diff -Nru mysql-8.0-8.0.26/client/base/abstract_options_provider.cc mysql-8.0-8.0.27/client/base/abstract_options_provider.cc
--- mysql-8.0-8.0.26/client/base/abstract_options_provider.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/client/base/abstract_options_provider.cc	2021-09-28 11:46:34.000000000 +0000
@@ -27,6 +27,7 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <iostream>
+#include <optional>
 #include <vector>
 
 #include "client/base/i_options_provider.h"
@@ -37,7 +38,6 @@
 using std::string;
 using std::vector;
 using namespace Mysql::Tools::Base::Options;
-using Mysql::Nullable;
 
 Simple_option *Abstract_options_provider::create_new_option(
     std::string name, std::string description) {
@@ -58,13 +58,14 @@
 }
 
 Password_option *Abstract_options_provider::create_new_password_option(
-    Nullable<string> *value, std::string name, std::string description) {
+    std::optional<string> *value, std::string name, std::string description) {
   return this->attach_new_option<Password_option>(
       new Password_option(value, name, description));
 }
 
 String_option *Abstract_options_provider::create_new_option(
-    Nullable<std::string> *value, std::string name, std::string description) {
+    std::optional<std::string> *value, std::string name,
+    std::string description) {
   return this->attach_new_option<String_option>(
       new String_option(value, name, description));
 }
diff -Nru mysql-8.0-8.0.26/client/base/abstract_options_provider.h mysql-8.0-8.0.27/client/base/abstract_options_provider.h
--- mysql-8.0-8.0.26/client/base/abstract_options_provider.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/client/base/abstract_options_provider.h	2021-09-28 11:46:34.000000000 +0000
@@ -26,6 +26,7 @@
 #define ABSTRACT_OPTIONS_PROVIDER_INCLUDED
 
 #include <map>
+#include <optional>
 #include <string>
 
 #include "client/base/bool_option.h"
@@ -81,22 +82,24 @@
     Creates and attach new password option. It removes password from
     command-line on UNIX systems to prevent password to be seen when listing
     processes.
-    @param value Pointer to Nullable<string> object to receive option value.
+    @param value Pointer to std::optional<string> object to receive option
+    value.
     @param name Name of option. It is used in command line option name as
       --name.
     @param description Description of option to be printed in --help.
    */
-  Password_option *create_new_password_option(Nullable<std::string> *value,
+  Password_option *create_new_password_option(std::optional<std::string> *value,
                                               std::string name,
                                               std::string description);
   /**
     Creates and attach new string option.
-    @param value Pointer to Nullable<string> object to receive option value.
+    @param value Pointer to std::optional<string> object to receive option
+    value.
     @param name Name of option. It is used in command line option name as
       --name.
     @param description Description of option to be printed in --help.
    */
-  String_option *create_new_option(Nullable<std::string> *value,
+  String_option *create_new_option(std::optional<std::string> *value,
                                    std::string name, std::string description);
   /**
     Creates and attach new 32-bit signed number option.
diff -Nru mysql-8.0-8.0.26/client/base/abstract_program.h mysql-8.0-8.0.27/client/base/abstract_program.h
--- mysql-8.0-8.0.26/client/base/abstract_program.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/client/base/abstract_program.h	2021-09-28 11:46:34.000000000 +0000
@@ -120,9 +120,10 @@
     Redirects call to option_parsed of main Abstract_program instance.
     If we have anonymous functions or binding this should be removed.
   */
-  static bool callback_option_parsed(
-      int optid, const struct my_option *opt MY_ATTRIBUTE((unused)),
-      char *argument);
+  static bool callback_option_parsed(int optid,
+                                     const struct my_option *opt
+                                     [[maybe_unused]],
+                                     char *argument);
 
   Options::Debug_options m_debug_options;
   Options::Help_options m_help_options;
diff -Nru mysql-8.0-8.0.26/client/base/abstract_string_option.h mysql-8.0-8.0.27/client/base/abstract_string_option.h
--- mysql-8.0-8.0.26/client/base/abstract_string_option.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/client/base/abstract_string_option.h	2021-09-28 11:46:34.000000000 +0000
@@ -26,11 +26,11 @@
 #define ABSTRACT_STRING_OPTION_INCLUDED
 
 #include <functional>
+#include <optional>
 #include <string>
 
 #include "client/base/abstract_value_option.h"
 #include "my_getopt.h"
-#include "nullable.h"
 
 namespace Mysql {
 namespace Tools {
@@ -58,10 +58,10 @@
       --name.
     @param description Description of option to be printed in --help.
    */
-  Abstract_string_option(Nullable<std::string> *value, ulong var_type,
+  Abstract_string_option(std::optional<std::string> *value, ulong var_type,
                          std::string name, std::string description);
 
-  Nullable<std::string> *m_destination_value;
+  std::optional<std::string> *m_destination_value;
 
  private:
   void string_callback(char *argument);
@@ -71,12 +71,12 @@
 
 template <typename T_type>
 Abstract_string_option<T_type>::Abstract_string_option(
-    Nullable<std::string> *value, ulong var_type, std::string name,
+    std::optional<std::string> *value, ulong var_type, std::string name,
     std::string description)
     : Abstract_value_option<T_type>(&this->m_original_value, var_type, name,
                                     description, (uint64)NULL),
       m_destination_value(value) {
-  *value = Nullable<std::string>();
+  *value = std::optional<std::string>();
   this->m_original_value = nullptr;
 
   this->add_callback(new std::function<void(char *)>(
@@ -86,7 +86,7 @@
 
 template <typename T_type>
 T_type *Abstract_string_option<T_type>::set_value(std::string value) {
-  *this->m_destination_value = Nullable<std::string>(value);
+  *this->m_destination_value = std::optional<std::string>(value);
   this->m_original_value = this->m_destination_value->value().c_str();
   this->m_option_structure.def_value =
       (uint64)this->m_destination_value->value().c_str();
@@ -97,7 +97,8 @@
 void Abstract_string_option<T_type>::string_callback(char *argument) {
   if (argument != nullptr) {
     // Copy argument value from char* to destination string.
-    *this->m_destination_value = Nullable<std::string>(this->m_original_value);
+    *this->m_destination_value =
+        std::optional<std::string>(this->m_original_value);
   } else {
     // There is no argument supplied, we shouldn't change default value.
   }
diff -Nru mysql-8.0-8.0.26/client/base/CMakeLists.txt mysql-8.0-8.0.27/client/base/CMakeLists.txt
--- mysql-8.0-8.0.26/client/base/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/client/base/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -20,6 +20,10 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
+INCLUDE_DIRECTORIES(
+  ${CMAKE_SOURCE_DIR}/client/include
+)
+
 ADD_LIBRARY(client_base STATIC
   bool_option.cc
   char_array_option.cc
@@ -44,6 +48,7 @@
   show_variable_query_extractor.cc
 
   ${CMAKE_SOURCE_DIR}/sql-common/sql_string.cc
+  ${CMAKE_SOURCE_DIR}/client/multi_factor_passwordopt-vars.cc
 )
 
 TARGET_LINK_LIBRARIES(client_base mysqlclient)
diff -Nru mysql-8.0-8.0.26/client/base/debug_options.cc mysql-8.0-8.0.27/client/base/debug_options.cc
--- mysql-8.0-8.0.26/client/base/debug_options.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/client/base/debug_options.cc	2021-09-28 11:46:34.000000000 +0000
@@ -77,8 +77,7 @@
 #endif
 }
 
-void Debug_options::debug_option_callback(
-    char *argument MY_ATTRIBUTE((unused))) {
+void Debug_options::debug_option_callback(char *argument [[maybe_unused]]) {
   if (this->m_dbug_option.has_value()) {
     DBUG_PUSH(this->m_dbug_option.value().c_str());
   }
diff -Nru mysql-8.0-8.0.26/client/base/debug_options.h mysql-8.0-8.0.27/client/base/debug_options.h
--- mysql-8.0-8.0.26/client/base/debug_options.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/client/base/debug_options.h	2021-09-28 11:46:34.000000000 +0000
@@ -25,9 +25,10 @@
 #ifndef DEBUG_OPTIONS_INCLUDED
 #define DEBUG_OPTIONS_INCLUDED
 
+#include <optional>
+
 #include "client/base/abstract_options_provider.h"
 #include "my_compiler.h"
-#include "nullable.h"
 
 namespace Mysql {
 namespace Tools {
@@ -58,12 +59,12 @@
   void options_parsed() override;
 
  private:
-  void debug_option_callback(char *argument MY_ATTRIBUTE((unused)));
+  void debug_option_callback(char *argument [[maybe_unused]]);
 
   Abstract_program *m_program;
   bool m_debug_info_flag{false};
   bool m_debug_check_flag{false};
-  Nullable<std::string> m_dbug_option;
+  std::optional<std::string> m_dbug_option;
 };
 
 }  // namespace Options
diff -Nru mysql-8.0-8.0.26/client/base/help_options.cc mysql-8.0-8.0.27/client/base/help_options.cc
--- mysql-8.0-8.0.26/client/base/help_options.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/client/base/help_options.cc	2021-09-28 11:46:34.000000000 +0000
@@ -55,12 +55,12 @@
           std::bind(&Help_options::version_callback, this, _1)));
 }
 
-void Help_options::help_callback(char *argument MY_ATTRIBUTE((unused))) {
+void Help_options::help_callback(char *argument [[maybe_unused]]) {
   this->print_usage();
   exit(0);
 }
 
-void Help_options::version_callback(char *argument MY_ATTRIBUTE((unused))) {
+void Help_options::version_callback(char *argument [[maybe_unused]]) {
   this->print_version_line();
   exit(0);
 }
diff -Nru mysql-8.0-8.0.26/client/base/help_options.h mysql-8.0-8.0.27/client/base/help_options.h
--- mysql-8.0-8.0.26/client/base/help_options.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/client/base/help_options.h	2021-09-28 11:46:34.000000000 +0000
@@ -58,8 +58,8 @@
   virtual void print_usage();
 
  private:
-  void help_callback(char *argument MY_ATTRIBUTE((unused)));
-  void version_callback(char *argument MY_ATTRIBUTE((unused)));
+  void help_callback(char *argument [[maybe_unused]]);
+  void version_callback(char *argument [[maybe_unused]]);
 
   void print_version_line();
 
diff -Nru mysql-8.0-8.0.26/client/base/mysql_connection_options.cc mysql-8.0-8.0.27/client/base/mysql_connection_options.cc
--- mysql-8.0-8.0.26/client/base/mysql_connection_options.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/client/base/mysql_connection_options.cc	2021-09-28 11:46:34.000000000 +0000
@@ -26,6 +26,7 @@
 
 #include <stdlib.h>
 #include <functional>
+#include <optional>
 #include <sstream>
 #include <vector>
 
@@ -34,10 +35,10 @@
 #include "client/base/abstract_program.h"
 #include "compression.h"
 #include "m_ctype.h"
+#include "multi_factor_passwordopt-vars.h"
 #include "mysys_err.h"
 #include "typelib.h"
 
-using Mysql::Nullable;
 using Mysql::Tools::Base::Abstract_program;
 using namespace Mysql::Tools::Base::Options;
 using std::string;
@@ -100,10 +101,20 @@
       ->set_value_step(1024)
       ->set_value(1024 * 1024L - 1024);
   this->create_new_password_option(
-          &this->m_password, "password",
+          &this->m_password[0], "password",
           "Password to use when connecting to server. If password is not given,"
           " it's solicited on the tty.")
       ->set_short_character('p');
+  this->create_new_password_option(
+      &this->m_password[0], "password1",
+      "Password for first factor authentication plugin.");
+  this->create_new_password_option(
+      &this->m_password[1], "password2",
+      "Password for second factor authentication plugin.");
+  this->create_new_password_option(
+      &this->m_password[2], "password3",
+      "Password for third factor authentication plugin.");
+
 #ifdef _WIN32
   this->create_new_option("pipe", "Use named pipes to connect to server.")
       ->set_short_character('W')
@@ -190,10 +201,12 @@
     set_get_server_public_key_option(connection,
                                      &this->m_get_server_public_key);
 
+  /* set passwords for --password{1,2,3} */
+  set_password_options(connection);
+
   if (!mysql_real_connect(connection, this->get_null_or_string(this->m_host),
-                          this->get_null_or_string(this->m_user),
-                          this->get_null_or_string(this->m_password), nullptr,
-                          this->m_mysql_port,
+                          this->get_null_or_string(this->m_user), nullptr,
+                          nullptr, this->m_mysql_port,
                           this->get_null_or_string(this->m_mysql_unix_port),
                           0)) {
     this->db_error(connection, "while connecting to the MySQL server");
@@ -223,7 +236,7 @@
 }
 
 const char *Mysql_connection_options::get_null_or_string(
-    Nullable<string> &maybe_string) {
+    std::optional<string> &maybe_string) {
   if (maybe_string.has_value()) {
     return maybe_string.value().c_str();
   } else {
@@ -232,14 +245,14 @@
 }
 
 #ifdef _WIN32
-void Mysql_connection_options::pipe_protocol_callback(
-    char *not_used MY_ATTRIBUTE((unused))) {
+void Mysql_connection_options::pipe_protocol_callback(char *not_used
+                                                      [[maybe_unused]]) {
   this->m_protocol = MYSQL_PROTOCOL_PIPE;
 }
 #endif
 
-void Mysql_connection_options::protocol_callback(
-    char *not_used MY_ATTRIBUTE((unused))) {
+void Mysql_connection_options::protocol_callback(char *not_used
+                                                 [[maybe_unused]]) {
   this->m_protocol = find_type_or_exit(this->m_protocol_string.value().c_str(),
                                        &sql_protocol_typelib, "protocol");
 }
diff -Nru mysql-8.0-8.0.26/client/base/mysql_connection_options.h mysql-8.0-8.0.27/client/base/mysql_connection_options.h
--- mysql-8.0-8.0.26/client/base/mysql_connection_options.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/client/base/mysql_connection_options.h	2021-09-28 11:46:34.000000000 +0000
@@ -25,6 +25,7 @@
 #ifndef MYSQL_CONNECTION_OPTIONS_INCLUDED
 #define MYSQL_CONNECTION_OPTIONS_INCLUDED
 
+#include <optional>
 #include <vector>
 
 #include "client/base/abstract_program.h"
@@ -33,7 +34,6 @@
 #include "client/client_priv.h"
 #include "my_compiler.h"
 #include "my_inttypes.h"
-#include "nullable.h"
 
 namespace Mysql {
 namespace Tools {
@@ -64,8 +64,8 @@
     bool apply_for_connection(MYSQL *connection);
 
    private:
-    Nullable<std::string> m_ssl_mode_string;
-    Nullable<std::string> m_ssl_fips_mode_string;
+    std::optional<std::string> m_ssl_mode_string;
+    std::optional<std::string> m_ssl_fips_mode_string;
 
     void ca_option_callback(char *argument);
     void mode_option_callback(char *argument);
@@ -108,42 +108,42 @@
     Returns pointer to constant array containing specified string or NULL
     value if string has length 0.
    */
-  const char *get_null_or_string(Nullable<std::string> &maybeString);
+  const char *get_null_or_string(std::optional<std::string> &maybeString);
 
   /**
     Prints database connection error and exits program.
    */
   void db_error(MYSQL *connection, const char *when);
 #ifdef _WIN32
-  void pipe_protocol_callback(char *not_used MY_ATTRIBUTE((unused)));
+  void pipe_protocol_callback(char *not_used [[maybe_unused]]);
 #endif
-  void protocol_callback(char *not_used MY_ATTRIBUTE((unused)));
+  void protocol_callback(char *not_used [[maybe_unused]]);
 
   static bool mysql_inited;
 
   Ssl_options m_ssl_options_provider;
   Abstract_program *m_program;
-  Nullable<std::string> m_protocol_string;
+  std::optional<std::string> m_protocol_string;
   uint32 m_protocol;
-  Nullable<std::string> m_bind_addr;
-  Nullable<std::string> m_host;
+  std::optional<std::string> m_bind_addr;
+  std::optional<std::string> m_host;
   uint32 m_mysql_port;
-  Nullable<std::string> m_mysql_unix_port;
+  std::optional<std::string> m_mysql_unix_port;
 #if defined(_WIN32)
-  Nullable<std::string> m_shared_memory_base_name;
+  std::optional<std::string> m_shared_memory_base_name;
 #endif
-  Nullable<std::string> m_default_auth;
-  Nullable<std::string> m_plugin_dir;
+  std::optional<std::string> m_default_auth;
+  std::optional<std::string> m_plugin_dir;
   uint32 m_net_buffer_length;
   uint32 m_max_allowed_packet;
   bool m_compress;
-  Nullable<std::string> m_user;
-  Nullable<std::string> m_password;
-  Nullable<std::string> m_default_charset;
-  Nullable<std::string> m_server_public_key;
+  std::optional<std::string> m_user;
+  std::optional<std::string> m_password[3];
+  std::optional<std::string> m_default_charset;
+  std::optional<std::string> m_server_public_key;
   bool m_get_server_public_key;
   uint m_zstd_compress_level;
-  Nullable<std::string> m_compress_algorithm;
+  std::optional<std::string> m_compress_algorithm;
 };
 
 }  // namespace Options
diff -Nru mysql-8.0-8.0.26/client/base/password_option.cc mysql-8.0-8.0.27/client/base/password_option.cc
--- mysql-8.0-8.0.26/client/base/password_option.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/client/base/password_option.cc	2021-09-28 11:46:34.000000000 +0000
@@ -23,18 +23,19 @@
 */
 
 #include "client/base/password_option.h"
+#include "multi_factor_passwordopt-vars.h"
 
 #include <stddef.h>
 #include <functional>
+#include <optional>
 
 #include "client/client_priv.h"
 
 using namespace Mysql::Tools::Base::Options;
-using Mysql::Nullable;
 using std::string;
 using std::placeholders::_1;
 
-Password_option::Password_option(Nullable<string> *value, string name,
+Password_option::Password_option(std::optional<string> *value, string name,
                                  string description)
     : Abstract_string_option<Password_option>(value, GET_PASSWORD, name,
                                               description) {
@@ -42,32 +43,13 @@
       std::bind(&Password_option::password_callback, this, _1)));
 }
 
+Password_option::~Password_option() { free_passwords(); }
+
 void Password_option::password_callback(char *argument) {
-  if (argument == ::disabled_my_option) {
-    // This prevents ::disabled_my_option being overriden later in this
-    // function.
-    argument = const_cast<char *>("");
-  }
-
-  if (argument != nullptr) {
-    /*
-     Destroy argument value, this modifies part of argv passed to main
-     routine. This makes command line on linux changed, so no user can see
-     password shortly after program starts. This works for example for
-     /proc/<pid>/cmdline file and ps tool.
-     */
-    for (char *pos = argument; *pos != 0; pos++) {
-      *pos = '*';
-    }
-
-    /*
-     This cuts argument length to hide password length on linux commandline
-     showing tools.
-     */
-    if (*argument) argument[1] = 0;
-  } else {
-    char *password = ::get_tty_password(nullptr);
-    *this->m_destination_value = Nullable<string>(password);
-    my_free(password);
-  }
+  struct my_option opt = get_my_option();
+  parse_command_line_password_option(&opt, argument);
+  unsigned int factor = 0;
+  if (strcmp(opt.name, "password"))
+    factor = opt.name[strlen("password")] - '0' - 1;
+  *this->m_destination_value = std::optional<string>(opt_password[factor]);
 }
diff -Nru mysql-8.0-8.0.26/client/base/password_option.h mysql-8.0-8.0.27/client/base/password_option.h
--- mysql-8.0-8.0.26/client/base/password_option.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/client/base/password_option.h	2021-09-28 11:46:34.000000000 +0000
@@ -25,11 +25,11 @@
 #ifndef PASSWORD_OPTION_INCLUDED
 #define PASSWORD_OPTION_INCLUDED
 
+#include <optional>
 #include <string>
 
 #include "client/base/abstract_string_option.h"
 #include "my_getopt.h"
-#include "nullable.h"
 
 namespace Mysql {
 namespace Tools {
@@ -49,8 +49,9 @@
       --name.
     @param description Description of option to be printed in --help.
    */
-  Password_option(Nullable<std::string> *value, std::string name,
+  Password_option(std::optional<std::string> *value, std::string name,
                   std::string description);
+  ~Password_option();
 
  private:
   void password_callback(char *);
diff -Nru mysql-8.0-8.0.26/client/base/ssl_options.cc mysql-8.0-8.0.27/client/base/ssl_options.cc
--- mysql-8.0-8.0.26/client/base/ssl_options.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/client/base/ssl_options.cc	2021-09-28 11:46:34.000000000 +0000
@@ -71,8 +71,8 @@
           this, _1)));
 }
 
-void Mysql_connection_options::Ssl_options::ca_option_callback(
-    char *argument MY_ATTRIBUTE((unused))) {
+void Mysql_connection_options::Ssl_options::ca_option_callback(char *argument [
+    [maybe_unused]]) {
   if (!ssl_mode_set_explicitly) ::opt_ssl_mode = SSL_MODE_VERIFY_CA;
 }
 
diff -Nru mysql-8.0-8.0.26/client/base/string_option.cc mysql-8.0-8.0.27/client/base/string_option.cc
--- mysql-8.0-8.0.26/client/base/string_option.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/client/base/string_option.cc	2021-09-28 11:46:34.000000000 +0000
@@ -24,11 +24,12 @@
 
 #include "client/base/string_option.h"
 
+#include <optional>
+
 using namespace Mysql::Tools::Base::Options;
-using Mysql::Nullable;
 using std::string;
 
-String_option::String_option(Nullable<string> *value, string name,
+String_option::String_option(std::optional<string> *value, string name,
                              string description)
     : Abstract_string_option<String_option>(value, GET_STR, name, description) {
 }
diff -Nru mysql-8.0-8.0.26/client/base/string_option.h mysql-8.0-8.0.27/client/base/string_option.h
--- mysql-8.0-8.0.26/client/base/string_option.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/client/base/string_option.h	2021-09-28 11:46:34.000000000 +0000
@@ -25,11 +25,11 @@
 #ifndef STRING_OPTION_INCLUDED
 #define STRING_OPTION_INCLUDED
 
+#include <optional>
 #include <string>
 
 #include "client/base/abstract_string_option.h"
 #include "my_getopt.h"
-#include "nullable.h"
 
 namespace Mysql {
 namespace Tools {
@@ -48,7 +48,7 @@
       --name.
     @param description Description of option to be printed in --help.
    */
-  String_option(Nullable<std::string> *value, std::string name,
+  String_option(std::optional<std::string> *value, std::string name,
                 std::string description);
 };
 
diff -Nru mysql-8.0-8.0.26/client/check/mysqlcheck.cc mysql-8.0-8.0.27/client/check/mysqlcheck.cc
--- mysql-8.0-8.0.26/client/check/mysqlcheck.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/client/check/mysqlcheck.cc	2021-09-28 11:46:34.000000000 +0000
@@ -57,17 +57,16 @@
             opt_extended = false, opt_compress = false, opt_databases = false,
             opt_fast = false, opt_medium_check = false, opt_quick = false,
             opt_all_in_1 = false, opt_silent = false, opt_auto_repair = false,
-            ignore_errors = false, tty_password = false, opt_frm = false,
-            debug_info_flag = false, debug_check_flag = false,
-            opt_fix_table_names = false, opt_fix_db_names = false,
-            opt_upgrade = false, opt_write_binlog = true;
+            ignore_errors = false, opt_frm = false, debug_info_flag = false,
+            debug_check_flag = false, opt_fix_table_names = false,
+            opt_fix_db_names = false, opt_upgrade = false,
+            opt_write_binlog = true;
 static uint verbose = 0, opt_mysql_port = 0;
 static uint opt_enable_cleartext_plugin = 0;
 static bool using_opt_enable_cleartext_plugin = false;
 static int my_end_arg;
 static char *opt_mysql_unix_port = nullptr;
-static char *opt_password = nullptr, *current_user = nullptr,
-            *current_host = nullptr;
+static char *current_user = nullptr, *current_host = nullptr;
 static const char *default_charset = nullptr;
 static char *opt_plugin_dir = nullptr, *opt_default_auth = nullptr;
 static int first_error = 0;
@@ -80,6 +79,8 @@
 static uint opt_protocol = 0;
 static char *opt_bind_addr = nullptr;
 
+#include "multi_factor_passwordopt-vars.h"
+
 static struct my_option my_long_options[] = {
     {"all-databases", 'A',
      "Check all the databases. This is the same as --databases with all "
@@ -183,11 +184,7 @@
      nullptr, 0, nullptr},
     {"optimize", 'o', "Optimize table.", nullptr, nullptr, nullptr, GET_NO_ARG,
      NO_ARG, 0, 0, 0, nullptr, 0, nullptr},
-    {"password", 'p',
-     "Password to use when connecting to server. If password is not given, "
-     "it's solicited on the tty.",
-     nullptr, nullptr, nullptr, GET_PASSWORD, OPT_ARG, 0, 0, 0, nullptr, 0,
-     nullptr},
+#include "multi_factor_passwordopt-longopts.h"
 #ifdef _WIN32
     {"pipe", 'W', "Use named pipes to connect to server.", 0, 0, 0, GET_NO_ARG,
      NO_ARG, 0, 0, 0, 0, 0, 0},
@@ -267,7 +264,7 @@
 
 static void usage(void);
 static int get_options(int *argc, char ***argv, MEM_ROOT *alloc);
-static int dbConnect(char *host, char *user, char *passwd);
+static int dbConnect(char *host, char *user);
 static void dbDisconnect(char *host);
 static void DBerror(MYSQL *mysql, const string &when);
 static void safe_exit(int error);
@@ -319,7 +316,8 @@
       what_to_do = DO_CHECK;
       opt_check_only_changed = true;
       break;
-    case 'I': /* Fall through */
+    case 'I':
+      [[fallthrough]];
     case '?':
       usage();
       exit(0);
@@ -330,24 +328,7 @@
     case 'o':
       what_to_do = DO_OPTIMIZE;
       break;
-    case 'p':
-      if (argument == disabled_my_option) {
-        // Don't require password
-        static char empty_password[] = {'\0'};
-        assert(empty_password[0] ==
-               '\0');  // Check that it has not been overwritten
-        argument = empty_password;
-      }
-      if (argument) {
-        char *start = argument;
-        my_free(opt_password);
-        opt_password = my_strdup(PSI_NOT_INSTRUMENTED, argument, MYF(MY_FAE));
-        while (*argument) *argument++ = 'x'; /* Destroy argument */
-        if (*start) start[1] = 0;            /* Cut length of argument */
-        tty_password = false;
-      } else
-        tty_password = true;
-      break;
+      PARSE_COMMAND_LINE_PASSWORD_OPTION;
     case 'r':
       what_to_do = DO_REPAIR;
       break;
@@ -453,13 +434,12 @@
     printf("for more information.\n");
     return 1;
   }
-  if (tty_password) opt_password = get_tty_password(NullS);
   if (debug_info_flag) my_end_arg = MY_CHECK_ERROR | MY_GIVE_INFO;
   if (debug_check_flag) my_end_arg = MY_CHECK_ERROR;
   return (0);
 } /* get_options */
 
-static int dbConnect(char *host, char *user, char *passwd) {
+static int dbConnect(char *host, char *user) {
   DBUG_TRACE;
   if (verbose) {
     fprintf(stderr, "# Connecting to %s...\n", host ? host : "localhost");
@@ -503,8 +483,9 @@
                  "mysqlcheck");
   set_server_public_key(&mysql_connection);
   set_get_server_public_key_option(&mysql_connection);
+  set_password_options(&mysql_connection);
   if (!(sock =
-            mysql_real_connect(&mysql_connection, host, user, passwd, nullptr,
+            mysql_real_connect(&mysql_connection, host, user, nullptr, nullptr,
                                opt_mysql_port, opt_mysql_unix_port, 0))) {
     DBerror(&mysql_connection, "when trying to connect");
     return 1;
@@ -543,7 +524,7 @@
     my_end(my_end_arg);
     exit(EX_USAGE);
   }
-  if (dbConnect(current_host, current_user, opt_password)) exit(EX_MYSQLERR);
+  if (dbConnect(current_host, current_user)) exit(EX_MYSQLERR);
 
   // Sun Studio does not work with range constructor from char** to string.
   vector<string> conv;
@@ -558,11 +539,11 @@
               DBerror);
 
   dbDisconnect(current_host);
-  my_free(opt_password);
+  free_passwords();
 #if defined(_WIN32)
   my_free(shared_memory_base_name);
 #endif
-  free_root(&alloc, MYF(0));
+  alloc.Clear();
   my_end(my_end_arg);
   return (first_error != 0);
 } /* main */
diff -Nru mysql-8.0-8.0.26/client/check/mysqlcheck_core.cc mysql-8.0-8.0.27/client/check/mysqlcheck_core.cc
--- mysql-8.0-8.0.26/client/check/mysqlcheck_core.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/client/check/mysqlcheck_core.cc	2021-09-28 11:46:34.000000000 +0000
@@ -120,7 +120,7 @@
     switch (src[i]) {
       case '`': /* Escape backtick character. */
         res += '`';
-        /* Fall through. */
+        [[fallthrough]];
       default:
         res += src[i];
     }
diff -Nru mysql-8.0-8.0.26/client/CMakeLists.txt mysql-8.0-8.0.27/client/CMakeLists.txt
--- mysql-8.0-8.0.26/client/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/client/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -32,6 +32,10 @@
 ## Subdirectory for mysql_migrate_keyring code.
 ADD_SUBDIRECTORY(migrate_keyring)
 
+INCLUDE_DIRECTORIES(
+  ${CMAKE_CURRENT_SOURCE_DIR}/include
+)
+
 MYSQL_ADD_EXECUTABLE(mysql
   ${CMAKE_SOURCE_DIR}/sql-common/net_ns.cc
   completion_hash.cc
@@ -39,6 +43,8 @@
   pattern_matcher.cc
   readline.cc
   client_query_attributes.cc
+  multi_factor_passwordopt-vars.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/common/user_registration.cc
   LINK_LIBRARIES mysqlclient client_base ${EDITLINE_LIBRARY}
   )
 
@@ -49,14 +55,6 @@
     )
 ENDIF()
 
-# Enable inlining, to avoid stack overflow for some long regular expressions.
-IF(SOLARIS_SPARC AND MY_COMPILER_IS_SUNPRO AND
-    CMAKE_BUILD_TYPE_UPPER STREQUAL "DEBUG")
-  ADD_COMPILE_FLAGS(mysqltest/regular_expressions.cc
-    COMPILE_FLAGS "-xO3"
-    )
-ENDIF()
-
 MYSQL_ADD_EXECUTABLE(mysqltest
   mysqltest.cc
   mysqltest/error_names.cc
@@ -76,18 +74,22 @@
 MYSQL_ADD_EXECUTABLE(mysqlcheck
   check/mysqlcheck.cc
   check/mysqlcheck_core.cc
+  multi_factor_passwordopt-vars.cc
   LINK_LIBRARIES mysqlclient
   )
 MYSQL_ADD_EXECUTABLE(mysqldump
   mysqldump.cc
+  multi_factor_passwordopt-vars.cc
   LINK_LIBRARIES mysqlclient
   )
 MYSQL_ADD_EXECUTABLE(mysqlimport
   mysqlimport.cc
+  multi_factor_passwordopt-vars.cc
   LINK_LIBRARIES mysqlclient
   )
 MYSQL_ADD_EXECUTABLE(mysqlshow
   mysqlshow.cc
+  multi_factor_passwordopt-vars.cc
   LINK_LIBRARIES mysqlclient
   )
 
@@ -251,10 +253,12 @@
 
 MYSQL_ADD_EXECUTABLE(mysqladmin
   mysqladmin.cc
+  multi_factor_passwordopt-vars.cc
   LINK_LIBRARIES mysqlclient
   )
 MYSQL_ADD_EXECUTABLE(mysqlslap
   mysqlslap.cc
+  multi_factor_passwordopt-vars.cc
   LINK_LIBRARIES mysqlclient
   )
 MYSQL_ADD_EXECUTABLE(mysql_config_editor
diff -Nru mysql-8.0-8.0.26/client/common/user_registration.cc mysql-8.0-8.0.27/client/common/user_registration.cc
--- mysql-8.0-8.0.26/client/common/user_registration.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/client/common/user_registration.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,219 @@
+
+/*
+Copyright (c) 2021, Oracle 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,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include <sstream>
+#include <vector>
+
+#include "user_registration.h"
+
+#include "my_hostname.h"
+#include "my_inttypes.h"
+#include "my_sys.h"
+#include "mysql/service_mysql_alloc.h"  // my_malloc
+#include "mysqld_error.h"
+
+/**
+  This helper method parses --fido-register-factor option values, and
+  inserts the parsed values in list.
+
+  @param[in] what_factor      comma separated string containing what all factors
+                              are to be registered
+  @param[out] list            container holding individual factors
+
+  @return true failed
+  @return false success
+*/
+static bool parse_register_option(char *what_factor,
+                                  std::vector<unsigned int> &list) {
+  std::string token;
+  std::stringstream str(what_factor);
+  while (getline(str, token, ',')) {
+    unsigned int nth_factor = 0;
+    try {
+      nth_factor = std::stoul(token);
+    } catch (std::invalid_argument &) {
+      return true;
+    } catch (std::out_of_range &) {
+      return true;
+    }
+    /* nth_factor can be either 2 or 3 */
+    if (nth_factor < 2 || nth_factor > 3) return true;
+    list.push_back(nth_factor);
+  }
+  return false;
+}
+
+/**
+  This helper method is used to perform device registration against a user
+  account. Below are the messages exchanged between client, server and
+  authenticator (fido device) during registration process.
+
+  == Initiate registration ==
+
+  client -> server : connect
+  server -> client : keep connection in registration mode
+  client -> server : ALTER USER account name nth FACTOR INITIATE REGISTRATION
+  server -> client : random challenge, user id, relying party ID
+
+  == Finish registration ==
+
+  client -> server : ALTER USER account name nth FACTOR FINISH REGISTRATION
+  client -> authenticator : random challenge, user id, relying party ID
+  authenticator -> client : public key, credential ID (X.509 certificate,
+  signature) client -> server : public key, credential ID server -> client : Ok
+  packet upon successful verification of signature
+
+  @param mysql              mysql connection handle
+  @param register_option    Comma separated list of values, which specifies
+  which factor requires registration. Valid values are "2", "3", "2,3" or "3,2"
+  @param errmsg             Buffer tol hold error message in case of error.
+
+  @return true failed
+  @return false success
+*/
+bool user_device_registration(MYSQL *mysql, char *register_option,
+                              char *errmsg) {
+  char query[1024] = {0};
+  MYSQL_RES *result;
+  MYSQL_ROW row;
+  ulong *lengths;
+  uchar *server_challenge = nullptr;
+  uchar *server_challenge_response = nullptr;
+  MYSQL_STMT *finish_reg_stmt;
+  MYSQL_BIND rs_bind;
+  uchar *pos = nullptr;
+
+  if (!mysql) {
+    sprintf(errmsg, "MySQL internal error. ");
+    return true;
+  }
+
+  std::vector<unsigned int> list;
+  if (parse_register_option(register_option, list)) {
+    sprintf(errmsg,
+            "Incorrect value specified for --fido-register-factor option. "
+            "Correct values can be '2', '3', '2,3' or '3,2'.");
+    return true;
+  }
+
+  for (auto f : list) {
+    sprintf(query, "ALTER USER USER() %d FACTOR INITIATE REGISTRATION", f);
+    if (mysql_real_query(mysql, query, (ulong)strlen(query))) {
+      sprintf(errmsg, "Initiate registration failed with error: %s. ",
+              mysql_error(mysql));
+      return true;
+    }
+    if (!(result = mysql_store_result(mysql))) {
+      sprintf(errmsg, "Initiate registration failed with error: %s. ",
+              mysql_error(mysql));
+      return true;
+    }
+    if (mysql_num_rows(result) > 1) {
+      sprintf(errmsg, "Initiate registration failed with error: %s. ",
+              mysql_error(mysql));
+      mysql_free_result(result);
+      return true;
+    }
+    row = mysql_fetch_row(result);
+    lengths = mysql_fetch_lengths(result);
+    /*
+      max length of challenge can be 32 (random challenge) +
+      255 (relying party ID) + 255 (host name) + 32 (user name) + 4 byte for
+      length encodings
+    */
+    if (lengths[0] > (CHALLENGE_LENGTH + RELYING_PARTY_ID_LENGTH +
+                      HOSTNAME_LENGTH + USERNAME_LENGTH + 4)) {
+      sprintf(errmsg, "Received server challenge is corrupt. Please retry.\n");
+      mysql_free_result(result);
+      return true;
+    }
+    server_challenge = static_cast<uchar *>(my_malloc(
+        PSI_NOT_INSTRUMENTED, lengths[0] + 1, MYF(MY_WME | MY_ZEROFILL)));
+    memcpy(server_challenge, row[0], lengths[0]);
+    mysql_free_result(result);
+
+    /* load fido client authentication plugin if required */
+    struct st_mysql_client_plugin *p =
+        mysql_client_find_plugin(mysql, "authentication_fido_client",
+                                 MYSQL_CLIENT_AUTHENTICATION_PLUGIN);
+    if (!p) {
+      my_free(server_challenge);
+      sprintf(
+          errmsg,
+          "Loading authentication_fido_client plugin failed with error: %s. ",
+          mysql_error(mysql));
+      return true;
+    }
+    /* set server challenge in plugin */
+    if (mysql_plugin_options(p, "registration_challenge", server_challenge)) {
+      my_free(server_challenge);
+      sprintf(errmsg,
+              "Failed to set plugin options \"registration_challenge\".\n");
+      return true;
+    }
+    my_free(server_challenge);
+    server_challenge = nullptr;
+    /* get challenge response from plugin */
+    if (mysql_plugin_get_option(p, "registration_response",
+                                &server_challenge_response)) {
+      sprintf(errmsg,
+              "Failed to get plugin options \"registration_response\".\n");
+      return true;
+    }
+    pos = server_challenge_response;
+
+    finish_reg_stmt = mysql_stmt_init(mysql);
+    /* execute FINISH REGISTRATION sql */
+    sprintf(query,
+            "ALTER USER USER() %d FACTOR FINISH REGISTRATION SET "
+            "CHALLENGE_RESPONSE AS '%s'",
+            f, server_challenge_response);
+    if (mysql_stmt_prepare(finish_reg_stmt, query, (ulong)strlen(query))) {
+      goto error;
+    }
+    /* Bind input buffers */
+    memset(&rs_bind, 0, sizeof(rs_bind));
+    rs_bind.buffer_type = MYSQL_TYPE_STRING;
+    rs_bind.buffer = (char *)(pos);
+    rs_bind.buffer_length =
+        (ulong)strlen(reinterpret_cast<char *>(server_challenge_response));
+    rs_bind.is_null = nullptr;
+
+    if (mysql_stmt_bind_param(finish_reg_stmt, &rs_bind)) {
+      goto error;
+    }
+    if (mysql_stmt_execute(finish_reg_stmt)) {
+      goto error;
+    }
+    if (mysql_stmt_close(finish_reg_stmt)) {
+      goto error;
+    }
+  }
+  return false;
+error:
+  sprintf(errmsg, "Finish registration failed with error: %s.\n",
+          mysql_stmt_error(finish_reg_stmt));
+  return true;
+}
\ No newline at end of file
diff -Nru mysql-8.0-8.0.26/client/completion_hash.cc mysql-8.0-8.0.27/client/completion_hash.cc
--- mysql-8.0-8.0.26/client/completion_hash.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/client/completion_hash.cc	2021-09-28 11:46:34.000000000 +0000
@@ -53,7 +53,7 @@
     ht->initialized = 0;
     return FAILURE;
   }
-  init_alloc_root(PSI_NOT_INSTRUMENTED, &ht->mem_root, 8192, 0);
+  ::new ((void *)&ht->mem_root) MEM_ROOT(PSI_NOT_INSTRUMENTED, 8192);
   ht->pHashFunction = hashpjw;
   ht->nTableSize = nSize;
   ht->initialized = 1;
@@ -192,7 +192,7 @@
 }
 
 void completion_hash_clean(HashTable *ht) {
-  free_root(&ht->mem_root, MYF(0));
+  ht->mem_root.Clear();
   memset(ht->arBuckets, 0, ht->nTableSize * sizeof(Bucket *));
 }
 
diff -Nru mysql-8.0-8.0.26/client/dump/abstract_mysql_chain_element_extension.cc mysql-8.0-8.0.27/client/dump/abstract_mysql_chain_element_extension.cc
--- mysql-8.0-8.0.26/client/dump/abstract_mysql_chain_element_extension.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/client/dump/abstract_mysql_chain_element_extension.cc	2021-09-28 11:46:34.000000000 +0000
@@ -27,6 +27,7 @@
 #include <stddef.h>
 #include <boost/algorithm/string.hpp>
 #include <functional>
+#include <optional>
 #include <sstream>
 
 #include "m_ctype.h"
@@ -80,7 +81,7 @@
   return my_strcasecmp(&my_charset_latin1, latin_name.c_str(), db_name.c_str());
 }
 
-Mysql::Nullable<std::string>
+std::optional<std::string>
 Abstract_mysql_chain_element_extension::get_create_statement(
     Mysql::Tools::Base::Mysql_query_runner *runner,
     const std::string &database_name, const std::string &object_name,
@@ -92,7 +93,7 @@
           this->get_quoted_object_full_name(database_name, object_name),
       &result);
 
-  Mysql::Nullable<std::string> res;
+  std::optional<std::string> res;
   if (result.size() > 0) {
     if (object_type == "FUNCTION" || object_type == "PROCEDURE" ||
         object_type == "TRIGGER")
diff -Nru mysql-8.0-8.0.26/client/dump/abstract_mysql_chain_element_extension.h mysql-8.0-8.0.27/client/dump/abstract_mysql_chain_element_extension.h
--- mysql-8.0-8.0.26/client/dump/abstract_mysql_chain_element_extension.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/client/dump/abstract_mysql_chain_element_extension.h	2021-09-28 11:46:34.000000000 +0000
@@ -25,8 +25,10 @@
 #ifndef ABSTRACT_MYSQL_CHAIN_ELEMENT_EXTENSION_INCLUDED
 #define ABSTRACT_MYSQL_CHAIN_ELEMENT_EXTENSION_INCLUDED
 
-#include <sys/types.h>
 #include <functional>
+#include <optional>
+
+#include <sys/types.h>
 
 #include "client/base/message_data.h"
 #include "client/dump/abstract_data_object.h"
@@ -34,7 +36,6 @@
 #include "client/dump/i_connection_provider.h"
 #include "client/dump/mysql_chain_element_options.h"
 #include "my_inttypes.h"
-#include "nullable.h"
 
 #define MYSQL_UNIVERSAL_CLIENT_CHARSET "utf8mb4"
 #define MAX_NAME_LEN (64 * 3)
@@ -66,7 +67,7 @@
     Gets CREATE statement for specified object. If object type is database,
     then object_name should be empty.
    */
-  Mysql::Nullable<std::string> get_create_statement(
+  std::optional<std::string> get_create_statement(
       Mysql::Tools::Base::Mysql_query_runner *runner,
       const std::string &database_name, const std::string &object_name,
       const std::string &object_type, uint field_id = 1);
diff -Nru mysql-8.0-8.0.26/client/dump/mysql_crawler.cc mysql-8.0-8.0.27/client/dump/mysql_crawler.cc
--- mysql-8.0-8.0.26/client/dump/mysql_crawler.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/client/dump/mysql_crawler.cc	2021-09-28 11:46:34.000000000 +0000
@@ -26,6 +26,7 @@
 
 #include <stdlib.h>
 #include <functional>
+#include <optional>
 #include <string>
 #include <vector>
 
@@ -110,7 +111,7 @@
        it != databases.end(); ++it) {
     std::string db_name = (**it)[0];
 
-    Mysql::Nullable<std::string> stmt = this->get_create_statement(
+    std::optional<std::string> stmt = this->get_create_statement(
         runner, "", db_name, "DATABASE IF NOT EXISTS");
     if (!stmt.has_value()) continue;  // some error ocurred
 
@@ -272,7 +273,7 @@
                       ? 0
                       : atoll(table_data[4].c_str());  // "Rows"
     bool isInnoDB = table_data[1] == "InnoDB";         // "Engine"
-    Mysql::Nullable<std::string> stmt =
+    std::optional<std::string> stmt =
         this->get_create_statement(runner, db.get_name(), table_name, "TABLE");
     if (!stmt.has_value()) continue;  // some error ocurred
     Table *table = new Table(this->generate_new_object_id(), table_name,
@@ -347,7 +348,7 @@
           return;
         } else
           runner->run_query(std::string("UNLOCK TABLES"));
-        Mysql::Nullable<std::string> stmt = this->get_create_statement(
+        std::optional<std::string> stmt = this->get_create_statement(
             runner, db.get_name(), table_name, "TABLE");
 
         if (!stmt.has_value()) {
@@ -387,7 +388,7 @@
        it != functions.end(); ++it) {
     const Mysql::Tools::Base::Mysql_query_runner::Row &function_row = **it;
 
-    Mysql::Nullable<std::string> stmt = this->get_create_statement(
+    std::optional<std::string> stmt = this->get_create_statement(
         runner, db.get_name(), function_row[1], type, 2);
     if (!stmt.has_value())  // some error ocurred
       break;
@@ -427,7 +428,7 @@
        it != events.end(); ++it) {
     const Mysql::Tools::Base::Mysql_query_runner::Row &event_row = **it;
 
-    Mysql::Nullable<std::string> stmt = this->get_create_statement(
+    std::optional<std::string> stmt = this->get_create_statement(
         runner, db.get_name(), event_row[1], "EVENT", 3);
 
     if (!stmt.has_value())  // some error ocurred
@@ -520,7 +521,7 @@
            triggers.begin();
        it != triggers.end(); ++it) {
     const Mysql::Tools::Base::Mysql_query_runner::Row &trigger_row = **it;
-    Mysql::Nullable<std::string> stmt = this->get_create_statement(
+    std::optional<std::string> stmt = this->get_create_statement(
         runner, table.get_schema(), trigger_row[0], "TRIGGER", 2);
     if (!stmt.has_value())  // some error occured
       break;
diff -Nru mysql-8.0-8.0.26/client/dump/mysqldump_tool_chain_maker_options.h mysql-8.0-8.0.27/client/dump/mysqldump_tool_chain_maker_options.h
--- mysql-8.0-8.0.26/client/dump/mysqldump_tool_chain_maker_options.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/client/dump/mysqldump_tool_chain_maker_options.h	2021-09-28 11:46:34.000000000 +0000
@@ -25,6 +25,8 @@
 #ifndef MYSQLDUMP_TOOL_CHAIN_MAKER_OPTIONS_INCLUDED
 #define MYSQLDUMP_TOOL_CHAIN_MAKER_OPTIONS_INCLUDED
 
+#include <optional>
+
 #include "client/dump/abstract_data_object.h"
 #include "client/dump/mysql_object_reader_options.h"
 #include "client/dump/object_filter.h"
@@ -65,8 +67,8 @@
   bool m_dump_all_databases;
   bool m_dump_selected_databases;
   uint32 m_default_parallelism;
-  Mysql::Nullable<std::string> m_result_file;
-  Mysql::Nullable<std::string> m_compress_output_algorithm;
+  std::optional<std::string> m_result_file;
+  std::optional<std::string> m_compress_output_algorithm;
   bool m_skip_rows_data;
 
  private:
@@ -78,7 +80,7 @@
    */
   std::map<int, int> m_object_queue_threads;
   std::map<std::string, int> m_database_to_object_queue_id;
-  Mysql::Nullable<std::string> m_parallel_schemas_string;
+  std::optional<std::string> m_parallel_schemas_string;
   int m_last_parallel_schemas_queue_id;
   /* count of parallel-schemas queues with default parallelism */
   int m_def_thread_count;
diff -Nru mysql-8.0-8.0.26/client/dump/object_filter.h mysql-8.0-8.0.27/client/dump/object_filter.h
--- mysql-8.0-8.0.26/client/dump/object_filter.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/client/dump/object_filter.h	2021-09-28 11:46:34.000000000 +0000
@@ -25,13 +25,13 @@
 #ifndef OBJECT_FILTER_INCLUDED
 #define OBJECT_FILTER_INCLUDED
 
+#include <optional>
 #include <string>
 #include <vector>
 
 #include "client/base/abstract_program.h"
 #include "client/base/composite_options_provider.h"
 #include "client/dump/abstract_data_object.h"
-#include "nullable.h"
 
 namespace Mysql {
 namespace Tools {
@@ -91,7 +91,7 @@
   bool m_dump_triggers;
   bool m_dump_events;
   bool m_dump_users;
-  Mysql::Nullable<std::string> m_include_tmp_string;
+  std::optional<std::string> m_include_tmp_string;
   Mysql::Tools::Base::Abstract_program *m_program;
 };
 
diff -Nru mysql-8.0-8.0.26/client/dump/program.h mysql-8.0-8.0.27/client/dump/program.h
--- mysql-8.0-8.0.26/client/dump/program.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/client/dump/program.h	2021-09-28 11:46:34.000000000 +0000
@@ -26,6 +26,7 @@
 #define PROGRAM_INCLUDED
 
 #include <atomic>
+#include <optional>
 
 #include "client/base/abstract_connection_program.h"
 #include "client/dump/mysql_chain_element_options.h"
@@ -70,7 +71,7 @@
   Mysqldump_tool_chain_maker_options *m_mysqldump_tool_chain_maker_options;
   bool m_single_transaction;
   bool m_watch_progress;
-  Mysql::Nullable<std::string> m_error_log_file;
+  std::optional<std::string> m_error_log_file;
   FILE *m_stderr;
   std::atomic<uint32_t> m_error_code;
 };
diff -Nru mysql-8.0-8.0.26/client/include/multi_factor_passwordopt-longopts.h mysql-8.0-8.0.27/client/include/multi_factor_passwordopt-longopts.h
--- mysql-8.0-8.0.26/client/include/multi_factor_passwordopt-longopts.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/client/include/multi_factor_passwordopt-longopts.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,92 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+/**
+  @file include/multi_factor_passwordopt-longopts.h
+
+  This file contains password options to be specified as part of command-line
+  options for first,second,third authentication plugin factors for a given user.
+*/
+
+/* preserve existing option for backward compatibility */
+{"password",
+ 'p',
+ "Password to use when connecting to server. If password is not given it's "
+ "asked from the tty.",
+ nullptr,
+ nullptr,
+ nullptr,
+ GET_PASSWORD,
+ OPT_ARG,
+ 0,
+ 0,
+ 0,
+ nullptr,
+ 0,
+ nullptr},
+    /*
+     --password1, --password2 --password3 are new options to handle password for
+     first, second and third factor authentication plugin defined for a given
+     user account
+   */
+    {"password1",
+     MYSQL_OPT_USER_PASSWORD,
+     "Password for first factor authentication plugin.",
+     nullptr,
+     nullptr,
+     nullptr,
+     GET_PASSWORD,
+     OPT_ARG,
+     0,
+     0,
+     0,
+     nullptr,
+     0,
+     nullptr},
+    {"password2",
+     MYSQL_OPT_USER_PASSWORD,
+     "Password for second factor authentication plugin.",
+     nullptr,
+     nullptr,
+     nullptr,
+     GET_PASSWORD,
+     OPT_ARG,
+     0,
+     0,
+     0,
+     nullptr,
+     0,
+     nullptr},
+    {"password3",
+     MYSQL_OPT_USER_PASSWORD,
+     "Password for third factor authentication plugin.",
+     nullptr,
+     nullptr,
+     nullptr,
+     GET_PASSWORD,
+     OPT_ARG,
+     0,
+     0,
+     0,
+     nullptr,
+     0,
+     nullptr},
diff -Nru mysql-8.0-8.0.26/client/include/multi_factor_passwordopt-vars.h mysql-8.0-8.0.27/client/include/multi_factor_passwordopt-vars.h
--- mysql-8.0-8.0.26/client/include/multi_factor_passwordopt-vars.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/client/include/multi_factor_passwordopt-vars.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,56 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+/**
+  @file include/multi_factor_passwordopt-vars.h
+*/
+
+#ifndef MULTI_FACTOR_PASSWORDOPT_VARS_H
+#define MULTI_FACTOR_PASSWORDOPT_VARS_H
+
+#include "mysql.h"
+
+extern char *opt_password[MAX_AUTH_FACTORS];
+extern bool tty_password[MAX_AUTH_FACTORS];
+
+/** parse passwords for --password or --password<N> option where N = 1,2,3 */
+void parse_command_line_password_option(const struct my_option *opt,
+                                        char *argument);
+/**
+  If --password<N> option is not specified with an argument, get password from
+  prompt
+*/
+void set_tty_password(MYSQL *mysql);
+/** Set password in mysql->options */
+void set_password_options(MYSQL *mysql);
+/** Release memory for opt_password */
+void free_passwords();
+
+#define PARSE_COMMAND_LINE_PASSWORD_OPTION             \
+  case 'p':                                            \
+    parse_command_line_password_option(opt, argument); \
+    break;                                             \
+  case MYSQL_OPT_USER_PASSWORD:                        \
+    parse_command_line_password_option(opt, argument); \
+    break;
+
+#endif  // MULTI_FACTOR_PASSWORDOPT_VARS_H
diff -Nru mysql-8.0-8.0.26/client/include/user_registration.h mysql-8.0-8.0.27/client/include/user_registration.h
--- mysql-8.0-8.0.26/client/include/user_registration.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/client/include/user_registration.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,34 @@
+
+/*
+Copyright (c) 2021, Oracle 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,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef USER_REGISTRATION_H_
+#define USER_REGISTRATION_H_
+
+#include <mysql.h>
+
+bool user_device_registration(MYSQL *mysql, char *register_option,
+                              char *errmsg);
+
+#endif  // USER_REGISTRATION_H_
\ No newline at end of file
diff -Nru mysql-8.0-8.0.26/client/migrate_keyring/options.cc mysql-8.0-8.0.27/client/migrate_keyring/options.cc
--- mysql-8.0-8.0.26/client/migrate_keyring/options.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/client/migrate_keyring/options.cc	2021-09-28 11:46:34.000000000 +0000
@@ -178,7 +178,7 @@
       usage(true);
       break;
     case 'I':
-      // Fall through
+      [[fallthrough]];
     case '?':
       Options::s_help = true;
       usage(false);
diff -Nru mysql-8.0-8.0.26/client/multi_factor_passwordopt-vars.cc mysql-8.0-8.0.27/client/multi_factor_passwordopt-vars.cc
--- mysql-8.0-8.0.26/client/multi_factor_passwordopt-vars.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/client/multi_factor_passwordopt-vars.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,107 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+/**
+  @file include/multi_factor_passwordopt-vars.h
+*/
+
+#include "multi_factor_passwordopt-vars.h"
+
+#include "my_getopt.h"
+#include "mysql.h"
+#include "mysql/service_mysql_alloc.h"  // my_free, my_strdup
+
+char *opt_password[MAX_AUTH_FACTORS] = {0};
+bool tty_password[MAX_AUTH_FACTORS] = {false};
+
+/**
+  Helper method used by clients to parse password set as part of command line.
+  This method checks if password value is specified or not. If not then a flag
+  is set to let client accept password from terminal.
+
+  @param opt            password option
+  @param argument       value specified for --password<1,2,3> or --password
+*/
+void parse_command_line_password_option(const struct my_option *opt,
+                                        char *argument) {
+  if (argument == disabled_my_option) {
+    // Don't require password
+    static char empty_password[] = {'\0'};
+    assert(empty_password[0] ==
+           '\0');  // Check that it has not been overwritten
+    argument = empty_password;
+  }
+  /*
+    password options can be --password or --password1 or --password2 or
+    --password3. Thus extract factor from option.
+  */
+  unsigned int factor = 0;
+  if (strcmp(opt->name, "password"))
+    factor = opt->name[strlen("password")] - '0' - 1;
+  if (argument) {
+    char *start = argument;
+    my_free(opt_password[factor]);
+    opt_password[factor] =
+        my_strdup(PSI_NOT_INSTRUMENTED, argument, MYF(MY_FAE));
+    while (*argument) *argument++ = 'x';  // Destroy argument
+    if (*start) start[1] = 0;
+    tty_password[factor] = false;
+  } else
+    tty_password[factor] = true;
+}
+
+/**
+  Helper method used by clients to accept password from terminal
+*/
+void set_tty_password(MYSQL *mysql) {
+  for (unsigned int factor = 1; factor <= MAX_AUTH_FACTORS; factor++) {
+    if (tty_password[factor - 1]) {
+      char *pwd = get_tty_password(NullS);
+      mysql_options4(mysql, MYSQL_OPT_USER_PASSWORD, &factor, pwd);
+      my_free(pwd);
+    }
+  }
+}
+
+/**
+  Helper method used by clients to set password in mysql->options
+*/
+void set_password_options(MYSQL *mysql) {
+  for (unsigned int factor = 1; factor <= MAX_AUTH_FACTORS; factor++) {
+    if (opt_password[factor - 1]) {
+      mysql_options4(mysql, MYSQL_OPT_USER_PASSWORD, &factor,
+                     opt_password[factor - 1]);
+    }
+  }
+  /* get password from terminal */
+  if (!(opt_password[0] && opt_password[1] && opt_password[2]))
+    set_tty_password(mysql);
+}
+
+void free_passwords() {
+  for (unsigned int factor = 1; factor <= MAX_AUTH_FACTORS; factor++) {
+    if (opt_password[factor - 1]) {
+      my_free(opt_password[factor - 1]);
+      opt_password[factor - 1] = nullptr;
+    }
+  }
+}
\ No newline at end of file
diff -Nru mysql-8.0-8.0.26/client/mysqladmin.cc mysql-8.0-8.0.27/client/mysqladmin.cc
--- mysql-8.0-8.0.26/client/mysqladmin.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/client/mysqladmin.cc	2021-09-28 11:46:34.000000000 +0000
@@ -56,7 +56,7 @@
 #define MAX_TRUNC_LENGTH 3
 
 const char *host = nullptr;
-char *user = nullptr, *opt_password = nullptr;
+char *user = nullptr;
 const char *default_charset = MYSQL_AUTODETECT_CHARSET_NAME;
 char truncated_var_names[MAX_MYSQL_VAR][MAX_TRUNC_LENGTH];
 char ex_var_names[MAX_MYSQL_VAR][FN_REFLEN];
@@ -64,10 +64,10 @@
 static int interval = 0;
 static bool option_force = false, interrupted = false, new_line = false,
             opt_compress = false, opt_relative = false, opt_verbose = false,
-            opt_vertical = false, tty_password = false, opt_nobeep;
+            opt_vertical = false, opt_nobeep;
 static bool debug_info_flag = false, debug_check_flag = false;
 static uint tcp_port = 0, option_wait = 0, option_silent = 0, nr_iterations;
-static uint opt_count_iterations = 0, my_end_arg;
+static uint opt_count_iterations = 0, my_end_arg = 0;
 static char *opt_bind_addr = nullptr;
 static ulong opt_connect_timeout, opt_shutdown_timeout;
 static char *unix_port = nullptr;
@@ -96,6 +96,7 @@
 #include "sslopt-vars.h"
 
 #include "caching_sha2_passwordopt-vars.h"
+#include "multi_factor_passwordopt-vars.h"
 
 static void usage(void);
 extern "C" bool get_one_option(int optid, const struct my_option *opt,
@@ -228,11 +229,7 @@
      REQUIRED_ARG, 0, 0, 0, nullptr, 0, nullptr},
     {"no-beep", 'b', "Turn off beep on error.", &opt_nobeep, &opt_nobeep,
      nullptr, GET_BOOL, NO_ARG, 0, 0, 0, nullptr, 0, nullptr},
-    {"password", 'p',
-     "Password to use when connecting to server. If password is not given it's "
-     "asked from the tty.",
-     nullptr, nullptr, nullptr, GET_PASSWORD, OPT_ARG, 0, 0, 0, nullptr, 0,
-     nullptr},
+#include "multi_factor_passwordopt-longopts.h"
 #ifdef _WIN32
     {"pipe", 'W', "Use named pipes to connect to server.", 0, 0, 0, GET_NO_ARG,
      NO_ARG, 0, 0, 0, 0, 0, 0},
@@ -321,8 +318,7 @@
 
 static const char *load_default_groups[] = {"mysqladmin", "client", nullptr};
 
-bool get_one_option(int optid,
-                    const struct my_option *opt MY_ATTRIBUTE((unused)),
+bool get_one_option(int optid, const struct my_option *opt [[maybe_unused]],
                     char *argument) {
   int error = 0;
 
@@ -330,24 +326,7 @@
     case 'c':
       opt_count_iterations = 1;
       break;
-    case 'p':
-      if (argument == disabled_my_option) {
-        // Don't require password
-        static char empty_password[] = {'\0'};
-        assert(empty_password[0] ==
-               '\0');  // Check that it has not been overwritten
-        argument = empty_password;
-      }
-      if (argument) {
-        char *start = argument;
-        my_free(opt_password);
-        opt_password = my_strdup(PSI_NOT_INSTRUMENTED, argument, MYF(MY_FAE));
-        while (*argument) *argument++ = 'x'; /* Destroy argument */
-        if (*start) start[1] = 0;            /* Cut length of argument */
-        tty_password = false;
-      } else
-        tty_password = true;
-      break;
+      PARSE_COMMAND_LINE_PASSWORD_OPTION;
     case 's':
       option_silent++;
       break;
@@ -401,16 +380,16 @@
   char **commands, **temp_argv;
 
   MY_INIT(argv[0]);
-  mysql_init(&mysql);
   my_getopt_use_args_separator = true;
   MEM_ROOT alloc{PSI_NOT_INSTRUMENTED, 512};
-  if (load_defaults("my", load_default_groups, &argc, &argv, &alloc))
+  if (load_defaults("my", load_default_groups, &argc, &argv, &alloc)) {
+    my_end(my_end_arg);
     return EXIT_FAILURE;
+  }
   my_getopt_use_args_separator = false;
 
   if ((ho_error =
            handle_options(&argc, &argv, my_long_options, get_one_option))) {
-    mysql_close(&mysql);
     my_end(my_end_arg);
     return ho_error;
   }
@@ -420,6 +399,7 @@
 
   if (argc == 0) {
     usage();
+    my_end(my_end_arg);
     return EXIT_FAILURE;
   }
 
@@ -427,11 +407,11 @@
   temp_argc = argc;
 
   commands = temp_argv;
-  if (tty_password) opt_password = get_tty_password(NullS);
 
   (void)signal(SIGINT, endprog);  /* Here if abort */
   (void)signal(SIGTERM, endprog); /* Here if abort */
 
+  mysql_init(&mysql);
   if (opt_bind_addr) mysql_options(&mysql, MYSQL_OPT_BIND, opt_bind_addr);
   if (opt_compress) mysql_options(&mysql, MYSQL_OPT_COMPRESS, NullS);
   if (opt_connect_timeout) {
@@ -440,6 +420,8 @@
   }
   if (SSL_SET_OPTIONS(&mysql)) {
     fprintf(stderr, "%s", SSL_SET_OPTIONS_ERROR);
+    mysql_close(&mysql);
+    my_end(my_end_arg);
     return EXIT_FAILURE;
   }
   if (opt_protocol)
@@ -479,6 +461,8 @@
 
   set_server_public_key(&mysql);
   set_get_server_public_key_option(&mysql);
+
+  set_password_options(&mysql);
   if (sql_connect(&mysql, option_wait)) {
     /*
       We couldn't get an initial connection and will definitely exit.
@@ -563,7 +547,7 @@
   }            /* got connection */
 
   mysql_close(&mysql);
-  my_free(opt_password);
+  free_passwords();
   my_free(user);
 #if defined(_WIN32)
   my_free(shared_memory_base_name);
@@ -578,7 +562,7 @@
   return error ? EXIT_FAILURE : EXIT_SUCCESS;
 }
 
-void endprog(int signal_number MY_ATTRIBUTE((unused))) { interrupted = true; }
+void endprog(int signal_number [[maybe_unused]]) { interrupted = true; }
 
 /**
    @brief connect to server, optionally waiting for same to come up
@@ -596,7 +580,7 @@
   bool info = false;
 
   for (;;) {
-    if (mysql_real_connect(mysql, host, user, opt_password, NullS, tcp_port,
+    if (mysql_real_connect(mysql, host, user, nullptr, NullS, tcp_port,
                            unix_port, CLIENT_REMEMBER_OPTIONS)) {
       mysql->reconnect = true;
       if (info) {
@@ -1118,7 +1102,7 @@
 
       case ADMIN_START_SLAVE:
         CLIENT_WARN_DEPRECATED("start-slave", "start-replica");
-        // FALLTHROUGH
+        [[fallthrough]];
       case ADMIN_START_REPLICA:
         if (mysql_query(mysql, "START REPLICA")) {
           my_printf_error(0, "Error starting replication: %s", error_flags,
@@ -1130,7 +1114,7 @@
 
       case ADMIN_STOP_SLAVE:
         CLIENT_WARN_DEPRECATED("stop-slave", "stop-replica");
-        // FALLTHROUGH
+        [[fallthrough]];
       case ADMIN_STOP_REPLICA:
         if (mysql_query(mysql, "STOP REPLICA")) {
           my_printf_error(0, "Error stopping replication: %s", error_flags,
@@ -1327,7 +1311,7 @@
 
 /* 3.rd argument, uint row, is not in use. Don't remove! */
 static void print_row(MYSQL_RES *result, MYSQL_ROW cur,
-                      uint row MY_ATTRIBUTE((unused))) {
+                      uint row [[maybe_unused]]) {
   uint i, length;
   MYSQL_FIELD *field;
 
@@ -1357,7 +1341,7 @@
   last_values[row] = tmp;
 }
 
-static void print_relative_row_vert(MYSQL_RES *result MY_ATTRIBUTE((unused)),
+static void print_relative_row_vert(MYSQL_RES *result [[maybe_unused]],
                                     MYSQL_ROW cur, uint row) {
   uint length;
   ulonglong tmp;
diff -Nru mysql-8.0-8.0.26/client/mysqlbinlog.cc mysql-8.0-8.0.27/client/mysqlbinlog.cc
--- mysql-8.0-8.0.26/client/mysqlbinlog.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/client/mysqlbinlog.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1601,7 +1601,7 @@
           goto end;
         }
       }
-      // Fall through
+        [[fallthrough]];
       case binary_log::ROWS_QUERY_LOG_EVENT:
       case binary_log::WRITE_ROWS_EVENT:
       case binary_log::DELETE_ROWS_EVENT:
@@ -1754,7 +1754,7 @@
               "any case. If you want to exclude or include transactions, "
               "you should use the options --exclude-gtids or "
               "--include-gtids, respectively, instead.");
-        /* fall through */
+        [[fallthrough]];
       default:
         ev->print(result_file, print_event_info);
         if (head->error == -1) goto err;
@@ -2241,7 +2241,7 @@
     case OPT_READ_FROM_REMOTE_MASTER_DEPRECATED:
       warning(CLIENT_WARN_DEPRECATED_MSG("--read-from-remote-master",
                                          "--read-from-remote-source"));
-      /* FALLTHROUGH */
+      [[fallthrough]];
     case OPT_REMOTE_PROTO:
       opt_remote_proto = (enum_remote_proto)(
           find_type_or_exit(argument, &remote_proto_typelib, opt->name) - 1);
diff -Nru mysql-8.0-8.0.26/client/mysql.cc mysql-8.0-8.0.27/client/mysql.cc
--- mysql-8.0-8.0.26/client/mysql.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/client/mysql.cc	2021-09-28 11:46:34.000000000 +0000
@@ -53,6 +53,7 @@
 #include "my_loglevel.h"
 #include "my_macros.h"
 #include "typelib.h"
+#include "user_registration.h"
 #include "violite.h"
 
 #ifdef HAVE_SYS_IOCTL_H
@@ -90,9 +91,8 @@
 #include <algorithm>
 #include <new>
 
-#include "sql_common.h"
-
 #include "sql-common/net_ns.h"
+#include "sql_common.h"
 
 using std::max;
 using std::min;
@@ -158,12 +158,12 @@
             using_opt_local_infile = false, vertical = false,
             line_numbers = true, column_names = true, opt_html = false,
             opt_xml = false, opt_nopager = true, opt_outfile = false,
-            named_cmds = false, tty_password = false, opt_nobeep = false,
-            opt_reconnect = true, default_pager_set = false,
-            opt_sigint_ignore = false, auto_vertical_output = false,
-            show_warnings = false, executing_query = false,
-            interrupted_query = false, ignore_spaces = false,
-            sigint_received = false, opt_syslog = false, opt_binhex = false;
+            named_cmds = false, opt_nobeep = false, opt_reconnect = true,
+            default_pager_set = false, opt_sigint_ignore = false,
+            auto_vertical_output = false, show_warnings = false,
+            executing_query = false, interrupted_query = false,
+            ignore_spaces = false, sigint_received = false, opt_syslog = false,
+            opt_binhex = false;
 static bool opt_binary_as_hex_set_explicitly = false;
 static bool debug_info_flag, debug_check_flag;
 static bool column_types_flag;
@@ -183,7 +183,6 @@
 static char *dns_srv_name;
 static char *current_db;
 static char *current_user = nullptr;
-static char *opt_password = nullptr;
 static char *current_prompt = nullptr;
 static char *delimiter_str = nullptr;
 static char *opt_init_command = nullptr;
@@ -216,7 +215,7 @@
 static char default_pager[FN_REFLEN];
 static char pager[FN_REFLEN], outfile[FN_REFLEN];
 static FILE *PAGER, *OUTFILE;
-static MEM_ROOT hash_mem_root;
+static MEM_ROOT hash_mem_root(PSI_NOT_INSTRUMENTED, 16384);
 static uint prompt_counter;
 static char delimiter[16] = DEFAULT_DELIMITER;
 static size_t delimiter_length = 1;
@@ -230,7 +229,11 @@
 static uint opt_protocol = 0;
 static const CHARSET_INFO *charset_info = &my_charset_latin1;
 
+static char *opt_fido_register_factor = nullptr;
+static char *opt_oci_config_file = nullptr;
+
 #include "caching_sha2_passwordopt-vars.h"
+#include "multi_factor_passwordopt-vars.h"
 #include "sslopt-vars.h"
 
 const char *default_dbug_option = "d:t:o,/tmp/mysql.trace";
@@ -320,8 +323,7 @@
 
 static int read_and_execute(bool interactive);
 static bool init_connection_options(MYSQL *mysql);
-static int sql_connect(char *host, char *database, char *user, char *password,
-                       uint silent);
+static int sql_connect(char *host, char *database, char *user, uint silent);
 static const char *server_version_string(MYSQL *mysql);
 static int put_info(const char *str, INFO_TYPE info, uint error = 0,
                     const char *sql_state = nullptr);
@@ -1328,11 +1330,9 @@
   }
   glob_buffer.mem_realloc((status.batch) ? batch_io_size : 512);
   completion_hash_init(&ht, 128);
-  init_alloc_root(PSI_NOT_INSTRUMENTED, &hash_mem_root, 16384, 0);
   memset(&mysql, 0, sizeof(mysql));
   global_attrs = new client_query_attributes();
-  if (sql_connect(current_host, current_db, current_user, opt_password,
-                  opt_silent)) {
+  if (sql_connect(current_host, current_db, current_user, opt_silent)) {
     quick = true;  // Avoid history
     status.exit_status = 1;
     mysql_end(-1);
@@ -1437,6 +1437,7 @@
           "any more secure.",
           INFO_INFO);
   }
+
   status.exit_status = read_and_execute(!status.batch);
   if (opt_outfile) end_tee();
   mysql_end(0);
@@ -1465,7 +1466,7 @@
   }
   batch_readline_end(status.line_buff);
   completion_hash_free(&ht);
-  free_root(&hash_mem_root, MYF(0));
+  hash_mem_root.Clear();
 
   my_free(histfile);
   my_free(histfile_tmp);
@@ -1482,7 +1483,7 @@
   old_buffer.mem_free();
   processed_prompt.mem_free();
   my_free(server_version);
-  my_free(opt_password);
+  free_passwords();
   my_free(opt_mysql_unix_port);
   my_free(current_db);
   my_free(current_host);
@@ -1582,11 +1583,10 @@
   MYSQL *ret;
   if (dns_srv_name)
     ret = mysql_real_connect_dns_srv(kill_mysql, dns_srv_name, current_user,
-                                     opt_password, "", 0);
+                                     nullptr, "", 0);
   else
-    ret =
-        mysql_real_connect(kill_mysql, current_host, current_user, opt_password,
-                           "", opt_mysql_port, opt_mysql_unix_port, 0);
+    ret = mysql_real_connect(kill_mysql, current_host, current_user, nullptr,
+                             "", opt_mysql_port, opt_mysql_unix_port, 0);
   if (!ret) {
 #ifdef HAVE_SETNS
     if (opt_network_namespace) (void)restore_original_network_namespace();
@@ -1787,11 +1787,7 @@
      "This option is disabled by default.",
      nullptr, nullptr, nullptr, GET_STR, OPT_ARG, 0, 0, 0, nullptr, 0, nullptr},
 #endif
-    {"password", 'p',
-     "Password to use when connecting to server. If password is not given it's "
-     "asked from the tty.",
-     nullptr, nullptr, nullptr, GET_PASSWORD, OPT_ARG, 0, 0, 0, nullptr, 0,
-     nullptr},
+#include "multi_factor_passwordopt-longopts.h"
 #ifdef _WIN32
     {"pipe", 'W', "Use named pipes to connect to server.", 0, 0, 0, GET_NO_ARG,
      NO_ARG, 0, 0, 0, 0, 0, 0},
@@ -1944,7 +1940,16 @@
      "Directory path safe for LOAD DATA LOCAL INFILE to read from.",
      &opt_load_data_local_dir, &opt_load_data_local_dir, nullptr, GET_STR,
      REQUIRED_ARG, 0, 0, 0, nullptr, 0, nullptr},
-
+    {"fido-register-factor", 0,
+     "Specifies authentication factor, for which registration needs to be "
+     "done.",
+     &opt_fido_register_factor, &opt_fido_register_factor, nullptr, GET_STR,
+     REQUIRED_ARG, 0, 0, 0, nullptr, 0, nullptr},
+    {"oci-config-file", 0,
+     "Specifies the location of the OCI configuration file. Default for Linux "
+     "is ~/.oci/config and %HOME/.oci/config on Windows.",
+     &opt_oci_config_file, &opt_oci_config_file, nullptr, GET_STR, REQUIRED_ARG,
+     0, 0, 0, nullptr, 0, nullptr},
     {nullptr, 0, nullptr, nullptr, nullptr, nullptr, GET_NO_ARG, NO_ARG, 0, 0,
      0, nullptr, 0, nullptr}};
 
@@ -1959,8 +1964,7 @@
   my_print_variables(my_long_options);
 }
 
-bool get_one_option(int optid,
-                    const struct my_option *opt MY_ATTRIBUTE((unused)),
+bool get_one_option(int optid, const struct my_option *opt [[maybe_unused]],
                     char *argument) {
   switch (optid) {
     case OPT_CHARSETS_DIR:
@@ -2043,24 +2047,7 @@
       else
         one_database = skip_updates = true;
       break;
-    case 'p':
-      if (argument == disabled_my_option) {
-        // Don't require password
-        static char empty_password[] = {'\0'};
-        assert(empty_password[0] ==
-               '\0');  // Check that it has not been overwritten
-        argument = empty_password;
-      }
-      if (argument) {
-        char *start = argument;
-        my_free(opt_password);
-        opt_password = my_strdup(PSI_NOT_INSTRUMENTED, argument, MYF(MY_FAE));
-        while (*argument) *argument++ = 'x';  // Destroy argument
-        if (*start) start[1] = 0;
-        tty_password = false;
-      } else
-        tty_password = true;
-      break;
+      PARSE_COMMAND_LINE_PASSWORD_OPTION;
     case '#':
       DBUG_PUSH(argument ? argument : default_dbug_option);
       debug_info_flag = true;
@@ -2157,7 +2144,6 @@
     my_free(current_db);
     current_db = my_strdup(PSI_NOT_INSTRUMENTED, *argv, MYF(MY_WME));
   }
-  if (tty_password) opt_password = get_tty_password(NullS);
   if (debug_info_flag) my_end_arg = MY_CHECK_ERROR | MY_GIVE_INFO;
   if (debug_check_flag) my_end_arg = MY_CHECK_ERROR;
 
@@ -2202,8 +2188,8 @@
         line_length = status.line_buff->read_length;
 
         /*
-          ASCII 0x00 is not allowed appearing in queries if it is not in binary
-          mode.
+          ASCII 0x00 is not allowed appearing in queries if it is not in
+          binary mode.
         */
         if (!real_binary_mode && strlen(line) != line_length) {
           status.exit_status = 1;
@@ -2337,9 +2323,9 @@
 #endif
 
   /*
-    If the function is called by 'source' command, it will return to interactive
-    mode, so real_binary_mode should be false. Otherwise, it will exit the
-    program, it is safe to set real_binary_mode to false.
+    If the function is called by 'source' command, it will return to
+    interactive mode, so real_binary_mode should be false. Otherwise, it will
+    exit the program, it is safe to set real_binary_mode to false.
   */
   real_binary_mode = false;
   return status.exit_status;
@@ -2747,9 +2733,8 @@
   array of matches, or NULL if there aren't any.
 */
 
-static char **new_mysql_completion(const char *text,
-                                   int start MY_ATTRIBUTE((unused)),
-                                   int end MY_ATTRIBUTE((unused))) {
+static char **new_mysql_completion(const char *text, int start [[maybe_unused]],
+                                   int end [[maybe_unused]]) {
   if (!status.batch && !quick)
 #if defined(USE_NEW_EDITLINE_INTERFACE)
     return rl_completion_matches(text, new_command_generator);
@@ -2845,7 +2830,7 @@
   /* Free old used memory */
   if (field_names) field_names = nullptr;
   completion_hash_clean(&ht);
-  free_root(&hash_mem_root, MYF(0));
+  hash_mem_root.Clear();
 
   /* hash this file's known subset of SQL commands */
   while (cmd->name) {
@@ -3115,8 +3100,8 @@
   tee_fprintf(PAGER, "   %s\n", (*cur)[num_name]);
 }
 
-static int com_server_help(String *buffer MY_ATTRIBUTE((unused)),
-                           char *line MY_ATTRIBUTE((unused)), char *help_arg) {
+static int com_server_help(String *buffer [[maybe_unused]],
+                           char *line [[maybe_unused]], char *help_arg) {
   MYSQL_ROW cur;
   const char *server_cmd;
   char cmd_buf[100 + 1];
@@ -3182,7 +3167,8 @@
         tee_fprintf(PAGER, "You asked for help about help category: \"%s\"\n",
                     cur[0]);
         put_info(
-            "For more information, type 'help <item>', where <item> is one of "
+            "For more information, type 'help <item>', where <item> is one "
+            "of "
             "the following",
             INFO_INFO);
         num_name = 1;
@@ -3212,8 +3198,8 @@
   return error;
 }
 
-static int com_help(String *buffer MY_ATTRIBUTE((unused)),
-                    char *line MY_ATTRIBUTE((unused))) {
+static int com_help(String *buffer [[maybe_unused]],
+                    char *line [[maybe_unused]]) {
   int i, j;
   char *help_arg = strchr(line, ' '), buff[32], *end;
   if (help_arg) {
@@ -3253,14 +3239,14 @@
 }
 
 /* ARGSUSED */
-static int com_clear(String *buffer, char *line MY_ATTRIBUTE((unused))) {
+static int com_clear(String *buffer, char *line [[maybe_unused]]) {
   if (status.add_to_history) fix_line(buffer);
   buffer->length(0);
   return 0;
 }
 
 /* ARGSUSED */
-static int com_charset(String *buffer MY_ATTRIBUTE((unused)), char *line) {
+static int com_charset(String *buffer [[maybe_unused]], char *line) {
   char buff[256], *param;
   const CHARSET_INFO *new_cs;
   strmake(buff, line, sizeof(buff) - 1);
@@ -3287,7 +3273,7 @@
           1  if fatal error
 */
 
-static int com_go(String *buffer, char *line MY_ATTRIBUTE((unused))) {
+static int com_go(String *buffer, char *line [[maybe_unused]]) {
   char buff[200];             /* about 110 chars used so far */
   char time_buff[52 + 3 + 1]; /* time max + space&parens + NUL */
   MYSQL_RES *result;
@@ -3560,7 +3546,7 @@
   const char *ptr = str, *end = ptr + len;
   ulong i;
 
-  if (len > 0) {
+  if (str != nullptr) {
     fprintf(output_file, "0x");
     for (; ptr < end; ptr++)
       fprintf(output_file, "%02X",
@@ -3646,12 +3632,13 @@
       field_max_length = field->max_length;
 
       /*
-       How many text cells on the screen will this string span?  If it contains
-       multibyte characters, then the number of characters we occupy on screen
-       will be fewer than the number of bytes we occupy in memory.
+       How many text cells on the screen will this string span?  If it
+       contains multibyte characters, then the number of characters we occupy
+       on screen will be fewer than the number of bytes we occupy in memory.
 
        We need to find how much screen real-estate we will occupy to know how
-       many extra padding-characters we should send with the printing function.
+       many extra padding-characters we should send with the printing
+       function.
       */
       visible_length = charset_info->cset->numcells(charset_info, buffer,
                                                     buffer + data_length);
@@ -3674,8 +3661,8 @@
     }
     (void)tee_fputs("\n", PAGER);
 
-    // Check interrupted_query last; this ensures that we get at least one row.
-    // This is useful for aborted EXPLAIN ANALYZE queries.
+    // Check interrupted_query last; this ensures that we get at least one
+    // row. This is useful for aborted EXPLAIN ANALYZE queries.
     if (interrupted_query) break;
   }
   tee_puts(separator.ptr(), PAGER);
@@ -3966,8 +3953,8 @@
   }
 }
 
-static int com_tee(String *buffer MY_ATTRIBUTE((unused)),
-                   char *line MY_ATTRIBUTE((unused))) {
+static int com_tee(String *buffer [[maybe_unused]],
+                   char *line [[maybe_unused]]) {
   char file_name[FN_REFLEN], *end, *param;
 
   while (my_isspace(charset_info, *line)) line++;
@@ -3999,8 +3986,8 @@
   return 0;
 }
 
-static int com_notee(String *buffer MY_ATTRIBUTE((unused)),
-                     char *line MY_ATTRIBUTE((unused))) {
+static int com_notee(String *buffer [[maybe_unused]],
+                     char *line [[maybe_unused]]) {
   if (opt_outfile) end_tee();
   tee_fprintf(stdout, "Outfile disabled.\n");
   return 0;
@@ -4011,8 +3998,8 @@
 */
 
 #ifdef USE_POPEN
-static int com_pager(String *buffer MY_ATTRIBUTE((unused)),
-                     char *line MY_ATTRIBUTE((unused))) {
+static int com_pager(String *buffer [[maybe_unused]],
+                     char *line [[maybe_unused]]) {
   char pager_name[FN_REFLEN], *end, *param;
 
   if (status.batch) return 0;
@@ -4046,8 +4033,8 @@
   return 0;
 }
 
-static int com_nopager(String *buffer MY_ATTRIBUTE((unused)),
-                       char *line MY_ATTRIBUTE((unused))) {
+static int com_nopager(String *buffer [[maybe_unused]],
+                       char *line [[maybe_unused]]) {
   my_stpcpy(pager, "stdout");
   opt_nopager = true;
   PAGER = stdout;
@@ -4061,7 +4048,7 @@
 */
 
 #ifdef USE_POPEN
-static int com_edit(String *buffer, char *line MY_ATTRIBUTE((unused))) {
+static int com_edit(String *buffer, char *line [[maybe_unused]]) {
   char filename[FN_REFLEN], buff[160];
   int fd, tmp;
   const char *editor;
@@ -4099,22 +4086,22 @@
 
 /* If arg is given, exit without errors. This happens on command 'quit' */
 
-static int com_quit(String *buffer MY_ATTRIBUTE((unused)),
-                    char *line MY_ATTRIBUTE((unused))) {
+static int com_quit(String *buffer [[maybe_unused]],
+                    char *line [[maybe_unused]]) {
   status.exit_status = 0;
   return 1;
 }
 
-static int com_rehash(String *buffer MY_ATTRIBUTE((unused)),
-                      char *line MY_ATTRIBUTE((unused))) {
+static int com_rehash(String *buffer [[maybe_unused]],
+                      char *line [[maybe_unused]]) {
 #ifdef HAVE_READLINE
   build_completion_hash(true, false);
 #endif
   return 0;
 }
 
-static int com_shell(String *buffer MY_ATTRIBUTE((unused)),
-                     char *line MY_ATTRIBUTE((unused))) {
+static int com_shell(String *buffer [[maybe_unused]],
+                     char *line [[maybe_unused]]) {
   char *shell_cmd;
 
   /* Skip space from line begin */
@@ -4134,7 +4121,7 @@
   return 0;
 }
 
-static int com_print(String *buffer, char *line MY_ATTRIBUTE((unused))) {
+static int com_print(String *buffer, char *line [[maybe_unused]]) {
   tee_puts("--------------", stdout);
   (void)tee_fputs(buffer->c_ptr(), stdout);
   if (!buffer->length() || (*buffer)[buffer->length() - 1] != '\n')
@@ -4177,7 +4164,7 @@
     buffer->length(0);  // command used
   } else
     opt_rehash = false;
-  error = sql_connect(current_host, current_db, current_user, opt_password, 0);
+  error = sql_connect(current_host, current_db, current_user, 0);
   opt_rehash = save_rehash;
 
   if (connected) {
@@ -4190,7 +4177,7 @@
   return error;
 }
 
-static int com_source(String *buffer MY_ATTRIBUTE((unused)), char *line) {
+static int com_source(String *buffer [[maybe_unused]], char *line) {
   char source_name[FN_REFLEN], *end, *param;
   LINE_BUFFER *line_buff;
   int error;
@@ -4236,7 +4223,7 @@
 }
 
 /* ARGSUSED */
-static int com_delimiter(String *buffer MY_ATTRIBUTE((unused)), char *line) {
+static int com_delimiter(String *buffer [[maybe_unused]], char *line) {
   char buff[256], *tmp;
 
   strmake(buff, line, sizeof(buff) - 1);
@@ -4259,7 +4246,7 @@
 }
 
 /* ARGSUSED */
-static int com_use(String *buffer MY_ATTRIBUTE((unused)), char *line) {
+static int com_use(String *buffer [[maybe_unused]], char *line) {
   char *tmp, buff[FN_REFLEN + 1];
   int select_db;
   uint warnings;
@@ -4386,22 +4373,21 @@
   return 0;
 }
 
-static int com_warnings(String *buffer MY_ATTRIBUTE((unused)),
-                        char *line MY_ATTRIBUTE((unused))) {
+static int com_warnings(String *buffer [[maybe_unused]],
+                        char *line [[maybe_unused]]) {
   show_warnings = true;
   put_info("Show warnings enabled.", INFO_INFO);
   return 0;
 }
 
-static int com_nowarnings(String *buffer MY_ATTRIBUTE((unused)),
-                          char *line MY_ATTRIBUTE((unused))) {
+static int com_nowarnings(String *buffer [[maybe_unused]],
+                          char *line [[maybe_unused]]) {
   show_warnings = false;
   put_info("Show warnings disabled.", INFO_INFO);
   return 0;
 }
 
-static int com_query_attributes(String *buffer MY_ATTRIBUTE((unused)),
-                                char *line) {
+static int com_query_attributes(String *buffer [[maybe_unused]], char *line) {
   char buff[1024], *param, name[1024];
   memset(buff, 0, sizeof(buff));
   strmake(buff, line, sizeof(buff) - 1);
@@ -4490,8 +4476,8 @@
   return quote_count;
 }
 
-static int sql_real_connect(char *host, char *database, char *user,
-                            char *password, uint silent) {
+static int sql_real_connect(char *host, char *database, char *user, char *,
+                            uint silent) {
   if (connected) {
     connected = false;
 #ifdef HAVE_SETNS
@@ -4539,11 +4525,11 @@
 #endif
   MYSQL *ret;
   if (dns_srv_name)
-    ret = mysql_real_connect_dns_srv(&mysql, dns_srv_name, user, password,
+    ret = mysql_real_connect_dns_srv(&mysql, dns_srv_name, user, nullptr,
                                      database,
                                      connect_flag | CLIENT_MULTI_STATEMENTS);
   else
-    ret = mysql_real_connect(&mysql, host, user, password, database,
+    ret = mysql_real_connect(&mysql, host, user, nullptr, database,
                              opt_mysql_port, opt_mysql_unix_port,
                              connect_flag | CLIENT_MULTI_STATEMENTS);
   if (!ret) {
@@ -4565,6 +4551,15 @@
     return -1;  // Retryable
   }
 
+  /* do user registration */
+  if (opt_fido_register_factor) {
+    char errmsg[FN_REFLEN];
+    if (user_device_registration(&mysql, opt_fido_register_factor, errmsg)) {
+      put_info(errmsg, INFO_ERROR);
+      return 1;
+    }
+  }
+
 #ifdef HAVE_SETNS
   if (opt_network_namespace && restore_original_network_namespace()) {
     if (!silent) {
@@ -4696,16 +4691,33 @@
 
   mysql_options(mysql, MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS, &handle_expired);
 
+  set_password_options(mysql);
+
+  if (opt_oci_config_file != nullptr) {
+    /* set OCI config file option if required */
+    struct st_mysql_client_plugin *oci_iam_plugin = mysql_client_find_plugin(
+        mysql, "authentication_oci_client", MYSQL_CLIENT_AUTHENTICATION_PLUGIN);
+    if (!oci_iam_plugin) {
+      put_info("Cannot load the authentication_oci_client plugin.", INFO_ERROR);
+      return 1;
+    }
+    if (mysql_plugin_options(oci_iam_plugin, "oci-config-file",
+                             opt_oci_config_file)) {
+      put_info(
+          "Failed to set config file for authentication_oci_client plugin.",
+          INFO_ERROR);
+      return 1;
+    }
+  }
   return false;
 }
 
-static int sql_connect(char *host, char *database, char *user, char *password,
-                       uint silent) {
+static int sql_connect(char *host, char *database, char *user, uint silent) {
   bool message = false;
   uint count = 0;
   int error;
   for (;;) {
-    if ((error = sql_real_connect(host, database, user, password, wait_flag)) >=
+    if ((error = sql_real_connect(host, database, user, nullptr, wait_flag)) >=
         0) {
       if (count) {
         tee_fputs("\n", stderr);
@@ -4728,8 +4740,8 @@
   }
 }
 
-static int com_status(String *buffer MY_ATTRIBUTE((unused)),
-                      char *line MY_ATTRIBUTE((unused))) {
+static int com_status(String *buffer [[maybe_unused]],
+                      char *line [[maybe_unused]]) {
   const char *status_str;
   char buff[40];
   ulonglong id;
@@ -5317,7 +5329,7 @@
   return;
 }
 
-static int com_prompt(String *buffer MY_ATTRIBUTE((unused)), char *line) {
+static int com_prompt(String *buffer [[maybe_unused]], char *line) {
   char *ptr = strchr(line, ' ');
   prompt_counter = 0;
   my_free(current_prompt);
@@ -5330,8 +5342,8 @@
   return 0;
 }
 
-static int com_resetconnection(String *buffer MY_ATTRIBUTE((unused)),
-                               char *line MY_ATTRIBUTE((unused))) {
+static int com_resetconnection(String *buffer [[maybe_unused]],
+                               char *line [[maybe_unused]]) {
   int error;
   global_attrs->clear(connected ? &mysql : nullptr);
   error = mysql_reset_connection(&mysql);
diff -Nru mysql-8.0-8.0.26/client/mysql_config_editor.cc mysql-8.0-8.0.27/client/mysql_config_editor.cc
--- mysql-8.0-8.0.26/client/mysql_config_editor.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/client/mysql_config_editor.cc	2021-09-28 11:46:34.000000000 +0000
@@ -237,9 +237,10 @@
      0, nullptr, 0, nullptr}};
 
 extern "C" {
-static bool my_program_get_one_option(
-    int optid, const struct my_option *opt MY_ATTRIBUTE((unused)),
-    char *argument MY_ATTRIBUTE((unused))) {
+static bool my_program_get_one_option(int optid,
+                                      const struct my_option *opt
+                                      [[maybe_unused]],
+                                      char *argument [[maybe_unused]]) {
   switch (optid) {
     case '#':
       DBUG_PUSH(argument ? argument : "d:t:o,/tmp/mysql_config_editor.trace");
diff -Nru mysql-8.0-8.0.26/client/mysqldump.cc mysql-8.0-8.0.27/client/mysqldump.cc
--- mysql-8.0-8.0.26/client/mysqldump.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/client/mysqldump.cc	2021-09-28 11:46:34.000000000 +0000
@@ -110,9 +110,8 @@
             opt_lock_all_tables = false, opt_set_charset = false,
             opt_dump_date = true, opt_autocommit = false,
             opt_disable_keys = true, opt_xml = false,
-            opt_delete_master_logs = false, tty_password = false,
-            opt_single_transaction = false, opt_comments = false,
-            opt_compact = false, opt_hex_blob = false,
+            opt_delete_master_logs = false, opt_single_transaction = false,
+            opt_comments = false, opt_compact = false, opt_hex_blob = false,
             opt_order_by_primary = false, opt_ignore = false,
             opt_complete_insert = false, opt_drop_database = false,
             opt_replace_into = false, opt_dump_triggers = false,
@@ -128,8 +127,7 @@
 static ulong opt_max_allowed_packet, opt_net_buffer_length;
 static MYSQL mysql_connection, *mysql = nullptr;
 static DYNAMIC_STRING insert_pat;
-static char *opt_password = nullptr, *current_user = nullptr,
-            *current_host = nullptr, *path = nullptr,
+static char *current_user = nullptr, *current_host = nullptr, *path = nullptr,
             *fields_terminated = nullptr, *lines_terminated = nullptr,
             *enclosed = nullptr, *opt_enclosed = nullptr, *escaped = nullptr,
             *where = nullptr, *opt_compatible_mode_str = nullptr,
@@ -160,6 +158,7 @@
 static char *opt_bind_addr = nullptr;
 static int first_error = 0;
 #include "caching_sha2_passwordopt-vars.h"
+#include "multi_factor_passwordopt-vars.h"
 #include "sslopt-vars.h"
 
 FILE *md_result_file = nullptr;
@@ -501,11 +500,7 @@
      "InnoDB table, but will make the dump itself take considerably longer.",
      &opt_order_by_primary, &opt_order_by_primary, nullptr, GET_BOOL, NO_ARG, 0,
      0, 0, nullptr, 0, nullptr},
-    {"password", 'p',
-     "Password to use when connecting to server. If password is not given it's "
-     "solicited on the tty.",
-     nullptr, nullptr, nullptr, GET_PASSWORD, OPT_ARG, 0, 0, 0, nullptr, 0,
-     nullptr},
+#include "multi_factor_passwordopt-longopts.h"
 #ifdef _WIN32
     {"pipe", 'W', "Use named pipes to connect to server.", 0, 0, 0, GET_NO_ARG,
      NO_ARG, 0, 0, 0, 0, 0, 0},
@@ -850,24 +845,7 @@
 static bool get_one_option(int optid, const struct my_option *opt,
                            char *argument) {
   switch (optid) {
-    case 'p':
-      if (argument == disabled_my_option) {
-        // Don't require password
-        static char empty_password[] = {'\0'};
-        assert(empty_password[0] ==
-               '\0');  // Check that it has not been overwritten
-        argument = empty_password;
-      }
-      if (argument) {
-        char *start = argument;
-        my_free(opt_password);
-        opt_password = my_strdup(PSI_NOT_INSTRUMENTED, argument, MYF(MY_FAE));
-        while (*argument) *argument++ = 'x'; /* Destroy argument */
-        if (*start) start[1] = 0;            /* Cut length of argument */
-        tty_password = false;
-      } else
-        tty_password = true;
-      break;
+    PARSE_COMMAND_LINE_PASSWORD_OPTION;
     case 'r':
       if (!(md_result_file =
                 my_fopen(argument, O_WRONLY | MY_FOPEN_BINARY, MYF(MY_WME))))
@@ -918,7 +896,7 @@
       exit(0);
     case (int)OPT_MASTER_DATA_DEPRECATED:
       CLIENT_WARN_DEPRECATED("--master-data", "--source-data");
-      // FALLTHROUGH
+      [[fallthrough]];
     case (int)OPT_SOURCE_DATA:
       if (!argument) /* work like in old versions */
         opt_master_data = MYSQL_OPT_SOURCE_DATA_EFFECTIVE_SQL;
@@ -932,7 +910,7 @@
       break;
     case (int)OPT_MYSQLDUMP_SLAVE_DATA_DEPRECATED:
       CLIENT_WARN_DEPRECATED("--dump-slave", "--dump-replica");
-      // FALLTHROUGH
+      [[fallthrough]];
     case (int)OPT_MYSQLDUMP_REPLICA_DATA:
       if (!argument) /* work like in old versions */
         opt_slave_data = MYSQL_OPT_SLAVE_DATA_EFFECTIVE_SQL;
@@ -1096,7 +1074,6 @@
     short_usage();
     return EX_USAGE;
   }
-  if (tty_password) opt_password = get_tty_password(NullS);
   return (0);
 } /* get_options */
 
@@ -1477,7 +1454,7 @@
 static void free_resources() {
   if (md_result_file && md_result_file != stdout)
     my_fclose(md_result_file, MYF(0));
-  my_free(opt_password);
+  free_passwords();
   if (ignore_table != nullptr) {
     delete ignore_table;
     ignore_table = nullptr;
@@ -1561,7 +1538,7 @@
   db_connect -- connects to the host and selects DB.
 */
 
-static int connect_to_db(char *host, char *user, char *passwd) {
+static int connect_to_db(char *host, char *user) {
   char buff[20 + FN_REFLEN];
   DBUG_TRACE;
 
@@ -1598,6 +1575,7 @@
                  "mysqldump");
   set_server_public_key(&mysql_connection);
   set_get_server_public_key_option(&mysql_connection);
+  set_password_options(&mysql_connection);
 
   if (opt_compress_algorithm)
     mysql_options(&mysql_connection, MYSQL_OPT_COMPRESSION_ALGORITHMS,
@@ -1618,7 +1596,7 @@
   }
 
   if (!(mysql =
-            mysql_real_connect(&mysql_connection, host, user, passwd, nullptr,
+            mysql_real_connect(&mysql_connection, host, user, nullptr, nullptr,
                                opt_mysql_port, opt_mysql_unix_port, 0))) {
     DB_error(&mysql_connection, "when trying to connect");
     return 1;
@@ -1695,6 +1673,7 @@
           mysql, nullptr,
           "/*!80018 SET SESSION show_create_table_skip_secondary_engine=1 */"))
     return 1;
+
   return 0;
 } /* connect_to_db */
 
@@ -1837,7 +1816,7 @@
           fputs("_", xml_file);
           break;
         }
-        /* fall through */
+        [[fallthrough]];
       default:
         fputc(*str, xml_file);
         break;
@@ -1963,7 +1942,7 @@
           str += 2;
           continue;
         }
-        /* fall through */
+        [[fallthrough]];
       default:
         fputc(*str, xml_file);
         break;
@@ -2059,7 +2038,7 @@
       case '-':
         if (*(comment_string + 1) == '-') /* Only one hyphen allowed. */
           break;
-        // Fall through.
+        [[fallthrough]];
       default:
         fputc(*comment_string, xml_file);
         break;
@@ -4493,7 +4472,7 @@
   0        Success.
   1        Failure.
 */
-int init_dumping_views(char *qdatabase MY_ATTRIBUTE((unused))) {
+int init_dumping_views(char *qdatabase [[maybe_unused]]) {
   return 0;
 } /* init_dumping_views */
 
@@ -4840,7 +4819,7 @@
 static int dump_selected_tables(char *db, char **table_names, int tables) {
   char table_buff[NAME_LEN * 2 + 3];
   DYNAMIC_STRING lock_tables_query;
-  MEM_ROOT root;
+  MEM_ROOT root(PSI_NOT_INSTRUMENTED, 8192);
   char **dump_tables, **pos, **end;
   DBUG_TRACE;
 
@@ -4849,7 +4828,6 @@
 
   if (init_dumping(db, init_dumping_tables)) return 1;
 
-  init_alloc_root(PSI_NOT_INSTRUMENTED, &root, 8192, 0);
   if (!(dump_tables = pos = (char **)root.Alloc(tables * sizeof(char *))))
     die(EX_EOM, "alloc_root failure.");
 
@@ -4867,7 +4845,7 @@
     } else {
       if (!opt_force) {
         dynstr_free(&lock_tables_query);
-        free_root(&root, MYF(0));
+        root.Clear();
       }
       maybe_die(EX_ILLEGAL_TABLE, "Couldn't find table: \"%s\"", *table_names);
       /* We shall continue here, if --force was given */
@@ -4885,7 +4863,7 @@
                          (ulong)(lock_tables_query.length - 1))) {
       if (!opt_force) {
         dynstr_free(&lock_tables_query);
-        free_root(&root, MYF(0));
+        root.Clear();
       }
       DB_error(mysql, "when doing LOCK TABLES");
       /* We shall continue here, if --force was given */
@@ -4894,7 +4872,7 @@
   dynstr_free(&lock_tables_query);
   if (flush_logs) {
     if (mysql_refresh(mysql, REFRESH_LOG)) {
-      if (!opt_force) free_root(&root, MYF(0));
+      if (!opt_force) root.Clear();
       DB_error(mysql, "when doing refresh");
     }
     /* We shall continue here, if --force was given */
@@ -4964,7 +4942,7 @@
     DBUG_PRINT("info", ("Dumping routines for database %s", db));
     dump_routines_for_db(db);
   }
-  free_root(&root, MYF(0));
+  root.Clear();
   if (opt_xml) {
     fputs("</database>\n", md_result_file);
     check_io(md_result_file);
@@ -5847,7 +5825,7 @@
     }
   }
 
-  if (connect_to_db(current_host, current_user, opt_password)) {
+  if (connect_to_db(current_host, current_user)) {
     free_resources();
     exit(EX_MYSQLERR);
   }
diff -Nru mysql-8.0-8.0.26/client/mysqlimport.cc mysql-8.0-8.0.27/client/mysqlimport.cc
--- mysql-8.0-8.0.26/client/mysqlimport.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/client/mysqlimport.cc	2021-09-28 11:46:34.000000000 +0000
@@ -63,15 +63,13 @@
 
 static bool verbose = false, lock_tables = false, ignore_errors = false,
             opt_delete = false, replace = false, silent = false, ignore = false,
-            opt_compress = false, opt_low_priority = false,
-            tty_password = false;
+            opt_compress = false, opt_low_priority = false;
 static bool debug_info_flag = false, debug_check_flag = false;
 static uint opt_use_threads = 0, opt_local_file = 0, my_end_arg = 0;
-static char *opt_password = nullptr, *current_user = nullptr,
-            *current_host = nullptr, *current_db = nullptr,
-            *fields_terminated = nullptr, *lines_terminated = nullptr,
-            *enclosed = nullptr, *opt_enclosed = nullptr, *escaped = nullptr,
-            *opt_columns = nullptr;
+static char *current_user = nullptr, *current_host = nullptr,
+            *current_db = nullptr, *fields_terminated = nullptr,
+            *lines_terminated = nullptr, *enclosed = nullptr,
+            *opt_enclosed = nullptr, *escaped = nullptr, *opt_columns = nullptr;
 static const char *default_charset = MYSQL_AUTODETECT_CHARSET_NAME;
 static uint opt_enable_cleartext_plugin = 0;
 static bool using_opt_enable_cleartext_plugin = false;
@@ -84,8 +82,8 @@
 static char *opt_compress_algorithm = nullptr;
 
 #include "caching_sha2_passwordopt-vars.h"
+#include "multi_factor_passwordopt-vars.h"
 #include "sslopt-vars.h"
-
 #if defined(_WIN32)
 static char *shared_memory_base_name = 0;
 #endif
@@ -178,11 +176,7 @@
      "Use LOW_PRIORITY when updating the table.", &opt_low_priority,
      &opt_low_priority, nullptr, GET_BOOL, NO_ARG, 0, 0, 0, nullptr, 0,
      nullptr},
-    {"password", 'p',
-     "Password to use when connecting to server. If password is not given it's "
-     "asked from the tty.",
-     nullptr, nullptr, nullptr, GET_PASSWORD, OPT_ARG, 0, 0, 0, nullptr, 0,
-     nullptr},
+#include "multi_factor_passwordopt-longopts.h"
 #ifdef _WIN32
     {"pipe", 'W', "Use named pipes to connect to server.", 0, 0, 0, GET_NO_ARG,
      NO_ARG, 0, 0, 0, 0, 0, 0},
@@ -268,24 +262,7 @@
 static bool get_one_option(int optid, const struct my_option *opt,
                            char *argument) {
   switch (optid) {
-    case 'p':
-      if (argument == disabled_my_option) {
-        // Don't require password
-        static char empty_password[] = {'\0'};
-        assert(empty_password[0] ==
-               '\0');  // Check that it has not been overwritten
-        argument = empty_password;
-      }
-      if (argument) {
-        char *start = argument;
-        my_free(opt_password);
-        opt_password = my_strdup(PSI_NOT_INSTRUMENTED, argument, MYF(MY_FAE));
-        while (*argument) *argument++ = 'x'; /* Destroy argument */
-        if (*start) start[1] = 0;            /* Cut length of argument */
-        tty_password = false;
-      } else
-        tty_password = true;
-      break;
+    PARSE_COMMAND_LINE_PASSWORD_OPTION;
 #ifdef _WIN32
     case 'W':
       opt_protocol = MYSQL_PROTOCOL_PIPE;
@@ -343,7 +320,6 @@
   }
   current_db = *((*argv)++);
   (*argc)--;
-  if (tty_password) opt_password = get_tty_password(NullS);
   return (0);
 }
 
@@ -437,7 +413,7 @@
   return 0;
 }
 
-static MYSQL *db_connect(char *host, char *database, char *user, char *passwd) {
+static MYSQL *db_connect(char *host, char *database, char *user, char *) {
   MYSQL *mysql;
   if (verbose) fprintf(stdout, "Connecting to %s\n", host ? host : "localhost");
   if (opt_use_threads && !lock_tables) {
@@ -487,7 +463,9 @@
                  "mysqlimport");
   set_server_public_key(mysql);
   set_get_server_public_key_option(mysql);
-  if (!(mysql_real_connect(mysql, host, user, passwd, database, opt_mysql_port,
+
+  set_password_options(mysql);
+  if (!(mysql_real_connect(mysql, host, user, nullptr, database, opt_mysql_port,
                            opt_mysql_unix_port, 0))) {
     ignore_errors = false; /* NO RETURN FROM db_error */
     db_error(mysql);
@@ -580,8 +558,8 @@
 
   if (mysql_thread_init()) goto error;
 
-  if (!(mysql =
-            db_connect(current_host, current_db, current_user, opt_password))) {
+  if (!(mysql = db_connect(current_host, current_db, current_user,
+                           opt_password[0]))) {
     goto error;
   }
 
@@ -699,7 +677,7 @@
     my_free(worker_threads);
   } else {
     if (!(mysql = db_connect(current_host, current_db, current_user,
-                             opt_password))) {
+                             opt_password[0]))) {
       exitcode = 1;
       goto end;
     }
@@ -724,7 +702,7 @@
   }
 end:
   db_disconnect(current_host, mysql);
-  my_free(opt_password);
+  free_passwords();
 #if defined(_WIN32)
   my_free(shared_memory_base_name);
 #endif
diff -Nru mysql-8.0-8.0.26/client/mysql_secure_installation.cc mysql-8.0-8.0.27/client/mysql_secure_installation.cc
--- mysql-8.0-8.0.26/client/mysql_secure_installation.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/client/mysql_secure_installation.cc	2021-09-28 11:46:34.000000000 +0000
@@ -131,9 +131,10 @@
 }
 
 extern "C" {
-static bool my_arguments_get_one_option(
-    int optid, const struct my_option *opt MY_ATTRIBUTE((unused)),
-    char *argument) {
+static bool my_arguments_get_one_option(int optid,
+                                        const struct my_option *opt
+                                        [[maybe_unused]],
+                                        char *argument) {
   switch (optid) {
     case '?':
       usage();
diff -Nru mysql-8.0-8.0.26/client/mysqlshow.cc mysql-8.0-8.0.27/client/mysqlshow.cc
--- mysql-8.0-8.0.26/client/mysqlshow.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/client/mysqlshow.cc	2021-09-28 11:46:34.000000000 +0000
@@ -49,10 +49,10 @@
 #include "typelib.h"
 #include "welcome_copyright_notice.h" /* ORACLE_WELCOME_COPYRIGHT_NOTICE */
 
-static char *host = nullptr, *opt_password = nullptr, *user = nullptr;
+static char *host = nullptr, *user = nullptr;
 static bool opt_show_keys = false, opt_compress = false, opt_count = false,
             opt_status = false;
-static bool tty_password = false, opt_table_type = false;
+static bool opt_table_type = false;
 static bool debug_info_flag = false, debug_check_flag = false;
 static uint my_end_arg = 0;
 static uint opt_verbose = 0;
@@ -64,6 +64,8 @@
 static uint opt_zstd_compress_level = default_zstd_compression_level;
 static char *opt_compress_algorithm = nullptr;
 
+#include "multi_factor_passwordopt-vars.h"
+
 #if defined(_WIN32)
 static char *shared_memory_base_name = 0;
 #endif
@@ -174,7 +176,8 @@
                  "mysqlshow");
   set_server_public_key(&mysql);
   set_get_server_public_key_option(&mysql);
-  if (!(mysql_real_connect(&mysql, host, user, opt_password,
+  set_password_options(&mysql);
+  if (!(mysql_real_connect(&mysql, host, user, nullptr,
                            (first_argument_uses_wildcards) ? "" : argv[0],
                            opt_mysql_port, opt_mysql_unix_port, 0))) {
     fprintf(stderr, "%s: %s\n", my_progname, mysql_error(&mysql));
@@ -200,7 +203,7 @@
       break;
   }
   mysql_close(&mysql); /* Close & free connection */
-  my_free(opt_password);
+  free_passwords();
 #if defined(_WIN32)
   my_free(shared_memory_base_name);
 #endif
@@ -252,12 +255,7 @@
      nullptr},
     {"keys", 'k', "Show keys for table.", &opt_show_keys, &opt_show_keys,
      nullptr, GET_BOOL, NO_ARG, 0, 0, 0, nullptr, 0, nullptr},
-    {"password", 'p',
-     "Password to use when connecting to server. If password is not given, "
-     "it's "
-     "solicited on the tty.",
-     nullptr, nullptr, nullptr, GET_PASSWORD, OPT_ARG, 0, 0, 0, nullptr, 0,
-     nullptr},
+#include "multi_factor_passwordopt-longopts.h"
     {"plugin_dir", OPT_PLUGIN_DIR, "Directory for client-side plugins.",
      &opt_plugin_dir, &opt_plugin_dir, nullptr, GET_STR, REQUIRED_ARG, 0, 0, 0,
      nullptr, 0, nullptr},
@@ -341,24 +339,7 @@
     case 'v':
       opt_verbose++;
       break;
-    case 'p':
-      if (argument == disabled_my_option) {
-        // Don't require password
-        static char empty_password[] = {'\0'};
-        assert(empty_password[0] ==
-               '\0');  // Check that it has not been overwritten
-        argument = empty_password;
-      }
-      if (argument) {
-        char *start = argument;
-        my_free(opt_password);
-        opt_password = my_strdup(PSI_NOT_INSTRUMENTED, argument, MYF(MY_FAE));
-        while (*argument) *argument++ = 'x'; /* Destroy argument */
-        if (*start) start[1] = 0;            /* Cut length of argument */
-        tty_password = false;
-      } else
-        tty_password = true;
-      break;
+      PARSE_COMMAND_LINE_PASSWORD_OPTION;
     case 'W':
 #ifdef _WIN32
       opt_protocol = MYSQL_PROTOCOL_PIPE;
@@ -395,7 +376,6 @@
   if ((ho_error = handle_options(argc, argv, my_long_options, get_one_option)))
     exit(ho_error);
 
-  if (tty_password) opt_password = get_tty_password(NullS);
   if (opt_count) {
     /*
       We need to set verbose to 2 as we need to change the output to include
diff -Nru mysql-8.0-8.0.26/client/mysqlslap.cc mysql-8.0-8.0.27/client/mysqlslap.cc
--- mysql-8.0-8.0.26/client/mysqlslap.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/client/mysqlslap.cc	2021-09-28 11:46:34.000000000 +0000
@@ -141,8 +141,7 @@
 char **primary_keys;
 unsigned long long primary_keys_number_of;
 
-static char *host = nullptr, *opt_password = nullptr,
-            *user_supplied_query = nullptr,
+static char *host = nullptr, *user_supplied_query = nullptr,
             *user_supplied_pre_statements = nullptr,
             *user_supplied_post_statements = nullptr, *default_engine = nullptr,
             *pre_system = nullptr, *post_system = nullptr,
@@ -159,7 +158,7 @@
 static bool opt_preserve = true, opt_no_drop = false;
 static bool debug_info_flag = false, debug_check_flag = false;
 static bool opt_only_print = false;
-static bool opt_compress = false, tty_password = false, opt_silent = false,
+static bool opt_compress = false, opt_silent = false,
             auto_generate_sql_autoincrement = false,
             auto_generate_sql_guid_primary = false, auto_generate_sql = false;
 const char *auto_generate_sql_type = "mixed";
@@ -202,6 +201,8 @@
 
 static uint opt_protocol = 0;
 
+#include "multi_factor_passwordopt-vars.h"
+
 static int get_options(int *argc, char ***argv);
 static uint opt_mysql_port = 0;
 
@@ -379,8 +380,9 @@
                   (char *)&opt_enable_cleartext_plugin);
   set_server_public_key(&mysql);
   set_get_server_public_key_option(&mysql);
+  set_password_options(&mysql);
   if (!opt_only_print) {
-    if (!(mysql_real_connect(&mysql, host, user, opt_password, nullptr,
+    if (!(mysql_real_connect(&mysql, host, user, nullptr, nullptr,
                              opt_mysql_port, opt_mysql_unix_port,
                              connect_flags))) {
       fprintf(stderr, "%s: Error when connecting to server: %s\n", my_progname,
@@ -427,7 +429,7 @@
   mysql_close(&mysql); /* Close & free connection */
 
   /* now free all the strings we created */
-  my_free(opt_password);
+  free_passwords();
   my_free(concurrency);
 
   statement_cleanup(create_statements);
@@ -654,11 +656,7 @@
      "been done.",
      &opt_only_print, &opt_only_print, nullptr, GET_BOOL, NO_ARG, 0, 0, 0,
      nullptr, 0, nullptr},
-    {"password", 'p',
-     "Password to use when connecting to server. If password is not given it's "
-     "asked from the tty.",
-     nullptr, nullptr, nullptr, GET_PASSWORD, OPT_ARG, 0, 0, 0, nullptr, 0,
-     nullptr},
+#include "multi_factor_passwordopt-longopts.h"
 #ifdef _WIN32
     {"pipe", 'W', "Use named pipes to connect to server.", 0, 0, 0, GET_NO_ARG,
      NO_ARG, 0, 0, 0, 0, 0, 0},
@@ -747,24 +745,7 @@
     case 'v':
       verbose++;
       break;
-    case 'p':
-      if (argument == disabled_my_option) {
-        // Don't require password
-        static char empty_password[] = {'\0'};
-        assert(empty_password[0] ==
-               '\0');  // Check that it has not been overwritten
-        argument = empty_password;
-      }
-      if (argument) {
-        char *start = argument;
-        my_free(opt_password);
-        opt_password = my_strdup(PSI_NOT_INSTRUMENTED, argument, MYF(MY_FAE));
-        while (*argument) *argument++ = 'x'; /* Destroy argument */
-        if (*start) start[1] = 0;            /* Cut length of argument */
-        tty_password = false;
-      } else
-        tty_password = true;
-      break;
+      PARSE_COMMAND_LINE_PASSWORD_OPTION;
     case 'W':
 #ifdef _WIN32
       opt_protocol = MYSQL_PROTOCOL_PIPE;
@@ -1415,8 +1396,6 @@
       return 1;
     }
   }
-
-  if (tty_password) opt_password = get_tty_password(NullS);
   return 0;
 }
 
@@ -2054,10 +2033,15 @@
   /* Connect to server */
   static ulong connection_retry_sleep = 100000; /* Microseconds */
   int x, connect_error = 1;
+  /* mysql options should be set to worker threads too */
+  set_password_options(mysql);
+  if (using_opt_enable_cleartext_plugin)
+    mysql_options(mysql, MYSQL_ENABLE_CLEARTEXT_PLUGIN,
+                  (char *)&opt_enable_cleartext_plugin);
   for (x = 0; x < 10; x++) {
-    if (mysql_real_connect(mysql, host, user, opt_password,
-                           create_schema_string, opt_mysql_port,
-                           opt_mysql_unix_port, connect_flags)) {
+    if (mysql_real_connect(mysql, host, user, nullptr, create_schema_string,
+                           opt_mysql_port, opt_mysql_unix_port,
+                           connect_flags)) {
       /* Connect suceeded */
       connect_error = 0;
       break;
diff -Nru mysql-8.0-8.0.26/client/mysqltest.cc mysql-8.0-8.0.27/client/mysqltest.cc
--- mysql-8.0-8.0.26/client/mysqltest.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/client/mysqltest.cc	2021-09-28 11:46:34.000000000 +0000
@@ -246,6 +246,7 @@
 
 static uint opt_zstd_compress_level = default_zstd_compression_level;
 static char *opt_compress_algorithm = nullptr;
+static uint opt_test_ssl_fips_mode = 0;
 
 #ifdef _WIN32
 static DWORD opt_safe_process_pid;
@@ -677,7 +678,7 @@
   ~AsyncTimer() {
     auto now = std::chrono::system_clock::now();
     auto delta = now - start_;
-    ulonglong MY_ATTRIBUTE((unused)) micros =
+    [[maybe_unused]] ulonglong micros =
         std::chrono::duration_cast<std::chrono::microseconds>(delta).count();
     DBUG_PRINT("async_timing",
                ("%s total micros: %llu", label_.c_str(), micros));
@@ -687,7 +688,7 @@
     auto now = std::chrono::system_clock::now();
     auto delta = now - time_;
     time_ = now;
-    ulonglong MY_ATTRIBUTE((unused)) micros =
+    [[maybe_unused]] ulonglong micros =
         std::chrono::duration_cast<std::chrono::microseconds>(delta).count();
     DBUG_PRINT("async_timing", ("%s op micros: %llu", label_.c_str(), micros));
   }
@@ -2206,7 +2207,7 @@
       break; /* ok */
     case RESULT_LENGTH_MISMATCH:
       mess = "Result length mismatch\n";
-      /* Fallthrough */
+      [[fallthrough]];
     case RESULT_CONTENT_MISMATCH: {
       /*
         Result mismatched, dump results to .reject file
@@ -3194,7 +3195,7 @@
 }
 
 static FILE *my_popen(DYNAMIC_STRING *ds_cmd, const char *mode,
-                      struct st_command *command MY_ATTRIBUTE((unused))) {
+                      struct st_command *command [[maybe_unused]]) {
 #ifdef _WIN32
   /*
     --execw is for tests executing commands containing non-ASCII characters.
@@ -4925,8 +4926,7 @@
   return 0;
 }
 
-static void do_wait_for_slave_to_stop(
-    struct st_command *c MY_ATTRIBUTE((unused))) {
+static void do_wait_for_slave_to_stop(struct st_command *c [[maybe_unused]]) {
   static int SLAVE_POLL_INTERVAL = 300000;
   MYSQL *mysql = &cur_con->mysql;
   for (;;) {
@@ -5660,7 +5660,7 @@
   @param pid  Process id.
   @param path Path to create minidump file in.
 */
-static void abort_process(int pid, const char *path MY_ATTRIBUTE((unused))) {
+static void abort_process(int pid, const char *path [[maybe_unused]]) {
 #ifdef _WIN32
   HANDLE proc;
   proc = OpenProcess(PROCESS_ALL_ACCESS, false, pid);
@@ -6597,7 +6597,7 @@
   static DYNAMIC_STRING ds_connection_name;
   static DYNAMIC_STRING ds_host;
   static DYNAMIC_STRING ds_user;
-  static DYNAMIC_STRING ds_password;
+  static DYNAMIC_STRING ds_password1;
   static DYNAMIC_STRING ds_database;
   static DYNAMIC_STRING ds_port;
   static DYNAMIC_STRING ds_sock;
@@ -6606,12 +6606,14 @@
   static DYNAMIC_STRING ds_shm;
   static DYNAMIC_STRING ds_compression_algorithm;
   static DYNAMIC_STRING ds_zstd_compression_level;
+  static DYNAMIC_STRING ds_password2;
+  static DYNAMIC_STRING ds_password3;
   const struct command_arg connect_args[] = {
       {"connection name", ARG_STRING, true, &ds_connection_name,
        "Name of the connection"},
       {"host", ARG_STRING, true, &ds_host, "Host to connect to"},
       {"user", ARG_STRING, false, &ds_user, "User to connect as"},
-      {"passsword", ARG_STRING, false, &ds_password,
+      {"passsword", ARG_STRING, false, &ds_password1,
        "Password used when connecting"},
       {"database", ARG_STRING, false, &ds_database,
        "Database to select after connect"},
@@ -6626,7 +6628,11 @@
       {"default_zstd_compression_level", ARG_STRING, false,
        &ds_zstd_compression_level,
        "Default compression level to use "
-       "when using zstd compression."}};
+       "when using zstd compression."},
+      {"second_passsword", ARG_STRING, false, &ds_password2,
+       "Password used when connecting"},
+      {"third_passsword", ARG_STRING, false, &ds_password3,
+       "Password used when connecting"}};
 
   DBUG_TRACE;
   DBUG_PRINT("enter", ("connect: %s", command->first_argument));
@@ -6803,12 +6809,30 @@
     mysql_options(&con_slot->mysql, MYSQL_ENABLE_CLEARTEXT_PLUGIN,
                   (char *)&con_cleartext_enable);
 
+  unsigned int factor = 0;
+  if (ds_password1.length) {
+    factor = 1;
+    mysql_options4(&con_slot->mysql, MYSQL_OPT_USER_PASSWORD, &factor,
+                   ds_password1.str);
+  }
+  /* set second and third password */
+  if (ds_password2.length) {
+    factor = 2;
+    mysql_options4(&con_slot->mysql, MYSQL_OPT_USER_PASSWORD, &factor,
+                   ds_password2.str);
+  }
+  if (ds_password3.length) {
+    factor = 3;
+    mysql_options4(&con_slot->mysql, MYSQL_OPT_USER_PASSWORD, &factor,
+                   ds_password3.str);
+  }
+
   /* Special database to allow one to connect without a database name */
   if (ds_database.length && !std::strcmp(ds_database.str, "*NO-ONE*"))
     dynstr_set(&ds_database, "");
 
   if (connect_n_handle_errors(command, &con_slot->mysql, ds_host.str,
-                              ds_user.str, ds_password.str, ds_database.str,
+                              ds_user.str, ds_password1.str, ds_database.str,
                               con_port, ds_sock.str)) {
     DBUG_PRINT("info", ("Inserting connection %s in connection pool",
                         ds_connection_name.str));
@@ -6826,7 +6850,7 @@
   dynstr_free(&ds_connection_name);
   dynstr_free(&ds_host);
   dynstr_free(&ds_user);
-  dynstr_free(&ds_password);
+  dynstr_free(&ds_password1);
   dynstr_free(&ds_database);
   dynstr_free(&ds_port);
   dynstr_free(&ds_sock);
@@ -6835,6 +6859,8 @@
   dynstr_free(&ds_shm);
   dynstr_free(&ds_compression_algorithm);
   dynstr_free(&ds_zstd_compression_level);
+  dynstr_free(&ds_password2);
+  dynstr_free(&ds_password3);
 }
 
 static int do_done(struct st_command *command) {
@@ -6940,11 +6966,14 @@
 
   /* If this block is ignored */
   if (!cur_block->ok) {
-    /* Inner block should be ignored too */
-    cur_block++;
-    cur_block->cmd = cmd;
-    cur_block->ok = false;
-    cur_block->delim[0] = '\0';
+    if (cmd == cmd_if || cmd == cmd_while) {
+      /* Inner block which comes with the command should be ignored */
+      cur_block++;
+      cur_block->cmd = cmd;
+      cur_block->ok = false;
+      cur_block->delim[0] = '\0';
+    }
+    /* No need to evaulate the condition */
     return;
   }
 
@@ -7782,6 +7811,12 @@
      "inclusive. Default is 3.",
      &opt_zstd_compress_level, &opt_zstd_compress_level, nullptr, GET_UINT,
      REQUIRED_ARG, 3, 1, 22, nullptr, 0, nullptr},
+    {"test-ssl-fips-mode", 0,
+     "Toggle SSL FIPS mode on or off, to see whether FIPS is supported. "
+     "Prints the result to stdout, and then exits. "
+     "Used by mtr to enable/disable FIPS tests. ",
+     &opt_test_ssl_fips_mode, nullptr, nullptr, GET_BOOL, NO_ARG, 0, 0, 0,
+     nullptr, 0, nullptr},
 
     {nullptr, 0, nullptr, nullptr, nullptr, nullptr, GET_NO_ARG, NO_ARG, 0, 0,
      0, nullptr, 0, nullptr}};
@@ -7802,6 +7837,13 @@
 
 static bool get_one_option(int optid, const struct my_option *opt,
                            char *argument) {
+  if (opt_test_ssl_fips_mode) {
+    char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
+    int fips_test = test_ssl_fips_mode(ssl_err_string);
+    fprintf(stdout, "--test-ssl-fips-mode %d %s\n", fips_test,
+            fips_test == 0 ? ssl_err_string : "Success");
+    exit(0);
+  }
   switch (optid) {
     case '#':
 #ifndef NDEBUG
@@ -9835,7 +9877,7 @@
             command->query = command->first_argument;
             command->first_word_len = 0;
           }
-          /* fall through */
+          [[fallthrough]];
         case Q_QUERY:
         case Q_REAP: {
           bool old_display_result_vertically = display_result_vertically;
@@ -10374,7 +10416,8 @@
           to 1.2000000
         */
         if (size1 < (size_t)r) r = size1;
-      // fallthrough: all cases till next break are executed
+        // fallthrough: all cases till next break are executed
+        [[fallthrough]];
       case 'e':
       case 'E':
         if (isdigit(*(from + size + 1))) {
@@ -10505,7 +10548,7 @@
 };
 
 void replace_strings_append(REPLACE *rep, DYNAMIC_STRING *ds, const char *str,
-                            size_t len MY_ATTRIBUTE((unused))) {
+                            size_t len [[maybe_unused]]) {
   REPLACE *rep_pos;
   REPLACE_STRING *rep_str;
   const char *start, *from;
diff -Nru mysql-8.0-8.0.26/cmake/boost.cmake mysql-8.0-8.0.27/cmake/boost.cmake
--- mysql-8.0-8.0.26/cmake/boost.cmake	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/cmake/boost.cmake	2021-09-28 11:46:34.000000000 +0000
@@ -39,7 +39,7 @@
 # is installed on the compile host in the standard location.
 
 SET(BOOST_PACKAGE_NAME "boost_1_73_0")
-SET(BOOST_TARBALL "${BOOST_PACKAGE_NAME}.tar.gz")
+SET(BOOST_TARBALL "${BOOST_PACKAGE_NAME}.tar.bz2")
 SET(BOOST_DOWNLOAD_URL
   "https://boostorg.jfrog.io/artifactory/main/release/1.73.0/source/${BOOST_TARBALL}"
   )
@@ -146,7 +146,7 @@
 
 IF (WITH_BOOST)
   ## Did we get a full path name, including file name?
-  IF (${WITH_BOOST} MATCHES ".*\\.tar.gz" OR ${WITH_BOOST} MATCHES ".*\\.zip")
+  IF (${WITH_BOOST} MATCHES ".*\\.tar.bz2" OR ${WITH_BOOST} MATCHES ".*\\.zip")
     GET_FILENAME_COMPONENT(BOOST_DIR ${WITH_BOOST} PATH)
     GET_FILENAME_COMPONENT(BOOST_ZIP ${WITH_BOOST} NAME)
     FIND_FILE(LOCAL_BOOST_ZIP
@@ -155,9 +155,9 @@
               NO_DEFAULT_PATH
              )
   ENDIF()
-  ## Did we get a path name to the directory of the .tar.gz or .zip file?
+  ## Did we get a path name to the directory of the .tar.bz2 or .zip file?
   FIND_FILE(LOCAL_BOOST_ZIP
-            NAMES "${BOOST_PACKAGE_NAME}.tar.gz" "${BOOST_PACKAGE_NAME}.zip"
+            NAMES "${BOOST_PACKAGE_NAME}.tar.bz2" "${BOOST_PACKAGE_NAME}.zip"
             PATHS ${WITH_BOOST}
             NO_DEFAULT_PATH
            )
@@ -239,9 +239,9 @@
 IF(LOCAL_BOOST_ZIP AND NOT LOCAL_BOOST_DIR)
   GET_FILENAME_COMPONENT(LOCAL_BOOST_DIR ${LOCAL_BOOST_ZIP} PATH)
   IF(NOT EXISTS "${LOCAL_BOOST_DIR}/${BOOST_PACKAGE_NAME}")
-    MESSAGE(STATUS "cd ${LOCAL_BOOST_DIR}; tar xfz ${LOCAL_BOOST_ZIP}")
+    MESSAGE(STATUS "cd ${LOCAL_BOOST_DIR}; tar xfj ${LOCAL_BOOST_ZIP}")
     EXECUTE_PROCESS(
-      COMMAND ${CMAKE_COMMAND} -E tar xfz "${LOCAL_BOOST_ZIP}"
+      COMMAND ${CMAKE_COMMAND} -E tar xfj "${LOCAL_BOOST_ZIP}"
       WORKING_DIRECTORY "${LOCAL_BOOST_DIR}"
       RESULT_VARIABLE tar_result
       )
diff -Nru mysql-8.0-8.0.26/cmake/build_configurations/compiler_options.cmake mysql-8.0-8.0.27/cmake/build_configurations/compiler_options.cmake
--- mysql-8.0-8.0.26/cmake/build_configurations/compiler_options.cmake	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/cmake/build_configurations/compiler_options.cmake	2021-09-28 11:46:34.000000000 +0000
@@ -24,19 +24,12 @@
 INCLUDE(CheckCXXCompilerFlag)
 INCLUDE(cmake/floating_point.cmake)
 
-IF(SIZEOF_VOIDP EQUAL 4)
-  SET(32BIT 1)
-ENDIF()
-IF(SIZEOF_VOIDP EQUAL 8)
-  SET(64BIT 1)
-ENDIF()
-
 SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 # Compiler options
 IF(UNIX)  
 
-  IF(MY_COMPILER_IS_GNU_OR_CLANG AND NOT SOLARIS_SPARC)
+  IF(MY_COMPILER_IS_GNU_OR_CLANG AND NOT SOLARIS)
     SET(SECTIONS_FLAG "-ffunction-sections -fdata-sections")
   ELSE()
     SET(SECTIONS_FLAG)
@@ -54,7 +47,7 @@
       STRING_APPEND(COMMON_C_FLAGS   " -ffp-contract=off")
     ENDIF()
 
-    SET(COMMON_CXX_FLAGS             "-std=c++14 -fno-omit-frame-pointer")
+    SET(COMMON_CXX_FLAGS             "-std=c++17 -fno-omit-frame-pointer")
     # Disable inline optimizations for valgrind testing to avoid false positives
     IF(WITH_VALGRIND)
       STRING_PREPEND(COMMON_CXX_FLAGS  "-fno-inline ")
@@ -68,7 +61,7 @@
   # Default Clang flags
   IF(MY_COMPILER_IS_CLANG)
     SET(COMMON_C_FLAGS               "-fno-omit-frame-pointer")
-    SET(COMMON_CXX_FLAGS             "-std=c++14 -fno-omit-frame-pointer")
+    SET(COMMON_CXX_FLAGS             "-std=c++17 -fno-omit-frame-pointer")
   ENDIF()
 
   # Faster TLS model
@@ -77,178 +70,6 @@
     STRING_APPEND(COMMON_CXX_FLAGS   " -ftls-model=initial-exec")
   ENDIF()
 
-  # Solaris flags
-  IF(SOLARIS)
-    # Link mysqld with mtmalloc on Solaris 10 and later
-    SET(WITH_MYSQLD_LDFLAGS "-lmtmalloc" CACHE STRING "")
-
-    IF(MY_COMPILER_IS_SUNPRO)
-      SET(SUNPRO_FLAGS     "")
-      STRING_APPEND(SUNPRO_FLAGS     " -xbuiltin=%all")
-      STRING_APPEND(SUNPRO_FLAGS     " -xlibmil")
-      STRING_APPEND(SUNPRO_FLAGS     " -xatomic=studio")
-
-      # Show tags for warnings, so that they can be added to suppression list
-      SET(SUNPRO_FLAGS     "${SUNPRO_FLAGS} -errtags")
-
-      IF(SOLARIS_INTEL)
-        STRING_APPEND(SUNPRO_FLAGS   " -nofstore")
-      ENDIF()
-
-      SET(COMMON_C_FLAGS            "${SUNPRO_FLAGS}")
-
-      # Build list of C warning tags to suppress. Comment in/out as needed.
-
-      # warning: useless declaration (E_USELESS_DECLARATION)
-      # Count: 8
-      # LIST(APPEND SUNPRO_C_WARNING_SUPPRESSION_LIST E_USELESS_DECLARATION)
-
-      # warning: empty translation unit (E_EMPTY_TRANSLATION_UNIT)
-      LIST(APPEND SUNPRO_C_WARNING_SUPPRESSION_LIST E_EMPTY_TRANSLATION_UNIT)
-
-      # warning: initialization type mismatch (E_INITIALIZATION_TYPE_MISMATCH)
-      # Count: 114
-      # LIST(APPEND SUNPRO_C_WARNING_SUPPRESSION_LIST
-      # E_INITIALIZATION_TYPE_MISMATCH)
-
-      # warning: statement not reached (E_STATEMENT_NOT_REACHED)
-      # Count: 3
-      # LIST(APPEND SUNPRO_C_WARNING_SUPPRESSION_LIST E_STATEMENT_NOT_REACHED)
-
-      # warning: initializer will be sign-extended: -1 (E_INIT_SIGN_EXTEND)
-      # Count: 1
-      # LIST(APPEND SUNPRO_C_WARNING_SUPPRESSION_LIST E_INIT_SIGN_EXTEND)
-
-      # warning: implicit function declaration: ntohl
-      # (E_NO_IMPLICIT_DECL_ALLOWED)
-      # Count: 2
-      # LIST(APPEND SUNPRO_C_WARNING_SUPPRESSION_LIST E_NO_IMPLICIT_DECL_ALLOWED)
-
-      # Convert CMAKE list to comma-separated string, and append to
-      # COMMON_C_FLAGS
-      STRING(REPLACE ";" "," SUNPRO_C_WARNING_SUPPRESSION_STRING
-	${SUNPRO_C_WARNING_SUPPRESSION_LIST})
-      SET(SUNPRO_C_WARNING_SUPPRESSION_FLAGS
-	"-erroff=${SUNPRO_C_WARNING_SUPPRESSION_STRING}")
-      STRING_APPEND(COMMON_C_FLAGS " ${SUNPRO_C_WARNING_SUPPRESSION_FLAGS}")
-
-
-      SET(COMMON_CXX_FLAGS          "-std=c++14 ${SUNPRO_FLAGS}")
-
-      # Build list of C++ warning tags to suppress. Comment in/out as needed.
-
-      # Warning, anonnotype: Types cannot be declared in anonymous union.
-      # Count: 43
-      LIST(APPEND SUNPRO_CXX_WARNING_SUPPRESSION_LIST anonnotype)
-
-      # Warning, fieldsemicolonw: extra ";" ignored.
-      # Count: 5
-      #LIST(APPEND SUNPRO_CXX_WARNING_SUPPRESSION_LIST fieldsemicolonw)
-
-      # Warning, wvarhidemem: key_type hides keyring::Key::key_type.
-      # Count: 2917
-      LIST(APPEND SUNPRO_CXX_WARNING_SUPPRESSION_LIST wvarhidemem)
-
-      # Warning, anonstruct: Anonymous struct is being declared.
-      # Count: 717
-      LIST(APPEND SUNPRO_CXX_WARNING_SUPPRESSION_LIST anonstruct)
-
-      # Warning, wlessrestrictedthrow: Function
-      # xcl::Connection_impl::~Connection_impl() can throw only the
-      # exceptions thrown by the function xcl::XConnection::~XConnection()
-      # it overrides.
-      # Count: 1221
-      LIST(APPEND SUNPRO_CXX_WARNING_SUPPRESSION_LIST wlessrestrictedthrow)
-
-      # Warning, oklambdaretmulti: Deducing non-void lambda return type
-      # 'bool' from lambda without a single return statement.
-      # Count: 84
-      LIST(APPEND SUNPRO_CXX_WARNING_SUPPRESSION_LIST oklambdaretmulti)
-
-      # Warning, nonewline: Last line in file ".../registry_metadata.cc.inc"
-      # is not terminated with a newline.
-      # Count: 58
-      #LIST(APPEND SUNPRO_CXX_WARNING_SUPPRESSION_LIST nonewline)
-
-      # Warning, voidretw: "worker_thread(void*)" is expected to return a
-      # value.
-      # Count: 1
-      #LIST(APPEND SUNPRO_CXX_WARNING_SUPPRESSION_LIST voidretw)
-
-      # Warning, unassigned: The variable ret has not yet been assigned a
-      # value.
-      # Count: 193
-      LIST(APPEND SUNPRO_CXX_WARNING_SUPPRESSION_LIST unassigned)
-
-      # Warning, badinitstr: String literal converted to char* in
-      # initialization.
-      # Count: 6
-      #LIST(APPEND SUNPRO_CXX_WARNING_SUPPRESSION_LIST badinitstr)
-
-      # Warning, hidevf: meb::Process_data_mgr::get_buffer hides the virtual
-      # function meb::Data_mgr::get_buffer(unsigned long long).
-      # Count: 7
-      #LIST(APPEND SUNPRO_CXX_WARNING_SUPPRESSION_LIST hidevf)
-
-      # Warning, attrskipunsup: attribute unused is unsupported and will be
-      # skipped..
-      # Count: 5
-      #LIST(APPEND SUNPRO_CXX_WARNING_SUPPRESSION_LIST attrskipunsup)
-
-      # Warning, nonvarrefww: A reference return value should be an lvalue
-      # (if the value of this function is used, the result is unpredictable).
-      # Count: 4
-      #LIST(APPEND SUNPRO_CXX_WARNING_SUPPRESSION_LIST nonvarrefww)
-
-      # Warning, explctspectypename: "typename" must be used within a template.
-      # Count: 1
-      #LIST(APPEND SUNPRO_CXX_WARNING_SUPPRESSION_LIST explctspectypename)
-
-      # Warning: Likely out-of-bound read: *(rhs+9[1]) in function decLnOp
-      #   (SEC_ARR_OUTSIDE_BOUND_READ)
-      # Count: 10
-      #LIST(APPEND SUNPRO_CXX_WARNING_SUPPRESSION_LIST SEC_ARR_OUTSIDE_BOUND_READ)
-
-      # Warning (Anachronism), incomtypew: debug_sync_C_callback_ptr, of type
-      # void(*)(const char*,unsigned long), was previously declared
-      # extern "C" void(*)(const char*,unsigned long).
-      # Count: 1
-      #LIST(APPEND SUNPRO_CXX_WARNING_SUPPRESSION_LIST, incomtypew)
-
-      # Warning, symdeprecated: 'MD5_Init(MD5state_st*)' is deprecated
-      # (declared at /usr/include/openssl/md5.h, line 124).
-      # Count: 3
-      #LIST(APPEND SUNPRO_CXX_WARNING_SUPPRESSION_LIST symdeprecated)
-
-      # Convert CMAKE list to comma-separated string, and append to
-      # COMMON_CXX_FLAGS
-      STRING(REPLACE ";" "," SUNPRO_CXX_WARNING_SUPPRESSION_STRING
-	"${SUNPRO_CXX_WARNING_SUPPRESSION_LIST}")
-      SET(SUNPRO_CXX_WARNING_SUPPRESSION_FLAGS
-	"-erroff=${SUNPRO_CXX_WARNING_SUPPRESSION_STRING}")
-      STRING_APPEND(COMMON_CXX_FLAGS " ${SUNPRO_CXX_WARNING_SUPPRESSION_FLAGS}")
-
-
-      # Reduce size of debug binaries, by omitting function declarations.
-      # Note that we cannot set "-xdebuginfo=no%decl" during feature tests.
-      # We still may get linking errors for merge_large_tests-t with Studio 12.6
-      # -g0 is the same as -g, except that inlining is enabled.
-      # When building -DWITH_NDBCLUSTER=1 even more of the merge_xxx_tests
-      # fail to link, so we keep -g0 for Studio 12.6
-      STRING_APPEND(CMAKE_C_FLAGS_DEBUG            " -g0 -xdebuginfo=no%decl")
-      STRING_APPEND(CMAKE_CXX_FLAGS_DEBUG          " -g0 -xdebuginfo=no%decl")
-      STRING_APPEND(CMAKE_C_FLAGS_RELWITHDEBINFO   " -xdebuginfo=no%decl")
-      STRING_APPEND(CMAKE_CXX_FLAGS_RELWITHDEBINFO " -xdebuginfo=no%decl")
-
-      # Bugs in SunPro, compile/link error unless we add some debug info.
-      # Errors seem to be related to TLS functions.
-      STRING_APPEND(CMAKE_CXX_FLAGS_MINSIZEREL
-        " -g0 -xdebuginfo=no%line,no%param,no%decl,no%variable,no%tagtype")
-      STRING_APPEND(CMAKE_CXX_FLAGS_RELEASE
-        " -g0 -xdebuginfo=no%line,no%param,no%decl,no%variable,no%tagtype")
-    ENDIF()
-  ENDIF()
-
   # Use STRING_PREPEND here, so command-line input can override our defaults.
   STRING_PREPEND(CMAKE_C_FLAGS                  "${COMMON_C_FLAGS} ")
   STRING_PREPEND(CMAKE_C_FLAGS_RELWITHDEBINFO   "${SECTIONS_FLAG} ")
diff -Nru mysql-8.0-8.0.26/cmake/cmake_policies.cmake mysql-8.0-8.0.27/cmake/cmake_policies.cmake
--- mysql-8.0-8.0.26/cmake/cmake_policies.cmake	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/cmake/cmake_policies.cmake	2021-09-28 11:46:34.000000000 +0000
@@ -39,6 +39,13 @@
   CMAKE_POLICY(SET CMP0069 NEW)
 ENDIF()
 
+# Do not produce ``<tgt>_LIB_DEPENDS`` cache entries to propagate library
+# link dependencies. In cmake code, use this instead:
+#   GET_TARGET_PROPERTY(TARGET_LIB_DEPENDS ${target} LINK_LIBRARIES)
+IF(POLICY CMP0073)
+  CMAKE_POLICY(SET CMP0073 NEW)
+ENDIF()
+
 # In CMake 3.12 and above, the
 #
 # * ``check_include_file`` macro in the ``CheckIncludeFile`` module, the
@@ -51,10 +58,3 @@
 IF(POLICY CMP0075)
   CMAKE_POLICY(SET CMP0075 NEW)
 ENDIF()
-
-# Produce ``<tgt>_LIB_DEPENDS`` cache entries to propagate library
-# link dependencies. We use them in MERGE_CONVENIENCE_LIBRARIES.
-# TODO(tdidriks): manage our own dependencies for "convenience" libraries.
-IF(POLICY CMP0073)
-  CMAKE_POLICY(SET CMP0073 OLD)
-ENDIF()
diff -Nru mysql-8.0-8.0.26/cmake/compile_flags.cmake mysql-8.0-8.0.27/cmake/compile_flags.cmake
--- mysql-8.0-8.0.26/cmake/compile_flags.cmake	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/cmake/compile_flags.cmake	2021-09-28 11:46:34.000000000 +0000
@@ -53,13 +53,13 @@
         )
     ENDFOREACH()
   ENDFOREACH()
-ENDFUNCTION()
+ENDFUNCTION(ADD_COMPILE_FLAGS)
 
 
-## ADD_COMPILE_DEFINITIONS(<source files> COMPILE_DEFINITIONS <flags>)
+## MY_ADD_COMPILE_DEFINITIONS(<source files> COMPILE_DEFINITIONS <flags>)
 ## Use this for adding preprocessor flags VAR or VAR=value to source files.
 ## cmake will prefix with '-D' and sort all COMPILE_DEFINITIONS alphabetically.
-FUNCTION(ADD_COMPILE_DEFINITIONS)
+FUNCTION(MY_ADD_COMPILE_DEFINITIONS)
   SET(FILES "")
   SET(FLAGS "")
   SET(COMPILE_DEFINITIONS_SEEN)
@@ -82,7 +82,7 @@
     SET_SOURCE_FILES_PROPERTIES(
       ${FILE} PROPERTIES COMPILE_DEFINITIONS "${DEFS}")
   ENDFOREACH()
-ENDFUNCTION()
+ENDFUNCTION(MY_ADD_COMPILE_DEFINITIONS)
 
 # -flto[=n] or -flto=auto or -flto=jobserver
 SET(MY_COMPILER_FLAG_FLTO " -flto(=[0-9a-z]+)?")
diff -Nru mysql-8.0-8.0.26/cmake/component.cmake mysql-8.0-8.0.27/cmake/component.cmake
--- mysql-8.0-8.0.26/cmake/component.cmake	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/cmake/component.cmake	2021-09-28 11:46:34.000000000 +0000
@@ -106,7 +106,12 @@
     IF(UNIX)
       IF(MY_COMPILER_IS_CLANG AND WITH_UBSAN)
         # nothing, clang/ubsan gets confused
+        UNSET(COMPONENT_COMPILE_VISIBILITY CACHE)
       ELSE()
+        # Use this also for component libraries and tests.
+        SET(COMPONENT_COMPILE_VISIBILITY
+          "-fvisibility=hidden" CACHE INTERNAL
+          "Use -fvisibility=hidden for components" FORCE)
         TARGET_COMPILE_OPTIONS(${target} PRIVATE "-fvisibility=hidden")
       ENDIF()
     ENDIF()
diff -Nru mysql-8.0-8.0.26/cmake/cpu_info.cmake mysql-8.0-8.0.27/cmake/cpu_info.cmake
--- mysql-8.0-8.0.26/cmake/cpu_info.cmake	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/cmake/cpu_info.cmake	2021-09-28 11:46:34.000000000 +0000
@@ -25,7 +25,7 @@
 FIND_PROGRAM(GETCONF getconf)
 MARK_AS_ADVANCED(GETCONF)
 
-IF(GETCONF AND NOT SOLARIS)
+IF(GETCONF AND NOT SOLARIS AND NOT APPLE)
   EXECUTE_PROCESS(
     COMMAND ${GETCONF} LEVEL1_DCACHE_LINESIZE
     OUTPUT_VARIABLE CPU_LEVEL1_DCACHE_LINESIZE
diff -Nru mysql-8.0-8.0.26/cmake/fido2.cmake mysql-8.0-8.0.27/cmake/fido2.cmake
--- mysql-8.0-8.0.26/cmake/fido2.cmake	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/cmake/fido2.cmake	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,129 @@
+# Copyright (c) 2020, 2021, Oracle 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,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+# cmake -DWITH_FIDO=bundled|system
+
+# libudev is needed on Linux only.
+FUNCTION(WARN_MISSING_SYSTEM_UDEV OUTPUT_WARNING)
+  IF(LINUX AND WITH_FIDO STREQUAL "bundled" AND NOT LIBUDEV_DEVEL_FOUND)
+    MESSAGE(WARNING "Cannot find development libraries. "
+      "You need to install the required packages:\n"
+      "  Debian/Ubuntu:              apt install libudev-dev\n"
+      "  RedHat/Fedora/Oracle Linux: yum install libudev-devel\n"
+      "  SuSE:                       zypper install libudev-devel\n"
+      )
+    SET(${OUTPUT_WARNING} 1 PARENT_SCOPE)
+  ENDIF()
+  IF(SOLARIS)
+    MESSAGE(STATUS "No known libudev on SOLARIS")
+    SET(${OUTPUT_WARNING} 1 PARENT_SCOPE)
+  ENDIF()
+ENDFUNCTION()
+
+# Bundled FIDO requires libudev.
+MACRO(FIND_SYSTEM_UDEV_OR_HID)
+  IF(LINUX)
+    FIND_LIBRARY(UDEV_SYSTEM_LIBRARY NAMES udev)
+    CHECK_INCLUDE_FILE(libudev.h HAVE_LIBUDEV_H)
+    IF(UDEV_SYSTEM_LIBRARY AND HAVE_LIBUDEV_H)
+      SET(LIBUDEV_DEVEL_FOUND 1)
+      MESSAGE(STATUS "UDEV_SYSTEM_LIBRARY ${UDEV_SYSTEM_LIBRARY}")
+    ENDIF()
+  ELSEIF(FREEBSD)
+    FIND_LIBRARY(HID_LIBRARY NAMES hidapi)
+    IF(HID_LIBRARY)
+      MESSAGE(STATUS "HID_LIBRARY ${HID_LIBRARY}")
+    ELSE()
+      MESSAGE(WARNING "Cannot find development libraries. "
+        "You need to install the required packages:\n"
+        "FreeBSD:     pkg install hidapi\n"
+      )
+    ENDIF()
+  ENDIF()
+ENDMACRO()
+
+FUNCTION(WARN_MISSING_SYSTEM_FIDO OUTPUT_WARNING)
+  IF(WITH_FIDO STREQUAL "system" AND NOT FIDO_FOUND)
+    MESSAGE(WARNING "Cannot find development libraries. "
+      "You need to install the required packages:\n"
+      "  Debian/Ubuntu:              apt install libfido2-dev\n"
+      "  RedHat/Fedora/Oracle Linux: yum install libfido2-devel\n"
+      "  SuSE:                       zypper install libfido2-devel\n"
+      )
+    SET(${OUTPUT_WARNING} 1 PARENT_SCOPE)
+  ENDIF()
+ENDFUNCTION()
+
+# Look for system fido2. If we find it, there is no need to look for libudev.
+MACRO(FIND_SYSTEM_FIDO)
+  CHECK_INCLUDE_FILE(fido.h HAVE_FIDO_H)
+  FIND_LIBRARY(FIDO_LIBRARY fido2)
+  IF (FIDO_LIBRARY AND HAVE_FIDO_H)
+    SET(FIDO_FOUND TRUE)
+    FIND_PATH(FIDO_INCLUDE_DIR fido.h)
+    MESSAGE(STATUS "FIDO_LIBRARY ${FIDO_LIBRARY}")
+  ENDIF()
+ENDMACRO()
+
+MACRO(MYSQL_USE_BUNDLED_FIDO)
+  SET(WITH_FIDO "bundled" CACHE STRING
+    "Bundled fido2 library")
+
+  FIND_SYSTEM_UDEV_OR_HID()
+
+  SET(CBOR_BUNDLE_SRC_PATH "extra/libcbor")
+
+  SET(FIDO_BUNDLE_SRC_PATH "extra/libfido2")
+  SET(FIDO_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/${FIDO_BUNDLE_SRC_PATH}/src)
+
+  # We use the bundled version, so:
+  SET(FIDO_FOUND TRUE)
+
+  # Mark it as not found if libudev is missing, so we can give proper warnings.
+  IF(LINUX AND NOT LIBUDEV_DEVEL_FOUND)
+    SET(FIDO_FOUND FALSE)
+  ENDIF()
+  # So that we skip authentication_fido_client.so
+  IF(SOLARIS)
+    SET(FIDO_FOUND FALSE)
+  ENDIF()
+  SET(FIDO_LIBRARY fido2 CACHE INTERNAL "Bundled fido2 library")
+ENDMACRO()
+
+MACRO(MYSQL_CHECK_FIDO)
+  IF (NOT WITH_FIDO)
+    SET(WITH_FIDO "bundled"
+      CACHE STRING "By default use bundled libfido2.")
+  ENDIF()
+
+  IF(WITH_FIDO STREQUAL "bundled")
+    MYSQL_USE_BUNDLED_FIDO()
+  ELSEIF(WITH_FIDO STREQUAL "system")
+    FIND_SYSTEM_FIDO()
+    IF(NOT FIDO_FOUND)
+      MESSAGE(WARNING "Cannot find system fido2 libraries.")
+    ENDIF()
+  ELSE()
+    MESSAGE(WARNING "WITH_FIDO must be bundled or system")
+  ENDIF()
+
+ENDMACRO()
diff -Nru mysql-8.0-8.0.26/cmake/googletest.cmake mysql-8.0-8.0.27/cmake/googletest.cmake
--- mysql-8.0-8.0.26/cmake/googletest.cmake	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/cmake/googletest.cmake	2021-09-28 11:46:34.000000000 +0000
@@ -20,7 +20,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
-SET(GOOGLETEST_RELEASE googletest-release-1.10.0)
+SET(GOOGLETEST_RELEASE googletest-release-1.11.0)
 SET(GMOCK_SOURCE_DIR
   ${CMAKE_SOURCE_DIR}/extra/googletest/${GOOGLETEST_RELEASE}/googlemock)
 SET(GTEST_SOURCE_DIR
@@ -59,14 +59,7 @@
   TARGET_INCLUDE_DIRECTORIES(${googletest_library} SYSTEM PUBLIC
     ${GMOCK_INCLUDE_DIRS}
     )
-  IF(MY_COMPILER_IS_SUNPRO)
-    TARGET_COMPILE_OPTIONS(${googletest_library} PRIVATE $<$<CONFIG:RelWithDebInfo>:-xO4>)
-  ENDIF()
   IF(HAS_MISSING_PROFILE)
     TARGET_COMPILE_OPTIONS(${googletest_library} PRIVATE ${HAS_MISSING_PROFILE})
   ENDIF()
 ENDFOREACH()
-
-IF(MY_COMPILER_IS_SUNPRO)
-  ADD_DEFINITIONS(-DGTEST_LANG_CXX11=1)
-ENDIF()
diff -Nru mysql-8.0-8.0.26/cmake/install_macros.cmake mysql-8.0-8.0.27/cmake/install_macros.cmake
--- mysql-8.0-8.0.26/cmake/install_macros.cmake	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/cmake/install_macros.cmake	2021-09-28 11:46:34.000000000 +0000
@@ -460,6 +460,87 @@
   ENDIF()
 ENDMACRO()
 
+MACRO(MYSQL_CHECK_FIDO_DLLS)
+  IF(APPLE AND WITH_FIDO STREQUAL "bundled")
+    ADD_CUSTOM_TARGET(symlink_fido2_dlls)
+
+    # We want libfido2.1.dylib rather than libfido2.1.5.0.dylib below:
+    SET(TARGET_FILE_NAME_fido2      "libfido2.1.dylib")
+
+    ADD_CUSTOM_TARGET(link_fido2_dlls_plugin ALL
+      COMMAND ${CMAKE_COMMAND} -E create_symlink
+      "../lib/${TARGET_FILE_NAME_fido2}" "${TARGET_FILE_NAME_fido2}"
+      WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/plugin_output_directory"
+
+      COMMENT "Creating fido2 symlinks in plugin_output_directory"
+
+      BYPRODUCTS
+      "${CMAKE_BINARY_DIR}/plugin_output_directory/${TARGET_FILE_NAME_fido2}"
+      )
+    ADD_DEPENDENCIES(symlink_fido2_dlls link_fido2_dlls_plugin)
+
+    # Create some symlinks from lib/plugin/*.dylib to ../../lib/*.dylib
+    FILE(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/plugin_output_directory/plugin")
+    ADD_CUSTOM_TARGET(link_fido2_dlls_plugin_install ALL
+      COMMAND ${CMAKE_COMMAND} -E create_symlink
+      "../../lib/${TARGET_FILE_NAME_fido2}" "${TARGET_FILE_NAME_fido2}"
+      WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/plugin_output_directory/plugin"
+      )
+    INSTALL(FILES
+      "${CMAKE_BINARY_DIR}/plugin_output_directory/plugin/${TARGET_FILE_NAME_fido2}"
+      DESTINATION ${INSTALL_PLUGINDIR} COMPONENT SharedLibraries
+      )
+    IF(EXISTS ${DEBUGBUILDDIR})
+      FILE(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/plugin_output_directory/plugin/debug")
+      ADD_CUSTOM_TARGET(link_fido2_dlls_plugin_install_debug ALL
+        COMMAND ${CMAKE_COMMAND} -E create_symlink
+        "../../../lib/${TARGET_FILE_NAME_fido2}" "${TARGET_FILE_NAME_fido2}"
+        WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/plugin_output_directory/plugin/debug"
+        )
+      ADD_DEPENDENCIES(symlink_fido2_dlls link_fido2_dlls_plugin_install_debug)
+      INSTALL(FILES
+        "${CMAKE_BINARY_DIR}/plugin_output_directory/plugin/debug/${TARGET_FILE_NAME_fido2}"
+        DESTINATION ${INSTALL_PLUGINDIR}/debug COMPONENT SharedLibraries
+        )
+    ENDIF()
+    IF(NOT BUILD_IS_SINGLE_CONFIG)
+      ADD_CUSTOM_TARGET(link_fido2_dlls_plugin_xcode ALL
+        COMMAND ${CMAKE_COMMAND} -E create_symlink
+        "../../lib/${CMAKE_CFG_INTDIR}/${TARGET_FILE_NAME_fido2}"
+        "${TARGET_FILE_NAME_fido2}"
+        WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/plugin_output_directory/${CMAKE_CFG_INTDIR}"
+        )
+      ADD_DEPENDENCIES(symlink_fido2_dlls link_fido2_dlls_plugin_xcode)
+    ENDIF()
+  ENDIF()
+ENDMACRO()
+
+MACRO(ADD_INSTALL_RPATH_FOR_FIDO2 TARGET)
+  MESSAGE(STATUS "ADD_INSTALL_RPATH_FOR_FIDO2 ${TARGET}")
+  IF(APPLE)
+    SET_PROPERTY(TARGET ${TARGET} PROPERTY INSTALL_RPATH "@loader_path")
+    # install_name_tool [-change old new] input
+
+    SET(LIBFIDO_MAJOR_DYLIB "libfido2.1.dylib")
+    ADD_CUSTOM_COMMAND(TARGET ${TARGET} POST_BUILD
+      COMMAND install_name_tool -change
+          "@rpath/${LIBFIDO_MAJOR_DYLIB}"
+          "@loader_path/${LIBFIDO_MAJOR_DYLIB}"
+          "$<TARGET_FILE:${TARGET}>"
+      )
+  ELSEIF(UNIX)
+    GET_TARGET_PROPERTY(TARGET_TYPE_${TARGET} ${TARGET} TYPE)
+    IF(TARGET_TYPE_${TARGET} STREQUAL "EXECUTABLE")
+      ADD_INSTALL_RPATH(${TARGET} "\$ORIGIN/../${INSTALL_PRIV_LIBDIR}")
+    ELSEIF(TARGET_TYPE_${TARGET} STREQUAL "MODULE_LIBRARY")
+      ADD_INSTALL_RPATH(${TARGET} "\$ORIGIN/../private")
+    ELSE()
+      MESSAGE(FATAL_ERROR "unknown type ${TARGET_TYPE_${TARGET}} for ${TARGET}")
+    ENDIF()
+  ENDIF()
+ENDMACRO()
+
+
 # For APPLE builds we support
 #   -DWITH_SSL=</path/to/custom/openssl>
 # SSL libraries are installed in lib/
diff -Nru mysql-8.0-8.0.26/cmake/kerberos.cmake mysql-8.0-8.0.27/cmake/kerberos.cmake
--- mysql-8.0-8.0.26/cmake/kerberos.cmake	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/cmake/kerberos.cmake	2021-09-28 11:46:34.000000000 +0000
@@ -236,6 +236,14 @@
     NO_SYSTEM_ENVIRONMENT_PATH
     )
 
+  FIND_LIBRARY(GSSAPI_LIBRARIES
+    NAMES "gssapi_krb5"
+    PATHS ${WITH_KERBEROS}/lib
+    NO_DEFAULT_PATH
+    NO_CMAKE_ENVIRONMENT_PATH
+    NO_SYSTEM_ENVIRONMENT_PATH
+    )
+
   FOREACH(EXTRA_LIB ${CUSTOM_KERBEROS_EXTRA_LIBRARIES})
     SET(VAR_NAME "KERBEROS_CUSTOM_LIBRARY_${EXTRA_LIB}")
     FIND_LIBRARY(${VAR_NAME}
@@ -271,6 +279,14 @@
     SET(WITH_KERBEROS "none" CACHE INTERNAL "")
   ENDIF()
 
+  IF(WIN32)
+    SET(KERBEROS_LIB_SSPI 1)
+    MESSAGE(STATUS "Kerberos client is supported in windows using SSPI.")
+  ELSE()
+    UNSET(KERBEROS_LIB_SSPI)
+    UNSET(KERBEROS_LIB_SSPI CACHE)
+  ENDIF()
+
   IF(NOT WITH_KERBEROS)
     IF(WITH_AUTHENTICATION_LDAP OR WITH_AUTHENTICATION_CLIENT_PLUGINS)
       SET(WITH_KERBEROS "system" CACHE STRING "${WITH_KERBEROS_DOC_STRING}")
diff -Nru mysql-8.0-8.0.26/cmake/libutils.cmake mysql-8.0-8.0.27/cmake/libutils.cmake
--- mysql-8.0-8.0.26/cmake/libutils.cmake	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/cmake/libutils.cmake	2021-09-28 11:46:34.000000000 +0000
@@ -309,22 +309,24 @@
 
 
 FUNCTION(GET_DEPENDEND_OS_LIBS target result)
-  SET(deps ${${target}_LIB_DEPENDS})
-  IF(deps)
-    FOREACH(lib ${deps})
-      # Filter out keywords for used for debug vs optimized builds
-      IF(NOT lib MATCHES "general" AND
-          NOT lib MATCHES "debug" AND
-          NOT lib MATCHES "optimized")
-        LIST(FIND KNOWN_CONVENIENCE_LIBRARIES ${lib} FOUNDIT)
-        IF(FOUNDIT LESS 0)
-          SET(ret ${ret} ${lib})
-        ENDIF()
+  GET_TARGET_PROPERTY(TARGET_LIB_DEPENDS ${target} LINK_LIBRARIES)
+  SET(MY_DEPENDENT_OS_LIBS)
+  IF(TARGET_LIB_DEPENDS)
+    LIST(REMOVE_DUPLICATES TARGET_LIB_DEPENDS)
+    FOREACH(lib ${TARGET_LIB_DEPENDS})
+      IF(lib MATCHES "${CMAKE_BINARY_DIR}")
+        # This is a "custom/imported" system lib (libssl libcrypto)
+        # MESSAGE(STATUS "GET_DEPENDEND_OS_LIBS ignore imported ${lib}")
+      ELSEIF(TARGET ${lib})
+        # This is one of our own libraries
+        # MESSAGE(STATUS "GET_DEPENDEND_OS_LIBS ignore our ${lib}")
+      ELSE()
+        LIST(APPEND MY_DEPENDENT_OS_LIBS ${lib})
       ENDIF()
     ENDFOREACH()
   ENDIF()
-  SET(${result} ${ret} PARENT_SCOPE)
-ENDFUNCTION()
+  SET(${result} ${MY_DEPENDENT_OS_LIBS} PARENT_SCOPE)
+ENDFUNCTION(GET_DEPENDEND_OS_LIBS)
 
 
 MACRO(MERGE_CONVENIENCE_LIBRARIES TARGET_ARG)
@@ -338,9 +340,18 @@
   SET(TARGET ${TARGET_ARG})
   SET(LIBS ${ARG_UNPARSED_ARGUMENTS})
 
+  # Add a dummy source file, with non-empty content, to avoid warning:
+  # libjson_binlog_static.a(json_binlog_static_depends.c.o) has no symbols
   SET(SOURCE_FILE
     ${CMAKE_BINARY_DIR}/archive_output_directory/${TARGET}_depends.c)
+  SET(SOURCE_FILE_CONTENT "void dummy_${TARGET}_function() {}")
+  CONFIGURE_FILE_CONTENT("${SOURCE_FILE_CONTENT}" "${SOURCE_FILE}")
+
   ADD_LIBRARY(${TARGET} STATIC ${SOURCE_FILE})
+  MY_CHECK_CXX_COMPILER_WARNING("-Wmissing-profile" HAS_MISSING_PROFILE)
+  IF(FPROFILE_USE AND HAS_MISSING_PROFILE)
+    ADD_COMPILE_FLAGS(${SOURCE_FILE} COMPILE_FLAGS ${HAS_MISSING_PROFILE})
+  ENDIF()
 
   IF(ARG_EXCLUDE_FROM_ALL)
     IF(NOT ARG_SKIP_INSTALL)
diff -Nru mysql-8.0-8.0.26/cmake/maintainer.cmake mysql-8.0-8.0.27/cmake/maintainer.cmake
--- mysql-8.0-8.0.26/cmake/maintainer.cmake	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/cmake/maintainer.cmake	2021-09-28 11:46:34.000000000 +0000
@@ -59,8 +59,8 @@
 SET(MY_CXX_WARNING_FLAGS "${MY_WARNING_FLAGS} -Woverloaded-virtual -Wcast-qual")
 
 IF(MY_COMPILER_IS_GNU)
-  # The default =3 given by -Wextra is a bit too strict for our code.
-  MY_ADD_CXX_WARNING_FLAG("Wimplicit-fallthrough=2")
+  # Accept only the standard [[fallthrough]] attribute, no comments.
+  MY_ADD_CXX_WARNING_FLAG("Wimplicit-fallthrough=5")
   MY_ADD_C_WARNING_FLAG("Wjump-misses-init")
   # This is included in -Wall on some platforms, enable it explicitly.
   MY_ADD_C_WARNING_FLAG("Wstringop-truncation")
@@ -186,15 +186,3 @@
     ADD_COMPILE_OPTIONS("-Wshadow-uncaptured-local")
   ENDIF()
 ENDMACRO()
-
-# When builing with PGO, GCC 9 will report -Wmissing-profile when compiling
-# files for which it cannot find profile data. It is valid to disable
-# this warning for files we are not currently interested in profiling.
-MACRO(DISABLE_MISSING_PROFILE_WARNING)
-  IF(FPROFILE_USE)
-    MY_CHECK_CXX_COMPILER_WARNING("-Wmissing-profile" HAS_WARN_FLAG)
-    IF(HAS_WARN_FLAG)
-      STRING_APPEND(CMAKE_CXX_FLAGS " ${HAS_WARN_FLAG}")
-    ENDIF()
-  ENDIF()
-ENDMACRO()
diff -Nru mysql-8.0-8.0.26/cmake/mysql_add_executable.cmake mysql-8.0-8.0.27/cmake/mysql_add_executable.cmake
--- mysql-8.0-8.0.26/cmake/mysql_add_executable.cmake	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/cmake/mysql_add_executable.cmake	2021-09-28 11:46:34.000000000 +0000
@@ -33,7 +33,6 @@
     ENABLE_EXPORTS
     EXCLUDE_FROM_ALL   # add target, but do not build it by default
     EXCLUDE_FROM_PGO   # add target, but do not build for PGO
-    EXCLUDE_ON_SOLARIS # do not build by default on Solaris
     SKIP_INSTALL       # do not install it
     )
   SET(EXECUTABLE_ONE_VALUE_KW
@@ -43,6 +42,8 @@
     RUNTIME_OUTPUT_DIRECTORY
     )
   SET(EXECUTABLE_MULTI_VALUE_KW
+    COMPILE_DEFINITIONS # for TARGET_COMPILE_DEFINITIONS
+    COMPILE_OPTIONS     # for TARGET_COMPILE_OPTIONS
     DEPENDENCIES
     INCLUDE_DIRECTORIES # for TARGET_INCLUDE_DIRECTORIES
     LINK_LIBRARIES
@@ -93,14 +94,6 @@
     ENDIF()
   ENDIF()
 
-  IF(SOLARIS AND ARG_EXCLUDE_ON_SOLARIS)
-    MESSAGE(WARNING
-      "Likely link failure for this compiler, skipping target ${target}")
-    SET(ARG_EXCLUDE_FROM_ALL TRUE)
-    SET(ARG_SKIP_INSTALL TRUE)
-    UNSET(ARG_ADD_TEST)
-  ENDIF()
-
   IF(ARG_ENABLE_EXPORTS)
     SET_TARGET_PROPERTIES(${target} PROPERTIES ENABLE_EXPORTS TRUE)
   ENDIF()
@@ -116,6 +109,14 @@
   SET_TARGET_PROPERTIES(${target} PROPERTIES
     RUNTIME_OUTPUT_DIRECTORY ${TARGET_RUNTIME_OUTPUT_DIRECTORY})
 
+  IF(ARG_COMPILE_DEFINITIONS)
+    TARGET_COMPILE_DEFINITIONS(${target} PRIVATE ${ARG_COMPILE_DEFINITIONS})
+  ENDIF()
+
+  IF(ARG_COMPILE_OPTIONS)
+    TARGET_COMPILE_OPTIONS(${target} PRIVATE ${ARG_COMPILE_OPTIONS})
+  ENDIF()
+
   IF(WIN32_CLANG AND WITH_ASAN)
     TARGET_LINK_LIBRARIES(${target} "${ASAN_LIB_DIR}/clang_rt.asan-x86_64.lib")
     TARGET_LINK_LIBRARIES(${target} "${ASAN_LIB_DIR}/clang_rt.asan_cxx-x86_64.lib")
diff -Nru mysql-8.0-8.0.26/cmake/mysql_version.cmake mysql-8.0-8.0.27/cmake/mysql_version.cmake
--- mysql-8.0-8.0.26/cmake/mysql_version.cmake	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/cmake/mysql_version.cmake	2021-09-28 11:46:34.000000000 +0000
@@ -25,7 +25,7 @@
 #
 
 SET(SHARED_LIB_MAJOR_VERSION "21")
-SET(SHARED_LIB_MINOR_VERSION "1")
+SET(SHARED_LIB_MINOR_VERSION "2")
 SET(PROTOCOL_VERSION "10")
 
 # Generate "something" to trigger cmake rerun when MYSQL_VERSION changes
diff -Nru mysql-8.0-8.0.26/cmake/os/Darwin.cmake mysql-8.0-8.0.27/cmake/os/Darwin.cmake
--- mysql-8.0-8.0.26/cmake/os/Darwin.cmake	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/cmake/os/Darwin.cmake	2021-09-28 11:46:34.000000000 +0000
@@ -28,16 +28,16 @@
   SET(APPLE_ARM 1)
 ENDIF()
 
-# We require at least XCode 9.0
+# We require at least XCode 10.0
 IF(NOT FORCE_UNSUPPORTED_COMPILER)
   IF(MY_COMPILER_IS_CLANG)
     CHECK_C_SOURCE_RUNS("
       int main()
       {
-        return (__clang_major__ < 9);
+        return (__clang_major__ < 10);
       }" HAVE_SUPPORTED_CLANG_VERSION)
     IF(NOT HAVE_SUPPORTED_CLANG_VERSION)
-      MESSAGE(FATAL_ERROR "XCode 9.0 or newer is required!")
+      MESSAGE(FATAL_ERROR "XCode 10.0 or newer is required!")
     ENDIF()
   ELSE()
     MESSAGE(FATAL_ERROR "Unsupported compiler!")
@@ -53,8 +53,40 @@
   ENDIF()
 ENDIF()
 
-# Use Libtool -static rather than ranlib
-SET(CMAKE_C_CREATE_STATIC_LIBRARY
-  "/usr/bin/libtool -static -no_warning_for_no_symbols -o <TARGET> <LINK_FLAGS> <OBJECTS> ")
-SET(CMAKE_CXX_CREATE_STATIC_LIBRARY
-  "/usr/bin/libtool -static -no_warning_for_no_symbols -o <TARGET> <LINK_FLAGS> <OBJECTS> ")
+# CMAKE_CXX_ARCHIVE_CREATE is by default
+#     "<CMAKE_AR> qc <TARGET> <LINK_FLAGS> <OBJECTS>"
+# And CMAKE_AR is "<toolchain>/usr/bin/ar"
+#
+# CMAKE_CXX_ARCHIVE_FINISH is by default
+#     "<CMAKE_RANLIB> <TARGET>"
+# and CMAKE_RANLIB is "<toolchain>/usr/bin/ranlib>"
+#
+# libtool has an option -no_warning_for_no_symbols
+# but will generate lots of warnings for files with the same basename:
+# /usr/bin/libtool: warning same member name (check_constraints.cc.o) ....
+#
+# To get a clean build, use 'ar' and ensure all source files are non-empty.
+# Use this by default for Ninja and Makefiles.
+IF(APPLE_XCODE)
+  SET(WITH_LIBTOOL_DEFAULT ON)
+ELSE()
+  SET(WITH_LIBTOOL_DEFAULT OFF)
+ENDIF()
+OPTION(WITH_LIBTOOL
+  "Use 'libtool' rather than 'ar' for creating static libraries"
+  ${WITH_LIBTOOL_DEFAULT}
+  )
+
+IF(WITH_LIBTOOL)
+  SET(CMAKE_C_CREATE_STATIC_LIBRARY
+    "/usr/bin/libtool -static -no_warning_for_no_symbols -o <TARGET> <LINK_FLAGS> <OBJECTS> ")
+  SET(CMAKE_CXX_CREATE_STATIC_LIBRARY
+    "/usr/bin/libtool -static -no_warning_for_no_symbols -o <TARGET> <LINK_FLAGS> <OBJECTS> ")
+ELSE()
+  # This did not fix the "library.a(filename.cc.o) has no symbols" warnings.
+  # 'ranlib' has the -no_warning_for_no_symbols option, but 'ar' does not.
+  # STRING(REPLACE "<CMAKE_RANLIB>" "<CMAKE_RANLIB> -no_warning_for_no_symbols"
+  #   CMAKE_C_ARCHIVE_FINISH "${CMAKE_C_ARCHIVE_FINISH}")
+  # STRING(REPLACE "<CMAKE_RANLIB>" "<CMAKE_RANLIB> -no_warning_for_no_symbols"
+  #   CMAKE_CXX_ARCHIVE_FINISH "${CMAKE_CXX_ARCHIVE_FINISH}")
+ENDIF()
diff -Nru mysql-8.0-8.0.26/cmake/os/FreeBSD.cmake mysql-8.0-8.0.27/cmake/os/FreeBSD.cmake
--- mysql-8.0-8.0.26/cmake/os/FreeBSD.cmake	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/cmake/os/FreeBSD.cmake	2021-09-28 11:46:34.000000000 +0000
@@ -45,12 +45,8 @@
       MESSAGE(FATAL_ERROR "Clang 6.0 or newer is required!")
     ENDIF()
   ELSEIF(MY_COMPILER_IS_GNU)
-    EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion
-      OUTPUT_STRIP_TRAILING_WHITESPACE
-      OUTPUT_VARIABLE GCC_VERSION)
-    IF(GCC_VERSION VERSION_LESS 5.3)
-      MESSAGE(FATAL_ERROR
-        "GCC 5.3 or newer is required (-dumpversion says ${GCC_VERSION})")
+    IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.1)
+      MESSAGE(FATAL_ERROR "GCC 7.1 or newer is required")
     ENDIF()
   ELSE()
     MESSAGE(FATAL_ERROR "Unsupported compiler!")
diff -Nru mysql-8.0-8.0.26/cmake/os/Linux.cmake mysql-8.0-8.0.27/cmake/os/Linux.cmake
--- mysql-8.0-8.0.26/cmake/os/Linux.cmake	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/cmake/os/Linux.cmake	2021-09-28 11:46:34.000000000 +0000
@@ -60,30 +60,15 @@
   SET(LINUX_RPM_PLATFORM 1)
 ENDIF()
 
-# We require at least GCC 5.3 or Clang 3.4.
+# We require at least GCC 7.1 Clang 5
 IF(NOT FORCE_UNSUPPORTED_COMPILER)
   IF(MY_COMPILER_IS_GNU)
-    EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion
-                    OUTPUT_STRIP_TRAILING_WHITESPACE
-                    OUTPUT_VARIABLE GCC_VERSION)
-    # -dumpversion may output only MAJOR.MINOR rather than MAJOR.MINOR.PATCH
-    IF(GCC_VERSION VERSION_LESS 5.3)
-      SET(WARNING_LEVEL WARNING)
-      IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.3)
-        SET(WARNING_LEVEL FATAL_ERROR)
-      ENDIF()
-      MESSAGE(${WARNING_LEVEL}
-        "GCC 5.3 or newer is required (-dumpversion says ${GCC_VERSION})")
+    IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.1)
+      MESSAGE(FATAL_ERROR "GCC 7.1 or newer is required")
     ENDIF()
   ELSEIF(MY_COMPILER_IS_CLANG)
-    CHECK_C_SOURCE_RUNS("
-      int main()
-      {
-        return (__clang_major__ < 3) ||
-               (__clang_major__ == 3 && __clang_minor__ < 4);
-      }" HAVE_SUPPORTED_CLANG_VERSION)
-    IF(NOT HAVE_SUPPORTED_CLANG_VERSION)
-      MESSAGE(FATAL_ERROR "Clang 3.4 or newer is required!")
+    IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5)
+      MESSAGE(FATAL_ERROR "Clang 5 or newer is required!")
     ENDIF()
   ELSE()
     MESSAGE(FATAL_ERROR "Unsupported compiler!")
diff -Nru mysql-8.0-8.0.26/cmake/os/SunOS.cmake mysql-8.0-8.0.27/cmake/os/SunOS.cmake
--- mysql-8.0-8.0.26/cmake/os/SunOS.cmake	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/cmake/os/SunOS.cmake	2021-09-28 11:46:34.000000000 +0000
@@ -25,56 +25,33 @@
 INCLUDE(CheckCSourceCompiles) 
 INCLUDE(CheckCXXSourceCompiles)
 
-SET(SOLARIS 1)
 IF(CMAKE_SYSTEM_PROCESSOR MATCHES "sparc")
   SET(SOLARIS_SPARC 1)
 ELSE()
-  SET(SOLARIS_INTEL 1)
+  MESSAGE(FATAL_ERROR "Solaris on Intel is not supported.")
 ENDIF()
 
-IF (NOT "${CMAKE_C_FLAGS}${CMAKE_CXX_FLAGS}" MATCHES "-m32|-m64")
-  IF(NOT FORCE_UNSUPPORTED_COMPILER)
-    MESSAGE("Adding -m64")
-    STRING_APPEND(CMAKE_C_FLAGS        " -m64")
-    STRING_APPEND(CMAKE_CXX_FLAGS      " -m64")
-    STRING_APPEND(CMAKE_C_LINK_FLAGS   " -m64")
-    STRING_APPEND(CMAKE_CXX_LINK_FLAGS " -m64")
-  ENDIF()
+IF("${CMAKE_C_FLAGS}${CMAKE_CXX_FLAGS}" MATCHES "-m32")
+  MESSAGE(FATAL_ERROR "32bit build not supported on Solaris.")
+ENDIF()
+
+IF(NOT "${CMAKE_C_FLAGS}" MATCHES  "-m64")
+  STRING_APPEND(CMAKE_C_FLAGS      " -m64")
+ENDIF()
+IF(NOT "{CMAKE_CXX_FLAGS}" MATCHES "-m64")
+  STRING_APPEND(CMAKE_CXX_FLAGS    " -m64")
 ENDIF()
 
-INCLUDE(CheckTypeSize)
-CHECK_TYPE_SIZE("void *" SIZEOF_VOIDP)
+STRING_APPEND(CMAKE_C_LINK_FLAGS   " -m64")
+STRING_APPEND(CMAKE_CXX_LINK_FLAGS " -m64")
 
 # We require at least SunStudio 12.6 (CC 5.15)
 IF(NOT FORCE_UNSUPPORTED_COMPILER)
   IF(MY_COMPILER_IS_SUNPRO)
-    IF(SIZEOF_VOIDP MATCHES 4)
-      MESSAGE(FATAL_ERROR "32 bit Solaris builds are not supported. ")
-    ENDIF()
-    # CC -V yields
-    # CC: Studio 12.6 Sun C++ 5.15 SunOS_sparc Beta 2016/12/19
-    # CC: Studio 12.5 Sun C++ 5.14 SunOS_sparc Dodona 2016/04/04
-    # CC: Sun C++ 5.13 SunOS_sparc Beta 2014/03/11
-    # CC: Sun C++ 5.11 SunOS_sparc 2010/08/13
-    EXECUTE_PROCESS(
-      COMMAND ${CMAKE_CXX_COMPILER} "-V"
-      OUTPUT_VARIABLE stdout
-      ERROR_VARIABLE  stderr
-      RESULT_VARIABLE result
-    )
-    STRING(REGEX MATCH "CC: Sun C\\+\\+ 5\\.([0-9]+)" VERSION_STRING ${stderr})
-    IF (NOT CMAKE_MATCH_1 OR CMAKE_MATCH_1 STREQUAL "")
-      STRING(REGEX MATCH "CC: Studio 12\\.[56] Sun C\\+\\+ 5\\.([0-9]+)"
-        VERSION_STRING ${stderr})
-    ENDIF()
-    SET(CC_MINOR_VERSION ${CMAKE_MATCH_1})
-    IF(${CC_MINOR_VERSION} LESS 15)
-      MESSAGE(FATAL_ERROR "Oracle Studio 12.6 or newer is required!")
-    ENDIF()
+    MESSAGE(FATAL_ERROR "Oracle Studio is not supported.")
   ELSEIF(MY_COMPILER_IS_CLANG)
     MESSAGE(WARNING "Clang is experimental!!")
   ELSEIF(MY_COMPILER_IS_GNU)
-    MESSAGE(STATUS "CMAKE_CXX_COMPILER_VERSION is ${CMAKE_CXX_COMPILER_VERSION}")
     # 9.2.0 generated code which dumped core in optimized mode.
     IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.2)
       MESSAGE(FATAL_ERROR "GCC 10.2 or newer is required")
@@ -94,10 +71,6 @@
 # http://docs.oracle.com/cd/E19455-01/806-5257/6je9h033k/index.html
 ADD_DEFINITIONS(-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT -D_PTHREADS)
 
-# On  Solaris, use of intrinsics will screw the lib search logic
-# Force using -lm, so rint etc are found.
-SET(LIBM m)
-
 # CMake defined -lthread as thread flag. This crashes in dlopen 
 # when trying to load plugins workaround with -lpthread
 SET(CMAKE_THREAD_LIBS_INIT -lpthread CACHE INTERNAL "" FORCE)
@@ -105,142 +78,4 @@
 # Solaris specific large page support
 CHECK_SYMBOL_EXISTS(MHA_MAPSIZE_VA sys/mman.h  HAVE_SOLARIS_LARGE_PAGES)
 
-# Solaris atomics
-CHECK_C_SOURCE_RUNS(
- "
- #include  <atomic.h>
-  int main()
-  {
-    int foo = -10; int bar = 10;
-    int64_t foo64 = -10; int64_t bar64 = 10;
-    if (atomic_add_int_nv((uint_t *)&foo, bar) || foo)
-      return -1;
-    bar = atomic_swap_uint((uint_t *)&foo, (uint_t)bar);
-    if (bar || foo != 10)
-     return -1;
-    bar = atomic_cas_uint((uint_t *)&bar, (uint_t)foo, 15);
-    if (bar)
-      return -1;
-    if (atomic_add_64_nv((volatile uint64_t *)&foo64, bar64) || foo64)
-      return -1;
-    bar64 = atomic_swap_64((volatile uint64_t *)&foo64, (uint64_t)bar64);
-    if (bar64 || foo64 != 10)
-      return -1;
-    bar64 = atomic_cas_64((volatile uint64_t *)&bar64, (uint_t)foo64, 15);
-    if (bar64)
-      return -1;
-    atomic_or_64((volatile uint64_t *)&bar64, 0);
-    return 0;
-  }
-"  HAVE_SOLARIS_ATOMIC)
-
-# This is used for the version_compile_machine variable.
-IF(SIZEOF_VOIDP MATCHES 8 AND SOLARIS_INTEL)
-  SET(MYSQL_MACHINE_TYPE "x86_64")
-ENDIF()
-
-
-MACRO(DIRNAME IN OUT)
-  GET_FILENAME_COMPONENT(${OUT} ${IN} PATH)
-ENDMACRO()
-
-# We assume that developer studio runtime libraries are installed.
-IF(MY_COMPILER_IS_SUNPRO)
-  DIRNAME(${CMAKE_CXX_COMPILER} CXX_PATH)
-
-  SET(LIBRARY_SUFFIX "lib/compilers/CC-gcc/lib")
-  IF(SIZEOF_VOIDP EQUAL 8 AND SOLARIS_SPARC)
-    SET(LIBRARY_SUFFIX "${LIBRARY_SUFFIX}/sparcv9")
-  ENDIF()
-  IF(SIZEOF_VOIDP EQUAL 8 AND SOLARIS_INTEL)
-    SET(LIBRARY_SUFFIX "${LIBRARY_SUFFIX}/amd64")
-  ENDIF()
-  FIND_LIBRARY(STL_LIBRARY_NAME
-    NAMES "stdc++"
-    PATHS ${CXX_PATH}/../${LIBRARY_SUFFIX}
-    NO_DEFAULT_PATH
-  )
-  MESSAGE(STATUS "STL_LIBRARY_NAME ${STL_LIBRARY_NAME}")
-  IF(STL_LIBRARY_NAME)
-    DIRNAME(${STL_LIBRARY_NAME} STL_LIBRARY_PATH)
-    SET(LRFLAGS " -L${STL_LIBRARY_PATH} -R${STL_LIBRARY_PATH}")
-    SET(QUOTED_CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS}")
-
-    STRING_APPEND(CMAKE_C_LINK_FLAGS          "${LRFLAGS}")
-    STRING_APPEND(CMAKE_CXX_LINK_FLAGS        "${LRFLAGS}")
-    STRING_APPEND(CMAKE_MODULE_LINKER_FLAGS   "${LRFLAGS}")
-    STRING_APPEND(CMAKE_SHARED_LINKER_FLAGS   "${LRFLAGS}")
-    STRING_APPEND(QUOTED_CMAKE_CXX_LINK_FLAGS "${LRFLAGS}")
-  ENDIF()
-
-  STRING_APPEND(CMAKE_C_LINK_FLAGS          " -lc")
-  STRING_APPEND(CMAKE_CXX_LINK_FLAGS        " -lstdc++ -lgcc_s -lCrunG3 -lc")
-  STRING_APPEND(CMAKE_MODULE_LINKER_FLAGS   " -lstdc++ -lgcc_s -lCrunG3 -lc")
-  STRING_APPEND(CMAKE_SHARED_LINKER_FLAGS   " -lstdc++ -lgcc_s -lCrunG3 -lc")
-  STRING_APPEND(QUOTED_CMAKE_CXX_LINK_FLAGS " -lstdc++ -lgcc_s -lCrunG3 -lc")
-
-  SET(LIBRARY_SUFFIX "lib/compilers/atomic")
-  IF(SIZEOF_VOIDP EQUAL 8 AND SOLARIS_SPARC)
-    SET(LIBRARY_SUFFIX "${LIBRARY_SUFFIX}/sparcv9")
-  ENDIF()
-  IF(SIZEOF_VOIDP EQUAL 8 AND SOLARIS_INTEL)
-    SET(LIBRARY_SUFFIX "${LIBRARY_SUFFIX}/amd64")
-  ENDIF()
-  FIND_LIBRARY(ATOMIC_LIBRARY_NAME
-    NAMES "statomic"
-    PATHS ${CXX_PATH}/../${LIBRARY_SUFFIX}
-    NO_DEFAULT_PATH
-  )
-  MESSAGE(STATUS "ATOMIC_LIBRARY_NAME ${ATOMIC_LIBRARY_NAME}")
-  IF(ATOMIC_LIBRARY_NAME)
-    DIRNAME(${ATOMIC_LIBRARY_NAME} ATOMIC_LIB_PATH)
-    SET(LRFLAGS " -L${ATOMIC_LIB_PATH} -R${ATOMIC_LIB_PATH}")
-
-    STRING_APPEND(CMAKE_C_LINK_FLAGS          "${LRFLAGS}")
-    STRING_APPEND(CMAKE_CXX_LINK_FLAGS        "${LRFLAGS}")
-    STRING_APPEND(CMAKE_MODULE_LINKER_FLAGS   "${LRFLAGS}")
-    STRING_APPEND(CMAKE_SHARED_LINKER_FLAGS   "${LRFLAGS}")
-    STRING_APPEND(QUOTED_CMAKE_CXX_LINK_FLAGS "${LRFLAGS}")
-  ENDIF()
-
-  SET(QUOTED_CMAKE_CXX_LINK_FLAGS
-    "${QUOTED_CMAKE_CXX_LINK_FLAGS} -lstatomic ")
-ENDIF()
-
-# Experimental support for clang on Intel Solaris.
-# Try to build and run static_thread_local_test.
-IF(MY_COMPILER_IS_CLANG AND SOLARIS_INTEL)
-  SET(CLANG_OUTPUT_FILE ${CMAKE_BINARY_DIR}/clang-output)
-  EXECUTE_PROCESS(
-    COMMAND ${CMAKE_CXX_COMPILER} --print-search-dirs
-    OUTPUT_FILE ${CLANG_OUTPUT_FILE}
-    )
-  FILE(READ ${CLANG_OUTPUT_FILE} OUTPUT_FILE_CONTENTS)
-  STRING(REPLACE "\n" ";" OUTPUT_FILE_CONTENTS ${OUTPUT_FILE_CONTENTS})
-  FOREACH(LINE ${OUTPUT_FILE_CONTENTS})
-    STRING(REGEX MATCH "(libraries: =)(.*)" XXX ${LINE})
-    IF(CMAKE_MATCH_1)
-      SET(LIBRARIES_STRING "${CMAKE_MATCH_2}")
-    ENDIF()
-  ENDFOREACH()
-  STRING(REPLACE ":" ";" LIBRARIES_LIST "${LIBRARIES_STRING}")
-
-  SET(LRFLAGS "")
-  FOREACH(LIB_PATH ${LIBRARIES_LIST})
-    GET_FILENAME_COMPONENT(REAL_PATH ${LIB_PATH} REALPATH)
-    STRING_APPEND(LRFLAGS " -Wl,-L${REAL_PATH} -Wl,-R${REAL_PATH}")
-  ENDFOREACH()
-
-  STRING_APPEND(CMAKE_C_LINK_FLAGS          "${LRFLAGS}")
-  STRING_APPEND(CMAKE_CXX_LINK_FLAGS        "${LRFLAGS}")
-  STRING_APPEND(CMAKE_MODULE_LINKER_FLAGS   "${LRFLAGS}")
-  STRING_APPEND(CMAKE_SHARED_LINKER_FLAGS   "${LRFLAGS}")
-
-  STRING_APPEND(CMAKE_C_LINK_FLAGS          " -lc")
-  STRING_APPEND(CMAKE_CXX_LINK_FLAGS        " -lstdc++ -lgcc_s -lc")
-  STRING_APPEND(CMAKE_MODULE_LINKER_FLAGS   " -lstdc++ -lgcc_s -lc")
-  STRING_APPEND(CMAKE_SHARED_LINKER_FLAGS   " -lstdc++ -lgcc_s -lc")
-  STRING_APPEND(QUOTED_CMAKE_CXX_LINK_FLAGS " -lstdc++ -lgcc_s -lc")
-ENDIF()
-
 SET(LINK_FLAG_Z_DEFS "-z,defs")
diff -Nru mysql-8.0-8.0.26/cmake/os/Windows.cmake mysql-8.0-8.0.27/cmake/os/Windows.cmake
--- mysql-8.0-8.0.26/cmake/os/Windows.cmake	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/cmake/os/Windows.cmake	2021-09-28 11:46:34.000000000 +0000
@@ -38,22 +38,19 @@
   SET(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "/imsvc ")
 ENDIF()
 
-# Optionally read user configuration, generated by configure.js.
-# This is left for backward compatibility reasons only.
-INCLUDE(${CMAKE_BINARY_DIR}/win/configure.data OPTIONAL)
-
 # avoid running system checks by using pre-cached check results
 # system checks are expensive on VS since every tiny program is to be compiled
 # in a VC solution.
 GET_FILENAME_COMPONENT(_SCRIPT_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
 INCLUDE(${_SCRIPT_DIR}/WindowsCache.cmake)
 
-# We require at least Visual Studio 2019 Update 4 (aka 16.4),
-# which has version nr 1924.
+# We require at least Visual Studio 2019 Update 9 (aka 16.9),
+# which has version nr 1928.
+# https://docs.microsoft.com/en-us/cpp/preprocessor/predefined-macros?view=msvc-160
 MESSAGE(STATUS "MSVC_VERSION is ${MSVC_VERSION}")
-IF(NOT FORCE_UNSUPPORTED_COMPILER AND MSVC_VERSION LESS 1924)
+IF(NOT FORCE_UNSUPPORTED_COMPILER AND MSVC_VERSION LESS 1928)
   MESSAGE(FATAL_ERROR
-    "Visual Studio 2019 Update 4 or newer is required!")
+    "Visual Studio 2019 Update 9 or newer is required!")
 ENDIF()
 
 # OS display name (version_compile_os etc).
@@ -161,20 +158,13 @@
     SET("${flag}" "${${flag}} /FC")
   ENDFOREACH()
 
-  # Turn on c++14 mode explicitly so that using c++17 features is disabled.
-  # For clang 10 we must use C++17. See:
-  # https://developercommunity.visualstudio.com/content/problem/665343/
-  # vs2019-stl-with-clang-cl-and-stdc14-generates-dupl.html
+  # Turn on c++17 mode explicitly so that using c++20 features is disabled.
   FOREACH(flag
       CMAKE_CXX_FLAGS_MINSIZEREL
       CMAKE_CXX_FLAGS_RELEASE  CMAKE_CXX_FLAGS_RELWITHDEBINFO
       CMAKE_CXX_FLAGS_DEBUG    CMAKE_CXX_FLAGS_DEBUG_INIT
       )
-    IF(WIN32_CLANG)
-      SET("${flag}" "${${flag}} /std:c++17")
-    ELSE()
-      SET("${flag}" "${${flag}} /std:c++14")
-    ENDIF()
+    SET("${flag}" "${${flag}} /std:c++17")
   ENDFOREACH()
 
   FOREACH(type EXE SHARED MODULE)
@@ -190,6 +180,25 @@
     STRING_APPEND(CMAKE_CXX_FLAGS " /MP")
   ENDIF()
 
+  IF(WIN32_CLANG)
+    # Adding -Wno-deprecated-declarations does not silence warnings,
+    # so add misc. macros instead.
+
+    # warning STL4015 The std::iterator class
+    # (used as a base class to provide typedefs) is deprecated in C++17
+    STRING_APPEND(CMAKE_CXX_FLAGS
+      " -D_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING")
+
+    # 'strcpy' is deprecated. This function or variable may be unsafe.
+    STRING_APPEND(CMAKE_C_FLAGS   " -D_CRT_SECURE_NO_WARNINGS")
+    STRING_APPEND(CMAKE_CXX_FLAGS " -D_CRT_SECURE_NO_WARNINGS")
+
+    # 'getpid' is deprecated. The POSIX name for this item is deprecated.
+    # Instead use the ISO C and C++ conformant name _getpid.
+    STRING_APPEND(CMAKE_C_FLAGS   " -D_CRT_NONSTDC_NO_DEPRECATE")
+    STRING_APPEND(CMAKE_CXX_FLAGS " -D_CRT_NONSTDC_NO_DEPRECATE")
+  ENDIF()
+
   #TODO: update the code and remove the disabled warnings
 
   # The compiler encountered a deprecated declaration.
diff -Nru mysql-8.0-8.0.26/cmake/package_name.cmake mysql-8.0-8.0.27/cmake/package_name.cmake
--- mysql-8.0-8.0.26/cmake/package_name.cmake	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/cmake/package_name.cmake	2021-09-28 11:46:34.000000000 +0000
@@ -52,13 +52,7 @@
       # SunOS 5.10=> solaris10
       STRING(REPLACE "5." "" VER "${CMAKE_SYSTEM_VERSION}")
       SET(DEFAULT_PLATFORM "solaris${VER}")
-      IF(64BIT)
-        IF(SOLARIS_INTEL)
-          SET(DEFAULT_MACHINE "x86_64")
-        ELSE()
-          SET(DEFAULT_MACHINE "${CMAKE_SYSTEM_PROCESSOR}-64bit")
-        ENDIF()
-      ENDIF()
+      SET(DEFAULT_MACHINE "${CMAKE_SYSTEM_PROCESSOR}-64bit")
     ELSEIF(FREEBSD)
       STRING(REGEX MATCH "[0-9]+\\.[0-9]+"  VER "${CMAKE_SYSTEM_VERSION}")
       SET(DEFAULT_PLATFORM "${CMAKE_SYSTEM_NAME}${VER}")
diff -Nru mysql-8.0-8.0.26/cmake/plugin.cmake mysql-8.0-8.0.27/cmake/plugin.cmake
--- mysql-8.0-8.0.26/cmake/plugin.cmake	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/cmake/plugin.cmake	2021-09-28 11:46:34.000000000 +0000
@@ -33,6 +33,8 @@
     STATIC_ONLY
     STORAGE_ENGINE
     TEST_ONLY
+    VISIBILITY_HIDDEN # Add -fvisibility=hidden on UNIX
+                      # TODO(tdidriks) make this default if MODULE_ONLY
     )
   SET(PLUGIN_ONE_VALUE_KW
     MODULE_OUTPUT_NAME
@@ -273,7 +275,16 @@
     TARGET_LINK_LIBRARIES (${target} ${ARG_LINK_LIBRARIES})
   ENDIF()
 
-ENDMACRO()
+  IF(BUILD_PLUGIN AND ARG_VISIBILITY_HIDDEN AND UNIX)
+    TARGET_COMPILE_OPTIONS(${target} PRIVATE "-fvisibility=hidden")
+  ENDIF()
+
+  IF(BUILD_PLUGIN AND ARG_MODULE_ONLY)
+    ADD_OBJDUMP_TARGET(show_${target} "$<TARGET_FILE:${target}>"
+      DEPENDS ${target})
+  ENDIF()
+
+ENDMACRO(MYSQL_ADD_PLUGIN)
 
 
 # Add all CMake projects under storage  and plugin 
diff -Nru mysql-8.0-8.0.26/cmake/protobuf.cmake mysql-8.0-8.0.27/cmake/protobuf.cmake
--- mysql-8.0-8.0.26/cmake/protobuf.cmake	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/cmake/protobuf.cmake	2021-09-28 11:46:34.000000000 +0000
@@ -29,6 +29,37 @@
 #  Other values will be ignored, and we fall back to "bundled"
 #
 
+# Bundled version is currently 3.11.1
+# Lowest checked system version is 3.5.0 on Oracle Linux 8.
+# Older versions may generate code which breaks the -Werror build.
+SET(MIN_PROTOBUF_VERSION_REQUIRED "3.5.0")
+
+MACRO(FIND_PROTOBUF_VERSION)
+  # Verify protobuf version number. Version information looks like:
+  # // The current version, represented as a single integer to make comparison
+  # // easier:  major * 10^6 + minor * 10^3 + micro
+  # #define GOOGLE_PROTOBUF_VERSION 3012004
+  FILE(STRINGS "${PROTOBUF_INCLUDE_DIR}/google/protobuf/stubs/common.h"
+    PROTOBUF_VERSION_NUMBER
+    REGEX "^#define[\t ]+GOOGLE_PROTOBUF_VERSION[\t ][0-9]+.*"
+    )
+  MESSAGE(STATUS "PROTOBUF_VERSION_NUMBER is ${PROTOBUF_VERSION_NUMBER}")
+  STRING(REGEX MATCH
+    ".*VERSION[\t ]([0-9]+).*" V_NUM "${PROTOBUF_VERSION_NUMBER}")
+
+  MATH(EXPR PB_MAJOR_VERSION "${CMAKE_MATCH_1} / 1000000")
+  MATH(EXPR MINOR_MICRO "${CMAKE_MATCH_1} - (1000000 * ${PB_MAJOR_VERSION})")
+  MATH(EXPR PB_MINOR_VERSION "${MINOR_MICRO} / 1000")
+  MATH(EXPR PB_MICRO_VERSION "${MINOR_MICRO} - (1000 * ${PB_MINOR_VERSION})")
+
+  SET(PROTOBUF_VERSION
+    "${PB_MAJOR_VERSION}.${PB_MINOR_VERSION}.${PB_MICRO_VERSION}")
+  SET(PROTOBUF_VERSION "${PROTOBUF_VERSION}" CACHE INTERNAL
+    "PROTOBUF major.minor.micro")
+  MESSAGE(STATUS
+    "PROTOBUF_VERSION (${WITH_PROTOBUF}) is ${PROTOBUF_VERSION}")
+ENDMACRO(FIND_PROTOBUF_VERSION)
+
 MACRO(ECHO_PROTOBUF_VARIABLES)
   MESSAGE(STATUS "PROTOBUF_INCLUDE_DIR ${PROTOBUF_INCLUDE_DIR}")
   MESSAGE(STATUS "PROTOBUF_LIBRARY ${PROTOBUF_LIBRARY}")
@@ -38,8 +69,10 @@
 
 MACRO(COULD_NOT_FIND_PROTOBUF)
   ECHO_PROTOBUF_VARIABLES()
-  MESSAGE(STATUS "Could not find (the correct version of) protobuf.")
-  MESSAGE(STATUS "MySQL currently requires at least protobuf version 3.0")
+  MESSAGE(WARNING
+    "Could not find (the correct version of) protobuf.\n"
+    "MySQL currently requires at least protobuf "
+    "version ${MIN_PROTOBUF_VERSION_REQUIRED}")
   MESSAGE(FATAL_ERROR
     "You can build with the bundled sources"
     )
@@ -85,7 +118,7 @@
       NOT WITH_PROTOBUF STREQUAL "system")
     SET(WITH_PROTOBUF "bundled")
   ENDIF()
-  MESSAGE(STATUS "WITH_PROTOBUF=${WITH_PROTOBUF}")
+
   IF(WITH_PROTOBUF STREQUAL "bundled")
     MYSQL_USE_BUNDLED_PROTOBUF()
   ELSE()
@@ -110,27 +143,8 @@
     MESSAGE(FATAL_ERROR "Use bundled protobuf, or install missing packages")
   ENDIF()
 
-  # Verify protobuf version number. Version information looks like:
-  # // The current version, represented as a single integer to make comparison
-  # // easier:  major * 10^6 + minor * 10^3 + micro
-  # #define GOOGLE_PROTOBUF_VERSION 2006000
-  FILE(STRINGS "${PROTOBUF_INCLUDE_DIR}/google/protobuf/stubs/common.h"
-    PROTOBUF_VERSION_NUMBER
-    REGEX "^#define[\t ]+GOOGLE_PROTOBUF_VERSION[\t ][0-9]+.*"
-    )
-  STRING(REGEX REPLACE
-    "^.*GOOGLE_PROTOBUF_VERSION[\t ]([0-9])[0-9][0-9]([0-9])[0-9][0-9].*$"
-    "\\1"
-    PROTOBUF_MAJOR_VERSION "${PROTOBUF_VERSION_NUMBER}")
-  STRING(REGEX REPLACE
-    "^.*GOOGLE_PROTOBUF_VERSION[\t ]([0-9])[0-9][0-9]([0-9])[0-9][0-9].*$"
-    "\\2"
-    PROTOBUF_MINOR_VERSION "${PROTOBUF_VERSION_NUMBER}")
-
-  MESSAGE(STATUS
-    "PROTOBUF_VERSION_NUMBER is ${PROTOBUF_VERSION_NUMBER}")
-
-  IF("${PROTOBUF_MAJOR_VERSION}.${PROTOBUF_MINOR_VERSION}" VERSION_LESS "3.0")
+  FIND_PROTOBUF_VERSION()
+  IF("${PROTOBUF_VERSION}" VERSION_LESS "${MIN_PROTOBUF_VERSION_REQUIRED}")
     COULD_NOT_FIND_PROTOBUF()
   ENDIF()
   ECHO_PROTOBUF_VARIABLES()
diff -Nru mysql-8.0-8.0.26/cmake/rapidjson.cmake mysql-8.0-8.0.27/cmake/rapidjson.cmake
--- mysql-8.0-8.0.26/cmake/rapidjson.cmake	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/cmake/rapidjson.cmake	2021-09-28 11:46:34.000000000 +0000
@@ -23,14 +23,6 @@
 # We require rapidjson version 1.1.0 or higher.
 # -DWITH_RAPIDJSON=bundled is the default
 
-IF(MY_COMPILER_IS_SUNPRO)
-  # Oracle Developer Studio 12.x isn't detected as c++11 compliant by rapidjson
-  # automatically.
-  ADD_DEFINITIONS(-DRAPIDJSON_HAS_CXX11_RANGE_FOR=1)
-  ADD_DEFINITIONS(-DRAPIDJSON_HAS_CXX11_NOEXCEPT=1)
-  ADD_DEFINITIONS(-DRAPIDJSON_HAS_CXX11_RVALUE_REFS=1)
-ENDIF()
-
 MACRO(WRONG_RAPIDJSON_VERSION)
   MESSAGE(FATAL_ERROR "rapidjson version 1.1.0 or higher is required.")
 ENDMACRO()
diff -Nru mysql-8.0-8.0.26/cmake/zstd.cmake mysql-8.0-8.0.27/cmake/zstd.cmake
--- mysql-8.0-8.0.26/cmake/zstd.cmake	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/cmake/zstd.cmake	2021-09-28 11:46:34.000000000 +0000
@@ -62,10 +62,13 @@
   ENDIF()
 ENDMACRO()
 
+SET(ZSTD_VERSION_DIR "zstd-1.5.0")
+SET(BUNDLED_ZSTD_PATH ${CMAKE_SOURCE_DIR}/extra/zstd/${ZSTD_VERSION_DIR}/lib)
+
 MACRO (MYSQL_USE_BUNDLED_ZSTD)
   SET(ZSTD_LIBRARY zstd CACHE INTERNAL "Bundled zlib library")
   SET(WITH_ZSTD "bundled" CACHE STRING "Use bundled zstd")
-  SET(ZSTD_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/extra/zstd/lib)
+  SET(ZSTD_INCLUDE_DIR ${BUNDLED_ZSTD_PATH})
   INCLUDE_DIRECTORIES(BEFORE SYSTEM ${ZSTD_INCLUDE_DIR})
   ADD_SUBDIRECTORY(extra/zstd)
 ENDMACRO()
diff -Nru mysql-8.0-8.0.26/CMakeLists.txt mysql-8.0-8.0.27/CMakeLists.txt
--- mysql-8.0-8.0.26/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -23,8 +23,8 @@
 MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
 
 IF(WIN32)
-  # CMake 3.8.0 is needed for Visual Studio 2017 and x64 toolset.
-  CMAKE_MINIMUM_REQUIRED(VERSION 3.8.0)
+  # Load policies. This is needed in order to parse the wmic version check.
+  CMAKE_MINIMUM_REQUIRED(VERSION 3.5.1)
   EXECUTE_PROCESS(COMMAND wmic os get version
     OUTPUT_VARIABLE NT_RELEASE_VERSION
     OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -233,6 +233,10 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 3.5.1)
 INCLUDE(cmake_policies NO_POLICY_SCOPE)
 
+IF(MY_HOST_SYSTEM_NAME MATCHES "SunOS")
+  SET(SOLARIS 1)
+ENDIF()
+
 IF(MY_HOST_SYSTEM_NAME MATCHES "Linux")
   # Trust 'rpm -qf /' rather than 'uname -s'
   STRING(REGEX MATCH "\\.el([678])\\." MATCH_FSYS "${MY_HOST_FILESYSTEM_NAME}")
@@ -300,20 +304,52 @@
         FIND_PROGRAM(ALTERNATIVE_GPP g++
           NO_DEFAULT_PATH
           PATHS "${OPT_PATH}/root/usr/bin")
+        FIND_PROGRAM(ALTERNATIVE_LD ld
+          NO_DEFAULT_PATH
+          PATHS "${OPT_PATH}/root/usr/bin")
+        FIND_PROGRAM(ALTERNATIVE_AR ar
+          NO_DEFAULT_PATH
+          PATHS "${OPT_PATH}/root/usr/bin")
+        FIND_PROGRAM(ALTERNATIVE_RANLIB ranlib
+          NO_DEFAULT_PATH
+          PATHS "${OPT_PATH}/root/usr/bin")
         FIND_PROGRAM(ALTERNATIVE_ENABLE enable
           NO_DEFAULT_PATH
           PATHS "${OPT_PATH}")
       ENDFOREACH()
-      IF(ALTERNATIVE_GCC AND ALTERNATIVE_GPP)
+      # A missing ALTERNATIVE_LD may generate bad executables.
+      IF(ALTERNATIVE_GCC AND ALTERNATIVE_GPP AND ALTERNATIVE_LD)
         SET(CMAKE_C_COMPILER ${ALTERNATIVE_GCC})
         SET(CMAKE_CXX_COMPILER ${ALTERNATIVE_GPP})
+        SET(CMAKE_LINKER ${ALTERNATIVE_LD})
+        SET(CMAKE_LINKER ${ALTERNATIVE_LD} CACHE PATH "Alternative ld")
+        IF(ALTERNATIVE_AR)
+          SET(CMAKE_AR ${ALTERNATIVE_AR})
+          SET(CMAKE_AR ${ALTERNATIVE_AR} CACHE PATH "Alternative ar")
+        ENDIF()
+        IF(ALTERNATIVE_RANLIB)
+          SET(CMAKE_RANLIB ${ALTERNATIVE_RANLIB})
+          SET(CMAKE_RANLIB ${ALTERNATIVE_RANLIB} CACHE PATH "Alternative ranlib")
+        ENDIF()
         MESSAGE(STATUS "Using ${ALTERNATIVE_GCC}")
         MESSAGE(STATUS "Using ${ALTERNATIVE_GPP}")
       ELSE()
+        IF(LINUX_RHEL6)
+          SET(DEV_PACKAGES
+            "devtoolset-8-gcc devtoolset-8-gcc-c++ devtoolset-8-binutils")
+        ELSEIF(LINUX_RHEL7)
+          SET(DEV_PACKAGES
+            "devtoolset-10-gcc devtoolset-10-gcc-c++ devtoolset-10-binutils")
+        ELSEIF(LINUX_RHEL8)
+          SET(DEV_PACKAGES
+            "gcc-toolset-10-gcc gcc-toolset-10-gcc-c++ gcc-toolset-10-binutils")
+        ENDIF()
         MESSAGE(WARNING
-          "Could not find devtoolset compiler in ${ALTERNATIVE_PATHS}")
+          "Could not find devtoolset compiler/linker in ${ALTERNATIVE_PATHS}")
+        MESSAGE(WARNING "You need to install the required packages:\n"
+          " yum install ${DEV_PACKAGES}\n")
         MESSAGE(FATAL_ERROR
-          "Please set CMAKE_C_COMPILER and CMAKE_CXX_COMPILER explicitly.")
+          "Or you can set CMAKE_C_COMPILER and CMAKE_CXX_COMPILER explicitly.")
       ENDIF()
 
     ELSEIF(LINUX_UBUNTU_18_04)
@@ -324,6 +360,20 @@
       FIND_PROGRAM(ALTERNATIVE_GPP g++-8
         NO_DEFAULT_PATH
         PATHS "/usr/bin")
+      FIND_PROGRAM(GCC_AR_EXECUTABLE gcc-ar-8
+        NO_DEFAULT_PATH
+        PATHS "/usr/bin")
+      FIND_PROGRAM(GCC_RANLIB_EXECUTABLE gcc-ranlib-8
+        NO_DEFAULT_PATH
+        PATHS "/usr/bin")
+      IF(GCC_AR_EXECUTABLE)
+        SET(CMAKE_AR ${GCC_AR_EXECUTABLE})
+        SET(CMAKE_AR ${GCC_AR_EXECUTABLE} CACHE PATH "Alternative ar")
+      ENDIF()
+      IF(GCC_RANLIB_EXECUTABLE)
+        SET(CMAKE_RANLIB ${GCC_RANLIB_EXECUTABLE})
+        SET(CMAKE_RANLIB ${GCC_RANLIB_EXECUTABLE} CACHE PATH "Alternative ranlib")
+      ENDIF()
       IF (ALTERNATIVE_GCC AND ALTERNATIVE_GPP)
         SET(CMAKE_C_COMPILER ${ALTERNATIVE_GCC})
         SET(CMAKE_CXX_COMPILER ${ALTERNATIVE_GPP})
@@ -345,6 +395,12 @@
         FIND_PROGRAM(ALTERNATIVE_GPP g++-10
           NO_DEFAULT_PATH
           PATHS "/usr/bin")
+        FIND_PROGRAM(GCC_AR_EXECUTABLE gcc-ar-10
+          NO_DEFAULT_PATH
+          PATHS "/usr/bin")
+        FIND_PROGRAM(GCC_RANLIB_EXECUTABLE gcc-ranlib-10
+          NO_DEFAULT_PATH
+          PATHS "/usr/bin")
       ELSEIF(LINUX_SUSE_15)
         FIND_PROGRAM(ALTERNATIVE_GCC gcc-9
           NO_DEFAULT_PATH
@@ -352,6 +408,20 @@
         FIND_PROGRAM(ALTERNATIVE_GPP g++-9
           NO_DEFAULT_PATH
           PATHS "/usr/bin")
+        FIND_PROGRAM(GCC_AR_EXECUTABLE gcc-ar-9
+          NO_DEFAULT_PATH
+          PATHS "/usr/bin")
+        FIND_PROGRAM(GCC_RANLIB_EXECUTABLE gcc-ranlib-9
+          NO_DEFAULT_PATH
+          PATHS "/usr/bin")
+      ENDIF()
+      IF(GCC_AR_EXECUTABLE)
+        SET(CMAKE_AR ${GCC_AR_EXECUTABLE})
+        SET(CMAKE_AR ${GCC_AR_EXECUTABLE} CACHE PATH "Alternative ar")
+      ENDIF()
+      IF(GCC_RANLIB_EXECUTABLE)
+        SET(CMAKE_RANLIB ${GCC_RANLIB_EXECUTABLE})
+        SET(CMAKE_RANLIB ${GCC_RANLIB_EXECUTABLE} CACHE PATH "Alternative ranlib")
       ENDIF()
       IF (ALTERNATIVE_GCC AND ALTERNATIVE_GPP)
         SET(CMAKE_C_COMPILER ${ALTERNATIVE_GCC})
@@ -373,6 +443,22 @@
             "or set CMAKE_C_COMPILER and CMAKE_CXX_COMPILER explicitly.")
         ENDIF()
       ENDIF()
+    ELSEIF(SOLARIS)
+      MESSAGE(STATUS "Looking for GCC 10 on Solaris.")
+      FIND_PROGRAM(ALTERNATIVE_GCC gcc
+        NO_DEFAULT_PATH
+        PATHS "/usr/gcc/10/bin")
+      FIND_PROGRAM(ALTERNATIVE_GPP g++
+        NO_DEFAULT_PATH
+        PATHS "/usr/gcc/10/bin")
+      IF (ALTERNATIVE_GCC AND ALTERNATIVE_GPP)
+        SET(CMAKE_C_COMPILER ${ALTERNATIVE_GCC})
+        SET(CMAKE_CXX_COMPILER ${ALTERNATIVE_GPP})
+        MESSAGE(STATUS "Using ${ALTERNATIVE_GCC}")
+        MESSAGE(STATUS "Using ${ALTERNATIVE_GPP}")
+      ELSE()
+        MESSAGE(WARNING "Could not find /usr/gcc/10/bin/gcc")
+      ENDIF()
     ENDIF()
   ENDIF()
 ENDIF()
@@ -593,11 +679,14 @@
 
 # Add RPM or DEB platform flags for STANDALONE build.
 # Not for DEBUG builds, since both platforms use -O2 and _FORTIFY_SOURCE.
+# Not for Release or MinSizeRel, it will inflate binary sizes.
 IF(LINUX_STANDALONE AND (LINUX_DEB_PLATFORM OR LINUX_RPM_PLATFORM))
   IF(CMAKE_BUILD_TYPE_UPPER STREQUAL "DEBUG" OR WITH_DEBUG)
     SET(WITH_PACKAGE_FLAGS_DEFAULT OFF)
-  ELSE()
+  ELSEIF(CMAKE_BUILD_TYPE_UPPER STREQUAL "RELWITHDEBINFO")
     SET(WITH_PACKAGE_FLAGS_DEFAULT ON)
+  ELSE()
+    SET(WITH_PACKAGE_FLAGS_DEFAULT OFF)
   ENDIF()
   OPTION(WITH_PACKAGE_FLAGS
     "Use DEB/RPM compiler flags" ${WITH_PACKAGE_FLAGS_DEFAULT})
@@ -628,6 +717,18 @@
   INCLUDE(${CMAKE_SOURCE_DIR}/cmake/build_configurations/compiler_options.cmake)
 ENDIF()
 
+# Set correct search path for executables, libraries, and data files.
+IF(LINUX_RHEL)
+  IF(ALTERNATIVE_GCC)
+    GET_FILENAME_COMPONENT(GCC_B_PREFIX ${ALTERNATIVE_GCC} DIRECTORY)
+    STRING_PREPEND(CMAKE_C_FLAGS "-B${GCC_B_PREFIX} ")
+  ENDIF()
+  IF(ALTERNATIVE_GPP)
+    GET_FILENAME_COMPONENT(GPP_B_PREFIX ${ALTERNATIVE_GPP} DIRECTORY)
+    STRING_PREPEND(CMAKE_CXX_FLAGS "-B${GPP_B_PREFIX} ")
+  ENDIF()
+ENDIF()
+
 INCLUDE(CMakePushCheckState)
 
 # Add macros
@@ -660,7 +761,7 @@
 INCLUDE(rapidjson)
 INCLUDE(fprofile)
 INCLUDE(gloves)
-
+INCLUDE(fido2)
 
 IF(UNIX)
   OPTION(WITH_VALGRIND "Valgrind instrumentation" OFF)
@@ -736,10 +837,21 @@
   "Report error if the Kerberos authentication plugin cannot be built."
   ${WITH_AUTHENTICATION_KERBEROS_DEFAULT})
 
+IF(WITH_INTERNAL AND (NOT SOLARIS))
+  SET(WITH_AUTHENTICATION_FIDO_DEFAULT ON)
+ELSE()
+  SET(WITH_AUTHENTICATION_FIDO_DEFAULT OFF)
+ENDIF()
+
+OPTION(WITH_AUTHENTICATION_FIDO
+  "Report error if the FIDO authentication plugin cannot be built."
+  ${WITH_AUTHENTICATION_FIDO_DEFAULT})
+
 # Default ON if we are building server-side plugins.
 # Also default ON in pushbuild, for our community builds.
 IF(WITH_AUTHENTICATION_KERBEROS OR
     WITH_AUTHENTICATION_LDAP OR
+    WITH_AUTHENTICATION_FIDO OR
     DEFINED ENV{PB2WORKDIR})
   SET(WITH_AUTHENTICATION_CLIENT_PLUGINS_DEFAULT ON)
 ELSE()
@@ -751,6 +863,8 @@
 #   authentication_kerberos_client.so
 # The LDAP client authentication plugin
 #   authentication_ldap_sasl_client.so
+# The FIDO client authentication plugin
+#   authentication_fido_client.so
 OPTION(WITH_AUTHENTICATION_CLIENT_PLUGINS
   "Build client-side authentication plugins, even if server-side are disabled"
   ${WITH_AUTHENTICATION_CLIENT_PLUGINS_DEFAULT})
@@ -857,6 +971,19 @@
   ENDIF()
 ENDFUNCTION()
 
+# When builing with PGO, GCC will report -Wmissing-profile when compiling
+# files for which it cannot find profile data. It is valid to disable
+# this warning for files we are not currently interested in profiling.
+MACRO(DISABLE_MISSING_PROFILE_WARNING)
+  IF(FPROFILE_USE)
+    MY_CHECK_CXX_COMPILER_WARNING("-Wmissing-profile" HAS_WARN_FLAG)
+    IF(HAS_WARN_FLAG)
+      STRING_APPEND(CMAKE_C_FLAGS   " ${HAS_WARN_FLAG}")
+      STRING_APPEND(CMAKE_CXX_FLAGS " ${HAS_WARN_FLAG}")
+    ENDIF()
+  ENDIF()
+ENDMACRO()
+
 MACRO(MY_SANITIZER_CHECK SAN_OPT ADD_OPTIMIZATION RESULT)
   MY_CHECK_C_COMPILER_FLAG("${SAN_OPT}" C_RESULT)
   MY_CHECK_CXX_COMPILER_FLAG("${SAN_OPT}" CXX_RESULT)
@@ -1188,8 +1315,12 @@
   STRING_APPEND(CMAKE_C_FLAGS   " ${DEBUG_PREFIX_FLAGS}")
   STRING_APPEND(CMAKE_CXX_FLAGS " ${DEBUG_PREFIX_FLAGS}")
 
-  STRING_APPEND(CMAKE_C_LINK_FLAGS " -Wl,--build-id=none")
-  STRING_APPEND(CMAKE_CXX_LINK_FLAGS " -Wl,--build-id=none")
+  # DEB/RPM will want to set build id.
+  IF(INSTALL_LAYOUT MATCHES "STANDALONE" OR INSTALL_LAYOUT MATCHES "TARGZ")
+    STRING_APPEND(CMAKE_C_LINK_FLAGS " -Wl,--build-id=none")
+    STRING_APPEND(CMAKE_CXX_LINK_FLAGS " -Wl,--build-id=none")
+  ENDIF()
+
   SET(BISON_NO_LINE_OPT "--no-lines")
 
   SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_COMPILE
@@ -1412,6 +1543,7 @@
   SSL
   ZLIB
   ZSTD
+  FIDO
   )
 
 SET(WITH_SYSTEM_LIBS_DEFAULT OFF)
@@ -1591,6 +1723,28 @@
 # Add RapidJSON library.
 MYSQL_CHECK_RAPIDJSON()
 
+# Look for fido2 library
+MYSQL_CHECK_FIDO()
+MYSQL_CHECK_FIDO_DLLS()
+
+IF(WITH_AUTHENTICATION_FIDO OR WITH_AUTHENTICATION_CLIENT_PLUGINS)
+  IF(WITH_FIDO STREQUAL "system" AND
+    NOT WITH_SSL STREQUAL "system")
+      MESSAGE(WARNING "-DWITH_AUTHENTICATION_FIDO=ON")
+      MESSAGE(FATAL_ERROR "Inconsistent options for FIDO/SSL")
+  ENDIF()
+
+  # FIDO (or libudev) missing, warn about what is missing, and break the build.
+  IF(WITH_AUTHENTICATION_FIDO AND NOT FIDO_FOUND)
+    SET(UDEV_WARN_MISSING)
+    SET(FIDO_WARN_MISSING)
+    WARN_MISSING_SYSTEM_UDEV(UDEV_WARN_MISSING)
+    WARN_MISSING_SYSTEM_FIDO(FIDO_WARN_MISSING)
+    MESSAGE(FATAL_ERROR
+      "-DWITH_AUTHENTICATION_FIDO=ON, but missing required libraries")
+  ENDIF()
+ENDIF()
+
 MACRO(MY_INCLUDE_SYSTEM_DIRECTORIES LIBRARY)
   IF(${WITH_${LIBRARY}} STREQUAL "bundled")
     SET(BEFORE_OR_AFTER "BEFORE")
@@ -1640,11 +1794,33 @@
   HAVE_PTHREAD_SETNAME_NP)
 ENDIF()
 
-IF(WITH_PROTOBUF STREQUAL "bundled")
+IF(WITH_PROTOBUF STREQUAL "bundled" OR WITH_FIDO STREQUAL "bundled")
   # Protobuf library is a target, installed to <root>/${INSTALL_PRIV_LIBDIR}
   # INSTALL_RPATH must be set for all binaries linking with libprotobuf.
-  SET(UNIX_INSTALL_RPATH_ORIGIN_PRIV_LIBDIR 1)
-  ADD_SUBDIRECTORY(extra/protobuf)
+  IF(WITH_PROTOBUF STREQUAL "bundled")
+    SET(UNIX_INSTALL_RPATH_ORIGIN_PRIV_LIBDIR 1)
+    ADD_SUBDIRECTORY(extra/protobuf)
+  ENDIF()
+
+  # The Fido library is a target, installed to <root>/${INSTALL_PRIV_LIBDIR}
+  # INSTALL_RPATH must be set for all binaries linking with libfido2.
+  IF(WITH_FIDO STREQUAL "bundled")
+    SET(INSTALL_RPATH_FOR_FIDO2 1)
+
+    # Do not break the build here in case of missing libudev on Linux.
+    SET(UDEV_WARN_MISSING FALSE)
+    WARN_MISSING_SYSTEM_UDEV(UDEV_WARN_MISSING)
+    IF((WITH_AUTHENTICATION_FIDO OR WITH_AUTHENTICATION_CLIENT_PLUGINS)
+        AND NOT UDEV_WARN_MISSING)
+      # Silence warning about CMP0075
+      CMAKE_PUSH_CHECK_STATE()
+      SET(CMAKE_REQUIRED_LIBRARIES)
+      ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${CBOR_BUNDLE_SRC_PATH})
+      ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${FIDO_BUNDLE_SRC_PATH})
+      CMAKE_POP_CHECK_STATE()
+    ENDIF()
+  ENDIF()
+
   IF(NOT APPLE AND NOT WIN32)
     # Debug versions of plugins may be installed to <root>/lib/plugin/debug
     FOREACH(LINK_FLAG
@@ -1702,18 +1878,6 @@
 ADD_SUBDIRECTORY(libbinlogstandalone)
 
 IF(NOT WITHOUT_SERVER)
-  # Build failure on Solaris 11.3 for debug builds with NDBCLUSTER.
-  # Adding basic local optimizations unbreaks it.
-  # We *could* test 'uname -v' VERSION_LESS 11.4 here.
-  # A clean build takes roughly the same time with or without -xO1
-  # Link time of mysqld is roughly 10% faster with -xO1.
-  IF(SOLARIS_SPARC AND MY_COMPILER_IS_SUNPRO AND
-      CMAKE_BUILD_TYPE_UPPER STREQUAL "DEBUG")
-    MESSAGE(STATUS
-      "Adding -xO1 for debug builds on Solaris ${MY_KERNEL_VERSION}")
-    STRING_APPEND(CMAKE_CXX_FLAGS_DEBUG " -xO1")
-  ENDIF()
-
   IF(WITH_UNIT_TESTS)
     IF(WIN32)
       SET(WITH_SHARED_UNITTEST_LIBRARY_DEFAULT OFF)
@@ -2008,6 +2172,14 @@
      ./library_output_directory lib
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
   )
+  # See ./mysql-test/suite/innodb_fts/include/mecab.inc
+  IF(MECAB_IPADIC_PARENT)
+    EXECUTE_PROCESS(
+      COMMAND ${CMAKE_COMMAND} -E create_symlink
+      "${MECAB_IPADIC_PARENT}" mecab
+      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/library_output_directory
+      )
+  ENDIF()
 ENDIF()
 
 # Without any --plugin-dir=<directory name> the server will look in
diff -Nru mysql-8.0-8.0.26/components/audit_api_message_emit/audit_api_message_emit.cc mysql-8.0-8.0.27/components/audit_api_message_emit/audit_api_message_emit.cc
--- mysql-8.0-8.0.26/components/audit_api_message_emit/audit_api_message_emit.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/components/audit_api_message_emit/audit_api_message_emit.cc	2021-09-28 11:46:34.000000000 +0000
@@ -92,8 +92,7 @@
   Check, whether the argument is not null pointer.
 */
 static bool not_null(IError_handler &handler, const char *arg,
-                     unsigned long length MY_ATTRIBUTE((unused)),
-                     size_t arg_pos) {
+                     unsigned long length [[maybe_unused]], size_t arg_pos) {
   if (arg == nullptr) {
     handler.error("Argument cannot be NULL [%d].", arg_pos);
     return false;
@@ -426,10 +425,10 @@
 /**
   UDF function itself.
 */
-static char *emit(UDF_INIT *initid MY_ATTRIBUTE((unused)), UDF_ARGS *args,
+static char *emit(UDF_INIT *initid [[maybe_unused]], UDF_ARGS *args,
                   char *result, unsigned long *length,
-                  unsigned char *null_value MY_ATTRIBUTE((unused)),
-                  unsigned char *error MY_ATTRIBUTE((unused))) {
+                  unsigned char *null_value [[maybe_unused]],
+                  unsigned char *error [[maybe_unused]]) {
   /*
     Store the error as the result of the UDF.
   */
diff -Nru mysql-8.0-8.0.26/components/keyrings/CMakeLists.txt mysql-8.0-8.0.27/components/keyrings/CMakeLists.txt
--- mysql-8.0-8.0.26/components/keyrings/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/components/keyrings/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -20,6 +20,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
+DISABLE_MISSING_PROFILE_WARNING()
+
 ADD_SUBDIRECTORY(common)
 
 # Keyring_file component
diff -Nru mysql-8.0-8.0.26/components/keyrings/common/CMakeLists.txt mysql-8.0-8.0.27/components/keyrings/common/CMakeLists.txt
--- mysql-8.0-8.0.26/components/keyrings/common/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/components/keyrings/common/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -46,9 +46,14 @@
   GenError
   )
 
+IF(COMPONENT_COMPILE_VISIBILITY)
+  SET(COMPILE_OPTIONS_ARG COMPILE_OPTIONS "${COMPONENT_COMPILE_VISIBILITY}")
+ENDIF()
+
 ADD_CONVENIENCE_LIBRARY(
   keyring_common
   ${KEYRING_COMMON_SOURCES}
+  ${COMPILE_OPTIONS_ARG}
   DEPENDENCIES ${KEYRING_COMMON_DEPENDENCIES}
   LINK_LIBRARIES library_mysys
 )
diff -Nru mysql-8.0-8.0.26/components/keyrings/common/encryption/aes.cc mysql-8.0-8.0.27/components/keyrings/common/encryption/aes.cc
--- mysql-8.0-8.0.26/components/keyrings/common/encryption/aes.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/components/keyrings/common/encryption/aes.cc	2021-09-28 11:46:34.000000000 +0000
@@ -83,7 +83,7 @@
     case Keyring_aes_opmode::keyring_aes_256_ofb:
       return EVP_aes_256_ofb();
     case Keyring_aes_opmode::keyring_aes_opmode_invalid:
-      // Fall through
+      [[fallthrough]];
     default:
       return nullptr;
   }
diff -Nru mysql-8.0-8.0.26/components/library_mysys/CMakeLists.txt mysql-8.0-8.0.27/components/library_mysys/CMakeLists.txt
--- mysql-8.0-8.0.26/components/library_mysys/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/components/library_mysys/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -20,6 +20,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
+DISABLE_MISSING_PROFILE_WARNING()
+
 ADD_LIBRARY(library_mysys STATIC
   my_memory.cc
   my_hex_tools.cc
diff -Nru mysql-8.0-8.0.26/components/logging/log_filter_dragnet.cc mysql-8.0-8.0.27/components/logging/log_filter_dragnet.cc
--- mysql-8.0-8.0.26/components/logging/log_filter_dragnet.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/components/logging/log_filter_dragnet.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1438,8 +1438,7 @@
   @retval false    value OK, go ahead and update system variable (from "save")
   @retval true     value rejected, do not update variable
 */
-static int check_var_filter_rules(MYSQL_THD thd,
-                                  SYS_VAR *self MY_ATTRIBUTE((unused)),
+static int check_var_filter_rules(MYSQL_THD thd, SYS_VAR *self [[maybe_unused]],
                                   void *save, struct st_mysql_value *value) {
   int ret;
   log_filter_ruleset *log_filter_temp_rules;
@@ -1507,8 +1506,8 @@
   @param  var_ptr  where to save the resulting (char *) value
   @param  save     pointer to the new value (from check function)
 */
-static void update_var_filter_rules(MYSQL_THD thd MY_ATTRIBUTE((unused)),
-                                    SYS_VAR *self MY_ATTRIBUTE((unused)),
+static void update_var_filter_rules(MYSQL_THD thd [[maybe_unused]],
+                                    SYS_VAR *self [[maybe_unused]],
                                     void *var_ptr, const void *save) {
   const char *state = nullptr;
   const char *new_val = *(static_cast<const char **>(const_cast<void *>(save)));
@@ -1542,7 +1541,7 @@
   @returns          int                 Number of matched rules
 */
 DEFINE_METHOD(int, log_service_imp::run,
-              (void *instance MY_ATTRIBUTE((unused)), log_line *ll)) {
+              (void *instance [[maybe_unused]], log_line *ll)) {
   return log_bf->filter_run(log_filter_dragnet_rules, ll);
 }
 
@@ -1565,7 +1564,7 @@
   @returns  otherwise                  A new instance could not be created
 */
 DEFINE_METHOD(log_service_error, log_service_imp::open,
-              (log_line * ll MY_ATTRIBUTE((unused)), void **instance)) {
+              (log_line * ll [[maybe_unused]], void **instance)) {
   if (instance == nullptr) return LOG_SERVICE_INVALID_ARGUMENT;
 
   *instance = nullptr;
@@ -1610,7 +1609,7 @@
   @returns  LOG_SERVICE_NOTHING_DONE       no work was done
 */
 DEFINE_METHOD(log_service_error, log_service_imp::flush,
-              (void **instance MY_ATTRIBUTE((unused)))) {
+              (void **instance [[maybe_unused]])) {
   return LOG_SERVICE_NOTHING_DONE;
 }
 
diff -Nru mysql-8.0-8.0.26/components/logging/log_sink_json.cc mysql-8.0-8.0.27/components/logging/log_sink_json.cc
--- mysql-8.0-8.0.26/components/logging/log_sink_json.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/components/logging/log_sink_json.cc	2021-09-28 11:46:34.000000000 +0000
@@ -462,7 +462,7 @@
   @retval  =0        success, returned hande is valid
 */
 DEFINE_METHOD(log_service_error, log_service_imp::open,
-              (log_line * ll MY_ATTRIBUTE((unused)), void **instance)) {
+              (log_line * ll [[maybe_unused]], void **instance)) {
   log_service_error rr;
   my_state *mi;
   char buff[10];
diff -Nru mysql-8.0-8.0.26/components/logging/log_sink_syseventlog.cc mysql-8.0-8.0.27/components/logging/log_sink_syseventlog.cc
--- mysql-8.0-8.0.26/components/logging/log_sink_syseventlog.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/components/logging/log_sink_syseventlog.cc	2021-09-28 11:46:34.000000000 +0000
@@ -417,8 +417,8 @@
   @retval false    value OK, go ahead and update system variable (from "save")
   @retval true     value rejected, do not update variable
 */
-static int sysvar_check_tag(MYSQL_THD thd MY_ATTRIBUTE((unused)),
-                            SYS_VAR *self MY_ATTRIBUTE((unused)), void *save,
+static int sysvar_check_tag(MYSQL_THD thd [[maybe_unused]],
+                            SYS_VAR *self [[maybe_unused]], void *save,
                             struct st_mysql_value *value) {
   int value_len = 0;
   const char *proposed_value;
@@ -448,9 +448,9 @@
   @param  var_ptr  where to save the resulting (char *) value
   @param  save     pointer to the new value (from check function)
 */
-static void sysvar_update_tag(MYSQL_THD thd MY_ATTRIBUTE((unused)),
-                              SYS_VAR *self MY_ATTRIBUTE((unused)),
-                              void *var_ptr, const void *save) {
+static void sysvar_update_tag(MYSQL_THD thd [[maybe_unused]],
+                              SYS_VAR *self [[maybe_unused]], void *var_ptr,
+                              const void *save) {
   const char *new_val = *(static_cast<const char **>(const_cast<void *>(save)));
 
   var_update_tag(new_val);
@@ -549,8 +549,8 @@
   @retval false    value OK, go ahead and update system variable (from "save")
   @retval true     value rejected, do not update variable
 */
-static int sysvar_check_fac(MYSQL_THD thd MY_ATTRIBUTE((unused)),
-                            SYS_VAR *self MY_ATTRIBUTE((unused)), void *save,
+static int sysvar_check_fac(MYSQL_THD thd [[maybe_unused]],
+                            SYS_VAR *self [[maybe_unused]], void *save,
                             struct st_mysql_value *value) {
   int value_len = 0;
   const char *proposed_value;
@@ -580,9 +580,9 @@
   @param  var_ptr  where to save the resulting (char *) value
   @param  save     pointer to the new value (from check function)
 */
-static void sysvar_update_fac(MYSQL_THD thd MY_ATTRIBUTE((unused)),
-                              SYS_VAR *self MY_ATTRIBUTE((unused)),
-                              void *var_ptr, const void *save) {
+static void sysvar_update_fac(MYSQL_THD thd [[maybe_unused]],
+                              SYS_VAR *self [[maybe_unused]], void *var_ptr,
+                              const void *save) {
   char *new_val = *(static_cast<char **>(const_cast<void *>(save)));
 
   var_update_fac(new_val);
@@ -672,9 +672,9 @@
   @param  var_ptr  where to save the resulting (char *) value
   @param  save     pointer to the new value (from check function)
 */
-static void sysvar_update_pid(MYSQL_THD thd MY_ATTRIBUTE((unused)),
-                              SYS_VAR *self MY_ATTRIBUTE((unused)),
-                              void *var_ptr MY_ATTRIBUTE((unused)),
+static void sysvar_update_pid(MYSQL_THD thd [[maybe_unused]],
+                              SYS_VAR *self [[maybe_unused]],
+                              void *var_ptr [[maybe_unused]],
                               const void *save) {
   var_update_pid(*(static_cast<bool *>(const_cast<void *>(save))));
 }
@@ -731,7 +731,7 @@
   @returns 	 LOG_SERVICE_MISC_ERROR        failure not otherwise specified
 */
 DEFINE_METHOD(int, log_service_imp::run,
-              (void *instance MY_ATTRIBUTE((unused)), log_line *ll)) {
+              (void *instance [[maybe_unused]], log_line *ll)) {
   const char *msg = nullptr;
   int out_fields = 0;
   enum loglevel level = ERROR_LEVEL;
@@ -897,7 +897,7 @@
 
 /* flush logs */
 DEFINE_METHOD(log_service_error, log_service_imp::flush,
-              (void **instance MY_ATTRIBUTE((unused)))) {
+              (void **instance [[maybe_unused]])) {
   if (!inited || !log_syslog_enabled) return LOG_SERVICE_NOT_AVAILABLE;
 
   log_syslog_reopen();
@@ -912,7 +912,7 @@
   @returns  otherwise                  a new instance could not be created
 */
 DEFINE_METHOD(log_service_error, log_service_imp::open,
-              (log_line * ll MY_ATTRIBUTE((unused)), void **instance)) {
+              (log_line * ll [[maybe_unused]], void **instance)) {
   if (instance == nullptr) return LOG_SERVICE_INVALID_ARGUMENT;
 
   *instance = nullptr;
@@ -926,7 +926,7 @@
   @returns  LOG_SERVICE_SUCCESS
 */
 DEFINE_METHOD(log_service_error, log_service_imp::close,
-              (void **instance MY_ATTRIBUTE((unused)))) {
+              (void **instance [[maybe_unused]])) {
   return LOG_SERVICE_SUCCESS;
 }
 
diff -Nru mysql-8.0-8.0.26/components/logging/log_sink_test.cc mysql-8.0-8.0.27/components/logging/log_sink_test.cc
--- mysql-8.0-8.0.26/components/logging/log_sink_test.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/components/logging/log_sink_test.cc	2021-09-28 11:46:34.000000000 +0000
@@ -785,7 +785,7 @@
   @returns         <0                   failure
 */
 DEFINE_METHOD(int, log_service_imp::run,
-              (void *instance MY_ATTRIBUTE((unused)), log_line *ll)) {
+              (void *instance [[maybe_unused]], log_line *ll)) {
   char out_buff[LOG_BUFF_MAX];
   char *out_writepos = out_buff;
   size_t out_left = LOG_BUFF_MAX - 1,  // bytes left in output buffer
@@ -1077,7 +1077,7 @@
 
 /* flush logs */
 DEFINE_METHOD(log_service_error, log_service_imp::flush,
-              (void **instance MY_ATTRIBUTE((unused)))) {
+              (void **instance [[maybe_unused]])) {
   int res;
 
   if (inited) log_service_exit();
@@ -1095,7 +1095,7 @@
   @retval  otherwise                  a new instance could not be created
 */
 DEFINE_METHOD(log_service_error, log_service_imp::open,
-              (log_line * ll MY_ATTRIBUTE((unused)), void **instance)) {
+              (log_line * ll [[maybe_unused]], void **instance)) {
   if (instance == nullptr) return LOG_SERVICE_INVALID_ARGUMENT;
 
   *instance = nullptr;
@@ -1110,7 +1110,7 @@
   @retval  otherwise                  an error occurred
 */
 DEFINE_METHOD(log_service_error, log_service_imp::close,
-              (void **instance MY_ATTRIBUTE((unused)))) {
+              (void **instance [[maybe_unused]])) {
   return LOG_SERVICE_SUCCESS;
 }
 
diff -Nru mysql-8.0-8.0.26/components/mysqlbackup/backup_page_tracker.cc mysql-8.0-8.0.27/components/mysqlbackup/backup_page_tracker.cc
--- mysql-8.0-8.0.26/components/mysqlbackup/backup_page_tracker.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/components/mysqlbackup/backup_page_tracker.cc	2021-09-28 11:46:34.000000000 +0000
@@ -192,8 +192,8 @@
 /**
    Callback method for initialization of UDF "mysqlbackup_page_track_set".
 */
-void Backup_page_tracker::set_page_tracking_deinit(
-    UDF_INIT *initid MY_ATTRIBUTE((unused))) {}
+void Backup_page_tracker::set_page_tracking_deinit(UDF_INIT *initid
+                                                   [[maybe_unused]]) {}
 
 /**
   UDF for "mysqlbackup_page_track_set"
@@ -245,8 +245,8 @@
    Callback method for initialization of UDF
    "mysqlbackup_page_track_get_start_lsn"
 */
-void Backup_page_tracker::page_track_get_start_lsn_deinit(
-    UDF_INIT *initid MY_ATTRIBUTE((unused))) {}
+void Backup_page_tracker::page_track_get_start_lsn_deinit(UDF_INIT *initid
+                                                          [[maybe_unused]]) {}
 
 /**
   UDF for "mysqlbackup_page_track_get_start_lsn"
@@ -290,7 +290,7 @@
    "mysqlbackup_page_track_get_changed_page_count".
 */
 void Backup_page_tracker::page_track_get_changed_page_count_deinit(
-    UDF_INIT *initid MY_ATTRIBUTE((unused))) {}
+    UDF_INIT *initid [[maybe_unused]]) {}
 
 /**
   UDF for "mysqlbackup_page_track_get_changed_page_count"
@@ -340,8 +340,8 @@
    Callback method for initialization of UDF
    "mysqlbackup_page_track_get_changed_pages".
 */
-void Backup_page_tracker::page_track_get_changed_pages_deinit(
-    UDF_INIT *initid MY_ATTRIBUTE((unused))) {
+void Backup_page_tracker::page_track_get_changed_pages_deinit(UDF_INIT *initid [
+    [maybe_unused]]) {
   free(m_changed_pages_buf);
   m_changed_pages_buf = nullptr;
 }
@@ -436,17 +436,20 @@
    @retval 0 success
    @retval non-zero failure
 */
-int page_track_callback(MYSQL_THD opaque_thd MY_ATTRIBUTE((unused)),
+int page_track_callback(MYSQL_THD opaque_thd [[maybe_unused]],
                         const uchar *buffer,
-                        size_t buffer_length MY_ATTRIBUTE((unused)),
-                        int page_count, void *context MY_ATTRIBUTE((unused))) {
+                        size_t buffer_length [[maybe_unused]], int page_count,
+                        void *context [[maybe_unused]]) {
   // Append to the disk file in binary mode
   FILE *fd = fopen(Backup_page_tracker::m_changed_pages_file, "ab");
   if (!fd) {
+    std::string msg{std::string("[page-track] Cannot open '") +
+                    Backup_page_tracker::m_changed_pages_file +
+                    "': " + strerror(errno) + "\n"};
     LogEvent()
         .type(LOG_TYPE_ERROR)
         .prio(ERROR_LEVEL)
-        .lookup(ER_MYSQLBACKUP_MSG, "[page-track] File open failed.");
+        .lookup(ER_MYSQLBACKUP_MSG, msg.c_str());
     return (1);
   }
 
@@ -456,10 +459,13 @@
 
   // write failed
   if (write_count != data_size) {
+    std::string msg{std::string("[page-track] Cannot write '") +
+                    Backup_page_tracker::m_changed_pages_file +
+                    "': " + strerror(errno) + "\n"};
     LogEvent()
         .type(LOG_TYPE_ERROR)
         .prio(ERROR_LEVEL)
-        .lookup(ER_MYSQLBACKUP_MSG, "[page-track] Writing to file failed.");
+        .lookup(ER_MYSQLBACKUP_MSG, msg.c_str());
     return (1);
   }
 
diff -Nru mysql-8.0-8.0.26/components/mysqlbackup/backup_page_tracker.h mysql-8.0-8.0.27/components/mysqlbackup/backup_page_tracker.h
--- mysql-8.0-8.0.26/components/mysqlbackup/backup_page_tracker.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/components/mysqlbackup/backup_page_tracker.h	2021-09-28 11:46:34.000000000 +0000
@@ -81,31 +81,31 @@
   static mysql_service_status_t unregister_udfs();
 
   static bool set_page_tracking_init(UDF_INIT *initid, UDF_ARGS *, char *);
-  static void set_page_tracking_deinit(UDF_INIT *initid MY_ATTRIBUTE((unused)));
+  static void set_page_tracking_deinit(UDF_INIT *initid [[maybe_unused]]);
   static long long set_page_tracking(UDF_INIT *initid, UDF_ARGS *,
                                      unsigned char *is_null,
                                      unsigned char *error);
 
   static bool page_track_get_changed_pages_init(UDF_INIT *initid, UDF_ARGS *,
                                                 char *);
-  static void page_track_get_changed_pages_deinit(
-      UDF_INIT *initid MY_ATTRIBUTE((unused)));
+  static void page_track_get_changed_pages_deinit(UDF_INIT *initid
+                                                  [[maybe_unused]]);
   static long long page_track_get_changed_pages(UDF_INIT *initid, UDF_ARGS *,
                                                 unsigned char *is_null,
                                                 unsigned char *error);
 
   static bool page_track_get_start_lsn_init(UDF_INIT *initid, UDF_ARGS *,
                                             char *);
-  static void page_track_get_start_lsn_deinit(
-      UDF_INIT *initid MY_ATTRIBUTE((unused)));
+  static void page_track_get_start_lsn_deinit(UDF_INIT *initid
+                                              [[maybe_unused]]);
   static long long page_track_get_start_lsn(UDF_INIT *initid, UDF_ARGS *,
                                             unsigned char *is_null,
                                             unsigned char *error);
 
   static bool page_track_get_changed_page_count_init(UDF_INIT *initid,
                                                      UDF_ARGS *, char *);
-  static void page_track_get_changed_page_count_deinit(
-      UDF_INIT *initid MY_ATTRIBUTE((unused)));
+  static void page_track_get_changed_page_count_deinit(UDF_INIT *initid
+                                                       [[maybe_unused]]);
   static long long page_track_get_changed_page_count(UDF_INIT *initid,
                                                      UDF_ARGS *,
                                                      unsigned char *is_null,
diff -Nru mysql-8.0-8.0.26/components/mysqlbackup/mysqlbackup.cc mysql-8.0-8.0.27/components/mysqlbackup/mysqlbackup.cc
--- mysql-8.0-8.0.26/components/mysqlbackup/mysqlbackup.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/components/mysqlbackup/mysqlbackup.cc	2021-09-28 11:46:34.000000000 +0000
@@ -193,7 +193,7 @@
   @retval 0 on success, errorno on failure
 */
 static int mysqlbackup_backup_id_check(MYSQL_THD thd,
-                                       SYS_VAR *self MY_ATTRIBUTE((unused)),
+                                       SYS_VAR *self [[maybe_unused]],
                                        void *save,
                                        struct st_mysql_value *value) {
   if (!have_backup_admin_privilege(thd))
@@ -334,11 +334,14 @@
   /* If failed before the last initialization succeeded, deinitialize. */
   switch (failpoint) {
     case 3:
-      unregister_status_variables(); /*FALLTHROUGH*/
+      unregister_status_variables();
+      [[fallthrough]];
     case 2:
-      unregister_system_variables(); /*FALLTHROUGH*/
+      unregister_system_variables();
+      [[fallthrough]];
     case 1:
-      deinitialize_log_service(); /*FALLTHROUGH*/
+      deinitialize_log_service();
+      [[fallthrough]];
     case 0:
       return (1);
   }
diff -Nru mysql-8.0-8.0.26/components/pfs_example/CMakeLists.txt mysql-8.0-8.0.27/components/pfs_example/CMakeLists.txt
--- mysql-8.0-8.0.26/components/pfs_example/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/components/pfs_example/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -20,6 +20,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
+DISABLE_MISSING_PROFILE_WARNING()
+
 MYSQL_ADD_COMPONENT(pfs_example
   pfs_example.cc
   MODULE_ONLY
diff -Nru mysql-8.0-8.0.26/components/query_attributes/query_attributes.cc mysql-8.0-8.0.27/components/query_attributes/query_attributes.cc
--- mysql-8.0-8.0.26/components/query_attributes/query_attributes.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/components/query_attributes/query_attributes.cc	2021-09-28 11:46:34.000000000 +0000
@@ -48,10 +48,12 @@
 
 static PSI_memory_key KEY_memory;
 
-static char *mysql_query_attribute_string(
-    UDF_INIT *initid, UDF_ARGS *args, char *result MY_ATTRIBUTE((unused)),
-    unsigned long *length, unsigned char *is_null,
-    unsigned char *error MY_ATTRIBUTE((unused))) {
+static char *mysql_query_attribute_string(UDF_INIT *initid, UDF_ARGS *args,
+                                          char *result [[maybe_unused]],
+                                          unsigned long *length,
+                                          unsigned char *is_null,
+                                          unsigned char *error
+                                          [[maybe_unused]]) {
   const char *name = args->args[0];
   mysqlh_query_attributes_iterator iter = nullptr;
   char *ret = nullptr;
@@ -120,8 +122,8 @@
   return false;
 }
 
-static void mysql_query_attribute_string_deinit(
-    UDF_INIT *initid MY_ATTRIBUTE((unused))) {
+static void mysql_query_attribute_string_deinit(UDF_INIT *initid
+                                                [[maybe_unused]]) {
   if (initid->ptr) my_free(initid->ptr);
 }
 
diff -Nru mysql-8.0-8.0.26/components/test/keyring_encryption_test/CMakeLists.txt mysql-8.0-8.0.27/components/test/keyring_encryption_test/CMakeLists.txt
--- mysql-8.0-8.0.26/components/test/keyring_encryption_test/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/components/test/keyring_encryption_test/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -21,6 +21,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 ADD_WSHADOW_WARNING()
+DISABLE_MISSING_PROFILE_WARNING()
 
 SET(KEYRING_ENCRYPTION_TEST_SOURCE
   # Options
diff -Nru mysql-8.0-8.0.26/components/test/keyring_encryption_test/options.cc mysql-8.0-8.0.27/components/test/keyring_encryption_test/options.cc
--- mysql-8.0-8.0.26/components/test/keyring_encryption_test/options.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/components/test/keyring_encryption_test/options.cc	2021-09-28 11:46:34.000000000 +0000
@@ -91,7 +91,7 @@
       usage(true);
       break;
     case 'I':
-      // Fall through
+      [[fallthrough]];
     case '?':
       usage(false);
       break;
diff -Nru mysql-8.0-8.0.26/components/test/test_audit_api_message.cc mysql-8.0-8.0.27/components/test/test_audit_api_message.cc
--- mysql-8.0-8.0.26/components/test/test_audit_api_message.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/components/test/test_audit_api_message.cc	2021-09-28 11:46:34.000000000 +0000
@@ -53,11 +53,10 @@
 
   @retval 0 This function always returns 0.
 */
-static long long message_internal(UDF_INIT *init MY_ATTRIBUTE((unused)),
-                                  UDF_ARGS *args MY_ATTRIBUTE((unused)),
-                                  unsigned char *null_value
-                                      MY_ATTRIBUTE((unused)),
-                                  unsigned char *error MY_ATTRIBUTE((unused))) {
+static long long message_internal(UDF_INIT *init [[maybe_unused]],
+                                  UDF_ARGS *args [[maybe_unused]],
+                                  unsigned char *null_value [[maybe_unused]],
+                                  unsigned char *error [[maybe_unused]]) {
   mysql_event_message_key_value_t val;
 
   lex_cstring_set(&val.key, "my_numeric_key");
@@ -83,10 +82,10 @@
 
   @retval 0 This function always returns 0.
 */
-static long long message_user(UDF_INIT *init MY_ATTRIBUTE((unused)),
-                              UDF_ARGS *args MY_ATTRIBUTE((unused)),
-                              unsigned char *null_value MY_ATTRIBUTE((unused)),
-                              unsigned char *error MY_ATTRIBUTE((unused))) {
+static long long message_user(UDF_INIT *init [[maybe_unused]],
+                              UDF_ARGS *args [[maybe_unused]],
+                              unsigned char *null_value [[maybe_unused]],
+                              unsigned char *error [[maybe_unused]]) {
   mysql_event_message_key_value_t val;
 
   lex_cstring_set(&val.key, "my_string_key");
diff -Nru mysql-8.0-8.0.26/components/test/test_udf_registration.cc mysql-8.0-8.0.27/components/test/test_udf_registration.cc
--- mysql-8.0-8.0.26/components/test/test_udf_registration.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/components/test/test_udf_registration.cc	2021-09-28 11:46:34.000000000 +0000
@@ -105,7 +105,7 @@
   return false;
 }
 
-static void dynamic_udf_deinit(UDF_INIT *initid MY_ATTRIBUTE((unused))) {
+static void dynamic_udf_deinit(UDF_INIT *initid [[maybe_unused]]) {
   assert(initid->ptr == test_init || initid->ptr == test_udf);
 }
 
@@ -120,7 +120,7 @@
   return 42;
 }
 
-static void dynamic_agg_deinit(UDF_INIT *initid MY_ATTRIBUTE((unused))) {
+static void dynamic_agg_deinit(UDF_INIT *initid [[maybe_unused]]) {
   assert(initid->ptr == test_init || initid->ptr == test_udf ||
          initid->ptr == test_udf_clear || initid->ptr == test_udf_add);
 }
diff -Nru mysql-8.0-8.0.26/config.h.cmake mysql-8.0-8.0.27/config.h.cmake
--- mysql-8.0-8.0.26/config.h.cmake	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/config.h.cmake	2021-09-28 11:46:34.000000000 +0000
@@ -104,6 +104,9 @@
 #cmakedefine HAVE_PTHREAD_CONDATTR_SETCLOCK 1
 #cmakedefine HAVE_PTHREAD_GETAFFINITY_NP 1
 #cmakedefine HAVE_PTHREAD_SIGMASK 1
+#cmakedefine HAVE_PTHREAD_SETNAME_NP_LINUX 1
+#cmakedefine HAVE_PTHREAD_SETNAME_NP_MACOS 1
+#cmakedefine HAVE_SET_THREAD_DESCRIPTION 1
 #cmakedefine HAVE_SLEEP 1
 #cmakedefine HAVE_STPCPY 1
 #cmakedefine HAVE_STPNCPY 1
@@ -194,6 +197,7 @@
 #define SYSTEM_TYPE "@SYSTEM_TYPE@"
 /* This should mean case insensitive file system */
 #cmakedefine FN_NO_CASE_SENSE 1
+#cmakedefine APPLE_ARM 1
 
 /*
  * From main CMakeLists.txt
@@ -212,6 +216,7 @@
 #cmakedefine KERBEROS_LIB_CONFIGURED
 #cmakedefine SCRAM_LIB_CONFIGURED
 #cmakedefine WITH_HYPERGRAPH_OPTIMIZER
+#cmakedefine KERBEROS_LIB_SSPI
 
 /* Lock Order */
 #cmakedefine WITH_LOCK_ORDER 1
diff -Nru mysql-8.0-8.0.26/configure.cmake mysql-8.0-8.0.27/configure.cmake
--- mysql-8.0-8.0.26/configure.cmake	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/configure.cmake	2021-09-28 11:46:34.000000000 +0000
@@ -615,6 +615,28 @@
 FAIL_REGEX "warning: incompatible pointer to integer conversion"
 )
 
+# Check for pthread_setname_np() on linux
+CHECK_C_SOURCE_COMPILES("
+#define _GNU_SOURCE
+#include <pthread.h>
+int main(int argc, char **argv)
+{
+  pthread_t tid = 0;
+  const char *name = NULL;
+  return pthread_setname_np(tid, name);
+}"
+HAVE_PTHREAD_SETNAME_NP_LINUX)
+
+# Check for pthread_setname_np() on macos
+CHECK_C_SOURCE_COMPILES("
+#include <pthread.h>
+int main(int argc, char **argv)
+{
+  char name[16] = {0};
+  return pthread_setname_np(name);
+}"
+HAVE_PTHREAD_SETNAME_NP_MACOS)
+
 #--------------------------------------------------------------------
 # Check for IPv6 support
 #--------------------------------------------------------------------
diff -Nru mysql-8.0-8.0.26/debian/changelog mysql-8.0-8.0.27/debian/changelog
--- mysql-8.0-8.0.26/debian/changelog	2021-07-22 11:53:03.000000000 +0000
+++ mysql-8.0-8.0.27/debian/changelog	2021-10-22 14:51:26.000000000 +0000
@@ -1,3 +1,24 @@
+mysql-8.0 (8.0.27-0ubuntu0.21.04.1) hirsute-security; urgency=medium
+
+  * SECURITY UPDATE: Update to 8.0.27 to fix security issues
+    - CVE-2021-2478, CVE-2021-2479, CVE-2021-2481, CVE-2021-35546,
+      CVE-2021-35575, CVE-2021-35577, CVE-2021-35584, CVE-2021-35591,
+      CVE-2021-35596, CVE-2021-35597, CVE-2021-35602, CVE-2021-35604,
+      CVE-2021-35607, CVE-2021-35608, CVE-2021-35610, CVE-2021-35612,
+      CVE-2021-35613, CVE-2021-35622, CVE-2021-35623, CVE-2021-35624,
+      CVE-2021-35625, CVE-2021-35626, CVE-2021-35627, CVE-2021-35628,
+      CVE-2021-35630, CVE-2021-35631, CVE-2021-35632, CVE-2021-35633,
+      CVE-2021-35634, CVE-2021-35635, CVE-2021-35636, CVE-2021-35637,
+      CVE-2021-35638, CVE-2021-35639, CVE-2021-35640, CVE-2021-35641,
+      CVE-2021-35642, CVE-2021-35643, CVE-2021-35644, CVE-2021-35645,
+      CVE-2021-35646, CVE-2021-35647, CVE-2021-35648
+  * debian/rules: disable innodb_fts.mecab_utf8 test, it hasn't run
+    successfully in a long time, but now gives an error.
+  * debian/patches/fix_ppc64el_longdouble_ftbfs.patch: removed, no longer
+    needed.
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Fri, 22 Oct 2021 10:51:26 -0400
+
 mysql-8.0 (8.0.26-0ubuntu0.21.04.3) hirsute-security; urgency=medium
 
   * SECURITY UPDATE: Update to 8.0.26 to fix security issues
diff -Nru mysql-8.0-8.0.26/debian/patches/fix_ppc64el_longdouble_ftbfs.patch mysql-8.0-8.0.27/debian/patches/fix_ppc64el_longdouble_ftbfs.patch
--- mysql-8.0-8.0.26/debian/patches/fix_ppc64el_longdouble_ftbfs.patch	2021-07-22 11:53:03.000000000 +0000
+++ mysql-8.0-8.0.27/debian/patches/fix_ppc64el_longdouble_ftbfs.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-Description: disable long double test on ppc64el causing FTBFS until a
- proper fix is found.
-Author: Marc Deslauriers <marc.deslauriers@canonical.com>
-
---- a/unittest/gunit/innodb/ut0new-t.cc
-+++ b/unittest/gunit/innodb/ut0new-t.cc
-@@ -39,7 +39,11 @@ using int_types =
- 
- using char_types = ::testing::Types<char, unsigned char, wchar_t>;
- 
-+#ifdef _GLIBCXX_LONG_DOUBLE_COMPAT
-+using floating_point_types = ::testing::Types<float, double>;
-+#else
- using floating_point_types = ::testing::Types<float, double, long double>;
-+#endif
- 
- /**
-  * This is a typed test template, it's instantiated below for all primitive
diff -Nru mysql-8.0-8.0.26/debian/patches/revert_faster_tls_model.patch mysql-8.0-8.0.27/debian/patches/revert_faster_tls_model.patch
--- mysql-8.0-8.0.26/debian/patches/revert_faster_tls_model.patch	2021-03-13 02:11:54.000000000 +0000
+++ mysql-8.0-8.0.27/debian/patches/revert_faster_tls_model.patch	2021-10-22 14:50:16.000000000 +0000
@@ -2,11 +2,12 @@
 Author: Marc Deslauriers <marc.deslauriers@canonical.com>
 Forwarded: No, not needed
 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/mysql-8.0/+bug/1889851
+Updated: 2021-10-21
 
 --- a/cmake/build_configurations/compiler_options.cmake
 +++ b/cmake/build_configurations/compiler_options.cmake
-@@ -71,12 +71,6 @@ IF(UNIX)
-     SET(COMMON_CXX_FLAGS             "-std=c++14 -fno-omit-frame-pointer")
+@@ -64,12 +64,6 @@ IF(UNIX)
+     SET(COMMON_CXX_FLAGS             "-std=c++17 -fno-omit-frame-pointer")
    ENDIF()
  
 -  # Faster TLS model
@@ -15,6 +16,6 @@
 -    STRING_APPEND(COMMON_CXX_FLAGS   " -ftls-model=initial-exec")
 -  ENDIF()
 -
-   # Solaris flags
-   IF(SOLARIS)
-     # Link mysqld with mtmalloc on Solaris 10 and later
+   # Use STRING_PREPEND here, so command-line input can override our defaults.
+   STRING_PREPEND(CMAKE_C_FLAGS                  "${COMMON_C_FLAGS} ")
+   STRING_PREPEND(CMAKE_C_FLAGS_RELWITHDEBINFO   "${SECTIONS_FLAG} ")
diff -Nru mysql-8.0-8.0.26/debian/patches/series mysql-8.0-8.0.27/debian/patches/series
--- mysql-8.0-8.0.26/debian/patches/series	2021-07-22 11:53:03.000000000 +0000
+++ mysql-8.0-8.0.27/debian/patches/series	2021-10-22 14:50:40.000000000 +0000
@@ -6,4 +6,3 @@
 revert_faster_tls_model.patch
 fix_path_mysql_keyring_encryption_test.patch
 disable_root_files.patch
-fix_ppc64el_longdouble_ftbfs.patch
diff -Nru mysql-8.0-8.0.26/debian/rules mysql-8.0-8.0.27/debian/rules
--- mysql-8.0-8.0.26/debian/rules	2021-07-22 11:53:03.000000000 +0000
+++ mysql-8.0-8.0.27/debian/rules	2021-10-22 14:51:06.000000000 +0000
@@ -160,7 +160,6 @@
 	# Skip replication tests since they are timing sensitive and may
 	# result in false positives.
 	cd $(builddir)/mysql-test && ./mtr --report-unstable-tests --parallel=$(TESTJOBS) --skip-rpl $(MTR_SUITE) --force --skip-test-list=./skiplist || $(TESTSUITE_FAIL_CMD) ;
-	cd $(builddir)/mysql-test && ./mtr --report-unstable-tests --force innodb_fts.mecab_utf8
 endif
 endif
 
diff -Nru mysql-8.0-8.0.26/Docs/INFO_SRC mysql-8.0-8.0.27/Docs/INFO_SRC
--- mysql-8.0-8.0.26/Docs/INFO_SRC	2021-07-01 08:13:51.000000000 +0000
+++ mysql-8.0-8.0.27/Docs/INFO_SRC	2021-09-28 13:19:38.000000000 +0000
@@ -1,7 +1,7 @@
-commit: f64af5bfff4c3a65eb44d9e513ca1c882850b030
-date: 2021-07-01 07:17:38 +0200
-build-date: 2021-07-01 07:54:49 +0000
-short: f64af5bfff4
-branch: mysql-8.0.26-release
+commit: 5c5b83a19a7ee94f7418d6e4fbb37da4b63d5d96
+date: 2021-09-28 13:36:27 +0200
+build-date: 2021-09-28 11:47:35 +0000
+short: 5c5b83a19a7
+branch: mysql-8.0.27-release
 
-MySQL source 8.0.26
+MySQL source 8.0.27
diff -Nru mysql-8.0-8.0.26/Docs/README.build mysql-8.0-8.0.27/Docs/README.build
--- mysql-8.0-8.0.26/Docs/README.build	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/Docs/README.build	2021-09-28 11:46:34.000000000 +0000
@@ -67,15 +67,21 @@
 
 It is possible to compile with Clang on Windows, which compiles faster
 and also yields faster binaries, but this is experimental and not officially
-supported. To compile, use LLVM 6.0.1 or newer from releases.llvm.org
-(Clang/C2, which is Microsoft's own version of Clang, is not supported),
-and put a Windows compile of Ninja in your path. Then execute the following
-in a shell:
-
-  "c:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
-  set PATH=<path to Ninja>;%PATH%
-  "c:\Program Files\CMake 3.8\bin\cmake.exe" -G Ninja -DCMAKE_C_COMPILER="c:/program files/llvm/msbuild-bin/cl.exe" -DCMAKE_CXX_COMPILER="c:/program files/llvm/msbuild-bin/cl.exe" -DCMAKE_LINKER="c:/program files/llvm/bin/lld-link.exe" -DWITH_BOOST=<path to Boost> ..
-  ninja
+supported. To compile, install the most recent version from
+https://github.com/llvm/llvm-project/releases
+(Clang/C2, which is Microsoft's own version of Clang, is not supported)
+
+Ensure that you have ninja and cmake in your path.
+Source the appropriate vcvarsall.bat file which comes with Visual Studio,
+so that Visual Studio executables are in your PATH.
+
+cmake -G Ninja -DFORCE_UNSUPPORTED_COMPILER=1
+  -DCMAKE_C_COMPILER="C:/Program Files/LLVM/bin/clang-cl.exe"
+  -DCMAKE_CXX_COMPILER="C:/Program Files/LLVM/bin/clang-cl.exe"
+  -DCMAKE_LINKER="C:/Program Files/LLVM/bin/lld-link.exe"
+  -DWITH_BOOST=<path to Boost> ..
+
+ninja
 
 This configuration also supports ASAN (-DWITH_ASAN=1), although currently only
 when linking with MSVC's linker (not with LLD).
@@ -85,9 +91,4 @@
 
 ===
 
-Note: For building with unit tests, you need to tell cmake where to find
-the sources, see ../cmake/googletest.cmake
-You should *not* 'make install' googletest/googlemock on your system,
-the libraries must be built from source, with the unit tests.
-
 Note: You need to tell cmake where to find boost, see ../cmake/boost.cmake
diff -Nru mysql-8.0-8.0.26/Doxyfile-ignored mysql-8.0-8.0.27/Doxyfile-ignored
--- mysql-8.0-8.0.26/Doxyfile-ignored	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/Doxyfile-ignored	2021-09-28 11:46:34.000000000 +0000
@@ -64,6 +64,7 @@
 sql/rpl_handler.h:*
 sql/rpl_io_monitor.h:*
 sql/rpl_rli_pdb.h:*
+sql/rpl_info_dummy.cc:*
 sql/rpl_trx_tracking.h:*
 sql/rpl_utility.h:*
 libbinlogevents/include/binlog_event.h:*
@@ -73,7 +74,7 @@
 # BUG#32245629 - FIX DOXYGEN WARNINGS IN THE OPTIMIZER CODE
 # 07-DEC-2020 Erlend Dahl
 sql/join_optimizer/join_optimizer.cc:*
-sql/opt_range.cc:*
+sql/range_optimizer/range_optimizer.cc:*
 sql/protocol_callback.h:*
 sql/protocol_classic.cc:*
 sql/spatial.cc:*
diff -Nru mysql-8.0-8.0.26/Doxyfile.in mysql-8.0-8.0.27/Doxyfile.in
--- mysql-8.0-8.0.26/Doxyfile.in	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/Doxyfile.in	2021-09-28 11:46:34.000000000 +0000
@@ -2278,6 +2278,7 @@
 # This tag requires that the tag SEARCH_INCLUDES is set to YES.
 
 INCLUDE_PATH           = . \
+                         client/include \
                          include \
                          include/mysql \
                          sql
@@ -2324,7 +2325,8 @@
                          ALWAYS_INLINE(X)=X \
                          UNIV_DEBUG \
                          UNIV_NOTHROW \
-                         __cplusplus
+                         __cplusplus \
+                         DOXYGEN_IF_DEBUG
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The
@@ -2348,7 +2350,8 @@
                          DEFINE_METHOD \
                          DEFINE_BOOL_METHOD \
                          DECLARE_METHOD \
-                         DECLARE_BOOL_METHOD
+                         DECLARE_BOOL_METHOD \
+                         IF_DEBUG
 
 # If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
 # remove all references to function-like macros that are alone on a line, have
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/appveyor.yml mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/appveyor.yml
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/appveyor.yml	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/appveyor.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,154 +0,0 @@
-version: '{build}'
-
-os: Visual Studio 2015
-
-environment:
-  matrix:
-    - compiler: msvc-15-seh
-      generator: "Visual Studio 15 2017"
-      build_system: cmake
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-
-    - compiler: msvc-15-seh
-      generator: "Visual Studio 15 2017 Win64"
-      build_system: cmake
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      enabled_on_pr: yes
-
-    - compiler: msvc-15-seh
-      build_system: bazel
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      enabled_on_pr: yes
-
-    - compiler: msvc-14-seh
-      build_system: cmake
-      generator: "Visual Studio 14 2015"
-      enabled_on_pr: yes
-
-    - compiler: msvc-14-seh
-      build_system: cmake
-      generator: "Visual Studio 14 2015 Win64"
-
-    - compiler: gcc-6.3.0-posix
-      build_system: cmake
-      generator: "MinGW Makefiles"
-      cxx_path: 'C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin'
-      enabled_on_pr: yes
-
-configuration:
-  - Debug
-
-build:
-  verbosity: minimal
-
-install:
-- ps: |
-    Write-Output "Compiler: $env:compiler"
-    Write-Output "Generator: $env:generator"
-    Write-Output "Env:Configuation: $env:configuration"
-    Write-Output "Env: $env"
-    if (-not (Test-Path env:APPVEYOR_PULL_REQUEST_NUMBER)) {
-      Write-Output "This is *NOT* a pull request build"
-    } else {
-      Write-Output "This is a pull request build"
-      if (-not (Test-Path env:enabled_on_pr) -or $env:enabled_on_pr -ne "yes") {
-        Write-Output "PR builds are *NOT* explicitly enabled"
-      }
-    }
-
-    # install Bazel
-    if ($env:build_system -eq "bazel") {
-        appveyor DownloadFile https://github.com/bazelbuild/bazel/releases/download/0.28.1/bazel-0.28.1-windows-x86_64.exe -FileName bazel.exe
-    }
-
-    if ($env:build_system -eq "cmake") {
-        # git bash conflicts with MinGW makefiles
-        if ($env:generator -eq "MinGW Makefiles") {
-            $env:path = $env:path.replace("C:\Program Files\Git\usr\bin;", "")
-            if ($env:cxx_path -ne "") {
-                $env:path += ";$env:cxx_path"
-            }
-        }
-    }
-
-before_build:
-- ps: |
-     $env:root=$env:APPVEYOR_BUILD_FOLDER
-     Write-Output "env:root: $env:root"
-
-build_script:
-- ps: |
-    # Only enable some builds for pull requests, the AppVeyor queue is too long.
-    if ((Test-Path env:APPVEYOR_PULL_REQUEST_NUMBER) -And (-not (Test-Path env:enabled_on_pr) -or $env:enabled_on_pr -ne "yes")) {
-      return
-    } else {
-        # special case - build with Bazel
-        if ($env:build_system -eq "bazel") {
-            & $env:root\bazel.exe build -c opt //:gtest_samples
-            if ($LastExitCode -eq 0) { # bazel writes to StdErr and PowerShell interprets it as an error
-                $host.SetShouldExit(0)
-            } else { # a real error
-                throw "Exec: $ErrorMessage"
-            }
-            return
-        }
-    }
-    # by default build with CMake
-    md _build -Force | Out-Null
-    cd _build
-
-    $conf = if ($env:generator -eq "MinGW Makefiles") {"-DCMAKE_BUILD_TYPE=$env:configuration"} else {"-DCMAKE_CONFIGURATION_TYPES=Debug;Release"}
-    # Disable test for MinGW (gtest tests fail, gmock tests can not build)
-    $gtest_build_tests = if ($env:generator -eq "MinGW Makefiles") {"-Dgtest_build_tests=OFF"} else {"-Dgtest_build_tests=ON"}
-    $gmock_build_tests = if ($env:generator -eq "MinGW Makefiles") {"-Dgmock_build_tests=OFF"} else {"-Dgmock_build_tests=ON"}
-    & cmake -G "$env:generator" $conf -Dgtest_build_samples=ON $gtest_build_tests $gmock_build_tests ..
-    if ($LastExitCode -ne 0) {
-        throw "Exec: $ErrorMessage"
-    }
-    $cmake_parallel = if ($env:generator -eq "MinGW Makefiles") {"-j2"} else  {"/m"}
-    & cmake --build . --config $env:configuration -- $cmake_parallel
-    if ($LastExitCode -ne 0) {
-        throw "Exec: $ErrorMessage"
-    }
-
-
-skip_commits:
-  files:
-    - '**/*.md'
-
-test_script:
-- ps: |
-    # Only enable some builds for pull requests, the AppVeyor queue is too long.
-    if ((Test-Path env:APPVEYOR_PULL_REQUEST_NUMBER) -And (-not (Test-Path env:enabled_on_pr) -or $env:enabled_on_pr -ne "yes")) {
-      return
-    }
-    if ($env:build_system -eq "bazel") {
-        # special case - testing with Bazel
-        & $env:root\bazel.exe test //:gtest_samples
-        if ($LastExitCode -eq 0) { # bazel writes to StdErr and PowerShell interprets it as an error
-            $host.SetShouldExit(0)
-        } else { # a real error
-            throw "Exec: $ErrorMessage"
-        }
-    }
-    if ($env:build_system -eq "cmake") {
-        # built with CMake - test with CTest
-        if ($env:generator -eq "MinGW Makefiles") {
-            return # No test available for MinGW
-        }
-
-        & ctest -C $env:configuration --timeout 600 --output-on-failure
-        if ($LastExitCode -ne 0) {
-            throw "Exec: $ErrorMessage"
-        }
-    }
-
-artifacts:
-  - path: '_build/CMakeFiles/*.log'
-    name: logs
-  - path: '_build/Testing/**/*.xml'
-    name: test_results
-  - path: 'bazel-testlogs/**/test.log'
-    name: test_logs
-  - path: 'bazel-testlogs/**/test.xml'
-    name: test_results
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/BUILD.bazel mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/BUILD.bazel
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/BUILD.bazel	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/BUILD.bazel	1970-01-01 00:00:00.000000000 +0000
@@ -1,179 +0,0 @@
-# Copyright 2017 Google Inc.
-# All Rights Reserved.
-#
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-#   Bazel Build for Google C++ Testing Framework(Google Test)
-
-load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")
-
-package(default_visibility = ["//visibility:public"])
-
-licenses(["notice"])
-
-config_setting(
-    name = "windows",
-    constraint_values = ["@bazel_tools//platforms:windows"],
-)
-
-config_setting(
-    name = "has_absl",
-    values = {"define": "absl=1"},
-)
-
-# Library that defines the FRIEND_TEST macro.
-cc_library(
-    name = "gtest_prod",
-    hdrs = ["googletest/include/gtest/gtest_prod.h"],
-    includes = ["googletest/include"],
-)
-
-# Google Test including Google Mock
-cc_library(
-    name = "gtest",
-    srcs = glob(
-        include = [
-            "googletest/src/*.cc",
-            "googletest/src/*.h",
-            "googletest/include/gtest/**/*.h",
-            "googlemock/src/*.cc",
-            "googlemock/include/gmock/**/*.h",
-        ],
-        exclude = [
-            "googletest/src/gtest-all.cc",
-            "googletest/src/gtest_main.cc",
-            "googlemock/src/gmock-all.cc",
-            "googlemock/src/gmock_main.cc",
-        ],
-    ),
-    hdrs = glob([
-        "googletest/include/gtest/*.h",
-        "googlemock/include/gmock/*.h",
-    ]),
-    copts = select({
-        ":windows": [],
-        "//conditions:default": ["-pthread"],
-    }),
-    defines = select({
-        ":has_absl": ["GTEST_HAS_ABSL=1"],
-        "//conditions:default": [],
-    }),
-    features = select({
-        ":windows": ["windows_export_all_symbols"],
-        "//conditions:default": [],
-    }),
-    includes = [
-        "googlemock",
-        "googlemock/include",
-        "googletest",
-        "googletest/include",
-    ],
-    linkopts = select({
-        ":windows": [],
-        "//conditions:default": ["-pthread"],
-    }),
-    deps = select({
-        ":has_absl": [
-            "@com_google_absl//absl/debugging:failure_signal_handler",
-            "@com_google_absl//absl/debugging:stacktrace",
-            "@com_google_absl//absl/debugging:symbolize",
-            "@com_google_absl//absl/strings",
-            "@com_google_absl//absl/types:optional",
-            "@com_google_absl//absl/types:variant",
-        ],
-        "//conditions:default": [],
-    }),
-)
-
-cc_library(
-    name = "gtest_main",
-    srcs = ["googlemock/src/gmock_main.cc"],
-    features = select({
-        ":windows": ["windows_export_all_symbols"],
-        "//conditions:default": [],
-    }),
-    deps = [":gtest"],
-)
-
-# The following rules build samples of how to use gTest.
-cc_library(
-    name = "gtest_sample_lib",
-    srcs = [
-        "googletest/samples/sample1.cc",
-        "googletest/samples/sample2.cc",
-        "googletest/samples/sample4.cc",
-    ],
-    hdrs = [
-        "googletest/samples/prime_tables.h",
-        "googletest/samples/sample1.h",
-        "googletest/samples/sample2.h",
-        "googletest/samples/sample3-inl.h",
-        "googletest/samples/sample4.h",
-    ],
-    features = select({
-        ":windows": ["windows_export_all_symbols"],
-        "//conditions:default": [],
-    }),
-)
-
-cc_test(
-    name = "gtest_samples",
-    size = "small",
-    # All Samples except:
-    #   sample9 (main)
-    #   sample10 (main and takes a command line option and needs to be separate)
-    srcs = [
-        "googletest/samples/sample1_unittest.cc",
-        "googletest/samples/sample2_unittest.cc",
-        "googletest/samples/sample3_unittest.cc",
-        "googletest/samples/sample4_unittest.cc",
-        "googletest/samples/sample5_unittest.cc",
-        "googletest/samples/sample6_unittest.cc",
-        "googletest/samples/sample7_unittest.cc",
-        "googletest/samples/sample8_unittest.cc",
-    ],
-    linkstatic = 0,
-    deps = [
-        "gtest_sample_lib",
-        ":gtest_main",
-    ],
-)
-
-cc_test(
-    name = "sample9_unittest",
-    size = "small",
-    srcs = ["googletest/samples/sample9_unittest.cc"],
-    deps = [":gtest"],
-)
-
-cc_test(
-    name = "sample10_unittest",
-    size = "small",
-    srcs = ["googletest/samples/sample10_unittest.cc"],
-    deps = [":gtest"],
-)
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/.clang-format mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/.clang-format
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/.clang-format	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/.clang-format	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-# Run manually to reformat a file:
-# clang-format -i --style=file <file>
-Language:        Cpp
-BasedOnStyle:  Google
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/CMakeLists.txt mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/CMakeLists.txt
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-# Note: CMake support is community-based. The maintainers do not use CMake
-# internally.
-
-cmake_minimum_required(VERSION 2.8.8)
-
-if (POLICY CMP0048)
-  cmake_policy(SET CMP0048 NEW)
-endif (POLICY CMP0048)
-
-project(googletest-distribution)
-set(GOOGLETEST_VERSION 1.10.0)
-
-if (CMAKE_VERSION VERSION_LESS "3.1")
-  add_definitions(-std=c++11)
-else()
-  set(CMAKE_CXX_STANDARD 11)
-  set(CMAKE_CXX_STANDARD_REQUIRED ON)
-  if(NOT CYGWIN)
-    set(CMAKE_CXX_EXTENSIONS OFF)
-  endif()
-endif()
-
-enable_testing()
-
-include(CMakeDependentOption)
-include(GNUInstallDirs)
-
-#Note that googlemock target already builds googletest
-option(BUILD_GMOCK "Builds the googlemock subproject" ON)
-option(INSTALL_GTEST "Enable installation of googletest. (Projects embedding googletest may want to turn this OFF.)" ON)
-
-if(BUILD_GMOCK)
-  add_subdirectory( googlemock )
-else()
-  add_subdirectory( googletest )
-endif()
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/CONTRIBUTING.md mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/CONTRIBUTING.md
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/CONTRIBUTING.md	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/CONTRIBUTING.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,142 +0,0 @@
-# How to become a contributor and submit your own code
-
-## Contributor License Agreements
-
-We'd love to accept your patches! Before we can take them, we have to jump a
-couple of legal hurdles.
-
-Please fill out either the individual or corporate Contributor License Agreement
-(CLA).
-
-*   If you are an individual writing original source code and you're sure you
-    own the intellectual property, then you'll need to sign an
-    [individual CLA](https://developers.google.com/open-source/cla/individual).
-*   If you work for a company that wants to allow you to contribute your work,
-    then you'll need to sign a
-    [corporate CLA](https://developers.google.com/open-source/cla/corporate).
-
-Follow either of the two links above to access the appropriate CLA and
-instructions for how to sign and return it. Once we receive it, we'll be able to
-accept your pull requests.
-
-## Are you a Googler?
-
-If you are a Googler, please make an attempt to submit an internal change rather
-than a GitHub Pull Request. If you are not able to submit an internal change a
-PR is acceptable as an alternative.
-
-## Contributing A Patch
-
-1.  Submit an issue describing your proposed change to the
-    [issue tracker](https://github.com/google/googletest).
-2.  Please don't mix more than one logical change per submittal, because it
-    makes the history hard to follow. If you want to make a change that doesn't
-    have a corresponding issue in the issue tracker, please create one.
-3.  Also, coordinate with team members that are listed on the issue in question.
-    This ensures that work isn't being duplicated and communicating your plan
-    early also generally leads to better patches.
-4.  If your proposed change is accepted, and you haven't already done so, sign a
-    Contributor License Agreement (see details above).
-5.  Fork the desired repo, develop and test your code changes.
-6.  Ensure that your code adheres to the existing style in the sample to which
-    you are contributing.
-7.  Ensure that your code has an appropriate set of unit tests which all pass.
-8.  Submit a pull request.
-
-## The Google Test and Google Mock Communities
-
-The Google Test community exists primarily through the
-[discussion group](http://groups.google.com/group/googletestframework) and the
-GitHub repository. Likewise, the Google Mock community exists primarily through
-their own [discussion group](http://groups.google.com/group/googlemock). You are
-definitely encouraged to contribute to the discussion and you can also help us
-to keep the effectiveness of the group high by following and promoting the
-guidelines listed here.
-
-### Please Be Friendly
-
-Showing courtesy and respect to others is a vital part of the Google culture,
-and we strongly encourage everyone participating in Google Test development to
-join us in accepting nothing less. Of course, being courteous is not the same as
-failing to constructively disagree with each other, but it does mean that we
-should be respectful of each other when enumerating the 42 technical reasons
-that a particular proposal may not be the best choice. There's never a reason to
-be antagonistic or dismissive toward anyone who is sincerely trying to
-contribute to a discussion.
-
-Sure, C++ testing is serious business and all that, but it's also a lot of fun.
-Let's keep it that way. Let's strive to be one of the friendliest communities in
-all of open source.
-
-As always, discuss Google Test in the official GoogleTest discussion group. You
-don't have to actually submit code in order to sign up. Your participation
-itself is a valuable contribution.
-
-## Style
-
-To keep the source consistent, readable, diffable and easy to merge, we use a
-fairly rigid coding style, as defined by the
-[google-styleguide](https://github.com/google/styleguide) project. All patches
-will be expected to conform to the style outlined
-[here](https://google.github.io/styleguide/cppguide.html). Use
-[.clang-format](https://github.com/google/googletest/blob/master/.clang-format)
-to check your formatting
-
-## Requirements for Contributors
-
-If you plan to contribute a patch, you need to build Google Test, Google Mock,
-and their own tests from a git checkout, which has further requirements:
-
-*   [Python](https://www.python.org/) v2.3 or newer (for running some of the
-    tests and re-generating certain source files from templates)
-*   [CMake](https://cmake.org/) v2.6.4 or newer
-
-## Developing Google Test and Google Mock
-
-This section discusses how to make your own changes to the Google Test project.
-
-### Testing Google Test and Google Mock Themselves
-
-To make sure your changes work as intended and don't break existing
-functionality, you'll want to compile and run Google Test and GoogleMock's own
-tests. For that you can use CMake:
-
-    mkdir mybuild
-    cd mybuild
-    cmake -Dgtest_build_tests=ON -Dgmock_build_tests=ON ${GTEST_REPO_DIR}
-
-To choose between building only Google Test or Google Mock, you may modify your
-cmake command to be one of each
-
-    cmake -Dgtest_build_tests=ON ${GTEST_DIR} # sets up Google Test tests
-    cmake -Dgmock_build_tests=ON ${GMOCK_DIR} # sets up Google Mock tests
-
-Make sure you have Python installed, as some of Google Test's tests are written
-in Python. If the cmake command complains about not being able to find Python
-(`Could NOT find PythonInterp (missing: PYTHON_EXECUTABLE)`), try telling it
-explicitly where your Python executable can be found:
-
-    cmake -DPYTHON_EXECUTABLE=path/to/python ...
-
-Next, you can build Google Test and / or Google Mock and all desired tests. On
-\*nix, this is usually done by
-
-    make
-
-To run the tests, do
-
-    make test
-
-All tests should pass.
-
-### Regenerating Source Files
-
-Some of Google Test's source files are generated from templates (not in the C++
-sense) using a script. For example, the file
-include/gtest/internal/gtest-type-util.h.pump is used to generate
-gtest-type-util.h in the same directory.
-
-You don't need to worry about regenerating the source files unless you need to
-modify them. You would then modify the corresponding `.pump` files and run the
-'[pump.py](googletest/scripts/pump.py)' generator script. See the
-[Pump Manual](googletest/docs/pump_manual.md).
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/CMakeLists.txt mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/CMakeLists.txt
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,233 +0,0 @@
-########################################################################
-# Note: CMake support is community-based. The maintainers do not use CMake
-# internally.
-#
-# CMake build script for Google Mock.
-#
-# To run the tests for Google Mock itself on Linux, use 'make test' or
-# ctest.  You can select which tests to run using 'ctest -R regex'.
-# For more options, run 'ctest --help'.
-
-option(gmock_build_tests "Build all of Google Mock's own tests." OFF)
-
-# A directory to find Google Test sources.
-if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/gtest/CMakeLists.txt")
-  set(gtest_dir gtest)
-else()
-  set(gtest_dir ../googletest)
-endif()
-
-# Defines pre_project_set_up_hermetic_build() and set_up_hermetic_build().
-include("${gtest_dir}/cmake/hermetic_build.cmake" OPTIONAL)
-
-if (COMMAND pre_project_set_up_hermetic_build)
-  # Google Test also calls hermetic setup functions from add_subdirectory,
-  # although its changes will not affect things at the current scope.
-  pre_project_set_up_hermetic_build()
-endif()
-
-########################################################################
-#
-# Project-wide settings
-
-# Name of the project.
-#
-# CMake files in this project can refer to the root source directory
-# as ${gmock_SOURCE_DIR} and to the root binary directory as
-# ${gmock_BINARY_DIR}.
-# Language "C" is required for find_package(Threads).
-if (CMAKE_VERSION VERSION_LESS 3.0)
-  project(gmock CXX C)
-else()
-  cmake_policy(SET CMP0048 NEW)
-  project(gmock VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C)
-endif()
-cmake_minimum_required(VERSION 2.6.4)
-
-if (COMMAND set_up_hermetic_build)
-  set_up_hermetic_build()
-endif()
-
-# Instructs CMake to process Google Test's CMakeLists.txt and add its
-# targets to the current scope.  We are placing Google Test's binary
-# directory in a subdirectory of our own as VC compilation may break
-# if they are the same (the default).
-add_subdirectory("${gtest_dir}" "${gmock_BINARY_DIR}/${gtest_dir}")
-
-
-# These commands only run if this is the main project
-if(CMAKE_PROJECT_NAME STREQUAL "gmock" OR CMAKE_PROJECT_NAME STREQUAL "googletest-distribution")
-  # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to
-  # make it prominent in the GUI.
-  option(BUILD_SHARED_LIBS "Build shared libraries (DLLs)." OFF)
-else()
-  mark_as_advanced(gmock_build_tests)
-endif()
-
-# Although Google Test's CMakeLists.txt calls this function, the
-# changes there don't affect the current scope.  Therefore we have to
-# call it again here.
-config_compiler_and_linker()  # from ${gtest_dir}/cmake/internal_utils.cmake
-
-# Adds Google Mock's and Google Test's header directories to the search path.
-set(gmock_build_include_dirs
-  "${gmock_SOURCE_DIR}/include"
-  "${gmock_SOURCE_DIR}"
-  "${gtest_SOURCE_DIR}/include"
-  # This directory is needed to build directly from Google Test sources.
-  "${gtest_SOURCE_DIR}")
-include_directories(${gmock_build_include_dirs})
-
-########################################################################
-#
-# Defines the gmock & gmock_main libraries.  User tests should link
-# with one of them.
-
-# Google Mock libraries.  We build them using more strict warnings than what
-# are used for other targets, to ensure that Google Mock can be compiled by
-# a user aggressive about warnings.
-if (MSVC)
-  cxx_library(gmock
-              "${cxx_strict}"
-              "${gtest_dir}/src/gtest-all.cc"
-              src/gmock-all.cc)
-
-  cxx_library(gmock_main
-              "${cxx_strict}"
-              "${gtest_dir}/src/gtest-all.cc"
-              src/gmock-all.cc
-              src/gmock_main.cc)
-else()
-  cxx_library(gmock "${cxx_strict}" src/gmock-all.cc)
-  target_link_libraries(gmock PUBLIC gtest)
-  cxx_library(gmock_main "${cxx_strict}" src/gmock_main.cc)
-  target_link_libraries(gmock_main PUBLIC gmock)
-endif()
-# If the CMake version supports it, attach header directory information
-# to the targets for when we are part of a parent build (ie being pulled
-# in via add_subdirectory() rather than being a standalone build).
-if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11")
-  target_include_directories(gmock SYSTEM INTERFACE
-    "$<BUILD_INTERFACE:${gmock_build_include_dirs}>"
-    "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
-  target_include_directories(gmock_main SYSTEM INTERFACE
-    "$<BUILD_INTERFACE:${gmock_build_include_dirs}>"
-    "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
-endif()
-
-########################################################################
-#
-# Install rules
-install_project(gmock gmock_main)
-
-########################################################################
-#
-# Google Mock's own tests.
-#
-# You can skip this section if you aren't interested in testing
-# Google Mock itself.
-#
-# The tests are not built by default.  To build them, set the
-# gmock_build_tests option to ON.  You can do it by running ccmake
-# or specifying the -Dgmock_build_tests=ON flag when running cmake.
-
-if (gmock_build_tests)
-  # This must be set in the root directory for the tests to be run by
-  # 'make test' or ctest.
-  enable_testing()
-
-  if (WIN32)
-    file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/RunTest.ps1"
-         CONTENT
-"$project_bin = \"${CMAKE_BINARY_DIR}/bin/$<CONFIG>\"
-$env:Path = \"$project_bin;$env:Path\"
-& $args")
-  elseif (MINGW OR CYGWIN)
-    file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/RunTest.ps1"
-         CONTENT
-"$project_bin = (cygpath --windows ${CMAKE_BINARY_DIR}/bin)
-$env:Path = \"$project_bin;$env:Path\"
-& $args")
-  endif()
-
-  if (MINGW OR CYGWIN)
-    if (CMAKE_VERSION VERSION_LESS "2.8.12")
-      add_compile_options("-Wa,-mbig-obj")
-    else()
-      add_definitions("-Wa,-mbig-obj")
-    endif()
-  endif()
-
-  ############################################################
-  # C++ tests built with standard compiler flags.
-
-  cxx_test(gmock-actions_test gmock_main)
-  cxx_test(gmock-cardinalities_test gmock_main)
-  cxx_test(gmock_ex_test gmock_main)
-  cxx_test(gmock-function-mocker_test gmock_main)
-  cxx_test(gmock-generated-actions_test gmock_main)
-  cxx_test(gmock-generated-function-mockers_test gmock_main)
-  cxx_test(gmock-generated-matchers_test gmock_main)
-  cxx_test(gmock-internal-utils_test gmock_main)
-  cxx_test(gmock-matchers_test gmock_main)
-  cxx_test(gmock-more-actions_test gmock_main)
-  cxx_test(gmock-nice-strict_test gmock_main)
-  cxx_test(gmock-port_test gmock_main)
-  cxx_test(gmock-spec-builders_test gmock_main)
-  cxx_test(gmock_link_test gmock_main test/gmock_link2_test.cc)
-  cxx_test(gmock_test gmock_main)
-
-  if (DEFINED GTEST_HAS_PTHREAD)
-    cxx_test(gmock_stress_test gmock)
-  endif()
-
-  # gmock_all_test is commented to save time building and running tests.
-  # Uncomment if necessary.
-  # cxx_test(gmock_all_test gmock_main)
-
-  ############################################################
-  # C++ tests built with non-standard compiler flags.
-
-  if (MSVC)
-    cxx_library(gmock_main_no_exception "${cxx_no_exception}"
-      "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc)
-
-    cxx_library(gmock_main_no_rtti "${cxx_no_rtti}"
-      "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc)
-
-  else()
-    cxx_library(gmock_main_no_exception "${cxx_no_exception}" src/gmock_main.cc)
-    target_link_libraries(gmock_main_no_exception PUBLIC gmock)
-
-    cxx_library(gmock_main_no_rtti "${cxx_no_rtti}" src/gmock_main.cc)
-    target_link_libraries(gmock_main_no_rtti PUBLIC gmock)
-  endif()
-  cxx_test_with_flags(gmock-more-actions_no_exception_test "${cxx_no_exception}"
-    gmock_main_no_exception test/gmock-more-actions_test.cc)
-
-  cxx_test_with_flags(gmock_no_rtti_test "${cxx_no_rtti}"
-    gmock_main_no_rtti test/gmock-spec-builders_test.cc)
-
-  cxx_shared_library(shared_gmock_main "${cxx_default}"
-    "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc)
-
-  # Tests that a binary can be built with Google Mock as a shared library.  On
-  # some system configurations, it may not possible to run the binary without
-  # knowing more details about the system configurations. We do not try to run
-  # this binary. To get a more robust shared library coverage, configure with
-  # -DBUILD_SHARED_LIBS=ON.
-  cxx_executable_with_flags(shared_gmock_test_ "${cxx_default}"
-    shared_gmock_main test/gmock-spec-builders_test.cc)
-  set_target_properties(shared_gmock_test_
-    PROPERTIES
-    COMPILE_DEFINITIONS "GTEST_LINKED_AS_SHARED_LIBRARY=1")
-
-  ############################################################
-  # Python tests.
-
-  cxx_executable(gmock_leak_test_ test gmock_main)
-  py_test(gmock_leak_test)
-
-  cxx_executable(gmock_output_test_ test gmock)
-  py_test(gmock_output_test)
-endif()
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/CONTRIBUTORS mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/CONTRIBUTORS
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/CONTRIBUTORS	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/CONTRIBUTORS	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-# This file contains a list of people who've made non-trivial
-# contribution to the Google C++ Mocking Framework project.  People
-# who commit code to the project are encouraged to add their names
-# here.  Please keep the list sorted by first names.
-
-Benoit Sigoure <tsuna@google.com>
-Bogdan Piloca <boo@google.com>
-Chandler Carruth <chandlerc@google.com>
-Dave MacLachlan <dmaclach@gmail.com>
-David Anderson <danderson@google.com>
-Dean Sturtevant
-Gene Volovich <gv@cite.com>
-Hal Burch <gmock@hburch.com>
-Jeffrey Yasskin <jyasskin@google.com>
-Jim Keller <jimkeller@google.com>
-Joe Walnes <joe@truemesh.com>
-Jon Wray <jwray@google.com>
-Keir Mierle <mierle@gmail.com>
-Keith Ray <keith.ray@gmail.com>
-Kostya Serebryany <kcc@google.com>
-Lev Makhlis
-Manuel Klimek <klimek@google.com>
-Mario Tanev <radix@google.com>
-Mark Paskin
-Markus Heule <markus.heule@gmail.com>
-Matthew Simmons <simmonmt@acm.org>
-Mike Bland <mbland@google.com>
-Neal Norwitz <nnorwitz@gmail.com>
-Nermin Ozkiranartli <nermin@google.com>
-Owen Carlsen <ocarlsen@google.com>
-Paneendra Ba <paneendra@google.com>
-Paul Menage <menage@google.com>
-Piotr Kaminski <piotrk@google.com>
-Russ Rufer <russ@pentad.com>
-Sverre Sundsdal <sundsdal@gmail.com>
-Takeshi Yoshino <tyoshino@google.com>
-Vadim Berman <vadimb@google.com>
-Vlad Losev <vladl@google.com>
-Wolfgang Klier <wklier@google.com>
-Zhanyong Wan <wan@google.com>
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-actions.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-actions.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-actions.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-actions.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,1142 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file implements some commonly used actions.
-
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_ACTIONS_H_
-#define GMOCK_INCLUDE_GMOCK_GMOCK_ACTIONS_H_
-
-#ifndef _WIN32_WCE
-# include <errno.h>
-#endif
-
-#include <algorithm>
-#include <functional>
-#include <memory>
-#include <string>
-#include <type_traits>
-#include <utility>
-
-#include "gmock/internal/gmock-internal-utils.h"
-#include "gmock/internal/gmock-port.h"
-
-#ifdef _MSC_VER
-# pragma warning(push)
-# pragma warning(disable:4100)
-#endif
-
-namespace testing {
-
-// To implement an action Foo, define:
-//   1. a class FooAction that implements the ActionInterface interface, and
-//   2. a factory function that creates an Action object from a
-//      const FooAction*.
-//
-// The two-level delegation design follows that of Matcher, providing
-// consistency for extension developers.  It also eases ownership
-// management as Action objects can now be copied like plain values.
-
-namespace internal {
-
-// BuiltInDefaultValueGetter<T, true>::Get() returns a
-// default-constructed T value.  BuiltInDefaultValueGetter<T,
-// false>::Get() crashes with an error.
-//
-// This primary template is used when kDefaultConstructible is true.
-template <typename T, bool kDefaultConstructible>
-struct BuiltInDefaultValueGetter {
-  static T Get() { return T(); }
-};
-template <typename T>
-struct BuiltInDefaultValueGetter<T, false> {
-  static T Get() {
-    Assert(false, __FILE__, __LINE__,
-           "Default action undefined for the function return type.");
-    return internal::Invalid<T>();
-    // The above statement will never be reached, but is required in
-    // order for this function to compile.
-  }
-};
-
-// BuiltInDefaultValue<T>::Get() returns the "built-in" default value
-// for type T, which is NULL when T is a raw pointer type, 0 when T is
-// a numeric type, false when T is bool, or "" when T is string or
-// std::string.  In addition, in C++11 and above, it turns a
-// default-constructed T value if T is default constructible.  For any
-// other type T, the built-in default T value is undefined, and the
-// function will abort the process.
-template <typename T>
-class BuiltInDefaultValue {
- public:
-  // This function returns true if and only if type T has a built-in default
-  // value.
-  static bool Exists() {
-    return ::std::is_default_constructible<T>::value;
-  }
-
-  static T Get() {
-    return BuiltInDefaultValueGetter<
-        T, ::std::is_default_constructible<T>::value>::Get();
-  }
-};
-
-// This partial specialization says that we use the same built-in
-// default value for T and const T.
-template <typename T>
-class BuiltInDefaultValue<const T> {
- public:
-  static bool Exists() { return BuiltInDefaultValue<T>::Exists(); }
-  static T Get() { return BuiltInDefaultValue<T>::Get(); }
-};
-
-// This partial specialization defines the default values for pointer
-// types.
-template <typename T>
-class BuiltInDefaultValue<T*> {
- public:
-  static bool Exists() { return true; }
-  static T* Get() { return nullptr; }
-};
-
-// The following specializations define the default values for
-// specific types we care about.
-#define GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(type, value) \
-  template <> \
-  class BuiltInDefaultValue<type> { \
-   public: \
-    static bool Exists() { return true; } \
-    static type Get() { return value; } \
-  }
-
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(void, );  // NOLINT
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(::std::string, "");
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(bool, false);
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(unsigned char, '\0');
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(signed char, '\0');
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(char, '\0');
-
-// There's no need for a default action for signed wchar_t, as that
-// type is the same as wchar_t for gcc, and invalid for MSVC.
-//
-// There's also no need for a default action for unsigned wchar_t, as
-// that type is the same as unsigned int for gcc, and invalid for
-// MSVC.
-#if GMOCK_WCHAR_T_IS_NATIVE_
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(wchar_t, 0U);  // NOLINT
-#endif
-
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(unsigned short, 0U);  // NOLINT
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(signed short, 0);     // NOLINT
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(unsigned int, 0U);
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(signed int, 0);
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(unsigned long, 0UL);  // NOLINT
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(signed long, 0L);     // NOLINT
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(UInt64, 0);
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(Int64, 0);
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(float, 0);
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(double, 0);
-
-#undef GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_
-
-}  // namespace internal
-
-// When an unexpected function call is encountered, Google Mock will
-// let it return a default value if the user has specified one for its
-// return type, or if the return type has a built-in default value;
-// otherwise Google Mock won't know what value to return and will have
-// to abort the process.
-//
-// The DefaultValue<T> class allows a user to specify the
-// default value for a type T that is both copyable and publicly
-// destructible (i.e. anything that can be used as a function return
-// type).  The usage is:
-//
-//   // Sets the default value for type T to be foo.
-//   DefaultValue<T>::Set(foo);
-template <typename T>
-class DefaultValue {
- public:
-  // Sets the default value for type T; requires T to be
-  // copy-constructable and have a public destructor.
-  static void Set(T x) {
-    delete producer_;
-    producer_ = new FixedValueProducer(x);
-  }
-
-  // Provides a factory function to be called to generate the default value.
-  // This method can be used even if T is only move-constructible, but it is not
-  // limited to that case.
-  typedef T (*FactoryFunction)();
-  static void SetFactory(FactoryFunction factory) {
-    delete producer_;
-    producer_ = new FactoryValueProducer(factory);
-  }
-
-  // Unsets the default value for type T.
-  static void Clear() {
-    delete producer_;
-    producer_ = nullptr;
-  }
-
-  // Returns true if and only if the user has set the default value for type T.
-  static bool IsSet() { return producer_ != nullptr; }
-
-  // Returns true if T has a default return value set by the user or there
-  // exists a built-in default value.
-  static bool Exists() {
-    return IsSet() || internal::BuiltInDefaultValue<T>::Exists();
-  }
-
-  // Returns the default value for type T if the user has set one;
-  // otherwise returns the built-in default value. Requires that Exists()
-  // is true, which ensures that the return value is well-defined.
-  static T Get() {
-    return producer_ == nullptr ? internal::BuiltInDefaultValue<T>::Get()
-                                : producer_->Produce();
-  }
-
- private:
-  class ValueProducer {
-   public:
-    virtual ~ValueProducer() {}
-    virtual T Produce() = 0;
-  };
-
-  class FixedValueProducer : public ValueProducer {
-   public:
-    explicit FixedValueProducer(T value) : value_(value) {}
-    T Produce() override { return value_; }
-
-   private:
-    const T value_;
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(FixedValueProducer);
-  };
-
-  class FactoryValueProducer : public ValueProducer {
-   public:
-    explicit FactoryValueProducer(FactoryFunction factory)
-        : factory_(factory) {}
-    T Produce() override { return factory_(); }
-
-   private:
-    const FactoryFunction factory_;
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(FactoryValueProducer);
-  };
-
-  static ValueProducer* producer_;
-};
-
-// This partial specialization allows a user to set default values for
-// reference types.
-template <typename T>
-class DefaultValue<T&> {
- public:
-  // Sets the default value for type T&.
-  static void Set(T& x) {  // NOLINT
-    address_ = &x;
-  }
-
-  // Unsets the default value for type T&.
-  static void Clear() { address_ = nullptr; }
-
-  // Returns true if and only if the user has set the default value for type T&.
-  static bool IsSet() { return address_ != nullptr; }
-
-  // Returns true if T has a default return value set by the user or there
-  // exists a built-in default value.
-  static bool Exists() {
-    return IsSet() || internal::BuiltInDefaultValue<T&>::Exists();
-  }
-
-  // Returns the default value for type T& if the user has set one;
-  // otherwise returns the built-in default value if there is one;
-  // otherwise aborts the process.
-  static T& Get() {
-    return address_ == nullptr ? internal::BuiltInDefaultValue<T&>::Get()
-                               : *address_;
-  }
-
- private:
-  static T* address_;
-};
-
-// This specialization allows DefaultValue<void>::Get() to
-// compile.
-template <>
-class DefaultValue<void> {
- public:
-  static bool Exists() { return true; }
-  static void Get() {}
-};
-
-// Points to the user-set default value for type T.
-template <typename T>
-typename DefaultValue<T>::ValueProducer* DefaultValue<T>::producer_ = nullptr;
-
-// Points to the user-set default value for type T&.
-template <typename T>
-T* DefaultValue<T&>::address_ = nullptr;
-
-// Implement this interface to define an action for function type F.
-template <typename F>
-class ActionInterface {
- public:
-  typedef typename internal::Function<F>::Result Result;
-  typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
-
-  ActionInterface() {}
-  virtual ~ActionInterface() {}
-
-  // Performs the action.  This method is not const, as in general an
-  // action can have side effects and be stateful.  For example, a
-  // get-the-next-element-from-the-collection action will need to
-  // remember the current element.
-  virtual Result Perform(const ArgumentTuple& args) = 0;
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ActionInterface);
-};
-
-// An Action<F> is a copyable and IMMUTABLE (except by assignment)
-// object that represents an action to be taken when a mock function
-// of type F is called.  The implementation of Action<T> is just a
-// std::shared_ptr to const ActionInterface<T>. Don't inherit from Action!
-// You can view an object implementing ActionInterface<F> as a
-// concrete action (including its current state), and an Action<F>
-// object as a handle to it.
-template <typename F>
-class Action {
-  // Adapter class to allow constructing Action from a legacy ActionInterface.
-  // New code should create Actions from functors instead.
-  struct ActionAdapter {
-    // Adapter must be copyable to satisfy std::function requirements.
-    ::std::shared_ptr<ActionInterface<F>> impl_;
-
-    template <typename... Args>
-    typename internal::Function<F>::Result operator()(Args&&... args) {
-      return impl_->Perform(
-          ::std::forward_as_tuple(::std::forward<Args>(args)...));
-    }
-  };
-
- public:
-  typedef typename internal::Function<F>::Result Result;
-  typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
-
-  // Constructs a null Action.  Needed for storing Action objects in
-  // STL containers.
-  Action() {}
-
-  // Construct an Action from a specified callable.
-  // This cannot take std::function directly, because then Action would not be
-  // directly constructible from lambda (it would require two conversions).
-  template <typename G,
-            typename = typename ::std::enable_if<
-                ::std::is_constructible<::std::function<F>, G>::value>::type>
-  Action(G&& fun) : fun_(::std::forward<G>(fun)) {}  // NOLINT
-
-  // Constructs an Action from its implementation.
-  explicit Action(ActionInterface<F>* impl)
-      : fun_(ActionAdapter{::std::shared_ptr<ActionInterface<F>>(impl)}) {}
-
-  // This constructor allows us to turn an Action<Func> object into an
-  // Action<F>, as long as F's arguments can be implicitly converted
-  // to Func's and Func's return type can be implicitly converted to F's.
-  template <typename Func>
-  explicit Action(const Action<Func>& action) : fun_(action.fun_) {}
-
-  // Returns true if and only if this is the DoDefault() action.
-  bool IsDoDefault() const { return fun_ == nullptr; }
-
-  // Performs the action.  Note that this method is const even though
-  // the corresponding method in ActionInterface is not.  The reason
-  // is that a const Action<F> means that it cannot be re-bound to
-  // another concrete action, not that the concrete action it binds to
-  // cannot change state.  (Think of the difference between a const
-  // pointer and a pointer to const.)
-  Result Perform(ArgumentTuple args) const {
-    if (IsDoDefault()) {
-      internal::IllegalDoDefault(__FILE__, __LINE__);
-    }
-    return internal::Apply(fun_, ::std::move(args));
-  }
-
- private:
-  template <typename G>
-  friend class Action;
-
-  // fun_ is an empty function if and only if this is the DoDefault() action.
-  ::std::function<F> fun_;
-};
-
-// The PolymorphicAction class template makes it easy to implement a
-// polymorphic action (i.e. an action that can be used in mock
-// functions of than one type, e.g. Return()).
-//
-// To define a polymorphic action, a user first provides a COPYABLE
-// implementation class that has a Perform() method template:
-//
-//   class FooAction {
-//    public:
-//     template <typename Result, typename ArgumentTuple>
-//     Result Perform(const ArgumentTuple& args) const {
-//       // Processes the arguments and returns a result, using
-//       // std::get<N>(args) to get the N-th (0-based) argument in the tuple.
-//     }
-//     ...
-//   };
-//
-// Then the user creates the polymorphic action using
-// MakePolymorphicAction(object) where object has type FooAction.  See
-// the definition of Return(void) and SetArgumentPointee<N>(value) for
-// complete examples.
-template <typename Impl>
-class PolymorphicAction {
- public:
-  explicit PolymorphicAction(const Impl& impl) : impl_(impl) {}
-
-  template <typename F>
-  operator Action<F>() const {
-    return Action<F>(new MonomorphicImpl<F>(impl_));
-  }
-
- private:
-  template <typename F>
-  class MonomorphicImpl : public ActionInterface<F> {
-   public:
-    typedef typename internal::Function<F>::Result Result;
-    typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
-
-    explicit MonomorphicImpl(const Impl& impl) : impl_(impl) {}
-
-    Result Perform(const ArgumentTuple& args) override {
-      return impl_.template Perform<Result>(args);
-    }
-
-   private:
-    Impl impl_;
-
-    GTEST_DISALLOW_ASSIGN_(MonomorphicImpl);
-  };
-
-  Impl impl_;
-
-  GTEST_DISALLOW_ASSIGN_(PolymorphicAction);
-};
-
-// Creates an Action from its implementation and returns it.  The
-// created Action object owns the implementation.
-template <typename F>
-Action<F> MakeAction(ActionInterface<F>* impl) {
-  return Action<F>(impl);
-}
-
-// Creates a polymorphic action from its implementation.  This is
-// easier to use than the PolymorphicAction<Impl> constructor as it
-// doesn't require you to explicitly write the template argument, e.g.
-//
-//   MakePolymorphicAction(foo);
-// vs
-//   PolymorphicAction<TypeOfFoo>(foo);
-template <typename Impl>
-inline PolymorphicAction<Impl> MakePolymorphicAction(const Impl& impl) {
-  return PolymorphicAction<Impl>(impl);
-}
-
-namespace internal {
-
-// Helper struct to specialize ReturnAction to execute a move instead of a copy
-// on return. Useful for move-only types, but could be used on any type.
-template <typename T>
-struct ByMoveWrapper {
-  explicit ByMoveWrapper(T value) : payload(std::move(value)) {}
-  T payload;
-};
-
-// Implements the polymorphic Return(x) action, which can be used in
-// any function that returns the type of x, regardless of the argument
-// types.
-//
-// Note: The value passed into Return must be converted into
-// Function<F>::Result when this action is cast to Action<F> rather than
-// when that action is performed. This is important in scenarios like
-//
-// MOCK_METHOD1(Method, T(U));
-// ...
-// {
-//   Foo foo;
-//   X x(&foo);
-//   EXPECT_CALL(mock, Method(_)).WillOnce(Return(x));
-// }
-//
-// In the example above the variable x holds reference to foo which leaves
-// scope and gets destroyed.  If copying X just copies a reference to foo,
-// that copy will be left with a hanging reference.  If conversion to T
-// makes a copy of foo, the above code is safe. To support that scenario, we
-// need to make sure that the type conversion happens inside the EXPECT_CALL
-// statement, and conversion of the result of Return to Action<T(U)> is a
-// good place for that.
-//
-// The real life example of the above scenario happens when an invocation
-// of gtl::Container() is passed into Return.
-//
-template <typename R>
-class ReturnAction {
- public:
-  // Constructs a ReturnAction object from the value to be returned.
-  // 'value' is passed by value instead of by const reference in order
-  // to allow Return("string literal") to compile.
-  explicit ReturnAction(R value) : value_(new R(std::move(value))) {}
-
-  // This template type conversion operator allows Return(x) to be
-  // used in ANY function that returns x's type.
-  template <typename F>
-  operator Action<F>() const {  // NOLINT
-    // Assert statement belongs here because this is the best place to verify
-    // conditions on F. It produces the clearest error messages
-    // in most compilers.
-    // Impl really belongs in this scope as a local class but can't
-    // because MSVC produces duplicate symbols in different translation units
-    // in this case. Until MS fixes that bug we put Impl into the class scope
-    // and put the typedef both here (for use in assert statement) and
-    // in the Impl class. But both definitions must be the same.
-    typedef typename Function<F>::Result Result;
-    GTEST_COMPILE_ASSERT_(
-        !std::is_reference<Result>::value,
-        use_ReturnRef_instead_of_Return_to_return_a_reference);
-    static_assert(!std::is_void<Result>::value,
-                  "Can't use Return() on an action expected to return `void`.");
-    return Action<F>(new Impl<R, F>(value_));
-  }
-
- private:
-  // Implements the Return(x) action for a particular function type F.
-  template <typename R_, typename F>
-  class Impl : public ActionInterface<F> {
-   public:
-    typedef typename Function<F>::Result Result;
-    typedef typename Function<F>::ArgumentTuple ArgumentTuple;
-
-    // The implicit cast is necessary when Result has more than one
-    // single-argument constructor (e.g. Result is std::vector<int>) and R
-    // has a type conversion operator template.  In that case, value_(value)
-    // won't compile as the compiler doesn't known which constructor of
-    // Result to call.  ImplicitCast_ forces the compiler to convert R to
-    // Result without considering explicit constructors, thus resolving the
-    // ambiguity. value_ is then initialized using its copy constructor.
-    explicit Impl(const std::shared_ptr<R>& value)
-        : value_before_cast_(*value),
-          value_(ImplicitCast_<Result>(value_before_cast_)) {}
-
-    Result Perform(const ArgumentTuple&) override { return value_; }
-
-   private:
-    GTEST_COMPILE_ASSERT_(!std::is_reference<Result>::value,
-                          Result_cannot_be_a_reference_type);
-    // We save the value before casting just in case it is being cast to a
-    // wrapper type.
-    R value_before_cast_;
-    Result value_;
-
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(Impl);
-  };
-
-  // Partially specialize for ByMoveWrapper. This version of ReturnAction will
-  // move its contents instead.
-  template <typename R_, typename F>
-  class Impl<ByMoveWrapper<R_>, F> : public ActionInterface<F> {
-   public:
-    typedef typename Function<F>::Result Result;
-    typedef typename Function<F>::ArgumentTuple ArgumentTuple;
-
-    explicit Impl(const std::shared_ptr<R>& wrapper)
-        : performed_(false), wrapper_(wrapper) {}
-
-    Result Perform(const ArgumentTuple&) override {
-      GTEST_CHECK_(!performed_)
-          << "A ByMove() action should only be performed once.";
-      performed_ = true;
-      return std::move(wrapper_->payload);
-    }
-
-   private:
-    bool performed_;
-    const std::shared_ptr<R> wrapper_;
-
-    GTEST_DISALLOW_ASSIGN_(Impl);
-  };
-
-  const std::shared_ptr<R> value_;
-
-  GTEST_DISALLOW_ASSIGN_(ReturnAction);
-};
-
-// Implements the ReturnNull() action.
-class ReturnNullAction {
- public:
-  // Allows ReturnNull() to be used in any pointer-returning function. In C++11
-  // this is enforced by returning nullptr, and in non-C++11 by asserting a
-  // pointer type on compile time.
-  template <typename Result, typename ArgumentTuple>
-  static Result Perform(const ArgumentTuple&) {
-    return nullptr;
-  }
-};
-
-// Implements the Return() action.
-class ReturnVoidAction {
- public:
-  // Allows Return() to be used in any void-returning function.
-  template <typename Result, typename ArgumentTuple>
-  static void Perform(const ArgumentTuple&) {
-    static_assert(std::is_void<Result>::value, "Result should be void.");
-  }
-};
-
-// Implements the polymorphic ReturnRef(x) action, which can be used
-// in any function that returns a reference to the type of x,
-// regardless of the argument types.
-template <typename T>
-class ReturnRefAction {
- public:
-  // Constructs a ReturnRefAction object from the reference to be returned.
-  explicit ReturnRefAction(T& ref) : ref_(ref) {}  // NOLINT
-
-  // This template type conversion operator allows ReturnRef(x) to be
-  // used in ANY function that returns a reference to x's type.
-  template <typename F>
-  operator Action<F>() const {
-    typedef typename Function<F>::Result Result;
-    // Asserts that the function return type is a reference.  This
-    // catches the user error of using ReturnRef(x) when Return(x)
-    // should be used, and generates some helpful error message.
-    GTEST_COMPILE_ASSERT_(std::is_reference<Result>::value,
-                          use_Return_instead_of_ReturnRef_to_return_a_value);
-    return Action<F>(new Impl<F>(ref_));
-  }
-
- private:
-  // Implements the ReturnRef(x) action for a particular function type F.
-  template <typename F>
-  class Impl : public ActionInterface<F> {
-   public:
-    typedef typename Function<F>::Result Result;
-    typedef typename Function<F>::ArgumentTuple ArgumentTuple;
-
-    explicit Impl(T& ref) : ref_(ref) {}  // NOLINT
-
-    Result Perform(const ArgumentTuple&) override { return ref_; }
-
-   private:
-    T& ref_;
-
-    GTEST_DISALLOW_ASSIGN_(Impl);
-  };
-
-  T& ref_;
-
-  GTEST_DISALLOW_ASSIGN_(ReturnRefAction);
-};
-
-// Implements the polymorphic ReturnRefOfCopy(x) action, which can be
-// used in any function that returns a reference to the type of x,
-// regardless of the argument types.
-template <typename T>
-class ReturnRefOfCopyAction {
- public:
-  // Constructs a ReturnRefOfCopyAction object from the reference to
-  // be returned.
-  explicit ReturnRefOfCopyAction(const T& value) : value_(value) {}  // NOLINT
-
-  // This template type conversion operator allows ReturnRefOfCopy(x) to be
-  // used in ANY function that returns a reference to x's type.
-  template <typename F>
-  operator Action<F>() const {
-    typedef typename Function<F>::Result Result;
-    // Asserts that the function return type is a reference.  This
-    // catches the user error of using ReturnRefOfCopy(x) when Return(x)
-    // should be used, and generates some helpful error message.
-    GTEST_COMPILE_ASSERT_(
-        std::is_reference<Result>::value,
-        use_Return_instead_of_ReturnRefOfCopy_to_return_a_value);
-    return Action<F>(new Impl<F>(value_));
-  }
-
- private:
-  // Implements the ReturnRefOfCopy(x) action for a particular function type F.
-  template <typename F>
-  class Impl : public ActionInterface<F> {
-   public:
-    typedef typename Function<F>::Result Result;
-    typedef typename Function<F>::ArgumentTuple ArgumentTuple;
-
-    explicit Impl(const T& value) : value_(value) {}  // NOLINT
-
-    Result Perform(const ArgumentTuple&) override { return value_; }
-
-   private:
-    T value_;
-
-    GTEST_DISALLOW_ASSIGN_(Impl);
-  };
-
-  const T value_;
-
-  GTEST_DISALLOW_ASSIGN_(ReturnRefOfCopyAction);
-};
-
-// Implements the polymorphic DoDefault() action.
-class DoDefaultAction {
- public:
-  // This template type conversion operator allows DoDefault() to be
-  // used in any function.
-  template <typename F>
-  operator Action<F>() const { return Action<F>(); }  // NOLINT
-};
-
-// Implements the Assign action to set a given pointer referent to a
-// particular value.
-template <typename T1, typename T2>
-class AssignAction {
- public:
-  AssignAction(T1* ptr, T2 value) : ptr_(ptr), value_(value) {}
-
-  template <typename Result, typename ArgumentTuple>
-  void Perform(const ArgumentTuple& /* args */) const {
-    *ptr_ = value_;
-  }
-
- private:
-  T1* const ptr_;
-  const T2 value_;
-
-  GTEST_DISALLOW_ASSIGN_(AssignAction);
-};
-
-#if !GTEST_OS_WINDOWS_MOBILE
-
-// Implements the SetErrnoAndReturn action to simulate return from
-// various system calls and libc functions.
-template <typename T>
-class SetErrnoAndReturnAction {
- public:
-  SetErrnoAndReturnAction(int errno_value, T result)
-      : errno_(errno_value),
-        result_(result) {}
-  template <typename Result, typename ArgumentTuple>
-  Result Perform(const ArgumentTuple& /* args */) const {
-    errno = errno_;
-    return result_;
-  }
-
- private:
-  const int errno_;
-  const T result_;
-
-  GTEST_DISALLOW_ASSIGN_(SetErrnoAndReturnAction);
-};
-
-#endif  // !GTEST_OS_WINDOWS_MOBILE
-
-// Implements the SetArgumentPointee<N>(x) action for any function
-// whose N-th argument (0-based) is a pointer to x's type.
-template <size_t N, typename A, typename = void>
-struct SetArgumentPointeeAction {
-  A value;
-
-  template <typename... Args>
-  void operator()(const Args&... args) const {
-    *::std::get<N>(std::tie(args...)) = value;
-  }
-};
-
-// Implements the Invoke(object_ptr, &Class::Method) action.
-template <class Class, typename MethodPtr>
-struct InvokeMethodAction {
-  Class* const obj_ptr;
-  const MethodPtr method_ptr;
-
-  template <typename... Args>
-  auto operator()(Args&&... args) const
-      -> decltype((obj_ptr->*method_ptr)(std::forward<Args>(args)...)) {
-    return (obj_ptr->*method_ptr)(std::forward<Args>(args)...);
-  }
-};
-
-// Implements the InvokeWithoutArgs(f) action.  The template argument
-// FunctionImpl is the implementation type of f, which can be either a
-// function pointer or a functor.  InvokeWithoutArgs(f) can be used as an
-// Action<F> as long as f's type is compatible with F.
-template <typename FunctionImpl>
-struct InvokeWithoutArgsAction {
-  FunctionImpl function_impl;
-
-  // Allows InvokeWithoutArgs(f) to be used as any action whose type is
-  // compatible with f.
-  template <typename... Args>
-  auto operator()(const Args&...) -> decltype(function_impl()) {
-    return function_impl();
-  }
-};
-
-// Implements the InvokeWithoutArgs(object_ptr, &Class::Method) action.
-template <class Class, typename MethodPtr>
-struct InvokeMethodWithoutArgsAction {
-  Class* const obj_ptr;
-  const MethodPtr method_ptr;
-
-  using ReturnType = typename std::result_of<MethodPtr(Class*)>::type;
-
-  template <typename... Args>
-  ReturnType operator()(const Args&...) const {
-    return (obj_ptr->*method_ptr)();
-  }
-};
-
-// Implements the IgnoreResult(action) action.
-template <typename A>
-class IgnoreResultAction {
- public:
-  explicit IgnoreResultAction(const A& action) : action_(action) {}
-
-  template <typename F>
-  operator Action<F>() const {
-    // Assert statement belongs here because this is the best place to verify
-    // conditions on F. It produces the clearest error messages
-    // in most compilers.
-    // Impl really belongs in this scope as a local class but can't
-    // because MSVC produces duplicate symbols in different translation units
-    // in this case. Until MS fixes that bug we put Impl into the class scope
-    // and put the typedef both here (for use in assert statement) and
-    // in the Impl class. But both definitions must be the same.
-    typedef typename internal::Function<F>::Result Result;
-
-    // Asserts at compile time that F returns void.
-    static_assert(std::is_void<Result>::value, "Result type should be void.");
-
-    return Action<F>(new Impl<F>(action_));
-  }
-
- private:
-  template <typename F>
-  class Impl : public ActionInterface<F> {
-   public:
-    typedef typename internal::Function<F>::Result Result;
-    typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
-
-    explicit Impl(const A& action) : action_(action) {}
-
-    void Perform(const ArgumentTuple& args) override {
-      // Performs the action and ignores its result.
-      action_.Perform(args);
-    }
-
-   private:
-    // Type OriginalFunction is the same as F except that its return
-    // type is IgnoredValue.
-    typedef typename internal::Function<F>::MakeResultIgnoredValue
-        OriginalFunction;
-
-    const Action<OriginalFunction> action_;
-
-    GTEST_DISALLOW_ASSIGN_(Impl);
-  };
-
-  const A action_;
-
-  GTEST_DISALLOW_ASSIGN_(IgnoreResultAction);
-};
-
-template <typename InnerAction, size_t... I>
-struct WithArgsAction {
-  InnerAction action;
-
-  // The inner action could be anything convertible to Action<X>.
-  // We use the conversion operator to detect the signature of the inner Action.
-  template <typename R, typename... Args>
-  operator Action<R(Args...)>() const {  // NOLINT
-    Action<R(typename std::tuple_element<I, std::tuple<Args...>>::type...)>
-        converted(action);
-
-    return [converted](Args... args) -> R {
-      return converted.Perform(std::forward_as_tuple(
-        std::get<I>(std::forward_as_tuple(std::forward<Args>(args)...))...));
-    };
-  }
-};
-
-template <typename... Actions>
-struct DoAllAction {
- private:
-  template <typename... Args, size_t... I>
-  std::vector<Action<void(Args...)>> Convert(IndexSequence<I...>) const {
-    return {std::get<I>(actions)...};
-  }
-
- public:
-  std::tuple<Actions...> actions;
-
-  template <typename R, typename... Args>
-  operator Action<R(Args...)>() const {  // NOLINT
-    struct Op {
-      std::vector<Action<void(Args...)>> converted;
-      Action<R(Args...)> last;
-      R operator()(Args... args) const {
-        auto tuple_args = std::forward_as_tuple(std::forward<Args>(args)...);
-        for (auto& a : converted) {
-          a.Perform(tuple_args);
-        }
-        return last.Perform(tuple_args);
-      }
-    };
-    return Op{Convert<Args...>(MakeIndexSequence<sizeof...(Actions) - 1>()),
-              std::get<sizeof...(Actions) - 1>(actions)};
-  }
-};
-
-}  // namespace internal
-
-// An Unused object can be implicitly constructed from ANY value.
-// This is handy when defining actions that ignore some or all of the
-// mock function arguments.  For example, given
-//
-//   MOCK_METHOD3(Foo, double(const string& label, double x, double y));
-//   MOCK_METHOD3(Bar, double(int index, double x, double y));
-//
-// instead of
-//
-//   double DistanceToOriginWithLabel(const string& label, double x, double y) {
-//     return sqrt(x*x + y*y);
-//   }
-//   double DistanceToOriginWithIndex(int index, double x, double y) {
-//     return sqrt(x*x + y*y);
-//   }
-//   ...
-//   EXPECT_CALL(mock, Foo("abc", _, _))
-//       .WillOnce(Invoke(DistanceToOriginWithLabel));
-//   EXPECT_CALL(mock, Bar(5, _, _))
-//       .WillOnce(Invoke(DistanceToOriginWithIndex));
-//
-// you could write
-//
-//   // We can declare any uninteresting argument as Unused.
-//   double DistanceToOrigin(Unused, double x, double y) {
-//     return sqrt(x*x + y*y);
-//   }
-//   ...
-//   EXPECT_CALL(mock, Foo("abc", _, _)).WillOnce(Invoke(DistanceToOrigin));
-//   EXPECT_CALL(mock, Bar(5, _, _)).WillOnce(Invoke(DistanceToOrigin));
-typedef internal::IgnoredValue Unused;
-
-// Creates an action that does actions a1, a2, ..., sequentially in
-// each invocation.
-template <typename... Action>
-internal::DoAllAction<typename std::decay<Action>::type...> DoAll(
-    Action&&... action) {
-  return {std::forward_as_tuple(std::forward<Action>(action)...)};
-}
-
-// WithArg<k>(an_action) creates an action that passes the k-th
-// (0-based) argument of the mock function to an_action and performs
-// it.  It adapts an action accepting one argument to one that accepts
-// multiple arguments.  For convenience, we also provide
-// WithArgs<k>(an_action) (defined below) as a synonym.
-template <size_t k, typename InnerAction>
-internal::WithArgsAction<typename std::decay<InnerAction>::type, k>
-WithArg(InnerAction&& action) {
-  return {std::forward<InnerAction>(action)};
-}
-
-// WithArgs<N1, N2, ..., Nk>(an_action) creates an action that passes
-// the selected arguments of the mock function to an_action and
-// performs it.  It serves as an adaptor between actions with
-// different argument lists.
-template <size_t k, size_t... ks, typename InnerAction>
-internal::WithArgsAction<typename std::decay<InnerAction>::type, k, ks...>
-WithArgs(InnerAction&& action) {
-  return {std::forward<InnerAction>(action)};
-}
-
-// WithoutArgs(inner_action) can be used in a mock function with a
-// non-empty argument list to perform inner_action, which takes no
-// argument.  In other words, it adapts an action accepting no
-// argument to one that accepts (and ignores) arguments.
-template <typename InnerAction>
-internal::WithArgsAction<typename std::decay<InnerAction>::type>
-WithoutArgs(InnerAction&& action) {
-  return {std::forward<InnerAction>(action)};
-}
-
-// Creates an action that returns 'value'.  'value' is passed by value
-// instead of const reference - otherwise Return("string literal")
-// will trigger a compiler error about using array as initializer.
-template <typename R>
-internal::ReturnAction<R> Return(R value) {
-  return internal::ReturnAction<R>(std::move(value));
-}
-
-// Creates an action that returns NULL.
-inline PolymorphicAction<internal::ReturnNullAction> ReturnNull() {
-  return MakePolymorphicAction(internal::ReturnNullAction());
-}
-
-// Creates an action that returns from a void function.
-inline PolymorphicAction<internal::ReturnVoidAction> Return() {
-  return MakePolymorphicAction(internal::ReturnVoidAction());
-}
-
-// Creates an action that returns the reference to a variable.
-template <typename R>
-inline internal::ReturnRefAction<R> ReturnRef(R& x) {  // NOLINT
-  return internal::ReturnRefAction<R>(x);
-}
-
-// Creates an action that returns the reference to a copy of the
-// argument.  The copy is created when the action is constructed and
-// lives as long as the action.
-template <typename R>
-inline internal::ReturnRefOfCopyAction<R> ReturnRefOfCopy(const R& x) {
-  return internal::ReturnRefOfCopyAction<R>(x);
-}
-
-// Modifies the parent action (a Return() action) to perform a move of the
-// argument instead of a copy.
-// Return(ByMove()) actions can only be executed once and will assert this
-// invariant.
-template <typename R>
-internal::ByMoveWrapper<R> ByMove(R x) {
-  return internal::ByMoveWrapper<R>(std::move(x));
-}
-
-// Creates an action that does the default action for the give mock function.
-inline internal::DoDefaultAction DoDefault() {
-  return internal::DoDefaultAction();
-}
-
-// Creates an action that sets the variable pointed by the N-th
-// (0-based) function argument to 'value'.
-template <size_t N, typename T>
-internal::SetArgumentPointeeAction<N, T> SetArgPointee(T x) {
-  return {std::move(x)};
-}
-
-// The following version is DEPRECATED.
-template <size_t N, typename T>
-internal::SetArgumentPointeeAction<N, T> SetArgumentPointee(T x) {
-  return {std::move(x)};
-}
-
-// Creates an action that sets a pointer referent to a given value.
-template <typename T1, typename T2>
-PolymorphicAction<internal::AssignAction<T1, T2> > Assign(T1* ptr, T2 val) {
-  return MakePolymorphicAction(internal::AssignAction<T1, T2>(ptr, val));
-}
-
-#if !GTEST_OS_WINDOWS_MOBILE
-
-// Creates an action that sets errno and returns the appropriate error.
-template <typename T>
-PolymorphicAction<internal::SetErrnoAndReturnAction<T> >
-SetErrnoAndReturn(int errval, T result) {
-  return MakePolymorphicAction(
-      internal::SetErrnoAndReturnAction<T>(errval, result));
-}
-
-#endif  // !GTEST_OS_WINDOWS_MOBILE
-
-// Various overloads for Invoke().
-
-// Legacy function.
-// Actions can now be implicitly constructed from callables. No need to create
-// wrapper objects.
-// This function exists for backwards compatibility.
-template <typename FunctionImpl>
-typename std::decay<FunctionImpl>::type Invoke(FunctionImpl&& function_impl) {
-  return std::forward<FunctionImpl>(function_impl);
-}
-
-// Creates an action that invokes the given method on the given object
-// with the mock function's arguments.
-template <class Class, typename MethodPtr>
-internal::InvokeMethodAction<Class, MethodPtr> Invoke(Class* obj_ptr,
-                                                      MethodPtr method_ptr) {
-  return {obj_ptr, method_ptr};
-}
-
-// Creates an action that invokes 'function_impl' with no argument.
-template <typename FunctionImpl>
-internal::InvokeWithoutArgsAction<typename std::decay<FunctionImpl>::type>
-InvokeWithoutArgs(FunctionImpl function_impl) {
-  return {std::move(function_impl)};
-}
-
-// Creates an action that invokes the given method on the given object
-// with no argument.
-template <class Class, typename MethodPtr>
-internal::InvokeMethodWithoutArgsAction<Class, MethodPtr> InvokeWithoutArgs(
-    Class* obj_ptr, MethodPtr method_ptr) {
-  return {obj_ptr, method_ptr};
-}
-
-// Creates an action that performs an_action and throws away its
-// result.  In other words, it changes the return type of an_action to
-// void.  an_action MUST NOT return void, or the code won't compile.
-template <typename A>
-inline internal::IgnoreResultAction<A> IgnoreResult(const A& an_action) {
-  return internal::IgnoreResultAction<A>(an_action);
-}
-
-// Creates a reference wrapper for the given L-value.  If necessary,
-// you can explicitly specify the type of the reference.  For example,
-// suppose 'derived' is an object of type Derived, ByRef(derived)
-// would wrap a Derived&.  If you want to wrap a const Base& instead,
-// where Base is a base class of Derived, just write:
-//
-//   ByRef<const Base>(derived)
-//
-// N.B. ByRef is redundant with std::ref, std::cref and std::reference_wrapper.
-// However, it may still be used for consistency with ByMove().
-template <typename T>
-inline ::std::reference_wrapper<T> ByRef(T& l_value) {  // NOLINT
-  return ::std::reference_wrapper<T>(l_value);
-}
-
-}  // namespace testing
-
-#ifdef _MSC_VER
-# pragma warning(pop)
-#endif
-
-
-#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_ACTIONS_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-cardinalities.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-cardinalities.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-cardinalities.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-cardinalities.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,157 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file implements some commonly used cardinalities.  More
-// cardinalities can be defined by the user implementing the
-// CardinalityInterface interface if necessary.
-
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_
-#define GMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_
-
-#include <limits.h>
-#include <memory>
-#include <ostream>  // NOLINT
-#include "gmock/internal/gmock-port.h"
-#include "gtest/gtest.h"
-
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
-/* class A needs to have dll-interface to be used by clients of class B */)
-
-namespace testing {
-
-// To implement a cardinality Foo, define:
-//   1. a class FooCardinality that implements the
-//      CardinalityInterface interface, and
-//   2. a factory function that creates a Cardinality object from a
-//      const FooCardinality*.
-//
-// The two-level delegation design follows that of Matcher, providing
-// consistency for extension developers.  It also eases ownership
-// management as Cardinality objects can now be copied like plain values.
-
-// The implementation of a cardinality.
-class CardinalityInterface {
- public:
-  virtual ~CardinalityInterface() {}
-
-  // Conservative estimate on the lower/upper bound of the number of
-  // calls allowed.
-  virtual int ConservativeLowerBound() const { return 0; }
-  virtual int ConservativeUpperBound() const { return INT_MAX; }
-
-  // Returns true if and only if call_count calls will satisfy this
-  // cardinality.
-  virtual bool IsSatisfiedByCallCount(int call_count) const = 0;
-
-  // Returns true if and only if call_count calls will saturate this
-  // cardinality.
-  virtual bool IsSaturatedByCallCount(int call_count) const = 0;
-
-  // Describes self to an ostream.
-  virtual void DescribeTo(::std::ostream* os) const = 0;
-};
-
-// A Cardinality is a copyable and IMMUTABLE (except by assignment)
-// object that specifies how many times a mock function is expected to
-// be called.  The implementation of Cardinality is just a std::shared_ptr
-// to const CardinalityInterface. Don't inherit from Cardinality!
-class GTEST_API_ Cardinality {
- public:
-  // Constructs a null cardinality.  Needed for storing Cardinality
-  // objects in STL containers.
-  Cardinality() {}
-
-  // Constructs a Cardinality from its implementation.
-  explicit Cardinality(const CardinalityInterface* impl) : impl_(impl) {}
-
-  // Conservative estimate on the lower/upper bound of the number of
-  // calls allowed.
-  int ConservativeLowerBound() const { return impl_->ConservativeLowerBound(); }
-  int ConservativeUpperBound() const { return impl_->ConservativeUpperBound(); }
-
-  // Returns true if and only if call_count calls will satisfy this
-  // cardinality.
-  bool IsSatisfiedByCallCount(int call_count) const {
-    return impl_->IsSatisfiedByCallCount(call_count);
-  }
-
-  // Returns true if and only if call_count calls will saturate this
-  // cardinality.
-  bool IsSaturatedByCallCount(int call_count) const {
-    return impl_->IsSaturatedByCallCount(call_count);
-  }
-
-  // Returns true if and only if call_count calls will over-saturate this
-  // cardinality, i.e. exceed the maximum number of allowed calls.
-  bool IsOverSaturatedByCallCount(int call_count) const {
-    return impl_->IsSaturatedByCallCount(call_count) &&
-        !impl_->IsSatisfiedByCallCount(call_count);
-  }
-
-  // Describes self to an ostream
-  void DescribeTo(::std::ostream* os) const { impl_->DescribeTo(os); }
-
-  // Describes the given actual call count to an ostream.
-  static void DescribeActualCallCountTo(int actual_call_count,
-                                        ::std::ostream* os);
-
- private:
-  std::shared_ptr<const CardinalityInterface> impl_;
-};
-
-// Creates a cardinality that allows at least n calls.
-GTEST_API_ Cardinality AtLeast(int n);
-
-// Creates a cardinality that allows at most n calls.
-GTEST_API_ Cardinality AtMost(int n);
-
-// Creates a cardinality that allows any number of calls.
-GTEST_API_ Cardinality AnyNumber();
-
-// Creates a cardinality that allows between min and max calls.
-GTEST_API_ Cardinality Between(int min, int max);
-
-// Creates a cardinality that allows exactly n calls.
-GTEST_API_ Cardinality Exactly(int n);
-
-// Creates a cardinality from its implementation.
-inline Cardinality MakeCardinality(const CardinalityInterface* c) {
-  return Cardinality(c);
-}
-
-}  // namespace testing
-
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
-
-#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-function-mocker.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-function-mocker.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-function-mocker.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-function-mocker.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,253 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file implements MOCK_METHOD.
-
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-#ifndef THIRD_PARTY_GOOGLETEST_GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_FUNCTION_MOCKER_H_  // NOLINT
-#define THIRD_PARTY_GOOGLETEST_GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_FUNCTION_MOCKER_H_  // NOLINT
-
-#include "gmock/gmock-generated-function-mockers.h"  // NOLINT
-#include "gmock/internal/gmock-pp.h"
-
-#define MOCK_METHOD(...) \
-  GMOCK_PP_VARIADIC_CALL(GMOCK_INTERNAL_MOCK_METHOD_ARG_, __VA_ARGS__)
-
-#define GMOCK_INTERNAL_MOCK_METHOD_ARG_1(...) \
-  GMOCK_INTERNAL_WRONG_ARITY(__VA_ARGS__)
-
-#define GMOCK_INTERNAL_MOCK_METHOD_ARG_2(...) \
-  GMOCK_INTERNAL_WRONG_ARITY(__VA_ARGS__)
-
-#define GMOCK_INTERNAL_MOCK_METHOD_ARG_3(_Ret, _MethodName, _Args) \
-  GMOCK_INTERNAL_MOCK_METHOD_ARG_4(_Ret, _MethodName, _Args, ())
-
-#define GMOCK_INTERNAL_MOCK_METHOD_ARG_4(_Ret, _MethodName, _Args, _Spec)     \
-  GMOCK_INTERNAL_ASSERT_PARENTHESIS(_Args);                                   \
-  GMOCK_INTERNAL_ASSERT_PARENTHESIS(_Spec);                                   \
-  GMOCK_INTERNAL_ASSERT_VALID_SIGNATURE(                                      \
-      GMOCK_PP_NARG0 _Args, GMOCK_INTERNAL_SIGNATURE(_Ret, _Args));           \
-  GMOCK_INTERNAL_ASSERT_VALID_SPEC(_Spec)                                     \
-  GMOCK_INTERNAL_MOCK_METHOD_IMPL(                                            \
-      GMOCK_PP_NARG0 _Args, _MethodName, GMOCK_INTERNAL_HAS_CONST(_Spec),     \
-      GMOCK_INTERNAL_HAS_OVERRIDE(_Spec), GMOCK_INTERNAL_HAS_FINAL(_Spec),    \
-      GMOCK_INTERNAL_HAS_NOEXCEPT(_Spec), GMOCK_INTERNAL_GET_CALLTYPE(_Spec), \
-      (GMOCK_INTERNAL_SIGNATURE(_Ret, _Args)))
-
-#define GMOCK_INTERNAL_MOCK_METHOD_ARG_5(...) \
-  GMOCK_INTERNAL_WRONG_ARITY(__VA_ARGS__)
-
-#define GMOCK_INTERNAL_MOCK_METHOD_ARG_6(...) \
-  GMOCK_INTERNAL_WRONG_ARITY(__VA_ARGS__)
-
-#define GMOCK_INTERNAL_MOCK_METHOD_ARG_7(...) \
-  GMOCK_INTERNAL_WRONG_ARITY(__VA_ARGS__)
-
-#define GMOCK_INTERNAL_WRONG_ARITY(...)                                      \
-  static_assert(                                                             \
-      false,                                                                 \
-      "MOCK_METHOD must be called with 3 or 4 arguments. _Ret, "             \
-      "_MethodName, _Args and optionally _Spec. _Args and _Spec must be "    \
-      "enclosed in parentheses. If _Ret is a type with unprotected commas, " \
-      "it must also be enclosed in parentheses.")
-
-#define GMOCK_INTERNAL_ASSERT_PARENTHESIS(_Tuple) \
-  static_assert(                                  \
-      GMOCK_PP_IS_ENCLOSED_PARENS(_Tuple),        \
-      GMOCK_PP_STRINGIZE(_Tuple) " should be enclosed in parentheses.")
-
-#define GMOCK_INTERNAL_ASSERT_VALID_SIGNATURE(_N, ...)                 \
-  static_assert(                                                       \
-      std::is_function<__VA_ARGS__>::value,                            \
-      "Signature must be a function type, maybe return type contains " \
-      "unprotected comma.");                                           \
-  static_assert(                                                       \
-      ::testing::tuple_size<typename ::testing::internal::Function<    \
-              __VA_ARGS__>::ArgumentTuple>::value == _N,               \
-      "This method does not take " GMOCK_PP_STRINGIZE(                 \
-          _N) " arguments. Parenthesize all types with unproctected commas.")
-
-#define GMOCK_INTERNAL_ASSERT_VALID_SPEC(_Spec) \
-  GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_ASSERT_VALID_SPEC_ELEMENT, ~, _Spec)
-
-#define GMOCK_INTERNAL_MOCK_METHOD_IMPL(_N, _MethodName, _Constness,           \
-                                        _Override, _Final, _Noexcept,          \
-                                        _CallType, _Signature)                 \
-  typename ::testing::internal::Function<GMOCK_PP_REMOVE_PARENS(               \
-      _Signature)>::Result                                                     \
-  GMOCK_INTERNAL_EXPAND(_CallType)                                             \
-      _MethodName(GMOCK_PP_REPEAT(GMOCK_INTERNAL_PARAMETER, _Signature, _N))   \
-          GMOCK_PP_IF(_Constness, const, ) GMOCK_PP_IF(_Noexcept, noexcept, )  \
-              GMOCK_PP_IF(_Override, override, )                               \
-                  GMOCK_PP_IF(_Final, final, ) {                               \
-    GMOCK_MOCKER_(_N, _Constness, _MethodName)                                 \
-        .SetOwnerAndName(this, #_MethodName);                                  \
-    return GMOCK_MOCKER_(_N, _Constness, _MethodName)                          \
-        .Invoke(GMOCK_PP_REPEAT(GMOCK_INTERNAL_FORWARD_ARG, _Signature, _N));  \
-  }                                                                            \
-  ::testing::MockSpec<GMOCK_PP_REMOVE_PARENS(_Signature)> gmock_##_MethodName( \
-      GMOCK_PP_REPEAT(GMOCK_INTERNAL_MATCHER_PARAMETER, _Signature, _N))       \
-      GMOCK_PP_IF(_Constness, const, ) {                                       \
-    GMOCK_MOCKER_(_N, _Constness, _MethodName).RegisterOwner(this);            \
-    return GMOCK_MOCKER_(_N, _Constness, _MethodName)                          \
-        .With(GMOCK_PP_REPEAT(GMOCK_INTERNAL_MATCHER_ARGUMENT, , _N));         \
-  }                                                                            \
-  ::testing::MockSpec<GMOCK_PP_REMOVE_PARENS(_Signature)> gmock_##_MethodName( \
-      const ::testing::internal::WithoutMatchers&,                             \
-      GMOCK_PP_IF(_Constness, const, )::testing::internal::Function<           \
-          GMOCK_PP_REMOVE_PARENS(_Signature)>*)                                \
-      const GMOCK_PP_IF(_Noexcept, noexcept, ) {                               \
-    return GMOCK_PP_CAT(::testing::internal::AdjustConstness_,                 \
-                        GMOCK_PP_IF(_Constness, const, ))(this)                \
-        ->gmock_##_MethodName(GMOCK_PP_REPEAT(                                 \
-            GMOCK_INTERNAL_A_MATCHER_ARGUMENT, _Signature, _N));               \
-  }                                                                            \
-  mutable ::testing::FunctionMocker<GMOCK_PP_REMOVE_PARENS(_Signature)>        \
-      GMOCK_MOCKER_(_N, _Constness, _MethodName)
-
-#define GMOCK_INTERNAL_EXPAND(...) __VA_ARGS__
-
-// Five Valid modifiers.
-#define GMOCK_INTERNAL_HAS_CONST(_Tuple) \
-  GMOCK_PP_HAS_COMMA(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_DETECT_CONST, ~, _Tuple))
-
-#define GMOCK_INTERNAL_HAS_OVERRIDE(_Tuple) \
-  GMOCK_PP_HAS_COMMA(                       \
-      GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_DETECT_OVERRIDE, ~, _Tuple))
-
-#define GMOCK_INTERNAL_HAS_FINAL(_Tuple) \
-  GMOCK_PP_HAS_COMMA(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_DETECT_FINAL, ~, _Tuple))
-
-#define GMOCK_INTERNAL_HAS_NOEXCEPT(_Tuple) \
-  GMOCK_PP_HAS_COMMA(                       \
-      GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_DETECT_NOEXCEPT, ~, _Tuple))
-
-#define GMOCK_INTERNAL_GET_CALLTYPE(_Tuple) \
-  GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_GET_CALLTYPE_IMPL, ~, _Tuple)
-
-#define GMOCK_INTERNAL_ASSERT_VALID_SPEC_ELEMENT(_i, _, _elem)            \
-  static_assert(                                                          \
-      (GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_CONST(_i, _, _elem)) +    \
-       GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_OVERRIDE(_i, _, _elem)) + \
-       GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_FINAL(_i, _, _elem)) +    \
-       GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_NOEXCEPT(_i, _, _elem)) + \
-       GMOCK_INTERNAL_IS_CALLTYPE(_elem)) == 1,                           \
-      GMOCK_PP_STRINGIZE(                                                 \
-          _elem) " cannot be recognized as a valid specification modifier.");
-
-// Modifiers implementation.
-#define GMOCK_INTERNAL_DETECT_CONST(_i, _, _elem) \
-  GMOCK_PP_CAT(GMOCK_INTERNAL_DETECT_CONST_I_, _elem)
-
-#define GMOCK_INTERNAL_DETECT_CONST_I_const ,
-
-#define GMOCK_INTERNAL_DETECT_OVERRIDE(_i, _, _elem) \
-  GMOCK_PP_CAT(GMOCK_INTERNAL_DETECT_OVERRIDE_I_, _elem)
-
-#define GMOCK_INTERNAL_DETECT_OVERRIDE_I_override ,
-
-#define GMOCK_INTERNAL_DETECT_FINAL(_i, _, _elem) \
-  GMOCK_PP_CAT(GMOCK_INTERNAL_DETECT_FINAL_I_, _elem)
-
-#define GMOCK_INTERNAL_DETECT_FINAL_I_final ,
-
-// TODO(iserna): Maybe noexcept should accept an argument here as well.
-#define GMOCK_INTERNAL_DETECT_NOEXCEPT(_i, _, _elem) \
-  GMOCK_PP_CAT(GMOCK_INTERNAL_DETECT_NOEXCEPT_I_, _elem)
-
-#define GMOCK_INTERNAL_DETECT_NOEXCEPT_I_noexcept ,
-
-#define GMOCK_INTERNAL_GET_CALLTYPE_IMPL(_i, _, _elem)           \
-  GMOCK_PP_IF(GMOCK_INTERNAL_IS_CALLTYPE(_elem),                 \
-              GMOCK_INTERNAL_GET_VALUE_CALLTYPE, GMOCK_PP_EMPTY) \
-  (_elem)
-
-// TODO(iserna): GMOCK_INTERNAL_IS_CALLTYPE and
-// GMOCK_INTERNAL_GET_VALUE_CALLTYPE needed more expansions to work on windows
-// maybe they can be simplified somehow.
-#define GMOCK_INTERNAL_IS_CALLTYPE(_arg) \
-  GMOCK_INTERNAL_IS_CALLTYPE_I(          \
-      GMOCK_PP_CAT(GMOCK_INTERNAL_IS_CALLTYPE_HELPER_, _arg))
-#define GMOCK_INTERNAL_IS_CALLTYPE_I(_arg) GMOCK_PP_IS_ENCLOSED_PARENS(_arg)
-
-#define GMOCK_INTERNAL_GET_VALUE_CALLTYPE(_arg) \
-  GMOCK_INTERNAL_GET_VALUE_CALLTYPE_I(          \
-      GMOCK_PP_CAT(GMOCK_INTERNAL_IS_CALLTYPE_HELPER_, _arg))
-#define GMOCK_INTERNAL_GET_VALUE_CALLTYPE_I(_arg) \
-  GMOCK_PP_CAT(GMOCK_PP_IDENTITY, _arg)
-
-#define GMOCK_INTERNAL_IS_CALLTYPE_HELPER_Calltype
-
-#define GMOCK_INTERNAL_SIGNATURE(_Ret, _Args)                         \
-  GMOCK_PP_IF(GMOCK_PP_IS_BEGIN_PARENS(_Ret), GMOCK_PP_REMOVE_PARENS, \
-              GMOCK_PP_IDENTITY)                                      \
-  (_Ret)(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_GET_TYPE, _, _Args))
-
-#define GMOCK_INTERNAL_GET_TYPE(_i, _, _elem)                          \
-  GMOCK_PP_COMMA_IF(_i)                                                \
-  GMOCK_PP_IF(GMOCK_PP_IS_BEGIN_PARENS(_elem), GMOCK_PP_REMOVE_PARENS, \
-              GMOCK_PP_IDENTITY)                                       \
-  (_elem)
-
-#define GMOCK_INTERNAL_PARAMETER(_i, _Signature, _)        \
-  GMOCK_PP_COMMA_IF(_i)                                    \
-  GMOCK_INTERNAL_ARG_O(typename, GMOCK_PP_INC(_i),         \
-                       GMOCK_PP_REMOVE_PARENS(_Signature)) \
-  gmock_a##_i
-
-#define GMOCK_INTERNAL_FORWARD_ARG(_i, _Signature, _)                       \
-  GMOCK_PP_COMMA_IF(_i)                                                     \
-  ::std::forward<GMOCK_INTERNAL_ARG_O(typename, GMOCK_PP_INC(_i),           \
-                                      GMOCK_PP_REMOVE_PARENS(_Signature))>( \
-      gmock_a##_i)
-
-#define GMOCK_INTERNAL_MATCHER_PARAMETER(_i, _Signature, _)    \
-  GMOCK_PP_COMMA_IF(_i)                                        \
-  GMOCK_INTERNAL_MATCHER_O(typename, GMOCK_PP_INC(_i),         \
-                           GMOCK_PP_REMOVE_PARENS(_Signature)) \
-  gmock_a##_i
-
-#define GMOCK_INTERNAL_MATCHER_ARGUMENT(_i, _1, _2) \
-  GMOCK_PP_COMMA_IF(_i)                             \
-  gmock_a##_i
-
-#define GMOCK_INTERNAL_A_MATCHER_ARGUMENT(_i, _Signature, _)    \
-  GMOCK_PP_COMMA_IF(_i)                                         \
-  ::testing::A<GMOCK_INTERNAL_ARG_O(typename, GMOCK_PP_INC(_i), \
-                                    GMOCK_PP_REMOVE_PARENS(_Signature))>()
-
-#define GMOCK_INTERNAL_ARG_O(_tn, _i, ...) GMOCK_ARG_(_tn, _i, __VA_ARGS__)
-
-#define GMOCK_INTERNAL_MATCHER_O(_tn, _i, ...) \
-  GMOCK_MATCHER_(_tn, _i, __VA_ARGS__)
-
-#endif  // THIRD_PARTY_GOOGLETEST_GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_FUNCTION_MOCKER_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-generated-actions.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-generated-actions.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-generated-actions.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-generated-actions.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,1884 +0,0 @@
-// This file was GENERATED by command:
-//     pump.py gmock-generated-actions.h.pump
-// DO NOT EDIT BY HAND!!!
-
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file implements some commonly used variadic actions.
-
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_
-#define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_
-
-#include <memory>
-#include <utility>
-
-#include "gmock/gmock-actions.h"
-#include "gmock/internal/gmock-port.h"
-
-namespace testing {
-namespace internal {
-
-// A macro from the ACTION* family (defined later in this file)
-// defines an action that can be used in a mock function.  Typically,
-// these actions only care about a subset of the arguments of the mock
-// function.  For example, if such an action only uses the second
-// argument, it can be used in any mock function that takes >= 2
-// arguments where the type of the second argument is compatible.
-//
-// Therefore, the action implementation must be prepared to take more
-// arguments than it needs.  The ExcessiveArg type is used to
-// represent those excessive arguments.  In order to keep the compiler
-// error messages tractable, we define it in the testing namespace
-// instead of testing::internal.  However, this is an INTERNAL TYPE
-// and subject to change without notice, so a user MUST NOT USE THIS
-// TYPE DIRECTLY.
-struct ExcessiveArg {};
-
-// A helper class needed for implementing the ACTION* macros.
-template <typename Result, class Impl>
-class ActionHelper {
- public:
-  static Result Perform(Impl* impl, const ::std::tuple<>& args) {
-    return impl->template gmock_PerformImpl<>(args, ExcessiveArg(),
-        ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), ExcessiveArg(),
-        ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), ExcessiveArg(),
-        ExcessiveArg());
-  }
-
-  template <typename A0>
-  static Result Perform(Impl* impl, const ::std::tuple<A0>& args) {
-    return impl->template gmock_PerformImpl<A0>(args, std::get<0>(args),
-        ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), ExcessiveArg(),
-        ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), ExcessiveArg(),
-        ExcessiveArg());
-  }
-
-  template <typename A0, typename A1>
-  static Result Perform(Impl* impl, const ::std::tuple<A0, A1>& args) {
-    return impl->template gmock_PerformImpl<A0, A1>(args, std::get<0>(args),
-        std::get<1>(args), ExcessiveArg(), ExcessiveArg(), ExcessiveArg(),
-        ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), ExcessiveArg(),
-        ExcessiveArg());
-  }
-
-  template <typename A0, typename A1, typename A2>
-  static Result Perform(Impl* impl, const ::std::tuple<A0, A1, A2>& args) {
-    return impl->template gmock_PerformImpl<A0, A1, A2>(args,
-        std::get<0>(args), std::get<1>(args), std::get<2>(args),
-        ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), ExcessiveArg(),
-        ExcessiveArg(), ExcessiveArg(), ExcessiveArg());
-  }
-
-  template <typename A0, typename A1, typename A2, typename A3>
-  static Result Perform(Impl* impl, const ::std::tuple<A0, A1, A2, A3>& args) {
-    return impl->template gmock_PerformImpl<A0, A1, A2, A3>(args,
-        std::get<0>(args), std::get<1>(args), std::get<2>(args),
-        std::get<3>(args), ExcessiveArg(), ExcessiveArg(), ExcessiveArg(),
-        ExcessiveArg(), ExcessiveArg(), ExcessiveArg());
-  }
-
-  template <typename A0, typename A1, typename A2, typename A3, typename A4>
-  static Result Perform(Impl* impl, const ::std::tuple<A0, A1, A2, A3,
-      A4>& args) {
-    return impl->template gmock_PerformImpl<A0, A1, A2, A3, A4>(args,
-        std::get<0>(args), std::get<1>(args), std::get<2>(args),
-        std::get<3>(args), std::get<4>(args), ExcessiveArg(), ExcessiveArg(),
-        ExcessiveArg(), ExcessiveArg(), ExcessiveArg());
-  }
-
-  template <typename A0, typename A1, typename A2, typename A3, typename A4,
-      typename A5>
-  static Result Perform(Impl* impl, const ::std::tuple<A0, A1, A2, A3, A4,
-      A5>& args) {
-    return impl->template gmock_PerformImpl<A0, A1, A2, A3, A4, A5>(args,
-        std::get<0>(args), std::get<1>(args), std::get<2>(args),
-        std::get<3>(args), std::get<4>(args), std::get<5>(args),
-        ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), ExcessiveArg());
-  }
-
-  template <typename A0, typename A1, typename A2, typename A3, typename A4,
-      typename A5, typename A6>
-  static Result Perform(Impl* impl, const ::std::tuple<A0, A1, A2, A3, A4, A5,
-      A6>& args) {
-    return impl->template gmock_PerformImpl<A0, A1, A2, A3, A4, A5, A6>(args,
-        std::get<0>(args), std::get<1>(args), std::get<2>(args),
-        std::get<3>(args), std::get<4>(args), std::get<5>(args),
-        std::get<6>(args), ExcessiveArg(), ExcessiveArg(), ExcessiveArg());
-  }
-
-  template <typename A0, typename A1, typename A2, typename A3, typename A4,
-      typename A5, typename A6, typename A7>
-  static Result Perform(Impl* impl, const ::std::tuple<A0, A1, A2, A3, A4, A5,
-      A6, A7>& args) {
-    return impl->template gmock_PerformImpl<A0, A1, A2, A3, A4, A5, A6,
-        A7>(args, std::get<0>(args), std::get<1>(args), std::get<2>(args),
-        std::get<3>(args), std::get<4>(args), std::get<5>(args),
-        std::get<6>(args), std::get<7>(args), ExcessiveArg(), ExcessiveArg());
-  }
-
-  template <typename A0, typename A1, typename A2, typename A3, typename A4,
-      typename A5, typename A6, typename A7, typename A8>
-  static Result Perform(Impl* impl, const ::std::tuple<A0, A1, A2, A3, A4, A5,
-      A6, A7, A8>& args) {
-    return impl->template gmock_PerformImpl<A0, A1, A2, A3, A4, A5, A6, A7,
-        A8>(args, std::get<0>(args), std::get<1>(args), std::get<2>(args),
-        std::get<3>(args), std::get<4>(args), std::get<5>(args),
-        std::get<6>(args), std::get<7>(args), std::get<8>(args),
-        ExcessiveArg());
-  }
-
-  template <typename A0, typename A1, typename A2, typename A3, typename A4,
-      typename A5, typename A6, typename A7, typename A8, typename A9>
-  static Result Perform(Impl* impl, const ::std::tuple<A0, A1, A2, A3, A4, A5,
-      A6, A7, A8, A9>& args) {
-    return impl->template gmock_PerformImpl<A0, A1, A2, A3, A4, A5, A6, A7, A8,
-        A9>(args, std::get<0>(args), std::get<1>(args), std::get<2>(args),
-        std::get<3>(args), std::get<4>(args), std::get<5>(args),
-        std::get<6>(args), std::get<7>(args), std::get<8>(args),
-        std::get<9>(args));
-  }
-};
-
-}  // namespace internal
-}  // namespace testing
-
-// The ACTION* family of macros can be used in a namespace scope to
-// define custom actions easily.  The syntax:
-//
-//   ACTION(name) { statements; }
-//
-// will define an action with the given name that executes the
-// statements.  The value returned by the statements will be used as
-// the return value of the action.  Inside the statements, you can
-// refer to the K-th (0-based) argument of the mock function by
-// 'argK', and refer to its type by 'argK_type'.  For example:
-//
-//   ACTION(IncrementArg1) {
-//     arg1_type temp = arg1;
-//     return ++(*temp);
-//   }
-//
-// allows you to write
-//
-//   ...WillOnce(IncrementArg1());
-//
-// You can also refer to the entire argument tuple and its type by
-// 'args' and 'args_type', and refer to the mock function type and its
-// return type by 'function_type' and 'return_type'.
-//
-// Note that you don't need to specify the types of the mock function
-// arguments.  However rest assured that your code is still type-safe:
-// you'll get a compiler error if *arg1 doesn't support the ++
-// operator, or if the type of ++(*arg1) isn't compatible with the
-// mock function's return type, for example.
-//
-// Sometimes you'll want to parameterize the action.   For that you can use
-// another macro:
-//
-//   ACTION_P(name, param_name) { statements; }
-//
-// For example:
-//
-//   ACTION_P(Add, n) { return arg0 + n; }
-//
-// will allow you to write:
-//
-//   ...WillOnce(Add(5));
-//
-// Note that you don't need to provide the type of the parameter
-// either.  If you need to reference the type of a parameter named
-// 'foo', you can write 'foo_type'.  For example, in the body of
-// ACTION_P(Add, n) above, you can write 'n_type' to refer to the type
-// of 'n'.
-//
-// We also provide ACTION_P2, ACTION_P3, ..., up to ACTION_P10 to support
-// multi-parameter actions.
-//
-// For the purpose of typing, you can view
-//
-//   ACTION_Pk(Foo, p1, ..., pk) { ... }
-//
-// as shorthand for
-//
-//   template <typename p1_type, ..., typename pk_type>
-//   FooActionPk<p1_type, ..., pk_type> Foo(p1_type p1, ..., pk_type pk) { ... }
-//
-// In particular, you can provide the template type arguments
-// explicitly when invoking Foo(), as in Foo<long, bool>(5, false);
-// although usually you can rely on the compiler to infer the types
-// for you automatically.  You can assign the result of expression
-// Foo(p1, ..., pk) to a variable of type FooActionPk<p1_type, ...,
-// pk_type>.  This can be useful when composing actions.
-//
-// You can also overload actions with different numbers of parameters:
-//
-//   ACTION_P(Plus, a) { ... }
-//   ACTION_P2(Plus, a, b) { ... }
-//
-// While it's tempting to always use the ACTION* macros when defining
-// a new action, you should also consider implementing ActionInterface
-// or using MakePolymorphicAction() instead, especially if you need to
-// use the action a lot.  While these approaches require more work,
-// they give you more control on the types of the mock function
-// arguments and the action parameters, which in general leads to
-// better compiler error messages that pay off in the long run.  They
-// also allow overloading actions based on parameter types (as opposed
-// to just based on the number of parameters).
-//
-// CAVEAT:
-//
-// ACTION*() can only be used in a namespace scope as templates cannot be
-// declared inside of a local class.
-// Users can, however, define any local functors (e.g. a lambda) that
-// can be used as actions.
-//
-// MORE INFORMATION:
-//
-// To learn more about using these macros, please search for 'ACTION' on
-// https://github.com/google/googletest/blob/master/googlemock/docs/cook_book.md
-
-// An internal macro needed for implementing ACTION*().
-#define GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_\
-    const args_type& args GTEST_ATTRIBUTE_UNUSED_, \
-    const arg0_type& arg0 GTEST_ATTRIBUTE_UNUSED_, \
-    const arg1_type& arg1 GTEST_ATTRIBUTE_UNUSED_, \
-    const arg2_type& arg2 GTEST_ATTRIBUTE_UNUSED_, \
-    const arg3_type& arg3 GTEST_ATTRIBUTE_UNUSED_, \
-    const arg4_type& arg4 GTEST_ATTRIBUTE_UNUSED_, \
-    const arg5_type& arg5 GTEST_ATTRIBUTE_UNUSED_, \
-    const arg6_type& arg6 GTEST_ATTRIBUTE_UNUSED_, \
-    const arg7_type& arg7 GTEST_ATTRIBUTE_UNUSED_, \
-    const arg8_type& arg8 GTEST_ATTRIBUTE_UNUSED_, \
-    const arg9_type& arg9 GTEST_ATTRIBUTE_UNUSED_
-
-// Sometimes you want to give an action explicit template parameters
-// that cannot be inferred from its value parameters.  ACTION() and
-// ACTION_P*() don't support that.  ACTION_TEMPLATE() remedies that
-// and can be viewed as an extension to ACTION() and ACTION_P*().
-//
-// The syntax:
-//
-//   ACTION_TEMPLATE(ActionName,
-//                   HAS_m_TEMPLATE_PARAMS(kind1, name1, ..., kind_m, name_m),
-//                   AND_n_VALUE_PARAMS(p1, ..., p_n)) { statements; }
-//
-// defines an action template that takes m explicit template
-// parameters and n value parameters.  name_i is the name of the i-th
-// template parameter, and kind_i specifies whether it's a typename,
-// an integral constant, or a template.  p_i is the name of the i-th
-// value parameter.
-//
-// Example:
-//
-//   // DuplicateArg<k, T>(output) converts the k-th argument of the mock
-//   // function to type T and copies it to *output.
-//   ACTION_TEMPLATE(DuplicateArg,
-//                   HAS_2_TEMPLATE_PARAMS(int, k, typename, T),
-//                   AND_1_VALUE_PARAMS(output)) {
-//     *output = T(::std::get<k>(args));
-//   }
-//   ...
-//     int n;
-//     EXPECT_CALL(mock, Foo(_, _))
-//         .WillOnce(DuplicateArg<1, unsigned char>(&n));
-//
-// To create an instance of an action template, write:
-//
-//   ActionName<t1, ..., t_m>(v1, ..., v_n)
-//
-// where the ts are the template arguments and the vs are the value
-// arguments.  The value argument types are inferred by the compiler.
-// If you want to explicitly specify the value argument types, you can
-// provide additional template arguments:
-//
-//   ActionName<t1, ..., t_m, u1, ..., u_k>(v1, ..., v_n)
-//
-// where u_i is the desired type of v_i.
-//
-// ACTION_TEMPLATE and ACTION/ACTION_P* can be overloaded on the
-// number of value parameters, but not on the number of template
-// parameters.  Without the restriction, the meaning of the following
-// is unclear:
-//
-//   OverloadedAction<int, bool>(x);
-//
-// Are we using a single-template-parameter action where 'bool' refers
-// to the type of x, or are we using a two-template-parameter action
-// where the compiler is asked to infer the type of x?
-//
-// Implementation notes:
-//
-// GMOCK_INTERNAL_*_HAS_m_TEMPLATE_PARAMS and
-// GMOCK_INTERNAL_*_AND_n_VALUE_PARAMS are internal macros for
-// implementing ACTION_TEMPLATE.  The main trick we use is to create
-// new macro invocations when expanding a macro.  For example, we have
-//
-//   #define ACTION_TEMPLATE(name, template_params, value_params)
-//       ... GMOCK_INTERNAL_DECL_##template_params ...
-//
-// which causes ACTION_TEMPLATE(..., HAS_1_TEMPLATE_PARAMS(typename, T), ...)
-// to expand to
-//
-//       ... GMOCK_INTERNAL_DECL_HAS_1_TEMPLATE_PARAMS(typename, T) ...
-//
-// Since GMOCK_INTERNAL_DECL_HAS_1_TEMPLATE_PARAMS is a macro, the
-// preprocessor will continue to expand it to
-//
-//       ... typename T ...
-//
-// This technique conforms to the C++ standard and is portable.  It
-// allows us to implement action templates using O(N) code, where N is
-// the maximum number of template/value parameters supported.  Without
-// using it, we'd have to devote O(N^2) amount of code to implement all
-// combinations of m and n.
-
-// Declares the template parameters.
-#define GMOCK_INTERNAL_DECL_HAS_1_TEMPLATE_PARAMS(kind0, name0) kind0 name0
-#define GMOCK_INTERNAL_DECL_HAS_2_TEMPLATE_PARAMS(kind0, name0, kind1, \
-    name1) kind0 name0, kind1 name1
-#define GMOCK_INTERNAL_DECL_HAS_3_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2) kind0 name0, kind1 name1, kind2 name2
-#define GMOCK_INTERNAL_DECL_HAS_4_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3) kind0 name0, kind1 name1, kind2 name2, \
-    kind3 name3
-#define GMOCK_INTERNAL_DECL_HAS_5_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4) kind0 name0, kind1 name1, \
-    kind2 name2, kind3 name3, kind4 name4
-#define GMOCK_INTERNAL_DECL_HAS_6_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4, kind5, name5) kind0 name0, \
-    kind1 name1, kind2 name2, kind3 name3, kind4 name4, kind5 name5
-#define GMOCK_INTERNAL_DECL_HAS_7_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, \
-    name6) kind0 name0, kind1 name1, kind2 name2, kind3 name3, kind4 name4, \
-    kind5 name5, kind6 name6
-#define GMOCK_INTERNAL_DECL_HAS_8_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, name6, \
-    kind7, name7) kind0 name0, kind1 name1, kind2 name2, kind3 name3, \
-    kind4 name4, kind5 name5, kind6 name6, kind7 name7
-#define GMOCK_INTERNAL_DECL_HAS_9_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, name6, \
-    kind7, name7, kind8, name8) kind0 name0, kind1 name1, kind2 name2, \
-    kind3 name3, kind4 name4, kind5 name5, kind6 name6, kind7 name7, \
-    kind8 name8
-#define GMOCK_INTERNAL_DECL_HAS_10_TEMPLATE_PARAMS(kind0, name0, kind1, \
-    name1, kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, \
-    name6, kind7, name7, kind8, name8, kind9, name9) kind0 name0, \
-    kind1 name1, kind2 name2, kind3 name3, kind4 name4, kind5 name5, \
-    kind6 name6, kind7 name7, kind8 name8, kind9 name9
-
-// Lists the template parameters.
-#define GMOCK_INTERNAL_LIST_HAS_1_TEMPLATE_PARAMS(kind0, name0) name0
-#define GMOCK_INTERNAL_LIST_HAS_2_TEMPLATE_PARAMS(kind0, name0, kind1, \
-    name1) name0, name1
-#define GMOCK_INTERNAL_LIST_HAS_3_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2) name0, name1, name2
-#define GMOCK_INTERNAL_LIST_HAS_4_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3) name0, name1, name2, name3
-#define GMOCK_INTERNAL_LIST_HAS_5_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4) name0, name1, name2, name3, \
-    name4
-#define GMOCK_INTERNAL_LIST_HAS_6_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4, kind5, name5) name0, name1, \
-    name2, name3, name4, name5
-#define GMOCK_INTERNAL_LIST_HAS_7_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, \
-    name6) name0, name1, name2, name3, name4, name5, name6
-#define GMOCK_INTERNAL_LIST_HAS_8_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, name6, \
-    kind7, name7) name0, name1, name2, name3, name4, name5, name6, name7
-#define GMOCK_INTERNAL_LIST_HAS_9_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, name6, \
-    kind7, name7, kind8, name8) name0, name1, name2, name3, name4, name5, \
-    name6, name7, name8
-#define GMOCK_INTERNAL_LIST_HAS_10_TEMPLATE_PARAMS(kind0, name0, kind1, \
-    name1, kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, \
-    name6, kind7, name7, kind8, name8, kind9, name9) name0, name1, name2, \
-    name3, name4, name5, name6, name7, name8, name9
-
-// Declares the types of value parameters.
-#define GMOCK_INTERNAL_DECL_TYPE_AND_0_VALUE_PARAMS()
-#define GMOCK_INTERNAL_DECL_TYPE_AND_1_VALUE_PARAMS(p0) , typename p0##_type
-#define GMOCK_INTERNAL_DECL_TYPE_AND_2_VALUE_PARAMS(p0, p1) , \
-    typename p0##_type, typename p1##_type
-#define GMOCK_INTERNAL_DECL_TYPE_AND_3_VALUE_PARAMS(p0, p1, p2) , \
-    typename p0##_type, typename p1##_type, typename p2##_type
-#define GMOCK_INTERNAL_DECL_TYPE_AND_4_VALUE_PARAMS(p0, p1, p2, p3) , \
-    typename p0##_type, typename p1##_type, typename p2##_type, \
-    typename p3##_type
-#define GMOCK_INTERNAL_DECL_TYPE_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4) , \
-    typename p0##_type, typename p1##_type, typename p2##_type, \
-    typename p3##_type, typename p4##_type
-#define GMOCK_INTERNAL_DECL_TYPE_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5) , \
-    typename p0##_type, typename p1##_type, typename p2##_type, \
-    typename p3##_type, typename p4##_type, typename p5##_type
-#define GMOCK_INTERNAL_DECL_TYPE_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6) , typename p0##_type, typename p1##_type, typename p2##_type, \
-    typename p3##_type, typename p4##_type, typename p5##_type, \
-    typename p6##_type
-#define GMOCK_INTERNAL_DECL_TYPE_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6, p7) , typename p0##_type, typename p1##_type, typename p2##_type, \
-    typename p3##_type, typename p4##_type, typename p5##_type, \
-    typename p6##_type, typename p7##_type
-#define GMOCK_INTERNAL_DECL_TYPE_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6, p7, p8) , typename p0##_type, typename p1##_type, typename p2##_type, \
-    typename p3##_type, typename p4##_type, typename p5##_type, \
-    typename p6##_type, typename p7##_type, typename p8##_type
-#define GMOCK_INTERNAL_DECL_TYPE_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6, p7, p8, p9) , typename p0##_type, typename p1##_type, \
-    typename p2##_type, typename p3##_type, typename p4##_type, \
-    typename p5##_type, typename p6##_type, typename p7##_type, \
-    typename p8##_type, typename p9##_type
-
-// Initializes the value parameters.
-#define GMOCK_INTERNAL_INIT_AND_0_VALUE_PARAMS()\
-    ()
-#define GMOCK_INTERNAL_INIT_AND_1_VALUE_PARAMS(p0)\
-    (p0##_type gmock_p0) : p0(::std::move(gmock_p0))
-#define GMOCK_INTERNAL_INIT_AND_2_VALUE_PARAMS(p0, p1)\
-    (p0##_type gmock_p0, p1##_type gmock_p1) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1))
-#define GMOCK_INTERNAL_INIT_AND_3_VALUE_PARAMS(p0, p1, p2)\
-    (p0##_type gmock_p0, p1##_type gmock_p1, \
-        p2##_type gmock_p2) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2))
-#define GMOCK_INTERNAL_INIT_AND_4_VALUE_PARAMS(p0, p1, p2, p3)\
-    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-        p3##_type gmock_p3) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3))
-#define GMOCK_INTERNAL_INIT_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4)\
-    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-        p3##_type gmock_p3, p4##_type gmock_p4) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4))
-#define GMOCK_INTERNAL_INIT_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5)\
-    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-        p3##_type gmock_p3, p4##_type gmock_p4, \
-        p5##_type gmock_p5) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \
-        p5(::std::move(gmock_p5))
-#define GMOCK_INTERNAL_INIT_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6)\
-    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-        p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
-        p6##_type gmock_p6) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \
-        p5(::std::move(gmock_p5)), p6(::std::move(gmock_p6))
-#define GMOCK_INTERNAL_INIT_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7)\
-    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-        p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
-        p6##_type gmock_p6, p7##_type gmock_p7) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \
-        p5(::std::move(gmock_p5)), p6(::std::move(gmock_p6)), \
-        p7(::std::move(gmock_p7))
-#define GMOCK_INTERNAL_INIT_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8)\
-    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-        p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
-        p6##_type gmock_p6, p7##_type gmock_p7, \
-        p8##_type gmock_p8) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \
-        p5(::std::move(gmock_p5)), p6(::std::move(gmock_p6)), \
-        p7(::std::move(gmock_p7)), p8(::std::move(gmock_p8))
-#define GMOCK_INTERNAL_INIT_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8, p9)\
-    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-        p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
-        p6##_type gmock_p6, p7##_type gmock_p7, p8##_type gmock_p8, \
-        p9##_type gmock_p9) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \
-        p5(::std::move(gmock_p5)), p6(::std::move(gmock_p6)), \
-        p7(::std::move(gmock_p7)), p8(::std::move(gmock_p8)), \
-        p9(::std::move(gmock_p9))
-
-// Declares the fields for storing the value parameters.
-#define GMOCK_INTERNAL_DEFN_AND_0_VALUE_PARAMS()
-#define GMOCK_INTERNAL_DEFN_AND_1_VALUE_PARAMS(p0) p0##_type p0;
-#define GMOCK_INTERNAL_DEFN_AND_2_VALUE_PARAMS(p0, p1) p0##_type p0; \
-    p1##_type p1;
-#define GMOCK_INTERNAL_DEFN_AND_3_VALUE_PARAMS(p0, p1, p2) p0##_type p0; \
-    p1##_type p1; p2##_type p2;
-#define GMOCK_INTERNAL_DEFN_AND_4_VALUE_PARAMS(p0, p1, p2, p3) p0##_type p0; \
-    p1##_type p1; p2##_type p2; p3##_type p3;
-#define GMOCK_INTERNAL_DEFN_AND_5_VALUE_PARAMS(p0, p1, p2, p3, \
-    p4) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; p4##_type p4;
-#define GMOCK_INTERNAL_DEFN_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, \
-    p5) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; p4##_type p4; \
-    p5##_type p5;
-#define GMOCK_INTERNAL_DEFN_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; p4##_type p4; \
-    p5##_type p5; p6##_type p6;
-#define GMOCK_INTERNAL_DEFN_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; p4##_type p4; \
-    p5##_type p5; p6##_type p6; p7##_type p7;
-#define GMOCK_INTERNAL_DEFN_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; \
-    p4##_type p4; p5##_type p5; p6##_type p6; p7##_type p7; p8##_type p8;
-#define GMOCK_INTERNAL_DEFN_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8, p9) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; \
-    p4##_type p4; p5##_type p5; p6##_type p6; p7##_type p7; p8##_type p8; \
-    p9##_type p9;
-
-// Lists the value parameters.
-#define GMOCK_INTERNAL_LIST_AND_0_VALUE_PARAMS()
-#define GMOCK_INTERNAL_LIST_AND_1_VALUE_PARAMS(p0) p0
-#define GMOCK_INTERNAL_LIST_AND_2_VALUE_PARAMS(p0, p1) p0, p1
-#define GMOCK_INTERNAL_LIST_AND_3_VALUE_PARAMS(p0, p1, p2) p0, p1, p2
-#define GMOCK_INTERNAL_LIST_AND_4_VALUE_PARAMS(p0, p1, p2, p3) p0, p1, p2, p3
-#define GMOCK_INTERNAL_LIST_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4) p0, p1, \
-    p2, p3, p4
-#define GMOCK_INTERNAL_LIST_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5) p0, \
-    p1, p2, p3, p4, p5
-#define GMOCK_INTERNAL_LIST_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6) p0, p1, p2, p3, p4, p5, p6
-#define GMOCK_INTERNAL_LIST_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7) p0, p1, p2, p3, p4, p5, p6, p7
-#define GMOCK_INTERNAL_LIST_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8) p0, p1, p2, p3, p4, p5, p6, p7, p8
-#define GMOCK_INTERNAL_LIST_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8, p9) p0, p1, p2, p3, p4, p5, p6, p7, p8, p9
-
-// Lists the value parameter types.
-#define GMOCK_INTERNAL_LIST_TYPE_AND_0_VALUE_PARAMS()
-#define GMOCK_INTERNAL_LIST_TYPE_AND_1_VALUE_PARAMS(p0) , p0##_type
-#define GMOCK_INTERNAL_LIST_TYPE_AND_2_VALUE_PARAMS(p0, p1) , p0##_type, \
-    p1##_type
-#define GMOCK_INTERNAL_LIST_TYPE_AND_3_VALUE_PARAMS(p0, p1, p2) , p0##_type, \
-    p1##_type, p2##_type
-#define GMOCK_INTERNAL_LIST_TYPE_AND_4_VALUE_PARAMS(p0, p1, p2, p3) , \
-    p0##_type, p1##_type, p2##_type, p3##_type
-#define GMOCK_INTERNAL_LIST_TYPE_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4) , \
-    p0##_type, p1##_type, p2##_type, p3##_type, p4##_type
-#define GMOCK_INTERNAL_LIST_TYPE_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5) , \
-    p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, p5##_type
-#define GMOCK_INTERNAL_LIST_TYPE_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6) , p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, p5##_type, \
-    p6##_type
-#define GMOCK_INTERNAL_LIST_TYPE_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6, p7) , p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
-    p5##_type, p6##_type, p7##_type
-#define GMOCK_INTERNAL_LIST_TYPE_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6, p7, p8) , p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
-    p5##_type, p6##_type, p7##_type, p8##_type
-#define GMOCK_INTERNAL_LIST_TYPE_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6, p7, p8, p9) , p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
-    p5##_type, p6##_type, p7##_type, p8##_type, p9##_type
-
-// Declares the value parameters.
-#define GMOCK_INTERNAL_DECL_AND_0_VALUE_PARAMS()
-#define GMOCK_INTERNAL_DECL_AND_1_VALUE_PARAMS(p0) p0##_type p0
-#define GMOCK_INTERNAL_DECL_AND_2_VALUE_PARAMS(p0, p1) p0##_type p0, \
-    p1##_type p1
-#define GMOCK_INTERNAL_DECL_AND_3_VALUE_PARAMS(p0, p1, p2) p0##_type p0, \
-    p1##_type p1, p2##_type p2
-#define GMOCK_INTERNAL_DECL_AND_4_VALUE_PARAMS(p0, p1, p2, p3) p0##_type p0, \
-    p1##_type p1, p2##_type p2, p3##_type p3
-#define GMOCK_INTERNAL_DECL_AND_5_VALUE_PARAMS(p0, p1, p2, p3, \
-    p4) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4
-#define GMOCK_INTERNAL_DECL_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, \
-    p5) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4, \
-    p5##_type p5
-#define GMOCK_INTERNAL_DECL_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4, \
-    p5##_type p5, p6##_type p6
-#define GMOCK_INTERNAL_DECL_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4, \
-    p5##_type p5, p6##_type p6, p7##_type p7
-#define GMOCK_INTERNAL_DECL_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, \
-    p4##_type p4, p5##_type p5, p6##_type p6, p7##_type p7, p8##_type p8
-#define GMOCK_INTERNAL_DECL_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8, p9) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, \
-    p4##_type p4, p5##_type p5, p6##_type p6, p7##_type p7, p8##_type p8, \
-    p9##_type p9
-
-// The suffix of the class template implementing the action template.
-#define GMOCK_INTERNAL_COUNT_AND_0_VALUE_PARAMS()
-#define GMOCK_INTERNAL_COUNT_AND_1_VALUE_PARAMS(p0) P
-#define GMOCK_INTERNAL_COUNT_AND_2_VALUE_PARAMS(p0, p1) P2
-#define GMOCK_INTERNAL_COUNT_AND_3_VALUE_PARAMS(p0, p1, p2) P3
-#define GMOCK_INTERNAL_COUNT_AND_4_VALUE_PARAMS(p0, p1, p2, p3) P4
-#define GMOCK_INTERNAL_COUNT_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4) P5
-#define GMOCK_INTERNAL_COUNT_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5) P6
-#define GMOCK_INTERNAL_COUNT_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6) P7
-#define GMOCK_INTERNAL_COUNT_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7) P8
-#define GMOCK_INTERNAL_COUNT_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8) P9
-#define GMOCK_INTERNAL_COUNT_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8, p9) P10
-
-// The name of the class template implementing the action template.
-#define GMOCK_ACTION_CLASS_(name, value_params)\
-    GTEST_CONCAT_TOKEN_(name##Action, GMOCK_INTERNAL_COUNT_##value_params)
-
-#define ACTION_TEMPLATE(name, template_params, value_params)\
-  template <GMOCK_INTERNAL_DECL_##template_params\
-            GMOCK_INTERNAL_DECL_TYPE_##value_params>\
-  class GMOCK_ACTION_CLASS_(name, value_params) {\
-   public:\
-    explicit GMOCK_ACTION_CLASS_(name, value_params)\
-        GMOCK_INTERNAL_INIT_##value_params {}\
-    template <typename F>\
-    class gmock_Impl : public ::testing::ActionInterface<F> {\
-     public:\
-      typedef F function_type;\
-      typedef typename ::testing::internal::Function<F>::Result return_type;\
-      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
-          args_type;\
-      explicit gmock_Impl GMOCK_INTERNAL_INIT_##value_params {}\
-      virtual return_type Perform(const args_type& args) {\
-        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
-            Perform(this, args);\
-      }\
-      template <typename arg0_type, typename arg1_type, typename arg2_type, \
-          typename arg3_type, typename arg4_type, typename arg5_type, \
-          typename arg6_type, typename arg7_type, typename arg8_type, \
-          typename arg9_type>\
-      return_type gmock_PerformImpl(const args_type& args, \
-          const arg0_type& arg0, const arg1_type& arg1, \
-          const arg2_type& arg2, const arg3_type& arg3, \
-          const arg4_type& arg4, const arg5_type& arg5, \
-          const arg6_type& arg6, const arg7_type& arg7, \
-          const arg8_type& arg8, const arg9_type& arg9) const;\
-      GMOCK_INTERNAL_DEFN_##value_params\
-     private:\
-      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
-    };\
-    template <typename F> operator ::testing::Action<F>() const {\
-      return ::testing::Action<F>(\
-          new gmock_Impl<F>(GMOCK_INTERNAL_LIST_##value_params));\
-    }\
-    GMOCK_INTERNAL_DEFN_##value_params\
-   private:\
-    GTEST_DISALLOW_ASSIGN_(GMOCK_ACTION_CLASS_(name, value_params));\
-  };\
-  template <GMOCK_INTERNAL_DECL_##template_params\
-            GMOCK_INTERNAL_DECL_TYPE_##value_params>\
-  inline GMOCK_ACTION_CLASS_(name, value_params)<\
-      GMOCK_INTERNAL_LIST_##template_params\
-      GMOCK_INTERNAL_LIST_TYPE_##value_params> name(\
-          GMOCK_INTERNAL_DECL_##value_params) {\
-    return GMOCK_ACTION_CLASS_(name, value_params)<\
-        GMOCK_INTERNAL_LIST_##template_params\
-        GMOCK_INTERNAL_LIST_TYPE_##value_params>(\
-            GMOCK_INTERNAL_LIST_##value_params);\
-  }\
-  template <GMOCK_INTERNAL_DECL_##template_params\
-            GMOCK_INTERNAL_DECL_TYPE_##value_params>\
-  template <typename F>\
-  template <typename arg0_type, typename arg1_type, typename arg2_type, \
-      typename arg3_type, typename arg4_type, typename arg5_type, \
-      typename arg6_type, typename arg7_type, typename arg8_type, \
-      typename arg9_type>\
-  typename ::testing::internal::Function<F>::Result\
-      GMOCK_ACTION_CLASS_(name, value_params)<\
-          GMOCK_INTERNAL_LIST_##template_params\
-          GMOCK_INTERNAL_LIST_TYPE_##value_params>::gmock_Impl<F>::\
-              gmock_PerformImpl(\
-          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
-
-#define ACTION(name)\
-  class name##Action {\
-   public:\
-    name##Action() {}\
-    template <typename F>\
-    class gmock_Impl : public ::testing::ActionInterface<F> {\
-     public:\
-      typedef F function_type;\
-      typedef typename ::testing::internal::Function<F>::Result return_type;\
-      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
-          args_type;\
-      gmock_Impl() {}\
-      virtual return_type Perform(const args_type& args) {\
-        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
-            Perform(this, args);\
-      }\
-      template <typename arg0_type, typename arg1_type, typename arg2_type, \
-          typename arg3_type, typename arg4_type, typename arg5_type, \
-          typename arg6_type, typename arg7_type, typename arg8_type, \
-          typename arg9_type>\
-      return_type gmock_PerformImpl(const args_type& args, \
-          const arg0_type& arg0, const arg1_type& arg1, \
-          const arg2_type& arg2, const arg3_type& arg3, \
-          const arg4_type& arg4, const arg5_type& arg5, \
-          const arg6_type& arg6, const arg7_type& arg7, \
-          const arg8_type& arg8, const arg9_type& arg9) const;\
-     private:\
-      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
-    };\
-    template <typename F> operator ::testing::Action<F>() const {\
-      return ::testing::Action<F>(new gmock_Impl<F>());\
-    }\
-   private:\
-    GTEST_DISALLOW_ASSIGN_(name##Action);\
-  };\
-  inline name##Action name() {\
-    return name##Action();\
-  }\
-  template <typename F>\
-  template <typename arg0_type, typename arg1_type, typename arg2_type, \
-      typename arg3_type, typename arg4_type, typename arg5_type, \
-      typename arg6_type, typename arg7_type, typename arg8_type, \
-      typename arg9_type>\
-  typename ::testing::internal::Function<F>::Result\
-      name##Action::gmock_Impl<F>::gmock_PerformImpl(\
-          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
-
-#define ACTION_P(name, p0)\
-  template <typename p0##_type>\
-  class name##ActionP {\
-   public:\
-    explicit name##ActionP(p0##_type gmock_p0) : \
-        p0(::std::forward<p0##_type>(gmock_p0)) {}\
-    template <typename F>\
-    class gmock_Impl : public ::testing::ActionInterface<F> {\
-     public:\
-      typedef F function_type;\
-      typedef typename ::testing::internal::Function<F>::Result return_type;\
-      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
-          args_type;\
-      explicit gmock_Impl(p0##_type gmock_p0) : \
-          p0(::std::forward<p0##_type>(gmock_p0)) {}\
-      virtual return_type Perform(const args_type& args) {\
-        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
-            Perform(this, args);\
-      }\
-      template <typename arg0_type, typename arg1_type, typename arg2_type, \
-          typename arg3_type, typename arg4_type, typename arg5_type, \
-          typename arg6_type, typename arg7_type, typename arg8_type, \
-          typename arg9_type>\
-      return_type gmock_PerformImpl(const args_type& args, \
-          const arg0_type& arg0, const arg1_type& arg1, \
-          const arg2_type& arg2, const arg3_type& arg3, \
-          const arg4_type& arg4, const arg5_type& arg5, \
-          const arg6_type& arg6, const arg7_type& arg7, \
-          const arg8_type& arg8, const arg9_type& arg9) const;\
-      p0##_type p0;\
-     private:\
-      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
-    };\
-    template <typename F> operator ::testing::Action<F>() const {\
-      return ::testing::Action<F>(new gmock_Impl<F>(p0));\
-    }\
-    p0##_type p0;\
-   private:\
-    GTEST_DISALLOW_ASSIGN_(name##ActionP);\
-  };\
-  template <typename p0##_type>\
-  inline name##ActionP<p0##_type> name(p0##_type p0) {\
-    return name##ActionP<p0##_type>(p0);\
-  }\
-  template <typename p0##_type>\
-  template <typename F>\
-  template <typename arg0_type, typename arg1_type, typename arg2_type, \
-      typename arg3_type, typename arg4_type, typename arg5_type, \
-      typename arg6_type, typename arg7_type, typename arg8_type, \
-      typename arg9_type>\
-  typename ::testing::internal::Function<F>::Result\
-      name##ActionP<p0##_type>::gmock_Impl<F>::gmock_PerformImpl(\
-          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
-
-#define ACTION_P2(name, p0, p1)\
-  template <typename p0##_type, typename p1##_type>\
-  class name##ActionP2 {\
-   public:\
-    name##ActionP2(p0##_type gmock_p0, \
-        p1##_type gmock_p1) : p0(::std::forward<p0##_type>(gmock_p0)), \
-        p1(::std::forward<p1##_type>(gmock_p1)) {}\
-    template <typename F>\
-    class gmock_Impl : public ::testing::ActionInterface<F> {\
-     public:\
-      typedef F function_type;\
-      typedef typename ::testing::internal::Function<F>::Result return_type;\
-      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
-          args_type;\
-      gmock_Impl(p0##_type gmock_p0, \
-          p1##_type gmock_p1) : p0(::std::forward<p0##_type>(gmock_p0)), \
-          p1(::std::forward<p1##_type>(gmock_p1)) {}\
-      virtual return_type Perform(const args_type& args) {\
-        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
-            Perform(this, args);\
-      }\
-      template <typename arg0_type, typename arg1_type, typename arg2_type, \
-          typename arg3_type, typename arg4_type, typename arg5_type, \
-          typename arg6_type, typename arg7_type, typename arg8_type, \
-          typename arg9_type>\
-      return_type gmock_PerformImpl(const args_type& args, \
-          const arg0_type& arg0, const arg1_type& arg1, \
-          const arg2_type& arg2, const arg3_type& arg3, \
-          const arg4_type& arg4, const arg5_type& arg5, \
-          const arg6_type& arg6, const arg7_type& arg7, \
-          const arg8_type& arg8, const arg9_type& arg9) const;\
-      p0##_type p0;\
-      p1##_type p1;\
-     private:\
-      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
-    };\
-    template <typename F> operator ::testing::Action<F>() const {\
-      return ::testing::Action<F>(new gmock_Impl<F>(p0, p1));\
-    }\
-    p0##_type p0;\
-    p1##_type p1;\
-   private:\
-    GTEST_DISALLOW_ASSIGN_(name##ActionP2);\
-  };\
-  template <typename p0##_type, typename p1##_type>\
-  inline name##ActionP2<p0##_type, p1##_type> name(p0##_type p0, \
-      p1##_type p1) {\
-    return name##ActionP2<p0##_type, p1##_type>(p0, p1);\
-  }\
-  template <typename p0##_type, typename p1##_type>\
-  template <typename F>\
-  template <typename arg0_type, typename arg1_type, typename arg2_type, \
-      typename arg3_type, typename arg4_type, typename arg5_type, \
-      typename arg6_type, typename arg7_type, typename arg8_type, \
-      typename arg9_type>\
-  typename ::testing::internal::Function<F>::Result\
-      name##ActionP2<p0##_type, p1##_type>::gmock_Impl<F>::gmock_PerformImpl(\
-          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
-
-#define ACTION_P3(name, p0, p1, p2)\
-  template <typename p0##_type, typename p1##_type, typename p2##_type>\
-  class name##ActionP3 {\
-   public:\
-    name##ActionP3(p0##_type gmock_p0, p1##_type gmock_p1, \
-        p2##_type gmock_p2) : p0(::std::forward<p0##_type>(gmock_p0)), \
-        p1(::std::forward<p1##_type>(gmock_p1)), \
-        p2(::std::forward<p2##_type>(gmock_p2)) {}\
-    template <typename F>\
-    class gmock_Impl : public ::testing::ActionInterface<F> {\
-     public:\
-      typedef F function_type;\
-      typedef typename ::testing::internal::Function<F>::Result return_type;\
-      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
-          args_type;\
-      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, \
-          p2##_type gmock_p2) : p0(::std::forward<p0##_type>(gmock_p0)), \
-          p1(::std::forward<p1##_type>(gmock_p1)), \
-          p2(::std::forward<p2##_type>(gmock_p2)) {}\
-      virtual return_type Perform(const args_type& args) {\
-        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
-            Perform(this, args);\
-      }\
-      template <typename arg0_type, typename arg1_type, typename arg2_type, \
-          typename arg3_type, typename arg4_type, typename arg5_type, \
-          typename arg6_type, typename arg7_type, typename arg8_type, \
-          typename arg9_type>\
-      return_type gmock_PerformImpl(const args_type& args, \
-          const arg0_type& arg0, const arg1_type& arg1, \
-          const arg2_type& arg2, const arg3_type& arg3, \
-          const arg4_type& arg4, const arg5_type& arg5, \
-          const arg6_type& arg6, const arg7_type& arg7, \
-          const arg8_type& arg8, const arg9_type& arg9) const;\
-      p0##_type p0;\
-      p1##_type p1;\
-      p2##_type p2;\
-     private:\
-      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
-    };\
-    template <typename F> operator ::testing::Action<F>() const {\
-      return ::testing::Action<F>(new gmock_Impl<F>(p0, p1, p2));\
-    }\
-    p0##_type p0;\
-    p1##_type p1;\
-    p2##_type p2;\
-   private:\
-    GTEST_DISALLOW_ASSIGN_(name##ActionP3);\
-  };\
-  template <typename p0##_type, typename p1##_type, typename p2##_type>\
-  inline name##ActionP3<p0##_type, p1##_type, p2##_type> name(p0##_type p0, \
-      p1##_type p1, p2##_type p2) {\
-    return name##ActionP3<p0##_type, p1##_type, p2##_type>(p0, p1, p2);\
-  }\
-  template <typename p0##_type, typename p1##_type, typename p2##_type>\
-  template <typename F>\
-  template <typename arg0_type, typename arg1_type, typename arg2_type, \
-      typename arg3_type, typename arg4_type, typename arg5_type, \
-      typename arg6_type, typename arg7_type, typename arg8_type, \
-      typename arg9_type>\
-  typename ::testing::internal::Function<F>::Result\
-      name##ActionP3<p0##_type, p1##_type, \
-          p2##_type>::gmock_Impl<F>::gmock_PerformImpl(\
-          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
-
-#define ACTION_P4(name, p0, p1, p2, p3)\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type>\
-  class name##ActionP4 {\
-   public:\
-    name##ActionP4(p0##_type gmock_p0, p1##_type gmock_p1, \
-        p2##_type gmock_p2, \
-        p3##_type gmock_p3) : p0(::std::forward<p0##_type>(gmock_p0)), \
-        p1(::std::forward<p1##_type>(gmock_p1)), \
-        p2(::std::forward<p2##_type>(gmock_p2)), \
-        p3(::std::forward<p3##_type>(gmock_p3)) {}\
-    template <typename F>\
-    class gmock_Impl : public ::testing::ActionInterface<F> {\
-     public:\
-      typedef F function_type;\
-      typedef typename ::testing::internal::Function<F>::Result return_type;\
-      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
-          args_type;\
-      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-          p3##_type gmock_p3) : p0(::std::forward<p0##_type>(gmock_p0)), \
-          p1(::std::forward<p1##_type>(gmock_p1)), \
-          p2(::std::forward<p2##_type>(gmock_p2)), \
-          p3(::std::forward<p3##_type>(gmock_p3)) {}\
-      virtual return_type Perform(const args_type& args) {\
-        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
-            Perform(this, args);\
-      }\
-      template <typename arg0_type, typename arg1_type, typename arg2_type, \
-          typename arg3_type, typename arg4_type, typename arg5_type, \
-          typename arg6_type, typename arg7_type, typename arg8_type, \
-          typename arg9_type>\
-      return_type gmock_PerformImpl(const args_type& args, \
-          const arg0_type& arg0, const arg1_type& arg1, \
-          const arg2_type& arg2, const arg3_type& arg3, \
-          const arg4_type& arg4, const arg5_type& arg5, \
-          const arg6_type& arg6, const arg7_type& arg7, \
-          const arg8_type& arg8, const arg9_type& arg9) const;\
-      p0##_type p0;\
-      p1##_type p1;\
-      p2##_type p2;\
-      p3##_type p3;\
-     private:\
-      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
-    };\
-    template <typename F> operator ::testing::Action<F>() const {\
-      return ::testing::Action<F>(new gmock_Impl<F>(p0, p1, p2, p3));\
-    }\
-    p0##_type p0;\
-    p1##_type p1;\
-    p2##_type p2;\
-    p3##_type p3;\
-   private:\
-    GTEST_DISALLOW_ASSIGN_(name##ActionP4);\
-  };\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type>\
-  inline name##ActionP4<p0##_type, p1##_type, p2##_type, \
-      p3##_type> name(p0##_type p0, p1##_type p1, p2##_type p2, \
-      p3##_type p3) {\
-    return name##ActionP4<p0##_type, p1##_type, p2##_type, p3##_type>(p0, p1, \
-        p2, p3);\
-  }\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type>\
-  template <typename F>\
-  template <typename arg0_type, typename arg1_type, typename arg2_type, \
-      typename arg3_type, typename arg4_type, typename arg5_type, \
-      typename arg6_type, typename arg7_type, typename arg8_type, \
-      typename arg9_type>\
-  typename ::testing::internal::Function<F>::Result\
-      name##ActionP4<p0##_type, p1##_type, p2##_type, \
-          p3##_type>::gmock_Impl<F>::gmock_PerformImpl(\
-          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
-
-#define ACTION_P5(name, p0, p1, p2, p3, p4)\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type>\
-  class name##ActionP5 {\
-   public:\
-    name##ActionP5(p0##_type gmock_p0, p1##_type gmock_p1, \
-        p2##_type gmock_p2, p3##_type gmock_p3, \
-        p4##_type gmock_p4) : p0(::std::forward<p0##_type>(gmock_p0)), \
-        p1(::std::forward<p1##_type>(gmock_p1)), \
-        p2(::std::forward<p2##_type>(gmock_p2)), \
-        p3(::std::forward<p3##_type>(gmock_p3)), \
-        p4(::std::forward<p4##_type>(gmock_p4)) {}\
-    template <typename F>\
-    class gmock_Impl : public ::testing::ActionInterface<F> {\
-     public:\
-      typedef F function_type;\
-      typedef typename ::testing::internal::Function<F>::Result return_type;\
-      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
-          args_type;\
-      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-          p3##_type gmock_p3, \
-          p4##_type gmock_p4) : p0(::std::forward<p0##_type>(gmock_p0)), \
-          p1(::std::forward<p1##_type>(gmock_p1)), \
-          p2(::std::forward<p2##_type>(gmock_p2)), \
-          p3(::std::forward<p3##_type>(gmock_p3)), \
-          p4(::std::forward<p4##_type>(gmock_p4)) {}\
-      virtual return_type Perform(const args_type& args) {\
-        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
-            Perform(this, args);\
-      }\
-      template <typename arg0_type, typename arg1_type, typename arg2_type, \
-          typename arg3_type, typename arg4_type, typename arg5_type, \
-          typename arg6_type, typename arg7_type, typename arg8_type, \
-          typename arg9_type>\
-      return_type gmock_PerformImpl(const args_type& args, \
-          const arg0_type& arg0, const arg1_type& arg1, \
-          const arg2_type& arg2, const arg3_type& arg3, \
-          const arg4_type& arg4, const arg5_type& arg5, \
-          const arg6_type& arg6, const arg7_type& arg7, \
-          const arg8_type& arg8, const arg9_type& arg9) const;\
-      p0##_type p0;\
-      p1##_type p1;\
-      p2##_type p2;\
-      p3##_type p3;\
-      p4##_type p4;\
-     private:\
-      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
-    };\
-    template <typename F> operator ::testing::Action<F>() const {\
-      return ::testing::Action<F>(new gmock_Impl<F>(p0, p1, p2, p3, p4));\
-    }\
-    p0##_type p0;\
-    p1##_type p1;\
-    p2##_type p2;\
-    p3##_type p3;\
-    p4##_type p4;\
-   private:\
-    GTEST_DISALLOW_ASSIGN_(name##ActionP5);\
-  };\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type>\
-  inline name##ActionP5<p0##_type, p1##_type, p2##_type, p3##_type, \
-      p4##_type> name(p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, \
-      p4##_type p4) {\
-    return name##ActionP5<p0##_type, p1##_type, p2##_type, p3##_type, \
-        p4##_type>(p0, p1, p2, p3, p4);\
-  }\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type>\
-  template <typename F>\
-  template <typename arg0_type, typename arg1_type, typename arg2_type, \
-      typename arg3_type, typename arg4_type, typename arg5_type, \
-      typename arg6_type, typename arg7_type, typename arg8_type, \
-      typename arg9_type>\
-  typename ::testing::internal::Function<F>::Result\
-      name##ActionP5<p0##_type, p1##_type, p2##_type, p3##_type, \
-          p4##_type>::gmock_Impl<F>::gmock_PerformImpl(\
-          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
-
-#define ACTION_P6(name, p0, p1, p2, p3, p4, p5)\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type>\
-  class name##ActionP6 {\
-   public:\
-    name##ActionP6(p0##_type gmock_p0, p1##_type gmock_p1, \
-        p2##_type gmock_p2, p3##_type gmock_p3, p4##_type gmock_p4, \
-        p5##_type gmock_p5) : p0(::std::forward<p0##_type>(gmock_p0)), \
-        p1(::std::forward<p1##_type>(gmock_p1)), \
-        p2(::std::forward<p2##_type>(gmock_p2)), \
-        p3(::std::forward<p3##_type>(gmock_p3)), \
-        p4(::std::forward<p4##_type>(gmock_p4)), \
-        p5(::std::forward<p5##_type>(gmock_p5)) {}\
-    template <typename F>\
-    class gmock_Impl : public ::testing::ActionInterface<F> {\
-     public:\
-      typedef F function_type;\
-      typedef typename ::testing::internal::Function<F>::Result return_type;\
-      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
-          args_type;\
-      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-          p3##_type gmock_p3, p4##_type gmock_p4, \
-          p5##_type gmock_p5) : p0(::std::forward<p0##_type>(gmock_p0)), \
-          p1(::std::forward<p1##_type>(gmock_p1)), \
-          p2(::std::forward<p2##_type>(gmock_p2)), \
-          p3(::std::forward<p3##_type>(gmock_p3)), \
-          p4(::std::forward<p4##_type>(gmock_p4)), \
-          p5(::std::forward<p5##_type>(gmock_p5)) {}\
-      virtual return_type Perform(const args_type& args) {\
-        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
-            Perform(this, args);\
-      }\
-      template <typename arg0_type, typename arg1_type, typename arg2_type, \
-          typename arg3_type, typename arg4_type, typename arg5_type, \
-          typename arg6_type, typename arg7_type, typename arg8_type, \
-          typename arg9_type>\
-      return_type gmock_PerformImpl(const args_type& args, \
-          const arg0_type& arg0, const arg1_type& arg1, \
-          const arg2_type& arg2, const arg3_type& arg3, \
-          const arg4_type& arg4, const arg5_type& arg5, \
-          const arg6_type& arg6, const arg7_type& arg7, \
-          const arg8_type& arg8, const arg9_type& arg9) const;\
-      p0##_type p0;\
-      p1##_type p1;\
-      p2##_type p2;\
-      p3##_type p3;\
-      p4##_type p4;\
-      p5##_type p5;\
-     private:\
-      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
-    };\
-    template <typename F> operator ::testing::Action<F>() const {\
-      return ::testing::Action<F>(new gmock_Impl<F>(p0, p1, p2, p3, p4, p5));\
-    }\
-    p0##_type p0;\
-    p1##_type p1;\
-    p2##_type p2;\
-    p3##_type p3;\
-    p4##_type p4;\
-    p5##_type p5;\
-   private:\
-    GTEST_DISALLOW_ASSIGN_(name##ActionP6);\
-  };\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type>\
-  inline name##ActionP6<p0##_type, p1##_type, p2##_type, p3##_type, \
-      p4##_type, p5##_type> name(p0##_type p0, p1##_type p1, p2##_type p2, \
-      p3##_type p3, p4##_type p4, p5##_type p5) {\
-    return name##ActionP6<p0##_type, p1##_type, p2##_type, p3##_type, \
-        p4##_type, p5##_type>(p0, p1, p2, p3, p4, p5);\
-  }\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type>\
-  template <typename F>\
-  template <typename arg0_type, typename arg1_type, typename arg2_type, \
-      typename arg3_type, typename arg4_type, typename arg5_type, \
-      typename arg6_type, typename arg7_type, typename arg8_type, \
-      typename arg9_type>\
-  typename ::testing::internal::Function<F>::Result\
-      name##ActionP6<p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
-          p5##_type>::gmock_Impl<F>::gmock_PerformImpl(\
-          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
-
-#define ACTION_P7(name, p0, p1, p2, p3, p4, p5, p6)\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type>\
-  class name##ActionP7 {\
-   public:\
-    name##ActionP7(p0##_type gmock_p0, p1##_type gmock_p1, \
-        p2##_type gmock_p2, p3##_type gmock_p3, p4##_type gmock_p4, \
-        p5##_type gmock_p5, \
-        p6##_type gmock_p6) : p0(::std::forward<p0##_type>(gmock_p0)), \
-        p1(::std::forward<p1##_type>(gmock_p1)), \
-        p2(::std::forward<p2##_type>(gmock_p2)), \
-        p3(::std::forward<p3##_type>(gmock_p3)), \
-        p4(::std::forward<p4##_type>(gmock_p4)), \
-        p5(::std::forward<p5##_type>(gmock_p5)), \
-        p6(::std::forward<p6##_type>(gmock_p6)) {}\
-    template <typename F>\
-    class gmock_Impl : public ::testing::ActionInterface<F> {\
-     public:\
-      typedef F function_type;\
-      typedef typename ::testing::internal::Function<F>::Result return_type;\
-      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
-          args_type;\
-      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-          p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
-          p6##_type gmock_p6) : p0(::std::forward<p0##_type>(gmock_p0)), \
-          p1(::std::forward<p1##_type>(gmock_p1)), \
-          p2(::std::forward<p2##_type>(gmock_p2)), \
-          p3(::std::forward<p3##_type>(gmock_p3)), \
-          p4(::std::forward<p4##_type>(gmock_p4)), \
-          p5(::std::forward<p5##_type>(gmock_p5)), \
-          p6(::std::forward<p6##_type>(gmock_p6)) {}\
-      virtual return_type Perform(const args_type& args) {\
-        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
-            Perform(this, args);\
-      }\
-      template <typename arg0_type, typename arg1_type, typename arg2_type, \
-          typename arg3_type, typename arg4_type, typename arg5_type, \
-          typename arg6_type, typename arg7_type, typename arg8_type, \
-          typename arg9_type>\
-      return_type gmock_PerformImpl(const args_type& args, \
-          const arg0_type& arg0, const arg1_type& arg1, \
-          const arg2_type& arg2, const arg3_type& arg3, \
-          const arg4_type& arg4, const arg5_type& arg5, \
-          const arg6_type& arg6, const arg7_type& arg7, \
-          const arg8_type& arg8, const arg9_type& arg9) const;\
-      p0##_type p0;\
-      p1##_type p1;\
-      p2##_type p2;\
-      p3##_type p3;\
-      p4##_type p4;\
-      p5##_type p5;\
-      p6##_type p6;\
-     private:\
-      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
-    };\
-    template <typename F> operator ::testing::Action<F>() const {\
-      return ::testing::Action<F>(new gmock_Impl<F>(p0, p1, p2, p3, p4, p5, \
-          p6));\
-    }\
-    p0##_type p0;\
-    p1##_type p1;\
-    p2##_type p2;\
-    p3##_type p3;\
-    p4##_type p4;\
-    p5##_type p5;\
-    p6##_type p6;\
-   private:\
-    GTEST_DISALLOW_ASSIGN_(name##ActionP7);\
-  };\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type>\
-  inline name##ActionP7<p0##_type, p1##_type, p2##_type, p3##_type, \
-      p4##_type, p5##_type, p6##_type> name(p0##_type p0, p1##_type p1, \
-      p2##_type p2, p3##_type p3, p4##_type p4, p5##_type p5, \
-      p6##_type p6) {\
-    return name##ActionP7<p0##_type, p1##_type, p2##_type, p3##_type, \
-        p4##_type, p5##_type, p6##_type>(p0, p1, p2, p3, p4, p5, p6);\
-  }\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type>\
-  template <typename F>\
-  template <typename arg0_type, typename arg1_type, typename arg2_type, \
-      typename arg3_type, typename arg4_type, typename arg5_type, \
-      typename arg6_type, typename arg7_type, typename arg8_type, \
-      typename arg9_type>\
-  typename ::testing::internal::Function<F>::Result\
-      name##ActionP7<p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
-          p5##_type, p6##_type>::gmock_Impl<F>::gmock_PerformImpl(\
-          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
-
-#define ACTION_P8(name, p0, p1, p2, p3, p4, p5, p6, p7)\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type, typename p7##_type>\
-  class name##ActionP8 {\
-   public:\
-    name##ActionP8(p0##_type gmock_p0, p1##_type gmock_p1, \
-        p2##_type gmock_p2, p3##_type gmock_p3, p4##_type gmock_p4, \
-        p5##_type gmock_p5, p6##_type gmock_p6, \
-        p7##_type gmock_p7) : p0(::std::forward<p0##_type>(gmock_p0)), \
-        p1(::std::forward<p1##_type>(gmock_p1)), \
-        p2(::std::forward<p2##_type>(gmock_p2)), \
-        p3(::std::forward<p3##_type>(gmock_p3)), \
-        p4(::std::forward<p4##_type>(gmock_p4)), \
-        p5(::std::forward<p5##_type>(gmock_p5)), \
-        p6(::std::forward<p6##_type>(gmock_p6)), \
-        p7(::std::forward<p7##_type>(gmock_p7)) {}\
-    template <typename F>\
-    class gmock_Impl : public ::testing::ActionInterface<F> {\
-     public:\
-      typedef F function_type;\
-      typedef typename ::testing::internal::Function<F>::Result return_type;\
-      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
-          args_type;\
-      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-          p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
-          p6##_type gmock_p6, \
-          p7##_type gmock_p7) : p0(::std::forward<p0##_type>(gmock_p0)), \
-          p1(::std::forward<p1##_type>(gmock_p1)), \
-          p2(::std::forward<p2##_type>(gmock_p2)), \
-          p3(::std::forward<p3##_type>(gmock_p3)), \
-          p4(::std::forward<p4##_type>(gmock_p4)), \
-          p5(::std::forward<p5##_type>(gmock_p5)), \
-          p6(::std::forward<p6##_type>(gmock_p6)), \
-          p7(::std::forward<p7##_type>(gmock_p7)) {}\
-      virtual return_type Perform(const args_type& args) {\
-        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
-            Perform(this, args);\
-      }\
-      template <typename arg0_type, typename arg1_type, typename arg2_type, \
-          typename arg3_type, typename arg4_type, typename arg5_type, \
-          typename arg6_type, typename arg7_type, typename arg8_type, \
-          typename arg9_type>\
-      return_type gmock_PerformImpl(const args_type& args, \
-          const arg0_type& arg0, const arg1_type& arg1, \
-          const arg2_type& arg2, const arg3_type& arg3, \
-          const arg4_type& arg4, const arg5_type& arg5, \
-          const arg6_type& arg6, const arg7_type& arg7, \
-          const arg8_type& arg8, const arg9_type& arg9) const;\
-      p0##_type p0;\
-      p1##_type p1;\
-      p2##_type p2;\
-      p3##_type p3;\
-      p4##_type p4;\
-      p5##_type p5;\
-      p6##_type p6;\
-      p7##_type p7;\
-     private:\
-      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
-    };\
-    template <typename F> operator ::testing::Action<F>() const {\
-      return ::testing::Action<F>(new gmock_Impl<F>(p0, p1, p2, p3, p4, p5, \
-          p6, p7));\
-    }\
-    p0##_type p0;\
-    p1##_type p1;\
-    p2##_type p2;\
-    p3##_type p3;\
-    p4##_type p4;\
-    p5##_type p5;\
-    p6##_type p6;\
-    p7##_type p7;\
-   private:\
-    GTEST_DISALLOW_ASSIGN_(name##ActionP8);\
-  };\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type, typename p7##_type>\
-  inline name##ActionP8<p0##_type, p1##_type, p2##_type, p3##_type, \
-      p4##_type, p5##_type, p6##_type, p7##_type> name(p0##_type p0, \
-      p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4, p5##_type p5, \
-      p6##_type p6, p7##_type p7) {\
-    return name##ActionP8<p0##_type, p1##_type, p2##_type, p3##_type, \
-        p4##_type, p5##_type, p6##_type, p7##_type>(p0, p1, p2, p3, p4, p5, \
-        p6, p7);\
-  }\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type, typename p7##_type>\
-  template <typename F>\
-  template <typename arg0_type, typename arg1_type, typename arg2_type, \
-      typename arg3_type, typename arg4_type, typename arg5_type, \
-      typename arg6_type, typename arg7_type, typename arg8_type, \
-      typename arg9_type>\
-  typename ::testing::internal::Function<F>::Result\
-      name##ActionP8<p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
-          p5##_type, p6##_type, \
-          p7##_type>::gmock_Impl<F>::gmock_PerformImpl(\
-          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
-
-#define ACTION_P9(name, p0, p1, p2, p3, p4, p5, p6, p7, p8)\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type, typename p7##_type, typename p8##_type>\
-  class name##ActionP9 {\
-   public:\
-    name##ActionP9(p0##_type gmock_p0, p1##_type gmock_p1, \
-        p2##_type gmock_p2, p3##_type gmock_p3, p4##_type gmock_p4, \
-        p5##_type gmock_p5, p6##_type gmock_p6, p7##_type gmock_p7, \
-        p8##_type gmock_p8) : p0(::std::forward<p0##_type>(gmock_p0)), \
-        p1(::std::forward<p1##_type>(gmock_p1)), \
-        p2(::std::forward<p2##_type>(gmock_p2)), \
-        p3(::std::forward<p3##_type>(gmock_p3)), \
-        p4(::std::forward<p4##_type>(gmock_p4)), \
-        p5(::std::forward<p5##_type>(gmock_p5)), \
-        p6(::std::forward<p6##_type>(gmock_p6)), \
-        p7(::std::forward<p7##_type>(gmock_p7)), \
-        p8(::std::forward<p8##_type>(gmock_p8)) {}\
-    template <typename F>\
-    class gmock_Impl : public ::testing::ActionInterface<F> {\
-     public:\
-      typedef F function_type;\
-      typedef typename ::testing::internal::Function<F>::Result return_type;\
-      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
-          args_type;\
-      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-          p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
-          p6##_type gmock_p6, p7##_type gmock_p7, \
-          p8##_type gmock_p8) : p0(::std::forward<p0##_type>(gmock_p0)), \
-          p1(::std::forward<p1##_type>(gmock_p1)), \
-          p2(::std::forward<p2##_type>(gmock_p2)), \
-          p3(::std::forward<p3##_type>(gmock_p3)), \
-          p4(::std::forward<p4##_type>(gmock_p4)), \
-          p5(::std::forward<p5##_type>(gmock_p5)), \
-          p6(::std::forward<p6##_type>(gmock_p6)), \
-          p7(::std::forward<p7##_type>(gmock_p7)), \
-          p8(::std::forward<p8##_type>(gmock_p8)) {}\
-      virtual return_type Perform(const args_type& args) {\
-        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
-            Perform(this, args);\
-      }\
-      template <typename arg0_type, typename arg1_type, typename arg2_type, \
-          typename arg3_type, typename arg4_type, typename arg5_type, \
-          typename arg6_type, typename arg7_type, typename arg8_type, \
-          typename arg9_type>\
-      return_type gmock_PerformImpl(const args_type& args, \
-          const arg0_type& arg0, const arg1_type& arg1, \
-          const arg2_type& arg2, const arg3_type& arg3, \
-          const arg4_type& arg4, const arg5_type& arg5, \
-          const arg6_type& arg6, const arg7_type& arg7, \
-          const arg8_type& arg8, const arg9_type& arg9) const;\
-      p0##_type p0;\
-      p1##_type p1;\
-      p2##_type p2;\
-      p3##_type p3;\
-      p4##_type p4;\
-      p5##_type p5;\
-      p6##_type p6;\
-      p7##_type p7;\
-      p8##_type p8;\
-     private:\
-      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
-    };\
-    template <typename F> operator ::testing::Action<F>() const {\
-      return ::testing::Action<F>(new gmock_Impl<F>(p0, p1, p2, p3, p4, p5, \
-          p6, p7, p8));\
-    }\
-    p0##_type p0;\
-    p1##_type p1;\
-    p2##_type p2;\
-    p3##_type p3;\
-    p4##_type p4;\
-    p5##_type p5;\
-    p6##_type p6;\
-    p7##_type p7;\
-    p8##_type p8;\
-   private:\
-    GTEST_DISALLOW_ASSIGN_(name##ActionP9);\
-  };\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type, typename p7##_type, typename p8##_type>\
-  inline name##ActionP9<p0##_type, p1##_type, p2##_type, p3##_type, \
-      p4##_type, p5##_type, p6##_type, p7##_type, \
-      p8##_type> name(p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, \
-      p4##_type p4, p5##_type p5, p6##_type p6, p7##_type p7, \
-      p8##_type p8) {\
-    return name##ActionP9<p0##_type, p1##_type, p2##_type, p3##_type, \
-        p4##_type, p5##_type, p6##_type, p7##_type, p8##_type>(p0, p1, p2, \
-        p3, p4, p5, p6, p7, p8);\
-  }\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type, typename p7##_type, typename p8##_type>\
-  template <typename F>\
-  template <typename arg0_type, typename arg1_type, typename arg2_type, \
-      typename arg3_type, typename arg4_type, typename arg5_type, \
-      typename arg6_type, typename arg7_type, typename arg8_type, \
-      typename arg9_type>\
-  typename ::testing::internal::Function<F>::Result\
-      name##ActionP9<p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
-          p5##_type, p6##_type, p7##_type, \
-          p8##_type>::gmock_Impl<F>::gmock_PerformImpl(\
-          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
-
-#define ACTION_P10(name, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9)\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type, typename p7##_type, typename p8##_type, \
-      typename p9##_type>\
-  class name##ActionP10 {\
-   public:\
-    name##ActionP10(p0##_type gmock_p0, p1##_type gmock_p1, \
-        p2##_type gmock_p2, p3##_type gmock_p3, p4##_type gmock_p4, \
-        p5##_type gmock_p5, p6##_type gmock_p6, p7##_type gmock_p7, \
-        p8##_type gmock_p8, \
-        p9##_type gmock_p9) : p0(::std::forward<p0##_type>(gmock_p0)), \
-        p1(::std::forward<p1##_type>(gmock_p1)), \
-        p2(::std::forward<p2##_type>(gmock_p2)), \
-        p3(::std::forward<p3##_type>(gmock_p3)), \
-        p4(::std::forward<p4##_type>(gmock_p4)), \
-        p5(::std::forward<p5##_type>(gmock_p5)), \
-        p6(::std::forward<p6##_type>(gmock_p6)), \
-        p7(::std::forward<p7##_type>(gmock_p7)), \
-        p8(::std::forward<p8##_type>(gmock_p8)), \
-        p9(::std::forward<p9##_type>(gmock_p9)) {}\
-    template <typename F>\
-    class gmock_Impl : public ::testing::ActionInterface<F> {\
-     public:\
-      typedef F function_type;\
-      typedef typename ::testing::internal::Function<F>::Result return_type;\
-      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
-          args_type;\
-      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-          p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
-          p6##_type gmock_p6, p7##_type gmock_p7, p8##_type gmock_p8, \
-          p9##_type gmock_p9) : p0(::std::forward<p0##_type>(gmock_p0)), \
-          p1(::std::forward<p1##_type>(gmock_p1)), \
-          p2(::std::forward<p2##_type>(gmock_p2)), \
-          p3(::std::forward<p3##_type>(gmock_p3)), \
-          p4(::std::forward<p4##_type>(gmock_p4)), \
-          p5(::std::forward<p5##_type>(gmock_p5)), \
-          p6(::std::forward<p6##_type>(gmock_p6)), \
-          p7(::std::forward<p7##_type>(gmock_p7)), \
-          p8(::std::forward<p8##_type>(gmock_p8)), \
-          p9(::std::forward<p9##_type>(gmock_p9)) {}\
-      virtual return_type Perform(const args_type& args) {\
-        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
-            Perform(this, args);\
-      }\
-      template <typename arg0_type, typename arg1_type, typename arg2_type, \
-          typename arg3_type, typename arg4_type, typename arg5_type, \
-          typename arg6_type, typename arg7_type, typename arg8_type, \
-          typename arg9_type>\
-      return_type gmock_PerformImpl(const args_type& args, \
-          const arg0_type& arg0, const arg1_type& arg1, \
-          const arg2_type& arg2, const arg3_type& arg3, \
-          const arg4_type& arg4, const arg5_type& arg5, \
-          const arg6_type& arg6, const arg7_type& arg7, \
-          const arg8_type& arg8, const arg9_type& arg9) const;\
-      p0##_type p0;\
-      p1##_type p1;\
-      p2##_type p2;\
-      p3##_type p3;\
-      p4##_type p4;\
-      p5##_type p5;\
-      p6##_type p6;\
-      p7##_type p7;\
-      p8##_type p8;\
-      p9##_type p9;\
-     private:\
-      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
-    };\
-    template <typename F> operator ::testing::Action<F>() const {\
-      return ::testing::Action<F>(new gmock_Impl<F>(p0, p1, p2, p3, p4, p5, \
-          p6, p7, p8, p9));\
-    }\
-    p0##_type p0;\
-    p1##_type p1;\
-    p2##_type p2;\
-    p3##_type p3;\
-    p4##_type p4;\
-    p5##_type p5;\
-    p6##_type p6;\
-    p7##_type p7;\
-    p8##_type p8;\
-    p9##_type p9;\
-   private:\
-    GTEST_DISALLOW_ASSIGN_(name##ActionP10);\
-  };\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type, typename p7##_type, typename p8##_type, \
-      typename p9##_type>\
-  inline name##ActionP10<p0##_type, p1##_type, p2##_type, p3##_type, \
-      p4##_type, p5##_type, p6##_type, p7##_type, p8##_type, \
-      p9##_type> name(p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, \
-      p4##_type p4, p5##_type p5, p6##_type p6, p7##_type p7, p8##_type p8, \
-      p9##_type p9) {\
-    return name##ActionP10<p0##_type, p1##_type, p2##_type, p3##_type, \
-        p4##_type, p5##_type, p6##_type, p7##_type, p8##_type, p9##_type>(p0, \
-        p1, p2, p3, p4, p5, p6, p7, p8, p9);\
-  }\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type, typename p7##_type, typename p8##_type, \
-      typename p9##_type>\
-  template <typename F>\
-  template <typename arg0_type, typename arg1_type, typename arg2_type, \
-      typename arg3_type, typename arg4_type, typename arg5_type, \
-      typename arg6_type, typename arg7_type, typename arg8_type, \
-      typename arg9_type>\
-  typename ::testing::internal::Function<F>::Result\
-      name##ActionP10<p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
-          p5##_type, p6##_type, p7##_type, p8##_type, \
-          p9##_type>::gmock_Impl<F>::gmock_PerformImpl(\
-          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
-
-namespace testing {
-
-
-// The ACTION*() macros trigger warning C4100 (unreferenced formal
-// parameter) in MSVC with -W4.  Unfortunately they cannot be fixed in
-// the macro definition, as the warnings are generated when the macro
-// is expanded and macro expansion cannot contain #pragma.  Therefore
-// we suppress them here.
-#ifdef _MSC_VER
-# pragma warning(push)
-# pragma warning(disable:4100)
-#endif
-
-// Various overloads for InvokeArgument<N>().
-//
-// The InvokeArgument<N>(a1, a2, ..., a_k) action invokes the N-th
-// (0-based) argument, which must be a k-ary callable, of the mock
-// function, with arguments a1, a2, ..., a_k.
-//
-// Notes:
-//
-//   1. The arguments are passed by value by default.  If you need to
-//   pass an argument by reference, wrap it inside ByRef().  For
-//   example,
-//
-//     InvokeArgument<1>(5, string("Hello"), ByRef(foo))
-//
-//   passes 5 and string("Hello") by value, and passes foo by
-//   reference.
-//
-//   2. If the callable takes an argument by reference but ByRef() is
-//   not used, it will receive the reference to a copy of the value,
-//   instead of the original value.  For example, when the 0-th
-//   argument of the mock function takes a const string&, the action
-//
-//     InvokeArgument<0>(string("Hello"))
-//
-//   makes a copy of the temporary string("Hello") object and passes a
-//   reference of the copy, instead of the original temporary object,
-//   to the callable.  This makes it easy for a user to define an
-//   InvokeArgument action from temporary values and have it performed
-//   later.
-
-namespace internal {
-namespace invoke_argument {
-
-// Appears in InvokeArgumentAdl's argument list to help avoid
-// accidental calls to user functions of the same name.
-struct AdlTag {};
-
-// InvokeArgumentAdl - a helper for InvokeArgument.
-// The basic overloads are provided here for generic functors.
-// Overloads for other custom-callables are provided in the
-// internal/custom/callback-actions.h header.
-
-template <typename R, typename F>
-R InvokeArgumentAdl(AdlTag, F f) {
-  return f();
-}
-template <typename R, typename F, typename A1>
-R InvokeArgumentAdl(AdlTag, F f, A1 a1) {
-  return f(a1);
-}
-template <typename R, typename F, typename A1, typename A2>
-R InvokeArgumentAdl(AdlTag, F f, A1 a1, A2 a2) {
-  return f(a1, a2);
-}
-template <typename R, typename F, typename A1, typename A2, typename A3>
-R InvokeArgumentAdl(AdlTag, F f, A1 a1, A2 a2, A3 a3) {
-  return f(a1, a2, a3);
-}
-template <typename R, typename F, typename A1, typename A2, typename A3,
-    typename A4>
-R InvokeArgumentAdl(AdlTag, F f, A1 a1, A2 a2, A3 a3, A4 a4) {
-  return f(a1, a2, a3, a4);
-}
-template <typename R, typename F, typename A1, typename A2, typename A3,
-    typename A4, typename A5>
-R InvokeArgumentAdl(AdlTag, F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5) {
-  return f(a1, a2, a3, a4, a5);
-}
-template <typename R, typename F, typename A1, typename A2, typename A3,
-    typename A4, typename A5, typename A6>
-R InvokeArgumentAdl(AdlTag, F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6) {
-  return f(a1, a2, a3, a4, a5, a6);
-}
-template <typename R, typename F, typename A1, typename A2, typename A3,
-    typename A4, typename A5, typename A6, typename A7>
-R InvokeArgumentAdl(AdlTag, F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6,
-    A7 a7) {
-  return f(a1, a2, a3, a4, a5, a6, a7);
-}
-template <typename R, typename F, typename A1, typename A2, typename A3,
-    typename A4, typename A5, typename A6, typename A7, typename A8>
-R InvokeArgumentAdl(AdlTag, F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6,
-    A7 a7, A8 a8) {
-  return f(a1, a2, a3, a4, a5, a6, a7, a8);
-}
-template <typename R, typename F, typename A1, typename A2, typename A3,
-    typename A4, typename A5, typename A6, typename A7, typename A8,
-    typename A9>
-R InvokeArgumentAdl(AdlTag, F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6,
-    A7 a7, A8 a8, A9 a9) {
-  return f(a1, a2, a3, a4, a5, a6, a7, a8, a9);
-}
-template <typename R, typename F, typename A1, typename A2, typename A3,
-    typename A4, typename A5, typename A6, typename A7, typename A8,
-    typename A9, typename A10>
-R InvokeArgumentAdl(AdlTag, F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6,
-    A7 a7, A8 a8, A9 a9, A10 a10) {
-  return f(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10);
-}
-}  // namespace invoke_argument
-}  // namespace internal
-
-ACTION_TEMPLATE(InvokeArgument,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_0_VALUE_PARAMS()) {
-  using internal::invoke_argument::InvokeArgumentAdl;
-  return InvokeArgumentAdl<return_type>(
-      internal::invoke_argument::AdlTag(),
-      ::std::get<k>(args));
-}
-
-ACTION_TEMPLATE(InvokeArgument,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_1_VALUE_PARAMS(p0)) {
-  using internal::invoke_argument::InvokeArgumentAdl;
-  return InvokeArgumentAdl<return_type>(
-      internal::invoke_argument::AdlTag(),
-      ::std::get<k>(args), p0);
-}
-
-ACTION_TEMPLATE(InvokeArgument,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_2_VALUE_PARAMS(p0, p1)) {
-  using internal::invoke_argument::InvokeArgumentAdl;
-  return InvokeArgumentAdl<return_type>(
-      internal::invoke_argument::AdlTag(),
-      ::std::get<k>(args), p0, p1);
-}
-
-ACTION_TEMPLATE(InvokeArgument,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_3_VALUE_PARAMS(p0, p1, p2)) {
-  using internal::invoke_argument::InvokeArgumentAdl;
-  return InvokeArgumentAdl<return_type>(
-      internal::invoke_argument::AdlTag(),
-      ::std::get<k>(args), p0, p1, p2);
-}
-
-ACTION_TEMPLATE(InvokeArgument,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_4_VALUE_PARAMS(p0, p1, p2, p3)) {
-  using internal::invoke_argument::InvokeArgumentAdl;
-  return InvokeArgumentAdl<return_type>(
-      internal::invoke_argument::AdlTag(),
-      ::std::get<k>(args), p0, p1, p2, p3);
-}
-
-ACTION_TEMPLATE(InvokeArgument,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4)) {
-  using internal::invoke_argument::InvokeArgumentAdl;
-  return InvokeArgumentAdl<return_type>(
-      internal::invoke_argument::AdlTag(),
-      ::std::get<k>(args), p0, p1, p2, p3, p4);
-}
-
-ACTION_TEMPLATE(InvokeArgument,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5)) {
-  using internal::invoke_argument::InvokeArgumentAdl;
-  return InvokeArgumentAdl<return_type>(
-      internal::invoke_argument::AdlTag(),
-      ::std::get<k>(args), p0, p1, p2, p3, p4, p5);
-}
-
-ACTION_TEMPLATE(InvokeArgument,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6)) {
-  using internal::invoke_argument::InvokeArgumentAdl;
-  return InvokeArgumentAdl<return_type>(
-      internal::invoke_argument::AdlTag(),
-      ::std::get<k>(args), p0, p1, p2, p3, p4, p5, p6);
-}
-
-ACTION_TEMPLATE(InvokeArgument,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7)) {
-  using internal::invoke_argument::InvokeArgumentAdl;
-  return InvokeArgumentAdl<return_type>(
-      internal::invoke_argument::AdlTag(),
-      ::std::get<k>(args), p0, p1, p2, p3, p4, p5, p6, p7);
-}
-
-ACTION_TEMPLATE(InvokeArgument,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7, p8)) {
-  using internal::invoke_argument::InvokeArgumentAdl;
-  return InvokeArgumentAdl<return_type>(
-      internal::invoke_argument::AdlTag(),
-      ::std::get<k>(args), p0, p1, p2, p3, p4, p5, p6, p7, p8);
-}
-
-ACTION_TEMPLATE(InvokeArgument,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9)) {
-  using internal::invoke_argument::InvokeArgumentAdl;
-  return InvokeArgumentAdl<return_type>(
-      internal::invoke_argument::AdlTag(),
-      ::std::get<k>(args), p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
-}
-
-// Various overloads for ReturnNew<T>().
-//
-// The ReturnNew<T>(a1, a2, ..., a_k) action returns a pointer to a new
-// instance of type T, constructed on the heap with constructor arguments
-// a1, a2, ..., and a_k. The caller assumes ownership of the returned value.
-ACTION_TEMPLATE(ReturnNew,
-                HAS_1_TEMPLATE_PARAMS(typename, T),
-                AND_0_VALUE_PARAMS()) {
-  return new T();
-}
-
-ACTION_TEMPLATE(ReturnNew,
-                HAS_1_TEMPLATE_PARAMS(typename, T),
-                AND_1_VALUE_PARAMS(p0)) {
-  return new T(p0);
-}
-
-ACTION_TEMPLATE(ReturnNew,
-                HAS_1_TEMPLATE_PARAMS(typename, T),
-                AND_2_VALUE_PARAMS(p0, p1)) {
-  return new T(p0, p1);
-}
-
-ACTION_TEMPLATE(ReturnNew,
-                HAS_1_TEMPLATE_PARAMS(typename, T),
-                AND_3_VALUE_PARAMS(p0, p1, p2)) {
-  return new T(p0, p1, p2);
-}
-
-ACTION_TEMPLATE(ReturnNew,
-                HAS_1_TEMPLATE_PARAMS(typename, T),
-                AND_4_VALUE_PARAMS(p0, p1, p2, p3)) {
-  return new T(p0, p1, p2, p3);
-}
-
-ACTION_TEMPLATE(ReturnNew,
-                HAS_1_TEMPLATE_PARAMS(typename, T),
-                AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4)) {
-  return new T(p0, p1, p2, p3, p4);
-}
-
-ACTION_TEMPLATE(ReturnNew,
-                HAS_1_TEMPLATE_PARAMS(typename, T),
-                AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5)) {
-  return new T(p0, p1, p2, p3, p4, p5);
-}
-
-ACTION_TEMPLATE(ReturnNew,
-                HAS_1_TEMPLATE_PARAMS(typename, T),
-                AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6)) {
-  return new T(p0, p1, p2, p3, p4, p5, p6);
-}
-
-ACTION_TEMPLATE(ReturnNew,
-                HAS_1_TEMPLATE_PARAMS(typename, T),
-                AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7)) {
-  return new T(p0, p1, p2, p3, p4, p5, p6, p7);
-}
-
-ACTION_TEMPLATE(ReturnNew,
-                HAS_1_TEMPLATE_PARAMS(typename, T),
-                AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7, p8)) {
-  return new T(p0, p1, p2, p3, p4, p5, p6, p7, p8);
-}
-
-ACTION_TEMPLATE(ReturnNew,
-                HAS_1_TEMPLATE_PARAMS(typename, T),
-                AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9)) {
-  return new T(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
-}
-
-#ifdef _MSC_VER
-# pragma warning(pop)
-#endif
-
-}  // namespace testing
-
-// Include any custom callback actions added by the local installation.
-// We must include this header at the end to make sure it can use the
-// declarations from this file.
-#include "gmock/internal/custom/gmock-generated-actions.h"
-
-#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-generated-actions.h.pump mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-generated-actions.h.pump
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-generated-actions.h.pump	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-generated-actions.h.pump	1970-01-01 00:00:00.000000000 +0000
@@ -1,627 +0,0 @@
-$$ -*- mode: c++; -*-
-$$ This is a Pump source file. Please use Pump to convert it to
-$$ gmock-generated-actions.h.
-$$
-$var n = 10  $$ The maximum arity we support.
-$$}} This meta comment fixes auto-indentation in editors.
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file implements some commonly used variadic actions.
-
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_
-#define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_
-
-#include <memory>
-#include <utility>
-
-#include "gmock/gmock-actions.h"
-#include "gmock/internal/gmock-port.h"
-
-namespace testing {
-namespace internal {
-
-// A macro from the ACTION* family (defined later in this file)
-// defines an action that can be used in a mock function.  Typically,
-// these actions only care about a subset of the arguments of the mock
-// function.  For example, if such an action only uses the second
-// argument, it can be used in any mock function that takes >= 2
-// arguments where the type of the second argument is compatible.
-//
-// Therefore, the action implementation must be prepared to take more
-// arguments than it needs.  The ExcessiveArg type is used to
-// represent those excessive arguments.  In order to keep the compiler
-// error messages tractable, we define it in the testing namespace
-// instead of testing::internal.  However, this is an INTERNAL TYPE
-// and subject to change without notice, so a user MUST NOT USE THIS
-// TYPE DIRECTLY.
-struct ExcessiveArg {};
-
-// A helper class needed for implementing the ACTION* macros.
-template <typename Result, class Impl>
-class ActionHelper {
- public:
-$range i 0..n
-$for i
-
-[[
-$var template = [[$if i==0 [[]] $else [[
-$range j 0..i-1
-  template <$for j, [[typename A$j]]>
-]]]]
-$range j 0..i-1
-$var As = [[$for j, [[A$j]]]]
-$var as = [[$for j, [[std::get<$j>(args)]]]]
-$range k 1..n-i
-$var eas = [[$for k, [[ExcessiveArg()]]]]
-$var arg_list = [[$if (i==0) | (i==n) [[$as$eas]] $else [[$as, $eas]]]]
-$template
-  static Result Perform(Impl* impl, const ::std::tuple<$As>& args) {
-    return impl->template gmock_PerformImpl<$As>(args, $arg_list);
-  }
-
-]]
-};
-
-}  // namespace internal
-}  // namespace testing
-
-// The ACTION* family of macros can be used in a namespace scope to
-// define custom actions easily.  The syntax:
-//
-//   ACTION(name) { statements; }
-//
-// will define an action with the given name that executes the
-// statements.  The value returned by the statements will be used as
-// the return value of the action.  Inside the statements, you can
-// refer to the K-th (0-based) argument of the mock function by
-// 'argK', and refer to its type by 'argK_type'.  For example:
-//
-//   ACTION(IncrementArg1) {
-//     arg1_type temp = arg1;
-//     return ++(*temp);
-//   }
-//
-// allows you to write
-//
-//   ...WillOnce(IncrementArg1());
-//
-// You can also refer to the entire argument tuple and its type by
-// 'args' and 'args_type', and refer to the mock function type and its
-// return type by 'function_type' and 'return_type'.
-//
-// Note that you don't need to specify the types of the mock function
-// arguments.  However rest assured that your code is still type-safe:
-// you'll get a compiler error if *arg1 doesn't support the ++
-// operator, or if the type of ++(*arg1) isn't compatible with the
-// mock function's return type, for example.
-//
-// Sometimes you'll want to parameterize the action.   For that you can use
-// another macro:
-//
-//   ACTION_P(name, param_name) { statements; }
-//
-// For example:
-//
-//   ACTION_P(Add, n) { return arg0 + n; }
-//
-// will allow you to write:
-//
-//   ...WillOnce(Add(5));
-//
-// Note that you don't need to provide the type of the parameter
-// either.  If you need to reference the type of a parameter named
-// 'foo', you can write 'foo_type'.  For example, in the body of
-// ACTION_P(Add, n) above, you can write 'n_type' to refer to the type
-// of 'n'.
-//
-// We also provide ACTION_P2, ACTION_P3, ..., up to ACTION_P$n to support
-// multi-parameter actions.
-//
-// For the purpose of typing, you can view
-//
-//   ACTION_Pk(Foo, p1, ..., pk) { ... }
-//
-// as shorthand for
-//
-//   template <typename p1_type, ..., typename pk_type>
-//   FooActionPk<p1_type, ..., pk_type> Foo(p1_type p1, ..., pk_type pk) { ... }
-//
-// In particular, you can provide the template type arguments
-// explicitly when invoking Foo(), as in Foo<long, bool>(5, false);
-// although usually you can rely on the compiler to infer the types
-// for you automatically.  You can assign the result of expression
-// Foo(p1, ..., pk) to a variable of type FooActionPk<p1_type, ...,
-// pk_type>.  This can be useful when composing actions.
-//
-// You can also overload actions with different numbers of parameters:
-//
-//   ACTION_P(Plus, a) { ... }
-//   ACTION_P2(Plus, a, b) { ... }
-//
-// While it's tempting to always use the ACTION* macros when defining
-// a new action, you should also consider implementing ActionInterface
-// or using MakePolymorphicAction() instead, especially if you need to
-// use the action a lot.  While these approaches require more work,
-// they give you more control on the types of the mock function
-// arguments and the action parameters, which in general leads to
-// better compiler error messages that pay off in the long run.  They
-// also allow overloading actions based on parameter types (as opposed
-// to just based on the number of parameters).
-//
-// CAVEAT:
-//
-// ACTION*() can only be used in a namespace scope as templates cannot be
-// declared inside of a local class.
-// Users can, however, define any local functors (e.g. a lambda) that
-// can be used as actions.
-//
-// MORE INFORMATION:
-//
-// To learn more about using these macros, please search for 'ACTION' on
-// https://github.com/google/googletest/blob/master/googlemock/docs/cook_book.md
-
-$range i 0..n
-$range k 0..n-1
-
-// An internal macro needed for implementing ACTION*().
-#define GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_\
-    const args_type& args GTEST_ATTRIBUTE_UNUSED_
-$for k [[, \
-    const arg$k[[]]_type& arg$k GTEST_ATTRIBUTE_UNUSED_]]
-
-
-// Sometimes you want to give an action explicit template parameters
-// that cannot be inferred from its value parameters.  ACTION() and
-// ACTION_P*() don't support that.  ACTION_TEMPLATE() remedies that
-// and can be viewed as an extension to ACTION() and ACTION_P*().
-//
-// The syntax:
-//
-//   ACTION_TEMPLATE(ActionName,
-//                   HAS_m_TEMPLATE_PARAMS(kind1, name1, ..., kind_m, name_m),
-//                   AND_n_VALUE_PARAMS(p1, ..., p_n)) { statements; }
-//
-// defines an action template that takes m explicit template
-// parameters and n value parameters.  name_i is the name of the i-th
-// template parameter, and kind_i specifies whether it's a typename,
-// an integral constant, or a template.  p_i is the name of the i-th
-// value parameter.
-//
-// Example:
-//
-//   // DuplicateArg<k, T>(output) converts the k-th argument of the mock
-//   // function to type T and copies it to *output.
-//   ACTION_TEMPLATE(DuplicateArg,
-//                   HAS_2_TEMPLATE_PARAMS(int, k, typename, T),
-//                   AND_1_VALUE_PARAMS(output)) {
-//     *output = T(::std::get<k>(args));
-//   }
-//   ...
-//     int n;
-//     EXPECT_CALL(mock, Foo(_, _))
-//         .WillOnce(DuplicateArg<1, unsigned char>(&n));
-//
-// To create an instance of an action template, write:
-//
-//   ActionName<t1, ..., t_m>(v1, ..., v_n)
-//
-// where the ts are the template arguments and the vs are the value
-// arguments.  The value argument types are inferred by the compiler.
-// If you want to explicitly specify the value argument types, you can
-// provide additional template arguments:
-//
-//   ActionName<t1, ..., t_m, u1, ..., u_k>(v1, ..., v_n)
-//
-// where u_i is the desired type of v_i.
-//
-// ACTION_TEMPLATE and ACTION/ACTION_P* can be overloaded on the
-// number of value parameters, but not on the number of template
-// parameters.  Without the restriction, the meaning of the following
-// is unclear:
-//
-//   OverloadedAction<int, bool>(x);
-//
-// Are we using a single-template-parameter action where 'bool' refers
-// to the type of x, or are we using a two-template-parameter action
-// where the compiler is asked to infer the type of x?
-//
-// Implementation notes:
-//
-// GMOCK_INTERNAL_*_HAS_m_TEMPLATE_PARAMS and
-// GMOCK_INTERNAL_*_AND_n_VALUE_PARAMS are internal macros for
-// implementing ACTION_TEMPLATE.  The main trick we use is to create
-// new macro invocations when expanding a macro.  For example, we have
-//
-//   #define ACTION_TEMPLATE(name, template_params, value_params)
-//       ... GMOCK_INTERNAL_DECL_##template_params ...
-//
-// which causes ACTION_TEMPLATE(..., HAS_1_TEMPLATE_PARAMS(typename, T), ...)
-// to expand to
-//
-//       ... GMOCK_INTERNAL_DECL_HAS_1_TEMPLATE_PARAMS(typename, T) ...
-//
-// Since GMOCK_INTERNAL_DECL_HAS_1_TEMPLATE_PARAMS is a macro, the
-// preprocessor will continue to expand it to
-//
-//       ... typename T ...
-//
-// This technique conforms to the C++ standard and is portable.  It
-// allows us to implement action templates using O(N) code, where N is
-// the maximum number of template/value parameters supported.  Without
-// using it, we'd have to devote O(N^2) amount of code to implement all
-// combinations of m and n.
-
-// Declares the template parameters.
-
-$range j 1..n
-$for j [[
-$range m 0..j-1
-#define GMOCK_INTERNAL_DECL_HAS_$j[[]]
-_TEMPLATE_PARAMS($for m, [[kind$m, name$m]]) $for m, [[kind$m name$m]]
-
-
-]]
-
-// Lists the template parameters.
-
-$for j [[
-$range m 0..j-1
-#define GMOCK_INTERNAL_LIST_HAS_$j[[]]
-_TEMPLATE_PARAMS($for m, [[kind$m, name$m]]) $for m, [[name$m]]
-
-
-]]
-
-// Declares the types of value parameters.
-
-$for i [[
-$range j 0..i-1
-#define GMOCK_INTERNAL_DECL_TYPE_AND_$i[[]]
-_VALUE_PARAMS($for j, [[p$j]]) $for j [[, typename p$j##_type]]
-
-
-]]
-
-// Initializes the value parameters.
-
-$for i [[
-$range j 0..i-1
-#define GMOCK_INTERNAL_INIT_AND_$i[[]]_VALUE_PARAMS($for j, [[p$j]])\
-    ($for j, [[p$j##_type gmock_p$j]])$if i>0 [[ : ]]$for j, [[p$j(::std::move(gmock_p$j))]]
-
-
-]]
-
-// Declares the fields for storing the value parameters.
-
-$for i [[
-$range j 0..i-1
-#define GMOCK_INTERNAL_DEFN_AND_$i[[]]
-_VALUE_PARAMS($for j, [[p$j]]) $for j [[p$j##_type p$j; ]]
-
-
-]]
-
-// Lists the value parameters.
-
-$for i [[
-$range j 0..i-1
-#define GMOCK_INTERNAL_LIST_AND_$i[[]]
-_VALUE_PARAMS($for j, [[p$j]]) $for j, [[p$j]]
-
-
-]]
-
-// Lists the value parameter types.
-
-$for i [[
-$range j 0..i-1
-#define GMOCK_INTERNAL_LIST_TYPE_AND_$i[[]]
-_VALUE_PARAMS($for j, [[p$j]]) $for j [[, p$j##_type]]
-
-
-]]
-
-// Declares the value parameters.
-
-$for i [[
-$range j 0..i-1
-#define GMOCK_INTERNAL_DECL_AND_$i[[]]_VALUE_PARAMS($for j, [[p$j]]) [[]]
-$for j, [[p$j##_type p$j]]
-
-
-]]
-
-// The suffix of the class template implementing the action template.
-$for i [[
-
-
-$range j 0..i-1
-#define GMOCK_INTERNAL_COUNT_AND_$i[[]]_VALUE_PARAMS($for j, [[p$j]]) [[]]
-$if i==1 [[P]] $elif i>=2 [[P$i]]
-]]
-
-
-// The name of the class template implementing the action template.
-#define GMOCK_ACTION_CLASS_(name, value_params)\
-    GTEST_CONCAT_TOKEN_(name##Action, GMOCK_INTERNAL_COUNT_##value_params)
-
-$range k 0..n-1
-
-#define ACTION_TEMPLATE(name, template_params, value_params)\
-  template <GMOCK_INTERNAL_DECL_##template_params\
-            GMOCK_INTERNAL_DECL_TYPE_##value_params>\
-  class GMOCK_ACTION_CLASS_(name, value_params) {\
-   public:\
-    explicit GMOCK_ACTION_CLASS_(name, value_params)\
-        GMOCK_INTERNAL_INIT_##value_params {}\
-    template <typename F>\
-    class gmock_Impl : public ::testing::ActionInterface<F> {\
-     public:\
-      typedef F function_type;\
-      typedef typename ::testing::internal::Function<F>::Result return_type;\
-      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
-          args_type;\
-      explicit gmock_Impl GMOCK_INTERNAL_INIT_##value_params {}\
-      virtual return_type Perform(const args_type& args) {\
-        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
-            Perform(this, args);\
-      }\
-      template <$for k, [[typename arg$k[[]]_type]]>\
-      return_type gmock_PerformImpl(const args_type& args[[]]
-$for k [[, const arg$k[[]]_type& arg$k]]) const;\
-      GMOCK_INTERNAL_DEFN_##value_params\
-     private:\
-      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
-    };\
-    template <typename F> operator ::testing::Action<F>() const {\
-      return ::testing::Action<F>(\
-          new gmock_Impl<F>(GMOCK_INTERNAL_LIST_##value_params));\
-    }\
-    GMOCK_INTERNAL_DEFN_##value_params\
-   private:\
-    GTEST_DISALLOW_ASSIGN_(GMOCK_ACTION_CLASS_(name, value_params));\
-  };\
-  template <GMOCK_INTERNAL_DECL_##template_params\
-            GMOCK_INTERNAL_DECL_TYPE_##value_params>\
-  inline GMOCK_ACTION_CLASS_(name, value_params)<\
-      GMOCK_INTERNAL_LIST_##template_params\
-      GMOCK_INTERNAL_LIST_TYPE_##value_params> name(\
-          GMOCK_INTERNAL_DECL_##value_params) {\
-    return GMOCK_ACTION_CLASS_(name, value_params)<\
-        GMOCK_INTERNAL_LIST_##template_params\
-        GMOCK_INTERNAL_LIST_TYPE_##value_params>(\
-            GMOCK_INTERNAL_LIST_##value_params);\
-  }\
-  template <GMOCK_INTERNAL_DECL_##template_params\
-            GMOCK_INTERNAL_DECL_TYPE_##value_params>\
-  template <typename F>\
-  template <typename arg0_type, typename arg1_type, typename arg2_type, \
-      typename arg3_type, typename arg4_type, typename arg5_type, \
-      typename arg6_type, typename arg7_type, typename arg8_type, \
-      typename arg9_type>\
-  typename ::testing::internal::Function<F>::Result\
-      GMOCK_ACTION_CLASS_(name, value_params)<\
-          GMOCK_INTERNAL_LIST_##template_params\
-          GMOCK_INTERNAL_LIST_TYPE_##value_params>::gmock_Impl<F>::\
-              gmock_PerformImpl(\
-          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
-
-$for i
-
-[[
-$var template = [[$if i==0 [[]] $else [[
-$range j 0..i-1
-
-  template <$for j, [[typename p$j##_type]]>\
-]]]]
-$var class_name = [[name##Action[[$if i==0 [[]] $elif i==1 [[P]]
-                                                $else [[P$i]]]]]]
-$range j 0..i-1
-$var ctor_param_list = [[$for j, [[p$j##_type gmock_p$j]]]]
-$var param_types_and_names = [[$for j, [[p$j##_type p$j]]]]
-$var inits = [[$if i==0 [[]] $else [[ : $for j, [[p$j(::std::forward<p$j##_type>(gmock_p$j))]]]]]]
-$var param_field_decls = [[$for j
-[[
-
-      p$j##_type p$j;\
-]]]]
-$var param_field_decls2 = [[$for j
-[[
-
-    p$j##_type p$j;\
-]]]]
-$var params = [[$for j, [[p$j]]]]
-$var param_types = [[$if i==0 [[]] $else [[<$for j, [[p$j##_type]]>]]]]
-$var typename_arg_types = [[$for k, [[typename arg$k[[]]_type]]]]
-$var arg_types_and_names = [[$for k, [[const arg$k[[]]_type& arg$k]]]]
-$var macro_name = [[$if i==0 [[ACTION]] $elif i==1 [[ACTION_P]]
-                                        $else [[ACTION_P$i]]]]
-
-#define $macro_name(name$for j [[, p$j]])\$template
-  class $class_name {\
-   public:\
-    [[$if i==1 [[explicit ]]]]$class_name($ctor_param_list)$inits {}\
-    template <typename F>\
-    class gmock_Impl : public ::testing::ActionInterface<F> {\
-     public:\
-      typedef F function_type;\
-      typedef typename ::testing::internal::Function<F>::Result return_type;\
-      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
-          args_type;\
-      [[$if i==1 [[explicit ]]]]gmock_Impl($ctor_param_list)$inits {}\
-      virtual return_type Perform(const args_type& args) {\
-        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
-            Perform(this, args);\
-      }\
-      template <$typename_arg_types>\
-      return_type gmock_PerformImpl(const args_type& args, [[]]
-$arg_types_and_names) const;\$param_field_decls
-     private:\
-      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
-    };\
-    template <typename F> operator ::testing::Action<F>() const {\
-      return ::testing::Action<F>(new gmock_Impl<F>($params));\
-    }\$param_field_decls2
-   private:\
-    GTEST_DISALLOW_ASSIGN_($class_name);\
-  };\$template
-  inline $class_name$param_types name($param_types_and_names) {\
-    return $class_name$param_types($params);\
-  }\$template
-  template <typename F>\
-  template <$typename_arg_types>\
-  typename ::testing::internal::Function<F>::Result\
-      $class_name$param_types::gmock_Impl<F>::gmock_PerformImpl(\
-          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
-]]
-$$ }  // This meta comment fixes auto-indentation in Emacs.  It won't
-$$    // show up in the generated code.
-
-
-namespace testing {
-
-
-// The ACTION*() macros trigger warning C4100 (unreferenced formal
-// parameter) in MSVC with -W4.  Unfortunately they cannot be fixed in
-// the macro definition, as the warnings are generated when the macro
-// is expanded and macro expansion cannot contain #pragma.  Therefore
-// we suppress them here.
-#ifdef _MSC_VER
-# pragma warning(push)
-# pragma warning(disable:4100)
-#endif
-
-// Various overloads for InvokeArgument<N>().
-//
-// The InvokeArgument<N>(a1, a2, ..., a_k) action invokes the N-th
-// (0-based) argument, which must be a k-ary callable, of the mock
-// function, with arguments a1, a2, ..., a_k.
-//
-// Notes:
-//
-//   1. The arguments are passed by value by default.  If you need to
-//   pass an argument by reference, wrap it inside ByRef().  For
-//   example,
-//
-//     InvokeArgument<1>(5, string("Hello"), ByRef(foo))
-//
-//   passes 5 and string("Hello") by value, and passes foo by
-//   reference.
-//
-//   2. If the callable takes an argument by reference but ByRef() is
-//   not used, it will receive the reference to a copy of the value,
-//   instead of the original value.  For example, when the 0-th
-//   argument of the mock function takes a const string&, the action
-//
-//     InvokeArgument<0>(string("Hello"))
-//
-//   makes a copy of the temporary string("Hello") object and passes a
-//   reference of the copy, instead of the original temporary object,
-//   to the callable.  This makes it easy for a user to define an
-//   InvokeArgument action from temporary values and have it performed
-//   later.
-
-namespace internal {
-namespace invoke_argument {
-
-// Appears in InvokeArgumentAdl's argument list to help avoid
-// accidental calls to user functions of the same name.
-struct AdlTag {};
-
-// InvokeArgumentAdl - a helper for InvokeArgument.
-// The basic overloads are provided here for generic functors.
-// Overloads for other custom-callables are provided in the
-// internal/custom/callback-actions.h header.
-
-$range i 0..n
-$for i
-[[
-$range j 1..i
-
-template <typename R, typename F[[$for j [[, typename A$j]]]]>
-R InvokeArgumentAdl(AdlTag, F f[[$for j [[, A$j a$j]]]]) {
-  return f([[$for j, [[a$j]]]]);
-}
-]]
-
-}  // namespace invoke_argument
-}  // namespace internal
-
-$range i 0..n
-$for i [[
-$range j 0..i-1
-
-ACTION_TEMPLATE(InvokeArgument,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_$i[[]]_VALUE_PARAMS($for j, [[p$j]])) {
-  using internal::invoke_argument::InvokeArgumentAdl;
-  return InvokeArgumentAdl<return_type>(
-      internal::invoke_argument::AdlTag(),
-      ::std::get<k>(args)$for j [[, p$j]]);
-}
-
-]]
-
-// Various overloads for ReturnNew<T>().
-//
-// The ReturnNew<T>(a1, a2, ..., a_k) action returns a pointer to a new
-// instance of type T, constructed on the heap with constructor arguments
-// a1, a2, ..., and a_k. The caller assumes ownership of the returned value.
-$range i 0..n
-$for i [[
-$range j 0..i-1
-$var ps = [[$for j, [[p$j]]]]
-
-ACTION_TEMPLATE(ReturnNew,
-                HAS_1_TEMPLATE_PARAMS(typename, T),
-                AND_$i[[]]_VALUE_PARAMS($ps)) {
-  return new T($ps);
-}
-
-]]
-
-#ifdef _MSC_VER
-# pragma warning(pop)
-#endif
-
-}  // namespace testing
-
-// Include any custom callback actions added by the local installation.
-// We must include this header at the end to make sure it can use the
-// declarations from this file.
-#include "gmock/internal/custom/gmock-generated-actions.h"
-
-#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-generated-function-mockers.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-generated-function-mockers.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-generated-function-mockers.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-generated-function-mockers.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,752 +0,0 @@
-// This file was GENERATED by command:
-//     pump.py gmock-generated-function-mockers.h.pump
-// DO NOT EDIT BY HAND!!!
-
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file implements function mockers of various arities.
-
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_FUNCTION_MOCKERS_H_
-#define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_FUNCTION_MOCKERS_H_
-
-#include <functional>
-#include <utility>
-
-#include "gmock/gmock-spec-builders.h"
-#include "gmock/internal/gmock-internal-utils.h"
-
-namespace testing {
-namespace internal {
-// Removes the given pointer; this is a helper for the expectation setter method
-// for parameterless matchers.
-//
-// We want to make sure that the user cannot set a parameterless expectation on
-// overloaded methods, including methods which are overloaded on const. Example:
-//
-//   class MockClass {
-//     MOCK_METHOD0(GetName, string&());
-//     MOCK_CONST_METHOD0(GetName, const string&());
-//   };
-//
-//   TEST() {
-//     // This should be an error, as it's not clear which overload is expected.
-//     EXPECT_CALL(mock, GetName).WillOnce(ReturnRef(value));
-//   }
-//
-// Here are the generated expectation-setter methods:
-//
-//   class MockClass {
-//     // Overload 1
-//     MockSpec<string&()> gmock_GetName() { ... }
-//     // Overload 2. Declared const so that the compiler will generate an
-//     // error when trying to resolve between this and overload 4 in
-//     // 'gmock_GetName(WithoutMatchers(), nullptr)'.
-//     MockSpec<string&()> gmock_GetName(
-//         const WithoutMatchers&, const Function<string&()>*) const {
-//       // Removes const from this, calls overload 1
-//       return AdjustConstness_(this)->gmock_GetName();
-//     }
-//
-//     // Overload 3
-//     const string& gmock_GetName() const { ... }
-//     // Overload 4
-//     MockSpec<const string&()> gmock_GetName(
-//         const WithoutMatchers&, const Function<const string&()>*) const {
-//       // Does not remove const, calls overload 3
-//       return AdjustConstness_const(this)->gmock_GetName();
-//     }
-//   }
-//
-template <typename MockType>
-const MockType* AdjustConstness_const(const MockType* mock) {
-  return mock;
-}
-
-// Removes const from and returns the given pointer; this is a helper for the
-// expectation setter method for parameterless matchers.
-template <typename MockType>
-MockType* AdjustConstness_(const MockType* mock) {
-  return const_cast<MockType*>(mock);
-}
-
-}  // namespace internal
-
-// The style guide prohibits "using" statements in a namespace scope
-// inside a header file.  However, the FunctionMocker class template
-// is meant to be defined in the ::testing namespace.  The following
-// line is just a trick for working around a bug in MSVC 8.0, which
-// cannot handle it if we define FunctionMocker in ::testing.
-using internal::FunctionMocker;
-
-// GMOCK_RESULT_(tn, F) expands to the result type of function type F.
-// We define this as a variadic macro in case F contains unprotected
-// commas (the same reason that we use variadic macros in other places
-// in this file).
-// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
-#define GMOCK_RESULT_(tn, ...) \
-    tn ::testing::internal::Function<__VA_ARGS__>::Result
-
-// The type of argument N of the given function type.
-// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
-#define GMOCK_ARG_(tn, N, ...) \
-    tn ::testing::internal::Function<__VA_ARGS__>::template Arg<N-1>::type
-
-// The matcher type for argument N of the given function type.
-// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
-#define GMOCK_MATCHER_(tn, N, ...) \
-    const ::testing::Matcher<GMOCK_ARG_(tn, N, __VA_ARGS__)>&
-
-// The variable for mocking the given method.
-// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
-#define GMOCK_MOCKER_(arity, constness, Method) \
-    GTEST_CONCAT_TOKEN_(gmock##constness##arity##_##Method##_, __LINE__)
-
-// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
-#define GMOCK_METHOD0_(tn, constness, ct, Method, ...) \
-  static_assert(0 == \
-      ::testing::internal::Function<__VA_ARGS__>::ArgumentCount, \
-      "MOCK_METHOD<N> must match argument count.");\
-  GMOCK_RESULT_(tn, __VA_ARGS__) ct Method( \
-      ) constness { \
-    GMOCK_MOCKER_(0, constness, Method).SetOwnerAndName(this, #Method); \
-    return GMOCK_MOCKER_(0, constness, Method).Invoke(); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> \
-      gmock_##Method() constness { \
-    GMOCK_MOCKER_(0, constness, Method).RegisterOwner(this); \
-    return GMOCK_MOCKER_(0, constness, Method).With(); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> gmock_##Method( \
-      const ::testing::internal::WithoutMatchers&, \
-      constness ::testing::internal::Function<__VA_ARGS__>* ) const { \
-        return ::testing::internal::AdjustConstness_##constness(this)-> \
-            gmock_##Method(); \
-      } \
-  mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_MOCKER_(0, constness, \
-      Method)
-
-// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
-#define GMOCK_METHOD1_(tn, constness, ct, Method, ...) \
-  static_assert(1 == \
-      ::testing::internal::Function<__VA_ARGS__>::ArgumentCount, \
-      "MOCK_METHOD<N> must match argument count.");\
-  GMOCK_RESULT_(tn, __VA_ARGS__) ct Method( \
-      GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1) constness { \
-    GMOCK_MOCKER_(1, constness, Method).SetOwnerAndName(this, #Method); \
-    return GMOCK_MOCKER_(1, constness, \
-        Method).Invoke(::std::forward<GMOCK_ARG_(tn, 1, \
-        __VA_ARGS__)>(gmock_a1)); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> \
-      gmock_##Method(GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1) constness { \
-    GMOCK_MOCKER_(1, constness, Method).RegisterOwner(this); \
-    return GMOCK_MOCKER_(1, constness, Method).With(gmock_a1); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> gmock_##Method( \
-      const ::testing::internal::WithoutMatchers&, \
-      constness ::testing::internal::Function<__VA_ARGS__>* ) const { \
-        return ::testing::internal::AdjustConstness_##constness(this)-> \
-            gmock_##Method(::testing::A<GMOCK_ARG_(tn, 1, __VA_ARGS__)>()); \
-      } \
-  mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_MOCKER_(1, constness, \
-      Method)
-
-// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
-#define GMOCK_METHOD2_(tn, constness, ct, Method, ...) \
-  static_assert(2 == \
-      ::testing::internal::Function<__VA_ARGS__>::ArgumentCount, \
-      "MOCK_METHOD<N> must match argument count.");\
-  GMOCK_RESULT_(tn, __VA_ARGS__) ct Method( \
-      GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1, GMOCK_ARG_(tn, 2, \
-          __VA_ARGS__) gmock_a2) constness { \
-    GMOCK_MOCKER_(2, constness, Method).SetOwnerAndName(this, #Method); \
-    return GMOCK_MOCKER_(2, constness, \
-        Method).Invoke(::std::forward<GMOCK_ARG_(tn, 1, \
-        __VA_ARGS__)>(gmock_a1), \
-  ::std::forward<GMOCK_ARG_(tn, 2, __VA_ARGS__)>(gmock_a2)); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> \
-      gmock_##Method(GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1, \
-                     GMOCK_MATCHER_(tn, 2, __VA_ARGS__) gmock_a2) constness { \
-    GMOCK_MOCKER_(2, constness, Method).RegisterOwner(this); \
-    return GMOCK_MOCKER_(2, constness, Method).With(gmock_a1, gmock_a2); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> gmock_##Method( \
-      const ::testing::internal::WithoutMatchers&, \
-      constness ::testing::internal::Function<__VA_ARGS__>* ) const { \
-        return ::testing::internal::AdjustConstness_##constness(this)-> \
-            gmock_##Method(::testing::A<GMOCK_ARG_(tn, 1, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 2, __VA_ARGS__)>()); \
-      } \
-  mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_MOCKER_(2, constness, \
-      Method)
-
-// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
-#define GMOCK_METHOD3_(tn, constness, ct, Method, ...) \
-  static_assert(3 == \
-      ::testing::internal::Function<__VA_ARGS__>::ArgumentCount, \
-      "MOCK_METHOD<N> must match argument count.");\
-  GMOCK_RESULT_(tn, __VA_ARGS__) ct Method( \
-      GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1, GMOCK_ARG_(tn, 2, \
-          __VA_ARGS__) gmock_a2, GMOCK_ARG_(tn, 3, \
-          __VA_ARGS__) gmock_a3) constness { \
-    GMOCK_MOCKER_(3, constness, Method).SetOwnerAndName(this, #Method); \
-    return GMOCK_MOCKER_(3, constness, \
-        Method).Invoke(::std::forward<GMOCK_ARG_(tn, 1, \
-        __VA_ARGS__)>(gmock_a1), \
-  ::std::forward<GMOCK_ARG_(tn, 2, __VA_ARGS__)>(gmock_a2), \
-  ::std::forward<GMOCK_ARG_(tn, 3, __VA_ARGS__)>(gmock_a3)); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> \
-      gmock_##Method(GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1, \
-                     GMOCK_MATCHER_(tn, 2, __VA_ARGS__) gmock_a2, \
-                     GMOCK_MATCHER_(tn, 3, __VA_ARGS__) gmock_a3) constness { \
-    GMOCK_MOCKER_(3, constness, Method).RegisterOwner(this); \
-    return GMOCK_MOCKER_(3, constness, Method).With(gmock_a1, gmock_a2, \
-        gmock_a3); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> gmock_##Method( \
-      const ::testing::internal::WithoutMatchers&, \
-      constness ::testing::internal::Function<__VA_ARGS__>* ) const { \
-        return ::testing::internal::AdjustConstness_##constness(this)-> \
-            gmock_##Method(::testing::A<GMOCK_ARG_(tn, 1, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 2, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 3, __VA_ARGS__)>()); \
-      } \
-  mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_MOCKER_(3, constness, \
-      Method)
-
-// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
-#define GMOCK_METHOD4_(tn, constness, ct, Method, ...) \
-  static_assert(4 == \
-      ::testing::internal::Function<__VA_ARGS__>::ArgumentCount, \
-      "MOCK_METHOD<N> must match argument count.");\
-  GMOCK_RESULT_(tn, __VA_ARGS__) ct Method( \
-      GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1, GMOCK_ARG_(tn, 2, \
-          __VA_ARGS__) gmock_a2, GMOCK_ARG_(tn, 3, __VA_ARGS__) gmock_a3, \
-          GMOCK_ARG_(tn, 4, __VA_ARGS__) gmock_a4) constness { \
-    GMOCK_MOCKER_(4, constness, Method).SetOwnerAndName(this, #Method); \
-    return GMOCK_MOCKER_(4, constness, \
-        Method).Invoke(::std::forward<GMOCK_ARG_(tn, 1, \
-        __VA_ARGS__)>(gmock_a1), \
-  ::std::forward<GMOCK_ARG_(tn, 2, __VA_ARGS__)>(gmock_a2), \
-  ::std::forward<GMOCK_ARG_(tn, 3, __VA_ARGS__)>(gmock_a3), \
-  ::std::forward<GMOCK_ARG_(tn, 4, __VA_ARGS__)>(gmock_a4)); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> \
-      gmock_##Method(GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1, \
-                     GMOCK_MATCHER_(tn, 2, __VA_ARGS__) gmock_a2, \
-                     GMOCK_MATCHER_(tn, 3, __VA_ARGS__) gmock_a3, \
-                     GMOCK_MATCHER_(tn, 4, __VA_ARGS__) gmock_a4) constness { \
-    GMOCK_MOCKER_(4, constness, Method).RegisterOwner(this); \
-    return GMOCK_MOCKER_(4, constness, Method).With(gmock_a1, gmock_a2, \
-        gmock_a3, gmock_a4); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> gmock_##Method( \
-      const ::testing::internal::WithoutMatchers&, \
-      constness ::testing::internal::Function<__VA_ARGS__>* ) const { \
-        return ::testing::internal::AdjustConstness_##constness(this)-> \
-            gmock_##Method(::testing::A<GMOCK_ARG_(tn, 1, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 2, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 3, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 4, __VA_ARGS__)>()); \
-      } \
-  mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_MOCKER_(4, constness, \
-      Method)
-
-// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
-#define GMOCK_METHOD5_(tn, constness, ct, Method, ...) \
-  static_assert(5 == \
-      ::testing::internal::Function<__VA_ARGS__>::ArgumentCount, \
-      "MOCK_METHOD<N> must match argument count.");\
-  GMOCK_RESULT_(tn, __VA_ARGS__) ct Method( \
-      GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1, GMOCK_ARG_(tn, 2, \
-          __VA_ARGS__) gmock_a2, GMOCK_ARG_(tn, 3, __VA_ARGS__) gmock_a3, \
-          GMOCK_ARG_(tn, 4, __VA_ARGS__) gmock_a4, GMOCK_ARG_(tn, 5, \
-          __VA_ARGS__) gmock_a5) constness { \
-    GMOCK_MOCKER_(5, constness, Method).SetOwnerAndName(this, #Method); \
-    return GMOCK_MOCKER_(5, constness, \
-        Method).Invoke(::std::forward<GMOCK_ARG_(tn, 1, \
-        __VA_ARGS__)>(gmock_a1), \
-  ::std::forward<GMOCK_ARG_(tn, 2, __VA_ARGS__)>(gmock_a2), \
-  ::std::forward<GMOCK_ARG_(tn, 3, __VA_ARGS__)>(gmock_a3), \
-  ::std::forward<GMOCK_ARG_(tn, 4, __VA_ARGS__)>(gmock_a4), \
-  ::std::forward<GMOCK_ARG_(tn, 5, __VA_ARGS__)>(gmock_a5)); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> \
-      gmock_##Method(GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1, \
-                     GMOCK_MATCHER_(tn, 2, __VA_ARGS__) gmock_a2, \
-                     GMOCK_MATCHER_(tn, 3, __VA_ARGS__) gmock_a3, \
-                     GMOCK_MATCHER_(tn, 4, __VA_ARGS__) gmock_a4, \
-                     GMOCK_MATCHER_(tn, 5, __VA_ARGS__) gmock_a5) constness { \
-    GMOCK_MOCKER_(5, constness, Method).RegisterOwner(this); \
-    return GMOCK_MOCKER_(5, constness, Method).With(gmock_a1, gmock_a2, \
-        gmock_a3, gmock_a4, gmock_a5); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> gmock_##Method( \
-      const ::testing::internal::WithoutMatchers&, \
-      constness ::testing::internal::Function<__VA_ARGS__>* ) const { \
-        return ::testing::internal::AdjustConstness_##constness(this)-> \
-            gmock_##Method(::testing::A<GMOCK_ARG_(tn, 1, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 2, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 3, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 4, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 5, __VA_ARGS__)>()); \
-      } \
-  mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_MOCKER_(5, constness, \
-      Method)
-
-// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
-#define GMOCK_METHOD6_(tn, constness, ct, Method, ...) \
-  static_assert(6 == \
-      ::testing::internal::Function<__VA_ARGS__>::ArgumentCount, \
-      "MOCK_METHOD<N> must match argument count.");\
-  GMOCK_RESULT_(tn, __VA_ARGS__) ct Method( \
-      GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1, GMOCK_ARG_(tn, 2, \
-          __VA_ARGS__) gmock_a2, GMOCK_ARG_(tn, 3, __VA_ARGS__) gmock_a3, \
-          GMOCK_ARG_(tn, 4, __VA_ARGS__) gmock_a4, GMOCK_ARG_(tn, 5, \
-          __VA_ARGS__) gmock_a5, GMOCK_ARG_(tn, 6, \
-          __VA_ARGS__) gmock_a6) constness { \
-    GMOCK_MOCKER_(6, constness, Method).SetOwnerAndName(this, #Method); \
-    return GMOCK_MOCKER_(6, constness, \
-        Method).Invoke(::std::forward<GMOCK_ARG_(tn, 1, \
-        __VA_ARGS__)>(gmock_a1), \
-  ::std::forward<GMOCK_ARG_(tn, 2, __VA_ARGS__)>(gmock_a2), \
-  ::std::forward<GMOCK_ARG_(tn, 3, __VA_ARGS__)>(gmock_a3), \
-  ::std::forward<GMOCK_ARG_(tn, 4, __VA_ARGS__)>(gmock_a4), \
-  ::std::forward<GMOCK_ARG_(tn, 5, __VA_ARGS__)>(gmock_a5), \
-  ::std::forward<GMOCK_ARG_(tn, 6, __VA_ARGS__)>(gmock_a6)); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> \
-      gmock_##Method(GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1, \
-                     GMOCK_MATCHER_(tn, 2, __VA_ARGS__) gmock_a2, \
-                     GMOCK_MATCHER_(tn, 3, __VA_ARGS__) gmock_a3, \
-                     GMOCK_MATCHER_(tn, 4, __VA_ARGS__) gmock_a4, \
-                     GMOCK_MATCHER_(tn, 5, __VA_ARGS__) gmock_a5, \
-                     GMOCK_MATCHER_(tn, 6, __VA_ARGS__) gmock_a6) constness { \
-    GMOCK_MOCKER_(6, constness, Method).RegisterOwner(this); \
-    return GMOCK_MOCKER_(6, constness, Method).With(gmock_a1, gmock_a2, \
-        gmock_a3, gmock_a4, gmock_a5, gmock_a6); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> gmock_##Method( \
-      const ::testing::internal::WithoutMatchers&, \
-      constness ::testing::internal::Function<__VA_ARGS__>* ) const { \
-        return ::testing::internal::AdjustConstness_##constness(this)-> \
-            gmock_##Method(::testing::A<GMOCK_ARG_(tn, 1, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 2, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 3, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 4, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 5, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 6, __VA_ARGS__)>()); \
-      } \
-  mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_MOCKER_(6, constness, \
-      Method)
-
-// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
-#define GMOCK_METHOD7_(tn, constness, ct, Method, ...) \
-  static_assert(7 == \
-      ::testing::internal::Function<__VA_ARGS__>::ArgumentCount, \
-      "MOCK_METHOD<N> must match argument count.");\
-  GMOCK_RESULT_(tn, __VA_ARGS__) ct Method( \
-      GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1, GMOCK_ARG_(tn, 2, \
-          __VA_ARGS__) gmock_a2, GMOCK_ARG_(tn, 3, __VA_ARGS__) gmock_a3, \
-          GMOCK_ARG_(tn, 4, __VA_ARGS__) gmock_a4, GMOCK_ARG_(tn, 5, \
-          __VA_ARGS__) gmock_a5, GMOCK_ARG_(tn, 6, __VA_ARGS__) gmock_a6, \
-          GMOCK_ARG_(tn, 7, __VA_ARGS__) gmock_a7) constness { \
-    GMOCK_MOCKER_(7, constness, Method).SetOwnerAndName(this, #Method); \
-    return GMOCK_MOCKER_(7, constness, \
-        Method).Invoke(::std::forward<GMOCK_ARG_(tn, 1, \
-        __VA_ARGS__)>(gmock_a1), \
-  ::std::forward<GMOCK_ARG_(tn, 2, __VA_ARGS__)>(gmock_a2), \
-  ::std::forward<GMOCK_ARG_(tn, 3, __VA_ARGS__)>(gmock_a3), \
-  ::std::forward<GMOCK_ARG_(tn, 4, __VA_ARGS__)>(gmock_a4), \
-  ::std::forward<GMOCK_ARG_(tn, 5, __VA_ARGS__)>(gmock_a5), \
-  ::std::forward<GMOCK_ARG_(tn, 6, __VA_ARGS__)>(gmock_a6), \
-  ::std::forward<GMOCK_ARG_(tn, 7, __VA_ARGS__)>(gmock_a7)); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> \
-      gmock_##Method(GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1, \
-                     GMOCK_MATCHER_(tn, 2, __VA_ARGS__) gmock_a2, \
-                     GMOCK_MATCHER_(tn, 3, __VA_ARGS__) gmock_a3, \
-                     GMOCK_MATCHER_(tn, 4, __VA_ARGS__) gmock_a4, \
-                     GMOCK_MATCHER_(tn, 5, __VA_ARGS__) gmock_a5, \
-                     GMOCK_MATCHER_(tn, 6, __VA_ARGS__) gmock_a6, \
-                     GMOCK_MATCHER_(tn, 7, __VA_ARGS__) gmock_a7) constness { \
-    GMOCK_MOCKER_(7, constness, Method).RegisterOwner(this); \
-    return GMOCK_MOCKER_(7, constness, Method).With(gmock_a1, gmock_a2, \
-        gmock_a3, gmock_a4, gmock_a5, gmock_a6, gmock_a7); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> gmock_##Method( \
-      const ::testing::internal::WithoutMatchers&, \
-      constness ::testing::internal::Function<__VA_ARGS__>* ) const { \
-        return ::testing::internal::AdjustConstness_##constness(this)-> \
-            gmock_##Method(::testing::A<GMOCK_ARG_(tn, 1, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 2, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 3, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 4, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 5, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 6, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 7, __VA_ARGS__)>()); \
-      } \
-  mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_MOCKER_(7, constness, \
-      Method)
-
-// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
-#define GMOCK_METHOD8_(tn, constness, ct, Method, ...) \
-  static_assert(8 == \
-      ::testing::internal::Function<__VA_ARGS__>::ArgumentCount, \
-      "MOCK_METHOD<N> must match argument count.");\
-  GMOCK_RESULT_(tn, __VA_ARGS__) ct Method( \
-      GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1, GMOCK_ARG_(tn, 2, \
-          __VA_ARGS__) gmock_a2, GMOCK_ARG_(tn, 3, __VA_ARGS__) gmock_a3, \
-          GMOCK_ARG_(tn, 4, __VA_ARGS__) gmock_a4, GMOCK_ARG_(tn, 5, \
-          __VA_ARGS__) gmock_a5, GMOCK_ARG_(tn, 6, __VA_ARGS__) gmock_a6, \
-          GMOCK_ARG_(tn, 7, __VA_ARGS__) gmock_a7, GMOCK_ARG_(tn, 8, \
-          __VA_ARGS__) gmock_a8) constness { \
-    GMOCK_MOCKER_(8, constness, Method).SetOwnerAndName(this, #Method); \
-    return GMOCK_MOCKER_(8, constness, \
-        Method).Invoke(::std::forward<GMOCK_ARG_(tn, 1, \
-        __VA_ARGS__)>(gmock_a1), \
-  ::std::forward<GMOCK_ARG_(tn, 2, __VA_ARGS__)>(gmock_a2), \
-  ::std::forward<GMOCK_ARG_(tn, 3, __VA_ARGS__)>(gmock_a3), \
-  ::std::forward<GMOCK_ARG_(tn, 4, __VA_ARGS__)>(gmock_a4), \
-  ::std::forward<GMOCK_ARG_(tn, 5, __VA_ARGS__)>(gmock_a5), \
-  ::std::forward<GMOCK_ARG_(tn, 6, __VA_ARGS__)>(gmock_a6), \
-  ::std::forward<GMOCK_ARG_(tn, 7, __VA_ARGS__)>(gmock_a7), \
-  ::std::forward<GMOCK_ARG_(tn, 8, __VA_ARGS__)>(gmock_a8)); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> \
-      gmock_##Method(GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1, \
-                     GMOCK_MATCHER_(tn, 2, __VA_ARGS__) gmock_a2, \
-                     GMOCK_MATCHER_(tn, 3, __VA_ARGS__) gmock_a3, \
-                     GMOCK_MATCHER_(tn, 4, __VA_ARGS__) gmock_a4, \
-                     GMOCK_MATCHER_(tn, 5, __VA_ARGS__) gmock_a5, \
-                     GMOCK_MATCHER_(tn, 6, __VA_ARGS__) gmock_a6, \
-                     GMOCK_MATCHER_(tn, 7, __VA_ARGS__) gmock_a7, \
-                     GMOCK_MATCHER_(tn, 8, __VA_ARGS__) gmock_a8) constness { \
-    GMOCK_MOCKER_(8, constness, Method).RegisterOwner(this); \
-    return GMOCK_MOCKER_(8, constness, Method).With(gmock_a1, gmock_a2, \
-        gmock_a3, gmock_a4, gmock_a5, gmock_a6, gmock_a7, gmock_a8); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> gmock_##Method( \
-      const ::testing::internal::WithoutMatchers&, \
-      constness ::testing::internal::Function<__VA_ARGS__>* ) const { \
-        return ::testing::internal::AdjustConstness_##constness(this)-> \
-            gmock_##Method(::testing::A<GMOCK_ARG_(tn, 1, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 2, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 3, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 4, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 5, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 6, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 7, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 8, __VA_ARGS__)>()); \
-      } \
-  mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_MOCKER_(8, constness, \
-      Method)
-
-// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
-#define GMOCK_METHOD9_(tn, constness, ct, Method, ...) \
-  static_assert(9 == \
-      ::testing::internal::Function<__VA_ARGS__>::ArgumentCount, \
-      "MOCK_METHOD<N> must match argument count.");\
-  GMOCK_RESULT_(tn, __VA_ARGS__) ct Method( \
-      GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1, GMOCK_ARG_(tn, 2, \
-          __VA_ARGS__) gmock_a2, GMOCK_ARG_(tn, 3, __VA_ARGS__) gmock_a3, \
-          GMOCK_ARG_(tn, 4, __VA_ARGS__) gmock_a4, GMOCK_ARG_(tn, 5, \
-          __VA_ARGS__) gmock_a5, GMOCK_ARG_(tn, 6, __VA_ARGS__) gmock_a6, \
-          GMOCK_ARG_(tn, 7, __VA_ARGS__) gmock_a7, GMOCK_ARG_(tn, 8, \
-          __VA_ARGS__) gmock_a8, GMOCK_ARG_(tn, 9, \
-          __VA_ARGS__) gmock_a9) constness { \
-    GMOCK_MOCKER_(9, constness, Method).SetOwnerAndName(this, #Method); \
-    return GMOCK_MOCKER_(9, constness, \
-        Method).Invoke(::std::forward<GMOCK_ARG_(tn, 1, \
-        __VA_ARGS__)>(gmock_a1), \
-  ::std::forward<GMOCK_ARG_(tn, 2, __VA_ARGS__)>(gmock_a2), \
-  ::std::forward<GMOCK_ARG_(tn, 3, __VA_ARGS__)>(gmock_a3), \
-  ::std::forward<GMOCK_ARG_(tn, 4, __VA_ARGS__)>(gmock_a4), \
-  ::std::forward<GMOCK_ARG_(tn, 5, __VA_ARGS__)>(gmock_a5), \
-  ::std::forward<GMOCK_ARG_(tn, 6, __VA_ARGS__)>(gmock_a6), \
-  ::std::forward<GMOCK_ARG_(tn, 7, __VA_ARGS__)>(gmock_a7), \
-  ::std::forward<GMOCK_ARG_(tn, 8, __VA_ARGS__)>(gmock_a8), \
-  ::std::forward<GMOCK_ARG_(tn, 9, __VA_ARGS__)>(gmock_a9)); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> \
-      gmock_##Method(GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1, \
-                     GMOCK_MATCHER_(tn, 2, __VA_ARGS__) gmock_a2, \
-                     GMOCK_MATCHER_(tn, 3, __VA_ARGS__) gmock_a3, \
-                     GMOCK_MATCHER_(tn, 4, __VA_ARGS__) gmock_a4, \
-                     GMOCK_MATCHER_(tn, 5, __VA_ARGS__) gmock_a5, \
-                     GMOCK_MATCHER_(tn, 6, __VA_ARGS__) gmock_a6, \
-                     GMOCK_MATCHER_(tn, 7, __VA_ARGS__) gmock_a7, \
-                     GMOCK_MATCHER_(tn, 8, __VA_ARGS__) gmock_a8, \
-                     GMOCK_MATCHER_(tn, 9, __VA_ARGS__) gmock_a9) constness { \
-    GMOCK_MOCKER_(9, constness, Method).RegisterOwner(this); \
-    return GMOCK_MOCKER_(9, constness, Method).With(gmock_a1, gmock_a2, \
-        gmock_a3, gmock_a4, gmock_a5, gmock_a6, gmock_a7, gmock_a8, \
-        gmock_a9); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> gmock_##Method( \
-      const ::testing::internal::WithoutMatchers&, \
-      constness ::testing::internal::Function<__VA_ARGS__>* ) const { \
-        return ::testing::internal::AdjustConstness_##constness(this)-> \
-            gmock_##Method(::testing::A<GMOCK_ARG_(tn, 1, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 2, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 3, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 4, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 5, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 6, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 7, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 8, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 9, __VA_ARGS__)>()); \
-      } \
-  mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_MOCKER_(9, constness, \
-      Method)
-
-// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
-#define GMOCK_METHOD10_(tn, constness, ct, Method, ...) \
-  static_assert(10 == \
-      ::testing::internal::Function<__VA_ARGS__>::ArgumentCount, \
-      "MOCK_METHOD<N> must match argument count.");\
-  GMOCK_RESULT_(tn, __VA_ARGS__) ct Method( \
-      GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1, GMOCK_ARG_(tn, 2, \
-          __VA_ARGS__) gmock_a2, GMOCK_ARG_(tn, 3, __VA_ARGS__) gmock_a3, \
-          GMOCK_ARG_(tn, 4, __VA_ARGS__) gmock_a4, GMOCK_ARG_(tn, 5, \
-          __VA_ARGS__) gmock_a5, GMOCK_ARG_(tn, 6, __VA_ARGS__) gmock_a6, \
-          GMOCK_ARG_(tn, 7, __VA_ARGS__) gmock_a7, GMOCK_ARG_(tn, 8, \
-          __VA_ARGS__) gmock_a8, GMOCK_ARG_(tn, 9, __VA_ARGS__) gmock_a9, \
-          GMOCK_ARG_(tn, 10, __VA_ARGS__) gmock_a10) constness { \
-    GMOCK_MOCKER_(10, constness, Method).SetOwnerAndName(this, #Method); \
-    return GMOCK_MOCKER_(10, constness, \
-        Method).Invoke(::std::forward<GMOCK_ARG_(tn, 1, \
-        __VA_ARGS__)>(gmock_a1), \
-  ::std::forward<GMOCK_ARG_(tn, 2, __VA_ARGS__)>(gmock_a2), \
-  ::std::forward<GMOCK_ARG_(tn, 3, __VA_ARGS__)>(gmock_a3), \
-  ::std::forward<GMOCK_ARG_(tn, 4, __VA_ARGS__)>(gmock_a4), \
-  ::std::forward<GMOCK_ARG_(tn, 5, __VA_ARGS__)>(gmock_a5), \
-  ::std::forward<GMOCK_ARG_(tn, 6, __VA_ARGS__)>(gmock_a6), \
-  ::std::forward<GMOCK_ARG_(tn, 7, __VA_ARGS__)>(gmock_a7), \
-  ::std::forward<GMOCK_ARG_(tn, 8, __VA_ARGS__)>(gmock_a8), \
-  ::std::forward<GMOCK_ARG_(tn, 9, __VA_ARGS__)>(gmock_a9), \
-  ::std::forward<GMOCK_ARG_(tn, 10, __VA_ARGS__)>(gmock_a10)); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> \
-      gmock_##Method(GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1, \
-                     GMOCK_MATCHER_(tn, 2, __VA_ARGS__) gmock_a2, \
-                     GMOCK_MATCHER_(tn, 3, __VA_ARGS__) gmock_a3, \
-                     GMOCK_MATCHER_(tn, 4, __VA_ARGS__) gmock_a4, \
-                     GMOCK_MATCHER_(tn, 5, __VA_ARGS__) gmock_a5, \
-                     GMOCK_MATCHER_(tn, 6, __VA_ARGS__) gmock_a6, \
-                     GMOCK_MATCHER_(tn, 7, __VA_ARGS__) gmock_a7, \
-                     GMOCK_MATCHER_(tn, 8, __VA_ARGS__) gmock_a8, \
-                     GMOCK_MATCHER_(tn, 9, __VA_ARGS__) gmock_a9, \
-                     GMOCK_MATCHER_(tn, 10, \
-                         __VA_ARGS__) gmock_a10) constness { \
-    GMOCK_MOCKER_(10, constness, Method).RegisterOwner(this); \
-    return GMOCK_MOCKER_(10, constness, Method).With(gmock_a1, gmock_a2, \
-        gmock_a3, gmock_a4, gmock_a5, gmock_a6, gmock_a7, gmock_a8, gmock_a9, \
-        gmock_a10); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> gmock_##Method( \
-      const ::testing::internal::WithoutMatchers&, \
-      constness ::testing::internal::Function<__VA_ARGS__>* ) const { \
-        return ::testing::internal::AdjustConstness_##constness(this)-> \
-            gmock_##Method(::testing::A<GMOCK_ARG_(tn, 1, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 2, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 3, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 4, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 5, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 6, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 7, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 8, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 9, __VA_ARGS__)>(), \
-                     ::testing::A<GMOCK_ARG_(tn, 10, __VA_ARGS__)>()); \
-      } \
-  mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_MOCKER_(10, constness, \
-      Method)
-
-#define MOCK_METHOD0(m, ...) GMOCK_METHOD0_(, , , m, __VA_ARGS__)
-#define MOCK_METHOD1(m, ...) GMOCK_METHOD1_(, , , m, __VA_ARGS__)
-#define MOCK_METHOD2(m, ...) GMOCK_METHOD2_(, , , m, __VA_ARGS__)
-#define MOCK_METHOD3(m, ...) GMOCK_METHOD3_(, , , m, __VA_ARGS__)
-#define MOCK_METHOD4(m, ...) GMOCK_METHOD4_(, , , m, __VA_ARGS__)
-#define MOCK_METHOD5(m, ...) GMOCK_METHOD5_(, , , m, __VA_ARGS__)
-#define MOCK_METHOD6(m, ...) GMOCK_METHOD6_(, , , m, __VA_ARGS__)
-#define MOCK_METHOD7(m, ...) GMOCK_METHOD7_(, , , m, __VA_ARGS__)
-#define MOCK_METHOD8(m, ...) GMOCK_METHOD8_(, , , m, __VA_ARGS__)
-#define MOCK_METHOD9(m, ...) GMOCK_METHOD9_(, , , m, __VA_ARGS__)
-#define MOCK_METHOD10(m, ...) GMOCK_METHOD10_(, , , m, __VA_ARGS__)
-
-#define MOCK_CONST_METHOD0(m, ...) GMOCK_METHOD0_(, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD1(m, ...) GMOCK_METHOD1_(, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD2(m, ...) GMOCK_METHOD2_(, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD3(m, ...) GMOCK_METHOD3_(, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD4(m, ...) GMOCK_METHOD4_(, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD5(m, ...) GMOCK_METHOD5_(, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD6(m, ...) GMOCK_METHOD6_(, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD7(m, ...) GMOCK_METHOD7_(, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD8(m, ...) GMOCK_METHOD8_(, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD9(m, ...) GMOCK_METHOD9_(, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD10(m, ...) GMOCK_METHOD10_(, const, , m, __VA_ARGS__)
-
-#define MOCK_METHOD0_T(m, ...) GMOCK_METHOD0_(typename, , , m, __VA_ARGS__)
-#define MOCK_METHOD1_T(m, ...) GMOCK_METHOD1_(typename, , , m, __VA_ARGS__)
-#define MOCK_METHOD2_T(m, ...) GMOCK_METHOD2_(typename, , , m, __VA_ARGS__)
-#define MOCK_METHOD3_T(m, ...) GMOCK_METHOD3_(typename, , , m, __VA_ARGS__)
-#define MOCK_METHOD4_T(m, ...) GMOCK_METHOD4_(typename, , , m, __VA_ARGS__)
-#define MOCK_METHOD5_T(m, ...) GMOCK_METHOD5_(typename, , , m, __VA_ARGS__)
-#define MOCK_METHOD6_T(m, ...) GMOCK_METHOD6_(typename, , , m, __VA_ARGS__)
-#define MOCK_METHOD7_T(m, ...) GMOCK_METHOD7_(typename, , , m, __VA_ARGS__)
-#define MOCK_METHOD8_T(m, ...) GMOCK_METHOD8_(typename, , , m, __VA_ARGS__)
-#define MOCK_METHOD9_T(m, ...) GMOCK_METHOD9_(typename, , , m, __VA_ARGS__)
-#define MOCK_METHOD10_T(m, ...) GMOCK_METHOD10_(typename, , , m, __VA_ARGS__)
-
-#define MOCK_CONST_METHOD0_T(m, ...) \
-    GMOCK_METHOD0_(typename, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD1_T(m, ...) \
-    GMOCK_METHOD1_(typename, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD2_T(m, ...) \
-    GMOCK_METHOD2_(typename, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD3_T(m, ...) \
-    GMOCK_METHOD3_(typename, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD4_T(m, ...) \
-    GMOCK_METHOD4_(typename, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD5_T(m, ...) \
-    GMOCK_METHOD5_(typename, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD6_T(m, ...) \
-    GMOCK_METHOD6_(typename, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD7_T(m, ...) \
-    GMOCK_METHOD7_(typename, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD8_T(m, ...) \
-    GMOCK_METHOD8_(typename, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD9_T(m, ...) \
-    GMOCK_METHOD9_(typename, const, , m, __VA_ARGS__)
-#define MOCK_CONST_METHOD10_T(m, ...) \
-    GMOCK_METHOD10_(typename, const, , m, __VA_ARGS__)
-
-#define MOCK_METHOD0_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD0_(, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD1_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD1_(, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD2_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD2_(, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD3_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD3_(, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD4_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD4_(, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD5_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD5_(, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD6_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD6_(, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD7_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD7_(, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD8_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD8_(, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD9_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD9_(, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD10_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD10_(, , ct, m, __VA_ARGS__)
-
-#define MOCK_CONST_METHOD0_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD0_(, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD1_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD1_(, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD2_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD2_(, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD3_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD3_(, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD4_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD4_(, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD5_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD5_(, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD6_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD6_(, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD7_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD7_(, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD8_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD8_(, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD9_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD9_(, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD10_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD10_(, const, ct, m, __VA_ARGS__)
-
-#define MOCK_METHOD0_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD0_(typename, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD1_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD1_(typename, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD2_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD2_(typename, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD3_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD3_(typename, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD4_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD4_(typename, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD5_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD5_(typename, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD6_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD6_(typename, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD7_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD7_(typename, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD8_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD8_(typename, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD9_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD9_(typename, , ct, m, __VA_ARGS__)
-#define MOCK_METHOD10_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD10_(typename, , ct, m, __VA_ARGS__)
-
-#define MOCK_CONST_METHOD0_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD0_(typename, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD1_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD1_(typename, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD2_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD2_(typename, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD3_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD3_(typename, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD4_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD4_(typename, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD5_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD5_(typename, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD6_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD6_(typename, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD7_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD7_(typename, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD8_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD8_(typename, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD9_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD9_(typename, const, ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD10_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD10_(typename, const, ct, m, __VA_ARGS__)
-
-}  // namespace testing
-
-#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_FUNCTION_MOCKERS_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-generated-function-mockers.h.pump mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-generated-function-mockers.h.pump
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-generated-function-mockers.h.pump	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-generated-function-mockers.h.pump	1970-01-01 00:00:00.000000000 +0000
@@ -1,227 +0,0 @@
-$$ -*- mode: c++; -*-
-$$ This is a Pump source file.  Please use Pump to convert
-$$ it to gmock-generated-function-mockers.h.
-$$
-$var n = 10  $$ The maximum arity we support.
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file implements function mockers of various arities.
-
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_FUNCTION_MOCKERS_H_
-#define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_FUNCTION_MOCKERS_H_
-
-#include <functional>
-#include <utility>
-
-#include "gmock/gmock-spec-builders.h"
-#include "gmock/internal/gmock-internal-utils.h"
-
-namespace testing {
-namespace internal {
-
-$range i 0..n
-// Removes the given pointer; this is a helper for the expectation setter method
-// for parameterless matchers.
-//
-// We want to make sure that the user cannot set a parameterless expectation on
-// overloaded methods, including methods which are overloaded on const. Example:
-//
-//   class MockClass {
-//     MOCK_METHOD0(GetName, string&());
-//     MOCK_CONST_METHOD0(GetName, const string&());
-//   };
-//
-//   TEST() {
-//     // This should be an error, as it's not clear which overload is expected.
-//     EXPECT_CALL(mock, GetName).WillOnce(ReturnRef(value));
-//   }
-//
-// Here are the generated expectation-setter methods:
-//
-//   class MockClass {
-//     // Overload 1
-//     MockSpec<string&()> gmock_GetName() { ... }
-//     // Overload 2. Declared const so that the compiler will generate an
-//     // error when trying to resolve between this and overload 4 in
-//     // 'gmock_GetName(WithoutMatchers(), nullptr)'.
-//     MockSpec<string&()> gmock_GetName(
-//         const WithoutMatchers&, const Function<string&()>*) const {
-//       // Removes const from this, calls overload 1
-//       return AdjustConstness_(this)->gmock_GetName();
-//     }
-//
-//     // Overload 3
-//     const string& gmock_GetName() const { ... }
-//     // Overload 4
-//     MockSpec<const string&()> gmock_GetName(
-//         const WithoutMatchers&, const Function<const string&()>*) const {
-//       // Does not remove const, calls overload 3
-//       return AdjustConstness_const(this)->gmock_GetName();
-//     }
-//   }
-//
-template <typename MockType>
-const MockType* AdjustConstness_const(const MockType* mock) {
-  return mock;
-}
-
-// Removes const from and returns the given pointer; this is a helper for the
-// expectation setter method for parameterless matchers.
-template <typename MockType>
-MockType* AdjustConstness_(const MockType* mock) {
-  return const_cast<MockType*>(mock);
-}
-
-}  // namespace internal
-
-// The style guide prohibits "using" statements in a namespace scope
-// inside a header file.  However, the FunctionMocker class template
-// is meant to be defined in the ::testing namespace.  The following
-// line is just a trick for working around a bug in MSVC 8.0, which
-// cannot handle it if we define FunctionMocker in ::testing.
-using internal::FunctionMocker;
-
-// GMOCK_RESULT_(tn, F) expands to the result type of function type F.
-// We define this as a variadic macro in case F contains unprotected
-// commas (the same reason that we use variadic macros in other places
-// in this file).
-// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
-#define GMOCK_RESULT_(tn, ...) \
-    tn ::testing::internal::Function<__VA_ARGS__>::Result
-
-// The type of argument N of the given function type.
-// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
-#define GMOCK_ARG_(tn, N, ...) \
-    tn ::testing::internal::Function<__VA_ARGS__>::template Arg<N-1>::type
-
-// The matcher type for argument N of the given function type.
-// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
-#define GMOCK_MATCHER_(tn, N, ...) \
-    const ::testing::Matcher<GMOCK_ARG_(tn, N, __VA_ARGS__)>&
-
-// The variable for mocking the given method.
-// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
-#define GMOCK_MOCKER_(arity, constness, Method) \
-    GTEST_CONCAT_TOKEN_(gmock##constness##arity##_##Method##_, __LINE__)
-
-
-$for i [[
-$range j 1..i
-$var arg_as = [[$for j, [[GMOCK_ARG_(tn, $j, __VA_ARGS__) gmock_a$j]]]]
-$var as = [[$for j, \
-  [[::std::forward<GMOCK_ARG_(tn, $j, __VA_ARGS__)>(gmock_a$j)]]]]
-$var matcher_arg_as = [[$for j, \
-                     [[GMOCK_MATCHER_(tn, $j, __VA_ARGS__) gmock_a$j]]]]
-$var matcher_as = [[$for j, [[gmock_a$j]]]]
-$var anything_matchers = [[$for j, \
-                     [[::testing::A<GMOCK_ARG_(tn, $j, __VA_ARGS__)>()]]]]
-// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
-#define GMOCK_METHOD$i[[]]_(tn, constness, ct, Method, ...) \
-  static_assert($i == ::testing::internal::Function<__VA_ARGS__>::ArgumentCount, "MOCK_METHOD<N> must match argument count.");\
-  GMOCK_RESULT_(tn, __VA_ARGS__) ct Method( \
-      $arg_as) constness { \
-    GMOCK_MOCKER_($i, constness, Method).SetOwnerAndName(this, #Method); \
-    return GMOCK_MOCKER_($i, constness, Method).Invoke($as); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> \
-      gmock_##Method($matcher_arg_as) constness { \
-    GMOCK_MOCKER_($i, constness, Method).RegisterOwner(this); \
-    return GMOCK_MOCKER_($i, constness, Method).With($matcher_as); \
-  } \
-  ::testing::MockSpec<__VA_ARGS__> gmock_##Method( \
-      const ::testing::internal::WithoutMatchers&, \
-      constness ::testing::internal::Function<__VA_ARGS__>* ) const { \
-        return ::testing::internal::AdjustConstness_##constness(this)-> \
-            gmock_##Method($anything_matchers); \
-      } \
-  mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_MOCKER_($i, constness, Method)
-
-
-]]
-$for i [[
-#define MOCK_METHOD$i(m, ...) GMOCK_METHOD$i[[]]_(, , , m, __VA_ARGS__)
-
-]]
-
-
-$for i [[
-#define MOCK_CONST_METHOD$i(m, ...) GMOCK_METHOD$i[[]]_(, const, , m, __VA_ARGS__)
-
-]]
-
-
-$for i [[
-#define MOCK_METHOD$i[[]]_T(m, ...) GMOCK_METHOD$i[[]]_(typename, , , m, __VA_ARGS__)
-
-]]
-
-
-$for i [[
-#define MOCK_CONST_METHOD$i[[]]_T(m, ...) \
-    GMOCK_METHOD$i[[]]_(typename, const, , m, __VA_ARGS__)
-
-]]
-
-
-$for i [[
-#define MOCK_METHOD$i[[]]_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD$i[[]]_(, , ct, m, __VA_ARGS__)
-
-]]
-
-
-$for i [[
-#define MOCK_CONST_METHOD$i[[]]_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD$i[[]]_(, const, ct, m, __VA_ARGS__)
-
-]]
-
-
-$for i [[
-#define MOCK_METHOD$i[[]]_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD$i[[]]_(typename, , ct, m, __VA_ARGS__)
-
-]]
-
-
-$for i [[
-#define MOCK_CONST_METHOD$i[[]]_T_WITH_CALLTYPE(ct, m, ...) \
-    GMOCK_METHOD$i[[]]_(typename, const, ct, m, __VA_ARGS__)
-
-]]
-
-}  // namespace testing
-
-#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_FUNCTION_MOCKERS_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-generated-matchers.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-generated-matchers.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-generated-matchers.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-generated-matchers.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,1097 +0,0 @@
-// This file was GENERATED by command:
-//     pump.py gmock-generated-matchers.h.pump
-// DO NOT EDIT BY HAND!!!
-
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file implements some commonly used variadic matchers.
-
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_MATCHERS_H_
-#define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_MATCHERS_H_
-
-#include <iterator>
-#include <sstream>
-#include <string>
-#include <utility>
-#include <vector>
-#include "gmock/gmock-matchers.h"
-
-// The MATCHER* family of macros can be used in a namespace scope to
-// define custom matchers easily.
-//
-// Basic Usage
-// ===========
-//
-// The syntax
-//
-//   MATCHER(name, description_string) { statements; }
-//
-// defines a matcher with the given name that executes the statements,
-// which must return a bool to indicate if the match succeeds.  Inside
-// the statements, you can refer to the value being matched by 'arg',
-// and refer to its type by 'arg_type'.
-//
-// The description string documents what the matcher does, and is used
-// to generate the failure message when the match fails.  Since a
-// MATCHER() is usually defined in a header file shared by multiple
-// C++ source files, we require the description to be a C-string
-// literal to avoid possible side effects.  It can be empty, in which
-// case we'll use the sequence of words in the matcher name as the
-// description.
-//
-// For example:
-//
-//   MATCHER(IsEven, "") { return (arg % 2) == 0; }
-//
-// allows you to write
-//
-//   // Expects mock_foo.Bar(n) to be called where n is even.
-//   EXPECT_CALL(mock_foo, Bar(IsEven()));
-//
-// or,
-//
-//   // Verifies that the value of some_expression is even.
-//   EXPECT_THAT(some_expression, IsEven());
-//
-// If the above assertion fails, it will print something like:
-//
-//   Value of: some_expression
-//   Expected: is even
-//     Actual: 7
-//
-// where the description "is even" is automatically calculated from the
-// matcher name IsEven.
-//
-// Argument Type
-// =============
-//
-// Note that the type of the value being matched (arg_type) is
-// determined by the context in which you use the matcher and is
-// supplied to you by the compiler, so you don't need to worry about
-// declaring it (nor can you).  This allows the matcher to be
-// polymorphic.  For example, IsEven() can be used to match any type
-// where the value of "(arg % 2) == 0" can be implicitly converted to
-// a bool.  In the "Bar(IsEven())" example above, if method Bar()
-// takes an int, 'arg_type' will be int; if it takes an unsigned long,
-// 'arg_type' will be unsigned long; and so on.
-//
-// Parameterizing Matchers
-// =======================
-//
-// Sometimes you'll want to parameterize the matcher.  For that you
-// can use another macro:
-//
-//   MATCHER_P(name, param_name, description_string) { statements; }
-//
-// For example:
-//
-//   MATCHER_P(HasAbsoluteValue, value, "") { return abs(arg) == value; }
-//
-// will allow you to write:
-//
-//   EXPECT_THAT(Blah("a"), HasAbsoluteValue(n));
-//
-// which may lead to this message (assuming n is 10):
-//
-//   Value of: Blah("a")
-//   Expected: has absolute value 10
-//     Actual: -9
-//
-// Note that both the matcher description and its parameter are
-// printed, making the message human-friendly.
-//
-// In the matcher definition body, you can write 'foo_type' to
-// reference the type of a parameter named 'foo'.  For example, in the
-// body of MATCHER_P(HasAbsoluteValue, value) above, you can write
-// 'value_type' to refer to the type of 'value'.
-//
-// We also provide MATCHER_P2, MATCHER_P3, ..., up to MATCHER_P10 to
-// support multi-parameter matchers.
-//
-// Describing Parameterized Matchers
-// =================================
-//
-// The last argument to MATCHER*() is a string-typed expression.  The
-// expression can reference all of the matcher's parameters and a
-// special bool-typed variable named 'negation'.  When 'negation' is
-// false, the expression should evaluate to the matcher's description;
-// otherwise it should evaluate to the description of the negation of
-// the matcher.  For example,
-//
-//   using testing::PrintToString;
-//
-//   MATCHER_P2(InClosedRange, low, hi,
-//       std::string(negation ? "is not" : "is") + " in range [" +
-//       PrintToString(low) + ", " + PrintToString(hi) + "]") {
-//     return low <= arg && arg <= hi;
-//   }
-//   ...
-//   EXPECT_THAT(3, InClosedRange(4, 6));
-//   EXPECT_THAT(3, Not(InClosedRange(2, 4)));
-//
-// would generate two failures that contain the text:
-//
-//   Expected: is in range [4, 6]
-//   ...
-//   Expected: is not in range [2, 4]
-//
-// If you specify "" as the description, the failure message will
-// contain the sequence of words in the matcher name followed by the
-// parameter values printed as a tuple.  For example,
-//
-//   MATCHER_P2(InClosedRange, low, hi, "") { ... }
-//   ...
-//   EXPECT_THAT(3, InClosedRange(4, 6));
-//   EXPECT_THAT(3, Not(InClosedRange(2, 4)));
-//
-// would generate two failures that contain the text:
-//
-//   Expected: in closed range (4, 6)
-//   ...
-//   Expected: not (in closed range (2, 4))
-//
-// Types of Matcher Parameters
-// ===========================
-//
-// For the purpose of typing, you can view
-//
-//   MATCHER_Pk(Foo, p1, ..., pk, description_string) { ... }
-//
-// as shorthand for
-//
-//   template <typename p1_type, ..., typename pk_type>
-//   FooMatcherPk<p1_type, ..., pk_type>
-//   Foo(p1_type p1, ..., pk_type pk) { ... }
-//
-// When you write Foo(v1, ..., vk), the compiler infers the types of
-// the parameters v1, ..., and vk for you.  If you are not happy with
-// the result of the type inference, you can specify the types by
-// explicitly instantiating the template, as in Foo<long, bool>(5,
-// false).  As said earlier, you don't get to (or need to) specify
-// 'arg_type' as that's determined by the context in which the matcher
-// is used.  You can assign the result of expression Foo(p1, ..., pk)
-// to a variable of type FooMatcherPk<p1_type, ..., pk_type>.  This
-// can be useful when composing matchers.
-//
-// While you can instantiate a matcher template with reference types,
-// passing the parameters by pointer usually makes your code more
-// readable.  If, however, you still want to pass a parameter by
-// reference, be aware that in the failure message generated by the
-// matcher you will see the value of the referenced object but not its
-// address.
-//
-// Explaining Match Results
-// ========================
-//
-// Sometimes the matcher description alone isn't enough to explain why
-// the match has failed or succeeded.  For example, when expecting a
-// long string, it can be very helpful to also print the diff between
-// the expected string and the actual one.  To achieve that, you can
-// optionally stream additional information to a special variable
-// named result_listener, whose type is a pointer to class
-// MatchResultListener:
-//
-//   MATCHER_P(EqualsLongString, str, "") {
-//     if (arg == str) return true;
-//
-//     *result_listener << "the difference: "
-///                     << DiffStrings(str, arg);
-//     return false;
-//   }
-//
-// Overloading Matchers
-// ====================
-//
-// You can overload matchers with different numbers of parameters:
-//
-//   MATCHER_P(Blah, a, description_string1) { ... }
-//   MATCHER_P2(Blah, a, b, description_string2) { ... }
-//
-// Caveats
-// =======
-//
-// When defining a new matcher, you should also consider implementing
-// MatcherInterface or using MakePolymorphicMatcher().  These
-// approaches require more work than the MATCHER* macros, but also
-// give you more control on the types of the value being matched and
-// the matcher parameters, which may leads to better compiler error
-// messages when the matcher is used wrong.  They also allow
-// overloading matchers based on parameter types (as opposed to just
-// based on the number of parameters).
-//
-// MATCHER*() can only be used in a namespace scope as templates cannot be
-// declared inside of a local class.
-//
-// More Information
-// ================
-//
-// To learn more about using these macros, please search for 'MATCHER'
-// on
-// https://github.com/google/googletest/blob/master/googlemock/docs/cook_book.md
-
-#define MATCHER(name, description)\
-  class name##Matcher {\
-   public:\
-    template <typename arg_type>\
-    class gmock_Impl : public ::testing::MatcherInterface<\
-        GTEST_REFERENCE_TO_CONST_(arg_type)> {\
-     public:\
-      gmock_Impl()\
-           {}\
-      virtual bool MatchAndExplain(\
-          GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-          ::testing::MatchResultListener* result_listener) const;\
-      virtual void DescribeTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(false);\
-      }\
-      virtual void DescribeNegationTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(true);\
-      }\
-     private:\
-      ::std::string FormatDescription(bool negation) const {\
-        ::std::string gmock_description = (description);\
-        if (!gmock_description.empty()) {\
-          return gmock_description;\
-        }\
-        return ::testing::internal::FormatMatcherDescription(\
-            negation, #name, \
-            ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
-                ::std::tuple<>()));\
-      }\
-    };\
-    template <typename arg_type>\
-    operator ::testing::Matcher<arg_type>() const {\
-      return ::testing::Matcher<arg_type>(\
-          new gmock_Impl<arg_type>());\
-    }\
-    name##Matcher() {\
-    }\
-   private:\
-  };\
-  inline name##Matcher name() {\
-    return name##Matcher();\
-  }\
-  template <typename arg_type>\
-  bool name##Matcher::gmock_Impl<arg_type>::MatchAndExplain(\
-      GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_)\
-          const
-
-#define MATCHER_P(name, p0, description)\
-  template <typename p0##_type>\
-  class name##MatcherP {\
-   public:\
-    template <typename arg_type>\
-    class gmock_Impl : public ::testing::MatcherInterface<\
-        GTEST_REFERENCE_TO_CONST_(arg_type)> {\
-     public:\
-      explicit gmock_Impl(p0##_type gmock_p0)\
-           : p0(::std::move(gmock_p0)) {}\
-      virtual bool MatchAndExplain(\
-          GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-          ::testing::MatchResultListener* result_listener) const;\
-      virtual void DescribeTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(false);\
-      }\
-      virtual void DescribeNegationTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(true);\
-      }\
-      p0##_type const p0;\
-     private:\
-      ::std::string FormatDescription(bool negation) const {\
-        ::std::string gmock_description = (description);\
-        if (!gmock_description.empty()) {\
-          return gmock_description;\
-        }\
-        return ::testing::internal::FormatMatcherDescription(\
-            negation, #name, \
-            ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
-                ::std::tuple<p0##_type>(p0)));\
-      }\
-    };\
-    template <typename arg_type>\
-    operator ::testing::Matcher<arg_type>() const {\
-      return ::testing::Matcher<arg_type>(\
-          new gmock_Impl<arg_type>(p0));\
-    }\
-    explicit name##MatcherP(p0##_type gmock_p0) : p0(::std::move(gmock_p0)) {\
-    }\
-    p0##_type const p0;\
-   private:\
-  };\
-  template <typename p0##_type>\
-  inline name##MatcherP<p0##_type> name(p0##_type p0) {\
-    return name##MatcherP<p0##_type>(p0);\
-  }\
-  template <typename p0##_type>\
-  template <typename arg_type>\
-  bool name##MatcherP<p0##_type>::gmock_Impl<arg_type>::MatchAndExplain(\
-      GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_)\
-          const
-
-#define MATCHER_P2(name, p0, p1, description)\
-  template <typename p0##_type, typename p1##_type>\
-  class name##MatcherP2 {\
-   public:\
-    template <typename arg_type>\
-    class gmock_Impl : public ::testing::MatcherInterface<\
-        GTEST_REFERENCE_TO_CONST_(arg_type)> {\
-     public:\
-      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1)\
-           : p0(::std::move(gmock_p0)), p1(::std::move(gmock_p1)) {}\
-      virtual bool MatchAndExplain(\
-          GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-          ::testing::MatchResultListener* result_listener) const;\
-      virtual void DescribeTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(false);\
-      }\
-      virtual void DescribeNegationTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(true);\
-      }\
-      p0##_type const p0;\
-      p1##_type const p1;\
-     private:\
-      ::std::string FormatDescription(bool negation) const {\
-        ::std::string gmock_description = (description);\
-        if (!gmock_description.empty()) {\
-          return gmock_description;\
-        }\
-        return ::testing::internal::FormatMatcherDescription(\
-            negation, #name, \
-            ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
-                ::std::tuple<p0##_type, p1##_type>(p0, p1)));\
-      }\
-    };\
-    template <typename arg_type>\
-    operator ::testing::Matcher<arg_type>() const {\
-      return ::testing::Matcher<arg_type>(\
-          new gmock_Impl<arg_type>(p0, p1));\
-    }\
-    name##MatcherP2(p0##_type gmock_p0, \
-        p1##_type gmock_p1) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)) {\
-    }\
-    p0##_type const p0;\
-    p1##_type const p1;\
-   private:\
-  };\
-  template <typename p0##_type, typename p1##_type>\
-  inline name##MatcherP2<p0##_type, p1##_type> name(p0##_type p0, \
-      p1##_type p1) {\
-    return name##MatcherP2<p0##_type, p1##_type>(p0, p1);\
-  }\
-  template <typename p0##_type, typename p1##_type>\
-  template <typename arg_type>\
-  bool name##MatcherP2<p0##_type, \
-      p1##_type>::gmock_Impl<arg_type>::MatchAndExplain(\
-      GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_)\
-          const
-
-#define MATCHER_P3(name, p0, p1, p2, description)\
-  template <typename p0##_type, typename p1##_type, typename p2##_type>\
-  class name##MatcherP3 {\
-   public:\
-    template <typename arg_type>\
-    class gmock_Impl : public ::testing::MatcherInterface<\
-        GTEST_REFERENCE_TO_CONST_(arg_type)> {\
-     public:\
-      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2)\
-           : p0(::std::move(gmock_p0)), p1(::std::move(gmock_p1)), \
-               p2(::std::move(gmock_p2)) {}\
-      virtual bool MatchAndExplain(\
-          GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-          ::testing::MatchResultListener* result_listener) const;\
-      virtual void DescribeTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(false);\
-      }\
-      virtual void DescribeNegationTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(true);\
-      }\
-      p0##_type const p0;\
-      p1##_type const p1;\
-      p2##_type const p2;\
-     private:\
-      ::std::string FormatDescription(bool negation) const {\
-        ::std::string gmock_description = (description);\
-        if (!gmock_description.empty()) {\
-          return gmock_description;\
-        }\
-        return ::testing::internal::FormatMatcherDescription(\
-            negation, #name, \
-            ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
-                ::std::tuple<p0##_type, p1##_type, p2##_type>(p0, p1, p2)));\
-      }\
-    };\
-    template <typename arg_type>\
-    operator ::testing::Matcher<arg_type>() const {\
-      return ::testing::Matcher<arg_type>(\
-          new gmock_Impl<arg_type>(p0, p1, p2));\
-    }\
-    name##MatcherP3(p0##_type gmock_p0, p1##_type gmock_p1, \
-        p2##_type gmock_p2) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)) {\
-    }\
-    p0##_type const p0;\
-    p1##_type const p1;\
-    p2##_type const p2;\
-   private:\
-  };\
-  template <typename p0##_type, typename p1##_type, typename p2##_type>\
-  inline name##MatcherP3<p0##_type, p1##_type, p2##_type> name(p0##_type p0, \
-      p1##_type p1, p2##_type p2) {\
-    return name##MatcherP3<p0##_type, p1##_type, p2##_type>(p0, p1, p2);\
-  }\
-  template <typename p0##_type, typename p1##_type, typename p2##_type>\
-  template <typename arg_type>\
-  bool name##MatcherP3<p0##_type, p1##_type, \
-      p2##_type>::gmock_Impl<arg_type>::MatchAndExplain(\
-      GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_)\
-          const
-
-#define MATCHER_P4(name, p0, p1, p2, p3, description)\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type>\
-  class name##MatcherP4 {\
-   public:\
-    template <typename arg_type>\
-    class gmock_Impl : public ::testing::MatcherInterface<\
-        GTEST_REFERENCE_TO_CONST_(arg_type)> {\
-     public:\
-      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-          p3##_type gmock_p3)\
-           : p0(::std::move(gmock_p0)), p1(::std::move(gmock_p1)), \
-               p2(::std::move(gmock_p2)), p3(::std::move(gmock_p3)) {}\
-      virtual bool MatchAndExplain(\
-          GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-          ::testing::MatchResultListener* result_listener) const;\
-      virtual void DescribeTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(false);\
-      }\
-      virtual void DescribeNegationTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(true);\
-      }\
-      p0##_type const p0;\
-      p1##_type const p1;\
-      p2##_type const p2;\
-      p3##_type const p3;\
-     private:\
-      ::std::string FormatDescription(bool negation) const {\
-        ::std::string gmock_description = (description);\
-        if (!gmock_description.empty()) {\
-          return gmock_description;\
-        }\
-        return ::testing::internal::FormatMatcherDescription(\
-            negation, #name, \
-            ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
-                ::std::tuple<p0##_type, p1##_type, p2##_type, p3##_type>(p0, \
-                    p1, p2, p3)));\
-      }\
-    };\
-    template <typename arg_type>\
-    operator ::testing::Matcher<arg_type>() const {\
-      return ::testing::Matcher<arg_type>(\
-          new gmock_Impl<arg_type>(p0, p1, p2, p3));\
-    }\
-    name##MatcherP4(p0##_type gmock_p0, p1##_type gmock_p1, \
-        p2##_type gmock_p2, p3##_type gmock_p3) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3)) {\
-    }\
-    p0##_type const p0;\
-    p1##_type const p1;\
-    p2##_type const p2;\
-    p3##_type const p3;\
-   private:\
-  };\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type>\
-  inline name##MatcherP4<p0##_type, p1##_type, p2##_type, \
-      p3##_type> name(p0##_type p0, p1##_type p1, p2##_type p2, \
-      p3##_type p3) {\
-    return name##MatcherP4<p0##_type, p1##_type, p2##_type, p3##_type>(p0, \
-        p1, p2, p3);\
-  }\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type>\
-  template <typename arg_type>\
-  bool name##MatcherP4<p0##_type, p1##_type, p2##_type, \
-      p3##_type>::gmock_Impl<arg_type>::MatchAndExplain(\
-      GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_)\
-          const
-
-#define MATCHER_P5(name, p0, p1, p2, p3, p4, description)\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type>\
-  class name##MatcherP5 {\
-   public:\
-    template <typename arg_type>\
-    class gmock_Impl : public ::testing::MatcherInterface<\
-        GTEST_REFERENCE_TO_CONST_(arg_type)> {\
-     public:\
-      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-          p3##_type gmock_p3, p4##_type gmock_p4)\
-           : p0(::std::move(gmock_p0)), p1(::std::move(gmock_p1)), \
-               p2(::std::move(gmock_p2)), p3(::std::move(gmock_p3)), \
-               p4(::std::move(gmock_p4)) {}\
-      virtual bool MatchAndExplain(\
-          GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-          ::testing::MatchResultListener* result_listener) const;\
-      virtual void DescribeTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(false);\
-      }\
-      virtual void DescribeNegationTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(true);\
-      }\
-      p0##_type const p0;\
-      p1##_type const p1;\
-      p2##_type const p2;\
-      p3##_type const p3;\
-      p4##_type const p4;\
-     private:\
-      ::std::string FormatDescription(bool negation) const {\
-        ::std::string gmock_description = (description);\
-        if (!gmock_description.empty()) {\
-          return gmock_description;\
-        }\
-        return ::testing::internal::FormatMatcherDescription(\
-            negation, #name, \
-            ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
-                ::std::tuple<p0##_type, p1##_type, p2##_type, p3##_type, \
-                    p4##_type>(p0, p1, p2, p3, p4)));\
-      }\
-    };\
-    template <typename arg_type>\
-    operator ::testing::Matcher<arg_type>() const {\
-      return ::testing::Matcher<arg_type>(\
-          new gmock_Impl<arg_type>(p0, p1, p2, p3, p4));\
-    }\
-    name##MatcherP5(p0##_type gmock_p0, p1##_type gmock_p1, \
-        p2##_type gmock_p2, p3##_type gmock_p3, \
-        p4##_type gmock_p4) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)) {\
-    }\
-    p0##_type const p0;\
-    p1##_type const p1;\
-    p2##_type const p2;\
-    p3##_type const p3;\
-    p4##_type const p4;\
-   private:\
-  };\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type>\
-  inline name##MatcherP5<p0##_type, p1##_type, p2##_type, p3##_type, \
-      p4##_type> name(p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, \
-      p4##_type p4) {\
-    return name##MatcherP5<p0##_type, p1##_type, p2##_type, p3##_type, \
-        p4##_type>(p0, p1, p2, p3, p4);\
-  }\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type>\
-  template <typename arg_type>\
-  bool name##MatcherP5<p0##_type, p1##_type, p2##_type, p3##_type, \
-      p4##_type>::gmock_Impl<arg_type>::MatchAndExplain(\
-      GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_)\
-          const
-
-#define MATCHER_P6(name, p0, p1, p2, p3, p4, p5, description)\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type>\
-  class name##MatcherP6 {\
-   public:\
-    template <typename arg_type>\
-    class gmock_Impl : public ::testing::MatcherInterface<\
-        GTEST_REFERENCE_TO_CONST_(arg_type)> {\
-     public:\
-      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-          p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5)\
-           : p0(::std::move(gmock_p0)), p1(::std::move(gmock_p1)), \
-               p2(::std::move(gmock_p2)), p3(::std::move(gmock_p3)), \
-               p4(::std::move(gmock_p4)), p5(::std::move(gmock_p5)) {}\
-      virtual bool MatchAndExplain(\
-          GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-          ::testing::MatchResultListener* result_listener) const;\
-      virtual void DescribeTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(false);\
-      }\
-      virtual void DescribeNegationTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(true);\
-      }\
-      p0##_type const p0;\
-      p1##_type const p1;\
-      p2##_type const p2;\
-      p3##_type const p3;\
-      p4##_type const p4;\
-      p5##_type const p5;\
-     private:\
-      ::std::string FormatDescription(bool negation) const {\
-        ::std::string gmock_description = (description);\
-        if (!gmock_description.empty()) {\
-          return gmock_description;\
-        }\
-        return ::testing::internal::FormatMatcherDescription(\
-            negation, #name, \
-            ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
-                ::std::tuple<p0##_type, p1##_type, p2##_type, p3##_type, \
-                    p4##_type, p5##_type>(p0, p1, p2, p3, p4, p5)));\
-      }\
-    };\
-    template <typename arg_type>\
-    operator ::testing::Matcher<arg_type>() const {\
-      return ::testing::Matcher<arg_type>(\
-          new gmock_Impl<arg_type>(p0, p1, p2, p3, p4, p5));\
-    }\
-    name##MatcherP6(p0##_type gmock_p0, p1##_type gmock_p1, \
-        p2##_type gmock_p2, p3##_type gmock_p3, p4##_type gmock_p4, \
-        p5##_type gmock_p5) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \
-        p5(::std::move(gmock_p5)) {\
-    }\
-    p0##_type const p0;\
-    p1##_type const p1;\
-    p2##_type const p2;\
-    p3##_type const p3;\
-    p4##_type const p4;\
-    p5##_type const p5;\
-   private:\
-  };\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type>\
-  inline name##MatcherP6<p0##_type, p1##_type, p2##_type, p3##_type, \
-      p4##_type, p5##_type> name(p0##_type p0, p1##_type p1, p2##_type p2, \
-      p3##_type p3, p4##_type p4, p5##_type p5) {\
-    return name##MatcherP6<p0##_type, p1##_type, p2##_type, p3##_type, \
-        p4##_type, p5##_type>(p0, p1, p2, p3, p4, p5);\
-  }\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type>\
-  template <typename arg_type>\
-  bool name##MatcherP6<p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
-      p5##_type>::gmock_Impl<arg_type>::MatchAndExplain(\
-      GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_)\
-          const
-
-#define MATCHER_P7(name, p0, p1, p2, p3, p4, p5, p6, description)\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type>\
-  class name##MatcherP7 {\
-   public:\
-    template <typename arg_type>\
-    class gmock_Impl : public ::testing::MatcherInterface<\
-        GTEST_REFERENCE_TO_CONST_(arg_type)> {\
-     public:\
-      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-          p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
-          p6##_type gmock_p6)\
-           : p0(::std::move(gmock_p0)), p1(::std::move(gmock_p1)), \
-               p2(::std::move(gmock_p2)), p3(::std::move(gmock_p3)), \
-               p4(::std::move(gmock_p4)), p5(::std::move(gmock_p5)), \
-               p6(::std::move(gmock_p6)) {}\
-      virtual bool MatchAndExplain(\
-          GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-          ::testing::MatchResultListener* result_listener) const;\
-      virtual void DescribeTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(false);\
-      }\
-      virtual void DescribeNegationTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(true);\
-      }\
-      p0##_type const p0;\
-      p1##_type const p1;\
-      p2##_type const p2;\
-      p3##_type const p3;\
-      p4##_type const p4;\
-      p5##_type const p5;\
-      p6##_type const p6;\
-     private:\
-      ::std::string FormatDescription(bool negation) const {\
-        ::std::string gmock_description = (description);\
-        if (!gmock_description.empty()) {\
-          return gmock_description;\
-        }\
-        return ::testing::internal::FormatMatcherDescription(\
-            negation, #name, \
-            ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
-                ::std::tuple<p0##_type, p1##_type, p2##_type, p3##_type, \
-                    p4##_type, p5##_type, p6##_type>(p0, p1, p2, p3, p4, p5, \
-                    p6)));\
-      }\
-    };\
-    template <typename arg_type>\
-    operator ::testing::Matcher<arg_type>() const {\
-      return ::testing::Matcher<arg_type>(\
-          new gmock_Impl<arg_type>(p0, p1, p2, p3, p4, p5, p6));\
-    }\
-    name##MatcherP7(p0##_type gmock_p0, p1##_type gmock_p1, \
-        p2##_type gmock_p2, p3##_type gmock_p3, p4##_type gmock_p4, \
-        p5##_type gmock_p5, p6##_type gmock_p6) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \
-        p5(::std::move(gmock_p5)), p6(::std::move(gmock_p6)) {\
-    }\
-    p0##_type const p0;\
-    p1##_type const p1;\
-    p2##_type const p2;\
-    p3##_type const p3;\
-    p4##_type const p4;\
-    p5##_type const p5;\
-    p6##_type const p6;\
-   private:\
-  };\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type>\
-  inline name##MatcherP7<p0##_type, p1##_type, p2##_type, p3##_type, \
-      p4##_type, p5##_type, p6##_type> name(p0##_type p0, p1##_type p1, \
-      p2##_type p2, p3##_type p3, p4##_type p4, p5##_type p5, \
-      p6##_type p6) {\
-    return name##MatcherP7<p0##_type, p1##_type, p2##_type, p3##_type, \
-        p4##_type, p5##_type, p6##_type>(p0, p1, p2, p3, p4, p5, p6);\
-  }\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type>\
-  template <typename arg_type>\
-  bool name##MatcherP7<p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
-      p5##_type, p6##_type>::gmock_Impl<arg_type>::MatchAndExplain(\
-      GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_)\
-          const
-
-#define MATCHER_P8(name, p0, p1, p2, p3, p4, p5, p6, p7, description)\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type, typename p7##_type>\
-  class name##MatcherP8 {\
-   public:\
-    template <typename arg_type>\
-    class gmock_Impl : public ::testing::MatcherInterface<\
-        GTEST_REFERENCE_TO_CONST_(arg_type)> {\
-     public:\
-      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-          p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
-          p6##_type gmock_p6, p7##_type gmock_p7)\
-           : p0(::std::move(gmock_p0)), p1(::std::move(gmock_p1)), \
-               p2(::std::move(gmock_p2)), p3(::std::move(gmock_p3)), \
-               p4(::std::move(gmock_p4)), p5(::std::move(gmock_p5)), \
-               p6(::std::move(gmock_p6)), p7(::std::move(gmock_p7)) {}\
-      virtual bool MatchAndExplain(\
-          GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-          ::testing::MatchResultListener* result_listener) const;\
-      virtual void DescribeTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(false);\
-      }\
-      virtual void DescribeNegationTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(true);\
-      }\
-      p0##_type const p0;\
-      p1##_type const p1;\
-      p2##_type const p2;\
-      p3##_type const p3;\
-      p4##_type const p4;\
-      p5##_type const p5;\
-      p6##_type const p6;\
-      p7##_type const p7;\
-     private:\
-      ::std::string FormatDescription(bool negation) const {\
-        ::std::string gmock_description = (description);\
-        if (!gmock_description.empty()) {\
-          return gmock_description;\
-        }\
-        return ::testing::internal::FormatMatcherDescription(\
-            negation, #name, \
-            ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
-                ::std::tuple<p0##_type, p1##_type, p2##_type, p3##_type, \
-                    p4##_type, p5##_type, p6##_type, p7##_type>(p0, p1, p2, \
-                    p3, p4, p5, p6, p7)));\
-      }\
-    };\
-    template <typename arg_type>\
-    operator ::testing::Matcher<arg_type>() const {\
-      return ::testing::Matcher<arg_type>(\
-          new gmock_Impl<arg_type>(p0, p1, p2, p3, p4, p5, p6, p7));\
-    }\
-    name##MatcherP8(p0##_type gmock_p0, p1##_type gmock_p1, \
-        p2##_type gmock_p2, p3##_type gmock_p3, p4##_type gmock_p4, \
-        p5##_type gmock_p5, p6##_type gmock_p6, \
-        p7##_type gmock_p7) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \
-        p5(::std::move(gmock_p5)), p6(::std::move(gmock_p6)), \
-        p7(::std::move(gmock_p7)) {\
-    }\
-    p0##_type const p0;\
-    p1##_type const p1;\
-    p2##_type const p2;\
-    p3##_type const p3;\
-    p4##_type const p4;\
-    p5##_type const p5;\
-    p6##_type const p6;\
-    p7##_type const p7;\
-   private:\
-  };\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type, typename p7##_type>\
-  inline name##MatcherP8<p0##_type, p1##_type, p2##_type, p3##_type, \
-      p4##_type, p5##_type, p6##_type, p7##_type> name(p0##_type p0, \
-      p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4, p5##_type p5, \
-      p6##_type p6, p7##_type p7) {\
-    return name##MatcherP8<p0##_type, p1##_type, p2##_type, p3##_type, \
-        p4##_type, p5##_type, p6##_type, p7##_type>(p0, p1, p2, p3, p4, p5, \
-        p6, p7);\
-  }\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type, typename p7##_type>\
-  template <typename arg_type>\
-  bool name##MatcherP8<p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
-      p5##_type, p6##_type, \
-      p7##_type>::gmock_Impl<arg_type>::MatchAndExplain(\
-      GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_)\
-          const
-
-#define MATCHER_P9(name, p0, p1, p2, p3, p4, p5, p6, p7, p8, description)\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type, typename p7##_type, typename p8##_type>\
-  class name##MatcherP9 {\
-   public:\
-    template <typename arg_type>\
-    class gmock_Impl : public ::testing::MatcherInterface<\
-        GTEST_REFERENCE_TO_CONST_(arg_type)> {\
-     public:\
-      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-          p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
-          p6##_type gmock_p6, p7##_type gmock_p7, p8##_type gmock_p8)\
-           : p0(::std::move(gmock_p0)), p1(::std::move(gmock_p1)), \
-               p2(::std::move(gmock_p2)), p3(::std::move(gmock_p3)), \
-               p4(::std::move(gmock_p4)), p5(::std::move(gmock_p5)), \
-               p6(::std::move(gmock_p6)), p7(::std::move(gmock_p7)), \
-               p8(::std::move(gmock_p8)) {}\
-      virtual bool MatchAndExplain(\
-          GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-          ::testing::MatchResultListener* result_listener) const;\
-      virtual void DescribeTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(false);\
-      }\
-      virtual void DescribeNegationTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(true);\
-      }\
-      p0##_type const p0;\
-      p1##_type const p1;\
-      p2##_type const p2;\
-      p3##_type const p3;\
-      p4##_type const p4;\
-      p5##_type const p5;\
-      p6##_type const p6;\
-      p7##_type const p7;\
-      p8##_type const p8;\
-     private:\
-      ::std::string FormatDescription(bool negation) const {\
-        ::std::string gmock_description = (description);\
-        if (!gmock_description.empty()) {\
-          return gmock_description;\
-        }\
-        return ::testing::internal::FormatMatcherDescription(\
-            negation, #name, \
-            ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
-                ::std::tuple<p0##_type, p1##_type, p2##_type, p3##_type, \
-                    p4##_type, p5##_type, p6##_type, p7##_type, \
-                    p8##_type>(p0, p1, p2, p3, p4, p5, p6, p7, p8)));\
-      }\
-    };\
-    template <typename arg_type>\
-    operator ::testing::Matcher<arg_type>() const {\
-      return ::testing::Matcher<arg_type>(\
-          new gmock_Impl<arg_type>(p0, p1, p2, p3, p4, p5, p6, p7, p8));\
-    }\
-    name##MatcherP9(p0##_type gmock_p0, p1##_type gmock_p1, \
-        p2##_type gmock_p2, p3##_type gmock_p3, p4##_type gmock_p4, \
-        p5##_type gmock_p5, p6##_type gmock_p6, p7##_type gmock_p7, \
-        p8##_type gmock_p8) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \
-        p5(::std::move(gmock_p5)), p6(::std::move(gmock_p6)), \
-        p7(::std::move(gmock_p7)), p8(::std::move(gmock_p8)) {\
-    }\
-    p0##_type const p0;\
-    p1##_type const p1;\
-    p2##_type const p2;\
-    p3##_type const p3;\
-    p4##_type const p4;\
-    p5##_type const p5;\
-    p6##_type const p6;\
-    p7##_type const p7;\
-    p8##_type const p8;\
-   private:\
-  };\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type, typename p7##_type, typename p8##_type>\
-  inline name##MatcherP9<p0##_type, p1##_type, p2##_type, p3##_type, \
-      p4##_type, p5##_type, p6##_type, p7##_type, \
-      p8##_type> name(p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, \
-      p4##_type p4, p5##_type p5, p6##_type p6, p7##_type p7, \
-      p8##_type p8) {\
-    return name##MatcherP9<p0##_type, p1##_type, p2##_type, p3##_type, \
-        p4##_type, p5##_type, p6##_type, p7##_type, p8##_type>(p0, p1, p2, \
-        p3, p4, p5, p6, p7, p8);\
-  }\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type, typename p7##_type, typename p8##_type>\
-  template <typename arg_type>\
-  bool name##MatcherP9<p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
-      p5##_type, p6##_type, p7##_type, \
-      p8##_type>::gmock_Impl<arg_type>::MatchAndExplain(\
-      GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_)\
-          const
-
-#define MATCHER_P10(name, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, description)\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type, typename p7##_type, typename p8##_type, \
-      typename p9##_type>\
-  class name##MatcherP10 {\
-   public:\
-    template <typename arg_type>\
-    class gmock_Impl : public ::testing::MatcherInterface<\
-        GTEST_REFERENCE_TO_CONST_(arg_type)> {\
-     public:\
-      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-          p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
-          p6##_type gmock_p6, p7##_type gmock_p7, p8##_type gmock_p8, \
-          p9##_type gmock_p9)\
-           : p0(::std::move(gmock_p0)), p1(::std::move(gmock_p1)), \
-               p2(::std::move(gmock_p2)), p3(::std::move(gmock_p3)), \
-               p4(::std::move(gmock_p4)), p5(::std::move(gmock_p5)), \
-               p6(::std::move(gmock_p6)), p7(::std::move(gmock_p7)), \
-               p8(::std::move(gmock_p8)), p9(::std::move(gmock_p9)) {}\
-      virtual bool MatchAndExplain(\
-          GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-          ::testing::MatchResultListener* result_listener) const;\
-      virtual void DescribeTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(false);\
-      }\
-      virtual void DescribeNegationTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(true);\
-      }\
-      p0##_type const p0;\
-      p1##_type const p1;\
-      p2##_type const p2;\
-      p3##_type const p3;\
-      p4##_type const p4;\
-      p5##_type const p5;\
-      p6##_type const p6;\
-      p7##_type const p7;\
-      p8##_type const p8;\
-      p9##_type const p9;\
-     private:\
-      ::std::string FormatDescription(bool negation) const {\
-        ::std::string gmock_description = (description);\
-        if (!gmock_description.empty()) {\
-          return gmock_description;\
-        }\
-        return ::testing::internal::FormatMatcherDescription(\
-            negation, #name, \
-            ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
-                ::std::tuple<p0##_type, p1##_type, p2##_type, p3##_type, \
-                    p4##_type, p5##_type, p6##_type, p7##_type, p8##_type, \
-                    p9##_type>(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9)));\
-      }\
-    };\
-    template <typename arg_type>\
-    operator ::testing::Matcher<arg_type>() const {\
-      return ::testing::Matcher<arg_type>(\
-          new gmock_Impl<arg_type>(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9));\
-    }\
-    name##MatcherP10(p0##_type gmock_p0, p1##_type gmock_p1, \
-        p2##_type gmock_p2, p3##_type gmock_p3, p4##_type gmock_p4, \
-        p5##_type gmock_p5, p6##_type gmock_p6, p7##_type gmock_p7, \
-        p8##_type gmock_p8, p9##_type gmock_p9) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \
-        p5(::std::move(gmock_p5)), p6(::std::move(gmock_p6)), \
-        p7(::std::move(gmock_p7)), p8(::std::move(gmock_p8)), \
-        p9(::std::move(gmock_p9)) {\
-    }\
-    p0##_type const p0;\
-    p1##_type const p1;\
-    p2##_type const p2;\
-    p3##_type const p3;\
-    p4##_type const p4;\
-    p5##_type const p5;\
-    p6##_type const p6;\
-    p7##_type const p7;\
-    p8##_type const p8;\
-    p9##_type const p9;\
-   private:\
-  };\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type, typename p7##_type, typename p8##_type, \
-      typename p9##_type>\
-  inline name##MatcherP10<p0##_type, p1##_type, p2##_type, p3##_type, \
-      p4##_type, p5##_type, p6##_type, p7##_type, p8##_type, \
-      p9##_type> name(p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, \
-      p4##_type p4, p5##_type p5, p6##_type p6, p7##_type p7, p8##_type p8, \
-      p9##_type p9) {\
-    return name##MatcherP10<p0##_type, p1##_type, p2##_type, p3##_type, \
-        p4##_type, p5##_type, p6##_type, p7##_type, p8##_type, p9##_type>(p0, \
-        p1, p2, p3, p4, p5, p6, p7, p8, p9);\
-  }\
-  template <typename p0##_type, typename p1##_type, typename p2##_type, \
-      typename p3##_type, typename p4##_type, typename p5##_type, \
-      typename p6##_type, typename p7##_type, typename p8##_type, \
-      typename p9##_type>\
-  template <typename arg_type>\
-  bool name##MatcherP10<p0##_type, p1##_type, p2##_type, p3##_type, \
-      p4##_type, p5##_type, p6##_type, p7##_type, p8##_type, \
-      p9##_type>::gmock_Impl<arg_type>::MatchAndExplain(\
-      GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_)\
-          const
-
-#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_MATCHERS_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-generated-matchers.h.pump mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-generated-matchers.h.pump
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-generated-matchers.h.pump	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-generated-matchers.h.pump	1970-01-01 00:00:00.000000000 +0000
@@ -1,346 +0,0 @@
-$$ -*- mode: c++; -*-
-$$ This is a Pump source file. Please use Pump to convert
-$$ it to gmock-generated-matchers.h.
-$$
-$var n = 10  $$ The maximum arity we support.
-$$ }} This line fixes auto-indentation of the following code in Emacs.
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file implements some commonly used variadic matchers.
-
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_MATCHERS_H_
-#define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_MATCHERS_H_
-
-#include <iterator>
-#include <sstream>
-#include <string>
-#include <utility>
-#include <vector>
-#include "gmock/gmock-matchers.h"
-
-// The MATCHER* family of macros can be used in a namespace scope to
-// define custom matchers easily.
-//
-// Basic Usage
-// ===========
-//
-// The syntax
-//
-//   MATCHER(name, description_string) { statements; }
-//
-// defines a matcher with the given name that executes the statements,
-// which must return a bool to indicate if the match succeeds.  Inside
-// the statements, you can refer to the value being matched by 'arg',
-// and refer to its type by 'arg_type'.
-//
-// The description string documents what the matcher does, and is used
-// to generate the failure message when the match fails.  Since a
-// MATCHER() is usually defined in a header file shared by multiple
-// C++ source files, we require the description to be a C-string
-// literal to avoid possible side effects.  It can be empty, in which
-// case we'll use the sequence of words in the matcher name as the
-// description.
-//
-// For example:
-//
-//   MATCHER(IsEven, "") { return (arg % 2) == 0; }
-//
-// allows you to write
-//
-//   // Expects mock_foo.Bar(n) to be called where n is even.
-//   EXPECT_CALL(mock_foo, Bar(IsEven()));
-//
-// or,
-//
-//   // Verifies that the value of some_expression is even.
-//   EXPECT_THAT(some_expression, IsEven());
-//
-// If the above assertion fails, it will print something like:
-//
-//   Value of: some_expression
-//   Expected: is even
-//     Actual: 7
-//
-// where the description "is even" is automatically calculated from the
-// matcher name IsEven.
-//
-// Argument Type
-// =============
-//
-// Note that the type of the value being matched (arg_type) is
-// determined by the context in which you use the matcher and is
-// supplied to you by the compiler, so you don't need to worry about
-// declaring it (nor can you).  This allows the matcher to be
-// polymorphic.  For example, IsEven() can be used to match any type
-// where the value of "(arg % 2) == 0" can be implicitly converted to
-// a bool.  In the "Bar(IsEven())" example above, if method Bar()
-// takes an int, 'arg_type' will be int; if it takes an unsigned long,
-// 'arg_type' will be unsigned long; and so on.
-//
-// Parameterizing Matchers
-// =======================
-//
-// Sometimes you'll want to parameterize the matcher.  For that you
-// can use another macro:
-//
-//   MATCHER_P(name, param_name, description_string) { statements; }
-//
-// For example:
-//
-//   MATCHER_P(HasAbsoluteValue, value, "") { return abs(arg) == value; }
-//
-// will allow you to write:
-//
-//   EXPECT_THAT(Blah("a"), HasAbsoluteValue(n));
-//
-// which may lead to this message (assuming n is 10):
-//
-//   Value of: Blah("a")
-//   Expected: has absolute value 10
-//     Actual: -9
-//
-// Note that both the matcher description and its parameter are
-// printed, making the message human-friendly.
-//
-// In the matcher definition body, you can write 'foo_type' to
-// reference the type of a parameter named 'foo'.  For example, in the
-// body of MATCHER_P(HasAbsoluteValue, value) above, you can write
-// 'value_type' to refer to the type of 'value'.
-//
-// We also provide MATCHER_P2, MATCHER_P3, ..., up to MATCHER_P$n to
-// support multi-parameter matchers.
-//
-// Describing Parameterized Matchers
-// =================================
-//
-// The last argument to MATCHER*() is a string-typed expression.  The
-// expression can reference all of the matcher's parameters and a
-// special bool-typed variable named 'negation'.  When 'negation' is
-// false, the expression should evaluate to the matcher's description;
-// otherwise it should evaluate to the description of the negation of
-// the matcher.  For example,
-//
-//   using testing::PrintToString;
-//
-//   MATCHER_P2(InClosedRange, low, hi,
-//       std::string(negation ? "is not" : "is") + " in range [" +
-//       PrintToString(low) + ", " + PrintToString(hi) + "]") {
-//     return low <= arg && arg <= hi;
-//   }
-//   ...
-//   EXPECT_THAT(3, InClosedRange(4, 6));
-//   EXPECT_THAT(3, Not(InClosedRange(2, 4)));
-//
-// would generate two failures that contain the text:
-//
-//   Expected: is in range [4, 6]
-//   ...
-//   Expected: is not in range [2, 4]
-//
-// If you specify "" as the description, the failure message will
-// contain the sequence of words in the matcher name followed by the
-// parameter values printed as a tuple.  For example,
-//
-//   MATCHER_P2(InClosedRange, low, hi, "") { ... }
-//   ...
-//   EXPECT_THAT(3, InClosedRange(4, 6));
-//   EXPECT_THAT(3, Not(InClosedRange(2, 4)));
-//
-// would generate two failures that contain the text:
-//
-//   Expected: in closed range (4, 6)
-//   ...
-//   Expected: not (in closed range (2, 4))
-//
-// Types of Matcher Parameters
-// ===========================
-//
-// For the purpose of typing, you can view
-//
-//   MATCHER_Pk(Foo, p1, ..., pk, description_string) { ... }
-//
-// as shorthand for
-//
-//   template <typename p1_type, ..., typename pk_type>
-//   FooMatcherPk<p1_type, ..., pk_type>
-//   Foo(p1_type p1, ..., pk_type pk) { ... }
-//
-// When you write Foo(v1, ..., vk), the compiler infers the types of
-// the parameters v1, ..., and vk for you.  If you are not happy with
-// the result of the type inference, you can specify the types by
-// explicitly instantiating the template, as in Foo<long, bool>(5,
-// false).  As said earlier, you don't get to (or need to) specify
-// 'arg_type' as that's determined by the context in which the matcher
-// is used.  You can assign the result of expression Foo(p1, ..., pk)
-// to a variable of type FooMatcherPk<p1_type, ..., pk_type>.  This
-// can be useful when composing matchers.
-//
-// While you can instantiate a matcher template with reference types,
-// passing the parameters by pointer usually makes your code more
-// readable.  If, however, you still want to pass a parameter by
-// reference, be aware that in the failure message generated by the
-// matcher you will see the value of the referenced object but not its
-// address.
-//
-// Explaining Match Results
-// ========================
-//
-// Sometimes the matcher description alone isn't enough to explain why
-// the match has failed or succeeded.  For example, when expecting a
-// long string, it can be very helpful to also print the diff between
-// the expected string and the actual one.  To achieve that, you can
-// optionally stream additional information to a special variable
-// named result_listener, whose type is a pointer to class
-// MatchResultListener:
-//
-//   MATCHER_P(EqualsLongString, str, "") {
-//     if (arg == str) return true;
-//
-//     *result_listener << "the difference: "
-///                     << DiffStrings(str, arg);
-//     return false;
-//   }
-//
-// Overloading Matchers
-// ====================
-//
-// You can overload matchers with different numbers of parameters:
-//
-//   MATCHER_P(Blah, a, description_string1) { ... }
-//   MATCHER_P2(Blah, a, b, description_string2) { ... }
-//
-// Caveats
-// =======
-//
-// When defining a new matcher, you should also consider implementing
-// MatcherInterface or using MakePolymorphicMatcher().  These
-// approaches require more work than the MATCHER* macros, but also
-// give you more control on the types of the value being matched and
-// the matcher parameters, which may leads to better compiler error
-// messages when the matcher is used wrong.  They also allow
-// overloading matchers based on parameter types (as opposed to just
-// based on the number of parameters).
-//
-// MATCHER*() can only be used in a namespace scope as templates cannot be
-// declared inside of a local class.
-//
-// More Information
-// ================
-//
-// To learn more about using these macros, please search for 'MATCHER'
-// on
-// https://github.com/google/googletest/blob/master/googlemock/docs/cook_book.md
-
-$range i 0..n
-$for i
-
-[[
-$var macro_name = [[$if i==0 [[MATCHER]] $elif i==1 [[MATCHER_P]]
-                                         $else [[MATCHER_P$i]]]]
-$var class_name = [[name##Matcher[[$if i==0 [[]] $elif i==1 [[P]]
-                                                 $else [[P$i]]]]]]
-$range j 0..i-1
-$var template = [[$if i==0 [[]] $else [[
-
-  template <$for j, [[typename p$j##_type]]>\
-]]]]
-$var ctor_param_list = [[$for j, [[p$j##_type gmock_p$j]]]]
-$var impl_ctor_param_list = [[$for j, [[p$j##_type gmock_p$j]]]]
-$var impl_inits = [[$if i==0 [[]] $else [[ : $for j, [[p$j(::std::move(gmock_p$j))]]]]]]
-$var inits = [[$if i==0 [[]] $else [[ : $for j, [[p$j(::std::move(gmock_p$j))]]]]]]
-$var params = [[$for j, [[p$j]]]]
-$var param_types = [[$if i==0 [[]] $else [[<$for j, [[p$j##_type]]>]]]]
-$var param_types_and_names = [[$for j, [[p$j##_type p$j]]]]
-$var param_field_decls = [[$for j
-[[
-
-      p$j##_type const p$j;\
-]]]]
-$var param_field_decls2 = [[$for j
-[[
-
-    p$j##_type const p$j;\
-]]]]
-
-#define $macro_name(name$for j [[, p$j]], description)\$template
-  class $class_name {\
-   public:\
-    template <typename arg_type>\
-    class gmock_Impl : public ::testing::MatcherInterface<\
-        GTEST_REFERENCE_TO_CONST_(arg_type)> {\
-     public:\
-      [[$if i==1 [[explicit ]]]]gmock_Impl($impl_ctor_param_list)\
-          $impl_inits {}\
-      virtual bool MatchAndExplain(\
-          GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-          ::testing::MatchResultListener* result_listener) const;\
-      virtual void DescribeTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(false);\
-      }\
-      virtual void DescribeNegationTo(::std::ostream* gmock_os) const {\
-        *gmock_os << FormatDescription(true);\
-      }\$param_field_decls
-     private:\
-      ::std::string FormatDescription(bool negation) const {\
-        ::std::string gmock_description = (description);\
-        if (!gmock_description.empty()) {\
-          return gmock_description;\
-        }\
-        return ::testing::internal::FormatMatcherDescription(\
-            negation, #name, \
-            ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
-                ::std::tuple<$for j, [[p$j##_type]]>($for j, [[p$j]])));\
-      }\
-    };\
-    template <typename arg_type>\
-    operator ::testing::Matcher<arg_type>() const {\
-      return ::testing::Matcher<arg_type>(\
-          new gmock_Impl<arg_type>($params));\
-    }\
-    [[$if i==1 [[explicit ]]]]$class_name($ctor_param_list)$inits {\
-    }\$param_field_decls2
-   private:\
-  };\$template
-  inline $class_name$param_types name($param_types_and_names) {\
-    return $class_name$param_types($params);\
-  }\$template
-  template <typename arg_type>\
-  bool $class_name$param_types::gmock_Impl<arg_type>::MatchAndExplain(\
-      GTEST_REFERENCE_TO_CONST_(arg_type) arg,\
-      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_)\
-          const
-]]
-
-
-#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_MATCHERS_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,101 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This is the main header file a user should include.
-
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_H_
-#define GMOCK_INCLUDE_GMOCK_GMOCK_H_
-
-// This file implements the following syntax:
-//
-//   ON_CALL(mock_object, Method(...))
-//     .With(...) ?
-//     .WillByDefault(...);
-//
-// where With() is optional and WillByDefault() must appear exactly
-// once.
-//
-//   EXPECT_CALL(mock_object, Method(...))
-//     .With(...) ?
-//     .Times(...) ?
-//     .InSequence(...) *
-//     .WillOnce(...) *
-//     .WillRepeatedly(...) ?
-//     .RetiresOnSaturation() ? ;
-//
-// where all clauses are optional and WillOnce() can be repeated.
-
-#include "gmock/gmock-actions.h"
-#include "gmock/gmock-cardinalities.h"
-#include "gmock/gmock-function-mocker.h"
-#include "gmock/gmock-generated-actions.h"
-#include "gmock/gmock-generated-function-mockers.h"
-#include "gmock/gmock-generated-matchers.h"
-#include "gmock/gmock-matchers.h"
-#include "gmock/gmock-more-actions.h"
-#include "gmock/gmock-more-matchers.h"
-#include "gmock/gmock-nice-strict.h"
-#include "gmock/internal/gmock-internal-utils.h"
-
-namespace testing {
-
-// Declares Google Mock flags that we want a user to use programmatically.
-GMOCK_DECLARE_bool_(catch_leaked_mocks);
-GMOCK_DECLARE_string_(verbose);
-GMOCK_DECLARE_int32_(default_mock_behavior);
-
-// Initializes Google Mock.  This must be called before running the
-// tests.  In particular, it parses the command line for the flags
-// that Google Mock recognizes.  Whenever a Google Mock flag is seen,
-// it is removed from argv, and *argc is decremented.
-//
-// No value is returned.  Instead, the Google Mock flag variables are
-// updated.
-//
-// Since Google Test is needed for Google Mock to work, this function
-// also initializes Google Test and parses its flags, if that hasn't
-// been done.
-GTEST_API_ void InitGoogleMock(int* argc, char** argv);
-
-// This overloaded version can be used in Windows programs compiled in
-// UNICODE mode.
-GTEST_API_ void InitGoogleMock(int* argc, wchar_t** argv);
-
-// This overloaded version can be used on Arduino/embedded platforms where
-// there is no argc/argv.
-GTEST_API_ void InitGoogleMock();
-
-}  // namespace testing
-
-#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-matchers.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-matchers.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-matchers.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-matchers.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,4568 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file implements some commonly used argument matchers.  More
-// matchers can be defined by the user implementing the
-// MatcherInterface<T> interface if necessary.
-//
-// See googletest/include/gtest/gtest-matchers.h for the definition of class
-// Matcher, class MatcherInterface, and others.
-
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_MATCHERS_H_
-#define GMOCK_INCLUDE_GMOCK_GMOCK_MATCHERS_H_
-
-#include <math.h>
-#include <algorithm>
-#include <initializer_list>
-#include <iterator>
-#include <limits>
-#include <memory>
-#include <ostream>  // NOLINT
-#include <sstream>
-#include <string>
-#include <type_traits>
-#include <utility>
-#include <vector>
-#include "gmock/internal/gmock-internal-utils.h"
-#include "gmock/internal/gmock-port.h"
-#include "gtest/gtest.h"
-
-// MSVC warning C5046 is new as of VS2017 version 15.8.
-#if defined(_MSC_VER) && _MSC_VER >= 1915
-#define GMOCK_MAYBE_5046_ 5046
-#else
-#define GMOCK_MAYBE_5046_
-#endif
-
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(
-    4251 GMOCK_MAYBE_5046_ /* class A needs to have dll-interface to be used by
-                              clients of class B */
-    /* Symbol involving type with internal linkage not defined */)
-
-namespace testing {
-
-// To implement a matcher Foo for type T, define:
-//   1. a class FooMatcherImpl that implements the
-//      MatcherInterface<T> interface, and
-//   2. a factory function that creates a Matcher<T> object from a
-//      FooMatcherImpl*.
-//
-// The two-level delegation design makes it possible to allow a user
-// to write "v" instead of "Eq(v)" where a Matcher is expected, which
-// is impossible if we pass matchers by pointers.  It also eases
-// ownership management as Matcher objects can now be copied like
-// plain values.
-
-// A match result listener that stores the explanation in a string.
-class StringMatchResultListener : public MatchResultListener {
- public:
-  StringMatchResultListener() : MatchResultListener(&ss_) {}
-
-  // Returns the explanation accumulated so far.
-  std::string str() const { return ss_.str(); }
-
-  // Clears the explanation accumulated so far.
-  void Clear() { ss_.str(""); }
-
- private:
-  ::std::stringstream ss_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(StringMatchResultListener);
-};
-
-// Anything inside the 'internal' namespace IS INTERNAL IMPLEMENTATION
-// and MUST NOT BE USED IN USER CODE!!!
-namespace internal {
-
-// The MatcherCastImpl class template is a helper for implementing
-// MatcherCast().  We need this helper in order to partially
-// specialize the implementation of MatcherCast() (C++ allows
-// class/struct templates to be partially specialized, but not
-// function templates.).
-
-// This general version is used when MatcherCast()'s argument is a
-// polymorphic matcher (i.e. something that can be converted to a
-// Matcher but is not one yet; for example, Eq(value)) or a value (for
-// example, "hello").
-template <typename T, typename M>
-class MatcherCastImpl {
- public:
-  static Matcher<T> Cast(const M& polymorphic_matcher_or_value) {
-    // M can be a polymorphic matcher, in which case we want to use
-    // its conversion operator to create Matcher<T>.  Or it can be a value
-    // that should be passed to the Matcher<T>'s constructor.
-    //
-    // We can't call Matcher<T>(polymorphic_matcher_or_value) when M is a
-    // polymorphic matcher because it'll be ambiguous if T has an implicit
-    // constructor from M (this usually happens when T has an implicit
-    // constructor from any type).
-    //
-    // It won't work to unconditionally implict_cast
-    // polymorphic_matcher_or_value to Matcher<T> because it won't trigger
-    // a user-defined conversion from M to T if one exists (assuming M is
-    // a value).
-    return CastImpl(polymorphic_matcher_or_value,
-                    std::is_convertible<M, Matcher<T>>{},
-                    std::is_convertible<M, T>{});
-  }
-
- private:
-  template <bool Ignore>
-  static Matcher<T> CastImpl(const M& polymorphic_matcher_or_value,
-                             std::true_type /* convertible_to_matcher */,
-                             bool_constant<Ignore>) {
-    // M is implicitly convertible to Matcher<T>, which means that either
-    // M is a polymorphic matcher or Matcher<T> has an implicit constructor
-    // from M.  In both cases using the implicit conversion will produce a
-    // matcher.
-    //
-    // Even if T has an implicit constructor from M, it won't be called because
-    // creating Matcher<T> would require a chain of two user-defined conversions
-    // (first to create T from M and then to create Matcher<T> from T).
-    return polymorphic_matcher_or_value;
-  }
-
-  // M can't be implicitly converted to Matcher<T>, so M isn't a polymorphic
-  // matcher. It's a value of a type implicitly convertible to T. Use direct
-  // initialization to create a matcher.
-  static Matcher<T> CastImpl(const M& value,
-                             std::false_type /* convertible_to_matcher */,
-                             std::true_type /* convertible_to_T */) {
-    return Matcher<T>(ImplicitCast_<T>(value));
-  }
-
-  // M can't be implicitly converted to either Matcher<T> or T. Attempt to use
-  // polymorphic matcher Eq(value) in this case.
-  //
-  // Note that we first attempt to perform an implicit cast on the value and
-  // only fall back to the polymorphic Eq() matcher afterwards because the
-  // latter calls bool operator==(const Lhs& lhs, const Rhs& rhs) in the end
-  // which might be undefined even when Rhs is implicitly convertible to Lhs
-  // (e.g. std::pair<const int, int> vs. std::pair<int, int>).
-  //
-  // We don't define this method inline as we need the declaration of Eq().
-  static Matcher<T> CastImpl(const M& value,
-                             std::false_type /* convertible_to_matcher */,
-                             std::false_type /* convertible_to_T */);
-};
-
-// This more specialized version is used when MatcherCast()'s argument
-// is already a Matcher.  This only compiles when type T can be
-// statically converted to type U.
-template <typename T, typename U>
-class MatcherCastImpl<T, Matcher<U> > {
- public:
-  static Matcher<T> Cast(const Matcher<U>& source_matcher) {
-    return Matcher<T>(new Impl(source_matcher));
-  }
-
- private:
-  class Impl : public MatcherInterface<T> {
-   public:
-    explicit Impl(const Matcher<U>& source_matcher)
-        : source_matcher_(source_matcher) {}
-
-    // We delegate the matching logic to the source matcher.
-    bool MatchAndExplain(T x, MatchResultListener* listener) const override {
-      using FromType = typename std::remove_cv<typename std::remove_pointer<
-          typename std::remove_reference<T>::type>::type>::type;
-      using ToType = typename std::remove_cv<typename std::remove_pointer<
-          typename std::remove_reference<U>::type>::type>::type;
-      // Do not allow implicitly converting base*/& to derived*/&.
-      static_assert(
-          // Do not trigger if only one of them is a pointer. That implies a
-          // regular conversion and not a down_cast.
-          (std::is_pointer<typename std::remove_reference<T>::type>::value !=
-           std::is_pointer<typename std::remove_reference<U>::type>::value) ||
-              std::is_same<FromType, ToType>::value ||
-              !std::is_base_of<FromType, ToType>::value,
-          "Can't implicitly convert from <base> to <derived>");
-
-      return source_matcher_.MatchAndExplain(static_cast<U>(x), listener);
-    }
-
-    void DescribeTo(::std::ostream* os) const override {
-      source_matcher_.DescribeTo(os);
-    }
-
-    void DescribeNegationTo(::std::ostream* os) const override {
-      source_matcher_.DescribeNegationTo(os);
-    }
-
-   private:
-    const Matcher<U> source_matcher_;
-
-    GTEST_DISALLOW_ASSIGN_(Impl);
-  };
-};
-
-// This even more specialized version is used for efficiently casting
-// a matcher to its own type.
-template <typename T>
-class MatcherCastImpl<T, Matcher<T> > {
- public:
-  static Matcher<T> Cast(const Matcher<T>& matcher) { return matcher; }
-};
-
-}  // namespace internal
-
-// In order to be safe and clear, casting between different matcher
-// types is done explicitly via MatcherCast<T>(m), which takes a
-// matcher m and returns a Matcher<T>.  It compiles only when T can be
-// statically converted to the argument type of m.
-template <typename T, typename M>
-inline Matcher<T> MatcherCast(const M& matcher) {
-  return internal::MatcherCastImpl<T, M>::Cast(matcher);
-}
-
-// Implements SafeMatcherCast().
-//
-// FIXME: The intermediate SafeMatcherCastImpl class was introduced as a
-// workaround for a compiler bug, and can now be removed.
-template <typename T>
-class SafeMatcherCastImpl {
- public:
-  // This overload handles polymorphic matchers and values only since
-  // monomorphic matchers are handled by the next one.
-  template <typename M>
-  static inline Matcher<T> Cast(const M& polymorphic_matcher_or_value) {
-    return internal::MatcherCastImpl<T, M>::Cast(polymorphic_matcher_or_value);
-  }
-
-  // This overload handles monomorphic matchers.
-  //
-  // In general, if type T can be implicitly converted to type U, we can
-  // safely convert a Matcher<U> to a Matcher<T> (i.e. Matcher is
-  // contravariant): just keep a copy of the original Matcher<U>, convert the
-  // argument from type T to U, and then pass it to the underlying Matcher<U>.
-  // The only exception is when U is a reference and T is not, as the
-  // underlying Matcher<U> may be interested in the argument's address, which
-  // is not preserved in the conversion from T to U.
-  template <typename U>
-  static inline Matcher<T> Cast(const Matcher<U>& matcher) {
-    // Enforce that T can be implicitly converted to U.
-    GTEST_COMPILE_ASSERT_((std::is_convertible<T, U>::value),
-                          "T must be implicitly convertible to U");
-    // Enforce that we are not converting a non-reference type T to a reference
-    // type U.
-    GTEST_COMPILE_ASSERT_(
-        std::is_reference<T>::value || !std::is_reference<U>::value,
-        cannot_convert_non_reference_arg_to_reference);
-    // In case both T and U are arithmetic types, enforce that the
-    // conversion is not lossy.
-    typedef GTEST_REMOVE_REFERENCE_AND_CONST_(T) RawT;
-    typedef GTEST_REMOVE_REFERENCE_AND_CONST_(U) RawU;
-    const bool kTIsOther = GMOCK_KIND_OF_(RawT) == internal::kOther;
-    const bool kUIsOther = GMOCK_KIND_OF_(RawU) == internal::kOther;
-    GTEST_COMPILE_ASSERT_(
-        kTIsOther || kUIsOther ||
-        (internal::LosslessArithmeticConvertible<RawT, RawU>::value),
-        conversion_of_arithmetic_types_must_be_lossless);
-    return MatcherCast<T>(matcher);
-  }
-};
-
-template <typename T, typename M>
-inline Matcher<T> SafeMatcherCast(const M& polymorphic_matcher) {
-  return SafeMatcherCastImpl<T>::Cast(polymorphic_matcher);
-}
-
-// A<T>() returns a matcher that matches any value of type T.
-template <typename T>
-Matcher<T> A();
-
-// Anything inside the 'internal' namespace IS INTERNAL IMPLEMENTATION
-// and MUST NOT BE USED IN USER CODE!!!
-namespace internal {
-
-// If the explanation is not empty, prints it to the ostream.
-inline void PrintIfNotEmpty(const std::string& explanation,
-                            ::std::ostream* os) {
-  if (explanation != "" && os != nullptr) {
-    *os << ", " << explanation;
-  }
-}
-
-// Returns true if the given type name is easy to read by a human.
-// This is used to decide whether printing the type of a value might
-// be helpful.
-inline bool IsReadableTypeName(const std::string& type_name) {
-  // We consider a type name readable if it's short or doesn't contain
-  // a template or function type.
-  return (type_name.length() <= 20 ||
-          type_name.find_first_of("<(") == std::string::npos);
-}
-
-// Matches the value against the given matcher, prints the value and explains
-// the match result to the listener. Returns the match result.
-// 'listener' must not be NULL.
-// Value cannot be passed by const reference, because some matchers take a
-// non-const argument.
-template <typename Value, typename T>
-bool MatchPrintAndExplain(Value& value, const Matcher<T>& matcher,
-                          MatchResultListener* listener) {
-  if (!listener->IsInterested()) {
-    // If the listener is not interested, we do not need to construct the
-    // inner explanation.
-    return matcher.Matches(value);
-  }
-
-  StringMatchResultListener inner_listener;
-  const bool match = matcher.MatchAndExplain(value, &inner_listener);
-
-  UniversalPrint(value, listener->stream());
-#if GTEST_HAS_RTTI
-  const std::string& type_name = GetTypeName<Value>();
-  if (IsReadableTypeName(type_name))
-    *listener->stream() << " (of type " << type_name << ")";
-#endif
-  PrintIfNotEmpty(inner_listener.str(), listener->stream());
-
-  return match;
-}
-
-// An internal helper class for doing compile-time loop on a tuple's
-// fields.
-template <size_t N>
-class TuplePrefix {
- public:
-  // TuplePrefix<N>::Matches(matcher_tuple, value_tuple) returns true
-  // if and only if the first N fields of matcher_tuple matches
-  // the first N fields of value_tuple, respectively.
-  template <typename MatcherTuple, typename ValueTuple>
-  static bool Matches(const MatcherTuple& matcher_tuple,
-                      const ValueTuple& value_tuple) {
-    return TuplePrefix<N - 1>::Matches(matcher_tuple, value_tuple) &&
-           std::get<N - 1>(matcher_tuple).Matches(std::get<N - 1>(value_tuple));
-  }
-
-  // TuplePrefix<N>::ExplainMatchFailuresTo(matchers, values, os)
-  // describes failures in matching the first N fields of matchers
-  // against the first N fields of values.  If there is no failure,
-  // nothing will be streamed to os.
-  template <typename MatcherTuple, typename ValueTuple>
-  static void ExplainMatchFailuresTo(const MatcherTuple& matchers,
-                                     const ValueTuple& values,
-                                     ::std::ostream* os) {
-    // First, describes failures in the first N - 1 fields.
-    TuplePrefix<N - 1>::ExplainMatchFailuresTo(matchers, values, os);
-
-    // Then describes the failure (if any) in the (N - 1)-th (0-based)
-    // field.
-    typename std::tuple_element<N - 1, MatcherTuple>::type matcher =
-        std::get<N - 1>(matchers);
-    typedef typename std::tuple_element<N - 1, ValueTuple>::type Value;
-    const Value& value = std::get<N - 1>(values);
-    StringMatchResultListener listener;
-    if (!matcher.MatchAndExplain(value, &listener)) {
-      *os << "  Expected arg #" << N - 1 << ": ";
-      std::get<N - 1>(matchers).DescribeTo(os);
-      *os << "\n           Actual: ";
-      // We remove the reference in type Value to prevent the
-      // universal printer from printing the address of value, which
-      // isn't interesting to the user most of the time.  The
-      // matcher's MatchAndExplain() method handles the case when
-      // the address is interesting.
-      internal::UniversalPrint(value, os);
-      PrintIfNotEmpty(listener.str(), os);
-      *os << "\n";
-    }
-  }
-};
-
-// The base case.
-template <>
-class TuplePrefix<0> {
- public:
-  template <typename MatcherTuple, typename ValueTuple>
-  static bool Matches(const MatcherTuple& /* matcher_tuple */,
-                      const ValueTuple& /* value_tuple */) {
-    return true;
-  }
-
-  template <typename MatcherTuple, typename ValueTuple>
-  static void ExplainMatchFailuresTo(const MatcherTuple& /* matchers */,
-                                     const ValueTuple& /* values */,
-                                     ::std::ostream* /* os */) {}
-};
-
-// TupleMatches(matcher_tuple, value_tuple) returns true if and only if
-// all matchers in matcher_tuple match the corresponding fields in
-// value_tuple.  It is a compiler error if matcher_tuple and
-// value_tuple have different number of fields or incompatible field
-// types.
-template <typename MatcherTuple, typename ValueTuple>
-bool TupleMatches(const MatcherTuple& matcher_tuple,
-                  const ValueTuple& value_tuple) {
-  // Makes sure that matcher_tuple and value_tuple have the same
-  // number of fields.
-  GTEST_COMPILE_ASSERT_(std::tuple_size<MatcherTuple>::value ==
-                            std::tuple_size<ValueTuple>::value,
-                        matcher_and_value_have_different_numbers_of_fields);
-  return TuplePrefix<std::tuple_size<ValueTuple>::value>::Matches(matcher_tuple,
-                                                                  value_tuple);
-}
-
-// Describes failures in matching matchers against values.  If there
-// is no failure, nothing will be streamed to os.
-template <typename MatcherTuple, typename ValueTuple>
-void ExplainMatchFailureTupleTo(const MatcherTuple& matchers,
-                                const ValueTuple& values,
-                                ::std::ostream* os) {
-  TuplePrefix<std::tuple_size<MatcherTuple>::value>::ExplainMatchFailuresTo(
-      matchers, values, os);
-}
-
-// TransformTupleValues and its helper.
-//
-// TransformTupleValuesHelper hides the internal machinery that
-// TransformTupleValues uses to implement a tuple traversal.
-template <typename Tuple, typename Func, typename OutIter>
-class TransformTupleValuesHelper {
- private:
-  typedef ::std::tuple_size<Tuple> TupleSize;
-
- public:
-  // For each member of tuple 't', taken in order, evaluates '*out++ = f(t)'.
-  // Returns the final value of 'out' in case the caller needs it.
-  static OutIter Run(Func f, const Tuple& t, OutIter out) {
-    return IterateOverTuple<Tuple, TupleSize::value>()(f, t, out);
-  }
-
- private:
-  template <typename Tup, size_t kRemainingSize>
-  struct IterateOverTuple {
-    OutIter operator() (Func f, const Tup& t, OutIter out) const {
-      *out++ = f(::std::get<TupleSize::value - kRemainingSize>(t));
-      return IterateOverTuple<Tup, kRemainingSize - 1>()(f, t, out);
-    }
-  };
-  template <typename Tup>
-  struct IterateOverTuple<Tup, 0> {
-    OutIter operator() (Func /* f */, const Tup& /* t */, OutIter out) const {
-      return out;
-    }
-  };
-};
-
-// Successively invokes 'f(element)' on each element of the tuple 't',
-// appending each result to the 'out' iterator. Returns the final value
-// of 'out'.
-template <typename Tuple, typename Func, typename OutIter>
-OutIter TransformTupleValues(Func f, const Tuple& t, OutIter out) {
-  return TransformTupleValuesHelper<Tuple, Func, OutIter>::Run(f, t, out);
-}
-
-// Implements A<T>().
-template <typename T>
-class AnyMatcherImpl : public MatcherInterface<const T&> {
- public:
-  bool MatchAndExplain(const T& /* x */,
-                       MatchResultListener* /* listener */) const override {
-    return true;
-  }
-  void DescribeTo(::std::ostream* os) const override { *os << "is anything"; }
-  void DescribeNegationTo(::std::ostream* os) const override {
-    // This is mostly for completeness' safe, as it's not very useful
-    // to write Not(A<bool>()).  However we cannot completely rule out
-    // such a possibility, and it doesn't hurt to be prepared.
-    *os << "never matches";
-  }
-};
-
-// Implements _, a matcher that matches any value of any
-// type.  This is a polymorphic matcher, so we need a template type
-// conversion operator to make it appearing as a Matcher<T> for any
-// type T.
-class AnythingMatcher {
- public:
-  template <typename T>
-  operator Matcher<T>() const { return A<T>(); }
-};
-
-// Implements the polymorphic IsNull() matcher, which matches any raw or smart
-// pointer that is NULL.
-class IsNullMatcher {
- public:
-  template <typename Pointer>
-  bool MatchAndExplain(const Pointer& p,
-                       MatchResultListener* /* listener */) const {
-    return p == nullptr;
-  }
-
-  void DescribeTo(::std::ostream* os) const { *os << "is NULL"; }
-  void DescribeNegationTo(::std::ostream* os) const {
-    *os << "isn't NULL";
-  }
-};
-
-// Implements the polymorphic NotNull() matcher, which matches any raw or smart
-// pointer that is not NULL.
-class NotNullMatcher {
- public:
-  template <typename Pointer>
-  bool MatchAndExplain(const Pointer& p,
-                       MatchResultListener* /* listener */) const {
-    return p != nullptr;
-  }
-
-  void DescribeTo(::std::ostream* os) const { *os << "isn't NULL"; }
-  void DescribeNegationTo(::std::ostream* os) const {
-    *os << "is NULL";
-  }
-};
-
-// Ref(variable) matches any argument that is a reference to
-// 'variable'.  This matcher is polymorphic as it can match any
-// super type of the type of 'variable'.
-//
-// The RefMatcher template class implements Ref(variable).  It can
-// only be instantiated with a reference type.  This prevents a user
-// from mistakenly using Ref(x) to match a non-reference function
-// argument.  For example, the following will righteously cause a
-// compiler error:
-//
-//   int n;
-//   Matcher<int> m1 = Ref(n);   // This won't compile.
-//   Matcher<int&> m2 = Ref(n);  // This will compile.
-template <typename T>
-class RefMatcher;
-
-template <typename T>
-class RefMatcher<T&> {
-  // Google Mock is a generic framework and thus needs to support
-  // mocking any function types, including those that take non-const
-  // reference arguments.  Therefore the template parameter T (and
-  // Super below) can be instantiated to either a const type or a
-  // non-const type.
- public:
-  // RefMatcher() takes a T& instead of const T&, as we want the
-  // compiler to catch using Ref(const_value) as a matcher for a
-  // non-const reference.
-  explicit RefMatcher(T& x) : object_(x) {}  // NOLINT
-
-  template <typename Super>
-  operator Matcher<Super&>() const {
-    // By passing object_ (type T&) to Impl(), which expects a Super&,
-    // we make sure that Super is a super type of T.  In particular,
-    // this catches using Ref(const_value) as a matcher for a
-    // non-const reference, as you cannot implicitly convert a const
-    // reference to a non-const reference.
-    return MakeMatcher(new Impl<Super>(object_));
-  }
-
- private:
-  template <typename Super>
-  class Impl : public MatcherInterface<Super&> {
-   public:
-    explicit Impl(Super& x) : object_(x) {}  // NOLINT
-
-    // MatchAndExplain() takes a Super& (as opposed to const Super&)
-    // in order to match the interface MatcherInterface<Super&>.
-    bool MatchAndExplain(Super& x,
-                         MatchResultListener* listener) const override {
-      *listener << "which is located @" << static_cast<const void*>(&x);
-      return &x == &object_;
-    }
-
-    void DescribeTo(::std::ostream* os) const override {
-      *os << "references the variable ";
-      UniversalPrinter<Super&>::Print(object_, os);
-    }
-
-    void DescribeNegationTo(::std::ostream* os) const override {
-      *os << "does not reference the variable ";
-      UniversalPrinter<Super&>::Print(object_, os);
-    }
-
-   private:
-    const Super& object_;
-
-    GTEST_DISALLOW_ASSIGN_(Impl);
-  };
-
-  T& object_;
-
-  GTEST_DISALLOW_ASSIGN_(RefMatcher);
-};
-
-// Polymorphic helper functions for narrow and wide string matchers.
-inline bool CaseInsensitiveCStringEquals(const char* lhs, const char* rhs) {
-  return String::CaseInsensitiveCStringEquals(lhs, rhs);
-}
-
-inline bool CaseInsensitiveCStringEquals(const wchar_t* lhs,
-                                         const wchar_t* rhs) {
-  return String::CaseInsensitiveWideCStringEquals(lhs, rhs);
-}
-
-// String comparison for narrow or wide strings that can have embedded NUL
-// characters.
-template <typename StringType>
-bool CaseInsensitiveStringEquals(const StringType& s1,
-                                 const StringType& s2) {
-  // Are the heads equal?
-  if (!CaseInsensitiveCStringEquals(s1.c_str(), s2.c_str())) {
-    return false;
-  }
-
-  // Skip the equal heads.
-  const typename StringType::value_type nul = 0;
-  const size_t i1 = s1.find(nul), i2 = s2.find(nul);
-
-  // Are we at the end of either s1 or s2?
-  if (i1 == StringType::npos || i2 == StringType::npos) {
-    return i1 == i2;
-  }
-
-  // Are the tails equal?
-  return CaseInsensitiveStringEquals(s1.substr(i1 + 1), s2.substr(i2 + 1));
-}
-
-// String matchers.
-
-// Implements equality-based string matchers like StrEq, StrCaseNe, and etc.
-template <typename StringType>
-class StrEqualityMatcher {
- public:
-  StrEqualityMatcher(const StringType& str, bool expect_eq,
-                     bool case_sensitive)
-      : string_(str), expect_eq_(expect_eq), case_sensitive_(case_sensitive) {}
-
-#if GTEST_HAS_ABSL
-  bool MatchAndExplain(const absl::string_view& s,
-                       MatchResultListener* listener) const {
-    // This should fail to compile if absl::string_view is used with wide
-    // strings.
-    const StringType& str = std::string(s);
-    return MatchAndExplain(str, listener);
-  }
-#endif  // GTEST_HAS_ABSL
-
-  // Accepts pointer types, particularly:
-  //   const char*
-  //   char*
-  //   const wchar_t*
-  //   wchar_t*
-  template <typename CharType>
-  bool MatchAndExplain(CharType* s, MatchResultListener* listener) const {
-    if (s == nullptr) {
-      return !expect_eq_;
-    }
-    return MatchAndExplain(StringType(s), listener);
-  }
-
-  // Matches anything that can convert to StringType.
-  //
-  // This is a template, not just a plain function with const StringType&,
-  // because absl::string_view has some interfering non-explicit constructors.
-  template <typename MatcheeStringType>
-  bool MatchAndExplain(const MatcheeStringType& s,
-                       MatchResultListener* /* listener */) const {
-    const StringType& s2(s);
-    const bool eq = case_sensitive_ ? s2 == string_ :
-        CaseInsensitiveStringEquals(s2, string_);
-    return expect_eq_ == eq;
-  }
-
-  void DescribeTo(::std::ostream* os) const {
-    DescribeToHelper(expect_eq_, os);
-  }
-
-  void DescribeNegationTo(::std::ostream* os) const {
-    DescribeToHelper(!expect_eq_, os);
-  }
-
- private:
-  void DescribeToHelper(bool expect_eq, ::std::ostream* os) const {
-    *os << (expect_eq ? "is " : "isn't ");
-    *os << "equal to ";
-    if (!case_sensitive_) {
-      *os << "(ignoring case) ";
-    }
-    UniversalPrint(string_, os);
-  }
-
-  const StringType string_;
-  const bool expect_eq_;
-  const bool case_sensitive_;
-
-  GTEST_DISALLOW_ASSIGN_(StrEqualityMatcher);
-};
-
-// Implements the polymorphic HasSubstr(substring) matcher, which
-// can be used as a Matcher<T> as long as T can be converted to a
-// string.
-template <typename StringType>
-class HasSubstrMatcher {
- public:
-  explicit HasSubstrMatcher(const StringType& substring)
-      : substring_(substring) {}
-
-#if GTEST_HAS_ABSL
-  bool MatchAndExplain(const absl::string_view& s,
-                       MatchResultListener* listener) const {
-    // This should fail to compile if absl::string_view is used with wide
-    // strings.
-    const StringType& str = std::string(s);
-    return MatchAndExplain(str, listener);
-  }
-#endif  // GTEST_HAS_ABSL
-
-  // Accepts pointer types, particularly:
-  //   const char*
-  //   char*
-  //   const wchar_t*
-  //   wchar_t*
-  template <typename CharType>
-  bool MatchAndExplain(CharType* s, MatchResultListener* listener) const {
-    return s != nullptr && MatchAndExplain(StringType(s), listener);
-  }
-
-  // Matches anything that can convert to StringType.
-  //
-  // This is a template, not just a plain function with const StringType&,
-  // because absl::string_view has some interfering non-explicit constructors.
-  template <typename MatcheeStringType>
-  bool MatchAndExplain(const MatcheeStringType& s,
-                       MatchResultListener* /* listener */) const {
-    const StringType& s2(s);
-    return s2.find(substring_) != StringType::npos;
-  }
-
-  // Describes what this matcher matches.
-  void DescribeTo(::std::ostream* os) const {
-    *os << "has substring ";
-    UniversalPrint(substring_, os);
-  }
-
-  void DescribeNegationTo(::std::ostream* os) const {
-    *os << "has no substring ";
-    UniversalPrint(substring_, os);
-  }
-
- private:
-  const StringType substring_;
-
-  GTEST_DISALLOW_ASSIGN_(HasSubstrMatcher);
-};
-
-// Implements the polymorphic StartsWith(substring) matcher, which
-// can be used as a Matcher<T> as long as T can be converted to a
-// string.
-template <typename StringType>
-class StartsWithMatcher {
- public:
-  explicit StartsWithMatcher(const StringType& prefix) : prefix_(prefix) {
-  }
-
-#if GTEST_HAS_ABSL
-  bool MatchAndExplain(const absl::string_view& s,
-                       MatchResultListener* listener) const {
-    // This should fail to compile if absl::string_view is used with wide
-    // strings.
-    const StringType& str = std::string(s);
-    return MatchAndExplain(str, listener);
-  }
-#endif  // GTEST_HAS_ABSL
-
-  // Accepts pointer types, particularly:
-  //   const char*
-  //   char*
-  //   const wchar_t*
-  //   wchar_t*
-  template <typename CharType>
-  bool MatchAndExplain(CharType* s, MatchResultListener* listener) const {
-    return s != nullptr && MatchAndExplain(StringType(s), listener);
-  }
-
-  // Matches anything that can convert to StringType.
-  //
-  // This is a template, not just a plain function with const StringType&,
-  // because absl::string_view has some interfering non-explicit constructors.
-  template <typename MatcheeStringType>
-  bool MatchAndExplain(const MatcheeStringType& s,
-                       MatchResultListener* /* listener */) const {
-    const StringType& s2(s);
-    return s2.length() >= prefix_.length() &&
-        s2.substr(0, prefix_.length()) == prefix_;
-  }
-
-  void DescribeTo(::std::ostream* os) const {
-    *os << "starts with ";
-    UniversalPrint(prefix_, os);
-  }
-
-  void DescribeNegationTo(::std::ostream* os) const {
-    *os << "doesn't start with ";
-    UniversalPrint(prefix_, os);
-  }
-
- private:
-  const StringType prefix_;
-
-  GTEST_DISALLOW_ASSIGN_(StartsWithMatcher);
-};
-
-// Implements the polymorphic EndsWith(substring) matcher, which
-// can be used as a Matcher<T> as long as T can be converted to a
-// string.
-template <typename StringType>
-class EndsWithMatcher {
- public:
-  explicit EndsWithMatcher(const StringType& suffix) : suffix_(suffix) {}
-
-#if GTEST_HAS_ABSL
-  bool MatchAndExplain(const absl::string_view& s,
-                       MatchResultListener* listener) const {
-    // This should fail to compile if absl::string_view is used with wide
-    // strings.
-    const StringType& str = std::string(s);
-    return MatchAndExplain(str, listener);
-  }
-#endif  // GTEST_HAS_ABSL
-
-  // Accepts pointer types, particularly:
-  //   const char*
-  //   char*
-  //   const wchar_t*
-  //   wchar_t*
-  template <typename CharType>
-  bool MatchAndExplain(CharType* s, MatchResultListener* listener) const {
-    return s != nullptr && MatchAndExplain(StringType(s), listener);
-  }
-
-  // Matches anything that can convert to StringType.
-  //
-  // This is a template, not just a plain function with const StringType&,
-  // because absl::string_view has some interfering non-explicit constructors.
-  template <typename MatcheeStringType>
-  bool MatchAndExplain(const MatcheeStringType& s,
-                       MatchResultListener* /* listener */) const {
-    const StringType& s2(s);
-    return s2.length() >= suffix_.length() &&
-        s2.substr(s2.length() - suffix_.length()) == suffix_;
-  }
-
-  void DescribeTo(::std::ostream* os) const {
-    *os << "ends with ";
-    UniversalPrint(suffix_, os);
-  }
-
-  void DescribeNegationTo(::std::ostream* os) const {
-    *os << "doesn't end with ";
-    UniversalPrint(suffix_, os);
-  }
-
- private:
-  const StringType suffix_;
-
-  GTEST_DISALLOW_ASSIGN_(EndsWithMatcher);
-};
-
-// Implements a matcher that compares the two fields of a 2-tuple
-// using one of the ==, <=, <, etc, operators.  The two fields being
-// compared don't have to have the same type.
-//
-// The matcher defined here is polymorphic (for example, Eq() can be
-// used to match a std::tuple<int, short>, a std::tuple<const long&, double>,
-// etc).  Therefore we use a template type conversion operator in the
-// implementation.
-template <typename D, typename Op>
-class PairMatchBase {
- public:
-  template <typename T1, typename T2>
-  operator Matcher<::std::tuple<T1, T2>>() const {
-    return Matcher<::std::tuple<T1, T2>>(new Impl<const ::std::tuple<T1, T2>&>);
-  }
-  template <typename T1, typename T2>
-  operator Matcher<const ::std::tuple<T1, T2>&>() const {
-    return MakeMatcher(new Impl<const ::std::tuple<T1, T2>&>);
-  }
-
- private:
-  static ::std::ostream& GetDesc(::std::ostream& os) {  // NOLINT
-    return os << D::Desc();
-  }
-
-  template <typename Tuple>
-  class Impl : public MatcherInterface<Tuple> {
-   public:
-    bool MatchAndExplain(Tuple args,
-                         MatchResultListener* /* listener */) const override {
-      return Op()(::std::get<0>(args), ::std::get<1>(args));
-    }
-    void DescribeTo(::std::ostream* os) const override {
-      *os << "are " << GetDesc;
-    }
-    void DescribeNegationTo(::std::ostream* os) const override {
-      *os << "aren't " << GetDesc;
-    }
-  };
-};
-
-class Eq2Matcher : public PairMatchBase<Eq2Matcher, AnyEq> {
- public:
-  static const char* Desc() { return "an equal pair"; }
-};
-class Ne2Matcher : public PairMatchBase<Ne2Matcher, AnyNe> {
- public:
-  static const char* Desc() { return "an unequal pair"; }
-};
-class Lt2Matcher : public PairMatchBase<Lt2Matcher, AnyLt> {
- public:
-  static const char* Desc() { return "a pair where the first < the second"; }
-};
-class Gt2Matcher : public PairMatchBase<Gt2Matcher, AnyGt> {
- public:
-  static const char* Desc() { return "a pair where the first > the second"; }
-};
-class Le2Matcher : public PairMatchBase<Le2Matcher, AnyLe> {
- public:
-  static const char* Desc() { return "a pair where the first <= the second"; }
-};
-class Ge2Matcher : public PairMatchBase<Ge2Matcher, AnyGe> {
- public:
-  static const char* Desc() { return "a pair where the first >= the second"; }
-};
-
-// Implements the Not(...) matcher for a particular argument type T.
-// We do not nest it inside the NotMatcher class template, as that
-// will prevent different instantiations of NotMatcher from sharing
-// the same NotMatcherImpl<T> class.
-template <typename T>
-class NotMatcherImpl : public MatcherInterface<const T&> {
- public:
-  explicit NotMatcherImpl(const Matcher<T>& matcher)
-      : matcher_(matcher) {}
-
-  bool MatchAndExplain(const T& x,
-                       MatchResultListener* listener) const override {
-    return !matcher_.MatchAndExplain(x, listener);
-  }
-
-  void DescribeTo(::std::ostream* os) const override {
-    matcher_.DescribeNegationTo(os);
-  }
-
-  void DescribeNegationTo(::std::ostream* os) const override {
-    matcher_.DescribeTo(os);
-  }
-
- private:
-  const Matcher<T> matcher_;
-
-  GTEST_DISALLOW_ASSIGN_(NotMatcherImpl);
-};
-
-// Implements the Not(m) matcher, which matches a value that doesn't
-// match matcher m.
-template <typename InnerMatcher>
-class NotMatcher {
- public:
-  explicit NotMatcher(InnerMatcher matcher) : matcher_(matcher) {}
-
-  // This template type conversion operator allows Not(m) to be used
-  // to match any type m can match.
-  template <typename T>
-  operator Matcher<T>() const {
-    return Matcher<T>(new NotMatcherImpl<T>(SafeMatcherCast<T>(matcher_)));
-  }
-
- private:
-  InnerMatcher matcher_;
-
-  GTEST_DISALLOW_ASSIGN_(NotMatcher);
-};
-
-// Implements the AllOf(m1, m2) matcher for a particular argument type
-// T. We do not nest it inside the BothOfMatcher class template, as
-// that will prevent different instantiations of BothOfMatcher from
-// sharing the same BothOfMatcherImpl<T> class.
-template <typename T>
-class AllOfMatcherImpl : public MatcherInterface<const T&> {
- public:
-  explicit AllOfMatcherImpl(std::vector<Matcher<T> > matchers)
-      : matchers_(std::move(matchers)) {}
-
-  void DescribeTo(::std::ostream* os) const override {
-    *os << "(";
-    for (size_t i = 0; i < matchers_.size(); ++i) {
-      if (i != 0) *os << ") and (";
-      matchers_[i].DescribeTo(os);
-    }
-    *os << ")";
-  }
-
-  void DescribeNegationTo(::std::ostream* os) const override {
-    *os << "(";
-    for (size_t i = 0; i < matchers_.size(); ++i) {
-      if (i != 0) *os << ") or (";
-      matchers_[i].DescribeNegationTo(os);
-    }
-    *os << ")";
-  }
-
-  bool MatchAndExplain(const T& x,
-                       MatchResultListener* listener) const override {
-    // If either matcher1_ or matcher2_ doesn't match x, we only need
-    // to explain why one of them fails.
-    std::string all_match_result;
-
-    for (size_t i = 0; i < matchers_.size(); ++i) {
-      StringMatchResultListener slistener;
-      if (matchers_[i].MatchAndExplain(x, &slistener)) {
-        if (all_match_result.empty()) {
-          all_match_result = slistener.str();
-        } else {
-          std::string result = slistener.str();
-          if (!result.empty()) {
-            all_match_result += ", and ";
-            all_match_result += result;
-          }
-        }
-      } else {
-        *listener << slistener.str();
-        return false;
-      }
-    }
-
-    // Otherwise we need to explain why *both* of them match.
-    *listener << all_match_result;
-    return true;
-  }
-
- private:
-  const std::vector<Matcher<T> > matchers_;
-
-  GTEST_DISALLOW_ASSIGN_(AllOfMatcherImpl);
-};
-
-// VariadicMatcher is used for the variadic implementation of
-// AllOf(m_1, m_2, ...) and AnyOf(m_1, m_2, ...).
-// CombiningMatcher<T> is used to recursively combine the provided matchers
-// (of type Args...).
-template <template <typename T> class CombiningMatcher, typename... Args>
-class VariadicMatcher {
- public:
-  VariadicMatcher(const Args&... matchers)  // NOLINT
-      : matchers_(matchers...) {
-    static_assert(sizeof...(Args) > 0, "Must have at least one matcher.");
-  }
-
-  // This template type conversion operator allows an
-  // VariadicMatcher<Matcher1, Matcher2...> object to match any type that
-  // all of the provided matchers (Matcher1, Matcher2, ...) can match.
-  template <typename T>
-  operator Matcher<T>() const {
-    std::vector<Matcher<T> > values;
-    CreateVariadicMatcher<T>(&values, std::integral_constant<size_t, 0>());
-    return Matcher<T>(new CombiningMatcher<T>(std::move(values)));
-  }
-
- private:
-  template <typename T, size_t I>
-  void CreateVariadicMatcher(std::vector<Matcher<T> >* values,
-                             std::integral_constant<size_t, I>) const {
-    values->push_back(SafeMatcherCast<T>(std::get<I>(matchers_)));
-    CreateVariadicMatcher<T>(values, std::integral_constant<size_t, I + 1>());
-  }
-
-  template <typename T>
-  void CreateVariadicMatcher(
-      std::vector<Matcher<T> >*,
-      std::integral_constant<size_t, sizeof...(Args)>) const {}
-
-  std::tuple<Args...> matchers_;
-
-  GTEST_DISALLOW_ASSIGN_(VariadicMatcher);
-};
-
-template <typename... Args>
-using AllOfMatcher = VariadicMatcher<AllOfMatcherImpl, Args...>;
-
-// Implements the AnyOf(m1, m2) matcher for a particular argument type
-// T.  We do not nest it inside the AnyOfMatcher class template, as
-// that will prevent different instantiations of AnyOfMatcher from
-// sharing the same EitherOfMatcherImpl<T> class.
-template <typename T>
-class AnyOfMatcherImpl : public MatcherInterface<const T&> {
- public:
-  explicit AnyOfMatcherImpl(std::vector<Matcher<T> > matchers)
-      : matchers_(std::move(matchers)) {}
-
-  void DescribeTo(::std::ostream* os) const override {
-    *os << "(";
-    for (size_t i = 0; i < matchers_.size(); ++i) {
-      if (i != 0) *os << ") or (";
-      matchers_[i].DescribeTo(os);
-    }
-    *os << ")";
-  }
-
-  void DescribeNegationTo(::std::ostream* os) const override {
-    *os << "(";
-    for (size_t i = 0; i < matchers_.size(); ++i) {
-      if (i != 0) *os << ") and (";
-      matchers_[i].DescribeNegationTo(os);
-    }
-    *os << ")";
-  }
-
-  bool MatchAndExplain(const T& x,
-                       MatchResultListener* listener) const override {
-    std::string no_match_result;
-
-    // If either matcher1_ or matcher2_ matches x, we just need to
-    // explain why *one* of them matches.
-    for (size_t i = 0; i < matchers_.size(); ++i) {
-      StringMatchResultListener slistener;
-      if (matchers_[i].MatchAndExplain(x, &slistener)) {
-        *listener << slistener.str();
-        return true;
-      } else {
-        if (no_match_result.empty()) {
-          no_match_result = slistener.str();
-        } else {
-          std::string result = slistener.str();
-          if (!result.empty()) {
-            no_match_result += ", and ";
-            no_match_result += result;
-          }
-        }
-      }
-    }
-
-    // Otherwise we need to explain why *both* of them fail.
-    *listener << no_match_result;
-    return false;
-  }
-
- private:
-  const std::vector<Matcher<T> > matchers_;
-
-  GTEST_DISALLOW_ASSIGN_(AnyOfMatcherImpl);
-};
-
-// AnyOfMatcher is used for the variadic implementation of AnyOf(m_1, m_2, ...).
-template <typename... Args>
-using AnyOfMatcher = VariadicMatcher<AnyOfMatcherImpl, Args...>;
-
-// Wrapper for implementation of Any/AllOfArray().
-template <template <class> class MatcherImpl, typename T>
-class SomeOfArrayMatcher {
- public:
-  // Constructs the matcher from a sequence of element values or
-  // element matchers.
-  template <typename Iter>
-  SomeOfArrayMatcher(Iter first, Iter last) : matchers_(first, last) {}
-
-  template <typename U>
-  operator Matcher<U>() const {  // NOLINT
-    using RawU = typename std::decay<U>::type;
-    std::vector<Matcher<RawU>> matchers;
-    for (const auto& matcher : matchers_) {
-      matchers.push_back(MatcherCast<RawU>(matcher));
-    }
-    return Matcher<U>(new MatcherImpl<RawU>(std::move(matchers)));
-  }
-
- private:
-  const ::std::vector<T> matchers_;
-
-  GTEST_DISALLOW_ASSIGN_(SomeOfArrayMatcher);
-};
-
-template <typename T>
-using AllOfArrayMatcher = SomeOfArrayMatcher<AllOfMatcherImpl, T>;
-
-template <typename T>
-using AnyOfArrayMatcher = SomeOfArrayMatcher<AnyOfMatcherImpl, T>;
-
-// Used for implementing Truly(pred), which turns a predicate into a
-// matcher.
-template <typename Predicate>
-class TrulyMatcher {
- public:
-  explicit TrulyMatcher(Predicate pred) : predicate_(pred) {}
-
-  // This method template allows Truly(pred) to be used as a matcher
-  // for type T where T is the argument type of predicate 'pred'.  The
-  // argument is passed by reference as the predicate may be
-  // interested in the address of the argument.
-  template <typename T>
-  bool MatchAndExplain(T& x,  // NOLINT
-                       MatchResultListener* /* listener */) const {
-    // Without the if-statement, MSVC sometimes warns about converting
-    // a value to bool (warning 4800).
-    //
-    // We cannot write 'return !!predicate_(x);' as that doesn't work
-    // when predicate_(x) returns a class convertible to bool but
-    // having no operator!().
-    if (predicate_(x))
-      return true;
-    return false;
-  }
-
-  void DescribeTo(::std::ostream* os) const {
-    *os << "satisfies the given predicate";
-  }
-
-  void DescribeNegationTo(::std::ostream* os) const {
-    *os << "doesn't satisfy the given predicate";
-  }
-
- private:
-  Predicate predicate_;
-
-  GTEST_DISALLOW_ASSIGN_(TrulyMatcher);
-};
-
-// Used for implementing Matches(matcher), which turns a matcher into
-// a predicate.
-template <typename M>
-class MatcherAsPredicate {
- public:
-  explicit MatcherAsPredicate(M matcher) : matcher_(matcher) {}
-
-  // This template operator() allows Matches(m) to be used as a
-  // predicate on type T where m is a matcher on type T.
-  //
-  // The argument x is passed by reference instead of by value, as
-  // some matcher may be interested in its address (e.g. as in
-  // Matches(Ref(n))(x)).
-  template <typename T>
-  bool operator()(const T& x) const {
-    // We let matcher_ commit to a particular type here instead of
-    // when the MatcherAsPredicate object was constructed.  This
-    // allows us to write Matches(m) where m is a polymorphic matcher
-    // (e.g. Eq(5)).
-    //
-    // If we write Matcher<T>(matcher_).Matches(x) here, it won't
-    // compile when matcher_ has type Matcher<const T&>; if we write
-    // Matcher<const T&>(matcher_).Matches(x) here, it won't compile
-    // when matcher_ has type Matcher<T>; if we just write
-    // matcher_.Matches(x), it won't compile when matcher_ is
-    // polymorphic, e.g. Eq(5).
-    //
-    // MatcherCast<const T&>() is necessary for making the code work
-    // in all of the above situations.
-    return MatcherCast<const T&>(matcher_).Matches(x);
-  }
-
- private:
-  M matcher_;
-
-  GTEST_DISALLOW_ASSIGN_(MatcherAsPredicate);
-};
-
-// For implementing ASSERT_THAT() and EXPECT_THAT().  The template
-// argument M must be a type that can be converted to a matcher.
-template <typename M>
-class PredicateFormatterFromMatcher {
- public:
-  explicit PredicateFormatterFromMatcher(M m) : matcher_(std::move(m)) {}
-
-  // This template () operator allows a PredicateFormatterFromMatcher
-  // object to act as a predicate-formatter suitable for using with
-  // Google Test's EXPECT_PRED_FORMAT1() macro.
-  template <typename T>
-  AssertionResult operator()(const char* value_text, const T& x) const {
-    // We convert matcher_ to a Matcher<const T&> *now* instead of
-    // when the PredicateFormatterFromMatcher object was constructed,
-    // as matcher_ may be polymorphic (e.g. NotNull()) and we won't
-    // know which type to instantiate it to until we actually see the
-    // type of x here.
-    //
-    // We write SafeMatcherCast<const T&>(matcher_) instead of
-    // Matcher<const T&>(matcher_), as the latter won't compile when
-    // matcher_ has type Matcher<T> (e.g. An<int>()).
-    // We don't write MatcherCast<const T&> either, as that allows
-    // potentially unsafe downcasting of the matcher argument.
-    const Matcher<const T&> matcher = SafeMatcherCast<const T&>(matcher_);
-
-    // The expected path here is that the matcher should match (i.e. that most
-    // tests pass) so optimize for this case.
-    if (matcher.Matches(x)) {
-      return AssertionSuccess();
-    }
-
-    ::std::stringstream ss;
-    ss << "Value of: " << value_text << "\n"
-       << "Expected: ";
-    matcher.DescribeTo(&ss);
-
-    // Rerun the matcher to "PrintAndExain" the failure.
-    StringMatchResultListener listener;
-    if (MatchPrintAndExplain(x, matcher, &listener)) {
-      ss << "\n  The matcher failed on the initial attempt; but passed when "
-            "rerun to generate the explanation.";
-    }
-    ss << "\n  Actual: " << listener.str();
-    return AssertionFailure() << ss.str();
-  }
-
- private:
-  const M matcher_;
-
-  GTEST_DISALLOW_ASSIGN_(PredicateFormatterFromMatcher);
-};
-
-// A helper function for converting a matcher to a predicate-formatter
-// without the user needing to explicitly write the type.  This is
-// used for implementing ASSERT_THAT() and EXPECT_THAT().
-// Implementation detail: 'matcher' is received by-value to force decaying.
-template <typename M>
-inline PredicateFormatterFromMatcher<M>
-MakePredicateFormatterFromMatcher(M matcher) {
-  return PredicateFormatterFromMatcher<M>(std::move(matcher));
-}
-
-// Implements the polymorphic floating point equality matcher, which matches
-// two float values using ULP-based approximation or, optionally, a
-// user-specified epsilon.  The template is meant to be instantiated with
-// FloatType being either float or double.
-template <typename FloatType>
-class FloatingEqMatcher {
- public:
-  // Constructor for FloatingEqMatcher.
-  // The matcher's input will be compared with expected.  The matcher treats two
-  // NANs as equal if nan_eq_nan is true.  Otherwise, under IEEE standards,
-  // equality comparisons between NANs will always return false.  We specify a
-  // negative max_abs_error_ term to indicate that ULP-based approximation will
-  // be used for comparison.
-  FloatingEqMatcher(FloatType expected, bool nan_eq_nan) :
-    expected_(expected), nan_eq_nan_(nan_eq_nan), max_abs_error_(-1) {
-  }
-
-  // Constructor that supports a user-specified max_abs_error that will be used
-  // for comparison instead of ULP-based approximation.  The max absolute
-  // should be non-negative.
-  FloatingEqMatcher(FloatType expected, bool nan_eq_nan,
-                    FloatType max_abs_error)
-      : expected_(expected),
-        nan_eq_nan_(nan_eq_nan),
-        max_abs_error_(max_abs_error) {
-    GTEST_CHECK_(max_abs_error >= 0)
-        << ", where max_abs_error is" << max_abs_error;
-  }
-
-  // Implements floating point equality matcher as a Matcher<T>.
-  template <typename T>
-  class Impl : public MatcherInterface<T> {
-   public:
-    Impl(FloatType expected, bool nan_eq_nan, FloatType max_abs_error)
-        : expected_(expected),
-          nan_eq_nan_(nan_eq_nan),
-          max_abs_error_(max_abs_error) {}
-
-    bool MatchAndExplain(T value,
-                         MatchResultListener* listener) const override {
-      const FloatingPoint<FloatType> actual(value), expected(expected_);
-
-      // Compares NaNs first, if nan_eq_nan_ is true.
-      if (actual.is_nan() || expected.is_nan()) {
-        if (actual.is_nan() && expected.is_nan()) {
-          return nan_eq_nan_;
-        }
-        // One is nan; the other is not nan.
-        return false;
-      }
-      if (HasMaxAbsError()) {
-        // We perform an equality check so that inf will match inf, regardless
-        // of error bounds.  If the result of value - expected_ would result in
-        // overflow or if either value is inf, the default result is infinity,
-        // which should only match if max_abs_error_ is also infinity.
-        if (value == expected_) {
-          return true;
-        }
-
-        const FloatType diff = value - expected_;
-        if (fabs(diff) <= max_abs_error_) {
-          return true;
-        }
-
-        if (listener->IsInterested()) {
-          *listener << "which is " << diff << " from " << expected_;
-        }
-        return false;
-      } else {
-        return actual.AlmostEquals(expected);
-      }
-    }
-
-    void DescribeTo(::std::ostream* os) const override {
-      // os->precision() returns the previously set precision, which we
-      // store to restore the ostream to its original configuration
-      // after outputting.
-      const ::std::streamsize old_precision = os->precision(
-          ::std::numeric_limits<FloatType>::digits10 + 2);
-      if (FloatingPoint<FloatType>(expected_).is_nan()) {
-        if (nan_eq_nan_) {
-          *os << "is NaN";
-        } else {
-          *os << "never matches";
-        }
-      } else {
-        *os << "is approximately " << expected_;
-        if (HasMaxAbsError()) {
-          *os << " (absolute error <= " << max_abs_error_ << ")";
-        }
-      }
-      os->precision(old_precision);
-    }
-
-    void DescribeNegationTo(::std::ostream* os) const override {
-      // As before, get original precision.
-      const ::std::streamsize old_precision = os->precision(
-          ::std::numeric_limits<FloatType>::digits10 + 2);
-      if (FloatingPoint<FloatType>(expected_).is_nan()) {
-        if (nan_eq_nan_) {
-          *os << "isn't NaN";
-        } else {
-          *os << "is anything";
-        }
-      } else {
-        *os << "isn't approximately " << expected_;
-        if (HasMaxAbsError()) {
-          *os << " (absolute error > " << max_abs_error_ << ")";
-        }
-      }
-      // Restore original precision.
-      os->precision(old_precision);
-    }
-
-   private:
-    bool HasMaxAbsError() const {
-      return max_abs_error_ >= 0;
-    }
-
-    const FloatType expected_;
-    const bool nan_eq_nan_;
-    // max_abs_error will be used for value comparison when >= 0.
-    const FloatType max_abs_error_;
-
-    GTEST_DISALLOW_ASSIGN_(Impl);
-  };
-
-  // The following 3 type conversion operators allow FloatEq(expected) and
-  // NanSensitiveFloatEq(expected) to be used as a Matcher<float>, a
-  // Matcher<const float&>, or a Matcher<float&>, but nothing else.
-  // (While Google's C++ coding style doesn't allow arguments passed
-  // by non-const reference, we may see them in code not conforming to
-  // the style.  Therefore Google Mock needs to support them.)
-  operator Matcher<FloatType>() const {
-    return MakeMatcher(
-        new Impl<FloatType>(expected_, nan_eq_nan_, max_abs_error_));
-  }
-
-  operator Matcher<const FloatType&>() const {
-    return MakeMatcher(
-        new Impl<const FloatType&>(expected_, nan_eq_nan_, max_abs_error_));
-  }
-
-  operator Matcher<FloatType&>() const {
-    return MakeMatcher(
-        new Impl<FloatType&>(expected_, nan_eq_nan_, max_abs_error_));
-  }
-
- private:
-  const FloatType expected_;
-  const bool nan_eq_nan_;
-  // max_abs_error will be used for value comparison when >= 0.
-  const FloatType max_abs_error_;
-
-  GTEST_DISALLOW_ASSIGN_(FloatingEqMatcher);
-};
-
-// A 2-tuple ("binary") wrapper around FloatingEqMatcher:
-// FloatingEq2Matcher() matches (x, y) by matching FloatingEqMatcher(x, false)
-// against y, and FloatingEq2Matcher(e) matches FloatingEqMatcher(x, false, e)
-// against y. The former implements "Eq", the latter "Near". At present, there
-// is no version that compares NaNs as equal.
-template <typename FloatType>
-class FloatingEq2Matcher {
- public:
-  FloatingEq2Matcher() { Init(-1, false); }
-
-  explicit FloatingEq2Matcher(bool nan_eq_nan) { Init(-1, nan_eq_nan); }
-
-  explicit FloatingEq2Matcher(FloatType max_abs_error) {
-    Init(max_abs_error, false);
-  }
-
-  FloatingEq2Matcher(FloatType max_abs_error, bool nan_eq_nan) {
-    Init(max_abs_error, nan_eq_nan);
-  }
-
-  template <typename T1, typename T2>
-  operator Matcher<::std::tuple<T1, T2>>() const {
-    return MakeMatcher(
-        new Impl<::std::tuple<T1, T2>>(max_abs_error_, nan_eq_nan_));
-  }
-  template <typename T1, typename T2>
-  operator Matcher<const ::std::tuple<T1, T2>&>() const {
-    return MakeMatcher(
-        new Impl<const ::std::tuple<T1, T2>&>(max_abs_error_, nan_eq_nan_));
-  }
-
- private:
-  static ::std::ostream& GetDesc(::std::ostream& os) {  // NOLINT
-    return os << "an almost-equal pair";
-  }
-
-  template <typename Tuple>
-  class Impl : public MatcherInterface<Tuple> {
-   public:
-    Impl(FloatType max_abs_error, bool nan_eq_nan) :
-        max_abs_error_(max_abs_error),
-        nan_eq_nan_(nan_eq_nan) {}
-
-    bool MatchAndExplain(Tuple args,
-                         MatchResultListener* listener) const override {
-      if (max_abs_error_ == -1) {
-        FloatingEqMatcher<FloatType> fm(::std::get<0>(args), nan_eq_nan_);
-        return static_cast<Matcher<FloatType>>(fm).MatchAndExplain(
-            ::std::get<1>(args), listener);
-      } else {
-        FloatingEqMatcher<FloatType> fm(::std::get<0>(args), nan_eq_nan_,
-                                        max_abs_error_);
-        return static_cast<Matcher<FloatType>>(fm).MatchAndExplain(
-            ::std::get<1>(args), listener);
-      }
-    }
-    void DescribeTo(::std::ostream* os) const override {
-      *os << "are " << GetDesc;
-    }
-    void DescribeNegationTo(::std::ostream* os) const override {
-      *os << "aren't " << GetDesc;
-    }
-
-   private:
-    FloatType max_abs_error_;
-    const bool nan_eq_nan_;
-  };
-
-  void Init(FloatType max_abs_error_val, bool nan_eq_nan_val) {
-    max_abs_error_ = max_abs_error_val;
-    nan_eq_nan_ = nan_eq_nan_val;
-  }
-  FloatType max_abs_error_;
-  bool nan_eq_nan_;
-};
-
-// Implements the Pointee(m) matcher for matching a pointer whose
-// pointee matches matcher m.  The pointer can be either raw or smart.
-template <typename InnerMatcher>
-class PointeeMatcher {
- public:
-  explicit PointeeMatcher(const InnerMatcher& matcher) : matcher_(matcher) {}
-
-  // This type conversion operator template allows Pointee(m) to be
-  // used as a matcher for any pointer type whose pointee type is
-  // compatible with the inner matcher, where type Pointer can be
-  // either a raw pointer or a smart pointer.
-  //
-  // The reason we do this instead of relying on
-  // MakePolymorphicMatcher() is that the latter is not flexible
-  // enough for implementing the DescribeTo() method of Pointee().
-  template <typename Pointer>
-  operator Matcher<Pointer>() const {
-    return Matcher<Pointer>(new Impl<const Pointer&>(matcher_));
-  }
-
- private:
-  // The monomorphic implementation that works for a particular pointer type.
-  template <typename Pointer>
-  class Impl : public MatcherInterface<Pointer> {
-   public:
-    typedef typename PointeeOf<typename std::remove_const<
-        typename std::remove_reference<Pointer>::type>::type>::type Pointee;
-
-    explicit Impl(const InnerMatcher& matcher)
-        : matcher_(MatcherCast<const Pointee&>(matcher)) {}
-
-    void DescribeTo(::std::ostream* os) const override {
-      *os << "points to a value that ";
-      matcher_.DescribeTo(os);
-    }
-
-    void DescribeNegationTo(::std::ostream* os) const override {
-      *os << "does not point to a value that ";
-      matcher_.DescribeTo(os);
-    }
-
-    bool MatchAndExplain(Pointer pointer,
-                         MatchResultListener* listener) const override {
-      if (GetRawPointer(pointer) == nullptr) return false;
-
-      *listener << "which points to ";
-      return MatchPrintAndExplain(*pointer, matcher_, listener);
-    }
-
-   private:
-    const Matcher<const Pointee&> matcher_;
-
-    GTEST_DISALLOW_ASSIGN_(Impl);
-  };
-
-  const InnerMatcher matcher_;
-
-  GTEST_DISALLOW_ASSIGN_(PointeeMatcher);
-};
-
-#if GTEST_HAS_RTTI
-// Implements the WhenDynamicCastTo<T>(m) matcher that matches a pointer or
-// reference that matches inner_matcher when dynamic_cast<T> is applied.
-// The result of dynamic_cast<To> is forwarded to the inner matcher.
-// If To is a pointer and the cast fails, the inner matcher will receive NULL.
-// If To is a reference and the cast fails, this matcher returns false
-// immediately.
-template <typename To>
-class WhenDynamicCastToMatcherBase {
- public:
-  explicit WhenDynamicCastToMatcherBase(const Matcher<To>& matcher)
-      : matcher_(matcher) {}
-
-  void DescribeTo(::std::ostream* os) const {
-    GetCastTypeDescription(os);
-    matcher_.DescribeTo(os);
-  }
-
-  void DescribeNegationTo(::std::ostream* os) const {
-    GetCastTypeDescription(os);
-    matcher_.DescribeNegationTo(os);
-  }
-
- protected:
-  const Matcher<To> matcher_;
-
-  static std::string GetToName() {
-    return GetTypeName<To>();
-  }
-
- private:
-  static void GetCastTypeDescription(::std::ostream* os) {
-    *os << "when dynamic_cast to " << GetToName() << ", ";
-  }
-
-  GTEST_DISALLOW_ASSIGN_(WhenDynamicCastToMatcherBase);
-};
-
-// Primary template.
-// To is a pointer. Cast and forward the result.
-template <typename To>
-class WhenDynamicCastToMatcher : public WhenDynamicCastToMatcherBase<To> {
- public:
-  explicit WhenDynamicCastToMatcher(const Matcher<To>& matcher)
-      : WhenDynamicCastToMatcherBase<To>(matcher) {}
-
-  template <typename From>
-  bool MatchAndExplain(From from, MatchResultListener* listener) const {
-    To to = dynamic_cast<To>(from);
-    return MatchPrintAndExplain(to, this->matcher_, listener);
-  }
-};
-
-// Specialize for references.
-// In this case we return false if the dynamic_cast fails.
-template <typename To>
-class WhenDynamicCastToMatcher<To&> : public WhenDynamicCastToMatcherBase<To&> {
- public:
-  explicit WhenDynamicCastToMatcher(const Matcher<To&>& matcher)
-      : WhenDynamicCastToMatcherBase<To&>(matcher) {}
-
-  template <typename From>
-  bool MatchAndExplain(From& from, MatchResultListener* listener) const {
-    // We don't want an std::bad_cast here, so do the cast with pointers.
-    To* to = dynamic_cast<To*>(&from);
-    if (to == nullptr) {
-      *listener << "which cannot be dynamic_cast to " << this->GetToName();
-      return false;
-    }
-    return MatchPrintAndExplain(*to, this->matcher_, listener);
-  }
-};
-#endif  // GTEST_HAS_RTTI
-
-// Implements the Field() matcher for matching a field (i.e. member
-// variable) of an object.
-template <typename Class, typename FieldType>
-class FieldMatcher {
- public:
-  FieldMatcher(FieldType Class::*field,
-               const Matcher<const FieldType&>& matcher)
-      : field_(field), matcher_(matcher), whose_field_("whose given field ") {}
-
-  FieldMatcher(const std::string& field_name, FieldType Class::*field,
-               const Matcher<const FieldType&>& matcher)
-      : field_(field),
-        matcher_(matcher),
-        whose_field_("whose field `" + field_name + "` ") {}
-
-  void DescribeTo(::std::ostream* os) const {
-    *os << "is an object " << whose_field_;
-    matcher_.DescribeTo(os);
-  }
-
-  void DescribeNegationTo(::std::ostream* os) const {
-    *os << "is an object " << whose_field_;
-    matcher_.DescribeNegationTo(os);
-  }
-
-  template <typename T>
-  bool MatchAndExplain(const T& value, MatchResultListener* listener) const {
-    // FIXME: The dispatch on std::is_pointer was introduced as a workaround for
-    // a compiler bug, and can now be removed.
-    return MatchAndExplainImpl(
-        typename std::is_pointer<typename std::remove_const<T>::type>::type(),
-        value, listener);
-  }
-
- private:
-  bool MatchAndExplainImpl(std::false_type /* is_not_pointer */,
-                           const Class& obj,
-                           MatchResultListener* listener) const {
-    *listener << whose_field_ << "is ";
-    return MatchPrintAndExplain(obj.*field_, matcher_, listener);
-  }
-
-  bool MatchAndExplainImpl(std::true_type /* is_pointer */, const Class* p,
-                           MatchResultListener* listener) const {
-    if (p == nullptr) return false;
-
-    *listener << "which points to an object ";
-    // Since *p has a field, it must be a class/struct/union type and
-    // thus cannot be a pointer.  Therefore we pass false_type() as
-    // the first argument.
-    return MatchAndExplainImpl(std::false_type(), *p, listener);
-  }
-
-  const FieldType Class::*field_;
-  const Matcher<const FieldType&> matcher_;
-
-  // Contains either "whose given field " if the name of the field is unknown
-  // or "whose field `name_of_field` " if the name is known.
-  const std::string whose_field_;
-
-  GTEST_DISALLOW_ASSIGN_(FieldMatcher);
-};
-
-// Implements the Property() matcher for matching a property
-// (i.e. return value of a getter method) of an object.
-//
-// Property is a const-qualified member function of Class returning
-// PropertyType.
-template <typename Class, typename PropertyType, typename Property>
-class PropertyMatcher {
- public:
-  typedef const PropertyType& RefToConstProperty;
-
-  PropertyMatcher(Property property, const Matcher<RefToConstProperty>& matcher)
-      : property_(property),
-        matcher_(matcher),
-        whose_property_("whose given property ") {}
-
-  PropertyMatcher(const std::string& property_name, Property property,
-                  const Matcher<RefToConstProperty>& matcher)
-      : property_(property),
-        matcher_(matcher),
-        whose_property_("whose property `" + property_name + "` ") {}
-
-  void DescribeTo(::std::ostream* os) const {
-    *os << "is an object " << whose_property_;
-    matcher_.DescribeTo(os);
-  }
-
-  void DescribeNegationTo(::std::ostream* os) const {
-    *os << "is an object " << whose_property_;
-    matcher_.DescribeNegationTo(os);
-  }
-
-  template <typename T>
-  bool MatchAndExplain(const T&value, MatchResultListener* listener) const {
-    return MatchAndExplainImpl(
-        typename std::is_pointer<typename std::remove_const<T>::type>::type(),
-        value, listener);
-  }
-
- private:
-  bool MatchAndExplainImpl(std::false_type /* is_not_pointer */,
-                           const Class& obj,
-                           MatchResultListener* listener) const {
-    *listener << whose_property_ << "is ";
-    // Cannot pass the return value (for example, int) to MatchPrintAndExplain,
-    // which takes a non-const reference as argument.
-    RefToConstProperty result = (obj.*property_)();
-    return MatchPrintAndExplain(result, matcher_, listener);
-  }
-
-  bool MatchAndExplainImpl(std::true_type /* is_pointer */, const Class* p,
-                           MatchResultListener* listener) const {
-    if (p == nullptr) return false;
-
-    *listener << "which points to an object ";
-    // Since *p has a property method, it must be a class/struct/union
-    // type and thus cannot be a pointer.  Therefore we pass
-    // false_type() as the first argument.
-    return MatchAndExplainImpl(std::false_type(), *p, listener);
-  }
-
-  Property property_;
-  const Matcher<RefToConstProperty> matcher_;
-
-  // Contains either "whose given property " if the name of the property is
-  // unknown or "whose property `name_of_property` " if the name is known.
-  const std::string whose_property_;
-
-  GTEST_DISALLOW_ASSIGN_(PropertyMatcher);
-};
-
-// Type traits specifying various features of different functors for ResultOf.
-// The default template specifies features for functor objects.
-template <typename Functor>
-struct CallableTraits {
-  typedef Functor StorageType;
-
-  static void CheckIsValid(Functor /* functor */) {}
-
-  template <typename T>
-  static auto Invoke(Functor f, const T& arg) -> decltype(f(arg)) {
-    return f(arg);
-  }
-};
-
-// Specialization for function pointers.
-template <typename ArgType, typename ResType>
-struct CallableTraits<ResType(*)(ArgType)> {
-  typedef ResType ResultType;
-  typedef ResType(*StorageType)(ArgType);
-
-  static void CheckIsValid(ResType(*f)(ArgType)) {
-    GTEST_CHECK_(f != nullptr)
-        << "NULL function pointer is passed into ResultOf().";
-  }
-  template <typename T>
-  static ResType Invoke(ResType(*f)(ArgType), T arg) {
-    return (*f)(arg);
-  }
-};
-
-// Implements the ResultOf() matcher for matching a return value of a
-// unary function of an object.
-template <typename Callable, typename InnerMatcher>
-class ResultOfMatcher {
- public:
-  ResultOfMatcher(Callable callable, InnerMatcher matcher)
-      : callable_(std::move(callable)), matcher_(std::move(matcher)) {
-    CallableTraits<Callable>::CheckIsValid(callable_);
-  }
-
-  template <typename T>
-  operator Matcher<T>() const {
-    return Matcher<T>(new Impl<const T&>(callable_, matcher_));
-  }
-
- private:
-  typedef typename CallableTraits<Callable>::StorageType CallableStorageType;
-
-  template <typename T>
-  class Impl : public MatcherInterface<T> {
-    using ResultType = decltype(CallableTraits<Callable>::template Invoke<T>(
-        std::declval<CallableStorageType>(), std::declval<T>()));
-
-   public:
-    template <typename M>
-    Impl(const CallableStorageType& callable, const M& matcher)
-        : callable_(callable), matcher_(MatcherCast<ResultType>(matcher)) {}
-
-    void DescribeTo(::std::ostream* os) const override {
-      *os << "is mapped by the given callable to a value that ";
-      matcher_.DescribeTo(os);
-    }
-
-    void DescribeNegationTo(::std::ostream* os) const override {
-      *os << "is mapped by the given callable to a value that ";
-      matcher_.DescribeNegationTo(os);
-    }
-
-    bool MatchAndExplain(T obj, MatchResultListener* listener) const override {
-      *listener << "which is mapped by the given callable to ";
-      // Cannot pass the return value directly to MatchPrintAndExplain, which
-      // takes a non-const reference as argument.
-      // Also, specifying template argument explicitly is needed because T could
-      // be a non-const reference (e.g. Matcher<Uncopyable&>).
-      ResultType result =
-          CallableTraits<Callable>::template Invoke<T>(callable_, obj);
-      return MatchPrintAndExplain(result, matcher_, listener);
-    }
-
-   private:
-    // Functors often define operator() as non-const method even though
-    // they are actually stateless. But we need to use them even when
-    // 'this' is a const pointer. It's the user's responsibility not to
-    // use stateful callables with ResultOf(), which doesn't guarantee
-    // how many times the callable will be invoked.
-    mutable CallableStorageType callable_;
-    const Matcher<ResultType> matcher_;
-
-    GTEST_DISALLOW_ASSIGN_(Impl);
-  };  // class Impl
-
-  const CallableStorageType callable_;
-  const InnerMatcher matcher_;
-
-  GTEST_DISALLOW_ASSIGN_(ResultOfMatcher);
-};
-
-// Implements a matcher that checks the size of an STL-style container.
-template <typename SizeMatcher>
-class SizeIsMatcher {
- public:
-  explicit SizeIsMatcher(const SizeMatcher& size_matcher)
-       : size_matcher_(size_matcher) {
-  }
-
-  template <typename Container>
-  operator Matcher<Container>() const {
-    return Matcher<Container>(new Impl<const Container&>(size_matcher_));
-  }
-
-  template <typename Container>
-  class Impl : public MatcherInterface<Container> {
-   public:
-    using SizeType = decltype(std::declval<Container>().size());
-    explicit Impl(const SizeMatcher& size_matcher)
-        : size_matcher_(MatcherCast<SizeType>(size_matcher)) {}
-
-    void DescribeTo(::std::ostream* os) const override {
-      *os << "size ";
-      size_matcher_.DescribeTo(os);
-    }
-    void DescribeNegationTo(::std::ostream* os) const override {
-      *os << "size ";
-      size_matcher_.DescribeNegationTo(os);
-    }
-
-    bool MatchAndExplain(Container container,
-                         MatchResultListener* listener) const override {
-      SizeType size = container.size();
-      StringMatchResultListener size_listener;
-      const bool result = size_matcher_.MatchAndExplain(size, &size_listener);
-      *listener
-          << "whose size " << size << (result ? " matches" : " doesn't match");
-      PrintIfNotEmpty(size_listener.str(), listener->stream());
-      return result;
-    }
-
-   private:
-    const Matcher<SizeType> size_matcher_;
-    GTEST_DISALLOW_ASSIGN_(Impl);
-  };
-
- private:
-  const SizeMatcher size_matcher_;
-  GTEST_DISALLOW_ASSIGN_(SizeIsMatcher);
-};
-
-// Implements a matcher that checks the begin()..end() distance of an STL-style
-// container.
-template <typename DistanceMatcher>
-class BeginEndDistanceIsMatcher {
- public:
-  explicit BeginEndDistanceIsMatcher(const DistanceMatcher& distance_matcher)
-      : distance_matcher_(distance_matcher) {}
-
-  template <typename Container>
-  operator Matcher<Container>() const {
-    return Matcher<Container>(new Impl<const Container&>(distance_matcher_));
-  }
-
-  template <typename Container>
-  class Impl : public MatcherInterface<Container> {
-   public:
-    typedef internal::StlContainerView<
-        GTEST_REMOVE_REFERENCE_AND_CONST_(Container)> ContainerView;
-    typedef typename std::iterator_traits<
-        typename ContainerView::type::const_iterator>::difference_type
-        DistanceType;
-    explicit Impl(const DistanceMatcher& distance_matcher)
-        : distance_matcher_(MatcherCast<DistanceType>(distance_matcher)) {}
-
-    void DescribeTo(::std::ostream* os) const override {
-      *os << "distance between begin() and end() ";
-      distance_matcher_.DescribeTo(os);
-    }
-    void DescribeNegationTo(::std::ostream* os) const override {
-      *os << "distance between begin() and end() ";
-      distance_matcher_.DescribeNegationTo(os);
-    }
-
-    bool MatchAndExplain(Container container,
-                         MatchResultListener* listener) const override {
-      using std::begin;
-      using std::end;
-      DistanceType distance = std::distance(begin(container), end(container));
-      StringMatchResultListener distance_listener;
-      const bool result =
-          distance_matcher_.MatchAndExplain(distance, &distance_listener);
-      *listener << "whose distance between begin() and end() " << distance
-                << (result ? " matches" : " doesn't match");
-      PrintIfNotEmpty(distance_listener.str(), listener->stream());
-      return result;
-    }
-
-   private:
-    const Matcher<DistanceType> distance_matcher_;
-    GTEST_DISALLOW_ASSIGN_(Impl);
-  };
-
- private:
-  const DistanceMatcher distance_matcher_;
-  GTEST_DISALLOW_ASSIGN_(BeginEndDistanceIsMatcher);
-};
-
-// Implements an equality matcher for any STL-style container whose elements
-// support ==. This matcher is like Eq(), but its failure explanations provide
-// more detailed information that is useful when the container is used as a set.
-// The failure message reports elements that are in one of the operands but not
-// the other. The failure messages do not report duplicate or out-of-order
-// elements in the containers (which don't properly matter to sets, but can
-// occur if the containers are vectors or lists, for example).
-//
-// Uses the container's const_iterator, value_type, operator ==,
-// begin(), and end().
-template <typename Container>
-class ContainerEqMatcher {
- public:
-  typedef internal::StlContainerView<Container> View;
-  typedef typename View::type StlContainer;
-  typedef typename View::const_reference StlContainerReference;
-
-  static_assert(!std::is_const<Container>::value,
-                "Container type must not be const");
-  static_assert(!std::is_reference<Container>::value,
-                "Container type must not be a reference");
-
-  // We make a copy of expected in case the elements in it are modified
-  // after this matcher is created.
-  explicit ContainerEqMatcher(const Container& expected)
-      : expected_(View::Copy(expected)) {}
-
-  void DescribeTo(::std::ostream* os) const {
-    *os << "equals ";
-    UniversalPrint(expected_, os);
-  }
-  void DescribeNegationTo(::std::ostream* os) const {
-    *os << "does not equal ";
-    UniversalPrint(expected_, os);
-  }
-
-  template <typename LhsContainer>
-  bool MatchAndExplain(const LhsContainer& lhs,
-                       MatchResultListener* listener) const {
-    typedef internal::StlContainerView<
-        typename std::remove_const<LhsContainer>::type>
-        LhsView;
-    typedef typename LhsView::type LhsStlContainer;
-    StlContainerReference lhs_stl_container = LhsView::ConstReference(lhs);
-    if (lhs_stl_container == expected_)
-      return true;
-
-    ::std::ostream* const os = listener->stream();
-    if (os != nullptr) {
-      // Something is different. Check for extra values first.
-      bool printed_header = false;
-      for (typename LhsStlContainer::const_iterator it =
-               lhs_stl_container.begin();
-           it != lhs_stl_container.end(); ++it) {
-        if (internal::ArrayAwareFind(expected_.begin(), expected_.end(), *it) ==
-            expected_.end()) {
-          if (printed_header) {
-            *os << ", ";
-          } else {
-            *os << "which has these unexpected elements: ";
-            printed_header = true;
-          }
-          UniversalPrint(*it, os);
-        }
-      }
-
-      // Now check for missing values.
-      bool printed_header2 = false;
-      for (typename StlContainer::const_iterator it = expected_.begin();
-           it != expected_.end(); ++it) {
-        if (internal::ArrayAwareFind(
-                lhs_stl_container.begin(), lhs_stl_container.end(), *it) ==
-            lhs_stl_container.end()) {
-          if (printed_header2) {
-            *os << ", ";
-          } else {
-            *os << (printed_header ? ",\nand" : "which")
-                << " doesn't have these expected elements: ";
-            printed_header2 = true;
-          }
-          UniversalPrint(*it, os);
-        }
-      }
-    }
-
-    return false;
-  }
-
- private:
-  const StlContainer expected_;
-
-  GTEST_DISALLOW_ASSIGN_(ContainerEqMatcher);
-};
-
-// A comparator functor that uses the < operator to compare two values.
-struct LessComparator {
-  template <typename T, typename U>
-  bool operator()(const T& lhs, const U& rhs) const { return lhs < rhs; }
-};
-
-// Implements WhenSortedBy(comparator, container_matcher).
-template <typename Comparator, typename ContainerMatcher>
-class WhenSortedByMatcher {
- public:
-  WhenSortedByMatcher(const Comparator& comparator,
-                      const ContainerMatcher& matcher)
-      : comparator_(comparator), matcher_(matcher) {}
-
-  template <typename LhsContainer>
-  operator Matcher<LhsContainer>() const {
-    return MakeMatcher(new Impl<LhsContainer>(comparator_, matcher_));
-  }
-
-  template <typename LhsContainer>
-  class Impl : public MatcherInterface<LhsContainer> {
-   public:
-    typedef internal::StlContainerView<
-         GTEST_REMOVE_REFERENCE_AND_CONST_(LhsContainer)> LhsView;
-    typedef typename LhsView::type LhsStlContainer;
-    typedef typename LhsView::const_reference LhsStlContainerReference;
-    // Transforms std::pair<const Key, Value> into std::pair<Key, Value>
-    // so that we can match associative containers.
-    typedef typename RemoveConstFromKey<
-        typename LhsStlContainer::value_type>::type LhsValue;
-
-    Impl(const Comparator& comparator, const ContainerMatcher& matcher)
-        : comparator_(comparator), matcher_(matcher) {}
-
-    void DescribeTo(::std::ostream* os) const override {
-      *os << "(when sorted) ";
-      matcher_.DescribeTo(os);
-    }
-
-    void DescribeNegationTo(::std::ostream* os) const override {
-      *os << "(when sorted) ";
-      matcher_.DescribeNegationTo(os);
-    }
-
-    bool MatchAndExplain(LhsContainer lhs,
-                         MatchResultListener* listener) const override {
-      LhsStlContainerReference lhs_stl_container = LhsView::ConstReference(lhs);
-      ::std::vector<LhsValue> sorted_container(lhs_stl_container.begin(),
-                                               lhs_stl_container.end());
-      ::std::sort(
-           sorted_container.begin(), sorted_container.end(), comparator_);
-
-      if (!listener->IsInterested()) {
-        // If the listener is not interested, we do not need to
-        // construct the inner explanation.
-        return matcher_.Matches(sorted_container);
-      }
-
-      *listener << "which is ";
-      UniversalPrint(sorted_container, listener->stream());
-      *listener << " when sorted";
-
-      StringMatchResultListener inner_listener;
-      const bool match = matcher_.MatchAndExplain(sorted_container,
-                                                  &inner_listener);
-      PrintIfNotEmpty(inner_listener.str(), listener->stream());
-      return match;
-    }
-
-   private:
-    const Comparator comparator_;
-    const Matcher<const ::std::vector<LhsValue>&> matcher_;
-
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(Impl);
-  };
-
- private:
-  const Comparator comparator_;
-  const ContainerMatcher matcher_;
-
-  GTEST_DISALLOW_ASSIGN_(WhenSortedByMatcher);
-};
-
-// Implements Pointwise(tuple_matcher, rhs_container).  tuple_matcher
-// must be able to be safely cast to Matcher<std::tuple<const T1&, const
-// T2&> >, where T1 and T2 are the types of elements in the LHS
-// container and the RHS container respectively.
-template <typename TupleMatcher, typename RhsContainer>
-class PointwiseMatcher {
-  GTEST_COMPILE_ASSERT_(
-      !IsHashTable<GTEST_REMOVE_REFERENCE_AND_CONST_(RhsContainer)>::value,
-      use_UnorderedPointwise_with_hash_tables);
-
- public:
-  typedef internal::StlContainerView<RhsContainer> RhsView;
-  typedef typename RhsView::type RhsStlContainer;
-  typedef typename RhsStlContainer::value_type RhsValue;
-
-  static_assert(!std::is_const<RhsContainer>::value,
-                "RhsContainer type must not be const");
-  static_assert(!std::is_reference<RhsContainer>::value,
-                "RhsContainer type must not be a reference");
-
-  // Like ContainerEq, we make a copy of rhs in case the elements in
-  // it are modified after this matcher is created.
-  PointwiseMatcher(const TupleMatcher& tuple_matcher, const RhsContainer& rhs)
-      : tuple_matcher_(tuple_matcher), rhs_(RhsView::Copy(rhs)) {}
-
-  template <typename LhsContainer>
-  operator Matcher<LhsContainer>() const {
-    GTEST_COMPILE_ASSERT_(
-        !IsHashTable<GTEST_REMOVE_REFERENCE_AND_CONST_(LhsContainer)>::value,
-        use_UnorderedPointwise_with_hash_tables);
-
-    return Matcher<LhsContainer>(
-        new Impl<const LhsContainer&>(tuple_matcher_, rhs_));
-  }
-
-  template <typename LhsContainer>
-  class Impl : public MatcherInterface<LhsContainer> {
-   public:
-    typedef internal::StlContainerView<
-         GTEST_REMOVE_REFERENCE_AND_CONST_(LhsContainer)> LhsView;
-    typedef typename LhsView::type LhsStlContainer;
-    typedef typename LhsView::const_reference LhsStlContainerReference;
-    typedef typename LhsStlContainer::value_type LhsValue;
-    // We pass the LHS value and the RHS value to the inner matcher by
-    // reference, as they may be expensive to copy.  We must use tuple
-    // instead of pair here, as a pair cannot hold references (C++ 98,
-    // 20.2.2 [lib.pairs]).
-    typedef ::std::tuple<const LhsValue&, const RhsValue&> InnerMatcherArg;
-
-    Impl(const TupleMatcher& tuple_matcher, const RhsStlContainer& rhs)
-        // mono_tuple_matcher_ holds a monomorphic version of the tuple matcher.
-        : mono_tuple_matcher_(SafeMatcherCast<InnerMatcherArg>(tuple_matcher)),
-          rhs_(rhs) {}
-
-    void DescribeTo(::std::ostream* os) const override {
-      *os << "contains " << rhs_.size()
-          << " values, where each value and its corresponding value in ";
-      UniversalPrinter<RhsStlContainer>::Print(rhs_, os);
-      *os << " ";
-      mono_tuple_matcher_.DescribeTo(os);
-    }
-    void DescribeNegationTo(::std::ostream* os) const override {
-      *os << "doesn't contain exactly " << rhs_.size()
-          << " values, or contains a value x at some index i"
-          << " where x and the i-th value of ";
-      UniversalPrint(rhs_, os);
-      *os << " ";
-      mono_tuple_matcher_.DescribeNegationTo(os);
-    }
-
-    bool MatchAndExplain(LhsContainer lhs,
-                         MatchResultListener* listener) const override {
-      LhsStlContainerReference lhs_stl_container = LhsView::ConstReference(lhs);
-      const size_t actual_size = lhs_stl_container.size();
-      if (actual_size != rhs_.size()) {
-        *listener << "which contains " << actual_size << " values";
-        return false;
-      }
-
-      typename LhsStlContainer::const_iterator left = lhs_stl_container.begin();
-      typename RhsStlContainer::const_iterator right = rhs_.begin();
-      for (size_t i = 0; i != actual_size; ++i, ++left, ++right) {
-        if (listener->IsInterested()) {
-          StringMatchResultListener inner_listener;
-          // Create InnerMatcherArg as a temporarily object to avoid it outlives
-          // *left and *right. Dereference or the conversion to `const T&` may
-          // return temp objects, e.g for vector<bool>.
-          if (!mono_tuple_matcher_.MatchAndExplain(
-                  InnerMatcherArg(ImplicitCast_<const LhsValue&>(*left),
-                                  ImplicitCast_<const RhsValue&>(*right)),
-                  &inner_listener)) {
-            *listener << "where the value pair (";
-            UniversalPrint(*left, listener->stream());
-            *listener << ", ";
-            UniversalPrint(*right, listener->stream());
-            *listener << ") at index #" << i << " don't match";
-            PrintIfNotEmpty(inner_listener.str(), listener->stream());
-            return false;
-          }
-        } else {
-          if (!mono_tuple_matcher_.Matches(
-                  InnerMatcherArg(ImplicitCast_<const LhsValue&>(*left),
-                                  ImplicitCast_<const RhsValue&>(*right))))
-            return false;
-        }
-      }
-
-      return true;
-    }
-
-   private:
-    const Matcher<InnerMatcherArg> mono_tuple_matcher_;
-    const RhsStlContainer rhs_;
-
-    GTEST_DISALLOW_ASSIGN_(Impl);
-  };
-
- private:
-  const TupleMatcher tuple_matcher_;
-  const RhsStlContainer rhs_;
-
-  GTEST_DISALLOW_ASSIGN_(PointwiseMatcher);
-};
-
-// Holds the logic common to ContainsMatcherImpl and EachMatcherImpl.
-template <typename Container>
-class QuantifierMatcherImpl : public MatcherInterface<Container> {
- public:
-  typedef GTEST_REMOVE_REFERENCE_AND_CONST_(Container) RawContainer;
-  typedef StlContainerView<RawContainer> View;
-  typedef typename View::type StlContainer;
-  typedef typename View::const_reference StlContainerReference;
-  typedef typename StlContainer::value_type Element;
-
-  template <typename InnerMatcher>
-  explicit QuantifierMatcherImpl(InnerMatcher inner_matcher)
-      : inner_matcher_(
-           testing::SafeMatcherCast<const Element&>(inner_matcher)) {}
-
-  // Checks whether:
-  // * All elements in the container match, if all_elements_should_match.
-  // * Any element in the container matches, if !all_elements_should_match.
-  bool MatchAndExplainImpl(bool all_elements_should_match,
-                           Container container,
-                           MatchResultListener* listener) const {
-    StlContainerReference stl_container = View::ConstReference(container);
-    size_t i = 0;
-    for (typename StlContainer::const_iterator it = stl_container.begin();
-         it != stl_container.end(); ++it, ++i) {
-      StringMatchResultListener inner_listener;
-      const bool matches = inner_matcher_.MatchAndExplain(*it, &inner_listener);
-
-      if (matches != all_elements_should_match) {
-        *listener << "whose element #" << i
-                  << (matches ? " matches" : " doesn't match");
-        PrintIfNotEmpty(inner_listener.str(), listener->stream());
-        return !all_elements_should_match;
-      }
-    }
-    return all_elements_should_match;
-  }
-
- protected:
-  const Matcher<const Element&> inner_matcher_;
-
-  GTEST_DISALLOW_ASSIGN_(QuantifierMatcherImpl);
-};
-
-// Implements Contains(element_matcher) for the given argument type Container.
-// Symmetric to EachMatcherImpl.
-template <typename Container>
-class ContainsMatcherImpl : public QuantifierMatcherImpl<Container> {
- public:
-  template <typename InnerMatcher>
-  explicit ContainsMatcherImpl(InnerMatcher inner_matcher)
-      : QuantifierMatcherImpl<Container>(inner_matcher) {}
-
-  // Describes what this matcher does.
-  void DescribeTo(::std::ostream* os) const override {
-    *os << "contains at least one element that ";
-    this->inner_matcher_.DescribeTo(os);
-  }
-
-  void DescribeNegationTo(::std::ostream* os) const override {
-    *os << "doesn't contain any element that ";
-    this->inner_matcher_.DescribeTo(os);
-  }
-
-  bool MatchAndExplain(Container container,
-                       MatchResultListener* listener) const override {
-    return this->MatchAndExplainImpl(false, container, listener);
-  }
-
- private:
-  GTEST_DISALLOW_ASSIGN_(ContainsMatcherImpl);
-};
-
-// Implements Each(element_matcher) for the given argument type Container.
-// Symmetric to ContainsMatcherImpl.
-template <typename Container>
-class EachMatcherImpl : public QuantifierMatcherImpl<Container> {
- public:
-  template <typename InnerMatcher>
-  explicit EachMatcherImpl(InnerMatcher inner_matcher)
-      : QuantifierMatcherImpl<Container>(inner_matcher) {}
-
-  // Describes what this matcher does.
-  void DescribeTo(::std::ostream* os) const override {
-    *os << "only contains elements that ";
-    this->inner_matcher_.DescribeTo(os);
-  }
-
-  void DescribeNegationTo(::std::ostream* os) const override {
-    *os << "contains some element that ";
-    this->inner_matcher_.DescribeNegationTo(os);
-  }
-
-  bool MatchAndExplain(Container container,
-                       MatchResultListener* listener) const override {
-    return this->MatchAndExplainImpl(true, container, listener);
-  }
-
- private:
-  GTEST_DISALLOW_ASSIGN_(EachMatcherImpl);
-};
-
-// Implements polymorphic Contains(element_matcher).
-template <typename M>
-class ContainsMatcher {
- public:
-  explicit ContainsMatcher(M m) : inner_matcher_(m) {}
-
-  template <typename Container>
-  operator Matcher<Container>() const {
-    return Matcher<Container>(
-        new ContainsMatcherImpl<const Container&>(inner_matcher_));
-  }
-
- private:
-  const M inner_matcher_;
-
-  GTEST_DISALLOW_ASSIGN_(ContainsMatcher);
-};
-
-// Implements polymorphic Each(element_matcher).
-template <typename M>
-class EachMatcher {
- public:
-  explicit EachMatcher(M m) : inner_matcher_(m) {}
-
-  template <typename Container>
-  operator Matcher<Container>() const {
-    return Matcher<Container>(
-        new EachMatcherImpl<const Container&>(inner_matcher_));
-  }
-
- private:
-  const M inner_matcher_;
-
-  GTEST_DISALLOW_ASSIGN_(EachMatcher);
-};
-
-struct Rank1 {};
-struct Rank0 : Rank1 {};
-
-namespace pair_getters {
-using std::get;
-template <typename T>
-auto First(T& x, Rank1) -> decltype(get<0>(x)) {  // NOLINT
-  return get<0>(x);
-}
-template <typename T>
-auto First(T& x, Rank0) -> decltype((x.first)) {  // NOLINT
-  return x.first;
-}
-
-template <typename T>
-auto Second(T& x, Rank1) -> decltype(get<1>(x)) {  // NOLINT
-  return get<1>(x);
-}
-template <typename T>
-auto Second(T& x, Rank0) -> decltype((x.second)) {  // NOLINT
-  return x.second;
-}
-}  // namespace pair_getters
-
-// Implements Key(inner_matcher) for the given argument pair type.
-// Key(inner_matcher) matches an std::pair whose 'first' field matches
-// inner_matcher.  For example, Contains(Key(Ge(5))) can be used to match an
-// std::map that contains at least one element whose key is >= 5.
-template <typename PairType>
-class KeyMatcherImpl : public MatcherInterface<PairType> {
- public:
-  typedef GTEST_REMOVE_REFERENCE_AND_CONST_(PairType) RawPairType;
-  typedef typename RawPairType::first_type KeyType;
-
-  template <typename InnerMatcher>
-  explicit KeyMatcherImpl(InnerMatcher inner_matcher)
-      : inner_matcher_(
-          testing::SafeMatcherCast<const KeyType&>(inner_matcher)) {
-  }
-
-  // Returns true if and only if 'key_value.first' (the key) matches the inner
-  // matcher.
-  bool MatchAndExplain(PairType key_value,
-                       MatchResultListener* listener) const override {
-    StringMatchResultListener inner_listener;
-    const bool match = inner_matcher_.MatchAndExplain(
-        pair_getters::First(key_value, Rank0()), &inner_listener);
-    const std::string explanation = inner_listener.str();
-    if (explanation != "") {
-      *listener << "whose first field is a value " << explanation;
-    }
-    return match;
-  }
-
-  // Describes what this matcher does.
-  void DescribeTo(::std::ostream* os) const override {
-    *os << "has a key that ";
-    inner_matcher_.DescribeTo(os);
-  }
-
-  // Describes what the negation of this matcher does.
-  void DescribeNegationTo(::std::ostream* os) const override {
-    *os << "doesn't have a key that ";
-    inner_matcher_.DescribeTo(os);
-  }
-
- private:
-  const Matcher<const KeyType&> inner_matcher_;
-
-  GTEST_DISALLOW_ASSIGN_(KeyMatcherImpl);
-};
-
-// Implements polymorphic Key(matcher_for_key).
-template <typename M>
-class KeyMatcher {
- public:
-  explicit KeyMatcher(M m) : matcher_for_key_(m) {}
-
-  template <typename PairType>
-  operator Matcher<PairType>() const {
-    return Matcher<PairType>(
-        new KeyMatcherImpl<const PairType&>(matcher_for_key_));
-  }
-
- private:
-  const M matcher_for_key_;
-
-  GTEST_DISALLOW_ASSIGN_(KeyMatcher);
-};
-
-// Implements Pair(first_matcher, second_matcher) for the given argument pair
-// type with its two matchers. See Pair() function below.
-template <typename PairType>
-class PairMatcherImpl : public MatcherInterface<PairType> {
- public:
-  typedef GTEST_REMOVE_REFERENCE_AND_CONST_(PairType) RawPairType;
-  typedef typename RawPairType::first_type FirstType;
-  typedef typename RawPairType::second_type SecondType;
-
-  template <typename FirstMatcher, typename SecondMatcher>
-  PairMatcherImpl(FirstMatcher first_matcher, SecondMatcher second_matcher)
-      : first_matcher_(
-            testing::SafeMatcherCast<const FirstType&>(first_matcher)),
-        second_matcher_(
-            testing::SafeMatcherCast<const SecondType&>(second_matcher)) {
-  }
-
-  // Describes what this matcher does.
-  void DescribeTo(::std::ostream* os) const override {
-    *os << "has a first field that ";
-    first_matcher_.DescribeTo(os);
-    *os << ", and has a second field that ";
-    second_matcher_.DescribeTo(os);
-  }
-
-  // Describes what the negation of this matcher does.
-  void DescribeNegationTo(::std::ostream* os) const override {
-    *os << "has a first field that ";
-    first_matcher_.DescribeNegationTo(os);
-    *os << ", or has a second field that ";
-    second_matcher_.DescribeNegationTo(os);
-  }
-
-  // Returns true if and only if 'a_pair.first' matches first_matcher and
-  // 'a_pair.second' matches second_matcher.
-  bool MatchAndExplain(PairType a_pair,
-                       MatchResultListener* listener) const override {
-    if (!listener->IsInterested()) {
-      // If the listener is not interested, we don't need to construct the
-      // explanation.
-      return first_matcher_.Matches(pair_getters::First(a_pair, Rank0())) &&
-             second_matcher_.Matches(pair_getters::Second(a_pair, Rank0()));
-    }
-    StringMatchResultListener first_inner_listener;
-    if (!first_matcher_.MatchAndExplain(pair_getters::First(a_pair, Rank0()),
-                                        &first_inner_listener)) {
-      *listener << "whose first field does not match";
-      PrintIfNotEmpty(first_inner_listener.str(), listener->stream());
-      return false;
-    }
-    StringMatchResultListener second_inner_listener;
-    if (!second_matcher_.MatchAndExplain(pair_getters::Second(a_pair, Rank0()),
-                                         &second_inner_listener)) {
-      *listener << "whose second field does not match";
-      PrintIfNotEmpty(second_inner_listener.str(), listener->stream());
-      return false;
-    }
-    ExplainSuccess(first_inner_listener.str(), second_inner_listener.str(),
-                   listener);
-    return true;
-  }
-
- private:
-  void ExplainSuccess(const std::string& first_explanation,
-                      const std::string& second_explanation,
-                      MatchResultListener* listener) const {
-    *listener << "whose both fields match";
-    if (first_explanation != "") {
-      *listener << ", where the first field is a value " << first_explanation;
-    }
-    if (second_explanation != "") {
-      *listener << ", ";
-      if (first_explanation != "") {
-        *listener << "and ";
-      } else {
-        *listener << "where ";
-      }
-      *listener << "the second field is a value " << second_explanation;
-    }
-  }
-
-  const Matcher<const FirstType&> first_matcher_;
-  const Matcher<const SecondType&> second_matcher_;
-
-  GTEST_DISALLOW_ASSIGN_(PairMatcherImpl);
-};
-
-// Implements polymorphic Pair(first_matcher, second_matcher).
-template <typename FirstMatcher, typename SecondMatcher>
-class PairMatcher {
- public:
-  PairMatcher(FirstMatcher first_matcher, SecondMatcher second_matcher)
-      : first_matcher_(first_matcher), second_matcher_(second_matcher) {}
-
-  template <typename PairType>
-  operator Matcher<PairType> () const {
-    return Matcher<PairType>(
-        new PairMatcherImpl<const PairType&>(first_matcher_, second_matcher_));
-  }
-
- private:
-  const FirstMatcher first_matcher_;
-  const SecondMatcher second_matcher_;
-
-  GTEST_DISALLOW_ASSIGN_(PairMatcher);
-};
-
-// Implements ElementsAre() and ElementsAreArray().
-template <typename Container>
-class ElementsAreMatcherImpl : public MatcherInterface<Container> {
- public:
-  typedef GTEST_REMOVE_REFERENCE_AND_CONST_(Container) RawContainer;
-  typedef internal::StlContainerView<RawContainer> View;
-  typedef typename View::type StlContainer;
-  typedef typename View::const_reference StlContainerReference;
-  typedef typename StlContainer::value_type Element;
-
-  // Constructs the matcher from a sequence of element values or
-  // element matchers.
-  template <typename InputIter>
-  ElementsAreMatcherImpl(InputIter first, InputIter last) {
-    while (first != last) {
-      matchers_.push_back(MatcherCast<const Element&>(*first++));
-    }
-  }
-
-  // Describes what this matcher does.
-  void DescribeTo(::std::ostream* os) const override {
-    if (count() == 0) {
-      *os << "is empty";
-    } else if (count() == 1) {
-      *os << "has 1 element that ";
-      matchers_[0].DescribeTo(os);
-    } else {
-      *os << "has " << Elements(count()) << " where\n";
-      for (size_t i = 0; i != count(); ++i) {
-        *os << "element #" << i << " ";
-        matchers_[i].DescribeTo(os);
-        if (i + 1 < count()) {
-          *os << ",\n";
-        }
-      }
-    }
-  }
-
-  // Describes what the negation of this matcher does.
-  void DescribeNegationTo(::std::ostream* os) const override {
-    if (count() == 0) {
-      *os << "isn't empty";
-      return;
-    }
-
-    *os << "doesn't have " << Elements(count()) << ", or\n";
-    for (size_t i = 0; i != count(); ++i) {
-      *os << "element #" << i << " ";
-      matchers_[i].DescribeNegationTo(os);
-      if (i + 1 < count()) {
-        *os << ", or\n";
-      }
-    }
-  }
-
-  bool MatchAndExplain(Container container,
-                       MatchResultListener* listener) const override {
-    // To work with stream-like "containers", we must only walk
-    // through the elements in one pass.
-
-    const bool listener_interested = listener->IsInterested();
-
-    // explanations[i] is the explanation of the element at index i.
-    ::std::vector<std::string> explanations(count());
-    StlContainerReference stl_container = View::ConstReference(container);
-    typename StlContainer::const_iterator it = stl_container.begin();
-    size_t exam_pos = 0;
-    bool mismatch_found = false;  // Have we found a mismatched element yet?
-
-    // Go through the elements and matchers in pairs, until we reach
-    // the end of either the elements or the matchers, or until we find a
-    // mismatch.
-    for (; it != stl_container.end() && exam_pos != count(); ++it, ++exam_pos) {
-      bool match;  // Does the current element match the current matcher?
-      if (listener_interested) {
-        StringMatchResultListener s;
-        match = matchers_[exam_pos].MatchAndExplain(*it, &s);
-        explanations[exam_pos] = s.str();
-      } else {
-        match = matchers_[exam_pos].Matches(*it);
-      }
-
-      if (!match) {
-        mismatch_found = true;
-        break;
-      }
-    }
-    // If mismatch_found is true, 'exam_pos' is the index of the mismatch.
-
-    // Find how many elements the actual container has.  We avoid
-    // calling size() s.t. this code works for stream-like "containers"
-    // that don't define size().
-    size_t actual_count = exam_pos;
-    for (; it != stl_container.end(); ++it) {
-      ++actual_count;
-    }
-
-    if (actual_count != count()) {
-      // The element count doesn't match.  If the container is empty,
-      // there's no need to explain anything as Google Mock already
-      // prints the empty container.  Otherwise we just need to show
-      // how many elements there actually are.
-      if (listener_interested && (actual_count != 0)) {
-        *listener << "which has " << Elements(actual_count);
-      }
-      return false;
-    }
-
-    if (mismatch_found) {
-      // The element count matches, but the exam_pos-th element doesn't match.
-      if (listener_interested) {
-        *listener << "whose element #" << exam_pos << " doesn't match";
-        PrintIfNotEmpty(explanations[exam_pos], listener->stream());
-      }
-      return false;
-    }
-
-    // Every element matches its expectation.  We need to explain why
-    // (the obvious ones can be skipped).
-    if (listener_interested) {
-      bool reason_printed = false;
-      for (size_t i = 0; i != count(); ++i) {
-        const std::string& s = explanations[i];
-        if (!s.empty()) {
-          if (reason_printed) {
-            *listener << ",\nand ";
-          }
-          *listener << "whose element #" << i << " matches, " << s;
-          reason_printed = true;
-        }
-      }
-    }
-    return true;
-  }
-
- private:
-  static Message Elements(size_t count) {
-    return Message() << count << (count == 1 ? " element" : " elements");
-  }
-
-  size_t count() const { return matchers_.size(); }
-
-  ::std::vector<Matcher<const Element&> > matchers_;
-
-  GTEST_DISALLOW_ASSIGN_(ElementsAreMatcherImpl);
-};
-
-// Connectivity matrix of (elements X matchers), in element-major order.
-// Initially, there are no edges.
-// Use NextGraph() to iterate over all possible edge configurations.
-// Use Randomize() to generate a random edge configuration.
-class GTEST_API_ MatchMatrix {
- public:
-  MatchMatrix(size_t num_elements, size_t num_matchers)
-      : num_elements_(num_elements),
-        num_matchers_(num_matchers),
-        matched_(num_elements_* num_matchers_, 0) {
-  }
-
-  size_t LhsSize() const { return num_elements_; }
-  size_t RhsSize() const { return num_matchers_; }
-  bool HasEdge(size_t ilhs, size_t irhs) const {
-    return matched_[SpaceIndex(ilhs, irhs)] == 1;
-  }
-  void SetEdge(size_t ilhs, size_t irhs, bool b) {
-    matched_[SpaceIndex(ilhs, irhs)] = b ? 1 : 0;
-  }
-
-  // Treating the connectivity matrix as a (LhsSize()*RhsSize())-bit number,
-  // adds 1 to that number; returns false if incrementing the graph left it
-  // empty.
-  bool NextGraph();
-
-  void Randomize();
-
-  std::string DebugString() const;
-
- private:
-  size_t SpaceIndex(size_t ilhs, size_t irhs) const {
-    return ilhs * num_matchers_ + irhs;
-  }
-
-  size_t num_elements_;
-  size_t num_matchers_;
-
-  // Each element is a char interpreted as bool. They are stored as a
-  // flattened array in lhs-major order, use 'SpaceIndex()' to translate
-  // a (ilhs, irhs) matrix coordinate into an offset.
-  ::std::vector<char> matched_;
-};
-
-typedef ::std::pair<size_t, size_t> ElementMatcherPair;
-typedef ::std::vector<ElementMatcherPair> ElementMatcherPairs;
-
-// Returns a maximum bipartite matching for the specified graph 'g'.
-// The matching is represented as a vector of {element, matcher} pairs.
-GTEST_API_ ElementMatcherPairs
-FindMaxBipartiteMatching(const MatchMatrix& g);
-
-struct UnorderedMatcherRequire {
-  enum Flags {
-    Superset = 1 << 0,
-    Subset = 1 << 1,
-    ExactMatch = Superset | Subset,
-  };
-};
-
-// Untyped base class for implementing UnorderedElementsAre.  By
-// putting logic that's not specific to the element type here, we
-// reduce binary bloat and increase compilation speed.
-class GTEST_API_ UnorderedElementsAreMatcherImplBase {
- protected:
-  explicit UnorderedElementsAreMatcherImplBase(
-      UnorderedMatcherRequire::Flags matcher_flags)
-      : match_flags_(matcher_flags) {}
-
-  // A vector of matcher describers, one for each element matcher.
-  // Does not own the describers (and thus can be used only when the
-  // element matchers are alive).
-  typedef ::std::vector<const MatcherDescriberInterface*> MatcherDescriberVec;
-
-  // Describes this UnorderedElementsAre matcher.
-  void DescribeToImpl(::std::ostream* os) const;
-
-  // Describes the negation of this UnorderedElementsAre matcher.
-  void DescribeNegationToImpl(::std::ostream* os) const;
-
-  bool VerifyMatchMatrix(const ::std::vector<std::string>& element_printouts,
-                         const MatchMatrix& matrix,
-                         MatchResultListener* listener) const;
-
-  bool FindPairing(const MatchMatrix& matrix,
-                   MatchResultListener* listener) const;
-
-  MatcherDescriberVec& matcher_describers() {
-    return matcher_describers_;
-  }
-
-  static Message Elements(size_t n) {
-    return Message() << n << " element" << (n == 1 ? "" : "s");
-  }
-
-  UnorderedMatcherRequire::Flags match_flags() const { return match_flags_; }
-
- private:
-  UnorderedMatcherRequire::Flags match_flags_;
-  MatcherDescriberVec matcher_describers_;
-
-  GTEST_DISALLOW_ASSIGN_(UnorderedElementsAreMatcherImplBase);
-};
-
-// Implements UnorderedElementsAre, UnorderedElementsAreArray, IsSubsetOf, and
-// IsSupersetOf.
-template <typename Container>
-class UnorderedElementsAreMatcherImpl
-    : public MatcherInterface<Container>,
-      public UnorderedElementsAreMatcherImplBase {
- public:
-  typedef GTEST_REMOVE_REFERENCE_AND_CONST_(Container) RawContainer;
-  typedef internal::StlContainerView<RawContainer> View;
-  typedef typename View::type StlContainer;
-  typedef typename View::const_reference StlContainerReference;
-  typedef typename StlContainer::const_iterator StlContainerConstIterator;
-  typedef typename StlContainer::value_type Element;
-
-  template <typename InputIter>
-  UnorderedElementsAreMatcherImpl(UnorderedMatcherRequire::Flags matcher_flags,
-                                  InputIter first, InputIter last)
-      : UnorderedElementsAreMatcherImplBase(matcher_flags) {
-    for (; first != last; ++first) {
-      matchers_.push_back(MatcherCast<const Element&>(*first));
-      matcher_describers().push_back(matchers_.back().GetDescriber());
-    }
-  }
-
-  // Describes what this matcher does.
-  void DescribeTo(::std::ostream* os) const override {
-    return UnorderedElementsAreMatcherImplBase::DescribeToImpl(os);
-  }
-
-  // Describes what the negation of this matcher does.
-  void DescribeNegationTo(::std::ostream* os) const override {
-    return UnorderedElementsAreMatcherImplBase::DescribeNegationToImpl(os);
-  }
-
-  bool MatchAndExplain(Container container,
-                       MatchResultListener* listener) const override {
-    StlContainerReference stl_container = View::ConstReference(container);
-    ::std::vector<std::string> element_printouts;
-    MatchMatrix matrix =
-        AnalyzeElements(stl_container.begin(), stl_container.end(),
-                        &element_printouts, listener);
-
-    if (matrix.LhsSize() == 0 && matrix.RhsSize() == 0) {
-      return true;
-    }
-
-    if (match_flags() == UnorderedMatcherRequire::ExactMatch) {
-      if (matrix.LhsSize() != matrix.RhsSize()) {
-        // The element count doesn't match.  If the container is empty,
-        // there's no need to explain anything as Google Mock already
-        // prints the empty container. Otherwise we just need to show
-        // how many elements there actually are.
-        if (matrix.LhsSize() != 0 && listener->IsInterested()) {
-          *listener << "which has " << Elements(matrix.LhsSize());
-        }
-        return false;
-      }
-    }
-
-    return VerifyMatchMatrix(element_printouts, matrix, listener) &&
-           FindPairing(matrix, listener);
-  }
-
- private:
-  template <typename ElementIter>
-  MatchMatrix AnalyzeElements(ElementIter elem_first, ElementIter elem_last,
-                              ::std::vector<std::string>* element_printouts,
-                              MatchResultListener* listener) const {
-    element_printouts->clear();
-    ::std::vector<char> did_match;
-    size_t num_elements = 0;
-    for (; elem_first != elem_last; ++num_elements, ++elem_first) {
-      if (listener->IsInterested()) {
-        element_printouts->push_back(PrintToString(*elem_first));
-      }
-      for (size_t irhs = 0; irhs != matchers_.size(); ++irhs) {
-        did_match.push_back(Matches(matchers_[irhs])(*elem_first));
-      }
-    }
-
-    MatchMatrix matrix(num_elements, matchers_.size());
-    ::std::vector<char>::const_iterator did_match_iter = did_match.begin();
-    for (size_t ilhs = 0; ilhs != num_elements; ++ilhs) {
-      for (size_t irhs = 0; irhs != matchers_.size(); ++irhs) {
-        matrix.SetEdge(ilhs, irhs, *did_match_iter++ != 0);
-      }
-    }
-    return matrix;
-  }
-
-  ::std::vector<Matcher<const Element&> > matchers_;
-
-  GTEST_DISALLOW_ASSIGN_(UnorderedElementsAreMatcherImpl);
-};
-
-// Functor for use in TransformTuple.
-// Performs MatcherCast<Target> on an input argument of any type.
-template <typename Target>
-struct CastAndAppendTransform {
-  template <typename Arg>
-  Matcher<Target> operator()(const Arg& a) const {
-    return MatcherCast<Target>(a);
-  }
-};
-
-// Implements UnorderedElementsAre.
-template <typename MatcherTuple>
-class UnorderedElementsAreMatcher {
- public:
-  explicit UnorderedElementsAreMatcher(const MatcherTuple& args)
-      : matchers_(args) {}
-
-  template <typename Container>
-  operator Matcher<Container>() const {
-    typedef GTEST_REMOVE_REFERENCE_AND_CONST_(Container) RawContainer;
-    typedef typename internal::StlContainerView<RawContainer>::type View;
-    typedef typename View::value_type Element;
-    typedef ::std::vector<Matcher<const Element&> > MatcherVec;
-    MatcherVec matchers;
-    matchers.reserve(::std::tuple_size<MatcherTuple>::value);
-    TransformTupleValues(CastAndAppendTransform<const Element&>(), matchers_,
-                         ::std::back_inserter(matchers));
-    return Matcher<Container>(
-        new UnorderedElementsAreMatcherImpl<const Container&>(
-            UnorderedMatcherRequire::ExactMatch, matchers.begin(),
-            matchers.end()));
-  }
-
- private:
-  const MatcherTuple matchers_;
-  GTEST_DISALLOW_ASSIGN_(UnorderedElementsAreMatcher);
-};
-
-// Implements ElementsAre.
-template <typename MatcherTuple>
-class ElementsAreMatcher {
- public:
-  explicit ElementsAreMatcher(const MatcherTuple& args) : matchers_(args) {}
-
-  template <typename Container>
-  operator Matcher<Container>() const {
-    GTEST_COMPILE_ASSERT_(
-        !IsHashTable<GTEST_REMOVE_REFERENCE_AND_CONST_(Container)>::value ||
-            ::std::tuple_size<MatcherTuple>::value < 2,
-        use_UnorderedElementsAre_with_hash_tables);
-
-    typedef GTEST_REMOVE_REFERENCE_AND_CONST_(Container) RawContainer;
-    typedef typename internal::StlContainerView<RawContainer>::type View;
-    typedef typename View::value_type Element;
-    typedef ::std::vector<Matcher<const Element&> > MatcherVec;
-    MatcherVec matchers;
-    matchers.reserve(::std::tuple_size<MatcherTuple>::value);
-    TransformTupleValues(CastAndAppendTransform<const Element&>(), matchers_,
-                         ::std::back_inserter(matchers));
-    return Matcher<Container>(new ElementsAreMatcherImpl<const Container&>(
-        matchers.begin(), matchers.end()));
-  }
-
- private:
-  const MatcherTuple matchers_;
-  GTEST_DISALLOW_ASSIGN_(ElementsAreMatcher);
-};
-
-// Implements UnorderedElementsAreArray(), IsSubsetOf(), and IsSupersetOf().
-template <typename T>
-class UnorderedElementsAreArrayMatcher {
- public:
-  template <typename Iter>
-  UnorderedElementsAreArrayMatcher(UnorderedMatcherRequire::Flags match_flags,
-                                   Iter first, Iter last)
-      : match_flags_(match_flags), matchers_(first, last) {}
-
-  template <typename Container>
-  operator Matcher<Container>() const {
-    return Matcher<Container>(
-        new UnorderedElementsAreMatcherImpl<const Container&>(
-            match_flags_, matchers_.begin(), matchers_.end()));
-  }
-
- private:
-  UnorderedMatcherRequire::Flags match_flags_;
-  ::std::vector<T> matchers_;
-
-  GTEST_DISALLOW_ASSIGN_(UnorderedElementsAreArrayMatcher);
-};
-
-// Implements ElementsAreArray().
-template <typename T>
-class ElementsAreArrayMatcher {
- public:
-  template <typename Iter>
-  ElementsAreArrayMatcher(Iter first, Iter last) : matchers_(first, last) {}
-
-  template <typename Container>
-  operator Matcher<Container>() const {
-    GTEST_COMPILE_ASSERT_(
-        !IsHashTable<GTEST_REMOVE_REFERENCE_AND_CONST_(Container)>::value,
-        use_UnorderedElementsAreArray_with_hash_tables);
-
-    return Matcher<Container>(new ElementsAreMatcherImpl<const Container&>(
-        matchers_.begin(), matchers_.end()));
-  }
-
- private:
-  const ::std::vector<T> matchers_;
-
-  GTEST_DISALLOW_ASSIGN_(ElementsAreArrayMatcher);
-};
-
-// Given a 2-tuple matcher tm of type Tuple2Matcher and a value second
-// of type Second, BoundSecondMatcher<Tuple2Matcher, Second>(tm,
-// second) is a polymorphic matcher that matches a value x if and only if
-// tm matches tuple (x, second).  Useful for implementing
-// UnorderedPointwise() in terms of UnorderedElementsAreArray().
-//
-// BoundSecondMatcher is copyable and assignable, as we need to put
-// instances of this class in a vector when implementing
-// UnorderedPointwise().
-template <typename Tuple2Matcher, typename Second>
-class BoundSecondMatcher {
- public:
-  BoundSecondMatcher(const Tuple2Matcher& tm, const Second& second)
-      : tuple2_matcher_(tm), second_value_(second) {}
-
-  template <typename T>
-  operator Matcher<T>() const {
-    return MakeMatcher(new Impl<T>(tuple2_matcher_, second_value_));
-  }
-
-  // We have to define this for UnorderedPointwise() to compile in
-  // C++98 mode, as it puts BoundSecondMatcher instances in a vector,
-  // which requires the elements to be assignable in C++98.  The
-  // compiler cannot generate the operator= for us, as Tuple2Matcher
-  // and Second may not be assignable.
-  //
-  // However, this should never be called, so the implementation just
-  // need to assert.
-  void operator=(const BoundSecondMatcher& /*rhs*/) {
-    GTEST_LOG_(FATAL) << "BoundSecondMatcher should never be assigned.";
-  }
-
- private:
-  template <typename T>
-  class Impl : public MatcherInterface<T> {
-   public:
-    typedef ::std::tuple<T, Second> ArgTuple;
-
-    Impl(const Tuple2Matcher& tm, const Second& second)
-        : mono_tuple2_matcher_(SafeMatcherCast<const ArgTuple&>(tm)),
-          second_value_(second) {}
-
-    void DescribeTo(::std::ostream* os) const override {
-      *os << "and ";
-      UniversalPrint(second_value_, os);
-      *os << " ";
-      mono_tuple2_matcher_.DescribeTo(os);
-    }
-
-    bool MatchAndExplain(T x, MatchResultListener* listener) const override {
-      return mono_tuple2_matcher_.MatchAndExplain(ArgTuple(x, second_value_),
-                                                  listener);
-    }
-
-   private:
-    const Matcher<const ArgTuple&> mono_tuple2_matcher_;
-    const Second second_value_;
-
-    GTEST_DISALLOW_ASSIGN_(Impl);
-  };
-
-  const Tuple2Matcher tuple2_matcher_;
-  const Second second_value_;
-};
-
-// Given a 2-tuple matcher tm and a value second,
-// MatcherBindSecond(tm, second) returns a matcher that matches a
-// value x if and only if tm matches tuple (x, second).  Useful for
-// implementing UnorderedPointwise() in terms of UnorderedElementsAreArray().
-template <typename Tuple2Matcher, typename Second>
-BoundSecondMatcher<Tuple2Matcher, Second> MatcherBindSecond(
-    const Tuple2Matcher& tm, const Second& second) {
-  return BoundSecondMatcher<Tuple2Matcher, Second>(tm, second);
-}
-
-// Returns the description for a matcher defined using the MATCHER*()
-// macro where the user-supplied description string is "", if
-// 'negation' is false; otherwise returns the description of the
-// negation of the matcher.  'param_values' contains a list of strings
-// that are the print-out of the matcher's parameters.
-GTEST_API_ std::string FormatMatcherDescription(bool negation,
-                                                const char* matcher_name,
-                                                const Strings& param_values);
-
-// Implements a matcher that checks the value of a optional<> type variable.
-template <typename ValueMatcher>
-class OptionalMatcher {
- public:
-  explicit OptionalMatcher(const ValueMatcher& value_matcher)
-      : value_matcher_(value_matcher) {}
-
-  template <typename Optional>
-  operator Matcher<Optional>() const {
-    return Matcher<Optional>(new Impl<const Optional&>(value_matcher_));
-  }
-
-  template <typename Optional>
-  class Impl : public MatcherInterface<Optional> {
-   public:
-    typedef GTEST_REMOVE_REFERENCE_AND_CONST_(Optional) OptionalView;
-    typedef typename OptionalView::value_type ValueType;
-    explicit Impl(const ValueMatcher& value_matcher)
-        : value_matcher_(MatcherCast<ValueType>(value_matcher)) {}
-
-    void DescribeTo(::std::ostream* os) const override {
-      *os << "value ";
-      value_matcher_.DescribeTo(os);
-    }
-
-    void DescribeNegationTo(::std::ostream* os) const override {
-      *os << "value ";
-      value_matcher_.DescribeNegationTo(os);
-    }
-
-    bool MatchAndExplain(Optional optional,
-                         MatchResultListener* listener) const override {
-      if (!optional) {
-        *listener << "which is not engaged";
-        return false;
-      }
-      const ValueType& value = *optional;
-      StringMatchResultListener value_listener;
-      const bool match = value_matcher_.MatchAndExplain(value, &value_listener);
-      *listener << "whose value " << PrintToString(value)
-                << (match ? " matches" : " doesn't match");
-      PrintIfNotEmpty(value_listener.str(), listener->stream());
-      return match;
-    }
-
-   private:
-    const Matcher<ValueType> value_matcher_;
-    GTEST_DISALLOW_ASSIGN_(Impl);
-  };
-
- private:
-  const ValueMatcher value_matcher_;
-  GTEST_DISALLOW_ASSIGN_(OptionalMatcher);
-};
-
-namespace variant_matcher {
-// Overloads to allow VariantMatcher to do proper ADL lookup.
-template <typename T>
-void holds_alternative() {}
-template <typename T>
-void get() {}
-
-// Implements a matcher that checks the value of a variant<> type variable.
-template <typename T>
-class VariantMatcher {
- public:
-  explicit VariantMatcher(::testing::Matcher<const T&> matcher)
-      : matcher_(std::move(matcher)) {}
-
-  template <typename Variant>
-  bool MatchAndExplain(const Variant& value,
-                       ::testing::MatchResultListener* listener) const {
-    using std::get;
-    if (!listener->IsInterested()) {
-      return holds_alternative<T>(value) && matcher_.Matches(get<T>(value));
-    }
-
-    if (!holds_alternative<T>(value)) {
-      *listener << "whose value is not of type '" << GetTypeName() << "'";
-      return false;
-    }
-
-    const T& elem = get<T>(value);
-    StringMatchResultListener elem_listener;
-    const bool match = matcher_.MatchAndExplain(elem, &elem_listener);
-    *listener << "whose value " << PrintToString(elem)
-              << (match ? " matches" : " doesn't match");
-    PrintIfNotEmpty(elem_listener.str(), listener->stream());
-    return match;
-  }
-
-  void DescribeTo(std::ostream* os) const {
-    *os << "is a variant<> with value of type '" << GetTypeName()
-        << "' and the value ";
-    matcher_.DescribeTo(os);
-  }
-
-  void DescribeNegationTo(std::ostream* os) const {
-    *os << "is a variant<> with value of type other than '" << GetTypeName()
-        << "' or the value ";
-    matcher_.DescribeNegationTo(os);
-  }
-
- private:
-  static std::string GetTypeName() {
-#if GTEST_HAS_RTTI
-    GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(
-        return internal::GetTypeName<T>());
-#endif
-    return "the element type";
-  }
-
-  const ::testing::Matcher<const T&> matcher_;
-};
-
-}  // namespace variant_matcher
-
-namespace any_cast_matcher {
-
-// Overloads to allow AnyCastMatcher to do proper ADL lookup.
-template <typename T>
-void any_cast() {}
-
-// Implements a matcher that any_casts the value.
-template <typename T>
-class AnyCastMatcher {
- public:
-  explicit AnyCastMatcher(const ::testing::Matcher<const T&>& matcher)
-      : matcher_(matcher) {}
-
-  template <typename AnyType>
-  bool MatchAndExplain(const AnyType& value,
-                       ::testing::MatchResultListener* listener) const {
-    if (!listener->IsInterested()) {
-      const T* ptr = any_cast<T>(&value);
-      return ptr != nullptr && matcher_.Matches(*ptr);
-    }
-
-    const T* elem = any_cast<T>(&value);
-    if (elem == nullptr) {
-      *listener << "whose value is not of type '" << GetTypeName() << "'";
-      return false;
-    }
-
-    StringMatchResultListener elem_listener;
-    const bool match = matcher_.MatchAndExplain(*elem, &elem_listener);
-    *listener << "whose value " << PrintToString(*elem)
-              << (match ? " matches" : " doesn't match");
-    PrintIfNotEmpty(elem_listener.str(), listener->stream());
-    return match;
-  }
-
-  void DescribeTo(std::ostream* os) const {
-    *os << "is an 'any' type with value of type '" << GetTypeName()
-        << "' and the value ";
-    matcher_.DescribeTo(os);
-  }
-
-  void DescribeNegationTo(std::ostream* os) const {
-    *os << "is an 'any' type with value of type other than '" << GetTypeName()
-        << "' or the value ";
-    matcher_.DescribeNegationTo(os);
-  }
-
- private:
-  static std::string GetTypeName() {
-#if GTEST_HAS_RTTI
-    GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(
-        return internal::GetTypeName<T>());
-#endif
-    return "the element type";
-  }
-
-  const ::testing::Matcher<const T&> matcher_;
-};
-
-}  // namespace any_cast_matcher
-
-// Implements the Args() matcher.
-template <class ArgsTuple, size_t... k>
-class ArgsMatcherImpl : public MatcherInterface<ArgsTuple> {
- public:
-  using RawArgsTuple = typename std::decay<ArgsTuple>::type;
-  using SelectedArgs =
-      std::tuple<typename std::tuple_element<k, RawArgsTuple>::type...>;
-  using MonomorphicInnerMatcher = Matcher<const SelectedArgs&>;
-
-  template <typename InnerMatcher>
-  explicit ArgsMatcherImpl(const InnerMatcher& inner_matcher)
-      : inner_matcher_(SafeMatcherCast<const SelectedArgs&>(inner_matcher)) {}
-
-  bool MatchAndExplain(ArgsTuple args,
-                       MatchResultListener* listener) const override {
-    // Workaround spurious C4100 on MSVC<=15.7 when k is empty.
-    (void)args;
-    const SelectedArgs& selected_args =
-        std::forward_as_tuple(std::get<k>(args)...);
-    if (!listener->IsInterested()) return inner_matcher_.Matches(selected_args);
-
-    PrintIndices(listener->stream());
-    *listener << "are " << PrintToString(selected_args);
-
-    StringMatchResultListener inner_listener;
-    const bool match =
-        inner_matcher_.MatchAndExplain(selected_args, &inner_listener);
-    PrintIfNotEmpty(inner_listener.str(), listener->stream());
-    return match;
-  }
-
-  void DescribeTo(::std::ostream* os) const override {
-    *os << "are a tuple ";
-    PrintIndices(os);
-    inner_matcher_.DescribeTo(os);
-  }
-
-  void DescribeNegationTo(::std::ostream* os) const override {
-    *os << "are a tuple ";
-    PrintIndices(os);
-    inner_matcher_.DescribeNegationTo(os);
-  }
-
- private:
-  // Prints the indices of the selected fields.
-  static void PrintIndices(::std::ostream* os) {
-    *os << "whose fields (";
-    const char* sep = "";
-    // Workaround spurious C4189 on MSVC<=15.7 when k is empty.
-    (void)sep;
-    const char* dummy[] = {"", (*os << sep << "#" << k, sep = ", ")...};
-    (void)dummy;
-    *os << ") ";
-  }
-
-  MonomorphicInnerMatcher inner_matcher_;
-};
-
-template <class InnerMatcher, size_t... k>
-class ArgsMatcher {
- public:
-  explicit ArgsMatcher(InnerMatcher inner_matcher)
-      : inner_matcher_(std::move(inner_matcher)) {}
-
-  template <typename ArgsTuple>
-  operator Matcher<ArgsTuple>() const {  // NOLINT
-    return MakeMatcher(new ArgsMatcherImpl<ArgsTuple, k...>(inner_matcher_));
-  }
-
- private:
-  InnerMatcher inner_matcher_;
-};
-
-}  // namespace internal
-
-// ElementsAreArray(iterator_first, iterator_last)
-// ElementsAreArray(pointer, count)
-// ElementsAreArray(array)
-// ElementsAreArray(container)
-// ElementsAreArray({ e1, e2, ..., en })
-//
-// The ElementsAreArray() functions are like ElementsAre(...), except
-// that they are given a homogeneous sequence rather than taking each
-// element as a function argument. The sequence can be specified as an
-// array, a pointer and count, a vector, an initializer list, or an
-// STL iterator range. In each of these cases, the underlying sequence
-// can be either a sequence of values or a sequence of matchers.
-//
-// All forms of ElementsAreArray() make a copy of the input matcher sequence.
-
-template <typename Iter>
-inline internal::ElementsAreArrayMatcher<
-    typename ::std::iterator_traits<Iter>::value_type>
-ElementsAreArray(Iter first, Iter last) {
-  typedef typename ::std::iterator_traits<Iter>::value_type T;
-  return internal::ElementsAreArrayMatcher<T>(first, last);
-}
-
-template <typename T>
-inline internal::ElementsAreArrayMatcher<T> ElementsAreArray(
-    const T* pointer, size_t count) {
-  return ElementsAreArray(pointer, pointer + count);
-}
-
-template <typename T, size_t N>
-inline internal::ElementsAreArrayMatcher<T> ElementsAreArray(
-    const T (&array)[N]) {
-  return ElementsAreArray(array, N);
-}
-
-template <typename Container>
-inline internal::ElementsAreArrayMatcher<typename Container::value_type>
-ElementsAreArray(const Container& container) {
-  return ElementsAreArray(container.begin(), container.end());
-}
-
-template <typename T>
-inline internal::ElementsAreArrayMatcher<T>
-ElementsAreArray(::std::initializer_list<T> xs) {
-  return ElementsAreArray(xs.begin(), xs.end());
-}
-
-// UnorderedElementsAreArray(iterator_first, iterator_last)
-// UnorderedElementsAreArray(pointer, count)
-// UnorderedElementsAreArray(array)
-// UnorderedElementsAreArray(container)
-// UnorderedElementsAreArray({ e1, e2, ..., en })
-//
-// UnorderedElementsAreArray() verifies that a bijective mapping onto a
-// collection of matchers exists.
-//
-// The matchers can be specified as an array, a pointer and count, a container,
-// an initializer list, or an STL iterator range. In each of these cases, the
-// underlying matchers can be either values or matchers.
-
-template <typename Iter>
-inline internal::UnorderedElementsAreArrayMatcher<
-    typename ::std::iterator_traits<Iter>::value_type>
-UnorderedElementsAreArray(Iter first, Iter last) {
-  typedef typename ::std::iterator_traits<Iter>::value_type T;
-  return internal::UnorderedElementsAreArrayMatcher<T>(
-      internal::UnorderedMatcherRequire::ExactMatch, first, last);
-}
-
-template <typename T>
-inline internal::UnorderedElementsAreArrayMatcher<T>
-UnorderedElementsAreArray(const T* pointer, size_t count) {
-  return UnorderedElementsAreArray(pointer, pointer + count);
-}
-
-template <typename T, size_t N>
-inline internal::UnorderedElementsAreArrayMatcher<T>
-UnorderedElementsAreArray(const T (&array)[N]) {
-  return UnorderedElementsAreArray(array, N);
-}
-
-template <typename Container>
-inline internal::UnorderedElementsAreArrayMatcher<
-    typename Container::value_type>
-UnorderedElementsAreArray(const Container& container) {
-  return UnorderedElementsAreArray(container.begin(), container.end());
-}
-
-template <typename T>
-inline internal::UnorderedElementsAreArrayMatcher<T>
-UnorderedElementsAreArray(::std::initializer_list<T> xs) {
-  return UnorderedElementsAreArray(xs.begin(), xs.end());
-}
-
-// _ is a matcher that matches anything of any type.
-//
-// This definition is fine as:
-//
-//   1. The C++ standard permits using the name _ in a namespace that
-//      is not the global namespace or ::std.
-//   2. The AnythingMatcher class has no data member or constructor,
-//      so it's OK to create global variables of this type.
-//   3. c-style has approved of using _ in this case.
-const internal::AnythingMatcher _ = {};
-// Creates a matcher that matches any value of the given type T.
-template <typename T>
-inline Matcher<T> A() {
-  return Matcher<T>(new internal::AnyMatcherImpl<T>());
-}
-
-// Creates a matcher that matches any value of the given type T.
-template <typename T>
-inline Matcher<T> An() { return A<T>(); }
-
-template <typename T, typename M>
-Matcher<T> internal::MatcherCastImpl<T, M>::CastImpl(
-    const M& value, std::false_type /* convertible_to_matcher */,
-    std::false_type /* convertible_to_T */) {
-  return Eq(value);
-}
-
-// Creates a polymorphic matcher that matches any NULL pointer.
-inline PolymorphicMatcher<internal::IsNullMatcher > IsNull() {
-  return MakePolymorphicMatcher(internal::IsNullMatcher());
-}
-
-// Creates a polymorphic matcher that matches any non-NULL pointer.
-// This is convenient as Not(NULL) doesn't compile (the compiler
-// thinks that that expression is comparing a pointer with an integer).
-inline PolymorphicMatcher<internal::NotNullMatcher > NotNull() {
-  return MakePolymorphicMatcher(internal::NotNullMatcher());
-}
-
-// Creates a polymorphic matcher that matches any argument that
-// references variable x.
-template <typename T>
-inline internal::RefMatcher<T&> Ref(T& x) {  // NOLINT
-  return internal::RefMatcher<T&>(x);
-}
-
-// Creates a matcher that matches any double argument approximately
-// equal to rhs, where two NANs are considered unequal.
-inline internal::FloatingEqMatcher<double> DoubleEq(double rhs) {
-  return internal::FloatingEqMatcher<double>(rhs, false);
-}
-
-// Creates a matcher that matches any double argument approximately
-// equal to rhs, including NaN values when rhs is NaN.
-inline internal::FloatingEqMatcher<double> NanSensitiveDoubleEq(double rhs) {
-  return internal::FloatingEqMatcher<double>(rhs, true);
-}
-
-// Creates a matcher that matches any double argument approximately equal to
-// rhs, up to the specified max absolute error bound, where two NANs are
-// considered unequal.  The max absolute error bound must be non-negative.
-inline internal::FloatingEqMatcher<double> DoubleNear(
-    double rhs, double max_abs_error) {
-  return internal::FloatingEqMatcher<double>(rhs, false, max_abs_error);
-}
-
-// Creates a matcher that matches any double argument approximately equal to
-// rhs, up to the specified max absolute error bound, including NaN values when
-// rhs is NaN.  The max absolute error bound must be non-negative.
-inline internal::FloatingEqMatcher<double> NanSensitiveDoubleNear(
-    double rhs, double max_abs_error) {
-  return internal::FloatingEqMatcher<double>(rhs, true, max_abs_error);
-}
-
-// Creates a matcher that matches any float argument approximately
-// equal to rhs, where two NANs are considered unequal.
-inline internal::FloatingEqMatcher<float> FloatEq(float rhs) {
-  return internal::FloatingEqMatcher<float>(rhs, false);
-}
-
-// Creates a matcher that matches any float argument approximately
-// equal to rhs, including NaN values when rhs is NaN.
-inline internal::FloatingEqMatcher<float> NanSensitiveFloatEq(float rhs) {
-  return internal::FloatingEqMatcher<float>(rhs, true);
-}
-
-// Creates a matcher that matches any float argument approximately equal to
-// rhs, up to the specified max absolute error bound, where two NANs are
-// considered unequal.  The max absolute error bound must be non-negative.
-inline internal::FloatingEqMatcher<float> FloatNear(
-    float rhs, float max_abs_error) {
-  return internal::FloatingEqMatcher<float>(rhs, false, max_abs_error);
-}
-
-// Creates a matcher that matches any float argument approximately equal to
-// rhs, up to the specified max absolute error bound, including NaN values when
-// rhs is NaN.  The max absolute error bound must be non-negative.
-inline internal::FloatingEqMatcher<float> NanSensitiveFloatNear(
-    float rhs, float max_abs_error) {
-  return internal::FloatingEqMatcher<float>(rhs, true, max_abs_error);
-}
-
-// Creates a matcher that matches a pointer (raw or smart) that points
-// to a value that matches inner_matcher.
-template <typename InnerMatcher>
-inline internal::PointeeMatcher<InnerMatcher> Pointee(
-    const InnerMatcher& inner_matcher) {
-  return internal::PointeeMatcher<InnerMatcher>(inner_matcher);
-}
-
-#if GTEST_HAS_RTTI
-// Creates a matcher that matches a pointer or reference that matches
-// inner_matcher when dynamic_cast<To> is applied.
-// The result of dynamic_cast<To> is forwarded to the inner matcher.
-// If To is a pointer and the cast fails, the inner matcher will receive NULL.
-// If To is a reference and the cast fails, this matcher returns false
-// immediately.
-template <typename To>
-inline PolymorphicMatcher<internal::WhenDynamicCastToMatcher<To> >
-WhenDynamicCastTo(const Matcher<To>& inner_matcher) {
-  return MakePolymorphicMatcher(
-      internal::WhenDynamicCastToMatcher<To>(inner_matcher));
-}
-#endif  // GTEST_HAS_RTTI
-
-// Creates a matcher that matches an object whose given field matches
-// 'matcher'.  For example,
-//   Field(&Foo::number, Ge(5))
-// matches a Foo object x if and only if x.number >= 5.
-template <typename Class, typename FieldType, typename FieldMatcher>
-inline PolymorphicMatcher<
-  internal::FieldMatcher<Class, FieldType> > Field(
-    FieldType Class::*field, const FieldMatcher& matcher) {
-  return MakePolymorphicMatcher(
-      internal::FieldMatcher<Class, FieldType>(
-          field, MatcherCast<const FieldType&>(matcher)));
-  // The call to MatcherCast() is required for supporting inner
-  // matchers of compatible types.  For example, it allows
-  //   Field(&Foo::bar, m)
-  // to compile where bar is an int32 and m is a matcher for int64.
-}
-
-// Same as Field() but also takes the name of the field to provide better error
-// messages.
-template <typename Class, typename FieldType, typename FieldMatcher>
-inline PolymorphicMatcher<internal::FieldMatcher<Class, FieldType> > Field(
-    const std::string& field_name, FieldType Class::*field,
-    const FieldMatcher& matcher) {
-  return MakePolymorphicMatcher(internal::FieldMatcher<Class, FieldType>(
-      field_name, field, MatcherCast<const FieldType&>(matcher)));
-}
-
-// Creates a matcher that matches an object whose given property
-// matches 'matcher'.  For example,
-//   Property(&Foo::str, StartsWith("hi"))
-// matches a Foo object x if and only if x.str() starts with "hi".
-template <typename Class, typename PropertyType, typename PropertyMatcher>
-inline PolymorphicMatcher<internal::PropertyMatcher<
-    Class, PropertyType, PropertyType (Class::*)() const> >
-Property(PropertyType (Class::*property)() const,
-         const PropertyMatcher& matcher) {
-  return MakePolymorphicMatcher(
-      internal::PropertyMatcher<Class, PropertyType,
-                                PropertyType (Class::*)() const>(
-          property, MatcherCast<const PropertyType&>(matcher)));
-  // The call to MatcherCast() is required for supporting inner
-  // matchers of compatible types.  For example, it allows
-  //   Property(&Foo::bar, m)
-  // to compile where bar() returns an int32 and m is a matcher for int64.
-}
-
-// Same as Property() above, but also takes the name of the property to provide
-// better error messages.
-template <typename Class, typename PropertyType, typename PropertyMatcher>
-inline PolymorphicMatcher<internal::PropertyMatcher<
-    Class, PropertyType, PropertyType (Class::*)() const> >
-Property(const std::string& property_name,
-         PropertyType (Class::*property)() const,
-         const PropertyMatcher& matcher) {
-  return MakePolymorphicMatcher(
-      internal::PropertyMatcher<Class, PropertyType,
-                                PropertyType (Class::*)() const>(
-          property_name, property, MatcherCast<const PropertyType&>(matcher)));
-}
-
-// The same as above but for reference-qualified member functions.
-template <typename Class, typename PropertyType, typename PropertyMatcher>
-inline PolymorphicMatcher<internal::PropertyMatcher<
-    Class, PropertyType, PropertyType (Class::*)() const &> >
-Property(PropertyType (Class::*property)() const &,
-         const PropertyMatcher& matcher) {
-  return MakePolymorphicMatcher(
-      internal::PropertyMatcher<Class, PropertyType,
-                                PropertyType (Class::*)() const&>(
-          property, MatcherCast<const PropertyType&>(matcher)));
-}
-
-// Three-argument form for reference-qualified member functions.
-template <typename Class, typename PropertyType, typename PropertyMatcher>
-inline PolymorphicMatcher<internal::PropertyMatcher<
-    Class, PropertyType, PropertyType (Class::*)() const &> >
-Property(const std::string& property_name,
-         PropertyType (Class::*property)() const &,
-         const PropertyMatcher& matcher) {
-  return MakePolymorphicMatcher(
-      internal::PropertyMatcher<Class, PropertyType,
-                                PropertyType (Class::*)() const&>(
-          property_name, property, MatcherCast<const PropertyType&>(matcher)));
-}
-
-// Creates a matcher that matches an object if and only if the result of
-// applying a callable to x matches 'matcher'. For example,
-//   ResultOf(f, StartsWith("hi"))
-// matches a Foo object x if and only if f(x) starts with "hi".
-// `callable` parameter can be a function, function pointer, or a functor. It is
-// required to keep no state affecting the results of the calls on it and make
-// no assumptions about how many calls will be made. Any state it keeps must be
-// protected from the concurrent access.
-template <typename Callable, typename InnerMatcher>
-internal::ResultOfMatcher<Callable, InnerMatcher> ResultOf(
-    Callable callable, InnerMatcher matcher) {
-  return internal::ResultOfMatcher<Callable, InnerMatcher>(
-      std::move(callable), std::move(matcher));
-}
-
-// String matchers.
-
-// Matches a string equal to str.
-inline PolymorphicMatcher<internal::StrEqualityMatcher<std::string> > StrEq(
-    const std::string& str) {
-  return MakePolymorphicMatcher(
-      internal::StrEqualityMatcher<std::string>(str, true, true));
-}
-
-// Matches a string not equal to str.
-inline PolymorphicMatcher<internal::StrEqualityMatcher<std::string> > StrNe(
-    const std::string& str) {
-  return MakePolymorphicMatcher(
-      internal::StrEqualityMatcher<std::string>(str, false, true));
-}
-
-// Matches a string equal to str, ignoring case.
-inline PolymorphicMatcher<internal::StrEqualityMatcher<std::string> > StrCaseEq(
-    const std::string& str) {
-  return MakePolymorphicMatcher(
-      internal::StrEqualityMatcher<std::string>(str, true, false));
-}
-
-// Matches a string not equal to str, ignoring case.
-inline PolymorphicMatcher<internal::StrEqualityMatcher<std::string> > StrCaseNe(
-    const std::string& str) {
-  return MakePolymorphicMatcher(
-      internal::StrEqualityMatcher<std::string>(str, false, false));
-}
-
-// Creates a matcher that matches any string, std::string, or C string
-// that contains the given substring.
-inline PolymorphicMatcher<internal::HasSubstrMatcher<std::string> > HasSubstr(
-    const std::string& substring) {
-  return MakePolymorphicMatcher(
-      internal::HasSubstrMatcher<std::string>(substring));
-}
-
-// Matches a string that starts with 'prefix' (case-sensitive).
-inline PolymorphicMatcher<internal::StartsWithMatcher<std::string> > StartsWith(
-    const std::string& prefix) {
-  return MakePolymorphicMatcher(
-      internal::StartsWithMatcher<std::string>(prefix));
-}
-
-// Matches a string that ends with 'suffix' (case-sensitive).
-inline PolymorphicMatcher<internal::EndsWithMatcher<std::string> > EndsWith(
-    const std::string& suffix) {
-  return MakePolymorphicMatcher(internal::EndsWithMatcher<std::string>(suffix));
-}
-
-#if GTEST_HAS_STD_WSTRING
-// Wide string matchers.
-
-// Matches a string equal to str.
-inline PolymorphicMatcher<internal::StrEqualityMatcher<std::wstring> > StrEq(
-    const std::wstring& str) {
-  return MakePolymorphicMatcher(
-      internal::StrEqualityMatcher<std::wstring>(str, true, true));
-}
-
-// Matches a string not equal to str.
-inline PolymorphicMatcher<internal::StrEqualityMatcher<std::wstring> > StrNe(
-    const std::wstring& str) {
-  return MakePolymorphicMatcher(
-      internal::StrEqualityMatcher<std::wstring>(str, false, true));
-}
-
-// Matches a string equal to str, ignoring case.
-inline PolymorphicMatcher<internal::StrEqualityMatcher<std::wstring> >
-StrCaseEq(const std::wstring& str) {
-  return MakePolymorphicMatcher(
-      internal::StrEqualityMatcher<std::wstring>(str, true, false));
-}
-
-// Matches a string not equal to str, ignoring case.
-inline PolymorphicMatcher<internal::StrEqualityMatcher<std::wstring> >
-StrCaseNe(const std::wstring& str) {
-  return MakePolymorphicMatcher(
-      internal::StrEqualityMatcher<std::wstring>(str, false, false));
-}
-
-// Creates a matcher that matches any ::wstring, std::wstring, or C wide string
-// that contains the given substring.
-inline PolymorphicMatcher<internal::HasSubstrMatcher<std::wstring> > HasSubstr(
-    const std::wstring& substring) {
-  return MakePolymorphicMatcher(
-      internal::HasSubstrMatcher<std::wstring>(substring));
-}
-
-// Matches a string that starts with 'prefix' (case-sensitive).
-inline PolymorphicMatcher<internal::StartsWithMatcher<std::wstring> >
-StartsWith(const std::wstring& prefix) {
-  return MakePolymorphicMatcher(
-      internal::StartsWithMatcher<std::wstring>(prefix));
-}
-
-// Matches a string that ends with 'suffix' (case-sensitive).
-inline PolymorphicMatcher<internal::EndsWithMatcher<std::wstring> > EndsWith(
-    const std::wstring& suffix) {
-  return MakePolymorphicMatcher(
-      internal::EndsWithMatcher<std::wstring>(suffix));
-}
-
-#endif  // GTEST_HAS_STD_WSTRING
-
-// Creates a polymorphic matcher that matches a 2-tuple where the
-// first field == the second field.
-inline internal::Eq2Matcher Eq() { return internal::Eq2Matcher(); }
-
-// Creates a polymorphic matcher that matches a 2-tuple where the
-// first field >= the second field.
-inline internal::Ge2Matcher Ge() { return internal::Ge2Matcher(); }
-
-// Creates a polymorphic matcher that matches a 2-tuple where the
-// first field > the second field.
-inline internal::Gt2Matcher Gt() { return internal::Gt2Matcher(); }
-
-// Creates a polymorphic matcher that matches a 2-tuple where the
-// first field <= the second field.
-inline internal::Le2Matcher Le() { return internal::Le2Matcher(); }
-
-// Creates a polymorphic matcher that matches a 2-tuple where the
-// first field < the second field.
-inline internal::Lt2Matcher Lt() { return internal::Lt2Matcher(); }
-
-// Creates a polymorphic matcher that matches a 2-tuple where the
-// first field != the second field.
-inline internal::Ne2Matcher Ne() { return internal::Ne2Matcher(); }
-
-// Creates a polymorphic matcher that matches a 2-tuple where
-// FloatEq(first field) matches the second field.
-inline internal::FloatingEq2Matcher<float> FloatEq() {
-  return internal::FloatingEq2Matcher<float>();
-}
-
-// Creates a polymorphic matcher that matches a 2-tuple where
-// DoubleEq(first field) matches the second field.
-inline internal::FloatingEq2Matcher<double> DoubleEq() {
-  return internal::FloatingEq2Matcher<double>();
-}
-
-// Creates a polymorphic matcher that matches a 2-tuple where
-// FloatEq(first field) matches the second field with NaN equality.
-inline internal::FloatingEq2Matcher<float> NanSensitiveFloatEq() {
-  return internal::FloatingEq2Matcher<float>(true);
-}
-
-// Creates a polymorphic matcher that matches a 2-tuple where
-// DoubleEq(first field) matches the second field with NaN equality.
-inline internal::FloatingEq2Matcher<double> NanSensitiveDoubleEq() {
-  return internal::FloatingEq2Matcher<double>(true);
-}
-
-// Creates a polymorphic matcher that matches a 2-tuple where
-// FloatNear(first field, max_abs_error) matches the second field.
-inline internal::FloatingEq2Matcher<float> FloatNear(float max_abs_error) {
-  return internal::FloatingEq2Matcher<float>(max_abs_error);
-}
-
-// Creates a polymorphic matcher that matches a 2-tuple where
-// DoubleNear(first field, max_abs_error) matches the second field.
-inline internal::FloatingEq2Matcher<double> DoubleNear(double max_abs_error) {
-  return internal::FloatingEq2Matcher<double>(max_abs_error);
-}
-
-// Creates a polymorphic matcher that matches a 2-tuple where
-// FloatNear(first field, max_abs_error) matches the second field with NaN
-// equality.
-inline internal::FloatingEq2Matcher<float> NanSensitiveFloatNear(
-    float max_abs_error) {
-  return internal::FloatingEq2Matcher<float>(max_abs_error, true);
-}
-
-// Creates a polymorphic matcher that matches a 2-tuple where
-// DoubleNear(first field, max_abs_error) matches the second field with NaN
-// equality.
-inline internal::FloatingEq2Matcher<double> NanSensitiveDoubleNear(
-    double max_abs_error) {
-  return internal::FloatingEq2Matcher<double>(max_abs_error, true);
-}
-
-// Creates a matcher that matches any value of type T that m doesn't
-// match.
-template <typename InnerMatcher>
-inline internal::NotMatcher<InnerMatcher> Not(InnerMatcher m) {
-  return internal::NotMatcher<InnerMatcher>(m);
-}
-
-// Returns a matcher that matches anything that satisfies the given
-// predicate.  The predicate can be any unary function or functor
-// whose return type can be implicitly converted to bool.
-template <typename Predicate>
-inline PolymorphicMatcher<internal::TrulyMatcher<Predicate> >
-Truly(Predicate pred) {
-  return MakePolymorphicMatcher(internal::TrulyMatcher<Predicate>(pred));
-}
-
-// Returns a matcher that matches the container size. The container must
-// support both size() and size_type which all STL-like containers provide.
-// Note that the parameter 'size' can be a value of type size_type as well as
-// matcher. For instance:
-//   EXPECT_THAT(container, SizeIs(2));     // Checks container has 2 elements.
-//   EXPECT_THAT(container, SizeIs(Le(2));  // Checks container has at most 2.
-template <typename SizeMatcher>
-inline internal::SizeIsMatcher<SizeMatcher>
-SizeIs(const SizeMatcher& size_matcher) {
-  return internal::SizeIsMatcher<SizeMatcher>(size_matcher);
-}
-
-// Returns a matcher that matches the distance between the container's begin()
-// iterator and its end() iterator, i.e. the size of the container. This matcher
-// can be used instead of SizeIs with containers such as std::forward_list which
-// do not implement size(). The container must provide const_iterator (with
-// valid iterator_traits), begin() and end().
-template <typename DistanceMatcher>
-inline internal::BeginEndDistanceIsMatcher<DistanceMatcher>
-BeginEndDistanceIs(const DistanceMatcher& distance_matcher) {
-  return internal::BeginEndDistanceIsMatcher<DistanceMatcher>(distance_matcher);
-}
-
-// Returns a matcher that matches an equal container.
-// This matcher behaves like Eq(), but in the event of mismatch lists the
-// values that are included in one container but not the other. (Duplicate
-// values and order differences are not explained.)
-template <typename Container>
-inline PolymorphicMatcher<internal::ContainerEqMatcher<
-    typename std::remove_const<Container>::type>>
-ContainerEq(const Container& rhs) {
-  // This following line is for working around a bug in MSVC 8.0,
-  // which causes Container to be a const type sometimes.
-  typedef typename std::remove_const<Container>::type RawContainer;
-  return MakePolymorphicMatcher(
-      internal::ContainerEqMatcher<RawContainer>(rhs));
-}
-
-// Returns a matcher that matches a container that, when sorted using
-// the given comparator, matches container_matcher.
-template <typename Comparator, typename ContainerMatcher>
-inline internal::WhenSortedByMatcher<Comparator, ContainerMatcher>
-WhenSortedBy(const Comparator& comparator,
-             const ContainerMatcher& container_matcher) {
-  return internal::WhenSortedByMatcher<Comparator, ContainerMatcher>(
-      comparator, container_matcher);
-}
-
-// Returns a matcher that matches a container that, when sorted using
-// the < operator, matches container_matcher.
-template <typename ContainerMatcher>
-inline internal::WhenSortedByMatcher<internal::LessComparator, ContainerMatcher>
-WhenSorted(const ContainerMatcher& container_matcher) {
-  return
-      internal::WhenSortedByMatcher<internal::LessComparator, ContainerMatcher>(
-          internal::LessComparator(), container_matcher);
-}
-
-// Matches an STL-style container or a native array that contains the
-// same number of elements as in rhs, where its i-th element and rhs's
-// i-th element (as a pair) satisfy the given pair matcher, for all i.
-// TupleMatcher must be able to be safely cast to Matcher<std::tuple<const
-// T1&, const T2&> >, where T1 and T2 are the types of elements in the
-// LHS container and the RHS container respectively.
-template <typename TupleMatcher, typename Container>
-inline internal::PointwiseMatcher<TupleMatcher,
-                                  typename std::remove_const<Container>::type>
-Pointwise(const TupleMatcher& tuple_matcher, const Container& rhs) {
-  // This following line is for working around a bug in MSVC 8.0,
-  // which causes Container to be a const type sometimes (e.g. when
-  // rhs is a const int[])..
-  typedef typename std::remove_const<Container>::type RawContainer;
-  return internal::PointwiseMatcher<TupleMatcher, RawContainer>(
-      tuple_matcher, rhs);
-}
-
-
-// Supports the Pointwise(m, {a, b, c}) syntax.
-template <typename TupleMatcher, typename T>
-inline internal::PointwiseMatcher<TupleMatcher, std::vector<T> > Pointwise(
-    const TupleMatcher& tuple_matcher, std::initializer_list<T> rhs) {
-  return Pointwise(tuple_matcher, std::vector<T>(rhs));
-}
-
-
-// UnorderedPointwise(pair_matcher, rhs) matches an STL-style
-// container or a native array that contains the same number of
-// elements as in rhs, where in some permutation of the container, its
-// i-th element and rhs's i-th element (as a pair) satisfy the given
-// pair matcher, for all i.  Tuple2Matcher must be able to be safely
-// cast to Matcher<std::tuple<const T1&, const T2&> >, where T1 and T2 are
-// the types of elements in the LHS container and the RHS container
-// respectively.
-//
-// This is like Pointwise(pair_matcher, rhs), except that the element
-// order doesn't matter.
-template <typename Tuple2Matcher, typename RhsContainer>
-inline internal::UnorderedElementsAreArrayMatcher<
-    typename internal::BoundSecondMatcher<
-        Tuple2Matcher,
-        typename internal::StlContainerView<
-            typename std::remove_const<RhsContainer>::type>::type::value_type>>
-UnorderedPointwise(const Tuple2Matcher& tuple2_matcher,
-                   const RhsContainer& rhs_container) {
-  // This following line is for working around a bug in MSVC 8.0,
-  // which causes RhsContainer to be a const type sometimes (e.g. when
-  // rhs_container is a const int[]).
-  typedef typename std::remove_const<RhsContainer>::type RawRhsContainer;
-
-  // RhsView allows the same code to handle RhsContainer being a
-  // STL-style container and it being a native C-style array.
-  typedef typename internal::StlContainerView<RawRhsContainer> RhsView;
-  typedef typename RhsView::type RhsStlContainer;
-  typedef typename RhsStlContainer::value_type Second;
-  const RhsStlContainer& rhs_stl_container =
-      RhsView::ConstReference(rhs_container);
-
-  // Create a matcher for each element in rhs_container.
-  ::std::vector<internal::BoundSecondMatcher<Tuple2Matcher, Second> > matchers;
-  for (typename RhsStlContainer::const_iterator it = rhs_stl_container.begin();
-       it != rhs_stl_container.end(); ++it) {
-    matchers.push_back(
-        internal::MatcherBindSecond(tuple2_matcher, *it));
-  }
-
-  // Delegate the work to UnorderedElementsAreArray().
-  return UnorderedElementsAreArray(matchers);
-}
-
-
-// Supports the UnorderedPointwise(m, {a, b, c}) syntax.
-template <typename Tuple2Matcher, typename T>
-inline internal::UnorderedElementsAreArrayMatcher<
-    typename internal::BoundSecondMatcher<Tuple2Matcher, T> >
-UnorderedPointwise(const Tuple2Matcher& tuple2_matcher,
-                   std::initializer_list<T> rhs) {
-  return UnorderedPointwise(tuple2_matcher, std::vector<T>(rhs));
-}
-
-
-// Matches an STL-style container or a native array that contains at
-// least one element matching the given value or matcher.
-//
-// Examples:
-//   ::std::set<int> page_ids;
-//   page_ids.insert(3);
-//   page_ids.insert(1);
-//   EXPECT_THAT(page_ids, Contains(1));
-//   EXPECT_THAT(page_ids, Contains(Gt(2)));
-//   EXPECT_THAT(page_ids, Not(Contains(4)));
-//
-//   ::std::map<int, size_t> page_lengths;
-//   page_lengths[1] = 100;
-//   EXPECT_THAT(page_lengths,
-//               Contains(::std::pair<const int, size_t>(1, 100)));
-//
-//   const char* user_ids[] = { "joe", "mike", "tom" };
-//   EXPECT_THAT(user_ids, Contains(Eq(::std::string("tom"))));
-template <typename M>
-inline internal::ContainsMatcher<M> Contains(M matcher) {
-  return internal::ContainsMatcher<M>(matcher);
-}
-
-// IsSupersetOf(iterator_first, iterator_last)
-// IsSupersetOf(pointer, count)
-// IsSupersetOf(array)
-// IsSupersetOf(container)
-// IsSupersetOf({e1, e2, ..., en})
-//
-// IsSupersetOf() verifies that a surjective partial mapping onto a collection
-// of matchers exists. In other words, a container matches
-// IsSupersetOf({e1, ..., en}) if and only if there is a permutation
-// {y1, ..., yn} of some of the container's elements where y1 matches e1,
-// ..., and yn matches en. Obviously, the size of the container must be >= n
-// in order to have a match. Examples:
-//
-// - {1, 2, 3} matches IsSupersetOf({Ge(3), Ne(0)}), as 3 matches Ge(3) and
-//   1 matches Ne(0).
-// - {1, 2} doesn't match IsSupersetOf({Eq(1), Lt(2)}), even though 1 matches
-//   both Eq(1) and Lt(2). The reason is that different matchers must be used
-//   for elements in different slots of the container.
-// - {1, 1, 2} matches IsSupersetOf({Eq(1), Lt(2)}), as (the first) 1 matches
-//   Eq(1) and (the second) 1 matches Lt(2).
-// - {1, 2, 3} matches IsSupersetOf(Gt(1), Gt(1)), as 2 matches (the first)
-//   Gt(1) and 3 matches (the second) Gt(1).
-//
-// The matchers can be specified as an array, a pointer and count, a container,
-// an initializer list, or an STL iterator range. In each of these cases, the
-// underlying matchers can be either values or matchers.
-
-template <typename Iter>
-inline internal::UnorderedElementsAreArrayMatcher<
-    typename ::std::iterator_traits<Iter>::value_type>
-IsSupersetOf(Iter first, Iter last) {
-  typedef typename ::std::iterator_traits<Iter>::value_type T;
-  return internal::UnorderedElementsAreArrayMatcher<T>(
-      internal::UnorderedMatcherRequire::Superset, first, last);
-}
-
-template <typename T>
-inline internal::UnorderedElementsAreArrayMatcher<T> IsSupersetOf(
-    const T* pointer, size_t count) {
-  return IsSupersetOf(pointer, pointer + count);
-}
-
-template <typename T, size_t N>
-inline internal::UnorderedElementsAreArrayMatcher<T> IsSupersetOf(
-    const T (&array)[N]) {
-  return IsSupersetOf(array, N);
-}
-
-template <typename Container>
-inline internal::UnorderedElementsAreArrayMatcher<
-    typename Container::value_type>
-IsSupersetOf(const Container& container) {
-  return IsSupersetOf(container.begin(), container.end());
-}
-
-template <typename T>
-inline internal::UnorderedElementsAreArrayMatcher<T> IsSupersetOf(
-    ::std::initializer_list<T> xs) {
-  return IsSupersetOf(xs.begin(), xs.end());
-}
-
-// IsSubsetOf(iterator_first, iterator_last)
-// IsSubsetOf(pointer, count)
-// IsSubsetOf(array)
-// IsSubsetOf(container)
-// IsSubsetOf({e1, e2, ..., en})
-//
-// IsSubsetOf() verifies that an injective mapping onto a collection of matchers
-// exists.  In other words, a container matches IsSubsetOf({e1, ..., en}) if and
-// only if there is a subset of matchers {m1, ..., mk} which would match the
-// container using UnorderedElementsAre.  Obviously, the size of the container
-// must be <= n in order to have a match. Examples:
-//
-// - {1} matches IsSubsetOf({Gt(0), Lt(0)}), as 1 matches Gt(0).
-// - {1, -1} matches IsSubsetOf({Lt(0), Gt(0)}), as 1 matches Gt(0) and -1
-//   matches Lt(0).
-// - {1, 2} doesn't matches IsSubsetOf({Gt(0), Lt(0)}), even though 1 and 2 both
-//   match Gt(0). The reason is that different matchers must be used for
-//   elements in different slots of the container.
-//
-// The matchers can be specified as an array, a pointer and count, a container,
-// an initializer list, or an STL iterator range. In each of these cases, the
-// underlying matchers can be either values or matchers.
-
-template <typename Iter>
-inline internal::UnorderedElementsAreArrayMatcher<
-    typename ::std::iterator_traits<Iter>::value_type>
-IsSubsetOf(Iter first, Iter last) {
-  typedef typename ::std::iterator_traits<Iter>::value_type T;
-  return internal::UnorderedElementsAreArrayMatcher<T>(
-      internal::UnorderedMatcherRequire::Subset, first, last);
-}
-
-template <typename T>
-inline internal::UnorderedElementsAreArrayMatcher<T> IsSubsetOf(
-    const T* pointer, size_t count) {
-  return IsSubsetOf(pointer, pointer + count);
-}
-
-template <typename T, size_t N>
-inline internal::UnorderedElementsAreArrayMatcher<T> IsSubsetOf(
-    const T (&array)[N]) {
-  return IsSubsetOf(array, N);
-}
-
-template <typename Container>
-inline internal::UnorderedElementsAreArrayMatcher<
-    typename Container::value_type>
-IsSubsetOf(const Container& container) {
-  return IsSubsetOf(container.begin(), container.end());
-}
-
-template <typename T>
-inline internal::UnorderedElementsAreArrayMatcher<T> IsSubsetOf(
-    ::std::initializer_list<T> xs) {
-  return IsSubsetOf(xs.begin(), xs.end());
-}
-
-// Matches an STL-style container or a native array that contains only
-// elements matching the given value or matcher.
-//
-// Each(m) is semantically equivalent to Not(Contains(Not(m))). Only
-// the messages are different.
-//
-// Examples:
-//   ::std::set<int> page_ids;
-//   // Each(m) matches an empty container, regardless of what m is.
-//   EXPECT_THAT(page_ids, Each(Eq(1)));
-//   EXPECT_THAT(page_ids, Each(Eq(77)));
-//
-//   page_ids.insert(3);
-//   EXPECT_THAT(page_ids, Each(Gt(0)));
-//   EXPECT_THAT(page_ids, Not(Each(Gt(4))));
-//   page_ids.insert(1);
-//   EXPECT_THAT(page_ids, Not(Each(Lt(2))));
-//
-//   ::std::map<int, size_t> page_lengths;
-//   page_lengths[1] = 100;
-//   page_lengths[2] = 200;
-//   page_lengths[3] = 300;
-//   EXPECT_THAT(page_lengths, Not(Each(Pair(1, 100))));
-//   EXPECT_THAT(page_lengths, Each(Key(Le(3))));
-//
-//   const char* user_ids[] = { "joe", "mike", "tom" };
-//   EXPECT_THAT(user_ids, Not(Each(Eq(::std::string("tom")))));
-template <typename M>
-inline internal::EachMatcher<M> Each(M matcher) {
-  return internal::EachMatcher<M>(matcher);
-}
-
-// Key(inner_matcher) matches an std::pair whose 'first' field matches
-// inner_matcher.  For example, Contains(Key(Ge(5))) can be used to match an
-// std::map that contains at least one element whose key is >= 5.
-template <typename M>
-inline internal::KeyMatcher<M> Key(M inner_matcher) {
-  return internal::KeyMatcher<M>(inner_matcher);
-}
-
-// Pair(first_matcher, second_matcher) matches a std::pair whose 'first' field
-// matches first_matcher and whose 'second' field matches second_matcher.  For
-// example, EXPECT_THAT(map_type, ElementsAre(Pair(Ge(5), "foo"))) can be used
-// to match a std::map<int, string> that contains exactly one element whose key
-// is >= 5 and whose value equals "foo".
-template <typename FirstMatcher, typename SecondMatcher>
-inline internal::PairMatcher<FirstMatcher, SecondMatcher>
-Pair(FirstMatcher first_matcher, SecondMatcher second_matcher) {
-  return internal::PairMatcher<FirstMatcher, SecondMatcher>(
-      first_matcher, second_matcher);
-}
-
-// Returns a predicate that is satisfied by anything that matches the
-// given matcher.
-template <typename M>
-inline internal::MatcherAsPredicate<M> Matches(M matcher) {
-  return internal::MatcherAsPredicate<M>(matcher);
-}
-
-// Returns true if and only if the value matches the matcher.
-template <typename T, typename M>
-inline bool Value(const T& value, M matcher) {
-  return testing::Matches(matcher)(value);
-}
-
-// Matches the value against the given matcher and explains the match
-// result to listener.
-template <typename T, typename M>
-inline bool ExplainMatchResult(
-    M matcher, const T& value, MatchResultListener* listener) {
-  return SafeMatcherCast<const T&>(matcher).MatchAndExplain(value, listener);
-}
-
-// Returns a string representation of the given matcher.  Useful for description
-// strings of matchers defined using MATCHER_P* macros that accept matchers as
-// their arguments.  For example:
-//
-// MATCHER_P(XAndYThat, matcher,
-//           "X that " + DescribeMatcher<int>(matcher, negation) +
-//               " and Y that " + DescribeMatcher<double>(matcher, negation)) {
-//   return ExplainMatchResult(matcher, arg.x(), result_listener) &&
-//          ExplainMatchResult(matcher, arg.y(), result_listener);
-// }
-template <typename T, typename M>
-std::string DescribeMatcher(const M& matcher, bool negation = false) {
-  ::std::stringstream ss;
-  Matcher<T> monomorphic_matcher = SafeMatcherCast<T>(matcher);
-  if (negation) {
-    monomorphic_matcher.DescribeNegationTo(&ss);
-  } else {
-    monomorphic_matcher.DescribeTo(&ss);
-  }
-  return ss.str();
-}
-
-template <typename... Args>
-internal::ElementsAreMatcher<
-    std::tuple<typename std::decay<const Args&>::type...>>
-ElementsAre(const Args&... matchers) {
-  return internal::ElementsAreMatcher<
-      std::tuple<typename std::decay<const Args&>::type...>>(
-      std::make_tuple(matchers...));
-}
-
-template <typename... Args>
-internal::UnorderedElementsAreMatcher<
-    std::tuple<typename std::decay<const Args&>::type...>>
-UnorderedElementsAre(const Args&... matchers) {
-  return internal::UnorderedElementsAreMatcher<
-      std::tuple<typename std::decay<const Args&>::type...>>(
-      std::make_tuple(matchers...));
-}
-
-// Define variadic matcher versions.
-template <typename... Args>
-internal::AllOfMatcher<typename std::decay<const Args&>::type...> AllOf(
-    const Args&... matchers) {
-  return internal::AllOfMatcher<typename std::decay<const Args&>::type...>(
-      matchers...);
-}
-
-template <typename... Args>
-internal::AnyOfMatcher<typename std::decay<const Args&>::type...> AnyOf(
-    const Args&... matchers) {
-  return internal::AnyOfMatcher<typename std::decay<const Args&>::type...>(
-      matchers...);
-}
-
-// AnyOfArray(array)
-// AnyOfArray(pointer, count)
-// AnyOfArray(container)
-// AnyOfArray({ e1, e2, ..., en })
-// AnyOfArray(iterator_first, iterator_last)
-//
-// AnyOfArray() verifies whether a given value matches any member of a
-// collection of matchers.
-//
-// AllOfArray(array)
-// AllOfArray(pointer, count)
-// AllOfArray(container)
-// AllOfArray({ e1, e2, ..., en })
-// AllOfArray(iterator_first, iterator_last)
-//
-// AllOfArray() verifies whether a given value matches all members of a
-// collection of matchers.
-//
-// The matchers can be specified as an array, a pointer and count, a container,
-// an initializer list, or an STL iterator range. In each of these cases, the
-// underlying matchers can be either values or matchers.
-
-template <typename Iter>
-inline internal::AnyOfArrayMatcher<
-    typename ::std::iterator_traits<Iter>::value_type>
-AnyOfArray(Iter first, Iter last) {
-  return internal::AnyOfArrayMatcher<
-      typename ::std::iterator_traits<Iter>::value_type>(first, last);
-}
-
-template <typename Iter>
-inline internal::AllOfArrayMatcher<
-    typename ::std::iterator_traits<Iter>::value_type>
-AllOfArray(Iter first, Iter last) {
-  return internal::AllOfArrayMatcher<
-      typename ::std::iterator_traits<Iter>::value_type>(first, last);
-}
-
-template <typename T>
-inline internal::AnyOfArrayMatcher<T> AnyOfArray(const T* ptr, size_t count) {
-  return AnyOfArray(ptr, ptr + count);
-}
-
-template <typename T>
-inline internal::AllOfArrayMatcher<T> AllOfArray(const T* ptr, size_t count) {
-  return AllOfArray(ptr, ptr + count);
-}
-
-template <typename T, size_t N>
-inline internal::AnyOfArrayMatcher<T> AnyOfArray(const T (&array)[N]) {
-  return AnyOfArray(array, N);
-}
-
-template <typename T, size_t N>
-inline internal::AllOfArrayMatcher<T> AllOfArray(const T (&array)[N]) {
-  return AllOfArray(array, N);
-}
-
-template <typename Container>
-inline internal::AnyOfArrayMatcher<typename Container::value_type> AnyOfArray(
-    const Container& container) {
-  return AnyOfArray(container.begin(), container.end());
-}
-
-template <typename Container>
-inline internal::AllOfArrayMatcher<typename Container::value_type> AllOfArray(
-    const Container& container) {
-  return AllOfArray(container.begin(), container.end());
-}
-
-template <typename T>
-inline internal::AnyOfArrayMatcher<T> AnyOfArray(
-    ::std::initializer_list<T> xs) {
-  return AnyOfArray(xs.begin(), xs.end());
-}
-
-template <typename T>
-inline internal::AllOfArrayMatcher<T> AllOfArray(
-    ::std::initializer_list<T> xs) {
-  return AllOfArray(xs.begin(), xs.end());
-}
-
-// Args<N1, N2, ..., Nk>(a_matcher) matches a tuple if the selected
-// fields of it matches a_matcher.  C++ doesn't support default
-// arguments for function templates, so we have to overload it.
-template <size_t... k, typename InnerMatcher>
-internal::ArgsMatcher<typename std::decay<InnerMatcher>::type, k...> Args(
-    InnerMatcher&& matcher) {
-  return internal::ArgsMatcher<typename std::decay<InnerMatcher>::type, k...>(
-      std::forward<InnerMatcher>(matcher));
-}
-
-// AllArgs(m) is a synonym of m.  This is useful in
-//
-//   EXPECT_CALL(foo, Bar(_, _)).With(AllArgs(Eq()));
-//
-// which is easier to read than
-//
-//   EXPECT_CALL(foo, Bar(_, _)).With(Eq());
-template <typename InnerMatcher>
-inline InnerMatcher AllArgs(const InnerMatcher& matcher) { return matcher; }
-
-// Returns a matcher that matches the value of an optional<> type variable.
-// The matcher implementation only uses '!arg' and requires that the optional<>
-// type has a 'value_type' member type and that '*arg' is of type 'value_type'
-// and is printable using 'PrintToString'. It is compatible with
-// std::optional/std::experimental::optional.
-// Note that to compare an optional type variable against nullopt you should
-// use Eq(nullopt) and not Optional(Eq(nullopt)). The latter implies that the
-// optional value contains an optional itself.
-template <typename ValueMatcher>
-inline internal::OptionalMatcher<ValueMatcher> Optional(
-    const ValueMatcher& value_matcher) {
-  return internal::OptionalMatcher<ValueMatcher>(value_matcher);
-}
-
-// Returns a matcher that matches the value of a absl::any type variable.
-template <typename T>
-PolymorphicMatcher<internal::any_cast_matcher::AnyCastMatcher<T> > AnyWith(
-    const Matcher<const T&>& matcher) {
-  return MakePolymorphicMatcher(
-      internal::any_cast_matcher::AnyCastMatcher<T>(matcher));
-}
-
-// Returns a matcher that matches the value of a variant<> type variable.
-// The matcher implementation uses ADL to find the holds_alternative and get
-// functions.
-// It is compatible with std::variant.
-template <typename T>
-PolymorphicMatcher<internal::variant_matcher::VariantMatcher<T> > VariantWith(
-    const Matcher<const T&>& matcher) {
-  return MakePolymorphicMatcher(
-      internal::variant_matcher::VariantMatcher<T>(matcher));
-}
-
-// These macros allow using matchers to check values in Google Test
-// tests.  ASSERT_THAT(value, matcher) and EXPECT_THAT(value, matcher)
-// succeed if and only if the value matches the matcher.  If the assertion
-// fails, the value and the description of the matcher will be printed.
-#define ASSERT_THAT(value, matcher) ASSERT_PRED_FORMAT1(\
-    ::testing::internal::MakePredicateFormatterFromMatcher(matcher), value)
-#define EXPECT_THAT(value, matcher) EXPECT_PRED_FORMAT1(\
-    ::testing::internal::MakePredicateFormatterFromMatcher(matcher), value)
-
-}  // namespace testing
-
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251 5046
-
-// Include any custom callback matchers added by the local installation.
-// We must include this header at the end to make sure it can use the
-// declarations from this file.
-#include "gmock/internal/custom/gmock-matchers.h"
-
-#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_MATCHERS_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-more-actions.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-more-actions.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-more-actions.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-more-actions.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,162 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file implements some actions that depend on gmock-generated-actions.h.
-
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_MORE_ACTIONS_H_
-#define GMOCK_INCLUDE_GMOCK_GMOCK_MORE_ACTIONS_H_
-
-#include <algorithm>
-#include <type_traits>
-
-#include "gmock/gmock-generated-actions.h"
-
-namespace testing {
-namespace internal {
-
-// An internal replacement for std::copy which mimics its behavior. This is
-// necessary because Visual Studio deprecates ::std::copy, issuing warning 4996.
-// However Visual Studio 2010 and later do not honor #pragmas which disable that
-// warning.
-template<typename InputIterator, typename OutputIterator>
-inline OutputIterator CopyElements(InputIterator first,
-                                   InputIterator last,
-                                   OutputIterator output) {
-  for (; first != last; ++first, ++output) {
-    *output = *first;
-  }
-  return output;
-}
-
-}  // namespace internal
-
-// Various overloads for Invoke().
-
-// The ACTION*() macros trigger warning C4100 (unreferenced formal
-// parameter) in MSVC with -W4.  Unfortunately they cannot be fixed in
-// the macro definition, as the warnings are generated when the macro
-// is expanded and macro expansion cannot contain #pragma.  Therefore
-// we suppress them here.
-#ifdef _MSC_VER
-# pragma warning(push)
-# pragma warning(disable:4100)
-#endif
-
-// Action ReturnArg<k>() returns the k-th argument of the mock function.
-ACTION_TEMPLATE(ReturnArg,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_0_VALUE_PARAMS()) {
-  return ::std::get<k>(args);
-}
-
-// Action SaveArg<k>(pointer) saves the k-th (0-based) argument of the
-// mock function to *pointer.
-ACTION_TEMPLATE(SaveArg,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_1_VALUE_PARAMS(pointer)) {
-  *pointer = ::std::get<k>(args);
-}
-
-// Action SaveArgPointee<k>(pointer) saves the value pointed to
-// by the k-th (0-based) argument of the mock function to *pointer.
-ACTION_TEMPLATE(SaveArgPointee,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_1_VALUE_PARAMS(pointer)) {
-  *pointer = *::std::get<k>(args);
-}
-
-// Action SetArgReferee<k>(value) assigns 'value' to the variable
-// referenced by the k-th (0-based) argument of the mock function.
-ACTION_TEMPLATE(SetArgReferee,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_1_VALUE_PARAMS(value)) {
-  typedef typename ::std::tuple_element<k, args_type>::type argk_type;
-  // Ensures that argument #k is a reference.  If you get a compiler
-  // error on the next line, you are using SetArgReferee<k>(value) in
-  // a mock function whose k-th (0-based) argument is not a reference.
-  GTEST_COMPILE_ASSERT_(std::is_reference<argk_type>::value,
-                        SetArgReferee_must_be_used_with_a_reference_argument);
-  ::std::get<k>(args) = value;
-}
-
-// Action SetArrayArgument<k>(first, last) copies the elements in
-// source range [first, last) to the array pointed to by the k-th
-// (0-based) argument, which can be either a pointer or an
-// iterator. The action does not take ownership of the elements in the
-// source range.
-ACTION_TEMPLATE(SetArrayArgument,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_2_VALUE_PARAMS(first, last)) {
-  // Visual Studio deprecates ::std::copy, so we use our own copy in that case.
-#ifdef _MSC_VER
-  internal::CopyElements(first, last, ::std::get<k>(args));
-#else
-  ::std::copy(first, last, ::std::get<k>(args));
-#endif
-}
-
-// Action DeleteArg<k>() deletes the k-th (0-based) argument of the mock
-// function.
-ACTION_TEMPLATE(DeleteArg,
-                HAS_1_TEMPLATE_PARAMS(int, k),
-                AND_0_VALUE_PARAMS()) {
-  delete ::std::get<k>(args);
-}
-
-// This action returns the value pointed to by 'pointer'.
-ACTION_P(ReturnPointee, pointer) { return *pointer; }
-
-// Action Throw(exception) can be used in a mock function of any type
-// to throw the given exception.  Any copyable value can be thrown.
-#if GTEST_HAS_EXCEPTIONS
-
-// Suppresses the 'unreachable code' warning that VC generates in opt modes.
-# ifdef _MSC_VER
-#  pragma warning(push)          // Saves the current warning state.
-#  pragma warning(disable:4702)  // Temporarily disables warning 4702.
-# endif
-ACTION_P(Throw, exception) { throw exception; }
-# ifdef _MSC_VER
-#  pragma warning(pop)           // Restores the warning state.
-# endif
-
-#endif  // GTEST_HAS_EXCEPTIONS
-
-#ifdef _MSC_VER
-# pragma warning(pop)
-#endif
-
-}  // namespace testing
-
-#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_MORE_ACTIONS_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-more-matchers.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-more-matchers.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-more-matchers.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-more-matchers.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,92 +0,0 @@
-// Copyright 2013, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file implements some matchers that depend on gmock-generated-matchers.h.
-//
-// Note that tests are implemented in gmock-matchers_test.cc rather than
-// gmock-more-matchers-test.cc.
-
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-#ifndef GMOCK_INCLUDE_GMOCK_MORE_MATCHERS_H_
-#define GMOCK_INCLUDE_GMOCK_MORE_MATCHERS_H_
-
-#include "gmock/gmock-generated-matchers.h"
-
-namespace testing {
-
-// Silence C4100 (unreferenced formal
-// parameter) for MSVC
-#ifdef _MSC_VER
-# pragma warning(push)
-# pragma warning(disable:4100)
-#if (_MSC_VER == 1900)
-// and silence C4800 (C4800: 'int *const ': forcing value
-// to bool 'true' or 'false') for MSVC 14
-# pragma warning(disable:4800)
-  #endif
-#endif
-
-// Defines a matcher that matches an empty container. The container must
-// support both size() and empty(), which all STL-like containers provide.
-MATCHER(IsEmpty, negation ? "isn't empty" : "is empty") {
-  if (arg.empty()) {
-    return true;
-  }
-  *result_listener << "whose size is " << arg.size();
-  return false;
-}
-
-// Define a matcher that matches a value that evaluates in boolean
-// context to true.  Useful for types that define "explicit operator
-// bool" operators and so can't be compared for equality with true
-// and false.
-MATCHER(IsTrue, negation ? "is false" : "is true") {
-  return static_cast<bool>(arg);
-}
-
-// Define a matcher that matches a value that evaluates in boolean
-// context to false.  Useful for types that define "explicit operator
-// bool" operators and so can't be compared for equality with true
-// and false.
-MATCHER(IsFalse, negation ? "is true" : "is false") {
-  return !static_cast<bool>(arg);
-}
-
-#ifdef _MSC_VER
-# pragma warning(pop)
-#endif
-
-
-}  // namespace testing
-
-#endif  // GMOCK_INCLUDE_GMOCK_MORE_MATCHERS_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-nice-strict.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-nice-strict.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-nice-strict.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-nice-strict.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,215 +0,0 @@
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Implements class templates NiceMock, NaggyMock, and StrictMock.
-//
-// Given a mock class MockFoo that is created using Google Mock,
-// NiceMock<MockFoo> is a subclass of MockFoo that allows
-// uninteresting calls (i.e. calls to mock methods that have no
-// EXPECT_CALL specs), NaggyMock<MockFoo> is a subclass of MockFoo
-// that prints a warning when an uninteresting call occurs, and
-// StrictMock<MockFoo> is a subclass of MockFoo that treats all
-// uninteresting calls as errors.
-//
-// Currently a mock is naggy by default, so MockFoo and
-// NaggyMock<MockFoo> behave like the same.  However, we will soon
-// switch the default behavior of mocks to be nice, as that in general
-// leads to more maintainable tests.  When that happens, MockFoo will
-// stop behaving like NaggyMock<MockFoo> and start behaving like
-// NiceMock<MockFoo>.
-//
-// NiceMock, NaggyMock, and StrictMock "inherit" the constructors of
-// their respective base class.  Therefore you can write
-// NiceMock<MockFoo>(5, "a") to construct a nice mock where MockFoo
-// has a constructor that accepts (int, const char*), for example.
-//
-// A known limitation is that NiceMock<MockFoo>, NaggyMock<MockFoo>,
-// and StrictMock<MockFoo> only works for mock methods defined using
-// the MOCK_METHOD* family of macros DIRECTLY in the MockFoo class.
-// If a mock method is defined in a base class of MockFoo, the "nice"
-// or "strict" modifier may not affect it, depending on the compiler.
-// In particular, nesting NiceMock, NaggyMock, and StrictMock is NOT
-// supported.
-
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_NICE_STRICT_H_
-#define GMOCK_INCLUDE_GMOCK_GMOCK_NICE_STRICT_H_
-
-#include "gmock/gmock-spec-builders.h"
-#include "gmock/internal/gmock-port.h"
-
-namespace testing {
-
-template <class MockClass>
-class NiceMock : public MockClass {
- public:
-  NiceMock() : MockClass() {
-    ::testing::Mock::AllowUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  // Ideally, we would inherit base class's constructors through a using
-  // declaration, which would preserve their visibility. However, many existing
-  // tests rely on the fact that current implementation reexports protected
-  // constructors as public. These tests would need to be cleaned up first.
-
-  // Single argument constructor is special-cased so that it can be
-  // made explicit.
-  template <typename A>
-  explicit NiceMock(A&& arg) : MockClass(std::forward<A>(arg)) {
-    ::testing::Mock::AllowUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  template <typename A1, typename A2, typename... An>
-  NiceMock(A1&& arg1, A2&& arg2, An&&... args)
-      : MockClass(std::forward<A1>(arg1), std::forward<A2>(arg2),
-                  std::forward<An>(args)...) {
-    ::testing::Mock::AllowUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  ~NiceMock() {  // NOLINT
-    ::testing::Mock::UnregisterCallReaction(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(NiceMock);
-};
-
-template <class MockClass>
-class NaggyMock : public MockClass {
- public:
-  NaggyMock() : MockClass() {
-    ::testing::Mock::WarnUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  // Ideally, we would inherit base class's constructors through a using
-  // declaration, which would preserve their visibility. However, many existing
-  // tests rely on the fact that current implementation reexports protected
-  // constructors as public. These tests would need to be cleaned up first.
-
-  // Single argument constructor is special-cased so that it can be
-  // made explicit.
-  template <typename A>
-  explicit NaggyMock(A&& arg) : MockClass(std::forward<A>(arg)) {
-    ::testing::Mock::WarnUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  template <typename A1, typename A2, typename... An>
-  NaggyMock(A1&& arg1, A2&& arg2, An&&... args)
-      : MockClass(std::forward<A1>(arg1), std::forward<A2>(arg2),
-                  std::forward<An>(args)...) {
-    ::testing::Mock::WarnUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  ~NaggyMock() {  // NOLINT
-    ::testing::Mock::UnregisterCallReaction(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(NaggyMock);
-};
-
-template <class MockClass>
-class StrictMock : public MockClass {
- public:
-  StrictMock() : MockClass() {
-    ::testing::Mock::FailUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  // Ideally, we would inherit base class's constructors through a using
-  // declaration, which would preserve their visibility. However, many existing
-  // tests rely on the fact that current implementation reexports protected
-  // constructors as public. These tests would need to be cleaned up first.
-
-  // Single argument constructor is special-cased so that it can be
-  // made explicit.
-  template <typename A>
-  explicit StrictMock(A&& arg) : MockClass(std::forward<A>(arg)) {
-    ::testing::Mock::FailUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  template <typename A1, typename A2, typename... An>
-  StrictMock(A1&& arg1, A2&& arg2, An&&... args)
-      : MockClass(std::forward<A1>(arg1), std::forward<A2>(arg2),
-                  std::forward<An>(args)...) {
-    ::testing::Mock::FailUninterestingCalls(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
-  ~StrictMock() {  // NOLINT
-    ::testing::Mock::UnregisterCallReaction(
-        internal::ImplicitCast_<MockClass*>(this));
-  }
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(StrictMock);
-};
-
-// The following specializations catch some (relatively more common)
-// user errors of nesting nice and strict mocks.  They do NOT catch
-// all possible errors.
-
-// These specializations are declared but not defined, as NiceMock,
-// NaggyMock, and StrictMock cannot be nested.
-
-template <typename MockClass>
-class NiceMock<NiceMock<MockClass> >;
-template <typename MockClass>
-class NiceMock<NaggyMock<MockClass> >;
-template <typename MockClass>
-class NiceMock<StrictMock<MockClass> >;
-
-template <typename MockClass>
-class NaggyMock<NiceMock<MockClass> >;
-template <typename MockClass>
-class NaggyMock<NaggyMock<MockClass> >;
-template <typename MockClass>
-class NaggyMock<StrictMock<MockClass> >;
-
-template <typename MockClass>
-class StrictMock<NiceMock<MockClass> >;
-template <typename MockClass>
-class StrictMock<NaggyMock<MockClass> >;
-template <typename MockClass>
-class StrictMock<StrictMock<MockClass> >;
-
-}  // namespace testing
-
-#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_NICE_STRICT_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-spec-builders.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-spec-builders.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-spec-builders.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/gmock-spec-builders.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,1985 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file implements the ON_CALL() and EXPECT_CALL() macros.
-//
-// A user can use the ON_CALL() macro to specify the default action of
-// a mock method.  The syntax is:
-//
-//   ON_CALL(mock_object, Method(argument-matchers))
-//       .With(multi-argument-matcher)
-//       .WillByDefault(action);
-//
-//  where the .With() clause is optional.
-//
-// A user can use the EXPECT_CALL() macro to specify an expectation on
-// a mock method.  The syntax is:
-//
-//   EXPECT_CALL(mock_object, Method(argument-matchers))
-//       .With(multi-argument-matchers)
-//       .Times(cardinality)
-//       .InSequence(sequences)
-//       .After(expectations)
-//       .WillOnce(action)
-//       .WillRepeatedly(action)
-//       .RetiresOnSaturation();
-//
-// where all clauses are optional, and .InSequence()/.After()/
-// .WillOnce() can appear any number of times.
-
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_SPEC_BUILDERS_H_
-#define GMOCK_INCLUDE_GMOCK_GMOCK_SPEC_BUILDERS_H_
-
-#include <functional>
-#include <map>
-#include <memory>
-#include <set>
-#include <sstream>
-#include <string>
-#include <type_traits>
-#include <utility>
-#include <vector>
-#include "gmock/gmock-actions.h"
-#include "gmock/gmock-cardinalities.h"
-#include "gmock/gmock-matchers.h"
-#include "gmock/internal/gmock-internal-utils.h"
-#include "gmock/internal/gmock-port.h"
-#include "gtest/gtest.h"
-
-#if GTEST_HAS_EXCEPTIONS
-# include <stdexcept>  // NOLINT
-#endif
-
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
-/* class A needs to have dll-interface to be used by clients of class B */)
-
-namespace testing {
-
-// An abstract handle of an expectation.
-class Expectation;
-
-// A set of expectation handles.
-class ExpectationSet;
-
-// Anything inside the 'internal' namespace IS INTERNAL IMPLEMENTATION
-// and MUST NOT BE USED IN USER CODE!!!
-namespace internal {
-
-// Implements a mock function.
-template <typename F> class FunctionMocker;
-
-// Base class for expectations.
-class ExpectationBase;
-
-// Implements an expectation.
-template <typename F> class TypedExpectation;
-
-// Helper class for testing the Expectation class template.
-class ExpectationTester;
-
-// Protects the mock object registry (in class Mock), all function
-// mockers, and all expectations.
-//
-// The reason we don't use more fine-grained protection is: when a
-// mock function Foo() is called, it needs to consult its expectations
-// to see which one should be picked.  If another thread is allowed to
-// call a mock function (either Foo() or a different one) at the same
-// time, it could affect the "retired" attributes of Foo()'s
-// expectations when InSequence() is used, and thus affect which
-// expectation gets picked.  Therefore, we sequence all mock function
-// calls to ensure the integrity of the mock objects' states.
-GTEST_API_ GTEST_DECLARE_STATIC_MUTEX_(g_gmock_mutex);
-
-// Untyped base class for ActionResultHolder<R>.
-class UntypedActionResultHolderBase;
-
-// Abstract base class of FunctionMocker.  This is the
-// type-agnostic part of the function mocker interface.  Its pure
-// virtual methods are implemented by FunctionMocker.
-class GTEST_API_ UntypedFunctionMockerBase {
- public:
-  UntypedFunctionMockerBase();
-  virtual ~UntypedFunctionMockerBase();
-
-  // Verifies that all expectations on this mock function have been
-  // satisfied.  Reports one or more Google Test non-fatal failures
-  // and returns false if not.
-  bool VerifyAndClearExpectationsLocked()
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex);
-
-  // Clears the ON_CALL()s set on this mock function.
-  virtual void ClearDefaultActionsLocked()
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) = 0;
-
-  // In all of the following Untyped* functions, it's the caller's
-  // responsibility to guarantee the correctness of the arguments'
-  // types.
-
-  // Performs the default action with the given arguments and returns
-  // the action's result.  The call description string will be used in
-  // the error message to describe the call in the case the default
-  // action fails.
-  // L = *
-  virtual UntypedActionResultHolderBase* UntypedPerformDefaultAction(
-      void* untyped_args, const std::string& call_description) const = 0;
-
-  // Performs the given action with the given arguments and returns
-  // the action's result.
-  // L = *
-  virtual UntypedActionResultHolderBase* UntypedPerformAction(
-      const void* untyped_action, void* untyped_args) const = 0;
-
-  // Writes a message that the call is uninteresting (i.e. neither
-  // explicitly expected nor explicitly unexpected) to the given
-  // ostream.
-  virtual void UntypedDescribeUninterestingCall(
-      const void* untyped_args,
-      ::std::ostream* os) const
-          GTEST_LOCK_EXCLUDED_(g_gmock_mutex) = 0;
-
-  // Returns the expectation that matches the given function arguments
-  // (or NULL is there's no match); when a match is found,
-  // untyped_action is set to point to the action that should be
-  // performed (or NULL if the action is "do default"), and
-  // is_excessive is modified to indicate whether the call exceeds the
-  // expected number.
-  virtual const ExpectationBase* UntypedFindMatchingExpectation(
-      const void* untyped_args,
-      const void** untyped_action, bool* is_excessive,
-      ::std::ostream* what, ::std::ostream* why)
-          GTEST_LOCK_EXCLUDED_(g_gmock_mutex) = 0;
-
-  // Prints the given function arguments to the ostream.
-  virtual void UntypedPrintArgs(const void* untyped_args,
-                                ::std::ostream* os) const = 0;
-
-  // Sets the mock object this mock method belongs to, and registers
-  // this information in the global mock registry.  Will be called
-  // whenever an EXPECT_CALL() or ON_CALL() is executed on this mock
-  // method.
-  void RegisterOwner(const void* mock_obj)
-      GTEST_LOCK_EXCLUDED_(g_gmock_mutex);
-
-  // Sets the mock object this mock method belongs to, and sets the
-  // name of the mock function.  Will be called upon each invocation
-  // of this mock function.
-  void SetOwnerAndName(const void* mock_obj, const char* name)
-      GTEST_LOCK_EXCLUDED_(g_gmock_mutex);
-
-  // Returns the mock object this mock method belongs to.  Must be
-  // called after RegisterOwner() or SetOwnerAndName() has been
-  // called.
-  const void* MockObject() const
-      GTEST_LOCK_EXCLUDED_(g_gmock_mutex);
-
-  // Returns the name of this mock method.  Must be called after
-  // SetOwnerAndName() has been called.
-  const char* Name() const
-      GTEST_LOCK_EXCLUDED_(g_gmock_mutex);
-
-  // Returns the result of invoking this mock function with the given
-  // arguments.  This function can be safely called from multiple
-  // threads concurrently.  The caller is responsible for deleting the
-  // result.
-  UntypedActionResultHolderBase* UntypedInvokeWith(void* untyped_args)
-      GTEST_LOCK_EXCLUDED_(g_gmock_mutex);
-
- protected:
-  typedef std::vector<const void*> UntypedOnCallSpecs;
-
-  using UntypedExpectations = std::vector<std::shared_ptr<ExpectationBase>>;
-
-  // Returns an Expectation object that references and co-owns exp,
-  // which must be an expectation on this mock function.
-  Expectation GetHandleOf(ExpectationBase* exp);
-
-  // Address of the mock object this mock method belongs to.  Only
-  // valid after this mock method has been called or
-  // ON_CALL/EXPECT_CALL has been invoked on it.
-  const void* mock_obj_;  // Protected by g_gmock_mutex.
-
-  // Name of the function being mocked.  Only valid after this mock
-  // method has been called.
-  const char* name_;  // Protected by g_gmock_mutex.
-
-  // All default action specs for this function mocker.
-  UntypedOnCallSpecs untyped_on_call_specs_;
-
-  // All expectations for this function mocker.
-  //
-  // It's undefined behavior to interleave expectations (EXPECT_CALLs
-  // or ON_CALLs) and mock function calls.  Also, the order of
-  // expectations is important.  Therefore it's a logic race condition
-  // to read/write untyped_expectations_ concurrently.  In order for
-  // tools like tsan to catch concurrent read/write accesses to
-  // untyped_expectations, we deliberately leave accesses to it
-  // unprotected.
-  UntypedExpectations untyped_expectations_;
-};  // class UntypedFunctionMockerBase
-
-// Untyped base class for OnCallSpec<F>.
-class UntypedOnCallSpecBase {
- public:
-  // The arguments are the location of the ON_CALL() statement.
-  UntypedOnCallSpecBase(const char* a_file, int a_line)
-      : file_(a_file), line_(a_line), last_clause_(kNone) {}
-
-  // Where in the source file was the default action spec defined?
-  const char* file() const { return file_; }
-  int line() const { return line_; }
-
- protected:
-  // Gives each clause in the ON_CALL() statement a name.
-  enum Clause {
-    // Do not change the order of the enum members!  The run-time
-    // syntax checking relies on it.
-    kNone,
-    kWith,
-    kWillByDefault
-  };
-
-  // Asserts that the ON_CALL() statement has a certain property.
-  void AssertSpecProperty(bool property,
-                          const std::string& failure_message) const {
-    Assert(property, file_, line_, failure_message);
-  }
-
-  // Expects that the ON_CALL() statement has a certain property.
-  void ExpectSpecProperty(bool property,
-                          const std::string& failure_message) const {
-    Expect(property, file_, line_, failure_message);
-  }
-
-  const char* file_;
-  int line_;
-
-  // The last clause in the ON_CALL() statement as seen so far.
-  // Initially kNone and changes as the statement is parsed.
-  Clause last_clause_;
-};  // class UntypedOnCallSpecBase
-
-// This template class implements an ON_CALL spec.
-template <typename F>
-class OnCallSpec : public UntypedOnCallSpecBase {
- public:
-  typedef typename Function<F>::ArgumentTuple ArgumentTuple;
-  typedef typename Function<F>::ArgumentMatcherTuple ArgumentMatcherTuple;
-
-  // Constructs an OnCallSpec object from the information inside
-  // the parenthesis of an ON_CALL() statement.
-  OnCallSpec(const char* a_file, int a_line,
-             const ArgumentMatcherTuple& matchers)
-      : UntypedOnCallSpecBase(a_file, a_line),
-        matchers_(matchers),
-        // By default, extra_matcher_ should match anything.  However,
-        // we cannot initialize it with _ as that causes ambiguity between
-        // Matcher's copy and move constructor for some argument types.
-        extra_matcher_(A<const ArgumentTuple&>()) {}
-
-  // Implements the .With() clause.
-  OnCallSpec& With(const Matcher<const ArgumentTuple&>& m) {
-    // Makes sure this is called at most once.
-    ExpectSpecProperty(last_clause_ < kWith,
-                       ".With() cannot appear "
-                       "more than once in an ON_CALL().");
-    last_clause_ = kWith;
-
-    extra_matcher_ = m;
-    return *this;
-  }
-
-  // Implements the .WillByDefault() clause.
-  OnCallSpec& WillByDefault(const Action<F>& action) {
-    ExpectSpecProperty(last_clause_ < kWillByDefault,
-                       ".WillByDefault() must appear "
-                       "exactly once in an ON_CALL().");
-    last_clause_ = kWillByDefault;
-
-    ExpectSpecProperty(!action.IsDoDefault(),
-                       "DoDefault() cannot be used in ON_CALL().");
-    action_ = action;
-    return *this;
-  }
-
-  // Returns true if and only if the given arguments match the matchers.
-  bool Matches(const ArgumentTuple& args) const {
-    return TupleMatches(matchers_, args) && extra_matcher_.Matches(args);
-  }
-
-  // Returns the action specified by the user.
-  const Action<F>& GetAction() const {
-    AssertSpecProperty(last_clause_ == kWillByDefault,
-                       ".WillByDefault() must appear exactly "
-                       "once in an ON_CALL().");
-    return action_;
-  }
-
- private:
-  // The information in statement
-  //
-  //   ON_CALL(mock_object, Method(matchers))
-  //       .With(multi-argument-matcher)
-  //       .WillByDefault(action);
-  //
-  // is recorded in the data members like this:
-  //
-  //   source file that contains the statement => file_
-  //   line number of the statement            => line_
-  //   matchers                                => matchers_
-  //   multi-argument-matcher                  => extra_matcher_
-  //   action                                  => action_
-  ArgumentMatcherTuple matchers_;
-  Matcher<const ArgumentTuple&> extra_matcher_;
-  Action<F> action_;
-};  // class OnCallSpec
-
-// Possible reactions on uninteresting calls.
-enum CallReaction {
-  kAllow,
-  kWarn,
-  kFail,
-};
-
-}  // namespace internal
-
-// Utilities for manipulating mock objects.
-class GTEST_API_ Mock {
- public:
-  // The following public methods can be called concurrently.
-
-  // Tells Google Mock to ignore mock_obj when checking for leaked
-  // mock objects.
-  static void AllowLeak(const void* mock_obj)
-      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
-
-  // Verifies and clears all expectations on the given mock object.
-  // If the expectations aren't satisfied, generates one or more
-  // Google Test non-fatal failures and returns false.
-  static bool VerifyAndClearExpectations(void* mock_obj)
-      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
-
-  // Verifies all expectations on the given mock object and clears its
-  // default actions and expectations.  Returns true if and only if the
-  // verification was successful.
-  static bool VerifyAndClear(void* mock_obj)
-      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
-
-  // Returns whether the mock was created as a naggy mock (default)
-  static bool IsNaggy(void* mock_obj)
-      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
-  // Returns whether the mock was created as a nice mock
-  static bool IsNice(void* mock_obj)
-      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
-  // Returns whether the mock was created as a strict mock
-  static bool IsStrict(void* mock_obj)
-      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
-
- private:
-  friend class internal::UntypedFunctionMockerBase;
-
-  // Needed for a function mocker to register itself (so that we know
-  // how to clear a mock object).
-  template <typename F>
-  friend class internal::FunctionMocker;
-
-  template <typename M>
-  friend class NiceMock;
-
-  template <typename M>
-  friend class NaggyMock;
-
-  template <typename M>
-  friend class StrictMock;
-
-  // Tells Google Mock to allow uninteresting calls on the given mock
-  // object.
-  static void AllowUninterestingCalls(const void* mock_obj)
-      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
-
-  // Tells Google Mock to warn the user about uninteresting calls on
-  // the given mock object.
-  static void WarnUninterestingCalls(const void* mock_obj)
-      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
-
-  // Tells Google Mock to fail uninteresting calls on the given mock
-  // object.
-  static void FailUninterestingCalls(const void* mock_obj)
-      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
-
-  // Tells Google Mock the given mock object is being destroyed and
-  // its entry in the call-reaction table should be removed.
-  static void UnregisterCallReaction(const void* mock_obj)
-      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
-
-  // Returns the reaction Google Mock will have on uninteresting calls
-  // made on the given mock object.
-  static internal::CallReaction GetReactionOnUninterestingCalls(
-      const void* mock_obj)
-          GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
-
-  // Verifies that all expectations on the given mock object have been
-  // satisfied.  Reports one or more Google Test non-fatal failures
-  // and returns false if not.
-  static bool VerifyAndClearExpectationsLocked(void* mock_obj)
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(internal::g_gmock_mutex);
-
-  // Clears all ON_CALL()s set on the given mock object.
-  static void ClearDefaultActionsLocked(void* mock_obj)
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(internal::g_gmock_mutex);
-
-  // Registers a mock object and a mock method it owns.
-  static void Register(
-      const void* mock_obj,
-      internal::UntypedFunctionMockerBase* mocker)
-          GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
-
-  // Tells Google Mock where in the source code mock_obj is used in an
-  // ON_CALL or EXPECT_CALL.  In case mock_obj is leaked, this
-  // information helps the user identify which object it is.
-  static void RegisterUseByOnCallOrExpectCall(
-      const void* mock_obj, const char* file, int line)
-          GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
-
-  // Unregisters a mock method; removes the owning mock object from
-  // the registry when the last mock method associated with it has
-  // been unregistered.  This is called only in the destructor of
-  // FunctionMocker.
-  static void UnregisterLocked(internal::UntypedFunctionMockerBase* mocker)
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(internal::g_gmock_mutex);
-};  // class Mock
-
-// An abstract handle of an expectation.  Useful in the .After()
-// clause of EXPECT_CALL() for setting the (partial) order of
-// expectations.  The syntax:
-//
-//   Expectation e1 = EXPECT_CALL(...)...;
-//   EXPECT_CALL(...).After(e1)...;
-//
-// sets two expectations where the latter can only be matched after
-// the former has been satisfied.
-//
-// Notes:
-//   - This class is copyable and has value semantics.
-//   - Constness is shallow: a const Expectation object itself cannot
-//     be modified, but the mutable methods of the ExpectationBase
-//     object it references can be called via expectation_base().
-
-class GTEST_API_ Expectation {
- public:
-  // Constructs a null object that doesn't reference any expectation.
-  Expectation();
-
-  ~Expectation();
-
-  // This single-argument ctor must not be explicit, in order to support the
-  //   Expectation e = EXPECT_CALL(...);
-  // syntax.
-  //
-  // A TypedExpectation object stores its pre-requisites as
-  // Expectation objects, and needs to call the non-const Retire()
-  // method on the ExpectationBase objects they reference.  Therefore
-  // Expectation must receive a *non-const* reference to the
-  // ExpectationBase object.
-  Expectation(internal::ExpectationBase& exp);  // NOLINT
-
-  // The compiler-generated copy ctor and operator= work exactly as
-  // intended, so we don't need to define our own.
-
-  // Returns true if and only if rhs references the same expectation as this
-  // object does.
-  bool operator==(const Expectation& rhs) const {
-    return expectation_base_ == rhs.expectation_base_;
-  }
-
-  bool operator!=(const Expectation& rhs) const { return !(*this == rhs); }
-
- private:
-  friend class ExpectationSet;
-  friend class Sequence;
-  friend class ::testing::internal::ExpectationBase;
-  friend class ::testing::internal::UntypedFunctionMockerBase;
-
-  template <typename F>
-  friend class ::testing::internal::FunctionMocker;
-
-  template <typename F>
-  friend class ::testing::internal::TypedExpectation;
-
-  // This comparator is needed for putting Expectation objects into a set.
-  class Less {
-   public:
-    bool operator()(const Expectation& lhs, const Expectation& rhs) const {
-      return lhs.expectation_base_.get() < rhs.expectation_base_.get();
-    }
-  };
-
-  typedef ::std::set<Expectation, Less> Set;
-
-  Expectation(
-      const std::shared_ptr<internal::ExpectationBase>& expectation_base);
-
-  // Returns the expectation this object references.
-  const std::shared_ptr<internal::ExpectationBase>& expectation_base() const {
-    return expectation_base_;
-  }
-
-  // A shared_ptr that co-owns the expectation this handle references.
-  std::shared_ptr<internal::ExpectationBase> expectation_base_;
-};
-
-// A set of expectation handles.  Useful in the .After() clause of
-// EXPECT_CALL() for setting the (partial) order of expectations.  The
-// syntax:
-//
-//   ExpectationSet es;
-//   es += EXPECT_CALL(...)...;
-//   es += EXPECT_CALL(...)...;
-//   EXPECT_CALL(...).After(es)...;
-//
-// sets three expectations where the last one can only be matched
-// after the first two have both been satisfied.
-//
-// This class is copyable and has value semantics.
-class ExpectationSet {
- public:
-  // A bidirectional iterator that can read a const element in the set.
-  typedef Expectation::Set::const_iterator const_iterator;
-
-  // An object stored in the set.  This is an alias of Expectation.
-  typedef Expectation::Set::value_type value_type;
-
-  // Constructs an empty set.
-  ExpectationSet() {}
-
-  // This single-argument ctor must not be explicit, in order to support the
-  //   ExpectationSet es = EXPECT_CALL(...);
-  // syntax.
-  ExpectationSet(internal::ExpectationBase& exp) {  // NOLINT
-    *this += Expectation(exp);
-  }
-
-  // This single-argument ctor implements implicit conversion from
-  // Expectation and thus must not be explicit.  This allows either an
-  // Expectation or an ExpectationSet to be used in .After().
-  ExpectationSet(const Expectation& e) {  // NOLINT
-    *this += e;
-  }
-
-  // The compiler-generator ctor and operator= works exactly as
-  // intended, so we don't need to define our own.
-
-  // Returns true if and only if rhs contains the same set of Expectation
-  // objects as this does.
-  bool operator==(const ExpectationSet& rhs) const {
-    return expectations_ == rhs.expectations_;
-  }
-
-  bool operator!=(const ExpectationSet& rhs) const { return !(*this == rhs); }
-
-  // Implements the syntax
-  //   expectation_set += EXPECT_CALL(...);
-  ExpectationSet& operator+=(const Expectation& e) {
-    expectations_.insert(e);
-    return *this;
-  }
-
-  int size() const { return static_cast<int>(expectations_.size()); }
-
-  const_iterator begin() const { return expectations_.begin(); }
-  const_iterator end() const { return expectations_.end(); }
-
- private:
-  Expectation::Set expectations_;
-};
-
-
-// Sequence objects are used by a user to specify the relative order
-// in which the expectations should match.  They are copyable (we rely
-// on the compiler-defined copy constructor and assignment operator).
-class GTEST_API_ Sequence {
- public:
-  // Constructs an empty sequence.
-  Sequence() : last_expectation_(new Expectation) {}
-
-  // Adds an expectation to this sequence.  The caller must ensure
-  // that no other thread is accessing this Sequence object.
-  void AddExpectation(const Expectation& expectation) const;
-
- private:
-  // The last expectation in this sequence.
-  std::shared_ptr<Expectation> last_expectation_;
-};  // class Sequence
-
-// An object of this type causes all EXPECT_CALL() statements
-// encountered in its scope to be put in an anonymous sequence.  The
-// work is done in the constructor and destructor.  You should only
-// create an InSequence object on the stack.
-//
-// The sole purpose for this class is to support easy definition of
-// sequential expectations, e.g.
-//
-//   {
-//     InSequence dummy;  // The name of the object doesn't matter.
-//
-//     // The following expectations must match in the order they appear.
-//     EXPECT_CALL(a, Bar())...;
-//     EXPECT_CALL(a, Baz())...;
-//     ...
-//     EXPECT_CALL(b, Xyz())...;
-//   }
-//
-// You can create InSequence objects in multiple threads, as long as
-// they are used to affect different mock objects.  The idea is that
-// each thread can create and set up its own mocks as if it's the only
-// thread.  However, for clarity of your tests we recommend you to set
-// up mocks in the main thread unless you have a good reason not to do
-// so.
-class GTEST_API_ InSequence {
- public:
-  InSequence();
-  ~InSequence();
- private:
-  bool sequence_created_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(InSequence);  // NOLINT
-} GTEST_ATTRIBUTE_UNUSED_;
-
-namespace internal {
-
-// Points to the implicit sequence introduced by a living InSequence
-// object (if any) in the current thread or NULL.
-GTEST_API_ extern ThreadLocal<Sequence*> g_gmock_implicit_sequence;
-
-// Base class for implementing expectations.
-//
-// There are two reasons for having a type-agnostic base class for
-// Expectation:
-//
-//   1. We need to store collections of expectations of different
-//   types (e.g. all pre-requisites of a particular expectation, all
-//   expectations in a sequence).  Therefore these expectation objects
-//   must share a common base class.
-//
-//   2. We can avoid binary code bloat by moving methods not depending
-//   on the template argument of Expectation to the base class.
-//
-// This class is internal and mustn't be used by user code directly.
-class GTEST_API_ ExpectationBase {
- public:
-  // source_text is the EXPECT_CALL(...) source that created this Expectation.
-  ExpectationBase(const char* file, int line, const std::string& source_text);
-
-  virtual ~ExpectationBase();
-
-  // Where in the source file was the expectation spec defined?
-  const char* file() const { return file_; }
-  int line() const { return line_; }
-  const char* source_text() const { return source_text_.c_str(); }
-  // Returns the cardinality specified in the expectation spec.
-  const Cardinality& cardinality() const { return cardinality_; }
-
-  // Describes the source file location of this expectation.
-  void DescribeLocationTo(::std::ostream* os) const {
-    *os << FormatFileLocation(file(), line()) << " ";
-  }
-
-  // Describes how many times a function call matching this
-  // expectation has occurred.
-  void DescribeCallCountTo(::std::ostream* os) const
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex);
-
-  // If this mock method has an extra matcher (i.e. .With(matcher)),
-  // describes it to the ostream.
-  virtual void MaybeDescribeExtraMatcherTo(::std::ostream* os) = 0;
-
- protected:
-  friend class ::testing::Expectation;
-  friend class UntypedFunctionMockerBase;
-
-  enum Clause {
-    // Don't change the order of the enum members!
-    kNone,
-    kWith,
-    kTimes,
-    kInSequence,
-    kAfter,
-    kWillOnce,
-    kWillRepeatedly,
-    kRetiresOnSaturation
-  };
-
-  typedef std::vector<const void*> UntypedActions;
-
-  // Returns an Expectation object that references and co-owns this
-  // expectation.
-  virtual Expectation GetHandle() = 0;
-
-  // Asserts that the EXPECT_CALL() statement has the given property.
-  void AssertSpecProperty(bool property,
-                          const std::string& failure_message) const {
-    Assert(property, file_, line_, failure_message);
-  }
-
-  // Expects that the EXPECT_CALL() statement has the given property.
-  void ExpectSpecProperty(bool property,
-                          const std::string& failure_message) const {
-    Expect(property, file_, line_, failure_message);
-  }
-
-  // Explicitly specifies the cardinality of this expectation.  Used
-  // by the subclasses to implement the .Times() clause.
-  void SpecifyCardinality(const Cardinality& cardinality);
-
-  // Returns true if and only if the user specified the cardinality
-  // explicitly using a .Times().
-  bool cardinality_specified() const { return cardinality_specified_; }
-
-  // Sets the cardinality of this expectation spec.
-  void set_cardinality(const Cardinality& a_cardinality) {
-    cardinality_ = a_cardinality;
-  }
-
-  // The following group of methods should only be called after the
-  // EXPECT_CALL() statement, and only when g_gmock_mutex is held by
-  // the current thread.
-
-  // Retires all pre-requisites of this expectation.
-  void RetireAllPreRequisites()
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex);
-
-  // Returns true if and only if this expectation is retired.
-  bool is_retired() const
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-    g_gmock_mutex.AssertHeld();
-    return retired_;
-  }
-
-  // Retires this expectation.
-  void Retire()
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-    g_gmock_mutex.AssertHeld();
-    retired_ = true;
-  }
-
-  // Returns true if and only if this expectation is satisfied.
-  bool IsSatisfied() const
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-    g_gmock_mutex.AssertHeld();
-    return cardinality().IsSatisfiedByCallCount(call_count_);
-  }
-
-  // Returns true if and only if this expectation is saturated.
-  bool IsSaturated() const
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-    g_gmock_mutex.AssertHeld();
-    return cardinality().IsSaturatedByCallCount(call_count_);
-  }
-
-  // Returns true if and only if this expectation is over-saturated.
-  bool IsOverSaturated() const
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-    g_gmock_mutex.AssertHeld();
-    return cardinality().IsOverSaturatedByCallCount(call_count_);
-  }
-
-  // Returns true if and only if all pre-requisites of this expectation are
-  // satisfied.
-  bool AllPrerequisitesAreSatisfied() const
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex);
-
-  // Adds unsatisfied pre-requisites of this expectation to 'result'.
-  void FindUnsatisfiedPrerequisites(ExpectationSet* result) const
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex);
-
-  // Returns the number this expectation has been invoked.
-  int call_count() const
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-    g_gmock_mutex.AssertHeld();
-    return call_count_;
-  }
-
-  // Increments the number this expectation has been invoked.
-  void IncrementCallCount()
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-    g_gmock_mutex.AssertHeld();
-    call_count_++;
-  }
-
-  // Checks the action count (i.e. the number of WillOnce() and
-  // WillRepeatedly() clauses) against the cardinality if this hasn't
-  // been done before.  Prints a warning if there are too many or too
-  // few actions.
-  void CheckActionCountIfNotDone() const
-      GTEST_LOCK_EXCLUDED_(mutex_);
-
-  friend class ::testing::Sequence;
-  friend class ::testing::internal::ExpectationTester;
-
-  template <typename Function>
-  friend class TypedExpectation;
-
-  // Implements the .Times() clause.
-  void UntypedTimes(const Cardinality& a_cardinality);
-
-  // This group of fields are part of the spec and won't change after
-  // an EXPECT_CALL() statement finishes.
-  const char* file_;          // The file that contains the expectation.
-  int line_;                  // The line number of the expectation.
-  const std::string source_text_;  // The EXPECT_CALL(...) source text.
-  // True if and only if the cardinality is specified explicitly.
-  bool cardinality_specified_;
-  Cardinality cardinality_;            // The cardinality of the expectation.
-  // The immediate pre-requisites (i.e. expectations that must be
-  // satisfied before this expectation can be matched) of this
-  // expectation.  We use std::shared_ptr in the set because we want an
-  // Expectation object to be co-owned by its FunctionMocker and its
-  // successors.  This allows multiple mock objects to be deleted at
-  // different times.
-  ExpectationSet immediate_prerequisites_;
-
-  // This group of fields are the current state of the expectation,
-  // and can change as the mock function is called.
-  int call_count_;  // How many times this expectation has been invoked.
-  bool retired_;    // True if and only if this expectation has retired.
-  UntypedActions untyped_actions_;
-  bool extra_matcher_specified_;
-  bool repeated_action_specified_;  // True if a WillRepeatedly() was specified.
-  bool retires_on_saturation_;
-  Clause last_clause_;
-  mutable bool action_count_checked_;  // Under mutex_.
-  mutable Mutex mutex_;  // Protects action_count_checked_.
-
-  GTEST_DISALLOW_ASSIGN_(ExpectationBase);
-};  // class ExpectationBase
-
-// Impements an expectation for the given function type.
-template <typename F>
-class TypedExpectation : public ExpectationBase {
- public:
-  typedef typename Function<F>::ArgumentTuple ArgumentTuple;
-  typedef typename Function<F>::ArgumentMatcherTuple ArgumentMatcherTuple;
-  typedef typename Function<F>::Result Result;
-
-  TypedExpectation(FunctionMocker<F>* owner, const char* a_file, int a_line,
-                   const std::string& a_source_text,
-                   const ArgumentMatcherTuple& m)
-      : ExpectationBase(a_file, a_line, a_source_text),
-        owner_(owner),
-        matchers_(m),
-        // By default, extra_matcher_ should match anything.  However,
-        // we cannot initialize it with _ as that causes ambiguity between
-        // Matcher's copy and move constructor for some argument types.
-        extra_matcher_(A<const ArgumentTuple&>()),
-        repeated_action_(DoDefault()) {}
-
-  ~TypedExpectation() override {
-    // Check the validity of the action count if it hasn't been done
-    // yet (for example, if the expectation was never used).
-    CheckActionCountIfNotDone();
-    for (UntypedActions::const_iterator it = untyped_actions_.begin();
-         it != untyped_actions_.end(); ++it) {
-      delete static_cast<const Action<F>*>(*it);
-    }
-  }
-
-  // Implements the .With() clause.
-  TypedExpectation& With(const Matcher<const ArgumentTuple&>& m) {
-    if (last_clause_ == kWith) {
-      ExpectSpecProperty(false,
-                         ".With() cannot appear "
-                         "more than once in an EXPECT_CALL().");
-    } else {
-      ExpectSpecProperty(last_clause_ < kWith,
-                         ".With() must be the first "
-                         "clause in an EXPECT_CALL().");
-    }
-    last_clause_ = kWith;
-
-    extra_matcher_ = m;
-    extra_matcher_specified_ = true;
-    return *this;
-  }
-
-  // Implements the .Times() clause.
-  TypedExpectation& Times(const Cardinality& a_cardinality) {
-    ExpectationBase::UntypedTimes(a_cardinality);
-    return *this;
-  }
-
-  // Implements the .Times() clause.
-  TypedExpectation& Times(int n) {
-    return Times(Exactly(n));
-  }
-
-  // Implements the .InSequence() clause.
-  TypedExpectation& InSequence(const Sequence& s) {
-    ExpectSpecProperty(last_clause_ <= kInSequence,
-                       ".InSequence() cannot appear after .After(),"
-                       " .WillOnce(), .WillRepeatedly(), or "
-                       ".RetiresOnSaturation().");
-    last_clause_ = kInSequence;
-
-    s.AddExpectation(GetHandle());
-    return *this;
-  }
-  TypedExpectation& InSequence(const Sequence& s1, const Sequence& s2) {
-    return InSequence(s1).InSequence(s2);
-  }
-  TypedExpectation& InSequence(const Sequence& s1, const Sequence& s2,
-                               const Sequence& s3) {
-    return InSequence(s1, s2).InSequence(s3);
-  }
-  TypedExpectation& InSequence(const Sequence& s1, const Sequence& s2,
-                               const Sequence& s3, const Sequence& s4) {
-    return InSequence(s1, s2, s3).InSequence(s4);
-  }
-  TypedExpectation& InSequence(const Sequence& s1, const Sequence& s2,
-                               const Sequence& s3, const Sequence& s4,
-                               const Sequence& s5) {
-    return InSequence(s1, s2, s3, s4).InSequence(s5);
-  }
-
-  // Implements that .After() clause.
-  TypedExpectation& After(const ExpectationSet& s) {
-    ExpectSpecProperty(last_clause_ <= kAfter,
-                       ".After() cannot appear after .WillOnce(),"
-                       " .WillRepeatedly(), or "
-                       ".RetiresOnSaturation().");
-    last_clause_ = kAfter;
-
-    for (ExpectationSet::const_iterator it = s.begin(); it != s.end(); ++it) {
-      immediate_prerequisites_ += *it;
-    }
-    return *this;
-  }
-  TypedExpectation& After(const ExpectationSet& s1, const ExpectationSet& s2) {
-    return After(s1).After(s2);
-  }
-  TypedExpectation& After(const ExpectationSet& s1, const ExpectationSet& s2,
-                          const ExpectationSet& s3) {
-    return After(s1, s2).After(s3);
-  }
-  TypedExpectation& After(const ExpectationSet& s1, const ExpectationSet& s2,
-                          const ExpectationSet& s3, const ExpectationSet& s4) {
-    return After(s1, s2, s3).After(s4);
-  }
-  TypedExpectation& After(const ExpectationSet& s1, const ExpectationSet& s2,
-                          const ExpectationSet& s3, const ExpectationSet& s4,
-                          const ExpectationSet& s5) {
-    return After(s1, s2, s3, s4).After(s5);
-  }
-
-  // Implements the .WillOnce() clause.
-  TypedExpectation& WillOnce(const Action<F>& action) {
-    ExpectSpecProperty(last_clause_ <= kWillOnce,
-                       ".WillOnce() cannot appear after "
-                       ".WillRepeatedly() or .RetiresOnSaturation().");
-    last_clause_ = kWillOnce;
-
-    untyped_actions_.push_back(new Action<F>(action));
-    if (!cardinality_specified()) {
-      set_cardinality(Exactly(static_cast<int>(untyped_actions_.size())));
-    }
-    return *this;
-  }
-
-  // Implements the .WillRepeatedly() clause.
-  TypedExpectation& WillRepeatedly(const Action<F>& action) {
-    if (last_clause_ == kWillRepeatedly) {
-      ExpectSpecProperty(false,
-                         ".WillRepeatedly() cannot appear "
-                         "more than once in an EXPECT_CALL().");
-    } else {
-      ExpectSpecProperty(last_clause_ < kWillRepeatedly,
-                         ".WillRepeatedly() cannot appear "
-                         "after .RetiresOnSaturation().");
-    }
-    last_clause_ = kWillRepeatedly;
-    repeated_action_specified_ = true;
-
-    repeated_action_ = action;
-    if (!cardinality_specified()) {
-      set_cardinality(AtLeast(static_cast<int>(untyped_actions_.size())));
-    }
-
-    // Now that no more action clauses can be specified, we check
-    // whether their count makes sense.
-    CheckActionCountIfNotDone();
-    return *this;
-  }
-
-  // Implements the .RetiresOnSaturation() clause.
-  TypedExpectation& RetiresOnSaturation() {
-    ExpectSpecProperty(last_clause_ < kRetiresOnSaturation,
-                       ".RetiresOnSaturation() cannot appear "
-                       "more than once.");
-    last_clause_ = kRetiresOnSaturation;
-    retires_on_saturation_ = true;
-
-    // Now that no more action clauses can be specified, we check
-    // whether their count makes sense.
-    CheckActionCountIfNotDone();
-    return *this;
-  }
-
-  // Returns the matchers for the arguments as specified inside the
-  // EXPECT_CALL() macro.
-  const ArgumentMatcherTuple& matchers() const {
-    return matchers_;
-  }
-
-  // Returns the matcher specified by the .With() clause.
-  const Matcher<const ArgumentTuple&>& extra_matcher() const {
-    return extra_matcher_;
-  }
-
-  // Returns the action specified by the .WillRepeatedly() clause.
-  const Action<F>& repeated_action() const { return repeated_action_; }
-
-  // If this mock method has an extra matcher (i.e. .With(matcher)),
-  // describes it to the ostream.
-  void MaybeDescribeExtraMatcherTo(::std::ostream* os) override {
-    if (extra_matcher_specified_) {
-      *os << "    Expected args: ";
-      extra_matcher_.DescribeTo(os);
-      *os << "\n";
-    }
-  }
-
- private:
-  template <typename Function>
-  friend class FunctionMocker;
-
-  // Returns an Expectation object that references and co-owns this
-  // expectation.
-  Expectation GetHandle() override { return owner_->GetHandleOf(this); }
-
-  // The following methods will be called only after the EXPECT_CALL()
-  // statement finishes and when the current thread holds
-  // g_gmock_mutex.
-
-  // Returns true if and only if this expectation matches the given arguments.
-  bool Matches(const ArgumentTuple& args) const
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-    g_gmock_mutex.AssertHeld();
-    return TupleMatches(matchers_, args) && extra_matcher_.Matches(args);
-  }
-
-  // Returns true if and only if this expectation should handle the given
-  // arguments.
-  bool ShouldHandleArguments(const ArgumentTuple& args) const
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-    g_gmock_mutex.AssertHeld();
-
-    // In case the action count wasn't checked when the expectation
-    // was defined (e.g. if this expectation has no WillRepeatedly()
-    // or RetiresOnSaturation() clause), we check it when the
-    // expectation is used for the first time.
-    CheckActionCountIfNotDone();
-    return !is_retired() && AllPrerequisitesAreSatisfied() && Matches(args);
-  }
-
-  // Describes the result of matching the arguments against this
-  // expectation to the given ostream.
-  void ExplainMatchResultTo(
-      const ArgumentTuple& args,
-      ::std::ostream* os) const
-          GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-    g_gmock_mutex.AssertHeld();
-
-    if (is_retired()) {
-      *os << "         Expected: the expectation is active\n"
-          << "           Actual: it is retired\n";
-    } else if (!Matches(args)) {
-      if (!TupleMatches(matchers_, args)) {
-        ExplainMatchFailureTupleTo(matchers_, args, os);
-      }
-      StringMatchResultListener listener;
-      if (!extra_matcher_.MatchAndExplain(args, &listener)) {
-        *os << "    Expected args: ";
-        extra_matcher_.DescribeTo(os);
-        *os << "\n           Actual: don't match";
-
-        internal::PrintIfNotEmpty(listener.str(), os);
-        *os << "\n";
-      }
-    } else if (!AllPrerequisitesAreSatisfied()) {
-      *os << "         Expected: all pre-requisites are satisfied\n"
-          << "           Actual: the following immediate pre-requisites "
-          << "are not satisfied:\n";
-      ExpectationSet unsatisfied_prereqs;
-      FindUnsatisfiedPrerequisites(&unsatisfied_prereqs);
-      int i = 0;
-      for (ExpectationSet::const_iterator it = unsatisfied_prereqs.begin();
-           it != unsatisfied_prereqs.end(); ++it) {
-        it->expectation_base()->DescribeLocationTo(os);
-        *os << "pre-requisite #" << i++ << "\n";
-      }
-      *os << "                   (end of pre-requisites)\n";
-    } else {
-      // This line is here just for completeness' sake.  It will never
-      // be executed as currently the ExplainMatchResultTo() function
-      // is called only when the mock function call does NOT match the
-      // expectation.
-      *os << "The call matches the expectation.\n";
-    }
-  }
-
-  // Returns the action that should be taken for the current invocation.
-  const Action<F>& GetCurrentAction(const FunctionMocker<F>* mocker,
-                                    const ArgumentTuple& args) const
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-    g_gmock_mutex.AssertHeld();
-    const int count = call_count();
-    Assert(count >= 1, __FILE__, __LINE__,
-           "call_count() is <= 0 when GetCurrentAction() is "
-           "called - this should never happen.");
-
-    const int action_count = static_cast<int>(untyped_actions_.size());
-    if (action_count > 0 && !repeated_action_specified_ &&
-        count > action_count) {
-      // If there is at least one WillOnce() and no WillRepeatedly(),
-      // we warn the user when the WillOnce() clauses ran out.
-      ::std::stringstream ss;
-      DescribeLocationTo(&ss);
-      ss << "Actions ran out in " << source_text() << "...\n"
-         << "Called " << count << " times, but only "
-         << action_count << " WillOnce()"
-         << (action_count == 1 ? " is" : "s are") << " specified - ";
-      mocker->DescribeDefaultActionTo(args, &ss);
-      Log(kWarning, ss.str(), 1);
-    }
-
-    return count <= action_count
-               ? *static_cast<const Action<F>*>(
-                     untyped_actions_[static_cast<size_t>(count - 1)])
-               : repeated_action();
-  }
-
-  // Given the arguments of a mock function call, if the call will
-  // over-saturate this expectation, returns the default action;
-  // otherwise, returns the next action in this expectation.  Also
-  // describes *what* happened to 'what', and explains *why* Google
-  // Mock does it to 'why'.  This method is not const as it calls
-  // IncrementCallCount().  A return value of NULL means the default
-  // action.
-  const Action<F>* GetActionForArguments(const FunctionMocker<F>* mocker,
-                                         const ArgumentTuple& args,
-                                         ::std::ostream* what,
-                                         ::std::ostream* why)
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-    g_gmock_mutex.AssertHeld();
-    if (IsSaturated()) {
-      // We have an excessive call.
-      IncrementCallCount();
-      *what << "Mock function called more times than expected - ";
-      mocker->DescribeDefaultActionTo(args, what);
-      DescribeCallCountTo(why);
-
-      return nullptr;
-    }
-
-    IncrementCallCount();
-    RetireAllPreRequisites();
-
-    if (retires_on_saturation_ && IsSaturated()) {
-      Retire();
-    }
-
-    // Must be done after IncrementCount()!
-    *what << "Mock function call matches " << source_text() <<"...\n";
-    return &(GetCurrentAction(mocker, args));
-  }
-
-  // All the fields below won't change once the EXPECT_CALL()
-  // statement finishes.
-  FunctionMocker<F>* const owner_;
-  ArgumentMatcherTuple matchers_;
-  Matcher<const ArgumentTuple&> extra_matcher_;
-  Action<F> repeated_action_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(TypedExpectation);
-};  // class TypedExpectation
-
-// A MockSpec object is used by ON_CALL() or EXPECT_CALL() for
-// specifying the default behavior of, or expectation on, a mock
-// function.
-
-// Note: class MockSpec really belongs to the ::testing namespace.
-// However if we define it in ::testing, MSVC will complain when
-// classes in ::testing::internal declare it as a friend class
-// template.  To workaround this compiler bug, we define MockSpec in
-// ::testing::internal and import it into ::testing.
-
-// Logs a message including file and line number information.
-GTEST_API_ void LogWithLocation(testing::internal::LogSeverity severity,
-                                const char* file, int line,
-                                const std::string& message);
-
-template <typename F>
-class MockSpec {
- public:
-  typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
-  typedef typename internal::Function<F>::ArgumentMatcherTuple
-      ArgumentMatcherTuple;
-
-  // Constructs a MockSpec object, given the function mocker object
-  // that the spec is associated with.
-  MockSpec(internal::FunctionMocker<F>* function_mocker,
-           const ArgumentMatcherTuple& matchers)
-      : function_mocker_(function_mocker), matchers_(matchers) {}
-
-  // Adds a new default action spec to the function mocker and returns
-  // the newly created spec.
-  internal::OnCallSpec<F>& InternalDefaultActionSetAt(
-      const char* file, int line, const char* obj, const char* call) {
-    LogWithLocation(internal::kInfo, file, line,
-                    std::string("ON_CALL(") + obj + ", " + call + ") invoked");
-    return function_mocker_->AddNewOnCallSpec(file, line, matchers_);
-  }
-
-  // Adds a new expectation spec to the function mocker and returns
-  // the newly created spec.
-  internal::TypedExpectation<F>& InternalExpectedAt(
-      const char* file, int line, const char* obj, const char* call) {
-    const std::string source_text(std::string("EXPECT_CALL(") + obj + ", " +
-                                  call + ")");
-    LogWithLocation(internal::kInfo, file, line, source_text + " invoked");
-    return function_mocker_->AddNewExpectation(
-        file, line, source_text, matchers_);
-  }
-
-  // This operator overload is used to swallow the superfluous parameter list
-  // introduced by the ON/EXPECT_CALL macros. See the macro comments for more
-  // explanation.
-  MockSpec<F>& operator()(const internal::WithoutMatchers&, void* const) {
-    return *this;
-  }
-
- private:
-  template <typename Function>
-  friend class internal::FunctionMocker;
-
-  // The function mocker that owns this spec.
-  internal::FunctionMocker<F>* const function_mocker_;
-  // The argument matchers specified in the spec.
-  ArgumentMatcherTuple matchers_;
-
-  GTEST_DISALLOW_ASSIGN_(MockSpec);
-};  // class MockSpec
-
-// Wrapper type for generically holding an ordinary value or lvalue reference.
-// If T is not a reference type, it must be copyable or movable.
-// ReferenceOrValueWrapper<T> is movable, and will also be copyable unless
-// T is a move-only value type (which means that it will always be copyable
-// if the current platform does not support move semantics).
-//
-// The primary template defines handling for values, but function header
-// comments describe the contract for the whole template (including
-// specializations).
-template <typename T>
-class ReferenceOrValueWrapper {
- public:
-  // Constructs a wrapper from the given value/reference.
-  explicit ReferenceOrValueWrapper(T value)
-      : value_(std::move(value)) {
-  }
-
-  // Unwraps and returns the underlying value/reference, exactly as
-  // originally passed. The behavior of calling this more than once on
-  // the same object is unspecified.
-  T Unwrap() { return std::move(value_); }
-
-  // Provides nondestructive access to the underlying value/reference.
-  // Always returns a const reference (more precisely,
-  // const std::add_lvalue_reference<T>::type). The behavior of calling this
-  // after calling Unwrap on the same object is unspecified.
-  const T& Peek() const {
-    return value_;
-  }
-
- private:
-  T value_;
-};
-
-// Specialization for lvalue reference types. See primary template
-// for documentation.
-template <typename T>
-class ReferenceOrValueWrapper<T&> {
- public:
-  // Workaround for debatable pass-by-reference lint warning (c-library-team
-  // policy precludes NOLINT in this context)
-  typedef T& reference;
-  explicit ReferenceOrValueWrapper(reference ref)
-      : value_ptr_(&ref) {}
-  T& Unwrap() { return *value_ptr_; }
-  const T& Peek() const { return *value_ptr_; }
-
- private:
-  T* value_ptr_;
-};
-
-// MSVC warns about using 'this' in base member initializer list, so
-// we need to temporarily disable the warning.  We have to do it for
-// the entire class to suppress the warning, even though it's about
-// the constructor only.
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(4355)
-
-// C++ treats the void type specially.  For example, you cannot define
-// a void-typed variable or pass a void value to a function.
-// ActionResultHolder<T> holds a value of type T, where T must be a
-// copyable type or void (T doesn't need to be default-constructable).
-// It hides the syntactic difference between void and other types, and
-// is used to unify the code for invoking both void-returning and
-// non-void-returning mock functions.
-
-// Untyped base class for ActionResultHolder<T>.
-class UntypedActionResultHolderBase {
- public:
-  virtual ~UntypedActionResultHolderBase() {}
-
-  // Prints the held value as an action's result to os.
-  virtual void PrintAsActionResult(::std::ostream* os) const = 0;
-};
-
-// This generic definition is used when T is not void.
-template <typename T>
-class ActionResultHolder : public UntypedActionResultHolderBase {
- public:
-  // Returns the held value. Must not be called more than once.
-  T Unwrap() {
-    return result_.Unwrap();
-  }
-
-  // Prints the held value as an action's result to os.
-  void PrintAsActionResult(::std::ostream* os) const override {
-    *os << "\n          Returns: ";
-    // T may be a reference type, so we don't use UniversalPrint().
-    UniversalPrinter<T>::Print(result_.Peek(), os);
-  }
-
-  // Performs the given mock function's default action and returns the
-  // result in a new-ed ActionResultHolder.
-  template <typename F>
-  static ActionResultHolder* PerformDefaultAction(
-      const FunctionMocker<F>* func_mocker,
-      typename Function<F>::ArgumentTuple&& args,
-      const std::string& call_description) {
-    return new ActionResultHolder(Wrapper(func_mocker->PerformDefaultAction(
-        std::move(args), call_description)));
-  }
-
-  // Performs the given action and returns the result in a new-ed
-  // ActionResultHolder.
-  template <typename F>
-  static ActionResultHolder* PerformAction(
-      const Action<F>& action, typename Function<F>::ArgumentTuple&& args) {
-    return new ActionResultHolder(
-        Wrapper(action.Perform(std::move(args))));
-  }
-
- private:
-  typedef ReferenceOrValueWrapper<T> Wrapper;
-
-  explicit ActionResultHolder(Wrapper result)
-      : result_(std::move(result)) {
-  }
-
-  Wrapper result_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ActionResultHolder);
-};
-
-// Specialization for T = void.
-template <>
-class ActionResultHolder<void> : public UntypedActionResultHolderBase {
- public:
-  void Unwrap() { }
-
-  void PrintAsActionResult(::std::ostream* /* os */) const override {}
-
-  // Performs the given mock function's default action and returns ownership
-  // of an empty ActionResultHolder*.
-  template <typename F>
-  static ActionResultHolder* PerformDefaultAction(
-      const FunctionMocker<F>* func_mocker,
-      typename Function<F>::ArgumentTuple&& args,
-      const std::string& call_description) {
-    func_mocker->PerformDefaultAction(std::move(args), call_description);
-    return new ActionResultHolder;
-  }
-
-  // Performs the given action and returns ownership of an empty
-  // ActionResultHolder*.
-  template <typename F>
-  static ActionResultHolder* PerformAction(
-      const Action<F>& action, typename Function<F>::ArgumentTuple&& args) {
-    action.Perform(std::move(args));
-    return new ActionResultHolder;
-  }
-
- private:
-  ActionResultHolder() {}
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ActionResultHolder);
-};
-
-template <typename F>
-class FunctionMocker;
-
-template <typename R, typename... Args>
-class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase {
-  using F = R(Args...);
-
- public:
-  using Result = R;
-  using ArgumentTuple = std::tuple<Args...>;
-  using ArgumentMatcherTuple = std::tuple<Matcher<Args>...>;
-
-  FunctionMocker() {}
-
-  // There is no generally useful and implementable semantics of
-  // copying a mock object, so copying a mock is usually a user error.
-  // Thus we disallow copying function mockers.  If the user really
-  // wants to copy a mock object, they should implement their own copy
-  // operation, for example:
-  //
-  //   class MockFoo : public Foo {
-  //    public:
-  //     // Defines a copy constructor explicitly.
-  //     MockFoo(const MockFoo& src) {}
-  //     ...
-  //   };
-  FunctionMocker(const FunctionMocker&) = delete;
-  FunctionMocker& operator=(const FunctionMocker&) = delete;
-
-  // The destructor verifies that all expectations on this mock
-  // function have been satisfied.  If not, it will report Google Test
-  // non-fatal failures for the violations.
-  ~FunctionMocker() override GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
-    MutexLock l(&g_gmock_mutex);
-    VerifyAndClearExpectationsLocked();
-    Mock::UnregisterLocked(this);
-    ClearDefaultActionsLocked();
-  }
-
-  // Returns the ON_CALL spec that matches this mock function with the
-  // given arguments; returns NULL if no matching ON_CALL is found.
-  // L = *
-  const OnCallSpec<F>* FindOnCallSpec(
-      const ArgumentTuple& args) const {
-    for (UntypedOnCallSpecs::const_reverse_iterator it
-             = untyped_on_call_specs_.rbegin();
-         it != untyped_on_call_specs_.rend(); ++it) {
-      const OnCallSpec<F>* spec = static_cast<const OnCallSpec<F>*>(*it);
-      if (spec->Matches(args))
-        return spec;
-    }
-
-    return nullptr;
-  }
-
-  // Performs the default action of this mock function on the given
-  // arguments and returns the result. Asserts (or throws if
-  // exceptions are enabled) with a helpful call descrption if there
-  // is no valid return value. This method doesn't depend on the
-  // mutable state of this object, and thus can be called concurrently
-  // without locking.
-  // L = *
-  Result PerformDefaultAction(ArgumentTuple&& args,
-                              const std::string& call_description) const {
-    const OnCallSpec<F>* const spec =
-        this->FindOnCallSpec(args);
-    if (spec != nullptr) {
-      return spec->GetAction().Perform(std::move(args));
-    }
-    const std::string message =
-        call_description +
-        "\n    The mock function has no default action "
-        "set, and its return type has no default value set.";
-#if GTEST_HAS_EXCEPTIONS
-    if (!DefaultValue<Result>::Exists()) {
-      throw std::runtime_error(message);
-    }
-#else
-    Assert(DefaultValue<Result>::Exists(), "", -1, message);
-#endif
-    return DefaultValue<Result>::Get();
-  }
-
-  // Performs the default action with the given arguments and returns
-  // the action's result.  The call description string will be used in
-  // the error message to describe the call in the case the default
-  // action fails.  The caller is responsible for deleting the result.
-  // L = *
-  UntypedActionResultHolderBase* UntypedPerformDefaultAction(
-      void* untyped_args,  // must point to an ArgumentTuple
-      const std::string& call_description) const override {
-    ArgumentTuple* args = static_cast<ArgumentTuple*>(untyped_args);
-    return ResultHolder::PerformDefaultAction(this, std::move(*args),
-                                              call_description);
-  }
-
-  // Performs the given action with the given arguments and returns
-  // the action's result.  The caller is responsible for deleting the
-  // result.
-  // L = *
-  UntypedActionResultHolderBase* UntypedPerformAction(
-      const void* untyped_action, void* untyped_args) const override {
-    // Make a copy of the action before performing it, in case the
-    // action deletes the mock object (and thus deletes itself).
-    const Action<F> action = *static_cast<const Action<F>*>(untyped_action);
-    ArgumentTuple* args = static_cast<ArgumentTuple*>(untyped_args);
-    return ResultHolder::PerformAction(action, std::move(*args));
-  }
-
-  // Implements UntypedFunctionMockerBase::ClearDefaultActionsLocked():
-  // clears the ON_CALL()s set on this mock function.
-  void ClearDefaultActionsLocked() override
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-    g_gmock_mutex.AssertHeld();
-
-    // Deleting our default actions may trigger other mock objects to be
-    // deleted, for example if an action contains a reference counted smart
-    // pointer to that mock object, and that is the last reference. So if we
-    // delete our actions within the context of the global mutex we may deadlock
-    // when this method is called again. Instead, make a copy of the set of
-    // actions to delete, clear our set within the mutex, and then delete the
-    // actions outside of the mutex.
-    UntypedOnCallSpecs specs_to_delete;
-    untyped_on_call_specs_.swap(specs_to_delete);
-
-    g_gmock_mutex.Unlock();
-    for (UntypedOnCallSpecs::const_iterator it =
-             specs_to_delete.begin();
-         it != specs_to_delete.end(); ++it) {
-      delete static_cast<const OnCallSpec<F>*>(*it);
-    }
-
-    // Lock the mutex again, since the caller expects it to be locked when we
-    // return.
-    g_gmock_mutex.Lock();
-  }
-
-  // Returns the result of invoking this mock function with the given
-  // arguments.  This function can be safely called from multiple
-  // threads concurrently.
-  Result Invoke(Args... args) GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
-    ArgumentTuple tuple(std::forward<Args>(args)...);
-    std::unique_ptr<ResultHolder> holder(DownCast_<ResultHolder*>(
-        this->UntypedInvokeWith(static_cast<void*>(&tuple))));
-    return holder->Unwrap();
-  }
-
-  MockSpec<F> With(Matcher<Args>... m) {
-    return MockSpec<F>(this, ::std::make_tuple(std::move(m)...));
-  }
-
- protected:
-  template <typename Function>
-  friend class MockSpec;
-
-  typedef ActionResultHolder<Result> ResultHolder;
-
-  // Adds and returns a default action spec for this mock function.
-  OnCallSpec<F>& AddNewOnCallSpec(
-      const char* file, int line,
-      const ArgumentMatcherTuple& m)
-          GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
-    Mock::RegisterUseByOnCallOrExpectCall(MockObject(), file, line);
-    OnCallSpec<F>* const on_call_spec = new OnCallSpec<F>(file, line, m);
-    untyped_on_call_specs_.push_back(on_call_spec);
-    return *on_call_spec;
-  }
-
-  // Adds and returns an expectation spec for this mock function.
-  TypedExpectation<F>& AddNewExpectation(const char* file, int line,
-                                         const std::string& source_text,
-                                         const ArgumentMatcherTuple& m)
-      GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
-    Mock::RegisterUseByOnCallOrExpectCall(MockObject(), file, line);
-    TypedExpectation<F>* const expectation =
-        new TypedExpectation<F>(this, file, line, source_text, m);
-    const std::shared_ptr<ExpectationBase> untyped_expectation(expectation);
-    // See the definition of untyped_expectations_ for why access to
-    // it is unprotected here.
-    untyped_expectations_.push_back(untyped_expectation);
-
-    // Adds this expectation into the implicit sequence if there is one.
-    Sequence* const implicit_sequence = g_gmock_implicit_sequence.get();
-    if (implicit_sequence != nullptr) {
-      implicit_sequence->AddExpectation(Expectation(untyped_expectation));
-    }
-
-    return *expectation;
-  }
-
- private:
-  template <typename Func> friend class TypedExpectation;
-
-  // Some utilities needed for implementing UntypedInvokeWith().
-
-  // Describes what default action will be performed for the given
-  // arguments.
-  // L = *
-  void DescribeDefaultActionTo(const ArgumentTuple& args,
-                               ::std::ostream* os) const {
-    const OnCallSpec<F>* const spec = FindOnCallSpec(args);
-
-    if (spec == nullptr) {
-      *os << (std::is_void<Result>::value ? "returning directly.\n"
-                                          : "returning default value.\n");
-    } else {
-      *os << "taking default action specified at:\n"
-          << FormatFileLocation(spec->file(), spec->line()) << "\n";
-    }
-  }
-
-  // Writes a message that the call is uninteresting (i.e. neither
-  // explicitly expected nor explicitly unexpected) to the given
-  // ostream.
-  void UntypedDescribeUninterestingCall(const void* untyped_args,
-                                        ::std::ostream* os) const override
-      GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
-    const ArgumentTuple& args =
-        *static_cast<const ArgumentTuple*>(untyped_args);
-    *os << "Uninteresting mock function call - ";
-    DescribeDefaultActionTo(args, os);
-    *os << "    Function call: " << Name();
-    UniversalPrint(args, os);
-  }
-
-  // Returns the expectation that matches the given function arguments
-  // (or NULL is there's no match); when a match is found,
-  // untyped_action is set to point to the action that should be
-  // performed (or NULL if the action is "do default"), and
-  // is_excessive is modified to indicate whether the call exceeds the
-  // expected number.
-  //
-  // Critical section: We must find the matching expectation and the
-  // corresponding action that needs to be taken in an ATOMIC
-  // transaction.  Otherwise another thread may call this mock
-  // method in the middle and mess up the state.
-  //
-  // However, performing the action has to be left out of the critical
-  // section.  The reason is that we have no control on what the
-  // action does (it can invoke an arbitrary user function or even a
-  // mock function) and excessive locking could cause a dead lock.
-  const ExpectationBase* UntypedFindMatchingExpectation(
-      const void* untyped_args, const void** untyped_action, bool* is_excessive,
-      ::std::ostream* what, ::std::ostream* why) override
-      GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
-    const ArgumentTuple& args =
-        *static_cast<const ArgumentTuple*>(untyped_args);
-    MutexLock l(&g_gmock_mutex);
-    TypedExpectation<F>* exp = this->FindMatchingExpectationLocked(args);
-    if (exp == nullptr) {  // A match wasn't found.
-      this->FormatUnexpectedCallMessageLocked(args, what, why);
-      return nullptr;
-    }
-
-    // This line must be done before calling GetActionForArguments(),
-    // which will increment the call count for *exp and thus affect
-    // its saturation status.
-    *is_excessive = exp->IsSaturated();
-    const Action<F>* action = exp->GetActionForArguments(this, args, what, why);
-    if (action != nullptr && action->IsDoDefault())
-      action = nullptr;  // Normalize "do default" to NULL.
-    *untyped_action = action;
-    return exp;
-  }
-
-  // Prints the given function arguments to the ostream.
-  void UntypedPrintArgs(const void* untyped_args,
-                        ::std::ostream* os) const override {
-    const ArgumentTuple& args =
-        *static_cast<const ArgumentTuple*>(untyped_args);
-    UniversalPrint(args, os);
-  }
-
-  // Returns the expectation that matches the arguments, or NULL if no
-  // expectation matches them.
-  TypedExpectation<F>* FindMatchingExpectationLocked(
-      const ArgumentTuple& args) const
-          GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-    g_gmock_mutex.AssertHeld();
-    // See the definition of untyped_expectations_ for why access to
-    // it is unprotected here.
-    for (typename UntypedExpectations::const_reverse_iterator it =
-             untyped_expectations_.rbegin();
-         it != untyped_expectations_.rend(); ++it) {
-      TypedExpectation<F>* const exp =
-          static_cast<TypedExpectation<F>*>(it->get());
-      if (exp->ShouldHandleArguments(args)) {
-        return exp;
-      }
-    }
-    return nullptr;
-  }
-
-  // Returns a message that the arguments don't match any expectation.
-  void FormatUnexpectedCallMessageLocked(
-      const ArgumentTuple& args,
-      ::std::ostream* os,
-      ::std::ostream* why) const
-          GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-    g_gmock_mutex.AssertHeld();
-    *os << "\nUnexpected mock function call - ";
-    DescribeDefaultActionTo(args, os);
-    PrintTriedExpectationsLocked(args, why);
-  }
-
-  // Prints a list of expectations that have been tried against the
-  // current mock function call.
-  void PrintTriedExpectationsLocked(
-      const ArgumentTuple& args,
-      ::std::ostream* why) const
-          GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-    g_gmock_mutex.AssertHeld();
-    const size_t count = untyped_expectations_.size();
-    *why << "Google Mock tried the following " << count << " "
-         << (count == 1 ? "expectation, but it didn't match" :
-             "expectations, but none matched")
-         << ":\n";
-    for (size_t i = 0; i < count; i++) {
-      TypedExpectation<F>* const expectation =
-          static_cast<TypedExpectation<F>*>(untyped_expectations_[i].get());
-      *why << "\n";
-      expectation->DescribeLocationTo(why);
-      if (count > 1) {
-        *why << "tried expectation #" << i << ": ";
-      }
-      *why << expectation->source_text() << "...\n";
-      expectation->ExplainMatchResultTo(args, why);
-      expectation->DescribeCallCountTo(why);
-    }
-  }
-};  // class FunctionMocker
-
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4355
-
-// Reports an uninteresting call (whose description is in msg) in the
-// manner specified by 'reaction'.
-void ReportUninterestingCall(CallReaction reaction, const std::string& msg);
-
-}  // namespace internal
-
-// A MockFunction<F> class has one mock method whose type is F.  It is
-// useful when you just want your test code to emit some messages and
-// have Google Mock verify the right messages are sent (and perhaps at
-// the right times).  For example, if you are exercising code:
-//
-//   Foo(1);
-//   Foo(2);
-//   Foo(3);
-//
-// and want to verify that Foo(1) and Foo(3) both invoke
-// mock.Bar("a"), but Foo(2) doesn't invoke anything, you can write:
-//
-// TEST(FooTest, InvokesBarCorrectly) {
-//   MyMock mock;
-//   MockFunction<void(string check_point_name)> check;
-//   {
-//     InSequence s;
-//
-//     EXPECT_CALL(mock, Bar("a"));
-//     EXPECT_CALL(check, Call("1"));
-//     EXPECT_CALL(check, Call("2"));
-//     EXPECT_CALL(mock, Bar("a"));
-//   }
-//   Foo(1);
-//   check.Call("1");
-//   Foo(2);
-//   check.Call("2");
-//   Foo(3);
-// }
-//
-// The expectation spec says that the first Bar("a") must happen
-// before check point "1", the second Bar("a") must happen after check
-// point "2", and nothing should happen between the two check
-// points. The explicit check points make it easy to tell which
-// Bar("a") is called by which call to Foo().
-//
-// MockFunction<F> can also be used to exercise code that accepts
-// std::function<F> callbacks. To do so, use AsStdFunction() method
-// to create std::function proxy forwarding to original object's Call.
-// Example:
-//
-// TEST(FooTest, RunsCallbackWithBarArgument) {
-//   MockFunction<int(string)> callback;
-//   EXPECT_CALL(callback, Call("bar")).WillOnce(Return(1));
-//   Foo(callback.AsStdFunction());
-// }
-template <typename F>
-class MockFunction;
-
-template <typename R, typename... Args>
-class MockFunction<R(Args...)> {
- public:
-  MockFunction() {}
-  MockFunction(const MockFunction&) = delete;
-  MockFunction& operator=(const MockFunction&) = delete;
-
-  std::function<R(Args...)> AsStdFunction() {
-    return [this](Args... args) -> R {
-      return this->Call(std::forward<Args>(args)...);
-    };
-  }
-
-  // Implementation detail: the expansion of the MOCK_METHOD macro.
-  R Call(Args... args) {
-    mock_.SetOwnerAndName(this, "Call");
-    return mock_.Invoke(std::forward<Args>(args)...);
-  }
-
-  internal::MockSpec<R(Args...)> gmock_Call(Matcher<Args>... m) {
-    mock_.RegisterOwner(this);
-    return mock_.With(std::move(m)...);
-  }
-
-  internal::MockSpec<R(Args...)> gmock_Call(const internal::WithoutMatchers&,
-                                            R (*)(Args...)) {
-    return this->gmock_Call(::testing::A<Args>()...);
-  }
-
- private:
-  internal::FunctionMocker<R(Args...)> mock_;
-};
-
-// The style guide prohibits "using" statements in a namespace scope
-// inside a header file.  However, the MockSpec class template is
-// meant to be defined in the ::testing namespace.  The following line
-// is just a trick for working around a bug in MSVC 8.0, which cannot
-// handle it if we define MockSpec in ::testing.
-using internal::MockSpec;
-
-// Const(x) is a convenient function for obtaining a const reference
-// to x.  This is useful for setting expectations on an overloaded
-// const mock method, e.g.
-//
-//   class MockFoo : public FooInterface {
-//    public:
-//     MOCK_METHOD0(Bar, int());
-//     MOCK_CONST_METHOD0(Bar, int&());
-//   };
-//
-//   MockFoo foo;
-//   // Expects a call to non-const MockFoo::Bar().
-//   EXPECT_CALL(foo, Bar());
-//   // Expects a call to const MockFoo::Bar().
-//   EXPECT_CALL(Const(foo), Bar());
-template <typename T>
-inline const T& Const(const T& x) { return x; }
-
-// Constructs an Expectation object that references and co-owns exp.
-inline Expectation::Expectation(internal::ExpectationBase& exp)  // NOLINT
-    : expectation_base_(exp.GetHandle().expectation_base()) {}
-
-}  // namespace testing
-
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
-
-// Implementation for ON_CALL and EXPECT_CALL macros. A separate macro is
-// required to avoid compile errors when the name of the method used in call is
-// a result of macro expansion. See CompilesWithMethodNameExpandedFromMacro
-// tests in internal/gmock-spec-builders_test.cc for more details.
-//
-// This macro supports statements both with and without parameter matchers. If
-// the parameter list is omitted, gMock will accept any parameters, which allows
-// tests to be written that don't need to encode the number of method
-// parameter. This technique may only be used for non-overloaded methods.
-//
-//   // These are the same:
-//   ON_CALL(mock, NoArgsMethod()).WillByDefault(...);
-//   ON_CALL(mock, NoArgsMethod).WillByDefault(...);
-//
-//   // As are these:
-//   ON_CALL(mock, TwoArgsMethod(_, _)).WillByDefault(...);
-//   ON_CALL(mock, TwoArgsMethod).WillByDefault(...);
-//
-//   // Can also specify args if you want, of course:
-//   ON_CALL(mock, TwoArgsMethod(_, 45)).WillByDefault(...);
-//
-//   // Overloads work as long as you specify parameters:
-//   ON_CALL(mock, OverloadedMethod(_)).WillByDefault(...);
-//   ON_CALL(mock, OverloadedMethod(_, _)).WillByDefault(...);
-//
-//   // Oops! Which overload did you want?
-//   ON_CALL(mock, OverloadedMethod).WillByDefault(...);
-//     => ERROR: call to member function 'gmock_OverloadedMethod' is ambiguous
-//
-// How this works: The mock class uses two overloads of the gmock_Method
-// expectation setter method plus an operator() overload on the MockSpec object.
-// In the matcher list form, the macro expands to:
-//
-//   // This statement:
-//   ON_CALL(mock, TwoArgsMethod(_, 45))...
-//
-//   // ...expands to:
-//   mock.gmock_TwoArgsMethod(_, 45)(WithoutMatchers(), nullptr)...
-//   |-------------v---------------||------------v-------------|
-//       invokes first overload        swallowed by operator()
-//
-//   // ...which is essentially:
-//   mock.gmock_TwoArgsMethod(_, 45)...
-//
-// Whereas the form without a matcher list:
-//
-//   // This statement:
-//   ON_CALL(mock, TwoArgsMethod)...
-//
-//   // ...expands to:
-//   mock.gmock_TwoArgsMethod(WithoutMatchers(), nullptr)...
-//   |-----------------------v--------------------------|
-//                 invokes second overload
-//
-//   // ...which is essentially:
-//   mock.gmock_TwoArgsMethod(_, _)...
-//
-// The WithoutMatchers() argument is used to disambiguate overloads and to
-// block the caller from accidentally invoking the second overload directly. The
-// second argument is an internal type derived from the method signature. The
-// failure to disambiguate two overloads of this method in the ON_CALL statement
-// is how we block callers from setting expectations on overloaded methods.
-#define GMOCK_ON_CALL_IMPL_(mock_expr, Setter, call)                    \
-  ((mock_expr).gmock_##call)(::testing::internal::GetWithoutMatchers(), \
-                             nullptr)                                   \
-      .Setter(__FILE__, __LINE__, #mock_expr, #call)
-
-#define ON_CALL(obj, call) \
-  GMOCK_ON_CALL_IMPL_(obj, InternalDefaultActionSetAt, call)
-
-#define EXPECT_CALL(obj, call) \
-  GMOCK_ON_CALL_IMPL_(obj, InternalExpectedAt, call)
-
-#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_SPEC_BUILDERS_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/internal/custom/gmock-generated-actions.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/internal/custom/gmock-generated-actions.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/internal/custom/gmock-generated-actions.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/internal/custom/gmock-generated-actions.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-// This file was GENERATED by command:
-//     pump.py gmock-generated-actions.h.pump
-// DO NOT EDIT BY HAND!!!
-
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_
-#define GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_
-
-#endif  // GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-$$ -*- mode: c++; -*-
-$$ This is a Pump source file. Please use Pump to convert
-$$ it to callback-actions.h.
-$$
-$var max_callback_arity = 5
-$$}} This meta comment fixes auto-indentation in editors.
-
-// GOOGLETEST_CM0002 DO NOT DELETE
-#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_
-#define GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_
-
-#endif  // GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/internal/custom/gmock-matchers.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/internal/custom/gmock-matchers.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/internal/custom/gmock-matchers.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/internal/custom/gmock-matchers.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-// Copyright 2015, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Injection point for custom user configurations. See README for details
-//
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_
-#define GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_
-#endif  // GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/internal/custom/gmock-port.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/internal/custom/gmock-port.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/internal/custom/gmock-port.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/internal/custom/gmock-port.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-// Copyright 2015, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Injection point for custom user configurations. See README for details
-//
-// ** Custom implementation starts here **
-
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_
-#define GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_
-
-#endif  // GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/internal/custom/README.md mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/internal/custom/README.md
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/internal/custom/README.md	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/internal/custom/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-# Customization Points
-
-The custom directory is an injection point for custom user configurations.
-
-## Header `gmock-port.h`
-
-The following macros can be defined:
-
-### Flag related macros:
-
-*   `GMOCK_DECLARE_bool_(name)`
-*   `GMOCK_DECLARE_int32_(name)`
-*   `GMOCK_DECLARE_string_(name)`
-*   `GMOCK_DEFINE_bool_(name, default_val, doc)`
-*   `GMOCK_DEFINE_int32_(name, default_val, doc)`
-*   `GMOCK_DEFINE_string_(name, default_val, doc)`
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/internal/gmock-internal-utils.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/internal/gmock-internal-utils.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/internal/gmock-internal-utils.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/internal/gmock-internal-utils.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,513 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file defines some utilities useful for implementing Google
-// Mock.  They are subject to change without notice, so please DO NOT
-// USE THEM IN USER CODE.
-
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_INTERNAL_UTILS_H_
-#define GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_INTERNAL_UTILS_H_
-
-#include <stdio.h>
-#include <ostream>  // NOLINT
-#include <string>
-#include <type_traits>
-#include "gmock/internal/gmock-port.h"
-#include "gtest/gtest.h"
-
-namespace testing {
-
-template <typename>
-class Matcher;
-
-namespace internal {
-
-// Silence MSVC C4100 (unreferenced formal parameter) and
-// C4805('==': unsafe mix of type 'const int' and type 'const bool')
-#ifdef _MSC_VER
-# pragma warning(push)
-# pragma warning(disable:4100)
-# pragma warning(disable:4805)
-#endif
-
-// Joins a vector of strings as if they are fields of a tuple; returns
-// the joined string.
-GTEST_API_ std::string JoinAsTuple(const Strings& fields);
-
-// Converts an identifier name to a space-separated list of lower-case
-// words.  Each maximum substring of the form [A-Za-z][a-z]*|\d+ is
-// treated as one word.  For example, both "FooBar123" and
-// "foo_bar_123" are converted to "foo bar 123".
-GTEST_API_ std::string ConvertIdentifierNameToWords(const char* id_name);
-
-// PointeeOf<Pointer>::type is the type of a value pointed to by a
-// Pointer, which can be either a smart pointer or a raw pointer.  The
-// following default implementation is for the case where Pointer is a
-// smart pointer.
-template <typename Pointer>
-struct PointeeOf {
-  // Smart pointer classes define type element_type as the type of
-  // their pointees.
-  typedef typename Pointer::element_type type;
-};
-// This specialization is for the raw pointer case.
-template <typename T>
-struct PointeeOf<T*> { typedef T type; };  // NOLINT
-
-// GetRawPointer(p) returns the raw pointer underlying p when p is a
-// smart pointer, or returns p itself when p is already a raw pointer.
-// The following default implementation is for the smart pointer case.
-template <typename Pointer>
-inline const typename Pointer::element_type* GetRawPointer(const Pointer& p) {
-  return p.get();
-}
-// This overloaded version is for the raw pointer case.
-template <typename Element>
-inline Element* GetRawPointer(Element* p) { return p; }
-
-// MSVC treats wchar_t as a native type usually, but treats it as the
-// same as unsigned short when the compiler option /Zc:wchar_t- is
-// specified.  It defines _NATIVE_WCHAR_T_DEFINED symbol when wchar_t
-// is a native type.
-#if defined(_MSC_VER) && !defined(_NATIVE_WCHAR_T_DEFINED)
-// wchar_t is a typedef.
-#else
-# define GMOCK_WCHAR_T_IS_NATIVE_ 1
-#endif
-
-// In what follows, we use the term "kind" to indicate whether a type
-// is bool, an integer type (excluding bool), a floating-point type,
-// or none of them.  This categorization is useful for determining
-// when a matcher argument type can be safely converted to another
-// type in the implementation of SafeMatcherCast.
-enum TypeKind {
-  kBool, kInteger, kFloatingPoint, kOther
-};
-
-// KindOf<T>::value is the kind of type T.
-template <typename T> struct KindOf {
-  enum { value = kOther };  // The default kind.
-};
-
-// This macro declares that the kind of 'type' is 'kind'.
-#define GMOCK_DECLARE_KIND_(type, kind) \
-  template <> struct KindOf<type> { enum { value = kind }; }
-
-GMOCK_DECLARE_KIND_(bool, kBool);
-
-// All standard integer types.
-GMOCK_DECLARE_KIND_(char, kInteger);
-GMOCK_DECLARE_KIND_(signed char, kInteger);
-GMOCK_DECLARE_KIND_(unsigned char, kInteger);
-GMOCK_DECLARE_KIND_(short, kInteger);  // NOLINT
-GMOCK_DECLARE_KIND_(unsigned short, kInteger);  // NOLINT
-GMOCK_DECLARE_KIND_(int, kInteger);
-GMOCK_DECLARE_KIND_(unsigned int, kInteger);
-GMOCK_DECLARE_KIND_(long, kInteger);  // NOLINT
-GMOCK_DECLARE_KIND_(unsigned long, kInteger);  // NOLINT
-
-#if GMOCK_WCHAR_T_IS_NATIVE_
-GMOCK_DECLARE_KIND_(wchar_t, kInteger);
-#endif
-
-// Non-standard integer types.
-GMOCK_DECLARE_KIND_(Int64, kInteger);
-GMOCK_DECLARE_KIND_(UInt64, kInteger);
-
-// All standard floating-point types.
-GMOCK_DECLARE_KIND_(float, kFloatingPoint);
-GMOCK_DECLARE_KIND_(double, kFloatingPoint);
-GMOCK_DECLARE_KIND_(long double, kFloatingPoint);
-
-#undef GMOCK_DECLARE_KIND_
-
-// Evaluates to the kind of 'type'.
-#define GMOCK_KIND_OF_(type) \
-  static_cast< ::testing::internal::TypeKind>( \
-      ::testing::internal::KindOf<type>::value)
-
-// Evaluates to true if and only if integer type T is signed.
-#define GMOCK_IS_SIGNED_(T) (static_cast<T>(-1) < 0)
-
-// LosslessArithmeticConvertibleImpl<kFromKind, From, kToKind, To>::value
-// is true if and only if arithmetic type From can be losslessly converted to
-// arithmetic type To.
-//
-// It's the user's responsibility to ensure that both From and To are
-// raw (i.e. has no CV modifier, is not a pointer, and is not a
-// reference) built-in arithmetic types, kFromKind is the kind of
-// From, and kToKind is the kind of To; the value is
-// implementation-defined when the above pre-condition is violated.
-template <TypeKind kFromKind, typename From, TypeKind kToKind, typename To>
-struct LosslessArithmeticConvertibleImpl : public std::false_type {};
-
-// Converting bool to bool is lossless.
-template <>
-struct LosslessArithmeticConvertibleImpl<kBool, bool, kBool, bool>
-    : public std::true_type {};
-
-// Converting bool to any integer type is lossless.
-template <typename To>
-struct LosslessArithmeticConvertibleImpl<kBool, bool, kInteger, To>
-    : public std::true_type {};
-
-// Converting bool to any floating-point type is lossless.
-template <typename To>
-struct LosslessArithmeticConvertibleImpl<kBool, bool, kFloatingPoint, To>
-    : public std::true_type {};
-
-// Converting an integer to bool is lossy.
-template <typename From>
-struct LosslessArithmeticConvertibleImpl<kInteger, From, kBool, bool>
-    : public std::false_type {};
-
-// Converting an integer to another non-bool integer is lossless
-// if and only if the target type's range encloses the source type's range.
-template <typename From, typename To>
-struct LosslessArithmeticConvertibleImpl<kInteger, From, kInteger, To>
-    : public bool_constant<
-      // When converting from a smaller size to a larger size, we are
-      // fine as long as we are not converting from signed to unsigned.
-      ((sizeof(From) < sizeof(To)) &&
-       (!GMOCK_IS_SIGNED_(From) || GMOCK_IS_SIGNED_(To))) ||
-      // When converting between the same size, the signedness must match.
-      ((sizeof(From) == sizeof(To)) &&
-       (GMOCK_IS_SIGNED_(From) == GMOCK_IS_SIGNED_(To)))> {};  // NOLINT
-
-#undef GMOCK_IS_SIGNED_
-
-// Converting an integer to a floating-point type may be lossy, since
-// the format of a floating-point number is implementation-defined.
-template <typename From, typename To>
-struct LosslessArithmeticConvertibleImpl<kInteger, From, kFloatingPoint, To>
-    : public std::false_type {};
-
-// Converting a floating-point to bool is lossy.
-template <typename From>
-struct LosslessArithmeticConvertibleImpl<kFloatingPoint, From, kBool, bool>
-    : public std::false_type {};
-
-// Converting a floating-point to an integer is lossy.
-template <typename From, typename To>
-struct LosslessArithmeticConvertibleImpl<kFloatingPoint, From, kInteger, To>
-    : public std::false_type {};
-
-// Converting a floating-point to another floating-point is lossless
-// if and only if the target type is at least as big as the source type.
-template <typename From, typename To>
-struct LosslessArithmeticConvertibleImpl<
-  kFloatingPoint, From, kFloatingPoint, To>
-    : public bool_constant<sizeof(From) <= sizeof(To)> {};  // NOLINT
-
-// LosslessArithmeticConvertible<From, To>::value is true if and only if
-// arithmetic type From can be losslessly converted to arithmetic type To.
-//
-// It's the user's responsibility to ensure that both From and To are
-// raw (i.e. has no CV modifier, is not a pointer, and is not a
-// reference) built-in arithmetic types; the value is
-// implementation-defined when the above pre-condition is violated.
-template <typename From, typename To>
-struct LosslessArithmeticConvertible
-    : public LosslessArithmeticConvertibleImpl<
-  GMOCK_KIND_OF_(From), From, GMOCK_KIND_OF_(To), To> {};  // NOLINT
-
-// This interface knows how to report a Google Mock failure (either
-// non-fatal or fatal).
-class FailureReporterInterface {
- public:
-  // The type of a failure (either non-fatal or fatal).
-  enum FailureType {
-    kNonfatal, kFatal
-  };
-
-  virtual ~FailureReporterInterface() {}
-
-  // Reports a failure that occurred at the given source file location.
-  virtual void ReportFailure(FailureType type, const char* file, int line,
-                             const std::string& message) = 0;
-};
-
-// Returns the failure reporter used by Google Mock.
-GTEST_API_ FailureReporterInterface* GetFailureReporter();
-
-// Asserts that condition is true; aborts the process with the given
-// message if condition is false.  We cannot use LOG(FATAL) or CHECK()
-// as Google Mock might be used to mock the log sink itself.  We
-// inline this function to prevent it from showing up in the stack
-// trace.
-inline void Assert(bool condition, const char* file, int line,
-                   const std::string& msg) {
-  if (!condition) {
-    GetFailureReporter()->ReportFailure(FailureReporterInterface::kFatal,
-                                        file, line, msg);
-  }
-}
-inline void Assert(bool condition, const char* file, int line) {
-  Assert(condition, file, line, "Assertion failed.");
-}
-
-// Verifies that condition is true; generates a non-fatal failure if
-// condition is false.
-inline void Expect(bool condition, const char* file, int line,
-                   const std::string& msg) {
-  if (!condition) {
-    GetFailureReporter()->ReportFailure(FailureReporterInterface::kNonfatal,
-                                        file, line, msg);
-  }
-}
-inline void Expect(bool condition, const char* file, int line) {
-  Expect(condition, file, line, "Expectation failed.");
-}
-
-// Severity level of a log.
-enum LogSeverity {
-  kInfo = 0,
-  kWarning = 1
-};
-
-// Valid values for the --gmock_verbose flag.
-
-// All logs (informational and warnings) are printed.
-const char kInfoVerbosity[] = "info";
-// Only warnings are printed.
-const char kWarningVerbosity[] = "warning";
-// No logs are printed.
-const char kErrorVerbosity[] = "error";
-
-// Returns true if and only if a log with the given severity is visible
-// according to the --gmock_verbose flag.
-GTEST_API_ bool LogIsVisible(LogSeverity severity);
-
-// Prints the given message to stdout if and only if 'severity' >= the level
-// specified by the --gmock_verbose flag.  If stack_frames_to_skip >=
-// 0, also prints the stack trace excluding the top
-// stack_frames_to_skip frames.  In opt mode, any positive
-// stack_frames_to_skip is treated as 0, since we don't know which
-// function calls will be inlined by the compiler and need to be
-// conservative.
-GTEST_API_ void Log(LogSeverity severity, const std::string& message,
-                    int stack_frames_to_skip);
-
-// A marker class that is used to resolve parameterless expectations to the
-// correct overload. This must not be instantiable, to prevent client code from
-// accidentally resolving to the overload; for example:
-//
-//    ON_CALL(mock, Method({}, nullptr))...
-//
-class WithoutMatchers {
- private:
-  WithoutMatchers() {}
-  friend GTEST_API_ WithoutMatchers GetWithoutMatchers();
-};
-
-// Internal use only: access the singleton instance of WithoutMatchers.
-GTEST_API_ WithoutMatchers GetWithoutMatchers();
-
-// Type traits.
-
-// Disable MSVC warnings for infinite recursion, since in this case the
-// the recursion is unreachable.
-#ifdef _MSC_VER
-# pragma warning(push)
-# pragma warning(disable:4717)
-#endif
-
-// Invalid<T>() is usable as an expression of type T, but will terminate
-// the program with an assertion failure if actually run.  This is useful
-// when a value of type T is needed for compilation, but the statement
-// will not really be executed (or we don't care if the statement
-// crashes).
-template <typename T>
-inline T Invalid() {
-  Assert(false, "", -1, "Internal error: attempt to return invalid value");
-  // This statement is unreachable, and would never terminate even if it
-  // could be reached. It is provided only to placate compiler warnings
-  // about missing return statements.
-  return Invalid<T>();
-}
-
-#ifdef _MSC_VER
-# pragma warning(pop)
-#endif
-
-// Given a raw type (i.e. having no top-level reference or const
-// modifier) RawContainer that's either an STL-style container or a
-// native array, class StlContainerView<RawContainer> has the
-// following members:
-//
-//   - type is a type that provides an STL-style container view to
-//     (i.e. implements the STL container concept for) RawContainer;
-//   - const_reference is a type that provides a reference to a const
-//     RawContainer;
-//   - ConstReference(raw_container) returns a const reference to an STL-style
-//     container view to raw_container, which is a RawContainer.
-//   - Copy(raw_container) returns an STL-style container view of a
-//     copy of raw_container, which is a RawContainer.
-//
-// This generic version is used when RawContainer itself is already an
-// STL-style container.
-template <class RawContainer>
-class StlContainerView {
- public:
-  typedef RawContainer type;
-  typedef const type& const_reference;
-
-  static const_reference ConstReference(const RawContainer& container) {
-    static_assert(!std::is_const<RawContainer>::value,
-                  "RawContainer type must not be const");
-    return container;
-  }
-  static type Copy(const RawContainer& container) { return container; }
-};
-
-// This specialization is used when RawContainer is a native array type.
-template <typename Element, size_t N>
-class StlContainerView<Element[N]> {
- public:
-  typedef typename std::remove_const<Element>::type RawElement;
-  typedef internal::NativeArray<RawElement> type;
-  // NativeArray<T> can represent a native array either by value or by
-  // reference (selected by a constructor argument), so 'const type'
-  // can be used to reference a const native array.  We cannot
-  // 'typedef const type& const_reference' here, as that would mean
-  // ConstReference() has to return a reference to a local variable.
-  typedef const type const_reference;
-
-  static const_reference ConstReference(const Element (&array)[N]) {
-    static_assert(std::is_same<Element, RawElement>::value,
-                  "Element type must not be const");
-    return type(array, N, RelationToSourceReference());
-  }
-  static type Copy(const Element (&array)[N]) {
-    return type(array, N, RelationToSourceCopy());
-  }
-};
-
-// This specialization is used when RawContainer is a native array
-// represented as a (pointer, size) tuple.
-template <typename ElementPointer, typename Size>
-class StlContainerView< ::std::tuple<ElementPointer, Size> > {
- public:
-  typedef typename std::remove_const<
-      typename internal::PointeeOf<ElementPointer>::type>::type RawElement;
-  typedef internal::NativeArray<RawElement> type;
-  typedef const type const_reference;
-
-  static const_reference ConstReference(
-      const ::std::tuple<ElementPointer, Size>& array) {
-    return type(std::get<0>(array), std::get<1>(array),
-                RelationToSourceReference());
-  }
-  static type Copy(const ::std::tuple<ElementPointer, Size>& array) {
-    return type(std::get<0>(array), std::get<1>(array), RelationToSourceCopy());
-  }
-};
-
-// The following specialization prevents the user from instantiating
-// StlContainer with a reference type.
-template <typename T> class StlContainerView<T&>;
-
-// A type transform to remove constness from the first part of a pair.
-// Pairs like that are used as the value_type of associative containers,
-// and this transform produces a similar but assignable pair.
-template <typename T>
-struct RemoveConstFromKey {
-  typedef T type;
-};
-
-// Partially specialized to remove constness from std::pair<const K, V>.
-template <typename K, typename V>
-struct RemoveConstFromKey<std::pair<const K, V> > {
-  typedef std::pair<K, V> type;
-};
-
-// Emit an assertion failure due to incorrect DoDefault() usage. Out-of-lined to
-// reduce code size.
-GTEST_API_ void IllegalDoDefault(const char* file, int line);
-
-template <typename F, typename Tuple, size_t... Idx>
-auto ApplyImpl(F&& f, Tuple&& args, IndexSequence<Idx...>) -> decltype(
-    std::forward<F>(f)(std::get<Idx>(std::forward<Tuple>(args))...)) {
-  return std::forward<F>(f)(std::get<Idx>(std::forward<Tuple>(args))...);
-}
-
-// Apply the function to a tuple of arguments.
-template <typename F, typename Tuple>
-auto Apply(F&& f, Tuple&& args)
-    -> decltype(ApplyImpl(std::forward<F>(f), std::forward<Tuple>(args),
-                          MakeIndexSequence<std::tuple_size<Tuple>::value>())) {
-  return ApplyImpl(std::forward<F>(f), std::forward<Tuple>(args),
-                   MakeIndexSequence<std::tuple_size<Tuple>::value>());
-}
-
-// Template struct Function<F>, where F must be a function type, contains
-// the following typedefs:
-//
-//   Result:               the function's return type.
-//   Arg<N>:               the type of the N-th argument, where N starts with 0.
-//   ArgumentTuple:        the tuple type consisting of all parameters of F.
-//   ArgumentMatcherTuple: the tuple type consisting of Matchers for all
-//                         parameters of F.
-//   MakeResultVoid:       the function type obtained by substituting void
-//                         for the return type of F.
-//   MakeResultIgnoredValue:
-//                         the function type obtained by substituting Something
-//                         for the return type of F.
-template <typename T>
-struct Function;
-
-template <typename R, typename... Args>
-struct Function<R(Args...)> {
-  using Result = R;
-  static constexpr size_t ArgumentCount = sizeof...(Args);
-  template <size_t I>
-  using Arg = ElemFromList<I, typename MakeIndexSequence<sizeof...(Args)>::type,
-                           Args...>;
-  using ArgumentTuple = std::tuple<Args...>;
-  using ArgumentMatcherTuple = std::tuple<Matcher<Args>...>;
-  using MakeResultVoid = void(Args...);
-  using MakeResultIgnoredValue = IgnoredValue(Args...);
-};
-
-template <typename R, typename... Args>
-constexpr size_t Function<R(Args...)>::ArgumentCount;
-
-#ifdef _MSC_VER
-# pragma warning(pop)
-#endif
-
-}  // namespace internal
-}  // namespace testing
-
-#endif  // GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_INTERNAL_UTILS_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/internal/gmock-port.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/internal/gmock-port.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/internal/gmock-port.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/internal/gmock-port.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,87 +0,0 @@
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-//
-// Low-level types and utilities for porting Google Mock to various
-// platforms.  All macros ending with _ and symbols defined in an
-// internal namespace are subject to change without notice.  Code
-// outside Google Mock MUST NOT USE THEM DIRECTLY.  Macros that don't
-// end with _ are part of Google Mock's public API and can be used by
-// code outside Google Mock.
-
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_
-#define GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_
-
-#include <assert.h>
-#include <stdlib.h>
-#include <iostream>
-
-// Most of the utilities needed for porting Google Mock are also
-// required for Google Test and are defined in gtest-port.h.
-//
-// Note to maintainers: to reduce code duplication, prefer adding
-// portability utilities to Google Test's gtest-port.h instead of
-// here, as Google Mock depends on Google Test.  Only add a utility
-// here if it's truly specific to Google Mock.
-
-#include "gtest/internal/gtest-port.h"
-#include "gmock/internal/custom/gmock-port.h"
-
-// For MS Visual C++, check the compiler version. At least VS 2015 is
-// required to compile Google Mock.
-#if defined(_MSC_VER) && _MSC_VER < 1900
-# error "At least Visual C++ 2015 (14.0) is required to compile Google Mock."
-#endif
-
-// Macro for referencing flags.  This is public as we want the user to
-// use this syntax to reference Google Mock flags.
-#define GMOCK_FLAG(name) FLAGS_gmock_##name
-
-#if !defined(GMOCK_DECLARE_bool_)
-
-// Macros for declaring flags.
-# define GMOCK_DECLARE_bool_(name) extern GTEST_API_ bool GMOCK_FLAG(name)
-# define GMOCK_DECLARE_int32_(name) \
-    extern GTEST_API_ ::testing::internal::Int32 GMOCK_FLAG(name)
-# define GMOCK_DECLARE_string_(name) \
-    extern GTEST_API_ ::std::string GMOCK_FLAG(name)
-
-// Macros for defining flags.
-# define GMOCK_DEFINE_bool_(name, default_val, doc) \
-    GTEST_API_ bool GMOCK_FLAG(name) = (default_val)
-# define GMOCK_DEFINE_int32_(name, default_val, doc) \
-    GTEST_API_ ::testing::internal::Int32 GMOCK_FLAG(name) = (default_val)
-# define GMOCK_DEFINE_string_(name, default_val, doc) \
-    GTEST_API_ ::std::string GMOCK_FLAG(name) = (default_val)
-
-#endif  // !defined(GMOCK_DECLARE_bool_)
-
-#endif  // GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/internal/gmock-pp.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/internal/gmock-pp.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/internal/gmock-pp.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/include/gmock/internal/gmock-pp.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,317 +0,0 @@
-#ifndef THIRD_PARTY_GOOGLETEST_GOOGLEMOCK_INCLUDE_GMOCK_PP_H_
-#define THIRD_PARTY_GOOGLETEST_GOOGLEMOCK_INCLUDE_GMOCK_PP_H_
-
-#undef GMOCK_PP_INTERNAL_USE_MSVC
-#if defined(__clang__)
-#define GMOCK_PP_INTERNAL_USE_MSVC 0
-#elif defined(_MSC_VER)
-// TODO(iserna): Also verify tradional versus comformant preprocessor.
-static_assert(
-    _MSC_VER >= 1900,
-    "MSVC version not supported. There is support for MSVC 14.0 and above.");
-#define GMOCK_PP_INTERNAL_USE_MSVC 1
-#else
-#define GMOCK_PP_INTERNAL_USE_MSVC 0
-#endif
-
-// Expands and concatenates the arguments. Constructed macros reevaluate.
-#define GMOCK_PP_CAT(_1, _2) GMOCK_PP_INTERNAL_CAT(_1, _2)
-
-// Expands and stringifies the only argument.
-#define GMOCK_PP_STRINGIZE(...) GMOCK_PP_INTERNAL_STRINGIZE(__VA_ARGS__)
-
-// Returns empty. Given a variadic number of arguments.
-#define GMOCK_PP_EMPTY(...)
-
-// Returns a comma. Given a variadic number of arguments.
-#define GMOCK_PP_COMMA(...) ,
-
-// Returns the only argument.
-#define GMOCK_PP_IDENTITY(_1) _1
-
-// MSVC preprocessor collapses __VA_ARGS__ in a single argument, we use a
-// CAT-like directive to force correct evaluation. Each macro has its own.
-#if GMOCK_PP_INTERNAL_USE_MSVC
-
-// Evaluates to the number of arguments after expansion.
-//
-//   #define PAIR x, y
-//
-//   GMOCK_PP_NARG() => 1
-//   GMOCK_PP_NARG(x) => 1
-//   GMOCK_PP_NARG(x, y) => 2
-//   GMOCK_PP_NARG(PAIR) => 2
-//
-// Requires: the number of arguments after expansion is at most 15.
-#define GMOCK_PP_NARG(...)                                                    \
-  GMOCK_PP_INTERNAL_NARG_CAT(                                                 \
-      GMOCK_PP_INTERNAL_INTERNAL_16TH(__VA_ARGS__, 15, 14, 13, 12, 11, 10, 9, \
-                                      8, 7, 6, 5, 4, 3, 2, 1), )
-
-// Returns 1 if the expansion of arguments has an unprotected comma. Otherwise
-// returns 0. Requires no more than 15 unprotected commas.
-#define GMOCK_PP_HAS_COMMA(...)                                               \
-  GMOCK_PP_INTERNAL_HAS_COMMA_CAT(                                            \
-      GMOCK_PP_INTERNAL_INTERNAL_16TH(__VA_ARGS__, 1, 1, 1, 1, 1, 1, 1, 1, 1, \
-                                      1, 1, 1, 1, 1, 0), )
-// Returns the first argument.
-#define GMOCK_PP_HEAD(...) \
-  GMOCK_PP_INTERNAL_HEAD_CAT(GMOCK_PP_INTERNAL_HEAD(__VA_ARGS__), )
-
-// Returns the tail. A variadic list of all arguments minus the first. Requires
-// at least one argument.
-#define GMOCK_PP_TAIL(...) \
-  GMOCK_PP_INTERNAL_TAIL_CAT(GMOCK_PP_INTERNAL_TAIL(__VA_ARGS__), )
-
-// Calls CAT(_Macro, NARG(__VA_ARGS__))(__VA_ARGS__)
-#define GMOCK_PP_VARIADIC_CALL(_Macro, ...) \
-  GMOCK_PP_INTERNAL_VARIADIC_CALL_CAT(      \
-      GMOCK_PP_CAT(_Macro, GMOCK_PP_NARG(__VA_ARGS__))(__VA_ARGS__), )
-
-#else  // GMOCK_PP_INTERNAL_USE_MSVC
-
-#define GMOCK_PP_NARG(...)                                                   \
-  GMOCK_PP_INTERNAL_INTERNAL_16TH(__VA_ARGS__, 15, 14, 13, 12, 11, 10, 9, 8, \
-                                  7, 6, 5, 4, 3, 2, 1)
-#define GMOCK_PP_HAS_COMMA(...)                                              \
-  GMOCK_PP_INTERNAL_INTERNAL_16TH(__VA_ARGS__, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \
-                                  1, 1, 1, 1, 0)
-#define GMOCK_PP_HEAD(...) GMOCK_PP_INTERNAL_HEAD(__VA_ARGS__)
-#define GMOCK_PP_TAIL(...) GMOCK_PP_INTERNAL_TAIL(__VA_ARGS__)
-#define GMOCK_PP_VARIADIC_CALL(_Macro, ...) \
-  GMOCK_PP_CAT(_Macro, GMOCK_PP_NARG(__VA_ARGS__))(__VA_ARGS__)
-
-#endif  // GMOCK_PP_INTERNAL_USE_MSVC
-
-// If the arguments after expansion have no tokens, evaluates to `1`. Otherwise
-// evaluates to `0`.
-//
-// Requires: * the number of arguments after expansion is at most 15.
-//           * If the argument is a macro, it must be able to be called with one
-//             argument.
-//
-// Implementation details:
-//
-// There is one case when it generates a compile error: if the argument is macro
-// that cannot be called with one argument.
-//
-//   #define M(a, b)  // it doesn't matter what it expands to
-//
-//   // Expected: expands to `0`.
-//   // Actual: compile error.
-//   GMOCK_PP_IS_EMPTY(M)
-//
-// There are 4 cases tested:
-//
-// * __VA_ARGS__ possible expansion has no unparen'd commas. Expected 0.
-// * __VA_ARGS__ possible expansion is not enclosed in parenthesis. Expected 0.
-// * __VA_ARGS__ possible expansion is not a macro that ()-evaluates to a comma.
-//   Expected 0
-// * __VA_ARGS__ is empty, or has unparen'd commas, or is enclosed in
-//   parenthesis, or is a macro that ()-evaluates to comma. Expected 1.
-//
-// We trigger detection on '0001', i.e. on empty.
-#define GMOCK_PP_IS_EMPTY(...)                                               \
-  GMOCK_PP_INTERNAL_IS_EMPTY(GMOCK_PP_HAS_COMMA(__VA_ARGS__),                \
-                             GMOCK_PP_HAS_COMMA(GMOCK_PP_COMMA __VA_ARGS__), \
-                             GMOCK_PP_HAS_COMMA(__VA_ARGS__()),              \
-                             GMOCK_PP_HAS_COMMA(GMOCK_PP_COMMA __VA_ARGS__()))
-
-// Evaluates to _Then if _Cond is 1 and _Else if _Cond is 0.
-#define GMOCK_PP_IF(_Cond, _Then, _Else) \
-  GMOCK_PP_CAT(GMOCK_PP_INTERNAL_IF_, _Cond)(_Then, _Else)
-
-// Evaluates to the number of arguments after expansion. Identifies 'empty' as
-// 0.
-//
-//   #define PAIR x, y
-//
-//   GMOCK_PP_NARG0() => 0
-//   GMOCK_PP_NARG0(x) => 1
-//   GMOCK_PP_NARG0(x, y) => 2
-//   GMOCK_PP_NARG0(PAIR) => 2
-//
-// Requires: * the number of arguments after expansion is at most 15.
-//           * If the argument is a macro, it must be able to be called with one
-//             argument.
-#define GMOCK_PP_NARG0(...) \
-  GMOCK_PP_IF(GMOCK_PP_IS_EMPTY(__VA_ARGS__), 0, GMOCK_PP_NARG(__VA_ARGS__))
-
-// Expands to 1 if the first argument starts with something in parentheses,
-// otherwise to 0.
-#define GMOCK_PP_IS_BEGIN_PARENS(...)                    \
-  GMOCK_PP_INTERNAL_ALTERNATE_HEAD(                      \
-      GMOCK_PP_CAT(GMOCK_PP_INTERNAL_IBP_IS_VARIADIC_R_, \
-                   GMOCK_PP_INTERNAL_IBP_IS_VARIADIC_C __VA_ARGS__))
-
-// Expands to 1 is there is only one argument and it is enclosed in parentheses.
-#define GMOCK_PP_IS_ENCLOSED_PARENS(...)             \
-  GMOCK_PP_IF(GMOCK_PP_IS_BEGIN_PARENS(__VA_ARGS__), \
-              GMOCK_PP_IS_EMPTY(GMOCK_PP_EMPTY __VA_ARGS__), 0)
-
-// Remove the parens, requires GMOCK_PP_IS_ENCLOSED_PARENS(args) => 1.
-#define GMOCK_PP_REMOVE_PARENS(...) GMOCK_PP_INTERNAL_REMOVE_PARENS __VA_ARGS__
-
-// Expands to _Macro(0, _Data, e1) _Macro(1, _Data, e2) ... _Macro(K -1, _Data,
-// eK) as many of GMOCK_INTERNAL_NARG0 _Tuple.
-// Requires: * |_Macro| can be called with 3 arguments.
-//           * |_Tuple| expansion has no more than 15 elements.
-#define GMOCK_PP_FOR_EACH(_Macro, _Data, _Tuple)                        \
-  GMOCK_PP_CAT(GMOCK_PP_INTERNAL_FOR_EACH_IMPL_, GMOCK_PP_NARG0 _Tuple) \
-  (0, _Macro, _Data, _Tuple)
-
-// Expands to _Macro(0, _Data, ) _Macro(1, _Data, ) ... _Macro(K - 1, _Data, )
-// Empty if _K = 0.
-// Requires: * |_Macro| can be called with 3 arguments.
-//           * |_K| literal between 0 and 15
-#define GMOCK_PP_REPEAT(_Macro, _Data, _N)           \
-  GMOCK_PP_CAT(GMOCK_PP_INTERNAL_FOR_EACH_IMPL_, _N) \
-  (0, _Macro, _Data, GMOCK_PP_INTENRAL_EMPTY_TUPLE)
-
-// Increments the argument, requires the argument to be between 0 and 15.
-#define GMOCK_PP_INC(_i) GMOCK_PP_CAT(GMOCK_PP_INTERNAL_INC_, _i)
-
-// Returns comma if _i != 0. Requires _i to be between 0 and 15.
-#define GMOCK_PP_COMMA_IF(_i) GMOCK_PP_CAT(GMOCK_PP_INTERNAL_COMMA_IF_, _i)
-
-// Internal details follow. Do not use any of these symbols outside of this
-// file or we will break your code.
-#define GMOCK_PP_INTENRAL_EMPTY_TUPLE (, , , , , , , , , , , , , , , )
-#define GMOCK_PP_INTERNAL_CAT(_1, _2) _1##_2
-#define GMOCK_PP_INTERNAL_STRINGIZE(...) #__VA_ARGS__
-#define GMOCK_PP_INTERNAL_INTERNAL_16TH(_1, _2, _3, _4, _5, _6, _7, _8, _9, \
-                                        _10, _11, _12, _13, _14, _15, _16,  \
-                                        ...)                                \
-  _16
-#define GMOCK_PP_INTERNAL_CAT_5(_1, _2, _3, _4, _5) _1##_2##_3##_4##_5
-#define GMOCK_PP_INTERNAL_IS_EMPTY(_1, _2, _3, _4)                             \
-  GMOCK_PP_HAS_COMMA(GMOCK_PP_INTERNAL_CAT_5(GMOCK_PP_INTERNAL_IS_EMPTY_CASE_, \
-                                             _1, _2, _3, _4))
-#define GMOCK_PP_INTERNAL_IS_EMPTY_CASE_0001 ,
-#define GMOCK_PP_INTERNAL_IF_1(_Then, _Else) _Then
-#define GMOCK_PP_INTERNAL_IF_0(_Then, _Else) _Else
-#define GMOCK_PP_INTERNAL_HEAD(_1, ...) _1
-#define GMOCK_PP_INTERNAL_TAIL(_1, ...) __VA_ARGS__
-
-#if GMOCK_PP_INTERNAL_USE_MSVC
-#define GMOCK_PP_INTERNAL_NARG_CAT(_1, _2) GMOCK_PP_INTERNAL_NARG_CAT_I(_1, _2)
-#define GMOCK_PP_INTERNAL_HEAD_CAT(_1, _2) GMOCK_PP_INTERNAL_HEAD_CAT_I(_1, _2)
-#define GMOCK_PP_INTERNAL_HAS_COMMA_CAT(_1, _2) \
-  GMOCK_PP_INTERNAL_HAS_COMMA_CAT_I(_1, _2)
-#define GMOCK_PP_INTERNAL_TAIL_CAT(_1, _2) GMOCK_PP_INTERNAL_TAIL_CAT_I(_1, _2)
-#define GMOCK_PP_INTERNAL_VARIADIC_CALL_CAT(_1, _2) \
-  GMOCK_PP_INTERNAL_VARIADIC_CALL_CAT_I(_1, _2)
-#define GMOCK_PP_INTERNAL_NARG_CAT_I(_1, _2) _1##_2
-#define GMOCK_PP_INTERNAL_HEAD_CAT_I(_1, _2) _1##_2
-#define GMOCK_PP_INTERNAL_HAS_COMMA_CAT_I(_1, _2) _1##_2
-#define GMOCK_PP_INTERNAL_TAIL_CAT_I(_1, _2) _1##_2
-#define GMOCK_PP_INTERNAL_VARIADIC_CALL_CAT_I(_1, _2) _1##_2
-#define GMOCK_PP_INTERNAL_ALTERNATE_HEAD(...) \
-  GMOCK_PP_INTERNAL_ALTERNATE_HEAD_CAT(GMOCK_PP_HEAD(__VA_ARGS__), )
-#define GMOCK_PP_INTERNAL_ALTERNATE_HEAD_CAT(_1, _2) \
-  GMOCK_PP_INTERNAL_ALTERNATE_HEAD_CAT_I(_1, _2)
-#define GMOCK_PP_INTERNAL_ALTERNATE_HEAD_CAT_I(_1, _2) _1##_2
-#else  // GMOCK_PP_INTERNAL_USE_MSVC
-#define GMOCK_PP_INTERNAL_ALTERNATE_HEAD(...) GMOCK_PP_HEAD(__VA_ARGS__)
-#endif  // GMOCK_PP_INTERNAL_USE_MSVC
-
-#define GMOCK_PP_INTERNAL_IBP_IS_VARIADIC_C(...) 1 _
-#define GMOCK_PP_INTERNAL_IBP_IS_VARIADIC_R_1 1,
-#define GMOCK_PP_INTERNAL_IBP_IS_VARIADIC_R_GMOCK_PP_INTERNAL_IBP_IS_VARIADIC_C \
-  0,
-#define GMOCK_PP_INTERNAL_REMOVE_PARENS(...) __VA_ARGS__
-#define GMOCK_PP_INTERNAL_INC_0 1
-#define GMOCK_PP_INTERNAL_INC_1 2
-#define GMOCK_PP_INTERNAL_INC_2 3
-#define GMOCK_PP_INTERNAL_INC_3 4
-#define GMOCK_PP_INTERNAL_INC_4 5
-#define GMOCK_PP_INTERNAL_INC_5 6
-#define GMOCK_PP_INTERNAL_INC_6 7
-#define GMOCK_PP_INTERNAL_INC_7 8
-#define GMOCK_PP_INTERNAL_INC_8 9
-#define GMOCK_PP_INTERNAL_INC_9 10
-#define GMOCK_PP_INTERNAL_INC_10 11
-#define GMOCK_PP_INTERNAL_INC_11 12
-#define GMOCK_PP_INTERNAL_INC_12 13
-#define GMOCK_PP_INTERNAL_INC_13 14
-#define GMOCK_PP_INTERNAL_INC_14 15
-#define GMOCK_PP_INTERNAL_INC_15 16
-#define GMOCK_PP_INTERNAL_COMMA_IF_0
-#define GMOCK_PP_INTERNAL_COMMA_IF_1 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_2 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_3 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_4 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_5 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_6 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_7 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_8 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_9 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_10 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_11 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_12 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_13 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_14 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_15 ,
-#define GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, _element) \
-  _Macro(_i, _Data, _element)
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_0(_i, _Macro, _Data, _Tuple)
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_1(_i, _Macro, _Data, _Tuple) \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple)
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_2(_i, _Macro, _Data, _Tuple)    \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_1(GMOCK_PP_INC(_i), _Macro, _Data,    \
-                                    (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_3(_i, _Macro, _Data, _Tuple)    \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_2(GMOCK_PP_INC(_i), _Macro, _Data,    \
-                                    (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_4(_i, _Macro, _Data, _Tuple)    \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_3(GMOCK_PP_INC(_i), _Macro, _Data,    \
-                                    (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_5(_i, _Macro, _Data, _Tuple)    \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_4(GMOCK_PP_INC(_i), _Macro, _Data,    \
-                                    (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_6(_i, _Macro, _Data, _Tuple)    \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_5(GMOCK_PP_INC(_i), _Macro, _Data,    \
-                                    (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_7(_i, _Macro, _Data, _Tuple)    \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_6(GMOCK_PP_INC(_i), _Macro, _Data,    \
-                                    (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_8(_i, _Macro, _Data, _Tuple)    \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_7(GMOCK_PP_INC(_i), _Macro, _Data,    \
-                                    (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_9(_i, _Macro, _Data, _Tuple)    \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_8(GMOCK_PP_INC(_i), _Macro, _Data,    \
-                                    (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_10(_i, _Macro, _Data, _Tuple)   \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_9(GMOCK_PP_INC(_i), _Macro, _Data,    \
-                                    (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_11(_i, _Macro, _Data, _Tuple)   \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_10(GMOCK_PP_INC(_i), _Macro, _Data,   \
-                                     (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_12(_i, _Macro, _Data, _Tuple)   \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_11(GMOCK_PP_INC(_i), _Macro, _Data,   \
-                                     (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_13(_i, _Macro, _Data, _Tuple)   \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_12(GMOCK_PP_INC(_i), _Macro, _Data,   \
-                                     (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_14(_i, _Macro, _Data, _Tuple)   \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_13(GMOCK_PP_INC(_i), _Macro, _Data,   \
-                                     (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_15(_i, _Macro, _Data, _Tuple)   \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_14(GMOCK_PP_INC(_i), _Macro, _Data,   \
-                                     (GMOCK_PP_TAIL _Tuple))
-
-#endif  // THIRD_PARTY_GOOGLETEST_GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PP_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/LICENSE mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/LICENSE
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/LICENSE	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/LICENSE	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-Copyright 2008, Google Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/README.md mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/README.md
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/README.md	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-# Googletest Mocking (gMock) Framework
-
-### Overview
-
-Google's framework for writing and using C++ mock classes. It can help you
-derive better designs of your system and write better tests.
-
-It is inspired by:
-
-*   [jMock](http://www.jmock.org/),
-*   [EasyMock](http://www.easymock.org/), and
-*   [Hamcrest](http://code.google.com/p/hamcrest/),
-
-and designed with C++'s specifics in mind.
-
-gMock:
-
--   provides a declarative syntax for defining mocks,
--   can define partial (hybrid) mocks, which are a cross of real and mock
-    objects,
--   handles functions of arbitrary types and overloaded functions,
--   comes with a rich set of matchers for validating function arguments,
--   uses an intuitive syntax for controlling the behavior of a mock,
--   does automatic verification of expectations (no record-and-replay needed),
--   allows arbitrary (partial) ordering constraints on function calls to be
-    expressed,
--   lets a user extend it by defining new matchers and actions.
--   does not use exceptions, and
--   is easy to learn and use.
-
-Details and examples can be found here:
-
-*   [gMock for Dummies](docs/for_dummies.md)
-*   [Legacy gMock FAQ](docs/gmock_faq.md)
-*   [gMock Cookbook](docs/cook_book.md)
-*   [gMock Cheat Sheet](docs/cheat_sheet.md)
-
-Please note that code under scripts/generator/ is from the [cppclean
-project](http://code.google.com/p/cppclean/) and under the Apache
-License, which is different from Google Mock's license.
-
-Google Mock is a part of
-[Google Test C++ testing framework](http://github.com/google/googletest/) and a
-subject to the same requirements.
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/src/gmock-all.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/src/gmock-all.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/src/gmock-all.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/src/gmock-all.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-//
-// Google C++ Mocking Framework (Google Mock)
-//
-// This file #includes all Google Mock implementation .cc files.  The
-// purpose is to allow a user to build Google Mock by compiling this
-// file alone.
-
-// This line ensures that gmock.h can be compiled on its own, even
-// when it's fused.
-#include "gmock/gmock.h"
-
-// The following lines pull in the real gmock *.cc files.
-#include "src/gmock-cardinalities.cc"
-#include "src/gmock-internal-utils.cc"
-#include "src/gmock-matchers.cc"
-#include "src/gmock-spec-builders.cc"
-#include "src/gmock.cc"
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/src/gmock-cardinalities.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/src/gmock-cardinalities.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/src/gmock-cardinalities.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/src/gmock-cardinalities.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,155 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file implements cardinalities.
-
-#include "gmock/gmock-cardinalities.h"
-
-#include <limits.h>
-#include <ostream>  // NOLINT
-#include <sstream>
-#include <string>
-#include "gmock/internal/gmock-internal-utils.h"
-#include "gtest/gtest.h"
-
-namespace testing {
-
-namespace {
-
-// Implements the Between(m, n) cardinality.
-class BetweenCardinalityImpl : public CardinalityInterface {
- public:
-  BetweenCardinalityImpl(int min, int max)
-      : min_(min >= 0 ? min : 0),
-        max_(max >= min_ ? max : min_) {
-    std::stringstream ss;
-    if (min < 0) {
-      ss << "The invocation lower bound must be >= 0, "
-         << "but is actually " << min << ".";
-      internal::Expect(false, __FILE__, __LINE__, ss.str());
-    } else if (max < 0) {
-      ss << "The invocation upper bound must be >= 0, "
-         << "but is actually " << max << ".";
-      internal::Expect(false, __FILE__, __LINE__, ss.str());
-    } else if (min > max) {
-      ss << "The invocation upper bound (" << max
-         << ") must be >= the invocation lower bound (" << min
-         << ").";
-      internal::Expect(false, __FILE__, __LINE__, ss.str());
-    }
-  }
-
-  // Conservative estimate on the lower/upper bound of the number of
-  // calls allowed.
-  int ConservativeLowerBound() const override { return min_; }
-  int ConservativeUpperBound() const override { return max_; }
-
-  bool IsSatisfiedByCallCount(int call_count) const override {
-    return min_ <= call_count && call_count <= max_;
-  }
-
-  bool IsSaturatedByCallCount(int call_count) const override {
-    return call_count >= max_;
-  }
-
-  void DescribeTo(::std::ostream* os) const override;
-
- private:
-  const int min_;
-  const int max_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(BetweenCardinalityImpl);
-};
-
-// Formats "n times" in a human-friendly way.
-inline std::string FormatTimes(int n) {
-  if (n == 1) {
-    return "once";
-  } else if (n == 2) {
-    return "twice";
-  } else {
-    std::stringstream ss;
-    ss << n << " times";
-    return ss.str();
-  }
-}
-
-// Describes the Between(m, n) cardinality in human-friendly text.
-void BetweenCardinalityImpl::DescribeTo(::std::ostream* os) const {
-  if (min_ == 0) {
-    if (max_ == 0) {
-      *os << "never called";
-    } else if (max_ == INT_MAX) {
-      *os << "called any number of times";
-    } else {
-      *os << "called at most " << FormatTimes(max_);
-    }
-  } else if (min_ == max_) {
-    *os << "called " << FormatTimes(min_);
-  } else if (max_ == INT_MAX) {
-    *os << "called at least " << FormatTimes(min_);
-  } else {
-    // 0 < min_ < max_ < INT_MAX
-    *os << "called between " << min_ << " and " << max_ << " times";
-  }
-}
-
-}  // Unnamed namespace
-
-// Describes the given call count to an ostream.
-void Cardinality::DescribeActualCallCountTo(int actual_call_count,
-                                            ::std::ostream* os) {
-  if (actual_call_count > 0) {
-    *os << "called " << FormatTimes(actual_call_count);
-  } else {
-    *os << "never called";
-  }
-}
-
-// Creates a cardinality that allows at least n calls.
-GTEST_API_ Cardinality AtLeast(int n) { return Between(n, INT_MAX); }
-
-// Creates a cardinality that allows at most n calls.
-GTEST_API_ Cardinality AtMost(int n) { return Between(0, n); }
-
-// Creates a cardinality that allows any number of calls.
-GTEST_API_ Cardinality AnyNumber() { return AtLeast(0); }
-
-// Creates a cardinality that allows between min and max calls.
-GTEST_API_ Cardinality Between(int min, int max) {
-  return Cardinality(new BetweenCardinalityImpl(min, max));
-}
-
-// Creates a cardinality that allows exactly n calls.
-GTEST_API_ Cardinality Exactly(int n) { return Between(n, n); }
-
-}  // namespace testing
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/src/gmock.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/src/gmock.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/src/gmock.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/src/gmock.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,213 +0,0 @@
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-#include "gmock/gmock.h"
-#include "gmock/internal/gmock-port.h"
-
-namespace testing {
-
-GMOCK_DEFINE_bool_(catch_leaked_mocks, true,
-                   "true if and only if Google Mock should report leaked "
-                   "mock objects as failures.");
-
-GMOCK_DEFINE_string_(verbose, internal::kWarningVerbosity,
-                     "Controls how verbose Google Mock's output is."
-                     "  Valid values:\n"
-                     "  info    - prints all messages.\n"
-                     "  warning - prints warnings and errors.\n"
-                     "  error   - prints errors only.");
-
-GMOCK_DEFINE_int32_(default_mock_behavior, 1,
-                    "Controls the default behavior of mocks."
-                    "  Valid values:\n"
-                    "  0 - by default, mocks act as NiceMocks.\n"
-                    "  1 - by default, mocks act as NaggyMocks.\n"
-                    "  2 - by default, mocks act as StrictMocks.");
-
-namespace internal {
-
-// Parses a string as a command line flag.  The string should have the
-// format "--gmock_flag=value".  When def_optional is true, the
-// "=value" part can be omitted.
-//
-// Returns the value of the flag, or NULL if the parsing failed.
-static const char* ParseGoogleMockFlagValue(const char* str,
-                                            const char* flag,
-                                            bool def_optional) {
-  // str and flag must not be NULL.
-  if (str == nullptr || flag == nullptr) return nullptr;
-
-  // The flag must start with "--gmock_".
-  const std::string flag_str = std::string("--gmock_") + flag;
-  const size_t flag_len = flag_str.length();
-  if (strncmp(str, flag_str.c_str(), flag_len) != 0) return nullptr;
-
-  // Skips the flag name.
-  const char* flag_end = str + flag_len;
-
-  // When def_optional is true, it's OK to not have a "=value" part.
-  if (def_optional && (flag_end[0] == '\0')) {
-    return flag_end;
-  }
-
-  // If def_optional is true and there are more characters after the
-  // flag name, or if def_optional is false, there must be a '=' after
-  // the flag name.
-  if (flag_end[0] != '=') return nullptr;
-
-  // Returns the string after "=".
-  return flag_end + 1;
-}
-
-// Parses a string for a Google Mock bool flag, in the form of
-// "--gmock_flag=value".
-//
-// On success, stores the value of the flag in *value, and returns
-// true.  On failure, returns false without changing *value.
-static bool ParseGoogleMockBoolFlag(const char* str, const char* flag,
-                                    bool* value) {
-  // Gets the value of the flag as a string.
-  const char* const value_str = ParseGoogleMockFlagValue(str, flag, true);
-
-  // Aborts if the parsing failed.
-  if (value_str == nullptr) return false;
-
-  // Converts the string value to a bool.
-  *value = !(*value_str == '0' || *value_str == 'f' || *value_str == 'F');
-  return true;
-}
-
-// Parses a string for a Google Mock string flag, in the form of
-// "--gmock_flag=value".
-//
-// On success, stores the value of the flag in *value, and returns
-// true.  On failure, returns false without changing *value.
-template <typename String>
-static bool ParseGoogleMockStringFlag(const char* str, const char* flag,
-                                      String* value) {
-  // Gets the value of the flag as a string.
-  const char* const value_str = ParseGoogleMockFlagValue(str, flag, false);
-
-  // Aborts if the parsing failed.
-  if (value_str == nullptr) return false;
-
-  // Sets *value to the value of the flag.
-  *value = value_str;
-  return true;
-}
-
-static bool ParseGoogleMockIntFlag(const char* str, const char* flag,
-                                   int* value) {
-  // Gets the value of the flag as a string.
-  const char* const value_str = ParseGoogleMockFlagValue(str, flag, true);
-
-  // Aborts if the parsing failed.
-  if (value_str == nullptr) return false;
-
-  // Sets *value to the value of the flag.
-  return ParseInt32(Message() << "The value of flag --" << flag,
-                    value_str, value);
-}
-
-// The internal implementation of InitGoogleMock().
-//
-// The type parameter CharType can be instantiated to either char or
-// wchar_t.
-template <typename CharType>
-void InitGoogleMockImpl(int* argc, CharType** argv) {
-  // Makes sure Google Test is initialized.  InitGoogleTest() is
-  // idempotent, so it's fine if the user has already called it.
-  InitGoogleTest(argc, argv);
-  if (*argc <= 0) return;
-
-  for (int i = 1; i != *argc; i++) {
-    const std::string arg_string = StreamableToString(argv[i]);
-    const char* const arg = arg_string.c_str();
-
-    // Do we see a Google Mock flag?
-    if (ParseGoogleMockBoolFlag(arg, "catch_leaked_mocks",
-                                &GMOCK_FLAG(catch_leaked_mocks)) ||
-        ParseGoogleMockStringFlag(arg, "verbose", &GMOCK_FLAG(verbose)) ||
-        ParseGoogleMockIntFlag(arg, "default_mock_behavior",
-                               &GMOCK_FLAG(default_mock_behavior))) {
-      // Yes.  Shift the remainder of the argv list left by one.  Note
-      // that argv has (*argc + 1) elements, the last one always being
-      // NULL.  The following loop moves the trailing NULL element as
-      // well.
-      for (int j = i; j != *argc; j++) {
-        argv[j] = argv[j + 1];
-      }
-
-      // Decrements the argument count.
-      (*argc)--;
-
-      // We also need to decrement the iterator as we just removed
-      // an element.
-      i--;
-    }
-  }
-}
-
-}  // namespace internal
-
-// Initializes Google Mock.  This must be called before running the
-// tests.  In particular, it parses a command line for the flags that
-// Google Mock recognizes.  Whenever a Google Mock flag is seen, it is
-// removed from argv, and *argc is decremented.
-//
-// No value is returned.  Instead, the Google Mock flag variables are
-// updated.
-//
-// Since Google Test is needed for Google Mock to work, this function
-// also initializes Google Test and parses its flags, if that hasn't
-// been done.
-GTEST_API_ void InitGoogleMock(int* argc, char** argv) {
-  internal::InitGoogleMockImpl(argc, argv);
-}
-
-// This overloaded version can be used in Windows programs compiled in
-// UNICODE mode.
-GTEST_API_ void InitGoogleMock(int* argc, wchar_t** argv) {
-  internal::InitGoogleMockImpl(argc, argv);
-}
-
-// This overloaded version can be used on Arduino/embedded platforms where
-// there is no argc/argv.
-GTEST_API_ void InitGoogleMock() {
-  // Since Arduino doesn't have a command line, fake out the argc/argv arguments
-  int argc = 1;
-  const auto arg0 = "dummy";
-  char* argv0 = const_cast<char*>(arg0);
-  char** argv = &argv0;
-
-  internal::InitGoogleMockImpl(&argc, argv);
-}
-
-}  // namespace testing
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/src/gmock-internal-utils.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/src/gmock-internal-utils.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/src/gmock-internal-utils.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/src/gmock-internal-utils.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,200 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file defines some utilities useful for implementing Google
-// Mock.  They are subject to change without notice, so please DO NOT
-// USE THEM IN USER CODE.
-
-#include "gmock/internal/gmock-internal-utils.h"
-
-#include <ctype.h>
-#include <ostream>  // NOLINT
-#include <string>
-#include "gmock/gmock.h"
-#include "gmock/internal/gmock-port.h"
-#include "gtest/gtest.h"
-
-namespace testing {
-namespace internal {
-
-// Joins a vector of strings as if they are fields of a tuple; returns
-// the joined string.
-GTEST_API_ std::string JoinAsTuple(const Strings& fields) {
-  switch (fields.size()) {
-    case 0:
-      return "";
-    case 1:
-      return fields[0];
-    default:
-      std::string result = "(" + fields[0];
-      for (size_t i = 1; i < fields.size(); i++) {
-        result += ", ";
-        result += fields[i];
-      }
-      result += ")";
-      return result;
-  }
-}
-
-// Converts an identifier name to a space-separated list of lower-case
-// words.  Each maximum substring of the form [A-Za-z][a-z]*|\d+ is
-// treated as one word.  For example, both "FooBar123" and
-// "foo_bar_123" are converted to "foo bar 123".
-GTEST_API_ std::string ConvertIdentifierNameToWords(const char* id_name) {
-  std::string result;
-  char prev_char = '\0';
-  for (const char* p = id_name; *p != '\0'; prev_char = *(p++)) {
-    // We don't care about the current locale as the input is
-    // guaranteed to be a valid C++ identifier name.
-    const bool starts_new_word = IsUpper(*p) ||
-        (!IsAlpha(prev_char) && IsLower(*p)) ||
-        (!IsDigit(prev_char) && IsDigit(*p));
-
-    if (IsAlNum(*p)) {
-      if (starts_new_word && result != "")
-        result += ' ';
-      result += ToLower(*p);
-    }
-  }
-  return result;
-}
-
-// This class reports Google Mock failures as Google Test failures.  A
-// user can define another class in a similar fashion if they intend to
-// use Google Mock with a testing framework other than Google Test.
-class GoogleTestFailureReporter : public FailureReporterInterface {
- public:
-  void ReportFailure(FailureType type, const char* file, int line,
-                     const std::string& message) override {
-    AssertHelper(type == kFatal ?
-                 TestPartResult::kFatalFailure :
-                 TestPartResult::kNonFatalFailure,
-                 file,
-                 line,
-                 message.c_str()) = Message();
-    if (type == kFatal) {
-      posix::Abort();
-    }
-  }
-};
-
-// Returns the global failure reporter.  Will create a
-// GoogleTestFailureReporter and return it the first time called.
-GTEST_API_ FailureReporterInterface* GetFailureReporter() {
-  // Points to the global failure reporter used by Google Mock.  gcc
-  // guarantees that the following use of failure_reporter is
-  // thread-safe.  We may need to add additional synchronization to
-  // protect failure_reporter if we port Google Mock to other
-  // compilers.
-  static FailureReporterInterface* const failure_reporter =
-      new GoogleTestFailureReporter();
-  return failure_reporter;
-}
-
-// Protects global resources (stdout in particular) used by Log().
-static GTEST_DEFINE_STATIC_MUTEX_(g_log_mutex);
-
-// Returns true if and only if a log with the given severity is visible
-// according to the --gmock_verbose flag.
-GTEST_API_ bool LogIsVisible(LogSeverity severity) {
-  if (GMOCK_FLAG(verbose) == kInfoVerbosity) {
-    // Always show the log if --gmock_verbose=info.
-    return true;
-  } else if (GMOCK_FLAG(verbose) == kErrorVerbosity) {
-    // Always hide it if --gmock_verbose=error.
-    return false;
-  } else {
-    // If --gmock_verbose is neither "info" nor "error", we treat it
-    // as "warning" (its default value).
-    return severity == kWarning;
-  }
-}
-
-// Prints the given message to stdout if and only if 'severity' >= the level
-// specified by the --gmock_verbose flag.  If stack_frames_to_skip >=
-// 0, also prints the stack trace excluding the top
-// stack_frames_to_skip frames.  In opt mode, any positive
-// stack_frames_to_skip is treated as 0, since we don't know which
-// function calls will be inlined by the compiler and need to be
-// conservative.
-GTEST_API_ void Log(LogSeverity severity, const std::string& message,
-                    int stack_frames_to_skip) {
-  if (!LogIsVisible(severity))
-    return;
-
-  // Ensures that logs from different threads don't interleave.
-  MutexLock l(&g_log_mutex);
-
-  if (severity == kWarning) {
-    // Prints a GMOCK WARNING marker to make the warnings easily searchable.
-    std::cout << "\nGMOCK WARNING:";
-  }
-  // Pre-pends a new-line to message if it doesn't start with one.
-  if (message.empty() || message[0] != '\n') {
-    std::cout << "\n";
-  }
-  std::cout << message;
-  if (stack_frames_to_skip >= 0) {
-#ifdef NDEBUG
-    // In opt mode, we have to be conservative and skip no stack frame.
-    const int actual_to_skip = 0;
-#else
-    // In dbg mode, we can do what the caller tell us to do (plus one
-    // for skipping this function's stack frame).
-    const int actual_to_skip = stack_frames_to_skip + 1;
-#endif  // NDEBUG
-
-    // Appends a new-line to message if it doesn't end with one.
-    if (!message.empty() && *message.rbegin() != '\n') {
-      std::cout << "\n";
-    }
-    std::cout << "Stack trace:\n"
-         << ::testing::internal::GetCurrentOsStackTraceExceptTop(
-             ::testing::UnitTest::GetInstance(), actual_to_skip);
-  }
-  std::cout << ::std::flush;
-}
-
-GTEST_API_ WithoutMatchers GetWithoutMatchers() { return WithoutMatchers(); }
-
-GTEST_API_ void IllegalDoDefault(const char* file, int line) {
-  internal::Assert(
-      false, file, line,
-      "You are using DoDefault() inside a composite action like "
-      "DoAll() or WithArgs().  This is not supported for technical "
-      "reasons.  Please instead spell out the default action, or "
-      "assign the default action to an Action variable and use "
-      "the variable in various places.");
-}
-
-}  // namespace internal
-}  // namespace testing
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/src/gmock_main.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/src/gmock_main.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/src/gmock_main.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/src/gmock_main.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,65 +0,0 @@
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-#include <iostream>
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-#ifdef ARDUINO
-void setup() {
-  // Since Google Mock depends on Google Test, InitGoogleMock() is
-  // also responsible for initializing Google Test.  Therefore there's
-  // no need for calling testing::InitGoogleTest() separately.
-  testing::InitGoogleMock();
-}
-void loop() { RUN_ALL_TESTS(); }
-#else
-
-// MS C++ compiler/linker has a bug on Windows (not on Windows CE), which
-// causes a link error when _tmain is defined in a static library and UNICODE
-// is enabled. For this reason instead of _tmain, main function is used on
-// Windows. See the following link to track the current status of this bug:
-// https://web.archive.org/web/20170912203238/connect.microsoft.com/VisualStudio/feedback/details/394464/wmain-link-error-in-the-static-library
-// // NOLINT
-#if GTEST_OS_WINDOWS_MOBILE
-# include <tchar.h>  // NOLINT
-
-GTEST_API_ int _tmain(int argc, TCHAR** argv) {
-#else
-GTEST_API_ int main(int argc, char** argv) {
-#endif  // GTEST_OS_WINDOWS_MOBILE
-  std::cout << "Running main() from gmock_main.cc\n";
-  // Since Google Mock depends on Google Test, InitGoogleMock() is
-  // also responsible for initializing Google Test.  Therefore there's
-  // no need for calling testing::InitGoogleTest() separately.
-  testing::InitGoogleMock(&argc, argv);
-  return RUN_ALL_TESTS();
-}
-#endif
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/src/gmock-matchers.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/src/gmock-matchers.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/src/gmock-matchers.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/src/gmock-matchers.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,462 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file implements Matcher<const string&>, Matcher<string>, and
-// utilities for defining matchers.
-
-#include "gmock/gmock-matchers.h"
-#include "gmock/gmock-generated-matchers.h"
-
-#include <string.h>
-#include <iostream>
-#include <sstream>
-#include <string>
-
-namespace testing {
-namespace internal {
-
-// Returns the description for a matcher defined using the MATCHER*()
-// macro where the user-supplied description string is "", if
-// 'negation' is false; otherwise returns the description of the
-// negation of the matcher.  'param_values' contains a list of strings
-// that are the print-out of the matcher's parameters.
-GTEST_API_ std::string FormatMatcherDescription(bool negation,
-                                                const char* matcher_name,
-                                                const Strings& param_values) {
-  std::string result = ConvertIdentifierNameToWords(matcher_name);
-  if (param_values.size() >= 1) result += " " + JoinAsTuple(param_values);
-  return negation ? "not (" + result + ")" : result;
-}
-
-// FindMaxBipartiteMatching and its helper class.
-//
-// Uses the well-known Ford-Fulkerson max flow method to find a maximum
-// bipartite matching. Flow is considered to be from left to right.
-// There is an implicit source node that is connected to all of the left
-// nodes, and an implicit sink node that is connected to all of the
-// right nodes. All edges have unit capacity.
-//
-// Neither the flow graph nor the residual flow graph are represented
-// explicitly. Instead, they are implied by the information in 'graph' and
-// a vector<int> called 'left_' whose elements are initialized to the
-// value kUnused. This represents the initial state of the algorithm,
-// where the flow graph is empty, and the residual flow graph has the
-// following edges:
-//   - An edge from source to each left_ node
-//   - An edge from each right_ node to sink
-//   - An edge from each left_ node to each right_ node, if the
-//     corresponding edge exists in 'graph'.
-//
-// When the TryAugment() method adds a flow, it sets left_[l] = r for some
-// nodes l and r. This induces the following changes:
-//   - The edges (source, l), (l, r), and (r, sink) are added to the
-//     flow graph.
-//   - The same three edges are removed from the residual flow graph.
-//   - The reverse edges (l, source), (r, l), and (sink, r) are added
-//     to the residual flow graph, which is a directional graph
-//     representing unused flow capacity.
-//
-// When the method augments a flow (moving left_[l] from some r1 to some
-// other r2), this can be thought of as "undoing" the above steps with
-// respect to r1 and "redoing" them with respect to r2.
-//
-// It bears repeating that the flow graph and residual flow graph are
-// never represented explicitly, but can be derived by looking at the
-// information in 'graph' and in left_.
-//
-// As an optimization, there is a second vector<int> called right_ which
-// does not provide any new information. Instead, it enables more
-// efficient queries about edges entering or leaving the right-side nodes
-// of the flow or residual flow graphs. The following invariants are
-// maintained:
-//
-// left[l] == kUnused or right[left[l]] == l
-// right[r] == kUnused or left[right[r]] == r
-//
-// . [ source ]                                        .
-// .   |||                                             .
-// .   |||                                             .
-// .   ||\--> left[0]=1  ---\    right[0]=-1 ----\     .
-// .   ||                   |                    |     .
-// .   |\---> left[1]=-1    \--> right[1]=0  ---\|     .
-// .   |                                        ||     .
-// .   \----> left[2]=2  ------> right[2]=2  --\||     .
-// .                                           |||     .
-// .         elements           matchers       vvv     .
-// .                                         [ sink ]  .
-//
-// See Also:
-//   [1] Cormen, et al (2001). "Section 26.2: The Ford-Fulkerson method".
-//       "Introduction to Algorithms (Second ed.)", pp. 651-664.
-//   [2] "Ford-Fulkerson algorithm", Wikipedia,
-//       'http://en.wikipedia.org/wiki/Ford%E2%80%93Fulkerson_algorithm'
-class MaxBipartiteMatchState {
- public:
-  explicit MaxBipartiteMatchState(const MatchMatrix& graph)
-      : graph_(&graph),
-        left_(graph_->LhsSize(), kUnused),
-        right_(graph_->RhsSize(), kUnused) {}
-
-  // Returns the edges of a maximal match, each in the form {left, right}.
-  ElementMatcherPairs Compute() {
-    // 'seen' is used for path finding { 0: unseen, 1: seen }.
-    ::std::vector<char> seen;
-    // Searches the residual flow graph for a path from each left node to
-    // the sink in the residual flow graph, and if one is found, add flow
-    // to the graph. It's okay to search through the left nodes once. The
-    // edge from the implicit source node to each previously-visited left
-    // node will have flow if that left node has any path to the sink
-    // whatsoever. Subsequent augmentations can only add flow to the
-    // network, and cannot take away that previous flow unit from the source.
-    // Since the source-to-left edge can only carry one flow unit (or,
-    // each element can be matched to only one matcher), there is no need
-    // to visit the left nodes more than once looking for augmented paths.
-    // The flow is known to be possible or impossible by looking at the
-    // node once.
-    for (size_t ilhs = 0; ilhs < graph_->LhsSize(); ++ilhs) {
-      // Reset the path-marking vector and try to find a path from
-      // source to sink starting at the left_[ilhs] node.
-      GTEST_CHECK_(left_[ilhs] == kUnused)
-          << "ilhs: " << ilhs << ", left_[ilhs]: " << left_[ilhs];
-      // 'seen' initialized to 'graph_->RhsSize()' copies of 0.
-      seen.assign(graph_->RhsSize(), 0);
-      TryAugment(ilhs, &seen);
-    }
-    ElementMatcherPairs result;
-    for (size_t ilhs = 0; ilhs < left_.size(); ++ilhs) {
-      size_t irhs = left_[ilhs];
-      if (irhs == kUnused) continue;
-      result.push_back(ElementMatcherPair(ilhs, irhs));
-    }
-    return result;
-  }
-
- private:
-  static const size_t kUnused = static_cast<size_t>(-1);
-
-  // Perform a depth-first search from left node ilhs to the sink.  If a
-  // path is found, flow is added to the network by linking the left and
-  // right vector elements corresponding each segment of the path.
-  // Returns true if a path to sink was found, which means that a unit of
-  // flow was added to the network. The 'seen' vector elements correspond
-  // to right nodes and are marked to eliminate cycles from the search.
-  //
-  // Left nodes will only be explored at most once because they
-  // are accessible from at most one right node in the residual flow
-  // graph.
-  //
-  // Note that left_[ilhs] is the only element of left_ that TryAugment will
-  // potentially transition from kUnused to another value. Any other
-  // left_ element holding kUnused before TryAugment will be holding it
-  // when TryAugment returns.
-  //
-  bool TryAugment(size_t ilhs, ::std::vector<char>* seen) {
-    for (size_t irhs = 0; irhs < graph_->RhsSize(); ++irhs) {
-      if ((*seen)[irhs]) continue;
-      if (!graph_->HasEdge(ilhs, irhs)) continue;
-      // There's an available edge from ilhs to irhs.
-      (*seen)[irhs] = 1;
-      // Next a search is performed to determine whether
-      // this edge is a dead end or leads to the sink.
-      //
-      // right_[irhs] == kUnused means that there is residual flow from
-      // right node irhs to the sink, so we can use that to finish this
-      // flow path and return success.
-      //
-      // Otherwise there is residual flow to some ilhs. We push flow
-      // along that path and call ourselves recursively to see if this
-      // ultimately leads to sink.
-      if (right_[irhs] == kUnused || TryAugment(right_[irhs], seen)) {
-        // Add flow from left_[ilhs] to right_[irhs].
-        left_[ilhs] = irhs;
-        right_[irhs] = ilhs;
-        return true;
-      }
-    }
-    return false;
-  }
-
-  const MatchMatrix* graph_;  // not owned
-  // Each element of the left_ vector represents a left hand side node
-  // (i.e. an element) and each element of right_ is a right hand side
-  // node (i.e. a matcher). The values in the left_ vector indicate
-  // outflow from that node to a node on the right_ side. The values
-  // in the right_ indicate inflow, and specify which left_ node is
-  // feeding that right_ node, if any. For example, left_[3] == 1 means
-  // there's a flow from element #3 to matcher #1. Such a flow would also
-  // be redundantly represented in the right_ vector as right_[1] == 3.
-  // Elements of left_ and right_ are either kUnused or mutually
-  // referent. Mutually referent means that left_[right_[i]] = i and
-  // right_[left_[i]] = i.
-  ::std::vector<size_t> left_;
-  ::std::vector<size_t> right_;
-
-  GTEST_DISALLOW_ASSIGN_(MaxBipartiteMatchState);
-};
-
-const size_t MaxBipartiteMatchState::kUnused;
-
-GTEST_API_ ElementMatcherPairs FindMaxBipartiteMatching(const MatchMatrix& g) {
-  return MaxBipartiteMatchState(g).Compute();
-}
-
-static void LogElementMatcherPairVec(const ElementMatcherPairs& pairs,
-                                     ::std::ostream* stream) {
-  typedef ElementMatcherPairs::const_iterator Iter;
-  ::std::ostream& os = *stream;
-  os << "{";
-  const char* sep = "";
-  for (Iter it = pairs.begin(); it != pairs.end(); ++it) {
-    os << sep << "\n  ("
-       << "element #" << it->first << ", "
-       << "matcher #" << it->second << ")";
-    sep = ",";
-  }
-  os << "\n}";
-}
-
-bool MatchMatrix::NextGraph() {
-  for (size_t ilhs = 0; ilhs < LhsSize(); ++ilhs) {
-    for (size_t irhs = 0; irhs < RhsSize(); ++irhs) {
-      char& b = matched_[SpaceIndex(ilhs, irhs)];
-      if (!b) {
-        b = 1;
-        return true;
-      }
-      b = 0;
-    }
-  }
-  return false;
-}
-
-void MatchMatrix::Randomize() {
-  for (size_t ilhs = 0; ilhs < LhsSize(); ++ilhs) {
-    for (size_t irhs = 0; irhs < RhsSize(); ++irhs) {
-      char& b = matched_[SpaceIndex(ilhs, irhs)];
-      b = static_cast<char>(rand() & 1);  // NOLINT
-    }
-  }
-}
-
-std::string MatchMatrix::DebugString() const {
-  ::std::stringstream ss;
-  const char* sep = "";
-  for (size_t i = 0; i < LhsSize(); ++i) {
-    ss << sep;
-    for (size_t j = 0; j < RhsSize(); ++j) {
-      ss << HasEdge(i, j);
-    }
-    sep = ";";
-  }
-  return ss.str();
-}
-
-void UnorderedElementsAreMatcherImplBase::DescribeToImpl(
-    ::std::ostream* os) const {
-  switch (match_flags()) {
-    case UnorderedMatcherRequire::ExactMatch:
-      if (matcher_describers_.empty()) {
-        *os << "is empty";
-        return;
-      }
-      if (matcher_describers_.size() == 1) {
-        *os << "has " << Elements(1) << " and that element ";
-        matcher_describers_[0]->DescribeTo(os);
-        return;
-      }
-      *os << "has " << Elements(matcher_describers_.size())
-          << " and there exists some permutation of elements such that:\n";
-      break;
-    case UnorderedMatcherRequire::Superset:
-      *os << "a surjection from elements to requirements exists such that:\n";
-      break;
-    case UnorderedMatcherRequire::Subset:
-      *os << "an injection from elements to requirements exists such that:\n";
-      break;
-  }
-
-  const char* sep = "";
-  for (size_t i = 0; i != matcher_describers_.size(); ++i) {
-    *os << sep;
-    if (match_flags() == UnorderedMatcherRequire::ExactMatch) {
-      *os << " - element #" << i << " ";
-    } else {
-      *os << " - an element ";
-    }
-    matcher_describers_[i]->DescribeTo(os);
-    if (match_flags() == UnorderedMatcherRequire::ExactMatch) {
-      sep = ", and\n";
-    } else {
-      sep = "\n";
-    }
-  }
-}
-
-void UnorderedElementsAreMatcherImplBase::DescribeNegationToImpl(
-    ::std::ostream* os) const {
-  switch (match_flags()) {
-    case UnorderedMatcherRequire::ExactMatch:
-      if (matcher_describers_.empty()) {
-        *os << "isn't empty";
-        return;
-      }
-      if (matcher_describers_.size() == 1) {
-        *os << "doesn't have " << Elements(1) << ", or has " << Elements(1)
-            << " that ";
-        matcher_describers_[0]->DescribeNegationTo(os);
-        return;
-      }
-      *os << "doesn't have " << Elements(matcher_describers_.size())
-          << ", or there exists no permutation of elements such that:\n";
-      break;
-    case UnorderedMatcherRequire::Superset:
-      *os << "no surjection from elements to requirements exists such that:\n";
-      break;
-    case UnorderedMatcherRequire::Subset:
-      *os << "no injection from elements to requirements exists such that:\n";
-      break;
-  }
-  const char* sep = "";
-  for (size_t i = 0; i != matcher_describers_.size(); ++i) {
-    *os << sep;
-    if (match_flags() == UnorderedMatcherRequire::ExactMatch) {
-      *os << " - element #" << i << " ";
-    } else {
-      *os << " - an element ";
-    }
-    matcher_describers_[i]->DescribeTo(os);
-    if (match_flags() == UnorderedMatcherRequire::ExactMatch) {
-      sep = ", and\n";
-    } else {
-      sep = "\n";
-    }
-  }
-}
-
-// Checks that all matchers match at least one element, and that all
-// elements match at least one matcher. This enables faster matching
-// and better error reporting.
-// Returns false, writing an explanation to 'listener', if and only
-// if the success criteria are not met.
-bool UnorderedElementsAreMatcherImplBase::VerifyMatchMatrix(
-    const ::std::vector<std::string>& element_printouts,
-    const MatchMatrix& matrix, MatchResultListener* listener) const {
-  bool result = true;
-  ::std::vector<char> element_matched(matrix.LhsSize(), 0);
-  ::std::vector<char> matcher_matched(matrix.RhsSize(), 0);
-
-  for (size_t ilhs = 0; ilhs < matrix.LhsSize(); ilhs++) {
-    for (size_t irhs = 0; irhs < matrix.RhsSize(); irhs++) {
-      char matched = matrix.HasEdge(ilhs, irhs);
-      element_matched[ilhs] |= matched;
-      matcher_matched[irhs] |= matched;
-    }
-  }
-
-  if (match_flags() & UnorderedMatcherRequire::Superset) {
-    const char* sep =
-        "where the following matchers don't match any elements:\n";
-    for (size_t mi = 0; mi < matcher_matched.size(); ++mi) {
-      if (matcher_matched[mi]) continue;
-      result = false;
-      if (listener->IsInterested()) {
-        *listener << sep << "matcher #" << mi << ": ";
-        matcher_describers_[mi]->DescribeTo(listener->stream());
-        sep = ",\n";
-      }
-    }
-  }
-
-  if (match_flags() & UnorderedMatcherRequire::Subset) {
-    const char* sep =
-        "where the following elements don't match any matchers:\n";
-    const char* outer_sep = "";
-    if (!result) {
-      outer_sep = "\nand ";
-    }
-    for (size_t ei = 0; ei < element_matched.size(); ++ei) {
-      if (element_matched[ei]) continue;
-      result = false;
-      if (listener->IsInterested()) {
-        *listener << outer_sep << sep << "element #" << ei << ": "
-                  << element_printouts[ei];
-        sep = ",\n";
-        outer_sep = "";
-      }
-    }
-  }
-  return result;
-}
-
-bool UnorderedElementsAreMatcherImplBase::FindPairing(
-    const MatchMatrix& matrix, MatchResultListener* listener) const {
-  ElementMatcherPairs matches = FindMaxBipartiteMatching(matrix);
-
-  size_t max_flow = matches.size();
-  if ((match_flags() & UnorderedMatcherRequire::Superset) &&
-      max_flow < matrix.RhsSize()) {
-    if (listener->IsInterested()) {
-      *listener << "where no permutation of the elements can satisfy all "
-                   "matchers, and the closest match is "
-                << max_flow << " of " << matrix.RhsSize()
-                << " matchers with the pairings:\n";
-      LogElementMatcherPairVec(matches, listener->stream());
-    }
-    return false;
-  }
-  if ((match_flags() & UnorderedMatcherRequire::Subset) &&
-      max_flow < matrix.LhsSize()) {
-    if (listener->IsInterested()) {
-      *listener
-          << "where not all elements can be matched, and the closest match is "
-          << max_flow << " of " << matrix.RhsSize()
-          << " matchers with the pairings:\n";
-      LogElementMatcherPairVec(matches, listener->stream());
-    }
-    return false;
-  }
-
-  if (matches.size() > 1) {
-    if (listener->IsInterested()) {
-      const char* sep = "where:\n";
-      for (size_t mi = 0; mi < matches.size(); ++mi) {
-        *listener << sep << " - element #" << matches[mi].first
-                  << " is matched by matcher #" << matches[mi].second;
-        sep = ",\n";
-      }
-    }
-  }
-  return true;
-}
-
-}  // namespace internal
-}  // namespace testing
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/src/gmock-spec-builders.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/src/gmock-spec-builders.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googlemock/src/gmock-spec-builders.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googlemock/src/gmock-spec-builders.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,888 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Google Mock - a framework for writing C++ mock classes.
-//
-// This file implements the spec builder syntax (ON_CALL and
-// EXPECT_CALL).
-
-#include "gmock/gmock-spec-builders.h"
-
-#include <stdlib.h>
-#include <iostream>  // NOLINT
-#include <map>
-#include <memory>
-#include <set>
-#include <string>
-#include <vector>
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-#if GTEST_OS_CYGWIN || GTEST_OS_LINUX || GTEST_OS_MAC
-# include <unistd.h>  // NOLINT
-#endif
-
-// Silence C4800 (C4800: 'int *const ': forcing value
-// to bool 'true' or 'false') for MSVC 15
-#ifdef _MSC_VER
-#if _MSC_VER == 1900
-#  pragma warning(push)
-#  pragma warning(disable:4800)
-#endif
-#endif
-
-namespace testing {
-namespace internal {
-
-// Protects the mock object registry (in class Mock), all function
-// mockers, and all expectations.
-GTEST_API_ GTEST_DEFINE_STATIC_MUTEX_(g_gmock_mutex);
-
-// Logs a message including file and line number information.
-GTEST_API_ void LogWithLocation(testing::internal::LogSeverity severity,
-                                const char* file, int line,
-                                const std::string& message) {
-  ::std::ostringstream s;
-  s << file << ":" << line << ": " << message << ::std::endl;
-  Log(severity, s.str(), 0);
-}
-
-// Constructs an ExpectationBase object.
-ExpectationBase::ExpectationBase(const char* a_file, int a_line,
-                                 const std::string& a_source_text)
-    : file_(a_file),
-      line_(a_line),
-      source_text_(a_source_text),
-      cardinality_specified_(false),
-      cardinality_(Exactly(1)),
-      call_count_(0),
-      retired_(false),
-      extra_matcher_specified_(false),
-      repeated_action_specified_(false),
-      retires_on_saturation_(false),
-      last_clause_(kNone),
-      action_count_checked_(false) {}
-
-// Destructs an ExpectationBase object.
-ExpectationBase::~ExpectationBase() {}
-
-// Explicitly specifies the cardinality of this expectation.  Used by
-// the subclasses to implement the .Times() clause.
-void ExpectationBase::SpecifyCardinality(const Cardinality& a_cardinality) {
-  cardinality_specified_ = true;
-  cardinality_ = a_cardinality;
-}
-
-// Retires all pre-requisites of this expectation.
-void ExpectationBase::RetireAllPreRequisites()
-    GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-  if (is_retired()) {
-    // We can take this short-cut as we never retire an expectation
-    // until we have retired all its pre-requisites.
-    return;
-  }
-
-  ::std::vector<ExpectationBase*> expectations(1, this);
-  while (!expectations.empty()) {
-    ExpectationBase* exp = expectations.back();
-    expectations.pop_back();
-
-    for (ExpectationSet::const_iterator it =
-             exp->immediate_prerequisites_.begin();
-         it != exp->immediate_prerequisites_.end(); ++it) {
-      ExpectationBase* next = it->expectation_base().get();
-      if (!next->is_retired()) {
-        next->Retire();
-        expectations.push_back(next);
-      }
-    }
-  }
-}
-
-// Returns true if and only if all pre-requisites of this expectation
-// have been satisfied.
-bool ExpectationBase::AllPrerequisitesAreSatisfied() const
-    GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-  g_gmock_mutex.AssertHeld();
-  ::std::vector<const ExpectationBase*> expectations(1, this);
-  while (!expectations.empty()) {
-    const ExpectationBase* exp = expectations.back();
-    expectations.pop_back();
-
-    for (ExpectationSet::const_iterator it =
-             exp->immediate_prerequisites_.begin();
-         it != exp->immediate_prerequisites_.end(); ++it) {
-      const ExpectationBase* next = it->expectation_base().get();
-      if (!next->IsSatisfied()) return false;
-      expectations.push_back(next);
-    }
-  }
-  return true;
-}
-
-// Adds unsatisfied pre-requisites of this expectation to 'result'.
-void ExpectationBase::FindUnsatisfiedPrerequisites(ExpectationSet* result) const
-    GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-  g_gmock_mutex.AssertHeld();
-  ::std::vector<const ExpectationBase*> expectations(1, this);
-  while (!expectations.empty()) {
-    const ExpectationBase* exp = expectations.back();
-    expectations.pop_back();
-
-    for (ExpectationSet::const_iterator it =
-             exp->immediate_prerequisites_.begin();
-         it != exp->immediate_prerequisites_.end(); ++it) {
-      const ExpectationBase* next = it->expectation_base().get();
-
-      if (next->IsSatisfied()) {
-        // If *it is satisfied and has a call count of 0, some of its
-        // pre-requisites may not be satisfied yet.
-        if (next->call_count_ == 0) {
-          expectations.push_back(next);
-        }
-      } else {
-        // Now that we know next is unsatisfied, we are not so interested
-        // in whether its pre-requisites are satisfied.  Therefore we
-        // don't iterate into it here.
-        *result += *it;
-      }
-    }
-  }
-}
-
-// Describes how many times a function call matching this
-// expectation has occurred.
-void ExpectationBase::DescribeCallCountTo(::std::ostream* os) const
-    GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-  g_gmock_mutex.AssertHeld();
-
-  // Describes how many times the function is expected to be called.
-  *os << "         Expected: to be ";
-  cardinality().DescribeTo(os);
-  *os << "\n           Actual: ";
-  Cardinality::DescribeActualCallCountTo(call_count(), os);
-
-  // Describes the state of the expectation (e.g. is it satisfied?
-  // is it active?).
-  *os << " - " << (IsOverSaturated() ? "over-saturated" :
-                   IsSaturated() ? "saturated" :
-                   IsSatisfied() ? "satisfied" : "unsatisfied")
-      << " and "
-      << (is_retired() ? "retired" : "active");
-}
-
-// Checks the action count (i.e. the number of WillOnce() and
-// WillRepeatedly() clauses) against the cardinality if this hasn't
-// been done before.  Prints a warning if there are too many or too
-// few actions.
-void ExpectationBase::CheckActionCountIfNotDone() const
-    GTEST_LOCK_EXCLUDED_(mutex_) {
-  bool should_check = false;
-  {
-    MutexLock l(&mutex_);
-    if (!action_count_checked_) {
-      action_count_checked_ = true;
-      should_check = true;
-    }
-  }
-
-  if (should_check) {
-    if (!cardinality_specified_) {
-      // The cardinality was inferred - no need to check the action
-      // count against it.
-      return;
-    }
-
-    // The cardinality was explicitly specified.
-    const int action_count = static_cast<int>(untyped_actions_.size());
-    const int upper_bound = cardinality().ConservativeUpperBound();
-    const int lower_bound = cardinality().ConservativeLowerBound();
-    bool too_many;  // True if there are too many actions, or false
-    // if there are too few.
-    if (action_count > upper_bound ||
-        (action_count == upper_bound && repeated_action_specified_)) {
-      too_many = true;
-    } else if (0 < action_count && action_count < lower_bound &&
-               !repeated_action_specified_) {
-      too_many = false;
-    } else {
-      return;
-    }
-
-    ::std::stringstream ss;
-    DescribeLocationTo(&ss);
-    ss << "Too " << (too_many ? "many" : "few")
-       << " actions specified in " << source_text() << "...\n"
-       << "Expected to be ";
-    cardinality().DescribeTo(&ss);
-    ss << ", but has " << (too_many ? "" : "only ")
-       << action_count << " WillOnce()"
-       << (action_count == 1 ? "" : "s");
-    if (repeated_action_specified_) {
-      ss << " and a WillRepeatedly()";
-    }
-    ss << ".";
-    Log(kWarning, ss.str(), -1);  // -1 means "don't print stack trace".
-  }
-}
-
-// Implements the .Times() clause.
-void ExpectationBase::UntypedTimes(const Cardinality& a_cardinality) {
-  if (last_clause_ == kTimes) {
-    ExpectSpecProperty(false,
-                       ".Times() cannot appear "
-                       "more than once in an EXPECT_CALL().");
-  } else {
-    ExpectSpecProperty(last_clause_ < kTimes,
-                       ".Times() cannot appear after "
-                       ".InSequence(), .WillOnce(), .WillRepeatedly(), "
-                       "or .RetiresOnSaturation().");
-  }
-  last_clause_ = kTimes;
-
-  SpecifyCardinality(a_cardinality);
-}
-
-// Points to the implicit sequence introduced by a living InSequence
-// object (if any) in the current thread or NULL.
-GTEST_API_ ThreadLocal<Sequence*> g_gmock_implicit_sequence;
-
-// Reports an uninteresting call (whose description is in msg) in the
-// manner specified by 'reaction'.
-void ReportUninterestingCall(CallReaction reaction, const std::string& msg) {
-  // Include a stack trace only if --gmock_verbose=info is specified.
-  const int stack_frames_to_skip =
-      GMOCK_FLAG(verbose) == kInfoVerbosity ? 3 : -1;
-  switch (reaction) {
-    case kAllow:
-      Log(kInfo, msg, stack_frames_to_skip);
-      break;
-    case kWarn:
-      Log(kWarning,
-          msg +
-              "\nNOTE: You can safely ignore the above warning unless this "
-              "call should not happen.  Do not suppress it by blindly adding "
-              "an EXPECT_CALL() if you don't mean to enforce the call.  "
-              "See "
-              "https://github.com/google/googletest/blob/master/googlemock/"
-              "docs/cook_book.md#"
-              "knowing-when-to-expect for details.\n",
-          stack_frames_to_skip);
-      break;
-    default:  // FAIL
-      Expect(false, nullptr, -1, msg);
-  }
-}
-
-UntypedFunctionMockerBase::UntypedFunctionMockerBase()
-    : mock_obj_(nullptr), name_("") {}
-
-UntypedFunctionMockerBase::~UntypedFunctionMockerBase() {}
-
-// Sets the mock object this mock method belongs to, and registers
-// this information in the global mock registry.  Will be called
-// whenever an EXPECT_CALL() or ON_CALL() is executed on this mock
-// method.
-void UntypedFunctionMockerBase::RegisterOwner(const void* mock_obj)
-    GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
-  {
-    MutexLock l(&g_gmock_mutex);
-    mock_obj_ = mock_obj;
-  }
-  Mock::Register(mock_obj, this);
-}
-
-// Sets the mock object this mock method belongs to, and sets the name
-// of the mock function.  Will be called upon each invocation of this
-// mock function.
-void UntypedFunctionMockerBase::SetOwnerAndName(const void* mock_obj,
-                                                const char* name)
-    GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
-  // We protect name_ under g_gmock_mutex in case this mock function
-  // is called from two threads concurrently.
-  MutexLock l(&g_gmock_mutex);
-  mock_obj_ = mock_obj;
-  name_ = name;
-}
-
-// Returns the name of the function being mocked.  Must be called
-// after RegisterOwner() or SetOwnerAndName() has been called.
-const void* UntypedFunctionMockerBase::MockObject() const
-    GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
-  const void* mock_obj;
-  {
-    // We protect mock_obj_ under g_gmock_mutex in case this mock
-    // function is called from two threads concurrently.
-    MutexLock l(&g_gmock_mutex);
-    Assert(mock_obj_ != nullptr, __FILE__, __LINE__,
-           "MockObject() must not be called before RegisterOwner() or "
-           "SetOwnerAndName() has been called.");
-    mock_obj = mock_obj_;
-  }
-  return mock_obj;
-}
-
-// Returns the name of this mock method.  Must be called after
-// SetOwnerAndName() has been called.
-const char* UntypedFunctionMockerBase::Name() const
-    GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
-  const char* name;
-  {
-    // We protect name_ under g_gmock_mutex in case this mock
-    // function is called from two threads concurrently.
-    MutexLock l(&g_gmock_mutex);
-    Assert(name_ != nullptr, __FILE__, __LINE__,
-           "Name() must not be called before SetOwnerAndName() has "
-           "been called.");
-    name = name_;
-  }
-  return name;
-}
-
-// Calculates the result of invoking this mock function with the given
-// arguments, prints it, and returns it.  The caller is responsible
-// for deleting the result.
-UntypedActionResultHolderBase* UntypedFunctionMockerBase::UntypedInvokeWith(
-    void* const untyped_args) GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
-  // See the definition of untyped_expectations_ for why access to it
-  // is unprotected here.
-  if (untyped_expectations_.size() == 0) {
-    // No expectation is set on this mock method - we have an
-    // uninteresting call.
-
-    // We must get Google Mock's reaction on uninteresting calls
-    // made on this mock object BEFORE performing the action,
-    // because the action may DELETE the mock object and make the
-    // following expression meaningless.
-    const CallReaction reaction =
-        Mock::GetReactionOnUninterestingCalls(MockObject());
-
-    // True if and only if we need to print this call's arguments and return
-    // value.  This definition must be kept in sync with
-    // the behavior of ReportUninterestingCall().
-    const bool need_to_report_uninteresting_call =
-        // If the user allows this uninteresting call, we print it
-        // only when they want informational messages.
-        reaction == kAllow ? LogIsVisible(kInfo) :
-                           // If the user wants this to be a warning, we print
-                           // it only when they want to see warnings.
-            reaction == kWarn
-                ? LogIsVisible(kWarning)
-                :
-                // Otherwise, the user wants this to be an error, and we
-                // should always print detailed information in the error.
-                true;
-
-    if (!need_to_report_uninteresting_call) {
-      // Perform the action without printing the call information.
-      return this->UntypedPerformDefaultAction(
-          untyped_args, "Function call: " + std::string(Name()));
-    }
-
-    // Warns about the uninteresting call.
-    ::std::stringstream ss;
-    this->UntypedDescribeUninterestingCall(untyped_args, &ss);
-
-    // Calculates the function result.
-    UntypedActionResultHolderBase* const result =
-        this->UntypedPerformDefaultAction(untyped_args, ss.str());
-
-    // Prints the function result.
-    if (result != nullptr) result->PrintAsActionResult(&ss);
-
-    ReportUninterestingCall(reaction, ss.str());
-    return result;
-  }
-
-  bool is_excessive = false;
-  ::std::stringstream ss;
-  ::std::stringstream why;
-  ::std::stringstream loc;
-  const void* untyped_action = nullptr;
-
-  // The UntypedFindMatchingExpectation() function acquires and
-  // releases g_gmock_mutex.
-  const ExpectationBase* const untyped_expectation =
-      this->UntypedFindMatchingExpectation(
-          untyped_args, &untyped_action, &is_excessive,
-          &ss, &why);
-  const bool found = untyped_expectation != nullptr;
-
-  // True if and only if we need to print the call's arguments
-  // and return value.
-  // This definition must be kept in sync with the uses of Expect()
-  // and Log() in this function.
-  const bool need_to_report_call =
-      !found || is_excessive || LogIsVisible(kInfo);
-  if (!need_to_report_call) {
-    // Perform the action without printing the call information.
-    return untyped_action == nullptr
-               ? this->UntypedPerformDefaultAction(untyped_args, "")
-               : this->UntypedPerformAction(untyped_action, untyped_args);
-  }
-
-  ss << "    Function call: " << Name();
-  this->UntypedPrintArgs(untyped_args, &ss);
-
-  // In case the action deletes a piece of the expectation, we
-  // generate the message beforehand.
-  if (found && !is_excessive) {
-    untyped_expectation->DescribeLocationTo(&loc);
-  }
-
-  UntypedActionResultHolderBase* const result =
-      untyped_action == nullptr
-          ? this->UntypedPerformDefaultAction(untyped_args, ss.str())
-          : this->UntypedPerformAction(untyped_action, untyped_args);
-  if (result != nullptr) result->PrintAsActionResult(&ss);
-  ss << "\n" << why.str();
-
-  if (!found) {
-    // No expectation matches this call - reports a failure.
-    Expect(false, nullptr, -1, ss.str());
-  } else if (is_excessive) {
-    // We had an upper-bound violation and the failure message is in ss.
-    Expect(false, untyped_expectation->file(),
-           untyped_expectation->line(), ss.str());
-  } else {
-    // We had an expected call and the matching expectation is
-    // described in ss.
-    Log(kInfo, loc.str() + ss.str(), 2);
-  }
-
-  return result;
-}
-
-// Returns an Expectation object that references and co-owns exp,
-// which must be an expectation on this mock function.
-Expectation UntypedFunctionMockerBase::GetHandleOf(ExpectationBase* exp) {
-  // See the definition of untyped_expectations_ for why access to it
-  // is unprotected here.
-  for (UntypedExpectations::const_iterator it =
-           untyped_expectations_.begin();
-       it != untyped_expectations_.end(); ++it) {
-    if (it->get() == exp) {
-      return Expectation(*it);
-    }
-  }
-
-  Assert(false, __FILE__, __LINE__, "Cannot find expectation.");
-  return Expectation();
-  // The above statement is just to make the code compile, and will
-  // never be executed.
-}
-
-// Verifies that all expectations on this mock function have been
-// satisfied.  Reports one or more Google Test non-fatal failures
-// and returns false if not.
-bool UntypedFunctionMockerBase::VerifyAndClearExpectationsLocked()
-    GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-  g_gmock_mutex.AssertHeld();
-  bool expectations_met = true;
-  for (UntypedExpectations::const_iterator it =
-           untyped_expectations_.begin();
-       it != untyped_expectations_.end(); ++it) {
-    ExpectationBase* const untyped_expectation = it->get();
-    if (untyped_expectation->IsOverSaturated()) {
-      // There was an upper-bound violation.  Since the error was
-      // already reported when it occurred, there is no need to do
-      // anything here.
-      expectations_met = false;
-    } else if (!untyped_expectation->IsSatisfied()) {
-      expectations_met = false;
-      ::std::stringstream ss;
-      ss  << "Actual function call count doesn't match "
-          << untyped_expectation->source_text() << "...\n";
-      // No need to show the source file location of the expectation
-      // in the description, as the Expect() call that follows already
-      // takes care of it.
-      untyped_expectation->MaybeDescribeExtraMatcherTo(&ss);
-      untyped_expectation->DescribeCallCountTo(&ss);
-      Expect(false, untyped_expectation->file(),
-             untyped_expectation->line(), ss.str());
-    }
-  }
-
-  // Deleting our expectations may trigger other mock objects to be deleted, for
-  // example if an action contains a reference counted smart pointer to that
-  // mock object, and that is the last reference. So if we delete our
-  // expectations within the context of the global mutex we may deadlock when
-  // this method is called again. Instead, make a copy of the set of
-  // expectations to delete, clear our set within the mutex, and then clear the
-  // copied set outside of it.
-  UntypedExpectations expectations_to_delete;
-  untyped_expectations_.swap(expectations_to_delete);
-
-  g_gmock_mutex.Unlock();
-  expectations_to_delete.clear();
-  g_gmock_mutex.Lock();
-
-  return expectations_met;
-}
-
-CallReaction intToCallReaction(int mock_behavior) {
-  if (mock_behavior >= kAllow && mock_behavior <= kFail) {
-    return static_cast<internal::CallReaction>(mock_behavior);
-  }
-  return kWarn;
-}
-
-}  // namespace internal
-
-// Class Mock.
-
-namespace {
-
-typedef std::set<internal::UntypedFunctionMockerBase*> FunctionMockers;
-
-// The current state of a mock object.  Such information is needed for
-// detecting leaked mock objects and explicitly verifying a mock's
-// expectations.
-struct MockObjectState {
-  MockObjectState()
-      : first_used_file(nullptr), first_used_line(-1), leakable(false) {}
-
-  // Where in the source file an ON_CALL or EXPECT_CALL is first
-  // invoked on this mock object.
-  const char* first_used_file;
-  int first_used_line;
-  ::std::string first_used_test_suite;
-  ::std::string first_used_test;
-  bool leakable;  // true if and only if it's OK to leak the object.
-  FunctionMockers function_mockers;  // All registered methods of the object.
-};
-
-// A global registry holding the state of all mock objects that are
-// alive.  A mock object is added to this registry the first time
-// Mock::AllowLeak(), ON_CALL(), or EXPECT_CALL() is called on it.  It
-// is removed from the registry in the mock object's destructor.
-class MockObjectRegistry {
- public:
-  // Maps a mock object (identified by its address) to its state.
-  typedef std::map<const void*, MockObjectState> StateMap;
-
-  // This destructor will be called when a program exits, after all
-  // tests in it have been run.  By then, there should be no mock
-  // object alive.  Therefore we report any living object as test
-  // failure, unless the user explicitly asked us to ignore it.
-  ~MockObjectRegistry() {
-    if (!GMOCK_FLAG(catch_leaked_mocks))
-      return;
-
-    int leaked_count = 0;
-    for (StateMap::const_iterator it = states_.begin(); it != states_.end();
-         ++it) {
-      if (it->second.leakable)  // The user said it's fine to leak this object.
-        continue;
-
-      // FIXME: Print the type of the leaked object.
-      // This can help the user identify the leaked object.
-      std::cout << "\n";
-      const MockObjectState& state = it->second;
-      std::cout << internal::FormatFileLocation(state.first_used_file,
-                                                state.first_used_line);
-      std::cout << " ERROR: this mock object";
-      if (state.first_used_test != "") {
-        std::cout << " (used in test " << state.first_used_test_suite << "."
-                  << state.first_used_test << ")";
-      }
-      std::cout << " should be deleted but never is. Its address is @"
-           << it->first << ".";
-      leaked_count++;
-    }
-    if (leaked_count > 0) {
-      std::cout << "\nERROR: " << leaked_count << " leaked mock "
-                << (leaked_count == 1 ? "object" : "objects")
-                << " found at program exit. Expectations on a mock object is "
-                   "verified when the object is destructed. Leaking a mock "
-                   "means that its expectations aren't verified, which is "
-                   "usually a test bug. If you really intend to leak a mock, "
-                   "you can suppress this error using "
-                   "testing::Mock::AllowLeak(mock_object), or you may use a "
-                   "fake or stub instead of a mock.\n";
-      std::cout.flush();
-      ::std::cerr.flush();
-      // RUN_ALL_TESTS() has already returned when this destructor is
-      // called.  Therefore we cannot use the normal Google Test
-      // failure reporting mechanism.
-      _exit(1);  // We cannot call exit() as it is not reentrant and
-                 // may already have been called.
-    }
-  }
-
-  StateMap& states() { return states_; }
-
- private:
-  StateMap states_;
-};
-
-// Protected by g_gmock_mutex.
-MockObjectRegistry g_mock_object_registry;
-
-// Maps a mock object to the reaction Google Mock should have when an
-// uninteresting method is called.  Protected by g_gmock_mutex.
-std::map<const void*, internal::CallReaction> g_uninteresting_call_reaction;
-
-// Sets the reaction Google Mock should have when an uninteresting
-// method of the given mock object is called.
-void SetReactionOnUninterestingCalls(const void* mock_obj,
-                                     internal::CallReaction reaction)
-    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  internal::MutexLock l(&internal::g_gmock_mutex);
-  g_uninteresting_call_reaction[mock_obj] = reaction;
-}
-
-}  // namespace
-
-// Tells Google Mock to allow uninteresting calls on the given mock
-// object.
-void Mock::AllowUninterestingCalls(const void* mock_obj)
-    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  SetReactionOnUninterestingCalls(mock_obj, internal::kAllow);
-}
-
-// Tells Google Mock to warn the user about uninteresting calls on the
-// given mock object.
-void Mock::WarnUninterestingCalls(const void* mock_obj)
-    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  SetReactionOnUninterestingCalls(mock_obj, internal::kWarn);
-}
-
-// Tells Google Mock to fail uninteresting calls on the given mock
-// object.
-void Mock::FailUninterestingCalls(const void* mock_obj)
-    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  SetReactionOnUninterestingCalls(mock_obj, internal::kFail);
-}
-
-// Tells Google Mock the given mock object is being destroyed and its
-// entry in the call-reaction table should be removed.
-void Mock::UnregisterCallReaction(const void* mock_obj)
-    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  internal::MutexLock l(&internal::g_gmock_mutex);
-  g_uninteresting_call_reaction.erase(mock_obj);
-}
-
-// Returns the reaction Google Mock will have on uninteresting calls
-// made on the given mock object.
-internal::CallReaction Mock::GetReactionOnUninterestingCalls(
-    const void* mock_obj)
-        GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  internal::MutexLock l(&internal::g_gmock_mutex);
-  return (g_uninteresting_call_reaction.count(mock_obj) == 0) ?
-      internal::intToCallReaction(GMOCK_FLAG(default_mock_behavior)) :
-      g_uninteresting_call_reaction[mock_obj];
-}
-
-// Tells Google Mock to ignore mock_obj when checking for leaked mock
-// objects.
-void Mock::AllowLeak(const void* mock_obj)
-    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  internal::MutexLock l(&internal::g_gmock_mutex);
-  g_mock_object_registry.states()[mock_obj].leakable = true;
-}
-
-// Verifies and clears all expectations on the given mock object.  If
-// the expectations aren't satisfied, generates one or more Google
-// Test non-fatal failures and returns false.
-bool Mock::VerifyAndClearExpectations(void* mock_obj)
-    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  internal::MutexLock l(&internal::g_gmock_mutex);
-  return VerifyAndClearExpectationsLocked(mock_obj);
-}
-
-// Verifies all expectations on the given mock object and clears its
-// default actions and expectations.  Returns true if and only if the
-// verification was successful.
-bool Mock::VerifyAndClear(void* mock_obj)
-    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  internal::MutexLock l(&internal::g_gmock_mutex);
-  ClearDefaultActionsLocked(mock_obj);
-  return VerifyAndClearExpectationsLocked(mock_obj);
-}
-
-// Verifies and clears all expectations on the given mock object.  If
-// the expectations aren't satisfied, generates one or more Google
-// Test non-fatal failures and returns false.
-bool Mock::VerifyAndClearExpectationsLocked(void* mock_obj)
-    GTEST_EXCLUSIVE_LOCK_REQUIRED_(internal::g_gmock_mutex) {
-  internal::g_gmock_mutex.AssertHeld();
-  if (g_mock_object_registry.states().count(mock_obj) == 0) {
-    // No EXPECT_CALL() was set on the given mock object.
-    return true;
-  }
-
-  // Verifies and clears the expectations on each mock method in the
-  // given mock object.
-  bool expectations_met = true;
-  FunctionMockers& mockers =
-      g_mock_object_registry.states()[mock_obj].function_mockers;
-  for (FunctionMockers::const_iterator it = mockers.begin();
-       it != mockers.end(); ++it) {
-    if (!(*it)->VerifyAndClearExpectationsLocked()) {
-      expectations_met = false;
-    }
-  }
-
-  // We don't clear the content of mockers, as they may still be
-  // needed by ClearDefaultActionsLocked().
-  return expectations_met;
-}
-
-bool Mock::IsNaggy(void* mock_obj)
-    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  return Mock::GetReactionOnUninterestingCalls(mock_obj) == internal::kWarn;
-}
-bool Mock::IsNice(void* mock_obj)
-    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  return Mock::GetReactionOnUninterestingCalls(mock_obj) == internal::kAllow;
-}
-bool Mock::IsStrict(void* mock_obj)
-    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  return Mock::GetReactionOnUninterestingCalls(mock_obj) == internal::kFail;
-}
-
-// Registers a mock object and a mock method it owns.
-void Mock::Register(const void* mock_obj,
-                    internal::UntypedFunctionMockerBase* mocker)
-    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  internal::MutexLock l(&internal::g_gmock_mutex);
-  g_mock_object_registry.states()[mock_obj].function_mockers.insert(mocker);
-}
-
-// Tells Google Mock where in the source code mock_obj is used in an
-// ON_CALL or EXPECT_CALL.  In case mock_obj is leaked, this
-// information helps the user identify which object it is.
-void Mock::RegisterUseByOnCallOrExpectCall(const void* mock_obj,
-                                           const char* file, int line)
-    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
-  internal::MutexLock l(&internal::g_gmock_mutex);
-  MockObjectState& state = g_mock_object_registry.states()[mock_obj];
-  if (state.first_used_file == nullptr) {
-    state.first_used_file = file;
-    state.first_used_line = line;
-    const TestInfo* const test_info =
-        UnitTest::GetInstance()->current_test_info();
-    if (test_info != nullptr) {
-      state.first_used_test_suite = test_info->test_suite_name();
-      state.first_used_test = test_info->name();
-    }
-  }
-}
-
-// Unregisters a mock method; removes the owning mock object from the
-// registry when the last mock method associated with it has been
-// unregistered.  This is called only in the destructor of
-// FunctionMockerBase.
-void Mock::UnregisterLocked(internal::UntypedFunctionMockerBase* mocker)
-    GTEST_EXCLUSIVE_LOCK_REQUIRED_(internal::g_gmock_mutex) {
-  internal::g_gmock_mutex.AssertHeld();
-  for (MockObjectRegistry::StateMap::iterator it =
-           g_mock_object_registry.states().begin();
-       it != g_mock_object_registry.states().end(); ++it) {
-    FunctionMockers& mockers = it->second.function_mockers;
-    if (mockers.erase(mocker) > 0) {
-      // mocker was in mockers and has been just removed.
-      if (mockers.empty()) {
-        g_mock_object_registry.states().erase(it);
-      }
-      return;
-    }
-  }
-}
-
-// Clears all ON_CALL()s set on the given mock object.
-void Mock::ClearDefaultActionsLocked(void* mock_obj)
-    GTEST_EXCLUSIVE_LOCK_REQUIRED_(internal::g_gmock_mutex) {
-  internal::g_gmock_mutex.AssertHeld();
-
-  if (g_mock_object_registry.states().count(mock_obj) == 0) {
-    // No ON_CALL() was set on the given mock object.
-    return;
-  }
-
-  // Clears the default actions for each mock method in the given mock
-  // object.
-  FunctionMockers& mockers =
-      g_mock_object_registry.states()[mock_obj].function_mockers;
-  for (FunctionMockers::const_iterator it = mockers.begin();
-       it != mockers.end(); ++it) {
-    (*it)->ClearDefaultActionsLocked();
-  }
-
-  // We don't clear the content of mockers, as they may still be
-  // needed by VerifyAndClearExpectationsLocked().
-}
-
-Expectation::Expectation() {}
-
-Expectation::Expectation(
-    const std::shared_ptr<internal::ExpectationBase>& an_expectation_base)
-    : expectation_base_(an_expectation_base) {}
-
-Expectation::~Expectation() {}
-
-// Adds an expectation to a sequence.
-void Sequence::AddExpectation(const Expectation& expectation) const {
-  if (*last_expectation_ != expectation) {
-    if (last_expectation_->expectation_base() != nullptr) {
-      expectation.expectation_base()->immediate_prerequisites_
-          += *last_expectation_;
-    }
-    *last_expectation_ = expectation;
-  }
-}
-
-// Creates the implicit sequence if there isn't one.
-InSequence::InSequence() {
-  if (internal::g_gmock_implicit_sequence.get() == nullptr) {
-    internal::g_gmock_implicit_sequence.set(new Sequence);
-    sequence_created_ = true;
-  } else {
-    sequence_created_ = false;
-  }
-}
-
-// Deletes the implicit sequence if it was created by the constructor
-// of this object.
-InSequence::~InSequence() {
-  if (sequence_created_) {
-    delete internal::g_gmock_implicit_sequence.get();
-    internal::g_gmock_implicit_sequence.set(nullptr);
-  }
-}
-
-}  // namespace testing
-
-#ifdef _MSC_VER
-#if _MSC_VER == 1900
-#  pragma warning(pop)
-#endif
-#endif
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/CMakeLists.txt mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/CMakeLists.txt
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,328 +0,0 @@
-########################################################################
-# Note: CMake support is community-based. The maintainers do not use CMake
-# internally.
-#
-# CMake build script for Google Test.
-#
-# To run the tests for Google Test itself on Linux, use 'make test' or
-# ctest.  You can select which tests to run using 'ctest -R regex'.
-# For more options, run 'ctest --help'.
-
-# When other libraries are using a shared version of runtime libraries,
-# Google Test also has to use one.
-option(
-  gtest_force_shared_crt
-  "Use shared (DLL) run-time lib even when Google Test is built as static lib."
-  OFF)
-
-option(gtest_build_tests "Build all of gtest's own tests." OFF)
-
-option(gtest_build_samples "Build gtest's sample programs." OFF)
-
-option(gtest_disable_pthreads "Disable uses of pthreads in gtest." OFF)
-
-option(
-  gtest_hide_internal_symbols
-  "Build gtest with internal symbols hidden in shared libraries."
-  OFF)
-
-# Defines pre_project_set_up_hermetic_build() and set_up_hermetic_build().
-include(cmake/hermetic_build.cmake OPTIONAL)
-
-if (COMMAND pre_project_set_up_hermetic_build)
-  pre_project_set_up_hermetic_build()
-endif()
-
-########################################################################
-#
-# Project-wide settings
-
-# Name of the project.
-#
-# CMake files in this project can refer to the root source directory
-# as ${gtest_SOURCE_DIR} and to the root binary directory as
-# ${gtest_BINARY_DIR}.
-# Language "C" is required for find_package(Threads).
-
-# Project version:
-
-if (CMAKE_VERSION VERSION_LESS 3.0)
-  project(gtest CXX C)
-  set(PROJECT_VERSION ${GOOGLETEST_VERSION})
-else()
-  cmake_policy(SET CMP0048 NEW)
-  project(gtest VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C)
-endif()
-cmake_minimum_required(VERSION 2.6.4)
-
-if (POLICY CMP0063) # Visibility
-  cmake_policy(SET CMP0063 NEW)
-endif (POLICY CMP0063)
-
-if (COMMAND set_up_hermetic_build)
-  set_up_hermetic_build()
-endif()
-
-# These commands only run if this is the main project
-if(CMAKE_PROJECT_NAME STREQUAL "gtest" OR CMAKE_PROJECT_NAME STREQUAL "googletest-distribution")
-
-  # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to
-  # make it prominent in the GUI.
-  option(BUILD_SHARED_LIBS "Build shared libraries (DLLs)." OFF)
-
-else()
-
-  mark_as_advanced(
-    gtest_force_shared_crt
-    gtest_build_tests
-    gtest_build_samples
-    gtest_disable_pthreads
-    gtest_hide_internal_symbols)
-
-endif()
-
-
-if (gtest_hide_internal_symbols)
-  set(CMAKE_CXX_VISIBILITY_PRESET hidden)
-  set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
-endif()
-
-# Define helper functions and macros used by Google Test.
-include(cmake/internal_utils.cmake)
-
-config_compiler_and_linker()  # Defined in internal_utils.cmake.
-
-# Create the CMake package file descriptors.
-if (INSTALL_GTEST)
-  include(CMakePackageConfigHelpers)
-  set(cmake_package_name GTest)
-  set(targets_export_name ${cmake_package_name}Targets CACHE INTERNAL "")
-  set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated" CACHE INTERNAL "")
-  set(cmake_files_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${cmake_package_name}")
-  set(version_file "${generated_dir}/${cmake_package_name}ConfigVersion.cmake")
-  write_basic_package_version_file(${version_file} VERSION ${GOOGLETEST_VERSION} COMPATIBILITY AnyNewerVersion)
-  install(EXPORT ${targets_export_name}
-    NAMESPACE ${cmake_package_name}::
-    DESTINATION ${cmake_files_install_dir})
-  set(config_file "${generated_dir}/${cmake_package_name}Config.cmake")
-  configure_package_config_file("${gtest_SOURCE_DIR}/cmake/Config.cmake.in"
-    "${config_file}" INSTALL_DESTINATION ${cmake_files_install_dir})
-  install(FILES ${version_file} ${config_file}
-    DESTINATION ${cmake_files_install_dir})
-endif()
-
-# Where Google Test's .h files can be found.
-set(gtest_build_include_dirs
-  "${gtest_SOURCE_DIR}/include"
-  "${gtest_SOURCE_DIR}")
-include_directories(${gtest_build_include_dirs})
-
-########################################################################
-#
-# Defines the gtest & gtest_main libraries.  User tests should link
-# with one of them.
-
-# Google Test libraries.  We build them using more strict warnings than what
-# are used for other targets, to ensure that gtest can be compiled by a user
-# aggressive about warnings.
-cxx_library(gtest "${cxx_strict}" src/gtest-all.cc)
-cxx_library(gtest_main "${cxx_strict}" src/gtest_main.cc)
-# If the CMake version supports it, attach header directory information
-# to the targets for when we are part of a parent build (ie being pulled
-# in via add_subdirectory() rather than being a standalone build).
-if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11")
-  target_include_directories(gtest SYSTEM INTERFACE
-    "$<BUILD_INTERFACE:${gtest_build_include_dirs}>"
-    "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
-  target_include_directories(gtest_main SYSTEM INTERFACE
-    "$<BUILD_INTERFACE:${gtest_build_include_dirs}>"
-    "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
-endif()
-target_link_libraries(gtest_main PUBLIC gtest)
-
-########################################################################
-#
-# Install rules
-install_project(gtest gtest_main)
-
-########################################################################
-#
-# Samples on how to link user tests with gtest or gtest_main.
-#
-# They are not built by default.  To build them, set the
-# gtest_build_samples option to ON.  You can do it by running ccmake
-# or specifying the -Dgtest_build_samples=ON flag when running cmake.
-
-if (gtest_build_samples)
-  cxx_executable(sample1_unittest samples gtest_main samples/sample1.cc)
-  cxx_executable(sample2_unittest samples gtest_main samples/sample2.cc)
-  cxx_executable(sample3_unittest samples gtest_main)
-  cxx_executable(sample4_unittest samples gtest_main samples/sample4.cc)
-  cxx_executable(sample5_unittest samples gtest_main samples/sample1.cc)
-  cxx_executable(sample6_unittest samples gtest_main)
-  cxx_executable(sample7_unittest samples gtest_main)
-  cxx_executable(sample8_unittest samples gtest_main)
-  cxx_executable(sample9_unittest samples gtest)
-  cxx_executable(sample10_unittest samples gtest)
-endif()
-
-########################################################################
-#
-# Google Test's own tests.
-#
-# You can skip this section if you aren't interested in testing
-# Google Test itself.
-#
-# The tests are not built by default.  To build them, set the
-# gtest_build_tests option to ON.  You can do it by running ccmake
-# or specifying the -Dgtest_build_tests=ON flag when running cmake.
-
-if (gtest_build_tests)
-  # This must be set in the root directory for the tests to be run by
-  # 'make test' or ctest.
-  enable_testing()
-
-  if (WIN32)
-    file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/RunTest.ps1"
-         CONTENT
-"$project_bin = \"${CMAKE_BINARY_DIR}/bin/$<CONFIG>\"
-$env:Path = \"$project_bin;$env:Path\"
-& $args")
-  elseif (MINGW OR CYGWIN)
-    file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/RunTest.ps1"
-         CONTENT
-"$project_bin = (cygpath --windows ${CMAKE_BINARY_DIR}/bin)
-$env:Path = \"$project_bin;$env:Path\"
-& $args")
-  endif()
-
-  ############################################################
-  # C++ tests built with standard compiler flags.
-
-  cxx_test(googletest-death-test-test gtest_main)
-  cxx_test(gtest_environment_test gtest)
-  cxx_test(googletest-filepath-test gtest_main)
-  cxx_test(googletest-listener-test gtest_main)
-  cxx_test(gtest_main_unittest gtest_main)
-  cxx_test(googletest-message-test gtest_main)
-  cxx_test(gtest_no_test_unittest gtest)
-  cxx_test(googletest-options-test gtest_main)
-  cxx_test(googletest-param-test-test gtest
-    test/googletest-param-test2-test.cc)
-  cxx_test(googletest-port-test gtest_main)
-  cxx_test(gtest_pred_impl_unittest gtest_main)
-  cxx_test(gtest_premature_exit_test gtest
-    test/gtest_premature_exit_test.cc)
-  cxx_test(googletest-printers-test gtest_main)
-  cxx_test(gtest_prod_test gtest_main
-    test/production.cc)
-  cxx_test(gtest_repeat_test gtest)
-  cxx_test(gtest_sole_header_test gtest_main)
-  cxx_test(gtest_stress_test gtest)
-  cxx_test(googletest-test-part-test gtest_main)
-  cxx_test(gtest_throw_on_failure_ex_test gtest)
-  cxx_test(gtest-typed-test_test gtest_main
-    test/gtest-typed-test2_test.cc)
-  cxx_test(gtest_unittest gtest_main)
-  cxx_test(gtest-unittest-api_test gtest)
-  cxx_test(gtest_skip_in_environment_setup_test gtest_main)
-  cxx_test(gtest_skip_test gtest_main)
-
-  ############################################################
-  # C++ tests built with non-standard compiler flags.
-
-  # MSVC 7.1 does not support STL with exceptions disabled.
-  if (NOT MSVC OR MSVC_VERSION GREATER 1310)
-    cxx_library(gtest_no_exception "${cxx_no_exception}"
-      src/gtest-all.cc)
-    cxx_library(gtest_main_no_exception "${cxx_no_exception}"
-      src/gtest-all.cc src/gtest_main.cc)
-  endif()
-  cxx_library(gtest_main_no_rtti "${cxx_no_rtti}"
-    src/gtest-all.cc src/gtest_main.cc)
-
-  cxx_test_with_flags(gtest-death-test_ex_nocatch_test
-    "${cxx_exception} -DGTEST_ENABLE_CATCH_EXCEPTIONS_=0"
-    gtest test/googletest-death-test_ex_test.cc)
-  cxx_test_with_flags(gtest-death-test_ex_catch_test
-    "${cxx_exception} -DGTEST_ENABLE_CATCH_EXCEPTIONS_=1"
-    gtest test/googletest-death-test_ex_test.cc)
-
-  cxx_test_with_flags(gtest_no_rtti_unittest "${cxx_no_rtti}"
-    gtest_main_no_rtti test/gtest_unittest.cc)
-
-  cxx_shared_library(gtest_dll "${cxx_default}"
-    src/gtest-all.cc src/gtest_main.cc)
-
-  cxx_executable_with_flags(gtest_dll_test_ "${cxx_default}"
-    gtest_dll test/gtest_all_test.cc)
-  set_target_properties(gtest_dll_test_
-                        PROPERTIES
-                        COMPILE_DEFINITIONS "GTEST_LINKED_AS_SHARED_LIBRARY=1")
-
-  ############################################################
-  # Python tests.
-
-  cxx_executable(googletest-break-on-failure-unittest_ test gtest)
-  py_test(googletest-break-on-failure-unittest)
-
-  py_test(gtest_skip_environment_check_output_test)
-
-  # Visual Studio .NET 2003 does not support STL with exceptions disabled.
-  if (NOT MSVC OR MSVC_VERSION GREATER 1310)  # 1310 is Visual Studio .NET 2003
-    cxx_executable_with_flags(
-      googletest-catch-exceptions-no-ex-test_
-      "${cxx_no_exception}"
-      gtest_main_no_exception
-      test/googletest-catch-exceptions-test_.cc)
-  endif()
-
-  cxx_executable_with_flags(
-    googletest-catch-exceptions-ex-test_
-    "${cxx_exception}"
-    gtest_main
-    test/googletest-catch-exceptions-test_.cc)
-  py_test(googletest-catch-exceptions-test)
-
-  cxx_executable(googletest-color-test_ test gtest)
-  py_test(googletest-color-test)
-
-  cxx_executable(googletest-env-var-test_ test gtest)
-  py_test(googletest-env-var-test)
-
-  cxx_executable(googletest-filter-unittest_ test gtest)
-  py_test(googletest-filter-unittest)
-
-  cxx_executable(gtest_help_test_ test gtest_main)
-  py_test(gtest_help_test)
-
-  cxx_executable(googletest-list-tests-unittest_ test gtest)
-  py_test(googletest-list-tests-unittest)
-
-  cxx_executable(googletest-output-test_ test gtest)
-  py_test(googletest-output-test --no_stacktrace_support)
-
-  cxx_executable(googletest-shuffle-test_ test gtest)
-  py_test(googletest-shuffle-test)
-
-  # MSVC 7.1 does not support STL with exceptions disabled.
-  if (NOT MSVC OR MSVC_VERSION GREATER 1310)
-    cxx_executable(googletest-throw-on-failure-test_ test gtest_no_exception)
-    set_target_properties(googletest-throw-on-failure-test_
-      PROPERTIES
-      COMPILE_FLAGS "${cxx_no_exception}")
-    py_test(googletest-throw-on-failure-test)
-  endif()
-
-  cxx_executable(googletest-uninitialized-test_ test gtest)
-  py_test(googletest-uninitialized-test)
-
-  cxx_executable(gtest_xml_outfile1_test_ test gtest_main)
-  cxx_executable(gtest_xml_outfile2_test_ test gtest_main)
-  py_test(gtest_xml_outfiles_test)
-  py_test(googletest-json-outfiles-test)
-
-  cxx_executable(gtest_xml_output_unittest_ test gtest)
-  py_test(gtest_xml_output_unittest --no_stacktrace_support)
-  py_test(googletest-json-output-unittest --no_stacktrace_support)
-endif()
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/CONTRIBUTORS mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/CONTRIBUTORS
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/CONTRIBUTORS	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/CONTRIBUTORS	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-# This file contains a list of people who've made non-trivial
-# contribution to the Google C++ Testing Framework project.  People
-# who commit code to the project are encouraged to add their names
-# here.  Please keep the list sorted by first names.
-
-Ajay Joshi <jaj@google.com>
-Balázs Dán <balazs.dan@gmail.com>
-Bharat Mediratta <bharat@menalto.com>
-Chandler Carruth <chandlerc@google.com>
-Chris Prince <cprince@google.com>
-Chris Taylor <taylorc@google.com>
-Dan Egnor <egnor@google.com>
-Eric Roman <eroman@chromium.org>
-Hady Zalek <hady.zalek@gmail.com>
-Jeffrey Yasskin <jyasskin@google.com>
-Jói Sigurðsson <joi@google.com>
-Keir Mierle <mierle@gmail.com>
-Keith Ray <keith.ray@gmail.com>
-Kenton Varda <kenton@google.com>
-Manuel Klimek <klimek@google.com>
-Markus Heule <markus.heule@gmail.com>
-Mika Raento <mikie@iki.fi>
-Miklós Fazekas <mfazekas@szemafor.com>
-Pasi Valminen <pasi.valminen@gmail.com>
-Patrick Hanna <phanna@google.com>
-Patrick Riley <pfr@google.com>
-Peter Kaminski <piotrk@google.com>
-Preston Jackson <preston.a.jackson@gmail.com>
-Rainer Klaffenboeck <rainer.klaffenboeck@dynatrace.com>
-Russ Cox <rsc@google.com>
-Russ Rufer <russ@pentad.com>
-Sean Mcafee <eefacm@gmail.com>
-Sigurður �sgeirsson <siggi@google.com>
-Tracy Bialik <tracy@pentad.com>
-Vadim Berman <vadimb@google.com>
-Vlad Losev <vladl@google.com>
-Zhanyong Wan <wan@google.com>
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest-death-test.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest-death-test.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest-death-test.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest-death-test.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,343 +0,0 @@
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-//
-// The Google C++ Testing and Mocking Framework (Google Test)
-//
-// This header file defines the public API for death tests.  It is
-// #included by gtest.h so a user doesn't need to include this
-// directly.
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GTEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_
-#define GTEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_
-
-#include "gtest/internal/gtest-death-test-internal.h"
-
-namespace testing {
-
-// This flag controls the style of death tests.  Valid values are "threadsafe",
-// meaning that the death test child process will re-execute the test binary
-// from the start, running only a single death test, or "fast",
-// meaning that the child process will execute the test logic immediately
-// after forking.
-GTEST_DECLARE_string_(death_test_style);
-
-#if GTEST_HAS_DEATH_TEST
-
-namespace internal {
-
-// Returns a Boolean value indicating whether the caller is currently
-// executing in the context of the death test child process.  Tools such as
-// Valgrind heap checkers may need this to modify their behavior in death
-// tests.  IMPORTANT: This is an internal utility.  Using it may break the
-// implementation of death tests.  User code MUST NOT use it.
-GTEST_API_ bool InDeathTestChild();
-
-}  // namespace internal
-
-// The following macros are useful for writing death tests.
-
-// Here's what happens when an ASSERT_DEATH* or EXPECT_DEATH* is
-// executed:
-//
-//   1. It generates a warning if there is more than one active
-//   thread.  This is because it's safe to fork() or clone() only
-//   when there is a single thread.
-//
-//   2. The parent process clone()s a sub-process and runs the death
-//   test in it; the sub-process exits with code 0 at the end of the
-//   death test, if it hasn't exited already.
-//
-//   3. The parent process waits for the sub-process to terminate.
-//
-//   4. The parent process checks the exit code and error message of
-//   the sub-process.
-//
-// Examples:
-//
-//   ASSERT_DEATH(server.SendMessage(56, "Hello"), "Invalid port number");
-//   for (int i = 0; i < 5; i++) {
-//     EXPECT_DEATH(server.ProcessRequest(i),
-//                  "Invalid request .* in ProcessRequest()")
-//                  << "Failed to die on request " << i;
-//   }
-//
-//   ASSERT_EXIT(server.ExitNow(), ::testing::ExitedWithCode(0), "Exiting");
-//
-//   bool KilledBySIGHUP(int exit_code) {
-//     return WIFSIGNALED(exit_code) && WTERMSIG(exit_code) == SIGHUP;
-//   }
-//
-//   ASSERT_EXIT(client.HangUpServer(), KilledBySIGHUP, "Hanging up!");
-//
-// On the regular expressions used in death tests:
-//
-//   GOOGLETEST_CM0005 DO NOT DELETE
-//   On POSIX-compliant systems (*nix), we use the <regex.h> library,
-//   which uses the POSIX extended regex syntax.
-//
-//   On other platforms (e.g. Windows or Mac), we only support a simple regex
-//   syntax implemented as part of Google Test.  This limited
-//   implementation should be enough most of the time when writing
-//   death tests; though it lacks many features you can find in PCRE
-//   or POSIX extended regex syntax.  For example, we don't support
-//   union ("x|y"), grouping ("(xy)"), brackets ("[xy]"), and
-//   repetition count ("x{5,7}"), among others.
-//
-//   Below is the syntax that we do support.  We chose it to be a
-//   subset of both PCRE and POSIX extended regex, so it's easy to
-//   learn wherever you come from.  In the following: 'A' denotes a
-//   literal character, period (.), or a single \\ escape sequence;
-//   'x' and 'y' denote regular expressions; 'm' and 'n' are for
-//   natural numbers.
-//
-//     c     matches any literal character c
-//     \\d   matches any decimal digit
-//     \\D   matches any character that's not a decimal digit
-//     \\f   matches \f
-//     \\n   matches \n
-//     \\r   matches \r
-//     \\s   matches any ASCII whitespace, including \n
-//     \\S   matches any character that's not a whitespace
-//     \\t   matches \t
-//     \\v   matches \v
-//     \\w   matches any letter, _, or decimal digit
-//     \\W   matches any character that \\w doesn't match
-//     \\c   matches any literal character c, which must be a punctuation
-//     .     matches any single character except \n
-//     A?    matches 0 or 1 occurrences of A
-//     A*    matches 0 or many occurrences of A
-//     A+    matches 1 or many occurrences of A
-//     ^     matches the beginning of a string (not that of each line)
-//     $     matches the end of a string (not that of each line)
-//     xy    matches x followed by y
-//
-//   If you accidentally use PCRE or POSIX extended regex features
-//   not implemented by us, you will get a run-time failure.  In that
-//   case, please try to rewrite your regular expression within the
-//   above syntax.
-//
-//   This implementation is *not* meant to be as highly tuned or robust
-//   as a compiled regex library, but should perform well enough for a
-//   death test, which already incurs significant overhead by launching
-//   a child process.
-//
-// Known caveats:
-//
-//   A "threadsafe" style death test obtains the path to the test
-//   program from argv[0] and re-executes it in the sub-process.  For
-//   simplicity, the current implementation doesn't search the PATH
-//   when launching the sub-process.  This means that the user must
-//   invoke the test program via a path that contains at least one
-//   path separator (e.g. path/to/foo_test and
-//   /absolute/path/to/bar_test are fine, but foo_test is not).  This
-//   is rarely a problem as people usually don't put the test binary
-//   directory in PATH.
-//
-
-// Asserts that a given statement causes the program to exit, with an
-// integer exit status that satisfies predicate, and emitting error output
-// that matches regex.
-# define ASSERT_EXIT(statement, predicate, regex) \
-    GTEST_DEATH_TEST_(statement, predicate, regex, GTEST_FATAL_FAILURE_)
-
-// Like ASSERT_EXIT, but continues on to successive tests in the
-// test suite, if any:
-# define EXPECT_EXIT(statement, predicate, regex) \
-    GTEST_DEATH_TEST_(statement, predicate, regex, GTEST_NONFATAL_FAILURE_)
-
-// Asserts that a given statement causes the program to exit, either by
-// explicitly exiting with a nonzero exit code or being killed by a
-// signal, and emitting error output that matches regex.
-# define ASSERT_DEATH(statement, regex) \
-    ASSERT_EXIT(statement, ::testing::internal::ExitedUnsuccessfully, regex)
-
-// Like ASSERT_DEATH, but continues on to successive tests in the
-// test suite, if any:
-# define EXPECT_DEATH(statement, regex) \
-    EXPECT_EXIT(statement, ::testing::internal::ExitedUnsuccessfully, regex)
-
-// Two predicate classes that can be used in {ASSERT,EXPECT}_EXIT*:
-
-// Tests that an exit code describes a normal exit with a given exit code.
-class GTEST_API_ ExitedWithCode {
- public:
-  explicit ExitedWithCode(int exit_code);
-  bool operator()(int exit_status) const;
- private:
-  // No implementation - assignment is unsupported.
-  void operator=(const ExitedWithCode& other);
-
-  const int exit_code_;
-};
-
-# if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
-// Tests that an exit code describes an exit due to termination by a
-// given signal.
-// GOOGLETEST_CM0006 DO NOT DELETE
-class GTEST_API_ KilledBySignal {
- public:
-  explicit KilledBySignal(int signum);
-  bool operator()(int exit_status) const;
- private:
-  const int signum_;
-};
-# endif  // !GTEST_OS_WINDOWS
-
-// EXPECT_DEBUG_DEATH asserts that the given statements die in debug mode.
-// The death testing framework causes this to have interesting semantics,
-// since the sideeffects of the call are only visible in opt mode, and not
-// in debug mode.
-//
-// In practice, this can be used to test functions that utilize the
-// LOG(DFATAL) macro using the following style:
-//
-// int DieInDebugOr12(int* sideeffect) {
-//   if (sideeffect) {
-//     *sideeffect = 12;
-//   }
-//   LOG(DFATAL) << "death";
-//   return 12;
-// }
-//
-// TEST(TestSuite, TestDieOr12WorksInDgbAndOpt) {
-//   int sideeffect = 0;
-//   // Only asserts in dbg.
-//   EXPECT_DEBUG_DEATH(DieInDebugOr12(&sideeffect), "death");
-//
-// #ifdef NDEBUG
-//   // opt-mode has sideeffect visible.
-//   EXPECT_EQ(12, sideeffect);
-// #else
-//   // dbg-mode no visible sideeffect.
-//   EXPECT_EQ(0, sideeffect);
-// #endif
-// }
-//
-// This will assert that DieInDebugReturn12InOpt() crashes in debug
-// mode, usually due to a DCHECK or LOG(DFATAL), but returns the
-// appropriate fallback value (12 in this case) in opt mode. If you
-// need to test that a function has appropriate side-effects in opt
-// mode, include assertions against the side-effects.  A general
-// pattern for this is:
-//
-// EXPECT_DEBUG_DEATH({
-//   // Side-effects here will have an effect after this statement in
-//   // opt mode, but none in debug mode.
-//   EXPECT_EQ(12, DieInDebugOr12(&sideeffect));
-// }, "death");
-//
-# ifdef NDEBUG
-
-#  define EXPECT_DEBUG_DEATH(statement, regex) \
-  GTEST_EXECUTE_STATEMENT_(statement, regex)
-
-#  define ASSERT_DEBUG_DEATH(statement, regex) \
-  GTEST_EXECUTE_STATEMENT_(statement, regex)
-
-# else
-
-#  define EXPECT_DEBUG_DEATH(statement, regex) \
-  EXPECT_DEATH(statement, regex)
-
-#  define ASSERT_DEBUG_DEATH(statement, regex) \
-  ASSERT_DEATH(statement, regex)
-
-# endif  // NDEBUG for EXPECT_DEBUG_DEATH
-#endif  // GTEST_HAS_DEATH_TEST
-
-// This macro is used for implementing macros such as
-// EXPECT_DEATH_IF_SUPPORTED and ASSERT_DEATH_IF_SUPPORTED on systems where
-// death tests are not supported. Those macros must compile on such systems
-// if and only if EXPECT_DEATH and ASSERT_DEATH compile with the same parameters
-// on systems that support death tests. This allows one to write such a macro on
-// a system that does not support death tests and be sure that it will compile
-// on a death-test supporting system. It is exposed publicly so that systems
-// that have death-tests with stricter requirements than GTEST_HAS_DEATH_TEST
-// can write their own equivalent of EXPECT_DEATH_IF_SUPPORTED and
-// ASSERT_DEATH_IF_SUPPORTED.
-//
-// Parameters:
-//   statement -  A statement that a macro such as EXPECT_DEATH would test
-//                for program termination. This macro has to make sure this
-//                statement is compiled but not executed, to ensure that
-//                EXPECT_DEATH_IF_SUPPORTED compiles with a certain
-//                parameter if and only if EXPECT_DEATH compiles with it.
-//   regex     -  A regex that a macro such as EXPECT_DEATH would use to test
-//                the output of statement.  This parameter has to be
-//                compiled but not evaluated by this macro, to ensure that
-//                this macro only accepts expressions that a macro such as
-//                EXPECT_DEATH would accept.
-//   terminator - Must be an empty statement for EXPECT_DEATH_IF_SUPPORTED
-//                and a return statement for ASSERT_DEATH_IF_SUPPORTED.
-//                This ensures that ASSERT_DEATH_IF_SUPPORTED will not
-//                compile inside functions where ASSERT_DEATH doesn't
-//                compile.
-//
-//  The branch that has an always false condition is used to ensure that
-//  statement and regex are compiled (and thus syntactically correct) but
-//  never executed. The unreachable code macro protects the terminator
-//  statement from generating an 'unreachable code' warning in case
-//  statement unconditionally returns or throws. The Message constructor at
-//  the end allows the syntax of streaming additional messages into the
-//  macro, for compilational compatibility with EXPECT_DEATH/ASSERT_DEATH.
-# define GTEST_UNSUPPORTED_DEATH_TEST(statement, regex, terminator) \
-    GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
-    if (::testing::internal::AlwaysTrue()) { \
-      GTEST_LOG_(WARNING) \
-          << "Death tests are not supported on this platform.\n" \
-          << "Statement '" #statement "' cannot be verified."; \
-    } else if (::testing::internal::AlwaysFalse()) { \
-      ::testing::internal::RE::PartialMatch(".*", (regex)); \
-      GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
-      terminator; \
-    } else \
-      ::testing::Message()
-
-// EXPECT_DEATH_IF_SUPPORTED(statement, regex) and
-// ASSERT_DEATH_IF_SUPPORTED(statement, regex) expand to real death tests if
-// death tests are supported; otherwise they just issue a warning.  This is
-// useful when you are combining death test assertions with normal test
-// assertions in one test.
-#if GTEST_HAS_DEATH_TEST
-# define EXPECT_DEATH_IF_SUPPORTED(statement, regex) \
-    EXPECT_DEATH(statement, regex)
-# define ASSERT_DEATH_IF_SUPPORTED(statement, regex) \
-    ASSERT_DEATH(statement, regex)
-#else
-# define EXPECT_DEATH_IF_SUPPORTED(statement, regex) \
-    GTEST_UNSUPPORTED_DEATH_TEST(statement, regex, )
-# define ASSERT_DEATH_IF_SUPPORTED(statement, regex) \
-    GTEST_UNSUPPORTED_DEATH_TEST(statement, regex, return)
-#endif
-
-}  // namespace testing
-
-#endif  // GTEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,2478 +0,0 @@
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-//
-// The Google C++ Testing and Mocking Framework (Google Test)
-//
-// This header file defines the public API for Google Test.  It should be
-// included by any test program that uses Google Test.
-//
-// IMPORTANT NOTE: Due to limitation of the C++ language, we have to
-// leave some internal implementation details in this header file.
-// They are clearly marked by comments like this:
-//
-//   // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-//
-// Such code is NOT meant to be used by a user directly, and is subject
-// to CHANGE WITHOUT NOTICE.  Therefore DO NOT DEPEND ON IT in a user
-// program!
-//
-// Acknowledgment: Google Test borrowed the idea of automatic test
-// registration from Barthelemy Dagenais' (barthelemy@prologique.com)
-// easyUnit framework.
-
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GTEST_INCLUDE_GTEST_GTEST_H_
-#define GTEST_INCLUDE_GTEST_GTEST_H_
-
-#include <cstddef>
-#include <limits>
-#include <memory>
-#include <ostream>
-#include <type_traits>
-#include <vector>
-
-#include "gtest/internal/gtest-internal.h"
-#include "gtest/internal/gtest-string.h"
-#include "gtest/gtest-death-test.h"
-#include "gtest/gtest-matchers.h"
-#include "gtest/gtest-message.h"
-#include "gtest/gtest-param-test.h"
-#include "gtest/gtest-printers.h"
-#include "gtest/gtest_prod.h"
-#include "gtest/gtest-test-part.h"
-#include "gtest/gtest-typed-test.h"
-
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
-/* class A needs to have dll-interface to be used by clients of class B */)
-
-namespace testing {
-
-// Silence C4100 (unreferenced formal parameter) and 4805
-// unsafe mix of type 'const int' and type 'const bool'
-#ifdef _MSC_VER
-# pragma warning(push)
-# pragma warning(disable:4805)
-# pragma warning(disable:4100)
-#endif
-
-
-// Declares the flags.
-
-// This flag temporary enables the disabled tests.
-GTEST_DECLARE_bool_(also_run_disabled_tests);
-
-// This flag brings the debugger on an assertion failure.
-GTEST_DECLARE_bool_(break_on_failure);
-
-// This flag controls whether Google Test catches all test-thrown exceptions
-// and logs them as failures.
-GTEST_DECLARE_bool_(catch_exceptions);
-
-// This flag enables using colors in terminal output. Available values are
-// "yes" to enable colors, "no" (disable colors), or "auto" (the default)
-// to let Google Test decide.
-GTEST_DECLARE_string_(color);
-
-// This flag sets up the filter to select by name using a glob pattern
-// the tests to run. If the filter is not given all tests are executed.
-GTEST_DECLARE_string_(filter);
-
-// This flag controls whether Google Test installs a signal handler that dumps
-// debugging information when fatal signals are raised.
-GTEST_DECLARE_bool_(install_failure_signal_handler);
-
-// This flag causes the Google Test to list tests. None of the tests listed
-// are actually run if the flag is provided.
-GTEST_DECLARE_bool_(list_tests);
-
-// This flag controls whether Google Test emits a detailed XML report to a file
-// in addition to its normal textual output.
-GTEST_DECLARE_string_(output);
-
-// This flags control whether Google Test prints the elapsed time for each
-// test.
-GTEST_DECLARE_bool_(print_time);
-
-// This flags control whether Google Test prints UTF8 characters as text.
-GTEST_DECLARE_bool_(print_utf8);
-
-// This flag specifies the random number seed.
-GTEST_DECLARE_int32_(random_seed);
-
-// This flag sets how many times the tests are repeated. The default value
-// is 1. If the value is -1 the tests are repeating forever.
-GTEST_DECLARE_int32_(repeat);
-
-// This flag controls whether Google Test includes Google Test internal
-// stack frames in failure stack traces.
-GTEST_DECLARE_bool_(show_internal_stack_frames);
-
-// When this flag is specified, tests' order is randomized on every iteration.
-GTEST_DECLARE_bool_(shuffle);
-
-// This flag specifies the maximum number of stack frames to be
-// printed in a failure message.
-GTEST_DECLARE_int32_(stack_trace_depth);
-
-// When this flag is specified, a failed assertion will throw an
-// exception if exceptions are enabled, or exit the program with a
-// non-zero code otherwise. For use with an external test framework.
-GTEST_DECLARE_bool_(throw_on_failure);
-
-// When this flag is set with a "host:port" string, on supported
-// platforms test results are streamed to the specified port on
-// the specified host machine.
-GTEST_DECLARE_string_(stream_result_to);
-
-#if GTEST_USE_OWN_FLAGFILE_FLAG_
-GTEST_DECLARE_string_(flagfile);
-#endif  // GTEST_USE_OWN_FLAGFILE_FLAG_
-
-// The upper limit for valid stack trace depths.
-const int kMaxStackTraceDepth = 100;
-
-namespace internal {
-
-class AssertHelper;
-class DefaultGlobalTestPartResultReporter;
-class ExecDeathTest;
-class NoExecDeathTest;
-class FinalSuccessChecker;
-class GTestFlagSaver;
-class StreamingListenerTest;
-class TestResultAccessor;
-class TestEventListenersAccessor;
-class TestEventRepeater;
-class UnitTestRecordPropertyTestHelper;
-class WindowsDeathTest;
-class FuchsiaDeathTest;
-class UnitTestImpl* GetUnitTestImpl();
-void ReportFailureInUnknownLocation(TestPartResult::Type result_type,
-                                    const std::string& message);
-
-}  // namespace internal
-
-// The friend relationship of some of these classes is cyclic.
-// If we don't forward declare them the compiler might confuse the classes
-// in friendship clauses with same named classes on the scope.
-class Test;
-class TestSuite;
-
-// Old API is still available but deprecated
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-using TestCase = TestSuite;
-#endif
-class TestInfo;
-class UnitTest;
-
-// A class for indicating whether an assertion was successful.  When
-// the assertion wasn't successful, the AssertionResult object
-// remembers a non-empty message that describes how it failed.
-//
-// To create an instance of this class, use one of the factory functions
-// (AssertionSuccess() and AssertionFailure()).
-//
-// This class is useful for two purposes:
-//   1. Defining predicate functions to be used with Boolean test assertions
-//      EXPECT_TRUE/EXPECT_FALSE and their ASSERT_ counterparts
-//   2. Defining predicate-format functions to be
-//      used with predicate assertions (ASSERT_PRED_FORMAT*, etc).
-//
-// For example, if you define IsEven predicate:
-//
-//   testing::AssertionResult IsEven(int n) {
-//     if ((n % 2) == 0)
-//       return testing::AssertionSuccess();
-//     else
-//       return testing::AssertionFailure() << n << " is odd";
-//   }
-//
-// Then the failed expectation EXPECT_TRUE(IsEven(Fib(5)))
-// will print the message
-//
-//   Value of: IsEven(Fib(5))
-//     Actual: false (5 is odd)
-//   Expected: true
-//
-// instead of a more opaque
-//
-//   Value of: IsEven(Fib(5))
-//     Actual: false
-//   Expected: true
-//
-// in case IsEven is a simple Boolean predicate.
-//
-// If you expect your predicate to be reused and want to support informative
-// messages in EXPECT_FALSE and ASSERT_FALSE (negative assertions show up
-// about half as often as positive ones in our tests), supply messages for
-// both success and failure cases:
-//
-//   testing::AssertionResult IsEven(int n) {
-//     if ((n % 2) == 0)
-//       return testing::AssertionSuccess() << n << " is even";
-//     else
-//       return testing::AssertionFailure() << n << " is odd";
-//   }
-//
-// Then a statement EXPECT_FALSE(IsEven(Fib(6))) will print
-//
-//   Value of: IsEven(Fib(6))
-//     Actual: true (8 is even)
-//   Expected: false
-//
-// NB: Predicates that support negative Boolean assertions have reduced
-// performance in positive ones so be careful not to use them in tests
-// that have lots (tens of thousands) of positive Boolean assertions.
-//
-// To use this class with EXPECT_PRED_FORMAT assertions such as:
-//
-//   // Verifies that Foo() returns an even number.
-//   EXPECT_PRED_FORMAT1(IsEven, Foo());
-//
-// you need to define:
-//
-//   testing::AssertionResult IsEven(const char* expr, int n) {
-//     if ((n % 2) == 0)
-//       return testing::AssertionSuccess();
-//     else
-//       return testing::AssertionFailure()
-//         << "Expected: " << expr << " is even\n  Actual: it's " << n;
-//   }
-//
-// If Foo() returns 5, you will see the following message:
-//
-//   Expected: Foo() is even
-//     Actual: it's 5
-//
-class GTEST_API_ AssertionResult {
- public:
-  // Copy constructor.
-  // Used in EXPECT_TRUE/FALSE(assertion_result).
-  AssertionResult(const AssertionResult& other);
-
-#if defined(_MSC_VER) && _MSC_VER < 1910
-  GTEST_DISABLE_MSC_WARNINGS_PUSH_(4800 /* forcing value to bool */)
-#endif
-
-  // Used in the EXPECT_TRUE/FALSE(bool_expression).
-  //
-  // T must be contextually convertible to bool.
-  //
-  // The second parameter prevents this overload from being considered if
-  // the argument is implicitly convertible to AssertionResult. In that case
-  // we want AssertionResult's copy constructor to be used.
-  template <typename T>
-  explicit AssertionResult(
-      const T& success,
-      typename std::enable_if<
-          !std::is_convertible<T, AssertionResult>::value>::type*
-      /*enabler*/
-      = nullptr)
-      : success_(success) {}
-
-#if defined(_MSC_VER) && _MSC_VER < 1910
-  GTEST_DISABLE_MSC_WARNINGS_POP_()
-#endif
-
-  // Assignment operator.
-  AssertionResult& operator=(AssertionResult other) {
-    swap(other);
-    return *this;
-  }
-
-  // Returns true if and only if the assertion succeeded.
-  operator bool() const { return success_; }  // NOLINT
-
-  // Returns the assertion's negation. Used with EXPECT/ASSERT_FALSE.
-  AssertionResult operator!() const;
-
-  // Returns the text streamed into this AssertionResult. Test assertions
-  // use it when they fail (i.e., the predicate's outcome doesn't match the
-  // assertion's expectation). When nothing has been streamed into the
-  // object, returns an empty string.
-  const char* message() const {
-    return message_.get() != nullptr ? message_->c_str() : "";
-  }
-  // Deprecated; please use message() instead.
-  const char* failure_message() const { return message(); }
-
-  // Streams a custom failure message into this object.
-  template <typename T> AssertionResult& operator<<(const T& value) {
-    AppendMessage(Message() << value);
-    return *this;
-  }
-
-  // Allows streaming basic output manipulators such as endl or flush into
-  // this object.
-  AssertionResult& operator<<(
-      ::std::ostream& (*basic_manipulator)(::std::ostream& stream)) {
-    AppendMessage(Message() << basic_manipulator);
-    return *this;
-  }
-
- private:
-  // Appends the contents of message to message_.
-  void AppendMessage(const Message& a_message) {
-    if (message_.get() == nullptr) message_.reset(new ::std::string);
-    message_->append(a_message.GetString().c_str());
-  }
-
-  // Swap the contents of this AssertionResult with other.
-  void swap(AssertionResult& other);
-
-  // Stores result of the assertion predicate.
-  bool success_;
-  // Stores the message describing the condition in case the expectation
-  // construct is not satisfied with the predicate's outcome.
-  // Referenced via a pointer to avoid taking too much stack frame space
-  // with test assertions.
-  std::unique_ptr< ::std::string> message_;
-};
-
-// Makes a successful assertion result.
-GTEST_API_ AssertionResult AssertionSuccess();
-
-// Makes a failed assertion result.
-GTEST_API_ AssertionResult AssertionFailure();
-
-// Makes a failed assertion result with the given failure message.
-// Deprecated; use AssertionFailure() << msg.
-GTEST_API_ AssertionResult AssertionFailure(const Message& msg);
-
-}  // namespace testing
-
-// Includes the auto-generated header that implements a family of generic
-// predicate assertion macros. This include comes late because it relies on
-// APIs declared above.
-#include "gtest/gtest_pred_impl.h"
-
-namespace testing {
-
-// The abstract class that all tests inherit from.
-//
-// In Google Test, a unit test program contains one or many TestSuites, and
-// each TestSuite contains one or many Tests.
-//
-// When you define a test using the TEST macro, you don't need to
-// explicitly derive from Test - the TEST macro automatically does
-// this for you.
-//
-// The only time you derive from Test is when defining a test fixture
-// to be used in a TEST_F.  For example:
-//
-//   class FooTest : public testing::Test {
-//    protected:
-//     void SetUp() override { ... }
-//     void TearDown() override { ... }
-//     ...
-//   };
-//
-//   TEST_F(FooTest, Bar) { ... }
-//   TEST_F(FooTest, Baz) { ... }
-//
-// Test is not copyable.
-class GTEST_API_ Test {
- public:
-  friend class TestInfo;
-
-  // The d'tor is virtual as we intend to inherit from Test.
-  virtual ~Test();
-
-  // Sets up the stuff shared by all tests in this test case.
-  //
-  // Google Test will call Foo::SetUpTestSuite() before running the first
-  // test in test case Foo.  Hence a sub-class can define its own
-  // SetUpTestSuite() method to shadow the one defined in the super
-  // class.
-  // Failures that happen during SetUpTestSuite are logged but otherwise
-  // ignored.
-  static void SetUpTestSuite() {}
-
-  // Tears down the stuff shared by all tests in this test suite.
-  //
-  // Google Test will call Foo::TearDownTestSuite() after running the last
-  // test in test case Foo.  Hence a sub-class can define its own
-  // TearDownTestSuite() method to shadow the one defined in the super
-  // class.
-  // Failures that happen during TearDownTestSuite are logged but otherwise
-  // ignored.
-  static void TearDownTestSuite() {}
-
-  // Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  static void TearDownTestCase() {}
-  static void SetUpTestCase() {}
-#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-  // Returns true if and only if the current test has a fatal failure.
-  static bool HasFatalFailure();
-
-  // Returns true if and only if the current test has a non-fatal failure.
-  static bool HasNonfatalFailure();
-
-  // Returns true if and only if the current test was skipped.
-  static bool IsSkipped();
-
-  // Returns true if and only if the current test has a (either fatal or
-  // non-fatal) failure.
-  static bool HasFailure() { return HasFatalFailure() || HasNonfatalFailure(); }
-
-  // Logs a property for the current test, test suite, or for the entire
-  // invocation of the test program when used outside of the context of a
-  // test suite.  Only the last value for a given key is remembered.  These
-  // are public static so they can be called from utility functions that are
-  // not members of the test fixture.  Calls to RecordProperty made during
-  // lifespan of the test (from the moment its constructor starts to the
-  // moment its destructor finishes) will be output in XML as attributes of
-  // the <testcase> element.  Properties recorded from fixture's
-  // SetUpTestSuite or TearDownTestSuite are logged as attributes of the
-  // corresponding <testsuite> element.  Calls to RecordProperty made in the
-  // global context (before or after invocation of RUN_ALL_TESTS and from
-  // SetUp/TearDown method of Environment objects registered with Google
-  // Test) will be output as attributes of the <testsuites> element.
-  static void RecordProperty(const std::string& key, const std::string& value);
-  static void RecordProperty(const std::string& key, int value);
-
- protected:
-  // Creates a Test object.
-  Test();
-
-  // Sets up the test fixture.
-  virtual void SetUp();
-
-  // Tears down the test fixture.
-  virtual void TearDown();
-
- private:
-  // Returns true if and only if the current test has the same fixture class
-  // as the first test in the current test suite.
-  static bool HasSameFixtureClass();
-
-  // Runs the test after the test fixture has been set up.
-  //
-  // A sub-class must implement this to define the test logic.
-  //
-  // DO NOT OVERRIDE THIS FUNCTION DIRECTLY IN A USER PROGRAM.
-  // Instead, use the TEST or TEST_F macro.
-  virtual void TestBody() = 0;
-
-  // Sets up, executes, and tears down the test.
-  void Run();
-
-  // Deletes self.  We deliberately pick an unusual name for this
-  // internal method to avoid clashing with names used in user TESTs.
-  void DeleteSelf_() { delete this; }
-
-  const std::unique_ptr<GTEST_FLAG_SAVER_> gtest_flag_saver_;
-
-  // Often a user misspells SetUp() as Setup() and spends a long time
-  // wondering why it is never called by Google Test.  The declaration of
-  // the following method is solely for catching such an error at
-  // compile time:
-  //
-  //   - The return type is deliberately chosen to be not void, so it
-  //   will be a conflict if void Setup() is declared in the user's
-  //   test fixture.
-  //
-  //   - This method is private, so it will be another compiler error
-  //   if the method is called from the user's test fixture.
-  //
-  // DO NOT OVERRIDE THIS FUNCTION.
-  //
-  // If you see an error about overriding the following function or
-  // about it being private, you have mis-spelled SetUp() as Setup().
-  struct Setup_should_be_spelled_SetUp {};
-  virtual Setup_should_be_spelled_SetUp* Setup() { return nullptr; }
-
-  // We disallow copying Tests.
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(Test);
-};
-
-typedef internal::TimeInMillis TimeInMillis;
-
-// A copyable object representing a user specified test property which can be
-// output as a key/value string pair.
-//
-// Don't inherit from TestProperty as its destructor is not virtual.
-class TestProperty {
- public:
-  // C'tor.  TestProperty does NOT have a default constructor.
-  // Always use this constructor (with parameters) to create a
-  // TestProperty object.
-  TestProperty(const std::string& a_key, const std::string& a_value) :
-    key_(a_key), value_(a_value) {
-  }
-
-  // Gets the user supplied key.
-  const char* key() const {
-    return key_.c_str();
-  }
-
-  // Gets the user supplied value.
-  const char* value() const {
-    return value_.c_str();
-  }
-
-  // Sets a new value, overriding the one supplied in the constructor.
-  void SetValue(const std::string& new_value) {
-    value_ = new_value;
-  }
-
- private:
-  // The key supplied by the user.
-  std::string key_;
-  // The value supplied by the user.
-  std::string value_;
-};
-
-// The result of a single Test.  This includes a list of
-// TestPartResults, a list of TestProperties, a count of how many
-// death tests there are in the Test, and how much time it took to run
-// the Test.
-//
-// TestResult is not copyable.
-class GTEST_API_ TestResult {
- public:
-  // Creates an empty TestResult.
-  TestResult();
-
-  // D'tor.  Do not inherit from TestResult.
-  ~TestResult();
-
-  // Gets the number of all test parts.  This is the sum of the number
-  // of successful test parts and the number of failed test parts.
-  int total_part_count() const;
-
-  // Returns the number of the test properties.
-  int test_property_count() const;
-
-  // Returns true if and only if the test passed (i.e. no test part failed).
-  bool Passed() const { return !Skipped() && !Failed(); }
-
-  // Returns true if and only if the test was skipped.
-  bool Skipped() const;
-
-  // Returns true if and only if the test failed.
-  bool Failed() const;
-
-  // Returns true if and only if the test fatally failed.
-  bool HasFatalFailure() const;
-
-  // Returns true if and only if the test has a non-fatal failure.
-  bool HasNonfatalFailure() const;
-
-  // Returns the elapsed time, in milliseconds.
-  TimeInMillis elapsed_time() const { return elapsed_time_; }
-
-  // Gets the time of the test case start, in ms from the start of the
-  // UNIX epoch.
-  TimeInMillis start_timestamp() const { return start_timestamp_; }
-
-  // Returns the i-th test part result among all the results. i can range from 0
-  // to total_part_count() - 1. If i is not in that range, aborts the program.
-  const TestPartResult& GetTestPartResult(int i) const;
-
-  // Returns the i-th test property. i can range from 0 to
-  // test_property_count() - 1. If i is not in that range, aborts the
-  // program.
-  const TestProperty& GetTestProperty(int i) const;
-
- private:
-  friend class TestInfo;
-  friend class TestSuite;
-  friend class UnitTest;
-  friend class internal::DefaultGlobalTestPartResultReporter;
-  friend class internal::ExecDeathTest;
-  friend class internal::TestResultAccessor;
-  friend class internal::UnitTestImpl;
-  friend class internal::WindowsDeathTest;
-  friend class internal::FuchsiaDeathTest;
-
-  // Gets the vector of TestPartResults.
-  const std::vector<TestPartResult>& test_part_results() const {
-    return test_part_results_;
-  }
-
-  // Gets the vector of TestProperties.
-  const std::vector<TestProperty>& test_properties() const {
-    return test_properties_;
-  }
-
-  // Sets the start time.
-  void set_start_timestamp(TimeInMillis start) { start_timestamp_ = start; }
-
-  // Sets the elapsed time.
-  void set_elapsed_time(TimeInMillis elapsed) { elapsed_time_ = elapsed; }
-
-  // Adds a test property to the list. The property is validated and may add
-  // a non-fatal failure if invalid (e.g., if it conflicts with reserved
-  // key names). If a property is already recorded for the same key, the
-  // value will be updated, rather than storing multiple values for the same
-  // key.  xml_element specifies the element for which the property is being
-  // recorded and is used for validation.
-  void RecordProperty(const std::string& xml_element,
-                      const TestProperty& test_property);
-
-  // Adds a failure if the key is a reserved attribute of Google Test
-  // testsuite tags.  Returns true if the property is valid.
-  // FIXME: Validate attribute names are legal and human readable.
-  static bool ValidateTestProperty(const std::string& xml_element,
-                                   const TestProperty& test_property);
-
-  // Adds a test part result to the list.
-  void AddTestPartResult(const TestPartResult& test_part_result);
-
-  // Returns the death test count.
-  int death_test_count() const { return death_test_count_; }
-
-  // Increments the death test count, returning the new count.
-  int increment_death_test_count() { return ++death_test_count_; }
-
-  // Clears the test part results.
-  void ClearTestPartResults();
-
-  // Clears the object.
-  void Clear();
-
-  // Protects mutable state of the property vector and of owned
-  // properties, whose values may be updated.
-  internal::Mutex test_properites_mutex_;
-
-  // The vector of TestPartResults
-  std::vector<TestPartResult> test_part_results_;
-  // The vector of TestProperties
-  std::vector<TestProperty> test_properties_;
-  // Running count of death tests.
-  int death_test_count_;
-  // The start time, in milliseconds since UNIX Epoch.
-  TimeInMillis start_timestamp_;
-  // The elapsed time, in milliseconds.
-  TimeInMillis elapsed_time_;
-
-  // We disallow copying TestResult.
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestResult);
-};  // class TestResult
-
-// A TestInfo object stores the following information about a test:
-//
-//   Test suite name
-//   Test name
-//   Whether the test should be run
-//   A function pointer that creates the test object when invoked
-//   Test result
-//
-// The constructor of TestInfo registers itself with the UnitTest
-// singleton such that the RUN_ALL_TESTS() macro knows which tests to
-// run.
-class GTEST_API_ TestInfo {
- public:
-  // Destructs a TestInfo object.  This function is not virtual, so
-  // don't inherit from TestInfo.
-  ~TestInfo();
-
-  // Returns the test suite name.
-  const char* test_suite_name() const { return test_suite_name_.c_str(); }
-
-// Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  const char* test_case_name() const { return test_suite_name(); }
-#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-  // Returns the test name.
-  const char* name() const { return name_.c_str(); }
-
-  // Returns the name of the parameter type, or NULL if this is not a typed
-  // or a type-parameterized test.
-  const char* type_param() const {
-    if (type_param_.get() != nullptr) return type_param_->c_str();
-    return nullptr;
-  }
-
-  // Returns the text representation of the value parameter, or NULL if this
-  // is not a value-parameterized test.
-  const char* value_param() const {
-    if (value_param_.get() != nullptr) return value_param_->c_str();
-    return nullptr;
-  }
-
-  // Returns the file name where this test is defined.
-  const char* file() const { return location_.file.c_str(); }
-
-  // Returns the line where this test is defined.
-  int line() const { return location_.line; }
-
-  // Return true if this test should not be run because it's in another shard.
-  bool is_in_another_shard() const { return is_in_another_shard_; }
-
-  // Returns true if this test should run, that is if the test is not
-  // disabled (or it is disabled but the also_run_disabled_tests flag has
-  // been specified) and its full name matches the user-specified filter.
-  //
-  // Google Test allows the user to filter the tests by their full names.
-  // The full name of a test Bar in test suite Foo is defined as
-  // "Foo.Bar".  Only the tests that match the filter will run.
-  //
-  // A filter is a colon-separated list of glob (not regex) patterns,
-  // optionally followed by a '-' and a colon-separated list of
-  // negative patterns (tests to exclude).  A test is run if it
-  // matches one of the positive patterns and does not match any of
-  // the negative patterns.
-  //
-  // For example, *A*:Foo.* is a filter that matches any string that
-  // contains the character 'A' or starts with "Foo.".
-  bool should_run() const { return should_run_; }
-
-  // Returns true if and only if this test will appear in the XML report.
-  bool is_reportable() const {
-    // The XML report includes tests matching the filter, excluding those
-    // run in other shards.
-    return matches_filter_ && !is_in_another_shard_;
-  }
-
-  // Returns the result of the test.
-  const TestResult* result() const { return &result_; }
-
- private:
-#if GTEST_HAS_DEATH_TEST
-  friend class internal::DefaultDeathTestFactory;
-#endif  // GTEST_HAS_DEATH_TEST
-  friend class Test;
-  friend class TestSuite;
-  friend class internal::UnitTestImpl;
-  friend class internal::StreamingListenerTest;
-  friend TestInfo* internal::MakeAndRegisterTestInfo(
-      const char* test_suite_name, const char* name, const char* type_param,
-      const char* value_param, internal::CodeLocation code_location,
-      internal::TypeId fixture_class_id, internal::SetUpTestSuiteFunc set_up_tc,
-      internal::TearDownTestSuiteFunc tear_down_tc,
-      internal::TestFactoryBase* factory);
-
-  // Constructs a TestInfo object. The newly constructed instance assumes
-  // ownership of the factory object.
-  TestInfo(const std::string& test_suite_name, const std::string& name,
-           const char* a_type_param,   // NULL if not a type-parameterized test
-           const char* a_value_param,  // NULL if not a value-parameterized test
-           internal::CodeLocation a_code_location,
-           internal::TypeId fixture_class_id,
-           internal::TestFactoryBase* factory);
-
-  // Increments the number of death tests encountered in this test so
-  // far.
-  int increment_death_test_count() {
-    return result_.increment_death_test_count();
-  }
-
-  // Creates the test object, runs it, records its result, and then
-  // deletes it.
-  void Run();
-
-  static void ClearTestResult(TestInfo* test_info) {
-    test_info->result_.Clear();
-  }
-
-  // These fields are immutable properties of the test.
-  const std::string test_suite_name_;    // test suite name
-  const std::string name_;               // Test name
-  // Name of the parameter type, or NULL if this is not a typed or a
-  // type-parameterized test.
-  const std::unique_ptr<const ::std::string> type_param_;
-  // Text representation of the value parameter, or NULL if this is not a
-  // value-parameterized test.
-  const std::unique_ptr<const ::std::string> value_param_;
-  internal::CodeLocation location_;
-  const internal::TypeId fixture_class_id_;  // ID of the test fixture class
-  bool should_run_;           // True if and only if this test should run
-  bool is_disabled_;          // True if and only if this test is disabled
-  bool matches_filter_;       // True if this test matches the
-                              // user-specified filter.
-  bool is_in_another_shard_;  // Will be run in another shard.
-  internal::TestFactoryBase* const factory_;  // The factory that creates
-                                              // the test object
-
-  // This field is mutable and needs to be reset before running the
-  // test for the second time.
-  TestResult result_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestInfo);
-};
-
-// A test suite, which consists of a vector of TestInfos.
-//
-// TestSuite is not copyable.
-class GTEST_API_ TestSuite {
- public:
-  // Creates a TestSuite with the given name.
-  //
-  // TestSuite does NOT have a default constructor.  Always use this
-  // constructor to create a TestSuite object.
-  //
-  // Arguments:
-  //
-  //   name:         name of the test suite
-  //   a_type_param: the name of the test's type parameter, or NULL if
-  //                 this is not a type-parameterized test.
-  //   set_up_tc:    pointer to the function that sets up the test suite
-  //   tear_down_tc: pointer to the function that tears down the test suite
-  TestSuite(const char* name, const char* a_type_param,
-            internal::SetUpTestSuiteFunc set_up_tc,
-            internal::TearDownTestSuiteFunc tear_down_tc);
-
-  // Destructor of TestSuite.
-  virtual ~TestSuite();
-
-  // Gets the name of the TestSuite.
-  const char* name() const { return name_.c_str(); }
-
-  // Returns the name of the parameter type, or NULL if this is not a
-  // type-parameterized test suite.
-  const char* type_param() const {
-    if (type_param_.get() != nullptr) return type_param_->c_str();
-    return nullptr;
-  }
-
-  // Returns true if any test in this test suite should run.
-  bool should_run() const { return should_run_; }
-
-  // Gets the number of successful tests in this test suite.
-  int successful_test_count() const;
-
-  // Gets the number of skipped tests in this test suite.
-  int skipped_test_count() const;
-
-  // Gets the number of failed tests in this test suite.
-  int failed_test_count() const;
-
-  // Gets the number of disabled tests that will be reported in the XML report.
-  int reportable_disabled_test_count() const;
-
-  // Gets the number of disabled tests in this test suite.
-  int disabled_test_count() const;
-
-  // Gets the number of tests to be printed in the XML report.
-  int reportable_test_count() const;
-
-  // Get the number of tests in this test suite that should run.
-  int test_to_run_count() const;
-
-  // Gets the number of all tests in this test suite.
-  int total_test_count() const;
-
-  // Returns true if and only if the test suite passed.
-  bool Passed() const { return !Failed(); }
-
-  // Returns true if and only if the test suite failed.
-  bool Failed() const { return failed_test_count() > 0; }
-
-  // Returns the elapsed time, in milliseconds.
-  TimeInMillis elapsed_time() const { return elapsed_time_; }
-
-  // Gets the time of the test suite start, in ms from the start of the
-  // UNIX epoch.
-  TimeInMillis start_timestamp() const { return start_timestamp_; }
-
-  // Returns the i-th test among all the tests. i can range from 0 to
-  // total_test_count() - 1. If i is not in that range, returns NULL.
-  const TestInfo* GetTestInfo(int i) const;
-
-  // Returns the TestResult that holds test properties recorded during
-  // execution of SetUpTestSuite and TearDownTestSuite.
-  const TestResult& ad_hoc_test_result() const { return ad_hoc_test_result_; }
-
- private:
-  friend class Test;
-  friend class internal::UnitTestImpl;
-
-  // Gets the (mutable) vector of TestInfos in this TestSuite.
-  std::vector<TestInfo*>& test_info_list() { return test_info_list_; }
-
-  // Gets the (immutable) vector of TestInfos in this TestSuite.
-  const std::vector<TestInfo*>& test_info_list() const {
-    return test_info_list_;
-  }
-
-  // Returns the i-th test among all the tests. i can range from 0 to
-  // total_test_count() - 1. If i is not in that range, returns NULL.
-  TestInfo* GetMutableTestInfo(int i);
-
-  // Sets the should_run member.
-  void set_should_run(bool should) { should_run_ = should; }
-
-  // Adds a TestInfo to this test suite.  Will delete the TestInfo upon
-  // destruction of the TestSuite object.
-  void AddTestInfo(TestInfo * test_info);
-
-  // Clears the results of all tests in this test suite.
-  void ClearResult();
-
-  // Clears the results of all tests in the given test suite.
-  static void ClearTestSuiteResult(TestSuite* test_suite) {
-    test_suite->ClearResult();
-  }
-
-  // Runs every test in this TestSuite.
-  void Run();
-
-  // Runs SetUpTestSuite() for this TestSuite.  This wrapper is needed
-  // for catching exceptions thrown from SetUpTestSuite().
-  void RunSetUpTestSuite() {
-    if (set_up_tc_ != nullptr) {
-      (*set_up_tc_)();
-    }
-  }
-
-  // Runs TearDownTestSuite() for this TestSuite.  This wrapper is
-  // needed for catching exceptions thrown from TearDownTestSuite().
-  void RunTearDownTestSuite() {
-    if (tear_down_tc_ != nullptr) {
-      (*tear_down_tc_)();
-    }
-  }
-
-  // Returns true if and only if test passed.
-  static bool TestPassed(const TestInfo* test_info) {
-    return test_info->should_run() && test_info->result()->Passed();
-  }
-
-  // Returns true if and only if test skipped.
-  static bool TestSkipped(const TestInfo* test_info) {
-    return test_info->should_run() && test_info->result()->Skipped();
-  }
-
-  // Returns true if and only if test failed.
-  static bool TestFailed(const TestInfo* test_info) {
-    return test_info->should_run() && test_info->result()->Failed();
-  }
-
-  // Returns true if and only if the test is disabled and will be reported in
-  // the XML report.
-  static bool TestReportableDisabled(const TestInfo* test_info) {
-    return test_info->is_reportable() && test_info->is_disabled_;
-  }
-
-  // Returns true if and only if test is disabled.
-  static bool TestDisabled(const TestInfo* test_info) {
-    return test_info->is_disabled_;
-  }
-
-  // Returns true if and only if this test will appear in the XML report.
-  static bool TestReportable(const TestInfo* test_info) {
-    return test_info->is_reportable();
-  }
-
-  // Returns true if the given test should run.
-  static bool ShouldRunTest(const TestInfo* test_info) {
-    return test_info->should_run();
-  }
-
-  // Shuffles the tests in this test suite.
-  void ShuffleTests(internal::Random* random);
-
-  // Restores the test order to before the first shuffle.
-  void UnshuffleTests();
-
-  // Name of the test suite.
-  std::string name_;
-  // Name of the parameter type, or NULL if this is not a typed or a
-  // type-parameterized test.
-  const std::unique_ptr<const ::std::string> type_param_;
-  // The vector of TestInfos in their original order.  It owns the
-  // elements in the vector.
-  std::vector<TestInfo*> test_info_list_;
-  // Provides a level of indirection for the test list to allow easy
-  // shuffling and restoring the test order.  The i-th element in this
-  // vector is the index of the i-th test in the shuffled test list.
-  std::vector<int> test_indices_;
-  // Pointer to the function that sets up the test suite.
-  internal::SetUpTestSuiteFunc set_up_tc_;
-  // Pointer to the function that tears down the test suite.
-  internal::TearDownTestSuiteFunc tear_down_tc_;
-  // True if and only if any test in this test suite should run.
-  bool should_run_;
-  // The start time, in milliseconds since UNIX Epoch.
-  TimeInMillis start_timestamp_;
-  // Elapsed time, in milliseconds.
-  TimeInMillis elapsed_time_;
-  // Holds test properties recorded during execution of SetUpTestSuite and
-  // TearDownTestSuite.
-  TestResult ad_hoc_test_result_;
-
-  // We disallow copying TestSuites.
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestSuite);
-};
-
-// An Environment object is capable of setting up and tearing down an
-// environment.  You should subclass this to define your own
-// environment(s).
-//
-// An Environment object does the set-up and tear-down in virtual
-// methods SetUp() and TearDown() instead of the constructor and the
-// destructor, as:
-//
-//   1. You cannot safely throw from a destructor.  This is a problem
-//      as in some cases Google Test is used where exceptions are enabled, and
-//      we may want to implement ASSERT_* using exceptions where they are
-//      available.
-//   2. You cannot use ASSERT_* directly in a constructor or
-//      destructor.
-class Environment {
- public:
-  // The d'tor is virtual as we need to subclass Environment.
-  virtual ~Environment() {}
-
-  // Override this to define how to set up the environment.
-  virtual void SetUp() {}
-
-  // Override this to define how to tear down the environment.
-  virtual void TearDown() {}
- private:
-  // If you see an error about overriding the following function or
-  // about it being private, you have mis-spelled SetUp() as Setup().
-  struct Setup_should_be_spelled_SetUp {};
-  virtual Setup_should_be_spelled_SetUp* Setup() { return nullptr; }
-};
-
-#if GTEST_HAS_EXCEPTIONS
-
-// Exception which can be thrown from TestEventListener::OnTestPartResult.
-class GTEST_API_ AssertionException
-    : public internal::GoogleTestFailureException {
- public:
-  explicit AssertionException(const TestPartResult& result)
-      : GoogleTestFailureException(result) {}
-};
-
-#endif  // GTEST_HAS_EXCEPTIONS
-
-// The interface for tracing execution of tests. The methods are organized in
-// the order the corresponding events are fired.
-class TestEventListener {
- public:
-  virtual ~TestEventListener() {}
-
-  // Fired before any test activity starts.
-  virtual void OnTestProgramStart(const UnitTest& unit_test) = 0;
-
-  // Fired before each iteration of tests starts.  There may be more than
-  // one iteration if GTEST_FLAG(repeat) is set. iteration is the iteration
-  // index, starting from 0.
-  virtual void OnTestIterationStart(const UnitTest& unit_test,
-                                    int iteration) = 0;
-
-  // Fired before environment set-up for each iteration of tests starts.
-  virtual void OnEnvironmentsSetUpStart(const UnitTest& unit_test) = 0;
-
-  // Fired after environment set-up for each iteration of tests ends.
-  virtual void OnEnvironmentsSetUpEnd(const UnitTest& unit_test) = 0;
-
-  // Fired before the test suite starts.
-  virtual void OnTestSuiteStart(const TestSuite& /*test_suite*/) {}
-
-  //  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  virtual void OnTestCaseStart(const TestCase& /*test_case*/) {}
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-  // Fired before the test starts.
-  virtual void OnTestStart(const TestInfo& test_info) = 0;
-
-  // Fired after a failed assertion or a SUCCEED() invocation.
-  // If you want to throw an exception from this function to skip to the next
-  // TEST, it must be AssertionException defined above, or inherited from it.
-  virtual void OnTestPartResult(const TestPartResult& test_part_result) = 0;
-
-  // Fired after the test ends.
-  virtual void OnTestEnd(const TestInfo& test_info) = 0;
-
-  // Fired after the test suite ends.
-  virtual void OnTestSuiteEnd(const TestSuite& /*test_suite*/) {}
-
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  virtual void OnTestCaseEnd(const TestCase& /*test_case*/) {}
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-  // Fired before environment tear-down for each iteration of tests starts.
-  virtual void OnEnvironmentsTearDownStart(const UnitTest& unit_test) = 0;
-
-  // Fired after environment tear-down for each iteration of tests ends.
-  virtual void OnEnvironmentsTearDownEnd(const UnitTest& unit_test) = 0;
-
-  // Fired after each iteration of tests finishes.
-  virtual void OnTestIterationEnd(const UnitTest& unit_test,
-                                  int iteration) = 0;
-
-  // Fired after all test activities have ended.
-  virtual void OnTestProgramEnd(const UnitTest& unit_test) = 0;
-};
-
-// The convenience class for users who need to override just one or two
-// methods and are not concerned that a possible change to a signature of
-// the methods they override will not be caught during the build.  For
-// comments about each method please see the definition of TestEventListener
-// above.
-class EmptyTestEventListener : public TestEventListener {
- public:
-  void OnTestProgramStart(const UnitTest& /*unit_test*/) override {}
-  void OnTestIterationStart(const UnitTest& /*unit_test*/,
-                            int /*iteration*/) override {}
-  void OnEnvironmentsSetUpStart(const UnitTest& /*unit_test*/) override {}
-  void OnEnvironmentsSetUpEnd(const UnitTest& /*unit_test*/) override {}
-  void OnTestSuiteStart(const TestSuite& /*test_suite*/) override {}
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  void OnTestCaseStart(const TestCase& /*test_case*/) override {}
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-  void OnTestStart(const TestInfo& /*test_info*/) override {}
-  void OnTestPartResult(const TestPartResult& /*test_part_result*/) override {}
-  void OnTestEnd(const TestInfo& /*test_info*/) override {}
-  void OnTestSuiteEnd(const TestSuite& /*test_suite*/) override {}
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  void OnTestCaseEnd(const TestCase& /*test_case*/) override {}
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-  void OnEnvironmentsTearDownStart(const UnitTest& /*unit_test*/) override {}
-  void OnEnvironmentsTearDownEnd(const UnitTest& /*unit_test*/) override {}
-  void OnTestIterationEnd(const UnitTest& /*unit_test*/,
-                          int /*iteration*/) override {}
-  void OnTestProgramEnd(const UnitTest& /*unit_test*/) override {}
-};
-
-// TestEventListeners lets users add listeners to track events in Google Test.
-class GTEST_API_ TestEventListeners {
- public:
-  TestEventListeners();
-  ~TestEventListeners();
-
-  // Appends an event listener to the end of the list. Google Test assumes
-  // the ownership of the listener (i.e. it will delete the listener when
-  // the test program finishes).
-  void Append(TestEventListener* listener);
-
-  // Removes the given event listener from the list and returns it.  It then
-  // becomes the caller's responsibility to delete the listener. Returns
-  // NULL if the listener is not found in the list.
-  TestEventListener* Release(TestEventListener* listener);
-
-  // Returns the standard listener responsible for the default console
-  // output.  Can be removed from the listeners list to shut down default
-  // console output.  Note that removing this object from the listener list
-  // with Release transfers its ownership to the caller and makes this
-  // function return NULL the next time.
-  TestEventListener* default_result_printer() const {
-    return default_result_printer_;
-  }
-
-  // Returns the standard listener responsible for the default XML output
-  // controlled by the --gtest_output=xml flag.  Can be removed from the
-  // listeners list by users who want to shut down the default XML output
-  // controlled by this flag and substitute it with custom one.  Note that
-  // removing this object from the listener list with Release transfers its
-  // ownership to the caller and makes this function return NULL the next
-  // time.
-  TestEventListener* default_xml_generator() const {
-    return default_xml_generator_;
-  }
-
- private:
-  friend class TestSuite;
-  friend class TestInfo;
-  friend class internal::DefaultGlobalTestPartResultReporter;
-  friend class internal::NoExecDeathTest;
-  friend class internal::TestEventListenersAccessor;
-  friend class internal::UnitTestImpl;
-
-  // Returns repeater that broadcasts the TestEventListener events to all
-  // subscribers.
-  TestEventListener* repeater();
-
-  // Sets the default_result_printer attribute to the provided listener.
-  // The listener is also added to the listener list and previous
-  // default_result_printer is removed from it and deleted. The listener can
-  // also be NULL in which case it will not be added to the list. Does
-  // nothing if the previous and the current listener objects are the same.
-  void SetDefaultResultPrinter(TestEventListener* listener);
-
-  // Sets the default_xml_generator attribute to the provided listener.  The
-  // listener is also added to the listener list and previous
-  // default_xml_generator is removed from it and deleted. The listener can
-  // also be NULL in which case it will not be added to the list. Does
-  // nothing if the previous and the current listener objects are the same.
-  void SetDefaultXmlGenerator(TestEventListener* listener);
-
-  // Controls whether events will be forwarded by the repeater to the
-  // listeners in the list.
-  bool EventForwardingEnabled() const;
-  void SuppressEventForwarding();
-
-  // The actual list of listeners.
-  internal::TestEventRepeater* repeater_;
-  // Listener responsible for the standard result output.
-  TestEventListener* default_result_printer_;
-  // Listener responsible for the creation of the XML output file.
-  TestEventListener* default_xml_generator_;
-
-  // We disallow copying TestEventListeners.
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestEventListeners);
-};
-
-// A UnitTest consists of a vector of TestSuites.
-//
-// This is a singleton class.  The only instance of UnitTest is
-// created when UnitTest::GetInstance() is first called.  This
-// instance is never deleted.
-//
-// UnitTest is not copyable.
-//
-// This class is thread-safe as long as the methods are called
-// according to their specification.
-class GTEST_API_ UnitTest {
- public:
-  // Gets the singleton UnitTest object.  The first time this method
-  // is called, a UnitTest object is constructed and returned.
-  // Consecutive calls will return the same object.
-  static UnitTest* GetInstance();
-
-  // Runs all tests in this UnitTest object and prints the result.
-  // Returns 0 if successful, or 1 otherwise.
-  //
-  // This method can only be called from the main thread.
-  //
-  // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-  int Run() GTEST_MUST_USE_RESULT_;
-
-  // Returns the working directory when the first TEST() or TEST_F()
-  // was executed.  The UnitTest object owns the string.
-  const char* original_working_dir() const;
-
-  // Returns the TestSuite object for the test that's currently running,
-  // or NULL if no test is running.
-  const TestSuite* current_test_suite() const GTEST_LOCK_EXCLUDED_(mutex_);
-
-// Legacy API is still available but deprecated
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  const TestCase* current_test_case() const GTEST_LOCK_EXCLUDED_(mutex_);
-#endif
-
-  // Returns the TestInfo object for the test that's currently running,
-  // or NULL if no test is running.
-  const TestInfo* current_test_info() const
-      GTEST_LOCK_EXCLUDED_(mutex_);
-
-  // Returns the random seed used at the start of the current test run.
-  int random_seed() const;
-
-  // Returns the ParameterizedTestSuiteRegistry object used to keep track of
-  // value-parameterized tests and instantiate and register them.
-  //
-  // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-  internal::ParameterizedTestSuiteRegistry& parameterized_test_registry()
-      GTEST_LOCK_EXCLUDED_(mutex_);
-
-  // Gets the number of successful test suites.
-  int successful_test_suite_count() const;
-
-  // Gets the number of failed test suites.
-  int failed_test_suite_count() const;
-
-  // Gets the number of all test suites.
-  int total_test_suite_count() const;
-
-  // Gets the number of all test suites that contain at least one test
-  // that should run.
-  int test_suite_to_run_count() const;
-
-  //  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  int successful_test_case_count() const;
-  int failed_test_case_count() const;
-  int total_test_case_count() const;
-  int test_case_to_run_count() const;
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-  // Gets the number of successful tests.
-  int successful_test_count() const;
-
-  // Gets the number of skipped tests.
-  int skipped_test_count() const;
-
-  // Gets the number of failed tests.
-  int failed_test_count() const;
-
-  // Gets the number of disabled tests that will be reported in the XML report.
-  int reportable_disabled_test_count() const;
-
-  // Gets the number of disabled tests.
-  int disabled_test_count() const;
-
-  // Gets the number of tests to be printed in the XML report.
-  int reportable_test_count() const;
-
-  // Gets the number of all tests.
-  int total_test_count() const;
-
-  // Gets the number of tests that should run.
-  int test_to_run_count() const;
-
-  // Gets the time of the test program start, in ms from the start of the
-  // UNIX epoch.
-  TimeInMillis start_timestamp() const;
-
-  // Gets the elapsed time, in milliseconds.
-  TimeInMillis elapsed_time() const;
-
-  // Returns true if and only if the unit test passed (i.e. all test suites
-  // passed).
-  bool Passed() const;
-
-  // Returns true if and only if the unit test failed (i.e. some test suite
-  // failed or something outside of all tests failed).
-  bool Failed() const;
-
-  // Gets the i-th test suite among all the test suites. i can range from 0 to
-  // total_test_suite_count() - 1. If i is not in that range, returns NULL.
-  const TestSuite* GetTestSuite(int i) const;
-
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  const TestCase* GetTestCase(int i) const;
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-  // Returns the TestResult containing information on test failures and
-  // properties logged outside of individual test suites.
-  const TestResult& ad_hoc_test_result() const;
-
-  // Returns the list of event listeners that can be used to track events
-  // inside Google Test.
-  TestEventListeners& listeners();
-
- private:
-  // Registers and returns a global test environment.  When a test
-  // program is run, all global test environments will be set-up in
-  // the order they were registered.  After all tests in the program
-  // have finished, all global test environments will be torn-down in
-  // the *reverse* order they were registered.
-  //
-  // The UnitTest object takes ownership of the given environment.
-  //
-  // This method can only be called from the main thread.
-  Environment* AddEnvironment(Environment* env);
-
-  // Adds a TestPartResult to the current TestResult object.  All
-  // Google Test assertion macros (e.g. ASSERT_TRUE, EXPECT_EQ, etc)
-  // eventually call this to report their results.  The user code
-  // should use the assertion macros instead of calling this directly.
-  void AddTestPartResult(TestPartResult::Type result_type,
-                         const char* file_name,
-                         int line_number,
-                         const std::string& message,
-                         const std::string& os_stack_trace)
-      GTEST_LOCK_EXCLUDED_(mutex_);
-
-  // Adds a TestProperty to the current TestResult object when invoked from
-  // inside a test, to current TestSuite's ad_hoc_test_result_ when invoked
-  // from SetUpTestSuite or TearDownTestSuite, or to the global property set
-  // when invoked elsewhere.  If the result already contains a property with
-  // the same key, the value will be updated.
-  void RecordProperty(const std::string& key, const std::string& value);
-
-  // Gets the i-th test suite among all the test suites. i can range from 0 to
-  // total_test_suite_count() - 1. If i is not in that range, returns NULL.
-  TestSuite* GetMutableTestSuite(int i);
-
-  // Accessors for the implementation object.
-  internal::UnitTestImpl* impl() { return impl_; }
-  const internal::UnitTestImpl* impl() const { return impl_; }
-
-  // These classes and functions are friends as they need to access private
-  // members of UnitTest.
-  friend class ScopedTrace;
-  friend class Test;
-  friend class internal::AssertHelper;
-  friend class internal::StreamingListenerTest;
-  friend class internal::UnitTestRecordPropertyTestHelper;
-  friend Environment* AddGlobalTestEnvironment(Environment* env);
-  friend internal::UnitTestImpl* internal::GetUnitTestImpl();
-  friend void internal::ReportFailureInUnknownLocation(
-      TestPartResult::Type result_type,
-      const std::string& message);
-
-  // Creates an empty UnitTest.
-  UnitTest();
-
-  // D'tor
-  virtual ~UnitTest();
-
-  // Pushes a trace defined by SCOPED_TRACE() on to the per-thread
-  // Google Test trace stack.
-  void PushGTestTrace(const internal::TraceInfo& trace)
-      GTEST_LOCK_EXCLUDED_(mutex_);
-
-  // Pops a trace from the per-thread Google Test trace stack.
-  void PopGTestTrace()
-      GTEST_LOCK_EXCLUDED_(mutex_);
-
-  // Protects mutable state in *impl_.  This is mutable as some const
-  // methods need to lock it too.
-  mutable internal::Mutex mutex_;
-
-  // Opaque implementation object.  This field is never changed once
-  // the object is constructed.  We don't mark it as const here, as
-  // doing so will cause a warning in the constructor of UnitTest.
-  // Mutable state in *impl_ is protected by mutex_.
-  internal::UnitTestImpl* impl_;
-
-  // We disallow copying UnitTest.
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(UnitTest);
-};
-
-// A convenient wrapper for adding an environment for the test
-// program.
-//
-// You should call this before RUN_ALL_TESTS() is called, probably in
-// main().  If you use gtest_main, you need to call this before main()
-// starts for it to take effect.  For example, you can define a global
-// variable like this:
-//
-//   testing::Environment* const foo_env =
-//       testing::AddGlobalTestEnvironment(new FooEnvironment);
-//
-// However, we strongly recommend you to write your own main() and
-// call AddGlobalTestEnvironment() there, as relying on initialization
-// of global variables makes the code harder to read and may cause
-// problems when you register multiple environments from different
-// translation units and the environments have dependencies among them
-// (remember that the compiler doesn't guarantee the order in which
-// global variables from different translation units are initialized).
-inline Environment* AddGlobalTestEnvironment(Environment* env) {
-  return UnitTest::GetInstance()->AddEnvironment(env);
-}
-
-// Initializes Google Test.  This must be called before calling
-// RUN_ALL_TESTS().  In particular, it parses a command line for the
-// flags that Google Test recognizes.  Whenever a Google Test flag is
-// seen, it is removed from argv, and *argc is decremented.
-//
-// No value is returned.  Instead, the Google Test flag variables are
-// updated.
-//
-// Calling the function for the second time has no user-visible effect.
-GTEST_API_ void InitGoogleTest(int* argc, char** argv);
-
-// This overloaded version can be used in Windows programs compiled in
-// UNICODE mode.
-GTEST_API_ void InitGoogleTest(int* argc, wchar_t** argv);
-
-// This overloaded version can be used on Arduino/embedded platforms where
-// there is no argc/argv.
-GTEST_API_ void InitGoogleTest();
-
-namespace internal {
-
-// Separate the error generating code from the code path to reduce the stack
-// frame size of CmpHelperEQ. This helps reduce the overhead of some sanitizers
-// when calling EXPECT_* in a tight loop.
-template <typename T1, typename T2>
-AssertionResult CmpHelperEQFailure(const char* lhs_expression,
-                                   const char* rhs_expression,
-                                   const T1& lhs, const T2& rhs) {
-  return EqFailure(lhs_expression,
-                   rhs_expression,
-                   FormatForComparisonFailureMessage(lhs, rhs),
-                   FormatForComparisonFailureMessage(rhs, lhs),
-                   false);
-}
-
-// This block of code defines operator==/!=
-// to block lexical scope lookup.
-// It prevents using invalid operator==/!= defined at namespace scope.
-struct faketype {};
-inline bool operator==(faketype, faketype) { return true; }
-inline bool operator!=(faketype, faketype) { return false; }
-
-// The helper function for {ASSERT|EXPECT}_EQ.
-template <typename T1, typename T2>
-AssertionResult CmpHelperEQ(const char* lhs_expression,
-                            const char* rhs_expression,
-                            const T1& lhs,
-                            const T2& rhs) {
-  if (lhs == rhs) {
-    return AssertionSuccess();
-  }
-
-  return CmpHelperEQFailure(lhs_expression, rhs_expression, lhs, rhs);
-}
-
-// With this overloaded version, we allow anonymous enums to be used
-// in {ASSERT|EXPECT}_EQ when compiled with gcc 4, as anonymous enums
-// can be implicitly cast to BiggestInt.
-GTEST_API_ AssertionResult CmpHelperEQ(const char* lhs_expression,
-                                       const char* rhs_expression,
-                                       BiggestInt lhs,
-                                       BiggestInt rhs);
-
-class EqHelper {
- public:
-  // This templatized version is for the general case.
-  template <
-      typename T1, typename T2,
-      // Disable this overload for cases where one argument is a pointer
-      // and the other is the null pointer constant.
-      typename std::enable_if<!std::is_integral<T1>::value ||
-                              !std::is_pointer<T2>::value>::type* = nullptr>
-  static AssertionResult Compare(const char* lhs_expression,
-                                 const char* rhs_expression, const T1& lhs,
-                                 const T2& rhs) {
-    return CmpHelperEQ(lhs_expression, rhs_expression, lhs, rhs);
-  }
-
-  // With this overloaded version, we allow anonymous enums to be used
-  // in {ASSERT|EXPECT}_EQ when compiled with gcc 4, as anonymous
-  // enums can be implicitly cast to BiggestInt.
-  //
-  // Even though its body looks the same as the above version, we
-  // cannot merge the two, as it will make anonymous enums unhappy.
-  static AssertionResult Compare(const char* lhs_expression,
-                                 const char* rhs_expression,
-                                 BiggestInt lhs,
-                                 BiggestInt rhs) {
-    return CmpHelperEQ(lhs_expression, rhs_expression, lhs, rhs);
-  }
-
-  template <typename T>
-  static AssertionResult Compare(
-      const char* lhs_expression, const char* rhs_expression,
-      // Handle cases where '0' is used as a null pointer literal.
-      std::nullptr_t /* lhs */, T* rhs) {
-    // We already know that 'lhs' is a null pointer.
-    return CmpHelperEQ(lhs_expression, rhs_expression, static_cast<T*>(nullptr),
-                       rhs);
-  }
-};
-
-// Separate the error generating code from the code path to reduce the stack
-// frame size of CmpHelperOP. This helps reduce the overhead of some sanitizers
-// when calling EXPECT_OP in a tight loop.
-template <typename T1, typename T2>
-AssertionResult CmpHelperOpFailure(const char* expr1, const char* expr2,
-                                   const T1& val1, const T2& val2,
-                                   const char* op) {
-  return AssertionFailure()
-         << "Expected: (" << expr1 << ") " << op << " (" << expr2
-         << "), actual: " << FormatForComparisonFailureMessage(val1, val2)
-         << " vs " << FormatForComparisonFailureMessage(val2, val1);
-}
-
-// A macro for implementing the helper functions needed to implement
-// ASSERT_?? and EXPECT_??.  It is here just to avoid copy-and-paste
-// of similar code.
-//
-// For each templatized helper function, we also define an overloaded
-// version for BiggestInt in order to reduce code bloat and allow
-// anonymous enums to be used with {ASSERT|EXPECT}_?? when compiled
-// with gcc 4.
-//
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-
-#define GTEST_IMPL_CMP_HELPER_(op_name, op)\
-template <typename T1, typename T2>\
-AssertionResult CmpHelper##op_name(const char* expr1, const char* expr2, \
-                                   const T1& val1, const T2& val2) {\
-  if (val1 op val2) {\
-    return AssertionSuccess();\
-  } else {\
-    return CmpHelperOpFailure(expr1, expr2, val1, val2, #op);\
-  }\
-}\
-GTEST_API_ AssertionResult CmpHelper##op_name(\
-    const char* expr1, const char* expr2, BiggestInt val1, BiggestInt val2)
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-
-// Implements the helper function for {ASSERT|EXPECT}_NE
-GTEST_IMPL_CMP_HELPER_(NE, !=);
-// Implements the helper function for {ASSERT|EXPECT}_LE
-GTEST_IMPL_CMP_HELPER_(LE, <=);
-// Implements the helper function for {ASSERT|EXPECT}_LT
-GTEST_IMPL_CMP_HELPER_(LT, <);
-// Implements the helper function for {ASSERT|EXPECT}_GE
-GTEST_IMPL_CMP_HELPER_(GE, >=);
-// Implements the helper function for {ASSERT|EXPECT}_GT
-GTEST_IMPL_CMP_HELPER_(GT, >);
-
-#undef GTEST_IMPL_CMP_HELPER_
-
-// The helper function for {ASSERT|EXPECT}_STREQ.
-//
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-GTEST_API_ AssertionResult CmpHelperSTREQ(const char* s1_expression,
-                                          const char* s2_expression,
-                                          const char* s1,
-                                          const char* s2);
-
-// The helper function for {ASSERT|EXPECT}_STRCASEEQ.
-//
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-GTEST_API_ AssertionResult CmpHelperSTRCASEEQ(const char* s1_expression,
-                                              const char* s2_expression,
-                                              const char* s1,
-                                              const char* s2);
-
-// The helper function for {ASSERT|EXPECT}_STRNE.
-//
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-GTEST_API_ AssertionResult CmpHelperSTRNE(const char* s1_expression,
-                                          const char* s2_expression,
-                                          const char* s1,
-                                          const char* s2);
-
-// The helper function for {ASSERT|EXPECT}_STRCASENE.
-//
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-GTEST_API_ AssertionResult CmpHelperSTRCASENE(const char* s1_expression,
-                                              const char* s2_expression,
-                                              const char* s1,
-                                              const char* s2);
-
-
-// Helper function for *_STREQ on wide strings.
-//
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-GTEST_API_ AssertionResult CmpHelperSTREQ(const char* s1_expression,
-                                          const char* s2_expression,
-                                          const wchar_t* s1,
-                                          const wchar_t* s2);
-
-// Helper function for *_STRNE on wide strings.
-//
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-GTEST_API_ AssertionResult CmpHelperSTRNE(const char* s1_expression,
-                                          const char* s2_expression,
-                                          const wchar_t* s1,
-                                          const wchar_t* s2);
-
-}  // namespace internal
-
-// IsSubstring() and IsNotSubstring() are intended to be used as the
-// first argument to {EXPECT,ASSERT}_PRED_FORMAT2(), not by
-// themselves.  They check whether needle is a substring of haystack
-// (NULL is considered a substring of itself only), and return an
-// appropriate error message when they fail.
-//
-// The {needle,haystack}_expr arguments are the stringified
-// expressions that generated the two real arguments.
-GTEST_API_ AssertionResult IsSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const char* needle, const char* haystack);
-GTEST_API_ AssertionResult IsSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const wchar_t* needle, const wchar_t* haystack);
-GTEST_API_ AssertionResult IsNotSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const char* needle, const char* haystack);
-GTEST_API_ AssertionResult IsNotSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const wchar_t* needle, const wchar_t* haystack);
-GTEST_API_ AssertionResult IsSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const ::std::string& needle, const ::std::string& haystack);
-GTEST_API_ AssertionResult IsNotSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const ::std::string& needle, const ::std::string& haystack);
-
-#if GTEST_HAS_STD_WSTRING
-GTEST_API_ AssertionResult IsSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const ::std::wstring& needle, const ::std::wstring& haystack);
-GTEST_API_ AssertionResult IsNotSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const ::std::wstring& needle, const ::std::wstring& haystack);
-#endif  // GTEST_HAS_STD_WSTRING
-
-namespace internal {
-
-// Helper template function for comparing floating-points.
-//
-// Template parameter:
-//
-//   RawType: the raw floating-point type (either float or double)
-//
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-template <typename RawType>
-AssertionResult CmpHelperFloatingPointEQ(const char* lhs_expression,
-                                         const char* rhs_expression,
-                                         RawType lhs_value,
-                                         RawType rhs_value) {
-  const FloatingPoint<RawType> lhs(lhs_value), rhs(rhs_value);
-
-  if (lhs.AlmostEquals(rhs)) {
-    return AssertionSuccess();
-  }
-
-  ::std::stringstream lhs_ss;
-  lhs_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
-         << lhs_value;
-
-  ::std::stringstream rhs_ss;
-  rhs_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
-         << rhs_value;
-
-  return EqFailure(lhs_expression,
-                   rhs_expression,
-                   StringStreamToString(&lhs_ss),
-                   StringStreamToString(&rhs_ss),
-                   false);
-}
-
-// Helper function for implementing ASSERT_NEAR.
-//
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-GTEST_API_ AssertionResult DoubleNearPredFormat(const char* expr1,
-                                                const char* expr2,
-                                                const char* abs_error_expr,
-                                                double val1,
-                                                double val2,
-                                                double abs_error);
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-// A class that enables one to stream messages to assertion macros
-class GTEST_API_ AssertHelper {
- public:
-  // Constructor.
-  AssertHelper(TestPartResult::Type type,
-               const char* file,
-               int line,
-               const char* message);
-  ~AssertHelper();
-
-  // Message assignment is a semantic trick to enable assertion
-  // streaming; see the GTEST_MESSAGE_ macro below.
-  void operator=(const Message& message) const;
-
- private:
-  // We put our data in a struct so that the size of the AssertHelper class can
-  // be as small as possible.  This is important because gcc is incapable of
-  // re-using stack space even for temporary variables, so every EXPECT_EQ
-  // reserves stack space for another AssertHelper.
-  struct AssertHelperData {
-    AssertHelperData(TestPartResult::Type t,
-                     const char* srcfile,
-                     int line_num,
-                     const char* msg)
-        : type(t), file(srcfile), line(line_num), message(msg) { }
-
-    TestPartResult::Type const type;
-    const char* const file;
-    int const line;
-    std::string const message;
-
-   private:
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(AssertHelperData);
-  };
-
-  AssertHelperData* const data_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(AssertHelper);
-};
-
-enum GTestColor { COLOR_DEFAULT, COLOR_RED, COLOR_GREEN, COLOR_YELLOW };
-
-GTEST_API_ GTEST_ATTRIBUTE_PRINTF_(2, 3) void ColoredPrintf(GTestColor color,
-                                                            const char* fmt,
-                                                            ...);
-
-}  // namespace internal
-
-// The pure interface class that all value-parameterized tests inherit from.
-// A value-parameterized class must inherit from both ::testing::Test and
-// ::testing::WithParamInterface. In most cases that just means inheriting
-// from ::testing::TestWithParam, but more complicated test hierarchies
-// may need to inherit from Test and WithParamInterface at different levels.
-//
-// This interface has support for accessing the test parameter value via
-// the GetParam() method.
-//
-// Use it with one of the parameter generator defining functions, like Range(),
-// Values(), ValuesIn(), Bool(), and Combine().
-//
-// class FooTest : public ::testing::TestWithParam<int> {
-//  protected:
-//   FooTest() {
-//     // Can use GetParam() here.
-//   }
-//   ~FooTest() override {
-//     // Can use GetParam() here.
-//   }
-//   void SetUp() override {
-//     // Can use GetParam() here.
-//   }
-//   void TearDown override {
-//     // Can use GetParam() here.
-//   }
-// };
-// TEST_P(FooTest, DoesBar) {
-//   // Can use GetParam() method here.
-//   Foo foo;
-//   ASSERT_TRUE(foo.DoesBar(GetParam()));
-// }
-// INSTANTIATE_TEST_SUITE_P(OneToTenRange, FooTest, ::testing::Range(1, 10));
-
-template <typename T>
-class WithParamInterface {
- public:
-  typedef T ParamType;
-  virtual ~WithParamInterface() {}
-
-  // The current parameter value. Is also available in the test fixture's
-  // constructor.
-  static const ParamType& GetParam() {
-    GTEST_CHECK_(parameter_ != nullptr)
-        << "GetParam() can only be called inside a value-parameterized test "
-        << "-- did you intend to write TEST_P instead of TEST_F?";
-    return *parameter_;
-  }
-
- private:
-  // Sets parameter value. The caller is responsible for making sure the value
-  // remains alive and unchanged throughout the current test.
-  static void SetParam(const ParamType* parameter) {
-    parameter_ = parameter;
-  }
-
-  // Static value used for accessing parameter during a test lifetime.
-  static const ParamType* parameter_;
-
-  // TestClass must be a subclass of WithParamInterface<T> and Test.
-  template <class TestClass> friend class internal::ParameterizedTestFactory;
-};
-
-template <typename T>
-const T* WithParamInterface<T>::parameter_ = nullptr;
-
-// Most value-parameterized classes can ignore the existence of
-// WithParamInterface, and can just inherit from ::testing::TestWithParam.
-
-template <typename T>
-class TestWithParam : public Test, public WithParamInterface<T> {
-};
-
-// Macros for indicating success/failure in test code.
-
-// Skips test in runtime.
-// Skipping test aborts current function.
-// Skipped tests are neither successful nor failed.
-#define GTEST_SKIP() GTEST_SKIP_("Skipped")
-
-// ADD_FAILURE unconditionally adds a failure to the current test.
-// SUCCEED generates a success - it doesn't automatically make the
-// current test successful, as a test is only successful when it has
-// no failure.
-//
-// EXPECT_* verifies that a certain condition is satisfied.  If not,
-// it behaves like ADD_FAILURE.  In particular:
-//
-//   EXPECT_TRUE  verifies that a Boolean condition is true.
-//   EXPECT_FALSE verifies that a Boolean condition is false.
-//
-// FAIL and ASSERT_* are similar to ADD_FAILURE and EXPECT_*, except
-// that they will also abort the current function on failure.  People
-// usually want the fail-fast behavior of FAIL and ASSERT_*, but those
-// writing data-driven tests often find themselves using ADD_FAILURE
-// and EXPECT_* more.
-
-// Generates a nonfatal failure with a generic message.
-#define ADD_FAILURE() GTEST_NONFATAL_FAILURE_("Failed")
-
-// Generates a nonfatal failure at the given source file location with
-// a generic message.
-#define ADD_FAILURE_AT(file, line) \
-  GTEST_MESSAGE_AT_(file, line, "Failed", \
-                    ::testing::TestPartResult::kNonFatalFailure)
-
-// Generates a fatal failure with a generic message.
-#define GTEST_FAIL() GTEST_FATAL_FAILURE_("Failed")
-
-// Like GTEST_FAIL(), but at the given source file location.
-#define GTEST_FAIL_AT(file, line)         \
-  GTEST_MESSAGE_AT_(file, line, "Failed", \
-                    ::testing::TestPartResult::kFatalFailure)
-
-// Define this macro to 1 to omit the definition of FAIL(), which is a
-// generic name and clashes with some other libraries.
-#if !GTEST_DONT_DEFINE_FAIL
-# define FAIL() GTEST_FAIL()
-#endif
-
-// Generates a success with a generic message.
-#define GTEST_SUCCEED() GTEST_SUCCESS_("Succeeded")
-
-// Define this macro to 1 to omit the definition of SUCCEED(), which
-// is a generic name and clashes with some other libraries.
-#if !GTEST_DONT_DEFINE_SUCCEED
-# define SUCCEED() GTEST_SUCCEED()
-#endif
-
-// Macros for testing exceptions.
-//
-//    * {ASSERT|EXPECT}_THROW(statement, expected_exception):
-//         Tests that the statement throws the expected exception.
-//    * {ASSERT|EXPECT}_NO_THROW(statement):
-//         Tests that the statement doesn't throw any exception.
-//    * {ASSERT|EXPECT}_ANY_THROW(statement):
-//         Tests that the statement throws an exception.
-
-#define EXPECT_THROW(statement, expected_exception) \
-  GTEST_TEST_THROW_(statement, expected_exception, GTEST_NONFATAL_FAILURE_)
-#define EXPECT_NO_THROW(statement) \
-  GTEST_TEST_NO_THROW_(statement, GTEST_NONFATAL_FAILURE_)
-#define EXPECT_ANY_THROW(statement) \
-  GTEST_TEST_ANY_THROW_(statement, GTEST_NONFATAL_FAILURE_)
-#define ASSERT_THROW(statement, expected_exception) \
-  GTEST_TEST_THROW_(statement, expected_exception, GTEST_FATAL_FAILURE_)
-#define ASSERT_NO_THROW(statement) \
-  GTEST_TEST_NO_THROW_(statement, GTEST_FATAL_FAILURE_)
-#define ASSERT_ANY_THROW(statement) \
-  GTEST_TEST_ANY_THROW_(statement, GTEST_FATAL_FAILURE_)
-
-// Boolean assertions. Condition can be either a Boolean expression or an
-// AssertionResult. For more information on how to use AssertionResult with
-// these macros see comments on that class.
-#define EXPECT_TRUE(condition) \
-  GTEST_TEST_BOOLEAN_(condition, #condition, false, true, \
-                      GTEST_NONFATAL_FAILURE_)
-#define EXPECT_FALSE(condition) \
-  GTEST_TEST_BOOLEAN_(!(condition), #condition, true, false, \
-                      GTEST_NONFATAL_FAILURE_)
-#define ASSERT_TRUE(condition) \
-  GTEST_TEST_BOOLEAN_(condition, #condition, false, true, \
-                      GTEST_FATAL_FAILURE_)
-#define ASSERT_FALSE(condition) \
-  GTEST_TEST_BOOLEAN_(!(condition), #condition, true, false, \
-                      GTEST_FATAL_FAILURE_)
-
-// Macros for testing equalities and inequalities.
-//
-//    * {ASSERT|EXPECT}_EQ(v1, v2): Tests that v1 == v2
-//    * {ASSERT|EXPECT}_NE(v1, v2): Tests that v1 != v2
-//    * {ASSERT|EXPECT}_LT(v1, v2): Tests that v1 < v2
-//    * {ASSERT|EXPECT}_LE(v1, v2): Tests that v1 <= v2
-//    * {ASSERT|EXPECT}_GT(v1, v2): Tests that v1 > v2
-//    * {ASSERT|EXPECT}_GE(v1, v2): Tests that v1 >= v2
-//
-// When they are not, Google Test prints both the tested expressions and
-// their actual values.  The values must be compatible built-in types,
-// or you will get a compiler error.  By "compatible" we mean that the
-// values can be compared by the respective operator.
-//
-// Note:
-//
-//   1. It is possible to make a user-defined type work with
-//   {ASSERT|EXPECT}_??(), but that requires overloading the
-//   comparison operators and is thus discouraged by the Google C++
-//   Usage Guide.  Therefore, you are advised to use the
-//   {ASSERT|EXPECT}_TRUE() macro to assert that two objects are
-//   equal.
-//
-//   2. The {ASSERT|EXPECT}_??() macros do pointer comparisons on
-//   pointers (in particular, C strings).  Therefore, if you use it
-//   with two C strings, you are testing how their locations in memory
-//   are related, not how their content is related.  To compare two C
-//   strings by content, use {ASSERT|EXPECT}_STR*().
-//
-//   3. {ASSERT|EXPECT}_EQ(v1, v2) is preferred to
-//   {ASSERT|EXPECT}_TRUE(v1 == v2), as the former tells you
-//   what the actual value is when it fails, and similarly for the
-//   other comparisons.
-//
-//   4. Do not depend on the order in which {ASSERT|EXPECT}_??()
-//   evaluate their arguments, which is undefined.
-//
-//   5. These macros evaluate their arguments exactly once.
-//
-// Examples:
-//
-//   EXPECT_NE(Foo(), 5);
-//   EXPECT_EQ(a_pointer, NULL);
-//   ASSERT_LT(i, array_size);
-//   ASSERT_GT(records.size(), 0) << "There is no record left.";
-
-#define EXPECT_EQ(val1, val2) \
-  EXPECT_PRED_FORMAT2(::testing::internal::EqHelper::Compare, val1, val2)
-#define EXPECT_NE(val1, val2) \
-  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperNE, val1, val2)
-#define EXPECT_LE(val1, val2) \
-  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperLE, val1, val2)
-#define EXPECT_LT(val1, val2) \
-  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperLT, val1, val2)
-#define EXPECT_GE(val1, val2) \
-  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperGE, val1, val2)
-#define EXPECT_GT(val1, val2) \
-  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperGT, val1, val2)
-
-#define GTEST_ASSERT_EQ(val1, val2) \
-  ASSERT_PRED_FORMAT2(::testing::internal::EqHelper::Compare, val1, val2)
-#define GTEST_ASSERT_NE(val1, val2) \
-  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperNE, val1, val2)
-#define GTEST_ASSERT_LE(val1, val2) \
-  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperLE, val1, val2)
-#define GTEST_ASSERT_LT(val1, val2) \
-  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperLT, val1, val2)
-#define GTEST_ASSERT_GE(val1, val2) \
-  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperGE, val1, val2)
-#define GTEST_ASSERT_GT(val1, val2) \
-  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperGT, val1, val2)
-
-// Define macro GTEST_DONT_DEFINE_ASSERT_XY to 1 to omit the definition of
-// ASSERT_XY(), which clashes with some users' own code.
-
-#if !GTEST_DONT_DEFINE_ASSERT_EQ
-# define ASSERT_EQ(val1, val2) GTEST_ASSERT_EQ(val1, val2)
-#endif
-
-#if !GTEST_DONT_DEFINE_ASSERT_NE
-# define ASSERT_NE(val1, val2) GTEST_ASSERT_NE(val1, val2)
-#endif
-
-#if !GTEST_DONT_DEFINE_ASSERT_LE
-# define ASSERT_LE(val1, val2) GTEST_ASSERT_LE(val1, val2)
-#endif
-
-#if !GTEST_DONT_DEFINE_ASSERT_LT
-# define ASSERT_LT(val1, val2) GTEST_ASSERT_LT(val1, val2)
-#endif
-
-#if !GTEST_DONT_DEFINE_ASSERT_GE
-# define ASSERT_GE(val1, val2) GTEST_ASSERT_GE(val1, val2)
-#endif
-
-#if !GTEST_DONT_DEFINE_ASSERT_GT
-# define ASSERT_GT(val1, val2) GTEST_ASSERT_GT(val1, val2)
-#endif
-
-// C-string Comparisons.  All tests treat NULL and any non-NULL string
-// as different.  Two NULLs are equal.
-//
-//    * {ASSERT|EXPECT}_STREQ(s1, s2):     Tests that s1 == s2
-//    * {ASSERT|EXPECT}_STRNE(s1, s2):     Tests that s1 != s2
-//    * {ASSERT|EXPECT}_STRCASEEQ(s1, s2): Tests that s1 == s2, ignoring case
-//    * {ASSERT|EXPECT}_STRCASENE(s1, s2): Tests that s1 != s2, ignoring case
-//
-// For wide or narrow string objects, you can use the
-// {ASSERT|EXPECT}_??() macros.
-//
-// Don't depend on the order in which the arguments are evaluated,
-// which is undefined.
-//
-// These macros evaluate their arguments exactly once.
-
-#define EXPECT_STREQ(s1, s2) \
-  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTREQ, s1, s2)
-#define EXPECT_STRNE(s1, s2) \
-  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTRNE, s1, s2)
-#define EXPECT_STRCASEEQ(s1, s2) \
-  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASEEQ, s1, s2)
-#define EXPECT_STRCASENE(s1, s2)\
-  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASENE, s1, s2)
-
-#define ASSERT_STREQ(s1, s2) \
-  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTREQ, s1, s2)
-#define ASSERT_STRNE(s1, s2) \
-  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTRNE, s1, s2)
-#define ASSERT_STRCASEEQ(s1, s2) \
-  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASEEQ, s1, s2)
-#define ASSERT_STRCASENE(s1, s2)\
-  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASENE, s1, s2)
-
-// Macros for comparing floating-point numbers.
-//
-//    * {ASSERT|EXPECT}_FLOAT_EQ(val1, val2):
-//         Tests that two float values are almost equal.
-//    * {ASSERT|EXPECT}_DOUBLE_EQ(val1, val2):
-//         Tests that two double values are almost equal.
-//    * {ASSERT|EXPECT}_NEAR(v1, v2, abs_error):
-//         Tests that v1 and v2 are within the given distance to each other.
-//
-// Google Test uses ULP-based comparison to automatically pick a default
-// error bound that is appropriate for the operands.  See the
-// FloatingPoint template class in gtest-internal.h if you are
-// interested in the implementation details.
-
-#define EXPECT_FLOAT_EQ(val1, val2)\
-  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ<float>, \
-                      val1, val2)
-
-#define EXPECT_DOUBLE_EQ(val1, val2)\
-  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ<double>, \
-                      val1, val2)
-
-#define ASSERT_FLOAT_EQ(val1, val2)\
-  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ<float>, \
-                      val1, val2)
-
-#define ASSERT_DOUBLE_EQ(val1, val2)\
-  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ<double>, \
-                      val1, val2)
-
-#define EXPECT_NEAR(val1, val2, abs_error)\
-  EXPECT_PRED_FORMAT3(::testing::internal::DoubleNearPredFormat, \
-                      val1, val2, abs_error)
-
-#define ASSERT_NEAR(val1, val2, abs_error)\
-  ASSERT_PRED_FORMAT3(::testing::internal::DoubleNearPredFormat, \
-                      val1, val2, abs_error)
-
-// These predicate format functions work on floating-point values, and
-// can be used in {ASSERT|EXPECT}_PRED_FORMAT2*(), e.g.
-//
-//   EXPECT_PRED_FORMAT2(testing::DoubleLE, Foo(), 5.0);
-
-// Asserts that val1 is less than, or almost equal to, val2.  Fails
-// otherwise.  In particular, it fails if either val1 or val2 is NaN.
-GTEST_API_ AssertionResult FloatLE(const char* expr1, const char* expr2,
-                                   float val1, float val2);
-GTEST_API_ AssertionResult DoubleLE(const char* expr1, const char* expr2,
-                                    double val1, double val2);
-
-
-#if GTEST_OS_WINDOWS
-
-// Macros that test for HRESULT failure and success, these are only useful
-// on Windows, and rely on Windows SDK macros and APIs to compile.
-//
-//    * {ASSERT|EXPECT}_HRESULT_{SUCCEEDED|FAILED}(expr)
-//
-// When expr unexpectedly fails or succeeds, Google Test prints the
-// expected result and the actual result with both a human-readable
-// string representation of the error, if available, as well as the
-// hex result code.
-# define EXPECT_HRESULT_SUCCEEDED(expr) \
-    EXPECT_PRED_FORMAT1(::testing::internal::IsHRESULTSuccess, (expr))
-
-# define ASSERT_HRESULT_SUCCEEDED(expr) \
-    ASSERT_PRED_FORMAT1(::testing::internal::IsHRESULTSuccess, (expr))
-
-# define EXPECT_HRESULT_FAILED(expr) \
-    EXPECT_PRED_FORMAT1(::testing::internal::IsHRESULTFailure, (expr))
-
-# define ASSERT_HRESULT_FAILED(expr) \
-    ASSERT_PRED_FORMAT1(::testing::internal::IsHRESULTFailure, (expr))
-
-#endif  // GTEST_OS_WINDOWS
-
-// Macros that execute statement and check that it doesn't generate new fatal
-// failures in the current thread.
-//
-//   * {ASSERT|EXPECT}_NO_FATAL_FAILURE(statement);
-//
-// Examples:
-//
-//   EXPECT_NO_FATAL_FAILURE(Process());
-//   ASSERT_NO_FATAL_FAILURE(Process()) << "Process() failed";
-//
-#define ASSERT_NO_FATAL_FAILURE(statement) \
-    GTEST_TEST_NO_FATAL_FAILURE_(statement, GTEST_FATAL_FAILURE_)
-#define EXPECT_NO_FATAL_FAILURE(statement) \
-    GTEST_TEST_NO_FATAL_FAILURE_(statement, GTEST_NONFATAL_FAILURE_)
-
-// Causes a trace (including the given source file path and line number,
-// and the given message) to be included in every test failure message generated
-// by code in the scope of the lifetime of an instance of this class. The effect
-// is undone with the destruction of the instance.
-//
-// The message argument can be anything streamable to std::ostream.
-//
-// Example:
-//   testing::ScopedTrace trace("file.cc", 123, "message");
-//
-class GTEST_API_ ScopedTrace {
- public:
-  // The c'tor pushes the given source file location and message onto
-  // a trace stack maintained by Google Test.
-
-  // Template version. Uses Message() to convert the values into strings.
-  // Slow, but flexible.
-  template <typename T>
-  ScopedTrace(const char* file, int line, const T& message) {
-    PushTrace(file, line, (Message() << message).GetString());
-  }
-
-  // Optimize for some known types.
-  ScopedTrace(const char* file, int line, const char* message) {
-    PushTrace(file, line, message ? message : "(null)");
-  }
-
-  ScopedTrace(const char* file, int line, const std::string& message) {
-    PushTrace(file, line, message);
-  }
-
-  // The d'tor pops the info pushed by the c'tor.
-  //
-  // Note that the d'tor is not virtual in order to be efficient.
-  // Don't inherit from ScopedTrace!
-  ~ScopedTrace();
-
- private:
-  void PushTrace(const char* file, int line, std::string message);
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedTrace);
-} GTEST_ATTRIBUTE_UNUSED_;  // A ScopedTrace object does its job in its
-                            // c'tor and d'tor.  Therefore it doesn't
-                            // need to be used otherwise.
-
-// Causes a trace (including the source file path, the current line
-// number, and the given message) to be included in every test failure
-// message generated by code in the current scope.  The effect is
-// undone when the control leaves the current scope.
-//
-// The message argument can be anything streamable to std::ostream.
-//
-// In the implementation, we include the current line number as part
-// of the dummy variable name, thus allowing multiple SCOPED_TRACE()s
-// to appear in the same block - as long as they are on different
-// lines.
-//
-// Assuming that each thread maintains its own stack of traces.
-// Therefore, a SCOPED_TRACE() would (correctly) only affect the
-// assertions in its own thread.
-#define SCOPED_TRACE(message) \
-  ::testing::ScopedTrace GTEST_CONCAT_TOKEN_(gtest_trace_, __LINE__)(\
-    __FILE__, __LINE__, (message))
-
-// Compile-time assertion for type equality.
-// StaticAssertTypeEq<type1, type2>() compiles if and only if type1 and type2
-// are the same type.  The value it returns is not interesting.
-//
-// Instead of making StaticAssertTypeEq a class template, we make it a
-// function template that invokes a helper class template.  This
-// prevents a user from misusing StaticAssertTypeEq<T1, T2> by
-// defining objects of that type.
-//
-// CAVEAT:
-//
-// When used inside a method of a class template,
-// StaticAssertTypeEq<T1, T2>() is effective ONLY IF the method is
-// instantiated.  For example, given:
-//
-//   template <typename T> class Foo {
-//    public:
-//     void Bar() { testing::StaticAssertTypeEq<int, T>(); }
-//   };
-//
-// the code:
-//
-//   void Test1() { Foo<bool> foo; }
-//
-// will NOT generate a compiler error, as Foo<bool>::Bar() is never
-// actually instantiated.  Instead, you need:
-//
-//   void Test2() { Foo<bool> foo; foo.Bar(); }
-//
-// to cause a compiler error.
-template <typename T1, typename T2>
-constexpr bool StaticAssertTypeEq() noexcept {
-  static_assert(std::is_same<T1, T2>::value,
-                "type1 and type2 are not the same type");
-  return true;
-}
-
-// Defines a test.
-//
-// The first parameter is the name of the test suite, and the second
-// parameter is the name of the test within the test suite.
-//
-// The convention is to end the test suite name with "Test".  For
-// example, a test suite for the Foo class can be named FooTest.
-//
-// Test code should appear between braces after an invocation of
-// this macro.  Example:
-//
-//   TEST(FooTest, InitializesCorrectly) {
-//     Foo foo;
-//     EXPECT_TRUE(foo.StatusIsOK());
-//   }
-
-// Note that we call GetTestTypeId() instead of GetTypeId<
-// ::testing::Test>() here to get the type ID of testing::Test.  This
-// is to work around a suspected linker bug when using Google Test as
-// a framework on Mac OS X.  The bug causes GetTypeId<
-// ::testing::Test>() to return different values depending on whether
-// the call is from the Google Test framework itself or from user test
-// code.  GetTestTypeId() is guaranteed to always return the same
-// value, as it always calls GetTypeId<>() from the Google Test
-// framework.
-#define GTEST_TEST(test_suite_name, test_name)             \
-  GTEST_TEST_(test_suite_name, test_name, ::testing::Test, \
-              ::testing::internal::GetTestTypeId())
-
-// Define this macro to 1 to omit the definition of TEST(), which
-// is a generic name and clashes with some other libraries.
-#if !GTEST_DONT_DEFINE_TEST
-#define TEST(test_suite_name, test_name) GTEST_TEST(test_suite_name, test_name)
-#endif
-
-// Defines a test that uses a test fixture.
-//
-// The first parameter is the name of the test fixture class, which
-// also doubles as the test suite name.  The second parameter is the
-// name of the test within the test suite.
-//
-// A test fixture class must be declared earlier.  The user should put
-// the test code between braces after using this macro.  Example:
-//
-//   class FooTest : public testing::Test {
-//    protected:
-//     void SetUp() override { b_.AddElement(3); }
-//
-//     Foo a_;
-//     Foo b_;
-//   };
-//
-//   TEST_F(FooTest, InitializesCorrectly) {
-//     EXPECT_TRUE(a_.StatusIsOK());
-//   }
-//
-//   TEST_F(FooTest, ReturnsElementCountCorrectly) {
-//     EXPECT_EQ(a_.size(), 0);
-//     EXPECT_EQ(b_.size(), 1);
-//   }
-//
-// GOOGLETEST_CM0011 DO NOT DELETE
-#define TEST_F(test_fixture, test_name)\
-  GTEST_TEST_(test_fixture, test_name, test_fixture, \
-              ::testing::internal::GetTypeId<test_fixture>())
-
-// Returns a path to temporary directory.
-// Tries to determine an appropriate directory for the platform.
-GTEST_API_ std::string TempDir();
-
-#ifdef _MSC_VER
-#  pragma warning(pop)
-#endif
-
-// Dynamically registers a test with the framework.
-//
-// This is an advanced API only to be used when the `TEST` macros are
-// insufficient. The macros should be preferred when possible, as they avoid
-// most of the complexity of calling this function.
-//
-// The `factory` argument is a factory callable (move-constructible) object or
-// function pointer that creates a new instance of the Test object. It
-// handles ownership to the caller. The signature of the callable is
-// `Fixture*()`, where `Fixture` is the test fixture class for the test. All
-// tests registered with the same `test_suite_name` must return the same
-// fixture type. This is checked at runtime.
-//
-// The framework will infer the fixture class from the factory and will call
-// the `SetUpTestSuite` and `TearDownTestSuite` for it.
-//
-// Must be called before `RUN_ALL_TESTS()` is invoked, otherwise behavior is
-// undefined.
-//
-// Use case example:
-//
-// class MyFixture : public ::testing::Test {
-//  public:
-//   // All of these optional, just like in regular macro usage.
-//   static void SetUpTestSuite() { ... }
-//   static void TearDownTestSuite() { ... }
-//   void SetUp() override { ... }
-//   void TearDown() override { ... }
-// };
-//
-// class MyTest : public MyFixture {
-//  public:
-//   explicit MyTest(int data) : data_(data) {}
-//   void TestBody() override { ... }
-//
-//  private:
-//   int data_;
-// };
-//
-// void RegisterMyTests(const std::vector<int>& values) {
-//   for (int v : values) {
-//     ::testing::RegisterTest(
-//         "MyFixture", ("Test" + std::to_string(v)).c_str(), nullptr,
-//         std::to_string(v).c_str(),
-//         __FILE__, __LINE__,
-//         // Important to use the fixture type as the return type here.
-//         [=]() -> MyFixture* { return new MyTest(v); });
-//   }
-// }
-// ...
-// int main(int argc, char** argv) {
-//   std::vector<int> values_to_test = LoadValuesFromConfig();
-//   RegisterMyTests(values_to_test);
-//   ...
-//   return RUN_ALL_TESTS();
-// }
-//
-template <int&... ExplicitParameterBarrier, typename Factory>
-TestInfo* RegisterTest(const char* test_suite_name, const char* test_name,
-                       const char* type_param, const char* value_param,
-                       const char* file, int line, Factory factory) {
-  using TestT = typename std::remove_pointer<decltype(factory())>::type;
-
-  class FactoryImpl : public internal::TestFactoryBase {
-   public:
-    explicit FactoryImpl(Factory f) : factory_(std::move(f)) {}
-    Test* CreateTest() override { return factory_(); }
-
-   private:
-    Factory factory_;
-  };
-
-  return internal::MakeAndRegisterTestInfo(
-      test_suite_name, test_name, type_param, value_param,
-      internal::CodeLocation(file, line), internal::GetTypeId<TestT>(),
-      internal::SuiteApiResolver<TestT>::GetSetUpCaseOrSuite(file, line),
-      internal::SuiteApiResolver<TestT>::GetTearDownCaseOrSuite(file, line),
-      new FactoryImpl{std::move(factory)});
-}
-
-}  // namespace testing
-
-// Use this function in main() to run all tests.  It returns 0 if all
-// tests are successful, or 1 otherwise.
-//
-// RUN_ALL_TESTS() should be invoked after the command line has been
-// parsed by InitGoogleTest().
-//
-// This function was formerly a macro; thus, it is in the global
-// namespace and has an all-caps name.
-int RUN_ALL_TESTS() GTEST_MUST_USE_RESULT_;
-
-inline int RUN_ALL_TESTS() {
-  return ::testing::UnitTest::GetInstance()->Run();
-}
-
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
-
-#endif  // GTEST_INCLUDE_GTEST_GTEST_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest-matchers.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest-matchers.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest-matchers.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest-matchers.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,750 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// The Google C++ Testing and Mocking Framework (Google Test)
-//
-// This file implements just enough of the matcher interface to allow
-// EXPECT_DEATH and friends to accept a matcher argument.
-
-// IWYU pragma: private, include "testing/base/public/gunit.h"
-// IWYU pragma: friend third_party/googletest/googlemock/.*
-// IWYU pragma: friend third_party/googletest/googletest/.*
-
-#ifndef GTEST_INCLUDE_GTEST_GTEST_MATCHERS_H_
-#define GTEST_INCLUDE_GTEST_GTEST_MATCHERS_H_
-
-#include <memory>
-#include <ostream>
-#include <string>
-#include <type_traits>
-
-#include "gtest/gtest-printers.h"
-#include "gtest/internal/gtest-internal.h"
-#include "gtest/internal/gtest-port.h"
-
-// MSVC warning C5046 is new as of VS2017 version 15.8.
-#if defined(_MSC_VER) && _MSC_VER >= 1915
-#define GTEST_MAYBE_5046_ 5046
-#else
-#define GTEST_MAYBE_5046_
-#endif
-
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(
-    4251 GTEST_MAYBE_5046_ /* class A needs to have dll-interface to be used by
-                              clients of class B */
-    /* Symbol involving type with internal linkage not defined */)
-
-namespace testing {
-
-// To implement a matcher Foo for type T, define:
-//   1. a class FooMatcherImpl that implements the
-//      MatcherInterface<T> interface, and
-//   2. a factory function that creates a Matcher<T> object from a
-//      FooMatcherImpl*.
-//
-// The two-level delegation design makes it possible to allow a user
-// to write "v" instead of "Eq(v)" where a Matcher is expected, which
-// is impossible if we pass matchers by pointers.  It also eases
-// ownership management as Matcher objects can now be copied like
-// plain values.
-
-// MatchResultListener is an abstract class.  Its << operator can be
-// used by a matcher to explain why a value matches or doesn't match.
-//
-class MatchResultListener {
- public:
-  // Creates a listener object with the given underlying ostream.  The
-  // listener does not own the ostream, and does not dereference it
-  // in the constructor or destructor.
-  explicit MatchResultListener(::std::ostream* os) : stream_(os) {}
-  virtual ~MatchResultListener() = 0;  // Makes this class abstract.
-
-  // Streams x to the underlying ostream; does nothing if the ostream
-  // is NULL.
-  template <typename T>
-  MatchResultListener& operator<<(const T& x) {
-    if (stream_ != nullptr) *stream_ << x;
-    return *this;
-  }
-
-  // Returns the underlying ostream.
-  ::std::ostream* stream() { return stream_; }
-
-  // Returns true if and only if the listener is interested in an explanation
-  // of the match result.  A matcher's MatchAndExplain() method can use
-  // this information to avoid generating the explanation when no one
-  // intends to hear it.
-  bool IsInterested() const { return stream_ != nullptr; }
-
- private:
-  ::std::ostream* const stream_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(MatchResultListener);
-};
-
-inline MatchResultListener::~MatchResultListener() {
-}
-
-// An instance of a subclass of this knows how to describe itself as a
-// matcher.
-class MatcherDescriberInterface {
- public:
-  virtual ~MatcherDescriberInterface() {}
-
-  // Describes this matcher to an ostream.  The function should print
-  // a verb phrase that describes the property a value matching this
-  // matcher should have.  The subject of the verb phrase is the value
-  // being matched.  For example, the DescribeTo() method of the Gt(7)
-  // matcher prints "is greater than 7".
-  virtual void DescribeTo(::std::ostream* os) const = 0;
-
-  // Describes the negation of this matcher to an ostream.  For
-  // example, if the description of this matcher is "is greater than
-  // 7", the negated description could be "is not greater than 7".
-  // You are not required to override this when implementing
-  // MatcherInterface, but it is highly advised so that your matcher
-  // can produce good error messages.
-  virtual void DescribeNegationTo(::std::ostream* os) const {
-    *os << "not (";
-    DescribeTo(os);
-    *os << ")";
-  }
-};
-
-// The implementation of a matcher.
-template <typename T>
-class MatcherInterface : public MatcherDescriberInterface {
- public:
-  // Returns true if and only if the matcher matches x; also explains the
-  // match result to 'listener' if necessary (see the next paragraph), in
-  // the form of a non-restrictive relative clause ("which ...",
-  // "whose ...", etc) that describes x.  For example, the
-  // MatchAndExplain() method of the Pointee(...) matcher should
-  // generate an explanation like "which points to ...".
-  //
-  // Implementations of MatchAndExplain() should add an explanation of
-  // the match result *if and only if* they can provide additional
-  // information that's not already present (or not obvious) in the
-  // print-out of x and the matcher's description.  Whether the match
-  // succeeds is not a factor in deciding whether an explanation is
-  // needed, as sometimes the caller needs to print a failure message
-  // when the match succeeds (e.g. when the matcher is used inside
-  // Not()).
-  //
-  // For example, a "has at least 10 elements" matcher should explain
-  // what the actual element count is, regardless of the match result,
-  // as it is useful information to the reader; on the other hand, an
-  // "is empty" matcher probably only needs to explain what the actual
-  // size is when the match fails, as it's redundant to say that the
-  // size is 0 when the value is already known to be empty.
-  //
-  // You should override this method when defining a new matcher.
-  //
-  // It's the responsibility of the caller (Google Test) to guarantee
-  // that 'listener' is not NULL.  This helps to simplify a matcher's
-  // implementation when it doesn't care about the performance, as it
-  // can talk to 'listener' without checking its validity first.
-  // However, in order to implement dummy listeners efficiently,
-  // listener->stream() may be NULL.
-  virtual bool MatchAndExplain(T x, MatchResultListener* listener) const = 0;
-
-  // Inherits these methods from MatcherDescriberInterface:
-  //   virtual void DescribeTo(::std::ostream* os) const = 0;
-  //   virtual void DescribeNegationTo(::std::ostream* os) const;
-};
-
-namespace internal {
-
-// Converts a MatcherInterface<T> to a MatcherInterface<const T&>.
-template <typename T>
-class MatcherInterfaceAdapter : public MatcherInterface<const T&> {
- public:
-  explicit MatcherInterfaceAdapter(const MatcherInterface<T>* impl)
-      : impl_(impl) {}
-  ~MatcherInterfaceAdapter() override { delete impl_; }
-
-  void DescribeTo(::std::ostream* os) const override { impl_->DescribeTo(os); }
-
-  void DescribeNegationTo(::std::ostream* os) const override {
-    impl_->DescribeNegationTo(os);
-  }
-
-  bool MatchAndExplain(const T& x,
-                       MatchResultListener* listener) const override {
-    return impl_->MatchAndExplain(x, listener);
-  }
-
- private:
-  const MatcherInterface<T>* const impl_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(MatcherInterfaceAdapter);
-};
-
-struct AnyEq {
-  template <typename A, typename B>
-  bool operator()(const A& a, const B& b) const { return a == b; }
-};
-struct AnyNe {
-  template <typename A, typename B>
-  bool operator()(const A& a, const B& b) const { return a != b; }
-};
-struct AnyLt {
-  template <typename A, typename B>
-  bool operator()(const A& a, const B& b) const { return a < b; }
-};
-struct AnyGt {
-  template <typename A, typename B>
-  bool operator()(const A& a, const B& b) const { return a > b; }
-};
-struct AnyLe {
-  template <typename A, typename B>
-  bool operator()(const A& a, const B& b) const { return a <= b; }
-};
-struct AnyGe {
-  template <typename A, typename B>
-  bool operator()(const A& a, const B& b) const { return a >= b; }
-};
-
-// A match result listener that ignores the explanation.
-class DummyMatchResultListener : public MatchResultListener {
- public:
-  DummyMatchResultListener() : MatchResultListener(nullptr) {}
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(DummyMatchResultListener);
-};
-
-// A match result listener that forwards the explanation to a given
-// ostream.  The difference between this and MatchResultListener is
-// that the former is concrete.
-class StreamMatchResultListener : public MatchResultListener {
- public:
-  explicit StreamMatchResultListener(::std::ostream* os)
-      : MatchResultListener(os) {}
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(StreamMatchResultListener);
-};
-
-// An internal class for implementing Matcher<T>, which will derive
-// from it.  We put functionalities common to all Matcher<T>
-// specializations here to avoid code duplication.
-template <typename T>
-class MatcherBase {
- public:
-  // Returns true if and only if the matcher matches x; also explains the
-  // match result to 'listener'.
-  bool MatchAndExplain(const T& x, MatchResultListener* listener) const {
-    return impl_->MatchAndExplain(x, listener);
-  }
-
-  // Returns true if and only if this matcher matches x.
-  bool Matches(const T& x) const {
-    DummyMatchResultListener dummy;
-    return MatchAndExplain(x, &dummy);
-  }
-
-  // Describes this matcher to an ostream.
-  void DescribeTo(::std::ostream* os) const { impl_->DescribeTo(os); }
-
-  // Describes the negation of this matcher to an ostream.
-  void DescribeNegationTo(::std::ostream* os) const {
-    impl_->DescribeNegationTo(os);
-  }
-
-  // Explains why x matches, or doesn't match, the matcher.
-  void ExplainMatchResultTo(const T& x, ::std::ostream* os) const {
-    StreamMatchResultListener listener(os);
-    MatchAndExplain(x, &listener);
-  }
-
-  // Returns the describer for this matcher object; retains ownership
-  // of the describer, which is only guaranteed to be alive when
-  // this matcher object is alive.
-  const MatcherDescriberInterface* GetDescriber() const {
-    return impl_.get();
-  }
-
- protected:
-  MatcherBase() {}
-
-  // Constructs a matcher from its implementation.
-  explicit MatcherBase(const MatcherInterface<const T&>* impl) : impl_(impl) {}
-
-  template <typename U>
-  explicit MatcherBase(
-      const MatcherInterface<U>* impl,
-      typename std::enable_if<!std::is_same<U, const U&>::value>::type* =
-          nullptr)
-      : impl_(new internal::MatcherInterfaceAdapter<U>(impl)) {}
-
-  MatcherBase(const MatcherBase&) = default;
-  MatcherBase& operator=(const MatcherBase&) = default;
-  MatcherBase(MatcherBase&&) = default;
-  MatcherBase& operator=(MatcherBase&&) = default;
-
-  virtual ~MatcherBase() {}
-
- private:
-  std::shared_ptr<const MatcherInterface<const T&>> impl_;
-};
-
-}  // namespace internal
-
-// A Matcher<T> is a copyable and IMMUTABLE (except by assignment)
-// object that can check whether a value of type T matches.  The
-// implementation of Matcher<T> is just a std::shared_ptr to const
-// MatcherInterface<T>.  Don't inherit from Matcher!
-template <typename T>
-class Matcher : public internal::MatcherBase<T> {
- public:
-  // Constructs a null matcher.  Needed for storing Matcher objects in STL
-  // containers.  A default-constructed matcher is not yet initialized.  You
-  // cannot use it until a valid value has been assigned to it.
-  explicit Matcher() {}  // NOLINT
-
-  // Constructs a matcher from its implementation.
-  explicit Matcher(const MatcherInterface<const T&>* impl)
-      : internal::MatcherBase<T>(impl) {}
-
-  template <typename U>
-  explicit Matcher(
-      const MatcherInterface<U>* impl,
-      typename std::enable_if<!std::is_same<U, const U&>::value>::type* =
-          nullptr)
-      : internal::MatcherBase<T>(impl) {}
-
-  // Implicit constructor here allows people to write
-  // EXPECT_CALL(foo, Bar(5)) instead of EXPECT_CALL(foo, Bar(Eq(5))) sometimes
-  Matcher(T value);  // NOLINT
-};
-
-// The following two specializations allow the user to write str
-// instead of Eq(str) and "foo" instead of Eq("foo") when a std::string
-// matcher is expected.
-template <>
-class GTEST_API_ Matcher<const std::string&>
-    : public internal::MatcherBase<const std::string&> {
- public:
-  Matcher() {}
-
-  explicit Matcher(const MatcherInterface<const std::string&>* impl)
-      : internal::MatcherBase<const std::string&>(impl) {}
-
-  // Allows the user to write str instead of Eq(str) sometimes, where
-  // str is a std::string object.
-  Matcher(const std::string& s);  // NOLINT
-
-  // Allows the user to write "foo" instead of Eq("foo") sometimes.
-  Matcher(const char* s);  // NOLINT
-};
-
-template <>
-class GTEST_API_ Matcher<std::string>
-    : public internal::MatcherBase<std::string> {
- public:
-  Matcher() {}
-
-  explicit Matcher(const MatcherInterface<const std::string&>* impl)
-      : internal::MatcherBase<std::string>(impl) {}
-  explicit Matcher(const MatcherInterface<std::string>* impl)
-      : internal::MatcherBase<std::string>(impl) {}
-
-  // Allows the user to write str instead of Eq(str) sometimes, where
-  // str is a string object.
-  Matcher(const std::string& s);  // NOLINT
-
-  // Allows the user to write "foo" instead of Eq("foo") sometimes.
-  Matcher(const char* s);  // NOLINT
-};
-
-#if GTEST_HAS_ABSL
-// The following two specializations allow the user to write str
-// instead of Eq(str) and "foo" instead of Eq("foo") when a absl::string_view
-// matcher is expected.
-template <>
-class GTEST_API_ Matcher<const absl::string_view&>
-    : public internal::MatcherBase<const absl::string_view&> {
- public:
-  Matcher() {}
-
-  explicit Matcher(const MatcherInterface<const absl::string_view&>* impl)
-      : internal::MatcherBase<const absl::string_view&>(impl) {}
-
-  // Allows the user to write str instead of Eq(str) sometimes, where
-  // str is a std::string object.
-  Matcher(const std::string& s);  // NOLINT
-
-  // Allows the user to write "foo" instead of Eq("foo") sometimes.
-  Matcher(const char* s);  // NOLINT
-
-  // Allows the user to pass absl::string_views directly.
-  Matcher(absl::string_view s);  // NOLINT
-};
-
-template <>
-class GTEST_API_ Matcher<absl::string_view>
-    : public internal::MatcherBase<absl::string_view> {
- public:
-  Matcher() {}
-
-  explicit Matcher(const MatcherInterface<const absl::string_view&>* impl)
-      : internal::MatcherBase<absl::string_view>(impl) {}
-  explicit Matcher(const MatcherInterface<absl::string_view>* impl)
-      : internal::MatcherBase<absl::string_view>(impl) {}
-
-  // Allows the user to write str instead of Eq(str) sometimes, where
-  // str is a std::string object.
-  Matcher(const std::string& s);  // NOLINT
-
-  // Allows the user to write "foo" instead of Eq("foo") sometimes.
-  Matcher(const char* s);  // NOLINT
-
-  // Allows the user to pass absl::string_views directly.
-  Matcher(absl::string_view s);  // NOLINT
-};
-#endif  // GTEST_HAS_ABSL
-
-// Prints a matcher in a human-readable format.
-template <typename T>
-std::ostream& operator<<(std::ostream& os, const Matcher<T>& matcher) {
-  matcher.DescribeTo(&os);
-  return os;
-}
-
-// The PolymorphicMatcher class template makes it easy to implement a
-// polymorphic matcher (i.e. a matcher that can match values of more
-// than one type, e.g. Eq(n) and NotNull()).
-//
-// To define a polymorphic matcher, a user should provide an Impl
-// class that has a DescribeTo() method and a DescribeNegationTo()
-// method, and define a member function (or member function template)
-//
-//   bool MatchAndExplain(const Value& value,
-//                        MatchResultListener* listener) const;
-//
-// See the definition of NotNull() for a complete example.
-template <class Impl>
-class PolymorphicMatcher {
- public:
-  explicit PolymorphicMatcher(const Impl& an_impl) : impl_(an_impl) {}
-
-  // Returns a mutable reference to the underlying matcher
-  // implementation object.
-  Impl& mutable_impl() { return impl_; }
-
-  // Returns an immutable reference to the underlying matcher
-  // implementation object.
-  const Impl& impl() const { return impl_; }
-
-  template <typename T>
-  operator Matcher<T>() const {
-    return Matcher<T>(new MonomorphicImpl<const T&>(impl_));
-  }
-
- private:
-  template <typename T>
-  class MonomorphicImpl : public MatcherInterface<T> {
-   public:
-    explicit MonomorphicImpl(const Impl& impl) : impl_(impl) {}
-
-    virtual void DescribeTo(::std::ostream* os) const { impl_.DescribeTo(os); }
-
-    virtual void DescribeNegationTo(::std::ostream* os) const {
-      impl_.DescribeNegationTo(os);
-    }
-
-    virtual bool MatchAndExplain(T x, MatchResultListener* listener) const {
-      return impl_.MatchAndExplain(x, listener);
-    }
-
-   private:
-    const Impl impl_;
-  };
-
-  Impl impl_;
-};
-
-// Creates a matcher from its implementation.
-// DEPRECATED: Especially in the generic code, prefer:
-//   Matcher<T>(new MyMatcherImpl<const T&>(...));
-//
-// MakeMatcher may create a Matcher that accepts its argument by value, which
-// leads to unnecessary copies & lack of support for non-copyable types.
-template <typename T>
-inline Matcher<T> MakeMatcher(const MatcherInterface<T>* impl) {
-  return Matcher<T>(impl);
-}
-
-// Creates a polymorphic matcher from its implementation.  This is
-// easier to use than the PolymorphicMatcher<Impl> constructor as it
-// doesn't require you to explicitly write the template argument, e.g.
-//
-//   MakePolymorphicMatcher(foo);
-// vs
-//   PolymorphicMatcher<TypeOfFoo>(foo);
-template <class Impl>
-inline PolymorphicMatcher<Impl> MakePolymorphicMatcher(const Impl& impl) {
-  return PolymorphicMatcher<Impl>(impl);
-}
-
-namespace internal {
-// Implements a matcher that compares a given value with a
-// pre-supplied value using one of the ==, <=, <, etc, operators.  The
-// two values being compared don't have to have the same type.
-//
-// The matcher defined here is polymorphic (for example, Eq(5) can be
-// used to match an int, a short, a double, etc).  Therefore we use
-// a template type conversion operator in the implementation.
-//
-// The following template definition assumes that the Rhs parameter is
-// a "bare" type (i.e. neither 'const T' nor 'T&').
-template <typename D, typename Rhs, typename Op>
-class ComparisonBase {
- public:
-  explicit ComparisonBase(const Rhs& rhs) : rhs_(rhs) {}
-  template <typename Lhs>
-  operator Matcher<Lhs>() const {
-    return Matcher<Lhs>(new Impl<const Lhs&>(rhs_));
-  }
-
- private:
-  template <typename T>
-  static const T& Unwrap(const T& v) { return v; }
-  template <typename T>
-  static const T& Unwrap(std::reference_wrapper<T> v) { return v; }
-
-  template <typename Lhs, typename = Rhs>
-  class Impl : public MatcherInterface<Lhs> {
-   public:
-    explicit Impl(const Rhs& rhs) : rhs_(rhs) {}
-    bool MatchAndExplain(Lhs lhs,
-                         MatchResultListener* /* listener */) const override {
-      return Op()(lhs, Unwrap(rhs_));
-    }
-    void DescribeTo(::std::ostream* os) const override {
-      *os << D::Desc() << " ";
-      UniversalPrint(Unwrap(rhs_), os);
-    }
-    void DescribeNegationTo(::std::ostream* os) const override {
-      *os << D::NegatedDesc() <<  " ";
-      UniversalPrint(Unwrap(rhs_), os);
-    }
-
-   private:
-    Rhs rhs_;
-  };
-  Rhs rhs_;
-};
-
-template <typename Rhs>
-class EqMatcher : public ComparisonBase<EqMatcher<Rhs>, Rhs, AnyEq> {
- public:
-  explicit EqMatcher(const Rhs& rhs)
-      : ComparisonBase<EqMatcher<Rhs>, Rhs, AnyEq>(rhs) { }
-  static const char* Desc() { return "is equal to"; }
-  static const char* NegatedDesc() { return "isn't equal to"; }
-};
-template <typename Rhs>
-class NeMatcher : public ComparisonBase<NeMatcher<Rhs>, Rhs, AnyNe> {
- public:
-  explicit NeMatcher(const Rhs& rhs)
-      : ComparisonBase<NeMatcher<Rhs>, Rhs, AnyNe>(rhs) { }
-  static const char* Desc() { return "isn't equal to"; }
-  static const char* NegatedDesc() { return "is equal to"; }
-};
-template <typename Rhs>
-class LtMatcher : public ComparisonBase<LtMatcher<Rhs>, Rhs, AnyLt> {
- public:
-  explicit LtMatcher(const Rhs& rhs)
-      : ComparisonBase<LtMatcher<Rhs>, Rhs, AnyLt>(rhs) { }
-  static const char* Desc() { return "is <"; }
-  static const char* NegatedDesc() { return "isn't <"; }
-};
-template <typename Rhs>
-class GtMatcher : public ComparisonBase<GtMatcher<Rhs>, Rhs, AnyGt> {
- public:
-  explicit GtMatcher(const Rhs& rhs)
-      : ComparisonBase<GtMatcher<Rhs>, Rhs, AnyGt>(rhs) { }
-  static const char* Desc() { return "is >"; }
-  static const char* NegatedDesc() { return "isn't >"; }
-};
-template <typename Rhs>
-class LeMatcher : public ComparisonBase<LeMatcher<Rhs>, Rhs, AnyLe> {
- public:
-  explicit LeMatcher(const Rhs& rhs)
-      : ComparisonBase<LeMatcher<Rhs>, Rhs, AnyLe>(rhs) { }
-  static const char* Desc() { return "is <="; }
-  static const char* NegatedDesc() { return "isn't <="; }
-};
-template <typename Rhs>
-class GeMatcher : public ComparisonBase<GeMatcher<Rhs>, Rhs, AnyGe> {
- public:
-  explicit GeMatcher(const Rhs& rhs)
-      : ComparisonBase<GeMatcher<Rhs>, Rhs, AnyGe>(rhs) { }
-  static const char* Desc() { return "is >="; }
-  static const char* NegatedDesc() { return "isn't >="; }
-};
-
-// Implements polymorphic matchers MatchesRegex(regex) and
-// ContainsRegex(regex), which can be used as a Matcher<T> as long as
-// T can be converted to a string.
-class MatchesRegexMatcher {
- public:
-  MatchesRegexMatcher(const RE* regex, bool full_match)
-      : regex_(regex), full_match_(full_match) {}
-
-#if GTEST_HAS_ABSL
-  bool MatchAndExplain(const absl::string_view& s,
-                       MatchResultListener* listener) const {
-    return MatchAndExplain(std::string(s), listener);
-  }
-#endif  // GTEST_HAS_ABSL
-
-  // Accepts pointer types, particularly:
-  //   const char*
-  //   char*
-  //   const wchar_t*
-  //   wchar_t*
-  template <typename CharType>
-  bool MatchAndExplain(CharType* s, MatchResultListener* listener) const {
-    return s != nullptr && MatchAndExplain(std::string(s), listener);
-  }
-
-  // Matches anything that can convert to std::string.
-  //
-  // This is a template, not just a plain function with const std::string&,
-  // because absl::string_view has some interfering non-explicit constructors.
-  template <class MatcheeStringType>
-  bool MatchAndExplain(const MatcheeStringType& s,
-                       MatchResultListener* /* listener */) const {
-    const std::string& s2(s);
-    return full_match_ ? RE::FullMatch(s2, *regex_)
-                       : RE::PartialMatch(s2, *regex_);
-  }
-
-  void DescribeTo(::std::ostream* os) const {
-    *os << (full_match_ ? "matches" : "contains") << " regular expression ";
-    UniversalPrinter<std::string>::Print(regex_->pattern(), os);
-  }
-
-  void DescribeNegationTo(::std::ostream* os) const {
-    *os << "doesn't " << (full_match_ ? "match" : "contain")
-        << " regular expression ";
-    UniversalPrinter<std::string>::Print(regex_->pattern(), os);
-  }
-
- private:
-  const std::shared_ptr<const RE> regex_;
-  const bool full_match_;
-};
-}  // namespace internal
-
-// Matches a string that fully matches regular expression 'regex'.
-// The matcher takes ownership of 'regex'.
-inline PolymorphicMatcher<internal::MatchesRegexMatcher> MatchesRegex(
-    const internal::RE* regex) {
-  return MakePolymorphicMatcher(internal::MatchesRegexMatcher(regex, true));
-}
-inline PolymorphicMatcher<internal::MatchesRegexMatcher> MatchesRegex(
-    const std::string& regex) {
-  return MatchesRegex(new internal::RE(regex));
-}
-
-// Matches a string that contains regular expression 'regex'.
-// The matcher takes ownership of 'regex'.
-inline PolymorphicMatcher<internal::MatchesRegexMatcher> ContainsRegex(
-    const internal::RE* regex) {
-  return MakePolymorphicMatcher(internal::MatchesRegexMatcher(regex, false));
-}
-inline PolymorphicMatcher<internal::MatchesRegexMatcher> ContainsRegex(
-    const std::string& regex) {
-  return ContainsRegex(new internal::RE(regex));
-}
-
-// Creates a polymorphic matcher that matches anything equal to x.
-// Note: if the parameter of Eq() were declared as const T&, Eq("foo")
-// wouldn't compile.
-template <typename T>
-inline internal::EqMatcher<T> Eq(T x) { return internal::EqMatcher<T>(x); }
-
-// Constructs a Matcher<T> from a 'value' of type T.  The constructed
-// matcher matches any value that's equal to 'value'.
-template <typename T>
-Matcher<T>::Matcher(T value) { *this = Eq(value); }
-
-// Creates a monomorphic matcher that matches anything with type Lhs
-// and equal to rhs.  A user may need to use this instead of Eq(...)
-// in order to resolve an overloading ambiguity.
-//
-// TypedEq<T>(x) is just a convenient short-hand for Matcher<T>(Eq(x))
-// or Matcher<T>(x), but more readable than the latter.
-//
-// We could define similar monomorphic matchers for other comparison
-// operations (e.g. TypedLt, TypedGe, and etc), but decided not to do
-// it yet as those are used much less than Eq() in practice.  A user
-// can always write Matcher<T>(Lt(5)) to be explicit about the type,
-// for example.
-template <typename Lhs, typename Rhs>
-inline Matcher<Lhs> TypedEq(const Rhs& rhs) { return Eq(rhs); }
-
-// Creates a polymorphic matcher that matches anything >= x.
-template <typename Rhs>
-inline internal::GeMatcher<Rhs> Ge(Rhs x) {
-  return internal::GeMatcher<Rhs>(x);
-}
-
-// Creates a polymorphic matcher that matches anything > x.
-template <typename Rhs>
-inline internal::GtMatcher<Rhs> Gt(Rhs x) {
-  return internal::GtMatcher<Rhs>(x);
-}
-
-// Creates a polymorphic matcher that matches anything <= x.
-template <typename Rhs>
-inline internal::LeMatcher<Rhs> Le(Rhs x) {
-  return internal::LeMatcher<Rhs>(x);
-}
-
-// Creates a polymorphic matcher that matches anything < x.
-template <typename Rhs>
-inline internal::LtMatcher<Rhs> Lt(Rhs x) {
-  return internal::LtMatcher<Rhs>(x);
-}
-
-// Creates a polymorphic matcher that matches anything != x.
-template <typename Rhs>
-inline internal::NeMatcher<Rhs> Ne(Rhs x) {
-  return internal::NeMatcher<Rhs>(x);
-}
-}  // namespace testing
-
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251 5046
-
-#endif  // GTEST_INCLUDE_GTEST_GTEST_MATCHERS_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest-message.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest-message.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest-message.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest-message.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,218 +0,0 @@
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-//
-// The Google C++ Testing and Mocking Framework (Google Test)
-//
-// This header file defines the Message class.
-//
-// IMPORTANT NOTE: Due to limitation of the C++ language, we have to
-// leave some internal implementation details in this header file.
-// They are clearly marked by comments like this:
-//
-//   // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-//
-// Such code is NOT meant to be used by a user directly, and is subject
-// to CHANGE WITHOUT NOTICE.  Therefore DO NOT DEPEND ON IT in a user
-// program!
-
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GTEST_INCLUDE_GTEST_GTEST_MESSAGE_H_
-#define GTEST_INCLUDE_GTEST_GTEST_MESSAGE_H_
-
-#include <limits>
-#include <memory>
-
-#include "gtest/internal/gtest-port.h"
-
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
-/* class A needs to have dll-interface to be used by clients of class B */)
-
-// Ensures that there is at least one operator<< in the global namespace.
-// See Message& operator<<(...) below for why.
-void operator<<(const testing::internal::Secret&, int);
-
-namespace testing {
-
-// The Message class works like an ostream repeater.
-//
-// Typical usage:
-//
-//   1. You stream a bunch of values to a Message object.
-//      It will remember the text in a stringstream.
-//   2. Then you stream the Message object to an ostream.
-//      This causes the text in the Message to be streamed
-//      to the ostream.
-//
-// For example;
-//
-//   testing::Message foo;
-//   foo << 1 << " != " << 2;
-//   std::cout << foo;
-//
-// will print "1 != 2".
-//
-// Message is not intended to be inherited from.  In particular, its
-// destructor is not virtual.
-//
-// Note that stringstream behaves differently in gcc and in MSVC.  You
-// can stream a NULL char pointer to it in the former, but not in the
-// latter (it causes an access violation if you do).  The Message
-// class hides this difference by treating a NULL char pointer as
-// "(null)".
-class GTEST_API_ Message {
- private:
-  // The type of basic IO manipulators (endl, ends, and flush) for
-  // narrow streams.
-  typedef std::ostream& (*BasicNarrowIoManip)(std::ostream&);
-
- public:
-  // Constructs an empty Message.
-  Message();
-
-  // Copy constructor.
-  Message(const Message& msg) : ss_(new ::std::stringstream) {  // NOLINT
-    *ss_ << msg.GetString();
-  }
-
-  // Constructs a Message from a C-string.
-  explicit Message(const char* str) : ss_(new ::std::stringstream) {
-    *ss_ << str;
-  }
-
-  // Streams a non-pointer value to this object.
-  template <typename T>
-  inline Message& operator <<(const T& val) {
-    // Some libraries overload << for STL containers.  These
-    // overloads are defined in the global namespace instead of ::std.
-    //
-    // C++'s symbol lookup rule (i.e. Koenig lookup) says that these
-    // overloads are visible in either the std namespace or the global
-    // namespace, but not other namespaces, including the testing
-    // namespace which Google Test's Message class is in.
-    //
-    // To allow STL containers (and other types that has a << operator
-    // defined in the global namespace) to be used in Google Test
-    // assertions, testing::Message must access the custom << operator
-    // from the global namespace.  With this using declaration,
-    // overloads of << defined in the global namespace and those
-    // visible via Koenig lookup are both exposed in this function.
-    using ::operator <<;
-    *ss_ << val;
-    return *this;
-  }
-
-  // Streams a pointer value to this object.
-  //
-  // This function is an overload of the previous one.  When you
-  // stream a pointer to a Message, this definition will be used as it
-  // is more specialized.  (The C++ Standard, section
-  // [temp.func.order].)  If you stream a non-pointer, then the
-  // previous definition will be used.
-  //
-  // The reason for this overload is that streaming a NULL pointer to
-  // ostream is undefined behavior.  Depending on the compiler, you
-  // may get "0", "(nil)", "(null)", or an access violation.  To
-  // ensure consistent result across compilers, we always treat NULL
-  // as "(null)".
-  template <typename T>
-  inline Message& operator <<(T* const& pointer) {  // NOLINT
-    if (pointer == nullptr) {
-      *ss_ << "(null)";
-    } else {
-      *ss_ << pointer;
-    }
-    return *this;
-  }
-
-  // Since the basic IO manipulators are overloaded for both narrow
-  // and wide streams, we have to provide this specialized definition
-  // of operator <<, even though its body is the same as the
-  // templatized version above.  Without this definition, streaming
-  // endl or other basic IO manipulators to Message will confuse the
-  // compiler.
-  Message& operator <<(BasicNarrowIoManip val) {
-    *ss_ << val;
-    return *this;
-  }
-
-  // Instead of 1/0, we want to see true/false for bool values.
-  Message& operator <<(bool b) {
-    return *this << (b ? "true" : "false");
-  }
-
-  // These two overloads allow streaming a wide C string to a Message
-  // using the UTF-8 encoding.
-  Message& operator <<(const wchar_t* wide_c_str);
-  Message& operator <<(wchar_t* wide_c_str);
-
-#if GTEST_HAS_STD_WSTRING
-  // Converts the given wide string to a narrow string using the UTF-8
-  // encoding, and streams the result to this Message object.
-  Message& operator <<(const ::std::wstring& wstr);
-#endif  // GTEST_HAS_STD_WSTRING
-
-  // Gets the text streamed to this object so far as an std::string.
-  // Each '\0' character in the buffer is replaced with "\\0".
-  //
-  // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-  std::string GetString() const;
-
- private:
-  // We'll hold the text streamed to this object here.
-  const std::unique_ptr< ::std::stringstream> ss_;
-
-  // We declare (but don't implement) this to prevent the compiler
-  // from implementing the assignment operator.
-  void operator=(const Message&);
-};
-
-// Streams a Message to an ostream.
-inline std::ostream& operator <<(std::ostream& os, const Message& sb) {
-  return os << sb.GetString();
-}
-
-namespace internal {
-
-// Converts a streamable value to an std::string.  A NULL pointer is
-// converted to "(null)".  When the input value is a ::string,
-// ::std::string, ::wstring, or ::std::wstring object, each NUL
-// character in it is replaced with "\\0".
-template <typename T>
-std::string StreamableToString(const T& streamable) {
-  return (Message() << streamable).GetString();
-}
-
-}  // namespace internal
-}  // namespace testing
-
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
-
-#endif  // GTEST_INCLUDE_GTEST_GTEST_MESSAGE_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest-param-test.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest-param-test.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest-param-test.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest-param-test.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,503 +0,0 @@
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Macros and functions for implementing parameterized tests
-// in Google C++ Testing and Mocking Framework (Google Test)
-//
-// This file is generated by a SCRIPT.  DO NOT EDIT BY HAND!
-//
-// GOOGLETEST_CM0001 DO NOT DELETE
-#ifndef GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_
-#define GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_
-
-
-// Value-parameterized tests allow you to test your code with different
-// parameters without writing multiple copies of the same test.
-//
-// Here is how you use value-parameterized tests:
-
-#if 0
-
-// To write value-parameterized tests, first you should define a fixture
-// class. It is usually derived from testing::TestWithParam<T> (see below for
-// another inheritance scheme that's sometimes useful in more complicated
-// class hierarchies), where the type of your parameter values.
-// TestWithParam<T> is itself derived from testing::Test. T can be any
-// copyable type. If it's a raw pointer, you are responsible for managing the
-// lifespan of the pointed values.
-
-class FooTest : public ::testing::TestWithParam<const char*> {
-  // You can implement all the usual class fixture members here.
-};
-
-// Then, use the TEST_P macro to define as many parameterized tests
-// for this fixture as you want. The _P suffix is for "parameterized"
-// or "pattern", whichever you prefer to think.
-
-TEST_P(FooTest, DoesBlah) {
-  // Inside a test, access the test parameter with the GetParam() method
-  // of the TestWithParam<T> class:
-  EXPECT_TRUE(foo.Blah(GetParam()));
-  ...
-}
-
-TEST_P(FooTest, HasBlahBlah) {
-  ...
-}
-
-// Finally, you can use INSTANTIATE_TEST_SUITE_P to instantiate the test
-// case with any set of parameters you want. Google Test defines a number
-// of functions for generating test parameters. They return what we call
-// (surprise!) parameter generators. Here is a summary of them, which
-// are all in the testing namespace:
-//
-//
-//  Range(begin, end [, step]) - Yields values {begin, begin+step,
-//                               begin+step+step, ...}. The values do not
-//                               include end. step defaults to 1.
-//  Values(v1, v2, ..., vN)    - Yields values {v1, v2, ..., vN}.
-//  ValuesIn(container)        - Yields values from a C-style array, an STL
-//  ValuesIn(begin,end)          container, or an iterator range [begin, end).
-//  Bool()                     - Yields sequence {false, true}.
-//  Combine(g1, g2, ..., gN)   - Yields all combinations (the Cartesian product
-//                               for the math savvy) of the values generated
-//                               by the N generators.
-//
-// For more details, see comments at the definitions of these functions below
-// in this file.
-//
-// The following statement will instantiate tests from the FooTest test suite
-// each with parameter values "meeny", "miny", and "moe".
-
-INSTANTIATE_TEST_SUITE_P(InstantiationName,
-                         FooTest,
-                         Values("meeny", "miny", "moe"));
-
-// To distinguish different instances of the pattern, (yes, you
-// can instantiate it more than once) the first argument to the
-// INSTANTIATE_TEST_SUITE_P macro is a prefix that will be added to the
-// actual test suite name. Remember to pick unique prefixes for different
-// instantiations. The tests from the instantiation above will have
-// these names:
-//
-//    * InstantiationName/FooTest.DoesBlah/0 for "meeny"
-//    * InstantiationName/FooTest.DoesBlah/1 for "miny"
-//    * InstantiationName/FooTest.DoesBlah/2 for "moe"
-//    * InstantiationName/FooTest.HasBlahBlah/0 for "meeny"
-//    * InstantiationName/FooTest.HasBlahBlah/1 for "miny"
-//    * InstantiationName/FooTest.HasBlahBlah/2 for "moe"
-//
-// You can use these names in --gtest_filter.
-//
-// This statement will instantiate all tests from FooTest again, each
-// with parameter values "cat" and "dog":
-
-const char* pets[] = {"cat", "dog"};
-INSTANTIATE_TEST_SUITE_P(AnotherInstantiationName, FooTest, ValuesIn(pets));
-
-// The tests from the instantiation above will have these names:
-//
-//    * AnotherInstantiationName/FooTest.DoesBlah/0 for "cat"
-//    * AnotherInstantiationName/FooTest.DoesBlah/1 for "dog"
-//    * AnotherInstantiationName/FooTest.HasBlahBlah/0 for "cat"
-//    * AnotherInstantiationName/FooTest.HasBlahBlah/1 for "dog"
-//
-// Please note that INSTANTIATE_TEST_SUITE_P will instantiate all tests
-// in the given test suite, whether their definitions come before or
-// AFTER the INSTANTIATE_TEST_SUITE_P statement.
-//
-// Please also note that generator expressions (including parameters to the
-// generators) are evaluated in InitGoogleTest(), after main() has started.
-// This allows the user on one hand, to adjust generator parameters in order
-// to dynamically determine a set of tests to run and on the other hand,
-// give the user a chance to inspect the generated tests with Google Test
-// reflection API before RUN_ALL_TESTS() is executed.
-//
-// You can see samples/sample7_unittest.cc and samples/sample8_unittest.cc
-// for more examples.
-//
-// In the future, we plan to publish the API for defining new parameter
-// generators. But for now this interface remains part of the internal
-// implementation and is subject to change.
-//
-//
-// A parameterized test fixture must be derived from testing::Test and from
-// testing::WithParamInterface<T>, where T is the type of the parameter
-// values. Inheriting from TestWithParam<T> satisfies that requirement because
-// TestWithParam<T> inherits from both Test and WithParamInterface. In more
-// complicated hierarchies, however, it is occasionally useful to inherit
-// separately from Test and WithParamInterface. For example:
-
-class BaseTest : public ::testing::Test {
-  // You can inherit all the usual members for a non-parameterized test
-  // fixture here.
-};
-
-class DerivedTest : public BaseTest, public ::testing::WithParamInterface<int> {
-  // The usual test fixture members go here too.
-};
-
-TEST_F(BaseTest, HasFoo) {
-  // This is an ordinary non-parameterized test.
-}
-
-TEST_P(DerivedTest, DoesBlah) {
-  // GetParam works just the same here as if you inherit from TestWithParam.
-  EXPECT_TRUE(foo.Blah(GetParam()));
-}
-
-#endif  // 0
-
-#include <iterator>
-#include <utility>
-
-#include "gtest/internal/gtest-internal.h"
-#include "gtest/internal/gtest-param-util.h"
-#include "gtest/internal/gtest-port.h"
-
-namespace testing {
-
-// Functions producing parameter generators.
-//
-// Google Test uses these generators to produce parameters for value-
-// parameterized tests. When a parameterized test suite is instantiated
-// with a particular generator, Google Test creates and runs tests
-// for each element in the sequence produced by the generator.
-//
-// In the following sample, tests from test suite FooTest are instantiated
-// each three times with parameter values 3, 5, and 8:
-//
-// class FooTest : public TestWithParam<int> { ... };
-//
-// TEST_P(FooTest, TestThis) {
-// }
-// TEST_P(FooTest, TestThat) {
-// }
-// INSTANTIATE_TEST_SUITE_P(TestSequence, FooTest, Values(3, 5, 8));
-//
-
-// Range() returns generators providing sequences of values in a range.
-//
-// Synopsis:
-// Range(start, end)
-//   - returns a generator producing a sequence of values {start, start+1,
-//     start+2, ..., }.
-// Range(start, end, step)
-//   - returns a generator producing a sequence of values {start, start+step,
-//     start+step+step, ..., }.
-// Notes:
-//   * The generated sequences never include end. For example, Range(1, 5)
-//     returns a generator producing a sequence {1, 2, 3, 4}. Range(1, 9, 2)
-//     returns a generator producing {1, 3, 5, 7}.
-//   * start and end must have the same type. That type may be any integral or
-//     floating-point type or a user defined type satisfying these conditions:
-//     * It must be assignable (have operator=() defined).
-//     * It must have operator+() (operator+(int-compatible type) for
-//       two-operand version).
-//     * It must have operator<() defined.
-//     Elements in the resulting sequences will also have that type.
-//   * Condition start < end must be satisfied in order for resulting sequences
-//     to contain any elements.
-//
-template <typename T, typename IncrementT>
-internal::ParamGenerator<T> Range(T start, T end, IncrementT step) {
-  return internal::ParamGenerator<T>(
-      new internal::RangeGenerator<T, IncrementT>(start, end, step));
-}
-
-template <typename T>
-internal::ParamGenerator<T> Range(T start, T end) {
-  return Range(start, end, 1);
-}
-
-// ValuesIn() function allows generation of tests with parameters coming from
-// a container.
-//
-// Synopsis:
-// ValuesIn(const T (&array)[N])
-//   - returns a generator producing sequences with elements from
-//     a C-style array.
-// ValuesIn(const Container& container)
-//   - returns a generator producing sequences with elements from
-//     an STL-style container.
-// ValuesIn(Iterator begin, Iterator end)
-//   - returns a generator producing sequences with elements from
-//     a range [begin, end) defined by a pair of STL-style iterators. These
-//     iterators can also be plain C pointers.
-//
-// Please note that ValuesIn copies the values from the containers
-// passed in and keeps them to generate tests in RUN_ALL_TESTS().
-//
-// Examples:
-//
-// This instantiates tests from test suite StringTest
-// each with C-string values of "foo", "bar", and "baz":
-//
-// const char* strings[] = {"foo", "bar", "baz"};
-// INSTANTIATE_TEST_SUITE_P(StringSequence, StringTest, ValuesIn(strings));
-//
-// This instantiates tests from test suite StlStringTest
-// each with STL strings with values "a" and "b":
-//
-// ::std::vector< ::std::string> GetParameterStrings() {
-//   ::std::vector< ::std::string> v;
-//   v.push_back("a");
-//   v.push_back("b");
-//   return v;
-// }
-//
-// INSTANTIATE_TEST_SUITE_P(CharSequence,
-//                          StlStringTest,
-//                          ValuesIn(GetParameterStrings()));
-//
-//
-// This will also instantiate tests from CharTest
-// each with parameter values 'a' and 'b':
-//
-// ::std::list<char> GetParameterChars() {
-//   ::std::list<char> list;
-//   list.push_back('a');
-//   list.push_back('b');
-//   return list;
-// }
-// ::std::list<char> l = GetParameterChars();
-// INSTANTIATE_TEST_SUITE_P(CharSequence2,
-//                          CharTest,
-//                          ValuesIn(l.begin(), l.end()));
-//
-template <typename ForwardIterator>
-internal::ParamGenerator<
-    typename std::iterator_traits<ForwardIterator>::value_type>
-ValuesIn(ForwardIterator begin, ForwardIterator end) {
-  typedef typename std::iterator_traits<ForwardIterator>::value_type ParamType;
-  return internal::ParamGenerator<ParamType>(
-      new internal::ValuesInIteratorRangeGenerator<ParamType>(begin, end));
-}
-
-template <typename T, size_t N>
-internal::ParamGenerator<T> ValuesIn(const T (&array)[N]) {
-  return ValuesIn(array, array + N);
-}
-
-template <class Container>
-internal::ParamGenerator<typename Container::value_type> ValuesIn(
-    const Container& container) {
-  return ValuesIn(container.begin(), container.end());
-}
-
-// Values() allows generating tests from explicitly specified list of
-// parameters.
-//
-// Synopsis:
-// Values(T v1, T v2, ..., T vN)
-//   - returns a generator producing sequences with elements v1, v2, ..., vN.
-//
-// For example, this instantiates tests from test suite BarTest each
-// with values "one", "two", and "three":
-//
-// INSTANTIATE_TEST_SUITE_P(NumSequence,
-//                          BarTest,
-//                          Values("one", "two", "three"));
-//
-// This instantiates tests from test suite BazTest each with values 1, 2, 3.5.
-// The exact type of values will depend on the type of parameter in BazTest.
-//
-// INSTANTIATE_TEST_SUITE_P(FloatingNumbers, BazTest, Values(1, 2, 3.5));
-//
-//
-template <typename... T>
-internal::ValueArray<T...> Values(T... v) {
-  return internal::ValueArray<T...>(std::move(v)...);
-}
-
-// Bool() allows generating tests with parameters in a set of (false, true).
-//
-// Synopsis:
-// Bool()
-//   - returns a generator producing sequences with elements {false, true}.
-//
-// It is useful when testing code that depends on Boolean flags. Combinations
-// of multiple flags can be tested when several Bool()'s are combined using
-// Combine() function.
-//
-// In the following example all tests in the test suite FlagDependentTest
-// will be instantiated twice with parameters false and true.
-//
-// class FlagDependentTest : public testing::TestWithParam<bool> {
-//   virtual void SetUp() {
-//     external_flag = GetParam();
-//   }
-// }
-// INSTANTIATE_TEST_SUITE_P(BoolSequence, FlagDependentTest, Bool());
-//
-inline internal::ParamGenerator<bool> Bool() {
-  return Values(false, true);
-}
-
-// Combine() allows the user to combine two or more sequences to produce
-// values of a Cartesian product of those sequences' elements.
-//
-// Synopsis:
-// Combine(gen1, gen2, ..., genN)
-//   - returns a generator producing sequences with elements coming from
-//     the Cartesian product of elements from the sequences generated by
-//     gen1, gen2, ..., genN. The sequence elements will have a type of
-//     std::tuple<T1, T2, ..., TN> where T1, T2, ..., TN are the types
-//     of elements from sequences produces by gen1, gen2, ..., genN.
-//
-// Combine can have up to 10 arguments.
-//
-// Example:
-//
-// This will instantiate tests in test suite AnimalTest each one with
-// the parameter values tuple("cat", BLACK), tuple("cat", WHITE),
-// tuple("dog", BLACK), and tuple("dog", WHITE):
-//
-// enum Color { BLACK, GRAY, WHITE };
-// class AnimalTest
-//     : public testing::TestWithParam<std::tuple<const char*, Color> > {...};
-//
-// TEST_P(AnimalTest, AnimalLooksNice) {...}
-//
-// INSTANTIATE_TEST_SUITE_P(AnimalVariations, AnimalTest,
-//                          Combine(Values("cat", "dog"),
-//                                  Values(BLACK, WHITE)));
-//
-// This will instantiate tests in FlagDependentTest with all variations of two
-// Boolean flags:
-//
-// class FlagDependentTest
-//     : public testing::TestWithParam<std::tuple<bool, bool> > {
-//   virtual void SetUp() {
-//     // Assigns external_flag_1 and external_flag_2 values from the tuple.
-//     std::tie(external_flag_1, external_flag_2) = GetParam();
-//   }
-// };
-//
-// TEST_P(FlagDependentTest, TestFeature1) {
-//   // Test your code using external_flag_1 and external_flag_2 here.
-// }
-// INSTANTIATE_TEST_SUITE_P(TwoBoolSequence, FlagDependentTest,
-//                          Combine(Bool(), Bool()));
-//
-template <typename... Generator>
-internal::CartesianProductHolder<Generator...> Combine(const Generator&... g) {
-  return internal::CartesianProductHolder<Generator...>(g...);
-}
-
-#define TEST_P(test_suite_name, test_name)                                     \
-  class GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)                     \
-      : public test_suite_name {                                               \
-   public:                                                                     \
-    GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)() {}                    \
-    virtual void TestBody();                                                   \
-                                                                               \
-   private:                                                                    \
-    static int AddToRegistry() {                                               \
-      ::testing::UnitTest::GetInstance()                                       \
-          ->parameterized_test_registry()                                      \
-          .GetTestSuitePatternHolder<test_suite_name>(                         \
-              #test_suite_name,                                                \
-              ::testing::internal::CodeLocation(__FILE__, __LINE__))           \
-          ->AddTestPattern(                                                    \
-              GTEST_STRINGIFY_(test_suite_name), GTEST_STRINGIFY_(test_name),  \
-              new ::testing::internal::TestMetaFactory<GTEST_TEST_CLASS_NAME_( \
-                  test_suite_name, test_name)>());                             \
-      return 0;                                                                \
-    }                                                                          \
-    static int gtest_registering_dummy_ GTEST_ATTRIBUTE_UNUSED_;               \
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(GTEST_TEST_CLASS_NAME_(test_suite_name,    \
-                                                           test_name));        \
-  };                                                                           \
-  int GTEST_TEST_CLASS_NAME_(test_suite_name,                                  \
-                             test_name)::gtest_registering_dummy_ =            \
-      GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::AddToRegistry();     \
-  void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::TestBody()
-
-// The last argument to INSTANTIATE_TEST_SUITE_P allows the user to specify
-// generator and an optional function or functor that generates custom test name
-// suffixes based on the test parameters. Such a function or functor should
-// accept one argument of type testing::TestParamInfo<class ParamType>, and
-// return std::string.
-//
-// testing::PrintToStringParamName is a builtin test suffix generator that
-// returns the value of testing::PrintToString(GetParam()).
-//
-// Note: test names must be non-empty, unique, and may only contain ASCII
-// alphanumeric characters or underscore. Because PrintToString adds quotes
-// to std::string and C strings, it won't work for these types.
-
-#define GTEST_EXPAND_(arg) arg
-#define GTEST_GET_FIRST_(first, ...) first
-#define GTEST_GET_SECOND_(first, second, ...) second
-
-#define INSTANTIATE_TEST_SUITE_P(prefix, test_suite_name, ...)                \
-  static ::testing::internal::ParamGenerator<test_suite_name::ParamType>      \
-      gtest_##prefix##test_suite_name##_EvalGenerator_() {                    \
-    return GTEST_EXPAND_(GTEST_GET_FIRST_(__VA_ARGS__, DUMMY_PARAM_));        \
-  }                                                                           \
-  static ::std::string gtest_##prefix##test_suite_name##_EvalGenerateName_(   \
-      const ::testing::TestParamInfo<test_suite_name::ParamType>& info) {     \
-    if (::testing::internal::AlwaysFalse()) {                                 \
-      ::testing::internal::TestNotEmpty(GTEST_EXPAND_(GTEST_GET_SECOND_(      \
-          __VA_ARGS__,                                                        \
-          ::testing::internal::DefaultParamName<test_suite_name::ParamType>,  \
-          DUMMY_PARAM_)));                                                    \
-      auto t = std::make_tuple(__VA_ARGS__);                                  \
-      static_assert(std::tuple_size<decltype(t)>::value <= 2,                 \
-                    "Too Many Args!");                                        \
-    }                                                                         \
-    return ((GTEST_EXPAND_(GTEST_GET_SECOND_(                                 \
-        __VA_ARGS__,                                                          \
-        ::testing::internal::DefaultParamName<test_suite_name::ParamType>,    \
-        DUMMY_PARAM_))))(info);                                               \
-  }                                                                           \
-  static int gtest_##prefix##test_suite_name##_dummy_                         \
-      GTEST_ATTRIBUTE_UNUSED_ =                                               \
-          ::testing::UnitTest::GetInstance()                                  \
-              ->parameterized_test_registry()                                 \
-              .GetTestSuitePatternHolder<test_suite_name>(                    \
-                  #test_suite_name,                                           \
-                  ::testing::internal::CodeLocation(__FILE__, __LINE__))      \
-              ->AddTestSuiteInstantiation(                                    \
-                  #prefix, &gtest_##prefix##test_suite_name##_EvalGenerator_, \
-                  &gtest_##prefix##test_suite_name##_EvalGenerateName_,       \
-                  __FILE__, __LINE__)
-
-// Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-#define INSTANTIATE_TEST_CASE_P                                            \
-  static_assert(::testing::internal::InstantiateTestCase_P_IsDeprecated(), \
-                "");                                                       \
-  INSTANTIATE_TEST_SUITE_P
-#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-}  // namespace testing
-
-#endif  // GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest_pred_impl.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest_pred_impl.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest_pred_impl.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest_pred_impl.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,359 +0,0 @@
-// Copyright 2006, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// This file is AUTOMATICALLY GENERATED on 01/02/2019 by command
-// 'gen_gtest_pred_impl.py 5'.  DO NOT EDIT BY HAND!
-//
-// Implements a family of generic predicate assertion macros.
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_
-#define GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_
-
-#include "gtest/gtest.h"
-
-namespace testing {
-
-// This header implements a family of generic predicate assertion
-// macros:
-//
-//   ASSERT_PRED_FORMAT1(pred_format, v1)
-//   ASSERT_PRED_FORMAT2(pred_format, v1, v2)
-//   ...
-//
-// where pred_format is a function or functor that takes n (in the
-// case of ASSERT_PRED_FORMATn) values and their source expression
-// text, and returns a testing::AssertionResult.  See the definition
-// of ASSERT_EQ in gtest.h for an example.
-//
-// If you don't care about formatting, you can use the more
-// restrictive version:
-//
-//   ASSERT_PRED1(pred, v1)
-//   ASSERT_PRED2(pred, v1, v2)
-//   ...
-//
-// where pred is an n-ary function or functor that returns bool,
-// and the values v1, v2, ..., must support the << operator for
-// streaming to std::ostream.
-//
-// We also define the EXPECT_* variations.
-//
-// For now we only support predicates whose arity is at most 5.
-// Please email googletestframework@googlegroups.com if you need
-// support for higher arities.
-
-// GTEST_ASSERT_ is the basic statement to which all of the assertions
-// in this file reduce.  Don't use this in your code.
-
-#define GTEST_ASSERT_(expression, on_failure) \
-  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
-  if (const ::testing::AssertionResult gtest_ar = (expression)) \
-    ; \
-  else \
-    on_failure(gtest_ar.failure_message())
-
-
-// Helper function for implementing {EXPECT|ASSERT}_PRED1.  Don't use
-// this in your code.
-template <typename Pred,
-          typename T1>
-AssertionResult AssertPred1Helper(const char* pred_text,
-                                  const char* e1,
-                                  Pred pred,
-                                  const T1& v1) {
-  if (pred(v1)) return AssertionSuccess();
-
-  return AssertionFailure()
-         << pred_text << "(" << e1 << ") evaluates to false, where"
-         << "\n"
-         << e1 << " evaluates to " << ::testing::PrintToString(v1);
-}
-
-// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT1.
-// Don't use this in your code.
-#define GTEST_PRED_FORMAT1_(pred_format, v1, on_failure)\
-  GTEST_ASSERT_(pred_format(#v1, v1), \
-                on_failure)
-
-// Internal macro for implementing {EXPECT|ASSERT}_PRED1.  Don't use
-// this in your code.
-#define GTEST_PRED1_(pred, v1, on_failure)\
-  GTEST_ASSERT_(::testing::AssertPred1Helper(#pred, \
-                                             #v1, \
-                                             pred, \
-                                             v1), on_failure)
-
-// Unary predicate assertion macros.
-#define EXPECT_PRED_FORMAT1(pred_format, v1) \
-  GTEST_PRED_FORMAT1_(pred_format, v1, GTEST_NONFATAL_FAILURE_)
-#define EXPECT_PRED1(pred, v1) \
-  GTEST_PRED1_(pred, v1, GTEST_NONFATAL_FAILURE_)
-#define ASSERT_PRED_FORMAT1(pred_format, v1) \
-  GTEST_PRED_FORMAT1_(pred_format, v1, GTEST_FATAL_FAILURE_)
-#define ASSERT_PRED1(pred, v1) \
-  GTEST_PRED1_(pred, v1, GTEST_FATAL_FAILURE_)
-
-
-
-// Helper function for implementing {EXPECT|ASSERT}_PRED2.  Don't use
-// this in your code.
-template <typename Pred,
-          typename T1,
-          typename T2>
-AssertionResult AssertPred2Helper(const char* pred_text,
-                                  const char* e1,
-                                  const char* e2,
-                                  Pred pred,
-                                  const T1& v1,
-                                  const T2& v2) {
-  if (pred(v1, v2)) return AssertionSuccess();
-
-  return AssertionFailure()
-         << pred_text << "(" << e1 << ", " << e2
-         << ") evaluates to false, where"
-         << "\n"
-         << e1 << " evaluates to " << ::testing::PrintToString(v1) << "\n"
-         << e2 << " evaluates to " << ::testing::PrintToString(v2);
-}
-
-// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT2.
-// Don't use this in your code.
-#define GTEST_PRED_FORMAT2_(pred_format, v1, v2, on_failure)\
-  GTEST_ASSERT_(pred_format(#v1, #v2, v1, v2), \
-                on_failure)
-
-// Internal macro for implementing {EXPECT|ASSERT}_PRED2.  Don't use
-// this in your code.
-#define GTEST_PRED2_(pred, v1, v2, on_failure)\
-  GTEST_ASSERT_(::testing::AssertPred2Helper(#pred, \
-                                             #v1, \
-                                             #v2, \
-                                             pred, \
-                                             v1, \
-                                             v2), on_failure)
-
-// Binary predicate assertion macros.
-#define EXPECT_PRED_FORMAT2(pred_format, v1, v2) \
-  GTEST_PRED_FORMAT2_(pred_format, v1, v2, GTEST_NONFATAL_FAILURE_)
-#define EXPECT_PRED2(pred, v1, v2) \
-  GTEST_PRED2_(pred, v1, v2, GTEST_NONFATAL_FAILURE_)
-#define ASSERT_PRED_FORMAT2(pred_format, v1, v2) \
-  GTEST_PRED_FORMAT2_(pred_format, v1, v2, GTEST_FATAL_FAILURE_)
-#define ASSERT_PRED2(pred, v1, v2) \
-  GTEST_PRED2_(pred, v1, v2, GTEST_FATAL_FAILURE_)
-
-
-
-// Helper function for implementing {EXPECT|ASSERT}_PRED3.  Don't use
-// this in your code.
-template <typename Pred,
-          typename T1,
-          typename T2,
-          typename T3>
-AssertionResult AssertPred3Helper(const char* pred_text,
-                                  const char* e1,
-                                  const char* e2,
-                                  const char* e3,
-                                  Pred pred,
-                                  const T1& v1,
-                                  const T2& v2,
-                                  const T3& v3) {
-  if (pred(v1, v2, v3)) return AssertionSuccess();
-
-  return AssertionFailure()
-         << pred_text << "(" << e1 << ", " << e2 << ", " << e3
-         << ") evaluates to false, where"
-         << "\n"
-         << e1 << " evaluates to " << ::testing::PrintToString(v1) << "\n"
-         << e2 << " evaluates to " << ::testing::PrintToString(v2) << "\n"
-         << e3 << " evaluates to " << ::testing::PrintToString(v3);
-}
-
-// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT3.
-// Don't use this in your code.
-#define GTEST_PRED_FORMAT3_(pred_format, v1, v2, v3, on_failure)\
-  GTEST_ASSERT_(pred_format(#v1, #v2, #v3, v1, v2, v3), \
-                on_failure)
-
-// Internal macro for implementing {EXPECT|ASSERT}_PRED3.  Don't use
-// this in your code.
-#define GTEST_PRED3_(pred, v1, v2, v3, on_failure)\
-  GTEST_ASSERT_(::testing::AssertPred3Helper(#pred, \
-                                             #v1, \
-                                             #v2, \
-                                             #v3, \
-                                             pred, \
-                                             v1, \
-                                             v2, \
-                                             v3), on_failure)
-
-// Ternary predicate assertion macros.
-#define EXPECT_PRED_FORMAT3(pred_format, v1, v2, v3) \
-  GTEST_PRED_FORMAT3_(pred_format, v1, v2, v3, GTEST_NONFATAL_FAILURE_)
-#define EXPECT_PRED3(pred, v1, v2, v3) \
-  GTEST_PRED3_(pred, v1, v2, v3, GTEST_NONFATAL_FAILURE_)
-#define ASSERT_PRED_FORMAT3(pred_format, v1, v2, v3) \
-  GTEST_PRED_FORMAT3_(pred_format, v1, v2, v3, GTEST_FATAL_FAILURE_)
-#define ASSERT_PRED3(pred, v1, v2, v3) \
-  GTEST_PRED3_(pred, v1, v2, v3, GTEST_FATAL_FAILURE_)
-
-
-
-// Helper function for implementing {EXPECT|ASSERT}_PRED4.  Don't use
-// this in your code.
-template <typename Pred,
-          typename T1,
-          typename T2,
-          typename T3,
-          typename T4>
-AssertionResult AssertPred4Helper(const char* pred_text,
-                                  const char* e1,
-                                  const char* e2,
-                                  const char* e3,
-                                  const char* e4,
-                                  Pred pred,
-                                  const T1& v1,
-                                  const T2& v2,
-                                  const T3& v3,
-                                  const T4& v4) {
-  if (pred(v1, v2, v3, v4)) return AssertionSuccess();
-
-  return AssertionFailure()
-         << pred_text << "(" << e1 << ", " << e2 << ", " << e3 << ", " << e4
-         << ") evaluates to false, where"
-         << "\n"
-         << e1 << " evaluates to " << ::testing::PrintToString(v1) << "\n"
-         << e2 << " evaluates to " << ::testing::PrintToString(v2) << "\n"
-         << e3 << " evaluates to " << ::testing::PrintToString(v3) << "\n"
-         << e4 << " evaluates to " << ::testing::PrintToString(v4);
-}
-
-// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT4.
-// Don't use this in your code.
-#define GTEST_PRED_FORMAT4_(pred_format, v1, v2, v3, v4, on_failure)\
-  GTEST_ASSERT_(pred_format(#v1, #v2, #v3, #v4, v1, v2, v3, v4), \
-                on_failure)
-
-// Internal macro for implementing {EXPECT|ASSERT}_PRED4.  Don't use
-// this in your code.
-#define GTEST_PRED4_(pred, v1, v2, v3, v4, on_failure)\
-  GTEST_ASSERT_(::testing::AssertPred4Helper(#pred, \
-                                             #v1, \
-                                             #v2, \
-                                             #v3, \
-                                             #v4, \
-                                             pred, \
-                                             v1, \
-                                             v2, \
-                                             v3, \
-                                             v4), on_failure)
-
-// 4-ary predicate assertion macros.
-#define EXPECT_PRED_FORMAT4(pred_format, v1, v2, v3, v4) \
-  GTEST_PRED_FORMAT4_(pred_format, v1, v2, v3, v4, GTEST_NONFATAL_FAILURE_)
-#define EXPECT_PRED4(pred, v1, v2, v3, v4) \
-  GTEST_PRED4_(pred, v1, v2, v3, v4, GTEST_NONFATAL_FAILURE_)
-#define ASSERT_PRED_FORMAT4(pred_format, v1, v2, v3, v4) \
-  GTEST_PRED_FORMAT4_(pred_format, v1, v2, v3, v4, GTEST_FATAL_FAILURE_)
-#define ASSERT_PRED4(pred, v1, v2, v3, v4) \
-  GTEST_PRED4_(pred, v1, v2, v3, v4, GTEST_FATAL_FAILURE_)
-
-
-
-// Helper function for implementing {EXPECT|ASSERT}_PRED5.  Don't use
-// this in your code.
-template <typename Pred,
-          typename T1,
-          typename T2,
-          typename T3,
-          typename T4,
-          typename T5>
-AssertionResult AssertPred5Helper(const char* pred_text,
-                                  const char* e1,
-                                  const char* e2,
-                                  const char* e3,
-                                  const char* e4,
-                                  const char* e5,
-                                  Pred pred,
-                                  const T1& v1,
-                                  const T2& v2,
-                                  const T3& v3,
-                                  const T4& v4,
-                                  const T5& v5) {
-  if (pred(v1, v2, v3, v4, v5)) return AssertionSuccess();
-
-  return AssertionFailure()
-         << pred_text << "(" << e1 << ", " << e2 << ", " << e3 << ", " << e4
-         << ", " << e5 << ") evaluates to false, where"
-         << "\n"
-         << e1 << " evaluates to " << ::testing::PrintToString(v1) << "\n"
-         << e2 << " evaluates to " << ::testing::PrintToString(v2) << "\n"
-         << e3 << " evaluates to " << ::testing::PrintToString(v3) << "\n"
-         << e4 << " evaluates to " << ::testing::PrintToString(v4) << "\n"
-         << e5 << " evaluates to " << ::testing::PrintToString(v5);
-}
-
-// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT5.
-// Don't use this in your code.
-#define GTEST_PRED_FORMAT5_(pred_format, v1, v2, v3, v4, v5, on_failure)\
-  GTEST_ASSERT_(pred_format(#v1, #v2, #v3, #v4, #v5, v1, v2, v3, v4, v5), \
-                on_failure)
-
-// Internal macro for implementing {EXPECT|ASSERT}_PRED5.  Don't use
-// this in your code.
-#define GTEST_PRED5_(pred, v1, v2, v3, v4, v5, on_failure)\
-  GTEST_ASSERT_(::testing::AssertPred5Helper(#pred, \
-                                             #v1, \
-                                             #v2, \
-                                             #v3, \
-                                             #v4, \
-                                             #v5, \
-                                             pred, \
-                                             v1, \
-                                             v2, \
-                                             v3, \
-                                             v4, \
-                                             v5), on_failure)
-
-// 5-ary predicate assertion macros.
-#define EXPECT_PRED_FORMAT5(pred_format, v1, v2, v3, v4, v5) \
-  GTEST_PRED_FORMAT5_(pred_format, v1, v2, v3, v4, v5, GTEST_NONFATAL_FAILURE_)
-#define EXPECT_PRED5(pred, v1, v2, v3, v4, v5) \
-  GTEST_PRED5_(pred, v1, v2, v3, v4, v5, GTEST_NONFATAL_FAILURE_)
-#define ASSERT_PRED_FORMAT5(pred_format, v1, v2, v3, v4, v5) \
-  GTEST_PRED_FORMAT5_(pred_format, v1, v2, v3, v4, v5, GTEST_FATAL_FAILURE_)
-#define ASSERT_PRED5(pred, v1, v2, v3, v4, v5) \
-  GTEST_PRED5_(pred, v1, v2, v3, v4, v5, GTEST_FATAL_FAILURE_)
-
-
-
-}  // namespace testing
-
-#endif  // GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest-printers.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest-printers.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest-printers.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest-printers.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,928 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Google Test - The Google C++ Testing and Mocking Framework
-//
-// This file implements a universal value printer that can print a
-// value of any type T:
-//
-//   void ::testing::internal::UniversalPrinter<T>::Print(value, ostream_ptr);
-//
-// A user can teach this function how to print a class type T by
-// defining either operator<<() or PrintTo() in the namespace that
-// defines T.  More specifically, the FIRST defined function in the
-// following list will be used (assuming T is defined in namespace
-// foo):
-//
-//   1. foo::PrintTo(const T&, ostream*)
-//   2. operator<<(ostream&, const T&) defined in either foo or the
-//      global namespace.
-//
-// However if T is an STL-style container then it is printed element-wise
-// unless foo::PrintTo(const T&, ostream*) is defined. Note that
-// operator<<() is ignored for container types.
-//
-// If none of the above is defined, it will print the debug string of
-// the value if it is a protocol buffer, or print the raw bytes in the
-// value otherwise.
-//
-// To aid debugging: when T is a reference type, the address of the
-// value is also printed; when T is a (const) char pointer, both the
-// pointer value and the NUL-terminated string it points to are
-// printed.
-//
-// We also provide some convenient wrappers:
-//
-//   // Prints a value to a string.  For a (const or not) char
-//   // pointer, the NUL-terminated string (but not the pointer) is
-//   // printed.
-//   std::string ::testing::PrintToString(const T& value);
-//
-//   // Prints a value tersely: for a reference type, the referenced
-//   // value (but not the address) is printed; for a (const or not) char
-//   // pointer, the NUL-terminated string (but not the pointer) is
-//   // printed.
-//   void ::testing::internal::UniversalTersePrint(const T& value, ostream*);
-//
-//   // Prints value using the type inferred by the compiler.  The difference
-//   // from UniversalTersePrint() is that this function prints both the
-//   // pointer and the NUL-terminated string for a (const or not) char pointer.
-//   void ::testing::internal::UniversalPrint(const T& value, ostream*);
-//
-//   // Prints the fields of a tuple tersely to a string vector, one
-//   // element for each field. Tuple support must be enabled in
-//   // gtest-port.h.
-//   std::vector<string> UniversalTersePrintTupleFieldsToStrings(
-//       const Tuple& value);
-//
-// Known limitation:
-//
-// The print primitives print the elements of an STL-style container
-// using the compiler-inferred type of *iter where iter is a
-// const_iterator of the container.  When const_iterator is an input
-// iterator but not a forward iterator, this inferred type may not
-// match value_type, and the print output may be incorrect.  In
-// practice, this is rarely a problem as for most containers
-// const_iterator is a forward iterator.  We'll fix this if there's an
-// actual need for it.  Note that this fix cannot rely on value_type
-// being defined as many user-defined container types don't have
-// value_type.
-
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GTEST_INCLUDE_GTEST_GTEST_PRINTERS_H_
-#define GTEST_INCLUDE_GTEST_GTEST_PRINTERS_H_
-
-#include <functional>
-#include <ostream>  // NOLINT
-#include <sstream>
-#include <string>
-#include <tuple>
-#include <type_traits>
-#include <utility>
-#include <vector>
-#include "gtest/internal/gtest-internal.h"
-#include "gtest/internal/gtest-port.h"
-
-#if GTEST_HAS_ABSL
-#include "absl/strings/string_view.h"
-#include "absl/types/optional.h"
-#include "absl/types/variant.h"
-#endif  // GTEST_HAS_ABSL
-
-namespace testing {
-
-// Definitions in the 'internal' and 'internal2' name spaces are
-// subject to change without notice.  DO NOT USE THEM IN USER CODE!
-namespace internal2 {
-
-// Prints the given number of bytes in the given object to the given
-// ostream.
-GTEST_API_ void PrintBytesInObjectTo(const unsigned char* obj_bytes,
-                                     size_t count,
-                                     ::std::ostream* os);
-
-// For selecting which printer to use when a given type has neither <<
-// nor PrintTo().
-enum TypeKind {
-  kProtobuf,              // a protobuf type
-  kConvertibleToInteger,  // a type implicitly convertible to BiggestInt
-                          // (e.g. a named or unnamed enum type)
-#if GTEST_HAS_ABSL
-  kConvertibleToStringView,  // a type implicitly convertible to
-                             // absl::string_view
-#endif
-  kOtherType  // anything else
-};
-
-// TypeWithoutFormatter<T, kTypeKind>::PrintValue(value, os) is called
-// by the universal printer to print a value of type T when neither
-// operator<< nor PrintTo() is defined for T, where kTypeKind is the
-// "kind" of T as defined by enum TypeKind.
-template <typename T, TypeKind kTypeKind>
-class TypeWithoutFormatter {
- public:
-  // This default version is called when kTypeKind is kOtherType.
-  static void PrintValue(const T& value, ::std::ostream* os) {
-    PrintBytesInObjectTo(
-        static_cast<const unsigned char*>(
-            reinterpret_cast<const void*>(std::addressof(value))),
-        sizeof(value), os);
-  }
-};
-
-// We print a protobuf using its ShortDebugString() when the string
-// doesn't exceed this many characters; otherwise we print it using
-// DebugString() for better readability.
-const size_t kProtobufOneLinerMaxLength = 50;
-
-template <typename T>
-class TypeWithoutFormatter<T, kProtobuf> {
- public:
-  static void PrintValue(const T& value, ::std::ostream* os) {
-    std::string pretty_str = value.ShortDebugString();
-    if (pretty_str.length() > kProtobufOneLinerMaxLength) {
-      pretty_str = "\n" + value.DebugString();
-    }
-    *os << ("<" + pretty_str + ">");
-  }
-};
-
-template <typename T>
-class TypeWithoutFormatter<T, kConvertibleToInteger> {
- public:
-  // Since T has no << operator or PrintTo() but can be implicitly
-  // converted to BiggestInt, we print it as a BiggestInt.
-  //
-  // Most likely T is an enum type (either named or unnamed), in which
-  // case printing it as an integer is the desired behavior.  In case
-  // T is not an enum, printing it as an integer is the best we can do
-  // given that it has no user-defined printer.
-  static void PrintValue(const T& value, ::std::ostream* os) {
-    const internal::BiggestInt kBigInt = value;
-    *os << kBigInt;
-  }
-};
-
-#if GTEST_HAS_ABSL
-template <typename T>
-class TypeWithoutFormatter<T, kConvertibleToStringView> {
- public:
-  // Since T has neither operator<< nor PrintTo() but can be implicitly
-  // converted to absl::string_view, we print it as a absl::string_view.
-  //
-  // Note: the implementation is further below, as it depends on
-  // internal::PrintTo symbol which is defined later in the file.
-  static void PrintValue(const T& value, ::std::ostream* os);
-};
-#endif
-
-// Prints the given value to the given ostream.  If the value is a
-// protocol message, its debug string is printed; if it's an enum or
-// of a type implicitly convertible to BiggestInt, it's printed as an
-// integer; otherwise the bytes in the value are printed.  This is
-// what UniversalPrinter<T>::Print() does when it knows nothing about
-// type T and T has neither << operator nor PrintTo().
-//
-// A user can override this behavior for a class type Foo by defining
-// a << operator in the namespace where Foo is defined.
-//
-// We put this operator in namespace 'internal2' instead of 'internal'
-// to simplify the implementation, as much code in 'internal' needs to
-// use << in STL, which would conflict with our own << were it defined
-// in 'internal'.
-//
-// Note that this operator<< takes a generic std::basic_ostream<Char,
-// CharTraits> type instead of the more restricted std::ostream.  If
-// we define it to take an std::ostream instead, we'll get an
-// "ambiguous overloads" compiler error when trying to print a type
-// Foo that supports streaming to std::basic_ostream<Char,
-// CharTraits>, as the compiler cannot tell whether
-// operator<<(std::ostream&, const T&) or
-// operator<<(std::basic_stream<Char, CharTraits>, const Foo&) is more
-// specific.
-template <typename Char, typename CharTraits, typename T>
-::std::basic_ostream<Char, CharTraits>& operator<<(
-    ::std::basic_ostream<Char, CharTraits>& os, const T& x) {
-  TypeWithoutFormatter<T, (internal::IsAProtocolMessage<T>::value
-                               ? kProtobuf
-                               : std::is_convertible<
-                                     const T&, internal::BiggestInt>::value
-                                     ? kConvertibleToInteger
-                                     :
-#if GTEST_HAS_ABSL
-                                     std::is_convertible<
-                                         const T&, absl::string_view>::value
-                                         ? kConvertibleToStringView
-                                         :
-#endif
-                                         kOtherType)>::PrintValue(x, &os);
-  return os;
-}
-
-}  // namespace internal2
-}  // namespace testing
-
-// This namespace MUST NOT BE NESTED IN ::testing, or the name look-up
-// magic needed for implementing UniversalPrinter won't work.
-namespace testing_internal {
-
-// Used to print a value that is not an STL-style container when the
-// user doesn't define PrintTo() for it.
-template <typename T>
-void DefaultPrintNonContainerTo(const T& value, ::std::ostream* os) {
-  // With the following statement, during unqualified name lookup,
-  // testing::internal2::operator<< appears as if it was declared in
-  // the nearest enclosing namespace that contains both
-  // ::testing_internal and ::testing::internal2, i.e. the global
-  // namespace.  For more details, refer to the C++ Standard section
-  // 7.3.4-1 [namespace.udir].  This allows us to fall back onto
-  // testing::internal2::operator<< in case T doesn't come with a <<
-  // operator.
-  //
-  // We cannot write 'using ::testing::internal2::operator<<;', which
-  // gcc 3.3 fails to compile due to a compiler bug.
-  using namespace ::testing::internal2;  // NOLINT
-
-  // Assuming T is defined in namespace foo, in the next statement,
-  // the compiler will consider all of:
-  //
-  //   1. foo::operator<< (thanks to Koenig look-up),
-  //   2. ::operator<< (as the current namespace is enclosed in ::),
-  //   3. testing::internal2::operator<< (thanks to the using statement above).
-  //
-  // The operator<< whose type matches T best will be picked.
-  //
-  // We deliberately allow #2 to be a candidate, as sometimes it's
-  // impossible to define #1 (e.g. when foo is ::std, defining
-  // anything in it is undefined behavior unless you are a compiler
-  // vendor.).
-  *os << value;
-}
-
-}  // namespace testing_internal
-
-namespace testing {
-namespace internal {
-
-// FormatForComparison<ToPrint, OtherOperand>::Format(value) formats a
-// value of type ToPrint that is an operand of a comparison assertion
-// (e.g. ASSERT_EQ).  OtherOperand is the type of the other operand in
-// the comparison, and is used to help determine the best way to
-// format the value.  In particular, when the value is a C string
-// (char pointer) and the other operand is an STL string object, we
-// want to format the C string as a string, since we know it is
-// compared by value with the string object.  If the value is a char
-// pointer but the other operand is not an STL string object, we don't
-// know whether the pointer is supposed to point to a NUL-terminated
-// string, and thus want to print it as a pointer to be safe.
-//
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-
-// The default case.
-template <typename ToPrint, typename OtherOperand>
-class FormatForComparison {
- public:
-  static ::std::string Format(const ToPrint& value) {
-    return ::testing::PrintToString(value);
-  }
-};
-
-// Array.
-template <typename ToPrint, size_t N, typename OtherOperand>
-class FormatForComparison<ToPrint[N], OtherOperand> {
- public:
-  static ::std::string Format(const ToPrint* value) {
-    return FormatForComparison<const ToPrint*, OtherOperand>::Format(value);
-  }
-};
-
-// By default, print C string as pointers to be safe, as we don't know
-// whether they actually point to a NUL-terminated string.
-
-#define GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(CharType)                \
-  template <typename OtherOperand>                                      \
-  class FormatForComparison<CharType*, OtherOperand> {                  \
-   public:                                                              \
-    static ::std::string Format(CharType* value) {                      \
-      return ::testing::PrintToString(static_cast<const void*>(value)); \
-    }                                                                   \
-  }
-
-GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(char);
-GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const char);
-GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(wchar_t);
-GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const wchar_t);
-
-#undef GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_
-
-// If a C string is compared with an STL string object, we know it's meant
-// to point to a NUL-terminated string, and thus can print it as a string.
-
-#define GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(CharType, OtherStringType) \
-  template <>                                                           \
-  class FormatForComparison<CharType*, OtherStringType> {               \
-   public:                                                              \
-    static ::std::string Format(CharType* value) {                      \
-      return ::testing::PrintToString(value);                           \
-    }                                                                   \
-  }
-
-GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(char, ::std::string);
-GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const char, ::std::string);
-
-#if GTEST_HAS_STD_WSTRING
-GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(wchar_t, ::std::wstring);
-GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const wchar_t, ::std::wstring);
-#endif
-
-#undef GTEST_IMPL_FORMAT_C_STRING_AS_STRING_
-
-// Formats a comparison assertion (e.g. ASSERT_EQ, EXPECT_LT, and etc)
-// operand to be used in a failure message.  The type (but not value)
-// of the other operand may affect the format.  This allows us to
-// print a char* as a raw pointer when it is compared against another
-// char* or void*, and print it as a C string when it is compared
-// against an std::string object, for example.
-//
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-template <typename T1, typename T2>
-std::string FormatForComparisonFailureMessage(
-    const T1& value, const T2& /* other_operand */) {
-  return FormatForComparison<T1, T2>::Format(value);
-}
-
-// UniversalPrinter<T>::Print(value, ostream_ptr) prints the given
-// value to the given ostream.  The caller must ensure that
-// 'ostream_ptr' is not NULL, or the behavior is undefined.
-//
-// We define UniversalPrinter as a class template (as opposed to a
-// function template), as we need to partially specialize it for
-// reference types, which cannot be done with function templates.
-template <typename T>
-class UniversalPrinter;
-
-template <typename T>
-void UniversalPrint(const T& value, ::std::ostream* os);
-
-enum DefaultPrinterType {
-  kPrintContainer,
-  kPrintPointer,
-  kPrintFunctionPointer,
-  kPrintOther,
-};
-template <DefaultPrinterType type> struct WrapPrinterType {};
-
-// Used to print an STL-style container when the user doesn't define
-// a PrintTo() for it.
-template <typename C>
-void DefaultPrintTo(WrapPrinterType<kPrintContainer> /* dummy */,
-                    const C& container, ::std::ostream* os) {
-  const size_t kMaxCount = 32;  // The maximum number of elements to print.
-  *os << '{';
-  size_t count = 0;
-  for (typename C::const_iterator it = container.begin();
-       it != container.end(); ++it, ++count) {
-    if (count > 0) {
-      *os << ',';
-      if (count == kMaxCount) {  // Enough has been printed.
-        *os << " ...";
-        break;
-      }
-    }
-    *os << ' ';
-    // We cannot call PrintTo(*it, os) here as PrintTo() doesn't
-    // handle *it being a native array.
-    internal::UniversalPrint(*it, os);
-  }
-
-  if (count > 0) {
-    *os << ' ';
-  }
-  *os << '}';
-}
-
-// Used to print a pointer that is neither a char pointer nor a member
-// pointer, when the user doesn't define PrintTo() for it.  (A member
-// variable pointer or member function pointer doesn't really point to
-// a location in the address space.  Their representation is
-// implementation-defined.  Therefore they will be printed as raw
-// bytes.)
-template <typename T>
-void DefaultPrintTo(WrapPrinterType<kPrintPointer> /* dummy */,
-                    T* p, ::std::ostream* os) {
-  if (p == nullptr) {
-    *os << "NULL";
-  } else {
-    // T is not a function type.  We just call << to print p,
-    // relying on ADL to pick up user-defined << for their pointer
-    // types, if any.
-    *os << p;
-  }
-}
-template <typename T>
-void DefaultPrintTo(WrapPrinterType<kPrintFunctionPointer> /* dummy */,
-                    T* p, ::std::ostream* os) {
-  if (p == nullptr) {
-    *os << "NULL";
-  } else {
-    // T is a function type, so '*os << p' doesn't do what we want
-    // (it just prints p as bool).  We want to print p as a const
-    // void*.
-    *os << reinterpret_cast<const void*>(p);
-  }
-}
-
-// Used to print a non-container, non-pointer value when the user
-// doesn't define PrintTo() for it.
-template <typename T>
-void DefaultPrintTo(WrapPrinterType<kPrintOther> /* dummy */,
-                    const T& value, ::std::ostream* os) {
-  ::testing_internal::DefaultPrintNonContainerTo(value, os);
-}
-
-// Prints the given value using the << operator if it has one;
-// otherwise prints the bytes in it.  This is what
-// UniversalPrinter<T>::Print() does when PrintTo() is not specialized
-// or overloaded for type T.
-//
-// A user can override this behavior for a class type Foo by defining
-// an overload of PrintTo() in the namespace where Foo is defined.  We
-// give the user this option as sometimes defining a << operator for
-// Foo is not desirable (e.g. the coding style may prevent doing it,
-// or there is already a << operator but it doesn't do what the user
-// wants).
-template <typename T>
-void PrintTo(const T& value, ::std::ostream* os) {
-  // DefaultPrintTo() is overloaded.  The type of its first argument
-  // determines which version will be picked.
-  //
-  // Note that we check for container types here, prior to we check
-  // for protocol message types in our operator<<.  The rationale is:
-  //
-  // For protocol messages, we want to give people a chance to
-  // override Google Mock's format by defining a PrintTo() or
-  // operator<<.  For STL containers, other formats can be
-  // incompatible with Google Mock's format for the container
-  // elements; therefore we check for container types here to ensure
-  // that our format is used.
-  //
-  // Note that MSVC and clang-cl do allow an implicit conversion from
-  // pointer-to-function to pointer-to-object, but clang-cl warns on it.
-  // So don't use ImplicitlyConvertible if it can be helped since it will
-  // cause this warning, and use a separate overload of DefaultPrintTo for
-  // function pointers so that the `*os << p` in the object pointer overload
-  // doesn't cause that warning either.
-  DefaultPrintTo(
-      WrapPrinterType <
-                  (sizeof(IsContainerTest<T>(0)) == sizeof(IsContainer)) &&
-              !IsRecursiveContainer<T>::value
-          ? kPrintContainer
-          : !std::is_pointer<T>::value
-                ? kPrintOther
-                : std::is_function<typename std::remove_pointer<T>::type>::value
-                      ? kPrintFunctionPointer
-                      : kPrintPointer > (),
-      value, os);
-}
-
-// The following list of PrintTo() overloads tells
-// UniversalPrinter<T>::Print() how to print standard types (built-in
-// types, strings, plain arrays, and pointers).
-
-// Overloads for various char types.
-GTEST_API_ void PrintTo(unsigned char c, ::std::ostream* os);
-GTEST_API_ void PrintTo(signed char c, ::std::ostream* os);
-inline void PrintTo(char c, ::std::ostream* os) {
-  // When printing a plain char, we always treat it as unsigned.  This
-  // way, the output won't be affected by whether the compiler thinks
-  // char is signed or not.
-  PrintTo(static_cast<unsigned char>(c), os);
-}
-
-// Overloads for other simple built-in types.
-inline void PrintTo(bool x, ::std::ostream* os) {
-  *os << (x ? "true" : "false");
-}
-
-// Overload for wchar_t type.
-// Prints a wchar_t as a symbol if it is printable or as its internal
-// code otherwise and also as its decimal code (except for L'\0').
-// The L'\0' char is printed as "L'\\0'". The decimal code is printed
-// as signed integer when wchar_t is implemented by the compiler
-// as a signed type and is printed as an unsigned integer when wchar_t
-// is implemented as an unsigned type.
-GTEST_API_ void PrintTo(wchar_t wc, ::std::ostream* os);
-
-// Overloads for C strings.
-GTEST_API_ void PrintTo(const char* s, ::std::ostream* os);
-inline void PrintTo(char* s, ::std::ostream* os) {
-  PrintTo(ImplicitCast_<const char*>(s), os);
-}
-
-// signed/unsigned char is often used for representing binary data, so
-// we print pointers to it as void* to be safe.
-inline void PrintTo(const signed char* s, ::std::ostream* os) {
-  PrintTo(ImplicitCast_<const void*>(s), os);
-}
-inline void PrintTo(signed char* s, ::std::ostream* os) {
-  PrintTo(ImplicitCast_<const void*>(s), os);
-}
-inline void PrintTo(const unsigned char* s, ::std::ostream* os) {
-  PrintTo(ImplicitCast_<const void*>(s), os);
-}
-inline void PrintTo(unsigned char* s, ::std::ostream* os) {
-  PrintTo(ImplicitCast_<const void*>(s), os);
-}
-
-// MSVC can be configured to define wchar_t as a typedef of unsigned
-// short.  It defines _NATIVE_WCHAR_T_DEFINED when wchar_t is a native
-// type.  When wchar_t is a typedef, defining an overload for const
-// wchar_t* would cause unsigned short* be printed as a wide string,
-// possibly causing invalid memory accesses.
-#if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED)
-// Overloads for wide C strings
-GTEST_API_ void PrintTo(const wchar_t* s, ::std::ostream* os);
-inline void PrintTo(wchar_t* s, ::std::ostream* os) {
-  PrintTo(ImplicitCast_<const wchar_t*>(s), os);
-}
-#endif
-
-// Overload for C arrays.  Multi-dimensional arrays are printed
-// properly.
-
-// Prints the given number of elements in an array, without printing
-// the curly braces.
-template <typename T>
-void PrintRawArrayTo(const T a[], size_t count, ::std::ostream* os) {
-  UniversalPrint(a[0], os);
-  for (size_t i = 1; i != count; i++) {
-    *os << ", ";
-    UniversalPrint(a[i], os);
-  }
-}
-
-// Overloads for ::std::string.
-GTEST_API_ void PrintStringTo(const ::std::string&s, ::std::ostream* os);
-inline void PrintTo(const ::std::string& s, ::std::ostream* os) {
-  PrintStringTo(s, os);
-}
-
-// Overloads for ::std::wstring.
-#if GTEST_HAS_STD_WSTRING
-GTEST_API_ void PrintWideStringTo(const ::std::wstring&s, ::std::ostream* os);
-inline void PrintTo(const ::std::wstring& s, ::std::ostream* os) {
-  PrintWideStringTo(s, os);
-}
-#endif  // GTEST_HAS_STD_WSTRING
-
-#if GTEST_HAS_ABSL
-// Overload for absl::string_view.
-inline void PrintTo(absl::string_view sp, ::std::ostream* os) {
-  PrintTo(::std::string(sp), os);
-}
-#endif  // GTEST_HAS_ABSL
-
-inline void PrintTo(std::nullptr_t, ::std::ostream* os) { *os << "(nullptr)"; }
-
-template <typename T>
-void PrintTo(std::reference_wrapper<T> ref, ::std::ostream* os) {
-  UniversalPrinter<T&>::Print(ref.get(), os);
-}
-
-// Helper function for printing a tuple.  T must be instantiated with
-// a tuple type.
-template <typename T>
-void PrintTupleTo(const T&, std::integral_constant<size_t, 0>,
-                  ::std::ostream*) {}
-
-template <typename T, size_t I>
-void PrintTupleTo(const T& t, std::integral_constant<size_t, I>,
-                  ::std::ostream* os) {
-  PrintTupleTo(t, std::integral_constant<size_t, I - 1>(), os);
-  GTEST_INTENTIONAL_CONST_COND_PUSH_()
-  if (I > 1) {
-    GTEST_INTENTIONAL_CONST_COND_POP_()
-    *os << ", ";
-  }
-  UniversalPrinter<typename std::tuple_element<I - 1, T>::type>::Print(
-      std::get<I - 1>(t), os);
-}
-
-template <typename... Types>
-void PrintTo(const ::std::tuple<Types...>& t, ::std::ostream* os) {
-  *os << "(";
-  PrintTupleTo(t, std::integral_constant<size_t, sizeof...(Types)>(), os);
-  *os << ")";
-}
-
-// Overload for std::pair.
-template <typename T1, typename T2>
-void PrintTo(const ::std::pair<T1, T2>& value, ::std::ostream* os) {
-  *os << '(';
-  // We cannot use UniversalPrint(value.first, os) here, as T1 may be
-  // a reference type.  The same for printing value.second.
-  UniversalPrinter<T1>::Print(value.first, os);
-  *os << ", ";
-  UniversalPrinter<T2>::Print(value.second, os);
-  *os << ')';
-}
-
-// Implements printing a non-reference type T by letting the compiler
-// pick the right overload of PrintTo() for T.
-template <typename T>
-class UniversalPrinter {
- public:
-  // MSVC warns about adding const to a function type, so we want to
-  // disable the warning.
-  GTEST_DISABLE_MSC_WARNINGS_PUSH_(4180)
-
-  // Note: we deliberately don't call this PrintTo(), as that name
-  // conflicts with ::testing::internal::PrintTo in the body of the
-  // function.
-  static void Print(const T& value, ::std::ostream* os) {
-    // By default, ::testing::internal::PrintTo() is used for printing
-    // the value.
-    //
-    // Thanks to Koenig look-up, if T is a class and has its own
-    // PrintTo() function defined in its namespace, that function will
-    // be visible here.  Since it is more specific than the generic ones
-    // in ::testing::internal, it will be picked by the compiler in the
-    // following statement - exactly what we want.
-    PrintTo(value, os);
-  }
-
-  GTEST_DISABLE_MSC_WARNINGS_POP_()
-};
-
-#if GTEST_HAS_ABSL
-
-// Printer for absl::optional
-
-template <typename T>
-class UniversalPrinter<::absl::optional<T>> {
- public:
-  static void Print(const ::absl::optional<T>& value, ::std::ostream* os) {
-    *os << '(';
-    if (!value) {
-      *os << "nullopt";
-    } else {
-      UniversalPrint(*value, os);
-    }
-    *os << ')';
-  }
-};
-
-// Printer for absl::variant
-
-template <typename... T>
-class UniversalPrinter<::absl::variant<T...>> {
- public:
-  static void Print(const ::absl::variant<T...>& value, ::std::ostream* os) {
-    *os << '(';
-    absl::visit(Visitor{os}, value);
-    *os << ')';
-  }
-
- private:
-  struct Visitor {
-    template <typename U>
-    void operator()(const U& u) const {
-      *os << "'" << GetTypeName<U>() << "' with value ";
-      UniversalPrint(u, os);
-    }
-    ::std::ostream* os;
-  };
-};
-
-#endif  // GTEST_HAS_ABSL
-
-// UniversalPrintArray(begin, len, os) prints an array of 'len'
-// elements, starting at address 'begin'.
-template <typename T>
-void UniversalPrintArray(const T* begin, size_t len, ::std::ostream* os) {
-  if (len == 0) {
-    *os << "{}";
-  } else {
-    *os << "{ ";
-    const size_t kThreshold = 18;
-    const size_t kChunkSize = 8;
-    // If the array has more than kThreshold elements, we'll have to
-    // omit some details by printing only the first and the last
-    // kChunkSize elements.
-    if (len <= kThreshold) {
-      PrintRawArrayTo(begin, len, os);
-    } else {
-      PrintRawArrayTo(begin, kChunkSize, os);
-      *os << ", ..., ";
-      PrintRawArrayTo(begin + len - kChunkSize, kChunkSize, os);
-    }
-    *os << " }";
-  }
-}
-// This overload prints a (const) char array compactly.
-GTEST_API_ void UniversalPrintArray(
-    const char* begin, size_t len, ::std::ostream* os);
-
-// This overload prints a (const) wchar_t array compactly.
-GTEST_API_ void UniversalPrintArray(
-    const wchar_t* begin, size_t len, ::std::ostream* os);
-
-// Implements printing an array type T[N].
-template <typename T, size_t N>
-class UniversalPrinter<T[N]> {
- public:
-  // Prints the given array, omitting some elements when there are too
-  // many.
-  static void Print(const T (&a)[N], ::std::ostream* os) {
-    UniversalPrintArray(a, N, os);
-  }
-};
-
-// Implements printing a reference type T&.
-template <typename T>
-class UniversalPrinter<T&> {
- public:
-  // MSVC warns about adding const to a function type, so we want to
-  // disable the warning.
-  GTEST_DISABLE_MSC_WARNINGS_PUSH_(4180)
-
-  static void Print(const T& value, ::std::ostream* os) {
-    // Prints the address of the value.  We use reinterpret_cast here
-    // as static_cast doesn't compile when T is a function type.
-    *os << "@" << reinterpret_cast<const void*>(&value) << " ";
-
-    // Then prints the value itself.
-    UniversalPrint(value, os);
-  }
-
-  GTEST_DISABLE_MSC_WARNINGS_POP_()
-};
-
-// Prints a value tersely: for a reference type, the referenced value
-// (but not the address) is printed; for a (const) char pointer, the
-// NUL-terminated string (but not the pointer) is printed.
-
-template <typename T>
-class UniversalTersePrinter {
- public:
-  static void Print(const T& value, ::std::ostream* os) {
-    UniversalPrint(value, os);
-  }
-};
-template <typename T>
-class UniversalTersePrinter<T&> {
- public:
-  static void Print(const T& value, ::std::ostream* os) {
-    UniversalPrint(value, os);
-  }
-};
-template <typename T, size_t N>
-class UniversalTersePrinter<T[N]> {
- public:
-  static void Print(const T (&value)[N], ::std::ostream* os) {
-    UniversalPrinter<T[N]>::Print(value, os);
-  }
-};
-template <>
-class UniversalTersePrinter<const char*> {
- public:
-  static void Print(const char* str, ::std::ostream* os) {
-    if (str == nullptr) {
-      *os << "NULL";
-    } else {
-      UniversalPrint(std::string(str), os);
-    }
-  }
-};
-template <>
-class UniversalTersePrinter<char*> {
- public:
-  static void Print(char* str, ::std::ostream* os) {
-    UniversalTersePrinter<const char*>::Print(str, os);
-  }
-};
-
-#if GTEST_HAS_STD_WSTRING
-template <>
-class UniversalTersePrinter<const wchar_t*> {
- public:
-  static void Print(const wchar_t* str, ::std::ostream* os) {
-    if (str == nullptr) {
-      *os << "NULL";
-    } else {
-      UniversalPrint(::std::wstring(str), os);
-    }
-  }
-};
-#endif
-
-template <>
-class UniversalTersePrinter<wchar_t*> {
- public:
-  static void Print(wchar_t* str, ::std::ostream* os) {
-    UniversalTersePrinter<const wchar_t*>::Print(str, os);
-  }
-};
-
-template <typename T>
-void UniversalTersePrint(const T& value, ::std::ostream* os) {
-  UniversalTersePrinter<T>::Print(value, os);
-}
-
-// Prints a value using the type inferred by the compiler.  The
-// difference between this and UniversalTersePrint() is that for a
-// (const) char pointer, this prints both the pointer and the
-// NUL-terminated string.
-template <typename T>
-void UniversalPrint(const T& value, ::std::ostream* os) {
-  // A workarond for the bug in VC++ 7.1 that prevents us from instantiating
-  // UniversalPrinter with T directly.
-  typedef T T1;
-  UniversalPrinter<T1>::Print(value, os);
-}
-
-typedef ::std::vector< ::std::string> Strings;
-
-  // Tersely prints the first N fields of a tuple to a string vector,
-  // one element for each field.
-template <typename Tuple>
-void TersePrintPrefixToStrings(const Tuple&, std::integral_constant<size_t, 0>,
-                               Strings*) {}
-template <typename Tuple, size_t I>
-void TersePrintPrefixToStrings(const Tuple& t,
-                               std::integral_constant<size_t, I>,
-                               Strings* strings) {
-  TersePrintPrefixToStrings(t, std::integral_constant<size_t, I - 1>(),
-                            strings);
-  ::std::stringstream ss;
-  UniversalTersePrint(std::get<I - 1>(t), &ss);
-  strings->push_back(ss.str());
-}
-
-// Prints the fields of a tuple tersely to a string vector, one
-// element for each field.  See the comment before
-// UniversalTersePrint() for how we define "tersely".
-template <typename Tuple>
-Strings UniversalTersePrintTupleFieldsToStrings(const Tuple& value) {
-  Strings result;
-  TersePrintPrefixToStrings(
-      value, std::integral_constant<size_t, std::tuple_size<Tuple>::value>(),
-      &result);
-  return result;
-}
-
-}  // namespace internal
-
-#if GTEST_HAS_ABSL
-namespace internal2 {
-template <typename T>
-void TypeWithoutFormatter<T, kConvertibleToStringView>::PrintValue(
-    const T& value, ::std::ostream* os) {
-  internal::PrintTo(absl::string_view(value), os);
-}
-}  // namespace internal2
-#endif
-
-template <typename T>
-::std::string PrintToString(const T& value) {
-  ::std::stringstream ss;
-  internal::UniversalTersePrinter<T>::Print(value, &ss);
-  return ss.str();
-}
-
-}  // namespace testing
-
-// Include any custom printer added by the local installation.
-// We must include this header at the end to make sure it can use the
-// declarations from this file.
-#include "gtest/internal/custom/gtest-printers.h"
-
-#endif  // GTEST_INCLUDE_GTEST_GTEST_PRINTERS_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest_prod.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest_prod.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest_prod.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest_prod.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-// Copyright 2006, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-//
-// Google C++ Testing and Mocking Framework definitions useful in production code.
-// GOOGLETEST_CM0003 DO NOT DELETE
-
-#ifndef GTEST_INCLUDE_GTEST_GTEST_PROD_H_
-#define GTEST_INCLUDE_GTEST_GTEST_PROD_H_
-
-// When you need to test the private or protected members of a class,
-// use the FRIEND_TEST macro to declare your tests as friends of the
-// class.  For example:
-//
-// class MyClass {
-//  private:
-//   void PrivateMethod();
-//   FRIEND_TEST(MyClassTest, PrivateMethodWorks);
-// };
-//
-// class MyClassTest : public testing::Test {
-//   // ...
-// };
-//
-// TEST_F(MyClassTest, PrivateMethodWorks) {
-//   // Can call MyClass::PrivateMethod() here.
-// }
-//
-// Note: The test class must be in the same namespace as the class being tested.
-// For example, putting MyClassTest in an anonymous namespace will not work.
-
-#define FRIEND_TEST(test_case_name, test_name)\
-friend class test_case_name##_##test_name##_Test
-
-#endif  // GTEST_INCLUDE_GTEST_GTEST_PROD_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest-spi.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest-spi.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest-spi.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest-spi.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,238 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-//
-// Utilities for testing Google Test itself and code that uses Google Test
-// (e.g. frameworks built on top of Google Test).
-
-// GOOGLETEST_CM0004 DO NOT DELETE
-
-#ifndef GTEST_INCLUDE_GTEST_GTEST_SPI_H_
-#define GTEST_INCLUDE_GTEST_GTEST_SPI_H_
-
-#include "gtest/gtest.h"
-
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
-/* class A needs to have dll-interface to be used by clients of class B */)
-
-namespace testing {
-
-// This helper class can be used to mock out Google Test failure reporting
-// so that we can test Google Test or code that builds on Google Test.
-//
-// An object of this class appends a TestPartResult object to the
-// TestPartResultArray object given in the constructor whenever a Google Test
-// failure is reported. It can either intercept only failures that are
-// generated in the same thread that created this object or it can intercept
-// all generated failures. The scope of this mock object can be controlled with
-// the second argument to the two arguments constructor.
-class GTEST_API_ ScopedFakeTestPartResultReporter
-    : public TestPartResultReporterInterface {
- public:
-  // The two possible mocking modes of this object.
-  enum InterceptMode {
-    INTERCEPT_ONLY_CURRENT_THREAD,  // Intercepts only thread local failures.
-    INTERCEPT_ALL_THREADS           // Intercepts all failures.
-  };
-
-  // The c'tor sets this object as the test part result reporter used
-  // by Google Test.  The 'result' parameter specifies where to report the
-  // results. This reporter will only catch failures generated in the current
-  // thread. DEPRECATED
-  explicit ScopedFakeTestPartResultReporter(TestPartResultArray* result);
-
-  // Same as above, but you can choose the interception scope of this object.
-  ScopedFakeTestPartResultReporter(InterceptMode intercept_mode,
-                                   TestPartResultArray* result);
-
-  // The d'tor restores the previous test part result reporter.
-  ~ScopedFakeTestPartResultReporter() override;
-
-  // Appends the TestPartResult object to the TestPartResultArray
-  // received in the constructor.
-  //
-  // This method is from the TestPartResultReporterInterface
-  // interface.
-  void ReportTestPartResult(const TestPartResult& result) override;
-
- private:
-  void Init();
-
-  const InterceptMode intercept_mode_;
-  TestPartResultReporterInterface* old_reporter_;
-  TestPartResultArray* const result_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedFakeTestPartResultReporter);
-};
-
-namespace internal {
-
-// A helper class for implementing EXPECT_FATAL_FAILURE() and
-// EXPECT_NONFATAL_FAILURE().  Its destructor verifies that the given
-// TestPartResultArray contains exactly one failure that has the given
-// type and contains the given substring.  If that's not the case, a
-// non-fatal failure will be generated.
-class GTEST_API_ SingleFailureChecker {
- public:
-  // The constructor remembers the arguments.
-  SingleFailureChecker(const TestPartResultArray* results,
-                       TestPartResult::Type type, const std::string& substr);
-  ~SingleFailureChecker();
- private:
-  const TestPartResultArray* const results_;
-  const TestPartResult::Type type_;
-  const std::string substr_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(SingleFailureChecker);
-};
-
-}  // namespace internal
-
-}  // namespace testing
-
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
-
-// A set of macros for testing Google Test assertions or code that's expected
-// to generate Google Test fatal failures.  It verifies that the given
-// statement will cause exactly one fatal Google Test failure with 'substr'
-// being part of the failure message.
-//
-// There are two different versions of this macro. EXPECT_FATAL_FAILURE only
-// affects and considers failures generated in the current thread and
-// EXPECT_FATAL_FAILURE_ON_ALL_THREADS does the same but for all threads.
-//
-// The verification of the assertion is done correctly even when the statement
-// throws an exception or aborts the current function.
-//
-// Known restrictions:
-//   - 'statement' cannot reference local non-static variables or
-//     non-static members of the current object.
-//   - 'statement' cannot return a value.
-//   - You cannot stream a failure message to this macro.
-//
-// Note that even though the implementations of the following two
-// macros are much alike, we cannot refactor them to use a common
-// helper macro, due to some peculiarity in how the preprocessor
-// works.  The AcceptsMacroThatExpandsToUnprotectedComma test in
-// gtest_unittest.cc will fail to compile if we do that.
-#define EXPECT_FATAL_FAILURE(statement, substr) \
-  do { \
-    class GTestExpectFatalFailureHelper {\
-     public:\
-      static void Execute() { statement; }\
-    };\
-    ::testing::TestPartResultArray gtest_failures;\
-    ::testing::internal::SingleFailureChecker gtest_checker(\
-        &gtest_failures, ::testing::TestPartResult::kFatalFailure, (substr));\
-    {\
-      ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\
-          ::testing::ScopedFakeTestPartResultReporter:: \
-          INTERCEPT_ONLY_CURRENT_THREAD, &gtest_failures);\
-      GTestExpectFatalFailureHelper::Execute();\
-    }\
-  } while (::testing::internal::AlwaysFalse())
-
-#define EXPECT_FATAL_FAILURE_ON_ALL_THREADS(statement, substr) \
-  do { \
-    class GTestExpectFatalFailureHelper {\
-     public:\
-      static void Execute() { statement; }\
-    };\
-    ::testing::TestPartResultArray gtest_failures;\
-    ::testing::internal::SingleFailureChecker gtest_checker(\
-        &gtest_failures, ::testing::TestPartResult::kFatalFailure, (substr));\
-    {\
-      ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\
-          ::testing::ScopedFakeTestPartResultReporter:: \
-          INTERCEPT_ALL_THREADS, &gtest_failures);\
-      GTestExpectFatalFailureHelper::Execute();\
-    }\
-  } while (::testing::internal::AlwaysFalse())
-
-// A macro for testing Google Test assertions or code that's expected to
-// generate Google Test non-fatal failures.  It asserts that the given
-// statement will cause exactly one non-fatal Google Test failure with 'substr'
-// being part of the failure message.
-//
-// There are two different versions of this macro. EXPECT_NONFATAL_FAILURE only
-// affects and considers failures generated in the current thread and
-// EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS does the same but for all threads.
-//
-// 'statement' is allowed to reference local variables and members of
-// the current object.
-//
-// The verification of the assertion is done correctly even when the statement
-// throws an exception or aborts the current function.
-//
-// Known restrictions:
-//   - You cannot stream a failure message to this macro.
-//
-// Note that even though the implementations of the following two
-// macros are much alike, we cannot refactor them to use a common
-// helper macro, due to some peculiarity in how the preprocessor
-// works.  If we do that, the code won't compile when the user gives
-// EXPECT_NONFATAL_FAILURE() a statement that contains a macro that
-// expands to code containing an unprotected comma.  The
-// AcceptsMacroThatExpandsToUnprotectedComma test in gtest_unittest.cc
-// catches that.
-//
-// For the same reason, we have to write
-//   if (::testing::internal::AlwaysTrue()) { statement; }
-// instead of
-//   GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement)
-// to avoid an MSVC warning on unreachable code.
-#define EXPECT_NONFATAL_FAILURE(statement, substr) \
-  do {\
-    ::testing::TestPartResultArray gtest_failures;\
-    ::testing::internal::SingleFailureChecker gtest_checker(\
-        &gtest_failures, ::testing::TestPartResult::kNonFatalFailure, \
-        (substr));\
-    {\
-      ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\
-          ::testing::ScopedFakeTestPartResultReporter:: \
-          INTERCEPT_ONLY_CURRENT_THREAD, &gtest_failures);\
-      if (::testing::internal::AlwaysTrue()) { statement; }\
-    }\
-  } while (::testing::internal::AlwaysFalse())
-
-#define EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(statement, substr) \
-  do {\
-    ::testing::TestPartResultArray gtest_failures;\
-    ::testing::internal::SingleFailureChecker gtest_checker(\
-        &gtest_failures, ::testing::TestPartResult::kNonFatalFailure, \
-        (substr));\
-    {\
-      ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\
-          ::testing::ScopedFakeTestPartResultReporter::INTERCEPT_ALL_THREADS, \
-          &gtest_failures);\
-      if (::testing::internal::AlwaysTrue()) { statement; }\
-    }\
-  } while (::testing::internal::AlwaysFalse())
-
-#endif  // GTEST_INCLUDE_GTEST_GTEST_SPI_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest-test-part.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest-test-part.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest-test-part.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest-test-part.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,184 +0,0 @@
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GTEST_INCLUDE_GTEST_GTEST_TEST_PART_H_
-#define GTEST_INCLUDE_GTEST_GTEST_TEST_PART_H_
-
-#include <iosfwd>
-#include <vector>
-#include "gtest/internal/gtest-internal.h"
-#include "gtest/internal/gtest-string.h"
-
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
-/* class A needs to have dll-interface to be used by clients of class B */)
-
-namespace testing {
-
-// A copyable object representing the result of a test part (i.e. an
-// assertion or an explicit FAIL(), ADD_FAILURE(), or SUCCESS()).
-//
-// Don't inherit from TestPartResult as its destructor is not virtual.
-class GTEST_API_ TestPartResult {
- public:
-  // The possible outcomes of a test part (i.e. an assertion or an
-  // explicit SUCCEED(), FAIL(), or ADD_FAILURE()).
-  enum Type {
-    kSuccess,          // Succeeded.
-    kNonFatalFailure,  // Failed but the test can continue.
-    kFatalFailure,     // Failed and the test should be terminated.
-    kSkip              // Skipped.
-  };
-
-  // C'tor.  TestPartResult does NOT have a default constructor.
-  // Always use this constructor (with parameters) to create a
-  // TestPartResult object.
-  TestPartResult(Type a_type, const char* a_file_name, int a_line_number,
-                 const char* a_message)
-      : type_(a_type),
-        file_name_(a_file_name == nullptr ? "" : a_file_name),
-        line_number_(a_line_number),
-        summary_(ExtractSummary(a_message)),
-        message_(a_message) {}
-
-  // Gets the outcome of the test part.
-  Type type() const { return type_; }
-
-  // Gets the name of the source file where the test part took place, or
-  // NULL if it's unknown.
-  const char* file_name() const {
-    return file_name_.empty() ? nullptr : file_name_.c_str();
-  }
-
-  // Gets the line in the source file where the test part took place,
-  // or -1 if it's unknown.
-  int line_number() const { return line_number_; }
-
-  // Gets the summary of the failure message.
-  const char* summary() const { return summary_.c_str(); }
-
-  // Gets the message associated with the test part.
-  const char* message() const { return message_.c_str(); }
-
-  // Returns true if and only if the test part was skipped.
-  bool skipped() const { return type_ == kSkip; }
-
-  // Returns true if and only if the test part passed.
-  bool passed() const { return type_ == kSuccess; }
-
-  // Returns true if and only if the test part non-fatally failed.
-  bool nonfatally_failed() const { return type_ == kNonFatalFailure; }
-
-  // Returns true if and only if the test part fatally failed.
-  bool fatally_failed() const { return type_ == kFatalFailure; }
-
-  // Returns true if and only if the test part failed.
-  bool failed() const { return fatally_failed() || nonfatally_failed(); }
-
- private:
-  Type type_;
-
-  // Gets the summary of the failure message by omitting the stack
-  // trace in it.
-  static std::string ExtractSummary(const char* message);
-
-  // The name of the source file where the test part took place, or
-  // "" if the source file is unknown.
-  std::string file_name_;
-  // The line in the source file where the test part took place, or -1
-  // if the line number is unknown.
-  int line_number_;
-  std::string summary_;  // The test failure summary.
-  std::string message_;  // The test failure message.
-};
-
-// Prints a TestPartResult object.
-std::ostream& operator<<(std::ostream& os, const TestPartResult& result);
-
-// An array of TestPartResult objects.
-//
-// Don't inherit from TestPartResultArray as its destructor is not
-// virtual.
-class GTEST_API_ TestPartResultArray {
- public:
-  TestPartResultArray() {}
-
-  // Appends the given TestPartResult to the array.
-  void Append(const TestPartResult& result);
-
-  // Returns the TestPartResult at the given index (0-based).
-  const TestPartResult& GetTestPartResult(int index) const;
-
-  // Returns the number of TestPartResult objects in the array.
-  int size() const;
-
- private:
-  std::vector<TestPartResult> array_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestPartResultArray);
-};
-
-// This interface knows how to report a test part result.
-class GTEST_API_ TestPartResultReporterInterface {
- public:
-  virtual ~TestPartResultReporterInterface() {}
-
-  virtual void ReportTestPartResult(const TestPartResult& result) = 0;
-};
-
-namespace internal {
-
-// This helper class is used by {ASSERT|EXPECT}_NO_FATAL_FAILURE to check if a
-// statement generates new fatal failures. To do so it registers itself as the
-// current test part result reporter. Besides checking if fatal failures were
-// reported, it only delegates the reporting to the former result reporter.
-// The original result reporter is restored in the destructor.
-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
-class GTEST_API_ HasNewFatalFailureHelper
-    : public TestPartResultReporterInterface {
- public:
-  HasNewFatalFailureHelper();
-  ~HasNewFatalFailureHelper() override;
-  void ReportTestPartResult(const TestPartResult& result) override;
-  bool has_new_fatal_failure() const { return has_new_fatal_failure_; }
- private:
-  bool has_new_fatal_failure_;
-  TestPartResultReporterInterface* original_reporter_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(HasNewFatalFailureHelper);
-};
-
-}  // namespace internal
-
-}  // namespace testing
-
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
-
-#endif  // GTEST_INCLUDE_GTEST_GTEST_TEST_PART_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest-typed-test.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest-typed-test.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest-typed-test.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/gtest-typed-test.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,330 +0,0 @@
-// Copyright 2008 Google Inc.
-// All Rights Reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GTEST_INCLUDE_GTEST_GTEST_TYPED_TEST_H_
-#define GTEST_INCLUDE_GTEST_GTEST_TYPED_TEST_H_
-
-// This header implements typed tests and type-parameterized tests.
-
-// Typed (aka type-driven) tests repeat the same test for types in a
-// list.  You must know which types you want to test with when writing
-// typed tests. Here's how you do it:
-
-#if 0
-
-// First, define a fixture class template.  It should be parameterized
-// by a type.  Remember to derive it from testing::Test.
-template <typename T>
-class FooTest : public testing::Test {
- public:
-  ...
-  typedef std::list<T> List;
-  static T shared_;
-  T value_;
-};
-
-// Next, associate a list of types with the test suite, which will be
-// repeated for each type in the list.  The typedef is necessary for
-// the macro to parse correctly.
-typedef testing::Types<char, int, unsigned int> MyTypes;
-TYPED_TEST_SUITE(FooTest, MyTypes);
-
-// If the type list contains only one type, you can write that type
-// directly without Types<...>:
-//   TYPED_TEST_SUITE(FooTest, int);
-
-// Then, use TYPED_TEST() instead of TEST_F() to define as many typed
-// tests for this test suite as you want.
-TYPED_TEST(FooTest, DoesBlah) {
-  // Inside a test, refer to the special name TypeParam to get the type
-  // parameter.  Since we are inside a derived class template, C++ requires
-  // us to visit the members of FooTest via 'this'.
-  TypeParam n = this->value_;
-
-  // To visit static members of the fixture, add the TestFixture::
-  // prefix.
-  n += TestFixture::shared_;
-
-  // To refer to typedefs in the fixture, add the "typename
-  // TestFixture::" prefix.
-  typename TestFixture::List values;
-  values.push_back(n);
-  ...
-}
-
-TYPED_TEST(FooTest, HasPropertyA) { ... }
-
-// TYPED_TEST_SUITE takes an optional third argument which allows to specify a
-// class that generates custom test name suffixes based on the type. This should
-// be a class which has a static template function GetName(int index) returning
-// a string for each type. The provided integer index equals the index of the
-// type in the provided type list. In many cases the index can be ignored.
-//
-// For example:
-//   class MyTypeNames {
-//    public:
-//     template <typename T>
-//     static std::string GetName(int) {
-//       if (std::is_same<T, char>()) return "char";
-//       if (std::is_same<T, int>()) return "int";
-//       if (std::is_same<T, unsigned int>()) return "unsignedInt";
-//     }
-//   };
-//   TYPED_TEST_SUITE(FooTest, MyTypes, MyTypeNames);
-
-#endif  // 0
-
-// Type-parameterized tests are abstract test patterns parameterized
-// by a type.  Compared with typed tests, type-parameterized tests
-// allow you to define the test pattern without knowing what the type
-// parameters are.  The defined pattern can be instantiated with
-// different types any number of times, in any number of translation
-// units.
-//
-// If you are designing an interface or concept, you can define a
-// suite of type-parameterized tests to verify properties that any
-// valid implementation of the interface/concept should have.  Then,
-// each implementation can easily instantiate the test suite to verify
-// that it conforms to the requirements, without having to write
-// similar tests repeatedly.  Here's an example:
-
-#if 0
-
-// First, define a fixture class template.  It should be parameterized
-// by a type.  Remember to derive it from testing::Test.
-template <typename T>
-class FooTest : public testing::Test {
-  ...
-};
-
-// Next, declare that you will define a type-parameterized test suite
-// (the _P suffix is for "parameterized" or "pattern", whichever you
-// prefer):
-TYPED_TEST_SUITE_P(FooTest);
-
-// Then, use TYPED_TEST_P() to define as many type-parameterized tests
-// for this type-parameterized test suite as you want.
-TYPED_TEST_P(FooTest, DoesBlah) {
-  // Inside a test, refer to TypeParam to get the type parameter.
-  TypeParam n = 0;
-  ...
-}
-
-TYPED_TEST_P(FooTest, HasPropertyA) { ... }
-
-// Now the tricky part: you need to register all test patterns before
-// you can instantiate them.  The first argument of the macro is the
-// test suite name; the rest are the names of the tests in this test
-// case.
-REGISTER_TYPED_TEST_SUITE_P(FooTest,
-                            DoesBlah, HasPropertyA);
-
-// Finally, you are free to instantiate the pattern with the types you
-// want.  If you put the above code in a header file, you can #include
-// it in multiple C++ source files and instantiate it multiple times.
-//
-// To distinguish different instances of the pattern, the first
-// argument to the INSTANTIATE_* macro is a prefix that will be added
-// to the actual test suite name.  Remember to pick unique prefixes for
-// different instances.
-typedef testing::Types<char, int, unsigned int> MyTypes;
-INSTANTIATE_TYPED_TEST_SUITE_P(My, FooTest, MyTypes);
-
-// If the type list contains only one type, you can write that type
-// directly without Types<...>:
-//   INSTANTIATE_TYPED_TEST_SUITE_P(My, FooTest, int);
-//
-// Similar to the optional argument of TYPED_TEST_SUITE above,
-// INSTANTIATE_TEST_SUITE_P takes an optional fourth argument which allows to
-// generate custom names.
-//   INSTANTIATE_TYPED_TEST_SUITE_P(My, FooTest, MyTypes, MyTypeNames);
-
-#endif  // 0
-
-#include "gtest/internal/gtest-port.h"
-#include "gtest/internal/gtest-type-util.h"
-
-// Implements typed tests.
-
-#if GTEST_HAS_TYPED_TEST
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-//
-// Expands to the name of the typedef for the type parameters of the
-// given test suite.
-#define GTEST_TYPE_PARAMS_(TestSuiteName) gtest_type_params_##TestSuiteName##_
-
-// Expands to the name of the typedef for the NameGenerator, responsible for
-// creating the suffixes of the name.
-#define GTEST_NAME_GENERATOR_(TestSuiteName) \
-  gtest_type_params_##TestSuiteName##_NameGenerator
-
-#define TYPED_TEST_SUITE(CaseName, Types, ...)                           \
-  typedef ::testing::internal::TypeList<Types>::type GTEST_TYPE_PARAMS_( \
-      CaseName);                                                         \
-  typedef ::testing::internal::NameGeneratorSelector<__VA_ARGS__>::type  \
-      GTEST_NAME_GENERATOR_(CaseName)
-
-# define TYPED_TEST(CaseName, TestName)                                       \
-  template <typename gtest_TypeParam_>                                        \
-  class GTEST_TEST_CLASS_NAME_(CaseName, TestName)                            \
-      : public CaseName<gtest_TypeParam_> {                                   \
-   private:                                                                   \
-    typedef CaseName<gtest_TypeParam_> TestFixture;                           \
-    typedef gtest_TypeParam_ TypeParam;                                       \
-    virtual void TestBody();                                                  \
-  };                                                                          \
-  static bool gtest_##CaseName##_##TestName##_registered_                     \
-        GTEST_ATTRIBUTE_UNUSED_ =                                             \
-      ::testing::internal::TypeParameterizedTest<                             \
-          CaseName,                                                           \
-          ::testing::internal::TemplateSel<GTEST_TEST_CLASS_NAME_(CaseName,   \
-                                                                  TestName)>, \
-          GTEST_TYPE_PARAMS_(                                                 \
-              CaseName)>::Register("",                                        \
-                                   ::testing::internal::CodeLocation(         \
-                                       __FILE__, __LINE__),                   \
-                                   #CaseName, #TestName, 0,                   \
-                                   ::testing::internal::GenerateNames<        \
-                                       GTEST_NAME_GENERATOR_(CaseName),       \
-                                       GTEST_TYPE_PARAMS_(CaseName)>());      \
-  template <typename gtest_TypeParam_>                                        \
-  void GTEST_TEST_CLASS_NAME_(CaseName,                                       \
-                              TestName)<gtest_TypeParam_>::TestBody()
-
-// Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-#define TYPED_TEST_CASE                                                \
-  static_assert(::testing::internal::TypedTestCaseIsDeprecated(), ""); \
-  TYPED_TEST_SUITE
-#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-#endif  // GTEST_HAS_TYPED_TEST
-
-// Implements type-parameterized tests.
-
-#if GTEST_HAS_TYPED_TEST_P
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-//
-// Expands to the namespace name that the type-parameterized tests for
-// the given type-parameterized test suite are defined in.  The exact
-// name of the namespace is subject to change without notice.
-#define GTEST_SUITE_NAMESPACE_(TestSuiteName) gtest_suite_##TestSuiteName##_
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-//
-// Expands to the name of the variable used to remember the names of
-// the defined tests in the given test suite.
-#define GTEST_TYPED_TEST_SUITE_P_STATE_(TestSuiteName) \
-  gtest_typed_test_suite_p_state_##TestSuiteName##_
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE DIRECTLY.
-//
-// Expands to the name of the variable used to remember the names of
-// the registered tests in the given test suite.
-#define GTEST_REGISTERED_TEST_NAMES_(TestSuiteName) \
-  gtest_registered_test_names_##TestSuiteName##_
-
-// The variables defined in the type-parameterized test macros are
-// static as typically these macros are used in a .h file that can be
-// #included in multiple translation units linked together.
-#define TYPED_TEST_SUITE_P(SuiteName)              \
-  static ::testing::internal::TypedTestSuitePState \
-      GTEST_TYPED_TEST_SUITE_P_STATE_(SuiteName)
-
-// Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-#define TYPED_TEST_CASE_P                                                 \
-  static_assert(::testing::internal::TypedTestCase_P_IsDeprecated(), ""); \
-  TYPED_TEST_SUITE_P
-#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-#define TYPED_TEST_P(SuiteName, TestName)                             \
-  namespace GTEST_SUITE_NAMESPACE_(SuiteName) {                       \
-    template <typename gtest_TypeParam_>                              \
-    class TestName : public SuiteName<gtest_TypeParam_> {             \
-     private:                                                         \
-      typedef SuiteName<gtest_TypeParam_> TestFixture;                \
-      typedef gtest_TypeParam_ TypeParam;                             \
-      virtual void TestBody();                                        \
-    };                                                                \
-    static bool gtest_##TestName##_defined_ GTEST_ATTRIBUTE_UNUSED_ = \
-        GTEST_TYPED_TEST_SUITE_P_STATE_(SuiteName).AddTestName(       \
-            __FILE__, __LINE__, #SuiteName, #TestName);               \
-  }                                                                   \
-  template <typename gtest_TypeParam_>                                \
-  void GTEST_SUITE_NAMESPACE_(                                        \
-      SuiteName)::TestName<gtest_TypeParam_>::TestBody()
-
-#define REGISTER_TYPED_TEST_SUITE_P(SuiteName, ...)                            \
-  namespace GTEST_SUITE_NAMESPACE_(SuiteName) {                                \
-    typedef ::testing::internal::Templates<__VA_ARGS__>::type gtest_AllTests_; \
-  }                                                                            \
-  static const char* const GTEST_REGISTERED_TEST_NAMES_(                       \
-      SuiteName) GTEST_ATTRIBUTE_UNUSED_ =                                     \
-      GTEST_TYPED_TEST_SUITE_P_STATE_(SuiteName).VerifyRegisteredTestNames(    \
-          __FILE__, __LINE__, #__VA_ARGS__)
-
-// Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-#define REGISTER_TYPED_TEST_CASE_P                                           \
-  static_assert(::testing::internal::RegisterTypedTestCase_P_IsDeprecated(), \
-                "");                                                         \
-  REGISTER_TYPED_TEST_SUITE_P
-#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-#define INSTANTIATE_TYPED_TEST_SUITE_P(Prefix, SuiteName, Types, ...)       \
-  static bool gtest_##Prefix##_##SuiteName GTEST_ATTRIBUTE_UNUSED_ =        \
-      ::testing::internal::TypeParameterizedTestSuite<                      \
-          SuiteName, GTEST_SUITE_NAMESPACE_(SuiteName)::gtest_AllTests_,    \
-          ::testing::internal::TypeList<Types>::type>::                     \
-          Register(#Prefix,                                                 \
-                   ::testing::internal::CodeLocation(__FILE__, __LINE__),   \
-                   &GTEST_TYPED_TEST_SUITE_P_STATE_(SuiteName), #SuiteName, \
-                   GTEST_REGISTERED_TEST_NAMES_(SuiteName),                 \
-                   ::testing::internal::GenerateNames<                      \
-                       ::testing::internal::NameGeneratorSelector<          \
-                           __VA_ARGS__>::type,                              \
-                       ::testing::internal::TypeList<Types>::type>())
-
-// Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-#define INSTANTIATE_TYPED_TEST_CASE_P                                      \
-  static_assert(                                                           \
-      ::testing::internal::InstantiateTypedTestCase_P_IsDeprecated(), ""); \
-  INSTANTIATE_TYPED_TEST_SUITE_P
-#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-#endif  // GTEST_HAS_TYPED_TEST_P
-
-#endif  // GTEST_INCLUDE_GTEST_GTEST_TYPED_TEST_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/custom/gtest.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/custom/gtest.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/custom/gtest.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/custom/gtest.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-// Copyright 2015, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Injection point for custom user configurations. See README for details
-//
-// ** Custom implementation starts here **
-
-#ifndef GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_H_
-#define GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_H_
-
-#endif  // GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/custom/gtest-port.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/custom/gtest-port.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/custom/gtest-port.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/custom/gtest-port.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-// Copyright 2015, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Injection point for custom user configurations. See README for details
-//
-// ** Custom implementation starts here **
-
-#ifndef GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_
-#define GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_
-
-#endif  // GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/custom/gtest-printers.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/custom/gtest-printers.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/custom/gtest-printers.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/custom/gtest-printers.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-// Copyright 2015, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// This file provides an injection point for custom printers in a local
-// installation of gTest.
-// It will be included from gtest-printers.h and the overrides in this file
-// will be visible to everyone.
-//
-// Injection point for custom user configurations. See README for details
-//
-// ** Custom implementation starts here **
-
-#ifndef GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PRINTERS_H_
-#define GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PRINTERS_H_
-
-#endif  // GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PRINTERS_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/custom/README.md mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/custom/README.md
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/custom/README.md	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/custom/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-# Customization Points
-
-The custom directory is an injection point for custom user configurations.
-
-## Header `gtest.h`
-
-### The following macros can be defined:
-
-*   `GTEST_OS_STACK_TRACE_GETTER_` - The name of an implementation of
-    `OsStackTraceGetterInterface`.
-*   `GTEST_CUSTOM_TEMPDIR_FUNCTION_` - An override for `testing::TempDir()`. See
-    `testing::TempDir` for semantics and signature.
-
-## Header `gtest-port.h`
-
-The following macros can be defined:
-
-### Flag related macros:
-
-*   `GTEST_FLAG(flag_name)`
-*   `GTEST_USE_OWN_FLAGFILE_FLAG_` - Define to 0 when the system provides its
-    own flagfile flag parsing.
-*   `GTEST_DECLARE_bool_(name)`
-*   `GTEST_DECLARE_int32_(name)`
-*   `GTEST_DECLARE_string_(name)`
-*   `GTEST_DEFINE_bool_(name, default_val, doc)`
-*   `GTEST_DEFINE_int32_(name, default_val, doc)`
-*   `GTEST_DEFINE_string_(name, default_val, doc)`
-
-### Logging:
-
-*   `GTEST_LOG_(severity)`
-*   `GTEST_CHECK_(condition)`
-*   Functions `LogToStderr()` and `FlushInfoLog()` have to be provided too.
-
-### Threading:
-
-*   `GTEST_HAS_NOTIFICATION_` - Enabled if Notification is already provided.
-*   `GTEST_HAS_MUTEX_AND_THREAD_LOCAL_` - Enabled if `Mutex` and `ThreadLocal`
-    are already provided. Must also provide `GTEST_DECLARE_STATIC_MUTEX_(mutex)`
-    and `GTEST_DEFINE_STATIC_MUTEX_(mutex)`
-*   `GTEST_EXCLUSIVE_LOCK_REQUIRED_(locks)`
-*   `GTEST_LOCK_EXCLUDED_(locks)`
-
-### Underlying library support features
-
-*   `GTEST_HAS_CXXABI_H_`
-
-### Exporting API symbols:
-
-*   `GTEST_API_` - Specifier for exported symbols.
-
-## Header `gtest-printers.h`
-
-*   See documentation at `gtest/gtest-printers.h` for details on how to define a
-    custom printer.
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/gtest-death-test-internal.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/gtest-death-test-internal.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/gtest-death-test-internal.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/gtest-death-test-internal.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,304 +0,0 @@
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// The Google C++ Testing and Mocking Framework (Google Test)
-//
-// This header file defines internal utilities needed for implementing
-// death tests.  They are subject to change without notice.
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_
-#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_
-
-#include "gtest/gtest-matchers.h"
-#include "gtest/internal/gtest-internal.h"
-
-#include <stdio.h>
-#include <memory>
-
-namespace testing {
-namespace internal {
-
-GTEST_DECLARE_string_(internal_run_death_test);
-
-// Names of the flags (needed for parsing Google Test flags).
-const char kDeathTestStyleFlag[] = "death_test_style";
-const char kDeathTestUseFork[] = "death_test_use_fork";
-const char kInternalRunDeathTestFlag[] = "internal_run_death_test";
-
-#if GTEST_HAS_DEATH_TEST
-
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
-/* class A needs to have dll-interface to be used by clients of class B */)
-
-// DeathTest is a class that hides much of the complexity of the
-// GTEST_DEATH_TEST_ macro.  It is abstract; its static Create method
-// returns a concrete class that depends on the prevailing death test
-// style, as defined by the --gtest_death_test_style and/or
-// --gtest_internal_run_death_test flags.
-
-// In describing the results of death tests, these terms are used with
-// the corresponding definitions:
-//
-// exit status:  The integer exit information in the format specified
-//               by wait(2)
-// exit code:    The integer code passed to exit(3), _exit(2), or
-//               returned from main()
-class GTEST_API_ DeathTest {
- public:
-  // Create returns false if there was an error determining the
-  // appropriate action to take for the current death test; for example,
-  // if the gtest_death_test_style flag is set to an invalid value.
-  // The LastMessage method will return a more detailed message in that
-  // case.  Otherwise, the DeathTest pointer pointed to by the "test"
-  // argument is set.  If the death test should be skipped, the pointer
-  // is set to NULL; otherwise, it is set to the address of a new concrete
-  // DeathTest object that controls the execution of the current test.
-  static bool Create(const char* statement, Matcher<const std::string&> matcher,
-                     const char* file, int line, DeathTest** test);
-  DeathTest();
-  virtual ~DeathTest() { }
-
-  // A helper class that aborts a death test when it's deleted.
-  class ReturnSentinel {
-   public:
-    explicit ReturnSentinel(DeathTest* test) : test_(test) { }
-    ~ReturnSentinel() { test_->Abort(TEST_ENCOUNTERED_RETURN_STATEMENT); }
-   private:
-    DeathTest* const test_;
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(ReturnSentinel);
-  } GTEST_ATTRIBUTE_UNUSED_;
-
-  // An enumeration of possible roles that may be taken when a death
-  // test is encountered.  EXECUTE means that the death test logic should
-  // be executed immediately.  OVERSEE means that the program should prepare
-  // the appropriate environment for a child process to execute the death
-  // test, then wait for it to complete.
-  enum TestRole { OVERSEE_TEST, EXECUTE_TEST };
-
-  // An enumeration of the three reasons that a test might be aborted.
-  enum AbortReason {
-    TEST_ENCOUNTERED_RETURN_STATEMENT,
-    TEST_THREW_EXCEPTION,
-    TEST_DID_NOT_DIE
-  };
-
-  // Assumes one of the above roles.
-  virtual TestRole AssumeRole() = 0;
-
-  // Waits for the death test to finish and returns its status.
-  virtual int Wait() = 0;
-
-  // Returns true if the death test passed; that is, the test process
-  // exited during the test, its exit status matches a user-supplied
-  // predicate, and its stderr output matches a user-supplied regular
-  // expression.
-  // The user-supplied predicate may be a macro expression rather
-  // than a function pointer or functor, or else Wait and Passed could
-  // be combined.
-  virtual bool Passed(bool exit_status_ok) = 0;
-
-  // Signals that the death test did not die as expected.
-  virtual void Abort(AbortReason reason) = 0;
-
-  // Returns a human-readable outcome message regarding the outcome of
-  // the last death test.
-  static const char* LastMessage();
-
-  static void set_last_death_test_message(const std::string& message);
-
- private:
-  // A string containing a description of the outcome of the last death test.
-  static std::string last_death_test_message_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(DeathTest);
-};
-
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
-
-// Factory interface for death tests.  May be mocked out for testing.
-class DeathTestFactory {
- public:
-  virtual ~DeathTestFactory() { }
-  virtual bool Create(const char* statement,
-                      Matcher<const std::string&> matcher, const char* file,
-                      int line, DeathTest** test) = 0;
-};
-
-// A concrete DeathTestFactory implementation for normal use.
-class DefaultDeathTestFactory : public DeathTestFactory {
- public:
-  bool Create(const char* statement, Matcher<const std::string&> matcher,
-              const char* file, int line, DeathTest** test) override;
-};
-
-// Returns true if exit_status describes a process that was terminated
-// by a signal, or exited normally with a nonzero exit code.
-GTEST_API_ bool ExitedUnsuccessfully(int exit_status);
-
-// A string passed to EXPECT_DEATH (etc.) is caught by one of these overloads
-// and interpreted as a regex (rather than an Eq matcher) for legacy
-// compatibility.
-inline Matcher<const ::std::string&> MakeDeathTestMatcher(
-    ::testing::internal::RE regex) {
-  return ContainsRegex(regex.pattern());
-}
-inline Matcher<const ::std::string&> MakeDeathTestMatcher(const char* regex) {
-  return ContainsRegex(regex);
-}
-inline Matcher<const ::std::string&> MakeDeathTestMatcher(
-    const ::std::string& regex) {
-  return ContainsRegex(regex);
-}
-
-// If a Matcher<const ::std::string&> is passed to EXPECT_DEATH (etc.), it's
-// used directly.
-inline Matcher<const ::std::string&> MakeDeathTestMatcher(
-    Matcher<const ::std::string&> matcher) {
-  return matcher;
-}
-
-// Traps C++ exceptions escaping statement and reports them as test
-// failures. Note that trapping SEH exceptions is not implemented here.
-# if GTEST_HAS_EXCEPTIONS
-#  define GTEST_EXECUTE_DEATH_TEST_STATEMENT_(statement, death_test) \
-  try { \
-    GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
-  } catch (const ::std::exception& gtest_exception) { \
-    fprintf(\
-        stderr, \
-        "\n%s: Caught std::exception-derived exception escaping the " \
-        "death test statement. Exception message: %s\n", \
-        ::testing::internal::FormatFileLocation(__FILE__, __LINE__).c_str(), \
-        gtest_exception.what()); \
-    fflush(stderr); \
-    death_test->Abort(::testing::internal::DeathTest::TEST_THREW_EXCEPTION); \
-  } catch (...) { \
-    death_test->Abort(::testing::internal::DeathTest::TEST_THREW_EXCEPTION); \
-  }
-
-# else
-#  define GTEST_EXECUTE_DEATH_TEST_STATEMENT_(statement, death_test) \
-  GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement)
-
-# endif
-
-// This macro is for implementing ASSERT_DEATH*, EXPECT_DEATH*,
-// ASSERT_EXIT*, and EXPECT_EXIT*.
-#define GTEST_DEATH_TEST_(statement, predicate, regex_or_matcher, fail)        \
-  GTEST_AMBIGUOUS_ELSE_BLOCKER_                                                \
-  if (::testing::internal::AlwaysTrue()) {                                     \
-    ::testing::internal::DeathTest* gtest_dt;                                  \
-    if (!::testing::internal::DeathTest::Create(                               \
-            #statement,                                                        \
-            ::testing::internal::MakeDeathTestMatcher(regex_or_matcher),       \
-            __FILE__, __LINE__, &gtest_dt)) {                                  \
-      goto GTEST_CONCAT_TOKEN_(gtest_label_, __LINE__);                        \
-    }                                                                          \
-    if (gtest_dt != nullptr) {                                                 \
-      std::unique_ptr< ::testing::internal::DeathTest> gtest_dt_ptr(gtest_dt); \
-      switch (gtest_dt->AssumeRole()) {                                        \
-        case ::testing::internal::DeathTest::OVERSEE_TEST:                     \
-          if (!gtest_dt->Passed(predicate(gtest_dt->Wait()))) {                \
-            goto GTEST_CONCAT_TOKEN_(gtest_label_, __LINE__);                  \
-          }                                                                    \
-          break;                                                               \
-        case ::testing::internal::DeathTest::EXECUTE_TEST: {                   \
-          ::testing::internal::DeathTest::ReturnSentinel gtest_sentinel(       \
-              gtest_dt);                                                       \
-          GTEST_EXECUTE_DEATH_TEST_STATEMENT_(statement, gtest_dt);            \
-          gtest_dt->Abort(::testing::internal::DeathTest::TEST_DID_NOT_DIE);   \
-          break;                                                               \
-        }                                                                      \
-        default:                                                               \
-          break;                                                               \
-      }                                                                        \
-    }                                                                          \
-  } else                                                                       \
-    GTEST_CONCAT_TOKEN_(gtest_label_, __LINE__)                                \
-        : fail(::testing::internal::DeathTest::LastMessage())
-// The symbol "fail" here expands to something into which a message
-// can be streamed.
-
-// This macro is for implementing ASSERT/EXPECT_DEBUG_DEATH when compiled in
-// NDEBUG mode. In this case we need the statements to be executed and the macro
-// must accept a streamed message even though the message is never printed.
-// The regex object is not evaluated, but it is used to prevent "unused"
-// warnings and to avoid an expression that doesn't compile in debug mode.
-#define GTEST_EXECUTE_STATEMENT_(statement, regex_or_matcher)    \
-  GTEST_AMBIGUOUS_ELSE_BLOCKER_                                  \
-  if (::testing::internal::AlwaysTrue()) {                       \
-    GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement);   \
-  } else if (!::testing::internal::AlwaysTrue()) {               \
-    ::testing::internal::MakeDeathTestMatcher(regex_or_matcher); \
-  } else                                                         \
-    ::testing::Message()
-
-// A class representing the parsed contents of the
-// --gtest_internal_run_death_test flag, as it existed when
-// RUN_ALL_TESTS was called.
-class InternalRunDeathTestFlag {
- public:
-  InternalRunDeathTestFlag(const std::string& a_file,
-                           int a_line,
-                           int an_index,
-                           int a_write_fd)
-      : file_(a_file), line_(a_line), index_(an_index),
-        write_fd_(a_write_fd) {}
-
-  ~InternalRunDeathTestFlag() {
-    if (write_fd_ >= 0)
-      posix::Close(write_fd_);
-  }
-
-  const std::string& file() const { return file_; }
-  int line() const { return line_; }
-  int index() const { return index_; }
-  int write_fd() const { return write_fd_; }
-
- private:
-  std::string file_;
-  int line_;
-  int index_;
-  int write_fd_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(InternalRunDeathTestFlag);
-};
-
-// Returns a newly created InternalRunDeathTestFlag object with fields
-// initialized from the GTEST_FLAG(internal_run_death_test) flag if
-// the flag is specified; otherwise returns NULL.
-InternalRunDeathTestFlag* ParseInternalRunDeathTestFlag();
-
-#endif  // GTEST_HAS_DEATH_TEST
-
-}  // namespace internal
-}  // namespace testing
-
-#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/gtest-filepath.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/gtest-filepath.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/gtest-filepath.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/gtest-filepath.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,211 +0,0 @@
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Google Test filepath utilities
-//
-// This header file declares classes and functions used internally by
-// Google Test.  They are subject to change without notice.
-//
-// This file is #included in gtest/internal/gtest-internal.h.
-// Do not include this header file separately!
-
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
-#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
-
-#include "gtest/internal/gtest-string.h"
-
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
-/* class A needs to have dll-interface to be used by clients of class B */)
-
-namespace testing {
-namespace internal {
-
-// FilePath - a class for file and directory pathname manipulation which
-// handles platform-specific conventions (like the pathname separator).
-// Used for helper functions for naming files in a directory for xml output.
-// Except for Set methods, all methods are const or static, which provides an
-// "immutable value object" -- useful for peace of mind.
-// A FilePath with a value ending in a path separator ("like/this/") represents
-// a directory, otherwise it is assumed to represent a file. In either case,
-// it may or may not represent an actual file or directory in the file system.
-// Names are NOT checked for syntax correctness -- no checking for illegal
-// characters, malformed paths, etc.
-
-class GTEST_API_ FilePath {
- public:
-  FilePath() : pathname_("") { }
-  FilePath(const FilePath& rhs) : pathname_(rhs.pathname_) { }
-
-  explicit FilePath(const std::string& pathname) : pathname_(pathname) {
-    Normalize();
-  }
-
-  FilePath& operator=(const FilePath& rhs) {
-    Set(rhs);
-    return *this;
-  }
-
-  void Set(const FilePath& rhs) {
-    pathname_ = rhs.pathname_;
-  }
-
-  const std::string& string() const { return pathname_; }
-  const char* c_str() const { return pathname_.c_str(); }
-
-  // Returns the current working directory, or "" if unsuccessful.
-  static FilePath GetCurrentDir();
-
-  // Given directory = "dir", base_name = "test", number = 0,
-  // extension = "xml", returns "dir/test.xml". If number is greater
-  // than zero (e.g., 12), returns "dir/test_12.xml".
-  // On Windows platform, uses \ as the separator rather than /.
-  static FilePath MakeFileName(const FilePath& directory,
-                               const FilePath& base_name,
-                               int number,
-                               const char* extension);
-
-  // Given directory = "dir", relative_path = "test.xml",
-  // returns "dir/test.xml".
-  // On Windows, uses \ as the separator rather than /.
-  static FilePath ConcatPaths(const FilePath& directory,
-                              const FilePath& relative_path);
-
-  // Returns a pathname for a file that does not currently exist. The pathname
-  // will be directory/base_name.extension or
-  // directory/base_name_<number>.extension if directory/base_name.extension
-  // already exists. The number will be incremented until a pathname is found
-  // that does not already exist.
-  // Examples: 'dir/foo_test.xml' or 'dir/foo_test_1.xml'.
-  // There could be a race condition if two or more processes are calling this
-  // function at the same time -- they could both pick the same filename.
-  static FilePath GenerateUniqueFileName(const FilePath& directory,
-                                         const FilePath& base_name,
-                                         const char* extension);
-
-  // Returns true if and only if the path is "".
-  bool IsEmpty() const { return pathname_.empty(); }
-
-  // If input name has a trailing separator character, removes it and returns
-  // the name, otherwise return the name string unmodified.
-  // On Windows platform, uses \ as the separator, other platforms use /.
-  FilePath RemoveTrailingPathSeparator() const;
-
-  // Returns a copy of the FilePath with the directory part removed.
-  // Example: FilePath("path/to/file").RemoveDirectoryName() returns
-  // FilePath("file"). If there is no directory part ("just_a_file"), it returns
-  // the FilePath unmodified. If there is no file part ("just_a_dir/") it
-  // returns an empty FilePath ("").
-  // On Windows platform, '\' is the path separator, otherwise it is '/'.
-  FilePath RemoveDirectoryName() const;
-
-  // RemoveFileName returns the directory path with the filename removed.
-  // Example: FilePath("path/to/file").RemoveFileName() returns "path/to/".
-  // If the FilePath is "a_file" or "/a_file", RemoveFileName returns
-  // FilePath("./") or, on Windows, FilePath(".\\"). If the filepath does
-  // not have a file, like "just/a/dir/", it returns the FilePath unmodified.
-  // On Windows platform, '\' is the path separator, otherwise it is '/'.
-  FilePath RemoveFileName() const;
-
-  // Returns a copy of the FilePath with the case-insensitive extension removed.
-  // Example: FilePath("dir/file.exe").RemoveExtension("EXE") returns
-  // FilePath("dir/file"). If a case-insensitive extension is not
-  // found, returns a copy of the original FilePath.
-  FilePath RemoveExtension(const char* extension) const;
-
-  // Creates directories so that path exists. Returns true if successful or if
-  // the directories already exist; returns false if unable to create
-  // directories for any reason. Will also return false if the FilePath does
-  // not represent a directory (that is, it doesn't end with a path separator).
-  bool CreateDirectoriesRecursively() const;
-
-  // Create the directory so that path exists. Returns true if successful or
-  // if the directory already exists; returns false if unable to create the
-  // directory for any reason, including if the parent directory does not
-  // exist. Not named "CreateDirectory" because that's a macro on Windows.
-  bool CreateFolder() const;
-
-  // Returns true if FilePath describes something in the file-system,
-  // either a file, directory, or whatever, and that something exists.
-  bool FileOrDirectoryExists() const;
-
-  // Returns true if pathname describes a directory in the file-system
-  // that exists.
-  bool DirectoryExists() const;
-
-  // Returns true if FilePath ends with a path separator, which indicates that
-  // it is intended to represent a directory. Returns false otherwise.
-  // This does NOT check that a directory (or file) actually exists.
-  bool IsDirectory() const;
-
-  // Returns true if pathname describes a root directory. (Windows has one
-  // root directory per disk drive.)
-  bool IsRootDirectory() const;
-
-  // Returns true if pathname describes an absolute path.
-  bool IsAbsolutePath() const;
-
- private:
-  // Replaces multiple consecutive separators with a single separator.
-  // For example, "bar///foo" becomes "bar/foo". Does not eliminate other
-  // redundancies that might be in a pathname involving "." or "..".
-  //
-  // A pathname with multiple consecutive separators may occur either through
-  // user error or as a result of some scripts or APIs that generate a pathname
-  // with a trailing separator. On other platforms the same API or script
-  // may NOT generate a pathname with a trailing "/". Then elsewhere that
-  // pathname may have another "/" and pathname components added to it,
-  // without checking for the separator already being there.
-  // The script language and operating system may allow paths like "foo//bar"
-  // but some of the functions in FilePath will not handle that correctly. In
-  // particular, RemoveTrailingPathSeparator() only removes one separator, and
-  // it is called in CreateDirectoriesRecursively() assuming that it will change
-  // a pathname from directory syntax (trailing separator) to filename syntax.
-  //
-  // On Windows this method also replaces the alternate path separator '/' with
-  // the primary path separator '\\', so that for example "bar\\/\\foo" becomes
-  // "bar\\foo".
-
-  void Normalize();
-
-  // Returns a pointer to the last occurence of a valid path separator in
-  // the FilePath. On Windows, for example, both '/' and '\' are valid path
-  // separators. Returns NULL if no path separator was found.
-  const char* FindLastPathSeparator() const;
-
-  std::string pathname_;
-};  // class FilePath
-
-}  // namespace internal
-}  // namespace testing
-
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
-
-#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/gtest-internal.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/gtest-internal.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/gtest-internal.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/gtest-internal.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,1380 +0,0 @@
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// The Google C++ Testing and Mocking Framework (Google Test)
-//
-// This header file declares functions and macros used internally by
-// Google Test.  They are subject to change without notice.
-
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_
-#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_
-
-#include "gtest/internal/gtest-port.h"
-
-#if GTEST_OS_LINUX
-# include <stdlib.h>
-# include <sys/types.h>
-# include <sys/wait.h>
-# include <unistd.h>
-#endif  // GTEST_OS_LINUX
-
-#if GTEST_HAS_EXCEPTIONS
-# include <stdexcept>
-#endif
-
-#include <ctype.h>
-#include <float.h>
-#include <string.h>
-#include <iomanip>
-#include <limits>
-#include <map>
-#include <set>
-#include <string>
-#include <type_traits>
-#include <vector>
-
-#include "gtest/gtest-message.h"
-#include "gtest/internal/gtest-filepath.h"
-#include "gtest/internal/gtest-string.h"
-#include "gtest/internal/gtest-type-util.h"
-
-// Due to C++ preprocessor weirdness, we need double indirection to
-// concatenate two tokens when one of them is __LINE__.  Writing
-//
-//   foo ## __LINE__
-//
-// will result in the token foo__LINE__, instead of foo followed by
-// the current line number.  For more details, see
-// http://www.parashift.com/c++-faq-lite/misc-technical-issues.html#faq-39.6
-#define GTEST_CONCAT_TOKEN_(foo, bar) GTEST_CONCAT_TOKEN_IMPL_(foo, bar)
-#define GTEST_CONCAT_TOKEN_IMPL_(foo, bar) foo ## bar
-
-// Stringifies its argument.
-#define GTEST_STRINGIFY_(name) #name
-
-namespace proto2 { class Message; }
-
-namespace testing {
-
-// Forward declarations.
-
-class AssertionResult;                 // Result of an assertion.
-class Message;                         // Represents a failure message.
-class Test;                            // Represents a test.
-class TestInfo;                        // Information about a test.
-class TestPartResult;                  // Result of a test part.
-class UnitTest;                        // A collection of test suites.
-
-template <typename T>
-::std::string PrintToString(const T& value);
-
-namespace internal {
-
-struct TraceInfo;                      // Information about a trace point.
-class TestInfoImpl;                    // Opaque implementation of TestInfo
-class UnitTestImpl;                    // Opaque implementation of UnitTest
-
-// The text used in failure messages to indicate the start of the
-// stack trace.
-GTEST_API_ extern const char kStackTraceMarker[];
-
-// An IgnoredValue object can be implicitly constructed from ANY value.
-class IgnoredValue {
-  struct Sink {};
- public:
-  // This constructor template allows any value to be implicitly
-  // converted to IgnoredValue.  The object has no data member and
-  // doesn't try to remember anything about the argument.  We
-  // deliberately omit the 'explicit' keyword in order to allow the
-  // conversion to be implicit.
-  // Disable the conversion if T already has a magical conversion operator.
-  // Otherwise we get ambiguity.
-  template <typename T,
-            typename std::enable_if<!std::is_convertible<T, Sink>::value,
-                                    int>::type = 0>
-  IgnoredValue(const T& /* ignored */) {}  // NOLINT(runtime/explicit)
-};
-
-// Appends the user-supplied message to the Google-Test-generated message.
-GTEST_API_ std::string AppendUserMessage(
-    const std::string& gtest_msg, const Message& user_msg);
-
-#if GTEST_HAS_EXCEPTIONS
-
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(4275 \
-/* an exported class was derived from a class that was not exported */)
-
-// This exception is thrown by (and only by) a failed Google Test
-// assertion when GTEST_FLAG(throw_on_failure) is true (if exceptions
-// are enabled).  We derive it from std::runtime_error, which is for
-// errors presumably detectable only at run time.  Since
-// std::runtime_error inherits from std::exception, many testing
-// frameworks know how to extract and print the message inside it.
-class GTEST_API_ GoogleTestFailureException : public ::std::runtime_error {
- public:
-  explicit GoogleTestFailureException(const TestPartResult& failure);
-};
-
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4275
-
-#endif  // GTEST_HAS_EXCEPTIONS
-
-namespace edit_distance {
-// Returns the optimal edits to go from 'left' to 'right'.
-// All edits cost the same, with replace having lower priority than
-// add/remove.
-// Simple implementation of the Wagner-Fischer algorithm.
-// See http://en.wikipedia.org/wiki/Wagner-Fischer_algorithm
-enum EditType { kMatch, kAdd, kRemove, kReplace };
-GTEST_API_ std::vector<EditType> CalculateOptimalEdits(
-    const std::vector<size_t>& left, const std::vector<size_t>& right);
-
-// Same as above, but the input is represented as strings.
-GTEST_API_ std::vector<EditType> CalculateOptimalEdits(
-    const std::vector<std::string>& left,
-    const std::vector<std::string>& right);
-
-// Create a diff of the input strings in Unified diff format.
-GTEST_API_ std::string CreateUnifiedDiff(const std::vector<std::string>& left,
-                                         const std::vector<std::string>& right,
-                                         size_t context = 2);
-
-}  // namespace edit_distance
-
-// Calculate the diff between 'left' and 'right' and return it in unified diff
-// format.
-// If not null, stores in 'total_line_count' the total number of lines found
-// in left + right.
-GTEST_API_ std::string DiffStrings(const std::string& left,
-                                   const std::string& right,
-                                   size_t* total_line_count);
-
-// Constructs and returns the message for an equality assertion
-// (e.g. ASSERT_EQ, EXPECT_STREQ, etc) failure.
-//
-// The first four parameters are the expressions used in the assertion
-// and their values, as strings.  For example, for ASSERT_EQ(foo, bar)
-// where foo is 5 and bar is 6, we have:
-//
-//   expected_expression: "foo"
-//   actual_expression:   "bar"
-//   expected_value:      "5"
-//   actual_value:        "6"
-//
-// The ignoring_case parameter is true if and only if the assertion is a
-// *_STRCASEEQ*.  When it's true, the string " (ignoring case)" will
-// be inserted into the message.
-GTEST_API_ AssertionResult EqFailure(const char* expected_expression,
-                                     const char* actual_expression,
-                                     const std::string& expected_value,
-                                     const std::string& actual_value,
-                                     bool ignoring_case);
-
-// Constructs a failure message for Boolean assertions such as EXPECT_TRUE.
-GTEST_API_ std::string GetBoolAssertionFailureMessage(
-    const AssertionResult& assertion_result,
-    const char* expression_text,
-    const char* actual_predicate_value,
-    const char* expected_predicate_value);
-
-// This template class represents an IEEE floating-point number
-// (either single-precision or double-precision, depending on the
-// template parameters).
-//
-// The purpose of this class is to do more sophisticated number
-// comparison.  (Due to round-off error, etc, it's very unlikely that
-// two floating-points will be equal exactly.  Hence a naive
-// comparison by the == operation often doesn't work.)
-//
-// Format of IEEE floating-point:
-//
-//   The most-significant bit being the leftmost, an IEEE
-//   floating-point looks like
-//
-//     sign_bit exponent_bits fraction_bits
-//
-//   Here, sign_bit is a single bit that designates the sign of the
-//   number.
-//
-//   For float, there are 8 exponent bits and 23 fraction bits.
-//
-//   For double, there are 11 exponent bits and 52 fraction bits.
-//
-//   More details can be found at
-//   http://en.wikipedia.org/wiki/IEEE_floating-point_standard.
-//
-// Template parameter:
-//
-//   RawType: the raw floating-point type (either float or double)
-template <typename RawType>
-class FloatingPoint {
- public:
-  // Defines the unsigned integer type that has the same size as the
-  // floating point number.
-  typedef typename TypeWithSize<sizeof(RawType)>::UInt Bits;
-
-  // Constants.
-
-  // # of bits in a number.
-  static const size_t kBitCount = 8*sizeof(RawType);
-
-  // # of fraction bits in a number.
-  static const size_t kFractionBitCount =
-    std::numeric_limits<RawType>::digits - 1;
-
-  // # of exponent bits in a number.
-  static const size_t kExponentBitCount = kBitCount - 1 - kFractionBitCount;
-
-  // The mask for the sign bit.
-  static const Bits kSignBitMask = static_cast<Bits>(1) << (kBitCount - 1);
-
-  // The mask for the fraction bits.
-  static const Bits kFractionBitMask =
-    ~static_cast<Bits>(0) >> (kExponentBitCount + 1);
-
-  // The mask for the exponent bits.
-  static const Bits kExponentBitMask = ~(kSignBitMask | kFractionBitMask);
-
-  // How many ULP's (Units in the Last Place) we want to tolerate when
-  // comparing two numbers.  The larger the value, the more error we
-  // allow.  A 0 value means that two numbers must be exactly the same
-  // to be considered equal.
-  //
-  // The maximum error of a single floating-point operation is 0.5
-  // units in the last place.  On Intel CPU's, all floating-point
-  // calculations are done with 80-bit precision, while double has 64
-  // bits.  Therefore, 4 should be enough for ordinary use.
-  //
-  // See the following article for more details on ULP:
-  // http://randomascii.wordpress.com/2012/02/25/comparing-floating-point-numbers-2012-edition/
-  static const size_t kMaxUlps = 4;
-
-  // Constructs a FloatingPoint from a raw floating-point number.
-  //
-  // On an Intel CPU, passing a non-normalized NAN (Not a Number)
-  // around may change its bits, although the new value is guaranteed
-  // to be also a NAN.  Therefore, don't expect this constructor to
-  // preserve the bits in x when x is a NAN.
-  explicit FloatingPoint(const RawType& x) { u_.value_ = x; }
-
-  // Static methods
-
-  // Reinterprets a bit pattern as a floating-point number.
-  //
-  // This function is needed to test the AlmostEquals() method.
-  static RawType ReinterpretBits(const Bits bits) {
-    FloatingPoint fp(0);
-    fp.u_.bits_ = bits;
-    return fp.u_.value_;
-  }
-
-  // Returns the floating-point number that represent positive infinity.
-  static RawType Infinity() {
-    return ReinterpretBits(kExponentBitMask);
-  }
-
-  // Returns the maximum representable finite floating-point number.
-  static RawType Max();
-
-  // Non-static methods
-
-  // Returns the bits that represents this number.
-  const Bits &bits() const { return u_.bits_; }
-
-  // Returns the exponent bits of this number.
-  Bits exponent_bits() const { return kExponentBitMask & u_.bits_; }
-
-  // Returns the fraction bits of this number.
-  Bits fraction_bits() const { return kFractionBitMask & u_.bits_; }
-
-  // Returns the sign bit of this number.
-  Bits sign_bit() const { return kSignBitMask & u_.bits_; }
-
-  // Returns true if and only if this is NAN (not a number).
-  bool is_nan() const {
-    // It's a NAN if the exponent bits are all ones and the fraction
-    // bits are not entirely zeros.
-    return (exponent_bits() == kExponentBitMask) && (fraction_bits() != 0);
-  }
-
-  // Returns true if and only if this number is at most kMaxUlps ULP's away
-  // from rhs.  In particular, this function:
-  //
-  //   - returns false if either number is (or both are) NAN.
-  //   - treats really large numbers as almost equal to infinity.
-  //   - thinks +0.0 and -0.0 are 0 DLP's apart.
-  bool AlmostEquals(const FloatingPoint& rhs) const {
-    // The IEEE standard says that any comparison operation involving
-    // a NAN must return false.
-    if (is_nan() || rhs.is_nan()) return false;
-
-    return DistanceBetweenSignAndMagnitudeNumbers(u_.bits_, rhs.u_.bits_)
-        <= kMaxUlps;
-  }
-
- private:
-  // The data type used to store the actual floating-point number.
-  union FloatingPointUnion {
-    RawType value_;  // The raw floating-point number.
-    Bits bits_;      // The bits that represent the number.
-  };
-
-  // Converts an integer from the sign-and-magnitude representation to
-  // the biased representation.  More precisely, let N be 2 to the
-  // power of (kBitCount - 1), an integer x is represented by the
-  // unsigned number x + N.
-  //
-  // For instance,
-  //
-  //   -N + 1 (the most negative number representable using
-  //          sign-and-magnitude) is represented by 1;
-  //   0      is represented by N; and
-  //   N - 1  (the biggest number representable using
-  //          sign-and-magnitude) is represented by 2N - 1.
-  //
-  // Read http://en.wikipedia.org/wiki/Signed_number_representations
-  // for more details on signed number representations.
-  static Bits SignAndMagnitudeToBiased(const Bits &sam) {
-    if (kSignBitMask & sam) {
-      // sam represents a negative number.
-      return ~sam + 1;
-    } else {
-      // sam represents a positive number.
-      return kSignBitMask | sam;
-    }
-  }
-
-  // Given two numbers in the sign-and-magnitude representation,
-  // returns the distance between them as an unsigned number.
-  static Bits DistanceBetweenSignAndMagnitudeNumbers(const Bits &sam1,
-                                                     const Bits &sam2) {
-    const Bits biased1 = SignAndMagnitudeToBiased(sam1);
-    const Bits biased2 = SignAndMagnitudeToBiased(sam2);
-    return (biased1 >= biased2) ? (biased1 - biased2) : (biased2 - biased1);
-  }
-
-  FloatingPointUnion u_;
-};
-
-// We cannot use std::numeric_limits<T>::max() as it clashes with the max()
-// macro defined by <windows.h>.
-template <>
-inline float FloatingPoint<float>::Max() { return FLT_MAX; }
-template <>
-inline double FloatingPoint<double>::Max() { return DBL_MAX; }
-
-// Typedefs the instances of the FloatingPoint template class that we
-// care to use.
-typedef FloatingPoint<float> Float;
-typedef FloatingPoint<double> Double;
-
-// In order to catch the mistake of putting tests that use different
-// test fixture classes in the same test suite, we need to assign
-// unique IDs to fixture classes and compare them.  The TypeId type is
-// used to hold such IDs.  The user should treat TypeId as an opaque
-// type: the only operation allowed on TypeId values is to compare
-// them for equality using the == operator.
-typedef const void* TypeId;
-
-template <typename T>
-class TypeIdHelper {
- public:
-  // dummy_ must not have a const type.  Otherwise an overly eager
-  // compiler (e.g. MSVC 7.1 & 8.0) may try to merge
-  // TypeIdHelper<T>::dummy_ for different Ts as an "optimization".
-  static bool dummy_;
-};
-
-template <typename T>
-bool TypeIdHelper<T>::dummy_ = false;
-
-// GetTypeId<T>() returns the ID of type T.  Different values will be
-// returned for different types.  Calling the function twice with the
-// same type argument is guaranteed to return the same ID.
-template <typename T>
-TypeId GetTypeId() {
-  // The compiler is required to allocate a different
-  // TypeIdHelper<T>::dummy_ variable for each T used to instantiate
-  // the template.  Therefore, the address of dummy_ is guaranteed to
-  // be unique.
-  return &(TypeIdHelper<T>::dummy_);
-}
-
-// Returns the type ID of ::testing::Test.  Always call this instead
-// of GetTypeId< ::testing::Test>() to get the type ID of
-// ::testing::Test, as the latter may give the wrong result due to a
-// suspected linker bug when compiling Google Test as a Mac OS X
-// framework.
-GTEST_API_ TypeId GetTestTypeId();
-
-// Defines the abstract factory interface that creates instances
-// of a Test object.
-class TestFactoryBase {
- public:
-  virtual ~TestFactoryBase() {}
-
-  // Creates a test instance to run. The instance is both created and destroyed
-  // within TestInfoImpl::Run()
-  virtual Test* CreateTest() = 0;
-
- protected:
-  TestFactoryBase() {}
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestFactoryBase);
-};
-
-// This class provides implementation of TeastFactoryBase interface.
-// It is used in TEST and TEST_F macros.
-template <class TestClass>
-class TestFactoryImpl : public TestFactoryBase {
- public:
-  Test* CreateTest() override { return new TestClass; }
-};
-
-#if GTEST_OS_WINDOWS
-
-// Predicate-formatters for implementing the HRESULT checking macros
-// {ASSERT|EXPECT}_HRESULT_{SUCCEEDED|FAILED}
-// We pass a long instead of HRESULT to avoid causing an
-// include dependency for the HRESULT type.
-GTEST_API_ AssertionResult IsHRESULTSuccess(const char* expr,
-                                            long hr);  // NOLINT
-GTEST_API_ AssertionResult IsHRESULTFailure(const char* expr,
-                                            long hr);  // NOLINT
-
-#endif  // GTEST_OS_WINDOWS
-
-// Types of SetUpTestSuite() and TearDownTestSuite() functions.
-using SetUpTestSuiteFunc = void (*)();
-using TearDownTestSuiteFunc = void (*)();
-
-struct CodeLocation {
-  CodeLocation(const std::string& a_file, int a_line)
-      : file(a_file), line(a_line) {}
-
-  std::string file;
-  int line;
-};
-
-//  Helper to identify which setup function for TestCase / TestSuite to call.
-//  Only one function is allowed, either TestCase or TestSute but not both.
-
-// Utility functions to help SuiteApiResolver
-using SetUpTearDownSuiteFuncType = void (*)();
-
-inline SetUpTearDownSuiteFuncType GetNotDefaultOrNull(
-    SetUpTearDownSuiteFuncType a, SetUpTearDownSuiteFuncType def) {
-  return a == def ? nullptr : a;
-}
-
-template <typename T>
-//  Note that SuiteApiResolver inherits from T because
-//  SetUpTestSuite()/TearDownTestSuite() could be protected. Ths way
-//  SuiteApiResolver can access them.
-struct SuiteApiResolver : T {
-  // testing::Test is only forward declared at this point. So we make it a
-  // dependend class for the compiler to be OK with it.
-  using Test =
-      typename std::conditional<sizeof(T) != 0, ::testing::Test, void>::type;
-
-  static SetUpTearDownSuiteFuncType GetSetUpCaseOrSuite(const char* filename,
-                                                        int line_num) {
-    SetUpTearDownSuiteFuncType test_case_fp =
-        GetNotDefaultOrNull(&T::SetUpTestCase, &Test::SetUpTestCase);
-    SetUpTearDownSuiteFuncType test_suite_fp =
-        GetNotDefaultOrNull(&T::SetUpTestSuite, &Test::SetUpTestSuite);
-
-    GTEST_CHECK_(!test_case_fp || !test_suite_fp)
-        << "Test can not provide both SetUpTestSuite and SetUpTestCase, please "
-           "make sure there is only one present at "
-        << filename << ":" << line_num;
-
-    return test_case_fp != nullptr ? test_case_fp : test_suite_fp;
-  }
-
-  static SetUpTearDownSuiteFuncType GetTearDownCaseOrSuite(const char* filename,
-                                                           int line_num) {
-    SetUpTearDownSuiteFuncType test_case_fp =
-        GetNotDefaultOrNull(&T::TearDownTestCase, &Test::TearDownTestCase);
-    SetUpTearDownSuiteFuncType test_suite_fp =
-        GetNotDefaultOrNull(&T::TearDownTestSuite, &Test::TearDownTestSuite);
-
-    GTEST_CHECK_(!test_case_fp || !test_suite_fp)
-        << "Test can not provide both TearDownTestSuite and TearDownTestCase,"
-           " please make sure there is only one present at"
-        << filename << ":" << line_num;
-
-    return test_case_fp != nullptr ? test_case_fp : test_suite_fp;
-  }
-};
-
-// Creates a new TestInfo object and registers it with Google Test;
-// returns the created object.
-//
-// Arguments:
-//
-//   test_suite_name:   name of the test suite
-//   name:             name of the test
-//   type_param        the name of the test's type parameter, or NULL if
-//                     this is not a typed or a type-parameterized test.
-//   value_param       text representation of the test's value parameter,
-//                     or NULL if this is not a type-parameterized test.
-//   code_location:    code location where the test is defined
-//   fixture_class_id: ID of the test fixture class
-//   set_up_tc:        pointer to the function that sets up the test suite
-//   tear_down_tc:     pointer to the function that tears down the test suite
-//   factory:          pointer to the factory that creates a test object.
-//                     The newly created TestInfo instance will assume
-//                     ownership of the factory object.
-GTEST_API_ TestInfo* MakeAndRegisterTestInfo(
-    const char* test_suite_name, const char* name, const char* type_param,
-    const char* value_param, CodeLocation code_location,
-    TypeId fixture_class_id, SetUpTestSuiteFunc set_up_tc,
-    TearDownTestSuiteFunc tear_down_tc, TestFactoryBase* factory);
-
-// If *pstr starts with the given prefix, modifies *pstr to be right
-// past the prefix and returns true; otherwise leaves *pstr unchanged
-// and returns false.  None of pstr, *pstr, and prefix can be NULL.
-GTEST_API_ bool SkipPrefix(const char* prefix, const char** pstr);
-
-#if GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P
-
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
-/* class A needs to have dll-interface to be used by clients of class B */)
-
-// State of the definition of a type-parameterized test suite.
-class GTEST_API_ TypedTestSuitePState {
- public:
-  TypedTestSuitePState() : registered_(false) {}
-
-  // Adds the given test name to defined_test_names_ and return true
-  // if the test suite hasn't been registered; otherwise aborts the
-  // program.
-  bool AddTestName(const char* file, int line, const char* case_name,
-                   const char* test_name) {
-    if (registered_) {
-      fprintf(stderr,
-              "%s Test %s must be defined before "
-              "REGISTER_TYPED_TEST_SUITE_P(%s, ...).\n",
-              FormatFileLocation(file, line).c_str(), test_name, case_name);
-      fflush(stderr);
-      posix::Abort();
-    }
-    registered_tests_.insert(
-        ::std::make_pair(test_name, CodeLocation(file, line)));
-    return true;
-  }
-
-  bool TestExists(const std::string& test_name) const {
-    return registered_tests_.count(test_name) > 0;
-  }
-
-  const CodeLocation& GetCodeLocation(const std::string& test_name) const {
-    RegisteredTestsMap::const_iterator it = registered_tests_.find(test_name);
-    GTEST_CHECK_(it != registered_tests_.end());
-    return it->second;
-  }
-
-  // Verifies that registered_tests match the test names in
-  // defined_test_names_; returns registered_tests if successful, or
-  // aborts the program otherwise.
-  const char* VerifyRegisteredTestNames(
-      const char* file, int line, const char* registered_tests);
-
- private:
-  typedef ::std::map<std::string, CodeLocation> RegisteredTestsMap;
-
-  bool registered_;
-  RegisteredTestsMap registered_tests_;
-};
-
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-using TypedTestCasePState = TypedTestSuitePState;
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
-
-// Skips to the first non-space char after the first comma in 'str';
-// returns NULL if no comma is found in 'str'.
-inline const char* SkipComma(const char* str) {
-  const char* comma = strchr(str, ',');
-  if (comma == nullptr) {
-    return nullptr;
-  }
-  while (IsSpace(*(++comma))) {}
-  return comma;
-}
-
-// Returns the prefix of 'str' before the first comma in it; returns
-// the entire string if it contains no comma.
-inline std::string GetPrefixUntilComma(const char* str) {
-  const char* comma = strchr(str, ',');
-  return comma == nullptr ? str : std::string(str, comma);
-}
-
-// Splits a given string on a given delimiter, populating a given
-// vector with the fields.
-void SplitString(const ::std::string& str, char delimiter,
-                 ::std::vector< ::std::string>* dest);
-
-// The default argument to the template below for the case when the user does
-// not provide a name generator.
-struct DefaultNameGenerator {
-  template <typename T>
-  static std::string GetName(int i) {
-    return StreamableToString(i);
-  }
-};
-
-template <typename Provided = DefaultNameGenerator>
-struct NameGeneratorSelector {
-  typedef Provided type;
-};
-
-template <typename NameGenerator>
-void GenerateNamesRecursively(Types0, std::vector<std::string>*, int) {}
-
-template <typename NameGenerator, typename Types>
-void GenerateNamesRecursively(Types, std::vector<std::string>* result, int i) {
-  result->push_back(NameGenerator::template GetName<typename Types::Head>(i));
-  GenerateNamesRecursively<NameGenerator>(typename Types::Tail(), result,
-                                          i + 1);
-}
-
-template <typename NameGenerator, typename Types>
-std::vector<std::string> GenerateNames() {
-  std::vector<std::string> result;
-  GenerateNamesRecursively<NameGenerator>(Types(), &result, 0);
-  return result;
-}
-
-// TypeParameterizedTest<Fixture, TestSel, Types>::Register()
-// registers a list of type-parameterized tests with Google Test.  The
-// return value is insignificant - we just need to return something
-// such that we can call this function in a namespace scope.
-//
-// Implementation note: The GTEST_TEMPLATE_ macro declares a template
-// template parameter.  It's defined in gtest-type-util.h.
-template <GTEST_TEMPLATE_ Fixture, class TestSel, typename Types>
-class TypeParameterizedTest {
- public:
-  // 'index' is the index of the test in the type list 'Types'
-  // specified in INSTANTIATE_TYPED_TEST_SUITE_P(Prefix, TestSuite,
-  // Types).  Valid values for 'index' are [0, N - 1] where N is the
-  // length of Types.
-  static bool Register(const char* prefix, const CodeLocation& code_location,
-                       const char* case_name, const char* test_names, int index,
-                       const std::vector<std::string>& type_names =
-                           GenerateNames<DefaultNameGenerator, Types>()) {
-    typedef typename Types::Head Type;
-    typedef Fixture<Type> FixtureClass;
-    typedef typename GTEST_BIND_(TestSel, Type) TestClass;
-
-    // First, registers the first type-parameterized test in the type
-    // list.
-    MakeAndRegisterTestInfo(
-        (std::string(prefix) + (prefix[0] == '\0' ? "" : "/") + case_name +
-         "/" + type_names[static_cast<size_t>(index)])
-            .c_str(),
-        StripTrailingSpaces(GetPrefixUntilComma(test_names)).c_str(),
-        GetTypeName<Type>().c_str(),
-        nullptr,  // No value parameter.
-        code_location, GetTypeId<FixtureClass>(),
-        SuiteApiResolver<TestClass>::GetSetUpCaseOrSuite(
-            code_location.file.c_str(), code_location.line),
-        SuiteApiResolver<TestClass>::GetTearDownCaseOrSuite(
-            code_location.file.c_str(), code_location.line),
-        new TestFactoryImpl<TestClass>);
-
-    // Next, recurses (at compile time) with the tail of the type list.
-    return TypeParameterizedTest<Fixture, TestSel,
-                                 typename Types::Tail>::Register(prefix,
-                                                                 code_location,
-                                                                 case_name,
-                                                                 test_names,
-                                                                 index + 1,
-                                                                 type_names);
-  }
-};
-
-// The base case for the compile time recursion.
-template <GTEST_TEMPLATE_ Fixture, class TestSel>
-class TypeParameterizedTest<Fixture, TestSel, Types0> {
- public:
-  static bool Register(const char* /*prefix*/, const CodeLocation&,
-                       const char* /*case_name*/, const char* /*test_names*/,
-                       int /*index*/,
-                       const std::vector<std::string>& =
-                           std::vector<std::string>() /*type_names*/) {
-    return true;
-  }
-};
-
-// TypeParameterizedTestSuite<Fixture, Tests, Types>::Register()
-// registers *all combinations* of 'Tests' and 'Types' with Google
-// Test.  The return value is insignificant - we just need to return
-// something such that we can call this function in a namespace scope.
-template <GTEST_TEMPLATE_ Fixture, typename Tests, typename Types>
-class TypeParameterizedTestSuite {
- public:
-  static bool Register(const char* prefix, CodeLocation code_location,
-                       const TypedTestSuitePState* state, const char* case_name,
-                       const char* test_names,
-                       const std::vector<std::string>& type_names =
-                           GenerateNames<DefaultNameGenerator, Types>()) {
-    std::string test_name = StripTrailingSpaces(
-        GetPrefixUntilComma(test_names));
-    if (!state->TestExists(test_name)) {
-      fprintf(stderr, "Failed to get code location for test %s.%s at %s.",
-              case_name, test_name.c_str(),
-              FormatFileLocation(code_location.file.c_str(),
-                                 code_location.line).c_str());
-      fflush(stderr);
-      posix::Abort();
-    }
-    const CodeLocation& test_location = state->GetCodeLocation(test_name);
-
-    typedef typename Tests::Head Head;
-
-    // First, register the first test in 'Test' for each type in 'Types'.
-    TypeParameterizedTest<Fixture, Head, Types>::Register(
-        prefix, test_location, case_name, test_names, 0, type_names);
-
-    // Next, recurses (at compile time) with the tail of the test list.
-    return TypeParameterizedTestSuite<Fixture, typename Tests::Tail,
-                                      Types>::Register(prefix, code_location,
-                                                       state, case_name,
-                                                       SkipComma(test_names),
-                                                       type_names);
-  }
-};
-
-// The base case for the compile time recursion.
-template <GTEST_TEMPLATE_ Fixture, typename Types>
-class TypeParameterizedTestSuite<Fixture, Templates0, Types> {
- public:
-  static bool Register(const char* /*prefix*/, const CodeLocation&,
-                       const TypedTestSuitePState* /*state*/,
-                       const char* /*case_name*/, const char* /*test_names*/,
-                       const std::vector<std::string>& =
-                           std::vector<std::string>() /*type_names*/) {
-    return true;
-  }
-};
-
-#endif  // GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P
-
-// Returns the current OS stack trace as an std::string.
-//
-// The maximum number of stack frames to be included is specified by
-// the gtest_stack_trace_depth flag.  The skip_count parameter
-// specifies the number of top frames to be skipped, which doesn't
-// count against the number of frames to be included.
-//
-// For example, if Foo() calls Bar(), which in turn calls
-// GetCurrentOsStackTraceExceptTop(..., 1), Foo() will be included in
-// the trace but Bar() and GetCurrentOsStackTraceExceptTop() won't.
-GTEST_API_ std::string GetCurrentOsStackTraceExceptTop(
-    UnitTest* unit_test, int skip_count);
-
-// Helpers for suppressing warnings on unreachable code or constant
-// condition.
-
-// Always returns true.
-GTEST_API_ bool AlwaysTrue();
-
-// Always returns false.
-inline bool AlwaysFalse() { return !AlwaysTrue(); }
-
-// Helper for suppressing false warning from Clang on a const char*
-// variable declared in a conditional expression always being NULL in
-// the else branch.
-struct GTEST_API_ ConstCharPtr {
-  ConstCharPtr(const char* str) : value(str) {}
-  operator bool() const { return true; }
-  const char* value;
-};
-
-// A simple Linear Congruential Generator for generating random
-// numbers with a uniform distribution.  Unlike rand() and srand(), it
-// doesn't use global state (and therefore can't interfere with user
-// code).  Unlike rand_r(), it's portable.  An LCG isn't very random,
-// but it's good enough for our purposes.
-class GTEST_API_ Random {
- public:
-  static const UInt32 kMaxRange = 1u << 31;
-
-  explicit Random(UInt32 seed) : state_(seed) {}
-
-  void Reseed(UInt32 seed) { state_ = seed; }
-
-  // Generates a random number from [0, range).  Crashes if 'range' is
-  // 0 or greater than kMaxRange.
-  UInt32 Generate(UInt32 range);
-
- private:
-  UInt32 state_;
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(Random);
-};
-
-// Turns const U&, U&, const U, and U all into U.
-#define GTEST_REMOVE_REFERENCE_AND_CONST_(T) \
-  typename std::remove_const<typename std::remove_reference<T>::type>::type
-
-// IsAProtocolMessage<T>::value is a compile-time bool constant that's
-// true if and only if T is type proto2::Message or a subclass of it.
-template <typename T>
-struct IsAProtocolMessage
-    : public bool_constant<
-          std::is_convertible<const T*, const ::proto2::Message*>::value> {};
-
-// When the compiler sees expression IsContainerTest<C>(0), if C is an
-// STL-style container class, the first overload of IsContainerTest
-// will be viable (since both C::iterator* and C::const_iterator* are
-// valid types and NULL can be implicitly converted to them).  It will
-// be picked over the second overload as 'int' is a perfect match for
-// the type of argument 0.  If C::iterator or C::const_iterator is not
-// a valid type, the first overload is not viable, and the second
-// overload will be picked.  Therefore, we can determine whether C is
-// a container class by checking the type of IsContainerTest<C>(0).
-// The value of the expression is insignificant.
-//
-// In C++11 mode we check the existence of a const_iterator and that an
-// iterator is properly implemented for the container.
-//
-// For pre-C++11 that we look for both C::iterator and C::const_iterator.
-// The reason is that C++ injects the name of a class as a member of the
-// class itself (e.g. you can refer to class iterator as either
-// 'iterator' or 'iterator::iterator').  If we look for C::iterator
-// only, for example, we would mistakenly think that a class named
-// iterator is an STL container.
-//
-// Also note that the simpler approach of overloading
-// IsContainerTest(typename C::const_iterator*) and
-// IsContainerTest(...) doesn't work with Visual Age C++ and Sun C++.
-typedef int IsContainer;
-template <class C,
-          class Iterator = decltype(::std::declval<const C&>().begin()),
-          class = decltype(::std::declval<const C&>().end()),
-          class = decltype(++::std::declval<Iterator&>()),
-          class = decltype(*::std::declval<Iterator>()),
-          class = typename C::const_iterator>
-IsContainer IsContainerTest(int /* dummy */) {
-  return 0;
-}
-
-typedef char IsNotContainer;
-template <class C>
-IsNotContainer IsContainerTest(long /* dummy */) { return '\0'; }
-
-// Trait to detect whether a type T is a hash table.
-// The heuristic used is that the type contains an inner type `hasher` and does
-// not contain an inner type `reverse_iterator`.
-// If the container is iterable in reverse, then order might actually matter.
-template <typename T>
-struct IsHashTable {
- private:
-  template <typename U>
-  static char test(typename U::hasher*, typename U::reverse_iterator*);
-  template <typename U>
-  static int test(typename U::hasher*, ...);
-  template <typename U>
-  static char test(...);
-
- public:
-  static const bool value = sizeof(test<T>(nullptr, nullptr)) == sizeof(int);
-};
-
-template <typename T>
-const bool IsHashTable<T>::value;
-
-template <typename C,
-          bool = sizeof(IsContainerTest<C>(0)) == sizeof(IsContainer)>
-struct IsRecursiveContainerImpl;
-
-template <typename C>
-struct IsRecursiveContainerImpl<C, false> : public std::false_type {};
-
-// Since the IsRecursiveContainerImpl depends on the IsContainerTest we need to
-// obey the same inconsistencies as the IsContainerTest, namely check if
-// something is a container is relying on only const_iterator in C++11 and
-// is relying on both const_iterator and iterator otherwise
-template <typename C>
-struct IsRecursiveContainerImpl<C, true> {
-  using value_type = decltype(*std::declval<typename C::const_iterator>());
-  using type =
-      std::is_same<typename std::remove_const<
-                       typename std::remove_reference<value_type>::type>::type,
-                   C>;
-};
-
-// IsRecursiveContainer<Type> is a unary compile-time predicate that
-// evaluates whether C is a recursive container type. A recursive container
-// type is a container type whose value_type is equal to the container type
-// itself. An example for a recursive container type is
-// boost::filesystem::path, whose iterator has a value_type that is equal to
-// boost::filesystem::path.
-template <typename C>
-struct IsRecursiveContainer : public IsRecursiveContainerImpl<C>::type {};
-
-// Utilities for native arrays.
-
-// ArrayEq() compares two k-dimensional native arrays using the
-// elements' operator==, where k can be any integer >= 0.  When k is
-// 0, ArrayEq() degenerates into comparing a single pair of values.
-
-template <typename T, typename U>
-bool ArrayEq(const T* lhs, size_t size, const U* rhs);
-
-// This generic version is used when k is 0.
-template <typename T, typename U>
-inline bool ArrayEq(const T& lhs, const U& rhs) { return lhs == rhs; }
-
-// This overload is used when k >= 1.
-template <typename T, typename U, size_t N>
-inline bool ArrayEq(const T(&lhs)[N], const U(&rhs)[N]) {
-  return internal::ArrayEq(lhs, N, rhs);
-}
-
-// This helper reduces code bloat.  If we instead put its logic inside
-// the previous ArrayEq() function, arrays with different sizes would
-// lead to different copies of the template code.
-template <typename T, typename U>
-bool ArrayEq(const T* lhs, size_t size, const U* rhs) {
-  for (size_t i = 0; i != size; i++) {
-    if (!internal::ArrayEq(lhs[i], rhs[i]))
-      return false;
-  }
-  return true;
-}
-
-// Finds the first element in the iterator range [begin, end) that
-// equals elem.  Element may be a native array type itself.
-template <typename Iter, typename Element>
-Iter ArrayAwareFind(Iter begin, Iter end, const Element& elem) {
-  for (Iter it = begin; it != end; ++it) {
-    if (internal::ArrayEq(*it, elem))
-      return it;
-  }
-  return end;
-}
-
-// CopyArray() copies a k-dimensional native array using the elements'
-// operator=, where k can be any integer >= 0.  When k is 0,
-// CopyArray() degenerates into copying a single value.
-
-template <typename T, typename U>
-void CopyArray(const T* from, size_t size, U* to);
-
-// This generic version is used when k is 0.
-template <typename T, typename U>
-inline void CopyArray(const T& from, U* to) { *to = from; }
-
-// This overload is used when k >= 1.
-template <typename T, typename U, size_t N>
-inline void CopyArray(const T(&from)[N], U(*to)[N]) {
-  internal::CopyArray(from, N, *to);
-}
-
-// This helper reduces code bloat.  If we instead put its logic inside
-// the previous CopyArray() function, arrays with different sizes
-// would lead to different copies of the template code.
-template <typename T, typename U>
-void CopyArray(const T* from, size_t size, U* to) {
-  for (size_t i = 0; i != size; i++) {
-    internal::CopyArray(from[i], to + i);
-  }
-}
-
-// The relation between an NativeArray object (see below) and the
-// native array it represents.
-// We use 2 different structs to allow non-copyable types to be used, as long
-// as RelationToSourceReference() is passed.
-struct RelationToSourceReference {};
-struct RelationToSourceCopy {};
-
-// Adapts a native array to a read-only STL-style container.  Instead
-// of the complete STL container concept, this adaptor only implements
-// members useful for Google Mock's container matchers.  New members
-// should be added as needed.  To simplify the implementation, we only
-// support Element being a raw type (i.e. having no top-level const or
-// reference modifier).  It's the client's responsibility to satisfy
-// this requirement.  Element can be an array type itself (hence
-// multi-dimensional arrays are supported).
-template <typename Element>
-class NativeArray {
- public:
-  // STL-style container typedefs.
-  typedef Element value_type;
-  typedef Element* iterator;
-  typedef const Element* const_iterator;
-
-  // Constructs from a native array. References the source.
-  NativeArray(const Element* array, size_t count, RelationToSourceReference) {
-    InitRef(array, count);
-  }
-
-  // Constructs from a native array. Copies the source.
-  NativeArray(const Element* array, size_t count, RelationToSourceCopy) {
-    InitCopy(array, count);
-  }
-
-  // Copy constructor.
-  NativeArray(const NativeArray& rhs) {
-    (this->*rhs.clone_)(rhs.array_, rhs.size_);
-  }
-
-  ~NativeArray() {
-    if (clone_ != &NativeArray::InitRef)
-      delete[] array_;
-  }
-
-  // STL-style container methods.
-  size_t size() const { return size_; }
-  const_iterator begin() const { return array_; }
-  const_iterator end() const { return array_ + size_; }
-  bool operator==(const NativeArray& rhs) const {
-    return size() == rhs.size() &&
-        ArrayEq(begin(), size(), rhs.begin());
-  }
-
- private:
-  static_assert(!std::is_const<Element>::value, "Type must not be const");
-  static_assert(!std::is_reference<Element>::value,
-                "Type must not be a reference");
-
-  // Initializes this object with a copy of the input.
-  void InitCopy(const Element* array, size_t a_size) {
-    Element* const copy = new Element[a_size];
-    CopyArray(array, a_size, copy);
-    array_ = copy;
-    size_ = a_size;
-    clone_ = &NativeArray::InitCopy;
-  }
-
-  // Initializes this object with a reference of the input.
-  void InitRef(const Element* array, size_t a_size) {
-    array_ = array;
-    size_ = a_size;
-    clone_ = &NativeArray::InitRef;
-  }
-
-  const Element* array_;
-  size_t size_;
-  void (NativeArray::*clone_)(const Element*, size_t);
-
-  GTEST_DISALLOW_ASSIGN_(NativeArray);
-};
-
-// Backport of std::index_sequence.
-template <size_t... Is>
-struct IndexSequence {
-  using type = IndexSequence;
-};
-
-// Double the IndexSequence, and one if plus_one is true.
-template <bool plus_one, typename T, size_t sizeofT>
-struct DoubleSequence;
-template <size_t... I, size_t sizeofT>
-struct DoubleSequence<true, IndexSequence<I...>, sizeofT> {
-  using type = IndexSequence<I..., (sizeofT + I)..., 2 * sizeofT>;
-};
-template <size_t... I, size_t sizeofT>
-struct DoubleSequence<false, IndexSequence<I...>, sizeofT> {
-  using type = IndexSequence<I..., (sizeofT + I)...>;
-};
-
-// Backport of std::make_index_sequence.
-// It uses O(ln(N)) instantiation depth.
-template <size_t N>
-struct MakeIndexSequence
-    : DoubleSequence<N % 2 == 1, typename MakeIndexSequence<N / 2>::type,
-                     N / 2>::type {};
-
-template <>
-struct MakeIndexSequence<0> : IndexSequence<> {};
-
-// FIXME: This implementation of ElemFromList is O(1) in instantiation depth,
-// but it is O(N^2) in total instantiations. Not sure if this is the best
-// tradeoff, as it will make it somewhat slow to compile.
-template <typename T, size_t, size_t>
-struct ElemFromListImpl {};
-
-template <typename T, size_t I>
-struct ElemFromListImpl<T, I, I> {
-  using type = T;
-};
-
-// Get the Nth element from T...
-// It uses O(1) instantiation depth.
-template <size_t N, typename I, typename... T>
-struct ElemFromList;
-
-template <size_t N, size_t... I, typename... T>
-struct ElemFromList<N, IndexSequence<I...>, T...>
-    : ElemFromListImpl<T, N, I>... {};
-
-template <typename... T>
-class FlatTuple;
-
-template <typename Derived, size_t I>
-struct FlatTupleElemBase;
-
-template <typename... T, size_t I>
-struct FlatTupleElemBase<FlatTuple<T...>, I> {
-  using value_type =
-      typename ElemFromList<I, typename MakeIndexSequence<sizeof...(T)>::type,
-                            T...>::type;
-  FlatTupleElemBase() = default;
-  explicit FlatTupleElemBase(value_type t) : value(std::move(t)) {}
-  value_type value;
-};
-
-template <typename Derived, typename Idx>
-struct FlatTupleBase;
-
-template <size_t... Idx, typename... T>
-struct FlatTupleBase<FlatTuple<T...>, IndexSequence<Idx...>>
-    : FlatTupleElemBase<FlatTuple<T...>, Idx>... {
-  using Indices = IndexSequence<Idx...>;
-  FlatTupleBase() = default;
-  explicit FlatTupleBase(T... t)
-      : FlatTupleElemBase<FlatTuple<T...>, Idx>(std::move(t))... {}
-};
-
-// Analog to std::tuple but with different tradeoffs.
-// This class minimizes the template instantiation depth, thus allowing more
-// elements that std::tuple would. std::tuple has been seen to require an
-// instantiation depth of more than 10x the number of elements in some
-// implementations.
-// FlatTuple and ElemFromList are not recursive and have a fixed depth
-// regardless of T...
-// MakeIndexSequence, on the other hand, it is recursive but with an
-// instantiation depth of O(ln(N)).
-template <typename... T>
-class FlatTuple
-    : private FlatTupleBase<FlatTuple<T...>,
-                            typename MakeIndexSequence<sizeof...(T)>::type> {
-  using Indices = typename FlatTuple::FlatTupleBase::Indices;
-
- public:
-  FlatTuple() = default;
-  explicit FlatTuple(T... t) : FlatTuple::FlatTupleBase(std::move(t)...) {}
-
-  template <size_t I>
-  const typename ElemFromList<I, Indices, T...>::type& Get() const {
-    return static_cast<const FlatTupleElemBase<FlatTuple, I>*>(this)->value;
-  }
-
-  template <size_t I>
-  typename ElemFromList<I, Indices, T...>::type& Get() {
-    return static_cast<FlatTupleElemBase<FlatTuple, I>*>(this)->value;
-  }
-};
-
-// Utility functions to be called with static_assert to induce deprecation
-// warnings.
-GTEST_INTERNAL_DEPRECATED(
-    "INSTANTIATE_TEST_CASE_P is deprecated, please use "
-    "INSTANTIATE_TEST_SUITE_P")
-constexpr bool InstantiateTestCase_P_IsDeprecated() { return true; }
-
-GTEST_INTERNAL_DEPRECATED(
-    "TYPED_TEST_CASE_P is deprecated, please use "
-    "TYPED_TEST_SUITE_P")
-constexpr bool TypedTestCase_P_IsDeprecated() { return true; }
-
-GTEST_INTERNAL_DEPRECATED(
-    "TYPED_TEST_CASE is deprecated, please use "
-    "TYPED_TEST_SUITE")
-constexpr bool TypedTestCaseIsDeprecated() { return true; }
-
-GTEST_INTERNAL_DEPRECATED(
-    "REGISTER_TYPED_TEST_CASE_P is deprecated, please use "
-    "REGISTER_TYPED_TEST_SUITE_P")
-constexpr bool RegisterTypedTestCase_P_IsDeprecated() { return true; }
-
-GTEST_INTERNAL_DEPRECATED(
-    "INSTANTIATE_TYPED_TEST_CASE_P is deprecated, please use "
-    "INSTANTIATE_TYPED_TEST_SUITE_P")
-constexpr bool InstantiateTypedTestCase_P_IsDeprecated() { return true; }
-
-}  // namespace internal
-}  // namespace testing
-
-#define GTEST_MESSAGE_AT_(file, line, message, result_type) \
-  ::testing::internal::AssertHelper(result_type, file, line, message) \
-    = ::testing::Message()
-
-#define GTEST_MESSAGE_(message, result_type) \
-  GTEST_MESSAGE_AT_(__FILE__, __LINE__, message, result_type)
-
-#define GTEST_FATAL_FAILURE_(message) \
-  return GTEST_MESSAGE_(message, ::testing::TestPartResult::kFatalFailure)
-
-#define GTEST_NONFATAL_FAILURE_(message) \
-  GTEST_MESSAGE_(message, ::testing::TestPartResult::kNonFatalFailure)
-
-#define GTEST_SUCCESS_(message) \
-  GTEST_MESSAGE_(message, ::testing::TestPartResult::kSuccess)
-
-#define GTEST_SKIP_(message) \
-  return GTEST_MESSAGE_(message, ::testing::TestPartResult::kSkip)
-
-// Suppress MSVC warning 4072 (unreachable code) for the code following
-// statement if it returns or throws (or doesn't return or throw in some
-// situations).
-#define GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement) \
-  if (::testing::internal::AlwaysTrue()) { statement; }
-
-#define GTEST_TEST_THROW_(statement, expected_exception, fail) \
-  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
-  if (::testing::internal::ConstCharPtr gtest_msg = "") { \
-    bool gtest_caught_expected = false; \
-    try { \
-      GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
-    } \
-    catch (expected_exception const&) { \
-      gtest_caught_expected = true; \
-    } \
-    catch (...) { \
-      gtest_msg.value = \
-          "Expected: " #statement " throws an exception of type " \
-          #expected_exception ".\n  Actual: it throws a different type."; \
-      goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \
-    } \
-    if (!gtest_caught_expected) { \
-      gtest_msg.value = \
-          "Expected: " #statement " throws an exception of type " \
-          #expected_exception ".\n  Actual: it throws nothing."; \
-      goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \
-    } \
-  } else \
-    GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__): \
-      fail(gtest_msg.value)
-
-#define GTEST_TEST_NO_THROW_(statement, fail) \
-  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
-  if (::testing::internal::AlwaysTrue()) { \
-    try { \
-      GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
-    } \
-    catch (...) { \
-      goto GTEST_CONCAT_TOKEN_(gtest_label_testnothrow_, __LINE__); \
-    } \
-  } else \
-    GTEST_CONCAT_TOKEN_(gtest_label_testnothrow_, __LINE__): \
-      fail("Expected: " #statement " doesn't throw an exception.\n" \
-           "  Actual: it throws.")
-
-#define GTEST_TEST_ANY_THROW_(statement, fail) \
-  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
-  if (::testing::internal::AlwaysTrue()) { \
-    bool gtest_caught_any = false; \
-    try { \
-      GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
-    } \
-    catch (...) { \
-      gtest_caught_any = true; \
-    } \
-    if (!gtest_caught_any) { \
-      goto GTEST_CONCAT_TOKEN_(gtest_label_testanythrow_, __LINE__); \
-    } \
-  } else \
-    GTEST_CONCAT_TOKEN_(gtest_label_testanythrow_, __LINE__): \
-      fail("Expected: " #statement " throws an exception.\n" \
-           "  Actual: it doesn't.")
-
-
-// Implements Boolean test assertions such as EXPECT_TRUE. expression can be
-// either a boolean expression or an AssertionResult. text is a textual
-// represenation of expression as it was passed into the EXPECT_TRUE.
-#define GTEST_TEST_BOOLEAN_(expression, text, actual, expected, fail) \
-  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
-  if (const ::testing::AssertionResult gtest_ar_ = \
-      ::testing::AssertionResult(expression)) \
-    ; \
-  else \
-    fail(::testing::internal::GetBoolAssertionFailureMessage(\
-        gtest_ar_, text, #actual, #expected).c_str())
-
-#define GTEST_TEST_NO_FATAL_FAILURE_(statement, fail) \
-  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
-  if (::testing::internal::AlwaysTrue()) { \
-    ::testing::internal::HasNewFatalFailureHelper gtest_fatal_failure_checker; \
-    GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
-    if (gtest_fatal_failure_checker.has_new_fatal_failure()) { \
-      goto GTEST_CONCAT_TOKEN_(gtest_label_testnofatal_, __LINE__); \
-    } \
-  } else \
-    GTEST_CONCAT_TOKEN_(gtest_label_testnofatal_, __LINE__): \
-      fail("Expected: " #statement " doesn't generate new fatal " \
-           "failures in the current thread.\n" \
-           "  Actual: it does.")
-
-// Expands to the name of the class that implements the given test.
-#define GTEST_TEST_CLASS_NAME_(test_suite_name, test_name) \
-  test_suite_name##_##test_name##_Test
-
-// Helper macro for defining tests.
-#define GTEST_TEST_(test_suite_name, test_name, parent_class, parent_id)      \
-  static_assert(sizeof(GTEST_STRINGIFY_(test_suite_name)) > 1,                \
-                "test_suite_name must not be empty");                         \
-  static_assert(sizeof(GTEST_STRINGIFY_(test_name)) > 1,                      \
-                "test_name must not be empty");                               \
-  class GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)                    \
-      : public parent_class {                                                 \
-   public:                                                                    \
-    GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)() {}                   \
-                                                                              \
-   private:                                                                   \
-    virtual void TestBody();                                                  \
-    static ::testing::TestInfo* const test_info_ GTEST_ATTRIBUTE_UNUSED_;     \
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(GTEST_TEST_CLASS_NAME_(test_suite_name,   \
-                                                           test_name));       \
-  };                                                                          \
-                                                                              \
-  ::testing::TestInfo* const GTEST_TEST_CLASS_NAME_(test_suite_name,          \
-                                                    test_name)::test_info_ =  \
-      ::testing::internal::MakeAndRegisterTestInfo(                           \
-          #test_suite_name, #test_name, nullptr, nullptr,                     \
-          ::testing::internal::CodeLocation(__FILE__, __LINE__), (parent_id), \
-          ::testing::internal::SuiteApiResolver<                              \
-              parent_class>::GetSetUpCaseOrSuite(__FILE__, __LINE__),         \
-          ::testing::internal::SuiteApiResolver<                              \
-              parent_class>::GetTearDownCaseOrSuite(__FILE__, __LINE__),      \
-          new ::testing::internal::TestFactoryImpl<GTEST_TEST_CLASS_NAME_(    \
-              test_suite_name, test_name)>);                                  \
-  void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::TestBody()
-
-#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/gtest-param-util.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/gtest-param-util.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/gtest-param-util.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/gtest-param-util.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,883 +0,0 @@
-// Copyright 2008 Google Inc.
-// All Rights Reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Type and function utilities for implementing parameterized tests.
-
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_
-#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_
-
-#include <ctype.h>
-
-#include <cassert>
-#include <iterator>
-#include <memory>
-#include <set>
-#include <tuple>
-#include <utility>
-#include <vector>
-
-#include "gtest/internal/gtest-internal.h"
-#include "gtest/internal/gtest-port.h"
-#include "gtest/gtest-printers.h"
-
-namespace testing {
-// Input to a parameterized test name generator, describing a test parameter.
-// Consists of the parameter value and the integer parameter index.
-template <class ParamType>
-struct TestParamInfo {
-  TestParamInfo(const ParamType& a_param, size_t an_index) :
-    param(a_param),
-    index(an_index) {}
-  ParamType param;
-  size_t index;
-};
-
-// A builtin parameterized test name generator which returns the result of
-// testing::PrintToString.
-struct PrintToStringParamName {
-  template <class ParamType>
-  std::string operator()(const TestParamInfo<ParamType>& info) const {
-    return PrintToString(info.param);
-  }
-};
-
-namespace internal {
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-// Utility Functions
-
-// Outputs a message explaining invalid registration of different
-// fixture class for the same test suite. This may happen when
-// TEST_P macro is used to define two tests with the same name
-// but in different namespaces.
-GTEST_API_ void ReportInvalidTestSuiteType(const char* test_suite_name,
-                                           CodeLocation code_location);
-
-template <typename> class ParamGeneratorInterface;
-template <typename> class ParamGenerator;
-
-// Interface for iterating over elements provided by an implementation
-// of ParamGeneratorInterface<T>.
-template <typename T>
-class ParamIteratorInterface {
- public:
-  virtual ~ParamIteratorInterface() {}
-  // A pointer to the base generator instance.
-  // Used only for the purposes of iterator comparison
-  // to make sure that two iterators belong to the same generator.
-  virtual const ParamGeneratorInterface<T>* BaseGenerator() const = 0;
-  // Advances iterator to point to the next element
-  // provided by the generator. The caller is responsible
-  // for not calling Advance() on an iterator equal to
-  // BaseGenerator()->End().
-  virtual void Advance() = 0;
-  // Clones the iterator object. Used for implementing copy semantics
-  // of ParamIterator<T>.
-  virtual ParamIteratorInterface* Clone() const = 0;
-  // Dereferences the current iterator and provides (read-only) access
-  // to the pointed value. It is the caller's responsibility not to call
-  // Current() on an iterator equal to BaseGenerator()->End().
-  // Used for implementing ParamGenerator<T>::operator*().
-  virtual const T* Current() const = 0;
-  // Determines whether the given iterator and other point to the same
-  // element in the sequence generated by the generator.
-  // Used for implementing ParamGenerator<T>::operator==().
-  virtual bool Equals(const ParamIteratorInterface& other) const = 0;
-};
-
-// Class iterating over elements provided by an implementation of
-// ParamGeneratorInterface<T>. It wraps ParamIteratorInterface<T>
-// and implements the const forward iterator concept.
-template <typename T>
-class ParamIterator {
- public:
-  typedef T value_type;
-  typedef const T& reference;
-  typedef ptrdiff_t difference_type;
-
-  // ParamIterator assumes ownership of the impl_ pointer.
-  ParamIterator(const ParamIterator& other) : impl_(other.impl_->Clone()) {}
-  ParamIterator& operator=(const ParamIterator& other) {
-    if (this != &other)
-      impl_.reset(other.impl_->Clone());
-    return *this;
-  }
-
-  const T& operator*() const { return *impl_->Current(); }
-  const T* operator->() const { return impl_->Current(); }
-  // Prefix version of operator++.
-  ParamIterator& operator++() {
-    impl_->Advance();
-    return *this;
-  }
-  // Postfix version of operator++.
-  ParamIterator operator++(int /*unused*/) {
-    ParamIteratorInterface<T>* clone = impl_->Clone();
-    impl_->Advance();
-    return ParamIterator(clone);
-  }
-  bool operator==(const ParamIterator& other) const {
-    return impl_.get() == other.impl_.get() || impl_->Equals(*other.impl_);
-  }
-  bool operator!=(const ParamIterator& other) const {
-    return !(*this == other);
-  }
-
- private:
-  friend class ParamGenerator<T>;
-  explicit ParamIterator(ParamIteratorInterface<T>* impl) : impl_(impl) {}
-  std::unique_ptr<ParamIteratorInterface<T> > impl_;
-};
-
-// ParamGeneratorInterface<T> is the binary interface to access generators
-// defined in other translation units.
-template <typename T>
-class ParamGeneratorInterface {
- public:
-  typedef T ParamType;
-
-  virtual ~ParamGeneratorInterface() {}
-
-  // Generator interface definition
-  virtual ParamIteratorInterface<T>* Begin() const = 0;
-  virtual ParamIteratorInterface<T>* End() const = 0;
-};
-
-// Wraps ParamGeneratorInterface<T> and provides general generator syntax
-// compatible with the STL Container concept.
-// This class implements copy initialization semantics and the contained
-// ParamGeneratorInterface<T> instance is shared among all copies
-// of the original object. This is possible because that instance is immutable.
-template<typename T>
-class ParamGenerator {
- public:
-  typedef ParamIterator<T> iterator;
-
-  explicit ParamGenerator(ParamGeneratorInterface<T>* impl) : impl_(impl) {}
-  ParamGenerator(const ParamGenerator& other) : impl_(other.impl_) {}
-
-  ParamGenerator& operator=(const ParamGenerator& other) {
-    impl_ = other.impl_;
-    return *this;
-  }
-
-  iterator begin() const { return iterator(impl_->Begin()); }
-  iterator end() const { return iterator(impl_->End()); }
-
- private:
-  std::shared_ptr<const ParamGeneratorInterface<T> > impl_;
-};
-
-// Generates values from a range of two comparable values. Can be used to
-// generate sequences of user-defined types that implement operator+() and
-// operator<().
-// This class is used in the Range() function.
-template <typename T, typename IncrementT>
-class RangeGenerator : public ParamGeneratorInterface<T> {
- public:
-  RangeGenerator(T begin, T end, IncrementT step)
-      : begin_(begin), end_(end),
-        step_(step), end_index_(CalculateEndIndex(begin, end, step)) {}
-  ~RangeGenerator() override {}
-
-  ParamIteratorInterface<T>* Begin() const override {
-    return new Iterator(this, begin_, 0, step_);
-  }
-  ParamIteratorInterface<T>* End() const override {
-    return new Iterator(this, end_, end_index_, step_);
-  }
-
- private:
-  class Iterator : public ParamIteratorInterface<T> {
-   public:
-    Iterator(const ParamGeneratorInterface<T>* base, T value, int index,
-             IncrementT step)
-        : base_(base), value_(value), index_(index), step_(step) {}
-    ~Iterator() override {}
-
-    const ParamGeneratorInterface<T>* BaseGenerator() const override {
-      return base_;
-    }
-    void Advance() override {
-      value_ = static_cast<T>(value_ + step_);
-      index_++;
-    }
-    ParamIteratorInterface<T>* Clone() const override {
-      return new Iterator(*this);
-    }
-    const T* Current() const override { return &value_; }
-    bool Equals(const ParamIteratorInterface<T>& other) const override {
-      // Having the same base generator guarantees that the other
-      // iterator is of the same type and we can downcast.
-      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
-          << "The program attempted to compare iterators "
-          << "from different generators." << std::endl;
-      const int other_index =
-          CheckedDowncastToActualType<const Iterator>(&other)->index_;
-      return index_ == other_index;
-    }
-
-   private:
-    Iterator(const Iterator& other)
-        : ParamIteratorInterface<T>(),
-          base_(other.base_), value_(other.value_), index_(other.index_),
-          step_(other.step_) {}
-
-    // No implementation - assignment is unsupported.
-    void operator=(const Iterator& other);
-
-    const ParamGeneratorInterface<T>* const base_;
-    T value_;
-    int index_;
-    const IncrementT step_;
-  };  // class RangeGenerator::Iterator
-
-  static int CalculateEndIndex(const T& begin,
-                               const T& end,
-                               const IncrementT& step) {
-    int end_index = 0;
-    for (T i = begin; i < end; i = static_cast<T>(i + step))
-      end_index++;
-    return end_index;
-  }
-
-  // No implementation - assignment is unsupported.
-  void operator=(const RangeGenerator& other);
-
-  const T begin_;
-  const T end_;
-  const IncrementT step_;
-  // The index for the end() iterator. All the elements in the generated
-  // sequence are indexed (0-based) to aid iterator comparison.
-  const int end_index_;
-};  // class RangeGenerator
-
-
-// Generates values from a pair of STL-style iterators. Used in the
-// ValuesIn() function. The elements are copied from the source range
-// since the source can be located on the stack, and the generator
-// is likely to persist beyond that stack frame.
-template <typename T>
-class ValuesInIteratorRangeGenerator : public ParamGeneratorInterface<T> {
- public:
-  template <typename ForwardIterator>
-  ValuesInIteratorRangeGenerator(ForwardIterator begin, ForwardIterator end)
-      : container_(begin, end) {}
-  ~ValuesInIteratorRangeGenerator() override {}
-
-  ParamIteratorInterface<T>* Begin() const override {
-    return new Iterator(this, container_.begin());
-  }
-  ParamIteratorInterface<T>* End() const override {
-    return new Iterator(this, container_.end());
-  }
-
- private:
-  typedef typename ::std::vector<T> ContainerType;
-
-  class Iterator : public ParamIteratorInterface<T> {
-   public:
-    Iterator(const ParamGeneratorInterface<T>* base,
-             typename ContainerType::const_iterator iterator)
-        : base_(base), iterator_(iterator) {}
-    ~Iterator() override {}
-
-    const ParamGeneratorInterface<T>* BaseGenerator() const override {
-      return base_;
-    }
-    void Advance() override {
-      ++iterator_;
-      value_.reset();
-    }
-    ParamIteratorInterface<T>* Clone() const override {
-      return new Iterator(*this);
-    }
-    // We need to use cached value referenced by iterator_ because *iterator_
-    // can return a temporary object (and of type other then T), so just
-    // having "return &*iterator_;" doesn't work.
-    // value_ is updated here and not in Advance() because Advance()
-    // can advance iterator_ beyond the end of the range, and we cannot
-    // detect that fact. The client code, on the other hand, is
-    // responsible for not calling Current() on an out-of-range iterator.
-    const T* Current() const override {
-      if (value_.get() == nullptr) value_.reset(new T(*iterator_));
-      return value_.get();
-    }
-    bool Equals(const ParamIteratorInterface<T>& other) const override {
-      // Having the same base generator guarantees that the other
-      // iterator is of the same type and we can downcast.
-      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
-          << "The program attempted to compare iterators "
-          << "from different generators." << std::endl;
-      return iterator_ ==
-          CheckedDowncastToActualType<const Iterator>(&other)->iterator_;
-    }
-
-   private:
-    Iterator(const Iterator& other)
-          // The explicit constructor call suppresses a false warning
-          // emitted by gcc when supplied with the -Wextra option.
-        : ParamIteratorInterface<T>(),
-          base_(other.base_),
-          iterator_(other.iterator_) {}
-
-    const ParamGeneratorInterface<T>* const base_;
-    typename ContainerType::const_iterator iterator_;
-    // A cached value of *iterator_. We keep it here to allow access by
-    // pointer in the wrapping iterator's operator->().
-    // value_ needs to be mutable to be accessed in Current().
-    // Use of std::unique_ptr helps manage cached value's lifetime,
-    // which is bound by the lifespan of the iterator itself.
-    mutable std::unique_ptr<const T> value_;
-  };  // class ValuesInIteratorRangeGenerator::Iterator
-
-  // No implementation - assignment is unsupported.
-  void operator=(const ValuesInIteratorRangeGenerator& other);
-
-  const ContainerType container_;
-};  // class ValuesInIteratorRangeGenerator
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-//
-// Default parameterized test name generator, returns a string containing the
-// integer test parameter index.
-template <class ParamType>
-std::string DefaultParamName(const TestParamInfo<ParamType>& info) {
-  Message name_stream;
-  name_stream << info.index;
-  return name_stream.GetString();
-}
-
-template <typename T = int>
-void TestNotEmpty() {
-  static_assert(sizeof(T) == 0, "Empty arguments are not allowed.");
-}
-template <typename T = int>
-void TestNotEmpty(const T&) {}
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-//
-// Stores a parameter value and later creates tests parameterized with that
-// value.
-template <class TestClass>
-class ParameterizedTestFactory : public TestFactoryBase {
- public:
-  typedef typename TestClass::ParamType ParamType;
-  explicit ParameterizedTestFactory(ParamType parameter) :
-      parameter_(parameter) {}
-  Test* CreateTest() override {
-    TestClass::SetParam(&parameter_);
-    return new TestClass();
-  }
-
- private:
-  const ParamType parameter_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestFactory);
-};
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-//
-// TestMetaFactoryBase is a base class for meta-factories that create
-// test factories for passing into MakeAndRegisterTestInfo function.
-template <class ParamType>
-class TestMetaFactoryBase {
- public:
-  virtual ~TestMetaFactoryBase() {}
-
-  virtual TestFactoryBase* CreateTestFactory(ParamType parameter) = 0;
-};
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-//
-// TestMetaFactory creates test factories for passing into
-// MakeAndRegisterTestInfo function. Since MakeAndRegisterTestInfo receives
-// ownership of test factory pointer, same factory object cannot be passed
-// into that method twice. But ParameterizedTestSuiteInfo is going to call
-// it for each Test/Parameter value combination. Thus it needs meta factory
-// creator class.
-template <class TestSuite>
-class TestMetaFactory
-    : public TestMetaFactoryBase<typename TestSuite::ParamType> {
- public:
-  using ParamType = typename TestSuite::ParamType;
-
-  TestMetaFactory() {}
-
-  TestFactoryBase* CreateTestFactory(ParamType parameter) override {
-    return new ParameterizedTestFactory<TestSuite>(parameter);
-  }
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestMetaFactory);
-};
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-//
-// ParameterizedTestSuiteInfoBase is a generic interface
-// to ParameterizedTestSuiteInfo classes. ParameterizedTestSuiteInfoBase
-// accumulates test information provided by TEST_P macro invocations
-// and generators provided by INSTANTIATE_TEST_SUITE_P macro invocations
-// and uses that information to register all resulting test instances
-// in RegisterTests method. The ParameterizeTestSuiteRegistry class holds
-// a collection of pointers to the ParameterizedTestSuiteInfo objects
-// and calls RegisterTests() on each of them when asked.
-class ParameterizedTestSuiteInfoBase {
- public:
-  virtual ~ParameterizedTestSuiteInfoBase() {}
-
-  // Base part of test suite name for display purposes.
-  virtual const std::string& GetTestSuiteName() const = 0;
-  // Test case id to verify identity.
-  virtual TypeId GetTestSuiteTypeId() const = 0;
-  // UnitTest class invokes this method to register tests in this
-  // test suite right before running them in RUN_ALL_TESTS macro.
-  // This method should not be called more than once on any single
-  // instance of a ParameterizedTestSuiteInfoBase derived class.
-  virtual void RegisterTests() = 0;
-
- protected:
-  ParameterizedTestSuiteInfoBase() {}
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestSuiteInfoBase);
-};
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-//
-// ParameterizedTestSuiteInfo accumulates tests obtained from TEST_P
-// macro invocations for a particular test suite and generators
-// obtained from INSTANTIATE_TEST_SUITE_P macro invocations for that
-// test suite. It registers tests with all values generated by all
-// generators when asked.
-template <class TestSuite>
-class ParameterizedTestSuiteInfo : public ParameterizedTestSuiteInfoBase {
- public:
-  // ParamType and GeneratorCreationFunc are private types but are required
-  // for declarations of public methods AddTestPattern() and
-  // AddTestSuiteInstantiation().
-  using ParamType = typename TestSuite::ParamType;
-  // A function that returns an instance of appropriate generator type.
-  typedef ParamGenerator<ParamType>(GeneratorCreationFunc)();
-  using ParamNameGeneratorFunc = std::string(const TestParamInfo<ParamType>&);
-
-  explicit ParameterizedTestSuiteInfo(const char* name,
-                                      CodeLocation code_location)
-      : test_suite_name_(name), code_location_(code_location) {}
-
-  // Test case base name for display purposes.
-  const std::string& GetTestSuiteName() const override {
-    return test_suite_name_;
-  }
-  // Test case id to verify identity.
-  TypeId GetTestSuiteTypeId() const override { return GetTypeId<TestSuite>(); }
-  // TEST_P macro uses AddTestPattern() to record information
-  // about a single test in a LocalTestInfo structure.
-  // test_suite_name is the base name of the test suite (without invocation
-  // prefix). test_base_name is the name of an individual test without
-  // parameter index. For the test SequenceA/FooTest.DoBar/1 FooTest is
-  // test suite base name and DoBar is test base name.
-  void AddTestPattern(const char* test_suite_name, const char* test_base_name,
-                      TestMetaFactoryBase<ParamType>* meta_factory) {
-    tests_.push_back(std::shared_ptr<TestInfo>(
-        new TestInfo(test_suite_name, test_base_name, meta_factory)));
-  }
-  // INSTANTIATE_TEST_SUITE_P macro uses AddGenerator() to record information
-  // about a generator.
-  int AddTestSuiteInstantiation(const std::string& instantiation_name,
-                                GeneratorCreationFunc* func,
-                                ParamNameGeneratorFunc* name_func,
-                                const char* file, int line) {
-    instantiations_.push_back(
-        InstantiationInfo(instantiation_name, func, name_func, file, line));
-    return 0;  // Return value used only to run this method in namespace scope.
-  }
-  // UnitTest class invokes this method to register tests in this test suite
-  // test suites right before running tests in RUN_ALL_TESTS macro.
-  // This method should not be called more than once on any single
-  // instance of a ParameterizedTestSuiteInfoBase derived class.
-  // UnitTest has a guard to prevent from calling this method more than once.
-  void RegisterTests() override {
-    for (typename TestInfoContainer::iterator test_it = tests_.begin();
-         test_it != tests_.end(); ++test_it) {
-      std::shared_ptr<TestInfo> test_info = *test_it;
-      for (typename InstantiationContainer::iterator gen_it =
-               instantiations_.begin(); gen_it != instantiations_.end();
-               ++gen_it) {
-        const std::string& instantiation_name = gen_it->name;
-        ParamGenerator<ParamType> generator((*gen_it->generator)());
-        ParamNameGeneratorFunc* name_func = gen_it->name_func;
-        const char* file = gen_it->file;
-        int line = gen_it->line;
-
-        std::string test_suite_name;
-        if ( !instantiation_name.empty() )
-          test_suite_name = instantiation_name + "/";
-        test_suite_name += test_info->test_suite_base_name;
-
-        size_t i = 0;
-        std::set<std::string> test_param_names;
-        for (typename ParamGenerator<ParamType>::iterator param_it =
-                 generator.begin();
-             param_it != generator.end(); ++param_it, ++i) {
-          Message test_name_stream;
-
-          std::string param_name = name_func(
-              TestParamInfo<ParamType>(*param_it, i));
-
-          GTEST_CHECK_(IsValidParamName(param_name))
-              << "Parameterized test name '" << param_name
-              << "' is invalid, in " << file
-              << " line " << line << std::endl;
-
-          GTEST_CHECK_(test_param_names.count(param_name) == 0)
-              << "Duplicate parameterized test name '" << param_name
-              << "', in " << file << " line " << line << std::endl;
-
-          test_param_names.insert(param_name);
-
-          if (!test_info->test_base_name.empty()) {
-            test_name_stream << test_info->test_base_name << "/";
-          }
-          test_name_stream << param_name;
-          MakeAndRegisterTestInfo(
-              test_suite_name.c_str(), test_name_stream.GetString().c_str(),
-              nullptr,  // No type parameter.
-              PrintToString(*param_it).c_str(), code_location_,
-              GetTestSuiteTypeId(),
-              SuiteApiResolver<TestSuite>::GetSetUpCaseOrSuite(file, line),
-              SuiteApiResolver<TestSuite>::GetTearDownCaseOrSuite(file, line),
-              test_info->test_meta_factory->CreateTestFactory(*param_it));
-        }  // for param_it
-      }  // for gen_it
-    }  // for test_it
-  }    // RegisterTests
-
- private:
-  // LocalTestInfo structure keeps information about a single test registered
-  // with TEST_P macro.
-  struct TestInfo {
-    TestInfo(const char* a_test_suite_base_name, const char* a_test_base_name,
-             TestMetaFactoryBase<ParamType>* a_test_meta_factory)
-        : test_suite_base_name(a_test_suite_base_name),
-          test_base_name(a_test_base_name),
-          test_meta_factory(a_test_meta_factory) {}
-
-    const std::string test_suite_base_name;
-    const std::string test_base_name;
-    const std::unique_ptr<TestMetaFactoryBase<ParamType> > test_meta_factory;
-  };
-  using TestInfoContainer = ::std::vector<std::shared_ptr<TestInfo> >;
-  // Records data received from INSTANTIATE_TEST_SUITE_P macros:
-  //  <Instantiation name, Sequence generator creation function,
-  //     Name generator function, Source file, Source line>
-  struct InstantiationInfo {
-      InstantiationInfo(const std::string &name_in,
-                        GeneratorCreationFunc* generator_in,
-                        ParamNameGeneratorFunc* name_func_in,
-                        const char* file_in,
-                        int line_in)
-          : name(name_in),
-            generator(generator_in),
-            name_func(name_func_in),
-            file(file_in),
-            line(line_in) {}
-
-      std::string name;
-      GeneratorCreationFunc* generator;
-      ParamNameGeneratorFunc* name_func;
-      const char* file;
-      int line;
-  };
-  typedef ::std::vector<InstantiationInfo> InstantiationContainer;
-
-  static bool IsValidParamName(const std::string& name) {
-    // Check for empty string
-    if (name.empty())
-      return false;
-
-    // Check for invalid characters
-    for (std::string::size_type index = 0; index < name.size(); ++index) {
-      if (!isalnum(name[index]) && name[index] != '_')
-        return false;
-    }
-
-    return true;
-  }
-
-  const std::string test_suite_name_;
-  CodeLocation code_location_;
-  TestInfoContainer tests_;
-  InstantiationContainer instantiations_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestSuiteInfo);
-};  // class ParameterizedTestSuiteInfo
-
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-template <class TestCase>
-using ParameterizedTestCaseInfo = ParameterizedTestSuiteInfo<TestCase>;
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-//
-// ParameterizedTestSuiteRegistry contains a map of
-// ParameterizedTestSuiteInfoBase classes accessed by test suite names. TEST_P
-// and INSTANTIATE_TEST_SUITE_P macros use it to locate their corresponding
-// ParameterizedTestSuiteInfo descriptors.
-class ParameterizedTestSuiteRegistry {
- public:
-  ParameterizedTestSuiteRegistry() {}
-  ~ParameterizedTestSuiteRegistry() {
-    for (auto& test_suite_info : test_suite_infos_) {
-      delete test_suite_info;
-    }
-  }
-
-  // Looks up or creates and returns a structure containing information about
-  // tests and instantiations of a particular test suite.
-  template <class TestSuite>
-  ParameterizedTestSuiteInfo<TestSuite>* GetTestSuitePatternHolder(
-      const char* test_suite_name, CodeLocation code_location) {
-    ParameterizedTestSuiteInfo<TestSuite>* typed_test_info = nullptr;
-    for (auto& test_suite_info : test_suite_infos_) {
-      if (test_suite_info->GetTestSuiteName() == test_suite_name) {
-        if (test_suite_info->GetTestSuiteTypeId() != GetTypeId<TestSuite>()) {
-          // Complain about incorrect usage of Google Test facilities
-          // and terminate the program since we cannot guaranty correct
-          // test suite setup and tear-down in this case.
-          ReportInvalidTestSuiteType(test_suite_name, code_location);
-          posix::Abort();
-        } else {
-          // At this point we are sure that the object we found is of the same
-          // type we are looking for, so we downcast it to that type
-          // without further checks.
-          typed_test_info = CheckedDowncastToActualType<
-              ParameterizedTestSuiteInfo<TestSuite> >(test_suite_info);
-        }
-        break;
-      }
-    }
-    if (typed_test_info == nullptr) {
-      typed_test_info = new ParameterizedTestSuiteInfo<TestSuite>(
-          test_suite_name, code_location);
-      test_suite_infos_.push_back(typed_test_info);
-    }
-    return typed_test_info;
-  }
-  void RegisterTests() {
-    for (auto& test_suite_info : test_suite_infos_) {
-      test_suite_info->RegisterTests();
-    }
-  }
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  template <class TestCase>
-  ParameterizedTestCaseInfo<TestCase>* GetTestCasePatternHolder(
-      const char* test_case_name, CodeLocation code_location) {
-    return GetTestSuitePatternHolder<TestCase>(test_case_name, code_location);
-  }
-
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
- private:
-  using TestSuiteInfoContainer = ::std::vector<ParameterizedTestSuiteInfoBase*>;
-
-  TestSuiteInfoContainer test_suite_infos_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestSuiteRegistry);
-};
-
-}  // namespace internal
-
-// Forward declarations of ValuesIn(), which is implemented in
-// include/gtest/gtest-param-test.h.
-template <class Container>
-internal::ParamGenerator<typename Container::value_type> ValuesIn(
-    const Container& container);
-
-namespace internal {
-// Used in the Values() function to provide polymorphic capabilities.
-
-template <typename... Ts>
-class ValueArray {
- public:
-  ValueArray(Ts... v) : v_{std::move(v)...} {}
-
-  template <typename T>
-  operator ParamGenerator<T>() const {  // NOLINT
-    return ValuesIn(MakeVector<T>(MakeIndexSequence<sizeof...(Ts)>()));
-  }
-
- private:
-  template <typename T, size_t... I>
-  std::vector<T> MakeVector(IndexSequence<I...>) const {
-    return std::vector<T>{static_cast<T>(v_.template Get<I>())...};
-  }
-
-  FlatTuple<Ts...> v_;
-};
-
-template <typename... T>
-class CartesianProductGenerator
-    : public ParamGeneratorInterface<::std::tuple<T...>> {
- public:
-  typedef ::std::tuple<T...> ParamType;
-
-  CartesianProductGenerator(const std::tuple<ParamGenerator<T>...>& g)
-      : generators_(g) {}
-  ~CartesianProductGenerator() override {}
-
-  ParamIteratorInterface<ParamType>* Begin() const override {
-    return new Iterator(this, generators_, false);
-  }
-  ParamIteratorInterface<ParamType>* End() const override {
-    return new Iterator(this, generators_, true);
-  }
-
- private:
-  template <class I>
-  class IteratorImpl;
-  template <size_t... I>
-  class IteratorImpl<IndexSequence<I...>>
-      : public ParamIteratorInterface<ParamType> {
-   public:
-    IteratorImpl(const ParamGeneratorInterface<ParamType>* base,
-             const std::tuple<ParamGenerator<T>...>& generators, bool is_end)
-        : base_(base),
-          begin_(std::get<I>(generators).begin()...),
-          end_(std::get<I>(generators).end()...),
-          current_(is_end ? end_ : begin_) {
-      ComputeCurrentValue();
-    }
-    ~IteratorImpl() override {}
-
-    const ParamGeneratorInterface<ParamType>* BaseGenerator() const override {
-      return base_;
-    }
-    // Advance should not be called on beyond-of-range iterators
-    // so no component iterators must be beyond end of range, either.
-    void Advance() override {
-      assert(!AtEnd());
-      // Advance the last iterator.
-      ++std::get<sizeof...(T) - 1>(current_);
-      // if that reaches end, propagate that up.
-      AdvanceIfEnd<sizeof...(T) - 1>();
-      ComputeCurrentValue();
-    }
-    ParamIteratorInterface<ParamType>* Clone() const override {
-      return new IteratorImpl(*this);
-    }
-
-    const ParamType* Current() const override { return current_value_.get(); }
-
-    bool Equals(const ParamIteratorInterface<ParamType>& other) const override {
-      // Having the same base generator guarantees that the other
-      // iterator is of the same type and we can downcast.
-      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
-          << "The program attempted to compare iterators "
-          << "from different generators." << std::endl;
-      const IteratorImpl* typed_other =
-          CheckedDowncastToActualType<const IteratorImpl>(&other);
-
-      // We must report iterators equal if they both point beyond their
-      // respective ranges. That can happen in a variety of fashions,
-      // so we have to consult AtEnd().
-      if (AtEnd() && typed_other->AtEnd()) return true;
-
-      bool same = true;
-      bool dummy[] = {
-          (same = same && std::get<I>(current_) ==
-                              std::get<I>(typed_other->current_))...};
-      (void)dummy;
-      return same;
-    }
-
-   private:
-    template <size_t ThisI>
-    void AdvanceIfEnd() {
-      if (std::get<ThisI>(current_) != std::get<ThisI>(end_)) return;
-
-      bool last = ThisI == 0;
-      if (last) {
-        // We are done. Nothing else to propagate.
-        return;
-      }
-
-      constexpr size_t NextI = ThisI - (ThisI != 0);
-      std::get<ThisI>(current_) = std::get<ThisI>(begin_);
-      ++std::get<NextI>(current_);
-      AdvanceIfEnd<NextI>();
-    }
-
-    void ComputeCurrentValue() {
-      if (!AtEnd())
-        current_value_ = std::make_shared<ParamType>(*std::get<I>(current_)...);
-    }
-    bool AtEnd() const {
-      bool at_end = false;
-      bool dummy[] = {
-          (at_end = at_end || std::get<I>(current_) == std::get<I>(end_))...};
-      (void)dummy;
-      return at_end;
-    }
-
-    const ParamGeneratorInterface<ParamType>* const base_;
-    std::tuple<typename ParamGenerator<T>::iterator...> begin_;
-    std::tuple<typename ParamGenerator<T>::iterator...> end_;
-    std::tuple<typename ParamGenerator<T>::iterator...> current_;
-    std::shared_ptr<ParamType> current_value_;
-  };
-
-  using Iterator = IteratorImpl<typename MakeIndexSequence<sizeof...(T)>::type>;
-
-  std::tuple<ParamGenerator<T>...> generators_;
-};
-
-template <class... Gen>
-class CartesianProductHolder {
- public:
-  CartesianProductHolder(const Gen&... g) : generators_(g...) {}
-  template <typename... T>
-  operator ParamGenerator<::std::tuple<T...>>() const {
-    return ParamGenerator<::std::tuple<T...>>(
-        new CartesianProductGenerator<T...>(generators_));
-  }
-
- private:
-  std::tuple<Gen...> generators_;
-};
-
-}  // namespace internal
-}  // namespace testing
-
-#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/gtest-port-arch.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/gtest-port-arch.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/gtest-port-arch.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/gtest-port-arch.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,107 +0,0 @@
-// Copyright 2015, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// The Google C++ Testing and Mocking Framework (Google Test)
-//
-// This header file defines the GTEST_OS_* macro.
-// It is separate from gtest-port.h so that custom/gtest-port.h can include it.
-
-#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_ARCH_H_
-#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_ARCH_H_
-
-// Determines the platform on which Google Test is compiled.
-#ifdef __CYGWIN__
-# define GTEST_OS_CYGWIN 1
-# elif defined(__MINGW__) || defined(__MINGW32__) || defined(__MINGW64__)
-#  define GTEST_OS_WINDOWS_MINGW 1
-#  define GTEST_OS_WINDOWS 1
-#elif defined _WIN32
-# define GTEST_OS_WINDOWS 1
-# ifdef _WIN32_WCE
-#  define GTEST_OS_WINDOWS_MOBILE 1
-# elif defined(WINAPI_FAMILY)
-#  include <winapifamily.h>
-#  if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
-#   define GTEST_OS_WINDOWS_DESKTOP 1
-#  elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_PHONE_APP)
-#   define GTEST_OS_WINDOWS_PHONE 1
-#  elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
-#   define GTEST_OS_WINDOWS_RT 1
-#  elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_TV_TITLE)
-#   define GTEST_OS_WINDOWS_PHONE 1
-#   define GTEST_OS_WINDOWS_TV_TITLE 1
-#  else
-    // WINAPI_FAMILY defined but no known partition matched.
-    // Default to desktop.
-#   define GTEST_OS_WINDOWS_DESKTOP 1
-#  endif
-# else
-#  define GTEST_OS_WINDOWS_DESKTOP 1
-# endif  // _WIN32_WCE
-#elif defined __OS2__
-# define GTEST_OS_OS2 1
-#elif defined __APPLE__
-# define GTEST_OS_MAC 1
-# if TARGET_OS_IPHONE
-#  define GTEST_OS_IOS 1
-# endif
-#elif defined __DragonFly__
-# define GTEST_OS_DRAGONFLY 1
-#elif defined __FreeBSD__
-# define GTEST_OS_FREEBSD 1
-#elif defined __Fuchsia__
-# define GTEST_OS_FUCHSIA 1
-#elif defined(__GLIBC__) && defined(__FreeBSD_kernel__)
-# define GTEST_OS_GNU_KFREEBSD 1
-#elif defined __linux__
-# define GTEST_OS_LINUX 1
-# if defined __ANDROID__
-#  define GTEST_OS_LINUX_ANDROID 1
-# endif
-#elif defined __MVS__
-# define GTEST_OS_ZOS 1
-#elif defined(__sun) && defined(__SVR4)
-# define GTEST_OS_SOLARIS 1
-#elif defined(_AIX)
-# define GTEST_OS_AIX 1
-#elif defined(__hpux)
-# define GTEST_OS_HPUX 1
-#elif defined __native_client__
-# define GTEST_OS_NACL 1
-#elif defined __NetBSD__
-# define GTEST_OS_NETBSD 1
-#elif defined __OpenBSD__
-# define GTEST_OS_OPENBSD 1
-#elif defined __QNX__
-# define GTEST_OS_QNX 1
-#elif defined(__HAIKU__)
-#define GTEST_OS_HAIKU 1
-#endif  // __CYGWIN__
-
-#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_ARCH_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/gtest-port.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/gtest-port.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/gtest-port.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/gtest-port.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,2231 +0,0 @@
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Low-level types and utilities for porting Google Test to various
-// platforms.  All macros ending with _ and symbols defined in an
-// internal namespace are subject to change without notice.  Code
-// outside Google Test MUST NOT USE THEM DIRECTLY.  Macros that don't
-// end with _ are part of Google Test's public API and can be used by
-// code outside Google Test.
-//
-// This file is fundamental to Google Test.  All other Google Test source
-// files are expected to #include this.  Therefore, it cannot #include
-// any other Google Test header.
-
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
-#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
-
-// Environment-describing macros
-// -----------------------------
-//
-// Google Test can be used in many different environments.  Macros in
-// this section tell Google Test what kind of environment it is being
-// used in, such that Google Test can provide environment-specific
-// features and implementations.
-//
-// Google Test tries to automatically detect the properties of its
-// environment, so users usually don't need to worry about these
-// macros.  However, the automatic detection is not perfect.
-// Sometimes it's necessary for a user to define some of the following
-// macros in the build script to override Google Test's decisions.
-//
-// If the user doesn't define a macro in the list, Google Test will
-// provide a default definition.  After this header is #included, all
-// macros in this list will be defined to either 1 or 0.
-//
-// Notes to maintainers:
-//   - Each macro here is a user-tweakable knob; do not grow the list
-//     lightly.
-//   - Use #if to key off these macros.  Don't use #ifdef or "#if
-//     defined(...)", which will not work as these macros are ALWAYS
-//     defined.
-//
-//   GTEST_HAS_CLONE          - Define it to 1/0 to indicate that clone(2)
-//                              is/isn't available.
-//   GTEST_HAS_EXCEPTIONS     - Define it to 1/0 to indicate that exceptions
-//                              are enabled.
-//   GTEST_HAS_POSIX_RE       - Define it to 1/0 to indicate that POSIX regular
-//                              expressions are/aren't available.
-//   GTEST_HAS_PTHREAD        - Define it to 1/0 to indicate that <pthread.h>
-//                              is/isn't available.
-//   GTEST_HAS_RTTI           - Define it to 1/0 to indicate that RTTI is/isn't
-//                              enabled.
-//   GTEST_HAS_STD_WSTRING    - Define it to 1/0 to indicate that
-//                              std::wstring does/doesn't work (Google Test can
-//                              be used where std::wstring is unavailable).
-//   GTEST_HAS_SEH            - Define it to 1/0 to indicate whether the
-//                              compiler supports Microsoft's "Structured
-//                              Exception Handling".
-//   GTEST_HAS_STREAM_REDIRECTION
-//                            - Define it to 1/0 to indicate whether the
-//                              platform supports I/O stream redirection using
-//                              dup() and dup2().
-//   GTEST_LINKED_AS_SHARED_LIBRARY
-//                            - Define to 1 when compiling tests that use
-//                              Google Test as a shared library (known as
-//                              DLL on Windows).
-//   GTEST_CREATE_SHARED_LIBRARY
-//                            - Define to 1 when compiling Google Test itself
-//                              as a shared library.
-//   GTEST_DEFAULT_DEATH_TEST_STYLE
-//                            - The default value of --gtest_death_test_style.
-//                              The legacy default has been "fast" in the open
-//                              source version since 2008. The recommended value
-//                              is "threadsafe", and can be set in
-//                              custom/gtest-port.h.
-
-// Platform-indicating macros
-// --------------------------
-//
-// Macros indicating the platform on which Google Test is being used
-// (a macro is defined to 1 if compiled on the given platform;
-// otherwise UNDEFINED -- it's never defined to 0.).  Google Test
-// defines these macros automatically.  Code outside Google Test MUST
-// NOT define them.
-//
-//   GTEST_OS_AIX      - IBM AIX
-//   GTEST_OS_CYGWIN   - Cygwin
-//   GTEST_OS_DRAGONFLY - DragonFlyBSD
-//   GTEST_OS_FREEBSD  - FreeBSD
-//   GTEST_OS_FUCHSIA  - Fuchsia
-//   GTEST_OS_GNU_KFREEBSD - GNU/kFreeBSD
-//   GTEST_OS_HAIKU    - Haiku
-//   GTEST_OS_HPUX     - HP-UX
-//   GTEST_OS_LINUX    - Linux
-//     GTEST_OS_LINUX_ANDROID - Google Android
-//   GTEST_OS_MAC      - Mac OS X
-//     GTEST_OS_IOS    - iOS
-//   GTEST_OS_NACL     - Google Native Client (NaCl)
-//   GTEST_OS_NETBSD   - NetBSD
-//   GTEST_OS_OPENBSD  - OpenBSD
-//   GTEST_OS_OS2      - OS/2
-//   GTEST_OS_QNX      - QNX
-//   GTEST_OS_SOLARIS  - Sun Solaris
-//   GTEST_OS_WINDOWS  - Windows (Desktop, MinGW, or Mobile)
-//     GTEST_OS_WINDOWS_DESKTOP  - Windows Desktop
-//     GTEST_OS_WINDOWS_MINGW    - MinGW
-//     GTEST_OS_WINDOWS_MOBILE   - Windows Mobile
-//     GTEST_OS_WINDOWS_PHONE    - Windows Phone
-//     GTEST_OS_WINDOWS_RT       - Windows Store App/WinRT
-//   GTEST_OS_ZOS      - z/OS
-//
-// Among the platforms, Cygwin, Linux, Mac OS X, and Windows have the
-// most stable support.  Since core members of the Google Test project
-// don't have access to other platforms, support for them may be less
-// stable.  If you notice any problems on your platform, please notify
-// googletestframework@googlegroups.com (patches for fixing them are
-// even more welcome!).
-//
-// It is possible that none of the GTEST_OS_* macros are defined.
-
-// Feature-indicating macros
-// -------------------------
-//
-// Macros indicating which Google Test features are available (a macro
-// is defined to 1 if the corresponding feature is supported;
-// otherwise UNDEFINED -- it's never defined to 0.).  Google Test
-// defines these macros automatically.  Code outside Google Test MUST
-// NOT define them.
-//
-// These macros are public so that portable tests can be written.
-// Such tests typically surround code using a feature with an #if
-// which controls that code.  For example:
-//
-// #if GTEST_HAS_DEATH_TEST
-//   EXPECT_DEATH(DoSomethingDeadly());
-// #endif
-//
-//   GTEST_HAS_DEATH_TEST   - death tests
-//   GTEST_HAS_TYPED_TEST   - typed tests
-//   GTEST_HAS_TYPED_TEST_P - type-parameterized tests
-//   GTEST_IS_THREADSAFE    - Google Test is thread-safe.
-//   GOOGLETEST_CM0007 DO NOT DELETE
-//   GTEST_USES_POSIX_RE    - enhanced POSIX regex is used. Do not confuse with
-//                            GTEST_HAS_POSIX_RE (see above) which users can
-//                            define themselves.
-//   GTEST_USES_SIMPLE_RE   - our own simple regex is used;
-//                            the above RE\b(s) are mutually exclusive.
-
-// Misc public macros
-// ------------------
-//
-//   GTEST_FLAG(flag_name)  - references the variable corresponding to
-//                            the given Google Test flag.
-
-// Internal utilities
-// ------------------
-//
-// The following macros and utilities are for Google Test's INTERNAL
-// use only.  Code outside Google Test MUST NOT USE THEM DIRECTLY.
-//
-// Macros for basic C++ coding:
-//   GTEST_AMBIGUOUS_ELSE_BLOCKER_ - for disabling a gcc warning.
-//   GTEST_ATTRIBUTE_UNUSED_  - declares that a class' instances or a
-//                              variable don't have to be used.
-//   GTEST_DISALLOW_ASSIGN_   - disables operator=.
-//   GTEST_DISALLOW_COPY_AND_ASSIGN_ - disables copy ctor and operator=.
-//   GTEST_MUST_USE_RESULT_   - declares that a function's result must be used.
-//   GTEST_INTENTIONAL_CONST_COND_PUSH_ - start code section where MSVC C4127 is
-//                                        suppressed (constant conditional).
-//   GTEST_INTENTIONAL_CONST_COND_POP_  - finish code section where MSVC C4127
-//                                        is suppressed.
-//
-// Synchronization:
-//   Mutex, MutexLock, ThreadLocal, GetThreadCount()
-//                            - synchronization primitives.
-//
-// Regular expressions:
-//   RE             - a simple regular expression class using the POSIX
-//                    Extended Regular Expression syntax on UNIX-like platforms
-//                    GOOGLETEST_CM0008 DO NOT DELETE
-//                    or a reduced regular exception syntax on other
-//                    platforms, including Windows.
-// Logging:
-//   GTEST_LOG_()   - logs messages at the specified severity level.
-//   LogToStderr()  - directs all log messages to stderr.
-//   FlushInfoLog() - flushes informational log messages.
-//
-// Stdout and stderr capturing:
-//   CaptureStdout()     - starts capturing stdout.
-//   GetCapturedStdout() - stops capturing stdout and returns the captured
-//                         string.
-//   CaptureStderr()     - starts capturing stderr.
-//   GetCapturedStderr() - stops capturing stderr and returns the captured
-//                         string.
-//
-// Integer types:
-//   TypeWithSize   - maps an integer to a int type.
-//   Int32, UInt32, Int64, UInt64, TimeInMillis
-//                  - integers of known sizes.
-//   BiggestInt     - the biggest signed integer type.
-//
-// Command-line utilities:
-//   GTEST_DECLARE_*()  - declares a flag.
-//   GTEST_DEFINE_*()   - defines a flag.
-//   GetInjectableArgvs() - returns the command line as a vector of strings.
-//
-// Environment variable utilities:
-//   GetEnv()             - gets the value of an environment variable.
-//   BoolFromGTestEnv()   - parses a bool environment variable.
-//   Int32FromGTestEnv()  - parses an Int32 environment variable.
-//   StringFromGTestEnv() - parses a string environment variable.
-//
-// Deprecation warnings:
-//   GTEST_INTERNAL_DEPRECATED(message) - attribute marking a function as
-//                                        deprecated; calling a marked function
-//                                        should generate a compiler warning
-
-#include <ctype.h>   // for isspace, etc
-#include <stddef.h>  // for ptrdiff_t
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <memory>
-#include <type_traits>
-
-#ifndef _WIN32_WCE
-# include <sys/types.h>
-# include <sys/stat.h>
-#endif  // !_WIN32_WCE
-
-#if defined __APPLE__
-# include <AvailabilityMacros.h>
-# include <TargetConditionals.h>
-#endif
-
-#include <algorithm>  // NOLINT
-#include <iostream>   // NOLINT
-#include <sstream>    // NOLINT
-#include <string>     // NOLINT
-#include <tuple>
-#include <utility>
-#include <vector>  // NOLINT
-
-#include "gtest/internal/gtest-port-arch.h"
-#include "gtest/internal/custom/gtest-port.h"
-
-#if !defined(GTEST_DEV_EMAIL_)
-# define GTEST_DEV_EMAIL_ "googletestframework@@googlegroups.com"
-# define GTEST_FLAG_PREFIX_ "gtest_"
-# define GTEST_FLAG_PREFIX_DASH_ "gtest-"
-# define GTEST_FLAG_PREFIX_UPPER_ "GTEST_"
-# define GTEST_NAME_ "Google Test"
-# define GTEST_PROJECT_URL_ "https://github.com/google/googletest/"
-#endif  // !defined(GTEST_DEV_EMAIL_)
-
-#if !defined(GTEST_INIT_GOOGLE_TEST_NAME_)
-# define GTEST_INIT_GOOGLE_TEST_NAME_ "testing::InitGoogleTest"
-#endif  // !defined(GTEST_INIT_GOOGLE_TEST_NAME_)
-
-// Determines the version of gcc that is used to compile this.
-#ifdef __GNUC__
-// 40302 means version 4.3.2.
-# define GTEST_GCC_VER_ \
-    (__GNUC__*10000 + __GNUC_MINOR__*100 + __GNUC_PATCHLEVEL__)
-#endif  // __GNUC__
-
-// Macros for disabling Microsoft Visual C++ warnings.
-//
-//   GTEST_DISABLE_MSC_WARNINGS_PUSH_(4800 4385)
-//   /* code that triggers warnings C4800 and C4385 */
-//   GTEST_DISABLE_MSC_WARNINGS_POP_()
-#if defined(_MSC_VER)
-# define GTEST_DISABLE_MSC_WARNINGS_PUSH_(warnings) \
-    __pragma(warning(push))                        \
-    __pragma(warning(disable: warnings))
-# define GTEST_DISABLE_MSC_WARNINGS_POP_()          \
-    __pragma(warning(pop))
-#else
-// Not all compilers are MSVC
-# define GTEST_DISABLE_MSC_WARNINGS_PUSH_(warnings)
-# define GTEST_DISABLE_MSC_WARNINGS_POP_()
-#endif
-
-// Clang on Windows does not understand MSVC's pragma warning.
-// We need clang-specific way to disable function deprecation warning.
-#ifdef __clang__
-# define GTEST_DISABLE_MSC_DEPRECATED_PUSH_()                         \
-    _Pragma("clang diagnostic push")                                  \
-    _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"") \
-    _Pragma("clang diagnostic ignored \"-Wdeprecated-implementations\"")
-#define GTEST_DISABLE_MSC_DEPRECATED_POP_() \
-    _Pragma("clang diagnostic pop")
-#else
-# define GTEST_DISABLE_MSC_DEPRECATED_PUSH_() \
-    GTEST_DISABLE_MSC_WARNINGS_PUSH_(4996)
-# define GTEST_DISABLE_MSC_DEPRECATED_POP_() \
-    GTEST_DISABLE_MSC_WARNINGS_POP_()
-#endif
-
-// Brings in definitions for functions used in the testing::internal::posix
-// namespace (read, write, close, chdir, isatty, stat). We do not currently
-// use them on Windows Mobile.
-#if GTEST_OS_WINDOWS
-# if !GTEST_OS_WINDOWS_MOBILE
-#  include <direct.h>
-#  include <io.h>
-# endif
-// In order to avoid having to include <windows.h>, use forward declaration
-#if GTEST_OS_WINDOWS_MINGW && !defined(__MINGW64_VERSION_MAJOR)
-// MinGW defined _CRITICAL_SECTION and _RTL_CRITICAL_SECTION as two
-// separate (equivalent) structs, instead of using typedef
-typedef struct _CRITICAL_SECTION GTEST_CRITICAL_SECTION;
-#else
-// Assume CRITICAL_SECTION is a typedef of _RTL_CRITICAL_SECTION.
-// This assumption is verified by
-// WindowsTypesTest.CRITICAL_SECTIONIs_RTL_CRITICAL_SECTION.
-typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
-#endif
-#else
-// This assumes that non-Windows OSes provide unistd.h. For OSes where this
-// is not the case, we need to include headers that provide the functions
-// mentioned above.
-# include <unistd.h>
-# include <strings.h>
-#endif  // GTEST_OS_WINDOWS
-
-#if GTEST_OS_LINUX_ANDROID
-// Used to define __ANDROID_API__ matching the target NDK API level.
-#  include <android/api-level.h>  // NOLINT
-#endif
-
-// Defines this to true if and only if Google Test can use POSIX regular
-// expressions.
-#ifndef GTEST_HAS_POSIX_RE
-# if GTEST_OS_LINUX_ANDROID
-// On Android, <regex.h> is only available starting with Gingerbread.
-#  define GTEST_HAS_POSIX_RE (__ANDROID_API__ >= 9)
-# else
-#  define GTEST_HAS_POSIX_RE (!GTEST_OS_WINDOWS)
-# endif
-#endif
-
-#if GTEST_USES_PCRE
-// The appropriate headers have already been included.
-
-#elif GTEST_HAS_POSIX_RE
-
-// On some platforms, <regex.h> needs someone to define size_t, and
-// won't compile otherwise.  We can #include it here as we already
-// included <stdlib.h>, which is guaranteed to define size_t through
-// <stddef.h>.
-# include <regex.h>  // NOLINT
-
-# define GTEST_USES_POSIX_RE 1
-
-#elif GTEST_OS_WINDOWS
-
-// <regex.h> is not available on Windows.  Use our own simple regex
-// implementation instead.
-# define GTEST_USES_SIMPLE_RE 1
-
-#else
-
-// <regex.h> may not be available on this platform.  Use our own
-// simple regex implementation instead.
-# define GTEST_USES_SIMPLE_RE 1
-
-#endif  // GTEST_USES_PCRE
-
-#ifndef GTEST_HAS_EXCEPTIONS
-// The user didn't tell us whether exceptions are enabled, so we need
-// to figure it out.
-# if defined(_MSC_VER) && defined(_CPPUNWIND)
-// MSVC defines _CPPUNWIND to 1 if and only if exceptions are enabled.
-#  define GTEST_HAS_EXCEPTIONS 1
-# elif defined(__BORLANDC__)
-// C++Builder's implementation of the STL uses the _HAS_EXCEPTIONS
-// macro to enable exceptions, so we'll do the same.
-// Assumes that exceptions are enabled by default.
-#  ifndef _HAS_EXCEPTIONS
-#   define _HAS_EXCEPTIONS 1
-#  endif  // _HAS_EXCEPTIONS
-#  define GTEST_HAS_EXCEPTIONS _HAS_EXCEPTIONS
-# elif defined(__clang__)
-// clang defines __EXCEPTIONS if and only if exceptions are enabled before clang
-// 220714, but if and only if cleanups are enabled after that. In Obj-C++ files,
-// there can be cleanups for ObjC exceptions which also need cleanups, even if
-// C++ exceptions are disabled. clang has __has_feature(cxx_exceptions) which
-// checks for C++ exceptions starting at clang r206352, but which checked for
-// cleanups prior to that. To reliably check for C++ exception availability with
-// clang, check for
-// __EXCEPTIONS && __has_feature(cxx_exceptions).
-#  define GTEST_HAS_EXCEPTIONS (__EXCEPTIONS && __has_feature(cxx_exceptions))
-# elif defined(__GNUC__) && __EXCEPTIONS
-// gcc defines __EXCEPTIONS to 1 if and only if exceptions are enabled.
-#  define GTEST_HAS_EXCEPTIONS 1
-# elif defined(__SUNPRO_CC)
-// Sun Pro CC supports exceptions.  However, there is no compile-time way of
-// detecting whether they are enabled or not.  Therefore, we assume that
-// they are enabled unless the user tells us otherwise.
-#  define GTEST_HAS_EXCEPTIONS 1
-# elif defined(__IBMCPP__) && __EXCEPTIONS
-// xlC defines __EXCEPTIONS to 1 if and only if exceptions are enabled.
-#  define GTEST_HAS_EXCEPTIONS 1
-# elif defined(__HP_aCC)
-// Exception handling is in effect by default in HP aCC compiler. It has to
-// be turned of by +noeh compiler option if desired.
-#  define GTEST_HAS_EXCEPTIONS 1
-# else
-// For other compilers, we assume exceptions are disabled to be
-// conservative.
-#  define GTEST_HAS_EXCEPTIONS 0
-# endif  // defined(_MSC_VER) || defined(__BORLANDC__)
-#endif  // GTEST_HAS_EXCEPTIONS
-
-#if !defined(GTEST_HAS_STD_STRING)
-// Even though we don't use this macro any longer, we keep it in case
-// some clients still depend on it.
-# define GTEST_HAS_STD_STRING 1
-#elif !GTEST_HAS_STD_STRING
-// The user told us that ::std::string isn't available.
-# error "::std::string isn't available."
-#endif  // !defined(GTEST_HAS_STD_STRING)
-
-#ifndef GTEST_HAS_STD_WSTRING
-// The user didn't tell us whether ::std::wstring is available, so we need
-// to figure it out.
-// Cygwin 1.7 and below doesn't support ::std::wstring.
-// Solaris' libc++ doesn't support it either.  Android has
-// no support for it at least as recent as Froyo (2.2).
-#define GTEST_HAS_STD_WSTRING                                         \
-  (!(GTEST_OS_LINUX_ANDROID || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \
-     GTEST_OS_HAIKU))
-
-#endif  // GTEST_HAS_STD_WSTRING
-
-// Determines whether RTTI is available.
-#ifndef GTEST_HAS_RTTI
-// The user didn't tell us whether RTTI is enabled, so we need to
-// figure it out.
-
-# ifdef _MSC_VER
-
-#ifdef _CPPRTTI  // MSVC defines this macro if and only if RTTI is enabled.
-#   define GTEST_HAS_RTTI 1
-#  else
-#   define GTEST_HAS_RTTI 0
-#  endif
-
-// Starting with version 4.3.2, gcc defines __GXX_RTTI if and only if RTTI is
-// enabled.
-# elif defined(__GNUC__)
-
-#  ifdef __GXX_RTTI
-// When building against STLport with the Android NDK and with
-// -frtti -fno-exceptions, the build fails at link time with undefined
-// references to __cxa_bad_typeid. Note sure if STL or toolchain bug,
-// so disable RTTI when detected.
-#   if GTEST_OS_LINUX_ANDROID && defined(_STLPORT_MAJOR) && \
-       !defined(__EXCEPTIONS)
-#    define GTEST_HAS_RTTI 0
-#   else
-#    define GTEST_HAS_RTTI 1
-#   endif  // GTEST_OS_LINUX_ANDROID && __STLPORT_MAJOR && !__EXCEPTIONS
-#  else
-#   define GTEST_HAS_RTTI 0
-#  endif  // __GXX_RTTI
-
-// Clang defines __GXX_RTTI starting with version 3.0, but its manual recommends
-// using has_feature instead. has_feature(cxx_rtti) is supported since 2.7, the
-// first version with C++ support.
-# elif defined(__clang__)
-
-#  define GTEST_HAS_RTTI __has_feature(cxx_rtti)
-
-// Starting with version 9.0 IBM Visual Age defines __RTTI_ALL__ to 1 if
-// both the typeid and dynamic_cast features are present.
-# elif defined(__IBMCPP__) && (__IBMCPP__ >= 900)
-
-#  ifdef __RTTI_ALL__
-#   define GTEST_HAS_RTTI 1
-#  else
-#   define GTEST_HAS_RTTI 0
-#  endif
-
-# else
-
-// For all other compilers, we assume RTTI is enabled.
-#  define GTEST_HAS_RTTI 1
-
-# endif  // _MSC_VER
-
-#endif  // GTEST_HAS_RTTI
-
-// It's this header's responsibility to #include <typeinfo> when RTTI
-// is enabled.
-#if GTEST_HAS_RTTI
-# include <typeinfo>
-#endif
-
-// Determines whether Google Test can use the pthreads library.
-#ifndef GTEST_HAS_PTHREAD
-// The user didn't tell us explicitly, so we make reasonable assumptions about
-// which platforms have pthreads support.
-//
-// To disable threading support in Google Test, add -DGTEST_HAS_PTHREAD=0
-// to your compiler flags.
-#define GTEST_HAS_PTHREAD                                                      \
-  (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_HPUX || GTEST_OS_QNX ||          \
-   GTEST_OS_FREEBSD || GTEST_OS_NACL || GTEST_OS_NETBSD || GTEST_OS_FUCHSIA || \
-   GTEST_OS_DRAGONFLY || GTEST_OS_GNU_KFREEBSD || GTEST_OS_OPENBSD ||          \
-   GTEST_OS_HAIKU)
-#endif  // GTEST_HAS_PTHREAD
-
-#if GTEST_HAS_PTHREAD
-// gtest-port.h guarantees to #include <pthread.h> when GTEST_HAS_PTHREAD is
-// true.
-# include <pthread.h>  // NOLINT
-
-// For timespec and nanosleep, used below.
-# include <time.h>  // NOLINT
-#endif
-
-// Determines whether clone(2) is supported.
-// Usually it will only be available on Linux, excluding
-// Linux on the Itanium architecture.
-// Also see http://linux.die.net/man/2/clone.
-#ifndef GTEST_HAS_CLONE
-// The user didn't tell us, so we need to figure it out.
-
-# if GTEST_OS_LINUX && !defined(__ia64__)
-#  if GTEST_OS_LINUX_ANDROID
-// On Android, clone() became available at different API levels for each 32-bit
-// architecture.
-#    if defined(__LP64__) || \
-        (defined(__arm__) && __ANDROID_API__ >= 9) || \
-        (defined(__mips__) && __ANDROID_API__ >= 12) || \
-        (defined(__i386__) && __ANDROID_API__ >= 17)
-#     define GTEST_HAS_CLONE 1
-#    else
-#     define GTEST_HAS_CLONE 0
-#    endif
-#  else
-#   define GTEST_HAS_CLONE 1
-#  endif
-# else
-#  define GTEST_HAS_CLONE 0
-# endif  // GTEST_OS_LINUX && !defined(__ia64__)
-
-#endif  // GTEST_HAS_CLONE
-
-// Determines whether to support stream redirection. This is used to test
-// output correctness and to implement death tests.
-#ifndef GTEST_HAS_STREAM_REDIRECTION
-// By default, we assume that stream redirection is supported on all
-// platforms except known mobile ones.
-# if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || GTEST_OS_WINDOWS_RT
-#  define GTEST_HAS_STREAM_REDIRECTION 0
-# else
-#  define GTEST_HAS_STREAM_REDIRECTION 1
-# endif  // !GTEST_OS_WINDOWS_MOBILE
-#endif  // GTEST_HAS_STREAM_REDIRECTION
-
-// Determines whether to support death tests.
-// pops up a dialog window that cannot be suppressed programmatically.
-#if (GTEST_OS_LINUX || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS ||             \
-     (GTEST_OS_MAC && !GTEST_OS_IOS) ||                                   \
-     (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER) || GTEST_OS_WINDOWS_MINGW ||  \
-     GTEST_OS_AIX || GTEST_OS_HPUX || GTEST_OS_OPENBSD || GTEST_OS_QNX || \
-     GTEST_OS_FREEBSD || GTEST_OS_NETBSD || GTEST_OS_FUCHSIA ||           \
-     GTEST_OS_DRAGONFLY || GTEST_OS_GNU_KFREEBSD || GTEST_OS_HAIKU)
-# define GTEST_HAS_DEATH_TEST 1
-#endif
-
-// Determines whether to support type-driven tests.
-
-// Typed tests need <typeinfo> and variadic macros, which GCC, VC++ 8.0,
-// Sun Pro CC, IBM Visual Age, and HP aCC support.
-#if defined(__GNUC__) || defined(_MSC_VER) || defined(__SUNPRO_CC) || \
-    defined(__IBMCPP__) || defined(__HP_aCC)
-# define GTEST_HAS_TYPED_TEST 1
-# define GTEST_HAS_TYPED_TEST_P 1
-#endif
-
-// Determines whether the system compiler uses UTF-16 for encoding wide strings.
-#define GTEST_WIDE_STRING_USES_UTF16_ \
-  (GTEST_OS_WINDOWS || GTEST_OS_CYGWIN || GTEST_OS_AIX || GTEST_OS_OS2)
-
-// Determines whether test results can be streamed to a socket.
-#if GTEST_OS_LINUX || GTEST_OS_GNU_KFREEBSD || GTEST_OS_DRAGONFLY || \
-    GTEST_OS_FREEBSD || GTEST_OS_NETBSD || GTEST_OS_OPENBSD
-# define GTEST_CAN_STREAM_RESULTS_ 1
-#endif
-
-// Defines some utility macros.
-
-// The GNU compiler emits a warning if nested "if" statements are followed by
-// an "else" statement and braces are not used to explicitly disambiguate the
-// "else" binding.  This leads to problems with code like:
-//
-//   if (gate)
-//     ASSERT_*(condition) << "Some message";
-//
-// The "switch (0) case 0:" idiom is used to suppress this.
-#ifdef __INTEL_COMPILER
-# define GTEST_AMBIGUOUS_ELSE_BLOCKER_
-#else
-# define GTEST_AMBIGUOUS_ELSE_BLOCKER_ switch (0) case 0: default:  // NOLINT
-#endif
-
-// Use this annotation at the end of a struct/class definition to
-// prevent the compiler from optimizing away instances that are never
-// used.  This is useful when all interesting logic happens inside the
-// c'tor and / or d'tor.  Example:
-//
-//   struct Foo {
-//     Foo() { ... }
-//   } GTEST_ATTRIBUTE_UNUSED_;
-//
-// Also use it after a variable or parameter declaration to tell the
-// compiler the variable/parameter does not have to be used.
-#if defined(__GNUC__) && !defined(COMPILER_ICC)
-# define GTEST_ATTRIBUTE_UNUSED_ __attribute__ ((unused))
-#elif defined(__clang__)
-# if __has_attribute(unused)
-#  define GTEST_ATTRIBUTE_UNUSED_ __attribute__ ((unused))
-# endif
-#endif
-#ifndef GTEST_ATTRIBUTE_UNUSED_
-# define GTEST_ATTRIBUTE_UNUSED_
-#endif
-
-// Use this annotation before a function that takes a printf format string.
-#if (defined(__GNUC__) || defined(__clang__)) && !defined(COMPILER_ICC)
-# if defined(__MINGW_PRINTF_FORMAT)
-// MinGW has two different printf implementations. Ensure the format macro
-// matches the selected implementation. See
-// https://sourceforge.net/p/mingw-w64/wiki2/gnu%20printf/.
-#  define GTEST_ATTRIBUTE_PRINTF_(string_index, first_to_check) \
-       __attribute__((__format__(__MINGW_PRINTF_FORMAT, string_index, \
-                                 first_to_check)))
-# else
-#  define GTEST_ATTRIBUTE_PRINTF_(string_index, first_to_check) \
-       __attribute__((__format__(__printf__, string_index, first_to_check)))
-# endif
-#else
-# define GTEST_ATTRIBUTE_PRINTF_(string_index, first_to_check)
-#endif
-
-
-// A macro to disallow operator=
-// This should be used in the private: declarations for a class.
-#define GTEST_DISALLOW_ASSIGN_(type) \
-  void operator=(type const &) = delete
-
-// A macro to disallow copy constructor and operator=
-// This should be used in the private: declarations for a class.
-#define GTEST_DISALLOW_COPY_AND_ASSIGN_(type) \
-  type(type const &) = delete; \
-  GTEST_DISALLOW_ASSIGN_(type)
-
-// Tell the compiler to warn about unused return values for functions declared
-// with this macro.  The macro should be used on function declarations
-// following the argument list:
-//
-//   Sprocket* AllocateSprocket() GTEST_MUST_USE_RESULT_;
-#if defined(__GNUC__) && !defined(COMPILER_ICC)
-# define GTEST_MUST_USE_RESULT_ __attribute__ ((warn_unused_result))
-#else
-# define GTEST_MUST_USE_RESULT_
-#endif  // __GNUC__ && !COMPILER_ICC
-
-// MS C++ compiler emits warning when a conditional expression is compile time
-// constant. In some contexts this warning is false positive and needs to be
-// suppressed. Use the following two macros in such cases:
-//
-// GTEST_INTENTIONAL_CONST_COND_PUSH_()
-// while (true) {
-// GTEST_INTENTIONAL_CONST_COND_POP_()
-// }
-# define GTEST_INTENTIONAL_CONST_COND_PUSH_() \
-    GTEST_DISABLE_MSC_WARNINGS_PUSH_(4127)
-# define GTEST_INTENTIONAL_CONST_COND_POP_() \
-    GTEST_DISABLE_MSC_WARNINGS_POP_()
-
-// Determine whether the compiler supports Microsoft's Structured Exception
-// Handling.  This is supported by several Windows compilers but generally
-// does not exist on any other system.
-#ifndef GTEST_HAS_SEH
-// The user didn't tell us, so we need to figure it out.
-
-# if defined(_MSC_VER) || defined(__BORLANDC__)
-// These two compilers are known to support SEH.
-#  define GTEST_HAS_SEH 1
-# else
-// Assume no SEH.
-#  define GTEST_HAS_SEH 0
-# endif
-
-#endif  // GTEST_HAS_SEH
-
-#ifndef GTEST_IS_THREADSAFE
-
-#define GTEST_IS_THREADSAFE                                                 \
-  (GTEST_HAS_MUTEX_AND_THREAD_LOCAL_ ||                                     \
-   (GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT) || \
-   GTEST_HAS_PTHREAD)
-
-#endif  // GTEST_IS_THREADSAFE
-
-// GTEST_API_ qualifies all symbols that must be exported. The definitions below
-// are guarded by #ifndef to give embedders a chance to define GTEST_API_ in
-// gtest/internal/custom/gtest-port.h
-#ifndef GTEST_API_
-
-#ifdef _MSC_VER
-# if GTEST_LINKED_AS_SHARED_LIBRARY
-#  define GTEST_API_ __declspec(dllimport)
-# elif GTEST_CREATE_SHARED_LIBRARY
-#  define GTEST_API_ __declspec(dllexport)
-# endif
-#elif __GNUC__ >= 4 || defined(__clang__)
-# define GTEST_API_ __attribute__((visibility ("default")))
-#endif  // _MSC_VER
-
-#endif  // GTEST_API_
-
-#ifndef GTEST_API_
-# define GTEST_API_
-#endif  // GTEST_API_
-
-#ifndef GTEST_DEFAULT_DEATH_TEST_STYLE
-# define GTEST_DEFAULT_DEATH_TEST_STYLE  "fast"
-#endif  // GTEST_DEFAULT_DEATH_TEST_STYLE
-
-#ifdef __GNUC__
-// Ask the compiler to never inline a given function.
-# define GTEST_NO_INLINE_ __attribute__((noinline))
-#else
-# define GTEST_NO_INLINE_
-#endif
-
-// _LIBCPP_VERSION is defined by the libc++ library from the LLVM project.
-#if !defined(GTEST_HAS_CXXABI_H_)
-# if defined(__GLIBCXX__) || (defined(_LIBCPP_VERSION) && !defined(_MSC_VER))
-#  define GTEST_HAS_CXXABI_H_ 1
-# else
-#  define GTEST_HAS_CXXABI_H_ 0
-# endif
-#endif
-
-// A function level attribute to disable checking for use of uninitialized
-// memory when built with MemorySanitizer.
-#if defined(__clang__)
-# if __has_feature(memory_sanitizer)
-#  define GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_ \
-       __attribute__((no_sanitize_memory))
-# else
-#  define GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
-# endif  // __has_feature(memory_sanitizer)
-#else
-# define GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
-#endif  // __clang__
-
-// A function level attribute to disable AddressSanitizer instrumentation.
-#if defined(__clang__)
-# if __has_feature(address_sanitizer)
-#  define GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_ \
-       __attribute__((no_sanitize_address))
-# else
-#  define GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
-# endif  // __has_feature(address_sanitizer)
-#else
-# define GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
-#endif  // __clang__
-
-// A function level attribute to disable HWAddressSanitizer instrumentation.
-#if defined(__clang__)
-# if __has_feature(hwaddress_sanitizer)
-#  define GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_ \
-       __attribute__((no_sanitize("hwaddress")))
-# else
-#  define GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
-# endif  // __has_feature(hwaddress_sanitizer)
-#else
-# define GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
-#endif  // __clang__
-
-// A function level attribute to disable ThreadSanitizer instrumentation.
-#if defined(__clang__)
-# if __has_feature(thread_sanitizer)
-#  define GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_ \
-       __attribute__((no_sanitize_thread))
-# else
-#  define GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
-# endif  // __has_feature(thread_sanitizer)
-#else
-# define GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
-#endif  // __clang__
-
-namespace testing {
-
-class Message;
-
-// Legacy imports for backwards compatibility.
-// New code should use std:: names directly.
-using std::get;
-using std::make_tuple;
-using std::tuple;
-using std::tuple_element;
-using std::tuple_size;
-
-namespace internal {
-
-// A secret type that Google Test users don't know about.  It has no
-// definition on purpose.  Therefore it's impossible to create a
-// Secret object, which is what we want.
-class Secret;
-
-// The GTEST_COMPILE_ASSERT_ is a legacy macro used to verify that a compile
-// time expression is true (in new code, use static_assert instead). For
-// example, you could use it to verify the size of a static array:
-//
-//   GTEST_COMPILE_ASSERT_(GTEST_ARRAY_SIZE_(names) == NUM_NAMES,
-//                         names_incorrect_size);
-//
-// The second argument to the macro must be a valid C++ identifier. If the
-// expression is false, compiler will issue an error containing this identifier.
-#define GTEST_COMPILE_ASSERT_(expr, msg) static_assert(expr, #msg)
-
-// Evaluates to the number of elements in 'array'.
-#define GTEST_ARRAY_SIZE_(array) (sizeof(array) / sizeof(array[0]))
-
-// A helper for suppressing warnings on constant condition.  It just
-// returns 'condition'.
-GTEST_API_ bool IsTrue(bool condition);
-
-// Defines RE.
-
-#if GTEST_USES_PCRE
-// if used, PCRE is injected by custom/gtest-port.h
-#elif GTEST_USES_POSIX_RE || GTEST_USES_SIMPLE_RE
-
-// A simple C++ wrapper for <regex.h>.  It uses the POSIX Extended
-// Regular Expression syntax.
-class GTEST_API_ RE {
- public:
-  // A copy constructor is required by the Standard to initialize object
-  // references from r-values.
-  RE(const RE& other) { Init(other.pattern()); }
-
-  // Constructs an RE from a string.
-  RE(const ::std::string& regex) { Init(regex.c_str()); }  // NOLINT
-
-  RE(const char* regex) { Init(regex); }  // NOLINT
-  ~RE();
-
-  // Returns the string representation of the regex.
-  const char* pattern() const { return pattern_; }
-
-  // FullMatch(str, re) returns true if and only if regular expression re
-  // matches the entire str.
-  // PartialMatch(str, re) returns true if and only if regular expression re
-  // matches a substring of str (including str itself).
-  static bool FullMatch(const ::std::string& str, const RE& re) {
-    return FullMatch(str.c_str(), re);
-  }
-  static bool PartialMatch(const ::std::string& str, const RE& re) {
-    return PartialMatch(str.c_str(), re);
-  }
-
-  static bool FullMatch(const char* str, const RE& re);
-  static bool PartialMatch(const char* str, const RE& re);
-
- private:
-  void Init(const char* regex);
-  const char* pattern_;
-  bool is_valid_;
-
-# if GTEST_USES_POSIX_RE
-
-  regex_t full_regex_;     // For FullMatch().
-  regex_t partial_regex_;  // For PartialMatch().
-
-# else  // GTEST_USES_SIMPLE_RE
-
-  const char* full_pattern_;  // For FullMatch();
-
-# endif
-
-  GTEST_DISALLOW_ASSIGN_(RE);
-};
-
-#endif  // GTEST_USES_PCRE
-
-// Formats a source file path and a line number as they would appear
-// in an error message from the compiler used to compile this code.
-GTEST_API_ ::std::string FormatFileLocation(const char* file, int line);
-
-// Formats a file location for compiler-independent XML output.
-// Although this function is not platform dependent, we put it next to
-// FormatFileLocation in order to contrast the two functions.
-GTEST_API_ ::std::string FormatCompilerIndependentFileLocation(const char* file,
-                                                               int line);
-
-// Defines logging utilities:
-//   GTEST_LOG_(severity) - logs messages at the specified severity level. The
-//                          message itself is streamed into the macro.
-//   LogToStderr()  - directs all log messages to stderr.
-//   FlushInfoLog() - flushes informational log messages.
-
-enum GTestLogSeverity {
-  GTEST_INFO,
-  GTEST_WARNING,
-  GTEST_ERROR,
-  GTEST_FATAL
-};
-
-// Formats log entry severity, provides a stream object for streaming the
-// log message, and terminates the message with a newline when going out of
-// scope.
-class GTEST_API_ GTestLog {
- public:
-  GTestLog(GTestLogSeverity severity, const char* file, int line);
-
-  // Flushes the buffers and, if severity is GTEST_FATAL, aborts the program.
-  ~GTestLog();
-
-  ::std::ostream& GetStream() { return ::std::cerr; }
-
- private:
-  const GTestLogSeverity severity_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(GTestLog);
-};
-
-#if !defined(GTEST_LOG_)
-
-# define GTEST_LOG_(severity) \
-    ::testing::internal::GTestLog(::testing::internal::GTEST_##severity, \
-                                  __FILE__, __LINE__).GetStream()
-
-inline void LogToStderr() {}
-inline void FlushInfoLog() { fflush(nullptr); }
-
-#endif  // !defined(GTEST_LOG_)
-
-#if !defined(GTEST_CHECK_)
-// INTERNAL IMPLEMENTATION - DO NOT USE.
-//
-// GTEST_CHECK_ is an all-mode assert. It aborts the program if the condition
-// is not satisfied.
-//  Synopsys:
-//    GTEST_CHECK_(boolean_condition);
-//     or
-//    GTEST_CHECK_(boolean_condition) << "Additional message";
-//
-//    This checks the condition and if the condition is not satisfied
-//    it prints message about the condition violation, including the
-//    condition itself, plus additional message streamed into it, if any,
-//    and then it aborts the program. It aborts the program irrespective of
-//    whether it is built in the debug mode or not.
-# define GTEST_CHECK_(condition) \
-    GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
-    if (::testing::internal::IsTrue(condition)) \
-      ; \
-    else \
-      GTEST_LOG_(FATAL) << "Condition " #condition " failed. "
-#endif  // !defined(GTEST_CHECK_)
-
-// An all-mode assert to verify that the given POSIX-style function
-// call returns 0 (indicating success).  Known limitation: this
-// doesn't expand to a balanced 'if' statement, so enclose the macro
-// in {} if you need to use it as the only statement in an 'if'
-// branch.
-#define GTEST_CHECK_POSIX_SUCCESS_(posix_call) \
-  if (const int gtest_error = (posix_call)) \
-    GTEST_LOG_(FATAL) << #posix_call << "failed with error " \
-                      << gtest_error
-
-// Transforms "T" into "const T&" according to standard reference collapsing
-// rules (this is only needed as a backport for C++98 compilers that do not
-// support reference collapsing). Specifically, it transforms:
-//
-//   char         ==> const char&
-//   const char   ==> const char&
-//   char&        ==> char&
-//   const char&  ==> const char&
-//
-// Note that the non-const reference will not have "const" added. This is
-// standard, and necessary so that "T" can always bind to "const T&".
-template <typename T>
-struct ConstRef { typedef const T& type; };
-template <typename T>
-struct ConstRef<T&> { typedef T& type; };
-
-// The argument T must depend on some template parameters.
-#define GTEST_REFERENCE_TO_CONST_(T) \
-  typename ::testing::internal::ConstRef<T>::type
-
-// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
-//
-// Use ImplicitCast_ as a safe version of static_cast for upcasting in
-// the type hierarchy (e.g. casting a Foo* to a SuperclassOfFoo* or a
-// const Foo*).  When you use ImplicitCast_, the compiler checks that
-// the cast is safe.  Such explicit ImplicitCast_s are necessary in
-// surprisingly many situations where C++ demands an exact type match
-// instead of an argument type convertable to a target type.
-//
-// The syntax for using ImplicitCast_ is the same as for static_cast:
-//
-//   ImplicitCast_<ToType>(expr)
-//
-// ImplicitCast_ would have been part of the C++ standard library,
-// but the proposal was submitted too late.  It will probably make
-// its way into the language in the future.
-//
-// This relatively ugly name is intentional. It prevents clashes with
-// similar functions users may have (e.g., implicit_cast). The internal
-// namespace alone is not enough because the function can be found by ADL.
-template<typename To>
-inline To ImplicitCast_(To x) { return x; }
-
-// When you upcast (that is, cast a pointer from type Foo to type
-// SuperclassOfFoo), it's fine to use ImplicitCast_<>, since upcasts
-// always succeed.  When you downcast (that is, cast a pointer from
-// type Foo to type SubclassOfFoo), static_cast<> isn't safe, because
-// how do you know the pointer is really of type SubclassOfFoo?  It
-// could be a bare Foo, or of type DifferentSubclassOfFoo.  Thus,
-// when you downcast, you should use this macro.  In debug mode, we
-// use dynamic_cast<> to double-check the downcast is legal (we die
-// if it's not).  In normal mode, we do the efficient static_cast<>
-// instead.  Thus, it's important to test in debug mode to make sure
-// the cast is legal!
-//    This is the only place in the code we should use dynamic_cast<>.
-// In particular, you SHOULDN'T be using dynamic_cast<> in order to
-// do RTTI (eg code like this:
-//    if (dynamic_cast<Subclass1>(foo)) HandleASubclass1Object(foo);
-//    if (dynamic_cast<Subclass2>(foo)) HandleASubclass2Object(foo);
-// You should design the code some other way not to need this.
-//
-// This relatively ugly name is intentional. It prevents clashes with
-// similar functions users may have (e.g., down_cast). The internal
-// namespace alone is not enough because the function can be found by ADL.
-template<typename To, typename From>  // use like this: DownCast_<T*>(foo);
-inline To DownCast_(From* f) {  // so we only accept pointers
-  // Ensures that To is a sub-type of From *.  This test is here only
-  // for compile-time type checking, and has no overhead in an
-  // optimized build at run-time, as it will be optimized away
-  // completely.
-  GTEST_INTENTIONAL_CONST_COND_PUSH_()
-  if (false) {
-  GTEST_INTENTIONAL_CONST_COND_POP_()
-  const To to = nullptr;
-  ::testing::internal::ImplicitCast_<From*>(to);
-  }
-
-#if GTEST_HAS_RTTI
-  // RTTI: debug mode only!
-  GTEST_CHECK_(f == nullptr || dynamic_cast<To>(f) != nullptr);
-#endif
-  return static_cast<To>(f);
-}
-
-// Downcasts the pointer of type Base to Derived.
-// Derived must be a subclass of Base. The parameter MUST
-// point to a class of type Derived, not any subclass of it.
-// When RTTI is available, the function performs a runtime
-// check to enforce this.
-template <class Derived, class Base>
-Derived* CheckedDowncastToActualType(Base* base) {
-#if GTEST_HAS_RTTI
-  GTEST_CHECK_(typeid(*base) == typeid(Derived));
-#endif
-
-#if GTEST_HAS_DOWNCAST_
-  return ::down_cast<Derived*>(base);
-#elif GTEST_HAS_RTTI
-  return dynamic_cast<Derived*>(base);  // NOLINT
-#else
-  return static_cast<Derived*>(base);  // Poor man's downcast.
-#endif
-}
-
-#if GTEST_HAS_STREAM_REDIRECTION
-
-// Defines the stderr capturer:
-//   CaptureStdout     - starts capturing stdout.
-//   GetCapturedStdout - stops capturing stdout and returns the captured string.
-//   CaptureStderr     - starts capturing stderr.
-//   GetCapturedStderr - stops capturing stderr and returns the captured string.
-//
-GTEST_API_ void CaptureStdout();
-GTEST_API_ std::string GetCapturedStdout();
-GTEST_API_ void CaptureStderr();
-GTEST_API_ std::string GetCapturedStderr();
-
-#endif  // GTEST_HAS_STREAM_REDIRECTION
-// Returns the size (in bytes) of a file.
-GTEST_API_ size_t GetFileSize(FILE* file);
-
-// Reads the entire content of a file as a string.
-GTEST_API_ std::string ReadEntireFile(FILE* file);
-
-// All command line arguments.
-GTEST_API_ std::vector<std::string> GetArgvs();
-
-#if GTEST_HAS_DEATH_TEST
-
-std::vector<std::string> GetInjectableArgvs();
-// Deprecated: pass the args vector by value instead.
-void SetInjectableArgvs(const std::vector<std::string>* new_argvs);
-void SetInjectableArgvs(const std::vector<std::string>& new_argvs);
-void ClearInjectableArgvs();
-
-#endif  // GTEST_HAS_DEATH_TEST
-
-// Defines synchronization primitives.
-#if GTEST_IS_THREADSAFE
-# if GTEST_HAS_PTHREAD
-// Sleeps for (roughly) n milliseconds.  This function is only for testing
-// Google Test's own constructs.  Don't use it in user tests, either
-// directly or indirectly.
-inline void SleepMilliseconds(int n) {
-  const timespec time = {
-    0,                  // 0 seconds.
-    n * 1000L * 1000L,  // And n ms.
-  };
-  nanosleep(&time, nullptr);
-}
-# endif  // GTEST_HAS_PTHREAD
-
-# if GTEST_HAS_NOTIFICATION_
-// Notification has already been imported into the namespace.
-// Nothing to do here.
-
-# elif GTEST_HAS_PTHREAD
-// Allows a controller thread to pause execution of newly created
-// threads until notified.  Instances of this class must be created
-// and destroyed in the controller thread.
-//
-// This class is only for testing Google Test's own constructs. Do not
-// use it in user tests, either directly or indirectly.
-class Notification {
- public:
-  Notification() : notified_(false) {
-    GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_init(&mutex_, nullptr));
-  }
-  ~Notification() {
-    pthread_mutex_destroy(&mutex_);
-  }
-
-  // Notifies all threads created with this notification to start. Must
-  // be called from the controller thread.
-  void Notify() {
-    pthread_mutex_lock(&mutex_);
-    notified_ = true;
-    pthread_mutex_unlock(&mutex_);
-  }
-
-  // Blocks until the controller thread notifies. Must be called from a test
-  // thread.
-  void WaitForNotification() {
-    for (;;) {
-      pthread_mutex_lock(&mutex_);
-      const bool notified = notified_;
-      pthread_mutex_unlock(&mutex_);
-      if (notified)
-        break;
-      SleepMilliseconds(10);
-    }
-  }
-
- private:
-  pthread_mutex_t mutex_;
-  bool notified_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(Notification);
-};
-
-# elif GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
-
-GTEST_API_ void SleepMilliseconds(int n);
-
-// Provides leak-safe Windows kernel handle ownership.
-// Used in death tests and in threading support.
-class GTEST_API_ AutoHandle {
- public:
-  // Assume that Win32 HANDLE type is equivalent to void*. Doing so allows us to
-  // avoid including <windows.h> in this header file. Including <windows.h> is
-  // undesirable because it defines a lot of symbols and macros that tend to
-  // conflict with client code. This assumption is verified by
-  // WindowsTypesTest.HANDLEIsVoidStar.
-  typedef void* Handle;
-  AutoHandle();
-  explicit AutoHandle(Handle handle);
-
-  ~AutoHandle();
-
-  Handle Get() const;
-  void Reset();
-  void Reset(Handle handle);
-
- private:
-  // Returns true if and only if the handle is a valid handle object that can be
-  // closed.
-  bool IsCloseable() const;
-
-  Handle handle_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(AutoHandle);
-};
-
-// Allows a controller thread to pause execution of newly created
-// threads until notified.  Instances of this class must be created
-// and destroyed in the controller thread.
-//
-// This class is only for testing Google Test's own constructs. Do not
-// use it in user tests, either directly or indirectly.
-class GTEST_API_ Notification {
- public:
-  Notification();
-  void Notify();
-  void WaitForNotification();
-
- private:
-  AutoHandle event_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(Notification);
-};
-# endif  // GTEST_HAS_NOTIFICATION_
-
-// On MinGW, we can have both GTEST_OS_WINDOWS and GTEST_HAS_PTHREAD
-// defined, but we don't want to use MinGW's pthreads implementation, which
-// has conformance problems with some versions of the POSIX standard.
-# if GTEST_HAS_PTHREAD && !GTEST_OS_WINDOWS_MINGW
-
-// As a C-function, ThreadFuncWithCLinkage cannot be templated itself.
-// Consequently, it cannot select a correct instantiation of ThreadWithParam
-// in order to call its Run(). Introducing ThreadWithParamBase as a
-// non-templated base class for ThreadWithParam allows us to bypass this
-// problem.
-class ThreadWithParamBase {
- public:
-  virtual ~ThreadWithParamBase() {}
-  virtual void Run() = 0;
-};
-
-// pthread_create() accepts a pointer to a function type with the C linkage.
-// According to the Standard (7.5/1), function types with different linkages
-// are different even if they are otherwise identical.  Some compilers (for
-// example, SunStudio) treat them as different types.  Since class methods
-// cannot be defined with C-linkage we need to define a free C-function to
-// pass into pthread_create().
-extern "C" inline void* ThreadFuncWithCLinkage(void* thread) {
-  static_cast<ThreadWithParamBase*>(thread)->Run();
-  return nullptr;
-}
-
-// Helper class for testing Google Test's multi-threading constructs.
-// To use it, write:
-//
-//   void ThreadFunc(int param) { /* Do things with param */ }
-//   Notification thread_can_start;
-//   ...
-//   // The thread_can_start parameter is optional; you can supply NULL.
-//   ThreadWithParam<int> thread(&ThreadFunc, 5, &thread_can_start);
-//   thread_can_start.Notify();
-//
-// These classes are only for testing Google Test's own constructs. Do
-// not use them in user tests, either directly or indirectly.
-template <typename T>
-class ThreadWithParam : public ThreadWithParamBase {
- public:
-  typedef void UserThreadFunc(T);
-
-  ThreadWithParam(UserThreadFunc* func, T param, Notification* thread_can_start)
-      : func_(func),
-        param_(param),
-        thread_can_start_(thread_can_start),
-        finished_(false) {
-    ThreadWithParamBase* const base = this;
-    // The thread can be created only after all fields except thread_
-    // have been initialized.
-    GTEST_CHECK_POSIX_SUCCESS_(
-        pthread_create(&thread_, nullptr, &ThreadFuncWithCLinkage, base));
-  }
-  ~ThreadWithParam() override { Join(); }
-
-  void Join() {
-    if (!finished_) {
-      GTEST_CHECK_POSIX_SUCCESS_(pthread_join(thread_, nullptr));
-      finished_ = true;
-    }
-  }
-
-  void Run() override {
-    if (thread_can_start_ != nullptr) thread_can_start_->WaitForNotification();
-    func_(param_);
-  }
-
- private:
-  UserThreadFunc* const func_;  // User-supplied thread function.
-  const T param_;  // User-supplied parameter to the thread function.
-  // When non-NULL, used to block execution until the controller thread
-  // notifies.
-  Notification* const thread_can_start_;
-  bool finished_;  // true if and only if we know that the thread function has
-                   // finished.
-  pthread_t thread_;  // The native thread object.
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadWithParam);
-};
-# endif  // !GTEST_OS_WINDOWS && GTEST_HAS_PTHREAD ||
-         // GTEST_HAS_MUTEX_AND_THREAD_LOCAL_
-
-# if GTEST_HAS_MUTEX_AND_THREAD_LOCAL_
-// Mutex and ThreadLocal have already been imported into the namespace.
-// Nothing to do here.
-
-# elif GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
-
-// Mutex implements mutex on Windows platforms.  It is used in conjunction
-// with class MutexLock:
-//
-//   Mutex mutex;
-//   ...
-//   MutexLock lock(&mutex);  // Acquires the mutex and releases it at the
-//                            // end of the current scope.
-//
-// A static Mutex *must* be defined or declared using one of the following
-// macros:
-//   GTEST_DEFINE_STATIC_MUTEX_(g_some_mutex);
-//   GTEST_DECLARE_STATIC_MUTEX_(g_some_mutex);
-//
-// (A non-static Mutex is defined/declared in the usual way).
-class GTEST_API_ Mutex {
- public:
-  enum MutexType { kStatic = 0, kDynamic = 1 };
-  // We rely on kStaticMutex being 0 as it is to what the linker initializes
-  // type_ in static mutexes.  critical_section_ will be initialized lazily
-  // in ThreadSafeLazyInit().
-  enum StaticConstructorSelector { kStaticMutex = 0 };
-
-  // This constructor intentionally does nothing.  It relies on type_ being
-  // statically initialized to 0 (effectively setting it to kStatic) and on
-  // ThreadSafeLazyInit() to lazily initialize the rest of the members.
-  explicit Mutex(StaticConstructorSelector /*dummy*/) {}
-
-  Mutex();
-  ~Mutex();
-
-  void Lock();
-
-  void Unlock();
-
-  // Does nothing if the current thread holds the mutex. Otherwise, crashes
-  // with high probability.
-  void AssertHeld();
-
- private:
-  // Initializes owner_thread_id_ and critical_section_ in static mutexes.
-  void ThreadSafeLazyInit();
-
-  // Per https://blogs.msdn.microsoft.com/oldnewthing/20040223-00/?p=40503,
-  // we assume that 0 is an invalid value for thread IDs.
-  unsigned int owner_thread_id_;
-
-  // For static mutexes, we rely on these members being initialized to zeros
-  // by the linker.
-  MutexType type_;
-  long critical_section_init_phase_;  // NOLINT
-  GTEST_CRITICAL_SECTION* critical_section_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(Mutex);
-};
-
-# define GTEST_DECLARE_STATIC_MUTEX_(mutex) \
-    extern ::testing::internal::Mutex mutex
-
-# define GTEST_DEFINE_STATIC_MUTEX_(mutex) \
-    ::testing::internal::Mutex mutex(::testing::internal::Mutex::kStaticMutex)
-
-// We cannot name this class MutexLock because the ctor declaration would
-// conflict with a macro named MutexLock, which is defined on some
-// platforms. That macro is used as a defensive measure to prevent against
-// inadvertent misuses of MutexLock like "MutexLock(&mu)" rather than
-// "MutexLock l(&mu)".  Hence the typedef trick below.
-class GTestMutexLock {
- public:
-  explicit GTestMutexLock(Mutex* mutex)
-      : mutex_(mutex) { mutex_->Lock(); }
-
-  ~GTestMutexLock() { mutex_->Unlock(); }
-
- private:
-  Mutex* const mutex_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(GTestMutexLock);
-};
-
-typedef GTestMutexLock MutexLock;
-
-// Base class for ValueHolder<T>.  Allows a caller to hold and delete a value
-// without knowing its type.
-class ThreadLocalValueHolderBase {
- public:
-  virtual ~ThreadLocalValueHolderBase() {}
-};
-
-// Provides a way for a thread to send notifications to a ThreadLocal
-// regardless of its parameter type.
-class ThreadLocalBase {
- public:
-  // Creates a new ValueHolder<T> object holding a default value passed to
-  // this ThreadLocal<T>'s constructor and returns it.  It is the caller's
-  // responsibility not to call this when the ThreadLocal<T> instance already
-  // has a value on the current thread.
-  virtual ThreadLocalValueHolderBase* NewValueForCurrentThread() const = 0;
-
- protected:
-  ThreadLocalBase() {}
-  virtual ~ThreadLocalBase() {}
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadLocalBase);
-};
-
-// Maps a thread to a set of ThreadLocals that have values instantiated on that
-// thread and notifies them when the thread exits.  A ThreadLocal instance is
-// expected to persist until all threads it has values on have terminated.
-class GTEST_API_ ThreadLocalRegistry {
- public:
-  // Registers thread_local_instance as having value on the current thread.
-  // Returns a value that can be used to identify the thread from other threads.
-  static ThreadLocalValueHolderBase* GetValueOnCurrentThread(
-      const ThreadLocalBase* thread_local_instance);
-
-  // Invoked when a ThreadLocal instance is destroyed.
-  static void OnThreadLocalDestroyed(
-      const ThreadLocalBase* thread_local_instance);
-};
-
-class GTEST_API_ ThreadWithParamBase {
- public:
-  void Join();
-
- protected:
-  class Runnable {
-   public:
-    virtual ~Runnable() {}
-    virtual void Run() = 0;
-  };
-
-  ThreadWithParamBase(Runnable *runnable, Notification* thread_can_start);
-  virtual ~ThreadWithParamBase();
-
- private:
-  AutoHandle thread_;
-};
-
-// Helper class for testing Google Test's multi-threading constructs.
-template <typename T>
-class ThreadWithParam : public ThreadWithParamBase {
- public:
-  typedef void UserThreadFunc(T);
-
-  ThreadWithParam(UserThreadFunc* func, T param, Notification* thread_can_start)
-      : ThreadWithParamBase(new RunnableImpl(func, param), thread_can_start) {
-  }
-  virtual ~ThreadWithParam() {}
-
- private:
-  class RunnableImpl : public Runnable {
-   public:
-    RunnableImpl(UserThreadFunc* func, T param)
-        : func_(func),
-          param_(param) {
-    }
-    virtual ~RunnableImpl() {}
-    virtual void Run() {
-      func_(param_);
-    }
-
-   private:
-    UserThreadFunc* const func_;
-    const T param_;
-
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(RunnableImpl);
-  };
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadWithParam);
-};
-
-// Implements thread-local storage on Windows systems.
-//
-//   // Thread 1
-//   ThreadLocal<int> tl(100);  // 100 is the default value for each thread.
-//
-//   // Thread 2
-//   tl.set(150);  // Changes the value for thread 2 only.
-//   EXPECT_EQ(150, tl.get());
-//
-//   // Thread 1
-//   EXPECT_EQ(100, tl.get());  // In thread 1, tl has the original value.
-//   tl.set(200);
-//   EXPECT_EQ(200, tl.get());
-//
-// The template type argument T must have a public copy constructor.
-// In addition, the default ThreadLocal constructor requires T to have
-// a public default constructor.
-//
-// The users of a TheadLocal instance have to make sure that all but one
-// threads (including the main one) using that instance have exited before
-// destroying it. Otherwise, the per-thread objects managed for them by the
-// ThreadLocal instance are not guaranteed to be destroyed on all platforms.
-//
-// Google Test only uses global ThreadLocal objects.  That means they
-// will die after main() has returned.  Therefore, no per-thread
-// object managed by Google Test will be leaked as long as all threads
-// using Google Test have exited when main() returns.
-template <typename T>
-class ThreadLocal : public ThreadLocalBase {
- public:
-  ThreadLocal() : default_factory_(new DefaultValueHolderFactory()) {}
-  explicit ThreadLocal(const T& value)
-      : default_factory_(new InstanceValueHolderFactory(value)) {}
-
-  ~ThreadLocal() { ThreadLocalRegistry::OnThreadLocalDestroyed(this); }
-
-  T* pointer() { return GetOrCreateValue(); }
-  const T* pointer() const { return GetOrCreateValue(); }
-  const T& get() const { return *pointer(); }
-  void set(const T& value) { *pointer() = value; }
-
- private:
-  // Holds a value of T.  Can be deleted via its base class without the caller
-  // knowing the type of T.
-  class ValueHolder : public ThreadLocalValueHolderBase {
-   public:
-    ValueHolder() : value_() {}
-    explicit ValueHolder(const T& value) : value_(value) {}
-
-    T* pointer() { return &value_; }
-
-   private:
-    T value_;
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(ValueHolder);
-  };
-
-
-  T* GetOrCreateValue() const {
-    return static_cast<ValueHolder*>(
-        ThreadLocalRegistry::GetValueOnCurrentThread(this))->pointer();
-  }
-
-  virtual ThreadLocalValueHolderBase* NewValueForCurrentThread() const {
-    return default_factory_->MakeNewHolder();
-  }
-
-  class ValueHolderFactory {
-   public:
-    ValueHolderFactory() {}
-    virtual ~ValueHolderFactory() {}
-    virtual ValueHolder* MakeNewHolder() const = 0;
-
-   private:
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(ValueHolderFactory);
-  };
-
-  class DefaultValueHolderFactory : public ValueHolderFactory {
-   public:
-    DefaultValueHolderFactory() {}
-    virtual ValueHolder* MakeNewHolder() const { return new ValueHolder(); }
-
-   private:
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultValueHolderFactory);
-  };
-
-  class InstanceValueHolderFactory : public ValueHolderFactory {
-   public:
-    explicit InstanceValueHolderFactory(const T& value) : value_(value) {}
-    virtual ValueHolder* MakeNewHolder() const {
-      return new ValueHolder(value_);
-    }
-
-   private:
-    const T value_;  // The value for each thread.
-
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(InstanceValueHolderFactory);
-  };
-
-  std::unique_ptr<ValueHolderFactory> default_factory_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadLocal);
-};
-
-# elif GTEST_HAS_PTHREAD
-
-// MutexBase and Mutex implement mutex on pthreads-based platforms.
-class MutexBase {
- public:
-  // Acquires this mutex.
-  void Lock() {
-    GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_lock(&mutex_));
-    owner_ = pthread_self();
-    has_owner_ = true;
-  }
-
-  // Releases this mutex.
-  void Unlock() {
-    // Since the lock is being released the owner_ field should no longer be
-    // considered valid. We don't protect writing to has_owner_ here, as it's
-    // the caller's responsibility to ensure that the current thread holds the
-    // mutex when this is called.
-    has_owner_ = false;
-    GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_unlock(&mutex_));
-  }
-
-  // Does nothing if the current thread holds the mutex. Otherwise, crashes
-  // with high probability.
-  void AssertHeld() const {
-    GTEST_CHECK_(has_owner_ && pthread_equal(owner_, pthread_self()))
-        << "The current thread is not holding the mutex @" << this;
-  }
-
-  // A static mutex may be used before main() is entered.  It may even
-  // be used before the dynamic initialization stage.  Therefore we
-  // must be able to initialize a static mutex object at link time.
-  // This means MutexBase has to be a POD and its member variables
-  // have to be public.
- public:
-  pthread_mutex_t mutex_;  // The underlying pthread mutex.
-  // has_owner_ indicates whether the owner_ field below contains a valid thread
-  // ID and is therefore safe to inspect (e.g., to use in pthread_equal()). All
-  // accesses to the owner_ field should be protected by a check of this field.
-  // An alternative might be to memset() owner_ to all zeros, but there's no
-  // guarantee that a zero'd pthread_t is necessarily invalid or even different
-  // from pthread_self().
-  bool has_owner_;
-  pthread_t owner_;  // The thread holding the mutex.
-};
-
-// Forward-declares a static mutex.
-#  define GTEST_DECLARE_STATIC_MUTEX_(mutex) \
-     extern ::testing::internal::MutexBase mutex
-
-// Defines and statically (i.e. at link time) initializes a static mutex.
-// The initialization list here does not explicitly initialize each field,
-// instead relying on default initialization for the unspecified fields. In
-// particular, the owner_ field (a pthread_t) is not explicitly initialized.
-// This allows initialization to work whether pthread_t is a scalar or struct.
-// The flag -Wmissing-field-initializers must not be specified for this to work.
-#define GTEST_DEFINE_STATIC_MUTEX_(mutex) \
-  ::testing::internal::MutexBase mutex = {PTHREAD_MUTEX_INITIALIZER, false, 0}
-
-// The Mutex class can only be used for mutexes created at runtime. It
-// shares its API with MutexBase otherwise.
-class Mutex : public MutexBase {
- public:
-  Mutex() {
-    GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_init(&mutex_, nullptr));
-    has_owner_ = false;
-  }
-  ~Mutex() {
-    GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_destroy(&mutex_));
-  }
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(Mutex);
-};
-
-// We cannot name this class MutexLock because the ctor declaration would
-// conflict with a macro named MutexLock, which is defined on some
-// platforms. That macro is used as a defensive measure to prevent against
-// inadvertent misuses of MutexLock like "MutexLock(&mu)" rather than
-// "MutexLock l(&mu)".  Hence the typedef trick below.
-class GTestMutexLock {
- public:
-  explicit GTestMutexLock(MutexBase* mutex)
-      : mutex_(mutex) { mutex_->Lock(); }
-
-  ~GTestMutexLock() { mutex_->Unlock(); }
-
- private:
-  MutexBase* const mutex_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(GTestMutexLock);
-};
-
-typedef GTestMutexLock MutexLock;
-
-// Helpers for ThreadLocal.
-
-// pthread_key_create() requires DeleteThreadLocalValue() to have
-// C-linkage.  Therefore it cannot be templatized to access
-// ThreadLocal<T>.  Hence the need for class
-// ThreadLocalValueHolderBase.
-class ThreadLocalValueHolderBase {
- public:
-  virtual ~ThreadLocalValueHolderBase() {}
-};
-
-// Called by pthread to delete thread-local data stored by
-// pthread_setspecific().
-extern "C" inline void DeleteThreadLocalValue(void* value_holder) {
-  delete static_cast<ThreadLocalValueHolderBase*>(value_holder);
-}
-
-// Implements thread-local storage on pthreads-based systems.
-template <typename T>
-class GTEST_API_ ThreadLocal {
- public:
-  ThreadLocal()
-      : key_(CreateKey()), default_factory_(new DefaultValueHolderFactory()) {}
-  explicit ThreadLocal(const T& value)
-      : key_(CreateKey()),
-        default_factory_(new InstanceValueHolderFactory(value)) {}
-
-  ~ThreadLocal() {
-    // Destroys the managed object for the current thread, if any.
-    DeleteThreadLocalValue(pthread_getspecific(key_));
-
-    // Releases resources associated with the key.  This will *not*
-    // delete managed objects for other threads.
-    GTEST_CHECK_POSIX_SUCCESS_(pthread_key_delete(key_));
-  }
-
-  T* pointer() { return GetOrCreateValue(); }
-  const T* pointer() const { return GetOrCreateValue(); }
-  const T& get() const { return *pointer(); }
-  void set(const T& value) { *pointer() = value; }
-
- private:
-  // Holds a value of type T.
-  class ValueHolder : public ThreadLocalValueHolderBase {
-   public:
-    ValueHolder() : value_() {}
-    explicit ValueHolder(const T& value) : value_(value) {}
-
-    T* pointer() { return &value_; }
-
-   private:
-    T value_;
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(ValueHolder);
-  };
-
-  static pthread_key_t CreateKey() {
-    pthread_key_t key;
-    // When a thread exits, DeleteThreadLocalValue() will be called on
-    // the object managed for that thread.
-    GTEST_CHECK_POSIX_SUCCESS_(
-        pthread_key_create(&key, &DeleteThreadLocalValue));
-    return key;
-  }
-
-  T* GetOrCreateValue() const {
-    ThreadLocalValueHolderBase* const holder =
-        static_cast<ThreadLocalValueHolderBase*>(pthread_getspecific(key_));
-    if (holder != nullptr) {
-      return CheckedDowncastToActualType<ValueHolder>(holder)->pointer();
-    }
-
-    ValueHolder* const new_holder = default_factory_->MakeNewHolder();
-    ThreadLocalValueHolderBase* const holder_base = new_holder;
-    GTEST_CHECK_POSIX_SUCCESS_(pthread_setspecific(key_, holder_base));
-    return new_holder->pointer();
-  }
-
-  class ValueHolderFactory {
-   public:
-    ValueHolderFactory() {}
-    virtual ~ValueHolderFactory() {}
-    virtual ValueHolder* MakeNewHolder() const = 0;
-
-   private:
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(ValueHolderFactory);
-  };
-
-  class DefaultValueHolderFactory : public ValueHolderFactory {
-   public:
-    DefaultValueHolderFactory() {}
-    virtual ValueHolder* MakeNewHolder() const { return new ValueHolder(); }
-
-   private:
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultValueHolderFactory);
-  };
-
-  class InstanceValueHolderFactory : public ValueHolderFactory {
-   public:
-    explicit InstanceValueHolderFactory(const T& value) : value_(value) {}
-    virtual ValueHolder* MakeNewHolder() const {
-      return new ValueHolder(value_);
-    }
-
-   private:
-    const T value_;  // The value for each thread.
-
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(InstanceValueHolderFactory);
-  };
-
-  // A key pthreads uses for looking up per-thread values.
-  const pthread_key_t key_;
-  std::unique_ptr<ValueHolderFactory> default_factory_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadLocal);
-};
-
-# endif  // GTEST_HAS_MUTEX_AND_THREAD_LOCAL_
-
-#else  // GTEST_IS_THREADSAFE
-
-// A dummy implementation of synchronization primitives (mutex, lock,
-// and thread-local variable).  Necessary for compiling Google Test where
-// mutex is not supported - using Google Test in multiple threads is not
-// supported on such platforms.
-
-class Mutex {
- public:
-  Mutex() {}
-  void Lock() {}
-  void Unlock() {}
-  void AssertHeld() const {}
-};
-
-# define GTEST_DECLARE_STATIC_MUTEX_(mutex) \
-  extern ::testing::internal::Mutex mutex
-
-# define GTEST_DEFINE_STATIC_MUTEX_(mutex) ::testing::internal::Mutex mutex
-
-// We cannot name this class MutexLock because the ctor declaration would
-// conflict with a macro named MutexLock, which is defined on some
-// platforms. That macro is used as a defensive measure to prevent against
-// inadvertent misuses of MutexLock like "MutexLock(&mu)" rather than
-// "MutexLock l(&mu)".  Hence the typedef trick below.
-class GTestMutexLock {
- public:
-  explicit GTestMutexLock(Mutex*) {}  // NOLINT
-};
-
-typedef GTestMutexLock MutexLock;
-
-template <typename T>
-class GTEST_API_ ThreadLocal {
- public:
-  ThreadLocal() : value_() {}
-  explicit ThreadLocal(const T& value) : value_(value) {}
-  T* pointer() { return &value_; }
-  const T* pointer() const { return &value_; }
-  const T& get() const { return value_; }
-  void set(const T& value) { value_ = value; }
- private:
-  T value_;
-};
-
-#endif  // GTEST_IS_THREADSAFE
-
-// Returns the number of threads running in the process, or 0 to indicate that
-// we cannot detect it.
-GTEST_API_ size_t GetThreadCount();
-
-template <bool B>
-using bool_constant = std::integral_constant<bool, B>;
-
-#if GTEST_OS_WINDOWS
-# define GTEST_PATH_SEP_ "\\"
-# define GTEST_HAS_ALT_PATH_SEP_ 1
-// The biggest signed integer type the compiler supports.
-typedef __int64 BiggestInt;
-#else
-# define GTEST_PATH_SEP_ "/"
-# define GTEST_HAS_ALT_PATH_SEP_ 0
-typedef long long BiggestInt;  // NOLINT
-#endif  // GTEST_OS_WINDOWS
-
-// Utilities for char.
-
-// isspace(int ch) and friends accept an unsigned char or EOF.  char
-// may be signed, depending on the compiler (or compiler flags).
-// Therefore we need to cast a char to unsigned char before calling
-// isspace(), etc.
-
-inline bool IsAlpha(char ch) {
-  return isalpha(static_cast<unsigned char>(ch)) != 0;
-}
-inline bool IsAlNum(char ch) {
-  return isalnum(static_cast<unsigned char>(ch)) != 0;
-}
-inline bool IsDigit(char ch) {
-  return isdigit(static_cast<unsigned char>(ch)) != 0;
-}
-inline bool IsLower(char ch) {
-  return islower(static_cast<unsigned char>(ch)) != 0;
-}
-inline bool IsSpace(char ch) {
-  return isspace(static_cast<unsigned char>(ch)) != 0;
-}
-inline bool IsUpper(char ch) {
-  return isupper(static_cast<unsigned char>(ch)) != 0;
-}
-inline bool IsXDigit(char ch) {
-  return isxdigit(static_cast<unsigned char>(ch)) != 0;
-}
-inline bool IsXDigit(wchar_t ch) {
-  const unsigned char low_byte = static_cast<unsigned char>(ch);
-  return ch == low_byte && isxdigit(low_byte) != 0;
-}
-
-inline char ToLower(char ch) {
-  return static_cast<char>(tolower(static_cast<unsigned char>(ch)));
-}
-inline char ToUpper(char ch) {
-  return static_cast<char>(toupper(static_cast<unsigned char>(ch)));
-}
-
-inline std::string StripTrailingSpaces(std::string str) {
-  std::string::iterator it = str.end();
-  while (it != str.begin() && IsSpace(*--it))
-    it = str.erase(it);
-  return str;
-}
-
-// The testing::internal::posix namespace holds wrappers for common
-// POSIX functions.  These wrappers hide the differences between
-// Windows/MSVC and POSIX systems.  Since some compilers define these
-// standard functions as macros, the wrapper cannot have the same name
-// as the wrapped function.
-
-namespace posix {
-
-// Functions with a different name on Windows.
-
-#if GTEST_OS_WINDOWS
-
-typedef struct _stat StatStruct;
-
-# ifdef __BORLANDC__
-inline int IsATTY(int fd) { return isatty(fd); }
-inline int StrCaseCmp(const char* s1, const char* s2) {
-  return stricmp(s1, s2);
-}
-inline char* StrDup(const char* src) { return strdup(src); }
-# else  // !__BORLANDC__
-#  if GTEST_OS_WINDOWS_MOBILE
-inline int IsATTY(int /* fd */) { return 0; }
-#  else
-inline int IsATTY(int fd) { return _isatty(fd); }
-#  endif  // GTEST_OS_WINDOWS_MOBILE
-inline int StrCaseCmp(const char* s1, const char* s2) {
-  return _stricmp(s1, s2);
-}
-inline char* StrDup(const char* src) { return _strdup(src); }
-# endif  // __BORLANDC__
-
-# if GTEST_OS_WINDOWS_MOBILE
-inline int FileNo(FILE* file) { return reinterpret_cast<int>(_fileno(file)); }
-// Stat(), RmDir(), and IsDir() are not needed on Windows CE at this
-// time and thus not defined there.
-# else
-inline int FileNo(FILE* file) { return _fileno(file); }
-inline int Stat(const char* path, StatStruct* buf) { return _stat(path, buf); }
-inline int RmDir(const char* dir) { return _rmdir(dir); }
-inline bool IsDir(const StatStruct& st) {
-  return (_S_IFDIR & st.st_mode) != 0;
-}
-# endif  // GTEST_OS_WINDOWS_MOBILE
-
-#else
-
-typedef struct stat StatStruct;
-
-inline int FileNo(FILE* file) { return fileno(file); }
-inline int IsATTY(int fd) { return isatty(fd); }
-inline int Stat(const char* path, StatStruct* buf) { return stat(path, buf); }
-inline int StrCaseCmp(const char* s1, const char* s2) {
-  return strcasecmp(s1, s2);
-}
-inline char* StrDup(const char* src) { return strdup(src); }
-inline int RmDir(const char* dir) { return rmdir(dir); }
-inline bool IsDir(const StatStruct& st) { return S_ISDIR(st.st_mode); }
-
-#endif  // GTEST_OS_WINDOWS
-
-// Functions deprecated by MSVC 8.0.
-
-GTEST_DISABLE_MSC_DEPRECATED_PUSH_()
-
-inline const char* StrNCpy(char* dest, const char* src, size_t n) {
-  return strncpy(dest, src, n);
-}
-
-// ChDir(), FReopen(), FDOpen(), Read(), Write(), Close(), and
-// StrError() aren't needed on Windows CE at this time and thus not
-// defined there.
-
-#if !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
-inline int ChDir(const char* dir) { return chdir(dir); }
-#endif
-inline FILE* FOpen(const char* path, const char* mode) {
-  return fopen(path, mode);
-}
-#if !GTEST_OS_WINDOWS_MOBILE
-inline FILE *FReopen(const char* path, const char* mode, FILE* stream) {
-  return freopen(path, mode, stream);
-}
-inline FILE* FDOpen(int fd, const char* mode) { return fdopen(fd, mode); }
-#endif
-inline int FClose(FILE* fp) { return fclose(fp); }
-#if !GTEST_OS_WINDOWS_MOBILE
-inline int Read(int fd, void* buf, unsigned int count) {
-  return static_cast<int>(read(fd, buf, count));
-}
-inline int Write(int fd, const void* buf, unsigned int count) {
-  return static_cast<int>(write(fd, buf, count));
-}
-inline int Close(int fd) { return close(fd); }
-inline const char* StrError(int errnum) { return strerror(errnum); }
-#endif
-inline const char* GetEnv(const char* name) {
-#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || GTEST_OS_WINDOWS_RT
-  // We are on Windows CE, which has no environment variables.
-  static_cast<void>(name);  // To prevent 'unused argument' warning.
-  return nullptr;
-#elif defined(__BORLANDC__) || defined(__SunOS_5_8) || defined(__SunOS_5_9)
-  // Environment variables which we programmatically clear will be set to the
-  // empty string rather than unset (NULL).  Handle that case.
-  const char* const env = getenv(name);
-  return (env != nullptr && env[0] != '\0') ? env : nullptr;
-#else
-  return getenv(name);
-#endif
-}
-
-GTEST_DISABLE_MSC_DEPRECATED_POP_()
-
-#if GTEST_OS_WINDOWS_MOBILE
-// Windows CE has no C library. The abort() function is used in
-// several places in Google Test. This implementation provides a reasonable
-// imitation of standard behaviour.
-[[noreturn]] void Abort();
-#else
-[[noreturn]] inline void Abort() { abort(); }
-#endif  // GTEST_OS_WINDOWS_MOBILE
-
-}  // namespace posix
-
-// MSVC "deprecates" snprintf and issues warnings wherever it is used.  In
-// order to avoid these warnings, we need to use _snprintf or _snprintf_s on
-// MSVC-based platforms.  We map the GTEST_SNPRINTF_ macro to the appropriate
-// function in order to achieve that.  We use macro definition here because
-// snprintf is a variadic function.
-#if _MSC_VER && !GTEST_OS_WINDOWS_MOBILE
-// MSVC 2005 and above support variadic macros.
-# define GTEST_SNPRINTF_(buffer, size, format, ...) \
-     _snprintf_s(buffer, size, size, format, __VA_ARGS__)
-#elif defined(_MSC_VER)
-// Windows CE does not define _snprintf_s
-# define GTEST_SNPRINTF_ _snprintf
-#else
-# define GTEST_SNPRINTF_ snprintf
-#endif
-
-// The maximum number a BiggestInt can represent.  This definition
-// works no matter BiggestInt is represented in one's complement or
-// two's complement.
-//
-// We cannot rely on numeric_limits in STL, as __int64 and long long
-// are not part of standard C++ and numeric_limits doesn't need to be
-// defined for them.
-const BiggestInt kMaxBiggestInt =
-    ~(static_cast<BiggestInt>(1) << (8*sizeof(BiggestInt) - 1));
-
-// This template class serves as a compile-time function from size to
-// type.  It maps a size in bytes to a primitive type with that
-// size. e.g.
-//
-//   TypeWithSize<4>::UInt
-//
-// is typedef-ed to be unsigned int (unsigned integer made up of 4
-// bytes).
-//
-// Such functionality should belong to STL, but I cannot find it
-// there.
-//
-// Google Test uses this class in the implementation of floating-point
-// comparison.
-//
-// For now it only handles UInt (unsigned int) as that's all Google Test
-// needs.  Other types can be easily added in the future if need
-// arises.
-template <size_t size>
-class TypeWithSize {
- public:
-  // This prevents the user from using TypeWithSize<N> with incorrect
-  // values of N.
-  typedef void UInt;
-};
-
-// The specialization for size 4.
-template <>
-class TypeWithSize<4> {
- public:
-  // unsigned int has size 4 in both gcc and MSVC.
-  //
-  // As base/basictypes.h doesn't compile on Windows, we cannot use
-  // uint32, uint64, and etc here.
-  typedef int Int;
-  typedef unsigned int UInt;
-};
-
-// The specialization for size 8.
-template <>
-class TypeWithSize<8> {
- public:
-#if GTEST_OS_WINDOWS
-  typedef __int64 Int;
-  typedef unsigned __int64 UInt;
-#else
-  typedef long long Int;  // NOLINT
-  typedef unsigned long long UInt;  // NOLINT
-#endif  // GTEST_OS_WINDOWS
-};
-
-// Integer types of known sizes.
-typedef TypeWithSize<4>::Int Int32;
-typedef TypeWithSize<4>::UInt UInt32;
-typedef TypeWithSize<8>::Int Int64;
-typedef TypeWithSize<8>::UInt UInt64;
-typedef TypeWithSize<8>::Int TimeInMillis;  // Represents time in milliseconds.
-
-// Utilities for command line flags and environment variables.
-
-// Macro for referencing flags.
-#if !defined(GTEST_FLAG)
-# define GTEST_FLAG(name) FLAGS_gtest_##name
-#endif  // !defined(GTEST_FLAG)
-
-#if !defined(GTEST_USE_OWN_FLAGFILE_FLAG_)
-# define GTEST_USE_OWN_FLAGFILE_FLAG_ 1
-#endif  // !defined(GTEST_USE_OWN_FLAGFILE_FLAG_)
-
-#if !defined(GTEST_DECLARE_bool_)
-# define GTEST_FLAG_SAVER_ ::testing::internal::GTestFlagSaver
-
-// Macros for declaring flags.
-# define GTEST_DECLARE_bool_(name) GTEST_API_ extern bool GTEST_FLAG(name)
-# define GTEST_DECLARE_int32_(name) \
-    GTEST_API_ extern ::testing::internal::Int32 GTEST_FLAG(name)
-# define GTEST_DECLARE_string_(name) \
-    GTEST_API_ extern ::std::string GTEST_FLAG(name)
-
-// Macros for defining flags.
-# define GTEST_DEFINE_bool_(name, default_val, doc) \
-    GTEST_API_ bool GTEST_FLAG(name) = (default_val)
-# define GTEST_DEFINE_int32_(name, default_val, doc) \
-    GTEST_API_ ::testing::internal::Int32 GTEST_FLAG(name) = (default_val)
-# define GTEST_DEFINE_string_(name, default_val, doc) \
-    GTEST_API_ ::std::string GTEST_FLAG(name) = (default_val)
-
-#endif  // !defined(GTEST_DECLARE_bool_)
-
-// Thread annotations
-#if !defined(GTEST_EXCLUSIVE_LOCK_REQUIRED_)
-# define GTEST_EXCLUSIVE_LOCK_REQUIRED_(locks)
-# define GTEST_LOCK_EXCLUDED_(locks)
-#endif  // !defined(GTEST_EXCLUSIVE_LOCK_REQUIRED_)
-
-// Parses 'str' for a 32-bit signed integer.  If successful, writes the result
-// to *value and returns true; otherwise leaves *value unchanged and returns
-// false.
-bool ParseInt32(const Message& src_text, const char* str, Int32* value);
-
-// Parses a bool/Int32/string from the environment variable
-// corresponding to the given Google Test flag.
-bool BoolFromGTestEnv(const char* flag, bool default_val);
-GTEST_API_ Int32 Int32FromGTestEnv(const char* flag, Int32 default_val);
-std::string OutputFlagAlsoCheckEnvVar();
-const char* StringFromGTestEnv(const char* flag, const char* default_val);
-
-}  // namespace internal
-}  // namespace testing
-
-#if !defined(GTEST_INTERNAL_DEPRECATED)
-
-// Internal Macro to mark an API deprecated, for googletest usage only
-// Usage: class GTEST_INTERNAL_DEPRECATED(message) MyClass or
-// GTEST_INTERNAL_DEPRECATED(message) <return_type> myFunction(); Every usage of
-// a deprecated entity will trigger a warning when compiled with
-// `-Wdeprecated-declarations` option (clang, gcc, any __GNUC__ compiler).
-// For msvc /W3 option will need to be used
-// Note that for 'other' compilers this macro evaluates to nothing to prevent
-// compilations errors.
-#if defined(_MSC_VER)
-#define GTEST_INTERNAL_DEPRECATED(message) __declspec(deprecated(message))
-#elif defined(__GNUC__)
-#define GTEST_INTERNAL_DEPRECATED(message) __attribute__((deprecated(message)))
-#else
-#define GTEST_INTERNAL_DEPRECATED(message)
-#endif
-
-#endif  // !defined(GTEST_INTERNAL_DEPRECATED)
-
-#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/gtest-string.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/gtest-string.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/gtest-string.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/gtest-string.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,171 +0,0 @@
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// The Google C++ Testing and Mocking Framework (Google Test)
-//
-// This header file declares the String class and functions used internally by
-// Google Test.  They are subject to change without notice. They should not used
-// by code external to Google Test.
-//
-// This header file is #included by gtest-internal.h.
-// It should not be #included by other files.
-
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_
-#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_
-
-#ifdef __BORLANDC__
-// string.h is not guaranteed to provide strcpy on C++ Builder.
-# include <mem.h>
-#endif
-
-#include <string.h>
-#include <string>
-
-#include "gtest/internal/gtest-port.h"
-
-namespace testing {
-namespace internal {
-
-// String - an abstract class holding static string utilities.
-class GTEST_API_ String {
- public:
-  // Static utility methods
-
-  // Clones a 0-terminated C string, allocating memory using new.  The
-  // caller is responsible for deleting the return value using
-  // delete[].  Returns the cloned string, or NULL if the input is
-  // NULL.
-  //
-  // This is different from strdup() in string.h, which allocates
-  // memory using malloc().
-  static const char* CloneCString(const char* c_str);
-
-#if GTEST_OS_WINDOWS_MOBILE
-  // Windows CE does not have the 'ANSI' versions of Win32 APIs. To be
-  // able to pass strings to Win32 APIs on CE we need to convert them
-  // to 'Unicode', UTF-16.
-
-  // Creates a UTF-16 wide string from the given ANSI string, allocating
-  // memory using new. The caller is responsible for deleting the return
-  // value using delete[]. Returns the wide string, or NULL if the
-  // input is NULL.
-  //
-  // The wide string is created using the ANSI codepage (CP_ACP) to
-  // match the behaviour of the ANSI versions of Win32 calls and the
-  // C runtime.
-  static LPCWSTR AnsiToUtf16(const char* c_str);
-
-  // Creates an ANSI string from the given wide string, allocating
-  // memory using new. The caller is responsible for deleting the return
-  // value using delete[]. Returns the ANSI string, or NULL if the
-  // input is NULL.
-  //
-  // The returned string is created using the ANSI codepage (CP_ACP) to
-  // match the behaviour of the ANSI versions of Win32 calls and the
-  // C runtime.
-  static const char* Utf16ToAnsi(LPCWSTR utf16_str);
-#endif
-
-  // Compares two C strings.  Returns true if and only if they have the same
-  // content.
-  //
-  // Unlike strcmp(), this function can handle NULL argument(s).  A
-  // NULL C string is considered different to any non-NULL C string,
-  // including the empty string.
-  static bool CStringEquals(const char* lhs, const char* rhs);
-
-  // Converts a wide C string to a String using the UTF-8 encoding.
-  // NULL will be converted to "(null)".  If an error occurred during
-  // the conversion, "(failed to convert from wide string)" is
-  // returned.
-  static std::string ShowWideCString(const wchar_t* wide_c_str);
-
-  // Compares two wide C strings.  Returns true if and only if they have the
-  // same content.
-  //
-  // Unlike wcscmp(), this function can handle NULL argument(s).  A
-  // NULL C string is considered different to any non-NULL C string,
-  // including the empty string.
-  static bool WideCStringEquals(const wchar_t* lhs, const wchar_t* rhs);
-
-  // Compares two C strings, ignoring case.  Returns true if and only if
-  // they have the same content.
-  //
-  // Unlike strcasecmp(), this function can handle NULL argument(s).
-  // A NULL C string is considered different to any non-NULL C string,
-  // including the empty string.
-  static bool CaseInsensitiveCStringEquals(const char* lhs,
-                                           const char* rhs);
-
-  // Compares two wide C strings, ignoring case.  Returns true if and only if
-  // they have the same content.
-  //
-  // Unlike wcscasecmp(), this function can handle NULL argument(s).
-  // A NULL C string is considered different to any non-NULL wide C string,
-  // including the empty string.
-  // NB: The implementations on different platforms slightly differ.
-  // On windows, this method uses _wcsicmp which compares according to LC_CTYPE
-  // environment variable. On GNU platform this method uses wcscasecmp
-  // which compares according to LC_CTYPE category of the current locale.
-  // On MacOS X, it uses towlower, which also uses LC_CTYPE category of the
-  // current locale.
-  static bool CaseInsensitiveWideCStringEquals(const wchar_t* lhs,
-                                               const wchar_t* rhs);
-
-  // Returns true if and only if the given string ends with the given suffix,
-  // ignoring case. Any string is considered to end with an empty suffix.
-  static bool EndsWithCaseInsensitive(
-      const std::string& str, const std::string& suffix);
-
-  // Formats an int value as "%02d".
-  static std::string FormatIntWidth2(int value);  // "%02d" for width == 2
-
-  // Formats an int value as "%X".
-  static std::string FormatHexInt(int value);
-
-  // Formats an int value as "%X".
-  static std::string FormatHexUInt32(UInt32 value);
-
-  // Formats a byte as "%02X".
-  static std::string FormatByte(unsigned char value);
-
- private:
-  String();  // Not meant to be instantiated.
-};  // class String
-
-// Gets the content of the stringstream's buffer as an std::string.  Each '\0'
-// character in the buffer is replaced with "\\0".
-GTEST_API_ std::string StringStreamToString(::std::stringstream* stream);
-
-}  // namespace internal
-}  // namespace testing
-
-#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/gtest-type-util.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/gtest-type-util.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/gtest-type-util.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/gtest-type-util.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,3335 +0,0 @@
-// This file was GENERATED by command:
-//     pump.py gtest-type-util.h.pump
-// DO NOT EDIT BY HAND!!!
-
-// Copyright 2008 Google Inc.
-// All Rights Reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Type utilities needed for implementing typed and type-parameterized
-// tests.  This file is generated by a SCRIPT.  DO NOT EDIT BY HAND!
-//
-// Currently we support at most 50 types in a list, and at most 50
-// type-parameterized tests in one type-parameterized test suite.
-// Please contact googletestframework@googlegroups.com if you need
-// more.
-
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
-#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
-
-#include "gtest/internal/gtest-port.h"
-
-// #ifdef __GNUC__ is too general here.  It is possible to use gcc without using
-// libstdc++ (which is where cxxabi.h comes from).
-# if GTEST_HAS_CXXABI_H_
-#  include <cxxabi.h>
-# elif defined(__HP_aCC)
-#  include <acxx_demangle.h>
-# endif  // GTEST_HASH_CXXABI_H_
-
-namespace testing {
-namespace internal {
-
-// Canonicalizes a given name with respect to the Standard C++ Library.
-// This handles removing the inline namespace within `std` that is
-// used by various standard libraries (e.g., `std::__1`).  Names outside
-// of namespace std are returned unmodified.
-inline std::string CanonicalizeForStdLibVersioning(std::string s) {
-  static const char prefix[] = "std::__";
-  if (s.compare(0, strlen(prefix), prefix) == 0) {
-    std::string::size_type end = s.find("::", strlen(prefix));
-    if (end != s.npos) {
-      // Erase everything between the initial `std` and the second `::`.
-      s.erase(strlen("std"), end - strlen("std"));
-    }
-  }
-  return s;
-}
-
-// GetTypeName<T>() returns a human-readable name of type T.
-// NB: This function is also used in Google Mock, so don't move it inside of
-// the typed-test-only section below.
-template <typename T>
-std::string GetTypeName() {
-# if GTEST_HAS_RTTI
-
-  const char* const name = typeid(T).name();
-#  if GTEST_HAS_CXXABI_H_ || defined(__HP_aCC)
-  int status = 0;
-  // gcc's implementation of typeid(T).name() mangles the type name,
-  // so we have to demangle it.
-#   if GTEST_HAS_CXXABI_H_
-  using abi::__cxa_demangle;
-#   endif  // GTEST_HAS_CXXABI_H_
-  char* const readable_name = __cxa_demangle(name, nullptr, nullptr, &status);
-  const std::string name_str(status == 0 ? readable_name : name);
-  free(readable_name);
-  return CanonicalizeForStdLibVersioning(name_str);
-#  else
-  return name;
-#  endif  // GTEST_HAS_CXXABI_H_ || __HP_aCC
-
-# else
-
-  return "<type>";
-
-# endif  // GTEST_HAS_RTTI
-}
-
-#if GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P
-
-// A unique type used as the default value for the arguments of class
-// template Types.  This allows us to simulate variadic templates
-// (e.g. Types<int>, Type<int, double>, and etc), which C++ doesn't
-// support directly.
-struct None {};
-
-// The following family of struct and struct templates are used to
-// represent type lists.  In particular, TypesN<T1, T2, ..., TN>
-// represents a type list with N types (T1, T2, ..., and TN) in it.
-// Except for Types0, every struct in the family has two member types:
-// Head for the first type in the list, and Tail for the rest of the
-// list.
-
-// The empty type list.
-struct Types0 {};
-
-// Type lists of length 1, 2, 3, and so on.
-
-template <typename T1>
-struct Types1 {
-  typedef T1 Head;
-  typedef Types0 Tail;
-};
-template <typename T1, typename T2>
-struct Types2 {
-  typedef T1 Head;
-  typedef Types1<T2> Tail;
-};
-
-template <typename T1, typename T2, typename T3>
-struct Types3 {
-  typedef T1 Head;
-  typedef Types2<T2, T3> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4>
-struct Types4 {
-  typedef T1 Head;
-  typedef Types3<T2, T3, T4> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5>
-struct Types5 {
-  typedef T1 Head;
-  typedef Types4<T2, T3, T4, T5> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6>
-struct Types6 {
-  typedef T1 Head;
-  typedef Types5<T2, T3, T4, T5, T6> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7>
-struct Types7 {
-  typedef T1 Head;
-  typedef Types6<T2, T3, T4, T5, T6, T7> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8>
-struct Types8 {
-  typedef T1 Head;
-  typedef Types7<T2, T3, T4, T5, T6, T7, T8> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9>
-struct Types9 {
-  typedef T1 Head;
-  typedef Types8<T2, T3, T4, T5, T6, T7, T8, T9> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10>
-struct Types10 {
-  typedef T1 Head;
-  typedef Types9<T2, T3, T4, T5, T6, T7, T8, T9, T10> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11>
-struct Types11 {
-  typedef T1 Head;
-  typedef Types10<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12>
-struct Types12 {
-  typedef T1 Head;
-  typedef Types11<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13>
-struct Types13 {
-  typedef T1 Head;
-  typedef Types12<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14>
-struct Types14 {
-  typedef T1 Head;
-  typedef Types13<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15>
-struct Types15 {
-  typedef T1 Head;
-  typedef Types14<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16>
-struct Types16 {
-  typedef T1 Head;
-  typedef Types15<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17>
-struct Types17 {
-  typedef T1 Head;
-  typedef Types16<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18>
-struct Types18 {
-  typedef T1 Head;
-  typedef Types17<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19>
-struct Types19 {
-  typedef T1 Head;
-  typedef Types18<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20>
-struct Types20 {
-  typedef T1 Head;
-  typedef Types19<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21>
-struct Types21 {
-  typedef T1 Head;
-  typedef Types20<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22>
-struct Types22 {
-  typedef T1 Head;
-  typedef Types21<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23>
-struct Types23 {
-  typedef T1 Head;
-  typedef Types22<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24>
-struct Types24 {
-  typedef T1 Head;
-  typedef Types23<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25>
-struct Types25 {
-  typedef T1 Head;
-  typedef Types24<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26>
-struct Types26 {
-  typedef T1 Head;
-  typedef Types25<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27>
-struct Types27 {
-  typedef T1 Head;
-  typedef Types26<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28>
-struct Types28 {
-  typedef T1 Head;
-  typedef Types27<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29>
-struct Types29 {
-  typedef T1 Head;
-  typedef Types28<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30>
-struct Types30 {
-  typedef T1 Head;
-  typedef Types29<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31>
-struct Types31 {
-  typedef T1 Head;
-  typedef Types30<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32>
-struct Types32 {
-  typedef T1 Head;
-  typedef Types31<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31, T32> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33>
-struct Types33 {
-  typedef T1 Head;
-  typedef Types32<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31, T32, T33> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34>
-struct Types34 {
-  typedef T1 Head;
-  typedef Types33<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31, T32, T33, T34> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35>
-struct Types35 {
-  typedef T1 Head;
-  typedef Types34<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31, T32, T33, T34, T35> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36>
-struct Types36 {
-  typedef T1 Head;
-  typedef Types35<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31, T32, T33, T34, T35, T36> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37>
-struct Types37 {
-  typedef T1 Head;
-  typedef Types36<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31, T32, T33, T34, T35, T36, T37> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38>
-struct Types38 {
-  typedef T1 Head;
-  typedef Types37<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31, T32, T33, T34, T35, T36, T37, T38> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39>
-struct Types39 {
-  typedef T1 Head;
-  typedef Types38<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40>
-struct Types40 {
-  typedef T1 Head;
-  typedef Types39<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41>
-struct Types41 {
-  typedef T1 Head;
-  typedef Types40<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41, typename T42>
-struct Types42 {
-  typedef T1 Head;
-  typedef Types41<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41, typename T42, typename T43>
-struct Types43 {
-  typedef T1 Head;
-  typedef Types42<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
-      T43> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41, typename T42, typename T43, typename T44>
-struct Types44 {
-  typedef T1 Head;
-  typedef Types43<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
-      T44> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41, typename T42, typename T43, typename T44, typename T45>
-struct Types45 {
-  typedef T1 Head;
-  typedef Types44<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
-      T44, T45> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41, typename T42, typename T43, typename T44, typename T45,
-    typename T46>
-struct Types46 {
-  typedef T1 Head;
-  typedef Types45<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
-      T44, T45, T46> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41, typename T42, typename T43, typename T44, typename T45,
-    typename T46, typename T47>
-struct Types47 {
-  typedef T1 Head;
-  typedef Types46<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
-      T44, T45, T46, T47> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41, typename T42, typename T43, typename T44, typename T45,
-    typename T46, typename T47, typename T48>
-struct Types48 {
-  typedef T1 Head;
-  typedef Types47<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
-      T44, T45, T46, T47, T48> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41, typename T42, typename T43, typename T44, typename T45,
-    typename T46, typename T47, typename T48, typename T49>
-struct Types49 {
-  typedef T1 Head;
-  typedef Types48<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
-      T44, T45, T46, T47, T48, T49> Tail;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41, typename T42, typename T43, typename T44, typename T45,
-    typename T46, typename T47, typename T48, typename T49, typename T50>
-struct Types50 {
-  typedef T1 Head;
-  typedef Types49<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
-      T44, T45, T46, T47, T48, T49, T50> Tail;
-};
-
-
-}  // namespace internal
-
-// We don't want to require the users to write TypesN<...> directly,
-// as that would require them to count the length.  Types<...> is much
-// easier to write, but generates horrible messages when there is a
-// compiler error, as gcc insists on printing out each template
-// argument, even if it has the default value (this means Types<int>
-// will appear as Types<int, None, None, ..., None> in the compiler
-// errors).
-//
-// Our solution is to combine the best part of the two approaches: a
-// user would write Types<T1, ..., TN>, and Google Test will translate
-// that to TypesN<T1, ..., TN> internally to make error messages
-// readable.  The translation is done by the 'type' member of the
-// Types template.
-template <typename T1 = internal::None, typename T2 = internal::None,
-    typename T3 = internal::None, typename T4 = internal::None,
-    typename T5 = internal::None, typename T6 = internal::None,
-    typename T7 = internal::None, typename T8 = internal::None,
-    typename T9 = internal::None, typename T10 = internal::None,
-    typename T11 = internal::None, typename T12 = internal::None,
-    typename T13 = internal::None, typename T14 = internal::None,
-    typename T15 = internal::None, typename T16 = internal::None,
-    typename T17 = internal::None, typename T18 = internal::None,
-    typename T19 = internal::None, typename T20 = internal::None,
-    typename T21 = internal::None, typename T22 = internal::None,
-    typename T23 = internal::None, typename T24 = internal::None,
-    typename T25 = internal::None, typename T26 = internal::None,
-    typename T27 = internal::None, typename T28 = internal::None,
-    typename T29 = internal::None, typename T30 = internal::None,
-    typename T31 = internal::None, typename T32 = internal::None,
-    typename T33 = internal::None, typename T34 = internal::None,
-    typename T35 = internal::None, typename T36 = internal::None,
-    typename T37 = internal::None, typename T38 = internal::None,
-    typename T39 = internal::None, typename T40 = internal::None,
-    typename T41 = internal::None, typename T42 = internal::None,
-    typename T43 = internal::None, typename T44 = internal::None,
-    typename T45 = internal::None, typename T46 = internal::None,
-    typename T47 = internal::None, typename T48 = internal::None,
-    typename T49 = internal::None, typename T50 = internal::None>
-struct Types {
-  typedef internal::Types50<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
-      T41, T42, T43, T44, T45, T46, T47, T48, T49, T50> type;
-};
-
-template <>
-struct Types<internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None> {
-  typedef internal::Types0 type;
-};
-template <typename T1>
-struct Types<T1, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None> {
-  typedef internal::Types1<T1> type;
-};
-template <typename T1, typename T2>
-struct Types<T1, T2, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None> {
-  typedef internal::Types2<T1, T2> type;
-};
-template <typename T1, typename T2, typename T3>
-struct Types<T1, T2, T3, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None> {
-  typedef internal::Types3<T1, T2, T3> type;
-};
-template <typename T1, typename T2, typename T3, typename T4>
-struct Types<T1, T2, T3, T4, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None> {
-  typedef internal::Types4<T1, T2, T3, T4> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5>
-struct Types<T1, T2, T3, T4, T5, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None> {
-  typedef internal::Types5<T1, T2, T3, T4, T5> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6>
-struct Types<T1, T2, T3, T4, T5, T6, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None> {
-  typedef internal::Types6<T1, T2, T3, T4, T5, T6> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7>
-struct Types<T1, T2, T3, T4, T5, T6, T7, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None> {
-  typedef internal::Types7<T1, T2, T3, T4, T5, T6, T7> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None> {
-  typedef internal::Types8<T1, T2, T3, T4, T5, T6, T7, T8> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None> {
-  typedef internal::Types9<T1, T2, T3, T4, T5, T6, T7, T8, T9> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None> {
-  typedef internal::Types10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None> {
-  typedef internal::Types11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None> {
-  typedef internal::Types12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
-      T12> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None> {
-  typedef internal::Types13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None> {
-  typedef internal::Types14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None> {
-  typedef internal::Types15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None> {
-  typedef internal::Types16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None> {
-  typedef internal::Types17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None> {
-  typedef internal::Types18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None> {
-  typedef internal::Types19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None> {
-  typedef internal::Types20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None> {
-  typedef internal::Types21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None> {
-  typedef internal::Types22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None> {
-  typedef internal::Types23<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None> {
-  typedef internal::Types24<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None> {
-  typedef internal::Types25<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None> {
-  typedef internal::Types26<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
-      T26> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None> {
-  typedef internal::Types27<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None> {
-  typedef internal::Types28<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None> {
-  typedef internal::Types29<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None> {
-  typedef internal::Types30<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None> {
-  typedef internal::Types31<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None> {
-  typedef internal::Types32<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None> {
-  typedef internal::Types33<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32, T33> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None> {
-  typedef internal::Types34<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32, T33, T34> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, T35, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None> {
-  typedef internal::Types35<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32, T33, T34, T35> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, T35, T36, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None> {
-  typedef internal::Types36<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, T35, T36, T37, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None> {
-  typedef internal::Types37<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, T35, T36, T37, T38, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None> {
-  typedef internal::Types38<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, T35, T36, T37, T38, T39, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None> {
-  typedef internal::Types39<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None> {
-  typedef internal::Types40<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39,
-      T40> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None, internal::None> {
-  typedef internal::Types41<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
-      T41> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41, typename T42>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, internal::None,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None> {
-  typedef internal::Types42<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
-      T41, T42> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41, typename T42, typename T43>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None, internal::None> {
-  typedef internal::Types43<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
-      T41, T42, T43> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41, typename T42, typename T43, typename T44>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None, internal::None> {
-  typedef internal::Types44<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
-      T41, T42, T43, T44> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41, typename T42, typename T43, typename T44, typename T45>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44, T45,
-    internal::None, internal::None, internal::None, internal::None,
-    internal::None> {
-  typedef internal::Types45<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
-      T41, T42, T43, T44, T45> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41, typename T42, typename T43, typename T44, typename T45,
-    typename T46>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44, T45,
-    T46, internal::None, internal::None, internal::None, internal::None> {
-  typedef internal::Types46<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
-      T41, T42, T43, T44, T45, T46> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41, typename T42, typename T43, typename T44, typename T45,
-    typename T46, typename T47>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44, T45,
-    T46, T47, internal::None, internal::None, internal::None> {
-  typedef internal::Types47<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
-      T41, T42, T43, T44, T45, T46, T47> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41, typename T42, typename T43, typename T44, typename T45,
-    typename T46, typename T47, typename T48>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44, T45,
-    T46, T47, T48, internal::None, internal::None> {
-  typedef internal::Types48<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
-      T41, T42, T43, T44, T45, T46, T47, T48> type;
-};
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41, typename T42, typename T43, typename T44, typename T45,
-    typename T46, typename T47, typename T48, typename T49>
-struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
-    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
-    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44, T45,
-    T46, T47, T48, T49, internal::None> {
-  typedef internal::Types49<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
-      T41, T42, T43, T44, T45, T46, T47, T48, T49> type;
-};
-
-namespace internal {
-
-# define GTEST_TEMPLATE_ template <typename T> class
-
-// The template "selector" struct TemplateSel<Tmpl> is used to
-// represent Tmpl, which must be a class template with one type
-// parameter, as a type.  TemplateSel<Tmpl>::Bind<T>::type is defined
-// as the type Tmpl<T>.  This allows us to actually instantiate the
-// template "selected" by TemplateSel<Tmpl>.
-//
-// This trick is necessary for simulating typedef for class templates,
-// which C++ doesn't support directly.
-template <GTEST_TEMPLATE_ Tmpl>
-struct TemplateSel {
-  template <typename T>
-  struct Bind {
-    typedef Tmpl<T> type;
-  };
-};
-
-# define GTEST_BIND_(TmplSel, T) \
-  TmplSel::template Bind<T>::type
-
-// A unique struct template used as the default value for the
-// arguments of class template Templates.  This allows us to simulate
-// variadic templates (e.g. Templates<int>, Templates<int, double>,
-// and etc), which C++ doesn't support directly.
-template <typename T>
-struct NoneT {};
-
-// The following family of struct and struct templates are used to
-// represent template lists.  In particular, TemplatesN<T1, T2, ...,
-// TN> represents a list of N templates (T1, T2, ..., and TN).  Except
-// for Templates0, every struct in the family has two member types:
-// Head for the selector of the first template in the list, and Tail
-// for the rest of the list.
-
-// The empty template list.
-struct Templates0 {};
-
-// Template lists of length 1, 2, 3, and so on.
-
-template <GTEST_TEMPLATE_ T1>
-struct Templates1 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates0 Tail;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2>
-struct Templates2 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates1<T2> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3>
-struct Templates3 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates2<T2, T3> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4>
-struct Templates4 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates3<T2, T3, T4> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5>
-struct Templates5 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates4<T2, T3, T4, T5> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6>
-struct Templates6 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates5<T2, T3, T4, T5, T6> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7>
-struct Templates7 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates6<T2, T3, T4, T5, T6, T7> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8>
-struct Templates8 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates7<T2, T3, T4, T5, T6, T7, T8> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9>
-struct Templates9 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates8<T2, T3, T4, T5, T6, T7, T8, T9> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10>
-struct Templates10 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates9<T2, T3, T4, T5, T6, T7, T8, T9, T10> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11>
-struct Templates11 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates10<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12>
-struct Templates12 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates11<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13>
-struct Templates13 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates12<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14>
-struct Templates14 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates13<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15>
-struct Templates15 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates14<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16>
-struct Templates16 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates15<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17>
-struct Templates17 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates16<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18>
-struct Templates18 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates17<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19>
-struct Templates19 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates18<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20>
-struct Templates20 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates19<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21>
-struct Templates21 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates20<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22>
-struct Templates22 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates21<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23>
-struct Templates23 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates22<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24>
-struct Templates24 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates23<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25>
-struct Templates25 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates24<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26>
-struct Templates26 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates25<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27>
-struct Templates27 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates26<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28>
-struct Templates28 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates27<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29>
-struct Templates29 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates28<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30>
-struct Templates30 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates29<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31>
-struct Templates31 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates30<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32>
-struct Templates32 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates31<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31, T32> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33>
-struct Templates33 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates32<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31, T32, T33> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34>
-struct Templates34 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates33<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31, T32, T33, T34> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35>
-struct Templates35 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates34<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31, T32, T33, T34, T35> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36>
-struct Templates36 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates35<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31, T32, T33, T34, T35, T36> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37>
-struct Templates37 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates36<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31, T32, T33, T34, T35, T36, T37> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38>
-struct Templates38 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates37<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39>
-struct Templates39 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates38<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40>
-struct Templates40 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates39<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41>
-struct Templates41 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates40<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42>
-struct Templates42 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates41<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
-      T42> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
-    GTEST_TEMPLATE_ T43>
-struct Templates43 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates42<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
-      T43> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
-    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44>
-struct Templates44 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates43<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
-      T43, T44> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
-    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45>
-struct Templates45 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates44<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
-      T43, T44, T45> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
-    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45,
-    GTEST_TEMPLATE_ T46>
-struct Templates46 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates45<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
-      T43, T44, T45, T46> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
-    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45,
-    GTEST_TEMPLATE_ T46, GTEST_TEMPLATE_ T47>
-struct Templates47 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates46<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
-      T43, T44, T45, T46, T47> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
-    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45,
-    GTEST_TEMPLATE_ T46, GTEST_TEMPLATE_ T47, GTEST_TEMPLATE_ T48>
-struct Templates48 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates47<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
-      T43, T44, T45, T46, T47, T48> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
-    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45,
-    GTEST_TEMPLATE_ T46, GTEST_TEMPLATE_ T47, GTEST_TEMPLATE_ T48,
-    GTEST_TEMPLATE_ T49>
-struct Templates49 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates48<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
-      T43, T44, T45, T46, T47, T48, T49> Tail;
-};
-
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
-    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45,
-    GTEST_TEMPLATE_ T46, GTEST_TEMPLATE_ T47, GTEST_TEMPLATE_ T48,
-    GTEST_TEMPLATE_ T49, GTEST_TEMPLATE_ T50>
-struct Templates50 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates49<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
-      T43, T44, T45, T46, T47, T48, T49, T50> Tail;
-};
-
-
-// We don't want to require the users to write TemplatesN<...> directly,
-// as that would require them to count the length.  Templates<...> is much
-// easier to write, but generates horrible messages when there is a
-// compiler error, as gcc insists on printing out each template
-// argument, even if it has the default value (this means Templates<list>
-// will appear as Templates<list, NoneT, NoneT, ..., NoneT> in the compiler
-// errors).
-//
-// Our solution is to combine the best part of the two approaches: a
-// user would write Templates<T1, ..., TN>, and Google Test will translate
-// that to TemplatesN<T1, ..., TN> internally to make error messages
-// readable.  The translation is done by the 'type' member of the
-// Templates template.
-template <GTEST_TEMPLATE_ T1 = NoneT, GTEST_TEMPLATE_ T2 = NoneT,
-    GTEST_TEMPLATE_ T3 = NoneT, GTEST_TEMPLATE_ T4 = NoneT,
-    GTEST_TEMPLATE_ T5 = NoneT, GTEST_TEMPLATE_ T6 = NoneT,
-    GTEST_TEMPLATE_ T7 = NoneT, GTEST_TEMPLATE_ T8 = NoneT,
-    GTEST_TEMPLATE_ T9 = NoneT, GTEST_TEMPLATE_ T10 = NoneT,
-    GTEST_TEMPLATE_ T11 = NoneT, GTEST_TEMPLATE_ T12 = NoneT,
-    GTEST_TEMPLATE_ T13 = NoneT, GTEST_TEMPLATE_ T14 = NoneT,
-    GTEST_TEMPLATE_ T15 = NoneT, GTEST_TEMPLATE_ T16 = NoneT,
-    GTEST_TEMPLATE_ T17 = NoneT, GTEST_TEMPLATE_ T18 = NoneT,
-    GTEST_TEMPLATE_ T19 = NoneT, GTEST_TEMPLATE_ T20 = NoneT,
-    GTEST_TEMPLATE_ T21 = NoneT, GTEST_TEMPLATE_ T22 = NoneT,
-    GTEST_TEMPLATE_ T23 = NoneT, GTEST_TEMPLATE_ T24 = NoneT,
-    GTEST_TEMPLATE_ T25 = NoneT, GTEST_TEMPLATE_ T26 = NoneT,
-    GTEST_TEMPLATE_ T27 = NoneT, GTEST_TEMPLATE_ T28 = NoneT,
-    GTEST_TEMPLATE_ T29 = NoneT, GTEST_TEMPLATE_ T30 = NoneT,
-    GTEST_TEMPLATE_ T31 = NoneT, GTEST_TEMPLATE_ T32 = NoneT,
-    GTEST_TEMPLATE_ T33 = NoneT, GTEST_TEMPLATE_ T34 = NoneT,
-    GTEST_TEMPLATE_ T35 = NoneT, GTEST_TEMPLATE_ T36 = NoneT,
-    GTEST_TEMPLATE_ T37 = NoneT, GTEST_TEMPLATE_ T38 = NoneT,
-    GTEST_TEMPLATE_ T39 = NoneT, GTEST_TEMPLATE_ T40 = NoneT,
-    GTEST_TEMPLATE_ T41 = NoneT, GTEST_TEMPLATE_ T42 = NoneT,
-    GTEST_TEMPLATE_ T43 = NoneT, GTEST_TEMPLATE_ T44 = NoneT,
-    GTEST_TEMPLATE_ T45 = NoneT, GTEST_TEMPLATE_ T46 = NoneT,
-    GTEST_TEMPLATE_ T47 = NoneT, GTEST_TEMPLATE_ T48 = NoneT,
-    GTEST_TEMPLATE_ T49 = NoneT, GTEST_TEMPLATE_ T50 = NoneT>
-struct Templates {
-  typedef Templates50<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
-      T42, T43, T44, T45, T46, T47, T48, T49, T50> type;
-};
-
-template <>
-struct Templates<NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT> {
-  typedef Templates0 type;
-};
-template <GTEST_TEMPLATE_ T1>
-struct Templates<T1, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT> {
-  typedef Templates1<T1> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2>
-struct Templates<T1, T2, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT> {
-  typedef Templates2<T1, T2> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3>
-struct Templates<T1, T2, T3, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates3<T1, T2, T3> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4>
-struct Templates<T1, T2, T3, T4, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates4<T1, T2, T3, T4> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5>
-struct Templates<T1, T2, T3, T4, T5, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates5<T1, T2, T3, T4, T5> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6>
-struct Templates<T1, T2, T3, T4, T5, T6, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates6<T1, T2, T3, T4, T5, T6> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates7<T1, T2, T3, T4, T5, T6, T7> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates8<T1, T2, T3, T4, T5, T6, T7, T8> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates9<T1, T2, T3, T4, T5, T6, T7, T8, T9> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT> {
-  typedef Templates22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT> {
-  typedef Templates23<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT> {
-  typedef Templates24<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT> {
-  typedef Templates25<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT> {
-  typedef Templates26<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT> {
-  typedef Templates27<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT> {
-  typedef Templates28<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT> {
-  typedef Templates29<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates30<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, T31, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates31<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, T31, T32, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates32<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31, T32> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, T31, T32, T33, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates33<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31, T32, T33> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, T31, T32, T33, T34, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates34<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31, T32, T33, T34> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, T31, T32, T33, T34, T35, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates35<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31, T32, T33, T34, T35> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, T31, T32, T33, T34, T35, T36, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates36<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31, T32, T33, T34, T35, T36> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, T31, T32, T33, T34, T35, T36, T37, NoneT, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates37<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, T31, T32, T33, T34, T35, T36, T37, T38, NoneT, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates38<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates39<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, NoneT, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates40<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, NoneT, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates41<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
-      T41> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, NoneT,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates42<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
-      T42> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
-    GTEST_TEMPLATE_ T43>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates43<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
-      T42, T43> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
-    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44,
-    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates44<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
-      T42, T43, T44> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
-    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44,
-    T45, NoneT, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates45<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
-      T42, T43, T44, T45> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
-    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45,
-    GTEST_TEMPLATE_ T46>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44,
-    T45, T46, NoneT, NoneT, NoneT, NoneT> {
-  typedef Templates46<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
-      T42, T43, T44, T45, T46> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
-    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45,
-    GTEST_TEMPLATE_ T46, GTEST_TEMPLATE_ T47>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44,
-    T45, T46, T47, NoneT, NoneT, NoneT> {
-  typedef Templates47<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
-      T42, T43, T44, T45, T46, T47> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
-    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45,
-    GTEST_TEMPLATE_ T46, GTEST_TEMPLATE_ T47, GTEST_TEMPLATE_ T48>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44,
-    T45, T46, T47, T48, NoneT, NoneT> {
-  typedef Templates48<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
-      T42, T43, T44, T45, T46, T47, T48> type;
-};
-template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
-    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
-    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
-    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
-    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
-    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
-    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
-    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
-    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
-    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
-    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
-    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
-    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
-    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
-    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45,
-    GTEST_TEMPLATE_ T46, GTEST_TEMPLATE_ T47, GTEST_TEMPLATE_ T48,
-    GTEST_TEMPLATE_ T49>
-struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
-    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
-    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44,
-    T45, T46, T47, T48, T49, NoneT> {
-  typedef Templates49<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
-      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
-      T42, T43, T44, T45, T46, T47, T48, T49> type;
-};
-
-// The TypeList template makes it possible to use either a single type
-// or a Types<...> list in TYPED_TEST_SUITE() and
-// INSTANTIATE_TYPED_TEST_SUITE_P().
-
-template <typename T>
-struct TypeList {
-  typedef Types1<T> type;
-};
-
-template <typename T1, typename T2, typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8, typename T9, typename T10,
-    typename T11, typename T12, typename T13, typename T14, typename T15,
-    typename T16, typename T17, typename T18, typename T19, typename T20,
-    typename T21, typename T22, typename T23, typename T24, typename T25,
-    typename T26, typename T27, typename T28, typename T29, typename T30,
-    typename T31, typename T32, typename T33, typename T34, typename T35,
-    typename T36, typename T37, typename T38, typename T39, typename T40,
-    typename T41, typename T42, typename T43, typename T44, typename T45,
-    typename T46, typename T47, typename T48, typename T49, typename T50>
-struct TypeList<Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
-    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
-    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
-    T44, T45, T46, T47, T48, T49, T50> > {
-  typedef typename Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
-      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
-      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
-      T41, T42, T43, T44, T45, T46, T47, T48, T49, T50>::type type;
-};
-
-#endif  // GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P
-
-}  // namespace internal
-}  // namespace testing
-
-#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/gtest-type-util.h.pump mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/gtest-type-util.h.pump
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/gtest-type-util.h.pump	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/include/gtest/internal/gtest-type-util.h.pump	1970-01-01 00:00:00.000000000 +0000
@@ -1,302 +0,0 @@
-$$ -*- mode: c++; -*-
-$var n = 50  $$ Maximum length of type lists we want to support.
-// Copyright 2008 Google Inc.
-// All Rights Reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Type utilities needed for implementing typed and type-parameterized
-// tests.  This file is generated by a SCRIPT.  DO NOT EDIT BY HAND!
-//
-// Currently we support at most $n types in a list, and at most $n
-// type-parameterized tests in one type-parameterized test suite.
-// Please contact googletestframework@googlegroups.com if you need
-// more.
-
-// GOOGLETEST_CM0001 DO NOT DELETE
-
-#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
-#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
-
-#include "gtest/internal/gtest-port.h"
-
-// #ifdef __GNUC__ is too general here.  It is possible to use gcc without using
-// libstdc++ (which is where cxxabi.h comes from).
-# if GTEST_HAS_CXXABI_H_
-#  include <cxxabi.h>
-# elif defined(__HP_aCC)
-#  include <acxx_demangle.h>
-# endif  // GTEST_HASH_CXXABI_H_
-
-namespace testing {
-namespace internal {
-
-// Canonicalizes a given name with respect to the Standard C++ Library.
-// This handles removing the inline namespace within `std` that is
-// used by various standard libraries (e.g., `std::__1`).  Names outside
-// of namespace std are returned unmodified.
-inline std::string CanonicalizeForStdLibVersioning(std::string s) {
-  static const char prefix[] = "std::__";
-  if (s.compare(0, strlen(prefix), prefix) == 0) {
-    std::string::size_type end = s.find("::", strlen(prefix));
-    if (end != s.npos) {
-      // Erase everything between the initial `std` and the second `::`.
-      s.erase(strlen("std"), end - strlen("std"));
-    }
-  }
-  return s;
-}
-
-// GetTypeName<T>() returns a human-readable name of type T.
-// NB: This function is also used in Google Mock, so don't move it inside of
-// the typed-test-only section below.
-template <typename T>
-std::string GetTypeName() {
-# if GTEST_HAS_RTTI
-
-  const char* const name = typeid(T).name();
-#  if GTEST_HAS_CXXABI_H_ || defined(__HP_aCC)
-  int status = 0;
-  // gcc's implementation of typeid(T).name() mangles the type name,
-  // so we have to demangle it.
-#   if GTEST_HAS_CXXABI_H_
-  using abi::__cxa_demangle;
-#   endif  // GTEST_HAS_CXXABI_H_
-  char* const readable_name = __cxa_demangle(name, nullptr, nullptr, &status);
-  const std::string name_str(status == 0 ? readable_name : name);
-  free(readable_name);
-  return CanonicalizeForStdLibVersioning(name_str);
-#  else
-  return name;
-#  endif  // GTEST_HAS_CXXABI_H_ || __HP_aCC
-
-# else
-
-  return "<type>";
-
-# endif  // GTEST_HAS_RTTI
-}
-
-#if GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P
-
-// A unique type used as the default value for the arguments of class
-// template Types.  This allows us to simulate variadic templates
-// (e.g. Types<int>, Type<int, double>, and etc), which C++ doesn't
-// support directly.
-struct None {};
-
-// The following family of struct and struct templates are used to
-// represent type lists.  In particular, TypesN<T1, T2, ..., TN>
-// represents a type list with N types (T1, T2, ..., and TN) in it.
-// Except for Types0, every struct in the family has two member types:
-// Head for the first type in the list, and Tail for the rest of the
-// list.
-
-// The empty type list.
-struct Types0 {};
-
-// Type lists of length 1, 2, 3, and so on.
-
-template <typename T1>
-struct Types1 {
-  typedef T1 Head;
-  typedef Types0 Tail;
-};
-
-$range i 2..n
-
-$for i [[
-$range j 1..i
-$range k 2..i
-template <$for j, [[typename T$j]]>
-struct Types$i {
-  typedef T1 Head;
-  typedef Types$(i-1)<$for k, [[T$k]]> Tail;
-};
-
-
-]]
-
-}  // namespace internal
-
-// We don't want to require the users to write TypesN<...> directly,
-// as that would require them to count the length.  Types<...> is much
-// easier to write, but generates horrible messages when there is a
-// compiler error, as gcc insists on printing out each template
-// argument, even if it has the default value (this means Types<int>
-// will appear as Types<int, None, None, ..., None> in the compiler
-// errors).
-//
-// Our solution is to combine the best part of the two approaches: a
-// user would write Types<T1, ..., TN>, and Google Test will translate
-// that to TypesN<T1, ..., TN> internally to make error messages
-// readable.  The translation is done by the 'type' member of the
-// Types template.
-
-$range i 1..n
-template <$for i, [[typename T$i = internal::None]]>
-struct Types {
-  typedef internal::Types$n<$for i, [[T$i]]> type;
-};
-
-template <>
-struct Types<$for i, [[internal::None]]> {
-  typedef internal::Types0 type;
-};
-
-$range i 1..n-1
-$for i [[
-$range j 1..i
-$range k i+1..n
-template <$for j, [[typename T$j]]>
-struct Types<$for j, [[T$j]]$for k[[, internal::None]]> {
-  typedef internal::Types$i<$for j, [[T$j]]> type;
-};
-
-]]
-
-namespace internal {
-
-# define GTEST_TEMPLATE_ template <typename T> class
-
-// The template "selector" struct TemplateSel<Tmpl> is used to
-// represent Tmpl, which must be a class template with one type
-// parameter, as a type.  TemplateSel<Tmpl>::Bind<T>::type is defined
-// as the type Tmpl<T>.  This allows us to actually instantiate the
-// template "selected" by TemplateSel<Tmpl>.
-//
-// This trick is necessary for simulating typedef for class templates,
-// which C++ doesn't support directly.
-template <GTEST_TEMPLATE_ Tmpl>
-struct TemplateSel {
-  template <typename T>
-  struct Bind {
-    typedef Tmpl<T> type;
-  };
-};
-
-# define GTEST_BIND_(TmplSel, T) \
-  TmplSel::template Bind<T>::type
-
-// A unique struct template used as the default value for the
-// arguments of class template Templates.  This allows us to simulate
-// variadic templates (e.g. Templates<int>, Templates<int, double>,
-// and etc), which C++ doesn't support directly.
-template <typename T>
-struct NoneT {};
-
-// The following family of struct and struct templates are used to
-// represent template lists.  In particular, TemplatesN<T1, T2, ...,
-// TN> represents a list of N templates (T1, T2, ..., and TN).  Except
-// for Templates0, every struct in the family has two member types:
-// Head for the selector of the first template in the list, and Tail
-// for the rest of the list.
-
-// The empty template list.
-struct Templates0 {};
-
-// Template lists of length 1, 2, 3, and so on.
-
-template <GTEST_TEMPLATE_ T1>
-struct Templates1 {
-  typedef TemplateSel<T1> Head;
-  typedef Templates0 Tail;
-};
-
-$range i 2..n
-
-$for i [[
-$range j 1..i
-$range k 2..i
-template <$for j, [[GTEST_TEMPLATE_ T$j]]>
-struct Templates$i {
-  typedef TemplateSel<T1> Head;
-  typedef Templates$(i-1)<$for k, [[T$k]]> Tail;
-};
-
-
-]]
-
-// We don't want to require the users to write TemplatesN<...> directly,
-// as that would require them to count the length.  Templates<...> is much
-// easier to write, but generates horrible messages when there is a
-// compiler error, as gcc insists on printing out each template
-// argument, even if it has the default value (this means Templates<list>
-// will appear as Templates<list, NoneT, NoneT, ..., NoneT> in the compiler
-// errors).
-//
-// Our solution is to combine the best part of the two approaches: a
-// user would write Templates<T1, ..., TN>, and Google Test will translate
-// that to TemplatesN<T1, ..., TN> internally to make error messages
-// readable.  The translation is done by the 'type' member of the
-// Templates template.
-
-$range i 1..n
-template <$for i, [[GTEST_TEMPLATE_ T$i = NoneT]]>
-struct Templates {
-  typedef Templates$n<$for i, [[T$i]]> type;
-};
-
-template <>
-struct Templates<$for i, [[NoneT]]> {
-  typedef Templates0 type;
-};
-
-$range i 1..n-1
-$for i [[
-$range j 1..i
-$range k i+1..n
-template <$for j, [[GTEST_TEMPLATE_ T$j]]>
-struct Templates<$for j, [[T$j]]$for k[[, NoneT]]> {
-  typedef Templates$i<$for j, [[T$j]]> type;
-};
-
-]]
-
-// The TypeList template makes it possible to use either a single type
-// or a Types<...> list in TYPED_TEST_SUITE() and
-// INSTANTIATE_TYPED_TEST_SUITE_P().
-
-template <typename T>
-struct TypeList {
-  typedef Types1<T> type;
-};
-
-
-$range i 1..n
-template <$for i, [[typename T$i]]>
-struct TypeList<Types<$for i, [[T$i]]> > {
-  typedef typename Types<$for i, [[T$i]]>::type type;
-};
-
-#endif  // GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P
-
-}  // namespace internal
-}  // namespace testing
-
-#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/LICENSE mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/LICENSE
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/LICENSE	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/LICENSE	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-Copyright 2008, Google Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/README.md mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/README.md
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/README.md	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,244 +0,0 @@
-### Generic Build Instructions
-
-#### Setup
-
-To build Google Test and your tests that use it, you need to tell your build
-system where to find its headers and source files. The exact way to do it
-depends on which build system you use, and is usually straightforward.
-
-### Build with CMake
-
-Google Test comes with a CMake build script (
-[CMakeLists.txt](https://github.com/google/googletest/blob/master/CMakeLists.txt))
-that can be used on a wide range of platforms ("C" stands for cross-platform.).
-If you don't have CMake installed already, you can download it for free from
-<http://www.cmake.org/>.
-
-CMake works by generating native makefiles or build projects that can be used in
-the compiler environment of your choice. You can either build Google Test as a
-standalone project or it can be incorporated into an existing CMake build for
-another project.
-
-#### Standalone CMake Project
-
-When building Google Test as a standalone project, the typical workflow starts
-with:
-
-    mkdir mybuild       # Create a directory to hold the build output.
-    cd mybuild
-    cmake ${GTEST_DIR}  # Generate native build scripts.
-
-If you want to build Google Test's samples, you should replace the last command
-with
-
-    cmake -Dgtest_build_samples=ON ${GTEST_DIR}
-
-If you are on a \*nix system, you should now see a Makefile in the current
-directory. Just type 'make' to build gtest.
-
-If you use Windows and have Visual Studio installed, a `gtest.sln` file and
-several `.vcproj` files will be created. You can then build them using Visual
-Studio.
-
-On Mac OS X with Xcode installed, a `.xcodeproj` file will be generated.
-
-#### Incorporating Into An Existing CMake Project
-
-If you want to use gtest in a project which already uses CMake, then a more
-robust and flexible approach is to build gtest as part of that project directly.
-This is done by making the GoogleTest source code available to the main build
-and adding it using CMake's `add_subdirectory()` command. This has the
-significant advantage that the same compiler and linker settings are used
-between gtest and the rest of your project, so issues associated with using
-incompatible libraries (eg debug/release), etc. are avoided. This is
-particularly useful on Windows. Making GoogleTest's source code available to the
-main build can be done a few different ways:
-
-*   Download the GoogleTest source code manually and place it at a known
-    location. This is the least flexible approach and can make it more difficult
-    to use with continuous integration systems, etc.
-*   Embed the GoogleTest source code as a direct copy in the main project's
-    source tree. This is often the simplest approach, but is also the hardest to
-    keep up to date. Some organizations may not permit this method.
-*   Add GoogleTest as a git submodule or equivalent. This may not always be
-    possible or appropriate. Git submodules, for example, have their own set of
-    advantages and drawbacks.
-*   Use CMake to download GoogleTest as part of the build's configure step. This
-    is just a little more complex, but doesn't have the limitations of the other
-    methods.
-
-The last of the above methods is implemented with a small piece of CMake code in
-a separate file (e.g. `CMakeLists.txt.in`) which is copied to the build area and
-then invoked as a sub-build _during the CMake stage_. That directory is then
-pulled into the main build with `add_subdirectory()`. For example:
-
-New file `CMakeLists.txt.in`:
-
-```cmake
-cmake_minimum_required(VERSION 2.8.2)
-
-project(googletest-download NONE)
-
-include(ExternalProject)
-ExternalProject_Add(googletest
-  GIT_REPOSITORY    https://github.com/google/googletest.git
-  GIT_TAG           master
-  SOURCE_DIR        "${CMAKE_CURRENT_BINARY_DIR}/googletest-src"
-  BINARY_DIR        "${CMAKE_CURRENT_BINARY_DIR}/googletest-build"
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND     ""
-  INSTALL_COMMAND   ""
-  TEST_COMMAND      ""
-)
-```
-
-Existing build's `CMakeLists.txt`:
-
-```cmake
-# Download and unpack googletest at configure time
-configure_file(CMakeLists.txt.in googletest-download/CMakeLists.txt)
-execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
-  RESULT_VARIABLE result
-  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download )
-if(result)
-  message(FATAL_ERROR "CMake step for googletest failed: ${result}")
-endif()
-execute_process(COMMAND ${CMAKE_COMMAND} --build .
-  RESULT_VARIABLE result
-  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download )
-if(result)
-  message(FATAL_ERROR "Build step for googletest failed: ${result}")
-endif()
-
-# Prevent overriding the parent project's compiler/linker
-# settings on Windows
-set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
-
-# Add googletest directly to our build. This defines
-# the gtest and gtest_main targets.
-add_subdirectory(${CMAKE_CURRENT_BINARY_DIR}/googletest-src
-                 ${CMAKE_CURRENT_BINARY_DIR}/googletest-build
-                 EXCLUDE_FROM_ALL)
-
-# The gtest/gtest_main targets carry header search path
-# dependencies automatically when using CMake 2.8.11 or
-# later. Otherwise we have to add them here ourselves.
-if (CMAKE_VERSION VERSION_LESS 2.8.11)
-  include_directories("${gtest_SOURCE_DIR}/include")
-endif()
-
-# Now simply link against gtest or gtest_main as needed. Eg
-add_executable(example example.cpp)
-target_link_libraries(example gtest_main)
-add_test(NAME example_test COMMAND example)
-```
-
-Note that this approach requires CMake 2.8.2 or later due to its use of the
-`ExternalProject_Add()` command. The above technique is discussed in more detail
-in [this separate article](http://crascit.com/2015/07/25/cmake-gtest/) which
-also contains a link to a fully generalized implementation of the technique.
-
-##### Visual Studio Dynamic vs Static Runtimes
-
-By default, new Visual Studio projects link the C runtimes dynamically but
-Google Test links them statically. This will generate an error that looks
-something like the following: gtest.lib(gtest-all.obj) : error LNK2038: mismatch
-detected for 'RuntimeLibrary': value 'MTd_StaticDebug' doesn't match value
-'MDd_DynamicDebug' in main.obj
-
-Google Test already has a CMake option for this: `gtest_force_shared_crt`
-
-Enabling this option will make gtest link the runtimes dynamically too, and
-match the project in which it is included.
-
-#### C++ Standard Version
-
-An environment that supports C++11 is required in order to successfully build
-Google Test. One way to ensure this is to specify the standard in the top-level
-project, for example by using the `set(CMAKE_CXX_STANDARD 11)` command. If this
-is not feasible, for example in a C project using Google Test for validation,
-then it can be specified by adding it to the options for cmake via the
-`DCMAKE_CXX_FLAGS` option.
-
-### Tweaking Google Test
-
-Google Test can be used in diverse environments. The default configuration may
-not work (or may not work well) out of the box in some environments. However,
-you can easily tweak Google Test by defining control macros on the compiler
-command line. Generally, these macros are named like `GTEST_XYZ` and you define
-them to either 1 or 0 to enable or disable a certain feature.
-
-We list the most frequently used macros below. For a complete list, see file
-[include/gtest/internal/gtest-port.h](https://github.com/google/googletest/blob/master/googletest/include/gtest/internal/gtest-port.h).
-
-### Multi-threaded Tests
-
-Google Test is thread-safe where the pthread library is available. After
-`#include "gtest/gtest.h"`, you can check the
-`GTEST_IS_THREADSAFE` macro to see whether this is the case (yes if the macro is
-`#defined` to 1, no if it's undefined.).
-
-If Google Test doesn't correctly detect whether pthread is available in your
-environment, you can force it with
-
-    -DGTEST_HAS_PTHREAD=1
-
-or
-
-    -DGTEST_HAS_PTHREAD=0
-
-When Google Test uses pthread, you may need to add flags to your compiler and/or
-linker to select the pthread library, or you'll get link errors. If you use the
-CMake script or the deprecated Autotools script, this is taken care of for you.
-If you use your own build script, you'll need to read your compiler and linker's
-manual to figure out what flags to add.
-
-### As a Shared Library (DLL)
-
-Google Test is compact, so most users can build and link it as a static library
-for the simplicity. You can choose to use Google Test as a shared library (known
-as a DLL on Windows) if you prefer.
-
-To compile *gtest* as a shared library, add
-
-    -DGTEST_CREATE_SHARED_LIBRARY=1
-
-to the compiler flags. You'll also need to tell the linker to produce a shared
-library instead - consult your linker's manual for how to do it.
-
-To compile your *tests* that use the gtest shared library, add
-
-    -DGTEST_LINKED_AS_SHARED_LIBRARY=1
-
-to the compiler flags.
-
-Note: while the above steps aren't technically necessary today when using some
-compilers (e.g. GCC), they may become necessary in the future, if we decide to
-improve the speed of loading the library (see
-<http://gcc.gnu.org/wiki/Visibility> for details). Therefore you are recommended
-to always add the above flags when using Google Test as a shared library.
-Otherwise a future release of Google Test may break your build script.
-
-### Avoiding Macro Name Clashes
-
-In C++, macros don't obey namespaces. Therefore two libraries that both define a
-macro of the same name will clash if you `#include` both definitions. In case a
-Google Test macro clashes with another library, you can force Google Test to
-rename its macro to avoid the conflict.
-
-Specifically, if both Google Test and some other code define macro FOO, you can
-add
-
-    -DGTEST_DONT_DEFINE_FOO=1
-
-to the compiler flags to tell Google Test to change the macro's name from `FOO`
-to `GTEST_FOO`. Currently `FOO` can be `FAIL`, `SUCCEED`, or `TEST`. For
-example, with `-DGTEST_DONT_DEFINE_TEST=1`, you'll need to write
-
-    GTEST_TEST(SomeTest, DoesThis) { ... }
-
-instead of
-
-    TEST(SomeTest, DoesThis) { ... }
-
-in order to define a test.
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/samples/prime_tables.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/samples/prime_tables.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/samples/prime_tables.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/samples/prime_tables.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,126 +0,0 @@
-// Copyright 2008 Google Inc.
-// All Rights Reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-
-// This provides interface PrimeTable that determines whether a number is a
-// prime and determines a next prime number. This interface is used
-// in Google Test samples demonstrating use of parameterized tests.
-
-#ifndef GTEST_SAMPLES_PRIME_TABLES_H_
-#define GTEST_SAMPLES_PRIME_TABLES_H_
-
-#include <algorithm>
-
-// The prime table interface.
-class PrimeTable {
- public:
-  virtual ~PrimeTable() {}
-
-  // Returns true if and only if n is a prime number.
-  virtual bool IsPrime(int n) const = 0;
-
-  // Returns the smallest prime number greater than p; or returns -1
-  // if the next prime is beyond the capacity of the table.
-  virtual int GetNextPrime(int p) const = 0;
-};
-
-// Implementation #1 calculates the primes on-the-fly.
-class OnTheFlyPrimeTable : public PrimeTable {
- public:
-  bool IsPrime(int n) const override {
-    if (n <= 1) return false;
-
-    for (int i = 2; i*i <= n; i++) {
-      // n is divisible by an integer other than 1 and itself.
-      if ((n % i) == 0) return false;
-    }
-
-    return true;
-  }
-
-  int GetNextPrime(int p) const override {
-    for (int n = p + 1; n > 0; n++) {
-      if (IsPrime(n)) return n;
-    }
-
-    return -1;
-  }
-};
-
-// Implementation #2 pre-calculates the primes and stores the result
-// in an array.
-class PreCalculatedPrimeTable : public PrimeTable {
- public:
-  // 'max' specifies the maximum number the prime table holds.
-  explicit PreCalculatedPrimeTable(int max)
-      : is_prime_size_(max + 1), is_prime_(new bool[max + 1]) {
-    CalculatePrimesUpTo(max);
-  }
-  ~PreCalculatedPrimeTable() override { delete[] is_prime_; }
-
-  bool IsPrime(int n) const override {
-    return 0 <= n && n < is_prime_size_ && is_prime_[n];
-  }
-
-  int GetNextPrime(int p) const override {
-    for (int n = p + 1; n < is_prime_size_; n++) {
-      if (is_prime_[n]) return n;
-    }
-
-    return -1;
-  }
-
- private:
-  void CalculatePrimesUpTo(int max) {
-    ::std::fill(is_prime_, is_prime_ + is_prime_size_, true);
-    is_prime_[0] = is_prime_[1] = false;
-
-    // Checks every candidate for prime number (we know that 2 is the only even
-    // prime).
-    for (int i = 2; i*i <= max; i += i%2+1) {
-      if (!is_prime_[i]) continue;
-
-      // Marks all multiples of i (except i itself) as non-prime.
-      // We are starting here from i-th multiplier, because all smaller
-      // complex numbers were already marked.
-      for (int j = i*i; j <= max; j += i) {
-        is_prime_[j] = false;
-      }
-    }
-  }
-
-  const int is_prime_size_;
-  bool* const is_prime_;
-
-  // Disables compiler warning "assignment operator could not be generated."
-  void operator=(const PreCalculatedPrimeTable& rhs);
-};
-
-#endif  // GTEST_SAMPLES_PRIME_TABLES_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/samples/sample10_unittest.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/samples/sample10_unittest.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/samples/sample10_unittest.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/samples/sample10_unittest.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,139 +0,0 @@
-// Copyright 2009 Google Inc. All Rights Reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// This sample shows how to use Google Test listener API to implement
-// a primitive leak checker.
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "gtest/gtest.h"
-using ::testing::EmptyTestEventListener;
-using ::testing::InitGoogleTest;
-using ::testing::Test;
-using ::testing::TestEventListeners;
-using ::testing::TestInfo;
-using ::testing::TestPartResult;
-using ::testing::UnitTest;
-
-namespace {
-// We will track memory used by this class.
-class Water {
- public:
-  // Normal Water declarations go here.
-
-  // operator new and operator delete help us control water allocation.
-  void* operator new(size_t allocation_size) {
-    allocated_++;
-    return malloc(allocation_size);
-  }
-
-  void operator delete(void* block, size_t /* allocation_size */) {
-    allocated_--;
-    free(block);
-  }
-
-  static int allocated() { return allocated_; }
-
- private:
-  static int allocated_;
-};
-
-int Water::allocated_ = 0;
-
-// This event listener monitors how many Water objects are created and
-// destroyed by each test, and reports a failure if a test leaks some Water
-// objects. It does this by comparing the number of live Water objects at
-// the beginning of a test and at the end of a test.
-class LeakChecker : public EmptyTestEventListener {
- private:
-  // Called before a test starts.
-  void OnTestStart(const TestInfo& /* test_info */) override {
-    initially_allocated_ = Water::allocated();
-  }
-
-  // Called after a test ends.
-  void OnTestEnd(const TestInfo& /* test_info */) override {
-    int difference = Water::allocated() - initially_allocated_;
-
-    // You can generate a failure in any event handler except
-    // OnTestPartResult. Just use an appropriate Google Test assertion to do
-    // it.
-    EXPECT_LE(difference, 0) << "Leaked " << difference << " unit(s) of Water!";
-  }
-
-  int initially_allocated_;
-};
-
-TEST(ListenersTest, DoesNotLeak) {
-  Water* water = new Water;
-  delete water;
-}
-
-// This should fail when the --check_for_leaks command line flag is
-// specified.
-TEST(ListenersTest, LeaksWater) {
-  Water* water = new Water;
-  EXPECT_TRUE(water != nullptr);
-}
-}  // namespace
-
-int main(int argc, char **argv) {
-  InitGoogleTest(&argc, argv);
-
-  bool check_for_leaks = false;
-  if (argc > 1 && strcmp(argv[1], "--check_for_leaks") == 0 )
-    check_for_leaks = true;
-  else
-    printf("%s\n", "Run this program with --check_for_leaks to enable "
-           "custom leak checking in the tests.");
-
-  // If we are given the --check_for_leaks command line flag, installs the
-  // leak checker.
-  if (check_for_leaks) {
-    TestEventListeners& listeners = UnitTest::GetInstance()->listeners();
-
-    // Adds the leak checker to the end of the test event listener list,
-    // after the default text output printer and the default XML report
-    // generator.
-    //
-    // The order is important - it ensures that failures generated in the
-    // leak checker's OnTestEnd() method are processed by the text and XML
-    // printers *before* their OnTestEnd() methods are called, such that
-    // they are attributed to the right test. Remember that a listener
-    // receives an OnXyzStart event *after* listeners preceding it in the
-    // list received that event, and receives an OnXyzEnd event *before*
-    // listeners preceding it.
-    //
-    // We don't need to worry about deleting the new listener later, as
-    // Google Test will do it.
-    listeners.Append(new LeakChecker);
-  }
-  return RUN_ALL_TESTS();
-}
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/samples/sample1.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/samples/sample1.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/samples/sample1.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/samples/sample1.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,66 +0,0 @@
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// A sample program demonstrating using Google C++ testing framework.
-
-#include "sample1.h"
-
-// Returns n! (the factorial of n).  For negative n, n! is defined to be 1.
-int Factorial(int n) {
-  int result = 1;
-  for (int i = 1; i <= n; i++) {
-    result *= i;
-  }
-
-  return result;
-}
-
-// Returns true if and only if n is a prime number.
-bool IsPrime(int n) {
-  // Trivial case 1: small numbers
-  if (n <= 1) return false;
-
-  // Trivial case 2: even numbers
-  if (n % 2 == 0) return n == 2;
-
-  // Now, we have that n is odd and n >= 3.
-
-  // Try to divide n by every odd number i, starting from 3
-  for (int i = 3; ; i += 2) {
-    // We only have to try i up to the square root of n
-    if (i > n/i) break;
-
-    // Now, we have i <= n/i < n.
-    // If n is divisible by i, n is not prime.
-    if (n % i == 0) return false;
-  }
-
-  // n has no integer factor in the range (1, n), and thus is prime.
-  return true;
-}
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/samples/sample1.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/samples/sample1.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/samples/sample1.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/samples/sample1.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// A sample program demonstrating using Google C++ testing framework.
-
-#ifndef GTEST_SAMPLES_SAMPLE1_H_
-#define GTEST_SAMPLES_SAMPLE1_H_
-
-// Returns n! (the factorial of n).  For negative n, n! is defined to be 1.
-int Factorial(int n);
-
-// Returns true if and only if n is a prime number.
-bool IsPrime(int n);
-
-#endif  // GTEST_SAMPLES_SAMPLE1_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/samples/sample1_unittest.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/samples/sample1_unittest.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/samples/sample1_unittest.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/samples/sample1_unittest.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,151 +0,0 @@
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// A sample program demonstrating using Google C++ testing framework.
-
-// This sample shows how to write a simple unit test for a function,
-// using Google C++ testing framework.
-//
-// Writing a unit test using Google C++ testing framework is easy as 1-2-3:
-
-
-// Step 1. Include necessary header files such that the stuff your
-// test logic needs is declared.
-//
-// Don't forget gtest.h, which declares the testing framework.
-
-#include <limits.h>
-#include "sample1.h"
-#include "gtest/gtest.h"
-namespace {
-
-// Step 2. Use the TEST macro to define your tests.
-//
-// TEST has two parameters: the test case name and the test name.
-// After using the macro, you should define your test logic between a
-// pair of braces.  You can use a bunch of macros to indicate the
-// success or failure of a test.  EXPECT_TRUE and EXPECT_EQ are
-// examples of such macros.  For a complete list, see gtest.h.
-//
-// <TechnicalDetails>
-//
-// In Google Test, tests are grouped into test cases.  This is how we
-// keep test code organized.  You should put logically related tests
-// into the same test case.
-//
-// The test case name and the test name should both be valid C++
-// identifiers.  And you should not use underscore (_) in the names.
-//
-// Google Test guarantees that each test you define is run exactly
-// once, but it makes no guarantee on the order the tests are
-// executed.  Therefore, you should write your tests in such a way
-// that their results don't depend on their order.
-//
-// </TechnicalDetails>
-
-
-// Tests Factorial().
-
-// Tests factorial of negative numbers.
-TEST(FactorialTest, Negative) {
-  // This test is named "Negative", and belongs to the "FactorialTest"
-  // test case.
-  EXPECT_EQ(1, Factorial(-5));
-  EXPECT_EQ(1, Factorial(-1));
-  EXPECT_GT(Factorial(-10), 0);
-
-  // <TechnicalDetails>
-  //
-  // EXPECT_EQ(expected, actual) is the same as
-  //
-  //   EXPECT_TRUE((expected) == (actual))
-  //
-  // except that it will print both the expected value and the actual
-  // value when the assertion fails.  This is very helpful for
-  // debugging.  Therefore in this case EXPECT_EQ is preferred.
-  //
-  // On the other hand, EXPECT_TRUE accepts any Boolean expression,
-  // and is thus more general.
-  //
-  // </TechnicalDetails>
-}
-
-// Tests factorial of 0.
-TEST(FactorialTest, Zero) {
-  EXPECT_EQ(1, Factorial(0));
-}
-
-// Tests factorial of positive numbers.
-TEST(FactorialTest, Positive) {
-  EXPECT_EQ(1, Factorial(1));
-  EXPECT_EQ(2, Factorial(2));
-  EXPECT_EQ(6, Factorial(3));
-  EXPECT_EQ(40320, Factorial(8));
-}
-
-
-// Tests IsPrime()
-
-// Tests negative input.
-TEST(IsPrimeTest, Negative) {
-  // This test belongs to the IsPrimeTest test case.
-
-  EXPECT_FALSE(IsPrime(-1));
-  EXPECT_FALSE(IsPrime(-2));
-  EXPECT_FALSE(IsPrime(INT_MIN));
-}
-
-// Tests some trivial cases.
-TEST(IsPrimeTest, Trivial) {
-  EXPECT_FALSE(IsPrime(0));
-  EXPECT_FALSE(IsPrime(1));
-  EXPECT_TRUE(IsPrime(2));
-  EXPECT_TRUE(IsPrime(3));
-}
-
-// Tests positive input.
-TEST(IsPrimeTest, Positive) {
-  EXPECT_FALSE(IsPrime(4));
-  EXPECT_TRUE(IsPrime(5));
-  EXPECT_FALSE(IsPrime(6));
-  EXPECT_TRUE(IsPrime(23));
-}
-}  // namespace
-
-// Step 3. Call RUN_ALL_TESTS() in main().
-//
-// We do this by linking in src/gtest_main.cc file, which consists of
-// a main() function which calls RUN_ALL_TESTS() for us.
-//
-// This runs all the tests you've defined, prints the result, and
-// returns 0 if successful, or 1 otherwise.
-//
-// Did you notice that we didn't register the tests?  The
-// RUN_ALL_TESTS() macro magically knows about all the tests we
-// defined.  Isn't this convenient?
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/samples/sample2.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/samples/sample2.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/samples/sample2.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/samples/sample2.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// A sample program demonstrating using Google C++ testing framework.
-
-#include "sample2.h"
-
-#include <string.h>
-
-// Clones a 0-terminated C string, allocating memory using new.
-const char* MyString::CloneCString(const char* a_c_string) {
-  if (a_c_string == nullptr) return nullptr;
-
-  const size_t len = strlen(a_c_string);
-  char* const clone = new char[ len + 1 ];
-  memcpy(clone, a_c_string, len + 1);
-
-  return clone;
-}
-
-// Sets the 0-terminated C string this MyString object
-// represents.
-void MyString::Set(const char* a_c_string) {
-  // Makes sure this works when c_string == c_string_
-  const char* const temp = MyString::CloneCString(a_c_string);
-  delete[] c_string_;
-  c_string_ = temp;
-}
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/samples/sample2.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/samples/sample2.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/samples/sample2.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/samples/sample2.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,81 +0,0 @@
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// A sample program demonstrating using Google C++ testing framework.
-
-#ifndef GTEST_SAMPLES_SAMPLE2_H_
-#define GTEST_SAMPLES_SAMPLE2_H_
-
-#include <string.h>
-
-
-// A simple string class.
-class MyString {
- private:
-  const char* c_string_;
-  const MyString& operator=(const MyString& rhs);
-
- public:
-  // Clones a 0-terminated C string, allocating memory using new.
-  static const char* CloneCString(const char* a_c_string);
-
-  ////////////////////////////////////////////////////////////
-  //
-  // C'tors
-
-  // The default c'tor constructs a NULL string.
-  MyString() : c_string_(nullptr) {}
-
-  // Constructs a MyString by cloning a 0-terminated C string.
-  explicit MyString(const char* a_c_string) : c_string_(nullptr) {
-    Set(a_c_string);
-  }
-
-  // Copy c'tor
-  MyString(const MyString& string) : c_string_(nullptr) {
-    Set(string.c_string_);
-  }
-
-  ////////////////////////////////////////////////////////////
-  //
-  // D'tor.  MyString is intended to be a final class, so the d'tor
-  // doesn't need to be virtual.
-  ~MyString() { delete[] c_string_; }
-
-  // Gets the 0-terminated C string this MyString object represents.
-  const char* c_string() const { return c_string_; }
-
-  size_t Length() const { return c_string_ == nullptr ? 0 : strlen(c_string_); }
-
-  // Sets the 0-terminated C string this MyString object represents.
-  void Set(const char* c_string);
-};
-
-
-#endif  // GTEST_SAMPLES_SAMPLE2_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/samples/sample2_unittest.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/samples/sample2_unittest.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/samples/sample2_unittest.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/samples/sample2_unittest.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,107 +0,0 @@
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// A sample program demonstrating using Google C++ testing framework.
-
-// This sample shows how to write a more complex unit test for a class
-// that has multiple member functions.
-//
-// Usually, it's a good idea to have one test for each method in your
-// class.  You don't have to do that exactly, but it helps to keep
-// your tests organized.  You may also throw in additional tests as
-// needed.
-
-#include "sample2.h"
-#include "gtest/gtest.h"
-namespace {
-// In this example, we test the MyString class (a simple string).
-
-// Tests the default c'tor.
-TEST(MyString, DefaultConstructor) {
-  const MyString s;
-
-  // Asserts that s.c_string() returns NULL.
-  //
-  // <TechnicalDetails>
-  //
-  // If we write NULL instead of
-  //
-  //   static_cast<const char *>(NULL)
-  //
-  // in this assertion, it will generate a warning on gcc 3.4.  The
-  // reason is that EXPECT_EQ needs to know the types of its
-  // arguments in order to print them when it fails.  Since NULL is
-  // #defined as 0, the compiler will use the formatter function for
-  // int to print it.  However, gcc thinks that NULL should be used as
-  // a pointer, not an int, and therefore complains.
-  //
-  // The root of the problem is C++'s lack of distinction between the
-  // integer number 0 and the null pointer constant.  Unfortunately,
-  // we have to live with this fact.
-  //
-  // </TechnicalDetails>
-  EXPECT_STREQ(nullptr, s.c_string());
-
-  EXPECT_EQ(0u, s.Length());
-}
-
-const char kHelloString[] = "Hello, world!";
-
-// Tests the c'tor that accepts a C string.
-TEST(MyString, ConstructorFromCString) {
-  const MyString s(kHelloString);
-  EXPECT_EQ(0, strcmp(s.c_string(), kHelloString));
-  EXPECT_EQ(sizeof(kHelloString)/sizeof(kHelloString[0]) - 1,
-            s.Length());
-}
-
-// Tests the copy c'tor.
-TEST(MyString, CopyConstructor) {
-  const MyString s1(kHelloString);
-  const MyString s2 = s1;
-  EXPECT_EQ(0, strcmp(s2.c_string(), kHelloString));
-}
-
-// Tests the Set method.
-TEST(MyString, Set) {
-  MyString s;
-
-  s.Set(kHelloString);
-  EXPECT_EQ(0, strcmp(s.c_string(), kHelloString));
-
-  // Set should work when the input pointer is the same as the one
-  // already in the MyString object.
-  s.Set(s.c_string());
-  EXPECT_EQ(0, strcmp(s.c_string(), kHelloString));
-
-  // Can we set the MyString to NULL?
-  s.Set(nullptr);
-  EXPECT_STREQ(nullptr, s.c_string());
-}
-}  // namespace
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/samples/sample3-inl.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/samples/sample3-inl.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/samples/sample3-inl.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/samples/sample3-inl.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,172 +0,0 @@
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// A sample program demonstrating using Google C++ testing framework.
-
-#ifndef GTEST_SAMPLES_SAMPLE3_INL_H_
-#define GTEST_SAMPLES_SAMPLE3_INL_H_
-
-#include <stddef.h>
-
-
-// Queue is a simple queue implemented as a singled-linked list.
-//
-// The element type must support copy constructor.
-template <typename E>  // E is the element type
-class Queue;
-
-// QueueNode is a node in a Queue, which consists of an element of
-// type E and a pointer to the next node.
-template <typename E>  // E is the element type
-class QueueNode {
-  friend class Queue<E>;
-
- public:
-  // Gets the element in this node.
-  const E& element() const { return element_; }
-
-  // Gets the next node in the queue.
-  QueueNode* next() { return next_; }
-  const QueueNode* next() const { return next_; }
-
- private:
-  // Creates a node with a given element value.  The next pointer is
-  // set to NULL.
-  explicit QueueNode(const E& an_element)
-      : element_(an_element), next_(nullptr) {}
-
-  // We disable the default assignment operator and copy c'tor.
-  const QueueNode& operator = (const QueueNode&);
-  QueueNode(const QueueNode&);
-
-  E element_;
-  QueueNode* next_;
-};
-
-template <typename E>  // E is the element type.
-class Queue {
- public:
-  // Creates an empty queue.
-  Queue() : head_(nullptr), last_(nullptr), size_(0) {}
-
-  // D'tor.  Clears the queue.
-  ~Queue() { Clear(); }
-
-  // Clears the queue.
-  void Clear() {
-    if (size_ > 0) {
-      // 1. Deletes every node.
-      QueueNode<E>* node = head_;
-      QueueNode<E>* next = node->next();
-      for (; ;) {
-        delete node;
-        node = next;
-        if (node == nullptr) break;
-        next = node->next();
-      }
-
-      // 2. Resets the member variables.
-      head_ = last_ = nullptr;
-      size_ = 0;
-    }
-  }
-
-  // Gets the number of elements.
-  size_t Size() const { return size_; }
-
-  // Gets the first element of the queue, or NULL if the queue is empty.
-  QueueNode<E>* Head() { return head_; }
-  const QueueNode<E>* Head() const { return head_; }
-
-  // Gets the last element of the queue, or NULL if the queue is empty.
-  QueueNode<E>* Last() { return last_; }
-  const QueueNode<E>* Last() const { return last_; }
-
-  // Adds an element to the end of the queue.  A copy of the element is
-  // created using the copy constructor, and then stored in the queue.
-  // Changes made to the element in the queue doesn't affect the source
-  // object, and vice versa.
-  void Enqueue(const E& element) {
-    QueueNode<E>* new_node = new QueueNode<E>(element);
-
-    if (size_ == 0) {
-      head_ = last_ = new_node;
-      size_ = 1;
-    } else {
-      last_->next_ = new_node;
-      last_ = new_node;
-      size_++;
-    }
-  }
-
-  // Removes the head of the queue and returns it.  Returns NULL if
-  // the queue is empty.
-  E* Dequeue() {
-    if (size_ == 0) {
-      return nullptr;
-    }
-
-    const QueueNode<E>* const old_head = head_;
-    head_ = head_->next_;
-    size_--;
-    if (size_ == 0) {
-      last_ = nullptr;
-    }
-
-    E* element = new E(old_head->element());
-    delete old_head;
-
-    return element;
-  }
-
-  // Applies a function/functor on each element of the queue, and
-  // returns the result in a new queue.  The original queue is not
-  // affected.
-  template <typename F>
-  Queue* Map(F function) const {
-    Queue* new_queue = new Queue();
-    for (const QueueNode<E>* node = head_; node != nullptr;
-         node = node->next_) {
-      new_queue->Enqueue(function(node->element()));
-    }
-
-    return new_queue;
-  }
-
- private:
-  QueueNode<E>* head_;  // The first node of the queue.
-  QueueNode<E>* last_;  // The last node of the queue.
-  size_t size_;  // The number of elements in the queue.
-
-  // We disallow copying a queue.
-  Queue(const Queue&);
-  const Queue& operator = (const Queue&);
-};
-
-#endif  // GTEST_SAMPLES_SAMPLE3_INL_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/samples/sample3_unittest.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/samples/sample3_unittest.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/samples/sample3_unittest.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/samples/sample3_unittest.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,149 +0,0 @@
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// A sample program demonstrating using Google C++ testing framework.
-
-// In this example, we use a more advanced feature of Google Test called
-// test fixture.
-//
-// A test fixture is a place to hold objects and functions shared by
-// all tests in a test case.  Using a test fixture avoids duplicating
-// the test code necessary to initialize and cleanup those common
-// objects for each test.  It is also useful for defining sub-routines
-// that your tests need to invoke a lot.
-//
-// <TechnicalDetails>
-//
-// The tests share the test fixture in the sense of code sharing, not
-// data sharing.  Each test is given its own fresh copy of the
-// fixture.  You cannot expect the data modified by one test to be
-// passed on to another test, which is a bad idea.
-//
-// The reason for this design is that tests should be independent and
-// repeatable.  In particular, a test should not fail as the result of
-// another test's failure.  If one test depends on info produced by
-// another test, then the two tests should really be one big test.
-//
-// The macros for indicating the success/failure of a test
-// (EXPECT_TRUE, FAIL, etc) need to know what the current test is
-// (when Google Test prints the test result, it tells you which test
-// each failure belongs to).  Technically, these macros invoke a
-// member function of the Test class.  Therefore, you cannot use them
-// in a global function.  That's why you should put test sub-routines
-// in a test fixture.
-//
-// </TechnicalDetails>
-
-#include "sample3-inl.h"
-#include "gtest/gtest.h"
-namespace {
-// To use a test fixture, derive a class from testing::Test.
-class QueueTestSmpl3 : public testing::Test {
- protected:  // You should make the members protected s.t. they can be
-             // accessed from sub-classes.
-
-  // virtual void SetUp() will be called before each test is run.  You
-  // should define it if you need to initialize the variables.
-  // Otherwise, this can be skipped.
-  void SetUp() override {
-    q1_.Enqueue(1);
-    q2_.Enqueue(2);
-    q2_.Enqueue(3);
-  }
-
-  // virtual void TearDown() will be called after each test is run.
-  // You should define it if there is cleanup work to do.  Otherwise,
-  // you don't have to provide it.
-  //
-  // virtual void TearDown() {
-  // }
-
-  // A helper function that some test uses.
-  static int Double(int n) {
-    return 2*n;
-  }
-
-  // A helper function for testing Queue::Map().
-  void MapTester(const Queue<int> * q) {
-    // Creates a new queue, where each element is twice as big as the
-    // corresponding one in q.
-    const Queue<int> * const new_q = q->Map(Double);
-
-    // Verifies that the new queue has the same size as q.
-    ASSERT_EQ(q->Size(), new_q->Size());
-
-    // Verifies the relationship between the elements of the two queues.
-    for (const QueueNode<int>*n1 = q->Head(), *n2 = new_q->Head();
-         n1 != nullptr; n1 = n1->next(), n2 = n2->next()) {
-      EXPECT_EQ(2 * n1->element(), n2->element());
-    }
-
-    delete new_q;
-  }
-
-  // Declares the variables your tests want to use.
-  Queue<int> q0_;
-  Queue<int> q1_;
-  Queue<int> q2_;
-};
-
-// When you have a test fixture, you define a test using TEST_F
-// instead of TEST.
-
-// Tests the default c'tor.
-TEST_F(QueueTestSmpl3, DefaultConstructor) {
-  // You can access data in the test fixture here.
-  EXPECT_EQ(0u, q0_.Size());
-}
-
-// Tests Dequeue().
-TEST_F(QueueTestSmpl3, Dequeue) {
-  int * n = q0_.Dequeue();
-  EXPECT_TRUE(n == nullptr);
-
-  n = q1_.Dequeue();
-  ASSERT_TRUE(n != nullptr);
-  EXPECT_EQ(1, *n);
-  EXPECT_EQ(0u, q1_.Size());
-  delete n;
-
-  n = q2_.Dequeue();
-  ASSERT_TRUE(n != nullptr);
-  EXPECT_EQ(2, *n);
-  EXPECT_EQ(1u, q2_.Size());
-  delete n;
-}
-
-// Tests the Queue::Map() function.
-TEST_F(QueueTestSmpl3, Map) {
-  MapTester(&q0_);
-  MapTester(&q1_);
-  MapTester(&q2_);
-}
-}  // namespace
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/samples/sample4.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/samples/sample4.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/samples/sample4.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/samples/sample4.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// A sample program demonstrating using Google C++ testing framework.
-
-#include <stdio.h>
-
-#include "sample4.h"
-
-// Returns the current counter value, and increments it.
-int Counter::Increment() {
-  return counter_++;
-}
-
-// Returns the current counter value, and decrements it.
-// counter can not be less than 0, return 0 in this case
-int Counter::Decrement() {
-  if (counter_ == 0) {
-    return counter_;
-  } else  {
-    return counter_--;
-  }
-}
-
-// Prints the current counter value to STDOUT.
-void Counter::Print() const {
-  printf("%d", counter_);
-}
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/samples/sample4.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/samples/sample4.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/samples/sample4.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/samples/sample4.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// A sample program demonstrating using Google C++ testing framework.
-#ifndef GTEST_SAMPLES_SAMPLE4_H_
-#define GTEST_SAMPLES_SAMPLE4_H_
-
-// A simple monotonic counter.
-class Counter {
- private:
-  int counter_;
-
- public:
-  // Creates a counter that starts at 0.
-  Counter() : counter_(0) {}
-
-  // Returns the current counter value, and increments it.
-  int Increment();
-
-  // Returns the current counter value, and decrements it.
-  int Decrement();
-
-  // Prints the current counter value to STDOUT.
-  void Print() const;
-};
-
-#endif  // GTEST_SAMPLES_SAMPLE4_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/samples/sample4_unittest.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/samples/sample4_unittest.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/samples/sample4_unittest.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/samples/sample4_unittest.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-#include "sample4.h"
-#include "gtest/gtest.h"
-
-namespace {
-// Tests the Increment() method.
-
-TEST(Counter, Increment) {
-  Counter c;
-
-  // Test that counter 0 returns 0
-  EXPECT_EQ(0, c.Decrement());
-
-  // EXPECT_EQ() evaluates its arguments exactly once, so they
-  // can have side effects.
-
-  EXPECT_EQ(0, c.Increment());
-  EXPECT_EQ(1, c.Increment());
-  EXPECT_EQ(2, c.Increment());
-
-  EXPECT_EQ(3, c.Decrement());
-}
-
-}  // namespace
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/samples/sample5_unittest.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/samples/sample5_unittest.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/samples/sample5_unittest.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/samples/sample5_unittest.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,196 +0,0 @@
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// This sample teaches how to reuse a test fixture in multiple test
-// cases by deriving sub-fixtures from it.
-//
-// When you define a test fixture, you specify the name of the test
-// case that will use this fixture.  Therefore, a test fixture can
-// be used by only one test case.
-//
-// Sometimes, more than one test cases may want to use the same or
-// slightly different test fixtures.  For example, you may want to
-// make sure that all tests for a GUI library don't leak important
-// system resources like fonts and brushes.  In Google Test, you do
-// this by putting the shared logic in a super (as in "super class")
-// test fixture, and then have each test case use a fixture derived
-// from this super fixture.
-
-#include <limits.h>
-#include <time.h>
-#include "gtest/gtest.h"
-#include "sample1.h"
-#include "sample3-inl.h"
-namespace {
-// In this sample, we want to ensure that every test finishes within
-// ~5 seconds.  If a test takes longer to run, we consider it a
-// failure.
-//
-// We put the code for timing a test in a test fixture called
-// "QuickTest".  QuickTest is intended to be the super fixture that
-// other fixtures derive from, therefore there is no test case with
-// the name "QuickTest".  This is OK.
-//
-// Later, we will derive multiple test fixtures from QuickTest.
-class QuickTest : public testing::Test {
- protected:
-  // Remember that SetUp() is run immediately before a test starts.
-  // This is a good place to record the start time.
-  void SetUp() override { start_time_ = time(nullptr); }
-
-  // TearDown() is invoked immediately after a test finishes.  Here we
-  // check if the test was too slow.
-  void TearDown() override {
-    // Gets the time when the test finishes
-    const time_t end_time = time(nullptr);
-
-    // Asserts that the test took no more than ~5 seconds.  Did you
-    // know that you can use assertions in SetUp() and TearDown() as
-    // well?
-    EXPECT_TRUE(end_time - start_time_ <= 5) << "The test took too long.";
-  }
-
-  // The UTC time (in seconds) when the test starts
-  time_t start_time_;
-};
-
-
-// We derive a fixture named IntegerFunctionTest from the QuickTest
-// fixture.  All tests using this fixture will be automatically
-// required to be quick.
-class IntegerFunctionTest : public QuickTest {
-  // We don't need any more logic than already in the QuickTest fixture.
-  // Therefore the body is empty.
-};
-
-
-// Now we can write tests in the IntegerFunctionTest test case.
-
-// Tests Factorial()
-TEST_F(IntegerFunctionTest, Factorial) {
-  // Tests factorial of negative numbers.
-  EXPECT_EQ(1, Factorial(-5));
-  EXPECT_EQ(1, Factorial(-1));
-  EXPECT_GT(Factorial(-10), 0);
-
-  // Tests factorial of 0.
-  EXPECT_EQ(1, Factorial(0));
-
-  // Tests factorial of positive numbers.
-  EXPECT_EQ(1, Factorial(1));
-  EXPECT_EQ(2, Factorial(2));
-  EXPECT_EQ(6, Factorial(3));
-  EXPECT_EQ(40320, Factorial(8));
-}
-
-
-// Tests IsPrime()
-TEST_F(IntegerFunctionTest, IsPrime) {
-  // Tests negative input.
-  EXPECT_FALSE(IsPrime(-1));
-  EXPECT_FALSE(IsPrime(-2));
-  EXPECT_FALSE(IsPrime(INT_MIN));
-
-  // Tests some trivial cases.
-  EXPECT_FALSE(IsPrime(0));
-  EXPECT_FALSE(IsPrime(1));
-  EXPECT_TRUE(IsPrime(2));
-  EXPECT_TRUE(IsPrime(3));
-
-  // Tests positive input.
-  EXPECT_FALSE(IsPrime(4));
-  EXPECT_TRUE(IsPrime(5));
-  EXPECT_FALSE(IsPrime(6));
-  EXPECT_TRUE(IsPrime(23));
-}
-
-
-// The next test case (named "QueueTest") also needs to be quick, so
-// we derive another fixture from QuickTest.
-//
-// The QueueTest test fixture has some logic and shared objects in
-// addition to what's in QuickTest already.  We define the additional
-// stuff inside the body of the test fixture, as usual.
-class QueueTest : public QuickTest {
- protected:
-  void SetUp() override {
-    // First, we need to set up the super fixture (QuickTest).
-    QuickTest::SetUp();
-
-    // Second, some additional setup for this fixture.
-    q1_.Enqueue(1);
-    q2_.Enqueue(2);
-    q2_.Enqueue(3);
-  }
-
-  // By default, TearDown() inherits the behavior of
-  // QuickTest::TearDown().  As we have no additional cleaning work
-  // for QueueTest, we omit it here.
-  //
-  // virtual void TearDown() {
-  //   QuickTest::TearDown();
-  // }
-
-  Queue<int> q0_;
-  Queue<int> q1_;
-  Queue<int> q2_;
-};
-
-
-// Now, let's write tests using the QueueTest fixture.
-
-// Tests the default constructor.
-TEST_F(QueueTest, DefaultConstructor) {
-  EXPECT_EQ(0u, q0_.Size());
-}
-
-// Tests Dequeue().
-TEST_F(QueueTest, Dequeue) {
-  int* n = q0_.Dequeue();
-  EXPECT_TRUE(n == nullptr);
-
-  n = q1_.Dequeue();
-  EXPECT_TRUE(n != nullptr);
-  EXPECT_EQ(1, *n);
-  EXPECT_EQ(0u, q1_.Size());
-  delete n;
-
-  n = q2_.Dequeue();
-  EXPECT_TRUE(n != nullptr);
-  EXPECT_EQ(2, *n);
-  EXPECT_EQ(1u, q2_.Size());
-  delete n;
-}
-}  // namespace
-// If necessary, you can derive further test fixtures from a derived
-// fixture itself.  For example, you can derive another fixture from
-// QueueTest.  Google Test imposes no limit on how deep the hierarchy
-// can be.  In practice, however, you probably don't want it to be too
-// deep as to be confusing.
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/samples/sample6_unittest.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/samples/sample6_unittest.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/samples/sample6_unittest.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/samples/sample6_unittest.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,224 +0,0 @@
-// Copyright 2008 Google Inc.
-// All Rights Reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// This sample shows how to test common properties of multiple
-// implementations of the same interface (aka interface tests).
-
-// The interface and its implementations are in this header.
-#include "prime_tables.h"
-
-#include "gtest/gtest.h"
-namespace {
-// First, we define some factory functions for creating instances of
-// the implementations.  You may be able to skip this step if all your
-// implementations can be constructed the same way.
-
-template <class T>
-PrimeTable* CreatePrimeTable();
-
-template <>
-PrimeTable* CreatePrimeTable<OnTheFlyPrimeTable>() {
-  return new OnTheFlyPrimeTable;
-}
-
-template <>
-PrimeTable* CreatePrimeTable<PreCalculatedPrimeTable>() {
-  return new PreCalculatedPrimeTable(10000);
-}
-
-// Then we define a test fixture class template.
-template <class T>
-class PrimeTableTest : public testing::Test {
- protected:
-  // The ctor calls the factory function to create a prime table
-  // implemented by T.
-  PrimeTableTest() : table_(CreatePrimeTable<T>()) {}
-
-  ~PrimeTableTest() override { delete table_; }
-
-  // Note that we test an implementation via the base interface
-  // instead of the actual implementation class.  This is important
-  // for keeping the tests close to the real world scenario, where the
-  // implementation is invoked via the base interface.  It avoids
-  // got-yas where the implementation class has a method that shadows
-  // a method with the same name (but slightly different argument
-  // types) in the base interface, for example.
-  PrimeTable* const table_;
-};
-
-#if GTEST_HAS_TYPED_TEST
-
-using testing::Types;
-
-// Google Test offers two ways for reusing tests for different types.
-// The first is called "typed tests".  You should use it if you
-// already know *all* the types you are gonna exercise when you write
-// the tests.
-
-// To write a typed test case, first use
-//
-//   TYPED_TEST_SUITE(TestCaseName, TypeList);
-//
-// to declare it and specify the type parameters.  As with TEST_F,
-// TestCaseName must match the test fixture name.
-
-// The list of types we want to test.
-typedef Types<OnTheFlyPrimeTable, PreCalculatedPrimeTable> Implementations;
-
-TYPED_TEST_SUITE(PrimeTableTest, Implementations);
-
-// Then use TYPED_TEST(TestCaseName, TestName) to define a typed test,
-// similar to TEST_F.
-TYPED_TEST(PrimeTableTest, ReturnsFalseForNonPrimes) {
-  // Inside the test body, you can refer to the type parameter by
-  // TypeParam, and refer to the fixture class by TestFixture.  We
-  // don't need them in this example.
-
-  // Since we are in the template world, C++ requires explicitly
-  // writing 'this->' when referring to members of the fixture class.
-  // This is something you have to learn to live with.
-  EXPECT_FALSE(this->table_->IsPrime(-5));
-  EXPECT_FALSE(this->table_->IsPrime(0));
-  EXPECT_FALSE(this->table_->IsPrime(1));
-  EXPECT_FALSE(this->table_->IsPrime(4));
-  EXPECT_FALSE(this->table_->IsPrime(6));
-  EXPECT_FALSE(this->table_->IsPrime(100));
-}
-
-TYPED_TEST(PrimeTableTest, ReturnsTrueForPrimes) {
-  EXPECT_TRUE(this->table_->IsPrime(2));
-  EXPECT_TRUE(this->table_->IsPrime(3));
-  EXPECT_TRUE(this->table_->IsPrime(5));
-  EXPECT_TRUE(this->table_->IsPrime(7));
-  EXPECT_TRUE(this->table_->IsPrime(11));
-  EXPECT_TRUE(this->table_->IsPrime(131));
-}
-
-TYPED_TEST(PrimeTableTest, CanGetNextPrime) {
-  EXPECT_EQ(2, this->table_->GetNextPrime(0));
-  EXPECT_EQ(3, this->table_->GetNextPrime(2));
-  EXPECT_EQ(5, this->table_->GetNextPrime(3));
-  EXPECT_EQ(7, this->table_->GetNextPrime(5));
-  EXPECT_EQ(11, this->table_->GetNextPrime(7));
-  EXPECT_EQ(131, this->table_->GetNextPrime(128));
-}
-
-// That's it!  Google Test will repeat each TYPED_TEST for each type
-// in the type list specified in TYPED_TEST_SUITE.  Sit back and be
-// happy that you don't have to define them multiple times.
-
-#endif  // GTEST_HAS_TYPED_TEST
-
-#if GTEST_HAS_TYPED_TEST_P
-
-using testing::Types;
-
-// Sometimes, however, you don't yet know all the types that you want
-// to test when you write the tests.  For example, if you are the
-// author of an interface and expect other people to implement it, you
-// might want to write a set of tests to make sure each implementation
-// conforms to some basic requirements, but you don't know what
-// implementations will be written in the future.
-//
-// How can you write the tests without committing to the type
-// parameters?  That's what "type-parameterized tests" can do for you.
-// It is a bit more involved than typed tests, but in return you get a
-// test pattern that can be reused in many contexts, which is a big
-// win.  Here's how you do it:
-
-// First, define a test fixture class template.  Here we just reuse
-// the PrimeTableTest fixture defined earlier:
-
-template <class T>
-class PrimeTableTest2 : public PrimeTableTest<T> {
-};
-
-// Then, declare the test case.  The argument is the name of the test
-// fixture, and also the name of the test case (as usual).  The _P
-// suffix is for "parameterized" or "pattern".
-TYPED_TEST_SUITE_P(PrimeTableTest2);
-
-// Next, use TYPED_TEST_P(TestCaseName, TestName) to define a test,
-// similar to what you do with TEST_F.
-TYPED_TEST_P(PrimeTableTest2, ReturnsFalseForNonPrimes) {
-  EXPECT_FALSE(this->table_->IsPrime(-5));
-  EXPECT_FALSE(this->table_->IsPrime(0));
-  EXPECT_FALSE(this->table_->IsPrime(1));
-  EXPECT_FALSE(this->table_->IsPrime(4));
-  EXPECT_FALSE(this->table_->IsPrime(6));
-  EXPECT_FALSE(this->table_->IsPrime(100));
-}
-
-TYPED_TEST_P(PrimeTableTest2, ReturnsTrueForPrimes) {
-  EXPECT_TRUE(this->table_->IsPrime(2));
-  EXPECT_TRUE(this->table_->IsPrime(3));
-  EXPECT_TRUE(this->table_->IsPrime(5));
-  EXPECT_TRUE(this->table_->IsPrime(7));
-  EXPECT_TRUE(this->table_->IsPrime(11));
-  EXPECT_TRUE(this->table_->IsPrime(131));
-}
-
-TYPED_TEST_P(PrimeTableTest2, CanGetNextPrime) {
-  EXPECT_EQ(2, this->table_->GetNextPrime(0));
-  EXPECT_EQ(3, this->table_->GetNextPrime(2));
-  EXPECT_EQ(5, this->table_->GetNextPrime(3));
-  EXPECT_EQ(7, this->table_->GetNextPrime(5));
-  EXPECT_EQ(11, this->table_->GetNextPrime(7));
-  EXPECT_EQ(131, this->table_->GetNextPrime(128));
-}
-
-// Type-parameterized tests involve one extra step: you have to
-// enumerate the tests you defined:
-REGISTER_TYPED_TEST_SUITE_P(
-    PrimeTableTest2,  // The first argument is the test case name.
-    // The rest of the arguments are the test names.
-    ReturnsFalseForNonPrimes, ReturnsTrueForPrimes, CanGetNextPrime);
-
-// At this point the test pattern is done.  However, you don't have
-// any real test yet as you haven't said which types you want to run
-// the tests with.
-
-// To turn the abstract test pattern into real tests, you instantiate
-// it with a list of types.  Usually the test pattern will be defined
-// in a .h file, and anyone can #include and instantiate it.  You can
-// even instantiate it more than once in the same program.  To tell
-// different instances apart, you give each of them a name, which will
-// become part of the test case name and can be used in test filters.
-
-// The list of types we want to test.  Note that it doesn't have to be
-// defined at the time we write the TYPED_TEST_P()s.
-typedef Types<OnTheFlyPrimeTable, PreCalculatedPrimeTable>
-    PrimeTableImplementations;
-INSTANTIATE_TYPED_TEST_SUITE_P(OnTheFlyAndPreCalculated,    // Instance name
-                               PrimeTableTest2,             // Test case name
-                               PrimeTableImplementations);  // Type list
-
-#endif  // GTEST_HAS_TYPED_TEST_P
-}  // namespace
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/samples/sample7_unittest.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/samples/sample7_unittest.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/samples/sample7_unittest.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/samples/sample7_unittest.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,117 +0,0 @@
-// Copyright 2008 Google Inc.
-// All Rights Reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// This sample shows how to test common properties of multiple
-// implementations of an interface (aka interface tests) using
-// value-parameterized tests. Each test in the test case has
-// a parameter that is an interface pointer to an implementation
-// tested.
-
-// The interface and its implementations are in this header.
-#include "prime_tables.h"
-
-#include "gtest/gtest.h"
-namespace {
-
-using ::testing::TestWithParam;
-using ::testing::Values;
-
-// As a general rule, to prevent a test from affecting the tests that come
-// after it, you should create and destroy the tested objects for each test
-// instead of reusing them.  In this sample we will define a simple factory
-// function for PrimeTable objects.  We will instantiate objects in test's
-// SetUp() method and delete them in TearDown() method.
-typedef PrimeTable* CreatePrimeTableFunc();
-
-PrimeTable* CreateOnTheFlyPrimeTable() {
-  return new OnTheFlyPrimeTable();
-}
-
-template <size_t max_precalculated>
-PrimeTable* CreatePreCalculatedPrimeTable() {
-  return new PreCalculatedPrimeTable(max_precalculated);
-}
-
-// Inside the test body, fixture constructor, SetUp(), and TearDown() you
-// can refer to the test parameter by GetParam().  In this case, the test
-// parameter is a factory function which we call in fixture's SetUp() to
-// create and store an instance of PrimeTable.
-class PrimeTableTestSmpl7 : public TestWithParam<CreatePrimeTableFunc*> {
- public:
-  ~PrimeTableTestSmpl7() override { delete table_; }
-  void SetUp() override { table_ = (*GetParam())(); }
-  void TearDown() override {
-    delete table_;
-    table_ = nullptr;
-  }
-
- protected:
-  PrimeTable* table_;
-};
-
-TEST_P(PrimeTableTestSmpl7, ReturnsFalseForNonPrimes) {
-  EXPECT_FALSE(table_->IsPrime(-5));
-  EXPECT_FALSE(table_->IsPrime(0));
-  EXPECT_FALSE(table_->IsPrime(1));
-  EXPECT_FALSE(table_->IsPrime(4));
-  EXPECT_FALSE(table_->IsPrime(6));
-  EXPECT_FALSE(table_->IsPrime(100));
-}
-
-TEST_P(PrimeTableTestSmpl7, ReturnsTrueForPrimes) {
-  EXPECT_TRUE(table_->IsPrime(2));
-  EXPECT_TRUE(table_->IsPrime(3));
-  EXPECT_TRUE(table_->IsPrime(5));
-  EXPECT_TRUE(table_->IsPrime(7));
-  EXPECT_TRUE(table_->IsPrime(11));
-  EXPECT_TRUE(table_->IsPrime(131));
-}
-
-TEST_P(PrimeTableTestSmpl7, CanGetNextPrime) {
-  EXPECT_EQ(2, table_->GetNextPrime(0));
-  EXPECT_EQ(3, table_->GetNextPrime(2));
-  EXPECT_EQ(5, table_->GetNextPrime(3));
-  EXPECT_EQ(7, table_->GetNextPrime(5));
-  EXPECT_EQ(11, table_->GetNextPrime(7));
-  EXPECT_EQ(131, table_->GetNextPrime(128));
-}
-
-// In order to run value-parameterized tests, you need to instantiate them,
-// or bind them to a list of values which will be used as test parameters.
-// You can instantiate them in a different translation module, or even
-// instantiate them several times.
-//
-// Here, we instantiate our tests with a list of two PrimeTable object
-// factory functions:
-INSTANTIATE_TEST_SUITE_P(OnTheFlyAndPreCalculated, PrimeTableTestSmpl7,
-                         Values(&CreateOnTheFlyPrimeTable,
-                                &CreatePreCalculatedPrimeTable<1000>));
-
-}  // namespace
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/samples/sample8_unittest.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/samples/sample8_unittest.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/samples/sample8_unittest.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/samples/sample8_unittest.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,154 +0,0 @@
-// Copyright 2008 Google Inc.
-// All Rights Reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// This sample shows how to test code relying on some global flag variables.
-// Combine() helps with generating all possible combinations of such flags,
-// and each test is given one combination as a parameter.
-
-// Use class definitions to test from this header.
-#include "prime_tables.h"
-
-#include "gtest/gtest.h"
-namespace {
-
-// Suppose we want to introduce a new, improved implementation of PrimeTable
-// which combines speed of PrecalcPrimeTable and versatility of
-// OnTheFlyPrimeTable (see prime_tables.h). Inside it instantiates both
-// PrecalcPrimeTable and OnTheFlyPrimeTable and uses the one that is more
-// appropriate under the circumstances. But in low memory conditions, it can be
-// told to instantiate without PrecalcPrimeTable instance at all and use only
-// OnTheFlyPrimeTable.
-class HybridPrimeTable : public PrimeTable {
- public:
-  HybridPrimeTable(bool force_on_the_fly, int max_precalculated)
-      : on_the_fly_impl_(new OnTheFlyPrimeTable),
-        precalc_impl_(force_on_the_fly
-                          ? nullptr
-                          : new PreCalculatedPrimeTable(max_precalculated)),
-        max_precalculated_(max_precalculated) {}
-  ~HybridPrimeTable() override {
-    delete on_the_fly_impl_;
-    delete precalc_impl_;
-  }
-
-  bool IsPrime(int n) const override {
-    if (precalc_impl_ != nullptr && n < max_precalculated_)
-      return precalc_impl_->IsPrime(n);
-    else
-      return on_the_fly_impl_->IsPrime(n);
-  }
-
-  int GetNextPrime(int p) const override {
-    int next_prime = -1;
-    if (precalc_impl_ != nullptr && p < max_precalculated_)
-      next_prime = precalc_impl_->GetNextPrime(p);
-
-    return next_prime != -1 ? next_prime : on_the_fly_impl_->GetNextPrime(p);
-  }
-
- private:
-  OnTheFlyPrimeTable* on_the_fly_impl_;
-  PreCalculatedPrimeTable* precalc_impl_;
-  int max_precalculated_;
-};
-
-using ::testing::TestWithParam;
-using ::testing::Bool;
-using ::testing::Values;
-using ::testing::Combine;
-
-// To test all code paths for HybridPrimeTable we must test it with numbers
-// both within and outside PreCalculatedPrimeTable's capacity and also with
-// PreCalculatedPrimeTable disabled. We do this by defining fixture which will
-// accept different combinations of parameters for instantiating a
-// HybridPrimeTable instance.
-class PrimeTableTest : public TestWithParam< ::std::tuple<bool, int> > {
- protected:
-  void SetUp() override {
-    bool force_on_the_fly;
-    int max_precalculated;
-    std::tie(force_on_the_fly, max_precalculated) = GetParam();
-    table_ = new HybridPrimeTable(force_on_the_fly, max_precalculated);
-  }
-  void TearDown() override {
-    delete table_;
-    table_ = nullptr;
-  }
-  HybridPrimeTable* table_;
-};
-
-TEST_P(PrimeTableTest, ReturnsFalseForNonPrimes) {
-  // Inside the test body, you can refer to the test parameter by GetParam().
-  // In this case, the test parameter is a PrimeTable interface pointer which
-  // we can use directly.
-  // Please note that you can also save it in the fixture's SetUp() method
-  // or constructor and use saved copy in the tests.
-
-  EXPECT_FALSE(table_->IsPrime(-5));
-  EXPECT_FALSE(table_->IsPrime(0));
-  EXPECT_FALSE(table_->IsPrime(1));
-  EXPECT_FALSE(table_->IsPrime(4));
-  EXPECT_FALSE(table_->IsPrime(6));
-  EXPECT_FALSE(table_->IsPrime(100));
-}
-
-TEST_P(PrimeTableTest, ReturnsTrueForPrimes) {
-  EXPECT_TRUE(table_->IsPrime(2));
-  EXPECT_TRUE(table_->IsPrime(3));
-  EXPECT_TRUE(table_->IsPrime(5));
-  EXPECT_TRUE(table_->IsPrime(7));
-  EXPECT_TRUE(table_->IsPrime(11));
-  EXPECT_TRUE(table_->IsPrime(131));
-}
-
-TEST_P(PrimeTableTest, CanGetNextPrime) {
-  EXPECT_EQ(2, table_->GetNextPrime(0));
-  EXPECT_EQ(3, table_->GetNextPrime(2));
-  EXPECT_EQ(5, table_->GetNextPrime(3));
-  EXPECT_EQ(7, table_->GetNextPrime(5));
-  EXPECT_EQ(11, table_->GetNextPrime(7));
-  EXPECT_EQ(131, table_->GetNextPrime(128));
-}
-
-// In order to run value-parameterized tests, you need to instantiate them,
-// or bind them to a list of values which will be used as test parameters.
-// You can instantiate them in a different translation module, or even
-// instantiate them several times.
-//
-// Here, we instantiate our tests with a list of parameters. We must combine
-// all variations of the boolean flag suppressing PrecalcPrimeTable and some
-// meaningful values for tests. We choose a small value (1), and a value that
-// will put some of the tested numbers beyond the capability of the
-// PrecalcPrimeTable instance and some inside it (10). Combine will produce all
-// possible combinations.
-INSTANTIATE_TEST_SUITE_P(MeaningfulTestParameters, PrimeTableTest,
-                         Combine(Bool(), Values(1, 10)));
-
-}  // namespace
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/samples/sample9_unittest.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/samples/sample9_unittest.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/samples/sample9_unittest.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/samples/sample9_unittest.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,156 +0,0 @@
-// Copyright 2009 Google Inc. All Rights Reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// This sample shows how to use Google Test listener API to implement
-// an alternative console output and how to use the UnitTest reflection API
-// to enumerate test cases and tests and to inspect their results.
-
-#include <stdio.h>
-
-#include "gtest/gtest.h"
-
-using ::testing::EmptyTestEventListener;
-using ::testing::InitGoogleTest;
-using ::testing::Test;
-using ::testing::TestCase;
-using ::testing::TestEventListeners;
-using ::testing::TestInfo;
-using ::testing::TestPartResult;
-using ::testing::UnitTest;
-namespace {
-// Provides alternative output mode which produces minimal amount of
-// information about tests.
-class TersePrinter : public EmptyTestEventListener {
- private:
-  // Called before any test activity starts.
-  void OnTestProgramStart(const UnitTest& /* unit_test */) override {}
-
-  // Called after all test activities have ended.
-  void OnTestProgramEnd(const UnitTest& unit_test) override {
-    fprintf(stdout, "TEST %s\n", unit_test.Passed() ? "PASSED" : "FAILED");
-    fflush(stdout);
-  }
-
-  // Called before a test starts.
-  void OnTestStart(const TestInfo& test_info) override {
-    fprintf(stdout,
-            "*** Test %s.%s starting.\n",
-            test_info.test_case_name(),
-            test_info.name());
-    fflush(stdout);
-  }
-
-  // Called after a failed assertion or a SUCCEED() invocation.
-  void OnTestPartResult(const TestPartResult& test_part_result) override {
-    fprintf(stdout,
-            "%s in %s:%d\n%s\n",
-            test_part_result.failed() ? "*** Failure" : "Success",
-            test_part_result.file_name(),
-            test_part_result.line_number(),
-            test_part_result.summary());
-    fflush(stdout);
-  }
-
-  // Called after a test ends.
-  void OnTestEnd(const TestInfo& test_info) override {
-    fprintf(stdout,
-            "*** Test %s.%s ending.\n",
-            test_info.test_case_name(),
-            test_info.name());
-    fflush(stdout);
-  }
-};  // class TersePrinter
-
-TEST(CustomOutputTest, PrintsMessage) {
-  printf("Printing something from the test body...\n");
-}
-
-TEST(CustomOutputTest, Succeeds) {
-  SUCCEED() << "SUCCEED() has been invoked from here";
-}
-
-TEST(CustomOutputTest, Fails) {
-  EXPECT_EQ(1, 2)
-      << "This test fails in order to demonstrate alternative failure messages";
-}
-}  // namespace
-
-int main(int argc, char **argv) {
-  InitGoogleTest(&argc, argv);
-
-  bool terse_output = false;
-  if (argc > 1 && strcmp(argv[1], "--terse_output") == 0 )
-    terse_output = true;
-  else
-    printf("%s\n", "Run this program with --terse_output to change the way "
-           "it prints its output.");
-
-  UnitTest& unit_test = *UnitTest::GetInstance();
-
-  // If we are given the --terse_output command line flag, suppresses the
-  // standard output and attaches own result printer.
-  if (terse_output) {
-    TestEventListeners& listeners = unit_test.listeners();
-
-    // Removes the default console output listener from the list so it will
-    // not receive events from Google Test and won't print any output. Since
-    // this operation transfers ownership of the listener to the caller we
-    // have to delete it as well.
-    delete listeners.Release(listeners.default_result_printer());
-
-    // Adds the custom output listener to the list. It will now receive
-    // events from Google Test and print the alternative output. We don't
-    // have to worry about deleting it since Google Test assumes ownership
-    // over it after adding it to the list.
-    listeners.Append(new TersePrinter);
-  }
-  int ret_val = RUN_ALL_TESTS();
-
-  // This is an example of using the UnitTest reflection API to inspect test
-  // results. Here we discount failures from the tests we expected to fail.
-  int unexpectedly_failed_tests = 0;
-  for (int i = 0; i < unit_test.total_test_suite_count(); ++i) {
-    const testing::TestSuite& test_suite = *unit_test.GetTestSuite(i);
-    for (int j = 0; j < test_suite.total_test_count(); ++j) {
-      const TestInfo& test_info = *test_suite.GetTestInfo(j);
-      // Counts failed tests that were not meant to fail (those without
-      // 'Fails' in the name).
-      if (test_info.result()->Failed() &&
-          strcmp(test_info.name(), "Fails") != 0) {
-        unexpectedly_failed_tests++;
-      }
-    }
-  }
-
-  // Test that were meant to fail should not affect the test program outcome.
-  if (unexpectedly_failed_tests == 0)
-    ret_val = 0;
-
-  return ret_val;
-}
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/src/gtest-all.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/src/gtest-all.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/src/gtest-all.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/src/gtest-all.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-//
-// Google C++ Testing and Mocking Framework (Google Test)
-//
-// Sometimes it's desirable to build Google Test by compiling a single file.
-// This file serves this purpose.
-
-// This line ensures that gtest.h can be compiled on its own, even
-// when it's fused.
-#include "gtest/gtest.h"
-
-// The following lines pull in the real gtest *.cc files.
-#include "src/gtest.cc"
-#include "src/gtest-death-test.cc"
-#include "src/gtest-filepath.cc"
-#include "src/gtest-matchers.cc"
-#include "src/gtest-port.cc"
-#include "src/gtest-printers.cc"
-#include "src/gtest-test-part.cc"
-#include "src/gtest-typed-test.cc"
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/src/gtest.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/src/gtest.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/src/gtest.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/src/gtest.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,6182 +0,0 @@
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-//
-// The Google C++ Testing and Mocking Framework (Google Test)
-
-#include "gtest/gtest.h"
-#include "gtest/internal/custom/gtest.h"
-#include "gtest/gtest-spi.h"
-
-#include <ctype.h>
-#include <math.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <wchar.h>
-#include <wctype.h>
-
-#include <algorithm>
-#include <iomanip>
-#include <limits>
-#include <list>
-#include <map>
-#include <ostream>  // NOLINT
-#include <sstream>
-#include <vector>
-
-#if GTEST_OS_LINUX
-
-# define GTEST_HAS_GETTIMEOFDAY_ 1
-
-# include <fcntl.h>  // NOLINT
-# include <limits.h>  // NOLINT
-# include <sched.h>  // NOLINT
-// Declares vsnprintf().  This header is not available on Windows.
-# include <strings.h>  // NOLINT
-# include <sys/mman.h>  // NOLINT
-# include <sys/time.h>  // NOLINT
-# include <unistd.h>  // NOLINT
-# include <string>
-
-#elif GTEST_OS_ZOS
-# define GTEST_HAS_GETTIMEOFDAY_ 1
-# include <sys/time.h>  // NOLINT
-
-// On z/OS we additionally need strings.h for strcasecmp.
-# include <strings.h>  // NOLINT
-
-#elif GTEST_OS_WINDOWS_MOBILE  // We are on Windows CE.
-
-# include <windows.h>  // NOLINT
-# undef min
-
-#elif GTEST_OS_WINDOWS  // We are on Windows proper.
-
-# include <windows.h>  // NOLINT
-# undef min
-
-# include <crtdbg.h>  // NOLINT
-# include <debugapi.h>  // NOLINT
-# include <io.h>  // NOLINT
-# include <sys/timeb.h>  // NOLINT
-# include <sys/types.h>  // NOLINT
-# include <sys/stat.h>  // NOLINT
-
-# if GTEST_OS_WINDOWS_MINGW
-// MinGW has gettimeofday() but not _ftime64().
-#  define GTEST_HAS_GETTIMEOFDAY_ 1
-#  include <sys/time.h>  // NOLINT
-# endif  // GTEST_OS_WINDOWS_MINGW
-
-#else
-
-// Assume other platforms have gettimeofday().
-# define GTEST_HAS_GETTIMEOFDAY_ 1
-
-// cpplint thinks that the header is already included, so we want to
-// silence it.
-# include <sys/time.h>  // NOLINT
-# include <unistd.h>  // NOLINT
-
-#endif  // GTEST_OS_LINUX
-
-#if GTEST_HAS_EXCEPTIONS
-# include <stdexcept>
-#endif
-
-#if GTEST_CAN_STREAM_RESULTS_
-# include <arpa/inet.h>  // NOLINT
-# include <netdb.h>  // NOLINT
-# include <sys/socket.h>  // NOLINT
-# include <sys/types.h>  // NOLINT
-#endif
-
-#include "src/gtest-internal-inl.h"
-
-#if GTEST_OS_WINDOWS
-# define vsnprintf _vsnprintf
-#endif  // GTEST_OS_WINDOWS
-
-#if GTEST_OS_MAC
-#ifndef GTEST_OS_IOS
-#include <crt_externs.h>
-#endif
-#endif
-
-#if GTEST_HAS_ABSL
-#include "absl/debugging/failure_signal_handler.h"
-#include "absl/debugging/stacktrace.h"
-#include "absl/debugging/symbolize.h"
-#include "absl/strings/str_cat.h"
-#endif  // GTEST_HAS_ABSL
-
-namespace testing {
-
-using internal::CountIf;
-using internal::ForEach;
-using internal::GetElementOr;
-using internal::Shuffle;
-
-// Constants.
-
-// A test whose test suite name or test name matches this filter is
-// disabled and not run.
-static const char kDisableTestFilter[] = "DISABLED_*:*/DISABLED_*";
-
-// A test suite whose name matches this filter is considered a death
-// test suite and will be run before test suites whose name doesn't
-// match this filter.
-static const char kDeathTestSuiteFilter[] = "*DeathTest:*DeathTest/*";
-
-// A test filter that matches everything.
-static const char kUniversalFilter[] = "*";
-
-// The default output format.
-static const char kDefaultOutputFormat[] = "xml";
-// The default output file.
-static const char kDefaultOutputFile[] = "test_detail";
-
-// The environment variable name for the test shard index.
-static const char kTestShardIndex[] = "GTEST_SHARD_INDEX";
-// The environment variable name for the total number of test shards.
-static const char kTestTotalShards[] = "GTEST_TOTAL_SHARDS";
-// The environment variable name for the test shard status file.
-static const char kTestShardStatusFile[] = "GTEST_SHARD_STATUS_FILE";
-
-namespace internal {
-
-// The text used in failure messages to indicate the start of the
-// stack trace.
-const char kStackTraceMarker[] = "\nStack trace:\n";
-
-// g_help_flag is true if and only if the --help flag or an equivalent form
-// is specified on the command line.
-bool g_help_flag = false;
-
-// Utilty function to Open File for Writing
-static FILE* OpenFileForWriting(const std::string& output_file) {
-  FILE* fileout = nullptr;
-  FilePath output_file_path(output_file);
-  FilePath output_dir(output_file_path.RemoveFileName());
-
-  if (output_dir.CreateDirectoriesRecursively()) {
-    fileout = posix::FOpen(output_file.c_str(), "w");
-  }
-  if (fileout == nullptr) {
-    GTEST_LOG_(FATAL) << "Unable to open file \"" << output_file << "\"";
-  }
-  return fileout;
-}
-
-}  // namespace internal
-
-// Bazel passes in the argument to '--test_filter' via the TESTBRIDGE_TEST_ONLY
-// environment variable.
-static const char* GetDefaultFilter() {
-  const char* const testbridge_test_only =
-      internal::posix::GetEnv("TESTBRIDGE_TEST_ONLY");
-  if (testbridge_test_only != nullptr) {
-    return testbridge_test_only;
-  }
-  return kUniversalFilter;
-}
-
-GTEST_DEFINE_bool_(
-    also_run_disabled_tests,
-    internal::BoolFromGTestEnv("also_run_disabled_tests", false),
-    "Run disabled tests too, in addition to the tests normally being run.");
-
-GTEST_DEFINE_bool_(
-    break_on_failure, internal::BoolFromGTestEnv("break_on_failure", false),
-    "True if and only if a failed assertion should be a debugger "
-    "break-point.");
-
-GTEST_DEFINE_bool_(catch_exceptions,
-                   internal::BoolFromGTestEnv("catch_exceptions", true),
-                   "True if and only if " GTEST_NAME_
-                   " should catch exceptions and treat them as test failures.");
-
-GTEST_DEFINE_string_(
-    color,
-    internal::StringFromGTestEnv("color", "auto"),
-    "Whether to use colors in the output.  Valid values: yes, no, "
-    "and auto.  'auto' means to use colors if the output is "
-    "being sent to a terminal and the TERM environment variable "
-    "is set to a terminal type that supports colors.");
-
-GTEST_DEFINE_string_(
-    filter,
-    internal::StringFromGTestEnv("filter", GetDefaultFilter()),
-    "A colon-separated list of glob (not regex) patterns "
-    "for filtering the tests to run, optionally followed by a "
-    "'-' and a : separated list of negative patterns (tests to "
-    "exclude).  A test is run if it matches one of the positive "
-    "patterns and does not match any of the negative patterns.");
-
-GTEST_DEFINE_bool_(
-    install_failure_signal_handler,
-    internal::BoolFromGTestEnv("install_failure_signal_handler", false),
-    "If true and supported on the current platform, " GTEST_NAME_ " should "
-    "install a signal handler that dumps debugging information when fatal "
-    "signals are raised.");
-
-GTEST_DEFINE_bool_(list_tests, false,
-                   "List all tests without running them.");
-
-// The net priority order after flag processing is thus:
-//   --gtest_output command line flag
-//   GTEST_OUTPUT environment variable
-//   XML_OUTPUT_FILE environment variable
-//   ''
-GTEST_DEFINE_string_(
-    output,
-    internal::StringFromGTestEnv("output",
-      internal::OutputFlagAlsoCheckEnvVar().c_str()),
-    "A format (defaults to \"xml\" but can be specified to be \"json\"), "
-    "optionally followed by a colon and an output file name or directory. "
-    "A directory is indicated by a trailing pathname separator. "
-    "Examples: \"xml:filename.xml\", \"xml::directoryname/\". "
-    "If a directory is specified, output files will be created "
-    "within that directory, with file-names based on the test "
-    "executable's name and, if necessary, made unique by adding "
-    "digits.");
-
-GTEST_DEFINE_bool_(print_time, internal::BoolFromGTestEnv("print_time", true),
-                   "True if and only if " GTEST_NAME_
-                   " should display elapsed time in text output.");
-
-GTEST_DEFINE_bool_(print_utf8, internal::BoolFromGTestEnv("print_utf8", true),
-                   "True if and only if " GTEST_NAME_
-                   " prints UTF8 characters as text.");
-
-GTEST_DEFINE_int32_(
-    random_seed,
-    internal::Int32FromGTestEnv("random_seed", 0),
-    "Random number seed to use when shuffling test orders.  Must be in range "
-    "[1, 99999], or 0 to use a seed based on the current time.");
-
-GTEST_DEFINE_int32_(
-    repeat,
-    internal::Int32FromGTestEnv("repeat", 1),
-    "How many times to repeat each test.  Specify a negative number "
-    "for repeating forever.  Useful for shaking out flaky tests.");
-
-GTEST_DEFINE_bool_(show_internal_stack_frames, false,
-                   "True if and only if " GTEST_NAME_
-                   " should include internal stack frames when "
-                   "printing test failure stack traces.");
-
-GTEST_DEFINE_bool_(shuffle, internal::BoolFromGTestEnv("shuffle", false),
-                   "True if and only if " GTEST_NAME_
-                   " should randomize tests' order on every run.");
-
-GTEST_DEFINE_int32_(
-    stack_trace_depth,
-    internal::Int32FromGTestEnv("stack_trace_depth", kMaxStackTraceDepth),
-    "The maximum number of stack frames to print when an "
-    "assertion fails.  The valid range is 0 through 100, inclusive.");
-
-GTEST_DEFINE_string_(
-    stream_result_to,
-    internal::StringFromGTestEnv("stream_result_to", ""),
-    "This flag specifies the host name and the port number on which to stream "
-    "test results. Example: \"localhost:555\". The flag is effective only on "
-    "Linux.");
-
-GTEST_DEFINE_bool_(
-    throw_on_failure,
-    internal::BoolFromGTestEnv("throw_on_failure", false),
-    "When this flag is specified, a failed assertion will throw an exception "
-    "if exceptions are enabled or exit the program with a non-zero code "
-    "otherwise. For use with an external test framework.");
-
-#if GTEST_USE_OWN_FLAGFILE_FLAG_
-GTEST_DEFINE_string_(
-    flagfile,
-    internal::StringFromGTestEnv("flagfile", ""),
-    "This flag specifies the flagfile to read command-line flags from.");
-#endif  // GTEST_USE_OWN_FLAGFILE_FLAG_
-
-namespace internal {
-
-// Generates a random number from [0, range), using a Linear
-// Congruential Generator (LCG).  Crashes if 'range' is 0 or greater
-// than kMaxRange.
-UInt32 Random::Generate(UInt32 range) {
-  // These constants are the same as are used in glibc's rand(3).
-  // Use wider types than necessary to prevent unsigned overflow diagnostics.
-  state_ = static_cast<UInt32>(1103515245ULL*state_ + 12345U) % kMaxRange;
-
-  GTEST_CHECK_(range > 0)
-      << "Cannot generate a number in the range [0, 0).";
-  GTEST_CHECK_(range <= kMaxRange)
-      << "Generation of a number in [0, " << range << ") was requested, "
-      << "but this can only generate numbers in [0, " << kMaxRange << ").";
-
-  // Converting via modulus introduces a bit of downward bias, but
-  // it's simple, and a linear congruential generator isn't too good
-  // to begin with.
-  return state_ % range;
-}
-
-// GTestIsInitialized() returns true if and only if the user has initialized
-// Google Test.  Useful for catching the user mistake of not initializing
-// Google Test before calling RUN_ALL_TESTS().
-static bool GTestIsInitialized() { return GetArgvs().size() > 0; }
-
-// Iterates over a vector of TestSuites, keeping a running sum of the
-// results of calling a given int-returning method on each.
-// Returns the sum.
-static int SumOverTestSuiteList(const std::vector<TestSuite*>& case_list,
-                                int (TestSuite::*method)() const) {
-  int sum = 0;
-  for (size_t i = 0; i < case_list.size(); i++) {
-    sum += (case_list[i]->*method)();
-  }
-  return sum;
-}
-
-// Returns true if and only if the test suite passed.
-static bool TestSuitePassed(const TestSuite* test_suite) {
-  return test_suite->should_run() && test_suite->Passed();
-}
-
-// Returns true if and only if the test suite failed.
-static bool TestSuiteFailed(const TestSuite* test_suite) {
-  return test_suite->should_run() && test_suite->Failed();
-}
-
-// Returns true if and only if test_suite contains at least one test that
-// should run.
-static bool ShouldRunTestSuite(const TestSuite* test_suite) {
-  return test_suite->should_run();
-}
-
-// AssertHelper constructor.
-AssertHelper::AssertHelper(TestPartResult::Type type,
-                           const char* file,
-                           int line,
-                           const char* message)
-    : data_(new AssertHelperData(type, file, line, message)) {
-}
-
-AssertHelper::~AssertHelper() {
-  delete data_;
-}
-
-// Message assignment, for assertion streaming support.
-void AssertHelper::operator=(const Message& message) const {
-  UnitTest::GetInstance()->
-    AddTestPartResult(data_->type, data_->file, data_->line,
-                      AppendUserMessage(data_->message, message),
-                      UnitTest::GetInstance()->impl()
-                      ->CurrentOsStackTraceExceptTop(1)
-                      // Skips the stack frame for this function itself.
-                      );  // NOLINT
-}
-
-// A copy of all command line arguments.  Set by InitGoogleTest().
-static ::std::vector<std::string> g_argvs;
-
-::std::vector<std::string> GetArgvs() {
-#if defined(GTEST_CUSTOM_GET_ARGVS_)
-  // GTEST_CUSTOM_GET_ARGVS_() may return a container of std::string or
-  // ::string. This code converts it to the appropriate type.
-  const auto& custom = GTEST_CUSTOM_GET_ARGVS_();
-  return ::std::vector<std::string>(custom.begin(), custom.end());
-#else   // defined(GTEST_CUSTOM_GET_ARGVS_)
-  return g_argvs;
-#endif  // defined(GTEST_CUSTOM_GET_ARGVS_)
-}
-
-// Returns the current application's name, removing directory path if that
-// is present.
-FilePath GetCurrentExecutableName() {
-  FilePath result;
-
-#if GTEST_OS_WINDOWS || GTEST_OS_OS2
-  result.Set(FilePath(GetArgvs()[0]).RemoveExtension("exe"));
-#else
-  result.Set(FilePath(GetArgvs()[0]));
-#endif  // GTEST_OS_WINDOWS
-
-  return result.RemoveDirectoryName();
-}
-
-// Functions for processing the gtest_output flag.
-
-// Returns the output format, or "" for normal printed output.
-std::string UnitTestOptions::GetOutputFormat() {
-  const char* const gtest_output_flag = GTEST_FLAG(output).c_str();
-  const char* const colon = strchr(gtest_output_flag, ':');
-  return (colon == nullptr)
-             ? std::string(gtest_output_flag)
-             : std::string(gtest_output_flag,
-                           static_cast<size_t>(colon - gtest_output_flag));
-}
-
-// Returns the name of the requested output file, or the default if none
-// was explicitly specified.
-std::string UnitTestOptions::GetAbsolutePathToOutputFile() {
-  const char* const gtest_output_flag = GTEST_FLAG(output).c_str();
-
-  std::string format = GetOutputFormat();
-  if (format.empty())
-    format = std::string(kDefaultOutputFormat);
-
-  const char* const colon = strchr(gtest_output_flag, ':');
-  if (colon == nullptr)
-    return internal::FilePath::MakeFileName(
-        internal::FilePath(
-            UnitTest::GetInstance()->original_working_dir()),
-        internal::FilePath(kDefaultOutputFile), 0,
-        format.c_str()).string();
-
-  internal::FilePath output_name(colon + 1);
-  if (!output_name.IsAbsolutePath())
-    output_name = internal::FilePath::ConcatPaths(
-        internal::FilePath(UnitTest::GetInstance()->original_working_dir()),
-        internal::FilePath(colon + 1));
-
-  if (!output_name.IsDirectory())
-    return output_name.string();
-
-  internal::FilePath result(internal::FilePath::GenerateUniqueFileName(
-      output_name, internal::GetCurrentExecutableName(),
-      GetOutputFormat().c_str()));
-  return result.string();
-}
-
-// Returns true if and only if the wildcard pattern matches the string.
-// The first ':' or '\0' character in pattern marks the end of it.
-//
-// This recursive algorithm isn't very efficient, but is clear and
-// works well enough for matching test names, which are short.
-bool UnitTestOptions::PatternMatchesString(const char *pattern,
-                                           const char *str) {
-  switch (*pattern) {
-    case '\0':
-    case ':':  // Either ':' or '\0' marks the end of the pattern.
-      return *str == '\0';
-    case '?':  // Matches any single character.
-      return *str != '\0' && PatternMatchesString(pattern + 1, str + 1);
-    case '*':  // Matches any string (possibly empty) of characters.
-      return (*str != '\0' && PatternMatchesString(pattern, str + 1)) ||
-          PatternMatchesString(pattern + 1, str);
-    default:  // Non-special character.  Matches itself.
-      return *pattern == *str &&
-          PatternMatchesString(pattern + 1, str + 1);
-  }
-}
-
-bool UnitTestOptions::MatchesFilter(
-    const std::string& name, const char* filter) {
-  const char *cur_pattern = filter;
-  for (;;) {
-    if (PatternMatchesString(cur_pattern, name.c_str())) {
-      return true;
-    }
-
-    // Finds the next pattern in the filter.
-    cur_pattern = strchr(cur_pattern, ':');
-
-    // Returns if no more pattern can be found.
-    if (cur_pattern == nullptr) {
-      return false;
-    }
-
-    // Skips the pattern separater (the ':' character).
-    cur_pattern++;
-  }
-}
-
-// Returns true if and only if the user-specified filter matches the test
-// suite name and the test name.
-bool UnitTestOptions::FilterMatchesTest(const std::string& test_suite_name,
-                                        const std::string& test_name) {
-  const std::string& full_name = test_suite_name + "." + test_name.c_str();
-
-  // Split --gtest_filter at '-', if there is one, to separate into
-  // positive filter and negative filter portions
-  const char* const p = GTEST_FLAG(filter).c_str();
-  const char* const dash = strchr(p, '-');
-  std::string positive;
-  std::string negative;
-  if (dash == nullptr) {
-    positive = GTEST_FLAG(filter).c_str();  // Whole string is a positive filter
-    negative = "";
-  } else {
-    positive = std::string(p, dash);   // Everything up to the dash
-    negative = std::string(dash + 1);  // Everything after the dash
-    if (positive.empty()) {
-      // Treat '-test1' as the same as '*-test1'
-      positive = kUniversalFilter;
-    }
-  }
-
-  // A filter is a colon-separated list of patterns.  It matches a
-  // test if any pattern in it matches the test.
-  return (MatchesFilter(full_name, positive.c_str()) &&
-          !MatchesFilter(full_name, negative.c_str()));
-}
-
-#if GTEST_HAS_SEH
-// Returns EXCEPTION_EXECUTE_HANDLER if Google Test should handle the
-// given SEH exception, or EXCEPTION_CONTINUE_SEARCH otherwise.
-// This function is useful as an __except condition.
-int UnitTestOptions::GTestShouldProcessSEH(DWORD exception_code) {
-  // Google Test should handle a SEH exception if:
-  //   1. the user wants it to, AND
-  //   2. this is not a breakpoint exception, AND
-  //   3. this is not a C++ exception (VC++ implements them via SEH,
-  //      apparently).
-  //
-  // SEH exception code for C++ exceptions.
-  // (see http://support.microsoft.com/kb/185294 for more information).
-  const DWORD kCxxExceptionCode = 0xe06d7363;
-
-  bool should_handle = true;
-
-  if (!GTEST_FLAG(catch_exceptions))
-    should_handle = false;
-  else if (exception_code == EXCEPTION_BREAKPOINT)
-    should_handle = false;
-  else if (exception_code == kCxxExceptionCode)
-    should_handle = false;
-
-  return should_handle ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH;
-}
-#endif  // GTEST_HAS_SEH
-
-}  // namespace internal
-
-// The c'tor sets this object as the test part result reporter used by
-// Google Test.  The 'result' parameter specifies where to report the
-// results. Intercepts only failures from the current thread.
-ScopedFakeTestPartResultReporter::ScopedFakeTestPartResultReporter(
-    TestPartResultArray* result)
-    : intercept_mode_(INTERCEPT_ONLY_CURRENT_THREAD),
-      result_(result) {
-  Init();
-}
-
-// The c'tor sets this object as the test part result reporter used by
-// Google Test.  The 'result' parameter specifies where to report the
-// results.
-ScopedFakeTestPartResultReporter::ScopedFakeTestPartResultReporter(
-    InterceptMode intercept_mode, TestPartResultArray* result)
-    : intercept_mode_(intercept_mode),
-      result_(result) {
-  Init();
-}
-
-void ScopedFakeTestPartResultReporter::Init() {
-  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
-  if (intercept_mode_ == INTERCEPT_ALL_THREADS) {
-    old_reporter_ = impl->GetGlobalTestPartResultReporter();
-    impl->SetGlobalTestPartResultReporter(this);
-  } else {
-    old_reporter_ = impl->GetTestPartResultReporterForCurrentThread();
-    impl->SetTestPartResultReporterForCurrentThread(this);
-  }
-}
-
-// The d'tor restores the test part result reporter used by Google Test
-// before.
-ScopedFakeTestPartResultReporter::~ScopedFakeTestPartResultReporter() {
-  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
-  if (intercept_mode_ == INTERCEPT_ALL_THREADS) {
-    impl->SetGlobalTestPartResultReporter(old_reporter_);
-  } else {
-    impl->SetTestPartResultReporterForCurrentThread(old_reporter_);
-  }
-}
-
-// Increments the test part result count and remembers the result.
-// This method is from the TestPartResultReporterInterface interface.
-void ScopedFakeTestPartResultReporter::ReportTestPartResult(
-    const TestPartResult& result) {
-  result_->Append(result);
-}
-
-namespace internal {
-
-// Returns the type ID of ::testing::Test.  We should always call this
-// instead of GetTypeId< ::testing::Test>() to get the type ID of
-// testing::Test.  This is to work around a suspected linker bug when
-// using Google Test as a framework on Mac OS X.  The bug causes
-// GetTypeId< ::testing::Test>() to return different values depending
-// on whether the call is from the Google Test framework itself or
-// from user test code.  GetTestTypeId() is guaranteed to always
-// return the same value, as it always calls GetTypeId<>() from the
-// gtest.cc, which is within the Google Test framework.
-TypeId GetTestTypeId() {
-  return GetTypeId<Test>();
-}
-
-// The value of GetTestTypeId() as seen from within the Google Test
-// library.  This is solely for testing GetTestTypeId().
-extern const TypeId kTestTypeIdInGoogleTest = GetTestTypeId();
-
-// This predicate-formatter checks that 'results' contains a test part
-// failure of the given type and that the failure message contains the
-// given substring.
-static AssertionResult HasOneFailure(const char* /* results_expr */,
-                                     const char* /* type_expr */,
-                                     const char* /* substr_expr */,
-                                     const TestPartResultArray& results,
-                                     TestPartResult::Type type,
-                                     const std::string& substr) {
-  const std::string expected(type == TestPartResult::kFatalFailure ?
-                        "1 fatal failure" :
-                        "1 non-fatal failure");
-  Message msg;
-  if (results.size() != 1) {
-    msg << "Expected: " << expected << "\n"
-        << "  Actual: " << results.size() << " failures";
-    for (int i = 0; i < results.size(); i++) {
-      msg << "\n" << results.GetTestPartResult(i);
-    }
-    return AssertionFailure() << msg;
-  }
-
-  const TestPartResult& r = results.GetTestPartResult(0);
-  if (r.type() != type) {
-    return AssertionFailure() << "Expected: " << expected << "\n"
-                              << "  Actual:\n"
-                              << r;
-  }
-
-  if (strstr(r.message(), substr.c_str()) == nullptr) {
-    return AssertionFailure() << "Expected: " << expected << " containing \""
-                              << substr << "\"\n"
-                              << "  Actual:\n"
-                              << r;
-  }
-
-  return AssertionSuccess();
-}
-
-// The constructor of SingleFailureChecker remembers where to look up
-// test part results, what type of failure we expect, and what
-// substring the failure message should contain.
-SingleFailureChecker::SingleFailureChecker(const TestPartResultArray* results,
-                                           TestPartResult::Type type,
-                                           const std::string& substr)
-    : results_(results), type_(type), substr_(substr) {}
-
-// The destructor of SingleFailureChecker verifies that the given
-// TestPartResultArray contains exactly one failure that has the given
-// type and contains the given substring.  If that's not the case, a
-// non-fatal failure will be generated.
-SingleFailureChecker::~SingleFailureChecker() {
-  EXPECT_PRED_FORMAT3(HasOneFailure, *results_, type_, substr_);
-}
-
-DefaultGlobalTestPartResultReporter::DefaultGlobalTestPartResultReporter(
-    UnitTestImpl* unit_test) : unit_test_(unit_test) {}
-
-void DefaultGlobalTestPartResultReporter::ReportTestPartResult(
-    const TestPartResult& result) {
-  unit_test_->current_test_result()->AddTestPartResult(result);
-  unit_test_->listeners()->repeater()->OnTestPartResult(result);
-}
-
-DefaultPerThreadTestPartResultReporter::DefaultPerThreadTestPartResultReporter(
-    UnitTestImpl* unit_test) : unit_test_(unit_test) {}
-
-void DefaultPerThreadTestPartResultReporter::ReportTestPartResult(
-    const TestPartResult& result) {
-  unit_test_->GetGlobalTestPartResultReporter()->ReportTestPartResult(result);
-}
-
-// Returns the global test part result reporter.
-TestPartResultReporterInterface*
-UnitTestImpl::GetGlobalTestPartResultReporter() {
-  internal::MutexLock lock(&global_test_part_result_reporter_mutex_);
-  return global_test_part_result_repoter_;
-}
-
-// Sets the global test part result reporter.
-void UnitTestImpl::SetGlobalTestPartResultReporter(
-    TestPartResultReporterInterface* reporter) {
-  internal::MutexLock lock(&global_test_part_result_reporter_mutex_);
-  global_test_part_result_repoter_ = reporter;
-}
-
-// Returns the test part result reporter for the current thread.
-TestPartResultReporterInterface*
-UnitTestImpl::GetTestPartResultReporterForCurrentThread() {
-  return per_thread_test_part_result_reporter_.get();
-}
-
-// Sets the test part result reporter for the current thread.
-void UnitTestImpl::SetTestPartResultReporterForCurrentThread(
-    TestPartResultReporterInterface* reporter) {
-  per_thread_test_part_result_reporter_.set(reporter);
-}
-
-// Gets the number of successful test suites.
-int UnitTestImpl::successful_test_suite_count() const {
-  return CountIf(test_suites_, TestSuitePassed);
-}
-
-// Gets the number of failed test suites.
-int UnitTestImpl::failed_test_suite_count() const {
-  return CountIf(test_suites_, TestSuiteFailed);
-}
-
-// Gets the number of all test suites.
-int UnitTestImpl::total_test_suite_count() const {
-  return static_cast<int>(test_suites_.size());
-}
-
-// Gets the number of all test suites that contain at least one test
-// that should run.
-int UnitTestImpl::test_suite_to_run_count() const {
-  return CountIf(test_suites_, ShouldRunTestSuite);
-}
-
-// Gets the number of successful tests.
-int UnitTestImpl::successful_test_count() const {
-  return SumOverTestSuiteList(test_suites_, &TestSuite::successful_test_count);
-}
-
-// Gets the number of skipped tests.
-int UnitTestImpl::skipped_test_count() const {
-  return SumOverTestSuiteList(test_suites_, &TestSuite::skipped_test_count);
-}
-
-// Gets the number of failed tests.
-int UnitTestImpl::failed_test_count() const {
-  return SumOverTestSuiteList(test_suites_, &TestSuite::failed_test_count);
-}
-
-// Gets the number of disabled tests that will be reported in the XML report.
-int UnitTestImpl::reportable_disabled_test_count() const {
-  return SumOverTestSuiteList(test_suites_,
-                              &TestSuite::reportable_disabled_test_count);
-}
-
-// Gets the number of disabled tests.
-int UnitTestImpl::disabled_test_count() const {
-  return SumOverTestSuiteList(test_suites_, &TestSuite::disabled_test_count);
-}
-
-// Gets the number of tests to be printed in the XML report.
-int UnitTestImpl::reportable_test_count() const {
-  return SumOverTestSuiteList(test_suites_, &TestSuite::reportable_test_count);
-}
-
-// Gets the number of all tests.
-int UnitTestImpl::total_test_count() const {
-  return SumOverTestSuiteList(test_suites_, &TestSuite::total_test_count);
-}
-
-// Gets the number of tests that should run.
-int UnitTestImpl::test_to_run_count() const {
-  return SumOverTestSuiteList(test_suites_, &TestSuite::test_to_run_count);
-}
-
-// Returns the current OS stack trace as an std::string.
-//
-// The maximum number of stack frames to be included is specified by
-// the gtest_stack_trace_depth flag.  The skip_count parameter
-// specifies the number of top frames to be skipped, which doesn't
-// count against the number of frames to be included.
-//
-// For example, if Foo() calls Bar(), which in turn calls
-// CurrentOsStackTraceExceptTop(1), Foo() will be included in the
-// trace but Bar() and CurrentOsStackTraceExceptTop() won't.
-std::string UnitTestImpl::CurrentOsStackTraceExceptTop(int skip_count) {
-  return os_stack_trace_getter()->CurrentStackTrace(
-      static_cast<int>(GTEST_FLAG(stack_trace_depth)),
-      skip_count + 1
-      // Skips the user-specified number of frames plus this function
-      // itself.
-      );  // NOLINT
-}
-
-// Returns the current time in milliseconds.
-TimeInMillis GetTimeInMillis() {
-#if GTEST_OS_WINDOWS_MOBILE || defined(__BORLANDC__)
-  // Difference between 1970-01-01 and 1601-01-01 in milliseconds.
-  // http://analogous.blogspot.com/2005/04/epoch.html
-  const TimeInMillis kJavaEpochToWinFileTimeDelta =
-    static_cast<TimeInMillis>(116444736UL) * 100000UL;
-  const DWORD kTenthMicrosInMilliSecond = 10000;
-
-  SYSTEMTIME now_systime;
-  FILETIME now_filetime;
-  ULARGE_INTEGER now_int64;
-  GetSystemTime(&now_systime);
-  if (SystemTimeToFileTime(&now_systime, &now_filetime)) {
-    now_int64.LowPart = now_filetime.dwLowDateTime;
-    now_int64.HighPart = now_filetime.dwHighDateTime;
-    now_int64.QuadPart = (now_int64.QuadPart / kTenthMicrosInMilliSecond) -
-      kJavaEpochToWinFileTimeDelta;
-    return now_int64.QuadPart;
-  }
-  return 0;
-#elif GTEST_OS_WINDOWS && !GTEST_HAS_GETTIMEOFDAY_
-  __timeb64 now;
-
-  // MSVC 8 deprecates _ftime64(), so we want to suppress warning 4996
-  // (deprecated function) there.
-  GTEST_DISABLE_MSC_DEPRECATED_PUSH_()
-  _ftime64(&now);
-  GTEST_DISABLE_MSC_DEPRECATED_POP_()
-
-  return static_cast<TimeInMillis>(now.time) * 1000 + now.millitm;
-#elif GTEST_HAS_GETTIMEOFDAY_
-  struct timeval now;
-  gettimeofday(&now, nullptr);
-  return static_cast<TimeInMillis>(now.tv_sec) * 1000 + now.tv_usec / 1000;
-#else
-# error "Don't know how to get the current time on your system."
-#endif
-}
-
-// Utilities
-
-// class String.
-
-#if GTEST_OS_WINDOWS_MOBILE
-// Creates a UTF-16 wide string from the given ANSI string, allocating
-// memory using new. The caller is responsible for deleting the return
-// value using delete[]. Returns the wide string, or NULL if the
-// input is NULL.
-LPCWSTR String::AnsiToUtf16(const char* ansi) {
-  if (!ansi) return nullptr;
-  const int length = strlen(ansi);
-  const int unicode_length =
-      MultiByteToWideChar(CP_ACP, 0, ansi, length, nullptr, 0);
-  WCHAR* unicode = new WCHAR[unicode_length + 1];
-  MultiByteToWideChar(CP_ACP, 0, ansi, length,
-                      unicode, unicode_length);
-  unicode[unicode_length] = 0;
-  return unicode;
-}
-
-// Creates an ANSI string from the given wide string, allocating
-// memory using new. The caller is responsible for deleting the return
-// value using delete[]. Returns the ANSI string, or NULL if the
-// input is NULL.
-const char* String::Utf16ToAnsi(LPCWSTR utf16_str)  {
-  if (!utf16_str) return nullptr;
-  const int ansi_length = WideCharToMultiByte(CP_ACP, 0, utf16_str, -1, nullptr,
-                                              0, nullptr, nullptr);
-  char* ansi = new char[ansi_length + 1];
-  WideCharToMultiByte(CP_ACP, 0, utf16_str, -1, ansi, ansi_length, nullptr,
-                      nullptr);
-  ansi[ansi_length] = 0;
-  return ansi;
-}
-
-#endif  // GTEST_OS_WINDOWS_MOBILE
-
-// Compares two C strings.  Returns true if and only if they have the same
-// content.
-//
-// Unlike strcmp(), this function can handle NULL argument(s).  A NULL
-// C string is considered different to any non-NULL C string,
-// including the empty string.
-bool String::CStringEquals(const char * lhs, const char * rhs) {
-  if (lhs == nullptr) return rhs == nullptr;
-
-  if (rhs == nullptr) return false;
-
-  return strcmp(lhs, rhs) == 0;
-}
-
-#if GTEST_HAS_STD_WSTRING
-
-// Converts an array of wide chars to a narrow string using the UTF-8
-// encoding, and streams the result to the given Message object.
-static void StreamWideCharsToMessage(const wchar_t* wstr, size_t length,
-                                     Message* msg) {
-  for (size_t i = 0; i != length; ) {  // NOLINT
-    if (wstr[i] != L'\0') {
-      *msg << WideStringToUtf8(wstr + i, static_cast<int>(length - i));
-      while (i != length && wstr[i] != L'\0')
-        i++;
-    } else {
-      *msg << '\0';
-      i++;
-    }
-  }
-}
-
-#endif  // GTEST_HAS_STD_WSTRING
-
-void SplitString(const ::std::string& str, char delimiter,
-                 ::std::vector< ::std::string>* dest) {
-  ::std::vector< ::std::string> parsed;
-  ::std::string::size_type pos = 0;
-  while (::testing::internal::AlwaysTrue()) {
-    const ::std::string::size_type colon = str.find(delimiter, pos);
-    if (colon == ::std::string::npos) {
-      parsed.push_back(str.substr(pos));
-      break;
-    } else {
-      parsed.push_back(str.substr(pos, colon - pos));
-      pos = colon + 1;
-    }
-  }
-  dest->swap(parsed);
-}
-
-}  // namespace internal
-
-// Constructs an empty Message.
-// We allocate the stringstream separately because otherwise each use of
-// ASSERT/EXPECT in a procedure adds over 200 bytes to the procedure's
-// stack frame leading to huge stack frames in some cases; gcc does not reuse
-// the stack space.
-Message::Message() : ss_(new ::std::stringstream) {
-  // By default, we want there to be enough precision when printing
-  // a double to a Message.
-  *ss_ << std::setprecision(std::numeric_limits<double>::digits10 + 2);
-}
-
-// These two overloads allow streaming a wide C string to a Message
-// using the UTF-8 encoding.
-Message& Message::operator <<(const wchar_t* wide_c_str) {
-  return *this << internal::String::ShowWideCString(wide_c_str);
-}
-Message& Message::operator <<(wchar_t* wide_c_str) {
-  return *this << internal::String::ShowWideCString(wide_c_str);
-}
-
-#if GTEST_HAS_STD_WSTRING
-// Converts the given wide string to a narrow string using the UTF-8
-// encoding, and streams the result to this Message object.
-Message& Message::operator <<(const ::std::wstring& wstr) {
-  internal::StreamWideCharsToMessage(wstr.c_str(), wstr.length(), this);
-  return *this;
-}
-#endif  // GTEST_HAS_STD_WSTRING
-
-// Gets the text streamed to this object so far as an std::string.
-// Each '\0' character in the buffer is replaced with "\\0".
-std::string Message::GetString() const {
-  return internal::StringStreamToString(ss_.get());
-}
-
-// AssertionResult constructors.
-// Used in EXPECT_TRUE/FALSE(assertion_result).
-AssertionResult::AssertionResult(const AssertionResult& other)
-    : success_(other.success_),
-      message_(other.message_.get() != nullptr
-                   ? new ::std::string(*other.message_)
-                   : static_cast< ::std::string*>(nullptr)) {}
-
-// Swaps two AssertionResults.
-void AssertionResult::swap(AssertionResult& other) {
-  using std::swap;
-  swap(success_, other.success_);
-  swap(message_, other.message_);
-}
-
-// Returns the assertion's negation. Used with EXPECT/ASSERT_FALSE.
-AssertionResult AssertionResult::operator!() const {
-  AssertionResult negation(!success_);
-  if (message_.get() != nullptr) negation << *message_;
-  return negation;
-}
-
-// Makes a successful assertion result.
-AssertionResult AssertionSuccess() {
-  return AssertionResult(true);
-}
-
-// Makes a failed assertion result.
-AssertionResult AssertionFailure() {
-  return AssertionResult(false);
-}
-
-// Makes a failed assertion result with the given failure message.
-// Deprecated; use AssertionFailure() << message.
-AssertionResult AssertionFailure(const Message& message) {
-  return AssertionFailure() << message;
-}
-
-namespace internal {
-
-namespace edit_distance {
-std::vector<EditType> CalculateOptimalEdits(const std::vector<size_t>& left,
-                                            const std::vector<size_t>& right) {
-  std::vector<std::vector<double> > costs(
-      left.size() + 1, std::vector<double>(right.size() + 1));
-  std::vector<std::vector<EditType> > best_move(
-      left.size() + 1, std::vector<EditType>(right.size() + 1));
-
-  // Populate for empty right.
-  for (size_t l_i = 0; l_i < costs.size(); ++l_i) {
-    costs[l_i][0] = static_cast<double>(l_i);
-    best_move[l_i][0] = kRemove;
-  }
-  // Populate for empty left.
-  for (size_t r_i = 1; r_i < costs[0].size(); ++r_i) {
-    costs[0][r_i] = static_cast<double>(r_i);
-    best_move[0][r_i] = kAdd;
-  }
-
-  for (size_t l_i = 0; l_i < left.size(); ++l_i) {
-    for (size_t r_i = 0; r_i < right.size(); ++r_i) {
-      if (left[l_i] == right[r_i]) {
-        // Found a match. Consume it.
-        costs[l_i + 1][r_i + 1] = costs[l_i][r_i];
-        best_move[l_i + 1][r_i + 1] = kMatch;
-        continue;
-      }
-
-      const double add = costs[l_i + 1][r_i];
-      const double remove = costs[l_i][r_i + 1];
-      const double replace = costs[l_i][r_i];
-      if (add < remove && add < replace) {
-        costs[l_i + 1][r_i + 1] = add + 1;
-        best_move[l_i + 1][r_i + 1] = kAdd;
-      } else if (remove < add && remove < replace) {
-        costs[l_i + 1][r_i + 1] = remove + 1;
-        best_move[l_i + 1][r_i + 1] = kRemove;
-      } else {
-        // We make replace a little more expensive than add/remove to lower
-        // their priority.
-        costs[l_i + 1][r_i + 1] = replace + 1.00001;
-        best_move[l_i + 1][r_i + 1] = kReplace;
-      }
-    }
-  }
-
-  // Reconstruct the best path. We do it in reverse order.
-  std::vector<EditType> best_path;
-  for (size_t l_i = left.size(), r_i = right.size(); l_i > 0 || r_i > 0;) {
-    EditType move = best_move[l_i][r_i];
-    best_path.push_back(move);
-    l_i -= move != kAdd;
-    r_i -= move != kRemove;
-  }
-  std::reverse(best_path.begin(), best_path.end());
-  return best_path;
-}
-
-namespace {
-
-// Helper class to convert string into ids with deduplication.
-class InternalStrings {
- public:
-  size_t GetId(const std::string& str) {
-    IdMap::iterator it = ids_.find(str);
-    if (it != ids_.end()) return it->second;
-    size_t id = ids_.size();
-    return ids_[str] = id;
-  }
-
- private:
-  typedef std::map<std::string, size_t> IdMap;
-  IdMap ids_;
-};
-
-}  // namespace
-
-std::vector<EditType> CalculateOptimalEdits(
-    const std::vector<std::string>& left,
-    const std::vector<std::string>& right) {
-  std::vector<size_t> left_ids, right_ids;
-  {
-    InternalStrings intern_table;
-    for (size_t i = 0; i < left.size(); ++i) {
-      left_ids.push_back(intern_table.GetId(left[i]));
-    }
-    for (size_t i = 0; i < right.size(); ++i) {
-      right_ids.push_back(intern_table.GetId(right[i]));
-    }
-  }
-  return CalculateOptimalEdits(left_ids, right_ids);
-}
-
-namespace {
-
-// Helper class that holds the state for one hunk and prints it out to the
-// stream.
-// It reorders adds/removes when possible to group all removes before all
-// adds. It also adds the hunk header before printint into the stream.
-class Hunk {
- public:
-  Hunk(size_t left_start, size_t right_start)
-      : left_start_(left_start),
-        right_start_(right_start),
-        adds_(),
-        removes_(),
-        common_() {}
-
-  void PushLine(char edit, const char* line) {
-    switch (edit) {
-      case ' ':
-        ++common_;
-        FlushEdits();
-        hunk_.push_back(std::make_pair(' ', line));
-        break;
-      case '-':
-        ++removes_;
-        hunk_removes_.push_back(std::make_pair('-', line));
-        break;
-      case '+':
-        ++adds_;
-        hunk_adds_.push_back(std::make_pair('+', line));
-        break;
-    }
-  }
-
-  void PrintTo(std::ostream* os) {
-    PrintHeader(os);
-    FlushEdits();
-    for (std::list<std::pair<char, const char*> >::const_iterator it =
-             hunk_.begin();
-         it != hunk_.end(); ++it) {
-      *os << it->first << it->second << "\n";
-    }
-  }
-
-  bool has_edits() const { return adds_ || removes_; }
-
- private:
-  void FlushEdits() {
-    hunk_.splice(hunk_.end(), hunk_removes_);
-    hunk_.splice(hunk_.end(), hunk_adds_);
-  }
-
-  // Print a unified diff header for one hunk.
-  // The format is
-  //   "@@ -<left_start>,<left_length> +<right_start>,<right_length> @@"
-  // where the left/right parts are omitted if unnecessary.
-  void PrintHeader(std::ostream* ss) const {
-    *ss << "@@ ";
-    if (removes_) {
-      *ss << "-" << left_start_ << "," << (removes_ + common_);
-    }
-    if (removes_ && adds_) {
-      *ss << " ";
-    }
-    if (adds_) {
-      *ss << "+" << right_start_ << "," << (adds_ + common_);
-    }
-    *ss << " @@\n";
-  }
-
-  size_t left_start_, right_start_;
-  size_t adds_, removes_, common_;
-  std::list<std::pair<char, const char*> > hunk_, hunk_adds_, hunk_removes_;
-};
-
-}  // namespace
-
-// Create a list of diff hunks in Unified diff format.
-// Each hunk has a header generated by PrintHeader above plus a body with
-// lines prefixed with ' ' for no change, '-' for deletion and '+' for
-// addition.
-// 'context' represents the desired unchanged prefix/suffix around the diff.
-// If two hunks are close enough that their contexts overlap, then they are
-// joined into one hunk.
-std::string CreateUnifiedDiff(const std::vector<std::string>& left,
-                              const std::vector<std::string>& right,
-                              size_t context) {
-  const std::vector<EditType> edits = CalculateOptimalEdits(left, right);
-
-  size_t l_i = 0, r_i = 0, edit_i = 0;
-  std::stringstream ss;
-  while (edit_i < edits.size()) {
-    // Find first edit.
-    while (edit_i < edits.size() && edits[edit_i] == kMatch) {
-      ++l_i;
-      ++r_i;
-      ++edit_i;
-    }
-
-    // Find the first line to include in the hunk.
-    const size_t prefix_context = std::min(l_i, context);
-    Hunk hunk(l_i - prefix_context + 1, r_i - prefix_context + 1);
-    for (size_t i = prefix_context; i > 0; --i) {
-      hunk.PushLine(' ', left[l_i - i].c_str());
-    }
-
-    // Iterate the edits until we found enough suffix for the hunk or the input
-    // is over.
-    size_t n_suffix = 0;
-    for (; edit_i < edits.size(); ++edit_i) {
-      if (n_suffix >= context) {
-        // Continue only if the next hunk is very close.
-        auto it = edits.begin() + static_cast<int>(edit_i);
-        while (it != edits.end() && *it == kMatch) ++it;
-        if (it == edits.end() ||
-            static_cast<size_t>(it - edits.begin()) - edit_i >= context) {
-          // There is no next edit or it is too far away.
-          break;
-        }
-      }
-
-      EditType edit = edits[edit_i];
-      // Reset count when a non match is found.
-      n_suffix = edit == kMatch ? n_suffix + 1 : 0;
-
-      if (edit == kMatch || edit == kRemove || edit == kReplace) {
-        hunk.PushLine(edit == kMatch ? ' ' : '-', left[l_i].c_str());
-      }
-      if (edit == kAdd || edit == kReplace) {
-        hunk.PushLine('+', right[r_i].c_str());
-      }
-
-      // Advance indices, depending on edit type.
-      l_i += edit != kAdd;
-      r_i += edit != kRemove;
-    }
-
-    if (!hunk.has_edits()) {
-      // We are done. We don't want this hunk.
-      break;
-    }
-
-    hunk.PrintTo(&ss);
-  }
-  return ss.str();
-}
-
-}  // namespace edit_distance
-
-namespace {
-
-// The string representation of the values received in EqFailure() are already
-// escaped. Split them on escaped '\n' boundaries. Leave all other escaped
-// characters the same.
-std::vector<std::string> SplitEscapedString(const std::string& str) {
-  std::vector<std::string> lines;
-  size_t start = 0, end = str.size();
-  if (end > 2 && str[0] == '"' && str[end - 1] == '"') {
-    ++start;
-    --end;
-  }
-  bool escaped = false;
-  for (size_t i = start; i + 1 < end; ++i) {
-    if (escaped) {
-      escaped = false;
-      if (str[i] == 'n') {
-        lines.push_back(str.substr(start, i - start - 1));
-        start = i + 1;
-      }
-    } else {
-      escaped = str[i] == '\\';
-    }
-  }
-  lines.push_back(str.substr(start, end - start));
-  return lines;
-}
-
-}  // namespace
-
-// Constructs and returns the message for an equality assertion
-// (e.g. ASSERT_EQ, EXPECT_STREQ, etc) failure.
-//
-// The first four parameters are the expressions used in the assertion
-// and their values, as strings.  For example, for ASSERT_EQ(foo, bar)
-// where foo is 5 and bar is 6, we have:
-//
-//   lhs_expression: "foo"
-//   rhs_expression: "bar"
-//   lhs_value:      "5"
-//   rhs_value:      "6"
-//
-// The ignoring_case parameter is true if and only if the assertion is a
-// *_STRCASEEQ*.  When it's true, the string "Ignoring case" will
-// be inserted into the message.
-AssertionResult EqFailure(const char* lhs_expression,
-                          const char* rhs_expression,
-                          const std::string& lhs_value,
-                          const std::string& rhs_value,
-                          bool ignoring_case) {
-  Message msg;
-  msg << "Expected equality of these values:";
-  msg << "\n  " << lhs_expression;
-  if (lhs_value != lhs_expression) {
-    msg << "\n    Which is: " << lhs_value;
-  }
-  msg << "\n  " << rhs_expression;
-  if (rhs_value != rhs_expression) {
-    msg << "\n    Which is: " << rhs_value;
-  }
-
-  if (ignoring_case) {
-    msg << "\nIgnoring case";
-  }
-
-  if (!lhs_value.empty() && !rhs_value.empty()) {
-    const std::vector<std::string> lhs_lines =
-        SplitEscapedString(lhs_value);
-    const std::vector<std::string> rhs_lines =
-        SplitEscapedString(rhs_value);
-    if (lhs_lines.size() > 1 || rhs_lines.size() > 1) {
-      msg << "\nWith diff:\n"
-          << edit_distance::CreateUnifiedDiff(lhs_lines, rhs_lines);
-    }
-  }
-
-  return AssertionFailure() << msg;
-}
-
-// Constructs a failure message for Boolean assertions such as EXPECT_TRUE.
-std::string GetBoolAssertionFailureMessage(
-    const AssertionResult& assertion_result,
-    const char* expression_text,
-    const char* actual_predicate_value,
-    const char* expected_predicate_value) {
-  const char* actual_message = assertion_result.message();
-  Message msg;
-  msg << "Value of: " << expression_text
-      << "\n  Actual: " << actual_predicate_value;
-  if (actual_message[0] != '\0')
-    msg << " (" << actual_message << ")";
-  msg << "\nExpected: " << expected_predicate_value;
-  return msg.GetString();
-}
-
-// Helper function for implementing ASSERT_NEAR.
-AssertionResult DoubleNearPredFormat(const char* expr1,
-                                     const char* expr2,
-                                     const char* abs_error_expr,
-                                     double val1,
-                                     double val2,
-                                     double abs_error) {
-  const double diff = fabs(val1 - val2);
-  if (diff <= abs_error) return AssertionSuccess();
-
-  return AssertionFailure()
-      << "The difference between " << expr1 << " and " << expr2
-      << " is " << diff << ", which exceeds " << abs_error_expr << ", where\n"
-      << expr1 << " evaluates to " << val1 << ",\n"
-      << expr2 << " evaluates to " << val2 << ", and\n"
-      << abs_error_expr << " evaluates to " << abs_error << ".";
-}
-
-
-// Helper template for implementing FloatLE() and DoubleLE().
-template <typename RawType>
-AssertionResult FloatingPointLE(const char* expr1,
-                                const char* expr2,
-                                RawType val1,
-                                RawType val2) {
-  // Returns success if val1 is less than val2,
-  if (val1 < val2) {
-    return AssertionSuccess();
-  }
-
-  // or if val1 is almost equal to val2.
-  const FloatingPoint<RawType> lhs(val1), rhs(val2);
-  if (lhs.AlmostEquals(rhs)) {
-    return AssertionSuccess();
-  }
-
-  // Note that the above two checks will both fail if either val1 or
-  // val2 is NaN, as the IEEE floating-point standard requires that
-  // any predicate involving a NaN must return false.
-
-  ::std::stringstream val1_ss;
-  val1_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
-          << val1;
-
-  ::std::stringstream val2_ss;
-  val2_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
-          << val2;
-
-  return AssertionFailure()
-      << "Expected: (" << expr1 << ") <= (" << expr2 << ")\n"
-      << "  Actual: " << StringStreamToString(&val1_ss) << " vs "
-      << StringStreamToString(&val2_ss);
-}
-
-}  // namespace internal
-
-// Asserts that val1 is less than, or almost equal to, val2.  Fails
-// otherwise.  In particular, it fails if either val1 or val2 is NaN.
-AssertionResult FloatLE(const char* expr1, const char* expr2,
-                        float val1, float val2) {
-  return internal::FloatingPointLE<float>(expr1, expr2, val1, val2);
-}
-
-// Asserts that val1 is less than, or almost equal to, val2.  Fails
-// otherwise.  In particular, it fails if either val1 or val2 is NaN.
-AssertionResult DoubleLE(const char* expr1, const char* expr2,
-                         double val1, double val2) {
-  return internal::FloatingPointLE<double>(expr1, expr2, val1, val2);
-}
-
-namespace internal {
-
-// The helper function for {ASSERT|EXPECT}_EQ with int or enum
-// arguments.
-AssertionResult CmpHelperEQ(const char* lhs_expression,
-                            const char* rhs_expression,
-                            BiggestInt lhs,
-                            BiggestInt rhs) {
-  if (lhs == rhs) {
-    return AssertionSuccess();
-  }
-
-  return EqFailure(lhs_expression,
-                   rhs_expression,
-                   FormatForComparisonFailureMessage(lhs, rhs),
-                   FormatForComparisonFailureMessage(rhs, lhs),
-                   false);
-}
-
-// A macro for implementing the helper functions needed to implement
-// ASSERT_?? and EXPECT_?? with integer or enum arguments.  It is here
-// just to avoid copy-and-paste of similar code.
-#define GTEST_IMPL_CMP_HELPER_(op_name, op)\
-AssertionResult CmpHelper##op_name(const char* expr1, const char* expr2, \
-                                   BiggestInt val1, BiggestInt val2) {\
-  if (val1 op val2) {\
-    return AssertionSuccess();\
-  } else {\
-    return AssertionFailure() \
-        << "Expected: (" << expr1 << ") " #op " (" << expr2\
-        << "), actual: " << FormatForComparisonFailureMessage(val1, val2)\
-        << " vs " << FormatForComparisonFailureMessage(val2, val1);\
-  }\
-}
-
-// Implements the helper function for {ASSERT|EXPECT}_NE with int or
-// enum arguments.
-GTEST_IMPL_CMP_HELPER_(NE, !=)
-// Implements the helper function for {ASSERT|EXPECT}_LE with int or
-// enum arguments.
-GTEST_IMPL_CMP_HELPER_(LE, <=)
-// Implements the helper function for {ASSERT|EXPECT}_LT with int or
-// enum arguments.
-GTEST_IMPL_CMP_HELPER_(LT, < )
-// Implements the helper function for {ASSERT|EXPECT}_GE with int or
-// enum arguments.
-GTEST_IMPL_CMP_HELPER_(GE, >=)
-// Implements the helper function for {ASSERT|EXPECT}_GT with int or
-// enum arguments.
-GTEST_IMPL_CMP_HELPER_(GT, > )
-
-#undef GTEST_IMPL_CMP_HELPER_
-
-// The helper function for {ASSERT|EXPECT}_STREQ.
-AssertionResult CmpHelperSTREQ(const char* lhs_expression,
-                               const char* rhs_expression,
-                               const char* lhs,
-                               const char* rhs) {
-  if (String::CStringEquals(lhs, rhs)) {
-    return AssertionSuccess();
-  }
-
-  return EqFailure(lhs_expression,
-                   rhs_expression,
-                   PrintToString(lhs),
-                   PrintToString(rhs),
-                   false);
-}
-
-// The helper function for {ASSERT|EXPECT}_STRCASEEQ.
-AssertionResult CmpHelperSTRCASEEQ(const char* lhs_expression,
-                                   const char* rhs_expression,
-                                   const char* lhs,
-                                   const char* rhs) {
-  if (String::CaseInsensitiveCStringEquals(lhs, rhs)) {
-    return AssertionSuccess();
-  }
-
-  return EqFailure(lhs_expression,
-                   rhs_expression,
-                   PrintToString(lhs),
-                   PrintToString(rhs),
-                   true);
-}
-
-// The helper function for {ASSERT|EXPECT}_STRNE.
-AssertionResult CmpHelperSTRNE(const char* s1_expression,
-                               const char* s2_expression,
-                               const char* s1,
-                               const char* s2) {
-  if (!String::CStringEquals(s1, s2)) {
-    return AssertionSuccess();
-  } else {
-    return AssertionFailure() << "Expected: (" << s1_expression << ") != ("
-                              << s2_expression << "), actual: \""
-                              << s1 << "\" vs \"" << s2 << "\"";
-  }
-}
-
-// The helper function for {ASSERT|EXPECT}_STRCASENE.
-AssertionResult CmpHelperSTRCASENE(const char* s1_expression,
-                                   const char* s2_expression,
-                                   const char* s1,
-                                   const char* s2) {
-  if (!String::CaseInsensitiveCStringEquals(s1, s2)) {
-    return AssertionSuccess();
-  } else {
-    return AssertionFailure()
-        << "Expected: (" << s1_expression << ") != ("
-        << s2_expression << ") (ignoring case), actual: \""
-        << s1 << "\" vs \"" << s2 << "\"";
-  }
-}
-
-}  // namespace internal
-
-namespace {
-
-// Helper functions for implementing IsSubString() and IsNotSubstring().
-
-// This group of overloaded functions return true if and only if needle
-// is a substring of haystack.  NULL is considered a substring of
-// itself only.
-
-bool IsSubstringPred(const char* needle, const char* haystack) {
-  if (needle == nullptr || haystack == nullptr) return needle == haystack;
-
-  return strstr(haystack, needle) != nullptr;
-}
-
-bool IsSubstringPred(const wchar_t* needle, const wchar_t* haystack) {
-  if (needle == nullptr || haystack == nullptr) return needle == haystack;
-
-  return wcsstr(haystack, needle) != nullptr;
-}
-
-// StringType here can be either ::std::string or ::std::wstring.
-template <typename StringType>
-bool IsSubstringPred(const StringType& needle,
-                     const StringType& haystack) {
-  return haystack.find(needle) != StringType::npos;
-}
-
-// This function implements either IsSubstring() or IsNotSubstring(),
-// depending on the value of the expected_to_be_substring parameter.
-// StringType here can be const char*, const wchar_t*, ::std::string,
-// or ::std::wstring.
-template <typename StringType>
-AssertionResult IsSubstringImpl(
-    bool expected_to_be_substring,
-    const char* needle_expr, const char* haystack_expr,
-    const StringType& needle, const StringType& haystack) {
-  if (IsSubstringPred(needle, haystack) == expected_to_be_substring)
-    return AssertionSuccess();
-
-  const bool is_wide_string = sizeof(needle[0]) > 1;
-  const char* const begin_string_quote = is_wide_string ? "L\"" : "\"";
-  return AssertionFailure()
-      << "Value of: " << needle_expr << "\n"
-      << "  Actual: " << begin_string_quote << needle << "\"\n"
-      << "Expected: " << (expected_to_be_substring ? "" : "not ")
-      << "a substring of " << haystack_expr << "\n"
-      << "Which is: " << begin_string_quote << haystack << "\"";
-}
-
-}  // namespace
-
-// IsSubstring() and IsNotSubstring() check whether needle is a
-// substring of haystack (NULL is considered a substring of itself
-// only), and return an appropriate error message when they fail.
-
-AssertionResult IsSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const char* needle, const char* haystack) {
-  return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack);
-}
-
-AssertionResult IsSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const wchar_t* needle, const wchar_t* haystack) {
-  return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack);
-}
-
-AssertionResult IsNotSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const char* needle, const char* haystack) {
-  return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack);
-}
-
-AssertionResult IsNotSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const wchar_t* needle, const wchar_t* haystack) {
-  return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack);
-}
-
-AssertionResult IsSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const ::std::string& needle, const ::std::string& haystack) {
-  return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack);
-}
-
-AssertionResult IsNotSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const ::std::string& needle, const ::std::string& haystack) {
-  return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack);
-}
-
-#if GTEST_HAS_STD_WSTRING
-AssertionResult IsSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const ::std::wstring& needle, const ::std::wstring& haystack) {
-  return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack);
-}
-
-AssertionResult IsNotSubstring(
-    const char* needle_expr, const char* haystack_expr,
-    const ::std::wstring& needle, const ::std::wstring& haystack) {
-  return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack);
-}
-#endif  // GTEST_HAS_STD_WSTRING
-
-namespace internal {
-
-#if GTEST_OS_WINDOWS
-
-namespace {
-
-// Helper function for IsHRESULT{SuccessFailure} predicates
-AssertionResult HRESULTFailureHelper(const char* expr,
-                                     const char* expected,
-                                     long hr) {  // NOLINT
-# if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_TV_TITLE
-
-  // Windows CE doesn't support FormatMessage.
-  const char error_text[] = "";
-
-# else
-
-  // Looks up the human-readable system message for the HRESULT code
-  // and since we're not passing any params to FormatMessage, we don't
-  // want inserts expanded.
-  const DWORD kFlags = FORMAT_MESSAGE_FROM_SYSTEM |
-                       FORMAT_MESSAGE_IGNORE_INSERTS;
-  const DWORD kBufSize = 4096;
-  // Gets the system's human readable message string for this HRESULT.
-  char error_text[kBufSize] = { '\0' };
-  DWORD message_length = ::FormatMessageA(kFlags,
-                                          0,   // no source, we're asking system
-                                          static_cast<DWORD>(hr),  // the error
-                                          0,   // no line width restrictions
-                                          error_text,  // output buffer
-                                          kBufSize,    // buf size
-                                          nullptr);  // no arguments for inserts
-  // Trims tailing white space (FormatMessage leaves a trailing CR-LF)
-  for (; message_length && IsSpace(error_text[message_length - 1]);
-          --message_length) {
-    error_text[message_length - 1] = '\0';
-  }
-
-# endif  // GTEST_OS_WINDOWS_MOBILE
-
-  const std::string error_hex("0x" + String::FormatHexInt(hr));
-  return ::testing::AssertionFailure()
-      << "Expected: " << expr << " " << expected << ".\n"
-      << "  Actual: " << error_hex << " " << error_text << "\n";
-}
-
-}  // namespace
-
-AssertionResult IsHRESULTSuccess(const char* expr, long hr) {  // NOLINT
-  if (SUCCEEDED(hr)) {
-    return AssertionSuccess();
-  }
-  return HRESULTFailureHelper(expr, "succeeds", hr);
-}
-
-AssertionResult IsHRESULTFailure(const char* expr, long hr) {  // NOLINT
-  if (FAILED(hr)) {
-    return AssertionSuccess();
-  }
-  return HRESULTFailureHelper(expr, "fails", hr);
-}
-
-#endif  // GTEST_OS_WINDOWS
-
-// Utility functions for encoding Unicode text (wide strings) in
-// UTF-8.
-
-// A Unicode code-point can have up to 21 bits, and is encoded in UTF-8
-// like this:
-//
-// Code-point length   Encoding
-//   0 -  7 bits       0xxxxxxx
-//   8 - 11 bits       110xxxxx 10xxxxxx
-//  12 - 16 bits       1110xxxx 10xxxxxx 10xxxxxx
-//  17 - 21 bits       11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-
-// The maximum code-point a one-byte UTF-8 sequence can represent.
-const UInt32 kMaxCodePoint1 = (static_cast<UInt32>(1) <<  7) - 1;
-
-// The maximum code-point a two-byte UTF-8 sequence can represent.
-const UInt32 kMaxCodePoint2 = (static_cast<UInt32>(1) << (5 + 6)) - 1;
-
-// The maximum code-point a three-byte UTF-8 sequence can represent.
-const UInt32 kMaxCodePoint3 = (static_cast<UInt32>(1) << (4 + 2*6)) - 1;
-
-// The maximum code-point a four-byte UTF-8 sequence can represent.
-const UInt32 kMaxCodePoint4 = (static_cast<UInt32>(1) << (3 + 3*6)) - 1;
-
-// Chops off the n lowest bits from a bit pattern.  Returns the n
-// lowest bits.  As a side effect, the original bit pattern will be
-// shifted to the right by n bits.
-inline UInt32 ChopLowBits(UInt32* bits, int n) {
-  const UInt32 low_bits = *bits & ((static_cast<UInt32>(1) << n) - 1);
-  *bits >>= n;
-  return low_bits;
-}
-
-// Converts a Unicode code point to a narrow string in UTF-8 encoding.
-// code_point parameter is of type UInt32 because wchar_t may not be
-// wide enough to contain a code point.
-// If the code_point is not a valid Unicode code point
-// (i.e. outside of Unicode range U+0 to U+10FFFF) it will be converted
-// to "(Invalid Unicode 0xXXXXXXXX)".
-std::string CodePointToUtf8(UInt32 code_point) {
-  if (code_point > kMaxCodePoint4) {
-    return "(Invalid Unicode 0x" + String::FormatHexUInt32(code_point) + ")";
-  }
-
-  char str[5];  // Big enough for the largest valid code point.
-  if (code_point <= kMaxCodePoint1) {
-    str[1] = '\0';
-    str[0] = static_cast<char>(code_point);                          // 0xxxxxxx
-  } else if (code_point <= kMaxCodePoint2) {
-    str[2] = '\0';
-    str[1] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
-    str[0] = static_cast<char>(0xC0 | code_point);                   // 110xxxxx
-  } else if (code_point <= kMaxCodePoint3) {
-    str[3] = '\0';
-    str[2] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
-    str[1] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
-    str[0] = static_cast<char>(0xE0 | code_point);                   // 1110xxxx
-  } else {  // code_point <= kMaxCodePoint4
-    str[4] = '\0';
-    str[3] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
-    str[2] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
-    str[1] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
-    str[0] = static_cast<char>(0xF0 | code_point);                   // 11110xxx
-  }
-  return str;
-}
-
-// The following two functions only make sense if the system
-// uses UTF-16 for wide string encoding. All supported systems
-// with 16 bit wchar_t (Windows, Cygwin) do use UTF-16.
-
-// Determines if the arguments constitute UTF-16 surrogate pair
-// and thus should be combined into a single Unicode code point
-// using CreateCodePointFromUtf16SurrogatePair.
-inline bool IsUtf16SurrogatePair(wchar_t first, wchar_t second) {
-  return sizeof(wchar_t) == 2 &&
-      (first & 0xFC00) == 0xD800 && (second & 0xFC00) == 0xDC00;
-}
-
-// Creates a Unicode code point from UTF16 surrogate pair.
-inline UInt32 CreateCodePointFromUtf16SurrogatePair(wchar_t first,
-                                                    wchar_t second) {
-  const auto first_u = static_cast<UInt32>(first);
-  const auto second_u = static_cast<UInt32>(second);
-  const UInt32 mask = (1 << 10) - 1;
-  return (sizeof(wchar_t) == 2)
-             ? (((first_u & mask) << 10) | (second_u & mask)) + 0x10000
-             :
-             // This function should not be called when the condition is
-             // false, but we provide a sensible default in case it is.
-             first_u;
-}
-
-// Converts a wide string to a narrow string in UTF-8 encoding.
-// The wide string is assumed to have the following encoding:
-//   UTF-16 if sizeof(wchar_t) == 2 (on Windows, Cygwin)
-//   UTF-32 if sizeof(wchar_t) == 4 (on Linux)
-// Parameter str points to a null-terminated wide string.
-// Parameter num_chars may additionally limit the number
-// of wchar_t characters processed. -1 is used when the entire string
-// should be processed.
-// If the string contains code points that are not valid Unicode code points
-// (i.e. outside of Unicode range U+0 to U+10FFFF) they will be output
-// as '(Invalid Unicode 0xXXXXXXXX)'. If the string is in UTF16 encoding
-// and contains invalid UTF-16 surrogate pairs, values in those pairs
-// will be encoded as individual Unicode characters from Basic Normal Plane.
-std::string WideStringToUtf8(const wchar_t* str, int num_chars) {
-  if (num_chars == -1)
-    num_chars = static_cast<int>(wcslen(str));
-
-  ::std::stringstream stream;
-  for (int i = 0; i < num_chars; ++i) {
-    UInt32 unicode_code_point;
-
-    if (str[i] == L'\0') {
-      break;
-    } else if (i + 1 < num_chars && IsUtf16SurrogatePair(str[i], str[i + 1])) {
-      unicode_code_point = CreateCodePointFromUtf16SurrogatePair(str[i],
-                                                                 str[i + 1]);
-      i++;
-    } else {
-      unicode_code_point = static_cast<UInt32>(str[i]);
-    }
-
-    stream << CodePointToUtf8(unicode_code_point);
-  }
-  return StringStreamToString(&stream);
-}
-
-// Converts a wide C string to an std::string using the UTF-8 encoding.
-// NULL will be converted to "(null)".
-std::string String::ShowWideCString(const wchar_t * wide_c_str) {
-  if (wide_c_str == nullptr) return "(null)";
-
-  return internal::WideStringToUtf8(wide_c_str, -1);
-}
-
-// Compares two wide C strings.  Returns true if and only if they have the
-// same content.
-//
-// Unlike wcscmp(), this function can handle NULL argument(s).  A NULL
-// C string is considered different to any non-NULL C string,
-// including the empty string.
-bool String::WideCStringEquals(const wchar_t * lhs, const wchar_t * rhs) {
-  if (lhs == nullptr) return rhs == nullptr;
-
-  if (rhs == nullptr) return false;
-
-  return wcscmp(lhs, rhs) == 0;
-}
-
-// Helper function for *_STREQ on wide strings.
-AssertionResult CmpHelperSTREQ(const char* lhs_expression,
-                               const char* rhs_expression,
-                               const wchar_t* lhs,
-                               const wchar_t* rhs) {
-  if (String::WideCStringEquals(lhs, rhs)) {
-    return AssertionSuccess();
-  }
-
-  return EqFailure(lhs_expression,
-                   rhs_expression,
-                   PrintToString(lhs),
-                   PrintToString(rhs),
-                   false);
-}
-
-// Helper function for *_STRNE on wide strings.
-AssertionResult CmpHelperSTRNE(const char* s1_expression,
-                               const char* s2_expression,
-                               const wchar_t* s1,
-                               const wchar_t* s2) {
-  if (!String::WideCStringEquals(s1, s2)) {
-    return AssertionSuccess();
-  }
-
-  return AssertionFailure() << "Expected: (" << s1_expression << ") != ("
-                            << s2_expression << "), actual: "
-                            << PrintToString(s1)
-                            << " vs " << PrintToString(s2);
-}
-
-// Compares two C strings, ignoring case.  Returns true if and only if they have
-// the same content.
-//
-// Unlike strcasecmp(), this function can handle NULL argument(s).  A
-// NULL C string is considered different to any non-NULL C string,
-// including the empty string.
-bool String::CaseInsensitiveCStringEquals(const char * lhs, const char * rhs) {
-  if (lhs == nullptr) return rhs == nullptr;
-  if (rhs == nullptr) return false;
-  return posix::StrCaseCmp(lhs, rhs) == 0;
-}
-
-// Compares two wide C strings, ignoring case.  Returns true if and only if they
-// have the same content.
-//
-// Unlike wcscasecmp(), this function can handle NULL argument(s).
-// A NULL C string is considered different to any non-NULL wide C string,
-// including the empty string.
-// NB: The implementations on different platforms slightly differ.
-// On windows, this method uses _wcsicmp which compares according to LC_CTYPE
-// environment variable. On GNU platform this method uses wcscasecmp
-// which compares according to LC_CTYPE category of the current locale.
-// On MacOS X, it uses towlower, which also uses LC_CTYPE category of the
-// current locale.
-bool String::CaseInsensitiveWideCStringEquals(const wchar_t* lhs,
-                                              const wchar_t* rhs) {
-  if (lhs == nullptr) return rhs == nullptr;
-
-  if (rhs == nullptr) return false;
-
-#if GTEST_OS_WINDOWS
-  return _wcsicmp(lhs, rhs) == 0;
-#elif GTEST_OS_LINUX && !GTEST_OS_LINUX_ANDROID
-  return wcscasecmp(lhs, rhs) == 0;
-#else
-  // Android, Mac OS X and Cygwin don't define wcscasecmp.
-  // Other unknown OSes may not define it either.
-  wint_t left, right;
-  do {
-    left = towlower(static_cast<wint_t>(*lhs++));
-    right = towlower(static_cast<wint_t>(*rhs++));
-  } while (left && left == right);
-  return left == right;
-#endif  // OS selector
-}
-
-// Returns true if and only if str ends with the given suffix, ignoring case.
-// Any string is considered to end with an empty suffix.
-bool String::EndsWithCaseInsensitive(
-    const std::string& str, const std::string& suffix) {
-  const size_t str_len = str.length();
-  const size_t suffix_len = suffix.length();
-  return (str_len >= suffix_len) &&
-         CaseInsensitiveCStringEquals(str.c_str() + str_len - suffix_len,
-                                      suffix.c_str());
-}
-
-// Formats an int value as "%02d".
-std::string String::FormatIntWidth2(int value) {
-  std::stringstream ss;
-  ss << std::setfill('0') << std::setw(2) << value;
-  return ss.str();
-}
-
-// Formats an int value as "%X".
-std::string String::FormatHexUInt32(UInt32 value) {
-  std::stringstream ss;
-  ss << std::hex << std::uppercase << value;
-  return ss.str();
-}
-
-// Formats an int value as "%X".
-std::string String::FormatHexInt(int value) {
-  return FormatHexUInt32(static_cast<UInt32>(value));
-}
-
-// Formats a byte as "%02X".
-std::string String::FormatByte(unsigned char value) {
-  std::stringstream ss;
-  ss << std::setfill('0') << std::setw(2) << std::hex << std::uppercase
-     << static_cast<unsigned int>(value);
-  return ss.str();
-}
-
-// Converts the buffer in a stringstream to an std::string, converting NUL
-// bytes to "\\0" along the way.
-std::string StringStreamToString(::std::stringstream* ss) {
-  const ::std::string& str = ss->str();
-  const char* const start = str.c_str();
-  const char* const end = start + str.length();
-
-  std::string result;
-  result.reserve(static_cast<size_t>(2 * (end - start)));
-  for (const char* ch = start; ch != end; ++ch) {
-    if (*ch == '\0') {
-      result += "\\0";  // Replaces NUL with "\\0";
-    } else {
-      result += *ch;
-    }
-  }
-
-  return result;
-}
-
-// Appends the user-supplied message to the Google-Test-generated message.
-std::string AppendUserMessage(const std::string& gtest_msg,
-                              const Message& user_msg) {
-  // Appends the user message if it's non-empty.
-  const std::string user_msg_string = user_msg.GetString();
-  if (user_msg_string.empty()) {
-    return gtest_msg;
-  }
-
-  return gtest_msg + "\n" + user_msg_string;
-}
-
-}  // namespace internal
-
-// class TestResult
-
-// Creates an empty TestResult.
-TestResult::TestResult()
-    : death_test_count_(0), start_timestamp_(0), elapsed_time_(0) {}
-
-// D'tor.
-TestResult::~TestResult() {
-}
-
-// Returns the i-th test part result among all the results. i can
-// range from 0 to total_part_count() - 1. If i is not in that range,
-// aborts the program.
-const TestPartResult& TestResult::GetTestPartResult(int i) const {
-  if (i < 0 || i >= total_part_count())
-    internal::posix::Abort();
-  return test_part_results_.at(static_cast<size_t>(i));
-}
-
-// Returns the i-th test property. i can range from 0 to
-// test_property_count() - 1. If i is not in that range, aborts the
-// program.
-const TestProperty& TestResult::GetTestProperty(int i) const {
-  if (i < 0 || i >= test_property_count())
-    internal::posix::Abort();
-  return test_properties_.at(static_cast<size_t>(i));
-}
-
-// Clears the test part results.
-void TestResult::ClearTestPartResults() {
-  test_part_results_.clear();
-}
-
-// Adds a test part result to the list.
-void TestResult::AddTestPartResult(const TestPartResult& test_part_result) {
-  test_part_results_.push_back(test_part_result);
-}
-
-// Adds a test property to the list. If a property with the same key as the
-// supplied property is already represented, the value of this test_property
-// replaces the old value for that key.
-void TestResult::RecordProperty(const std::string& xml_element,
-                                const TestProperty& test_property) {
-  if (!ValidateTestProperty(xml_element, test_property)) {
-    return;
-  }
-  internal::MutexLock lock(&test_properites_mutex_);
-  const std::vector<TestProperty>::iterator property_with_matching_key =
-      std::find_if(test_properties_.begin(), test_properties_.end(),
-                   internal::TestPropertyKeyIs(test_property.key()));
-  if (property_with_matching_key == test_properties_.end()) {
-    test_properties_.push_back(test_property);
-    return;
-  }
-  property_with_matching_key->SetValue(test_property.value());
-}
-
-// The list of reserved attributes used in the <testsuites> element of XML
-// output.
-static const char* const kReservedTestSuitesAttributes[] = {
-  "disabled",
-  "errors",
-  "failures",
-  "name",
-  "random_seed",
-  "tests",
-  "time",
-  "timestamp"
-};
-
-// The list of reserved attributes used in the <testsuite> element of XML
-// output.
-static const char* const kReservedTestSuiteAttributes[] = {
-    "disabled", "errors", "failures", "name", "tests", "time", "timestamp"};
-
-// The list of reserved attributes used in the <testcase> element of XML output.
-static const char* const kReservedTestCaseAttributes[] = {
-    "classname",   "name", "status", "time",  "type_param",
-    "value_param", "file", "line"};
-
-// Use a slightly different set for allowed output to ensure existing tests can
-// still RecordProperty("result") or "RecordProperty(timestamp")
-static const char* const kReservedOutputTestCaseAttributes[] = {
-    "classname",   "name", "status", "time",   "type_param",
-    "value_param", "file", "line",   "result", "timestamp"};
-
-template <int kSize>
-std::vector<std::string> ArrayAsVector(const char* const (&array)[kSize]) {
-  return std::vector<std::string>(array, array + kSize);
-}
-
-static std::vector<std::string> GetReservedAttributesForElement(
-    const std::string& xml_element) {
-  if (xml_element == "testsuites") {
-    return ArrayAsVector(kReservedTestSuitesAttributes);
-  } else if (xml_element == "testsuite") {
-    return ArrayAsVector(kReservedTestSuiteAttributes);
-  } else if (xml_element == "testcase") {
-    return ArrayAsVector(kReservedTestCaseAttributes);
-  } else {
-    GTEST_CHECK_(false) << "Unrecognized xml_element provided: " << xml_element;
-  }
-  // This code is unreachable but some compilers may not realizes that.
-  return std::vector<std::string>();
-}
-
-// TODO(jdesprez): Merge the two getReserved attributes once skip is improved
-static std::vector<std::string> GetReservedOutputAttributesForElement(
-    const std::string& xml_element) {
-  if (xml_element == "testsuites") {
-    return ArrayAsVector(kReservedTestSuitesAttributes);
-  } else if (xml_element == "testsuite") {
-    return ArrayAsVector(kReservedTestSuiteAttributes);
-  } else if (xml_element == "testcase") {
-    return ArrayAsVector(kReservedOutputTestCaseAttributes);
-  } else {
-    GTEST_CHECK_(false) << "Unrecognized xml_element provided: " << xml_element;
-  }
-  // This code is unreachable but some compilers may not realizes that.
-  return std::vector<std::string>();
-}
-
-static std::string FormatWordList(const std::vector<std::string>& words) {
-  Message word_list;
-  for (size_t i = 0; i < words.size(); ++i) {
-    if (i > 0 && words.size() > 2) {
-      word_list << ", ";
-    }
-    if (i == words.size() - 1) {
-      word_list << "and ";
-    }
-    word_list << "'" << words[i] << "'";
-  }
-  return word_list.GetString();
-}
-
-static bool ValidateTestPropertyName(
-    const std::string& property_name,
-    const std::vector<std::string>& reserved_names) {
-  if (std::find(reserved_names.begin(), reserved_names.end(), property_name) !=
-          reserved_names.end()) {
-    ADD_FAILURE() << "Reserved key used in RecordProperty(): " << property_name
-                  << " (" << FormatWordList(reserved_names)
-                  << " are reserved by " << GTEST_NAME_ << ")";
-    return false;
-  }
-  return true;
-}
-
-// Adds a failure if the key is a reserved attribute of the element named
-// xml_element.  Returns true if the property is valid.
-bool TestResult::ValidateTestProperty(const std::string& xml_element,
-                                      const TestProperty& test_property) {
-  return ValidateTestPropertyName(test_property.key(),
-                                  GetReservedAttributesForElement(xml_element));
-}
-
-// Clears the object.
-void TestResult::Clear() {
-  test_part_results_.clear();
-  test_properties_.clear();
-  death_test_count_ = 0;
-  elapsed_time_ = 0;
-}
-
-// Returns true off the test part was skipped.
-static bool TestPartSkipped(const TestPartResult& result) {
-  return result.skipped();
-}
-
-// Returns true if and only if the test was skipped.
-bool TestResult::Skipped() const {
-  return !Failed() && CountIf(test_part_results_, TestPartSkipped) > 0;
-}
-
-// Returns true if and only if the test failed.
-bool TestResult::Failed() const {
-  for (int i = 0; i < total_part_count(); ++i) {
-    if (GetTestPartResult(i).failed())
-      return true;
-  }
-  return false;
-}
-
-// Returns true if and only if the test part fatally failed.
-static bool TestPartFatallyFailed(const TestPartResult& result) {
-  return result.fatally_failed();
-}
-
-// Returns true if and only if the test fatally failed.
-bool TestResult::HasFatalFailure() const {
-  return CountIf(test_part_results_, TestPartFatallyFailed) > 0;
-}
-
-// Returns true if and only if the test part non-fatally failed.
-static bool TestPartNonfatallyFailed(const TestPartResult& result) {
-  return result.nonfatally_failed();
-}
-
-// Returns true if and only if the test has a non-fatal failure.
-bool TestResult::HasNonfatalFailure() const {
-  return CountIf(test_part_results_, TestPartNonfatallyFailed) > 0;
-}
-
-// Gets the number of all test parts.  This is the sum of the number
-// of successful test parts and the number of failed test parts.
-int TestResult::total_part_count() const {
-  return static_cast<int>(test_part_results_.size());
-}
-
-// Returns the number of the test properties.
-int TestResult::test_property_count() const {
-  return static_cast<int>(test_properties_.size());
-}
-
-// class Test
-
-// Creates a Test object.
-
-// The c'tor saves the states of all flags.
-Test::Test()
-    : gtest_flag_saver_(new GTEST_FLAG_SAVER_) {
-}
-
-// The d'tor restores the states of all flags.  The actual work is
-// done by the d'tor of the gtest_flag_saver_ field, and thus not
-// visible here.
-Test::~Test() {
-}
-
-// Sets up the test fixture.
-//
-// A sub-class may override this.
-void Test::SetUp() {
-}
-
-// Tears down the test fixture.
-//
-// A sub-class may override this.
-void Test::TearDown() {
-}
-
-// Allows user supplied key value pairs to be recorded for later output.
-void Test::RecordProperty(const std::string& key, const std::string& value) {
-  UnitTest::GetInstance()->RecordProperty(key, value);
-}
-
-// Allows user supplied key value pairs to be recorded for later output.
-void Test::RecordProperty(const std::string& key, int value) {
-  Message value_message;
-  value_message << value;
-  RecordProperty(key, value_message.GetString().c_str());
-}
-
-namespace internal {
-
-void ReportFailureInUnknownLocation(TestPartResult::Type result_type,
-                                    const std::string& message) {
-  // This function is a friend of UnitTest and as such has access to
-  // AddTestPartResult.
-  UnitTest::GetInstance()->AddTestPartResult(
-      result_type,
-      nullptr,  // No info about the source file where the exception occurred.
-      -1,       // We have no info on which line caused the exception.
-      message,
-      "");  // No stack trace, either.
-}
-
-}  // namespace internal
-
-// Google Test requires all tests in the same test suite to use the same test
-// fixture class.  This function checks if the current test has the
-// same fixture class as the first test in the current test suite.  If
-// yes, it returns true; otherwise it generates a Google Test failure and
-// returns false.
-bool Test::HasSameFixtureClass() {
-  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
-  const TestSuite* const test_suite = impl->current_test_suite();
-
-  // Info about the first test in the current test suite.
-  const TestInfo* const first_test_info = test_suite->test_info_list()[0];
-  const internal::TypeId first_fixture_id = first_test_info->fixture_class_id_;
-  const char* const first_test_name = first_test_info->name();
-
-  // Info about the current test.
-  const TestInfo* const this_test_info = impl->current_test_info();
-  const internal::TypeId this_fixture_id = this_test_info->fixture_class_id_;
-  const char* const this_test_name = this_test_info->name();
-
-  if (this_fixture_id != first_fixture_id) {
-    // Is the first test defined using TEST?
-    const bool first_is_TEST = first_fixture_id == internal::GetTestTypeId();
-    // Is this test defined using TEST?
-    const bool this_is_TEST = this_fixture_id == internal::GetTestTypeId();
-
-    if (first_is_TEST || this_is_TEST) {
-      // Both TEST and TEST_F appear in same test suite, which is incorrect.
-      // Tell the user how to fix this.
-
-      // Gets the name of the TEST and the name of the TEST_F.  Note
-      // that first_is_TEST and this_is_TEST cannot both be true, as
-      // the fixture IDs are different for the two tests.
-      const char* const TEST_name =
-          first_is_TEST ? first_test_name : this_test_name;
-      const char* const TEST_F_name =
-          first_is_TEST ? this_test_name : first_test_name;
-
-      ADD_FAILURE()
-          << "All tests in the same test suite must use the same test fixture\n"
-          << "class, so mixing TEST_F and TEST in the same test suite is\n"
-          << "illegal.  In test suite " << this_test_info->test_suite_name()
-          << ",\n"
-          << "test " << TEST_F_name << " is defined using TEST_F but\n"
-          << "test " << TEST_name << " is defined using TEST.  You probably\n"
-          << "want to change the TEST to TEST_F or move it to another test\n"
-          << "case.";
-    } else {
-      // Two fixture classes with the same name appear in two different
-      // namespaces, which is not allowed. Tell the user how to fix this.
-      ADD_FAILURE()
-          << "All tests in the same test suite must use the same test fixture\n"
-          << "class.  However, in test suite "
-          << this_test_info->test_suite_name() << ",\n"
-          << "you defined test " << first_test_name << " and test "
-          << this_test_name << "\n"
-          << "using two different test fixture classes.  This can happen if\n"
-          << "the two classes are from different namespaces or translation\n"
-          << "units and have the same name.  You should probably rename one\n"
-          << "of the classes to put the tests into different test suites.";
-    }
-    return false;
-  }
-
-  return true;
-}
-
-#if GTEST_HAS_SEH
-
-// Adds an "exception thrown" fatal failure to the current test.  This
-// function returns its result via an output parameter pointer because VC++
-// prohibits creation of objects with destructors on stack in functions
-// using __try (see error C2712).
-static std::string* FormatSehExceptionMessage(DWORD exception_code,
-                                              const char* location) {
-  Message message;
-  message << "SEH exception with code 0x" << std::setbase(16) <<
-    exception_code << std::setbase(10) << " thrown in " << location << ".";
-
-  return new std::string(message.GetString());
-}
-
-#endif  // GTEST_HAS_SEH
-
-namespace internal {
-
-#if GTEST_HAS_EXCEPTIONS
-
-// Adds an "exception thrown" fatal failure to the current test.
-static std::string FormatCxxExceptionMessage(const char* description,
-                                             const char* location) {
-  Message message;
-  if (description != nullptr) {
-    message << "C++ exception with description \"" << description << "\"";
-  } else {
-    message << "Unknown C++ exception";
-  }
-  message << " thrown in " << location << ".";
-
-  return message.GetString();
-}
-
-static std::string PrintTestPartResultToString(
-    const TestPartResult& test_part_result);
-
-GoogleTestFailureException::GoogleTestFailureException(
-    const TestPartResult& failure)
-    : ::std::runtime_error(PrintTestPartResultToString(failure).c_str()) {}
-
-#endif  // GTEST_HAS_EXCEPTIONS
-
-// We put these helper functions in the internal namespace as IBM's xlC
-// compiler rejects the code if they were declared static.
-
-// Runs the given method and handles SEH exceptions it throws, when
-// SEH is supported; returns the 0-value for type Result in case of an
-// SEH exception.  (Microsoft compilers cannot handle SEH and C++
-// exceptions in the same function.  Therefore, we provide a separate
-// wrapper function for handling SEH exceptions.)
-template <class T, typename Result>
-Result HandleSehExceptionsInMethodIfSupported(
-    T* object, Result (T::*method)(), const char* location) {
-#if GTEST_HAS_SEH
-  __try {
-    return (object->*method)();
-  } __except (internal::UnitTestOptions::GTestShouldProcessSEH(  // NOLINT
-      GetExceptionCode())) {
-    // We create the exception message on the heap because VC++ prohibits
-    // creation of objects with destructors on stack in functions using __try
-    // (see error C2712).
-    std::string* exception_message = FormatSehExceptionMessage(
-        GetExceptionCode(), location);
-    internal::ReportFailureInUnknownLocation(TestPartResult::kFatalFailure,
-                                             *exception_message);
-    delete exception_message;
-    return static_cast<Result>(0);
-  }
-#else
-  (void)location;
-  return (object->*method)();
-#endif  // GTEST_HAS_SEH
-}
-
-// Runs the given method and catches and reports C++ and/or SEH-style
-// exceptions, if they are supported; returns the 0-value for type
-// Result in case of an SEH exception.
-template <class T, typename Result>
-Result HandleExceptionsInMethodIfSupported(
-    T* object, Result (T::*method)(), const char* location) {
-  // NOTE: The user code can affect the way in which Google Test handles
-  // exceptions by setting GTEST_FLAG(catch_exceptions), but only before
-  // RUN_ALL_TESTS() starts. It is technically possible to check the flag
-  // after the exception is caught and either report or re-throw the
-  // exception based on the flag's value:
-  //
-  // try {
-  //   // Perform the test method.
-  // } catch (...) {
-  //   if (GTEST_FLAG(catch_exceptions))
-  //     // Report the exception as failure.
-  //   else
-  //     throw;  // Re-throws the original exception.
-  // }
-  //
-  // However, the purpose of this flag is to allow the program to drop into
-  // the debugger when the exception is thrown. On most platforms, once the
-  // control enters the catch block, the exception origin information is
-  // lost and the debugger will stop the program at the point of the
-  // re-throw in this function -- instead of at the point of the original
-  // throw statement in the code under test.  For this reason, we perform
-  // the check early, sacrificing the ability to affect Google Test's
-  // exception handling in the method where the exception is thrown.
-  if (internal::GetUnitTestImpl()->catch_exceptions()) {
-#if GTEST_HAS_EXCEPTIONS
-    try {
-      return HandleSehExceptionsInMethodIfSupported(object, method, location);
-    } catch (const AssertionException&) {  // NOLINT
-      // This failure was reported already.
-    } catch (const internal::GoogleTestFailureException&) {  // NOLINT
-      // This exception type can only be thrown by a failed Google
-      // Test assertion with the intention of letting another testing
-      // framework catch it.  Therefore we just re-throw it.
-      throw;
-    } catch (const std::exception& e) {  // NOLINT
-      internal::ReportFailureInUnknownLocation(
-          TestPartResult::kFatalFailure,
-          FormatCxxExceptionMessage(e.what(), location));
-    } catch (...) {  // NOLINT
-      internal::ReportFailureInUnknownLocation(
-          TestPartResult::kFatalFailure,
-          FormatCxxExceptionMessage(nullptr, location));
-    }
-    return static_cast<Result>(0);
-#else
-    return HandleSehExceptionsInMethodIfSupported(object, method, location);
-#endif  // GTEST_HAS_EXCEPTIONS
-  } else {
-    return (object->*method)();
-  }
-}
-
-}  // namespace internal
-
-// Runs the test and updates the test result.
-void Test::Run() {
-  if (!HasSameFixtureClass()) return;
-
-  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
-  impl->os_stack_trace_getter()->UponLeavingGTest();
-  internal::HandleExceptionsInMethodIfSupported(this, &Test::SetUp, "SetUp()");
-  // We will run the test only if SetUp() was successful and didn't call
-  // GTEST_SKIP().
-  if (!HasFatalFailure() && !IsSkipped()) {
-    impl->os_stack_trace_getter()->UponLeavingGTest();
-    internal::HandleExceptionsInMethodIfSupported(
-        this, &Test::TestBody, "the test body");
-  }
-
-  // However, we want to clean up as much as possible.  Hence we will
-  // always call TearDown(), even if SetUp() or the test body has
-  // failed.
-  impl->os_stack_trace_getter()->UponLeavingGTest();
-  internal::HandleExceptionsInMethodIfSupported(
-      this, &Test::TearDown, "TearDown()");
-}
-
-// Returns true if and only if the current test has a fatal failure.
-bool Test::HasFatalFailure() {
-  return internal::GetUnitTestImpl()->current_test_result()->HasFatalFailure();
-}
-
-// Returns true if and only if the current test has a non-fatal failure.
-bool Test::HasNonfatalFailure() {
-  return internal::GetUnitTestImpl()->current_test_result()->
-      HasNonfatalFailure();
-}
-
-// Returns true if and only if the current test was skipped.
-bool Test::IsSkipped() {
-  return internal::GetUnitTestImpl()->current_test_result()->Skipped();
-}
-
-// class TestInfo
-
-// Constructs a TestInfo object. It assumes ownership of the test factory
-// object.
-TestInfo::TestInfo(const std::string& a_test_suite_name,
-                   const std::string& a_name, const char* a_type_param,
-                   const char* a_value_param,
-                   internal::CodeLocation a_code_location,
-                   internal::TypeId fixture_class_id,
-                   internal::TestFactoryBase* factory)
-    : test_suite_name_(a_test_suite_name),
-      name_(a_name),
-      type_param_(a_type_param ? new std::string(a_type_param) : nullptr),
-      value_param_(a_value_param ? new std::string(a_value_param) : nullptr),
-      location_(a_code_location),
-      fixture_class_id_(fixture_class_id),
-      should_run_(false),
-      is_disabled_(false),
-      matches_filter_(false),
-      factory_(factory),
-      result_() {}
-
-// Destructs a TestInfo object.
-TestInfo::~TestInfo() { delete factory_; }
-
-namespace internal {
-
-// Creates a new TestInfo object and registers it with Google Test;
-// returns the created object.
-//
-// Arguments:
-//
-//   test_suite_name:   name of the test suite
-//   name:             name of the test
-//   type_param:       the name of the test's type parameter, or NULL if
-//                     this is not a typed or a type-parameterized test.
-//   value_param:      text representation of the test's value parameter,
-//                     or NULL if this is not a value-parameterized test.
-//   code_location:    code location where the test is defined
-//   fixture_class_id: ID of the test fixture class
-//   set_up_tc:        pointer to the function that sets up the test suite
-//   tear_down_tc:     pointer to the function that tears down the test suite
-//   factory:          pointer to the factory that creates a test object.
-//                     The newly created TestInfo instance will assume
-//                     ownership of the factory object.
-TestInfo* MakeAndRegisterTestInfo(
-    const char* test_suite_name, const char* name, const char* type_param,
-    const char* value_param, CodeLocation code_location,
-    TypeId fixture_class_id, SetUpTestSuiteFunc set_up_tc,
-    TearDownTestSuiteFunc tear_down_tc, TestFactoryBase* factory) {
-  TestInfo* const test_info =
-      new TestInfo(test_suite_name, name, type_param, value_param,
-                   code_location, fixture_class_id, factory);
-  GetUnitTestImpl()->AddTestInfo(set_up_tc, tear_down_tc, test_info);
-  return test_info;
-}
-
-void ReportInvalidTestSuiteType(const char* test_suite_name,
-                                CodeLocation code_location) {
-  Message errors;
-  errors
-      << "Attempted redefinition of test suite " << test_suite_name << ".\n"
-      << "All tests in the same test suite must use the same test fixture\n"
-      << "class.  However, in test suite " << test_suite_name << ", you tried\n"
-      << "to define a test using a fixture class different from the one\n"
-      << "used earlier. This can happen if the two fixture classes are\n"
-      << "from different namespaces and have the same name. You should\n"
-      << "probably rename one of the classes to put the tests into different\n"
-      << "test suites.";
-
-  GTEST_LOG_(ERROR) << FormatFileLocation(code_location.file.c_str(),
-                                          code_location.line)
-                    << " " << errors.GetString();
-}
-}  // namespace internal
-
-namespace {
-
-// A predicate that checks the test name of a TestInfo against a known
-// value.
-//
-// This is used for implementation of the TestSuite class only.  We put
-// it in the anonymous namespace to prevent polluting the outer
-// namespace.
-//
-// TestNameIs is copyable.
-class TestNameIs {
- public:
-  // Constructor.
-  //
-  // TestNameIs has NO default constructor.
-  explicit TestNameIs(const char* name)
-      : name_(name) {}
-
-  // Returns true if and only if the test name of test_info matches name_.
-  bool operator()(const TestInfo * test_info) const {
-    return test_info && test_info->name() == name_;
-  }
-
- private:
-  std::string name_;
-};
-
-}  // namespace
-
-namespace internal {
-
-// This method expands all parameterized tests registered with macros TEST_P
-// and INSTANTIATE_TEST_SUITE_P into regular tests and registers those.
-// This will be done just once during the program runtime.
-void UnitTestImpl::RegisterParameterizedTests() {
-  if (!parameterized_tests_registered_) {
-    parameterized_test_registry_.RegisterTests();
-    parameterized_tests_registered_ = true;
-  }
-}
-
-}  // namespace internal
-
-// Creates the test object, runs it, records its result, and then
-// deletes it.
-void TestInfo::Run() {
-  if (!should_run_) return;
-
-  // Tells UnitTest where to store test result.
-  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
-  impl->set_current_test_info(this);
-
-  TestEventListener* repeater = UnitTest::GetInstance()->listeners().repeater();
-
-  // Notifies the unit test event listeners that a test is about to start.
-  repeater->OnTestStart(*this);
-
-  const TimeInMillis start = internal::GetTimeInMillis();
-
-  impl->os_stack_trace_getter()->UponLeavingGTest();
-
-  // Creates the test object.
-  Test* const test = internal::HandleExceptionsInMethodIfSupported(
-      factory_, &internal::TestFactoryBase::CreateTest,
-      "the test fixture's constructor");
-
-  // Runs the test if the constructor didn't generate a fatal failure or invoke
-  // GTEST_SKIP().
-  // Note that the object will not be null
-  if (!Test::HasFatalFailure() && !Test::IsSkipped()) {
-    // This doesn't throw as all user code that can throw are wrapped into
-    // exception handling code.
-    test->Run();
-  }
-
-  if (test != nullptr) {
-    // Deletes the test object.
-    impl->os_stack_trace_getter()->UponLeavingGTest();
-    internal::HandleExceptionsInMethodIfSupported(
-        test, &Test::DeleteSelf_, "the test fixture's destructor");
-  }
-
-  result_.set_start_timestamp(start);
-  result_.set_elapsed_time(internal::GetTimeInMillis() - start);
-
-  // Notifies the unit test event listener that a test has just finished.
-  repeater->OnTestEnd(*this);
-
-  // Tells UnitTest to stop associating assertion results to this
-  // test.
-  impl->set_current_test_info(nullptr);
-}
-
-// class TestSuite
-
-// Gets the number of successful tests in this test suite.
-int TestSuite::successful_test_count() const {
-  return CountIf(test_info_list_, TestPassed);
-}
-
-// Gets the number of successful tests in this test suite.
-int TestSuite::skipped_test_count() const {
-  return CountIf(test_info_list_, TestSkipped);
-}
-
-// Gets the number of failed tests in this test suite.
-int TestSuite::failed_test_count() const {
-  return CountIf(test_info_list_, TestFailed);
-}
-
-// Gets the number of disabled tests that will be reported in the XML report.
-int TestSuite::reportable_disabled_test_count() const {
-  return CountIf(test_info_list_, TestReportableDisabled);
-}
-
-// Gets the number of disabled tests in this test suite.
-int TestSuite::disabled_test_count() const {
-  return CountIf(test_info_list_, TestDisabled);
-}
-
-// Gets the number of tests to be printed in the XML report.
-int TestSuite::reportable_test_count() const {
-  return CountIf(test_info_list_, TestReportable);
-}
-
-// Get the number of tests in this test suite that should run.
-int TestSuite::test_to_run_count() const {
-  return CountIf(test_info_list_, ShouldRunTest);
-}
-
-// Gets the number of all tests.
-int TestSuite::total_test_count() const {
-  return static_cast<int>(test_info_list_.size());
-}
-
-// Creates a TestSuite with the given name.
-//
-// Arguments:
-//
-//   name:         name of the test suite
-//   a_type_param: the name of the test suite's type parameter, or NULL if
-//                 this is not a typed or a type-parameterized test suite.
-//   set_up_tc:    pointer to the function that sets up the test suite
-//   tear_down_tc: pointer to the function that tears down the test suite
-TestSuite::TestSuite(const char* a_name, const char* a_type_param,
-                     internal::SetUpTestSuiteFunc set_up_tc,
-                     internal::TearDownTestSuiteFunc tear_down_tc)
-    : name_(a_name),
-      type_param_(a_type_param ? new std::string(a_type_param) : nullptr),
-      set_up_tc_(set_up_tc),
-      tear_down_tc_(tear_down_tc),
-      should_run_(false),
-      start_timestamp_(0),
-      elapsed_time_(0) {}
-
-// Destructor of TestSuite.
-TestSuite::~TestSuite() {
-  // Deletes every Test in the collection.
-  ForEach(test_info_list_, internal::Delete<TestInfo>);
-}
-
-// Returns the i-th test among all the tests. i can range from 0 to
-// total_test_count() - 1. If i is not in that range, returns NULL.
-const TestInfo* TestSuite::GetTestInfo(int i) const {
-  const int index = GetElementOr(test_indices_, i, -1);
-  return index < 0 ? nullptr : test_info_list_[static_cast<size_t>(index)];
-}
-
-// Returns the i-th test among all the tests. i can range from 0 to
-// total_test_count() - 1. If i is not in that range, returns NULL.
-TestInfo* TestSuite::GetMutableTestInfo(int i) {
-  const int index = GetElementOr(test_indices_, i, -1);
-  return index < 0 ? nullptr : test_info_list_[static_cast<size_t>(index)];
-}
-
-// Adds a test to this test suite.  Will delete the test upon
-// destruction of the TestSuite object.
-void TestSuite::AddTestInfo(TestInfo* test_info) {
-  test_info_list_.push_back(test_info);
-  test_indices_.push_back(static_cast<int>(test_indices_.size()));
-}
-
-// Runs every test in this TestSuite.
-void TestSuite::Run() {
-  if (!should_run_) return;
-
-  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
-  impl->set_current_test_suite(this);
-
-  TestEventListener* repeater = UnitTest::GetInstance()->listeners().repeater();
-
-  // Call both legacy and the new API
-  repeater->OnTestSuiteStart(*this);
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI
-  repeater->OnTestCaseStart(*this);
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI
-
-  impl->os_stack_trace_getter()->UponLeavingGTest();
-  internal::HandleExceptionsInMethodIfSupported(
-      this, &TestSuite::RunSetUpTestSuite, "SetUpTestSuite()");
-
-  start_timestamp_ = internal::GetTimeInMillis();
-  for (int i = 0; i < total_test_count(); i++) {
-    GetMutableTestInfo(i)->Run();
-  }
-  elapsed_time_ = internal::GetTimeInMillis() - start_timestamp_;
-
-  impl->os_stack_trace_getter()->UponLeavingGTest();
-  internal::HandleExceptionsInMethodIfSupported(
-      this, &TestSuite::RunTearDownTestSuite, "TearDownTestSuite()");
-
-  // Call both legacy and the new API
-  repeater->OnTestSuiteEnd(*this);
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI
-  repeater->OnTestCaseEnd(*this);
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI
-
-  impl->set_current_test_suite(nullptr);
-}
-
-// Clears the results of all tests in this test suite.
-void TestSuite::ClearResult() {
-  ad_hoc_test_result_.Clear();
-  ForEach(test_info_list_, TestInfo::ClearTestResult);
-}
-
-// Shuffles the tests in this test suite.
-void TestSuite::ShuffleTests(internal::Random* random) {
-  Shuffle(random, &test_indices_);
-}
-
-// Restores the test order to before the first shuffle.
-void TestSuite::UnshuffleTests() {
-  for (size_t i = 0; i < test_indices_.size(); i++) {
-    test_indices_[i] = static_cast<int>(i);
-  }
-}
-
-// Formats a countable noun.  Depending on its quantity, either the
-// singular form or the plural form is used. e.g.
-//
-// FormatCountableNoun(1, "formula", "formuli") returns "1 formula".
-// FormatCountableNoun(5, "book", "books") returns "5 books".
-static std::string FormatCountableNoun(int count,
-                                       const char * singular_form,
-                                       const char * plural_form) {
-  return internal::StreamableToString(count) + " " +
-      (count == 1 ? singular_form : plural_form);
-}
-
-// Formats the count of tests.
-static std::string FormatTestCount(int test_count) {
-  return FormatCountableNoun(test_count, "test", "tests");
-}
-
-// Formats the count of test suites.
-static std::string FormatTestSuiteCount(int test_suite_count) {
-  return FormatCountableNoun(test_suite_count, "test suite", "test suites");
-}
-
-// Converts a TestPartResult::Type enum to human-friendly string
-// representation.  Both kNonFatalFailure and kFatalFailure are translated
-// to "Failure", as the user usually doesn't care about the difference
-// between the two when viewing the test result.
-static const char * TestPartResultTypeToString(TestPartResult::Type type) {
-  switch (type) {
-    case TestPartResult::kSkip:
-      return "Skipped";
-    case TestPartResult::kSuccess:
-      return "Success";
-
-    case TestPartResult::kNonFatalFailure:
-    case TestPartResult::kFatalFailure:
-#ifdef _MSC_VER
-      return "error: ";
-#else
-      return "Failure\n";
-#endif
-    default:
-      return "Unknown result type";
-  }
-}
-
-namespace internal {
-
-// Prints a TestPartResult to an std::string.
-static std::string PrintTestPartResultToString(
-    const TestPartResult& test_part_result) {
-  return (Message()
-          << internal::FormatFileLocation(test_part_result.file_name(),
-                                          test_part_result.line_number())
-          << " " << TestPartResultTypeToString(test_part_result.type())
-          << test_part_result.message()).GetString();
-}
-
-// Prints a TestPartResult.
-static void PrintTestPartResult(const TestPartResult& test_part_result) {
-  const std::string& result =
-      PrintTestPartResultToString(test_part_result);
-  printf("%s\n", result.c_str());
-  fflush(stdout);
-  // If the test program runs in Visual Studio or a debugger, the
-  // following statements add the test part result message to the Output
-  // window such that the user can double-click on it to jump to the
-  // corresponding source code location; otherwise they do nothing.
-#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE
-  // We don't call OutputDebugString*() on Windows Mobile, as printing
-  // to stdout is done by OutputDebugString() there already - we don't
-  // want the same message printed twice.
-  ::OutputDebugStringA(result.c_str());
-  ::OutputDebugStringA("\n");
-#endif
-}
-
-// class PrettyUnitTestResultPrinter
-#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE && \
-    !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT && !GTEST_OS_WINDOWS_MINGW
-
-// Returns the character attribute for the given color.
-static WORD GetColorAttribute(GTestColor color) {
-  switch (color) {
-    case COLOR_RED:    return FOREGROUND_RED;
-    case COLOR_GREEN:  return FOREGROUND_GREEN;
-    case COLOR_YELLOW: return FOREGROUND_RED | FOREGROUND_GREEN;
-    default:           return 0;
-  }
-}
-
-static int GetBitOffset(WORD color_mask) {
-  if (color_mask == 0) return 0;
-
-  int bitOffset = 0;
-  while ((color_mask & 1) == 0) {
-    color_mask >>= 1;
-    ++bitOffset;
-  }
-  return bitOffset;
-}
-
-static WORD GetNewColor(GTestColor color, WORD old_color_attrs) {
-  // Let's reuse the BG
-  static const WORD background_mask = BACKGROUND_BLUE | BACKGROUND_GREEN |
-                                      BACKGROUND_RED | BACKGROUND_INTENSITY;
-  static const WORD foreground_mask = FOREGROUND_BLUE | FOREGROUND_GREEN |
-                                      FOREGROUND_RED | FOREGROUND_INTENSITY;
-  const WORD existing_bg = old_color_attrs & background_mask;
-
-  WORD new_color =
-      GetColorAttribute(color) | existing_bg | FOREGROUND_INTENSITY;
-  static const int bg_bitOffset = GetBitOffset(background_mask);
-  static const int fg_bitOffset = GetBitOffset(foreground_mask);
-
-  if (((new_color & background_mask) >> bg_bitOffset) ==
-      ((new_color & foreground_mask) >> fg_bitOffset)) {
-    new_color ^= FOREGROUND_INTENSITY;  // invert intensity
-  }
-  return new_color;
-}
-
-#else
-
-// Returns the ANSI color code for the given color.  COLOR_DEFAULT is
-// an invalid input.
-static const char* GetAnsiColorCode(GTestColor color) {
-  switch (color) {
-    case COLOR_RED:     return "1";
-    case COLOR_GREEN:   return "2";
-    case COLOR_YELLOW:  return "3";
-    default:
-      return nullptr;
-  }
-}
-
-#endif  // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE
-
-// Returns true if and only if Google Test should use colors in the output.
-bool ShouldUseColor(bool stdout_is_tty) {
-  const char* const gtest_color = GTEST_FLAG(color).c_str();
-
-  if (String::CaseInsensitiveCStringEquals(gtest_color, "auto")) {
-#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW
-    // On Windows the TERM variable is usually not set, but the
-    // console there does support colors.
-    return stdout_is_tty;
-#else
-    // On non-Windows platforms, we rely on the TERM variable.
-    const char* const term = posix::GetEnv("TERM");
-    const bool term_supports_color =
-        String::CStringEquals(term, "xterm") ||
-        String::CStringEquals(term, "xterm-color") ||
-        String::CStringEquals(term, "xterm-256color") ||
-        String::CStringEquals(term, "screen") ||
-        String::CStringEquals(term, "screen-256color") ||
-        String::CStringEquals(term, "tmux") ||
-        String::CStringEquals(term, "tmux-256color") ||
-        String::CStringEquals(term, "rxvt-unicode") ||
-        String::CStringEquals(term, "rxvt-unicode-256color") ||
-        String::CStringEquals(term, "linux") ||
-        String::CStringEquals(term, "cygwin");
-    return stdout_is_tty && term_supports_color;
-#endif  // GTEST_OS_WINDOWS
-  }
-
-  return String::CaseInsensitiveCStringEquals(gtest_color, "yes") ||
-      String::CaseInsensitiveCStringEquals(gtest_color, "true") ||
-      String::CaseInsensitiveCStringEquals(gtest_color, "t") ||
-      String::CStringEquals(gtest_color, "1");
-  // We take "yes", "true", "t", and "1" as meaning "yes".  If the
-  // value is neither one of these nor "auto", we treat it as "no" to
-  // be conservative.
-}
-
-// Helpers for printing colored strings to stdout. Note that on Windows, we
-// cannot simply emit special characters and have the terminal change colors.
-// This routine must actually emit the characters rather than return a string
-// that would be colored when printed, as can be done on Linux.
-void ColoredPrintf(GTestColor color, const char* fmt, ...) {
-  va_list args;
-  va_start(args, fmt);
-
-#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_ZOS || GTEST_OS_IOS || \
-    GTEST_OS_WINDOWS_PHONE || GTEST_OS_WINDOWS_RT || defined(ESP_PLATFORM)
-  const bool use_color = AlwaysFalse();
-#else
-  static const bool in_color_mode =
-      ShouldUseColor(posix::IsATTY(posix::FileNo(stdout)) != 0);
-  const bool use_color = in_color_mode && (color != COLOR_DEFAULT);
-#endif  // GTEST_OS_WINDOWS_MOBILE || GTEST_OS_ZOS
-
-  if (!use_color) {
-    vprintf(fmt, args);
-    va_end(args);
-    return;
-  }
-
-#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE && \
-    !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT && !GTEST_OS_WINDOWS_MINGW
-  const HANDLE stdout_handle = GetStdHandle(STD_OUTPUT_HANDLE);
-
-  // Gets the current text color.
-  CONSOLE_SCREEN_BUFFER_INFO buffer_info;
-  GetConsoleScreenBufferInfo(stdout_handle, &buffer_info);
-  const WORD old_color_attrs = buffer_info.wAttributes;
-  const WORD new_color = GetNewColor(color, old_color_attrs);
-
-  // We need to flush the stream buffers into the console before each
-  // SetConsoleTextAttribute call lest it affect the text that is already
-  // printed but has not yet reached the console.
-  fflush(stdout);
-  SetConsoleTextAttribute(stdout_handle, new_color);
-
-  vprintf(fmt, args);
-
-  fflush(stdout);
-  // Restores the text color.
-  SetConsoleTextAttribute(stdout_handle, old_color_attrs);
-#else
-  printf("\033[0;3%sm", GetAnsiColorCode(color));
-  vprintf(fmt, args);
-  printf("\033[m");  // Resets the terminal to default.
-#endif  // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE
-  va_end(args);
-}
-
-// Text printed in Google Test's text output and --gtest_list_tests
-// output to label the type parameter and value parameter for a test.
-static const char kTypeParamLabel[] = "TypeParam";
-static const char kValueParamLabel[] = "GetParam()";
-
-static void PrintFullTestCommentIfPresent(const TestInfo& test_info) {
-  const char* const type_param = test_info.type_param();
-  const char* const value_param = test_info.value_param();
-
-  if (type_param != nullptr || value_param != nullptr) {
-    printf(", where ");
-    if (type_param != nullptr) {
-      printf("%s = %s", kTypeParamLabel, type_param);
-      if (value_param != nullptr) printf(" and ");
-    }
-    if (value_param != nullptr) {
-      printf("%s = %s", kValueParamLabel, value_param);
-    }
-  }
-}
-
-// This class implements the TestEventListener interface.
-//
-// Class PrettyUnitTestResultPrinter is copyable.
-class PrettyUnitTestResultPrinter : public TestEventListener {
- public:
-  PrettyUnitTestResultPrinter() {}
-  static void PrintTestName(const char* test_suite, const char* test) {
-    printf("%s.%s", test_suite, test);
-  }
-
-  // The following methods override what's in the TestEventListener class.
-  void OnTestProgramStart(const UnitTest& /*unit_test*/) override {}
-  void OnTestIterationStart(const UnitTest& unit_test, int iteration) override;
-  void OnEnvironmentsSetUpStart(const UnitTest& unit_test) override;
-  void OnEnvironmentsSetUpEnd(const UnitTest& /*unit_test*/) override {}
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  void OnTestCaseStart(const TestCase& test_case) override;
-#else
-  void OnTestSuiteStart(const TestSuite& test_suite) override;
-#endif  // OnTestCaseStart
-
-  void OnTestStart(const TestInfo& test_info) override;
-
-  void OnTestPartResult(const TestPartResult& result) override;
-  void OnTestEnd(const TestInfo& test_info) override;
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  void OnTestCaseEnd(const TestCase& test_case) override;
-#else
-  void OnTestSuiteEnd(const TestSuite& test_suite) override;
-#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-  void OnEnvironmentsTearDownStart(const UnitTest& unit_test) override;
-  void OnEnvironmentsTearDownEnd(const UnitTest& /*unit_test*/) override {}
-  void OnTestIterationEnd(const UnitTest& unit_test, int iteration) override;
-  void OnTestProgramEnd(const UnitTest& /*unit_test*/) override {}
-
- private:
-  static void PrintFailedTests(const UnitTest& unit_test);
-  static void PrintSkippedTests(const UnitTest& unit_test);
-};
-
-  // Fired before each iteration of tests starts.
-void PrettyUnitTestResultPrinter::OnTestIterationStart(
-    const UnitTest& unit_test, int iteration) {
-  if (GTEST_FLAG(repeat) != 1)
-    printf("\nRepeating all tests (iteration %d) . . .\n\n", iteration + 1);
-
-  const char* const filter = GTEST_FLAG(filter).c_str();
-
-  // Prints the filter if it's not *.  This reminds the user that some
-  // tests may be skipped.
-  if (!String::CStringEquals(filter, kUniversalFilter)) {
-    ColoredPrintf(COLOR_YELLOW,
-                  "Note: %s filter = %s\n", GTEST_NAME_, filter);
-  }
-
-  if (internal::ShouldShard(kTestTotalShards, kTestShardIndex, false)) {
-    const Int32 shard_index = Int32FromEnvOrDie(kTestShardIndex, -1);
-    ColoredPrintf(COLOR_YELLOW,
-                  "Note: This is test shard %d of %s.\n",
-                  static_cast<int>(shard_index) + 1,
-                  internal::posix::GetEnv(kTestTotalShards));
-  }
-
-  if (GTEST_FLAG(shuffle)) {
-    ColoredPrintf(COLOR_YELLOW,
-                  "Note: Randomizing tests' orders with a seed of %d .\n",
-                  unit_test.random_seed());
-  }
-
-  ColoredPrintf(COLOR_GREEN,  "[==========] ");
-  printf("Running %s from %s.\n",
-         FormatTestCount(unit_test.test_to_run_count()).c_str(),
-         FormatTestSuiteCount(unit_test.test_suite_to_run_count()).c_str());
-  fflush(stdout);
-}
-
-void PrettyUnitTestResultPrinter::OnEnvironmentsSetUpStart(
-    const UnitTest& /*unit_test*/) {
-  ColoredPrintf(COLOR_GREEN,  "[----------] ");
-  printf("Global test environment set-up.\n");
-  fflush(stdout);
-}
-
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-void PrettyUnitTestResultPrinter::OnTestCaseStart(const TestCase& test_case) {
-  const std::string counts =
-      FormatCountableNoun(test_case.test_to_run_count(), "test", "tests");
-  ColoredPrintf(COLOR_GREEN, "[----------] ");
-  printf("%s from %s", counts.c_str(), test_case.name());
-  if (test_case.type_param() == nullptr) {
-    printf("\n");
-  } else {
-    printf(", where %s = %s\n", kTypeParamLabel, test_case.type_param());
-  }
-  fflush(stdout);
-}
-#else
-void PrettyUnitTestResultPrinter::OnTestSuiteStart(
-    const TestSuite& test_suite) {
-  const std::string counts =
-      FormatCountableNoun(test_suite.test_to_run_count(), "test", "tests");
-  ColoredPrintf(COLOR_GREEN, "[----------] ");
-  printf("%s from %s", counts.c_str(), test_suite.name());
-  if (test_suite.type_param() == nullptr) {
-    printf("\n");
-  } else {
-    printf(", where %s = %s\n", kTypeParamLabel, test_suite.type_param());
-  }
-  fflush(stdout);
-}
-#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-void PrettyUnitTestResultPrinter::OnTestStart(const TestInfo& test_info) {
-  ColoredPrintf(COLOR_GREEN,  "[ RUN      ] ");
-  PrintTestName(test_info.test_suite_name(), test_info.name());
-  printf("\n");
-  fflush(stdout);
-}
-
-// Called after an assertion failure.
-void PrettyUnitTestResultPrinter::OnTestPartResult(
-    const TestPartResult& result) {
-  switch (result.type()) {
-    // If the test part succeeded, or was skipped,
-    // we don't need to do anything.
-    case TestPartResult::kSkip:
-    case TestPartResult::kSuccess:
-      return;
-    default:
-      // Print failure message from the assertion
-      // (e.g. expected this and got that).
-      PrintTestPartResult(result);
-      fflush(stdout);
-  }
-}
-
-void PrettyUnitTestResultPrinter::OnTestEnd(const TestInfo& test_info) {
-  if (test_info.result()->Passed()) {
-    ColoredPrintf(COLOR_GREEN, "[       OK ] ");
-  } else if (test_info.result()->Skipped()) {
-    ColoredPrintf(COLOR_GREEN, "[  SKIPPED ] ");
-  } else {
-    ColoredPrintf(COLOR_RED, "[  FAILED  ] ");
-  }
-  PrintTestName(test_info.test_suite_name(), test_info.name());
-  if (test_info.result()->Failed())
-    PrintFullTestCommentIfPresent(test_info);
-
-  if (GTEST_FLAG(print_time)) {
-    printf(" (%s ms)\n", internal::StreamableToString(
-           test_info.result()->elapsed_time()).c_str());
-  } else {
-    printf("\n");
-  }
-  fflush(stdout);
-}
-
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-void PrettyUnitTestResultPrinter::OnTestCaseEnd(const TestCase& test_case) {
-  if (!GTEST_FLAG(print_time)) return;
-
-  const std::string counts =
-      FormatCountableNoun(test_case.test_to_run_count(), "test", "tests");
-  ColoredPrintf(COLOR_GREEN, "[----------] ");
-  printf("%s from %s (%s ms total)\n\n", counts.c_str(), test_case.name(),
-         internal::StreamableToString(test_case.elapsed_time()).c_str());
-  fflush(stdout);
-}
-#else
-void PrettyUnitTestResultPrinter::OnTestSuiteEnd(const TestSuite& test_suite) {
-  if (!GTEST_FLAG(print_time)) return;
-
-  const std::string counts =
-      FormatCountableNoun(test_suite.test_to_run_count(), "test", "tests");
-  ColoredPrintf(COLOR_GREEN, "[----------] ");
-  printf("%s from %s (%s ms total)\n\n", counts.c_str(), test_suite.name(),
-         internal::StreamableToString(test_suite.elapsed_time()).c_str());
-  fflush(stdout);
-}
-#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-void PrettyUnitTestResultPrinter::OnEnvironmentsTearDownStart(
-    const UnitTest& /*unit_test*/) {
-  ColoredPrintf(COLOR_GREEN,  "[----------] ");
-  printf("Global test environment tear-down\n");
-  fflush(stdout);
-}
-
-// Internal helper for printing the list of failed tests.
-void PrettyUnitTestResultPrinter::PrintFailedTests(const UnitTest& unit_test) {
-  const int failed_test_count = unit_test.failed_test_count();
-  if (failed_test_count == 0) {
-    return;
-  }
-
-  for (int i = 0; i < unit_test.total_test_suite_count(); ++i) {
-    const TestSuite& test_suite = *unit_test.GetTestSuite(i);
-    if (!test_suite.should_run() || (test_suite.failed_test_count() == 0)) {
-      continue;
-    }
-    for (int j = 0; j < test_suite.total_test_count(); ++j) {
-      const TestInfo& test_info = *test_suite.GetTestInfo(j);
-      if (!test_info.should_run() || !test_info.result()->Failed()) {
-        continue;
-      }
-      ColoredPrintf(COLOR_RED, "[  FAILED  ] ");
-      printf("%s.%s", test_suite.name(), test_info.name());
-      PrintFullTestCommentIfPresent(test_info);
-      printf("\n");
-    }
-  }
-}
-
-// Internal helper for printing the list of skipped tests.
-void PrettyUnitTestResultPrinter::PrintSkippedTests(const UnitTest& unit_test) {
-  const int skipped_test_count = unit_test.skipped_test_count();
-  if (skipped_test_count == 0) {
-    return;
-  }
-
-  for (int i = 0; i < unit_test.total_test_suite_count(); ++i) {
-    const TestSuite& test_suite = *unit_test.GetTestSuite(i);
-    if (!test_suite.should_run() || (test_suite.skipped_test_count() == 0)) {
-      continue;
-    }
-    for (int j = 0; j < test_suite.total_test_count(); ++j) {
-      const TestInfo& test_info = *test_suite.GetTestInfo(j);
-      if (!test_info.should_run() || !test_info.result()->Skipped()) {
-        continue;
-      }
-      ColoredPrintf(COLOR_GREEN, "[  SKIPPED ] ");
-      printf("%s.%s", test_suite.name(), test_info.name());
-      printf("\n");
-    }
-  }
-}
-
-void PrettyUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test,
-                                                     int /*iteration*/) {
-  ColoredPrintf(COLOR_GREEN,  "[==========] ");
-  printf("%s from %s ran.",
-         FormatTestCount(unit_test.test_to_run_count()).c_str(),
-         FormatTestSuiteCount(unit_test.test_suite_to_run_count()).c_str());
-  if (GTEST_FLAG(print_time)) {
-    printf(" (%s ms total)",
-           internal::StreamableToString(unit_test.elapsed_time()).c_str());
-  }
-  printf("\n");
-  ColoredPrintf(COLOR_GREEN,  "[  PASSED  ] ");
-  printf("%s.\n", FormatTestCount(unit_test.successful_test_count()).c_str());
-
-  const int skipped_test_count = unit_test.skipped_test_count();
-  if (skipped_test_count > 0) {
-    ColoredPrintf(COLOR_GREEN, "[  SKIPPED ] ");
-    printf("%s, listed below:\n", FormatTestCount(skipped_test_count).c_str());
-    PrintSkippedTests(unit_test);
-  }
-
-  int num_failures = unit_test.failed_test_count();
-  if (!unit_test.Passed()) {
-    const int failed_test_count = unit_test.failed_test_count();
-    ColoredPrintf(COLOR_RED,  "[  FAILED  ] ");
-    printf("%s, listed below:\n", FormatTestCount(failed_test_count).c_str());
-    PrintFailedTests(unit_test);
-    printf("\n%2d FAILED %s\n", num_failures,
-                        num_failures == 1 ? "TEST" : "TESTS");
-  }
-
-  int num_disabled = unit_test.reportable_disabled_test_count();
-  if (num_disabled && !GTEST_FLAG(also_run_disabled_tests)) {
-    if (!num_failures) {
-      printf("\n");  // Add a spacer if no FAILURE banner is displayed.
-    }
-    ColoredPrintf(COLOR_YELLOW,
-                  "  YOU HAVE %d DISABLED %s\n\n",
-                  num_disabled,
-                  num_disabled == 1 ? "TEST" : "TESTS");
-  }
-  // Ensure that Google Test output is printed before, e.g., heapchecker output.
-  fflush(stdout);
-}
-
-// End PrettyUnitTestResultPrinter
-
-// class TestEventRepeater
-//
-// This class forwards events to other event listeners.
-class TestEventRepeater : public TestEventListener {
- public:
-  TestEventRepeater() : forwarding_enabled_(true) {}
-  ~TestEventRepeater() override;
-  void Append(TestEventListener *listener);
-  TestEventListener* Release(TestEventListener* listener);
-
-  // Controls whether events will be forwarded to listeners_. Set to false
-  // in death test child processes.
-  bool forwarding_enabled() const { return forwarding_enabled_; }
-  void set_forwarding_enabled(bool enable) { forwarding_enabled_ = enable; }
-
-  void OnTestProgramStart(const UnitTest& unit_test) override;
-  void OnTestIterationStart(const UnitTest& unit_test, int iteration) override;
-  void OnEnvironmentsSetUpStart(const UnitTest& unit_test) override;
-  void OnEnvironmentsSetUpEnd(const UnitTest& unit_test) override;
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  void OnTestCaseStart(const TestSuite& parameter) override;
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  void OnTestSuiteStart(const TestSuite& parameter) override;
-  void OnTestStart(const TestInfo& test_info) override;
-  void OnTestPartResult(const TestPartResult& result) override;
-  void OnTestEnd(const TestInfo& test_info) override;
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  void OnTestCaseEnd(const TestCase& parameter) override;
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  void OnTestSuiteEnd(const TestSuite& parameter) override;
-  void OnEnvironmentsTearDownStart(const UnitTest& unit_test) override;
-  void OnEnvironmentsTearDownEnd(const UnitTest& unit_test) override;
-  void OnTestIterationEnd(const UnitTest& unit_test, int iteration) override;
-  void OnTestProgramEnd(const UnitTest& unit_test) override;
-
- private:
-  // Controls whether events will be forwarded to listeners_. Set to false
-  // in death test child processes.
-  bool forwarding_enabled_;
-  // The list of listeners that receive events.
-  std::vector<TestEventListener*> listeners_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestEventRepeater);
-};
-
-TestEventRepeater::~TestEventRepeater() {
-  ForEach(listeners_, Delete<TestEventListener>);
-}
-
-void TestEventRepeater::Append(TestEventListener *listener) {
-  listeners_.push_back(listener);
-}
-
-TestEventListener* TestEventRepeater::Release(TestEventListener *listener) {
-  for (size_t i = 0; i < listeners_.size(); ++i) {
-    if (listeners_[i] == listener) {
-      listeners_.erase(listeners_.begin() + static_cast<int>(i));
-      return listener;
-    }
-  }
-
-  return nullptr;
-}
-
-// Since most methods are very similar, use macros to reduce boilerplate.
-// This defines a member that forwards the call to all listeners.
-#define GTEST_REPEATER_METHOD_(Name, Type) \
-void TestEventRepeater::Name(const Type& parameter) { \
-  if (forwarding_enabled_) { \
-    for (size_t i = 0; i < listeners_.size(); i++) { \
-      listeners_[i]->Name(parameter); \
-    } \
-  } \
-}
-// This defines a member that forwards the call to all listeners in reverse
-// order.
-#define GTEST_REVERSE_REPEATER_METHOD_(Name, Type)      \
-  void TestEventRepeater::Name(const Type& parameter) { \
-    if (forwarding_enabled_) {                          \
-      for (size_t i = listeners_.size(); i != 0; i--) { \
-        listeners_[i - 1]->Name(parameter);             \
-      }                                                 \
-    }                                                   \
-  }
-
-GTEST_REPEATER_METHOD_(OnTestProgramStart, UnitTest)
-GTEST_REPEATER_METHOD_(OnEnvironmentsSetUpStart, UnitTest)
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-GTEST_REPEATER_METHOD_(OnTestCaseStart, TestSuite)
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-GTEST_REPEATER_METHOD_(OnTestSuiteStart, TestSuite)
-GTEST_REPEATER_METHOD_(OnTestStart, TestInfo)
-GTEST_REPEATER_METHOD_(OnTestPartResult, TestPartResult)
-GTEST_REPEATER_METHOD_(OnEnvironmentsTearDownStart, UnitTest)
-GTEST_REVERSE_REPEATER_METHOD_(OnEnvironmentsSetUpEnd, UnitTest)
-GTEST_REVERSE_REPEATER_METHOD_(OnEnvironmentsTearDownEnd, UnitTest)
-GTEST_REVERSE_REPEATER_METHOD_(OnTestEnd, TestInfo)
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-GTEST_REVERSE_REPEATER_METHOD_(OnTestCaseEnd, TestSuite)
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-GTEST_REVERSE_REPEATER_METHOD_(OnTestSuiteEnd, TestSuite)
-GTEST_REVERSE_REPEATER_METHOD_(OnTestProgramEnd, UnitTest)
-
-#undef GTEST_REPEATER_METHOD_
-#undef GTEST_REVERSE_REPEATER_METHOD_
-
-void TestEventRepeater::OnTestIterationStart(const UnitTest& unit_test,
-                                             int iteration) {
-  if (forwarding_enabled_) {
-    for (size_t i = 0; i < listeners_.size(); i++) {
-      listeners_[i]->OnTestIterationStart(unit_test, iteration);
-    }
-  }
-}
-
-void TestEventRepeater::OnTestIterationEnd(const UnitTest& unit_test,
-                                           int iteration) {
-  if (forwarding_enabled_) {
-    for (size_t i = listeners_.size(); i > 0; i--) {
-      listeners_[i - 1]->OnTestIterationEnd(unit_test, iteration);
-    }
-  }
-}
-
-// End TestEventRepeater
-
-// This class generates an XML output file.
-class XmlUnitTestResultPrinter : public EmptyTestEventListener {
- public:
-  explicit XmlUnitTestResultPrinter(const char* output_file);
-
-  void OnTestIterationEnd(const UnitTest& unit_test, int iteration) override;
-  void ListTestsMatchingFilter(const std::vector<TestSuite*>& test_suites);
-
-  // Prints an XML summary of all unit tests.
-  static void PrintXmlTestsList(std::ostream* stream,
-                                const std::vector<TestSuite*>& test_suites);
-
- private:
-  // Is c a whitespace character that is normalized to a space character
-  // when it appears in an XML attribute value?
-  static bool IsNormalizableWhitespace(char c) {
-    return c == 0x9 || c == 0xA || c == 0xD;
-  }
-
-  // May c appear in a well-formed XML document?
-  static bool IsValidXmlCharacter(char c) {
-    return IsNormalizableWhitespace(c) || c >= 0x20;
-  }
-
-  // Returns an XML-escaped copy of the input string str.  If
-  // is_attribute is true, the text is meant to appear as an attribute
-  // value, and normalizable whitespace is preserved by replacing it
-  // with character references.
-  static std::string EscapeXml(const std::string& str, bool is_attribute);
-
-  // Returns the given string with all characters invalid in XML removed.
-  static std::string RemoveInvalidXmlCharacters(const std::string& str);
-
-  // Convenience wrapper around EscapeXml when str is an attribute value.
-  static std::string EscapeXmlAttribute(const std::string& str) {
-    return EscapeXml(str, true);
-  }
-
-  // Convenience wrapper around EscapeXml when str is not an attribute value.
-  static std::string EscapeXmlText(const char* str) {
-    return EscapeXml(str, false);
-  }
-
-  // Verifies that the given attribute belongs to the given element and
-  // streams the attribute as XML.
-  static void OutputXmlAttribute(std::ostream* stream,
-                                 const std::string& element_name,
-                                 const std::string& name,
-                                 const std::string& value);
-
-  // Streams an XML CDATA section, escaping invalid CDATA sequences as needed.
-  static void OutputXmlCDataSection(::std::ostream* stream, const char* data);
-
-  // Streams an XML representation of a TestInfo object.
-  static void OutputXmlTestInfo(::std::ostream* stream,
-                                const char* test_suite_name,
-                                const TestInfo& test_info);
-
-  // Prints an XML representation of a TestSuite object
-  static void PrintXmlTestSuite(::std::ostream* stream,
-                                const TestSuite& test_suite);
-
-  // Prints an XML summary of unit_test to output stream out.
-  static void PrintXmlUnitTest(::std::ostream* stream,
-                               const UnitTest& unit_test);
-
-  // Produces a string representing the test properties in a result as space
-  // delimited XML attributes based on the property key="value" pairs.
-  // When the std::string is not empty, it includes a space at the beginning,
-  // to delimit this attribute from prior attributes.
-  static std::string TestPropertiesAsXmlAttributes(const TestResult& result);
-
-  // Streams an XML representation of the test properties of a TestResult
-  // object.
-  static void OutputXmlTestProperties(std::ostream* stream,
-                                      const TestResult& result);
-
-  // The output file.
-  const std::string output_file_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(XmlUnitTestResultPrinter);
-};
-
-// Creates a new XmlUnitTestResultPrinter.
-XmlUnitTestResultPrinter::XmlUnitTestResultPrinter(const char* output_file)
-    : output_file_(output_file) {
-  if (output_file_.empty()) {
-    GTEST_LOG_(FATAL) << "XML output file may not be null";
-  }
-}
-
-// Called after the unit test ends.
-void XmlUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test,
-                                                  int /*iteration*/) {
-  FILE* xmlout = OpenFileForWriting(output_file_);
-  std::stringstream stream;
-  PrintXmlUnitTest(&stream, unit_test);
-  fprintf(xmlout, "%s", StringStreamToString(&stream).c_str());
-  fclose(xmlout);
-}
-
-void XmlUnitTestResultPrinter::ListTestsMatchingFilter(
-    const std::vector<TestSuite*>& test_suites) {
-  FILE* xmlout = OpenFileForWriting(output_file_);
-  std::stringstream stream;
-  PrintXmlTestsList(&stream, test_suites);
-  fprintf(xmlout, "%s", StringStreamToString(&stream).c_str());
-  fclose(xmlout);
-}
-
-// Returns an XML-escaped copy of the input string str.  If is_attribute
-// is true, the text is meant to appear as an attribute value, and
-// normalizable whitespace is preserved by replacing it with character
-// references.
-//
-// Invalid XML characters in str, if any, are stripped from the output.
-// It is expected that most, if not all, of the text processed by this
-// module will consist of ordinary English text.
-// If this module is ever modified to produce version 1.1 XML output,
-// most invalid characters can be retained using character references.
-std::string XmlUnitTestResultPrinter::EscapeXml(
-    const std::string& str, bool is_attribute) {
-  Message m;
-
-  for (size_t i = 0; i < str.size(); ++i) {
-    const char ch = str[i];
-    switch (ch) {
-      case '<':
-        m << "&lt;";
-        break;
-      case '>':
-        m << "&gt;";
-        break;
-      case '&':
-        m << "&amp;";
-        break;
-      case '\'':
-        if (is_attribute)
-          m << "&apos;";
-        else
-          m << '\'';
-        break;
-      case '"':
-        if (is_attribute)
-          m << "&quot;";
-        else
-          m << '"';
-        break;
-      default:
-        if (IsValidXmlCharacter(ch)) {
-          if (is_attribute && IsNormalizableWhitespace(ch))
-            m << "&#x" << String::FormatByte(static_cast<unsigned char>(ch))
-              << ";";
-          else
-            m << ch;
-        }
-        break;
-    }
-  }
-
-  return m.GetString();
-}
-
-// Returns the given string with all characters invalid in XML removed.
-// Currently invalid characters are dropped from the string. An
-// alternative is to replace them with certain characters such as . or ?.
-std::string XmlUnitTestResultPrinter::RemoveInvalidXmlCharacters(
-    const std::string& str) {
-  std::string output;
-  output.reserve(str.size());
-  for (std::string::const_iterator it = str.begin(); it != str.end(); ++it)
-    if (IsValidXmlCharacter(*it))
-      output.push_back(*it);
-
-  return output;
-}
-
-// The following routines generate an XML representation of a UnitTest
-// object.
-// GOOGLETEST_CM0009 DO NOT DELETE
-//
-// This is how Google Test concepts map to the DTD:
-//
-// <testsuites name="AllTests">        <-- corresponds to a UnitTest object
-//   <testsuite name="testcase-name">  <-- corresponds to a TestSuite object
-//     <testcase name="test-name">     <-- corresponds to a TestInfo object
-//       <failure message="...">...</failure>
-//       <failure message="...">...</failure>
-//       <failure message="...">...</failure>
-//                                     <-- individual assertion failures
-//     </testcase>
-//   </testsuite>
-// </testsuites>
-
-// Formats the given time in milliseconds as seconds.
-std::string FormatTimeInMillisAsSeconds(TimeInMillis ms) {
-  ::std::stringstream ss;
-  ss << (static_cast<double>(ms) * 1e-3);
-  return ss.str();
-}
-
-static bool PortableLocaltime(time_t seconds, struct tm* out) {
-#if defined(_MSC_VER)
-  return localtime_s(out, &seconds) == 0;
-#elif defined(__MINGW32__) || defined(__MINGW64__)
-  // MINGW <time.h> provides neither localtime_r nor localtime_s, but uses
-  // Windows' localtime(), which has a thread-local tm buffer.
-  struct tm* tm_ptr = localtime(&seconds);  // NOLINT
-  if (tm_ptr == nullptr) return false;
-  *out = *tm_ptr;
-  return true;
-#else
-  return localtime_r(&seconds, out) != nullptr;
-#endif
-}
-
-// Converts the given epoch time in milliseconds to a date string in the ISO
-// 8601 format, without the timezone information.
-std::string FormatEpochTimeInMillisAsIso8601(TimeInMillis ms) {
-  struct tm time_struct;
-  if (!PortableLocaltime(static_cast<time_t>(ms / 1000), &time_struct))
-    return "";
-  // YYYY-MM-DDThh:mm:ss
-  return StreamableToString(time_struct.tm_year + 1900) + "-" +
-      String::FormatIntWidth2(time_struct.tm_mon + 1) + "-" +
-      String::FormatIntWidth2(time_struct.tm_mday) + "T" +
-      String::FormatIntWidth2(time_struct.tm_hour) + ":" +
-      String::FormatIntWidth2(time_struct.tm_min) + ":" +
-      String::FormatIntWidth2(time_struct.tm_sec);
-}
-
-// Streams an XML CDATA section, escaping invalid CDATA sequences as needed.
-void XmlUnitTestResultPrinter::OutputXmlCDataSection(::std::ostream* stream,
-                                                     const char* data) {
-  const char* segment = data;
-  *stream << "<![CDATA[";
-  for (;;) {
-    const char* const next_segment = strstr(segment, "]]>");
-    if (next_segment != nullptr) {
-      stream->write(
-          segment, static_cast<std::streamsize>(next_segment - segment));
-      *stream << "]]>]]&gt;<![CDATA[";
-      segment = next_segment + strlen("]]>");
-    } else {
-      *stream << segment;
-      break;
-    }
-  }
-  *stream << "]]>";
-}
-
-void XmlUnitTestResultPrinter::OutputXmlAttribute(
-    std::ostream* stream,
-    const std::string& element_name,
-    const std::string& name,
-    const std::string& value) {
-  const std::vector<std::string>& allowed_names =
-      GetReservedOutputAttributesForElement(element_name);
-
-  GTEST_CHECK_(std::find(allowed_names.begin(), allowed_names.end(), name) !=
-                   allowed_names.end())
-      << "Attribute " << name << " is not allowed for element <" << element_name
-      << ">.";
-
-  *stream << " " << name << "=\"" << EscapeXmlAttribute(value) << "\"";
-}
-
-// Prints an XML representation of a TestInfo object.
-void XmlUnitTestResultPrinter::OutputXmlTestInfo(::std::ostream* stream,
-                                                 const char* test_suite_name,
-                                                 const TestInfo& test_info) {
-  const TestResult& result = *test_info.result();
-  const std::string kTestsuite = "testcase";
-
-  if (test_info.is_in_another_shard()) {
-    return;
-  }
-
-  *stream << "    <testcase";
-  OutputXmlAttribute(stream, kTestsuite, "name", test_info.name());
-
-  if (test_info.value_param() != nullptr) {
-    OutputXmlAttribute(stream, kTestsuite, "value_param",
-                       test_info.value_param());
-  }
-  if (test_info.type_param() != nullptr) {
-    OutputXmlAttribute(stream, kTestsuite, "type_param",
-                       test_info.type_param());
-  }
-  if (GTEST_FLAG(list_tests)) {
-    OutputXmlAttribute(stream, kTestsuite, "file", test_info.file());
-    OutputXmlAttribute(stream, kTestsuite, "line",
-                       StreamableToString(test_info.line()));
-    *stream << " />\n";
-    return;
-  }
-
-  OutputXmlAttribute(stream, kTestsuite, "status",
-                     test_info.should_run() ? "run" : "notrun");
-  OutputXmlAttribute(stream, kTestsuite, "result",
-                     test_info.should_run()
-                         ? (result.Skipped() ? "skipped" : "completed")
-                         : "suppressed");
-  OutputXmlAttribute(stream, kTestsuite, "time",
-                     FormatTimeInMillisAsSeconds(result.elapsed_time()));
-  OutputXmlAttribute(
-      stream, kTestsuite, "timestamp",
-      FormatEpochTimeInMillisAsIso8601(result.start_timestamp()));
-  OutputXmlAttribute(stream, kTestsuite, "classname", test_suite_name);
-
-  int failures = 0;
-  for (int i = 0; i < result.total_part_count(); ++i) {
-    const TestPartResult& part = result.GetTestPartResult(i);
-    if (part.failed()) {
-      if (++failures == 1) {
-        *stream << ">\n";
-      }
-      const std::string location =
-          internal::FormatCompilerIndependentFileLocation(part.file_name(),
-                                                          part.line_number());
-      const std::string summary = location + "\n" + part.summary();
-      *stream << "      <failure message=\""
-              << EscapeXmlAttribute(summary.c_str())
-              << "\" type=\"\">";
-      const std::string detail = location + "\n" + part.message();
-      OutputXmlCDataSection(stream, RemoveInvalidXmlCharacters(detail).c_str());
-      *stream << "</failure>\n";
-    }
-  }
-
-  if (failures == 0 && result.test_property_count() == 0) {
-    *stream << " />\n";
-  } else {
-    if (failures == 0) {
-      *stream << ">\n";
-    }
-    OutputXmlTestProperties(stream, result);
-    *stream << "    </testcase>\n";
-  }
-}
-
-// Prints an XML representation of a TestSuite object
-void XmlUnitTestResultPrinter::PrintXmlTestSuite(std::ostream* stream,
-                                                 const TestSuite& test_suite) {
-  const std::string kTestsuite = "testsuite";
-  *stream << "  <" << kTestsuite;
-  OutputXmlAttribute(stream, kTestsuite, "name", test_suite.name());
-  OutputXmlAttribute(stream, kTestsuite, "tests",
-                     StreamableToString(test_suite.reportable_test_count()));
-  if (!GTEST_FLAG(list_tests)) {
-    OutputXmlAttribute(stream, kTestsuite, "failures",
-                       StreamableToString(test_suite.failed_test_count()));
-    OutputXmlAttribute(
-        stream, kTestsuite, "disabled",
-        StreamableToString(test_suite.reportable_disabled_test_count()));
-    OutputXmlAttribute(stream, kTestsuite, "errors", "0");
-    OutputXmlAttribute(stream, kTestsuite, "time",
-                       FormatTimeInMillisAsSeconds(test_suite.elapsed_time()));
-    OutputXmlAttribute(
-        stream, kTestsuite, "timestamp",
-        FormatEpochTimeInMillisAsIso8601(test_suite.start_timestamp()));
-    *stream << TestPropertiesAsXmlAttributes(test_suite.ad_hoc_test_result());
-  }
-  *stream << ">\n";
-  for (int i = 0; i < test_suite.total_test_count(); ++i) {
-    if (test_suite.GetTestInfo(i)->is_reportable())
-      OutputXmlTestInfo(stream, test_suite.name(), *test_suite.GetTestInfo(i));
-  }
-  *stream << "  </" << kTestsuite << ">\n";
-}
-
-// Prints an XML summary of unit_test to output stream out.
-void XmlUnitTestResultPrinter::PrintXmlUnitTest(std::ostream* stream,
-                                                const UnitTest& unit_test) {
-  const std::string kTestsuites = "testsuites";
-
-  *stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
-  *stream << "<" << kTestsuites;
-
-  OutputXmlAttribute(stream, kTestsuites, "tests",
-                     StreamableToString(unit_test.reportable_test_count()));
-  OutputXmlAttribute(stream, kTestsuites, "failures",
-                     StreamableToString(unit_test.failed_test_count()));
-  OutputXmlAttribute(
-      stream, kTestsuites, "disabled",
-      StreamableToString(unit_test.reportable_disabled_test_count()));
-  OutputXmlAttribute(stream, kTestsuites, "errors", "0");
-  OutputXmlAttribute(stream, kTestsuites, "time",
-                     FormatTimeInMillisAsSeconds(unit_test.elapsed_time()));
-  OutputXmlAttribute(
-      stream, kTestsuites, "timestamp",
-      FormatEpochTimeInMillisAsIso8601(unit_test.start_timestamp()));
-
-  if (GTEST_FLAG(shuffle)) {
-    OutputXmlAttribute(stream, kTestsuites, "random_seed",
-                       StreamableToString(unit_test.random_seed()));
-  }
-  *stream << TestPropertiesAsXmlAttributes(unit_test.ad_hoc_test_result());
-
-  OutputXmlAttribute(stream, kTestsuites, "name", "AllTests");
-  *stream << ">\n";
-
-  for (int i = 0; i < unit_test.total_test_suite_count(); ++i) {
-    if (unit_test.GetTestSuite(i)->reportable_test_count() > 0)
-      PrintXmlTestSuite(stream, *unit_test.GetTestSuite(i));
-  }
-  *stream << "</" << kTestsuites << ">\n";
-}
-
-void XmlUnitTestResultPrinter::PrintXmlTestsList(
-    std::ostream* stream, const std::vector<TestSuite*>& test_suites) {
-  const std::string kTestsuites = "testsuites";
-
-  *stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
-  *stream << "<" << kTestsuites;
-
-  int total_tests = 0;
-  for (auto test_suite : test_suites) {
-    total_tests += test_suite->total_test_count();
-  }
-  OutputXmlAttribute(stream, kTestsuites, "tests",
-                     StreamableToString(total_tests));
-  OutputXmlAttribute(stream, kTestsuites, "name", "AllTests");
-  *stream << ">\n";
-
-  for (auto test_suite : test_suites) {
-    PrintXmlTestSuite(stream, *test_suite);
-  }
-  *stream << "</" << kTestsuites << ">\n";
-}
-
-// Produces a string representing the test properties in a result as space
-// delimited XML attributes based on the property key="value" pairs.
-std::string XmlUnitTestResultPrinter::TestPropertiesAsXmlAttributes(
-    const TestResult& result) {
-  Message attributes;
-  for (int i = 0; i < result.test_property_count(); ++i) {
-    const TestProperty& property = result.GetTestProperty(i);
-    attributes << " " << property.key() << "="
-        << "\"" << EscapeXmlAttribute(property.value()) << "\"";
-  }
-  return attributes.GetString();
-}
-
-void XmlUnitTestResultPrinter::OutputXmlTestProperties(
-    std::ostream* stream, const TestResult& result) {
-  const std::string kProperties = "properties";
-  const std::string kProperty = "property";
-
-  if (result.test_property_count() <= 0) {
-    return;
-  }
-
-  *stream << "<" << kProperties << ">\n";
-  for (int i = 0; i < result.test_property_count(); ++i) {
-    const TestProperty& property = result.GetTestProperty(i);
-    *stream << "<" << kProperty;
-    *stream << " name=\"" << EscapeXmlAttribute(property.key()) << "\"";
-    *stream << " value=\"" << EscapeXmlAttribute(property.value()) << "\"";
-    *stream << "/>\n";
-  }
-  *stream << "</" << kProperties << ">\n";
-}
-
-// End XmlUnitTestResultPrinter
-
-// This class generates an JSON output file.
-class JsonUnitTestResultPrinter : public EmptyTestEventListener {
- public:
-  explicit JsonUnitTestResultPrinter(const char* output_file);
-
-  void OnTestIterationEnd(const UnitTest& unit_test, int iteration) override;
-
-  // Prints an JSON summary of all unit tests.
-  static void PrintJsonTestList(::std::ostream* stream,
-                                const std::vector<TestSuite*>& test_suites);
-
- private:
-  // Returns an JSON-escaped copy of the input string str.
-  static std::string EscapeJson(const std::string& str);
-
-  //// Verifies that the given attribute belongs to the given element and
-  //// streams the attribute as JSON.
-  static void OutputJsonKey(std::ostream* stream,
-                            const std::string& element_name,
-                            const std::string& name,
-                            const std::string& value,
-                            const std::string& indent,
-                            bool comma = true);
-  static void OutputJsonKey(std::ostream* stream,
-                            const std::string& element_name,
-                            const std::string& name,
-                            int value,
-                            const std::string& indent,
-                            bool comma = true);
-
-  // Streams a JSON representation of a TestInfo object.
-  static void OutputJsonTestInfo(::std::ostream* stream,
-                                 const char* test_suite_name,
-                                 const TestInfo& test_info);
-
-  // Prints a JSON representation of a TestSuite object
-  static void PrintJsonTestSuite(::std::ostream* stream,
-                                 const TestSuite& test_suite);
-
-  // Prints a JSON summary of unit_test to output stream out.
-  static void PrintJsonUnitTest(::std::ostream* stream,
-                                const UnitTest& unit_test);
-
-  // Produces a string representing the test properties in a result as
-  // a JSON dictionary.
-  static std::string TestPropertiesAsJson(const TestResult& result,
-                                          const std::string& indent);
-
-  // The output file.
-  const std::string output_file_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(JsonUnitTestResultPrinter);
-};
-
-// Creates a new JsonUnitTestResultPrinter.
-JsonUnitTestResultPrinter::JsonUnitTestResultPrinter(const char* output_file)
-    : output_file_(output_file) {
-  if (output_file_.empty()) {
-    GTEST_LOG_(FATAL) << "JSON output file may not be null";
-  }
-}
-
-void JsonUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test,
-                                                  int /*iteration*/) {
-  FILE* jsonout = OpenFileForWriting(output_file_);
-  std::stringstream stream;
-  PrintJsonUnitTest(&stream, unit_test);
-  fprintf(jsonout, "%s", StringStreamToString(&stream).c_str());
-  fclose(jsonout);
-}
-
-// Returns an JSON-escaped copy of the input string str.
-std::string JsonUnitTestResultPrinter::EscapeJson(const std::string& str) {
-  Message m;
-
-  for (size_t i = 0; i < str.size(); ++i) {
-    const char ch = str[i];
-    switch (ch) {
-      case '\\':
-      case '"':
-      case '/':
-        m << '\\' << ch;
-        break;
-      case '\b':
-        m << "\\b";
-        break;
-      case '\t':
-        m << "\\t";
-        break;
-      case '\n':
-        m << "\\n";
-        break;
-      case '\f':
-        m << "\\f";
-        break;
-      case '\r':
-        m << "\\r";
-        break;
-      default:
-        if (ch < ' ') {
-          m << "\\u00" << String::FormatByte(static_cast<unsigned char>(ch));
-        } else {
-          m << ch;
-        }
-        break;
-    }
-  }
-
-  return m.GetString();
-}
-
-// The following routines generate an JSON representation of a UnitTest
-// object.
-
-// Formats the given time in milliseconds as seconds.
-static std::string FormatTimeInMillisAsDuration(TimeInMillis ms) {
-  ::std::stringstream ss;
-  ss << (static_cast<double>(ms) * 1e-3) << "s";
-  return ss.str();
-}
-
-// Converts the given epoch time in milliseconds to a date string in the
-// RFC3339 format, without the timezone information.
-static std::string FormatEpochTimeInMillisAsRFC3339(TimeInMillis ms) {
-  struct tm time_struct;
-  if (!PortableLocaltime(static_cast<time_t>(ms / 1000), &time_struct))
-    return "";
-  // YYYY-MM-DDThh:mm:ss
-  return StreamableToString(time_struct.tm_year + 1900) + "-" +
-      String::FormatIntWidth2(time_struct.tm_mon + 1) + "-" +
-      String::FormatIntWidth2(time_struct.tm_mday) + "T" +
-      String::FormatIntWidth2(time_struct.tm_hour) + ":" +
-      String::FormatIntWidth2(time_struct.tm_min) + ":" +
-      String::FormatIntWidth2(time_struct.tm_sec) + "Z";
-}
-
-static inline std::string Indent(size_t width) {
-  return std::string(width, ' ');
-}
-
-void JsonUnitTestResultPrinter::OutputJsonKey(
-    std::ostream* stream,
-    const std::string& element_name,
-    const std::string& name,
-    const std::string& value,
-    const std::string& indent,
-    bool comma) {
-  const std::vector<std::string>& allowed_names =
-      GetReservedOutputAttributesForElement(element_name);
-
-  GTEST_CHECK_(std::find(allowed_names.begin(), allowed_names.end(), name) !=
-                   allowed_names.end())
-      << "Key \"" << name << "\" is not allowed for value \"" << element_name
-      << "\".";
-
-  *stream << indent << "\"" << name << "\": \"" << EscapeJson(value) << "\"";
-  if (comma)
-    *stream << ",\n";
-}
-
-void JsonUnitTestResultPrinter::OutputJsonKey(
-    std::ostream* stream,
-    const std::string& element_name,
-    const std::string& name,
-    int value,
-    const std::string& indent,
-    bool comma) {
-  const std::vector<std::string>& allowed_names =
-      GetReservedOutputAttributesForElement(element_name);
-
-  GTEST_CHECK_(std::find(allowed_names.begin(), allowed_names.end(), name) !=
-                   allowed_names.end())
-      << "Key \"" << name << "\" is not allowed for value \"" << element_name
-      << "\".";
-
-  *stream << indent << "\"" << name << "\": " << StreamableToString(value);
-  if (comma)
-    *stream << ",\n";
-}
-
-// Prints a JSON representation of a TestInfo object.
-void JsonUnitTestResultPrinter::OutputJsonTestInfo(::std::ostream* stream,
-                                                   const char* test_suite_name,
-                                                   const TestInfo& test_info) {
-  const TestResult& result = *test_info.result();
-  const std::string kTestsuite = "testcase";
-  const std::string kIndent = Indent(10);
-
-  *stream << Indent(8) << "{\n";
-  OutputJsonKey(stream, kTestsuite, "name", test_info.name(), kIndent);
-
-  if (test_info.value_param() != nullptr) {
-    OutputJsonKey(stream, kTestsuite, "value_param", test_info.value_param(),
-                  kIndent);
-  }
-  if (test_info.type_param() != nullptr) {
-    OutputJsonKey(stream, kTestsuite, "type_param", test_info.type_param(),
-                  kIndent);
-  }
-  if (GTEST_FLAG(list_tests)) {
-    OutputJsonKey(stream, kTestsuite, "file", test_info.file(), kIndent);
-    OutputJsonKey(stream, kTestsuite, "line", test_info.line(), kIndent, false);
-    *stream << "\n" << Indent(8) << "}";
-    return;
-  }
-
-  OutputJsonKey(stream, kTestsuite, "status",
-                test_info.should_run() ? "RUN" : "NOTRUN", kIndent);
-  OutputJsonKey(stream, kTestsuite, "result",
-                test_info.should_run()
-                    ? (result.Skipped() ? "SKIPPED" : "COMPLETED")
-                    : "SUPPRESSED",
-                kIndent);
-  OutputJsonKey(stream, kTestsuite, "timestamp",
-                FormatEpochTimeInMillisAsRFC3339(result.start_timestamp()),
-                kIndent);
-  OutputJsonKey(stream, kTestsuite, "time",
-                FormatTimeInMillisAsDuration(result.elapsed_time()), kIndent);
-  OutputJsonKey(stream, kTestsuite, "classname", test_suite_name, kIndent,
-                false);
-  *stream << TestPropertiesAsJson(result, kIndent);
-
-  int failures = 0;
-  for (int i = 0; i < result.total_part_count(); ++i) {
-    const TestPartResult& part = result.GetTestPartResult(i);
-    if (part.failed()) {
-      *stream << ",\n";
-      if (++failures == 1) {
-        *stream << kIndent << "\"" << "failures" << "\": [\n";
-      }
-      const std::string location =
-          internal::FormatCompilerIndependentFileLocation(part.file_name(),
-                                                          part.line_number());
-      const std::string message = EscapeJson(location + "\n" + part.message());
-      *stream << kIndent << "  {\n"
-              << kIndent << "    \"failure\": \"" << message << "\",\n"
-              << kIndent << "    \"type\": \"\"\n"
-              << kIndent << "  }";
-    }
-  }
-
-  if (failures > 0)
-    *stream << "\n" << kIndent << "]";
-  *stream << "\n" << Indent(8) << "}";
-}
-
-// Prints an JSON representation of a TestSuite object
-void JsonUnitTestResultPrinter::PrintJsonTestSuite(
-    std::ostream* stream, const TestSuite& test_suite) {
-  const std::string kTestsuite = "testsuite";
-  const std::string kIndent = Indent(6);
-
-  *stream << Indent(4) << "{\n";
-  OutputJsonKey(stream, kTestsuite, "name", test_suite.name(), kIndent);
-  OutputJsonKey(stream, kTestsuite, "tests", test_suite.reportable_test_count(),
-                kIndent);
-  if (!GTEST_FLAG(list_tests)) {
-    OutputJsonKey(stream, kTestsuite, "failures",
-                  test_suite.failed_test_count(), kIndent);
-    OutputJsonKey(stream, kTestsuite, "disabled",
-                  test_suite.reportable_disabled_test_count(), kIndent);
-    OutputJsonKey(stream, kTestsuite, "errors", 0, kIndent);
-    OutputJsonKey(
-        stream, kTestsuite, "timestamp",
-        FormatEpochTimeInMillisAsRFC3339(test_suite.start_timestamp()),
-        kIndent);
-    OutputJsonKey(stream, kTestsuite, "time",
-                  FormatTimeInMillisAsDuration(test_suite.elapsed_time()),
-                  kIndent, false);
-    *stream << TestPropertiesAsJson(test_suite.ad_hoc_test_result(), kIndent)
-            << ",\n";
-  }
-
-  *stream << kIndent << "\"" << kTestsuite << "\": [\n";
-
-  bool comma = false;
-  for (int i = 0; i < test_suite.total_test_count(); ++i) {
-    if (test_suite.GetTestInfo(i)->is_reportable()) {
-      if (comma) {
-        *stream << ",\n";
-      } else {
-        comma = true;
-      }
-      OutputJsonTestInfo(stream, test_suite.name(), *test_suite.GetTestInfo(i));
-    }
-  }
-  *stream << "\n" << kIndent << "]\n" << Indent(4) << "}";
-}
-
-// Prints a JSON summary of unit_test to output stream out.
-void JsonUnitTestResultPrinter::PrintJsonUnitTest(std::ostream* stream,
-                                                  const UnitTest& unit_test) {
-  const std::string kTestsuites = "testsuites";
-  const std::string kIndent = Indent(2);
-  *stream << "{\n";
-
-  OutputJsonKey(stream, kTestsuites, "tests", unit_test.reportable_test_count(),
-                kIndent);
-  OutputJsonKey(stream, kTestsuites, "failures", unit_test.failed_test_count(),
-                kIndent);
-  OutputJsonKey(stream, kTestsuites, "disabled",
-                unit_test.reportable_disabled_test_count(), kIndent);
-  OutputJsonKey(stream, kTestsuites, "errors", 0, kIndent);
-  if (GTEST_FLAG(shuffle)) {
-    OutputJsonKey(stream, kTestsuites, "random_seed", unit_test.random_seed(),
-                  kIndent);
-  }
-  OutputJsonKey(stream, kTestsuites, "timestamp",
-                FormatEpochTimeInMillisAsRFC3339(unit_test.start_timestamp()),
-                kIndent);
-  OutputJsonKey(stream, kTestsuites, "time",
-                FormatTimeInMillisAsDuration(unit_test.elapsed_time()), kIndent,
-                false);
-
-  *stream << TestPropertiesAsJson(unit_test.ad_hoc_test_result(), kIndent)
-          << ",\n";
-
-  OutputJsonKey(stream, kTestsuites, "name", "AllTests", kIndent);
-  *stream << kIndent << "\"" << kTestsuites << "\": [\n";
-
-  bool comma = false;
-  for (int i = 0; i < unit_test.total_test_suite_count(); ++i) {
-    if (unit_test.GetTestSuite(i)->reportable_test_count() > 0) {
-      if (comma) {
-        *stream << ",\n";
-      } else {
-        comma = true;
-      }
-      PrintJsonTestSuite(stream, *unit_test.GetTestSuite(i));
-    }
-  }
-
-  *stream << "\n" << kIndent << "]\n" << "}\n";
-}
-
-void JsonUnitTestResultPrinter::PrintJsonTestList(
-    std::ostream* stream, const std::vector<TestSuite*>& test_suites) {
-  const std::string kTestsuites = "testsuites";
-  const std::string kIndent = Indent(2);
-  *stream << "{\n";
-  int total_tests = 0;
-  for (auto test_suite : test_suites) {
-    total_tests += test_suite->total_test_count();
-  }
-  OutputJsonKey(stream, kTestsuites, "tests", total_tests, kIndent);
-
-  OutputJsonKey(stream, kTestsuites, "name", "AllTests", kIndent);
-  *stream << kIndent << "\"" << kTestsuites << "\": [\n";
-
-  for (size_t i = 0; i < test_suites.size(); ++i) {
-    if (i != 0) {
-      *stream << ",\n";
-    }
-    PrintJsonTestSuite(stream, *test_suites[i]);
-  }
-
-  *stream << "\n"
-          << kIndent << "]\n"
-          << "}\n";
-}
-// Produces a string representing the test properties in a result as
-// a JSON dictionary.
-std::string JsonUnitTestResultPrinter::TestPropertiesAsJson(
-    const TestResult& result, const std::string& indent) {
-  Message attributes;
-  for (int i = 0; i < result.test_property_count(); ++i) {
-    const TestProperty& property = result.GetTestProperty(i);
-    attributes << ",\n" << indent << "\"" << property.key() << "\": "
-               << "\"" << EscapeJson(property.value()) << "\"";
-  }
-  return attributes.GetString();
-}
-
-// End JsonUnitTestResultPrinter
-
-#if GTEST_CAN_STREAM_RESULTS_
-
-// Checks if str contains '=', '&', '%' or '\n' characters. If yes,
-// replaces them by "%xx" where xx is their hexadecimal value. For
-// example, replaces "=" with "%3D".  This algorithm is O(strlen(str))
-// in both time and space -- important as the input str may contain an
-// arbitrarily long test failure message and stack trace.
-std::string StreamingListener::UrlEncode(const char* str) {
-  std::string result;
-  result.reserve(strlen(str) + 1);
-  for (char ch = *str; ch != '\0'; ch = *++str) {
-    switch (ch) {
-      case '%':
-      case '=':
-      case '&':
-      case '\n':
-        result.append("%" + String::FormatByte(static_cast<unsigned char>(ch)));
-        break;
-      default:
-        result.push_back(ch);
-        break;
-    }
-  }
-  return result;
-}
-
-void StreamingListener::SocketWriter::MakeConnection() {
-  GTEST_CHECK_(sockfd_ == -1)
-      << "MakeConnection() can't be called when there is already a connection.";
-
-  addrinfo hints;
-  memset(&hints, 0, sizeof(hints));
-  hints.ai_family = AF_UNSPEC;    // To allow both IPv4 and IPv6 addresses.
-  hints.ai_socktype = SOCK_STREAM;
-  addrinfo* servinfo = nullptr;
-
-  // Use the getaddrinfo() to get a linked list of IP addresses for
-  // the given host name.
-  const int error_num = getaddrinfo(
-      host_name_.c_str(), port_num_.c_str(), &hints, &servinfo);
-  if (error_num != 0) {
-    GTEST_LOG_(WARNING) << "stream_result_to: getaddrinfo() failed: "
-                        << gai_strerror(error_num);
-  }
-
-  // Loop through all the results and connect to the first we can.
-  for (addrinfo* cur_addr = servinfo; sockfd_ == -1 && cur_addr != nullptr;
-       cur_addr = cur_addr->ai_next) {
-    sockfd_ = socket(
-        cur_addr->ai_family, cur_addr->ai_socktype, cur_addr->ai_protocol);
-    if (sockfd_ != -1) {
-      // Connect the client socket to the server socket.
-      if (connect(sockfd_, cur_addr->ai_addr, cur_addr->ai_addrlen) == -1) {
-        close(sockfd_);
-        sockfd_ = -1;
-      }
-    }
-  }
-
-  freeaddrinfo(servinfo);  // all done with this structure
-
-  if (sockfd_ == -1) {
-    GTEST_LOG_(WARNING) << "stream_result_to: failed to connect to "
-                        << host_name_ << ":" << port_num_;
-  }
-}
-
-// End of class Streaming Listener
-#endif  // GTEST_CAN_STREAM_RESULTS__
-
-// class OsStackTraceGetter
-
-const char* const OsStackTraceGetterInterface::kElidedFramesMarker =
-    "... " GTEST_NAME_ " internal frames ...";
-
-std::string OsStackTraceGetter::CurrentStackTrace(int max_depth, int skip_count)
-    GTEST_LOCK_EXCLUDED_(mutex_) {
-#if GTEST_HAS_ABSL
-  std::string result;
-
-  if (max_depth <= 0) {
-    return result;
-  }
-
-  max_depth = std::min(max_depth, kMaxStackTraceDepth);
-
-  std::vector<void*> raw_stack(max_depth);
-  // Skips the frames requested by the caller, plus this function.
-  const int raw_stack_size =
-      absl::GetStackTrace(&raw_stack[0], max_depth, skip_count + 1);
-
-  void* caller_frame = nullptr;
-  {
-    MutexLock lock(&mutex_);
-    caller_frame = caller_frame_;
-  }
-
-  for (int i = 0; i < raw_stack_size; ++i) {
-    if (raw_stack[i] == caller_frame &&
-        !GTEST_FLAG(show_internal_stack_frames)) {
-      // Add a marker to the trace and stop adding frames.
-      absl::StrAppend(&result, kElidedFramesMarker, "\n");
-      break;
-    }
-
-    char tmp[1024];
-    const char* symbol = "(unknown)";
-    if (absl::Symbolize(raw_stack[i], tmp, sizeof(tmp))) {
-      symbol = tmp;
-    }
-
-    char line[1024];
-    snprintf(line, sizeof(line), "  %p: %s\n", raw_stack[i], symbol);
-    result += line;
-  }
-
-  return result;
-
-#else  // !GTEST_HAS_ABSL
-  static_cast<void>(max_depth);
-  static_cast<void>(skip_count);
-  return "";
-#endif  // GTEST_HAS_ABSL
-}
-
-void OsStackTraceGetter::UponLeavingGTest() GTEST_LOCK_EXCLUDED_(mutex_) {
-#if GTEST_HAS_ABSL
-  void* caller_frame = nullptr;
-  if (absl::GetStackTrace(&caller_frame, 1, 3) <= 0) {
-    caller_frame = nullptr;
-  }
-
-  MutexLock lock(&mutex_);
-  caller_frame_ = caller_frame;
-#endif  // GTEST_HAS_ABSL
-}
-
-// A helper class that creates the premature-exit file in its
-// constructor and deletes the file in its destructor.
-class ScopedPrematureExitFile {
- public:
-  explicit ScopedPrematureExitFile(const char* premature_exit_filepath)
-      : premature_exit_filepath_(premature_exit_filepath ?
-                                 premature_exit_filepath : "") {
-    // If a path to the premature-exit file is specified...
-    if (!premature_exit_filepath_.empty()) {
-      // create the file with a single "0" character in it.  I/O
-      // errors are ignored as there's nothing better we can do and we
-      // don't want to fail the test because of this.
-      FILE* pfile = posix::FOpen(premature_exit_filepath, "w");
-      fwrite("0", 1, 1, pfile);
-      fclose(pfile);
-    }
-  }
-
-  ~ScopedPrematureExitFile() {
-    if (!premature_exit_filepath_.empty()) {
-      int retval = remove(premature_exit_filepath_.c_str());
-      if (retval) {
-        GTEST_LOG_(ERROR) << "Failed to remove premature exit filepath \""
-                          << premature_exit_filepath_ << "\" with error "
-                          << retval;
-      }
-    }
-  }
-
- private:
-  const std::string premature_exit_filepath_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedPrematureExitFile);
-};
-
-}  // namespace internal
-
-// class TestEventListeners
-
-TestEventListeners::TestEventListeners()
-    : repeater_(new internal::TestEventRepeater()),
-      default_result_printer_(nullptr),
-      default_xml_generator_(nullptr) {}
-
-TestEventListeners::~TestEventListeners() { delete repeater_; }
-
-// Returns the standard listener responsible for the default console
-// output.  Can be removed from the listeners list to shut down default
-// console output.  Note that removing this object from the listener list
-// with Release transfers its ownership to the user.
-void TestEventListeners::Append(TestEventListener* listener) {
-  repeater_->Append(listener);
-}
-
-// Removes the given event listener from the list and returns it.  It then
-// becomes the caller's responsibility to delete the listener. Returns
-// NULL if the listener is not found in the list.
-TestEventListener* TestEventListeners::Release(TestEventListener* listener) {
-  if (listener == default_result_printer_)
-    default_result_printer_ = nullptr;
-  else if (listener == default_xml_generator_)
-    default_xml_generator_ = nullptr;
-  return repeater_->Release(listener);
-}
-
-// Returns repeater that broadcasts the TestEventListener events to all
-// subscribers.
-TestEventListener* TestEventListeners::repeater() { return repeater_; }
-
-// Sets the default_result_printer attribute to the provided listener.
-// The listener is also added to the listener list and previous
-// default_result_printer is removed from it and deleted. The listener can
-// also be NULL in which case it will not be added to the list. Does
-// nothing if the previous and the current listener objects are the same.
-void TestEventListeners::SetDefaultResultPrinter(TestEventListener* listener) {
-  if (default_result_printer_ != listener) {
-    // It is an error to pass this method a listener that is already in the
-    // list.
-    delete Release(default_result_printer_);
-    default_result_printer_ = listener;
-    if (listener != nullptr) Append(listener);
-  }
-}
-
-// Sets the default_xml_generator attribute to the provided listener.  The
-// listener is also added to the listener list and previous
-// default_xml_generator is removed from it and deleted. The listener can
-// also be NULL in which case it will not be added to the list. Does
-// nothing if the previous and the current listener objects are the same.
-void TestEventListeners::SetDefaultXmlGenerator(TestEventListener* listener) {
-  if (default_xml_generator_ != listener) {
-    // It is an error to pass this method a listener that is already in the
-    // list.
-    delete Release(default_xml_generator_);
-    default_xml_generator_ = listener;
-    if (listener != nullptr) Append(listener);
-  }
-}
-
-// Controls whether events will be forwarded by the repeater to the
-// listeners in the list.
-bool TestEventListeners::EventForwardingEnabled() const {
-  return repeater_->forwarding_enabled();
-}
-
-void TestEventListeners::SuppressEventForwarding() {
-  repeater_->set_forwarding_enabled(false);
-}
-
-// class UnitTest
-
-// Gets the singleton UnitTest object.  The first time this method is
-// called, a UnitTest object is constructed and returned.  Consecutive
-// calls will return the same object.
-//
-// We don't protect this under mutex_ as a user is not supposed to
-// call this before main() starts, from which point on the return
-// value will never change.
-UnitTest* UnitTest::GetInstance() {
-  // CodeGear C++Builder insists on a public destructor for the
-  // default implementation.  Use this implementation to keep good OO
-  // design with private destructor.
-
-#if defined(__BORLANDC__)
-  static UnitTest* const instance = new UnitTest;
-  return instance;
-#else
-  static UnitTest instance;
-  return &instance;
-#endif  // defined(__BORLANDC__)
-}
-
-// Gets the number of successful test suites.
-int UnitTest::successful_test_suite_count() const {
-  return impl()->successful_test_suite_count();
-}
-
-// Gets the number of failed test suites.
-int UnitTest::failed_test_suite_count() const {
-  return impl()->failed_test_suite_count();
-}
-
-// Gets the number of all test suites.
-int UnitTest::total_test_suite_count() const {
-  return impl()->total_test_suite_count();
-}
-
-// Gets the number of all test suites that contain at least one test
-// that should run.
-int UnitTest::test_suite_to_run_count() const {
-  return impl()->test_suite_to_run_count();
-}
-
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-int UnitTest::successful_test_case_count() const {
-  return impl()->successful_test_suite_count();
-}
-int UnitTest::failed_test_case_count() const {
-  return impl()->failed_test_suite_count();
-}
-int UnitTest::total_test_case_count() const {
-  return impl()->total_test_suite_count();
-}
-int UnitTest::test_case_to_run_count() const {
-  return impl()->test_suite_to_run_count();
-}
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-// Gets the number of successful tests.
-int UnitTest::successful_test_count() const {
-  return impl()->successful_test_count();
-}
-
-// Gets the number of skipped tests.
-int UnitTest::skipped_test_count() const {
-  return impl()->skipped_test_count();
-}
-
-// Gets the number of failed tests.
-int UnitTest::failed_test_count() const { return impl()->failed_test_count(); }
-
-// Gets the number of disabled tests that will be reported in the XML report.
-int UnitTest::reportable_disabled_test_count() const {
-  return impl()->reportable_disabled_test_count();
-}
-
-// Gets the number of disabled tests.
-int UnitTest::disabled_test_count() const {
-  return impl()->disabled_test_count();
-}
-
-// Gets the number of tests to be printed in the XML report.
-int UnitTest::reportable_test_count() const {
-  return impl()->reportable_test_count();
-}
-
-// Gets the number of all tests.
-int UnitTest::total_test_count() const { return impl()->total_test_count(); }
-
-// Gets the number of tests that should run.
-int UnitTest::test_to_run_count() const { return impl()->test_to_run_count(); }
-
-// Gets the time of the test program start, in ms from the start of the
-// UNIX epoch.
-internal::TimeInMillis UnitTest::start_timestamp() const {
-    return impl()->start_timestamp();
-}
-
-// Gets the elapsed time, in milliseconds.
-internal::TimeInMillis UnitTest::elapsed_time() const {
-  return impl()->elapsed_time();
-}
-
-// Returns true if and only if the unit test passed (i.e. all test suites
-// passed).
-bool UnitTest::Passed() const { return impl()->Passed(); }
-
-// Returns true if and only if the unit test failed (i.e. some test suite
-// failed or something outside of all tests failed).
-bool UnitTest::Failed() const { return impl()->Failed(); }
-
-// Gets the i-th test suite among all the test suites. i can range from 0 to
-// total_test_suite_count() - 1. If i is not in that range, returns NULL.
-const TestSuite* UnitTest::GetTestSuite(int i) const {
-  return impl()->GetTestSuite(i);
-}
-
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-const TestCase* UnitTest::GetTestCase(int i) const {
-  return impl()->GetTestCase(i);
-}
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-// Returns the TestResult containing information on test failures and
-// properties logged outside of individual test suites.
-const TestResult& UnitTest::ad_hoc_test_result() const {
-  return *impl()->ad_hoc_test_result();
-}
-
-// Gets the i-th test suite among all the test suites. i can range from 0 to
-// total_test_suite_count() - 1. If i is not in that range, returns NULL.
-TestSuite* UnitTest::GetMutableTestSuite(int i) {
-  return impl()->GetMutableSuiteCase(i);
-}
-
-// Returns the list of event listeners that can be used to track events
-// inside Google Test.
-TestEventListeners& UnitTest::listeners() {
-  return *impl()->listeners();
-}
-
-// Registers and returns a global test environment.  When a test
-// program is run, all global test environments will be set-up in the
-// order they were registered.  After all tests in the program have
-// finished, all global test environments will be torn-down in the
-// *reverse* order they were registered.
-//
-// The UnitTest object takes ownership of the given environment.
-//
-// We don't protect this under mutex_, as we only support calling it
-// from the main thread.
-Environment* UnitTest::AddEnvironment(Environment* env) {
-  if (env == nullptr) {
-    return nullptr;
-  }
-
-  impl_->environments().push_back(env);
-  return env;
-}
-
-// Adds a TestPartResult to the current TestResult object.  All Google Test
-// assertion macros (e.g. ASSERT_TRUE, EXPECT_EQ, etc) eventually call
-// this to report their results.  The user code should use the
-// assertion macros instead of calling this directly.
-void UnitTest::AddTestPartResult(
-    TestPartResult::Type result_type,
-    const char* file_name,
-    int line_number,
-    const std::string& message,
-    const std::string& os_stack_trace) GTEST_LOCK_EXCLUDED_(mutex_) {
-  Message msg;
-  msg << message;
-
-  internal::MutexLock lock(&mutex_);
-  if (impl_->gtest_trace_stack().size() > 0) {
-    msg << "\n" << GTEST_NAME_ << " trace:";
-
-    for (size_t i = impl_->gtest_trace_stack().size(); i > 0; --i) {
-      const internal::TraceInfo& trace = impl_->gtest_trace_stack()[i - 1];
-      msg << "\n" << internal::FormatFileLocation(trace.file, trace.line)
-          << " " << trace.message;
-    }
-  }
-
-  if (os_stack_trace.c_str() != nullptr && !os_stack_trace.empty()) {
-    msg << internal::kStackTraceMarker << os_stack_trace;
-  }
-
-  const TestPartResult result = TestPartResult(
-      result_type, file_name, line_number, msg.GetString().c_str());
-  impl_->GetTestPartResultReporterForCurrentThread()->
-      ReportTestPartResult(result);
-
-  if (result_type != TestPartResult::kSuccess &&
-      result_type != TestPartResult::kSkip) {
-    // gtest_break_on_failure takes precedence over
-    // gtest_throw_on_failure.  This allows a user to set the latter
-    // in the code (perhaps in order to use Google Test assertions
-    // with another testing framework) and specify the former on the
-    // command line for debugging.
-    if (GTEST_FLAG(break_on_failure)) {
-#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
-      // Using DebugBreak on Windows allows gtest to still break into a debugger
-      // when a failure happens and both the --gtest_break_on_failure and
-      // the --gtest_catch_exceptions flags are specified.
-      DebugBreak();
-#elif (!defined(__native_client__)) &&            \
-    ((defined(__clang__) || defined(__GNUC__)) && \
-     (defined(__x86_64__) || defined(__i386__)))
-      // with clang/gcc we can achieve the same effect on x86 by invoking int3
-      asm("int3");
-#else
-      // Dereference nullptr through a volatile pointer to prevent the compiler
-      // from removing. We use this rather than abort() or __builtin_trap() for
-      // portability: some debuggers don't correctly trap abort().
-      *static_cast<volatile int*>(nullptr) = 1;
-#endif  // GTEST_OS_WINDOWS
-    } else if (GTEST_FLAG(throw_on_failure)) {
-#if GTEST_HAS_EXCEPTIONS
-      throw internal::GoogleTestFailureException(result);
-#else
-      // We cannot call abort() as it generates a pop-up in debug mode
-      // that cannot be suppressed in VC 7.1 or below.
-      exit(1);
-#endif
-    }
-  }
-}
-
-// Adds a TestProperty to the current TestResult object when invoked from
-// inside a test, to current TestSuite's ad_hoc_test_result_ when invoked
-// from SetUpTestSuite or TearDownTestSuite, or to the global property set
-// when invoked elsewhere.  If the result already contains a property with
-// the same key, the value will be updated.
-void UnitTest::RecordProperty(const std::string& key,
-                              const std::string& value) {
-  impl_->RecordProperty(TestProperty(key, value));
-}
-
-// Runs all tests in this UnitTest object and prints the result.
-// Returns 0 if successful, or 1 otherwise.
-//
-// We don't protect this under mutex_, as we only support calling it
-// from the main thread.
-int UnitTest::Run() {
-  const bool in_death_test_child_process =
-      internal::GTEST_FLAG(internal_run_death_test).length() > 0;
-
-  // Google Test implements this protocol for catching that a test
-  // program exits before returning control to Google Test:
-  //
-  //   1. Upon start, Google Test creates a file whose absolute path
-  //      is specified by the environment variable
-  //      TEST_PREMATURE_EXIT_FILE.
-  //   2. When Google Test has finished its work, it deletes the file.
-  //
-  // This allows a test runner to set TEST_PREMATURE_EXIT_FILE before
-  // running a Google-Test-based test program and check the existence
-  // of the file at the end of the test execution to see if it has
-  // exited prematurely.
-
-  // If we are in the child process of a death test, don't
-  // create/delete the premature exit file, as doing so is unnecessary
-  // and will confuse the parent process.  Otherwise, create/delete
-  // the file upon entering/leaving this function.  If the program
-  // somehow exits before this function has a chance to return, the
-  // premature-exit file will be left undeleted, causing a test runner
-  // that understands the premature-exit-file protocol to report the
-  // test as having failed.
-  const internal::ScopedPrematureExitFile premature_exit_file(
-      in_death_test_child_process
-          ? nullptr
-          : internal::posix::GetEnv("TEST_PREMATURE_EXIT_FILE"));
-
-  // Captures the value of GTEST_FLAG(catch_exceptions).  This value will be
-  // used for the duration of the program.
-  impl()->set_catch_exceptions(GTEST_FLAG(catch_exceptions));
-
-#if GTEST_OS_WINDOWS
-  // Either the user wants Google Test to catch exceptions thrown by the
-  // tests or this is executing in the context of death test child
-  // process. In either case the user does not want to see pop-up dialogs
-  // about crashes - they are expected.
-  if (impl()->catch_exceptions() || in_death_test_child_process) {
-# if !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
-    // SetErrorMode doesn't exist on CE.
-    SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOALIGNMENTFAULTEXCEPT |
-                 SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX);
-# endif  // !GTEST_OS_WINDOWS_MOBILE
-
-# if (defined(_MSC_VER) || GTEST_OS_WINDOWS_MINGW) && !GTEST_OS_WINDOWS_MOBILE
-    // Death test children can be terminated with _abort().  On Windows,
-    // _abort() can show a dialog with a warning message.  This forces the
-    // abort message to go to stderr instead.
-    _set_error_mode(_OUT_TO_STDERR);
-# endif
-
-# if defined(_MSC_VER) && !GTEST_OS_WINDOWS_MOBILE
-    // In the debug version, Visual Studio pops up a separate dialog
-    // offering a choice to debug the aborted program. We need to suppress
-    // this dialog or it will pop up for every EXPECT/ASSERT_DEATH statement
-    // executed. Google Test will notify the user of any unexpected
-    // failure via stderr.
-    if (!GTEST_FLAG(break_on_failure))
-      _set_abort_behavior(
-          0x0,                                    // Clear the following flags:
-          _WRITE_ABORT_MSG | _CALL_REPORTFAULT);  // pop-up window, core dump.
-# endif
-
-    // In debug mode, the Windows CRT can crash with an assertion over invalid
-    // input (e.g. passing an invalid file descriptor).  The default handling
-    // for these assertions is to pop up a dialog and wait for user input.
-    // Instead ask the CRT to dump such assertions to stderr non-interactively.
-    if (!IsDebuggerPresent()) {
-      (void)_CrtSetReportMode(_CRT_ASSERT,
-                              _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
-      (void)_CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);
-    }
-  }
-#endif  // GTEST_OS_WINDOWS
-
-  return internal::HandleExceptionsInMethodIfSupported(
-      impl(),
-      &internal::UnitTestImpl::RunAllTests,
-      "auxiliary test code (environments or event listeners)") ? 0 : 1;
-}
-
-// Returns the working directory when the first TEST() or TEST_F() was
-// executed.
-const char* UnitTest::original_working_dir() const {
-  return impl_->original_working_dir_.c_str();
-}
-
-// Returns the TestSuite object for the test that's currently running,
-// or NULL if no test is running.
-const TestSuite* UnitTest::current_test_suite() const
-    GTEST_LOCK_EXCLUDED_(mutex_) {
-  internal::MutexLock lock(&mutex_);
-  return impl_->current_test_suite();
-}
-
-// Legacy API is still available but deprecated
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-const TestCase* UnitTest::current_test_case() const
-    GTEST_LOCK_EXCLUDED_(mutex_) {
-  internal::MutexLock lock(&mutex_);
-  return impl_->current_test_suite();
-}
-#endif
-
-// Returns the TestInfo object for the test that's currently running,
-// or NULL if no test is running.
-const TestInfo* UnitTest::current_test_info() const
-    GTEST_LOCK_EXCLUDED_(mutex_) {
-  internal::MutexLock lock(&mutex_);
-  return impl_->current_test_info();
-}
-
-// Returns the random seed used at the start of the current test run.
-int UnitTest::random_seed() const { return impl_->random_seed(); }
-
-// Returns ParameterizedTestSuiteRegistry object used to keep track of
-// value-parameterized tests and instantiate and register them.
-internal::ParameterizedTestSuiteRegistry&
-UnitTest::parameterized_test_registry() GTEST_LOCK_EXCLUDED_(mutex_) {
-  return impl_->parameterized_test_registry();
-}
-
-// Creates an empty UnitTest.
-UnitTest::UnitTest() {
-  impl_ = new internal::UnitTestImpl(this);
-}
-
-// Destructor of UnitTest.
-UnitTest::~UnitTest() {
-  delete impl_;
-}
-
-// Pushes a trace defined by SCOPED_TRACE() on to the per-thread
-// Google Test trace stack.
-void UnitTest::PushGTestTrace(const internal::TraceInfo& trace)
-    GTEST_LOCK_EXCLUDED_(mutex_) {
-  internal::MutexLock lock(&mutex_);
-  impl_->gtest_trace_stack().push_back(trace);
-}
-
-// Pops a trace from the per-thread Google Test trace stack.
-void UnitTest::PopGTestTrace()
-    GTEST_LOCK_EXCLUDED_(mutex_) {
-  internal::MutexLock lock(&mutex_);
-  impl_->gtest_trace_stack().pop_back();
-}
-
-namespace internal {
-
-UnitTestImpl::UnitTestImpl(UnitTest* parent)
-    : parent_(parent),
-      GTEST_DISABLE_MSC_WARNINGS_PUSH_(4355 /* using this in initializer */)
-          default_global_test_part_result_reporter_(this),
-      default_per_thread_test_part_result_reporter_(this),
-      GTEST_DISABLE_MSC_WARNINGS_POP_() global_test_part_result_repoter_(
-          &default_global_test_part_result_reporter_),
-      per_thread_test_part_result_reporter_(
-          &default_per_thread_test_part_result_reporter_),
-      parameterized_test_registry_(),
-      parameterized_tests_registered_(false),
-      last_death_test_suite_(-1),
-      current_test_suite_(nullptr),
-      current_test_info_(nullptr),
-      ad_hoc_test_result_(),
-      os_stack_trace_getter_(nullptr),
-      post_flag_parse_init_performed_(false),
-      random_seed_(0),  // Will be overridden by the flag before first use.
-      random_(0),       // Will be reseeded before first use.
-      start_timestamp_(0),
-      elapsed_time_(0),
-#if GTEST_HAS_DEATH_TEST
-      death_test_factory_(new DefaultDeathTestFactory),
-#endif
-      // Will be overridden by the flag before first use.
-      catch_exceptions_(false) {
-  listeners()->SetDefaultResultPrinter(new PrettyUnitTestResultPrinter);
-}
-
-UnitTestImpl::~UnitTestImpl() {
-  // Deletes every TestSuite.
-  ForEach(test_suites_, internal::Delete<TestSuite>);
-
-  // Deletes every Environment.
-  ForEach(environments_, internal::Delete<Environment>);
-
-  delete os_stack_trace_getter_;
-}
-
-// Adds a TestProperty to the current TestResult object when invoked in a
-// context of a test, to current test suite's ad_hoc_test_result when invoke
-// from SetUpTestSuite/TearDownTestSuite, or to the global property set
-// otherwise.  If the result already contains a property with the same key,
-// the value will be updated.
-void UnitTestImpl::RecordProperty(const TestProperty& test_property) {
-  std::string xml_element;
-  TestResult* test_result;  // TestResult appropriate for property recording.
-
-  if (current_test_info_ != nullptr) {
-    xml_element = "testcase";
-    test_result = &(current_test_info_->result_);
-  } else if (current_test_suite_ != nullptr) {
-    xml_element = "testsuite";
-    test_result = &(current_test_suite_->ad_hoc_test_result_);
-  } else {
-    xml_element = "testsuites";
-    test_result = &ad_hoc_test_result_;
-  }
-  test_result->RecordProperty(xml_element, test_property);
-}
-
-#if GTEST_HAS_DEATH_TEST
-// Disables event forwarding if the control is currently in a death test
-// subprocess. Must not be called before InitGoogleTest.
-void UnitTestImpl::SuppressTestEventsIfInSubprocess() {
-  if (internal_run_death_test_flag_.get() != nullptr)
-    listeners()->SuppressEventForwarding();
-}
-#endif  // GTEST_HAS_DEATH_TEST
-
-// Initializes event listeners performing XML output as specified by
-// UnitTestOptions. Must not be called before InitGoogleTest.
-void UnitTestImpl::ConfigureXmlOutput() {
-  const std::string& output_format = UnitTestOptions::GetOutputFormat();
-  if (output_format == "xml") {
-    listeners()->SetDefaultXmlGenerator(new XmlUnitTestResultPrinter(
-        UnitTestOptions::GetAbsolutePathToOutputFile().c_str()));
-  } else if (output_format == "json") {
-    listeners()->SetDefaultXmlGenerator(new JsonUnitTestResultPrinter(
-        UnitTestOptions::GetAbsolutePathToOutputFile().c_str()));
-  } else if (output_format != "") {
-    GTEST_LOG_(WARNING) << "WARNING: unrecognized output format \""
-                        << output_format << "\" ignored.";
-  }
-}
-
-#if GTEST_CAN_STREAM_RESULTS_
-// Initializes event listeners for streaming test results in string form.
-// Must not be called before InitGoogleTest.
-void UnitTestImpl::ConfigureStreamingOutput() {
-  const std::string& target = GTEST_FLAG(stream_result_to);
-  if (!target.empty()) {
-    const size_t pos = target.find(':');
-    if (pos != std::string::npos) {
-      listeners()->Append(new StreamingListener(target.substr(0, pos),
-                                                target.substr(pos+1)));
-    } else {
-      GTEST_LOG_(WARNING) << "unrecognized streaming target \"" << target
-                          << "\" ignored.";
-    }
-  }
-}
-#endif  // GTEST_CAN_STREAM_RESULTS_
-
-// Performs initialization dependent upon flag values obtained in
-// ParseGoogleTestFlagsOnly.  Is called from InitGoogleTest after the call to
-// ParseGoogleTestFlagsOnly.  In case a user neglects to call InitGoogleTest
-// this function is also called from RunAllTests.  Since this function can be
-// called more than once, it has to be idempotent.
-void UnitTestImpl::PostFlagParsingInit() {
-  // Ensures that this function does not execute more than once.
-  if (!post_flag_parse_init_performed_) {
-    post_flag_parse_init_performed_ = true;
-
-#if defined(GTEST_CUSTOM_TEST_EVENT_LISTENER_)
-    // Register to send notifications about key process state changes.
-    listeners()->Append(new GTEST_CUSTOM_TEST_EVENT_LISTENER_());
-#endif  // defined(GTEST_CUSTOM_TEST_EVENT_LISTENER_)
-
-#if GTEST_HAS_DEATH_TEST
-    InitDeathTestSubprocessControlInfo();
-    SuppressTestEventsIfInSubprocess();
-#endif  // GTEST_HAS_DEATH_TEST
-
-    // Registers parameterized tests. This makes parameterized tests
-    // available to the UnitTest reflection API without running
-    // RUN_ALL_TESTS.
-    RegisterParameterizedTests();
-
-    // Configures listeners for XML output. This makes it possible for users
-    // to shut down the default XML output before invoking RUN_ALL_TESTS.
-    ConfigureXmlOutput();
-
-#if GTEST_CAN_STREAM_RESULTS_
-    // Configures listeners for streaming test results to the specified server.
-    ConfigureStreamingOutput();
-#endif  // GTEST_CAN_STREAM_RESULTS_
-
-#if GTEST_HAS_ABSL
-    if (GTEST_FLAG(install_failure_signal_handler)) {
-      absl::FailureSignalHandlerOptions options;
-      absl::InstallFailureSignalHandler(options);
-    }
-#endif  // GTEST_HAS_ABSL
-  }
-}
-
-// A predicate that checks the name of a TestSuite against a known
-// value.
-//
-// This is used for implementation of the UnitTest class only.  We put
-// it in the anonymous namespace to prevent polluting the outer
-// namespace.
-//
-// TestSuiteNameIs is copyable.
-class TestSuiteNameIs {
- public:
-  // Constructor.
-  explicit TestSuiteNameIs(const std::string& name) : name_(name) {}
-
-  // Returns true if and only if the name of test_suite matches name_.
-  bool operator()(const TestSuite* test_suite) const {
-    return test_suite != nullptr &&
-           strcmp(test_suite->name(), name_.c_str()) == 0;
-  }
-
- private:
-  std::string name_;
-};
-
-// Finds and returns a TestSuite with the given name.  If one doesn't
-// exist, creates one and returns it.  It's the CALLER'S
-// RESPONSIBILITY to ensure that this function is only called WHEN THE
-// TESTS ARE NOT SHUFFLED.
-//
-// Arguments:
-//
-//   test_suite_name: name of the test suite
-//   type_param:     the name of the test suite's type parameter, or NULL if
-//                   this is not a typed or a type-parameterized test suite.
-//   set_up_tc:      pointer to the function that sets up the test suite
-//   tear_down_tc:   pointer to the function that tears down the test suite
-TestSuite* UnitTestImpl::GetTestSuite(
-    const char* test_suite_name, const char* type_param,
-    internal::SetUpTestSuiteFunc set_up_tc,
-    internal::TearDownTestSuiteFunc tear_down_tc) {
-  // Can we find a TestSuite with the given name?
-  const auto test_suite =
-      std::find_if(test_suites_.rbegin(), test_suites_.rend(),
-                   TestSuiteNameIs(test_suite_name));
-
-  if (test_suite != test_suites_.rend()) return *test_suite;
-
-  // No.  Let's create one.
-  auto* const new_test_suite =
-      new TestSuite(test_suite_name, type_param, set_up_tc, tear_down_tc);
-
-  // Is this a death test suite?
-  if (internal::UnitTestOptions::MatchesFilter(test_suite_name,
-                                               kDeathTestSuiteFilter)) {
-    // Yes.  Inserts the test suite after the last death test suite
-    // defined so far.  This only works when the test suites haven't
-    // been shuffled.  Otherwise we may end up running a death test
-    // after a non-death test.
-    ++last_death_test_suite_;
-    test_suites_.insert(test_suites_.begin() + last_death_test_suite_,
-                        new_test_suite);
-  } else {
-    // No.  Appends to the end of the list.
-    test_suites_.push_back(new_test_suite);
-  }
-
-  test_suite_indices_.push_back(static_cast<int>(test_suite_indices_.size()));
-  return new_test_suite;
-}
-
-// Helpers for setting up / tearing down the given environment.  They
-// are for use in the ForEach() function.
-static void SetUpEnvironment(Environment* env) { env->SetUp(); }
-static void TearDownEnvironment(Environment* env) { env->TearDown(); }
-
-// Runs all tests in this UnitTest object, prints the result, and
-// returns true if all tests are successful.  If any exception is
-// thrown during a test, the test is considered to be failed, but the
-// rest of the tests will still be run.
-//
-// When parameterized tests are enabled, it expands and registers
-// parameterized tests first in RegisterParameterizedTests().
-// All other functions called from RunAllTests() may safely assume that
-// parameterized tests are ready to be counted and run.
-bool UnitTestImpl::RunAllTests() {
-  // True if and only if Google Test is initialized before RUN_ALL_TESTS() is
-  // called.
-  const bool gtest_is_initialized_before_run_all_tests = GTestIsInitialized();
-
-  // Do not run any test if the --help flag was specified.
-  if (g_help_flag)
-    return true;
-
-  // Repeats the call to the post-flag parsing initialization in case the
-  // user didn't call InitGoogleTest.
-  PostFlagParsingInit();
-
-  // Even if sharding is not on, test runners may want to use the
-  // GTEST_SHARD_STATUS_FILE to query whether the test supports the sharding
-  // protocol.
-  internal::WriteToShardStatusFileIfNeeded();
-
-  // True if and only if we are in a subprocess for running a thread-safe-style
-  // death test.
-  bool in_subprocess_for_death_test = false;
-
-#if GTEST_HAS_DEATH_TEST
-  in_subprocess_for_death_test =
-      (internal_run_death_test_flag_.get() != nullptr);
-# if defined(GTEST_EXTRA_DEATH_TEST_CHILD_SETUP_)
-  if (in_subprocess_for_death_test) {
-    GTEST_EXTRA_DEATH_TEST_CHILD_SETUP_();
-  }
-# endif  // defined(GTEST_EXTRA_DEATH_TEST_CHILD_SETUP_)
-#endif  // GTEST_HAS_DEATH_TEST
-
-  const bool should_shard = ShouldShard(kTestTotalShards, kTestShardIndex,
-                                        in_subprocess_for_death_test);
-
-  // Compares the full test names with the filter to decide which
-  // tests to run.
-  const bool has_tests_to_run = FilterTests(should_shard
-                                              ? HONOR_SHARDING_PROTOCOL
-                                              : IGNORE_SHARDING_PROTOCOL) > 0;
-
-  // Lists the tests and exits if the --gtest_list_tests flag was specified.
-  if (GTEST_FLAG(list_tests)) {
-    // This must be called *after* FilterTests() has been called.
-    ListTestsMatchingFilter();
-    return true;
-  }
-
-  random_seed_ = GTEST_FLAG(shuffle) ?
-      GetRandomSeedFromFlag(GTEST_FLAG(random_seed)) : 0;
-
-  // True if and only if at least one test has failed.
-  bool failed = false;
-
-  TestEventListener* repeater = listeners()->repeater();
-
-  start_timestamp_ = GetTimeInMillis();
-  repeater->OnTestProgramStart(*parent_);
-
-  // How many times to repeat the tests?  We don't want to repeat them
-  // when we are inside the subprocess of a death test.
-  const int repeat = in_subprocess_for_death_test ? 1 : GTEST_FLAG(repeat);
-  // Repeats forever if the repeat count is negative.
-  const bool gtest_repeat_forever = repeat < 0;
-  for (int i = 0; gtest_repeat_forever || i != repeat; i++) {
-    // We want to preserve failures generated by ad-hoc test
-    // assertions executed before RUN_ALL_TESTS().
-    ClearNonAdHocTestResult();
-
-    const TimeInMillis start = GetTimeInMillis();
-
-    // Shuffles test suites and tests if requested.
-    if (has_tests_to_run && GTEST_FLAG(shuffle)) {
-      random()->Reseed(static_cast<UInt32>(random_seed_));
-      // This should be done before calling OnTestIterationStart(),
-      // such that a test event listener can see the actual test order
-      // in the event.
-      ShuffleTests();
-    }
-
-    // Tells the unit test event listeners that the tests are about to start.
-    repeater->OnTestIterationStart(*parent_, i);
-
-    // Runs each test suite if there is at least one test to run.
-    if (has_tests_to_run) {
-      // Sets up all environments beforehand.
-      repeater->OnEnvironmentsSetUpStart(*parent_);
-      ForEach(environments_, SetUpEnvironment);
-      repeater->OnEnvironmentsSetUpEnd(*parent_);
-
-      // Runs the tests only if there was no fatal failure or skip triggered
-      // during global set-up.
-      if (Test::IsSkipped()) {
-        // Emit diagnostics when global set-up calls skip, as it will not be
-        // emitted by default.
-        TestResult& test_result =
-            *internal::GetUnitTestImpl()->current_test_result();
-        for (int j = 0; j < test_result.total_part_count(); ++j) {
-          const TestPartResult& test_part_result =
-              test_result.GetTestPartResult(j);
-          if (test_part_result.type() == TestPartResult::kSkip) {
-            const std::string& result = test_part_result.message();
-            printf("%s\n", result.c_str());
-          }
-        }
-        fflush(stdout);
-      } else if (!Test::HasFatalFailure()) {
-        for (int test_index = 0; test_index < total_test_suite_count();
-             test_index++) {
-          GetMutableSuiteCase(test_index)->Run();
-        }
-      }
-
-      // Tears down all environments in reverse order afterwards.
-      repeater->OnEnvironmentsTearDownStart(*parent_);
-      std::for_each(environments_.rbegin(), environments_.rend(),
-                    TearDownEnvironment);
-      repeater->OnEnvironmentsTearDownEnd(*parent_);
-    }
-
-    elapsed_time_ = GetTimeInMillis() - start;
-
-    // Tells the unit test event listener that the tests have just finished.
-    repeater->OnTestIterationEnd(*parent_, i);
-
-    // Gets the result and clears it.
-    if (!Passed()) {
-      failed = true;
-    }
-
-    // Restores the original test order after the iteration.  This
-    // allows the user to quickly repro a failure that happens in the
-    // N-th iteration without repeating the first (N - 1) iterations.
-    // This is not enclosed in "if (GTEST_FLAG(shuffle)) { ... }", in
-    // case the user somehow changes the value of the flag somewhere
-    // (it's always safe to unshuffle the tests).
-    UnshuffleTests();
-
-    if (GTEST_FLAG(shuffle)) {
-      // Picks a new random seed for each iteration.
-      random_seed_ = GetNextRandomSeed(random_seed_);
-    }
-  }
-
-  repeater->OnTestProgramEnd(*parent_);
-
-  if (!gtest_is_initialized_before_run_all_tests) {
-    ColoredPrintf(
-        COLOR_RED,
-        "\nIMPORTANT NOTICE - DO NOT IGNORE:\n"
-        "This test program did NOT call " GTEST_INIT_GOOGLE_TEST_NAME_
-        "() before calling RUN_ALL_TESTS(). This is INVALID. Soon " GTEST_NAME_
-        " will start to enforce the valid usage. "
-        "Please fix it ASAP, or IT WILL START TO FAIL.\n");  // NOLINT
-#if GTEST_FOR_GOOGLE_
-    ColoredPrintf(COLOR_RED,
-                  "For more details, see http://wiki/Main/ValidGUnitMain.\n");
-#endif  // GTEST_FOR_GOOGLE_
-  }
-
-  return !failed;
-}
-
-// Reads the GTEST_SHARD_STATUS_FILE environment variable, and creates the file
-// if the variable is present. If a file already exists at this location, this
-// function will write over it. If the variable is present, but the file cannot
-// be created, prints an error and exits.
-void WriteToShardStatusFileIfNeeded() {
-  const char* const test_shard_file = posix::GetEnv(kTestShardStatusFile);
-  if (test_shard_file != nullptr) {
-    FILE* const file = posix::FOpen(test_shard_file, "w");
-    if (file == nullptr) {
-      ColoredPrintf(COLOR_RED,
-                    "Could not write to the test shard status file \"%s\" "
-                    "specified by the %s environment variable.\n",
-                    test_shard_file, kTestShardStatusFile);
-      fflush(stdout);
-      exit(EXIT_FAILURE);
-    }
-    fclose(file);
-  }
-}
-
-// Checks whether sharding is enabled by examining the relevant
-// environment variable values. If the variables are present,
-// but inconsistent (i.e., shard_index >= total_shards), prints
-// an error and exits. If in_subprocess_for_death_test, sharding is
-// disabled because it must only be applied to the original test
-// process. Otherwise, we could filter out death tests we intended to execute.
-bool ShouldShard(const char* total_shards_env,
-                 const char* shard_index_env,
-                 bool in_subprocess_for_death_test) {
-  if (in_subprocess_for_death_test) {
-    return false;
-  }
-
-  const Int32 total_shards = Int32FromEnvOrDie(total_shards_env, -1);
-  const Int32 shard_index = Int32FromEnvOrDie(shard_index_env, -1);
-
-  if (total_shards == -1 && shard_index == -1) {
-    return false;
-  } else if (total_shards == -1 && shard_index != -1) {
-    const Message msg = Message()
-      << "Invalid environment variables: you have "
-      << kTestShardIndex << " = " << shard_index
-      << ", but have left " << kTestTotalShards << " unset.\n";
-    ColoredPrintf(COLOR_RED, "%s", msg.GetString().c_str());
-    fflush(stdout);
-    exit(EXIT_FAILURE);
-  } else if (total_shards != -1 && shard_index == -1) {
-    const Message msg = Message()
-      << "Invalid environment variables: you have "
-      << kTestTotalShards << " = " << total_shards
-      << ", but have left " << kTestShardIndex << " unset.\n";
-    ColoredPrintf(COLOR_RED, "%s", msg.GetString().c_str());
-    fflush(stdout);
-    exit(EXIT_FAILURE);
-  } else if (shard_index < 0 || shard_index >= total_shards) {
-    const Message msg = Message()
-      << "Invalid environment variables: we require 0 <= "
-      << kTestShardIndex << " < " << kTestTotalShards
-      << ", but you have " << kTestShardIndex << "=" << shard_index
-      << ", " << kTestTotalShards << "=" << total_shards << ".\n";
-    ColoredPrintf(COLOR_RED, "%s", msg.GetString().c_str());
-    fflush(stdout);
-    exit(EXIT_FAILURE);
-  }
-
-  return total_shards > 1;
-}
-
-// Parses the environment variable var as an Int32. If it is unset,
-// returns default_val. If it is not an Int32, prints an error
-// and aborts.
-Int32 Int32FromEnvOrDie(const char* var, Int32 default_val) {
-  const char* str_val = posix::GetEnv(var);
-  if (str_val == nullptr) {
-    return default_val;
-  }
-
-  Int32 result;
-  if (!ParseInt32(Message() << "The value of environment variable " << var,
-                  str_val, &result)) {
-    exit(EXIT_FAILURE);
-  }
-  return result;
-}
-
-// Given the total number of shards, the shard index, and the test id,
-// returns true if and only if the test should be run on this shard. The test id
-// is some arbitrary but unique non-negative integer assigned to each test
-// method. Assumes that 0 <= shard_index < total_shards.
-bool ShouldRunTestOnShard(int total_shards, int shard_index, int test_id) {
-  return (test_id % total_shards) == shard_index;
-}
-
-// Compares the name of each test with the user-specified filter to
-// decide whether the test should be run, then records the result in
-// each TestSuite and TestInfo object.
-// If shard_tests == true, further filters tests based on sharding
-// variables in the environment - see
-// https://github.com/google/googletest/blob/master/googletest/docs/advanced.md
-// . Returns the number of tests that should run.
-int UnitTestImpl::FilterTests(ReactionToSharding shard_tests) {
-  const Int32 total_shards = shard_tests == HONOR_SHARDING_PROTOCOL ?
-      Int32FromEnvOrDie(kTestTotalShards, -1) : -1;
-  const Int32 shard_index = shard_tests == HONOR_SHARDING_PROTOCOL ?
-      Int32FromEnvOrDie(kTestShardIndex, -1) : -1;
-
-  // num_runnable_tests are the number of tests that will
-  // run across all shards (i.e., match filter and are not disabled).
-  // num_selected_tests are the number of tests to be run on
-  // this shard.
-  int num_runnable_tests = 0;
-  int num_selected_tests = 0;
-  for (auto* test_suite : test_suites_) {
-    const std::string& test_suite_name = test_suite->name();
-    test_suite->set_should_run(false);
-
-    for (size_t j = 0; j < test_suite->test_info_list().size(); j++) {
-      TestInfo* const test_info = test_suite->test_info_list()[j];
-      const std::string test_name(test_info->name());
-      // A test is disabled if test suite name or test name matches
-      // kDisableTestFilter.
-      const bool is_disabled = internal::UnitTestOptions::MatchesFilter(
-                                   test_suite_name, kDisableTestFilter) ||
-                               internal::UnitTestOptions::MatchesFilter(
-                                   test_name, kDisableTestFilter);
-      test_info->is_disabled_ = is_disabled;
-
-      const bool matches_filter = internal::UnitTestOptions::FilterMatchesTest(
-          test_suite_name, test_name);
-      test_info->matches_filter_ = matches_filter;
-
-      const bool is_runnable =
-          (GTEST_FLAG(also_run_disabled_tests) || !is_disabled) &&
-          matches_filter;
-
-      const bool is_in_another_shard =
-          shard_tests != IGNORE_SHARDING_PROTOCOL &&
-          !ShouldRunTestOnShard(total_shards, shard_index, num_runnable_tests);
-      test_info->is_in_another_shard_ = is_in_another_shard;
-      const bool is_selected = is_runnable && !is_in_another_shard;
-
-      num_runnable_tests += is_runnable;
-      num_selected_tests += is_selected;
-
-      test_info->should_run_ = is_selected;
-      test_suite->set_should_run(test_suite->should_run() || is_selected);
-    }
-  }
-  return num_selected_tests;
-}
-
-// Prints the given C-string on a single line by replacing all '\n'
-// characters with string "\\n".  If the output takes more than
-// max_length characters, only prints the first max_length characters
-// and "...".
-static void PrintOnOneLine(const char* str, int max_length) {
-  if (str != nullptr) {
-    for (int i = 0; *str != '\0'; ++str) {
-      if (i >= max_length) {
-        printf("...");
-        break;
-      }
-      if (*str == '\n') {
-        printf("\\n");
-        i += 2;
-      } else {
-        printf("%c", *str);
-        ++i;
-      }
-    }
-  }
-}
-
-// Prints the names of the tests matching the user-specified filter flag.
-void UnitTestImpl::ListTestsMatchingFilter() {
-  // Print at most this many characters for each type/value parameter.
-  const int kMaxParamLength = 250;
-
-  for (auto* test_suite : test_suites_) {
-    bool printed_test_suite_name = false;
-
-    for (size_t j = 0; j < test_suite->test_info_list().size(); j++) {
-      const TestInfo* const test_info = test_suite->test_info_list()[j];
-      if (test_info->matches_filter_) {
-        if (!printed_test_suite_name) {
-          printed_test_suite_name = true;
-          printf("%s.", test_suite->name());
-          if (test_suite->type_param() != nullptr) {
-            printf("  # %s = ", kTypeParamLabel);
-            // We print the type parameter on a single line to make
-            // the output easy to parse by a program.
-            PrintOnOneLine(test_suite->type_param(), kMaxParamLength);
-          }
-          printf("\n");
-        }
-        printf("  %s", test_info->name());
-        if (test_info->value_param() != nullptr) {
-          printf("  # %s = ", kValueParamLabel);
-          // We print the value parameter on a single line to make the
-          // output easy to parse by a program.
-          PrintOnOneLine(test_info->value_param(), kMaxParamLength);
-        }
-        printf("\n");
-      }
-    }
-  }
-  fflush(stdout);
-  const std::string& output_format = UnitTestOptions::GetOutputFormat();
-  if (output_format == "xml" || output_format == "json") {
-    FILE* fileout = OpenFileForWriting(
-        UnitTestOptions::GetAbsolutePathToOutputFile().c_str());
-    std::stringstream stream;
-    if (output_format == "xml") {
-      XmlUnitTestResultPrinter(
-          UnitTestOptions::GetAbsolutePathToOutputFile().c_str())
-          .PrintXmlTestsList(&stream, test_suites_);
-    } else if (output_format == "json") {
-      JsonUnitTestResultPrinter(
-          UnitTestOptions::GetAbsolutePathToOutputFile().c_str())
-          .PrintJsonTestList(&stream, test_suites_);
-    }
-    fprintf(fileout, "%s", StringStreamToString(&stream).c_str());
-    fclose(fileout);
-  }
-}
-
-// Sets the OS stack trace getter.
-//
-// Does nothing if the input and the current OS stack trace getter are
-// the same; otherwise, deletes the old getter and makes the input the
-// current getter.
-void UnitTestImpl::set_os_stack_trace_getter(
-    OsStackTraceGetterInterface* getter) {
-  if (os_stack_trace_getter_ != getter) {
-    delete os_stack_trace_getter_;
-    os_stack_trace_getter_ = getter;
-  }
-}
-
-// Returns the current OS stack trace getter if it is not NULL;
-// otherwise, creates an OsStackTraceGetter, makes it the current
-// getter, and returns it.
-OsStackTraceGetterInterface* UnitTestImpl::os_stack_trace_getter() {
-  if (os_stack_trace_getter_ == nullptr) {
-#ifdef GTEST_OS_STACK_TRACE_GETTER_
-    os_stack_trace_getter_ = new GTEST_OS_STACK_TRACE_GETTER_;
-#else
-    os_stack_trace_getter_ = new OsStackTraceGetter;
-#endif  // GTEST_OS_STACK_TRACE_GETTER_
-  }
-
-  return os_stack_trace_getter_;
-}
-
-// Returns the most specific TestResult currently running.
-TestResult* UnitTestImpl::current_test_result() {
-  if (current_test_info_ != nullptr) {
-    return &current_test_info_->result_;
-  }
-  if (current_test_suite_ != nullptr) {
-    return &current_test_suite_->ad_hoc_test_result_;
-  }
-  return &ad_hoc_test_result_;
-}
-
-// Shuffles all test suites, and the tests within each test suite,
-// making sure that death tests are still run first.
-void UnitTestImpl::ShuffleTests() {
-  // Shuffles the death test suites.
-  ShuffleRange(random(), 0, last_death_test_suite_ + 1, &test_suite_indices_);
-
-  // Shuffles the non-death test suites.
-  ShuffleRange(random(), last_death_test_suite_ + 1,
-               static_cast<int>(test_suites_.size()), &test_suite_indices_);
-
-  // Shuffles the tests inside each test suite.
-  for (auto& test_suite : test_suites_) {
-    test_suite->ShuffleTests(random());
-  }
-}
-
-// Restores the test suites and tests to their order before the first shuffle.
-void UnitTestImpl::UnshuffleTests() {
-  for (size_t i = 0; i < test_suites_.size(); i++) {
-    // Unshuffles the tests in each test suite.
-    test_suites_[i]->UnshuffleTests();
-    // Resets the index of each test suite.
-    test_suite_indices_[i] = static_cast<int>(i);
-  }
-}
-
-// Returns the current OS stack trace as an std::string.
-//
-// The maximum number of stack frames to be included is specified by
-// the gtest_stack_trace_depth flag.  The skip_count parameter
-// specifies the number of top frames to be skipped, which doesn't
-// count against the number of frames to be included.
-//
-// For example, if Foo() calls Bar(), which in turn calls
-// GetCurrentOsStackTraceExceptTop(..., 1), Foo() will be included in
-// the trace but Bar() and GetCurrentOsStackTraceExceptTop() won't.
-std::string GetCurrentOsStackTraceExceptTop(UnitTest* /*unit_test*/,
-                                            int skip_count) {
-  // We pass skip_count + 1 to skip this wrapper function in addition
-  // to what the user really wants to skip.
-  return GetUnitTestImpl()->CurrentOsStackTraceExceptTop(skip_count + 1);
-}
-
-// Used by the GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_ macro to
-// suppress unreachable code warnings.
-namespace {
-class ClassUniqueToAlwaysTrue {};
-}
-
-bool IsTrue(bool condition) { return condition; }
-
-bool AlwaysTrue() {
-#if GTEST_HAS_EXCEPTIONS
-  // This condition is always false so AlwaysTrue() never actually throws,
-  // but it makes the compiler think that it may throw.
-  if (IsTrue(false))
-    throw ClassUniqueToAlwaysTrue();
-#endif  // GTEST_HAS_EXCEPTIONS
-  return true;
-}
-
-// If *pstr starts with the given prefix, modifies *pstr to be right
-// past the prefix and returns true; otherwise leaves *pstr unchanged
-// and returns false.  None of pstr, *pstr, and prefix can be NULL.
-bool SkipPrefix(const char* prefix, const char** pstr) {
-  const size_t prefix_len = strlen(prefix);
-  if (strncmp(*pstr, prefix, prefix_len) == 0) {
-    *pstr += prefix_len;
-    return true;
-  }
-  return false;
-}
-
-// Parses a string as a command line flag.  The string should have
-// the format "--flag=value".  When def_optional is true, the "=value"
-// part can be omitted.
-//
-// Returns the value of the flag, or NULL if the parsing failed.
-static const char* ParseFlagValue(const char* str, const char* flag,
-                                  bool def_optional) {
-  // str and flag must not be NULL.
-  if (str == nullptr || flag == nullptr) return nullptr;
-
-  // The flag must start with "--" followed by GTEST_FLAG_PREFIX_.
-  const std::string flag_str = std::string("--") + GTEST_FLAG_PREFIX_ + flag;
-  const size_t flag_len = flag_str.length();
-  if (strncmp(str, flag_str.c_str(), flag_len) != 0) return nullptr;
-
-  // Skips the flag name.
-  const char* flag_end = str + flag_len;
-
-  // When def_optional is true, it's OK to not have a "=value" part.
-  if (def_optional && (flag_end[0] == '\0')) {
-    return flag_end;
-  }
-
-  // If def_optional is true and there are more characters after the
-  // flag name, or if def_optional is false, there must be a '=' after
-  // the flag name.
-  if (flag_end[0] != '=') return nullptr;
-
-  // Returns the string after "=".
-  return flag_end + 1;
-}
-
-// Parses a string for a bool flag, in the form of either
-// "--flag=value" or "--flag".
-//
-// In the former case, the value is taken as true as long as it does
-// not start with '0', 'f', or 'F'.
-//
-// In the latter case, the value is taken as true.
-//
-// On success, stores the value of the flag in *value, and returns
-// true.  On failure, returns false without changing *value.
-static bool ParseBoolFlag(const char* str, const char* flag, bool* value) {
-  // Gets the value of the flag as a string.
-  const char* const value_str = ParseFlagValue(str, flag, true);
-
-  // Aborts if the parsing failed.
-  if (value_str == nullptr) return false;
-
-  // Converts the string value to a bool.
-  *value = !(*value_str == '0' || *value_str == 'f' || *value_str == 'F');
-  return true;
-}
-
-// Parses a string for an Int32 flag, in the form of
-// "--flag=value".
-//
-// On success, stores the value of the flag in *value, and returns
-// true.  On failure, returns false without changing *value.
-bool ParseInt32Flag(const char* str, const char* flag, Int32* value) {
-  // Gets the value of the flag as a string.
-  const char* const value_str = ParseFlagValue(str, flag, false);
-
-  // Aborts if the parsing failed.
-  if (value_str == nullptr) return false;
-
-  // Sets *value to the value of the flag.
-  return ParseInt32(Message() << "The value of flag --" << flag,
-                    value_str, value);
-}
-
-// Parses a string for a string flag, in the form of
-// "--flag=value".
-//
-// On success, stores the value of the flag in *value, and returns
-// true.  On failure, returns false without changing *value.
-template <typename String>
-static bool ParseStringFlag(const char* str, const char* flag, String* value) {
-  // Gets the value of the flag as a string.
-  const char* const value_str = ParseFlagValue(str, flag, false);
-
-  // Aborts if the parsing failed.
-  if (value_str == nullptr) return false;
-
-  // Sets *value to the value of the flag.
-  *value = value_str;
-  return true;
-}
-
-// Determines whether a string has a prefix that Google Test uses for its
-// flags, i.e., starts with GTEST_FLAG_PREFIX_ or GTEST_FLAG_PREFIX_DASH_.
-// If Google Test detects that a command line flag has its prefix but is not
-// recognized, it will print its help message. Flags starting with
-// GTEST_INTERNAL_PREFIX_ followed by "internal_" are considered Google Test
-// internal flags and do not trigger the help message.
-static bool HasGoogleTestFlagPrefix(const char* str) {
-  return (SkipPrefix("--", &str) ||
-          SkipPrefix("-", &str) ||
-          SkipPrefix("/", &str)) &&
-         !SkipPrefix(GTEST_FLAG_PREFIX_ "internal_", &str) &&
-         (SkipPrefix(GTEST_FLAG_PREFIX_, &str) ||
-          SkipPrefix(GTEST_FLAG_PREFIX_DASH_, &str));
-}
-
-// Prints a string containing code-encoded text.  The following escape
-// sequences can be used in the string to control the text color:
-//
-//   @@    prints a single '@' character.
-//   @R    changes the color to red.
-//   @G    changes the color to green.
-//   @Y    changes the color to yellow.
-//   @D    changes to the default terminal text color.
-//
-static void PrintColorEncoded(const char* str) {
-  GTestColor color = COLOR_DEFAULT;  // The current color.
-
-  // Conceptually, we split the string into segments divided by escape
-  // sequences.  Then we print one segment at a time.  At the end of
-  // each iteration, the str pointer advances to the beginning of the
-  // next segment.
-  for (;;) {
-    const char* p = strchr(str, '@');
-    if (p == nullptr) {
-      ColoredPrintf(color, "%s", str);
-      return;
-    }
-
-    ColoredPrintf(color, "%s", std::string(str, p).c_str());
-
-    const char ch = p[1];
-    str = p + 2;
-    if (ch == '@') {
-      ColoredPrintf(color, "@");
-    } else if (ch == 'D') {
-      color = COLOR_DEFAULT;
-    } else if (ch == 'R') {
-      color = COLOR_RED;
-    } else if (ch == 'G') {
-      color = COLOR_GREEN;
-    } else if (ch == 'Y') {
-      color = COLOR_YELLOW;
-    } else {
-      --str;
-    }
-  }
-}
-
-static const char kColorEncodedHelpMessage[] =
-"This program contains tests written using " GTEST_NAME_ ". You can use the\n"
-"following command line flags to control its behavior:\n"
-"\n"
-"Test Selection:\n"
-"  @G--" GTEST_FLAG_PREFIX_ "list_tests@D\n"
-"      List the names of all tests instead of running them. The name of\n"
-"      TEST(Foo, Bar) is \"Foo.Bar\".\n"
-"  @G--" GTEST_FLAG_PREFIX_ "filter=@YPOSTIVE_PATTERNS"
-    "[@G-@YNEGATIVE_PATTERNS]@D\n"
-"      Run only the tests whose name matches one of the positive patterns but\n"
-"      none of the negative patterns. '?' matches any single character; '*'\n"
-"      matches any substring; ':' separates two patterns.\n"
-"  @G--" GTEST_FLAG_PREFIX_ "also_run_disabled_tests@D\n"
-"      Run all disabled tests too.\n"
-"\n"
-"Test Execution:\n"
-"  @G--" GTEST_FLAG_PREFIX_ "repeat=@Y[COUNT]@D\n"
-"      Run the tests repeatedly; use a negative count to repeat forever.\n"
-"  @G--" GTEST_FLAG_PREFIX_ "shuffle@D\n"
-"      Randomize tests' orders on every iteration.\n"
-"  @G--" GTEST_FLAG_PREFIX_ "random_seed=@Y[NUMBER]@D\n"
-"      Random number seed to use for shuffling test orders (between 1 and\n"
-"      99999, or 0 to use a seed based on the current time).\n"
-"\n"
-"Test Output:\n"
-"  @G--" GTEST_FLAG_PREFIX_ "color=@Y(@Gyes@Y|@Gno@Y|@Gauto@Y)@D\n"
-"      Enable/disable colored output. The default is @Gauto@D.\n"
-"  -@G-" GTEST_FLAG_PREFIX_ "print_time=0@D\n"
-"      Don't print the elapsed time of each test.\n"
-"  @G--" GTEST_FLAG_PREFIX_ "output=@Y(@Gjson@Y|@Gxml@Y)[@G:@YDIRECTORY_PATH@G"
-    GTEST_PATH_SEP_ "@Y|@G:@YFILE_PATH]@D\n"
-"      Generate a JSON or XML report in the given directory or with the given\n"
-"      file name. @YFILE_PATH@D defaults to @Gtest_detail.xml@D.\n"
-# if GTEST_CAN_STREAM_RESULTS_
-"  @G--" GTEST_FLAG_PREFIX_ "stream_result_to=@YHOST@G:@YPORT@D\n"
-"      Stream test results to the given server.\n"
-# endif  // GTEST_CAN_STREAM_RESULTS_
-"\n"
-"Assertion Behavior:\n"
-# if GTEST_HAS_DEATH_TEST && !GTEST_OS_WINDOWS
-"  @G--" GTEST_FLAG_PREFIX_ "death_test_style=@Y(@Gfast@Y|@Gthreadsafe@Y)@D\n"
-"      Set the default death test style.\n"
-# endif  // GTEST_HAS_DEATH_TEST && !GTEST_OS_WINDOWS
-"  @G--" GTEST_FLAG_PREFIX_ "break_on_failure@D\n"
-"      Turn assertion failures into debugger break-points.\n"
-"  @G--" GTEST_FLAG_PREFIX_ "throw_on_failure@D\n"
-"      Turn assertion failures into C++ exceptions for use by an external\n"
-"      test framework.\n"
-"  @G--" GTEST_FLAG_PREFIX_ "catch_exceptions=0@D\n"
-"      Do not report exceptions as test failures. Instead, allow them\n"
-"      to crash the program or throw a pop-up (on Windows).\n"
-"\n"
-"Except for @G--" GTEST_FLAG_PREFIX_ "list_tests@D, you can alternatively set "
-    "the corresponding\n"
-"environment variable of a flag (all letters in upper-case). For example, to\n"
-"disable colored text output, you can either specify @G--" GTEST_FLAG_PREFIX_
-    "color=no@D or set\n"
-"the @G" GTEST_FLAG_PREFIX_UPPER_ "COLOR@D environment variable to @Gno@D.\n"
-"\n"
-"For more information, please read the " GTEST_NAME_ " documentation at\n"
-"@G" GTEST_PROJECT_URL_ "@D. If you find a bug in " GTEST_NAME_ "\n"
-"(not one in your own code or tests), please report it to\n"
-"@G<" GTEST_DEV_EMAIL_ ">@D.\n";
-
-static bool ParseGoogleTestFlag(const char* const arg) {
-  return ParseBoolFlag(arg, kAlsoRunDisabledTestsFlag,
-                       &GTEST_FLAG(also_run_disabled_tests)) ||
-      ParseBoolFlag(arg, kBreakOnFailureFlag,
-                    &GTEST_FLAG(break_on_failure)) ||
-      ParseBoolFlag(arg, kCatchExceptionsFlag,
-                    &GTEST_FLAG(catch_exceptions)) ||
-      ParseStringFlag(arg, kColorFlag, &GTEST_FLAG(color)) ||
-      ParseStringFlag(arg, kDeathTestStyleFlag,
-                      &GTEST_FLAG(death_test_style)) ||
-      ParseBoolFlag(arg, kDeathTestUseFork,
-                    &GTEST_FLAG(death_test_use_fork)) ||
-      ParseStringFlag(arg, kFilterFlag, &GTEST_FLAG(filter)) ||
-      ParseStringFlag(arg, kInternalRunDeathTestFlag,
-                      &GTEST_FLAG(internal_run_death_test)) ||
-      ParseBoolFlag(arg, kListTestsFlag, &GTEST_FLAG(list_tests)) ||
-      ParseStringFlag(arg, kOutputFlag, &GTEST_FLAG(output)) ||
-      ParseBoolFlag(arg, kPrintTimeFlag, &GTEST_FLAG(print_time)) ||
-      ParseBoolFlag(arg, kPrintUTF8Flag, &GTEST_FLAG(print_utf8)) ||
-      ParseInt32Flag(arg, kRandomSeedFlag, &GTEST_FLAG(random_seed)) ||
-      ParseInt32Flag(arg, kRepeatFlag, &GTEST_FLAG(repeat)) ||
-      ParseBoolFlag(arg, kShuffleFlag, &GTEST_FLAG(shuffle)) ||
-      ParseInt32Flag(arg, kStackTraceDepthFlag,
-                     &GTEST_FLAG(stack_trace_depth)) ||
-      ParseStringFlag(arg, kStreamResultToFlag,
-                      &GTEST_FLAG(stream_result_to)) ||
-      ParseBoolFlag(arg, kThrowOnFailureFlag,
-                    &GTEST_FLAG(throw_on_failure));
-}
-
-#if GTEST_USE_OWN_FLAGFILE_FLAG_
-static void LoadFlagsFromFile(const std::string& path) {
-  FILE* flagfile = posix::FOpen(path.c_str(), "r");
-  if (!flagfile) {
-    GTEST_LOG_(FATAL) << "Unable to open file \"" << GTEST_FLAG(flagfile)
-                      << "\"";
-  }
-  std::string contents(ReadEntireFile(flagfile));
-  posix::FClose(flagfile);
-  std::vector<std::string> lines;
-  SplitString(contents, '\n', &lines);
-  for (size_t i = 0; i < lines.size(); ++i) {
-    if (lines[i].empty())
-      continue;
-    if (!ParseGoogleTestFlag(lines[i].c_str()))
-      g_help_flag = true;
-  }
-}
-#endif  // GTEST_USE_OWN_FLAGFILE_FLAG_
-
-// Parses the command line for Google Test flags, without initializing
-// other parts of Google Test.  The type parameter CharType can be
-// instantiated to either char or wchar_t.
-template <typename CharType>
-void ParseGoogleTestFlagsOnlyImpl(int* argc, CharType** argv) {
-  for (int i = 1; i < *argc; i++) {
-    const std::string arg_string = StreamableToString(argv[i]);
-    const char* const arg = arg_string.c_str();
-
-    using internal::ParseBoolFlag;
-    using internal::ParseInt32Flag;
-#ifdef __SUNPRO_CC
-    // https://community.oracle.com/thread/4106985
-    // Assertion: (../lnk/symdescr.cc, line 96) while processing ....
-#else
-    using internal::ParseStringFlag;
-#endif
-
-    bool remove_flag = false;
-    if (ParseGoogleTestFlag(arg)) {
-      remove_flag = true;
-#if GTEST_USE_OWN_FLAGFILE_FLAG_
-    } else if (ParseStringFlag(arg, kFlagfileFlag, &GTEST_FLAG(flagfile))) {
-      LoadFlagsFromFile(GTEST_FLAG(flagfile));
-      remove_flag = true;
-#endif  // GTEST_USE_OWN_FLAGFILE_FLAG_
-    } else if (arg_string == "--help" || arg_string == "-h" ||
-               arg_string == "-?" || arg_string == "/?" ||
-               HasGoogleTestFlagPrefix(arg)) {
-      // Both help flag and unrecognized Google Test flags (excluding
-      // internal ones) trigger help display.
-      g_help_flag = true;
-    }
-
-    if (remove_flag) {
-      // Shift the remainder of the argv list left by one.  Note
-      // that argv has (*argc + 1) elements, the last one always being
-      // NULL.  The following loop moves the trailing NULL element as
-      // well.
-      for (int j = i; j != *argc; j++) {
-        argv[j] = argv[j + 1];
-      }
-
-      // Decrements the argument count.
-      (*argc)--;
-
-      // We also need to decrement the iterator as we just removed
-      // an element.
-      i--;
-    }
-  }
-
-  if (g_help_flag) {
-    // We print the help here instead of in RUN_ALL_TESTS(), as the
-    // latter may not be called at all if the user is using Google
-    // Test with another testing framework.
-    PrintColorEncoded(kColorEncodedHelpMessage);
-  }
-}
-
-// Parses the command line for Google Test flags, without initializing
-// other parts of Google Test.
-void ParseGoogleTestFlagsOnly(int* argc, char** argv) {
-  ParseGoogleTestFlagsOnlyImpl(argc, argv);
-
-  // Fix the value of *_NSGetArgc() on macOS, but if and only if
-  // *_NSGetArgv() == argv
-  // Only applicable to char** version of argv
-#if GTEST_OS_MAC
-#ifndef GTEST_OS_IOS
-  if (*_NSGetArgv() == argv) {
-    *_NSGetArgc() = *argc;
-  }
-#endif
-#endif
-}
-void ParseGoogleTestFlagsOnly(int* argc, wchar_t** argv) {
-  ParseGoogleTestFlagsOnlyImpl(argc, argv);
-}
-
-// The internal implementation of InitGoogleTest().
-//
-// The type parameter CharType can be instantiated to either char or
-// wchar_t.
-template <typename CharType>
-void InitGoogleTestImpl(int* argc, CharType** argv) {
-  // We don't want to run the initialization code twice.
-  if (GTestIsInitialized()) return;
-
-  if (*argc <= 0) return;
-
-  g_argvs.clear();
-  for (int i = 0; i != *argc; i++) {
-    g_argvs.push_back(StreamableToString(argv[i]));
-  }
-
-#if GTEST_HAS_ABSL
-  absl::InitializeSymbolizer(g_argvs[0].c_str());
-#endif  // GTEST_HAS_ABSL
-
-  ParseGoogleTestFlagsOnly(argc, argv);
-  GetUnitTestImpl()->PostFlagParsingInit();
-}
-
-}  // namespace internal
-
-// Initializes Google Test.  This must be called before calling
-// RUN_ALL_TESTS().  In particular, it parses a command line for the
-// flags that Google Test recognizes.  Whenever a Google Test flag is
-// seen, it is removed from argv, and *argc is decremented.
-//
-// No value is returned.  Instead, the Google Test flag variables are
-// updated.
-//
-// Calling the function for the second time has no user-visible effect.
-void InitGoogleTest(int* argc, char** argv) {
-#if defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
-  GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_(argc, argv);
-#else  // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
-  internal::InitGoogleTestImpl(argc, argv);
-#endif  // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
-}
-
-// This overloaded version can be used in Windows programs compiled in
-// UNICODE mode.
-void InitGoogleTest(int* argc, wchar_t** argv) {
-#if defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
-  GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_(argc, argv);
-#else  // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
-  internal::InitGoogleTestImpl(argc, argv);
-#endif  // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
-}
-
-// This overloaded version can be used on Arduino/embedded platforms where
-// there is no argc/argv.
-void InitGoogleTest() {
-  // Since Arduino doesn't have a command line, fake out the argc/argv arguments
-  int argc = 1;
-  const auto arg0 = "dummy";
-  char* argv0 = const_cast<char*>(arg0);
-  char** argv = &argv0;
-
-#if defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
-  GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_(&argc, argv);
-#else  // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
-  internal::InitGoogleTestImpl(&argc, argv);
-#endif  // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
-}
-
-std::string TempDir() {
-#if defined(GTEST_CUSTOM_TEMPDIR_FUNCTION_)
-  return GTEST_CUSTOM_TEMPDIR_FUNCTION_();
-#endif
-
-#if GTEST_OS_WINDOWS_MOBILE
-  return "\\temp\\";
-#elif GTEST_OS_WINDOWS
-  const char* temp_dir = internal::posix::GetEnv("TEMP");
-  if (temp_dir == nullptr || temp_dir[0] == '\0')
-    return "\\temp\\";
-  else if (temp_dir[strlen(temp_dir) - 1] == '\\')
-    return temp_dir;
-  else
-    return std::string(temp_dir) + "\\";
-#elif GTEST_OS_LINUX_ANDROID
-  return "/sdcard/";
-#else
-  return "/tmp/";
-#endif  // GTEST_OS_WINDOWS_MOBILE
-}
-
-// Class ScopedTrace
-
-// Pushes the given source file location and message onto a per-thread
-// trace stack maintained by Google Test.
-void ScopedTrace::PushTrace(const char* file, int line, std::string message) {
-  internal::TraceInfo trace;
-  trace.file = file;
-  trace.line = line;
-  trace.message.swap(message);
-
-  UnitTest::GetInstance()->PushGTestTrace(trace);
-}
-
-// Pops the info pushed by the c'tor.
-ScopedTrace::~ScopedTrace()
-    GTEST_LOCK_EXCLUDED_(&UnitTest::mutex_) {
-  UnitTest::GetInstance()->PopGTestTrace();
-}
-
-}  // namespace testing
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/src/gtest-death-test.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/src/gtest-death-test.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/src/gtest-death-test.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/src/gtest-death-test.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,1653 +0,0 @@
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-//
-// This file implements death tests.
-
-#include "gtest/gtest-death-test.h"
-
-#include <utility>
-
-#include "gtest/internal/gtest-port.h"
-#include "gtest/internal/custom/gtest.h"
-
-#if GTEST_HAS_DEATH_TEST
-
-# if GTEST_OS_MAC
-#  include <crt_externs.h>
-# endif  // GTEST_OS_MAC
-
-# include <errno.h>
-# include <fcntl.h>
-# include <limits.h>
-
-# if GTEST_OS_LINUX
-#  include <signal.h>
-# endif  // GTEST_OS_LINUX
-
-# include <stdarg.h>
-
-# if GTEST_OS_WINDOWS
-#  include <windows.h>
-# else
-#  include <sys/mman.h>
-#  include <sys/wait.h>
-# endif  // GTEST_OS_WINDOWS
-
-# if GTEST_OS_QNX
-#  include <spawn.h>
-# endif  // GTEST_OS_QNX
-
-# if GTEST_OS_FUCHSIA
-#  include <lib/fdio/fd.h>
-#  include <lib/fdio/io.h>
-#  include <lib/fdio/spawn.h>
-#  include <lib/zx/channel.h>
-#  include <lib/zx/port.h>
-#  include <lib/zx/process.h>
-#  include <lib/zx/socket.h>
-#  include <zircon/processargs.h>
-#  include <zircon/syscalls.h>
-#  include <zircon/syscalls/policy.h>
-#  include <zircon/syscalls/port.h>
-# endif  // GTEST_OS_FUCHSIA
-
-#endif  // GTEST_HAS_DEATH_TEST
-
-#include "gtest/gtest-message.h"
-#include "gtest/internal/gtest-string.h"
-#include "src/gtest-internal-inl.h"
-
-namespace testing {
-
-// Constants.
-
-// The default death test style.
-//
-// This is defined in internal/gtest-port.h as "fast", but can be overridden by
-// a definition in internal/custom/gtest-port.h. The recommended value, which is
-// used internally at Google, is "threadsafe".
-static const char kDefaultDeathTestStyle[] = GTEST_DEFAULT_DEATH_TEST_STYLE;
-
-GTEST_DEFINE_string_(
-    death_test_style,
-    internal::StringFromGTestEnv("death_test_style", kDefaultDeathTestStyle),
-    "Indicates how to run a death test in a forked child process: "
-    "\"threadsafe\" (child process re-executes the test binary "
-    "from the beginning, running only the specific death test) or "
-    "\"fast\" (child process runs the death test immediately "
-    "after forking).");
-
-GTEST_DEFINE_bool_(
-    death_test_use_fork,
-    internal::BoolFromGTestEnv("death_test_use_fork", false),
-    "Instructs to use fork()/_exit() instead of clone() in death tests. "
-    "Ignored and always uses fork() on POSIX systems where clone() is not "
-    "implemented. Useful when running under valgrind or similar tools if "
-    "those do not support clone(). Valgrind 3.3.1 will just fail if "
-    "it sees an unsupported combination of clone() flags. "
-    "It is not recommended to use this flag w/o valgrind though it will "
-    "work in 99% of the cases. Once valgrind is fixed, this flag will "
-    "most likely be removed.");
-
-namespace internal {
-GTEST_DEFINE_string_(
-    internal_run_death_test, "",
-    "Indicates the file, line number, temporal index of "
-    "the single death test to run, and a file descriptor to "
-    "which a success code may be sent, all separated by "
-    "the '|' characters.  This flag is specified if and only if the "
-    "current process is a sub-process launched for running a thread-safe "
-    "death test.  FOR INTERNAL USE ONLY.");
-}  // namespace internal
-
-#if GTEST_HAS_DEATH_TEST
-
-namespace internal {
-
-// Valid only for fast death tests. Indicates the code is running in the
-// child process of a fast style death test.
-# if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
-static bool g_in_fast_death_test_child = false;
-# endif
-
-// Returns a Boolean value indicating whether the caller is currently
-// executing in the context of the death test child process.  Tools such as
-// Valgrind heap checkers may need this to modify their behavior in death
-// tests.  IMPORTANT: This is an internal utility.  Using it may break the
-// implementation of death tests.  User code MUST NOT use it.
-bool InDeathTestChild() {
-# if GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
-
-  // On Windows and Fuchsia, death tests are thread-safe regardless of the value
-  // of the death_test_style flag.
-  return !GTEST_FLAG(internal_run_death_test).empty();
-
-# else
-
-  if (GTEST_FLAG(death_test_style) == "threadsafe")
-    return !GTEST_FLAG(internal_run_death_test).empty();
-  else
-    return g_in_fast_death_test_child;
-#endif
-}
-
-}  // namespace internal
-
-// ExitedWithCode constructor.
-ExitedWithCode::ExitedWithCode(int exit_code) : exit_code_(exit_code) {
-}
-
-// ExitedWithCode function-call operator.
-bool ExitedWithCode::operator()(int exit_status) const {
-# if GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
-
-  return exit_status == exit_code_;
-
-# else
-
-  return WIFEXITED(exit_status) && WEXITSTATUS(exit_status) == exit_code_;
-
-# endif  // GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
-}
-
-# if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
-// KilledBySignal constructor.
-KilledBySignal::KilledBySignal(int signum) : signum_(signum) {
-}
-
-// KilledBySignal function-call operator.
-bool KilledBySignal::operator()(int exit_status) const {
-#  if defined(GTEST_KILLED_BY_SIGNAL_OVERRIDE_)
-  {
-    bool result;
-    if (GTEST_KILLED_BY_SIGNAL_OVERRIDE_(signum_, exit_status, &result)) {
-      return result;
-    }
-  }
-#  endif  // defined(GTEST_KILLED_BY_SIGNAL_OVERRIDE_)
-  return WIFSIGNALED(exit_status) && WTERMSIG(exit_status) == signum_;
-}
-# endif  // !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
-
-namespace internal {
-
-// Utilities needed for death tests.
-
-// Generates a textual description of a given exit code, in the format
-// specified by wait(2).
-static std::string ExitSummary(int exit_code) {
-  Message m;
-
-# if GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
-
-  m << "Exited with exit status " << exit_code;
-
-# else
-
-  if (WIFEXITED(exit_code)) {
-    m << "Exited with exit status " << WEXITSTATUS(exit_code);
-  } else if (WIFSIGNALED(exit_code)) {
-    m << "Terminated by signal " << WTERMSIG(exit_code);
-  }
-#  ifdef WCOREDUMP
-  if (WCOREDUMP(exit_code)) {
-    m << " (core dumped)";
-  }
-#  endif
-# endif  // GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
-
-  return m.GetString();
-}
-
-// Returns true if exit_status describes a process that was terminated
-// by a signal, or exited normally with a nonzero exit code.
-bool ExitedUnsuccessfully(int exit_status) {
-  return !ExitedWithCode(0)(exit_status);
-}
-
-# if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
-// Generates a textual failure message when a death test finds more than
-// one thread running, or cannot determine the number of threads, prior
-// to executing the given statement.  It is the responsibility of the
-// caller not to pass a thread_count of 1.
-static std::string DeathTestThreadWarning(size_t thread_count) {
-  Message msg;
-  msg << "Death tests use fork(), which is unsafe particularly"
-      << " in a threaded context. For this test, " << GTEST_NAME_ << " ";
-  if (thread_count == 0) {
-    msg << "couldn't detect the number of threads.";
-  } else {
-    msg << "detected " << thread_count << " threads.";
-  }
-  msg << " See "
-         "https://github.com/google/googletest/blob/master/googletest/docs/"
-         "advanced.md#death-tests-and-threads"
-      << " for more explanation and suggested solutions, especially if"
-      << " this is the last message you see before your test times out.";
-  return msg.GetString();
-}
-# endif  // !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
-
-// Flag characters for reporting a death test that did not die.
-static const char kDeathTestLived = 'L';
-static const char kDeathTestReturned = 'R';
-static const char kDeathTestThrew = 'T';
-static const char kDeathTestInternalError = 'I';
-
-#if GTEST_OS_FUCHSIA
-
-// File descriptor used for the pipe in the child process.
-static const int kFuchsiaReadPipeFd = 3;
-
-#endif
-
-// An enumeration describing all of the possible ways that a death test can
-// conclude.  DIED means that the process died while executing the test
-// code; LIVED means that process lived beyond the end of the test code;
-// RETURNED means that the test statement attempted to execute a return
-// statement, which is not allowed; THREW means that the test statement
-// returned control by throwing an exception.  IN_PROGRESS means the test
-// has not yet concluded.
-enum DeathTestOutcome { IN_PROGRESS, DIED, LIVED, RETURNED, THREW };
-
-// Routine for aborting the program which is safe to call from an
-// exec-style death test child process, in which case the error
-// message is propagated back to the parent process.  Otherwise, the
-// message is simply printed to stderr.  In either case, the program
-// then exits with status 1.
-static void DeathTestAbort(const std::string& message) {
-  // On a POSIX system, this function may be called from a threadsafe-style
-  // death test child process, which operates on a very small stack.  Use
-  // the heap for any additional non-minuscule memory requirements.
-  const InternalRunDeathTestFlag* const flag =
-      GetUnitTestImpl()->internal_run_death_test_flag();
-  if (flag != nullptr) {
-    FILE* parent = posix::FDOpen(flag->write_fd(), "w");
-    fputc(kDeathTestInternalError, parent);
-    fprintf(parent, "%s", message.c_str());
-    fflush(parent);
-    _exit(1);
-  } else {
-    fprintf(stderr, "%s", message.c_str());
-    fflush(stderr);
-    posix::Abort();
-  }
-}
-
-// A replacement for CHECK that calls DeathTestAbort if the assertion
-// fails.
-# define GTEST_DEATH_TEST_CHECK_(expression) \
-  do { \
-    if (!::testing::internal::IsTrue(expression)) { \
-      DeathTestAbort( \
-          ::std::string("CHECK failed: File ") + __FILE__ +  ", line " \
-          + ::testing::internal::StreamableToString(__LINE__) + ": " \
-          + #expression); \
-    } \
-  } while (::testing::internal::AlwaysFalse())
-
-// This macro is similar to GTEST_DEATH_TEST_CHECK_, but it is meant for
-// evaluating any system call that fulfills two conditions: it must return
-// -1 on failure, and set errno to EINTR when it is interrupted and
-// should be tried again.  The macro expands to a loop that repeatedly
-// evaluates the expression as long as it evaluates to -1 and sets
-// errno to EINTR.  If the expression evaluates to -1 but errno is
-// something other than EINTR, DeathTestAbort is called.
-# define GTEST_DEATH_TEST_CHECK_SYSCALL_(expression) \
-  do { \
-    int gtest_retval; \
-    do { \
-      gtest_retval = (expression); \
-    } while (gtest_retval == -1 && errno == EINTR); \
-    if (gtest_retval == -1) { \
-      DeathTestAbort( \
-          ::std::string("CHECK failed: File ") + __FILE__ + ", line " \
-          + ::testing::internal::StreamableToString(__LINE__) + ": " \
-          + #expression + " != -1"); \
-    } \
-  } while (::testing::internal::AlwaysFalse())
-
-// Returns the message describing the last system error in errno.
-std::string GetLastErrnoDescription() {
-    return errno == 0 ? "" : posix::StrError(errno);
-}
-
-// This is called from a death test parent process to read a failure
-// message from the death test child process and log it with the FATAL
-// severity. On Windows, the message is read from a pipe handle. On other
-// platforms, it is read from a file descriptor.
-static void FailFromInternalError(int fd) {
-  Message error;
-  char buffer[256];
-  int num_read;
-
-  do {
-    while ((num_read = posix::Read(fd, buffer, 255)) > 0) {
-      buffer[num_read] = '\0';
-      error << buffer;
-    }
-  } while (num_read == -1 && errno == EINTR);
-
-  if (num_read == 0) {
-    GTEST_LOG_(FATAL) << error.GetString();
-  } else {
-    const int last_error = errno;
-    GTEST_LOG_(FATAL) << "Error while reading death test internal: "
-                      << GetLastErrnoDescription() << " [" << last_error << "]";
-  }
-}
-
-// Death test constructor.  Increments the running death test count
-// for the current test.
-DeathTest::DeathTest() {
-  TestInfo* const info = GetUnitTestImpl()->current_test_info();
-  if (info == nullptr) {
-    DeathTestAbort("Cannot run a death test outside of a TEST or "
-                   "TEST_F construct");
-  }
-}
-
-// Creates and returns a death test by dispatching to the current
-// death test factory.
-bool DeathTest::Create(const char* statement,
-                       Matcher<const std::string&> matcher, const char* file,
-                       int line, DeathTest** test) {
-  return GetUnitTestImpl()->death_test_factory()->Create(
-      statement, std::move(matcher), file, line, test);
-}
-
-const char* DeathTest::LastMessage() {
-  return last_death_test_message_.c_str();
-}
-
-void DeathTest::set_last_death_test_message(const std::string& message) {
-  last_death_test_message_ = message;
-}
-
-std::string DeathTest::last_death_test_message_;
-
-// Provides cross platform implementation for some death functionality.
-class DeathTestImpl : public DeathTest {
- protected:
-  DeathTestImpl(const char* a_statement, Matcher<const std::string&> matcher)
-      : statement_(a_statement),
-        matcher_(std::move(matcher)),
-        spawned_(false),
-        status_(-1),
-        outcome_(IN_PROGRESS),
-        read_fd_(-1),
-        write_fd_(-1) {}
-
-  // read_fd_ is expected to be closed and cleared by a derived class.
-  ~DeathTestImpl() override { GTEST_DEATH_TEST_CHECK_(read_fd_ == -1); }
-
-  void Abort(AbortReason reason) override;
-  bool Passed(bool status_ok) override;
-
-  const char* statement() const { return statement_; }
-  bool spawned() const { return spawned_; }
-  void set_spawned(bool is_spawned) { spawned_ = is_spawned; }
-  int status() const { return status_; }
-  void set_status(int a_status) { status_ = a_status; }
-  DeathTestOutcome outcome() const { return outcome_; }
-  void set_outcome(DeathTestOutcome an_outcome) { outcome_ = an_outcome; }
-  int read_fd() const { return read_fd_; }
-  void set_read_fd(int fd) { read_fd_ = fd; }
-  int write_fd() const { return write_fd_; }
-  void set_write_fd(int fd) { write_fd_ = fd; }
-
-  // Called in the parent process only. Reads the result code of the death
-  // test child process via a pipe, interprets it to set the outcome_
-  // member, and closes read_fd_.  Outputs diagnostics and terminates in
-  // case of unexpected codes.
-  void ReadAndInterpretStatusByte();
-
-  // Returns stderr output from the child process.
-  virtual std::string GetErrorLogs();
-
- private:
-  // The textual content of the code this object is testing.  This class
-  // doesn't own this string and should not attempt to delete it.
-  const char* const statement_;
-  // A matcher that's expected to match the stderr output by the child process.
-  Matcher<const std::string&> matcher_;
-  // True if the death test child process has been successfully spawned.
-  bool spawned_;
-  // The exit status of the child process.
-  int status_;
-  // How the death test concluded.
-  DeathTestOutcome outcome_;
-  // Descriptor to the read end of the pipe to the child process.  It is
-  // always -1 in the child process.  The child keeps its write end of the
-  // pipe in write_fd_.
-  int read_fd_;
-  // Descriptor to the child's write end of the pipe to the parent process.
-  // It is always -1 in the parent process.  The parent keeps its end of the
-  // pipe in read_fd_.
-  int write_fd_;
-};
-
-// Called in the parent process only. Reads the result code of the death
-// test child process via a pipe, interprets it to set the outcome_
-// member, and closes read_fd_.  Outputs diagnostics and terminates in
-// case of unexpected codes.
-void DeathTestImpl::ReadAndInterpretStatusByte() {
-  char flag;
-  int bytes_read;
-
-  // The read() here blocks until data is available (signifying the
-  // failure of the death test) or until the pipe is closed (signifying
-  // its success), so it's okay to call this in the parent before
-  // the child process has exited.
-  do {
-    bytes_read = posix::Read(read_fd(), &flag, 1);
-  } while (bytes_read == -1 && errno == EINTR);
-
-  if (bytes_read == 0) {
-    set_outcome(DIED);
-  } else if (bytes_read == 1) {
-    switch (flag) {
-      case kDeathTestReturned:
-        set_outcome(RETURNED);
-        break;
-      case kDeathTestThrew:
-        set_outcome(THREW);
-        break;
-      case kDeathTestLived:
-        set_outcome(LIVED);
-        break;
-      case kDeathTestInternalError:
-        FailFromInternalError(read_fd());  // Does not return.
-        break;
-      default:
-        GTEST_LOG_(FATAL) << "Death test child process reported "
-                          << "unexpected status byte ("
-                          << static_cast<unsigned int>(flag) << ")";
-    }
-  } else {
-    GTEST_LOG_(FATAL) << "Read from death test child process failed: "
-                      << GetLastErrnoDescription();
-  }
-  GTEST_DEATH_TEST_CHECK_SYSCALL_(posix::Close(read_fd()));
-  set_read_fd(-1);
-}
-
-std::string DeathTestImpl::GetErrorLogs() {
-  return GetCapturedStderr();
-}
-
-// Signals that the death test code which should have exited, didn't.
-// Should be called only in a death test child process.
-// Writes a status byte to the child's status file descriptor, then
-// calls _exit(1).
-void DeathTestImpl::Abort(AbortReason reason) {
-  // The parent process considers the death test to be a failure if
-  // it finds any data in our pipe.  So, here we write a single flag byte
-  // to the pipe, then exit.
-  const char status_ch =
-      reason == TEST_DID_NOT_DIE ? kDeathTestLived :
-      reason == TEST_THREW_EXCEPTION ? kDeathTestThrew : kDeathTestReturned;
-
-  GTEST_DEATH_TEST_CHECK_SYSCALL_(posix::Write(write_fd(), &status_ch, 1));
-  // We are leaking the descriptor here because on some platforms (i.e.,
-  // when built as Windows DLL), destructors of global objects will still
-  // run after calling _exit(). On such systems, write_fd_ will be
-  // indirectly closed from the destructor of UnitTestImpl, causing double
-  // close if it is also closed here. On debug configurations, double close
-  // may assert. As there are no in-process buffers to flush here, we are
-  // relying on the OS to close the descriptor after the process terminates
-  // when the destructors are not run.
-  _exit(1);  // Exits w/o any normal exit hooks (we were supposed to crash)
-}
-
-// Returns an indented copy of stderr output for a death test.
-// This makes distinguishing death test output lines from regular log lines
-// much easier.
-static ::std::string FormatDeathTestOutput(const ::std::string& output) {
-  ::std::string ret;
-  for (size_t at = 0; ; ) {
-    const size_t line_end = output.find('\n', at);
-    ret += "[  DEATH   ] ";
-    if (line_end == ::std::string::npos) {
-      ret += output.substr(at);
-      break;
-    }
-    ret += output.substr(at, line_end + 1 - at);
-    at = line_end + 1;
-  }
-  return ret;
-}
-
-// Assesses the success or failure of a death test, using both private
-// members which have previously been set, and one argument:
-//
-// Private data members:
-//   outcome:  An enumeration describing how the death test
-//             concluded: DIED, LIVED, THREW, or RETURNED.  The death test
-//             fails in the latter three cases.
-//   status:   The exit status of the child process. On *nix, it is in the
-//             in the format specified by wait(2). On Windows, this is the
-//             value supplied to the ExitProcess() API or a numeric code
-//             of the exception that terminated the program.
-//   matcher_: A matcher that's expected to match the stderr output by the child
-//             process.
-//
-// Argument:
-//   status_ok: true if exit_status is acceptable in the context of
-//              this particular death test, which fails if it is false
-//
-// Returns true if and only if all of the above conditions are met.  Otherwise,
-// the first failing condition, in the order given above, is the one that is
-// reported. Also sets the last death test message string.
-bool DeathTestImpl::Passed(bool status_ok) {
-  if (!spawned())
-    return false;
-
-  const std::string error_message = GetErrorLogs();
-
-  bool success = false;
-  Message buffer;
-
-  buffer << "Death test: " << statement() << "\n";
-  switch (outcome()) {
-    case LIVED:
-      buffer << "    Result: failed to die.\n"
-             << " Error msg:\n" << FormatDeathTestOutput(error_message);
-      break;
-    case THREW:
-      buffer << "    Result: threw an exception.\n"
-             << " Error msg:\n" << FormatDeathTestOutput(error_message);
-      break;
-    case RETURNED:
-      buffer << "    Result: illegal return in test statement.\n"
-             << " Error msg:\n" << FormatDeathTestOutput(error_message);
-      break;
-    case DIED:
-      if (status_ok) {
-        if (matcher_.Matches(error_message)) {
-          success = true;
-        } else {
-          std::ostringstream stream;
-          matcher_.DescribeTo(&stream);
-          buffer << "    Result: died but not with expected error.\n"
-                 << "  Expected: " << stream.str() << "\n"
-                 << "Actual msg:\n"
-                 << FormatDeathTestOutput(error_message);
-        }
-      } else {
-        buffer << "    Result: died but not with expected exit code:\n"
-               << "            " << ExitSummary(status()) << "\n"
-               << "Actual msg:\n" << FormatDeathTestOutput(error_message);
-      }
-      break;
-    case IN_PROGRESS:
-    default:
-      GTEST_LOG_(FATAL)
-          << "DeathTest::Passed somehow called before conclusion of test";
-  }
-
-  DeathTest::set_last_death_test_message(buffer.GetString());
-  return success;
-}
-
-# if GTEST_OS_WINDOWS
-// WindowsDeathTest implements death tests on Windows. Due to the
-// specifics of starting new processes on Windows, death tests there are
-// always threadsafe, and Google Test considers the
-// --gtest_death_test_style=fast setting to be equivalent to
-// --gtest_death_test_style=threadsafe there.
-//
-// A few implementation notes:  Like the Linux version, the Windows
-// implementation uses pipes for child-to-parent communication. But due to
-// the specifics of pipes on Windows, some extra steps are required:
-//
-// 1. The parent creates a communication pipe and stores handles to both
-//    ends of it.
-// 2. The parent starts the child and provides it with the information
-//    necessary to acquire the handle to the write end of the pipe.
-// 3. The child acquires the write end of the pipe and signals the parent
-//    using a Windows event.
-// 4. Now the parent can release the write end of the pipe on its side. If
-//    this is done before step 3, the object's reference count goes down to
-//    0 and it is destroyed, preventing the child from acquiring it. The
-//    parent now has to release it, or read operations on the read end of
-//    the pipe will not return when the child terminates.
-// 5. The parent reads child's output through the pipe (outcome code and
-//    any possible error messages) from the pipe, and its stderr and then
-//    determines whether to fail the test.
-//
-// Note: to distinguish Win32 API calls from the local method and function
-// calls, the former are explicitly resolved in the global namespace.
-//
-class WindowsDeathTest : public DeathTestImpl {
- public:
-  WindowsDeathTest(const char* a_statement, Matcher<const std::string&> matcher,
-                   const char* file, int line)
-      : DeathTestImpl(a_statement, std::move(matcher)),
-        file_(file),
-        line_(line) {}
-
-  // All of these virtual functions are inherited from DeathTest.
-  virtual int Wait();
-  virtual TestRole AssumeRole();
-
- private:
-  // The name of the file in which the death test is located.
-  const char* const file_;
-  // The line number on which the death test is located.
-  const int line_;
-  // Handle to the write end of the pipe to the child process.
-  AutoHandle write_handle_;
-  // Child process handle.
-  AutoHandle child_handle_;
-  // Event the child process uses to signal the parent that it has
-  // acquired the handle to the write end of the pipe. After seeing this
-  // event the parent can release its own handles to make sure its
-  // ReadFile() calls return when the child terminates.
-  AutoHandle event_handle_;
-};
-
-// Waits for the child in a death test to exit, returning its exit
-// status, or 0 if no child process exists.  As a side effect, sets the
-// outcome data member.
-int WindowsDeathTest::Wait() {
-  if (!spawned())
-    return 0;
-
-  // Wait until the child either signals that it has acquired the write end
-  // of the pipe or it dies.
-  const HANDLE wait_handles[2] = { child_handle_.Get(), event_handle_.Get() };
-  switch (::WaitForMultipleObjects(2,
-                                   wait_handles,
-                                   FALSE,  // Waits for any of the handles.
-                                   INFINITE)) {
-    case WAIT_OBJECT_0:
-    case WAIT_OBJECT_0 + 1:
-      break;
-    default:
-      GTEST_DEATH_TEST_CHECK_(false);  // Should not get here.
-  }
-
-  // The child has acquired the write end of the pipe or exited.
-  // We release the handle on our side and continue.
-  write_handle_.Reset();
-  event_handle_.Reset();
-
-  ReadAndInterpretStatusByte();
-
-  // Waits for the child process to exit if it haven't already. This
-  // returns immediately if the child has already exited, regardless of
-  // whether previous calls to WaitForMultipleObjects synchronized on this
-  // handle or not.
-  GTEST_DEATH_TEST_CHECK_(
-      WAIT_OBJECT_0 == ::WaitForSingleObject(child_handle_.Get(),
-                                             INFINITE));
-  DWORD status_code;
-  GTEST_DEATH_TEST_CHECK_(
-      ::GetExitCodeProcess(child_handle_.Get(), &status_code) != FALSE);
-  child_handle_.Reset();
-  set_status(static_cast<int>(status_code));
-  return status();
-}
-
-// The AssumeRole process for a Windows death test.  It creates a child
-// process with the same executable as the current process to run the
-// death test.  The child process is given the --gtest_filter and
-// --gtest_internal_run_death_test flags such that it knows to run the
-// current death test only.
-DeathTest::TestRole WindowsDeathTest::AssumeRole() {
-  const UnitTestImpl* const impl = GetUnitTestImpl();
-  const InternalRunDeathTestFlag* const flag =
-      impl->internal_run_death_test_flag();
-  const TestInfo* const info = impl->current_test_info();
-  const int death_test_index = info->result()->death_test_count();
-
-  if (flag != nullptr) {
-    // ParseInternalRunDeathTestFlag() has performed all the necessary
-    // processing.
-    set_write_fd(flag->write_fd());
-    return EXECUTE_TEST;
-  }
-
-  // WindowsDeathTest uses an anonymous pipe to communicate results of
-  // a death test.
-  SECURITY_ATTRIBUTES handles_are_inheritable = {sizeof(SECURITY_ATTRIBUTES),
-                                                 nullptr, TRUE};
-  HANDLE read_handle, write_handle;
-  GTEST_DEATH_TEST_CHECK_(
-      ::CreatePipe(&read_handle, &write_handle, &handles_are_inheritable,
-                   0)  // Default buffer size.
-      != FALSE);
-  set_read_fd(::_open_osfhandle(reinterpret_cast<intptr_t>(read_handle),
-                                O_RDONLY));
-  write_handle_.Reset(write_handle);
-  event_handle_.Reset(::CreateEvent(
-      &handles_are_inheritable,
-      TRUE,       // The event will automatically reset to non-signaled state.
-      FALSE,      // The initial state is non-signalled.
-      nullptr));  // The even is unnamed.
-  GTEST_DEATH_TEST_CHECK_(event_handle_.Get() != nullptr);
-  const std::string filter_flag = std::string("--") + GTEST_FLAG_PREFIX_ +
-                                  kFilterFlag + "=" + info->test_suite_name() +
-                                  "." + info->name();
-  const std::string internal_flag =
-      std::string("--") + GTEST_FLAG_PREFIX_ + kInternalRunDeathTestFlag +
-      "=" + file_ + "|" + StreamableToString(line_) + "|" +
-      StreamableToString(death_test_index) + "|" +
-      StreamableToString(static_cast<unsigned int>(::GetCurrentProcessId())) +
-      // size_t has the same width as pointers on both 32-bit and 64-bit
-      // Windows platforms.
-      // See http://msdn.microsoft.com/en-us/library/tcxf1dw6.aspx.
-      "|" + StreamableToString(reinterpret_cast<size_t>(write_handle)) +
-      "|" + StreamableToString(reinterpret_cast<size_t>(event_handle_.Get()));
-
-  char executable_path[_MAX_PATH + 1];  // NOLINT
-  GTEST_DEATH_TEST_CHECK_(_MAX_PATH + 1 != ::GetModuleFileNameA(nullptr,
-                                                                executable_path,
-                                                                _MAX_PATH));
-
-  std::string command_line =
-      std::string(::GetCommandLineA()) + " " + filter_flag + " \"" +
-      internal_flag + "\"";
-
-  DeathTest::set_last_death_test_message("");
-
-  CaptureStderr();
-  // Flush the log buffers since the log streams are shared with the child.
-  FlushInfoLog();
-
-  // The child process will share the standard handles with the parent.
-  STARTUPINFOA startup_info;
-  memset(&startup_info, 0, sizeof(STARTUPINFO));
-  startup_info.dwFlags = STARTF_USESTDHANDLES;
-  startup_info.hStdInput = ::GetStdHandle(STD_INPUT_HANDLE);
-  startup_info.hStdOutput = ::GetStdHandle(STD_OUTPUT_HANDLE);
-  startup_info.hStdError = ::GetStdHandle(STD_ERROR_HANDLE);
-
-  PROCESS_INFORMATION process_info;
-  GTEST_DEATH_TEST_CHECK_(
-      ::CreateProcessA(
-          executable_path, const_cast<char*>(command_line.c_str()),
-          nullptr,  // Retuned process handle is not inheritable.
-          nullptr,  // Retuned thread handle is not inheritable.
-          TRUE,  // Child inherits all inheritable handles (for write_handle_).
-          0x0,   // Default creation flags.
-          nullptr,  // Inherit the parent's environment.
-          UnitTest::GetInstance()->original_working_dir(), &startup_info,
-          &process_info) != FALSE);
-  child_handle_.Reset(process_info.hProcess);
-  ::CloseHandle(process_info.hThread);
-  set_spawned(true);
-  return OVERSEE_TEST;
-}
-
-# elif GTEST_OS_FUCHSIA
-
-class FuchsiaDeathTest : public DeathTestImpl {
- public:
-  FuchsiaDeathTest(const char* a_statement, Matcher<const std::string&> matcher,
-                   const char* file, int line)
-      : DeathTestImpl(a_statement, std::move(matcher)),
-        file_(file),
-        line_(line) {}
-
-  // All of these virtual functions are inherited from DeathTest.
-  int Wait() override;
-  TestRole AssumeRole() override;
-  std::string GetErrorLogs() override;
-
- private:
-  // The name of the file in which the death test is located.
-  const char* const file_;
-  // The line number on which the death test is located.
-  const int line_;
-  // The stderr data captured by the child process.
-  std::string captured_stderr_;
-
-  zx::process child_process_;
-  zx::channel exception_channel_;
-  zx::socket stderr_socket_;
-};
-
-// Utility class for accumulating command-line arguments.
-class Arguments {
- public:
-  Arguments() { args_.push_back(nullptr); }
-
-  ~Arguments() {
-    for (std::vector<char*>::iterator i = args_.begin(); i != args_.end();
-         ++i) {
-      free(*i);
-    }
-  }
-  void AddArgument(const char* argument) {
-    args_.insert(args_.end() - 1, posix::StrDup(argument));
-  }
-
-  template <typename Str>
-  void AddArguments(const ::std::vector<Str>& arguments) {
-    for (typename ::std::vector<Str>::const_iterator i = arguments.begin();
-         i != arguments.end();
-         ++i) {
-      args_.insert(args_.end() - 1, posix::StrDup(i->c_str()));
-    }
-  }
-  char* const* Argv() {
-    return &args_[0];
-  }
-
-  int size() {
-    return args_.size() - 1;
-  }
-
- private:
-  std::vector<char*> args_;
-};
-
-// Waits for the child in a death test to exit, returning its exit
-// status, or 0 if no child process exists.  As a side effect, sets the
-// outcome data member.
-int FuchsiaDeathTest::Wait() {
-  const int kProcessKey = 0;
-  const int kSocketKey = 1;
-  const int kExceptionKey = 2;
-
-  if (!spawned())
-    return 0;
-
-  // Create a port to wait for socket/task/exception events.
-  zx_status_t status_zx;
-  zx::port port;
-  status_zx = zx::port::create(0, &port);
-  GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
-
-  // Register to wait for the child process to terminate.
-  status_zx = child_process_.wait_async(
-      port, kProcessKey, ZX_PROCESS_TERMINATED, ZX_WAIT_ASYNC_ONCE);
-  GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
-
-  // Register to wait for the socket to be readable or closed.
-  status_zx = stderr_socket_.wait_async(
-      port, kSocketKey, ZX_SOCKET_READABLE | ZX_SOCKET_PEER_CLOSED,
-      ZX_WAIT_ASYNC_ONCE);
-  GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
-
-  // Register to wait for an exception.
-  status_zx = exception_channel_.wait_async(
-      port, kExceptionKey, ZX_CHANNEL_READABLE, ZX_WAIT_ASYNC_ONCE);
-  GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
-
-  bool process_terminated = false;
-  bool socket_closed = false;
-  do {
-    zx_port_packet_t packet = {};
-    status_zx = port.wait(zx::time::infinite(), &packet);
-    GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
-
-    if (packet.key == kExceptionKey) {
-      // Process encountered an exception. Kill it directly rather than
-      // letting other handlers process the event. We will get a kProcessKey
-      // event when the process actually terminates.
-      status_zx = child_process_.kill();
-      GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
-    } else if (packet.key == kProcessKey) {
-      // Process terminated.
-      GTEST_DEATH_TEST_CHECK_(ZX_PKT_IS_SIGNAL_ONE(packet.type));
-      GTEST_DEATH_TEST_CHECK_(packet.signal.observed & ZX_PROCESS_TERMINATED);
-      process_terminated = true;
-    } else if (packet.key == kSocketKey) {
-      GTEST_DEATH_TEST_CHECK_(ZX_PKT_IS_SIGNAL_ONE(packet.type));
-      if (packet.signal.observed & ZX_SOCKET_READABLE) {
-        // Read data from the socket.
-        constexpr size_t kBufferSize = 1024;
-        do {
-          size_t old_length = captured_stderr_.length();
-          size_t bytes_read = 0;
-          captured_stderr_.resize(old_length + kBufferSize);
-          status_zx = stderr_socket_.read(
-              0, &captured_stderr_.front() + old_length, kBufferSize,
-              &bytes_read);
-          captured_stderr_.resize(old_length + bytes_read);
-        } while (status_zx == ZX_OK);
-        if (status_zx == ZX_ERR_PEER_CLOSED) {
-          socket_closed = true;
-        } else {
-          GTEST_DEATH_TEST_CHECK_(status_zx == ZX_ERR_SHOULD_WAIT);
-          status_zx = stderr_socket_.wait_async(
-              port, kSocketKey, ZX_SOCKET_READABLE | ZX_SOCKET_PEER_CLOSED,
-              ZX_WAIT_ASYNC_ONCE);
-          GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
-        }
-      } else {
-        GTEST_DEATH_TEST_CHECK_(packet.signal.observed & ZX_SOCKET_PEER_CLOSED);
-        socket_closed = true;
-      }
-    }
-  } while (!process_terminated && !socket_closed);
-
-  ReadAndInterpretStatusByte();
-
-  zx_info_process_t buffer;
-  status_zx = child_process_.get_info(
-      ZX_INFO_PROCESS, &buffer, sizeof(buffer), nullptr, nullptr);
-  GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
-
-  GTEST_DEATH_TEST_CHECK_(buffer.exited);
-  set_status(buffer.return_code);
-  return status();
-}
-
-// The AssumeRole process for a Fuchsia death test.  It creates a child
-// process with the same executable as the current process to run the
-// death test.  The child process is given the --gtest_filter and
-// --gtest_internal_run_death_test flags such that it knows to run the
-// current death test only.
-DeathTest::TestRole FuchsiaDeathTest::AssumeRole() {
-  const UnitTestImpl* const impl = GetUnitTestImpl();
-  const InternalRunDeathTestFlag* const flag =
-      impl->internal_run_death_test_flag();
-  const TestInfo* const info = impl->current_test_info();
-  const int death_test_index = info->result()->death_test_count();
-
-  if (flag != nullptr) {
-    // ParseInternalRunDeathTestFlag() has performed all the necessary
-    // processing.
-    set_write_fd(kFuchsiaReadPipeFd);
-    return EXECUTE_TEST;
-  }
-
-  // Flush the log buffers since the log streams are shared with the child.
-  FlushInfoLog();
-
-  // Build the child process command line.
-  const std::string filter_flag = std::string("--") + GTEST_FLAG_PREFIX_ +
-                                  kFilterFlag + "=" + info->test_suite_name() +
-                                  "." + info->name();
-  const std::string internal_flag =
-      std::string("--") + GTEST_FLAG_PREFIX_ + kInternalRunDeathTestFlag + "="
-      + file_ + "|"
-      + StreamableToString(line_) + "|"
-      + StreamableToString(death_test_index);
-  Arguments args;
-  args.AddArguments(GetInjectableArgvs());
-  args.AddArgument(filter_flag.c_str());
-  args.AddArgument(internal_flag.c_str());
-
-  // Build the pipe for communication with the child.
-  zx_status_t status;
-  zx_handle_t child_pipe_handle;
-  int child_pipe_fd;
-  status = fdio_pipe_half(&child_pipe_fd, &child_pipe_handle);
-  GTEST_DEATH_TEST_CHECK_(status == ZX_OK);
-  set_read_fd(child_pipe_fd);
-
-  // Set the pipe handle for the child.
-  fdio_spawn_action_t spawn_actions[2] = {};
-  fdio_spawn_action_t* add_handle_action = &spawn_actions[0];
-  add_handle_action->action = FDIO_SPAWN_ACTION_ADD_HANDLE;
-  add_handle_action->h.id = PA_HND(PA_FD, kFuchsiaReadPipeFd);
-  add_handle_action->h.handle = child_pipe_handle;
-
-  // Create a socket pair will be used to receive the child process' stderr.
-  zx::socket stderr_producer_socket;
-  status =
-      zx::socket::create(0, &stderr_producer_socket, &stderr_socket_);
-  GTEST_DEATH_TEST_CHECK_(status >= 0);
-  int stderr_producer_fd = -1;
-  status =
-      fdio_fd_create(stderr_producer_socket.release(), &stderr_producer_fd);
-  GTEST_DEATH_TEST_CHECK_(status >= 0);
-
-  // Make the stderr socket nonblocking.
-  GTEST_DEATH_TEST_CHECK_(fcntl(stderr_producer_fd, F_SETFL, 0) == 0);
-
-  fdio_spawn_action_t* add_stderr_action = &spawn_actions[1];
-  add_stderr_action->action = FDIO_SPAWN_ACTION_CLONE_FD;
-  add_stderr_action->fd.local_fd = stderr_producer_fd;
-  add_stderr_action->fd.target_fd = STDERR_FILENO;
-
-  // Create a child job.
-  zx_handle_t child_job = ZX_HANDLE_INVALID;
-  status = zx_job_create(zx_job_default(), 0, & child_job);
-  GTEST_DEATH_TEST_CHECK_(status == ZX_OK);
-  zx_policy_basic_t policy;
-  policy.condition = ZX_POL_NEW_ANY;
-  policy.policy = ZX_POL_ACTION_ALLOW;
-  status = zx_job_set_policy(
-      child_job, ZX_JOB_POL_RELATIVE, ZX_JOB_POL_BASIC, &policy, 1);
-  GTEST_DEATH_TEST_CHECK_(status == ZX_OK);
-
-  // Create an exception channel attached to the |child_job|, to allow
-  // us to suppress the system default exception handler from firing.
-  status =
-      zx_task_create_exception_channel(
-          child_job, 0, exception_channel_.reset_and_get_address());
-  GTEST_DEATH_TEST_CHECK_(status == ZX_OK);
-
-  // Spawn the child process.
-  status = fdio_spawn_etc(
-      child_job, FDIO_SPAWN_CLONE_ALL, args.Argv()[0], args.Argv(), nullptr,
-      2, spawn_actions, child_process_.reset_and_get_address(), nullptr);
-  GTEST_DEATH_TEST_CHECK_(status == ZX_OK);
-
-  set_spawned(true);
-  return OVERSEE_TEST;
-}
-
-std::string FuchsiaDeathTest::GetErrorLogs() {
-  return captured_stderr_;
-}
-
-#else  // We are neither on Windows, nor on Fuchsia.
-
-// ForkingDeathTest provides implementations for most of the abstract
-// methods of the DeathTest interface.  Only the AssumeRole method is
-// left undefined.
-class ForkingDeathTest : public DeathTestImpl {
- public:
-  ForkingDeathTest(const char* statement, Matcher<const std::string&> matcher);
-
-  // All of these virtual functions are inherited from DeathTest.
-  int Wait() override;
-
- protected:
-  void set_child_pid(pid_t child_pid) { child_pid_ = child_pid; }
-
- private:
-  // PID of child process during death test; 0 in the child process itself.
-  pid_t child_pid_;
-};
-
-// Constructs a ForkingDeathTest.
-ForkingDeathTest::ForkingDeathTest(const char* a_statement,
-                                   Matcher<const std::string&> matcher)
-    : DeathTestImpl(a_statement, std::move(matcher)), child_pid_(-1) {}
-
-// Waits for the child in a death test to exit, returning its exit
-// status, or 0 if no child process exists.  As a side effect, sets the
-// outcome data member.
-int ForkingDeathTest::Wait() {
-  if (!spawned())
-    return 0;
-
-  ReadAndInterpretStatusByte();
-
-  int status_value;
-  GTEST_DEATH_TEST_CHECK_SYSCALL_(waitpid(child_pid_, &status_value, 0));
-  set_status(status_value);
-  return status_value;
-}
-
-// A concrete death test class that forks, then immediately runs the test
-// in the child process.
-class NoExecDeathTest : public ForkingDeathTest {
- public:
-  NoExecDeathTest(const char* a_statement, Matcher<const std::string&> matcher)
-      : ForkingDeathTest(a_statement, std::move(matcher)) {}
-  TestRole AssumeRole() override;
-};
-
-// The AssumeRole process for a fork-and-run death test.  It implements a
-// straightforward fork, with a simple pipe to transmit the status byte.
-DeathTest::TestRole NoExecDeathTest::AssumeRole() {
-  const size_t thread_count = GetThreadCount();
-  if (thread_count != 1) {
-    GTEST_LOG_(WARNING) << DeathTestThreadWarning(thread_count);
-  }
-
-  int pipe_fd[2];
-  GTEST_DEATH_TEST_CHECK_(pipe(pipe_fd) != -1);
-
-  DeathTest::set_last_death_test_message("");
-  CaptureStderr();
-  // When we fork the process below, the log file buffers are copied, but the
-  // file descriptors are shared.  We flush all log files here so that closing
-  // the file descriptors in the child process doesn't throw off the
-  // synchronization between descriptors and buffers in the parent process.
-  // This is as close to the fork as possible to avoid a race condition in case
-  // there are multiple threads running before the death test, and another
-  // thread writes to the log file.
-  FlushInfoLog();
-
-  const pid_t child_pid = fork();
-  GTEST_DEATH_TEST_CHECK_(child_pid != -1);
-  set_child_pid(child_pid);
-  if (child_pid == 0) {
-    GTEST_DEATH_TEST_CHECK_SYSCALL_(close(pipe_fd[0]));
-    set_write_fd(pipe_fd[1]);
-    // Redirects all logging to stderr in the child process to prevent
-    // concurrent writes to the log files.  We capture stderr in the parent
-    // process and append the child process' output to a log.
-    LogToStderr();
-    // Event forwarding to the listeners of event listener API mush be shut
-    // down in death test subprocesses.
-    GetUnitTestImpl()->listeners()->SuppressEventForwarding();
-    g_in_fast_death_test_child = true;
-    return EXECUTE_TEST;
-  } else {
-    GTEST_DEATH_TEST_CHECK_SYSCALL_(close(pipe_fd[1]));
-    set_read_fd(pipe_fd[0]);
-    set_spawned(true);
-    return OVERSEE_TEST;
-  }
-}
-
-// A concrete death test class that forks and re-executes the main
-// program from the beginning, with command-line flags set that cause
-// only this specific death test to be run.
-class ExecDeathTest : public ForkingDeathTest {
- public:
-  ExecDeathTest(const char* a_statement, Matcher<const std::string&> matcher,
-                const char* file, int line)
-      : ForkingDeathTest(a_statement, std::move(matcher)),
-        file_(file),
-        line_(line) {}
-  TestRole AssumeRole() override;
-
- private:
-  static ::std::vector<std::string> GetArgvsForDeathTestChildProcess() {
-    ::std::vector<std::string> args = GetInjectableArgvs();
-#  if defined(GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_)
-    ::std::vector<std::string> extra_args =
-        GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_();
-    args.insert(args.end(), extra_args.begin(), extra_args.end());
-#  endif  // defined(GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_)
-    return args;
-  }
-  // The name of the file in which the death test is located.
-  const char* const file_;
-  // The line number on which the death test is located.
-  const int line_;
-};
-
-// Utility class for accumulating command-line arguments.
-class Arguments {
- public:
-  Arguments() { args_.push_back(nullptr); }
-
-  ~Arguments() {
-    for (std::vector<char*>::iterator i = args_.begin(); i != args_.end();
-         ++i) {
-      free(*i);
-    }
-  }
-  void AddArgument(const char* argument) {
-    args_.insert(args_.end() - 1, posix::StrDup(argument));
-  }
-
-  template <typename Str>
-  void AddArguments(const ::std::vector<Str>& arguments) {
-    for (typename ::std::vector<Str>::const_iterator i = arguments.begin();
-         i != arguments.end();
-         ++i) {
-      args_.insert(args_.end() - 1, posix::StrDup(i->c_str()));
-    }
-  }
-  char* const* Argv() {
-    return &args_[0];
-  }
-
- private:
-  std::vector<char*> args_;
-};
-
-// A struct that encompasses the arguments to the child process of a
-// threadsafe-style death test process.
-struct ExecDeathTestArgs {
-  char* const* argv;  // Command-line arguments for the child's call to exec
-  int close_fd;       // File descriptor to close; the read end of a pipe
-};
-
-#  if GTEST_OS_MAC
-inline char** GetEnviron() {
-  // When Google Test is built as a framework on MacOS X, the environ variable
-  // is unavailable. Apple's documentation (man environ) recommends using
-  // _NSGetEnviron() instead.
-  return *_NSGetEnviron();
-}
-#  else
-// Some POSIX platforms expect you to declare environ. extern "C" makes
-// it reside in the global namespace.
-extern "C" char** environ;
-inline char** GetEnviron() { return environ; }
-#  endif  // GTEST_OS_MAC
-
-#  if !GTEST_OS_QNX
-// The main function for a threadsafe-style death test child process.
-// This function is called in a clone()-ed process and thus must avoid
-// any potentially unsafe operations like malloc or libc functions.
-static int ExecDeathTestChildMain(void* child_arg) {
-  ExecDeathTestArgs* const args = static_cast<ExecDeathTestArgs*>(child_arg);
-  GTEST_DEATH_TEST_CHECK_SYSCALL_(close(args->close_fd));
-
-  // We need to execute the test program in the same environment where
-  // it was originally invoked.  Therefore we change to the original
-  // working directory first.
-  const char* const original_dir =
-      UnitTest::GetInstance()->original_working_dir();
-  // We can safely call chdir() as it's a direct system call.
-  if (chdir(original_dir) != 0) {
-    DeathTestAbort(std::string("chdir(\"") + original_dir + "\") failed: " +
-                   GetLastErrnoDescription());
-    return EXIT_FAILURE;
-  }
-
-  // We can safely call execve() as it's a direct system call.  We
-  // cannot use execvp() as it's a libc function and thus potentially
-  // unsafe.  Since execve() doesn't search the PATH, the user must
-  // invoke the test program via a valid path that contains at least
-  // one path separator.
-  execve(args->argv[0], args->argv, GetEnviron());
-  DeathTestAbort(std::string("execve(") + args->argv[0] + ", ...) in " +
-                 original_dir + " failed: " +
-                 GetLastErrnoDescription());
-  return EXIT_FAILURE;
-}
-#  endif  // !GTEST_OS_QNX
-
-#  if GTEST_HAS_CLONE
-// Two utility routines that together determine the direction the stack
-// grows.
-// This could be accomplished more elegantly by a single recursive
-// function, but we want to guard against the unlikely possibility of
-// a smart compiler optimizing the recursion away.
-//
-// GTEST_NO_INLINE_ is required to prevent GCC 4.6 from inlining
-// StackLowerThanAddress into StackGrowsDown, which then doesn't give
-// correct answer.
-static void StackLowerThanAddress(const void* ptr,
-                                  bool* result) GTEST_NO_INLINE_;
-// HWAddressSanitizer add a random tag to the MSB of the local variable address,
-// making comparison result unpredictable.
-GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
-static void StackLowerThanAddress(const void* ptr, bool* result) {
-  int dummy;
-  *result = (&dummy < ptr);
-}
-
-// Make sure AddressSanitizer does not tamper with the stack here.
-GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
-GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
-static bool StackGrowsDown() {
-  int dummy;
-  bool result;
-  StackLowerThanAddress(&dummy, &result);
-  return result;
-}
-#  endif  // GTEST_HAS_CLONE
-
-// Spawns a child process with the same executable as the current process in
-// a thread-safe manner and instructs it to run the death test.  The
-// implementation uses fork(2) + exec.  On systems where clone(2) is
-// available, it is used instead, being slightly more thread-safe.  On QNX,
-// fork supports only single-threaded environments, so this function uses
-// spawn(2) there instead.  The function dies with an error message if
-// anything goes wrong.
-static pid_t ExecDeathTestSpawnChild(char* const* argv, int close_fd) {
-  ExecDeathTestArgs args = { argv, close_fd };
-  pid_t child_pid = -1;
-
-#  if GTEST_OS_QNX
-  // Obtains the current directory and sets it to be closed in the child
-  // process.
-  const int cwd_fd = open(".", O_RDONLY);
-  GTEST_DEATH_TEST_CHECK_(cwd_fd != -1);
-  GTEST_DEATH_TEST_CHECK_SYSCALL_(fcntl(cwd_fd, F_SETFD, FD_CLOEXEC));
-  // We need to execute the test program in the same environment where
-  // it was originally invoked.  Therefore we change to the original
-  // working directory first.
-  const char* const original_dir =
-      UnitTest::GetInstance()->original_working_dir();
-  // We can safely call chdir() as it's a direct system call.
-  if (chdir(original_dir) != 0) {
-    DeathTestAbort(std::string("chdir(\"") + original_dir + "\") failed: " +
-                   GetLastErrnoDescription());
-    return EXIT_FAILURE;
-  }
-
-  int fd_flags;
-  // Set close_fd to be closed after spawn.
-  GTEST_DEATH_TEST_CHECK_SYSCALL_(fd_flags = fcntl(close_fd, F_GETFD));
-  GTEST_DEATH_TEST_CHECK_SYSCALL_(fcntl(close_fd, F_SETFD,
-                                        fd_flags | FD_CLOEXEC));
-  struct inheritance inherit = {0};
-  // spawn is a system call.
-  child_pid =
-      spawn(args.argv[0], 0, nullptr, &inherit, args.argv, GetEnviron());
-  // Restores the current working directory.
-  GTEST_DEATH_TEST_CHECK_(fchdir(cwd_fd) != -1);
-  GTEST_DEATH_TEST_CHECK_SYSCALL_(close(cwd_fd));
-
-#  else   // GTEST_OS_QNX
-#   if GTEST_OS_LINUX
-  // When a SIGPROF signal is received while fork() or clone() are executing,
-  // the process may hang. To avoid this, we ignore SIGPROF here and re-enable
-  // it after the call to fork()/clone() is complete.
-  struct sigaction saved_sigprof_action;
-  struct sigaction ignore_sigprof_action;
-  memset(&ignore_sigprof_action, 0, sizeof(ignore_sigprof_action));
-  sigemptyset(&ignore_sigprof_action.sa_mask);
-  ignore_sigprof_action.sa_handler = SIG_IGN;
-  GTEST_DEATH_TEST_CHECK_SYSCALL_(sigaction(
-      SIGPROF, &ignore_sigprof_action, &saved_sigprof_action));
-#   endif  // GTEST_OS_LINUX
-
-#   if GTEST_HAS_CLONE
-  const bool use_fork = GTEST_FLAG(death_test_use_fork);
-
-  if (!use_fork) {
-    static const bool stack_grows_down = StackGrowsDown();
-    const auto stack_size = static_cast<size_t>(getpagesize() * 2);
-    // MMAP_ANONYMOUS is not defined on Mac, so we use MAP_ANON instead.
-    void* const stack = mmap(nullptr, stack_size, PROT_READ | PROT_WRITE,
-                             MAP_ANON | MAP_PRIVATE, -1, 0);
-    GTEST_DEATH_TEST_CHECK_(stack != MAP_FAILED);
-
-    // Maximum stack alignment in bytes:  For a downward-growing stack, this
-    // amount is subtracted from size of the stack space to get an address
-    // that is within the stack space and is aligned on all systems we care
-    // about.  As far as I know there is no ABI with stack alignment greater
-    // than 64.  We assume stack and stack_size already have alignment of
-    // kMaxStackAlignment.
-    const size_t kMaxStackAlignment = 64;
-    void* const stack_top =
-        static_cast<char*>(stack) +
-            (stack_grows_down ? stack_size - kMaxStackAlignment : 0);
-    GTEST_DEATH_TEST_CHECK_(
-        static_cast<size_t>(stack_size) > kMaxStackAlignment &&
-        reinterpret_cast<uintptr_t>(stack_top) % kMaxStackAlignment == 0);
-
-    child_pid = clone(&ExecDeathTestChildMain, stack_top, SIGCHLD, &args);
-
-    GTEST_DEATH_TEST_CHECK_(munmap(stack, stack_size) != -1);
-  }
-#   else
-  const bool use_fork = true;
-#   endif  // GTEST_HAS_CLONE
-
-  if (use_fork && (child_pid = fork()) == 0) {
-      ExecDeathTestChildMain(&args);
-      _exit(0);
-  }
-#  endif  // GTEST_OS_QNX
-#  if GTEST_OS_LINUX
-  GTEST_DEATH_TEST_CHECK_SYSCALL_(
-      sigaction(SIGPROF, &saved_sigprof_action, nullptr));
-#  endif  // GTEST_OS_LINUX
-
-  GTEST_DEATH_TEST_CHECK_(child_pid != -1);
-  return child_pid;
-}
-
-// The AssumeRole process for a fork-and-exec death test.  It re-executes the
-// main program from the beginning, setting the --gtest_filter
-// and --gtest_internal_run_death_test flags to cause only the current
-// death test to be re-run.
-DeathTest::TestRole ExecDeathTest::AssumeRole() {
-  const UnitTestImpl* const impl = GetUnitTestImpl();
-  const InternalRunDeathTestFlag* const flag =
-      impl->internal_run_death_test_flag();
-  const TestInfo* const info = impl->current_test_info();
-  const int death_test_index = info->result()->death_test_count();
-
-  if (flag != nullptr) {
-    set_write_fd(flag->write_fd());
-    return EXECUTE_TEST;
-  }
-
-  int pipe_fd[2];
-  GTEST_DEATH_TEST_CHECK_(pipe(pipe_fd) != -1);
-  // Clear the close-on-exec flag on the write end of the pipe, lest
-  // it be closed when the child process does an exec:
-  GTEST_DEATH_TEST_CHECK_(fcntl(pipe_fd[1], F_SETFD, 0) != -1);
-
-  const std::string filter_flag = std::string("--") + GTEST_FLAG_PREFIX_ +
-                                  kFilterFlag + "=" + info->test_suite_name() +
-                                  "." + info->name();
-  const std::string internal_flag =
-      std::string("--") + GTEST_FLAG_PREFIX_ + kInternalRunDeathTestFlag + "="
-      + file_ + "|" + StreamableToString(line_) + "|"
-      + StreamableToString(death_test_index) + "|"
-      + StreamableToString(pipe_fd[1]);
-  Arguments args;
-  args.AddArguments(GetArgvsForDeathTestChildProcess());
-  args.AddArgument(filter_flag.c_str());
-  args.AddArgument(internal_flag.c_str());
-
-  DeathTest::set_last_death_test_message("");
-
-  CaptureStderr();
-  // See the comment in NoExecDeathTest::AssumeRole for why the next line
-  // is necessary.
-  FlushInfoLog();
-
-  const pid_t child_pid = ExecDeathTestSpawnChild(args.Argv(), pipe_fd[0]);
-  GTEST_DEATH_TEST_CHECK_SYSCALL_(close(pipe_fd[1]));
-  set_child_pid(child_pid);
-  set_read_fd(pipe_fd[0]);
-  set_spawned(true);
-  return OVERSEE_TEST;
-}
-
-# endif  // !GTEST_OS_WINDOWS
-
-// Creates a concrete DeathTest-derived class that depends on the
-// --gtest_death_test_style flag, and sets the pointer pointed to
-// by the "test" argument to its address.  If the test should be
-// skipped, sets that pointer to NULL.  Returns true, unless the
-// flag is set to an invalid value.
-bool DefaultDeathTestFactory::Create(const char* statement,
-                                     Matcher<const std::string&> matcher,
-                                     const char* file, int line,
-                                     DeathTest** test) {
-  UnitTestImpl* const impl = GetUnitTestImpl();
-  const InternalRunDeathTestFlag* const flag =
-      impl->internal_run_death_test_flag();
-  const int death_test_index = impl->current_test_info()
-      ->increment_death_test_count();
-
-  if (flag != nullptr) {
-    if (death_test_index > flag->index()) {
-      DeathTest::set_last_death_test_message(
-          "Death test count (" + StreamableToString(death_test_index)
-          + ") somehow exceeded expected maximum ("
-          + StreamableToString(flag->index()) + ")");
-      return false;
-    }
-
-    if (!(flag->file() == file && flag->line() == line &&
-          flag->index() == death_test_index)) {
-      *test = nullptr;
-      return true;
-    }
-  }
-
-# if GTEST_OS_WINDOWS
-
-  if (GTEST_FLAG(death_test_style) == "threadsafe" ||
-      GTEST_FLAG(death_test_style) == "fast") {
-    *test = new WindowsDeathTest(statement, std::move(matcher), file, line);
-  }
-
-# elif GTEST_OS_FUCHSIA
-
-  if (GTEST_FLAG(death_test_style) == "threadsafe" ||
-      GTEST_FLAG(death_test_style) == "fast") {
-    *test = new FuchsiaDeathTest(statement, std::move(matcher), file, line);
-  }
-
-# else
-
-  if (GTEST_FLAG(death_test_style) == "threadsafe") {
-    *test = new ExecDeathTest(statement, std::move(matcher), file, line);
-  } else if (GTEST_FLAG(death_test_style) == "fast") {
-    *test = new NoExecDeathTest(statement, std::move(matcher));
-  }
-
-# endif  // GTEST_OS_WINDOWS
-
-  else {  // NOLINT - this is more readable than unbalanced brackets inside #if.
-    DeathTest::set_last_death_test_message(
-        "Unknown death test style \"" + GTEST_FLAG(death_test_style)
-        + "\" encountered");
-    return false;
-  }
-
-  return true;
-}
-
-# if GTEST_OS_WINDOWS
-// Recreates the pipe and event handles from the provided parameters,
-// signals the event, and returns a file descriptor wrapped around the pipe
-// handle. This function is called in the child process only.
-static int GetStatusFileDescriptor(unsigned int parent_process_id,
-                            size_t write_handle_as_size_t,
-                            size_t event_handle_as_size_t) {
-  AutoHandle parent_process_handle(::OpenProcess(PROCESS_DUP_HANDLE,
-                                                   FALSE,  // Non-inheritable.
-                                                   parent_process_id));
-  if (parent_process_handle.Get() == INVALID_HANDLE_VALUE) {
-    DeathTestAbort("Unable to open parent process " +
-                   StreamableToString(parent_process_id));
-  }
-
-  GTEST_CHECK_(sizeof(HANDLE) <= sizeof(size_t));
-
-  const HANDLE write_handle =
-      reinterpret_cast<HANDLE>(write_handle_as_size_t);
-  HANDLE dup_write_handle;
-
-  // The newly initialized handle is accessible only in the parent
-  // process. To obtain one accessible within the child, we need to use
-  // DuplicateHandle.
-  if (!::DuplicateHandle(parent_process_handle.Get(), write_handle,
-                         ::GetCurrentProcess(), &dup_write_handle,
-                         0x0,    // Requested privileges ignored since
-                                 // DUPLICATE_SAME_ACCESS is used.
-                         FALSE,  // Request non-inheritable handler.
-                         DUPLICATE_SAME_ACCESS)) {
-    DeathTestAbort("Unable to duplicate the pipe handle " +
-                   StreamableToString(write_handle_as_size_t) +
-                   " from the parent process " +
-                   StreamableToString(parent_process_id));
-  }
-
-  const HANDLE event_handle = reinterpret_cast<HANDLE>(event_handle_as_size_t);
-  HANDLE dup_event_handle;
-
-  if (!::DuplicateHandle(parent_process_handle.Get(), event_handle,
-                         ::GetCurrentProcess(), &dup_event_handle,
-                         0x0,
-                         FALSE,
-                         DUPLICATE_SAME_ACCESS)) {
-    DeathTestAbort("Unable to duplicate the event handle " +
-                   StreamableToString(event_handle_as_size_t) +
-                   " from the parent process " +
-                   StreamableToString(parent_process_id));
-  }
-
-  const int write_fd =
-      ::_open_osfhandle(reinterpret_cast<intptr_t>(dup_write_handle), O_APPEND);
-  if (write_fd == -1) {
-    DeathTestAbort("Unable to convert pipe handle " +
-                   StreamableToString(write_handle_as_size_t) +
-                   " to a file descriptor");
-  }
-
-  // Signals the parent that the write end of the pipe has been acquired
-  // so the parent can release its own write end.
-  ::SetEvent(dup_event_handle);
-
-  return write_fd;
-}
-# endif  // GTEST_OS_WINDOWS
-
-// Returns a newly created InternalRunDeathTestFlag object with fields
-// initialized from the GTEST_FLAG(internal_run_death_test) flag if
-// the flag is specified; otherwise returns NULL.
-InternalRunDeathTestFlag* ParseInternalRunDeathTestFlag() {
-  if (GTEST_FLAG(internal_run_death_test) == "") return nullptr;
-
-  // GTEST_HAS_DEATH_TEST implies that we have ::std::string, so we
-  // can use it here.
-  int line = -1;
-  int index = -1;
-  ::std::vector< ::std::string> fields;
-  SplitString(GTEST_FLAG(internal_run_death_test).c_str(), '|', &fields);
-  int write_fd = -1;
-
-# if GTEST_OS_WINDOWS
-
-  unsigned int parent_process_id = 0;
-  size_t write_handle_as_size_t = 0;
-  size_t event_handle_as_size_t = 0;
-
-  if (fields.size() != 6
-      || !ParseNaturalNumber(fields[1], &line)
-      || !ParseNaturalNumber(fields[2], &index)
-      || !ParseNaturalNumber(fields[3], &parent_process_id)
-      || !ParseNaturalNumber(fields[4], &write_handle_as_size_t)
-      || !ParseNaturalNumber(fields[5], &event_handle_as_size_t)) {
-    DeathTestAbort("Bad --gtest_internal_run_death_test flag: " +
-                   GTEST_FLAG(internal_run_death_test));
-  }
-  write_fd = GetStatusFileDescriptor(parent_process_id,
-                                     write_handle_as_size_t,
-                                     event_handle_as_size_t);
-
-# elif GTEST_OS_FUCHSIA
-
-  if (fields.size() != 3
-      || !ParseNaturalNumber(fields[1], &line)
-      || !ParseNaturalNumber(fields[2], &index)) {
-    DeathTestAbort("Bad --gtest_internal_run_death_test flag: "
-        + GTEST_FLAG(internal_run_death_test));
-  }
-
-# else
-
-  if (fields.size() != 4
-      || !ParseNaturalNumber(fields[1], &line)
-      || !ParseNaturalNumber(fields[2], &index)
-      || !ParseNaturalNumber(fields[3], &write_fd)) {
-    DeathTestAbort("Bad --gtest_internal_run_death_test flag: "
-        + GTEST_FLAG(internal_run_death_test));
-  }
-
-# endif  // GTEST_OS_WINDOWS
-
-  return new InternalRunDeathTestFlag(fields[0], line, index, write_fd);
-}
-
-}  // namespace internal
-
-#endif  // GTEST_HAS_DEATH_TEST
-
-}  // namespace testing
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/src/gtest-filepath.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/src/gtest-filepath.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/src/gtest-filepath.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/src/gtest-filepath.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,379 +0,0 @@
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "gtest/internal/gtest-filepath.h"
-
-#include <stdlib.h>
-#include "gtest/internal/gtest-port.h"
-#include "gtest/gtest-message.h"
-
-#if GTEST_OS_WINDOWS_MOBILE
-# include <windows.h>
-#elif GTEST_OS_WINDOWS
-# include <direct.h>
-# include <io.h>
-#else
-# include <limits.h>
-# include <climits>  // Some Linux distributions define PATH_MAX here.
-#endif  // GTEST_OS_WINDOWS_MOBILE
-
-#include "gtest/internal/gtest-string.h"
-
-#if GTEST_OS_WINDOWS
-# define GTEST_PATH_MAX_ _MAX_PATH
-#elif defined(PATH_MAX)
-# define GTEST_PATH_MAX_ PATH_MAX
-#elif defined(_XOPEN_PATH_MAX)
-# define GTEST_PATH_MAX_ _XOPEN_PATH_MAX
-#else
-# define GTEST_PATH_MAX_ _POSIX_PATH_MAX
-#endif  // GTEST_OS_WINDOWS
-
-namespace testing {
-namespace internal {
-
-#if GTEST_OS_WINDOWS
-// On Windows, '\\' is the standard path separator, but many tools and the
-// Windows API also accept '/' as an alternate path separator. Unless otherwise
-// noted, a file path can contain either kind of path separators, or a mixture
-// of them.
-const char kPathSeparator = '\\';
-const char kAlternatePathSeparator = '/';
-const char kAlternatePathSeparatorString[] = "/";
-# if GTEST_OS_WINDOWS_MOBILE
-// Windows CE doesn't have a current directory. You should not use
-// the current directory in tests on Windows CE, but this at least
-// provides a reasonable fallback.
-const char kCurrentDirectoryString[] = "\\";
-// Windows CE doesn't define INVALID_FILE_ATTRIBUTES
-const DWORD kInvalidFileAttributes = 0xffffffff;
-# else
-const char kCurrentDirectoryString[] = ".\\";
-# endif  // GTEST_OS_WINDOWS_MOBILE
-#else
-const char kPathSeparator = '/';
-const char kCurrentDirectoryString[] = "./";
-#endif  // GTEST_OS_WINDOWS
-
-// Returns whether the given character is a valid path separator.
-static bool IsPathSeparator(char c) {
-#if GTEST_HAS_ALT_PATH_SEP_
-  return (c == kPathSeparator) || (c == kAlternatePathSeparator);
-#else
-  return c == kPathSeparator;
-#endif
-}
-
-// Returns the current working directory, or "" if unsuccessful.
-FilePath FilePath::GetCurrentDir() {
-#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || \
-    GTEST_OS_WINDOWS_RT || ARDUINO || defined(ESP_PLATFORM)
-  // These platforms do not have a current directory, so we just return
-  // something reasonable.
-  return FilePath(kCurrentDirectoryString);
-#elif GTEST_OS_WINDOWS
-  char cwd[GTEST_PATH_MAX_ + 1] = { '\0' };
-  return FilePath(_getcwd(cwd, sizeof(cwd)) == nullptr ? "" : cwd);
-#else
-  char cwd[GTEST_PATH_MAX_ + 1] = { '\0' };
-  char* result = getcwd(cwd, sizeof(cwd));
-# if GTEST_OS_NACL
-  // getcwd will likely fail in NaCl due to the sandbox, so return something
-  // reasonable. The user may have provided a shim implementation for getcwd,
-  // however, so fallback only when failure is detected.
-  return FilePath(result == nullptr ? kCurrentDirectoryString : cwd);
-# endif  // GTEST_OS_NACL
-  return FilePath(result == nullptr ? "" : cwd);
-#endif  // GTEST_OS_WINDOWS_MOBILE
-}
-
-// Returns a copy of the FilePath with the case-insensitive extension removed.
-// Example: FilePath("dir/file.exe").RemoveExtension("EXE") returns
-// FilePath("dir/file"). If a case-insensitive extension is not
-// found, returns a copy of the original FilePath.
-FilePath FilePath::RemoveExtension(const char* extension) const {
-  const std::string dot_extension = std::string(".") + extension;
-  if (String::EndsWithCaseInsensitive(pathname_, dot_extension)) {
-    return FilePath(pathname_.substr(
-        0, pathname_.length() - dot_extension.length()));
-  }
-  return *this;
-}
-
-// Returns a pointer to the last occurrence of a valid path separator in
-// the FilePath. On Windows, for example, both '/' and '\' are valid path
-// separators. Returns NULL if no path separator was found.
-const char* FilePath::FindLastPathSeparator() const {
-  const char* const last_sep = strrchr(c_str(), kPathSeparator);
-#if GTEST_HAS_ALT_PATH_SEP_
-  const char* const last_alt_sep = strrchr(c_str(), kAlternatePathSeparator);
-  // Comparing two pointers of which only one is NULL is undefined.
-  if (last_alt_sep != nullptr &&
-      (last_sep == nullptr || last_alt_sep > last_sep)) {
-    return last_alt_sep;
-  }
-#endif
-  return last_sep;
-}
-
-// Returns a copy of the FilePath with the directory part removed.
-// Example: FilePath("path/to/file").RemoveDirectoryName() returns
-// FilePath("file"). If there is no directory part ("just_a_file"), it returns
-// the FilePath unmodified. If there is no file part ("just_a_dir/") it
-// returns an empty FilePath ("").
-// On Windows platform, '\' is the path separator, otherwise it is '/'.
-FilePath FilePath::RemoveDirectoryName() const {
-  const char* const last_sep = FindLastPathSeparator();
-  return last_sep ? FilePath(last_sep + 1) : *this;
-}
-
-// RemoveFileName returns the directory path with the filename removed.
-// Example: FilePath("path/to/file").RemoveFileName() returns "path/to/".
-// If the FilePath is "a_file" or "/a_file", RemoveFileName returns
-// FilePath("./") or, on Windows, FilePath(".\\"). If the filepath does
-// not have a file, like "just/a/dir/", it returns the FilePath unmodified.
-// On Windows platform, '\' is the path separator, otherwise it is '/'.
-FilePath FilePath::RemoveFileName() const {
-  const char* const last_sep = FindLastPathSeparator();
-  std::string dir;
-  if (last_sep) {
-    dir = std::string(c_str(), static_cast<size_t>(last_sep + 1 - c_str()));
-  } else {
-    dir = kCurrentDirectoryString;
-  }
-  return FilePath(dir);
-}
-
-// Helper functions for naming files in a directory for xml output.
-
-// Given directory = "dir", base_name = "test", number = 0,
-// extension = "xml", returns "dir/test.xml". If number is greater
-// than zero (e.g., 12), returns "dir/test_12.xml".
-// On Windows platform, uses \ as the separator rather than /.
-FilePath FilePath::MakeFileName(const FilePath& directory,
-                                const FilePath& base_name,
-                                int number,
-                                const char* extension) {
-  std::string file;
-  if (number == 0) {
-    file = base_name.string() + "." + extension;
-  } else {
-    file = base_name.string() + "_" + StreamableToString(number)
-        + "." + extension;
-  }
-  return ConcatPaths(directory, FilePath(file));
-}
-
-// Given directory = "dir", relative_path = "test.xml", returns "dir/test.xml".
-// On Windows, uses \ as the separator rather than /.
-FilePath FilePath::ConcatPaths(const FilePath& directory,
-                               const FilePath& relative_path) {
-  if (directory.IsEmpty())
-    return relative_path;
-  const FilePath dir(directory.RemoveTrailingPathSeparator());
-  return FilePath(dir.string() + kPathSeparator + relative_path.string());
-}
-
-// Returns true if pathname describes something findable in the file-system,
-// either a file, directory, or whatever.
-bool FilePath::FileOrDirectoryExists() const {
-#if GTEST_OS_WINDOWS_MOBILE
-  LPCWSTR unicode = String::AnsiToUtf16(pathname_.c_str());
-  const DWORD attributes = GetFileAttributes(unicode);
-  delete [] unicode;
-  return attributes != kInvalidFileAttributes;
-#else
-  posix::StatStruct file_stat;
-  return posix::Stat(pathname_.c_str(), &file_stat) == 0;
-#endif  // GTEST_OS_WINDOWS_MOBILE
-}
-
-// Returns true if pathname describes a directory in the file-system
-// that exists.
-bool FilePath::DirectoryExists() const {
-  bool result = false;
-#if GTEST_OS_WINDOWS
-  // Don't strip off trailing separator if path is a root directory on
-  // Windows (like "C:\\").
-  const FilePath& path(IsRootDirectory() ? *this :
-                                           RemoveTrailingPathSeparator());
-#else
-  const FilePath& path(*this);
-#endif
-
-#if GTEST_OS_WINDOWS_MOBILE
-  LPCWSTR unicode = String::AnsiToUtf16(path.c_str());
-  const DWORD attributes = GetFileAttributes(unicode);
-  delete [] unicode;
-  if ((attributes != kInvalidFileAttributes) &&
-      (attributes & FILE_ATTRIBUTE_DIRECTORY)) {
-    result = true;
-  }
-#else
-  posix::StatStruct file_stat;
-  result = posix::Stat(path.c_str(), &file_stat) == 0 &&
-      posix::IsDir(file_stat);
-#endif  // GTEST_OS_WINDOWS_MOBILE
-
-  return result;
-}
-
-// Returns true if pathname describes a root directory. (Windows has one
-// root directory per disk drive.)
-bool FilePath::IsRootDirectory() const {
-#if GTEST_OS_WINDOWS
-  return pathname_.length() == 3 && IsAbsolutePath();
-#else
-  return pathname_.length() == 1 && IsPathSeparator(pathname_.c_str()[0]);
-#endif
-}
-
-// Returns true if pathname describes an absolute path.
-bool FilePath::IsAbsolutePath() const {
-  const char* const name = pathname_.c_str();
-#if GTEST_OS_WINDOWS
-  return pathname_.length() >= 3 &&
-     ((name[0] >= 'a' && name[0] <= 'z') ||
-      (name[0] >= 'A' && name[0] <= 'Z')) &&
-     name[1] == ':' &&
-     IsPathSeparator(name[2]);
-#else
-  return IsPathSeparator(name[0]);
-#endif
-}
-
-// Returns a pathname for a file that does not currently exist. The pathname
-// will be directory/base_name.extension or
-// directory/base_name_<number>.extension if directory/base_name.extension
-// already exists. The number will be incremented until a pathname is found
-// that does not already exist.
-// Examples: 'dir/foo_test.xml' or 'dir/foo_test_1.xml'.
-// There could be a race condition if two or more processes are calling this
-// function at the same time -- they could both pick the same filename.
-FilePath FilePath::GenerateUniqueFileName(const FilePath& directory,
-                                          const FilePath& base_name,
-                                          const char* extension) {
-  FilePath full_pathname;
-  int number = 0;
-  do {
-    full_pathname.Set(MakeFileName(directory, base_name, number++, extension));
-  } while (full_pathname.FileOrDirectoryExists());
-  return full_pathname;
-}
-
-// Returns true if FilePath ends with a path separator, which indicates that
-// it is intended to represent a directory. Returns false otherwise.
-// This does NOT check that a directory (or file) actually exists.
-bool FilePath::IsDirectory() const {
-  return !pathname_.empty() &&
-         IsPathSeparator(pathname_.c_str()[pathname_.length() - 1]);
-}
-
-// Create directories so that path exists. Returns true if successful or if
-// the directories already exist; returns false if unable to create directories
-// for any reason.
-bool FilePath::CreateDirectoriesRecursively() const {
-  if (!this->IsDirectory()) {
-    return false;
-  }
-
-  if (pathname_.length() == 0 || this->DirectoryExists()) {
-    return true;
-  }
-
-  const FilePath parent(this->RemoveTrailingPathSeparator().RemoveFileName());
-  return parent.CreateDirectoriesRecursively() && this->CreateFolder();
-}
-
-// Create the directory so that path exists. Returns true if successful or
-// if the directory already exists; returns false if unable to create the
-// directory for any reason, including if the parent directory does not
-// exist. Not named "CreateDirectory" because that's a macro on Windows.
-bool FilePath::CreateFolder() const {
-#if GTEST_OS_WINDOWS_MOBILE
-  FilePath removed_sep(this->RemoveTrailingPathSeparator());
-  LPCWSTR unicode = String::AnsiToUtf16(removed_sep.c_str());
-  int result = CreateDirectory(unicode, nullptr) ? 0 : -1;
-  delete [] unicode;
-#elif GTEST_OS_WINDOWS
-  int result = _mkdir(pathname_.c_str());
-#else
-  int result = mkdir(pathname_.c_str(), 0777);
-#endif  // GTEST_OS_WINDOWS_MOBILE
-
-  if (result == -1) {
-    return this->DirectoryExists();  // An error is OK if the directory exists.
-  }
-  return true;  // No error.
-}
-
-// If input name has a trailing separator character, remove it and return the
-// name, otherwise return the name string unmodified.
-// On Windows platform, uses \ as the separator, other platforms use /.
-FilePath FilePath::RemoveTrailingPathSeparator() const {
-  return IsDirectory()
-      ? FilePath(pathname_.substr(0, pathname_.length() - 1))
-      : *this;
-}
-
-// Removes any redundant separators that might be in the pathname.
-// For example, "bar///foo" becomes "bar/foo". Does not eliminate other
-// redundancies that might be in a pathname involving "." or "..".
-void FilePath::Normalize() {
-  if (pathname_.c_str() == nullptr) {
-    pathname_ = "";
-    return;
-  }
-  const char* src = pathname_.c_str();
-  char* const dest = new char[pathname_.length() + 1];
-  char* dest_ptr = dest;
-  memset(dest_ptr, 0, pathname_.length() + 1);
-
-  while (*src != '\0') {
-    *dest_ptr = *src;
-    if (!IsPathSeparator(*src)) {
-      src++;
-    } else {
-#if GTEST_HAS_ALT_PATH_SEP_
-      if (*dest_ptr == kAlternatePathSeparator) {
-        *dest_ptr = kPathSeparator;
-      }
-#endif
-      while (IsPathSeparator(*src))
-        src++;
-    }
-    dest_ptr++;
-  }
-  *dest_ptr = '\0';
-  pathname_ = dest;
-  delete[] dest;
-}
-
-}  // namespace internal
-}  // namespace testing
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/src/gtest-internal-inl.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/src/gtest-internal-inl.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/src/gtest-internal-inl.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/src/gtest-internal-inl.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,1211 +0,0 @@
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Utility functions and classes used by the Google C++ testing framework.//
-// This file contains purely Google Test's internal implementation.  Please
-// DO NOT #INCLUDE IT IN A USER PROGRAM.
-
-#ifndef GTEST_SRC_GTEST_INTERNAL_INL_H_
-#define GTEST_SRC_GTEST_INTERNAL_INL_H_
-
-#ifndef _WIN32_WCE
-# include <errno.h>
-#endif  // !_WIN32_WCE
-#include <stddef.h>
-#include <stdlib.h>  // For strtoll/_strtoul64/malloc/free.
-#include <string.h>  // For memmove.
-
-#include <algorithm>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "gtest/internal/gtest-port.h"
-
-#if GTEST_CAN_STREAM_RESULTS_
-# include <arpa/inet.h>  // NOLINT
-# include <netdb.h>  // NOLINT
-#endif
-
-#if GTEST_OS_WINDOWS
-# include <windows.h>  // NOLINT
-#endif  // GTEST_OS_WINDOWS
-
-#include "gtest/gtest.h"
-#include "gtest/gtest-spi.h"
-
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
-/* class A needs to have dll-interface to be used by clients of class B */)
-
-namespace testing {
-
-// Declares the flags.
-//
-// We don't want the users to modify this flag in the code, but want
-// Google Test's own unit tests to be able to access it. Therefore we
-// declare it here as opposed to in gtest.h.
-GTEST_DECLARE_bool_(death_test_use_fork);
-
-namespace internal {
-
-// The value of GetTestTypeId() as seen from within the Google Test
-// library.  This is solely for testing GetTestTypeId().
-GTEST_API_ extern const TypeId kTestTypeIdInGoogleTest;
-
-// Names of the flags (needed for parsing Google Test flags).
-const char kAlsoRunDisabledTestsFlag[] = "also_run_disabled_tests";
-const char kBreakOnFailureFlag[] = "break_on_failure";
-const char kCatchExceptionsFlag[] = "catch_exceptions";
-const char kColorFlag[] = "color";
-const char kFilterFlag[] = "filter";
-const char kListTestsFlag[] = "list_tests";
-const char kOutputFlag[] = "output";
-const char kPrintTimeFlag[] = "print_time";
-const char kPrintUTF8Flag[] = "print_utf8";
-const char kRandomSeedFlag[] = "random_seed";
-const char kRepeatFlag[] = "repeat";
-const char kShuffleFlag[] = "shuffle";
-const char kStackTraceDepthFlag[] = "stack_trace_depth";
-const char kStreamResultToFlag[] = "stream_result_to";
-const char kThrowOnFailureFlag[] = "throw_on_failure";
-const char kFlagfileFlag[] = "flagfile";
-
-// A valid random seed must be in [1, kMaxRandomSeed].
-const int kMaxRandomSeed = 99999;
-
-// g_help_flag is true if and only if the --help flag or an equivalent form
-// is specified on the command line.
-GTEST_API_ extern bool g_help_flag;
-
-// Returns the current time in milliseconds.
-GTEST_API_ TimeInMillis GetTimeInMillis();
-
-// Returns true if and only if Google Test should use colors in the output.
-GTEST_API_ bool ShouldUseColor(bool stdout_is_tty);
-
-// Formats the given time in milliseconds as seconds.
-GTEST_API_ std::string FormatTimeInMillisAsSeconds(TimeInMillis ms);
-
-// Converts the given time in milliseconds to a date string in the ISO 8601
-// format, without the timezone information.  N.B.: due to the use the
-// non-reentrant localtime() function, this function is not thread safe.  Do
-// not use it in any code that can be called from multiple threads.
-GTEST_API_ std::string FormatEpochTimeInMillisAsIso8601(TimeInMillis ms);
-
-// Parses a string for an Int32 flag, in the form of "--flag=value".
-//
-// On success, stores the value of the flag in *value, and returns
-// true.  On failure, returns false without changing *value.
-GTEST_API_ bool ParseInt32Flag(
-    const char* str, const char* flag, Int32* value);
-
-// Returns a random seed in range [1, kMaxRandomSeed] based on the
-// given --gtest_random_seed flag value.
-inline int GetRandomSeedFromFlag(Int32 random_seed_flag) {
-  const unsigned int raw_seed = (random_seed_flag == 0) ?
-      static_cast<unsigned int>(GetTimeInMillis()) :
-      static_cast<unsigned int>(random_seed_flag);
-
-  // Normalizes the actual seed to range [1, kMaxRandomSeed] such that
-  // it's easy to type.
-  const int normalized_seed =
-      static_cast<int>((raw_seed - 1U) %
-                       static_cast<unsigned int>(kMaxRandomSeed)) + 1;
-  return normalized_seed;
-}
-
-// Returns the first valid random seed after 'seed'.  The behavior is
-// undefined if 'seed' is invalid.  The seed after kMaxRandomSeed is
-// considered to be 1.
-inline int GetNextRandomSeed(int seed) {
-  GTEST_CHECK_(1 <= seed && seed <= kMaxRandomSeed)
-      << "Invalid random seed " << seed << " - must be in [1, "
-      << kMaxRandomSeed << "].";
-  const int next_seed = seed + 1;
-  return (next_seed > kMaxRandomSeed) ? 1 : next_seed;
-}
-
-// This class saves the values of all Google Test flags in its c'tor, and
-// restores them in its d'tor.
-class GTestFlagSaver {
- public:
-  // The c'tor.
-  GTestFlagSaver() {
-    also_run_disabled_tests_ = GTEST_FLAG(also_run_disabled_tests);
-    break_on_failure_ = GTEST_FLAG(break_on_failure);
-    catch_exceptions_ = GTEST_FLAG(catch_exceptions);
-    color_ = GTEST_FLAG(color);
-    death_test_style_ = GTEST_FLAG(death_test_style);
-    death_test_use_fork_ = GTEST_FLAG(death_test_use_fork);
-    filter_ = GTEST_FLAG(filter);
-    internal_run_death_test_ = GTEST_FLAG(internal_run_death_test);
-    list_tests_ = GTEST_FLAG(list_tests);
-    output_ = GTEST_FLAG(output);
-    print_time_ = GTEST_FLAG(print_time);
-    print_utf8_ = GTEST_FLAG(print_utf8);
-    random_seed_ = GTEST_FLAG(random_seed);
-    repeat_ = GTEST_FLAG(repeat);
-    shuffle_ = GTEST_FLAG(shuffle);
-    stack_trace_depth_ = GTEST_FLAG(stack_trace_depth);
-    stream_result_to_ = GTEST_FLAG(stream_result_to);
-    throw_on_failure_ = GTEST_FLAG(throw_on_failure);
-  }
-
-  // The d'tor is not virtual.  DO NOT INHERIT FROM THIS CLASS.
-  ~GTestFlagSaver() {
-    GTEST_FLAG(also_run_disabled_tests) = also_run_disabled_tests_;
-    GTEST_FLAG(break_on_failure) = break_on_failure_;
-    GTEST_FLAG(catch_exceptions) = catch_exceptions_;
-    GTEST_FLAG(color) = color_;
-    GTEST_FLAG(death_test_style) = death_test_style_;
-    GTEST_FLAG(death_test_use_fork) = death_test_use_fork_;
-    GTEST_FLAG(filter) = filter_;
-    GTEST_FLAG(internal_run_death_test) = internal_run_death_test_;
-    GTEST_FLAG(list_tests) = list_tests_;
-    GTEST_FLAG(output) = output_;
-    GTEST_FLAG(print_time) = print_time_;
-    GTEST_FLAG(print_utf8) = print_utf8_;
-    GTEST_FLAG(random_seed) = random_seed_;
-    GTEST_FLAG(repeat) = repeat_;
-    GTEST_FLAG(shuffle) = shuffle_;
-    GTEST_FLAG(stack_trace_depth) = stack_trace_depth_;
-    GTEST_FLAG(stream_result_to) = stream_result_to_;
-    GTEST_FLAG(throw_on_failure) = throw_on_failure_;
-  }
-
- private:
-  // Fields for saving the original values of flags.
-  bool also_run_disabled_tests_;
-  bool break_on_failure_;
-  bool catch_exceptions_;
-  std::string color_;
-  std::string death_test_style_;
-  bool death_test_use_fork_;
-  std::string filter_;
-  std::string internal_run_death_test_;
-  bool list_tests_;
-  std::string output_;
-  bool print_time_;
-  bool print_utf8_;
-  internal::Int32 random_seed_;
-  internal::Int32 repeat_;
-  bool shuffle_;
-  internal::Int32 stack_trace_depth_;
-  std::string stream_result_to_;
-  bool throw_on_failure_;
-} GTEST_ATTRIBUTE_UNUSED_;
-
-// Converts a Unicode code point to a narrow string in UTF-8 encoding.
-// code_point parameter is of type UInt32 because wchar_t may not be
-// wide enough to contain a code point.
-// If the code_point is not a valid Unicode code point
-// (i.e. outside of Unicode range U+0 to U+10FFFF) it will be converted
-// to "(Invalid Unicode 0xXXXXXXXX)".
-GTEST_API_ std::string CodePointToUtf8(UInt32 code_point);
-
-// Converts a wide string to a narrow string in UTF-8 encoding.
-// The wide string is assumed to have the following encoding:
-//   UTF-16 if sizeof(wchar_t) == 2 (on Windows, Cygwin)
-//   UTF-32 if sizeof(wchar_t) == 4 (on Linux)
-// Parameter str points to a null-terminated wide string.
-// Parameter num_chars may additionally limit the number
-// of wchar_t characters processed. -1 is used when the entire string
-// should be processed.
-// If the string contains code points that are not valid Unicode code points
-// (i.e. outside of Unicode range U+0 to U+10FFFF) they will be output
-// as '(Invalid Unicode 0xXXXXXXXX)'. If the string is in UTF16 encoding
-// and contains invalid UTF-16 surrogate pairs, values in those pairs
-// will be encoded as individual Unicode characters from Basic Normal Plane.
-GTEST_API_ std::string WideStringToUtf8(const wchar_t* str, int num_chars);
-
-// Reads the GTEST_SHARD_STATUS_FILE environment variable, and creates the file
-// if the variable is present. If a file already exists at this location, this
-// function will write over it. If the variable is present, but the file cannot
-// be created, prints an error and exits.
-void WriteToShardStatusFileIfNeeded();
-
-// Checks whether sharding is enabled by examining the relevant
-// environment variable values. If the variables are present,
-// but inconsistent (e.g., shard_index >= total_shards), prints
-// an error and exits. If in_subprocess_for_death_test, sharding is
-// disabled because it must only be applied to the original test
-// process. Otherwise, we could filter out death tests we intended to execute.
-GTEST_API_ bool ShouldShard(const char* total_shards_str,
-                            const char* shard_index_str,
-                            bool in_subprocess_for_death_test);
-
-// Parses the environment variable var as an Int32. If it is unset,
-// returns default_val. If it is not an Int32, prints an error and
-// and aborts.
-GTEST_API_ Int32 Int32FromEnvOrDie(const char* env_var, Int32 default_val);
-
-// Given the total number of shards, the shard index, and the test id,
-// returns true if and only if the test should be run on this shard. The test id
-// is some arbitrary but unique non-negative integer assigned to each test
-// method. Assumes that 0 <= shard_index < total_shards.
-GTEST_API_ bool ShouldRunTestOnShard(
-    int total_shards, int shard_index, int test_id);
-
-// STL container utilities.
-
-// Returns the number of elements in the given container that satisfy
-// the given predicate.
-template <class Container, typename Predicate>
-inline int CountIf(const Container& c, Predicate predicate) {
-  // Implemented as an explicit loop since std::count_if() in libCstd on
-  // Solaris has a non-standard signature.
-  int count = 0;
-  for (typename Container::const_iterator it = c.begin(); it != c.end(); ++it) {
-    if (predicate(*it))
-      ++count;
-  }
-  return count;
-}
-
-// Applies a function/functor to each element in the container.
-template <class Container, typename Functor>
-void ForEach(const Container& c, Functor functor) {
-  std::for_each(c.begin(), c.end(), functor);
-}
-
-// Returns the i-th element of the vector, or default_value if i is not
-// in range [0, v.size()).
-template <typename E>
-inline E GetElementOr(const std::vector<E>& v, int i, E default_value) {
-  return (i < 0 || i >= static_cast<int>(v.size())) ? default_value
-                                                    : v[static_cast<size_t>(i)];
-}
-
-// Performs an in-place shuffle of a range of the vector's elements.
-// 'begin' and 'end' are element indices as an STL-style range;
-// i.e. [begin, end) are shuffled, where 'end' == size() means to
-// shuffle to the end of the vector.
-template <typename E>
-void ShuffleRange(internal::Random* random, int begin, int end,
-                  std::vector<E>* v) {
-  const int size = static_cast<int>(v->size());
-  GTEST_CHECK_(0 <= begin && begin <= size)
-      << "Invalid shuffle range start " << begin << ": must be in range [0, "
-      << size << "].";
-  GTEST_CHECK_(begin <= end && end <= size)
-      << "Invalid shuffle range finish " << end << ": must be in range ["
-      << begin << ", " << size << "].";
-
-  // Fisher-Yates shuffle, from
-  // http://en.wikipedia.org/wiki/Fisher-Yates_shuffle
-  for (int range_width = end - begin; range_width >= 2; range_width--) {
-    const int last_in_range = begin + range_width - 1;
-    const int selected =
-        begin +
-        static_cast<int>(random->Generate(static_cast<UInt32>(range_width)));
-    std::swap((*v)[static_cast<size_t>(selected)],
-              (*v)[static_cast<size_t>(last_in_range)]);
-  }
-}
-
-// Performs an in-place shuffle of the vector's elements.
-template <typename E>
-inline void Shuffle(internal::Random* random, std::vector<E>* v) {
-  ShuffleRange(random, 0, static_cast<int>(v->size()), v);
-}
-
-// A function for deleting an object.  Handy for being used as a
-// functor.
-template <typename T>
-static void Delete(T* x) {
-  delete x;
-}
-
-// A predicate that checks the key of a TestProperty against a known key.
-//
-// TestPropertyKeyIs is copyable.
-class TestPropertyKeyIs {
- public:
-  // Constructor.
-  //
-  // TestPropertyKeyIs has NO default constructor.
-  explicit TestPropertyKeyIs(const std::string& key) : key_(key) {}
-
-  // Returns true if and only if the test name of test property matches on key_.
-  bool operator()(const TestProperty& test_property) const {
-    return test_property.key() == key_;
-  }
-
- private:
-  std::string key_;
-};
-
-// Class UnitTestOptions.
-//
-// This class contains functions for processing options the user
-// specifies when running the tests.  It has only static members.
-//
-// In most cases, the user can specify an option using either an
-// environment variable or a command line flag.  E.g. you can set the
-// test filter using either GTEST_FILTER or --gtest_filter.  If both
-// the variable and the flag are present, the latter overrides the
-// former.
-class GTEST_API_ UnitTestOptions {
- public:
-  // Functions for processing the gtest_output flag.
-
-  // Returns the output format, or "" for normal printed output.
-  static std::string GetOutputFormat();
-
-  // Returns the absolute path of the requested output file, or the
-  // default (test_detail.xml in the original working directory) if
-  // none was explicitly specified.
-  static std::string GetAbsolutePathToOutputFile();
-
-  // Functions for processing the gtest_filter flag.
-
-  // Returns true if and only if the wildcard pattern matches the string.
-  // The first ':' or '\0' character in pattern marks the end of it.
-  //
-  // This recursive algorithm isn't very efficient, but is clear and
-  // works well enough for matching test names, which are short.
-  static bool PatternMatchesString(const char *pattern, const char *str);
-
-  // Returns true if and only if the user-specified filter matches the test
-  // suite name and the test name.
-  static bool FilterMatchesTest(const std::string& test_suite_name,
-                                const std::string& test_name);
-
-#if GTEST_OS_WINDOWS
-  // Function for supporting the gtest_catch_exception flag.
-
-  // Returns EXCEPTION_EXECUTE_HANDLER if Google Test should handle the
-  // given SEH exception, or EXCEPTION_CONTINUE_SEARCH otherwise.
-  // This function is useful as an __except condition.
-  static int GTestShouldProcessSEH(DWORD exception_code);
-#endif  // GTEST_OS_WINDOWS
-
-  // Returns true if "name" matches the ':' separated list of glob-style
-  // filters in "filter".
-  static bool MatchesFilter(const std::string& name, const char* filter);
-};
-
-// Returns the current application's name, removing directory path if that
-// is present.  Used by UnitTestOptions::GetOutputFile.
-GTEST_API_ FilePath GetCurrentExecutableName();
-
-// The role interface for getting the OS stack trace as a string.
-class OsStackTraceGetterInterface {
- public:
-  OsStackTraceGetterInterface() {}
-  virtual ~OsStackTraceGetterInterface() {}
-
-  // Returns the current OS stack trace as an std::string.  Parameters:
-  //
-  //   max_depth  - the maximum number of stack frames to be included
-  //                in the trace.
-  //   skip_count - the number of top frames to be skipped; doesn't count
-  //                against max_depth.
-  virtual std::string CurrentStackTrace(int max_depth, int skip_count) = 0;
-
-  // UponLeavingGTest() should be called immediately before Google Test calls
-  // user code. It saves some information about the current stack that
-  // CurrentStackTrace() will use to find and hide Google Test stack frames.
-  virtual void UponLeavingGTest() = 0;
-
-  // This string is inserted in place of stack frames that are part of
-  // Google Test's implementation.
-  static const char* const kElidedFramesMarker;
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(OsStackTraceGetterInterface);
-};
-
-// A working implementation of the OsStackTraceGetterInterface interface.
-class OsStackTraceGetter : public OsStackTraceGetterInterface {
- public:
-  OsStackTraceGetter() {}
-
-  std::string CurrentStackTrace(int max_depth, int skip_count) override;
-  void UponLeavingGTest() override;
-
- private:
-#if GTEST_HAS_ABSL
-  Mutex mutex_;  // Protects all internal state.
-
-  // We save the stack frame below the frame that calls user code.
-  // We do this because the address of the frame immediately below
-  // the user code changes between the call to UponLeavingGTest()
-  // and any calls to the stack trace code from within the user code.
-  void* caller_frame_ = nullptr;
-#endif  // GTEST_HAS_ABSL
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(OsStackTraceGetter);
-};
-
-// Information about a Google Test trace point.
-struct TraceInfo {
-  const char* file;
-  int line;
-  std::string message;
-};
-
-// This is the default global test part result reporter used in UnitTestImpl.
-// This class should only be used by UnitTestImpl.
-class DefaultGlobalTestPartResultReporter
-  : public TestPartResultReporterInterface {
- public:
-  explicit DefaultGlobalTestPartResultReporter(UnitTestImpl* unit_test);
-  // Implements the TestPartResultReporterInterface. Reports the test part
-  // result in the current test.
-  void ReportTestPartResult(const TestPartResult& result) override;
-
- private:
-  UnitTestImpl* const unit_test_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultGlobalTestPartResultReporter);
-};
-
-// This is the default per thread test part result reporter used in
-// UnitTestImpl. This class should only be used by UnitTestImpl.
-class DefaultPerThreadTestPartResultReporter
-    : public TestPartResultReporterInterface {
- public:
-  explicit DefaultPerThreadTestPartResultReporter(UnitTestImpl* unit_test);
-  // Implements the TestPartResultReporterInterface. The implementation just
-  // delegates to the current global test part result reporter of *unit_test_.
-  void ReportTestPartResult(const TestPartResult& result) override;
-
- private:
-  UnitTestImpl* const unit_test_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultPerThreadTestPartResultReporter);
-};
-
-// The private implementation of the UnitTest class.  We don't protect
-// the methods under a mutex, as this class is not accessible by a
-// user and the UnitTest class that delegates work to this class does
-// proper locking.
-class GTEST_API_ UnitTestImpl {
- public:
-  explicit UnitTestImpl(UnitTest* parent);
-  virtual ~UnitTestImpl();
-
-  // There are two different ways to register your own TestPartResultReporter.
-  // You can register your own repoter to listen either only for test results
-  // from the current thread or for results from all threads.
-  // By default, each per-thread test result repoter just passes a new
-  // TestPartResult to the global test result reporter, which registers the
-  // test part result for the currently running test.
-
-  // Returns the global test part result reporter.
-  TestPartResultReporterInterface* GetGlobalTestPartResultReporter();
-
-  // Sets the global test part result reporter.
-  void SetGlobalTestPartResultReporter(
-      TestPartResultReporterInterface* reporter);
-
-  // Returns the test part result reporter for the current thread.
-  TestPartResultReporterInterface* GetTestPartResultReporterForCurrentThread();
-
-  // Sets the test part result reporter for the current thread.
-  void SetTestPartResultReporterForCurrentThread(
-      TestPartResultReporterInterface* reporter);
-
-  // Gets the number of successful test suites.
-  int successful_test_suite_count() const;
-
-  // Gets the number of failed test suites.
-  int failed_test_suite_count() const;
-
-  // Gets the number of all test suites.
-  int total_test_suite_count() const;
-
-  // Gets the number of all test suites that contain at least one test
-  // that should run.
-  int test_suite_to_run_count() const;
-
-  // Gets the number of successful tests.
-  int successful_test_count() const;
-
-  // Gets the number of skipped tests.
-  int skipped_test_count() const;
-
-  // Gets the number of failed tests.
-  int failed_test_count() const;
-
-  // Gets the number of disabled tests that will be reported in the XML report.
-  int reportable_disabled_test_count() const;
-
-  // Gets the number of disabled tests.
-  int disabled_test_count() const;
-
-  // Gets the number of tests to be printed in the XML report.
-  int reportable_test_count() const;
-
-  // Gets the number of all tests.
-  int total_test_count() const;
-
-  // Gets the number of tests that should run.
-  int test_to_run_count() const;
-
-  // Gets the time of the test program start, in ms from the start of the
-  // UNIX epoch.
-  TimeInMillis start_timestamp() const { return start_timestamp_; }
-
-  // Gets the elapsed time, in milliseconds.
-  TimeInMillis elapsed_time() const { return elapsed_time_; }
-
-  // Returns true if and only if the unit test passed (i.e. all test suites
-  // passed).
-  bool Passed() const { return !Failed(); }
-
-  // Returns true if and only if the unit test failed (i.e. some test suite
-  // failed or something outside of all tests failed).
-  bool Failed() const {
-    return failed_test_suite_count() > 0 || ad_hoc_test_result()->Failed();
-  }
-
-  // Gets the i-th test suite among all the test suites. i can range from 0 to
-  // total_test_suite_count() - 1. If i is not in that range, returns NULL.
-  const TestSuite* GetTestSuite(int i) const {
-    const int index = GetElementOr(test_suite_indices_, i, -1);
-    return index < 0 ? nullptr : test_suites_[static_cast<size_t>(i)];
-  }
-
-  //  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  const TestCase* GetTestCase(int i) const { return GetTestSuite(i); }
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-  // Gets the i-th test suite among all the test suites. i can range from 0 to
-  // total_test_suite_count() - 1. If i is not in that range, returns NULL.
-  TestSuite* GetMutableSuiteCase(int i) {
-    const int index = GetElementOr(test_suite_indices_, i, -1);
-    return index < 0 ? nullptr : test_suites_[static_cast<size_t>(index)];
-  }
-
-  // Provides access to the event listener list.
-  TestEventListeners* listeners() { return &listeners_; }
-
-  // Returns the TestResult for the test that's currently running, or
-  // the TestResult for the ad hoc test if no test is running.
-  TestResult* current_test_result();
-
-  // Returns the TestResult for the ad hoc test.
-  const TestResult* ad_hoc_test_result() const { return &ad_hoc_test_result_; }
-
-  // Sets the OS stack trace getter.
-  //
-  // Does nothing if the input and the current OS stack trace getter
-  // are the same; otherwise, deletes the old getter and makes the
-  // input the current getter.
-  void set_os_stack_trace_getter(OsStackTraceGetterInterface* getter);
-
-  // Returns the current OS stack trace getter if it is not NULL;
-  // otherwise, creates an OsStackTraceGetter, makes it the current
-  // getter, and returns it.
-  OsStackTraceGetterInterface* os_stack_trace_getter();
-
-  // Returns the current OS stack trace as an std::string.
-  //
-  // The maximum number of stack frames to be included is specified by
-  // the gtest_stack_trace_depth flag.  The skip_count parameter
-  // specifies the number of top frames to be skipped, which doesn't
-  // count against the number of frames to be included.
-  //
-  // For example, if Foo() calls Bar(), which in turn calls
-  // CurrentOsStackTraceExceptTop(1), Foo() will be included in the
-  // trace but Bar() and CurrentOsStackTraceExceptTop() won't.
-  std::string CurrentOsStackTraceExceptTop(int skip_count) GTEST_NO_INLINE_;
-
-  // Finds and returns a TestSuite with the given name.  If one doesn't
-  // exist, creates one and returns it.
-  //
-  // Arguments:
-  //
-  //   test_suite_name: name of the test suite
-  //   type_param:     the name of the test's type parameter, or NULL if
-  //                   this is not a typed or a type-parameterized test.
-  //   set_up_tc:      pointer to the function that sets up the test suite
-  //   tear_down_tc:   pointer to the function that tears down the test suite
-  TestSuite* GetTestSuite(const char* test_suite_name, const char* type_param,
-                          internal::SetUpTestSuiteFunc set_up_tc,
-                          internal::TearDownTestSuiteFunc tear_down_tc);
-
-//  Legacy API is deprecated but still available
-#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-  TestCase* GetTestCase(const char* test_case_name, const char* type_param,
-                        internal::SetUpTestSuiteFunc set_up_tc,
-                        internal::TearDownTestSuiteFunc tear_down_tc) {
-    return GetTestSuite(test_case_name, type_param, set_up_tc, tear_down_tc);
-  }
-#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
-
-  // Adds a TestInfo to the unit test.
-  //
-  // Arguments:
-  //
-  //   set_up_tc:    pointer to the function that sets up the test suite
-  //   tear_down_tc: pointer to the function that tears down the test suite
-  //   test_info:    the TestInfo object
-  void AddTestInfo(internal::SetUpTestSuiteFunc set_up_tc,
-                   internal::TearDownTestSuiteFunc tear_down_tc,
-                   TestInfo* test_info) {
-    // In order to support thread-safe death tests, we need to
-    // remember the original working directory when the test program
-    // was first invoked.  We cannot do this in RUN_ALL_TESTS(), as
-    // the user may have changed the current directory before calling
-    // RUN_ALL_TESTS().  Therefore we capture the current directory in
-    // AddTestInfo(), which is called to register a TEST or TEST_F
-    // before main() is reached.
-    if (original_working_dir_.IsEmpty()) {
-      original_working_dir_.Set(FilePath::GetCurrentDir());
-      GTEST_CHECK_(!original_working_dir_.IsEmpty())
-          << "Failed to get the current working directory.";
-    }
-
-    GetTestSuite(test_info->test_suite_name(), test_info->type_param(),
-                 set_up_tc, tear_down_tc)
-        ->AddTestInfo(test_info);
-  }
-
-  // Returns ParameterizedTestSuiteRegistry object used to keep track of
-  // value-parameterized tests and instantiate and register them.
-  internal::ParameterizedTestSuiteRegistry& parameterized_test_registry() {
-    return parameterized_test_registry_;
-  }
-
-  // Sets the TestSuite object for the test that's currently running.
-  void set_current_test_suite(TestSuite* a_current_test_suite) {
-    current_test_suite_ = a_current_test_suite;
-  }
-
-  // Sets the TestInfo object for the test that's currently running.  If
-  // current_test_info is NULL, the assertion results will be stored in
-  // ad_hoc_test_result_.
-  void set_current_test_info(TestInfo* a_current_test_info) {
-    current_test_info_ = a_current_test_info;
-  }
-
-  // Registers all parameterized tests defined using TEST_P and
-  // INSTANTIATE_TEST_SUITE_P, creating regular tests for each test/parameter
-  // combination. This method can be called more then once; it has guards
-  // protecting from registering the tests more then once.  If
-  // value-parameterized tests are disabled, RegisterParameterizedTests is
-  // present but does nothing.
-  void RegisterParameterizedTests();
-
-  // Runs all tests in this UnitTest object, prints the result, and
-  // returns true if all tests are successful.  If any exception is
-  // thrown during a test, this test is considered to be failed, but
-  // the rest of the tests will still be run.
-  bool RunAllTests();
-
-  // Clears the results of all tests, except the ad hoc tests.
-  void ClearNonAdHocTestResult() {
-    ForEach(test_suites_, TestSuite::ClearTestSuiteResult);
-  }
-
-  // Clears the results of ad-hoc test assertions.
-  void ClearAdHocTestResult() {
-    ad_hoc_test_result_.Clear();
-  }
-
-  // Adds a TestProperty to the current TestResult object when invoked in a
-  // context of a test or a test suite, or to the global property set. If the
-  // result already contains a property with the same key, the value will be
-  // updated.
-  void RecordProperty(const TestProperty& test_property);
-
-  enum ReactionToSharding {
-    HONOR_SHARDING_PROTOCOL,
-    IGNORE_SHARDING_PROTOCOL
-  };
-
-  // Matches the full name of each test against the user-specified
-  // filter to decide whether the test should run, then records the
-  // result in each TestSuite and TestInfo object.
-  // If shard_tests == HONOR_SHARDING_PROTOCOL, further filters tests
-  // based on sharding variables in the environment.
-  // Returns the number of tests that should run.
-  int FilterTests(ReactionToSharding shard_tests);
-
-  // Prints the names of the tests matching the user-specified filter flag.
-  void ListTestsMatchingFilter();
-
-  const TestSuite* current_test_suite() const { return current_test_suite_; }
-  TestInfo* current_test_info() { return current_test_info_; }
-  const TestInfo* current_test_info() const { return current_test_info_; }
-
-  // Returns the vector of environments that need to be set-up/torn-down
-  // before/after the tests are run.
-  std::vector<Environment*>& environments() { return environments_; }
-
-  // Getters for the per-thread Google Test trace stack.
-  std::vector<TraceInfo>& gtest_trace_stack() {
-    return *(gtest_trace_stack_.pointer());
-  }
-  const std::vector<TraceInfo>& gtest_trace_stack() const {
-    return gtest_trace_stack_.get();
-  }
-
-#if GTEST_HAS_DEATH_TEST
-  void InitDeathTestSubprocessControlInfo() {
-    internal_run_death_test_flag_.reset(ParseInternalRunDeathTestFlag());
-  }
-  // Returns a pointer to the parsed --gtest_internal_run_death_test
-  // flag, or NULL if that flag was not specified.
-  // This information is useful only in a death test child process.
-  // Must not be called before a call to InitGoogleTest.
-  const InternalRunDeathTestFlag* internal_run_death_test_flag() const {
-    return internal_run_death_test_flag_.get();
-  }
-
-  // Returns a pointer to the current death test factory.
-  internal::DeathTestFactory* death_test_factory() {
-    return death_test_factory_.get();
-  }
-
-  void SuppressTestEventsIfInSubprocess();
-
-  friend class ReplaceDeathTestFactory;
-#endif  // GTEST_HAS_DEATH_TEST
-
-  // Initializes the event listener performing XML output as specified by
-  // UnitTestOptions. Must not be called before InitGoogleTest.
-  void ConfigureXmlOutput();
-
-#if GTEST_CAN_STREAM_RESULTS_
-  // Initializes the event listener for streaming test results to a socket.
-  // Must not be called before InitGoogleTest.
-  void ConfigureStreamingOutput();
-#endif
-
-  // Performs initialization dependent upon flag values obtained in
-  // ParseGoogleTestFlagsOnly.  Is called from InitGoogleTest after the call to
-  // ParseGoogleTestFlagsOnly.  In case a user neglects to call InitGoogleTest
-  // this function is also called from RunAllTests.  Since this function can be
-  // called more than once, it has to be idempotent.
-  void PostFlagParsingInit();
-
-  // Gets the random seed used at the start of the current test iteration.
-  int random_seed() const { return random_seed_; }
-
-  // Gets the random number generator.
-  internal::Random* random() { return &random_; }
-
-  // Shuffles all test suites, and the tests within each test suite,
-  // making sure that death tests are still run first.
-  void ShuffleTests();
-
-  // Restores the test suites and tests to their order before the first shuffle.
-  void UnshuffleTests();
-
-  // Returns the value of GTEST_FLAG(catch_exceptions) at the moment
-  // UnitTest::Run() starts.
-  bool catch_exceptions() const { return catch_exceptions_; }
-
- private:
-  friend class ::testing::UnitTest;
-
-  // Used by UnitTest::Run() to capture the state of
-  // GTEST_FLAG(catch_exceptions) at the moment it starts.
-  void set_catch_exceptions(bool value) { catch_exceptions_ = value; }
-
-  // The UnitTest object that owns this implementation object.
-  UnitTest* const parent_;
-
-  // The working directory when the first TEST() or TEST_F() was
-  // executed.
-  internal::FilePath original_working_dir_;
-
-  // The default test part result reporters.
-  DefaultGlobalTestPartResultReporter default_global_test_part_result_reporter_;
-  DefaultPerThreadTestPartResultReporter
-      default_per_thread_test_part_result_reporter_;
-
-  // Points to (but doesn't own) the global test part result reporter.
-  TestPartResultReporterInterface* global_test_part_result_repoter_;
-
-  // Protects read and write access to global_test_part_result_reporter_.
-  internal::Mutex global_test_part_result_reporter_mutex_;
-
-  // Points to (but doesn't own) the per-thread test part result reporter.
-  internal::ThreadLocal<TestPartResultReporterInterface*>
-      per_thread_test_part_result_reporter_;
-
-  // The vector of environments that need to be set-up/torn-down
-  // before/after the tests are run.
-  std::vector<Environment*> environments_;
-
-  // The vector of TestSuites in their original order.  It owns the
-  // elements in the vector.
-  std::vector<TestSuite*> test_suites_;
-
-  // Provides a level of indirection for the test suite list to allow
-  // easy shuffling and restoring the test suite order.  The i-th
-  // element of this vector is the index of the i-th test suite in the
-  // shuffled order.
-  std::vector<int> test_suite_indices_;
-
-  // ParameterizedTestRegistry object used to register value-parameterized
-  // tests.
-  internal::ParameterizedTestSuiteRegistry parameterized_test_registry_;
-
-  // Indicates whether RegisterParameterizedTests() has been called already.
-  bool parameterized_tests_registered_;
-
-  // Index of the last death test suite registered.  Initially -1.
-  int last_death_test_suite_;
-
-  // This points to the TestSuite for the currently running test.  It
-  // changes as Google Test goes through one test suite after another.
-  // When no test is running, this is set to NULL and Google Test
-  // stores assertion results in ad_hoc_test_result_.  Initially NULL.
-  TestSuite* current_test_suite_;
-
-  // This points to the TestInfo for the currently running test.  It
-  // changes as Google Test goes through one test after another.  When
-  // no test is running, this is set to NULL and Google Test stores
-  // assertion results in ad_hoc_test_result_.  Initially NULL.
-  TestInfo* current_test_info_;
-
-  // Normally, a user only writes assertions inside a TEST or TEST_F,
-  // or inside a function called by a TEST or TEST_F.  Since Google
-  // Test keeps track of which test is current running, it can
-  // associate such an assertion with the test it belongs to.
-  //
-  // If an assertion is encountered when no TEST or TEST_F is running,
-  // Google Test attributes the assertion result to an imaginary "ad hoc"
-  // test, and records the result in ad_hoc_test_result_.
-  TestResult ad_hoc_test_result_;
-
-  // The list of event listeners that can be used to track events inside
-  // Google Test.
-  TestEventListeners listeners_;
-
-  // The OS stack trace getter.  Will be deleted when the UnitTest
-  // object is destructed.  By default, an OsStackTraceGetter is used,
-  // but the user can set this field to use a custom getter if that is
-  // desired.
-  OsStackTraceGetterInterface* os_stack_trace_getter_;
-
-  // True if and only if PostFlagParsingInit() has been called.
-  bool post_flag_parse_init_performed_;
-
-  // The random number seed used at the beginning of the test run.
-  int random_seed_;
-
-  // Our random number generator.
-  internal::Random random_;
-
-  // The time of the test program start, in ms from the start of the
-  // UNIX epoch.
-  TimeInMillis start_timestamp_;
-
-  // How long the test took to run, in milliseconds.
-  TimeInMillis elapsed_time_;
-
-#if GTEST_HAS_DEATH_TEST
-  // The decomposed components of the gtest_internal_run_death_test flag,
-  // parsed when RUN_ALL_TESTS is called.
-  std::unique_ptr<InternalRunDeathTestFlag> internal_run_death_test_flag_;
-  std::unique_ptr<internal::DeathTestFactory> death_test_factory_;
-#endif  // GTEST_HAS_DEATH_TEST
-
-  // A per-thread stack of traces created by the SCOPED_TRACE() macro.
-  internal::ThreadLocal<std::vector<TraceInfo> > gtest_trace_stack_;
-
-  // The value of GTEST_FLAG(catch_exceptions) at the moment RunAllTests()
-  // starts.
-  bool catch_exceptions_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(UnitTestImpl);
-};  // class UnitTestImpl
-
-// Convenience function for accessing the global UnitTest
-// implementation object.
-inline UnitTestImpl* GetUnitTestImpl() {
-  return UnitTest::GetInstance()->impl();
-}
-
-#if GTEST_USES_SIMPLE_RE
-
-// Internal helper functions for implementing the simple regular
-// expression matcher.
-GTEST_API_ bool IsInSet(char ch, const char* str);
-GTEST_API_ bool IsAsciiDigit(char ch);
-GTEST_API_ bool IsAsciiPunct(char ch);
-GTEST_API_ bool IsRepeat(char ch);
-GTEST_API_ bool IsAsciiWhiteSpace(char ch);
-GTEST_API_ bool IsAsciiWordChar(char ch);
-GTEST_API_ bool IsValidEscape(char ch);
-GTEST_API_ bool AtomMatchesChar(bool escaped, char pattern, char ch);
-GTEST_API_ bool ValidateRegex(const char* regex);
-GTEST_API_ bool MatchRegexAtHead(const char* regex, const char* str);
-GTEST_API_ bool MatchRepetitionAndRegexAtHead(
-    bool escaped, char ch, char repeat, const char* regex, const char* str);
-GTEST_API_ bool MatchRegexAnywhere(const char* regex, const char* str);
-
-#endif  // GTEST_USES_SIMPLE_RE
-
-// Parses the command line for Google Test flags, without initializing
-// other parts of Google Test.
-GTEST_API_ void ParseGoogleTestFlagsOnly(int* argc, char** argv);
-GTEST_API_ void ParseGoogleTestFlagsOnly(int* argc, wchar_t** argv);
-
-#if GTEST_HAS_DEATH_TEST
-
-// Returns the message describing the last system error, regardless of the
-// platform.
-GTEST_API_ std::string GetLastErrnoDescription();
-
-// Attempts to parse a string into a positive integer pointed to by the
-// number parameter.  Returns true if that is possible.
-// GTEST_HAS_DEATH_TEST implies that we have ::std::string, so we can use
-// it here.
-template <typename Integer>
-bool ParseNaturalNumber(const ::std::string& str, Integer* number) {
-  // Fail fast if the given string does not begin with a digit;
-  // this bypasses strtoXXX's "optional leading whitespace and plus
-  // or minus sign" semantics, which are undesirable here.
-  if (str.empty() || !IsDigit(str[0])) {
-    return false;
-  }
-  errno = 0;
-
-  char* end;
-  // BiggestConvertible is the largest integer type that system-provided
-  // string-to-number conversion routines can return.
-
-# if GTEST_OS_WINDOWS && !defined(__GNUC__)
-
-  // MSVC and C++ Builder define __int64 instead of the standard long long.
-  typedef unsigned __int64 BiggestConvertible;
-  const BiggestConvertible parsed = _strtoui64(str.c_str(), &end, 10);
-
-# else
-
-  typedef unsigned long long BiggestConvertible;  // NOLINT
-  const BiggestConvertible parsed = strtoull(str.c_str(), &end, 10);
-
-# endif  // GTEST_OS_WINDOWS && !defined(__GNUC__)
-
-  const bool parse_success = *end == '\0' && errno == 0;
-
-  GTEST_CHECK_(sizeof(Integer) <= sizeof(parsed));
-
-  const Integer result = static_cast<Integer>(parsed);
-  if (parse_success && static_cast<BiggestConvertible>(result) == parsed) {
-    *number = result;
-    return true;
-  }
-  return false;
-}
-#endif  // GTEST_HAS_DEATH_TEST
-
-// TestResult contains some private methods that should be hidden from
-// Google Test user but are required for testing. This class allow our tests
-// to access them.
-//
-// This class is supplied only for the purpose of testing Google Test's own
-// constructs. Do not use it in user tests, either directly or indirectly.
-class TestResultAccessor {
- public:
-  static void RecordProperty(TestResult* test_result,
-                             const std::string& xml_element,
-                             const TestProperty& property) {
-    test_result->RecordProperty(xml_element, property);
-  }
-
-  static void ClearTestPartResults(TestResult* test_result) {
-    test_result->ClearTestPartResults();
-  }
-
-  static const std::vector<testing::TestPartResult>& test_part_results(
-      const TestResult& test_result) {
-    return test_result.test_part_results();
-  }
-};
-
-#if GTEST_CAN_STREAM_RESULTS_
-
-// Streams test results to the given port on the given host machine.
-class StreamingListener : public EmptyTestEventListener {
- public:
-  // Abstract base class for writing strings to a socket.
-  class AbstractSocketWriter {
-   public:
-    virtual ~AbstractSocketWriter() {}
-
-    // Sends a string to the socket.
-    virtual void Send(const std::string& message) = 0;
-
-    // Closes the socket.
-    virtual void CloseConnection() {}
-
-    // Sends a string and a newline to the socket.
-    void SendLn(const std::string& message) { Send(message + "\n"); }
-  };
-
-  // Concrete class for actually writing strings to a socket.
-  class SocketWriter : public AbstractSocketWriter {
-   public:
-    SocketWriter(const std::string& host, const std::string& port)
-        : sockfd_(-1), host_name_(host), port_num_(port) {
-      MakeConnection();
-    }
-
-    ~SocketWriter() override {
-      if (sockfd_ != -1)
-        CloseConnection();
-    }
-
-    // Sends a string to the socket.
-    void Send(const std::string& message) override {
-      GTEST_CHECK_(sockfd_ != -1)
-          << "Send() can be called only when there is a connection.";
-
-      const auto len = static_cast<size_t>(message.length());
-      if (write(sockfd_, message.c_str(), len) != static_cast<ssize_t>(len)) {
-        GTEST_LOG_(WARNING)
-            << "stream_result_to: failed to stream to "
-            << host_name_ << ":" << port_num_;
-      }
-    }
-
-   private:
-    // Creates a client socket and connects to the server.
-    void MakeConnection();
-
-    // Closes the socket.
-    void CloseConnection() override {
-      GTEST_CHECK_(sockfd_ != -1)
-          << "CloseConnection() can be called only when there is a connection.";
-
-      close(sockfd_);
-      sockfd_ = -1;
-    }
-
-    int sockfd_;  // socket file descriptor
-    const std::string host_name_;
-    const std::string port_num_;
-
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(SocketWriter);
-  };  // class SocketWriter
-
-  // Escapes '=', '&', '%', and '\n' characters in str as "%xx".
-  static std::string UrlEncode(const char* str);
-
-  StreamingListener(const std::string& host, const std::string& port)
-      : socket_writer_(new SocketWriter(host, port)) {
-    Start();
-  }
-
-  explicit StreamingListener(AbstractSocketWriter* socket_writer)
-      : socket_writer_(socket_writer) { Start(); }
-
-  void OnTestProgramStart(const UnitTest& /* unit_test */) override {
-    SendLn("event=TestProgramStart");
-  }
-
-  void OnTestProgramEnd(const UnitTest& unit_test) override {
-    // Note that Google Test current only report elapsed time for each
-    // test iteration, not for the entire test program.
-    SendLn("event=TestProgramEnd&passed=" + FormatBool(unit_test.Passed()));
-
-    // Notify the streaming server to stop.
-    socket_writer_->CloseConnection();
-  }
-
-  void OnTestIterationStart(const UnitTest& /* unit_test */,
-                            int iteration) override {
-    SendLn("event=TestIterationStart&iteration=" +
-           StreamableToString(iteration));
-  }
-
-  void OnTestIterationEnd(const UnitTest& unit_test,
-                          int /* iteration */) override {
-    SendLn("event=TestIterationEnd&passed=" +
-           FormatBool(unit_test.Passed()) + "&elapsed_time=" +
-           StreamableToString(unit_test.elapsed_time()) + "ms");
-  }
-
-  // Note that "event=TestCaseStart" is a wire format and has to remain
-  // "case" for compatibilty
-  void OnTestCaseStart(const TestCase& test_case) override {
-    SendLn(std::string("event=TestCaseStart&name=") + test_case.name());
-  }
-
-  // Note that "event=TestCaseEnd" is a wire format and has to remain
-  // "case" for compatibilty
-  void OnTestCaseEnd(const TestCase& test_case) override {
-    SendLn("event=TestCaseEnd&passed=" + FormatBool(test_case.Passed()) +
-           "&elapsed_time=" + StreamableToString(test_case.elapsed_time()) +
-           "ms");
-  }
-
-  void OnTestStart(const TestInfo& test_info) override {
-    SendLn(std::string("event=TestStart&name=") + test_info.name());
-  }
-
-  void OnTestEnd(const TestInfo& test_info) override {
-    SendLn("event=TestEnd&passed=" +
-           FormatBool((test_info.result())->Passed()) +
-           "&elapsed_time=" +
-           StreamableToString((test_info.result())->elapsed_time()) + "ms");
-  }
-
-  void OnTestPartResult(const TestPartResult& test_part_result) override {
-    const char* file_name = test_part_result.file_name();
-    if (file_name == nullptr) file_name = "";
-    SendLn("event=TestPartResult&file=" + UrlEncode(file_name) +
-           "&line=" + StreamableToString(test_part_result.line_number()) +
-           "&message=" + UrlEncode(test_part_result.message()));
-  }
-
- private:
-  // Sends the given message and a newline to the socket.
-  void SendLn(const std::string& message) { socket_writer_->SendLn(message); }
-
-  // Called at the start of streaming to notify the receiver what
-  // protocol we are using.
-  void Start() { SendLn("gtest_streaming_protocol_version=1.0"); }
-
-  std::string FormatBool(bool value) { return value ? "1" : "0"; }
-
-  const std::unique_ptr<AbstractSocketWriter> socket_writer_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(StreamingListener);
-};  // class StreamingListener
-
-#endif  // GTEST_CAN_STREAM_RESULTS_
-
-}  // namespace internal
-}  // namespace testing
-
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
-
-#endif  // GTEST_SRC_GTEST_INTERNAL_INL_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/src/gtest_main.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/src/gtest_main.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/src/gtest_main.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/src/gtest_main.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-// Copyright 2006, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <cstdio>
-#include "gtest/gtest.h"
-
-#ifdef ARDUINO
-void setup() {
-  testing::InitGoogleTest();
-}
-
-void loop() { RUN_ALL_TESTS(); }
-
-#else
-
-GTEST_API_ int main(int argc, char **argv) {
-  printf("Running main() from %s\n", __FILE__);
-  testing::InitGoogleTest(&argc, argv);
-  return RUN_ALL_TESTS();
-}
-#endif
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/src/gtest-matchers.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/src/gtest-matchers.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/src/gtest-matchers.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/src/gtest-matchers.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,97 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// The Google C++ Testing and Mocking Framework (Google Test)
-//
-// This file implements just enough of the matcher interface to allow
-// EXPECT_DEATH and friends to accept a matcher argument.
-
-#include "gtest/internal/gtest-internal.h"
-#include "gtest/internal/gtest-port.h"
-#include "gtest/gtest-matchers.h"
-
-#include <string>
-
-namespace testing {
-
-// Constructs a matcher that matches a const std::string& whose value is
-// equal to s.
-Matcher<const std::string&>::Matcher(const std::string& s) { *this = Eq(s); }
-
-// Constructs a matcher that matches a const std::string& whose value is
-// equal to s.
-Matcher<const std::string&>::Matcher(const char* s) {
-  *this = Eq(std::string(s));
-}
-
-// Constructs a matcher that matches a std::string whose value is equal to
-// s.
-Matcher<std::string>::Matcher(const std::string& s) { *this = Eq(s); }
-
-// Constructs a matcher that matches a std::string whose value is equal to
-// s.
-Matcher<std::string>::Matcher(const char* s) { *this = Eq(std::string(s)); }
-
-#if GTEST_HAS_ABSL
-// Constructs a matcher that matches a const absl::string_view& whose value is
-// equal to s.
-Matcher<const absl::string_view&>::Matcher(const std::string& s) {
-  *this = Eq(s);
-}
-
-// Constructs a matcher that matches a const absl::string_view& whose value is
-// equal to s.
-Matcher<const absl::string_view&>::Matcher(const char* s) {
-  *this = Eq(std::string(s));
-}
-
-// Constructs a matcher that matches a const absl::string_view& whose value is
-// equal to s.
-Matcher<const absl::string_view&>::Matcher(absl::string_view s) {
-  *this = Eq(std::string(s));
-}
-
-// Constructs a matcher that matches a absl::string_view whose value is equal to
-// s.
-Matcher<absl::string_view>::Matcher(const std::string& s) { *this = Eq(s); }
-
-// Constructs a matcher that matches a absl::string_view whose value is equal to
-// s.
-Matcher<absl::string_view>::Matcher(const char* s) {
-  *this = Eq(std::string(s));
-}
-
-// Constructs a matcher that matches a absl::string_view whose value is equal to
-// s.
-Matcher<absl::string_view>::Matcher(absl::string_view s) {
-  *this = Eq(std::string(s));
-}
-#endif  // GTEST_HAS_ABSL
-
-}  // namespace testing
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/src/gtest-port.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/src/gtest-port.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/src/gtest-port.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/src/gtest-port.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,1399 +0,0 @@
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-#include "gtest/internal/gtest-port.h"
-
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <fstream>
-#include <memory>
-
-#if GTEST_OS_WINDOWS
-# include <windows.h>
-# include <io.h>
-# include <sys/stat.h>
-# include <map>  // Used in ThreadLocal.
-# ifdef _MSC_VER
-#  include <crtdbg.h>
-# endif  // _MSC_VER
-#else
-# include <unistd.h>
-#endif  // GTEST_OS_WINDOWS
-
-#if GTEST_OS_MAC
-# include <mach/mach_init.h>
-# include <mach/task.h>
-# include <mach/vm_map.h>
-#endif  // GTEST_OS_MAC
-
-#if GTEST_OS_DRAGONFLY || GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD || \
-    GTEST_OS_NETBSD || GTEST_OS_OPENBSD
-# include <sys/sysctl.h>
-# if GTEST_OS_DRAGONFLY || GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD
-#  include <sys/user.h>
-# endif
-#endif
-
-#if GTEST_OS_QNX
-# include <devctl.h>
-# include <fcntl.h>
-# include <sys/procfs.h>
-#endif  // GTEST_OS_QNX
-
-#if GTEST_OS_AIX
-# include <procinfo.h>
-# include <sys/types.h>
-#endif  // GTEST_OS_AIX
-
-#if GTEST_OS_FUCHSIA
-# include <zircon/process.h>
-# include <zircon/syscalls.h>
-#endif  // GTEST_OS_FUCHSIA
-
-#include "gtest/gtest-spi.h"
-#include "gtest/gtest-message.h"
-#include "gtest/internal/gtest-internal.h"
-#include "gtest/internal/gtest-string.h"
-#include "src/gtest-internal-inl.h"
-
-namespace testing {
-namespace internal {
-
-#if defined(_MSC_VER) || defined(__BORLANDC__)
-// MSVC and C++Builder do not provide a definition of STDERR_FILENO.
-const int kStdOutFileno = 1;
-const int kStdErrFileno = 2;
-#else
-const int kStdOutFileno = STDOUT_FILENO;
-const int kStdErrFileno = STDERR_FILENO;
-#endif  // _MSC_VER
-
-#if GTEST_OS_LINUX
-
-namespace {
-template <typename T>
-T ReadProcFileField(const std::string& filename, int field) {
-  std::string dummy;
-  std::ifstream file(filename.c_str());
-  while (field-- > 0) {
-    file >> dummy;
-  }
-  T output = 0;
-  file >> output;
-  return output;
-}
-}  // namespace
-
-// Returns the number of active threads, or 0 when there is an error.
-size_t GetThreadCount() {
-  const std::string filename =
-      (Message() << "/proc/" << getpid() << "/stat").GetString();
-  return ReadProcFileField<size_t>(filename, 19);
-}
-
-#elif GTEST_OS_MAC
-
-size_t GetThreadCount() {
-  const task_t task = mach_task_self();
-  mach_msg_type_number_t thread_count;
-  thread_act_array_t thread_list;
-  const kern_return_t status = task_threads(task, &thread_list, &thread_count);
-  if (status == KERN_SUCCESS) {
-    // task_threads allocates resources in thread_list and we need to free them
-    // to avoid leaks.
-    vm_deallocate(task,
-                  reinterpret_cast<vm_address_t>(thread_list),
-                  sizeof(thread_t) * thread_count);
-    return static_cast<size_t>(thread_count);
-  } else {
-    return 0;
-  }
-}
-
-#elif GTEST_OS_DRAGONFLY || GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD || \
-      GTEST_OS_NETBSD
-
-#if GTEST_OS_NETBSD
-#undef KERN_PROC
-#define KERN_PROC KERN_PROC2
-#define kinfo_proc kinfo_proc2
-#endif
-
-#if GTEST_OS_DRAGONFLY
-#define KP_NLWP(kp) (kp.kp_nthreads)
-#elif GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD
-#define KP_NLWP(kp) (kp.ki_numthreads)
-#elif GTEST_OS_NETBSD
-#define KP_NLWP(kp) (kp.p_nlwps)
-#endif
-
-// Returns the number of threads running in the process, or 0 to indicate that
-// we cannot detect it.
-size_t GetThreadCount() {
-  int mib[] = {
-    CTL_KERN,
-    KERN_PROC,
-    KERN_PROC_PID,
-    getpid(),
-#if GTEST_OS_NETBSD
-    sizeof(struct kinfo_proc),
-    1,
-#endif
-  };
-  u_int miblen = sizeof(mib) / sizeof(mib[0]);
-  struct kinfo_proc info;
-  size_t size = sizeof(info);
-  if (sysctl(mib, miblen, &info, &size, NULL, 0)) {
-    return 0;
-  }
-  return static_cast<size_t>(KP_NLWP(info));
-}
-#elif GTEST_OS_OPENBSD
-
-// Returns the number of threads running in the process, or 0 to indicate that
-// we cannot detect it.
-size_t GetThreadCount() {
-  int mib[] = {
-    CTL_KERN,
-    KERN_PROC,
-    KERN_PROC_PID | KERN_PROC_SHOW_THREADS,
-    getpid(),
-    sizeof(struct kinfo_proc),
-    0,
-  };
-  u_int miblen = sizeof(mib) / sizeof(mib[0]);
-
-  // get number of structs
-  size_t size;
-  if (sysctl(mib, miblen, NULL, &size, NULL, 0)) {
-    return 0;
-  }
-  mib[5] = size / mib[4];
-
-  // populate array of structs
-  struct kinfo_proc info[mib[5]];
-  if (sysctl(mib, miblen, &info, &size, NULL, 0)) {
-    return 0;
-  }
-
-  // exclude empty members
-  int nthreads = 0;
-  for (int i = 0; i < size / mib[4]; i++) {
-    if (info[i].p_tid != -1)
-      nthreads++;
-  }
-  return nthreads;
-}
-
-#elif GTEST_OS_QNX
-
-// Returns the number of threads running in the process, or 0 to indicate that
-// we cannot detect it.
-size_t GetThreadCount() {
-  const int fd = open("/proc/self/as", O_RDONLY);
-  if (fd < 0) {
-    return 0;
-  }
-  procfs_info process_info;
-  const int status =
-      devctl(fd, DCMD_PROC_INFO, &process_info, sizeof(process_info), nullptr);
-  close(fd);
-  if (status == EOK) {
-    return static_cast<size_t>(process_info.num_threads);
-  } else {
-    return 0;
-  }
-}
-
-#elif GTEST_OS_AIX
-
-size_t GetThreadCount() {
-  struct procentry64 entry;
-  pid_t pid = getpid();
-  int status = getprocs64(&entry, sizeof(entry), nullptr, 0, &pid, 1);
-  if (status == 1) {
-    return entry.pi_thcount;
-  } else {
-    return 0;
-  }
-}
-
-#elif GTEST_OS_FUCHSIA
-
-size_t GetThreadCount() {
-  int dummy_buffer;
-  size_t avail;
-  zx_status_t status = zx_object_get_info(
-      zx_process_self(),
-      ZX_INFO_PROCESS_THREADS,
-      &dummy_buffer,
-      0,
-      nullptr,
-      &avail);
-  if (status == ZX_OK) {
-    return avail;
-  } else {
-    return 0;
-  }
-}
-
-#else
-
-size_t GetThreadCount() {
-  // There's no portable way to detect the number of threads, so we just
-  // return 0 to indicate that we cannot detect it.
-  return 0;
-}
-
-#endif  // GTEST_OS_LINUX
-
-#if GTEST_IS_THREADSAFE && GTEST_OS_WINDOWS
-
-void SleepMilliseconds(int n) {
-  ::Sleep(static_cast<DWORD>(n));
-}
-
-AutoHandle::AutoHandle()
-    : handle_(INVALID_HANDLE_VALUE) {}
-
-AutoHandle::AutoHandle(Handle handle)
-    : handle_(handle) {}
-
-AutoHandle::~AutoHandle() {
-  Reset();
-}
-
-AutoHandle::Handle AutoHandle::Get() const {
-  return handle_;
-}
-
-void AutoHandle::Reset() {
-  Reset(INVALID_HANDLE_VALUE);
-}
-
-void AutoHandle::Reset(HANDLE handle) {
-  // Resetting with the same handle we already own is invalid.
-  if (handle_ != handle) {
-    if (IsCloseable()) {
-      ::CloseHandle(handle_);
-    }
-    handle_ = handle;
-  } else {
-    GTEST_CHECK_(!IsCloseable())
-        << "Resetting a valid handle to itself is likely a programmer error "
-            "and thus not allowed.";
-  }
-}
-
-bool AutoHandle::IsCloseable() const {
-  // Different Windows APIs may use either of these values to represent an
-  // invalid handle.
-  return handle_ != nullptr && handle_ != INVALID_HANDLE_VALUE;
-}
-
-Notification::Notification()
-    : event_(::CreateEvent(nullptr,     // Default security attributes.
-                           TRUE,        // Do not reset automatically.
-                           FALSE,       // Initially unset.
-                           nullptr)) {  // Anonymous event.
-  GTEST_CHECK_(event_.Get() != nullptr);
-}
-
-void Notification::Notify() {
-  GTEST_CHECK_(::SetEvent(event_.Get()) != FALSE);
-}
-
-void Notification::WaitForNotification() {
-  GTEST_CHECK_(
-      ::WaitForSingleObject(event_.Get(), INFINITE) == WAIT_OBJECT_0);
-}
-
-Mutex::Mutex()
-    : owner_thread_id_(0),
-      type_(kDynamic),
-      critical_section_init_phase_(0),
-      critical_section_(new CRITICAL_SECTION) {
-  ::InitializeCriticalSection(critical_section_);
-}
-
-Mutex::~Mutex() {
-  // Static mutexes are leaked intentionally. It is not thread-safe to try
-  // to clean them up.
-  if (type_ == kDynamic) {
-    ::DeleteCriticalSection(critical_section_);
-    delete critical_section_;
-    critical_section_ = nullptr;
-  }
-}
-
-void Mutex::Lock() {
-  ThreadSafeLazyInit();
-  ::EnterCriticalSection(critical_section_);
-  owner_thread_id_ = ::GetCurrentThreadId();
-}
-
-void Mutex::Unlock() {
-  ThreadSafeLazyInit();
-  // We don't protect writing to owner_thread_id_ here, as it's the
-  // caller's responsibility to ensure that the current thread holds the
-  // mutex when this is called.
-  owner_thread_id_ = 0;
-  ::LeaveCriticalSection(critical_section_);
-}
-
-// Does nothing if the current thread holds the mutex. Otherwise, crashes
-// with high probability.
-void Mutex::AssertHeld() {
-  ThreadSafeLazyInit();
-  GTEST_CHECK_(owner_thread_id_ == ::GetCurrentThreadId())
-      << "The current thread is not holding the mutex @" << this;
-}
-
-namespace {
-
-#ifdef _MSC_VER
-// Use the RAII idiom to flag mem allocs that are intentionally never
-// deallocated. The motivation is to silence the false positive mem leaks
-// that are reported by the debug version of MS's CRT which can only detect
-// if an alloc is missing a matching deallocation.
-// Example:
-//    MemoryIsNotDeallocated memory_is_not_deallocated;
-//    critical_section_ = new CRITICAL_SECTION;
-//
-class MemoryIsNotDeallocated
-{
- public:
-  MemoryIsNotDeallocated() : old_crtdbg_flag_(0) {
-    old_crtdbg_flag_ = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
-    // Set heap allocation block type to _IGNORE_BLOCK so that MS debug CRT
-    // doesn't report mem leak if there's no matching deallocation.
-    _CrtSetDbgFlag(old_crtdbg_flag_ & ~_CRTDBG_ALLOC_MEM_DF);
-  }
-
-  ~MemoryIsNotDeallocated() {
-    // Restore the original _CRTDBG_ALLOC_MEM_DF flag
-    _CrtSetDbgFlag(old_crtdbg_flag_);
-  }
-
- private:
-  int old_crtdbg_flag_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(MemoryIsNotDeallocated);
-};
-#endif  // _MSC_VER
-
-}  // namespace
-
-// Initializes owner_thread_id_ and critical_section_ in static mutexes.
-void Mutex::ThreadSafeLazyInit() {
-  // Dynamic mutexes are initialized in the constructor.
-  if (type_ == kStatic) {
-    switch (
-        ::InterlockedCompareExchange(&critical_section_init_phase_, 1L, 0L)) {
-      case 0:
-        // If critical_section_init_phase_ was 0 before the exchange, we
-        // are the first to test it and need to perform the initialization.
-        owner_thread_id_ = 0;
-        {
-          // Use RAII to flag that following mem alloc is never deallocated.
-#ifdef _MSC_VER
-          MemoryIsNotDeallocated memory_is_not_deallocated;
-#endif  // _MSC_VER
-          critical_section_ = new CRITICAL_SECTION;
-        }
-        ::InitializeCriticalSection(critical_section_);
-        // Updates the critical_section_init_phase_ to 2 to signal
-        // initialization complete.
-        GTEST_CHECK_(::InterlockedCompareExchange(
-                          &critical_section_init_phase_, 2L, 1L) ==
-                      1L);
-        break;
-      case 1:
-        // Somebody else is already initializing the mutex; spin until they
-        // are done.
-        while (::InterlockedCompareExchange(&critical_section_init_phase_,
-                                            2L,
-                                            2L) != 2L) {
-          // Possibly yields the rest of the thread's time slice to other
-          // threads.
-          ::Sleep(0);
-        }
-        break;
-
-      case 2:
-        break;  // The mutex is already initialized and ready for use.
-
-      default:
-        GTEST_CHECK_(false)
-            << "Unexpected value of critical_section_init_phase_ "
-            << "while initializing a static mutex.";
-    }
-  }
-}
-
-namespace {
-
-class ThreadWithParamSupport : public ThreadWithParamBase {
- public:
-  static HANDLE CreateThread(Runnable* runnable,
-                             Notification* thread_can_start) {
-    ThreadMainParam* param = new ThreadMainParam(runnable, thread_can_start);
-    DWORD thread_id;
-    HANDLE thread_handle = ::CreateThread(
-        nullptr,  // Default security.
-        0,        // Default stack size.
-        &ThreadWithParamSupport::ThreadMain,
-        param,        // Parameter to ThreadMainStatic
-        0x0,          // Default creation flags.
-        &thread_id);  // Need a valid pointer for the call to work under Win98.
-    GTEST_CHECK_(thread_handle != nullptr)
-        << "CreateThread failed with error " << ::GetLastError() << ".";
-    if (thread_handle == nullptr) {
-      delete param;
-    }
-    return thread_handle;
-  }
-
- private:
-  struct ThreadMainParam {
-    ThreadMainParam(Runnable* runnable, Notification* thread_can_start)
-        : runnable_(runnable),
-          thread_can_start_(thread_can_start) {
-    }
-    std::unique_ptr<Runnable> runnable_;
-    // Does not own.
-    Notification* thread_can_start_;
-  };
-
-  static DWORD WINAPI ThreadMain(void* ptr) {
-    // Transfers ownership.
-    std::unique_ptr<ThreadMainParam> param(static_cast<ThreadMainParam*>(ptr));
-    if (param->thread_can_start_ != nullptr)
-      param->thread_can_start_->WaitForNotification();
-    param->runnable_->Run();
-    return 0;
-  }
-
-  // Prohibit instantiation.
-  ThreadWithParamSupport();
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadWithParamSupport);
-};
-
-}  // namespace
-
-ThreadWithParamBase::ThreadWithParamBase(Runnable *runnable,
-                                         Notification* thread_can_start)
-      : thread_(ThreadWithParamSupport::CreateThread(runnable,
-                                                     thread_can_start)) {
-}
-
-ThreadWithParamBase::~ThreadWithParamBase() {
-  Join();
-}
-
-void ThreadWithParamBase::Join() {
-  GTEST_CHECK_(::WaitForSingleObject(thread_.Get(), INFINITE) == WAIT_OBJECT_0)
-      << "Failed to join the thread with error " << ::GetLastError() << ".";
-}
-
-// Maps a thread to a set of ThreadIdToThreadLocals that have values
-// instantiated on that thread and notifies them when the thread exits.  A
-// ThreadLocal instance is expected to persist until all threads it has
-// values on have terminated.
-class ThreadLocalRegistryImpl {
- public:
-  // Registers thread_local_instance as having value on the current thread.
-  // Returns a value that can be used to identify the thread from other threads.
-  static ThreadLocalValueHolderBase* GetValueOnCurrentThread(
-      const ThreadLocalBase* thread_local_instance) {
-    DWORD current_thread = ::GetCurrentThreadId();
-    MutexLock lock(&mutex_);
-    ThreadIdToThreadLocals* const thread_to_thread_locals =
-        GetThreadLocalsMapLocked();
-    ThreadIdToThreadLocals::iterator thread_local_pos =
-        thread_to_thread_locals->find(current_thread);
-    if (thread_local_pos == thread_to_thread_locals->end()) {
-      thread_local_pos = thread_to_thread_locals->insert(
-          std::make_pair(current_thread, ThreadLocalValues())).first;
-      StartWatcherThreadFor(current_thread);
-    }
-    ThreadLocalValues& thread_local_values = thread_local_pos->second;
-    ThreadLocalValues::iterator value_pos =
-        thread_local_values.find(thread_local_instance);
-    if (value_pos == thread_local_values.end()) {
-      value_pos =
-          thread_local_values
-              .insert(std::make_pair(
-                  thread_local_instance,
-                  std::shared_ptr<ThreadLocalValueHolderBase>(
-                      thread_local_instance->NewValueForCurrentThread())))
-              .first;
-    }
-    return value_pos->second.get();
-  }
-
-  static void OnThreadLocalDestroyed(
-      const ThreadLocalBase* thread_local_instance) {
-    std::vector<std::shared_ptr<ThreadLocalValueHolderBase> > value_holders;
-    // Clean up the ThreadLocalValues data structure while holding the lock, but
-    // defer the destruction of the ThreadLocalValueHolderBases.
-    {
-      MutexLock lock(&mutex_);
-      ThreadIdToThreadLocals* const thread_to_thread_locals =
-          GetThreadLocalsMapLocked();
-      for (ThreadIdToThreadLocals::iterator it =
-          thread_to_thread_locals->begin();
-          it != thread_to_thread_locals->end();
-          ++it) {
-        ThreadLocalValues& thread_local_values = it->second;
-        ThreadLocalValues::iterator value_pos =
-            thread_local_values.find(thread_local_instance);
-        if (value_pos != thread_local_values.end()) {
-          value_holders.push_back(value_pos->second);
-          thread_local_values.erase(value_pos);
-          // This 'if' can only be successful at most once, so theoretically we
-          // could break out of the loop here, but we don't bother doing so.
-        }
-      }
-    }
-    // Outside the lock, let the destructor for 'value_holders' deallocate the
-    // ThreadLocalValueHolderBases.
-  }
-
-  static void OnThreadExit(DWORD thread_id) {
-    GTEST_CHECK_(thread_id != 0) << ::GetLastError();
-    std::vector<std::shared_ptr<ThreadLocalValueHolderBase> > value_holders;
-    // Clean up the ThreadIdToThreadLocals data structure while holding the
-    // lock, but defer the destruction of the ThreadLocalValueHolderBases.
-    {
-      MutexLock lock(&mutex_);
-      ThreadIdToThreadLocals* const thread_to_thread_locals =
-          GetThreadLocalsMapLocked();
-      ThreadIdToThreadLocals::iterator thread_local_pos =
-          thread_to_thread_locals->find(thread_id);
-      if (thread_local_pos != thread_to_thread_locals->end()) {
-        ThreadLocalValues& thread_local_values = thread_local_pos->second;
-        for (ThreadLocalValues::iterator value_pos =
-            thread_local_values.begin();
-            value_pos != thread_local_values.end();
-            ++value_pos) {
-          value_holders.push_back(value_pos->second);
-        }
-        thread_to_thread_locals->erase(thread_local_pos);
-      }
-    }
-    // Outside the lock, let the destructor for 'value_holders' deallocate the
-    // ThreadLocalValueHolderBases.
-  }
-
- private:
-  // In a particular thread, maps a ThreadLocal object to its value.
-  typedef std::map<const ThreadLocalBase*,
-                   std::shared_ptr<ThreadLocalValueHolderBase> >
-      ThreadLocalValues;
-  // Stores all ThreadIdToThreadLocals having values in a thread, indexed by
-  // thread's ID.
-  typedef std::map<DWORD, ThreadLocalValues> ThreadIdToThreadLocals;
-
-  // Holds the thread id and thread handle that we pass from
-  // StartWatcherThreadFor to WatcherThreadFunc.
-  typedef std::pair<DWORD, HANDLE> ThreadIdAndHandle;
-
-  static void StartWatcherThreadFor(DWORD thread_id) {
-    // The returned handle will be kept in thread_map and closed by
-    // watcher_thread in WatcherThreadFunc.
-    HANDLE thread = ::OpenThread(SYNCHRONIZE | THREAD_QUERY_INFORMATION,
-                                 FALSE,
-                                 thread_id);
-    GTEST_CHECK_(thread != nullptr);
-    // We need to pass a valid thread ID pointer into CreateThread for it
-    // to work correctly under Win98.
-    DWORD watcher_thread_id;
-    HANDLE watcher_thread = ::CreateThread(
-        nullptr,  // Default security.
-        0,        // Default stack size
-        &ThreadLocalRegistryImpl::WatcherThreadFunc,
-        reinterpret_cast<LPVOID>(new ThreadIdAndHandle(thread_id, thread)),
-        CREATE_SUSPENDED, &watcher_thread_id);
-    GTEST_CHECK_(watcher_thread != nullptr);
-    // Give the watcher thread the same priority as ours to avoid being
-    // blocked by it.
-    ::SetThreadPriority(watcher_thread,
-                        ::GetThreadPriority(::GetCurrentThread()));
-    ::ResumeThread(watcher_thread);
-    ::CloseHandle(watcher_thread);
-  }
-
-  // Monitors exit from a given thread and notifies those
-  // ThreadIdToThreadLocals about thread termination.
-  static DWORD WINAPI WatcherThreadFunc(LPVOID param) {
-    const ThreadIdAndHandle* tah =
-        reinterpret_cast<const ThreadIdAndHandle*>(param);
-    GTEST_CHECK_(
-        ::WaitForSingleObject(tah->second, INFINITE) == WAIT_OBJECT_0);
-    OnThreadExit(tah->first);
-    ::CloseHandle(tah->second);
-    delete tah;
-    return 0;
-  }
-
-  // Returns map of thread local instances.
-  static ThreadIdToThreadLocals* GetThreadLocalsMapLocked() {
-    mutex_.AssertHeld();
-#ifdef _MSC_VER
-    MemoryIsNotDeallocated memory_is_not_deallocated;
-#endif  // _MSC_VER
-    static ThreadIdToThreadLocals* map = new ThreadIdToThreadLocals();
-    return map;
-  }
-
-  // Protects access to GetThreadLocalsMapLocked() and its return value.
-  static Mutex mutex_;
-  // Protects access to GetThreadMapLocked() and its return value.
-  static Mutex thread_map_mutex_;
-};
-
-Mutex ThreadLocalRegistryImpl::mutex_(Mutex::kStaticMutex);
-Mutex ThreadLocalRegistryImpl::thread_map_mutex_(Mutex::kStaticMutex);
-
-ThreadLocalValueHolderBase* ThreadLocalRegistry::GetValueOnCurrentThread(
-      const ThreadLocalBase* thread_local_instance) {
-  return ThreadLocalRegistryImpl::GetValueOnCurrentThread(
-      thread_local_instance);
-}
-
-void ThreadLocalRegistry::OnThreadLocalDestroyed(
-      const ThreadLocalBase* thread_local_instance) {
-  ThreadLocalRegistryImpl::OnThreadLocalDestroyed(thread_local_instance);
-}
-
-#endif  // GTEST_IS_THREADSAFE && GTEST_OS_WINDOWS
-
-#if GTEST_USES_POSIX_RE
-
-// Implements RE.  Currently only needed for death tests.
-
-RE::~RE() {
-  if (is_valid_) {
-    // regfree'ing an invalid regex might crash because the content
-    // of the regex is undefined. Since the regex's are essentially
-    // the same, one cannot be valid (or invalid) without the other
-    // being so too.
-    regfree(&partial_regex_);
-    regfree(&full_regex_);
-  }
-  free(const_cast<char*>(pattern_));
-}
-
-// Returns true if and only if regular expression re matches the entire str.
-bool RE::FullMatch(const char* str, const RE& re) {
-  if (!re.is_valid_) return false;
-
-  regmatch_t match;
-  return regexec(&re.full_regex_, str, 1, &match, 0) == 0;
-}
-
-// Returns true if and only if regular expression re matches a substring of
-// str (including str itself).
-bool RE::PartialMatch(const char* str, const RE& re) {
-  if (!re.is_valid_) return false;
-
-  regmatch_t match;
-  return regexec(&re.partial_regex_, str, 1, &match, 0) == 0;
-}
-
-// Initializes an RE from its string representation.
-void RE::Init(const char* regex) {
-  pattern_ = posix::StrDup(regex);
-
-  // Reserves enough bytes to hold the regular expression used for a
-  // full match.
-  const size_t full_regex_len = strlen(regex) + 10;
-  char* const full_pattern = new char[full_regex_len];
-
-  snprintf(full_pattern, full_regex_len, "^(%s)$", regex);
-  is_valid_ = regcomp(&full_regex_, full_pattern, REG_EXTENDED) == 0;
-  // We want to call regcomp(&partial_regex_, ...) even if the
-  // previous expression returns false.  Otherwise partial_regex_ may
-  // not be properly initialized can may cause trouble when it's
-  // freed.
-  //
-  // Some implementation of POSIX regex (e.g. on at least some
-  // versions of Cygwin) doesn't accept the empty string as a valid
-  // regex.  We change it to an equivalent form "()" to be safe.
-  if (is_valid_) {
-    const char* const partial_regex = (*regex == '\0') ? "()" : regex;
-    is_valid_ = regcomp(&partial_regex_, partial_regex, REG_EXTENDED) == 0;
-  }
-  EXPECT_TRUE(is_valid_)
-      << "Regular expression \"" << regex
-      << "\" is not a valid POSIX Extended regular expression.";
-
-  delete[] full_pattern;
-}
-
-#elif GTEST_USES_SIMPLE_RE
-
-// Returns true if and only if ch appears anywhere in str (excluding the
-// terminating '\0' character).
-bool IsInSet(char ch, const char* str) {
-  return ch != '\0' && strchr(str, ch) != nullptr;
-}
-
-// Returns true if and only if ch belongs to the given classification.
-// Unlike similar functions in <ctype.h>, these aren't affected by the
-// current locale.
-bool IsAsciiDigit(char ch) { return '0' <= ch && ch <= '9'; }
-bool IsAsciiPunct(char ch) {
-  return IsInSet(ch, "^-!\"#$%&'()*+,./:;<=>?@[\\]_`{|}~");
-}
-bool IsRepeat(char ch) { return IsInSet(ch, "?*+"); }
-bool IsAsciiWhiteSpace(char ch) { return IsInSet(ch, " \f\n\r\t\v"); }
-bool IsAsciiWordChar(char ch) {
-  return ('a' <= ch && ch <= 'z') || ('A' <= ch && ch <= 'Z') ||
-      ('0' <= ch && ch <= '9') || ch == '_';
-}
-
-// Returns true if and only if "\\c" is a supported escape sequence.
-bool IsValidEscape(char c) {
-  return (IsAsciiPunct(c) || IsInSet(c, "dDfnrsStvwW"));
-}
-
-// Returns true if and only if the given atom (specified by escaped and
-// pattern) matches ch.  The result is undefined if the atom is invalid.
-bool AtomMatchesChar(bool escaped, char pattern_char, char ch) {
-  if (escaped) {  // "\\p" where p is pattern_char.
-    switch (pattern_char) {
-      case 'd': return IsAsciiDigit(ch);
-      case 'D': return !IsAsciiDigit(ch);
-      case 'f': return ch == '\f';
-      case 'n': return ch == '\n';
-      case 'r': return ch == '\r';
-      case 's': return IsAsciiWhiteSpace(ch);
-      case 'S': return !IsAsciiWhiteSpace(ch);
-      case 't': return ch == '\t';
-      case 'v': return ch == '\v';
-      case 'w': return IsAsciiWordChar(ch);
-      case 'W': return !IsAsciiWordChar(ch);
-    }
-    return IsAsciiPunct(pattern_char) && pattern_char == ch;
-  }
-
-  return (pattern_char == '.' && ch != '\n') || pattern_char == ch;
-}
-
-// Helper function used by ValidateRegex() to format error messages.
-static std::string FormatRegexSyntaxError(const char* regex, int index) {
-  return (Message() << "Syntax error at index " << index
-          << " in simple regular expression \"" << regex << "\": ").GetString();
-}
-
-// Generates non-fatal failures and returns false if regex is invalid;
-// otherwise returns true.
-bool ValidateRegex(const char* regex) {
-  if (regex == nullptr) {
-    ADD_FAILURE() << "NULL is not a valid simple regular expression.";
-    return false;
-  }
-
-  bool is_valid = true;
-
-  // True if and only if ?, *, or + can follow the previous atom.
-  bool prev_repeatable = false;
-  for (int i = 0; regex[i]; i++) {
-    if (regex[i] == '\\') {  // An escape sequence
-      i++;
-      if (regex[i] == '\0') {
-        ADD_FAILURE() << FormatRegexSyntaxError(regex, i - 1)
-                      << "'\\' cannot appear at the end.";
-        return false;
-      }
-
-      if (!IsValidEscape(regex[i])) {
-        ADD_FAILURE() << FormatRegexSyntaxError(regex, i - 1)
-                      << "invalid escape sequence \"\\" << regex[i] << "\".";
-        is_valid = false;
-      }
-      prev_repeatable = true;
-    } else {  // Not an escape sequence.
-      const char ch = regex[i];
-
-      if (ch == '^' && i > 0) {
-        ADD_FAILURE() << FormatRegexSyntaxError(regex, i)
-                      << "'^' can only appear at the beginning.";
-        is_valid = false;
-      } else if (ch == '$' && regex[i + 1] != '\0') {
-        ADD_FAILURE() << FormatRegexSyntaxError(regex, i)
-                      << "'$' can only appear at the end.";
-        is_valid = false;
-      } else if (IsInSet(ch, "()[]{}|")) {
-        ADD_FAILURE() << FormatRegexSyntaxError(regex, i)
-                      << "'" << ch << "' is unsupported.";
-        is_valid = false;
-      } else if (IsRepeat(ch) && !prev_repeatable) {
-        ADD_FAILURE() << FormatRegexSyntaxError(regex, i)
-                      << "'" << ch << "' can only follow a repeatable token.";
-        is_valid = false;
-      }
-
-      prev_repeatable = !IsInSet(ch, "^$?*+");
-    }
-  }
-
-  return is_valid;
-}
-
-// Matches a repeated regex atom followed by a valid simple regular
-// expression.  The regex atom is defined as c if escaped is false,
-// or \c otherwise.  repeat is the repetition meta character (?, *,
-// or +).  The behavior is undefined if str contains too many
-// characters to be indexable by size_t, in which case the test will
-// probably time out anyway.  We are fine with this limitation as
-// std::string has it too.
-bool MatchRepetitionAndRegexAtHead(
-    bool escaped, char c, char repeat, const char* regex,
-    const char* str) {
-  const size_t min_count = (repeat == '+') ? 1 : 0;
-  const size_t max_count = (repeat == '?') ? 1 :
-      static_cast<size_t>(-1) - 1;
-  // We cannot call numeric_limits::max() as it conflicts with the
-  // max() macro on Windows.
-
-  for (size_t i = 0; i <= max_count; ++i) {
-    // We know that the atom matches each of the first i characters in str.
-    if (i >= min_count && MatchRegexAtHead(regex, str + i)) {
-      // We have enough matches at the head, and the tail matches too.
-      // Since we only care about *whether* the pattern matches str
-      // (as opposed to *how* it matches), there is no need to find a
-      // greedy match.
-      return true;
-    }
-    if (str[i] == '\0' || !AtomMatchesChar(escaped, c, str[i]))
-      return false;
-  }
-  return false;
-}
-
-// Returns true if and only if regex matches a prefix of str. regex must
-// be a valid simple regular expression and not start with "^", or the
-// result is undefined.
-bool MatchRegexAtHead(const char* regex, const char* str) {
-  if (*regex == '\0')  // An empty regex matches a prefix of anything.
-    return true;
-
-  // "$" only matches the end of a string.  Note that regex being
-  // valid guarantees that there's nothing after "$" in it.
-  if (*regex == '$')
-    return *str == '\0';
-
-  // Is the first thing in regex an escape sequence?
-  const bool escaped = *regex == '\\';
-  if (escaped)
-    ++regex;
-  if (IsRepeat(regex[1])) {
-    // MatchRepetitionAndRegexAtHead() calls MatchRegexAtHead(), so
-    // here's an indirect recursion.  It terminates as the regex gets
-    // shorter in each recursion.
-    return MatchRepetitionAndRegexAtHead(
-        escaped, regex[0], regex[1], regex + 2, str);
-  } else {
-    // regex isn't empty, isn't "$", and doesn't start with a
-    // repetition.  We match the first atom of regex with the first
-    // character of str and recurse.
-    return (*str != '\0') && AtomMatchesChar(escaped, *regex, *str) &&
-        MatchRegexAtHead(regex + 1, str + 1);
-  }
-}
-
-// Returns true if and only if regex matches any substring of str.  regex must
-// be a valid simple regular expression, or the result is undefined.
-//
-// The algorithm is recursive, but the recursion depth doesn't exceed
-// the regex length, so we won't need to worry about running out of
-// stack space normally.  In rare cases the time complexity can be
-// exponential with respect to the regex length + the string length,
-// but usually it's must faster (often close to linear).
-bool MatchRegexAnywhere(const char* regex, const char* str) {
-  if (regex == nullptr || str == nullptr) return false;
-
-  if (*regex == '^')
-    return MatchRegexAtHead(regex + 1, str);
-
-  // A successful match can be anywhere in str.
-  do {
-    if (MatchRegexAtHead(regex, str))
-      return true;
-  } while (*str++ != '\0');
-  return false;
-}
-
-// Implements the RE class.
-
-RE::~RE() {
-  free(const_cast<char*>(pattern_));
-  free(const_cast<char*>(full_pattern_));
-}
-
-// Returns true if and only if regular expression re matches the entire str.
-bool RE::FullMatch(const char* str, const RE& re) {
-  return re.is_valid_ && MatchRegexAnywhere(re.full_pattern_, str);
-}
-
-// Returns true if and only if regular expression re matches a substring of
-// str (including str itself).
-bool RE::PartialMatch(const char* str, const RE& re) {
-  return re.is_valid_ && MatchRegexAnywhere(re.pattern_, str);
-}
-
-// Initializes an RE from its string representation.
-void RE::Init(const char* regex) {
-  pattern_ = full_pattern_ = nullptr;
-  if (regex != nullptr) {
-    pattern_ = posix::StrDup(regex);
-  }
-
-  is_valid_ = ValidateRegex(regex);
-  if (!is_valid_) {
-    // No need to calculate the full pattern when the regex is invalid.
-    return;
-  }
-
-  const size_t len = strlen(regex);
-  // Reserves enough bytes to hold the regular expression used for a
-  // full match: we need space to prepend a '^', append a '$', and
-  // terminate the string with '\0'.
-  char* buffer = static_cast<char*>(malloc(len + 3));
-  full_pattern_ = buffer;
-
-  if (*regex != '^')
-    *buffer++ = '^';  // Makes sure full_pattern_ starts with '^'.
-
-  // We don't use snprintf or strncpy, as they trigger a warning when
-  // compiled with VC++ 8.0.
-  memcpy(buffer, regex, len);
-  buffer += len;
-
-  if (len == 0 || regex[len - 1] != '$')
-    *buffer++ = '$';  // Makes sure full_pattern_ ends with '$'.
-
-  *buffer = '\0';
-}
-
-#endif  // GTEST_USES_POSIX_RE
-
-const char kUnknownFile[] = "unknown file";
-
-// Formats a source file path and a line number as they would appear
-// in an error message from the compiler used to compile this code.
-GTEST_API_ ::std::string FormatFileLocation(const char* file, int line) {
-  const std::string file_name(file == nullptr ? kUnknownFile : file);
-
-  if (line < 0) {
-    return file_name + ":";
-  }
-#ifdef _MSC_VER
-  return file_name + "(" + StreamableToString(line) + "):";
-#else
-  return file_name + ":" + StreamableToString(line) + ":";
-#endif  // _MSC_VER
-}
-
-// Formats a file location for compiler-independent XML output.
-// Although this function is not platform dependent, we put it next to
-// FormatFileLocation in order to contrast the two functions.
-// Note that FormatCompilerIndependentFileLocation() does NOT append colon
-// to the file location it produces, unlike FormatFileLocation().
-GTEST_API_ ::std::string FormatCompilerIndependentFileLocation(
-    const char* file, int line) {
-  const std::string file_name(file == nullptr ? kUnknownFile : file);
-
-  if (line < 0)
-    return file_name;
-  else
-    return file_name + ":" + StreamableToString(line);
-}
-
-GTestLog::GTestLog(GTestLogSeverity severity, const char* file, int line)
-    : severity_(severity) {
-  const char* const marker =
-      severity == GTEST_INFO ?    "[  INFO ]" :
-      severity == GTEST_WARNING ? "[WARNING]" :
-      severity == GTEST_ERROR ?   "[ ERROR ]" : "[ FATAL ]";
-  GetStream() << ::std::endl << marker << " "
-              << FormatFileLocation(file, line).c_str() << ": ";
-}
-
-// Flushes the buffers and, if severity is GTEST_FATAL, aborts the program.
-GTestLog::~GTestLog() {
-  GetStream() << ::std::endl;
-  if (severity_ == GTEST_FATAL) {
-    fflush(stderr);
-    posix::Abort();
-  }
-}
-
-// Disable Microsoft deprecation warnings for POSIX functions called from
-// this class (creat, dup, dup2, and close)
-GTEST_DISABLE_MSC_DEPRECATED_PUSH_()
-
-#if GTEST_HAS_STREAM_REDIRECTION
-
-// Object that captures an output stream (stdout/stderr).
-class CapturedStream {
- public:
-  // The ctor redirects the stream to a temporary file.
-  explicit CapturedStream(int fd) : fd_(fd), uncaptured_fd_(dup(fd)) {
-# if GTEST_OS_WINDOWS
-    char temp_dir_path[MAX_PATH + 1] = { '\0' };  // NOLINT
-    char temp_file_path[MAX_PATH + 1] = { '\0' };  // NOLINT
-
-    ::GetTempPathA(sizeof(temp_dir_path), temp_dir_path);
-    const UINT success = ::GetTempFileNameA(temp_dir_path,
-                                            "gtest_redir",
-                                            0,  // Generate unique file name.
-                                            temp_file_path);
-    GTEST_CHECK_(success != 0)
-        << "Unable to create a temporary file in " << temp_dir_path;
-    const int captured_fd = creat(temp_file_path, _S_IREAD | _S_IWRITE);
-    GTEST_CHECK_(captured_fd != -1) << "Unable to open temporary file "
-                                    << temp_file_path;
-    filename_ = temp_file_path;
-# else
-    // There's no guarantee that a test has write access to the current
-    // directory, so we create the temporary file in the /tmp directory
-    // instead. We use /tmp on most systems, and /sdcard on Android.
-    // That's because Android doesn't have /tmp.
-#  if GTEST_OS_LINUX_ANDROID
-    // Note: Android applications are expected to call the framework's
-    // Context.getExternalStorageDirectory() method through JNI to get
-    // the location of the world-writable SD Card directory. However,
-    // this requires a Context handle, which cannot be retrieved
-    // globally from native code. Doing so also precludes running the
-    // code as part of a regular standalone executable, which doesn't
-    // run in a Dalvik process (e.g. when running it through 'adb shell').
-    //
-    // The location /data/local/tmp is directly accessible from native code.
-    // '/sdcard' and other variants cannot be relied on, as they are not
-    // guaranteed to be mounted, or may have a delay in mounting.
-    char name_template[] = "/data/local/tmp/gtest_captured_stream.XXXXXX";
-#  else
-    char name_template[] = "/tmp/captured_stream.XXXXXX";
-#  endif  // GTEST_OS_LINUX_ANDROID
-    const int captured_fd = mkstemp(name_template);
-    if (captured_fd == -1) {
-      GTEST_LOG_(WARNING)
-          << "Failed to create tmp file " << name_template
-          << " for test; does the test have access to the /tmp directory?";
-    }
-    filename_ = name_template;
-# endif  // GTEST_OS_WINDOWS
-    fflush(nullptr);
-    dup2(captured_fd, fd_);
-    close(captured_fd);
-  }
-
-  ~CapturedStream() {
-    remove(filename_.c_str());
-  }
-
-  std::string GetCapturedString() {
-    if (uncaptured_fd_ != -1) {
-      // Restores the original stream.
-      fflush(nullptr);
-      dup2(uncaptured_fd_, fd_);
-      close(uncaptured_fd_);
-      uncaptured_fd_ = -1;
-    }
-
-    FILE* const file = posix::FOpen(filename_.c_str(), "r");
-    if (file == nullptr) {
-      GTEST_LOG_(FATAL) << "Failed to open tmp file " << filename_
-                        << " for capturing stream.";
-    }
-    const std::string content = ReadEntireFile(file);
-    posix::FClose(file);
-    return content;
-  }
-
- private:
-  const int fd_;  // A stream to capture.
-  int uncaptured_fd_;
-  // Name of the temporary file holding the stderr output.
-  ::std::string filename_;
-
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(CapturedStream);
-};
-
-GTEST_DISABLE_MSC_DEPRECATED_POP_()
-
-static CapturedStream* g_captured_stderr = nullptr;
-static CapturedStream* g_captured_stdout = nullptr;
-
-// Starts capturing an output stream (stdout/stderr).
-static void CaptureStream(int fd, const char* stream_name,
-                          CapturedStream** stream) {
-  if (*stream != nullptr) {
-    GTEST_LOG_(FATAL) << "Only one " << stream_name
-                      << " capturer can exist at a time.";
-  }
-  *stream = new CapturedStream(fd);
-}
-
-// Stops capturing the output stream and returns the captured string.
-static std::string GetCapturedStream(CapturedStream** captured_stream) {
-  const std::string content = (*captured_stream)->GetCapturedString();
-
-  delete *captured_stream;
-  *captured_stream = nullptr;
-
-  return content;
-}
-
-// Starts capturing stdout.
-void CaptureStdout() {
-  CaptureStream(kStdOutFileno, "stdout", &g_captured_stdout);
-}
-
-// Starts capturing stderr.
-void CaptureStderr() {
-  CaptureStream(kStdErrFileno, "stderr", &g_captured_stderr);
-}
-
-// Stops capturing stdout and returns the captured string.
-std::string GetCapturedStdout() {
-  return GetCapturedStream(&g_captured_stdout);
-}
-
-// Stops capturing stderr and returns the captured string.
-std::string GetCapturedStderr() {
-  return GetCapturedStream(&g_captured_stderr);
-}
-
-#endif  // GTEST_HAS_STREAM_REDIRECTION
-
-
-
-
-
-size_t GetFileSize(FILE* file) {
-  fseek(file, 0, SEEK_END);
-  return static_cast<size_t>(ftell(file));
-}
-
-std::string ReadEntireFile(FILE* file) {
-  const size_t file_size = GetFileSize(file);
-  char* const buffer = new char[file_size];
-
-  size_t bytes_last_read = 0;  // # of bytes read in the last fread()
-  size_t bytes_read = 0;       // # of bytes read so far
-
-  fseek(file, 0, SEEK_SET);
-
-  // Keeps reading the file until we cannot read further or the
-  // pre-determined file size is reached.
-  do {
-    bytes_last_read = fread(buffer+bytes_read, 1, file_size-bytes_read, file);
-    bytes_read += bytes_last_read;
-  } while (bytes_last_read > 0 && bytes_read < file_size);
-
-  const std::string content(buffer, bytes_read);
-  delete[] buffer;
-
-  return content;
-}
-
-#if GTEST_HAS_DEATH_TEST
-static const std::vector<std::string>* g_injected_test_argvs =
-    nullptr;  // Owned.
-
-std::vector<std::string> GetInjectableArgvs() {
-  if (g_injected_test_argvs != nullptr) {
-    return *g_injected_test_argvs;
-  }
-  return GetArgvs();
-}
-
-void SetInjectableArgvs(const std::vector<std::string>* new_argvs) {
-  if (g_injected_test_argvs != new_argvs) delete g_injected_test_argvs;
-  g_injected_test_argvs = new_argvs;
-}
-
-void SetInjectableArgvs(const std::vector<std::string>& new_argvs) {
-  SetInjectableArgvs(
-      new std::vector<std::string>(new_argvs.begin(), new_argvs.end()));
-}
-
-void ClearInjectableArgvs() {
-  delete g_injected_test_argvs;
-  g_injected_test_argvs = nullptr;
-}
-#endif  // GTEST_HAS_DEATH_TEST
-
-#if GTEST_OS_WINDOWS_MOBILE
-namespace posix {
-void Abort() {
-  DebugBreak();
-  TerminateProcess(GetCurrentProcess(), 1);
-}
-}  // namespace posix
-#endif  // GTEST_OS_WINDOWS_MOBILE
-
-// Returns the name of the environment variable corresponding to the
-// given flag.  For example, FlagToEnvVar("foo") will return
-// "GTEST_FOO" in the open-source version.
-static std::string FlagToEnvVar(const char* flag) {
-  const std::string full_flag =
-      (Message() << GTEST_FLAG_PREFIX_ << flag).GetString();
-
-  Message env_var;
-  for (size_t i = 0; i != full_flag.length(); i++) {
-    env_var << ToUpper(full_flag.c_str()[i]);
-  }
-
-  return env_var.GetString();
-}
-
-// Parses 'str' for a 32-bit signed integer.  If successful, writes
-// the result to *value and returns true; otherwise leaves *value
-// unchanged and returns false.
-bool ParseInt32(const Message& src_text, const char* str, Int32* value) {
-  // Parses the environment variable as a decimal integer.
-  char* end = nullptr;
-  const long long_value = strtol(str, &end, 10);  // NOLINT
-
-  // Has strtol() consumed all characters in the string?
-  if (*end != '\0') {
-    // No - an invalid character was encountered.
-    Message msg;
-    msg << "WARNING: " << src_text
-        << " is expected to be a 32-bit integer, but actually"
-        << " has value \"" << str << "\".\n";
-    printf("%s", msg.GetString().c_str());
-    fflush(stdout);
-    return false;
-  }
-
-  // Is the parsed value in the range of an Int32?
-  const Int32 result = static_cast<Int32>(long_value);
-  if (long_value == LONG_MAX || long_value == LONG_MIN ||
-      // The parsed value overflows as a long.  (strtol() returns
-      // LONG_MAX or LONG_MIN when the input overflows.)
-      result != long_value
-      // The parsed value overflows as an Int32.
-      ) {
-    Message msg;
-    msg << "WARNING: " << src_text
-        << " is expected to be a 32-bit integer, but actually"
-        << " has value " << str << ", which overflows.\n";
-    printf("%s", msg.GetString().c_str());
-    fflush(stdout);
-    return false;
-  }
-
-  *value = result;
-  return true;
-}
-
-// Reads and returns the Boolean environment variable corresponding to
-// the given flag; if it's not set, returns default_value.
-//
-// The value is considered true if and only if it's not "0".
-bool BoolFromGTestEnv(const char* flag, bool default_value) {
-#if defined(GTEST_GET_BOOL_FROM_ENV_)
-  return GTEST_GET_BOOL_FROM_ENV_(flag, default_value);
-#else
-  const std::string env_var = FlagToEnvVar(flag);
-  const char* const string_value = posix::GetEnv(env_var.c_str());
-  return string_value == nullptr ? default_value
-                                 : strcmp(string_value, "0") != 0;
-#endif  // defined(GTEST_GET_BOOL_FROM_ENV_)
-}
-
-// Reads and returns a 32-bit integer stored in the environment
-// variable corresponding to the given flag; if it isn't set or
-// doesn't represent a valid 32-bit integer, returns default_value.
-Int32 Int32FromGTestEnv(const char* flag, Int32 default_value) {
-#if defined(GTEST_GET_INT32_FROM_ENV_)
-  return GTEST_GET_INT32_FROM_ENV_(flag, default_value);
-#else
-  const std::string env_var = FlagToEnvVar(flag);
-  const char* const string_value = posix::GetEnv(env_var.c_str());
-  if (string_value == nullptr) {
-    // The environment variable is not set.
-    return default_value;
-  }
-
-  Int32 result = default_value;
-  if (!ParseInt32(Message() << "Environment variable " << env_var,
-                  string_value, &result)) {
-    printf("The default value %s is used.\n",
-           (Message() << default_value).GetString().c_str());
-    fflush(stdout);
-    return default_value;
-  }
-
-  return result;
-#endif  // defined(GTEST_GET_INT32_FROM_ENV_)
-}
-
-// As a special case for the 'output' flag, if GTEST_OUTPUT is not
-// set, we look for XML_OUTPUT_FILE, which is set by the Bazel build
-// system.  The value of XML_OUTPUT_FILE is a filename without the
-// "xml:" prefix of GTEST_OUTPUT.
-// Note that this is meant to be called at the call site so it does
-// not check that the flag is 'output'
-// In essence this checks an env variable called XML_OUTPUT_FILE
-// and if it is set we prepend "xml:" to its value, if it not set we return ""
-std::string OutputFlagAlsoCheckEnvVar(){
-  std::string default_value_for_output_flag = "";
-  const char* xml_output_file_env = posix::GetEnv("XML_OUTPUT_FILE");
-  if (nullptr != xml_output_file_env) {
-    default_value_for_output_flag = std::string("xml:") + xml_output_file_env;
-  }
-  return default_value_for_output_flag;
-}
-
-// Reads and returns the string environment variable corresponding to
-// the given flag; if it's not set, returns default_value.
-const char* StringFromGTestEnv(const char* flag, const char* default_value) {
-#if defined(GTEST_GET_STRING_FROM_ENV_)
-  return GTEST_GET_STRING_FROM_ENV_(flag, default_value);
-#else
-  const std::string env_var = FlagToEnvVar(flag);
-  const char* const value = posix::GetEnv(env_var.c_str());
-  return value == nullptr ? default_value : value;
-#endif  // defined(GTEST_GET_STRING_FROM_ENV_)
-}
-
-}  // namespace internal
-}  // namespace testing
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/src/gtest-printers.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/src/gtest-printers.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/src/gtest-printers.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/src/gtest-printers.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,442 +0,0 @@
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Google Test - The Google C++ Testing and Mocking Framework
-//
-// This file implements a universal value printer that can print a
-// value of any type T:
-//
-//   void ::testing::internal::UniversalPrinter<T>::Print(value, ostream_ptr);
-//
-// It uses the << operator when possible, and prints the bytes in the
-// object otherwise.  A user can override its behavior for a class
-// type Foo by defining either operator<<(::std::ostream&, const Foo&)
-// or void PrintTo(const Foo&, ::std::ostream*) in the namespace that
-// defines Foo.
-
-#include "gtest/gtest-printers.h"
-#include <stdio.h>
-#include <cctype>
-#include <cwchar>
-#include <ostream>  // NOLINT
-#include <string>
-#include "gtest/internal/gtest-port.h"
-#include "src/gtest-internal-inl.h"
-
-namespace testing {
-
-namespace {
-
-using ::std::ostream;
-
-// Prints a segment of bytes in the given object.
-GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
-GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
-GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
-GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
-void PrintByteSegmentInObjectTo(const unsigned char* obj_bytes, size_t start,
-                                size_t count, ostream* os) {
-  char text[5] = "";
-  for (size_t i = 0; i != count; i++) {
-    const size_t j = start + i;
-    if (i != 0) {
-      // Organizes the bytes into groups of 2 for easy parsing by
-      // human.
-      if ((j % 2) == 0)
-        *os << ' ';
-      else
-        *os << '-';
-    }
-    GTEST_SNPRINTF_(text, sizeof(text), "%02X", obj_bytes[j]);
-    *os << text;
-  }
-}
-
-// Prints the bytes in the given value to the given ostream.
-void PrintBytesInObjectToImpl(const unsigned char* obj_bytes, size_t count,
-                              ostream* os) {
-  // Tells the user how big the object is.
-  *os << count << "-byte object <";
-
-  const size_t kThreshold = 132;
-  const size_t kChunkSize = 64;
-  // If the object size is bigger than kThreshold, we'll have to omit
-  // some details by printing only the first and the last kChunkSize
-  // bytes.
-  if (count < kThreshold) {
-    PrintByteSegmentInObjectTo(obj_bytes, 0, count, os);
-  } else {
-    PrintByteSegmentInObjectTo(obj_bytes, 0, kChunkSize, os);
-    *os << " ... ";
-    // Rounds up to 2-byte boundary.
-    const size_t resume_pos = (count - kChunkSize + 1)/2*2;
-    PrintByteSegmentInObjectTo(obj_bytes, resume_pos, count - resume_pos, os);
-  }
-  *os << ">";
-}
-
-}  // namespace
-
-namespace internal2 {
-
-// Delegates to PrintBytesInObjectToImpl() to print the bytes in the
-// given object.  The delegation simplifies the implementation, which
-// uses the << operator and thus is easier done outside of the
-// ::testing::internal namespace, which contains a << operator that
-// sometimes conflicts with the one in STL.
-void PrintBytesInObjectTo(const unsigned char* obj_bytes, size_t count,
-                          ostream* os) {
-  PrintBytesInObjectToImpl(obj_bytes, count, os);
-}
-
-}  // namespace internal2
-
-namespace internal {
-
-// Depending on the value of a char (or wchar_t), we print it in one
-// of three formats:
-//   - as is if it's a printable ASCII (e.g. 'a', '2', ' '),
-//   - as a hexadecimal escape sequence (e.g. '\x7F'), or
-//   - as a special escape sequence (e.g. '\r', '\n').
-enum CharFormat {
-  kAsIs,
-  kHexEscape,
-  kSpecialEscape
-};
-
-// Returns true if c is a printable ASCII character.  We test the
-// value of c directly instead of calling isprint(), which is buggy on
-// Windows Mobile.
-inline bool IsPrintableAscii(wchar_t c) {
-  return 0x20 <= c && c <= 0x7E;
-}
-
-// Prints a wide or narrow char c as a character literal without the
-// quotes, escaping it when necessary; returns how c was formatted.
-// The template argument UnsignedChar is the unsigned version of Char,
-// which is the type of c.
-template <typename UnsignedChar, typename Char>
-static CharFormat PrintAsCharLiteralTo(Char c, ostream* os) {
-  wchar_t w_c = static_cast<wchar_t>(c);
-  switch (w_c) {
-    case L'\0':
-      *os << "\\0";
-      break;
-    case L'\'':
-      *os << "\\'";
-      break;
-    case L'\\':
-      *os << "\\\\";
-      break;
-    case L'\a':
-      *os << "\\a";
-      break;
-    case L'\b':
-      *os << "\\b";
-      break;
-    case L'\f':
-      *os << "\\f";
-      break;
-    case L'\n':
-      *os << "\\n";
-      break;
-    case L'\r':
-      *os << "\\r";
-      break;
-    case L'\t':
-      *os << "\\t";
-      break;
-    case L'\v':
-      *os << "\\v";
-      break;
-    default:
-      if (IsPrintableAscii(w_c)) {
-        *os << static_cast<char>(c);
-        return kAsIs;
-      } else {
-        ostream::fmtflags flags = os->flags();
-        *os << "\\x" << std::hex << std::uppercase
-            << static_cast<int>(static_cast<UnsignedChar>(c));
-        os->flags(flags);
-        return kHexEscape;
-      }
-  }
-  return kSpecialEscape;
-}
-
-// Prints a wchar_t c as if it's part of a string literal, escaping it when
-// necessary; returns how c was formatted.
-static CharFormat PrintAsStringLiteralTo(wchar_t c, ostream* os) {
-  switch (c) {
-    case L'\'':
-      *os << "'";
-      return kAsIs;
-    case L'"':
-      *os << "\\\"";
-      return kSpecialEscape;
-    default:
-      return PrintAsCharLiteralTo<wchar_t>(c, os);
-  }
-}
-
-// Prints a char c as if it's part of a string literal, escaping it when
-// necessary; returns how c was formatted.
-static CharFormat PrintAsStringLiteralTo(char c, ostream* os) {
-  return PrintAsStringLiteralTo(
-      static_cast<wchar_t>(static_cast<unsigned char>(c)), os);
-}
-
-// Prints a wide or narrow character c and its code.  '\0' is printed
-// as "'\\0'", other unprintable characters are also properly escaped
-// using the standard C++ escape sequence.  The template argument
-// UnsignedChar is the unsigned version of Char, which is the type of c.
-template <typename UnsignedChar, typename Char>
-void PrintCharAndCodeTo(Char c, ostream* os) {
-  // First, print c as a literal in the most readable form we can find.
-  *os << ((sizeof(c) > 1) ? "L'" : "'");
-  const CharFormat format = PrintAsCharLiteralTo<UnsignedChar>(c, os);
-  *os << "'";
-
-  // To aid user debugging, we also print c's code in decimal, unless
-  // it's 0 (in which case c was printed as '\\0', making the code
-  // obvious).
-  if (c == 0)
-    return;
-  *os << " (" << static_cast<int>(c);
-
-  // For more convenience, we print c's code again in hexadecimal,
-  // unless c was already printed in the form '\x##' or the code is in
-  // [1, 9].
-  if (format == kHexEscape || (1 <= c && c <= 9)) {
-    // Do nothing.
-  } else {
-    *os << ", 0x" << String::FormatHexInt(static_cast<int>(c));
-  }
-  *os << ")";
-}
-
-void PrintTo(unsigned char c, ::std::ostream* os) {
-  PrintCharAndCodeTo<unsigned char>(c, os);
-}
-void PrintTo(signed char c, ::std::ostream* os) {
-  PrintCharAndCodeTo<unsigned char>(c, os);
-}
-
-// Prints a wchar_t as a symbol if it is printable or as its internal
-// code otherwise and also as its code.  L'\0' is printed as "L'\\0'".
-void PrintTo(wchar_t wc, ostream* os) {
-  PrintCharAndCodeTo<wchar_t>(wc, os);
-}
-
-// Prints the given array of characters to the ostream.  CharType must be either
-// char or wchar_t.
-// The array starts at begin, the length is len, it may include '\0' characters
-// and may not be NUL-terminated.
-template <typename CharType>
-GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
-GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
-GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
-GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
-static CharFormat PrintCharsAsStringTo(
-    const CharType* begin, size_t len, ostream* os) {
-  const char* const kQuoteBegin = sizeof(CharType) == 1 ? "\"" : "L\"";
-  *os << kQuoteBegin;
-  bool is_previous_hex = false;
-  CharFormat print_format = kAsIs;
-  for (size_t index = 0; index < len; ++index) {
-    const CharType cur = begin[index];
-    if (is_previous_hex && IsXDigit(cur)) {
-      // Previous character is of '\x..' form and this character can be
-      // interpreted as another hexadecimal digit in its number. Break string to
-      // disambiguate.
-      *os << "\" " << kQuoteBegin;
-    }
-    is_previous_hex = PrintAsStringLiteralTo(cur, os) == kHexEscape;
-    // Remember if any characters required hex escaping.
-    if (is_previous_hex) {
-      print_format = kHexEscape;
-    }
-  }
-  *os << "\"";
-  return print_format;
-}
-
-// Prints a (const) char/wchar_t array of 'len' elements, starting at address
-// 'begin'.  CharType must be either char or wchar_t.
-template <typename CharType>
-GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
-GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
-GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
-GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
-static void UniversalPrintCharArray(
-    const CharType* begin, size_t len, ostream* os) {
-  // The code
-  //   const char kFoo[] = "foo";
-  // generates an array of 4, not 3, elements, with the last one being '\0'.
-  //
-  // Therefore when printing a char array, we don't print the last element if
-  // it's '\0', such that the output matches the string literal as it's
-  // written in the source code.
-  if (len > 0 && begin[len - 1] == '\0') {
-    PrintCharsAsStringTo(begin, len - 1, os);
-    return;
-  }
-
-  // If, however, the last element in the array is not '\0', e.g.
-  //    const char kFoo[] = { 'f', 'o', 'o' };
-  // we must print the entire array.  We also print a message to indicate
-  // that the array is not NUL-terminated.
-  PrintCharsAsStringTo(begin, len, os);
-  *os << " (no terminating NUL)";
-}
-
-// Prints a (const) char array of 'len' elements, starting at address 'begin'.
-void UniversalPrintArray(const char* begin, size_t len, ostream* os) {
-  UniversalPrintCharArray(begin, len, os);
-}
-
-// Prints a (const) wchar_t array of 'len' elements, starting at address
-// 'begin'.
-void UniversalPrintArray(const wchar_t* begin, size_t len, ostream* os) {
-  UniversalPrintCharArray(begin, len, os);
-}
-
-// Prints the given C string to the ostream.
-void PrintTo(const char* s, ostream* os) {
-  if (s == nullptr) {
-    *os << "NULL";
-  } else {
-    *os << ImplicitCast_<const void*>(s) << " pointing to ";
-    PrintCharsAsStringTo(s, strlen(s), os);
-  }
-}
-
-// MSVC compiler can be configured to define whar_t as a typedef
-// of unsigned short. Defining an overload for const wchar_t* in that case
-// would cause pointers to unsigned shorts be printed as wide strings,
-// possibly accessing more memory than intended and causing invalid
-// memory accesses. MSVC defines _NATIVE_WCHAR_T_DEFINED symbol when
-// wchar_t is implemented as a native type.
-#if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED)
-// Prints the given wide C string to the ostream.
-void PrintTo(const wchar_t* s, ostream* os) {
-  if (s == nullptr) {
-    *os << "NULL";
-  } else {
-    *os << ImplicitCast_<const void*>(s) << " pointing to ";
-    PrintCharsAsStringTo(s, wcslen(s), os);
-  }
-}
-#endif  // wchar_t is native
-
-namespace {
-
-bool ContainsUnprintableControlCodes(const char* str, size_t length) {
-  const unsigned char *s = reinterpret_cast<const unsigned char *>(str);
-
-  for (size_t i = 0; i < length; i++) {
-    unsigned char ch = *s++;
-    if (std::iscntrl(ch)) {
-        switch (ch) {
-        case '\t':
-        case '\n':
-        case '\r':
-          break;
-        default:
-          return true;
-        }
-      }
-  }
-  return false;
-}
-
-bool IsUTF8TrailByte(unsigned char t) { return 0x80 <= t && t<= 0xbf; }
-
-bool IsValidUTF8(const char* str, size_t length) {
-  const unsigned char *s = reinterpret_cast<const unsigned char *>(str);
-
-  for (size_t i = 0; i < length;) {
-    unsigned char lead = s[i++];
-
-    if (lead <= 0x7f) {
-      continue;  // single-byte character (ASCII) 0..7F
-    }
-    if (lead < 0xc2) {
-      return false;  // trail byte or non-shortest form
-    } else if (lead <= 0xdf && (i + 1) <= length && IsUTF8TrailByte(s[i])) {
-      ++i;  // 2-byte character
-    } else if (0xe0 <= lead && lead <= 0xef && (i + 2) <= length &&
-               IsUTF8TrailByte(s[i]) &&
-               IsUTF8TrailByte(s[i + 1]) &&
-               // check for non-shortest form and surrogate
-               (lead != 0xe0 || s[i] >= 0xa0) &&
-               (lead != 0xed || s[i] < 0xa0)) {
-      i += 2;  // 3-byte character
-    } else if (0xf0 <= lead && lead <= 0xf4 && (i + 3) <= length &&
-               IsUTF8TrailByte(s[i]) &&
-               IsUTF8TrailByte(s[i + 1]) &&
-               IsUTF8TrailByte(s[i + 2]) &&
-               // check for non-shortest form
-               (lead != 0xf0 || s[i] >= 0x90) &&
-               (lead != 0xf4 || s[i] < 0x90)) {
-      i += 3;  // 4-byte character
-    } else {
-      return false;
-    }
-  }
-  return true;
-}
-
-void ConditionalPrintAsText(const char* str, size_t length, ostream* os) {
-  if (!ContainsUnprintableControlCodes(str, length) &&
-      IsValidUTF8(str, length)) {
-    *os << "\n    As Text: \"" << str << "\"";
-  }
-}
-
-}  // anonymous namespace
-
-void PrintStringTo(const ::std::string& s, ostream* os) {
-  if (PrintCharsAsStringTo(s.data(), s.size(), os) == kHexEscape) {
-    if (GTEST_FLAG(print_utf8)) {
-      ConditionalPrintAsText(s.data(), s.size(), os);
-    }
-  }
-}
-
-#if GTEST_HAS_STD_WSTRING
-void PrintWideStringTo(const ::std::wstring& s, ostream* os) {
-  PrintCharsAsStringTo(s.data(), s.size(), os);
-}
-#endif  // GTEST_HAS_STD_WSTRING
-
-}  // namespace internal
-
-}  // namespace testing
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/src/gtest-test-part.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/src/gtest-test-part.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/src/gtest-test-part.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/src/gtest-test-part.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,104 +0,0 @@
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-//
-// The Google C++ Testing and Mocking Framework (Google Test)
-
-#include "gtest/gtest-test-part.h"
-#include "src/gtest-internal-inl.h"
-
-namespace testing {
-
-using internal::GetUnitTestImpl;
-
-// Gets the summary of the failure message by omitting the stack trace
-// in it.
-std::string TestPartResult::ExtractSummary(const char* message) {
-  const char* const stack_trace = strstr(message, internal::kStackTraceMarker);
-  return stack_trace == nullptr ? message : std::string(message, stack_trace);
-}
-
-// Prints a TestPartResult object.
-std::ostream& operator<<(std::ostream& os, const TestPartResult& result) {
-  return os << result.file_name() << ":" << result.line_number() << ": "
-            << (result.type() == TestPartResult::kSuccess
-                    ? "Success"
-                    : result.type() == TestPartResult::kSkip
-                          ? "Skipped"
-                          : result.type() == TestPartResult::kFatalFailure
-                                ? "Fatal failure"
-                                : "Non-fatal failure")
-            << ":\n"
-            << result.message() << std::endl;
-}
-
-// Appends a TestPartResult to the array.
-void TestPartResultArray::Append(const TestPartResult& result) {
-  array_.push_back(result);
-}
-
-// Returns the TestPartResult at the given index (0-based).
-const TestPartResult& TestPartResultArray::GetTestPartResult(int index) const {
-  if (index < 0 || index >= size()) {
-    printf("\nInvalid index (%d) into TestPartResultArray.\n", index);
-    internal::posix::Abort();
-  }
-
-  return array_[static_cast<size_t>(index)];
-}
-
-// Returns the number of TestPartResult objects in the array.
-int TestPartResultArray::size() const {
-  return static_cast<int>(array_.size());
-}
-
-namespace internal {
-
-HasNewFatalFailureHelper::HasNewFatalFailureHelper()
-    : has_new_fatal_failure_(false),
-      original_reporter_(GetUnitTestImpl()->
-                         GetTestPartResultReporterForCurrentThread()) {
-  GetUnitTestImpl()->SetTestPartResultReporterForCurrentThread(this);
-}
-
-HasNewFatalFailureHelper::~HasNewFatalFailureHelper() {
-  GetUnitTestImpl()->SetTestPartResultReporterForCurrentThread(
-      original_reporter_);
-}
-
-void HasNewFatalFailureHelper::ReportTestPartResult(
-    const TestPartResult& result) {
-  if (result.fatally_failed())
-    has_new_fatal_failure_ = true;
-  original_reporter_->ReportTestPartResult(result);
-}
-
-}  // namespace internal
-
-}  // namespace testing
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/src/gtest-typed-test.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/src/gtest-typed-test.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/googletest/src/gtest-typed-test.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/googletest/src/gtest-typed-test.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,118 +0,0 @@
-// Copyright 2008 Google Inc.
-// All Rights Reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-#include "gtest/gtest-typed-test.h"
-
-#include "gtest/gtest.h"
-
-namespace testing {
-namespace internal {
-
-#if GTEST_HAS_TYPED_TEST_P
-
-// Skips to the first non-space char in str. Returns an empty string if str
-// contains only whitespace characters.
-static const char* SkipSpaces(const char* str) {
-  while (IsSpace(*str))
-    str++;
-  return str;
-}
-
-static std::vector<std::string> SplitIntoTestNames(const char* src) {
-  std::vector<std::string> name_vec;
-  src = SkipSpaces(src);
-  for (; src != nullptr; src = SkipComma(src)) {
-    name_vec.push_back(StripTrailingSpaces(GetPrefixUntilComma(src)));
-  }
-  return name_vec;
-}
-
-// Verifies that registered_tests match the test names in
-// registered_tests_; returns registered_tests if successful, or
-// aborts the program otherwise.
-const char* TypedTestSuitePState::VerifyRegisteredTestNames(
-    const char* file, int line, const char* registered_tests) {
-  typedef RegisteredTestsMap::const_iterator RegisteredTestIter;
-  registered_ = true;
-
-  std::vector<std::string> name_vec = SplitIntoTestNames(registered_tests);
-
-  Message errors;
-
-  std::set<std::string> tests;
-  for (std::vector<std::string>::const_iterator name_it = name_vec.begin();
-       name_it != name_vec.end(); ++name_it) {
-    const std::string& name = *name_it;
-    if (tests.count(name) != 0) {
-      errors << "Test " << name << " is listed more than once.\n";
-      continue;
-    }
-
-    bool found = false;
-    for (RegisteredTestIter it = registered_tests_.begin();
-         it != registered_tests_.end();
-         ++it) {
-      if (name == it->first) {
-        found = true;
-        break;
-      }
-    }
-
-    if (found) {
-      tests.insert(name);
-    } else {
-      errors << "No test named " << name
-             << " can be found in this test suite.\n";
-    }
-  }
-
-  for (RegisteredTestIter it = registered_tests_.begin();
-       it != registered_tests_.end();
-       ++it) {
-    if (tests.count(it->first) == 0) {
-      errors << "You forgot to list test " << it->first << ".\n";
-    }
-  }
-
-  const std::string& errors_str = errors.GetString();
-  if (errors_str != "") {
-    fprintf(stderr, "%s %s", FormatFileLocation(file, line).c_str(),
-            errors_str.c_str());
-    fflush(stderr);
-    posix::Abort();
-  }
-
-  return registered_tests;
-}
-
-#endif  // GTEST_HAS_TYPED_TEST_P
-
-}  // namespace internal
-}  // namespace testing
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/library.json mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/library.json
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/library.json	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/library.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,59 +0,0 @@
-{
-  "name": "googletest",
-  "keywords": "unittest, unit, test, gtest, gmock",
-  "description": "googletest is a testing framework developed by the Testing Technology team with Google's specific requirements and constraints in mind. No matter whether you work on Linux, Windows, or a Mac, if you write C++ code, googletest can help you. And it supports any kind of tests, not just unit tests.",
-   "license": "BSD-3-Clause",
-  "homepage": "https://github.com/google/googletest/blob/master/README.md",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/google/googletest.git"
-  },
-  "version": "1.8.1",
-  "frameworks": "arduino",
-  "platforms": [
-        "espressif32"
-  ],
-  "export": {
-        "include": [
-            "googlemock/include/*",
-            "googlemock/src/*",
-            "googletest/include/*",
-            "googletest/src/*"
-        ],
-        "exclude": [
-            "ci",
-            "googlemock/build-aux",
-            "googlemock/cmake",
-            "googlemock/make",
-            "googlemock/msvc",
-            "googlemock/scripts",
-            "googlemock/src/gmock-all.cc",
-            "googlemock/src/gmock_main.cc",
-            "googlemock/test",
-            "googlemock/CMakeLists.txt",
-            "googlemock/Makefile.am",
-            "googlemock/configure.ac",
-            "googletest/cmake",
-            "googletest/codegear",
-            "googletest/m4",
-            "googletest/make",
-            "googletest/msvc",
-            "googletest/scripts",
-            "googletest/src/gtest-all.cc",
-            "googletest/src/gtest_main.cc",
-            "googletest/test",
-            "googletest/xcode",
-            "googletest/CMakeLists.txt",
-            "googletest/Makefile.am",
-            "googletest/configure.ac"
-          ]
-  },
-  "build": {
-        "flags": [
-            "-Igooglemock/include",
-            "-Igooglemock",
-            "-Igoogletest/include",
-            "-Igoogletest"
-        ]
-  }
-}
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/LICENSE mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/LICENSE
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/LICENSE	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/LICENSE	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-Copyright 2008, Google Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/platformio.ini mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/platformio.ini
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/platformio.ini	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/platformio.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-; PlatformIO Project Configuration File
-;
-;   Build options: build flags, source filter
-;   Upload options: custom upload port, speed and extra flags
-;   Library options: dependencies, extra library storages
-;   Advanced options: extra scripting
-;
-; Please visit documentation for the other options and examples
-; http://docs.platformio.org/page/projectconf.html
-
-
-[platformio]
-#src_dir = ./googlemock
-#src_dir = ./googletest
-src_dir = .
-
-[env:googletest_esp32]
-platform = espressif32
-board = esp32dev
-framework = arduino
-build_flags = -I./googletest/include -I./googletest
-src_filter = +<*> -<.git/> -<googlemock> -<googletest/codegear/> -<googletest/samples> -<googletest/test/> -<googletest/xcode> -<googletest/src> +<googletest/src/gtest-all.cc> +<googletest/src/gtest_main.cc>
-upload_speed = 921600
-
-[env:googlemock_esp32]
-platform = espressif32
-board = esp32dev
-framework = arduino
-build_flags = -I./googlemock/include -I./googletest/include -I./googletest -I./googlemock
-src_filter = +<*> -<.git/> -<googletest> -<googlemock/test/> -<googlemock/src> +<googlemock/src/gmock-all.cc> +<googlemock/src/gmock_main.cc> +<googletest/src/gtest-all.cc>
-upload_speed = 921600
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/README.md mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/README.md
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/README.md	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,134 +0,0 @@
-# Google Test
-
-#### OSS Builds Status:
-
-[![Build Status](https://api.travis-ci.org/google/googletest.svg?branch=master)](https://travis-ci.org/google/googletest)
-[![Build status](https://ci.appveyor.com/api/projects/status/4o38plt0xbo1ubc8/branch/master?svg=true)](https://ci.appveyor.com/project/GoogleTestAppVeyor/googletest/branch/master)
-
-### Future Plans
-
-#### 1.8.x Release:
-
-[the 1.8.x](https://github.com/google/googletest/releases/tag/release-1.8.1) is
-the last release that works with pre-C++11 compilers. The 1.8.x will not accept
-any requests for any new features and any bugfix requests will only be accepted
-if proven "critical"
-
-#### Post 1.8.x:
-
-On-going work to improve/cleanup/pay technical debt. When this work is completed
-there will be a 1.9.x tagged release
-
-#### Post 1.9.x
-
-Post 1.9.x googletest will follow
-[Abseil Live at Head philosophy](https://abseil.io/about/philosophy)
-
-## Welcome to **Google Test**, Google's C++ test framework!
-
-This repository is a merger of the formerly separate GoogleTest and GoogleMock
-projects. These were so closely related that it makes sense to maintain and
-release them together.
-
-Please subscribe to the mailing list at googletestframework@googlegroups.com for
-questions, discussions, and development.
-
-### Getting started:
-
-The information for **Google Test** is available in the
-[Google Test Primer](googletest/docs/primer.md) documentation.
-
-**Google Mock** is an extension to Google Test for writing and using C++ mock
-classes. See the separate [Google Mock documentation](googlemock/README.md).
-
-More detailed documentation for googletest is in its interior
-[googletest/README.md](googletest/README.md) file.
-
-## Features
-
-*   An [xUnit](https://en.wikipedia.org/wiki/XUnit) test framework.
-*   Test discovery.
-*   A rich set of assertions.
-*   User-defined assertions.
-*   Death tests.
-*   Fatal and non-fatal failures.
-*   Value-parameterized tests.
-*   Type-parameterized tests.
-*   Various options for running the tests.
-*   XML test report generation.
-
-## Platforms
-
-Google test has been used on a variety of platforms:
-
-*   Linux
-*   Mac OS X
-*   Windows
-*   Cygwin
-*   MinGW
-*   Windows Mobile
-*   Symbian
-*   PlatformIO
-
-## Who Is Using Google Test?
-
-In addition to many internal projects at Google, Google Test is also used by the
-following notable projects:
-
-*   The [Chromium projects](http://www.chromium.org/) (behind the Chrome browser
-    and Chrome OS).
-*   The [LLVM](http://llvm.org/) compiler.
-*   [Protocol Buffers](https://github.com/google/protobuf), Google's data
-    interchange format.
-*   The [OpenCV](http://opencv.org/) computer vision library.
-*   [tiny-dnn](https://github.com/tiny-dnn/tiny-dnn): header only,
-    dependency-free deep learning framework in C++11.
-
-## Related Open Source Projects
-
-[GTest Runner](https://github.com/nholthaus/gtest-runner) is a Qt5 based
-automated test-runner and Graphical User Interface with powerful features for
-Windows and Linux platforms.
-
-[Google Test UI](https://github.com/ospector/gtest-gbar) is test runner that
-runs your test binary, allows you to track its progress via a progress bar, and
-displays a list of test failures. Clicking on one shows failure text. Google
-Test UI is written in C#.
-
-[GTest TAP Listener](https://github.com/kinow/gtest-tap-listener) is an event
-listener for Google Test that implements the
-[TAP protocol](https://en.wikipedia.org/wiki/Test_Anything_Protocol) for test
-result output. If your test runner understands TAP, you may find it useful.
-
-[gtest-parallel](https://github.com/google/gtest-parallel) is a test runner that
-runs tests from your binary in parallel to provide significant speed-up.
-
-[GoogleTest Adapter](https://marketplace.visualstudio.com/items?itemName=DavidSchuldenfrei.gtest-adapter)
-is a VS Code extension allowing to view Google Tests in a tree view, and
-run/debug your tests.
-
-## Requirements
-
-Google Test is designed to have fairly minimal requirements to build and use
-with your projects, but there are some. If you notice any problems on your
-platform, please notify
-[googletestframework@googlegroups.com](https://groups.google.com/forum/#!forum/googletestframework).
-Patches for fixing them are welcome!
-
-### Build Requirements
-
-These are the base requirements to build and use Google Test from a source
-package:
-
-*   [Bazel](https://bazel.build/) or [CMake](https://cmake.org/). NOTE: Bazel is
-    the build system that googletest is using internally and tests against.
-    CMake is community-supported.
-
-*   a C++11-standard-compliant compiler
-
-## Contributing change
-
-Please read the [`CONTRIBUTING.md`](CONTRIBUTING.md) for details on how to
-contribute to this project.
-
-Happy testing!
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/.travis.yml mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/.travis.yml
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/.travis.yml	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-# Build matrix / environment variable are explained on:
-# https://docs.travis-ci.com/user/customizing-the-build/
-# This file can be validated on:
-# http://lint.travis-ci.org/
-
-language: cpp
-
-# Define the matrix explicitly, manually expanding the combinations of (os, compiler, env).
-# It is more tedious, but grants us far more flexibility.
-matrix:
-  include:
-    - os: linux
-      before_install: chmod -R +x ./ci/*platformio.sh
-      install: ./ci/install-platformio.sh
-      script: ./ci/build-platformio.sh
-    - os: linux
-      dist: xenial
-      compiler: gcc
-      install: ./ci/install-linux.sh && ./ci/log-config.sh
-      script: ./ci/build-linux-bazel.sh
-    - os: linux
-      dist: xenial
-      compiler: clang
-      install: ./ci/install-linux.sh && ./ci/log-config.sh
-      script: ./ci/build-linux-bazel.sh
-    - os: linux
-      compiler: gcc
-      env: BUILD_TYPE=Debug VERBOSE=1 CXX_FLAGS=-std=c++11
-    - os: linux
-      compiler: clang
-      env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 -Wgnu-zero-variadic-macro-arguments
-    - os: linux
-      compiler: clang
-      env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 NO_EXCEPTION=ON NO_RTTI=ON COMPILER_IS_GNUCXX=ON
-    - os: osx
-      compiler: gcc
-      env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 HOMEBREW_LOGS=~/homebrew-logs HOMEBREW_TEMP=~/homebrew-temp
-    - os: osx
-      compiler: clang
-      env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 HOMEBREW_LOGS=~/homebrew-logs HOMEBREW_TEMP=~/homebrew-temp
-
-# These are the install and build (script) phases for the most common entries in the matrix.  They could be included
-# in each entry in the matrix, but that is just repetitive.
-install:
-  - ./ci/install-${TRAVIS_OS_NAME}.sh
-  - . ./ci/env-${TRAVIS_OS_NAME}.sh
-  - ./ci/log-config.sh
-
-script: ./ci/travis.sh
-
-# This section installs the necessary dependencies.
-addons:
-  apt:
-    # List of whitelisted in travis packages for ubuntu-precise can be found here:
-    #   https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise
-    # List of whitelisted in travis apt-sources:
-    #   https://github.com/travis-ci/apt-source-whitelist/blob/master/ubuntu.json
-    sources:
-    - ubuntu-toolchain-r-test
-    - llvm-toolchain-precise-3.9
-    packages:
-    - g++-4.9
-    - clang-3.9
-    update: true
-  homebrew:
-    packages:
-    - ccache
-    - gcc@4.9
-    - llvm@4
-    update: true
-
-notifications:
-  email: false
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/WORKSPACE mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/WORKSPACE
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.10.0/WORKSPACE	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.10.0/WORKSPACE	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-workspace(name = "com_google_googletest")
-
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-
-# Abseil
-http_archive(
-     name = "com_google_absl",
-     urls = ["https://github.com/abseil/abseil-cpp/archive/master.zip"],
-     strip_prefix = "abseil-cpp-master",
-)
-
-http_archive(
-    name = "rules_cc",
-    strip_prefix = "rules_cc-master",
-    urls = ["https://github.com/bazelbuild/rules_cc/archive/master.zip"],
-)
-
-http_archive(
-    name = "rules_python",
-    strip_prefix = "rules_python-master",
-    urls = ["https://github.com/bazelbuild/rules_python/archive/master.zip"],
-)
-
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/CMakeLists.txt mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/CMakeLists.txt
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,32 @@
+# Note: CMake support is community-based. The maintainers do not use CMake
+# internally.
+
+cmake_minimum_required(VERSION 2.8.12)
+
+if (POLICY CMP0048)
+  cmake_policy(SET CMP0048 NEW)
+endif (POLICY CMP0048)
+
+project(googletest-distribution)
+set(GOOGLETEST_VERSION 1.11.0)
+
+if (CMAKE_VERSION VERSION_GREATER "3.0.2")
+  if(NOT CYGWIN AND NOT MSYS AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL QNX)
+    set(CMAKE_CXX_EXTENSIONS OFF)
+  endif()
+endif()
+
+enable_testing()
+
+include(CMakeDependentOption)
+include(GNUInstallDirs)
+
+#Note that googlemock target already builds googletest
+option(BUILD_GMOCK "Builds the googlemock subproject" ON)
+option(INSTALL_GTEST "Enable installation of googletest. (Projects embedding googletest may want to turn this OFF.)" ON)
+
+if(BUILD_GMOCK)
+  add_subdirectory( googlemock )
+else()
+  add_subdirectory( googletest )
+endif()
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/CONTRIBUTING.md mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/CONTRIBUTING.md
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/CONTRIBUTING.md	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/CONTRIBUTING.md	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,130 @@
+# How to become a contributor and submit your own code
+
+## Contributor License Agreements
+
+We'd love to accept your patches! Before we can take them, we have to jump a
+couple of legal hurdles.
+
+Please fill out either the individual or corporate Contributor License Agreement
+(CLA).
+
+*   If you are an individual writing original source code and you're sure you
+    own the intellectual property, then you'll need to sign an
+    [individual CLA](https://developers.google.com/open-source/cla/individual).
+*   If you work for a company that wants to allow you to contribute your work,
+    then you'll need to sign a
+    [corporate CLA](https://developers.google.com/open-source/cla/corporate).
+
+Follow either of the two links above to access the appropriate CLA and
+instructions for how to sign and return it. Once we receive it, we'll be able to
+accept your pull requests.
+
+## Are you a Googler?
+
+If you are a Googler, please make an attempt to submit an internal change rather
+than a GitHub Pull Request. If you are not able to submit an internal change a
+PR is acceptable as an alternative.
+
+## Contributing A Patch
+
+1.  Submit an issue describing your proposed change to the
+    [issue tracker](https://github.com/google/googletest/issues).
+2.  Please don't mix more than one logical change per submittal, because it
+    makes the history hard to follow. If you want to make a change that doesn't
+    have a corresponding issue in the issue tracker, please create one.
+3.  Also, coordinate with team members that are listed on the issue in question.
+    This ensures that work isn't being duplicated and communicating your plan
+    early also generally leads to better patches.
+4.  If your proposed change is accepted, and you haven't already done so, sign a
+    Contributor License Agreement (see details above).
+5.  Fork the desired repo, develop and test your code changes.
+6.  Ensure that your code adheres to the existing style in the sample to which
+    you are contributing.
+7.  Ensure that your code has an appropriate set of unit tests which all pass.
+8.  Submit a pull request.
+
+## The Google Test and Google Mock Communities
+
+The Google Test community exists primarily through the
+[discussion group](http://groups.google.com/group/googletestframework) and the
+GitHub repository. Likewise, the Google Mock community exists primarily through
+their own [discussion group](http://groups.google.com/group/googlemock). You are
+definitely encouraged to contribute to the discussion and you can also help us
+to keep the effectiveness of the group high by following and promoting the
+guidelines listed here.
+
+### Please Be Friendly
+
+Showing courtesy and respect to others is a vital part of the Google culture,
+and we strongly encourage everyone participating in Google Test development to
+join us in accepting nothing less. Of course, being courteous is not the same as
+failing to constructively disagree with each other, but it does mean that we
+should be respectful of each other when enumerating the 42 technical reasons
+that a particular proposal may not be the best choice. There's never a reason to
+be antagonistic or dismissive toward anyone who is sincerely trying to
+contribute to a discussion.
+
+Sure, C++ testing is serious business and all that, but it's also a lot of fun.
+Let's keep it that way. Let's strive to be one of the friendliest communities in
+all of open source.
+
+As always, discuss Google Test in the official GoogleTest discussion group. You
+don't have to actually submit code in order to sign up. Your participation
+itself is a valuable contribution.
+
+## Style
+
+To keep the source consistent, readable, diffable and easy to merge, we use a
+fairly rigid coding style, as defined by the
+[google-styleguide](https://github.com/google/styleguide) project. All patches
+will be expected to conform to the style outlined
+[here](https://google.github.io/styleguide/cppguide.html). Use
+[.clang-format](https://github.com/google/googletest/blob/master/.clang-format)
+to check your formatting.
+
+## Requirements for Contributors
+
+If you plan to contribute a patch, you need to build Google Test, Google Mock,
+and their own tests from a git checkout, which has further requirements:
+
+*   [Python](https://www.python.org/) v2.3 or newer (for running some of the
+    tests and re-generating certain source files from templates)
+*   [CMake](https://cmake.org/) v2.8.12 or newer
+
+## Developing Google Test and Google Mock
+
+This section discusses how to make your own changes to the Google Test project.
+
+### Testing Google Test and Google Mock Themselves
+
+To make sure your changes work as intended and don't break existing
+functionality, you'll want to compile and run Google Test and GoogleMock's own
+tests. For that you can use CMake:
+
+    mkdir mybuild
+    cd mybuild
+    cmake -Dgtest_build_tests=ON -Dgmock_build_tests=ON ${GTEST_REPO_DIR}
+
+To choose between building only Google Test or Google Mock, you may modify your
+cmake command to be one of each
+
+    cmake -Dgtest_build_tests=ON ${GTEST_DIR} # sets up Google Test tests
+    cmake -Dgmock_build_tests=ON ${GMOCK_DIR} # sets up Google Mock tests
+
+Make sure you have Python installed, as some of Google Test's tests are written
+in Python. If the cmake command complains about not being able to find Python
+(`Could NOT find PythonInterp (missing: PYTHON_EXECUTABLE)`), try telling it
+explicitly where your Python executable can be found:
+
+    cmake -DPYTHON_EXECUTABLE=path/to/python ...
+
+Next, you can build Google Test and / or Google Mock and all desired tests. On
+\*nix, this is usually done by
+
+    make
+
+To run the tests, do
+
+    make test
+
+All tests should pass.
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/CONTRIBUTORS mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/CONTRIBUTORS
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/CONTRIBUTORS	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/CONTRIBUTORS	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,63 @@
+# This file contains a list of people who've made non-trivial
+# contribution to the Google C++ Testing Framework project.  People
+# who commit code to the project are encouraged to add their names
+# here.  Please keep the list sorted by first names.
+
+Ajay Joshi <jaj@google.com>
+Balázs Dán <balazs.dan@gmail.com>
+Benoit Sigoure <tsuna@google.com>
+Bharat Mediratta <bharat@menalto.com>
+Bogdan Piloca <boo@google.com>
+Chandler Carruth <chandlerc@google.com>
+Chris Prince <cprince@google.com>
+Chris Taylor <taylorc@google.com>
+Dan Egnor <egnor@google.com>
+Dave MacLachlan <dmaclach@gmail.com>
+David Anderson <danderson@google.com>
+Dean Sturtevant
+Eric Roman <eroman@chromium.org>
+Gene Volovich <gv@cite.com>
+Hady Zalek <hady.zalek@gmail.com>
+Hal Burch <gmock@hburch.com>
+Jeffrey Yasskin <jyasskin@google.com>
+Jim Keller <jimkeller@google.com>
+Joe Walnes <joe@truemesh.com>
+Jon Wray <jwray@google.com>
+Jói Sigurðsson <joi@google.com>
+Keir Mierle <mierle@gmail.com>
+Keith Ray <keith.ray@gmail.com>
+Kenton Varda <kenton@google.com>
+Kostya Serebryany <kcc@google.com>
+Krystian Kuzniarek <krystian.kuzniarek@gmail.com>
+Lev Makhlis
+Manuel Klimek <klimek@google.com>
+Mario Tanev <radix@google.com>
+Mark Paskin
+Markus Heule <markus.heule@gmail.com>
+Matthew Simmons <simmonmt@acm.org>
+Mika Raento <mikie@iki.fi>
+Mike Bland <mbland@google.com>
+Miklós Fazekas <mfazekas@szemafor.com>
+Neal Norwitz <nnorwitz@gmail.com>
+Nermin Ozkiranartli <nermin@google.com>
+Owen Carlsen <ocarlsen@google.com>
+Paneendra Ba <paneendra@google.com>
+Pasi Valminen <pasi.valminen@gmail.com>
+Patrick Hanna <phanna@google.com>
+Patrick Riley <pfr@google.com>
+Paul Menage <menage@google.com>
+Peter Kaminski <piotrk@google.com>
+Piotr Kaminski <piotrk@google.com>
+Preston Jackson <preston.a.jackson@gmail.com>
+Rainer Klaffenboeck <rainer.klaffenboeck@dynatrace.com>
+Russ Cox <rsc@google.com>
+Russ Rufer <russ@pentad.com>
+Sean Mcafee <eefacm@gmail.com>
+Sigurður �sgeirsson <siggi@google.com>
+Sverre Sundsdal <sundsdal@gmail.com>
+Takeshi Yoshino <tyoshino@google.com>
+Tracy Bialik <tracy@pentad.com>
+Vadim Berman <vadimb@google.com>
+Vlad Losev <vladl@google.com>
+Wolfgang Klier <wklier@google.com>
+Zhanyong Wan <wan@google.com>
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/CMakeLists.txt mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/CMakeLists.txt
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,218 @@
+########################################################################
+# Note: CMake support is community-based. The maintainers do not use CMake
+# internally.
+#
+# CMake build script for Google Mock.
+#
+# To run the tests for Google Mock itself on Linux, use 'make test' or
+# ctest.  You can select which tests to run using 'ctest -R regex'.
+# For more options, run 'ctest --help'.
+
+option(gmock_build_tests "Build all of Google Mock's own tests." OFF)
+
+# A directory to find Google Test sources.
+if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/gtest/CMakeLists.txt")
+  set(gtest_dir gtest)
+else()
+  set(gtest_dir ../googletest)
+endif()
+
+# Defines pre_project_set_up_hermetic_build() and set_up_hermetic_build().
+include("${gtest_dir}/cmake/hermetic_build.cmake" OPTIONAL)
+
+if (COMMAND pre_project_set_up_hermetic_build)
+  # Google Test also calls hermetic setup functions from add_subdirectory,
+  # although its changes will not affect things at the current scope.
+  pre_project_set_up_hermetic_build()
+endif()
+
+########################################################################
+#
+# Project-wide settings
+
+# Name of the project.
+#
+# CMake files in this project can refer to the root source directory
+# as ${gmock_SOURCE_DIR} and to the root binary directory as
+# ${gmock_BINARY_DIR}.
+# Language "C" is required for find_package(Threads).
+if (CMAKE_VERSION VERSION_LESS 3.0)
+  project(gmock CXX C)
+else()
+  cmake_policy(SET CMP0048 NEW)
+  project(gmock VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C)
+endif()
+cmake_minimum_required(VERSION 2.8.12)
+
+if (COMMAND set_up_hermetic_build)
+  set_up_hermetic_build()
+endif()
+
+# Instructs CMake to process Google Test's CMakeLists.txt and add its
+# targets to the current scope.  We are placing Google Test's binary
+# directory in a subdirectory of our own as VC compilation may break
+# if they are the same (the default).
+add_subdirectory("${gtest_dir}" "${gmock_BINARY_DIR}/${gtest_dir}")
+
+
+# These commands only run if this is the main project
+if(CMAKE_PROJECT_NAME STREQUAL "gmock" OR CMAKE_PROJECT_NAME STREQUAL "googletest-distribution")
+  # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to
+  # make it prominent in the GUI.
+  option(BUILD_SHARED_LIBS "Build shared libraries (DLLs)." OFF)
+else()
+  mark_as_advanced(gmock_build_tests)
+endif()
+
+# Although Google Test's CMakeLists.txt calls this function, the
+# changes there don't affect the current scope.  Therefore we have to
+# call it again here.
+config_compiler_and_linker()  # from ${gtest_dir}/cmake/internal_utils.cmake
+
+# Adds Google Mock's and Google Test's header directories to the search path.
+set(gmock_build_include_dirs
+  "${gmock_SOURCE_DIR}/include"
+  "${gmock_SOURCE_DIR}"
+  "${gtest_SOURCE_DIR}/include"
+  # This directory is needed to build directly from Google Test sources.
+  "${gtest_SOURCE_DIR}")
+include_directories(${gmock_build_include_dirs})
+
+########################################################################
+#
+# Defines the gmock & gmock_main libraries.  User tests should link
+# with one of them.
+
+# Google Mock libraries.  We build them using more strict warnings than what
+# are used for other targets, to ensure that Google Mock can be compiled by
+# a user aggressive about warnings.
+if (MSVC)
+  cxx_library(gmock
+              "${cxx_strict}"
+              "${gtest_dir}/src/gtest-all.cc"
+              src/gmock-all.cc)
+
+  cxx_library(gmock_main
+              "${cxx_strict}"
+              "${gtest_dir}/src/gtest-all.cc"
+              src/gmock-all.cc
+              src/gmock_main.cc)
+else()
+  cxx_library(gmock "${cxx_strict}" src/gmock-all.cc)
+  target_link_libraries(gmock PUBLIC gtest)
+  set_target_properties(gmock PROPERTIES VERSION ${GOOGLETEST_VERSION})
+  cxx_library(gmock_main "${cxx_strict}" src/gmock_main.cc)
+  target_link_libraries(gmock_main PUBLIC gmock)
+  set_target_properties(gmock_main PROPERTIES VERSION ${GOOGLETEST_VERSION})
+endif()
+# If the CMake version supports it, attach header directory information
+# to the targets for when we are part of a parent build (ie being pulled
+# in via add_subdirectory() rather than being a standalone build).
+if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11")
+  target_include_directories(gmock SYSTEM INTERFACE
+    "$<BUILD_INTERFACE:${gmock_build_include_dirs}>"
+    "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
+  target_include_directories(gmock_main SYSTEM INTERFACE
+    "$<BUILD_INTERFACE:${gmock_build_include_dirs}>"
+    "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
+endif()
+
+########################################################################
+#
+# Install rules
+install_project(gmock gmock_main)
+
+########################################################################
+#
+# Google Mock's own tests.
+#
+# You can skip this section if you aren't interested in testing
+# Google Mock itself.
+#
+# The tests are not built by default.  To build them, set the
+# gmock_build_tests option to ON.  You can do it by running ccmake
+# or specifying the -Dgmock_build_tests=ON flag when running cmake.
+
+if (gmock_build_tests)
+  # This must be set in the root directory for the tests to be run by
+  # 'make test' or ctest.
+  enable_testing()
+
+  if (MINGW OR CYGWIN)
+    if (CMAKE_VERSION VERSION_LESS "2.8.12")
+      add_compile_options("-Wa,-mbig-obj")
+    else()
+      add_definitions("-Wa,-mbig-obj")
+    endif()
+  endif()
+
+  ############################################################
+  # C++ tests built with standard compiler flags.
+
+  cxx_test(gmock-actions_test gmock_main)
+  cxx_test(gmock-cardinalities_test gmock_main)
+  cxx_test(gmock_ex_test gmock_main)
+  cxx_test(gmock-function-mocker_test gmock_main)
+  cxx_test(gmock-internal-utils_test gmock_main)
+  cxx_test(gmock-matchers_test gmock_main)
+  cxx_test(gmock-more-actions_test gmock_main)
+  cxx_test(gmock-nice-strict_test gmock_main)
+  cxx_test(gmock-port_test gmock_main)
+  cxx_test(gmock-spec-builders_test gmock_main)
+  cxx_test(gmock_link_test gmock_main test/gmock_link2_test.cc)
+  cxx_test(gmock_test gmock_main)
+
+  if (DEFINED GTEST_HAS_PTHREAD)
+    cxx_test(gmock_stress_test gmock)
+  endif()
+
+  # gmock_all_test is commented to save time building and running tests.
+  # Uncomment if necessary.
+  # cxx_test(gmock_all_test gmock_main)
+
+  ############################################################
+  # C++ tests built with non-standard compiler flags.
+
+  if (MSVC)
+    cxx_library(gmock_main_no_exception "${cxx_no_exception}"
+      "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc)
+
+    cxx_library(gmock_main_no_rtti "${cxx_no_rtti}"
+      "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc)
+
+  else()
+    cxx_library(gmock_main_no_exception "${cxx_no_exception}" src/gmock_main.cc)
+    target_link_libraries(gmock_main_no_exception PUBLIC gmock)
+
+    cxx_library(gmock_main_no_rtti "${cxx_no_rtti}" src/gmock_main.cc)
+    target_link_libraries(gmock_main_no_rtti PUBLIC gmock)
+  endif()
+  cxx_test_with_flags(gmock-more-actions_no_exception_test "${cxx_no_exception}"
+    gmock_main_no_exception test/gmock-more-actions_test.cc)
+
+  cxx_test_with_flags(gmock_no_rtti_test "${cxx_no_rtti}"
+    gmock_main_no_rtti test/gmock-spec-builders_test.cc)
+
+  cxx_shared_library(shared_gmock_main "${cxx_default}"
+    "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc)
+
+  # Tests that a binary can be built with Google Mock as a shared library.  On
+  # some system configurations, it may not possible to run the binary without
+  # knowing more details about the system configurations. We do not try to run
+  # this binary. To get a more robust shared library coverage, configure with
+  # -DBUILD_SHARED_LIBS=ON.
+  cxx_executable_with_flags(shared_gmock_test_ "${cxx_default}"
+    shared_gmock_main test/gmock-spec-builders_test.cc)
+  set_target_properties(shared_gmock_test_
+    PROPERTIES
+    COMPILE_DEFINITIONS "GTEST_LINKED_AS_SHARED_LIBRARY=1")
+
+  ############################################################
+  # Python tests.
+
+  cxx_executable(gmock_leak_test_ test gmock_main)
+  py_test(gmock_leak_test)
+
+  cxx_executable(gmock_output_test_ test gmock)
+  py_test(gmock_output_test)
+endif()
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/gmock-actions.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/gmock-actions.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/gmock-actions.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/gmock-actions.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,1687 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// The ACTION* family of macros can be used in a namespace scope to
+// define custom actions easily.  The syntax:
+//
+//   ACTION(name) { statements; }
+//
+// will define an action with the given name that executes the
+// statements.  The value returned by the statements will be used as
+// the return value of the action.  Inside the statements, you can
+// refer to the K-th (0-based) argument of the mock function by
+// 'argK', and refer to its type by 'argK_type'.  For example:
+//
+//   ACTION(IncrementArg1) {
+//     arg1_type temp = arg1;
+//     return ++(*temp);
+//   }
+//
+// allows you to write
+//
+//   ...WillOnce(IncrementArg1());
+//
+// You can also refer to the entire argument tuple and its type by
+// 'args' and 'args_type', and refer to the mock function type and its
+// return type by 'function_type' and 'return_type'.
+//
+// Note that you don't need to specify the types of the mock function
+// arguments.  However rest assured that your code is still type-safe:
+// you'll get a compiler error if *arg1 doesn't support the ++
+// operator, or if the type of ++(*arg1) isn't compatible with the
+// mock function's return type, for example.
+//
+// Sometimes you'll want to parameterize the action.   For that you can use
+// another macro:
+//
+//   ACTION_P(name, param_name) { statements; }
+//
+// For example:
+//
+//   ACTION_P(Add, n) { return arg0 + n; }
+//
+// will allow you to write:
+//
+//   ...WillOnce(Add(5));
+//
+// Note that you don't need to provide the type of the parameter
+// either.  If you need to reference the type of a parameter named
+// 'foo', you can write 'foo_type'.  For example, in the body of
+// ACTION_P(Add, n) above, you can write 'n_type' to refer to the type
+// of 'n'.
+//
+// We also provide ACTION_P2, ACTION_P3, ..., up to ACTION_P10 to support
+// multi-parameter actions.
+//
+// For the purpose of typing, you can view
+//
+//   ACTION_Pk(Foo, p1, ..., pk) { ... }
+//
+// as shorthand for
+//
+//   template <typename p1_type, ..., typename pk_type>
+//   FooActionPk<p1_type, ..., pk_type> Foo(p1_type p1, ..., pk_type pk) { ... }
+//
+// In particular, you can provide the template type arguments
+// explicitly when invoking Foo(), as in Foo<long, bool>(5, false);
+// although usually you can rely on the compiler to infer the types
+// for you automatically.  You can assign the result of expression
+// Foo(p1, ..., pk) to a variable of type FooActionPk<p1_type, ...,
+// pk_type>.  This can be useful when composing actions.
+//
+// You can also overload actions with different numbers of parameters:
+//
+//   ACTION_P(Plus, a) { ... }
+//   ACTION_P2(Plus, a, b) { ... }
+//
+// While it's tempting to always use the ACTION* macros when defining
+// a new action, you should also consider implementing ActionInterface
+// or using MakePolymorphicAction() instead, especially if you need to
+// use the action a lot.  While these approaches require more work,
+// they give you more control on the types of the mock function
+// arguments and the action parameters, which in general leads to
+// better compiler error messages that pay off in the long run.  They
+// also allow overloading actions based on parameter types (as opposed
+// to just based on the number of parameters).
+//
+// CAVEAT:
+//
+// ACTION*() can only be used in a namespace scope as templates cannot be
+// declared inside of a local class.
+// Users can, however, define any local functors (e.g. a lambda) that
+// can be used as actions.
+//
+// MORE INFORMATION:
+//
+// To learn more about using these macros, please search for 'ACTION' on
+// https://github.com/google/googletest/blob/master/docs/gmock_cook_book.md
+
+// GOOGLETEST_CM0002 DO NOT DELETE
+
+#ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_ACTIONS_H_
+#define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_ACTIONS_H_
+
+#ifndef _WIN32_WCE
+# include <errno.h>
+#endif
+
+#include <algorithm>
+#include <functional>
+#include <memory>
+#include <string>
+#include <tuple>
+#include <type_traits>
+#include <utility>
+
+#include "gmock/internal/gmock-internal-utils.h"
+#include "gmock/internal/gmock-port.h"
+#include "gmock/internal/gmock-pp.h"
+
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable:4100)
+#endif
+
+namespace testing {
+
+// To implement an action Foo, define:
+//   1. a class FooAction that implements the ActionInterface interface, and
+//   2. a factory function that creates an Action object from a
+//      const FooAction*.
+//
+// The two-level delegation design follows that of Matcher, providing
+// consistency for extension developers.  It also eases ownership
+// management as Action objects can now be copied like plain values.
+
+namespace internal {
+
+// BuiltInDefaultValueGetter<T, true>::Get() returns a
+// default-constructed T value.  BuiltInDefaultValueGetter<T,
+// false>::Get() crashes with an error.
+//
+// This primary template is used when kDefaultConstructible is true.
+template <typename T, bool kDefaultConstructible>
+struct BuiltInDefaultValueGetter {
+  static T Get() { return T(); }
+};
+template <typename T>
+struct BuiltInDefaultValueGetter<T, false> {
+  static T Get() {
+    Assert(false, __FILE__, __LINE__,
+           "Default action undefined for the function return type.");
+    return internal::Invalid<T>();
+    // The above statement will never be reached, but is required in
+    // order for this function to compile.
+  }
+};
+
+// BuiltInDefaultValue<T>::Get() returns the "built-in" default value
+// for type T, which is NULL when T is a raw pointer type, 0 when T is
+// a numeric type, false when T is bool, or "" when T is string or
+// std::string.  In addition, in C++11 and above, it turns a
+// default-constructed T value if T is default constructible.  For any
+// other type T, the built-in default T value is undefined, and the
+// function will abort the process.
+template <typename T>
+class BuiltInDefaultValue {
+ public:
+  // This function returns true if and only if type T has a built-in default
+  // value.
+  static bool Exists() {
+    return ::std::is_default_constructible<T>::value;
+  }
+
+  static T Get() {
+    return BuiltInDefaultValueGetter<
+        T, ::std::is_default_constructible<T>::value>::Get();
+  }
+};
+
+// This partial specialization says that we use the same built-in
+// default value for T and const T.
+template <typename T>
+class BuiltInDefaultValue<const T> {
+ public:
+  static bool Exists() { return BuiltInDefaultValue<T>::Exists(); }
+  static T Get() { return BuiltInDefaultValue<T>::Get(); }
+};
+
+// This partial specialization defines the default values for pointer
+// types.
+template <typename T>
+class BuiltInDefaultValue<T*> {
+ public:
+  static bool Exists() { return true; }
+  static T* Get() { return nullptr; }
+};
+
+// The following specializations define the default values for
+// specific types we care about.
+#define GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(type, value) \
+  template <> \
+  class BuiltInDefaultValue<type> { \
+   public: \
+    static bool Exists() { return true; } \
+    static type Get() { return value; } \
+  }
+
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(void, );  // NOLINT
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(::std::string, "");
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(bool, false);
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(unsigned char, '\0');
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(signed char, '\0');
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(char, '\0');
+
+// There's no need for a default action for signed wchar_t, as that
+// type is the same as wchar_t for gcc, and invalid for MSVC.
+//
+// There's also no need for a default action for unsigned wchar_t, as
+// that type is the same as unsigned int for gcc, and invalid for
+// MSVC.
+#if GMOCK_WCHAR_T_IS_NATIVE_
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(wchar_t, 0U);  // NOLINT
+#endif
+
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(unsigned short, 0U);  // NOLINT
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(signed short, 0);     // NOLINT
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(unsigned int, 0U);
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(signed int, 0);
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(unsigned long, 0UL);  // NOLINT
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(signed long, 0L);     // NOLINT
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(unsigned long long, 0);  // NOLINT
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(signed long long, 0);  // NOLINT
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(float, 0);
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(double, 0);
+
+#undef GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_
+
+// Simple two-arg form of std::disjunction.
+template <typename P, typename Q>
+using disjunction = typename ::std::conditional<P::value, P, Q>::type;
+
+}  // namespace internal
+
+// When an unexpected function call is encountered, Google Mock will
+// let it return a default value if the user has specified one for its
+// return type, or if the return type has a built-in default value;
+// otherwise Google Mock won't know what value to return and will have
+// to abort the process.
+//
+// The DefaultValue<T> class allows a user to specify the
+// default value for a type T that is both copyable and publicly
+// destructible (i.e. anything that can be used as a function return
+// type).  The usage is:
+//
+//   // Sets the default value for type T to be foo.
+//   DefaultValue<T>::Set(foo);
+template <typename T>
+class DefaultValue {
+ public:
+  // Sets the default value for type T; requires T to be
+  // copy-constructable and have a public destructor.
+  static void Set(T x) {
+    delete producer_;
+    producer_ = new FixedValueProducer(x);
+  }
+
+  // Provides a factory function to be called to generate the default value.
+  // This method can be used even if T is only move-constructible, but it is not
+  // limited to that case.
+  typedef T (*FactoryFunction)();
+  static void SetFactory(FactoryFunction factory) {
+    delete producer_;
+    producer_ = new FactoryValueProducer(factory);
+  }
+
+  // Unsets the default value for type T.
+  static void Clear() {
+    delete producer_;
+    producer_ = nullptr;
+  }
+
+  // Returns true if and only if the user has set the default value for type T.
+  static bool IsSet() { return producer_ != nullptr; }
+
+  // Returns true if T has a default return value set by the user or there
+  // exists a built-in default value.
+  static bool Exists() {
+    return IsSet() || internal::BuiltInDefaultValue<T>::Exists();
+  }
+
+  // Returns the default value for type T if the user has set one;
+  // otherwise returns the built-in default value. Requires that Exists()
+  // is true, which ensures that the return value is well-defined.
+  static T Get() {
+    return producer_ == nullptr ? internal::BuiltInDefaultValue<T>::Get()
+                                : producer_->Produce();
+  }
+
+ private:
+  class ValueProducer {
+   public:
+    virtual ~ValueProducer() {}
+    virtual T Produce() = 0;
+  };
+
+  class FixedValueProducer : public ValueProducer {
+   public:
+    explicit FixedValueProducer(T value) : value_(value) {}
+    T Produce() override { return value_; }
+
+   private:
+    const T value_;
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(FixedValueProducer);
+  };
+
+  class FactoryValueProducer : public ValueProducer {
+   public:
+    explicit FactoryValueProducer(FactoryFunction factory)
+        : factory_(factory) {}
+    T Produce() override { return factory_(); }
+
+   private:
+    const FactoryFunction factory_;
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(FactoryValueProducer);
+  };
+
+  static ValueProducer* producer_;
+};
+
+// This partial specialization allows a user to set default values for
+// reference types.
+template <typename T>
+class DefaultValue<T&> {
+ public:
+  // Sets the default value for type T&.
+  static void Set(T& x) {  // NOLINT
+    address_ = &x;
+  }
+
+  // Unsets the default value for type T&.
+  static void Clear() { address_ = nullptr; }
+
+  // Returns true if and only if the user has set the default value for type T&.
+  static bool IsSet() { return address_ != nullptr; }
+
+  // Returns true if T has a default return value set by the user or there
+  // exists a built-in default value.
+  static bool Exists() {
+    return IsSet() || internal::BuiltInDefaultValue<T&>::Exists();
+  }
+
+  // Returns the default value for type T& if the user has set one;
+  // otherwise returns the built-in default value if there is one;
+  // otherwise aborts the process.
+  static T& Get() {
+    return address_ == nullptr ? internal::BuiltInDefaultValue<T&>::Get()
+                               : *address_;
+  }
+
+ private:
+  static T* address_;
+};
+
+// This specialization allows DefaultValue<void>::Get() to
+// compile.
+template <>
+class DefaultValue<void> {
+ public:
+  static bool Exists() { return true; }
+  static void Get() {}
+};
+
+// Points to the user-set default value for type T.
+template <typename T>
+typename DefaultValue<T>::ValueProducer* DefaultValue<T>::producer_ = nullptr;
+
+// Points to the user-set default value for type T&.
+template <typename T>
+T* DefaultValue<T&>::address_ = nullptr;
+
+// Implement this interface to define an action for function type F.
+template <typename F>
+class ActionInterface {
+ public:
+  typedef typename internal::Function<F>::Result Result;
+  typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
+
+  ActionInterface() {}
+  virtual ~ActionInterface() {}
+
+  // Performs the action.  This method is not const, as in general an
+  // action can have side effects and be stateful.  For example, a
+  // get-the-next-element-from-the-collection action will need to
+  // remember the current element.
+  virtual Result Perform(const ArgumentTuple& args) = 0;
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ActionInterface);
+};
+
+// An Action<F> is a copyable and IMMUTABLE (except by assignment)
+// object that represents an action to be taken when a mock function
+// of type F is called.  The implementation of Action<T> is just a
+// std::shared_ptr to const ActionInterface<T>. Don't inherit from Action!
+// You can view an object implementing ActionInterface<F> as a
+// concrete action (including its current state), and an Action<F>
+// object as a handle to it.
+template <typename F>
+class Action {
+  // Adapter class to allow constructing Action from a legacy ActionInterface.
+  // New code should create Actions from functors instead.
+  struct ActionAdapter {
+    // Adapter must be copyable to satisfy std::function requirements.
+    ::std::shared_ptr<ActionInterface<F>> impl_;
+
+    template <typename... Args>
+    typename internal::Function<F>::Result operator()(Args&&... args) {
+      return impl_->Perform(
+          ::std::forward_as_tuple(::std::forward<Args>(args)...));
+    }
+  };
+
+  template <typename G>
+  using IsCompatibleFunctor = std::is_constructible<std::function<F>, G>;
+
+ public:
+  typedef typename internal::Function<F>::Result Result;
+  typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
+
+  // Constructs a null Action.  Needed for storing Action objects in
+  // STL containers.
+  Action() {}
+
+  // Construct an Action from a specified callable.
+  // This cannot take std::function directly, because then Action would not be
+  // directly constructible from lambda (it would require two conversions).
+  template <
+      typename G,
+      typename = typename std::enable_if<internal::disjunction<
+          IsCompatibleFunctor<G>, std::is_constructible<std::function<Result()>,
+                                                        G>>::value>::type>
+  Action(G&& fun) {  // NOLINT
+    Init(::std::forward<G>(fun), IsCompatibleFunctor<G>());
+  }
+
+  // Constructs an Action from its implementation.
+  explicit Action(ActionInterface<F>* impl)
+      : fun_(ActionAdapter{::std::shared_ptr<ActionInterface<F>>(impl)}) {}
+
+  // This constructor allows us to turn an Action<Func> object into an
+  // Action<F>, as long as F's arguments can be implicitly converted
+  // to Func's and Func's return type can be implicitly converted to F's.
+  template <typename Func>
+  explicit Action(const Action<Func>& action) : fun_(action.fun_) {}
+
+  // Returns true if and only if this is the DoDefault() action.
+  bool IsDoDefault() const { return fun_ == nullptr; }
+
+  // Performs the action.  Note that this method is const even though
+  // the corresponding method in ActionInterface is not.  The reason
+  // is that a const Action<F> means that it cannot be re-bound to
+  // another concrete action, not that the concrete action it binds to
+  // cannot change state.  (Think of the difference between a const
+  // pointer and a pointer to const.)
+  Result Perform(ArgumentTuple args) const {
+    if (IsDoDefault()) {
+      internal::IllegalDoDefault(__FILE__, __LINE__);
+    }
+    return internal::Apply(fun_, ::std::move(args));
+  }
+
+ private:
+  template <typename G>
+  friend class Action;
+
+  template <typename G>
+  void Init(G&& g, ::std::true_type) {
+    fun_ = ::std::forward<G>(g);
+  }
+
+  template <typename G>
+  void Init(G&& g, ::std::false_type) {
+    fun_ = IgnoreArgs<typename ::std::decay<G>::type>{::std::forward<G>(g)};
+  }
+
+  template <typename FunctionImpl>
+  struct IgnoreArgs {
+    template <typename... Args>
+    Result operator()(const Args&...) const {
+      return function_impl();
+    }
+
+    FunctionImpl function_impl;
+  };
+
+  // fun_ is an empty function if and only if this is the DoDefault() action.
+  ::std::function<F> fun_;
+};
+
+// The PolymorphicAction class template makes it easy to implement a
+// polymorphic action (i.e. an action that can be used in mock
+// functions of than one type, e.g. Return()).
+//
+// To define a polymorphic action, a user first provides a COPYABLE
+// implementation class that has a Perform() method template:
+//
+//   class FooAction {
+//    public:
+//     template <typename Result, typename ArgumentTuple>
+//     Result Perform(const ArgumentTuple& args) const {
+//       // Processes the arguments and returns a result, using
+//       // std::get<N>(args) to get the N-th (0-based) argument in the tuple.
+//     }
+//     ...
+//   };
+//
+// Then the user creates the polymorphic action using
+// MakePolymorphicAction(object) where object has type FooAction.  See
+// the definition of Return(void) and SetArgumentPointee<N>(value) for
+// complete examples.
+template <typename Impl>
+class PolymorphicAction {
+ public:
+  explicit PolymorphicAction(const Impl& impl) : impl_(impl) {}
+
+  template <typename F>
+  operator Action<F>() const {
+    return Action<F>(new MonomorphicImpl<F>(impl_));
+  }
+
+ private:
+  template <typename F>
+  class MonomorphicImpl : public ActionInterface<F> {
+   public:
+    typedef typename internal::Function<F>::Result Result;
+    typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
+
+    explicit MonomorphicImpl(const Impl& impl) : impl_(impl) {}
+
+    Result Perform(const ArgumentTuple& args) override {
+      return impl_.template Perform<Result>(args);
+    }
+
+   private:
+    Impl impl_;
+  };
+
+  Impl impl_;
+};
+
+// Creates an Action from its implementation and returns it.  The
+// created Action object owns the implementation.
+template <typename F>
+Action<F> MakeAction(ActionInterface<F>* impl) {
+  return Action<F>(impl);
+}
+
+// Creates a polymorphic action from its implementation.  This is
+// easier to use than the PolymorphicAction<Impl> constructor as it
+// doesn't require you to explicitly write the template argument, e.g.
+//
+//   MakePolymorphicAction(foo);
+// vs
+//   PolymorphicAction<TypeOfFoo>(foo);
+template <typename Impl>
+inline PolymorphicAction<Impl> MakePolymorphicAction(const Impl& impl) {
+  return PolymorphicAction<Impl>(impl);
+}
+
+namespace internal {
+
+// Helper struct to specialize ReturnAction to execute a move instead of a copy
+// on return. Useful for move-only types, but could be used on any type.
+template <typename T>
+struct ByMoveWrapper {
+  explicit ByMoveWrapper(T value) : payload(std::move(value)) {}
+  T payload;
+};
+
+// Implements the polymorphic Return(x) action, which can be used in
+// any function that returns the type of x, regardless of the argument
+// types.
+//
+// Note: The value passed into Return must be converted into
+// Function<F>::Result when this action is cast to Action<F> rather than
+// when that action is performed. This is important in scenarios like
+//
+// MOCK_METHOD1(Method, T(U));
+// ...
+// {
+//   Foo foo;
+//   X x(&foo);
+//   EXPECT_CALL(mock, Method(_)).WillOnce(Return(x));
+// }
+//
+// In the example above the variable x holds reference to foo which leaves
+// scope and gets destroyed.  If copying X just copies a reference to foo,
+// that copy will be left with a hanging reference.  If conversion to T
+// makes a copy of foo, the above code is safe. To support that scenario, we
+// need to make sure that the type conversion happens inside the EXPECT_CALL
+// statement, and conversion of the result of Return to Action<T(U)> is a
+// good place for that.
+//
+// The real life example of the above scenario happens when an invocation
+// of gtl::Container() is passed into Return.
+//
+template <typename R>
+class ReturnAction {
+ public:
+  // Constructs a ReturnAction object from the value to be returned.
+  // 'value' is passed by value instead of by const reference in order
+  // to allow Return("string literal") to compile.
+  explicit ReturnAction(R value) : value_(new R(std::move(value))) {}
+
+  // This template type conversion operator allows Return(x) to be
+  // used in ANY function that returns x's type.
+  template <typename F>
+  operator Action<F>() const {  // NOLINT
+    // Assert statement belongs here because this is the best place to verify
+    // conditions on F. It produces the clearest error messages
+    // in most compilers.
+    // Impl really belongs in this scope as a local class but can't
+    // because MSVC produces duplicate symbols in different translation units
+    // in this case. Until MS fixes that bug we put Impl into the class scope
+    // and put the typedef both here (for use in assert statement) and
+    // in the Impl class. But both definitions must be the same.
+    typedef typename Function<F>::Result Result;
+    GTEST_COMPILE_ASSERT_(
+        !std::is_reference<Result>::value,
+        use_ReturnRef_instead_of_Return_to_return_a_reference);
+    static_assert(!std::is_void<Result>::value,
+                  "Can't use Return() on an action expected to return `void`.");
+    return Action<F>(new Impl<R, F>(value_));
+  }
+
+ private:
+  // Implements the Return(x) action for a particular function type F.
+  template <typename R_, typename F>
+  class Impl : public ActionInterface<F> {
+   public:
+    typedef typename Function<F>::Result Result;
+    typedef typename Function<F>::ArgumentTuple ArgumentTuple;
+
+    // The implicit cast is necessary when Result has more than one
+    // single-argument constructor (e.g. Result is std::vector<int>) and R
+    // has a type conversion operator template.  In that case, value_(value)
+    // won't compile as the compiler doesn't known which constructor of
+    // Result to call.  ImplicitCast_ forces the compiler to convert R to
+    // Result without considering explicit constructors, thus resolving the
+    // ambiguity. value_ is then initialized using its copy constructor.
+    explicit Impl(const std::shared_ptr<R>& value)
+        : value_before_cast_(*value),
+          value_(ImplicitCast_<Result>(value_before_cast_)) {}
+
+    Result Perform(const ArgumentTuple&) override { return value_; }
+
+   private:
+    GTEST_COMPILE_ASSERT_(!std::is_reference<Result>::value,
+                          Result_cannot_be_a_reference_type);
+    // We save the value before casting just in case it is being cast to a
+    // wrapper type.
+    R value_before_cast_;
+    Result value_;
+
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(Impl);
+  };
+
+  // Partially specialize for ByMoveWrapper. This version of ReturnAction will
+  // move its contents instead.
+  template <typename R_, typename F>
+  class Impl<ByMoveWrapper<R_>, F> : public ActionInterface<F> {
+   public:
+    typedef typename Function<F>::Result Result;
+    typedef typename Function<F>::ArgumentTuple ArgumentTuple;
+
+    explicit Impl(const std::shared_ptr<R>& wrapper)
+        : performed_(false), wrapper_(wrapper) {}
+
+    Result Perform(const ArgumentTuple&) override {
+      GTEST_CHECK_(!performed_)
+          << "A ByMove() action should only be performed once.";
+      performed_ = true;
+      return std::move(wrapper_->payload);
+    }
+
+   private:
+    bool performed_;
+    const std::shared_ptr<R> wrapper_;
+  };
+
+  const std::shared_ptr<R> value_;
+};
+
+// Implements the ReturnNull() action.
+class ReturnNullAction {
+ public:
+  // Allows ReturnNull() to be used in any pointer-returning function. In C++11
+  // this is enforced by returning nullptr, and in non-C++11 by asserting a
+  // pointer type on compile time.
+  template <typename Result, typename ArgumentTuple>
+  static Result Perform(const ArgumentTuple&) {
+    return nullptr;
+  }
+};
+
+// Implements the Return() action.
+class ReturnVoidAction {
+ public:
+  // Allows Return() to be used in any void-returning function.
+  template <typename Result, typename ArgumentTuple>
+  static void Perform(const ArgumentTuple&) {
+    static_assert(std::is_void<Result>::value, "Result should be void.");
+  }
+};
+
+// Implements the polymorphic ReturnRef(x) action, which can be used
+// in any function that returns a reference to the type of x,
+// regardless of the argument types.
+template <typename T>
+class ReturnRefAction {
+ public:
+  // Constructs a ReturnRefAction object from the reference to be returned.
+  explicit ReturnRefAction(T& ref) : ref_(ref) {}  // NOLINT
+
+  // This template type conversion operator allows ReturnRef(x) to be
+  // used in ANY function that returns a reference to x's type.
+  template <typename F>
+  operator Action<F>() const {
+    typedef typename Function<F>::Result Result;
+    // Asserts that the function return type is a reference.  This
+    // catches the user error of using ReturnRef(x) when Return(x)
+    // should be used, and generates some helpful error message.
+    GTEST_COMPILE_ASSERT_(std::is_reference<Result>::value,
+                          use_Return_instead_of_ReturnRef_to_return_a_value);
+    return Action<F>(new Impl<F>(ref_));
+  }
+
+ private:
+  // Implements the ReturnRef(x) action for a particular function type F.
+  template <typename F>
+  class Impl : public ActionInterface<F> {
+   public:
+    typedef typename Function<F>::Result Result;
+    typedef typename Function<F>::ArgumentTuple ArgumentTuple;
+
+    explicit Impl(T& ref) : ref_(ref) {}  // NOLINT
+
+    Result Perform(const ArgumentTuple&) override { return ref_; }
+
+   private:
+    T& ref_;
+  };
+
+  T& ref_;
+};
+
+// Implements the polymorphic ReturnRefOfCopy(x) action, which can be
+// used in any function that returns a reference to the type of x,
+// regardless of the argument types.
+template <typename T>
+class ReturnRefOfCopyAction {
+ public:
+  // Constructs a ReturnRefOfCopyAction object from the reference to
+  // be returned.
+  explicit ReturnRefOfCopyAction(const T& value) : value_(value) {}  // NOLINT
+
+  // This template type conversion operator allows ReturnRefOfCopy(x) to be
+  // used in ANY function that returns a reference to x's type.
+  template <typename F>
+  operator Action<F>() const {
+    typedef typename Function<F>::Result Result;
+    // Asserts that the function return type is a reference.  This
+    // catches the user error of using ReturnRefOfCopy(x) when Return(x)
+    // should be used, and generates some helpful error message.
+    GTEST_COMPILE_ASSERT_(
+        std::is_reference<Result>::value,
+        use_Return_instead_of_ReturnRefOfCopy_to_return_a_value);
+    return Action<F>(new Impl<F>(value_));
+  }
+
+ private:
+  // Implements the ReturnRefOfCopy(x) action for a particular function type F.
+  template <typename F>
+  class Impl : public ActionInterface<F> {
+   public:
+    typedef typename Function<F>::Result Result;
+    typedef typename Function<F>::ArgumentTuple ArgumentTuple;
+
+    explicit Impl(const T& value) : value_(value) {}  // NOLINT
+
+    Result Perform(const ArgumentTuple&) override { return value_; }
+
+   private:
+    T value_;
+  };
+
+  const T value_;
+};
+
+// Implements the polymorphic ReturnRoundRobin(v) action, which can be
+// used in any function that returns the element_type of v.
+template <typename T>
+class ReturnRoundRobinAction {
+ public:
+  explicit ReturnRoundRobinAction(std::vector<T> values) {
+    GTEST_CHECK_(!values.empty())
+        << "ReturnRoundRobin requires at least one element.";
+    state_->values = std::move(values);
+  }
+
+  template <typename... Args>
+  T operator()(Args&&...) const {
+     return state_->Next();
+  }
+
+ private:
+  struct State {
+    T Next() {
+      T ret_val = values[i++];
+      if (i == values.size()) i = 0;
+      return ret_val;
+    }
+
+    std::vector<T> values;
+    size_t i = 0;
+  };
+  std::shared_ptr<State> state_ = std::make_shared<State>();
+};
+
+// Implements the polymorphic DoDefault() action.
+class DoDefaultAction {
+ public:
+  // This template type conversion operator allows DoDefault() to be
+  // used in any function.
+  template <typename F>
+  operator Action<F>() const { return Action<F>(); }  // NOLINT
+};
+
+// Implements the Assign action to set a given pointer referent to a
+// particular value.
+template <typename T1, typename T2>
+class AssignAction {
+ public:
+  AssignAction(T1* ptr, T2 value) : ptr_(ptr), value_(value) {}
+
+  template <typename Result, typename ArgumentTuple>
+  void Perform(const ArgumentTuple& /* args */) const {
+    *ptr_ = value_;
+  }
+
+ private:
+  T1* const ptr_;
+  const T2 value_;
+};
+
+#if !GTEST_OS_WINDOWS_MOBILE
+
+// Implements the SetErrnoAndReturn action to simulate return from
+// various system calls and libc functions.
+template <typename T>
+class SetErrnoAndReturnAction {
+ public:
+  SetErrnoAndReturnAction(int errno_value, T result)
+      : errno_(errno_value),
+        result_(result) {}
+  template <typename Result, typename ArgumentTuple>
+  Result Perform(const ArgumentTuple& /* args */) const {
+    errno = errno_;
+    return result_;
+  }
+
+ private:
+  const int errno_;
+  const T result_;
+};
+
+#endif  // !GTEST_OS_WINDOWS_MOBILE
+
+// Implements the SetArgumentPointee<N>(x) action for any function
+// whose N-th argument (0-based) is a pointer to x's type.
+template <size_t N, typename A, typename = void>
+struct SetArgumentPointeeAction {
+  A value;
+
+  template <typename... Args>
+  void operator()(const Args&... args) const {
+    *::std::get<N>(std::tie(args...)) = value;
+  }
+};
+
+// Implements the Invoke(object_ptr, &Class::Method) action.
+template <class Class, typename MethodPtr>
+struct InvokeMethodAction {
+  Class* const obj_ptr;
+  const MethodPtr method_ptr;
+
+  template <typename... Args>
+  auto operator()(Args&&... args) const
+      -> decltype((obj_ptr->*method_ptr)(std::forward<Args>(args)...)) {
+    return (obj_ptr->*method_ptr)(std::forward<Args>(args)...);
+  }
+};
+
+// Implements the InvokeWithoutArgs(f) action.  The template argument
+// FunctionImpl is the implementation type of f, which can be either a
+// function pointer or a functor.  InvokeWithoutArgs(f) can be used as an
+// Action<F> as long as f's type is compatible with F.
+template <typename FunctionImpl>
+struct InvokeWithoutArgsAction {
+  FunctionImpl function_impl;
+
+  // Allows InvokeWithoutArgs(f) to be used as any action whose type is
+  // compatible with f.
+  template <typename... Args>
+  auto operator()(const Args&...) -> decltype(function_impl()) {
+    return function_impl();
+  }
+};
+
+// Implements the InvokeWithoutArgs(object_ptr, &Class::Method) action.
+template <class Class, typename MethodPtr>
+struct InvokeMethodWithoutArgsAction {
+  Class* const obj_ptr;
+  const MethodPtr method_ptr;
+
+  using ReturnType =
+      decltype((std::declval<Class*>()->*std::declval<MethodPtr>())());
+
+  template <typename... Args>
+  ReturnType operator()(const Args&...) const {
+    return (obj_ptr->*method_ptr)();
+  }
+};
+
+// Implements the IgnoreResult(action) action.
+template <typename A>
+class IgnoreResultAction {
+ public:
+  explicit IgnoreResultAction(const A& action) : action_(action) {}
+
+  template <typename F>
+  operator Action<F>() const {
+    // Assert statement belongs here because this is the best place to verify
+    // conditions on F. It produces the clearest error messages
+    // in most compilers.
+    // Impl really belongs in this scope as a local class but can't
+    // because MSVC produces duplicate symbols in different translation units
+    // in this case. Until MS fixes that bug we put Impl into the class scope
+    // and put the typedef both here (for use in assert statement) and
+    // in the Impl class. But both definitions must be the same.
+    typedef typename internal::Function<F>::Result Result;
+
+    // Asserts at compile time that F returns void.
+    static_assert(std::is_void<Result>::value, "Result type should be void.");
+
+    return Action<F>(new Impl<F>(action_));
+  }
+
+ private:
+  template <typename F>
+  class Impl : public ActionInterface<F> {
+   public:
+    typedef typename internal::Function<F>::Result Result;
+    typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
+
+    explicit Impl(const A& action) : action_(action) {}
+
+    void Perform(const ArgumentTuple& args) override {
+      // Performs the action and ignores its result.
+      action_.Perform(args);
+    }
+
+   private:
+    // Type OriginalFunction is the same as F except that its return
+    // type is IgnoredValue.
+    typedef typename internal::Function<F>::MakeResultIgnoredValue
+        OriginalFunction;
+
+    const Action<OriginalFunction> action_;
+  };
+
+  const A action_;
+};
+
+template <typename InnerAction, size_t... I>
+struct WithArgsAction {
+  InnerAction action;
+
+  // The inner action could be anything convertible to Action<X>.
+  // We use the conversion operator to detect the signature of the inner Action.
+  template <typename R, typename... Args>
+  operator Action<R(Args...)>() const {  // NOLINT
+    using TupleType = std::tuple<Args...>;
+    Action<R(typename std::tuple_element<I, TupleType>::type...)>
+        converted(action);
+
+    return [converted](Args... args) -> R {
+      return converted.Perform(std::forward_as_tuple(
+        std::get<I>(std::forward_as_tuple(std::forward<Args>(args)...))...));
+    };
+  }
+};
+
+template <typename... Actions>
+struct DoAllAction {
+ private:
+  template <typename T>
+  using NonFinalType =
+      typename std::conditional<std::is_scalar<T>::value, T, const T&>::type;
+
+  template <typename ActionT, size_t... I>
+  std::vector<ActionT> Convert(IndexSequence<I...>) const {
+    return {ActionT(std::get<I>(actions))...};
+  }
+
+ public:
+  std::tuple<Actions...> actions;
+
+  template <typename R, typename... Args>
+  operator Action<R(Args...)>() const {  // NOLINT
+    struct Op {
+      std::vector<Action<void(NonFinalType<Args>...)>> converted;
+      Action<R(Args...)> last;
+      R operator()(Args... args) const {
+        auto tuple_args = std::forward_as_tuple(std::forward<Args>(args)...);
+        for (auto& a : converted) {
+          a.Perform(tuple_args);
+        }
+        return last.Perform(std::move(tuple_args));
+      }
+    };
+    return Op{Convert<Action<void(NonFinalType<Args>...)>>(
+                  MakeIndexSequence<sizeof...(Actions) - 1>()),
+              std::get<sizeof...(Actions) - 1>(actions)};
+  }
+};
+
+template <typename T, typename... Params>
+struct ReturnNewAction {
+  T* operator()() const {
+    return internal::Apply(
+        [](const Params&... unpacked_params) {
+          return new T(unpacked_params...);
+        },
+        params);
+  }
+  std::tuple<Params...> params;
+};
+
+template <size_t k>
+struct ReturnArgAction {
+  template <typename... Args>
+  auto operator()(const Args&... args) const ->
+      typename std::tuple_element<k, std::tuple<Args...>>::type {
+    return std::get<k>(std::tie(args...));
+  }
+};
+
+template <size_t k, typename Ptr>
+struct SaveArgAction {
+  Ptr pointer;
+
+  template <typename... Args>
+  void operator()(const Args&... args) const {
+    *pointer = std::get<k>(std::tie(args...));
+  }
+};
+
+template <size_t k, typename Ptr>
+struct SaveArgPointeeAction {
+  Ptr pointer;
+
+  template <typename... Args>
+  void operator()(const Args&... args) const {
+    *pointer = *std::get<k>(std::tie(args...));
+  }
+};
+
+template <size_t k, typename T>
+struct SetArgRefereeAction {
+  T value;
+
+  template <typename... Args>
+  void operator()(Args&&... args) const {
+    using argk_type =
+        typename ::std::tuple_element<k, std::tuple<Args...>>::type;
+    static_assert(std::is_lvalue_reference<argk_type>::value,
+                  "Argument must be a reference type.");
+    std::get<k>(std::tie(args...)) = value;
+  }
+};
+
+template <size_t k, typename I1, typename I2>
+struct SetArrayArgumentAction {
+  I1 first;
+  I2 last;
+
+  template <typename... Args>
+  void operator()(const Args&... args) const {
+    auto value = std::get<k>(std::tie(args...));
+    for (auto it = first; it != last; ++it, (void)++value) {
+      *value = *it;
+    }
+  }
+};
+
+template <size_t k>
+struct DeleteArgAction {
+  template <typename... Args>
+  void operator()(const Args&... args) const {
+    delete std::get<k>(std::tie(args...));
+  }
+};
+
+template <typename Ptr>
+struct ReturnPointeeAction {
+  Ptr pointer;
+  template <typename... Args>
+  auto operator()(const Args&...) const -> decltype(*pointer) {
+    return *pointer;
+  }
+};
+
+#if GTEST_HAS_EXCEPTIONS
+template <typename T>
+struct ThrowAction {
+  T exception;
+  // We use a conversion operator to adapt to any return type.
+  template <typename R, typename... Args>
+  operator Action<R(Args...)>() const {  // NOLINT
+    T copy = exception;
+    return [copy](Args...) -> R { throw copy; };
+  }
+};
+#endif  // GTEST_HAS_EXCEPTIONS
+
+}  // namespace internal
+
+// An Unused object can be implicitly constructed from ANY value.
+// This is handy when defining actions that ignore some or all of the
+// mock function arguments.  For example, given
+//
+//   MOCK_METHOD3(Foo, double(const string& label, double x, double y));
+//   MOCK_METHOD3(Bar, double(int index, double x, double y));
+//
+// instead of
+//
+//   double DistanceToOriginWithLabel(const string& label, double x, double y) {
+//     return sqrt(x*x + y*y);
+//   }
+//   double DistanceToOriginWithIndex(int index, double x, double y) {
+//     return sqrt(x*x + y*y);
+//   }
+//   ...
+//   EXPECT_CALL(mock, Foo("abc", _, _))
+//       .WillOnce(Invoke(DistanceToOriginWithLabel));
+//   EXPECT_CALL(mock, Bar(5, _, _))
+//       .WillOnce(Invoke(DistanceToOriginWithIndex));
+//
+// you could write
+//
+//   // We can declare any uninteresting argument as Unused.
+//   double DistanceToOrigin(Unused, double x, double y) {
+//     return sqrt(x*x + y*y);
+//   }
+//   ...
+//   EXPECT_CALL(mock, Foo("abc", _, _)).WillOnce(Invoke(DistanceToOrigin));
+//   EXPECT_CALL(mock, Bar(5, _, _)).WillOnce(Invoke(DistanceToOrigin));
+typedef internal::IgnoredValue Unused;
+
+// Creates an action that does actions a1, a2, ..., sequentially in
+// each invocation. All but the last action will have a readonly view of the
+// arguments.
+template <typename... Action>
+internal::DoAllAction<typename std::decay<Action>::type...> DoAll(
+    Action&&... action) {
+  return {std::forward_as_tuple(std::forward<Action>(action)...)};
+}
+
+// WithArg<k>(an_action) creates an action that passes the k-th
+// (0-based) argument of the mock function to an_action and performs
+// it.  It adapts an action accepting one argument to one that accepts
+// multiple arguments.  For convenience, we also provide
+// WithArgs<k>(an_action) (defined below) as a synonym.
+template <size_t k, typename InnerAction>
+internal::WithArgsAction<typename std::decay<InnerAction>::type, k>
+WithArg(InnerAction&& action) {
+  return {std::forward<InnerAction>(action)};
+}
+
+// WithArgs<N1, N2, ..., Nk>(an_action) creates an action that passes
+// the selected arguments of the mock function to an_action and
+// performs it.  It serves as an adaptor between actions with
+// different argument lists.
+template <size_t k, size_t... ks, typename InnerAction>
+internal::WithArgsAction<typename std::decay<InnerAction>::type, k, ks...>
+WithArgs(InnerAction&& action) {
+  return {std::forward<InnerAction>(action)};
+}
+
+// WithoutArgs(inner_action) can be used in a mock function with a
+// non-empty argument list to perform inner_action, which takes no
+// argument.  In other words, it adapts an action accepting no
+// argument to one that accepts (and ignores) arguments.
+template <typename InnerAction>
+internal::WithArgsAction<typename std::decay<InnerAction>::type>
+WithoutArgs(InnerAction&& action) {
+  return {std::forward<InnerAction>(action)};
+}
+
+// Creates an action that returns 'value'.  'value' is passed by value
+// instead of const reference - otherwise Return("string literal")
+// will trigger a compiler error about using array as initializer.
+template <typename R>
+internal::ReturnAction<R> Return(R value) {
+  return internal::ReturnAction<R>(std::move(value));
+}
+
+// Creates an action that returns NULL.
+inline PolymorphicAction<internal::ReturnNullAction> ReturnNull() {
+  return MakePolymorphicAction(internal::ReturnNullAction());
+}
+
+// Creates an action that returns from a void function.
+inline PolymorphicAction<internal::ReturnVoidAction> Return() {
+  return MakePolymorphicAction(internal::ReturnVoidAction());
+}
+
+// Creates an action that returns the reference to a variable.
+template <typename R>
+inline internal::ReturnRefAction<R> ReturnRef(R& x) {  // NOLINT
+  return internal::ReturnRefAction<R>(x);
+}
+
+// Prevent using ReturnRef on reference to temporary.
+template <typename R, R* = nullptr>
+internal::ReturnRefAction<R> ReturnRef(R&&) = delete;
+
+// Creates an action that returns the reference to a copy of the
+// argument.  The copy is created when the action is constructed and
+// lives as long as the action.
+template <typename R>
+inline internal::ReturnRefOfCopyAction<R> ReturnRefOfCopy(const R& x) {
+  return internal::ReturnRefOfCopyAction<R>(x);
+}
+
+// Modifies the parent action (a Return() action) to perform a move of the
+// argument instead of a copy.
+// Return(ByMove()) actions can only be executed once and will assert this
+// invariant.
+template <typename R>
+internal::ByMoveWrapper<R> ByMove(R x) {
+  return internal::ByMoveWrapper<R>(std::move(x));
+}
+
+// Creates an action that returns an element of `vals`. Calling this action will
+// repeatedly return the next value from `vals` until it reaches the end and
+// will restart from the beginning.
+template <typename T>
+internal::ReturnRoundRobinAction<T> ReturnRoundRobin(std::vector<T> vals) {
+  return internal::ReturnRoundRobinAction<T>(std::move(vals));
+}
+
+// Creates an action that returns an element of `vals`. Calling this action will
+// repeatedly return the next value from `vals` until it reaches the end and
+// will restart from the beginning.
+template <typename T>
+internal::ReturnRoundRobinAction<T> ReturnRoundRobin(
+    std::initializer_list<T> vals) {
+  return internal::ReturnRoundRobinAction<T>(std::vector<T>(vals));
+}
+
+// Creates an action that does the default action for the give mock function.
+inline internal::DoDefaultAction DoDefault() {
+  return internal::DoDefaultAction();
+}
+
+// Creates an action that sets the variable pointed by the N-th
+// (0-based) function argument to 'value'.
+template <size_t N, typename T>
+internal::SetArgumentPointeeAction<N, T> SetArgPointee(T value) {
+  return {std::move(value)};
+}
+
+// The following version is DEPRECATED.
+template <size_t N, typename T>
+internal::SetArgumentPointeeAction<N, T> SetArgumentPointee(T value) {
+  return {std::move(value)};
+}
+
+// Creates an action that sets a pointer referent to a given value.
+template <typename T1, typename T2>
+PolymorphicAction<internal::AssignAction<T1, T2> > Assign(T1* ptr, T2 val) {
+  return MakePolymorphicAction(internal::AssignAction<T1, T2>(ptr, val));
+}
+
+#if !GTEST_OS_WINDOWS_MOBILE
+
+// Creates an action that sets errno and returns the appropriate error.
+template <typename T>
+PolymorphicAction<internal::SetErrnoAndReturnAction<T> >
+SetErrnoAndReturn(int errval, T result) {
+  return MakePolymorphicAction(
+      internal::SetErrnoAndReturnAction<T>(errval, result));
+}
+
+#endif  // !GTEST_OS_WINDOWS_MOBILE
+
+// Various overloads for Invoke().
+
+// Legacy function.
+// Actions can now be implicitly constructed from callables. No need to create
+// wrapper objects.
+// This function exists for backwards compatibility.
+template <typename FunctionImpl>
+typename std::decay<FunctionImpl>::type Invoke(FunctionImpl&& function_impl) {
+  return std::forward<FunctionImpl>(function_impl);
+}
+
+// Creates an action that invokes the given method on the given object
+// with the mock function's arguments.
+template <class Class, typename MethodPtr>
+internal::InvokeMethodAction<Class, MethodPtr> Invoke(Class* obj_ptr,
+                                                      MethodPtr method_ptr) {
+  return {obj_ptr, method_ptr};
+}
+
+// Creates an action that invokes 'function_impl' with no argument.
+template <typename FunctionImpl>
+internal::InvokeWithoutArgsAction<typename std::decay<FunctionImpl>::type>
+InvokeWithoutArgs(FunctionImpl function_impl) {
+  return {std::move(function_impl)};
+}
+
+// Creates an action that invokes the given method on the given object
+// with no argument.
+template <class Class, typename MethodPtr>
+internal::InvokeMethodWithoutArgsAction<Class, MethodPtr> InvokeWithoutArgs(
+    Class* obj_ptr, MethodPtr method_ptr) {
+  return {obj_ptr, method_ptr};
+}
+
+// Creates an action that performs an_action and throws away its
+// result.  In other words, it changes the return type of an_action to
+// void.  an_action MUST NOT return void, or the code won't compile.
+template <typename A>
+inline internal::IgnoreResultAction<A> IgnoreResult(const A& an_action) {
+  return internal::IgnoreResultAction<A>(an_action);
+}
+
+// Creates a reference wrapper for the given L-value.  If necessary,
+// you can explicitly specify the type of the reference.  For example,
+// suppose 'derived' is an object of type Derived, ByRef(derived)
+// would wrap a Derived&.  If you want to wrap a const Base& instead,
+// where Base is a base class of Derived, just write:
+//
+//   ByRef<const Base>(derived)
+//
+// N.B. ByRef is redundant with std::ref, std::cref and std::reference_wrapper.
+// However, it may still be used for consistency with ByMove().
+template <typename T>
+inline ::std::reference_wrapper<T> ByRef(T& l_value) {  // NOLINT
+  return ::std::reference_wrapper<T>(l_value);
+}
+
+// The ReturnNew<T>(a1, a2, ..., a_k) action returns a pointer to a new
+// instance of type T, constructed on the heap with constructor arguments
+// a1, a2, ..., and a_k. The caller assumes ownership of the returned value.
+template <typename T, typename... Params>
+internal::ReturnNewAction<T, typename std::decay<Params>::type...> ReturnNew(
+    Params&&... params) {
+  return {std::forward_as_tuple(std::forward<Params>(params)...)};
+}
+
+// Action ReturnArg<k>() returns the k-th argument of the mock function.
+template <size_t k>
+internal::ReturnArgAction<k> ReturnArg() {
+  return {};
+}
+
+// Action SaveArg<k>(pointer) saves the k-th (0-based) argument of the
+// mock function to *pointer.
+template <size_t k, typename Ptr>
+internal::SaveArgAction<k, Ptr> SaveArg(Ptr pointer) {
+  return {pointer};
+}
+
+// Action SaveArgPointee<k>(pointer) saves the value pointed to
+// by the k-th (0-based) argument of the mock function to *pointer.
+template <size_t k, typename Ptr>
+internal::SaveArgPointeeAction<k, Ptr> SaveArgPointee(Ptr pointer) {
+  return {pointer};
+}
+
+// Action SetArgReferee<k>(value) assigns 'value' to the variable
+// referenced by the k-th (0-based) argument of the mock function.
+template <size_t k, typename T>
+internal::SetArgRefereeAction<k, typename std::decay<T>::type> SetArgReferee(
+    T&& value) {
+  return {std::forward<T>(value)};
+}
+
+// Action SetArrayArgument<k>(first, last) copies the elements in
+// source range [first, last) to the array pointed to by the k-th
+// (0-based) argument, which can be either a pointer or an
+// iterator. The action does not take ownership of the elements in the
+// source range.
+template <size_t k, typename I1, typename I2>
+internal::SetArrayArgumentAction<k, I1, I2> SetArrayArgument(I1 first,
+                                                             I2 last) {
+  return {first, last};
+}
+
+// Action DeleteArg<k>() deletes the k-th (0-based) argument of the mock
+// function.
+template <size_t k>
+internal::DeleteArgAction<k> DeleteArg() {
+  return {};
+}
+
+// This action returns the value pointed to by 'pointer'.
+template <typename Ptr>
+internal::ReturnPointeeAction<Ptr> ReturnPointee(Ptr pointer) {
+  return {pointer};
+}
+
+// Action Throw(exception) can be used in a mock function of any type
+// to throw the given exception.  Any copyable value can be thrown.
+#if GTEST_HAS_EXCEPTIONS
+template <typename T>
+internal::ThrowAction<typename std::decay<T>::type> Throw(T&& exception) {
+  return {std::forward<T>(exception)};
+}
+#endif  // GTEST_HAS_EXCEPTIONS
+
+namespace internal {
+
+// A macro from the ACTION* family (defined later in gmock-generated-actions.h)
+// defines an action that can be used in a mock function.  Typically,
+// these actions only care about a subset of the arguments of the mock
+// function.  For example, if such an action only uses the second
+// argument, it can be used in any mock function that takes >= 2
+// arguments where the type of the second argument is compatible.
+//
+// Therefore, the action implementation must be prepared to take more
+// arguments than it needs.  The ExcessiveArg type is used to
+// represent those excessive arguments.  In order to keep the compiler
+// error messages tractable, we define it in the testing namespace
+// instead of testing::internal.  However, this is an INTERNAL TYPE
+// and subject to change without notice, so a user MUST NOT USE THIS
+// TYPE DIRECTLY.
+struct ExcessiveArg {};
+
+// Builds an implementation of an Action<> for some particular signature, using
+// a class defined by an ACTION* macro.
+template <typename F, typename Impl> struct ActionImpl;
+
+template <typename Impl>
+struct ImplBase {
+  struct Holder {
+    // Allows each copy of the Action<> to get to the Impl.
+    explicit operator const Impl&() const { return *ptr; }
+    std::shared_ptr<Impl> ptr;
+  };
+  using type = typename std::conditional<std::is_constructible<Impl>::value,
+                                         Impl, Holder>::type;
+};
+
+template <typename R, typename... Args, typename Impl>
+struct ActionImpl<R(Args...), Impl> : ImplBase<Impl>::type {
+  using Base = typename ImplBase<Impl>::type;
+  using function_type = R(Args...);
+  using args_type = std::tuple<Args...>;
+
+  ActionImpl() = default;  // Only defined if appropriate for Base.
+  explicit ActionImpl(std::shared_ptr<Impl> impl) : Base{std::move(impl)} { }
+
+  R operator()(Args&&... arg) const {
+    static constexpr size_t kMaxArgs =
+        sizeof...(Args) <= 10 ? sizeof...(Args) : 10;
+    return Apply(MakeIndexSequence<kMaxArgs>{},
+                 MakeIndexSequence<10 - kMaxArgs>{},
+                 args_type{std::forward<Args>(arg)...});
+  }
+
+  template <std::size_t... arg_id, std::size_t... excess_id>
+  R Apply(IndexSequence<arg_id...>, IndexSequence<excess_id...>,
+          const args_type& args) const {
+    // Impl need not be specific to the signature of action being implemented;
+    // only the implementing function body needs to have all of the specific
+    // types instantiated.  Up to 10 of the args that are provided by the
+    // args_type get passed, followed by a dummy of unspecified type for the
+    // remainder up to 10 explicit args.
+    static constexpr ExcessiveArg kExcessArg{};
+    return static_cast<const Impl&>(*this).template gmock_PerformImpl<
+        /*function_type=*/function_type, /*return_type=*/R,
+        /*args_type=*/args_type,
+        /*argN_type=*/typename std::tuple_element<arg_id, args_type>::type...>(
+        /*args=*/args, std::get<arg_id>(args)...,
+        ((void)excess_id, kExcessArg)...);
+  }
+};
+
+// Stores a default-constructed Impl as part of the Action<>'s
+// std::function<>. The Impl should be trivial to copy.
+template <typename F, typename Impl>
+::testing::Action<F> MakeAction() {
+  return ::testing::Action<F>(ActionImpl<F, Impl>());
+}
+
+// Stores just the one given instance of Impl.
+template <typename F, typename Impl>
+::testing::Action<F> MakeAction(std::shared_ptr<Impl> impl) {
+  return ::testing::Action<F>(ActionImpl<F, Impl>(std::move(impl)));
+}
+
+#define GMOCK_INTERNAL_ARG_UNUSED(i, data, el) \
+  , const arg##i##_type& arg##i GTEST_ATTRIBUTE_UNUSED_
+#define GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_           \
+  const args_type& args GTEST_ATTRIBUTE_UNUSED_ GMOCK_PP_REPEAT( \
+      GMOCK_INTERNAL_ARG_UNUSED, , 10)
+
+#define GMOCK_INTERNAL_ARG(i, data, el) , const arg##i##_type& arg##i
+#define GMOCK_ACTION_ARG_TYPES_AND_NAMES_ \
+  const args_type& args GMOCK_PP_REPEAT(GMOCK_INTERNAL_ARG, , 10)
+
+#define GMOCK_INTERNAL_TEMPLATE_ARG(i, data, el) , typename arg##i##_type
+#define GMOCK_ACTION_TEMPLATE_ARGS_NAMES_ \
+  GMOCK_PP_TAIL(GMOCK_PP_REPEAT(GMOCK_INTERNAL_TEMPLATE_ARG, , 10))
+
+#define GMOCK_INTERNAL_TYPENAME_PARAM(i, data, param) , typename param##_type
+#define GMOCK_ACTION_TYPENAME_PARAMS_(params) \
+  GMOCK_PP_TAIL(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_TYPENAME_PARAM, , params))
+
+#define GMOCK_INTERNAL_TYPE_PARAM(i, data, param) , param##_type
+#define GMOCK_ACTION_TYPE_PARAMS_(params) \
+  GMOCK_PP_TAIL(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_TYPE_PARAM, , params))
+
+#define GMOCK_INTERNAL_TYPE_GVALUE_PARAM(i, data, param) \
+  , param##_type gmock_p##i
+#define GMOCK_ACTION_TYPE_GVALUE_PARAMS_(params) \
+  GMOCK_PP_TAIL(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_TYPE_GVALUE_PARAM, , params))
+
+#define GMOCK_INTERNAL_GVALUE_PARAM(i, data, param) \
+  , std::forward<param##_type>(gmock_p##i)
+#define GMOCK_ACTION_GVALUE_PARAMS_(params) \
+  GMOCK_PP_TAIL(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_GVALUE_PARAM, , params))
+
+#define GMOCK_INTERNAL_INIT_PARAM(i, data, param) \
+  , param(::std::forward<param##_type>(gmock_p##i))
+#define GMOCK_ACTION_INIT_PARAMS_(params) \
+  GMOCK_PP_TAIL(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_INIT_PARAM, , params))
+
+#define GMOCK_INTERNAL_FIELD_PARAM(i, data, param) param##_type param;
+#define GMOCK_ACTION_FIELD_PARAMS_(params) \
+  GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_FIELD_PARAM, , params)
+
+#define GMOCK_INTERNAL_ACTION(name, full_name, params)                        \
+  template <GMOCK_ACTION_TYPENAME_PARAMS_(params)>                            \
+  class full_name {                                                           \
+   public:                                                                    \
+    explicit full_name(GMOCK_ACTION_TYPE_GVALUE_PARAMS_(params))              \
+        : impl_(std::make_shared<gmock_Impl>(                                 \
+                GMOCK_ACTION_GVALUE_PARAMS_(params))) { }                     \
+    full_name(const full_name&) = default;                                    \
+    full_name(full_name&&) noexcept = default;                                \
+    template <typename F>                                                     \
+    operator ::testing::Action<F>() const {                                   \
+      return ::testing::internal::MakeAction<F>(impl_);                       \
+    }                                                                         \
+   private:                                                                   \
+    class gmock_Impl {                                                        \
+     public:                                                                  \
+      explicit gmock_Impl(GMOCK_ACTION_TYPE_GVALUE_PARAMS_(params))           \
+          : GMOCK_ACTION_INIT_PARAMS_(params) {}                              \
+      template <typename function_type, typename return_type,                 \
+                typename args_type, GMOCK_ACTION_TEMPLATE_ARGS_NAMES_>        \
+      return_type gmock_PerformImpl(GMOCK_ACTION_ARG_TYPES_AND_NAMES_) const; \
+      GMOCK_ACTION_FIELD_PARAMS_(params)                                      \
+    };                                                                        \
+    std::shared_ptr<const gmock_Impl> impl_;                                  \
+  };                                                                          \
+  template <GMOCK_ACTION_TYPENAME_PARAMS_(params)>                            \
+  inline full_name<GMOCK_ACTION_TYPE_PARAMS_(params)> name(                   \
+      GMOCK_ACTION_TYPE_GVALUE_PARAMS_(params)) {                             \
+    return full_name<GMOCK_ACTION_TYPE_PARAMS_(params)>(                      \
+        GMOCK_ACTION_GVALUE_PARAMS_(params));                                 \
+  }                                                                           \
+  template <GMOCK_ACTION_TYPENAME_PARAMS_(params)>                            \
+  template <typename function_type, typename return_type, typename args_type, \
+            GMOCK_ACTION_TEMPLATE_ARGS_NAMES_>                                \
+  return_type full_name<GMOCK_ACTION_TYPE_PARAMS_(params)>::gmock_Impl::      \
+  gmock_PerformImpl(GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
+
+}  // namespace internal
+
+// Similar to GMOCK_INTERNAL_ACTION, but no bound parameters are stored.
+#define ACTION(name)                                                          \
+  class name##Action {                                                        \
+   public:                                                                    \
+   explicit name##Action() noexcept {}                                        \
+   name##Action(const name##Action&) noexcept {}                              \
+    template <typename F>                                                     \
+    operator ::testing::Action<F>() const {                                   \
+      return ::testing::internal::MakeAction<F, gmock_Impl>();                \
+    }                                                                         \
+   private:                                                                   \
+    class gmock_Impl {                                                        \
+     public:                                                                  \
+      template <typename function_type, typename return_type,                 \
+                typename args_type, GMOCK_ACTION_TEMPLATE_ARGS_NAMES_>        \
+      return_type gmock_PerformImpl(GMOCK_ACTION_ARG_TYPES_AND_NAMES_) const; \
+    };                                                                        \
+  };                                                                          \
+  inline name##Action name() GTEST_MUST_USE_RESULT_;                          \
+  inline name##Action name() { return name##Action(); }                       \
+  template <typename function_type, typename return_type, typename args_type, \
+            GMOCK_ACTION_TEMPLATE_ARGS_NAMES_>                                \
+  return_type name##Action::gmock_Impl::gmock_PerformImpl(                    \
+      GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
+
+#define ACTION_P(name, ...) \
+  GMOCK_INTERNAL_ACTION(name, name##ActionP, (__VA_ARGS__))
+
+#define ACTION_P2(name, ...) \
+  GMOCK_INTERNAL_ACTION(name, name##ActionP2, (__VA_ARGS__))
+
+#define ACTION_P3(name, ...) \
+  GMOCK_INTERNAL_ACTION(name, name##ActionP3, (__VA_ARGS__))
+
+#define ACTION_P4(name, ...) \
+  GMOCK_INTERNAL_ACTION(name, name##ActionP4, (__VA_ARGS__))
+
+#define ACTION_P5(name, ...) \
+  GMOCK_INTERNAL_ACTION(name, name##ActionP5, (__VA_ARGS__))
+
+#define ACTION_P6(name, ...) \
+  GMOCK_INTERNAL_ACTION(name, name##ActionP6, (__VA_ARGS__))
+
+#define ACTION_P7(name, ...) \
+  GMOCK_INTERNAL_ACTION(name, name##ActionP7, (__VA_ARGS__))
+
+#define ACTION_P8(name, ...) \
+  GMOCK_INTERNAL_ACTION(name, name##ActionP8, (__VA_ARGS__))
+
+#define ACTION_P9(name, ...) \
+  GMOCK_INTERNAL_ACTION(name, name##ActionP9, (__VA_ARGS__))
+
+#define ACTION_P10(name, ...) \
+  GMOCK_INTERNAL_ACTION(name, name##ActionP10, (__VA_ARGS__))
+
+}  // namespace testing
+
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif
+
+#endif  // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_ACTIONS_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/gmock-cardinalities.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/gmock-cardinalities.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/gmock-cardinalities.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/gmock-cardinalities.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,157 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file implements some commonly used cardinalities.  More
+// cardinalities can be defined by the user implementing the
+// CardinalityInterface interface if necessary.
+
+// GOOGLETEST_CM0002 DO NOT DELETE
+
+#ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_
+#define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_
+
+#include <limits.h>
+#include <memory>
+#include <ostream>  // NOLINT
+#include "gmock/internal/gmock-port.h"
+#include "gtest/gtest.h"
+
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
+/* class A needs to have dll-interface to be used by clients of class B */)
+
+namespace testing {
+
+// To implement a cardinality Foo, define:
+//   1. a class FooCardinality that implements the
+//      CardinalityInterface interface, and
+//   2. a factory function that creates a Cardinality object from a
+//      const FooCardinality*.
+//
+// The two-level delegation design follows that of Matcher, providing
+// consistency for extension developers.  It also eases ownership
+// management as Cardinality objects can now be copied like plain values.
+
+// The implementation of a cardinality.
+class CardinalityInterface {
+ public:
+  virtual ~CardinalityInterface() {}
+
+  // Conservative estimate on the lower/upper bound of the number of
+  // calls allowed.
+  virtual int ConservativeLowerBound() const { return 0; }
+  virtual int ConservativeUpperBound() const { return INT_MAX; }
+
+  // Returns true if and only if call_count calls will satisfy this
+  // cardinality.
+  virtual bool IsSatisfiedByCallCount(int call_count) const = 0;
+
+  // Returns true if and only if call_count calls will saturate this
+  // cardinality.
+  virtual bool IsSaturatedByCallCount(int call_count) const = 0;
+
+  // Describes self to an ostream.
+  virtual void DescribeTo(::std::ostream* os) const = 0;
+};
+
+// A Cardinality is a copyable and IMMUTABLE (except by assignment)
+// object that specifies how many times a mock function is expected to
+// be called.  The implementation of Cardinality is just a std::shared_ptr
+// to const CardinalityInterface. Don't inherit from Cardinality!
+class GTEST_API_ Cardinality {
+ public:
+  // Constructs a null cardinality.  Needed for storing Cardinality
+  // objects in STL containers.
+  Cardinality() {}
+
+  // Constructs a Cardinality from its implementation.
+  explicit Cardinality(const CardinalityInterface* impl) : impl_(impl) {}
+
+  // Conservative estimate on the lower/upper bound of the number of
+  // calls allowed.
+  int ConservativeLowerBound() const { return impl_->ConservativeLowerBound(); }
+  int ConservativeUpperBound() const { return impl_->ConservativeUpperBound(); }
+
+  // Returns true if and only if call_count calls will satisfy this
+  // cardinality.
+  bool IsSatisfiedByCallCount(int call_count) const {
+    return impl_->IsSatisfiedByCallCount(call_count);
+  }
+
+  // Returns true if and only if call_count calls will saturate this
+  // cardinality.
+  bool IsSaturatedByCallCount(int call_count) const {
+    return impl_->IsSaturatedByCallCount(call_count);
+  }
+
+  // Returns true if and only if call_count calls will over-saturate this
+  // cardinality, i.e. exceed the maximum number of allowed calls.
+  bool IsOverSaturatedByCallCount(int call_count) const {
+    return impl_->IsSaturatedByCallCount(call_count) &&
+        !impl_->IsSatisfiedByCallCount(call_count);
+  }
+
+  // Describes self to an ostream
+  void DescribeTo(::std::ostream* os) const { impl_->DescribeTo(os); }
+
+  // Describes the given actual call count to an ostream.
+  static void DescribeActualCallCountTo(int actual_call_count,
+                                        ::std::ostream* os);
+
+ private:
+  std::shared_ptr<const CardinalityInterface> impl_;
+};
+
+// Creates a cardinality that allows at least n calls.
+GTEST_API_ Cardinality AtLeast(int n);
+
+// Creates a cardinality that allows at most n calls.
+GTEST_API_ Cardinality AtMost(int n);
+
+// Creates a cardinality that allows any number of calls.
+GTEST_API_ Cardinality AnyNumber();
+
+// Creates a cardinality that allows between min and max calls.
+GTEST_API_ Cardinality Between(int min, int max);
+
+// Creates a cardinality that allows exactly n calls.
+GTEST_API_ Cardinality Exactly(int n);
+
+// Creates a cardinality from its implementation.
+inline Cardinality MakeCardinality(const CardinalityInterface* c) {
+  return Cardinality(c);
+}
+
+}  // namespace testing
+
+GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
+
+#endif  // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/gmock-function-mocker.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/gmock-function-mocker.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/gmock-function-mocker.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/gmock-function-mocker.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,479 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file implements MOCK_METHOD.
+
+// GOOGLETEST_CM0002 DO NOT DELETE
+
+#ifndef GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_FUNCTION_MOCKER_H_  // NOLINT
+#define GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_FUNCTION_MOCKER_H_  // NOLINT
+
+#include <type_traits>  // IWYU pragma: keep
+#include <utility>      // IWYU pragma: keep
+
+#include "gmock/gmock-spec-builders.h"
+#include "gmock/internal/gmock-internal-utils.h"
+#include "gmock/internal/gmock-pp.h"
+
+namespace testing {
+namespace internal {
+template <typename T>
+using identity_t = T;
+
+template <typename Pattern>
+struct ThisRefAdjuster {
+  template <typename T>
+  using AdjustT = typename std::conditional<
+      std::is_const<typename std::remove_reference<Pattern>::type>::value,
+      typename std::conditional<std::is_lvalue_reference<Pattern>::value,
+                                const T&, const T&&>::type,
+      typename std::conditional<std::is_lvalue_reference<Pattern>::value, T&,
+                                T&&>::type>::type;
+
+  template <typename MockType>
+  static AdjustT<MockType> Adjust(const MockType& mock) {
+    return static_cast<AdjustT<MockType>>(const_cast<MockType&>(mock));
+  }
+};
+
+}  // namespace internal
+
+// The style guide prohibits "using" statements in a namespace scope
+// inside a header file.  However, the FunctionMocker class template
+// is meant to be defined in the ::testing namespace.  The following
+// line is just a trick for working around a bug in MSVC 8.0, which
+// cannot handle it if we define FunctionMocker in ::testing.
+using internal::FunctionMocker;
+}  // namespace testing
+
+#define MOCK_METHOD(...) \
+  GMOCK_PP_VARIADIC_CALL(GMOCK_INTERNAL_MOCK_METHOD_ARG_, __VA_ARGS__)
+
+#define GMOCK_INTERNAL_MOCK_METHOD_ARG_1(...) \
+  GMOCK_INTERNAL_WRONG_ARITY(__VA_ARGS__)
+
+#define GMOCK_INTERNAL_MOCK_METHOD_ARG_2(...) \
+  GMOCK_INTERNAL_WRONG_ARITY(__VA_ARGS__)
+
+#define GMOCK_INTERNAL_MOCK_METHOD_ARG_3(_Ret, _MethodName, _Args) \
+  GMOCK_INTERNAL_MOCK_METHOD_ARG_4(_Ret, _MethodName, _Args, ())
+
+#define GMOCK_INTERNAL_MOCK_METHOD_ARG_4(_Ret, _MethodName, _Args, _Spec)     \
+  GMOCK_INTERNAL_ASSERT_PARENTHESIS(_Args);                                   \
+  GMOCK_INTERNAL_ASSERT_PARENTHESIS(_Spec);                                   \
+  GMOCK_INTERNAL_ASSERT_VALID_SIGNATURE(                                      \
+      GMOCK_PP_NARG0 _Args, GMOCK_INTERNAL_SIGNATURE(_Ret, _Args));           \
+  GMOCK_INTERNAL_ASSERT_VALID_SPEC(_Spec)                                     \
+  GMOCK_INTERNAL_MOCK_METHOD_IMPL(                                            \
+      GMOCK_PP_NARG0 _Args, _MethodName, GMOCK_INTERNAL_HAS_CONST(_Spec),     \
+      GMOCK_INTERNAL_HAS_OVERRIDE(_Spec), GMOCK_INTERNAL_HAS_FINAL(_Spec),    \
+      GMOCK_INTERNAL_GET_NOEXCEPT_SPEC(_Spec),                                \
+      GMOCK_INTERNAL_GET_CALLTYPE(_Spec), GMOCK_INTERNAL_GET_REF_SPEC(_Spec), \
+      (GMOCK_INTERNAL_SIGNATURE(_Ret, _Args)))
+
+#define GMOCK_INTERNAL_MOCK_METHOD_ARG_5(...) \
+  GMOCK_INTERNAL_WRONG_ARITY(__VA_ARGS__)
+
+#define GMOCK_INTERNAL_MOCK_METHOD_ARG_6(...) \
+  GMOCK_INTERNAL_WRONG_ARITY(__VA_ARGS__)
+
+#define GMOCK_INTERNAL_MOCK_METHOD_ARG_7(...) \
+  GMOCK_INTERNAL_WRONG_ARITY(__VA_ARGS__)
+
+#define GMOCK_INTERNAL_WRONG_ARITY(...)                                      \
+  static_assert(                                                             \
+      false,                                                                 \
+      "MOCK_METHOD must be called with 3 or 4 arguments. _Ret, "             \
+      "_MethodName, _Args and optionally _Spec. _Args and _Spec must be "    \
+      "enclosed in parentheses. If _Ret is a type with unprotected commas, " \
+      "it must also be enclosed in parentheses.")
+
+#define GMOCK_INTERNAL_ASSERT_PARENTHESIS(_Tuple) \
+  static_assert(                                  \
+      GMOCK_PP_IS_ENCLOSED_PARENS(_Tuple),        \
+      GMOCK_PP_STRINGIZE(_Tuple) " should be enclosed in parentheses.")
+
+#define GMOCK_INTERNAL_ASSERT_VALID_SIGNATURE(_N, ...)                 \
+  static_assert(                                                       \
+      std::is_function<__VA_ARGS__>::value,                            \
+      "Signature must be a function type, maybe return type contains " \
+      "unprotected comma.");                                           \
+  static_assert(                                                       \
+      ::testing::tuple_size<typename ::testing::internal::Function<    \
+              __VA_ARGS__>::ArgumentTuple>::value == _N,               \
+      "This method does not take " GMOCK_PP_STRINGIZE(                 \
+          _N) " arguments. Parenthesize all types with unprotected commas.")
+
+#define GMOCK_INTERNAL_ASSERT_VALID_SPEC(_Spec) \
+  GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_ASSERT_VALID_SPEC_ELEMENT, ~, _Spec)
+
+#define GMOCK_INTERNAL_MOCK_METHOD_IMPL(_N, _MethodName, _Constness,           \
+                                        _Override, _Final, _NoexceptSpec,      \
+                                        _CallType, _RefSpec, _Signature)       \
+  typename ::testing::internal::Function<GMOCK_PP_REMOVE_PARENS(               \
+      _Signature)>::Result                                                     \
+  GMOCK_INTERNAL_EXPAND(_CallType)                                             \
+      _MethodName(GMOCK_PP_REPEAT(GMOCK_INTERNAL_PARAMETER, _Signature, _N))   \
+          GMOCK_PP_IF(_Constness, const, ) _RefSpec _NoexceptSpec              \
+          GMOCK_PP_IF(_Override, override, ) GMOCK_PP_IF(_Final, final, ) {    \
+    GMOCK_MOCKER_(_N, _Constness, _MethodName)                                 \
+        .SetOwnerAndName(this, #_MethodName);                                  \
+    return GMOCK_MOCKER_(_N, _Constness, _MethodName)                          \
+        .Invoke(GMOCK_PP_REPEAT(GMOCK_INTERNAL_FORWARD_ARG, _Signature, _N));  \
+  }                                                                            \
+  ::testing::MockSpec<GMOCK_PP_REMOVE_PARENS(_Signature)> gmock_##_MethodName( \
+      GMOCK_PP_REPEAT(GMOCK_INTERNAL_MATCHER_PARAMETER, _Signature, _N))       \
+      GMOCK_PP_IF(_Constness, const, ) _RefSpec {                              \
+    GMOCK_MOCKER_(_N, _Constness, _MethodName).RegisterOwner(this);            \
+    return GMOCK_MOCKER_(_N, _Constness, _MethodName)                          \
+        .With(GMOCK_PP_REPEAT(GMOCK_INTERNAL_MATCHER_ARGUMENT, , _N));         \
+  }                                                                            \
+  ::testing::MockSpec<GMOCK_PP_REMOVE_PARENS(_Signature)> gmock_##_MethodName( \
+      const ::testing::internal::WithoutMatchers&,                             \
+      GMOCK_PP_IF(_Constness, const, )::testing::internal::Function<           \
+          GMOCK_PP_REMOVE_PARENS(_Signature)>*) const _RefSpec _NoexceptSpec { \
+    return ::testing::internal::ThisRefAdjuster<GMOCK_PP_IF(                   \
+        _Constness, const, ) int _RefSpec>::Adjust(*this)                      \
+        .gmock_##_MethodName(GMOCK_PP_REPEAT(                                  \
+            GMOCK_INTERNAL_A_MATCHER_ARGUMENT, _Signature, _N));               \
+  }                                                                            \
+  mutable ::testing::FunctionMocker<GMOCK_PP_REMOVE_PARENS(_Signature)>        \
+      GMOCK_MOCKER_(_N, _Constness, _MethodName)
+
+#define GMOCK_INTERNAL_EXPAND(...) __VA_ARGS__
+
+// Five Valid modifiers.
+#define GMOCK_INTERNAL_HAS_CONST(_Tuple) \
+  GMOCK_PP_HAS_COMMA(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_DETECT_CONST, ~, _Tuple))
+
+#define GMOCK_INTERNAL_HAS_OVERRIDE(_Tuple) \
+  GMOCK_PP_HAS_COMMA(                       \
+      GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_DETECT_OVERRIDE, ~, _Tuple))
+
+#define GMOCK_INTERNAL_HAS_FINAL(_Tuple) \
+  GMOCK_PP_HAS_COMMA(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_DETECT_FINAL, ~, _Tuple))
+
+#define GMOCK_INTERNAL_GET_NOEXCEPT_SPEC(_Tuple) \
+  GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_NOEXCEPT_SPEC_IF_NOEXCEPT, ~, _Tuple)
+
+#define GMOCK_INTERNAL_NOEXCEPT_SPEC_IF_NOEXCEPT(_i, _, _elem)          \
+  GMOCK_PP_IF(                                                          \
+      GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_NOEXCEPT(_i, _, _elem)), \
+      _elem, )
+
+#define GMOCK_INTERNAL_GET_REF_SPEC(_Tuple) \
+  GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_REF_SPEC_IF_REF, ~, _Tuple)
+
+#define GMOCK_INTERNAL_REF_SPEC_IF_REF(_i, _, _elem)                       \
+  GMOCK_PP_IF(GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_REF(_i, _, _elem)), \
+              GMOCK_PP_CAT(GMOCK_INTERNAL_UNPACK_, _elem), )
+
+#define GMOCK_INTERNAL_GET_CALLTYPE(_Tuple) \
+  GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_GET_CALLTYPE_IMPL, ~, _Tuple)
+
+#define GMOCK_INTERNAL_ASSERT_VALID_SPEC_ELEMENT(_i, _, _elem)            \
+  static_assert(                                                          \
+      (GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_CONST(_i, _, _elem)) +    \
+       GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_OVERRIDE(_i, _, _elem)) + \
+       GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_FINAL(_i, _, _elem)) +    \
+       GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_NOEXCEPT(_i, _, _elem)) + \
+       GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_REF(_i, _, _elem)) +      \
+       GMOCK_INTERNAL_IS_CALLTYPE(_elem)) == 1,                           \
+      GMOCK_PP_STRINGIZE(                                                 \
+          _elem) " cannot be recognized as a valid specification modifier.");
+
+// Modifiers implementation.
+#define GMOCK_INTERNAL_DETECT_CONST(_i, _, _elem) \
+  GMOCK_PP_CAT(GMOCK_INTERNAL_DETECT_CONST_I_, _elem)
+
+#define GMOCK_INTERNAL_DETECT_CONST_I_const ,
+
+#define GMOCK_INTERNAL_DETECT_OVERRIDE(_i, _, _elem) \
+  GMOCK_PP_CAT(GMOCK_INTERNAL_DETECT_OVERRIDE_I_, _elem)
+
+#define GMOCK_INTERNAL_DETECT_OVERRIDE_I_override ,
+
+#define GMOCK_INTERNAL_DETECT_FINAL(_i, _, _elem) \
+  GMOCK_PP_CAT(GMOCK_INTERNAL_DETECT_FINAL_I_, _elem)
+
+#define GMOCK_INTERNAL_DETECT_FINAL_I_final ,
+
+#define GMOCK_INTERNAL_DETECT_NOEXCEPT(_i, _, _elem) \
+  GMOCK_PP_CAT(GMOCK_INTERNAL_DETECT_NOEXCEPT_I_, _elem)
+
+#define GMOCK_INTERNAL_DETECT_NOEXCEPT_I_noexcept ,
+
+#define GMOCK_INTERNAL_DETECT_REF(_i, _, _elem) \
+  GMOCK_PP_CAT(GMOCK_INTERNAL_DETECT_REF_I_, _elem)
+
+#define GMOCK_INTERNAL_DETECT_REF_I_ref ,
+
+#define GMOCK_INTERNAL_UNPACK_ref(x) x
+
+#define GMOCK_INTERNAL_GET_CALLTYPE_IMPL(_i, _, _elem)           \
+  GMOCK_PP_IF(GMOCK_INTERNAL_IS_CALLTYPE(_elem),                 \
+              GMOCK_INTERNAL_GET_VALUE_CALLTYPE, GMOCK_PP_EMPTY) \
+  (_elem)
+
+// TODO(iserna): GMOCK_INTERNAL_IS_CALLTYPE and
+// GMOCK_INTERNAL_GET_VALUE_CALLTYPE needed more expansions to work on windows
+// maybe they can be simplified somehow.
+#define GMOCK_INTERNAL_IS_CALLTYPE(_arg) \
+  GMOCK_INTERNAL_IS_CALLTYPE_I(          \
+      GMOCK_PP_CAT(GMOCK_INTERNAL_IS_CALLTYPE_HELPER_, _arg))
+#define GMOCK_INTERNAL_IS_CALLTYPE_I(_arg) GMOCK_PP_IS_ENCLOSED_PARENS(_arg)
+
+#define GMOCK_INTERNAL_GET_VALUE_CALLTYPE(_arg) \
+  GMOCK_INTERNAL_GET_VALUE_CALLTYPE_I(          \
+      GMOCK_PP_CAT(GMOCK_INTERNAL_IS_CALLTYPE_HELPER_, _arg))
+#define GMOCK_INTERNAL_GET_VALUE_CALLTYPE_I(_arg) \
+  GMOCK_PP_IDENTITY _arg
+
+#define GMOCK_INTERNAL_IS_CALLTYPE_HELPER_Calltype
+
+// Note: The use of `identity_t` here allows _Ret to represent return types that
+// would normally need to be specified in a different way. For example, a method
+// returning a function pointer must be written as
+//
+// fn_ptr_return_t (*method(method_args_t...))(fn_ptr_args_t...)
+//
+// But we only support placing the return type at the beginning. To handle this,
+// we wrap all calls in identity_t, so that a declaration will be expanded to
+//
+// identity_t<fn_ptr_return_t (*)(fn_ptr_args_t...)> method(method_args_t...)
+//
+// This allows us to work around the syntactic oddities of function/method
+// types.
+#define GMOCK_INTERNAL_SIGNATURE(_Ret, _Args)                                 \
+  ::testing::internal::identity_t<GMOCK_PP_IF(GMOCK_PP_IS_BEGIN_PARENS(_Ret), \
+                                              GMOCK_PP_REMOVE_PARENS,         \
+                                              GMOCK_PP_IDENTITY)(_Ret)>(      \
+      GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_GET_TYPE, _, _Args))
+
+#define GMOCK_INTERNAL_GET_TYPE(_i, _, _elem)                          \
+  GMOCK_PP_COMMA_IF(_i)                                                \
+  GMOCK_PP_IF(GMOCK_PP_IS_BEGIN_PARENS(_elem), GMOCK_PP_REMOVE_PARENS, \
+              GMOCK_PP_IDENTITY)                                       \
+  (_elem)
+
+#define GMOCK_INTERNAL_PARAMETER(_i, _Signature, _)            \
+  GMOCK_PP_COMMA_IF(_i)                                        \
+  GMOCK_INTERNAL_ARG_O(_i, GMOCK_PP_REMOVE_PARENS(_Signature)) \
+  gmock_a##_i
+
+#define GMOCK_INTERNAL_FORWARD_ARG(_i, _Signature, _) \
+  GMOCK_PP_COMMA_IF(_i)                               \
+  ::std::forward<GMOCK_INTERNAL_ARG_O(                \
+      _i, GMOCK_PP_REMOVE_PARENS(_Signature))>(gmock_a##_i)
+
+#define GMOCK_INTERNAL_MATCHER_PARAMETER(_i, _Signature, _)        \
+  GMOCK_PP_COMMA_IF(_i)                                            \
+  GMOCK_INTERNAL_MATCHER_O(_i, GMOCK_PP_REMOVE_PARENS(_Signature)) \
+  gmock_a##_i
+
+#define GMOCK_INTERNAL_MATCHER_ARGUMENT(_i, _1, _2) \
+  GMOCK_PP_COMMA_IF(_i)                             \
+  gmock_a##_i
+
+#define GMOCK_INTERNAL_A_MATCHER_ARGUMENT(_i, _Signature, _) \
+  GMOCK_PP_COMMA_IF(_i)                                      \
+  ::testing::A<GMOCK_INTERNAL_ARG_O(_i, GMOCK_PP_REMOVE_PARENS(_Signature))>()
+
+#define GMOCK_INTERNAL_ARG_O(_i, ...) \
+  typename ::testing::internal::Function<__VA_ARGS__>::template Arg<_i>::type
+
+#define GMOCK_INTERNAL_MATCHER_O(_i, ...)                          \
+  const ::testing::Matcher<typename ::testing::internal::Function< \
+      __VA_ARGS__>::template Arg<_i>::type>&
+
+#define MOCK_METHOD0(m, ...) GMOCK_INTERNAL_MOCK_METHODN(, , m, 0, __VA_ARGS__)
+#define MOCK_METHOD1(m, ...) GMOCK_INTERNAL_MOCK_METHODN(, , m, 1, __VA_ARGS__)
+#define MOCK_METHOD2(m, ...) GMOCK_INTERNAL_MOCK_METHODN(, , m, 2, __VA_ARGS__)
+#define MOCK_METHOD3(m, ...) GMOCK_INTERNAL_MOCK_METHODN(, , m, 3, __VA_ARGS__)
+#define MOCK_METHOD4(m, ...) GMOCK_INTERNAL_MOCK_METHODN(, , m, 4, __VA_ARGS__)
+#define MOCK_METHOD5(m, ...) GMOCK_INTERNAL_MOCK_METHODN(, , m, 5, __VA_ARGS__)
+#define MOCK_METHOD6(m, ...) GMOCK_INTERNAL_MOCK_METHODN(, , m, 6, __VA_ARGS__)
+#define MOCK_METHOD7(m, ...) GMOCK_INTERNAL_MOCK_METHODN(, , m, 7, __VA_ARGS__)
+#define MOCK_METHOD8(m, ...) GMOCK_INTERNAL_MOCK_METHODN(, , m, 8, __VA_ARGS__)
+#define MOCK_METHOD9(m, ...) GMOCK_INTERNAL_MOCK_METHODN(, , m, 9, __VA_ARGS__)
+#define MOCK_METHOD10(m, ...) \
+  GMOCK_INTERNAL_MOCK_METHODN(, , m, 10, __VA_ARGS__)
+
+#define MOCK_CONST_METHOD0(m, ...) \
+  GMOCK_INTERNAL_MOCK_METHODN(const, , m, 0, __VA_ARGS__)
+#define MOCK_CONST_METHOD1(m, ...) \
+  GMOCK_INTERNAL_MOCK_METHODN(const, , m, 1, __VA_ARGS__)
+#define MOCK_CONST_METHOD2(m, ...) \
+  GMOCK_INTERNAL_MOCK_METHODN(const, , m, 2, __VA_ARGS__)
+#define MOCK_CONST_METHOD3(m, ...) \
+  GMOCK_INTERNAL_MOCK_METHODN(const, , m, 3, __VA_ARGS__)
+#define MOCK_CONST_METHOD4(m, ...) \
+  GMOCK_INTERNAL_MOCK_METHODN(const, , m, 4, __VA_ARGS__)
+#define MOCK_CONST_METHOD5(m, ...) \
+  GMOCK_INTERNAL_MOCK_METHODN(const, , m, 5, __VA_ARGS__)
+#define MOCK_CONST_METHOD6(m, ...) \
+  GMOCK_INTERNAL_MOCK_METHODN(const, , m, 6, __VA_ARGS__)
+#define MOCK_CONST_METHOD7(m, ...) \
+  GMOCK_INTERNAL_MOCK_METHODN(const, , m, 7, __VA_ARGS__)
+#define MOCK_CONST_METHOD8(m, ...) \
+  GMOCK_INTERNAL_MOCK_METHODN(const, , m, 8, __VA_ARGS__)
+#define MOCK_CONST_METHOD9(m, ...) \
+  GMOCK_INTERNAL_MOCK_METHODN(const, , m, 9, __VA_ARGS__)
+#define MOCK_CONST_METHOD10(m, ...) \
+  GMOCK_INTERNAL_MOCK_METHODN(const, , m, 10, __VA_ARGS__)
+
+#define MOCK_METHOD0_T(m, ...) MOCK_METHOD0(m, __VA_ARGS__)
+#define MOCK_METHOD1_T(m, ...) MOCK_METHOD1(m, __VA_ARGS__)
+#define MOCK_METHOD2_T(m, ...) MOCK_METHOD2(m, __VA_ARGS__)
+#define MOCK_METHOD3_T(m, ...) MOCK_METHOD3(m, __VA_ARGS__)
+#define MOCK_METHOD4_T(m, ...) MOCK_METHOD4(m, __VA_ARGS__)
+#define MOCK_METHOD5_T(m, ...) MOCK_METHOD5(m, __VA_ARGS__)
+#define MOCK_METHOD6_T(m, ...) MOCK_METHOD6(m, __VA_ARGS__)
+#define MOCK_METHOD7_T(m, ...) MOCK_METHOD7(m, __VA_ARGS__)
+#define MOCK_METHOD8_T(m, ...) MOCK_METHOD8(m, __VA_ARGS__)
+#define MOCK_METHOD9_T(m, ...) MOCK_METHOD9(m, __VA_ARGS__)
+#define MOCK_METHOD10_T(m, ...) MOCK_METHOD10(m, __VA_ARGS__)
+
+#define MOCK_CONST_METHOD0_T(m, ...) MOCK_CONST_METHOD0(m, __VA_ARGS__)
+#define MOCK_CONST_METHOD1_T(m, ...) MOCK_CONST_METHOD1(m, __VA_ARGS__)
+#define MOCK_CONST_METHOD2_T(m, ...) MOCK_CONST_METHOD2(m, __VA_ARGS__)
+#define MOCK_CONST_METHOD3_T(m, ...) MOCK_CONST_METHOD3(m, __VA_ARGS__)
+#define MOCK_CONST_METHOD4_T(m, ...) MOCK_CONST_METHOD4(m, __VA_ARGS__)
+#define MOCK_CONST_METHOD5_T(m, ...) MOCK_CONST_METHOD5(m, __VA_ARGS__)
+#define MOCK_CONST_METHOD6_T(m, ...) MOCK_CONST_METHOD6(m, __VA_ARGS__)
+#define MOCK_CONST_METHOD7_T(m, ...) MOCK_CONST_METHOD7(m, __VA_ARGS__)
+#define MOCK_CONST_METHOD8_T(m, ...) MOCK_CONST_METHOD8(m, __VA_ARGS__)
+#define MOCK_CONST_METHOD9_T(m, ...) MOCK_CONST_METHOD9(m, __VA_ARGS__)
+#define MOCK_CONST_METHOD10_T(m, ...) MOCK_CONST_METHOD10(m, __VA_ARGS__)
+
+#define MOCK_METHOD0_WITH_CALLTYPE(ct, m, ...) \
+  GMOCK_INTERNAL_MOCK_METHODN(, ct, m, 0, __VA_ARGS__)
+#define MOCK_METHOD1_WITH_CALLTYPE(ct, m, ...) \
+  GMOCK_INTERNAL_MOCK_METHODN(, ct, m, 1, __VA_ARGS__)
+#define MOCK_METHOD2_WITH_CALLTYPE(ct, m, ...) \
+  GMOCK_INTERNAL_MOCK_METHODN(, ct, m, 2, __VA_ARGS__)
+#define MOCK_METHOD3_WITH_CALLTYPE(ct, m, ...) \
+  GMOCK_INTERNAL_MOCK_METHODN(, ct, m, 3, __VA_ARGS__)
+#define MOCK_METHOD4_WITH_CALLTYPE(ct, m, ...) \
+  GMOCK_INTERNAL_MOCK_METHODN(, ct, m, 4, __VA_ARGS__)
+#define MOCK_METHOD5_WITH_CALLTYPE(ct, m, ...) \
+  GMOCK_INTERNAL_MOCK_METHODN(, ct, m, 5, __VA_ARGS__)
+#define MOCK_METHOD6_WITH_CALLTYPE(ct, m, ...) \
+  GMOCK_INTERNAL_MOCK_METHODN(, ct, m, 6, __VA_ARGS__)
+#define MOCK_METHOD7_WITH_CALLTYPE(ct, m, ...) \
+  GMOCK_INTERNAL_MOCK_METHODN(, ct, m, 7, __VA_ARGS__)
+#define MOCK_METHOD8_WITH_CALLTYPE(ct, m, ...) \
+  GMOCK_INTERNAL_MOCK_METHODN(, ct, m, 8, __VA_ARGS__)
+#define MOCK_METHOD9_WITH_CALLTYPE(ct, m, ...) \
+  GMOCK_INTERNAL_MOCK_METHODN(, ct, m, 9, __VA_ARGS__)
+#define MOCK_METHOD10_WITH_CALLTYPE(ct, m, ...) \
+  GMOCK_INTERNAL_MOCK_METHODN(, ct, m, 10, __VA_ARGS__)
+
+#define MOCK_CONST_METHOD0_WITH_CALLTYPE(ct, m, ...) \
+  GMOCK_INTERNAL_MOCK_METHODN(const, ct, m, 0, __VA_ARGS__)
+#define MOCK_CONST_METHOD1_WITH_CALLTYPE(ct, m, ...) \
+  GMOCK_INTERNAL_MOCK_METHODN(const, ct, m, 1, __VA_ARGS__)
+#define MOCK_CONST_METHOD2_WITH_CALLTYPE(ct, m, ...) \
+  GMOCK_INTERNAL_MOCK_METHODN(const, ct, m, 2, __VA_ARGS__)
+#define MOCK_CONST_METHOD3_WITH_CALLTYPE(ct, m, ...) \
+  GMOCK_INTERNAL_MOCK_METHODN(const, ct, m, 3, __VA_ARGS__)
+#define MOCK_CONST_METHOD4_WITH_CALLTYPE(ct, m, ...) \
+  GMOCK_INTERNAL_MOCK_METHODN(const, ct, m, 4, __VA_ARGS__)
+#define MOCK_CONST_METHOD5_WITH_CALLTYPE(ct, m, ...) \
+  GMOCK_INTERNAL_MOCK_METHODN(const, ct, m, 5, __VA_ARGS__)
+#define MOCK_CONST_METHOD6_WITH_CALLTYPE(ct, m, ...) \
+  GMOCK_INTERNAL_MOCK_METHODN(const, ct, m, 6, __VA_ARGS__)
+#define MOCK_CONST_METHOD7_WITH_CALLTYPE(ct, m, ...) \
+  GMOCK_INTERNAL_MOCK_METHODN(const, ct, m, 7, __VA_ARGS__)
+#define MOCK_CONST_METHOD8_WITH_CALLTYPE(ct, m, ...) \
+  GMOCK_INTERNAL_MOCK_METHODN(const, ct, m, 8, __VA_ARGS__)
+#define MOCK_CONST_METHOD9_WITH_CALLTYPE(ct, m, ...) \
+  GMOCK_INTERNAL_MOCK_METHODN(const, ct, m, 9, __VA_ARGS__)
+#define MOCK_CONST_METHOD10_WITH_CALLTYPE(ct, m, ...) \
+  GMOCK_INTERNAL_MOCK_METHODN(const, ct, m, 10, __VA_ARGS__)
+
+#define MOCK_METHOD0_T_WITH_CALLTYPE(ct, m, ...) \
+  MOCK_METHOD0_WITH_CALLTYPE(ct, m, __VA_ARGS__)
+#define MOCK_METHOD1_T_WITH_CALLTYPE(ct, m, ...) \
+  MOCK_METHOD1_WITH_CALLTYPE(ct, m, __VA_ARGS__)
+#define MOCK_METHOD2_T_WITH_CALLTYPE(ct, m, ...) \
+  MOCK_METHOD2_WITH_CALLTYPE(ct, m, __VA_ARGS__)
+#define MOCK_METHOD3_T_WITH_CALLTYPE(ct, m, ...) \
+  MOCK_METHOD3_WITH_CALLTYPE(ct, m, __VA_ARGS__)
+#define MOCK_METHOD4_T_WITH_CALLTYPE(ct, m, ...) \
+  MOCK_METHOD4_WITH_CALLTYPE(ct, m, __VA_ARGS__)
+#define MOCK_METHOD5_T_WITH_CALLTYPE(ct, m, ...) \
+  MOCK_METHOD5_WITH_CALLTYPE(ct, m, __VA_ARGS__)
+#define MOCK_METHOD6_T_WITH_CALLTYPE(ct, m, ...) \
+  MOCK_METHOD6_WITH_CALLTYPE(ct, m, __VA_ARGS__)
+#define MOCK_METHOD7_T_WITH_CALLTYPE(ct, m, ...) \
+  MOCK_METHOD7_WITH_CALLTYPE(ct, m, __VA_ARGS__)
+#define MOCK_METHOD8_T_WITH_CALLTYPE(ct, m, ...) \
+  MOCK_METHOD8_WITH_CALLTYPE(ct, m, __VA_ARGS__)
+#define MOCK_METHOD9_T_WITH_CALLTYPE(ct, m, ...) \
+  MOCK_METHOD9_WITH_CALLTYPE(ct, m, __VA_ARGS__)
+#define MOCK_METHOD10_T_WITH_CALLTYPE(ct, m, ...) \
+  MOCK_METHOD10_WITH_CALLTYPE(ct, m, __VA_ARGS__)
+
+#define MOCK_CONST_METHOD0_T_WITH_CALLTYPE(ct, m, ...) \
+  MOCK_CONST_METHOD0_WITH_CALLTYPE(ct, m, __VA_ARGS__)
+#define MOCK_CONST_METHOD1_T_WITH_CALLTYPE(ct, m, ...) \
+  MOCK_CONST_METHOD1_WITH_CALLTYPE(ct, m, __VA_ARGS__)
+#define MOCK_CONST_METHOD2_T_WITH_CALLTYPE(ct, m, ...) \
+  MOCK_CONST_METHOD2_WITH_CALLTYPE(ct, m, __VA_ARGS__)
+#define MOCK_CONST_METHOD3_T_WITH_CALLTYPE(ct, m, ...) \
+  MOCK_CONST_METHOD3_WITH_CALLTYPE(ct, m, __VA_ARGS__)
+#define MOCK_CONST_METHOD4_T_WITH_CALLTYPE(ct, m, ...) \
+  MOCK_CONST_METHOD4_WITH_CALLTYPE(ct, m, __VA_ARGS__)
+#define MOCK_CONST_METHOD5_T_WITH_CALLTYPE(ct, m, ...) \
+  MOCK_CONST_METHOD5_WITH_CALLTYPE(ct, m, __VA_ARGS__)
+#define MOCK_CONST_METHOD6_T_WITH_CALLTYPE(ct, m, ...) \
+  MOCK_CONST_METHOD6_WITH_CALLTYPE(ct, m, __VA_ARGS__)
+#define MOCK_CONST_METHOD7_T_WITH_CALLTYPE(ct, m, ...) \
+  MOCK_CONST_METHOD7_WITH_CALLTYPE(ct, m, __VA_ARGS__)
+#define MOCK_CONST_METHOD8_T_WITH_CALLTYPE(ct, m, ...) \
+  MOCK_CONST_METHOD8_WITH_CALLTYPE(ct, m, __VA_ARGS__)
+#define MOCK_CONST_METHOD9_T_WITH_CALLTYPE(ct, m, ...) \
+  MOCK_CONST_METHOD9_WITH_CALLTYPE(ct, m, __VA_ARGS__)
+#define MOCK_CONST_METHOD10_T_WITH_CALLTYPE(ct, m, ...) \
+  MOCK_CONST_METHOD10_WITH_CALLTYPE(ct, m, __VA_ARGS__)
+
+#define GMOCK_INTERNAL_MOCK_METHODN(constness, ct, Method, args_num, ...) \
+  GMOCK_INTERNAL_ASSERT_VALID_SIGNATURE(                                  \
+      args_num, ::testing::internal::identity_t<__VA_ARGS__>);            \
+  GMOCK_INTERNAL_MOCK_METHOD_IMPL(                                        \
+      args_num, Method, GMOCK_PP_NARG0(constness), 0, 0, , ct, ,          \
+      (::testing::internal::identity_t<__VA_ARGS__>))
+
+#define GMOCK_MOCKER_(arity, constness, Method) \
+  GTEST_CONCAT_TOKEN_(gmock##constness##arity##_##Method##_, __LINE__)
+
+#endif  // GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_FUNCTION_MOCKER_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/gmock.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/gmock.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/gmock.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/gmock.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,98 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This is the main header file a user should include.
+
+// GOOGLETEST_CM0002 DO NOT DELETE
+
+#ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_H_
+#define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_H_
+
+// This file implements the following syntax:
+//
+//   ON_CALL(mock_object, Method(...))
+//     .With(...) ?
+//     .WillByDefault(...);
+//
+// where With() is optional and WillByDefault() must appear exactly
+// once.
+//
+//   EXPECT_CALL(mock_object, Method(...))
+//     .With(...) ?
+//     .Times(...) ?
+//     .InSequence(...) *
+//     .WillOnce(...) *
+//     .WillRepeatedly(...) ?
+//     .RetiresOnSaturation() ? ;
+//
+// where all clauses are optional and WillOnce() can be repeated.
+
+#include "gmock/gmock-actions.h"
+#include "gmock/gmock-cardinalities.h"
+#include "gmock/gmock-function-mocker.h"
+#include "gmock/gmock-matchers.h"
+#include "gmock/gmock-more-actions.h"
+#include "gmock/gmock-more-matchers.h"
+#include "gmock/gmock-nice-strict.h"
+#include "gmock/internal/gmock-internal-utils.h"
+
+namespace testing {
+
+// Declares Google Mock flags that we want a user to use programmatically.
+GMOCK_DECLARE_bool_(catch_leaked_mocks);
+GMOCK_DECLARE_string_(verbose);
+GMOCK_DECLARE_int32_(default_mock_behavior);
+
+// Initializes Google Mock.  This must be called before running the
+// tests.  In particular, it parses the command line for the flags
+// that Google Mock recognizes.  Whenever a Google Mock flag is seen,
+// it is removed from argv, and *argc is decremented.
+//
+// No value is returned.  Instead, the Google Mock flag variables are
+// updated.
+//
+// Since Google Test is needed for Google Mock to work, this function
+// also initializes Google Test and parses its flags, if that hasn't
+// been done.
+GTEST_API_ void InitGoogleMock(int* argc, char** argv);
+
+// This overloaded version can be used in Windows programs compiled in
+// UNICODE mode.
+GTEST_API_ void InitGoogleMock(int* argc, wchar_t** argv);
+
+// This overloaded version can be used on Arduino/embedded platforms where
+// there is no argc/argv.
+GTEST_API_ void InitGoogleMock();
+
+}  // namespace testing
+
+#endif  // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/gmock-matchers.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/gmock-matchers.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/gmock-matchers.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/gmock-matchers.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,5392 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// The MATCHER* family of macros can be used in a namespace scope to
+// define custom matchers easily.
+//
+// Basic Usage
+// ===========
+//
+// The syntax
+//
+//   MATCHER(name, description_string) { statements; }
+//
+// defines a matcher with the given name that executes the statements,
+// which must return a bool to indicate if the match succeeds.  Inside
+// the statements, you can refer to the value being matched by 'arg',
+// and refer to its type by 'arg_type'.
+//
+// The description string documents what the matcher does, and is used
+// to generate the failure message when the match fails.  Since a
+// MATCHER() is usually defined in a header file shared by multiple
+// C++ source files, we require the description to be a C-string
+// literal to avoid possible side effects.  It can be empty, in which
+// case we'll use the sequence of words in the matcher name as the
+// description.
+//
+// For example:
+//
+//   MATCHER(IsEven, "") { return (arg % 2) == 0; }
+//
+// allows you to write
+//
+//   // Expects mock_foo.Bar(n) to be called where n is even.
+//   EXPECT_CALL(mock_foo, Bar(IsEven()));
+//
+// or,
+//
+//   // Verifies that the value of some_expression is even.
+//   EXPECT_THAT(some_expression, IsEven());
+//
+// If the above assertion fails, it will print something like:
+//
+//   Value of: some_expression
+//   Expected: is even
+//     Actual: 7
+//
+// where the description "is even" is automatically calculated from the
+// matcher name IsEven.
+//
+// Argument Type
+// =============
+//
+// Note that the type of the value being matched (arg_type) is
+// determined by the context in which you use the matcher and is
+// supplied to you by the compiler, so you don't need to worry about
+// declaring it (nor can you).  This allows the matcher to be
+// polymorphic.  For example, IsEven() can be used to match any type
+// where the value of "(arg % 2) == 0" can be implicitly converted to
+// a bool.  In the "Bar(IsEven())" example above, if method Bar()
+// takes an int, 'arg_type' will be int; if it takes an unsigned long,
+// 'arg_type' will be unsigned long; and so on.
+//
+// Parameterizing Matchers
+// =======================
+//
+// Sometimes you'll want to parameterize the matcher.  For that you
+// can use another macro:
+//
+//   MATCHER_P(name, param_name, description_string) { statements; }
+//
+// For example:
+//
+//   MATCHER_P(HasAbsoluteValue, value, "") { return abs(arg) == value; }
+//
+// will allow you to write:
+//
+//   EXPECT_THAT(Blah("a"), HasAbsoluteValue(n));
+//
+// which may lead to this message (assuming n is 10):
+//
+//   Value of: Blah("a")
+//   Expected: has absolute value 10
+//     Actual: -9
+//
+// Note that both the matcher description and its parameter are
+// printed, making the message human-friendly.
+//
+// In the matcher definition body, you can write 'foo_type' to
+// reference the type of a parameter named 'foo'.  For example, in the
+// body of MATCHER_P(HasAbsoluteValue, value) above, you can write
+// 'value_type' to refer to the type of 'value'.
+//
+// We also provide MATCHER_P2, MATCHER_P3, ..., up to MATCHER_P$n to
+// support multi-parameter matchers.
+//
+// Describing Parameterized Matchers
+// =================================
+//
+// The last argument to MATCHER*() is a string-typed expression.  The
+// expression can reference all of the matcher's parameters and a
+// special bool-typed variable named 'negation'.  When 'negation' is
+// false, the expression should evaluate to the matcher's description;
+// otherwise it should evaluate to the description of the negation of
+// the matcher.  For example,
+//
+//   using testing::PrintToString;
+//
+//   MATCHER_P2(InClosedRange, low, hi,
+//       std::string(negation ? "is not" : "is") + " in range [" +
+//       PrintToString(low) + ", " + PrintToString(hi) + "]") {
+//     return low <= arg && arg <= hi;
+//   }
+//   ...
+//   EXPECT_THAT(3, InClosedRange(4, 6));
+//   EXPECT_THAT(3, Not(InClosedRange(2, 4)));
+//
+// would generate two failures that contain the text:
+//
+//   Expected: is in range [4, 6]
+//   ...
+//   Expected: is not in range [2, 4]
+//
+// If you specify "" as the description, the failure message will
+// contain the sequence of words in the matcher name followed by the
+// parameter values printed as a tuple.  For example,
+//
+//   MATCHER_P2(InClosedRange, low, hi, "") { ... }
+//   ...
+//   EXPECT_THAT(3, InClosedRange(4, 6));
+//   EXPECT_THAT(3, Not(InClosedRange(2, 4)));
+//
+// would generate two failures that contain the text:
+//
+//   Expected: in closed range (4, 6)
+//   ...
+//   Expected: not (in closed range (2, 4))
+//
+// Types of Matcher Parameters
+// ===========================
+//
+// For the purpose of typing, you can view
+//
+//   MATCHER_Pk(Foo, p1, ..., pk, description_string) { ... }
+//
+// as shorthand for
+//
+//   template <typename p1_type, ..., typename pk_type>
+//   FooMatcherPk<p1_type, ..., pk_type>
+//   Foo(p1_type p1, ..., pk_type pk) { ... }
+//
+// When you write Foo(v1, ..., vk), the compiler infers the types of
+// the parameters v1, ..., and vk for you.  If you are not happy with
+// the result of the type inference, you can specify the types by
+// explicitly instantiating the template, as in Foo<long, bool>(5,
+// false).  As said earlier, you don't get to (or need to) specify
+// 'arg_type' as that's determined by the context in which the matcher
+// is used.  You can assign the result of expression Foo(p1, ..., pk)
+// to a variable of type FooMatcherPk<p1_type, ..., pk_type>.  This
+// can be useful when composing matchers.
+//
+// While you can instantiate a matcher template with reference types,
+// passing the parameters by pointer usually makes your code more
+// readable.  If, however, you still want to pass a parameter by
+// reference, be aware that in the failure message generated by the
+// matcher you will see the value of the referenced object but not its
+// address.
+//
+// Explaining Match Results
+// ========================
+//
+// Sometimes the matcher description alone isn't enough to explain why
+// the match has failed or succeeded.  For example, when expecting a
+// long string, it can be very helpful to also print the diff between
+// the expected string and the actual one.  To achieve that, you can
+// optionally stream additional information to a special variable
+// named result_listener, whose type is a pointer to class
+// MatchResultListener:
+//
+//   MATCHER_P(EqualsLongString, str, "") {
+//     if (arg == str) return true;
+//
+//     *result_listener << "the difference: "
+///                     << DiffStrings(str, arg);
+//     return false;
+//   }
+//
+// Overloading Matchers
+// ====================
+//
+// You can overload matchers with different numbers of parameters:
+//
+//   MATCHER_P(Blah, a, description_string1) { ... }
+//   MATCHER_P2(Blah, a, b, description_string2) { ... }
+//
+// Caveats
+// =======
+//
+// When defining a new matcher, you should also consider implementing
+// MatcherInterface or using MakePolymorphicMatcher().  These
+// approaches require more work than the MATCHER* macros, but also
+// give you more control on the types of the value being matched and
+// the matcher parameters, which may leads to better compiler error
+// messages when the matcher is used wrong.  They also allow
+// overloading matchers based on parameter types (as opposed to just
+// based on the number of parameters).
+//
+// MATCHER*() can only be used in a namespace scope as templates cannot be
+// declared inside of a local class.
+//
+// More Information
+// ================
+//
+// To learn more about using these macros, please search for 'MATCHER'
+// on
+// https://github.com/google/googletest/blob/master/docs/gmock_cook_book.md
+//
+// This file also implements some commonly used argument matchers.  More
+// matchers can be defined by the user implementing the
+// MatcherInterface<T> interface if necessary.
+//
+// See googletest/include/gtest/gtest-matchers.h for the definition of class
+// Matcher, class MatcherInterface, and others.
+
+// GOOGLETEST_CM0002 DO NOT DELETE
+
+#ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MATCHERS_H_
+#define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MATCHERS_H_
+
+#include <algorithm>
+#include <cmath>
+#include <initializer_list>
+#include <iterator>
+#include <limits>
+#include <memory>
+#include <ostream>  // NOLINT
+#include <sstream>
+#include <string>
+#include <type_traits>
+#include <utility>
+#include <vector>
+
+#include "gmock/internal/gmock-internal-utils.h"
+#include "gmock/internal/gmock-port.h"
+#include "gmock/internal/gmock-pp.h"
+#include "gtest/gtest.h"
+
+// MSVC warning C5046 is new as of VS2017 version 15.8.
+#if defined(_MSC_VER) && _MSC_VER >= 1915
+#define GMOCK_MAYBE_5046_ 5046
+#else
+#define GMOCK_MAYBE_5046_
+#endif
+
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(
+    4251 GMOCK_MAYBE_5046_ /* class A needs to have dll-interface to be used by
+                              clients of class B */
+    /* Symbol involving type with internal linkage not defined */)
+
+namespace testing {
+
+// To implement a matcher Foo for type T, define:
+//   1. a class FooMatcherImpl that implements the
+//      MatcherInterface<T> interface, and
+//   2. a factory function that creates a Matcher<T> object from a
+//      FooMatcherImpl*.
+//
+// The two-level delegation design makes it possible to allow a user
+// to write "v" instead of "Eq(v)" where a Matcher is expected, which
+// is impossible if we pass matchers by pointers.  It also eases
+// ownership management as Matcher objects can now be copied like
+// plain values.
+
+// A match result listener that stores the explanation in a string.
+class StringMatchResultListener : public MatchResultListener {
+ public:
+  StringMatchResultListener() : MatchResultListener(&ss_) {}
+
+  // Returns the explanation accumulated so far.
+  std::string str() const { return ss_.str(); }
+
+  // Clears the explanation accumulated so far.
+  void Clear() { ss_.str(""); }
+
+ private:
+  ::std::stringstream ss_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(StringMatchResultListener);
+};
+
+// Anything inside the 'internal' namespace IS INTERNAL IMPLEMENTATION
+// and MUST NOT BE USED IN USER CODE!!!
+namespace internal {
+
+// The MatcherCastImpl class template is a helper for implementing
+// MatcherCast().  We need this helper in order to partially
+// specialize the implementation of MatcherCast() (C++ allows
+// class/struct templates to be partially specialized, but not
+// function templates.).
+
+// This general version is used when MatcherCast()'s argument is a
+// polymorphic matcher (i.e. something that can be converted to a
+// Matcher but is not one yet; for example, Eq(value)) or a value (for
+// example, "hello").
+template <typename T, typename M>
+class MatcherCastImpl {
+ public:
+  static Matcher<T> Cast(const M& polymorphic_matcher_or_value) {
+    // M can be a polymorphic matcher, in which case we want to use
+    // its conversion operator to create Matcher<T>.  Or it can be a value
+    // that should be passed to the Matcher<T>'s constructor.
+    //
+    // We can't call Matcher<T>(polymorphic_matcher_or_value) when M is a
+    // polymorphic matcher because it'll be ambiguous if T has an implicit
+    // constructor from M (this usually happens when T has an implicit
+    // constructor from any type).
+    //
+    // It won't work to unconditionally implicit_cast
+    // polymorphic_matcher_or_value to Matcher<T> because it won't trigger
+    // a user-defined conversion from M to T if one exists (assuming M is
+    // a value).
+    return CastImpl(polymorphic_matcher_or_value,
+                    std::is_convertible<M, Matcher<T>>{},
+                    std::is_convertible<M, T>{});
+  }
+
+ private:
+  template <bool Ignore>
+  static Matcher<T> CastImpl(const M& polymorphic_matcher_or_value,
+                             std::true_type /* convertible_to_matcher */,
+                             std::integral_constant<bool, Ignore>) {
+    // M is implicitly convertible to Matcher<T>, which means that either
+    // M is a polymorphic matcher or Matcher<T> has an implicit constructor
+    // from M.  In both cases using the implicit conversion will produce a
+    // matcher.
+    //
+    // Even if T has an implicit constructor from M, it won't be called because
+    // creating Matcher<T> would require a chain of two user-defined conversions
+    // (first to create T from M and then to create Matcher<T> from T).
+    return polymorphic_matcher_or_value;
+  }
+
+  // M can't be implicitly converted to Matcher<T>, so M isn't a polymorphic
+  // matcher. It's a value of a type implicitly convertible to T. Use direct
+  // initialization to create a matcher.
+  static Matcher<T> CastImpl(const M& value,
+                             std::false_type /* convertible_to_matcher */,
+                             std::true_type /* convertible_to_T */) {
+    return Matcher<T>(ImplicitCast_<T>(value));
+  }
+
+  // M can't be implicitly converted to either Matcher<T> or T. Attempt to use
+  // polymorphic matcher Eq(value) in this case.
+  //
+  // Note that we first attempt to perform an implicit cast on the value and
+  // only fall back to the polymorphic Eq() matcher afterwards because the
+  // latter calls bool operator==(const Lhs& lhs, const Rhs& rhs) in the end
+  // which might be undefined even when Rhs is implicitly convertible to Lhs
+  // (e.g. std::pair<const int, int> vs. std::pair<int, int>).
+  //
+  // We don't define this method inline as we need the declaration of Eq().
+  static Matcher<T> CastImpl(const M& value,
+                             std::false_type /* convertible_to_matcher */,
+                             std::false_type /* convertible_to_T */);
+};
+
+// This more specialized version is used when MatcherCast()'s argument
+// is already a Matcher.  This only compiles when type T can be
+// statically converted to type U.
+template <typename T, typename U>
+class MatcherCastImpl<T, Matcher<U> > {
+ public:
+  static Matcher<T> Cast(const Matcher<U>& source_matcher) {
+    return Matcher<T>(new Impl(source_matcher));
+  }
+
+ private:
+  class Impl : public MatcherInterface<T> {
+   public:
+    explicit Impl(const Matcher<U>& source_matcher)
+        : source_matcher_(source_matcher) {}
+
+    // We delegate the matching logic to the source matcher.
+    bool MatchAndExplain(T x, MatchResultListener* listener) const override {
+      using FromType = typename std::remove_cv<typename std::remove_pointer<
+          typename std::remove_reference<T>::type>::type>::type;
+      using ToType = typename std::remove_cv<typename std::remove_pointer<
+          typename std::remove_reference<U>::type>::type>::type;
+      // Do not allow implicitly converting base*/& to derived*/&.
+      static_assert(
+          // Do not trigger if only one of them is a pointer. That implies a
+          // regular conversion and not a down_cast.
+          (std::is_pointer<typename std::remove_reference<T>::type>::value !=
+           std::is_pointer<typename std::remove_reference<U>::type>::value) ||
+              std::is_same<FromType, ToType>::value ||
+              !std::is_base_of<FromType, ToType>::value,
+          "Can't implicitly convert from <base> to <derived>");
+
+      // Do the cast to `U` explicitly if necessary.
+      // Otherwise, let implicit conversions do the trick.
+      using CastType =
+          typename std::conditional<std::is_convertible<T&, const U&>::value,
+                                    T&, U>::type;
+
+      return source_matcher_.MatchAndExplain(static_cast<CastType>(x),
+                                             listener);
+    }
+
+    void DescribeTo(::std::ostream* os) const override {
+      source_matcher_.DescribeTo(os);
+    }
+
+    void DescribeNegationTo(::std::ostream* os) const override {
+      source_matcher_.DescribeNegationTo(os);
+    }
+
+   private:
+    const Matcher<U> source_matcher_;
+  };
+};
+
+// This even more specialized version is used for efficiently casting
+// a matcher to its own type.
+template <typename T>
+class MatcherCastImpl<T, Matcher<T> > {
+ public:
+  static Matcher<T> Cast(const Matcher<T>& matcher) { return matcher; }
+};
+
+// Template specialization for parameterless Matcher.
+template <typename Derived>
+class MatcherBaseImpl {
+ public:
+  MatcherBaseImpl() = default;
+
+  template <typename T>
+  operator ::testing::Matcher<T>() const {  // NOLINT(runtime/explicit)
+    return ::testing::Matcher<T>(new
+                                 typename Derived::template gmock_Impl<T>());
+  }
+};
+
+// Template specialization for Matcher with parameters.
+template <template <typename...> class Derived, typename... Ts>
+class MatcherBaseImpl<Derived<Ts...>> {
+ public:
+  // Mark the constructor explicit for single argument T to avoid implicit
+  // conversions.
+  template <typename E = std::enable_if<sizeof...(Ts) == 1>,
+            typename E::type* = nullptr>
+  explicit MatcherBaseImpl(Ts... params)
+      : params_(std::forward<Ts>(params)...) {}
+  template <typename E = std::enable_if<sizeof...(Ts) != 1>,
+            typename = typename E::type>
+  MatcherBaseImpl(Ts... params)  // NOLINT
+      : params_(std::forward<Ts>(params)...) {}
+
+  template <typename F>
+  operator ::testing::Matcher<F>() const {  // NOLINT(runtime/explicit)
+    return Apply<F>(MakeIndexSequence<sizeof...(Ts)>{});
+  }
+
+ private:
+  template <typename F, std::size_t... tuple_ids>
+  ::testing::Matcher<F> Apply(IndexSequence<tuple_ids...>) const {
+    return ::testing::Matcher<F>(
+        new typename Derived<Ts...>::template gmock_Impl<F>(
+            std::get<tuple_ids>(params_)...));
+  }
+
+  const std::tuple<Ts...> params_;
+};
+
+}  // namespace internal
+
+// In order to be safe and clear, casting between different matcher
+// types is done explicitly via MatcherCast<T>(m), which takes a
+// matcher m and returns a Matcher<T>.  It compiles only when T can be
+// statically converted to the argument type of m.
+template <typename T, typename M>
+inline Matcher<T> MatcherCast(const M& matcher) {
+  return internal::MatcherCastImpl<T, M>::Cast(matcher);
+}
+
+// This overload handles polymorphic matchers and values only since
+// monomorphic matchers are handled by the next one.
+template <typename T, typename M>
+inline Matcher<T> SafeMatcherCast(const M& polymorphic_matcher_or_value) {
+  return MatcherCast<T>(polymorphic_matcher_or_value);
+}
+
+// This overload handles monomorphic matchers.
+//
+// In general, if type T can be implicitly converted to type U, we can
+// safely convert a Matcher<U> to a Matcher<T> (i.e. Matcher is
+// contravariant): just keep a copy of the original Matcher<U>, convert the
+// argument from type T to U, and then pass it to the underlying Matcher<U>.
+// The only exception is when U is a reference and T is not, as the
+// underlying Matcher<U> may be interested in the argument's address, which
+// is not preserved in the conversion from T to U.
+template <typename T, typename U>
+inline Matcher<T> SafeMatcherCast(const Matcher<U>& matcher) {
+  // Enforce that T can be implicitly converted to U.
+  static_assert(std::is_convertible<const T&, const U&>::value,
+                "T must be implicitly convertible to U");
+  // Enforce that we are not converting a non-reference type T to a reference
+  // type U.
+  GTEST_COMPILE_ASSERT_(
+      std::is_reference<T>::value || !std::is_reference<U>::value,
+      cannot_convert_non_reference_arg_to_reference);
+  // In case both T and U are arithmetic types, enforce that the
+  // conversion is not lossy.
+  typedef GTEST_REMOVE_REFERENCE_AND_CONST_(T) RawT;
+  typedef GTEST_REMOVE_REFERENCE_AND_CONST_(U) RawU;
+  constexpr bool kTIsOther = GMOCK_KIND_OF_(RawT) == internal::kOther;
+  constexpr bool kUIsOther = GMOCK_KIND_OF_(RawU) == internal::kOther;
+  GTEST_COMPILE_ASSERT_(
+      kTIsOther || kUIsOther ||
+      (internal::LosslessArithmeticConvertible<RawT, RawU>::value),
+      conversion_of_arithmetic_types_must_be_lossless);
+  return MatcherCast<T>(matcher);
+}
+
+// A<T>() returns a matcher that matches any value of type T.
+template <typename T>
+Matcher<T> A();
+
+// Anything inside the 'internal' namespace IS INTERNAL IMPLEMENTATION
+// and MUST NOT BE USED IN USER CODE!!!
+namespace internal {
+
+// If the explanation is not empty, prints it to the ostream.
+inline void PrintIfNotEmpty(const std::string& explanation,
+                            ::std::ostream* os) {
+  if (explanation != "" && os != nullptr) {
+    *os << ", " << explanation;
+  }
+}
+
+// Returns true if the given type name is easy to read by a human.
+// This is used to decide whether printing the type of a value might
+// be helpful.
+inline bool IsReadableTypeName(const std::string& type_name) {
+  // We consider a type name readable if it's short or doesn't contain
+  // a template or function type.
+  return (type_name.length() <= 20 ||
+          type_name.find_first_of("<(") == std::string::npos);
+}
+
+// Matches the value against the given matcher, prints the value and explains
+// the match result to the listener. Returns the match result.
+// 'listener' must not be NULL.
+// Value cannot be passed by const reference, because some matchers take a
+// non-const argument.
+template <typename Value, typename T>
+bool MatchPrintAndExplain(Value& value, const Matcher<T>& matcher,
+                          MatchResultListener* listener) {
+  if (!listener->IsInterested()) {
+    // If the listener is not interested, we do not need to construct the
+    // inner explanation.
+    return matcher.Matches(value);
+  }
+
+  StringMatchResultListener inner_listener;
+  const bool match = matcher.MatchAndExplain(value, &inner_listener);
+
+  UniversalPrint(value, listener->stream());
+#if GTEST_HAS_RTTI
+  const std::string& type_name = GetTypeName<Value>();
+  if (IsReadableTypeName(type_name))
+    *listener->stream() << " (of type " << type_name << ")";
+#endif
+  PrintIfNotEmpty(inner_listener.str(), listener->stream());
+
+  return match;
+}
+
+// An internal helper class for doing compile-time loop on a tuple's
+// fields.
+template <size_t N>
+class TuplePrefix {
+ public:
+  // TuplePrefix<N>::Matches(matcher_tuple, value_tuple) returns true
+  // if and only if the first N fields of matcher_tuple matches
+  // the first N fields of value_tuple, respectively.
+  template <typename MatcherTuple, typename ValueTuple>
+  static bool Matches(const MatcherTuple& matcher_tuple,
+                      const ValueTuple& value_tuple) {
+    return TuplePrefix<N - 1>::Matches(matcher_tuple, value_tuple) &&
+           std::get<N - 1>(matcher_tuple).Matches(std::get<N - 1>(value_tuple));
+  }
+
+  // TuplePrefix<N>::ExplainMatchFailuresTo(matchers, values, os)
+  // describes failures in matching the first N fields of matchers
+  // against the first N fields of values.  If there is no failure,
+  // nothing will be streamed to os.
+  template <typename MatcherTuple, typename ValueTuple>
+  static void ExplainMatchFailuresTo(const MatcherTuple& matchers,
+                                     const ValueTuple& values,
+                                     ::std::ostream* os) {
+    // First, describes failures in the first N - 1 fields.
+    TuplePrefix<N - 1>::ExplainMatchFailuresTo(matchers, values, os);
+
+    // Then describes the failure (if any) in the (N - 1)-th (0-based)
+    // field.
+    typename std::tuple_element<N - 1, MatcherTuple>::type matcher =
+        std::get<N - 1>(matchers);
+    typedef typename std::tuple_element<N - 1, ValueTuple>::type Value;
+    const Value& value = std::get<N - 1>(values);
+    StringMatchResultListener listener;
+    if (!matcher.MatchAndExplain(value, &listener)) {
+      *os << "  Expected arg #" << N - 1 << ": ";
+      std::get<N - 1>(matchers).DescribeTo(os);
+      *os << "\n           Actual: ";
+      // We remove the reference in type Value to prevent the
+      // universal printer from printing the address of value, which
+      // isn't interesting to the user most of the time.  The
+      // matcher's MatchAndExplain() method handles the case when
+      // the address is interesting.
+      internal::UniversalPrint(value, os);
+      PrintIfNotEmpty(listener.str(), os);
+      *os << "\n";
+    }
+  }
+};
+
+// The base case.
+template <>
+class TuplePrefix<0> {
+ public:
+  template <typename MatcherTuple, typename ValueTuple>
+  static bool Matches(const MatcherTuple& /* matcher_tuple */,
+                      const ValueTuple& /* value_tuple */) {
+    return true;
+  }
+
+  template <typename MatcherTuple, typename ValueTuple>
+  static void ExplainMatchFailuresTo(const MatcherTuple& /* matchers */,
+                                     const ValueTuple& /* values */,
+                                     ::std::ostream* /* os */) {}
+};
+
+// TupleMatches(matcher_tuple, value_tuple) returns true if and only if
+// all matchers in matcher_tuple match the corresponding fields in
+// value_tuple.  It is a compiler error if matcher_tuple and
+// value_tuple have different number of fields or incompatible field
+// types.
+template <typename MatcherTuple, typename ValueTuple>
+bool TupleMatches(const MatcherTuple& matcher_tuple,
+                  const ValueTuple& value_tuple) {
+  // Makes sure that matcher_tuple and value_tuple have the same
+  // number of fields.
+  GTEST_COMPILE_ASSERT_(std::tuple_size<MatcherTuple>::value ==
+                            std::tuple_size<ValueTuple>::value,
+                        matcher_and_value_have_different_numbers_of_fields);
+  return TuplePrefix<std::tuple_size<ValueTuple>::value>::Matches(matcher_tuple,
+                                                                  value_tuple);
+}
+
+// Describes failures in matching matchers against values.  If there
+// is no failure, nothing will be streamed to os.
+template <typename MatcherTuple, typename ValueTuple>
+void ExplainMatchFailureTupleTo(const MatcherTuple& matchers,
+                                const ValueTuple& values,
+                                ::std::ostream* os) {
+  TuplePrefix<std::tuple_size<MatcherTuple>::value>::ExplainMatchFailuresTo(
+      matchers, values, os);
+}
+
+// TransformTupleValues and its helper.
+//
+// TransformTupleValuesHelper hides the internal machinery that
+// TransformTupleValues uses to implement a tuple traversal.
+template <typename Tuple, typename Func, typename OutIter>
+class TransformTupleValuesHelper {
+ private:
+  typedef ::std::tuple_size<Tuple> TupleSize;
+
+ public:
+  // For each member of tuple 't', taken in order, evaluates '*out++ = f(t)'.
+  // Returns the final value of 'out' in case the caller needs it.
+  static OutIter Run(Func f, const Tuple& t, OutIter out) {
+    return IterateOverTuple<Tuple, TupleSize::value>()(f, t, out);
+  }
+
+ private:
+  template <typename Tup, size_t kRemainingSize>
+  struct IterateOverTuple {
+    OutIter operator() (Func f, const Tup& t, OutIter out) const {
+      *out++ = f(::std::get<TupleSize::value - kRemainingSize>(t));
+      return IterateOverTuple<Tup, kRemainingSize - 1>()(f, t, out);
+    }
+  };
+  template <typename Tup>
+  struct IterateOverTuple<Tup, 0> {
+    OutIter operator() (Func /* f */, const Tup& /* t */, OutIter out) const {
+      return out;
+    }
+  };
+};
+
+// Successively invokes 'f(element)' on each element of the tuple 't',
+// appending each result to the 'out' iterator. Returns the final value
+// of 'out'.
+template <typename Tuple, typename Func, typename OutIter>
+OutIter TransformTupleValues(Func f, const Tuple& t, OutIter out) {
+  return TransformTupleValuesHelper<Tuple, Func, OutIter>::Run(f, t, out);
+}
+
+// Implements _, a matcher that matches any value of any
+// type.  This is a polymorphic matcher, so we need a template type
+// conversion operator to make it appearing as a Matcher<T> for any
+// type T.
+class AnythingMatcher {
+ public:
+  using is_gtest_matcher = void;
+
+  template <typename T>
+  bool MatchAndExplain(const T& /* x */, std::ostream* /* listener */) const {
+    return true;
+  }
+  void DescribeTo(std::ostream* os) const { *os << "is anything"; }
+  void DescribeNegationTo(::std::ostream* os) const {
+    // This is mostly for completeness' sake, as it's not very useful
+    // to write Not(A<bool>()).  However we cannot completely rule out
+    // such a possibility, and it doesn't hurt to be prepared.
+    *os << "never matches";
+  }
+};
+
+// Implements the polymorphic IsNull() matcher, which matches any raw or smart
+// pointer that is NULL.
+class IsNullMatcher {
+ public:
+  template <typename Pointer>
+  bool MatchAndExplain(const Pointer& p,
+                       MatchResultListener* /* listener */) const {
+    return p == nullptr;
+  }
+
+  void DescribeTo(::std::ostream* os) const { *os << "is NULL"; }
+  void DescribeNegationTo(::std::ostream* os) const {
+    *os << "isn't NULL";
+  }
+};
+
+// Implements the polymorphic NotNull() matcher, which matches any raw or smart
+// pointer that is not NULL.
+class NotNullMatcher {
+ public:
+  template <typename Pointer>
+  bool MatchAndExplain(const Pointer& p,
+                       MatchResultListener* /* listener */) const {
+    return p != nullptr;
+  }
+
+  void DescribeTo(::std::ostream* os) const { *os << "isn't NULL"; }
+  void DescribeNegationTo(::std::ostream* os) const {
+    *os << "is NULL";
+  }
+};
+
+// Ref(variable) matches any argument that is a reference to
+// 'variable'.  This matcher is polymorphic as it can match any
+// super type of the type of 'variable'.
+//
+// The RefMatcher template class implements Ref(variable).  It can
+// only be instantiated with a reference type.  This prevents a user
+// from mistakenly using Ref(x) to match a non-reference function
+// argument.  For example, the following will righteously cause a
+// compiler error:
+//
+//   int n;
+//   Matcher<int> m1 = Ref(n);   // This won't compile.
+//   Matcher<int&> m2 = Ref(n);  // This will compile.
+template <typename T>
+class RefMatcher;
+
+template <typename T>
+class RefMatcher<T&> {
+  // Google Mock is a generic framework and thus needs to support
+  // mocking any function types, including those that take non-const
+  // reference arguments.  Therefore the template parameter T (and
+  // Super below) can be instantiated to either a const type or a
+  // non-const type.
+ public:
+  // RefMatcher() takes a T& instead of const T&, as we want the
+  // compiler to catch using Ref(const_value) as a matcher for a
+  // non-const reference.
+  explicit RefMatcher(T& x) : object_(x) {}  // NOLINT
+
+  template <typename Super>
+  operator Matcher<Super&>() const {
+    // By passing object_ (type T&) to Impl(), which expects a Super&,
+    // we make sure that Super is a super type of T.  In particular,
+    // this catches using Ref(const_value) as a matcher for a
+    // non-const reference, as you cannot implicitly convert a const
+    // reference to a non-const reference.
+    return MakeMatcher(new Impl<Super>(object_));
+  }
+
+ private:
+  template <typename Super>
+  class Impl : public MatcherInterface<Super&> {
+   public:
+    explicit Impl(Super& x) : object_(x) {}  // NOLINT
+
+    // MatchAndExplain() takes a Super& (as opposed to const Super&)
+    // in order to match the interface MatcherInterface<Super&>.
+    bool MatchAndExplain(Super& x,
+                         MatchResultListener* listener) const override {
+      *listener << "which is located @" << static_cast<const void*>(&x);
+      return &x == &object_;
+    }
+
+    void DescribeTo(::std::ostream* os) const override {
+      *os << "references the variable ";
+      UniversalPrinter<Super&>::Print(object_, os);
+    }
+
+    void DescribeNegationTo(::std::ostream* os) const override {
+      *os << "does not reference the variable ";
+      UniversalPrinter<Super&>::Print(object_, os);
+    }
+
+   private:
+    const Super& object_;
+  };
+
+  T& object_;
+};
+
+// Polymorphic helper functions for narrow and wide string matchers.
+inline bool CaseInsensitiveCStringEquals(const char* lhs, const char* rhs) {
+  return String::CaseInsensitiveCStringEquals(lhs, rhs);
+}
+
+inline bool CaseInsensitiveCStringEquals(const wchar_t* lhs,
+                                         const wchar_t* rhs) {
+  return String::CaseInsensitiveWideCStringEquals(lhs, rhs);
+}
+
+// String comparison for narrow or wide strings that can have embedded NUL
+// characters.
+template <typename StringType>
+bool CaseInsensitiveStringEquals(const StringType& s1,
+                                 const StringType& s2) {
+  // Are the heads equal?
+  if (!CaseInsensitiveCStringEquals(s1.c_str(), s2.c_str())) {
+    return false;
+  }
+
+  // Skip the equal heads.
+  const typename StringType::value_type nul = 0;
+  const size_t i1 = s1.find(nul), i2 = s2.find(nul);
+
+  // Are we at the end of either s1 or s2?
+  if (i1 == StringType::npos || i2 == StringType::npos) {
+    return i1 == i2;
+  }
+
+  // Are the tails equal?
+  return CaseInsensitiveStringEquals(s1.substr(i1 + 1), s2.substr(i2 + 1));
+}
+
+// String matchers.
+
+// Implements equality-based string matchers like StrEq, StrCaseNe, and etc.
+template <typename StringType>
+class StrEqualityMatcher {
+ public:
+  StrEqualityMatcher(StringType str, bool expect_eq, bool case_sensitive)
+      : string_(std::move(str)),
+        expect_eq_(expect_eq),
+        case_sensitive_(case_sensitive) {}
+
+#if GTEST_INTERNAL_HAS_STRING_VIEW
+  bool MatchAndExplain(const internal::StringView& s,
+                       MatchResultListener* listener) const {
+    // This should fail to compile if StringView is used with wide
+    // strings.
+    const StringType& str = std::string(s);
+    return MatchAndExplain(str, listener);
+  }
+#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
+
+  // Accepts pointer types, particularly:
+  //   const char*
+  //   char*
+  //   const wchar_t*
+  //   wchar_t*
+  template <typename CharType>
+  bool MatchAndExplain(CharType* s, MatchResultListener* listener) const {
+    if (s == nullptr) {
+      return !expect_eq_;
+    }
+    return MatchAndExplain(StringType(s), listener);
+  }
+
+  // Matches anything that can convert to StringType.
+  //
+  // This is a template, not just a plain function with const StringType&,
+  // because StringView has some interfering non-explicit constructors.
+  template <typename MatcheeStringType>
+  bool MatchAndExplain(const MatcheeStringType& s,
+                       MatchResultListener* /* listener */) const {
+    const StringType s2(s);
+    const bool eq = case_sensitive_ ? s2 == string_ :
+        CaseInsensitiveStringEquals(s2, string_);
+    return expect_eq_ == eq;
+  }
+
+  void DescribeTo(::std::ostream* os) const {
+    DescribeToHelper(expect_eq_, os);
+  }
+
+  void DescribeNegationTo(::std::ostream* os) const {
+    DescribeToHelper(!expect_eq_, os);
+  }
+
+ private:
+  void DescribeToHelper(bool expect_eq, ::std::ostream* os) const {
+    *os << (expect_eq ? "is " : "isn't ");
+    *os << "equal to ";
+    if (!case_sensitive_) {
+      *os << "(ignoring case) ";
+    }
+    UniversalPrint(string_, os);
+  }
+
+  const StringType string_;
+  const bool expect_eq_;
+  const bool case_sensitive_;
+};
+
+// Implements the polymorphic HasSubstr(substring) matcher, which
+// can be used as a Matcher<T> as long as T can be converted to a
+// string.
+template <typename StringType>
+class HasSubstrMatcher {
+ public:
+  explicit HasSubstrMatcher(const StringType& substring)
+      : substring_(substring) {}
+
+#if GTEST_INTERNAL_HAS_STRING_VIEW
+  bool MatchAndExplain(const internal::StringView& s,
+                       MatchResultListener* listener) const {
+    // This should fail to compile if StringView is used with wide
+    // strings.
+    const StringType& str = std::string(s);
+    return MatchAndExplain(str, listener);
+  }
+#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
+
+  // Accepts pointer types, particularly:
+  //   const char*
+  //   char*
+  //   const wchar_t*
+  //   wchar_t*
+  template <typename CharType>
+  bool MatchAndExplain(CharType* s, MatchResultListener* listener) const {
+    return s != nullptr && MatchAndExplain(StringType(s), listener);
+  }
+
+  // Matches anything that can convert to StringType.
+  //
+  // This is a template, not just a plain function with const StringType&,
+  // because StringView has some interfering non-explicit constructors.
+  template <typename MatcheeStringType>
+  bool MatchAndExplain(const MatcheeStringType& s,
+                       MatchResultListener* /* listener */) const {
+    return StringType(s).find(substring_) != StringType::npos;
+  }
+
+  // Describes what this matcher matches.
+  void DescribeTo(::std::ostream* os) const {
+    *os << "has substring ";
+    UniversalPrint(substring_, os);
+  }
+
+  void DescribeNegationTo(::std::ostream* os) const {
+    *os << "has no substring ";
+    UniversalPrint(substring_, os);
+  }
+
+ private:
+  const StringType substring_;
+};
+
+// Implements the polymorphic StartsWith(substring) matcher, which
+// can be used as a Matcher<T> as long as T can be converted to a
+// string.
+template <typename StringType>
+class StartsWithMatcher {
+ public:
+  explicit StartsWithMatcher(const StringType& prefix) : prefix_(prefix) {
+  }
+
+#if GTEST_INTERNAL_HAS_STRING_VIEW
+  bool MatchAndExplain(const internal::StringView& s,
+                       MatchResultListener* listener) const {
+    // This should fail to compile if StringView is used with wide
+    // strings.
+    const StringType& str = std::string(s);
+    return MatchAndExplain(str, listener);
+  }
+#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
+
+  // Accepts pointer types, particularly:
+  //   const char*
+  //   char*
+  //   const wchar_t*
+  //   wchar_t*
+  template <typename CharType>
+  bool MatchAndExplain(CharType* s, MatchResultListener* listener) const {
+    return s != nullptr && MatchAndExplain(StringType(s), listener);
+  }
+
+  // Matches anything that can convert to StringType.
+  //
+  // This is a template, not just a plain function with const StringType&,
+  // because StringView has some interfering non-explicit constructors.
+  template <typename MatcheeStringType>
+  bool MatchAndExplain(const MatcheeStringType& s,
+                       MatchResultListener* /* listener */) const {
+    const StringType& s2(s);
+    return s2.length() >= prefix_.length() &&
+        s2.substr(0, prefix_.length()) == prefix_;
+  }
+
+  void DescribeTo(::std::ostream* os) const {
+    *os << "starts with ";
+    UniversalPrint(prefix_, os);
+  }
+
+  void DescribeNegationTo(::std::ostream* os) const {
+    *os << "doesn't start with ";
+    UniversalPrint(prefix_, os);
+  }
+
+ private:
+  const StringType prefix_;
+};
+
+// Implements the polymorphic EndsWith(substring) matcher, which
+// can be used as a Matcher<T> as long as T can be converted to a
+// string.
+template <typename StringType>
+class EndsWithMatcher {
+ public:
+  explicit EndsWithMatcher(const StringType& suffix) : suffix_(suffix) {}
+
+#if GTEST_INTERNAL_HAS_STRING_VIEW
+  bool MatchAndExplain(const internal::StringView& s,
+                       MatchResultListener* listener) const {
+    // This should fail to compile if StringView is used with wide
+    // strings.
+    const StringType& str = std::string(s);
+    return MatchAndExplain(str, listener);
+  }
+#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
+
+  // Accepts pointer types, particularly:
+  //   const char*
+  //   char*
+  //   const wchar_t*
+  //   wchar_t*
+  template <typename CharType>
+  bool MatchAndExplain(CharType* s, MatchResultListener* listener) const {
+    return s != nullptr && MatchAndExplain(StringType(s), listener);
+  }
+
+  // Matches anything that can convert to StringType.
+  //
+  // This is a template, not just a plain function with const StringType&,
+  // because StringView has some interfering non-explicit constructors.
+  template <typename MatcheeStringType>
+  bool MatchAndExplain(const MatcheeStringType& s,
+                       MatchResultListener* /* listener */) const {
+    const StringType& s2(s);
+    return s2.length() >= suffix_.length() &&
+        s2.substr(s2.length() - suffix_.length()) == suffix_;
+  }
+
+  void DescribeTo(::std::ostream* os) const {
+    *os << "ends with ";
+    UniversalPrint(suffix_, os);
+  }
+
+  void DescribeNegationTo(::std::ostream* os) const {
+    *os << "doesn't end with ";
+    UniversalPrint(suffix_, os);
+  }
+
+ private:
+  const StringType suffix_;
+};
+
+// Implements a matcher that compares the two fields of a 2-tuple
+// using one of the ==, <=, <, etc, operators.  The two fields being
+// compared don't have to have the same type.
+//
+// The matcher defined here is polymorphic (for example, Eq() can be
+// used to match a std::tuple<int, short>, a std::tuple<const long&, double>,
+// etc).  Therefore we use a template type conversion operator in the
+// implementation.
+template <typename D, typename Op>
+class PairMatchBase {
+ public:
+  template <typename T1, typename T2>
+  operator Matcher<::std::tuple<T1, T2>>() const {
+    return Matcher<::std::tuple<T1, T2>>(new Impl<const ::std::tuple<T1, T2>&>);
+  }
+  template <typename T1, typename T2>
+  operator Matcher<const ::std::tuple<T1, T2>&>() const {
+    return MakeMatcher(new Impl<const ::std::tuple<T1, T2>&>);
+  }
+
+ private:
+  static ::std::ostream& GetDesc(::std::ostream& os) {  // NOLINT
+    return os << D::Desc();
+  }
+
+  template <typename Tuple>
+  class Impl : public MatcherInterface<Tuple> {
+   public:
+    bool MatchAndExplain(Tuple args,
+                         MatchResultListener* /* listener */) const override {
+      return Op()(::std::get<0>(args), ::std::get<1>(args));
+    }
+    void DescribeTo(::std::ostream* os) const override {
+      *os << "are " << GetDesc;
+    }
+    void DescribeNegationTo(::std::ostream* os) const override {
+      *os << "aren't " << GetDesc;
+    }
+  };
+};
+
+class Eq2Matcher : public PairMatchBase<Eq2Matcher, AnyEq> {
+ public:
+  static const char* Desc() { return "an equal pair"; }
+};
+class Ne2Matcher : public PairMatchBase<Ne2Matcher, AnyNe> {
+ public:
+  static const char* Desc() { return "an unequal pair"; }
+};
+class Lt2Matcher : public PairMatchBase<Lt2Matcher, AnyLt> {
+ public:
+  static const char* Desc() { return "a pair where the first < the second"; }
+};
+class Gt2Matcher : public PairMatchBase<Gt2Matcher, AnyGt> {
+ public:
+  static const char* Desc() { return "a pair where the first > the second"; }
+};
+class Le2Matcher : public PairMatchBase<Le2Matcher, AnyLe> {
+ public:
+  static const char* Desc() { return "a pair where the first <= the second"; }
+};
+class Ge2Matcher : public PairMatchBase<Ge2Matcher, AnyGe> {
+ public:
+  static const char* Desc() { return "a pair where the first >= the second"; }
+};
+
+// Implements the Not(...) matcher for a particular argument type T.
+// We do not nest it inside the NotMatcher class template, as that
+// will prevent different instantiations of NotMatcher from sharing
+// the same NotMatcherImpl<T> class.
+template <typename T>
+class NotMatcherImpl : public MatcherInterface<const T&> {
+ public:
+  explicit NotMatcherImpl(const Matcher<T>& matcher)
+      : matcher_(matcher) {}
+
+  bool MatchAndExplain(const T& x,
+                       MatchResultListener* listener) const override {
+    return !matcher_.MatchAndExplain(x, listener);
+  }
+
+  void DescribeTo(::std::ostream* os) const override {
+    matcher_.DescribeNegationTo(os);
+  }
+
+  void DescribeNegationTo(::std::ostream* os) const override {
+    matcher_.DescribeTo(os);
+  }
+
+ private:
+  const Matcher<T> matcher_;
+};
+
+// Implements the Not(m) matcher, which matches a value that doesn't
+// match matcher m.
+template <typename InnerMatcher>
+class NotMatcher {
+ public:
+  explicit NotMatcher(InnerMatcher matcher) : matcher_(matcher) {}
+
+  // This template type conversion operator allows Not(m) to be used
+  // to match any type m can match.
+  template <typename T>
+  operator Matcher<T>() const {
+    return Matcher<T>(new NotMatcherImpl<T>(SafeMatcherCast<T>(matcher_)));
+  }
+
+ private:
+  InnerMatcher matcher_;
+};
+
+// Implements the AllOf(m1, m2) matcher for a particular argument type
+// T. We do not nest it inside the BothOfMatcher class template, as
+// that will prevent different instantiations of BothOfMatcher from
+// sharing the same BothOfMatcherImpl<T> class.
+template <typename T>
+class AllOfMatcherImpl : public MatcherInterface<const T&> {
+ public:
+  explicit AllOfMatcherImpl(std::vector<Matcher<T> > matchers)
+      : matchers_(std::move(matchers)) {}
+
+  void DescribeTo(::std::ostream* os) const override {
+    *os << "(";
+    for (size_t i = 0; i < matchers_.size(); ++i) {
+      if (i != 0) *os << ") and (";
+      matchers_[i].DescribeTo(os);
+    }
+    *os << ")";
+  }
+
+  void DescribeNegationTo(::std::ostream* os) const override {
+    *os << "(";
+    for (size_t i = 0; i < matchers_.size(); ++i) {
+      if (i != 0) *os << ") or (";
+      matchers_[i].DescribeNegationTo(os);
+    }
+    *os << ")";
+  }
+
+  bool MatchAndExplain(const T& x,
+                       MatchResultListener* listener) const override {
+    // If either matcher1_ or matcher2_ doesn't match x, we only need
+    // to explain why one of them fails.
+    std::string all_match_result;
+
+    for (size_t i = 0; i < matchers_.size(); ++i) {
+      StringMatchResultListener slistener;
+      if (matchers_[i].MatchAndExplain(x, &slistener)) {
+        if (all_match_result.empty()) {
+          all_match_result = slistener.str();
+        } else {
+          std::string result = slistener.str();
+          if (!result.empty()) {
+            all_match_result += ", and ";
+            all_match_result += result;
+          }
+        }
+      } else {
+        *listener << slistener.str();
+        return false;
+      }
+    }
+
+    // Otherwise we need to explain why *both* of them match.
+    *listener << all_match_result;
+    return true;
+  }
+
+ private:
+  const std::vector<Matcher<T> > matchers_;
+};
+
+// VariadicMatcher is used for the variadic implementation of
+// AllOf(m_1, m_2, ...) and AnyOf(m_1, m_2, ...).
+// CombiningMatcher<T> is used to recursively combine the provided matchers
+// (of type Args...).
+template <template <typename T> class CombiningMatcher, typename... Args>
+class VariadicMatcher {
+ public:
+  VariadicMatcher(const Args&... matchers)  // NOLINT
+      : matchers_(matchers...) {
+    static_assert(sizeof...(Args) > 0, "Must have at least one matcher.");
+  }
+
+  VariadicMatcher(const VariadicMatcher&) = default;
+  VariadicMatcher& operator=(const VariadicMatcher&) = delete;
+
+  // This template type conversion operator allows an
+  // VariadicMatcher<Matcher1, Matcher2...> object to match any type that
+  // all of the provided matchers (Matcher1, Matcher2, ...) can match.
+  template <typename T>
+  operator Matcher<T>() const {
+    std::vector<Matcher<T> > values;
+    CreateVariadicMatcher<T>(&values, std::integral_constant<size_t, 0>());
+    return Matcher<T>(new CombiningMatcher<T>(std::move(values)));
+  }
+
+ private:
+  template <typename T, size_t I>
+  void CreateVariadicMatcher(std::vector<Matcher<T> >* values,
+                             std::integral_constant<size_t, I>) const {
+    values->push_back(SafeMatcherCast<T>(std::get<I>(matchers_)));
+    CreateVariadicMatcher<T>(values, std::integral_constant<size_t, I + 1>());
+  }
+
+  template <typename T>
+  void CreateVariadicMatcher(
+      std::vector<Matcher<T> >*,
+      std::integral_constant<size_t, sizeof...(Args)>) const {}
+
+  std::tuple<Args...> matchers_;
+};
+
+template <typename... Args>
+using AllOfMatcher = VariadicMatcher<AllOfMatcherImpl, Args...>;
+
+// Implements the AnyOf(m1, m2) matcher for a particular argument type
+// T.  We do not nest it inside the AnyOfMatcher class template, as
+// that will prevent different instantiations of AnyOfMatcher from
+// sharing the same EitherOfMatcherImpl<T> class.
+template <typename T>
+class AnyOfMatcherImpl : public MatcherInterface<const T&> {
+ public:
+  explicit AnyOfMatcherImpl(std::vector<Matcher<T> > matchers)
+      : matchers_(std::move(matchers)) {}
+
+  void DescribeTo(::std::ostream* os) const override {
+    *os << "(";
+    for (size_t i = 0; i < matchers_.size(); ++i) {
+      if (i != 0) *os << ") or (";
+      matchers_[i].DescribeTo(os);
+    }
+    *os << ")";
+  }
+
+  void DescribeNegationTo(::std::ostream* os) const override {
+    *os << "(";
+    for (size_t i = 0; i < matchers_.size(); ++i) {
+      if (i != 0) *os << ") and (";
+      matchers_[i].DescribeNegationTo(os);
+    }
+    *os << ")";
+  }
+
+  bool MatchAndExplain(const T& x,
+                       MatchResultListener* listener) const override {
+    std::string no_match_result;
+
+    // If either matcher1_ or matcher2_ matches x, we just need to
+    // explain why *one* of them matches.
+    for (size_t i = 0; i < matchers_.size(); ++i) {
+      StringMatchResultListener slistener;
+      if (matchers_[i].MatchAndExplain(x, &slistener)) {
+        *listener << slistener.str();
+        return true;
+      } else {
+        if (no_match_result.empty()) {
+          no_match_result = slistener.str();
+        } else {
+          std::string result = slistener.str();
+          if (!result.empty()) {
+            no_match_result += ", and ";
+            no_match_result += result;
+          }
+        }
+      }
+    }
+
+    // Otherwise we need to explain why *both* of them fail.
+    *listener << no_match_result;
+    return false;
+  }
+
+ private:
+  const std::vector<Matcher<T> > matchers_;
+};
+
+// AnyOfMatcher is used for the variadic implementation of AnyOf(m_1, m_2, ...).
+template <typename... Args>
+using AnyOfMatcher = VariadicMatcher<AnyOfMatcherImpl, Args...>;
+
+// Wrapper for implementation of Any/AllOfArray().
+template <template <class> class MatcherImpl, typename T>
+class SomeOfArrayMatcher {
+ public:
+  // Constructs the matcher from a sequence of element values or
+  // element matchers.
+  template <typename Iter>
+  SomeOfArrayMatcher(Iter first, Iter last) : matchers_(first, last) {}
+
+  template <typename U>
+  operator Matcher<U>() const {  // NOLINT
+    using RawU = typename std::decay<U>::type;
+    std::vector<Matcher<RawU>> matchers;
+    for (const auto& matcher : matchers_) {
+      matchers.push_back(MatcherCast<RawU>(matcher));
+    }
+    return Matcher<U>(new MatcherImpl<RawU>(std::move(matchers)));
+  }
+
+ private:
+  const ::std::vector<T> matchers_;
+};
+
+template <typename T>
+using AllOfArrayMatcher = SomeOfArrayMatcher<AllOfMatcherImpl, T>;
+
+template <typename T>
+using AnyOfArrayMatcher = SomeOfArrayMatcher<AnyOfMatcherImpl, T>;
+
+// Used for implementing Truly(pred), which turns a predicate into a
+// matcher.
+template <typename Predicate>
+class TrulyMatcher {
+ public:
+  explicit TrulyMatcher(Predicate pred) : predicate_(pred) {}
+
+  // This method template allows Truly(pred) to be used as a matcher
+  // for type T where T is the argument type of predicate 'pred'.  The
+  // argument is passed by reference as the predicate may be
+  // interested in the address of the argument.
+  template <typename T>
+  bool MatchAndExplain(T& x,  // NOLINT
+                       MatchResultListener* listener) const {
+    // Without the if-statement, MSVC sometimes warns about converting
+    // a value to bool (warning 4800).
+    //
+    // We cannot write 'return !!predicate_(x);' as that doesn't work
+    // when predicate_(x) returns a class convertible to bool but
+    // having no operator!().
+    if (predicate_(x))
+      return true;
+    *listener << "didn't satisfy the given predicate";
+    return false;
+  }
+
+  void DescribeTo(::std::ostream* os) const {
+    *os << "satisfies the given predicate";
+  }
+
+  void DescribeNegationTo(::std::ostream* os) const {
+    *os << "doesn't satisfy the given predicate";
+  }
+
+ private:
+  Predicate predicate_;
+};
+
+// Used for implementing Matches(matcher), which turns a matcher into
+// a predicate.
+template <typename M>
+class MatcherAsPredicate {
+ public:
+  explicit MatcherAsPredicate(M matcher) : matcher_(matcher) {}
+
+  // This template operator() allows Matches(m) to be used as a
+  // predicate on type T where m is a matcher on type T.
+  //
+  // The argument x is passed by reference instead of by value, as
+  // some matcher may be interested in its address (e.g. as in
+  // Matches(Ref(n))(x)).
+  template <typename T>
+  bool operator()(const T& x) const {
+    // We let matcher_ commit to a particular type here instead of
+    // when the MatcherAsPredicate object was constructed.  This
+    // allows us to write Matches(m) where m is a polymorphic matcher
+    // (e.g. Eq(5)).
+    //
+    // If we write Matcher<T>(matcher_).Matches(x) here, it won't
+    // compile when matcher_ has type Matcher<const T&>; if we write
+    // Matcher<const T&>(matcher_).Matches(x) here, it won't compile
+    // when matcher_ has type Matcher<T>; if we just write
+    // matcher_.Matches(x), it won't compile when matcher_ is
+    // polymorphic, e.g. Eq(5).
+    //
+    // MatcherCast<const T&>() is necessary for making the code work
+    // in all of the above situations.
+    return MatcherCast<const T&>(matcher_).Matches(x);
+  }
+
+ private:
+  M matcher_;
+};
+
+// For implementing ASSERT_THAT() and EXPECT_THAT().  The template
+// argument M must be a type that can be converted to a matcher.
+template <typename M>
+class PredicateFormatterFromMatcher {
+ public:
+  explicit PredicateFormatterFromMatcher(M m) : matcher_(std::move(m)) {}
+
+  // This template () operator allows a PredicateFormatterFromMatcher
+  // object to act as a predicate-formatter suitable for using with
+  // Google Test's EXPECT_PRED_FORMAT1() macro.
+  template <typename T>
+  AssertionResult operator()(const char* value_text, const T& x) const {
+    // We convert matcher_ to a Matcher<const T&> *now* instead of
+    // when the PredicateFormatterFromMatcher object was constructed,
+    // as matcher_ may be polymorphic (e.g. NotNull()) and we won't
+    // know which type to instantiate it to until we actually see the
+    // type of x here.
+    //
+    // We write SafeMatcherCast<const T&>(matcher_) instead of
+    // Matcher<const T&>(matcher_), as the latter won't compile when
+    // matcher_ has type Matcher<T> (e.g. An<int>()).
+    // We don't write MatcherCast<const T&> either, as that allows
+    // potentially unsafe downcasting of the matcher argument.
+    const Matcher<const T&> matcher = SafeMatcherCast<const T&>(matcher_);
+
+    // The expected path here is that the matcher should match (i.e. that most
+    // tests pass) so optimize for this case.
+    if (matcher.Matches(x)) {
+      return AssertionSuccess();
+    }
+
+    ::std::stringstream ss;
+    ss << "Value of: " << value_text << "\n"
+       << "Expected: ";
+    matcher.DescribeTo(&ss);
+
+    // Rerun the matcher to "PrintAndExplain" the failure.
+    StringMatchResultListener listener;
+    if (MatchPrintAndExplain(x, matcher, &listener)) {
+      ss << "\n  The matcher failed on the initial attempt; but passed when "
+            "rerun to generate the explanation.";
+    }
+    ss << "\n  Actual: " << listener.str();
+    return AssertionFailure() << ss.str();
+  }
+
+ private:
+  const M matcher_;
+};
+
+// A helper function for converting a matcher to a predicate-formatter
+// without the user needing to explicitly write the type.  This is
+// used for implementing ASSERT_THAT() and EXPECT_THAT().
+// Implementation detail: 'matcher' is received by-value to force decaying.
+template <typename M>
+inline PredicateFormatterFromMatcher<M>
+MakePredicateFormatterFromMatcher(M matcher) {
+  return PredicateFormatterFromMatcher<M>(std::move(matcher));
+}
+
+// Implements the polymorphic IsNan() matcher, which matches any floating type
+// value that is Nan.
+class IsNanMatcher {
+ public:
+  template <typename FloatType>
+  bool MatchAndExplain(const FloatType& f,
+                       MatchResultListener* /* listener */) const {
+    return (::std::isnan)(f);
+  }
+
+  void DescribeTo(::std::ostream* os) const { *os << "is NaN"; }
+  void DescribeNegationTo(::std::ostream* os) const {
+    *os << "isn't NaN";
+  }
+};
+
+// Implements the polymorphic floating point equality matcher, which matches
+// two float values using ULP-based approximation or, optionally, a
+// user-specified epsilon.  The template is meant to be instantiated with
+// FloatType being either float or double.
+template <typename FloatType>
+class FloatingEqMatcher {
+ public:
+  // Constructor for FloatingEqMatcher.
+  // The matcher's input will be compared with expected.  The matcher treats two
+  // NANs as equal if nan_eq_nan is true.  Otherwise, under IEEE standards,
+  // equality comparisons between NANs will always return false.  We specify a
+  // negative max_abs_error_ term to indicate that ULP-based approximation will
+  // be used for comparison.
+  FloatingEqMatcher(FloatType expected, bool nan_eq_nan) :
+    expected_(expected), nan_eq_nan_(nan_eq_nan), max_abs_error_(-1) {
+  }
+
+  // Constructor that supports a user-specified max_abs_error that will be used
+  // for comparison instead of ULP-based approximation.  The max absolute
+  // should be non-negative.
+  FloatingEqMatcher(FloatType expected, bool nan_eq_nan,
+                    FloatType max_abs_error)
+      : expected_(expected),
+        nan_eq_nan_(nan_eq_nan),
+        max_abs_error_(max_abs_error) {
+    GTEST_CHECK_(max_abs_error >= 0)
+        << ", where max_abs_error is" << max_abs_error;
+  }
+
+  // Implements floating point equality matcher as a Matcher<T>.
+  template <typename T>
+  class Impl : public MatcherInterface<T> {
+   public:
+    Impl(FloatType expected, bool nan_eq_nan, FloatType max_abs_error)
+        : expected_(expected),
+          nan_eq_nan_(nan_eq_nan),
+          max_abs_error_(max_abs_error) {}
+
+    bool MatchAndExplain(T value,
+                         MatchResultListener* listener) const override {
+      const FloatingPoint<FloatType> actual(value), expected(expected_);
+
+      // Compares NaNs first, if nan_eq_nan_ is true.
+      if (actual.is_nan() || expected.is_nan()) {
+        if (actual.is_nan() && expected.is_nan()) {
+          return nan_eq_nan_;
+        }
+        // One is nan; the other is not nan.
+        return false;
+      }
+      if (HasMaxAbsError()) {
+        // We perform an equality check so that inf will match inf, regardless
+        // of error bounds.  If the result of value - expected_ would result in
+        // overflow or if either value is inf, the default result is infinity,
+        // which should only match if max_abs_error_ is also infinity.
+        if (value == expected_) {
+          return true;
+        }
+
+        const FloatType diff = value - expected_;
+        if (::std::fabs(diff) <= max_abs_error_) {
+          return true;
+        }
+
+        if (listener->IsInterested()) {
+          *listener << "which is " << diff << " from " << expected_;
+        }
+        return false;
+      } else {
+        return actual.AlmostEquals(expected);
+      }
+    }
+
+    void DescribeTo(::std::ostream* os) const override {
+      // os->precision() returns the previously set precision, which we
+      // store to restore the ostream to its original configuration
+      // after outputting.
+      const ::std::streamsize old_precision = os->precision(
+          ::std::numeric_limits<FloatType>::digits10 + 2);
+      if (FloatingPoint<FloatType>(expected_).is_nan()) {
+        if (nan_eq_nan_) {
+          *os << "is NaN";
+        } else {
+          *os << "never matches";
+        }
+      } else {
+        *os << "is approximately " << expected_;
+        if (HasMaxAbsError()) {
+          *os << " (absolute error <= " << max_abs_error_ << ")";
+        }
+      }
+      os->precision(old_precision);
+    }
+
+    void DescribeNegationTo(::std::ostream* os) const override {
+      // As before, get original precision.
+      const ::std::streamsize old_precision = os->precision(
+          ::std::numeric_limits<FloatType>::digits10 + 2);
+      if (FloatingPoint<FloatType>(expected_).is_nan()) {
+        if (nan_eq_nan_) {
+          *os << "isn't NaN";
+        } else {
+          *os << "is anything";
+        }
+      } else {
+        *os << "isn't approximately " << expected_;
+        if (HasMaxAbsError()) {
+          *os << " (absolute error > " << max_abs_error_ << ")";
+        }
+      }
+      // Restore original precision.
+      os->precision(old_precision);
+    }
+
+   private:
+    bool HasMaxAbsError() const {
+      return max_abs_error_ >= 0;
+    }
+
+    const FloatType expected_;
+    const bool nan_eq_nan_;
+    // max_abs_error will be used for value comparison when >= 0.
+    const FloatType max_abs_error_;
+  };
+
+  // The following 3 type conversion operators allow FloatEq(expected) and
+  // NanSensitiveFloatEq(expected) to be used as a Matcher<float>, a
+  // Matcher<const float&>, or a Matcher<float&>, but nothing else.
+  operator Matcher<FloatType>() const {
+    return MakeMatcher(
+        new Impl<FloatType>(expected_, nan_eq_nan_, max_abs_error_));
+  }
+
+  operator Matcher<const FloatType&>() const {
+    return MakeMatcher(
+        new Impl<const FloatType&>(expected_, nan_eq_nan_, max_abs_error_));
+  }
+
+  operator Matcher<FloatType&>() const {
+    return MakeMatcher(
+        new Impl<FloatType&>(expected_, nan_eq_nan_, max_abs_error_));
+  }
+
+ private:
+  const FloatType expected_;
+  const bool nan_eq_nan_;
+  // max_abs_error will be used for value comparison when >= 0.
+  const FloatType max_abs_error_;
+};
+
+// A 2-tuple ("binary") wrapper around FloatingEqMatcher:
+// FloatingEq2Matcher() matches (x, y) by matching FloatingEqMatcher(x, false)
+// against y, and FloatingEq2Matcher(e) matches FloatingEqMatcher(x, false, e)
+// against y. The former implements "Eq", the latter "Near". At present, there
+// is no version that compares NaNs as equal.
+template <typename FloatType>
+class FloatingEq2Matcher {
+ public:
+  FloatingEq2Matcher() { Init(-1, false); }
+
+  explicit FloatingEq2Matcher(bool nan_eq_nan) { Init(-1, nan_eq_nan); }
+
+  explicit FloatingEq2Matcher(FloatType max_abs_error) {
+    Init(max_abs_error, false);
+  }
+
+  FloatingEq2Matcher(FloatType max_abs_error, bool nan_eq_nan) {
+    Init(max_abs_error, nan_eq_nan);
+  }
+
+  template <typename T1, typename T2>
+  operator Matcher<::std::tuple<T1, T2>>() const {
+    return MakeMatcher(
+        new Impl<::std::tuple<T1, T2>>(max_abs_error_, nan_eq_nan_));
+  }
+  template <typename T1, typename T2>
+  operator Matcher<const ::std::tuple<T1, T2>&>() const {
+    return MakeMatcher(
+        new Impl<const ::std::tuple<T1, T2>&>(max_abs_error_, nan_eq_nan_));
+  }
+
+ private:
+  static ::std::ostream& GetDesc(::std::ostream& os) {  // NOLINT
+    return os << "an almost-equal pair";
+  }
+
+  template <typename Tuple>
+  class Impl : public MatcherInterface<Tuple> {
+   public:
+    Impl(FloatType max_abs_error, bool nan_eq_nan) :
+        max_abs_error_(max_abs_error),
+        nan_eq_nan_(nan_eq_nan) {}
+
+    bool MatchAndExplain(Tuple args,
+                         MatchResultListener* listener) const override {
+      if (max_abs_error_ == -1) {
+        FloatingEqMatcher<FloatType> fm(::std::get<0>(args), nan_eq_nan_);
+        return static_cast<Matcher<FloatType>>(fm).MatchAndExplain(
+            ::std::get<1>(args), listener);
+      } else {
+        FloatingEqMatcher<FloatType> fm(::std::get<0>(args), nan_eq_nan_,
+                                        max_abs_error_);
+        return static_cast<Matcher<FloatType>>(fm).MatchAndExplain(
+            ::std::get<1>(args), listener);
+      }
+    }
+    void DescribeTo(::std::ostream* os) const override {
+      *os << "are " << GetDesc;
+    }
+    void DescribeNegationTo(::std::ostream* os) const override {
+      *os << "aren't " << GetDesc;
+    }
+
+   private:
+    FloatType max_abs_error_;
+    const bool nan_eq_nan_;
+  };
+
+  void Init(FloatType max_abs_error_val, bool nan_eq_nan_val) {
+    max_abs_error_ = max_abs_error_val;
+    nan_eq_nan_ = nan_eq_nan_val;
+  }
+  FloatType max_abs_error_;
+  bool nan_eq_nan_;
+};
+
+// Implements the Pointee(m) matcher for matching a pointer whose
+// pointee matches matcher m.  The pointer can be either raw or smart.
+template <typename InnerMatcher>
+class PointeeMatcher {
+ public:
+  explicit PointeeMatcher(const InnerMatcher& matcher) : matcher_(matcher) {}
+
+  // This type conversion operator template allows Pointee(m) to be
+  // used as a matcher for any pointer type whose pointee type is
+  // compatible with the inner matcher, where type Pointer can be
+  // either a raw pointer or a smart pointer.
+  //
+  // The reason we do this instead of relying on
+  // MakePolymorphicMatcher() is that the latter is not flexible
+  // enough for implementing the DescribeTo() method of Pointee().
+  template <typename Pointer>
+  operator Matcher<Pointer>() const {
+    return Matcher<Pointer>(new Impl<const Pointer&>(matcher_));
+  }
+
+ private:
+  // The monomorphic implementation that works for a particular pointer type.
+  template <typename Pointer>
+  class Impl : public MatcherInterface<Pointer> {
+   public:
+    using Pointee =
+        typename std::pointer_traits<GTEST_REMOVE_REFERENCE_AND_CONST_(
+            Pointer)>::element_type;
+
+    explicit Impl(const InnerMatcher& matcher)
+        : matcher_(MatcherCast<const Pointee&>(matcher)) {}
+
+    void DescribeTo(::std::ostream* os) const override {
+      *os << "points to a value that ";
+      matcher_.DescribeTo(os);
+    }
+
+    void DescribeNegationTo(::std::ostream* os) const override {
+      *os << "does not point to a value that ";
+      matcher_.DescribeTo(os);
+    }
+
+    bool MatchAndExplain(Pointer pointer,
+                         MatchResultListener* listener) const override {
+      if (GetRawPointer(pointer) == nullptr) return false;
+
+      *listener << "which points to ";
+      return MatchPrintAndExplain(*pointer, matcher_, listener);
+    }
+
+   private:
+    const Matcher<const Pointee&> matcher_;
+  };
+
+  const InnerMatcher matcher_;
+};
+
+// Implements the Pointer(m) matcher
+// Implements the Pointer(m) matcher for matching a pointer that matches matcher
+// m.  The pointer can be either raw or smart, and will match `m` against the
+// raw pointer.
+template <typename InnerMatcher>
+class PointerMatcher {
+ public:
+  explicit PointerMatcher(const InnerMatcher& matcher) : matcher_(matcher) {}
+
+  // This type conversion operator template allows Pointer(m) to be
+  // used as a matcher for any pointer type whose pointer type is
+  // compatible with the inner matcher, where type PointerType can be
+  // either a raw pointer or a smart pointer.
+  //
+  // The reason we do this instead of relying on
+  // MakePolymorphicMatcher() is that the latter is not flexible
+  // enough for implementing the DescribeTo() method of Pointer().
+  template <typename PointerType>
+  operator Matcher<PointerType>() const {  // NOLINT
+    return Matcher<PointerType>(new Impl<const PointerType&>(matcher_));
+  }
+
+ private:
+  // The monomorphic implementation that works for a particular pointer type.
+  template <typename PointerType>
+  class Impl : public MatcherInterface<PointerType> {
+   public:
+    using Pointer =
+        const typename std::pointer_traits<GTEST_REMOVE_REFERENCE_AND_CONST_(
+            PointerType)>::element_type*;
+
+    explicit Impl(const InnerMatcher& matcher)
+        : matcher_(MatcherCast<Pointer>(matcher)) {}
+
+    void DescribeTo(::std::ostream* os) const override {
+      *os << "is a pointer that ";
+      matcher_.DescribeTo(os);
+    }
+
+    void DescribeNegationTo(::std::ostream* os) const override {
+      *os << "is not a pointer that ";
+      matcher_.DescribeTo(os);
+    }
+
+    bool MatchAndExplain(PointerType pointer,
+                         MatchResultListener* listener) const override {
+      *listener << "which is a pointer that ";
+      Pointer p = GetRawPointer(pointer);
+      return MatchPrintAndExplain(p, matcher_, listener);
+    }
+
+   private:
+    Matcher<Pointer> matcher_;
+  };
+
+  const InnerMatcher matcher_;
+};
+
+#if GTEST_HAS_RTTI
+// Implements the WhenDynamicCastTo<T>(m) matcher that matches a pointer or
+// reference that matches inner_matcher when dynamic_cast<T> is applied.
+// The result of dynamic_cast<To> is forwarded to the inner matcher.
+// If To is a pointer and the cast fails, the inner matcher will receive NULL.
+// If To is a reference and the cast fails, this matcher returns false
+// immediately.
+template <typename To>
+class WhenDynamicCastToMatcherBase {
+ public:
+  explicit WhenDynamicCastToMatcherBase(const Matcher<To>& matcher)
+      : matcher_(matcher) {}
+
+  void DescribeTo(::std::ostream* os) const {
+    GetCastTypeDescription(os);
+    matcher_.DescribeTo(os);
+  }
+
+  void DescribeNegationTo(::std::ostream* os) const {
+    GetCastTypeDescription(os);
+    matcher_.DescribeNegationTo(os);
+  }
+
+ protected:
+  const Matcher<To> matcher_;
+
+  static std::string GetToName() {
+    return GetTypeName<To>();
+  }
+
+ private:
+  static void GetCastTypeDescription(::std::ostream* os) {
+    *os << "when dynamic_cast to " << GetToName() << ", ";
+  }
+};
+
+// Primary template.
+// To is a pointer. Cast and forward the result.
+template <typename To>
+class WhenDynamicCastToMatcher : public WhenDynamicCastToMatcherBase<To> {
+ public:
+  explicit WhenDynamicCastToMatcher(const Matcher<To>& matcher)
+      : WhenDynamicCastToMatcherBase<To>(matcher) {}
+
+  template <typename From>
+  bool MatchAndExplain(From from, MatchResultListener* listener) const {
+    To to = dynamic_cast<To>(from);
+    return MatchPrintAndExplain(to, this->matcher_, listener);
+  }
+};
+
+// Specialize for references.
+// In this case we return false if the dynamic_cast fails.
+template <typename To>
+class WhenDynamicCastToMatcher<To&> : public WhenDynamicCastToMatcherBase<To&> {
+ public:
+  explicit WhenDynamicCastToMatcher(const Matcher<To&>& matcher)
+      : WhenDynamicCastToMatcherBase<To&>(matcher) {}
+
+  template <typename From>
+  bool MatchAndExplain(From& from, MatchResultListener* listener) const {
+    // We don't want an std::bad_cast here, so do the cast with pointers.
+    To* to = dynamic_cast<To*>(&from);
+    if (to == nullptr) {
+      *listener << "which cannot be dynamic_cast to " << this->GetToName();
+      return false;
+    }
+    return MatchPrintAndExplain(*to, this->matcher_, listener);
+  }
+};
+#endif  // GTEST_HAS_RTTI
+
+// Implements the Field() matcher for matching a field (i.e. member
+// variable) of an object.
+template <typename Class, typename FieldType>
+class FieldMatcher {
+ public:
+  FieldMatcher(FieldType Class::*field,
+               const Matcher<const FieldType&>& matcher)
+      : field_(field), matcher_(matcher), whose_field_("whose given field ") {}
+
+  FieldMatcher(const std::string& field_name, FieldType Class::*field,
+               const Matcher<const FieldType&>& matcher)
+      : field_(field),
+        matcher_(matcher),
+        whose_field_("whose field `" + field_name + "` ") {}
+
+  void DescribeTo(::std::ostream* os) const {
+    *os << "is an object " << whose_field_;
+    matcher_.DescribeTo(os);
+  }
+
+  void DescribeNegationTo(::std::ostream* os) const {
+    *os << "is an object " << whose_field_;
+    matcher_.DescribeNegationTo(os);
+  }
+
+  template <typename T>
+  bool MatchAndExplain(const T& value, MatchResultListener* listener) const {
+    // FIXME: The dispatch on std::is_pointer was introduced as a workaround for
+    // a compiler bug, and can now be removed.
+    return MatchAndExplainImpl(
+        typename std::is_pointer<typename std::remove_const<T>::type>::type(),
+        value, listener);
+  }
+
+ private:
+  bool MatchAndExplainImpl(std::false_type /* is_not_pointer */,
+                           const Class& obj,
+                           MatchResultListener* listener) const {
+    *listener << whose_field_ << "is ";
+    return MatchPrintAndExplain(obj.*field_, matcher_, listener);
+  }
+
+  bool MatchAndExplainImpl(std::true_type /* is_pointer */, const Class* p,
+                           MatchResultListener* listener) const {
+    if (p == nullptr) return false;
+
+    *listener << "which points to an object ";
+    // Since *p has a field, it must be a class/struct/union type and
+    // thus cannot be a pointer.  Therefore we pass false_type() as
+    // the first argument.
+    return MatchAndExplainImpl(std::false_type(), *p, listener);
+  }
+
+  const FieldType Class::*field_;
+  const Matcher<const FieldType&> matcher_;
+
+  // Contains either "whose given field " if the name of the field is unknown
+  // or "whose field `name_of_field` " if the name is known.
+  const std::string whose_field_;
+};
+
+// Implements the Property() matcher for matching a property
+// (i.e. return value of a getter method) of an object.
+//
+// Property is a const-qualified member function of Class returning
+// PropertyType.
+template <typename Class, typename PropertyType, typename Property>
+class PropertyMatcher {
+ public:
+  typedef const PropertyType& RefToConstProperty;
+
+  PropertyMatcher(Property property, const Matcher<RefToConstProperty>& matcher)
+      : property_(property),
+        matcher_(matcher),
+        whose_property_("whose given property ") {}
+
+  PropertyMatcher(const std::string& property_name, Property property,
+                  const Matcher<RefToConstProperty>& matcher)
+      : property_(property),
+        matcher_(matcher),
+        whose_property_("whose property `" + property_name + "` ") {}
+
+  void DescribeTo(::std::ostream* os) const {
+    *os << "is an object " << whose_property_;
+    matcher_.DescribeTo(os);
+  }
+
+  void DescribeNegationTo(::std::ostream* os) const {
+    *os << "is an object " << whose_property_;
+    matcher_.DescribeNegationTo(os);
+  }
+
+  template <typename T>
+  bool MatchAndExplain(const T&value, MatchResultListener* listener) const {
+    return MatchAndExplainImpl(
+        typename std::is_pointer<typename std::remove_const<T>::type>::type(),
+        value, listener);
+  }
+
+ private:
+  bool MatchAndExplainImpl(std::false_type /* is_not_pointer */,
+                           const Class& obj,
+                           MatchResultListener* listener) const {
+    *listener << whose_property_ << "is ";
+    // Cannot pass the return value (for example, int) to MatchPrintAndExplain,
+    // which takes a non-const reference as argument.
+    RefToConstProperty result = (obj.*property_)();
+    return MatchPrintAndExplain(result, matcher_, listener);
+  }
+
+  bool MatchAndExplainImpl(std::true_type /* is_pointer */, const Class* p,
+                           MatchResultListener* listener) const {
+    if (p == nullptr) return false;
+
+    *listener << "which points to an object ";
+    // Since *p has a property method, it must be a class/struct/union
+    // type and thus cannot be a pointer.  Therefore we pass
+    // false_type() as the first argument.
+    return MatchAndExplainImpl(std::false_type(), *p, listener);
+  }
+
+  Property property_;
+  const Matcher<RefToConstProperty> matcher_;
+
+  // Contains either "whose given property " if the name of the property is
+  // unknown or "whose property `name_of_property` " if the name is known.
+  const std::string whose_property_;
+};
+
+// Type traits specifying various features of different functors for ResultOf.
+// The default template specifies features for functor objects.
+template <typename Functor>
+struct CallableTraits {
+  typedef Functor StorageType;
+
+  static void CheckIsValid(Functor /* functor */) {}
+
+  template <typename T>
+  static auto Invoke(Functor f, const T& arg) -> decltype(f(arg)) {
+    return f(arg);
+  }
+};
+
+// Specialization for function pointers.
+template <typename ArgType, typename ResType>
+struct CallableTraits<ResType(*)(ArgType)> {
+  typedef ResType ResultType;
+  typedef ResType(*StorageType)(ArgType);
+
+  static void CheckIsValid(ResType(*f)(ArgType)) {
+    GTEST_CHECK_(f != nullptr)
+        << "NULL function pointer is passed into ResultOf().";
+  }
+  template <typename T>
+  static ResType Invoke(ResType(*f)(ArgType), T arg) {
+    return (*f)(arg);
+  }
+};
+
+// Implements the ResultOf() matcher for matching a return value of a
+// unary function of an object.
+template <typename Callable, typename InnerMatcher>
+class ResultOfMatcher {
+ public:
+  ResultOfMatcher(Callable callable, InnerMatcher matcher)
+      : callable_(std::move(callable)), matcher_(std::move(matcher)) {
+    CallableTraits<Callable>::CheckIsValid(callable_);
+  }
+
+  template <typename T>
+  operator Matcher<T>() const {
+    return Matcher<T>(new Impl<const T&>(callable_, matcher_));
+  }
+
+ private:
+  typedef typename CallableTraits<Callable>::StorageType CallableStorageType;
+
+  template <typename T>
+  class Impl : public MatcherInterface<T> {
+    using ResultType = decltype(CallableTraits<Callable>::template Invoke<T>(
+        std::declval<CallableStorageType>(), std::declval<T>()));
+
+   public:
+    template <typename M>
+    Impl(const CallableStorageType& callable, const M& matcher)
+        : callable_(callable), matcher_(MatcherCast<ResultType>(matcher)) {}
+
+    void DescribeTo(::std::ostream* os) const override {
+      *os << "is mapped by the given callable to a value that ";
+      matcher_.DescribeTo(os);
+    }
+
+    void DescribeNegationTo(::std::ostream* os) const override {
+      *os << "is mapped by the given callable to a value that ";
+      matcher_.DescribeNegationTo(os);
+    }
+
+    bool MatchAndExplain(T obj, MatchResultListener* listener) const override {
+      *listener << "which is mapped by the given callable to ";
+      // Cannot pass the return value directly to MatchPrintAndExplain, which
+      // takes a non-const reference as argument.
+      // Also, specifying template argument explicitly is needed because T could
+      // be a non-const reference (e.g. Matcher<Uncopyable&>).
+      ResultType result =
+          CallableTraits<Callable>::template Invoke<T>(callable_, obj);
+      return MatchPrintAndExplain(result, matcher_, listener);
+    }
+
+   private:
+    // Functors often define operator() as non-const method even though
+    // they are actually stateless. But we need to use them even when
+    // 'this' is a const pointer. It's the user's responsibility not to
+    // use stateful callables with ResultOf(), which doesn't guarantee
+    // how many times the callable will be invoked.
+    mutable CallableStorageType callable_;
+    const Matcher<ResultType> matcher_;
+  };  // class Impl
+
+  const CallableStorageType callable_;
+  const InnerMatcher matcher_;
+};
+
+// Implements a matcher that checks the size of an STL-style container.
+template <typename SizeMatcher>
+class SizeIsMatcher {
+ public:
+  explicit SizeIsMatcher(const SizeMatcher& size_matcher)
+       : size_matcher_(size_matcher) {
+  }
+
+  template <typename Container>
+  operator Matcher<Container>() const {
+    return Matcher<Container>(new Impl<const Container&>(size_matcher_));
+  }
+
+  template <typename Container>
+  class Impl : public MatcherInterface<Container> {
+   public:
+    using SizeType = decltype(std::declval<Container>().size());
+    explicit Impl(const SizeMatcher& size_matcher)
+        : size_matcher_(MatcherCast<SizeType>(size_matcher)) {}
+
+    void DescribeTo(::std::ostream* os) const override {
+      *os << "size ";
+      size_matcher_.DescribeTo(os);
+    }
+    void DescribeNegationTo(::std::ostream* os) const override {
+      *os << "size ";
+      size_matcher_.DescribeNegationTo(os);
+    }
+
+    bool MatchAndExplain(Container container,
+                         MatchResultListener* listener) const override {
+      SizeType size = container.size();
+      StringMatchResultListener size_listener;
+      const bool result = size_matcher_.MatchAndExplain(size, &size_listener);
+      *listener
+          << "whose size " << size << (result ? " matches" : " doesn't match");
+      PrintIfNotEmpty(size_listener.str(), listener->stream());
+      return result;
+    }
+
+   private:
+    const Matcher<SizeType> size_matcher_;
+  };
+
+ private:
+  const SizeMatcher size_matcher_;
+};
+
+// Implements a matcher that checks the begin()..end() distance of an STL-style
+// container.
+template <typename DistanceMatcher>
+class BeginEndDistanceIsMatcher {
+ public:
+  explicit BeginEndDistanceIsMatcher(const DistanceMatcher& distance_matcher)
+      : distance_matcher_(distance_matcher) {}
+
+  template <typename Container>
+  operator Matcher<Container>() const {
+    return Matcher<Container>(new Impl<const Container&>(distance_matcher_));
+  }
+
+  template <typename Container>
+  class Impl : public MatcherInterface<Container> {
+   public:
+    typedef internal::StlContainerView<
+        GTEST_REMOVE_REFERENCE_AND_CONST_(Container)> ContainerView;
+    typedef typename std::iterator_traits<
+        typename ContainerView::type::const_iterator>::difference_type
+        DistanceType;
+    explicit Impl(const DistanceMatcher& distance_matcher)
+        : distance_matcher_(MatcherCast<DistanceType>(distance_matcher)) {}
+
+    void DescribeTo(::std::ostream* os) const override {
+      *os << "distance between begin() and end() ";
+      distance_matcher_.DescribeTo(os);
+    }
+    void DescribeNegationTo(::std::ostream* os) const override {
+      *os << "distance between begin() and end() ";
+      distance_matcher_.DescribeNegationTo(os);
+    }
+
+    bool MatchAndExplain(Container container,
+                         MatchResultListener* listener) const override {
+      using std::begin;
+      using std::end;
+      DistanceType distance = std::distance(begin(container), end(container));
+      StringMatchResultListener distance_listener;
+      const bool result =
+          distance_matcher_.MatchAndExplain(distance, &distance_listener);
+      *listener << "whose distance between begin() and end() " << distance
+                << (result ? " matches" : " doesn't match");
+      PrintIfNotEmpty(distance_listener.str(), listener->stream());
+      return result;
+    }
+
+   private:
+    const Matcher<DistanceType> distance_matcher_;
+  };
+
+ private:
+  const DistanceMatcher distance_matcher_;
+};
+
+// Implements an equality matcher for any STL-style container whose elements
+// support ==. This matcher is like Eq(), but its failure explanations provide
+// more detailed information that is useful when the container is used as a set.
+// The failure message reports elements that are in one of the operands but not
+// the other. The failure messages do not report duplicate or out-of-order
+// elements in the containers (which don't properly matter to sets, but can
+// occur if the containers are vectors or lists, for example).
+//
+// Uses the container's const_iterator, value_type, operator ==,
+// begin(), and end().
+template <typename Container>
+class ContainerEqMatcher {
+ public:
+  typedef internal::StlContainerView<Container> View;
+  typedef typename View::type StlContainer;
+  typedef typename View::const_reference StlContainerReference;
+
+  static_assert(!std::is_const<Container>::value,
+                "Container type must not be const");
+  static_assert(!std::is_reference<Container>::value,
+                "Container type must not be a reference");
+
+  // We make a copy of expected in case the elements in it are modified
+  // after this matcher is created.
+  explicit ContainerEqMatcher(const Container& expected)
+      : expected_(View::Copy(expected)) {}
+
+  void DescribeTo(::std::ostream* os) const {
+    *os << "equals ";
+    UniversalPrint(expected_, os);
+  }
+  void DescribeNegationTo(::std::ostream* os) const {
+    *os << "does not equal ";
+    UniversalPrint(expected_, os);
+  }
+
+  template <typename LhsContainer>
+  bool MatchAndExplain(const LhsContainer& lhs,
+                       MatchResultListener* listener) const {
+    typedef internal::StlContainerView<
+        typename std::remove_const<LhsContainer>::type>
+        LhsView;
+    typedef typename LhsView::type LhsStlContainer;
+    StlContainerReference lhs_stl_container = LhsView::ConstReference(lhs);
+    if (lhs_stl_container == expected_)
+      return true;
+
+    ::std::ostream* const os = listener->stream();
+    if (os != nullptr) {
+      // Something is different. Check for extra values first.
+      bool printed_header = false;
+      for (typename LhsStlContainer::const_iterator it =
+               lhs_stl_container.begin();
+           it != lhs_stl_container.end(); ++it) {
+        if (internal::ArrayAwareFind(expected_.begin(), expected_.end(), *it) ==
+            expected_.end()) {
+          if (printed_header) {
+            *os << ", ";
+          } else {
+            *os << "which has these unexpected elements: ";
+            printed_header = true;
+          }
+          UniversalPrint(*it, os);
+        }
+      }
+
+      // Now check for missing values.
+      bool printed_header2 = false;
+      for (typename StlContainer::const_iterator it = expected_.begin();
+           it != expected_.end(); ++it) {
+        if (internal::ArrayAwareFind(
+                lhs_stl_container.begin(), lhs_stl_container.end(), *it) ==
+            lhs_stl_container.end()) {
+          if (printed_header2) {
+            *os << ", ";
+          } else {
+            *os << (printed_header ? ",\nand" : "which")
+                << " doesn't have these expected elements: ";
+            printed_header2 = true;
+          }
+          UniversalPrint(*it, os);
+        }
+      }
+    }
+
+    return false;
+  }
+
+ private:
+  const StlContainer expected_;
+};
+
+// A comparator functor that uses the < operator to compare two values.
+struct LessComparator {
+  template <typename T, typename U>
+  bool operator()(const T& lhs, const U& rhs) const { return lhs < rhs; }
+};
+
+// Implements WhenSortedBy(comparator, container_matcher).
+template <typename Comparator, typename ContainerMatcher>
+class WhenSortedByMatcher {
+ public:
+  WhenSortedByMatcher(const Comparator& comparator,
+                      const ContainerMatcher& matcher)
+      : comparator_(comparator), matcher_(matcher) {}
+
+  template <typename LhsContainer>
+  operator Matcher<LhsContainer>() const {
+    return MakeMatcher(new Impl<LhsContainer>(comparator_, matcher_));
+  }
+
+  template <typename LhsContainer>
+  class Impl : public MatcherInterface<LhsContainer> {
+   public:
+    typedef internal::StlContainerView<
+         GTEST_REMOVE_REFERENCE_AND_CONST_(LhsContainer)> LhsView;
+    typedef typename LhsView::type LhsStlContainer;
+    typedef typename LhsView::const_reference LhsStlContainerReference;
+    // Transforms std::pair<const Key, Value> into std::pair<Key, Value>
+    // so that we can match associative containers.
+    typedef typename RemoveConstFromKey<
+        typename LhsStlContainer::value_type>::type LhsValue;
+
+    Impl(const Comparator& comparator, const ContainerMatcher& matcher)
+        : comparator_(comparator), matcher_(matcher) {}
+
+    void DescribeTo(::std::ostream* os) const override {
+      *os << "(when sorted) ";
+      matcher_.DescribeTo(os);
+    }
+
+    void DescribeNegationTo(::std::ostream* os) const override {
+      *os << "(when sorted) ";
+      matcher_.DescribeNegationTo(os);
+    }
+
+    bool MatchAndExplain(LhsContainer lhs,
+                         MatchResultListener* listener) const override {
+      LhsStlContainerReference lhs_stl_container = LhsView::ConstReference(lhs);
+      ::std::vector<LhsValue> sorted_container(lhs_stl_container.begin(),
+                                               lhs_stl_container.end());
+      ::std::sort(
+           sorted_container.begin(), sorted_container.end(), comparator_);
+
+      if (!listener->IsInterested()) {
+        // If the listener is not interested, we do not need to
+        // construct the inner explanation.
+        return matcher_.Matches(sorted_container);
+      }
+
+      *listener << "which is ";
+      UniversalPrint(sorted_container, listener->stream());
+      *listener << " when sorted";
+
+      StringMatchResultListener inner_listener;
+      const bool match = matcher_.MatchAndExplain(sorted_container,
+                                                  &inner_listener);
+      PrintIfNotEmpty(inner_listener.str(), listener->stream());
+      return match;
+    }
+
+   private:
+    const Comparator comparator_;
+    const Matcher<const ::std::vector<LhsValue>&> matcher_;
+
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(Impl);
+  };
+
+ private:
+  const Comparator comparator_;
+  const ContainerMatcher matcher_;
+};
+
+// Implements Pointwise(tuple_matcher, rhs_container).  tuple_matcher
+// must be able to be safely cast to Matcher<std::tuple<const T1&, const
+// T2&> >, where T1 and T2 are the types of elements in the LHS
+// container and the RHS container respectively.
+template <typename TupleMatcher, typename RhsContainer>
+class PointwiseMatcher {
+  GTEST_COMPILE_ASSERT_(
+      !IsHashTable<GTEST_REMOVE_REFERENCE_AND_CONST_(RhsContainer)>::value,
+      use_UnorderedPointwise_with_hash_tables);
+
+ public:
+  typedef internal::StlContainerView<RhsContainer> RhsView;
+  typedef typename RhsView::type RhsStlContainer;
+  typedef typename RhsStlContainer::value_type RhsValue;
+
+  static_assert(!std::is_const<RhsContainer>::value,
+                "RhsContainer type must not be const");
+  static_assert(!std::is_reference<RhsContainer>::value,
+                "RhsContainer type must not be a reference");
+
+  // Like ContainerEq, we make a copy of rhs in case the elements in
+  // it are modified after this matcher is created.
+  PointwiseMatcher(const TupleMatcher& tuple_matcher, const RhsContainer& rhs)
+      : tuple_matcher_(tuple_matcher), rhs_(RhsView::Copy(rhs)) {}
+
+  template <typename LhsContainer>
+  operator Matcher<LhsContainer>() const {
+    GTEST_COMPILE_ASSERT_(
+        !IsHashTable<GTEST_REMOVE_REFERENCE_AND_CONST_(LhsContainer)>::value,
+        use_UnorderedPointwise_with_hash_tables);
+
+    return Matcher<LhsContainer>(
+        new Impl<const LhsContainer&>(tuple_matcher_, rhs_));
+  }
+
+  template <typename LhsContainer>
+  class Impl : public MatcherInterface<LhsContainer> {
+   public:
+    typedef internal::StlContainerView<
+         GTEST_REMOVE_REFERENCE_AND_CONST_(LhsContainer)> LhsView;
+    typedef typename LhsView::type LhsStlContainer;
+    typedef typename LhsView::const_reference LhsStlContainerReference;
+    typedef typename LhsStlContainer::value_type LhsValue;
+    // We pass the LHS value and the RHS value to the inner matcher by
+    // reference, as they may be expensive to copy.  We must use tuple
+    // instead of pair here, as a pair cannot hold references (C++ 98,
+    // 20.2.2 [lib.pairs]).
+    typedef ::std::tuple<const LhsValue&, const RhsValue&> InnerMatcherArg;
+
+    Impl(const TupleMatcher& tuple_matcher, const RhsStlContainer& rhs)
+        // mono_tuple_matcher_ holds a monomorphic version of the tuple matcher.
+        : mono_tuple_matcher_(SafeMatcherCast<InnerMatcherArg>(tuple_matcher)),
+          rhs_(rhs) {}
+
+    void DescribeTo(::std::ostream* os) const override {
+      *os << "contains " << rhs_.size()
+          << " values, where each value and its corresponding value in ";
+      UniversalPrinter<RhsStlContainer>::Print(rhs_, os);
+      *os << " ";
+      mono_tuple_matcher_.DescribeTo(os);
+    }
+    void DescribeNegationTo(::std::ostream* os) const override {
+      *os << "doesn't contain exactly " << rhs_.size()
+          << " values, or contains a value x at some index i"
+          << " where x and the i-th value of ";
+      UniversalPrint(rhs_, os);
+      *os << " ";
+      mono_tuple_matcher_.DescribeNegationTo(os);
+    }
+
+    bool MatchAndExplain(LhsContainer lhs,
+                         MatchResultListener* listener) const override {
+      LhsStlContainerReference lhs_stl_container = LhsView::ConstReference(lhs);
+      const size_t actual_size = lhs_stl_container.size();
+      if (actual_size != rhs_.size()) {
+        *listener << "which contains " << actual_size << " values";
+        return false;
+      }
+
+      typename LhsStlContainer::const_iterator left = lhs_stl_container.begin();
+      typename RhsStlContainer::const_iterator right = rhs_.begin();
+      for (size_t i = 0; i != actual_size; ++i, ++left, ++right) {
+        if (listener->IsInterested()) {
+          StringMatchResultListener inner_listener;
+          // Create InnerMatcherArg as a temporarily object to avoid it outlives
+          // *left and *right. Dereference or the conversion to `const T&` may
+          // return temp objects, e.g for vector<bool>.
+          if (!mono_tuple_matcher_.MatchAndExplain(
+                  InnerMatcherArg(ImplicitCast_<const LhsValue&>(*left),
+                                  ImplicitCast_<const RhsValue&>(*right)),
+                  &inner_listener)) {
+            *listener << "where the value pair (";
+            UniversalPrint(*left, listener->stream());
+            *listener << ", ";
+            UniversalPrint(*right, listener->stream());
+            *listener << ") at index #" << i << " don't match";
+            PrintIfNotEmpty(inner_listener.str(), listener->stream());
+            return false;
+          }
+        } else {
+          if (!mono_tuple_matcher_.Matches(
+                  InnerMatcherArg(ImplicitCast_<const LhsValue&>(*left),
+                                  ImplicitCast_<const RhsValue&>(*right))))
+            return false;
+        }
+      }
+
+      return true;
+    }
+
+   private:
+    const Matcher<InnerMatcherArg> mono_tuple_matcher_;
+    const RhsStlContainer rhs_;
+  };
+
+ private:
+  const TupleMatcher tuple_matcher_;
+  const RhsStlContainer rhs_;
+};
+
+// Holds the logic common to ContainsMatcherImpl and EachMatcherImpl.
+template <typename Container>
+class QuantifierMatcherImpl : public MatcherInterface<Container> {
+ public:
+  typedef GTEST_REMOVE_REFERENCE_AND_CONST_(Container) RawContainer;
+  typedef StlContainerView<RawContainer> View;
+  typedef typename View::type StlContainer;
+  typedef typename View::const_reference StlContainerReference;
+  typedef typename StlContainer::value_type Element;
+
+  template <typename InnerMatcher>
+  explicit QuantifierMatcherImpl(InnerMatcher inner_matcher)
+      : inner_matcher_(
+           testing::SafeMatcherCast<const Element&>(inner_matcher)) {}
+
+  // Checks whether:
+  // * All elements in the container match, if all_elements_should_match.
+  // * Any element in the container matches, if !all_elements_should_match.
+  bool MatchAndExplainImpl(bool all_elements_should_match,
+                           Container container,
+                           MatchResultListener* listener) const {
+    StlContainerReference stl_container = View::ConstReference(container);
+    size_t i = 0;
+    for (typename StlContainer::const_iterator it = stl_container.begin();
+         it != stl_container.end(); ++it, ++i) {
+      StringMatchResultListener inner_listener;
+      const bool matches = inner_matcher_.MatchAndExplain(*it, &inner_listener);
+
+      if (matches != all_elements_should_match) {
+        *listener << "whose element #" << i
+                  << (matches ? " matches" : " doesn't match");
+        PrintIfNotEmpty(inner_listener.str(), listener->stream());
+        return !all_elements_should_match;
+      }
+    }
+    return all_elements_should_match;
+  }
+
+ protected:
+  const Matcher<const Element&> inner_matcher_;
+};
+
+// Implements Contains(element_matcher) for the given argument type Container.
+// Symmetric to EachMatcherImpl.
+template <typename Container>
+class ContainsMatcherImpl : public QuantifierMatcherImpl<Container> {
+ public:
+  template <typename InnerMatcher>
+  explicit ContainsMatcherImpl(InnerMatcher inner_matcher)
+      : QuantifierMatcherImpl<Container>(inner_matcher) {}
+
+  // Describes what this matcher does.
+  void DescribeTo(::std::ostream* os) const override {
+    *os << "contains at least one element that ";
+    this->inner_matcher_.DescribeTo(os);
+  }
+
+  void DescribeNegationTo(::std::ostream* os) const override {
+    *os << "doesn't contain any element that ";
+    this->inner_matcher_.DescribeTo(os);
+  }
+
+  bool MatchAndExplain(Container container,
+                       MatchResultListener* listener) const override {
+    return this->MatchAndExplainImpl(false, container, listener);
+  }
+};
+
+// Implements Each(element_matcher) for the given argument type Container.
+// Symmetric to ContainsMatcherImpl.
+template <typename Container>
+class EachMatcherImpl : public QuantifierMatcherImpl<Container> {
+ public:
+  template <typename InnerMatcher>
+  explicit EachMatcherImpl(InnerMatcher inner_matcher)
+      : QuantifierMatcherImpl<Container>(inner_matcher) {}
+
+  // Describes what this matcher does.
+  void DescribeTo(::std::ostream* os) const override {
+    *os << "only contains elements that ";
+    this->inner_matcher_.DescribeTo(os);
+  }
+
+  void DescribeNegationTo(::std::ostream* os) const override {
+    *os << "contains some element that ";
+    this->inner_matcher_.DescribeNegationTo(os);
+  }
+
+  bool MatchAndExplain(Container container,
+                       MatchResultListener* listener) const override {
+    return this->MatchAndExplainImpl(true, container, listener);
+  }
+};
+
+// Implements polymorphic Contains(element_matcher).
+template <typename M>
+class ContainsMatcher {
+ public:
+  explicit ContainsMatcher(M m) : inner_matcher_(m) {}
+
+  template <typename Container>
+  operator Matcher<Container>() const {
+    return Matcher<Container>(
+        new ContainsMatcherImpl<const Container&>(inner_matcher_));
+  }
+
+ private:
+  const M inner_matcher_;
+};
+
+// Implements polymorphic Each(element_matcher).
+template <typename M>
+class EachMatcher {
+ public:
+  explicit EachMatcher(M m) : inner_matcher_(m) {}
+
+  template <typename Container>
+  operator Matcher<Container>() const {
+    return Matcher<Container>(
+        new EachMatcherImpl<const Container&>(inner_matcher_));
+  }
+
+ private:
+  const M inner_matcher_;
+};
+
+struct Rank1 {};
+struct Rank0 : Rank1 {};
+
+namespace pair_getters {
+using std::get;
+template <typename T>
+auto First(T& x, Rank1) -> decltype(get<0>(x)) {  // NOLINT
+  return get<0>(x);
+}
+template <typename T>
+auto First(T& x, Rank0) -> decltype((x.first)) {  // NOLINT
+  return x.first;
+}
+
+template <typename T>
+auto Second(T& x, Rank1) -> decltype(get<1>(x)) {  // NOLINT
+  return get<1>(x);
+}
+template <typename T>
+auto Second(T& x, Rank0) -> decltype((x.second)) {  // NOLINT
+  return x.second;
+}
+}  // namespace pair_getters
+
+// Implements Key(inner_matcher) for the given argument pair type.
+// Key(inner_matcher) matches an std::pair whose 'first' field matches
+// inner_matcher.  For example, Contains(Key(Ge(5))) can be used to match an
+// std::map that contains at least one element whose key is >= 5.
+template <typename PairType>
+class KeyMatcherImpl : public MatcherInterface<PairType> {
+ public:
+  typedef GTEST_REMOVE_REFERENCE_AND_CONST_(PairType) RawPairType;
+  typedef typename RawPairType::first_type KeyType;
+
+  template <typename InnerMatcher>
+  explicit KeyMatcherImpl(InnerMatcher inner_matcher)
+      : inner_matcher_(
+          testing::SafeMatcherCast<const KeyType&>(inner_matcher)) {
+  }
+
+  // Returns true if and only if 'key_value.first' (the key) matches the inner
+  // matcher.
+  bool MatchAndExplain(PairType key_value,
+                       MatchResultListener* listener) const override {
+    StringMatchResultListener inner_listener;
+    const bool match = inner_matcher_.MatchAndExplain(
+        pair_getters::First(key_value, Rank0()), &inner_listener);
+    const std::string explanation = inner_listener.str();
+    if (explanation != "") {
+      *listener << "whose first field is a value " << explanation;
+    }
+    return match;
+  }
+
+  // Describes what this matcher does.
+  void DescribeTo(::std::ostream* os) const override {
+    *os << "has a key that ";
+    inner_matcher_.DescribeTo(os);
+  }
+
+  // Describes what the negation of this matcher does.
+  void DescribeNegationTo(::std::ostream* os) const override {
+    *os << "doesn't have a key that ";
+    inner_matcher_.DescribeTo(os);
+  }
+
+ private:
+  const Matcher<const KeyType&> inner_matcher_;
+};
+
+// Implements polymorphic Key(matcher_for_key).
+template <typename M>
+class KeyMatcher {
+ public:
+  explicit KeyMatcher(M m) : matcher_for_key_(m) {}
+
+  template <typename PairType>
+  operator Matcher<PairType>() const {
+    return Matcher<PairType>(
+        new KeyMatcherImpl<const PairType&>(matcher_for_key_));
+  }
+
+ private:
+  const M matcher_for_key_;
+};
+
+// Implements polymorphic Address(matcher_for_address).
+template <typename InnerMatcher>
+class AddressMatcher {
+ public:
+  explicit AddressMatcher(InnerMatcher m) : matcher_(m) {}
+
+  template <typename Type>
+  operator Matcher<Type>() const {  // NOLINT
+    return Matcher<Type>(new Impl<const Type&>(matcher_));
+  }
+
+ private:
+  // The monomorphic implementation that works for a particular object type.
+  template <typename Type>
+  class Impl : public MatcherInterface<Type> {
+   public:
+    using Address = const GTEST_REMOVE_REFERENCE_AND_CONST_(Type) *;
+    explicit Impl(const InnerMatcher& matcher)
+        : matcher_(MatcherCast<Address>(matcher)) {}
+
+    void DescribeTo(::std::ostream* os) const override {
+      *os << "has address that ";
+      matcher_.DescribeTo(os);
+    }
+
+    void DescribeNegationTo(::std::ostream* os) const override {
+      *os << "does not have address that ";
+      matcher_.DescribeTo(os);
+    }
+
+    bool MatchAndExplain(Type object,
+                         MatchResultListener* listener) const override {
+      *listener << "which has address ";
+      Address address = std::addressof(object);
+      return MatchPrintAndExplain(address, matcher_, listener);
+    }
+
+   private:
+    const Matcher<Address> matcher_;
+  };
+  const InnerMatcher matcher_;
+};
+
+// Implements Pair(first_matcher, second_matcher) for the given argument pair
+// type with its two matchers. See Pair() function below.
+template <typename PairType>
+class PairMatcherImpl : public MatcherInterface<PairType> {
+ public:
+  typedef GTEST_REMOVE_REFERENCE_AND_CONST_(PairType) RawPairType;
+  typedef typename RawPairType::first_type FirstType;
+  typedef typename RawPairType::second_type SecondType;
+
+  template <typename FirstMatcher, typename SecondMatcher>
+  PairMatcherImpl(FirstMatcher first_matcher, SecondMatcher second_matcher)
+      : first_matcher_(
+            testing::SafeMatcherCast<const FirstType&>(first_matcher)),
+        second_matcher_(
+            testing::SafeMatcherCast<const SecondType&>(second_matcher)) {
+  }
+
+  // Describes what this matcher does.
+  void DescribeTo(::std::ostream* os) const override {
+    *os << "has a first field that ";
+    first_matcher_.DescribeTo(os);
+    *os << ", and has a second field that ";
+    second_matcher_.DescribeTo(os);
+  }
+
+  // Describes what the negation of this matcher does.
+  void DescribeNegationTo(::std::ostream* os) const override {
+    *os << "has a first field that ";
+    first_matcher_.DescribeNegationTo(os);
+    *os << ", or has a second field that ";
+    second_matcher_.DescribeNegationTo(os);
+  }
+
+  // Returns true if and only if 'a_pair.first' matches first_matcher and
+  // 'a_pair.second' matches second_matcher.
+  bool MatchAndExplain(PairType a_pair,
+                       MatchResultListener* listener) const override {
+    if (!listener->IsInterested()) {
+      // If the listener is not interested, we don't need to construct the
+      // explanation.
+      return first_matcher_.Matches(pair_getters::First(a_pair, Rank0())) &&
+             second_matcher_.Matches(pair_getters::Second(a_pair, Rank0()));
+    }
+    StringMatchResultListener first_inner_listener;
+    if (!first_matcher_.MatchAndExplain(pair_getters::First(a_pair, Rank0()),
+                                        &first_inner_listener)) {
+      *listener << "whose first field does not match";
+      PrintIfNotEmpty(first_inner_listener.str(), listener->stream());
+      return false;
+    }
+    StringMatchResultListener second_inner_listener;
+    if (!second_matcher_.MatchAndExplain(pair_getters::Second(a_pair, Rank0()),
+                                         &second_inner_listener)) {
+      *listener << "whose second field does not match";
+      PrintIfNotEmpty(second_inner_listener.str(), listener->stream());
+      return false;
+    }
+    ExplainSuccess(first_inner_listener.str(), second_inner_listener.str(),
+                   listener);
+    return true;
+  }
+
+ private:
+  void ExplainSuccess(const std::string& first_explanation,
+                      const std::string& second_explanation,
+                      MatchResultListener* listener) const {
+    *listener << "whose both fields match";
+    if (first_explanation != "") {
+      *listener << ", where the first field is a value " << first_explanation;
+    }
+    if (second_explanation != "") {
+      *listener << ", ";
+      if (first_explanation != "") {
+        *listener << "and ";
+      } else {
+        *listener << "where ";
+      }
+      *listener << "the second field is a value " << second_explanation;
+    }
+  }
+
+  const Matcher<const FirstType&> first_matcher_;
+  const Matcher<const SecondType&> second_matcher_;
+};
+
+// Implements polymorphic Pair(first_matcher, second_matcher).
+template <typename FirstMatcher, typename SecondMatcher>
+class PairMatcher {
+ public:
+  PairMatcher(FirstMatcher first_matcher, SecondMatcher second_matcher)
+      : first_matcher_(first_matcher), second_matcher_(second_matcher) {}
+
+  template <typename PairType>
+  operator Matcher<PairType> () const {
+    return Matcher<PairType>(
+        new PairMatcherImpl<const PairType&>(first_matcher_, second_matcher_));
+  }
+
+ private:
+  const FirstMatcher first_matcher_;
+  const SecondMatcher second_matcher_;
+};
+
+template <typename T, size_t... I>
+auto UnpackStructImpl(const T& t, IndexSequence<I...>, int)
+    -> decltype(std::tie(get<I>(t)...)) {
+  static_assert(std::tuple_size<T>::value == sizeof...(I),
+                "Number of arguments doesn't match the number of fields.");
+  return std::tie(get<I>(t)...);
+}
+
+#if defined(__cpp_structured_bindings) && __cpp_structured_bindings >= 201606
+template <typename T>
+auto UnpackStructImpl(const T& t, MakeIndexSequence<1>, char) {
+  const auto& [a] = t;
+  return std::tie(a);
+}
+template <typename T>
+auto UnpackStructImpl(const T& t, MakeIndexSequence<2>, char) {
+  const auto& [a, b] = t;
+  return std::tie(a, b);
+}
+template <typename T>
+auto UnpackStructImpl(const T& t, MakeIndexSequence<3>, char) {
+  const auto& [a, b, c] = t;
+  return std::tie(a, b, c);
+}
+template <typename T>
+auto UnpackStructImpl(const T& t, MakeIndexSequence<4>, char) {
+  const auto& [a, b, c, d] = t;
+  return std::tie(a, b, c, d);
+}
+template <typename T>
+auto UnpackStructImpl(const T& t, MakeIndexSequence<5>, char) {
+  const auto& [a, b, c, d, e] = t;
+  return std::tie(a, b, c, d, e);
+}
+template <typename T>
+auto UnpackStructImpl(const T& t, MakeIndexSequence<6>, char) {
+  const auto& [a, b, c, d, e, f] = t;
+  return std::tie(a, b, c, d, e, f);
+}
+template <typename T>
+auto UnpackStructImpl(const T& t, MakeIndexSequence<7>, char) {
+  const auto& [a, b, c, d, e, f, g] = t;
+  return std::tie(a, b, c, d, e, f, g);
+}
+template <typename T>
+auto UnpackStructImpl(const T& t, MakeIndexSequence<8>, char) {
+  const auto& [a, b, c, d, e, f, g, h] = t;
+  return std::tie(a, b, c, d, e, f, g, h);
+}
+template <typename T>
+auto UnpackStructImpl(const T& t, MakeIndexSequence<9>, char) {
+  const auto& [a, b, c, d, e, f, g, h, i] = t;
+  return std::tie(a, b, c, d, e, f, g, h, i);
+}
+template <typename T>
+auto UnpackStructImpl(const T& t, MakeIndexSequence<10>, char) {
+  const auto& [a, b, c, d, e, f, g, h, i, j] = t;
+  return std::tie(a, b, c, d, e, f, g, h, i, j);
+}
+template <typename T>
+auto UnpackStructImpl(const T& t, MakeIndexSequence<11>, char) {
+  const auto& [a, b, c, d, e, f, g, h, i, j, k] = t;
+  return std::tie(a, b, c, d, e, f, g, h, i, j, k);
+}
+template <typename T>
+auto UnpackStructImpl(const T& t, MakeIndexSequence<12>, char) {
+  const auto& [a, b, c, d, e, f, g, h, i, j, k, l] = t;
+  return std::tie(a, b, c, d, e, f, g, h, i, j, k, l);
+}
+template <typename T>
+auto UnpackStructImpl(const T& t, MakeIndexSequence<13>, char) {
+  const auto& [a, b, c, d, e, f, g, h, i, j, k, l, m] = t;
+  return std::tie(a, b, c, d, e, f, g, h, i, j, k, l, m);
+}
+template <typename T>
+auto UnpackStructImpl(const T& t, MakeIndexSequence<14>, char) {
+  const auto& [a, b, c, d, e, f, g, h, i, j, k, l, m, n] = t;
+  return std::tie(a, b, c, d, e, f, g, h, i, j, k, l, m, n);
+}
+template <typename T>
+auto UnpackStructImpl(const T& t, MakeIndexSequence<15>, char) {
+  const auto& [a, b, c, d, e, f, g, h, i, j, k, l, m, n, o] = t;
+  return std::tie(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o);
+}
+template <typename T>
+auto UnpackStructImpl(const T& t, MakeIndexSequence<16>, char) {
+  const auto& [a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p] = t;
+  return std::tie(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p);
+}
+#endif  // defined(__cpp_structured_bindings)
+
+template <size_t I, typename T>
+auto UnpackStruct(const T& t)
+    -> decltype((UnpackStructImpl)(t, MakeIndexSequence<I>{}, 0)) {
+  return (UnpackStructImpl)(t, MakeIndexSequence<I>{}, 0);
+}
+
+// Helper function to do comma folding in C++11.
+// The array ensures left-to-right order of evaluation.
+// Usage: VariadicExpand({expr...});
+template <typename T, size_t N>
+void VariadicExpand(const T (&)[N]) {}
+
+template <typename Struct, typename StructSize>
+class FieldsAreMatcherImpl;
+
+template <typename Struct, size_t... I>
+class FieldsAreMatcherImpl<Struct, IndexSequence<I...>>
+    : public MatcherInterface<Struct> {
+  using UnpackedType =
+      decltype(UnpackStruct<sizeof...(I)>(std::declval<const Struct&>()));
+  using MatchersType = std::tuple<
+      Matcher<const typename std::tuple_element<I, UnpackedType>::type&>...>;
+
+ public:
+  template <typename Inner>
+  explicit FieldsAreMatcherImpl(const Inner& matchers)
+      : matchers_(testing::SafeMatcherCast<
+                  const typename std::tuple_element<I, UnpackedType>::type&>(
+            std::get<I>(matchers))...) {}
+
+  void DescribeTo(::std::ostream* os) const override {
+    const char* separator = "";
+    VariadicExpand(
+        {(*os << separator << "has field #" << I << " that ",
+          std::get<I>(matchers_).DescribeTo(os), separator = ", and ")...});
+  }
+
+  void DescribeNegationTo(::std::ostream* os) const override {
+    const char* separator = "";
+    VariadicExpand({(*os << separator << "has field #" << I << " that ",
+                     std::get<I>(matchers_).DescribeNegationTo(os),
+                     separator = ", or ")...});
+  }
+
+  bool MatchAndExplain(Struct t, MatchResultListener* listener) const override {
+    return MatchInternal((UnpackStruct<sizeof...(I)>)(t), listener);
+  }
+
+ private:
+  bool MatchInternal(UnpackedType tuple, MatchResultListener* listener) const {
+    if (!listener->IsInterested()) {
+      // If the listener is not interested, we don't need to construct the
+      // explanation.
+      bool good = true;
+      VariadicExpand({good = good && std::get<I>(matchers_).Matches(
+                                         std::get<I>(tuple))...});
+      return good;
+    }
+
+    size_t failed_pos = ~size_t{};
+
+    std::vector<StringMatchResultListener> inner_listener(sizeof...(I));
+
+    VariadicExpand(
+        {failed_pos == ~size_t{} && !std::get<I>(matchers_).MatchAndExplain(
+                                        std::get<I>(tuple), &inner_listener[I])
+             ? failed_pos = I
+             : 0 ...});
+    if (failed_pos != ~size_t{}) {
+      *listener << "whose field #" << failed_pos << " does not match";
+      PrintIfNotEmpty(inner_listener[failed_pos].str(), listener->stream());
+      return false;
+    }
+
+    *listener << "whose all elements match";
+    const char* separator = ", where";
+    for (size_t index = 0; index < sizeof...(I); ++index) {
+      const std::string str = inner_listener[index].str();
+      if (!str.empty()) {
+        *listener << separator << " field #" << index << " is a value " << str;
+        separator = ", and";
+      }
+    }
+
+    return true;
+  }
+
+  MatchersType matchers_;
+};
+
+template <typename... Inner>
+class FieldsAreMatcher {
+ public:
+  explicit FieldsAreMatcher(Inner... inner) : matchers_(std::move(inner)...) {}
+
+  template <typename Struct>
+  operator Matcher<Struct>() const {  // NOLINT
+    return Matcher<Struct>(
+        new FieldsAreMatcherImpl<const Struct&, IndexSequenceFor<Inner...>>(
+            matchers_));
+  }
+
+ private:
+  std::tuple<Inner...> matchers_;
+};
+
+// Implements ElementsAre() and ElementsAreArray().
+template <typename Container>
+class ElementsAreMatcherImpl : public MatcherInterface<Container> {
+ public:
+  typedef GTEST_REMOVE_REFERENCE_AND_CONST_(Container) RawContainer;
+  typedef internal::StlContainerView<RawContainer> View;
+  typedef typename View::type StlContainer;
+  typedef typename View::const_reference StlContainerReference;
+  typedef typename StlContainer::value_type Element;
+
+  // Constructs the matcher from a sequence of element values or
+  // element matchers.
+  template <typename InputIter>
+  ElementsAreMatcherImpl(InputIter first, InputIter last) {
+    while (first != last) {
+      matchers_.push_back(MatcherCast<const Element&>(*first++));
+    }
+  }
+
+  // Describes what this matcher does.
+  void DescribeTo(::std::ostream* os) const override {
+    if (count() == 0) {
+      *os << "is empty";
+    } else if (count() == 1) {
+      *os << "has 1 element that ";
+      matchers_[0].DescribeTo(os);
+    } else {
+      *os << "has " << Elements(count()) << " where\n";
+      for (size_t i = 0; i != count(); ++i) {
+        *os << "element #" << i << " ";
+        matchers_[i].DescribeTo(os);
+        if (i + 1 < count()) {
+          *os << ",\n";
+        }
+      }
+    }
+  }
+
+  // Describes what the negation of this matcher does.
+  void DescribeNegationTo(::std::ostream* os) const override {
+    if (count() == 0) {
+      *os << "isn't empty";
+      return;
+    }
+
+    *os << "doesn't have " << Elements(count()) << ", or\n";
+    for (size_t i = 0; i != count(); ++i) {
+      *os << "element #" << i << " ";
+      matchers_[i].DescribeNegationTo(os);
+      if (i + 1 < count()) {
+        *os << ", or\n";
+      }
+    }
+  }
+
+  bool MatchAndExplain(Container container,
+                       MatchResultListener* listener) const override {
+    // To work with stream-like "containers", we must only walk
+    // through the elements in one pass.
+
+    const bool listener_interested = listener->IsInterested();
+
+    // explanations[i] is the explanation of the element at index i.
+    ::std::vector<std::string> explanations(count());
+    StlContainerReference stl_container = View::ConstReference(container);
+    typename StlContainer::const_iterator it = stl_container.begin();
+    size_t exam_pos = 0;
+    bool mismatch_found = false;  // Have we found a mismatched element yet?
+
+    // Go through the elements and matchers in pairs, until we reach
+    // the end of either the elements or the matchers, or until we find a
+    // mismatch.
+    for (; it != stl_container.end() && exam_pos != count(); ++it, ++exam_pos) {
+      bool match;  // Does the current element match the current matcher?
+      if (listener_interested) {
+        StringMatchResultListener s;
+        match = matchers_[exam_pos].MatchAndExplain(*it, &s);
+        explanations[exam_pos] = s.str();
+      } else {
+        match = matchers_[exam_pos].Matches(*it);
+      }
+
+      if (!match) {
+        mismatch_found = true;
+        break;
+      }
+    }
+    // If mismatch_found is true, 'exam_pos' is the index of the mismatch.
+
+    // Find how many elements the actual container has.  We avoid
+    // calling size() s.t. this code works for stream-like "containers"
+    // that don't define size().
+    size_t actual_count = exam_pos;
+    for (; it != stl_container.end(); ++it) {
+      ++actual_count;
+    }
+
+    if (actual_count != count()) {
+      // The element count doesn't match.  If the container is empty,
+      // there's no need to explain anything as Google Mock already
+      // prints the empty container.  Otherwise we just need to show
+      // how many elements there actually are.
+      if (listener_interested && (actual_count != 0)) {
+        *listener << "which has " << Elements(actual_count);
+      }
+      return false;
+    }
+
+    if (mismatch_found) {
+      // The element count matches, but the exam_pos-th element doesn't match.
+      if (listener_interested) {
+        *listener << "whose element #" << exam_pos << " doesn't match";
+        PrintIfNotEmpty(explanations[exam_pos], listener->stream());
+      }
+      return false;
+    }
+
+    // Every element matches its expectation.  We need to explain why
+    // (the obvious ones can be skipped).
+    if (listener_interested) {
+      bool reason_printed = false;
+      for (size_t i = 0; i != count(); ++i) {
+        const std::string& s = explanations[i];
+        if (!s.empty()) {
+          if (reason_printed) {
+            *listener << ",\nand ";
+          }
+          *listener << "whose element #" << i << " matches, " << s;
+          reason_printed = true;
+        }
+      }
+    }
+    return true;
+  }
+
+ private:
+  static Message Elements(size_t count) {
+    return Message() << count << (count == 1 ? " element" : " elements");
+  }
+
+  size_t count() const { return matchers_.size(); }
+
+  ::std::vector<Matcher<const Element&> > matchers_;
+};
+
+// Connectivity matrix of (elements X matchers), in element-major order.
+// Initially, there are no edges.
+// Use NextGraph() to iterate over all possible edge configurations.
+// Use Randomize() to generate a random edge configuration.
+class GTEST_API_ MatchMatrix {
+ public:
+  MatchMatrix(size_t num_elements, size_t num_matchers)
+      : num_elements_(num_elements),
+        num_matchers_(num_matchers),
+        matched_(num_elements_* num_matchers_, 0) {
+  }
+
+  size_t LhsSize() const { return num_elements_; }
+  size_t RhsSize() const { return num_matchers_; }
+  bool HasEdge(size_t ilhs, size_t irhs) const {
+    return matched_[SpaceIndex(ilhs, irhs)] == 1;
+  }
+  void SetEdge(size_t ilhs, size_t irhs, bool b) {
+    matched_[SpaceIndex(ilhs, irhs)] = b ? 1 : 0;
+  }
+
+  // Treating the connectivity matrix as a (LhsSize()*RhsSize())-bit number,
+  // adds 1 to that number; returns false if incrementing the graph left it
+  // empty.
+  bool NextGraph();
+
+  void Randomize();
+
+  std::string DebugString() const;
+
+ private:
+  size_t SpaceIndex(size_t ilhs, size_t irhs) const {
+    return ilhs * num_matchers_ + irhs;
+  }
+
+  size_t num_elements_;
+  size_t num_matchers_;
+
+  // Each element is a char interpreted as bool. They are stored as a
+  // flattened array in lhs-major order, use 'SpaceIndex()' to translate
+  // a (ilhs, irhs) matrix coordinate into an offset.
+  ::std::vector<char> matched_;
+};
+
+typedef ::std::pair<size_t, size_t> ElementMatcherPair;
+typedef ::std::vector<ElementMatcherPair> ElementMatcherPairs;
+
+// Returns a maximum bipartite matching for the specified graph 'g'.
+// The matching is represented as a vector of {element, matcher} pairs.
+GTEST_API_ ElementMatcherPairs
+FindMaxBipartiteMatching(const MatchMatrix& g);
+
+struct UnorderedMatcherRequire {
+  enum Flags {
+    Superset = 1 << 0,
+    Subset = 1 << 1,
+    ExactMatch = Superset | Subset,
+  };
+};
+
+// Untyped base class for implementing UnorderedElementsAre.  By
+// putting logic that's not specific to the element type here, we
+// reduce binary bloat and increase compilation speed.
+class GTEST_API_ UnorderedElementsAreMatcherImplBase {
+ protected:
+  explicit UnorderedElementsAreMatcherImplBase(
+      UnorderedMatcherRequire::Flags matcher_flags)
+      : match_flags_(matcher_flags) {}
+
+  // A vector of matcher describers, one for each element matcher.
+  // Does not own the describers (and thus can be used only when the
+  // element matchers are alive).
+  typedef ::std::vector<const MatcherDescriberInterface*> MatcherDescriberVec;
+
+  // Describes this UnorderedElementsAre matcher.
+  void DescribeToImpl(::std::ostream* os) const;
+
+  // Describes the negation of this UnorderedElementsAre matcher.
+  void DescribeNegationToImpl(::std::ostream* os) const;
+
+  bool VerifyMatchMatrix(const ::std::vector<std::string>& element_printouts,
+                         const MatchMatrix& matrix,
+                         MatchResultListener* listener) const;
+
+  bool FindPairing(const MatchMatrix& matrix,
+                   MatchResultListener* listener) const;
+
+  MatcherDescriberVec& matcher_describers() {
+    return matcher_describers_;
+  }
+
+  static Message Elements(size_t n) {
+    return Message() << n << " element" << (n == 1 ? "" : "s");
+  }
+
+  UnorderedMatcherRequire::Flags match_flags() const { return match_flags_; }
+
+ private:
+  UnorderedMatcherRequire::Flags match_flags_;
+  MatcherDescriberVec matcher_describers_;
+};
+
+// Implements UnorderedElementsAre, UnorderedElementsAreArray, IsSubsetOf, and
+// IsSupersetOf.
+template <typename Container>
+class UnorderedElementsAreMatcherImpl
+    : public MatcherInterface<Container>,
+      public UnorderedElementsAreMatcherImplBase {
+ public:
+  typedef GTEST_REMOVE_REFERENCE_AND_CONST_(Container) RawContainer;
+  typedef internal::StlContainerView<RawContainer> View;
+  typedef typename View::type StlContainer;
+  typedef typename View::const_reference StlContainerReference;
+  typedef typename StlContainer::const_iterator StlContainerConstIterator;
+  typedef typename StlContainer::value_type Element;
+
+  template <typename InputIter>
+  UnorderedElementsAreMatcherImpl(UnorderedMatcherRequire::Flags matcher_flags,
+                                  InputIter first, InputIter last)
+      : UnorderedElementsAreMatcherImplBase(matcher_flags) {
+    for (; first != last; ++first) {
+      matchers_.push_back(MatcherCast<const Element&>(*first));
+    }
+    for (const auto& m : matchers_) {
+      matcher_describers().push_back(m.GetDescriber());
+    }
+  }
+
+  // Describes what this matcher does.
+  void DescribeTo(::std::ostream* os) const override {
+    return UnorderedElementsAreMatcherImplBase::DescribeToImpl(os);
+  }
+
+  // Describes what the negation of this matcher does.
+  void DescribeNegationTo(::std::ostream* os) const override {
+    return UnorderedElementsAreMatcherImplBase::DescribeNegationToImpl(os);
+  }
+
+  bool MatchAndExplain(Container container,
+                       MatchResultListener* listener) const override {
+    StlContainerReference stl_container = View::ConstReference(container);
+    ::std::vector<std::string> element_printouts;
+    MatchMatrix matrix =
+        AnalyzeElements(stl_container.begin(), stl_container.end(),
+                        &element_printouts, listener);
+
+    if (matrix.LhsSize() == 0 && matrix.RhsSize() == 0) {
+      return true;
+    }
+
+    if (match_flags() == UnorderedMatcherRequire::ExactMatch) {
+      if (matrix.LhsSize() != matrix.RhsSize()) {
+        // The element count doesn't match.  If the container is empty,
+        // there's no need to explain anything as Google Mock already
+        // prints the empty container. Otherwise we just need to show
+        // how many elements there actually are.
+        if (matrix.LhsSize() != 0 && listener->IsInterested()) {
+          *listener << "which has " << Elements(matrix.LhsSize());
+        }
+        return false;
+      }
+    }
+
+    return VerifyMatchMatrix(element_printouts, matrix, listener) &&
+           FindPairing(matrix, listener);
+  }
+
+ private:
+  template <typename ElementIter>
+  MatchMatrix AnalyzeElements(ElementIter elem_first, ElementIter elem_last,
+                              ::std::vector<std::string>* element_printouts,
+                              MatchResultListener* listener) const {
+    element_printouts->clear();
+    ::std::vector<char> did_match;
+    size_t num_elements = 0;
+    DummyMatchResultListener dummy;
+    for (; elem_first != elem_last; ++num_elements, ++elem_first) {
+      if (listener->IsInterested()) {
+        element_printouts->push_back(PrintToString(*elem_first));
+      }
+      for (size_t irhs = 0; irhs != matchers_.size(); ++irhs) {
+        did_match.push_back(
+            matchers_[irhs].MatchAndExplain(*elem_first, &dummy));
+      }
+    }
+
+    MatchMatrix matrix(num_elements, matchers_.size());
+    ::std::vector<char>::const_iterator did_match_iter = did_match.begin();
+    for (size_t ilhs = 0; ilhs != num_elements; ++ilhs) {
+      for (size_t irhs = 0; irhs != matchers_.size(); ++irhs) {
+        matrix.SetEdge(ilhs, irhs, *did_match_iter++ != 0);
+      }
+    }
+    return matrix;
+  }
+
+  ::std::vector<Matcher<const Element&> > matchers_;
+};
+
+// Functor for use in TransformTuple.
+// Performs MatcherCast<Target> on an input argument of any type.
+template <typename Target>
+struct CastAndAppendTransform {
+  template <typename Arg>
+  Matcher<Target> operator()(const Arg& a) const {
+    return MatcherCast<Target>(a);
+  }
+};
+
+// Implements UnorderedElementsAre.
+template <typename MatcherTuple>
+class UnorderedElementsAreMatcher {
+ public:
+  explicit UnorderedElementsAreMatcher(const MatcherTuple& args)
+      : matchers_(args) {}
+
+  template <typename Container>
+  operator Matcher<Container>() const {
+    typedef GTEST_REMOVE_REFERENCE_AND_CONST_(Container) RawContainer;
+    typedef typename internal::StlContainerView<RawContainer>::type View;
+    typedef typename View::value_type Element;
+    typedef ::std::vector<Matcher<const Element&> > MatcherVec;
+    MatcherVec matchers;
+    matchers.reserve(::std::tuple_size<MatcherTuple>::value);
+    TransformTupleValues(CastAndAppendTransform<const Element&>(), matchers_,
+                         ::std::back_inserter(matchers));
+    return Matcher<Container>(
+        new UnorderedElementsAreMatcherImpl<const Container&>(
+            UnorderedMatcherRequire::ExactMatch, matchers.begin(),
+            matchers.end()));
+  }
+
+ private:
+  const MatcherTuple matchers_;
+};
+
+// Implements ElementsAre.
+template <typename MatcherTuple>
+class ElementsAreMatcher {
+ public:
+  explicit ElementsAreMatcher(const MatcherTuple& args) : matchers_(args) {}
+
+  template <typename Container>
+  operator Matcher<Container>() const {
+    GTEST_COMPILE_ASSERT_(
+        !IsHashTable<GTEST_REMOVE_REFERENCE_AND_CONST_(Container)>::value ||
+            ::std::tuple_size<MatcherTuple>::value < 2,
+        use_UnorderedElementsAre_with_hash_tables);
+
+    typedef GTEST_REMOVE_REFERENCE_AND_CONST_(Container) RawContainer;
+    typedef typename internal::StlContainerView<RawContainer>::type View;
+    typedef typename View::value_type Element;
+    typedef ::std::vector<Matcher<const Element&> > MatcherVec;
+    MatcherVec matchers;
+    matchers.reserve(::std::tuple_size<MatcherTuple>::value);
+    TransformTupleValues(CastAndAppendTransform<const Element&>(), matchers_,
+                         ::std::back_inserter(matchers));
+    return Matcher<Container>(new ElementsAreMatcherImpl<const Container&>(
+        matchers.begin(), matchers.end()));
+  }
+
+ private:
+  const MatcherTuple matchers_;
+};
+
+// Implements UnorderedElementsAreArray(), IsSubsetOf(), and IsSupersetOf().
+template <typename T>
+class UnorderedElementsAreArrayMatcher {
+ public:
+  template <typename Iter>
+  UnorderedElementsAreArrayMatcher(UnorderedMatcherRequire::Flags match_flags,
+                                   Iter first, Iter last)
+      : match_flags_(match_flags), matchers_(first, last) {}
+
+  template <typename Container>
+  operator Matcher<Container>() const {
+    return Matcher<Container>(
+        new UnorderedElementsAreMatcherImpl<const Container&>(
+            match_flags_, matchers_.begin(), matchers_.end()));
+  }
+
+ private:
+  UnorderedMatcherRequire::Flags match_flags_;
+  ::std::vector<T> matchers_;
+};
+
+// Implements ElementsAreArray().
+template <typename T>
+class ElementsAreArrayMatcher {
+ public:
+  template <typename Iter>
+  ElementsAreArrayMatcher(Iter first, Iter last) : matchers_(first, last) {}
+
+  template <typename Container>
+  operator Matcher<Container>() const {
+    GTEST_COMPILE_ASSERT_(
+        !IsHashTable<GTEST_REMOVE_REFERENCE_AND_CONST_(Container)>::value,
+        use_UnorderedElementsAreArray_with_hash_tables);
+
+    return Matcher<Container>(new ElementsAreMatcherImpl<const Container&>(
+        matchers_.begin(), matchers_.end()));
+  }
+
+ private:
+  const ::std::vector<T> matchers_;
+};
+
+// Given a 2-tuple matcher tm of type Tuple2Matcher and a value second
+// of type Second, BoundSecondMatcher<Tuple2Matcher, Second>(tm,
+// second) is a polymorphic matcher that matches a value x if and only if
+// tm matches tuple (x, second).  Useful for implementing
+// UnorderedPointwise() in terms of UnorderedElementsAreArray().
+//
+// BoundSecondMatcher is copyable and assignable, as we need to put
+// instances of this class in a vector when implementing
+// UnorderedPointwise().
+template <typename Tuple2Matcher, typename Second>
+class BoundSecondMatcher {
+ public:
+  BoundSecondMatcher(const Tuple2Matcher& tm, const Second& second)
+      : tuple2_matcher_(tm), second_value_(second) {}
+
+  BoundSecondMatcher(const BoundSecondMatcher& other) = default;
+
+  template <typename T>
+  operator Matcher<T>() const {
+    return MakeMatcher(new Impl<T>(tuple2_matcher_, second_value_));
+  }
+
+  // We have to define this for UnorderedPointwise() to compile in
+  // C++98 mode, as it puts BoundSecondMatcher instances in a vector,
+  // which requires the elements to be assignable in C++98.  The
+  // compiler cannot generate the operator= for us, as Tuple2Matcher
+  // and Second may not be assignable.
+  //
+  // However, this should never be called, so the implementation just
+  // need to assert.
+  void operator=(const BoundSecondMatcher& /*rhs*/) {
+    GTEST_LOG_(FATAL) << "BoundSecondMatcher should never be assigned.";
+  }
+
+ private:
+  template <typename T>
+  class Impl : public MatcherInterface<T> {
+   public:
+    typedef ::std::tuple<T, Second> ArgTuple;
+
+    Impl(const Tuple2Matcher& tm, const Second& second)
+        : mono_tuple2_matcher_(SafeMatcherCast<const ArgTuple&>(tm)),
+          second_value_(second) {}
+
+    void DescribeTo(::std::ostream* os) const override {
+      *os << "and ";
+      UniversalPrint(second_value_, os);
+      *os << " ";
+      mono_tuple2_matcher_.DescribeTo(os);
+    }
+
+    bool MatchAndExplain(T x, MatchResultListener* listener) const override {
+      return mono_tuple2_matcher_.MatchAndExplain(ArgTuple(x, second_value_),
+                                                  listener);
+    }
+
+   private:
+    const Matcher<const ArgTuple&> mono_tuple2_matcher_;
+    const Second second_value_;
+  };
+
+  const Tuple2Matcher tuple2_matcher_;
+  const Second second_value_;
+};
+
+// Given a 2-tuple matcher tm and a value second,
+// MatcherBindSecond(tm, second) returns a matcher that matches a
+// value x if and only if tm matches tuple (x, second).  Useful for
+// implementing UnorderedPointwise() in terms of UnorderedElementsAreArray().
+template <typename Tuple2Matcher, typename Second>
+BoundSecondMatcher<Tuple2Matcher, Second> MatcherBindSecond(
+    const Tuple2Matcher& tm, const Second& second) {
+  return BoundSecondMatcher<Tuple2Matcher, Second>(tm, second);
+}
+
+// Returns the description for a matcher defined using the MATCHER*()
+// macro where the user-supplied description string is "", if
+// 'negation' is false; otherwise returns the description of the
+// negation of the matcher.  'param_values' contains a list of strings
+// that are the print-out of the matcher's parameters.
+GTEST_API_ std::string FormatMatcherDescription(bool negation,
+                                                const char* matcher_name,
+                                                const Strings& param_values);
+
+// Implements a matcher that checks the value of a optional<> type variable.
+template <typename ValueMatcher>
+class OptionalMatcher {
+ public:
+  explicit OptionalMatcher(const ValueMatcher& value_matcher)
+      : value_matcher_(value_matcher) {}
+
+  template <typename Optional>
+  operator Matcher<Optional>() const {
+    return Matcher<Optional>(new Impl<const Optional&>(value_matcher_));
+  }
+
+  template <typename Optional>
+  class Impl : public MatcherInterface<Optional> {
+   public:
+    typedef GTEST_REMOVE_REFERENCE_AND_CONST_(Optional) OptionalView;
+    typedef typename OptionalView::value_type ValueType;
+    explicit Impl(const ValueMatcher& value_matcher)
+        : value_matcher_(MatcherCast<ValueType>(value_matcher)) {}
+
+    void DescribeTo(::std::ostream* os) const override {
+      *os << "value ";
+      value_matcher_.DescribeTo(os);
+    }
+
+    void DescribeNegationTo(::std::ostream* os) const override {
+      *os << "value ";
+      value_matcher_.DescribeNegationTo(os);
+    }
+
+    bool MatchAndExplain(Optional optional,
+                         MatchResultListener* listener) const override {
+      if (!optional) {
+        *listener << "which is not engaged";
+        return false;
+      }
+      const ValueType& value = *optional;
+      StringMatchResultListener value_listener;
+      const bool match = value_matcher_.MatchAndExplain(value, &value_listener);
+      *listener << "whose value " << PrintToString(value)
+                << (match ? " matches" : " doesn't match");
+      PrintIfNotEmpty(value_listener.str(), listener->stream());
+      return match;
+    }
+
+   private:
+    const Matcher<ValueType> value_matcher_;
+  };
+
+ private:
+  const ValueMatcher value_matcher_;
+};
+
+namespace variant_matcher {
+// Overloads to allow VariantMatcher to do proper ADL lookup.
+template <typename T>
+void holds_alternative() {}
+template <typename T>
+void get() {}
+
+// Implements a matcher that checks the value of a variant<> type variable.
+template <typename T>
+class VariantMatcher {
+ public:
+  explicit VariantMatcher(::testing::Matcher<const T&> matcher)
+      : matcher_(std::move(matcher)) {}
+
+  template <typename Variant>
+  bool MatchAndExplain(const Variant& value,
+                       ::testing::MatchResultListener* listener) const {
+    using std::get;
+    if (!listener->IsInterested()) {
+      return holds_alternative<T>(value) && matcher_.Matches(get<T>(value));
+    }
+
+    if (!holds_alternative<T>(value)) {
+      *listener << "whose value is not of type '" << GetTypeName() << "'";
+      return false;
+    }
+
+    const T& elem = get<T>(value);
+    StringMatchResultListener elem_listener;
+    const bool match = matcher_.MatchAndExplain(elem, &elem_listener);
+    *listener << "whose value " << PrintToString(elem)
+              << (match ? " matches" : " doesn't match");
+    PrintIfNotEmpty(elem_listener.str(), listener->stream());
+    return match;
+  }
+
+  void DescribeTo(std::ostream* os) const {
+    *os << "is a variant<> with value of type '" << GetTypeName()
+        << "' and the value ";
+    matcher_.DescribeTo(os);
+  }
+
+  void DescribeNegationTo(std::ostream* os) const {
+    *os << "is a variant<> with value of type other than '" << GetTypeName()
+        << "' or the value ";
+    matcher_.DescribeNegationTo(os);
+  }
+
+ private:
+  static std::string GetTypeName() {
+#if GTEST_HAS_RTTI
+    GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(
+        return internal::GetTypeName<T>());
+#endif
+    return "the element type";
+  }
+
+  const ::testing::Matcher<const T&> matcher_;
+};
+
+}  // namespace variant_matcher
+
+namespace any_cast_matcher {
+
+// Overloads to allow AnyCastMatcher to do proper ADL lookup.
+template <typename T>
+void any_cast() {}
+
+// Implements a matcher that any_casts the value.
+template <typename T>
+class AnyCastMatcher {
+ public:
+  explicit AnyCastMatcher(const ::testing::Matcher<const T&>& matcher)
+      : matcher_(matcher) {}
+
+  template <typename AnyType>
+  bool MatchAndExplain(const AnyType& value,
+                       ::testing::MatchResultListener* listener) const {
+    if (!listener->IsInterested()) {
+      const T* ptr = any_cast<T>(&value);
+      return ptr != nullptr && matcher_.Matches(*ptr);
+    }
+
+    const T* elem = any_cast<T>(&value);
+    if (elem == nullptr) {
+      *listener << "whose value is not of type '" << GetTypeName() << "'";
+      return false;
+    }
+
+    StringMatchResultListener elem_listener;
+    const bool match = matcher_.MatchAndExplain(*elem, &elem_listener);
+    *listener << "whose value " << PrintToString(*elem)
+              << (match ? " matches" : " doesn't match");
+    PrintIfNotEmpty(elem_listener.str(), listener->stream());
+    return match;
+  }
+
+  void DescribeTo(std::ostream* os) const {
+    *os << "is an 'any' type with value of type '" << GetTypeName()
+        << "' and the value ";
+    matcher_.DescribeTo(os);
+  }
+
+  void DescribeNegationTo(std::ostream* os) const {
+    *os << "is an 'any' type with value of type other than '" << GetTypeName()
+        << "' or the value ";
+    matcher_.DescribeNegationTo(os);
+  }
+
+ private:
+  static std::string GetTypeName() {
+#if GTEST_HAS_RTTI
+    GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(
+        return internal::GetTypeName<T>());
+#endif
+    return "the element type";
+  }
+
+  const ::testing::Matcher<const T&> matcher_;
+};
+
+}  // namespace any_cast_matcher
+
+// Implements the Args() matcher.
+template <class ArgsTuple, size_t... k>
+class ArgsMatcherImpl : public MatcherInterface<ArgsTuple> {
+ public:
+  using RawArgsTuple = typename std::decay<ArgsTuple>::type;
+  using SelectedArgs =
+      std::tuple<typename std::tuple_element<k, RawArgsTuple>::type...>;
+  using MonomorphicInnerMatcher = Matcher<const SelectedArgs&>;
+
+  template <typename InnerMatcher>
+  explicit ArgsMatcherImpl(const InnerMatcher& inner_matcher)
+      : inner_matcher_(SafeMatcherCast<const SelectedArgs&>(inner_matcher)) {}
+
+  bool MatchAndExplain(ArgsTuple args,
+                       MatchResultListener* listener) const override {
+    // Workaround spurious C4100 on MSVC<=15.7 when k is empty.
+    (void)args;
+    const SelectedArgs& selected_args =
+        std::forward_as_tuple(std::get<k>(args)...);
+    if (!listener->IsInterested()) return inner_matcher_.Matches(selected_args);
+
+    PrintIndices(listener->stream());
+    *listener << "are " << PrintToString(selected_args);
+
+    StringMatchResultListener inner_listener;
+    const bool match =
+        inner_matcher_.MatchAndExplain(selected_args, &inner_listener);
+    PrintIfNotEmpty(inner_listener.str(), listener->stream());
+    return match;
+  }
+
+  void DescribeTo(::std::ostream* os) const override {
+    *os << "are a tuple ";
+    PrintIndices(os);
+    inner_matcher_.DescribeTo(os);
+  }
+
+  void DescribeNegationTo(::std::ostream* os) const override {
+    *os << "are a tuple ";
+    PrintIndices(os);
+    inner_matcher_.DescribeNegationTo(os);
+  }
+
+ private:
+  // Prints the indices of the selected fields.
+  static void PrintIndices(::std::ostream* os) {
+    *os << "whose fields (";
+    const char* sep = "";
+    // Workaround spurious C4189 on MSVC<=15.7 when k is empty.
+    (void)sep;
+    const char* dummy[] = {"", (*os << sep << "#" << k, sep = ", ")...};
+    (void)dummy;
+    *os << ") ";
+  }
+
+  MonomorphicInnerMatcher inner_matcher_;
+};
+
+template <class InnerMatcher, size_t... k>
+class ArgsMatcher {
+ public:
+  explicit ArgsMatcher(InnerMatcher inner_matcher)
+      : inner_matcher_(std::move(inner_matcher)) {}
+
+  template <typename ArgsTuple>
+  operator Matcher<ArgsTuple>() const {  // NOLINT
+    return MakeMatcher(new ArgsMatcherImpl<ArgsTuple, k...>(inner_matcher_));
+  }
+
+ private:
+  InnerMatcher inner_matcher_;
+};
+
+}  // namespace internal
+
+// ElementsAreArray(iterator_first, iterator_last)
+// ElementsAreArray(pointer, count)
+// ElementsAreArray(array)
+// ElementsAreArray(container)
+// ElementsAreArray({ e1, e2, ..., en })
+//
+// The ElementsAreArray() functions are like ElementsAre(...), except
+// that they are given a homogeneous sequence rather than taking each
+// element as a function argument. The sequence can be specified as an
+// array, a pointer and count, a vector, an initializer list, or an
+// STL iterator range. In each of these cases, the underlying sequence
+// can be either a sequence of values or a sequence of matchers.
+//
+// All forms of ElementsAreArray() make a copy of the input matcher sequence.
+
+template <typename Iter>
+inline internal::ElementsAreArrayMatcher<
+    typename ::std::iterator_traits<Iter>::value_type>
+ElementsAreArray(Iter first, Iter last) {
+  typedef typename ::std::iterator_traits<Iter>::value_type T;
+  return internal::ElementsAreArrayMatcher<T>(first, last);
+}
+
+template <typename T>
+inline internal::ElementsAreArrayMatcher<T> ElementsAreArray(
+    const T* pointer, size_t count) {
+  return ElementsAreArray(pointer, pointer + count);
+}
+
+template <typename T, size_t N>
+inline internal::ElementsAreArrayMatcher<T> ElementsAreArray(
+    const T (&array)[N]) {
+  return ElementsAreArray(array, N);
+}
+
+template <typename Container>
+inline internal::ElementsAreArrayMatcher<typename Container::value_type>
+ElementsAreArray(const Container& container) {
+  return ElementsAreArray(container.begin(), container.end());
+}
+
+template <typename T>
+inline internal::ElementsAreArrayMatcher<T>
+ElementsAreArray(::std::initializer_list<T> xs) {
+  return ElementsAreArray(xs.begin(), xs.end());
+}
+
+// UnorderedElementsAreArray(iterator_first, iterator_last)
+// UnorderedElementsAreArray(pointer, count)
+// UnorderedElementsAreArray(array)
+// UnorderedElementsAreArray(container)
+// UnorderedElementsAreArray({ e1, e2, ..., en })
+//
+// UnorderedElementsAreArray() verifies that a bijective mapping onto a
+// collection of matchers exists.
+//
+// The matchers can be specified as an array, a pointer and count, a container,
+// an initializer list, or an STL iterator range. In each of these cases, the
+// underlying matchers can be either values or matchers.
+
+template <typename Iter>
+inline internal::UnorderedElementsAreArrayMatcher<
+    typename ::std::iterator_traits<Iter>::value_type>
+UnorderedElementsAreArray(Iter first, Iter last) {
+  typedef typename ::std::iterator_traits<Iter>::value_type T;
+  return internal::UnorderedElementsAreArrayMatcher<T>(
+      internal::UnorderedMatcherRequire::ExactMatch, first, last);
+}
+
+template <typename T>
+inline internal::UnorderedElementsAreArrayMatcher<T>
+UnorderedElementsAreArray(const T* pointer, size_t count) {
+  return UnorderedElementsAreArray(pointer, pointer + count);
+}
+
+template <typename T, size_t N>
+inline internal::UnorderedElementsAreArrayMatcher<T>
+UnorderedElementsAreArray(const T (&array)[N]) {
+  return UnorderedElementsAreArray(array, N);
+}
+
+template <typename Container>
+inline internal::UnorderedElementsAreArrayMatcher<
+    typename Container::value_type>
+UnorderedElementsAreArray(const Container& container) {
+  return UnorderedElementsAreArray(container.begin(), container.end());
+}
+
+template <typename T>
+inline internal::UnorderedElementsAreArrayMatcher<T>
+UnorderedElementsAreArray(::std::initializer_list<T> xs) {
+  return UnorderedElementsAreArray(xs.begin(), xs.end());
+}
+
+// _ is a matcher that matches anything of any type.
+//
+// This definition is fine as:
+//
+//   1. The C++ standard permits using the name _ in a namespace that
+//      is not the global namespace or ::std.
+//   2. The AnythingMatcher class has no data member or constructor,
+//      so it's OK to create global variables of this type.
+//   3. c-style has approved of using _ in this case.
+const internal::AnythingMatcher _ = {};
+// Creates a matcher that matches any value of the given type T.
+template <typename T>
+inline Matcher<T> A() {
+  return _;
+}
+
+// Creates a matcher that matches any value of the given type T.
+template <typename T>
+inline Matcher<T> An() {
+  return _;
+}
+
+template <typename T, typename M>
+Matcher<T> internal::MatcherCastImpl<T, M>::CastImpl(
+    const M& value, std::false_type /* convertible_to_matcher */,
+    std::false_type /* convertible_to_T */) {
+  return Eq(value);
+}
+
+// Creates a polymorphic matcher that matches any NULL pointer.
+inline PolymorphicMatcher<internal::IsNullMatcher > IsNull() {
+  return MakePolymorphicMatcher(internal::IsNullMatcher());
+}
+
+// Creates a polymorphic matcher that matches any non-NULL pointer.
+// This is convenient as Not(NULL) doesn't compile (the compiler
+// thinks that that expression is comparing a pointer with an integer).
+inline PolymorphicMatcher<internal::NotNullMatcher > NotNull() {
+  return MakePolymorphicMatcher(internal::NotNullMatcher());
+}
+
+// Creates a polymorphic matcher that matches any argument that
+// references variable x.
+template <typename T>
+inline internal::RefMatcher<T&> Ref(T& x) {  // NOLINT
+  return internal::RefMatcher<T&>(x);
+}
+
+// Creates a polymorphic matcher that matches any NaN floating point.
+inline PolymorphicMatcher<internal::IsNanMatcher> IsNan() {
+  return MakePolymorphicMatcher(internal::IsNanMatcher());
+}
+
+// Creates a matcher that matches any double argument approximately
+// equal to rhs, where two NANs are considered unequal.
+inline internal::FloatingEqMatcher<double> DoubleEq(double rhs) {
+  return internal::FloatingEqMatcher<double>(rhs, false);
+}
+
+// Creates a matcher that matches any double argument approximately
+// equal to rhs, including NaN values when rhs is NaN.
+inline internal::FloatingEqMatcher<double> NanSensitiveDoubleEq(double rhs) {
+  return internal::FloatingEqMatcher<double>(rhs, true);
+}
+
+// Creates a matcher that matches any double argument approximately equal to
+// rhs, up to the specified max absolute error bound, where two NANs are
+// considered unequal.  The max absolute error bound must be non-negative.
+inline internal::FloatingEqMatcher<double> DoubleNear(
+    double rhs, double max_abs_error) {
+  return internal::FloatingEqMatcher<double>(rhs, false, max_abs_error);
+}
+
+// Creates a matcher that matches any double argument approximately equal to
+// rhs, up to the specified max absolute error bound, including NaN values when
+// rhs is NaN.  The max absolute error bound must be non-negative.
+inline internal::FloatingEqMatcher<double> NanSensitiveDoubleNear(
+    double rhs, double max_abs_error) {
+  return internal::FloatingEqMatcher<double>(rhs, true, max_abs_error);
+}
+
+// Creates a matcher that matches any float argument approximately
+// equal to rhs, where two NANs are considered unequal.
+inline internal::FloatingEqMatcher<float> FloatEq(float rhs) {
+  return internal::FloatingEqMatcher<float>(rhs, false);
+}
+
+// Creates a matcher that matches any float argument approximately
+// equal to rhs, including NaN values when rhs is NaN.
+inline internal::FloatingEqMatcher<float> NanSensitiveFloatEq(float rhs) {
+  return internal::FloatingEqMatcher<float>(rhs, true);
+}
+
+// Creates a matcher that matches any float argument approximately equal to
+// rhs, up to the specified max absolute error bound, where two NANs are
+// considered unequal.  The max absolute error bound must be non-negative.
+inline internal::FloatingEqMatcher<float> FloatNear(
+    float rhs, float max_abs_error) {
+  return internal::FloatingEqMatcher<float>(rhs, false, max_abs_error);
+}
+
+// Creates a matcher that matches any float argument approximately equal to
+// rhs, up to the specified max absolute error bound, including NaN values when
+// rhs is NaN.  The max absolute error bound must be non-negative.
+inline internal::FloatingEqMatcher<float> NanSensitiveFloatNear(
+    float rhs, float max_abs_error) {
+  return internal::FloatingEqMatcher<float>(rhs, true, max_abs_error);
+}
+
+// Creates a matcher that matches a pointer (raw or smart) that points
+// to a value that matches inner_matcher.
+template <typename InnerMatcher>
+inline internal::PointeeMatcher<InnerMatcher> Pointee(
+    const InnerMatcher& inner_matcher) {
+  return internal::PointeeMatcher<InnerMatcher>(inner_matcher);
+}
+
+#if GTEST_HAS_RTTI
+// Creates a matcher that matches a pointer or reference that matches
+// inner_matcher when dynamic_cast<To> is applied.
+// The result of dynamic_cast<To> is forwarded to the inner matcher.
+// If To is a pointer and the cast fails, the inner matcher will receive NULL.
+// If To is a reference and the cast fails, this matcher returns false
+// immediately.
+template <typename To>
+inline PolymorphicMatcher<internal::WhenDynamicCastToMatcher<To> >
+WhenDynamicCastTo(const Matcher<To>& inner_matcher) {
+  return MakePolymorphicMatcher(
+      internal::WhenDynamicCastToMatcher<To>(inner_matcher));
+}
+#endif  // GTEST_HAS_RTTI
+
+// Creates a matcher that matches an object whose given field matches
+// 'matcher'.  For example,
+//   Field(&Foo::number, Ge(5))
+// matches a Foo object x if and only if x.number >= 5.
+template <typename Class, typename FieldType, typename FieldMatcher>
+inline PolymorphicMatcher<
+  internal::FieldMatcher<Class, FieldType> > Field(
+    FieldType Class::*field, const FieldMatcher& matcher) {
+  return MakePolymorphicMatcher(
+      internal::FieldMatcher<Class, FieldType>(
+          field, MatcherCast<const FieldType&>(matcher)));
+  // The call to MatcherCast() is required for supporting inner
+  // matchers of compatible types.  For example, it allows
+  //   Field(&Foo::bar, m)
+  // to compile where bar is an int32 and m is a matcher for int64.
+}
+
+// Same as Field() but also takes the name of the field to provide better error
+// messages.
+template <typename Class, typename FieldType, typename FieldMatcher>
+inline PolymorphicMatcher<internal::FieldMatcher<Class, FieldType> > Field(
+    const std::string& field_name, FieldType Class::*field,
+    const FieldMatcher& matcher) {
+  return MakePolymorphicMatcher(internal::FieldMatcher<Class, FieldType>(
+      field_name, field, MatcherCast<const FieldType&>(matcher)));
+}
+
+// Creates a matcher that matches an object whose given property
+// matches 'matcher'.  For example,
+//   Property(&Foo::str, StartsWith("hi"))
+// matches a Foo object x if and only if x.str() starts with "hi".
+template <typename Class, typename PropertyType, typename PropertyMatcher>
+inline PolymorphicMatcher<internal::PropertyMatcher<
+    Class, PropertyType, PropertyType (Class::*)() const> >
+Property(PropertyType (Class::*property)() const,
+         const PropertyMatcher& matcher) {
+  return MakePolymorphicMatcher(
+      internal::PropertyMatcher<Class, PropertyType,
+                                PropertyType (Class::*)() const>(
+          property, MatcherCast<const PropertyType&>(matcher)));
+  // The call to MatcherCast() is required for supporting inner
+  // matchers of compatible types.  For example, it allows
+  //   Property(&Foo::bar, m)
+  // to compile where bar() returns an int32 and m is a matcher for int64.
+}
+
+// Same as Property() above, but also takes the name of the property to provide
+// better error messages.
+template <typename Class, typename PropertyType, typename PropertyMatcher>
+inline PolymorphicMatcher<internal::PropertyMatcher<
+    Class, PropertyType, PropertyType (Class::*)() const> >
+Property(const std::string& property_name,
+         PropertyType (Class::*property)() const,
+         const PropertyMatcher& matcher) {
+  return MakePolymorphicMatcher(
+      internal::PropertyMatcher<Class, PropertyType,
+                                PropertyType (Class::*)() const>(
+          property_name, property, MatcherCast<const PropertyType&>(matcher)));
+}
+
+// The same as above but for reference-qualified member functions.
+template <typename Class, typename PropertyType, typename PropertyMatcher>
+inline PolymorphicMatcher<internal::PropertyMatcher<
+    Class, PropertyType, PropertyType (Class::*)() const &> >
+Property(PropertyType (Class::*property)() const &,
+         const PropertyMatcher& matcher) {
+  return MakePolymorphicMatcher(
+      internal::PropertyMatcher<Class, PropertyType,
+                                PropertyType (Class::*)() const&>(
+          property, MatcherCast<const PropertyType&>(matcher)));
+}
+
+// Three-argument form for reference-qualified member functions.
+template <typename Class, typename PropertyType, typename PropertyMatcher>
+inline PolymorphicMatcher<internal::PropertyMatcher<
+    Class, PropertyType, PropertyType (Class::*)() const &> >
+Property(const std::string& property_name,
+         PropertyType (Class::*property)() const &,
+         const PropertyMatcher& matcher) {
+  return MakePolymorphicMatcher(
+      internal::PropertyMatcher<Class, PropertyType,
+                                PropertyType (Class::*)() const&>(
+          property_name, property, MatcherCast<const PropertyType&>(matcher)));
+}
+
+// Creates a matcher that matches an object if and only if the result of
+// applying a callable to x matches 'matcher'. For example,
+//   ResultOf(f, StartsWith("hi"))
+// matches a Foo object x if and only if f(x) starts with "hi".
+// `callable` parameter can be a function, function pointer, or a functor. It is
+// required to keep no state affecting the results of the calls on it and make
+// no assumptions about how many calls will be made. Any state it keeps must be
+// protected from the concurrent access.
+template <typename Callable, typename InnerMatcher>
+internal::ResultOfMatcher<Callable, InnerMatcher> ResultOf(
+    Callable callable, InnerMatcher matcher) {
+  return internal::ResultOfMatcher<Callable, InnerMatcher>(
+      std::move(callable), std::move(matcher));
+}
+
+// String matchers.
+
+// Matches a string equal to str.
+template <typename T = std::string>
+PolymorphicMatcher<internal::StrEqualityMatcher<std::string> > StrEq(
+    const internal::StringLike<T>& str) {
+  return MakePolymorphicMatcher(
+      internal::StrEqualityMatcher<std::string>(std::string(str), true, true));
+}
+
+// Matches a string not equal to str.
+template <typename T = std::string>
+PolymorphicMatcher<internal::StrEqualityMatcher<std::string> > StrNe(
+    const internal::StringLike<T>& str) {
+  return MakePolymorphicMatcher(
+      internal::StrEqualityMatcher<std::string>(std::string(str), false, true));
+}
+
+// Matches a string equal to str, ignoring case.
+template <typename T = std::string>
+PolymorphicMatcher<internal::StrEqualityMatcher<std::string> > StrCaseEq(
+    const internal::StringLike<T>& str) {
+  return MakePolymorphicMatcher(
+      internal::StrEqualityMatcher<std::string>(std::string(str), true, false));
+}
+
+// Matches a string not equal to str, ignoring case.
+template <typename T = std::string>
+PolymorphicMatcher<internal::StrEqualityMatcher<std::string> > StrCaseNe(
+    const internal::StringLike<T>& str) {
+  return MakePolymorphicMatcher(internal::StrEqualityMatcher<std::string>(
+      std::string(str), false, false));
+}
+
+// Creates a matcher that matches any string, std::string, or C string
+// that contains the given substring.
+template <typename T = std::string>
+PolymorphicMatcher<internal::HasSubstrMatcher<std::string> > HasSubstr(
+    const internal::StringLike<T>& substring) {
+  return MakePolymorphicMatcher(
+      internal::HasSubstrMatcher<std::string>(std::string(substring)));
+}
+
+// Matches a string that starts with 'prefix' (case-sensitive).
+template <typename T = std::string>
+PolymorphicMatcher<internal::StartsWithMatcher<std::string> > StartsWith(
+    const internal::StringLike<T>& prefix) {
+  return MakePolymorphicMatcher(
+      internal::StartsWithMatcher<std::string>(std::string(prefix)));
+}
+
+// Matches a string that ends with 'suffix' (case-sensitive).
+template <typename T = std::string>
+PolymorphicMatcher<internal::EndsWithMatcher<std::string> > EndsWith(
+    const internal::StringLike<T>& suffix) {
+  return MakePolymorphicMatcher(
+      internal::EndsWithMatcher<std::string>(std::string(suffix)));
+}
+
+#if GTEST_HAS_STD_WSTRING
+// Wide string matchers.
+
+// Matches a string equal to str.
+inline PolymorphicMatcher<internal::StrEqualityMatcher<std::wstring> > StrEq(
+    const std::wstring& str) {
+  return MakePolymorphicMatcher(
+      internal::StrEqualityMatcher<std::wstring>(str, true, true));
+}
+
+// Matches a string not equal to str.
+inline PolymorphicMatcher<internal::StrEqualityMatcher<std::wstring> > StrNe(
+    const std::wstring& str) {
+  return MakePolymorphicMatcher(
+      internal::StrEqualityMatcher<std::wstring>(str, false, true));
+}
+
+// Matches a string equal to str, ignoring case.
+inline PolymorphicMatcher<internal::StrEqualityMatcher<std::wstring> >
+StrCaseEq(const std::wstring& str) {
+  return MakePolymorphicMatcher(
+      internal::StrEqualityMatcher<std::wstring>(str, true, false));
+}
+
+// Matches a string not equal to str, ignoring case.
+inline PolymorphicMatcher<internal::StrEqualityMatcher<std::wstring> >
+StrCaseNe(const std::wstring& str) {
+  return MakePolymorphicMatcher(
+      internal::StrEqualityMatcher<std::wstring>(str, false, false));
+}
+
+// Creates a matcher that matches any ::wstring, std::wstring, or C wide string
+// that contains the given substring.
+inline PolymorphicMatcher<internal::HasSubstrMatcher<std::wstring> > HasSubstr(
+    const std::wstring& substring) {
+  return MakePolymorphicMatcher(
+      internal::HasSubstrMatcher<std::wstring>(substring));
+}
+
+// Matches a string that starts with 'prefix' (case-sensitive).
+inline PolymorphicMatcher<internal::StartsWithMatcher<std::wstring> >
+StartsWith(const std::wstring& prefix) {
+  return MakePolymorphicMatcher(
+      internal::StartsWithMatcher<std::wstring>(prefix));
+}
+
+// Matches a string that ends with 'suffix' (case-sensitive).
+inline PolymorphicMatcher<internal::EndsWithMatcher<std::wstring> > EndsWith(
+    const std::wstring& suffix) {
+  return MakePolymorphicMatcher(
+      internal::EndsWithMatcher<std::wstring>(suffix));
+}
+
+#endif  // GTEST_HAS_STD_WSTRING
+
+// Creates a polymorphic matcher that matches a 2-tuple where the
+// first field == the second field.
+inline internal::Eq2Matcher Eq() { return internal::Eq2Matcher(); }
+
+// Creates a polymorphic matcher that matches a 2-tuple where the
+// first field >= the second field.
+inline internal::Ge2Matcher Ge() { return internal::Ge2Matcher(); }
+
+// Creates a polymorphic matcher that matches a 2-tuple where the
+// first field > the second field.
+inline internal::Gt2Matcher Gt() { return internal::Gt2Matcher(); }
+
+// Creates a polymorphic matcher that matches a 2-tuple where the
+// first field <= the second field.
+inline internal::Le2Matcher Le() { return internal::Le2Matcher(); }
+
+// Creates a polymorphic matcher that matches a 2-tuple where the
+// first field < the second field.
+inline internal::Lt2Matcher Lt() { return internal::Lt2Matcher(); }
+
+// Creates a polymorphic matcher that matches a 2-tuple where the
+// first field != the second field.
+inline internal::Ne2Matcher Ne() { return internal::Ne2Matcher(); }
+
+// Creates a polymorphic matcher that matches a 2-tuple where
+// FloatEq(first field) matches the second field.
+inline internal::FloatingEq2Matcher<float> FloatEq() {
+  return internal::FloatingEq2Matcher<float>();
+}
+
+// Creates a polymorphic matcher that matches a 2-tuple where
+// DoubleEq(first field) matches the second field.
+inline internal::FloatingEq2Matcher<double> DoubleEq() {
+  return internal::FloatingEq2Matcher<double>();
+}
+
+// Creates a polymorphic matcher that matches a 2-tuple where
+// FloatEq(first field) matches the second field with NaN equality.
+inline internal::FloatingEq2Matcher<float> NanSensitiveFloatEq() {
+  return internal::FloatingEq2Matcher<float>(true);
+}
+
+// Creates a polymorphic matcher that matches a 2-tuple where
+// DoubleEq(first field) matches the second field with NaN equality.
+inline internal::FloatingEq2Matcher<double> NanSensitiveDoubleEq() {
+  return internal::FloatingEq2Matcher<double>(true);
+}
+
+// Creates a polymorphic matcher that matches a 2-tuple where
+// FloatNear(first field, max_abs_error) matches the second field.
+inline internal::FloatingEq2Matcher<float> FloatNear(float max_abs_error) {
+  return internal::FloatingEq2Matcher<float>(max_abs_error);
+}
+
+// Creates a polymorphic matcher that matches a 2-tuple where
+// DoubleNear(first field, max_abs_error) matches the second field.
+inline internal::FloatingEq2Matcher<double> DoubleNear(double max_abs_error) {
+  return internal::FloatingEq2Matcher<double>(max_abs_error);
+}
+
+// Creates a polymorphic matcher that matches a 2-tuple where
+// FloatNear(first field, max_abs_error) matches the second field with NaN
+// equality.
+inline internal::FloatingEq2Matcher<float> NanSensitiveFloatNear(
+    float max_abs_error) {
+  return internal::FloatingEq2Matcher<float>(max_abs_error, true);
+}
+
+// Creates a polymorphic matcher that matches a 2-tuple where
+// DoubleNear(first field, max_abs_error) matches the second field with NaN
+// equality.
+inline internal::FloatingEq2Matcher<double> NanSensitiveDoubleNear(
+    double max_abs_error) {
+  return internal::FloatingEq2Matcher<double>(max_abs_error, true);
+}
+
+// Creates a matcher that matches any value of type T that m doesn't
+// match.
+template <typename InnerMatcher>
+inline internal::NotMatcher<InnerMatcher> Not(InnerMatcher m) {
+  return internal::NotMatcher<InnerMatcher>(m);
+}
+
+// Returns a matcher that matches anything that satisfies the given
+// predicate.  The predicate can be any unary function or functor
+// whose return type can be implicitly converted to bool.
+template <typename Predicate>
+inline PolymorphicMatcher<internal::TrulyMatcher<Predicate> >
+Truly(Predicate pred) {
+  return MakePolymorphicMatcher(internal::TrulyMatcher<Predicate>(pred));
+}
+
+// Returns a matcher that matches the container size. The container must
+// support both size() and size_type which all STL-like containers provide.
+// Note that the parameter 'size' can be a value of type size_type as well as
+// matcher. For instance:
+//   EXPECT_THAT(container, SizeIs(2));     // Checks container has 2 elements.
+//   EXPECT_THAT(container, SizeIs(Le(2));  // Checks container has at most 2.
+template <typename SizeMatcher>
+inline internal::SizeIsMatcher<SizeMatcher>
+SizeIs(const SizeMatcher& size_matcher) {
+  return internal::SizeIsMatcher<SizeMatcher>(size_matcher);
+}
+
+// Returns a matcher that matches the distance between the container's begin()
+// iterator and its end() iterator, i.e. the size of the container. This matcher
+// can be used instead of SizeIs with containers such as std::forward_list which
+// do not implement size(). The container must provide const_iterator (with
+// valid iterator_traits), begin() and end().
+template <typename DistanceMatcher>
+inline internal::BeginEndDistanceIsMatcher<DistanceMatcher>
+BeginEndDistanceIs(const DistanceMatcher& distance_matcher) {
+  return internal::BeginEndDistanceIsMatcher<DistanceMatcher>(distance_matcher);
+}
+
+// Returns a matcher that matches an equal container.
+// This matcher behaves like Eq(), but in the event of mismatch lists the
+// values that are included in one container but not the other. (Duplicate
+// values and order differences are not explained.)
+template <typename Container>
+inline PolymorphicMatcher<internal::ContainerEqMatcher<
+    typename std::remove_const<Container>::type>>
+ContainerEq(const Container& rhs) {
+  return MakePolymorphicMatcher(internal::ContainerEqMatcher<Container>(rhs));
+}
+
+// Returns a matcher that matches a container that, when sorted using
+// the given comparator, matches container_matcher.
+template <typename Comparator, typename ContainerMatcher>
+inline internal::WhenSortedByMatcher<Comparator, ContainerMatcher>
+WhenSortedBy(const Comparator& comparator,
+             const ContainerMatcher& container_matcher) {
+  return internal::WhenSortedByMatcher<Comparator, ContainerMatcher>(
+      comparator, container_matcher);
+}
+
+// Returns a matcher that matches a container that, when sorted using
+// the < operator, matches container_matcher.
+template <typename ContainerMatcher>
+inline internal::WhenSortedByMatcher<internal::LessComparator, ContainerMatcher>
+WhenSorted(const ContainerMatcher& container_matcher) {
+  return
+      internal::WhenSortedByMatcher<internal::LessComparator, ContainerMatcher>(
+          internal::LessComparator(), container_matcher);
+}
+
+// Matches an STL-style container or a native array that contains the
+// same number of elements as in rhs, where its i-th element and rhs's
+// i-th element (as a pair) satisfy the given pair matcher, for all i.
+// TupleMatcher must be able to be safely cast to Matcher<std::tuple<const
+// T1&, const T2&> >, where T1 and T2 are the types of elements in the
+// LHS container and the RHS container respectively.
+template <typename TupleMatcher, typename Container>
+inline internal::PointwiseMatcher<TupleMatcher,
+                                  typename std::remove_const<Container>::type>
+Pointwise(const TupleMatcher& tuple_matcher, const Container& rhs) {
+  return internal::PointwiseMatcher<TupleMatcher, Container>(tuple_matcher,
+                                                             rhs);
+}
+
+
+// Supports the Pointwise(m, {a, b, c}) syntax.
+template <typename TupleMatcher, typename T>
+inline internal::PointwiseMatcher<TupleMatcher, std::vector<T> > Pointwise(
+    const TupleMatcher& tuple_matcher, std::initializer_list<T> rhs) {
+  return Pointwise(tuple_matcher, std::vector<T>(rhs));
+}
+
+
+// UnorderedPointwise(pair_matcher, rhs) matches an STL-style
+// container or a native array that contains the same number of
+// elements as in rhs, where in some permutation of the container, its
+// i-th element and rhs's i-th element (as a pair) satisfy the given
+// pair matcher, for all i.  Tuple2Matcher must be able to be safely
+// cast to Matcher<std::tuple<const T1&, const T2&> >, where T1 and T2 are
+// the types of elements in the LHS container and the RHS container
+// respectively.
+//
+// This is like Pointwise(pair_matcher, rhs), except that the element
+// order doesn't matter.
+template <typename Tuple2Matcher, typename RhsContainer>
+inline internal::UnorderedElementsAreArrayMatcher<
+    typename internal::BoundSecondMatcher<
+        Tuple2Matcher,
+        typename internal::StlContainerView<
+            typename std::remove_const<RhsContainer>::type>::type::value_type>>
+UnorderedPointwise(const Tuple2Matcher& tuple2_matcher,
+                   const RhsContainer& rhs_container) {
+  // RhsView allows the same code to handle RhsContainer being a
+  // STL-style container and it being a native C-style array.
+  typedef typename internal::StlContainerView<RhsContainer> RhsView;
+  typedef typename RhsView::type RhsStlContainer;
+  typedef typename RhsStlContainer::value_type Second;
+  const RhsStlContainer& rhs_stl_container =
+      RhsView::ConstReference(rhs_container);
+
+  // Create a matcher for each element in rhs_container.
+  ::std::vector<internal::BoundSecondMatcher<Tuple2Matcher, Second> > matchers;
+  for (typename RhsStlContainer::const_iterator it = rhs_stl_container.begin();
+       it != rhs_stl_container.end(); ++it) {
+    matchers.push_back(
+        internal::MatcherBindSecond(tuple2_matcher, *it));
+  }
+
+  // Delegate the work to UnorderedElementsAreArray().
+  return UnorderedElementsAreArray(matchers);
+}
+
+
+// Supports the UnorderedPointwise(m, {a, b, c}) syntax.
+template <typename Tuple2Matcher, typename T>
+inline internal::UnorderedElementsAreArrayMatcher<
+    typename internal::BoundSecondMatcher<Tuple2Matcher, T> >
+UnorderedPointwise(const Tuple2Matcher& tuple2_matcher,
+                   std::initializer_list<T> rhs) {
+  return UnorderedPointwise(tuple2_matcher, std::vector<T>(rhs));
+}
+
+
+// Matches an STL-style container or a native array that contains at
+// least one element matching the given value or matcher.
+//
+// Examples:
+//   ::std::set<int> page_ids;
+//   page_ids.insert(3);
+//   page_ids.insert(1);
+//   EXPECT_THAT(page_ids, Contains(1));
+//   EXPECT_THAT(page_ids, Contains(Gt(2)));
+//   EXPECT_THAT(page_ids, Not(Contains(4)));
+//
+//   ::std::map<int, size_t> page_lengths;
+//   page_lengths[1] = 100;
+//   EXPECT_THAT(page_lengths,
+//               Contains(::std::pair<const int, size_t>(1, 100)));
+//
+//   const char* user_ids[] = { "joe", "mike", "tom" };
+//   EXPECT_THAT(user_ids, Contains(Eq(::std::string("tom"))));
+template <typename M>
+inline internal::ContainsMatcher<M> Contains(M matcher) {
+  return internal::ContainsMatcher<M>(matcher);
+}
+
+// IsSupersetOf(iterator_first, iterator_last)
+// IsSupersetOf(pointer, count)
+// IsSupersetOf(array)
+// IsSupersetOf(container)
+// IsSupersetOf({e1, e2, ..., en})
+//
+// IsSupersetOf() verifies that a surjective partial mapping onto a collection
+// of matchers exists. In other words, a container matches
+// IsSupersetOf({e1, ..., en}) if and only if there is a permutation
+// {y1, ..., yn} of some of the container's elements where y1 matches e1,
+// ..., and yn matches en. Obviously, the size of the container must be >= n
+// in order to have a match. Examples:
+//
+// - {1, 2, 3} matches IsSupersetOf({Ge(3), Ne(0)}), as 3 matches Ge(3) and
+//   1 matches Ne(0).
+// - {1, 2} doesn't match IsSupersetOf({Eq(1), Lt(2)}), even though 1 matches
+//   both Eq(1) and Lt(2). The reason is that different matchers must be used
+//   for elements in different slots of the container.
+// - {1, 1, 2} matches IsSupersetOf({Eq(1), Lt(2)}), as (the first) 1 matches
+//   Eq(1) and (the second) 1 matches Lt(2).
+// - {1, 2, 3} matches IsSupersetOf(Gt(1), Gt(1)), as 2 matches (the first)
+//   Gt(1) and 3 matches (the second) Gt(1).
+//
+// The matchers can be specified as an array, a pointer and count, a container,
+// an initializer list, or an STL iterator range. In each of these cases, the
+// underlying matchers can be either values or matchers.
+
+template <typename Iter>
+inline internal::UnorderedElementsAreArrayMatcher<
+    typename ::std::iterator_traits<Iter>::value_type>
+IsSupersetOf(Iter first, Iter last) {
+  typedef typename ::std::iterator_traits<Iter>::value_type T;
+  return internal::UnorderedElementsAreArrayMatcher<T>(
+      internal::UnorderedMatcherRequire::Superset, first, last);
+}
+
+template <typename T>
+inline internal::UnorderedElementsAreArrayMatcher<T> IsSupersetOf(
+    const T* pointer, size_t count) {
+  return IsSupersetOf(pointer, pointer + count);
+}
+
+template <typename T, size_t N>
+inline internal::UnorderedElementsAreArrayMatcher<T> IsSupersetOf(
+    const T (&array)[N]) {
+  return IsSupersetOf(array, N);
+}
+
+template <typename Container>
+inline internal::UnorderedElementsAreArrayMatcher<
+    typename Container::value_type>
+IsSupersetOf(const Container& container) {
+  return IsSupersetOf(container.begin(), container.end());
+}
+
+template <typename T>
+inline internal::UnorderedElementsAreArrayMatcher<T> IsSupersetOf(
+    ::std::initializer_list<T> xs) {
+  return IsSupersetOf(xs.begin(), xs.end());
+}
+
+// IsSubsetOf(iterator_first, iterator_last)
+// IsSubsetOf(pointer, count)
+// IsSubsetOf(array)
+// IsSubsetOf(container)
+// IsSubsetOf({e1, e2, ..., en})
+//
+// IsSubsetOf() verifies that an injective mapping onto a collection of matchers
+// exists.  In other words, a container matches IsSubsetOf({e1, ..., en}) if and
+// only if there is a subset of matchers {m1, ..., mk} which would match the
+// container using UnorderedElementsAre.  Obviously, the size of the container
+// must be <= n in order to have a match. Examples:
+//
+// - {1} matches IsSubsetOf({Gt(0), Lt(0)}), as 1 matches Gt(0).
+// - {1, -1} matches IsSubsetOf({Lt(0), Gt(0)}), as 1 matches Gt(0) and -1
+//   matches Lt(0).
+// - {1, 2} doesn't matches IsSubsetOf({Gt(0), Lt(0)}), even though 1 and 2 both
+//   match Gt(0). The reason is that different matchers must be used for
+//   elements in different slots of the container.
+//
+// The matchers can be specified as an array, a pointer and count, a container,
+// an initializer list, or an STL iterator range. In each of these cases, the
+// underlying matchers can be either values or matchers.
+
+template <typename Iter>
+inline internal::UnorderedElementsAreArrayMatcher<
+    typename ::std::iterator_traits<Iter>::value_type>
+IsSubsetOf(Iter first, Iter last) {
+  typedef typename ::std::iterator_traits<Iter>::value_type T;
+  return internal::UnorderedElementsAreArrayMatcher<T>(
+      internal::UnorderedMatcherRequire::Subset, first, last);
+}
+
+template <typename T>
+inline internal::UnorderedElementsAreArrayMatcher<T> IsSubsetOf(
+    const T* pointer, size_t count) {
+  return IsSubsetOf(pointer, pointer + count);
+}
+
+template <typename T, size_t N>
+inline internal::UnorderedElementsAreArrayMatcher<T> IsSubsetOf(
+    const T (&array)[N]) {
+  return IsSubsetOf(array, N);
+}
+
+template <typename Container>
+inline internal::UnorderedElementsAreArrayMatcher<
+    typename Container::value_type>
+IsSubsetOf(const Container& container) {
+  return IsSubsetOf(container.begin(), container.end());
+}
+
+template <typename T>
+inline internal::UnorderedElementsAreArrayMatcher<T> IsSubsetOf(
+    ::std::initializer_list<T> xs) {
+  return IsSubsetOf(xs.begin(), xs.end());
+}
+
+// Matches an STL-style container or a native array that contains only
+// elements matching the given value or matcher.
+//
+// Each(m) is semantically equivalent to Not(Contains(Not(m))). Only
+// the messages are different.
+//
+// Examples:
+//   ::std::set<int> page_ids;
+//   // Each(m) matches an empty container, regardless of what m is.
+//   EXPECT_THAT(page_ids, Each(Eq(1)));
+//   EXPECT_THAT(page_ids, Each(Eq(77)));
+//
+//   page_ids.insert(3);
+//   EXPECT_THAT(page_ids, Each(Gt(0)));
+//   EXPECT_THAT(page_ids, Not(Each(Gt(4))));
+//   page_ids.insert(1);
+//   EXPECT_THAT(page_ids, Not(Each(Lt(2))));
+//
+//   ::std::map<int, size_t> page_lengths;
+//   page_lengths[1] = 100;
+//   page_lengths[2] = 200;
+//   page_lengths[3] = 300;
+//   EXPECT_THAT(page_lengths, Not(Each(Pair(1, 100))));
+//   EXPECT_THAT(page_lengths, Each(Key(Le(3))));
+//
+//   const char* user_ids[] = { "joe", "mike", "tom" };
+//   EXPECT_THAT(user_ids, Not(Each(Eq(::std::string("tom")))));
+template <typename M>
+inline internal::EachMatcher<M> Each(M matcher) {
+  return internal::EachMatcher<M>(matcher);
+}
+
+// Key(inner_matcher) matches an std::pair whose 'first' field matches
+// inner_matcher.  For example, Contains(Key(Ge(5))) can be used to match an
+// std::map that contains at least one element whose key is >= 5.
+template <typename M>
+inline internal::KeyMatcher<M> Key(M inner_matcher) {
+  return internal::KeyMatcher<M>(inner_matcher);
+}
+
+// Pair(first_matcher, second_matcher) matches a std::pair whose 'first' field
+// matches first_matcher and whose 'second' field matches second_matcher.  For
+// example, EXPECT_THAT(map_type, ElementsAre(Pair(Ge(5), "foo"))) can be used
+// to match a std::map<int, string> that contains exactly one element whose key
+// is >= 5 and whose value equals "foo".
+template <typename FirstMatcher, typename SecondMatcher>
+inline internal::PairMatcher<FirstMatcher, SecondMatcher>
+Pair(FirstMatcher first_matcher, SecondMatcher second_matcher) {
+  return internal::PairMatcher<FirstMatcher, SecondMatcher>(
+      first_matcher, second_matcher);
+}
+
+namespace no_adl {
+// FieldsAre(matchers...) matches piecewise the fields of compatible structs.
+// These include those that support `get<I>(obj)`, and when structured bindings
+// are enabled any class that supports them.
+// In particular, `std::tuple`, `std::pair`, `std::array` and aggregate types.
+template <typename... M>
+internal::FieldsAreMatcher<typename std::decay<M>::type...> FieldsAre(
+    M&&... matchers) {
+  return internal::FieldsAreMatcher<typename std::decay<M>::type...>(
+      std::forward<M>(matchers)...);
+}
+
+// Creates a matcher that matches a pointer (raw or smart) that matches
+// inner_matcher.
+template <typename InnerMatcher>
+inline internal::PointerMatcher<InnerMatcher> Pointer(
+    const InnerMatcher& inner_matcher) {
+  return internal::PointerMatcher<InnerMatcher>(inner_matcher);
+}
+
+// Creates a matcher that matches an object that has an address that matches
+// inner_matcher.
+template <typename InnerMatcher>
+inline internal::AddressMatcher<InnerMatcher> Address(
+    const InnerMatcher& inner_matcher) {
+  return internal::AddressMatcher<InnerMatcher>(inner_matcher);
+}
+}  // namespace no_adl
+
+// Returns a predicate that is satisfied by anything that matches the
+// given matcher.
+template <typename M>
+inline internal::MatcherAsPredicate<M> Matches(M matcher) {
+  return internal::MatcherAsPredicate<M>(matcher);
+}
+
+// Returns true if and only if the value matches the matcher.
+template <typename T, typename M>
+inline bool Value(const T& value, M matcher) {
+  return testing::Matches(matcher)(value);
+}
+
+// Matches the value against the given matcher and explains the match
+// result to listener.
+template <typename T, typename M>
+inline bool ExplainMatchResult(
+    M matcher, const T& value, MatchResultListener* listener) {
+  return SafeMatcherCast<const T&>(matcher).MatchAndExplain(value, listener);
+}
+
+// Returns a string representation of the given matcher.  Useful for description
+// strings of matchers defined using MATCHER_P* macros that accept matchers as
+// their arguments.  For example:
+//
+// MATCHER_P(XAndYThat, matcher,
+//           "X that " + DescribeMatcher<int>(matcher, negation) +
+//               " and Y that " + DescribeMatcher<double>(matcher, negation)) {
+//   return ExplainMatchResult(matcher, arg.x(), result_listener) &&
+//          ExplainMatchResult(matcher, arg.y(), result_listener);
+// }
+template <typename T, typename M>
+std::string DescribeMatcher(const M& matcher, bool negation = false) {
+  ::std::stringstream ss;
+  Matcher<T> monomorphic_matcher = SafeMatcherCast<T>(matcher);
+  if (negation) {
+    monomorphic_matcher.DescribeNegationTo(&ss);
+  } else {
+    monomorphic_matcher.DescribeTo(&ss);
+  }
+  return ss.str();
+}
+
+template <typename... Args>
+internal::ElementsAreMatcher<
+    std::tuple<typename std::decay<const Args&>::type...>>
+ElementsAre(const Args&... matchers) {
+  return internal::ElementsAreMatcher<
+      std::tuple<typename std::decay<const Args&>::type...>>(
+      std::make_tuple(matchers...));
+}
+
+template <typename... Args>
+internal::UnorderedElementsAreMatcher<
+    std::tuple<typename std::decay<const Args&>::type...>>
+UnorderedElementsAre(const Args&... matchers) {
+  return internal::UnorderedElementsAreMatcher<
+      std::tuple<typename std::decay<const Args&>::type...>>(
+      std::make_tuple(matchers...));
+}
+
+// Define variadic matcher versions.
+template <typename... Args>
+internal::AllOfMatcher<typename std::decay<const Args&>::type...> AllOf(
+    const Args&... matchers) {
+  return internal::AllOfMatcher<typename std::decay<const Args&>::type...>(
+      matchers...);
+}
+
+template <typename... Args>
+internal::AnyOfMatcher<typename std::decay<const Args&>::type...> AnyOf(
+    const Args&... matchers) {
+  return internal::AnyOfMatcher<typename std::decay<const Args&>::type...>(
+      matchers...);
+}
+
+// AnyOfArray(array)
+// AnyOfArray(pointer, count)
+// AnyOfArray(container)
+// AnyOfArray({ e1, e2, ..., en })
+// AnyOfArray(iterator_first, iterator_last)
+//
+// AnyOfArray() verifies whether a given value matches any member of a
+// collection of matchers.
+//
+// AllOfArray(array)
+// AllOfArray(pointer, count)
+// AllOfArray(container)
+// AllOfArray({ e1, e2, ..., en })
+// AllOfArray(iterator_first, iterator_last)
+//
+// AllOfArray() verifies whether a given value matches all members of a
+// collection of matchers.
+//
+// The matchers can be specified as an array, a pointer and count, a container,
+// an initializer list, or an STL iterator range. In each of these cases, the
+// underlying matchers can be either values or matchers.
+
+template <typename Iter>
+inline internal::AnyOfArrayMatcher<
+    typename ::std::iterator_traits<Iter>::value_type>
+AnyOfArray(Iter first, Iter last) {
+  return internal::AnyOfArrayMatcher<
+      typename ::std::iterator_traits<Iter>::value_type>(first, last);
+}
+
+template <typename Iter>
+inline internal::AllOfArrayMatcher<
+    typename ::std::iterator_traits<Iter>::value_type>
+AllOfArray(Iter first, Iter last) {
+  return internal::AllOfArrayMatcher<
+      typename ::std::iterator_traits<Iter>::value_type>(first, last);
+}
+
+template <typename T>
+inline internal::AnyOfArrayMatcher<T> AnyOfArray(const T* ptr, size_t count) {
+  return AnyOfArray(ptr, ptr + count);
+}
+
+template <typename T>
+inline internal::AllOfArrayMatcher<T> AllOfArray(const T* ptr, size_t count) {
+  return AllOfArray(ptr, ptr + count);
+}
+
+template <typename T, size_t N>
+inline internal::AnyOfArrayMatcher<T> AnyOfArray(const T (&array)[N]) {
+  return AnyOfArray(array, N);
+}
+
+template <typename T, size_t N>
+inline internal::AllOfArrayMatcher<T> AllOfArray(const T (&array)[N]) {
+  return AllOfArray(array, N);
+}
+
+template <typename Container>
+inline internal::AnyOfArrayMatcher<typename Container::value_type> AnyOfArray(
+    const Container& container) {
+  return AnyOfArray(container.begin(), container.end());
+}
+
+template <typename Container>
+inline internal::AllOfArrayMatcher<typename Container::value_type> AllOfArray(
+    const Container& container) {
+  return AllOfArray(container.begin(), container.end());
+}
+
+template <typename T>
+inline internal::AnyOfArrayMatcher<T> AnyOfArray(
+    ::std::initializer_list<T> xs) {
+  return AnyOfArray(xs.begin(), xs.end());
+}
+
+template <typename T>
+inline internal::AllOfArrayMatcher<T> AllOfArray(
+    ::std::initializer_list<T> xs) {
+  return AllOfArray(xs.begin(), xs.end());
+}
+
+// Args<N1, N2, ..., Nk>(a_matcher) matches a tuple if the selected
+// fields of it matches a_matcher.  C++ doesn't support default
+// arguments for function templates, so we have to overload it.
+template <size_t... k, typename InnerMatcher>
+internal::ArgsMatcher<typename std::decay<InnerMatcher>::type, k...> Args(
+    InnerMatcher&& matcher) {
+  return internal::ArgsMatcher<typename std::decay<InnerMatcher>::type, k...>(
+      std::forward<InnerMatcher>(matcher));
+}
+
+// AllArgs(m) is a synonym of m.  This is useful in
+//
+//   EXPECT_CALL(foo, Bar(_, _)).With(AllArgs(Eq()));
+//
+// which is easier to read than
+//
+//   EXPECT_CALL(foo, Bar(_, _)).With(Eq());
+template <typename InnerMatcher>
+inline InnerMatcher AllArgs(const InnerMatcher& matcher) { return matcher; }
+
+// Returns a matcher that matches the value of an optional<> type variable.
+// The matcher implementation only uses '!arg' and requires that the optional<>
+// type has a 'value_type' member type and that '*arg' is of type 'value_type'
+// and is printable using 'PrintToString'. It is compatible with
+// std::optional/std::experimental::optional.
+// Note that to compare an optional type variable against nullopt you should
+// use Eq(nullopt) and not Eq(Optional(nullopt)). The latter implies that the
+// optional value contains an optional itself.
+template <typename ValueMatcher>
+inline internal::OptionalMatcher<ValueMatcher> Optional(
+    const ValueMatcher& value_matcher) {
+  return internal::OptionalMatcher<ValueMatcher>(value_matcher);
+}
+
+// Returns a matcher that matches the value of a absl::any type variable.
+template <typename T>
+PolymorphicMatcher<internal::any_cast_matcher::AnyCastMatcher<T> > AnyWith(
+    const Matcher<const T&>& matcher) {
+  return MakePolymorphicMatcher(
+      internal::any_cast_matcher::AnyCastMatcher<T>(matcher));
+}
+
+// Returns a matcher that matches the value of a variant<> type variable.
+// The matcher implementation uses ADL to find the holds_alternative and get
+// functions.
+// It is compatible with std::variant.
+template <typename T>
+PolymorphicMatcher<internal::variant_matcher::VariantMatcher<T> > VariantWith(
+    const Matcher<const T&>& matcher) {
+  return MakePolymorphicMatcher(
+      internal::variant_matcher::VariantMatcher<T>(matcher));
+}
+
+#if GTEST_HAS_EXCEPTIONS
+
+// Anything inside the `internal` namespace is internal to the implementation
+// and must not be used in user code!
+namespace internal {
+
+class WithWhatMatcherImpl {
+ public:
+  WithWhatMatcherImpl(Matcher<std::string> matcher)
+      : matcher_(std::move(matcher)) {}
+
+  void DescribeTo(std::ostream* os) const {
+    *os << "contains .what() that ";
+    matcher_.DescribeTo(os);
+  }
+
+  void DescribeNegationTo(std::ostream* os) const {
+    *os << "contains .what() that does not ";
+    matcher_.DescribeTo(os);
+  }
+
+  template <typename Err>
+  bool MatchAndExplain(const Err& err, MatchResultListener* listener) const {
+    *listener << "which contains .what() that ";
+    return matcher_.MatchAndExplain(err.what(), listener);
+  }
+
+ private:
+  const Matcher<std::string> matcher_;
+};
+
+inline PolymorphicMatcher<WithWhatMatcherImpl> WithWhat(
+    Matcher<std::string> m) {
+  return MakePolymorphicMatcher(WithWhatMatcherImpl(std::move(m)));
+}
+
+template <typename Err>
+class ExceptionMatcherImpl {
+  class NeverThrown {
+   public:
+    const char* what() const noexcept {
+      return "this exception should never be thrown";
+    }
+  };
+
+  // If the matchee raises an exception of a wrong type, we'd like to
+  // catch it and print its message and type. To do that, we add an additional
+  // catch clause:
+  //
+  //     try { ... }
+  //     catch (const Err&) { /* an expected exception */ }
+  //     catch (const std::exception&) { /* exception of a wrong type */ }
+  //
+  // However, if the `Err` itself is `std::exception`, we'd end up with two
+  // identical `catch` clauses:
+  //
+  //     try { ... }
+  //     catch (const std::exception&) { /* an expected exception */ }
+  //     catch (const std::exception&) { /* exception of a wrong type */ }
+  //
+  // This can cause a warning or an error in some compilers. To resolve
+  // the issue, we use a fake error type whenever `Err` is `std::exception`:
+  //
+  //     try { ... }
+  //     catch (const std::exception&) { /* an expected exception */ }
+  //     catch (const NeverThrown&) { /* exception of a wrong type */ }
+  using DefaultExceptionType = typename std::conditional<
+      std::is_same<typename std::remove_cv<
+                       typename std::remove_reference<Err>::type>::type,
+                   std::exception>::value,
+      const NeverThrown&, const std::exception&>::type;
+
+ public:
+  ExceptionMatcherImpl(Matcher<const Err&> matcher)
+      : matcher_(std::move(matcher)) {}
+
+  void DescribeTo(std::ostream* os) const {
+    *os << "throws an exception which is a " << GetTypeName<Err>();
+    *os << " which ";
+    matcher_.DescribeTo(os);
+  }
+
+  void DescribeNegationTo(std::ostream* os) const {
+    *os << "throws an exception which is not a " << GetTypeName<Err>();
+    *os << " which ";
+    matcher_.DescribeNegationTo(os);
+  }
+
+  template <typename T>
+  bool MatchAndExplain(T&& x, MatchResultListener* listener) const {
+    try {
+      (void)(std::forward<T>(x)());
+    } catch (const Err& err) {
+      *listener << "throws an exception which is a " << GetTypeName<Err>();
+      *listener << " ";
+      return matcher_.MatchAndExplain(err, listener);
+    } catch (DefaultExceptionType err) {
+#if GTEST_HAS_RTTI
+      *listener << "throws an exception of type " << GetTypeName(typeid(err));
+      *listener << " ";
+#else
+      *listener << "throws an std::exception-derived type ";
+#endif
+      *listener << "with description \"" << err.what() << "\"";
+      return false;
+    } catch (...) {
+      *listener << "throws an exception of an unknown type";
+      return false;
+    }
+
+    *listener << "does not throw any exception";
+    return false;
+  }
+
+ private:
+  const Matcher<const Err&> matcher_;
+};
+
+}  // namespace internal
+
+// Throws()
+// Throws(exceptionMatcher)
+// ThrowsMessage(messageMatcher)
+//
+// This matcher accepts a callable and verifies that when invoked, it throws
+// an exception with the given type and properties.
+//
+// Examples:
+//
+//   EXPECT_THAT(
+//       []() { throw std::runtime_error("message"); },
+//       Throws<std::runtime_error>());
+//
+//   EXPECT_THAT(
+//       []() { throw std::runtime_error("message"); },
+//       ThrowsMessage<std::runtime_error>(HasSubstr("message")));
+//
+//   EXPECT_THAT(
+//       []() { throw std::runtime_error("message"); },
+//       Throws<std::runtime_error>(
+//           Property(&std::runtime_error::what, HasSubstr("message"))));
+
+template <typename Err>
+PolymorphicMatcher<internal::ExceptionMatcherImpl<Err>> Throws() {
+  return MakePolymorphicMatcher(
+      internal::ExceptionMatcherImpl<Err>(A<const Err&>()));
+}
+
+template <typename Err, typename ExceptionMatcher>
+PolymorphicMatcher<internal::ExceptionMatcherImpl<Err>> Throws(
+    const ExceptionMatcher& exception_matcher) {
+  // Using matcher cast allows users to pass a matcher of a more broad type.
+  // For example user may want to pass Matcher<std::exception>
+  // to Throws<std::runtime_error>, or Matcher<int64> to Throws<int32>.
+  return MakePolymorphicMatcher(internal::ExceptionMatcherImpl<Err>(
+      SafeMatcherCast<const Err&>(exception_matcher)));
+}
+
+template <typename Err, typename MessageMatcher>
+PolymorphicMatcher<internal::ExceptionMatcherImpl<Err>> ThrowsMessage(
+    MessageMatcher&& message_matcher) {
+  static_assert(std::is_base_of<std::exception, Err>::value,
+                "expected an std::exception-derived type");
+  return Throws<Err>(internal::WithWhat(
+      MatcherCast<std::string>(std::forward<MessageMatcher>(message_matcher))));
+}
+
+#endif  // GTEST_HAS_EXCEPTIONS
+
+// These macros allow using matchers to check values in Google Test
+// tests.  ASSERT_THAT(value, matcher) and EXPECT_THAT(value, matcher)
+// succeed if and only if the value matches the matcher.  If the assertion
+// fails, the value and the description of the matcher will be printed.
+#define ASSERT_THAT(value, matcher) ASSERT_PRED_FORMAT1(\
+    ::testing::internal::MakePredicateFormatterFromMatcher(matcher), value)
+#define EXPECT_THAT(value, matcher) EXPECT_PRED_FORMAT1(\
+    ::testing::internal::MakePredicateFormatterFromMatcher(matcher), value)
+
+// MATCHER* macroses itself are listed below.
+#define MATCHER(name, description)                                             \
+  class name##Matcher                                                          \
+      : public ::testing::internal::MatcherBaseImpl<name##Matcher> {           \
+   public:                                                                     \
+    template <typename arg_type>                                               \
+    class gmock_Impl : public ::testing::MatcherInterface<const arg_type&> {   \
+     public:                                                                   \
+      gmock_Impl() {}                                                          \
+      bool MatchAndExplain(                                                    \
+          const arg_type& arg,                                                 \
+          ::testing::MatchResultListener* result_listener) const override;     \
+      void DescribeTo(::std::ostream* gmock_os) const override {               \
+        *gmock_os << FormatDescription(false);                                 \
+      }                                                                        \
+      void DescribeNegationTo(::std::ostream* gmock_os) const override {       \
+        *gmock_os << FormatDescription(true);                                  \
+      }                                                                        \
+                                                                               \
+     private:                                                                  \
+      ::std::string FormatDescription(bool negation) const {                   \
+        ::std::string gmock_description = (description);                       \
+        if (!gmock_description.empty()) {                                      \
+          return gmock_description;                                            \
+        }                                                                      \
+        return ::testing::internal::FormatMatcherDescription(negation, #name,  \
+                                                             {});              \
+      }                                                                        \
+    };                                                                         \
+  };                                                                           \
+  GTEST_ATTRIBUTE_UNUSED_ inline name##Matcher name() { return {}; }           \
+  template <typename arg_type>                                                 \
+  bool name##Matcher::gmock_Impl<arg_type>::MatchAndExplain(                   \
+      const arg_type& arg,                                                     \
+      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_) \
+      const
+
+#define MATCHER_P(name, p0, description) \
+  GMOCK_INTERNAL_MATCHER(name, name##MatcherP, description, (p0))
+#define MATCHER_P2(name, p0, p1, description) \
+  GMOCK_INTERNAL_MATCHER(name, name##MatcherP2, description, (p0, p1))
+#define MATCHER_P3(name, p0, p1, p2, description) \
+  GMOCK_INTERNAL_MATCHER(name, name##MatcherP3, description, (p0, p1, p2))
+#define MATCHER_P4(name, p0, p1, p2, p3, description) \
+  GMOCK_INTERNAL_MATCHER(name, name##MatcherP4, description, (p0, p1, p2, p3))
+#define MATCHER_P5(name, p0, p1, p2, p3, p4, description)    \
+  GMOCK_INTERNAL_MATCHER(name, name##MatcherP5, description, \
+                         (p0, p1, p2, p3, p4))
+#define MATCHER_P6(name, p0, p1, p2, p3, p4, p5, description) \
+  GMOCK_INTERNAL_MATCHER(name, name##MatcherP6, description,  \
+                         (p0, p1, p2, p3, p4, p5))
+#define MATCHER_P7(name, p0, p1, p2, p3, p4, p5, p6, description) \
+  GMOCK_INTERNAL_MATCHER(name, name##MatcherP7, description,      \
+                         (p0, p1, p2, p3, p4, p5, p6))
+#define MATCHER_P8(name, p0, p1, p2, p3, p4, p5, p6, p7, description) \
+  GMOCK_INTERNAL_MATCHER(name, name##MatcherP8, description,          \
+                         (p0, p1, p2, p3, p4, p5, p6, p7))
+#define MATCHER_P9(name, p0, p1, p2, p3, p4, p5, p6, p7, p8, description) \
+  GMOCK_INTERNAL_MATCHER(name, name##MatcherP9, description,              \
+                         (p0, p1, p2, p3, p4, p5, p6, p7, p8))
+#define MATCHER_P10(name, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, description) \
+  GMOCK_INTERNAL_MATCHER(name, name##MatcherP10, description,                  \
+                         (p0, p1, p2, p3, p4, p5, p6, p7, p8, p9))
+
+#define GMOCK_INTERNAL_MATCHER(name, full_name, description, args)             \
+  template <GMOCK_INTERNAL_MATCHER_TEMPLATE_PARAMS(args)>                      \
+  class full_name : public ::testing::internal::MatcherBaseImpl<               \
+                        full_name<GMOCK_INTERNAL_MATCHER_TYPE_PARAMS(args)>> { \
+   public:                                                                     \
+    using full_name::MatcherBaseImpl::MatcherBaseImpl;                         \
+    template <typename arg_type>                                               \
+    class gmock_Impl : public ::testing::MatcherInterface<const arg_type&> {   \
+     public:                                                                   \
+      explicit gmock_Impl(GMOCK_INTERNAL_MATCHER_FUNCTION_ARGS(args))          \
+          : GMOCK_INTERNAL_MATCHER_FORWARD_ARGS(args) {}                       \
+      bool MatchAndExplain(                                                    \
+          const arg_type& arg,                                                 \
+          ::testing::MatchResultListener* result_listener) const override;     \
+      void DescribeTo(::std::ostream* gmock_os) const override {               \
+        *gmock_os << FormatDescription(false);                                 \
+      }                                                                        \
+      void DescribeNegationTo(::std::ostream* gmock_os) const override {       \
+        *gmock_os << FormatDescription(true);                                  \
+      }                                                                        \
+      GMOCK_INTERNAL_MATCHER_MEMBERS(args)                                     \
+                                                                               \
+     private:                                                                  \
+      ::std::string FormatDescription(bool negation) const {                   \
+        ::std::string gmock_description = (description);                       \
+        if (!gmock_description.empty()) {                                      \
+          return gmock_description;                                            \
+        }                                                                      \
+        return ::testing::internal::FormatMatcherDescription(                  \
+            negation, #name,                                                   \
+            ::testing::internal::UniversalTersePrintTupleFieldsToStrings(      \
+                ::std::tuple<GMOCK_INTERNAL_MATCHER_TYPE_PARAMS(args)>(        \
+                    GMOCK_INTERNAL_MATCHER_MEMBERS_USAGE(args))));             \
+      }                                                                        \
+    };                                                                         \
+  };                                                                           \
+  template <GMOCK_INTERNAL_MATCHER_TEMPLATE_PARAMS(args)>                      \
+  inline full_name<GMOCK_INTERNAL_MATCHER_TYPE_PARAMS(args)> name(             \
+      GMOCK_INTERNAL_MATCHER_FUNCTION_ARGS(args)) {                            \
+    return full_name<GMOCK_INTERNAL_MATCHER_TYPE_PARAMS(args)>(                \
+        GMOCK_INTERNAL_MATCHER_ARGS_USAGE(args));                              \
+  }                                                                            \
+  template <GMOCK_INTERNAL_MATCHER_TEMPLATE_PARAMS(args)>                      \
+  template <typename arg_type>                                                 \
+  bool full_name<GMOCK_INTERNAL_MATCHER_TYPE_PARAMS(args)>::gmock_Impl<        \
+      arg_type>::MatchAndExplain(const arg_type& arg,                          \
+                                 ::testing::MatchResultListener*               \
+                                     result_listener GTEST_ATTRIBUTE_UNUSED_)  \
+      const
+
+#define GMOCK_INTERNAL_MATCHER_TEMPLATE_PARAMS(args) \
+  GMOCK_PP_TAIL(                                     \
+      GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_MATCHER_TEMPLATE_PARAM, , args))
+#define GMOCK_INTERNAL_MATCHER_TEMPLATE_PARAM(i_unused, data_unused, arg) \
+  , typename arg##_type
+
+#define GMOCK_INTERNAL_MATCHER_TYPE_PARAMS(args) \
+  GMOCK_PP_TAIL(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_MATCHER_TYPE_PARAM, , args))
+#define GMOCK_INTERNAL_MATCHER_TYPE_PARAM(i_unused, data_unused, arg) \
+  , arg##_type
+
+#define GMOCK_INTERNAL_MATCHER_FUNCTION_ARGS(args) \
+  GMOCK_PP_TAIL(dummy_first GMOCK_PP_FOR_EACH(     \
+      GMOCK_INTERNAL_MATCHER_FUNCTION_ARG, , args))
+#define GMOCK_INTERNAL_MATCHER_FUNCTION_ARG(i, data_unused, arg) \
+  , arg##_type gmock_p##i
+
+#define GMOCK_INTERNAL_MATCHER_FORWARD_ARGS(args) \
+  GMOCK_PP_TAIL(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_MATCHER_FORWARD_ARG, , args))
+#define GMOCK_INTERNAL_MATCHER_FORWARD_ARG(i, data_unused, arg) \
+  , arg(::std::forward<arg##_type>(gmock_p##i))
+
+#define GMOCK_INTERNAL_MATCHER_MEMBERS(args) \
+  GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_MATCHER_MEMBER, , args)
+#define GMOCK_INTERNAL_MATCHER_MEMBER(i_unused, data_unused, arg) \
+  const arg##_type arg;
+
+#define GMOCK_INTERNAL_MATCHER_MEMBERS_USAGE(args) \
+  GMOCK_PP_TAIL(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_MATCHER_MEMBER_USAGE, , args))
+#define GMOCK_INTERNAL_MATCHER_MEMBER_USAGE(i_unused, data_unused, arg) , arg
+
+#define GMOCK_INTERNAL_MATCHER_ARGS_USAGE(args) \
+  GMOCK_PP_TAIL(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_MATCHER_ARG_USAGE, , args))
+#define GMOCK_INTERNAL_MATCHER_ARG_USAGE(i, data_unused, arg_unused) \
+  , gmock_p##i
+
+// To prevent ADL on certain functions we put them on a separate namespace.
+using namespace no_adl;  // NOLINT
+
+}  // namespace testing
+
+GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251 5046
+
+// Include any custom callback matchers added by the local installation.
+// We must include this header at the end to make sure it can use the
+// declarations from this file.
+#include "gmock/internal/custom/gmock-matchers.h"
+
+#endif  // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MATCHERS_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/gmock-more-actions.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/gmock-more-actions.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/gmock-more-actions.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/gmock-more-actions.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,573 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file implements some commonly used variadic actions.
+
+// GOOGLETEST_CM0002 DO NOT DELETE
+
+#ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MORE_ACTIONS_H_
+#define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MORE_ACTIONS_H_
+
+#include <memory>
+#include <utility>
+
+#include "gmock/gmock-actions.h"
+#include "gmock/internal/gmock-port.h"
+
+// Include any custom callback actions added by the local installation.
+#include "gmock/internal/custom/gmock-generated-actions.h"
+
+// Sometimes you want to give an action explicit template parameters
+// that cannot be inferred from its value parameters.  ACTION() and
+// ACTION_P*() don't support that.  ACTION_TEMPLATE() remedies that
+// and can be viewed as an extension to ACTION() and ACTION_P*().
+//
+// The syntax:
+//
+//   ACTION_TEMPLATE(ActionName,
+//                   HAS_m_TEMPLATE_PARAMS(kind1, name1, ..., kind_m, name_m),
+//                   AND_n_VALUE_PARAMS(p1, ..., p_n)) { statements; }
+//
+// defines an action template that takes m explicit template
+// parameters and n value parameters.  name_i is the name of the i-th
+// template parameter, and kind_i specifies whether it's a typename,
+// an integral constant, or a template.  p_i is the name of the i-th
+// value parameter.
+//
+// Example:
+//
+//   // DuplicateArg<k, T>(output) converts the k-th argument of the mock
+//   // function to type T and copies it to *output.
+//   ACTION_TEMPLATE(DuplicateArg,
+//                   HAS_2_TEMPLATE_PARAMS(int, k, typename, T),
+//                   AND_1_VALUE_PARAMS(output)) {
+//     *output = T(::std::get<k>(args));
+//   }
+//   ...
+//     int n;
+//     EXPECT_CALL(mock, Foo(_, _))
+//         .WillOnce(DuplicateArg<1, unsigned char>(&n));
+//
+// To create an instance of an action template, write:
+//
+//   ActionName<t1, ..., t_m>(v1, ..., v_n)
+//
+// where the ts are the template arguments and the vs are the value
+// arguments.  The value argument types are inferred by the compiler.
+// If you want to explicitly specify the value argument types, you can
+// provide additional template arguments:
+//
+//   ActionName<t1, ..., t_m, u1, ..., u_k>(v1, ..., v_n)
+//
+// where u_i is the desired type of v_i.
+//
+// ACTION_TEMPLATE and ACTION/ACTION_P* can be overloaded on the
+// number of value parameters, but not on the number of template
+// parameters.  Without the restriction, the meaning of the following
+// is unclear:
+//
+//   OverloadedAction<int, bool>(x);
+//
+// Are we using a single-template-parameter action where 'bool' refers
+// to the type of x, or are we using a two-template-parameter action
+// where the compiler is asked to infer the type of x?
+//
+// Implementation notes:
+//
+// GMOCK_INTERNAL_*_HAS_m_TEMPLATE_PARAMS and
+// GMOCK_INTERNAL_*_AND_n_VALUE_PARAMS are internal macros for
+// implementing ACTION_TEMPLATE.  The main trick we use is to create
+// new macro invocations when expanding a macro.  For example, we have
+//
+//   #define ACTION_TEMPLATE(name, template_params, value_params)
+//       ... GMOCK_INTERNAL_DECL_##template_params ...
+//
+// which causes ACTION_TEMPLATE(..., HAS_1_TEMPLATE_PARAMS(typename, T), ...)
+// to expand to
+//
+//       ... GMOCK_INTERNAL_DECL_HAS_1_TEMPLATE_PARAMS(typename, T) ...
+//
+// Since GMOCK_INTERNAL_DECL_HAS_1_TEMPLATE_PARAMS is a macro, the
+// preprocessor will continue to expand it to
+//
+//       ... typename T ...
+//
+// This technique conforms to the C++ standard and is portable.  It
+// allows us to implement action templates using O(N) code, where N is
+// the maximum number of template/value parameters supported.  Without
+// using it, we'd have to devote O(N^2) amount of code to implement all
+// combinations of m and n.
+
+// Declares the template parameters.
+#define GMOCK_INTERNAL_DECL_HAS_1_TEMPLATE_PARAMS(kind0, name0) kind0 name0
+#define GMOCK_INTERNAL_DECL_HAS_2_TEMPLATE_PARAMS(kind0, name0, kind1, \
+    name1) kind0 name0, kind1 name1
+#define GMOCK_INTERNAL_DECL_HAS_3_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
+    kind2, name2) kind0 name0, kind1 name1, kind2 name2
+#define GMOCK_INTERNAL_DECL_HAS_4_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
+    kind2, name2, kind3, name3) kind0 name0, kind1 name1, kind2 name2, \
+    kind3 name3
+#define GMOCK_INTERNAL_DECL_HAS_5_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
+    kind2, name2, kind3, name3, kind4, name4) kind0 name0, kind1 name1, \
+    kind2 name2, kind3 name3, kind4 name4
+#define GMOCK_INTERNAL_DECL_HAS_6_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
+    kind2, name2, kind3, name3, kind4, name4, kind5, name5) kind0 name0, \
+    kind1 name1, kind2 name2, kind3 name3, kind4 name4, kind5 name5
+#define GMOCK_INTERNAL_DECL_HAS_7_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
+    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, \
+    name6) kind0 name0, kind1 name1, kind2 name2, kind3 name3, kind4 name4, \
+    kind5 name5, kind6 name6
+#define GMOCK_INTERNAL_DECL_HAS_8_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
+    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, name6, \
+    kind7, name7) kind0 name0, kind1 name1, kind2 name2, kind3 name3, \
+    kind4 name4, kind5 name5, kind6 name6, kind7 name7
+#define GMOCK_INTERNAL_DECL_HAS_9_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
+    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, name6, \
+    kind7, name7, kind8, name8) kind0 name0, kind1 name1, kind2 name2, \
+    kind3 name3, kind4 name4, kind5 name5, kind6 name6, kind7 name7, \
+    kind8 name8
+#define GMOCK_INTERNAL_DECL_HAS_10_TEMPLATE_PARAMS(kind0, name0, kind1, \
+    name1, kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, \
+    name6, kind7, name7, kind8, name8, kind9, name9) kind0 name0, \
+    kind1 name1, kind2 name2, kind3 name3, kind4 name4, kind5 name5, \
+    kind6 name6, kind7 name7, kind8 name8, kind9 name9
+
+// Lists the template parameters.
+#define GMOCK_INTERNAL_LIST_HAS_1_TEMPLATE_PARAMS(kind0, name0) name0
+#define GMOCK_INTERNAL_LIST_HAS_2_TEMPLATE_PARAMS(kind0, name0, kind1, \
+    name1) name0, name1
+#define GMOCK_INTERNAL_LIST_HAS_3_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
+    kind2, name2) name0, name1, name2
+#define GMOCK_INTERNAL_LIST_HAS_4_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
+    kind2, name2, kind3, name3) name0, name1, name2, name3
+#define GMOCK_INTERNAL_LIST_HAS_5_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
+    kind2, name2, kind3, name3, kind4, name4) name0, name1, name2, name3, \
+    name4
+#define GMOCK_INTERNAL_LIST_HAS_6_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
+    kind2, name2, kind3, name3, kind4, name4, kind5, name5) name0, name1, \
+    name2, name3, name4, name5
+#define GMOCK_INTERNAL_LIST_HAS_7_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
+    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, \
+    name6) name0, name1, name2, name3, name4, name5, name6
+#define GMOCK_INTERNAL_LIST_HAS_8_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
+    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, name6, \
+    kind7, name7) name0, name1, name2, name3, name4, name5, name6, name7
+#define GMOCK_INTERNAL_LIST_HAS_9_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
+    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, name6, \
+    kind7, name7, kind8, name8) name0, name1, name2, name3, name4, name5, \
+    name6, name7, name8
+#define GMOCK_INTERNAL_LIST_HAS_10_TEMPLATE_PARAMS(kind0, name0, kind1, \
+    name1, kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, \
+    name6, kind7, name7, kind8, name8, kind9, name9) name0, name1, name2, \
+    name3, name4, name5, name6, name7, name8, name9
+
+// Declares the types of value parameters.
+#define GMOCK_INTERNAL_DECL_TYPE_AND_0_VALUE_PARAMS()
+#define GMOCK_INTERNAL_DECL_TYPE_AND_1_VALUE_PARAMS(p0) , typename p0##_type
+#define GMOCK_INTERNAL_DECL_TYPE_AND_2_VALUE_PARAMS(p0, p1) , \
+    typename p0##_type, typename p1##_type
+#define GMOCK_INTERNAL_DECL_TYPE_AND_3_VALUE_PARAMS(p0, p1, p2) , \
+    typename p0##_type, typename p1##_type, typename p2##_type
+#define GMOCK_INTERNAL_DECL_TYPE_AND_4_VALUE_PARAMS(p0, p1, p2, p3) , \
+    typename p0##_type, typename p1##_type, typename p2##_type, \
+    typename p3##_type
+#define GMOCK_INTERNAL_DECL_TYPE_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4) , \
+    typename p0##_type, typename p1##_type, typename p2##_type, \
+    typename p3##_type, typename p4##_type
+#define GMOCK_INTERNAL_DECL_TYPE_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5) , \
+    typename p0##_type, typename p1##_type, typename p2##_type, \
+    typename p3##_type, typename p4##_type, typename p5##_type
+#define GMOCK_INTERNAL_DECL_TYPE_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
+    p6) , typename p0##_type, typename p1##_type, typename p2##_type, \
+    typename p3##_type, typename p4##_type, typename p5##_type, \
+    typename p6##_type
+#define GMOCK_INTERNAL_DECL_TYPE_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
+    p6, p7) , typename p0##_type, typename p1##_type, typename p2##_type, \
+    typename p3##_type, typename p4##_type, typename p5##_type, \
+    typename p6##_type, typename p7##_type
+#define GMOCK_INTERNAL_DECL_TYPE_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
+    p6, p7, p8) , typename p0##_type, typename p1##_type, typename p2##_type, \
+    typename p3##_type, typename p4##_type, typename p5##_type, \
+    typename p6##_type, typename p7##_type, typename p8##_type
+#define GMOCK_INTERNAL_DECL_TYPE_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
+    p6, p7, p8, p9) , typename p0##_type, typename p1##_type, \
+    typename p2##_type, typename p3##_type, typename p4##_type, \
+    typename p5##_type, typename p6##_type, typename p7##_type, \
+    typename p8##_type, typename p9##_type
+
+// Initializes the value parameters.
+#define GMOCK_INTERNAL_INIT_AND_0_VALUE_PARAMS()\
+    ()
+#define GMOCK_INTERNAL_INIT_AND_1_VALUE_PARAMS(p0)\
+    (p0##_type gmock_p0) : p0(::std::move(gmock_p0))
+#define GMOCK_INTERNAL_INIT_AND_2_VALUE_PARAMS(p0, p1)\
+    (p0##_type gmock_p0, p1##_type gmock_p1) : p0(::std::move(gmock_p0)), \
+        p1(::std::move(gmock_p1))
+#define GMOCK_INTERNAL_INIT_AND_3_VALUE_PARAMS(p0, p1, p2)\
+    (p0##_type gmock_p0, p1##_type gmock_p1, \
+        p2##_type gmock_p2) : p0(::std::move(gmock_p0)), \
+        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2))
+#define GMOCK_INTERNAL_INIT_AND_4_VALUE_PARAMS(p0, p1, p2, p3)\
+    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
+        p3##_type gmock_p3) : p0(::std::move(gmock_p0)), \
+        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
+        p3(::std::move(gmock_p3))
+#define GMOCK_INTERNAL_INIT_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4)\
+    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
+        p3##_type gmock_p3, p4##_type gmock_p4) : p0(::std::move(gmock_p0)), \
+        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
+        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4))
+#define GMOCK_INTERNAL_INIT_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5)\
+    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
+        p3##_type gmock_p3, p4##_type gmock_p4, \
+        p5##_type gmock_p5) : p0(::std::move(gmock_p0)), \
+        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
+        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \
+        p5(::std::move(gmock_p5))
+#define GMOCK_INTERNAL_INIT_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6)\
+    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
+        p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
+        p6##_type gmock_p6) : p0(::std::move(gmock_p0)), \
+        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
+        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \
+        p5(::std::move(gmock_p5)), p6(::std::move(gmock_p6))
+#define GMOCK_INTERNAL_INIT_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7)\
+    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
+        p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
+        p6##_type gmock_p6, p7##_type gmock_p7) : p0(::std::move(gmock_p0)), \
+        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
+        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \
+        p5(::std::move(gmock_p5)), p6(::std::move(gmock_p6)), \
+        p7(::std::move(gmock_p7))
+#define GMOCK_INTERNAL_INIT_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
+    p7, p8)\
+    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
+        p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
+        p6##_type gmock_p6, p7##_type gmock_p7, \
+        p8##_type gmock_p8) : p0(::std::move(gmock_p0)), \
+        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
+        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \
+        p5(::std::move(gmock_p5)), p6(::std::move(gmock_p6)), \
+        p7(::std::move(gmock_p7)), p8(::std::move(gmock_p8))
+#define GMOCK_INTERNAL_INIT_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
+    p7, p8, p9)\
+    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
+        p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
+        p6##_type gmock_p6, p7##_type gmock_p7, p8##_type gmock_p8, \
+        p9##_type gmock_p9) : p0(::std::move(gmock_p0)), \
+        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
+        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \
+        p5(::std::move(gmock_p5)), p6(::std::move(gmock_p6)), \
+        p7(::std::move(gmock_p7)), p8(::std::move(gmock_p8)), \
+        p9(::std::move(gmock_p9))
+
+// Defines the copy constructor
+#define GMOCK_INTERNAL_DEFN_COPY_AND_0_VALUE_PARAMS() \
+    {}  // Avoid https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82134
+#define GMOCK_INTERNAL_DEFN_COPY_AND_1_VALUE_PARAMS(...) = default;
+#define GMOCK_INTERNAL_DEFN_COPY_AND_2_VALUE_PARAMS(...) = default;
+#define GMOCK_INTERNAL_DEFN_COPY_AND_3_VALUE_PARAMS(...) = default;
+#define GMOCK_INTERNAL_DEFN_COPY_AND_4_VALUE_PARAMS(...) = default;
+#define GMOCK_INTERNAL_DEFN_COPY_AND_5_VALUE_PARAMS(...) = default;
+#define GMOCK_INTERNAL_DEFN_COPY_AND_6_VALUE_PARAMS(...) = default;
+#define GMOCK_INTERNAL_DEFN_COPY_AND_7_VALUE_PARAMS(...) = default;
+#define GMOCK_INTERNAL_DEFN_COPY_AND_8_VALUE_PARAMS(...) = default;
+#define GMOCK_INTERNAL_DEFN_COPY_AND_9_VALUE_PARAMS(...) = default;
+#define GMOCK_INTERNAL_DEFN_COPY_AND_10_VALUE_PARAMS(...) = default;
+
+// Declares the fields for storing the value parameters.
+#define GMOCK_INTERNAL_DEFN_AND_0_VALUE_PARAMS()
+#define GMOCK_INTERNAL_DEFN_AND_1_VALUE_PARAMS(p0) p0##_type p0;
+#define GMOCK_INTERNAL_DEFN_AND_2_VALUE_PARAMS(p0, p1) p0##_type p0; \
+    p1##_type p1;
+#define GMOCK_INTERNAL_DEFN_AND_3_VALUE_PARAMS(p0, p1, p2) p0##_type p0; \
+    p1##_type p1; p2##_type p2;
+#define GMOCK_INTERNAL_DEFN_AND_4_VALUE_PARAMS(p0, p1, p2, p3) p0##_type p0; \
+    p1##_type p1; p2##_type p2; p3##_type p3;
+#define GMOCK_INTERNAL_DEFN_AND_5_VALUE_PARAMS(p0, p1, p2, p3, \
+    p4) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; p4##_type p4;
+#define GMOCK_INTERNAL_DEFN_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, \
+    p5) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; p4##_type p4; \
+    p5##_type p5;
+#define GMOCK_INTERNAL_DEFN_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
+    p6) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; p4##_type p4; \
+    p5##_type p5; p6##_type p6;
+#define GMOCK_INTERNAL_DEFN_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
+    p7) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; p4##_type p4; \
+    p5##_type p5; p6##_type p6; p7##_type p7;
+#define GMOCK_INTERNAL_DEFN_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
+    p7, p8) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; \
+    p4##_type p4; p5##_type p5; p6##_type p6; p7##_type p7; p8##_type p8;
+#define GMOCK_INTERNAL_DEFN_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
+    p7, p8, p9) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; \
+    p4##_type p4; p5##_type p5; p6##_type p6; p7##_type p7; p8##_type p8; \
+    p9##_type p9;
+
+// Lists the value parameters.
+#define GMOCK_INTERNAL_LIST_AND_0_VALUE_PARAMS()
+#define GMOCK_INTERNAL_LIST_AND_1_VALUE_PARAMS(p0) p0
+#define GMOCK_INTERNAL_LIST_AND_2_VALUE_PARAMS(p0, p1) p0, p1
+#define GMOCK_INTERNAL_LIST_AND_3_VALUE_PARAMS(p0, p1, p2) p0, p1, p2
+#define GMOCK_INTERNAL_LIST_AND_4_VALUE_PARAMS(p0, p1, p2, p3) p0, p1, p2, p3
+#define GMOCK_INTERNAL_LIST_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4) p0, p1, \
+    p2, p3, p4
+#define GMOCK_INTERNAL_LIST_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5) p0, \
+    p1, p2, p3, p4, p5
+#define GMOCK_INTERNAL_LIST_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
+    p6) p0, p1, p2, p3, p4, p5, p6
+#define GMOCK_INTERNAL_LIST_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
+    p7) p0, p1, p2, p3, p4, p5, p6, p7
+#define GMOCK_INTERNAL_LIST_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
+    p7, p8) p0, p1, p2, p3, p4, p5, p6, p7, p8
+#define GMOCK_INTERNAL_LIST_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
+    p7, p8, p9) p0, p1, p2, p3, p4, p5, p6, p7, p8, p9
+
+// Lists the value parameter types.
+#define GMOCK_INTERNAL_LIST_TYPE_AND_0_VALUE_PARAMS()
+#define GMOCK_INTERNAL_LIST_TYPE_AND_1_VALUE_PARAMS(p0) , p0##_type
+#define GMOCK_INTERNAL_LIST_TYPE_AND_2_VALUE_PARAMS(p0, p1) , p0##_type, \
+    p1##_type
+#define GMOCK_INTERNAL_LIST_TYPE_AND_3_VALUE_PARAMS(p0, p1, p2) , p0##_type, \
+    p1##_type, p2##_type
+#define GMOCK_INTERNAL_LIST_TYPE_AND_4_VALUE_PARAMS(p0, p1, p2, p3) , \
+    p0##_type, p1##_type, p2##_type, p3##_type
+#define GMOCK_INTERNAL_LIST_TYPE_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4) , \
+    p0##_type, p1##_type, p2##_type, p3##_type, p4##_type
+#define GMOCK_INTERNAL_LIST_TYPE_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5) , \
+    p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, p5##_type
+#define GMOCK_INTERNAL_LIST_TYPE_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
+    p6) , p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, p5##_type, \
+    p6##_type
+#define GMOCK_INTERNAL_LIST_TYPE_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
+    p6, p7) , p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
+    p5##_type, p6##_type, p7##_type
+#define GMOCK_INTERNAL_LIST_TYPE_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
+    p6, p7, p8) , p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
+    p5##_type, p6##_type, p7##_type, p8##_type
+#define GMOCK_INTERNAL_LIST_TYPE_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
+    p6, p7, p8, p9) , p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
+    p5##_type, p6##_type, p7##_type, p8##_type, p9##_type
+
+// Declares the value parameters.
+#define GMOCK_INTERNAL_DECL_AND_0_VALUE_PARAMS()
+#define GMOCK_INTERNAL_DECL_AND_1_VALUE_PARAMS(p0) p0##_type p0
+#define GMOCK_INTERNAL_DECL_AND_2_VALUE_PARAMS(p0, p1) p0##_type p0, \
+    p1##_type p1
+#define GMOCK_INTERNAL_DECL_AND_3_VALUE_PARAMS(p0, p1, p2) p0##_type p0, \
+    p1##_type p1, p2##_type p2
+#define GMOCK_INTERNAL_DECL_AND_4_VALUE_PARAMS(p0, p1, p2, p3) p0##_type p0, \
+    p1##_type p1, p2##_type p2, p3##_type p3
+#define GMOCK_INTERNAL_DECL_AND_5_VALUE_PARAMS(p0, p1, p2, p3, \
+    p4) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4
+#define GMOCK_INTERNAL_DECL_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, \
+    p5) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4, \
+    p5##_type p5
+#define GMOCK_INTERNAL_DECL_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
+    p6) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4, \
+    p5##_type p5, p6##_type p6
+#define GMOCK_INTERNAL_DECL_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
+    p7) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4, \
+    p5##_type p5, p6##_type p6, p7##_type p7
+#define GMOCK_INTERNAL_DECL_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
+    p7, p8) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, \
+    p4##_type p4, p5##_type p5, p6##_type p6, p7##_type p7, p8##_type p8
+#define GMOCK_INTERNAL_DECL_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
+    p7, p8, p9) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, \
+    p4##_type p4, p5##_type p5, p6##_type p6, p7##_type p7, p8##_type p8, \
+    p9##_type p9
+
+// The suffix of the class template implementing the action template.
+#define GMOCK_INTERNAL_COUNT_AND_0_VALUE_PARAMS()
+#define GMOCK_INTERNAL_COUNT_AND_1_VALUE_PARAMS(p0) P
+#define GMOCK_INTERNAL_COUNT_AND_2_VALUE_PARAMS(p0, p1) P2
+#define GMOCK_INTERNAL_COUNT_AND_3_VALUE_PARAMS(p0, p1, p2) P3
+#define GMOCK_INTERNAL_COUNT_AND_4_VALUE_PARAMS(p0, p1, p2, p3) P4
+#define GMOCK_INTERNAL_COUNT_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4) P5
+#define GMOCK_INTERNAL_COUNT_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5) P6
+#define GMOCK_INTERNAL_COUNT_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6) P7
+#define GMOCK_INTERNAL_COUNT_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
+    p7) P8
+#define GMOCK_INTERNAL_COUNT_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
+    p7, p8) P9
+#define GMOCK_INTERNAL_COUNT_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
+    p7, p8, p9) P10
+
+// The name of the class template implementing the action template.
+#define GMOCK_ACTION_CLASS_(name, value_params)\
+    GTEST_CONCAT_TOKEN_(name##Action, GMOCK_INTERNAL_COUNT_##value_params)
+
+#define ACTION_TEMPLATE(name, template_params, value_params)                   \
+  template <GMOCK_INTERNAL_DECL_##template_params                              \
+            GMOCK_INTERNAL_DECL_TYPE_##value_params>                           \
+  class GMOCK_ACTION_CLASS_(name, value_params) {                              \
+   public:                                                                     \
+    explicit GMOCK_ACTION_CLASS_(name, value_params)(                          \
+        GMOCK_INTERNAL_DECL_##value_params)                                    \
+        GMOCK_PP_IF(GMOCK_PP_IS_EMPTY(GMOCK_INTERNAL_COUNT_##value_params),    \
+                    = default; ,                                               \
+                    : impl_(std::make_shared<gmock_Impl>(                      \
+                                GMOCK_INTERNAL_LIST_##value_params)) { })      \
+    GMOCK_ACTION_CLASS_(name, value_params)(                                   \
+        const GMOCK_ACTION_CLASS_(name, value_params)&) noexcept               \
+        GMOCK_INTERNAL_DEFN_COPY_##value_params                                \
+    GMOCK_ACTION_CLASS_(name, value_params)(                                   \
+        GMOCK_ACTION_CLASS_(name, value_params)&&) noexcept                    \
+        GMOCK_INTERNAL_DEFN_COPY_##value_params                                \
+    template <typename F>                                                      \
+    operator ::testing::Action<F>() const {                                    \
+      return GMOCK_PP_IF(                                                      \
+          GMOCK_PP_IS_EMPTY(GMOCK_INTERNAL_COUNT_##value_params),              \
+                      (::testing::internal::MakeAction<F, gmock_Impl>()),      \
+                      (::testing::internal::MakeAction<F>(impl_)));            \
+    }                                                                          \
+   private:                                                                    \
+    class gmock_Impl {                                                         \
+     public:                                                                   \
+      explicit gmock_Impl GMOCK_INTERNAL_INIT_##value_params {}                \
+      template <typename function_type, typename return_type,                  \
+                typename args_type, GMOCK_ACTION_TEMPLATE_ARGS_NAMES_>         \
+      return_type gmock_PerformImpl(GMOCK_ACTION_ARG_TYPES_AND_NAMES_) const;  \
+      GMOCK_INTERNAL_DEFN_##value_params                                       \
+    };                                                                         \
+    GMOCK_PP_IF(GMOCK_PP_IS_EMPTY(GMOCK_INTERNAL_COUNT_##value_params),        \
+                , std::shared_ptr<const gmock_Impl> impl_;)                    \
+  };                                                                           \
+  template <GMOCK_INTERNAL_DECL_##template_params                              \
+            GMOCK_INTERNAL_DECL_TYPE_##value_params>                           \
+  GMOCK_ACTION_CLASS_(name, value_params)<                                     \
+      GMOCK_INTERNAL_LIST_##template_params                                    \
+      GMOCK_INTERNAL_LIST_TYPE_##value_params> name(                           \
+          GMOCK_INTERNAL_DECL_##value_params) GTEST_MUST_USE_RESULT_;          \
+  template <GMOCK_INTERNAL_DECL_##template_params                              \
+            GMOCK_INTERNAL_DECL_TYPE_##value_params>                           \
+  inline GMOCK_ACTION_CLASS_(name, value_params)<                              \
+      GMOCK_INTERNAL_LIST_##template_params                                    \
+      GMOCK_INTERNAL_LIST_TYPE_##value_params> name(                           \
+          GMOCK_INTERNAL_DECL_##value_params) {                                \
+    return GMOCK_ACTION_CLASS_(name, value_params)<                            \
+        GMOCK_INTERNAL_LIST_##template_params                                  \
+        GMOCK_INTERNAL_LIST_TYPE_##value_params>(                              \
+            GMOCK_INTERNAL_LIST_##value_params);                               \
+  }                                                                            \
+  template <GMOCK_INTERNAL_DECL_##template_params                              \
+            GMOCK_INTERNAL_DECL_TYPE_##value_params>                           \
+  template <typename function_type, typename return_type, typename args_type,  \
+            GMOCK_ACTION_TEMPLATE_ARGS_NAMES_>                                 \
+  return_type GMOCK_ACTION_CLASS_(name, value_params)<                         \
+      GMOCK_INTERNAL_LIST_##template_params                                    \
+      GMOCK_INTERNAL_LIST_TYPE_##value_params>::gmock_Impl::gmock_PerformImpl( \
+          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
+
+namespace testing {
+
+// The ACTION*() macros trigger warning C4100 (unreferenced formal
+// parameter) in MSVC with -W4.  Unfortunately they cannot be fixed in
+// the macro definition, as the warnings are generated when the macro
+// is expanded and macro expansion cannot contain #pragma.  Therefore
+// we suppress them here.
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable:4100)
+#endif
+
+namespace internal {
+
+// internal::InvokeArgument - a helper for InvokeArgument action.
+// The basic overloads are provided here for generic functors.
+// Overloads for other custom-callables are provided in the
+// internal/custom/gmock-generated-actions.h header.
+template <typename F, typename... Args>
+auto InvokeArgument(F f, Args... args) -> decltype(f(args...)) {
+  return f(args...);
+}
+
+template <std::size_t index, typename... Params>
+struct InvokeArgumentAction {
+  template <typename... Args>
+  auto operator()(Args&&... args) const -> decltype(internal::InvokeArgument(
+      std::get<index>(std::forward_as_tuple(std::forward<Args>(args)...)),
+      std::declval<const Params&>()...)) {
+    internal::FlatTuple<Args&&...> args_tuple(FlatTupleConstructTag{},
+                                              std::forward<Args>(args)...);
+    return params.Apply([&](const Params&... unpacked_params) {
+      auto&& callable = args_tuple.template Get<index>();
+      return internal::InvokeArgument(
+          std::forward<decltype(callable)>(callable), unpacked_params...);
+    });
+  }
+
+  internal::FlatTuple<Params...> params;
+};
+
+}  // namespace internal
+
+// The InvokeArgument<N>(a1, a2, ..., a_k) action invokes the N-th
+// (0-based) argument, which must be a k-ary callable, of the mock
+// function, with arguments a1, a2, ..., a_k.
+//
+// Notes:
+//
+//   1. The arguments are passed by value by default.  If you need to
+//   pass an argument by reference, wrap it inside std::ref().  For
+//   example,
+//
+//     InvokeArgument<1>(5, string("Hello"), std::ref(foo))
+//
+//   passes 5 and string("Hello") by value, and passes foo by
+//   reference.
+//
+//   2. If the callable takes an argument by reference but std::ref() is
+//   not used, it will receive the reference to a copy of the value,
+//   instead of the original value.  For example, when the 0-th
+//   argument of the mock function takes a const string&, the action
+//
+//     InvokeArgument<0>(string("Hello"))
+//
+//   makes a copy of the temporary string("Hello") object and passes a
+//   reference of the copy, instead of the original temporary object,
+//   to the callable.  This makes it easy for a user to define an
+//   InvokeArgument action from temporary values and have it performed
+//   later.
+template <std::size_t index, typename... Params>
+internal::InvokeArgumentAction<index, typename std::decay<Params>::type...>
+InvokeArgument(Params&&... params) {
+  return {internal::FlatTuple<typename std::decay<Params>::type...>(
+      internal::FlatTupleConstructTag{}, std::forward<Params>(params)...)};
+}
+
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif
+
+}  // namespace testing
+
+#endif  // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MORE_ACTIONS_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/gmock-more-matchers.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/gmock-more-matchers.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/gmock-more-matchers.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/gmock-more-matchers.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,92 @@
+// Copyright 2013, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file implements some matchers that depend on gmock-matchers.h.
+//
+// Note that tests are implemented in gmock-matchers_test.cc rather than
+// gmock-more-matchers-test.cc.
+
+// GOOGLETEST_CM0002 DO NOT DELETE
+
+#ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MORE_MATCHERS_H_
+#define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MORE_MATCHERS_H_
+
+#include "gmock/gmock-matchers.h"
+
+namespace testing {
+
+// Silence C4100 (unreferenced formal
+// parameter) for MSVC
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable:4100)
+#if (_MSC_VER == 1900)
+// and silence C4800 (C4800: 'int *const ': forcing value
+// to bool 'true' or 'false') for MSVC 14
+# pragma warning(disable:4800)
+  #endif
+#endif
+
+// Defines a matcher that matches an empty container. The container must
+// support both size() and empty(), which all STL-like containers provide.
+MATCHER(IsEmpty, negation ? "isn't empty" : "is empty") {
+  if (arg.empty()) {
+    return true;
+  }
+  *result_listener << "whose size is " << arg.size();
+  return false;
+}
+
+// Define a matcher that matches a value that evaluates in boolean
+// context to true.  Useful for types that define "explicit operator
+// bool" operators and so can't be compared for equality with true
+// and false.
+MATCHER(IsTrue, negation ? "is false" : "is true") {
+  return static_cast<bool>(arg);
+}
+
+// Define a matcher that matches a value that evaluates in boolean
+// context to false.  Useful for types that define "explicit operator
+// bool" operators and so can't be compared for equality with true
+// and false.
+MATCHER(IsFalse, negation ? "is true" : "is false") {
+  return !static_cast<bool>(arg);
+}
+
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif
+
+
+}  // namespace testing
+
+#endif  // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MORE_MATCHERS_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/gmock-nice-strict.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/gmock-nice-strict.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/gmock-nice-strict.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/gmock-nice-strict.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,261 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+// Implements class templates NiceMock, NaggyMock, and StrictMock.
+//
+// Given a mock class MockFoo that is created using Google Mock,
+// NiceMock<MockFoo> is a subclass of MockFoo that allows
+// uninteresting calls (i.e. calls to mock methods that have no
+// EXPECT_CALL specs), NaggyMock<MockFoo> is a subclass of MockFoo
+// that prints a warning when an uninteresting call occurs, and
+// StrictMock<MockFoo> is a subclass of MockFoo that treats all
+// uninteresting calls as errors.
+//
+// Currently a mock is naggy by default, so MockFoo and
+// NaggyMock<MockFoo> behave like the same.  However, we will soon
+// switch the default behavior of mocks to be nice, as that in general
+// leads to more maintainable tests.  When that happens, MockFoo will
+// stop behaving like NaggyMock<MockFoo> and start behaving like
+// NiceMock<MockFoo>.
+//
+// NiceMock, NaggyMock, and StrictMock "inherit" the constructors of
+// their respective base class.  Therefore you can write
+// NiceMock<MockFoo>(5, "a") to construct a nice mock where MockFoo
+// has a constructor that accepts (int, const char*), for example.
+//
+// A known limitation is that NiceMock<MockFoo>, NaggyMock<MockFoo>,
+// and StrictMock<MockFoo> only works for mock methods defined using
+// the MOCK_METHOD* family of macros DIRECTLY in the MockFoo class.
+// If a mock method is defined in a base class of MockFoo, the "nice"
+// or "strict" modifier may not affect it, depending on the compiler.
+// In particular, nesting NiceMock, NaggyMock, and StrictMock is NOT
+// supported.
+
+// GOOGLETEST_CM0002 DO NOT DELETE
+
+#ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_NICE_STRICT_H_
+#define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_NICE_STRICT_H_
+
+#include <type_traits>
+
+#include "gmock/gmock-spec-builders.h"
+#include "gmock/internal/gmock-port.h"
+
+namespace testing {
+template <class MockClass>
+class NiceMock;
+template <class MockClass>
+class NaggyMock;
+template <class MockClass>
+class StrictMock;
+
+namespace internal {
+template <typename T>
+std::true_type StrictnessModifierProbe(const NiceMock<T>&);
+template <typename T>
+std::true_type StrictnessModifierProbe(const NaggyMock<T>&);
+template <typename T>
+std::true_type StrictnessModifierProbe(const StrictMock<T>&);
+std::false_type StrictnessModifierProbe(...);
+
+template <typename T>
+constexpr bool HasStrictnessModifier() {
+  return decltype(StrictnessModifierProbe(std::declval<const T&>()))::value;
+}
+
+// Base classes that register and deregister with testing::Mock to alter the
+// default behavior around uninteresting calls. Inheriting from one of these
+// classes first and then MockClass ensures the MockClass constructor is run
+// after registration, and that the MockClass destructor runs before
+// deregistration. This guarantees that MockClass's constructor and destructor
+// run with the same level of strictness as its instance methods.
+
+#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW && \
+    (defined(_MSC_VER) || defined(__clang__))
+// We need to mark these classes with this declspec to ensure that
+// the empty base class optimization is performed.
+#define GTEST_INTERNAL_EMPTY_BASE_CLASS __declspec(empty_bases)
+#else
+#define GTEST_INTERNAL_EMPTY_BASE_CLASS
+#endif
+
+template <typename Base>
+class NiceMockImpl {
+ public:
+  NiceMockImpl() { ::testing::Mock::AllowUninterestingCalls(this); }
+
+  ~NiceMockImpl() { ::testing::Mock::UnregisterCallReaction(this); }
+};
+
+template <typename Base>
+class NaggyMockImpl {
+ public:
+  NaggyMockImpl() { ::testing::Mock::WarnUninterestingCalls(this); }
+
+  ~NaggyMockImpl() { ::testing::Mock::UnregisterCallReaction(this); }
+};
+
+template <typename Base>
+class StrictMockImpl {
+ public:
+  StrictMockImpl() { ::testing::Mock::FailUninterestingCalls(this); }
+
+  ~StrictMockImpl() { ::testing::Mock::UnregisterCallReaction(this); }
+};
+
+}  // namespace internal
+
+template <class MockClass>
+class GTEST_INTERNAL_EMPTY_BASE_CLASS NiceMock
+    : private internal::NiceMockImpl<MockClass>,
+      public MockClass {
+ public:
+  static_assert(!internal::HasStrictnessModifier<MockClass>(),
+                "Can't apply NiceMock to a class hierarchy that already has a "
+                "strictness modifier. See "
+                "https://google.github.io/googletest/"
+                "gmock_cook_book.html#NiceStrictNaggy");
+  NiceMock() : MockClass() {
+    static_assert(sizeof(*this) == sizeof(MockClass),
+                  "The impl subclass shouldn't introduce any padding");
+  }
+
+  // Ideally, we would inherit base class's constructors through a using
+  // declaration, which would preserve their visibility. However, many existing
+  // tests rely on the fact that current implementation reexports protected
+  // constructors as public. These tests would need to be cleaned up first.
+
+  // Single argument constructor is special-cased so that it can be
+  // made explicit.
+  template <typename A>
+  explicit NiceMock(A&& arg) : MockClass(std::forward<A>(arg)) {
+    static_assert(sizeof(*this) == sizeof(MockClass),
+                  "The impl subclass shouldn't introduce any padding");
+  }
+
+  template <typename TArg1, typename TArg2, typename... An>
+  NiceMock(TArg1&& arg1, TArg2&& arg2, An&&... args)
+      : MockClass(std::forward<TArg1>(arg1), std::forward<TArg2>(arg2),
+                  std::forward<An>(args)...) {
+    static_assert(sizeof(*this) == sizeof(MockClass),
+                  "The impl subclass shouldn't introduce any padding");
+  }
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(NiceMock);
+};
+
+template <class MockClass>
+class GTEST_INTERNAL_EMPTY_BASE_CLASS NaggyMock
+    : private internal::NaggyMockImpl<MockClass>,
+      public MockClass {
+  static_assert(!internal::HasStrictnessModifier<MockClass>(),
+                "Can't apply NaggyMock to a class hierarchy that already has a "
+                "strictness modifier. See "
+                "https://google.github.io/googletest/"
+                "gmock_cook_book.html#NiceStrictNaggy");
+
+ public:
+  NaggyMock() : MockClass() {
+    static_assert(sizeof(*this) == sizeof(MockClass),
+                  "The impl subclass shouldn't introduce any padding");
+  }
+
+  // Ideally, we would inherit base class's constructors through a using
+  // declaration, which would preserve their visibility. However, many existing
+  // tests rely on the fact that current implementation reexports protected
+  // constructors as public. These tests would need to be cleaned up first.
+
+  // Single argument constructor is special-cased so that it can be
+  // made explicit.
+  template <typename A>
+  explicit NaggyMock(A&& arg) : MockClass(std::forward<A>(arg)) {
+    static_assert(sizeof(*this) == sizeof(MockClass),
+                  "The impl subclass shouldn't introduce any padding");
+  }
+
+  template <typename TArg1, typename TArg2, typename... An>
+  NaggyMock(TArg1&& arg1, TArg2&& arg2, An&&... args)
+      : MockClass(std::forward<TArg1>(arg1), std::forward<TArg2>(arg2),
+                  std::forward<An>(args)...) {
+    static_assert(sizeof(*this) == sizeof(MockClass),
+                  "The impl subclass shouldn't introduce any padding");
+  }
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(NaggyMock);
+};
+
+template <class MockClass>
+class GTEST_INTERNAL_EMPTY_BASE_CLASS StrictMock
+    : private internal::StrictMockImpl<MockClass>,
+      public MockClass {
+ public:
+  static_assert(
+      !internal::HasStrictnessModifier<MockClass>(),
+      "Can't apply StrictMock to a class hierarchy that already has a "
+      "strictness modifier. See "
+      "https://google.github.io/googletest/"
+      "gmock_cook_book.html#NiceStrictNaggy");
+  StrictMock() : MockClass() {
+    static_assert(sizeof(*this) == sizeof(MockClass),
+                  "The impl subclass shouldn't introduce any padding");
+  }
+
+  // Ideally, we would inherit base class's constructors through a using
+  // declaration, which would preserve their visibility. However, many existing
+  // tests rely on the fact that current implementation reexports protected
+  // constructors as public. These tests would need to be cleaned up first.
+
+  // Single argument constructor is special-cased so that it can be
+  // made explicit.
+  template <typename A>
+  explicit StrictMock(A&& arg) : MockClass(std::forward<A>(arg)) {
+    static_assert(sizeof(*this) == sizeof(MockClass),
+                  "The impl subclass shouldn't introduce any padding");
+  }
+
+  template <typename TArg1, typename TArg2, typename... An>
+  StrictMock(TArg1&& arg1, TArg2&& arg2, An&&... args)
+      : MockClass(std::forward<TArg1>(arg1), std::forward<TArg2>(arg2),
+                  std::forward<An>(args)...) {
+    static_assert(sizeof(*this) == sizeof(MockClass),
+                  "The impl subclass shouldn't introduce any padding");
+  }
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(StrictMock);
+};
+
+#undef GTEST_INTERNAL_EMPTY_BASE_CLASS
+
+}  // namespace testing
+
+#endif  // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_NICE_STRICT_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/gmock-spec-builders.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/gmock-spec-builders.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/gmock-spec-builders.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/gmock-spec-builders.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,2038 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file implements the ON_CALL() and EXPECT_CALL() macros.
+//
+// A user can use the ON_CALL() macro to specify the default action of
+// a mock method.  The syntax is:
+//
+//   ON_CALL(mock_object, Method(argument-matchers))
+//       .With(multi-argument-matcher)
+//       .WillByDefault(action);
+//
+//  where the .With() clause is optional.
+//
+// A user can use the EXPECT_CALL() macro to specify an expectation on
+// a mock method.  The syntax is:
+//
+//   EXPECT_CALL(mock_object, Method(argument-matchers))
+//       .With(multi-argument-matchers)
+//       .Times(cardinality)
+//       .InSequence(sequences)
+//       .After(expectations)
+//       .WillOnce(action)
+//       .WillRepeatedly(action)
+//       .RetiresOnSaturation();
+//
+// where all clauses are optional, and .InSequence()/.After()/
+// .WillOnce() can appear any number of times.
+
+// GOOGLETEST_CM0002 DO NOT DELETE
+
+#ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_SPEC_BUILDERS_H_
+#define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_SPEC_BUILDERS_H_
+
+#include <functional>
+#include <map>
+#include <memory>
+#include <set>
+#include <sstream>
+#include <string>
+#include <type_traits>
+#include <utility>
+#include <vector>
+#include "gmock/gmock-actions.h"
+#include "gmock/gmock-cardinalities.h"
+#include "gmock/gmock-matchers.h"
+#include "gmock/internal/gmock-internal-utils.h"
+#include "gmock/internal/gmock-port.h"
+#include "gtest/gtest.h"
+
+#if GTEST_HAS_EXCEPTIONS
+# include <stdexcept>  // NOLINT
+#endif
+
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
+/* class A needs to have dll-interface to be used by clients of class B */)
+
+namespace testing {
+
+// An abstract handle of an expectation.
+class Expectation;
+
+// A set of expectation handles.
+class ExpectationSet;
+
+// Anything inside the 'internal' namespace IS INTERNAL IMPLEMENTATION
+// and MUST NOT BE USED IN USER CODE!!!
+namespace internal {
+
+// Implements a mock function.
+template <typename F> class FunctionMocker;
+
+// Base class for expectations.
+class ExpectationBase;
+
+// Implements an expectation.
+template <typename F> class TypedExpectation;
+
+// Helper class for testing the Expectation class template.
+class ExpectationTester;
+
+// Helper classes for implementing NiceMock, StrictMock, and NaggyMock.
+template <typename MockClass>
+class NiceMockImpl;
+template <typename MockClass>
+class StrictMockImpl;
+template <typename MockClass>
+class NaggyMockImpl;
+
+// Protects the mock object registry (in class Mock), all function
+// mockers, and all expectations.
+//
+// The reason we don't use more fine-grained protection is: when a
+// mock function Foo() is called, it needs to consult its expectations
+// to see which one should be picked.  If another thread is allowed to
+// call a mock function (either Foo() or a different one) at the same
+// time, it could affect the "retired" attributes of Foo()'s
+// expectations when InSequence() is used, and thus affect which
+// expectation gets picked.  Therefore, we sequence all mock function
+// calls to ensure the integrity of the mock objects' states.
+GTEST_API_ GTEST_DECLARE_STATIC_MUTEX_(g_gmock_mutex);
+
+// Untyped base class for ActionResultHolder<R>.
+class UntypedActionResultHolderBase;
+
+// Abstract base class of FunctionMocker.  This is the
+// type-agnostic part of the function mocker interface.  Its pure
+// virtual methods are implemented by FunctionMocker.
+class GTEST_API_ UntypedFunctionMockerBase {
+ public:
+  UntypedFunctionMockerBase();
+  virtual ~UntypedFunctionMockerBase();
+
+  // Verifies that all expectations on this mock function have been
+  // satisfied.  Reports one or more Google Test non-fatal failures
+  // and returns false if not.
+  bool VerifyAndClearExpectationsLocked()
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex);
+
+  // Clears the ON_CALL()s set on this mock function.
+  virtual void ClearDefaultActionsLocked()
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) = 0;
+
+  // In all of the following Untyped* functions, it's the caller's
+  // responsibility to guarantee the correctness of the arguments'
+  // types.
+
+  // Performs the default action with the given arguments and returns
+  // the action's result.  The call description string will be used in
+  // the error message to describe the call in the case the default
+  // action fails.
+  // L = *
+  virtual UntypedActionResultHolderBase* UntypedPerformDefaultAction(
+      void* untyped_args, const std::string& call_description) const = 0;
+
+  // Performs the given action with the given arguments and returns
+  // the action's result.
+  // L = *
+  virtual UntypedActionResultHolderBase* UntypedPerformAction(
+      const void* untyped_action, void* untyped_args) const = 0;
+
+  // Writes a message that the call is uninteresting (i.e. neither
+  // explicitly expected nor explicitly unexpected) to the given
+  // ostream.
+  virtual void UntypedDescribeUninterestingCall(
+      const void* untyped_args,
+      ::std::ostream* os) const
+          GTEST_LOCK_EXCLUDED_(g_gmock_mutex) = 0;
+
+  // Returns the expectation that matches the given function arguments
+  // (or NULL is there's no match); when a match is found,
+  // untyped_action is set to point to the action that should be
+  // performed (or NULL if the action is "do default"), and
+  // is_excessive is modified to indicate whether the call exceeds the
+  // expected number.
+  virtual const ExpectationBase* UntypedFindMatchingExpectation(
+      const void* untyped_args,
+      const void** untyped_action, bool* is_excessive,
+      ::std::ostream* what, ::std::ostream* why)
+          GTEST_LOCK_EXCLUDED_(g_gmock_mutex) = 0;
+
+  // Prints the given function arguments to the ostream.
+  virtual void UntypedPrintArgs(const void* untyped_args,
+                                ::std::ostream* os) const = 0;
+
+  // Sets the mock object this mock method belongs to, and registers
+  // this information in the global mock registry.  Will be called
+  // whenever an EXPECT_CALL() or ON_CALL() is executed on this mock
+  // method.
+  void RegisterOwner(const void* mock_obj)
+      GTEST_LOCK_EXCLUDED_(g_gmock_mutex);
+
+  // Sets the mock object this mock method belongs to, and sets the
+  // name of the mock function.  Will be called upon each invocation
+  // of this mock function.
+  void SetOwnerAndName(const void* mock_obj, const char* name)
+      GTEST_LOCK_EXCLUDED_(g_gmock_mutex);
+
+  // Returns the mock object this mock method belongs to.  Must be
+  // called after RegisterOwner() or SetOwnerAndName() has been
+  // called.
+  const void* MockObject() const
+      GTEST_LOCK_EXCLUDED_(g_gmock_mutex);
+
+  // Returns the name of this mock method.  Must be called after
+  // SetOwnerAndName() has been called.
+  const char* Name() const
+      GTEST_LOCK_EXCLUDED_(g_gmock_mutex);
+
+  // Returns the result of invoking this mock function with the given
+  // arguments.  This function can be safely called from multiple
+  // threads concurrently.  The caller is responsible for deleting the
+  // result.
+  UntypedActionResultHolderBase* UntypedInvokeWith(void* untyped_args)
+      GTEST_LOCK_EXCLUDED_(g_gmock_mutex);
+
+ protected:
+  typedef std::vector<const void*> UntypedOnCallSpecs;
+
+  using UntypedExpectations = std::vector<std::shared_ptr<ExpectationBase>>;
+
+  // Returns an Expectation object that references and co-owns exp,
+  // which must be an expectation on this mock function.
+  Expectation GetHandleOf(ExpectationBase* exp);
+
+  // Address of the mock object this mock method belongs to.  Only
+  // valid after this mock method has been called or
+  // ON_CALL/EXPECT_CALL has been invoked on it.
+  const void* mock_obj_;  // Protected by g_gmock_mutex.
+
+  // Name of the function being mocked.  Only valid after this mock
+  // method has been called.
+  const char* name_;  // Protected by g_gmock_mutex.
+
+  // All default action specs for this function mocker.
+  UntypedOnCallSpecs untyped_on_call_specs_;
+
+  // All expectations for this function mocker.
+  //
+  // It's undefined behavior to interleave expectations (EXPECT_CALLs
+  // or ON_CALLs) and mock function calls.  Also, the order of
+  // expectations is important.  Therefore it's a logic race condition
+  // to read/write untyped_expectations_ concurrently.  In order for
+  // tools like tsan to catch concurrent read/write accesses to
+  // untyped_expectations, we deliberately leave accesses to it
+  // unprotected.
+  UntypedExpectations untyped_expectations_;
+};  // class UntypedFunctionMockerBase
+
+// Untyped base class for OnCallSpec<F>.
+class UntypedOnCallSpecBase {
+ public:
+  // The arguments are the location of the ON_CALL() statement.
+  UntypedOnCallSpecBase(const char* a_file, int a_line)
+      : file_(a_file), line_(a_line), last_clause_(kNone) {}
+
+  // Where in the source file was the default action spec defined?
+  const char* file() const { return file_; }
+  int line() const { return line_; }
+
+ protected:
+  // Gives each clause in the ON_CALL() statement a name.
+  enum Clause {
+    // Do not change the order of the enum members!  The run-time
+    // syntax checking relies on it.
+    kNone,
+    kWith,
+    kWillByDefault
+  };
+
+  // Asserts that the ON_CALL() statement has a certain property.
+  void AssertSpecProperty(bool property,
+                          const std::string& failure_message) const {
+    Assert(property, file_, line_, failure_message);
+  }
+
+  // Expects that the ON_CALL() statement has a certain property.
+  void ExpectSpecProperty(bool property,
+                          const std::string& failure_message) const {
+    Expect(property, file_, line_, failure_message);
+  }
+
+  const char* file_;
+  int line_;
+
+  // The last clause in the ON_CALL() statement as seen so far.
+  // Initially kNone and changes as the statement is parsed.
+  Clause last_clause_;
+};  // class UntypedOnCallSpecBase
+
+// This template class implements an ON_CALL spec.
+template <typename F>
+class OnCallSpec : public UntypedOnCallSpecBase {
+ public:
+  typedef typename Function<F>::ArgumentTuple ArgumentTuple;
+  typedef typename Function<F>::ArgumentMatcherTuple ArgumentMatcherTuple;
+
+  // Constructs an OnCallSpec object from the information inside
+  // the parenthesis of an ON_CALL() statement.
+  OnCallSpec(const char* a_file, int a_line,
+             const ArgumentMatcherTuple& matchers)
+      : UntypedOnCallSpecBase(a_file, a_line),
+        matchers_(matchers),
+        // By default, extra_matcher_ should match anything.  However,
+        // we cannot initialize it with _ as that causes ambiguity between
+        // Matcher's copy and move constructor for some argument types.
+        extra_matcher_(A<const ArgumentTuple&>()) {}
+
+  // Implements the .With() clause.
+  OnCallSpec& With(const Matcher<const ArgumentTuple&>& m) {
+    // Makes sure this is called at most once.
+    ExpectSpecProperty(last_clause_ < kWith,
+                       ".With() cannot appear "
+                       "more than once in an ON_CALL().");
+    last_clause_ = kWith;
+
+    extra_matcher_ = m;
+    return *this;
+  }
+
+  // Implements the .WillByDefault() clause.
+  OnCallSpec& WillByDefault(const Action<F>& action) {
+    ExpectSpecProperty(last_clause_ < kWillByDefault,
+                       ".WillByDefault() must appear "
+                       "exactly once in an ON_CALL().");
+    last_clause_ = kWillByDefault;
+
+    ExpectSpecProperty(!action.IsDoDefault(),
+                       "DoDefault() cannot be used in ON_CALL().");
+    action_ = action;
+    return *this;
+  }
+
+  // Returns true if and only if the given arguments match the matchers.
+  bool Matches(const ArgumentTuple& args) const {
+    return TupleMatches(matchers_, args) && extra_matcher_.Matches(args);
+  }
+
+  // Returns the action specified by the user.
+  const Action<F>& GetAction() const {
+    AssertSpecProperty(last_clause_ == kWillByDefault,
+                       ".WillByDefault() must appear exactly "
+                       "once in an ON_CALL().");
+    return action_;
+  }
+
+ private:
+  // The information in statement
+  //
+  //   ON_CALL(mock_object, Method(matchers))
+  //       .With(multi-argument-matcher)
+  //       .WillByDefault(action);
+  //
+  // is recorded in the data members like this:
+  //
+  //   source file that contains the statement => file_
+  //   line number of the statement            => line_
+  //   matchers                                => matchers_
+  //   multi-argument-matcher                  => extra_matcher_
+  //   action                                  => action_
+  ArgumentMatcherTuple matchers_;
+  Matcher<const ArgumentTuple&> extra_matcher_;
+  Action<F> action_;
+};  // class OnCallSpec
+
+// Possible reactions on uninteresting calls.
+enum CallReaction {
+  kAllow,
+  kWarn,
+  kFail,
+};
+
+}  // namespace internal
+
+// Utilities for manipulating mock objects.
+class GTEST_API_ Mock {
+ public:
+  // The following public methods can be called concurrently.
+
+  // Tells Google Mock to ignore mock_obj when checking for leaked
+  // mock objects.
+  static void AllowLeak(const void* mock_obj)
+      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+
+  // Verifies and clears all expectations on the given mock object.
+  // If the expectations aren't satisfied, generates one or more
+  // Google Test non-fatal failures and returns false.
+  static bool VerifyAndClearExpectations(void* mock_obj)
+      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+
+  // Verifies all expectations on the given mock object and clears its
+  // default actions and expectations.  Returns true if and only if the
+  // verification was successful.
+  static bool VerifyAndClear(void* mock_obj)
+      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+
+  // Returns whether the mock was created as a naggy mock (default)
+  static bool IsNaggy(void* mock_obj)
+      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+  // Returns whether the mock was created as a nice mock
+  static bool IsNice(void* mock_obj)
+      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+  // Returns whether the mock was created as a strict mock
+  static bool IsStrict(void* mock_obj)
+      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+
+ private:
+  friend class internal::UntypedFunctionMockerBase;
+
+  // Needed for a function mocker to register itself (so that we know
+  // how to clear a mock object).
+  template <typename F>
+  friend class internal::FunctionMocker;
+
+  template <typename MockClass>
+  friend class internal::NiceMockImpl;
+  template <typename MockClass>
+  friend class internal::NaggyMockImpl;
+  template <typename MockClass>
+  friend class internal::StrictMockImpl;
+
+  // Tells Google Mock to allow uninteresting calls on the given mock
+  // object.
+  static void AllowUninterestingCalls(const void* mock_obj)
+      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+
+  // Tells Google Mock to warn the user about uninteresting calls on
+  // the given mock object.
+  static void WarnUninterestingCalls(const void* mock_obj)
+      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+
+  // Tells Google Mock to fail uninteresting calls on the given mock
+  // object.
+  static void FailUninterestingCalls(const void* mock_obj)
+      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+
+  // Tells Google Mock the given mock object is being destroyed and
+  // its entry in the call-reaction table should be removed.
+  static void UnregisterCallReaction(const void* mock_obj)
+      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+
+  // Returns the reaction Google Mock will have on uninteresting calls
+  // made on the given mock object.
+  static internal::CallReaction GetReactionOnUninterestingCalls(
+      const void* mock_obj)
+          GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+
+  // Verifies that all expectations on the given mock object have been
+  // satisfied.  Reports one or more Google Test non-fatal failures
+  // and returns false if not.
+  static bool VerifyAndClearExpectationsLocked(void* mock_obj)
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(internal::g_gmock_mutex);
+
+  // Clears all ON_CALL()s set on the given mock object.
+  static void ClearDefaultActionsLocked(void* mock_obj)
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(internal::g_gmock_mutex);
+
+  // Registers a mock object and a mock method it owns.
+  static void Register(
+      const void* mock_obj,
+      internal::UntypedFunctionMockerBase* mocker)
+          GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+
+  // Tells Google Mock where in the source code mock_obj is used in an
+  // ON_CALL or EXPECT_CALL.  In case mock_obj is leaked, this
+  // information helps the user identify which object it is.
+  static void RegisterUseByOnCallOrExpectCall(
+      const void* mock_obj, const char* file, int line)
+          GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+
+  // Unregisters a mock method; removes the owning mock object from
+  // the registry when the last mock method associated with it has
+  // been unregistered.  This is called only in the destructor of
+  // FunctionMocker.
+  static void UnregisterLocked(internal::UntypedFunctionMockerBase* mocker)
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(internal::g_gmock_mutex);
+};  // class Mock
+
+// An abstract handle of an expectation.  Useful in the .After()
+// clause of EXPECT_CALL() for setting the (partial) order of
+// expectations.  The syntax:
+//
+//   Expectation e1 = EXPECT_CALL(...)...;
+//   EXPECT_CALL(...).After(e1)...;
+//
+// sets two expectations where the latter can only be matched after
+// the former has been satisfied.
+//
+// Notes:
+//   - This class is copyable and has value semantics.
+//   - Constness is shallow: a const Expectation object itself cannot
+//     be modified, but the mutable methods of the ExpectationBase
+//     object it references can be called via expectation_base().
+
+class GTEST_API_ Expectation {
+ public:
+  // Constructs a null object that doesn't reference any expectation.
+  Expectation();
+  Expectation(Expectation&&) = default;
+  Expectation(const Expectation&) = default;
+  Expectation& operator=(Expectation&&) = default;
+  Expectation& operator=(const Expectation&) = default;
+  ~Expectation();
+
+  // This single-argument ctor must not be explicit, in order to support the
+  //   Expectation e = EXPECT_CALL(...);
+  // syntax.
+  //
+  // A TypedExpectation object stores its pre-requisites as
+  // Expectation objects, and needs to call the non-const Retire()
+  // method on the ExpectationBase objects they reference.  Therefore
+  // Expectation must receive a *non-const* reference to the
+  // ExpectationBase object.
+  Expectation(internal::ExpectationBase& exp);  // NOLINT
+
+  // The compiler-generated copy ctor and operator= work exactly as
+  // intended, so we don't need to define our own.
+
+  // Returns true if and only if rhs references the same expectation as this
+  // object does.
+  bool operator==(const Expectation& rhs) const {
+    return expectation_base_ == rhs.expectation_base_;
+  }
+
+  bool operator!=(const Expectation& rhs) const { return !(*this == rhs); }
+
+ private:
+  friend class ExpectationSet;
+  friend class Sequence;
+  friend class ::testing::internal::ExpectationBase;
+  friend class ::testing::internal::UntypedFunctionMockerBase;
+
+  template <typename F>
+  friend class ::testing::internal::FunctionMocker;
+
+  template <typename F>
+  friend class ::testing::internal::TypedExpectation;
+
+  // This comparator is needed for putting Expectation objects into a set.
+  class Less {
+   public:
+    bool operator()(const Expectation& lhs, const Expectation& rhs) const {
+      return lhs.expectation_base_.get() < rhs.expectation_base_.get();
+    }
+  };
+
+  typedef ::std::set<Expectation, Less> Set;
+
+  Expectation(
+      const std::shared_ptr<internal::ExpectationBase>& expectation_base);
+
+  // Returns the expectation this object references.
+  const std::shared_ptr<internal::ExpectationBase>& expectation_base() const {
+    return expectation_base_;
+  }
+
+  // A shared_ptr that co-owns the expectation this handle references.
+  std::shared_ptr<internal::ExpectationBase> expectation_base_;
+};
+
+// A set of expectation handles.  Useful in the .After() clause of
+// EXPECT_CALL() for setting the (partial) order of expectations.  The
+// syntax:
+//
+//   ExpectationSet es;
+//   es += EXPECT_CALL(...)...;
+//   es += EXPECT_CALL(...)...;
+//   EXPECT_CALL(...).After(es)...;
+//
+// sets three expectations where the last one can only be matched
+// after the first two have both been satisfied.
+//
+// This class is copyable and has value semantics.
+class ExpectationSet {
+ public:
+  // A bidirectional iterator that can read a const element in the set.
+  typedef Expectation::Set::const_iterator const_iterator;
+
+  // An object stored in the set.  This is an alias of Expectation.
+  typedef Expectation::Set::value_type value_type;
+
+  // Constructs an empty set.
+  ExpectationSet() {}
+
+  // This single-argument ctor must not be explicit, in order to support the
+  //   ExpectationSet es = EXPECT_CALL(...);
+  // syntax.
+  ExpectationSet(internal::ExpectationBase& exp) {  // NOLINT
+    *this += Expectation(exp);
+  }
+
+  // This single-argument ctor implements implicit conversion from
+  // Expectation and thus must not be explicit.  This allows either an
+  // Expectation or an ExpectationSet to be used in .After().
+  ExpectationSet(const Expectation& e) {  // NOLINT
+    *this += e;
+  }
+
+  // The compiler-generator ctor and operator= works exactly as
+  // intended, so we don't need to define our own.
+
+  // Returns true if and only if rhs contains the same set of Expectation
+  // objects as this does.
+  bool operator==(const ExpectationSet& rhs) const {
+    return expectations_ == rhs.expectations_;
+  }
+
+  bool operator!=(const ExpectationSet& rhs) const { return !(*this == rhs); }
+
+  // Implements the syntax
+  //   expectation_set += EXPECT_CALL(...);
+  ExpectationSet& operator+=(const Expectation& e) {
+    expectations_.insert(e);
+    return *this;
+  }
+
+  int size() const { return static_cast<int>(expectations_.size()); }
+
+  const_iterator begin() const { return expectations_.begin(); }
+  const_iterator end() const { return expectations_.end(); }
+
+ private:
+  Expectation::Set expectations_;
+};
+
+
+// Sequence objects are used by a user to specify the relative order
+// in which the expectations should match.  They are copyable (we rely
+// on the compiler-defined copy constructor and assignment operator).
+class GTEST_API_ Sequence {
+ public:
+  // Constructs an empty sequence.
+  Sequence() : last_expectation_(new Expectation) {}
+
+  // Adds an expectation to this sequence.  The caller must ensure
+  // that no other thread is accessing this Sequence object.
+  void AddExpectation(const Expectation& expectation) const;
+
+ private:
+  // The last expectation in this sequence.
+  std::shared_ptr<Expectation> last_expectation_;
+};  // class Sequence
+
+// An object of this type causes all EXPECT_CALL() statements
+// encountered in its scope to be put in an anonymous sequence.  The
+// work is done in the constructor and destructor.  You should only
+// create an InSequence object on the stack.
+//
+// The sole purpose for this class is to support easy definition of
+// sequential expectations, e.g.
+//
+//   {
+//     InSequence dummy;  // The name of the object doesn't matter.
+//
+//     // The following expectations must match in the order they appear.
+//     EXPECT_CALL(a, Bar())...;
+//     EXPECT_CALL(a, Baz())...;
+//     ...
+//     EXPECT_CALL(b, Xyz())...;
+//   }
+//
+// You can create InSequence objects in multiple threads, as long as
+// they are used to affect different mock objects.  The idea is that
+// each thread can create and set up its own mocks as if it's the only
+// thread.  However, for clarity of your tests we recommend you to set
+// up mocks in the main thread unless you have a good reason not to do
+// so.
+class GTEST_API_ InSequence {
+ public:
+  InSequence();
+  ~InSequence();
+ private:
+  bool sequence_created_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(InSequence);  // NOLINT
+} GTEST_ATTRIBUTE_UNUSED_;
+
+namespace internal {
+
+// Points to the implicit sequence introduced by a living InSequence
+// object (if any) in the current thread or NULL.
+GTEST_API_ extern ThreadLocal<Sequence*> g_gmock_implicit_sequence;
+
+// Base class for implementing expectations.
+//
+// There are two reasons for having a type-agnostic base class for
+// Expectation:
+//
+//   1. We need to store collections of expectations of different
+//   types (e.g. all pre-requisites of a particular expectation, all
+//   expectations in a sequence).  Therefore these expectation objects
+//   must share a common base class.
+//
+//   2. We can avoid binary code bloat by moving methods not depending
+//   on the template argument of Expectation to the base class.
+//
+// This class is internal and mustn't be used by user code directly.
+class GTEST_API_ ExpectationBase {
+ public:
+  // source_text is the EXPECT_CALL(...) source that created this Expectation.
+  ExpectationBase(const char* file, int line, const std::string& source_text);
+
+  virtual ~ExpectationBase();
+
+  // Where in the source file was the expectation spec defined?
+  const char* file() const { return file_; }
+  int line() const { return line_; }
+  const char* source_text() const { return source_text_.c_str(); }
+  // Returns the cardinality specified in the expectation spec.
+  const Cardinality& cardinality() const { return cardinality_; }
+
+  // Describes the source file location of this expectation.
+  void DescribeLocationTo(::std::ostream* os) const {
+    *os << FormatFileLocation(file(), line()) << " ";
+  }
+
+  // Describes how many times a function call matching this
+  // expectation has occurred.
+  void DescribeCallCountTo(::std::ostream* os) const
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex);
+
+  // If this mock method has an extra matcher (i.e. .With(matcher)),
+  // describes it to the ostream.
+  virtual void MaybeDescribeExtraMatcherTo(::std::ostream* os) = 0;
+
+ protected:
+  friend class ::testing::Expectation;
+  friend class UntypedFunctionMockerBase;
+
+  enum Clause {
+    // Don't change the order of the enum members!
+    kNone,
+    kWith,
+    kTimes,
+    kInSequence,
+    kAfter,
+    kWillOnce,
+    kWillRepeatedly,
+    kRetiresOnSaturation
+  };
+
+  typedef std::vector<const void*> UntypedActions;
+
+  // Returns an Expectation object that references and co-owns this
+  // expectation.
+  virtual Expectation GetHandle() = 0;
+
+  // Asserts that the EXPECT_CALL() statement has the given property.
+  void AssertSpecProperty(bool property,
+                          const std::string& failure_message) const {
+    Assert(property, file_, line_, failure_message);
+  }
+
+  // Expects that the EXPECT_CALL() statement has the given property.
+  void ExpectSpecProperty(bool property,
+                          const std::string& failure_message) const {
+    Expect(property, file_, line_, failure_message);
+  }
+
+  // Explicitly specifies the cardinality of this expectation.  Used
+  // by the subclasses to implement the .Times() clause.
+  void SpecifyCardinality(const Cardinality& cardinality);
+
+  // Returns true if and only if the user specified the cardinality
+  // explicitly using a .Times().
+  bool cardinality_specified() const { return cardinality_specified_; }
+
+  // Sets the cardinality of this expectation spec.
+  void set_cardinality(const Cardinality& a_cardinality) {
+    cardinality_ = a_cardinality;
+  }
+
+  // The following group of methods should only be called after the
+  // EXPECT_CALL() statement, and only when g_gmock_mutex is held by
+  // the current thread.
+
+  // Retires all pre-requisites of this expectation.
+  void RetireAllPreRequisites()
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex);
+
+  // Returns true if and only if this expectation is retired.
+  bool is_retired() const
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+    return retired_;
+  }
+
+  // Retires this expectation.
+  void Retire()
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+    retired_ = true;
+  }
+
+  // Returns true if and only if this expectation is satisfied.
+  bool IsSatisfied() const
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+    return cardinality().IsSatisfiedByCallCount(call_count_);
+  }
+
+  // Returns true if and only if this expectation is saturated.
+  bool IsSaturated() const
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+    return cardinality().IsSaturatedByCallCount(call_count_);
+  }
+
+  // Returns true if and only if this expectation is over-saturated.
+  bool IsOverSaturated() const
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+    return cardinality().IsOverSaturatedByCallCount(call_count_);
+  }
+
+  // Returns true if and only if all pre-requisites of this expectation are
+  // satisfied.
+  bool AllPrerequisitesAreSatisfied() const
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex);
+
+  // Adds unsatisfied pre-requisites of this expectation to 'result'.
+  void FindUnsatisfiedPrerequisites(ExpectationSet* result) const
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex);
+
+  // Returns the number this expectation has been invoked.
+  int call_count() const
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+    return call_count_;
+  }
+
+  // Increments the number this expectation has been invoked.
+  void IncrementCallCount()
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+    call_count_++;
+  }
+
+  // Checks the action count (i.e. the number of WillOnce() and
+  // WillRepeatedly() clauses) against the cardinality if this hasn't
+  // been done before.  Prints a warning if there are too many or too
+  // few actions.
+  void CheckActionCountIfNotDone() const
+      GTEST_LOCK_EXCLUDED_(mutex_);
+
+  friend class ::testing::Sequence;
+  friend class ::testing::internal::ExpectationTester;
+
+  template <typename Function>
+  friend class TypedExpectation;
+
+  // Implements the .Times() clause.
+  void UntypedTimes(const Cardinality& a_cardinality);
+
+  // This group of fields are part of the spec and won't change after
+  // an EXPECT_CALL() statement finishes.
+  const char* file_;          // The file that contains the expectation.
+  int line_;                  // The line number of the expectation.
+  const std::string source_text_;  // The EXPECT_CALL(...) source text.
+  // True if and only if the cardinality is specified explicitly.
+  bool cardinality_specified_;
+  Cardinality cardinality_;            // The cardinality of the expectation.
+  // The immediate pre-requisites (i.e. expectations that must be
+  // satisfied before this expectation can be matched) of this
+  // expectation.  We use std::shared_ptr in the set because we want an
+  // Expectation object to be co-owned by its FunctionMocker and its
+  // successors.  This allows multiple mock objects to be deleted at
+  // different times.
+  ExpectationSet immediate_prerequisites_;
+
+  // This group of fields are the current state of the expectation,
+  // and can change as the mock function is called.
+  int call_count_;  // How many times this expectation has been invoked.
+  bool retired_;    // True if and only if this expectation has retired.
+  UntypedActions untyped_actions_;
+  bool extra_matcher_specified_;
+  bool repeated_action_specified_;  // True if a WillRepeatedly() was specified.
+  bool retires_on_saturation_;
+  Clause last_clause_;
+  mutable bool action_count_checked_;  // Under mutex_.
+  mutable Mutex mutex_;  // Protects action_count_checked_.
+};  // class ExpectationBase
+
+// Impements an expectation for the given function type.
+template <typename F>
+class TypedExpectation : public ExpectationBase {
+ public:
+  typedef typename Function<F>::ArgumentTuple ArgumentTuple;
+  typedef typename Function<F>::ArgumentMatcherTuple ArgumentMatcherTuple;
+  typedef typename Function<F>::Result Result;
+
+  TypedExpectation(FunctionMocker<F>* owner, const char* a_file, int a_line,
+                   const std::string& a_source_text,
+                   const ArgumentMatcherTuple& m)
+      : ExpectationBase(a_file, a_line, a_source_text),
+        owner_(owner),
+        matchers_(m),
+        // By default, extra_matcher_ should match anything.  However,
+        // we cannot initialize it with _ as that causes ambiguity between
+        // Matcher's copy and move constructor for some argument types.
+        extra_matcher_(A<const ArgumentTuple&>()),
+        repeated_action_(DoDefault()) {}
+
+  ~TypedExpectation() override {
+    // Check the validity of the action count if it hasn't been done
+    // yet (for example, if the expectation was never used).
+    CheckActionCountIfNotDone();
+    for (UntypedActions::const_iterator it = untyped_actions_.begin();
+         it != untyped_actions_.end(); ++it) {
+      delete static_cast<const Action<F>*>(*it);
+    }
+  }
+
+  // Implements the .With() clause.
+  TypedExpectation& With(const Matcher<const ArgumentTuple&>& m) {
+    if (last_clause_ == kWith) {
+      ExpectSpecProperty(false,
+                         ".With() cannot appear "
+                         "more than once in an EXPECT_CALL().");
+    } else {
+      ExpectSpecProperty(last_clause_ < kWith,
+                         ".With() must be the first "
+                         "clause in an EXPECT_CALL().");
+    }
+    last_clause_ = kWith;
+
+    extra_matcher_ = m;
+    extra_matcher_specified_ = true;
+    return *this;
+  }
+
+  // Implements the .Times() clause.
+  TypedExpectation& Times(const Cardinality& a_cardinality) {
+    ExpectationBase::UntypedTimes(a_cardinality);
+    return *this;
+  }
+
+  // Implements the .Times() clause.
+  TypedExpectation& Times(int n) {
+    return Times(Exactly(n));
+  }
+
+  // Implements the .InSequence() clause.
+  TypedExpectation& InSequence(const Sequence& s) {
+    ExpectSpecProperty(last_clause_ <= kInSequence,
+                       ".InSequence() cannot appear after .After(),"
+                       " .WillOnce(), .WillRepeatedly(), or "
+                       ".RetiresOnSaturation().");
+    last_clause_ = kInSequence;
+
+    s.AddExpectation(GetHandle());
+    return *this;
+  }
+  TypedExpectation& InSequence(const Sequence& s1, const Sequence& s2) {
+    return InSequence(s1).InSequence(s2);
+  }
+  TypedExpectation& InSequence(const Sequence& s1, const Sequence& s2,
+                               const Sequence& s3) {
+    return InSequence(s1, s2).InSequence(s3);
+  }
+  TypedExpectation& InSequence(const Sequence& s1, const Sequence& s2,
+                               const Sequence& s3, const Sequence& s4) {
+    return InSequence(s1, s2, s3).InSequence(s4);
+  }
+  TypedExpectation& InSequence(const Sequence& s1, const Sequence& s2,
+                               const Sequence& s3, const Sequence& s4,
+                               const Sequence& s5) {
+    return InSequence(s1, s2, s3, s4).InSequence(s5);
+  }
+
+  // Implements that .After() clause.
+  TypedExpectation& After(const ExpectationSet& s) {
+    ExpectSpecProperty(last_clause_ <= kAfter,
+                       ".After() cannot appear after .WillOnce(),"
+                       " .WillRepeatedly(), or "
+                       ".RetiresOnSaturation().");
+    last_clause_ = kAfter;
+
+    for (ExpectationSet::const_iterator it = s.begin(); it != s.end(); ++it) {
+      immediate_prerequisites_ += *it;
+    }
+    return *this;
+  }
+  TypedExpectation& After(const ExpectationSet& s1, const ExpectationSet& s2) {
+    return After(s1).After(s2);
+  }
+  TypedExpectation& After(const ExpectationSet& s1, const ExpectationSet& s2,
+                          const ExpectationSet& s3) {
+    return After(s1, s2).After(s3);
+  }
+  TypedExpectation& After(const ExpectationSet& s1, const ExpectationSet& s2,
+                          const ExpectationSet& s3, const ExpectationSet& s4) {
+    return After(s1, s2, s3).After(s4);
+  }
+  TypedExpectation& After(const ExpectationSet& s1, const ExpectationSet& s2,
+                          const ExpectationSet& s3, const ExpectationSet& s4,
+                          const ExpectationSet& s5) {
+    return After(s1, s2, s3, s4).After(s5);
+  }
+
+  // Implements the .WillOnce() clause.
+  TypedExpectation& WillOnce(const Action<F>& action) {
+    ExpectSpecProperty(last_clause_ <= kWillOnce,
+                       ".WillOnce() cannot appear after "
+                       ".WillRepeatedly() or .RetiresOnSaturation().");
+    last_clause_ = kWillOnce;
+
+    untyped_actions_.push_back(new Action<F>(action));
+    if (!cardinality_specified()) {
+      set_cardinality(Exactly(static_cast<int>(untyped_actions_.size())));
+    }
+    return *this;
+  }
+
+  // Implements the .WillRepeatedly() clause.
+  TypedExpectation& WillRepeatedly(const Action<F>& action) {
+    if (last_clause_ == kWillRepeatedly) {
+      ExpectSpecProperty(false,
+                         ".WillRepeatedly() cannot appear "
+                         "more than once in an EXPECT_CALL().");
+    } else {
+      ExpectSpecProperty(last_clause_ < kWillRepeatedly,
+                         ".WillRepeatedly() cannot appear "
+                         "after .RetiresOnSaturation().");
+    }
+    last_clause_ = kWillRepeatedly;
+    repeated_action_specified_ = true;
+
+    repeated_action_ = action;
+    if (!cardinality_specified()) {
+      set_cardinality(AtLeast(static_cast<int>(untyped_actions_.size())));
+    }
+
+    // Now that no more action clauses can be specified, we check
+    // whether their count makes sense.
+    CheckActionCountIfNotDone();
+    return *this;
+  }
+
+  // Implements the .RetiresOnSaturation() clause.
+  TypedExpectation& RetiresOnSaturation() {
+    ExpectSpecProperty(last_clause_ < kRetiresOnSaturation,
+                       ".RetiresOnSaturation() cannot appear "
+                       "more than once.");
+    last_clause_ = kRetiresOnSaturation;
+    retires_on_saturation_ = true;
+
+    // Now that no more action clauses can be specified, we check
+    // whether their count makes sense.
+    CheckActionCountIfNotDone();
+    return *this;
+  }
+
+  // Returns the matchers for the arguments as specified inside the
+  // EXPECT_CALL() macro.
+  const ArgumentMatcherTuple& matchers() const {
+    return matchers_;
+  }
+
+  // Returns the matcher specified by the .With() clause.
+  const Matcher<const ArgumentTuple&>& extra_matcher() const {
+    return extra_matcher_;
+  }
+
+  // Returns the action specified by the .WillRepeatedly() clause.
+  const Action<F>& repeated_action() const { return repeated_action_; }
+
+  // If this mock method has an extra matcher (i.e. .With(matcher)),
+  // describes it to the ostream.
+  void MaybeDescribeExtraMatcherTo(::std::ostream* os) override {
+    if (extra_matcher_specified_) {
+      *os << "    Expected args: ";
+      extra_matcher_.DescribeTo(os);
+      *os << "\n";
+    }
+  }
+
+ private:
+  template <typename Function>
+  friend class FunctionMocker;
+
+  // Returns an Expectation object that references and co-owns this
+  // expectation.
+  Expectation GetHandle() override { return owner_->GetHandleOf(this); }
+
+  // The following methods will be called only after the EXPECT_CALL()
+  // statement finishes and when the current thread holds
+  // g_gmock_mutex.
+
+  // Returns true if and only if this expectation matches the given arguments.
+  bool Matches(const ArgumentTuple& args) const
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+    return TupleMatches(matchers_, args) && extra_matcher_.Matches(args);
+  }
+
+  // Returns true if and only if this expectation should handle the given
+  // arguments.
+  bool ShouldHandleArguments(const ArgumentTuple& args) const
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+
+    // In case the action count wasn't checked when the expectation
+    // was defined (e.g. if this expectation has no WillRepeatedly()
+    // or RetiresOnSaturation() clause), we check it when the
+    // expectation is used for the first time.
+    CheckActionCountIfNotDone();
+    return !is_retired() && AllPrerequisitesAreSatisfied() && Matches(args);
+  }
+
+  // Describes the result of matching the arguments against this
+  // expectation to the given ostream.
+  void ExplainMatchResultTo(
+      const ArgumentTuple& args,
+      ::std::ostream* os) const
+          GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+
+    if (is_retired()) {
+      *os << "         Expected: the expectation is active\n"
+          << "           Actual: it is retired\n";
+    } else if (!Matches(args)) {
+      if (!TupleMatches(matchers_, args)) {
+        ExplainMatchFailureTupleTo(matchers_, args, os);
+      }
+      StringMatchResultListener listener;
+      if (!extra_matcher_.MatchAndExplain(args, &listener)) {
+        *os << "    Expected args: ";
+        extra_matcher_.DescribeTo(os);
+        *os << "\n           Actual: don't match";
+
+        internal::PrintIfNotEmpty(listener.str(), os);
+        *os << "\n";
+      }
+    } else if (!AllPrerequisitesAreSatisfied()) {
+      *os << "         Expected: all pre-requisites are satisfied\n"
+          << "           Actual: the following immediate pre-requisites "
+          << "are not satisfied:\n";
+      ExpectationSet unsatisfied_prereqs;
+      FindUnsatisfiedPrerequisites(&unsatisfied_prereqs);
+      int i = 0;
+      for (ExpectationSet::const_iterator it = unsatisfied_prereqs.begin();
+           it != unsatisfied_prereqs.end(); ++it) {
+        it->expectation_base()->DescribeLocationTo(os);
+        *os << "pre-requisite #" << i++ << "\n";
+      }
+      *os << "                   (end of pre-requisites)\n";
+    } else {
+      // This line is here just for completeness' sake.  It will never
+      // be executed as currently the ExplainMatchResultTo() function
+      // is called only when the mock function call does NOT match the
+      // expectation.
+      *os << "The call matches the expectation.\n";
+    }
+  }
+
+  // Returns the action that should be taken for the current invocation.
+  const Action<F>& GetCurrentAction(const FunctionMocker<F>* mocker,
+                                    const ArgumentTuple& args) const
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+    const int count = call_count();
+    Assert(count >= 1, __FILE__, __LINE__,
+           "call_count() is <= 0 when GetCurrentAction() is "
+           "called - this should never happen.");
+
+    const int action_count = static_cast<int>(untyped_actions_.size());
+    if (action_count > 0 && !repeated_action_specified_ &&
+        count > action_count) {
+      // If there is at least one WillOnce() and no WillRepeatedly(),
+      // we warn the user when the WillOnce() clauses ran out.
+      ::std::stringstream ss;
+      DescribeLocationTo(&ss);
+      ss << "Actions ran out in " << source_text() << "...\n"
+         << "Called " << count << " times, but only "
+         << action_count << " WillOnce()"
+         << (action_count == 1 ? " is" : "s are") << " specified - ";
+      mocker->DescribeDefaultActionTo(args, &ss);
+      Log(kWarning, ss.str(), 1);
+    }
+
+    return count <= action_count
+               ? *static_cast<const Action<F>*>(
+                     untyped_actions_[static_cast<size_t>(count - 1)])
+               : repeated_action();
+  }
+
+  // Given the arguments of a mock function call, if the call will
+  // over-saturate this expectation, returns the default action;
+  // otherwise, returns the next action in this expectation.  Also
+  // describes *what* happened to 'what', and explains *why* Google
+  // Mock does it to 'why'.  This method is not const as it calls
+  // IncrementCallCount().  A return value of NULL means the default
+  // action.
+  const Action<F>* GetActionForArguments(const FunctionMocker<F>* mocker,
+                                         const ArgumentTuple& args,
+                                         ::std::ostream* what,
+                                         ::std::ostream* why)
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+    if (IsSaturated()) {
+      // We have an excessive call.
+      IncrementCallCount();
+      *what << "Mock function called more times than expected - ";
+      mocker->DescribeDefaultActionTo(args, what);
+      DescribeCallCountTo(why);
+
+      return nullptr;
+    }
+
+    IncrementCallCount();
+    RetireAllPreRequisites();
+
+    if (retires_on_saturation_ && IsSaturated()) {
+      Retire();
+    }
+
+    // Must be done after IncrementCount()!
+    *what << "Mock function call matches " << source_text() <<"...\n";
+    return &(GetCurrentAction(mocker, args));
+  }
+
+  // All the fields below won't change once the EXPECT_CALL()
+  // statement finishes.
+  FunctionMocker<F>* const owner_;
+  ArgumentMatcherTuple matchers_;
+  Matcher<const ArgumentTuple&> extra_matcher_;
+  Action<F> repeated_action_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(TypedExpectation);
+};  // class TypedExpectation
+
+// A MockSpec object is used by ON_CALL() or EXPECT_CALL() for
+// specifying the default behavior of, or expectation on, a mock
+// function.
+
+// Note: class MockSpec really belongs to the ::testing namespace.
+// However if we define it in ::testing, MSVC will complain when
+// classes in ::testing::internal declare it as a friend class
+// template.  To workaround this compiler bug, we define MockSpec in
+// ::testing::internal and import it into ::testing.
+
+// Logs a message including file and line number information.
+GTEST_API_ void LogWithLocation(testing::internal::LogSeverity severity,
+                                const char* file, int line,
+                                const std::string& message);
+
+template <typename F>
+class MockSpec {
+ public:
+  typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
+  typedef typename internal::Function<F>::ArgumentMatcherTuple
+      ArgumentMatcherTuple;
+
+  // Constructs a MockSpec object, given the function mocker object
+  // that the spec is associated with.
+  MockSpec(internal::FunctionMocker<F>* function_mocker,
+           const ArgumentMatcherTuple& matchers)
+      : function_mocker_(function_mocker), matchers_(matchers) {}
+
+  // Adds a new default action spec to the function mocker and returns
+  // the newly created spec.
+  internal::OnCallSpec<F>& InternalDefaultActionSetAt(
+      const char* file, int line, const char* obj, const char* call) {
+    LogWithLocation(internal::kInfo, file, line,
+                    std::string("ON_CALL(") + obj + ", " + call + ") invoked");
+    return function_mocker_->AddNewOnCallSpec(file, line, matchers_);
+  }
+
+  // Adds a new expectation spec to the function mocker and returns
+  // the newly created spec.
+  internal::TypedExpectation<F>& InternalExpectedAt(
+      const char* file, int line, const char* obj, const char* call) {
+    const std::string source_text(std::string("EXPECT_CALL(") + obj + ", " +
+                                  call + ")");
+    LogWithLocation(internal::kInfo, file, line, source_text + " invoked");
+    return function_mocker_->AddNewExpectation(
+        file, line, source_text, matchers_);
+  }
+
+  // This operator overload is used to swallow the superfluous parameter list
+  // introduced by the ON/EXPECT_CALL macros. See the macro comments for more
+  // explanation.
+  MockSpec<F>& operator()(const internal::WithoutMatchers&, void* const) {
+    return *this;
+  }
+
+ private:
+  template <typename Function>
+  friend class internal::FunctionMocker;
+
+  // The function mocker that owns this spec.
+  internal::FunctionMocker<F>* const function_mocker_;
+  // The argument matchers specified in the spec.
+  ArgumentMatcherTuple matchers_;
+};  // class MockSpec
+
+// Wrapper type for generically holding an ordinary value or lvalue reference.
+// If T is not a reference type, it must be copyable or movable.
+// ReferenceOrValueWrapper<T> is movable, and will also be copyable unless
+// T is a move-only value type (which means that it will always be copyable
+// if the current platform does not support move semantics).
+//
+// The primary template defines handling for values, but function header
+// comments describe the contract for the whole template (including
+// specializations).
+template <typename T>
+class ReferenceOrValueWrapper {
+ public:
+  // Constructs a wrapper from the given value/reference.
+  explicit ReferenceOrValueWrapper(T value)
+      : value_(std::move(value)) {
+  }
+
+  // Unwraps and returns the underlying value/reference, exactly as
+  // originally passed. The behavior of calling this more than once on
+  // the same object is unspecified.
+  T Unwrap() { return std::move(value_); }
+
+  // Provides nondestructive access to the underlying value/reference.
+  // Always returns a const reference (more precisely,
+  // const std::add_lvalue_reference<T>::type). The behavior of calling this
+  // after calling Unwrap on the same object is unspecified.
+  const T& Peek() const {
+    return value_;
+  }
+
+ private:
+  T value_;
+};
+
+// Specialization for lvalue reference types. See primary template
+// for documentation.
+template <typename T>
+class ReferenceOrValueWrapper<T&> {
+ public:
+  // Workaround for debatable pass-by-reference lint warning (c-library-team
+  // policy precludes NOLINT in this context)
+  typedef T& reference;
+  explicit ReferenceOrValueWrapper(reference ref)
+      : value_ptr_(&ref) {}
+  T& Unwrap() { return *value_ptr_; }
+  const T& Peek() const { return *value_ptr_; }
+
+ private:
+  T* value_ptr_;
+};
+
+// C++ treats the void type specially.  For example, you cannot define
+// a void-typed variable or pass a void value to a function.
+// ActionResultHolder<T> holds a value of type T, where T must be a
+// copyable type or void (T doesn't need to be default-constructable).
+// It hides the syntactic difference between void and other types, and
+// is used to unify the code for invoking both void-returning and
+// non-void-returning mock functions.
+
+// Untyped base class for ActionResultHolder<T>.
+class UntypedActionResultHolderBase {
+ public:
+  virtual ~UntypedActionResultHolderBase() {}
+
+  // Prints the held value as an action's result to os.
+  virtual void PrintAsActionResult(::std::ostream* os) const = 0;
+};
+
+// This generic definition is used when T is not void.
+template <typename T>
+class ActionResultHolder : public UntypedActionResultHolderBase {
+ public:
+  // Returns the held value. Must not be called more than once.
+  T Unwrap() {
+    return result_.Unwrap();
+  }
+
+  // Prints the held value as an action's result to os.
+  void PrintAsActionResult(::std::ostream* os) const override {
+    *os << "\n          Returns: ";
+    // T may be a reference type, so we don't use UniversalPrint().
+    UniversalPrinter<T>::Print(result_.Peek(), os);
+  }
+
+  // Performs the given mock function's default action and returns the
+  // result in a new-ed ActionResultHolder.
+  template <typename F>
+  static ActionResultHolder* PerformDefaultAction(
+      const FunctionMocker<F>* func_mocker,
+      typename Function<F>::ArgumentTuple&& args,
+      const std::string& call_description) {
+    return new ActionResultHolder(Wrapper(func_mocker->PerformDefaultAction(
+        std::move(args), call_description)));
+  }
+
+  // Performs the given action and returns the result in a new-ed
+  // ActionResultHolder.
+  template <typename F>
+  static ActionResultHolder* PerformAction(
+      const Action<F>& action, typename Function<F>::ArgumentTuple&& args) {
+    return new ActionResultHolder(
+        Wrapper(action.Perform(std::move(args))));
+  }
+
+ private:
+  typedef ReferenceOrValueWrapper<T> Wrapper;
+
+  explicit ActionResultHolder(Wrapper result)
+      : result_(std::move(result)) {
+  }
+
+  Wrapper result_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ActionResultHolder);
+};
+
+// Specialization for T = void.
+template <>
+class ActionResultHolder<void> : public UntypedActionResultHolderBase {
+ public:
+  void Unwrap() { }
+
+  void PrintAsActionResult(::std::ostream* /* os */) const override {}
+
+  // Performs the given mock function's default action and returns ownership
+  // of an empty ActionResultHolder*.
+  template <typename F>
+  static ActionResultHolder* PerformDefaultAction(
+      const FunctionMocker<F>* func_mocker,
+      typename Function<F>::ArgumentTuple&& args,
+      const std::string& call_description) {
+    func_mocker->PerformDefaultAction(std::move(args), call_description);
+    return new ActionResultHolder;
+  }
+
+  // Performs the given action and returns ownership of an empty
+  // ActionResultHolder*.
+  template <typename F>
+  static ActionResultHolder* PerformAction(
+      const Action<F>& action, typename Function<F>::ArgumentTuple&& args) {
+    action.Perform(std::move(args));
+    return new ActionResultHolder;
+  }
+
+ private:
+  ActionResultHolder() {}
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ActionResultHolder);
+};
+
+template <typename F>
+class FunctionMocker;
+
+template <typename R, typename... Args>
+class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase {
+  using F = R(Args...);
+
+ public:
+  using Result = R;
+  using ArgumentTuple = std::tuple<Args...>;
+  using ArgumentMatcherTuple = std::tuple<Matcher<Args>...>;
+
+  FunctionMocker() {}
+
+  // There is no generally useful and implementable semantics of
+  // copying a mock object, so copying a mock is usually a user error.
+  // Thus we disallow copying function mockers.  If the user really
+  // wants to copy a mock object, they should implement their own copy
+  // operation, for example:
+  //
+  //   class MockFoo : public Foo {
+  //    public:
+  //     // Defines a copy constructor explicitly.
+  //     MockFoo(const MockFoo& src) {}
+  //     ...
+  //   };
+  FunctionMocker(const FunctionMocker&) = delete;
+  FunctionMocker& operator=(const FunctionMocker&) = delete;
+
+  // The destructor verifies that all expectations on this mock
+  // function have been satisfied.  If not, it will report Google Test
+  // non-fatal failures for the violations.
+  ~FunctionMocker() override GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
+    MutexLock l(&g_gmock_mutex);
+    VerifyAndClearExpectationsLocked();
+    Mock::UnregisterLocked(this);
+    ClearDefaultActionsLocked();
+  }
+
+  // Returns the ON_CALL spec that matches this mock function with the
+  // given arguments; returns NULL if no matching ON_CALL is found.
+  // L = *
+  const OnCallSpec<F>* FindOnCallSpec(
+      const ArgumentTuple& args) const {
+    for (UntypedOnCallSpecs::const_reverse_iterator it
+             = untyped_on_call_specs_.rbegin();
+         it != untyped_on_call_specs_.rend(); ++it) {
+      const OnCallSpec<F>* spec = static_cast<const OnCallSpec<F>*>(*it);
+      if (spec->Matches(args))
+        return spec;
+    }
+
+    return nullptr;
+  }
+
+  // Performs the default action of this mock function on the given
+  // arguments and returns the result. Asserts (or throws if
+  // exceptions are enabled) with a helpful call descrption if there
+  // is no valid return value. This method doesn't depend on the
+  // mutable state of this object, and thus can be called concurrently
+  // without locking.
+  // L = *
+  Result PerformDefaultAction(ArgumentTuple&& args,
+                              const std::string& call_description) const {
+    const OnCallSpec<F>* const spec =
+        this->FindOnCallSpec(args);
+    if (spec != nullptr) {
+      return spec->GetAction().Perform(std::move(args));
+    }
+    const std::string message =
+        call_description +
+        "\n    The mock function has no default action "
+        "set, and its return type has no default value set.";
+#if GTEST_HAS_EXCEPTIONS
+    if (!DefaultValue<Result>::Exists()) {
+      throw std::runtime_error(message);
+    }
+#else
+    Assert(DefaultValue<Result>::Exists(), "", -1, message);
+#endif
+    return DefaultValue<Result>::Get();
+  }
+
+  // Performs the default action with the given arguments and returns
+  // the action's result.  The call description string will be used in
+  // the error message to describe the call in the case the default
+  // action fails.  The caller is responsible for deleting the result.
+  // L = *
+  UntypedActionResultHolderBase* UntypedPerformDefaultAction(
+      void* untyped_args,  // must point to an ArgumentTuple
+      const std::string& call_description) const override {
+    ArgumentTuple* args = static_cast<ArgumentTuple*>(untyped_args);
+    return ResultHolder::PerformDefaultAction(this, std::move(*args),
+                                              call_description);
+  }
+
+  // Performs the given action with the given arguments and returns
+  // the action's result.  The caller is responsible for deleting the
+  // result.
+  // L = *
+  UntypedActionResultHolderBase* UntypedPerformAction(
+      const void* untyped_action, void* untyped_args) const override {
+    // Make a copy of the action before performing it, in case the
+    // action deletes the mock object (and thus deletes itself).
+    const Action<F> action = *static_cast<const Action<F>*>(untyped_action);
+    ArgumentTuple* args = static_cast<ArgumentTuple*>(untyped_args);
+    return ResultHolder::PerformAction(action, std::move(*args));
+  }
+
+  // Implements UntypedFunctionMockerBase::ClearDefaultActionsLocked():
+  // clears the ON_CALL()s set on this mock function.
+  void ClearDefaultActionsLocked() override
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+
+    // Deleting our default actions may trigger other mock objects to be
+    // deleted, for example if an action contains a reference counted smart
+    // pointer to that mock object, and that is the last reference. So if we
+    // delete our actions within the context of the global mutex we may deadlock
+    // when this method is called again. Instead, make a copy of the set of
+    // actions to delete, clear our set within the mutex, and then delete the
+    // actions outside of the mutex.
+    UntypedOnCallSpecs specs_to_delete;
+    untyped_on_call_specs_.swap(specs_to_delete);
+
+    g_gmock_mutex.Unlock();
+    for (UntypedOnCallSpecs::const_iterator it =
+             specs_to_delete.begin();
+         it != specs_to_delete.end(); ++it) {
+      delete static_cast<const OnCallSpec<F>*>(*it);
+    }
+
+    // Lock the mutex again, since the caller expects it to be locked when we
+    // return.
+    g_gmock_mutex.Lock();
+  }
+
+  // Returns the result of invoking this mock function with the given
+  // arguments.  This function can be safely called from multiple
+  // threads concurrently.
+  Result Invoke(Args... args) GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
+    ArgumentTuple tuple(std::forward<Args>(args)...);
+    std::unique_ptr<ResultHolder> holder(DownCast_<ResultHolder*>(
+        this->UntypedInvokeWith(static_cast<void*>(&tuple))));
+    return holder->Unwrap();
+  }
+
+  MockSpec<F> With(Matcher<Args>... m) {
+    return MockSpec<F>(this, ::std::make_tuple(std::move(m)...));
+  }
+
+ protected:
+  template <typename Function>
+  friend class MockSpec;
+
+  typedef ActionResultHolder<Result> ResultHolder;
+
+  // Adds and returns a default action spec for this mock function.
+  OnCallSpec<F>& AddNewOnCallSpec(
+      const char* file, int line,
+      const ArgumentMatcherTuple& m)
+          GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
+    Mock::RegisterUseByOnCallOrExpectCall(MockObject(), file, line);
+    OnCallSpec<F>* const on_call_spec = new OnCallSpec<F>(file, line, m);
+    untyped_on_call_specs_.push_back(on_call_spec);
+    return *on_call_spec;
+  }
+
+  // Adds and returns an expectation spec for this mock function.
+  TypedExpectation<F>& AddNewExpectation(const char* file, int line,
+                                         const std::string& source_text,
+                                         const ArgumentMatcherTuple& m)
+      GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
+    Mock::RegisterUseByOnCallOrExpectCall(MockObject(), file, line);
+    TypedExpectation<F>* const expectation =
+        new TypedExpectation<F>(this, file, line, source_text, m);
+    const std::shared_ptr<ExpectationBase> untyped_expectation(expectation);
+    // See the definition of untyped_expectations_ for why access to
+    // it is unprotected here.
+    untyped_expectations_.push_back(untyped_expectation);
+
+    // Adds this expectation into the implicit sequence if there is one.
+    Sequence* const implicit_sequence = g_gmock_implicit_sequence.get();
+    if (implicit_sequence != nullptr) {
+      implicit_sequence->AddExpectation(Expectation(untyped_expectation));
+    }
+
+    return *expectation;
+  }
+
+ private:
+  template <typename Func> friend class TypedExpectation;
+
+  // Some utilities needed for implementing UntypedInvokeWith().
+
+  // Describes what default action will be performed for the given
+  // arguments.
+  // L = *
+  void DescribeDefaultActionTo(const ArgumentTuple& args,
+                               ::std::ostream* os) const {
+    const OnCallSpec<F>* const spec = FindOnCallSpec(args);
+
+    if (spec == nullptr) {
+      *os << (std::is_void<Result>::value ? "returning directly.\n"
+                                          : "returning default value.\n");
+    } else {
+      *os << "taking default action specified at:\n"
+          << FormatFileLocation(spec->file(), spec->line()) << "\n";
+    }
+  }
+
+  // Writes a message that the call is uninteresting (i.e. neither
+  // explicitly expected nor explicitly unexpected) to the given
+  // ostream.
+  void UntypedDescribeUninterestingCall(const void* untyped_args,
+                                        ::std::ostream* os) const override
+      GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
+    const ArgumentTuple& args =
+        *static_cast<const ArgumentTuple*>(untyped_args);
+    *os << "Uninteresting mock function call - ";
+    DescribeDefaultActionTo(args, os);
+    *os << "    Function call: " << Name();
+    UniversalPrint(args, os);
+  }
+
+  // Returns the expectation that matches the given function arguments
+  // (or NULL is there's no match); when a match is found,
+  // untyped_action is set to point to the action that should be
+  // performed (or NULL if the action is "do default"), and
+  // is_excessive is modified to indicate whether the call exceeds the
+  // expected number.
+  //
+  // Critical section: We must find the matching expectation and the
+  // corresponding action that needs to be taken in an ATOMIC
+  // transaction.  Otherwise another thread may call this mock
+  // method in the middle and mess up the state.
+  //
+  // However, performing the action has to be left out of the critical
+  // section.  The reason is that we have no control on what the
+  // action does (it can invoke an arbitrary user function or even a
+  // mock function) and excessive locking could cause a dead lock.
+  const ExpectationBase* UntypedFindMatchingExpectation(
+      const void* untyped_args, const void** untyped_action, bool* is_excessive,
+      ::std::ostream* what, ::std::ostream* why) override
+      GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
+    const ArgumentTuple& args =
+        *static_cast<const ArgumentTuple*>(untyped_args);
+    MutexLock l(&g_gmock_mutex);
+    TypedExpectation<F>* exp = this->FindMatchingExpectationLocked(args);
+    if (exp == nullptr) {  // A match wasn't found.
+      this->FormatUnexpectedCallMessageLocked(args, what, why);
+      return nullptr;
+    }
+
+    // This line must be done before calling GetActionForArguments(),
+    // which will increment the call count for *exp and thus affect
+    // its saturation status.
+    *is_excessive = exp->IsSaturated();
+    const Action<F>* action = exp->GetActionForArguments(this, args, what, why);
+    if (action != nullptr && action->IsDoDefault())
+      action = nullptr;  // Normalize "do default" to NULL.
+    *untyped_action = action;
+    return exp;
+  }
+
+  // Prints the given function arguments to the ostream.
+  void UntypedPrintArgs(const void* untyped_args,
+                        ::std::ostream* os) const override {
+    const ArgumentTuple& args =
+        *static_cast<const ArgumentTuple*>(untyped_args);
+    UniversalPrint(args, os);
+  }
+
+  // Returns the expectation that matches the arguments, or NULL if no
+  // expectation matches them.
+  TypedExpectation<F>* FindMatchingExpectationLocked(
+      const ArgumentTuple& args) const
+          GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+    // See the definition of untyped_expectations_ for why access to
+    // it is unprotected here.
+    for (typename UntypedExpectations::const_reverse_iterator it =
+             untyped_expectations_.rbegin();
+         it != untyped_expectations_.rend(); ++it) {
+      TypedExpectation<F>* const exp =
+          static_cast<TypedExpectation<F>*>(it->get());
+      if (exp->ShouldHandleArguments(args)) {
+        return exp;
+      }
+    }
+    return nullptr;
+  }
+
+  // Returns a message that the arguments don't match any expectation.
+  void FormatUnexpectedCallMessageLocked(
+      const ArgumentTuple& args,
+      ::std::ostream* os,
+      ::std::ostream* why) const
+          GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+    *os << "\nUnexpected mock function call - ";
+    DescribeDefaultActionTo(args, os);
+    PrintTriedExpectationsLocked(args, why);
+  }
+
+  // Prints a list of expectations that have been tried against the
+  // current mock function call.
+  void PrintTriedExpectationsLocked(
+      const ArgumentTuple& args,
+      ::std::ostream* why) const
+          GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+    const size_t count = untyped_expectations_.size();
+    *why << "Google Mock tried the following " << count << " "
+         << (count == 1 ? "expectation, but it didn't match" :
+             "expectations, but none matched")
+         << ":\n";
+    for (size_t i = 0; i < count; i++) {
+      TypedExpectation<F>* const expectation =
+          static_cast<TypedExpectation<F>*>(untyped_expectations_[i].get());
+      *why << "\n";
+      expectation->DescribeLocationTo(why);
+      if (count > 1) {
+        *why << "tried expectation #" << i << ": ";
+      }
+      *why << expectation->source_text() << "...\n";
+      expectation->ExplainMatchResultTo(args, why);
+      expectation->DescribeCallCountTo(why);
+    }
+  }
+};  // class FunctionMocker
+
+// Reports an uninteresting call (whose description is in msg) in the
+// manner specified by 'reaction'.
+void ReportUninterestingCall(CallReaction reaction, const std::string& msg);
+
+}  // namespace internal
+
+namespace internal {
+
+template <typename F>
+class MockFunction;
+
+template <typename R, typename... Args>
+class MockFunction<R(Args...)> {
+ public:
+  MockFunction(const MockFunction&) = delete;
+  MockFunction& operator=(const MockFunction&) = delete;
+
+  std::function<R(Args...)> AsStdFunction() {
+    return [this](Args... args) -> R {
+      return this->Call(std::forward<Args>(args)...);
+    };
+  }
+
+  // Implementation detail: the expansion of the MOCK_METHOD macro.
+  R Call(Args... args) {
+    mock_.SetOwnerAndName(this, "Call");
+    return mock_.Invoke(std::forward<Args>(args)...);
+  }
+
+  MockSpec<R(Args...)> gmock_Call(Matcher<Args>... m) {
+    mock_.RegisterOwner(this);
+    return mock_.With(std::move(m)...);
+  }
+
+  MockSpec<R(Args...)> gmock_Call(const WithoutMatchers&, R (*)(Args...)) {
+    return this->gmock_Call(::testing::A<Args>()...);
+  }
+
+ protected:
+  MockFunction() = default;
+  ~MockFunction() = default;
+
+ private:
+  FunctionMocker<R(Args...)> mock_;
+};
+
+/*
+The SignatureOf<F> struct is a meta-function returning function signature
+corresponding to the provided F argument.
+
+It makes use of MockFunction easier by allowing it to accept more F arguments
+than just function signatures.
+
+Specializations provided here cover a signature type itself and any template
+that can be parameterized with a signature, including std::function and
+boost::function.
+*/
+
+template <typename F, typename = void>
+struct SignatureOf;
+
+template <typename R, typename... Args>
+struct SignatureOf<R(Args...)> {
+  using type = R(Args...);
+};
+
+template <template <typename> class C, typename F>
+struct SignatureOf<C<F>,
+                   typename std::enable_if<std::is_function<F>::value>::type>
+    : SignatureOf<F> {};
+
+template <typename F>
+using SignatureOfT = typename SignatureOf<F>::type;
+
+}  // namespace internal
+
+// A MockFunction<F> type has one mock method whose type is
+// internal::SignatureOfT<F>.  It is useful when you just want your
+// test code to emit some messages and have Google Mock verify the
+// right messages are sent (and perhaps at the right times).  For
+// example, if you are exercising code:
+//
+//   Foo(1);
+//   Foo(2);
+//   Foo(3);
+//
+// and want to verify that Foo(1) and Foo(3) both invoke
+// mock.Bar("a"), but Foo(2) doesn't invoke anything, you can write:
+//
+// TEST(FooTest, InvokesBarCorrectly) {
+//   MyMock mock;
+//   MockFunction<void(string check_point_name)> check;
+//   {
+//     InSequence s;
+//
+//     EXPECT_CALL(mock, Bar("a"));
+//     EXPECT_CALL(check, Call("1"));
+//     EXPECT_CALL(check, Call("2"));
+//     EXPECT_CALL(mock, Bar("a"));
+//   }
+//   Foo(1);
+//   check.Call("1");
+//   Foo(2);
+//   check.Call("2");
+//   Foo(3);
+// }
+//
+// The expectation spec says that the first Bar("a") must happen
+// before check point "1", the second Bar("a") must happen after check
+// point "2", and nothing should happen between the two check
+// points. The explicit check points make it easy to tell which
+// Bar("a") is called by which call to Foo().
+//
+// MockFunction<F> can also be used to exercise code that accepts
+// std::function<internal::SignatureOfT<F>> callbacks. To do so, use
+// AsStdFunction() method to create std::function proxy forwarding to
+// original object's Call. Example:
+//
+// TEST(FooTest, RunsCallbackWithBarArgument) {
+//   MockFunction<int(string)> callback;
+//   EXPECT_CALL(callback, Call("bar")).WillOnce(Return(1));
+//   Foo(callback.AsStdFunction());
+// }
+//
+// The internal::SignatureOfT<F> indirection allows to use other types
+// than just function signature type. This is typically useful when
+// providing a mock for a predefined std::function type. Example:
+//
+// using FilterPredicate = std::function<bool(string)>;
+// void MyFilterAlgorithm(FilterPredicate predicate);
+//
+// TEST(FooTest, FilterPredicateAlwaysAccepts) {
+//   MockFunction<FilterPredicate> predicateMock;
+//   EXPECT_CALL(predicateMock, Call(_)).WillRepeatedly(Return(true));
+//   MyFilterAlgorithm(predicateMock.AsStdFunction());
+// }
+template <typename F>
+class MockFunction : public internal::MockFunction<internal::SignatureOfT<F>> {
+  using Base = internal::MockFunction<internal::SignatureOfT<F>>;
+
+ public:
+  using Base::Base;
+};
+
+// The style guide prohibits "using" statements in a namespace scope
+// inside a header file.  However, the MockSpec class template is
+// meant to be defined in the ::testing namespace.  The following line
+// is just a trick for working around a bug in MSVC 8.0, which cannot
+// handle it if we define MockSpec in ::testing.
+using internal::MockSpec;
+
+// Const(x) is a convenient function for obtaining a const reference
+// to x.  This is useful for setting expectations on an overloaded
+// const mock method, e.g.
+//
+//   class MockFoo : public FooInterface {
+//    public:
+//     MOCK_METHOD0(Bar, int());
+//     MOCK_CONST_METHOD0(Bar, int&());
+//   };
+//
+//   MockFoo foo;
+//   // Expects a call to non-const MockFoo::Bar().
+//   EXPECT_CALL(foo, Bar());
+//   // Expects a call to const MockFoo::Bar().
+//   EXPECT_CALL(Const(foo), Bar());
+template <typename T>
+inline const T& Const(const T& x) { return x; }
+
+// Constructs an Expectation object that references and co-owns exp.
+inline Expectation::Expectation(internal::ExpectationBase& exp)  // NOLINT
+    : expectation_base_(exp.GetHandle().expectation_base()) {}
+
+}  // namespace testing
+
+GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
+
+// Implementation for ON_CALL and EXPECT_CALL macros. A separate macro is
+// required to avoid compile errors when the name of the method used in call is
+// a result of macro expansion. See CompilesWithMethodNameExpandedFromMacro
+// tests in internal/gmock-spec-builders_test.cc for more details.
+//
+// This macro supports statements both with and without parameter matchers. If
+// the parameter list is omitted, gMock will accept any parameters, which allows
+// tests to be written that don't need to encode the number of method
+// parameter. This technique may only be used for non-overloaded methods.
+//
+//   // These are the same:
+//   ON_CALL(mock, NoArgsMethod()).WillByDefault(...);
+//   ON_CALL(mock, NoArgsMethod).WillByDefault(...);
+//
+//   // As are these:
+//   ON_CALL(mock, TwoArgsMethod(_, _)).WillByDefault(...);
+//   ON_CALL(mock, TwoArgsMethod).WillByDefault(...);
+//
+//   // Can also specify args if you want, of course:
+//   ON_CALL(mock, TwoArgsMethod(_, 45)).WillByDefault(...);
+//
+//   // Overloads work as long as you specify parameters:
+//   ON_CALL(mock, OverloadedMethod(_)).WillByDefault(...);
+//   ON_CALL(mock, OverloadedMethod(_, _)).WillByDefault(...);
+//
+//   // Oops! Which overload did you want?
+//   ON_CALL(mock, OverloadedMethod).WillByDefault(...);
+//     => ERROR: call to member function 'gmock_OverloadedMethod' is ambiguous
+//
+// How this works: The mock class uses two overloads of the gmock_Method
+// expectation setter method plus an operator() overload on the MockSpec object.
+// In the matcher list form, the macro expands to:
+//
+//   // This statement:
+//   ON_CALL(mock, TwoArgsMethod(_, 45))...
+//
+//   // ...expands to:
+//   mock.gmock_TwoArgsMethod(_, 45)(WithoutMatchers(), nullptr)...
+//   |-------------v---------------||------------v-------------|
+//       invokes first overload        swallowed by operator()
+//
+//   // ...which is essentially:
+//   mock.gmock_TwoArgsMethod(_, 45)...
+//
+// Whereas the form without a matcher list:
+//
+//   // This statement:
+//   ON_CALL(mock, TwoArgsMethod)...
+//
+//   // ...expands to:
+//   mock.gmock_TwoArgsMethod(WithoutMatchers(), nullptr)...
+//   |-----------------------v--------------------------|
+//                 invokes second overload
+//
+//   // ...which is essentially:
+//   mock.gmock_TwoArgsMethod(_, _)...
+//
+// The WithoutMatchers() argument is used to disambiguate overloads and to
+// block the caller from accidentally invoking the second overload directly. The
+// second argument is an internal type derived from the method signature. The
+// failure to disambiguate two overloads of this method in the ON_CALL statement
+// is how we block callers from setting expectations on overloaded methods.
+#define GMOCK_ON_CALL_IMPL_(mock_expr, Setter, call)                    \
+  ((mock_expr).gmock_##call)(::testing::internal::GetWithoutMatchers(), \
+                             nullptr)                                   \
+      .Setter(__FILE__, __LINE__, #mock_expr, #call)
+
+#define ON_CALL(obj, call) \
+  GMOCK_ON_CALL_IMPL_(obj, InternalDefaultActionSetAt, call)
+
+#define EXPECT_CALL(obj, call) \
+  GMOCK_ON_CALL_IMPL_(obj, InternalExpectedAt, call)
+
+#endif  // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_SPEC_BUILDERS_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/internal/custom/gmock-generated-actions.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/internal/custom/gmock-generated-actions.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/internal/custom/gmock-generated-actions.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/internal/custom/gmock-generated-actions.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,6 @@
+// GOOGLETEST_CM0002 DO NOT DELETE
+
+#ifndef GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_
+#define GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_
+
+#endif  // GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/internal/custom/gmock-matchers.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/internal/custom/gmock-matchers.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/internal/custom/gmock-matchers.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/internal/custom/gmock-matchers.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,36 @@
+// Copyright 2015, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Injection point for custom user configurations. See README for details
+//
+// GOOGLETEST_CM0002 DO NOT DELETE
+
+#ifndef GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_
+#define GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_
+#endif  // GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/internal/custom/gmock-port.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/internal/custom/gmock-port.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/internal/custom/gmock-port.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/internal/custom/gmock-port.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,39 @@
+// Copyright 2015, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Injection point for custom user configurations. See README for details
+//
+// ** Custom implementation starts here **
+
+// GOOGLETEST_CM0002 DO NOT DELETE
+
+#ifndef GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_
+#define GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_
+
+#endif  // GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/internal/custom/README.md mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/internal/custom/README.md
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/internal/custom/README.md	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/internal/custom/README.md	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,16 @@
+# Customization Points
+
+The custom directory is an injection point for custom user configurations.
+
+## Header `gmock-port.h`
+
+The following macros can be defined:
+
+### Flag related macros:
+
+*   `GMOCK_DECLARE_bool_(name)`
+*   `GMOCK_DECLARE_int32_(name)`
+*   `GMOCK_DECLARE_string_(name)`
+*   `GMOCK_DEFINE_bool_(name, default_val, doc)`
+*   `GMOCK_DEFINE_int32_(name, default_val, doc)`
+*   `GMOCK_DEFINE_string_(name, default_val, doc)`
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/internal/gmock-internal-utils.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/internal/gmock-internal-utils.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/internal/gmock-internal-utils.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/internal/gmock-internal-utils.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,459 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file defines some utilities useful for implementing Google
+// Mock.  They are subject to change without notice, so please DO NOT
+// USE THEM IN USER CODE.
+
+// GOOGLETEST_CM0002 DO NOT DELETE
+
+#ifndef GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_INTERNAL_UTILS_H_
+#define GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_INTERNAL_UTILS_H_
+
+#include <stdio.h>
+#include <ostream>  // NOLINT
+#include <string>
+#include <type_traits>
+#include "gmock/internal/gmock-port.h"
+#include "gtest/gtest.h"
+
+namespace testing {
+
+template <typename>
+class Matcher;
+
+namespace internal {
+
+// Silence MSVC C4100 (unreferenced formal parameter) and
+// C4805('==': unsafe mix of type 'const int' and type 'const bool')
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable:4100)
+# pragma warning(disable:4805)
+#endif
+
+// Joins a vector of strings as if they are fields of a tuple; returns
+// the joined string.
+GTEST_API_ std::string JoinAsTuple(const Strings& fields);
+
+// Converts an identifier name to a space-separated list of lower-case
+// words.  Each maximum substring of the form [A-Za-z][a-z]*|\d+ is
+// treated as one word.  For example, both "FooBar123" and
+// "foo_bar_123" are converted to "foo bar 123".
+GTEST_API_ std::string ConvertIdentifierNameToWords(const char* id_name);
+
+// GetRawPointer(p) returns the raw pointer underlying p when p is a
+// smart pointer, or returns p itself when p is already a raw pointer.
+// The following default implementation is for the smart pointer case.
+template <typename Pointer>
+inline const typename Pointer::element_type* GetRawPointer(const Pointer& p) {
+  return p.get();
+}
+// This overloaded version is for the raw pointer case.
+template <typename Element>
+inline Element* GetRawPointer(Element* p) { return p; }
+
+// MSVC treats wchar_t as a native type usually, but treats it as the
+// same as unsigned short when the compiler option /Zc:wchar_t- is
+// specified.  It defines _NATIVE_WCHAR_T_DEFINED symbol when wchar_t
+// is a native type.
+#if defined(_MSC_VER) && !defined(_NATIVE_WCHAR_T_DEFINED)
+// wchar_t is a typedef.
+#else
+# define GMOCK_WCHAR_T_IS_NATIVE_ 1
+#endif
+
+// In what follows, we use the term "kind" to indicate whether a type
+// is bool, an integer type (excluding bool), a floating-point type,
+// or none of them.  This categorization is useful for determining
+// when a matcher argument type can be safely converted to another
+// type in the implementation of SafeMatcherCast.
+enum TypeKind {
+  kBool, kInteger, kFloatingPoint, kOther
+};
+
+// KindOf<T>::value is the kind of type T.
+template <typename T> struct KindOf {
+  enum { value = kOther };  // The default kind.
+};
+
+// This macro declares that the kind of 'type' is 'kind'.
+#define GMOCK_DECLARE_KIND_(type, kind) \
+  template <> struct KindOf<type> { enum { value = kind }; }
+
+GMOCK_DECLARE_KIND_(bool, kBool);
+
+// All standard integer types.
+GMOCK_DECLARE_KIND_(char, kInteger);
+GMOCK_DECLARE_KIND_(signed char, kInteger);
+GMOCK_DECLARE_KIND_(unsigned char, kInteger);
+GMOCK_DECLARE_KIND_(short, kInteger);  // NOLINT
+GMOCK_DECLARE_KIND_(unsigned short, kInteger);  // NOLINT
+GMOCK_DECLARE_KIND_(int, kInteger);
+GMOCK_DECLARE_KIND_(unsigned int, kInteger);
+GMOCK_DECLARE_KIND_(long, kInteger);  // NOLINT
+GMOCK_DECLARE_KIND_(unsigned long, kInteger);  // NOLINT
+GMOCK_DECLARE_KIND_(long long, kInteger);  // NOLINT
+GMOCK_DECLARE_KIND_(unsigned long long, kInteger);  // NOLINT
+
+#if GMOCK_WCHAR_T_IS_NATIVE_
+GMOCK_DECLARE_KIND_(wchar_t, kInteger);
+#endif
+
+// All standard floating-point types.
+GMOCK_DECLARE_KIND_(float, kFloatingPoint);
+GMOCK_DECLARE_KIND_(double, kFloatingPoint);
+GMOCK_DECLARE_KIND_(long double, kFloatingPoint);
+
+#undef GMOCK_DECLARE_KIND_
+
+// Evaluates to the kind of 'type'.
+#define GMOCK_KIND_OF_(type) \
+  static_cast< ::testing::internal::TypeKind>( \
+      ::testing::internal::KindOf<type>::value)
+
+// LosslessArithmeticConvertibleImpl<kFromKind, From, kToKind, To>::value
+// is true if and only if arithmetic type From can be losslessly converted to
+// arithmetic type To.
+//
+// It's the user's responsibility to ensure that both From and To are
+// raw (i.e. has no CV modifier, is not a pointer, and is not a
+// reference) built-in arithmetic types, kFromKind is the kind of
+// From, and kToKind is the kind of To; the value is
+// implementation-defined when the above pre-condition is violated.
+template <TypeKind kFromKind, typename From, TypeKind kToKind, typename To>
+using LosslessArithmeticConvertibleImpl = std::integral_constant<
+    bool,
+    // clang-format off
+      // Converting from bool is always lossless
+      (kFromKind == kBool) ? true
+      // Converting between any other type kinds will be lossy if the type
+      // kinds are not the same.
+    : (kFromKind != kToKind) ? false
+    : (kFromKind == kInteger &&
+       // Converting between integers of different widths is allowed so long
+       // as the conversion does not go from signed to unsigned.
+      (((sizeof(From) < sizeof(To)) &&
+        !(std::is_signed<From>::value && !std::is_signed<To>::value)) ||
+       // Converting between integers of the same width only requires the
+       // two types to have the same signedness.
+       ((sizeof(From) == sizeof(To)) &&
+        (std::is_signed<From>::value == std::is_signed<To>::value)))
+       ) ? true
+      // Floating point conversions are lossless if and only if `To` is at least
+      // as wide as `From`.
+    : (kFromKind == kFloatingPoint && (sizeof(From) <= sizeof(To))) ? true
+    : false
+    // clang-format on
+    >;
+
+// LosslessArithmeticConvertible<From, To>::value is true if and only if
+// arithmetic type From can be losslessly converted to arithmetic type To.
+//
+// It's the user's responsibility to ensure that both From and To are
+// raw (i.e. has no CV modifier, is not a pointer, and is not a
+// reference) built-in arithmetic types; the value is
+// implementation-defined when the above pre-condition is violated.
+template <typename From, typename To>
+using LosslessArithmeticConvertible =
+    LosslessArithmeticConvertibleImpl<GMOCK_KIND_OF_(From), From,
+                                      GMOCK_KIND_OF_(To), To>;
+
+// This interface knows how to report a Google Mock failure (either
+// non-fatal or fatal).
+class FailureReporterInterface {
+ public:
+  // The type of a failure (either non-fatal or fatal).
+  enum FailureType {
+    kNonfatal, kFatal
+  };
+
+  virtual ~FailureReporterInterface() {}
+
+  // Reports a failure that occurred at the given source file location.
+  virtual void ReportFailure(FailureType type, const char* file, int line,
+                             const std::string& message) = 0;
+};
+
+// Returns the failure reporter used by Google Mock.
+GTEST_API_ FailureReporterInterface* GetFailureReporter();
+
+// Asserts that condition is true; aborts the process with the given
+// message if condition is false.  We cannot use LOG(FATAL) or CHECK()
+// as Google Mock might be used to mock the log sink itself.  We
+// inline this function to prevent it from showing up in the stack
+// trace.
+inline void Assert(bool condition, const char* file, int line,
+                   const std::string& msg) {
+  if (!condition) {
+    GetFailureReporter()->ReportFailure(FailureReporterInterface::kFatal,
+                                        file, line, msg);
+  }
+}
+inline void Assert(bool condition, const char* file, int line) {
+  Assert(condition, file, line, "Assertion failed.");
+}
+
+// Verifies that condition is true; generates a non-fatal failure if
+// condition is false.
+inline void Expect(bool condition, const char* file, int line,
+                   const std::string& msg) {
+  if (!condition) {
+    GetFailureReporter()->ReportFailure(FailureReporterInterface::kNonfatal,
+                                        file, line, msg);
+  }
+}
+inline void Expect(bool condition, const char* file, int line) {
+  Expect(condition, file, line, "Expectation failed.");
+}
+
+// Severity level of a log.
+enum LogSeverity {
+  kInfo = 0,
+  kWarning = 1
+};
+
+// Valid values for the --gmock_verbose flag.
+
+// All logs (informational and warnings) are printed.
+const char kInfoVerbosity[] = "info";
+// Only warnings are printed.
+const char kWarningVerbosity[] = "warning";
+// No logs are printed.
+const char kErrorVerbosity[] = "error";
+
+// Returns true if and only if a log with the given severity is visible
+// according to the --gmock_verbose flag.
+GTEST_API_ bool LogIsVisible(LogSeverity severity);
+
+// Prints the given message to stdout if and only if 'severity' >= the level
+// specified by the --gmock_verbose flag.  If stack_frames_to_skip >=
+// 0, also prints the stack trace excluding the top
+// stack_frames_to_skip frames.  In opt mode, any positive
+// stack_frames_to_skip is treated as 0, since we don't know which
+// function calls will be inlined by the compiler and need to be
+// conservative.
+GTEST_API_ void Log(LogSeverity severity, const std::string& message,
+                    int stack_frames_to_skip);
+
+// A marker class that is used to resolve parameterless expectations to the
+// correct overload. This must not be instantiable, to prevent client code from
+// accidentally resolving to the overload; for example:
+//
+//    ON_CALL(mock, Method({}, nullptr))...
+//
+class WithoutMatchers {
+ private:
+  WithoutMatchers() {}
+  friend GTEST_API_ WithoutMatchers GetWithoutMatchers();
+};
+
+// Internal use only: access the singleton instance of WithoutMatchers.
+GTEST_API_ WithoutMatchers GetWithoutMatchers();
+
+// Disable MSVC warnings for infinite recursion, since in this case the
+// the recursion is unreachable.
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable:4717)
+#endif
+
+// Invalid<T>() is usable as an expression of type T, but will terminate
+// the program with an assertion failure if actually run.  This is useful
+// when a value of type T is needed for compilation, but the statement
+// will not really be executed (or we don't care if the statement
+// crashes).
+template <typename T>
+inline T Invalid() {
+  Assert(false, "", -1, "Internal error: attempt to return invalid value");
+  // This statement is unreachable, and would never terminate even if it
+  // could be reached. It is provided only to placate compiler warnings
+  // about missing return statements.
+  return Invalid<T>();
+}
+
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif
+
+// Given a raw type (i.e. having no top-level reference or const
+// modifier) RawContainer that's either an STL-style container or a
+// native array, class StlContainerView<RawContainer> has the
+// following members:
+//
+//   - type is a type that provides an STL-style container view to
+//     (i.e. implements the STL container concept for) RawContainer;
+//   - const_reference is a type that provides a reference to a const
+//     RawContainer;
+//   - ConstReference(raw_container) returns a const reference to an STL-style
+//     container view to raw_container, which is a RawContainer.
+//   - Copy(raw_container) returns an STL-style container view of a
+//     copy of raw_container, which is a RawContainer.
+//
+// This generic version is used when RawContainer itself is already an
+// STL-style container.
+template <class RawContainer>
+class StlContainerView {
+ public:
+  typedef RawContainer type;
+  typedef const type& const_reference;
+
+  static const_reference ConstReference(const RawContainer& container) {
+    static_assert(!std::is_const<RawContainer>::value,
+                  "RawContainer type must not be const");
+    return container;
+  }
+  static type Copy(const RawContainer& container) { return container; }
+};
+
+// This specialization is used when RawContainer is a native array type.
+template <typename Element, size_t N>
+class StlContainerView<Element[N]> {
+ public:
+  typedef typename std::remove_const<Element>::type RawElement;
+  typedef internal::NativeArray<RawElement> type;
+  // NativeArray<T> can represent a native array either by value or by
+  // reference (selected by a constructor argument), so 'const type'
+  // can be used to reference a const native array.  We cannot
+  // 'typedef const type& const_reference' here, as that would mean
+  // ConstReference() has to return a reference to a local variable.
+  typedef const type const_reference;
+
+  static const_reference ConstReference(const Element (&array)[N]) {
+    static_assert(std::is_same<Element, RawElement>::value,
+                  "Element type must not be const");
+    return type(array, N, RelationToSourceReference());
+  }
+  static type Copy(const Element (&array)[N]) {
+    return type(array, N, RelationToSourceCopy());
+  }
+};
+
+// This specialization is used when RawContainer is a native array
+// represented as a (pointer, size) tuple.
+template <typename ElementPointer, typename Size>
+class StlContainerView< ::std::tuple<ElementPointer, Size> > {
+ public:
+  typedef typename std::remove_const<
+      typename std::pointer_traits<ElementPointer>::element_type>::type
+      RawElement;
+  typedef internal::NativeArray<RawElement> type;
+  typedef const type const_reference;
+
+  static const_reference ConstReference(
+      const ::std::tuple<ElementPointer, Size>& array) {
+    return type(std::get<0>(array), std::get<1>(array),
+                RelationToSourceReference());
+  }
+  static type Copy(const ::std::tuple<ElementPointer, Size>& array) {
+    return type(std::get<0>(array), std::get<1>(array), RelationToSourceCopy());
+  }
+};
+
+// The following specialization prevents the user from instantiating
+// StlContainer with a reference type.
+template <typename T> class StlContainerView<T&>;
+
+// A type transform to remove constness from the first part of a pair.
+// Pairs like that are used as the value_type of associative containers,
+// and this transform produces a similar but assignable pair.
+template <typename T>
+struct RemoveConstFromKey {
+  typedef T type;
+};
+
+// Partially specialized to remove constness from std::pair<const K, V>.
+template <typename K, typename V>
+struct RemoveConstFromKey<std::pair<const K, V> > {
+  typedef std::pair<K, V> type;
+};
+
+// Emit an assertion failure due to incorrect DoDefault() usage. Out-of-lined to
+// reduce code size.
+GTEST_API_ void IllegalDoDefault(const char* file, int line);
+
+template <typename F, typename Tuple, size_t... Idx>
+auto ApplyImpl(F&& f, Tuple&& args, IndexSequence<Idx...>) -> decltype(
+    std::forward<F>(f)(std::get<Idx>(std::forward<Tuple>(args))...)) {
+  return std::forward<F>(f)(std::get<Idx>(std::forward<Tuple>(args))...);
+}
+
+// Apply the function to a tuple of arguments.
+template <typename F, typename Tuple>
+auto Apply(F&& f, Tuple&& args) -> decltype(
+    ApplyImpl(std::forward<F>(f), std::forward<Tuple>(args),
+              MakeIndexSequence<std::tuple_size<
+                  typename std::remove_reference<Tuple>::type>::value>())) {
+  return ApplyImpl(std::forward<F>(f), std::forward<Tuple>(args),
+                   MakeIndexSequence<std::tuple_size<
+                       typename std::remove_reference<Tuple>::type>::value>());
+}
+
+// Template struct Function<F>, where F must be a function type, contains
+// the following typedefs:
+//
+//   Result:               the function's return type.
+//   Arg<N>:               the type of the N-th argument, where N starts with 0.
+//   ArgumentTuple:        the tuple type consisting of all parameters of F.
+//   ArgumentMatcherTuple: the tuple type consisting of Matchers for all
+//                         parameters of F.
+//   MakeResultVoid:       the function type obtained by substituting void
+//                         for the return type of F.
+//   MakeResultIgnoredValue:
+//                         the function type obtained by substituting Something
+//                         for the return type of F.
+template <typename T>
+struct Function;
+
+template <typename R, typename... Args>
+struct Function<R(Args...)> {
+  using Result = R;
+  static constexpr size_t ArgumentCount = sizeof...(Args);
+  template <size_t I>
+  using Arg = ElemFromList<I, Args...>;
+  using ArgumentTuple = std::tuple<Args...>;
+  using ArgumentMatcherTuple = std::tuple<Matcher<Args>...>;
+  using MakeResultVoid = void(Args...);
+  using MakeResultIgnoredValue = IgnoredValue(Args...);
+};
+
+template <typename R, typename... Args>
+constexpr size_t Function<R(Args...)>::ArgumentCount;
+
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif
+
+}  // namespace internal
+}  // namespace testing
+
+#endif  // GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_INTERNAL_UTILS_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/internal/gmock-port.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/internal/gmock-port.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/internal/gmock-port.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/internal/gmock-port.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,87 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+//
+// Low-level types and utilities for porting Google Mock to various
+// platforms.  All macros ending with _ and symbols defined in an
+// internal namespace are subject to change without notice.  Code
+// outside Google Mock MUST NOT USE THEM DIRECTLY.  Macros that don't
+// end with _ are part of Google Mock's public API and can be used by
+// code outside Google Mock.
+
+// GOOGLETEST_CM0002 DO NOT DELETE
+
+#ifndef GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_
+#define GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_
+
+#include <assert.h>
+#include <stdlib.h>
+#include <cstdint>
+#include <iostream>
+
+// Most of the utilities needed for porting Google Mock are also
+// required for Google Test and are defined in gtest-port.h.
+//
+// Note to maintainers: to reduce code duplication, prefer adding
+// portability utilities to Google Test's gtest-port.h instead of
+// here, as Google Mock depends on Google Test.  Only add a utility
+// here if it's truly specific to Google Mock.
+
+#include "gtest/internal/gtest-port.h"
+#include "gmock/internal/custom/gmock-port.h"
+
+// For MS Visual C++, check the compiler version. At least VS 2015 is
+// required to compile Google Mock.
+#if defined(_MSC_VER) && _MSC_VER < 1900
+# error "At least Visual C++ 2015 (14.0) is required to compile Google Mock."
+#endif
+
+// Macro for referencing flags.  This is public as we want the user to
+// use this syntax to reference Google Mock flags.
+#define GMOCK_FLAG(name) FLAGS_gmock_##name
+
+#if !defined(GMOCK_DECLARE_bool_)
+
+// Macros for declaring flags.
+# define GMOCK_DECLARE_bool_(name) extern GTEST_API_ bool GMOCK_FLAG(name)
+# define GMOCK_DECLARE_int32_(name) extern GTEST_API_ int32_t GMOCK_FLAG(name)
+# define GMOCK_DECLARE_string_(name) \
+    extern GTEST_API_ ::std::string GMOCK_FLAG(name)
+
+// Macros for defining flags.
+# define GMOCK_DEFINE_bool_(name, default_val, doc) \
+    GTEST_API_ bool GMOCK_FLAG(name) = (default_val)
+# define GMOCK_DEFINE_int32_(name, default_val, doc) \
+    GTEST_API_ int32_t GMOCK_FLAG(name) = (default_val)
+# define GMOCK_DEFINE_string_(name, default_val, doc) \
+    GTEST_API_ ::std::string GMOCK_FLAG(name) = (default_val)
+
+#endif  // !defined(GMOCK_DECLARE_bool_)
+
+#endif  // GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/internal/gmock-pp.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/internal/gmock-pp.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/internal/gmock-pp.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/include/gmock/internal/gmock-pp.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,279 @@
+#ifndef GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PP_H_
+#define GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PP_H_
+
+// Expands and concatenates the arguments. Constructed macros reevaluate.
+#define GMOCK_PP_CAT(_1, _2) GMOCK_PP_INTERNAL_CAT(_1, _2)
+
+// Expands and stringifies the only argument.
+#define GMOCK_PP_STRINGIZE(...) GMOCK_PP_INTERNAL_STRINGIZE(__VA_ARGS__)
+
+// Returns empty. Given a variadic number of arguments.
+#define GMOCK_PP_EMPTY(...)
+
+// Returns a comma. Given a variadic number of arguments.
+#define GMOCK_PP_COMMA(...) ,
+
+// Returns the only argument.
+#define GMOCK_PP_IDENTITY(_1) _1
+
+// Evaluates to the number of arguments after expansion.
+//
+//   #define PAIR x, y
+//
+//   GMOCK_PP_NARG() => 1
+//   GMOCK_PP_NARG(x) => 1
+//   GMOCK_PP_NARG(x, y) => 2
+//   GMOCK_PP_NARG(PAIR) => 2
+//
+// Requires: the number of arguments after expansion is at most 15.
+#define GMOCK_PP_NARG(...) \
+  GMOCK_PP_INTERNAL_16TH(  \
+      (__VA_ARGS__, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0))
+
+// Returns 1 if the expansion of arguments has an unprotected comma. Otherwise
+// returns 0. Requires no more than 15 unprotected commas.
+#define GMOCK_PP_HAS_COMMA(...) \
+  GMOCK_PP_INTERNAL_16TH(       \
+      (__VA_ARGS__, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0))
+
+// Returns the first argument.
+#define GMOCK_PP_HEAD(...) GMOCK_PP_INTERNAL_HEAD((__VA_ARGS__, unusedArg))
+
+// Returns the tail. A variadic list of all arguments minus the first. Requires
+// at least one argument.
+#define GMOCK_PP_TAIL(...) GMOCK_PP_INTERNAL_TAIL((__VA_ARGS__))
+
+// Calls CAT(_Macro, NARG(__VA_ARGS__))(__VA_ARGS__)
+#define GMOCK_PP_VARIADIC_CALL(_Macro, ...) \
+  GMOCK_PP_IDENTITY(                        \
+      GMOCK_PP_CAT(_Macro, GMOCK_PP_NARG(__VA_ARGS__))(__VA_ARGS__))
+
+// If the arguments after expansion have no tokens, evaluates to `1`. Otherwise
+// evaluates to `0`.
+//
+// Requires: * the number of arguments after expansion is at most 15.
+//           * If the argument is a macro, it must be able to be called with one
+//             argument.
+//
+// Implementation details:
+//
+// There is one case when it generates a compile error: if the argument is macro
+// that cannot be called with one argument.
+//
+//   #define M(a, b)  // it doesn't matter what it expands to
+//
+//   // Expected: expands to `0`.
+//   // Actual: compile error.
+//   GMOCK_PP_IS_EMPTY(M)
+//
+// There are 4 cases tested:
+//
+// * __VA_ARGS__ possible expansion has no unparen'd commas. Expected 0.
+// * __VA_ARGS__ possible expansion is not enclosed in parenthesis. Expected 0.
+// * __VA_ARGS__ possible expansion is not a macro that ()-evaluates to a comma.
+//   Expected 0
+// * __VA_ARGS__ is empty, or has unparen'd commas, or is enclosed in
+//   parenthesis, or is a macro that ()-evaluates to comma. Expected 1.
+//
+// We trigger detection on '0001', i.e. on empty.
+#define GMOCK_PP_IS_EMPTY(...)                                               \
+  GMOCK_PP_INTERNAL_IS_EMPTY(GMOCK_PP_HAS_COMMA(__VA_ARGS__),                \
+                             GMOCK_PP_HAS_COMMA(GMOCK_PP_COMMA __VA_ARGS__), \
+                             GMOCK_PP_HAS_COMMA(__VA_ARGS__()),              \
+                             GMOCK_PP_HAS_COMMA(GMOCK_PP_COMMA __VA_ARGS__()))
+
+// Evaluates to _Then if _Cond is 1 and _Else if _Cond is 0.
+#define GMOCK_PP_IF(_Cond, _Then, _Else) \
+  GMOCK_PP_CAT(GMOCK_PP_INTERNAL_IF_, _Cond)(_Then, _Else)
+
+// Similar to GMOCK_PP_IF but takes _Then and _Else in parentheses.
+//
+// GMOCK_PP_GENERIC_IF(1, (a, b, c), (d, e, f)) => a, b, c
+// GMOCK_PP_GENERIC_IF(0, (a, b, c), (d, e, f)) => d, e, f
+//
+#define GMOCK_PP_GENERIC_IF(_Cond, _Then, _Else) \
+  GMOCK_PP_REMOVE_PARENS(GMOCK_PP_IF(_Cond, _Then, _Else))
+
+// Evaluates to the number of arguments after expansion. Identifies 'empty' as
+// 0.
+//
+//   #define PAIR x, y
+//
+//   GMOCK_PP_NARG0() => 0
+//   GMOCK_PP_NARG0(x) => 1
+//   GMOCK_PP_NARG0(x, y) => 2
+//   GMOCK_PP_NARG0(PAIR) => 2
+//
+// Requires: * the number of arguments after expansion is at most 15.
+//           * If the argument is a macro, it must be able to be called with one
+//             argument.
+#define GMOCK_PP_NARG0(...) \
+  GMOCK_PP_IF(GMOCK_PP_IS_EMPTY(__VA_ARGS__), 0, GMOCK_PP_NARG(__VA_ARGS__))
+
+// Expands to 1 if the first argument starts with something in parentheses,
+// otherwise to 0.
+#define GMOCK_PP_IS_BEGIN_PARENS(...)                              \
+  GMOCK_PP_HEAD(GMOCK_PP_CAT(GMOCK_PP_INTERNAL_IBP_IS_VARIADIC_R_, \
+                             GMOCK_PP_INTERNAL_IBP_IS_VARIADIC_C __VA_ARGS__))
+
+// Expands to 1 is there is only one argument and it is enclosed in parentheses.
+#define GMOCK_PP_IS_ENCLOSED_PARENS(...)             \
+  GMOCK_PP_IF(GMOCK_PP_IS_BEGIN_PARENS(__VA_ARGS__), \
+              GMOCK_PP_IS_EMPTY(GMOCK_PP_EMPTY __VA_ARGS__), 0)
+
+// Remove the parens, requires GMOCK_PP_IS_ENCLOSED_PARENS(args) => 1.
+#define GMOCK_PP_REMOVE_PARENS(...) GMOCK_PP_INTERNAL_REMOVE_PARENS __VA_ARGS__
+
+// Expands to _Macro(0, _Data, e1) _Macro(1, _Data, e2) ... _Macro(K -1, _Data,
+// eK) as many of GMOCK_INTERNAL_NARG0 _Tuple.
+// Requires: * |_Macro| can be called with 3 arguments.
+//           * |_Tuple| expansion has no more than 15 elements.
+#define GMOCK_PP_FOR_EACH(_Macro, _Data, _Tuple)                        \
+  GMOCK_PP_CAT(GMOCK_PP_INTERNAL_FOR_EACH_IMPL_, GMOCK_PP_NARG0 _Tuple) \
+  (0, _Macro, _Data, _Tuple)
+
+// Expands to _Macro(0, _Data, ) _Macro(1, _Data, ) ... _Macro(K - 1, _Data, )
+// Empty if _K = 0.
+// Requires: * |_Macro| can be called with 3 arguments.
+//           * |_K| literal between 0 and 15
+#define GMOCK_PP_REPEAT(_Macro, _Data, _N)           \
+  GMOCK_PP_CAT(GMOCK_PP_INTERNAL_FOR_EACH_IMPL_, _N) \
+  (0, _Macro, _Data, GMOCK_PP_INTENRAL_EMPTY_TUPLE)
+
+// Increments the argument, requires the argument to be between 0 and 15.
+#define GMOCK_PP_INC(_i) GMOCK_PP_CAT(GMOCK_PP_INTERNAL_INC_, _i)
+
+// Returns comma if _i != 0. Requires _i to be between 0 and 15.
+#define GMOCK_PP_COMMA_IF(_i) GMOCK_PP_CAT(GMOCK_PP_INTERNAL_COMMA_IF_, _i)
+
+// Internal details follow. Do not use any of these symbols outside of this
+// file or we will break your code.
+#define GMOCK_PP_INTENRAL_EMPTY_TUPLE (, , , , , , , , , , , , , , , )
+#define GMOCK_PP_INTERNAL_CAT(_1, _2) _1##_2
+#define GMOCK_PP_INTERNAL_STRINGIZE(...) #__VA_ARGS__
+#define GMOCK_PP_INTERNAL_CAT_5(_1, _2, _3, _4, _5) _1##_2##_3##_4##_5
+#define GMOCK_PP_INTERNAL_IS_EMPTY(_1, _2, _3, _4)                             \
+  GMOCK_PP_HAS_COMMA(GMOCK_PP_INTERNAL_CAT_5(GMOCK_PP_INTERNAL_IS_EMPTY_CASE_, \
+                                             _1, _2, _3, _4))
+#define GMOCK_PP_INTERNAL_IS_EMPTY_CASE_0001 ,
+#define GMOCK_PP_INTERNAL_IF_1(_Then, _Else) _Then
+#define GMOCK_PP_INTERNAL_IF_0(_Then, _Else) _Else
+
+// Because of MSVC treating a token with a comma in it as a single token when
+// passed to another macro, we need to force it to evaluate it as multiple
+// tokens. We do that by using a "IDENTITY(MACRO PARENTHESIZED_ARGS)" macro. We
+// define one per possible macro that relies on this behavior. Note "_Args" must
+// be parenthesized.
+#define GMOCK_PP_INTERNAL_INTERNAL_16TH(_1, _2, _3, _4, _5, _6, _7, _8, _9, \
+                                        _10, _11, _12, _13, _14, _15, _16,  \
+                                        ...)                                \
+  _16
+#define GMOCK_PP_INTERNAL_16TH(_Args) \
+  GMOCK_PP_IDENTITY(GMOCK_PP_INTERNAL_INTERNAL_16TH _Args)
+#define GMOCK_PP_INTERNAL_INTERNAL_HEAD(_1, ...) _1
+#define GMOCK_PP_INTERNAL_HEAD(_Args) \
+  GMOCK_PP_IDENTITY(GMOCK_PP_INTERNAL_INTERNAL_HEAD _Args)
+#define GMOCK_PP_INTERNAL_INTERNAL_TAIL(_1, ...) __VA_ARGS__
+#define GMOCK_PP_INTERNAL_TAIL(_Args) \
+  GMOCK_PP_IDENTITY(GMOCK_PP_INTERNAL_INTERNAL_TAIL _Args)
+
+#define GMOCK_PP_INTERNAL_IBP_IS_VARIADIC_C(...) 1 _
+#define GMOCK_PP_INTERNAL_IBP_IS_VARIADIC_R_1 1,
+#define GMOCK_PP_INTERNAL_IBP_IS_VARIADIC_R_GMOCK_PP_INTERNAL_IBP_IS_VARIADIC_C \
+  0,
+#define GMOCK_PP_INTERNAL_REMOVE_PARENS(...) __VA_ARGS__
+#define GMOCK_PP_INTERNAL_INC_0 1
+#define GMOCK_PP_INTERNAL_INC_1 2
+#define GMOCK_PP_INTERNAL_INC_2 3
+#define GMOCK_PP_INTERNAL_INC_3 4
+#define GMOCK_PP_INTERNAL_INC_4 5
+#define GMOCK_PP_INTERNAL_INC_5 6
+#define GMOCK_PP_INTERNAL_INC_6 7
+#define GMOCK_PP_INTERNAL_INC_7 8
+#define GMOCK_PP_INTERNAL_INC_8 9
+#define GMOCK_PP_INTERNAL_INC_9 10
+#define GMOCK_PP_INTERNAL_INC_10 11
+#define GMOCK_PP_INTERNAL_INC_11 12
+#define GMOCK_PP_INTERNAL_INC_12 13
+#define GMOCK_PP_INTERNAL_INC_13 14
+#define GMOCK_PP_INTERNAL_INC_14 15
+#define GMOCK_PP_INTERNAL_INC_15 16
+#define GMOCK_PP_INTERNAL_COMMA_IF_0
+#define GMOCK_PP_INTERNAL_COMMA_IF_1 ,
+#define GMOCK_PP_INTERNAL_COMMA_IF_2 ,
+#define GMOCK_PP_INTERNAL_COMMA_IF_3 ,
+#define GMOCK_PP_INTERNAL_COMMA_IF_4 ,
+#define GMOCK_PP_INTERNAL_COMMA_IF_5 ,
+#define GMOCK_PP_INTERNAL_COMMA_IF_6 ,
+#define GMOCK_PP_INTERNAL_COMMA_IF_7 ,
+#define GMOCK_PP_INTERNAL_COMMA_IF_8 ,
+#define GMOCK_PP_INTERNAL_COMMA_IF_9 ,
+#define GMOCK_PP_INTERNAL_COMMA_IF_10 ,
+#define GMOCK_PP_INTERNAL_COMMA_IF_11 ,
+#define GMOCK_PP_INTERNAL_COMMA_IF_12 ,
+#define GMOCK_PP_INTERNAL_COMMA_IF_13 ,
+#define GMOCK_PP_INTERNAL_COMMA_IF_14 ,
+#define GMOCK_PP_INTERNAL_COMMA_IF_15 ,
+#define GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, _element) \
+  _Macro(_i, _Data, _element)
+#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_0(_i, _Macro, _Data, _Tuple)
+#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_1(_i, _Macro, _Data, _Tuple) \
+  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple)
+#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_2(_i, _Macro, _Data, _Tuple)    \
+  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
+  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_1(GMOCK_PP_INC(_i), _Macro, _Data,    \
+                                    (GMOCK_PP_TAIL _Tuple))
+#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_3(_i, _Macro, _Data, _Tuple)    \
+  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
+  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_2(GMOCK_PP_INC(_i), _Macro, _Data,    \
+                                    (GMOCK_PP_TAIL _Tuple))
+#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_4(_i, _Macro, _Data, _Tuple)    \
+  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
+  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_3(GMOCK_PP_INC(_i), _Macro, _Data,    \
+                                    (GMOCK_PP_TAIL _Tuple))
+#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_5(_i, _Macro, _Data, _Tuple)    \
+  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
+  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_4(GMOCK_PP_INC(_i), _Macro, _Data,    \
+                                    (GMOCK_PP_TAIL _Tuple))
+#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_6(_i, _Macro, _Data, _Tuple)    \
+  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
+  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_5(GMOCK_PP_INC(_i), _Macro, _Data,    \
+                                    (GMOCK_PP_TAIL _Tuple))
+#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_7(_i, _Macro, _Data, _Tuple)    \
+  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
+  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_6(GMOCK_PP_INC(_i), _Macro, _Data,    \
+                                    (GMOCK_PP_TAIL _Tuple))
+#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_8(_i, _Macro, _Data, _Tuple)    \
+  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
+  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_7(GMOCK_PP_INC(_i), _Macro, _Data,    \
+                                    (GMOCK_PP_TAIL _Tuple))
+#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_9(_i, _Macro, _Data, _Tuple)    \
+  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
+  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_8(GMOCK_PP_INC(_i), _Macro, _Data,    \
+                                    (GMOCK_PP_TAIL _Tuple))
+#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_10(_i, _Macro, _Data, _Tuple)   \
+  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
+  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_9(GMOCK_PP_INC(_i), _Macro, _Data,    \
+                                    (GMOCK_PP_TAIL _Tuple))
+#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_11(_i, _Macro, _Data, _Tuple)   \
+  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
+  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_10(GMOCK_PP_INC(_i), _Macro, _Data,   \
+                                     (GMOCK_PP_TAIL _Tuple))
+#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_12(_i, _Macro, _Data, _Tuple)   \
+  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
+  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_11(GMOCK_PP_INC(_i), _Macro, _Data,   \
+                                     (GMOCK_PP_TAIL _Tuple))
+#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_13(_i, _Macro, _Data, _Tuple)   \
+  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
+  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_12(GMOCK_PP_INC(_i), _Macro, _Data,   \
+                                     (GMOCK_PP_TAIL _Tuple))
+#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_14(_i, _Macro, _Data, _Tuple)   \
+  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
+  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_13(GMOCK_PP_INC(_i), _Macro, _Data,   \
+                                     (GMOCK_PP_TAIL _Tuple))
+#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_15(_i, _Macro, _Data, _Tuple)   \
+  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
+  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_14(GMOCK_PP_INC(_i), _Macro, _Data,   \
+                                     (GMOCK_PP_TAIL _Tuple))
+
+#endif  // GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PP_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/README.md mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/README.md
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/README.md	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/README.md	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,44 @@
+# Googletest Mocking (gMock) Framework
+
+### Overview
+
+Google's framework for writing and using C++ mock classes. It can help you
+derive better designs of your system and write better tests.
+
+It is inspired by:
+
+*   [jMock](http://www.jmock.org/)
+*   [EasyMock](http://www.easymock.org/)
+*   [Hamcrest](http://code.google.com/p/hamcrest/)
+
+It is designed with C++'s specifics in mind.
+
+gMock:
+
+-   Provides a declarative syntax for defining mocks.
+-   Can define partial (hybrid) mocks, which are a cross of real and mock
+    objects.
+-   Handles functions of arbitrary types and overloaded functions.
+-   Comes with a rich set of matchers for validating function arguments.
+-   Uses an intuitive syntax for controlling the behavior of a mock.
+-   Does automatic verification of expectations (no record-and-replay needed).
+-   Allows arbitrary (partial) ordering constraints on function calls to be
+    expressed.
+-   Lets a user extend it by defining new matchers and actions.
+-   Does not use exceptions.
+-   Is easy to learn and use.
+
+Details and examples can be found here:
+
+*   [gMock for Dummies](https://google.github.io/googletest/gmock_for_dummies.html)
+*   [Legacy gMock FAQ](https://google.github.io/googletest/gmock_faq.html)
+*   [gMock Cookbook](https://google.github.io/googletest/gmock_cook_book.html)
+*   [gMock Cheat Sheet](https://google.github.io/googletest/gmock_cheat_sheet.html)
+
+Please note that code under scripts/generator/ is from the
+[cppclean project](http://code.google.com/p/cppclean/) and under the Apache
+License, which is different from GoogleMock's license.
+
+GoogleMock is a part of
+[GoogleTest C++ testing framework](http://github.com/google/googletest/) and a
+subject to the same requirements.
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/src/gmock-all.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/src/gmock-all.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/src/gmock-all.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/src/gmock-all.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,46 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+//
+// Google C++ Mocking Framework (Google Mock)
+//
+// This file #includes all Google Mock implementation .cc files.  The
+// purpose is to allow a user to build Google Mock by compiling this
+// file alone.
+
+// This line ensures that gmock.h can be compiled on its own, even
+// when it's fused.
+#include "gmock/gmock.h"
+
+// The following lines pull in the real gmock *.cc files.
+#include "src/gmock-cardinalities.cc"
+#include "src/gmock-internal-utils.cc"
+#include "src/gmock-matchers.cc"
+#include "src/gmock-spec-builders.cc"
+#include "src/gmock.cc"
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/src/gmock-cardinalities.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/src/gmock-cardinalities.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/src/gmock-cardinalities.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/src/gmock-cardinalities.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,155 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file implements cardinalities.
+
+#include "gmock/gmock-cardinalities.h"
+
+#include <limits.h>
+#include <ostream>  // NOLINT
+#include <sstream>
+#include <string>
+#include "gmock/internal/gmock-internal-utils.h"
+#include "gtest/gtest.h"
+
+namespace testing {
+
+namespace {
+
+// Implements the Between(m, n) cardinality.
+class BetweenCardinalityImpl : public CardinalityInterface {
+ public:
+  BetweenCardinalityImpl(int min, int max)
+      : min_(min >= 0 ? min : 0),
+        max_(max >= min_ ? max : min_) {
+    std::stringstream ss;
+    if (min < 0) {
+      ss << "The invocation lower bound must be >= 0, "
+         << "but is actually " << min << ".";
+      internal::Expect(false, __FILE__, __LINE__, ss.str());
+    } else if (max < 0) {
+      ss << "The invocation upper bound must be >= 0, "
+         << "but is actually " << max << ".";
+      internal::Expect(false, __FILE__, __LINE__, ss.str());
+    } else if (min > max) {
+      ss << "The invocation upper bound (" << max
+         << ") must be >= the invocation lower bound (" << min
+         << ").";
+      internal::Expect(false, __FILE__, __LINE__, ss.str());
+    }
+  }
+
+  // Conservative estimate on the lower/upper bound of the number of
+  // calls allowed.
+  int ConservativeLowerBound() const override { return min_; }
+  int ConservativeUpperBound() const override { return max_; }
+
+  bool IsSatisfiedByCallCount(int call_count) const override {
+    return min_ <= call_count && call_count <= max_;
+  }
+
+  bool IsSaturatedByCallCount(int call_count) const override {
+    return call_count >= max_;
+  }
+
+  void DescribeTo(::std::ostream* os) const override;
+
+ private:
+  const int min_;
+  const int max_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(BetweenCardinalityImpl);
+};
+
+// Formats "n times" in a human-friendly way.
+inline std::string FormatTimes(int n) {
+  if (n == 1) {
+    return "once";
+  } else if (n == 2) {
+    return "twice";
+  } else {
+    std::stringstream ss;
+    ss << n << " times";
+    return ss.str();
+  }
+}
+
+// Describes the Between(m, n) cardinality in human-friendly text.
+void BetweenCardinalityImpl::DescribeTo(::std::ostream* os) const {
+  if (min_ == 0) {
+    if (max_ == 0) {
+      *os << "never called";
+    } else if (max_ == INT_MAX) {
+      *os << "called any number of times";
+    } else {
+      *os << "called at most " << FormatTimes(max_);
+    }
+  } else if (min_ == max_) {
+    *os << "called " << FormatTimes(min_);
+  } else if (max_ == INT_MAX) {
+    *os << "called at least " << FormatTimes(min_);
+  } else {
+    // 0 < min_ < max_ < INT_MAX
+    *os << "called between " << min_ << " and " << max_ << " times";
+  }
+}
+
+}  // Unnamed namespace
+
+// Describes the given call count to an ostream.
+void Cardinality::DescribeActualCallCountTo(int actual_call_count,
+                                            ::std::ostream* os) {
+  if (actual_call_count > 0) {
+    *os << "called " << FormatTimes(actual_call_count);
+  } else {
+    *os << "never called";
+  }
+}
+
+// Creates a cardinality that allows at least n calls.
+GTEST_API_ Cardinality AtLeast(int n) { return Between(n, INT_MAX); }
+
+// Creates a cardinality that allows at most n calls.
+GTEST_API_ Cardinality AtMost(int n) { return Between(0, n); }
+
+// Creates a cardinality that allows any number of calls.
+GTEST_API_ Cardinality AnyNumber() { return AtLeast(0); }
+
+// Creates a cardinality that allows between min and max calls.
+GTEST_API_ Cardinality Between(int min, int max) {
+  return Cardinality(new BetweenCardinalityImpl(min, max));
+}
+
+// Creates a cardinality that allows exactly n calls.
+GTEST_API_ Cardinality Exactly(int n) { return Between(n, n); }
+
+}  // namespace testing
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/src/gmock.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/src/gmock.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/src/gmock.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/src/gmock.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,213 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+#include "gmock/gmock.h"
+#include "gmock/internal/gmock-port.h"
+
+namespace testing {
+
+GMOCK_DEFINE_bool_(catch_leaked_mocks, true,
+                   "true if and only if Google Mock should report leaked "
+                   "mock objects as failures.");
+
+GMOCK_DEFINE_string_(verbose, internal::kWarningVerbosity,
+                     "Controls how verbose Google Mock's output is."
+                     "  Valid values:\n"
+                     "  info    - prints all messages.\n"
+                     "  warning - prints warnings and errors.\n"
+                     "  error   - prints errors only.");
+
+GMOCK_DEFINE_int32_(default_mock_behavior, 1,
+                    "Controls the default behavior of mocks."
+                    "  Valid values:\n"
+                    "  0 - by default, mocks act as NiceMocks.\n"
+                    "  1 - by default, mocks act as NaggyMocks.\n"
+                    "  2 - by default, mocks act as StrictMocks.");
+
+namespace internal {
+
+// Parses a string as a command line flag.  The string should have the
+// format "--gmock_flag=value".  When def_optional is true, the
+// "=value" part can be omitted.
+//
+// Returns the value of the flag, or NULL if the parsing failed.
+static const char* ParseGoogleMockFlagValue(const char* str,
+                                            const char* flag,
+                                            bool def_optional) {
+  // str and flag must not be NULL.
+  if (str == nullptr || flag == nullptr) return nullptr;
+
+  // The flag must start with "--gmock_".
+  const std::string flag_str = std::string("--gmock_") + flag;
+  const size_t flag_len = flag_str.length();
+  if (strncmp(str, flag_str.c_str(), flag_len) != 0) return nullptr;
+
+  // Skips the flag name.
+  const char* flag_end = str + flag_len;
+
+  // When def_optional is true, it's OK to not have a "=value" part.
+  if (def_optional && (flag_end[0] == '\0')) {
+    return flag_end;
+  }
+
+  // If def_optional is true and there are more characters after the
+  // flag name, or if def_optional is false, there must be a '=' after
+  // the flag name.
+  if (flag_end[0] != '=') return nullptr;
+
+  // Returns the string after "=".
+  return flag_end + 1;
+}
+
+// Parses a string for a Google Mock bool flag, in the form of
+// "--gmock_flag=value".
+//
+// On success, stores the value of the flag in *value, and returns
+// true.  On failure, returns false without changing *value.
+static bool ParseGoogleMockBoolFlag(const char* str, const char* flag,
+                                    bool* value) {
+  // Gets the value of the flag as a string.
+  const char* const value_str = ParseGoogleMockFlagValue(str, flag, true);
+
+  // Aborts if the parsing failed.
+  if (value_str == nullptr) return false;
+
+  // Converts the string value to a bool.
+  *value = !(*value_str == '0' || *value_str == 'f' || *value_str == 'F');
+  return true;
+}
+
+// Parses a string for a Google Mock string flag, in the form of
+// "--gmock_flag=value".
+//
+// On success, stores the value of the flag in *value, and returns
+// true.  On failure, returns false without changing *value.
+template <typename String>
+static bool ParseGoogleMockStringFlag(const char* str, const char* flag,
+                                      String* value) {
+  // Gets the value of the flag as a string.
+  const char* const value_str = ParseGoogleMockFlagValue(str, flag, false);
+
+  // Aborts if the parsing failed.
+  if (value_str == nullptr) return false;
+
+  // Sets *value to the value of the flag.
+  *value = value_str;
+  return true;
+}
+
+static bool ParseGoogleMockIntFlag(const char* str, const char* flag,
+                                   int32_t* value) {
+  // Gets the value of the flag as a string.
+  const char* const value_str = ParseGoogleMockFlagValue(str, flag, true);
+
+  // Aborts if the parsing failed.
+  if (value_str == nullptr) return false;
+
+  // Sets *value to the value of the flag.
+  return ParseInt32(Message() << "The value of flag --" << flag,
+                    value_str, value);
+}
+
+// The internal implementation of InitGoogleMock().
+//
+// The type parameter CharType can be instantiated to either char or
+// wchar_t.
+template <typename CharType>
+void InitGoogleMockImpl(int* argc, CharType** argv) {
+  // Makes sure Google Test is initialized.  InitGoogleTest() is
+  // idempotent, so it's fine if the user has already called it.
+  InitGoogleTest(argc, argv);
+  if (*argc <= 0) return;
+
+  for (int i = 1; i != *argc; i++) {
+    const std::string arg_string = StreamableToString(argv[i]);
+    const char* const arg = arg_string.c_str();
+
+    // Do we see a Google Mock flag?
+    if (ParseGoogleMockBoolFlag(arg, "catch_leaked_mocks",
+                                &GMOCK_FLAG(catch_leaked_mocks)) ||
+        ParseGoogleMockStringFlag(arg, "verbose", &GMOCK_FLAG(verbose)) ||
+        ParseGoogleMockIntFlag(arg, "default_mock_behavior",
+                               &GMOCK_FLAG(default_mock_behavior))) {
+      // Yes.  Shift the remainder of the argv list left by one.  Note
+      // that argv has (*argc + 1) elements, the last one always being
+      // NULL.  The following loop moves the trailing NULL element as
+      // well.
+      for (int j = i; j != *argc; j++) {
+        argv[j] = argv[j + 1];
+      }
+
+      // Decrements the argument count.
+      (*argc)--;
+
+      // We also need to decrement the iterator as we just removed
+      // an element.
+      i--;
+    }
+  }
+}
+
+}  // namespace internal
+
+// Initializes Google Mock.  This must be called before running the
+// tests.  In particular, it parses a command line for the flags that
+// Google Mock recognizes.  Whenever a Google Mock flag is seen, it is
+// removed from argv, and *argc is decremented.
+//
+// No value is returned.  Instead, the Google Mock flag variables are
+// updated.
+//
+// Since Google Test is needed for Google Mock to work, this function
+// also initializes Google Test and parses its flags, if that hasn't
+// been done.
+GTEST_API_ void InitGoogleMock(int* argc, char** argv) {
+  internal::InitGoogleMockImpl(argc, argv);
+}
+
+// This overloaded version can be used in Windows programs compiled in
+// UNICODE mode.
+GTEST_API_ void InitGoogleMock(int* argc, wchar_t** argv) {
+  internal::InitGoogleMockImpl(argc, argv);
+}
+
+// This overloaded version can be used on Arduino/embedded platforms where
+// there is no argc/argv.
+GTEST_API_ void InitGoogleMock() {
+  // Since Arduino doesn't have a command line, fake out the argc/argv arguments
+  int argc = 1;
+  const auto arg0 = "dummy";
+  char* argv0 = const_cast<char*>(arg0);
+  char** argv = &argv0;
+
+  internal::InitGoogleMockImpl(&argc, argv);
+}
+
+}  // namespace testing
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/src/gmock-internal-utils.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/src/gmock-internal-utils.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/src/gmock-internal-utils.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/src/gmock-internal-utils.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,200 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file defines some utilities useful for implementing Google
+// Mock.  They are subject to change without notice, so please DO NOT
+// USE THEM IN USER CODE.
+
+#include "gmock/internal/gmock-internal-utils.h"
+
+#include <ctype.h>
+#include <ostream>  // NOLINT
+#include <string>
+#include "gmock/gmock.h"
+#include "gmock/internal/gmock-port.h"
+#include "gtest/gtest.h"
+
+namespace testing {
+namespace internal {
+
+// Joins a vector of strings as if they are fields of a tuple; returns
+// the joined string.
+GTEST_API_ std::string JoinAsTuple(const Strings& fields) {
+  switch (fields.size()) {
+    case 0:
+      return "";
+    case 1:
+      return fields[0];
+    default:
+      std::string result = "(" + fields[0];
+      for (size_t i = 1; i < fields.size(); i++) {
+        result += ", ";
+        result += fields[i];
+      }
+      result += ")";
+      return result;
+  }
+}
+
+// Converts an identifier name to a space-separated list of lower-case
+// words.  Each maximum substring of the form [A-Za-z][a-z]*|\d+ is
+// treated as one word.  For example, both "FooBar123" and
+// "foo_bar_123" are converted to "foo bar 123".
+GTEST_API_ std::string ConvertIdentifierNameToWords(const char* id_name) {
+  std::string result;
+  char prev_char = '\0';
+  for (const char* p = id_name; *p != '\0'; prev_char = *(p++)) {
+    // We don't care about the current locale as the input is
+    // guaranteed to be a valid C++ identifier name.
+    const bool starts_new_word = IsUpper(*p) ||
+        (!IsAlpha(prev_char) && IsLower(*p)) ||
+        (!IsDigit(prev_char) && IsDigit(*p));
+
+    if (IsAlNum(*p)) {
+      if (starts_new_word && result != "")
+        result += ' ';
+      result += ToLower(*p);
+    }
+  }
+  return result;
+}
+
+// This class reports Google Mock failures as Google Test failures.  A
+// user can define another class in a similar fashion if they intend to
+// use Google Mock with a testing framework other than Google Test.
+class GoogleTestFailureReporter : public FailureReporterInterface {
+ public:
+  void ReportFailure(FailureType type, const char* file, int line,
+                     const std::string& message) override {
+    AssertHelper(type == kFatal ?
+                 TestPartResult::kFatalFailure :
+                 TestPartResult::kNonFatalFailure,
+                 file,
+                 line,
+                 message.c_str()) = Message();
+    if (type == kFatal) {
+      posix::Abort();
+    }
+  }
+};
+
+// Returns the global failure reporter.  Will create a
+// GoogleTestFailureReporter and return it the first time called.
+GTEST_API_ FailureReporterInterface* GetFailureReporter() {
+  // Points to the global failure reporter used by Google Mock.  gcc
+  // guarantees that the following use of failure_reporter is
+  // thread-safe.  We may need to add additional synchronization to
+  // protect failure_reporter if we port Google Mock to other
+  // compilers.
+  static FailureReporterInterface* const failure_reporter =
+      new GoogleTestFailureReporter();
+  return failure_reporter;
+}
+
+// Protects global resources (stdout in particular) used by Log().
+static GTEST_DEFINE_STATIC_MUTEX_(g_log_mutex);
+
+// Returns true if and only if a log with the given severity is visible
+// according to the --gmock_verbose flag.
+GTEST_API_ bool LogIsVisible(LogSeverity severity) {
+  if (GMOCK_FLAG(verbose) == kInfoVerbosity) {
+    // Always show the log if --gmock_verbose=info.
+    return true;
+  } else if (GMOCK_FLAG(verbose) == kErrorVerbosity) {
+    // Always hide it if --gmock_verbose=error.
+    return false;
+  } else {
+    // If --gmock_verbose is neither "info" nor "error", we treat it
+    // as "warning" (its default value).
+    return severity == kWarning;
+  }
+}
+
+// Prints the given message to stdout if and only if 'severity' >= the level
+// specified by the --gmock_verbose flag.  If stack_frames_to_skip >=
+// 0, also prints the stack trace excluding the top
+// stack_frames_to_skip frames.  In opt mode, any positive
+// stack_frames_to_skip is treated as 0, since we don't know which
+// function calls will be inlined by the compiler and need to be
+// conservative.
+GTEST_API_ void Log(LogSeverity severity, const std::string& message,
+                    int stack_frames_to_skip) {
+  if (!LogIsVisible(severity))
+    return;
+
+  // Ensures that logs from different threads don't interleave.
+  MutexLock l(&g_log_mutex);
+
+  if (severity == kWarning) {
+    // Prints a GMOCK WARNING marker to make the warnings easily searchable.
+    std::cout << "\nGMOCK WARNING:";
+  }
+  // Pre-pends a new-line to message if it doesn't start with one.
+  if (message.empty() || message[0] != '\n') {
+    std::cout << "\n";
+  }
+  std::cout << message;
+  if (stack_frames_to_skip >= 0) {
+#ifdef NDEBUG
+    // In opt mode, we have to be conservative and skip no stack frame.
+    const int actual_to_skip = 0;
+#else
+    // In dbg mode, we can do what the caller tell us to do (plus one
+    // for skipping this function's stack frame).
+    const int actual_to_skip = stack_frames_to_skip + 1;
+#endif  // NDEBUG
+
+    // Appends a new-line to message if it doesn't end with one.
+    if (!message.empty() && *message.rbegin() != '\n') {
+      std::cout << "\n";
+    }
+    std::cout << "Stack trace:\n"
+         << ::testing::internal::GetCurrentOsStackTraceExceptTop(
+             ::testing::UnitTest::GetInstance(), actual_to_skip);
+  }
+  std::cout << ::std::flush;
+}
+
+GTEST_API_ WithoutMatchers GetWithoutMatchers() { return WithoutMatchers(); }
+
+GTEST_API_ void IllegalDoDefault(const char* file, int line) {
+  internal::Assert(
+      false, file, line,
+      "You are using DoDefault() inside a composite action like "
+      "DoAll() or WithArgs().  This is not supported for technical "
+      "reasons.  Please instead spell out the default action, or "
+      "assign the default action to an Action variable and use "
+      "the variable in various places.");
+}
+
+}  // namespace internal
+}  // namespace testing
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/src/gmock_main.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/src/gmock_main.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/src/gmock_main.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/src/gmock_main.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,72 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+#include <iostream>
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
+#if GTEST_OS_ESP8266 || GTEST_OS_ESP32
+#if GTEST_OS_ESP8266
+extern "C" {
+#endif
+void setup() {
+  // Since Google Mock depends on Google Test, InitGoogleMock() is
+  // also responsible for initializing Google Test.  Therefore there's
+  // no need for calling testing::InitGoogleTest() separately.
+  testing::InitGoogleMock();
+}
+void loop() { RUN_ALL_TESTS(); }
+#if GTEST_OS_ESP8266
+}
+#endif
+
+#else
+
+// MS C++ compiler/linker has a bug on Windows (not on Windows CE), which
+// causes a link error when _tmain is defined in a static library and UNICODE
+// is enabled. For this reason instead of _tmain, main function is used on
+// Windows. See the following link to track the current status of this bug:
+// https://web.archive.org/web/20170912203238/connect.microsoft.com/VisualStudio/feedback/details/394464/wmain-link-error-in-the-static-library
+// // NOLINT
+#if GTEST_OS_WINDOWS_MOBILE
+# include <tchar.h>  // NOLINT
+
+GTEST_API_ int _tmain(int argc, TCHAR** argv) {
+#else
+GTEST_API_ int main(int argc, char** argv) {
+#endif  // GTEST_OS_WINDOWS_MOBILE
+  std::cout << "Running main() from gmock_main.cc\n";
+  // Since Google Mock depends on Google Test, InitGoogleMock() is
+  // also responsible for initializing Google Test.  Therefore there's
+  // no need for calling testing::InitGoogleTest() separately.
+  testing::InitGoogleMock(&argc, argv);
+  return RUN_ALL_TESTS();
+}
+#endif
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/src/gmock-matchers.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/src/gmock-matchers.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/src/gmock-matchers.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/src/gmock-matchers.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,459 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file implements Matcher<const string&>, Matcher<string>, and
+// utilities for defining matchers.
+
+#include "gmock/gmock-matchers.h"
+
+#include <string.h>
+#include <iostream>
+#include <sstream>
+#include <string>
+
+namespace testing {
+namespace internal {
+
+// Returns the description for a matcher defined using the MATCHER*()
+// macro where the user-supplied description string is "", if
+// 'negation' is false; otherwise returns the description of the
+// negation of the matcher.  'param_values' contains a list of strings
+// that are the print-out of the matcher's parameters.
+GTEST_API_ std::string FormatMatcherDescription(bool negation,
+                                                const char* matcher_name,
+                                                const Strings& param_values) {
+  std::string result = ConvertIdentifierNameToWords(matcher_name);
+  if (param_values.size() >= 1) result += " " + JoinAsTuple(param_values);
+  return negation ? "not (" + result + ")" : result;
+}
+
+// FindMaxBipartiteMatching and its helper class.
+//
+// Uses the well-known Ford-Fulkerson max flow method to find a maximum
+// bipartite matching. Flow is considered to be from left to right.
+// There is an implicit source node that is connected to all of the left
+// nodes, and an implicit sink node that is connected to all of the
+// right nodes. All edges have unit capacity.
+//
+// Neither the flow graph nor the residual flow graph are represented
+// explicitly. Instead, they are implied by the information in 'graph' and
+// a vector<int> called 'left_' whose elements are initialized to the
+// value kUnused. This represents the initial state of the algorithm,
+// where the flow graph is empty, and the residual flow graph has the
+// following edges:
+//   - An edge from source to each left_ node
+//   - An edge from each right_ node to sink
+//   - An edge from each left_ node to each right_ node, if the
+//     corresponding edge exists in 'graph'.
+//
+// When the TryAugment() method adds a flow, it sets left_[l] = r for some
+// nodes l and r. This induces the following changes:
+//   - The edges (source, l), (l, r), and (r, sink) are added to the
+//     flow graph.
+//   - The same three edges are removed from the residual flow graph.
+//   - The reverse edges (l, source), (r, l), and (sink, r) are added
+//     to the residual flow graph, which is a directional graph
+//     representing unused flow capacity.
+//
+// When the method augments a flow (moving left_[l] from some r1 to some
+// other r2), this can be thought of as "undoing" the above steps with
+// respect to r1 and "redoing" them with respect to r2.
+//
+// It bears repeating that the flow graph and residual flow graph are
+// never represented explicitly, but can be derived by looking at the
+// information in 'graph' and in left_.
+//
+// As an optimization, there is a second vector<int> called right_ which
+// does not provide any new information. Instead, it enables more
+// efficient queries about edges entering or leaving the right-side nodes
+// of the flow or residual flow graphs. The following invariants are
+// maintained:
+//
+// left[l] == kUnused or right[left[l]] == l
+// right[r] == kUnused or left[right[r]] == r
+//
+// . [ source ]                                        .
+// .   |||                                             .
+// .   |||                                             .
+// .   ||\--> left[0]=1  ---\    right[0]=-1 ----\     .
+// .   ||                   |                    |     .
+// .   |\---> left[1]=-1    \--> right[1]=0  ---\|     .
+// .   |                                        ||     .
+// .   \----> left[2]=2  ------> right[2]=2  --\||     .
+// .                                           |||     .
+// .         elements           matchers       vvv     .
+// .                                         [ sink ]  .
+//
+// See Also:
+//   [1] Cormen, et al (2001). "Section 26.2: The Ford-Fulkerson method".
+//       "Introduction to Algorithms (Second ed.)", pp. 651-664.
+//   [2] "Ford-Fulkerson algorithm", Wikipedia,
+//       'http://en.wikipedia.org/wiki/Ford%E2%80%93Fulkerson_algorithm'
+class MaxBipartiteMatchState {
+ public:
+  explicit MaxBipartiteMatchState(const MatchMatrix& graph)
+      : graph_(&graph),
+        left_(graph_->LhsSize(), kUnused),
+        right_(graph_->RhsSize(), kUnused) {}
+
+  // Returns the edges of a maximal match, each in the form {left, right}.
+  ElementMatcherPairs Compute() {
+    // 'seen' is used for path finding { 0: unseen, 1: seen }.
+    ::std::vector<char> seen;
+    // Searches the residual flow graph for a path from each left node to
+    // the sink in the residual flow graph, and if one is found, add flow
+    // to the graph. It's okay to search through the left nodes once. The
+    // edge from the implicit source node to each previously-visited left
+    // node will have flow if that left node has any path to the sink
+    // whatsoever. Subsequent augmentations can only add flow to the
+    // network, and cannot take away that previous flow unit from the source.
+    // Since the source-to-left edge can only carry one flow unit (or,
+    // each element can be matched to only one matcher), there is no need
+    // to visit the left nodes more than once looking for augmented paths.
+    // The flow is known to be possible or impossible by looking at the
+    // node once.
+    for (size_t ilhs = 0; ilhs < graph_->LhsSize(); ++ilhs) {
+      // Reset the path-marking vector and try to find a path from
+      // source to sink starting at the left_[ilhs] node.
+      GTEST_CHECK_(left_[ilhs] == kUnused)
+          << "ilhs: " << ilhs << ", left_[ilhs]: " << left_[ilhs];
+      // 'seen' initialized to 'graph_->RhsSize()' copies of 0.
+      seen.assign(graph_->RhsSize(), 0);
+      TryAugment(ilhs, &seen);
+    }
+    ElementMatcherPairs result;
+    for (size_t ilhs = 0; ilhs < left_.size(); ++ilhs) {
+      size_t irhs = left_[ilhs];
+      if (irhs == kUnused) continue;
+      result.push_back(ElementMatcherPair(ilhs, irhs));
+    }
+    return result;
+  }
+
+ private:
+  static const size_t kUnused = static_cast<size_t>(-1);
+
+  // Perform a depth-first search from left node ilhs to the sink.  If a
+  // path is found, flow is added to the network by linking the left and
+  // right vector elements corresponding each segment of the path.
+  // Returns true if a path to sink was found, which means that a unit of
+  // flow was added to the network. The 'seen' vector elements correspond
+  // to right nodes and are marked to eliminate cycles from the search.
+  //
+  // Left nodes will only be explored at most once because they
+  // are accessible from at most one right node in the residual flow
+  // graph.
+  //
+  // Note that left_[ilhs] is the only element of left_ that TryAugment will
+  // potentially transition from kUnused to another value. Any other
+  // left_ element holding kUnused before TryAugment will be holding it
+  // when TryAugment returns.
+  //
+  bool TryAugment(size_t ilhs, ::std::vector<char>* seen) {
+    for (size_t irhs = 0; irhs < graph_->RhsSize(); ++irhs) {
+      if ((*seen)[irhs]) continue;
+      if (!graph_->HasEdge(ilhs, irhs)) continue;
+      // There's an available edge from ilhs to irhs.
+      (*seen)[irhs] = 1;
+      // Next a search is performed to determine whether
+      // this edge is a dead end or leads to the sink.
+      //
+      // right_[irhs] == kUnused means that there is residual flow from
+      // right node irhs to the sink, so we can use that to finish this
+      // flow path and return success.
+      //
+      // Otherwise there is residual flow to some ilhs. We push flow
+      // along that path and call ourselves recursively to see if this
+      // ultimately leads to sink.
+      if (right_[irhs] == kUnused || TryAugment(right_[irhs], seen)) {
+        // Add flow from left_[ilhs] to right_[irhs].
+        left_[ilhs] = irhs;
+        right_[irhs] = ilhs;
+        return true;
+      }
+    }
+    return false;
+  }
+
+  const MatchMatrix* graph_;  // not owned
+  // Each element of the left_ vector represents a left hand side node
+  // (i.e. an element) and each element of right_ is a right hand side
+  // node (i.e. a matcher). The values in the left_ vector indicate
+  // outflow from that node to a node on the right_ side. The values
+  // in the right_ indicate inflow, and specify which left_ node is
+  // feeding that right_ node, if any. For example, left_[3] == 1 means
+  // there's a flow from element #3 to matcher #1. Such a flow would also
+  // be redundantly represented in the right_ vector as right_[1] == 3.
+  // Elements of left_ and right_ are either kUnused or mutually
+  // referent. Mutually referent means that left_[right_[i]] = i and
+  // right_[left_[i]] = i.
+  ::std::vector<size_t> left_;
+  ::std::vector<size_t> right_;
+};
+
+const size_t MaxBipartiteMatchState::kUnused;
+
+GTEST_API_ ElementMatcherPairs FindMaxBipartiteMatching(const MatchMatrix& g) {
+  return MaxBipartiteMatchState(g).Compute();
+}
+
+static void LogElementMatcherPairVec(const ElementMatcherPairs& pairs,
+                                     ::std::ostream* stream) {
+  typedef ElementMatcherPairs::const_iterator Iter;
+  ::std::ostream& os = *stream;
+  os << "{";
+  const char* sep = "";
+  for (Iter it = pairs.begin(); it != pairs.end(); ++it) {
+    os << sep << "\n  ("
+       << "element #" << it->first << ", "
+       << "matcher #" << it->second << ")";
+    sep = ",";
+  }
+  os << "\n}";
+}
+
+bool MatchMatrix::NextGraph() {
+  for (size_t ilhs = 0; ilhs < LhsSize(); ++ilhs) {
+    for (size_t irhs = 0; irhs < RhsSize(); ++irhs) {
+      char& b = matched_[SpaceIndex(ilhs, irhs)];
+      if (!b) {
+        b = 1;
+        return true;
+      }
+      b = 0;
+    }
+  }
+  return false;
+}
+
+void MatchMatrix::Randomize() {
+  for (size_t ilhs = 0; ilhs < LhsSize(); ++ilhs) {
+    for (size_t irhs = 0; irhs < RhsSize(); ++irhs) {
+      char& b = matched_[SpaceIndex(ilhs, irhs)];
+      b = static_cast<char>(rand() & 1);  // NOLINT
+    }
+  }
+}
+
+std::string MatchMatrix::DebugString() const {
+  ::std::stringstream ss;
+  const char* sep = "";
+  for (size_t i = 0; i < LhsSize(); ++i) {
+    ss << sep;
+    for (size_t j = 0; j < RhsSize(); ++j) {
+      ss << HasEdge(i, j);
+    }
+    sep = ";";
+  }
+  return ss.str();
+}
+
+void UnorderedElementsAreMatcherImplBase::DescribeToImpl(
+    ::std::ostream* os) const {
+  switch (match_flags()) {
+    case UnorderedMatcherRequire::ExactMatch:
+      if (matcher_describers_.empty()) {
+        *os << "is empty";
+        return;
+      }
+      if (matcher_describers_.size() == 1) {
+        *os << "has " << Elements(1) << " and that element ";
+        matcher_describers_[0]->DescribeTo(os);
+        return;
+      }
+      *os << "has " << Elements(matcher_describers_.size())
+          << " and there exists some permutation of elements such that:\n";
+      break;
+    case UnorderedMatcherRequire::Superset:
+      *os << "a surjection from elements to requirements exists such that:\n";
+      break;
+    case UnorderedMatcherRequire::Subset:
+      *os << "an injection from elements to requirements exists such that:\n";
+      break;
+  }
+
+  const char* sep = "";
+  for (size_t i = 0; i != matcher_describers_.size(); ++i) {
+    *os << sep;
+    if (match_flags() == UnorderedMatcherRequire::ExactMatch) {
+      *os << " - element #" << i << " ";
+    } else {
+      *os << " - an element ";
+    }
+    matcher_describers_[i]->DescribeTo(os);
+    if (match_flags() == UnorderedMatcherRequire::ExactMatch) {
+      sep = ", and\n";
+    } else {
+      sep = "\n";
+    }
+  }
+}
+
+void UnorderedElementsAreMatcherImplBase::DescribeNegationToImpl(
+    ::std::ostream* os) const {
+  switch (match_flags()) {
+    case UnorderedMatcherRequire::ExactMatch:
+      if (matcher_describers_.empty()) {
+        *os << "isn't empty";
+        return;
+      }
+      if (matcher_describers_.size() == 1) {
+        *os << "doesn't have " << Elements(1) << ", or has " << Elements(1)
+            << " that ";
+        matcher_describers_[0]->DescribeNegationTo(os);
+        return;
+      }
+      *os << "doesn't have " << Elements(matcher_describers_.size())
+          << ", or there exists no permutation of elements such that:\n";
+      break;
+    case UnorderedMatcherRequire::Superset:
+      *os << "no surjection from elements to requirements exists such that:\n";
+      break;
+    case UnorderedMatcherRequire::Subset:
+      *os << "no injection from elements to requirements exists such that:\n";
+      break;
+  }
+  const char* sep = "";
+  for (size_t i = 0; i != matcher_describers_.size(); ++i) {
+    *os << sep;
+    if (match_flags() == UnorderedMatcherRequire::ExactMatch) {
+      *os << " - element #" << i << " ";
+    } else {
+      *os << " - an element ";
+    }
+    matcher_describers_[i]->DescribeTo(os);
+    if (match_flags() == UnorderedMatcherRequire::ExactMatch) {
+      sep = ", and\n";
+    } else {
+      sep = "\n";
+    }
+  }
+}
+
+// Checks that all matchers match at least one element, and that all
+// elements match at least one matcher. This enables faster matching
+// and better error reporting.
+// Returns false, writing an explanation to 'listener', if and only
+// if the success criteria are not met.
+bool UnorderedElementsAreMatcherImplBase::VerifyMatchMatrix(
+    const ::std::vector<std::string>& element_printouts,
+    const MatchMatrix& matrix, MatchResultListener* listener) const {
+  bool result = true;
+  ::std::vector<char> element_matched(matrix.LhsSize(), 0);
+  ::std::vector<char> matcher_matched(matrix.RhsSize(), 0);
+
+  for (size_t ilhs = 0; ilhs < matrix.LhsSize(); ilhs++) {
+    for (size_t irhs = 0; irhs < matrix.RhsSize(); irhs++) {
+      char matched = matrix.HasEdge(ilhs, irhs);
+      element_matched[ilhs] |= matched;
+      matcher_matched[irhs] |= matched;
+    }
+  }
+
+  if (match_flags() & UnorderedMatcherRequire::Superset) {
+    const char* sep =
+        "where the following matchers don't match any elements:\n";
+    for (size_t mi = 0; mi < matcher_matched.size(); ++mi) {
+      if (matcher_matched[mi]) continue;
+      result = false;
+      if (listener->IsInterested()) {
+        *listener << sep << "matcher #" << mi << ": ";
+        matcher_describers_[mi]->DescribeTo(listener->stream());
+        sep = ",\n";
+      }
+    }
+  }
+
+  if (match_flags() & UnorderedMatcherRequire::Subset) {
+    const char* sep =
+        "where the following elements don't match any matchers:\n";
+    const char* outer_sep = "";
+    if (!result) {
+      outer_sep = "\nand ";
+    }
+    for (size_t ei = 0; ei < element_matched.size(); ++ei) {
+      if (element_matched[ei]) continue;
+      result = false;
+      if (listener->IsInterested()) {
+        *listener << outer_sep << sep << "element #" << ei << ": "
+                  << element_printouts[ei];
+        sep = ",\n";
+        outer_sep = "";
+      }
+    }
+  }
+  return result;
+}
+
+bool UnorderedElementsAreMatcherImplBase::FindPairing(
+    const MatchMatrix& matrix, MatchResultListener* listener) const {
+  ElementMatcherPairs matches = FindMaxBipartiteMatching(matrix);
+
+  size_t max_flow = matches.size();
+  if ((match_flags() & UnorderedMatcherRequire::Superset) &&
+      max_flow < matrix.RhsSize()) {
+    if (listener->IsInterested()) {
+      *listener << "where no permutation of the elements can satisfy all "
+                   "matchers, and the closest match is "
+                << max_flow << " of " << matrix.RhsSize()
+                << " matchers with the pairings:\n";
+      LogElementMatcherPairVec(matches, listener->stream());
+    }
+    return false;
+  }
+  if ((match_flags() & UnorderedMatcherRequire::Subset) &&
+      max_flow < matrix.LhsSize()) {
+    if (listener->IsInterested()) {
+      *listener
+          << "where not all elements can be matched, and the closest match is "
+          << max_flow << " of " << matrix.RhsSize()
+          << " matchers with the pairings:\n";
+      LogElementMatcherPairVec(matches, listener->stream());
+    }
+    return false;
+  }
+
+  if (matches.size() > 1) {
+    if (listener->IsInterested()) {
+      const char* sep = "where:\n";
+      for (size_t mi = 0; mi < matches.size(); ++mi) {
+        *listener << sep << " - element #" << matches[mi].first
+                  << " is matched by matcher #" << matches[mi].second;
+        sep = ",\n";
+      }
+    }
+  }
+  return true;
+}
+
+}  // namespace internal
+}  // namespace testing
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/src/gmock-spec-builders.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/src/gmock-spec-builders.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googlemock/src/gmock-spec-builders.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googlemock/src/gmock-spec-builders.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,908 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file implements the spec builder syntax (ON_CALL and
+// EXPECT_CALL).
+
+#include "gmock/gmock-spec-builders.h"
+
+#include <stdlib.h>
+
+#include <iostream>  // NOLINT
+#include <map>
+#include <memory>
+#include <set>
+#include <string>
+#include <vector>
+
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+#include "gtest/internal/gtest-port.h"
+
+#if GTEST_OS_CYGWIN || GTEST_OS_LINUX || GTEST_OS_MAC
+# include <unistd.h>  // NOLINT
+#endif
+
+// Silence C4800 (C4800: 'int *const ': forcing value
+// to bool 'true' or 'false') for MSVC 15
+#ifdef _MSC_VER
+#if _MSC_VER == 1900
+#  pragma warning(push)
+#  pragma warning(disable:4800)
+#endif
+#endif
+
+namespace testing {
+namespace internal {
+
+// Protects the mock object registry (in class Mock), all function
+// mockers, and all expectations.
+GTEST_API_ GTEST_DEFINE_STATIC_MUTEX_(g_gmock_mutex);
+
+// Logs a message including file and line number information.
+GTEST_API_ void LogWithLocation(testing::internal::LogSeverity severity,
+                                const char* file, int line,
+                                const std::string& message) {
+  ::std::ostringstream s;
+  s << internal::FormatFileLocation(file, line) << " " << message
+    << ::std::endl;
+  Log(severity, s.str(), 0);
+}
+
+// Constructs an ExpectationBase object.
+ExpectationBase::ExpectationBase(const char* a_file, int a_line,
+                                 const std::string& a_source_text)
+    : file_(a_file),
+      line_(a_line),
+      source_text_(a_source_text),
+      cardinality_specified_(false),
+      cardinality_(Exactly(1)),
+      call_count_(0),
+      retired_(false),
+      extra_matcher_specified_(false),
+      repeated_action_specified_(false),
+      retires_on_saturation_(false),
+      last_clause_(kNone),
+      action_count_checked_(false) {}
+
+// Destructs an ExpectationBase object.
+ExpectationBase::~ExpectationBase() {}
+
+// Explicitly specifies the cardinality of this expectation.  Used by
+// the subclasses to implement the .Times() clause.
+void ExpectationBase::SpecifyCardinality(const Cardinality& a_cardinality) {
+  cardinality_specified_ = true;
+  cardinality_ = a_cardinality;
+}
+
+// Retires all pre-requisites of this expectation.
+void ExpectationBase::RetireAllPreRequisites()
+    GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+  if (is_retired()) {
+    // We can take this short-cut as we never retire an expectation
+    // until we have retired all its pre-requisites.
+    return;
+  }
+
+  ::std::vector<ExpectationBase*> expectations(1, this);
+  while (!expectations.empty()) {
+    ExpectationBase* exp = expectations.back();
+    expectations.pop_back();
+
+    for (ExpectationSet::const_iterator it =
+             exp->immediate_prerequisites_.begin();
+         it != exp->immediate_prerequisites_.end(); ++it) {
+      ExpectationBase* next = it->expectation_base().get();
+      if (!next->is_retired()) {
+        next->Retire();
+        expectations.push_back(next);
+      }
+    }
+  }
+}
+
+// Returns true if and only if all pre-requisites of this expectation
+// have been satisfied.
+bool ExpectationBase::AllPrerequisitesAreSatisfied() const
+    GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+  g_gmock_mutex.AssertHeld();
+  ::std::vector<const ExpectationBase*> expectations(1, this);
+  while (!expectations.empty()) {
+    const ExpectationBase* exp = expectations.back();
+    expectations.pop_back();
+
+    for (ExpectationSet::const_iterator it =
+             exp->immediate_prerequisites_.begin();
+         it != exp->immediate_prerequisites_.end(); ++it) {
+      const ExpectationBase* next = it->expectation_base().get();
+      if (!next->IsSatisfied()) return false;
+      expectations.push_back(next);
+    }
+  }
+  return true;
+}
+
+// Adds unsatisfied pre-requisites of this expectation to 'result'.
+void ExpectationBase::FindUnsatisfiedPrerequisites(ExpectationSet* result) const
+    GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+  g_gmock_mutex.AssertHeld();
+  ::std::vector<const ExpectationBase*> expectations(1, this);
+  while (!expectations.empty()) {
+    const ExpectationBase* exp = expectations.back();
+    expectations.pop_back();
+
+    for (ExpectationSet::const_iterator it =
+             exp->immediate_prerequisites_.begin();
+         it != exp->immediate_prerequisites_.end(); ++it) {
+      const ExpectationBase* next = it->expectation_base().get();
+
+      if (next->IsSatisfied()) {
+        // If *it is satisfied and has a call count of 0, some of its
+        // pre-requisites may not be satisfied yet.
+        if (next->call_count_ == 0) {
+          expectations.push_back(next);
+        }
+      } else {
+        // Now that we know next is unsatisfied, we are not so interested
+        // in whether its pre-requisites are satisfied.  Therefore we
+        // don't iterate into it here.
+        *result += *it;
+      }
+    }
+  }
+}
+
+// Describes how many times a function call matching this
+// expectation has occurred.
+void ExpectationBase::DescribeCallCountTo(::std::ostream* os) const
+    GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+  g_gmock_mutex.AssertHeld();
+
+  // Describes how many times the function is expected to be called.
+  *os << "         Expected: to be ";
+  cardinality().DescribeTo(os);
+  *os << "\n           Actual: ";
+  Cardinality::DescribeActualCallCountTo(call_count(), os);
+
+  // Describes the state of the expectation (e.g. is it satisfied?
+  // is it active?).
+  *os << " - " << (IsOverSaturated() ? "over-saturated" :
+                   IsSaturated() ? "saturated" :
+                   IsSatisfied() ? "satisfied" : "unsatisfied")
+      << " and "
+      << (is_retired() ? "retired" : "active");
+}
+
+// Checks the action count (i.e. the number of WillOnce() and
+// WillRepeatedly() clauses) against the cardinality if this hasn't
+// been done before.  Prints a warning if there are too many or too
+// few actions.
+void ExpectationBase::CheckActionCountIfNotDone() const
+    GTEST_LOCK_EXCLUDED_(mutex_) {
+  bool should_check = false;
+  {
+    MutexLock l(&mutex_);
+    if (!action_count_checked_) {
+      action_count_checked_ = true;
+      should_check = true;
+    }
+  }
+
+  if (should_check) {
+    if (!cardinality_specified_) {
+      // The cardinality was inferred - no need to check the action
+      // count against it.
+      return;
+    }
+
+    // The cardinality was explicitly specified.
+    const int action_count = static_cast<int>(untyped_actions_.size());
+    const int upper_bound = cardinality().ConservativeUpperBound();
+    const int lower_bound = cardinality().ConservativeLowerBound();
+    bool too_many;  // True if there are too many actions, or false
+    // if there are too few.
+    if (action_count > upper_bound ||
+        (action_count == upper_bound && repeated_action_specified_)) {
+      too_many = true;
+    } else if (0 < action_count && action_count < lower_bound &&
+               !repeated_action_specified_) {
+      too_many = false;
+    } else {
+      return;
+    }
+
+    ::std::stringstream ss;
+    DescribeLocationTo(&ss);
+    ss << "Too " << (too_many ? "many" : "few")
+       << " actions specified in " << source_text() << "...\n"
+       << "Expected to be ";
+    cardinality().DescribeTo(&ss);
+    ss << ", but has " << (too_many ? "" : "only ")
+       << action_count << " WillOnce()"
+       << (action_count == 1 ? "" : "s");
+    if (repeated_action_specified_) {
+      ss << " and a WillRepeatedly()";
+    }
+    ss << ".";
+    Log(kWarning, ss.str(), -1);  // -1 means "don't print stack trace".
+  }
+}
+
+// Implements the .Times() clause.
+void ExpectationBase::UntypedTimes(const Cardinality& a_cardinality) {
+  if (last_clause_ == kTimes) {
+    ExpectSpecProperty(false,
+                       ".Times() cannot appear "
+                       "more than once in an EXPECT_CALL().");
+  } else {
+    ExpectSpecProperty(last_clause_ < kTimes,
+                       ".Times() cannot appear after "
+                       ".InSequence(), .WillOnce(), .WillRepeatedly(), "
+                       "or .RetiresOnSaturation().");
+  }
+  last_clause_ = kTimes;
+
+  SpecifyCardinality(a_cardinality);
+}
+
+// Points to the implicit sequence introduced by a living InSequence
+// object (if any) in the current thread or NULL.
+GTEST_API_ ThreadLocal<Sequence*> g_gmock_implicit_sequence;
+
+// Reports an uninteresting call (whose description is in msg) in the
+// manner specified by 'reaction'.
+void ReportUninterestingCall(CallReaction reaction, const std::string& msg) {
+  // Include a stack trace only if --gmock_verbose=info is specified.
+  const int stack_frames_to_skip =
+      GMOCK_FLAG(verbose) == kInfoVerbosity ? 3 : -1;
+  switch (reaction) {
+    case kAllow:
+      Log(kInfo, msg, stack_frames_to_skip);
+      break;
+    case kWarn:
+      Log(kWarning,
+          msg +
+              "\nNOTE: You can safely ignore the above warning unless this "
+              "call should not happen.  Do not suppress it by blindly adding "
+              "an EXPECT_CALL() if you don't mean to enforce the call.  "
+              "See "
+              "https://github.com/google/googletest/blob/master/docs/"
+              "gmock_cook_book.md#"
+              "knowing-when-to-expect for details.\n",
+          stack_frames_to_skip);
+      break;
+    default:  // FAIL
+      Expect(false, nullptr, -1, msg);
+  }
+}
+
+UntypedFunctionMockerBase::UntypedFunctionMockerBase()
+    : mock_obj_(nullptr), name_("") {}
+
+UntypedFunctionMockerBase::~UntypedFunctionMockerBase() {}
+
+// Sets the mock object this mock method belongs to, and registers
+// this information in the global mock registry.  Will be called
+// whenever an EXPECT_CALL() or ON_CALL() is executed on this mock
+// method.
+void UntypedFunctionMockerBase::RegisterOwner(const void* mock_obj)
+    GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
+  {
+    MutexLock l(&g_gmock_mutex);
+    mock_obj_ = mock_obj;
+  }
+  Mock::Register(mock_obj, this);
+}
+
+// Sets the mock object this mock method belongs to, and sets the name
+// of the mock function.  Will be called upon each invocation of this
+// mock function.
+void UntypedFunctionMockerBase::SetOwnerAndName(const void* mock_obj,
+                                                const char* name)
+    GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
+  // We protect name_ under g_gmock_mutex in case this mock function
+  // is called from two threads concurrently.
+  MutexLock l(&g_gmock_mutex);
+  mock_obj_ = mock_obj;
+  name_ = name;
+}
+
+// Returns the name of the function being mocked.  Must be called
+// after RegisterOwner() or SetOwnerAndName() has been called.
+const void* UntypedFunctionMockerBase::MockObject() const
+    GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
+  const void* mock_obj;
+  {
+    // We protect mock_obj_ under g_gmock_mutex in case this mock
+    // function is called from two threads concurrently.
+    MutexLock l(&g_gmock_mutex);
+    Assert(mock_obj_ != nullptr, __FILE__, __LINE__,
+           "MockObject() must not be called before RegisterOwner() or "
+           "SetOwnerAndName() has been called.");
+    mock_obj = mock_obj_;
+  }
+  return mock_obj;
+}
+
+// Returns the name of this mock method.  Must be called after
+// SetOwnerAndName() has been called.
+const char* UntypedFunctionMockerBase::Name() const
+    GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
+  const char* name;
+  {
+    // We protect name_ under g_gmock_mutex in case this mock
+    // function is called from two threads concurrently.
+    MutexLock l(&g_gmock_mutex);
+    Assert(name_ != nullptr, __FILE__, __LINE__,
+           "Name() must not be called before SetOwnerAndName() has "
+           "been called.");
+    name = name_;
+  }
+  return name;
+}
+
+// Calculates the result of invoking this mock function with the given
+// arguments, prints it, and returns it.  The caller is responsible
+// for deleting the result.
+UntypedActionResultHolderBase* UntypedFunctionMockerBase::UntypedInvokeWith(
+    void* const untyped_args) GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
+  // See the definition of untyped_expectations_ for why access to it
+  // is unprotected here.
+  if (untyped_expectations_.size() == 0) {
+    // No expectation is set on this mock method - we have an
+    // uninteresting call.
+
+    // We must get Google Mock's reaction on uninteresting calls
+    // made on this mock object BEFORE performing the action,
+    // because the action may DELETE the mock object and make the
+    // following expression meaningless.
+    const CallReaction reaction =
+        Mock::GetReactionOnUninterestingCalls(MockObject());
+
+    // True if and only if we need to print this call's arguments and return
+    // value.  This definition must be kept in sync with
+    // the behavior of ReportUninterestingCall().
+    const bool need_to_report_uninteresting_call =
+        // If the user allows this uninteresting call, we print it
+        // only when they want informational messages.
+        reaction == kAllow ? LogIsVisible(kInfo) :
+                           // If the user wants this to be a warning, we print
+                           // it only when they want to see warnings.
+            reaction == kWarn
+                ? LogIsVisible(kWarning)
+                :
+                // Otherwise, the user wants this to be an error, and we
+                // should always print detailed information in the error.
+                true;
+
+    if (!need_to_report_uninteresting_call) {
+      // Perform the action without printing the call information.
+      return this->UntypedPerformDefaultAction(
+          untyped_args, "Function call: " + std::string(Name()));
+    }
+
+    // Warns about the uninteresting call.
+    ::std::stringstream ss;
+    this->UntypedDescribeUninterestingCall(untyped_args, &ss);
+
+    // Calculates the function result.
+    UntypedActionResultHolderBase* const result =
+        this->UntypedPerformDefaultAction(untyped_args, ss.str());
+
+    // Prints the function result.
+    if (result != nullptr) result->PrintAsActionResult(&ss);
+
+    ReportUninterestingCall(reaction, ss.str());
+    return result;
+  }
+
+  bool is_excessive = false;
+  ::std::stringstream ss;
+  ::std::stringstream why;
+  ::std::stringstream loc;
+  const void* untyped_action = nullptr;
+
+  // The UntypedFindMatchingExpectation() function acquires and
+  // releases g_gmock_mutex.
+
+  const ExpectationBase* const untyped_expectation =
+      this->UntypedFindMatchingExpectation(untyped_args, &untyped_action,
+                                           &is_excessive, &ss, &why);
+  const bool found = untyped_expectation != nullptr;
+
+  // True if and only if we need to print the call's arguments
+  // and return value.
+  // This definition must be kept in sync with the uses of Expect()
+  // and Log() in this function.
+  const bool need_to_report_call =
+      !found || is_excessive || LogIsVisible(kInfo);
+  if (!need_to_report_call) {
+    // Perform the action without printing the call information.
+    return untyped_action == nullptr
+               ? this->UntypedPerformDefaultAction(untyped_args, "")
+               : this->UntypedPerformAction(untyped_action, untyped_args);
+  }
+
+  ss << "    Function call: " << Name();
+  this->UntypedPrintArgs(untyped_args, &ss);
+
+  // In case the action deletes a piece of the expectation, we
+  // generate the message beforehand.
+  if (found && !is_excessive) {
+    untyped_expectation->DescribeLocationTo(&loc);
+  }
+
+  UntypedActionResultHolderBase* result = nullptr;
+
+  auto perform_action = [&] {
+    return untyped_action == nullptr
+               ? this->UntypedPerformDefaultAction(untyped_args, ss.str())
+               : this->UntypedPerformAction(untyped_action, untyped_args);
+  };
+  auto handle_failures = [&] {
+    ss << "\n" << why.str();
+
+    if (!found) {
+      // No expectation matches this call - reports a failure.
+      Expect(false, nullptr, -1, ss.str());
+    } else if (is_excessive) {
+      // We had an upper-bound violation and the failure message is in ss.
+      Expect(false, untyped_expectation->file(), untyped_expectation->line(),
+             ss.str());
+    } else {
+      // We had an expected call and the matching expectation is
+      // described in ss.
+      Log(kInfo, loc.str() + ss.str(), 2);
+    }
+  };
+#if GTEST_HAS_EXCEPTIONS
+  try {
+    result = perform_action();
+  } catch (...) {
+    handle_failures();
+    throw;
+  }
+#else
+  result = perform_action();
+#endif
+
+  if (result != nullptr) result->PrintAsActionResult(&ss);
+  handle_failures();
+  return result;
+}
+
+// Returns an Expectation object that references and co-owns exp,
+// which must be an expectation on this mock function.
+Expectation UntypedFunctionMockerBase::GetHandleOf(ExpectationBase* exp) {
+  // See the definition of untyped_expectations_ for why access to it
+  // is unprotected here.
+  for (UntypedExpectations::const_iterator it =
+           untyped_expectations_.begin();
+       it != untyped_expectations_.end(); ++it) {
+    if (it->get() == exp) {
+      return Expectation(*it);
+    }
+  }
+
+  Assert(false, __FILE__, __LINE__, "Cannot find expectation.");
+  return Expectation();
+  // The above statement is just to make the code compile, and will
+  // never be executed.
+}
+
+// Verifies that all expectations on this mock function have been
+// satisfied.  Reports one or more Google Test non-fatal failures
+// and returns false if not.
+bool UntypedFunctionMockerBase::VerifyAndClearExpectationsLocked()
+    GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+  g_gmock_mutex.AssertHeld();
+  bool expectations_met = true;
+  for (UntypedExpectations::const_iterator it =
+           untyped_expectations_.begin();
+       it != untyped_expectations_.end(); ++it) {
+    ExpectationBase* const untyped_expectation = it->get();
+    if (untyped_expectation->IsOverSaturated()) {
+      // There was an upper-bound violation.  Since the error was
+      // already reported when it occurred, there is no need to do
+      // anything here.
+      expectations_met = false;
+    } else if (!untyped_expectation->IsSatisfied()) {
+      expectations_met = false;
+      ::std::stringstream ss;
+      ss  << "Actual function call count doesn't match "
+          << untyped_expectation->source_text() << "...\n";
+      // No need to show the source file location of the expectation
+      // in the description, as the Expect() call that follows already
+      // takes care of it.
+      untyped_expectation->MaybeDescribeExtraMatcherTo(&ss);
+      untyped_expectation->DescribeCallCountTo(&ss);
+      Expect(false, untyped_expectation->file(),
+             untyped_expectation->line(), ss.str());
+    }
+  }
+
+  // Deleting our expectations may trigger other mock objects to be deleted, for
+  // example if an action contains a reference counted smart pointer to that
+  // mock object, and that is the last reference. So if we delete our
+  // expectations within the context of the global mutex we may deadlock when
+  // this method is called again. Instead, make a copy of the set of
+  // expectations to delete, clear our set within the mutex, and then clear the
+  // copied set outside of it.
+  UntypedExpectations expectations_to_delete;
+  untyped_expectations_.swap(expectations_to_delete);
+
+  g_gmock_mutex.Unlock();
+  expectations_to_delete.clear();
+  g_gmock_mutex.Lock();
+
+  return expectations_met;
+}
+
+CallReaction intToCallReaction(int mock_behavior) {
+  if (mock_behavior >= kAllow && mock_behavior <= kFail) {
+    return static_cast<internal::CallReaction>(mock_behavior);
+  }
+  return kWarn;
+}
+
+}  // namespace internal
+
+// Class Mock.
+
+namespace {
+
+typedef std::set<internal::UntypedFunctionMockerBase*> FunctionMockers;
+
+// The current state of a mock object.  Such information is needed for
+// detecting leaked mock objects and explicitly verifying a mock's
+// expectations.
+struct MockObjectState {
+  MockObjectState()
+      : first_used_file(nullptr), first_used_line(-1), leakable(false) {}
+
+  // Where in the source file an ON_CALL or EXPECT_CALL is first
+  // invoked on this mock object.
+  const char* first_used_file;
+  int first_used_line;
+  ::std::string first_used_test_suite;
+  ::std::string first_used_test;
+  bool leakable;  // true if and only if it's OK to leak the object.
+  FunctionMockers function_mockers;  // All registered methods of the object.
+};
+
+// A global registry holding the state of all mock objects that are
+// alive.  A mock object is added to this registry the first time
+// Mock::AllowLeak(), ON_CALL(), or EXPECT_CALL() is called on it.  It
+// is removed from the registry in the mock object's destructor.
+class MockObjectRegistry {
+ public:
+  // Maps a mock object (identified by its address) to its state.
+  typedef std::map<const void*, MockObjectState> StateMap;
+
+  // This destructor will be called when a program exits, after all
+  // tests in it have been run.  By then, there should be no mock
+  // object alive.  Therefore we report any living object as test
+  // failure, unless the user explicitly asked us to ignore it.
+  ~MockObjectRegistry() {
+    if (!GMOCK_FLAG(catch_leaked_mocks))
+      return;
+
+    int leaked_count = 0;
+    for (StateMap::const_iterator it = states_.begin(); it != states_.end();
+         ++it) {
+      if (it->second.leakable)  // The user said it's fine to leak this object.
+        continue;
+
+      // FIXME: Print the type of the leaked object.
+      // This can help the user identify the leaked object.
+      std::cout << "\n";
+      const MockObjectState& state = it->second;
+      std::cout << internal::FormatFileLocation(state.first_used_file,
+                                                state.first_used_line);
+      std::cout << " ERROR: this mock object";
+      if (state.first_used_test != "") {
+        std::cout << " (used in test " << state.first_used_test_suite << "."
+                  << state.first_used_test << ")";
+      }
+      std::cout << " should be deleted but never is. Its address is @"
+           << it->first << ".";
+      leaked_count++;
+    }
+    if (leaked_count > 0) {
+      std::cout << "\nERROR: " << leaked_count << " leaked mock "
+                << (leaked_count == 1 ? "object" : "objects")
+                << " found at program exit. Expectations on a mock object are "
+                   "verified when the object is destructed. Leaking a mock "
+                   "means that its expectations aren't verified, which is "
+                   "usually a test bug. If you really intend to leak a mock, "
+                   "you can suppress this error using "
+                   "testing::Mock::AllowLeak(mock_object), or you may use a "
+                   "fake or stub instead of a mock.\n";
+      std::cout.flush();
+      ::std::cerr.flush();
+      // RUN_ALL_TESTS() has already returned when this destructor is
+      // called.  Therefore we cannot use the normal Google Test
+      // failure reporting mechanism.
+      _exit(1);  // We cannot call exit() as it is not reentrant and
+                 // may already have been called.
+    }
+  }
+
+  StateMap& states() { return states_; }
+
+ private:
+  StateMap states_;
+};
+
+// Protected by g_gmock_mutex.
+MockObjectRegistry g_mock_object_registry;
+
+// Maps a mock object to the reaction Google Mock should have when an
+// uninteresting method is called.  Protected by g_gmock_mutex.
+std::map<const void*, internal::CallReaction> g_uninteresting_call_reaction;
+
+// Sets the reaction Google Mock should have when an uninteresting
+// method of the given mock object is called.
+void SetReactionOnUninterestingCalls(const void* mock_obj,
+                                     internal::CallReaction reaction)
+    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
+  internal::MutexLock l(&internal::g_gmock_mutex);
+  g_uninteresting_call_reaction[mock_obj] = reaction;
+}
+
+}  // namespace
+
+// Tells Google Mock to allow uninteresting calls on the given mock
+// object.
+void Mock::AllowUninterestingCalls(const void* mock_obj)
+    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
+  SetReactionOnUninterestingCalls(mock_obj, internal::kAllow);
+}
+
+// Tells Google Mock to warn the user about uninteresting calls on the
+// given mock object.
+void Mock::WarnUninterestingCalls(const void* mock_obj)
+    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
+  SetReactionOnUninterestingCalls(mock_obj, internal::kWarn);
+}
+
+// Tells Google Mock to fail uninteresting calls on the given mock
+// object.
+void Mock::FailUninterestingCalls(const void* mock_obj)
+    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
+  SetReactionOnUninterestingCalls(mock_obj, internal::kFail);
+}
+
+// Tells Google Mock the given mock object is being destroyed and its
+// entry in the call-reaction table should be removed.
+void Mock::UnregisterCallReaction(const void* mock_obj)
+    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
+  internal::MutexLock l(&internal::g_gmock_mutex);
+  g_uninteresting_call_reaction.erase(mock_obj);
+}
+
+// Returns the reaction Google Mock will have on uninteresting calls
+// made on the given mock object.
+internal::CallReaction Mock::GetReactionOnUninterestingCalls(
+    const void* mock_obj)
+        GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
+  internal::MutexLock l(&internal::g_gmock_mutex);
+  return (g_uninteresting_call_reaction.count(mock_obj) == 0) ?
+      internal::intToCallReaction(GMOCK_FLAG(default_mock_behavior)) :
+      g_uninteresting_call_reaction[mock_obj];
+}
+
+// Tells Google Mock to ignore mock_obj when checking for leaked mock
+// objects.
+void Mock::AllowLeak(const void* mock_obj)
+    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
+  internal::MutexLock l(&internal::g_gmock_mutex);
+  g_mock_object_registry.states()[mock_obj].leakable = true;
+}
+
+// Verifies and clears all expectations on the given mock object.  If
+// the expectations aren't satisfied, generates one or more Google
+// Test non-fatal failures and returns false.
+bool Mock::VerifyAndClearExpectations(void* mock_obj)
+    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
+  internal::MutexLock l(&internal::g_gmock_mutex);
+  return VerifyAndClearExpectationsLocked(mock_obj);
+}
+
+// Verifies all expectations on the given mock object and clears its
+// default actions and expectations.  Returns true if and only if the
+// verification was successful.
+bool Mock::VerifyAndClear(void* mock_obj)
+    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
+  internal::MutexLock l(&internal::g_gmock_mutex);
+  ClearDefaultActionsLocked(mock_obj);
+  return VerifyAndClearExpectationsLocked(mock_obj);
+}
+
+// Verifies and clears all expectations on the given mock object.  If
+// the expectations aren't satisfied, generates one or more Google
+// Test non-fatal failures and returns false.
+bool Mock::VerifyAndClearExpectationsLocked(void* mock_obj)
+    GTEST_EXCLUSIVE_LOCK_REQUIRED_(internal::g_gmock_mutex) {
+  internal::g_gmock_mutex.AssertHeld();
+  if (g_mock_object_registry.states().count(mock_obj) == 0) {
+    // No EXPECT_CALL() was set on the given mock object.
+    return true;
+  }
+
+  // Verifies and clears the expectations on each mock method in the
+  // given mock object.
+  bool expectations_met = true;
+  FunctionMockers& mockers =
+      g_mock_object_registry.states()[mock_obj].function_mockers;
+  for (FunctionMockers::const_iterator it = mockers.begin();
+       it != mockers.end(); ++it) {
+    if (!(*it)->VerifyAndClearExpectationsLocked()) {
+      expectations_met = false;
+    }
+  }
+
+  // We don't clear the content of mockers, as they may still be
+  // needed by ClearDefaultActionsLocked().
+  return expectations_met;
+}
+
+bool Mock::IsNaggy(void* mock_obj)
+    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
+  return Mock::GetReactionOnUninterestingCalls(mock_obj) == internal::kWarn;
+}
+bool Mock::IsNice(void* mock_obj)
+    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
+  return Mock::GetReactionOnUninterestingCalls(mock_obj) == internal::kAllow;
+}
+bool Mock::IsStrict(void* mock_obj)
+    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
+  return Mock::GetReactionOnUninterestingCalls(mock_obj) == internal::kFail;
+}
+
+// Registers a mock object and a mock method it owns.
+void Mock::Register(const void* mock_obj,
+                    internal::UntypedFunctionMockerBase* mocker)
+    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
+  internal::MutexLock l(&internal::g_gmock_mutex);
+  g_mock_object_registry.states()[mock_obj].function_mockers.insert(mocker);
+}
+
+// Tells Google Mock where in the source code mock_obj is used in an
+// ON_CALL or EXPECT_CALL.  In case mock_obj is leaked, this
+// information helps the user identify which object it is.
+void Mock::RegisterUseByOnCallOrExpectCall(const void* mock_obj,
+                                           const char* file, int line)
+    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
+  internal::MutexLock l(&internal::g_gmock_mutex);
+  MockObjectState& state = g_mock_object_registry.states()[mock_obj];
+  if (state.first_used_file == nullptr) {
+    state.first_used_file = file;
+    state.first_used_line = line;
+    const TestInfo* const test_info =
+        UnitTest::GetInstance()->current_test_info();
+    if (test_info != nullptr) {
+      state.first_used_test_suite = test_info->test_suite_name();
+      state.first_used_test = test_info->name();
+    }
+  }
+}
+
+// Unregisters a mock method; removes the owning mock object from the
+// registry when the last mock method associated with it has been
+// unregistered.  This is called only in the destructor of
+// FunctionMockerBase.
+void Mock::UnregisterLocked(internal::UntypedFunctionMockerBase* mocker)
+    GTEST_EXCLUSIVE_LOCK_REQUIRED_(internal::g_gmock_mutex) {
+  internal::g_gmock_mutex.AssertHeld();
+  for (MockObjectRegistry::StateMap::iterator it =
+           g_mock_object_registry.states().begin();
+       it != g_mock_object_registry.states().end(); ++it) {
+    FunctionMockers& mockers = it->second.function_mockers;
+    if (mockers.erase(mocker) > 0) {
+      // mocker was in mockers and has been just removed.
+      if (mockers.empty()) {
+        g_mock_object_registry.states().erase(it);
+      }
+      return;
+    }
+  }
+}
+
+// Clears all ON_CALL()s set on the given mock object.
+void Mock::ClearDefaultActionsLocked(void* mock_obj)
+    GTEST_EXCLUSIVE_LOCK_REQUIRED_(internal::g_gmock_mutex) {
+  internal::g_gmock_mutex.AssertHeld();
+
+  if (g_mock_object_registry.states().count(mock_obj) == 0) {
+    // No ON_CALL() was set on the given mock object.
+    return;
+  }
+
+  // Clears the default actions for each mock method in the given mock
+  // object.
+  FunctionMockers& mockers =
+      g_mock_object_registry.states()[mock_obj].function_mockers;
+  for (FunctionMockers::const_iterator it = mockers.begin();
+       it != mockers.end(); ++it) {
+    (*it)->ClearDefaultActionsLocked();
+  }
+
+  // We don't clear the content of mockers, as they may still be
+  // needed by VerifyAndClearExpectationsLocked().
+}
+
+Expectation::Expectation() {}
+
+Expectation::Expectation(
+    const std::shared_ptr<internal::ExpectationBase>& an_expectation_base)
+    : expectation_base_(an_expectation_base) {}
+
+Expectation::~Expectation() {}
+
+// Adds an expectation to a sequence.
+void Sequence::AddExpectation(const Expectation& expectation) const {
+  if (*last_expectation_ != expectation) {
+    if (last_expectation_->expectation_base() != nullptr) {
+      expectation.expectation_base()->immediate_prerequisites_
+          += *last_expectation_;
+    }
+    *last_expectation_ = expectation;
+  }
+}
+
+// Creates the implicit sequence if there isn't one.
+InSequence::InSequence() {
+  if (internal::g_gmock_implicit_sequence.get() == nullptr) {
+    internal::g_gmock_implicit_sequence.set(new Sequence);
+    sequence_created_ = true;
+  } else {
+    sequence_created_ = false;
+  }
+}
+
+// Deletes the implicit sequence if it was created by the constructor
+// of this object.
+InSequence::~InSequence() {
+  if (sequence_created_) {
+    delete internal::g_gmock_implicit_sequence.get();
+    internal::g_gmock_implicit_sequence.set(nullptr);
+  }
+}
+
+}  // namespace testing
+
+#ifdef _MSC_VER
+#if _MSC_VER == 1900
+#  pragma warning(pop)
+#endif
+#endif
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/CMakeLists.txt mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/CMakeLists.txt
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,323 @@
+########################################################################
+# Note: CMake support is community-based. The maintainers do not use CMake
+# internally.
+#
+# CMake build script for Google Test.
+#
+# To run the tests for Google Test itself on Linux, use 'make test' or
+# ctest.  You can select which tests to run using 'ctest -R regex'.
+# For more options, run 'ctest --help'.
+
+# When other libraries are using a shared version of runtime libraries,
+# Google Test also has to use one.
+option(
+  gtest_force_shared_crt
+  "Use shared (DLL) run-time lib even when Google Test is built as static lib."
+  OFF)
+
+option(gtest_build_tests "Build all of gtest's own tests." OFF)
+
+option(gtest_build_samples "Build gtest's sample programs." OFF)
+
+option(gtest_disable_pthreads "Disable uses of pthreads in gtest." OFF)
+
+option(
+  gtest_hide_internal_symbols
+  "Build gtest with internal symbols hidden in shared libraries."
+  OFF)
+
+# Defines pre_project_set_up_hermetic_build() and set_up_hermetic_build().
+include(cmake/hermetic_build.cmake OPTIONAL)
+
+if (COMMAND pre_project_set_up_hermetic_build)
+  pre_project_set_up_hermetic_build()
+endif()
+
+########################################################################
+#
+# Project-wide settings
+
+# Name of the project.
+#
+# CMake files in this project can refer to the root source directory
+# as ${gtest_SOURCE_DIR} and to the root binary directory as
+# ${gtest_BINARY_DIR}.
+# Language "C" is required for find_package(Threads).
+
+# Project version:
+
+if (CMAKE_VERSION VERSION_LESS 3.0)
+  project(gtest CXX C)
+  set(PROJECT_VERSION ${GOOGLETEST_VERSION})
+else()
+  cmake_policy(SET CMP0048 NEW)
+  project(gtest VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C)
+endif()
+cmake_minimum_required(VERSION 2.8.12)
+
+if (POLICY CMP0063) # Visibility
+  cmake_policy(SET CMP0063 NEW)
+endif (POLICY CMP0063)
+
+if (COMMAND set_up_hermetic_build)
+  set_up_hermetic_build()
+endif()
+
+# These commands only run if this is the main project
+if(CMAKE_PROJECT_NAME STREQUAL "gtest" OR CMAKE_PROJECT_NAME STREQUAL "googletest-distribution")
+
+  # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to
+  # make it prominent in the GUI.
+  option(BUILD_SHARED_LIBS "Build shared libraries (DLLs)." OFF)
+
+else()
+
+  mark_as_advanced(
+    gtest_force_shared_crt
+    gtest_build_tests
+    gtest_build_samples
+    gtest_disable_pthreads
+    gtest_hide_internal_symbols)
+
+endif()
+
+
+if (gtest_hide_internal_symbols)
+  set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+  set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
+endif()
+
+# Define helper functions and macros used by Google Test.
+include(cmake/internal_utils.cmake)
+
+config_compiler_and_linker()  # Defined in internal_utils.cmake.
+
+# Needed to set the namespace for both the export targets and the
+# alias libraries
+set(cmake_package_name GTest CACHE INTERNAL "")
+
+# Create the CMake package file descriptors.
+if (INSTALL_GTEST)
+  include(CMakePackageConfigHelpers)
+  set(targets_export_name ${cmake_package_name}Targets CACHE INTERNAL "")
+  set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated" CACHE INTERNAL "")
+  set(cmake_files_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${cmake_package_name}")
+  set(version_file "${generated_dir}/${cmake_package_name}ConfigVersion.cmake")
+  write_basic_package_version_file(${version_file} VERSION ${GOOGLETEST_VERSION} COMPATIBILITY AnyNewerVersion)
+  install(EXPORT ${targets_export_name}
+    NAMESPACE ${cmake_package_name}::
+    DESTINATION ${cmake_files_install_dir})
+  set(config_file "${generated_dir}/${cmake_package_name}Config.cmake")
+  configure_package_config_file("${gtest_SOURCE_DIR}/cmake/Config.cmake.in"
+    "${config_file}" INSTALL_DESTINATION ${cmake_files_install_dir})
+  install(FILES ${version_file} ${config_file}
+    DESTINATION ${cmake_files_install_dir})
+endif()
+
+# Where Google Test's .h files can be found.
+set(gtest_build_include_dirs
+  "${gtest_SOURCE_DIR}/include"
+  "${gtest_SOURCE_DIR}")
+include_directories(${gtest_build_include_dirs})
+
+########################################################################
+#
+# Defines the gtest & gtest_main libraries.  User tests should link
+# with one of them.
+
+# Google Test libraries.  We build them using more strict warnings than what
+# are used for other targets, to ensure that gtest can be compiled by a user
+# aggressive about warnings.
+cxx_library(gtest "${cxx_strict}" src/gtest-all.cc)
+set_target_properties(gtest PROPERTIES VERSION ${GOOGLETEST_VERSION})
+cxx_library(gtest_main "${cxx_strict}" src/gtest_main.cc)
+set_target_properties(gtest_main PROPERTIES VERSION ${GOOGLETEST_VERSION})
+# If the CMake version supports it, attach header directory information
+# to the targets for when we are part of a parent build (ie being pulled
+# in via add_subdirectory() rather than being a standalone build).
+if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11")
+  target_include_directories(gtest SYSTEM INTERFACE
+    "$<BUILD_INTERFACE:${gtest_build_include_dirs}>"
+    "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
+  target_include_directories(gtest_main SYSTEM INTERFACE
+    "$<BUILD_INTERFACE:${gtest_build_include_dirs}>"
+    "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
+endif()
+target_link_libraries(gtest_main PUBLIC gtest)
+
+########################################################################
+#
+# Install rules
+install_project(gtest gtest_main)
+
+########################################################################
+#
+# Samples on how to link user tests with gtest or gtest_main.
+#
+# They are not built by default.  To build them, set the
+# gtest_build_samples option to ON.  You can do it by running ccmake
+# or specifying the -Dgtest_build_samples=ON flag when running cmake.
+
+if (gtest_build_samples)
+  cxx_executable(sample1_unittest samples gtest_main samples/sample1.cc)
+  cxx_executable(sample2_unittest samples gtest_main samples/sample2.cc)
+  cxx_executable(sample3_unittest samples gtest_main)
+  cxx_executable(sample4_unittest samples gtest_main samples/sample4.cc)
+  cxx_executable(sample5_unittest samples gtest_main samples/sample1.cc)
+  cxx_executable(sample6_unittest samples gtest_main)
+  cxx_executable(sample7_unittest samples gtest_main)
+  cxx_executable(sample8_unittest samples gtest_main)
+  cxx_executable(sample9_unittest samples gtest)
+  cxx_executable(sample10_unittest samples gtest)
+endif()
+
+########################################################################
+#
+# Google Test's own tests.
+#
+# You can skip this section if you aren't interested in testing
+# Google Test itself.
+#
+# The tests are not built by default.  To build them, set the
+# gtest_build_tests option to ON.  You can do it by running ccmake
+# or specifying the -Dgtest_build_tests=ON flag when running cmake.
+
+if (gtest_build_tests)
+  # This must be set in the root directory for the tests to be run by
+  # 'make test' or ctest.
+  enable_testing()
+
+  ############################################################
+  # C++ tests built with standard compiler flags.
+
+  cxx_test(googletest-death-test-test gtest_main)
+  cxx_test(gtest_environment_test gtest)
+  cxx_test(googletest-filepath-test gtest_main)
+  cxx_test(googletest-listener-test gtest_main)
+  cxx_test(gtest_main_unittest gtest_main)
+  cxx_test(googletest-message-test gtest_main)
+  cxx_test(gtest_no_test_unittest gtest)
+  cxx_test(googletest-options-test gtest_main)
+  cxx_test(googletest-param-test-test gtest
+    test/googletest-param-test2-test.cc)
+  cxx_test(googletest-port-test gtest_main)
+  cxx_test(gtest_pred_impl_unittest gtest_main)
+  cxx_test(gtest_premature_exit_test gtest
+    test/gtest_premature_exit_test.cc)
+  cxx_test(googletest-printers-test gtest_main)
+  cxx_test(gtest_prod_test gtest_main
+    test/production.cc)
+  cxx_test(gtest_repeat_test gtest)
+  cxx_test(gtest_sole_header_test gtest_main)
+  cxx_test(gtest_stress_test gtest)
+  cxx_test(googletest-test-part-test gtest_main)
+  cxx_test(gtest_throw_on_failure_ex_test gtest)
+  cxx_test(gtest-typed-test_test gtest_main
+    test/gtest-typed-test2_test.cc)
+  cxx_test(gtest_unittest gtest_main)
+  cxx_test(gtest-unittest-api_test gtest)
+  cxx_test(gtest_skip_in_environment_setup_test gtest_main)
+  cxx_test(gtest_skip_test gtest_main)
+
+  ############################################################
+  # C++ tests built with non-standard compiler flags.
+
+  # MSVC 7.1 does not support STL with exceptions disabled.
+  if (NOT MSVC OR MSVC_VERSION GREATER 1310)
+    cxx_library(gtest_no_exception "${cxx_no_exception}"
+      src/gtest-all.cc)
+    cxx_library(gtest_main_no_exception "${cxx_no_exception}"
+      src/gtest-all.cc src/gtest_main.cc)
+  endif()
+  cxx_library(gtest_main_no_rtti "${cxx_no_rtti}"
+    src/gtest-all.cc src/gtest_main.cc)
+
+  cxx_test_with_flags(gtest-death-test_ex_nocatch_test
+    "${cxx_exception} -DGTEST_ENABLE_CATCH_EXCEPTIONS_=0"
+    gtest test/googletest-death-test_ex_test.cc)
+  cxx_test_with_flags(gtest-death-test_ex_catch_test
+    "${cxx_exception} -DGTEST_ENABLE_CATCH_EXCEPTIONS_=1"
+    gtest test/googletest-death-test_ex_test.cc)
+
+  cxx_test_with_flags(gtest_no_rtti_unittest "${cxx_no_rtti}"
+    gtest_main_no_rtti test/gtest_unittest.cc)
+
+  cxx_shared_library(gtest_dll "${cxx_default}"
+    src/gtest-all.cc src/gtest_main.cc)
+
+  cxx_executable_with_flags(gtest_dll_test_ "${cxx_default}"
+    gtest_dll test/gtest_all_test.cc)
+  set_target_properties(gtest_dll_test_
+                        PROPERTIES
+                        COMPILE_DEFINITIONS "GTEST_LINKED_AS_SHARED_LIBRARY=1")
+
+  ############################################################
+  # Python tests.
+
+  cxx_executable(googletest-break-on-failure-unittest_ test gtest)
+  py_test(googletest-break-on-failure-unittest)
+
+  py_test(gtest_skip_check_output_test)
+  py_test(gtest_skip_environment_check_output_test)
+
+  # Visual Studio .NET 2003 does not support STL with exceptions disabled.
+  if (NOT MSVC OR MSVC_VERSION GREATER 1310)  # 1310 is Visual Studio .NET 2003
+    cxx_executable_with_flags(
+      googletest-catch-exceptions-no-ex-test_
+      "${cxx_no_exception}"
+      gtest_main_no_exception
+      test/googletest-catch-exceptions-test_.cc)
+  endif()
+
+  cxx_executable_with_flags(
+    googletest-catch-exceptions-ex-test_
+    "${cxx_exception}"
+    gtest_main
+    test/googletest-catch-exceptions-test_.cc)
+  py_test(googletest-catch-exceptions-test)
+
+  cxx_executable(googletest-color-test_ test gtest)
+  py_test(googletest-color-test)
+
+  cxx_executable(googletest-env-var-test_ test gtest)
+  py_test(googletest-env-var-test)
+
+  cxx_executable(googletest-filter-unittest_ test gtest)
+  py_test(googletest-filter-unittest)
+
+  cxx_executable(gtest_help_test_ test gtest_main)
+  py_test(gtest_help_test)
+
+  cxx_executable(googletest-list-tests-unittest_ test gtest)
+  py_test(googletest-list-tests-unittest)
+
+  cxx_executable(googletest-output-test_ test gtest)
+  py_test(googletest-output-test --no_stacktrace_support)
+
+  cxx_executable(googletest-shuffle-test_ test gtest)
+  py_test(googletest-shuffle-test)
+
+  # MSVC 7.1 does not support STL with exceptions disabled.
+  if (NOT MSVC OR MSVC_VERSION GREATER 1310)
+    cxx_executable(googletest-throw-on-failure-test_ test gtest_no_exception)
+    set_target_properties(googletest-throw-on-failure-test_
+      PROPERTIES
+      COMPILE_FLAGS "${cxx_no_exception}")
+    py_test(googletest-throw-on-failure-test)
+  endif()
+
+  cxx_executable(googletest-uninitialized-test_ test gtest)
+  py_test(googletest-uninitialized-test)
+
+  cxx_executable(gtest_list_output_unittest_ test gtest)
+  py_test(gtest_list_output_unittest)
+
+  cxx_executable(gtest_xml_outfile1_test_ test gtest_main)
+  cxx_executable(gtest_xml_outfile2_test_ test gtest_main)
+  py_test(gtest_xml_outfiles_test)
+  py_test(googletest-json-outfiles-test)
+
+  cxx_executable(gtest_xml_output_unittest_ test gtest)
+  py_test(gtest_xml_output_unittest --no_stacktrace_support)
+  py_test(googletest-json-output-unittest --no_stacktrace_support)
+endif()
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest-death-test.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest-death-test.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest-death-test.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest-death-test.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,346 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+//
+// The Google C++ Testing and Mocking Framework (Google Test)
+//
+// This header file defines the public API for death tests.  It is
+// #included by gtest.h so a user doesn't need to include this
+// directly.
+// GOOGLETEST_CM0001 DO NOT DELETE
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_
+#define GOOGLETEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_
+
+#include "gtest/internal/gtest-death-test-internal.h"
+
+namespace testing {
+
+// This flag controls the style of death tests.  Valid values are "threadsafe",
+// meaning that the death test child process will re-execute the test binary
+// from the start, running only a single death test, or "fast",
+// meaning that the child process will execute the test logic immediately
+// after forking.
+GTEST_DECLARE_string_(death_test_style);
+
+#if GTEST_HAS_DEATH_TEST
+
+namespace internal {
+
+// Returns a Boolean value indicating whether the caller is currently
+// executing in the context of the death test child process.  Tools such as
+// Valgrind heap checkers may need this to modify their behavior in death
+// tests.  IMPORTANT: This is an internal utility.  Using it may break the
+// implementation of death tests.  User code MUST NOT use it.
+GTEST_API_ bool InDeathTestChild();
+
+}  // namespace internal
+
+// The following macros are useful for writing death tests.
+
+// Here's what happens when an ASSERT_DEATH* or EXPECT_DEATH* is
+// executed:
+//
+//   1. It generates a warning if there is more than one active
+//   thread.  This is because it's safe to fork() or clone() only
+//   when there is a single thread.
+//
+//   2. The parent process clone()s a sub-process and runs the death
+//   test in it; the sub-process exits with code 0 at the end of the
+//   death test, if it hasn't exited already.
+//
+//   3. The parent process waits for the sub-process to terminate.
+//
+//   4. The parent process checks the exit code and error message of
+//   the sub-process.
+//
+// Examples:
+//
+//   ASSERT_DEATH(server.SendMessage(56, "Hello"), "Invalid port number");
+//   for (int i = 0; i < 5; i++) {
+//     EXPECT_DEATH(server.ProcessRequest(i),
+//                  "Invalid request .* in ProcessRequest()")
+//                  << "Failed to die on request " << i;
+//   }
+//
+//   ASSERT_EXIT(server.ExitNow(), ::testing::ExitedWithCode(0), "Exiting");
+//
+//   bool KilledBySIGHUP(int exit_code) {
+//     return WIFSIGNALED(exit_code) && WTERMSIG(exit_code) == SIGHUP;
+//   }
+//
+//   ASSERT_EXIT(client.HangUpServer(), KilledBySIGHUP, "Hanging up!");
+//
+// The final parameter to each of these macros is a matcher applied to any data
+// the sub-process wrote to stderr.  For compatibility with existing tests, a
+// bare string is interpreted as a regular expression matcher.
+//
+// On the regular expressions used in death tests:
+//
+//   GOOGLETEST_CM0005 DO NOT DELETE
+//   On POSIX-compliant systems (*nix), we use the <regex.h> library,
+//   which uses the POSIX extended regex syntax.
+//
+//   On other platforms (e.g. Windows or Mac), we only support a simple regex
+//   syntax implemented as part of Google Test.  This limited
+//   implementation should be enough most of the time when writing
+//   death tests; though it lacks many features you can find in PCRE
+//   or POSIX extended regex syntax.  For example, we don't support
+//   union ("x|y"), grouping ("(xy)"), brackets ("[xy]"), and
+//   repetition count ("x{5,7}"), among others.
+//
+//   Below is the syntax that we do support.  We chose it to be a
+//   subset of both PCRE and POSIX extended regex, so it's easy to
+//   learn wherever you come from.  In the following: 'A' denotes a
+//   literal character, period (.), or a single \\ escape sequence;
+//   'x' and 'y' denote regular expressions; 'm' and 'n' are for
+//   natural numbers.
+//
+//     c     matches any literal character c
+//     \\d   matches any decimal digit
+//     \\D   matches any character that's not a decimal digit
+//     \\f   matches \f
+//     \\n   matches \n
+//     \\r   matches \r
+//     \\s   matches any ASCII whitespace, including \n
+//     \\S   matches any character that's not a whitespace
+//     \\t   matches \t
+//     \\v   matches \v
+//     \\w   matches any letter, _, or decimal digit
+//     \\W   matches any character that \\w doesn't match
+//     \\c   matches any literal character c, which must be a punctuation
+//     .     matches any single character except \n
+//     A?    matches 0 or 1 occurrences of A
+//     A*    matches 0 or many occurrences of A
+//     A+    matches 1 or many occurrences of A
+//     ^     matches the beginning of a string (not that of each line)
+//     $     matches the end of a string (not that of each line)
+//     xy    matches x followed by y
+//
+//   If you accidentally use PCRE or POSIX extended regex features
+//   not implemented by us, you will get a run-time failure.  In that
+//   case, please try to rewrite your regular expression within the
+//   above syntax.
+//
+//   This implementation is *not* meant to be as highly tuned or robust
+//   as a compiled regex library, but should perform well enough for a
+//   death test, which already incurs significant overhead by launching
+//   a child process.
+//
+// Known caveats:
+//
+//   A "threadsafe" style death test obtains the path to the test
+//   program from argv[0] and re-executes it in the sub-process.  For
+//   simplicity, the current implementation doesn't search the PATH
+//   when launching the sub-process.  This means that the user must
+//   invoke the test program via a path that contains at least one
+//   path separator (e.g. path/to/foo_test and
+//   /absolute/path/to/bar_test are fine, but foo_test is not).  This
+//   is rarely a problem as people usually don't put the test binary
+//   directory in PATH.
+//
+
+// Asserts that a given `statement` causes the program to exit, with an
+// integer exit status that satisfies `predicate`, and emitting error output
+// that matches `matcher`.
+# define ASSERT_EXIT(statement, predicate, matcher) \
+    GTEST_DEATH_TEST_(statement, predicate, matcher, GTEST_FATAL_FAILURE_)
+
+// Like `ASSERT_EXIT`, but continues on to successive tests in the
+// test suite, if any:
+# define EXPECT_EXIT(statement, predicate, matcher) \
+    GTEST_DEATH_TEST_(statement, predicate, matcher, GTEST_NONFATAL_FAILURE_)
+
+// Asserts that a given `statement` causes the program to exit, either by
+// explicitly exiting with a nonzero exit code or being killed by a
+// signal, and emitting error output that matches `matcher`.
+# define ASSERT_DEATH(statement, matcher) \
+    ASSERT_EXIT(statement, ::testing::internal::ExitedUnsuccessfully, matcher)
+
+// Like `ASSERT_DEATH`, but continues on to successive tests in the
+// test suite, if any:
+# define EXPECT_DEATH(statement, matcher) \
+    EXPECT_EXIT(statement, ::testing::internal::ExitedUnsuccessfully, matcher)
+
+// Two predicate classes that can be used in {ASSERT,EXPECT}_EXIT*:
+
+// Tests that an exit code describes a normal exit with a given exit code.
+class GTEST_API_ ExitedWithCode {
+ public:
+  explicit ExitedWithCode(int exit_code);
+  ExitedWithCode(const ExitedWithCode&) = default;
+  void operator=(const ExitedWithCode& other) = delete;
+  bool operator()(int exit_status) const;
+ private:
+  const int exit_code_;
+};
+
+# if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
+// Tests that an exit code describes an exit due to termination by a
+// given signal.
+// GOOGLETEST_CM0006 DO NOT DELETE
+class GTEST_API_ KilledBySignal {
+ public:
+  explicit KilledBySignal(int signum);
+  bool operator()(int exit_status) const;
+ private:
+  const int signum_;
+};
+# endif  // !GTEST_OS_WINDOWS
+
+// EXPECT_DEBUG_DEATH asserts that the given statements die in debug mode.
+// The death testing framework causes this to have interesting semantics,
+// since the sideeffects of the call are only visible in opt mode, and not
+// in debug mode.
+//
+// In practice, this can be used to test functions that utilize the
+// LOG(DFATAL) macro using the following style:
+//
+// int DieInDebugOr12(int* sideeffect) {
+//   if (sideeffect) {
+//     *sideeffect = 12;
+//   }
+//   LOG(DFATAL) << "death";
+//   return 12;
+// }
+//
+// TEST(TestSuite, TestDieOr12WorksInDgbAndOpt) {
+//   int sideeffect = 0;
+//   // Only asserts in dbg.
+//   EXPECT_DEBUG_DEATH(DieInDebugOr12(&sideeffect), "death");
+//
+// #ifdef NDEBUG
+//   // opt-mode has sideeffect visible.
+//   EXPECT_EQ(12, sideeffect);
+// #else
+//   // dbg-mode no visible sideeffect.
+//   EXPECT_EQ(0, sideeffect);
+// #endif
+// }
+//
+// This will assert that DieInDebugReturn12InOpt() crashes in debug
+// mode, usually due to a DCHECK or LOG(DFATAL), but returns the
+// appropriate fallback value (12 in this case) in opt mode. If you
+// need to test that a function has appropriate side-effects in opt
+// mode, include assertions against the side-effects.  A general
+// pattern for this is:
+//
+// EXPECT_DEBUG_DEATH({
+//   // Side-effects here will have an effect after this statement in
+//   // opt mode, but none in debug mode.
+//   EXPECT_EQ(12, DieInDebugOr12(&sideeffect));
+// }, "death");
+//
+# ifdef NDEBUG
+
+#  define EXPECT_DEBUG_DEATH(statement, regex) \
+  GTEST_EXECUTE_STATEMENT_(statement, regex)
+
+#  define ASSERT_DEBUG_DEATH(statement, regex) \
+  GTEST_EXECUTE_STATEMENT_(statement, regex)
+
+# else
+
+#  define EXPECT_DEBUG_DEATH(statement, regex) \
+  EXPECT_DEATH(statement, regex)
+
+#  define ASSERT_DEBUG_DEATH(statement, regex) \
+  ASSERT_DEATH(statement, regex)
+
+# endif  // NDEBUG for EXPECT_DEBUG_DEATH
+#endif  // GTEST_HAS_DEATH_TEST
+
+// This macro is used for implementing macros such as
+// EXPECT_DEATH_IF_SUPPORTED and ASSERT_DEATH_IF_SUPPORTED on systems where
+// death tests are not supported. Those macros must compile on such systems
+// if and only if EXPECT_DEATH and ASSERT_DEATH compile with the same parameters
+// on systems that support death tests. This allows one to write such a macro on
+// a system that does not support death tests and be sure that it will compile
+// on a death-test supporting system. It is exposed publicly so that systems
+// that have death-tests with stricter requirements than GTEST_HAS_DEATH_TEST
+// can write their own equivalent of EXPECT_DEATH_IF_SUPPORTED and
+// ASSERT_DEATH_IF_SUPPORTED.
+//
+// Parameters:
+//   statement -  A statement that a macro such as EXPECT_DEATH would test
+//                for program termination. This macro has to make sure this
+//                statement is compiled but not executed, to ensure that
+//                EXPECT_DEATH_IF_SUPPORTED compiles with a certain
+//                parameter if and only if EXPECT_DEATH compiles with it.
+//   regex     -  A regex that a macro such as EXPECT_DEATH would use to test
+//                the output of statement.  This parameter has to be
+//                compiled but not evaluated by this macro, to ensure that
+//                this macro only accepts expressions that a macro such as
+//                EXPECT_DEATH would accept.
+//   terminator - Must be an empty statement for EXPECT_DEATH_IF_SUPPORTED
+//                and a return statement for ASSERT_DEATH_IF_SUPPORTED.
+//                This ensures that ASSERT_DEATH_IF_SUPPORTED will not
+//                compile inside functions where ASSERT_DEATH doesn't
+//                compile.
+//
+//  The branch that has an always false condition is used to ensure that
+//  statement and regex are compiled (and thus syntactically correct) but
+//  never executed. The unreachable code macro protects the terminator
+//  statement from generating an 'unreachable code' warning in case
+//  statement unconditionally returns or throws. The Message constructor at
+//  the end allows the syntax of streaming additional messages into the
+//  macro, for compilational compatibility with EXPECT_DEATH/ASSERT_DEATH.
+# define GTEST_UNSUPPORTED_DEATH_TEST(statement, regex, terminator) \
+    GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
+    if (::testing::internal::AlwaysTrue()) { \
+      GTEST_LOG_(WARNING) \
+          << "Death tests are not supported on this platform.\n" \
+          << "Statement '" #statement "' cannot be verified."; \
+    } else if (::testing::internal::AlwaysFalse()) { \
+      ::testing::internal::RE::PartialMatch(".*", (regex)); \
+      GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
+      terminator; \
+    } else \
+      ::testing::Message()
+
+// EXPECT_DEATH_IF_SUPPORTED(statement, regex) and
+// ASSERT_DEATH_IF_SUPPORTED(statement, regex) expand to real death tests if
+// death tests are supported; otherwise they just issue a warning.  This is
+// useful when you are combining death test assertions with normal test
+// assertions in one test.
+#if GTEST_HAS_DEATH_TEST
+# define EXPECT_DEATH_IF_SUPPORTED(statement, regex) \
+    EXPECT_DEATH(statement, regex)
+# define ASSERT_DEATH_IF_SUPPORTED(statement, regex) \
+    ASSERT_DEATH(statement, regex)
+#else
+# define EXPECT_DEATH_IF_SUPPORTED(statement, regex) \
+    GTEST_UNSUPPORTED_DEATH_TEST(statement, regex, )
+# define ASSERT_DEATH_IF_SUPPORTED(statement, regex) \
+    GTEST_UNSUPPORTED_DEATH_TEST(statement, regex, return)
+#endif
+
+}  // namespace testing
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,2495 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+//
+// The Google C++ Testing and Mocking Framework (Google Test)
+//
+// This header file defines the public API for Google Test.  It should be
+// included by any test program that uses Google Test.
+//
+// IMPORTANT NOTE: Due to limitation of the C++ language, we have to
+// leave some internal implementation details in this header file.
+// They are clearly marked by comments like this:
+//
+//   // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+//
+// Such code is NOT meant to be used by a user directly, and is subject
+// to CHANGE WITHOUT NOTICE.  Therefore DO NOT DEPEND ON IT in a user
+// program!
+//
+// Acknowledgment: Google Test borrowed the idea of automatic test
+// registration from Barthelemy Dagenais' (barthelemy@prologique.com)
+// easyUnit framework.
+
+// GOOGLETEST_CM0001 DO NOT DELETE
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_H_
+#define GOOGLETEST_INCLUDE_GTEST_GTEST_H_
+
+#include <cstddef>
+#include <limits>
+#include <memory>
+#include <ostream>
+#include <type_traits>
+#include <vector>
+
+#include "gtest/internal/gtest-internal.h"
+#include "gtest/internal/gtest-string.h"
+#include "gtest/gtest-death-test.h"
+#include "gtest/gtest-matchers.h"
+#include "gtest/gtest-message.h"
+#include "gtest/gtest-param-test.h"
+#include "gtest/gtest-printers.h"
+#include "gtest/gtest_prod.h"
+#include "gtest/gtest-test-part.h"
+#include "gtest/gtest-typed-test.h"
+
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
+/* class A needs to have dll-interface to be used by clients of class B */)
+
+namespace testing {
+
+// Silence C4100 (unreferenced formal parameter) and 4805
+// unsafe mix of type 'const int' and type 'const bool'
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable:4805)
+# pragma warning(disable:4100)
+#endif
+
+
+// Declares the flags.
+
+// This flag temporary enables the disabled tests.
+GTEST_DECLARE_bool_(also_run_disabled_tests);
+
+// This flag brings the debugger on an assertion failure.
+GTEST_DECLARE_bool_(break_on_failure);
+
+// This flag controls whether Google Test catches all test-thrown exceptions
+// and logs them as failures.
+GTEST_DECLARE_bool_(catch_exceptions);
+
+// This flag enables using colors in terminal output. Available values are
+// "yes" to enable colors, "no" (disable colors), or "auto" (the default)
+// to let Google Test decide.
+GTEST_DECLARE_string_(color);
+
+// This flag controls whether the test runner should continue execution past
+// first failure.
+GTEST_DECLARE_bool_(fail_fast);
+
+// This flag sets up the filter to select by name using a glob pattern
+// the tests to run. If the filter is not given all tests are executed.
+GTEST_DECLARE_string_(filter);
+
+// This flag controls whether Google Test installs a signal handler that dumps
+// debugging information when fatal signals are raised.
+GTEST_DECLARE_bool_(install_failure_signal_handler);
+
+// This flag causes the Google Test to list tests. None of the tests listed
+// are actually run if the flag is provided.
+GTEST_DECLARE_bool_(list_tests);
+
+// This flag controls whether Google Test emits a detailed XML report to a file
+// in addition to its normal textual output.
+GTEST_DECLARE_string_(output);
+
+// This flags control whether Google Test prints only test failures.
+GTEST_DECLARE_bool_(brief);
+
+// This flags control whether Google Test prints the elapsed time for each
+// test.
+GTEST_DECLARE_bool_(print_time);
+
+// This flags control whether Google Test prints UTF8 characters as text.
+GTEST_DECLARE_bool_(print_utf8);
+
+// This flag specifies the random number seed.
+GTEST_DECLARE_int32_(random_seed);
+
+// This flag sets how many times the tests are repeated. The default value
+// is 1. If the value is -1 the tests are repeating forever.
+GTEST_DECLARE_int32_(repeat);
+
+// This flag controls whether Google Test includes Google Test internal
+// stack frames in failure stack traces.
+GTEST_DECLARE_bool_(show_internal_stack_frames);
+
+// When this flag is specified, tests' order is randomized on every iteration.
+GTEST_DECLARE_bool_(shuffle);
+
+// This flag specifies the maximum number of stack frames to be
+// printed in a failure message.
+GTEST_DECLARE_int32_(stack_trace_depth);
+
+// When this flag is specified, a failed assertion will throw an
+// exception if exceptions are enabled, or exit the program with a
+// non-zero code otherwise. For use with an external test framework.
+GTEST_DECLARE_bool_(throw_on_failure);
+
+// When this flag is set with a "host:port" string, on supported
+// platforms test results are streamed to the specified port on
+// the specified host machine.
+GTEST_DECLARE_string_(stream_result_to);
+
+#if GTEST_USE_OWN_FLAGFILE_FLAG_
+GTEST_DECLARE_string_(flagfile);
+#endif  // GTEST_USE_OWN_FLAGFILE_FLAG_
+
+// The upper limit for valid stack trace depths.
+const int kMaxStackTraceDepth = 100;
+
+namespace internal {
+
+class AssertHelper;
+class DefaultGlobalTestPartResultReporter;
+class ExecDeathTest;
+class NoExecDeathTest;
+class FinalSuccessChecker;
+class GTestFlagSaver;
+class StreamingListenerTest;
+class TestResultAccessor;
+class TestEventListenersAccessor;
+class TestEventRepeater;
+class UnitTestRecordPropertyTestHelper;
+class WindowsDeathTest;
+class FuchsiaDeathTest;
+class UnitTestImpl* GetUnitTestImpl();
+void ReportFailureInUnknownLocation(TestPartResult::Type result_type,
+                                    const std::string& message);
+std::set<std::string>* GetIgnoredParameterizedTestSuites();
+
+}  // namespace internal
+
+// The friend relationship of some of these classes is cyclic.
+// If we don't forward declare them the compiler might confuse the classes
+// in friendship clauses with same named classes on the scope.
+class Test;
+class TestSuite;
+
+// Old API is still available but deprecated
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+using TestCase = TestSuite;
+#endif
+class TestInfo;
+class UnitTest;
+
+// A class for indicating whether an assertion was successful.  When
+// the assertion wasn't successful, the AssertionResult object
+// remembers a non-empty message that describes how it failed.
+//
+// To create an instance of this class, use one of the factory functions
+// (AssertionSuccess() and AssertionFailure()).
+//
+// This class is useful for two purposes:
+//   1. Defining predicate functions to be used with Boolean test assertions
+//      EXPECT_TRUE/EXPECT_FALSE and their ASSERT_ counterparts
+//   2. Defining predicate-format functions to be
+//      used with predicate assertions (ASSERT_PRED_FORMAT*, etc).
+//
+// For example, if you define IsEven predicate:
+//
+//   testing::AssertionResult IsEven(int n) {
+//     if ((n % 2) == 0)
+//       return testing::AssertionSuccess();
+//     else
+//       return testing::AssertionFailure() << n << " is odd";
+//   }
+//
+// Then the failed expectation EXPECT_TRUE(IsEven(Fib(5)))
+// will print the message
+//
+//   Value of: IsEven(Fib(5))
+//     Actual: false (5 is odd)
+//   Expected: true
+//
+// instead of a more opaque
+//
+//   Value of: IsEven(Fib(5))
+//     Actual: false
+//   Expected: true
+//
+// in case IsEven is a simple Boolean predicate.
+//
+// If you expect your predicate to be reused and want to support informative
+// messages in EXPECT_FALSE and ASSERT_FALSE (negative assertions show up
+// about half as often as positive ones in our tests), supply messages for
+// both success and failure cases:
+//
+//   testing::AssertionResult IsEven(int n) {
+//     if ((n % 2) == 0)
+//       return testing::AssertionSuccess() << n << " is even";
+//     else
+//       return testing::AssertionFailure() << n << " is odd";
+//   }
+//
+// Then a statement EXPECT_FALSE(IsEven(Fib(6))) will print
+//
+//   Value of: IsEven(Fib(6))
+//     Actual: true (8 is even)
+//   Expected: false
+//
+// NB: Predicates that support negative Boolean assertions have reduced
+// performance in positive ones so be careful not to use them in tests
+// that have lots (tens of thousands) of positive Boolean assertions.
+//
+// To use this class with EXPECT_PRED_FORMAT assertions such as:
+//
+//   // Verifies that Foo() returns an even number.
+//   EXPECT_PRED_FORMAT1(IsEven, Foo());
+//
+// you need to define:
+//
+//   testing::AssertionResult IsEven(const char* expr, int n) {
+//     if ((n % 2) == 0)
+//       return testing::AssertionSuccess();
+//     else
+//       return testing::AssertionFailure()
+//         << "Expected: " << expr << " is even\n  Actual: it's " << n;
+//   }
+//
+// If Foo() returns 5, you will see the following message:
+//
+//   Expected: Foo() is even
+//     Actual: it's 5
+//
+class GTEST_API_ AssertionResult {
+ public:
+  // Copy constructor.
+  // Used in EXPECT_TRUE/FALSE(assertion_result).
+  AssertionResult(const AssertionResult& other);
+
+// C4800 is a level 3 warning in Visual Studio 2015 and earlier.
+// This warning is not emitted in Visual Studio 2017.
+// This warning is off by default starting in Visual Studio 2019 but can be
+// enabled with command-line options.
+#if defined(_MSC_VER) && (_MSC_VER < 1910 || _MSC_VER >= 1920)
+  GTEST_DISABLE_MSC_WARNINGS_PUSH_(4800 /* forcing value to bool */)
+#endif
+
+  // Used in the EXPECT_TRUE/FALSE(bool_expression).
+  //
+  // T must be contextually convertible to bool.
+  //
+  // The second parameter prevents this overload from being considered if
+  // the argument is implicitly convertible to AssertionResult. In that case
+  // we want AssertionResult's copy constructor to be used.
+  template <typename T>
+  explicit AssertionResult(
+      const T& success,
+      typename std::enable_if<
+          !std::is_convertible<T, AssertionResult>::value>::type*
+      /*enabler*/
+      = nullptr)
+      : success_(success) {}
+
+#if defined(_MSC_VER) && (_MSC_VER < 1910 || _MSC_VER >= 1920)
+  GTEST_DISABLE_MSC_WARNINGS_POP_()
+#endif
+
+  // Assignment operator.
+  AssertionResult& operator=(AssertionResult other) {
+    swap(other);
+    return *this;
+  }
+
+  // Returns true if and only if the assertion succeeded.
+  operator bool() const { return success_; }  // NOLINT
+
+  // Returns the assertion's negation. Used with EXPECT/ASSERT_FALSE.
+  AssertionResult operator!() const;
+
+  // Returns the text streamed into this AssertionResult. Test assertions
+  // use it when they fail (i.e., the predicate's outcome doesn't match the
+  // assertion's expectation). When nothing has been streamed into the
+  // object, returns an empty string.
+  const char* message() const {
+    return message_.get() != nullptr ? message_->c_str() : "";
+  }
+  // Deprecated; please use message() instead.
+  const char* failure_message() const { return message(); }
+
+  // Streams a custom failure message into this object.
+  template <typename T> AssertionResult& operator<<(const T& value) {
+    AppendMessage(Message() << value);
+    return *this;
+  }
+
+  // Allows streaming basic output manipulators such as endl or flush into
+  // this object.
+  AssertionResult& operator<<(
+      ::std::ostream& (*basic_manipulator)(::std::ostream& stream)) {
+    AppendMessage(Message() << basic_manipulator);
+    return *this;
+  }
+
+ private:
+  // Appends the contents of message to message_.
+  void AppendMessage(const Message& a_message) {
+    if (message_.get() == nullptr) message_.reset(new ::std::string);
+    message_->append(a_message.GetString().c_str());
+  }
+
+  // Swap the contents of this AssertionResult with other.
+  void swap(AssertionResult& other);
+
+  // Stores result of the assertion predicate.
+  bool success_;
+  // Stores the message describing the condition in case the expectation
+  // construct is not satisfied with the predicate's outcome.
+  // Referenced via a pointer to avoid taking too much stack frame space
+  // with test assertions.
+  std::unique_ptr< ::std::string> message_;
+};
+
+// Makes a successful assertion result.
+GTEST_API_ AssertionResult AssertionSuccess();
+
+// Makes a failed assertion result.
+GTEST_API_ AssertionResult AssertionFailure();
+
+// Makes a failed assertion result with the given failure message.
+// Deprecated; use AssertionFailure() << msg.
+GTEST_API_ AssertionResult AssertionFailure(const Message& msg);
+
+}  // namespace testing
+
+// Includes the auto-generated header that implements a family of generic
+// predicate assertion macros. This include comes late because it relies on
+// APIs declared above.
+#include "gtest/gtest_pred_impl.h"
+
+namespace testing {
+
+// The abstract class that all tests inherit from.
+//
+// In Google Test, a unit test program contains one or many TestSuites, and
+// each TestSuite contains one or many Tests.
+//
+// When you define a test using the TEST macro, you don't need to
+// explicitly derive from Test - the TEST macro automatically does
+// this for you.
+//
+// The only time you derive from Test is when defining a test fixture
+// to be used in a TEST_F.  For example:
+//
+//   class FooTest : public testing::Test {
+//    protected:
+//     void SetUp() override { ... }
+//     void TearDown() override { ... }
+//     ...
+//   };
+//
+//   TEST_F(FooTest, Bar) { ... }
+//   TEST_F(FooTest, Baz) { ... }
+//
+// Test is not copyable.
+class GTEST_API_ Test {
+ public:
+  friend class TestInfo;
+
+  // The d'tor is virtual as we intend to inherit from Test.
+  virtual ~Test();
+
+  // Sets up the stuff shared by all tests in this test suite.
+  //
+  // Google Test will call Foo::SetUpTestSuite() before running the first
+  // test in test suite Foo.  Hence a sub-class can define its own
+  // SetUpTestSuite() method to shadow the one defined in the super
+  // class.
+  static void SetUpTestSuite() {}
+
+  // Tears down the stuff shared by all tests in this test suite.
+  //
+  // Google Test will call Foo::TearDownTestSuite() after running the last
+  // test in test suite Foo.  Hence a sub-class can define its own
+  // TearDownTestSuite() method to shadow the one defined in the super
+  // class.
+  static void TearDownTestSuite() {}
+
+  // Legacy API is deprecated but still available. Use SetUpTestSuite and
+  // TearDownTestSuite instead.
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  static void TearDownTestCase() {}
+  static void SetUpTestCase() {}
+#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+  // Returns true if and only if the current test has a fatal failure.
+  static bool HasFatalFailure();
+
+  // Returns true if and only if the current test has a non-fatal failure.
+  static bool HasNonfatalFailure();
+
+  // Returns true if and only if the current test was skipped.
+  static bool IsSkipped();
+
+  // Returns true if and only if the current test has a (either fatal or
+  // non-fatal) failure.
+  static bool HasFailure() { return HasFatalFailure() || HasNonfatalFailure(); }
+
+  // Logs a property for the current test, test suite, or for the entire
+  // invocation of the test program when used outside of the context of a
+  // test suite.  Only the last value for a given key is remembered.  These
+  // are public static so they can be called from utility functions that are
+  // not members of the test fixture.  Calls to RecordProperty made during
+  // lifespan of the test (from the moment its constructor starts to the
+  // moment its destructor finishes) will be output in XML as attributes of
+  // the <testcase> element.  Properties recorded from fixture's
+  // SetUpTestSuite or TearDownTestSuite are logged as attributes of the
+  // corresponding <testsuite> element.  Calls to RecordProperty made in the
+  // global context (before or after invocation of RUN_ALL_TESTS and from
+  // SetUp/TearDown method of Environment objects registered with Google
+  // Test) will be output as attributes of the <testsuites> element.
+  static void RecordProperty(const std::string& key, const std::string& value);
+  static void RecordProperty(const std::string& key, int value);
+
+ protected:
+  // Creates a Test object.
+  Test();
+
+  // Sets up the test fixture.
+  virtual void SetUp();
+
+  // Tears down the test fixture.
+  virtual void TearDown();
+
+ private:
+  // Returns true if and only if the current test has the same fixture class
+  // as the first test in the current test suite.
+  static bool HasSameFixtureClass();
+
+  // Runs the test after the test fixture has been set up.
+  //
+  // A sub-class must implement this to define the test logic.
+  //
+  // DO NOT OVERRIDE THIS FUNCTION DIRECTLY IN A USER PROGRAM.
+  // Instead, use the TEST or TEST_F macro.
+  virtual void TestBody() = 0;
+
+  // Sets up, executes, and tears down the test.
+  void Run();
+
+  // Deletes self.  We deliberately pick an unusual name for this
+  // internal method to avoid clashing with names used in user TESTs.
+  void DeleteSelf_() { delete this; }
+
+  const std::unique_ptr<GTEST_FLAG_SAVER_> gtest_flag_saver_;
+
+  // Often a user misspells SetUp() as Setup() and spends a long time
+  // wondering why it is never called by Google Test.  The declaration of
+  // the following method is solely for catching such an error at
+  // compile time:
+  //
+  //   - The return type is deliberately chosen to be not void, so it
+  //   will be a conflict if void Setup() is declared in the user's
+  //   test fixture.
+  //
+  //   - This method is private, so it will be another compiler error
+  //   if the method is called from the user's test fixture.
+  //
+  // DO NOT OVERRIDE THIS FUNCTION.
+  //
+  // If you see an error about overriding the following function or
+  // about it being private, you have mis-spelled SetUp() as Setup().
+  struct Setup_should_be_spelled_SetUp {};
+  virtual Setup_should_be_spelled_SetUp* Setup() { return nullptr; }
+
+  // We disallow copying Tests.
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(Test);
+};
+
+typedef internal::TimeInMillis TimeInMillis;
+
+// A copyable object representing a user specified test property which can be
+// output as a key/value string pair.
+//
+// Don't inherit from TestProperty as its destructor is not virtual.
+class TestProperty {
+ public:
+  // C'tor.  TestProperty does NOT have a default constructor.
+  // Always use this constructor (with parameters) to create a
+  // TestProperty object.
+  TestProperty(const std::string& a_key, const std::string& a_value) :
+    key_(a_key), value_(a_value) {
+  }
+
+  // Gets the user supplied key.
+  const char* key() const {
+    return key_.c_str();
+  }
+
+  // Gets the user supplied value.
+  const char* value() const {
+    return value_.c_str();
+  }
+
+  // Sets a new value, overriding the one supplied in the constructor.
+  void SetValue(const std::string& new_value) {
+    value_ = new_value;
+  }
+
+ private:
+  // The key supplied by the user.
+  std::string key_;
+  // The value supplied by the user.
+  std::string value_;
+};
+
+// The result of a single Test.  This includes a list of
+// TestPartResults, a list of TestProperties, a count of how many
+// death tests there are in the Test, and how much time it took to run
+// the Test.
+//
+// TestResult is not copyable.
+class GTEST_API_ TestResult {
+ public:
+  // Creates an empty TestResult.
+  TestResult();
+
+  // D'tor.  Do not inherit from TestResult.
+  ~TestResult();
+
+  // Gets the number of all test parts.  This is the sum of the number
+  // of successful test parts and the number of failed test parts.
+  int total_part_count() const;
+
+  // Returns the number of the test properties.
+  int test_property_count() const;
+
+  // Returns true if and only if the test passed (i.e. no test part failed).
+  bool Passed() const { return !Skipped() && !Failed(); }
+
+  // Returns true if and only if the test was skipped.
+  bool Skipped() const;
+
+  // Returns true if and only if the test failed.
+  bool Failed() const;
+
+  // Returns true if and only if the test fatally failed.
+  bool HasFatalFailure() const;
+
+  // Returns true if and only if the test has a non-fatal failure.
+  bool HasNonfatalFailure() const;
+
+  // Returns the elapsed time, in milliseconds.
+  TimeInMillis elapsed_time() const { return elapsed_time_; }
+
+  // Gets the time of the test case start, in ms from the start of the
+  // UNIX epoch.
+  TimeInMillis start_timestamp() const { return start_timestamp_; }
+
+  // Returns the i-th test part result among all the results. i can range from 0
+  // to total_part_count() - 1. If i is not in that range, aborts the program.
+  const TestPartResult& GetTestPartResult(int i) const;
+
+  // Returns the i-th test property. i can range from 0 to
+  // test_property_count() - 1. If i is not in that range, aborts the
+  // program.
+  const TestProperty& GetTestProperty(int i) const;
+
+ private:
+  friend class TestInfo;
+  friend class TestSuite;
+  friend class UnitTest;
+  friend class internal::DefaultGlobalTestPartResultReporter;
+  friend class internal::ExecDeathTest;
+  friend class internal::TestResultAccessor;
+  friend class internal::UnitTestImpl;
+  friend class internal::WindowsDeathTest;
+  friend class internal::FuchsiaDeathTest;
+
+  // Gets the vector of TestPartResults.
+  const std::vector<TestPartResult>& test_part_results() const {
+    return test_part_results_;
+  }
+
+  // Gets the vector of TestProperties.
+  const std::vector<TestProperty>& test_properties() const {
+    return test_properties_;
+  }
+
+  // Sets the start time.
+  void set_start_timestamp(TimeInMillis start) { start_timestamp_ = start; }
+
+  // Sets the elapsed time.
+  void set_elapsed_time(TimeInMillis elapsed) { elapsed_time_ = elapsed; }
+
+  // Adds a test property to the list. The property is validated and may add
+  // a non-fatal failure if invalid (e.g., if it conflicts with reserved
+  // key names). If a property is already recorded for the same key, the
+  // value will be updated, rather than storing multiple values for the same
+  // key.  xml_element specifies the element for which the property is being
+  // recorded and is used for validation.
+  void RecordProperty(const std::string& xml_element,
+                      const TestProperty& test_property);
+
+  // Adds a failure if the key is a reserved attribute of Google Test
+  // testsuite tags.  Returns true if the property is valid.
+  // FIXME: Validate attribute names are legal and human readable.
+  static bool ValidateTestProperty(const std::string& xml_element,
+                                   const TestProperty& test_property);
+
+  // Adds a test part result to the list.
+  void AddTestPartResult(const TestPartResult& test_part_result);
+
+  // Returns the death test count.
+  int death_test_count() const { return death_test_count_; }
+
+  // Increments the death test count, returning the new count.
+  int increment_death_test_count() { return ++death_test_count_; }
+
+  // Clears the test part results.
+  void ClearTestPartResults();
+
+  // Clears the object.
+  void Clear();
+
+  // Protects mutable state of the property vector and of owned
+  // properties, whose values may be updated.
+  internal::Mutex test_properties_mutex_;
+
+  // The vector of TestPartResults
+  std::vector<TestPartResult> test_part_results_;
+  // The vector of TestProperties
+  std::vector<TestProperty> test_properties_;
+  // Running count of death tests.
+  int death_test_count_;
+  // The start time, in milliseconds since UNIX Epoch.
+  TimeInMillis start_timestamp_;
+  // The elapsed time, in milliseconds.
+  TimeInMillis elapsed_time_;
+
+  // We disallow copying TestResult.
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestResult);
+};  // class TestResult
+
+// A TestInfo object stores the following information about a test:
+//
+//   Test suite name
+//   Test name
+//   Whether the test should be run
+//   A function pointer that creates the test object when invoked
+//   Test result
+//
+// The constructor of TestInfo registers itself with the UnitTest
+// singleton such that the RUN_ALL_TESTS() macro knows which tests to
+// run.
+class GTEST_API_ TestInfo {
+ public:
+  // Destructs a TestInfo object.  This function is not virtual, so
+  // don't inherit from TestInfo.
+  ~TestInfo();
+
+  // Returns the test suite name.
+  const char* test_suite_name() const { return test_suite_name_.c_str(); }
+
+// Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  const char* test_case_name() const { return test_suite_name(); }
+#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+  // Returns the test name.
+  const char* name() const { return name_.c_str(); }
+
+  // Returns the name of the parameter type, or NULL if this is not a typed
+  // or a type-parameterized test.
+  const char* type_param() const {
+    if (type_param_.get() != nullptr) return type_param_->c_str();
+    return nullptr;
+  }
+
+  // Returns the text representation of the value parameter, or NULL if this
+  // is not a value-parameterized test.
+  const char* value_param() const {
+    if (value_param_.get() != nullptr) return value_param_->c_str();
+    return nullptr;
+  }
+
+  // Returns the file name where this test is defined.
+  const char* file() const { return location_.file.c_str(); }
+
+  // Returns the line where this test is defined.
+  int line() const { return location_.line; }
+
+  // Return true if this test should not be run because it's in another shard.
+  bool is_in_another_shard() const { return is_in_another_shard_; }
+
+  // Returns true if this test should run, that is if the test is not
+  // disabled (or it is disabled but the also_run_disabled_tests flag has
+  // been specified) and its full name matches the user-specified filter.
+  //
+  // Google Test allows the user to filter the tests by their full names.
+  // The full name of a test Bar in test suite Foo is defined as
+  // "Foo.Bar".  Only the tests that match the filter will run.
+  //
+  // A filter is a colon-separated list of glob (not regex) patterns,
+  // optionally followed by a '-' and a colon-separated list of
+  // negative patterns (tests to exclude).  A test is run if it
+  // matches one of the positive patterns and does not match any of
+  // the negative patterns.
+  //
+  // For example, *A*:Foo.* is a filter that matches any string that
+  // contains the character 'A' or starts with "Foo.".
+  bool should_run() const { return should_run_; }
+
+  // Returns true if and only if this test will appear in the XML report.
+  bool is_reportable() const {
+    // The XML report includes tests matching the filter, excluding those
+    // run in other shards.
+    return matches_filter_ && !is_in_another_shard_;
+  }
+
+  // Returns the result of the test.
+  const TestResult* result() const { return &result_; }
+
+ private:
+#if GTEST_HAS_DEATH_TEST
+  friend class internal::DefaultDeathTestFactory;
+#endif  // GTEST_HAS_DEATH_TEST
+  friend class Test;
+  friend class TestSuite;
+  friend class internal::UnitTestImpl;
+  friend class internal::StreamingListenerTest;
+  friend TestInfo* internal::MakeAndRegisterTestInfo(
+      const char* test_suite_name, const char* name, const char* type_param,
+      const char* value_param, internal::CodeLocation code_location,
+      internal::TypeId fixture_class_id, internal::SetUpTestSuiteFunc set_up_tc,
+      internal::TearDownTestSuiteFunc tear_down_tc,
+      internal::TestFactoryBase* factory);
+
+  // Constructs a TestInfo object. The newly constructed instance assumes
+  // ownership of the factory object.
+  TestInfo(const std::string& test_suite_name, const std::string& name,
+           const char* a_type_param,   // NULL if not a type-parameterized test
+           const char* a_value_param,  // NULL if not a value-parameterized test
+           internal::CodeLocation a_code_location,
+           internal::TypeId fixture_class_id,
+           internal::TestFactoryBase* factory);
+
+  // Increments the number of death tests encountered in this test so
+  // far.
+  int increment_death_test_count() {
+    return result_.increment_death_test_count();
+  }
+
+  // Creates the test object, runs it, records its result, and then
+  // deletes it.
+  void Run();
+
+  // Skip and records the test result for this object.
+  void Skip();
+
+  static void ClearTestResult(TestInfo* test_info) {
+    test_info->result_.Clear();
+  }
+
+  // These fields are immutable properties of the test.
+  const std::string test_suite_name_;    // test suite name
+  const std::string name_;               // Test name
+  // Name of the parameter type, or NULL if this is not a typed or a
+  // type-parameterized test.
+  const std::unique_ptr<const ::std::string> type_param_;
+  // Text representation of the value parameter, or NULL if this is not a
+  // value-parameterized test.
+  const std::unique_ptr<const ::std::string> value_param_;
+  internal::CodeLocation location_;
+  const internal::TypeId fixture_class_id_;  // ID of the test fixture class
+  bool should_run_;           // True if and only if this test should run
+  bool is_disabled_;          // True if and only if this test is disabled
+  bool matches_filter_;       // True if this test matches the
+                              // user-specified filter.
+  bool is_in_another_shard_;  // Will be run in another shard.
+  internal::TestFactoryBase* const factory_;  // The factory that creates
+                                              // the test object
+
+  // This field is mutable and needs to be reset before running the
+  // test for the second time.
+  TestResult result_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestInfo);
+};
+
+// A test suite, which consists of a vector of TestInfos.
+//
+// TestSuite is not copyable.
+class GTEST_API_ TestSuite {
+ public:
+  // Creates a TestSuite with the given name.
+  //
+  // TestSuite does NOT have a default constructor.  Always use this
+  // constructor to create a TestSuite object.
+  //
+  // Arguments:
+  //
+  //   name:         name of the test suite
+  //   a_type_param: the name of the test's type parameter, or NULL if
+  //                 this is not a type-parameterized test.
+  //   set_up_tc:    pointer to the function that sets up the test suite
+  //   tear_down_tc: pointer to the function that tears down the test suite
+  TestSuite(const char* name, const char* a_type_param,
+            internal::SetUpTestSuiteFunc set_up_tc,
+            internal::TearDownTestSuiteFunc tear_down_tc);
+
+  // Destructor of TestSuite.
+  virtual ~TestSuite();
+
+  // Gets the name of the TestSuite.
+  const char* name() const { return name_.c_str(); }
+
+  // Returns the name of the parameter type, or NULL if this is not a
+  // type-parameterized test suite.
+  const char* type_param() const {
+    if (type_param_.get() != nullptr) return type_param_->c_str();
+    return nullptr;
+  }
+
+  // Returns true if any test in this test suite should run.
+  bool should_run() const { return should_run_; }
+
+  // Gets the number of successful tests in this test suite.
+  int successful_test_count() const;
+
+  // Gets the number of skipped tests in this test suite.
+  int skipped_test_count() const;
+
+  // Gets the number of failed tests in this test suite.
+  int failed_test_count() const;
+
+  // Gets the number of disabled tests that will be reported in the XML report.
+  int reportable_disabled_test_count() const;
+
+  // Gets the number of disabled tests in this test suite.
+  int disabled_test_count() const;
+
+  // Gets the number of tests to be printed in the XML report.
+  int reportable_test_count() const;
+
+  // Get the number of tests in this test suite that should run.
+  int test_to_run_count() const;
+
+  // Gets the number of all tests in this test suite.
+  int total_test_count() const;
+
+  // Returns true if and only if the test suite passed.
+  bool Passed() const { return !Failed(); }
+
+  // Returns true if and only if the test suite failed.
+  bool Failed() const {
+    return failed_test_count() > 0 || ad_hoc_test_result().Failed();
+  }
+
+  // Returns the elapsed time, in milliseconds.
+  TimeInMillis elapsed_time() const { return elapsed_time_; }
+
+  // Gets the time of the test suite start, in ms from the start of the
+  // UNIX epoch.
+  TimeInMillis start_timestamp() const { return start_timestamp_; }
+
+  // Returns the i-th test among all the tests. i can range from 0 to
+  // total_test_count() - 1. If i is not in that range, returns NULL.
+  const TestInfo* GetTestInfo(int i) const;
+
+  // Returns the TestResult that holds test properties recorded during
+  // execution of SetUpTestSuite and TearDownTestSuite.
+  const TestResult& ad_hoc_test_result() const { return ad_hoc_test_result_; }
+
+ private:
+  friend class Test;
+  friend class internal::UnitTestImpl;
+
+  // Gets the (mutable) vector of TestInfos in this TestSuite.
+  std::vector<TestInfo*>& test_info_list() { return test_info_list_; }
+
+  // Gets the (immutable) vector of TestInfos in this TestSuite.
+  const std::vector<TestInfo*>& test_info_list() const {
+    return test_info_list_;
+  }
+
+  // Returns the i-th test among all the tests. i can range from 0 to
+  // total_test_count() - 1. If i is not in that range, returns NULL.
+  TestInfo* GetMutableTestInfo(int i);
+
+  // Sets the should_run member.
+  void set_should_run(bool should) { should_run_ = should; }
+
+  // Adds a TestInfo to this test suite.  Will delete the TestInfo upon
+  // destruction of the TestSuite object.
+  void AddTestInfo(TestInfo * test_info);
+
+  // Clears the results of all tests in this test suite.
+  void ClearResult();
+
+  // Clears the results of all tests in the given test suite.
+  static void ClearTestSuiteResult(TestSuite* test_suite) {
+    test_suite->ClearResult();
+  }
+
+  // Runs every test in this TestSuite.
+  void Run();
+
+  // Skips the execution of tests under this TestSuite
+  void Skip();
+
+  // Runs SetUpTestSuite() for this TestSuite.  This wrapper is needed
+  // for catching exceptions thrown from SetUpTestSuite().
+  void RunSetUpTestSuite() {
+    if (set_up_tc_ != nullptr) {
+      (*set_up_tc_)();
+    }
+  }
+
+  // Runs TearDownTestSuite() for this TestSuite.  This wrapper is
+  // needed for catching exceptions thrown from TearDownTestSuite().
+  void RunTearDownTestSuite() {
+    if (tear_down_tc_ != nullptr) {
+      (*tear_down_tc_)();
+    }
+  }
+
+  // Returns true if and only if test passed.
+  static bool TestPassed(const TestInfo* test_info) {
+    return test_info->should_run() && test_info->result()->Passed();
+  }
+
+  // Returns true if and only if test skipped.
+  static bool TestSkipped(const TestInfo* test_info) {
+    return test_info->should_run() && test_info->result()->Skipped();
+  }
+
+  // Returns true if and only if test failed.
+  static bool TestFailed(const TestInfo* test_info) {
+    return test_info->should_run() && test_info->result()->Failed();
+  }
+
+  // Returns true if and only if the test is disabled and will be reported in
+  // the XML report.
+  static bool TestReportableDisabled(const TestInfo* test_info) {
+    return test_info->is_reportable() && test_info->is_disabled_;
+  }
+
+  // Returns true if and only if test is disabled.
+  static bool TestDisabled(const TestInfo* test_info) {
+    return test_info->is_disabled_;
+  }
+
+  // Returns true if and only if this test will appear in the XML report.
+  static bool TestReportable(const TestInfo* test_info) {
+    return test_info->is_reportable();
+  }
+
+  // Returns true if the given test should run.
+  static bool ShouldRunTest(const TestInfo* test_info) {
+    return test_info->should_run();
+  }
+
+  // Shuffles the tests in this test suite.
+  void ShuffleTests(internal::Random* random);
+
+  // Restores the test order to before the first shuffle.
+  void UnshuffleTests();
+
+  // Name of the test suite.
+  std::string name_;
+  // Name of the parameter type, or NULL if this is not a typed or a
+  // type-parameterized test.
+  const std::unique_ptr<const ::std::string> type_param_;
+  // The vector of TestInfos in their original order.  It owns the
+  // elements in the vector.
+  std::vector<TestInfo*> test_info_list_;
+  // Provides a level of indirection for the test list to allow easy
+  // shuffling and restoring the test order.  The i-th element in this
+  // vector is the index of the i-th test in the shuffled test list.
+  std::vector<int> test_indices_;
+  // Pointer to the function that sets up the test suite.
+  internal::SetUpTestSuiteFunc set_up_tc_;
+  // Pointer to the function that tears down the test suite.
+  internal::TearDownTestSuiteFunc tear_down_tc_;
+  // True if and only if any test in this test suite should run.
+  bool should_run_;
+  // The start time, in milliseconds since UNIX Epoch.
+  TimeInMillis start_timestamp_;
+  // Elapsed time, in milliseconds.
+  TimeInMillis elapsed_time_;
+  // Holds test properties recorded during execution of SetUpTestSuite and
+  // TearDownTestSuite.
+  TestResult ad_hoc_test_result_;
+
+  // We disallow copying TestSuites.
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestSuite);
+};
+
+// An Environment object is capable of setting up and tearing down an
+// environment.  You should subclass this to define your own
+// environment(s).
+//
+// An Environment object does the set-up and tear-down in virtual
+// methods SetUp() and TearDown() instead of the constructor and the
+// destructor, as:
+//
+//   1. You cannot safely throw from a destructor.  This is a problem
+//      as in some cases Google Test is used where exceptions are enabled, and
+//      we may want to implement ASSERT_* using exceptions where they are
+//      available.
+//   2. You cannot use ASSERT_* directly in a constructor or
+//      destructor.
+class Environment {
+ public:
+  // The d'tor is virtual as we need to subclass Environment.
+  virtual ~Environment() {}
+
+  // Override this to define how to set up the environment.
+  virtual void SetUp() {}
+
+  // Override this to define how to tear down the environment.
+  virtual void TearDown() {}
+ private:
+  // If you see an error about overriding the following function or
+  // about it being private, you have mis-spelled SetUp() as Setup().
+  struct Setup_should_be_spelled_SetUp {};
+  virtual Setup_should_be_spelled_SetUp* Setup() { return nullptr; }
+};
+
+#if GTEST_HAS_EXCEPTIONS
+
+// Exception which can be thrown from TestEventListener::OnTestPartResult.
+class GTEST_API_ AssertionException
+    : public internal::GoogleTestFailureException {
+ public:
+  explicit AssertionException(const TestPartResult& result)
+      : GoogleTestFailureException(result) {}
+};
+
+#endif  // GTEST_HAS_EXCEPTIONS
+
+// The interface for tracing execution of tests. The methods are organized in
+// the order the corresponding events are fired.
+class TestEventListener {
+ public:
+  virtual ~TestEventListener() {}
+
+  // Fired before any test activity starts.
+  virtual void OnTestProgramStart(const UnitTest& unit_test) = 0;
+
+  // Fired before each iteration of tests starts.  There may be more than
+  // one iteration if GTEST_FLAG(repeat) is set. iteration is the iteration
+  // index, starting from 0.
+  virtual void OnTestIterationStart(const UnitTest& unit_test,
+                                    int iteration) = 0;
+
+  // Fired before environment set-up for each iteration of tests starts.
+  virtual void OnEnvironmentsSetUpStart(const UnitTest& unit_test) = 0;
+
+  // Fired after environment set-up for each iteration of tests ends.
+  virtual void OnEnvironmentsSetUpEnd(const UnitTest& unit_test) = 0;
+
+  // Fired before the test suite starts.
+  virtual void OnTestSuiteStart(const TestSuite& /*test_suite*/) {}
+
+  //  Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  virtual void OnTestCaseStart(const TestCase& /*test_case*/) {}
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+  // Fired before the test starts.
+  virtual void OnTestStart(const TestInfo& test_info) = 0;
+
+  // Fired after a failed assertion or a SUCCEED() invocation.
+  // If you want to throw an exception from this function to skip to the next
+  // TEST, it must be AssertionException defined above, or inherited from it.
+  virtual void OnTestPartResult(const TestPartResult& test_part_result) = 0;
+
+  // Fired after the test ends.
+  virtual void OnTestEnd(const TestInfo& test_info) = 0;
+
+  // Fired after the test suite ends.
+  virtual void OnTestSuiteEnd(const TestSuite& /*test_suite*/) {}
+
+//  Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  virtual void OnTestCaseEnd(const TestCase& /*test_case*/) {}
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+  // Fired before environment tear-down for each iteration of tests starts.
+  virtual void OnEnvironmentsTearDownStart(const UnitTest& unit_test) = 0;
+
+  // Fired after environment tear-down for each iteration of tests ends.
+  virtual void OnEnvironmentsTearDownEnd(const UnitTest& unit_test) = 0;
+
+  // Fired after each iteration of tests finishes.
+  virtual void OnTestIterationEnd(const UnitTest& unit_test,
+                                  int iteration) = 0;
+
+  // Fired after all test activities have ended.
+  virtual void OnTestProgramEnd(const UnitTest& unit_test) = 0;
+};
+
+// The convenience class for users who need to override just one or two
+// methods and are not concerned that a possible change to a signature of
+// the methods they override will not be caught during the build.  For
+// comments about each method please see the definition of TestEventListener
+// above.
+class EmptyTestEventListener : public TestEventListener {
+ public:
+  void OnTestProgramStart(const UnitTest& /*unit_test*/) override {}
+  void OnTestIterationStart(const UnitTest& /*unit_test*/,
+                            int /*iteration*/) override {}
+  void OnEnvironmentsSetUpStart(const UnitTest& /*unit_test*/) override {}
+  void OnEnvironmentsSetUpEnd(const UnitTest& /*unit_test*/) override {}
+  void OnTestSuiteStart(const TestSuite& /*test_suite*/) override {}
+//  Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  void OnTestCaseStart(const TestCase& /*test_case*/) override {}
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+  void OnTestStart(const TestInfo& /*test_info*/) override {}
+  void OnTestPartResult(const TestPartResult& /*test_part_result*/) override {}
+  void OnTestEnd(const TestInfo& /*test_info*/) override {}
+  void OnTestSuiteEnd(const TestSuite& /*test_suite*/) override {}
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  void OnTestCaseEnd(const TestCase& /*test_case*/) override {}
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+  void OnEnvironmentsTearDownStart(const UnitTest& /*unit_test*/) override {}
+  void OnEnvironmentsTearDownEnd(const UnitTest& /*unit_test*/) override {}
+  void OnTestIterationEnd(const UnitTest& /*unit_test*/,
+                          int /*iteration*/) override {}
+  void OnTestProgramEnd(const UnitTest& /*unit_test*/) override {}
+};
+
+// TestEventListeners lets users add listeners to track events in Google Test.
+class GTEST_API_ TestEventListeners {
+ public:
+  TestEventListeners();
+  ~TestEventListeners();
+
+  // Appends an event listener to the end of the list. Google Test assumes
+  // the ownership of the listener (i.e. it will delete the listener when
+  // the test program finishes).
+  void Append(TestEventListener* listener);
+
+  // Removes the given event listener from the list and returns it.  It then
+  // becomes the caller's responsibility to delete the listener. Returns
+  // NULL if the listener is not found in the list.
+  TestEventListener* Release(TestEventListener* listener);
+
+  // Returns the standard listener responsible for the default console
+  // output.  Can be removed from the listeners list to shut down default
+  // console output.  Note that removing this object from the listener list
+  // with Release transfers its ownership to the caller and makes this
+  // function return NULL the next time.
+  TestEventListener* default_result_printer() const {
+    return default_result_printer_;
+  }
+
+  // Returns the standard listener responsible for the default XML output
+  // controlled by the --gtest_output=xml flag.  Can be removed from the
+  // listeners list by users who want to shut down the default XML output
+  // controlled by this flag and substitute it with custom one.  Note that
+  // removing this object from the listener list with Release transfers its
+  // ownership to the caller and makes this function return NULL the next
+  // time.
+  TestEventListener* default_xml_generator() const {
+    return default_xml_generator_;
+  }
+
+ private:
+  friend class TestSuite;
+  friend class TestInfo;
+  friend class internal::DefaultGlobalTestPartResultReporter;
+  friend class internal::NoExecDeathTest;
+  friend class internal::TestEventListenersAccessor;
+  friend class internal::UnitTestImpl;
+
+  // Returns repeater that broadcasts the TestEventListener events to all
+  // subscribers.
+  TestEventListener* repeater();
+
+  // Sets the default_result_printer attribute to the provided listener.
+  // The listener is also added to the listener list and previous
+  // default_result_printer is removed from it and deleted. The listener can
+  // also be NULL in which case it will not be added to the list. Does
+  // nothing if the previous and the current listener objects are the same.
+  void SetDefaultResultPrinter(TestEventListener* listener);
+
+  // Sets the default_xml_generator attribute to the provided listener.  The
+  // listener is also added to the listener list and previous
+  // default_xml_generator is removed from it and deleted. The listener can
+  // also be NULL in which case it will not be added to the list. Does
+  // nothing if the previous and the current listener objects are the same.
+  void SetDefaultXmlGenerator(TestEventListener* listener);
+
+  // Controls whether events will be forwarded by the repeater to the
+  // listeners in the list.
+  bool EventForwardingEnabled() const;
+  void SuppressEventForwarding();
+
+  // The actual list of listeners.
+  internal::TestEventRepeater* repeater_;
+  // Listener responsible for the standard result output.
+  TestEventListener* default_result_printer_;
+  // Listener responsible for the creation of the XML output file.
+  TestEventListener* default_xml_generator_;
+
+  // We disallow copying TestEventListeners.
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestEventListeners);
+};
+
+// A UnitTest consists of a vector of TestSuites.
+//
+// This is a singleton class.  The only instance of UnitTest is
+// created when UnitTest::GetInstance() is first called.  This
+// instance is never deleted.
+//
+// UnitTest is not copyable.
+//
+// This class is thread-safe as long as the methods are called
+// according to their specification.
+class GTEST_API_ UnitTest {
+ public:
+  // Gets the singleton UnitTest object.  The first time this method
+  // is called, a UnitTest object is constructed and returned.
+  // Consecutive calls will return the same object.
+  static UnitTest* GetInstance();
+
+  // Runs all tests in this UnitTest object and prints the result.
+  // Returns 0 if successful, or 1 otherwise.
+  //
+  // This method can only be called from the main thread.
+  //
+  // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+  int Run() GTEST_MUST_USE_RESULT_;
+
+  // Returns the working directory when the first TEST() or TEST_F()
+  // was executed.  The UnitTest object owns the string.
+  const char* original_working_dir() const;
+
+  // Returns the TestSuite object for the test that's currently running,
+  // or NULL if no test is running.
+  const TestSuite* current_test_suite() const GTEST_LOCK_EXCLUDED_(mutex_);
+
+// Legacy API is still available but deprecated
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  const TestCase* current_test_case() const GTEST_LOCK_EXCLUDED_(mutex_);
+#endif
+
+  // Returns the TestInfo object for the test that's currently running,
+  // or NULL if no test is running.
+  const TestInfo* current_test_info() const
+      GTEST_LOCK_EXCLUDED_(mutex_);
+
+  // Returns the random seed used at the start of the current test run.
+  int random_seed() const;
+
+  // Returns the ParameterizedTestSuiteRegistry object used to keep track of
+  // value-parameterized tests and instantiate and register them.
+  //
+  // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+  internal::ParameterizedTestSuiteRegistry& parameterized_test_registry()
+      GTEST_LOCK_EXCLUDED_(mutex_);
+
+  // Gets the number of successful test suites.
+  int successful_test_suite_count() const;
+
+  // Gets the number of failed test suites.
+  int failed_test_suite_count() const;
+
+  // Gets the number of all test suites.
+  int total_test_suite_count() const;
+
+  // Gets the number of all test suites that contain at least one test
+  // that should run.
+  int test_suite_to_run_count() const;
+
+  //  Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  int successful_test_case_count() const;
+  int failed_test_case_count() const;
+  int total_test_case_count() const;
+  int test_case_to_run_count() const;
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+  // Gets the number of successful tests.
+  int successful_test_count() const;
+
+  // Gets the number of skipped tests.
+  int skipped_test_count() const;
+
+  // Gets the number of failed tests.
+  int failed_test_count() const;
+
+  // Gets the number of disabled tests that will be reported in the XML report.
+  int reportable_disabled_test_count() const;
+
+  // Gets the number of disabled tests.
+  int disabled_test_count() const;
+
+  // Gets the number of tests to be printed in the XML report.
+  int reportable_test_count() const;
+
+  // Gets the number of all tests.
+  int total_test_count() const;
+
+  // Gets the number of tests that should run.
+  int test_to_run_count() const;
+
+  // Gets the time of the test program start, in ms from the start of the
+  // UNIX epoch.
+  TimeInMillis start_timestamp() const;
+
+  // Gets the elapsed time, in milliseconds.
+  TimeInMillis elapsed_time() const;
+
+  // Returns true if and only if the unit test passed (i.e. all test suites
+  // passed).
+  bool Passed() const;
+
+  // Returns true if and only if the unit test failed (i.e. some test suite
+  // failed or something outside of all tests failed).
+  bool Failed() const;
+
+  // Gets the i-th test suite among all the test suites. i can range from 0 to
+  // total_test_suite_count() - 1. If i is not in that range, returns NULL.
+  const TestSuite* GetTestSuite(int i) const;
+
+//  Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  const TestCase* GetTestCase(int i) const;
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+  // Returns the TestResult containing information on test failures and
+  // properties logged outside of individual test suites.
+  const TestResult& ad_hoc_test_result() const;
+
+  // Returns the list of event listeners that can be used to track events
+  // inside Google Test.
+  TestEventListeners& listeners();
+
+ private:
+  // Registers and returns a global test environment.  When a test
+  // program is run, all global test environments will be set-up in
+  // the order they were registered.  After all tests in the program
+  // have finished, all global test environments will be torn-down in
+  // the *reverse* order they were registered.
+  //
+  // The UnitTest object takes ownership of the given environment.
+  //
+  // This method can only be called from the main thread.
+  Environment* AddEnvironment(Environment* env);
+
+  // Adds a TestPartResult to the current TestResult object.  All
+  // Google Test assertion macros (e.g. ASSERT_TRUE, EXPECT_EQ, etc)
+  // eventually call this to report their results.  The user code
+  // should use the assertion macros instead of calling this directly.
+  void AddTestPartResult(TestPartResult::Type result_type,
+                         const char* file_name,
+                         int line_number,
+                         const std::string& message,
+                         const std::string& os_stack_trace)
+      GTEST_LOCK_EXCLUDED_(mutex_);
+
+  // Adds a TestProperty to the current TestResult object when invoked from
+  // inside a test, to current TestSuite's ad_hoc_test_result_ when invoked
+  // from SetUpTestSuite or TearDownTestSuite, or to the global property set
+  // when invoked elsewhere.  If the result already contains a property with
+  // the same key, the value will be updated.
+  void RecordProperty(const std::string& key, const std::string& value);
+
+  // Gets the i-th test suite among all the test suites. i can range from 0 to
+  // total_test_suite_count() - 1. If i is not in that range, returns NULL.
+  TestSuite* GetMutableTestSuite(int i);
+
+  // Accessors for the implementation object.
+  internal::UnitTestImpl* impl() { return impl_; }
+  const internal::UnitTestImpl* impl() const { return impl_; }
+
+  // These classes and functions are friends as they need to access private
+  // members of UnitTest.
+  friend class ScopedTrace;
+  friend class Test;
+  friend class internal::AssertHelper;
+  friend class internal::StreamingListenerTest;
+  friend class internal::UnitTestRecordPropertyTestHelper;
+  friend Environment* AddGlobalTestEnvironment(Environment* env);
+  friend std::set<std::string>* internal::GetIgnoredParameterizedTestSuites();
+  friend internal::UnitTestImpl* internal::GetUnitTestImpl();
+  friend void internal::ReportFailureInUnknownLocation(
+      TestPartResult::Type result_type,
+      const std::string& message);
+
+  // Creates an empty UnitTest.
+  UnitTest();
+
+  // D'tor
+  virtual ~UnitTest();
+
+  // Pushes a trace defined by SCOPED_TRACE() on to the per-thread
+  // Google Test trace stack.
+  void PushGTestTrace(const internal::TraceInfo& trace)
+      GTEST_LOCK_EXCLUDED_(mutex_);
+
+  // Pops a trace from the per-thread Google Test trace stack.
+  void PopGTestTrace()
+      GTEST_LOCK_EXCLUDED_(mutex_);
+
+  // Protects mutable state in *impl_.  This is mutable as some const
+  // methods need to lock it too.
+  mutable internal::Mutex mutex_;
+
+  // Opaque implementation object.  This field is never changed once
+  // the object is constructed.  We don't mark it as const here, as
+  // doing so will cause a warning in the constructor of UnitTest.
+  // Mutable state in *impl_ is protected by mutex_.
+  internal::UnitTestImpl* impl_;
+
+  // We disallow copying UnitTest.
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(UnitTest);
+};
+
+// A convenient wrapper for adding an environment for the test
+// program.
+//
+// You should call this before RUN_ALL_TESTS() is called, probably in
+// main().  If you use gtest_main, you need to call this before main()
+// starts for it to take effect.  For example, you can define a global
+// variable like this:
+//
+//   testing::Environment* const foo_env =
+//       testing::AddGlobalTestEnvironment(new FooEnvironment);
+//
+// However, we strongly recommend you to write your own main() and
+// call AddGlobalTestEnvironment() there, as relying on initialization
+// of global variables makes the code harder to read and may cause
+// problems when you register multiple environments from different
+// translation units and the environments have dependencies among them
+// (remember that the compiler doesn't guarantee the order in which
+// global variables from different translation units are initialized).
+inline Environment* AddGlobalTestEnvironment(Environment* env) {
+  return UnitTest::GetInstance()->AddEnvironment(env);
+}
+
+// Initializes Google Test.  This must be called before calling
+// RUN_ALL_TESTS().  In particular, it parses a command line for the
+// flags that Google Test recognizes.  Whenever a Google Test flag is
+// seen, it is removed from argv, and *argc is decremented.
+//
+// No value is returned.  Instead, the Google Test flag variables are
+// updated.
+//
+// Calling the function for the second time has no user-visible effect.
+GTEST_API_ void InitGoogleTest(int* argc, char** argv);
+
+// This overloaded version can be used in Windows programs compiled in
+// UNICODE mode.
+GTEST_API_ void InitGoogleTest(int* argc, wchar_t** argv);
+
+// This overloaded version can be used on Arduino/embedded platforms where
+// there is no argc/argv.
+GTEST_API_ void InitGoogleTest();
+
+namespace internal {
+
+// Separate the error generating code from the code path to reduce the stack
+// frame size of CmpHelperEQ. This helps reduce the overhead of some sanitizers
+// when calling EXPECT_* in a tight loop.
+template <typename T1, typename T2>
+AssertionResult CmpHelperEQFailure(const char* lhs_expression,
+                                   const char* rhs_expression,
+                                   const T1& lhs, const T2& rhs) {
+  return EqFailure(lhs_expression,
+                   rhs_expression,
+                   FormatForComparisonFailureMessage(lhs, rhs),
+                   FormatForComparisonFailureMessage(rhs, lhs),
+                   false);
+}
+
+// This block of code defines operator==/!=
+// to block lexical scope lookup.
+// It prevents using invalid operator==/!= defined at namespace scope.
+struct faketype {};
+inline bool operator==(faketype, faketype) { return true; }
+inline bool operator!=(faketype, faketype) { return false; }
+
+// The helper function for {ASSERT|EXPECT}_EQ.
+template <typename T1, typename T2>
+AssertionResult CmpHelperEQ(const char* lhs_expression,
+                            const char* rhs_expression,
+                            const T1& lhs,
+                            const T2& rhs) {
+  if (lhs == rhs) {
+    return AssertionSuccess();
+  }
+
+  return CmpHelperEQFailure(lhs_expression, rhs_expression, lhs, rhs);
+}
+
+class EqHelper {
+ public:
+  // This templatized version is for the general case.
+  template <
+      typename T1, typename T2,
+      // Disable this overload for cases where one argument is a pointer
+      // and the other is the null pointer constant.
+      typename std::enable_if<!std::is_integral<T1>::value ||
+                              !std::is_pointer<T2>::value>::type* = nullptr>
+  static AssertionResult Compare(const char* lhs_expression,
+                                 const char* rhs_expression, const T1& lhs,
+                                 const T2& rhs) {
+    return CmpHelperEQ(lhs_expression, rhs_expression, lhs, rhs);
+  }
+
+  // With this overloaded version, we allow anonymous enums to be used
+  // in {ASSERT|EXPECT}_EQ when compiled with gcc 4, as anonymous
+  // enums can be implicitly cast to BiggestInt.
+  //
+  // Even though its body looks the same as the above version, we
+  // cannot merge the two, as it will make anonymous enums unhappy.
+  static AssertionResult Compare(const char* lhs_expression,
+                                 const char* rhs_expression,
+                                 BiggestInt lhs,
+                                 BiggestInt rhs) {
+    return CmpHelperEQ(lhs_expression, rhs_expression, lhs, rhs);
+  }
+
+  template <typename T>
+  static AssertionResult Compare(
+      const char* lhs_expression, const char* rhs_expression,
+      // Handle cases where '0' is used as a null pointer literal.
+      std::nullptr_t /* lhs */, T* rhs) {
+    // We already know that 'lhs' is a null pointer.
+    return CmpHelperEQ(lhs_expression, rhs_expression, static_cast<T*>(nullptr),
+                       rhs);
+  }
+};
+
+// Separate the error generating code from the code path to reduce the stack
+// frame size of CmpHelperOP. This helps reduce the overhead of some sanitizers
+// when calling EXPECT_OP in a tight loop.
+template <typename T1, typename T2>
+AssertionResult CmpHelperOpFailure(const char* expr1, const char* expr2,
+                                   const T1& val1, const T2& val2,
+                                   const char* op) {
+  return AssertionFailure()
+         << "Expected: (" << expr1 << ") " << op << " (" << expr2
+         << "), actual: " << FormatForComparisonFailureMessage(val1, val2)
+         << " vs " << FormatForComparisonFailureMessage(val2, val1);
+}
+
+// A macro for implementing the helper functions needed to implement
+// ASSERT_?? and EXPECT_??.  It is here just to avoid copy-and-paste
+// of similar code.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+
+#define GTEST_IMPL_CMP_HELPER_(op_name, op)\
+template <typename T1, typename T2>\
+AssertionResult CmpHelper##op_name(const char* expr1, const char* expr2, \
+                                   const T1& val1, const T2& val2) {\
+  if (val1 op val2) {\
+    return AssertionSuccess();\
+  } else {\
+    return CmpHelperOpFailure(expr1, expr2, val1, val2, #op);\
+  }\
+}
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+
+// Implements the helper function for {ASSERT|EXPECT}_NE
+GTEST_IMPL_CMP_HELPER_(NE, !=)
+// Implements the helper function for {ASSERT|EXPECT}_LE
+GTEST_IMPL_CMP_HELPER_(LE, <=)
+// Implements the helper function for {ASSERT|EXPECT}_LT
+GTEST_IMPL_CMP_HELPER_(LT, <)
+// Implements the helper function for {ASSERT|EXPECT}_GE
+GTEST_IMPL_CMP_HELPER_(GE, >=)
+// Implements the helper function for {ASSERT|EXPECT}_GT
+GTEST_IMPL_CMP_HELPER_(GT, >)
+
+#undef GTEST_IMPL_CMP_HELPER_
+
+// The helper function for {ASSERT|EXPECT}_STREQ.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+GTEST_API_ AssertionResult CmpHelperSTREQ(const char* s1_expression,
+                                          const char* s2_expression,
+                                          const char* s1,
+                                          const char* s2);
+
+// The helper function for {ASSERT|EXPECT}_STRCASEEQ.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+GTEST_API_ AssertionResult CmpHelperSTRCASEEQ(const char* s1_expression,
+                                              const char* s2_expression,
+                                              const char* s1,
+                                              const char* s2);
+
+// The helper function for {ASSERT|EXPECT}_STRNE.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+GTEST_API_ AssertionResult CmpHelperSTRNE(const char* s1_expression,
+                                          const char* s2_expression,
+                                          const char* s1,
+                                          const char* s2);
+
+// The helper function for {ASSERT|EXPECT}_STRCASENE.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+GTEST_API_ AssertionResult CmpHelperSTRCASENE(const char* s1_expression,
+                                              const char* s2_expression,
+                                              const char* s1,
+                                              const char* s2);
+
+
+// Helper function for *_STREQ on wide strings.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+GTEST_API_ AssertionResult CmpHelperSTREQ(const char* s1_expression,
+                                          const char* s2_expression,
+                                          const wchar_t* s1,
+                                          const wchar_t* s2);
+
+// Helper function for *_STRNE on wide strings.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+GTEST_API_ AssertionResult CmpHelperSTRNE(const char* s1_expression,
+                                          const char* s2_expression,
+                                          const wchar_t* s1,
+                                          const wchar_t* s2);
+
+}  // namespace internal
+
+// IsSubstring() and IsNotSubstring() are intended to be used as the
+// first argument to {EXPECT,ASSERT}_PRED_FORMAT2(), not by
+// themselves.  They check whether needle is a substring of haystack
+// (NULL is considered a substring of itself only), and return an
+// appropriate error message when they fail.
+//
+// The {needle,haystack}_expr arguments are the stringified
+// expressions that generated the two real arguments.
+GTEST_API_ AssertionResult IsSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const char* needle, const char* haystack);
+GTEST_API_ AssertionResult IsSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const wchar_t* needle, const wchar_t* haystack);
+GTEST_API_ AssertionResult IsNotSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const char* needle, const char* haystack);
+GTEST_API_ AssertionResult IsNotSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const wchar_t* needle, const wchar_t* haystack);
+GTEST_API_ AssertionResult IsSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const ::std::string& needle, const ::std::string& haystack);
+GTEST_API_ AssertionResult IsNotSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const ::std::string& needle, const ::std::string& haystack);
+
+#if GTEST_HAS_STD_WSTRING
+GTEST_API_ AssertionResult IsSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const ::std::wstring& needle, const ::std::wstring& haystack);
+GTEST_API_ AssertionResult IsNotSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const ::std::wstring& needle, const ::std::wstring& haystack);
+#endif  // GTEST_HAS_STD_WSTRING
+
+namespace internal {
+
+// Helper template function for comparing floating-points.
+//
+// Template parameter:
+//
+//   RawType: the raw floating-point type (either float or double)
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+template <typename RawType>
+AssertionResult CmpHelperFloatingPointEQ(const char* lhs_expression,
+                                         const char* rhs_expression,
+                                         RawType lhs_value,
+                                         RawType rhs_value) {
+  const FloatingPoint<RawType> lhs(lhs_value), rhs(rhs_value);
+
+  if (lhs.AlmostEquals(rhs)) {
+    return AssertionSuccess();
+  }
+
+  ::std::stringstream lhs_ss;
+  lhs_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
+         << lhs_value;
+
+  ::std::stringstream rhs_ss;
+  rhs_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
+         << rhs_value;
+
+  return EqFailure(lhs_expression,
+                   rhs_expression,
+                   StringStreamToString(&lhs_ss),
+                   StringStreamToString(&rhs_ss),
+                   false);
+}
+
+// Helper function for implementing ASSERT_NEAR.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+GTEST_API_ AssertionResult DoubleNearPredFormat(const char* expr1,
+                                                const char* expr2,
+                                                const char* abs_error_expr,
+                                                double val1,
+                                                double val2,
+                                                double abs_error);
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+// A class that enables one to stream messages to assertion macros
+class GTEST_API_ AssertHelper {
+ public:
+  // Constructor.
+  AssertHelper(TestPartResult::Type type,
+               const char* file,
+               int line,
+               const char* message);
+  ~AssertHelper();
+
+  // Message assignment is a semantic trick to enable assertion
+  // streaming; see the GTEST_MESSAGE_ macro below.
+  void operator=(const Message& message) const;
+
+ private:
+  // We put our data in a struct so that the size of the AssertHelper class can
+  // be as small as possible.  This is important because gcc is incapable of
+  // re-using stack space even for temporary variables, so every EXPECT_EQ
+  // reserves stack space for another AssertHelper.
+  struct AssertHelperData {
+    AssertHelperData(TestPartResult::Type t,
+                     const char* srcfile,
+                     int line_num,
+                     const char* msg)
+        : type(t), file(srcfile), line(line_num), message(msg) { }
+
+    TestPartResult::Type const type;
+    const char* const file;
+    int const line;
+    std::string const message;
+
+   private:
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(AssertHelperData);
+  };
+
+  AssertHelperData* const data_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(AssertHelper);
+};
+
+}  // namespace internal
+
+// The pure interface class that all value-parameterized tests inherit from.
+// A value-parameterized class must inherit from both ::testing::Test and
+// ::testing::WithParamInterface. In most cases that just means inheriting
+// from ::testing::TestWithParam, but more complicated test hierarchies
+// may need to inherit from Test and WithParamInterface at different levels.
+//
+// This interface has support for accessing the test parameter value via
+// the GetParam() method.
+//
+// Use it with one of the parameter generator defining functions, like Range(),
+// Values(), ValuesIn(), Bool(), and Combine().
+//
+// class FooTest : public ::testing::TestWithParam<int> {
+//  protected:
+//   FooTest() {
+//     // Can use GetParam() here.
+//   }
+//   ~FooTest() override {
+//     // Can use GetParam() here.
+//   }
+//   void SetUp() override {
+//     // Can use GetParam() here.
+//   }
+//   void TearDown override {
+//     // Can use GetParam() here.
+//   }
+// };
+// TEST_P(FooTest, DoesBar) {
+//   // Can use GetParam() method here.
+//   Foo foo;
+//   ASSERT_TRUE(foo.DoesBar(GetParam()));
+// }
+// INSTANTIATE_TEST_SUITE_P(OneToTenRange, FooTest, ::testing::Range(1, 10));
+
+template <typename T>
+class WithParamInterface {
+ public:
+  typedef T ParamType;
+  virtual ~WithParamInterface() {}
+
+  // The current parameter value. Is also available in the test fixture's
+  // constructor.
+  static const ParamType& GetParam() {
+    GTEST_CHECK_(parameter_ != nullptr)
+        << "GetParam() can only be called inside a value-parameterized test "
+        << "-- did you intend to write TEST_P instead of TEST_F?";
+    return *parameter_;
+  }
+
+ private:
+  // Sets parameter value. The caller is responsible for making sure the value
+  // remains alive and unchanged throughout the current test.
+  static void SetParam(const ParamType* parameter) {
+    parameter_ = parameter;
+  }
+
+  // Static value used for accessing parameter during a test lifetime.
+  static const ParamType* parameter_;
+
+  // TestClass must be a subclass of WithParamInterface<T> and Test.
+  template <class TestClass> friend class internal::ParameterizedTestFactory;
+};
+
+template <typename T>
+const T* WithParamInterface<T>::parameter_ = nullptr;
+
+// Most value-parameterized classes can ignore the existence of
+// WithParamInterface, and can just inherit from ::testing::TestWithParam.
+
+template <typename T>
+class TestWithParam : public Test, public WithParamInterface<T> {
+};
+
+// Macros for indicating success/failure in test code.
+
+// Skips test in runtime.
+// Skipping test aborts current function.
+// Skipped tests are neither successful nor failed.
+#define GTEST_SKIP() GTEST_SKIP_("")
+
+// ADD_FAILURE unconditionally adds a failure to the current test.
+// SUCCEED generates a success - it doesn't automatically make the
+// current test successful, as a test is only successful when it has
+// no failure.
+//
+// EXPECT_* verifies that a certain condition is satisfied.  If not,
+// it behaves like ADD_FAILURE.  In particular:
+//
+//   EXPECT_TRUE  verifies that a Boolean condition is true.
+//   EXPECT_FALSE verifies that a Boolean condition is false.
+//
+// FAIL and ASSERT_* are similar to ADD_FAILURE and EXPECT_*, except
+// that they will also abort the current function on failure.  People
+// usually want the fail-fast behavior of FAIL and ASSERT_*, but those
+// writing data-driven tests often find themselves using ADD_FAILURE
+// and EXPECT_* more.
+
+// Generates a nonfatal failure with a generic message.
+#define ADD_FAILURE() GTEST_NONFATAL_FAILURE_("Failed")
+
+// Generates a nonfatal failure at the given source file location with
+// a generic message.
+#define ADD_FAILURE_AT(file, line) \
+  GTEST_MESSAGE_AT_(file, line, "Failed", \
+                    ::testing::TestPartResult::kNonFatalFailure)
+
+// Generates a fatal failure with a generic message.
+#define GTEST_FAIL() GTEST_FATAL_FAILURE_("Failed")
+
+// Like GTEST_FAIL(), but at the given source file location.
+#define GTEST_FAIL_AT(file, line)         \
+  GTEST_MESSAGE_AT_(file, line, "Failed", \
+                    ::testing::TestPartResult::kFatalFailure)
+
+// Define this macro to 1 to omit the definition of FAIL(), which is a
+// generic name and clashes with some other libraries.
+#if !GTEST_DONT_DEFINE_FAIL
+# define FAIL() GTEST_FAIL()
+#endif
+
+// Generates a success with a generic message.
+#define GTEST_SUCCEED() GTEST_SUCCESS_("Succeeded")
+
+// Define this macro to 1 to omit the definition of SUCCEED(), which
+// is a generic name and clashes with some other libraries.
+#if !GTEST_DONT_DEFINE_SUCCEED
+# define SUCCEED() GTEST_SUCCEED()
+#endif
+
+// Macros for testing exceptions.
+//
+//    * {ASSERT|EXPECT}_THROW(statement, expected_exception):
+//         Tests that the statement throws the expected exception.
+//    * {ASSERT|EXPECT}_NO_THROW(statement):
+//         Tests that the statement doesn't throw any exception.
+//    * {ASSERT|EXPECT}_ANY_THROW(statement):
+//         Tests that the statement throws an exception.
+
+#define EXPECT_THROW(statement, expected_exception) \
+  GTEST_TEST_THROW_(statement, expected_exception, GTEST_NONFATAL_FAILURE_)
+#define EXPECT_NO_THROW(statement) \
+  GTEST_TEST_NO_THROW_(statement, GTEST_NONFATAL_FAILURE_)
+#define EXPECT_ANY_THROW(statement) \
+  GTEST_TEST_ANY_THROW_(statement, GTEST_NONFATAL_FAILURE_)
+#define ASSERT_THROW(statement, expected_exception) \
+  GTEST_TEST_THROW_(statement, expected_exception, GTEST_FATAL_FAILURE_)
+#define ASSERT_NO_THROW(statement) \
+  GTEST_TEST_NO_THROW_(statement, GTEST_FATAL_FAILURE_)
+#define ASSERT_ANY_THROW(statement) \
+  GTEST_TEST_ANY_THROW_(statement, GTEST_FATAL_FAILURE_)
+
+// Boolean assertions. Condition can be either a Boolean expression or an
+// AssertionResult. For more information on how to use AssertionResult with
+// these macros see comments on that class.
+#define GTEST_EXPECT_TRUE(condition) \
+  GTEST_TEST_BOOLEAN_(condition, #condition, false, true, \
+                      GTEST_NONFATAL_FAILURE_)
+#define GTEST_EXPECT_FALSE(condition) \
+  GTEST_TEST_BOOLEAN_(!(condition), #condition, true, false, \
+                      GTEST_NONFATAL_FAILURE_)
+#define GTEST_ASSERT_TRUE(condition) \
+  GTEST_TEST_BOOLEAN_(condition, #condition, false, true, \
+                      GTEST_FATAL_FAILURE_)
+#define GTEST_ASSERT_FALSE(condition) \
+  GTEST_TEST_BOOLEAN_(!(condition), #condition, true, false, \
+                      GTEST_FATAL_FAILURE_)
+
+// Define these macros to 1 to omit the definition of the corresponding
+// EXPECT or ASSERT, which clashes with some users' own code.
+
+#if !GTEST_DONT_DEFINE_EXPECT_TRUE
+#define EXPECT_TRUE(condition) GTEST_EXPECT_TRUE(condition)
+#endif
+
+#if !GTEST_DONT_DEFINE_EXPECT_FALSE
+#define EXPECT_FALSE(condition) GTEST_EXPECT_FALSE(condition)
+#endif
+
+#if !GTEST_DONT_DEFINE_ASSERT_TRUE
+#define ASSERT_TRUE(condition) GTEST_ASSERT_TRUE(condition)
+#endif
+
+#if !GTEST_DONT_DEFINE_ASSERT_FALSE
+#define ASSERT_FALSE(condition) GTEST_ASSERT_FALSE(condition)
+#endif
+
+// Macros for testing equalities and inequalities.
+//
+//    * {ASSERT|EXPECT}_EQ(v1, v2): Tests that v1 == v2
+//    * {ASSERT|EXPECT}_NE(v1, v2): Tests that v1 != v2
+//    * {ASSERT|EXPECT}_LT(v1, v2): Tests that v1 < v2
+//    * {ASSERT|EXPECT}_LE(v1, v2): Tests that v1 <= v2
+//    * {ASSERT|EXPECT}_GT(v1, v2): Tests that v1 > v2
+//    * {ASSERT|EXPECT}_GE(v1, v2): Tests that v1 >= v2
+//
+// When they are not, Google Test prints both the tested expressions and
+// their actual values.  The values must be compatible built-in types,
+// or you will get a compiler error.  By "compatible" we mean that the
+// values can be compared by the respective operator.
+//
+// Note:
+//
+//   1. It is possible to make a user-defined type work with
+//   {ASSERT|EXPECT}_??(), but that requires overloading the
+//   comparison operators and is thus discouraged by the Google C++
+//   Usage Guide.  Therefore, you are advised to use the
+//   {ASSERT|EXPECT}_TRUE() macro to assert that two objects are
+//   equal.
+//
+//   2. The {ASSERT|EXPECT}_??() macros do pointer comparisons on
+//   pointers (in particular, C strings).  Therefore, if you use it
+//   with two C strings, you are testing how their locations in memory
+//   are related, not how their content is related.  To compare two C
+//   strings by content, use {ASSERT|EXPECT}_STR*().
+//
+//   3. {ASSERT|EXPECT}_EQ(v1, v2) is preferred to
+//   {ASSERT|EXPECT}_TRUE(v1 == v2), as the former tells you
+//   what the actual value is when it fails, and similarly for the
+//   other comparisons.
+//
+//   4. Do not depend on the order in which {ASSERT|EXPECT}_??()
+//   evaluate their arguments, which is undefined.
+//
+//   5. These macros evaluate their arguments exactly once.
+//
+// Examples:
+//
+//   EXPECT_NE(Foo(), 5);
+//   EXPECT_EQ(a_pointer, NULL);
+//   ASSERT_LT(i, array_size);
+//   ASSERT_GT(records.size(), 0) << "There is no record left.";
+
+#define EXPECT_EQ(val1, val2) \
+  EXPECT_PRED_FORMAT2(::testing::internal::EqHelper::Compare, val1, val2)
+#define EXPECT_NE(val1, val2) \
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperNE, val1, val2)
+#define EXPECT_LE(val1, val2) \
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperLE, val1, val2)
+#define EXPECT_LT(val1, val2) \
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperLT, val1, val2)
+#define EXPECT_GE(val1, val2) \
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperGE, val1, val2)
+#define EXPECT_GT(val1, val2) \
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperGT, val1, val2)
+
+#define GTEST_ASSERT_EQ(val1, val2) \
+  ASSERT_PRED_FORMAT2(::testing::internal::EqHelper::Compare, val1, val2)
+#define GTEST_ASSERT_NE(val1, val2) \
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperNE, val1, val2)
+#define GTEST_ASSERT_LE(val1, val2) \
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperLE, val1, val2)
+#define GTEST_ASSERT_LT(val1, val2) \
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperLT, val1, val2)
+#define GTEST_ASSERT_GE(val1, val2) \
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperGE, val1, val2)
+#define GTEST_ASSERT_GT(val1, val2) \
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperGT, val1, val2)
+
+// Define macro GTEST_DONT_DEFINE_ASSERT_XY to 1 to omit the definition of
+// ASSERT_XY(), which clashes with some users' own code.
+
+#if !GTEST_DONT_DEFINE_ASSERT_EQ
+# define ASSERT_EQ(val1, val2) GTEST_ASSERT_EQ(val1, val2)
+#endif
+
+#if !GTEST_DONT_DEFINE_ASSERT_NE
+# define ASSERT_NE(val1, val2) GTEST_ASSERT_NE(val1, val2)
+#endif
+
+#if !GTEST_DONT_DEFINE_ASSERT_LE
+# define ASSERT_LE(val1, val2) GTEST_ASSERT_LE(val1, val2)
+#endif
+
+#if !GTEST_DONT_DEFINE_ASSERT_LT
+# define ASSERT_LT(val1, val2) GTEST_ASSERT_LT(val1, val2)
+#endif
+
+#if !GTEST_DONT_DEFINE_ASSERT_GE
+# define ASSERT_GE(val1, val2) GTEST_ASSERT_GE(val1, val2)
+#endif
+
+#if !GTEST_DONT_DEFINE_ASSERT_GT
+# define ASSERT_GT(val1, val2) GTEST_ASSERT_GT(val1, val2)
+#endif
+
+// C-string Comparisons.  All tests treat NULL and any non-NULL string
+// as different.  Two NULLs are equal.
+//
+//    * {ASSERT|EXPECT}_STREQ(s1, s2):     Tests that s1 == s2
+//    * {ASSERT|EXPECT}_STRNE(s1, s2):     Tests that s1 != s2
+//    * {ASSERT|EXPECT}_STRCASEEQ(s1, s2): Tests that s1 == s2, ignoring case
+//    * {ASSERT|EXPECT}_STRCASENE(s1, s2): Tests that s1 != s2, ignoring case
+//
+// For wide or narrow string objects, you can use the
+// {ASSERT|EXPECT}_??() macros.
+//
+// Don't depend on the order in which the arguments are evaluated,
+// which is undefined.
+//
+// These macros evaluate their arguments exactly once.
+
+#define EXPECT_STREQ(s1, s2) \
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTREQ, s1, s2)
+#define EXPECT_STRNE(s1, s2) \
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTRNE, s1, s2)
+#define EXPECT_STRCASEEQ(s1, s2) \
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASEEQ, s1, s2)
+#define EXPECT_STRCASENE(s1, s2)\
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASENE, s1, s2)
+
+#define ASSERT_STREQ(s1, s2) \
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTREQ, s1, s2)
+#define ASSERT_STRNE(s1, s2) \
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTRNE, s1, s2)
+#define ASSERT_STRCASEEQ(s1, s2) \
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASEEQ, s1, s2)
+#define ASSERT_STRCASENE(s1, s2)\
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASENE, s1, s2)
+
+// Macros for comparing floating-point numbers.
+//
+//    * {ASSERT|EXPECT}_FLOAT_EQ(val1, val2):
+//         Tests that two float values are almost equal.
+//    * {ASSERT|EXPECT}_DOUBLE_EQ(val1, val2):
+//         Tests that two double values are almost equal.
+//    * {ASSERT|EXPECT}_NEAR(v1, v2, abs_error):
+//         Tests that v1 and v2 are within the given distance to each other.
+//
+// Google Test uses ULP-based comparison to automatically pick a default
+// error bound that is appropriate for the operands.  See the
+// FloatingPoint template class in gtest-internal.h if you are
+// interested in the implementation details.
+
+#define EXPECT_FLOAT_EQ(val1, val2)\
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ<float>, \
+                      val1, val2)
+
+#define EXPECT_DOUBLE_EQ(val1, val2)\
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ<double>, \
+                      val1, val2)
+
+#define ASSERT_FLOAT_EQ(val1, val2)\
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ<float>, \
+                      val1, val2)
+
+#define ASSERT_DOUBLE_EQ(val1, val2)\
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ<double>, \
+                      val1, val2)
+
+#define EXPECT_NEAR(val1, val2, abs_error)\
+  EXPECT_PRED_FORMAT3(::testing::internal::DoubleNearPredFormat, \
+                      val1, val2, abs_error)
+
+#define ASSERT_NEAR(val1, val2, abs_error)\
+  ASSERT_PRED_FORMAT3(::testing::internal::DoubleNearPredFormat, \
+                      val1, val2, abs_error)
+
+// These predicate format functions work on floating-point values, and
+// can be used in {ASSERT|EXPECT}_PRED_FORMAT2*(), e.g.
+//
+//   EXPECT_PRED_FORMAT2(testing::DoubleLE, Foo(), 5.0);
+
+// Asserts that val1 is less than, or almost equal to, val2.  Fails
+// otherwise.  In particular, it fails if either val1 or val2 is NaN.
+GTEST_API_ AssertionResult FloatLE(const char* expr1, const char* expr2,
+                                   float val1, float val2);
+GTEST_API_ AssertionResult DoubleLE(const char* expr1, const char* expr2,
+                                    double val1, double val2);
+
+
+#if GTEST_OS_WINDOWS
+
+// Macros that test for HRESULT failure and success, these are only useful
+// on Windows, and rely on Windows SDK macros and APIs to compile.
+//
+//    * {ASSERT|EXPECT}_HRESULT_{SUCCEEDED|FAILED}(expr)
+//
+// When expr unexpectedly fails or succeeds, Google Test prints the
+// expected result and the actual result with both a human-readable
+// string representation of the error, if available, as well as the
+// hex result code.
+# define EXPECT_HRESULT_SUCCEEDED(expr) \
+    EXPECT_PRED_FORMAT1(::testing::internal::IsHRESULTSuccess, (expr))
+
+# define ASSERT_HRESULT_SUCCEEDED(expr) \
+    ASSERT_PRED_FORMAT1(::testing::internal::IsHRESULTSuccess, (expr))
+
+# define EXPECT_HRESULT_FAILED(expr) \
+    EXPECT_PRED_FORMAT1(::testing::internal::IsHRESULTFailure, (expr))
+
+# define ASSERT_HRESULT_FAILED(expr) \
+    ASSERT_PRED_FORMAT1(::testing::internal::IsHRESULTFailure, (expr))
+
+#endif  // GTEST_OS_WINDOWS
+
+// Macros that execute statement and check that it doesn't generate new fatal
+// failures in the current thread.
+//
+//   * {ASSERT|EXPECT}_NO_FATAL_FAILURE(statement);
+//
+// Examples:
+//
+//   EXPECT_NO_FATAL_FAILURE(Process());
+//   ASSERT_NO_FATAL_FAILURE(Process()) << "Process() failed";
+//
+#define ASSERT_NO_FATAL_FAILURE(statement) \
+    GTEST_TEST_NO_FATAL_FAILURE_(statement, GTEST_FATAL_FAILURE_)
+#define EXPECT_NO_FATAL_FAILURE(statement) \
+    GTEST_TEST_NO_FATAL_FAILURE_(statement, GTEST_NONFATAL_FAILURE_)
+
+// Causes a trace (including the given source file path and line number,
+// and the given message) to be included in every test failure message generated
+// by code in the scope of the lifetime of an instance of this class. The effect
+// is undone with the destruction of the instance.
+//
+// The message argument can be anything streamable to std::ostream.
+//
+// Example:
+//   testing::ScopedTrace trace("file.cc", 123, "message");
+//
+class GTEST_API_ ScopedTrace {
+ public:
+  // The c'tor pushes the given source file location and message onto
+  // a trace stack maintained by Google Test.
+
+  // Template version. Uses Message() to convert the values into strings.
+  // Slow, but flexible.
+  template <typename T>
+  ScopedTrace(const char* file, int line, const T& message) {
+    PushTrace(file, line, (Message() << message).GetString());
+  }
+
+  // Optimize for some known types.
+  ScopedTrace(const char* file, int line, const char* message) {
+    PushTrace(file, line, message ? message : "(null)");
+  }
+
+  ScopedTrace(const char* file, int line, const std::string& message) {
+    PushTrace(file, line, message);
+  }
+
+  // The d'tor pops the info pushed by the c'tor.
+  //
+  // Note that the d'tor is not virtual in order to be efficient.
+  // Don't inherit from ScopedTrace!
+  ~ScopedTrace();
+
+ private:
+  void PushTrace(const char* file, int line, std::string message);
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedTrace);
+} GTEST_ATTRIBUTE_UNUSED_;  // A ScopedTrace object does its job in its
+                            // c'tor and d'tor.  Therefore it doesn't
+                            // need to be used otherwise.
+
+// Causes a trace (including the source file path, the current line
+// number, and the given message) to be included in every test failure
+// message generated by code in the current scope.  The effect is
+// undone when the control leaves the current scope.
+//
+// The message argument can be anything streamable to std::ostream.
+//
+// In the implementation, we include the current line number as part
+// of the dummy variable name, thus allowing multiple SCOPED_TRACE()s
+// to appear in the same block - as long as they are on different
+// lines.
+//
+// Assuming that each thread maintains its own stack of traces.
+// Therefore, a SCOPED_TRACE() would (correctly) only affect the
+// assertions in its own thread.
+#define SCOPED_TRACE(message) \
+  ::testing::ScopedTrace GTEST_CONCAT_TOKEN_(gtest_trace_, __LINE__)(\
+    __FILE__, __LINE__, (message))
+
+// Compile-time assertion for type equality.
+// StaticAssertTypeEq<type1, type2>() compiles if and only if type1 and type2
+// are the same type.  The value it returns is not interesting.
+//
+// Instead of making StaticAssertTypeEq a class template, we make it a
+// function template that invokes a helper class template.  This
+// prevents a user from misusing StaticAssertTypeEq<T1, T2> by
+// defining objects of that type.
+//
+// CAVEAT:
+//
+// When used inside a method of a class template,
+// StaticAssertTypeEq<T1, T2>() is effective ONLY IF the method is
+// instantiated.  For example, given:
+//
+//   template <typename T> class Foo {
+//    public:
+//     void Bar() { testing::StaticAssertTypeEq<int, T>(); }
+//   };
+//
+// the code:
+//
+//   void Test1() { Foo<bool> foo; }
+//
+// will NOT generate a compiler error, as Foo<bool>::Bar() is never
+// actually instantiated.  Instead, you need:
+//
+//   void Test2() { Foo<bool> foo; foo.Bar(); }
+//
+// to cause a compiler error.
+template <typename T1, typename T2>
+constexpr bool StaticAssertTypeEq() noexcept {
+  static_assert(std::is_same<T1, T2>::value, "T1 and T2 are not the same type");
+  return true;
+}
+
+// Defines a test.
+//
+// The first parameter is the name of the test suite, and the second
+// parameter is the name of the test within the test suite.
+//
+// The convention is to end the test suite name with "Test".  For
+// example, a test suite for the Foo class can be named FooTest.
+//
+// Test code should appear between braces after an invocation of
+// this macro.  Example:
+//
+//   TEST(FooTest, InitializesCorrectly) {
+//     Foo foo;
+//     EXPECT_TRUE(foo.StatusIsOK());
+//   }
+
+// Note that we call GetTestTypeId() instead of GetTypeId<
+// ::testing::Test>() here to get the type ID of testing::Test.  This
+// is to work around a suspected linker bug when using Google Test as
+// a framework on Mac OS X.  The bug causes GetTypeId<
+// ::testing::Test>() to return different values depending on whether
+// the call is from the Google Test framework itself or from user test
+// code.  GetTestTypeId() is guaranteed to always return the same
+// value, as it always calls GetTypeId<>() from the Google Test
+// framework.
+#define GTEST_TEST(test_suite_name, test_name)             \
+  GTEST_TEST_(test_suite_name, test_name, ::testing::Test, \
+              ::testing::internal::GetTestTypeId())
+
+// Define this macro to 1 to omit the definition of TEST(), which
+// is a generic name and clashes with some other libraries.
+#if !GTEST_DONT_DEFINE_TEST
+#define TEST(test_suite_name, test_name) GTEST_TEST(test_suite_name, test_name)
+#endif
+
+// Defines a test that uses a test fixture.
+//
+// The first parameter is the name of the test fixture class, which
+// also doubles as the test suite name.  The second parameter is the
+// name of the test within the test suite.
+//
+// A test fixture class must be declared earlier.  The user should put
+// the test code between braces after using this macro.  Example:
+//
+//   class FooTest : public testing::Test {
+//    protected:
+//     void SetUp() override { b_.AddElement(3); }
+//
+//     Foo a_;
+//     Foo b_;
+//   };
+//
+//   TEST_F(FooTest, InitializesCorrectly) {
+//     EXPECT_TRUE(a_.StatusIsOK());
+//   }
+//
+//   TEST_F(FooTest, ReturnsElementCountCorrectly) {
+//     EXPECT_EQ(a_.size(), 0);
+//     EXPECT_EQ(b_.size(), 1);
+//   }
+//
+// GOOGLETEST_CM0011 DO NOT DELETE
+#if !GTEST_DONT_DEFINE_TEST
+#define TEST_F(test_fixture, test_name)\
+  GTEST_TEST_(test_fixture, test_name, test_fixture, \
+              ::testing::internal::GetTypeId<test_fixture>())
+#endif  // !GTEST_DONT_DEFINE_TEST
+
+// Returns a path to temporary directory.
+// Tries to determine an appropriate directory for the platform.
+GTEST_API_ std::string TempDir();
+
+#ifdef _MSC_VER
+#  pragma warning(pop)
+#endif
+
+// Dynamically registers a test with the framework.
+//
+// This is an advanced API only to be used when the `TEST` macros are
+// insufficient. The macros should be preferred when possible, as they avoid
+// most of the complexity of calling this function.
+//
+// The `factory` argument is a factory callable (move-constructible) object or
+// function pointer that creates a new instance of the Test object. It
+// handles ownership to the caller. The signature of the callable is
+// `Fixture*()`, where `Fixture` is the test fixture class for the test. All
+// tests registered with the same `test_suite_name` must return the same
+// fixture type. This is checked at runtime.
+//
+// The framework will infer the fixture class from the factory and will call
+// the `SetUpTestSuite` and `TearDownTestSuite` for it.
+//
+// Must be called before `RUN_ALL_TESTS()` is invoked, otherwise behavior is
+// undefined.
+//
+// Use case example:
+//
+// class MyFixture : public ::testing::Test {
+//  public:
+//   // All of these optional, just like in regular macro usage.
+//   static void SetUpTestSuite() { ... }
+//   static void TearDownTestSuite() { ... }
+//   void SetUp() override { ... }
+//   void TearDown() override { ... }
+// };
+//
+// class MyTest : public MyFixture {
+//  public:
+//   explicit MyTest(int data) : data_(data) {}
+//   void TestBody() override { ... }
+//
+//  private:
+//   int data_;
+// };
+//
+// void RegisterMyTests(const std::vector<int>& values) {
+//   for (int v : values) {
+//     ::testing::RegisterTest(
+//         "MyFixture", ("Test" + std::to_string(v)).c_str(), nullptr,
+//         std::to_string(v).c_str(),
+//         __FILE__, __LINE__,
+//         // Important to use the fixture type as the return type here.
+//         [=]() -> MyFixture* { return new MyTest(v); });
+//   }
+// }
+// ...
+// int main(int argc, char** argv) {
+//   std::vector<int> values_to_test = LoadValuesFromConfig();
+//   RegisterMyTests(values_to_test);
+//   ...
+//   return RUN_ALL_TESTS();
+// }
+//
+template <int&... ExplicitParameterBarrier, typename Factory>
+TestInfo* RegisterTest(const char* test_suite_name, const char* test_name,
+                       const char* type_param, const char* value_param,
+                       const char* file, int line, Factory factory) {
+  using TestT = typename std::remove_pointer<decltype(factory())>::type;
+
+  class FactoryImpl : public internal::TestFactoryBase {
+   public:
+    explicit FactoryImpl(Factory f) : factory_(std::move(f)) {}
+    Test* CreateTest() override { return factory_(); }
+
+   private:
+    Factory factory_;
+  };
+
+  return internal::MakeAndRegisterTestInfo(
+      test_suite_name, test_name, type_param, value_param,
+      internal::CodeLocation(file, line), internal::GetTypeId<TestT>(),
+      internal::SuiteApiResolver<TestT>::GetSetUpCaseOrSuite(file, line),
+      internal::SuiteApiResolver<TestT>::GetTearDownCaseOrSuite(file, line),
+      new FactoryImpl{std::move(factory)});
+}
+
+}  // namespace testing
+
+// Use this function in main() to run all tests.  It returns 0 if all
+// tests are successful, or 1 otherwise.
+//
+// RUN_ALL_TESTS() should be invoked after the command line has been
+// parsed by InitGoogleTest().
+//
+// This function was formerly a macro; thus, it is in the global
+// namespace and has an all-caps name.
+int RUN_ALL_TESTS() GTEST_MUST_USE_RESULT_;
+
+inline int RUN_ALL_TESTS() {
+  return ::testing::UnitTest::GetInstance()->Run();
+}
+
+GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_GTEST_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest-matchers.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest-matchers.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest-matchers.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest-matchers.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,930 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// The Google C++ Testing and Mocking Framework (Google Test)
+//
+// This file implements just enough of the matcher interface to allow
+// EXPECT_DEATH and friends to accept a matcher argument.
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_MATCHERS_H_
+#define GOOGLETEST_INCLUDE_GTEST_GTEST_MATCHERS_H_
+
+#include <atomic>
+#include <memory>
+#include <ostream>
+#include <string>
+#include <type_traits>
+
+#include "gtest/gtest-printers.h"
+#include "gtest/internal/gtest-internal.h"
+#include "gtest/internal/gtest-port.h"
+
+// MSVC warning C5046 is new as of VS2017 version 15.8.
+#if defined(_MSC_VER) && _MSC_VER >= 1915
+#define GTEST_MAYBE_5046_ 5046
+#else
+#define GTEST_MAYBE_5046_
+#endif
+
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(
+    4251 GTEST_MAYBE_5046_ /* class A needs to have dll-interface to be used by
+                              clients of class B */
+    /* Symbol involving type with internal linkage not defined */)
+
+namespace testing {
+
+// To implement a matcher Foo for type T, define:
+//   1. a class FooMatcherMatcher that implements the matcher interface:
+//     using is_gtest_matcher = void;
+//     bool MatchAndExplain(const T&, std::ostream*);
+//       (MatchResultListener* can also be used instead of std::ostream*)
+//     void DescribeTo(std::ostream*);
+//     void DescribeNegationTo(std::ostream*);
+//
+//   2. a factory function that creates a Matcher<T> object from a
+//      FooMatcherMatcher.
+
+class MatchResultListener {
+ public:
+  // Creates a listener object with the given underlying ostream.  The
+  // listener does not own the ostream, and does not dereference it
+  // in the constructor or destructor.
+  explicit MatchResultListener(::std::ostream* os) : stream_(os) {}
+  virtual ~MatchResultListener() = 0;  // Makes this class abstract.
+
+  // Streams x to the underlying ostream; does nothing if the ostream
+  // is NULL.
+  template <typename T>
+  MatchResultListener& operator<<(const T& x) {
+    if (stream_ != nullptr) *stream_ << x;
+    return *this;
+  }
+
+  // Returns the underlying ostream.
+  ::std::ostream* stream() { return stream_; }
+
+  // Returns true if and only if the listener is interested in an explanation
+  // of the match result.  A matcher's MatchAndExplain() method can use
+  // this information to avoid generating the explanation when no one
+  // intends to hear it.
+  bool IsInterested() const { return stream_ != nullptr; }
+
+ private:
+  ::std::ostream* const stream_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(MatchResultListener);
+};
+
+inline MatchResultListener::~MatchResultListener() {
+}
+
+// An instance of a subclass of this knows how to describe itself as a
+// matcher.
+class GTEST_API_ MatcherDescriberInterface {
+ public:
+  virtual ~MatcherDescriberInterface() {}
+
+  // Describes this matcher to an ostream.  The function should print
+  // a verb phrase that describes the property a value matching this
+  // matcher should have.  The subject of the verb phrase is the value
+  // being matched.  For example, the DescribeTo() method of the Gt(7)
+  // matcher prints "is greater than 7".
+  virtual void DescribeTo(::std::ostream* os) const = 0;
+
+  // Describes the negation of this matcher to an ostream.  For
+  // example, if the description of this matcher is "is greater than
+  // 7", the negated description could be "is not greater than 7".
+  // You are not required to override this when implementing
+  // MatcherInterface, but it is highly advised so that your matcher
+  // can produce good error messages.
+  virtual void DescribeNegationTo(::std::ostream* os) const {
+    *os << "not (";
+    DescribeTo(os);
+    *os << ")";
+  }
+};
+
+// The implementation of a matcher.
+template <typename T>
+class MatcherInterface : public MatcherDescriberInterface {
+ public:
+  // Returns true if and only if the matcher matches x; also explains the
+  // match result to 'listener' if necessary (see the next paragraph), in
+  // the form of a non-restrictive relative clause ("which ...",
+  // "whose ...", etc) that describes x.  For example, the
+  // MatchAndExplain() method of the Pointee(...) matcher should
+  // generate an explanation like "which points to ...".
+  //
+  // Implementations of MatchAndExplain() should add an explanation of
+  // the match result *if and only if* they can provide additional
+  // information that's not already present (or not obvious) in the
+  // print-out of x and the matcher's description.  Whether the match
+  // succeeds is not a factor in deciding whether an explanation is
+  // needed, as sometimes the caller needs to print a failure message
+  // when the match succeeds (e.g. when the matcher is used inside
+  // Not()).
+  //
+  // For example, a "has at least 10 elements" matcher should explain
+  // what the actual element count is, regardless of the match result,
+  // as it is useful information to the reader; on the other hand, an
+  // "is empty" matcher probably only needs to explain what the actual
+  // size is when the match fails, as it's redundant to say that the
+  // size is 0 when the value is already known to be empty.
+  //
+  // You should override this method when defining a new matcher.
+  //
+  // It's the responsibility of the caller (Google Test) to guarantee
+  // that 'listener' is not NULL.  This helps to simplify a matcher's
+  // implementation when it doesn't care about the performance, as it
+  // can talk to 'listener' without checking its validity first.
+  // However, in order to implement dummy listeners efficiently,
+  // listener->stream() may be NULL.
+  virtual bool MatchAndExplain(T x, MatchResultListener* listener) const = 0;
+
+  // Inherits these methods from MatcherDescriberInterface:
+  //   virtual void DescribeTo(::std::ostream* os) const = 0;
+  //   virtual void DescribeNegationTo(::std::ostream* os) const;
+};
+
+namespace internal {
+
+struct AnyEq {
+  template <typename A, typename B>
+  bool operator()(const A& a, const B& b) const { return a == b; }
+};
+struct AnyNe {
+  template <typename A, typename B>
+  bool operator()(const A& a, const B& b) const { return a != b; }
+};
+struct AnyLt {
+  template <typename A, typename B>
+  bool operator()(const A& a, const B& b) const { return a < b; }
+};
+struct AnyGt {
+  template <typename A, typename B>
+  bool operator()(const A& a, const B& b) const { return a > b; }
+};
+struct AnyLe {
+  template <typename A, typename B>
+  bool operator()(const A& a, const B& b) const { return a <= b; }
+};
+struct AnyGe {
+  template <typename A, typename B>
+  bool operator()(const A& a, const B& b) const { return a >= b; }
+};
+
+// A match result listener that ignores the explanation.
+class DummyMatchResultListener : public MatchResultListener {
+ public:
+  DummyMatchResultListener() : MatchResultListener(nullptr) {}
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(DummyMatchResultListener);
+};
+
+// A match result listener that forwards the explanation to a given
+// ostream.  The difference between this and MatchResultListener is
+// that the former is concrete.
+class StreamMatchResultListener : public MatchResultListener {
+ public:
+  explicit StreamMatchResultListener(::std::ostream* os)
+      : MatchResultListener(os) {}
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(StreamMatchResultListener);
+};
+
+struct SharedPayloadBase {
+  std::atomic<int> ref{1};
+  void Ref() { ref.fetch_add(1, std::memory_order_relaxed); }
+  bool Unref() { return ref.fetch_sub(1, std::memory_order_acq_rel) == 1; }
+};
+
+template <typename T>
+struct SharedPayload : SharedPayloadBase {
+  explicit SharedPayload(const T& v) : value(v) {}
+  explicit SharedPayload(T&& v) : value(std::move(v)) {}
+
+  static void Destroy(SharedPayloadBase* shared) {
+    delete static_cast<SharedPayload*>(shared);
+  }
+
+  T value;
+};
+
+// An internal class for implementing Matcher<T>, which will derive
+// from it.  We put functionalities common to all Matcher<T>
+// specializations here to avoid code duplication.
+template <typename T>
+class MatcherBase : private MatcherDescriberInterface {
+ public:
+  // Returns true if and only if the matcher matches x; also explains the
+  // match result to 'listener'.
+  bool MatchAndExplain(const T& x, MatchResultListener* listener) const {
+    GTEST_CHECK_(vtable_ != nullptr);
+    return vtable_->match_and_explain(*this, x, listener);
+  }
+
+  // Returns true if and only if this matcher matches x.
+  bool Matches(const T& x) const {
+    DummyMatchResultListener dummy;
+    return MatchAndExplain(x, &dummy);
+  }
+
+  // Describes this matcher to an ostream.
+  void DescribeTo(::std::ostream* os) const final {
+    GTEST_CHECK_(vtable_ != nullptr);
+    vtable_->describe(*this, os, false);
+  }
+
+  // Describes the negation of this matcher to an ostream.
+  void DescribeNegationTo(::std::ostream* os) const final {
+    GTEST_CHECK_(vtable_ != nullptr);
+    vtable_->describe(*this, os, true);
+  }
+
+  // Explains why x matches, or doesn't match, the matcher.
+  void ExplainMatchResultTo(const T& x, ::std::ostream* os) const {
+    StreamMatchResultListener listener(os);
+    MatchAndExplain(x, &listener);
+  }
+
+  // Returns the describer for this matcher object; retains ownership
+  // of the describer, which is only guaranteed to be alive when
+  // this matcher object is alive.
+  const MatcherDescriberInterface* GetDescriber() const {
+    if (vtable_ == nullptr) return nullptr;
+    return vtable_->get_describer(*this);
+  }
+
+ protected:
+  MatcherBase() : vtable_(nullptr) {}
+
+  // Constructs a matcher from its implementation.
+  template <typename U>
+  explicit MatcherBase(const MatcherInterface<U>* impl) {
+    Init(impl);
+  }
+
+  template <typename M, typename = typename std::remove_reference<
+                            M>::type::is_gtest_matcher>
+  MatcherBase(M&& m) {  // NOLINT
+    Init(std::forward<M>(m));
+  }
+
+  MatcherBase(const MatcherBase& other)
+      : vtable_(other.vtable_), buffer_(other.buffer_) {
+    if (IsShared()) buffer_.shared->Ref();
+  }
+
+  MatcherBase& operator=(const MatcherBase& other) {
+    if (this == &other) return *this;
+    Destroy();
+    vtable_ = other.vtable_;
+    buffer_ = other.buffer_;
+    if (IsShared()) buffer_.shared->Ref();
+    return *this;
+  }
+
+  MatcherBase(MatcherBase&& other)
+      : vtable_(other.vtable_), buffer_(other.buffer_) {
+    other.vtable_ = nullptr;
+  }
+
+  MatcherBase& operator=(MatcherBase&& other) {
+    if (this == &other) return *this;
+    Destroy();
+    vtable_ = other.vtable_;
+    buffer_ = other.buffer_;
+    other.vtable_ = nullptr;
+    return *this;
+  }
+
+  ~MatcherBase() override { Destroy(); }
+
+ private:
+  struct VTable {
+    bool (*match_and_explain)(const MatcherBase&, const T&,
+                              MatchResultListener*);
+    void (*describe)(const MatcherBase&, std::ostream*, bool negation);
+    // Returns the captured object if it implements the interface, otherwise
+    // returns the MatcherBase itself.
+    const MatcherDescriberInterface* (*get_describer)(const MatcherBase&);
+    // Called on shared instances when the reference count reaches 0.
+    void (*shared_destroy)(SharedPayloadBase*);
+  };
+
+  bool IsShared() const {
+    return vtable_ != nullptr && vtable_->shared_destroy != nullptr;
+  }
+
+  // If the implementation uses a listener, call that.
+  template <typename P>
+  static auto MatchAndExplainImpl(const MatcherBase& m, const T& value,
+                                  MatchResultListener* listener)
+      -> decltype(P::Get(m).MatchAndExplain(value, listener->stream())) {
+    return P::Get(m).MatchAndExplain(value, listener->stream());
+  }
+
+  template <typename P>
+  static auto MatchAndExplainImpl(const MatcherBase& m, const T& value,
+                                  MatchResultListener* listener)
+      -> decltype(P::Get(m).MatchAndExplain(value, listener)) {
+    return P::Get(m).MatchAndExplain(value, listener);
+  }
+
+  template <typename P>
+  static void DescribeImpl(const MatcherBase& m, std::ostream* os,
+                           bool negation) {
+    if (negation) {
+      P::Get(m).DescribeNegationTo(os);
+    } else {
+      P::Get(m).DescribeTo(os);
+    }
+  }
+
+  template <typename P>
+  static const MatcherDescriberInterface* GetDescriberImpl(
+      const MatcherBase& m) {
+    // If the impl is a MatcherDescriberInterface, then return it.
+    // Otherwise use MatcherBase itself.
+    // This allows us to implement the GetDescriber() function without support
+    // from the impl, but some users really want to get their impl back when
+    // they call GetDescriber().
+    // We use std::get on a tuple as a workaround of not having `if constexpr`.
+    return std::get<(
+        std::is_convertible<decltype(&P::Get(m)),
+                            const MatcherDescriberInterface*>::value
+            ? 1
+            : 0)>(std::make_tuple(&m, &P::Get(m)));
+  }
+
+  template <typename P>
+  const VTable* GetVTable() {
+    static constexpr VTable kVTable = {&MatchAndExplainImpl<P>,
+                                       &DescribeImpl<P>, &GetDescriberImpl<P>,
+                                       P::shared_destroy};
+    return &kVTable;
+  }
+
+  union Buffer {
+    // Add some types to give Buffer some common alignment/size use cases.
+    void* ptr;
+    double d;
+    int64_t i;
+    // And add one for the out-of-line cases.
+    SharedPayloadBase* shared;
+  };
+
+  void Destroy() {
+    if (IsShared() && buffer_.shared->Unref()) {
+      vtable_->shared_destroy(buffer_.shared);
+    }
+  }
+
+  template <typename M>
+  static constexpr bool IsInlined() {
+    return sizeof(M) <= sizeof(Buffer) && alignof(M) <= alignof(Buffer) &&
+           std::is_trivially_copy_constructible<M>::value &&
+           std::is_trivially_destructible<M>::value;
+  }
+
+  template <typename M, bool = MatcherBase::IsInlined<M>()>
+  struct ValuePolicy {
+    static const M& Get(const MatcherBase& m) {
+      // When inlined along with Init, need to be explicit to avoid violating
+      // strict aliasing rules.
+      const M *ptr = static_cast<const M*>(
+          static_cast<const void*>(&m.buffer_));
+      return *ptr;
+    }
+    static void Init(MatcherBase& m, M impl) {
+      ::new (static_cast<void*>(&m.buffer_)) M(impl);
+    }
+    static constexpr auto shared_destroy = nullptr;
+  };
+
+  template <typename M>
+  struct ValuePolicy<M, false> {
+    using Shared = SharedPayload<M>;
+    static const M& Get(const MatcherBase& m) {
+      return static_cast<Shared*>(m.buffer_.shared)->value;
+    }
+    template <typename Arg>
+    static void Init(MatcherBase& m, Arg&& arg) {
+      m.buffer_.shared = new Shared(std::forward<Arg>(arg));
+    }
+    static constexpr auto shared_destroy = &Shared::Destroy;
+  };
+
+  template <typename U, bool B>
+  struct ValuePolicy<const MatcherInterface<U>*, B> {
+    using M = const MatcherInterface<U>;
+    using Shared = SharedPayload<std::unique_ptr<M>>;
+    static const M& Get(const MatcherBase& m) {
+      return *static_cast<Shared*>(m.buffer_.shared)->value;
+    }
+    static void Init(MatcherBase& m, M* impl) {
+      m.buffer_.shared = new Shared(std::unique_ptr<M>(impl));
+    }
+
+    static constexpr auto shared_destroy = &Shared::Destroy;
+  };
+
+  template <typename M>
+  void Init(M&& m) {
+    using MM = typename std::decay<M>::type;
+    using Policy = ValuePolicy<MM>;
+    vtable_ = GetVTable<Policy>();
+    Policy::Init(*this, std::forward<M>(m));
+  }
+
+  const VTable* vtable_;
+  Buffer buffer_;
+};
+
+}  // namespace internal
+
+// A Matcher<T> is a copyable and IMMUTABLE (except by assignment)
+// object that can check whether a value of type T matches.  The
+// implementation of Matcher<T> is just a std::shared_ptr to const
+// MatcherInterface<T>.  Don't inherit from Matcher!
+template <typename T>
+class Matcher : public internal::MatcherBase<T> {
+ public:
+  // Constructs a null matcher.  Needed for storing Matcher objects in STL
+  // containers.  A default-constructed matcher is not yet initialized.  You
+  // cannot use it until a valid value has been assigned to it.
+  explicit Matcher() {}  // NOLINT
+
+  // Constructs a matcher from its implementation.
+  explicit Matcher(const MatcherInterface<const T&>* impl)
+      : internal::MatcherBase<T>(impl) {}
+
+  template <typename U>
+  explicit Matcher(
+      const MatcherInterface<U>* impl,
+      typename std::enable_if<!std::is_same<U, const U&>::value>::type* =
+          nullptr)
+      : internal::MatcherBase<T>(impl) {}
+
+  template <typename M, typename = typename std::remove_reference<
+                            M>::type::is_gtest_matcher>
+  Matcher(M&& m) : internal::MatcherBase<T>(std::forward<M>(m)) {}  // NOLINT
+
+  // Implicit constructor here allows people to write
+  // EXPECT_CALL(foo, Bar(5)) instead of EXPECT_CALL(foo, Bar(Eq(5))) sometimes
+  Matcher(T value);  // NOLINT
+};
+
+// The following two specializations allow the user to write str
+// instead of Eq(str) and "foo" instead of Eq("foo") when a std::string
+// matcher is expected.
+template <>
+class GTEST_API_ Matcher<const std::string&>
+    : public internal::MatcherBase<const std::string&> {
+ public:
+  Matcher() {}
+
+  explicit Matcher(const MatcherInterface<const std::string&>* impl)
+      : internal::MatcherBase<const std::string&>(impl) {}
+
+  template <typename M, typename = typename std::remove_reference<
+                            M>::type::is_gtest_matcher>
+  Matcher(M&& m)  // NOLINT
+      : internal::MatcherBase<const std::string&>(std::forward<M>(m)) {}
+
+  // Allows the user to write str instead of Eq(str) sometimes, where
+  // str is a std::string object.
+  Matcher(const std::string& s);  // NOLINT
+
+  // Allows the user to write "foo" instead of Eq("foo") sometimes.
+  Matcher(const char* s);  // NOLINT
+};
+
+template <>
+class GTEST_API_ Matcher<std::string>
+    : public internal::MatcherBase<std::string> {
+ public:
+  Matcher() {}
+
+  explicit Matcher(const MatcherInterface<const std::string&>* impl)
+      : internal::MatcherBase<std::string>(impl) {}
+  explicit Matcher(const MatcherInterface<std::string>* impl)
+      : internal::MatcherBase<std::string>(impl) {}
+
+  template <typename M, typename = typename std::remove_reference<
+                            M>::type::is_gtest_matcher>
+  Matcher(M&& m)  // NOLINT
+      : internal::MatcherBase<std::string>(std::forward<M>(m)) {}
+
+  // Allows the user to write str instead of Eq(str) sometimes, where
+  // str is a string object.
+  Matcher(const std::string& s);  // NOLINT
+
+  // Allows the user to write "foo" instead of Eq("foo") sometimes.
+  Matcher(const char* s);  // NOLINT
+};
+
+#if GTEST_INTERNAL_HAS_STRING_VIEW
+// The following two specializations allow the user to write str
+// instead of Eq(str) and "foo" instead of Eq("foo") when a absl::string_view
+// matcher is expected.
+template <>
+class GTEST_API_ Matcher<const internal::StringView&>
+    : public internal::MatcherBase<const internal::StringView&> {
+ public:
+  Matcher() {}
+
+  explicit Matcher(const MatcherInterface<const internal::StringView&>* impl)
+      : internal::MatcherBase<const internal::StringView&>(impl) {}
+
+  template <typename M, typename = typename std::remove_reference<
+                            M>::type::is_gtest_matcher>
+  Matcher(M&& m)  // NOLINT
+      : internal::MatcherBase<const internal::StringView&>(std::forward<M>(m)) {
+  }
+
+  // Allows the user to write str instead of Eq(str) sometimes, where
+  // str is a std::string object.
+  Matcher(const std::string& s);  // NOLINT
+
+  // Allows the user to write "foo" instead of Eq("foo") sometimes.
+  Matcher(const char* s);  // NOLINT
+
+  // Allows the user to pass absl::string_views or std::string_views directly.
+  Matcher(internal::StringView s);  // NOLINT
+};
+
+template <>
+class GTEST_API_ Matcher<internal::StringView>
+    : public internal::MatcherBase<internal::StringView> {
+ public:
+  Matcher() {}
+
+  explicit Matcher(const MatcherInterface<const internal::StringView&>* impl)
+      : internal::MatcherBase<internal::StringView>(impl) {}
+  explicit Matcher(const MatcherInterface<internal::StringView>* impl)
+      : internal::MatcherBase<internal::StringView>(impl) {}
+
+  template <typename M, typename = typename std::remove_reference<
+                            M>::type::is_gtest_matcher>
+  Matcher(M&& m)  // NOLINT
+      : internal::MatcherBase<internal::StringView>(std::forward<M>(m)) {}
+
+  // Allows the user to write str instead of Eq(str) sometimes, where
+  // str is a std::string object.
+  Matcher(const std::string& s);  // NOLINT
+
+  // Allows the user to write "foo" instead of Eq("foo") sometimes.
+  Matcher(const char* s);  // NOLINT
+
+  // Allows the user to pass absl::string_views or std::string_views directly.
+  Matcher(internal::StringView s);  // NOLINT
+};
+#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
+
+// Prints a matcher in a human-readable format.
+template <typename T>
+std::ostream& operator<<(std::ostream& os, const Matcher<T>& matcher) {
+  matcher.DescribeTo(&os);
+  return os;
+}
+
+// The PolymorphicMatcher class template makes it easy to implement a
+// polymorphic matcher (i.e. a matcher that can match values of more
+// than one type, e.g. Eq(n) and NotNull()).
+//
+// To define a polymorphic matcher, a user should provide an Impl
+// class that has a DescribeTo() method and a DescribeNegationTo()
+// method, and define a member function (or member function template)
+//
+//   bool MatchAndExplain(const Value& value,
+//                        MatchResultListener* listener) const;
+//
+// See the definition of NotNull() for a complete example.
+template <class Impl>
+class PolymorphicMatcher {
+ public:
+  explicit PolymorphicMatcher(const Impl& an_impl) : impl_(an_impl) {}
+
+  // Returns a mutable reference to the underlying matcher
+  // implementation object.
+  Impl& mutable_impl() { return impl_; }
+
+  // Returns an immutable reference to the underlying matcher
+  // implementation object.
+  const Impl& impl() const { return impl_; }
+
+  template <typename T>
+  operator Matcher<T>() const {
+    return Matcher<T>(new MonomorphicImpl<const T&>(impl_));
+  }
+
+ private:
+  template <typename T>
+  class MonomorphicImpl : public MatcherInterface<T> {
+   public:
+    explicit MonomorphicImpl(const Impl& impl) : impl_(impl) {}
+
+    void DescribeTo(::std::ostream* os) const override { impl_.DescribeTo(os); }
+
+    void DescribeNegationTo(::std::ostream* os) const override {
+      impl_.DescribeNegationTo(os);
+    }
+
+    bool MatchAndExplain(T x, MatchResultListener* listener) const override {
+      return impl_.MatchAndExplain(x, listener);
+    }
+
+   private:
+    const Impl impl_;
+  };
+
+  Impl impl_;
+};
+
+// Creates a matcher from its implementation.
+// DEPRECATED: Especially in the generic code, prefer:
+//   Matcher<T>(new MyMatcherImpl<const T&>(...));
+//
+// MakeMatcher may create a Matcher that accepts its argument by value, which
+// leads to unnecessary copies & lack of support for non-copyable types.
+template <typename T>
+inline Matcher<T> MakeMatcher(const MatcherInterface<T>* impl) {
+  return Matcher<T>(impl);
+}
+
+// Creates a polymorphic matcher from its implementation.  This is
+// easier to use than the PolymorphicMatcher<Impl> constructor as it
+// doesn't require you to explicitly write the template argument, e.g.
+//
+//   MakePolymorphicMatcher(foo);
+// vs
+//   PolymorphicMatcher<TypeOfFoo>(foo);
+template <class Impl>
+inline PolymorphicMatcher<Impl> MakePolymorphicMatcher(const Impl& impl) {
+  return PolymorphicMatcher<Impl>(impl);
+}
+
+namespace internal {
+// Implements a matcher that compares a given value with a
+// pre-supplied value using one of the ==, <=, <, etc, operators.  The
+// two values being compared don't have to have the same type.
+//
+// The matcher defined here is polymorphic (for example, Eq(5) can be
+// used to match an int, a short, a double, etc).  Therefore we use
+// a template type conversion operator in the implementation.
+//
+// The following template definition assumes that the Rhs parameter is
+// a "bare" type (i.e. neither 'const T' nor 'T&').
+template <typename D, typename Rhs, typename Op>
+class ComparisonBase {
+ public:
+  explicit ComparisonBase(const Rhs& rhs) : rhs_(rhs) {}
+
+  using is_gtest_matcher = void;
+
+  template <typename Lhs>
+  bool MatchAndExplain(const Lhs& lhs, std::ostream*) const {
+    return Op()(lhs, Unwrap(rhs_));
+  }
+  void DescribeTo(std::ostream* os) const {
+    *os << D::Desc() << " ";
+    UniversalPrint(Unwrap(rhs_), os);
+  }
+  void DescribeNegationTo(std::ostream* os) const {
+    *os << D::NegatedDesc() << " ";
+    UniversalPrint(Unwrap(rhs_), os);
+  }
+
+ private:
+  template <typename T>
+  static const T& Unwrap(const T& v) {
+    return v;
+  }
+  template <typename T>
+  static const T& Unwrap(std::reference_wrapper<T> v) {
+    return v;
+  }
+
+  Rhs rhs_;
+};
+
+template <typename Rhs>
+class EqMatcher : public ComparisonBase<EqMatcher<Rhs>, Rhs, AnyEq> {
+ public:
+  explicit EqMatcher(const Rhs& rhs)
+      : ComparisonBase<EqMatcher<Rhs>, Rhs, AnyEq>(rhs) { }
+  static const char* Desc() { return "is equal to"; }
+  static const char* NegatedDesc() { return "isn't equal to"; }
+};
+template <typename Rhs>
+class NeMatcher : public ComparisonBase<NeMatcher<Rhs>, Rhs, AnyNe> {
+ public:
+  explicit NeMatcher(const Rhs& rhs)
+      : ComparisonBase<NeMatcher<Rhs>, Rhs, AnyNe>(rhs) { }
+  static const char* Desc() { return "isn't equal to"; }
+  static const char* NegatedDesc() { return "is equal to"; }
+};
+template <typename Rhs>
+class LtMatcher : public ComparisonBase<LtMatcher<Rhs>, Rhs, AnyLt> {
+ public:
+  explicit LtMatcher(const Rhs& rhs)
+      : ComparisonBase<LtMatcher<Rhs>, Rhs, AnyLt>(rhs) { }
+  static const char* Desc() { return "is <"; }
+  static const char* NegatedDesc() { return "isn't <"; }
+};
+template <typename Rhs>
+class GtMatcher : public ComparisonBase<GtMatcher<Rhs>, Rhs, AnyGt> {
+ public:
+  explicit GtMatcher(const Rhs& rhs)
+      : ComparisonBase<GtMatcher<Rhs>, Rhs, AnyGt>(rhs) { }
+  static const char* Desc() { return "is >"; }
+  static const char* NegatedDesc() { return "isn't >"; }
+};
+template <typename Rhs>
+class LeMatcher : public ComparisonBase<LeMatcher<Rhs>, Rhs, AnyLe> {
+ public:
+  explicit LeMatcher(const Rhs& rhs)
+      : ComparisonBase<LeMatcher<Rhs>, Rhs, AnyLe>(rhs) { }
+  static const char* Desc() { return "is <="; }
+  static const char* NegatedDesc() { return "isn't <="; }
+};
+template <typename Rhs>
+class GeMatcher : public ComparisonBase<GeMatcher<Rhs>, Rhs, AnyGe> {
+ public:
+  explicit GeMatcher(const Rhs& rhs)
+      : ComparisonBase<GeMatcher<Rhs>, Rhs, AnyGe>(rhs) { }
+  static const char* Desc() { return "is >="; }
+  static const char* NegatedDesc() { return "isn't >="; }
+};
+
+template <typename T, typename = typename std::enable_if<
+                          std::is_constructible<std::string, T>::value>::type>
+using StringLike = T;
+
+// Implements polymorphic matchers MatchesRegex(regex) and
+// ContainsRegex(regex), which can be used as a Matcher<T> as long as
+// T can be converted to a string.
+class MatchesRegexMatcher {
+ public:
+  MatchesRegexMatcher(const RE* regex, bool full_match)
+      : regex_(regex), full_match_(full_match) {}
+
+#if GTEST_INTERNAL_HAS_STRING_VIEW
+  bool MatchAndExplain(const internal::StringView& s,
+                       MatchResultListener* listener) const {
+    return MatchAndExplain(std::string(s), listener);
+  }
+#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
+
+  // Accepts pointer types, particularly:
+  //   const char*
+  //   char*
+  //   const wchar_t*
+  //   wchar_t*
+  template <typename CharType>
+  bool MatchAndExplain(CharType* s, MatchResultListener* listener) const {
+    return s != nullptr && MatchAndExplain(std::string(s), listener);
+  }
+
+  // Matches anything that can convert to std::string.
+  //
+  // This is a template, not just a plain function with const std::string&,
+  // because absl::string_view has some interfering non-explicit constructors.
+  template <class MatcheeStringType>
+  bool MatchAndExplain(const MatcheeStringType& s,
+                       MatchResultListener* /* listener */) const {
+    const std::string& s2(s);
+    return full_match_ ? RE::FullMatch(s2, *regex_)
+                       : RE::PartialMatch(s2, *regex_);
+  }
+
+  void DescribeTo(::std::ostream* os) const {
+    *os << (full_match_ ? "matches" : "contains") << " regular expression ";
+    UniversalPrinter<std::string>::Print(regex_->pattern(), os);
+  }
+
+  void DescribeNegationTo(::std::ostream* os) const {
+    *os << "doesn't " << (full_match_ ? "match" : "contain")
+        << " regular expression ";
+    UniversalPrinter<std::string>::Print(regex_->pattern(), os);
+  }
+
+ private:
+  const std::shared_ptr<const RE> regex_;
+  const bool full_match_;
+};
+}  // namespace internal
+
+// Matches a string that fully matches regular expression 'regex'.
+// The matcher takes ownership of 'regex'.
+inline PolymorphicMatcher<internal::MatchesRegexMatcher> MatchesRegex(
+    const internal::RE* regex) {
+  return MakePolymorphicMatcher(internal::MatchesRegexMatcher(regex, true));
+}
+template <typename T = std::string>
+PolymorphicMatcher<internal::MatchesRegexMatcher> MatchesRegex(
+    const internal::StringLike<T>& regex) {
+  return MatchesRegex(new internal::RE(std::string(regex)));
+}
+
+// Matches a string that contains regular expression 'regex'.
+// The matcher takes ownership of 'regex'.
+inline PolymorphicMatcher<internal::MatchesRegexMatcher> ContainsRegex(
+    const internal::RE* regex) {
+  return MakePolymorphicMatcher(internal::MatchesRegexMatcher(regex, false));
+}
+template <typename T = std::string>
+PolymorphicMatcher<internal::MatchesRegexMatcher> ContainsRegex(
+    const internal::StringLike<T>& regex) {
+  return ContainsRegex(new internal::RE(std::string(regex)));
+}
+
+// Creates a polymorphic matcher that matches anything equal to x.
+// Note: if the parameter of Eq() were declared as const T&, Eq("foo")
+// wouldn't compile.
+template <typename T>
+inline internal::EqMatcher<T> Eq(T x) { return internal::EqMatcher<T>(x); }
+
+// Constructs a Matcher<T> from a 'value' of type T.  The constructed
+// matcher matches any value that's equal to 'value'.
+template <typename T>
+Matcher<T>::Matcher(T value) { *this = Eq(value); }
+
+// Creates a monomorphic matcher that matches anything with type Lhs
+// and equal to rhs.  A user may need to use this instead of Eq(...)
+// in order to resolve an overloading ambiguity.
+//
+// TypedEq<T>(x) is just a convenient short-hand for Matcher<T>(Eq(x))
+// or Matcher<T>(x), but more readable than the latter.
+//
+// We could define similar monomorphic matchers for other comparison
+// operations (e.g. TypedLt, TypedGe, and etc), but decided not to do
+// it yet as those are used much less than Eq() in practice.  A user
+// can always write Matcher<T>(Lt(5)) to be explicit about the type,
+// for example.
+template <typename Lhs, typename Rhs>
+inline Matcher<Lhs> TypedEq(const Rhs& rhs) { return Eq(rhs); }
+
+// Creates a polymorphic matcher that matches anything >= x.
+template <typename Rhs>
+inline internal::GeMatcher<Rhs> Ge(Rhs x) {
+  return internal::GeMatcher<Rhs>(x);
+}
+
+// Creates a polymorphic matcher that matches anything > x.
+template <typename Rhs>
+inline internal::GtMatcher<Rhs> Gt(Rhs x) {
+  return internal::GtMatcher<Rhs>(x);
+}
+
+// Creates a polymorphic matcher that matches anything <= x.
+template <typename Rhs>
+inline internal::LeMatcher<Rhs> Le(Rhs x) {
+  return internal::LeMatcher<Rhs>(x);
+}
+
+// Creates a polymorphic matcher that matches anything < x.
+template <typename Rhs>
+inline internal::LtMatcher<Rhs> Lt(Rhs x) {
+  return internal::LtMatcher<Rhs>(x);
+}
+
+// Creates a polymorphic matcher that matches anything != x.
+template <typename Rhs>
+inline internal::NeMatcher<Rhs> Ne(Rhs x) {
+  return internal::NeMatcher<Rhs>(x);
+}
+}  // namespace testing
+
+GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251 5046
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_GTEST_MATCHERS_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest-message.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest-message.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest-message.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest-message.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,219 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+//
+// The Google C++ Testing and Mocking Framework (Google Test)
+//
+// This header file defines the Message class.
+//
+// IMPORTANT NOTE: Due to limitation of the C++ language, we have to
+// leave some internal implementation details in this header file.
+// They are clearly marked by comments like this:
+//
+//   // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+//
+// Such code is NOT meant to be used by a user directly, and is subject
+// to CHANGE WITHOUT NOTICE.  Therefore DO NOT DEPEND ON IT in a user
+// program!
+
+// GOOGLETEST_CM0001 DO NOT DELETE
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_MESSAGE_H_
+#define GOOGLETEST_INCLUDE_GTEST_GTEST_MESSAGE_H_
+
+#include <limits>
+#include <memory>
+#include <sstream>
+
+#include "gtest/internal/gtest-port.h"
+
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
+/* class A needs to have dll-interface to be used by clients of class B */)
+
+// Ensures that there is at least one operator<< in the global namespace.
+// See Message& operator<<(...) below for why.
+void operator<<(const testing::internal::Secret&, int);
+
+namespace testing {
+
+// The Message class works like an ostream repeater.
+//
+// Typical usage:
+//
+//   1. You stream a bunch of values to a Message object.
+//      It will remember the text in a stringstream.
+//   2. Then you stream the Message object to an ostream.
+//      This causes the text in the Message to be streamed
+//      to the ostream.
+//
+// For example;
+//
+//   testing::Message foo;
+//   foo << 1 << " != " << 2;
+//   std::cout << foo;
+//
+// will print "1 != 2".
+//
+// Message is not intended to be inherited from.  In particular, its
+// destructor is not virtual.
+//
+// Note that stringstream behaves differently in gcc and in MSVC.  You
+// can stream a NULL char pointer to it in the former, but not in the
+// latter (it causes an access violation if you do).  The Message
+// class hides this difference by treating a NULL char pointer as
+// "(null)".
+class GTEST_API_ Message {
+ private:
+  // The type of basic IO manipulators (endl, ends, and flush) for
+  // narrow streams.
+  typedef std::ostream& (*BasicNarrowIoManip)(std::ostream&);
+
+ public:
+  // Constructs an empty Message.
+  Message();
+
+  // Copy constructor.
+  Message(const Message& msg) : ss_(new ::std::stringstream) {  // NOLINT
+    *ss_ << msg.GetString();
+  }
+
+  // Constructs a Message from a C-string.
+  explicit Message(const char* str) : ss_(new ::std::stringstream) {
+    *ss_ << str;
+  }
+
+  // Streams a non-pointer value to this object.
+  template <typename T>
+  inline Message& operator <<(const T& val) {
+    // Some libraries overload << for STL containers.  These
+    // overloads are defined in the global namespace instead of ::std.
+    //
+    // C++'s symbol lookup rule (i.e. Koenig lookup) says that these
+    // overloads are visible in either the std namespace or the global
+    // namespace, but not other namespaces, including the testing
+    // namespace which Google Test's Message class is in.
+    //
+    // To allow STL containers (and other types that has a << operator
+    // defined in the global namespace) to be used in Google Test
+    // assertions, testing::Message must access the custom << operator
+    // from the global namespace.  With this using declaration,
+    // overloads of << defined in the global namespace and those
+    // visible via Koenig lookup are both exposed in this function.
+    using ::operator <<;
+    *ss_ << val;
+    return *this;
+  }
+
+  // Streams a pointer value to this object.
+  //
+  // This function is an overload of the previous one.  When you
+  // stream a pointer to a Message, this definition will be used as it
+  // is more specialized.  (The C++ Standard, section
+  // [temp.func.order].)  If you stream a non-pointer, then the
+  // previous definition will be used.
+  //
+  // The reason for this overload is that streaming a NULL pointer to
+  // ostream is undefined behavior.  Depending on the compiler, you
+  // may get "0", "(nil)", "(null)", or an access violation.  To
+  // ensure consistent result across compilers, we always treat NULL
+  // as "(null)".
+  template <typename T>
+  inline Message& operator <<(T* const& pointer) {  // NOLINT
+    if (pointer == nullptr) {
+      *ss_ << "(null)";
+    } else {
+      *ss_ << pointer;
+    }
+    return *this;
+  }
+
+  // Since the basic IO manipulators are overloaded for both narrow
+  // and wide streams, we have to provide this specialized definition
+  // of operator <<, even though its body is the same as the
+  // templatized version above.  Without this definition, streaming
+  // endl or other basic IO manipulators to Message will confuse the
+  // compiler.
+  Message& operator <<(BasicNarrowIoManip val) {
+    *ss_ << val;
+    return *this;
+  }
+
+  // Instead of 1/0, we want to see true/false for bool values.
+  Message& operator <<(bool b) {
+    return *this << (b ? "true" : "false");
+  }
+
+  // These two overloads allow streaming a wide C string to a Message
+  // using the UTF-8 encoding.
+  Message& operator <<(const wchar_t* wide_c_str);
+  Message& operator <<(wchar_t* wide_c_str);
+
+#if GTEST_HAS_STD_WSTRING
+  // Converts the given wide string to a narrow string using the UTF-8
+  // encoding, and streams the result to this Message object.
+  Message& operator <<(const ::std::wstring& wstr);
+#endif  // GTEST_HAS_STD_WSTRING
+
+  // Gets the text streamed to this object so far as an std::string.
+  // Each '\0' character in the buffer is replaced with "\\0".
+  //
+  // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+  std::string GetString() const;
+
+ private:
+  // We'll hold the text streamed to this object here.
+  const std::unique_ptr< ::std::stringstream> ss_;
+
+  // We declare (but don't implement) this to prevent the compiler
+  // from implementing the assignment operator.
+  void operator=(const Message&);
+};
+
+// Streams a Message to an ostream.
+inline std::ostream& operator <<(std::ostream& os, const Message& sb) {
+  return os << sb.GetString();
+}
+
+namespace internal {
+
+// Converts a streamable value to an std::string.  A NULL pointer is
+// converted to "(null)".  When the input value is a ::string,
+// ::std::string, ::wstring, or ::std::wstring object, each NUL
+// character in it is replaced with "\\0".
+template <typename T>
+std::string StreamableToString(const T& streamable) {
+  return (Message() << streamable).GetString();
+}
+
+}  // namespace internal
+}  // namespace testing
+
+GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_GTEST_MESSAGE_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest-param-test.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest-param-test.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest-param-test.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest-param-test.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,507 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Macros and functions for implementing parameterized tests
+// in Google C++ Testing and Mocking Framework (Google Test)
+//
+// GOOGLETEST_CM0001 DO NOT DELETE
+#ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_
+#define GOOGLETEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_
+
+// Value-parameterized tests allow you to test your code with different
+// parameters without writing multiple copies of the same test.
+//
+// Here is how you use value-parameterized tests:
+
+#if 0
+
+// To write value-parameterized tests, first you should define a fixture
+// class. It is usually derived from testing::TestWithParam<T> (see below for
+// another inheritance scheme that's sometimes useful in more complicated
+// class hierarchies), where the type of your parameter values.
+// TestWithParam<T> is itself derived from testing::Test. T can be any
+// copyable type. If it's a raw pointer, you are responsible for managing the
+// lifespan of the pointed values.
+
+class FooTest : public ::testing::TestWithParam<const char*> {
+  // You can implement all the usual class fixture members here.
+};
+
+// Then, use the TEST_P macro to define as many parameterized tests
+// for this fixture as you want. The _P suffix is for "parameterized"
+// or "pattern", whichever you prefer to think.
+
+TEST_P(FooTest, DoesBlah) {
+  // Inside a test, access the test parameter with the GetParam() method
+  // of the TestWithParam<T> class:
+  EXPECT_TRUE(foo.Blah(GetParam()));
+  ...
+}
+
+TEST_P(FooTest, HasBlahBlah) {
+  ...
+}
+
+// Finally, you can use INSTANTIATE_TEST_SUITE_P to instantiate the test
+// case with any set of parameters you want. Google Test defines a number
+// of functions for generating test parameters. They return what we call
+// (surprise!) parameter generators. Here is a summary of them, which
+// are all in the testing namespace:
+//
+//
+//  Range(begin, end [, step]) - Yields values {begin, begin+step,
+//                               begin+step+step, ...}. The values do not
+//                               include end. step defaults to 1.
+//  Values(v1, v2, ..., vN)    - Yields values {v1, v2, ..., vN}.
+//  ValuesIn(container)        - Yields values from a C-style array, an STL
+//  ValuesIn(begin,end)          container, or an iterator range [begin, end).
+//  Bool()                     - Yields sequence {false, true}.
+//  Combine(g1, g2, ..., gN)   - Yields all combinations (the Cartesian product
+//                               for the math savvy) of the values generated
+//                               by the N generators.
+//
+// For more details, see comments at the definitions of these functions below
+// in this file.
+//
+// The following statement will instantiate tests from the FooTest test suite
+// each with parameter values "meeny", "miny", and "moe".
+
+INSTANTIATE_TEST_SUITE_P(InstantiationName,
+                         FooTest,
+                         Values("meeny", "miny", "moe"));
+
+// To distinguish different instances of the pattern, (yes, you
+// can instantiate it more than once) the first argument to the
+// INSTANTIATE_TEST_SUITE_P macro is a prefix that will be added to the
+// actual test suite name. Remember to pick unique prefixes for different
+// instantiations. The tests from the instantiation above will have
+// these names:
+//
+//    * InstantiationName/FooTest.DoesBlah/0 for "meeny"
+//    * InstantiationName/FooTest.DoesBlah/1 for "miny"
+//    * InstantiationName/FooTest.DoesBlah/2 for "moe"
+//    * InstantiationName/FooTest.HasBlahBlah/0 for "meeny"
+//    * InstantiationName/FooTest.HasBlahBlah/1 for "miny"
+//    * InstantiationName/FooTest.HasBlahBlah/2 for "moe"
+//
+// You can use these names in --gtest_filter.
+//
+// This statement will instantiate all tests from FooTest again, each
+// with parameter values "cat" and "dog":
+
+const char* pets[] = {"cat", "dog"};
+INSTANTIATE_TEST_SUITE_P(AnotherInstantiationName, FooTest, ValuesIn(pets));
+
+// The tests from the instantiation above will have these names:
+//
+//    * AnotherInstantiationName/FooTest.DoesBlah/0 for "cat"
+//    * AnotherInstantiationName/FooTest.DoesBlah/1 for "dog"
+//    * AnotherInstantiationName/FooTest.HasBlahBlah/0 for "cat"
+//    * AnotherInstantiationName/FooTest.HasBlahBlah/1 for "dog"
+//
+// Please note that INSTANTIATE_TEST_SUITE_P will instantiate all tests
+// in the given test suite, whether their definitions come before or
+// AFTER the INSTANTIATE_TEST_SUITE_P statement.
+//
+// Please also note that generator expressions (including parameters to the
+// generators) are evaluated in InitGoogleTest(), after main() has started.
+// This allows the user on one hand, to adjust generator parameters in order
+// to dynamically determine a set of tests to run and on the other hand,
+// give the user a chance to inspect the generated tests with Google Test
+// reflection API before RUN_ALL_TESTS() is executed.
+//
+// You can see samples/sample7_unittest.cc and samples/sample8_unittest.cc
+// for more examples.
+//
+// In the future, we plan to publish the API for defining new parameter
+// generators. But for now this interface remains part of the internal
+// implementation and is subject to change.
+//
+//
+// A parameterized test fixture must be derived from testing::Test and from
+// testing::WithParamInterface<T>, where T is the type of the parameter
+// values. Inheriting from TestWithParam<T> satisfies that requirement because
+// TestWithParam<T> inherits from both Test and WithParamInterface. In more
+// complicated hierarchies, however, it is occasionally useful to inherit
+// separately from Test and WithParamInterface. For example:
+
+class BaseTest : public ::testing::Test {
+  // You can inherit all the usual members for a non-parameterized test
+  // fixture here.
+};
+
+class DerivedTest : public BaseTest, public ::testing::WithParamInterface<int> {
+  // The usual test fixture members go here too.
+};
+
+TEST_F(BaseTest, HasFoo) {
+  // This is an ordinary non-parameterized test.
+}
+
+TEST_P(DerivedTest, DoesBlah) {
+  // GetParam works just the same here as if you inherit from TestWithParam.
+  EXPECT_TRUE(foo.Blah(GetParam()));
+}
+
+#endif  // 0
+
+#include <iterator>
+#include <utility>
+
+#include "gtest/internal/gtest-internal.h"
+#include "gtest/internal/gtest-param-util.h"
+#include "gtest/internal/gtest-port.h"
+
+namespace testing {
+
+// Functions producing parameter generators.
+//
+// Google Test uses these generators to produce parameters for value-
+// parameterized tests. When a parameterized test suite is instantiated
+// with a particular generator, Google Test creates and runs tests
+// for each element in the sequence produced by the generator.
+//
+// In the following sample, tests from test suite FooTest are instantiated
+// each three times with parameter values 3, 5, and 8:
+//
+// class FooTest : public TestWithParam<int> { ... };
+//
+// TEST_P(FooTest, TestThis) {
+// }
+// TEST_P(FooTest, TestThat) {
+// }
+// INSTANTIATE_TEST_SUITE_P(TestSequence, FooTest, Values(3, 5, 8));
+//
+
+// Range() returns generators providing sequences of values in a range.
+//
+// Synopsis:
+// Range(start, end)
+//   - returns a generator producing a sequence of values {start, start+1,
+//     start+2, ..., }.
+// Range(start, end, step)
+//   - returns a generator producing a sequence of values {start, start+step,
+//     start+step+step, ..., }.
+// Notes:
+//   * The generated sequences never include end. For example, Range(1, 5)
+//     returns a generator producing a sequence {1, 2, 3, 4}. Range(1, 9, 2)
+//     returns a generator producing {1, 3, 5, 7}.
+//   * start and end must have the same type. That type may be any integral or
+//     floating-point type or a user defined type satisfying these conditions:
+//     * It must be assignable (have operator=() defined).
+//     * It must have operator+() (operator+(int-compatible type) for
+//       two-operand version).
+//     * It must have operator<() defined.
+//     Elements in the resulting sequences will also have that type.
+//   * Condition start < end must be satisfied in order for resulting sequences
+//     to contain any elements.
+//
+template <typename T, typename IncrementT>
+internal::ParamGenerator<T> Range(T start, T end, IncrementT step) {
+  return internal::ParamGenerator<T>(
+      new internal::RangeGenerator<T, IncrementT>(start, end, step));
+}
+
+template <typename T>
+internal::ParamGenerator<T> Range(T start, T end) {
+  return Range(start, end, 1);
+}
+
+// ValuesIn() function allows generation of tests with parameters coming from
+// a container.
+//
+// Synopsis:
+// ValuesIn(const T (&array)[N])
+//   - returns a generator producing sequences with elements from
+//     a C-style array.
+// ValuesIn(const Container& container)
+//   - returns a generator producing sequences with elements from
+//     an STL-style container.
+// ValuesIn(Iterator begin, Iterator end)
+//   - returns a generator producing sequences with elements from
+//     a range [begin, end) defined by a pair of STL-style iterators. These
+//     iterators can also be plain C pointers.
+//
+// Please note that ValuesIn copies the values from the containers
+// passed in and keeps them to generate tests in RUN_ALL_TESTS().
+//
+// Examples:
+//
+// This instantiates tests from test suite StringTest
+// each with C-string values of "foo", "bar", and "baz":
+//
+// const char* strings[] = {"foo", "bar", "baz"};
+// INSTANTIATE_TEST_SUITE_P(StringSequence, StringTest, ValuesIn(strings));
+//
+// This instantiates tests from test suite StlStringTest
+// each with STL strings with values "a" and "b":
+//
+// ::std::vector< ::std::string> GetParameterStrings() {
+//   ::std::vector< ::std::string> v;
+//   v.push_back("a");
+//   v.push_back("b");
+//   return v;
+// }
+//
+// INSTANTIATE_TEST_SUITE_P(CharSequence,
+//                          StlStringTest,
+//                          ValuesIn(GetParameterStrings()));
+//
+//
+// This will also instantiate tests from CharTest
+// each with parameter values 'a' and 'b':
+//
+// ::std::list<char> GetParameterChars() {
+//   ::std::list<char> list;
+//   list.push_back('a');
+//   list.push_back('b');
+//   return list;
+// }
+// ::std::list<char> l = GetParameterChars();
+// INSTANTIATE_TEST_SUITE_P(CharSequence2,
+//                          CharTest,
+//                          ValuesIn(l.begin(), l.end()));
+//
+template <typename ForwardIterator>
+internal::ParamGenerator<
+    typename std::iterator_traits<ForwardIterator>::value_type>
+ValuesIn(ForwardIterator begin, ForwardIterator end) {
+  typedef typename std::iterator_traits<ForwardIterator>::value_type ParamType;
+  return internal::ParamGenerator<ParamType>(
+      new internal::ValuesInIteratorRangeGenerator<ParamType>(begin, end));
+}
+
+template <typename T, size_t N>
+internal::ParamGenerator<T> ValuesIn(const T (&array)[N]) {
+  return ValuesIn(array, array + N);
+}
+
+template <class Container>
+internal::ParamGenerator<typename Container::value_type> ValuesIn(
+    const Container& container) {
+  return ValuesIn(container.begin(), container.end());
+}
+
+// Values() allows generating tests from explicitly specified list of
+// parameters.
+//
+// Synopsis:
+// Values(T v1, T v2, ..., T vN)
+//   - returns a generator producing sequences with elements v1, v2, ..., vN.
+//
+// For example, this instantiates tests from test suite BarTest each
+// with values "one", "two", and "three":
+//
+// INSTANTIATE_TEST_SUITE_P(NumSequence,
+//                          BarTest,
+//                          Values("one", "two", "three"));
+//
+// This instantiates tests from test suite BazTest each with values 1, 2, 3.5.
+// The exact type of values will depend on the type of parameter in BazTest.
+//
+// INSTANTIATE_TEST_SUITE_P(FloatingNumbers, BazTest, Values(1, 2, 3.5));
+//
+//
+template <typename... T>
+internal::ValueArray<T...> Values(T... v) {
+  return internal::ValueArray<T...>(std::move(v)...);
+}
+
+// Bool() allows generating tests with parameters in a set of (false, true).
+//
+// Synopsis:
+// Bool()
+//   - returns a generator producing sequences with elements {false, true}.
+//
+// It is useful when testing code that depends on Boolean flags. Combinations
+// of multiple flags can be tested when several Bool()'s are combined using
+// Combine() function.
+//
+// In the following example all tests in the test suite FlagDependentTest
+// will be instantiated twice with parameters false and true.
+//
+// class FlagDependentTest : public testing::TestWithParam<bool> {
+//   virtual void SetUp() {
+//     external_flag = GetParam();
+//   }
+// }
+// INSTANTIATE_TEST_SUITE_P(BoolSequence, FlagDependentTest, Bool());
+//
+inline internal::ParamGenerator<bool> Bool() {
+  return Values(false, true);
+}
+
+// Combine() allows the user to combine two or more sequences to produce
+// values of a Cartesian product of those sequences' elements.
+//
+// Synopsis:
+// Combine(gen1, gen2, ..., genN)
+//   - returns a generator producing sequences with elements coming from
+//     the Cartesian product of elements from the sequences generated by
+//     gen1, gen2, ..., genN. The sequence elements will have a type of
+//     std::tuple<T1, T2, ..., TN> where T1, T2, ..., TN are the types
+//     of elements from sequences produces by gen1, gen2, ..., genN.
+//
+// Example:
+//
+// This will instantiate tests in test suite AnimalTest each one with
+// the parameter values tuple("cat", BLACK), tuple("cat", WHITE),
+// tuple("dog", BLACK), and tuple("dog", WHITE):
+//
+// enum Color { BLACK, GRAY, WHITE };
+// class AnimalTest
+//     : public testing::TestWithParam<std::tuple<const char*, Color> > {...};
+//
+// TEST_P(AnimalTest, AnimalLooksNice) {...}
+//
+// INSTANTIATE_TEST_SUITE_P(AnimalVariations, AnimalTest,
+//                          Combine(Values("cat", "dog"),
+//                                  Values(BLACK, WHITE)));
+//
+// This will instantiate tests in FlagDependentTest with all variations of two
+// Boolean flags:
+//
+// class FlagDependentTest
+//     : public testing::TestWithParam<std::tuple<bool, bool> > {
+//   virtual void SetUp() {
+//     // Assigns external_flag_1 and external_flag_2 values from the tuple.
+//     std::tie(external_flag_1, external_flag_2) = GetParam();
+//   }
+// };
+//
+// TEST_P(FlagDependentTest, TestFeature1) {
+//   // Test your code using external_flag_1 and external_flag_2 here.
+// }
+// INSTANTIATE_TEST_SUITE_P(TwoBoolSequence, FlagDependentTest,
+//                          Combine(Bool(), Bool()));
+//
+template <typename... Generator>
+internal::CartesianProductHolder<Generator...> Combine(const Generator&... g) {
+  return internal::CartesianProductHolder<Generator...>(g...);
+}
+
+#define TEST_P(test_suite_name, test_name)                                     \
+  class GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)                     \
+      : public test_suite_name {                                               \
+   public:                                                                     \
+    GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)() {}                    \
+    void TestBody() override;                                                  \
+                                                                               \
+   private:                                                                    \
+    static int AddToRegistry() {                                               \
+      ::testing::UnitTest::GetInstance()                                       \
+          ->parameterized_test_registry()                                      \
+          .GetTestSuitePatternHolder<test_suite_name>(                         \
+              GTEST_STRINGIFY_(test_suite_name),                               \
+              ::testing::internal::CodeLocation(__FILE__, __LINE__))           \
+          ->AddTestPattern(                                                    \
+              GTEST_STRINGIFY_(test_suite_name), GTEST_STRINGIFY_(test_name),  \
+              new ::testing::internal::TestMetaFactory<GTEST_TEST_CLASS_NAME_( \
+                  test_suite_name, test_name)>(),                              \
+              ::testing::internal::CodeLocation(__FILE__, __LINE__));          \
+      return 0;                                                                \
+    }                                                                          \
+    static int gtest_registering_dummy_ GTEST_ATTRIBUTE_UNUSED_;               \
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(GTEST_TEST_CLASS_NAME_(test_suite_name,    \
+                                                           test_name));        \
+  };                                                                           \
+  int GTEST_TEST_CLASS_NAME_(test_suite_name,                                  \
+                             test_name)::gtest_registering_dummy_ =            \
+      GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::AddToRegistry();     \
+  void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::TestBody()
+
+// The last argument to INSTANTIATE_TEST_SUITE_P allows the user to specify
+// generator and an optional function or functor that generates custom test name
+// suffixes based on the test parameters. Such a function or functor should
+// accept one argument of type testing::TestParamInfo<class ParamType>, and
+// return std::string.
+//
+// testing::PrintToStringParamName is a builtin test suffix generator that
+// returns the value of testing::PrintToString(GetParam()).
+//
+// Note: test names must be non-empty, unique, and may only contain ASCII
+// alphanumeric characters or underscore. Because PrintToString adds quotes
+// to std::string and C strings, it won't work for these types.
+
+#define GTEST_EXPAND_(arg) arg
+#define GTEST_GET_FIRST_(first, ...) first
+#define GTEST_GET_SECOND_(first, second, ...) second
+
+#define INSTANTIATE_TEST_SUITE_P(prefix, test_suite_name, ...)                \
+  static ::testing::internal::ParamGenerator<test_suite_name::ParamType>      \
+      gtest_##prefix##test_suite_name##_EvalGenerator_() {                    \
+    return GTEST_EXPAND_(GTEST_GET_FIRST_(__VA_ARGS__, DUMMY_PARAM_));        \
+  }                                                                           \
+  static ::std::string gtest_##prefix##test_suite_name##_EvalGenerateName_(   \
+      const ::testing::TestParamInfo<test_suite_name::ParamType>& info) {     \
+    if (::testing::internal::AlwaysFalse()) {                                 \
+      ::testing::internal::TestNotEmpty(GTEST_EXPAND_(GTEST_GET_SECOND_(      \
+          __VA_ARGS__,                                                        \
+          ::testing::internal::DefaultParamName<test_suite_name::ParamType>,  \
+          DUMMY_PARAM_)));                                                    \
+      auto t = std::make_tuple(__VA_ARGS__);                                  \
+      static_assert(std::tuple_size<decltype(t)>::value <= 2,                 \
+                    "Too Many Args!");                                        \
+    }                                                                         \
+    return ((GTEST_EXPAND_(GTEST_GET_SECOND_(                                 \
+        __VA_ARGS__,                                                          \
+        ::testing::internal::DefaultParamName<test_suite_name::ParamType>,    \
+        DUMMY_PARAM_))))(info);                                               \
+  }                                                                           \
+  static int gtest_##prefix##test_suite_name##_dummy_                         \
+      GTEST_ATTRIBUTE_UNUSED_ =                                               \
+          ::testing::UnitTest::GetInstance()                                  \
+              ->parameterized_test_registry()                                 \
+              .GetTestSuitePatternHolder<test_suite_name>(                    \
+                  GTEST_STRINGIFY_(test_suite_name),                          \
+                  ::testing::internal::CodeLocation(__FILE__, __LINE__))      \
+              ->AddTestSuiteInstantiation(                                    \
+                  GTEST_STRINGIFY_(prefix),                                   \
+                  &gtest_##prefix##test_suite_name##_EvalGenerator_,          \
+                  &gtest_##prefix##test_suite_name##_EvalGenerateName_,       \
+                  __FILE__, __LINE__)
+
+
+// Allow Marking a Parameterized test class as not needing to be instantiated.
+#define GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(T)                   \
+  namespace gtest_do_not_use_outside_namespace_scope {}                   \
+  static const ::testing::internal::MarkAsIgnored gtest_allow_ignore_##T( \
+      GTEST_STRINGIFY_(T))
+
+// Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+#define INSTANTIATE_TEST_CASE_P                                            \
+  static_assert(::testing::internal::InstantiateTestCase_P_IsDeprecated(), \
+                "");                                                       \
+  INSTANTIATE_TEST_SUITE_P
+#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+}  // namespace testing
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest_pred_impl.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest_pred_impl.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest_pred_impl.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest_pred_impl.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,359 @@
+// Copyright 2006, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// This file is AUTOMATICALLY GENERATED on 01/02/2019 by command
+// 'gen_gtest_pred_impl.py 5'.  DO NOT EDIT BY HAND!
+//
+// Implements a family of generic predicate assertion macros.
+// GOOGLETEST_CM0001 DO NOT DELETE
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_
+#define GOOGLETEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_
+
+#include "gtest/gtest.h"
+
+namespace testing {
+
+// This header implements a family of generic predicate assertion
+// macros:
+//
+//   ASSERT_PRED_FORMAT1(pred_format, v1)
+//   ASSERT_PRED_FORMAT2(pred_format, v1, v2)
+//   ...
+//
+// where pred_format is a function or functor that takes n (in the
+// case of ASSERT_PRED_FORMATn) values and their source expression
+// text, and returns a testing::AssertionResult.  See the definition
+// of ASSERT_EQ in gtest.h for an example.
+//
+// If you don't care about formatting, you can use the more
+// restrictive version:
+//
+//   ASSERT_PRED1(pred, v1)
+//   ASSERT_PRED2(pred, v1, v2)
+//   ...
+//
+// where pred is an n-ary function or functor that returns bool,
+// and the values v1, v2, ..., must support the << operator for
+// streaming to std::ostream.
+//
+// We also define the EXPECT_* variations.
+//
+// For now we only support predicates whose arity is at most 5.
+// Please email googletestframework@googlegroups.com if you need
+// support for higher arities.
+
+// GTEST_ASSERT_ is the basic statement to which all of the assertions
+// in this file reduce.  Don't use this in your code.
+
+#define GTEST_ASSERT_(expression, on_failure) \
+  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
+  if (const ::testing::AssertionResult gtest_ar = (expression)) \
+    ; \
+  else \
+    on_failure(gtest_ar.failure_message())
+
+
+// Helper function for implementing {EXPECT|ASSERT}_PRED1.  Don't use
+// this in your code.
+template <typename Pred,
+          typename T1>
+AssertionResult AssertPred1Helper(const char* pred_text,
+                                  const char* e1,
+                                  Pred pred,
+                                  const T1& v1) {
+  if (pred(v1)) return AssertionSuccess();
+
+  return AssertionFailure()
+         << pred_text << "(" << e1 << ") evaluates to false, where"
+         << "\n"
+         << e1 << " evaluates to " << ::testing::PrintToString(v1);
+}
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT1.
+// Don't use this in your code.
+#define GTEST_PRED_FORMAT1_(pred_format, v1, on_failure)\
+  GTEST_ASSERT_(pred_format(#v1, v1), \
+                on_failure)
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED1.  Don't use
+// this in your code.
+#define GTEST_PRED1_(pred, v1, on_failure)\
+  GTEST_ASSERT_(::testing::AssertPred1Helper(#pred, \
+                                             #v1, \
+                                             pred, \
+                                             v1), on_failure)
+
+// Unary predicate assertion macros.
+#define EXPECT_PRED_FORMAT1(pred_format, v1) \
+  GTEST_PRED_FORMAT1_(pred_format, v1, GTEST_NONFATAL_FAILURE_)
+#define EXPECT_PRED1(pred, v1) \
+  GTEST_PRED1_(pred, v1, GTEST_NONFATAL_FAILURE_)
+#define ASSERT_PRED_FORMAT1(pred_format, v1) \
+  GTEST_PRED_FORMAT1_(pred_format, v1, GTEST_FATAL_FAILURE_)
+#define ASSERT_PRED1(pred, v1) \
+  GTEST_PRED1_(pred, v1, GTEST_FATAL_FAILURE_)
+
+
+
+// Helper function for implementing {EXPECT|ASSERT}_PRED2.  Don't use
+// this in your code.
+template <typename Pred,
+          typename T1,
+          typename T2>
+AssertionResult AssertPred2Helper(const char* pred_text,
+                                  const char* e1,
+                                  const char* e2,
+                                  Pred pred,
+                                  const T1& v1,
+                                  const T2& v2) {
+  if (pred(v1, v2)) return AssertionSuccess();
+
+  return AssertionFailure()
+         << pred_text << "(" << e1 << ", " << e2
+         << ") evaluates to false, where"
+         << "\n"
+         << e1 << " evaluates to " << ::testing::PrintToString(v1) << "\n"
+         << e2 << " evaluates to " << ::testing::PrintToString(v2);
+}
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT2.
+// Don't use this in your code.
+#define GTEST_PRED_FORMAT2_(pred_format, v1, v2, on_failure)\
+  GTEST_ASSERT_(pred_format(#v1, #v2, v1, v2), \
+                on_failure)
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED2.  Don't use
+// this in your code.
+#define GTEST_PRED2_(pred, v1, v2, on_failure)\
+  GTEST_ASSERT_(::testing::AssertPred2Helper(#pred, \
+                                             #v1, \
+                                             #v2, \
+                                             pred, \
+                                             v1, \
+                                             v2), on_failure)
+
+// Binary predicate assertion macros.
+#define EXPECT_PRED_FORMAT2(pred_format, v1, v2) \
+  GTEST_PRED_FORMAT2_(pred_format, v1, v2, GTEST_NONFATAL_FAILURE_)
+#define EXPECT_PRED2(pred, v1, v2) \
+  GTEST_PRED2_(pred, v1, v2, GTEST_NONFATAL_FAILURE_)
+#define ASSERT_PRED_FORMAT2(pred_format, v1, v2) \
+  GTEST_PRED_FORMAT2_(pred_format, v1, v2, GTEST_FATAL_FAILURE_)
+#define ASSERT_PRED2(pred, v1, v2) \
+  GTEST_PRED2_(pred, v1, v2, GTEST_FATAL_FAILURE_)
+
+
+
+// Helper function for implementing {EXPECT|ASSERT}_PRED3.  Don't use
+// this in your code.
+template <typename Pred,
+          typename T1,
+          typename T2,
+          typename T3>
+AssertionResult AssertPred3Helper(const char* pred_text,
+                                  const char* e1,
+                                  const char* e2,
+                                  const char* e3,
+                                  Pred pred,
+                                  const T1& v1,
+                                  const T2& v2,
+                                  const T3& v3) {
+  if (pred(v1, v2, v3)) return AssertionSuccess();
+
+  return AssertionFailure()
+         << pred_text << "(" << e1 << ", " << e2 << ", " << e3
+         << ") evaluates to false, where"
+         << "\n"
+         << e1 << " evaluates to " << ::testing::PrintToString(v1) << "\n"
+         << e2 << " evaluates to " << ::testing::PrintToString(v2) << "\n"
+         << e3 << " evaluates to " << ::testing::PrintToString(v3);
+}
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT3.
+// Don't use this in your code.
+#define GTEST_PRED_FORMAT3_(pred_format, v1, v2, v3, on_failure)\
+  GTEST_ASSERT_(pred_format(#v1, #v2, #v3, v1, v2, v3), \
+                on_failure)
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED3.  Don't use
+// this in your code.
+#define GTEST_PRED3_(pred, v1, v2, v3, on_failure)\
+  GTEST_ASSERT_(::testing::AssertPred3Helper(#pred, \
+                                             #v1, \
+                                             #v2, \
+                                             #v3, \
+                                             pred, \
+                                             v1, \
+                                             v2, \
+                                             v3), on_failure)
+
+// Ternary predicate assertion macros.
+#define EXPECT_PRED_FORMAT3(pred_format, v1, v2, v3) \
+  GTEST_PRED_FORMAT3_(pred_format, v1, v2, v3, GTEST_NONFATAL_FAILURE_)
+#define EXPECT_PRED3(pred, v1, v2, v3) \
+  GTEST_PRED3_(pred, v1, v2, v3, GTEST_NONFATAL_FAILURE_)
+#define ASSERT_PRED_FORMAT3(pred_format, v1, v2, v3) \
+  GTEST_PRED_FORMAT3_(pred_format, v1, v2, v3, GTEST_FATAL_FAILURE_)
+#define ASSERT_PRED3(pred, v1, v2, v3) \
+  GTEST_PRED3_(pred, v1, v2, v3, GTEST_FATAL_FAILURE_)
+
+
+
+// Helper function for implementing {EXPECT|ASSERT}_PRED4.  Don't use
+// this in your code.
+template <typename Pred,
+          typename T1,
+          typename T2,
+          typename T3,
+          typename T4>
+AssertionResult AssertPred4Helper(const char* pred_text,
+                                  const char* e1,
+                                  const char* e2,
+                                  const char* e3,
+                                  const char* e4,
+                                  Pred pred,
+                                  const T1& v1,
+                                  const T2& v2,
+                                  const T3& v3,
+                                  const T4& v4) {
+  if (pred(v1, v2, v3, v4)) return AssertionSuccess();
+
+  return AssertionFailure()
+         << pred_text << "(" << e1 << ", " << e2 << ", " << e3 << ", " << e4
+         << ") evaluates to false, where"
+         << "\n"
+         << e1 << " evaluates to " << ::testing::PrintToString(v1) << "\n"
+         << e2 << " evaluates to " << ::testing::PrintToString(v2) << "\n"
+         << e3 << " evaluates to " << ::testing::PrintToString(v3) << "\n"
+         << e4 << " evaluates to " << ::testing::PrintToString(v4);
+}
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT4.
+// Don't use this in your code.
+#define GTEST_PRED_FORMAT4_(pred_format, v1, v2, v3, v4, on_failure)\
+  GTEST_ASSERT_(pred_format(#v1, #v2, #v3, #v4, v1, v2, v3, v4), \
+                on_failure)
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED4.  Don't use
+// this in your code.
+#define GTEST_PRED4_(pred, v1, v2, v3, v4, on_failure)\
+  GTEST_ASSERT_(::testing::AssertPred4Helper(#pred, \
+                                             #v1, \
+                                             #v2, \
+                                             #v3, \
+                                             #v4, \
+                                             pred, \
+                                             v1, \
+                                             v2, \
+                                             v3, \
+                                             v4), on_failure)
+
+// 4-ary predicate assertion macros.
+#define EXPECT_PRED_FORMAT4(pred_format, v1, v2, v3, v4) \
+  GTEST_PRED_FORMAT4_(pred_format, v1, v2, v3, v4, GTEST_NONFATAL_FAILURE_)
+#define EXPECT_PRED4(pred, v1, v2, v3, v4) \
+  GTEST_PRED4_(pred, v1, v2, v3, v4, GTEST_NONFATAL_FAILURE_)
+#define ASSERT_PRED_FORMAT4(pred_format, v1, v2, v3, v4) \
+  GTEST_PRED_FORMAT4_(pred_format, v1, v2, v3, v4, GTEST_FATAL_FAILURE_)
+#define ASSERT_PRED4(pred, v1, v2, v3, v4) \
+  GTEST_PRED4_(pred, v1, v2, v3, v4, GTEST_FATAL_FAILURE_)
+
+
+
+// Helper function for implementing {EXPECT|ASSERT}_PRED5.  Don't use
+// this in your code.
+template <typename Pred,
+          typename T1,
+          typename T2,
+          typename T3,
+          typename T4,
+          typename T5>
+AssertionResult AssertPred5Helper(const char* pred_text,
+                                  const char* e1,
+                                  const char* e2,
+                                  const char* e3,
+                                  const char* e4,
+                                  const char* e5,
+                                  Pred pred,
+                                  const T1& v1,
+                                  const T2& v2,
+                                  const T3& v3,
+                                  const T4& v4,
+                                  const T5& v5) {
+  if (pred(v1, v2, v3, v4, v5)) return AssertionSuccess();
+
+  return AssertionFailure()
+         << pred_text << "(" << e1 << ", " << e2 << ", " << e3 << ", " << e4
+         << ", " << e5 << ") evaluates to false, where"
+         << "\n"
+         << e1 << " evaluates to " << ::testing::PrintToString(v1) << "\n"
+         << e2 << " evaluates to " << ::testing::PrintToString(v2) << "\n"
+         << e3 << " evaluates to " << ::testing::PrintToString(v3) << "\n"
+         << e4 << " evaluates to " << ::testing::PrintToString(v4) << "\n"
+         << e5 << " evaluates to " << ::testing::PrintToString(v5);
+}
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT5.
+// Don't use this in your code.
+#define GTEST_PRED_FORMAT5_(pred_format, v1, v2, v3, v4, v5, on_failure)\
+  GTEST_ASSERT_(pred_format(#v1, #v2, #v3, #v4, #v5, v1, v2, v3, v4, v5), \
+                on_failure)
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED5.  Don't use
+// this in your code.
+#define GTEST_PRED5_(pred, v1, v2, v3, v4, v5, on_failure)\
+  GTEST_ASSERT_(::testing::AssertPred5Helper(#pred, \
+                                             #v1, \
+                                             #v2, \
+                                             #v3, \
+                                             #v4, \
+                                             #v5, \
+                                             pred, \
+                                             v1, \
+                                             v2, \
+                                             v3, \
+                                             v4, \
+                                             v5), on_failure)
+
+// 5-ary predicate assertion macros.
+#define EXPECT_PRED_FORMAT5(pred_format, v1, v2, v3, v4, v5) \
+  GTEST_PRED_FORMAT5_(pred_format, v1, v2, v3, v4, v5, GTEST_NONFATAL_FAILURE_)
+#define EXPECT_PRED5(pred, v1, v2, v3, v4, v5) \
+  GTEST_PRED5_(pred, v1, v2, v3, v4, v5, GTEST_NONFATAL_FAILURE_)
+#define ASSERT_PRED_FORMAT5(pred_format, v1, v2, v3, v4, v5) \
+  GTEST_PRED_FORMAT5_(pred_format, v1, v2, v3, v4, v5, GTEST_FATAL_FAILURE_)
+#define ASSERT_PRED5(pred, v1, v2, v3, v4, v5) \
+  GTEST_PRED5_(pred, v1, v2, v3, v4, v5, GTEST_FATAL_FAILURE_)
+
+
+
+}  // namespace testing
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest-printers.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest-printers.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest-printers.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest-printers.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,1029 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+// Google Test - The Google C++ Testing and Mocking Framework
+//
+// This file implements a universal value printer that can print a
+// value of any type T:
+//
+//   void ::testing::internal::UniversalPrinter<T>::Print(value, ostream_ptr);
+//
+// A user can teach this function how to print a class type T by
+// defining either operator<<() or PrintTo() in the namespace that
+// defines T.  More specifically, the FIRST defined function in the
+// following list will be used (assuming T is defined in namespace
+// foo):
+//
+//   1. foo::PrintTo(const T&, ostream*)
+//   2. operator<<(ostream&, const T&) defined in either foo or the
+//      global namespace.
+//
+// However if T is an STL-style container then it is printed element-wise
+// unless foo::PrintTo(const T&, ostream*) is defined. Note that
+// operator<<() is ignored for container types.
+//
+// If none of the above is defined, it will print the debug string of
+// the value if it is a protocol buffer, or print the raw bytes in the
+// value otherwise.
+//
+// To aid debugging: when T is a reference type, the address of the
+// value is also printed; when T is a (const) char pointer, both the
+// pointer value and the NUL-terminated string it points to are
+// printed.
+//
+// We also provide some convenient wrappers:
+//
+//   // Prints a value to a string.  For a (const or not) char
+//   // pointer, the NUL-terminated string (but not the pointer) is
+//   // printed.
+//   std::string ::testing::PrintToString(const T& value);
+//
+//   // Prints a value tersely: for a reference type, the referenced
+//   // value (but not the address) is printed; for a (const or not) char
+//   // pointer, the NUL-terminated string (but not the pointer) is
+//   // printed.
+//   void ::testing::internal::UniversalTersePrint(const T& value, ostream*);
+//
+//   // Prints value using the type inferred by the compiler.  The difference
+//   // from UniversalTersePrint() is that this function prints both the
+//   // pointer and the NUL-terminated string for a (const or not) char pointer.
+//   void ::testing::internal::UniversalPrint(const T& value, ostream*);
+//
+//   // Prints the fields of a tuple tersely to a string vector, one
+//   // element for each field. Tuple support must be enabled in
+//   // gtest-port.h.
+//   std::vector<string> UniversalTersePrintTupleFieldsToStrings(
+//       const Tuple& value);
+//
+// Known limitation:
+//
+// The print primitives print the elements of an STL-style container
+// using the compiler-inferred type of *iter where iter is a
+// const_iterator of the container.  When const_iterator is an input
+// iterator but not a forward iterator, this inferred type may not
+// match value_type, and the print output may be incorrect.  In
+// practice, this is rarely a problem as for most containers
+// const_iterator is a forward iterator.  We'll fix this if there's an
+// actual need for it.  Note that this fix cannot rely on value_type
+// being defined as many user-defined container types don't have
+// value_type.
+
+// GOOGLETEST_CM0001 DO NOT DELETE
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_PRINTERS_H_
+#define GOOGLETEST_INCLUDE_GTEST_GTEST_PRINTERS_H_
+
+#include <functional>
+#include <memory>
+#include <ostream>  // NOLINT
+#include <sstream>
+#include <string>
+#include <tuple>
+#include <type_traits>
+#include <utility>
+#include <vector>
+
+#include "gtest/internal/gtest-internal.h"
+#include "gtest/internal/gtest-port.h"
+
+namespace testing {
+
+// Definitions in the internal* namespaces are subject to change without notice.
+// DO NOT USE THEM IN USER CODE!
+namespace internal {
+
+template <typename T>
+void UniversalPrint(const T& value, ::std::ostream* os);
+
+// Used to print an STL-style container when the user doesn't define
+// a PrintTo() for it.
+struct ContainerPrinter {
+  template <typename T,
+            typename = typename std::enable_if<
+                (sizeof(IsContainerTest<T>(0)) == sizeof(IsContainer)) &&
+                !IsRecursiveContainer<T>::value>::type>
+  static void PrintValue(const T& container, std::ostream* os) {
+    const size_t kMaxCount = 32;  // The maximum number of elements to print.
+    *os << '{';
+    size_t count = 0;
+    for (auto&& elem : container) {
+      if (count > 0) {
+        *os << ',';
+        if (count == kMaxCount) {  // Enough has been printed.
+          *os << " ...";
+          break;
+        }
+      }
+      *os << ' ';
+      // We cannot call PrintTo(elem, os) here as PrintTo() doesn't
+      // handle `elem` being a native array.
+      internal::UniversalPrint(elem, os);
+      ++count;
+    }
+
+    if (count > 0) {
+      *os << ' ';
+    }
+    *os << '}';
+  }
+};
+
+// Used to print a pointer that is neither a char pointer nor a member
+// pointer, when the user doesn't define PrintTo() for it.  (A member
+// variable pointer or member function pointer doesn't really point to
+// a location in the address space.  Their representation is
+// implementation-defined.  Therefore they will be printed as raw
+// bytes.)
+struct FunctionPointerPrinter {
+  template <typename T, typename = typename std::enable_if<
+                            std::is_function<T>::value>::type>
+  static void PrintValue(T* p, ::std::ostream* os) {
+    if (p == nullptr) {
+      *os << "NULL";
+    } else {
+      // T is a function type, so '*os << p' doesn't do what we want
+      // (it just prints p as bool).  We want to print p as a const
+      // void*.
+      *os << reinterpret_cast<const void*>(p);
+    }
+  }
+};
+
+struct PointerPrinter {
+  template <typename T>
+  static void PrintValue(T* p, ::std::ostream* os) {
+    if (p == nullptr) {
+      *os << "NULL";
+    } else {
+      // T is not a function type.  We just call << to print p,
+      // relying on ADL to pick up user-defined << for their pointer
+      // types, if any.
+      *os << p;
+    }
+  }
+};
+
+namespace internal_stream_operator_without_lexical_name_lookup {
+
+// The presence of an operator<< here will terminate lexical scope lookup
+// straight away (even though it cannot be a match because of its argument
+// types). Thus, the two operator<< calls in StreamPrinter will find only ADL
+// candidates.
+struct LookupBlocker {};
+void operator<<(LookupBlocker, LookupBlocker);
+
+struct StreamPrinter {
+  template <typename T,
+            // Don't accept member pointers here. We'd print them via implicit
+            // conversion to bool, which isn't useful.
+            typename = typename std::enable_if<
+                !std::is_member_pointer<T>::value>::type,
+            // Only accept types for which we can find a streaming operator via
+            // ADL (possibly involving implicit conversions).
+            typename = decltype(std::declval<std::ostream&>()
+                                << std::declval<const T&>())>
+  static void PrintValue(const T& value, ::std::ostream* os) {
+    // Call streaming operator found by ADL, possibly with implicit conversions
+    // of the arguments.
+    *os << value;
+  }
+};
+
+}  // namespace internal_stream_operator_without_lexical_name_lookup
+
+struct ProtobufPrinter {
+  // We print a protobuf using its ShortDebugString() when the string
+  // doesn't exceed this many characters; otherwise we print it using
+  // DebugString() for better readability.
+  static const size_t kProtobufOneLinerMaxLength = 50;
+
+  template <typename T,
+            typename = typename std::enable_if<
+                internal::HasDebugStringAndShortDebugString<T>::value>::type>
+  static void PrintValue(const T& value, ::std::ostream* os) {
+    std::string pretty_str = value.ShortDebugString();
+    if (pretty_str.length() > kProtobufOneLinerMaxLength) {
+      pretty_str = "\n" + value.DebugString();
+    }
+    *os << ("<" + pretty_str + ">");
+  }
+};
+
+struct ConvertibleToIntegerPrinter {
+  // Since T has no << operator or PrintTo() but can be implicitly
+  // converted to BiggestInt, we print it as a BiggestInt.
+  //
+  // Most likely T is an enum type (either named or unnamed), in which
+  // case printing it as an integer is the desired behavior.  In case
+  // T is not an enum, printing it as an integer is the best we can do
+  // given that it has no user-defined printer.
+  static void PrintValue(internal::BiggestInt value, ::std::ostream* os) {
+    *os << value;
+  }
+};
+
+struct ConvertibleToStringViewPrinter {
+#if GTEST_INTERNAL_HAS_STRING_VIEW
+  static void PrintValue(internal::StringView value, ::std::ostream* os) {
+    internal::UniversalPrint(value, os);
+  }
+#endif
+};
+
+
+// Prints the given number of bytes in the given object to the given
+// ostream.
+GTEST_API_ void PrintBytesInObjectTo(const unsigned char* obj_bytes,
+                                     size_t count,
+                                     ::std::ostream* os);
+struct RawBytesPrinter {
+  // SFINAE on `sizeof` to make sure we have a complete type.
+  template <typename T, size_t = sizeof(T)>
+  static void PrintValue(const T& value, ::std::ostream* os) {
+    PrintBytesInObjectTo(
+        static_cast<const unsigned char*>(
+            // Load bearing cast to void* to support iOS
+            reinterpret_cast<const void*>(std::addressof(value))),
+        sizeof(value), os);
+  }
+};
+
+struct FallbackPrinter {
+  template <typename T>
+  static void PrintValue(const T&, ::std::ostream* os) {
+    *os << "(incomplete type)";
+  }
+};
+
+// Try every printer in order and return the first one that works.
+template <typename T, typename E, typename Printer, typename... Printers>
+struct FindFirstPrinter : FindFirstPrinter<T, E, Printers...> {};
+
+template <typename T, typename Printer, typename... Printers>
+struct FindFirstPrinter<
+    T, decltype(Printer::PrintValue(std::declval<const T&>(), nullptr)),
+    Printer, Printers...> {
+  using type = Printer;
+};
+
+// Select the best printer in the following order:
+//  - Print containers (they have begin/end/etc).
+//  - Print function pointers.
+//  - Print object pointers.
+//  - Use the stream operator, if available.
+//  - Print protocol buffers.
+//  - Print types convertible to BiggestInt.
+//  - Print types convertible to StringView, if available.
+//  - Fallback to printing the raw bytes of the object.
+template <typename T>
+void PrintWithFallback(const T& value, ::std::ostream* os) {
+  using Printer = typename FindFirstPrinter<
+      T, void, ContainerPrinter, FunctionPointerPrinter, PointerPrinter,
+      internal_stream_operator_without_lexical_name_lookup::StreamPrinter,
+      ProtobufPrinter, ConvertibleToIntegerPrinter,
+      ConvertibleToStringViewPrinter, RawBytesPrinter, FallbackPrinter>::type;
+  Printer::PrintValue(value, os);
+}
+
+// FormatForComparison<ToPrint, OtherOperand>::Format(value) formats a
+// value of type ToPrint that is an operand of a comparison assertion
+// (e.g. ASSERT_EQ).  OtherOperand is the type of the other operand in
+// the comparison, and is used to help determine the best way to
+// format the value.  In particular, when the value is a C string
+// (char pointer) and the other operand is an STL string object, we
+// want to format the C string as a string, since we know it is
+// compared by value with the string object.  If the value is a char
+// pointer but the other operand is not an STL string object, we don't
+// know whether the pointer is supposed to point to a NUL-terminated
+// string, and thus want to print it as a pointer to be safe.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+
+// The default case.
+template <typename ToPrint, typename OtherOperand>
+class FormatForComparison {
+ public:
+  static ::std::string Format(const ToPrint& value) {
+    return ::testing::PrintToString(value);
+  }
+};
+
+// Array.
+template <typename ToPrint, size_t N, typename OtherOperand>
+class FormatForComparison<ToPrint[N], OtherOperand> {
+ public:
+  static ::std::string Format(const ToPrint* value) {
+    return FormatForComparison<const ToPrint*, OtherOperand>::Format(value);
+  }
+};
+
+// By default, print C string as pointers to be safe, as we don't know
+// whether they actually point to a NUL-terminated string.
+
+#define GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(CharType)                \
+  template <typename OtherOperand>                                      \
+  class FormatForComparison<CharType*, OtherOperand> {                  \
+   public:                                                              \
+    static ::std::string Format(CharType* value) {                      \
+      return ::testing::PrintToString(static_cast<const void*>(value)); \
+    }                                                                   \
+  }
+
+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(char);
+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const char);
+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(wchar_t);
+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const wchar_t);
+#ifdef __cpp_char8_t
+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(char8_t);
+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const char8_t);
+#endif
+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(char16_t);
+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const char16_t);
+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(char32_t);
+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const char32_t);
+
+#undef GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_
+
+// If a C string is compared with an STL string object, we know it's meant
+// to point to a NUL-terminated string, and thus can print it as a string.
+
+#define GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(CharType, OtherStringType) \
+  template <>                                                           \
+  class FormatForComparison<CharType*, OtherStringType> {               \
+   public:                                                              \
+    static ::std::string Format(CharType* value) {                      \
+      return ::testing::PrintToString(value);                           \
+    }                                                                   \
+  }
+
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(char, ::std::string);
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const char, ::std::string);
+#ifdef __cpp_char8_t
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(char8_t, ::std::u8string);
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const char8_t, ::std::u8string);
+#endif
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(char16_t, ::std::u16string);
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const char16_t, ::std::u16string);
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(char32_t, ::std::u32string);
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const char32_t, ::std::u32string);
+
+#if GTEST_HAS_STD_WSTRING
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(wchar_t, ::std::wstring);
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const wchar_t, ::std::wstring);
+#endif
+
+#undef GTEST_IMPL_FORMAT_C_STRING_AS_STRING_
+
+// Formats a comparison assertion (e.g. ASSERT_EQ, EXPECT_LT, and etc)
+// operand to be used in a failure message.  The type (but not value)
+// of the other operand may affect the format.  This allows us to
+// print a char* as a raw pointer when it is compared against another
+// char* or void*, and print it as a C string when it is compared
+// against an std::string object, for example.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+template <typename T1, typename T2>
+std::string FormatForComparisonFailureMessage(
+    const T1& value, const T2& /* other_operand */) {
+  return FormatForComparison<T1, T2>::Format(value);
+}
+
+// UniversalPrinter<T>::Print(value, ostream_ptr) prints the given
+// value to the given ostream.  The caller must ensure that
+// 'ostream_ptr' is not NULL, or the behavior is undefined.
+//
+// We define UniversalPrinter as a class template (as opposed to a
+// function template), as we need to partially specialize it for
+// reference types, which cannot be done with function templates.
+template <typename T>
+class UniversalPrinter;
+
+// Prints the given value using the << operator if it has one;
+// otherwise prints the bytes in it.  This is what
+// UniversalPrinter<T>::Print() does when PrintTo() is not specialized
+// or overloaded for type T.
+//
+// A user can override this behavior for a class type Foo by defining
+// an overload of PrintTo() in the namespace where Foo is defined.  We
+// give the user this option as sometimes defining a << operator for
+// Foo is not desirable (e.g. the coding style may prevent doing it,
+// or there is already a << operator but it doesn't do what the user
+// wants).
+template <typename T>
+void PrintTo(const T& value, ::std::ostream* os) {
+  internal::PrintWithFallback(value, os);
+}
+
+// The following list of PrintTo() overloads tells
+// UniversalPrinter<T>::Print() how to print standard types (built-in
+// types, strings, plain arrays, and pointers).
+
+// Overloads for various char types.
+GTEST_API_ void PrintTo(unsigned char c, ::std::ostream* os);
+GTEST_API_ void PrintTo(signed char c, ::std::ostream* os);
+inline void PrintTo(char c, ::std::ostream* os) {
+  // When printing a plain char, we always treat it as unsigned.  This
+  // way, the output won't be affected by whether the compiler thinks
+  // char is signed or not.
+  PrintTo(static_cast<unsigned char>(c), os);
+}
+
+// Overloads for other simple built-in types.
+inline void PrintTo(bool x, ::std::ostream* os) {
+  *os << (x ? "true" : "false");
+}
+
+// Overload for wchar_t type.
+// Prints a wchar_t as a symbol if it is printable or as its internal
+// code otherwise and also as its decimal code (except for L'\0').
+// The L'\0' char is printed as "L'\\0'". The decimal code is printed
+// as signed integer when wchar_t is implemented by the compiler
+// as a signed type and is printed as an unsigned integer when wchar_t
+// is implemented as an unsigned type.
+GTEST_API_ void PrintTo(wchar_t wc, ::std::ostream* os);
+
+GTEST_API_ void PrintTo(char32_t c, ::std::ostream* os);
+inline void PrintTo(char16_t c, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<char32_t>(c), os);
+}
+#ifdef __cpp_char8_t
+inline void PrintTo(char8_t c, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<char32_t>(c), os);
+}
+#endif
+
+// Overloads for C strings.
+GTEST_API_ void PrintTo(const char* s, ::std::ostream* os);
+inline void PrintTo(char* s, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<const char*>(s), os);
+}
+
+// signed/unsigned char is often used for representing binary data, so
+// we print pointers to it as void* to be safe.
+inline void PrintTo(const signed char* s, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<const void*>(s), os);
+}
+inline void PrintTo(signed char* s, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<const void*>(s), os);
+}
+inline void PrintTo(const unsigned char* s, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<const void*>(s), os);
+}
+inline void PrintTo(unsigned char* s, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<const void*>(s), os);
+}
+#ifdef __cpp_char8_t
+// Overloads for u8 strings.
+GTEST_API_ void PrintTo(const char8_t* s, ::std::ostream* os);
+inline void PrintTo(char8_t* s, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<const char8_t*>(s), os);
+}
+#endif
+// Overloads for u16 strings.
+GTEST_API_ void PrintTo(const char16_t* s, ::std::ostream* os);
+inline void PrintTo(char16_t* s, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<const char16_t*>(s), os);
+}
+// Overloads for u32 strings.
+GTEST_API_ void PrintTo(const char32_t* s, ::std::ostream* os);
+inline void PrintTo(char32_t* s, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<const char32_t*>(s), os);
+}
+
+// MSVC can be configured to define wchar_t as a typedef of unsigned
+// short.  It defines _NATIVE_WCHAR_T_DEFINED when wchar_t is a native
+// type.  When wchar_t is a typedef, defining an overload for const
+// wchar_t* would cause unsigned short* be printed as a wide string,
+// possibly causing invalid memory accesses.
+#if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED)
+// Overloads for wide C strings
+GTEST_API_ void PrintTo(const wchar_t* s, ::std::ostream* os);
+inline void PrintTo(wchar_t* s, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<const wchar_t*>(s), os);
+}
+#endif
+
+// Overload for C arrays.  Multi-dimensional arrays are printed
+// properly.
+
+// Prints the given number of elements in an array, without printing
+// the curly braces.
+template <typename T>
+void PrintRawArrayTo(const T a[], size_t count, ::std::ostream* os) {
+  UniversalPrint(a[0], os);
+  for (size_t i = 1; i != count; i++) {
+    *os << ", ";
+    UniversalPrint(a[i], os);
+  }
+}
+
+// Overloads for ::std::string.
+GTEST_API_ void PrintStringTo(const ::std::string&s, ::std::ostream* os);
+inline void PrintTo(const ::std::string& s, ::std::ostream* os) {
+  PrintStringTo(s, os);
+}
+
+// Overloads for ::std::u8string
+#ifdef __cpp_char8_t
+GTEST_API_ void PrintU8StringTo(const ::std::u8string& s, ::std::ostream* os);
+inline void PrintTo(const ::std::u8string& s, ::std::ostream* os) {
+  PrintU8StringTo(s, os);
+}
+#endif
+
+// Overloads for ::std::u16string
+GTEST_API_ void PrintU16StringTo(const ::std::u16string& s, ::std::ostream* os);
+inline void PrintTo(const ::std::u16string& s, ::std::ostream* os) {
+  PrintU16StringTo(s, os);
+}
+
+// Overloads for ::std::u32string
+GTEST_API_ void PrintU32StringTo(const ::std::u32string& s, ::std::ostream* os);
+inline void PrintTo(const ::std::u32string& s, ::std::ostream* os) {
+  PrintU32StringTo(s, os);
+}
+
+// Overloads for ::std::wstring.
+#if GTEST_HAS_STD_WSTRING
+GTEST_API_ void PrintWideStringTo(const ::std::wstring&s, ::std::ostream* os);
+inline void PrintTo(const ::std::wstring& s, ::std::ostream* os) {
+  PrintWideStringTo(s, os);
+}
+#endif  // GTEST_HAS_STD_WSTRING
+
+#if GTEST_INTERNAL_HAS_STRING_VIEW
+// Overload for internal::StringView.
+inline void PrintTo(internal::StringView sp, ::std::ostream* os) {
+  PrintTo(::std::string(sp), os);
+}
+#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
+
+inline void PrintTo(std::nullptr_t, ::std::ostream* os) { *os << "(nullptr)"; }
+
+template <typename T>
+void PrintTo(std::reference_wrapper<T> ref, ::std::ostream* os) {
+  UniversalPrinter<T&>::Print(ref.get(), os);
+}
+
+inline const void* VoidifyPointer(const void* p) { return p; }
+inline const void* VoidifyPointer(volatile const void* p) {
+  return const_cast<const void*>(p);
+}
+
+template <typename T, typename Ptr>
+void PrintSmartPointer(const Ptr& ptr, std::ostream* os, char) {
+  if (ptr == nullptr) {
+    *os << "(nullptr)";
+  } else {
+    // We can't print the value. Just print the pointer..
+    *os << "(" << (VoidifyPointer)(ptr.get()) << ")";
+  }
+}
+template <typename T, typename Ptr,
+          typename = typename std::enable_if<!std::is_void<T>::value &&
+                                             !std::is_array<T>::value>::type>
+void PrintSmartPointer(const Ptr& ptr, std::ostream* os, int) {
+  if (ptr == nullptr) {
+    *os << "(nullptr)";
+  } else {
+    *os << "(ptr = " << (VoidifyPointer)(ptr.get()) << ", value = ";
+    UniversalPrinter<T>::Print(*ptr, os);
+    *os << ")";
+  }
+}
+
+template <typename T, typename D>
+void PrintTo(const std::unique_ptr<T, D>& ptr, std::ostream* os) {
+  (PrintSmartPointer<T>)(ptr, os, 0);
+}
+
+template <typename T>
+void PrintTo(const std::shared_ptr<T>& ptr, std::ostream* os) {
+  (PrintSmartPointer<T>)(ptr, os, 0);
+}
+
+// Helper function for printing a tuple.  T must be instantiated with
+// a tuple type.
+template <typename T>
+void PrintTupleTo(const T&, std::integral_constant<size_t, 0>,
+                  ::std::ostream*) {}
+
+template <typename T, size_t I>
+void PrintTupleTo(const T& t, std::integral_constant<size_t, I>,
+                  ::std::ostream* os) {
+  PrintTupleTo(t, std::integral_constant<size_t, I - 1>(), os);
+  GTEST_INTENTIONAL_CONST_COND_PUSH_()
+  if (I > 1) {
+    GTEST_INTENTIONAL_CONST_COND_POP_()
+    *os << ", ";
+  }
+  UniversalPrinter<typename std::tuple_element<I - 1, T>::type>::Print(
+      std::get<I - 1>(t), os);
+}
+
+template <typename... Types>
+void PrintTo(const ::std::tuple<Types...>& t, ::std::ostream* os) {
+  *os << "(";
+  PrintTupleTo(t, std::integral_constant<size_t, sizeof...(Types)>(), os);
+  *os << ")";
+}
+
+// Overload for std::pair.
+template <typename T1, typename T2>
+void PrintTo(const ::std::pair<T1, T2>& value, ::std::ostream* os) {
+  *os << '(';
+  // We cannot use UniversalPrint(value.first, os) here, as T1 may be
+  // a reference type.  The same for printing value.second.
+  UniversalPrinter<T1>::Print(value.first, os);
+  *os << ", ";
+  UniversalPrinter<T2>::Print(value.second, os);
+  *os << ')';
+}
+
+// Implements printing a non-reference type T by letting the compiler
+// pick the right overload of PrintTo() for T.
+template <typename T>
+class UniversalPrinter {
+ public:
+  // MSVC warns about adding const to a function type, so we want to
+  // disable the warning.
+  GTEST_DISABLE_MSC_WARNINGS_PUSH_(4180)
+
+  // Note: we deliberately don't call this PrintTo(), as that name
+  // conflicts with ::testing::internal::PrintTo in the body of the
+  // function.
+  static void Print(const T& value, ::std::ostream* os) {
+    // By default, ::testing::internal::PrintTo() is used for printing
+    // the value.
+    //
+    // Thanks to Koenig look-up, if T is a class and has its own
+    // PrintTo() function defined in its namespace, that function will
+    // be visible here.  Since it is more specific than the generic ones
+    // in ::testing::internal, it will be picked by the compiler in the
+    // following statement - exactly what we want.
+    PrintTo(value, os);
+  }
+
+  GTEST_DISABLE_MSC_WARNINGS_POP_()
+};
+
+// Remove any const-qualifiers before passing a type to UniversalPrinter.
+template <typename T>
+class UniversalPrinter<const T> : public UniversalPrinter<T> {};
+
+#if GTEST_INTERNAL_HAS_ANY
+
+// Printer for std::any / absl::any
+
+template <>
+class UniversalPrinter<Any> {
+ public:
+  static void Print(const Any& value, ::std::ostream* os) {
+    if (value.has_value()) {
+      *os << "value of type " << GetTypeName(value);
+    } else {
+      *os << "no value";
+    }
+  }
+
+ private:
+  static std::string GetTypeName(const Any& value) {
+#if GTEST_HAS_RTTI
+    return internal::GetTypeName(value.type());
+#else
+    static_cast<void>(value);  // possibly unused
+    return "<unknown_type>";
+#endif  // GTEST_HAS_RTTI
+  }
+};
+
+#endif  // GTEST_INTERNAL_HAS_ANY
+
+#if GTEST_INTERNAL_HAS_OPTIONAL
+
+// Printer for std::optional / absl::optional
+
+template <typename T>
+class UniversalPrinter<Optional<T>> {
+ public:
+  static void Print(const Optional<T>& value, ::std::ostream* os) {
+    *os << '(';
+    if (!value) {
+      *os << "nullopt";
+    } else {
+      UniversalPrint(*value, os);
+    }
+    *os << ')';
+  }
+};
+
+#endif  // GTEST_INTERNAL_HAS_OPTIONAL
+
+#if GTEST_INTERNAL_HAS_VARIANT
+
+// Printer for std::variant / absl::variant
+
+template <typename... T>
+class UniversalPrinter<Variant<T...>> {
+ public:
+  static void Print(const Variant<T...>& value, ::std::ostream* os) {
+    *os << '(';
+#if GTEST_HAS_ABSL
+    absl::visit(Visitor{os, value.index()}, value);
+#else
+    std::visit(Visitor{os, value.index()}, value);
+#endif  // GTEST_HAS_ABSL
+    *os << ')';
+  }
+
+ private:
+  struct Visitor {
+    template <typename U>
+    void operator()(const U& u) const {
+      *os << "'" << GetTypeName<U>() << "(index = " << index
+          << ")' with value ";
+      UniversalPrint(u, os);
+    }
+    ::std::ostream* os;
+    std::size_t index;
+  };
+};
+
+#endif  // GTEST_INTERNAL_HAS_VARIANT
+
+// UniversalPrintArray(begin, len, os) prints an array of 'len'
+// elements, starting at address 'begin'.
+template <typename T>
+void UniversalPrintArray(const T* begin, size_t len, ::std::ostream* os) {
+  if (len == 0) {
+    *os << "{}";
+  } else {
+    *os << "{ ";
+    const size_t kThreshold = 18;
+    const size_t kChunkSize = 8;
+    // If the array has more than kThreshold elements, we'll have to
+    // omit some details by printing only the first and the last
+    // kChunkSize elements.
+    if (len <= kThreshold) {
+      PrintRawArrayTo(begin, len, os);
+    } else {
+      PrintRawArrayTo(begin, kChunkSize, os);
+      *os << ", ..., ";
+      PrintRawArrayTo(begin + len - kChunkSize, kChunkSize, os);
+    }
+    *os << " }";
+  }
+}
+// This overload prints a (const) char array compactly.
+GTEST_API_ void UniversalPrintArray(
+    const char* begin, size_t len, ::std::ostream* os);
+
+#ifdef __cpp_char8_t
+// This overload prints a (const) char8_t array compactly.
+GTEST_API_ void UniversalPrintArray(const char8_t* begin, size_t len,
+                                    ::std::ostream* os);
+#endif
+
+// This overload prints a (const) char16_t array compactly.
+GTEST_API_ void UniversalPrintArray(const char16_t* begin, size_t len,
+                                    ::std::ostream* os);
+
+// This overload prints a (const) char32_t array compactly.
+GTEST_API_ void UniversalPrintArray(const char32_t* begin, size_t len,
+                                    ::std::ostream* os);
+
+// This overload prints a (const) wchar_t array compactly.
+GTEST_API_ void UniversalPrintArray(
+    const wchar_t* begin, size_t len, ::std::ostream* os);
+
+// Implements printing an array type T[N].
+template <typename T, size_t N>
+class UniversalPrinter<T[N]> {
+ public:
+  // Prints the given array, omitting some elements when there are too
+  // many.
+  static void Print(const T (&a)[N], ::std::ostream* os) {
+    UniversalPrintArray(a, N, os);
+  }
+};
+
+// Implements printing a reference type T&.
+template <typename T>
+class UniversalPrinter<T&> {
+ public:
+  // MSVC warns about adding const to a function type, so we want to
+  // disable the warning.
+  GTEST_DISABLE_MSC_WARNINGS_PUSH_(4180)
+
+  static void Print(const T& value, ::std::ostream* os) {
+    // Prints the address of the value.  We use reinterpret_cast here
+    // as static_cast doesn't compile when T is a function type.
+    *os << "@" << reinterpret_cast<const void*>(&value) << " ";
+
+    // Then prints the value itself.
+    UniversalPrint(value, os);
+  }
+
+  GTEST_DISABLE_MSC_WARNINGS_POP_()
+};
+
+// Prints a value tersely: for a reference type, the referenced value
+// (but not the address) is printed; for a (const) char pointer, the
+// NUL-terminated string (but not the pointer) is printed.
+
+template <typename T>
+class UniversalTersePrinter {
+ public:
+  static void Print(const T& value, ::std::ostream* os) {
+    UniversalPrint(value, os);
+  }
+};
+template <typename T>
+class UniversalTersePrinter<T&> {
+ public:
+  static void Print(const T& value, ::std::ostream* os) {
+    UniversalPrint(value, os);
+  }
+};
+template <typename T, size_t N>
+class UniversalTersePrinter<T[N]> {
+ public:
+  static void Print(const T (&value)[N], ::std::ostream* os) {
+    UniversalPrinter<T[N]>::Print(value, os);
+  }
+};
+template <>
+class UniversalTersePrinter<const char*> {
+ public:
+  static void Print(const char* str, ::std::ostream* os) {
+    if (str == nullptr) {
+      *os << "NULL";
+    } else {
+      UniversalPrint(std::string(str), os);
+    }
+  }
+};
+template <>
+class UniversalTersePrinter<char*> : public UniversalTersePrinter<const char*> {
+};
+
+#ifdef __cpp_char8_t
+template <>
+class UniversalTersePrinter<const char8_t*> {
+ public:
+  static void Print(const char8_t* str, ::std::ostream* os) {
+    if (str == nullptr) {
+      *os << "NULL";
+    } else {
+      UniversalPrint(::std::u8string(str), os);
+    }
+  }
+};
+template <>
+class UniversalTersePrinter<char8_t*>
+    : public UniversalTersePrinter<const char8_t*> {};
+#endif
+
+template <>
+class UniversalTersePrinter<const char16_t*> {
+ public:
+  static void Print(const char16_t* str, ::std::ostream* os) {
+    if (str == nullptr) {
+      *os << "NULL";
+    } else {
+      UniversalPrint(::std::u16string(str), os);
+    }
+  }
+};
+template <>
+class UniversalTersePrinter<char16_t*>
+    : public UniversalTersePrinter<const char16_t*> {};
+
+template <>
+class UniversalTersePrinter<const char32_t*> {
+ public:
+  static void Print(const char32_t* str, ::std::ostream* os) {
+    if (str == nullptr) {
+      *os << "NULL";
+    } else {
+      UniversalPrint(::std::u32string(str), os);
+    }
+  }
+};
+template <>
+class UniversalTersePrinter<char32_t*>
+    : public UniversalTersePrinter<const char32_t*> {};
+
+#if GTEST_HAS_STD_WSTRING
+template <>
+class UniversalTersePrinter<const wchar_t*> {
+ public:
+  static void Print(const wchar_t* str, ::std::ostream* os) {
+    if (str == nullptr) {
+      *os << "NULL";
+    } else {
+      UniversalPrint(::std::wstring(str), os);
+    }
+  }
+};
+#endif
+
+template <>
+class UniversalTersePrinter<wchar_t*> {
+ public:
+  static void Print(wchar_t* str, ::std::ostream* os) {
+    UniversalTersePrinter<const wchar_t*>::Print(str, os);
+  }
+};
+
+template <typename T>
+void UniversalTersePrint(const T& value, ::std::ostream* os) {
+  UniversalTersePrinter<T>::Print(value, os);
+}
+
+// Prints a value using the type inferred by the compiler.  The
+// difference between this and UniversalTersePrint() is that for a
+// (const) char pointer, this prints both the pointer and the
+// NUL-terminated string.
+template <typename T>
+void UniversalPrint(const T& value, ::std::ostream* os) {
+  // A workarond for the bug in VC++ 7.1 that prevents us from instantiating
+  // UniversalPrinter with T directly.
+  typedef T T1;
+  UniversalPrinter<T1>::Print(value, os);
+}
+
+typedef ::std::vector< ::std::string> Strings;
+
+  // Tersely prints the first N fields of a tuple to a string vector,
+  // one element for each field.
+template <typename Tuple>
+void TersePrintPrefixToStrings(const Tuple&, std::integral_constant<size_t, 0>,
+                               Strings*) {}
+template <typename Tuple, size_t I>
+void TersePrintPrefixToStrings(const Tuple& t,
+                               std::integral_constant<size_t, I>,
+                               Strings* strings) {
+  TersePrintPrefixToStrings(t, std::integral_constant<size_t, I - 1>(),
+                            strings);
+  ::std::stringstream ss;
+  UniversalTersePrint(std::get<I - 1>(t), &ss);
+  strings->push_back(ss.str());
+}
+
+// Prints the fields of a tuple tersely to a string vector, one
+// element for each field.  See the comment before
+// UniversalTersePrint() for how we define "tersely".
+template <typename Tuple>
+Strings UniversalTersePrintTupleFieldsToStrings(const Tuple& value) {
+  Strings result;
+  TersePrintPrefixToStrings(
+      value, std::integral_constant<size_t, std::tuple_size<Tuple>::value>(),
+      &result);
+  return result;
+}
+
+}  // namespace internal
+
+template <typename T>
+::std::string PrintToString(const T& value) {
+  ::std::stringstream ss;
+  internal::UniversalTersePrinter<T>::Print(value, &ss);
+  return ss.str();
+}
+
+}  // namespace testing
+
+// Include any custom printer added by the local installation.
+// We must include this header at the end to make sure it can use the
+// declarations from this file.
+#include "gtest/internal/custom/gtest-printers.h"
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_GTEST_PRINTERS_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest_prod.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest_prod.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest_prod.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest_prod.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,61 @@
+// Copyright 2006, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+//
+// Google C++ Testing and Mocking Framework definitions useful in production code.
+// GOOGLETEST_CM0003 DO NOT DELETE
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_PROD_H_
+#define GOOGLETEST_INCLUDE_GTEST_GTEST_PROD_H_
+
+// When you need to test the private or protected members of a class,
+// use the FRIEND_TEST macro to declare your tests as friends of the
+// class.  For example:
+//
+// class MyClass {
+//  private:
+//   void PrivateMethod();
+//   FRIEND_TEST(MyClassTest, PrivateMethodWorks);
+// };
+//
+// class MyClassTest : public testing::Test {
+//   // ...
+// };
+//
+// TEST_F(MyClassTest, PrivateMethodWorks) {
+//   // Can call MyClass::PrivateMethod() here.
+// }
+//
+// Note: The test class must be in the same namespace as the class being tested.
+// For example, putting MyClassTest in an anonymous namespace will not work.
+
+#define FRIEND_TEST(test_case_name, test_name)\
+friend class test_case_name##_##test_name##_Test
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_GTEST_PROD_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest-spi.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest-spi.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest-spi.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest-spi.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,238 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+//
+// Utilities for testing Google Test itself and code that uses Google Test
+// (e.g. frameworks built on top of Google Test).
+
+// GOOGLETEST_CM0004 DO NOT DELETE
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_SPI_H_
+#define GOOGLETEST_INCLUDE_GTEST_GTEST_SPI_H_
+
+#include "gtest/gtest.h"
+
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
+/* class A needs to have dll-interface to be used by clients of class B */)
+
+namespace testing {
+
+// This helper class can be used to mock out Google Test failure reporting
+// so that we can test Google Test or code that builds on Google Test.
+//
+// An object of this class appends a TestPartResult object to the
+// TestPartResultArray object given in the constructor whenever a Google Test
+// failure is reported. It can either intercept only failures that are
+// generated in the same thread that created this object or it can intercept
+// all generated failures. The scope of this mock object can be controlled with
+// the second argument to the two arguments constructor.
+class GTEST_API_ ScopedFakeTestPartResultReporter
+    : public TestPartResultReporterInterface {
+ public:
+  // The two possible mocking modes of this object.
+  enum InterceptMode {
+    INTERCEPT_ONLY_CURRENT_THREAD,  // Intercepts only thread local failures.
+    INTERCEPT_ALL_THREADS           // Intercepts all failures.
+  };
+
+  // The c'tor sets this object as the test part result reporter used
+  // by Google Test.  The 'result' parameter specifies where to report the
+  // results. This reporter will only catch failures generated in the current
+  // thread. DEPRECATED
+  explicit ScopedFakeTestPartResultReporter(TestPartResultArray* result);
+
+  // Same as above, but you can choose the interception scope of this object.
+  ScopedFakeTestPartResultReporter(InterceptMode intercept_mode,
+                                   TestPartResultArray* result);
+
+  // The d'tor restores the previous test part result reporter.
+  ~ScopedFakeTestPartResultReporter() override;
+
+  // Appends the TestPartResult object to the TestPartResultArray
+  // received in the constructor.
+  //
+  // This method is from the TestPartResultReporterInterface
+  // interface.
+  void ReportTestPartResult(const TestPartResult& result) override;
+
+ private:
+  void Init();
+
+  const InterceptMode intercept_mode_;
+  TestPartResultReporterInterface* old_reporter_;
+  TestPartResultArray* const result_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedFakeTestPartResultReporter);
+};
+
+namespace internal {
+
+// A helper class for implementing EXPECT_FATAL_FAILURE() and
+// EXPECT_NONFATAL_FAILURE().  Its destructor verifies that the given
+// TestPartResultArray contains exactly one failure that has the given
+// type and contains the given substring.  If that's not the case, a
+// non-fatal failure will be generated.
+class GTEST_API_ SingleFailureChecker {
+ public:
+  // The constructor remembers the arguments.
+  SingleFailureChecker(const TestPartResultArray* results,
+                       TestPartResult::Type type, const std::string& substr);
+  ~SingleFailureChecker();
+ private:
+  const TestPartResultArray* const results_;
+  const TestPartResult::Type type_;
+  const std::string substr_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(SingleFailureChecker);
+};
+
+}  // namespace internal
+
+}  // namespace testing
+
+GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
+
+// A set of macros for testing Google Test assertions or code that's expected
+// to generate Google Test fatal failures.  It verifies that the given
+// statement will cause exactly one fatal Google Test failure with 'substr'
+// being part of the failure message.
+//
+// There are two different versions of this macro. EXPECT_FATAL_FAILURE only
+// affects and considers failures generated in the current thread and
+// EXPECT_FATAL_FAILURE_ON_ALL_THREADS does the same but for all threads.
+//
+// The verification of the assertion is done correctly even when the statement
+// throws an exception or aborts the current function.
+//
+// Known restrictions:
+//   - 'statement' cannot reference local non-static variables or
+//     non-static members of the current object.
+//   - 'statement' cannot return a value.
+//   - You cannot stream a failure message to this macro.
+//
+// Note that even though the implementations of the following two
+// macros are much alike, we cannot refactor them to use a common
+// helper macro, due to some peculiarity in how the preprocessor
+// works.  The AcceptsMacroThatExpandsToUnprotectedComma test in
+// gtest_unittest.cc will fail to compile if we do that.
+#define EXPECT_FATAL_FAILURE(statement, substr) \
+  do { \
+    class GTestExpectFatalFailureHelper {\
+     public:\
+      static void Execute() { statement; }\
+    };\
+    ::testing::TestPartResultArray gtest_failures;\
+    ::testing::internal::SingleFailureChecker gtest_checker(\
+        &gtest_failures, ::testing::TestPartResult::kFatalFailure, (substr));\
+    {\
+      ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\
+          ::testing::ScopedFakeTestPartResultReporter:: \
+          INTERCEPT_ONLY_CURRENT_THREAD, &gtest_failures);\
+      GTestExpectFatalFailureHelper::Execute();\
+    }\
+  } while (::testing::internal::AlwaysFalse())
+
+#define EXPECT_FATAL_FAILURE_ON_ALL_THREADS(statement, substr) \
+  do { \
+    class GTestExpectFatalFailureHelper {\
+     public:\
+      static void Execute() { statement; }\
+    };\
+    ::testing::TestPartResultArray gtest_failures;\
+    ::testing::internal::SingleFailureChecker gtest_checker(\
+        &gtest_failures, ::testing::TestPartResult::kFatalFailure, (substr));\
+    {\
+      ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\
+          ::testing::ScopedFakeTestPartResultReporter:: \
+          INTERCEPT_ALL_THREADS, &gtest_failures);\
+      GTestExpectFatalFailureHelper::Execute();\
+    }\
+  } while (::testing::internal::AlwaysFalse())
+
+// A macro for testing Google Test assertions or code that's expected to
+// generate Google Test non-fatal failures.  It asserts that the given
+// statement will cause exactly one non-fatal Google Test failure with 'substr'
+// being part of the failure message.
+//
+// There are two different versions of this macro. EXPECT_NONFATAL_FAILURE only
+// affects and considers failures generated in the current thread and
+// EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS does the same but for all threads.
+//
+// 'statement' is allowed to reference local variables and members of
+// the current object.
+//
+// The verification of the assertion is done correctly even when the statement
+// throws an exception or aborts the current function.
+//
+// Known restrictions:
+//   - You cannot stream a failure message to this macro.
+//
+// Note that even though the implementations of the following two
+// macros are much alike, we cannot refactor them to use a common
+// helper macro, due to some peculiarity in how the preprocessor
+// works.  If we do that, the code won't compile when the user gives
+// EXPECT_NONFATAL_FAILURE() a statement that contains a macro that
+// expands to code containing an unprotected comma.  The
+// AcceptsMacroThatExpandsToUnprotectedComma test in gtest_unittest.cc
+// catches that.
+//
+// For the same reason, we have to write
+//   if (::testing::internal::AlwaysTrue()) { statement; }
+// instead of
+//   GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement)
+// to avoid an MSVC warning on unreachable code.
+#define EXPECT_NONFATAL_FAILURE(statement, substr) \
+  do {\
+    ::testing::TestPartResultArray gtest_failures;\
+    ::testing::internal::SingleFailureChecker gtest_checker(\
+        &gtest_failures, ::testing::TestPartResult::kNonFatalFailure, \
+        (substr));\
+    {\
+      ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\
+          ::testing::ScopedFakeTestPartResultReporter:: \
+          INTERCEPT_ONLY_CURRENT_THREAD, &gtest_failures);\
+      if (::testing::internal::AlwaysTrue()) { statement; }\
+    }\
+  } while (::testing::internal::AlwaysFalse())
+
+#define EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(statement, substr) \
+  do {\
+    ::testing::TestPartResultArray gtest_failures;\
+    ::testing::internal::SingleFailureChecker gtest_checker(\
+        &gtest_failures, ::testing::TestPartResult::kNonFatalFailure, \
+        (substr));\
+    {\
+      ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\
+          ::testing::ScopedFakeTestPartResultReporter::INTERCEPT_ALL_THREADS, \
+          &gtest_failures);\
+      if (::testing::internal::AlwaysTrue()) { statement; }\
+    }\
+  } while (::testing::internal::AlwaysFalse())
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_GTEST_SPI_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest-test-part.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest-test-part.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest-test-part.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest-test-part.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,184 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// GOOGLETEST_CM0001 DO NOT DELETE
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_TEST_PART_H_
+#define GOOGLETEST_INCLUDE_GTEST_GTEST_TEST_PART_H_
+
+#include <iosfwd>
+#include <vector>
+#include "gtest/internal/gtest-internal.h"
+#include "gtest/internal/gtest-string.h"
+
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
+/* class A needs to have dll-interface to be used by clients of class B */)
+
+namespace testing {
+
+// A copyable object representing the result of a test part (i.e. an
+// assertion or an explicit FAIL(), ADD_FAILURE(), or SUCCESS()).
+//
+// Don't inherit from TestPartResult as its destructor is not virtual.
+class GTEST_API_ TestPartResult {
+ public:
+  // The possible outcomes of a test part (i.e. an assertion or an
+  // explicit SUCCEED(), FAIL(), or ADD_FAILURE()).
+  enum Type {
+    kSuccess,          // Succeeded.
+    kNonFatalFailure,  // Failed but the test can continue.
+    kFatalFailure,     // Failed and the test should be terminated.
+    kSkip              // Skipped.
+  };
+
+  // C'tor.  TestPartResult does NOT have a default constructor.
+  // Always use this constructor (with parameters) to create a
+  // TestPartResult object.
+  TestPartResult(Type a_type, const char* a_file_name, int a_line_number,
+                 const char* a_message)
+      : type_(a_type),
+        file_name_(a_file_name == nullptr ? "" : a_file_name),
+        line_number_(a_line_number),
+        summary_(ExtractSummary(a_message)),
+        message_(a_message) {}
+
+  // Gets the outcome of the test part.
+  Type type() const { return type_; }
+
+  // Gets the name of the source file where the test part took place, or
+  // NULL if it's unknown.
+  const char* file_name() const {
+    return file_name_.empty() ? nullptr : file_name_.c_str();
+  }
+
+  // Gets the line in the source file where the test part took place,
+  // or -1 if it's unknown.
+  int line_number() const { return line_number_; }
+
+  // Gets the summary of the failure message.
+  const char* summary() const { return summary_.c_str(); }
+
+  // Gets the message associated with the test part.
+  const char* message() const { return message_.c_str(); }
+
+  // Returns true if and only if the test part was skipped.
+  bool skipped() const { return type_ == kSkip; }
+
+  // Returns true if and only if the test part passed.
+  bool passed() const { return type_ == kSuccess; }
+
+  // Returns true if and only if the test part non-fatally failed.
+  bool nonfatally_failed() const { return type_ == kNonFatalFailure; }
+
+  // Returns true if and only if the test part fatally failed.
+  bool fatally_failed() const { return type_ == kFatalFailure; }
+
+  // Returns true if and only if the test part failed.
+  bool failed() const { return fatally_failed() || nonfatally_failed(); }
+
+ private:
+  Type type_;
+
+  // Gets the summary of the failure message by omitting the stack
+  // trace in it.
+  static std::string ExtractSummary(const char* message);
+
+  // The name of the source file where the test part took place, or
+  // "" if the source file is unknown.
+  std::string file_name_;
+  // The line in the source file where the test part took place, or -1
+  // if the line number is unknown.
+  int line_number_;
+  std::string summary_;  // The test failure summary.
+  std::string message_;  // The test failure message.
+};
+
+// Prints a TestPartResult object.
+std::ostream& operator<<(std::ostream& os, const TestPartResult& result);
+
+// An array of TestPartResult objects.
+//
+// Don't inherit from TestPartResultArray as its destructor is not
+// virtual.
+class GTEST_API_ TestPartResultArray {
+ public:
+  TestPartResultArray() {}
+
+  // Appends the given TestPartResult to the array.
+  void Append(const TestPartResult& result);
+
+  // Returns the TestPartResult at the given index (0-based).
+  const TestPartResult& GetTestPartResult(int index) const;
+
+  // Returns the number of TestPartResult objects in the array.
+  int size() const;
+
+ private:
+  std::vector<TestPartResult> array_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestPartResultArray);
+};
+
+// This interface knows how to report a test part result.
+class GTEST_API_ TestPartResultReporterInterface {
+ public:
+  virtual ~TestPartResultReporterInterface() {}
+
+  virtual void ReportTestPartResult(const TestPartResult& result) = 0;
+};
+
+namespace internal {
+
+// This helper class is used by {ASSERT|EXPECT}_NO_FATAL_FAILURE to check if a
+// statement generates new fatal failures. To do so it registers itself as the
+// current test part result reporter. Besides checking if fatal failures were
+// reported, it only delegates the reporting to the former result reporter.
+// The original result reporter is restored in the destructor.
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+class GTEST_API_ HasNewFatalFailureHelper
+    : public TestPartResultReporterInterface {
+ public:
+  HasNewFatalFailureHelper();
+  ~HasNewFatalFailureHelper() override;
+  void ReportTestPartResult(const TestPartResult& result) override;
+  bool has_new_fatal_failure() const { return has_new_fatal_failure_; }
+ private:
+  bool has_new_fatal_failure_;
+  TestPartResultReporterInterface* original_reporter_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(HasNewFatalFailureHelper);
+};
+
+}  // namespace internal
+
+}  // namespace testing
+
+GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_GTEST_TEST_PART_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest-typed-test.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest-typed-test.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest-typed-test.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/gtest-typed-test.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,329 @@
+// Copyright 2008 Google Inc.
+// All Rights Reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// GOOGLETEST_CM0001 DO NOT DELETE
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_TYPED_TEST_H_
+#define GOOGLETEST_INCLUDE_GTEST_GTEST_TYPED_TEST_H_
+
+// This header implements typed tests and type-parameterized tests.
+
+// Typed (aka type-driven) tests repeat the same test for types in a
+// list.  You must know which types you want to test with when writing
+// typed tests. Here's how you do it:
+
+#if 0
+
+// First, define a fixture class template.  It should be parameterized
+// by a type.  Remember to derive it from testing::Test.
+template <typename T>
+class FooTest : public testing::Test {
+ public:
+  ...
+  typedef std::list<T> List;
+  static T shared_;
+  T value_;
+};
+
+// Next, associate a list of types with the test suite, which will be
+// repeated for each type in the list.  The typedef is necessary for
+// the macro to parse correctly.
+typedef testing::Types<char, int, unsigned int> MyTypes;
+TYPED_TEST_SUITE(FooTest, MyTypes);
+
+// If the type list contains only one type, you can write that type
+// directly without Types<...>:
+//   TYPED_TEST_SUITE(FooTest, int);
+
+// Then, use TYPED_TEST() instead of TEST_F() to define as many typed
+// tests for this test suite as you want.
+TYPED_TEST(FooTest, DoesBlah) {
+  // Inside a test, refer to the special name TypeParam to get the type
+  // parameter.  Since we are inside a derived class template, C++ requires
+  // us to visit the members of FooTest via 'this'.
+  TypeParam n = this->value_;
+
+  // To visit static members of the fixture, add the TestFixture::
+  // prefix.
+  n += TestFixture::shared_;
+
+  // To refer to typedefs in the fixture, add the "typename
+  // TestFixture::" prefix.
+  typename TestFixture::List values;
+  values.push_back(n);
+  ...
+}
+
+TYPED_TEST(FooTest, HasPropertyA) { ... }
+
+// TYPED_TEST_SUITE takes an optional third argument which allows to specify a
+// class that generates custom test name suffixes based on the type. This should
+// be a class which has a static template function GetName(int index) returning
+// a string for each type. The provided integer index equals the index of the
+// type in the provided type list. In many cases the index can be ignored.
+//
+// For example:
+//   class MyTypeNames {
+//    public:
+//     template <typename T>
+//     static std::string GetName(int) {
+//       if (std::is_same<T, char>()) return "char";
+//       if (std::is_same<T, int>()) return "int";
+//       if (std::is_same<T, unsigned int>()) return "unsignedInt";
+//     }
+//   };
+//   TYPED_TEST_SUITE(FooTest, MyTypes, MyTypeNames);
+
+#endif  // 0
+
+// Type-parameterized tests are abstract test patterns parameterized
+// by a type.  Compared with typed tests, type-parameterized tests
+// allow you to define the test pattern without knowing what the type
+// parameters are.  The defined pattern can be instantiated with
+// different types any number of times, in any number of translation
+// units.
+//
+// If you are designing an interface or concept, you can define a
+// suite of type-parameterized tests to verify properties that any
+// valid implementation of the interface/concept should have.  Then,
+// each implementation can easily instantiate the test suite to verify
+// that it conforms to the requirements, without having to write
+// similar tests repeatedly.  Here's an example:
+
+#if 0
+
+// First, define a fixture class template.  It should be parameterized
+// by a type.  Remember to derive it from testing::Test.
+template <typename T>
+class FooTest : public testing::Test {
+  ...
+};
+
+// Next, declare that you will define a type-parameterized test suite
+// (the _P suffix is for "parameterized" or "pattern", whichever you
+// prefer):
+TYPED_TEST_SUITE_P(FooTest);
+
+// Then, use TYPED_TEST_P() to define as many type-parameterized tests
+// for this type-parameterized test suite as you want.
+TYPED_TEST_P(FooTest, DoesBlah) {
+  // Inside a test, refer to TypeParam to get the type parameter.
+  TypeParam n = 0;
+  ...
+}
+
+TYPED_TEST_P(FooTest, HasPropertyA) { ... }
+
+// Now the tricky part: you need to register all test patterns before
+// you can instantiate them.  The first argument of the macro is the
+// test suite name; the rest are the names of the tests in this test
+// case.
+REGISTER_TYPED_TEST_SUITE_P(FooTest,
+                            DoesBlah, HasPropertyA);
+
+// Finally, you are free to instantiate the pattern with the types you
+// want.  If you put the above code in a header file, you can #include
+// it in multiple C++ source files and instantiate it multiple times.
+//
+// To distinguish different instances of the pattern, the first
+// argument to the INSTANTIATE_* macro is a prefix that will be added
+// to the actual test suite name.  Remember to pick unique prefixes for
+// different instances.
+typedef testing::Types<char, int, unsigned int> MyTypes;
+INSTANTIATE_TYPED_TEST_SUITE_P(My, FooTest, MyTypes);
+
+// If the type list contains only one type, you can write that type
+// directly without Types<...>:
+//   INSTANTIATE_TYPED_TEST_SUITE_P(My, FooTest, int);
+//
+// Similar to the optional argument of TYPED_TEST_SUITE above,
+// INSTANTIATE_TEST_SUITE_P takes an optional fourth argument which allows to
+// generate custom names.
+//   INSTANTIATE_TYPED_TEST_SUITE_P(My, FooTest, MyTypes, MyTypeNames);
+
+#endif  // 0
+
+#include "gtest/internal/gtest-internal.h"
+#include "gtest/internal/gtest-port.h"
+#include "gtest/internal/gtest-type-util.h"
+
+// Implements typed tests.
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// Expands to the name of the typedef for the type parameters of the
+// given test suite.
+#define GTEST_TYPE_PARAMS_(TestSuiteName) gtest_type_params_##TestSuiteName##_
+
+// Expands to the name of the typedef for the NameGenerator, responsible for
+// creating the suffixes of the name.
+#define GTEST_NAME_GENERATOR_(TestSuiteName) \
+  gtest_type_params_##TestSuiteName##_NameGenerator
+
+#define TYPED_TEST_SUITE(CaseName, Types, ...)                          \
+  typedef ::testing::internal::GenerateTypeList<Types>::type            \
+      GTEST_TYPE_PARAMS_(CaseName);                                     \
+  typedef ::testing::internal::NameGeneratorSelector<__VA_ARGS__>::type \
+      GTEST_NAME_GENERATOR_(CaseName)
+
+#define TYPED_TEST(CaseName, TestName)                                        \
+  static_assert(sizeof(GTEST_STRINGIFY_(TestName)) > 1,                       \
+                "test-name must not be empty");                               \
+  template <typename gtest_TypeParam_>                                        \
+  class GTEST_TEST_CLASS_NAME_(CaseName, TestName)                            \
+      : public CaseName<gtest_TypeParam_> {                                   \
+   private:                                                                   \
+    typedef CaseName<gtest_TypeParam_> TestFixture;                           \
+    typedef gtest_TypeParam_ TypeParam;                                       \
+    void TestBody() override;                                                 \
+  };                                                                          \
+  static bool gtest_##CaseName##_##TestName##_registered_                     \
+      GTEST_ATTRIBUTE_UNUSED_ = ::testing::internal::TypeParameterizedTest<   \
+          CaseName,                                                           \
+          ::testing::internal::TemplateSel<GTEST_TEST_CLASS_NAME_(CaseName,   \
+                                                                  TestName)>, \
+          GTEST_TYPE_PARAMS_(                                                 \
+              CaseName)>::Register("",                                        \
+                                   ::testing::internal::CodeLocation(         \
+                                       __FILE__, __LINE__),                   \
+                                   GTEST_STRINGIFY_(CaseName),                \
+                                   GTEST_STRINGIFY_(TestName), 0,             \
+                                   ::testing::internal::GenerateNames<        \
+                                       GTEST_NAME_GENERATOR_(CaseName),       \
+                                       GTEST_TYPE_PARAMS_(CaseName)>());      \
+  template <typename gtest_TypeParam_>                                        \
+  void GTEST_TEST_CLASS_NAME_(CaseName,                                       \
+                              TestName)<gtest_TypeParam_>::TestBody()
+
+// Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+#define TYPED_TEST_CASE                                                \
+  static_assert(::testing::internal::TypedTestCaseIsDeprecated(), ""); \
+  TYPED_TEST_SUITE
+#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+// Implements type-parameterized tests.
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// Expands to the namespace name that the type-parameterized tests for
+// the given type-parameterized test suite are defined in.  The exact
+// name of the namespace is subject to change without notice.
+#define GTEST_SUITE_NAMESPACE_(TestSuiteName) gtest_suite_##TestSuiteName##_
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// Expands to the name of the variable used to remember the names of
+// the defined tests in the given test suite.
+#define GTEST_TYPED_TEST_SUITE_P_STATE_(TestSuiteName) \
+  gtest_typed_test_suite_p_state_##TestSuiteName##_
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE DIRECTLY.
+//
+// Expands to the name of the variable used to remember the names of
+// the registered tests in the given test suite.
+#define GTEST_REGISTERED_TEST_NAMES_(TestSuiteName) \
+  gtest_registered_test_names_##TestSuiteName##_
+
+// The variables defined in the type-parameterized test macros are
+// static as typically these macros are used in a .h file that can be
+// #included in multiple translation units linked together.
+#define TYPED_TEST_SUITE_P(SuiteName)              \
+  static ::testing::internal::TypedTestSuitePState \
+      GTEST_TYPED_TEST_SUITE_P_STATE_(SuiteName)
+
+// Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+#define TYPED_TEST_CASE_P                                                 \
+  static_assert(::testing::internal::TypedTestCase_P_IsDeprecated(), ""); \
+  TYPED_TEST_SUITE_P
+#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+#define TYPED_TEST_P(SuiteName, TestName)                             \
+  namespace GTEST_SUITE_NAMESPACE_(SuiteName) {                       \
+    template <typename gtest_TypeParam_>                              \
+    class TestName : public SuiteName<gtest_TypeParam_> {             \
+     private:                                                         \
+      typedef SuiteName<gtest_TypeParam_> TestFixture;                \
+      typedef gtest_TypeParam_ TypeParam;                             \
+      void TestBody() override;                                       \
+    };                                                                \
+    static bool gtest_##TestName##_defined_ GTEST_ATTRIBUTE_UNUSED_ = \
+        GTEST_TYPED_TEST_SUITE_P_STATE_(SuiteName).AddTestName(       \
+            __FILE__, __LINE__, GTEST_STRINGIFY_(SuiteName),          \
+            GTEST_STRINGIFY_(TestName));                              \
+  }                                                                   \
+  template <typename gtest_TypeParam_>                                \
+  void GTEST_SUITE_NAMESPACE_(                                        \
+      SuiteName)::TestName<gtest_TypeParam_>::TestBody()
+
+// Note: this won't work correctly if the trailing arguments are macros.
+#define REGISTER_TYPED_TEST_SUITE_P(SuiteName, ...)                         \
+  namespace GTEST_SUITE_NAMESPACE_(SuiteName) {                             \
+    typedef ::testing::internal::Templates<__VA_ARGS__> gtest_AllTests_;    \
+  }                                                                         \
+  static const char* const GTEST_REGISTERED_TEST_NAMES_(                    \
+      SuiteName) GTEST_ATTRIBUTE_UNUSED_ =                                  \
+      GTEST_TYPED_TEST_SUITE_P_STATE_(SuiteName).VerifyRegisteredTestNames( \
+          GTEST_STRINGIFY_(SuiteName), __FILE__, __LINE__, #__VA_ARGS__)
+
+// Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+#define REGISTER_TYPED_TEST_CASE_P                                           \
+  static_assert(::testing::internal::RegisterTypedTestCase_P_IsDeprecated(), \
+                "");                                                         \
+  REGISTER_TYPED_TEST_SUITE_P
+#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+#define INSTANTIATE_TYPED_TEST_SUITE_P(Prefix, SuiteName, Types, ...)       \
+  static_assert(sizeof(GTEST_STRINGIFY_(Prefix)) > 1,                       \
+                "test-suit-prefix must not be empty");                      \
+  static bool gtest_##Prefix##_##SuiteName GTEST_ATTRIBUTE_UNUSED_ =        \
+      ::testing::internal::TypeParameterizedTestSuite<                      \
+          SuiteName, GTEST_SUITE_NAMESPACE_(SuiteName)::gtest_AllTests_,    \
+          ::testing::internal::GenerateTypeList<Types>::type>::             \
+          Register(GTEST_STRINGIFY_(Prefix),                                \
+                   ::testing::internal::CodeLocation(__FILE__, __LINE__),   \
+                   &GTEST_TYPED_TEST_SUITE_P_STATE_(SuiteName),             \
+                   GTEST_STRINGIFY_(SuiteName),                             \
+                   GTEST_REGISTERED_TEST_NAMES_(SuiteName),                 \
+                   ::testing::internal::GenerateNames<                      \
+                       ::testing::internal::NameGeneratorSelector<          \
+                           __VA_ARGS__>::type,                              \
+                       ::testing::internal::GenerateTypeList<Types>::type>())
+
+// Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+#define INSTANTIATE_TYPED_TEST_CASE_P                                      \
+  static_assert(                                                           \
+      ::testing::internal::InstantiateTypedTestCase_P_IsDeprecated(), ""); \
+  INSTANTIATE_TYPED_TEST_SUITE_P
+#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_GTEST_TYPED_TEST_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/custom/gtest.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/custom/gtest.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/custom/gtest.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/custom/gtest.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,37 @@
+// Copyright 2015, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Injection point for custom user configurations. See README for details
+//
+// ** Custom implementation starts here **
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_H_
+#define GOOGLETEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_H_
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/custom/gtest-port.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/custom/gtest-port.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/custom/gtest-port.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/custom/gtest-port.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,37 @@
+// Copyright 2015, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Injection point for custom user configurations. See README for details
+//
+// ** Custom implementation starts here **
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_
+#define GOOGLETEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/custom/gtest-printers.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/custom/gtest-printers.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/custom/gtest-printers.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/custom/gtest-printers.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,42 @@
+// Copyright 2015, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// This file provides an injection point for custom printers in a local
+// installation of gTest.
+// It will be included from gtest-printers.h and the overrides in this file
+// will be visible to everyone.
+//
+// Injection point for custom user configurations. See README for details
+//
+// ** Custom implementation starts here **
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PRINTERS_H_
+#define GOOGLETEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PRINTERS_H_
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PRINTERS_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/custom/README.md mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/custom/README.md
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/custom/README.md	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/custom/README.md	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,56 @@
+# Customization Points
+
+The custom directory is an injection point for custom user configurations.
+
+## Header `gtest.h`
+
+### The following macros can be defined:
+
+*   `GTEST_OS_STACK_TRACE_GETTER_` - The name of an implementation of
+    `OsStackTraceGetterInterface`.
+*   `GTEST_CUSTOM_TEMPDIR_FUNCTION_` - An override for `testing::TempDir()`. See
+    `testing::TempDir` for semantics and signature.
+
+## Header `gtest-port.h`
+
+The following macros can be defined:
+
+### Flag related macros:
+
+*   `GTEST_FLAG(flag_name)`
+*   `GTEST_USE_OWN_FLAGFILE_FLAG_` - Define to 0 when the system provides its
+    own flagfile flag parsing.
+*   `GTEST_DECLARE_bool_(name)`
+*   `GTEST_DECLARE_int32_(name)`
+*   `GTEST_DECLARE_string_(name)`
+*   `GTEST_DEFINE_bool_(name, default_val, doc)`
+*   `GTEST_DEFINE_int32_(name, default_val, doc)`
+*   `GTEST_DEFINE_string_(name, default_val, doc)`
+
+### Logging:
+
+*   `GTEST_LOG_(severity)`
+*   `GTEST_CHECK_(condition)`
+*   Functions `LogToStderr()` and `FlushInfoLog()` have to be provided too.
+
+### Threading:
+
+*   `GTEST_HAS_NOTIFICATION_` - Enabled if Notification is already provided.
+*   `GTEST_HAS_MUTEX_AND_THREAD_LOCAL_` - Enabled if `Mutex` and `ThreadLocal`
+    are already provided. Must also provide `GTEST_DECLARE_STATIC_MUTEX_(mutex)`
+    and `GTEST_DEFINE_STATIC_MUTEX_(mutex)`
+*   `GTEST_EXCLUSIVE_LOCK_REQUIRED_(locks)`
+*   `GTEST_LOCK_EXCLUDED_(locks)`
+
+### Underlying library support features
+
+*   `GTEST_HAS_CXXABI_H_`
+
+### Exporting API symbols:
+
+*   `GTEST_API_` - Specifier for exported symbols.
+
+## Header `gtest-printers.h`
+
+*   See documentation at `gtest/gtest-printers.h` for details on how to define a
+    custom printer.
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/gtest-death-test-internal.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/gtest-death-test-internal.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/gtest-death-test-internal.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/gtest-death-test-internal.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,304 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// The Google C++ Testing and Mocking Framework (Google Test)
+//
+// This header file defines internal utilities needed for implementing
+// death tests.  They are subject to change without notice.
+// GOOGLETEST_CM0001 DO NOT DELETE
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_
+#define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_
+
+#include "gtest/gtest-matchers.h"
+#include "gtest/internal/gtest-internal.h"
+
+#include <stdio.h>
+#include <memory>
+
+namespace testing {
+namespace internal {
+
+GTEST_DECLARE_string_(internal_run_death_test);
+
+// Names of the flags (needed for parsing Google Test flags).
+const char kDeathTestStyleFlag[] = "death_test_style";
+const char kDeathTestUseFork[] = "death_test_use_fork";
+const char kInternalRunDeathTestFlag[] = "internal_run_death_test";
+
+#if GTEST_HAS_DEATH_TEST
+
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
+/* class A needs to have dll-interface to be used by clients of class B */)
+
+// DeathTest is a class that hides much of the complexity of the
+// GTEST_DEATH_TEST_ macro.  It is abstract; its static Create method
+// returns a concrete class that depends on the prevailing death test
+// style, as defined by the --gtest_death_test_style and/or
+// --gtest_internal_run_death_test flags.
+
+// In describing the results of death tests, these terms are used with
+// the corresponding definitions:
+//
+// exit status:  The integer exit information in the format specified
+//               by wait(2)
+// exit code:    The integer code passed to exit(3), _exit(2), or
+//               returned from main()
+class GTEST_API_ DeathTest {
+ public:
+  // Create returns false if there was an error determining the
+  // appropriate action to take for the current death test; for example,
+  // if the gtest_death_test_style flag is set to an invalid value.
+  // The LastMessage method will return a more detailed message in that
+  // case.  Otherwise, the DeathTest pointer pointed to by the "test"
+  // argument is set.  If the death test should be skipped, the pointer
+  // is set to NULL; otherwise, it is set to the address of a new concrete
+  // DeathTest object that controls the execution of the current test.
+  static bool Create(const char* statement, Matcher<const std::string&> matcher,
+                     const char* file, int line, DeathTest** test);
+  DeathTest();
+  virtual ~DeathTest() { }
+
+  // A helper class that aborts a death test when it's deleted.
+  class ReturnSentinel {
+   public:
+    explicit ReturnSentinel(DeathTest* test) : test_(test) { }
+    ~ReturnSentinel() { test_->Abort(TEST_ENCOUNTERED_RETURN_STATEMENT); }
+   private:
+    DeathTest* const test_;
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(ReturnSentinel);
+  } GTEST_ATTRIBUTE_UNUSED_;
+
+  // An enumeration of possible roles that may be taken when a death
+  // test is encountered.  EXECUTE means that the death test logic should
+  // be executed immediately.  OVERSEE means that the program should prepare
+  // the appropriate environment for a child process to execute the death
+  // test, then wait for it to complete.
+  enum TestRole { OVERSEE_TEST, EXECUTE_TEST };
+
+  // An enumeration of the three reasons that a test might be aborted.
+  enum AbortReason {
+    TEST_ENCOUNTERED_RETURN_STATEMENT,
+    TEST_THREW_EXCEPTION,
+    TEST_DID_NOT_DIE
+  };
+
+  // Assumes one of the above roles.
+  virtual TestRole AssumeRole() = 0;
+
+  // Waits for the death test to finish and returns its status.
+  virtual int Wait() = 0;
+
+  // Returns true if the death test passed; that is, the test process
+  // exited during the test, its exit status matches a user-supplied
+  // predicate, and its stderr output matches a user-supplied regular
+  // expression.
+  // The user-supplied predicate may be a macro expression rather
+  // than a function pointer or functor, or else Wait and Passed could
+  // be combined.
+  virtual bool Passed(bool exit_status_ok) = 0;
+
+  // Signals that the death test did not die as expected.
+  virtual void Abort(AbortReason reason) = 0;
+
+  // Returns a human-readable outcome message regarding the outcome of
+  // the last death test.
+  static const char* LastMessage();
+
+  static void set_last_death_test_message(const std::string& message);
+
+ private:
+  // A string containing a description of the outcome of the last death test.
+  static std::string last_death_test_message_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(DeathTest);
+};
+
+GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
+
+// Factory interface for death tests.  May be mocked out for testing.
+class DeathTestFactory {
+ public:
+  virtual ~DeathTestFactory() { }
+  virtual bool Create(const char* statement,
+                      Matcher<const std::string&> matcher, const char* file,
+                      int line, DeathTest** test) = 0;
+};
+
+// A concrete DeathTestFactory implementation for normal use.
+class DefaultDeathTestFactory : public DeathTestFactory {
+ public:
+  bool Create(const char* statement, Matcher<const std::string&> matcher,
+              const char* file, int line, DeathTest** test) override;
+};
+
+// Returns true if exit_status describes a process that was terminated
+// by a signal, or exited normally with a nonzero exit code.
+GTEST_API_ bool ExitedUnsuccessfully(int exit_status);
+
+// A string passed to EXPECT_DEATH (etc.) is caught by one of these overloads
+// and interpreted as a regex (rather than an Eq matcher) for legacy
+// compatibility.
+inline Matcher<const ::std::string&> MakeDeathTestMatcher(
+    ::testing::internal::RE regex) {
+  return ContainsRegex(regex.pattern());
+}
+inline Matcher<const ::std::string&> MakeDeathTestMatcher(const char* regex) {
+  return ContainsRegex(regex);
+}
+inline Matcher<const ::std::string&> MakeDeathTestMatcher(
+    const ::std::string& regex) {
+  return ContainsRegex(regex);
+}
+
+// If a Matcher<const ::std::string&> is passed to EXPECT_DEATH (etc.), it's
+// used directly.
+inline Matcher<const ::std::string&> MakeDeathTestMatcher(
+    Matcher<const ::std::string&> matcher) {
+  return matcher;
+}
+
+// Traps C++ exceptions escaping statement and reports them as test
+// failures. Note that trapping SEH exceptions is not implemented here.
+# if GTEST_HAS_EXCEPTIONS
+#  define GTEST_EXECUTE_DEATH_TEST_STATEMENT_(statement, death_test) \
+  try { \
+    GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
+  } catch (const ::std::exception& gtest_exception) { \
+    fprintf(\
+        stderr, \
+        "\n%s: Caught std::exception-derived exception escaping the " \
+        "death test statement. Exception message: %s\n", \
+        ::testing::internal::FormatFileLocation(__FILE__, __LINE__).c_str(), \
+        gtest_exception.what()); \
+    fflush(stderr); \
+    death_test->Abort(::testing::internal::DeathTest::TEST_THREW_EXCEPTION); \
+  } catch (...) { \
+    death_test->Abort(::testing::internal::DeathTest::TEST_THREW_EXCEPTION); \
+  }
+
+# else
+#  define GTEST_EXECUTE_DEATH_TEST_STATEMENT_(statement, death_test) \
+  GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement)
+
+# endif
+
+// This macro is for implementing ASSERT_DEATH*, EXPECT_DEATH*,
+// ASSERT_EXIT*, and EXPECT_EXIT*.
+#define GTEST_DEATH_TEST_(statement, predicate, regex_or_matcher, fail)        \
+  GTEST_AMBIGUOUS_ELSE_BLOCKER_                                                \
+  if (::testing::internal::AlwaysTrue()) {                                     \
+    ::testing::internal::DeathTest* gtest_dt;                                  \
+    if (!::testing::internal::DeathTest::Create(                               \
+            #statement,                                                        \
+            ::testing::internal::MakeDeathTestMatcher(regex_or_matcher),       \
+            __FILE__, __LINE__, &gtest_dt)) {                                  \
+      goto GTEST_CONCAT_TOKEN_(gtest_label_, __LINE__);                        \
+    }                                                                          \
+    if (gtest_dt != nullptr) {                                                 \
+      std::unique_ptr< ::testing::internal::DeathTest> gtest_dt_ptr(gtest_dt); \
+      switch (gtest_dt->AssumeRole()) {                                        \
+        case ::testing::internal::DeathTest::OVERSEE_TEST:                     \
+          if (!gtest_dt->Passed(predicate(gtest_dt->Wait()))) {                \
+            goto GTEST_CONCAT_TOKEN_(gtest_label_, __LINE__);                  \
+          }                                                                    \
+          break;                                                               \
+        case ::testing::internal::DeathTest::EXECUTE_TEST: {                   \
+          ::testing::internal::DeathTest::ReturnSentinel gtest_sentinel(       \
+              gtest_dt);                                                       \
+          GTEST_EXECUTE_DEATH_TEST_STATEMENT_(statement, gtest_dt);            \
+          gtest_dt->Abort(::testing::internal::DeathTest::TEST_DID_NOT_DIE);   \
+          break;                                                               \
+        }                                                                      \
+        default:                                                               \
+          break;                                                               \
+      }                                                                        \
+    }                                                                          \
+  } else                                                                       \
+    GTEST_CONCAT_TOKEN_(gtest_label_, __LINE__)                                \
+        : fail(::testing::internal::DeathTest::LastMessage())
+// The symbol "fail" here expands to something into which a message
+// can be streamed.
+
+// This macro is for implementing ASSERT/EXPECT_DEBUG_DEATH when compiled in
+// NDEBUG mode. In this case we need the statements to be executed and the macro
+// must accept a streamed message even though the message is never printed.
+// The regex object is not evaluated, but it is used to prevent "unused"
+// warnings and to avoid an expression that doesn't compile in debug mode.
+#define GTEST_EXECUTE_STATEMENT_(statement, regex_or_matcher)    \
+  GTEST_AMBIGUOUS_ELSE_BLOCKER_                                  \
+  if (::testing::internal::AlwaysTrue()) {                       \
+    GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement);   \
+  } else if (!::testing::internal::AlwaysTrue()) {               \
+    ::testing::internal::MakeDeathTestMatcher(regex_or_matcher); \
+  } else                                                         \
+    ::testing::Message()
+
+// A class representing the parsed contents of the
+// --gtest_internal_run_death_test flag, as it existed when
+// RUN_ALL_TESTS was called.
+class InternalRunDeathTestFlag {
+ public:
+  InternalRunDeathTestFlag(const std::string& a_file,
+                           int a_line,
+                           int an_index,
+                           int a_write_fd)
+      : file_(a_file), line_(a_line), index_(an_index),
+        write_fd_(a_write_fd) {}
+
+  ~InternalRunDeathTestFlag() {
+    if (write_fd_ >= 0)
+      posix::Close(write_fd_);
+  }
+
+  const std::string& file() const { return file_; }
+  int line() const { return line_; }
+  int index() const { return index_; }
+  int write_fd() const { return write_fd_; }
+
+ private:
+  std::string file_;
+  int line_;
+  int index_;
+  int write_fd_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(InternalRunDeathTestFlag);
+};
+
+// Returns a newly created InternalRunDeathTestFlag object with fields
+// initialized from the GTEST_FLAG(internal_run_death_test) flag if
+// the flag is specified; otherwise returns NULL.
+InternalRunDeathTestFlag* ParseInternalRunDeathTestFlag();
+
+#endif  // GTEST_HAS_DEATH_TEST
+
+}  // namespace internal
+}  // namespace testing
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/gtest-filepath.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/gtest-filepath.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/gtest-filepath.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/gtest-filepath.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,211 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Google Test filepath utilities
+//
+// This header file declares classes and functions used internally by
+// Google Test.  They are subject to change without notice.
+//
+// This file is #included in gtest/internal/gtest-internal.h.
+// Do not include this header file separately!
+
+// GOOGLETEST_CM0001 DO NOT DELETE
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
+#define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
+
+#include "gtest/internal/gtest-string.h"
+
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
+/* class A needs to have dll-interface to be used by clients of class B */)
+
+namespace testing {
+namespace internal {
+
+// FilePath - a class for file and directory pathname manipulation which
+// handles platform-specific conventions (like the pathname separator).
+// Used for helper functions for naming files in a directory for xml output.
+// Except for Set methods, all methods are const or static, which provides an
+// "immutable value object" -- useful for peace of mind.
+// A FilePath with a value ending in a path separator ("like/this/") represents
+// a directory, otherwise it is assumed to represent a file. In either case,
+// it may or may not represent an actual file or directory in the file system.
+// Names are NOT checked for syntax correctness -- no checking for illegal
+// characters, malformed paths, etc.
+
+class GTEST_API_ FilePath {
+ public:
+  FilePath() : pathname_("") { }
+  FilePath(const FilePath& rhs) : pathname_(rhs.pathname_) { }
+
+  explicit FilePath(const std::string& pathname) : pathname_(pathname) {
+    Normalize();
+  }
+
+  FilePath& operator=(const FilePath& rhs) {
+    Set(rhs);
+    return *this;
+  }
+
+  void Set(const FilePath& rhs) {
+    pathname_ = rhs.pathname_;
+  }
+
+  const std::string& string() const { return pathname_; }
+  const char* c_str() const { return pathname_.c_str(); }
+
+  // Returns the current working directory, or "" if unsuccessful.
+  static FilePath GetCurrentDir();
+
+  // Given directory = "dir", base_name = "test", number = 0,
+  // extension = "xml", returns "dir/test.xml". If number is greater
+  // than zero (e.g., 12), returns "dir/test_12.xml".
+  // On Windows platform, uses \ as the separator rather than /.
+  static FilePath MakeFileName(const FilePath& directory,
+                               const FilePath& base_name,
+                               int number,
+                               const char* extension);
+
+  // Given directory = "dir", relative_path = "test.xml",
+  // returns "dir/test.xml".
+  // On Windows, uses \ as the separator rather than /.
+  static FilePath ConcatPaths(const FilePath& directory,
+                              const FilePath& relative_path);
+
+  // Returns a pathname for a file that does not currently exist. The pathname
+  // will be directory/base_name.extension or
+  // directory/base_name_<number>.extension if directory/base_name.extension
+  // already exists. The number will be incremented until a pathname is found
+  // that does not already exist.
+  // Examples: 'dir/foo_test.xml' or 'dir/foo_test_1.xml'.
+  // There could be a race condition if two or more processes are calling this
+  // function at the same time -- they could both pick the same filename.
+  static FilePath GenerateUniqueFileName(const FilePath& directory,
+                                         const FilePath& base_name,
+                                         const char* extension);
+
+  // Returns true if and only if the path is "".
+  bool IsEmpty() const { return pathname_.empty(); }
+
+  // If input name has a trailing separator character, removes it and returns
+  // the name, otherwise return the name string unmodified.
+  // On Windows platform, uses \ as the separator, other platforms use /.
+  FilePath RemoveTrailingPathSeparator() const;
+
+  // Returns a copy of the FilePath with the directory part removed.
+  // Example: FilePath("path/to/file").RemoveDirectoryName() returns
+  // FilePath("file"). If there is no directory part ("just_a_file"), it returns
+  // the FilePath unmodified. If there is no file part ("just_a_dir/") it
+  // returns an empty FilePath ("").
+  // On Windows platform, '\' is the path separator, otherwise it is '/'.
+  FilePath RemoveDirectoryName() const;
+
+  // RemoveFileName returns the directory path with the filename removed.
+  // Example: FilePath("path/to/file").RemoveFileName() returns "path/to/".
+  // If the FilePath is "a_file" or "/a_file", RemoveFileName returns
+  // FilePath("./") or, on Windows, FilePath(".\\"). If the filepath does
+  // not have a file, like "just/a/dir/", it returns the FilePath unmodified.
+  // On Windows platform, '\' is the path separator, otherwise it is '/'.
+  FilePath RemoveFileName() const;
+
+  // Returns a copy of the FilePath with the case-insensitive extension removed.
+  // Example: FilePath("dir/file.exe").RemoveExtension("EXE") returns
+  // FilePath("dir/file"). If a case-insensitive extension is not
+  // found, returns a copy of the original FilePath.
+  FilePath RemoveExtension(const char* extension) const;
+
+  // Creates directories so that path exists. Returns true if successful or if
+  // the directories already exist; returns false if unable to create
+  // directories for any reason. Will also return false if the FilePath does
+  // not represent a directory (that is, it doesn't end with a path separator).
+  bool CreateDirectoriesRecursively() const;
+
+  // Create the directory so that path exists. Returns true if successful or
+  // if the directory already exists; returns false if unable to create the
+  // directory for any reason, including if the parent directory does not
+  // exist. Not named "CreateDirectory" because that's a macro on Windows.
+  bool CreateFolder() const;
+
+  // Returns true if FilePath describes something in the file-system,
+  // either a file, directory, or whatever, and that something exists.
+  bool FileOrDirectoryExists() const;
+
+  // Returns true if pathname describes a directory in the file-system
+  // that exists.
+  bool DirectoryExists() const;
+
+  // Returns true if FilePath ends with a path separator, which indicates that
+  // it is intended to represent a directory. Returns false otherwise.
+  // This does NOT check that a directory (or file) actually exists.
+  bool IsDirectory() const;
+
+  // Returns true if pathname describes a root directory. (Windows has one
+  // root directory per disk drive.)
+  bool IsRootDirectory() const;
+
+  // Returns true if pathname describes an absolute path.
+  bool IsAbsolutePath() const;
+
+ private:
+  // Replaces multiple consecutive separators with a single separator.
+  // For example, "bar///foo" becomes "bar/foo". Does not eliminate other
+  // redundancies that might be in a pathname involving "." or "..".
+  //
+  // A pathname with multiple consecutive separators may occur either through
+  // user error or as a result of some scripts or APIs that generate a pathname
+  // with a trailing separator. On other platforms the same API or script
+  // may NOT generate a pathname with a trailing "/". Then elsewhere that
+  // pathname may have another "/" and pathname components added to it,
+  // without checking for the separator already being there.
+  // The script language and operating system may allow paths like "foo//bar"
+  // but some of the functions in FilePath will not handle that correctly. In
+  // particular, RemoveTrailingPathSeparator() only removes one separator, and
+  // it is called in CreateDirectoriesRecursively() assuming that it will change
+  // a pathname from directory syntax (trailing separator) to filename syntax.
+  //
+  // On Windows this method also replaces the alternate path separator '/' with
+  // the primary path separator '\\', so that for example "bar\\/\\foo" becomes
+  // "bar\\foo".
+
+  void Normalize();
+
+  // Returns a pointer to the last occurrence of a valid path separator in
+  // the FilePath. On Windows, for example, both '/' and '\' are valid path
+  // separators. Returns NULL if no path separator was found.
+  const char* FindLastPathSeparator() const;
+
+  std::string pathname_;
+};  // class FilePath
+
+}  // namespace internal
+}  // namespace testing
+
+GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/gtest-internal.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/gtest-internal.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/gtest-internal.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/gtest-internal.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,1560 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// The Google C++ Testing and Mocking Framework (Google Test)
+//
+// This header file declares functions and macros used internally by
+// Google Test.  They are subject to change without notice.
+
+// GOOGLETEST_CM0001 DO NOT DELETE
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_
+#define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_
+
+#include "gtest/internal/gtest-port.h"
+
+#if GTEST_OS_LINUX
+# include <stdlib.h>
+# include <sys/types.h>
+# include <sys/wait.h>
+# include <unistd.h>
+#endif  // GTEST_OS_LINUX
+
+#if GTEST_HAS_EXCEPTIONS
+# include <stdexcept>
+#endif
+
+#include <ctype.h>
+#include <float.h>
+#include <string.h>
+#include <cstdint>
+#include <iomanip>
+#include <limits>
+#include <map>
+#include <set>
+#include <string>
+#include <type_traits>
+#include <vector>
+
+#include "gtest/gtest-message.h"
+#include "gtest/internal/gtest-filepath.h"
+#include "gtest/internal/gtest-string.h"
+#include "gtest/internal/gtest-type-util.h"
+
+// Due to C++ preprocessor weirdness, we need double indirection to
+// concatenate two tokens when one of them is __LINE__.  Writing
+//
+//   foo ## __LINE__
+//
+// will result in the token foo__LINE__, instead of foo followed by
+// the current line number.  For more details, see
+// http://www.parashift.com/c++-faq-lite/misc-technical-issues.html#faq-39.6
+#define GTEST_CONCAT_TOKEN_(foo, bar) GTEST_CONCAT_TOKEN_IMPL_(foo, bar)
+#define GTEST_CONCAT_TOKEN_IMPL_(foo, bar) foo ## bar
+
+// Stringifies its argument.
+// Work around a bug in visual studio which doesn't accept code like this:
+//
+//   #define GTEST_STRINGIFY_(name) #name
+//   #define MACRO(a, b, c) ... GTEST_STRINGIFY_(a) ...
+//   MACRO(, x, y)
+//
+// Complaining about the argument to GTEST_STRINGIFY_ being empty.
+// This is allowed by the spec.
+#define GTEST_STRINGIFY_HELPER_(name, ...) #name
+#define GTEST_STRINGIFY_(...) GTEST_STRINGIFY_HELPER_(__VA_ARGS__, )
+
+namespace proto2 {
+class MessageLite;
+}
+
+namespace testing {
+
+// Forward declarations.
+
+class AssertionResult;                 // Result of an assertion.
+class Message;                         // Represents a failure message.
+class Test;                            // Represents a test.
+class TestInfo;                        // Information about a test.
+class TestPartResult;                  // Result of a test part.
+class UnitTest;                        // A collection of test suites.
+
+template <typename T>
+::std::string PrintToString(const T& value);
+
+namespace internal {
+
+struct TraceInfo;                      // Information about a trace point.
+class TestInfoImpl;                    // Opaque implementation of TestInfo
+class UnitTestImpl;                    // Opaque implementation of UnitTest
+
+// The text used in failure messages to indicate the start of the
+// stack trace.
+GTEST_API_ extern const char kStackTraceMarker[];
+
+// An IgnoredValue object can be implicitly constructed from ANY value.
+class IgnoredValue {
+  struct Sink {};
+ public:
+  // This constructor template allows any value to be implicitly
+  // converted to IgnoredValue.  The object has no data member and
+  // doesn't try to remember anything about the argument.  We
+  // deliberately omit the 'explicit' keyword in order to allow the
+  // conversion to be implicit.
+  // Disable the conversion if T already has a magical conversion operator.
+  // Otherwise we get ambiguity.
+  template <typename T,
+            typename std::enable_if<!std::is_convertible<T, Sink>::value,
+                                    int>::type = 0>
+  IgnoredValue(const T& /* ignored */) {}  // NOLINT(runtime/explicit)
+};
+
+// Appends the user-supplied message to the Google-Test-generated message.
+GTEST_API_ std::string AppendUserMessage(
+    const std::string& gtest_msg, const Message& user_msg);
+
+#if GTEST_HAS_EXCEPTIONS
+
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4275 \
+/* an exported class was derived from a class that was not exported */)
+
+// This exception is thrown by (and only by) a failed Google Test
+// assertion when GTEST_FLAG(throw_on_failure) is true (if exceptions
+// are enabled).  We derive it from std::runtime_error, which is for
+// errors presumably detectable only at run time.  Since
+// std::runtime_error inherits from std::exception, many testing
+// frameworks know how to extract and print the message inside it.
+class GTEST_API_ GoogleTestFailureException : public ::std::runtime_error {
+ public:
+  explicit GoogleTestFailureException(const TestPartResult& failure);
+};
+
+GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4275
+
+#endif  // GTEST_HAS_EXCEPTIONS
+
+namespace edit_distance {
+// Returns the optimal edits to go from 'left' to 'right'.
+// All edits cost the same, with replace having lower priority than
+// add/remove.
+// Simple implementation of the Wagner-Fischer algorithm.
+// See http://en.wikipedia.org/wiki/Wagner-Fischer_algorithm
+enum EditType { kMatch, kAdd, kRemove, kReplace };
+GTEST_API_ std::vector<EditType> CalculateOptimalEdits(
+    const std::vector<size_t>& left, const std::vector<size_t>& right);
+
+// Same as above, but the input is represented as strings.
+GTEST_API_ std::vector<EditType> CalculateOptimalEdits(
+    const std::vector<std::string>& left,
+    const std::vector<std::string>& right);
+
+// Create a diff of the input strings in Unified diff format.
+GTEST_API_ std::string CreateUnifiedDiff(const std::vector<std::string>& left,
+                                         const std::vector<std::string>& right,
+                                         size_t context = 2);
+
+}  // namespace edit_distance
+
+// Calculate the diff between 'left' and 'right' and return it in unified diff
+// format.
+// If not null, stores in 'total_line_count' the total number of lines found
+// in left + right.
+GTEST_API_ std::string DiffStrings(const std::string& left,
+                                   const std::string& right,
+                                   size_t* total_line_count);
+
+// Constructs and returns the message for an equality assertion
+// (e.g. ASSERT_EQ, EXPECT_STREQ, etc) failure.
+//
+// The first four parameters are the expressions used in the assertion
+// and their values, as strings.  For example, for ASSERT_EQ(foo, bar)
+// where foo is 5 and bar is 6, we have:
+//
+//   expected_expression: "foo"
+//   actual_expression:   "bar"
+//   expected_value:      "5"
+//   actual_value:        "6"
+//
+// The ignoring_case parameter is true if and only if the assertion is a
+// *_STRCASEEQ*.  When it's true, the string " (ignoring case)" will
+// be inserted into the message.
+GTEST_API_ AssertionResult EqFailure(const char* expected_expression,
+                                     const char* actual_expression,
+                                     const std::string& expected_value,
+                                     const std::string& actual_value,
+                                     bool ignoring_case);
+
+// Constructs a failure message for Boolean assertions such as EXPECT_TRUE.
+GTEST_API_ std::string GetBoolAssertionFailureMessage(
+    const AssertionResult& assertion_result,
+    const char* expression_text,
+    const char* actual_predicate_value,
+    const char* expected_predicate_value);
+
+// This template class represents an IEEE floating-point number
+// (either single-precision or double-precision, depending on the
+// template parameters).
+//
+// The purpose of this class is to do more sophisticated number
+// comparison.  (Due to round-off error, etc, it's very unlikely that
+// two floating-points will be equal exactly.  Hence a naive
+// comparison by the == operation often doesn't work.)
+//
+// Format of IEEE floating-point:
+//
+//   The most-significant bit being the leftmost, an IEEE
+//   floating-point looks like
+//
+//     sign_bit exponent_bits fraction_bits
+//
+//   Here, sign_bit is a single bit that designates the sign of the
+//   number.
+//
+//   For float, there are 8 exponent bits and 23 fraction bits.
+//
+//   For double, there are 11 exponent bits and 52 fraction bits.
+//
+//   More details can be found at
+//   http://en.wikipedia.org/wiki/IEEE_floating-point_standard.
+//
+// Template parameter:
+//
+//   RawType: the raw floating-point type (either float or double)
+template <typename RawType>
+class FloatingPoint {
+ public:
+  // Defines the unsigned integer type that has the same size as the
+  // floating point number.
+  typedef typename TypeWithSize<sizeof(RawType)>::UInt Bits;
+
+  // Constants.
+
+  // # of bits in a number.
+  static const size_t kBitCount = 8*sizeof(RawType);
+
+  // # of fraction bits in a number.
+  static const size_t kFractionBitCount =
+    std::numeric_limits<RawType>::digits - 1;
+
+  // # of exponent bits in a number.
+  static const size_t kExponentBitCount = kBitCount - 1 - kFractionBitCount;
+
+  // The mask for the sign bit.
+  static const Bits kSignBitMask = static_cast<Bits>(1) << (kBitCount - 1);
+
+  // The mask for the fraction bits.
+  static const Bits kFractionBitMask =
+    ~static_cast<Bits>(0) >> (kExponentBitCount + 1);
+
+  // The mask for the exponent bits.
+  static const Bits kExponentBitMask = ~(kSignBitMask | kFractionBitMask);
+
+  // How many ULP's (Units in the Last Place) we want to tolerate when
+  // comparing two numbers.  The larger the value, the more error we
+  // allow.  A 0 value means that two numbers must be exactly the same
+  // to be considered equal.
+  //
+  // The maximum error of a single floating-point operation is 0.5
+  // units in the last place.  On Intel CPU's, all floating-point
+  // calculations are done with 80-bit precision, while double has 64
+  // bits.  Therefore, 4 should be enough for ordinary use.
+  //
+  // See the following article for more details on ULP:
+  // http://randomascii.wordpress.com/2012/02/25/comparing-floating-point-numbers-2012-edition/
+  static const uint32_t kMaxUlps = 4;
+
+  // Constructs a FloatingPoint from a raw floating-point number.
+  //
+  // On an Intel CPU, passing a non-normalized NAN (Not a Number)
+  // around may change its bits, although the new value is guaranteed
+  // to be also a NAN.  Therefore, don't expect this constructor to
+  // preserve the bits in x when x is a NAN.
+  explicit FloatingPoint(const RawType& x) { u_.value_ = x; }
+
+  // Static methods
+
+  // Reinterprets a bit pattern as a floating-point number.
+  //
+  // This function is needed to test the AlmostEquals() method.
+  static RawType ReinterpretBits(const Bits bits) {
+    FloatingPoint fp(0);
+    fp.u_.bits_ = bits;
+    return fp.u_.value_;
+  }
+
+  // Returns the floating-point number that represent positive infinity.
+  static RawType Infinity() {
+    return ReinterpretBits(kExponentBitMask);
+  }
+
+  // Returns the maximum representable finite floating-point number.
+  static RawType Max();
+
+  // Non-static methods
+
+  // Returns the bits that represents this number.
+  const Bits &bits() const { return u_.bits_; }
+
+  // Returns the exponent bits of this number.
+  Bits exponent_bits() const { return kExponentBitMask & u_.bits_; }
+
+  // Returns the fraction bits of this number.
+  Bits fraction_bits() const { return kFractionBitMask & u_.bits_; }
+
+  // Returns the sign bit of this number.
+  Bits sign_bit() const { return kSignBitMask & u_.bits_; }
+
+  // Returns true if and only if this is NAN (not a number).
+  bool is_nan() const {
+    // It's a NAN if the exponent bits are all ones and the fraction
+    // bits are not entirely zeros.
+    return (exponent_bits() == kExponentBitMask) && (fraction_bits() != 0);
+  }
+
+  // Returns true if and only if this number is at most kMaxUlps ULP's away
+  // from rhs.  In particular, this function:
+  //
+  //   - returns false if either number is (or both are) NAN.
+  //   - treats really large numbers as almost equal to infinity.
+  //   - thinks +0.0 and -0.0 are 0 DLP's apart.
+  bool AlmostEquals(const FloatingPoint& rhs) const {
+    // The IEEE standard says that any comparison operation involving
+    // a NAN must return false.
+    if (is_nan() || rhs.is_nan()) return false;
+
+    return DistanceBetweenSignAndMagnitudeNumbers(u_.bits_, rhs.u_.bits_)
+        <= kMaxUlps;
+  }
+
+ private:
+  // The data type used to store the actual floating-point number.
+  union FloatingPointUnion {
+    RawType value_;  // The raw floating-point number.
+    Bits bits_;      // The bits that represent the number.
+  };
+
+  // Converts an integer from the sign-and-magnitude representation to
+  // the biased representation.  More precisely, let N be 2 to the
+  // power of (kBitCount - 1), an integer x is represented by the
+  // unsigned number x + N.
+  //
+  // For instance,
+  //
+  //   -N + 1 (the most negative number representable using
+  //          sign-and-magnitude) is represented by 1;
+  //   0      is represented by N; and
+  //   N - 1  (the biggest number representable using
+  //          sign-and-magnitude) is represented by 2N - 1.
+  //
+  // Read http://en.wikipedia.org/wiki/Signed_number_representations
+  // for more details on signed number representations.
+  static Bits SignAndMagnitudeToBiased(const Bits &sam) {
+    if (kSignBitMask & sam) {
+      // sam represents a negative number.
+      return ~sam + 1;
+    } else {
+      // sam represents a positive number.
+      return kSignBitMask | sam;
+    }
+  }
+
+  // Given two numbers in the sign-and-magnitude representation,
+  // returns the distance between them as an unsigned number.
+  static Bits DistanceBetweenSignAndMagnitudeNumbers(const Bits &sam1,
+                                                     const Bits &sam2) {
+    const Bits biased1 = SignAndMagnitudeToBiased(sam1);
+    const Bits biased2 = SignAndMagnitudeToBiased(sam2);
+    return (biased1 >= biased2) ? (biased1 - biased2) : (biased2 - biased1);
+  }
+
+  FloatingPointUnion u_;
+};
+
+// We cannot use std::numeric_limits<T>::max() as it clashes with the max()
+// macro defined by <windows.h>.
+template <>
+inline float FloatingPoint<float>::Max() { return FLT_MAX; }
+template <>
+inline double FloatingPoint<double>::Max() { return DBL_MAX; }
+
+// Typedefs the instances of the FloatingPoint template class that we
+// care to use.
+typedef FloatingPoint<float> Float;
+typedef FloatingPoint<double> Double;
+
+// In order to catch the mistake of putting tests that use different
+// test fixture classes in the same test suite, we need to assign
+// unique IDs to fixture classes and compare them.  The TypeId type is
+// used to hold such IDs.  The user should treat TypeId as an opaque
+// type: the only operation allowed on TypeId values is to compare
+// them for equality using the == operator.
+typedef const void* TypeId;
+
+template <typename T>
+class TypeIdHelper {
+ public:
+  // dummy_ must not have a const type.  Otherwise an overly eager
+  // compiler (e.g. MSVC 7.1 & 8.0) may try to merge
+  // TypeIdHelper<T>::dummy_ for different Ts as an "optimization".
+  static bool dummy_;
+};
+
+template <typename T>
+bool TypeIdHelper<T>::dummy_ = false;
+
+// GetTypeId<T>() returns the ID of type T.  Different values will be
+// returned for different types.  Calling the function twice with the
+// same type argument is guaranteed to return the same ID.
+template <typename T>
+TypeId GetTypeId() {
+  // The compiler is required to allocate a different
+  // TypeIdHelper<T>::dummy_ variable for each T used to instantiate
+  // the template.  Therefore, the address of dummy_ is guaranteed to
+  // be unique.
+  return &(TypeIdHelper<T>::dummy_);
+}
+
+// Returns the type ID of ::testing::Test.  Always call this instead
+// of GetTypeId< ::testing::Test>() to get the type ID of
+// ::testing::Test, as the latter may give the wrong result due to a
+// suspected linker bug when compiling Google Test as a Mac OS X
+// framework.
+GTEST_API_ TypeId GetTestTypeId();
+
+// Defines the abstract factory interface that creates instances
+// of a Test object.
+class TestFactoryBase {
+ public:
+  virtual ~TestFactoryBase() {}
+
+  // Creates a test instance to run. The instance is both created and destroyed
+  // within TestInfoImpl::Run()
+  virtual Test* CreateTest() = 0;
+
+ protected:
+  TestFactoryBase() {}
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestFactoryBase);
+};
+
+// This class provides implementation of TeastFactoryBase interface.
+// It is used in TEST and TEST_F macros.
+template <class TestClass>
+class TestFactoryImpl : public TestFactoryBase {
+ public:
+  Test* CreateTest() override { return new TestClass; }
+};
+
+#if GTEST_OS_WINDOWS
+
+// Predicate-formatters for implementing the HRESULT checking macros
+// {ASSERT|EXPECT}_HRESULT_{SUCCEEDED|FAILED}
+// We pass a long instead of HRESULT to avoid causing an
+// include dependency for the HRESULT type.
+GTEST_API_ AssertionResult IsHRESULTSuccess(const char* expr,
+                                            long hr);  // NOLINT
+GTEST_API_ AssertionResult IsHRESULTFailure(const char* expr,
+                                            long hr);  // NOLINT
+
+#endif  // GTEST_OS_WINDOWS
+
+// Types of SetUpTestSuite() and TearDownTestSuite() functions.
+using SetUpTestSuiteFunc = void (*)();
+using TearDownTestSuiteFunc = void (*)();
+
+struct CodeLocation {
+  CodeLocation(const std::string& a_file, int a_line)
+      : file(a_file), line(a_line) {}
+
+  std::string file;
+  int line;
+};
+
+//  Helper to identify which setup function for TestCase / TestSuite to call.
+//  Only one function is allowed, either TestCase or TestSute but not both.
+
+// Utility functions to help SuiteApiResolver
+using SetUpTearDownSuiteFuncType = void (*)();
+
+inline SetUpTearDownSuiteFuncType GetNotDefaultOrNull(
+    SetUpTearDownSuiteFuncType a, SetUpTearDownSuiteFuncType def) {
+  return a == def ? nullptr : a;
+}
+
+template <typename T>
+//  Note that SuiteApiResolver inherits from T because
+//  SetUpTestSuite()/TearDownTestSuite() could be protected. Ths way
+//  SuiteApiResolver can access them.
+struct SuiteApiResolver : T {
+  // testing::Test is only forward declared at this point. So we make it a
+  // dependend class for the compiler to be OK with it.
+  using Test =
+      typename std::conditional<sizeof(T) != 0, ::testing::Test, void>::type;
+
+  static SetUpTearDownSuiteFuncType GetSetUpCaseOrSuite(const char* filename,
+                                                        int line_num) {
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+    SetUpTearDownSuiteFuncType test_case_fp =
+        GetNotDefaultOrNull(&T::SetUpTestCase, &Test::SetUpTestCase);
+    SetUpTearDownSuiteFuncType test_suite_fp =
+        GetNotDefaultOrNull(&T::SetUpTestSuite, &Test::SetUpTestSuite);
+
+    GTEST_CHECK_(!test_case_fp || !test_suite_fp)
+        << "Test can not provide both SetUpTestSuite and SetUpTestCase, please "
+           "make sure there is only one present at "
+        << filename << ":" << line_num;
+
+    return test_case_fp != nullptr ? test_case_fp : test_suite_fp;
+#else
+    (void)(filename);
+    (void)(line_num);
+    return &T::SetUpTestSuite;
+#endif
+  }
+
+  static SetUpTearDownSuiteFuncType GetTearDownCaseOrSuite(const char* filename,
+                                                           int line_num) {
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+    SetUpTearDownSuiteFuncType test_case_fp =
+        GetNotDefaultOrNull(&T::TearDownTestCase, &Test::TearDownTestCase);
+    SetUpTearDownSuiteFuncType test_suite_fp =
+        GetNotDefaultOrNull(&T::TearDownTestSuite, &Test::TearDownTestSuite);
+
+    GTEST_CHECK_(!test_case_fp || !test_suite_fp)
+        << "Test can not provide both TearDownTestSuite and TearDownTestCase,"
+           " please make sure there is only one present at"
+        << filename << ":" << line_num;
+
+    return test_case_fp != nullptr ? test_case_fp : test_suite_fp;
+#else
+    (void)(filename);
+    (void)(line_num);
+    return &T::TearDownTestSuite;
+#endif
+  }
+};
+
+// Creates a new TestInfo object and registers it with Google Test;
+// returns the created object.
+//
+// Arguments:
+//
+//   test_suite_name:  name of the test suite
+//   name:             name of the test
+//   type_param:       the name of the test's type parameter, or NULL if
+//                     this is not a typed or a type-parameterized test.
+//   value_param:      text representation of the test's value parameter,
+//                     or NULL if this is not a type-parameterized test.
+//   code_location:    code location where the test is defined
+//   fixture_class_id: ID of the test fixture class
+//   set_up_tc:        pointer to the function that sets up the test suite
+//   tear_down_tc:     pointer to the function that tears down the test suite
+//   factory:          pointer to the factory that creates a test object.
+//                     The newly created TestInfo instance will assume
+//                     ownership of the factory object.
+GTEST_API_ TestInfo* MakeAndRegisterTestInfo(
+    const char* test_suite_name, const char* name, const char* type_param,
+    const char* value_param, CodeLocation code_location,
+    TypeId fixture_class_id, SetUpTestSuiteFunc set_up_tc,
+    TearDownTestSuiteFunc tear_down_tc, TestFactoryBase* factory);
+
+// If *pstr starts with the given prefix, modifies *pstr to be right
+// past the prefix and returns true; otherwise leaves *pstr unchanged
+// and returns false.  None of pstr, *pstr, and prefix can be NULL.
+GTEST_API_ bool SkipPrefix(const char* prefix, const char** pstr);
+
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
+/* class A needs to have dll-interface to be used by clients of class B */)
+
+// State of the definition of a type-parameterized test suite.
+class GTEST_API_ TypedTestSuitePState {
+ public:
+  TypedTestSuitePState() : registered_(false) {}
+
+  // Adds the given test name to defined_test_names_ and return true
+  // if the test suite hasn't been registered; otherwise aborts the
+  // program.
+  bool AddTestName(const char* file, int line, const char* case_name,
+                   const char* test_name) {
+    if (registered_) {
+      fprintf(stderr,
+              "%s Test %s must be defined before "
+              "REGISTER_TYPED_TEST_SUITE_P(%s, ...).\n",
+              FormatFileLocation(file, line).c_str(), test_name, case_name);
+      fflush(stderr);
+      posix::Abort();
+    }
+    registered_tests_.insert(
+        ::std::make_pair(test_name, CodeLocation(file, line)));
+    return true;
+  }
+
+  bool TestExists(const std::string& test_name) const {
+    return registered_tests_.count(test_name) > 0;
+  }
+
+  const CodeLocation& GetCodeLocation(const std::string& test_name) const {
+    RegisteredTestsMap::const_iterator it = registered_tests_.find(test_name);
+    GTEST_CHECK_(it != registered_tests_.end());
+    return it->second;
+  }
+
+  // Verifies that registered_tests match the test names in
+  // defined_test_names_; returns registered_tests if successful, or
+  // aborts the program otherwise.
+  const char* VerifyRegisteredTestNames(const char* test_suite_name,
+                                        const char* file, int line,
+                                        const char* registered_tests);
+
+ private:
+  typedef ::std::map<std::string, CodeLocation> RegisteredTestsMap;
+
+  bool registered_;
+  RegisteredTestsMap registered_tests_;
+};
+
+//  Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+using TypedTestCasePState = TypedTestSuitePState;
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
+
+// Skips to the first non-space char after the first comma in 'str';
+// returns NULL if no comma is found in 'str'.
+inline const char* SkipComma(const char* str) {
+  const char* comma = strchr(str, ',');
+  if (comma == nullptr) {
+    return nullptr;
+  }
+  while (IsSpace(*(++comma))) {}
+  return comma;
+}
+
+// Returns the prefix of 'str' before the first comma in it; returns
+// the entire string if it contains no comma.
+inline std::string GetPrefixUntilComma(const char* str) {
+  const char* comma = strchr(str, ',');
+  return comma == nullptr ? str : std::string(str, comma);
+}
+
+// Splits a given string on a given delimiter, populating a given
+// vector with the fields.
+void SplitString(const ::std::string& str, char delimiter,
+                 ::std::vector< ::std::string>* dest);
+
+// The default argument to the template below for the case when the user does
+// not provide a name generator.
+struct DefaultNameGenerator {
+  template <typename T>
+  static std::string GetName(int i) {
+    return StreamableToString(i);
+  }
+};
+
+template <typename Provided = DefaultNameGenerator>
+struct NameGeneratorSelector {
+  typedef Provided type;
+};
+
+template <typename NameGenerator>
+void GenerateNamesRecursively(internal::None, std::vector<std::string>*, int) {}
+
+template <typename NameGenerator, typename Types>
+void GenerateNamesRecursively(Types, std::vector<std::string>* result, int i) {
+  result->push_back(NameGenerator::template GetName<typename Types::Head>(i));
+  GenerateNamesRecursively<NameGenerator>(typename Types::Tail(), result,
+                                          i + 1);
+}
+
+template <typename NameGenerator, typename Types>
+std::vector<std::string> GenerateNames() {
+  std::vector<std::string> result;
+  GenerateNamesRecursively<NameGenerator>(Types(), &result, 0);
+  return result;
+}
+
+// TypeParameterizedTest<Fixture, TestSel, Types>::Register()
+// registers a list of type-parameterized tests with Google Test.  The
+// return value is insignificant - we just need to return something
+// such that we can call this function in a namespace scope.
+//
+// Implementation note: The GTEST_TEMPLATE_ macro declares a template
+// template parameter.  It's defined in gtest-type-util.h.
+template <GTEST_TEMPLATE_ Fixture, class TestSel, typename Types>
+class TypeParameterizedTest {
+ public:
+  // 'index' is the index of the test in the type list 'Types'
+  // specified in INSTANTIATE_TYPED_TEST_SUITE_P(Prefix, TestSuite,
+  // Types).  Valid values for 'index' are [0, N - 1] where N is the
+  // length of Types.
+  static bool Register(const char* prefix, const CodeLocation& code_location,
+                       const char* case_name, const char* test_names, int index,
+                       const std::vector<std::string>& type_names =
+                           GenerateNames<DefaultNameGenerator, Types>()) {
+    typedef typename Types::Head Type;
+    typedef Fixture<Type> FixtureClass;
+    typedef typename GTEST_BIND_(TestSel, Type) TestClass;
+
+    // First, registers the first type-parameterized test in the type
+    // list.
+    MakeAndRegisterTestInfo(
+        (std::string(prefix) + (prefix[0] == '\0' ? "" : "/") + case_name +
+         "/" + type_names[static_cast<size_t>(index)])
+            .c_str(),
+        StripTrailingSpaces(GetPrefixUntilComma(test_names)).c_str(),
+        GetTypeName<Type>().c_str(),
+        nullptr,  // No value parameter.
+        code_location, GetTypeId<FixtureClass>(),
+        SuiteApiResolver<TestClass>::GetSetUpCaseOrSuite(
+            code_location.file.c_str(), code_location.line),
+        SuiteApiResolver<TestClass>::GetTearDownCaseOrSuite(
+            code_location.file.c_str(), code_location.line),
+        new TestFactoryImpl<TestClass>);
+
+    // Next, recurses (at compile time) with the tail of the type list.
+    return TypeParameterizedTest<Fixture, TestSel,
+                                 typename Types::Tail>::Register(prefix,
+                                                                 code_location,
+                                                                 case_name,
+                                                                 test_names,
+                                                                 index + 1,
+                                                                 type_names);
+  }
+};
+
+// The base case for the compile time recursion.
+template <GTEST_TEMPLATE_ Fixture, class TestSel>
+class TypeParameterizedTest<Fixture, TestSel, internal::None> {
+ public:
+  static bool Register(const char* /*prefix*/, const CodeLocation&,
+                       const char* /*case_name*/, const char* /*test_names*/,
+                       int /*index*/,
+                       const std::vector<std::string>& =
+                           std::vector<std::string>() /*type_names*/) {
+    return true;
+  }
+};
+
+GTEST_API_ void RegisterTypeParameterizedTestSuite(const char* test_suite_name,
+                                                   CodeLocation code_location);
+GTEST_API_ void RegisterTypeParameterizedTestSuiteInstantiation(
+    const char* case_name);
+
+// TypeParameterizedTestSuite<Fixture, Tests, Types>::Register()
+// registers *all combinations* of 'Tests' and 'Types' with Google
+// Test.  The return value is insignificant - we just need to return
+// something such that we can call this function in a namespace scope.
+template <GTEST_TEMPLATE_ Fixture, typename Tests, typename Types>
+class TypeParameterizedTestSuite {
+ public:
+  static bool Register(const char* prefix, CodeLocation code_location,
+                       const TypedTestSuitePState* state, const char* case_name,
+                       const char* test_names,
+                       const std::vector<std::string>& type_names =
+                           GenerateNames<DefaultNameGenerator, Types>()) {
+    RegisterTypeParameterizedTestSuiteInstantiation(case_name);
+    std::string test_name = StripTrailingSpaces(
+        GetPrefixUntilComma(test_names));
+    if (!state->TestExists(test_name)) {
+      fprintf(stderr, "Failed to get code location for test %s.%s at %s.",
+              case_name, test_name.c_str(),
+              FormatFileLocation(code_location.file.c_str(),
+                                 code_location.line).c_str());
+      fflush(stderr);
+      posix::Abort();
+    }
+    const CodeLocation& test_location = state->GetCodeLocation(test_name);
+
+    typedef typename Tests::Head Head;
+
+    // First, register the first test in 'Test' for each type in 'Types'.
+    TypeParameterizedTest<Fixture, Head, Types>::Register(
+        prefix, test_location, case_name, test_names, 0, type_names);
+
+    // Next, recurses (at compile time) with the tail of the test list.
+    return TypeParameterizedTestSuite<Fixture, typename Tests::Tail,
+                                      Types>::Register(prefix, code_location,
+                                                       state, case_name,
+                                                       SkipComma(test_names),
+                                                       type_names);
+  }
+};
+
+// The base case for the compile time recursion.
+template <GTEST_TEMPLATE_ Fixture, typename Types>
+class TypeParameterizedTestSuite<Fixture, internal::None, Types> {
+ public:
+  static bool Register(const char* /*prefix*/, const CodeLocation&,
+                       const TypedTestSuitePState* /*state*/,
+                       const char* /*case_name*/, const char* /*test_names*/,
+                       const std::vector<std::string>& =
+                           std::vector<std::string>() /*type_names*/) {
+    return true;
+  }
+};
+
+// Returns the current OS stack trace as an std::string.
+//
+// The maximum number of stack frames to be included is specified by
+// the gtest_stack_trace_depth flag.  The skip_count parameter
+// specifies the number of top frames to be skipped, which doesn't
+// count against the number of frames to be included.
+//
+// For example, if Foo() calls Bar(), which in turn calls
+// GetCurrentOsStackTraceExceptTop(..., 1), Foo() will be included in
+// the trace but Bar() and GetCurrentOsStackTraceExceptTop() won't.
+GTEST_API_ std::string GetCurrentOsStackTraceExceptTop(
+    UnitTest* unit_test, int skip_count);
+
+// Helpers for suppressing warnings on unreachable code or constant
+// condition.
+
+// Always returns true.
+GTEST_API_ bool AlwaysTrue();
+
+// Always returns false.
+inline bool AlwaysFalse() { return !AlwaysTrue(); }
+
+// Helper for suppressing false warning from Clang on a const char*
+// variable declared in a conditional expression always being NULL in
+// the else branch.
+struct GTEST_API_ ConstCharPtr {
+  ConstCharPtr(const char* str) : value(str) {}
+  operator bool() const { return true; }
+  const char* value;
+};
+
+// Helper for declaring std::string within 'if' statement
+// in pre C++17 build environment.
+struct TrueWithString {
+  TrueWithString() = default;
+  explicit TrueWithString(const char* str) : value(str) {}
+  explicit TrueWithString(const std::string& str) : value(str) {}
+  explicit operator bool() const { return true; }
+  std::string value;
+};
+
+// A simple Linear Congruential Generator for generating random
+// numbers with a uniform distribution.  Unlike rand() and srand(), it
+// doesn't use global state (and therefore can't interfere with user
+// code).  Unlike rand_r(), it's portable.  An LCG isn't very random,
+// but it's good enough for our purposes.
+class GTEST_API_ Random {
+ public:
+  static const uint32_t kMaxRange = 1u << 31;
+
+  explicit Random(uint32_t seed) : state_(seed) {}
+
+  void Reseed(uint32_t seed) { state_ = seed; }
+
+  // Generates a random number from [0, range).  Crashes if 'range' is
+  // 0 or greater than kMaxRange.
+  uint32_t Generate(uint32_t range);
+
+ private:
+  uint32_t state_;
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(Random);
+};
+
+// Turns const U&, U&, const U, and U all into U.
+#define GTEST_REMOVE_REFERENCE_AND_CONST_(T) \
+  typename std::remove_const<typename std::remove_reference<T>::type>::type
+
+// HasDebugStringAndShortDebugString<T>::value is a compile-time bool constant
+// that's true if and only if T has methods DebugString() and ShortDebugString()
+// that return std::string.
+template <typename T>
+class HasDebugStringAndShortDebugString {
+ private:
+  template <typename C>
+  static auto CheckDebugString(C*) -> typename std::is_same<
+      std::string, decltype(std::declval<const C>().DebugString())>::type;
+  template <typename>
+  static std::false_type CheckDebugString(...);
+
+  template <typename C>
+  static auto CheckShortDebugString(C*) -> typename std::is_same<
+      std::string, decltype(std::declval<const C>().ShortDebugString())>::type;
+  template <typename>
+  static std::false_type CheckShortDebugString(...);
+
+  using HasDebugStringType = decltype(CheckDebugString<T>(nullptr));
+  using HasShortDebugStringType = decltype(CheckShortDebugString<T>(nullptr));
+
+ public:
+  static constexpr bool value =
+      HasDebugStringType::value && HasShortDebugStringType::value;
+};
+
+template <typename T>
+constexpr bool HasDebugStringAndShortDebugString<T>::value;
+
+// When the compiler sees expression IsContainerTest<C>(0), if C is an
+// STL-style container class, the first overload of IsContainerTest
+// will be viable (since both C::iterator* and C::const_iterator* are
+// valid types and NULL can be implicitly converted to them).  It will
+// be picked over the second overload as 'int' is a perfect match for
+// the type of argument 0.  If C::iterator or C::const_iterator is not
+// a valid type, the first overload is not viable, and the second
+// overload will be picked.  Therefore, we can determine whether C is
+// a container class by checking the type of IsContainerTest<C>(0).
+// The value of the expression is insignificant.
+//
+// In C++11 mode we check the existence of a const_iterator and that an
+// iterator is properly implemented for the container.
+//
+// For pre-C++11 that we look for both C::iterator and C::const_iterator.
+// The reason is that C++ injects the name of a class as a member of the
+// class itself (e.g. you can refer to class iterator as either
+// 'iterator' or 'iterator::iterator').  If we look for C::iterator
+// only, for example, we would mistakenly think that a class named
+// iterator is an STL container.
+//
+// Also note that the simpler approach of overloading
+// IsContainerTest(typename C::const_iterator*) and
+// IsContainerTest(...) doesn't work with Visual Age C++ and Sun C++.
+typedef int IsContainer;
+template <class C,
+          class Iterator = decltype(::std::declval<const C&>().begin()),
+          class = decltype(::std::declval<const C&>().end()),
+          class = decltype(++::std::declval<Iterator&>()),
+          class = decltype(*::std::declval<Iterator>()),
+          class = typename C::const_iterator>
+IsContainer IsContainerTest(int /* dummy */) {
+  return 0;
+}
+
+typedef char IsNotContainer;
+template <class C>
+IsNotContainer IsContainerTest(long /* dummy */) { return '\0'; }
+
+// Trait to detect whether a type T is a hash table.
+// The heuristic used is that the type contains an inner type `hasher` and does
+// not contain an inner type `reverse_iterator`.
+// If the container is iterable in reverse, then order might actually matter.
+template <typename T>
+struct IsHashTable {
+ private:
+  template <typename U>
+  static char test(typename U::hasher*, typename U::reverse_iterator*);
+  template <typename U>
+  static int test(typename U::hasher*, ...);
+  template <typename U>
+  static char test(...);
+
+ public:
+  static const bool value = sizeof(test<T>(nullptr, nullptr)) == sizeof(int);
+};
+
+template <typename T>
+const bool IsHashTable<T>::value;
+
+template <typename C,
+          bool = sizeof(IsContainerTest<C>(0)) == sizeof(IsContainer)>
+struct IsRecursiveContainerImpl;
+
+template <typename C>
+struct IsRecursiveContainerImpl<C, false> : public std::false_type {};
+
+// Since the IsRecursiveContainerImpl depends on the IsContainerTest we need to
+// obey the same inconsistencies as the IsContainerTest, namely check if
+// something is a container is relying on only const_iterator in C++11 and
+// is relying on both const_iterator and iterator otherwise
+template <typename C>
+struct IsRecursiveContainerImpl<C, true> {
+  using value_type = decltype(*std::declval<typename C::const_iterator>());
+  using type =
+      std::is_same<typename std::remove_const<
+                       typename std::remove_reference<value_type>::type>::type,
+                   C>;
+};
+
+// IsRecursiveContainer<Type> is a unary compile-time predicate that
+// evaluates whether C is a recursive container type. A recursive container
+// type is a container type whose value_type is equal to the container type
+// itself. An example for a recursive container type is
+// boost::filesystem::path, whose iterator has a value_type that is equal to
+// boost::filesystem::path.
+template <typename C>
+struct IsRecursiveContainer : public IsRecursiveContainerImpl<C>::type {};
+
+// Utilities for native arrays.
+
+// ArrayEq() compares two k-dimensional native arrays using the
+// elements' operator==, where k can be any integer >= 0.  When k is
+// 0, ArrayEq() degenerates into comparing a single pair of values.
+
+template <typename T, typename U>
+bool ArrayEq(const T* lhs, size_t size, const U* rhs);
+
+// This generic version is used when k is 0.
+template <typename T, typename U>
+inline bool ArrayEq(const T& lhs, const U& rhs) { return lhs == rhs; }
+
+// This overload is used when k >= 1.
+template <typename T, typename U, size_t N>
+inline bool ArrayEq(const T(&lhs)[N], const U(&rhs)[N]) {
+  return internal::ArrayEq(lhs, N, rhs);
+}
+
+// This helper reduces code bloat.  If we instead put its logic inside
+// the previous ArrayEq() function, arrays with different sizes would
+// lead to different copies of the template code.
+template <typename T, typename U>
+bool ArrayEq(const T* lhs, size_t size, const U* rhs) {
+  for (size_t i = 0; i != size; i++) {
+    if (!internal::ArrayEq(lhs[i], rhs[i]))
+      return false;
+  }
+  return true;
+}
+
+// Finds the first element in the iterator range [begin, end) that
+// equals elem.  Element may be a native array type itself.
+template <typename Iter, typename Element>
+Iter ArrayAwareFind(Iter begin, Iter end, const Element& elem) {
+  for (Iter it = begin; it != end; ++it) {
+    if (internal::ArrayEq(*it, elem))
+      return it;
+  }
+  return end;
+}
+
+// CopyArray() copies a k-dimensional native array using the elements'
+// operator=, where k can be any integer >= 0.  When k is 0,
+// CopyArray() degenerates into copying a single value.
+
+template <typename T, typename U>
+void CopyArray(const T* from, size_t size, U* to);
+
+// This generic version is used when k is 0.
+template <typename T, typename U>
+inline void CopyArray(const T& from, U* to) { *to = from; }
+
+// This overload is used when k >= 1.
+template <typename T, typename U, size_t N>
+inline void CopyArray(const T(&from)[N], U(*to)[N]) {
+  internal::CopyArray(from, N, *to);
+}
+
+// This helper reduces code bloat.  If we instead put its logic inside
+// the previous CopyArray() function, arrays with different sizes
+// would lead to different copies of the template code.
+template <typename T, typename U>
+void CopyArray(const T* from, size_t size, U* to) {
+  for (size_t i = 0; i != size; i++) {
+    internal::CopyArray(from[i], to + i);
+  }
+}
+
+// The relation between an NativeArray object (see below) and the
+// native array it represents.
+// We use 2 different structs to allow non-copyable types to be used, as long
+// as RelationToSourceReference() is passed.
+struct RelationToSourceReference {};
+struct RelationToSourceCopy {};
+
+// Adapts a native array to a read-only STL-style container.  Instead
+// of the complete STL container concept, this adaptor only implements
+// members useful for Google Mock's container matchers.  New members
+// should be added as needed.  To simplify the implementation, we only
+// support Element being a raw type (i.e. having no top-level const or
+// reference modifier).  It's the client's responsibility to satisfy
+// this requirement.  Element can be an array type itself (hence
+// multi-dimensional arrays are supported).
+template <typename Element>
+class NativeArray {
+ public:
+  // STL-style container typedefs.
+  typedef Element value_type;
+  typedef Element* iterator;
+  typedef const Element* const_iterator;
+
+  // Constructs from a native array. References the source.
+  NativeArray(const Element* array, size_t count, RelationToSourceReference) {
+    InitRef(array, count);
+  }
+
+  // Constructs from a native array. Copies the source.
+  NativeArray(const Element* array, size_t count, RelationToSourceCopy) {
+    InitCopy(array, count);
+  }
+
+  // Copy constructor.
+  NativeArray(const NativeArray& rhs) {
+    (this->*rhs.clone_)(rhs.array_, rhs.size_);
+  }
+
+  ~NativeArray() {
+    if (clone_ != &NativeArray::InitRef)
+      delete[] array_;
+  }
+
+  // STL-style container methods.
+  size_t size() const { return size_; }
+  const_iterator begin() const { return array_; }
+  const_iterator end() const { return array_ + size_; }
+  bool operator==(const NativeArray& rhs) const {
+    return size() == rhs.size() &&
+        ArrayEq(begin(), size(), rhs.begin());
+  }
+
+ private:
+  static_assert(!std::is_const<Element>::value, "Type must not be const");
+  static_assert(!std::is_reference<Element>::value,
+                "Type must not be a reference");
+
+  // Initializes this object with a copy of the input.
+  void InitCopy(const Element* array, size_t a_size) {
+    Element* const copy = new Element[a_size];
+    CopyArray(array, a_size, copy);
+    array_ = copy;
+    size_ = a_size;
+    clone_ = &NativeArray::InitCopy;
+  }
+
+  // Initializes this object with a reference of the input.
+  void InitRef(const Element* array, size_t a_size) {
+    array_ = array;
+    size_ = a_size;
+    clone_ = &NativeArray::InitRef;
+  }
+
+  const Element* array_;
+  size_t size_;
+  void (NativeArray::*clone_)(const Element*, size_t);
+};
+
+// Backport of std::index_sequence.
+template <size_t... Is>
+struct IndexSequence {
+  using type = IndexSequence;
+};
+
+// Double the IndexSequence, and one if plus_one is true.
+template <bool plus_one, typename T, size_t sizeofT>
+struct DoubleSequence;
+template <size_t... I, size_t sizeofT>
+struct DoubleSequence<true, IndexSequence<I...>, sizeofT> {
+  using type = IndexSequence<I..., (sizeofT + I)..., 2 * sizeofT>;
+};
+template <size_t... I, size_t sizeofT>
+struct DoubleSequence<false, IndexSequence<I...>, sizeofT> {
+  using type = IndexSequence<I..., (sizeofT + I)...>;
+};
+
+// Backport of std::make_index_sequence.
+// It uses O(ln(N)) instantiation depth.
+template <size_t N>
+struct MakeIndexSequenceImpl
+    : DoubleSequence<N % 2 == 1, typename MakeIndexSequenceImpl<N / 2>::type,
+                     N / 2>::type {};
+
+template <>
+struct MakeIndexSequenceImpl<0> : IndexSequence<> {};
+
+template <size_t N>
+using MakeIndexSequence = typename MakeIndexSequenceImpl<N>::type;
+
+template <typename... T>
+using IndexSequenceFor = typename MakeIndexSequence<sizeof...(T)>::type;
+
+template <size_t>
+struct Ignore {
+  Ignore(...);  // NOLINT
+};
+
+template <typename>
+struct ElemFromListImpl;
+template <size_t... I>
+struct ElemFromListImpl<IndexSequence<I...>> {
+  // We make Ignore a template to solve a problem with MSVC.
+  // A non-template Ignore would work fine with `decltype(Ignore(I))...`, but
+  // MSVC doesn't understand how to deal with that pack expansion.
+  // Use `0 * I` to have a single instantiation of Ignore.
+  template <typename R>
+  static R Apply(Ignore<0 * I>..., R (*)(), ...);
+};
+
+template <size_t N, typename... T>
+struct ElemFromList {
+  using type =
+      decltype(ElemFromListImpl<typename MakeIndexSequence<N>::type>::Apply(
+          static_cast<T (*)()>(nullptr)...));
+};
+
+struct FlatTupleConstructTag {};
+
+template <typename... T>
+class FlatTuple;
+
+template <typename Derived, size_t I>
+struct FlatTupleElemBase;
+
+template <typename... T, size_t I>
+struct FlatTupleElemBase<FlatTuple<T...>, I> {
+  using value_type = typename ElemFromList<I, T...>::type;
+  FlatTupleElemBase() = default;
+  template <typename Arg>
+  explicit FlatTupleElemBase(FlatTupleConstructTag, Arg&& t)
+      : value(std::forward<Arg>(t)) {}
+  value_type value;
+};
+
+template <typename Derived, typename Idx>
+struct FlatTupleBase;
+
+template <size_t... Idx, typename... T>
+struct FlatTupleBase<FlatTuple<T...>, IndexSequence<Idx...>>
+    : FlatTupleElemBase<FlatTuple<T...>, Idx>... {
+  using Indices = IndexSequence<Idx...>;
+  FlatTupleBase() = default;
+  template <typename... Args>
+  explicit FlatTupleBase(FlatTupleConstructTag, Args&&... args)
+      : FlatTupleElemBase<FlatTuple<T...>, Idx>(FlatTupleConstructTag{},
+                                                std::forward<Args>(args))... {}
+
+  template <size_t I>
+  const typename ElemFromList<I, T...>::type& Get() const {
+    return FlatTupleElemBase<FlatTuple<T...>, I>::value;
+  }
+
+  template <size_t I>
+  typename ElemFromList<I, T...>::type& Get() {
+    return FlatTupleElemBase<FlatTuple<T...>, I>::value;
+  }
+
+  template <typename F>
+  auto Apply(F&& f) -> decltype(std::forward<F>(f)(this->Get<Idx>()...)) {
+    return std::forward<F>(f)(Get<Idx>()...);
+  }
+
+  template <typename F>
+  auto Apply(F&& f) const -> decltype(std::forward<F>(f)(this->Get<Idx>()...)) {
+    return std::forward<F>(f)(Get<Idx>()...);
+  }
+};
+
+// Analog to std::tuple but with different tradeoffs.
+// This class minimizes the template instantiation depth, thus allowing more
+// elements than std::tuple would. std::tuple has been seen to require an
+// instantiation depth of more than 10x the number of elements in some
+// implementations.
+// FlatTuple and ElemFromList are not recursive and have a fixed depth
+// regardless of T...
+// MakeIndexSequence, on the other hand, it is recursive but with an
+// instantiation depth of O(ln(N)).
+template <typename... T>
+class FlatTuple
+    : private FlatTupleBase<FlatTuple<T...>,
+                            typename MakeIndexSequence<sizeof...(T)>::type> {
+  using Indices = typename FlatTupleBase<
+      FlatTuple<T...>, typename MakeIndexSequence<sizeof...(T)>::type>::Indices;
+
+ public:
+  FlatTuple() = default;
+  template <typename... Args>
+  explicit FlatTuple(FlatTupleConstructTag tag, Args&&... args)
+      : FlatTuple::FlatTupleBase(tag, std::forward<Args>(args)...) {}
+
+  using FlatTuple::FlatTupleBase::Apply;
+  using FlatTuple::FlatTupleBase::Get;
+};
+
+// Utility functions to be called with static_assert to induce deprecation
+// warnings.
+GTEST_INTERNAL_DEPRECATED(
+    "INSTANTIATE_TEST_CASE_P is deprecated, please use "
+    "INSTANTIATE_TEST_SUITE_P")
+constexpr bool InstantiateTestCase_P_IsDeprecated() { return true; }
+
+GTEST_INTERNAL_DEPRECATED(
+    "TYPED_TEST_CASE_P is deprecated, please use "
+    "TYPED_TEST_SUITE_P")
+constexpr bool TypedTestCase_P_IsDeprecated() { return true; }
+
+GTEST_INTERNAL_DEPRECATED(
+    "TYPED_TEST_CASE is deprecated, please use "
+    "TYPED_TEST_SUITE")
+constexpr bool TypedTestCaseIsDeprecated() { return true; }
+
+GTEST_INTERNAL_DEPRECATED(
+    "REGISTER_TYPED_TEST_CASE_P is deprecated, please use "
+    "REGISTER_TYPED_TEST_SUITE_P")
+constexpr bool RegisterTypedTestCase_P_IsDeprecated() { return true; }
+
+GTEST_INTERNAL_DEPRECATED(
+    "INSTANTIATE_TYPED_TEST_CASE_P is deprecated, please use "
+    "INSTANTIATE_TYPED_TEST_SUITE_P")
+constexpr bool InstantiateTypedTestCase_P_IsDeprecated() { return true; }
+
+}  // namespace internal
+}  // namespace testing
+
+namespace std {
+// Some standard library implementations use `struct tuple_size` and some use
+// `class tuple_size`. Clang warns about the mismatch.
+// https://reviews.llvm.org/D55466
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wmismatched-tags"
+#endif
+template <typename... Ts>
+struct tuple_size<testing::internal::FlatTuple<Ts...>>
+    : std::integral_constant<size_t, sizeof...(Ts)> {};
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+}  // namespace std
+
+#define GTEST_MESSAGE_AT_(file, line, message, result_type) \
+  ::testing::internal::AssertHelper(result_type, file, line, message) \
+    = ::testing::Message()
+
+#define GTEST_MESSAGE_(message, result_type) \
+  GTEST_MESSAGE_AT_(__FILE__, __LINE__, message, result_type)
+
+#define GTEST_FATAL_FAILURE_(message) \
+  return GTEST_MESSAGE_(message, ::testing::TestPartResult::kFatalFailure)
+
+#define GTEST_NONFATAL_FAILURE_(message) \
+  GTEST_MESSAGE_(message, ::testing::TestPartResult::kNonFatalFailure)
+
+#define GTEST_SUCCESS_(message) \
+  GTEST_MESSAGE_(message, ::testing::TestPartResult::kSuccess)
+
+#define GTEST_SKIP_(message) \
+  return GTEST_MESSAGE_(message, ::testing::TestPartResult::kSkip)
+
+// Suppress MSVC warning 4072 (unreachable code) for the code following
+// statement if it returns or throws (or doesn't return or throw in some
+// situations).
+// NOTE: The "else" is important to keep this expansion to prevent a top-level
+// "else" from attaching to our "if".
+#define GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement) \
+  if (::testing::internal::AlwaysTrue()) {                        \
+    statement;                                                    \
+  } else                     /* NOLINT */                         \
+    static_assert(true, "")  // User must have a semicolon after expansion.
+
+#if GTEST_HAS_EXCEPTIONS
+
+namespace testing {
+namespace internal {
+
+class NeverThrown {
+ public:
+  const char* what() const noexcept {
+    return "this exception should never be thrown";
+  }
+};
+
+}  // namespace internal
+}  // namespace testing
+
+#if GTEST_HAS_RTTI
+
+#define GTEST_EXCEPTION_TYPE_(e) ::testing::internal::GetTypeName(typeid(e))
+
+#else  // GTEST_HAS_RTTI
+
+#define GTEST_EXCEPTION_TYPE_(e) \
+  std::string { "an std::exception-derived error" }
+
+#endif  // GTEST_HAS_RTTI
+
+#define GTEST_TEST_THROW_CATCH_STD_EXCEPTION_(statement, expected_exception)   \
+  catch (typename std::conditional<                                            \
+         std::is_same<typename std::remove_cv<typename std::remove_reference<  \
+                          expected_exception>::type>::type,                    \
+                      std::exception>::value,                                  \
+         const ::testing::internal::NeverThrown&, const std::exception&>::type \
+             e) {                                                              \
+    gtest_msg.value = "Expected: " #statement                                  \
+                      " throws an exception of type " #expected_exception      \
+                      ".\n  Actual: it throws ";                               \
+    gtest_msg.value += GTEST_EXCEPTION_TYPE_(e);                               \
+    gtest_msg.value += " with description \"";                                 \
+    gtest_msg.value += e.what();                                               \
+    gtest_msg.value += "\".";                                                  \
+    goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__);                \
+  }
+
+#else  // GTEST_HAS_EXCEPTIONS
+
+#define GTEST_TEST_THROW_CATCH_STD_EXCEPTION_(statement, expected_exception)
+
+#endif  // GTEST_HAS_EXCEPTIONS
+
+#define GTEST_TEST_THROW_(statement, expected_exception, fail)              \
+  GTEST_AMBIGUOUS_ELSE_BLOCKER_                                             \
+  if (::testing::internal::TrueWithString gtest_msg{}) {                    \
+    bool gtest_caught_expected = false;                                     \
+    try {                                                                   \
+      GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement);            \
+    } catch (expected_exception const&) {                                   \
+      gtest_caught_expected = true;                                         \
+    }                                                                       \
+    GTEST_TEST_THROW_CATCH_STD_EXCEPTION_(statement, expected_exception)    \
+    catch (...) {                                                           \
+      gtest_msg.value = "Expected: " #statement                             \
+                        " throws an exception of type " #expected_exception \
+                        ".\n  Actual: it throws a different type.";         \
+      goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__);           \
+    }                                                                       \
+    if (!gtest_caught_expected) {                                           \
+      gtest_msg.value = "Expected: " #statement                             \
+                        " throws an exception of type " #expected_exception \
+                        ".\n  Actual: it throws nothing.";                  \
+      goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__);           \
+    }                                                                       \
+  } else /*NOLINT*/                                                         \
+    GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__)                   \
+        : fail(gtest_msg.value.c_str())
+
+#if GTEST_HAS_EXCEPTIONS
+
+#define GTEST_TEST_NO_THROW_CATCH_STD_EXCEPTION_()                \
+  catch (std::exception const& e) {                               \
+    gtest_msg.value = "it throws ";                               \
+    gtest_msg.value += GTEST_EXCEPTION_TYPE_(e);                  \
+    gtest_msg.value += " with description \"";                    \
+    gtest_msg.value += e.what();                                  \
+    gtest_msg.value += "\".";                                     \
+    goto GTEST_CONCAT_TOKEN_(gtest_label_testnothrow_, __LINE__); \
+  }
+
+#else  // GTEST_HAS_EXCEPTIONS
+
+#define GTEST_TEST_NO_THROW_CATCH_STD_EXCEPTION_()
+
+#endif  // GTEST_HAS_EXCEPTIONS
+
+#define GTEST_TEST_NO_THROW_(statement, fail) \
+  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
+  if (::testing::internal::TrueWithString gtest_msg{}) { \
+    try { \
+      GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
+    } \
+    GTEST_TEST_NO_THROW_CATCH_STD_EXCEPTION_() \
+    catch (...) { \
+      gtest_msg.value = "it throws."; \
+      goto GTEST_CONCAT_TOKEN_(gtest_label_testnothrow_, __LINE__); \
+    } \
+  } else \
+    GTEST_CONCAT_TOKEN_(gtest_label_testnothrow_, __LINE__): \
+      fail(("Expected: " #statement " doesn't throw an exception.\n" \
+            "  Actual: " + gtest_msg.value).c_str())
+
+#define GTEST_TEST_ANY_THROW_(statement, fail) \
+  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
+  if (::testing::internal::AlwaysTrue()) { \
+    bool gtest_caught_any = false; \
+    try { \
+      GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
+    } \
+    catch (...) { \
+      gtest_caught_any = true; \
+    } \
+    if (!gtest_caught_any) { \
+      goto GTEST_CONCAT_TOKEN_(gtest_label_testanythrow_, __LINE__); \
+    } \
+  } else \
+    GTEST_CONCAT_TOKEN_(gtest_label_testanythrow_, __LINE__): \
+      fail("Expected: " #statement " throws an exception.\n" \
+           "  Actual: it doesn't.")
+
+
+// Implements Boolean test assertions such as EXPECT_TRUE. expression can be
+// either a boolean expression or an AssertionResult. text is a textual
+// representation of expression as it was passed into the EXPECT_TRUE.
+#define GTEST_TEST_BOOLEAN_(expression, text, actual, expected, fail) \
+  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
+  if (const ::testing::AssertionResult gtest_ar_ = \
+      ::testing::AssertionResult(expression)) \
+    ; \
+  else \
+    fail(::testing::internal::GetBoolAssertionFailureMessage(\
+        gtest_ar_, text, #actual, #expected).c_str())
+
+#define GTEST_TEST_NO_FATAL_FAILURE_(statement, fail) \
+  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
+  if (::testing::internal::AlwaysTrue()) { \
+    ::testing::internal::HasNewFatalFailureHelper gtest_fatal_failure_checker; \
+    GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
+    if (gtest_fatal_failure_checker.has_new_fatal_failure()) { \
+      goto GTEST_CONCAT_TOKEN_(gtest_label_testnofatal_, __LINE__); \
+    } \
+  } else \
+    GTEST_CONCAT_TOKEN_(gtest_label_testnofatal_, __LINE__): \
+      fail("Expected: " #statement " doesn't generate new fatal " \
+           "failures in the current thread.\n" \
+           "  Actual: it does.")
+
+// Expands to the name of the class that implements the given test.
+#define GTEST_TEST_CLASS_NAME_(test_suite_name, test_name) \
+  test_suite_name##_##test_name##_Test
+
+// Helper macro for defining tests.
+#define GTEST_TEST_(test_suite_name, test_name, parent_class, parent_id)      \
+  static_assert(sizeof(GTEST_STRINGIFY_(test_suite_name)) > 1,                \
+                "test_suite_name must not be empty");                         \
+  static_assert(sizeof(GTEST_STRINGIFY_(test_name)) > 1,                      \
+                "test_name must not be empty");                               \
+  class GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)                    \
+      : public parent_class {                                                 \
+   public:                                                                    \
+    GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)() = default;           \
+    ~GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)() override = default; \
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(GTEST_TEST_CLASS_NAME_(test_suite_name,   \
+                                                           test_name));       \
+    GTEST_DISALLOW_MOVE_AND_ASSIGN_(GTEST_TEST_CLASS_NAME_(test_suite_name,   \
+                                                           test_name));       \
+                                                                              \
+   private:                                                                   \
+    void TestBody() override;                                                 \
+    static ::testing::TestInfo* const test_info_ GTEST_ATTRIBUTE_UNUSED_;     \
+  };                                                                          \
+                                                                              \
+  ::testing::TestInfo* const GTEST_TEST_CLASS_NAME_(test_suite_name,          \
+                                                    test_name)::test_info_ =  \
+      ::testing::internal::MakeAndRegisterTestInfo(                           \
+          #test_suite_name, #test_name, nullptr, nullptr,                     \
+          ::testing::internal::CodeLocation(__FILE__, __LINE__), (parent_id), \
+          ::testing::internal::SuiteApiResolver<                              \
+              parent_class>::GetSetUpCaseOrSuite(__FILE__, __LINE__),         \
+          ::testing::internal::SuiteApiResolver<                              \
+              parent_class>::GetTearDownCaseOrSuite(__FILE__, __LINE__),      \
+          new ::testing::internal::TestFactoryImpl<GTEST_TEST_CLASS_NAME_(    \
+              test_suite_name, test_name)>);                                  \
+  void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::TestBody()
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/gtest-param-util.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/gtest-param-util.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/gtest-param-util.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/gtest-param-util.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,947 @@
+// Copyright 2008 Google Inc.
+// All Rights Reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+// Type and function utilities for implementing parameterized tests.
+
+// GOOGLETEST_CM0001 DO NOT DELETE
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_
+#define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_
+
+#include <ctype.h>
+
+#include <cassert>
+#include <iterator>
+#include <memory>
+#include <set>
+#include <tuple>
+#include <type_traits>
+#include <utility>
+#include <vector>
+
+#include "gtest/internal/gtest-internal.h"
+#include "gtest/internal/gtest-port.h"
+#include "gtest/gtest-printers.h"
+#include "gtest/gtest-test-part.h"
+
+namespace testing {
+// Input to a parameterized test name generator, describing a test parameter.
+// Consists of the parameter value and the integer parameter index.
+template <class ParamType>
+struct TestParamInfo {
+  TestParamInfo(const ParamType& a_param, size_t an_index) :
+    param(a_param),
+    index(an_index) {}
+  ParamType param;
+  size_t index;
+};
+
+// A builtin parameterized test name generator which returns the result of
+// testing::PrintToString.
+struct PrintToStringParamName {
+  template <class ParamType>
+  std::string operator()(const TestParamInfo<ParamType>& info) const {
+    return PrintToString(info.param);
+  }
+};
+
+namespace internal {
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+// Utility Functions
+
+// Outputs a message explaining invalid registration of different
+// fixture class for the same test suite. This may happen when
+// TEST_P macro is used to define two tests with the same name
+// but in different namespaces.
+GTEST_API_ void ReportInvalidTestSuiteType(const char* test_suite_name,
+                                           CodeLocation code_location);
+
+template <typename> class ParamGeneratorInterface;
+template <typename> class ParamGenerator;
+
+// Interface for iterating over elements provided by an implementation
+// of ParamGeneratorInterface<T>.
+template <typename T>
+class ParamIteratorInterface {
+ public:
+  virtual ~ParamIteratorInterface() {}
+  // A pointer to the base generator instance.
+  // Used only for the purposes of iterator comparison
+  // to make sure that two iterators belong to the same generator.
+  virtual const ParamGeneratorInterface<T>* BaseGenerator() const = 0;
+  // Advances iterator to point to the next element
+  // provided by the generator. The caller is responsible
+  // for not calling Advance() on an iterator equal to
+  // BaseGenerator()->End().
+  virtual void Advance() = 0;
+  // Clones the iterator object. Used for implementing copy semantics
+  // of ParamIterator<T>.
+  virtual ParamIteratorInterface* Clone() const = 0;
+  // Dereferences the current iterator and provides (read-only) access
+  // to the pointed value. It is the caller's responsibility not to call
+  // Current() on an iterator equal to BaseGenerator()->End().
+  // Used for implementing ParamGenerator<T>::operator*().
+  virtual const T* Current() const = 0;
+  // Determines whether the given iterator and other point to the same
+  // element in the sequence generated by the generator.
+  // Used for implementing ParamGenerator<T>::operator==().
+  virtual bool Equals(const ParamIteratorInterface& other) const = 0;
+};
+
+// Class iterating over elements provided by an implementation of
+// ParamGeneratorInterface<T>. It wraps ParamIteratorInterface<T>
+// and implements the const forward iterator concept.
+template <typename T>
+class ParamIterator {
+ public:
+  typedef T value_type;
+  typedef const T& reference;
+  typedef ptrdiff_t difference_type;
+
+  // ParamIterator assumes ownership of the impl_ pointer.
+  ParamIterator(const ParamIterator& other) : impl_(other.impl_->Clone()) {}
+  ParamIterator& operator=(const ParamIterator& other) {
+    if (this != &other)
+      impl_.reset(other.impl_->Clone());
+    return *this;
+  }
+
+  const T& operator*() const { return *impl_->Current(); }
+  const T* operator->() const { return impl_->Current(); }
+  // Prefix version of operator++.
+  ParamIterator& operator++() {
+    impl_->Advance();
+    return *this;
+  }
+  // Postfix version of operator++.
+  ParamIterator operator++(int /*unused*/) {
+    ParamIteratorInterface<T>* clone = impl_->Clone();
+    impl_->Advance();
+    return ParamIterator(clone);
+  }
+  bool operator==(const ParamIterator& other) const {
+    return impl_.get() == other.impl_.get() || impl_->Equals(*other.impl_);
+  }
+  bool operator!=(const ParamIterator& other) const {
+    return !(*this == other);
+  }
+
+ private:
+  friend class ParamGenerator<T>;
+  explicit ParamIterator(ParamIteratorInterface<T>* impl) : impl_(impl) {}
+  std::unique_ptr<ParamIteratorInterface<T> > impl_;
+};
+
+// ParamGeneratorInterface<T> is the binary interface to access generators
+// defined in other translation units.
+template <typename T>
+class ParamGeneratorInterface {
+ public:
+  typedef T ParamType;
+
+  virtual ~ParamGeneratorInterface() {}
+
+  // Generator interface definition
+  virtual ParamIteratorInterface<T>* Begin() const = 0;
+  virtual ParamIteratorInterface<T>* End() const = 0;
+};
+
+// Wraps ParamGeneratorInterface<T> and provides general generator syntax
+// compatible with the STL Container concept.
+// This class implements copy initialization semantics and the contained
+// ParamGeneratorInterface<T> instance is shared among all copies
+// of the original object. This is possible because that instance is immutable.
+template<typename T>
+class ParamGenerator {
+ public:
+  typedef ParamIterator<T> iterator;
+
+  explicit ParamGenerator(ParamGeneratorInterface<T>* impl) : impl_(impl) {}
+  ParamGenerator(const ParamGenerator& other) : impl_(other.impl_) {}
+
+  ParamGenerator& operator=(const ParamGenerator& other) {
+    impl_ = other.impl_;
+    return *this;
+  }
+
+  iterator begin() const { return iterator(impl_->Begin()); }
+  iterator end() const { return iterator(impl_->End()); }
+
+ private:
+  std::shared_ptr<const ParamGeneratorInterface<T> > impl_;
+};
+
+// Generates values from a range of two comparable values. Can be used to
+// generate sequences of user-defined types that implement operator+() and
+// operator<().
+// This class is used in the Range() function.
+template <typename T, typename IncrementT>
+class RangeGenerator : public ParamGeneratorInterface<T> {
+ public:
+  RangeGenerator(T begin, T end, IncrementT step)
+      : begin_(begin), end_(end),
+        step_(step), end_index_(CalculateEndIndex(begin, end, step)) {}
+  ~RangeGenerator() override {}
+
+  ParamIteratorInterface<T>* Begin() const override {
+    return new Iterator(this, begin_, 0, step_);
+  }
+  ParamIteratorInterface<T>* End() const override {
+    return new Iterator(this, end_, end_index_, step_);
+  }
+
+ private:
+  class Iterator : public ParamIteratorInterface<T> {
+   public:
+    Iterator(const ParamGeneratorInterface<T>* base, T value, int index,
+             IncrementT step)
+        : base_(base), value_(value), index_(index), step_(step) {}
+    ~Iterator() override {}
+
+    const ParamGeneratorInterface<T>* BaseGenerator() const override {
+      return base_;
+    }
+    void Advance() override {
+      value_ = static_cast<T>(value_ + step_);
+      index_++;
+    }
+    ParamIteratorInterface<T>* Clone() const override {
+      return new Iterator(*this);
+    }
+    const T* Current() const override { return &value_; }
+    bool Equals(const ParamIteratorInterface<T>& other) const override {
+      // Having the same base generator guarantees that the other
+      // iterator is of the same type and we can downcast.
+      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
+          << "The program attempted to compare iterators "
+          << "from different generators." << std::endl;
+      const int other_index =
+          CheckedDowncastToActualType<const Iterator>(&other)->index_;
+      return index_ == other_index;
+    }
+
+   private:
+    Iterator(const Iterator& other)
+        : ParamIteratorInterface<T>(),
+          base_(other.base_), value_(other.value_), index_(other.index_),
+          step_(other.step_) {}
+
+    // No implementation - assignment is unsupported.
+    void operator=(const Iterator& other);
+
+    const ParamGeneratorInterface<T>* const base_;
+    T value_;
+    int index_;
+    const IncrementT step_;
+  };  // class RangeGenerator::Iterator
+
+  static int CalculateEndIndex(const T& begin,
+                               const T& end,
+                               const IncrementT& step) {
+    int end_index = 0;
+    for (T i = begin; i < end; i = static_cast<T>(i + step))
+      end_index++;
+    return end_index;
+  }
+
+  // No implementation - assignment is unsupported.
+  void operator=(const RangeGenerator& other);
+
+  const T begin_;
+  const T end_;
+  const IncrementT step_;
+  // The index for the end() iterator. All the elements in the generated
+  // sequence are indexed (0-based) to aid iterator comparison.
+  const int end_index_;
+};  // class RangeGenerator
+
+
+// Generates values from a pair of STL-style iterators. Used in the
+// ValuesIn() function. The elements are copied from the source range
+// since the source can be located on the stack, and the generator
+// is likely to persist beyond that stack frame.
+template <typename T>
+class ValuesInIteratorRangeGenerator : public ParamGeneratorInterface<T> {
+ public:
+  template <typename ForwardIterator>
+  ValuesInIteratorRangeGenerator(ForwardIterator begin, ForwardIterator end)
+      : container_(begin, end) {}
+  ~ValuesInIteratorRangeGenerator() override {}
+
+  ParamIteratorInterface<T>* Begin() const override {
+    return new Iterator(this, container_.begin());
+  }
+  ParamIteratorInterface<T>* End() const override {
+    return new Iterator(this, container_.end());
+  }
+
+ private:
+  typedef typename ::std::vector<T> ContainerType;
+
+  class Iterator : public ParamIteratorInterface<T> {
+   public:
+    Iterator(const ParamGeneratorInterface<T>* base,
+             typename ContainerType::const_iterator iterator)
+        : base_(base), iterator_(iterator) {}
+    ~Iterator() override {}
+
+    const ParamGeneratorInterface<T>* BaseGenerator() const override {
+      return base_;
+    }
+    void Advance() override {
+      ++iterator_;
+      value_.reset();
+    }
+    ParamIteratorInterface<T>* Clone() const override {
+      return new Iterator(*this);
+    }
+    // We need to use cached value referenced by iterator_ because *iterator_
+    // can return a temporary object (and of type other then T), so just
+    // having "return &*iterator_;" doesn't work.
+    // value_ is updated here and not in Advance() because Advance()
+    // can advance iterator_ beyond the end of the range, and we cannot
+    // detect that fact. The client code, on the other hand, is
+    // responsible for not calling Current() on an out-of-range iterator.
+    const T* Current() const override {
+      if (value_.get() == nullptr) value_.reset(new T(*iterator_));
+      return value_.get();
+    }
+    bool Equals(const ParamIteratorInterface<T>& other) const override {
+      // Having the same base generator guarantees that the other
+      // iterator is of the same type and we can downcast.
+      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
+          << "The program attempted to compare iterators "
+          << "from different generators." << std::endl;
+      return iterator_ ==
+          CheckedDowncastToActualType<const Iterator>(&other)->iterator_;
+    }
+
+   private:
+    Iterator(const Iterator& other)
+          // The explicit constructor call suppresses a false warning
+          // emitted by gcc when supplied with the -Wextra option.
+        : ParamIteratorInterface<T>(),
+          base_(other.base_),
+          iterator_(other.iterator_) {}
+
+    const ParamGeneratorInterface<T>* const base_;
+    typename ContainerType::const_iterator iterator_;
+    // A cached value of *iterator_. We keep it here to allow access by
+    // pointer in the wrapping iterator's operator->().
+    // value_ needs to be mutable to be accessed in Current().
+    // Use of std::unique_ptr helps manage cached value's lifetime,
+    // which is bound by the lifespan of the iterator itself.
+    mutable std::unique_ptr<const T> value_;
+  };  // class ValuesInIteratorRangeGenerator::Iterator
+
+  // No implementation - assignment is unsupported.
+  void operator=(const ValuesInIteratorRangeGenerator& other);
+
+  const ContainerType container_;
+};  // class ValuesInIteratorRangeGenerator
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// Default parameterized test name generator, returns a string containing the
+// integer test parameter index.
+template <class ParamType>
+std::string DefaultParamName(const TestParamInfo<ParamType>& info) {
+  Message name_stream;
+  name_stream << info.index;
+  return name_stream.GetString();
+}
+
+template <typename T = int>
+void TestNotEmpty() {
+  static_assert(sizeof(T) == 0, "Empty arguments are not allowed.");
+}
+template <typename T = int>
+void TestNotEmpty(const T&) {}
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// Stores a parameter value and later creates tests parameterized with that
+// value.
+template <class TestClass>
+class ParameterizedTestFactory : public TestFactoryBase {
+ public:
+  typedef typename TestClass::ParamType ParamType;
+  explicit ParameterizedTestFactory(ParamType parameter) :
+      parameter_(parameter) {}
+  Test* CreateTest() override {
+    TestClass::SetParam(&parameter_);
+    return new TestClass();
+  }
+
+ private:
+  const ParamType parameter_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestFactory);
+};
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// TestMetaFactoryBase is a base class for meta-factories that create
+// test factories for passing into MakeAndRegisterTestInfo function.
+template <class ParamType>
+class TestMetaFactoryBase {
+ public:
+  virtual ~TestMetaFactoryBase() {}
+
+  virtual TestFactoryBase* CreateTestFactory(ParamType parameter) = 0;
+};
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// TestMetaFactory creates test factories for passing into
+// MakeAndRegisterTestInfo function. Since MakeAndRegisterTestInfo receives
+// ownership of test factory pointer, same factory object cannot be passed
+// into that method twice. But ParameterizedTestSuiteInfo is going to call
+// it for each Test/Parameter value combination. Thus it needs meta factory
+// creator class.
+template <class TestSuite>
+class TestMetaFactory
+    : public TestMetaFactoryBase<typename TestSuite::ParamType> {
+ public:
+  using ParamType = typename TestSuite::ParamType;
+
+  TestMetaFactory() {}
+
+  TestFactoryBase* CreateTestFactory(ParamType parameter) override {
+    return new ParameterizedTestFactory<TestSuite>(parameter);
+  }
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestMetaFactory);
+};
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// ParameterizedTestSuiteInfoBase is a generic interface
+// to ParameterizedTestSuiteInfo classes. ParameterizedTestSuiteInfoBase
+// accumulates test information provided by TEST_P macro invocations
+// and generators provided by INSTANTIATE_TEST_SUITE_P macro invocations
+// and uses that information to register all resulting test instances
+// in RegisterTests method. The ParameterizeTestSuiteRegistry class holds
+// a collection of pointers to the ParameterizedTestSuiteInfo objects
+// and calls RegisterTests() on each of them when asked.
+class ParameterizedTestSuiteInfoBase {
+ public:
+  virtual ~ParameterizedTestSuiteInfoBase() {}
+
+  // Base part of test suite name for display purposes.
+  virtual const std::string& GetTestSuiteName() const = 0;
+  // Test suite id to verify identity.
+  virtual TypeId GetTestSuiteTypeId() const = 0;
+  // UnitTest class invokes this method to register tests in this
+  // test suite right before running them in RUN_ALL_TESTS macro.
+  // This method should not be called more than once on any single
+  // instance of a ParameterizedTestSuiteInfoBase derived class.
+  virtual void RegisterTests() = 0;
+
+ protected:
+  ParameterizedTestSuiteInfoBase() {}
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestSuiteInfoBase);
+};
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// Report a the name of a test_suit as safe to ignore
+// as the side effect of construction of this type.
+struct GTEST_API_ MarkAsIgnored {
+  explicit MarkAsIgnored(const char* test_suite);
+};
+
+GTEST_API_ void InsertSyntheticTestCase(const std::string& name,
+                                        CodeLocation location, bool has_test_p);
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// ParameterizedTestSuiteInfo accumulates tests obtained from TEST_P
+// macro invocations for a particular test suite and generators
+// obtained from INSTANTIATE_TEST_SUITE_P macro invocations for that
+// test suite. It registers tests with all values generated by all
+// generators when asked.
+template <class TestSuite>
+class ParameterizedTestSuiteInfo : public ParameterizedTestSuiteInfoBase {
+ public:
+  // ParamType and GeneratorCreationFunc are private types but are required
+  // for declarations of public methods AddTestPattern() and
+  // AddTestSuiteInstantiation().
+  using ParamType = typename TestSuite::ParamType;
+  // A function that returns an instance of appropriate generator type.
+  typedef ParamGenerator<ParamType>(GeneratorCreationFunc)();
+  using ParamNameGeneratorFunc = std::string(const TestParamInfo<ParamType>&);
+
+  explicit ParameterizedTestSuiteInfo(const char* name,
+                                      CodeLocation code_location)
+      : test_suite_name_(name), code_location_(code_location) {}
+
+  // Test suite base name for display purposes.
+  const std::string& GetTestSuiteName() const override {
+    return test_suite_name_;
+  }
+  // Test suite id to verify identity.
+  TypeId GetTestSuiteTypeId() const override { return GetTypeId<TestSuite>(); }
+  // TEST_P macro uses AddTestPattern() to record information
+  // about a single test in a LocalTestInfo structure.
+  // test_suite_name is the base name of the test suite (without invocation
+  // prefix). test_base_name is the name of an individual test without
+  // parameter index. For the test SequenceA/FooTest.DoBar/1 FooTest is
+  // test suite base name and DoBar is test base name.
+  void AddTestPattern(const char* test_suite_name, const char* test_base_name,
+                      TestMetaFactoryBase<ParamType>* meta_factory,
+                      CodeLocation code_location) {
+    tests_.push_back(std::shared_ptr<TestInfo>(new TestInfo(
+        test_suite_name, test_base_name, meta_factory, code_location)));
+  }
+  // INSTANTIATE_TEST_SUITE_P macro uses AddGenerator() to record information
+  // about a generator.
+  int AddTestSuiteInstantiation(const std::string& instantiation_name,
+                                GeneratorCreationFunc* func,
+                                ParamNameGeneratorFunc* name_func,
+                                const char* file, int line) {
+    instantiations_.push_back(
+        InstantiationInfo(instantiation_name, func, name_func, file, line));
+    return 0;  // Return value used only to run this method in namespace scope.
+  }
+  // UnitTest class invokes this method to register tests in this test suite
+  // right before running tests in RUN_ALL_TESTS macro.
+  // This method should not be called more than once on any single
+  // instance of a ParameterizedTestSuiteInfoBase derived class.
+  // UnitTest has a guard to prevent from calling this method more than once.
+  void RegisterTests() override {
+    bool generated_instantiations = false;
+
+    for (typename TestInfoContainer::iterator test_it = tests_.begin();
+         test_it != tests_.end(); ++test_it) {
+      std::shared_ptr<TestInfo> test_info = *test_it;
+      for (typename InstantiationContainer::iterator gen_it =
+               instantiations_.begin(); gen_it != instantiations_.end();
+               ++gen_it) {
+        const std::string& instantiation_name = gen_it->name;
+        ParamGenerator<ParamType> generator((*gen_it->generator)());
+        ParamNameGeneratorFunc* name_func = gen_it->name_func;
+        const char* file = gen_it->file;
+        int line = gen_it->line;
+
+        std::string test_suite_name;
+        if ( !instantiation_name.empty() )
+          test_suite_name = instantiation_name + "/";
+        test_suite_name += test_info->test_suite_base_name;
+
+        size_t i = 0;
+        std::set<std::string> test_param_names;
+        for (typename ParamGenerator<ParamType>::iterator param_it =
+                 generator.begin();
+             param_it != generator.end(); ++param_it, ++i) {
+          generated_instantiations = true;
+
+          Message test_name_stream;
+
+          std::string param_name = name_func(
+              TestParamInfo<ParamType>(*param_it, i));
+
+          GTEST_CHECK_(IsValidParamName(param_name))
+              << "Parameterized test name '" << param_name
+              << "' is invalid, in " << file
+              << " line " << line << std::endl;
+
+          GTEST_CHECK_(test_param_names.count(param_name) == 0)
+              << "Duplicate parameterized test name '" << param_name
+              << "', in " << file << " line " << line << std::endl;
+
+          test_param_names.insert(param_name);
+
+          if (!test_info->test_base_name.empty()) {
+            test_name_stream << test_info->test_base_name << "/";
+          }
+          test_name_stream << param_name;
+          MakeAndRegisterTestInfo(
+              test_suite_name.c_str(), test_name_stream.GetString().c_str(),
+              nullptr,  // No type parameter.
+              PrintToString(*param_it).c_str(), test_info->code_location,
+              GetTestSuiteTypeId(),
+              SuiteApiResolver<TestSuite>::GetSetUpCaseOrSuite(file, line),
+              SuiteApiResolver<TestSuite>::GetTearDownCaseOrSuite(file, line),
+              test_info->test_meta_factory->CreateTestFactory(*param_it));
+        }  // for param_it
+      }  // for gen_it
+    }  // for test_it
+
+    if (!generated_instantiations) {
+      // There are no generaotrs, or they all generate nothing ...
+      InsertSyntheticTestCase(GetTestSuiteName(), code_location_,
+                              !tests_.empty());
+    }
+  }    // RegisterTests
+
+ private:
+  // LocalTestInfo structure keeps information about a single test registered
+  // with TEST_P macro.
+  struct TestInfo {
+    TestInfo(const char* a_test_suite_base_name, const char* a_test_base_name,
+             TestMetaFactoryBase<ParamType>* a_test_meta_factory,
+             CodeLocation a_code_location)
+        : test_suite_base_name(a_test_suite_base_name),
+          test_base_name(a_test_base_name),
+          test_meta_factory(a_test_meta_factory),
+          code_location(a_code_location) {}
+
+    const std::string test_suite_base_name;
+    const std::string test_base_name;
+    const std::unique_ptr<TestMetaFactoryBase<ParamType> > test_meta_factory;
+    const CodeLocation code_location;
+  };
+  using TestInfoContainer = ::std::vector<std::shared_ptr<TestInfo> >;
+  // Records data received from INSTANTIATE_TEST_SUITE_P macros:
+  //  <Instantiation name, Sequence generator creation function,
+  //     Name generator function, Source file, Source line>
+  struct InstantiationInfo {
+      InstantiationInfo(const std::string &name_in,
+                        GeneratorCreationFunc* generator_in,
+                        ParamNameGeneratorFunc* name_func_in,
+                        const char* file_in,
+                        int line_in)
+          : name(name_in),
+            generator(generator_in),
+            name_func(name_func_in),
+            file(file_in),
+            line(line_in) {}
+
+      std::string name;
+      GeneratorCreationFunc* generator;
+      ParamNameGeneratorFunc* name_func;
+      const char* file;
+      int line;
+  };
+  typedef ::std::vector<InstantiationInfo> InstantiationContainer;
+
+  static bool IsValidParamName(const std::string& name) {
+    // Check for empty string
+    if (name.empty())
+      return false;
+
+    // Check for invalid characters
+    for (std::string::size_type index = 0; index < name.size(); ++index) {
+      if (!IsAlNum(name[index]) && name[index] != '_')
+        return false;
+    }
+
+    return true;
+  }
+
+  const std::string test_suite_name_;
+  CodeLocation code_location_;
+  TestInfoContainer tests_;
+  InstantiationContainer instantiations_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestSuiteInfo);
+};  // class ParameterizedTestSuiteInfo
+
+//  Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+template <class TestCase>
+using ParameterizedTestCaseInfo = ParameterizedTestSuiteInfo<TestCase>;
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// ParameterizedTestSuiteRegistry contains a map of
+// ParameterizedTestSuiteInfoBase classes accessed by test suite names. TEST_P
+// and INSTANTIATE_TEST_SUITE_P macros use it to locate their corresponding
+// ParameterizedTestSuiteInfo descriptors.
+class ParameterizedTestSuiteRegistry {
+ public:
+  ParameterizedTestSuiteRegistry() {}
+  ~ParameterizedTestSuiteRegistry() {
+    for (auto& test_suite_info : test_suite_infos_) {
+      delete test_suite_info;
+    }
+  }
+
+  // Looks up or creates and returns a structure containing information about
+  // tests and instantiations of a particular test suite.
+  template <class TestSuite>
+  ParameterizedTestSuiteInfo<TestSuite>* GetTestSuitePatternHolder(
+      const char* test_suite_name, CodeLocation code_location) {
+    ParameterizedTestSuiteInfo<TestSuite>* typed_test_info = nullptr;
+    for (auto& test_suite_info : test_suite_infos_) {
+      if (test_suite_info->GetTestSuiteName() == test_suite_name) {
+        if (test_suite_info->GetTestSuiteTypeId() != GetTypeId<TestSuite>()) {
+          // Complain about incorrect usage of Google Test facilities
+          // and terminate the program since we cannot guaranty correct
+          // test suite setup and tear-down in this case.
+          ReportInvalidTestSuiteType(test_suite_name, code_location);
+          posix::Abort();
+        } else {
+          // At this point we are sure that the object we found is of the same
+          // type we are looking for, so we downcast it to that type
+          // without further checks.
+          typed_test_info = CheckedDowncastToActualType<
+              ParameterizedTestSuiteInfo<TestSuite> >(test_suite_info);
+        }
+        break;
+      }
+    }
+    if (typed_test_info == nullptr) {
+      typed_test_info = new ParameterizedTestSuiteInfo<TestSuite>(
+          test_suite_name, code_location);
+      test_suite_infos_.push_back(typed_test_info);
+    }
+    return typed_test_info;
+  }
+  void RegisterTests() {
+    for (auto& test_suite_info : test_suite_infos_) {
+      test_suite_info->RegisterTests();
+    }
+  }
+//  Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  template <class TestCase>
+  ParameterizedTestCaseInfo<TestCase>* GetTestCasePatternHolder(
+      const char* test_case_name, CodeLocation code_location) {
+    return GetTestSuitePatternHolder<TestCase>(test_case_name, code_location);
+  }
+
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+ private:
+  using TestSuiteInfoContainer = ::std::vector<ParameterizedTestSuiteInfoBase*>;
+
+  TestSuiteInfoContainer test_suite_infos_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestSuiteRegistry);
+};
+
+// Keep track of what type-parameterized test suite are defined and
+// where as well as which are intatiated. This allows susequently
+// identifying suits that are defined but never used.
+class TypeParameterizedTestSuiteRegistry {
+ public:
+  // Add a suite definition
+  void RegisterTestSuite(const char* test_suite_name,
+                         CodeLocation code_location);
+
+  // Add an instantiation of a suit.
+  void RegisterInstantiation(const char* test_suite_name);
+
+  // For each suit repored as defined but not reported as instantiation,
+  // emit a test that reports that fact (configurably, as an error).
+  void CheckForInstantiations();
+
+ private:
+  struct TypeParameterizedTestSuiteInfo {
+    explicit TypeParameterizedTestSuiteInfo(CodeLocation c)
+        : code_location(c), instantiated(false) {}
+
+    CodeLocation code_location;
+    bool instantiated;
+  };
+
+  std::map<std::string, TypeParameterizedTestSuiteInfo> suites_;
+};
+
+}  // namespace internal
+
+// Forward declarations of ValuesIn(), which is implemented in
+// include/gtest/gtest-param-test.h.
+template <class Container>
+internal::ParamGenerator<typename Container::value_type> ValuesIn(
+    const Container& container);
+
+namespace internal {
+// Used in the Values() function to provide polymorphic capabilities.
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4100)
+#endif
+
+template <typename... Ts>
+class ValueArray {
+ public:
+  explicit ValueArray(Ts... v) : v_(FlatTupleConstructTag{}, std::move(v)...) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {  // NOLINT
+    return ValuesIn(MakeVector<T>(MakeIndexSequence<sizeof...(Ts)>()));
+  }
+
+ private:
+  template <typename T, size_t... I>
+  std::vector<T> MakeVector(IndexSequence<I...>) const {
+    return std::vector<T>{static_cast<T>(v_.template Get<I>())...};
+  }
+
+  FlatTuple<Ts...> v_;
+};
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+template <typename... T>
+class CartesianProductGenerator
+    : public ParamGeneratorInterface<::std::tuple<T...>> {
+ public:
+  typedef ::std::tuple<T...> ParamType;
+
+  CartesianProductGenerator(const std::tuple<ParamGenerator<T>...>& g)
+      : generators_(g) {}
+  ~CartesianProductGenerator() override {}
+
+  ParamIteratorInterface<ParamType>* Begin() const override {
+    return new Iterator(this, generators_, false);
+  }
+  ParamIteratorInterface<ParamType>* End() const override {
+    return new Iterator(this, generators_, true);
+  }
+
+ private:
+  template <class I>
+  class IteratorImpl;
+  template <size_t... I>
+  class IteratorImpl<IndexSequence<I...>>
+      : public ParamIteratorInterface<ParamType> {
+   public:
+    IteratorImpl(const ParamGeneratorInterface<ParamType>* base,
+             const std::tuple<ParamGenerator<T>...>& generators, bool is_end)
+        : base_(base),
+          begin_(std::get<I>(generators).begin()...),
+          end_(std::get<I>(generators).end()...),
+          current_(is_end ? end_ : begin_) {
+      ComputeCurrentValue();
+    }
+    ~IteratorImpl() override {}
+
+    const ParamGeneratorInterface<ParamType>* BaseGenerator() const override {
+      return base_;
+    }
+    // Advance should not be called on beyond-of-range iterators
+    // so no component iterators must be beyond end of range, either.
+    void Advance() override {
+      assert(!AtEnd());
+      // Advance the last iterator.
+      ++std::get<sizeof...(T) - 1>(current_);
+      // if that reaches end, propagate that up.
+      AdvanceIfEnd<sizeof...(T) - 1>();
+      ComputeCurrentValue();
+    }
+    ParamIteratorInterface<ParamType>* Clone() const override {
+      return new IteratorImpl(*this);
+    }
+
+    const ParamType* Current() const override { return current_value_.get(); }
+
+    bool Equals(const ParamIteratorInterface<ParamType>& other) const override {
+      // Having the same base generator guarantees that the other
+      // iterator is of the same type and we can downcast.
+      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
+          << "The program attempted to compare iterators "
+          << "from different generators." << std::endl;
+      const IteratorImpl* typed_other =
+          CheckedDowncastToActualType<const IteratorImpl>(&other);
+
+      // We must report iterators equal if they both point beyond their
+      // respective ranges. That can happen in a variety of fashions,
+      // so we have to consult AtEnd().
+      if (AtEnd() && typed_other->AtEnd()) return true;
+
+      bool same = true;
+      bool dummy[] = {
+          (same = same && std::get<I>(current_) ==
+                              std::get<I>(typed_other->current_))...};
+      (void)dummy;
+      return same;
+    }
+
+   private:
+    template <size_t ThisI>
+    void AdvanceIfEnd() {
+      if (std::get<ThisI>(current_) != std::get<ThisI>(end_)) return;
+
+      bool last = ThisI == 0;
+      if (last) {
+        // We are done. Nothing else to propagate.
+        return;
+      }
+
+      constexpr size_t NextI = ThisI - (ThisI != 0);
+      std::get<ThisI>(current_) = std::get<ThisI>(begin_);
+      ++std::get<NextI>(current_);
+      AdvanceIfEnd<NextI>();
+    }
+
+    void ComputeCurrentValue() {
+      if (!AtEnd())
+        current_value_ = std::make_shared<ParamType>(*std::get<I>(current_)...);
+    }
+    bool AtEnd() const {
+      bool at_end = false;
+      bool dummy[] = {
+          (at_end = at_end || std::get<I>(current_) == std::get<I>(end_))...};
+      (void)dummy;
+      return at_end;
+    }
+
+    const ParamGeneratorInterface<ParamType>* const base_;
+    std::tuple<typename ParamGenerator<T>::iterator...> begin_;
+    std::tuple<typename ParamGenerator<T>::iterator...> end_;
+    std::tuple<typename ParamGenerator<T>::iterator...> current_;
+    std::shared_ptr<ParamType> current_value_;
+  };
+
+  using Iterator = IteratorImpl<typename MakeIndexSequence<sizeof...(T)>::type>;
+
+  std::tuple<ParamGenerator<T>...> generators_;
+};
+
+template <class... Gen>
+class CartesianProductHolder {
+ public:
+  CartesianProductHolder(const Gen&... g) : generators_(g...) {}
+  template <typename... T>
+  operator ParamGenerator<::std::tuple<T...>>() const {
+    return ParamGenerator<::std::tuple<T...>>(
+        new CartesianProductGenerator<T...>(generators_));
+  }
+
+ private:
+  std::tuple<Gen...> generators_;
+};
+
+}  // namespace internal
+}  // namespace testing
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/gtest-port-arch.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/gtest-port-arch.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/gtest-port-arch.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/gtest-port-arch.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,114 @@
+// Copyright 2015, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// The Google C++ Testing and Mocking Framework (Google Test)
+//
+// This header file defines the GTEST_OS_* macro.
+// It is separate from gtest-port.h so that custom/gtest-port.h can include it.
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_ARCH_H_
+#define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_ARCH_H_
+
+// Determines the platform on which Google Test is compiled.
+#ifdef __CYGWIN__
+# define GTEST_OS_CYGWIN 1
+# elif defined(__MINGW__) || defined(__MINGW32__) || defined(__MINGW64__)
+#  define GTEST_OS_WINDOWS_MINGW 1
+#  define GTEST_OS_WINDOWS 1
+#elif defined _WIN32
+# define GTEST_OS_WINDOWS 1
+# ifdef _WIN32_WCE
+#  define GTEST_OS_WINDOWS_MOBILE 1
+# elif defined(WINAPI_FAMILY)
+#  include <winapifamily.h>
+#  if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+#   define GTEST_OS_WINDOWS_DESKTOP 1
+#  elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_PHONE_APP)
+#   define GTEST_OS_WINDOWS_PHONE 1
+#  elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
+#   define GTEST_OS_WINDOWS_RT 1
+#  elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_TV_TITLE)
+#   define GTEST_OS_WINDOWS_PHONE 1
+#   define GTEST_OS_WINDOWS_TV_TITLE 1
+#  else
+    // WINAPI_FAMILY defined but no known partition matched.
+    // Default to desktop.
+#   define GTEST_OS_WINDOWS_DESKTOP 1
+#  endif
+# else
+#  define GTEST_OS_WINDOWS_DESKTOP 1
+# endif  // _WIN32_WCE
+#elif defined __OS2__
+# define GTEST_OS_OS2 1
+#elif defined __APPLE__
+# define GTEST_OS_MAC 1
+# include <TargetConditionals.h>
+# if TARGET_OS_IPHONE
+#  define GTEST_OS_IOS 1
+# endif
+#elif defined __DragonFly__
+# define GTEST_OS_DRAGONFLY 1
+#elif defined __FreeBSD__
+# define GTEST_OS_FREEBSD 1
+#elif defined __Fuchsia__
+# define GTEST_OS_FUCHSIA 1
+#elif defined(__GLIBC__) && defined(__FreeBSD_kernel__)
+# define GTEST_OS_GNU_KFREEBSD 1
+#elif defined __linux__
+# define GTEST_OS_LINUX 1
+# if defined __ANDROID__
+#  define GTEST_OS_LINUX_ANDROID 1
+# endif
+#elif defined __MVS__
+# define GTEST_OS_ZOS 1
+#elif defined(__sun) && defined(__SVR4)
+# define GTEST_OS_SOLARIS 1
+#elif defined(_AIX)
+# define GTEST_OS_AIX 1
+#elif defined(__hpux)
+# define GTEST_OS_HPUX 1
+#elif defined __native_client__
+# define GTEST_OS_NACL 1
+#elif defined __NetBSD__
+# define GTEST_OS_NETBSD 1
+#elif defined __OpenBSD__
+# define GTEST_OS_OPENBSD 1
+#elif defined __QNX__
+# define GTEST_OS_QNX 1
+#elif defined(__HAIKU__)
+#define GTEST_OS_HAIKU 1
+#elif defined ESP8266
+#define GTEST_OS_ESP8266 1
+#elif defined ESP32
+#define GTEST_OS_ESP32 1
+#elif defined(__XTENSA__)
+#define GTEST_OS_XTENSA 1
+#endif  // __CYGWIN__
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_ARCH_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/gtest-port.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/gtest-port.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/gtest-port.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/gtest-port.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,2389 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Low-level types and utilities for porting Google Test to various
+// platforms.  All macros ending with _ and symbols defined in an
+// internal namespace are subject to change without notice.  Code
+// outside Google Test MUST NOT USE THEM DIRECTLY.  Macros that don't
+// end with _ are part of Google Test's public API and can be used by
+// code outside Google Test.
+//
+// This file is fundamental to Google Test.  All other Google Test source
+// files are expected to #include this.  Therefore, it cannot #include
+// any other Google Test header.
+
+// GOOGLETEST_CM0001 DO NOT DELETE
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
+#define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
+
+// Environment-describing macros
+// -----------------------------
+//
+// Google Test can be used in many different environments.  Macros in
+// this section tell Google Test what kind of environment it is being
+// used in, such that Google Test can provide environment-specific
+// features and implementations.
+//
+// Google Test tries to automatically detect the properties of its
+// environment, so users usually don't need to worry about these
+// macros.  However, the automatic detection is not perfect.
+// Sometimes it's necessary for a user to define some of the following
+// macros in the build script to override Google Test's decisions.
+//
+// If the user doesn't define a macro in the list, Google Test will
+// provide a default definition.  After this header is #included, all
+// macros in this list will be defined to either 1 or 0.
+//
+// Notes to maintainers:
+//   - Each macro here is a user-tweakable knob; do not grow the list
+//     lightly.
+//   - Use #if to key off these macros.  Don't use #ifdef or "#if
+//     defined(...)", which will not work as these macros are ALWAYS
+//     defined.
+//
+//   GTEST_HAS_CLONE          - Define it to 1/0 to indicate that clone(2)
+//                              is/isn't available.
+//   GTEST_HAS_EXCEPTIONS     - Define it to 1/0 to indicate that exceptions
+//                              are enabled.
+//   GTEST_HAS_POSIX_RE       - Define it to 1/0 to indicate that POSIX regular
+//                              expressions are/aren't available.
+//   GTEST_HAS_PTHREAD        - Define it to 1/0 to indicate that <pthread.h>
+//                              is/isn't available.
+//   GTEST_HAS_RTTI           - Define it to 1/0 to indicate that RTTI is/isn't
+//                              enabled.
+//   GTEST_HAS_STD_WSTRING    - Define it to 1/0 to indicate that
+//                              std::wstring does/doesn't work (Google Test can
+//                              be used where std::wstring is unavailable).
+//   GTEST_HAS_SEH            - Define it to 1/0 to indicate whether the
+//                              compiler supports Microsoft's "Structured
+//                              Exception Handling".
+//   GTEST_HAS_STREAM_REDIRECTION
+//                            - Define it to 1/0 to indicate whether the
+//                              platform supports I/O stream redirection using
+//                              dup() and dup2().
+//   GTEST_LINKED_AS_SHARED_LIBRARY
+//                            - Define to 1 when compiling tests that use
+//                              Google Test as a shared library (known as
+//                              DLL on Windows).
+//   GTEST_CREATE_SHARED_LIBRARY
+//                            - Define to 1 when compiling Google Test itself
+//                              as a shared library.
+//   GTEST_DEFAULT_DEATH_TEST_STYLE
+//                            - The default value of --gtest_death_test_style.
+//                              The legacy default has been "fast" in the open
+//                              source version since 2008. The recommended value
+//                              is "threadsafe", and can be set in
+//                              custom/gtest-port.h.
+
+// Platform-indicating macros
+// --------------------------
+//
+// Macros indicating the platform on which Google Test is being used
+// (a macro is defined to 1 if compiled on the given platform;
+// otherwise UNDEFINED -- it's never defined to 0.).  Google Test
+// defines these macros automatically.  Code outside Google Test MUST
+// NOT define them.
+//
+//   GTEST_OS_AIX      - IBM AIX
+//   GTEST_OS_CYGWIN   - Cygwin
+//   GTEST_OS_DRAGONFLY - DragonFlyBSD
+//   GTEST_OS_FREEBSD  - FreeBSD
+//   GTEST_OS_FUCHSIA  - Fuchsia
+//   GTEST_OS_GNU_KFREEBSD - GNU/kFreeBSD
+//   GTEST_OS_HAIKU    - Haiku
+//   GTEST_OS_HPUX     - HP-UX
+//   GTEST_OS_LINUX    - Linux
+//     GTEST_OS_LINUX_ANDROID - Google Android
+//   GTEST_OS_MAC      - Mac OS X
+//     GTEST_OS_IOS    - iOS
+//   GTEST_OS_NACL     - Google Native Client (NaCl)
+//   GTEST_OS_NETBSD   - NetBSD
+//   GTEST_OS_OPENBSD  - OpenBSD
+//   GTEST_OS_OS2      - OS/2
+//   GTEST_OS_QNX      - QNX
+//   GTEST_OS_SOLARIS  - Sun Solaris
+//   GTEST_OS_WINDOWS  - Windows (Desktop, MinGW, or Mobile)
+//     GTEST_OS_WINDOWS_DESKTOP  - Windows Desktop
+//     GTEST_OS_WINDOWS_MINGW    - MinGW
+//     GTEST_OS_WINDOWS_MOBILE   - Windows Mobile
+//     GTEST_OS_WINDOWS_PHONE    - Windows Phone
+//     GTEST_OS_WINDOWS_RT       - Windows Store App/WinRT
+//   GTEST_OS_ZOS      - z/OS
+//
+// Among the platforms, Cygwin, Linux, Mac OS X, and Windows have the
+// most stable support.  Since core members of the Google Test project
+// don't have access to other platforms, support for them may be less
+// stable.  If you notice any problems on your platform, please notify
+// googletestframework@googlegroups.com (patches for fixing them are
+// even more welcome!).
+//
+// It is possible that none of the GTEST_OS_* macros are defined.
+
+// Feature-indicating macros
+// -------------------------
+//
+// Macros indicating which Google Test features are available (a macro
+// is defined to 1 if the corresponding feature is supported;
+// otherwise UNDEFINED -- it's never defined to 0.).  Google Test
+// defines these macros automatically.  Code outside Google Test MUST
+// NOT define them.
+//
+// These macros are public so that portable tests can be written.
+// Such tests typically surround code using a feature with an #if
+// which controls that code.  For example:
+//
+// #if GTEST_HAS_DEATH_TEST
+//   EXPECT_DEATH(DoSomethingDeadly());
+// #endif
+//
+//   GTEST_HAS_DEATH_TEST   - death tests
+//   GTEST_HAS_TYPED_TEST   - typed tests
+//   GTEST_HAS_TYPED_TEST_P - type-parameterized tests
+//   GTEST_IS_THREADSAFE    - Google Test is thread-safe.
+//   GOOGLETEST_CM0007 DO NOT DELETE
+//   GTEST_USES_POSIX_RE    - enhanced POSIX regex is used. Do not confuse with
+//                            GTEST_HAS_POSIX_RE (see above) which users can
+//                            define themselves.
+//   GTEST_USES_SIMPLE_RE   - our own simple regex is used;
+//                            the above RE\b(s) are mutually exclusive.
+
+// Misc public macros
+// ------------------
+//
+//   GTEST_FLAG(flag_name)  - references the variable corresponding to
+//                            the given Google Test flag.
+
+// Internal utilities
+// ------------------
+//
+// The following macros and utilities are for Google Test's INTERNAL
+// use only.  Code outside Google Test MUST NOT USE THEM DIRECTLY.
+//
+// Macros for basic C++ coding:
+//   GTEST_AMBIGUOUS_ELSE_BLOCKER_ - for disabling a gcc warning.
+//   GTEST_ATTRIBUTE_UNUSED_  - declares that a class' instances or a
+//                              variable don't have to be used.
+//   GTEST_DISALLOW_ASSIGN_   - disables copy operator=.
+//   GTEST_DISALLOW_COPY_AND_ASSIGN_ - disables copy ctor and operator=.
+//   GTEST_DISALLOW_MOVE_ASSIGN_   - disables move operator=.
+//   GTEST_DISALLOW_MOVE_AND_ASSIGN_ - disables move ctor and operator=.
+//   GTEST_MUST_USE_RESULT_   - declares that a function's result must be used.
+//   GTEST_INTENTIONAL_CONST_COND_PUSH_ - start code section where MSVC C4127 is
+//                                        suppressed (constant conditional).
+//   GTEST_INTENTIONAL_CONST_COND_POP_  - finish code section where MSVC C4127
+//                                        is suppressed.
+//   GTEST_INTERNAL_HAS_ANY - for enabling UniversalPrinter<std::any> or
+//                            UniversalPrinter<absl::any> specializations.
+//   GTEST_INTERNAL_HAS_OPTIONAL - for enabling UniversalPrinter<std::optional>
+//   or
+//                                 UniversalPrinter<absl::optional>
+//                                 specializations.
+//   GTEST_INTERNAL_HAS_STRING_VIEW - for enabling Matcher<std::string_view> or
+//                                    Matcher<absl::string_view>
+//                                    specializations.
+//   GTEST_INTERNAL_HAS_VARIANT - for enabling UniversalPrinter<std::variant> or
+//                                UniversalPrinter<absl::variant>
+//                                specializations.
+//
+// Synchronization:
+//   Mutex, MutexLock, ThreadLocal, GetThreadCount()
+//                            - synchronization primitives.
+//
+// Regular expressions:
+//   RE             - a simple regular expression class using the POSIX
+//                    Extended Regular Expression syntax on UNIX-like platforms
+//                    GOOGLETEST_CM0008 DO NOT DELETE
+//                    or a reduced regular exception syntax on other
+//                    platforms, including Windows.
+// Logging:
+//   GTEST_LOG_()   - logs messages at the specified severity level.
+//   LogToStderr()  - directs all log messages to stderr.
+//   FlushInfoLog() - flushes informational log messages.
+//
+// Stdout and stderr capturing:
+//   CaptureStdout()     - starts capturing stdout.
+//   GetCapturedStdout() - stops capturing stdout and returns the captured
+//                         string.
+//   CaptureStderr()     - starts capturing stderr.
+//   GetCapturedStderr() - stops capturing stderr and returns the captured
+//                         string.
+//
+// Integer types:
+//   TypeWithSize   - maps an integer to a int type.
+//   TimeInMillis   - integers of known sizes.
+//   BiggestInt     - the biggest signed integer type.
+//
+// Command-line utilities:
+//   GTEST_DECLARE_*()  - declares a flag.
+//   GTEST_DEFINE_*()   - defines a flag.
+//   GetInjectableArgvs() - returns the command line as a vector of strings.
+//
+// Environment variable utilities:
+//   GetEnv()             - gets the value of an environment variable.
+//   BoolFromGTestEnv()   - parses a bool environment variable.
+//   Int32FromGTestEnv()  - parses an int32_t environment variable.
+//   StringFromGTestEnv() - parses a string environment variable.
+//
+// Deprecation warnings:
+//   GTEST_INTERNAL_DEPRECATED(message) - attribute marking a function as
+//                                        deprecated; calling a marked function
+//                                        should generate a compiler warning
+
+#include <ctype.h>   // for isspace, etc
+#include <stddef.h>  // for ptrdiff_t
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <cerrno>
+#include <cstdint>
+#include <limits>
+#include <type_traits>
+
+#ifndef _WIN32_WCE
+# include <sys/types.h>
+# include <sys/stat.h>
+#endif  // !_WIN32_WCE
+
+#if defined __APPLE__
+# include <AvailabilityMacros.h>
+# include <TargetConditionals.h>
+#endif
+
+#include <iostream>  // NOLINT
+#include <locale>
+#include <memory>
+#include <string>  // NOLINT
+#include <tuple>
+#include <vector>  // NOLINT
+
+#include "gtest/internal/custom/gtest-port.h"
+#include "gtest/internal/gtest-port-arch.h"
+
+#if !defined(GTEST_DEV_EMAIL_)
+# define GTEST_DEV_EMAIL_ "googletestframework@@googlegroups.com"
+# define GTEST_FLAG_PREFIX_ "gtest_"
+# define GTEST_FLAG_PREFIX_DASH_ "gtest-"
+# define GTEST_FLAG_PREFIX_UPPER_ "GTEST_"
+# define GTEST_NAME_ "Google Test"
+# define GTEST_PROJECT_URL_ "https://github.com/google/googletest/"
+#endif  // !defined(GTEST_DEV_EMAIL_)
+
+#if !defined(GTEST_INIT_GOOGLE_TEST_NAME_)
+# define GTEST_INIT_GOOGLE_TEST_NAME_ "testing::InitGoogleTest"
+#endif  // !defined(GTEST_INIT_GOOGLE_TEST_NAME_)
+
+// Determines the version of gcc that is used to compile this.
+#ifdef __GNUC__
+// 40302 means version 4.3.2.
+# define GTEST_GCC_VER_ \
+    (__GNUC__*10000 + __GNUC_MINOR__*100 + __GNUC_PATCHLEVEL__)
+#endif  // __GNUC__
+
+// Macros for disabling Microsoft Visual C++ warnings.
+//
+//   GTEST_DISABLE_MSC_WARNINGS_PUSH_(4800 4385)
+//   /* code that triggers warnings C4800 and C4385 */
+//   GTEST_DISABLE_MSC_WARNINGS_POP_()
+#if defined(_MSC_VER)
+# define GTEST_DISABLE_MSC_WARNINGS_PUSH_(warnings) \
+    __pragma(warning(push))                        \
+    __pragma(warning(disable: warnings))
+# define GTEST_DISABLE_MSC_WARNINGS_POP_()          \
+    __pragma(warning(pop))
+#else
+// Not all compilers are MSVC
+# define GTEST_DISABLE_MSC_WARNINGS_PUSH_(warnings)
+# define GTEST_DISABLE_MSC_WARNINGS_POP_()
+#endif
+
+// Clang on Windows does not understand MSVC's pragma warning.
+// We need clang-specific way to disable function deprecation warning.
+#ifdef __clang__
+# define GTEST_DISABLE_MSC_DEPRECATED_PUSH_()                         \
+    _Pragma("clang diagnostic push")                                  \
+    _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"") \
+    _Pragma("clang diagnostic ignored \"-Wdeprecated-implementations\"")
+#define GTEST_DISABLE_MSC_DEPRECATED_POP_() \
+    _Pragma("clang diagnostic pop")
+#else
+# define GTEST_DISABLE_MSC_DEPRECATED_PUSH_() \
+    GTEST_DISABLE_MSC_WARNINGS_PUSH_(4996)
+# define GTEST_DISABLE_MSC_DEPRECATED_POP_() \
+    GTEST_DISABLE_MSC_WARNINGS_POP_()
+#endif
+
+// Brings in definitions for functions used in the testing::internal::posix
+// namespace (read, write, close, chdir, isatty, stat). We do not currently
+// use them on Windows Mobile.
+#if GTEST_OS_WINDOWS
+# if !GTEST_OS_WINDOWS_MOBILE
+#  include <direct.h>
+#  include <io.h>
+# endif
+// In order to avoid having to include <windows.h>, use forward declaration
+#if GTEST_OS_WINDOWS_MINGW && !defined(__MINGW64_VERSION_MAJOR)
+// MinGW defined _CRITICAL_SECTION and _RTL_CRITICAL_SECTION as two
+// separate (equivalent) structs, instead of using typedef
+typedef struct _CRITICAL_SECTION GTEST_CRITICAL_SECTION;
+#else
+// Assume CRITICAL_SECTION is a typedef of _RTL_CRITICAL_SECTION.
+// This assumption is verified by
+// WindowsTypesTest.CRITICAL_SECTIONIs_RTL_CRITICAL_SECTION.
+typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
+#endif
+#elif GTEST_OS_XTENSA
+#include <unistd.h>
+// Xtensa toolchains define strcasecmp in the string.h header instead of
+// strings.h. string.h is already included.
+#else
+// This assumes that non-Windows OSes provide unistd.h. For OSes where this
+// is not the case, we need to include headers that provide the functions
+// mentioned above.
+# include <unistd.h>
+# include <strings.h>
+#endif  // GTEST_OS_WINDOWS
+
+#if GTEST_OS_LINUX_ANDROID
+// Used to define __ANDROID_API__ matching the target NDK API level.
+#  include <android/api-level.h>  // NOLINT
+#endif
+
+// Defines this to true if and only if Google Test can use POSIX regular
+// expressions.
+#ifndef GTEST_HAS_POSIX_RE
+# if GTEST_OS_LINUX_ANDROID
+// On Android, <regex.h> is only available starting with Gingerbread.
+#  define GTEST_HAS_POSIX_RE (__ANDROID_API__ >= 9)
+# else
+#define GTEST_HAS_POSIX_RE (!GTEST_OS_WINDOWS && !GTEST_OS_XTENSA)
+# endif
+#endif
+
+#if GTEST_USES_PCRE
+// The appropriate headers have already been included.
+
+#elif GTEST_HAS_POSIX_RE
+
+// On some platforms, <regex.h> needs someone to define size_t, and
+// won't compile otherwise.  We can #include it here as we already
+// included <stdlib.h>, which is guaranteed to define size_t through
+// <stddef.h>.
+# include <regex.h>  // NOLINT
+
+# define GTEST_USES_POSIX_RE 1
+
+#elif GTEST_OS_WINDOWS
+
+// <regex.h> is not available on Windows.  Use our own simple regex
+// implementation instead.
+# define GTEST_USES_SIMPLE_RE 1
+
+#else
+
+// <regex.h> may not be available on this platform.  Use our own
+// simple regex implementation instead.
+# define GTEST_USES_SIMPLE_RE 1
+
+#endif  // GTEST_USES_PCRE
+
+#ifndef GTEST_HAS_EXCEPTIONS
+// The user didn't tell us whether exceptions are enabled, so we need
+// to figure it out.
+# if defined(_MSC_VER) && defined(_CPPUNWIND)
+// MSVC defines _CPPUNWIND to 1 if and only if exceptions are enabled.
+#  define GTEST_HAS_EXCEPTIONS 1
+# elif defined(__BORLANDC__)
+// C++Builder's implementation of the STL uses the _HAS_EXCEPTIONS
+// macro to enable exceptions, so we'll do the same.
+// Assumes that exceptions are enabled by default.
+#  ifndef _HAS_EXCEPTIONS
+#   define _HAS_EXCEPTIONS 1
+#  endif  // _HAS_EXCEPTIONS
+#  define GTEST_HAS_EXCEPTIONS _HAS_EXCEPTIONS
+# elif defined(__clang__)
+// clang defines __EXCEPTIONS if and only if exceptions are enabled before clang
+// 220714, but if and only if cleanups are enabled after that. In Obj-C++ files,
+// there can be cleanups for ObjC exceptions which also need cleanups, even if
+// C++ exceptions are disabled. clang has __has_feature(cxx_exceptions) which
+// checks for C++ exceptions starting at clang r206352, but which checked for
+// cleanups prior to that. To reliably check for C++ exception availability with
+// clang, check for
+// __EXCEPTIONS && __has_feature(cxx_exceptions).
+#  define GTEST_HAS_EXCEPTIONS (__EXCEPTIONS && __has_feature(cxx_exceptions))
+# elif defined(__GNUC__) && __EXCEPTIONS
+// gcc defines __EXCEPTIONS to 1 if and only if exceptions are enabled.
+#  define GTEST_HAS_EXCEPTIONS 1
+# elif defined(__SUNPRO_CC)
+// Sun Pro CC supports exceptions.  However, there is no compile-time way of
+// detecting whether they are enabled or not.  Therefore, we assume that
+// they are enabled unless the user tells us otherwise.
+#  define GTEST_HAS_EXCEPTIONS 1
+# elif defined(__IBMCPP__) && __EXCEPTIONS
+// xlC defines __EXCEPTIONS to 1 if and only if exceptions are enabled.
+#  define GTEST_HAS_EXCEPTIONS 1
+# elif defined(__HP_aCC)
+// Exception handling is in effect by default in HP aCC compiler. It has to
+// be turned of by +noeh compiler option if desired.
+#  define GTEST_HAS_EXCEPTIONS 1
+# else
+// For other compilers, we assume exceptions are disabled to be
+// conservative.
+#  define GTEST_HAS_EXCEPTIONS 0
+# endif  // defined(_MSC_VER) || defined(__BORLANDC__)
+#endif  // GTEST_HAS_EXCEPTIONS
+
+#ifndef GTEST_HAS_STD_WSTRING
+// The user didn't tell us whether ::std::wstring is available, so we need
+// to figure it out.
+// Cygwin 1.7 and below doesn't support ::std::wstring.
+// Solaris' libc++ doesn't support it either.  Android has
+// no support for it at least as recent as Froyo (2.2).
+#define GTEST_HAS_STD_WSTRING                                         \
+  (!(GTEST_OS_LINUX_ANDROID || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \
+     GTEST_OS_HAIKU || GTEST_OS_ESP32 || GTEST_OS_ESP8266 || GTEST_OS_XTENSA))
+
+#endif  // GTEST_HAS_STD_WSTRING
+
+// Determines whether RTTI is available.
+#ifndef GTEST_HAS_RTTI
+// The user didn't tell us whether RTTI is enabled, so we need to
+// figure it out.
+
+# ifdef _MSC_VER
+
+#ifdef _CPPRTTI  // MSVC defines this macro if and only if RTTI is enabled.
+#   define GTEST_HAS_RTTI 1
+#  else
+#   define GTEST_HAS_RTTI 0
+#  endif
+
+// Starting with version 4.3.2, gcc defines __GXX_RTTI if and only if RTTI is
+// enabled.
+# elif defined(__GNUC__)
+
+#  ifdef __GXX_RTTI
+// When building against STLport with the Android NDK and with
+// -frtti -fno-exceptions, the build fails at link time with undefined
+// references to __cxa_bad_typeid. Note sure if STL or toolchain bug,
+// so disable RTTI when detected.
+#   if GTEST_OS_LINUX_ANDROID && defined(_STLPORT_MAJOR) && \
+       !defined(__EXCEPTIONS)
+#    define GTEST_HAS_RTTI 0
+#   else
+#    define GTEST_HAS_RTTI 1
+#   endif  // GTEST_OS_LINUX_ANDROID && __STLPORT_MAJOR && !__EXCEPTIONS
+#  else
+#   define GTEST_HAS_RTTI 0
+#  endif  // __GXX_RTTI
+
+// Clang defines __GXX_RTTI starting with version 3.0, but its manual recommends
+// using has_feature instead. has_feature(cxx_rtti) is supported since 2.7, the
+// first version with C++ support.
+# elif defined(__clang__)
+
+#  define GTEST_HAS_RTTI __has_feature(cxx_rtti)
+
+// Starting with version 9.0 IBM Visual Age defines __RTTI_ALL__ to 1 if
+// both the typeid and dynamic_cast features are present.
+# elif defined(__IBMCPP__) && (__IBMCPP__ >= 900)
+
+#  ifdef __RTTI_ALL__
+#   define GTEST_HAS_RTTI 1
+#  else
+#   define GTEST_HAS_RTTI 0
+#  endif
+
+# else
+
+// For all other compilers, we assume RTTI is enabled.
+#  define GTEST_HAS_RTTI 1
+
+# endif  // _MSC_VER
+
+#endif  // GTEST_HAS_RTTI
+
+// It's this header's responsibility to #include <typeinfo> when RTTI
+// is enabled.
+#if GTEST_HAS_RTTI
+# include <typeinfo>
+#endif
+
+// Determines whether Google Test can use the pthreads library.
+#ifndef GTEST_HAS_PTHREAD
+// The user didn't tell us explicitly, so we make reasonable assumptions about
+// which platforms have pthreads support.
+//
+// To disable threading support in Google Test, add -DGTEST_HAS_PTHREAD=0
+// to your compiler flags.
+#define GTEST_HAS_PTHREAD                                                      \
+  (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_HPUX || GTEST_OS_QNX ||          \
+   GTEST_OS_FREEBSD || GTEST_OS_NACL || GTEST_OS_NETBSD || GTEST_OS_FUCHSIA || \
+   GTEST_OS_DRAGONFLY || GTEST_OS_GNU_KFREEBSD || GTEST_OS_OPENBSD ||          \
+   GTEST_OS_HAIKU)
+#endif  // GTEST_HAS_PTHREAD
+
+#if GTEST_HAS_PTHREAD
+// gtest-port.h guarantees to #include <pthread.h> when GTEST_HAS_PTHREAD is
+// true.
+# include <pthread.h>  // NOLINT
+
+// For timespec and nanosleep, used below.
+# include <time.h>  // NOLINT
+#endif
+
+// Determines whether clone(2) is supported.
+// Usually it will only be available on Linux, excluding
+// Linux on the Itanium architecture.
+// Also see http://linux.die.net/man/2/clone.
+#ifndef GTEST_HAS_CLONE
+// The user didn't tell us, so we need to figure it out.
+
+# if GTEST_OS_LINUX && !defined(__ia64__)
+#  if GTEST_OS_LINUX_ANDROID
+// On Android, clone() became available at different API levels for each 32-bit
+// architecture.
+#    if defined(__LP64__) || \
+        (defined(__arm__) && __ANDROID_API__ >= 9) || \
+        (defined(__mips__) && __ANDROID_API__ >= 12) || \
+        (defined(__i386__) && __ANDROID_API__ >= 17)
+#     define GTEST_HAS_CLONE 1
+#    else
+#     define GTEST_HAS_CLONE 0
+#    endif
+#  else
+#   define GTEST_HAS_CLONE 1
+#  endif
+# else
+#  define GTEST_HAS_CLONE 0
+# endif  // GTEST_OS_LINUX && !defined(__ia64__)
+
+#endif  // GTEST_HAS_CLONE
+
+// Determines whether to support stream redirection. This is used to test
+// output correctness and to implement death tests.
+#ifndef GTEST_HAS_STREAM_REDIRECTION
+// By default, we assume that stream redirection is supported on all
+// platforms except known mobile ones.
+#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || \
+    GTEST_OS_WINDOWS_RT || GTEST_OS_ESP8266 || GTEST_OS_XTENSA
+#  define GTEST_HAS_STREAM_REDIRECTION 0
+# else
+#  define GTEST_HAS_STREAM_REDIRECTION 1
+# endif  // !GTEST_OS_WINDOWS_MOBILE
+#endif  // GTEST_HAS_STREAM_REDIRECTION
+
+// Determines whether to support death tests.
+// pops up a dialog window that cannot be suppressed programmatically.
+#if (GTEST_OS_LINUX || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS ||             \
+     (GTEST_OS_MAC && !GTEST_OS_IOS) ||                                   \
+     (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER) || GTEST_OS_WINDOWS_MINGW ||  \
+     GTEST_OS_AIX || GTEST_OS_HPUX || GTEST_OS_OPENBSD || GTEST_OS_QNX || \
+     GTEST_OS_FREEBSD || GTEST_OS_NETBSD || GTEST_OS_FUCHSIA ||           \
+     GTEST_OS_DRAGONFLY || GTEST_OS_GNU_KFREEBSD || GTEST_OS_HAIKU)
+# define GTEST_HAS_DEATH_TEST 1
+#endif
+
+// Determines whether to support type-driven tests.
+
+// Typed tests need <typeinfo> and variadic macros, which GCC, VC++ 8.0,
+// Sun Pro CC, IBM Visual Age, and HP aCC support.
+#if defined(__GNUC__) || defined(_MSC_VER) || defined(__SUNPRO_CC) || \
+    defined(__IBMCPP__) || defined(__HP_aCC)
+# define GTEST_HAS_TYPED_TEST 1
+# define GTEST_HAS_TYPED_TEST_P 1
+#endif
+
+// Determines whether the system compiler uses UTF-16 for encoding wide strings.
+#define GTEST_WIDE_STRING_USES_UTF16_ \
+  (GTEST_OS_WINDOWS || GTEST_OS_CYGWIN || GTEST_OS_AIX || GTEST_OS_OS2)
+
+// Determines whether test results can be streamed to a socket.
+#if GTEST_OS_LINUX || GTEST_OS_GNU_KFREEBSD || GTEST_OS_DRAGONFLY || \
+    GTEST_OS_FREEBSD || GTEST_OS_NETBSD || GTEST_OS_OPENBSD
+# define GTEST_CAN_STREAM_RESULTS_ 1
+#endif
+
+// Defines some utility macros.
+
+// The GNU compiler emits a warning if nested "if" statements are followed by
+// an "else" statement and braces are not used to explicitly disambiguate the
+// "else" binding.  This leads to problems with code like:
+//
+//   if (gate)
+//     ASSERT_*(condition) << "Some message";
+//
+// The "switch (0) case 0:" idiom is used to suppress this.
+#ifdef __INTEL_COMPILER
+# define GTEST_AMBIGUOUS_ELSE_BLOCKER_
+#else
+# define GTEST_AMBIGUOUS_ELSE_BLOCKER_ switch (0) case 0: default:  // NOLINT
+#endif
+
+// Use this annotation at the end of a struct/class definition to
+// prevent the compiler from optimizing away instances that are never
+// used.  This is useful when all interesting logic happens inside the
+// c'tor and / or d'tor.  Example:
+//
+//   struct Foo {
+//     Foo() { ... }
+//   } GTEST_ATTRIBUTE_UNUSED_;
+//
+// Also use it after a variable or parameter declaration to tell the
+// compiler the variable/parameter does not have to be used.
+#if defined(__GNUC__) && !defined(COMPILER_ICC)
+# define GTEST_ATTRIBUTE_UNUSED_ __attribute__ ((unused))
+#elif defined(__clang__)
+# if __has_attribute(unused)
+#  define GTEST_ATTRIBUTE_UNUSED_ __attribute__ ((unused))
+# endif
+#endif
+#ifndef GTEST_ATTRIBUTE_UNUSED_
+# define GTEST_ATTRIBUTE_UNUSED_
+#endif
+
+// Use this annotation before a function that takes a printf format string.
+#if (defined(__GNUC__) || defined(__clang__)) && !defined(COMPILER_ICC)
+# if defined(__MINGW_PRINTF_FORMAT)
+// MinGW has two different printf implementations. Ensure the format macro
+// matches the selected implementation. See
+// https://sourceforge.net/p/mingw-w64/wiki2/gnu%20printf/.
+#  define GTEST_ATTRIBUTE_PRINTF_(string_index, first_to_check) \
+       __attribute__((__format__(__MINGW_PRINTF_FORMAT, string_index, \
+                                 first_to_check)))
+# else
+#  define GTEST_ATTRIBUTE_PRINTF_(string_index, first_to_check) \
+       __attribute__((__format__(__printf__, string_index, first_to_check)))
+# endif
+#else
+# define GTEST_ATTRIBUTE_PRINTF_(string_index, first_to_check)
+#endif
+
+
+// A macro to disallow copy operator=
+// This should be used in the private: declarations for a class.
+#define GTEST_DISALLOW_ASSIGN_(type) \
+  type& operator=(type const &) = delete
+
+// A macro to disallow copy constructor and operator=
+// This should be used in the private: declarations for a class.
+#define GTEST_DISALLOW_COPY_AND_ASSIGN_(type) \
+  type(type const&) = delete;                 \
+  type& operator=(type const&) = delete
+
+// A macro to disallow move operator=
+// This should be used in the private: declarations for a class.
+#define GTEST_DISALLOW_MOVE_ASSIGN_(type) \
+  type& operator=(type &&) noexcept = delete
+
+// A macro to disallow move constructor and operator=
+// This should be used in the private: declarations for a class.
+#define GTEST_DISALLOW_MOVE_AND_ASSIGN_(type) \
+  type(type&&) noexcept = delete;             \
+  type& operator=(type&&) noexcept = delete
+
+// Tell the compiler to warn about unused return values for functions declared
+// with this macro.  The macro should be used on function declarations
+// following the argument list:
+//
+//   Sprocket* AllocateSprocket() GTEST_MUST_USE_RESULT_;
+#if defined(__GNUC__) && !defined(COMPILER_ICC)
+# define GTEST_MUST_USE_RESULT_ __attribute__ ((warn_unused_result))
+#else
+# define GTEST_MUST_USE_RESULT_
+#endif  // __GNUC__ && !COMPILER_ICC
+
+// MS C++ compiler emits warning when a conditional expression is compile time
+// constant. In some contexts this warning is false positive and needs to be
+// suppressed. Use the following two macros in such cases:
+//
+// GTEST_INTENTIONAL_CONST_COND_PUSH_()
+// while (true) {
+// GTEST_INTENTIONAL_CONST_COND_POP_()
+// }
+# define GTEST_INTENTIONAL_CONST_COND_PUSH_() \
+    GTEST_DISABLE_MSC_WARNINGS_PUSH_(4127)
+# define GTEST_INTENTIONAL_CONST_COND_POP_() \
+    GTEST_DISABLE_MSC_WARNINGS_POP_()
+
+// Determine whether the compiler supports Microsoft's Structured Exception
+// Handling.  This is supported by several Windows compilers but generally
+// does not exist on any other system.
+#ifndef GTEST_HAS_SEH
+// The user didn't tell us, so we need to figure it out.
+
+# if defined(_MSC_VER) || defined(__BORLANDC__)
+// These two compilers are known to support SEH.
+#  define GTEST_HAS_SEH 1
+# else
+// Assume no SEH.
+#  define GTEST_HAS_SEH 0
+# endif
+
+#endif  // GTEST_HAS_SEH
+
+#ifndef GTEST_IS_THREADSAFE
+
+#define GTEST_IS_THREADSAFE                                                 \
+  (GTEST_HAS_MUTEX_AND_THREAD_LOCAL_ ||                                     \
+   (GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT) || \
+   GTEST_HAS_PTHREAD)
+
+#endif  // GTEST_IS_THREADSAFE
+
+// GTEST_API_ qualifies all symbols that must be exported. The definitions below
+// are guarded by #ifndef to give embedders a chance to define GTEST_API_ in
+// gtest/internal/custom/gtest-port.h
+#ifndef GTEST_API_
+
+#ifdef _MSC_VER
+# if GTEST_LINKED_AS_SHARED_LIBRARY
+#  define GTEST_API_ __declspec(dllimport)
+# elif GTEST_CREATE_SHARED_LIBRARY
+#  define GTEST_API_ __declspec(dllexport)
+# endif
+#elif __GNUC__ >= 4 || defined(__clang__)
+# define GTEST_API_ __attribute__((visibility ("default")))
+#endif  // _MSC_VER
+
+#endif  // GTEST_API_
+
+#ifndef GTEST_API_
+# define GTEST_API_
+#endif  // GTEST_API_
+
+#ifndef GTEST_DEFAULT_DEATH_TEST_STYLE
+# define GTEST_DEFAULT_DEATH_TEST_STYLE  "fast"
+#endif  // GTEST_DEFAULT_DEATH_TEST_STYLE
+
+#ifdef __GNUC__
+// Ask the compiler to never inline a given function.
+# define GTEST_NO_INLINE_ __attribute__((noinline))
+#else
+# define GTEST_NO_INLINE_
+#endif
+
+// _LIBCPP_VERSION is defined by the libc++ library from the LLVM project.
+#if !defined(GTEST_HAS_CXXABI_H_)
+# if defined(__GLIBCXX__) || (defined(_LIBCPP_VERSION) && !defined(_MSC_VER))
+#  define GTEST_HAS_CXXABI_H_ 1
+# else
+#  define GTEST_HAS_CXXABI_H_ 0
+# endif
+#endif
+
+// A function level attribute to disable checking for use of uninitialized
+// memory when built with MemorySanitizer.
+#if defined(__clang__)
+# if __has_feature(memory_sanitizer)
+#  define GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_ \
+       __attribute__((no_sanitize_memory))
+# else
+#  define GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
+# endif  // __has_feature(memory_sanitizer)
+#else
+# define GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
+#endif  // __clang__
+
+// A function level attribute to disable AddressSanitizer instrumentation.
+#if defined(__clang__)
+# if __has_feature(address_sanitizer)
+#  define GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_ \
+       __attribute__((no_sanitize_address))
+# else
+#  define GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
+# endif  // __has_feature(address_sanitizer)
+#else
+# define GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
+#endif  // __clang__
+
+// A function level attribute to disable HWAddressSanitizer instrumentation.
+#if defined(__clang__)
+# if __has_feature(hwaddress_sanitizer)
+#  define GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_ \
+       __attribute__((no_sanitize("hwaddress")))
+# else
+#  define GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
+# endif  // __has_feature(hwaddress_sanitizer)
+#else
+# define GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
+#endif  // __clang__
+
+// A function level attribute to disable ThreadSanitizer instrumentation.
+#if defined(__clang__)
+# if __has_feature(thread_sanitizer)
+#  define GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_ \
+       __attribute__((no_sanitize_thread))
+# else
+#  define GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
+# endif  // __has_feature(thread_sanitizer)
+#else
+# define GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
+#endif  // __clang__
+
+namespace testing {
+
+class Message;
+
+// Legacy imports for backwards compatibility.
+// New code should use std:: names directly.
+using std::get;
+using std::make_tuple;
+using std::tuple;
+using std::tuple_element;
+using std::tuple_size;
+
+namespace internal {
+
+// A secret type that Google Test users don't know about.  It has no
+// definition on purpose.  Therefore it's impossible to create a
+// Secret object, which is what we want.
+class Secret;
+
+// The GTEST_COMPILE_ASSERT_ is a legacy macro used to verify that a compile
+// time expression is true (in new code, use static_assert instead). For
+// example, you could use it to verify the size of a static array:
+//
+//   GTEST_COMPILE_ASSERT_(GTEST_ARRAY_SIZE_(names) == NUM_NAMES,
+//                         names_incorrect_size);
+//
+// The second argument to the macro must be a valid C++ identifier. If the
+// expression is false, compiler will issue an error containing this identifier.
+#define GTEST_COMPILE_ASSERT_(expr, msg) static_assert(expr, #msg)
+
+// A helper for suppressing warnings on constant condition.  It just
+// returns 'condition'.
+GTEST_API_ bool IsTrue(bool condition);
+
+// Defines RE.
+
+#if GTEST_USES_PCRE
+// if used, PCRE is injected by custom/gtest-port.h
+#elif GTEST_USES_POSIX_RE || GTEST_USES_SIMPLE_RE
+
+// A simple C++ wrapper for <regex.h>.  It uses the POSIX Extended
+// Regular Expression syntax.
+class GTEST_API_ RE {
+ public:
+  // A copy constructor is required by the Standard to initialize object
+  // references from r-values.
+  RE(const RE& other) { Init(other.pattern()); }
+
+  // Constructs an RE from a string.
+  RE(const ::std::string& regex) { Init(regex.c_str()); }  // NOLINT
+
+  RE(const char* regex) { Init(regex); }  // NOLINT
+  ~RE();
+
+  // Returns the string representation of the regex.
+  const char* pattern() const { return pattern_; }
+
+  // FullMatch(str, re) returns true if and only if regular expression re
+  // matches the entire str.
+  // PartialMatch(str, re) returns true if and only if regular expression re
+  // matches a substring of str (including str itself).
+  static bool FullMatch(const ::std::string& str, const RE& re) {
+    return FullMatch(str.c_str(), re);
+  }
+  static bool PartialMatch(const ::std::string& str, const RE& re) {
+    return PartialMatch(str.c_str(), re);
+  }
+
+  static bool FullMatch(const char* str, const RE& re);
+  static bool PartialMatch(const char* str, const RE& re);
+
+ private:
+  void Init(const char* regex);
+  const char* pattern_;
+  bool is_valid_;
+
+# if GTEST_USES_POSIX_RE
+
+  regex_t full_regex_;     // For FullMatch().
+  regex_t partial_regex_;  // For PartialMatch().
+
+# else  // GTEST_USES_SIMPLE_RE
+
+  const char* full_pattern_;  // For FullMatch();
+
+# endif
+};
+
+#endif  // GTEST_USES_PCRE
+
+// Formats a source file path and a line number as they would appear
+// in an error message from the compiler used to compile this code.
+GTEST_API_ ::std::string FormatFileLocation(const char* file, int line);
+
+// Formats a file location for compiler-independent XML output.
+// Although this function is not platform dependent, we put it next to
+// FormatFileLocation in order to contrast the two functions.
+GTEST_API_ ::std::string FormatCompilerIndependentFileLocation(const char* file,
+                                                               int line);
+
+// Defines logging utilities:
+//   GTEST_LOG_(severity) - logs messages at the specified severity level. The
+//                          message itself is streamed into the macro.
+//   LogToStderr()  - directs all log messages to stderr.
+//   FlushInfoLog() - flushes informational log messages.
+
+enum GTestLogSeverity {
+  GTEST_INFO,
+  GTEST_WARNING,
+  GTEST_ERROR,
+  GTEST_FATAL
+};
+
+// Formats log entry severity, provides a stream object for streaming the
+// log message, and terminates the message with a newline when going out of
+// scope.
+class GTEST_API_ GTestLog {
+ public:
+  GTestLog(GTestLogSeverity severity, const char* file, int line);
+
+  // Flushes the buffers and, if severity is GTEST_FATAL, aborts the program.
+  ~GTestLog();
+
+  ::std::ostream& GetStream() { return ::std::cerr; }
+
+ private:
+  const GTestLogSeverity severity_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(GTestLog);
+};
+
+#if !defined(GTEST_LOG_)
+
+# define GTEST_LOG_(severity) \
+    ::testing::internal::GTestLog(::testing::internal::GTEST_##severity, \
+                                  __FILE__, __LINE__).GetStream()
+
+inline void LogToStderr() {}
+inline void FlushInfoLog() { fflush(nullptr); }
+
+#endif  // !defined(GTEST_LOG_)
+
+#if !defined(GTEST_CHECK_)
+// INTERNAL IMPLEMENTATION - DO NOT USE.
+//
+// GTEST_CHECK_ is an all-mode assert. It aborts the program if the condition
+// is not satisfied.
+//  Synopsys:
+//    GTEST_CHECK_(boolean_condition);
+//     or
+//    GTEST_CHECK_(boolean_condition) << "Additional message";
+//
+//    This checks the condition and if the condition is not satisfied
+//    it prints message about the condition violation, including the
+//    condition itself, plus additional message streamed into it, if any,
+//    and then it aborts the program. It aborts the program irrespective of
+//    whether it is built in the debug mode or not.
+# define GTEST_CHECK_(condition) \
+    GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
+    if (::testing::internal::IsTrue(condition)) \
+      ; \
+    else \
+      GTEST_LOG_(FATAL) << "Condition " #condition " failed. "
+#endif  // !defined(GTEST_CHECK_)
+
+// An all-mode assert to verify that the given POSIX-style function
+// call returns 0 (indicating success).  Known limitation: this
+// doesn't expand to a balanced 'if' statement, so enclose the macro
+// in {} if you need to use it as the only statement in an 'if'
+// branch.
+#define GTEST_CHECK_POSIX_SUCCESS_(posix_call) \
+  if (const int gtest_error = (posix_call)) \
+    GTEST_LOG_(FATAL) << #posix_call << "failed with error " \
+                      << gtest_error
+
+// Transforms "T" into "const T&" according to standard reference collapsing
+// rules (this is only needed as a backport for C++98 compilers that do not
+// support reference collapsing). Specifically, it transforms:
+//
+//   char         ==> const char&
+//   const char   ==> const char&
+//   char&        ==> char&
+//   const char&  ==> const char&
+//
+// Note that the non-const reference will not have "const" added. This is
+// standard, and necessary so that "T" can always bind to "const T&".
+template <typename T>
+struct ConstRef { typedef const T& type; };
+template <typename T>
+struct ConstRef<T&> { typedef T& type; };
+
+// The argument T must depend on some template parameters.
+#define GTEST_REFERENCE_TO_CONST_(T) \
+  typename ::testing::internal::ConstRef<T>::type
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// Use ImplicitCast_ as a safe version of static_cast for upcasting in
+// the type hierarchy (e.g. casting a Foo* to a SuperclassOfFoo* or a
+// const Foo*).  When you use ImplicitCast_, the compiler checks that
+// the cast is safe.  Such explicit ImplicitCast_s are necessary in
+// surprisingly many situations where C++ demands an exact type match
+// instead of an argument type convertable to a target type.
+//
+// The syntax for using ImplicitCast_ is the same as for static_cast:
+//
+//   ImplicitCast_<ToType>(expr)
+//
+// ImplicitCast_ would have been part of the C++ standard library,
+// but the proposal was submitted too late.  It will probably make
+// its way into the language in the future.
+//
+// This relatively ugly name is intentional. It prevents clashes with
+// similar functions users may have (e.g., implicit_cast). The internal
+// namespace alone is not enough because the function can be found by ADL.
+template<typename To>
+inline To ImplicitCast_(To x) { return x; }
+
+// When you upcast (that is, cast a pointer from type Foo to type
+// SuperclassOfFoo), it's fine to use ImplicitCast_<>, since upcasts
+// always succeed.  When you downcast (that is, cast a pointer from
+// type Foo to type SubclassOfFoo), static_cast<> isn't safe, because
+// how do you know the pointer is really of type SubclassOfFoo?  It
+// could be a bare Foo, or of type DifferentSubclassOfFoo.  Thus,
+// when you downcast, you should use this macro.  In debug mode, we
+// use dynamic_cast<> to double-check the downcast is legal (we die
+// if it's not).  In normal mode, we do the efficient static_cast<>
+// instead.  Thus, it's important to test in debug mode to make sure
+// the cast is legal!
+//    This is the only place in the code we should use dynamic_cast<>.
+// In particular, you SHOULDN'T be using dynamic_cast<> in order to
+// do RTTI (eg code like this:
+//    if (dynamic_cast<Subclass1>(foo)) HandleASubclass1Object(foo);
+//    if (dynamic_cast<Subclass2>(foo)) HandleASubclass2Object(foo);
+// You should design the code some other way not to need this.
+//
+// This relatively ugly name is intentional. It prevents clashes with
+// similar functions users may have (e.g., down_cast). The internal
+// namespace alone is not enough because the function can be found by ADL.
+template<typename To, typename From>  // use like this: DownCast_<T*>(foo);
+inline To DownCast_(From* f) {  // so we only accept pointers
+  // Ensures that To is a sub-type of From *.  This test is here only
+  // for compile-time type checking, and has no overhead in an
+  // optimized build at run-time, as it will be optimized away
+  // completely.
+  GTEST_INTENTIONAL_CONST_COND_PUSH_()
+  if (false) {
+  GTEST_INTENTIONAL_CONST_COND_POP_()
+  const To to = nullptr;
+  ::testing::internal::ImplicitCast_<From*>(to);
+  }
+
+#if GTEST_HAS_RTTI
+  // RTTI: debug mode only!
+  GTEST_CHECK_(f == nullptr || dynamic_cast<To>(f) != nullptr);
+#endif
+  return static_cast<To>(f);
+}
+
+// Downcasts the pointer of type Base to Derived.
+// Derived must be a subclass of Base. The parameter MUST
+// point to a class of type Derived, not any subclass of it.
+// When RTTI is available, the function performs a runtime
+// check to enforce this.
+template <class Derived, class Base>
+Derived* CheckedDowncastToActualType(Base* base) {
+#if GTEST_HAS_RTTI
+  GTEST_CHECK_(typeid(*base) == typeid(Derived));
+#endif
+
+#if GTEST_HAS_DOWNCAST_
+  return ::down_cast<Derived*>(base);
+#elif GTEST_HAS_RTTI
+  return dynamic_cast<Derived*>(base);  // NOLINT
+#else
+  return static_cast<Derived*>(base);  // Poor man's downcast.
+#endif
+}
+
+#if GTEST_HAS_STREAM_REDIRECTION
+
+// Defines the stderr capturer:
+//   CaptureStdout     - starts capturing stdout.
+//   GetCapturedStdout - stops capturing stdout and returns the captured string.
+//   CaptureStderr     - starts capturing stderr.
+//   GetCapturedStderr - stops capturing stderr and returns the captured string.
+//
+GTEST_API_ void CaptureStdout();
+GTEST_API_ std::string GetCapturedStdout();
+GTEST_API_ void CaptureStderr();
+GTEST_API_ std::string GetCapturedStderr();
+
+#endif  // GTEST_HAS_STREAM_REDIRECTION
+// Returns the size (in bytes) of a file.
+GTEST_API_ size_t GetFileSize(FILE* file);
+
+// Reads the entire content of a file as a string.
+GTEST_API_ std::string ReadEntireFile(FILE* file);
+
+// All command line arguments.
+GTEST_API_ std::vector<std::string> GetArgvs();
+
+#if GTEST_HAS_DEATH_TEST
+
+std::vector<std::string> GetInjectableArgvs();
+// Deprecated: pass the args vector by value instead.
+void SetInjectableArgvs(const std::vector<std::string>* new_argvs);
+void SetInjectableArgvs(const std::vector<std::string>& new_argvs);
+void ClearInjectableArgvs();
+
+#endif  // GTEST_HAS_DEATH_TEST
+
+// Defines synchronization primitives.
+#if GTEST_IS_THREADSAFE
+# if GTEST_HAS_PTHREAD
+// Sleeps for (roughly) n milliseconds.  This function is only for testing
+// Google Test's own constructs.  Don't use it in user tests, either
+// directly or indirectly.
+inline void SleepMilliseconds(int n) {
+  const timespec time = {
+    0,                  // 0 seconds.
+    n * 1000L * 1000L,  // And n ms.
+  };
+  nanosleep(&time, nullptr);
+}
+# endif  // GTEST_HAS_PTHREAD
+
+# if GTEST_HAS_NOTIFICATION_
+// Notification has already been imported into the namespace.
+// Nothing to do here.
+
+# elif GTEST_HAS_PTHREAD
+// Allows a controller thread to pause execution of newly created
+// threads until notified.  Instances of this class must be created
+// and destroyed in the controller thread.
+//
+// This class is only for testing Google Test's own constructs. Do not
+// use it in user tests, either directly or indirectly.
+class Notification {
+ public:
+  Notification() : notified_(false) {
+    GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_init(&mutex_, nullptr));
+  }
+  ~Notification() {
+    pthread_mutex_destroy(&mutex_);
+  }
+
+  // Notifies all threads created with this notification to start. Must
+  // be called from the controller thread.
+  void Notify() {
+    pthread_mutex_lock(&mutex_);
+    notified_ = true;
+    pthread_mutex_unlock(&mutex_);
+  }
+
+  // Blocks until the controller thread notifies. Must be called from a test
+  // thread.
+  void WaitForNotification() {
+    for (;;) {
+      pthread_mutex_lock(&mutex_);
+      const bool notified = notified_;
+      pthread_mutex_unlock(&mutex_);
+      if (notified)
+        break;
+      SleepMilliseconds(10);
+    }
+  }
+
+ private:
+  pthread_mutex_t mutex_;
+  bool notified_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(Notification);
+};
+
+# elif GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
+
+GTEST_API_ void SleepMilliseconds(int n);
+
+// Provides leak-safe Windows kernel handle ownership.
+// Used in death tests and in threading support.
+class GTEST_API_ AutoHandle {
+ public:
+  // Assume that Win32 HANDLE type is equivalent to void*. Doing so allows us to
+  // avoid including <windows.h> in this header file. Including <windows.h> is
+  // undesirable because it defines a lot of symbols and macros that tend to
+  // conflict with client code. This assumption is verified by
+  // WindowsTypesTest.HANDLEIsVoidStar.
+  typedef void* Handle;
+  AutoHandle();
+  explicit AutoHandle(Handle handle);
+
+  ~AutoHandle();
+
+  Handle Get() const;
+  void Reset();
+  void Reset(Handle handle);
+
+ private:
+  // Returns true if and only if the handle is a valid handle object that can be
+  // closed.
+  bool IsCloseable() const;
+
+  Handle handle_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(AutoHandle);
+};
+
+// Allows a controller thread to pause execution of newly created
+// threads until notified.  Instances of this class must be created
+// and destroyed in the controller thread.
+//
+// This class is only for testing Google Test's own constructs. Do not
+// use it in user tests, either directly or indirectly.
+class GTEST_API_ Notification {
+ public:
+  Notification();
+  void Notify();
+  void WaitForNotification();
+
+ private:
+  AutoHandle event_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(Notification);
+};
+# endif  // GTEST_HAS_NOTIFICATION_
+
+// On MinGW, we can have both GTEST_OS_WINDOWS and GTEST_HAS_PTHREAD
+// defined, but we don't want to use MinGW's pthreads implementation, which
+// has conformance problems with some versions of the POSIX standard.
+# if GTEST_HAS_PTHREAD && !GTEST_OS_WINDOWS_MINGW
+
+// As a C-function, ThreadFuncWithCLinkage cannot be templated itself.
+// Consequently, it cannot select a correct instantiation of ThreadWithParam
+// in order to call its Run(). Introducing ThreadWithParamBase as a
+// non-templated base class for ThreadWithParam allows us to bypass this
+// problem.
+class ThreadWithParamBase {
+ public:
+  virtual ~ThreadWithParamBase() {}
+  virtual void Run() = 0;
+};
+
+// pthread_create() accepts a pointer to a function type with the C linkage.
+// According to the Standard (7.5/1), function types with different linkages
+// are different even if they are otherwise identical.  Some compilers (for
+// example, SunStudio) treat them as different types.  Since class methods
+// cannot be defined with C-linkage we need to define a free C-function to
+// pass into pthread_create().
+extern "C" inline void* ThreadFuncWithCLinkage(void* thread) {
+  static_cast<ThreadWithParamBase*>(thread)->Run();
+  return nullptr;
+}
+
+// Helper class for testing Google Test's multi-threading constructs.
+// To use it, write:
+//
+//   void ThreadFunc(int param) { /* Do things with param */ }
+//   Notification thread_can_start;
+//   ...
+//   // The thread_can_start parameter is optional; you can supply NULL.
+//   ThreadWithParam<int> thread(&ThreadFunc, 5, &thread_can_start);
+//   thread_can_start.Notify();
+//
+// These classes are only for testing Google Test's own constructs. Do
+// not use them in user tests, either directly or indirectly.
+template <typename T>
+class ThreadWithParam : public ThreadWithParamBase {
+ public:
+  typedef void UserThreadFunc(T);
+
+  ThreadWithParam(UserThreadFunc* func, T param, Notification* thread_can_start)
+      : func_(func),
+        param_(param),
+        thread_can_start_(thread_can_start),
+        finished_(false) {
+    ThreadWithParamBase* const base = this;
+    // The thread can be created only after all fields except thread_
+    // have been initialized.
+    GTEST_CHECK_POSIX_SUCCESS_(
+        pthread_create(&thread_, nullptr, &ThreadFuncWithCLinkage, base));
+  }
+  ~ThreadWithParam() override { Join(); }
+
+  void Join() {
+    if (!finished_) {
+      GTEST_CHECK_POSIX_SUCCESS_(pthread_join(thread_, nullptr));
+      finished_ = true;
+    }
+  }
+
+  void Run() override {
+    if (thread_can_start_ != nullptr) thread_can_start_->WaitForNotification();
+    func_(param_);
+  }
+
+ private:
+  UserThreadFunc* const func_;  // User-supplied thread function.
+  const T param_;  // User-supplied parameter to the thread function.
+  // When non-NULL, used to block execution until the controller thread
+  // notifies.
+  Notification* const thread_can_start_;
+  bool finished_;  // true if and only if we know that the thread function has
+                   // finished.
+  pthread_t thread_;  // The native thread object.
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadWithParam);
+};
+# endif  // !GTEST_OS_WINDOWS && GTEST_HAS_PTHREAD ||
+         // GTEST_HAS_MUTEX_AND_THREAD_LOCAL_
+
+# if GTEST_HAS_MUTEX_AND_THREAD_LOCAL_
+// Mutex and ThreadLocal have already been imported into the namespace.
+// Nothing to do here.
+
+# elif GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
+
+// Mutex implements mutex on Windows platforms.  It is used in conjunction
+// with class MutexLock:
+//
+//   Mutex mutex;
+//   ...
+//   MutexLock lock(&mutex);  // Acquires the mutex and releases it at the
+//                            // end of the current scope.
+//
+// A static Mutex *must* be defined or declared using one of the following
+// macros:
+//   GTEST_DEFINE_STATIC_MUTEX_(g_some_mutex);
+//   GTEST_DECLARE_STATIC_MUTEX_(g_some_mutex);
+//
+// (A non-static Mutex is defined/declared in the usual way).
+class GTEST_API_ Mutex {
+ public:
+  enum MutexType { kStatic = 0, kDynamic = 1 };
+  // We rely on kStaticMutex being 0 as it is to what the linker initializes
+  // type_ in static mutexes.  critical_section_ will be initialized lazily
+  // in ThreadSafeLazyInit().
+  enum StaticConstructorSelector { kStaticMutex = 0 };
+
+  // This constructor intentionally does nothing.  It relies on type_ being
+  // statically initialized to 0 (effectively setting it to kStatic) and on
+  // ThreadSafeLazyInit() to lazily initialize the rest of the members.
+  explicit Mutex(StaticConstructorSelector /*dummy*/) {}
+
+  Mutex();
+  ~Mutex();
+
+  void Lock();
+
+  void Unlock();
+
+  // Does nothing if the current thread holds the mutex. Otherwise, crashes
+  // with high probability.
+  void AssertHeld();
+
+ private:
+  // Initializes owner_thread_id_ and critical_section_ in static mutexes.
+  void ThreadSafeLazyInit();
+
+  // Per https://blogs.msdn.microsoft.com/oldnewthing/20040223-00/?p=40503,
+  // we assume that 0 is an invalid value for thread IDs.
+  unsigned int owner_thread_id_;
+
+  // For static mutexes, we rely on these members being initialized to zeros
+  // by the linker.
+  MutexType type_;
+  long critical_section_init_phase_;  // NOLINT
+  GTEST_CRITICAL_SECTION* critical_section_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(Mutex);
+};
+
+# define GTEST_DECLARE_STATIC_MUTEX_(mutex) \
+    extern ::testing::internal::Mutex mutex
+
+# define GTEST_DEFINE_STATIC_MUTEX_(mutex) \
+    ::testing::internal::Mutex mutex(::testing::internal::Mutex::kStaticMutex)
+
+// We cannot name this class MutexLock because the ctor declaration would
+// conflict with a macro named MutexLock, which is defined on some
+// platforms. That macro is used as a defensive measure to prevent against
+// inadvertent misuses of MutexLock like "MutexLock(&mu)" rather than
+// "MutexLock l(&mu)".  Hence the typedef trick below.
+class GTestMutexLock {
+ public:
+  explicit GTestMutexLock(Mutex* mutex)
+      : mutex_(mutex) { mutex_->Lock(); }
+
+  ~GTestMutexLock() { mutex_->Unlock(); }
+
+ private:
+  Mutex* const mutex_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(GTestMutexLock);
+};
+
+typedef GTestMutexLock MutexLock;
+
+// Base class for ValueHolder<T>.  Allows a caller to hold and delete a value
+// without knowing its type.
+class ThreadLocalValueHolderBase {
+ public:
+  virtual ~ThreadLocalValueHolderBase() {}
+};
+
+// Provides a way for a thread to send notifications to a ThreadLocal
+// regardless of its parameter type.
+class ThreadLocalBase {
+ public:
+  // Creates a new ValueHolder<T> object holding a default value passed to
+  // this ThreadLocal<T>'s constructor and returns it.  It is the caller's
+  // responsibility not to call this when the ThreadLocal<T> instance already
+  // has a value on the current thread.
+  virtual ThreadLocalValueHolderBase* NewValueForCurrentThread() const = 0;
+
+ protected:
+  ThreadLocalBase() {}
+  virtual ~ThreadLocalBase() {}
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadLocalBase);
+};
+
+// Maps a thread to a set of ThreadLocals that have values instantiated on that
+// thread and notifies them when the thread exits.  A ThreadLocal instance is
+// expected to persist until all threads it has values on have terminated.
+class GTEST_API_ ThreadLocalRegistry {
+ public:
+  // Registers thread_local_instance as having value on the current thread.
+  // Returns a value that can be used to identify the thread from other threads.
+  static ThreadLocalValueHolderBase* GetValueOnCurrentThread(
+      const ThreadLocalBase* thread_local_instance);
+
+  // Invoked when a ThreadLocal instance is destroyed.
+  static void OnThreadLocalDestroyed(
+      const ThreadLocalBase* thread_local_instance);
+};
+
+class GTEST_API_ ThreadWithParamBase {
+ public:
+  void Join();
+
+ protected:
+  class Runnable {
+   public:
+    virtual ~Runnable() {}
+    virtual void Run() = 0;
+  };
+
+  ThreadWithParamBase(Runnable *runnable, Notification* thread_can_start);
+  virtual ~ThreadWithParamBase();
+
+ private:
+  AutoHandle thread_;
+};
+
+// Helper class for testing Google Test's multi-threading constructs.
+template <typename T>
+class ThreadWithParam : public ThreadWithParamBase {
+ public:
+  typedef void UserThreadFunc(T);
+
+  ThreadWithParam(UserThreadFunc* func, T param, Notification* thread_can_start)
+      : ThreadWithParamBase(new RunnableImpl(func, param), thread_can_start) {
+  }
+  virtual ~ThreadWithParam() {}
+
+ private:
+  class RunnableImpl : public Runnable {
+   public:
+    RunnableImpl(UserThreadFunc* func, T param)
+        : func_(func),
+          param_(param) {
+    }
+    virtual ~RunnableImpl() {}
+    virtual void Run() {
+      func_(param_);
+    }
+
+   private:
+    UserThreadFunc* const func_;
+    const T param_;
+
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(RunnableImpl);
+  };
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadWithParam);
+};
+
+// Implements thread-local storage on Windows systems.
+//
+//   // Thread 1
+//   ThreadLocal<int> tl(100);  // 100 is the default value for each thread.
+//
+//   // Thread 2
+//   tl.set(150);  // Changes the value for thread 2 only.
+//   EXPECT_EQ(150, tl.get());
+//
+//   // Thread 1
+//   EXPECT_EQ(100, tl.get());  // In thread 1, tl has the original value.
+//   tl.set(200);
+//   EXPECT_EQ(200, tl.get());
+//
+// The template type argument T must have a public copy constructor.
+// In addition, the default ThreadLocal constructor requires T to have
+// a public default constructor.
+//
+// The users of a TheadLocal instance have to make sure that all but one
+// threads (including the main one) using that instance have exited before
+// destroying it. Otherwise, the per-thread objects managed for them by the
+// ThreadLocal instance are not guaranteed to be destroyed on all platforms.
+//
+// Google Test only uses global ThreadLocal objects.  That means they
+// will die after main() has returned.  Therefore, no per-thread
+// object managed by Google Test will be leaked as long as all threads
+// using Google Test have exited when main() returns.
+template <typename T>
+class ThreadLocal : public ThreadLocalBase {
+ public:
+  ThreadLocal() : default_factory_(new DefaultValueHolderFactory()) {}
+  explicit ThreadLocal(const T& value)
+      : default_factory_(new InstanceValueHolderFactory(value)) {}
+
+  ~ThreadLocal() { ThreadLocalRegistry::OnThreadLocalDestroyed(this); }
+
+  T* pointer() { return GetOrCreateValue(); }
+  const T* pointer() const { return GetOrCreateValue(); }
+  const T& get() const { return *pointer(); }
+  void set(const T& value) { *pointer() = value; }
+
+ private:
+  // Holds a value of T.  Can be deleted via its base class without the caller
+  // knowing the type of T.
+  class ValueHolder : public ThreadLocalValueHolderBase {
+   public:
+    ValueHolder() : value_() {}
+    explicit ValueHolder(const T& value) : value_(value) {}
+
+    T* pointer() { return &value_; }
+
+   private:
+    T value_;
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(ValueHolder);
+  };
+
+
+  T* GetOrCreateValue() const {
+    return static_cast<ValueHolder*>(
+        ThreadLocalRegistry::GetValueOnCurrentThread(this))->pointer();
+  }
+
+  virtual ThreadLocalValueHolderBase* NewValueForCurrentThread() const {
+    return default_factory_->MakeNewHolder();
+  }
+
+  class ValueHolderFactory {
+   public:
+    ValueHolderFactory() {}
+    virtual ~ValueHolderFactory() {}
+    virtual ValueHolder* MakeNewHolder() const = 0;
+
+   private:
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(ValueHolderFactory);
+  };
+
+  class DefaultValueHolderFactory : public ValueHolderFactory {
+   public:
+    DefaultValueHolderFactory() {}
+    ValueHolder* MakeNewHolder() const override { return new ValueHolder(); }
+
+   private:
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultValueHolderFactory);
+  };
+
+  class InstanceValueHolderFactory : public ValueHolderFactory {
+   public:
+    explicit InstanceValueHolderFactory(const T& value) : value_(value) {}
+    ValueHolder* MakeNewHolder() const override {
+      return new ValueHolder(value_);
+    }
+
+   private:
+    const T value_;  // The value for each thread.
+
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(InstanceValueHolderFactory);
+  };
+
+  std::unique_ptr<ValueHolderFactory> default_factory_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadLocal);
+};
+
+# elif GTEST_HAS_PTHREAD
+
+// MutexBase and Mutex implement mutex on pthreads-based platforms.
+class MutexBase {
+ public:
+  // Acquires this mutex.
+  void Lock() {
+    GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_lock(&mutex_));
+    owner_ = pthread_self();
+    has_owner_ = true;
+  }
+
+  // Releases this mutex.
+  void Unlock() {
+    // Since the lock is being released the owner_ field should no longer be
+    // considered valid. We don't protect writing to has_owner_ here, as it's
+    // the caller's responsibility to ensure that the current thread holds the
+    // mutex when this is called.
+    has_owner_ = false;
+    GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_unlock(&mutex_));
+  }
+
+  // Does nothing if the current thread holds the mutex. Otherwise, crashes
+  // with high probability.
+  void AssertHeld() const {
+    GTEST_CHECK_(has_owner_ && pthread_equal(owner_, pthread_self()))
+        << "The current thread is not holding the mutex @" << this;
+  }
+
+  // A static mutex may be used before main() is entered.  It may even
+  // be used before the dynamic initialization stage.  Therefore we
+  // must be able to initialize a static mutex object at link time.
+  // This means MutexBase has to be a POD and its member variables
+  // have to be public.
+ public:
+  pthread_mutex_t mutex_;  // The underlying pthread mutex.
+  // has_owner_ indicates whether the owner_ field below contains a valid thread
+  // ID and is therefore safe to inspect (e.g., to use in pthread_equal()). All
+  // accesses to the owner_ field should be protected by a check of this field.
+  // An alternative might be to memset() owner_ to all zeros, but there's no
+  // guarantee that a zero'd pthread_t is necessarily invalid or even different
+  // from pthread_self().
+  bool has_owner_;
+  pthread_t owner_;  // The thread holding the mutex.
+};
+
+// Forward-declares a static mutex.
+#  define GTEST_DECLARE_STATIC_MUTEX_(mutex) \
+     extern ::testing::internal::MutexBase mutex
+
+// Defines and statically (i.e. at link time) initializes a static mutex.
+// The initialization list here does not explicitly initialize each field,
+// instead relying on default initialization for the unspecified fields. In
+// particular, the owner_ field (a pthread_t) is not explicitly initialized.
+// This allows initialization to work whether pthread_t is a scalar or struct.
+// The flag -Wmissing-field-initializers must not be specified for this to work.
+#define GTEST_DEFINE_STATIC_MUTEX_(mutex) \
+  ::testing::internal::MutexBase mutex = {PTHREAD_MUTEX_INITIALIZER, false, 0}
+
+// The Mutex class can only be used for mutexes created at runtime. It
+// shares its API with MutexBase otherwise.
+class Mutex : public MutexBase {
+ public:
+  Mutex() {
+    GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_init(&mutex_, nullptr));
+    has_owner_ = false;
+  }
+  ~Mutex() {
+    GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_destroy(&mutex_));
+  }
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(Mutex);
+};
+
+// We cannot name this class MutexLock because the ctor declaration would
+// conflict with a macro named MutexLock, which is defined on some
+// platforms. That macro is used as a defensive measure to prevent against
+// inadvertent misuses of MutexLock like "MutexLock(&mu)" rather than
+// "MutexLock l(&mu)".  Hence the typedef trick below.
+class GTestMutexLock {
+ public:
+  explicit GTestMutexLock(MutexBase* mutex)
+      : mutex_(mutex) { mutex_->Lock(); }
+
+  ~GTestMutexLock() { mutex_->Unlock(); }
+
+ private:
+  MutexBase* const mutex_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(GTestMutexLock);
+};
+
+typedef GTestMutexLock MutexLock;
+
+// Helpers for ThreadLocal.
+
+// pthread_key_create() requires DeleteThreadLocalValue() to have
+// C-linkage.  Therefore it cannot be templatized to access
+// ThreadLocal<T>.  Hence the need for class
+// ThreadLocalValueHolderBase.
+class ThreadLocalValueHolderBase {
+ public:
+  virtual ~ThreadLocalValueHolderBase() {}
+};
+
+// Called by pthread to delete thread-local data stored by
+// pthread_setspecific().
+extern "C" inline void DeleteThreadLocalValue(void* value_holder) {
+  delete static_cast<ThreadLocalValueHolderBase*>(value_holder);
+}
+
+// Implements thread-local storage on pthreads-based systems.
+template <typename T>
+class GTEST_API_ ThreadLocal {
+ public:
+  ThreadLocal()
+      : key_(CreateKey()), default_factory_(new DefaultValueHolderFactory()) {}
+  explicit ThreadLocal(const T& value)
+      : key_(CreateKey()),
+        default_factory_(new InstanceValueHolderFactory(value)) {}
+
+  ~ThreadLocal() {
+    // Destroys the managed object for the current thread, if any.
+    DeleteThreadLocalValue(pthread_getspecific(key_));
+
+    // Releases resources associated with the key.  This will *not*
+    // delete managed objects for other threads.
+    GTEST_CHECK_POSIX_SUCCESS_(pthread_key_delete(key_));
+  }
+
+  T* pointer() { return GetOrCreateValue(); }
+  const T* pointer() const { return GetOrCreateValue(); }
+  const T& get() const { return *pointer(); }
+  void set(const T& value) { *pointer() = value; }
+
+ private:
+  // Holds a value of type T.
+  class ValueHolder : public ThreadLocalValueHolderBase {
+   public:
+    ValueHolder() : value_() {}
+    explicit ValueHolder(const T& value) : value_(value) {}
+
+    T* pointer() { return &value_; }
+
+   private:
+    T value_;
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(ValueHolder);
+  };
+
+  static pthread_key_t CreateKey() {
+    pthread_key_t key;
+    // When a thread exits, DeleteThreadLocalValue() will be called on
+    // the object managed for that thread.
+    GTEST_CHECK_POSIX_SUCCESS_(
+        pthread_key_create(&key, &DeleteThreadLocalValue));
+    return key;
+  }
+
+  T* GetOrCreateValue() const {
+    ThreadLocalValueHolderBase* const holder =
+        static_cast<ThreadLocalValueHolderBase*>(pthread_getspecific(key_));
+    if (holder != nullptr) {
+      return CheckedDowncastToActualType<ValueHolder>(holder)->pointer();
+    }
+
+    ValueHolder* const new_holder = default_factory_->MakeNewHolder();
+    ThreadLocalValueHolderBase* const holder_base = new_holder;
+    GTEST_CHECK_POSIX_SUCCESS_(pthread_setspecific(key_, holder_base));
+    return new_holder->pointer();
+  }
+
+  class ValueHolderFactory {
+   public:
+    ValueHolderFactory() {}
+    virtual ~ValueHolderFactory() {}
+    virtual ValueHolder* MakeNewHolder() const = 0;
+
+   private:
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(ValueHolderFactory);
+  };
+
+  class DefaultValueHolderFactory : public ValueHolderFactory {
+   public:
+    DefaultValueHolderFactory() {}
+    ValueHolder* MakeNewHolder() const override { return new ValueHolder(); }
+
+   private:
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultValueHolderFactory);
+  };
+
+  class InstanceValueHolderFactory : public ValueHolderFactory {
+   public:
+    explicit InstanceValueHolderFactory(const T& value) : value_(value) {}
+    ValueHolder* MakeNewHolder() const override {
+      return new ValueHolder(value_);
+    }
+
+   private:
+    const T value_;  // The value for each thread.
+
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(InstanceValueHolderFactory);
+  };
+
+  // A key pthreads uses for looking up per-thread values.
+  const pthread_key_t key_;
+  std::unique_ptr<ValueHolderFactory> default_factory_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadLocal);
+};
+
+# endif  // GTEST_HAS_MUTEX_AND_THREAD_LOCAL_
+
+#else  // GTEST_IS_THREADSAFE
+
+// A dummy implementation of synchronization primitives (mutex, lock,
+// and thread-local variable).  Necessary for compiling Google Test where
+// mutex is not supported - using Google Test in multiple threads is not
+// supported on such platforms.
+
+class Mutex {
+ public:
+  Mutex() {}
+  void Lock() {}
+  void Unlock() {}
+  void AssertHeld() const {}
+};
+
+# define GTEST_DECLARE_STATIC_MUTEX_(mutex) \
+  extern ::testing::internal::Mutex mutex
+
+# define GTEST_DEFINE_STATIC_MUTEX_(mutex) ::testing::internal::Mutex mutex
+
+// We cannot name this class MutexLock because the ctor declaration would
+// conflict with a macro named MutexLock, which is defined on some
+// platforms. That macro is used as a defensive measure to prevent against
+// inadvertent misuses of MutexLock like "MutexLock(&mu)" rather than
+// "MutexLock l(&mu)".  Hence the typedef trick below.
+class GTestMutexLock {
+ public:
+  explicit GTestMutexLock(Mutex*) {}  // NOLINT
+};
+
+typedef GTestMutexLock MutexLock;
+
+template <typename T>
+class GTEST_API_ ThreadLocal {
+ public:
+  ThreadLocal() : value_() {}
+  explicit ThreadLocal(const T& value) : value_(value) {}
+  T* pointer() { return &value_; }
+  const T* pointer() const { return &value_; }
+  const T& get() const { return value_; }
+  void set(const T& value) { value_ = value; }
+ private:
+  T value_;
+};
+
+#endif  // GTEST_IS_THREADSAFE
+
+// Returns the number of threads running in the process, or 0 to indicate that
+// we cannot detect it.
+GTEST_API_ size_t GetThreadCount();
+
+#if GTEST_OS_WINDOWS
+# define GTEST_PATH_SEP_ "\\"
+# define GTEST_HAS_ALT_PATH_SEP_ 1
+#else
+# define GTEST_PATH_SEP_ "/"
+# define GTEST_HAS_ALT_PATH_SEP_ 0
+#endif  // GTEST_OS_WINDOWS
+
+// Utilities for char.
+
+// isspace(int ch) and friends accept an unsigned char or EOF.  char
+// may be signed, depending on the compiler (or compiler flags).
+// Therefore we need to cast a char to unsigned char before calling
+// isspace(), etc.
+
+inline bool IsAlpha(char ch) {
+  return isalpha(static_cast<unsigned char>(ch)) != 0;
+}
+inline bool IsAlNum(char ch) {
+  return isalnum(static_cast<unsigned char>(ch)) != 0;
+}
+inline bool IsDigit(char ch) {
+  return isdigit(static_cast<unsigned char>(ch)) != 0;
+}
+inline bool IsLower(char ch) {
+  return islower(static_cast<unsigned char>(ch)) != 0;
+}
+inline bool IsSpace(char ch) {
+  return isspace(static_cast<unsigned char>(ch)) != 0;
+}
+inline bool IsUpper(char ch) {
+  return isupper(static_cast<unsigned char>(ch)) != 0;
+}
+inline bool IsXDigit(char ch) {
+  return isxdigit(static_cast<unsigned char>(ch)) != 0;
+}
+#ifdef __cpp_char8_t
+inline bool IsXDigit(char8_t ch) {
+  return isxdigit(static_cast<unsigned char>(ch)) != 0;
+}
+#endif
+inline bool IsXDigit(char16_t ch) {
+  const unsigned char low_byte = static_cast<unsigned char>(ch);
+  return ch == low_byte && isxdigit(low_byte) != 0;
+}
+inline bool IsXDigit(char32_t ch) {
+  const unsigned char low_byte = static_cast<unsigned char>(ch);
+  return ch == low_byte && isxdigit(low_byte) != 0;
+}
+inline bool IsXDigit(wchar_t ch) {
+  const unsigned char low_byte = static_cast<unsigned char>(ch);
+  return ch == low_byte && isxdigit(low_byte) != 0;
+}
+
+inline char ToLower(char ch) {
+  return static_cast<char>(tolower(static_cast<unsigned char>(ch)));
+}
+inline char ToUpper(char ch) {
+  return static_cast<char>(toupper(static_cast<unsigned char>(ch)));
+}
+
+inline std::string StripTrailingSpaces(std::string str) {
+  std::string::iterator it = str.end();
+  while (it != str.begin() && IsSpace(*--it))
+    it = str.erase(it);
+  return str;
+}
+
+// The testing::internal::posix namespace holds wrappers for common
+// POSIX functions.  These wrappers hide the differences between
+// Windows/MSVC and POSIX systems.  Since some compilers define these
+// standard functions as macros, the wrapper cannot have the same name
+// as the wrapped function.
+
+namespace posix {
+
+// Functions with a different name on Windows.
+
+#if GTEST_OS_WINDOWS
+
+typedef struct _stat StatStruct;
+
+# ifdef __BORLANDC__
+inline int DoIsATTY(int fd) { return isatty(fd); }
+inline int StrCaseCmp(const char* s1, const char* s2) {
+  return stricmp(s1, s2);
+}
+inline char* StrDup(const char* src) { return strdup(src); }
+# else  // !__BORLANDC__
+#  if GTEST_OS_WINDOWS_MOBILE
+inline int DoIsATTY(int /* fd */) { return 0; }
+#  else
+inline int DoIsATTY(int fd) { return _isatty(fd); }
+#  endif  // GTEST_OS_WINDOWS_MOBILE
+inline int StrCaseCmp(const char* s1, const char* s2) {
+  return _stricmp(s1, s2);
+}
+inline char* StrDup(const char* src) { return _strdup(src); }
+# endif  // __BORLANDC__
+
+# if GTEST_OS_WINDOWS_MOBILE
+inline int FileNo(FILE* file) { return reinterpret_cast<int>(_fileno(file)); }
+// Stat(), RmDir(), and IsDir() are not needed on Windows CE at this
+// time and thus not defined there.
+# else
+inline int FileNo(FILE* file) { return _fileno(file); }
+inline int Stat(const char* path, StatStruct* buf) { return _stat(path, buf); }
+inline int RmDir(const char* dir) { return _rmdir(dir); }
+inline bool IsDir(const StatStruct& st) {
+  return (_S_IFDIR & st.st_mode) != 0;
+}
+# endif  // GTEST_OS_WINDOWS_MOBILE
+
+#elif GTEST_OS_ESP8266
+typedef struct stat StatStruct;
+
+inline int FileNo(FILE* file) { return fileno(file); }
+inline int DoIsATTY(int fd) { return isatty(fd); }
+inline int Stat(const char* path, StatStruct* buf) {
+  // stat function not implemented on ESP8266
+  return 0;
+}
+inline int StrCaseCmp(const char* s1, const char* s2) {
+  return strcasecmp(s1, s2);
+}
+inline char* StrDup(const char* src) { return strdup(src); }
+inline int RmDir(const char* dir) { return rmdir(dir); }
+inline bool IsDir(const StatStruct& st) { return S_ISDIR(st.st_mode); }
+
+#else
+
+typedef struct stat StatStruct;
+
+inline int FileNo(FILE* file) { return fileno(file); }
+inline int DoIsATTY(int fd) { return isatty(fd); }
+inline int Stat(const char* path, StatStruct* buf) { return stat(path, buf); }
+inline int StrCaseCmp(const char* s1, const char* s2) {
+  return strcasecmp(s1, s2);
+}
+inline char* StrDup(const char* src) { return strdup(src); }
+inline int RmDir(const char* dir) { return rmdir(dir); }
+inline bool IsDir(const StatStruct& st) { return S_ISDIR(st.st_mode); }
+
+#endif  // GTEST_OS_WINDOWS
+
+inline int IsATTY(int fd) {
+  // DoIsATTY might change errno (for example ENOTTY in case you redirect stdout
+  // to a file on Linux), which is unexpected, so save the previous value, and
+  // restore it after the call.
+  int savedErrno = errno;
+  int isAttyValue = DoIsATTY(fd);
+  errno = savedErrno;
+
+  return isAttyValue;
+}
+
+// Functions deprecated by MSVC 8.0.
+
+GTEST_DISABLE_MSC_DEPRECATED_PUSH_()
+
+// ChDir(), FReopen(), FDOpen(), Read(), Write(), Close(), and
+// StrError() aren't needed on Windows CE at this time and thus not
+// defined there.
+
+#if !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_WINDOWS_PHONE && \
+    !GTEST_OS_WINDOWS_RT && !GTEST_OS_ESP8266 && !GTEST_OS_XTENSA
+inline int ChDir(const char* dir) { return chdir(dir); }
+#endif
+inline FILE* FOpen(const char* path, const char* mode) {
+#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW
+  struct wchar_codecvt : public std::codecvt<wchar_t, char, std::mbstate_t> {};
+  std::wstring_convert<wchar_codecvt> converter;
+  std::wstring wide_path = converter.from_bytes(path);
+  std::wstring wide_mode = converter.from_bytes(mode);
+  return _wfopen(wide_path.c_str(), wide_mode.c_str());
+#else  // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW
+  return fopen(path, mode);
+#endif  // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW
+}
+#if !GTEST_OS_WINDOWS_MOBILE
+inline FILE *FReopen(const char* path, const char* mode, FILE* stream) {
+  return freopen(path, mode, stream);
+}
+inline FILE* FDOpen(int fd, const char* mode) { return fdopen(fd, mode); }
+#endif
+inline int FClose(FILE* fp) { return fclose(fp); }
+#if !GTEST_OS_WINDOWS_MOBILE
+inline int Read(int fd, void* buf, unsigned int count) {
+  return static_cast<int>(read(fd, buf, count));
+}
+inline int Write(int fd, const void* buf, unsigned int count) {
+  return static_cast<int>(write(fd, buf, count));
+}
+inline int Close(int fd) { return close(fd); }
+inline const char* StrError(int errnum) { return strerror(errnum); }
+#endif
+inline const char* GetEnv(const char* name) {
+#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || \
+    GTEST_OS_WINDOWS_RT || GTEST_OS_ESP8266 || GTEST_OS_XTENSA
+  // We are on an embedded platform, which has no environment variables.
+  static_cast<void>(name);  // To prevent 'unused argument' warning.
+  return nullptr;
+#elif defined(__BORLANDC__) || defined(__SunOS_5_8) || defined(__SunOS_5_9)
+  // Environment variables which we programmatically clear will be set to the
+  // empty string rather than unset (NULL).  Handle that case.
+  const char* const env = getenv(name);
+  return (env != nullptr && env[0] != '\0') ? env : nullptr;
+#else
+  return getenv(name);
+#endif
+}
+
+GTEST_DISABLE_MSC_DEPRECATED_POP_()
+
+#if GTEST_OS_WINDOWS_MOBILE
+// Windows CE has no C library. The abort() function is used in
+// several places in Google Test. This implementation provides a reasonable
+// imitation of standard behaviour.
+[[noreturn]] void Abort();
+#else
+[[noreturn]] inline void Abort() { abort(); }
+#endif  // GTEST_OS_WINDOWS_MOBILE
+
+}  // namespace posix
+
+// MSVC "deprecates" snprintf and issues warnings wherever it is used.  In
+// order to avoid these warnings, we need to use _snprintf or _snprintf_s on
+// MSVC-based platforms.  We map the GTEST_SNPRINTF_ macro to the appropriate
+// function in order to achieve that.  We use macro definition here because
+// snprintf is a variadic function.
+#if _MSC_VER && !GTEST_OS_WINDOWS_MOBILE
+// MSVC 2005 and above support variadic macros.
+# define GTEST_SNPRINTF_(buffer, size, format, ...) \
+     _snprintf_s(buffer, size, size, format, __VA_ARGS__)
+#elif defined(_MSC_VER)
+// Windows CE does not define _snprintf_s
+# define GTEST_SNPRINTF_ _snprintf
+#else
+# define GTEST_SNPRINTF_ snprintf
+#endif
+
+// The biggest signed integer type the compiler supports.
+//
+// long long is guaranteed to be at least 64-bits in C++11.
+using BiggestInt = long long;  // NOLINT
+
+// The maximum number a BiggestInt can represent.
+constexpr BiggestInt kMaxBiggestInt = (std::numeric_limits<BiggestInt>::max)();
+
+// This template class serves as a compile-time function from size to
+// type.  It maps a size in bytes to a primitive type with that
+// size. e.g.
+//
+//   TypeWithSize<4>::UInt
+//
+// is typedef-ed to be unsigned int (unsigned integer made up of 4
+// bytes).
+//
+// Such functionality should belong to STL, but I cannot find it
+// there.
+//
+// Google Test uses this class in the implementation of floating-point
+// comparison.
+//
+// For now it only handles UInt (unsigned int) as that's all Google Test
+// needs.  Other types can be easily added in the future if need
+// arises.
+template <size_t size>
+class TypeWithSize {
+ public:
+  // This prevents the user from using TypeWithSize<N> with incorrect
+  // values of N.
+  using UInt = void;
+};
+
+// The specialization for size 4.
+template <>
+class TypeWithSize<4> {
+ public:
+  using Int = std::int32_t;
+  using UInt = std::uint32_t;
+};
+
+// The specialization for size 8.
+template <>
+class TypeWithSize<8> {
+ public:
+  using Int = std::int64_t;
+  using UInt = std::uint64_t;
+};
+
+// Integer types of known sizes.
+using TimeInMillis = int64_t;  // Represents time in milliseconds.
+
+// Utilities for command line flags and environment variables.
+
+// Macro for referencing flags.
+#if !defined(GTEST_FLAG)
+# define GTEST_FLAG(name) FLAGS_gtest_##name
+#endif  // !defined(GTEST_FLAG)
+
+#if !defined(GTEST_USE_OWN_FLAGFILE_FLAG_)
+# define GTEST_USE_OWN_FLAGFILE_FLAG_ 1
+#endif  // !defined(GTEST_USE_OWN_FLAGFILE_FLAG_)
+
+#if !defined(GTEST_DECLARE_bool_)
+# define GTEST_FLAG_SAVER_ ::testing::internal::GTestFlagSaver
+
+// Macros for declaring flags.
+# define GTEST_DECLARE_bool_(name) GTEST_API_ extern bool GTEST_FLAG(name)
+# define GTEST_DECLARE_int32_(name) \
+    GTEST_API_ extern std::int32_t GTEST_FLAG(name)
+# define GTEST_DECLARE_string_(name) \
+    GTEST_API_ extern ::std::string GTEST_FLAG(name)
+
+// Macros for defining flags.
+# define GTEST_DEFINE_bool_(name, default_val, doc) \
+    GTEST_API_ bool GTEST_FLAG(name) = (default_val)
+# define GTEST_DEFINE_int32_(name, default_val, doc) \
+    GTEST_API_ std::int32_t GTEST_FLAG(name) = (default_val)
+# define GTEST_DEFINE_string_(name, default_val, doc) \
+    GTEST_API_ ::std::string GTEST_FLAG(name) = (default_val)
+
+#endif  // !defined(GTEST_DECLARE_bool_)
+
+// Thread annotations
+#if !defined(GTEST_EXCLUSIVE_LOCK_REQUIRED_)
+# define GTEST_EXCLUSIVE_LOCK_REQUIRED_(locks)
+# define GTEST_LOCK_EXCLUDED_(locks)
+#endif  // !defined(GTEST_EXCLUSIVE_LOCK_REQUIRED_)
+
+// Parses 'str' for a 32-bit signed integer.  If successful, writes the result
+// to *value and returns true; otherwise leaves *value unchanged and returns
+// false.
+GTEST_API_ bool ParseInt32(const Message& src_text, const char* str,
+                           int32_t* value);
+
+// Parses a bool/int32_t/string from the environment variable
+// corresponding to the given Google Test flag.
+bool BoolFromGTestEnv(const char* flag, bool default_val);
+GTEST_API_ int32_t Int32FromGTestEnv(const char* flag, int32_t default_val);
+std::string OutputFlagAlsoCheckEnvVar();
+const char* StringFromGTestEnv(const char* flag, const char* default_val);
+
+}  // namespace internal
+}  // namespace testing
+
+#if !defined(GTEST_INTERNAL_DEPRECATED)
+
+// Internal Macro to mark an API deprecated, for googletest usage only
+// Usage: class GTEST_INTERNAL_DEPRECATED(message) MyClass or
+// GTEST_INTERNAL_DEPRECATED(message) <return_type> myFunction(); Every usage of
+// a deprecated entity will trigger a warning when compiled with
+// `-Wdeprecated-declarations` option (clang, gcc, any __GNUC__ compiler).
+// For msvc /W3 option will need to be used
+// Note that for 'other' compilers this macro evaluates to nothing to prevent
+// compilations errors.
+#if defined(_MSC_VER)
+#define GTEST_INTERNAL_DEPRECATED(message) __declspec(deprecated(message))
+#elif defined(__GNUC__)
+#define GTEST_INTERNAL_DEPRECATED(message) __attribute__((deprecated(message)))
+#else
+#define GTEST_INTERNAL_DEPRECATED(message)
+#endif
+
+#endif  // !defined(GTEST_INTERNAL_DEPRECATED)
+
+#if GTEST_HAS_ABSL
+// Always use absl::any for UniversalPrinter<> specializations if googletest
+// is built with absl support.
+#define GTEST_INTERNAL_HAS_ANY 1
+#include "absl/types/any.h"
+namespace testing {
+namespace internal {
+using Any = ::absl::any;
+}  // namespace internal
+}  // namespace testing
+#else
+#ifdef __has_include
+#if __has_include(<any>) && __cplusplus >= 201703L
+// Otherwise for C++17 and higher use std::any for UniversalPrinter<>
+// specializations.
+#define GTEST_INTERNAL_HAS_ANY 1
+#include <any>
+namespace testing {
+namespace internal {
+using Any = ::std::any;
+}  // namespace internal
+}  // namespace testing
+// The case where absl is configured NOT to alias std::any is not
+// supported.
+#endif  // __has_include(<any>) && __cplusplus >= 201703L
+#endif  // __has_include
+#endif  // GTEST_HAS_ABSL
+
+#if GTEST_HAS_ABSL
+// Always use absl::optional for UniversalPrinter<> specializations if
+// googletest is built with absl support.
+#define GTEST_INTERNAL_HAS_OPTIONAL 1
+#include "absl/types/optional.h"
+namespace testing {
+namespace internal {
+template <typename T>
+using Optional = ::absl::optional<T>;
+}  // namespace internal
+}  // namespace testing
+#else
+#ifdef __has_include
+#if __has_include(<optional>) && __cplusplus >= 201703L
+// Otherwise for C++17 and higher use std::optional for UniversalPrinter<>
+// specializations.
+#define GTEST_INTERNAL_HAS_OPTIONAL 1
+#include <optional>
+namespace testing {
+namespace internal {
+template <typename T>
+using Optional = ::std::optional<T>;
+}  // namespace internal
+}  // namespace testing
+// The case where absl is configured NOT to alias std::optional is not
+// supported.
+#endif  // __has_include(<optional>) && __cplusplus >= 201703L
+#endif  // __has_include
+#endif  // GTEST_HAS_ABSL
+
+#if GTEST_HAS_ABSL
+// Always use absl::string_view for Matcher<> specializations if googletest
+// is built with absl support.
+# define GTEST_INTERNAL_HAS_STRING_VIEW 1
+#include "absl/strings/string_view.h"
+namespace testing {
+namespace internal {
+using StringView = ::absl::string_view;
+}  // namespace internal
+}  // namespace testing
+#else
+# ifdef __has_include
+#   if __has_include(<string_view>) && __cplusplus >= 201703L
+// Otherwise for C++17 and higher use std::string_view for Matcher<>
+// specializations.
+#   define GTEST_INTERNAL_HAS_STRING_VIEW 1
+#include <string_view>
+namespace testing {
+namespace internal {
+using StringView = ::std::string_view;
+}  // namespace internal
+}  // namespace testing
+// The case where absl is configured NOT to alias std::string_view is not
+// supported.
+#  endif  // __has_include(<string_view>) && __cplusplus >= 201703L
+# endif  // __has_include
+#endif  // GTEST_HAS_ABSL
+
+#if GTEST_HAS_ABSL
+// Always use absl::variant for UniversalPrinter<> specializations if googletest
+// is built with absl support.
+#define GTEST_INTERNAL_HAS_VARIANT 1
+#include "absl/types/variant.h"
+namespace testing {
+namespace internal {
+template <typename... T>
+using Variant = ::absl::variant<T...>;
+}  // namespace internal
+}  // namespace testing
+#else
+#ifdef __has_include
+#if __has_include(<variant>) && __cplusplus >= 201703L
+// Otherwise for C++17 and higher use std::variant for UniversalPrinter<>
+// specializations.
+#define GTEST_INTERNAL_HAS_VARIANT 1
+#include <variant>
+namespace testing {
+namespace internal {
+template <typename... T>
+using Variant = ::std::variant<T...>;
+}  // namespace internal
+}  // namespace testing
+// The case where absl is configured NOT to alias std::variant is not supported.
+#endif  // __has_include(<variant>) && __cplusplus >= 201703L
+#endif  // __has_include
+#endif  // GTEST_HAS_ABSL
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/gtest-string.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/gtest-string.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/gtest-string.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/gtest-string.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,175 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// The Google C++ Testing and Mocking Framework (Google Test)
+//
+// This header file declares the String class and functions used internally by
+// Google Test.  They are subject to change without notice. They should not used
+// by code external to Google Test.
+//
+// This header file is #included by gtest-internal.h.
+// It should not be #included by other files.
+
+// GOOGLETEST_CM0001 DO NOT DELETE
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_
+#define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_
+
+#ifdef __BORLANDC__
+// string.h is not guaranteed to provide strcpy on C++ Builder.
+# include <mem.h>
+#endif
+
+#include <string.h>
+#include <cstdint>
+#include <string>
+
+#include "gtest/internal/gtest-port.h"
+
+namespace testing {
+namespace internal {
+
+// String - an abstract class holding static string utilities.
+class GTEST_API_ String {
+ public:
+  // Static utility methods
+
+  // Clones a 0-terminated C string, allocating memory using new.  The
+  // caller is responsible for deleting the return value using
+  // delete[].  Returns the cloned string, or NULL if the input is
+  // NULL.
+  //
+  // This is different from strdup() in string.h, which allocates
+  // memory using malloc().
+  static const char* CloneCString(const char* c_str);
+
+#if GTEST_OS_WINDOWS_MOBILE
+  // Windows CE does not have the 'ANSI' versions of Win32 APIs. To be
+  // able to pass strings to Win32 APIs on CE we need to convert them
+  // to 'Unicode', UTF-16.
+
+  // Creates a UTF-16 wide string from the given ANSI string, allocating
+  // memory using new. The caller is responsible for deleting the return
+  // value using delete[]. Returns the wide string, or NULL if the
+  // input is NULL.
+  //
+  // The wide string is created using the ANSI codepage (CP_ACP) to
+  // match the behaviour of the ANSI versions of Win32 calls and the
+  // C runtime.
+  static LPCWSTR AnsiToUtf16(const char* c_str);
+
+  // Creates an ANSI string from the given wide string, allocating
+  // memory using new. The caller is responsible for deleting the return
+  // value using delete[]. Returns the ANSI string, or NULL if the
+  // input is NULL.
+  //
+  // The returned string is created using the ANSI codepage (CP_ACP) to
+  // match the behaviour of the ANSI versions of Win32 calls and the
+  // C runtime.
+  static const char* Utf16ToAnsi(LPCWSTR utf16_str);
+#endif
+
+  // Compares two C strings.  Returns true if and only if they have the same
+  // content.
+  //
+  // Unlike strcmp(), this function can handle NULL argument(s).  A
+  // NULL C string is considered different to any non-NULL C string,
+  // including the empty string.
+  static bool CStringEquals(const char* lhs, const char* rhs);
+
+  // Converts a wide C string to a String using the UTF-8 encoding.
+  // NULL will be converted to "(null)".  If an error occurred during
+  // the conversion, "(failed to convert from wide string)" is
+  // returned.
+  static std::string ShowWideCString(const wchar_t* wide_c_str);
+
+  // Compares two wide C strings.  Returns true if and only if they have the
+  // same content.
+  //
+  // Unlike wcscmp(), this function can handle NULL argument(s).  A
+  // NULL C string is considered different to any non-NULL C string,
+  // including the empty string.
+  static bool WideCStringEquals(const wchar_t* lhs, const wchar_t* rhs);
+
+  // Compares two C strings, ignoring case.  Returns true if and only if
+  // they have the same content.
+  //
+  // Unlike strcasecmp(), this function can handle NULL argument(s).
+  // A NULL C string is considered different to any non-NULL C string,
+  // including the empty string.
+  static bool CaseInsensitiveCStringEquals(const char* lhs,
+                                           const char* rhs);
+
+  // Compares two wide C strings, ignoring case.  Returns true if and only if
+  // they have the same content.
+  //
+  // Unlike wcscasecmp(), this function can handle NULL argument(s).
+  // A NULL C string is considered different to any non-NULL wide C string,
+  // including the empty string.
+  // NB: The implementations on different platforms slightly differ.
+  // On windows, this method uses _wcsicmp which compares according to LC_CTYPE
+  // environment variable. On GNU platform this method uses wcscasecmp
+  // which compares according to LC_CTYPE category of the current locale.
+  // On MacOS X, it uses towlower, which also uses LC_CTYPE category of the
+  // current locale.
+  static bool CaseInsensitiveWideCStringEquals(const wchar_t* lhs,
+                                               const wchar_t* rhs);
+
+  // Returns true if and only if the given string ends with the given suffix,
+  // ignoring case. Any string is considered to end with an empty suffix.
+  static bool EndsWithCaseInsensitive(
+      const std::string& str, const std::string& suffix);
+
+  // Formats an int value as "%02d".
+  static std::string FormatIntWidth2(int value);  // "%02d" for width == 2
+
+  // Formats an int value to given width with leading zeros.
+  static std::string FormatIntWidthN(int value, int width);
+
+  // Formats an int value as "%X".
+  static std::string FormatHexInt(int value);
+
+  // Formats an int value as "%X".
+  static std::string FormatHexUInt32(uint32_t value);
+
+  // Formats a byte as "%02X".
+  static std::string FormatByte(unsigned char value);
+
+ private:
+  String();  // Not meant to be instantiated.
+};  // class String
+
+// Gets the content of the stringstream's buffer as an std::string.  Each '\0'
+// character in the buffer is replaced with "\\0".
+GTEST_API_ std::string StringStreamToString(::std::stringstream* stream);
+
+}  // namespace internal
+}  // namespace testing
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/gtest-type-util.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/gtest-type-util.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/gtest-type-util.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/include/gtest/internal/gtest-type-util.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,183 @@
+// Copyright 2008 Google Inc.
+// All Rights Reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Type utilities needed for implementing typed and type-parameterized
+// tests.
+
+// GOOGLETEST_CM0001 DO NOT DELETE
+
+#ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
+#define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
+
+#include "gtest/internal/gtest-port.h"
+
+// #ifdef __GNUC__ is too general here.  It is possible to use gcc without using
+// libstdc++ (which is where cxxabi.h comes from).
+# if GTEST_HAS_CXXABI_H_
+#  include <cxxabi.h>
+# elif defined(__HP_aCC)
+#  include <acxx_demangle.h>
+# endif  // GTEST_HASH_CXXABI_H_
+
+namespace testing {
+namespace internal {
+
+// Canonicalizes a given name with respect to the Standard C++ Library.
+// This handles removing the inline namespace within `std` that is
+// used by various standard libraries (e.g., `std::__1`).  Names outside
+// of namespace std are returned unmodified.
+inline std::string CanonicalizeForStdLibVersioning(std::string s) {
+  static const char prefix[] = "std::__";
+  if (s.compare(0, strlen(prefix), prefix) == 0) {
+    std::string::size_type end = s.find("::", strlen(prefix));
+    if (end != s.npos) {
+      // Erase everything between the initial `std` and the second `::`.
+      s.erase(strlen("std"), end - strlen("std"));
+    }
+  }
+  return s;
+}
+
+#if GTEST_HAS_RTTI
+// GetTypeName(const std::type_info&) returns a human-readable name of type T.
+inline std::string GetTypeName(const std::type_info& type) {
+  const char* const name = type.name();
+#if GTEST_HAS_CXXABI_H_ || defined(__HP_aCC)
+  int status = 0;
+  // gcc's implementation of typeid(T).name() mangles the type name,
+  // so we have to demangle it.
+#if GTEST_HAS_CXXABI_H_
+  using abi::__cxa_demangle;
+#endif  // GTEST_HAS_CXXABI_H_
+  char* const readable_name = __cxa_demangle(name, nullptr, nullptr, &status);
+  const std::string name_str(status == 0 ? readable_name : name);
+  free(readable_name);
+  return CanonicalizeForStdLibVersioning(name_str);
+#else
+  return name;
+#endif  // GTEST_HAS_CXXABI_H_ || __HP_aCC
+}
+#endif  // GTEST_HAS_RTTI
+
+// GetTypeName<T>() returns a human-readable name of type T if and only if
+// RTTI is enabled, otherwise it returns a dummy type name.
+// NB: This function is also used in Google Mock, so don't move it inside of
+// the typed-test-only section below.
+template <typename T>
+std::string GetTypeName() {
+#if GTEST_HAS_RTTI
+  return GetTypeName(typeid(T));
+#else
+  return "<type>";
+#endif  // GTEST_HAS_RTTI
+}
+
+// A unique type indicating an empty node
+struct None {};
+
+# define GTEST_TEMPLATE_ template <typename T> class
+
+// The template "selector" struct TemplateSel<Tmpl> is used to
+// represent Tmpl, which must be a class template with one type
+// parameter, as a type.  TemplateSel<Tmpl>::Bind<T>::type is defined
+// as the type Tmpl<T>.  This allows us to actually instantiate the
+// template "selected" by TemplateSel<Tmpl>.
+//
+// This trick is necessary for simulating typedef for class templates,
+// which C++ doesn't support directly.
+template <GTEST_TEMPLATE_ Tmpl>
+struct TemplateSel {
+  template <typename T>
+  struct Bind {
+    typedef Tmpl<T> type;
+  };
+};
+
+# define GTEST_BIND_(TmplSel, T) \
+  TmplSel::template Bind<T>::type
+
+template <GTEST_TEMPLATE_ Head_, GTEST_TEMPLATE_... Tail_>
+struct Templates {
+  using Head = TemplateSel<Head_>;
+  using Tail = Templates<Tail_...>;
+};
+
+template <GTEST_TEMPLATE_ Head_>
+struct Templates<Head_> {
+  using Head = TemplateSel<Head_>;
+  using Tail = None;
+};
+
+// Tuple-like type lists
+template <typename Head_, typename... Tail_>
+struct Types {
+  using Head = Head_;
+  using Tail = Types<Tail_...>;
+};
+
+template <typename Head_>
+struct Types<Head_> {
+  using Head = Head_;
+  using Tail = None;
+};
+
+// Helper metafunctions to tell apart a single type from types
+// generated by ::testing::Types
+template <typename... Ts>
+struct ProxyTypeList {
+  using type = Types<Ts...>;
+};
+
+template <typename>
+struct is_proxy_type_list : std::false_type {};
+
+template <typename... Ts>
+struct is_proxy_type_list<ProxyTypeList<Ts...>> : std::true_type {};
+
+// Generator which conditionally creates type lists.
+// It recognizes if a requested type list should be created
+// and prevents creating a new type list nested within another one.
+template <typename T>
+struct GenerateTypeList {
+ private:
+  using proxy = typename std::conditional<is_proxy_type_list<T>::value, T,
+                                          ProxyTypeList<T>>::type;
+
+ public:
+  using type = typename proxy::type;
+};
+
+}  // namespace internal
+
+template <typename... Ts>
+using Types = internal::ProxyTypeList<Ts...>;
+
+}  // namespace testing
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/README.md mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/README.md
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/README.md	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/README.md	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,215 @@
+### Generic Build Instructions
+
+#### Setup
+
+To build GoogleTest and your tests that use it, you need to tell your build
+system where to find its headers and source files. The exact way to do it
+depends on which build system you use, and is usually straightforward.
+
+### Build with CMake
+
+GoogleTest comes with a CMake build script
+([CMakeLists.txt](https://github.com/google/googletest/blob/master/CMakeLists.txt))
+that can be used on a wide range of platforms ("C" stands for cross-platform.).
+If you don't have CMake installed already, you can download it for free from
+<http://www.cmake.org/>.
+
+CMake works by generating native makefiles or build projects that can be used in
+the compiler environment of your choice. You can either build GoogleTest as a
+standalone project or it can be incorporated into an existing CMake build for
+another project.
+
+#### Standalone CMake Project
+
+When building GoogleTest as a standalone project, the typical workflow starts
+with
+
+```
+git clone https://github.com/google/googletest.git -b release-1.10.0
+cd googletest        # Main directory of the cloned repository.
+mkdir build          # Create a directory to hold the build output.
+cd build
+cmake ..             # Generate native build scripts for GoogleTest.
+```
+
+The above command also includes GoogleMock by default. And so, if you want to
+build only GoogleTest, you should replace the last command with
+
+```
+cmake .. -DBUILD_GMOCK=OFF
+```
+
+If you are on a \*nix system, you should now see a Makefile in the current
+directory. Just type `make` to build GoogleTest. And then you can simply install
+GoogleTest if you are a system administrator.
+
+```
+make
+sudo make install    # Install in /usr/local/ by default
+```
+
+If you use Windows and have Visual Studio installed, a `gtest.sln` file and
+several `.vcproj` files will be created. You can then build them using Visual
+Studio.
+
+On Mac OS X with Xcode installed, a `.xcodeproj` file will be generated.
+
+#### Incorporating Into An Existing CMake Project
+
+If you want to use GoogleTest in a project which already uses CMake, the easiest
+way is to get installed libraries and headers.
+
+*   Import GoogleTest by using `find_package` (or `pkg_check_modules`). For
+    example, if `find_package(GTest CONFIG REQUIRED)` succeeds, you can use the
+    libraries as `GTest::gtest`, `GTest::gmock`.
+
+And a more robust and flexible approach is to build GoogleTest as part of that
+project directly. This is done by making the GoogleTest source code available to
+the main build and adding it using CMake's `add_subdirectory()` command. This
+has the significant advantage that the same compiler and linker settings are
+used between GoogleTest and the rest of your project, so issues associated with
+using incompatible libraries (eg debug/release), etc. are avoided. This is
+particularly useful on Windows. Making GoogleTest's source code available to the
+main build can be done a few different ways:
+
+*   Download the GoogleTest source code manually and place it at a known
+    location. This is the least flexible approach and can make it more difficult
+    to use with continuous integration systems, etc.
+*   Embed the GoogleTest source code as a direct copy in the main project's
+    source tree. This is often the simplest approach, but is also the hardest to
+    keep up to date. Some organizations may not permit this method.
+*   Add GoogleTest as a git submodule or equivalent. This may not always be
+    possible or appropriate. Git submodules, for example, have their own set of
+    advantages and drawbacks.
+*   Use CMake to download GoogleTest as part of the build's configure step. This
+    approach doesn't have the limitations of the other methods.
+
+The last of the above methods is implemented with a small piece of CMake code
+that downloads and pulls the GoogleTest code into the main build.
+
+Just add to your `CMakeLists.txt`:
+
+```cmake
+include(FetchContent)
+FetchContent_Declare(
+  googletest
+  # Specify the commit you depend on and update it regularly.
+  URL https://github.com/google/googletest/archive/609281088cfefc76f9d0ce82e1ff6c30cc3591e5.zip
+)
+# For Windows: Prevent overriding the parent project's compiler/linker settings
+set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+FetchContent_MakeAvailable(googletest)
+
+# Now simply link against gtest or gtest_main as needed. Eg
+add_executable(example example.cpp)
+target_link_libraries(example gtest_main)
+add_test(NAME example_test COMMAND example)
+```
+
+Note that this approach requires CMake 3.14 or later due to its use of the
+`FetchContent_MakeAvailable()` command.
+
+##### Visual Studio Dynamic vs Static Runtimes
+
+By default, new Visual Studio projects link the C runtimes dynamically but
+GoogleTest links them statically. This will generate an error that looks
+something like the following: gtest.lib(gtest-all.obj) : error LNK2038: mismatch
+detected for 'RuntimeLibrary': value 'MTd_StaticDebug' doesn't match value
+'MDd_DynamicDebug' in main.obj
+
+GoogleTest already has a CMake option for this: `gtest_force_shared_crt`
+
+Enabling this option will make gtest link the runtimes dynamically too, and
+match the project in which it is included.
+
+#### C++ Standard Version
+
+An environment that supports C++11 is required in order to successfully build
+GoogleTest. One way to ensure this is to specify the standard in the top-level
+project, for example by using the `set(CMAKE_CXX_STANDARD 11)` command. If this
+is not feasible, for example in a C project using GoogleTest for validation,
+then it can be specified by adding it to the options for cmake via the
+`DCMAKE_CXX_FLAGS` option.
+
+### Tweaking GoogleTest
+
+GoogleTest can be used in diverse environments. The default configuration may
+not work (or may not work well) out of the box in some environments. However,
+you can easily tweak GoogleTest by defining control macros on the compiler
+command line. Generally, these macros are named like `GTEST_XYZ` and you define
+them to either 1 or 0 to enable or disable a certain feature.
+
+We list the most frequently used macros below. For a complete list, see file
+[include/gtest/internal/gtest-port.h](https://github.com/google/googletest/blob/master/googletest/include/gtest/internal/gtest-port.h).
+
+### Multi-threaded Tests
+
+GoogleTest is thread-safe where the pthread library is available. After
+`#include "gtest/gtest.h"`, you can check the
+`GTEST_IS_THREADSAFE` macro to see whether this is the case (yes if the macro is
+`#defined` to 1, no if it's undefined.).
+
+If GoogleTest doesn't correctly detect whether pthread is available in your
+environment, you can force it with
+
+    -DGTEST_HAS_PTHREAD=1
+
+or
+
+    -DGTEST_HAS_PTHREAD=0
+
+When GoogleTest uses pthread, you may need to add flags to your compiler and/or
+linker to select the pthread library, or you'll get link errors. If you use the
+CMake script, this is taken care of for you. If you use your own build script,
+you'll need to read your compiler and linker's manual to figure out what flags
+to add.
+
+### As a Shared Library (DLL)
+
+GoogleTest is compact, so most users can build and link it as a static library
+for the simplicity. You can choose to use GoogleTest as a shared library (known
+as a DLL on Windows) if you prefer.
+
+To compile *gtest* as a shared library, add
+
+    -DGTEST_CREATE_SHARED_LIBRARY=1
+
+to the compiler flags. You'll also need to tell the linker to produce a shared
+library instead - consult your linker's manual for how to do it.
+
+To compile your *tests* that use the gtest shared library, add
+
+    -DGTEST_LINKED_AS_SHARED_LIBRARY=1
+
+to the compiler flags.
+
+Note: while the above steps aren't technically necessary today when using some
+compilers (e.g. GCC), they may become necessary in the future, if we decide to
+improve the speed of loading the library (see
+<http://gcc.gnu.org/wiki/Visibility> for details). Therefore you are recommended
+to always add the above flags when using GoogleTest as a shared library.
+Otherwise a future release of GoogleTest may break your build script.
+
+### Avoiding Macro Name Clashes
+
+In C++, macros don't obey namespaces. Therefore two libraries that both define a
+macro of the same name will clash if you `#include` both definitions. In case a
+GoogleTest macro clashes with another library, you can force GoogleTest to
+rename its macro to avoid the conflict.
+
+Specifically, if both GoogleTest and some other code define macro FOO, you can
+add
+
+    -DGTEST_DONT_DEFINE_FOO=1
+
+to the compiler flags to tell GoogleTest to change the macro's name from `FOO`
+to `GTEST_FOO`. Currently `FOO` can be `FAIL`, `SUCCEED`, or `TEST`. For
+example, with `-DGTEST_DONT_DEFINE_TEST=1`, you'll need to write
+
+    GTEST_TEST(SomeTest, DoesThis) { ... }
+
+instead of
+
+    TEST(SomeTest, DoesThis) { ... }
+
+in order to define a test.
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/samples/prime_tables.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/samples/prime_tables.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/samples/prime_tables.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/samples/prime_tables.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,126 @@
+// Copyright 2008 Google Inc.
+// All Rights Reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+
+// This provides interface PrimeTable that determines whether a number is a
+// prime and determines a next prime number. This interface is used
+// in Google Test samples demonstrating use of parameterized tests.
+
+#ifndef GOOGLETEST_SAMPLES_PRIME_TABLES_H_
+#define GOOGLETEST_SAMPLES_PRIME_TABLES_H_
+
+#include <algorithm>
+
+// The prime table interface.
+class PrimeTable {
+ public:
+  virtual ~PrimeTable() {}
+
+  // Returns true if and only if n is a prime number.
+  virtual bool IsPrime(int n) const = 0;
+
+  // Returns the smallest prime number greater than p; or returns -1
+  // if the next prime is beyond the capacity of the table.
+  virtual int GetNextPrime(int p) const = 0;
+};
+
+// Implementation #1 calculates the primes on-the-fly.
+class OnTheFlyPrimeTable : public PrimeTable {
+ public:
+  bool IsPrime(int n) const override {
+    if (n <= 1) return false;
+
+    for (int i = 2; i*i <= n; i++) {
+      // n is divisible by an integer other than 1 and itself.
+      if ((n % i) == 0) return false;
+    }
+
+    return true;
+  }
+
+  int GetNextPrime(int p) const override {
+    if (p < 0) return -1;
+
+    for (int n = p + 1;; n++) {
+      if (IsPrime(n)) return n;
+    }
+  }
+};
+
+// Implementation #2 pre-calculates the primes and stores the result
+// in an array.
+class PreCalculatedPrimeTable : public PrimeTable {
+ public:
+  // 'max' specifies the maximum number the prime table holds.
+  explicit PreCalculatedPrimeTable(int max)
+      : is_prime_size_(max + 1), is_prime_(new bool[max + 1]) {
+    CalculatePrimesUpTo(max);
+  }
+  ~PreCalculatedPrimeTable() override { delete[] is_prime_; }
+
+  bool IsPrime(int n) const override {
+    return 0 <= n && n < is_prime_size_ && is_prime_[n];
+  }
+
+  int GetNextPrime(int p) const override {
+    for (int n = p + 1; n < is_prime_size_; n++) {
+      if (is_prime_[n]) return n;
+    }
+
+    return -1;
+  }
+
+ private:
+  void CalculatePrimesUpTo(int max) {
+    ::std::fill(is_prime_, is_prime_ + is_prime_size_, true);
+    is_prime_[0] = is_prime_[1] = false;
+
+    // Checks every candidate for prime number (we know that 2 is the only even
+    // prime).
+    for (int i = 2; i*i <= max; i += i%2+1) {
+      if (!is_prime_[i]) continue;
+
+      // Marks all multiples of i (except i itself) as non-prime.
+      // We are starting here from i-th multiplier, because all smaller
+      // complex numbers were already marked.
+      for (int j = i*i; j <= max; j += i) {
+        is_prime_[j] = false;
+      }
+    }
+  }
+
+  const int is_prime_size_;
+  bool* const is_prime_;
+
+  // Disables compiler warning "assignment operator could not be generated."
+  void operator=(const PreCalculatedPrimeTable& rhs);
+};
+
+#endif  // GOOGLETEST_SAMPLES_PRIME_TABLES_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/samples/sample10_unittest.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/samples/sample10_unittest.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/samples/sample10_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/samples/sample10_unittest.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,139 @@
+// Copyright 2009 Google Inc. All Rights Reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+// This sample shows how to use Google Test listener API to implement
+// a primitive leak checker.
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "gtest/gtest.h"
+using ::testing::EmptyTestEventListener;
+using ::testing::InitGoogleTest;
+using ::testing::Test;
+using ::testing::TestEventListeners;
+using ::testing::TestInfo;
+using ::testing::TestPartResult;
+using ::testing::UnitTest;
+
+namespace {
+// We will track memory used by this class.
+class Water {
+ public:
+  // Normal Water declarations go here.
+
+  // operator new and operator delete help us control water allocation.
+  void* operator new(size_t allocation_size) {
+    allocated_++;
+    return malloc(allocation_size);
+  }
+
+  void operator delete(void* block, size_t /* allocation_size */) {
+    allocated_--;
+    free(block);
+  }
+
+  static int allocated() { return allocated_; }
+
+ private:
+  static int allocated_;
+};
+
+int Water::allocated_ = 0;
+
+// This event listener monitors how many Water objects are created and
+// destroyed by each test, and reports a failure if a test leaks some Water
+// objects. It does this by comparing the number of live Water objects at
+// the beginning of a test and at the end of a test.
+class LeakChecker : public EmptyTestEventListener {
+ private:
+  // Called before a test starts.
+  void OnTestStart(const TestInfo& /* test_info */) override {
+    initially_allocated_ = Water::allocated();
+  }
+
+  // Called after a test ends.
+  void OnTestEnd(const TestInfo& /* test_info */) override {
+    int difference = Water::allocated() - initially_allocated_;
+
+    // You can generate a failure in any event handler except
+    // OnTestPartResult. Just use an appropriate Google Test assertion to do
+    // it.
+    EXPECT_LE(difference, 0) << "Leaked " << difference << " unit(s) of Water!";
+  }
+
+  int initially_allocated_;
+};
+
+TEST(ListenersTest, DoesNotLeak) {
+  Water* water = new Water;
+  delete water;
+}
+
+// This should fail when the --check_for_leaks command line flag is
+// specified.
+TEST(ListenersTest, LeaksWater) {
+  Water* water = new Water;
+  EXPECT_TRUE(water != nullptr);
+}
+}  // namespace
+
+int main(int argc, char **argv) {
+  InitGoogleTest(&argc, argv);
+
+  bool check_for_leaks = false;
+  if (argc > 1 && strcmp(argv[1], "--check_for_leaks") == 0 )
+    check_for_leaks = true;
+  else
+    printf("%s\n", "Run this program with --check_for_leaks to enable "
+           "custom leak checking in the tests.");
+
+  // If we are given the --check_for_leaks command line flag, installs the
+  // leak checker.
+  if (check_for_leaks) {
+    TestEventListeners& listeners = UnitTest::GetInstance()->listeners();
+
+    // Adds the leak checker to the end of the test event listener list,
+    // after the default text output printer and the default XML report
+    // generator.
+    //
+    // The order is important - it ensures that failures generated in the
+    // leak checker's OnTestEnd() method are processed by the text and XML
+    // printers *before* their OnTestEnd() methods are called, such that
+    // they are attributed to the right test. Remember that a listener
+    // receives an OnXyzStart event *after* listeners preceding it in the
+    // list received that event, and receives an OnXyzEnd event *before*
+    // listeners preceding it.
+    //
+    // We don't need to worry about deleting the new listener later, as
+    // Google Test will do it.
+    listeners.Append(new LeakChecker);
+  }
+  return RUN_ALL_TESTS();
+}
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/samples/sample1.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/samples/sample1.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/samples/sample1.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/samples/sample1.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,66 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// A sample program demonstrating using Google C++ testing framework.
+
+#include "sample1.h"
+
+// Returns n! (the factorial of n).  For negative n, n! is defined to be 1.
+int Factorial(int n) {
+  int result = 1;
+  for (int i = 1; i <= n; i++) {
+    result *= i;
+  }
+
+  return result;
+}
+
+// Returns true if and only if n is a prime number.
+bool IsPrime(int n) {
+  // Trivial case 1: small numbers
+  if (n <= 1) return false;
+
+  // Trivial case 2: even numbers
+  if (n % 2 == 0) return n == 2;
+
+  // Now, we have that n is odd and n >= 3.
+
+  // Try to divide n by every odd number i, starting from 3
+  for (int i = 3; ; i += 2) {
+    // We only have to try i up to the square root of n
+    if (i > n/i) break;
+
+    // Now, we have i <= n/i < n.
+    // If n is divisible by i, n is not prime.
+    if (n % i == 0) return false;
+  }
+
+  // n has no integer factor in the range (1, n), and thus is prime.
+  return true;
+}
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/samples/sample1.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/samples/sample1.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/samples/sample1.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/samples/sample1.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,41 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// A sample program demonstrating using Google C++ testing framework.
+
+#ifndef GOOGLETEST_SAMPLES_SAMPLE1_H_
+#define GOOGLETEST_SAMPLES_SAMPLE1_H_
+
+// Returns n! (the factorial of n).  For negative n, n! is defined to be 1.
+int Factorial(int n);
+
+// Returns true if and only if n is a prime number.
+bool IsPrime(int n);
+
+#endif  // GOOGLETEST_SAMPLES_SAMPLE1_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/samples/sample1_unittest.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/samples/sample1_unittest.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/samples/sample1_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/samples/sample1_unittest.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,151 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// A sample program demonstrating using Google C++ testing framework.
+
+// This sample shows how to write a simple unit test for a function,
+// using Google C++ testing framework.
+//
+// Writing a unit test using Google C++ testing framework is easy as 1-2-3:
+
+
+// Step 1. Include necessary header files such that the stuff your
+// test logic needs is declared.
+//
+// Don't forget gtest.h, which declares the testing framework.
+
+#include <limits.h>
+#include "sample1.h"
+#include "gtest/gtest.h"
+namespace {
+
+// Step 2. Use the TEST macro to define your tests.
+//
+// TEST has two parameters: the test case name and the test name.
+// After using the macro, you should define your test logic between a
+// pair of braces.  You can use a bunch of macros to indicate the
+// success or failure of a test.  EXPECT_TRUE and EXPECT_EQ are
+// examples of such macros.  For a complete list, see gtest.h.
+//
+// <TechnicalDetails>
+//
+// In Google Test, tests are grouped into test cases.  This is how we
+// keep test code organized.  You should put logically related tests
+// into the same test case.
+//
+// The test case name and the test name should both be valid C++
+// identifiers.  And you should not use underscore (_) in the names.
+//
+// Google Test guarantees that each test you define is run exactly
+// once, but it makes no guarantee on the order the tests are
+// executed.  Therefore, you should write your tests in such a way
+// that their results don't depend on their order.
+//
+// </TechnicalDetails>
+
+
+// Tests Factorial().
+
+// Tests factorial of negative numbers.
+TEST(FactorialTest, Negative) {
+  // This test is named "Negative", and belongs to the "FactorialTest"
+  // test case.
+  EXPECT_EQ(1, Factorial(-5));
+  EXPECT_EQ(1, Factorial(-1));
+  EXPECT_GT(Factorial(-10), 0);
+
+  // <TechnicalDetails>
+  //
+  // EXPECT_EQ(expected, actual) is the same as
+  //
+  //   EXPECT_TRUE((expected) == (actual))
+  //
+  // except that it will print both the expected value and the actual
+  // value when the assertion fails.  This is very helpful for
+  // debugging.  Therefore in this case EXPECT_EQ is preferred.
+  //
+  // On the other hand, EXPECT_TRUE accepts any Boolean expression,
+  // and is thus more general.
+  //
+  // </TechnicalDetails>
+}
+
+// Tests factorial of 0.
+TEST(FactorialTest, Zero) {
+  EXPECT_EQ(1, Factorial(0));
+}
+
+// Tests factorial of positive numbers.
+TEST(FactorialTest, Positive) {
+  EXPECT_EQ(1, Factorial(1));
+  EXPECT_EQ(2, Factorial(2));
+  EXPECT_EQ(6, Factorial(3));
+  EXPECT_EQ(40320, Factorial(8));
+}
+
+
+// Tests IsPrime()
+
+// Tests negative input.
+TEST(IsPrimeTest, Negative) {
+  // This test belongs to the IsPrimeTest test case.
+
+  EXPECT_FALSE(IsPrime(-1));
+  EXPECT_FALSE(IsPrime(-2));
+  EXPECT_FALSE(IsPrime(INT_MIN));
+}
+
+// Tests some trivial cases.
+TEST(IsPrimeTest, Trivial) {
+  EXPECT_FALSE(IsPrime(0));
+  EXPECT_FALSE(IsPrime(1));
+  EXPECT_TRUE(IsPrime(2));
+  EXPECT_TRUE(IsPrime(3));
+}
+
+// Tests positive input.
+TEST(IsPrimeTest, Positive) {
+  EXPECT_FALSE(IsPrime(4));
+  EXPECT_TRUE(IsPrime(5));
+  EXPECT_FALSE(IsPrime(6));
+  EXPECT_TRUE(IsPrime(23));
+}
+}  // namespace
+
+// Step 3. Call RUN_ALL_TESTS() in main().
+//
+// We do this by linking in src/gtest_main.cc file, which consists of
+// a main() function which calls RUN_ALL_TESTS() for us.
+//
+// This runs all the tests you've defined, prints the result, and
+// returns 0 if successful, or 1 otherwise.
+//
+// Did you notice that we didn't register the tests?  The
+// RUN_ALL_TESTS() macro magically knows about all the tests we
+// defined.  Isn't this convenient?
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/samples/sample2.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/samples/sample2.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/samples/sample2.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/samples/sample2.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,54 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// A sample program demonstrating using Google C++ testing framework.
+
+#include "sample2.h"
+
+#include <string.h>
+
+// Clones a 0-terminated C string, allocating memory using new.
+const char* MyString::CloneCString(const char* a_c_string) {
+  if (a_c_string == nullptr) return nullptr;
+
+  const size_t len = strlen(a_c_string);
+  char* const clone = new char[ len + 1 ];
+  memcpy(clone, a_c_string, len + 1);
+
+  return clone;
+}
+
+// Sets the 0-terminated C string this MyString object
+// represents.
+void MyString::Set(const char* a_c_string) {
+  // Makes sure this works when c_string == c_string_
+  const char* const temp = MyString::CloneCString(a_c_string);
+  delete[] c_string_;
+  c_string_ = temp;
+}
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/samples/sample2.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/samples/sample2.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/samples/sample2.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/samples/sample2.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,80 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// A sample program demonstrating using Google C++ testing framework.
+
+#ifndef GOOGLETEST_SAMPLES_SAMPLE2_H_
+#define GOOGLETEST_SAMPLES_SAMPLE2_H_
+
+#include <string.h>
+
+
+// A simple string class.
+class MyString {
+ private:
+  const char* c_string_;
+  const MyString& operator=(const MyString& rhs);
+
+ public:
+  // Clones a 0-terminated C string, allocating memory using new.
+  static const char* CloneCString(const char* a_c_string);
+
+  ////////////////////////////////////////////////////////////
+  //
+  // C'tors
+
+  // The default c'tor constructs a NULL string.
+  MyString() : c_string_(nullptr) {}
+
+  // Constructs a MyString by cloning a 0-terminated C string.
+  explicit MyString(const char* a_c_string) : c_string_(nullptr) {
+    Set(a_c_string);
+  }
+
+  // Copy c'tor
+  MyString(const MyString& string) : c_string_(nullptr) {
+    Set(string.c_string_);
+  }
+
+  ////////////////////////////////////////////////////////////
+  //
+  // D'tor.  MyString is intended to be a final class, so the d'tor
+  // doesn't need to be virtual.
+  ~MyString() { delete[] c_string_; }
+
+  // Gets the 0-terminated C string this MyString object represents.
+  const char* c_string() const { return c_string_; }
+
+  size_t Length() const { return c_string_ == nullptr ? 0 : strlen(c_string_); }
+
+  // Sets the 0-terminated C string this MyString object represents.
+  void Set(const char* c_string);
+};
+
+#endif  // GOOGLETEST_SAMPLES_SAMPLE2_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/samples/sample2_unittest.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/samples/sample2_unittest.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/samples/sample2_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/samples/sample2_unittest.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,107 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// A sample program demonstrating using Google C++ testing framework.
+
+// This sample shows how to write a more complex unit test for a class
+// that has multiple member functions.
+//
+// Usually, it's a good idea to have one test for each method in your
+// class.  You don't have to do that exactly, but it helps to keep
+// your tests organized.  You may also throw in additional tests as
+// needed.
+
+#include "sample2.h"
+#include "gtest/gtest.h"
+namespace {
+// In this example, we test the MyString class (a simple string).
+
+// Tests the default c'tor.
+TEST(MyString, DefaultConstructor) {
+  const MyString s;
+
+  // Asserts that s.c_string() returns NULL.
+  //
+  // <TechnicalDetails>
+  //
+  // If we write NULL instead of
+  //
+  //   static_cast<const char *>(NULL)
+  //
+  // in this assertion, it will generate a warning on gcc 3.4.  The
+  // reason is that EXPECT_EQ needs to know the types of its
+  // arguments in order to print them when it fails.  Since NULL is
+  // #defined as 0, the compiler will use the formatter function for
+  // int to print it.  However, gcc thinks that NULL should be used as
+  // a pointer, not an int, and therefore complains.
+  //
+  // The root of the problem is C++'s lack of distinction between the
+  // integer number 0 and the null pointer constant.  Unfortunately,
+  // we have to live with this fact.
+  //
+  // </TechnicalDetails>
+  EXPECT_STREQ(nullptr, s.c_string());
+
+  EXPECT_EQ(0u, s.Length());
+}
+
+const char kHelloString[] = "Hello, world!";
+
+// Tests the c'tor that accepts a C string.
+TEST(MyString, ConstructorFromCString) {
+  const MyString s(kHelloString);
+  EXPECT_EQ(0, strcmp(s.c_string(), kHelloString));
+  EXPECT_EQ(sizeof(kHelloString)/sizeof(kHelloString[0]) - 1,
+            s.Length());
+}
+
+// Tests the copy c'tor.
+TEST(MyString, CopyConstructor) {
+  const MyString s1(kHelloString);
+  const MyString s2 = s1;
+  EXPECT_EQ(0, strcmp(s2.c_string(), kHelloString));
+}
+
+// Tests the Set method.
+TEST(MyString, Set) {
+  MyString s;
+
+  s.Set(kHelloString);
+  EXPECT_EQ(0, strcmp(s.c_string(), kHelloString));
+
+  // Set should work when the input pointer is the same as the one
+  // already in the MyString object.
+  s.Set(s.c_string());
+  EXPECT_EQ(0, strcmp(s.c_string(), kHelloString));
+
+  // Can we set the MyString to NULL?
+  s.Set(nullptr);
+  EXPECT_STREQ(nullptr, s.c_string());
+}
+}  // namespace
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/samples/sample3-inl.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/samples/sample3-inl.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/samples/sample3-inl.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/samples/sample3-inl.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,172 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// A sample program demonstrating using Google C++ testing framework.
+
+#ifndef GOOGLETEST_SAMPLES_SAMPLE3_INL_H_
+#define GOOGLETEST_SAMPLES_SAMPLE3_INL_H_
+
+#include <stddef.h>
+
+
+// Queue is a simple queue implemented as a singled-linked list.
+//
+// The element type must support copy constructor.
+template <typename E>  // E is the element type
+class Queue;
+
+// QueueNode is a node in a Queue, which consists of an element of
+// type E and a pointer to the next node.
+template <typename E>  // E is the element type
+class QueueNode {
+  friend class Queue<E>;
+
+ public:
+  // Gets the element in this node.
+  const E& element() const { return element_; }
+
+  // Gets the next node in the queue.
+  QueueNode* next() { return next_; }
+  const QueueNode* next() const { return next_; }
+
+ private:
+  // Creates a node with a given element value.  The next pointer is
+  // set to NULL.
+  explicit QueueNode(const E& an_element)
+      : element_(an_element), next_(nullptr) {}
+
+  // We disable the default assignment operator and copy c'tor.
+  const QueueNode& operator = (const QueueNode&);
+  QueueNode(const QueueNode&);
+
+  E element_;
+  QueueNode* next_;
+};
+
+template <typename E>  // E is the element type.
+class Queue {
+ public:
+  // Creates an empty queue.
+  Queue() : head_(nullptr), last_(nullptr), size_(0) {}
+
+  // D'tor.  Clears the queue.
+  ~Queue() { Clear(); }
+
+  // Clears the queue.
+  void Clear() {
+    if (size_ > 0) {
+      // 1. Deletes every node.
+      QueueNode<E>* node = head_;
+      QueueNode<E>* next = node->next();
+      for (; ;) {
+        delete node;
+        node = next;
+        if (node == nullptr) break;
+        next = node->next();
+      }
+
+      // 2. Resets the member variables.
+      head_ = last_ = nullptr;
+      size_ = 0;
+    }
+  }
+
+  // Gets the number of elements.
+  size_t Size() const { return size_; }
+
+  // Gets the first element of the queue, or NULL if the queue is empty.
+  QueueNode<E>* Head() { return head_; }
+  const QueueNode<E>* Head() const { return head_; }
+
+  // Gets the last element of the queue, or NULL if the queue is empty.
+  QueueNode<E>* Last() { return last_; }
+  const QueueNode<E>* Last() const { return last_; }
+
+  // Adds an element to the end of the queue.  A copy of the element is
+  // created using the copy constructor, and then stored in the queue.
+  // Changes made to the element in the queue doesn't affect the source
+  // object, and vice versa.
+  void Enqueue(const E& element) {
+    QueueNode<E>* new_node = new QueueNode<E>(element);
+
+    if (size_ == 0) {
+      head_ = last_ = new_node;
+      size_ = 1;
+    } else {
+      last_->next_ = new_node;
+      last_ = new_node;
+      size_++;
+    }
+  }
+
+  // Removes the head of the queue and returns it.  Returns NULL if
+  // the queue is empty.
+  E* Dequeue() {
+    if (size_ == 0) {
+      return nullptr;
+    }
+
+    const QueueNode<E>* const old_head = head_;
+    head_ = head_->next_;
+    size_--;
+    if (size_ == 0) {
+      last_ = nullptr;
+    }
+
+    E* element = new E(old_head->element());
+    delete old_head;
+
+    return element;
+  }
+
+  // Applies a function/functor on each element of the queue, and
+  // returns the result in a new queue.  The original queue is not
+  // affected.
+  template <typename F>
+  Queue* Map(F function) const {
+    Queue* new_queue = new Queue();
+    for (const QueueNode<E>* node = head_; node != nullptr;
+         node = node->next_) {
+      new_queue->Enqueue(function(node->element()));
+    }
+
+    return new_queue;
+  }
+
+ private:
+  QueueNode<E>* head_;  // The first node of the queue.
+  QueueNode<E>* last_;  // The last node of the queue.
+  size_t size_;  // The number of elements in the queue.
+
+  // We disallow copying a queue.
+  Queue(const Queue&);
+  const Queue& operator = (const Queue&);
+};
+
+#endif  // GOOGLETEST_SAMPLES_SAMPLE3_INL_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/samples/sample3_unittest.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/samples/sample3_unittest.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/samples/sample3_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/samples/sample3_unittest.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,149 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// A sample program demonstrating using Google C++ testing framework.
+
+// In this example, we use a more advanced feature of Google Test called
+// test fixture.
+//
+// A test fixture is a place to hold objects and functions shared by
+// all tests in a test case.  Using a test fixture avoids duplicating
+// the test code necessary to initialize and cleanup those common
+// objects for each test.  It is also useful for defining sub-routines
+// that your tests need to invoke a lot.
+//
+// <TechnicalDetails>
+//
+// The tests share the test fixture in the sense of code sharing, not
+// data sharing.  Each test is given its own fresh copy of the
+// fixture.  You cannot expect the data modified by one test to be
+// passed on to another test, which is a bad idea.
+//
+// The reason for this design is that tests should be independent and
+// repeatable.  In particular, a test should not fail as the result of
+// another test's failure.  If one test depends on info produced by
+// another test, then the two tests should really be one big test.
+//
+// The macros for indicating the success/failure of a test
+// (EXPECT_TRUE, FAIL, etc) need to know what the current test is
+// (when Google Test prints the test result, it tells you which test
+// each failure belongs to).  Technically, these macros invoke a
+// member function of the Test class.  Therefore, you cannot use them
+// in a global function.  That's why you should put test sub-routines
+// in a test fixture.
+//
+// </TechnicalDetails>
+
+#include "sample3-inl.h"
+#include "gtest/gtest.h"
+namespace {
+// To use a test fixture, derive a class from testing::Test.
+class QueueTestSmpl3 : public testing::Test {
+ protected:  // You should make the members protected s.t. they can be
+             // accessed from sub-classes.
+
+  // virtual void SetUp() will be called before each test is run.  You
+  // should define it if you need to initialize the variables.
+  // Otherwise, this can be skipped.
+  void SetUp() override {
+    q1_.Enqueue(1);
+    q2_.Enqueue(2);
+    q2_.Enqueue(3);
+  }
+
+  // virtual void TearDown() will be called after each test is run.
+  // You should define it if there is cleanup work to do.  Otherwise,
+  // you don't have to provide it.
+  //
+  // virtual void TearDown() {
+  // }
+
+  // A helper function that some test uses.
+  static int Double(int n) {
+    return 2*n;
+  }
+
+  // A helper function for testing Queue::Map().
+  void MapTester(const Queue<int> * q) {
+    // Creates a new queue, where each element is twice as big as the
+    // corresponding one in q.
+    const Queue<int> * const new_q = q->Map(Double);
+
+    // Verifies that the new queue has the same size as q.
+    ASSERT_EQ(q->Size(), new_q->Size());
+
+    // Verifies the relationship between the elements of the two queues.
+    for (const QueueNode<int>*n1 = q->Head(), *n2 = new_q->Head();
+         n1 != nullptr; n1 = n1->next(), n2 = n2->next()) {
+      EXPECT_EQ(2 * n1->element(), n2->element());
+    }
+
+    delete new_q;
+  }
+
+  // Declares the variables your tests want to use.
+  Queue<int> q0_;
+  Queue<int> q1_;
+  Queue<int> q2_;
+};
+
+// When you have a test fixture, you define a test using TEST_F
+// instead of TEST.
+
+// Tests the default c'tor.
+TEST_F(QueueTestSmpl3, DefaultConstructor) {
+  // You can access data in the test fixture here.
+  EXPECT_EQ(0u, q0_.Size());
+}
+
+// Tests Dequeue().
+TEST_F(QueueTestSmpl3, Dequeue) {
+  int * n = q0_.Dequeue();
+  EXPECT_TRUE(n == nullptr);
+
+  n = q1_.Dequeue();
+  ASSERT_TRUE(n != nullptr);
+  EXPECT_EQ(1, *n);
+  EXPECT_EQ(0u, q1_.Size());
+  delete n;
+
+  n = q2_.Dequeue();
+  ASSERT_TRUE(n != nullptr);
+  EXPECT_EQ(2, *n);
+  EXPECT_EQ(1u, q2_.Size());
+  delete n;
+}
+
+// Tests the Queue::Map() function.
+TEST_F(QueueTestSmpl3, Map) {
+  MapTester(&q0_);
+  MapTester(&q1_);
+  MapTester(&q2_);
+}
+}  // namespace
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/samples/sample4.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/samples/sample4.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/samples/sample4.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/samples/sample4.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,54 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// A sample program demonstrating using Google C++ testing framework.
+
+#include <stdio.h>
+
+#include "sample4.h"
+
+// Returns the current counter value, and increments it.
+int Counter::Increment() {
+  return counter_++;
+}
+
+// Returns the current counter value, and decrements it.
+// counter can not be less than 0, return 0 in this case
+int Counter::Decrement() {
+  if (counter_ == 0) {
+    return counter_;
+  } else  {
+    return counter_--;
+  }
+}
+
+// Prints the current counter value to STDOUT.
+void Counter::Print() const {
+  printf("%d", counter_);
+}
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/samples/sample4.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/samples/sample4.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/samples/sample4.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/samples/sample4.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,53 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// A sample program demonstrating using Google C++ testing framework.
+#ifndef GOOGLETEST_SAMPLES_SAMPLE4_H_
+#define GOOGLETEST_SAMPLES_SAMPLE4_H_
+
+// A simple monotonic counter.
+class Counter {
+ private:
+  int counter_;
+
+ public:
+  // Creates a counter that starts at 0.
+  Counter() : counter_(0) {}
+
+  // Returns the current counter value, and increments it.
+  int Increment();
+
+  // Returns the current counter value, and decrements it.
+  int Decrement();
+
+  // Prints the current counter value to STDOUT.
+  void Print() const;
+};
+
+#endif  // GOOGLETEST_SAMPLES_SAMPLE4_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/samples/sample4_unittest.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/samples/sample4_unittest.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/samples/sample4_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/samples/sample4_unittest.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,53 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+#include "sample4.h"
+#include "gtest/gtest.h"
+
+namespace {
+// Tests the Increment() method.
+
+TEST(Counter, Increment) {
+  Counter c;
+
+  // Test that counter 0 returns 0
+  EXPECT_EQ(0, c.Decrement());
+
+  // EXPECT_EQ() evaluates its arguments exactly once, so they
+  // can have side effects.
+
+  EXPECT_EQ(0, c.Increment());
+  EXPECT_EQ(1, c.Increment());
+  EXPECT_EQ(2, c.Increment());
+
+  EXPECT_EQ(3, c.Decrement());
+}
+
+}  // namespace
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/samples/sample5_unittest.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/samples/sample5_unittest.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/samples/sample5_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/samples/sample5_unittest.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,196 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+// This sample teaches how to reuse a test fixture in multiple test
+// cases by deriving sub-fixtures from it.
+//
+// When you define a test fixture, you specify the name of the test
+// case that will use this fixture.  Therefore, a test fixture can
+// be used by only one test case.
+//
+// Sometimes, more than one test cases may want to use the same or
+// slightly different test fixtures.  For example, you may want to
+// make sure that all tests for a GUI library don't leak important
+// system resources like fonts and brushes.  In Google Test, you do
+// this by putting the shared logic in a super (as in "super class")
+// test fixture, and then have each test case use a fixture derived
+// from this super fixture.
+
+#include <limits.h>
+#include <time.h>
+#include "gtest/gtest.h"
+#include "sample1.h"
+#include "sample3-inl.h"
+namespace {
+// In this sample, we want to ensure that every test finishes within
+// ~5 seconds.  If a test takes longer to run, we consider it a
+// failure.
+//
+// We put the code for timing a test in a test fixture called
+// "QuickTest".  QuickTest is intended to be the super fixture that
+// other fixtures derive from, therefore there is no test case with
+// the name "QuickTest".  This is OK.
+//
+// Later, we will derive multiple test fixtures from QuickTest.
+class QuickTest : public testing::Test {
+ protected:
+  // Remember that SetUp() is run immediately before a test starts.
+  // This is a good place to record the start time.
+  void SetUp() override { start_time_ = time(nullptr); }
+
+  // TearDown() is invoked immediately after a test finishes.  Here we
+  // check if the test was too slow.
+  void TearDown() override {
+    // Gets the time when the test finishes
+    const time_t end_time = time(nullptr);
+
+    // Asserts that the test took no more than ~5 seconds.  Did you
+    // know that you can use assertions in SetUp() and TearDown() as
+    // well?
+    EXPECT_TRUE(end_time - start_time_ <= 5) << "The test took too long.";
+  }
+
+  // The UTC time (in seconds) when the test starts
+  time_t start_time_;
+};
+
+
+// We derive a fixture named IntegerFunctionTest from the QuickTest
+// fixture.  All tests using this fixture will be automatically
+// required to be quick.
+class IntegerFunctionTest : public QuickTest {
+  // We don't need any more logic than already in the QuickTest fixture.
+  // Therefore the body is empty.
+};
+
+
+// Now we can write tests in the IntegerFunctionTest test case.
+
+// Tests Factorial()
+TEST_F(IntegerFunctionTest, Factorial) {
+  // Tests factorial of negative numbers.
+  EXPECT_EQ(1, Factorial(-5));
+  EXPECT_EQ(1, Factorial(-1));
+  EXPECT_GT(Factorial(-10), 0);
+
+  // Tests factorial of 0.
+  EXPECT_EQ(1, Factorial(0));
+
+  // Tests factorial of positive numbers.
+  EXPECT_EQ(1, Factorial(1));
+  EXPECT_EQ(2, Factorial(2));
+  EXPECT_EQ(6, Factorial(3));
+  EXPECT_EQ(40320, Factorial(8));
+}
+
+
+// Tests IsPrime()
+TEST_F(IntegerFunctionTest, IsPrime) {
+  // Tests negative input.
+  EXPECT_FALSE(IsPrime(-1));
+  EXPECT_FALSE(IsPrime(-2));
+  EXPECT_FALSE(IsPrime(INT_MIN));
+
+  // Tests some trivial cases.
+  EXPECT_FALSE(IsPrime(0));
+  EXPECT_FALSE(IsPrime(1));
+  EXPECT_TRUE(IsPrime(2));
+  EXPECT_TRUE(IsPrime(3));
+
+  // Tests positive input.
+  EXPECT_FALSE(IsPrime(4));
+  EXPECT_TRUE(IsPrime(5));
+  EXPECT_FALSE(IsPrime(6));
+  EXPECT_TRUE(IsPrime(23));
+}
+
+
+// The next test case (named "QueueTest") also needs to be quick, so
+// we derive another fixture from QuickTest.
+//
+// The QueueTest test fixture has some logic and shared objects in
+// addition to what's in QuickTest already.  We define the additional
+// stuff inside the body of the test fixture, as usual.
+class QueueTest : public QuickTest {
+ protected:
+  void SetUp() override {
+    // First, we need to set up the super fixture (QuickTest).
+    QuickTest::SetUp();
+
+    // Second, some additional setup for this fixture.
+    q1_.Enqueue(1);
+    q2_.Enqueue(2);
+    q2_.Enqueue(3);
+  }
+
+  // By default, TearDown() inherits the behavior of
+  // QuickTest::TearDown().  As we have no additional cleaning work
+  // for QueueTest, we omit it here.
+  //
+  // virtual void TearDown() {
+  //   QuickTest::TearDown();
+  // }
+
+  Queue<int> q0_;
+  Queue<int> q1_;
+  Queue<int> q2_;
+};
+
+
+// Now, let's write tests using the QueueTest fixture.
+
+// Tests the default constructor.
+TEST_F(QueueTest, DefaultConstructor) {
+  EXPECT_EQ(0u, q0_.Size());
+}
+
+// Tests Dequeue().
+TEST_F(QueueTest, Dequeue) {
+  int* n = q0_.Dequeue();
+  EXPECT_TRUE(n == nullptr);
+
+  n = q1_.Dequeue();
+  EXPECT_TRUE(n != nullptr);
+  EXPECT_EQ(1, *n);
+  EXPECT_EQ(0u, q1_.Size());
+  delete n;
+
+  n = q2_.Dequeue();
+  EXPECT_TRUE(n != nullptr);
+  EXPECT_EQ(2, *n);
+  EXPECT_EQ(1u, q2_.Size());
+  delete n;
+}
+}  // namespace
+// If necessary, you can derive further test fixtures from a derived
+// fixture itself.  For example, you can derive another fixture from
+// QueueTest.  Google Test imposes no limit on how deep the hierarchy
+// can be.  In practice, however, you probably don't want it to be too
+// deep as to be confusing.
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/samples/sample6_unittest.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/samples/sample6_unittest.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/samples/sample6_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/samples/sample6_unittest.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,217 @@
+// Copyright 2008 Google Inc.
+// All Rights Reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+// This sample shows how to test common properties of multiple
+// implementations of the same interface (aka interface tests).
+
+// The interface and its implementations are in this header.
+#include "prime_tables.h"
+
+#include "gtest/gtest.h"
+namespace {
+// First, we define some factory functions for creating instances of
+// the implementations.  You may be able to skip this step if all your
+// implementations can be constructed the same way.
+
+template <class T>
+PrimeTable* CreatePrimeTable();
+
+template <>
+PrimeTable* CreatePrimeTable<OnTheFlyPrimeTable>() {
+  return new OnTheFlyPrimeTable;
+}
+
+template <>
+PrimeTable* CreatePrimeTable<PreCalculatedPrimeTable>() {
+  return new PreCalculatedPrimeTable(10000);
+}
+
+// Then we define a test fixture class template.
+template <class T>
+class PrimeTableTest : public testing::Test {
+ protected:
+  // The ctor calls the factory function to create a prime table
+  // implemented by T.
+  PrimeTableTest() : table_(CreatePrimeTable<T>()) {}
+
+  ~PrimeTableTest() override { delete table_; }
+
+  // Note that we test an implementation via the base interface
+  // instead of the actual implementation class.  This is important
+  // for keeping the tests close to the real world scenario, where the
+  // implementation is invoked via the base interface.  It avoids
+  // got-yas where the implementation class has a method that shadows
+  // a method with the same name (but slightly different argument
+  // types) in the base interface, for example.
+  PrimeTable* const table_;
+};
+
+using testing::Types;
+
+// Google Test offers two ways for reusing tests for different types.
+// The first is called "typed tests".  You should use it if you
+// already know *all* the types you are gonna exercise when you write
+// the tests.
+
+// To write a typed test case, first use
+//
+//   TYPED_TEST_SUITE(TestCaseName, TypeList);
+//
+// to declare it and specify the type parameters.  As with TEST_F,
+// TestCaseName must match the test fixture name.
+
+// The list of types we want to test.
+typedef Types<OnTheFlyPrimeTable, PreCalculatedPrimeTable> Implementations;
+
+TYPED_TEST_SUITE(PrimeTableTest, Implementations);
+
+// Then use TYPED_TEST(TestCaseName, TestName) to define a typed test,
+// similar to TEST_F.
+TYPED_TEST(PrimeTableTest, ReturnsFalseForNonPrimes) {
+  // Inside the test body, you can refer to the type parameter by
+  // TypeParam, and refer to the fixture class by TestFixture.  We
+  // don't need them in this example.
+
+  // Since we are in the template world, C++ requires explicitly
+  // writing 'this->' when referring to members of the fixture class.
+  // This is something you have to learn to live with.
+  EXPECT_FALSE(this->table_->IsPrime(-5));
+  EXPECT_FALSE(this->table_->IsPrime(0));
+  EXPECT_FALSE(this->table_->IsPrime(1));
+  EXPECT_FALSE(this->table_->IsPrime(4));
+  EXPECT_FALSE(this->table_->IsPrime(6));
+  EXPECT_FALSE(this->table_->IsPrime(100));
+}
+
+TYPED_TEST(PrimeTableTest, ReturnsTrueForPrimes) {
+  EXPECT_TRUE(this->table_->IsPrime(2));
+  EXPECT_TRUE(this->table_->IsPrime(3));
+  EXPECT_TRUE(this->table_->IsPrime(5));
+  EXPECT_TRUE(this->table_->IsPrime(7));
+  EXPECT_TRUE(this->table_->IsPrime(11));
+  EXPECT_TRUE(this->table_->IsPrime(131));
+}
+
+TYPED_TEST(PrimeTableTest, CanGetNextPrime) {
+  EXPECT_EQ(2, this->table_->GetNextPrime(0));
+  EXPECT_EQ(3, this->table_->GetNextPrime(2));
+  EXPECT_EQ(5, this->table_->GetNextPrime(3));
+  EXPECT_EQ(7, this->table_->GetNextPrime(5));
+  EXPECT_EQ(11, this->table_->GetNextPrime(7));
+  EXPECT_EQ(131, this->table_->GetNextPrime(128));
+}
+
+// That's it!  Google Test will repeat each TYPED_TEST for each type
+// in the type list specified in TYPED_TEST_SUITE.  Sit back and be
+// happy that you don't have to define them multiple times.
+
+using testing::Types;
+
+// Sometimes, however, you don't yet know all the types that you want
+// to test when you write the tests.  For example, if you are the
+// author of an interface and expect other people to implement it, you
+// might want to write a set of tests to make sure each implementation
+// conforms to some basic requirements, but you don't know what
+// implementations will be written in the future.
+//
+// How can you write the tests without committing to the type
+// parameters?  That's what "type-parameterized tests" can do for you.
+// It is a bit more involved than typed tests, but in return you get a
+// test pattern that can be reused in many contexts, which is a big
+// win.  Here's how you do it:
+
+// First, define a test fixture class template.  Here we just reuse
+// the PrimeTableTest fixture defined earlier:
+
+template <class T>
+class PrimeTableTest2 : public PrimeTableTest<T> {
+};
+
+// Then, declare the test case.  The argument is the name of the test
+// fixture, and also the name of the test case (as usual).  The _P
+// suffix is for "parameterized" or "pattern".
+TYPED_TEST_SUITE_P(PrimeTableTest2);
+
+// Next, use TYPED_TEST_P(TestCaseName, TestName) to define a test,
+// similar to what you do with TEST_F.
+TYPED_TEST_P(PrimeTableTest2, ReturnsFalseForNonPrimes) {
+  EXPECT_FALSE(this->table_->IsPrime(-5));
+  EXPECT_FALSE(this->table_->IsPrime(0));
+  EXPECT_FALSE(this->table_->IsPrime(1));
+  EXPECT_FALSE(this->table_->IsPrime(4));
+  EXPECT_FALSE(this->table_->IsPrime(6));
+  EXPECT_FALSE(this->table_->IsPrime(100));
+}
+
+TYPED_TEST_P(PrimeTableTest2, ReturnsTrueForPrimes) {
+  EXPECT_TRUE(this->table_->IsPrime(2));
+  EXPECT_TRUE(this->table_->IsPrime(3));
+  EXPECT_TRUE(this->table_->IsPrime(5));
+  EXPECT_TRUE(this->table_->IsPrime(7));
+  EXPECT_TRUE(this->table_->IsPrime(11));
+  EXPECT_TRUE(this->table_->IsPrime(131));
+}
+
+TYPED_TEST_P(PrimeTableTest2, CanGetNextPrime) {
+  EXPECT_EQ(2, this->table_->GetNextPrime(0));
+  EXPECT_EQ(3, this->table_->GetNextPrime(2));
+  EXPECT_EQ(5, this->table_->GetNextPrime(3));
+  EXPECT_EQ(7, this->table_->GetNextPrime(5));
+  EXPECT_EQ(11, this->table_->GetNextPrime(7));
+  EXPECT_EQ(131, this->table_->GetNextPrime(128));
+}
+
+// Type-parameterized tests involve one extra step: you have to
+// enumerate the tests you defined:
+REGISTER_TYPED_TEST_SUITE_P(
+    PrimeTableTest2,  // The first argument is the test case name.
+    // The rest of the arguments are the test names.
+    ReturnsFalseForNonPrimes, ReturnsTrueForPrimes, CanGetNextPrime);
+
+// At this point the test pattern is done.  However, you don't have
+// any real test yet as you haven't said which types you want to run
+// the tests with.
+
+// To turn the abstract test pattern into real tests, you instantiate
+// it with a list of types.  Usually the test pattern will be defined
+// in a .h file, and anyone can #include and instantiate it.  You can
+// even instantiate it more than once in the same program.  To tell
+// different instances apart, you give each of them a name, which will
+// become part of the test case name and can be used in test filters.
+
+// The list of types we want to test.  Note that it doesn't have to be
+// defined at the time we write the TYPED_TEST_P()s.
+typedef Types<OnTheFlyPrimeTable, PreCalculatedPrimeTable>
+    PrimeTableImplementations;
+INSTANTIATE_TYPED_TEST_SUITE_P(OnTheFlyAndPreCalculated,    // Instance name
+                               PrimeTableTest2,             // Test case name
+                               PrimeTableImplementations);  // Type list
+
+}  // namespace
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/samples/sample7_unittest.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/samples/sample7_unittest.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/samples/sample7_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/samples/sample7_unittest.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,117 @@
+// Copyright 2008 Google Inc.
+// All Rights Reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+// This sample shows how to test common properties of multiple
+// implementations of an interface (aka interface tests) using
+// value-parameterized tests. Each test in the test case has
+// a parameter that is an interface pointer to an implementation
+// tested.
+
+// The interface and its implementations are in this header.
+#include "prime_tables.h"
+
+#include "gtest/gtest.h"
+namespace {
+
+using ::testing::TestWithParam;
+using ::testing::Values;
+
+// As a general rule, to prevent a test from affecting the tests that come
+// after it, you should create and destroy the tested objects for each test
+// instead of reusing them.  In this sample we will define a simple factory
+// function for PrimeTable objects.  We will instantiate objects in test's
+// SetUp() method and delete them in TearDown() method.
+typedef PrimeTable* CreatePrimeTableFunc();
+
+PrimeTable* CreateOnTheFlyPrimeTable() {
+  return new OnTheFlyPrimeTable();
+}
+
+template <size_t max_precalculated>
+PrimeTable* CreatePreCalculatedPrimeTable() {
+  return new PreCalculatedPrimeTable(max_precalculated);
+}
+
+// Inside the test body, fixture constructor, SetUp(), and TearDown() you
+// can refer to the test parameter by GetParam().  In this case, the test
+// parameter is a factory function which we call in fixture's SetUp() to
+// create and store an instance of PrimeTable.
+class PrimeTableTestSmpl7 : public TestWithParam<CreatePrimeTableFunc*> {
+ public:
+  ~PrimeTableTestSmpl7() override { delete table_; }
+  void SetUp() override { table_ = (*GetParam())(); }
+  void TearDown() override {
+    delete table_;
+    table_ = nullptr;
+  }
+
+ protected:
+  PrimeTable* table_;
+};
+
+TEST_P(PrimeTableTestSmpl7, ReturnsFalseForNonPrimes) {
+  EXPECT_FALSE(table_->IsPrime(-5));
+  EXPECT_FALSE(table_->IsPrime(0));
+  EXPECT_FALSE(table_->IsPrime(1));
+  EXPECT_FALSE(table_->IsPrime(4));
+  EXPECT_FALSE(table_->IsPrime(6));
+  EXPECT_FALSE(table_->IsPrime(100));
+}
+
+TEST_P(PrimeTableTestSmpl7, ReturnsTrueForPrimes) {
+  EXPECT_TRUE(table_->IsPrime(2));
+  EXPECT_TRUE(table_->IsPrime(3));
+  EXPECT_TRUE(table_->IsPrime(5));
+  EXPECT_TRUE(table_->IsPrime(7));
+  EXPECT_TRUE(table_->IsPrime(11));
+  EXPECT_TRUE(table_->IsPrime(131));
+}
+
+TEST_P(PrimeTableTestSmpl7, CanGetNextPrime) {
+  EXPECT_EQ(2, table_->GetNextPrime(0));
+  EXPECT_EQ(3, table_->GetNextPrime(2));
+  EXPECT_EQ(5, table_->GetNextPrime(3));
+  EXPECT_EQ(7, table_->GetNextPrime(5));
+  EXPECT_EQ(11, table_->GetNextPrime(7));
+  EXPECT_EQ(131, table_->GetNextPrime(128));
+}
+
+// In order to run value-parameterized tests, you need to instantiate them,
+// or bind them to a list of values which will be used as test parameters.
+// You can instantiate them in a different translation module, or even
+// instantiate them several times.
+//
+// Here, we instantiate our tests with a list of two PrimeTable object
+// factory functions:
+INSTANTIATE_TEST_SUITE_P(OnTheFlyAndPreCalculated, PrimeTableTestSmpl7,
+                         Values(&CreateOnTheFlyPrimeTable,
+                                &CreatePreCalculatedPrimeTable<1000>));
+
+}  // namespace
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/samples/sample8_unittest.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/samples/sample8_unittest.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/samples/sample8_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/samples/sample8_unittest.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,154 @@
+// Copyright 2008 Google Inc.
+// All Rights Reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+// This sample shows how to test code relying on some global flag variables.
+// Combine() helps with generating all possible combinations of such flags,
+// and each test is given one combination as a parameter.
+
+// Use class definitions to test from this header.
+#include "prime_tables.h"
+
+#include "gtest/gtest.h"
+namespace {
+
+// Suppose we want to introduce a new, improved implementation of PrimeTable
+// which combines speed of PrecalcPrimeTable and versatility of
+// OnTheFlyPrimeTable (see prime_tables.h). Inside it instantiates both
+// PrecalcPrimeTable and OnTheFlyPrimeTable and uses the one that is more
+// appropriate under the circumstances. But in low memory conditions, it can be
+// told to instantiate without PrecalcPrimeTable instance at all and use only
+// OnTheFlyPrimeTable.
+class HybridPrimeTable : public PrimeTable {
+ public:
+  HybridPrimeTable(bool force_on_the_fly, int max_precalculated)
+      : on_the_fly_impl_(new OnTheFlyPrimeTable),
+        precalc_impl_(force_on_the_fly
+                          ? nullptr
+                          : new PreCalculatedPrimeTable(max_precalculated)),
+        max_precalculated_(max_precalculated) {}
+  ~HybridPrimeTable() override {
+    delete on_the_fly_impl_;
+    delete precalc_impl_;
+  }
+
+  bool IsPrime(int n) const override {
+    if (precalc_impl_ != nullptr && n < max_precalculated_)
+      return precalc_impl_->IsPrime(n);
+    else
+      return on_the_fly_impl_->IsPrime(n);
+  }
+
+  int GetNextPrime(int p) const override {
+    int next_prime = -1;
+    if (precalc_impl_ != nullptr && p < max_precalculated_)
+      next_prime = precalc_impl_->GetNextPrime(p);
+
+    return next_prime != -1 ? next_prime : on_the_fly_impl_->GetNextPrime(p);
+  }
+
+ private:
+  OnTheFlyPrimeTable* on_the_fly_impl_;
+  PreCalculatedPrimeTable* precalc_impl_;
+  int max_precalculated_;
+};
+
+using ::testing::TestWithParam;
+using ::testing::Bool;
+using ::testing::Values;
+using ::testing::Combine;
+
+// To test all code paths for HybridPrimeTable we must test it with numbers
+// both within and outside PreCalculatedPrimeTable's capacity and also with
+// PreCalculatedPrimeTable disabled. We do this by defining fixture which will
+// accept different combinations of parameters for instantiating a
+// HybridPrimeTable instance.
+class PrimeTableTest : public TestWithParam< ::std::tuple<bool, int> > {
+ protected:
+  void SetUp() override {
+    bool force_on_the_fly;
+    int max_precalculated;
+    std::tie(force_on_the_fly, max_precalculated) = GetParam();
+    table_ = new HybridPrimeTable(force_on_the_fly, max_precalculated);
+  }
+  void TearDown() override {
+    delete table_;
+    table_ = nullptr;
+  }
+  HybridPrimeTable* table_;
+};
+
+TEST_P(PrimeTableTest, ReturnsFalseForNonPrimes) {
+  // Inside the test body, you can refer to the test parameter by GetParam().
+  // In this case, the test parameter is a PrimeTable interface pointer which
+  // we can use directly.
+  // Please note that you can also save it in the fixture's SetUp() method
+  // or constructor and use saved copy in the tests.
+
+  EXPECT_FALSE(table_->IsPrime(-5));
+  EXPECT_FALSE(table_->IsPrime(0));
+  EXPECT_FALSE(table_->IsPrime(1));
+  EXPECT_FALSE(table_->IsPrime(4));
+  EXPECT_FALSE(table_->IsPrime(6));
+  EXPECT_FALSE(table_->IsPrime(100));
+}
+
+TEST_P(PrimeTableTest, ReturnsTrueForPrimes) {
+  EXPECT_TRUE(table_->IsPrime(2));
+  EXPECT_TRUE(table_->IsPrime(3));
+  EXPECT_TRUE(table_->IsPrime(5));
+  EXPECT_TRUE(table_->IsPrime(7));
+  EXPECT_TRUE(table_->IsPrime(11));
+  EXPECT_TRUE(table_->IsPrime(131));
+}
+
+TEST_P(PrimeTableTest, CanGetNextPrime) {
+  EXPECT_EQ(2, table_->GetNextPrime(0));
+  EXPECT_EQ(3, table_->GetNextPrime(2));
+  EXPECT_EQ(5, table_->GetNextPrime(3));
+  EXPECT_EQ(7, table_->GetNextPrime(5));
+  EXPECT_EQ(11, table_->GetNextPrime(7));
+  EXPECT_EQ(131, table_->GetNextPrime(128));
+}
+
+// In order to run value-parameterized tests, you need to instantiate them,
+// or bind them to a list of values which will be used as test parameters.
+// You can instantiate them in a different translation module, or even
+// instantiate them several times.
+//
+// Here, we instantiate our tests with a list of parameters. We must combine
+// all variations of the boolean flag suppressing PrecalcPrimeTable and some
+// meaningful values for tests. We choose a small value (1), and a value that
+// will put some of the tested numbers beyond the capability of the
+// PrecalcPrimeTable instance and some inside it (10). Combine will produce all
+// possible combinations.
+INSTANTIATE_TEST_SUITE_P(MeaningfulTestParameters, PrimeTableTest,
+                         Combine(Bool(), Values(1, 10)));
+
+}  // namespace
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/samples/sample9_unittest.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/samples/sample9_unittest.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/samples/sample9_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/samples/sample9_unittest.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,156 @@
+// Copyright 2009 Google Inc. All Rights Reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+// This sample shows how to use Google Test listener API to implement
+// an alternative console output and how to use the UnitTest reflection API
+// to enumerate test cases and tests and to inspect their results.
+
+#include <stdio.h>
+
+#include "gtest/gtest.h"
+
+using ::testing::EmptyTestEventListener;
+using ::testing::InitGoogleTest;
+using ::testing::Test;
+using ::testing::TestCase;
+using ::testing::TestEventListeners;
+using ::testing::TestInfo;
+using ::testing::TestPartResult;
+using ::testing::UnitTest;
+namespace {
+// Provides alternative output mode which produces minimal amount of
+// information about tests.
+class TersePrinter : public EmptyTestEventListener {
+ private:
+  // Called before any test activity starts.
+  void OnTestProgramStart(const UnitTest& /* unit_test */) override {}
+
+  // Called after all test activities have ended.
+  void OnTestProgramEnd(const UnitTest& unit_test) override {
+    fprintf(stdout, "TEST %s\n", unit_test.Passed() ? "PASSED" : "FAILED");
+    fflush(stdout);
+  }
+
+  // Called before a test starts.
+  void OnTestStart(const TestInfo& test_info) override {
+    fprintf(stdout,
+            "*** Test %s.%s starting.\n",
+            test_info.test_case_name(),
+            test_info.name());
+    fflush(stdout);
+  }
+
+  // Called after a failed assertion or a SUCCEED() invocation.
+  void OnTestPartResult(const TestPartResult& test_part_result) override {
+    fprintf(stdout,
+            "%s in %s:%d\n%s\n",
+            test_part_result.failed() ? "*** Failure" : "Success",
+            test_part_result.file_name(),
+            test_part_result.line_number(),
+            test_part_result.summary());
+    fflush(stdout);
+  }
+
+  // Called after a test ends.
+  void OnTestEnd(const TestInfo& test_info) override {
+    fprintf(stdout,
+            "*** Test %s.%s ending.\n",
+            test_info.test_case_name(),
+            test_info.name());
+    fflush(stdout);
+  }
+};  // class TersePrinter
+
+TEST(CustomOutputTest, PrintsMessage) {
+  printf("Printing something from the test body...\n");
+}
+
+TEST(CustomOutputTest, Succeeds) {
+  SUCCEED() << "SUCCEED() has been invoked from here";
+}
+
+TEST(CustomOutputTest, Fails) {
+  EXPECT_EQ(1, 2)
+      << "This test fails in order to demonstrate alternative failure messages";
+}
+}  // namespace
+
+int main(int argc, char **argv) {
+  InitGoogleTest(&argc, argv);
+
+  bool terse_output = false;
+  if (argc > 1 && strcmp(argv[1], "--terse_output") == 0 )
+    terse_output = true;
+  else
+    printf("%s\n", "Run this program with --terse_output to change the way "
+           "it prints its output.");
+
+  UnitTest& unit_test = *UnitTest::GetInstance();
+
+  // If we are given the --terse_output command line flag, suppresses the
+  // standard output and attaches own result printer.
+  if (terse_output) {
+    TestEventListeners& listeners = unit_test.listeners();
+
+    // Removes the default console output listener from the list so it will
+    // not receive events from Google Test and won't print any output. Since
+    // this operation transfers ownership of the listener to the caller we
+    // have to delete it as well.
+    delete listeners.Release(listeners.default_result_printer());
+
+    // Adds the custom output listener to the list. It will now receive
+    // events from Google Test and print the alternative output. We don't
+    // have to worry about deleting it since Google Test assumes ownership
+    // over it after adding it to the list.
+    listeners.Append(new TersePrinter);
+  }
+  int ret_val = RUN_ALL_TESTS();
+
+  // This is an example of using the UnitTest reflection API to inspect test
+  // results. Here we discount failures from the tests we expected to fail.
+  int unexpectedly_failed_tests = 0;
+  for (int i = 0; i < unit_test.total_test_suite_count(); ++i) {
+    const testing::TestSuite& test_suite = *unit_test.GetTestSuite(i);
+    for (int j = 0; j < test_suite.total_test_count(); ++j) {
+      const TestInfo& test_info = *test_suite.GetTestInfo(j);
+      // Counts failed tests that were not meant to fail (those without
+      // 'Fails' in the name).
+      if (test_info.result()->Failed() &&
+          strcmp(test_info.name(), "Fails") != 0) {
+        unexpectedly_failed_tests++;
+      }
+    }
+  }
+
+  // Test that were meant to fail should not affect the test program outcome.
+  if (unexpectedly_failed_tests == 0)
+    ret_val = 0;
+
+  return ret_val;
+}
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/src/gtest-all.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/src/gtest-all.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/src/gtest-all.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/src/gtest-all.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,48 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+//
+// Google C++ Testing and Mocking Framework (Google Test)
+//
+// Sometimes it's desirable to build Google Test by compiling a single file.
+// This file serves this purpose.
+
+// This line ensures that gtest.h can be compiled on its own, even
+// when it's fused.
+#include "gtest/gtest.h"
+
+// The following lines pull in the real gtest *.cc files.
+#include "src/gtest.cc"
+#include "src/gtest-death-test.cc"
+#include "src/gtest-filepath.cc"
+#include "src/gtest-matchers.cc"
+#include "src/gtest-port.cc"
+#include "src/gtest-printers.cc"
+#include "src/gtest-test-part.cc"
+#include "src/gtest-typed-test.cc"
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/src/gtest.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/src/gtest.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/src/gtest.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/src/gtest.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,6746 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+//
+// The Google C++ Testing and Mocking Framework (Google Test)
+
+#include "gtest/gtest.h"
+#include "gtest/internal/custom/gtest.h"
+#include "gtest/gtest-spi.h"
+
+#include <ctype.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+#include <wchar.h>
+#include <wctype.h>
+
+#include <algorithm>
+#include <chrono>  // NOLINT
+#include <cmath>
+#include <cstdint>
+#include <iomanip>
+#include <limits>
+#include <list>
+#include <map>
+#include <ostream>  // NOLINT
+#include <sstream>
+#include <vector>
+
+#if GTEST_OS_LINUX
+
+# include <fcntl.h>  // NOLINT
+# include <limits.h>  // NOLINT
+# include <sched.h>  // NOLINT
+// Declares vsnprintf().  This header is not available on Windows.
+# include <strings.h>  // NOLINT
+# include <sys/mman.h>  // NOLINT
+# include <sys/time.h>  // NOLINT
+# include <unistd.h>  // NOLINT
+# include <string>
+
+#elif GTEST_OS_ZOS
+# include <sys/time.h>  // NOLINT
+
+// On z/OS we additionally need strings.h for strcasecmp.
+# include <strings.h>  // NOLINT
+
+#elif GTEST_OS_WINDOWS_MOBILE  // We are on Windows CE.
+
+# include <windows.h>  // NOLINT
+# undef min
+
+#elif GTEST_OS_WINDOWS  // We are on Windows proper.
+
+# include <windows.h>  // NOLINT
+# undef min
+
+#ifdef _MSC_VER
+# include <crtdbg.h>  // NOLINT
+#endif
+
+# include <io.h>  // NOLINT
+# include <sys/timeb.h>  // NOLINT
+# include <sys/types.h>  // NOLINT
+# include <sys/stat.h>  // NOLINT
+
+# if GTEST_OS_WINDOWS_MINGW
+#  include <sys/time.h>  // NOLINT
+# endif  // GTEST_OS_WINDOWS_MINGW
+
+#else
+
+// cpplint thinks that the header is already included, so we want to
+// silence it.
+# include <sys/time.h>  // NOLINT
+# include <unistd.h>  // NOLINT
+
+#endif  // GTEST_OS_LINUX
+
+#if GTEST_HAS_EXCEPTIONS
+# include <stdexcept>
+#endif
+
+#if GTEST_CAN_STREAM_RESULTS_
+# include <arpa/inet.h>  // NOLINT
+# include <netdb.h>  // NOLINT
+# include <sys/socket.h>  // NOLINT
+# include <sys/types.h>  // NOLINT
+#endif
+
+#include "src/gtest-internal-inl.h"
+
+#if GTEST_OS_WINDOWS
+# define vsnprintf _vsnprintf
+#endif  // GTEST_OS_WINDOWS
+
+#if GTEST_OS_MAC
+#ifndef GTEST_OS_IOS
+#include <crt_externs.h>
+#endif
+#endif
+
+#if GTEST_HAS_ABSL
+#include "absl/debugging/failure_signal_handler.h"
+#include "absl/debugging/stacktrace.h"
+#include "absl/debugging/symbolize.h"
+#include "absl/strings/str_cat.h"
+#endif  // GTEST_HAS_ABSL
+
+namespace testing {
+
+using internal::CountIf;
+using internal::ForEach;
+using internal::GetElementOr;
+using internal::Shuffle;
+
+// Constants.
+
+// A test whose test suite name or test name matches this filter is
+// disabled and not run.
+static const char kDisableTestFilter[] = "DISABLED_*:*/DISABLED_*";
+
+// A test suite whose name matches this filter is considered a death
+// test suite and will be run before test suites whose name doesn't
+// match this filter.
+static const char kDeathTestSuiteFilter[] = "*DeathTest:*DeathTest/*";
+
+// A test filter that matches everything.
+static const char kUniversalFilter[] = "*";
+
+// The default output format.
+static const char kDefaultOutputFormat[] = "xml";
+// The default output file.
+static const char kDefaultOutputFile[] = "test_detail";
+
+// The environment variable name for the test shard index.
+static const char kTestShardIndex[] = "GTEST_SHARD_INDEX";
+// The environment variable name for the total number of test shards.
+static const char kTestTotalShards[] = "GTEST_TOTAL_SHARDS";
+// The environment variable name for the test shard status file.
+static const char kTestShardStatusFile[] = "GTEST_SHARD_STATUS_FILE";
+
+namespace internal {
+
+// The text used in failure messages to indicate the start of the
+// stack trace.
+const char kStackTraceMarker[] = "\nStack trace:\n";
+
+// g_help_flag is true if and only if the --help flag or an equivalent form
+// is specified on the command line.
+bool g_help_flag = false;
+
+// Utilty function to Open File for Writing
+static FILE* OpenFileForWriting(const std::string& output_file) {
+  FILE* fileout = nullptr;
+  FilePath output_file_path(output_file);
+  FilePath output_dir(output_file_path.RemoveFileName());
+
+  if (output_dir.CreateDirectoriesRecursively()) {
+    fileout = posix::FOpen(output_file.c_str(), "w");
+  }
+  if (fileout == nullptr) {
+    GTEST_LOG_(FATAL) << "Unable to open file \"" << output_file << "\"";
+  }
+  return fileout;
+}
+
+}  // namespace internal
+
+// Bazel passes in the argument to '--test_filter' via the TESTBRIDGE_TEST_ONLY
+// environment variable.
+static const char* GetDefaultFilter() {
+  const char* const testbridge_test_only =
+      internal::posix::GetEnv("TESTBRIDGE_TEST_ONLY");
+  if (testbridge_test_only != nullptr) {
+    return testbridge_test_only;
+  }
+  return kUniversalFilter;
+}
+
+// Bazel passes in the argument to '--test_runner_fail_fast' via the
+// TESTBRIDGE_TEST_RUNNER_FAIL_FAST environment variable.
+static bool GetDefaultFailFast() {
+  const char* const testbridge_test_runner_fail_fast =
+      internal::posix::GetEnv("TESTBRIDGE_TEST_RUNNER_FAIL_FAST");
+  if (testbridge_test_runner_fail_fast != nullptr) {
+    return strcmp(testbridge_test_runner_fail_fast, "1") == 0;
+  }
+  return false;
+}
+
+GTEST_DEFINE_bool_(
+    fail_fast, internal::BoolFromGTestEnv("fail_fast", GetDefaultFailFast()),
+    "True if and only if a test failure should stop further test execution.");
+
+GTEST_DEFINE_bool_(
+    also_run_disabled_tests,
+    internal::BoolFromGTestEnv("also_run_disabled_tests", false),
+    "Run disabled tests too, in addition to the tests normally being run.");
+
+GTEST_DEFINE_bool_(
+    break_on_failure, internal::BoolFromGTestEnv("break_on_failure", false),
+    "True if and only if a failed assertion should be a debugger "
+    "break-point.");
+
+GTEST_DEFINE_bool_(catch_exceptions,
+                   internal::BoolFromGTestEnv("catch_exceptions", true),
+                   "True if and only if " GTEST_NAME_
+                   " should catch exceptions and treat them as test failures.");
+
+GTEST_DEFINE_string_(
+    color,
+    internal::StringFromGTestEnv("color", "auto"),
+    "Whether to use colors in the output.  Valid values: yes, no, "
+    "and auto.  'auto' means to use colors if the output is "
+    "being sent to a terminal and the TERM environment variable "
+    "is set to a terminal type that supports colors.");
+
+GTEST_DEFINE_string_(
+    filter,
+    internal::StringFromGTestEnv("filter", GetDefaultFilter()),
+    "A colon-separated list of glob (not regex) patterns "
+    "for filtering the tests to run, optionally followed by a "
+    "'-' and a : separated list of negative patterns (tests to "
+    "exclude).  A test is run if it matches one of the positive "
+    "patterns and does not match any of the negative patterns.");
+
+GTEST_DEFINE_bool_(
+    install_failure_signal_handler,
+    internal::BoolFromGTestEnv("install_failure_signal_handler", false),
+    "If true and supported on the current platform, " GTEST_NAME_ " should "
+    "install a signal handler that dumps debugging information when fatal "
+    "signals are raised.");
+
+GTEST_DEFINE_bool_(list_tests, false,
+                   "List all tests without running them.");
+
+// The net priority order after flag processing is thus:
+//   --gtest_output command line flag
+//   GTEST_OUTPUT environment variable
+//   XML_OUTPUT_FILE environment variable
+//   ''
+GTEST_DEFINE_string_(
+    output,
+    internal::StringFromGTestEnv("output",
+      internal::OutputFlagAlsoCheckEnvVar().c_str()),
+    "A format (defaults to \"xml\" but can be specified to be \"json\"), "
+    "optionally followed by a colon and an output file name or directory. "
+    "A directory is indicated by a trailing pathname separator. "
+    "Examples: \"xml:filename.xml\", \"xml::directoryname/\". "
+    "If a directory is specified, output files will be created "
+    "within that directory, with file-names based on the test "
+    "executable's name and, if necessary, made unique by adding "
+    "digits.");
+
+GTEST_DEFINE_bool_(
+    brief, internal::BoolFromGTestEnv("brief", false),
+    "True if only test failures should be displayed in text output.");
+
+GTEST_DEFINE_bool_(print_time, internal::BoolFromGTestEnv("print_time", true),
+                   "True if and only if " GTEST_NAME_
+                   " should display elapsed time in text output.");
+
+GTEST_DEFINE_bool_(print_utf8, internal::BoolFromGTestEnv("print_utf8", true),
+                   "True if and only if " GTEST_NAME_
+                   " prints UTF8 characters as text.");
+
+GTEST_DEFINE_int32_(
+    random_seed,
+    internal::Int32FromGTestEnv("random_seed", 0),
+    "Random number seed to use when shuffling test orders.  Must be in range "
+    "[1, 99999], or 0 to use a seed based on the current time.");
+
+GTEST_DEFINE_int32_(
+    repeat,
+    internal::Int32FromGTestEnv("repeat", 1),
+    "How many times to repeat each test.  Specify a negative number "
+    "for repeating forever.  Useful for shaking out flaky tests.");
+
+GTEST_DEFINE_bool_(show_internal_stack_frames, false,
+                   "True if and only if " GTEST_NAME_
+                   " should include internal stack frames when "
+                   "printing test failure stack traces.");
+
+GTEST_DEFINE_bool_(shuffle, internal::BoolFromGTestEnv("shuffle", false),
+                   "True if and only if " GTEST_NAME_
+                   " should randomize tests' order on every run.");
+
+GTEST_DEFINE_int32_(
+    stack_trace_depth,
+    internal::Int32FromGTestEnv("stack_trace_depth", kMaxStackTraceDepth),
+    "The maximum number of stack frames to print when an "
+    "assertion fails.  The valid range is 0 through 100, inclusive.");
+
+GTEST_DEFINE_string_(
+    stream_result_to,
+    internal::StringFromGTestEnv("stream_result_to", ""),
+    "This flag specifies the host name and the port number on which to stream "
+    "test results. Example: \"localhost:555\". The flag is effective only on "
+    "Linux.");
+
+GTEST_DEFINE_bool_(
+    throw_on_failure,
+    internal::BoolFromGTestEnv("throw_on_failure", false),
+    "When this flag is specified, a failed assertion will throw an exception "
+    "if exceptions are enabled or exit the program with a non-zero code "
+    "otherwise. For use with an external test framework.");
+
+#if GTEST_USE_OWN_FLAGFILE_FLAG_
+GTEST_DEFINE_string_(
+    flagfile,
+    internal::StringFromGTestEnv("flagfile", ""),
+    "This flag specifies the flagfile to read command-line flags from.");
+#endif  // GTEST_USE_OWN_FLAGFILE_FLAG_
+
+namespace internal {
+
+// Generates a random number from [0, range), using a Linear
+// Congruential Generator (LCG).  Crashes if 'range' is 0 or greater
+// than kMaxRange.
+uint32_t Random::Generate(uint32_t range) {
+  // These constants are the same as are used in glibc's rand(3).
+  // Use wider types than necessary to prevent unsigned overflow diagnostics.
+  state_ = static_cast<uint32_t>(1103515245ULL*state_ + 12345U) % kMaxRange;
+
+  GTEST_CHECK_(range > 0)
+      << "Cannot generate a number in the range [0, 0).";
+  GTEST_CHECK_(range <= kMaxRange)
+      << "Generation of a number in [0, " << range << ") was requested, "
+      << "but this can only generate numbers in [0, " << kMaxRange << ").";
+
+  // Converting via modulus introduces a bit of downward bias, but
+  // it's simple, and a linear congruential generator isn't too good
+  // to begin with.
+  return state_ % range;
+}
+
+// GTestIsInitialized() returns true if and only if the user has initialized
+// Google Test.  Useful for catching the user mistake of not initializing
+// Google Test before calling RUN_ALL_TESTS().
+static bool GTestIsInitialized() { return GetArgvs().size() > 0; }
+
+// Iterates over a vector of TestSuites, keeping a running sum of the
+// results of calling a given int-returning method on each.
+// Returns the sum.
+static int SumOverTestSuiteList(const std::vector<TestSuite*>& case_list,
+                                int (TestSuite::*method)() const) {
+  int sum = 0;
+  for (size_t i = 0; i < case_list.size(); i++) {
+    sum += (case_list[i]->*method)();
+  }
+  return sum;
+}
+
+// Returns true if and only if the test suite passed.
+static bool TestSuitePassed(const TestSuite* test_suite) {
+  return test_suite->should_run() && test_suite->Passed();
+}
+
+// Returns true if and only if the test suite failed.
+static bool TestSuiteFailed(const TestSuite* test_suite) {
+  return test_suite->should_run() && test_suite->Failed();
+}
+
+// Returns true if and only if test_suite contains at least one test that
+// should run.
+static bool ShouldRunTestSuite(const TestSuite* test_suite) {
+  return test_suite->should_run();
+}
+
+// AssertHelper constructor.
+AssertHelper::AssertHelper(TestPartResult::Type type,
+                           const char* file,
+                           int line,
+                           const char* message)
+    : data_(new AssertHelperData(type, file, line, message)) {
+}
+
+AssertHelper::~AssertHelper() {
+  delete data_;
+}
+
+// Message assignment, for assertion streaming support.
+void AssertHelper::operator=(const Message& message) const {
+  UnitTest::GetInstance()->
+    AddTestPartResult(data_->type, data_->file, data_->line,
+                      AppendUserMessage(data_->message, message),
+                      UnitTest::GetInstance()->impl()
+                      ->CurrentOsStackTraceExceptTop(1)
+                      // Skips the stack frame for this function itself.
+                      );  // NOLINT
+}
+
+namespace {
+
+// When TEST_P is found without a matching INSTANTIATE_TEST_SUITE_P
+// to creates test cases for it, a syntetic test case is
+// inserted to report ether an error or a log message.
+//
+// This configuration bit will likely be removed at some point.
+constexpr bool kErrorOnUninstantiatedParameterizedTest = true;
+constexpr bool kErrorOnUninstantiatedTypeParameterizedTest = true;
+
+// A test that fails at a given file/line location with a given message.
+class FailureTest : public Test {
+ public:
+  explicit FailureTest(const CodeLocation& loc, std::string error_message,
+                       bool as_error)
+      : loc_(loc),
+        error_message_(std::move(error_message)),
+        as_error_(as_error) {}
+
+  void TestBody() override {
+    if (as_error_) {
+      AssertHelper(TestPartResult::kNonFatalFailure, loc_.file.c_str(),
+                   loc_.line, "") = Message() << error_message_;
+    } else {
+      std::cout << error_message_ << std::endl;
+    }
+  }
+
+ private:
+  const CodeLocation loc_;
+  const std::string error_message_;
+  const bool as_error_;
+};
+
+
+}  // namespace
+
+std::set<std::string>* GetIgnoredParameterizedTestSuites() {
+  return UnitTest::GetInstance()->impl()->ignored_parameterized_test_suites();
+}
+
+// Add a given test_suit to the list of them allow to go un-instantiated.
+MarkAsIgnored::MarkAsIgnored(const char* test_suite) {
+  GetIgnoredParameterizedTestSuites()->insert(test_suite);
+}
+
+// If this parameterized test suite has no instantiations (and that
+// has not been marked as okay), emit a test case reporting that.
+void InsertSyntheticTestCase(const std::string& name, CodeLocation location,
+                             bool has_test_p) {
+  const auto& ignored = *GetIgnoredParameterizedTestSuites();
+  if (ignored.find(name) != ignored.end()) return;
+
+  const char kMissingInstantiation[] =  //
+      " is defined via TEST_P, but never instantiated. None of the test cases "
+      "will run. Either no INSTANTIATE_TEST_SUITE_P is provided or the only "
+      "ones provided expand to nothing."
+      "\n\n"
+      "Ideally, TEST_P definitions should only ever be included as part of "
+      "binaries that intend to use them. (As opposed to, for example, being "
+      "placed in a library that may be linked in to get other utilities.)";
+
+  const char kMissingTestCase[] =  //
+      " is instantiated via INSTANTIATE_TEST_SUITE_P, but no tests are "
+      "defined via TEST_P . No test cases will run."
+      "\n\n"
+      "Ideally, INSTANTIATE_TEST_SUITE_P should only ever be invoked from "
+      "code that always depend on code that provides TEST_P. Failing to do "
+      "so is often an indication of dead code, e.g. the last TEST_P was "
+      "removed but the rest got left behind.";
+
+  std::string message =
+      "Parameterized test suite " + name +
+      (has_test_p ? kMissingInstantiation : kMissingTestCase) +
+      "\n\n"
+      "To suppress this error for this test suite, insert the following line "
+      "(in a non-header) in the namespace it is defined in:"
+      "\n\n"
+      "GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(" + name + ");";
+
+  std::string full_name = "UninstantiatedParameterizedTestSuite<" + name + ">";
+  RegisterTest(  //
+      "GoogleTestVerification", full_name.c_str(),
+      nullptr,  // No type parameter.
+      nullptr,  // No value parameter.
+      location.file.c_str(), location.line, [message, location] {
+        return new FailureTest(location, message,
+                               kErrorOnUninstantiatedParameterizedTest);
+      });
+}
+
+void RegisterTypeParameterizedTestSuite(const char* test_suite_name,
+                                        CodeLocation code_location) {
+  GetUnitTestImpl()->type_parameterized_test_registry().RegisterTestSuite(
+      test_suite_name, code_location);
+}
+
+void RegisterTypeParameterizedTestSuiteInstantiation(const char* case_name) {
+  GetUnitTestImpl()
+      ->type_parameterized_test_registry()
+      .RegisterInstantiation(case_name);
+}
+
+void TypeParameterizedTestSuiteRegistry::RegisterTestSuite(
+    const char* test_suite_name, CodeLocation code_location) {
+  suites_.emplace(std::string(test_suite_name),
+                 TypeParameterizedTestSuiteInfo(code_location));
+}
+
+void TypeParameterizedTestSuiteRegistry::RegisterInstantiation(
+        const char* test_suite_name) {
+  auto it = suites_.find(std::string(test_suite_name));
+  if (it != suites_.end()) {
+    it->second.instantiated = true;
+  } else {
+    GTEST_LOG_(ERROR) << "Unknown type parameterized test suit '"
+                      << test_suite_name << "'";
+  }
+}
+
+void TypeParameterizedTestSuiteRegistry::CheckForInstantiations() {
+  const auto& ignored = *GetIgnoredParameterizedTestSuites();
+  for (const auto& testcase : suites_) {
+    if (testcase.second.instantiated) continue;
+    if (ignored.find(testcase.first) != ignored.end()) continue;
+
+    std::string message =
+        "Type parameterized test suite " + testcase.first +
+        " is defined via REGISTER_TYPED_TEST_SUITE_P, but never instantiated "
+        "via INSTANTIATE_TYPED_TEST_SUITE_P. None of the test cases will run."
+        "\n\n"
+        "Ideally, TYPED_TEST_P definitions should only ever be included as "
+        "part of binaries that intend to use them. (As opposed to, for "
+        "example, being placed in a library that may be linked in to get other "
+        "utilities.)"
+        "\n\n"
+        "To suppress this error for this test suite, insert the following line "
+        "(in a non-header) in the namespace it is defined in:"
+        "\n\n"
+        "GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(" +
+        testcase.first + ");";
+
+    std::string full_name =
+        "UninstantiatedTypeParameterizedTestSuite<" + testcase.first + ">";
+    RegisterTest(  //
+        "GoogleTestVerification", full_name.c_str(),
+        nullptr,  // No type parameter.
+        nullptr,  // No value parameter.
+        testcase.second.code_location.file.c_str(),
+        testcase.second.code_location.line, [message, testcase] {
+          return new FailureTest(testcase.second.code_location, message,
+                                 kErrorOnUninstantiatedTypeParameterizedTest);
+        });
+  }
+}
+
+// A copy of all command line arguments.  Set by InitGoogleTest().
+static ::std::vector<std::string> g_argvs;
+
+::std::vector<std::string> GetArgvs() {
+#if defined(GTEST_CUSTOM_GET_ARGVS_)
+  // GTEST_CUSTOM_GET_ARGVS_() may return a container of std::string or
+  // ::string. This code converts it to the appropriate type.
+  const auto& custom = GTEST_CUSTOM_GET_ARGVS_();
+  return ::std::vector<std::string>(custom.begin(), custom.end());
+#else   // defined(GTEST_CUSTOM_GET_ARGVS_)
+  return g_argvs;
+#endif  // defined(GTEST_CUSTOM_GET_ARGVS_)
+}
+
+// Returns the current application's name, removing directory path if that
+// is present.
+FilePath GetCurrentExecutableName() {
+  FilePath result;
+
+#if GTEST_OS_WINDOWS || GTEST_OS_OS2
+  result.Set(FilePath(GetArgvs()[0]).RemoveExtension("exe"));
+#else
+  result.Set(FilePath(GetArgvs()[0]));
+#endif  // GTEST_OS_WINDOWS
+
+  return result.RemoveDirectoryName();
+}
+
+// Functions for processing the gtest_output flag.
+
+// Returns the output format, or "" for normal printed output.
+std::string UnitTestOptions::GetOutputFormat() {
+  const char* const gtest_output_flag = GTEST_FLAG(output).c_str();
+  const char* const colon = strchr(gtest_output_flag, ':');
+  return (colon == nullptr)
+             ? std::string(gtest_output_flag)
+             : std::string(gtest_output_flag,
+                           static_cast<size_t>(colon - gtest_output_flag));
+}
+
+// Returns the name of the requested output file, or the default if none
+// was explicitly specified.
+std::string UnitTestOptions::GetAbsolutePathToOutputFile() {
+  const char* const gtest_output_flag = GTEST_FLAG(output).c_str();
+
+  std::string format = GetOutputFormat();
+  if (format.empty())
+    format = std::string(kDefaultOutputFormat);
+
+  const char* const colon = strchr(gtest_output_flag, ':');
+  if (colon == nullptr)
+    return internal::FilePath::MakeFileName(
+        internal::FilePath(
+            UnitTest::GetInstance()->original_working_dir()),
+        internal::FilePath(kDefaultOutputFile), 0,
+        format.c_str()).string();
+
+  internal::FilePath output_name(colon + 1);
+  if (!output_name.IsAbsolutePath())
+    output_name = internal::FilePath::ConcatPaths(
+        internal::FilePath(UnitTest::GetInstance()->original_working_dir()),
+        internal::FilePath(colon + 1));
+
+  if (!output_name.IsDirectory())
+    return output_name.string();
+
+  internal::FilePath result(internal::FilePath::GenerateUniqueFileName(
+      output_name, internal::GetCurrentExecutableName(),
+      GetOutputFormat().c_str()));
+  return result.string();
+}
+
+// Returns true if and only if the wildcard pattern matches the string. Each
+// pattern consists of regular characters, single-character wildcards (?), and
+// multi-character wildcards (*).
+//
+// This function implements a linear-time string globbing algorithm based on
+// https://research.swtch.com/glob.
+static bool PatternMatchesString(const std::string& name_str,
+                                 const char* pattern, const char* pattern_end) {
+  const char* name = name_str.c_str();
+  const char* const name_begin = name;
+  const char* const name_end = name + name_str.size();
+
+  const char* pattern_next = pattern;
+  const char* name_next = name;
+
+  while (pattern < pattern_end || name < name_end) {
+    if (pattern < pattern_end) {
+      switch (*pattern) {
+        default:  // Match an ordinary character.
+          if (name < name_end && *name == *pattern) {
+            ++pattern;
+            ++name;
+            continue;
+          }
+          break;
+        case '?':  // Match any single character.
+          if (name < name_end) {
+            ++pattern;
+            ++name;
+            continue;
+          }
+          break;
+        case '*':
+          // Match zero or more characters. Start by skipping over the wildcard
+          // and matching zero characters from name. If that fails, restart and
+          // match one more character than the last attempt.
+          pattern_next = pattern;
+          name_next = name + 1;
+          ++pattern;
+          continue;
+      }
+    }
+    // Failed to match a character. Restart if possible.
+    if (name_begin < name_next && name_next <= name_end) {
+      pattern = pattern_next;
+      name = name_next;
+      continue;
+    }
+    return false;
+  }
+  return true;
+}
+
+bool UnitTestOptions::MatchesFilter(const std::string& name_str,
+                                    const char* filter) {
+  // The filter is a list of patterns separated by colons (:).
+  const char* pattern = filter;
+  while (true) {
+    // Find the bounds of this pattern.
+    const char* const next_sep = strchr(pattern, ':');
+    const char* const pattern_end =
+        next_sep != nullptr ? next_sep : pattern + strlen(pattern);
+
+    // Check if this pattern matches name_str.
+    if (PatternMatchesString(name_str, pattern, pattern_end)) {
+      return true;
+    }
+
+    // Give up on this pattern. However, if we found a pattern separator (:),
+    // advance to the next pattern (skipping over the separator) and restart.
+    if (next_sep == nullptr) {
+      return false;
+    }
+    pattern = next_sep + 1;
+  }
+  return true;
+}
+
+// Returns true if and only if the user-specified filter matches the test
+// suite name and the test name.
+bool UnitTestOptions::FilterMatchesTest(const std::string& test_suite_name,
+                                        const std::string& test_name) {
+  const std::string& full_name = test_suite_name + "." + test_name.c_str();
+
+  // Split --gtest_filter at '-', if there is one, to separate into
+  // positive filter and negative filter portions
+  const char* const p = GTEST_FLAG(filter).c_str();
+  const char* const dash = strchr(p, '-');
+  std::string positive;
+  std::string negative;
+  if (dash == nullptr) {
+    positive = GTEST_FLAG(filter).c_str();  // Whole string is a positive filter
+    negative = "";
+  } else {
+    positive = std::string(p, dash);   // Everything up to the dash
+    negative = std::string(dash + 1);  // Everything after the dash
+    if (positive.empty()) {
+      // Treat '-test1' as the same as '*-test1'
+      positive = kUniversalFilter;
+    }
+  }
+
+  // A filter is a colon-separated list of patterns.  It matches a
+  // test if any pattern in it matches the test.
+  return (MatchesFilter(full_name, positive.c_str()) &&
+          !MatchesFilter(full_name, negative.c_str()));
+}
+
+#if GTEST_HAS_SEH
+// Returns EXCEPTION_EXECUTE_HANDLER if Google Test should handle the
+// given SEH exception, or EXCEPTION_CONTINUE_SEARCH otherwise.
+// This function is useful as an __except condition.
+int UnitTestOptions::GTestShouldProcessSEH(DWORD exception_code) {
+  // Google Test should handle a SEH exception if:
+  //   1. the user wants it to, AND
+  //   2. this is not a breakpoint exception, AND
+  //   3. this is not a C++ exception (VC++ implements them via SEH,
+  //      apparently).
+  //
+  // SEH exception code for C++ exceptions.
+  // (see http://support.microsoft.com/kb/185294 for more information).
+  const DWORD kCxxExceptionCode = 0xe06d7363;
+
+  bool should_handle = true;
+
+  if (!GTEST_FLAG(catch_exceptions))
+    should_handle = false;
+  else if (exception_code == EXCEPTION_BREAKPOINT)
+    should_handle = false;
+  else if (exception_code == kCxxExceptionCode)
+    should_handle = false;
+
+  return should_handle ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH;
+}
+#endif  // GTEST_HAS_SEH
+
+}  // namespace internal
+
+// The c'tor sets this object as the test part result reporter used by
+// Google Test.  The 'result' parameter specifies where to report the
+// results. Intercepts only failures from the current thread.
+ScopedFakeTestPartResultReporter::ScopedFakeTestPartResultReporter(
+    TestPartResultArray* result)
+    : intercept_mode_(INTERCEPT_ONLY_CURRENT_THREAD),
+      result_(result) {
+  Init();
+}
+
+// The c'tor sets this object as the test part result reporter used by
+// Google Test.  The 'result' parameter specifies where to report the
+// results.
+ScopedFakeTestPartResultReporter::ScopedFakeTestPartResultReporter(
+    InterceptMode intercept_mode, TestPartResultArray* result)
+    : intercept_mode_(intercept_mode),
+      result_(result) {
+  Init();
+}
+
+void ScopedFakeTestPartResultReporter::Init() {
+  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
+  if (intercept_mode_ == INTERCEPT_ALL_THREADS) {
+    old_reporter_ = impl->GetGlobalTestPartResultReporter();
+    impl->SetGlobalTestPartResultReporter(this);
+  } else {
+    old_reporter_ = impl->GetTestPartResultReporterForCurrentThread();
+    impl->SetTestPartResultReporterForCurrentThread(this);
+  }
+}
+
+// The d'tor restores the test part result reporter used by Google Test
+// before.
+ScopedFakeTestPartResultReporter::~ScopedFakeTestPartResultReporter() {
+  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
+  if (intercept_mode_ == INTERCEPT_ALL_THREADS) {
+    impl->SetGlobalTestPartResultReporter(old_reporter_);
+  } else {
+    impl->SetTestPartResultReporterForCurrentThread(old_reporter_);
+  }
+}
+
+// Increments the test part result count and remembers the result.
+// This method is from the TestPartResultReporterInterface interface.
+void ScopedFakeTestPartResultReporter::ReportTestPartResult(
+    const TestPartResult& result) {
+  result_->Append(result);
+}
+
+namespace internal {
+
+// Returns the type ID of ::testing::Test.  We should always call this
+// instead of GetTypeId< ::testing::Test>() to get the type ID of
+// testing::Test.  This is to work around a suspected linker bug when
+// using Google Test as a framework on Mac OS X.  The bug causes
+// GetTypeId< ::testing::Test>() to return different values depending
+// on whether the call is from the Google Test framework itself or
+// from user test code.  GetTestTypeId() is guaranteed to always
+// return the same value, as it always calls GetTypeId<>() from the
+// gtest.cc, which is within the Google Test framework.
+TypeId GetTestTypeId() {
+  return GetTypeId<Test>();
+}
+
+// The value of GetTestTypeId() as seen from within the Google Test
+// library.  This is solely for testing GetTestTypeId().
+extern const TypeId kTestTypeIdInGoogleTest = GetTestTypeId();
+
+// This predicate-formatter checks that 'results' contains a test part
+// failure of the given type and that the failure message contains the
+// given substring.
+static AssertionResult HasOneFailure(const char* /* results_expr */,
+                                     const char* /* type_expr */,
+                                     const char* /* substr_expr */,
+                                     const TestPartResultArray& results,
+                                     TestPartResult::Type type,
+                                     const std::string& substr) {
+  const std::string expected(type == TestPartResult::kFatalFailure ?
+                        "1 fatal failure" :
+                        "1 non-fatal failure");
+  Message msg;
+  if (results.size() != 1) {
+    msg << "Expected: " << expected << "\n"
+        << "  Actual: " << results.size() << " failures";
+    for (int i = 0; i < results.size(); i++) {
+      msg << "\n" << results.GetTestPartResult(i);
+    }
+    return AssertionFailure() << msg;
+  }
+
+  const TestPartResult& r = results.GetTestPartResult(0);
+  if (r.type() != type) {
+    return AssertionFailure() << "Expected: " << expected << "\n"
+                              << "  Actual:\n"
+                              << r;
+  }
+
+  if (strstr(r.message(), substr.c_str()) == nullptr) {
+    return AssertionFailure() << "Expected: " << expected << " containing \""
+                              << substr << "\"\n"
+                              << "  Actual:\n"
+                              << r;
+  }
+
+  return AssertionSuccess();
+}
+
+// The constructor of SingleFailureChecker remembers where to look up
+// test part results, what type of failure we expect, and what
+// substring the failure message should contain.
+SingleFailureChecker::SingleFailureChecker(const TestPartResultArray* results,
+                                           TestPartResult::Type type,
+                                           const std::string& substr)
+    : results_(results), type_(type), substr_(substr) {}
+
+// The destructor of SingleFailureChecker verifies that the given
+// TestPartResultArray contains exactly one failure that has the given
+// type and contains the given substring.  If that's not the case, a
+// non-fatal failure will be generated.
+SingleFailureChecker::~SingleFailureChecker() {
+  EXPECT_PRED_FORMAT3(HasOneFailure, *results_, type_, substr_);
+}
+
+DefaultGlobalTestPartResultReporter::DefaultGlobalTestPartResultReporter(
+    UnitTestImpl* unit_test) : unit_test_(unit_test) {}
+
+void DefaultGlobalTestPartResultReporter::ReportTestPartResult(
+    const TestPartResult& result) {
+  unit_test_->current_test_result()->AddTestPartResult(result);
+  unit_test_->listeners()->repeater()->OnTestPartResult(result);
+}
+
+DefaultPerThreadTestPartResultReporter::DefaultPerThreadTestPartResultReporter(
+    UnitTestImpl* unit_test) : unit_test_(unit_test) {}
+
+void DefaultPerThreadTestPartResultReporter::ReportTestPartResult(
+    const TestPartResult& result) {
+  unit_test_->GetGlobalTestPartResultReporter()->ReportTestPartResult(result);
+}
+
+// Returns the global test part result reporter.
+TestPartResultReporterInterface*
+UnitTestImpl::GetGlobalTestPartResultReporter() {
+  internal::MutexLock lock(&global_test_part_result_reporter_mutex_);
+  return global_test_part_result_repoter_;
+}
+
+// Sets the global test part result reporter.
+void UnitTestImpl::SetGlobalTestPartResultReporter(
+    TestPartResultReporterInterface* reporter) {
+  internal::MutexLock lock(&global_test_part_result_reporter_mutex_);
+  global_test_part_result_repoter_ = reporter;
+}
+
+// Returns the test part result reporter for the current thread.
+TestPartResultReporterInterface*
+UnitTestImpl::GetTestPartResultReporterForCurrentThread() {
+  return per_thread_test_part_result_reporter_.get();
+}
+
+// Sets the test part result reporter for the current thread.
+void UnitTestImpl::SetTestPartResultReporterForCurrentThread(
+    TestPartResultReporterInterface* reporter) {
+  per_thread_test_part_result_reporter_.set(reporter);
+}
+
+// Gets the number of successful test suites.
+int UnitTestImpl::successful_test_suite_count() const {
+  return CountIf(test_suites_, TestSuitePassed);
+}
+
+// Gets the number of failed test suites.
+int UnitTestImpl::failed_test_suite_count() const {
+  return CountIf(test_suites_, TestSuiteFailed);
+}
+
+// Gets the number of all test suites.
+int UnitTestImpl::total_test_suite_count() const {
+  return static_cast<int>(test_suites_.size());
+}
+
+// Gets the number of all test suites that contain at least one test
+// that should run.
+int UnitTestImpl::test_suite_to_run_count() const {
+  return CountIf(test_suites_, ShouldRunTestSuite);
+}
+
+// Gets the number of successful tests.
+int UnitTestImpl::successful_test_count() const {
+  return SumOverTestSuiteList(test_suites_, &TestSuite::successful_test_count);
+}
+
+// Gets the number of skipped tests.
+int UnitTestImpl::skipped_test_count() const {
+  return SumOverTestSuiteList(test_suites_, &TestSuite::skipped_test_count);
+}
+
+// Gets the number of failed tests.
+int UnitTestImpl::failed_test_count() const {
+  return SumOverTestSuiteList(test_suites_, &TestSuite::failed_test_count);
+}
+
+// Gets the number of disabled tests that will be reported in the XML report.
+int UnitTestImpl::reportable_disabled_test_count() const {
+  return SumOverTestSuiteList(test_suites_,
+                              &TestSuite::reportable_disabled_test_count);
+}
+
+// Gets the number of disabled tests.
+int UnitTestImpl::disabled_test_count() const {
+  return SumOverTestSuiteList(test_suites_, &TestSuite::disabled_test_count);
+}
+
+// Gets the number of tests to be printed in the XML report.
+int UnitTestImpl::reportable_test_count() const {
+  return SumOverTestSuiteList(test_suites_, &TestSuite::reportable_test_count);
+}
+
+// Gets the number of all tests.
+int UnitTestImpl::total_test_count() const {
+  return SumOverTestSuiteList(test_suites_, &TestSuite::total_test_count);
+}
+
+// Gets the number of tests that should run.
+int UnitTestImpl::test_to_run_count() const {
+  return SumOverTestSuiteList(test_suites_, &TestSuite::test_to_run_count);
+}
+
+// Returns the current OS stack trace as an std::string.
+//
+// The maximum number of stack frames to be included is specified by
+// the gtest_stack_trace_depth flag.  The skip_count parameter
+// specifies the number of top frames to be skipped, which doesn't
+// count against the number of frames to be included.
+//
+// For example, if Foo() calls Bar(), which in turn calls
+// CurrentOsStackTraceExceptTop(1), Foo() will be included in the
+// trace but Bar() and CurrentOsStackTraceExceptTop() won't.
+std::string UnitTestImpl::CurrentOsStackTraceExceptTop(int skip_count) {
+  return os_stack_trace_getter()->CurrentStackTrace(
+      static_cast<int>(GTEST_FLAG(stack_trace_depth)),
+      skip_count + 1
+      // Skips the user-specified number of frames plus this function
+      // itself.
+      );  // NOLINT
+}
+
+// A helper class for measuring elapsed times.
+class Timer {
+ public:
+  Timer() : start_(std::chrono::steady_clock::now()) {}
+
+  // Return time elapsed in milliseconds since the timer was created.
+  TimeInMillis Elapsed() {
+    return std::chrono::duration_cast<std::chrono::milliseconds>(
+               std::chrono::steady_clock::now() - start_)
+        .count();
+  }
+
+ private:
+  std::chrono::steady_clock::time_point start_;
+};
+
+// Returns a timestamp as milliseconds since the epoch. Note this time may jump
+// around subject to adjustments by the system, to measure elapsed time use
+// Timer instead.
+TimeInMillis GetTimeInMillis() {
+  return std::chrono::duration_cast<std::chrono::milliseconds>(
+             std::chrono::system_clock::now() -
+             std::chrono::system_clock::from_time_t(0))
+      .count();
+}
+
+// Utilities
+
+// class String.
+
+#if GTEST_OS_WINDOWS_MOBILE
+// Creates a UTF-16 wide string from the given ANSI string, allocating
+// memory using new. The caller is responsible for deleting the return
+// value using delete[]. Returns the wide string, or NULL if the
+// input is NULL.
+LPCWSTR String::AnsiToUtf16(const char* ansi) {
+  if (!ansi) return nullptr;
+  const int length = strlen(ansi);
+  const int unicode_length =
+      MultiByteToWideChar(CP_ACP, 0, ansi, length, nullptr, 0);
+  WCHAR* unicode = new WCHAR[unicode_length + 1];
+  MultiByteToWideChar(CP_ACP, 0, ansi, length,
+                      unicode, unicode_length);
+  unicode[unicode_length] = 0;
+  return unicode;
+}
+
+// Creates an ANSI string from the given wide string, allocating
+// memory using new. The caller is responsible for deleting the return
+// value using delete[]. Returns the ANSI string, or NULL if the
+// input is NULL.
+const char* String::Utf16ToAnsi(LPCWSTR utf16_str)  {
+  if (!utf16_str) return nullptr;
+  const int ansi_length = WideCharToMultiByte(CP_ACP, 0, utf16_str, -1, nullptr,
+                                              0, nullptr, nullptr);
+  char* ansi = new char[ansi_length + 1];
+  WideCharToMultiByte(CP_ACP, 0, utf16_str, -1, ansi, ansi_length, nullptr,
+                      nullptr);
+  ansi[ansi_length] = 0;
+  return ansi;
+}
+
+#endif  // GTEST_OS_WINDOWS_MOBILE
+
+// Compares two C strings.  Returns true if and only if they have the same
+// content.
+//
+// Unlike strcmp(), this function can handle NULL argument(s).  A NULL
+// C string is considered different to any non-NULL C string,
+// including the empty string.
+bool String::CStringEquals(const char * lhs, const char * rhs) {
+  if (lhs == nullptr) return rhs == nullptr;
+
+  if (rhs == nullptr) return false;
+
+  return strcmp(lhs, rhs) == 0;
+}
+
+#if GTEST_HAS_STD_WSTRING
+
+// Converts an array of wide chars to a narrow string using the UTF-8
+// encoding, and streams the result to the given Message object.
+static void StreamWideCharsToMessage(const wchar_t* wstr, size_t length,
+                                     Message* msg) {
+  for (size_t i = 0; i != length; ) {  // NOLINT
+    if (wstr[i] != L'\0') {
+      *msg << WideStringToUtf8(wstr + i, static_cast<int>(length - i));
+      while (i != length && wstr[i] != L'\0')
+        i++;
+    } else {
+      *msg << '\0';
+      i++;
+    }
+  }
+}
+
+#endif  // GTEST_HAS_STD_WSTRING
+
+void SplitString(const ::std::string& str, char delimiter,
+                 ::std::vector< ::std::string>* dest) {
+  ::std::vector< ::std::string> parsed;
+  ::std::string::size_type pos = 0;
+  while (::testing::internal::AlwaysTrue()) {
+    const ::std::string::size_type colon = str.find(delimiter, pos);
+    if (colon == ::std::string::npos) {
+      parsed.push_back(str.substr(pos));
+      break;
+    } else {
+      parsed.push_back(str.substr(pos, colon - pos));
+      pos = colon + 1;
+    }
+  }
+  dest->swap(parsed);
+}
+
+}  // namespace internal
+
+// Constructs an empty Message.
+// We allocate the stringstream separately because otherwise each use of
+// ASSERT/EXPECT in a procedure adds over 200 bytes to the procedure's
+// stack frame leading to huge stack frames in some cases; gcc does not reuse
+// the stack space.
+Message::Message() : ss_(new ::std::stringstream) {
+  // By default, we want there to be enough precision when printing
+  // a double to a Message.
+  *ss_ << std::setprecision(std::numeric_limits<double>::digits10 + 2);
+}
+
+// These two overloads allow streaming a wide C string to a Message
+// using the UTF-8 encoding.
+Message& Message::operator <<(const wchar_t* wide_c_str) {
+  return *this << internal::String::ShowWideCString(wide_c_str);
+}
+Message& Message::operator <<(wchar_t* wide_c_str) {
+  return *this << internal::String::ShowWideCString(wide_c_str);
+}
+
+#if GTEST_HAS_STD_WSTRING
+// Converts the given wide string to a narrow string using the UTF-8
+// encoding, and streams the result to this Message object.
+Message& Message::operator <<(const ::std::wstring& wstr) {
+  internal::StreamWideCharsToMessage(wstr.c_str(), wstr.length(), this);
+  return *this;
+}
+#endif  // GTEST_HAS_STD_WSTRING
+
+// Gets the text streamed to this object so far as an std::string.
+// Each '\0' character in the buffer is replaced with "\\0".
+std::string Message::GetString() const {
+  return internal::StringStreamToString(ss_.get());
+}
+
+// AssertionResult constructors.
+// Used in EXPECT_TRUE/FALSE(assertion_result).
+AssertionResult::AssertionResult(const AssertionResult& other)
+    : success_(other.success_),
+      message_(other.message_.get() != nullptr
+                   ? new ::std::string(*other.message_)
+                   : static_cast< ::std::string*>(nullptr)) {}
+
+// Swaps two AssertionResults.
+void AssertionResult::swap(AssertionResult& other) {
+  using std::swap;
+  swap(success_, other.success_);
+  swap(message_, other.message_);
+}
+
+// Returns the assertion's negation. Used with EXPECT/ASSERT_FALSE.
+AssertionResult AssertionResult::operator!() const {
+  AssertionResult negation(!success_);
+  if (message_.get() != nullptr) negation << *message_;
+  return negation;
+}
+
+// Makes a successful assertion result.
+AssertionResult AssertionSuccess() {
+  return AssertionResult(true);
+}
+
+// Makes a failed assertion result.
+AssertionResult AssertionFailure() {
+  return AssertionResult(false);
+}
+
+// Makes a failed assertion result with the given failure message.
+// Deprecated; use AssertionFailure() << message.
+AssertionResult AssertionFailure(const Message& message) {
+  return AssertionFailure() << message;
+}
+
+namespace internal {
+
+namespace edit_distance {
+std::vector<EditType> CalculateOptimalEdits(const std::vector<size_t>& left,
+                                            const std::vector<size_t>& right) {
+  std::vector<std::vector<double> > costs(
+      left.size() + 1, std::vector<double>(right.size() + 1));
+  std::vector<std::vector<EditType> > best_move(
+      left.size() + 1, std::vector<EditType>(right.size() + 1));
+
+  // Populate for empty right.
+  for (size_t l_i = 0; l_i < costs.size(); ++l_i) {
+    costs[l_i][0] = static_cast<double>(l_i);
+    best_move[l_i][0] = kRemove;
+  }
+  // Populate for empty left.
+  for (size_t r_i = 1; r_i < costs[0].size(); ++r_i) {
+    costs[0][r_i] = static_cast<double>(r_i);
+    best_move[0][r_i] = kAdd;
+  }
+
+  for (size_t l_i = 0; l_i < left.size(); ++l_i) {
+    for (size_t r_i = 0; r_i < right.size(); ++r_i) {
+      if (left[l_i] == right[r_i]) {
+        // Found a match. Consume it.
+        costs[l_i + 1][r_i + 1] = costs[l_i][r_i];
+        best_move[l_i + 1][r_i + 1] = kMatch;
+        continue;
+      }
+
+      const double add = costs[l_i + 1][r_i];
+      const double remove = costs[l_i][r_i + 1];
+      const double replace = costs[l_i][r_i];
+      if (add < remove && add < replace) {
+        costs[l_i + 1][r_i + 1] = add + 1;
+        best_move[l_i + 1][r_i + 1] = kAdd;
+      } else if (remove < add && remove < replace) {
+        costs[l_i + 1][r_i + 1] = remove + 1;
+        best_move[l_i + 1][r_i + 1] = kRemove;
+      } else {
+        // We make replace a little more expensive than add/remove to lower
+        // their priority.
+        costs[l_i + 1][r_i + 1] = replace + 1.00001;
+        best_move[l_i + 1][r_i + 1] = kReplace;
+      }
+    }
+  }
+
+  // Reconstruct the best path. We do it in reverse order.
+  std::vector<EditType> best_path;
+  for (size_t l_i = left.size(), r_i = right.size(); l_i > 0 || r_i > 0;) {
+    EditType move = best_move[l_i][r_i];
+    best_path.push_back(move);
+    l_i -= move != kAdd;
+    r_i -= move != kRemove;
+  }
+  std::reverse(best_path.begin(), best_path.end());
+  return best_path;
+}
+
+namespace {
+
+// Helper class to convert string into ids with deduplication.
+class InternalStrings {
+ public:
+  size_t GetId(const std::string& str) {
+    IdMap::iterator it = ids_.find(str);
+    if (it != ids_.end()) return it->second;
+    size_t id = ids_.size();
+    return ids_[str] = id;
+  }
+
+ private:
+  typedef std::map<std::string, size_t> IdMap;
+  IdMap ids_;
+};
+
+}  // namespace
+
+std::vector<EditType> CalculateOptimalEdits(
+    const std::vector<std::string>& left,
+    const std::vector<std::string>& right) {
+  std::vector<size_t> left_ids, right_ids;
+  {
+    InternalStrings intern_table;
+    for (size_t i = 0; i < left.size(); ++i) {
+      left_ids.push_back(intern_table.GetId(left[i]));
+    }
+    for (size_t i = 0; i < right.size(); ++i) {
+      right_ids.push_back(intern_table.GetId(right[i]));
+    }
+  }
+  return CalculateOptimalEdits(left_ids, right_ids);
+}
+
+namespace {
+
+// Helper class that holds the state for one hunk and prints it out to the
+// stream.
+// It reorders adds/removes when possible to group all removes before all
+// adds. It also adds the hunk header before printint into the stream.
+class Hunk {
+ public:
+  Hunk(size_t left_start, size_t right_start)
+      : left_start_(left_start),
+        right_start_(right_start),
+        adds_(),
+        removes_(),
+        common_() {}
+
+  void PushLine(char edit, const char* line) {
+    switch (edit) {
+      case ' ':
+        ++common_;
+        FlushEdits();
+        hunk_.push_back(std::make_pair(' ', line));
+        break;
+      case '-':
+        ++removes_;
+        hunk_removes_.push_back(std::make_pair('-', line));
+        break;
+      case '+':
+        ++adds_;
+        hunk_adds_.push_back(std::make_pair('+', line));
+        break;
+    }
+  }
+
+  void PrintTo(std::ostream* os) {
+    PrintHeader(os);
+    FlushEdits();
+    for (std::list<std::pair<char, const char*> >::const_iterator it =
+             hunk_.begin();
+         it != hunk_.end(); ++it) {
+      *os << it->first << it->second << "\n";
+    }
+  }
+
+  bool has_edits() const { return adds_ || removes_; }
+
+ private:
+  void FlushEdits() {
+    hunk_.splice(hunk_.end(), hunk_removes_);
+    hunk_.splice(hunk_.end(), hunk_adds_);
+  }
+
+  // Print a unified diff header for one hunk.
+  // The format is
+  //   "@@ -<left_start>,<left_length> +<right_start>,<right_length> @@"
+  // where the left/right parts are omitted if unnecessary.
+  void PrintHeader(std::ostream* ss) const {
+    *ss << "@@ ";
+    if (removes_) {
+      *ss << "-" << left_start_ << "," << (removes_ + common_);
+    }
+    if (removes_ && adds_) {
+      *ss << " ";
+    }
+    if (adds_) {
+      *ss << "+" << right_start_ << "," << (adds_ + common_);
+    }
+    *ss << " @@\n";
+  }
+
+  size_t left_start_, right_start_;
+  size_t adds_, removes_, common_;
+  std::list<std::pair<char, const char*> > hunk_, hunk_adds_, hunk_removes_;
+};
+
+}  // namespace
+
+// Create a list of diff hunks in Unified diff format.
+// Each hunk has a header generated by PrintHeader above plus a body with
+// lines prefixed with ' ' for no change, '-' for deletion and '+' for
+// addition.
+// 'context' represents the desired unchanged prefix/suffix around the diff.
+// If two hunks are close enough that their contexts overlap, then they are
+// joined into one hunk.
+std::string CreateUnifiedDiff(const std::vector<std::string>& left,
+                              const std::vector<std::string>& right,
+                              size_t context) {
+  const std::vector<EditType> edits = CalculateOptimalEdits(left, right);
+
+  size_t l_i = 0, r_i = 0, edit_i = 0;
+  std::stringstream ss;
+  while (edit_i < edits.size()) {
+    // Find first edit.
+    while (edit_i < edits.size() && edits[edit_i] == kMatch) {
+      ++l_i;
+      ++r_i;
+      ++edit_i;
+    }
+
+    // Find the first line to include in the hunk.
+    const size_t prefix_context = std::min(l_i, context);
+    Hunk hunk(l_i - prefix_context + 1, r_i - prefix_context + 1);
+    for (size_t i = prefix_context; i > 0; --i) {
+      hunk.PushLine(' ', left[l_i - i].c_str());
+    }
+
+    // Iterate the edits until we found enough suffix for the hunk or the input
+    // is over.
+    size_t n_suffix = 0;
+    for (; edit_i < edits.size(); ++edit_i) {
+      if (n_suffix >= context) {
+        // Continue only if the next hunk is very close.
+        auto it = edits.begin() + static_cast<int>(edit_i);
+        while (it != edits.end() && *it == kMatch) ++it;
+        if (it == edits.end() ||
+            static_cast<size_t>(it - edits.begin()) - edit_i >= context) {
+          // There is no next edit or it is too far away.
+          break;
+        }
+      }
+
+      EditType edit = edits[edit_i];
+      // Reset count when a non match is found.
+      n_suffix = edit == kMatch ? n_suffix + 1 : 0;
+
+      if (edit == kMatch || edit == kRemove || edit == kReplace) {
+        hunk.PushLine(edit == kMatch ? ' ' : '-', left[l_i].c_str());
+      }
+      if (edit == kAdd || edit == kReplace) {
+        hunk.PushLine('+', right[r_i].c_str());
+      }
+
+      // Advance indices, depending on edit type.
+      l_i += edit != kAdd;
+      r_i += edit != kRemove;
+    }
+
+    if (!hunk.has_edits()) {
+      // We are done. We don't want this hunk.
+      break;
+    }
+
+    hunk.PrintTo(&ss);
+  }
+  return ss.str();
+}
+
+}  // namespace edit_distance
+
+namespace {
+
+// The string representation of the values received in EqFailure() are already
+// escaped. Split them on escaped '\n' boundaries. Leave all other escaped
+// characters the same.
+std::vector<std::string> SplitEscapedString(const std::string& str) {
+  std::vector<std::string> lines;
+  size_t start = 0, end = str.size();
+  if (end > 2 && str[0] == '"' && str[end - 1] == '"') {
+    ++start;
+    --end;
+  }
+  bool escaped = false;
+  for (size_t i = start; i + 1 < end; ++i) {
+    if (escaped) {
+      escaped = false;
+      if (str[i] == 'n') {
+        lines.push_back(str.substr(start, i - start - 1));
+        start = i + 1;
+      }
+    } else {
+      escaped = str[i] == '\\';
+    }
+  }
+  lines.push_back(str.substr(start, end - start));
+  return lines;
+}
+
+}  // namespace
+
+// Constructs and returns the message for an equality assertion
+// (e.g. ASSERT_EQ, EXPECT_STREQ, etc) failure.
+//
+// The first four parameters are the expressions used in the assertion
+// and their values, as strings.  For example, for ASSERT_EQ(foo, bar)
+// where foo is 5 and bar is 6, we have:
+//
+//   lhs_expression: "foo"
+//   rhs_expression: "bar"
+//   lhs_value:      "5"
+//   rhs_value:      "6"
+//
+// The ignoring_case parameter is true if and only if the assertion is a
+// *_STRCASEEQ*.  When it's true, the string "Ignoring case" will
+// be inserted into the message.
+AssertionResult EqFailure(const char* lhs_expression,
+                          const char* rhs_expression,
+                          const std::string& lhs_value,
+                          const std::string& rhs_value,
+                          bool ignoring_case) {
+  Message msg;
+  msg << "Expected equality of these values:";
+  msg << "\n  " << lhs_expression;
+  if (lhs_value != lhs_expression) {
+    msg << "\n    Which is: " << lhs_value;
+  }
+  msg << "\n  " << rhs_expression;
+  if (rhs_value != rhs_expression) {
+    msg << "\n    Which is: " << rhs_value;
+  }
+
+  if (ignoring_case) {
+    msg << "\nIgnoring case";
+  }
+
+  if (!lhs_value.empty() && !rhs_value.empty()) {
+    const std::vector<std::string> lhs_lines =
+        SplitEscapedString(lhs_value);
+    const std::vector<std::string> rhs_lines =
+        SplitEscapedString(rhs_value);
+    if (lhs_lines.size() > 1 || rhs_lines.size() > 1) {
+      msg << "\nWith diff:\n"
+          << edit_distance::CreateUnifiedDiff(lhs_lines, rhs_lines);
+    }
+  }
+
+  return AssertionFailure() << msg;
+}
+
+// Constructs a failure message for Boolean assertions such as EXPECT_TRUE.
+std::string GetBoolAssertionFailureMessage(
+    const AssertionResult& assertion_result,
+    const char* expression_text,
+    const char* actual_predicate_value,
+    const char* expected_predicate_value) {
+  const char* actual_message = assertion_result.message();
+  Message msg;
+  msg << "Value of: " << expression_text
+      << "\n  Actual: " << actual_predicate_value;
+  if (actual_message[0] != '\0')
+    msg << " (" << actual_message << ")";
+  msg << "\nExpected: " << expected_predicate_value;
+  return msg.GetString();
+}
+
+// Helper function for implementing ASSERT_NEAR.
+AssertionResult DoubleNearPredFormat(const char* expr1,
+                                     const char* expr2,
+                                     const char* abs_error_expr,
+                                     double val1,
+                                     double val2,
+                                     double abs_error) {
+  const double diff = fabs(val1 - val2);
+  if (diff <= abs_error) return AssertionSuccess();
+
+  // Find the value which is closest to zero.
+  const double min_abs = std::min(fabs(val1), fabs(val2));
+  // Find the distance to the next double from that value.
+  const double epsilon =
+      nextafter(min_abs, std::numeric_limits<double>::infinity()) - min_abs;
+  // Detect the case where abs_error is so small that EXPECT_NEAR is
+  // effectively the same as EXPECT_EQUAL, and give an informative error
+  // message so that the situation can be more easily understood without
+  // requiring exotic floating-point knowledge.
+  // Don't do an epsilon check if abs_error is zero because that implies
+  // that an equality check was actually intended.
+  if (!(std::isnan)(val1) && !(std::isnan)(val2) && abs_error > 0 &&
+      abs_error < epsilon) {
+    return AssertionFailure()
+           << "The difference between " << expr1 << " and " << expr2 << " is "
+           << diff << ", where\n"
+           << expr1 << " evaluates to " << val1 << ",\n"
+           << expr2 << " evaluates to " << val2 << ".\nThe abs_error parameter "
+           << abs_error_expr << " evaluates to " << abs_error
+           << " which is smaller than the minimum distance between doubles for "
+              "numbers of this magnitude which is "
+           << epsilon
+           << ", thus making this EXPECT_NEAR check equivalent to "
+              "EXPECT_EQUAL. Consider using EXPECT_DOUBLE_EQ instead.";
+  }
+  return AssertionFailure()
+      << "The difference between " << expr1 << " and " << expr2
+      << " is " << diff << ", which exceeds " << abs_error_expr << ", where\n"
+      << expr1 << " evaluates to " << val1 << ",\n"
+      << expr2 << " evaluates to " << val2 << ", and\n"
+      << abs_error_expr << " evaluates to " << abs_error << ".";
+}
+
+
+// Helper template for implementing FloatLE() and DoubleLE().
+template <typename RawType>
+AssertionResult FloatingPointLE(const char* expr1,
+                                const char* expr2,
+                                RawType val1,
+                                RawType val2) {
+  // Returns success if val1 is less than val2,
+  if (val1 < val2) {
+    return AssertionSuccess();
+  }
+
+  // or if val1 is almost equal to val2.
+  const FloatingPoint<RawType> lhs(val1), rhs(val2);
+  if (lhs.AlmostEquals(rhs)) {
+    return AssertionSuccess();
+  }
+
+  // Note that the above two checks will both fail if either val1 or
+  // val2 is NaN, as the IEEE floating-point standard requires that
+  // any predicate involving a NaN must return false.
+
+  ::std::stringstream val1_ss;
+  val1_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
+          << val1;
+
+  ::std::stringstream val2_ss;
+  val2_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
+          << val2;
+
+  return AssertionFailure()
+      << "Expected: (" << expr1 << ") <= (" << expr2 << ")\n"
+      << "  Actual: " << StringStreamToString(&val1_ss) << " vs "
+      << StringStreamToString(&val2_ss);
+}
+
+}  // namespace internal
+
+// Asserts that val1 is less than, or almost equal to, val2.  Fails
+// otherwise.  In particular, it fails if either val1 or val2 is NaN.
+AssertionResult FloatLE(const char* expr1, const char* expr2,
+                        float val1, float val2) {
+  return internal::FloatingPointLE<float>(expr1, expr2, val1, val2);
+}
+
+// Asserts that val1 is less than, or almost equal to, val2.  Fails
+// otherwise.  In particular, it fails if either val1 or val2 is NaN.
+AssertionResult DoubleLE(const char* expr1, const char* expr2,
+                         double val1, double val2) {
+  return internal::FloatingPointLE<double>(expr1, expr2, val1, val2);
+}
+
+namespace internal {
+
+// The helper function for {ASSERT|EXPECT}_STREQ.
+AssertionResult CmpHelperSTREQ(const char* lhs_expression,
+                               const char* rhs_expression,
+                               const char* lhs,
+                               const char* rhs) {
+  if (String::CStringEquals(lhs, rhs)) {
+    return AssertionSuccess();
+  }
+
+  return EqFailure(lhs_expression,
+                   rhs_expression,
+                   PrintToString(lhs),
+                   PrintToString(rhs),
+                   false);
+}
+
+// The helper function for {ASSERT|EXPECT}_STRCASEEQ.
+AssertionResult CmpHelperSTRCASEEQ(const char* lhs_expression,
+                                   const char* rhs_expression,
+                                   const char* lhs,
+                                   const char* rhs) {
+  if (String::CaseInsensitiveCStringEquals(lhs, rhs)) {
+    return AssertionSuccess();
+  }
+
+  return EqFailure(lhs_expression,
+                   rhs_expression,
+                   PrintToString(lhs),
+                   PrintToString(rhs),
+                   true);
+}
+
+// The helper function for {ASSERT|EXPECT}_STRNE.
+AssertionResult CmpHelperSTRNE(const char* s1_expression,
+                               const char* s2_expression,
+                               const char* s1,
+                               const char* s2) {
+  if (!String::CStringEquals(s1, s2)) {
+    return AssertionSuccess();
+  } else {
+    return AssertionFailure() << "Expected: (" << s1_expression << ") != ("
+                              << s2_expression << "), actual: \""
+                              << s1 << "\" vs \"" << s2 << "\"";
+  }
+}
+
+// The helper function for {ASSERT|EXPECT}_STRCASENE.
+AssertionResult CmpHelperSTRCASENE(const char* s1_expression,
+                                   const char* s2_expression,
+                                   const char* s1,
+                                   const char* s2) {
+  if (!String::CaseInsensitiveCStringEquals(s1, s2)) {
+    return AssertionSuccess();
+  } else {
+    return AssertionFailure()
+        << "Expected: (" << s1_expression << ") != ("
+        << s2_expression << ") (ignoring case), actual: \""
+        << s1 << "\" vs \"" << s2 << "\"";
+  }
+}
+
+}  // namespace internal
+
+namespace {
+
+// Helper functions for implementing IsSubString() and IsNotSubstring().
+
+// This group of overloaded functions return true if and only if needle
+// is a substring of haystack.  NULL is considered a substring of
+// itself only.
+
+bool IsSubstringPred(const char* needle, const char* haystack) {
+  if (needle == nullptr || haystack == nullptr) return needle == haystack;
+
+  return strstr(haystack, needle) != nullptr;
+}
+
+bool IsSubstringPred(const wchar_t* needle, const wchar_t* haystack) {
+  if (needle == nullptr || haystack == nullptr) return needle == haystack;
+
+  return wcsstr(haystack, needle) != nullptr;
+}
+
+// StringType here can be either ::std::string or ::std::wstring.
+template <typename StringType>
+bool IsSubstringPred(const StringType& needle,
+                     const StringType& haystack) {
+  return haystack.find(needle) != StringType::npos;
+}
+
+// This function implements either IsSubstring() or IsNotSubstring(),
+// depending on the value of the expected_to_be_substring parameter.
+// StringType here can be const char*, const wchar_t*, ::std::string,
+// or ::std::wstring.
+template <typename StringType>
+AssertionResult IsSubstringImpl(
+    bool expected_to_be_substring,
+    const char* needle_expr, const char* haystack_expr,
+    const StringType& needle, const StringType& haystack) {
+  if (IsSubstringPred(needle, haystack) == expected_to_be_substring)
+    return AssertionSuccess();
+
+  const bool is_wide_string = sizeof(needle[0]) > 1;
+  const char* const begin_string_quote = is_wide_string ? "L\"" : "\"";
+  return AssertionFailure()
+      << "Value of: " << needle_expr << "\n"
+      << "  Actual: " << begin_string_quote << needle << "\"\n"
+      << "Expected: " << (expected_to_be_substring ? "" : "not ")
+      << "a substring of " << haystack_expr << "\n"
+      << "Which is: " << begin_string_quote << haystack << "\"";
+}
+
+}  // namespace
+
+// IsSubstring() and IsNotSubstring() check whether needle is a
+// substring of haystack (NULL is considered a substring of itself
+// only), and return an appropriate error message when they fail.
+
+AssertionResult IsSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const char* needle, const char* haystack) {
+  return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack);
+}
+
+AssertionResult IsSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const wchar_t* needle, const wchar_t* haystack) {
+  return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack);
+}
+
+AssertionResult IsNotSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const char* needle, const char* haystack) {
+  return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack);
+}
+
+AssertionResult IsNotSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const wchar_t* needle, const wchar_t* haystack) {
+  return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack);
+}
+
+AssertionResult IsSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const ::std::string& needle, const ::std::string& haystack) {
+  return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack);
+}
+
+AssertionResult IsNotSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const ::std::string& needle, const ::std::string& haystack) {
+  return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack);
+}
+
+#if GTEST_HAS_STD_WSTRING
+AssertionResult IsSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const ::std::wstring& needle, const ::std::wstring& haystack) {
+  return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack);
+}
+
+AssertionResult IsNotSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const ::std::wstring& needle, const ::std::wstring& haystack) {
+  return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack);
+}
+#endif  // GTEST_HAS_STD_WSTRING
+
+namespace internal {
+
+#if GTEST_OS_WINDOWS
+
+namespace {
+
+// Helper function for IsHRESULT{SuccessFailure} predicates
+AssertionResult HRESULTFailureHelper(const char* expr,
+                                     const char* expected,
+                                     long hr) {  // NOLINT
+# if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_TV_TITLE
+
+  // Windows CE doesn't support FormatMessage.
+  const char error_text[] = "";
+
+# else
+
+  // Looks up the human-readable system message for the HRESULT code
+  // and since we're not passing any params to FormatMessage, we don't
+  // want inserts expanded.
+  const DWORD kFlags = FORMAT_MESSAGE_FROM_SYSTEM |
+                       FORMAT_MESSAGE_IGNORE_INSERTS;
+  const DWORD kBufSize = 4096;
+  // Gets the system's human readable message string for this HRESULT.
+  char error_text[kBufSize] = { '\0' };
+  DWORD message_length = ::FormatMessageA(kFlags,
+                                          0,   // no source, we're asking system
+                                          static_cast<DWORD>(hr),  // the error
+                                          0,   // no line width restrictions
+                                          error_text,  // output buffer
+                                          kBufSize,    // buf size
+                                          nullptr);  // no arguments for inserts
+  // Trims tailing white space (FormatMessage leaves a trailing CR-LF)
+  for (; message_length && IsSpace(error_text[message_length - 1]);
+          --message_length) {
+    error_text[message_length - 1] = '\0';
+  }
+
+# endif  // GTEST_OS_WINDOWS_MOBILE
+
+  const std::string error_hex("0x" + String::FormatHexInt(hr));
+  return ::testing::AssertionFailure()
+      << "Expected: " << expr << " " << expected << ".\n"
+      << "  Actual: " << error_hex << " " << error_text << "\n";
+}
+
+}  // namespace
+
+AssertionResult IsHRESULTSuccess(const char* expr, long hr) {  // NOLINT
+  if (SUCCEEDED(hr)) {
+    return AssertionSuccess();
+  }
+  return HRESULTFailureHelper(expr, "succeeds", hr);
+}
+
+AssertionResult IsHRESULTFailure(const char* expr, long hr) {  // NOLINT
+  if (FAILED(hr)) {
+    return AssertionSuccess();
+  }
+  return HRESULTFailureHelper(expr, "fails", hr);
+}
+
+#endif  // GTEST_OS_WINDOWS
+
+// Utility functions for encoding Unicode text (wide strings) in
+// UTF-8.
+
+// A Unicode code-point can have up to 21 bits, and is encoded in UTF-8
+// like this:
+//
+// Code-point length   Encoding
+//   0 -  7 bits       0xxxxxxx
+//   8 - 11 bits       110xxxxx 10xxxxxx
+//  12 - 16 bits       1110xxxx 10xxxxxx 10xxxxxx
+//  17 - 21 bits       11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+
+// The maximum code-point a one-byte UTF-8 sequence can represent.
+constexpr uint32_t kMaxCodePoint1 = (static_cast<uint32_t>(1) <<  7) - 1;
+
+// The maximum code-point a two-byte UTF-8 sequence can represent.
+constexpr uint32_t kMaxCodePoint2 = (static_cast<uint32_t>(1) << (5 + 6)) - 1;
+
+// The maximum code-point a three-byte UTF-8 sequence can represent.
+constexpr uint32_t kMaxCodePoint3 = (static_cast<uint32_t>(1) << (4 + 2*6)) - 1;
+
+// The maximum code-point a four-byte UTF-8 sequence can represent.
+constexpr uint32_t kMaxCodePoint4 = (static_cast<uint32_t>(1) << (3 + 3*6)) - 1;
+
+// Chops off the n lowest bits from a bit pattern.  Returns the n
+// lowest bits.  As a side effect, the original bit pattern will be
+// shifted to the right by n bits.
+inline uint32_t ChopLowBits(uint32_t* bits, int n) {
+  const uint32_t low_bits = *bits & ((static_cast<uint32_t>(1) << n) - 1);
+  *bits >>= n;
+  return low_bits;
+}
+
+// Converts a Unicode code point to a narrow string in UTF-8 encoding.
+// code_point parameter is of type uint32_t because wchar_t may not be
+// wide enough to contain a code point.
+// If the code_point is not a valid Unicode code point
+// (i.e. outside of Unicode range U+0 to U+10FFFF) it will be converted
+// to "(Invalid Unicode 0xXXXXXXXX)".
+std::string CodePointToUtf8(uint32_t code_point) {
+  if (code_point > kMaxCodePoint4) {
+    return "(Invalid Unicode 0x" + String::FormatHexUInt32(code_point) + ")";
+  }
+
+  char str[5];  // Big enough for the largest valid code point.
+  if (code_point <= kMaxCodePoint1) {
+    str[1] = '\0';
+    str[0] = static_cast<char>(code_point);                          // 0xxxxxxx
+  } else if (code_point <= kMaxCodePoint2) {
+    str[2] = '\0';
+    str[1] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
+    str[0] = static_cast<char>(0xC0 | code_point);                   // 110xxxxx
+  } else if (code_point <= kMaxCodePoint3) {
+    str[3] = '\0';
+    str[2] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
+    str[1] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
+    str[0] = static_cast<char>(0xE0 | code_point);                   // 1110xxxx
+  } else {  // code_point <= kMaxCodePoint4
+    str[4] = '\0';
+    str[3] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
+    str[2] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
+    str[1] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
+    str[0] = static_cast<char>(0xF0 | code_point);                   // 11110xxx
+  }
+  return str;
+}
+
+// The following two functions only make sense if the system
+// uses UTF-16 for wide string encoding. All supported systems
+// with 16 bit wchar_t (Windows, Cygwin) do use UTF-16.
+
+// Determines if the arguments constitute UTF-16 surrogate pair
+// and thus should be combined into a single Unicode code point
+// using CreateCodePointFromUtf16SurrogatePair.
+inline bool IsUtf16SurrogatePair(wchar_t first, wchar_t second) {
+  return sizeof(wchar_t) == 2 &&
+      (first & 0xFC00) == 0xD800 && (second & 0xFC00) == 0xDC00;
+}
+
+// Creates a Unicode code point from UTF16 surrogate pair.
+inline uint32_t CreateCodePointFromUtf16SurrogatePair(wchar_t first,
+                                                      wchar_t second) {
+  const auto first_u = static_cast<uint32_t>(first);
+  const auto second_u = static_cast<uint32_t>(second);
+  const uint32_t mask = (1 << 10) - 1;
+  return (sizeof(wchar_t) == 2)
+             ? (((first_u & mask) << 10) | (second_u & mask)) + 0x10000
+             :
+             // This function should not be called when the condition is
+             // false, but we provide a sensible default in case it is.
+             first_u;
+}
+
+// Converts a wide string to a narrow string in UTF-8 encoding.
+// The wide string is assumed to have the following encoding:
+//   UTF-16 if sizeof(wchar_t) == 2 (on Windows, Cygwin)
+//   UTF-32 if sizeof(wchar_t) == 4 (on Linux)
+// Parameter str points to a null-terminated wide string.
+// Parameter num_chars may additionally limit the number
+// of wchar_t characters processed. -1 is used when the entire string
+// should be processed.
+// If the string contains code points that are not valid Unicode code points
+// (i.e. outside of Unicode range U+0 to U+10FFFF) they will be output
+// as '(Invalid Unicode 0xXXXXXXXX)'. If the string is in UTF16 encoding
+// and contains invalid UTF-16 surrogate pairs, values in those pairs
+// will be encoded as individual Unicode characters from Basic Normal Plane.
+std::string WideStringToUtf8(const wchar_t* str, int num_chars) {
+  if (num_chars == -1)
+    num_chars = static_cast<int>(wcslen(str));
+
+  ::std::stringstream stream;
+  for (int i = 0; i < num_chars; ++i) {
+    uint32_t unicode_code_point;
+
+    if (str[i] == L'\0') {
+      break;
+    } else if (i + 1 < num_chars && IsUtf16SurrogatePair(str[i], str[i + 1])) {
+      unicode_code_point = CreateCodePointFromUtf16SurrogatePair(str[i],
+                                                                 str[i + 1]);
+      i++;
+    } else {
+      unicode_code_point = static_cast<uint32_t>(str[i]);
+    }
+
+    stream << CodePointToUtf8(unicode_code_point);
+  }
+  return StringStreamToString(&stream);
+}
+
+// Converts a wide C string to an std::string using the UTF-8 encoding.
+// NULL will be converted to "(null)".
+std::string String::ShowWideCString(const wchar_t * wide_c_str) {
+  if (wide_c_str == nullptr) return "(null)";
+
+  return internal::WideStringToUtf8(wide_c_str, -1);
+}
+
+// Compares two wide C strings.  Returns true if and only if they have the
+// same content.
+//
+// Unlike wcscmp(), this function can handle NULL argument(s).  A NULL
+// C string is considered different to any non-NULL C string,
+// including the empty string.
+bool String::WideCStringEquals(const wchar_t * lhs, const wchar_t * rhs) {
+  if (lhs == nullptr) return rhs == nullptr;
+
+  if (rhs == nullptr) return false;
+
+  return wcscmp(lhs, rhs) == 0;
+}
+
+// Helper function for *_STREQ on wide strings.
+AssertionResult CmpHelperSTREQ(const char* lhs_expression,
+                               const char* rhs_expression,
+                               const wchar_t* lhs,
+                               const wchar_t* rhs) {
+  if (String::WideCStringEquals(lhs, rhs)) {
+    return AssertionSuccess();
+  }
+
+  return EqFailure(lhs_expression,
+                   rhs_expression,
+                   PrintToString(lhs),
+                   PrintToString(rhs),
+                   false);
+}
+
+// Helper function for *_STRNE on wide strings.
+AssertionResult CmpHelperSTRNE(const char* s1_expression,
+                               const char* s2_expression,
+                               const wchar_t* s1,
+                               const wchar_t* s2) {
+  if (!String::WideCStringEquals(s1, s2)) {
+    return AssertionSuccess();
+  }
+
+  return AssertionFailure() << "Expected: (" << s1_expression << ") != ("
+                            << s2_expression << "), actual: "
+                            << PrintToString(s1)
+                            << " vs " << PrintToString(s2);
+}
+
+// Compares two C strings, ignoring case.  Returns true if and only if they have
+// the same content.
+//
+// Unlike strcasecmp(), this function can handle NULL argument(s).  A
+// NULL C string is considered different to any non-NULL C string,
+// including the empty string.
+bool String::CaseInsensitiveCStringEquals(const char * lhs, const char * rhs) {
+  if (lhs == nullptr) return rhs == nullptr;
+  if (rhs == nullptr) return false;
+  return posix::StrCaseCmp(lhs, rhs) == 0;
+}
+
+// Compares two wide C strings, ignoring case.  Returns true if and only if they
+// have the same content.
+//
+// Unlike wcscasecmp(), this function can handle NULL argument(s).
+// A NULL C string is considered different to any non-NULL wide C string,
+// including the empty string.
+// NB: The implementations on different platforms slightly differ.
+// On windows, this method uses _wcsicmp which compares according to LC_CTYPE
+// environment variable. On GNU platform this method uses wcscasecmp
+// which compares according to LC_CTYPE category of the current locale.
+// On MacOS X, it uses towlower, which also uses LC_CTYPE category of the
+// current locale.
+bool String::CaseInsensitiveWideCStringEquals(const wchar_t* lhs,
+                                              const wchar_t* rhs) {
+  if (lhs == nullptr) return rhs == nullptr;
+
+  if (rhs == nullptr) return false;
+
+#if GTEST_OS_WINDOWS
+  return _wcsicmp(lhs, rhs) == 0;
+#elif GTEST_OS_LINUX && !GTEST_OS_LINUX_ANDROID
+  return wcscasecmp(lhs, rhs) == 0;
+#else
+  // Android, Mac OS X and Cygwin don't define wcscasecmp.
+  // Other unknown OSes may not define it either.
+  wint_t left, right;
+  do {
+    left = towlower(static_cast<wint_t>(*lhs++));
+    right = towlower(static_cast<wint_t>(*rhs++));
+  } while (left && left == right);
+  return left == right;
+#endif  // OS selector
+}
+
+// Returns true if and only if str ends with the given suffix, ignoring case.
+// Any string is considered to end with an empty suffix.
+bool String::EndsWithCaseInsensitive(
+    const std::string& str, const std::string& suffix) {
+  const size_t str_len = str.length();
+  const size_t suffix_len = suffix.length();
+  return (str_len >= suffix_len) &&
+         CaseInsensitiveCStringEquals(str.c_str() + str_len - suffix_len,
+                                      suffix.c_str());
+}
+
+// Formats an int value as "%02d".
+std::string String::FormatIntWidth2(int value) {
+  return FormatIntWidthN(value, 2);
+}
+
+// Formats an int value to given width with leading zeros.
+std::string String::FormatIntWidthN(int value, int width) {
+  std::stringstream ss;
+  ss << std::setfill('0') << std::setw(width) << value;
+  return ss.str();
+}
+
+// Formats an int value as "%X".
+std::string String::FormatHexUInt32(uint32_t value) {
+  std::stringstream ss;
+  ss << std::hex << std::uppercase << value;
+  return ss.str();
+}
+
+// Formats an int value as "%X".
+std::string String::FormatHexInt(int value) {
+  return FormatHexUInt32(static_cast<uint32_t>(value));
+}
+
+// Formats a byte as "%02X".
+std::string String::FormatByte(unsigned char value) {
+  std::stringstream ss;
+  ss << std::setfill('0') << std::setw(2) << std::hex << std::uppercase
+     << static_cast<unsigned int>(value);
+  return ss.str();
+}
+
+// Converts the buffer in a stringstream to an std::string, converting NUL
+// bytes to "\\0" along the way.
+std::string StringStreamToString(::std::stringstream* ss) {
+  const ::std::string& str = ss->str();
+  const char* const start = str.c_str();
+  const char* const end = start + str.length();
+
+  std::string result;
+  result.reserve(static_cast<size_t>(2 * (end - start)));
+  for (const char* ch = start; ch != end; ++ch) {
+    if (*ch == '\0') {
+      result += "\\0";  // Replaces NUL with "\\0";
+    } else {
+      result += *ch;
+    }
+  }
+
+  return result;
+}
+
+// Appends the user-supplied message to the Google-Test-generated message.
+std::string AppendUserMessage(const std::string& gtest_msg,
+                              const Message& user_msg) {
+  // Appends the user message if it's non-empty.
+  const std::string user_msg_string = user_msg.GetString();
+  if (user_msg_string.empty()) {
+    return gtest_msg;
+  }
+  if (gtest_msg.empty()) {
+    return user_msg_string;
+  }
+  return gtest_msg + "\n" + user_msg_string;
+}
+
+}  // namespace internal
+
+// class TestResult
+
+// Creates an empty TestResult.
+TestResult::TestResult()
+    : death_test_count_(0), start_timestamp_(0), elapsed_time_(0) {}
+
+// D'tor.
+TestResult::~TestResult() {
+}
+
+// Returns the i-th test part result among all the results. i can
+// range from 0 to total_part_count() - 1. If i is not in that range,
+// aborts the program.
+const TestPartResult& TestResult::GetTestPartResult(int i) const {
+  if (i < 0 || i >= total_part_count())
+    internal::posix::Abort();
+  return test_part_results_.at(static_cast<size_t>(i));
+}
+
+// Returns the i-th test property. i can range from 0 to
+// test_property_count() - 1. If i is not in that range, aborts the
+// program.
+const TestProperty& TestResult::GetTestProperty(int i) const {
+  if (i < 0 || i >= test_property_count())
+    internal::posix::Abort();
+  return test_properties_.at(static_cast<size_t>(i));
+}
+
+// Clears the test part results.
+void TestResult::ClearTestPartResults() {
+  test_part_results_.clear();
+}
+
+// Adds a test part result to the list.
+void TestResult::AddTestPartResult(const TestPartResult& test_part_result) {
+  test_part_results_.push_back(test_part_result);
+}
+
+// Adds a test property to the list. If a property with the same key as the
+// supplied property is already represented, the value of this test_property
+// replaces the old value for that key.
+void TestResult::RecordProperty(const std::string& xml_element,
+                                const TestProperty& test_property) {
+  if (!ValidateTestProperty(xml_element, test_property)) {
+    return;
+  }
+  internal::MutexLock lock(&test_properties_mutex_);
+  const std::vector<TestProperty>::iterator property_with_matching_key =
+      std::find_if(test_properties_.begin(), test_properties_.end(),
+                   internal::TestPropertyKeyIs(test_property.key()));
+  if (property_with_matching_key == test_properties_.end()) {
+    test_properties_.push_back(test_property);
+    return;
+  }
+  property_with_matching_key->SetValue(test_property.value());
+}
+
+// The list of reserved attributes used in the <testsuites> element of XML
+// output.
+static const char* const kReservedTestSuitesAttributes[] = {
+  "disabled",
+  "errors",
+  "failures",
+  "name",
+  "random_seed",
+  "tests",
+  "time",
+  "timestamp"
+};
+
+// The list of reserved attributes used in the <testsuite> element of XML
+// output.
+static const char* const kReservedTestSuiteAttributes[] = {
+    "disabled", "errors", "failures",  "name",
+    "tests",    "time",   "timestamp", "skipped"};
+
+// The list of reserved attributes used in the <testcase> element of XML output.
+static const char* const kReservedTestCaseAttributes[] = {
+    "classname",   "name", "status", "time",  "type_param",
+    "value_param", "file", "line"};
+
+// Use a slightly different set for allowed output to ensure existing tests can
+// still RecordProperty("result") or "RecordProperty(timestamp")
+static const char* const kReservedOutputTestCaseAttributes[] = {
+    "classname",   "name", "status", "time",   "type_param",
+    "value_param", "file", "line",   "result", "timestamp"};
+
+template <size_t kSize>
+std::vector<std::string> ArrayAsVector(const char* const (&array)[kSize]) {
+  return std::vector<std::string>(array, array + kSize);
+}
+
+static std::vector<std::string> GetReservedAttributesForElement(
+    const std::string& xml_element) {
+  if (xml_element == "testsuites") {
+    return ArrayAsVector(kReservedTestSuitesAttributes);
+  } else if (xml_element == "testsuite") {
+    return ArrayAsVector(kReservedTestSuiteAttributes);
+  } else if (xml_element == "testcase") {
+    return ArrayAsVector(kReservedTestCaseAttributes);
+  } else {
+    GTEST_CHECK_(false) << "Unrecognized xml_element provided: " << xml_element;
+  }
+  // This code is unreachable but some compilers may not realizes that.
+  return std::vector<std::string>();
+}
+
+// TODO(jdesprez): Merge the two getReserved attributes once skip is improved
+static std::vector<std::string> GetReservedOutputAttributesForElement(
+    const std::string& xml_element) {
+  if (xml_element == "testsuites") {
+    return ArrayAsVector(kReservedTestSuitesAttributes);
+  } else if (xml_element == "testsuite") {
+    return ArrayAsVector(kReservedTestSuiteAttributes);
+  } else if (xml_element == "testcase") {
+    return ArrayAsVector(kReservedOutputTestCaseAttributes);
+  } else {
+    GTEST_CHECK_(false) << "Unrecognized xml_element provided: " << xml_element;
+  }
+  // This code is unreachable but some compilers may not realizes that.
+  return std::vector<std::string>();
+}
+
+static std::string FormatWordList(const std::vector<std::string>& words) {
+  Message word_list;
+  for (size_t i = 0; i < words.size(); ++i) {
+    if (i > 0 && words.size() > 2) {
+      word_list << ", ";
+    }
+    if (i == words.size() - 1) {
+      word_list << "and ";
+    }
+    word_list << "'" << words[i] << "'";
+  }
+  return word_list.GetString();
+}
+
+static bool ValidateTestPropertyName(
+    const std::string& property_name,
+    const std::vector<std::string>& reserved_names) {
+  if (std::find(reserved_names.begin(), reserved_names.end(), property_name) !=
+          reserved_names.end()) {
+    ADD_FAILURE() << "Reserved key used in RecordProperty(): " << property_name
+                  << " (" << FormatWordList(reserved_names)
+                  << " are reserved by " << GTEST_NAME_ << ")";
+    return false;
+  }
+  return true;
+}
+
+// Adds a failure if the key is a reserved attribute of the element named
+// xml_element.  Returns true if the property is valid.
+bool TestResult::ValidateTestProperty(const std::string& xml_element,
+                                      const TestProperty& test_property) {
+  return ValidateTestPropertyName(test_property.key(),
+                                  GetReservedAttributesForElement(xml_element));
+}
+
+// Clears the object.
+void TestResult::Clear() {
+  test_part_results_.clear();
+  test_properties_.clear();
+  death_test_count_ = 0;
+  elapsed_time_ = 0;
+}
+
+// Returns true off the test part was skipped.
+static bool TestPartSkipped(const TestPartResult& result) {
+  return result.skipped();
+}
+
+// Returns true if and only if the test was skipped.
+bool TestResult::Skipped() const {
+  return !Failed() && CountIf(test_part_results_, TestPartSkipped) > 0;
+}
+
+// Returns true if and only if the test failed.
+bool TestResult::Failed() const {
+  for (int i = 0; i < total_part_count(); ++i) {
+    if (GetTestPartResult(i).failed())
+      return true;
+  }
+  return false;
+}
+
+// Returns true if and only if the test part fatally failed.
+static bool TestPartFatallyFailed(const TestPartResult& result) {
+  return result.fatally_failed();
+}
+
+// Returns true if and only if the test fatally failed.
+bool TestResult::HasFatalFailure() const {
+  return CountIf(test_part_results_, TestPartFatallyFailed) > 0;
+}
+
+// Returns true if and only if the test part non-fatally failed.
+static bool TestPartNonfatallyFailed(const TestPartResult& result) {
+  return result.nonfatally_failed();
+}
+
+// Returns true if and only if the test has a non-fatal failure.
+bool TestResult::HasNonfatalFailure() const {
+  return CountIf(test_part_results_, TestPartNonfatallyFailed) > 0;
+}
+
+// Gets the number of all test parts.  This is the sum of the number
+// of successful test parts and the number of failed test parts.
+int TestResult::total_part_count() const {
+  return static_cast<int>(test_part_results_.size());
+}
+
+// Returns the number of the test properties.
+int TestResult::test_property_count() const {
+  return static_cast<int>(test_properties_.size());
+}
+
+// class Test
+
+// Creates a Test object.
+
+// The c'tor saves the states of all flags.
+Test::Test()
+    : gtest_flag_saver_(new GTEST_FLAG_SAVER_) {
+}
+
+// The d'tor restores the states of all flags.  The actual work is
+// done by the d'tor of the gtest_flag_saver_ field, and thus not
+// visible here.
+Test::~Test() {
+}
+
+// Sets up the test fixture.
+//
+// A sub-class may override this.
+void Test::SetUp() {
+}
+
+// Tears down the test fixture.
+//
+// A sub-class may override this.
+void Test::TearDown() {
+}
+
+// Allows user supplied key value pairs to be recorded for later output.
+void Test::RecordProperty(const std::string& key, const std::string& value) {
+  UnitTest::GetInstance()->RecordProperty(key, value);
+}
+
+// Allows user supplied key value pairs to be recorded for later output.
+void Test::RecordProperty(const std::string& key, int value) {
+  Message value_message;
+  value_message << value;
+  RecordProperty(key, value_message.GetString().c_str());
+}
+
+namespace internal {
+
+void ReportFailureInUnknownLocation(TestPartResult::Type result_type,
+                                    const std::string& message) {
+  // This function is a friend of UnitTest and as such has access to
+  // AddTestPartResult.
+  UnitTest::GetInstance()->AddTestPartResult(
+      result_type,
+      nullptr,  // No info about the source file where the exception occurred.
+      -1,       // We have no info on which line caused the exception.
+      message,
+      "");  // No stack trace, either.
+}
+
+}  // namespace internal
+
+// Google Test requires all tests in the same test suite to use the same test
+// fixture class.  This function checks if the current test has the
+// same fixture class as the first test in the current test suite.  If
+// yes, it returns true; otherwise it generates a Google Test failure and
+// returns false.
+bool Test::HasSameFixtureClass() {
+  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
+  const TestSuite* const test_suite = impl->current_test_suite();
+
+  // Info about the first test in the current test suite.
+  const TestInfo* const first_test_info = test_suite->test_info_list()[0];
+  const internal::TypeId first_fixture_id = first_test_info->fixture_class_id_;
+  const char* const first_test_name = first_test_info->name();
+
+  // Info about the current test.
+  const TestInfo* const this_test_info = impl->current_test_info();
+  const internal::TypeId this_fixture_id = this_test_info->fixture_class_id_;
+  const char* const this_test_name = this_test_info->name();
+
+  if (this_fixture_id != first_fixture_id) {
+    // Is the first test defined using TEST?
+    const bool first_is_TEST = first_fixture_id == internal::GetTestTypeId();
+    // Is this test defined using TEST?
+    const bool this_is_TEST = this_fixture_id == internal::GetTestTypeId();
+
+    if (first_is_TEST || this_is_TEST) {
+      // Both TEST and TEST_F appear in same test suite, which is incorrect.
+      // Tell the user how to fix this.
+
+      // Gets the name of the TEST and the name of the TEST_F.  Note
+      // that first_is_TEST and this_is_TEST cannot both be true, as
+      // the fixture IDs are different for the two tests.
+      const char* const TEST_name =
+          first_is_TEST ? first_test_name : this_test_name;
+      const char* const TEST_F_name =
+          first_is_TEST ? this_test_name : first_test_name;
+
+      ADD_FAILURE()
+          << "All tests in the same test suite must use the same test fixture\n"
+          << "class, so mixing TEST_F and TEST in the same test suite is\n"
+          << "illegal.  In test suite " << this_test_info->test_suite_name()
+          << ",\n"
+          << "test " << TEST_F_name << " is defined using TEST_F but\n"
+          << "test " << TEST_name << " is defined using TEST.  You probably\n"
+          << "want to change the TEST to TEST_F or move it to another test\n"
+          << "case.";
+    } else {
+      // Two fixture classes with the same name appear in two different
+      // namespaces, which is not allowed. Tell the user how to fix this.
+      ADD_FAILURE()
+          << "All tests in the same test suite must use the same test fixture\n"
+          << "class.  However, in test suite "
+          << this_test_info->test_suite_name() << ",\n"
+          << "you defined test " << first_test_name << " and test "
+          << this_test_name << "\n"
+          << "using two different test fixture classes.  This can happen if\n"
+          << "the two classes are from different namespaces or translation\n"
+          << "units and have the same name.  You should probably rename one\n"
+          << "of the classes to put the tests into different test suites.";
+    }
+    return false;
+  }
+
+  return true;
+}
+
+#if GTEST_HAS_SEH
+
+// Adds an "exception thrown" fatal failure to the current test.  This
+// function returns its result via an output parameter pointer because VC++
+// prohibits creation of objects with destructors on stack in functions
+// using __try (see error C2712).
+static std::string* FormatSehExceptionMessage(DWORD exception_code,
+                                              const char* location) {
+  Message message;
+  message << "SEH exception with code 0x" << std::setbase(16) <<
+    exception_code << std::setbase(10) << " thrown in " << location << ".";
+
+  return new std::string(message.GetString());
+}
+
+#endif  // GTEST_HAS_SEH
+
+namespace internal {
+
+#if GTEST_HAS_EXCEPTIONS
+
+// Adds an "exception thrown" fatal failure to the current test.
+static std::string FormatCxxExceptionMessage(const char* description,
+                                             const char* location) {
+  Message message;
+  if (description != nullptr) {
+    message << "C++ exception with description \"" << description << "\"";
+  } else {
+    message << "Unknown C++ exception";
+  }
+  message << " thrown in " << location << ".";
+
+  return message.GetString();
+}
+
+static std::string PrintTestPartResultToString(
+    const TestPartResult& test_part_result);
+
+GoogleTestFailureException::GoogleTestFailureException(
+    const TestPartResult& failure)
+    : ::std::runtime_error(PrintTestPartResultToString(failure).c_str()) {}
+
+#endif  // GTEST_HAS_EXCEPTIONS
+
+// We put these helper functions in the internal namespace as IBM's xlC
+// compiler rejects the code if they were declared static.
+
+// Runs the given method and handles SEH exceptions it throws, when
+// SEH is supported; returns the 0-value for type Result in case of an
+// SEH exception.  (Microsoft compilers cannot handle SEH and C++
+// exceptions in the same function.  Therefore, we provide a separate
+// wrapper function for handling SEH exceptions.)
+template <class T, typename Result>
+Result HandleSehExceptionsInMethodIfSupported(
+    T* object, Result (T::*method)(), const char* location) {
+#if GTEST_HAS_SEH
+  __try {
+    return (object->*method)();
+  } __except (internal::UnitTestOptions::GTestShouldProcessSEH(  // NOLINT
+      GetExceptionCode())) {
+    // We create the exception message on the heap because VC++ prohibits
+    // creation of objects with destructors on stack in functions using __try
+    // (see error C2712).
+    std::string* exception_message = FormatSehExceptionMessage(
+        GetExceptionCode(), location);
+    internal::ReportFailureInUnknownLocation(TestPartResult::kFatalFailure,
+                                             *exception_message);
+    delete exception_message;
+    return static_cast<Result>(0);
+  }
+#else
+  (void)location;
+  return (object->*method)();
+#endif  // GTEST_HAS_SEH
+}
+
+// Runs the given method and catches and reports C++ and/or SEH-style
+// exceptions, if they are supported; returns the 0-value for type
+// Result in case of an SEH exception.
+template <class T, typename Result>
+Result HandleExceptionsInMethodIfSupported(
+    T* object, Result (T::*method)(), const char* location) {
+  // NOTE: The user code can affect the way in which Google Test handles
+  // exceptions by setting GTEST_FLAG(catch_exceptions), but only before
+  // RUN_ALL_TESTS() starts. It is technically possible to check the flag
+  // after the exception is caught and either report or re-throw the
+  // exception based on the flag's value:
+  //
+  // try {
+  //   // Perform the test method.
+  // } catch (...) {
+  //   if (GTEST_FLAG(catch_exceptions))
+  //     // Report the exception as failure.
+  //   else
+  //     throw;  // Re-throws the original exception.
+  // }
+  //
+  // However, the purpose of this flag is to allow the program to drop into
+  // the debugger when the exception is thrown. On most platforms, once the
+  // control enters the catch block, the exception origin information is
+  // lost and the debugger will stop the program at the point of the
+  // re-throw in this function -- instead of at the point of the original
+  // throw statement in the code under test.  For this reason, we perform
+  // the check early, sacrificing the ability to affect Google Test's
+  // exception handling in the method where the exception is thrown.
+  if (internal::GetUnitTestImpl()->catch_exceptions()) {
+#if GTEST_HAS_EXCEPTIONS
+    try {
+      return HandleSehExceptionsInMethodIfSupported(object, method, location);
+    } catch (const AssertionException&) {  // NOLINT
+      // This failure was reported already.
+    } catch (const internal::GoogleTestFailureException&) {  // NOLINT
+      // This exception type can only be thrown by a failed Google
+      // Test assertion with the intention of letting another testing
+      // framework catch it.  Therefore we just re-throw it.
+      throw;
+    } catch (const std::exception& e) {  // NOLINT
+      internal::ReportFailureInUnknownLocation(
+          TestPartResult::kFatalFailure,
+          FormatCxxExceptionMessage(e.what(), location));
+    } catch (...) {  // NOLINT
+      internal::ReportFailureInUnknownLocation(
+          TestPartResult::kFatalFailure,
+          FormatCxxExceptionMessage(nullptr, location));
+    }
+    return static_cast<Result>(0);
+#else
+    return HandleSehExceptionsInMethodIfSupported(object, method, location);
+#endif  // GTEST_HAS_EXCEPTIONS
+  } else {
+    return (object->*method)();
+  }
+}
+
+}  // namespace internal
+
+// Runs the test and updates the test result.
+void Test::Run() {
+  if (!HasSameFixtureClass()) return;
+
+  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
+  impl->os_stack_trace_getter()->UponLeavingGTest();
+  internal::HandleExceptionsInMethodIfSupported(this, &Test::SetUp, "SetUp()");
+  // We will run the test only if SetUp() was successful and didn't call
+  // GTEST_SKIP().
+  if (!HasFatalFailure() && !IsSkipped()) {
+    impl->os_stack_trace_getter()->UponLeavingGTest();
+    internal::HandleExceptionsInMethodIfSupported(
+        this, &Test::TestBody, "the test body");
+  }
+
+  // However, we want to clean up as much as possible.  Hence we will
+  // always call TearDown(), even if SetUp() or the test body has
+  // failed.
+  impl->os_stack_trace_getter()->UponLeavingGTest();
+  internal::HandleExceptionsInMethodIfSupported(
+      this, &Test::TearDown, "TearDown()");
+}
+
+// Returns true if and only if the current test has a fatal failure.
+bool Test::HasFatalFailure() {
+  return internal::GetUnitTestImpl()->current_test_result()->HasFatalFailure();
+}
+
+// Returns true if and only if the current test has a non-fatal failure.
+bool Test::HasNonfatalFailure() {
+  return internal::GetUnitTestImpl()->current_test_result()->
+      HasNonfatalFailure();
+}
+
+// Returns true if and only if the current test was skipped.
+bool Test::IsSkipped() {
+  return internal::GetUnitTestImpl()->current_test_result()->Skipped();
+}
+
+// class TestInfo
+
+// Constructs a TestInfo object. It assumes ownership of the test factory
+// object.
+TestInfo::TestInfo(const std::string& a_test_suite_name,
+                   const std::string& a_name, const char* a_type_param,
+                   const char* a_value_param,
+                   internal::CodeLocation a_code_location,
+                   internal::TypeId fixture_class_id,
+                   internal::TestFactoryBase* factory)
+    : test_suite_name_(a_test_suite_name),
+      name_(a_name),
+      type_param_(a_type_param ? new std::string(a_type_param) : nullptr),
+      value_param_(a_value_param ? new std::string(a_value_param) : nullptr),
+      location_(a_code_location),
+      fixture_class_id_(fixture_class_id),
+      should_run_(false),
+      is_disabled_(false),
+      matches_filter_(false),
+      is_in_another_shard_(false),
+      factory_(factory),
+      result_() {}
+
+// Destructs a TestInfo object.
+TestInfo::~TestInfo() { delete factory_; }
+
+namespace internal {
+
+// Creates a new TestInfo object and registers it with Google Test;
+// returns the created object.
+//
+// Arguments:
+//
+//   test_suite_name:  name of the test suite
+//   name:             name of the test
+//   type_param:       the name of the test's type parameter, or NULL if
+//                     this is not a typed or a type-parameterized test.
+//   value_param:      text representation of the test's value parameter,
+//                     or NULL if this is not a value-parameterized test.
+//   code_location:    code location where the test is defined
+//   fixture_class_id: ID of the test fixture class
+//   set_up_tc:        pointer to the function that sets up the test suite
+//   tear_down_tc:     pointer to the function that tears down the test suite
+//   factory:          pointer to the factory that creates a test object.
+//                     The newly created TestInfo instance will assume
+//                     ownership of the factory object.
+TestInfo* MakeAndRegisterTestInfo(
+    const char* test_suite_name, const char* name, const char* type_param,
+    const char* value_param, CodeLocation code_location,
+    TypeId fixture_class_id, SetUpTestSuiteFunc set_up_tc,
+    TearDownTestSuiteFunc tear_down_tc, TestFactoryBase* factory) {
+  TestInfo* const test_info =
+      new TestInfo(test_suite_name, name, type_param, value_param,
+                   code_location, fixture_class_id, factory);
+  GetUnitTestImpl()->AddTestInfo(set_up_tc, tear_down_tc, test_info);
+  return test_info;
+}
+
+void ReportInvalidTestSuiteType(const char* test_suite_name,
+                                CodeLocation code_location) {
+  Message errors;
+  errors
+      << "Attempted redefinition of test suite " << test_suite_name << ".\n"
+      << "All tests in the same test suite must use the same test fixture\n"
+      << "class.  However, in test suite " << test_suite_name << ", you tried\n"
+      << "to define a test using a fixture class different from the one\n"
+      << "used earlier. This can happen if the two fixture classes are\n"
+      << "from different namespaces and have the same name. You should\n"
+      << "probably rename one of the classes to put the tests into different\n"
+      << "test suites.";
+
+  GTEST_LOG_(ERROR) << FormatFileLocation(code_location.file.c_str(),
+                                          code_location.line)
+                    << " " << errors.GetString();
+}
+}  // namespace internal
+
+namespace {
+
+// A predicate that checks the test name of a TestInfo against a known
+// value.
+//
+// This is used for implementation of the TestSuite class only.  We put
+// it in the anonymous namespace to prevent polluting the outer
+// namespace.
+//
+// TestNameIs is copyable.
+class TestNameIs {
+ public:
+  // Constructor.
+  //
+  // TestNameIs has NO default constructor.
+  explicit TestNameIs(const char* name)
+      : name_(name) {}
+
+  // Returns true if and only if the test name of test_info matches name_.
+  bool operator()(const TestInfo * test_info) const {
+    return test_info && test_info->name() == name_;
+  }
+
+ private:
+  std::string name_;
+};
+
+}  // namespace
+
+namespace internal {
+
+// This method expands all parameterized tests registered with macros TEST_P
+// and INSTANTIATE_TEST_SUITE_P into regular tests and registers those.
+// This will be done just once during the program runtime.
+void UnitTestImpl::RegisterParameterizedTests() {
+  if (!parameterized_tests_registered_) {
+    parameterized_test_registry_.RegisterTests();
+    type_parameterized_test_registry_.CheckForInstantiations();
+    parameterized_tests_registered_ = true;
+  }
+}
+
+}  // namespace internal
+
+// Creates the test object, runs it, records its result, and then
+// deletes it.
+void TestInfo::Run() {
+  if (!should_run_) return;
+
+  // Tells UnitTest where to store test result.
+  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
+  impl->set_current_test_info(this);
+
+  TestEventListener* repeater = UnitTest::GetInstance()->listeners().repeater();
+
+  // Notifies the unit test event listeners that a test is about to start.
+  repeater->OnTestStart(*this);
+
+  result_.set_start_timestamp(internal::GetTimeInMillis());
+  internal::Timer timer;
+
+  impl->os_stack_trace_getter()->UponLeavingGTest();
+
+  // Creates the test object.
+  Test* const test = internal::HandleExceptionsInMethodIfSupported(
+      factory_, &internal::TestFactoryBase::CreateTest,
+      "the test fixture's constructor");
+
+  // Runs the test if the constructor didn't generate a fatal failure or invoke
+  // GTEST_SKIP().
+  // Note that the object will not be null
+  if (!Test::HasFatalFailure() && !Test::IsSkipped()) {
+    // This doesn't throw as all user code that can throw are wrapped into
+    // exception handling code.
+    test->Run();
+  }
+
+  if (test != nullptr) {
+    // Deletes the test object.
+    impl->os_stack_trace_getter()->UponLeavingGTest();
+    internal::HandleExceptionsInMethodIfSupported(
+        test, &Test::DeleteSelf_, "the test fixture's destructor");
+  }
+
+  result_.set_elapsed_time(timer.Elapsed());
+
+  // Notifies the unit test event listener that a test has just finished.
+  repeater->OnTestEnd(*this);
+
+  // Tells UnitTest to stop associating assertion results to this
+  // test.
+  impl->set_current_test_info(nullptr);
+}
+
+// Skip and records a skipped test result for this object.
+void TestInfo::Skip() {
+  if (!should_run_) return;
+
+  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
+  impl->set_current_test_info(this);
+
+  TestEventListener* repeater = UnitTest::GetInstance()->listeners().repeater();
+
+  // Notifies the unit test event listeners that a test is about to start.
+  repeater->OnTestStart(*this);
+
+  const TestPartResult test_part_result =
+      TestPartResult(TestPartResult::kSkip, this->file(), this->line(), "");
+  impl->GetTestPartResultReporterForCurrentThread()->ReportTestPartResult(
+      test_part_result);
+
+  // Notifies the unit test event listener that a test has just finished.
+  repeater->OnTestEnd(*this);
+  impl->set_current_test_info(nullptr);
+}
+
+// class TestSuite
+
+// Gets the number of successful tests in this test suite.
+int TestSuite::successful_test_count() const {
+  return CountIf(test_info_list_, TestPassed);
+}
+
+// Gets the number of successful tests in this test suite.
+int TestSuite::skipped_test_count() const {
+  return CountIf(test_info_list_, TestSkipped);
+}
+
+// Gets the number of failed tests in this test suite.
+int TestSuite::failed_test_count() const {
+  return CountIf(test_info_list_, TestFailed);
+}
+
+// Gets the number of disabled tests that will be reported in the XML report.
+int TestSuite::reportable_disabled_test_count() const {
+  return CountIf(test_info_list_, TestReportableDisabled);
+}
+
+// Gets the number of disabled tests in this test suite.
+int TestSuite::disabled_test_count() const {
+  return CountIf(test_info_list_, TestDisabled);
+}
+
+// Gets the number of tests to be printed in the XML report.
+int TestSuite::reportable_test_count() const {
+  return CountIf(test_info_list_, TestReportable);
+}
+
+// Get the number of tests in this test suite that should run.
+int TestSuite::test_to_run_count() const {
+  return CountIf(test_info_list_, ShouldRunTest);
+}
+
+// Gets the number of all tests.
+int TestSuite::total_test_count() const {
+  return static_cast<int>(test_info_list_.size());
+}
+
+// Creates a TestSuite with the given name.
+//
+// Arguments:
+//
+//   a_name:       name of the test suite
+//   a_type_param: the name of the test suite's type parameter, or NULL if
+//                 this is not a typed or a type-parameterized test suite.
+//   set_up_tc:    pointer to the function that sets up the test suite
+//   tear_down_tc: pointer to the function that tears down the test suite
+TestSuite::TestSuite(const char* a_name, const char* a_type_param,
+                     internal::SetUpTestSuiteFunc set_up_tc,
+                     internal::TearDownTestSuiteFunc tear_down_tc)
+    : name_(a_name),
+      type_param_(a_type_param ? new std::string(a_type_param) : nullptr),
+      set_up_tc_(set_up_tc),
+      tear_down_tc_(tear_down_tc),
+      should_run_(false),
+      start_timestamp_(0),
+      elapsed_time_(0) {}
+
+// Destructor of TestSuite.
+TestSuite::~TestSuite() {
+  // Deletes every Test in the collection.
+  ForEach(test_info_list_, internal::Delete<TestInfo>);
+}
+
+// Returns the i-th test among all the tests. i can range from 0 to
+// total_test_count() - 1. If i is not in that range, returns NULL.
+const TestInfo* TestSuite::GetTestInfo(int i) const {
+  const int index = GetElementOr(test_indices_, i, -1);
+  return index < 0 ? nullptr : test_info_list_[static_cast<size_t>(index)];
+}
+
+// Returns the i-th test among all the tests. i can range from 0 to
+// total_test_count() - 1. If i is not in that range, returns NULL.
+TestInfo* TestSuite::GetMutableTestInfo(int i) {
+  const int index = GetElementOr(test_indices_, i, -1);
+  return index < 0 ? nullptr : test_info_list_[static_cast<size_t>(index)];
+}
+
+// Adds a test to this test suite.  Will delete the test upon
+// destruction of the TestSuite object.
+void TestSuite::AddTestInfo(TestInfo* test_info) {
+  test_info_list_.push_back(test_info);
+  test_indices_.push_back(static_cast<int>(test_indices_.size()));
+}
+
+// Runs every test in this TestSuite.
+void TestSuite::Run() {
+  if (!should_run_) return;
+
+  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
+  impl->set_current_test_suite(this);
+
+  TestEventListener* repeater = UnitTest::GetInstance()->listeners().repeater();
+
+  // Call both legacy and the new API
+  repeater->OnTestSuiteStart(*this);
+//  Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  repeater->OnTestCaseStart(*this);
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+  impl->os_stack_trace_getter()->UponLeavingGTest();
+  internal::HandleExceptionsInMethodIfSupported(
+      this, &TestSuite::RunSetUpTestSuite, "SetUpTestSuite()");
+
+  start_timestamp_ = internal::GetTimeInMillis();
+  internal::Timer timer;
+  for (int i = 0; i < total_test_count(); i++) {
+    GetMutableTestInfo(i)->Run();
+    if (GTEST_FLAG(fail_fast) && GetMutableTestInfo(i)->result()->Failed()) {
+      for (int j = i + 1; j < total_test_count(); j++) {
+        GetMutableTestInfo(j)->Skip();
+      }
+      break;
+    }
+  }
+  elapsed_time_ = timer.Elapsed();
+
+  impl->os_stack_trace_getter()->UponLeavingGTest();
+  internal::HandleExceptionsInMethodIfSupported(
+      this, &TestSuite::RunTearDownTestSuite, "TearDownTestSuite()");
+
+  // Call both legacy and the new API
+  repeater->OnTestSuiteEnd(*this);
+//  Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  repeater->OnTestCaseEnd(*this);
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+  impl->set_current_test_suite(nullptr);
+}
+
+// Skips all tests under this TestSuite.
+void TestSuite::Skip() {
+  if (!should_run_) return;
+
+  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
+  impl->set_current_test_suite(this);
+
+  TestEventListener* repeater = UnitTest::GetInstance()->listeners().repeater();
+
+  // Call both legacy and the new API
+  repeater->OnTestSuiteStart(*this);
+//  Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  repeater->OnTestCaseStart(*this);
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+  for (int i = 0; i < total_test_count(); i++) {
+    GetMutableTestInfo(i)->Skip();
+  }
+
+  // Call both legacy and the new API
+  repeater->OnTestSuiteEnd(*this);
+  // Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  repeater->OnTestCaseEnd(*this);
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+  impl->set_current_test_suite(nullptr);
+}
+
+// Clears the results of all tests in this test suite.
+void TestSuite::ClearResult() {
+  ad_hoc_test_result_.Clear();
+  ForEach(test_info_list_, TestInfo::ClearTestResult);
+}
+
+// Shuffles the tests in this test suite.
+void TestSuite::ShuffleTests(internal::Random* random) {
+  Shuffle(random, &test_indices_);
+}
+
+// Restores the test order to before the first shuffle.
+void TestSuite::UnshuffleTests() {
+  for (size_t i = 0; i < test_indices_.size(); i++) {
+    test_indices_[i] = static_cast<int>(i);
+  }
+}
+
+// Formats a countable noun.  Depending on its quantity, either the
+// singular form or the plural form is used. e.g.
+//
+// FormatCountableNoun(1, "formula", "formuli") returns "1 formula".
+// FormatCountableNoun(5, "book", "books") returns "5 books".
+static std::string FormatCountableNoun(int count,
+                                       const char * singular_form,
+                                       const char * plural_form) {
+  return internal::StreamableToString(count) + " " +
+      (count == 1 ? singular_form : plural_form);
+}
+
+// Formats the count of tests.
+static std::string FormatTestCount(int test_count) {
+  return FormatCountableNoun(test_count, "test", "tests");
+}
+
+// Formats the count of test suites.
+static std::string FormatTestSuiteCount(int test_suite_count) {
+  return FormatCountableNoun(test_suite_count, "test suite", "test suites");
+}
+
+// Converts a TestPartResult::Type enum to human-friendly string
+// representation.  Both kNonFatalFailure and kFatalFailure are translated
+// to "Failure", as the user usually doesn't care about the difference
+// between the two when viewing the test result.
+static const char * TestPartResultTypeToString(TestPartResult::Type type) {
+  switch (type) {
+    case TestPartResult::kSkip:
+      return "Skipped\n";
+    case TestPartResult::kSuccess:
+      return "Success";
+
+    case TestPartResult::kNonFatalFailure:
+    case TestPartResult::kFatalFailure:
+#ifdef _MSC_VER
+      return "error: ";
+#else
+      return "Failure\n";
+#endif
+    default:
+      return "Unknown result type";
+  }
+}
+
+namespace internal {
+namespace {
+enum class GTestColor { kDefault, kRed, kGreen, kYellow };
+}  // namespace
+
+// Prints a TestPartResult to an std::string.
+static std::string PrintTestPartResultToString(
+    const TestPartResult& test_part_result) {
+  return (Message()
+          << internal::FormatFileLocation(test_part_result.file_name(),
+                                          test_part_result.line_number())
+          << " " << TestPartResultTypeToString(test_part_result.type())
+          << test_part_result.message()).GetString();
+}
+
+// Prints a TestPartResult.
+static void PrintTestPartResult(const TestPartResult& test_part_result) {
+  const std::string& result =
+      PrintTestPartResultToString(test_part_result);
+  printf("%s\n", result.c_str());
+  fflush(stdout);
+  // If the test program runs in Visual Studio or a debugger, the
+  // following statements add the test part result message to the Output
+  // window such that the user can double-click on it to jump to the
+  // corresponding source code location; otherwise they do nothing.
+#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE
+  // We don't call OutputDebugString*() on Windows Mobile, as printing
+  // to stdout is done by OutputDebugString() there already - we don't
+  // want the same message printed twice.
+  ::OutputDebugStringA(result.c_str());
+  ::OutputDebugStringA("\n");
+#endif
+}
+
+// class PrettyUnitTestResultPrinter
+#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE && \
+    !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT && !GTEST_OS_WINDOWS_MINGW
+
+// Returns the character attribute for the given color.
+static WORD GetColorAttribute(GTestColor color) {
+  switch (color) {
+    case GTestColor::kRed:
+      return FOREGROUND_RED;
+    case GTestColor::kGreen:
+      return FOREGROUND_GREEN;
+    case GTestColor::kYellow:
+      return FOREGROUND_RED | FOREGROUND_GREEN;
+    default:           return 0;
+  }
+}
+
+static int GetBitOffset(WORD color_mask) {
+  if (color_mask == 0) return 0;
+
+  int bitOffset = 0;
+  while ((color_mask & 1) == 0) {
+    color_mask >>= 1;
+    ++bitOffset;
+  }
+  return bitOffset;
+}
+
+static WORD GetNewColor(GTestColor color, WORD old_color_attrs) {
+  // Let's reuse the BG
+  static const WORD background_mask = BACKGROUND_BLUE | BACKGROUND_GREEN |
+                                      BACKGROUND_RED | BACKGROUND_INTENSITY;
+  static const WORD foreground_mask = FOREGROUND_BLUE | FOREGROUND_GREEN |
+                                      FOREGROUND_RED | FOREGROUND_INTENSITY;
+  const WORD existing_bg = old_color_attrs & background_mask;
+
+  WORD new_color =
+      GetColorAttribute(color) | existing_bg | FOREGROUND_INTENSITY;
+  static const int bg_bitOffset = GetBitOffset(background_mask);
+  static const int fg_bitOffset = GetBitOffset(foreground_mask);
+
+  if (((new_color & background_mask) >> bg_bitOffset) ==
+      ((new_color & foreground_mask) >> fg_bitOffset)) {
+    new_color ^= FOREGROUND_INTENSITY;  // invert intensity
+  }
+  return new_color;
+}
+
+#else
+
+// Returns the ANSI color code for the given color. GTestColor::kDefault is
+// an invalid input.
+static const char* GetAnsiColorCode(GTestColor color) {
+  switch (color) {
+    case GTestColor::kRed:
+      return "1";
+    case GTestColor::kGreen:
+      return "2";
+    case GTestColor::kYellow:
+      return "3";
+    default:
+      return nullptr;
+  }
+}
+
+#endif  // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE
+
+// Returns true if and only if Google Test should use colors in the output.
+bool ShouldUseColor(bool stdout_is_tty) {
+  const char* const gtest_color = GTEST_FLAG(color).c_str();
+
+  if (String::CaseInsensitiveCStringEquals(gtest_color, "auto")) {
+#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW
+    // On Windows the TERM variable is usually not set, but the
+    // console there does support colors.
+    return stdout_is_tty;
+#else
+    // On non-Windows platforms, we rely on the TERM variable.
+    const char* const term = posix::GetEnv("TERM");
+    const bool term_supports_color =
+        String::CStringEquals(term, "xterm") ||
+        String::CStringEquals(term, "xterm-color") ||
+        String::CStringEquals(term, "xterm-256color") ||
+        String::CStringEquals(term, "screen") ||
+        String::CStringEquals(term, "screen-256color") ||
+        String::CStringEquals(term, "tmux") ||
+        String::CStringEquals(term, "tmux-256color") ||
+        String::CStringEquals(term, "rxvt-unicode") ||
+        String::CStringEquals(term, "rxvt-unicode-256color") ||
+        String::CStringEquals(term, "linux") ||
+        String::CStringEquals(term, "cygwin");
+    return stdout_is_tty && term_supports_color;
+#endif  // GTEST_OS_WINDOWS
+  }
+
+  return String::CaseInsensitiveCStringEquals(gtest_color, "yes") ||
+      String::CaseInsensitiveCStringEquals(gtest_color, "true") ||
+      String::CaseInsensitiveCStringEquals(gtest_color, "t") ||
+      String::CStringEquals(gtest_color, "1");
+  // We take "yes", "true", "t", and "1" as meaning "yes".  If the
+  // value is neither one of these nor "auto", we treat it as "no" to
+  // be conservative.
+}
+
+// Helpers for printing colored strings to stdout. Note that on Windows, we
+// cannot simply emit special characters and have the terminal change colors.
+// This routine must actually emit the characters rather than return a string
+// that would be colored when printed, as can be done on Linux.
+
+GTEST_ATTRIBUTE_PRINTF_(2, 3)
+static void ColoredPrintf(GTestColor color, const char *fmt, ...) {
+  va_list args;
+  va_start(args, fmt);
+
+#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_ZOS || GTEST_OS_IOS || \
+    GTEST_OS_WINDOWS_PHONE || GTEST_OS_WINDOWS_RT || defined(ESP_PLATFORM)
+  const bool use_color = AlwaysFalse();
+#else
+  static const bool in_color_mode =
+      ShouldUseColor(posix::IsATTY(posix::FileNo(stdout)) != 0);
+  const bool use_color = in_color_mode && (color != GTestColor::kDefault);
+#endif  // GTEST_OS_WINDOWS_MOBILE || GTEST_OS_ZOS
+
+  if (!use_color) {
+    vprintf(fmt, args);
+    va_end(args);
+    return;
+  }
+
+#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE && \
+    !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT && !GTEST_OS_WINDOWS_MINGW
+  const HANDLE stdout_handle = GetStdHandle(STD_OUTPUT_HANDLE);
+
+  // Gets the current text color.
+  CONSOLE_SCREEN_BUFFER_INFO buffer_info;
+  GetConsoleScreenBufferInfo(stdout_handle, &buffer_info);
+  const WORD old_color_attrs = buffer_info.wAttributes;
+  const WORD new_color = GetNewColor(color, old_color_attrs);
+
+  // We need to flush the stream buffers into the console before each
+  // SetConsoleTextAttribute call lest it affect the text that is already
+  // printed but has not yet reached the console.
+  fflush(stdout);
+  SetConsoleTextAttribute(stdout_handle, new_color);
+
+  vprintf(fmt, args);
+
+  fflush(stdout);
+  // Restores the text color.
+  SetConsoleTextAttribute(stdout_handle, old_color_attrs);
+#else
+  printf("\033[0;3%sm", GetAnsiColorCode(color));
+  vprintf(fmt, args);
+  printf("\033[m");  // Resets the terminal to default.
+#endif  // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE
+  va_end(args);
+}
+
+// Text printed in Google Test's text output and --gtest_list_tests
+// output to label the type parameter and value parameter for a test.
+static const char kTypeParamLabel[] = "TypeParam";
+static const char kValueParamLabel[] = "GetParam()";
+
+static void PrintFullTestCommentIfPresent(const TestInfo& test_info) {
+  const char* const type_param = test_info.type_param();
+  const char* const value_param = test_info.value_param();
+
+  if (type_param != nullptr || value_param != nullptr) {
+    printf(", where ");
+    if (type_param != nullptr) {
+      printf("%s = %s", kTypeParamLabel, type_param);
+      if (value_param != nullptr) printf(" and ");
+    }
+    if (value_param != nullptr) {
+      printf("%s = %s", kValueParamLabel, value_param);
+    }
+  }
+}
+
+// This class implements the TestEventListener interface.
+//
+// Class PrettyUnitTestResultPrinter is copyable.
+class PrettyUnitTestResultPrinter : public TestEventListener {
+ public:
+  PrettyUnitTestResultPrinter() {}
+  static void PrintTestName(const char* test_suite, const char* test) {
+    printf("%s.%s", test_suite, test);
+  }
+
+  // The following methods override what's in the TestEventListener class.
+  void OnTestProgramStart(const UnitTest& /*unit_test*/) override {}
+  void OnTestIterationStart(const UnitTest& unit_test, int iteration) override;
+  void OnEnvironmentsSetUpStart(const UnitTest& unit_test) override;
+  void OnEnvironmentsSetUpEnd(const UnitTest& /*unit_test*/) override {}
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  void OnTestCaseStart(const TestCase& test_case) override;
+#else
+  void OnTestSuiteStart(const TestSuite& test_suite) override;
+#endif  // OnTestCaseStart
+
+  void OnTestStart(const TestInfo& test_info) override;
+
+  void OnTestPartResult(const TestPartResult& result) override;
+  void OnTestEnd(const TestInfo& test_info) override;
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  void OnTestCaseEnd(const TestCase& test_case) override;
+#else
+  void OnTestSuiteEnd(const TestSuite& test_suite) override;
+#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+  void OnEnvironmentsTearDownStart(const UnitTest& unit_test) override;
+  void OnEnvironmentsTearDownEnd(const UnitTest& /*unit_test*/) override {}
+  void OnTestIterationEnd(const UnitTest& unit_test, int iteration) override;
+  void OnTestProgramEnd(const UnitTest& /*unit_test*/) override {}
+
+ private:
+  static void PrintFailedTests(const UnitTest& unit_test);
+  static void PrintFailedTestSuites(const UnitTest& unit_test);
+  static void PrintSkippedTests(const UnitTest& unit_test);
+};
+
+  // Fired before each iteration of tests starts.
+void PrettyUnitTestResultPrinter::OnTestIterationStart(
+    const UnitTest& unit_test, int iteration) {
+  if (GTEST_FLAG(repeat) != 1)
+    printf("\nRepeating all tests (iteration %d) . . .\n\n", iteration + 1);
+
+  const char* const filter = GTEST_FLAG(filter).c_str();
+
+  // Prints the filter if it's not *.  This reminds the user that some
+  // tests may be skipped.
+  if (!String::CStringEquals(filter, kUniversalFilter)) {
+    ColoredPrintf(GTestColor::kYellow, "Note: %s filter = %s\n", GTEST_NAME_,
+                  filter);
+  }
+
+  if (internal::ShouldShard(kTestTotalShards, kTestShardIndex, false)) {
+    const int32_t shard_index = Int32FromEnvOrDie(kTestShardIndex, -1);
+    ColoredPrintf(GTestColor::kYellow, "Note: This is test shard %d of %s.\n",
+                  static_cast<int>(shard_index) + 1,
+                  internal::posix::GetEnv(kTestTotalShards));
+  }
+
+  if (GTEST_FLAG(shuffle)) {
+    ColoredPrintf(GTestColor::kYellow,
+                  "Note: Randomizing tests' orders with a seed of %d .\n",
+                  unit_test.random_seed());
+  }
+
+  ColoredPrintf(GTestColor::kGreen, "[==========] ");
+  printf("Running %s from %s.\n",
+         FormatTestCount(unit_test.test_to_run_count()).c_str(),
+         FormatTestSuiteCount(unit_test.test_suite_to_run_count()).c_str());
+  fflush(stdout);
+}
+
+void PrettyUnitTestResultPrinter::OnEnvironmentsSetUpStart(
+    const UnitTest& /*unit_test*/) {
+  ColoredPrintf(GTestColor::kGreen, "[----------] ");
+  printf("Global test environment set-up.\n");
+  fflush(stdout);
+}
+
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+void PrettyUnitTestResultPrinter::OnTestCaseStart(const TestCase& test_case) {
+  const std::string counts =
+      FormatCountableNoun(test_case.test_to_run_count(), "test", "tests");
+  ColoredPrintf(GTestColor::kGreen, "[----------] ");
+  printf("%s from %s", counts.c_str(), test_case.name());
+  if (test_case.type_param() == nullptr) {
+    printf("\n");
+  } else {
+    printf(", where %s = %s\n", kTypeParamLabel, test_case.type_param());
+  }
+  fflush(stdout);
+}
+#else
+void PrettyUnitTestResultPrinter::OnTestSuiteStart(
+    const TestSuite& test_suite) {
+  const std::string counts =
+      FormatCountableNoun(test_suite.test_to_run_count(), "test", "tests");
+  ColoredPrintf(GTestColor::kGreen, "[----------] ");
+  printf("%s from %s", counts.c_str(), test_suite.name());
+  if (test_suite.type_param() == nullptr) {
+    printf("\n");
+  } else {
+    printf(", where %s = %s\n", kTypeParamLabel, test_suite.type_param());
+  }
+  fflush(stdout);
+}
+#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+void PrettyUnitTestResultPrinter::OnTestStart(const TestInfo& test_info) {
+  ColoredPrintf(GTestColor::kGreen, "[ RUN      ] ");
+  PrintTestName(test_info.test_suite_name(), test_info.name());
+  printf("\n");
+  fflush(stdout);
+}
+
+// Called after an assertion failure.
+void PrettyUnitTestResultPrinter::OnTestPartResult(
+    const TestPartResult& result) {
+  switch (result.type()) {
+    // If the test part succeeded, we don't need to do anything.
+    case TestPartResult::kSuccess:
+      return;
+    default:
+      // Print failure message from the assertion
+      // (e.g. expected this and got that).
+      PrintTestPartResult(result);
+      fflush(stdout);
+  }
+}
+
+void PrettyUnitTestResultPrinter::OnTestEnd(const TestInfo& test_info) {
+  if (test_info.result()->Passed()) {
+    ColoredPrintf(GTestColor::kGreen, "[       OK ] ");
+  } else if (test_info.result()->Skipped()) {
+    ColoredPrintf(GTestColor::kGreen, "[  SKIPPED ] ");
+  } else {
+    ColoredPrintf(GTestColor::kRed, "[  FAILED  ] ");
+  }
+  PrintTestName(test_info.test_suite_name(), test_info.name());
+  if (test_info.result()->Failed())
+    PrintFullTestCommentIfPresent(test_info);
+
+  if (GTEST_FLAG(print_time)) {
+    printf(" (%s ms)\n", internal::StreamableToString(
+           test_info.result()->elapsed_time()).c_str());
+  } else {
+    printf("\n");
+  }
+  fflush(stdout);
+}
+
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+void PrettyUnitTestResultPrinter::OnTestCaseEnd(const TestCase& test_case) {
+  if (!GTEST_FLAG(print_time)) return;
+
+  const std::string counts =
+      FormatCountableNoun(test_case.test_to_run_count(), "test", "tests");
+  ColoredPrintf(GTestColor::kGreen, "[----------] ");
+  printf("%s from %s (%s ms total)\n\n", counts.c_str(), test_case.name(),
+         internal::StreamableToString(test_case.elapsed_time()).c_str());
+  fflush(stdout);
+}
+#else
+void PrettyUnitTestResultPrinter::OnTestSuiteEnd(const TestSuite& test_suite) {
+  if (!GTEST_FLAG(print_time)) return;
+
+  const std::string counts =
+      FormatCountableNoun(test_suite.test_to_run_count(), "test", "tests");
+  ColoredPrintf(GTestColor::kGreen, "[----------] ");
+  printf("%s from %s (%s ms total)\n\n", counts.c_str(), test_suite.name(),
+         internal::StreamableToString(test_suite.elapsed_time()).c_str());
+  fflush(stdout);
+}
+#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+void PrettyUnitTestResultPrinter::OnEnvironmentsTearDownStart(
+    const UnitTest& /*unit_test*/) {
+  ColoredPrintf(GTestColor::kGreen, "[----------] ");
+  printf("Global test environment tear-down\n");
+  fflush(stdout);
+}
+
+// Internal helper for printing the list of failed tests.
+void PrettyUnitTestResultPrinter::PrintFailedTests(const UnitTest& unit_test) {
+  const int failed_test_count = unit_test.failed_test_count();
+  ColoredPrintf(GTestColor::kRed, "[  FAILED  ] ");
+  printf("%s, listed below:\n", FormatTestCount(failed_test_count).c_str());
+
+  for (int i = 0; i < unit_test.total_test_suite_count(); ++i) {
+    const TestSuite& test_suite = *unit_test.GetTestSuite(i);
+    if (!test_suite.should_run() || (test_suite.failed_test_count() == 0)) {
+      continue;
+    }
+    for (int j = 0; j < test_suite.total_test_count(); ++j) {
+      const TestInfo& test_info = *test_suite.GetTestInfo(j);
+      if (!test_info.should_run() || !test_info.result()->Failed()) {
+        continue;
+      }
+      ColoredPrintf(GTestColor::kRed, "[  FAILED  ] ");
+      printf("%s.%s", test_suite.name(), test_info.name());
+      PrintFullTestCommentIfPresent(test_info);
+      printf("\n");
+    }
+  }
+  printf("\n%2d FAILED %s\n", failed_test_count,
+         failed_test_count == 1 ? "TEST" : "TESTS");
+}
+
+// Internal helper for printing the list of test suite failures not covered by
+// PrintFailedTests.
+void PrettyUnitTestResultPrinter::PrintFailedTestSuites(
+    const UnitTest& unit_test) {
+  int suite_failure_count = 0;
+  for (int i = 0; i < unit_test.total_test_suite_count(); ++i) {
+    const TestSuite& test_suite = *unit_test.GetTestSuite(i);
+    if (!test_suite.should_run()) {
+      continue;
+    }
+    if (test_suite.ad_hoc_test_result().Failed()) {
+      ColoredPrintf(GTestColor::kRed, "[  FAILED  ] ");
+      printf("%s: SetUpTestSuite or TearDownTestSuite\n", test_suite.name());
+      ++suite_failure_count;
+    }
+  }
+  if (suite_failure_count > 0) {
+    printf("\n%2d FAILED TEST %s\n", suite_failure_count,
+           suite_failure_count == 1 ? "SUITE" : "SUITES");
+  }
+}
+
+// Internal helper for printing the list of skipped tests.
+void PrettyUnitTestResultPrinter::PrintSkippedTests(const UnitTest& unit_test) {
+  const int skipped_test_count = unit_test.skipped_test_count();
+  if (skipped_test_count == 0) {
+    return;
+  }
+
+  for (int i = 0; i < unit_test.total_test_suite_count(); ++i) {
+    const TestSuite& test_suite = *unit_test.GetTestSuite(i);
+    if (!test_suite.should_run() || (test_suite.skipped_test_count() == 0)) {
+      continue;
+    }
+    for (int j = 0; j < test_suite.total_test_count(); ++j) {
+      const TestInfo& test_info = *test_suite.GetTestInfo(j);
+      if (!test_info.should_run() || !test_info.result()->Skipped()) {
+        continue;
+      }
+      ColoredPrintf(GTestColor::kGreen, "[  SKIPPED ] ");
+      printf("%s.%s", test_suite.name(), test_info.name());
+      printf("\n");
+    }
+  }
+}
+
+void PrettyUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test,
+                                                     int /*iteration*/) {
+  ColoredPrintf(GTestColor::kGreen, "[==========] ");
+  printf("%s from %s ran.",
+         FormatTestCount(unit_test.test_to_run_count()).c_str(),
+         FormatTestSuiteCount(unit_test.test_suite_to_run_count()).c_str());
+  if (GTEST_FLAG(print_time)) {
+    printf(" (%s ms total)",
+           internal::StreamableToString(unit_test.elapsed_time()).c_str());
+  }
+  printf("\n");
+  ColoredPrintf(GTestColor::kGreen, "[  PASSED  ] ");
+  printf("%s.\n", FormatTestCount(unit_test.successful_test_count()).c_str());
+
+  const int skipped_test_count = unit_test.skipped_test_count();
+  if (skipped_test_count > 0) {
+    ColoredPrintf(GTestColor::kGreen, "[  SKIPPED ] ");
+    printf("%s, listed below:\n", FormatTestCount(skipped_test_count).c_str());
+    PrintSkippedTests(unit_test);
+  }
+
+  if (!unit_test.Passed()) {
+    PrintFailedTests(unit_test);
+    PrintFailedTestSuites(unit_test);
+  }
+
+  int num_disabled = unit_test.reportable_disabled_test_count();
+  if (num_disabled && !GTEST_FLAG(also_run_disabled_tests)) {
+    if (unit_test.Passed()) {
+      printf("\n");  // Add a spacer if no FAILURE banner is displayed.
+    }
+    ColoredPrintf(GTestColor::kYellow, "  YOU HAVE %d DISABLED %s\n\n",
+                  num_disabled, num_disabled == 1 ? "TEST" : "TESTS");
+  }
+  // Ensure that Google Test output is printed before, e.g., heapchecker output.
+  fflush(stdout);
+}
+
+// End PrettyUnitTestResultPrinter
+
+// This class implements the TestEventListener interface.
+//
+// Class BriefUnitTestResultPrinter is copyable.
+class BriefUnitTestResultPrinter : public TestEventListener {
+ public:
+  BriefUnitTestResultPrinter() {}
+  static void PrintTestName(const char* test_suite, const char* test) {
+    printf("%s.%s", test_suite, test);
+  }
+
+  // The following methods override what's in the TestEventListener class.
+  void OnTestProgramStart(const UnitTest& /*unit_test*/) override {}
+  void OnTestIterationStart(const UnitTest& /*unit_test*/,
+                            int /*iteration*/) override {}
+  void OnEnvironmentsSetUpStart(const UnitTest& /*unit_test*/) override {}
+  void OnEnvironmentsSetUpEnd(const UnitTest& /*unit_test*/) override {}
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  void OnTestCaseStart(const TestCase& /*test_case*/) override {}
+#else
+  void OnTestSuiteStart(const TestSuite& /*test_suite*/) override {}
+#endif  // OnTestCaseStart
+
+  void OnTestStart(const TestInfo& /*test_info*/) override {}
+
+  void OnTestPartResult(const TestPartResult& result) override;
+  void OnTestEnd(const TestInfo& test_info) override;
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  void OnTestCaseEnd(const TestCase& /*test_case*/) override {}
+#else
+  void OnTestSuiteEnd(const TestSuite& /*test_suite*/) override {}
+#endif  // GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+  void OnEnvironmentsTearDownStart(const UnitTest& /*unit_test*/) override {}
+  void OnEnvironmentsTearDownEnd(const UnitTest& /*unit_test*/) override {}
+  void OnTestIterationEnd(const UnitTest& unit_test, int iteration) override;
+  void OnTestProgramEnd(const UnitTest& /*unit_test*/) override {}
+};
+
+// Called after an assertion failure.
+void BriefUnitTestResultPrinter::OnTestPartResult(
+    const TestPartResult& result) {
+  switch (result.type()) {
+    // If the test part succeeded, we don't need to do anything.
+    case TestPartResult::kSuccess:
+      return;
+    default:
+      // Print failure message from the assertion
+      // (e.g. expected this and got that).
+      PrintTestPartResult(result);
+      fflush(stdout);
+  }
+}
+
+void BriefUnitTestResultPrinter::OnTestEnd(const TestInfo& test_info) {
+  if (test_info.result()->Failed()) {
+    ColoredPrintf(GTestColor::kRed, "[  FAILED  ] ");
+    PrintTestName(test_info.test_suite_name(), test_info.name());
+    PrintFullTestCommentIfPresent(test_info);
+
+    if (GTEST_FLAG(print_time)) {
+      printf(" (%s ms)\n",
+             internal::StreamableToString(test_info.result()->elapsed_time())
+                 .c_str());
+    } else {
+      printf("\n");
+    }
+    fflush(stdout);
+  }
+}
+
+void BriefUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test,
+                                                    int /*iteration*/) {
+  ColoredPrintf(GTestColor::kGreen, "[==========] ");
+  printf("%s from %s ran.",
+         FormatTestCount(unit_test.test_to_run_count()).c_str(),
+         FormatTestSuiteCount(unit_test.test_suite_to_run_count()).c_str());
+  if (GTEST_FLAG(print_time)) {
+    printf(" (%s ms total)",
+           internal::StreamableToString(unit_test.elapsed_time()).c_str());
+  }
+  printf("\n");
+  ColoredPrintf(GTestColor::kGreen, "[  PASSED  ] ");
+  printf("%s.\n", FormatTestCount(unit_test.successful_test_count()).c_str());
+
+  const int skipped_test_count = unit_test.skipped_test_count();
+  if (skipped_test_count > 0) {
+    ColoredPrintf(GTestColor::kGreen, "[  SKIPPED ] ");
+    printf("%s.\n", FormatTestCount(skipped_test_count).c_str());
+  }
+
+  int num_disabled = unit_test.reportable_disabled_test_count();
+  if (num_disabled && !GTEST_FLAG(also_run_disabled_tests)) {
+    if (unit_test.Passed()) {
+      printf("\n");  // Add a spacer if no FAILURE banner is displayed.
+    }
+    ColoredPrintf(GTestColor::kYellow, "  YOU HAVE %d DISABLED %s\n\n",
+                  num_disabled, num_disabled == 1 ? "TEST" : "TESTS");
+  }
+  // Ensure that Google Test output is printed before, e.g., heapchecker output.
+  fflush(stdout);
+}
+
+// End BriefUnitTestResultPrinter
+
+// class TestEventRepeater
+//
+// This class forwards events to other event listeners.
+class TestEventRepeater : public TestEventListener {
+ public:
+  TestEventRepeater() : forwarding_enabled_(true) {}
+  ~TestEventRepeater() override;
+  void Append(TestEventListener *listener);
+  TestEventListener* Release(TestEventListener* listener);
+
+  // Controls whether events will be forwarded to listeners_. Set to false
+  // in death test child processes.
+  bool forwarding_enabled() const { return forwarding_enabled_; }
+  void set_forwarding_enabled(bool enable) { forwarding_enabled_ = enable; }
+
+  void OnTestProgramStart(const UnitTest& unit_test) override;
+  void OnTestIterationStart(const UnitTest& unit_test, int iteration) override;
+  void OnEnvironmentsSetUpStart(const UnitTest& unit_test) override;
+  void OnEnvironmentsSetUpEnd(const UnitTest& unit_test) override;
+//  Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  void OnTestCaseStart(const TestSuite& parameter) override;
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  void OnTestSuiteStart(const TestSuite& parameter) override;
+  void OnTestStart(const TestInfo& test_info) override;
+  void OnTestPartResult(const TestPartResult& result) override;
+  void OnTestEnd(const TestInfo& test_info) override;
+//  Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  void OnTestCaseEnd(const TestCase& parameter) override;
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  void OnTestSuiteEnd(const TestSuite& parameter) override;
+  void OnEnvironmentsTearDownStart(const UnitTest& unit_test) override;
+  void OnEnvironmentsTearDownEnd(const UnitTest& unit_test) override;
+  void OnTestIterationEnd(const UnitTest& unit_test, int iteration) override;
+  void OnTestProgramEnd(const UnitTest& unit_test) override;
+
+ private:
+  // Controls whether events will be forwarded to listeners_. Set to false
+  // in death test child processes.
+  bool forwarding_enabled_;
+  // The list of listeners that receive events.
+  std::vector<TestEventListener*> listeners_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestEventRepeater);
+};
+
+TestEventRepeater::~TestEventRepeater() {
+  ForEach(listeners_, Delete<TestEventListener>);
+}
+
+void TestEventRepeater::Append(TestEventListener *listener) {
+  listeners_.push_back(listener);
+}
+
+TestEventListener* TestEventRepeater::Release(TestEventListener *listener) {
+  for (size_t i = 0; i < listeners_.size(); ++i) {
+    if (listeners_[i] == listener) {
+      listeners_.erase(listeners_.begin() + static_cast<int>(i));
+      return listener;
+    }
+  }
+
+  return nullptr;
+}
+
+// Since most methods are very similar, use macros to reduce boilerplate.
+// This defines a member that forwards the call to all listeners.
+#define GTEST_REPEATER_METHOD_(Name, Type) \
+void TestEventRepeater::Name(const Type& parameter) { \
+  if (forwarding_enabled_) { \
+    for (size_t i = 0; i < listeners_.size(); i++) { \
+      listeners_[i]->Name(parameter); \
+    } \
+  } \
+}
+// This defines a member that forwards the call to all listeners in reverse
+// order.
+#define GTEST_REVERSE_REPEATER_METHOD_(Name, Type)      \
+  void TestEventRepeater::Name(const Type& parameter) { \
+    if (forwarding_enabled_) {                          \
+      for (size_t i = listeners_.size(); i != 0; i--) { \
+        listeners_[i - 1]->Name(parameter);             \
+      }                                                 \
+    }                                                   \
+  }
+
+GTEST_REPEATER_METHOD_(OnTestProgramStart, UnitTest)
+GTEST_REPEATER_METHOD_(OnEnvironmentsSetUpStart, UnitTest)
+//  Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+GTEST_REPEATER_METHOD_(OnTestCaseStart, TestSuite)
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+GTEST_REPEATER_METHOD_(OnTestSuiteStart, TestSuite)
+GTEST_REPEATER_METHOD_(OnTestStart, TestInfo)
+GTEST_REPEATER_METHOD_(OnTestPartResult, TestPartResult)
+GTEST_REPEATER_METHOD_(OnEnvironmentsTearDownStart, UnitTest)
+GTEST_REVERSE_REPEATER_METHOD_(OnEnvironmentsSetUpEnd, UnitTest)
+GTEST_REVERSE_REPEATER_METHOD_(OnEnvironmentsTearDownEnd, UnitTest)
+GTEST_REVERSE_REPEATER_METHOD_(OnTestEnd, TestInfo)
+//  Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+GTEST_REVERSE_REPEATER_METHOD_(OnTestCaseEnd, TestSuite)
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+GTEST_REVERSE_REPEATER_METHOD_(OnTestSuiteEnd, TestSuite)
+GTEST_REVERSE_REPEATER_METHOD_(OnTestProgramEnd, UnitTest)
+
+#undef GTEST_REPEATER_METHOD_
+#undef GTEST_REVERSE_REPEATER_METHOD_
+
+void TestEventRepeater::OnTestIterationStart(const UnitTest& unit_test,
+                                             int iteration) {
+  if (forwarding_enabled_) {
+    for (size_t i = 0; i < listeners_.size(); i++) {
+      listeners_[i]->OnTestIterationStart(unit_test, iteration);
+    }
+  }
+}
+
+void TestEventRepeater::OnTestIterationEnd(const UnitTest& unit_test,
+                                           int iteration) {
+  if (forwarding_enabled_) {
+    for (size_t i = listeners_.size(); i > 0; i--) {
+      listeners_[i - 1]->OnTestIterationEnd(unit_test, iteration);
+    }
+  }
+}
+
+// End TestEventRepeater
+
+// This class generates an XML output file.
+class XmlUnitTestResultPrinter : public EmptyTestEventListener {
+ public:
+  explicit XmlUnitTestResultPrinter(const char* output_file);
+
+  void OnTestIterationEnd(const UnitTest& unit_test, int iteration) override;
+  void ListTestsMatchingFilter(const std::vector<TestSuite*>& test_suites);
+
+  // Prints an XML summary of all unit tests.
+  static void PrintXmlTestsList(std::ostream* stream,
+                                const std::vector<TestSuite*>& test_suites);
+
+ private:
+  // Is c a whitespace character that is normalized to a space character
+  // when it appears in an XML attribute value?
+  static bool IsNormalizableWhitespace(char c) {
+    return c == 0x9 || c == 0xA || c == 0xD;
+  }
+
+  // May c appear in a well-formed XML document?
+  static bool IsValidXmlCharacter(char c) {
+    return IsNormalizableWhitespace(c) || c >= 0x20;
+  }
+
+  // Returns an XML-escaped copy of the input string str.  If
+  // is_attribute is true, the text is meant to appear as an attribute
+  // value, and normalizable whitespace is preserved by replacing it
+  // with character references.
+  static std::string EscapeXml(const std::string& str, bool is_attribute);
+
+  // Returns the given string with all characters invalid in XML removed.
+  static std::string RemoveInvalidXmlCharacters(const std::string& str);
+
+  // Convenience wrapper around EscapeXml when str is an attribute value.
+  static std::string EscapeXmlAttribute(const std::string& str) {
+    return EscapeXml(str, true);
+  }
+
+  // Convenience wrapper around EscapeXml when str is not an attribute value.
+  static std::string EscapeXmlText(const char* str) {
+    return EscapeXml(str, false);
+  }
+
+  // Verifies that the given attribute belongs to the given element and
+  // streams the attribute as XML.
+  static void OutputXmlAttribute(std::ostream* stream,
+                                 const std::string& element_name,
+                                 const std::string& name,
+                                 const std::string& value);
+
+  // Streams an XML CDATA section, escaping invalid CDATA sequences as needed.
+  static void OutputXmlCDataSection(::std::ostream* stream, const char* data);
+
+  // Streams a test suite XML stanza containing the given test result.
+  //
+  // Requires: result.Failed()
+  static void OutputXmlTestSuiteForTestResult(::std::ostream* stream,
+                                              const TestResult& result);
+
+  // Streams an XML representation of a TestResult object.
+  static void OutputXmlTestResult(::std::ostream* stream,
+                                  const TestResult& result);
+
+  // Streams an XML representation of a TestInfo object.
+  static void OutputXmlTestInfo(::std::ostream* stream,
+                                const char* test_suite_name,
+                                const TestInfo& test_info);
+
+  // Prints an XML representation of a TestSuite object
+  static void PrintXmlTestSuite(::std::ostream* stream,
+                                const TestSuite& test_suite);
+
+  // Prints an XML summary of unit_test to output stream out.
+  static void PrintXmlUnitTest(::std::ostream* stream,
+                               const UnitTest& unit_test);
+
+  // Produces a string representing the test properties in a result as space
+  // delimited XML attributes based on the property key="value" pairs.
+  // When the std::string is not empty, it includes a space at the beginning,
+  // to delimit this attribute from prior attributes.
+  static std::string TestPropertiesAsXmlAttributes(const TestResult& result);
+
+  // Streams an XML representation of the test properties of a TestResult
+  // object.
+  static void OutputXmlTestProperties(std::ostream* stream,
+                                      const TestResult& result);
+
+  // The output file.
+  const std::string output_file_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(XmlUnitTestResultPrinter);
+};
+
+// Creates a new XmlUnitTestResultPrinter.
+XmlUnitTestResultPrinter::XmlUnitTestResultPrinter(const char* output_file)
+    : output_file_(output_file) {
+  if (output_file_.empty()) {
+    GTEST_LOG_(FATAL) << "XML output file may not be null";
+  }
+}
+
+// Called after the unit test ends.
+void XmlUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test,
+                                                  int /*iteration*/) {
+  FILE* xmlout = OpenFileForWriting(output_file_);
+  std::stringstream stream;
+  PrintXmlUnitTest(&stream, unit_test);
+  fprintf(xmlout, "%s", StringStreamToString(&stream).c_str());
+  fclose(xmlout);
+}
+
+void XmlUnitTestResultPrinter::ListTestsMatchingFilter(
+    const std::vector<TestSuite*>& test_suites) {
+  FILE* xmlout = OpenFileForWriting(output_file_);
+  std::stringstream stream;
+  PrintXmlTestsList(&stream, test_suites);
+  fprintf(xmlout, "%s", StringStreamToString(&stream).c_str());
+  fclose(xmlout);
+}
+
+// Returns an XML-escaped copy of the input string str.  If is_attribute
+// is true, the text is meant to appear as an attribute value, and
+// normalizable whitespace is preserved by replacing it with character
+// references.
+//
+// Invalid XML characters in str, if any, are stripped from the output.
+// It is expected that most, if not all, of the text processed by this
+// module will consist of ordinary English text.
+// If this module is ever modified to produce version 1.1 XML output,
+// most invalid characters can be retained using character references.
+std::string XmlUnitTestResultPrinter::EscapeXml(
+    const std::string& str, bool is_attribute) {
+  Message m;
+
+  for (size_t i = 0; i < str.size(); ++i) {
+    const char ch = str[i];
+    switch (ch) {
+      case '<':
+        m << "&lt;";
+        break;
+      case '>':
+        m << "&gt;";
+        break;
+      case '&':
+        m << "&amp;";
+        break;
+      case '\'':
+        if (is_attribute)
+          m << "&apos;";
+        else
+          m << '\'';
+        break;
+      case '"':
+        if (is_attribute)
+          m << "&quot;";
+        else
+          m << '"';
+        break;
+      default:
+        if (IsValidXmlCharacter(ch)) {
+          if (is_attribute && IsNormalizableWhitespace(ch))
+            m << "&#x" << String::FormatByte(static_cast<unsigned char>(ch))
+              << ";";
+          else
+            m << ch;
+        }
+        break;
+    }
+  }
+
+  return m.GetString();
+}
+
+// Returns the given string with all characters invalid in XML removed.
+// Currently invalid characters are dropped from the string. An
+// alternative is to replace them with certain characters such as . or ?.
+std::string XmlUnitTestResultPrinter::RemoveInvalidXmlCharacters(
+    const std::string& str) {
+  std::string output;
+  output.reserve(str.size());
+  for (std::string::const_iterator it = str.begin(); it != str.end(); ++it)
+    if (IsValidXmlCharacter(*it))
+      output.push_back(*it);
+
+  return output;
+}
+
+// The following routines generate an XML representation of a UnitTest
+// object.
+// GOOGLETEST_CM0009 DO NOT DELETE
+//
+// This is how Google Test concepts map to the DTD:
+//
+// <testsuites name="AllTests">        <-- corresponds to a UnitTest object
+//   <testsuite name="testcase-name">  <-- corresponds to a TestSuite object
+//     <testcase name="test-name">     <-- corresponds to a TestInfo object
+//       <failure message="...">...</failure>
+//       <failure message="...">...</failure>
+//       <failure message="...">...</failure>
+//                                     <-- individual assertion failures
+//     </testcase>
+//   </testsuite>
+// </testsuites>
+
+// Formats the given time in milliseconds as seconds.
+std::string FormatTimeInMillisAsSeconds(TimeInMillis ms) {
+  ::std::stringstream ss;
+  ss << (static_cast<double>(ms) * 1e-3);
+  return ss.str();
+}
+
+static bool PortableLocaltime(time_t seconds, struct tm* out) {
+#if defined(_MSC_VER)
+  return localtime_s(out, &seconds) == 0;
+#elif defined(__MINGW32__) || defined(__MINGW64__)
+  // MINGW <time.h> provides neither localtime_r nor localtime_s, but uses
+  // Windows' localtime(), which has a thread-local tm buffer.
+  struct tm* tm_ptr = localtime(&seconds);  // NOLINT
+  if (tm_ptr == nullptr) return false;
+  *out = *tm_ptr;
+  return true;
+#elif defined(__STDC_LIB_EXT1__)
+  // Uses localtime_s when available as localtime_r is only available from
+  // C23 standard.
+  return localtime_s(&seconds, out) != nullptr;
+#else
+  return localtime_r(&seconds, out) != nullptr;
+#endif
+}
+
+// Converts the given epoch time in milliseconds to a date string in the ISO
+// 8601 format, without the timezone information.
+std::string FormatEpochTimeInMillisAsIso8601(TimeInMillis ms) {
+  struct tm time_struct;
+  if (!PortableLocaltime(static_cast<time_t>(ms / 1000), &time_struct))
+    return "";
+  // YYYY-MM-DDThh:mm:ss.sss
+  return StreamableToString(time_struct.tm_year + 1900) + "-" +
+      String::FormatIntWidth2(time_struct.tm_mon + 1) + "-" +
+      String::FormatIntWidth2(time_struct.tm_mday) + "T" +
+      String::FormatIntWidth2(time_struct.tm_hour) + ":" +
+      String::FormatIntWidth2(time_struct.tm_min) + ":" +
+      String::FormatIntWidth2(time_struct.tm_sec) + "." +
+      String::FormatIntWidthN(static_cast<int>(ms % 1000), 3);
+}
+
+// Streams an XML CDATA section, escaping invalid CDATA sequences as needed.
+void XmlUnitTestResultPrinter::OutputXmlCDataSection(::std::ostream* stream,
+                                                     const char* data) {
+  const char* segment = data;
+  *stream << "<![CDATA[";
+  for (;;) {
+    const char* const next_segment = strstr(segment, "]]>");
+    if (next_segment != nullptr) {
+      stream->write(
+          segment, static_cast<std::streamsize>(next_segment - segment));
+      *stream << "]]>]]&gt;<![CDATA[";
+      segment = next_segment + strlen("]]>");
+    } else {
+      *stream << segment;
+      break;
+    }
+  }
+  *stream << "]]>";
+}
+
+void XmlUnitTestResultPrinter::OutputXmlAttribute(
+    std::ostream* stream,
+    const std::string& element_name,
+    const std::string& name,
+    const std::string& value) {
+  const std::vector<std::string>& allowed_names =
+      GetReservedOutputAttributesForElement(element_name);
+
+  GTEST_CHECK_(std::find(allowed_names.begin(), allowed_names.end(), name) !=
+                   allowed_names.end())
+      << "Attribute " << name << " is not allowed for element <" << element_name
+      << ">.";
+
+  *stream << " " << name << "=\"" << EscapeXmlAttribute(value) << "\"";
+}
+
+// Streams a test suite XML stanza containing the given test result.
+void XmlUnitTestResultPrinter::OutputXmlTestSuiteForTestResult(
+    ::std::ostream* stream, const TestResult& result) {
+  // Output the boilerplate for a minimal test suite with one test.
+  *stream << "  <testsuite";
+  OutputXmlAttribute(stream, "testsuite", "name", "NonTestSuiteFailure");
+  OutputXmlAttribute(stream, "testsuite", "tests", "1");
+  OutputXmlAttribute(stream, "testsuite", "failures", "1");
+  OutputXmlAttribute(stream, "testsuite", "disabled", "0");
+  OutputXmlAttribute(stream, "testsuite", "skipped", "0");
+  OutputXmlAttribute(stream, "testsuite", "errors", "0");
+  OutputXmlAttribute(stream, "testsuite", "time",
+                     FormatTimeInMillisAsSeconds(result.elapsed_time()));
+  OutputXmlAttribute(
+      stream, "testsuite", "timestamp",
+      FormatEpochTimeInMillisAsIso8601(result.start_timestamp()));
+  *stream << ">";
+
+  // Output the boilerplate for a minimal test case with a single test.
+  *stream << "    <testcase";
+  OutputXmlAttribute(stream, "testcase", "name", "");
+  OutputXmlAttribute(stream, "testcase", "status", "run");
+  OutputXmlAttribute(stream, "testcase", "result", "completed");
+  OutputXmlAttribute(stream, "testcase", "classname", "");
+  OutputXmlAttribute(stream, "testcase", "time",
+                     FormatTimeInMillisAsSeconds(result.elapsed_time()));
+  OutputXmlAttribute(
+      stream, "testcase", "timestamp",
+      FormatEpochTimeInMillisAsIso8601(result.start_timestamp()));
+
+  // Output the actual test result.
+  OutputXmlTestResult(stream, result);
+
+  // Complete the test suite.
+  *stream << "  </testsuite>\n";
+}
+
+// Prints an XML representation of a TestInfo object.
+void XmlUnitTestResultPrinter::OutputXmlTestInfo(::std::ostream* stream,
+                                                 const char* test_suite_name,
+                                                 const TestInfo& test_info) {
+  const TestResult& result = *test_info.result();
+  const std::string kTestsuite = "testcase";
+
+  if (test_info.is_in_another_shard()) {
+    return;
+  }
+
+  *stream << "    <testcase";
+  OutputXmlAttribute(stream, kTestsuite, "name", test_info.name());
+
+  if (test_info.value_param() != nullptr) {
+    OutputXmlAttribute(stream, kTestsuite, "value_param",
+                       test_info.value_param());
+  }
+  if (test_info.type_param() != nullptr) {
+    OutputXmlAttribute(stream, kTestsuite, "type_param",
+                       test_info.type_param());
+  }
+  if (GTEST_FLAG(list_tests)) {
+    OutputXmlAttribute(stream, kTestsuite, "file", test_info.file());
+    OutputXmlAttribute(stream, kTestsuite, "line",
+                       StreamableToString(test_info.line()));
+    *stream << " />\n";
+    return;
+  }
+
+  OutputXmlAttribute(stream, kTestsuite, "status",
+                     test_info.should_run() ? "run" : "notrun");
+  OutputXmlAttribute(stream, kTestsuite, "result",
+                     test_info.should_run()
+                         ? (result.Skipped() ? "skipped" : "completed")
+                         : "suppressed");
+  OutputXmlAttribute(stream, kTestsuite, "time",
+                     FormatTimeInMillisAsSeconds(result.elapsed_time()));
+  OutputXmlAttribute(
+      stream, kTestsuite, "timestamp",
+      FormatEpochTimeInMillisAsIso8601(result.start_timestamp()));
+  OutputXmlAttribute(stream, kTestsuite, "classname", test_suite_name);
+
+  OutputXmlTestResult(stream, result);
+}
+
+void XmlUnitTestResultPrinter::OutputXmlTestResult(::std::ostream* stream,
+                                                   const TestResult& result) {
+  int failures = 0;
+  int skips = 0;
+  for (int i = 0; i < result.total_part_count(); ++i) {
+    const TestPartResult& part = result.GetTestPartResult(i);
+    if (part.failed()) {
+      if (++failures == 1 && skips == 0) {
+        *stream << ">\n";
+      }
+      const std::string location =
+          internal::FormatCompilerIndependentFileLocation(part.file_name(),
+                                                          part.line_number());
+      const std::string summary = location + "\n" + part.summary();
+      *stream << "      <failure message=\""
+              << EscapeXmlAttribute(summary)
+              << "\" type=\"\">";
+      const std::string detail = location + "\n" + part.message();
+      OutputXmlCDataSection(stream, RemoveInvalidXmlCharacters(detail).c_str());
+      *stream << "</failure>\n";
+    } else if (part.skipped()) {
+      if (++skips == 1 && failures == 0) {
+        *stream << ">\n";
+      }
+      const std::string location =
+          internal::FormatCompilerIndependentFileLocation(part.file_name(),
+                                                          part.line_number());
+      const std::string summary = location + "\n" + part.summary();
+      *stream << "      <skipped message=\""
+              << EscapeXmlAttribute(summary.c_str()) << "\">";
+      const std::string detail = location + "\n" + part.message();
+      OutputXmlCDataSection(stream, RemoveInvalidXmlCharacters(detail).c_str());
+      *stream << "</skipped>\n";
+    }
+  }
+
+  if (failures == 0 && skips == 0 && result.test_property_count() == 0) {
+    *stream << " />\n";
+  } else {
+    if (failures == 0 && skips == 0) {
+      *stream << ">\n";
+    }
+    OutputXmlTestProperties(stream, result);
+    *stream << "    </testcase>\n";
+  }
+}
+
+// Prints an XML representation of a TestSuite object
+void XmlUnitTestResultPrinter::PrintXmlTestSuite(std::ostream* stream,
+                                                 const TestSuite& test_suite) {
+  const std::string kTestsuite = "testsuite";
+  *stream << "  <" << kTestsuite;
+  OutputXmlAttribute(stream, kTestsuite, "name", test_suite.name());
+  OutputXmlAttribute(stream, kTestsuite, "tests",
+                     StreamableToString(test_suite.reportable_test_count()));
+  if (!GTEST_FLAG(list_tests)) {
+    OutputXmlAttribute(stream, kTestsuite, "failures",
+                       StreamableToString(test_suite.failed_test_count()));
+    OutputXmlAttribute(
+        stream, kTestsuite, "disabled",
+        StreamableToString(test_suite.reportable_disabled_test_count()));
+    OutputXmlAttribute(stream, kTestsuite, "skipped",
+                       StreamableToString(test_suite.skipped_test_count()));
+
+    OutputXmlAttribute(stream, kTestsuite, "errors", "0");
+
+    OutputXmlAttribute(stream, kTestsuite, "time",
+                       FormatTimeInMillisAsSeconds(test_suite.elapsed_time()));
+    OutputXmlAttribute(
+        stream, kTestsuite, "timestamp",
+        FormatEpochTimeInMillisAsIso8601(test_suite.start_timestamp()));
+    *stream << TestPropertiesAsXmlAttributes(test_suite.ad_hoc_test_result());
+  }
+  *stream << ">\n";
+  for (int i = 0; i < test_suite.total_test_count(); ++i) {
+    if (test_suite.GetTestInfo(i)->is_reportable())
+      OutputXmlTestInfo(stream, test_suite.name(), *test_suite.GetTestInfo(i));
+  }
+  *stream << "  </" << kTestsuite << ">\n";
+}
+
+// Prints an XML summary of unit_test to output stream out.
+void XmlUnitTestResultPrinter::PrintXmlUnitTest(std::ostream* stream,
+                                                const UnitTest& unit_test) {
+  const std::string kTestsuites = "testsuites";
+
+  *stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+  *stream << "<" << kTestsuites;
+
+  OutputXmlAttribute(stream, kTestsuites, "tests",
+                     StreamableToString(unit_test.reportable_test_count()));
+  OutputXmlAttribute(stream, kTestsuites, "failures",
+                     StreamableToString(unit_test.failed_test_count()));
+  OutputXmlAttribute(
+      stream, kTestsuites, "disabled",
+      StreamableToString(unit_test.reportable_disabled_test_count()));
+  OutputXmlAttribute(stream, kTestsuites, "errors", "0");
+  OutputXmlAttribute(stream, kTestsuites, "time",
+                     FormatTimeInMillisAsSeconds(unit_test.elapsed_time()));
+  OutputXmlAttribute(
+      stream, kTestsuites, "timestamp",
+      FormatEpochTimeInMillisAsIso8601(unit_test.start_timestamp()));
+
+  if (GTEST_FLAG(shuffle)) {
+    OutputXmlAttribute(stream, kTestsuites, "random_seed",
+                       StreamableToString(unit_test.random_seed()));
+  }
+  *stream << TestPropertiesAsXmlAttributes(unit_test.ad_hoc_test_result());
+
+  OutputXmlAttribute(stream, kTestsuites, "name", "AllTests");
+  *stream << ">\n";
+
+  for (int i = 0; i < unit_test.total_test_suite_count(); ++i) {
+    if (unit_test.GetTestSuite(i)->reportable_test_count() > 0)
+      PrintXmlTestSuite(stream, *unit_test.GetTestSuite(i));
+  }
+
+  // If there was a test failure outside of one of the test suites (like in a
+  // test environment) include that in the output.
+  if (unit_test.ad_hoc_test_result().Failed()) {
+    OutputXmlTestSuiteForTestResult(stream, unit_test.ad_hoc_test_result());
+  }
+
+  *stream << "</" << kTestsuites << ">\n";
+}
+
+void XmlUnitTestResultPrinter::PrintXmlTestsList(
+    std::ostream* stream, const std::vector<TestSuite*>& test_suites) {
+  const std::string kTestsuites = "testsuites";
+
+  *stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+  *stream << "<" << kTestsuites;
+
+  int total_tests = 0;
+  for (auto test_suite : test_suites) {
+    total_tests += test_suite->total_test_count();
+  }
+  OutputXmlAttribute(stream, kTestsuites, "tests",
+                     StreamableToString(total_tests));
+  OutputXmlAttribute(stream, kTestsuites, "name", "AllTests");
+  *stream << ">\n";
+
+  for (auto test_suite : test_suites) {
+    PrintXmlTestSuite(stream, *test_suite);
+  }
+  *stream << "</" << kTestsuites << ">\n";
+}
+
+// Produces a string representing the test properties in a result as space
+// delimited XML attributes based on the property key="value" pairs.
+std::string XmlUnitTestResultPrinter::TestPropertiesAsXmlAttributes(
+    const TestResult& result) {
+  Message attributes;
+  for (int i = 0; i < result.test_property_count(); ++i) {
+    const TestProperty& property = result.GetTestProperty(i);
+    attributes << " " << property.key() << "="
+        << "\"" << EscapeXmlAttribute(property.value()) << "\"";
+  }
+  return attributes.GetString();
+}
+
+void XmlUnitTestResultPrinter::OutputXmlTestProperties(
+    std::ostream* stream, const TestResult& result) {
+  const std::string kProperties = "properties";
+  const std::string kProperty = "property";
+
+  if (result.test_property_count() <= 0) {
+    return;
+  }
+
+  *stream << "<" << kProperties << ">\n";
+  for (int i = 0; i < result.test_property_count(); ++i) {
+    const TestProperty& property = result.GetTestProperty(i);
+    *stream << "<" << kProperty;
+    *stream << " name=\"" << EscapeXmlAttribute(property.key()) << "\"";
+    *stream << " value=\"" << EscapeXmlAttribute(property.value()) << "\"";
+    *stream << "/>\n";
+  }
+  *stream << "</" << kProperties << ">\n";
+}
+
+// End XmlUnitTestResultPrinter
+
+// This class generates an JSON output file.
+class JsonUnitTestResultPrinter : public EmptyTestEventListener {
+ public:
+  explicit JsonUnitTestResultPrinter(const char* output_file);
+
+  void OnTestIterationEnd(const UnitTest& unit_test, int iteration) override;
+
+  // Prints an JSON summary of all unit tests.
+  static void PrintJsonTestList(::std::ostream* stream,
+                                const std::vector<TestSuite*>& test_suites);
+
+ private:
+  // Returns an JSON-escaped copy of the input string str.
+  static std::string EscapeJson(const std::string& str);
+
+  //// Verifies that the given attribute belongs to the given element and
+  //// streams the attribute as JSON.
+  static void OutputJsonKey(std::ostream* stream,
+                            const std::string& element_name,
+                            const std::string& name,
+                            const std::string& value,
+                            const std::string& indent,
+                            bool comma = true);
+  static void OutputJsonKey(std::ostream* stream,
+                            const std::string& element_name,
+                            const std::string& name,
+                            int value,
+                            const std::string& indent,
+                            bool comma = true);
+
+  // Streams a test suite JSON stanza containing the given test result.
+  //
+  // Requires: result.Failed()
+  static void OutputJsonTestSuiteForTestResult(::std::ostream* stream,
+                                               const TestResult& result);
+
+  // Streams a JSON representation of a TestResult object.
+  static void OutputJsonTestResult(::std::ostream* stream,
+                                   const TestResult& result);
+
+  // Streams a JSON representation of a TestInfo object.
+  static void OutputJsonTestInfo(::std::ostream* stream,
+                                 const char* test_suite_name,
+                                 const TestInfo& test_info);
+
+  // Prints a JSON representation of a TestSuite object
+  static void PrintJsonTestSuite(::std::ostream* stream,
+                                 const TestSuite& test_suite);
+
+  // Prints a JSON summary of unit_test to output stream out.
+  static void PrintJsonUnitTest(::std::ostream* stream,
+                                const UnitTest& unit_test);
+
+  // Produces a string representing the test properties in a result as
+  // a JSON dictionary.
+  static std::string TestPropertiesAsJson(const TestResult& result,
+                                          const std::string& indent);
+
+  // The output file.
+  const std::string output_file_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(JsonUnitTestResultPrinter);
+};
+
+// Creates a new JsonUnitTestResultPrinter.
+JsonUnitTestResultPrinter::JsonUnitTestResultPrinter(const char* output_file)
+    : output_file_(output_file) {
+  if (output_file_.empty()) {
+    GTEST_LOG_(FATAL) << "JSON output file may not be null";
+  }
+}
+
+void JsonUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test,
+                                                  int /*iteration*/) {
+  FILE* jsonout = OpenFileForWriting(output_file_);
+  std::stringstream stream;
+  PrintJsonUnitTest(&stream, unit_test);
+  fprintf(jsonout, "%s", StringStreamToString(&stream).c_str());
+  fclose(jsonout);
+}
+
+// Returns an JSON-escaped copy of the input string str.
+std::string JsonUnitTestResultPrinter::EscapeJson(const std::string& str) {
+  Message m;
+
+  for (size_t i = 0; i < str.size(); ++i) {
+    const char ch = str[i];
+    switch (ch) {
+      case '\\':
+      case '"':
+      case '/':
+        m << '\\' << ch;
+        break;
+      case '\b':
+        m << "\\b";
+        break;
+      case '\t':
+        m << "\\t";
+        break;
+      case '\n':
+        m << "\\n";
+        break;
+      case '\f':
+        m << "\\f";
+        break;
+      case '\r':
+        m << "\\r";
+        break;
+      default:
+        if (ch < ' ') {
+          m << "\\u00" << String::FormatByte(static_cast<unsigned char>(ch));
+        } else {
+          m << ch;
+        }
+        break;
+    }
+  }
+
+  return m.GetString();
+}
+
+// The following routines generate an JSON representation of a UnitTest
+// object.
+
+// Formats the given time in milliseconds as seconds.
+static std::string FormatTimeInMillisAsDuration(TimeInMillis ms) {
+  ::std::stringstream ss;
+  ss << (static_cast<double>(ms) * 1e-3) << "s";
+  return ss.str();
+}
+
+// Converts the given epoch time in milliseconds to a date string in the
+// RFC3339 format, without the timezone information.
+static std::string FormatEpochTimeInMillisAsRFC3339(TimeInMillis ms) {
+  struct tm time_struct;
+  if (!PortableLocaltime(static_cast<time_t>(ms / 1000), &time_struct))
+    return "";
+  // YYYY-MM-DDThh:mm:ss
+  return StreamableToString(time_struct.tm_year + 1900) + "-" +
+      String::FormatIntWidth2(time_struct.tm_mon + 1) + "-" +
+      String::FormatIntWidth2(time_struct.tm_mday) + "T" +
+      String::FormatIntWidth2(time_struct.tm_hour) + ":" +
+      String::FormatIntWidth2(time_struct.tm_min) + ":" +
+      String::FormatIntWidth2(time_struct.tm_sec) + "Z";
+}
+
+static inline std::string Indent(size_t width) {
+  return std::string(width, ' ');
+}
+
+void JsonUnitTestResultPrinter::OutputJsonKey(
+    std::ostream* stream,
+    const std::string& element_name,
+    const std::string& name,
+    const std::string& value,
+    const std::string& indent,
+    bool comma) {
+  const std::vector<std::string>& allowed_names =
+      GetReservedOutputAttributesForElement(element_name);
+
+  GTEST_CHECK_(std::find(allowed_names.begin(), allowed_names.end(), name) !=
+                   allowed_names.end())
+      << "Key \"" << name << "\" is not allowed for value \"" << element_name
+      << "\".";
+
+  *stream << indent << "\"" << name << "\": \"" << EscapeJson(value) << "\"";
+  if (comma)
+    *stream << ",\n";
+}
+
+void JsonUnitTestResultPrinter::OutputJsonKey(
+    std::ostream* stream,
+    const std::string& element_name,
+    const std::string& name,
+    int value,
+    const std::string& indent,
+    bool comma) {
+  const std::vector<std::string>& allowed_names =
+      GetReservedOutputAttributesForElement(element_name);
+
+  GTEST_CHECK_(std::find(allowed_names.begin(), allowed_names.end(), name) !=
+                   allowed_names.end())
+      << "Key \"" << name << "\" is not allowed for value \"" << element_name
+      << "\".";
+
+  *stream << indent << "\"" << name << "\": " << StreamableToString(value);
+  if (comma)
+    *stream << ",\n";
+}
+
+// Streams a test suite JSON stanza containing the given test result.
+void JsonUnitTestResultPrinter::OutputJsonTestSuiteForTestResult(
+    ::std::ostream* stream, const TestResult& result) {
+  // Output the boilerplate for a new test suite.
+  *stream << Indent(4) << "{\n";
+  OutputJsonKey(stream, "testsuite", "name", "NonTestSuiteFailure", Indent(6));
+  OutputJsonKey(stream, "testsuite", "tests", 1, Indent(6));
+  if (!GTEST_FLAG(list_tests)) {
+    OutputJsonKey(stream, "testsuite", "failures", 1, Indent(6));
+    OutputJsonKey(stream, "testsuite", "disabled", 0, Indent(6));
+    OutputJsonKey(stream, "testsuite", "skipped", 0, Indent(6));
+    OutputJsonKey(stream, "testsuite", "errors", 0, Indent(6));
+    OutputJsonKey(stream, "testsuite", "time",
+                  FormatTimeInMillisAsDuration(result.elapsed_time()),
+                  Indent(6));
+    OutputJsonKey(stream, "testsuite", "timestamp",
+                  FormatEpochTimeInMillisAsRFC3339(result.start_timestamp()),
+                  Indent(6));
+  }
+  *stream << Indent(6) << "\"testsuite\": [\n";
+
+  // Output the boilerplate for a new test case.
+  *stream << Indent(8) << "{\n";
+  OutputJsonKey(stream, "testcase", "name", "", Indent(10));
+  OutputJsonKey(stream, "testcase", "status", "RUN", Indent(10));
+  OutputJsonKey(stream, "testcase", "result", "COMPLETED", Indent(10));
+  OutputJsonKey(stream, "testcase", "timestamp",
+                FormatEpochTimeInMillisAsRFC3339(result.start_timestamp()),
+                Indent(10));
+  OutputJsonKey(stream, "testcase", "time",
+                FormatTimeInMillisAsDuration(result.elapsed_time()),
+                Indent(10));
+  OutputJsonKey(stream, "testcase", "classname", "", Indent(10), false);
+  *stream << TestPropertiesAsJson(result, Indent(10));
+
+  // Output the actual test result.
+  OutputJsonTestResult(stream, result);
+
+  // Finish the test suite.
+  *stream << "\n" << Indent(6) << "]\n" << Indent(4) << "}";
+}
+
+// Prints a JSON representation of a TestInfo object.
+void JsonUnitTestResultPrinter::OutputJsonTestInfo(::std::ostream* stream,
+                                                   const char* test_suite_name,
+                                                   const TestInfo& test_info) {
+  const TestResult& result = *test_info.result();
+  const std::string kTestsuite = "testcase";
+  const std::string kIndent = Indent(10);
+
+  *stream << Indent(8) << "{\n";
+  OutputJsonKey(stream, kTestsuite, "name", test_info.name(), kIndent);
+
+  if (test_info.value_param() != nullptr) {
+    OutputJsonKey(stream, kTestsuite, "value_param", test_info.value_param(),
+                  kIndent);
+  }
+  if (test_info.type_param() != nullptr) {
+    OutputJsonKey(stream, kTestsuite, "type_param", test_info.type_param(),
+                  kIndent);
+  }
+  if (GTEST_FLAG(list_tests)) {
+    OutputJsonKey(stream, kTestsuite, "file", test_info.file(), kIndent);
+    OutputJsonKey(stream, kTestsuite, "line", test_info.line(), kIndent, false);
+    *stream << "\n" << Indent(8) << "}";
+    return;
+  }
+
+  OutputJsonKey(stream, kTestsuite, "status",
+                test_info.should_run() ? "RUN" : "NOTRUN", kIndent);
+  OutputJsonKey(stream, kTestsuite, "result",
+                test_info.should_run()
+                    ? (result.Skipped() ? "SKIPPED" : "COMPLETED")
+                    : "SUPPRESSED",
+                kIndent);
+  OutputJsonKey(stream, kTestsuite, "timestamp",
+                FormatEpochTimeInMillisAsRFC3339(result.start_timestamp()),
+                kIndent);
+  OutputJsonKey(stream, kTestsuite, "time",
+                FormatTimeInMillisAsDuration(result.elapsed_time()), kIndent);
+  OutputJsonKey(stream, kTestsuite, "classname", test_suite_name, kIndent,
+                false);
+  *stream << TestPropertiesAsJson(result, kIndent);
+
+  OutputJsonTestResult(stream, result);
+}
+
+void JsonUnitTestResultPrinter::OutputJsonTestResult(::std::ostream* stream,
+                                                     const TestResult& result) {
+  const std::string kIndent = Indent(10);
+
+  int failures = 0;
+  for (int i = 0; i < result.total_part_count(); ++i) {
+    const TestPartResult& part = result.GetTestPartResult(i);
+    if (part.failed()) {
+      *stream << ",\n";
+      if (++failures == 1) {
+        *stream << kIndent << "\"" << "failures" << "\": [\n";
+      }
+      const std::string location =
+          internal::FormatCompilerIndependentFileLocation(part.file_name(),
+                                                          part.line_number());
+      const std::string message = EscapeJson(location + "\n" + part.message());
+      *stream << kIndent << "  {\n"
+              << kIndent << "    \"failure\": \"" << message << "\",\n"
+              << kIndent << "    \"type\": \"\"\n"
+              << kIndent << "  }";
+    }
+  }
+
+  if (failures > 0)
+    *stream << "\n" << kIndent << "]";
+  *stream << "\n" << Indent(8) << "}";
+}
+
+// Prints an JSON representation of a TestSuite object
+void JsonUnitTestResultPrinter::PrintJsonTestSuite(
+    std::ostream* stream, const TestSuite& test_suite) {
+  const std::string kTestsuite = "testsuite";
+  const std::string kIndent = Indent(6);
+
+  *stream << Indent(4) << "{\n";
+  OutputJsonKey(stream, kTestsuite, "name", test_suite.name(), kIndent);
+  OutputJsonKey(stream, kTestsuite, "tests", test_suite.reportable_test_count(),
+                kIndent);
+  if (!GTEST_FLAG(list_tests)) {
+    OutputJsonKey(stream, kTestsuite, "failures",
+                  test_suite.failed_test_count(), kIndent);
+    OutputJsonKey(stream, kTestsuite, "disabled",
+                  test_suite.reportable_disabled_test_count(), kIndent);
+    OutputJsonKey(stream, kTestsuite, "errors", 0, kIndent);
+    OutputJsonKey(
+        stream, kTestsuite, "timestamp",
+        FormatEpochTimeInMillisAsRFC3339(test_suite.start_timestamp()),
+        kIndent);
+    OutputJsonKey(stream, kTestsuite, "time",
+                  FormatTimeInMillisAsDuration(test_suite.elapsed_time()),
+                  kIndent, false);
+    *stream << TestPropertiesAsJson(test_suite.ad_hoc_test_result(), kIndent)
+            << ",\n";
+  }
+
+  *stream << kIndent << "\"" << kTestsuite << "\": [\n";
+
+  bool comma = false;
+  for (int i = 0; i < test_suite.total_test_count(); ++i) {
+    if (test_suite.GetTestInfo(i)->is_reportable()) {
+      if (comma) {
+        *stream << ",\n";
+      } else {
+        comma = true;
+      }
+      OutputJsonTestInfo(stream, test_suite.name(), *test_suite.GetTestInfo(i));
+    }
+  }
+  *stream << "\n" << kIndent << "]\n" << Indent(4) << "}";
+}
+
+// Prints a JSON summary of unit_test to output stream out.
+void JsonUnitTestResultPrinter::PrintJsonUnitTest(std::ostream* stream,
+                                                  const UnitTest& unit_test) {
+  const std::string kTestsuites = "testsuites";
+  const std::string kIndent = Indent(2);
+  *stream << "{\n";
+
+  OutputJsonKey(stream, kTestsuites, "tests", unit_test.reportable_test_count(),
+                kIndent);
+  OutputJsonKey(stream, kTestsuites, "failures", unit_test.failed_test_count(),
+                kIndent);
+  OutputJsonKey(stream, kTestsuites, "disabled",
+                unit_test.reportable_disabled_test_count(), kIndent);
+  OutputJsonKey(stream, kTestsuites, "errors", 0, kIndent);
+  if (GTEST_FLAG(shuffle)) {
+    OutputJsonKey(stream, kTestsuites, "random_seed", unit_test.random_seed(),
+                  kIndent);
+  }
+  OutputJsonKey(stream, kTestsuites, "timestamp",
+                FormatEpochTimeInMillisAsRFC3339(unit_test.start_timestamp()),
+                kIndent);
+  OutputJsonKey(stream, kTestsuites, "time",
+                FormatTimeInMillisAsDuration(unit_test.elapsed_time()), kIndent,
+                false);
+
+  *stream << TestPropertiesAsJson(unit_test.ad_hoc_test_result(), kIndent)
+          << ",\n";
+
+  OutputJsonKey(stream, kTestsuites, "name", "AllTests", kIndent);
+  *stream << kIndent << "\"" << kTestsuites << "\": [\n";
+
+  bool comma = false;
+  for (int i = 0; i < unit_test.total_test_suite_count(); ++i) {
+    if (unit_test.GetTestSuite(i)->reportable_test_count() > 0) {
+      if (comma) {
+        *stream << ",\n";
+      } else {
+        comma = true;
+      }
+      PrintJsonTestSuite(stream, *unit_test.GetTestSuite(i));
+    }
+  }
+
+  // If there was a test failure outside of one of the test suites (like in a
+  // test environment) include that in the output.
+  if (unit_test.ad_hoc_test_result().Failed()) {
+    OutputJsonTestSuiteForTestResult(stream, unit_test.ad_hoc_test_result());
+  }
+
+  *stream << "\n" << kIndent << "]\n" << "}\n";
+}
+
+void JsonUnitTestResultPrinter::PrintJsonTestList(
+    std::ostream* stream, const std::vector<TestSuite*>& test_suites) {
+  const std::string kTestsuites = "testsuites";
+  const std::string kIndent = Indent(2);
+  *stream << "{\n";
+  int total_tests = 0;
+  for (auto test_suite : test_suites) {
+    total_tests += test_suite->total_test_count();
+  }
+  OutputJsonKey(stream, kTestsuites, "tests", total_tests, kIndent);
+
+  OutputJsonKey(stream, kTestsuites, "name", "AllTests", kIndent);
+  *stream << kIndent << "\"" << kTestsuites << "\": [\n";
+
+  for (size_t i = 0; i < test_suites.size(); ++i) {
+    if (i != 0) {
+      *stream << ",\n";
+    }
+    PrintJsonTestSuite(stream, *test_suites[i]);
+  }
+
+  *stream << "\n"
+          << kIndent << "]\n"
+          << "}\n";
+}
+// Produces a string representing the test properties in a result as
+// a JSON dictionary.
+std::string JsonUnitTestResultPrinter::TestPropertiesAsJson(
+    const TestResult& result, const std::string& indent) {
+  Message attributes;
+  for (int i = 0; i < result.test_property_count(); ++i) {
+    const TestProperty& property = result.GetTestProperty(i);
+    attributes << ",\n" << indent << "\"" << property.key() << "\": "
+               << "\"" << EscapeJson(property.value()) << "\"";
+  }
+  return attributes.GetString();
+}
+
+// End JsonUnitTestResultPrinter
+
+#if GTEST_CAN_STREAM_RESULTS_
+
+// Checks if str contains '=', '&', '%' or '\n' characters. If yes,
+// replaces them by "%xx" where xx is their hexadecimal value. For
+// example, replaces "=" with "%3D".  This algorithm is O(strlen(str))
+// in both time and space -- important as the input str may contain an
+// arbitrarily long test failure message and stack trace.
+std::string StreamingListener::UrlEncode(const char* str) {
+  std::string result;
+  result.reserve(strlen(str) + 1);
+  for (char ch = *str; ch != '\0'; ch = *++str) {
+    switch (ch) {
+      case '%':
+      case '=':
+      case '&':
+      case '\n':
+        result.append("%" + String::FormatByte(static_cast<unsigned char>(ch)));
+        break;
+      default:
+        result.push_back(ch);
+        break;
+    }
+  }
+  return result;
+}
+
+void StreamingListener::SocketWriter::MakeConnection() {
+  GTEST_CHECK_(sockfd_ == -1)
+      << "MakeConnection() can't be called when there is already a connection.";
+
+  addrinfo hints;
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_family = AF_UNSPEC;    // To allow both IPv4 and IPv6 addresses.
+  hints.ai_socktype = SOCK_STREAM;
+  addrinfo* servinfo = nullptr;
+
+  // Use the getaddrinfo() to get a linked list of IP addresses for
+  // the given host name.
+  const int error_num = getaddrinfo(
+      host_name_.c_str(), port_num_.c_str(), &hints, &servinfo);
+  if (error_num != 0) {
+    GTEST_LOG_(WARNING) << "stream_result_to: getaddrinfo() failed: "
+                        << gai_strerror(error_num);
+  }
+
+  // Loop through all the results and connect to the first we can.
+  for (addrinfo* cur_addr = servinfo; sockfd_ == -1 && cur_addr != nullptr;
+       cur_addr = cur_addr->ai_next) {
+    sockfd_ = socket(
+        cur_addr->ai_family, cur_addr->ai_socktype, cur_addr->ai_protocol);
+    if (sockfd_ != -1) {
+      // Connect the client socket to the server socket.
+      if (connect(sockfd_, cur_addr->ai_addr, cur_addr->ai_addrlen) == -1) {
+        close(sockfd_);
+        sockfd_ = -1;
+      }
+    }
+  }
+
+  freeaddrinfo(servinfo);  // all done with this structure
+
+  if (sockfd_ == -1) {
+    GTEST_LOG_(WARNING) << "stream_result_to: failed to connect to "
+                        << host_name_ << ":" << port_num_;
+  }
+}
+
+// End of class Streaming Listener
+#endif  // GTEST_CAN_STREAM_RESULTS__
+
+// class OsStackTraceGetter
+
+const char* const OsStackTraceGetterInterface::kElidedFramesMarker =
+    "... " GTEST_NAME_ " internal frames ...";
+
+std::string OsStackTraceGetter::CurrentStackTrace(int max_depth, int skip_count)
+    GTEST_LOCK_EXCLUDED_(mutex_) {
+#if GTEST_HAS_ABSL
+  std::string result;
+
+  if (max_depth <= 0) {
+    return result;
+  }
+
+  max_depth = std::min(max_depth, kMaxStackTraceDepth);
+
+  std::vector<void*> raw_stack(max_depth);
+  // Skips the frames requested by the caller, plus this function.
+  const int raw_stack_size =
+      absl::GetStackTrace(&raw_stack[0], max_depth, skip_count + 1);
+
+  void* caller_frame = nullptr;
+  {
+    MutexLock lock(&mutex_);
+    caller_frame = caller_frame_;
+  }
+
+  for (int i = 0; i < raw_stack_size; ++i) {
+    if (raw_stack[i] == caller_frame &&
+        !GTEST_FLAG(show_internal_stack_frames)) {
+      // Add a marker to the trace and stop adding frames.
+      absl::StrAppend(&result, kElidedFramesMarker, "\n");
+      break;
+    }
+
+    char tmp[1024];
+    const char* symbol = "(unknown)";
+    if (absl::Symbolize(raw_stack[i], tmp, sizeof(tmp))) {
+      symbol = tmp;
+    }
+
+    char line[1024];
+    snprintf(line, sizeof(line), "  %p: %s\n", raw_stack[i], symbol);
+    result += line;
+  }
+
+  return result;
+
+#else  // !GTEST_HAS_ABSL
+  static_cast<void>(max_depth);
+  static_cast<void>(skip_count);
+  return "";
+#endif  // GTEST_HAS_ABSL
+}
+
+void OsStackTraceGetter::UponLeavingGTest() GTEST_LOCK_EXCLUDED_(mutex_) {
+#if GTEST_HAS_ABSL
+  void* caller_frame = nullptr;
+  if (absl::GetStackTrace(&caller_frame, 1, 3) <= 0) {
+    caller_frame = nullptr;
+  }
+
+  MutexLock lock(&mutex_);
+  caller_frame_ = caller_frame;
+#endif  // GTEST_HAS_ABSL
+}
+
+// A helper class that creates the premature-exit file in its
+// constructor and deletes the file in its destructor.
+class ScopedPrematureExitFile {
+ public:
+  explicit ScopedPrematureExitFile(const char* premature_exit_filepath)
+      : premature_exit_filepath_(premature_exit_filepath ?
+                                 premature_exit_filepath : "") {
+    // If a path to the premature-exit file is specified...
+    if (!premature_exit_filepath_.empty()) {
+      // create the file with a single "0" character in it.  I/O
+      // errors are ignored as there's nothing better we can do and we
+      // don't want to fail the test because of this.
+      FILE* pfile = posix::FOpen(premature_exit_filepath, "w");
+      fwrite("0", 1, 1, pfile);
+      fclose(pfile);
+    }
+  }
+
+  ~ScopedPrematureExitFile() {
+#if !defined GTEST_OS_ESP8266
+    if (!premature_exit_filepath_.empty()) {
+      int retval = remove(premature_exit_filepath_.c_str());
+      if (retval) {
+        GTEST_LOG_(ERROR) << "Failed to remove premature exit filepath \""
+                          << premature_exit_filepath_ << "\" with error "
+                          << retval;
+      }
+    }
+#endif
+  }
+
+ private:
+  const std::string premature_exit_filepath_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedPrematureExitFile);
+};
+
+}  // namespace internal
+
+// class TestEventListeners
+
+TestEventListeners::TestEventListeners()
+    : repeater_(new internal::TestEventRepeater()),
+      default_result_printer_(nullptr),
+      default_xml_generator_(nullptr) {}
+
+TestEventListeners::~TestEventListeners() { delete repeater_; }
+
+// Returns the standard listener responsible for the default console
+// output.  Can be removed from the listeners list to shut down default
+// console output.  Note that removing this object from the listener list
+// with Release transfers its ownership to the user.
+void TestEventListeners::Append(TestEventListener* listener) {
+  repeater_->Append(listener);
+}
+
+// Removes the given event listener from the list and returns it.  It then
+// becomes the caller's responsibility to delete the listener. Returns
+// NULL if the listener is not found in the list.
+TestEventListener* TestEventListeners::Release(TestEventListener* listener) {
+  if (listener == default_result_printer_)
+    default_result_printer_ = nullptr;
+  else if (listener == default_xml_generator_)
+    default_xml_generator_ = nullptr;
+  return repeater_->Release(listener);
+}
+
+// Returns repeater that broadcasts the TestEventListener events to all
+// subscribers.
+TestEventListener* TestEventListeners::repeater() { return repeater_; }
+
+// Sets the default_result_printer attribute to the provided listener.
+// The listener is also added to the listener list and previous
+// default_result_printer is removed from it and deleted. The listener can
+// also be NULL in which case it will not be added to the list. Does
+// nothing if the previous and the current listener objects are the same.
+void TestEventListeners::SetDefaultResultPrinter(TestEventListener* listener) {
+  if (default_result_printer_ != listener) {
+    // It is an error to pass this method a listener that is already in the
+    // list.
+    delete Release(default_result_printer_);
+    default_result_printer_ = listener;
+    if (listener != nullptr) Append(listener);
+  }
+}
+
+// Sets the default_xml_generator attribute to the provided listener.  The
+// listener is also added to the listener list and previous
+// default_xml_generator is removed from it and deleted. The listener can
+// also be NULL in which case it will not be added to the list. Does
+// nothing if the previous and the current listener objects are the same.
+void TestEventListeners::SetDefaultXmlGenerator(TestEventListener* listener) {
+  if (default_xml_generator_ != listener) {
+    // It is an error to pass this method a listener that is already in the
+    // list.
+    delete Release(default_xml_generator_);
+    default_xml_generator_ = listener;
+    if (listener != nullptr) Append(listener);
+  }
+}
+
+// Controls whether events will be forwarded by the repeater to the
+// listeners in the list.
+bool TestEventListeners::EventForwardingEnabled() const {
+  return repeater_->forwarding_enabled();
+}
+
+void TestEventListeners::SuppressEventForwarding() {
+  repeater_->set_forwarding_enabled(false);
+}
+
+// class UnitTest
+
+// Gets the singleton UnitTest object.  The first time this method is
+// called, a UnitTest object is constructed and returned.  Consecutive
+// calls will return the same object.
+//
+// We don't protect this under mutex_ as a user is not supposed to
+// call this before main() starts, from which point on the return
+// value will never change.
+UnitTest* UnitTest::GetInstance() {
+  // CodeGear C++Builder insists on a public destructor for the
+  // default implementation.  Use this implementation to keep good OO
+  // design with private destructor.
+
+#if defined(__BORLANDC__)
+  static UnitTest* const instance = new UnitTest;
+  return instance;
+#else
+  static UnitTest instance;
+  return &instance;
+#endif  // defined(__BORLANDC__)
+}
+
+// Gets the number of successful test suites.
+int UnitTest::successful_test_suite_count() const {
+  return impl()->successful_test_suite_count();
+}
+
+// Gets the number of failed test suites.
+int UnitTest::failed_test_suite_count() const {
+  return impl()->failed_test_suite_count();
+}
+
+// Gets the number of all test suites.
+int UnitTest::total_test_suite_count() const {
+  return impl()->total_test_suite_count();
+}
+
+// Gets the number of all test suites that contain at least one test
+// that should run.
+int UnitTest::test_suite_to_run_count() const {
+  return impl()->test_suite_to_run_count();
+}
+
+//  Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+int UnitTest::successful_test_case_count() const {
+  return impl()->successful_test_suite_count();
+}
+int UnitTest::failed_test_case_count() const {
+  return impl()->failed_test_suite_count();
+}
+int UnitTest::total_test_case_count() const {
+  return impl()->total_test_suite_count();
+}
+int UnitTest::test_case_to_run_count() const {
+  return impl()->test_suite_to_run_count();
+}
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+// Gets the number of successful tests.
+int UnitTest::successful_test_count() const {
+  return impl()->successful_test_count();
+}
+
+// Gets the number of skipped tests.
+int UnitTest::skipped_test_count() const {
+  return impl()->skipped_test_count();
+}
+
+// Gets the number of failed tests.
+int UnitTest::failed_test_count() const { return impl()->failed_test_count(); }
+
+// Gets the number of disabled tests that will be reported in the XML report.
+int UnitTest::reportable_disabled_test_count() const {
+  return impl()->reportable_disabled_test_count();
+}
+
+// Gets the number of disabled tests.
+int UnitTest::disabled_test_count() const {
+  return impl()->disabled_test_count();
+}
+
+// Gets the number of tests to be printed in the XML report.
+int UnitTest::reportable_test_count() const {
+  return impl()->reportable_test_count();
+}
+
+// Gets the number of all tests.
+int UnitTest::total_test_count() const { return impl()->total_test_count(); }
+
+// Gets the number of tests that should run.
+int UnitTest::test_to_run_count() const { return impl()->test_to_run_count(); }
+
+// Gets the time of the test program start, in ms from the start of the
+// UNIX epoch.
+internal::TimeInMillis UnitTest::start_timestamp() const {
+    return impl()->start_timestamp();
+}
+
+// Gets the elapsed time, in milliseconds.
+internal::TimeInMillis UnitTest::elapsed_time() const {
+  return impl()->elapsed_time();
+}
+
+// Returns true if and only if the unit test passed (i.e. all test suites
+// passed).
+bool UnitTest::Passed() const { return impl()->Passed(); }
+
+// Returns true if and only if the unit test failed (i.e. some test suite
+// failed or something outside of all tests failed).
+bool UnitTest::Failed() const { return impl()->Failed(); }
+
+// Gets the i-th test suite among all the test suites. i can range from 0 to
+// total_test_suite_count() - 1. If i is not in that range, returns NULL.
+const TestSuite* UnitTest::GetTestSuite(int i) const {
+  return impl()->GetTestSuite(i);
+}
+
+//  Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+const TestCase* UnitTest::GetTestCase(int i) const {
+  return impl()->GetTestCase(i);
+}
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+// Returns the TestResult containing information on test failures and
+// properties logged outside of individual test suites.
+const TestResult& UnitTest::ad_hoc_test_result() const {
+  return *impl()->ad_hoc_test_result();
+}
+
+// Gets the i-th test suite among all the test suites. i can range from 0 to
+// total_test_suite_count() - 1. If i is not in that range, returns NULL.
+TestSuite* UnitTest::GetMutableTestSuite(int i) {
+  return impl()->GetMutableSuiteCase(i);
+}
+
+// Returns the list of event listeners that can be used to track events
+// inside Google Test.
+TestEventListeners& UnitTest::listeners() {
+  return *impl()->listeners();
+}
+
+// Registers and returns a global test environment.  When a test
+// program is run, all global test environments will be set-up in the
+// order they were registered.  After all tests in the program have
+// finished, all global test environments will be torn-down in the
+// *reverse* order they were registered.
+//
+// The UnitTest object takes ownership of the given environment.
+//
+// We don't protect this under mutex_, as we only support calling it
+// from the main thread.
+Environment* UnitTest::AddEnvironment(Environment* env) {
+  if (env == nullptr) {
+    return nullptr;
+  }
+
+  impl_->environments().push_back(env);
+  return env;
+}
+
+// Adds a TestPartResult to the current TestResult object.  All Google Test
+// assertion macros (e.g. ASSERT_TRUE, EXPECT_EQ, etc) eventually call
+// this to report their results.  The user code should use the
+// assertion macros instead of calling this directly.
+void UnitTest::AddTestPartResult(
+    TestPartResult::Type result_type,
+    const char* file_name,
+    int line_number,
+    const std::string& message,
+    const std::string& os_stack_trace) GTEST_LOCK_EXCLUDED_(mutex_) {
+  Message msg;
+  msg << message;
+
+  internal::MutexLock lock(&mutex_);
+  if (impl_->gtest_trace_stack().size() > 0) {
+    msg << "\n" << GTEST_NAME_ << " trace:";
+
+    for (size_t i = impl_->gtest_trace_stack().size(); i > 0; --i) {
+      const internal::TraceInfo& trace = impl_->gtest_trace_stack()[i - 1];
+      msg << "\n" << internal::FormatFileLocation(trace.file, trace.line)
+          << " " << trace.message;
+    }
+  }
+
+  if (os_stack_trace.c_str() != nullptr && !os_stack_trace.empty()) {
+    msg << internal::kStackTraceMarker << os_stack_trace;
+  }
+
+  const TestPartResult result = TestPartResult(
+      result_type, file_name, line_number, msg.GetString().c_str());
+  impl_->GetTestPartResultReporterForCurrentThread()->
+      ReportTestPartResult(result);
+
+  if (result_type != TestPartResult::kSuccess &&
+      result_type != TestPartResult::kSkip) {
+    // gtest_break_on_failure takes precedence over
+    // gtest_throw_on_failure.  This allows a user to set the latter
+    // in the code (perhaps in order to use Google Test assertions
+    // with another testing framework) and specify the former on the
+    // command line for debugging.
+    if (GTEST_FLAG(break_on_failure)) {
+#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
+      // Using DebugBreak on Windows allows gtest to still break into a debugger
+      // when a failure happens and both the --gtest_break_on_failure and
+      // the --gtest_catch_exceptions flags are specified.
+      DebugBreak();
+#elif (!defined(__native_client__)) &&            \
+    ((defined(__clang__) || defined(__GNUC__)) && \
+     (defined(__x86_64__) || defined(__i386__)))
+      // with clang/gcc we can achieve the same effect on x86 by invoking int3
+      asm("int3");
+#else
+      // Dereference nullptr through a volatile pointer to prevent the compiler
+      // from removing. We use this rather than abort() or __builtin_trap() for
+      // portability: some debuggers don't correctly trap abort().
+      *static_cast<volatile int*>(nullptr) = 1;
+#endif  // GTEST_OS_WINDOWS
+    } else if (GTEST_FLAG(throw_on_failure)) {
+#if GTEST_HAS_EXCEPTIONS
+      throw internal::GoogleTestFailureException(result);
+#else
+      // We cannot call abort() as it generates a pop-up in debug mode
+      // that cannot be suppressed in VC 7.1 or below.
+      exit(1);
+#endif
+    }
+  }
+}
+
+// Adds a TestProperty to the current TestResult object when invoked from
+// inside a test, to current TestSuite's ad_hoc_test_result_ when invoked
+// from SetUpTestSuite or TearDownTestSuite, or to the global property set
+// when invoked elsewhere.  If the result already contains a property with
+// the same key, the value will be updated.
+void UnitTest::RecordProperty(const std::string& key,
+                              const std::string& value) {
+  impl_->RecordProperty(TestProperty(key, value));
+}
+
+// Runs all tests in this UnitTest object and prints the result.
+// Returns 0 if successful, or 1 otherwise.
+//
+// We don't protect this under mutex_, as we only support calling it
+// from the main thread.
+int UnitTest::Run() {
+  const bool in_death_test_child_process =
+      internal::GTEST_FLAG(internal_run_death_test).length() > 0;
+
+  // Google Test implements this protocol for catching that a test
+  // program exits before returning control to Google Test:
+  //
+  //   1. Upon start, Google Test creates a file whose absolute path
+  //      is specified by the environment variable
+  //      TEST_PREMATURE_EXIT_FILE.
+  //   2. When Google Test has finished its work, it deletes the file.
+  //
+  // This allows a test runner to set TEST_PREMATURE_EXIT_FILE before
+  // running a Google-Test-based test program and check the existence
+  // of the file at the end of the test execution to see if it has
+  // exited prematurely.
+
+  // If we are in the child process of a death test, don't
+  // create/delete the premature exit file, as doing so is unnecessary
+  // and will confuse the parent process.  Otherwise, create/delete
+  // the file upon entering/leaving this function.  If the program
+  // somehow exits before this function has a chance to return, the
+  // premature-exit file will be left undeleted, causing a test runner
+  // that understands the premature-exit-file protocol to report the
+  // test as having failed.
+  const internal::ScopedPrematureExitFile premature_exit_file(
+      in_death_test_child_process
+          ? nullptr
+          : internal::posix::GetEnv("TEST_PREMATURE_EXIT_FILE"));
+
+  // Captures the value of GTEST_FLAG(catch_exceptions).  This value will be
+  // used for the duration of the program.
+  impl()->set_catch_exceptions(GTEST_FLAG(catch_exceptions));
+
+#if GTEST_OS_WINDOWS
+  // Either the user wants Google Test to catch exceptions thrown by the
+  // tests or this is executing in the context of death test child
+  // process. In either case the user does not want to see pop-up dialogs
+  // about crashes - they are expected.
+  if (impl()->catch_exceptions() || in_death_test_child_process) {
+# if !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
+    // SetErrorMode doesn't exist on CE.
+    SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOALIGNMENTFAULTEXCEPT |
+                 SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX);
+# endif  // !GTEST_OS_WINDOWS_MOBILE
+
+# if (defined(_MSC_VER) || GTEST_OS_WINDOWS_MINGW) && !GTEST_OS_WINDOWS_MOBILE
+    // Death test children can be terminated with _abort().  On Windows,
+    // _abort() can show a dialog with a warning message.  This forces the
+    // abort message to go to stderr instead.
+    _set_error_mode(_OUT_TO_STDERR);
+# endif
+
+# if defined(_MSC_VER) && !GTEST_OS_WINDOWS_MOBILE
+    // In the debug version, Visual Studio pops up a separate dialog
+    // offering a choice to debug the aborted program. We need to suppress
+    // this dialog or it will pop up for every EXPECT/ASSERT_DEATH statement
+    // executed. Google Test will notify the user of any unexpected
+    // failure via stderr.
+    if (!GTEST_FLAG(break_on_failure))
+      _set_abort_behavior(
+          0x0,                                    // Clear the following flags:
+          _WRITE_ABORT_MSG | _CALL_REPORTFAULT);  // pop-up window, core dump.
+
+    // In debug mode, the Windows CRT can crash with an assertion over invalid
+    // input (e.g. passing an invalid file descriptor).  The default handling
+    // for these assertions is to pop up a dialog and wait for user input.
+    // Instead ask the CRT to dump such assertions to stderr non-interactively.
+    if (!IsDebuggerPresent()) {
+      (void)_CrtSetReportMode(_CRT_ASSERT,
+                              _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
+      (void)_CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);
+    }
+# endif
+  }
+#endif  // GTEST_OS_WINDOWS
+
+  return internal::HandleExceptionsInMethodIfSupported(
+      impl(),
+      &internal::UnitTestImpl::RunAllTests,
+      "auxiliary test code (environments or event listeners)") ? 0 : 1;
+}
+
+// Returns the working directory when the first TEST() or TEST_F() was
+// executed.
+const char* UnitTest::original_working_dir() const {
+  return impl_->original_working_dir_.c_str();
+}
+
+// Returns the TestSuite object for the test that's currently running,
+// or NULL if no test is running.
+const TestSuite* UnitTest::current_test_suite() const
+    GTEST_LOCK_EXCLUDED_(mutex_) {
+  internal::MutexLock lock(&mutex_);
+  return impl_->current_test_suite();
+}
+
+// Legacy API is still available but deprecated
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+const TestCase* UnitTest::current_test_case() const
+    GTEST_LOCK_EXCLUDED_(mutex_) {
+  internal::MutexLock lock(&mutex_);
+  return impl_->current_test_suite();
+}
+#endif
+
+// Returns the TestInfo object for the test that's currently running,
+// or NULL if no test is running.
+const TestInfo* UnitTest::current_test_info() const
+    GTEST_LOCK_EXCLUDED_(mutex_) {
+  internal::MutexLock lock(&mutex_);
+  return impl_->current_test_info();
+}
+
+// Returns the random seed used at the start of the current test run.
+int UnitTest::random_seed() const { return impl_->random_seed(); }
+
+// Returns ParameterizedTestSuiteRegistry object used to keep track of
+// value-parameterized tests and instantiate and register them.
+internal::ParameterizedTestSuiteRegistry&
+UnitTest::parameterized_test_registry() GTEST_LOCK_EXCLUDED_(mutex_) {
+  return impl_->parameterized_test_registry();
+}
+
+// Creates an empty UnitTest.
+UnitTest::UnitTest() {
+  impl_ = new internal::UnitTestImpl(this);
+}
+
+// Destructor of UnitTest.
+UnitTest::~UnitTest() {
+  delete impl_;
+}
+
+// Pushes a trace defined by SCOPED_TRACE() on to the per-thread
+// Google Test trace stack.
+void UnitTest::PushGTestTrace(const internal::TraceInfo& trace)
+    GTEST_LOCK_EXCLUDED_(mutex_) {
+  internal::MutexLock lock(&mutex_);
+  impl_->gtest_trace_stack().push_back(trace);
+}
+
+// Pops a trace from the per-thread Google Test trace stack.
+void UnitTest::PopGTestTrace()
+    GTEST_LOCK_EXCLUDED_(mutex_) {
+  internal::MutexLock lock(&mutex_);
+  impl_->gtest_trace_stack().pop_back();
+}
+
+namespace internal {
+
+UnitTestImpl::UnitTestImpl(UnitTest* parent)
+    : parent_(parent),
+      GTEST_DISABLE_MSC_WARNINGS_PUSH_(4355 /* using this in initializer */)
+          default_global_test_part_result_reporter_(this),
+      default_per_thread_test_part_result_reporter_(this),
+      GTEST_DISABLE_MSC_WARNINGS_POP_() global_test_part_result_repoter_(
+          &default_global_test_part_result_reporter_),
+      per_thread_test_part_result_reporter_(
+          &default_per_thread_test_part_result_reporter_),
+      parameterized_test_registry_(),
+      parameterized_tests_registered_(false),
+      last_death_test_suite_(-1),
+      current_test_suite_(nullptr),
+      current_test_info_(nullptr),
+      ad_hoc_test_result_(),
+      os_stack_trace_getter_(nullptr),
+      post_flag_parse_init_performed_(false),
+      random_seed_(0),  // Will be overridden by the flag before first use.
+      random_(0),       // Will be reseeded before first use.
+      start_timestamp_(0),
+      elapsed_time_(0),
+#if GTEST_HAS_DEATH_TEST
+      death_test_factory_(new DefaultDeathTestFactory),
+#endif
+      // Will be overridden by the flag before first use.
+      catch_exceptions_(false) {
+  listeners()->SetDefaultResultPrinter(new PrettyUnitTestResultPrinter);
+}
+
+UnitTestImpl::~UnitTestImpl() {
+  // Deletes every TestSuite.
+  ForEach(test_suites_, internal::Delete<TestSuite>);
+
+  // Deletes every Environment.
+  ForEach(environments_, internal::Delete<Environment>);
+
+  delete os_stack_trace_getter_;
+}
+
+// Adds a TestProperty to the current TestResult object when invoked in a
+// context of a test, to current test suite's ad_hoc_test_result when invoke
+// from SetUpTestSuite/TearDownTestSuite, or to the global property set
+// otherwise.  If the result already contains a property with the same key,
+// the value will be updated.
+void UnitTestImpl::RecordProperty(const TestProperty& test_property) {
+  std::string xml_element;
+  TestResult* test_result;  // TestResult appropriate for property recording.
+
+  if (current_test_info_ != nullptr) {
+    xml_element = "testcase";
+    test_result = &(current_test_info_->result_);
+  } else if (current_test_suite_ != nullptr) {
+    xml_element = "testsuite";
+    test_result = &(current_test_suite_->ad_hoc_test_result_);
+  } else {
+    xml_element = "testsuites";
+    test_result = &ad_hoc_test_result_;
+  }
+  test_result->RecordProperty(xml_element, test_property);
+}
+
+#if GTEST_HAS_DEATH_TEST
+// Disables event forwarding if the control is currently in a death test
+// subprocess. Must not be called before InitGoogleTest.
+void UnitTestImpl::SuppressTestEventsIfInSubprocess() {
+  if (internal_run_death_test_flag_.get() != nullptr)
+    listeners()->SuppressEventForwarding();
+}
+#endif  // GTEST_HAS_DEATH_TEST
+
+// Initializes event listeners performing XML output as specified by
+// UnitTestOptions. Must not be called before InitGoogleTest.
+void UnitTestImpl::ConfigureXmlOutput() {
+  const std::string& output_format = UnitTestOptions::GetOutputFormat();
+  if (output_format == "xml") {
+    listeners()->SetDefaultXmlGenerator(new XmlUnitTestResultPrinter(
+        UnitTestOptions::GetAbsolutePathToOutputFile().c_str()));
+  } else if (output_format == "json") {
+    listeners()->SetDefaultXmlGenerator(new JsonUnitTestResultPrinter(
+        UnitTestOptions::GetAbsolutePathToOutputFile().c_str()));
+  } else if (output_format != "") {
+    GTEST_LOG_(WARNING) << "WARNING: unrecognized output format \""
+                        << output_format << "\" ignored.";
+  }
+}
+
+#if GTEST_CAN_STREAM_RESULTS_
+// Initializes event listeners for streaming test results in string form.
+// Must not be called before InitGoogleTest.
+void UnitTestImpl::ConfigureStreamingOutput() {
+  const std::string& target = GTEST_FLAG(stream_result_to);
+  if (!target.empty()) {
+    const size_t pos = target.find(':');
+    if (pos != std::string::npos) {
+      listeners()->Append(new StreamingListener(target.substr(0, pos),
+                                                target.substr(pos+1)));
+    } else {
+      GTEST_LOG_(WARNING) << "unrecognized streaming target \"" << target
+                          << "\" ignored.";
+    }
+  }
+}
+#endif  // GTEST_CAN_STREAM_RESULTS_
+
+// Performs initialization dependent upon flag values obtained in
+// ParseGoogleTestFlagsOnly.  Is called from InitGoogleTest after the call to
+// ParseGoogleTestFlagsOnly.  In case a user neglects to call InitGoogleTest
+// this function is also called from RunAllTests.  Since this function can be
+// called more than once, it has to be idempotent.
+void UnitTestImpl::PostFlagParsingInit() {
+  // Ensures that this function does not execute more than once.
+  if (!post_flag_parse_init_performed_) {
+    post_flag_parse_init_performed_ = true;
+
+#if defined(GTEST_CUSTOM_TEST_EVENT_LISTENER_)
+    // Register to send notifications about key process state changes.
+    listeners()->Append(new GTEST_CUSTOM_TEST_EVENT_LISTENER_());
+#endif  // defined(GTEST_CUSTOM_TEST_EVENT_LISTENER_)
+
+#if GTEST_HAS_DEATH_TEST
+    InitDeathTestSubprocessControlInfo();
+    SuppressTestEventsIfInSubprocess();
+#endif  // GTEST_HAS_DEATH_TEST
+
+    // Registers parameterized tests. This makes parameterized tests
+    // available to the UnitTest reflection API without running
+    // RUN_ALL_TESTS.
+    RegisterParameterizedTests();
+
+    // Configures listeners for XML output. This makes it possible for users
+    // to shut down the default XML output before invoking RUN_ALL_TESTS.
+    ConfigureXmlOutput();
+
+    if (GTEST_FLAG(brief)) {
+      listeners()->SetDefaultResultPrinter(new BriefUnitTestResultPrinter);
+    }
+
+#if GTEST_CAN_STREAM_RESULTS_
+    // Configures listeners for streaming test results to the specified server.
+    ConfigureStreamingOutput();
+#endif  // GTEST_CAN_STREAM_RESULTS_
+
+#if GTEST_HAS_ABSL
+    if (GTEST_FLAG(install_failure_signal_handler)) {
+      absl::FailureSignalHandlerOptions options;
+      absl::InstallFailureSignalHandler(options);
+    }
+#endif  // GTEST_HAS_ABSL
+  }
+}
+
+// A predicate that checks the name of a TestSuite against a known
+// value.
+//
+// This is used for implementation of the UnitTest class only.  We put
+// it in the anonymous namespace to prevent polluting the outer
+// namespace.
+//
+// TestSuiteNameIs is copyable.
+class TestSuiteNameIs {
+ public:
+  // Constructor.
+  explicit TestSuiteNameIs(const std::string& name) : name_(name) {}
+
+  // Returns true if and only if the name of test_suite matches name_.
+  bool operator()(const TestSuite* test_suite) const {
+    return test_suite != nullptr &&
+           strcmp(test_suite->name(), name_.c_str()) == 0;
+  }
+
+ private:
+  std::string name_;
+};
+
+// Finds and returns a TestSuite with the given name.  If one doesn't
+// exist, creates one and returns it.  It's the CALLER'S
+// RESPONSIBILITY to ensure that this function is only called WHEN THE
+// TESTS ARE NOT SHUFFLED.
+//
+// Arguments:
+//
+//   test_suite_name: name of the test suite
+//   type_param:      the name of the test suite's type parameter, or NULL if
+//                    this is not a typed or a type-parameterized test suite.
+//   set_up_tc:       pointer to the function that sets up the test suite
+//   tear_down_tc:    pointer to the function that tears down the test suite
+TestSuite* UnitTestImpl::GetTestSuite(
+    const char* test_suite_name, const char* type_param,
+    internal::SetUpTestSuiteFunc set_up_tc,
+    internal::TearDownTestSuiteFunc tear_down_tc) {
+  // Can we find a TestSuite with the given name?
+  const auto test_suite =
+      std::find_if(test_suites_.rbegin(), test_suites_.rend(),
+                   TestSuiteNameIs(test_suite_name));
+
+  if (test_suite != test_suites_.rend()) return *test_suite;
+
+  // No.  Let's create one.
+  auto* const new_test_suite =
+      new TestSuite(test_suite_name, type_param, set_up_tc, tear_down_tc);
+
+  // Is this a death test suite?
+  if (internal::UnitTestOptions::MatchesFilter(test_suite_name,
+                                               kDeathTestSuiteFilter)) {
+    // Yes.  Inserts the test suite after the last death test suite
+    // defined so far.  This only works when the test suites haven't
+    // been shuffled.  Otherwise we may end up running a death test
+    // after a non-death test.
+    ++last_death_test_suite_;
+    test_suites_.insert(test_suites_.begin() + last_death_test_suite_,
+                        new_test_suite);
+  } else {
+    // No.  Appends to the end of the list.
+    test_suites_.push_back(new_test_suite);
+  }
+
+  test_suite_indices_.push_back(static_cast<int>(test_suite_indices_.size()));
+  return new_test_suite;
+}
+
+// Helpers for setting up / tearing down the given environment.  They
+// are for use in the ForEach() function.
+static void SetUpEnvironment(Environment* env) { env->SetUp(); }
+static void TearDownEnvironment(Environment* env) { env->TearDown(); }
+
+// Runs all tests in this UnitTest object, prints the result, and
+// returns true if all tests are successful.  If any exception is
+// thrown during a test, the test is considered to be failed, but the
+// rest of the tests will still be run.
+//
+// When parameterized tests are enabled, it expands and registers
+// parameterized tests first in RegisterParameterizedTests().
+// All other functions called from RunAllTests() may safely assume that
+// parameterized tests are ready to be counted and run.
+bool UnitTestImpl::RunAllTests() {
+  // True if and only if Google Test is initialized before RUN_ALL_TESTS() is
+  // called.
+  const bool gtest_is_initialized_before_run_all_tests = GTestIsInitialized();
+
+  // Do not run any test if the --help flag was specified.
+  if (g_help_flag)
+    return true;
+
+  // Repeats the call to the post-flag parsing initialization in case the
+  // user didn't call InitGoogleTest.
+  PostFlagParsingInit();
+
+  // Even if sharding is not on, test runners may want to use the
+  // GTEST_SHARD_STATUS_FILE to query whether the test supports the sharding
+  // protocol.
+  internal::WriteToShardStatusFileIfNeeded();
+
+  // True if and only if we are in a subprocess for running a thread-safe-style
+  // death test.
+  bool in_subprocess_for_death_test = false;
+
+#if GTEST_HAS_DEATH_TEST
+  in_subprocess_for_death_test =
+      (internal_run_death_test_flag_.get() != nullptr);
+# if defined(GTEST_EXTRA_DEATH_TEST_CHILD_SETUP_)
+  if (in_subprocess_for_death_test) {
+    GTEST_EXTRA_DEATH_TEST_CHILD_SETUP_();
+  }
+# endif  // defined(GTEST_EXTRA_DEATH_TEST_CHILD_SETUP_)
+#endif  // GTEST_HAS_DEATH_TEST
+
+  const bool should_shard = ShouldShard(kTestTotalShards, kTestShardIndex,
+                                        in_subprocess_for_death_test);
+
+  // Compares the full test names with the filter to decide which
+  // tests to run.
+  const bool has_tests_to_run = FilterTests(should_shard
+                                              ? HONOR_SHARDING_PROTOCOL
+                                              : IGNORE_SHARDING_PROTOCOL) > 0;
+
+  // Lists the tests and exits if the --gtest_list_tests flag was specified.
+  if (GTEST_FLAG(list_tests)) {
+    // This must be called *after* FilterTests() has been called.
+    ListTestsMatchingFilter();
+    return true;
+  }
+
+  random_seed_ = GTEST_FLAG(shuffle) ?
+      GetRandomSeedFromFlag(GTEST_FLAG(random_seed)) : 0;
+
+  // True if and only if at least one test has failed.
+  bool failed = false;
+
+  TestEventListener* repeater = listeners()->repeater();
+
+  start_timestamp_ = GetTimeInMillis();
+  repeater->OnTestProgramStart(*parent_);
+
+  // How many times to repeat the tests?  We don't want to repeat them
+  // when we are inside the subprocess of a death test.
+  const int repeat = in_subprocess_for_death_test ? 1 : GTEST_FLAG(repeat);
+  // Repeats forever if the repeat count is negative.
+  const bool gtest_repeat_forever = repeat < 0;
+  for (int i = 0; gtest_repeat_forever || i != repeat; i++) {
+    // We want to preserve failures generated by ad-hoc test
+    // assertions executed before RUN_ALL_TESTS().
+    ClearNonAdHocTestResult();
+
+    Timer timer;
+
+    // Shuffles test suites and tests if requested.
+    if (has_tests_to_run && GTEST_FLAG(shuffle)) {
+      random()->Reseed(static_cast<uint32_t>(random_seed_));
+      // This should be done before calling OnTestIterationStart(),
+      // such that a test event listener can see the actual test order
+      // in the event.
+      ShuffleTests();
+    }
+
+    // Tells the unit test event listeners that the tests are about to start.
+    repeater->OnTestIterationStart(*parent_, i);
+
+    // Runs each test suite if there is at least one test to run.
+    if (has_tests_to_run) {
+      // Sets up all environments beforehand.
+      repeater->OnEnvironmentsSetUpStart(*parent_);
+      ForEach(environments_, SetUpEnvironment);
+      repeater->OnEnvironmentsSetUpEnd(*parent_);
+
+      // Runs the tests only if there was no fatal failure or skip triggered
+      // during global set-up.
+      if (Test::IsSkipped()) {
+        // Emit diagnostics when global set-up calls skip, as it will not be
+        // emitted by default.
+        TestResult& test_result =
+            *internal::GetUnitTestImpl()->current_test_result();
+        for (int j = 0; j < test_result.total_part_count(); ++j) {
+          const TestPartResult& test_part_result =
+              test_result.GetTestPartResult(j);
+          if (test_part_result.type() == TestPartResult::kSkip) {
+            const std::string& result = test_part_result.message();
+            printf("%s\n", result.c_str());
+          }
+        }
+        fflush(stdout);
+      } else if (!Test::HasFatalFailure()) {
+        for (int test_index = 0; test_index < total_test_suite_count();
+             test_index++) {
+          GetMutableSuiteCase(test_index)->Run();
+          if (GTEST_FLAG(fail_fast) &&
+              GetMutableSuiteCase(test_index)->Failed()) {
+            for (int j = test_index + 1; j < total_test_suite_count(); j++) {
+              GetMutableSuiteCase(j)->Skip();
+            }
+            break;
+          }
+        }
+      } else if (Test::HasFatalFailure()) {
+        // If there was a fatal failure during the global setup then we know we
+        // aren't going to run any tests. Explicitly mark all of the tests as
+        // skipped to make this obvious in the output.
+        for (int test_index = 0; test_index < total_test_suite_count();
+             test_index++) {
+          GetMutableSuiteCase(test_index)->Skip();
+        }
+      }
+
+      // Tears down all environments in reverse order afterwards.
+      repeater->OnEnvironmentsTearDownStart(*parent_);
+      std::for_each(environments_.rbegin(), environments_.rend(),
+                    TearDownEnvironment);
+      repeater->OnEnvironmentsTearDownEnd(*parent_);
+    }
+
+    elapsed_time_ = timer.Elapsed();
+
+    // Tells the unit test event listener that the tests have just finished.
+    repeater->OnTestIterationEnd(*parent_, i);
+
+    // Gets the result and clears it.
+    if (!Passed()) {
+      failed = true;
+    }
+
+    // Restores the original test order after the iteration.  This
+    // allows the user to quickly repro a failure that happens in the
+    // N-th iteration without repeating the first (N - 1) iterations.
+    // This is not enclosed in "if (GTEST_FLAG(shuffle)) { ... }", in
+    // case the user somehow changes the value of the flag somewhere
+    // (it's always safe to unshuffle the tests).
+    UnshuffleTests();
+
+    if (GTEST_FLAG(shuffle)) {
+      // Picks a new random seed for each iteration.
+      random_seed_ = GetNextRandomSeed(random_seed_);
+    }
+  }
+
+  repeater->OnTestProgramEnd(*parent_);
+
+  if (!gtest_is_initialized_before_run_all_tests) {
+    ColoredPrintf(
+        GTestColor::kRed,
+        "\nIMPORTANT NOTICE - DO NOT IGNORE:\n"
+        "This test program did NOT call " GTEST_INIT_GOOGLE_TEST_NAME_
+        "() before calling RUN_ALL_TESTS(). This is INVALID. Soon " GTEST_NAME_
+        " will start to enforce the valid usage. "
+        "Please fix it ASAP, or IT WILL START TO FAIL.\n");  // NOLINT
+#if GTEST_FOR_GOOGLE_
+    ColoredPrintf(GTestColor::kRed,
+                  "For more details, see http://wiki/Main/ValidGUnitMain.\n");
+#endif  // GTEST_FOR_GOOGLE_
+  }
+
+  return !failed;
+}
+
+// Reads the GTEST_SHARD_STATUS_FILE environment variable, and creates the file
+// if the variable is present. If a file already exists at this location, this
+// function will write over it. If the variable is present, but the file cannot
+// be created, prints an error and exits.
+void WriteToShardStatusFileIfNeeded() {
+  const char* const test_shard_file = posix::GetEnv(kTestShardStatusFile);
+  if (test_shard_file != nullptr) {
+    FILE* const file = posix::FOpen(test_shard_file, "w");
+    if (file == nullptr) {
+      ColoredPrintf(GTestColor::kRed,
+                    "Could not write to the test shard status file \"%s\" "
+                    "specified by the %s environment variable.\n",
+                    test_shard_file, kTestShardStatusFile);
+      fflush(stdout);
+      exit(EXIT_FAILURE);
+    }
+    fclose(file);
+  }
+}
+
+// Checks whether sharding is enabled by examining the relevant
+// environment variable values. If the variables are present,
+// but inconsistent (i.e., shard_index >= total_shards), prints
+// an error and exits. If in_subprocess_for_death_test, sharding is
+// disabled because it must only be applied to the original test
+// process. Otherwise, we could filter out death tests we intended to execute.
+bool ShouldShard(const char* total_shards_env,
+                 const char* shard_index_env,
+                 bool in_subprocess_for_death_test) {
+  if (in_subprocess_for_death_test) {
+    return false;
+  }
+
+  const int32_t total_shards = Int32FromEnvOrDie(total_shards_env, -1);
+  const int32_t shard_index = Int32FromEnvOrDie(shard_index_env, -1);
+
+  if (total_shards == -1 && shard_index == -1) {
+    return false;
+  } else if (total_shards == -1 && shard_index != -1) {
+    const Message msg = Message()
+      << "Invalid environment variables: you have "
+      << kTestShardIndex << " = " << shard_index
+      << ", but have left " << kTestTotalShards << " unset.\n";
+    ColoredPrintf(GTestColor::kRed, "%s", msg.GetString().c_str());
+    fflush(stdout);
+    exit(EXIT_FAILURE);
+  } else if (total_shards != -1 && shard_index == -1) {
+    const Message msg = Message()
+      << "Invalid environment variables: you have "
+      << kTestTotalShards << " = " << total_shards
+      << ", but have left " << kTestShardIndex << " unset.\n";
+    ColoredPrintf(GTestColor::kRed, "%s", msg.GetString().c_str());
+    fflush(stdout);
+    exit(EXIT_FAILURE);
+  } else if (shard_index < 0 || shard_index >= total_shards) {
+    const Message msg = Message()
+      << "Invalid environment variables: we require 0 <= "
+      << kTestShardIndex << " < " << kTestTotalShards
+      << ", but you have " << kTestShardIndex << "=" << shard_index
+      << ", " << kTestTotalShards << "=" << total_shards << ".\n";
+    ColoredPrintf(GTestColor::kRed, "%s", msg.GetString().c_str());
+    fflush(stdout);
+    exit(EXIT_FAILURE);
+  }
+
+  return total_shards > 1;
+}
+
+// Parses the environment variable var as an Int32. If it is unset,
+// returns default_val. If it is not an Int32, prints an error
+// and aborts.
+int32_t Int32FromEnvOrDie(const char* var, int32_t default_val) {
+  const char* str_val = posix::GetEnv(var);
+  if (str_val == nullptr) {
+    return default_val;
+  }
+
+  int32_t result;
+  if (!ParseInt32(Message() << "The value of environment variable " << var,
+                  str_val, &result)) {
+    exit(EXIT_FAILURE);
+  }
+  return result;
+}
+
+// Given the total number of shards, the shard index, and the test id,
+// returns true if and only if the test should be run on this shard. The test id
+// is some arbitrary but unique non-negative integer assigned to each test
+// method. Assumes that 0 <= shard_index < total_shards.
+bool ShouldRunTestOnShard(int total_shards, int shard_index, int test_id) {
+  return (test_id % total_shards) == shard_index;
+}
+
+// Compares the name of each test with the user-specified filter to
+// decide whether the test should be run, then records the result in
+// each TestSuite and TestInfo object.
+// If shard_tests == true, further filters tests based on sharding
+// variables in the environment - see
+// https://github.com/google/googletest/blob/master/googletest/docs/advanced.md
+// . Returns the number of tests that should run.
+int UnitTestImpl::FilterTests(ReactionToSharding shard_tests) {
+  const int32_t total_shards = shard_tests == HONOR_SHARDING_PROTOCOL ?
+      Int32FromEnvOrDie(kTestTotalShards, -1) : -1;
+  const int32_t shard_index = shard_tests == HONOR_SHARDING_PROTOCOL ?
+      Int32FromEnvOrDie(kTestShardIndex, -1) : -1;
+
+  // num_runnable_tests are the number of tests that will
+  // run across all shards (i.e., match filter and are not disabled).
+  // num_selected_tests are the number of tests to be run on
+  // this shard.
+  int num_runnable_tests = 0;
+  int num_selected_tests = 0;
+  for (auto* test_suite : test_suites_) {
+    const std::string& test_suite_name = test_suite->name();
+    test_suite->set_should_run(false);
+
+    for (size_t j = 0; j < test_suite->test_info_list().size(); j++) {
+      TestInfo* const test_info = test_suite->test_info_list()[j];
+      const std::string test_name(test_info->name());
+      // A test is disabled if test suite name or test name matches
+      // kDisableTestFilter.
+      const bool is_disabled = internal::UnitTestOptions::MatchesFilter(
+                                   test_suite_name, kDisableTestFilter) ||
+                               internal::UnitTestOptions::MatchesFilter(
+                                   test_name, kDisableTestFilter);
+      test_info->is_disabled_ = is_disabled;
+
+      const bool matches_filter = internal::UnitTestOptions::FilterMatchesTest(
+          test_suite_name, test_name);
+      test_info->matches_filter_ = matches_filter;
+
+      const bool is_runnable =
+          (GTEST_FLAG(also_run_disabled_tests) || !is_disabled) &&
+          matches_filter;
+
+      const bool is_in_another_shard =
+          shard_tests != IGNORE_SHARDING_PROTOCOL &&
+          !ShouldRunTestOnShard(total_shards, shard_index, num_runnable_tests);
+      test_info->is_in_another_shard_ = is_in_another_shard;
+      const bool is_selected = is_runnable && !is_in_another_shard;
+
+      num_runnable_tests += is_runnable;
+      num_selected_tests += is_selected;
+
+      test_info->should_run_ = is_selected;
+      test_suite->set_should_run(test_suite->should_run() || is_selected);
+    }
+  }
+  return num_selected_tests;
+}
+
+// Prints the given C-string on a single line by replacing all '\n'
+// characters with string "\\n".  If the output takes more than
+// max_length characters, only prints the first max_length characters
+// and "...".
+static void PrintOnOneLine(const char* str, int max_length) {
+  if (str != nullptr) {
+    for (int i = 0; *str != '\0'; ++str) {
+      if (i >= max_length) {
+        printf("...");
+        break;
+      }
+      if (*str == '\n') {
+        printf("\\n");
+        i += 2;
+      } else {
+        printf("%c", *str);
+        ++i;
+      }
+    }
+  }
+}
+
+// Prints the names of the tests matching the user-specified filter flag.
+void UnitTestImpl::ListTestsMatchingFilter() {
+  // Print at most this many characters for each type/value parameter.
+  const int kMaxParamLength = 250;
+
+  for (auto* test_suite : test_suites_) {
+    bool printed_test_suite_name = false;
+
+    for (size_t j = 0; j < test_suite->test_info_list().size(); j++) {
+      const TestInfo* const test_info = test_suite->test_info_list()[j];
+      if (test_info->matches_filter_) {
+        if (!printed_test_suite_name) {
+          printed_test_suite_name = true;
+          printf("%s.", test_suite->name());
+          if (test_suite->type_param() != nullptr) {
+            printf("  # %s = ", kTypeParamLabel);
+            // We print the type parameter on a single line to make
+            // the output easy to parse by a program.
+            PrintOnOneLine(test_suite->type_param(), kMaxParamLength);
+          }
+          printf("\n");
+        }
+        printf("  %s", test_info->name());
+        if (test_info->value_param() != nullptr) {
+          printf("  # %s = ", kValueParamLabel);
+          // We print the value parameter on a single line to make the
+          // output easy to parse by a program.
+          PrintOnOneLine(test_info->value_param(), kMaxParamLength);
+        }
+        printf("\n");
+      }
+    }
+  }
+  fflush(stdout);
+  const std::string& output_format = UnitTestOptions::GetOutputFormat();
+  if (output_format == "xml" || output_format == "json") {
+    FILE* fileout = OpenFileForWriting(
+        UnitTestOptions::GetAbsolutePathToOutputFile().c_str());
+    std::stringstream stream;
+    if (output_format == "xml") {
+      XmlUnitTestResultPrinter(
+          UnitTestOptions::GetAbsolutePathToOutputFile().c_str())
+          .PrintXmlTestsList(&stream, test_suites_);
+    } else if (output_format == "json") {
+      JsonUnitTestResultPrinter(
+          UnitTestOptions::GetAbsolutePathToOutputFile().c_str())
+          .PrintJsonTestList(&stream, test_suites_);
+    }
+    fprintf(fileout, "%s", StringStreamToString(&stream).c_str());
+    fclose(fileout);
+  }
+}
+
+// Sets the OS stack trace getter.
+//
+// Does nothing if the input and the current OS stack trace getter are
+// the same; otherwise, deletes the old getter and makes the input the
+// current getter.
+void UnitTestImpl::set_os_stack_trace_getter(
+    OsStackTraceGetterInterface* getter) {
+  if (os_stack_trace_getter_ != getter) {
+    delete os_stack_trace_getter_;
+    os_stack_trace_getter_ = getter;
+  }
+}
+
+// Returns the current OS stack trace getter if it is not NULL;
+// otherwise, creates an OsStackTraceGetter, makes it the current
+// getter, and returns it.
+OsStackTraceGetterInterface* UnitTestImpl::os_stack_trace_getter() {
+  if (os_stack_trace_getter_ == nullptr) {
+#ifdef GTEST_OS_STACK_TRACE_GETTER_
+    os_stack_trace_getter_ = new GTEST_OS_STACK_TRACE_GETTER_;
+#else
+    os_stack_trace_getter_ = new OsStackTraceGetter;
+#endif  // GTEST_OS_STACK_TRACE_GETTER_
+  }
+
+  return os_stack_trace_getter_;
+}
+
+// Returns the most specific TestResult currently running.
+TestResult* UnitTestImpl::current_test_result() {
+  if (current_test_info_ != nullptr) {
+    return &current_test_info_->result_;
+  }
+  if (current_test_suite_ != nullptr) {
+    return &current_test_suite_->ad_hoc_test_result_;
+  }
+  return &ad_hoc_test_result_;
+}
+
+// Shuffles all test suites, and the tests within each test suite,
+// making sure that death tests are still run first.
+void UnitTestImpl::ShuffleTests() {
+  // Shuffles the death test suites.
+  ShuffleRange(random(), 0, last_death_test_suite_ + 1, &test_suite_indices_);
+
+  // Shuffles the non-death test suites.
+  ShuffleRange(random(), last_death_test_suite_ + 1,
+               static_cast<int>(test_suites_.size()), &test_suite_indices_);
+
+  // Shuffles the tests inside each test suite.
+  for (auto& test_suite : test_suites_) {
+    test_suite->ShuffleTests(random());
+  }
+}
+
+// Restores the test suites and tests to their order before the first shuffle.
+void UnitTestImpl::UnshuffleTests() {
+  for (size_t i = 0; i < test_suites_.size(); i++) {
+    // Unshuffles the tests in each test suite.
+    test_suites_[i]->UnshuffleTests();
+    // Resets the index of each test suite.
+    test_suite_indices_[i] = static_cast<int>(i);
+  }
+}
+
+// Returns the current OS stack trace as an std::string.
+//
+// The maximum number of stack frames to be included is specified by
+// the gtest_stack_trace_depth flag.  The skip_count parameter
+// specifies the number of top frames to be skipped, which doesn't
+// count against the number of frames to be included.
+//
+// For example, if Foo() calls Bar(), which in turn calls
+// GetCurrentOsStackTraceExceptTop(..., 1), Foo() will be included in
+// the trace but Bar() and GetCurrentOsStackTraceExceptTop() won't.
+std::string GetCurrentOsStackTraceExceptTop(UnitTest* /*unit_test*/,
+                                            int skip_count) {
+  // We pass skip_count + 1 to skip this wrapper function in addition
+  // to what the user really wants to skip.
+  return GetUnitTestImpl()->CurrentOsStackTraceExceptTop(skip_count + 1);
+}
+
+// Used by the GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_ macro to
+// suppress unreachable code warnings.
+namespace {
+class ClassUniqueToAlwaysTrue {};
+}
+
+bool IsTrue(bool condition) { return condition; }
+
+bool AlwaysTrue() {
+#if GTEST_HAS_EXCEPTIONS
+  // This condition is always false so AlwaysTrue() never actually throws,
+  // but it makes the compiler think that it may throw.
+  if (IsTrue(false))
+    throw ClassUniqueToAlwaysTrue();
+#endif  // GTEST_HAS_EXCEPTIONS
+  return true;
+}
+
+// If *pstr starts with the given prefix, modifies *pstr to be right
+// past the prefix and returns true; otherwise leaves *pstr unchanged
+// and returns false.  None of pstr, *pstr, and prefix can be NULL.
+bool SkipPrefix(const char* prefix, const char** pstr) {
+  const size_t prefix_len = strlen(prefix);
+  if (strncmp(*pstr, prefix, prefix_len) == 0) {
+    *pstr += prefix_len;
+    return true;
+  }
+  return false;
+}
+
+// Parses a string as a command line flag.  The string should have
+// the format "--flag=value".  When def_optional is true, the "=value"
+// part can be omitted.
+//
+// Returns the value of the flag, or NULL if the parsing failed.
+static const char* ParseFlagValue(const char* str, const char* flag,
+                                  bool def_optional) {
+  // str and flag must not be NULL.
+  if (str == nullptr || flag == nullptr) return nullptr;
+
+  // The flag must start with "--" followed by GTEST_FLAG_PREFIX_.
+  const std::string flag_str = std::string("--") + GTEST_FLAG_PREFIX_ + flag;
+  const size_t flag_len = flag_str.length();
+  if (strncmp(str, flag_str.c_str(), flag_len) != 0) return nullptr;
+
+  // Skips the flag name.
+  const char* flag_end = str + flag_len;
+
+  // When def_optional is true, it's OK to not have a "=value" part.
+  if (def_optional && (flag_end[0] == '\0')) {
+    return flag_end;
+  }
+
+  // If def_optional is true and there are more characters after the
+  // flag name, or if def_optional is false, there must be a '=' after
+  // the flag name.
+  if (flag_end[0] != '=') return nullptr;
+
+  // Returns the string after "=".
+  return flag_end + 1;
+}
+
+// Parses a string for a bool flag, in the form of either
+// "--flag=value" or "--flag".
+//
+// In the former case, the value is taken as true as long as it does
+// not start with '0', 'f', or 'F'.
+//
+// In the latter case, the value is taken as true.
+//
+// On success, stores the value of the flag in *value, and returns
+// true.  On failure, returns false without changing *value.
+static bool ParseBoolFlag(const char* str, const char* flag, bool* value) {
+  // Gets the value of the flag as a string.
+  const char* const value_str = ParseFlagValue(str, flag, true);
+
+  // Aborts if the parsing failed.
+  if (value_str == nullptr) return false;
+
+  // Converts the string value to a bool.
+  *value = !(*value_str == '0' || *value_str == 'f' || *value_str == 'F');
+  return true;
+}
+
+// Parses a string for an int32_t flag, in the form of "--flag=value".
+//
+// On success, stores the value of the flag in *value, and returns
+// true.  On failure, returns false without changing *value.
+bool ParseInt32Flag(const char* str, const char* flag, int32_t* value) {
+  // Gets the value of the flag as a string.
+  const char* const value_str = ParseFlagValue(str, flag, false);
+
+  // Aborts if the parsing failed.
+  if (value_str == nullptr) return false;
+
+  // Sets *value to the value of the flag.
+  return ParseInt32(Message() << "The value of flag --" << flag,
+                    value_str, value);
+}
+
+// Parses a string for a string flag, in the form of "--flag=value".
+//
+// On success, stores the value of the flag in *value, and returns
+// true.  On failure, returns false without changing *value.
+template <typename String>
+static bool ParseStringFlag(const char* str, const char* flag, String* value) {
+  // Gets the value of the flag as a string.
+  const char* const value_str = ParseFlagValue(str, flag, false);
+
+  // Aborts if the parsing failed.
+  if (value_str == nullptr) return false;
+
+  // Sets *value to the value of the flag.
+  *value = value_str;
+  return true;
+}
+
+// Determines whether a string has a prefix that Google Test uses for its
+// flags, i.e., starts with GTEST_FLAG_PREFIX_ or GTEST_FLAG_PREFIX_DASH_.
+// If Google Test detects that a command line flag has its prefix but is not
+// recognized, it will print its help message. Flags starting with
+// GTEST_INTERNAL_PREFIX_ followed by "internal_" are considered Google Test
+// internal flags and do not trigger the help message.
+static bool HasGoogleTestFlagPrefix(const char* str) {
+  return (SkipPrefix("--", &str) ||
+          SkipPrefix("-", &str) ||
+          SkipPrefix("/", &str)) &&
+         !SkipPrefix(GTEST_FLAG_PREFIX_ "internal_", &str) &&
+         (SkipPrefix(GTEST_FLAG_PREFIX_, &str) ||
+          SkipPrefix(GTEST_FLAG_PREFIX_DASH_, &str));
+}
+
+// Prints a string containing code-encoded text.  The following escape
+// sequences can be used in the string to control the text color:
+//
+//   @@    prints a single '@' character.
+//   @R    changes the color to red.
+//   @G    changes the color to green.
+//   @Y    changes the color to yellow.
+//   @D    changes to the default terminal text color.
+//
+static void PrintColorEncoded(const char* str) {
+  GTestColor color = GTestColor::kDefault;  // The current color.
+
+  // Conceptually, we split the string into segments divided by escape
+  // sequences.  Then we print one segment at a time.  At the end of
+  // each iteration, the str pointer advances to the beginning of the
+  // next segment.
+  for (;;) {
+    const char* p = strchr(str, '@');
+    if (p == nullptr) {
+      ColoredPrintf(color, "%s", str);
+      return;
+    }
+
+    ColoredPrintf(color, "%s", std::string(str, p).c_str());
+
+    const char ch = p[1];
+    str = p + 2;
+    if (ch == '@') {
+      ColoredPrintf(color, "@");
+    } else if (ch == 'D') {
+      color = GTestColor::kDefault;
+    } else if (ch == 'R') {
+      color = GTestColor::kRed;
+    } else if (ch == 'G') {
+      color = GTestColor::kGreen;
+    } else if (ch == 'Y') {
+      color = GTestColor::kYellow;
+    } else {
+      --str;
+    }
+  }
+}
+
+static const char kColorEncodedHelpMessage[] =
+    "This program contains tests written using " GTEST_NAME_
+    ". You can use the\n"
+    "following command line flags to control its behavior:\n"
+    "\n"
+    "Test Selection:\n"
+    "  @G--" GTEST_FLAG_PREFIX_
+    "list_tests@D\n"
+    "      List the names of all tests instead of running them. The name of\n"
+    "      TEST(Foo, Bar) is \"Foo.Bar\".\n"
+    "  @G--" GTEST_FLAG_PREFIX_
+    "filter=@YPOSITIVE_PATTERNS"
+    "[@G-@YNEGATIVE_PATTERNS]@D\n"
+    "      Run only the tests whose name matches one of the positive patterns "
+    "but\n"
+    "      none of the negative patterns. '?' matches any single character; "
+    "'*'\n"
+    "      matches any substring; ':' separates two patterns.\n"
+    "  @G--" GTEST_FLAG_PREFIX_
+    "also_run_disabled_tests@D\n"
+    "      Run all disabled tests too.\n"
+    "\n"
+    "Test Execution:\n"
+    "  @G--" GTEST_FLAG_PREFIX_
+    "repeat=@Y[COUNT]@D\n"
+    "      Run the tests repeatedly; use a negative count to repeat forever.\n"
+    "  @G--" GTEST_FLAG_PREFIX_
+    "shuffle@D\n"
+    "      Randomize tests' orders on every iteration.\n"
+    "  @G--" GTEST_FLAG_PREFIX_
+    "random_seed=@Y[NUMBER]@D\n"
+    "      Random number seed to use for shuffling test orders (between 1 and\n"
+    "      99999, or 0 to use a seed based on the current time).\n"
+    "\n"
+    "Test Output:\n"
+    "  @G--" GTEST_FLAG_PREFIX_
+    "color=@Y(@Gyes@Y|@Gno@Y|@Gauto@Y)@D\n"
+    "      Enable/disable colored output. The default is @Gauto@D.\n"
+    "  @G--" GTEST_FLAG_PREFIX_
+    "brief=1@D\n"
+    "      Only print test failures.\n"
+    "  @G--" GTEST_FLAG_PREFIX_
+    "print_time=0@D\n"
+    "      Don't print the elapsed time of each test.\n"
+    "  @G--" GTEST_FLAG_PREFIX_
+    "output=@Y(@Gjson@Y|@Gxml@Y)[@G:@YDIRECTORY_PATH@G" GTEST_PATH_SEP_
+    "@Y|@G:@YFILE_PATH]@D\n"
+    "      Generate a JSON or XML report in the given directory or with the "
+    "given\n"
+    "      file name. @YFILE_PATH@D defaults to @Gtest_detail.xml@D.\n"
+# if GTEST_CAN_STREAM_RESULTS_
+    "  @G--" GTEST_FLAG_PREFIX_
+    "stream_result_to=@YHOST@G:@YPORT@D\n"
+    "      Stream test results to the given server.\n"
+# endif  // GTEST_CAN_STREAM_RESULTS_
+    "\n"
+    "Assertion Behavior:\n"
+# if GTEST_HAS_DEATH_TEST && !GTEST_OS_WINDOWS
+    "  @G--" GTEST_FLAG_PREFIX_
+    "death_test_style=@Y(@Gfast@Y|@Gthreadsafe@Y)@D\n"
+    "      Set the default death test style.\n"
+# endif  // GTEST_HAS_DEATH_TEST && !GTEST_OS_WINDOWS
+    "  @G--" GTEST_FLAG_PREFIX_
+    "break_on_failure@D\n"
+    "      Turn assertion failures into debugger break-points.\n"
+    "  @G--" GTEST_FLAG_PREFIX_
+    "throw_on_failure@D\n"
+    "      Turn assertion failures into C++ exceptions for use by an external\n"
+    "      test framework.\n"
+    "  @G--" GTEST_FLAG_PREFIX_
+    "catch_exceptions=0@D\n"
+    "      Do not report exceptions as test failures. Instead, allow them\n"
+    "      to crash the program or throw a pop-up (on Windows).\n"
+    "\n"
+    "Except for @G--" GTEST_FLAG_PREFIX_
+    "list_tests@D, you can alternatively set "
+    "the corresponding\n"
+    "environment variable of a flag (all letters in upper-case). For example, "
+    "to\n"
+    "disable colored text output, you can either specify "
+    "@G--" GTEST_FLAG_PREFIX_
+    "color=no@D or set\n"
+    "the @G" GTEST_FLAG_PREFIX_UPPER_
+    "COLOR@D environment variable to @Gno@D.\n"
+    "\n"
+    "For more information, please read the " GTEST_NAME_
+    " documentation at\n"
+    "@G" GTEST_PROJECT_URL_ "@D. If you find a bug in " GTEST_NAME_
+    "\n"
+    "(not one in your own code or tests), please report it to\n"
+    "@G<" GTEST_DEV_EMAIL_ ">@D.\n";
+
+static bool ParseGoogleTestFlag(const char* const arg) {
+  return ParseBoolFlag(arg, kAlsoRunDisabledTestsFlag,
+                       &GTEST_FLAG(also_run_disabled_tests)) ||
+         ParseBoolFlag(arg, kBreakOnFailureFlag,
+                       &GTEST_FLAG(break_on_failure)) ||
+         ParseBoolFlag(arg, kCatchExceptionsFlag,
+                       &GTEST_FLAG(catch_exceptions)) ||
+         ParseStringFlag(arg, kColorFlag, &GTEST_FLAG(color)) ||
+         ParseStringFlag(arg, kDeathTestStyleFlag,
+                         &GTEST_FLAG(death_test_style)) ||
+         ParseBoolFlag(arg, kDeathTestUseFork,
+                       &GTEST_FLAG(death_test_use_fork)) ||
+         ParseBoolFlag(arg, kFailFast, &GTEST_FLAG(fail_fast)) ||
+         ParseStringFlag(arg, kFilterFlag, &GTEST_FLAG(filter)) ||
+         ParseStringFlag(arg, kInternalRunDeathTestFlag,
+                         &GTEST_FLAG(internal_run_death_test)) ||
+         ParseBoolFlag(arg, kListTestsFlag, &GTEST_FLAG(list_tests)) ||
+         ParseStringFlag(arg, kOutputFlag, &GTEST_FLAG(output)) ||
+         ParseBoolFlag(arg, kBriefFlag, &GTEST_FLAG(brief)) ||
+         ParseBoolFlag(arg, kPrintTimeFlag, &GTEST_FLAG(print_time)) ||
+         ParseBoolFlag(arg, kPrintUTF8Flag, &GTEST_FLAG(print_utf8)) ||
+         ParseInt32Flag(arg, kRandomSeedFlag, &GTEST_FLAG(random_seed)) ||
+         ParseInt32Flag(arg, kRepeatFlag, &GTEST_FLAG(repeat)) ||
+         ParseBoolFlag(arg, kShuffleFlag, &GTEST_FLAG(shuffle)) ||
+         ParseInt32Flag(arg, kStackTraceDepthFlag,
+                        &GTEST_FLAG(stack_trace_depth)) ||
+         ParseStringFlag(arg, kStreamResultToFlag,
+                         &GTEST_FLAG(stream_result_to)) ||
+         ParseBoolFlag(arg, kThrowOnFailureFlag, &GTEST_FLAG(throw_on_failure));
+}
+
+#if GTEST_USE_OWN_FLAGFILE_FLAG_
+static void LoadFlagsFromFile(const std::string& path) {
+  FILE* flagfile = posix::FOpen(path.c_str(), "r");
+  if (!flagfile) {
+    GTEST_LOG_(FATAL) << "Unable to open file \"" << GTEST_FLAG(flagfile)
+                      << "\"";
+  }
+  std::string contents(ReadEntireFile(flagfile));
+  posix::FClose(flagfile);
+  std::vector<std::string> lines;
+  SplitString(contents, '\n', &lines);
+  for (size_t i = 0; i < lines.size(); ++i) {
+    if (lines[i].empty())
+      continue;
+    if (!ParseGoogleTestFlag(lines[i].c_str()))
+      g_help_flag = true;
+  }
+}
+#endif  // GTEST_USE_OWN_FLAGFILE_FLAG_
+
+// Parses the command line for Google Test flags, without initializing
+// other parts of Google Test.  The type parameter CharType can be
+// instantiated to either char or wchar_t.
+template <typename CharType>
+void ParseGoogleTestFlagsOnlyImpl(int* argc, CharType** argv) {
+  for (int i = 1; i < *argc; i++) {
+    const std::string arg_string = StreamableToString(argv[i]);
+    const char* const arg = arg_string.c_str();
+
+    using internal::ParseBoolFlag;
+    using internal::ParseInt32Flag;
+    using internal::ParseStringFlag;
+
+    bool remove_flag = false;
+    if (ParseGoogleTestFlag(arg)) {
+      remove_flag = true;
+#if GTEST_USE_OWN_FLAGFILE_FLAG_
+    } else if (ParseStringFlag(arg, kFlagfileFlag, &GTEST_FLAG(flagfile))) {
+      LoadFlagsFromFile(GTEST_FLAG(flagfile));
+      remove_flag = true;
+#endif  // GTEST_USE_OWN_FLAGFILE_FLAG_
+    } else if (arg_string == "--help" || arg_string == "-h" ||
+               arg_string == "-?" || arg_string == "/?" ||
+               HasGoogleTestFlagPrefix(arg)) {
+      // Both help flag and unrecognized Google Test flags (excluding
+      // internal ones) trigger help display.
+      g_help_flag = true;
+    }
+
+    if (remove_flag) {
+      // Shift the remainder of the argv list left by one.  Note
+      // that argv has (*argc + 1) elements, the last one always being
+      // NULL.  The following loop moves the trailing NULL element as
+      // well.
+      for (int j = i; j != *argc; j++) {
+        argv[j] = argv[j + 1];
+      }
+
+      // Decrements the argument count.
+      (*argc)--;
+
+      // We also need to decrement the iterator as we just removed
+      // an element.
+      i--;
+    }
+  }
+
+  if (g_help_flag) {
+    // We print the help here instead of in RUN_ALL_TESTS(), as the
+    // latter may not be called at all if the user is using Google
+    // Test with another testing framework.
+    PrintColorEncoded(kColorEncodedHelpMessage);
+  }
+}
+
+// Parses the command line for Google Test flags, without initializing
+// other parts of Google Test.
+void ParseGoogleTestFlagsOnly(int* argc, char** argv) {
+  ParseGoogleTestFlagsOnlyImpl(argc, argv);
+
+  // Fix the value of *_NSGetArgc() on macOS, but if and only if
+  // *_NSGetArgv() == argv
+  // Only applicable to char** version of argv
+#if GTEST_OS_MAC
+#ifndef GTEST_OS_IOS
+  if (*_NSGetArgv() == argv) {
+    *_NSGetArgc() = *argc;
+  }
+#endif
+#endif
+}
+void ParseGoogleTestFlagsOnly(int* argc, wchar_t** argv) {
+  ParseGoogleTestFlagsOnlyImpl(argc, argv);
+}
+
+// The internal implementation of InitGoogleTest().
+//
+// The type parameter CharType can be instantiated to either char or
+// wchar_t.
+template <typename CharType>
+void InitGoogleTestImpl(int* argc, CharType** argv) {
+  // We don't want to run the initialization code twice.
+  if (GTestIsInitialized()) return;
+
+  if (*argc <= 0) return;
+
+  g_argvs.clear();
+  for (int i = 0; i != *argc; i++) {
+    g_argvs.push_back(StreamableToString(argv[i]));
+  }
+
+#if GTEST_HAS_ABSL
+  absl::InitializeSymbolizer(g_argvs[0].c_str());
+#endif  // GTEST_HAS_ABSL
+
+  ParseGoogleTestFlagsOnly(argc, argv);
+  GetUnitTestImpl()->PostFlagParsingInit();
+}
+
+}  // namespace internal
+
+// Initializes Google Test.  This must be called before calling
+// RUN_ALL_TESTS().  In particular, it parses a command line for the
+// flags that Google Test recognizes.  Whenever a Google Test flag is
+// seen, it is removed from argv, and *argc is decremented.
+//
+// No value is returned.  Instead, the Google Test flag variables are
+// updated.
+//
+// Calling the function for the second time has no user-visible effect.
+void InitGoogleTest(int* argc, char** argv) {
+#if defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
+  GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_(argc, argv);
+#else  // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
+  internal::InitGoogleTestImpl(argc, argv);
+#endif  // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
+}
+
+// This overloaded version can be used in Windows programs compiled in
+// UNICODE mode.
+void InitGoogleTest(int* argc, wchar_t** argv) {
+#if defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
+  GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_(argc, argv);
+#else  // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
+  internal::InitGoogleTestImpl(argc, argv);
+#endif  // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
+}
+
+// This overloaded version can be used on Arduino/embedded platforms where
+// there is no argc/argv.
+void InitGoogleTest() {
+  // Since Arduino doesn't have a command line, fake out the argc/argv arguments
+  int argc = 1;
+  const auto arg0 = "dummy";
+  char* argv0 = const_cast<char*>(arg0);
+  char** argv = &argv0;
+
+#if defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
+  GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_(&argc, argv);
+#else  // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
+  internal::InitGoogleTestImpl(&argc, argv);
+#endif  // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
+}
+
+std::string TempDir() {
+#if defined(GTEST_CUSTOM_TEMPDIR_FUNCTION_)
+  return GTEST_CUSTOM_TEMPDIR_FUNCTION_();
+#elif GTEST_OS_WINDOWS_MOBILE
+  return "\\temp\\";
+#elif GTEST_OS_WINDOWS
+  const char* temp_dir = internal::posix::GetEnv("TEMP");
+  if (temp_dir == nullptr || temp_dir[0] == '\0') {
+    return "\\temp\\";
+  } else if (temp_dir[strlen(temp_dir) - 1] == '\\') {
+    return temp_dir;
+  } else {
+    return std::string(temp_dir) + "\\";
+  }
+#elif GTEST_OS_LINUX_ANDROID
+  const char* temp_dir = internal::posix::GetEnv("TEST_TMPDIR");
+  if (temp_dir == nullptr || temp_dir[0] == '\0') {
+    return "/data/local/tmp/";
+  } else {
+    return temp_dir;
+  }
+#elif GTEST_OS_LINUX
+  const char* temp_dir = internal::posix::GetEnv("TEST_TMPDIR");
+  if (temp_dir == nullptr || temp_dir[0] == '\0') {
+    return "/tmp/";
+  } else {
+    return temp_dir;
+  }
+#else
+  return "/tmp/";
+#endif  // GTEST_OS_WINDOWS_MOBILE
+}
+
+// Class ScopedTrace
+
+// Pushes the given source file location and message onto a per-thread
+// trace stack maintained by Google Test.
+void ScopedTrace::PushTrace(const char* file, int line, std::string message) {
+  internal::TraceInfo trace;
+  trace.file = file;
+  trace.line = line;
+  trace.message.swap(message);
+
+  UnitTest::GetInstance()->PushGTestTrace(trace);
+}
+
+// Pops the info pushed by the c'tor.
+ScopedTrace::~ScopedTrace()
+    GTEST_LOCK_EXCLUDED_(&UnitTest::mutex_) {
+  UnitTest::GetInstance()->PopGTestTrace();
+}
+
+}  // namespace testing
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/src/gtest-death-test.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/src/gtest-death-test.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/src/gtest-death-test.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/src/gtest-death-test.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,1644 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+//
+// This file implements death tests.
+
+#include "gtest/gtest-death-test.h"
+
+#include <functional>
+#include <utility>
+
+#include "gtest/internal/gtest-port.h"
+#include "gtest/internal/custom/gtest.h"
+
+#if GTEST_HAS_DEATH_TEST
+
+# if GTEST_OS_MAC
+#  include <crt_externs.h>
+# endif  // GTEST_OS_MAC
+
+# include <errno.h>
+# include <fcntl.h>
+# include <limits.h>
+
+# if GTEST_OS_LINUX
+#  include <signal.h>
+# endif  // GTEST_OS_LINUX
+
+# include <stdarg.h>
+
+# if GTEST_OS_WINDOWS
+#  include <windows.h>
+# else
+#  include <sys/mman.h>
+#  include <sys/wait.h>
+# endif  // GTEST_OS_WINDOWS
+
+# if GTEST_OS_QNX
+#  include <spawn.h>
+# endif  // GTEST_OS_QNX
+
+# if GTEST_OS_FUCHSIA
+#  include <lib/fdio/fd.h>
+#  include <lib/fdio/io.h>
+#  include <lib/fdio/spawn.h>
+#  include <lib/zx/channel.h>
+#  include <lib/zx/port.h>
+#  include <lib/zx/process.h>
+#  include <lib/zx/socket.h>
+#  include <zircon/processargs.h>
+#  include <zircon/syscalls.h>
+#  include <zircon/syscalls/policy.h>
+#  include <zircon/syscalls/port.h>
+# endif  // GTEST_OS_FUCHSIA
+
+#endif  // GTEST_HAS_DEATH_TEST
+
+#include "gtest/gtest-message.h"
+#include "gtest/internal/gtest-string.h"
+#include "src/gtest-internal-inl.h"
+
+namespace testing {
+
+// Constants.
+
+// The default death test style.
+//
+// This is defined in internal/gtest-port.h as "fast", but can be overridden by
+// a definition in internal/custom/gtest-port.h. The recommended value, which is
+// used internally at Google, is "threadsafe".
+static const char kDefaultDeathTestStyle[] = GTEST_DEFAULT_DEATH_TEST_STYLE;
+
+GTEST_DEFINE_string_(
+    death_test_style,
+    internal::StringFromGTestEnv("death_test_style", kDefaultDeathTestStyle),
+    "Indicates how to run a death test in a forked child process: "
+    "\"threadsafe\" (child process re-executes the test binary "
+    "from the beginning, running only the specific death test) or "
+    "\"fast\" (child process runs the death test immediately "
+    "after forking).");
+
+GTEST_DEFINE_bool_(
+    death_test_use_fork,
+    internal::BoolFromGTestEnv("death_test_use_fork", false),
+    "Instructs to use fork()/_exit() instead of clone() in death tests. "
+    "Ignored and always uses fork() on POSIX systems where clone() is not "
+    "implemented. Useful when running under valgrind or similar tools if "
+    "those do not support clone(). Valgrind 3.3.1 will just fail if "
+    "it sees an unsupported combination of clone() flags. "
+    "It is not recommended to use this flag w/o valgrind though it will "
+    "work in 99% of the cases. Once valgrind is fixed, this flag will "
+    "most likely be removed.");
+
+namespace internal {
+GTEST_DEFINE_string_(
+    internal_run_death_test, "",
+    "Indicates the file, line number, temporal index of "
+    "the single death test to run, and a file descriptor to "
+    "which a success code may be sent, all separated by "
+    "the '|' characters.  This flag is specified if and only if the "
+    "current process is a sub-process launched for running a thread-safe "
+    "death test.  FOR INTERNAL USE ONLY.");
+}  // namespace internal
+
+#if GTEST_HAS_DEATH_TEST
+
+namespace internal {
+
+// Valid only for fast death tests. Indicates the code is running in the
+// child process of a fast style death test.
+# if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
+static bool g_in_fast_death_test_child = false;
+# endif
+
+// Returns a Boolean value indicating whether the caller is currently
+// executing in the context of the death test child process.  Tools such as
+// Valgrind heap checkers may need this to modify their behavior in death
+// tests.  IMPORTANT: This is an internal utility.  Using it may break the
+// implementation of death tests.  User code MUST NOT use it.
+bool InDeathTestChild() {
+# if GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
+
+  // On Windows and Fuchsia, death tests are thread-safe regardless of the value
+  // of the death_test_style flag.
+  return !GTEST_FLAG(internal_run_death_test).empty();
+
+# else
+
+  if (GTEST_FLAG(death_test_style) == "threadsafe")
+    return !GTEST_FLAG(internal_run_death_test).empty();
+  else
+    return g_in_fast_death_test_child;
+#endif
+}
+
+}  // namespace internal
+
+// ExitedWithCode constructor.
+ExitedWithCode::ExitedWithCode(int exit_code) : exit_code_(exit_code) {
+}
+
+// ExitedWithCode function-call operator.
+bool ExitedWithCode::operator()(int exit_status) const {
+# if GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
+
+  return exit_status == exit_code_;
+
+# else
+
+  return WIFEXITED(exit_status) && WEXITSTATUS(exit_status) == exit_code_;
+
+# endif  // GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
+}
+
+# if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
+// KilledBySignal constructor.
+KilledBySignal::KilledBySignal(int signum) : signum_(signum) {
+}
+
+// KilledBySignal function-call operator.
+bool KilledBySignal::operator()(int exit_status) const {
+#  if defined(GTEST_KILLED_BY_SIGNAL_OVERRIDE_)
+  {
+    bool result;
+    if (GTEST_KILLED_BY_SIGNAL_OVERRIDE_(signum_, exit_status, &result)) {
+      return result;
+    }
+  }
+#  endif  // defined(GTEST_KILLED_BY_SIGNAL_OVERRIDE_)
+  return WIFSIGNALED(exit_status) && WTERMSIG(exit_status) == signum_;
+}
+# endif  // !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
+
+namespace internal {
+
+// Utilities needed for death tests.
+
+// Generates a textual description of a given exit code, in the format
+// specified by wait(2).
+static std::string ExitSummary(int exit_code) {
+  Message m;
+
+# if GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
+
+  m << "Exited with exit status " << exit_code;
+
+# else
+
+  if (WIFEXITED(exit_code)) {
+    m << "Exited with exit status " << WEXITSTATUS(exit_code);
+  } else if (WIFSIGNALED(exit_code)) {
+    m << "Terminated by signal " << WTERMSIG(exit_code);
+  }
+#  ifdef WCOREDUMP
+  if (WCOREDUMP(exit_code)) {
+    m << " (core dumped)";
+  }
+#  endif
+# endif  // GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
+
+  return m.GetString();
+}
+
+// Returns true if exit_status describes a process that was terminated
+// by a signal, or exited normally with a nonzero exit code.
+bool ExitedUnsuccessfully(int exit_status) {
+  return !ExitedWithCode(0)(exit_status);
+}
+
+# if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
+// Generates a textual failure message when a death test finds more than
+// one thread running, or cannot determine the number of threads, prior
+// to executing the given statement.  It is the responsibility of the
+// caller not to pass a thread_count of 1.
+static std::string DeathTestThreadWarning(size_t thread_count) {
+  Message msg;
+  msg << "Death tests use fork(), which is unsafe particularly"
+      << " in a threaded context. For this test, " << GTEST_NAME_ << " ";
+  if (thread_count == 0) {
+    msg << "couldn't detect the number of threads.";
+  } else {
+    msg << "detected " << thread_count << " threads.";
+  }
+  msg << " See "
+         "https://github.com/google/googletest/blob/master/docs/"
+         "advanced.md#death-tests-and-threads"
+      << " for more explanation and suggested solutions, especially if"
+      << " this is the last message you see before your test times out.";
+  return msg.GetString();
+}
+# endif  // !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
+
+// Flag characters for reporting a death test that did not die.
+static const char kDeathTestLived = 'L';
+static const char kDeathTestReturned = 'R';
+static const char kDeathTestThrew = 'T';
+static const char kDeathTestInternalError = 'I';
+
+#if GTEST_OS_FUCHSIA
+
+// File descriptor used for the pipe in the child process.
+static const int kFuchsiaReadPipeFd = 3;
+
+#endif
+
+// An enumeration describing all of the possible ways that a death test can
+// conclude.  DIED means that the process died while executing the test
+// code; LIVED means that process lived beyond the end of the test code;
+// RETURNED means that the test statement attempted to execute a return
+// statement, which is not allowed; THREW means that the test statement
+// returned control by throwing an exception.  IN_PROGRESS means the test
+// has not yet concluded.
+enum DeathTestOutcome { IN_PROGRESS, DIED, LIVED, RETURNED, THREW };
+
+// Routine for aborting the program which is safe to call from an
+// exec-style death test child process, in which case the error
+// message is propagated back to the parent process.  Otherwise, the
+// message is simply printed to stderr.  In either case, the program
+// then exits with status 1.
+static void DeathTestAbort(const std::string& message) {
+  // On a POSIX system, this function may be called from a threadsafe-style
+  // death test child process, which operates on a very small stack.  Use
+  // the heap for any additional non-minuscule memory requirements.
+  const InternalRunDeathTestFlag* const flag =
+      GetUnitTestImpl()->internal_run_death_test_flag();
+  if (flag != nullptr) {
+    FILE* parent = posix::FDOpen(flag->write_fd(), "w");
+    fputc(kDeathTestInternalError, parent);
+    fprintf(parent, "%s", message.c_str());
+    fflush(parent);
+    _exit(1);
+  } else {
+    fprintf(stderr, "%s", message.c_str());
+    fflush(stderr);
+    posix::Abort();
+  }
+}
+
+// A replacement for CHECK that calls DeathTestAbort if the assertion
+// fails.
+# define GTEST_DEATH_TEST_CHECK_(expression) \
+  do { \
+    if (!::testing::internal::IsTrue(expression)) { \
+      DeathTestAbort( \
+          ::std::string("CHECK failed: File ") + __FILE__ +  ", line " \
+          + ::testing::internal::StreamableToString(__LINE__) + ": " \
+          + #expression); \
+    } \
+  } while (::testing::internal::AlwaysFalse())
+
+// This macro is similar to GTEST_DEATH_TEST_CHECK_, but it is meant for
+// evaluating any system call that fulfills two conditions: it must return
+// -1 on failure, and set errno to EINTR when it is interrupted and
+// should be tried again.  The macro expands to a loop that repeatedly
+// evaluates the expression as long as it evaluates to -1 and sets
+// errno to EINTR.  If the expression evaluates to -1 but errno is
+// something other than EINTR, DeathTestAbort is called.
+# define GTEST_DEATH_TEST_CHECK_SYSCALL_(expression) \
+  do { \
+    int gtest_retval; \
+    do { \
+      gtest_retval = (expression); \
+    } while (gtest_retval == -1 && errno == EINTR); \
+    if (gtest_retval == -1) { \
+      DeathTestAbort( \
+          ::std::string("CHECK failed: File ") + __FILE__ + ", line " \
+          + ::testing::internal::StreamableToString(__LINE__) + ": " \
+          + #expression + " != -1"); \
+    } \
+  } while (::testing::internal::AlwaysFalse())
+
+// Returns the message describing the last system error in errno.
+std::string GetLastErrnoDescription() {
+    return errno == 0 ? "" : posix::StrError(errno);
+}
+
+// This is called from a death test parent process to read a failure
+// message from the death test child process and log it with the FATAL
+// severity. On Windows, the message is read from a pipe handle. On other
+// platforms, it is read from a file descriptor.
+static void FailFromInternalError(int fd) {
+  Message error;
+  char buffer[256];
+  int num_read;
+
+  do {
+    while ((num_read = posix::Read(fd, buffer, 255)) > 0) {
+      buffer[num_read] = '\0';
+      error << buffer;
+    }
+  } while (num_read == -1 && errno == EINTR);
+
+  if (num_read == 0) {
+    GTEST_LOG_(FATAL) << error.GetString();
+  } else {
+    const int last_error = errno;
+    GTEST_LOG_(FATAL) << "Error while reading death test internal: "
+                      << GetLastErrnoDescription() << " [" << last_error << "]";
+  }
+}
+
+// Death test constructor.  Increments the running death test count
+// for the current test.
+DeathTest::DeathTest() {
+  TestInfo* const info = GetUnitTestImpl()->current_test_info();
+  if (info == nullptr) {
+    DeathTestAbort("Cannot run a death test outside of a TEST or "
+                   "TEST_F construct");
+  }
+}
+
+// Creates and returns a death test by dispatching to the current
+// death test factory.
+bool DeathTest::Create(const char* statement,
+                       Matcher<const std::string&> matcher, const char* file,
+                       int line, DeathTest** test) {
+  return GetUnitTestImpl()->death_test_factory()->Create(
+      statement, std::move(matcher), file, line, test);
+}
+
+const char* DeathTest::LastMessage() {
+  return last_death_test_message_.c_str();
+}
+
+void DeathTest::set_last_death_test_message(const std::string& message) {
+  last_death_test_message_ = message;
+}
+
+std::string DeathTest::last_death_test_message_;
+
+// Provides cross platform implementation for some death functionality.
+class DeathTestImpl : public DeathTest {
+ protected:
+  DeathTestImpl(const char* a_statement, Matcher<const std::string&> matcher)
+      : statement_(a_statement),
+        matcher_(std::move(matcher)),
+        spawned_(false),
+        status_(-1),
+        outcome_(IN_PROGRESS),
+        read_fd_(-1),
+        write_fd_(-1) {}
+
+  // read_fd_ is expected to be closed and cleared by a derived class.
+  ~DeathTestImpl() override { GTEST_DEATH_TEST_CHECK_(read_fd_ == -1); }
+
+  void Abort(AbortReason reason) override;
+  bool Passed(bool status_ok) override;
+
+  const char* statement() const { return statement_; }
+  bool spawned() const { return spawned_; }
+  void set_spawned(bool is_spawned) { spawned_ = is_spawned; }
+  int status() const { return status_; }
+  void set_status(int a_status) { status_ = a_status; }
+  DeathTestOutcome outcome() const { return outcome_; }
+  void set_outcome(DeathTestOutcome an_outcome) { outcome_ = an_outcome; }
+  int read_fd() const { return read_fd_; }
+  void set_read_fd(int fd) { read_fd_ = fd; }
+  int write_fd() const { return write_fd_; }
+  void set_write_fd(int fd) { write_fd_ = fd; }
+
+  // Called in the parent process only. Reads the result code of the death
+  // test child process via a pipe, interprets it to set the outcome_
+  // member, and closes read_fd_.  Outputs diagnostics and terminates in
+  // case of unexpected codes.
+  void ReadAndInterpretStatusByte();
+
+  // Returns stderr output from the child process.
+  virtual std::string GetErrorLogs();
+
+ private:
+  // The textual content of the code this object is testing.  This class
+  // doesn't own this string and should not attempt to delete it.
+  const char* const statement_;
+  // A matcher that's expected to match the stderr output by the child process.
+  Matcher<const std::string&> matcher_;
+  // True if the death test child process has been successfully spawned.
+  bool spawned_;
+  // The exit status of the child process.
+  int status_;
+  // How the death test concluded.
+  DeathTestOutcome outcome_;
+  // Descriptor to the read end of the pipe to the child process.  It is
+  // always -1 in the child process.  The child keeps its write end of the
+  // pipe in write_fd_.
+  int read_fd_;
+  // Descriptor to the child's write end of the pipe to the parent process.
+  // It is always -1 in the parent process.  The parent keeps its end of the
+  // pipe in read_fd_.
+  int write_fd_;
+};
+
+// Called in the parent process only. Reads the result code of the death
+// test child process via a pipe, interprets it to set the outcome_
+// member, and closes read_fd_.  Outputs diagnostics and terminates in
+// case of unexpected codes.
+void DeathTestImpl::ReadAndInterpretStatusByte() {
+  char flag;
+  int bytes_read;
+
+  // The read() here blocks until data is available (signifying the
+  // failure of the death test) or until the pipe is closed (signifying
+  // its success), so it's okay to call this in the parent before
+  // the child process has exited.
+  do {
+    bytes_read = posix::Read(read_fd(), &flag, 1);
+  } while (bytes_read == -1 && errno == EINTR);
+
+  if (bytes_read == 0) {
+    set_outcome(DIED);
+  } else if (bytes_read == 1) {
+    switch (flag) {
+      case kDeathTestReturned:
+        set_outcome(RETURNED);
+        break;
+      case kDeathTestThrew:
+        set_outcome(THREW);
+        break;
+      case kDeathTestLived:
+        set_outcome(LIVED);
+        break;
+      case kDeathTestInternalError:
+        FailFromInternalError(read_fd());  // Does not return.
+        break;
+      default:
+        GTEST_LOG_(FATAL) << "Death test child process reported "
+                          << "unexpected status byte ("
+                          << static_cast<unsigned int>(flag) << ")";
+    }
+  } else {
+    GTEST_LOG_(FATAL) << "Read from death test child process failed: "
+                      << GetLastErrnoDescription();
+  }
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(posix::Close(read_fd()));
+  set_read_fd(-1);
+}
+
+std::string DeathTestImpl::GetErrorLogs() {
+  return GetCapturedStderr();
+}
+
+// Signals that the death test code which should have exited, didn't.
+// Should be called only in a death test child process.
+// Writes a status byte to the child's status file descriptor, then
+// calls _exit(1).
+void DeathTestImpl::Abort(AbortReason reason) {
+  // The parent process considers the death test to be a failure if
+  // it finds any data in our pipe.  So, here we write a single flag byte
+  // to the pipe, then exit.
+  const char status_ch =
+      reason == TEST_DID_NOT_DIE ? kDeathTestLived :
+      reason == TEST_THREW_EXCEPTION ? kDeathTestThrew : kDeathTestReturned;
+
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(posix::Write(write_fd(), &status_ch, 1));
+  // We are leaking the descriptor here because on some platforms (i.e.,
+  // when built as Windows DLL), destructors of global objects will still
+  // run after calling _exit(). On such systems, write_fd_ will be
+  // indirectly closed from the destructor of UnitTestImpl, causing double
+  // close if it is also closed here. On debug configurations, double close
+  // may assert. As there are no in-process buffers to flush here, we are
+  // relying on the OS to close the descriptor after the process terminates
+  // when the destructors are not run.
+  _exit(1);  // Exits w/o any normal exit hooks (we were supposed to crash)
+}
+
+// Returns an indented copy of stderr output for a death test.
+// This makes distinguishing death test output lines from regular log lines
+// much easier.
+static ::std::string FormatDeathTestOutput(const ::std::string& output) {
+  ::std::string ret;
+  for (size_t at = 0; ; ) {
+    const size_t line_end = output.find('\n', at);
+    ret += "[  DEATH   ] ";
+    if (line_end == ::std::string::npos) {
+      ret += output.substr(at);
+      break;
+    }
+    ret += output.substr(at, line_end + 1 - at);
+    at = line_end + 1;
+  }
+  return ret;
+}
+
+// Assesses the success or failure of a death test, using both private
+// members which have previously been set, and one argument:
+//
+// Private data members:
+//   outcome:  An enumeration describing how the death test
+//             concluded: DIED, LIVED, THREW, or RETURNED.  The death test
+//             fails in the latter three cases.
+//   status:   The exit status of the child process. On *nix, it is in the
+//             in the format specified by wait(2). On Windows, this is the
+//             value supplied to the ExitProcess() API or a numeric code
+//             of the exception that terminated the program.
+//   matcher_: A matcher that's expected to match the stderr output by the child
+//             process.
+//
+// Argument:
+//   status_ok: true if exit_status is acceptable in the context of
+//              this particular death test, which fails if it is false
+//
+// Returns true if and only if all of the above conditions are met.  Otherwise,
+// the first failing condition, in the order given above, is the one that is
+// reported. Also sets the last death test message string.
+bool DeathTestImpl::Passed(bool status_ok) {
+  if (!spawned())
+    return false;
+
+  const std::string error_message = GetErrorLogs();
+
+  bool success = false;
+  Message buffer;
+
+  buffer << "Death test: " << statement() << "\n";
+  switch (outcome()) {
+    case LIVED:
+      buffer << "    Result: failed to die.\n"
+             << " Error msg:\n" << FormatDeathTestOutput(error_message);
+      break;
+    case THREW:
+      buffer << "    Result: threw an exception.\n"
+             << " Error msg:\n" << FormatDeathTestOutput(error_message);
+      break;
+    case RETURNED:
+      buffer << "    Result: illegal return in test statement.\n"
+             << " Error msg:\n" << FormatDeathTestOutput(error_message);
+      break;
+    case DIED:
+      if (status_ok) {
+        if (matcher_.Matches(error_message)) {
+          success = true;
+        } else {
+          std::ostringstream stream;
+          matcher_.DescribeTo(&stream);
+          buffer << "    Result: died but not with expected error.\n"
+                 << "  Expected: " << stream.str() << "\n"
+                 << "Actual msg:\n"
+                 << FormatDeathTestOutput(error_message);
+        }
+      } else {
+        buffer << "    Result: died but not with expected exit code:\n"
+               << "            " << ExitSummary(status()) << "\n"
+               << "Actual msg:\n" << FormatDeathTestOutput(error_message);
+      }
+      break;
+    case IN_PROGRESS:
+    default:
+      GTEST_LOG_(FATAL)
+          << "DeathTest::Passed somehow called before conclusion of test";
+  }
+
+  DeathTest::set_last_death_test_message(buffer.GetString());
+  return success;
+}
+
+# if GTEST_OS_WINDOWS
+// WindowsDeathTest implements death tests on Windows. Due to the
+// specifics of starting new processes on Windows, death tests there are
+// always threadsafe, and Google Test considers the
+// --gtest_death_test_style=fast setting to be equivalent to
+// --gtest_death_test_style=threadsafe there.
+//
+// A few implementation notes:  Like the Linux version, the Windows
+// implementation uses pipes for child-to-parent communication. But due to
+// the specifics of pipes on Windows, some extra steps are required:
+//
+// 1. The parent creates a communication pipe and stores handles to both
+//    ends of it.
+// 2. The parent starts the child and provides it with the information
+//    necessary to acquire the handle to the write end of the pipe.
+// 3. The child acquires the write end of the pipe and signals the parent
+//    using a Windows event.
+// 4. Now the parent can release the write end of the pipe on its side. If
+//    this is done before step 3, the object's reference count goes down to
+//    0 and it is destroyed, preventing the child from acquiring it. The
+//    parent now has to release it, or read operations on the read end of
+//    the pipe will not return when the child terminates.
+// 5. The parent reads child's output through the pipe (outcome code and
+//    any possible error messages) from the pipe, and its stderr and then
+//    determines whether to fail the test.
+//
+// Note: to distinguish Win32 API calls from the local method and function
+// calls, the former are explicitly resolved in the global namespace.
+//
+class WindowsDeathTest : public DeathTestImpl {
+ public:
+  WindowsDeathTest(const char* a_statement, Matcher<const std::string&> matcher,
+                   const char* file, int line)
+      : DeathTestImpl(a_statement, std::move(matcher)),
+        file_(file),
+        line_(line) {}
+
+  // All of these virtual functions are inherited from DeathTest.
+  virtual int Wait();
+  virtual TestRole AssumeRole();
+
+ private:
+  // The name of the file in which the death test is located.
+  const char* const file_;
+  // The line number on which the death test is located.
+  const int line_;
+  // Handle to the write end of the pipe to the child process.
+  AutoHandle write_handle_;
+  // Child process handle.
+  AutoHandle child_handle_;
+  // Event the child process uses to signal the parent that it has
+  // acquired the handle to the write end of the pipe. After seeing this
+  // event the parent can release its own handles to make sure its
+  // ReadFile() calls return when the child terminates.
+  AutoHandle event_handle_;
+};
+
+// Waits for the child in a death test to exit, returning its exit
+// status, or 0 if no child process exists.  As a side effect, sets the
+// outcome data member.
+int WindowsDeathTest::Wait() {
+  if (!spawned())
+    return 0;
+
+  // Wait until the child either signals that it has acquired the write end
+  // of the pipe or it dies.
+  const HANDLE wait_handles[2] = { child_handle_.Get(), event_handle_.Get() };
+  switch (::WaitForMultipleObjects(2,
+                                   wait_handles,
+                                   FALSE,  // Waits for any of the handles.
+                                   INFINITE)) {
+    case WAIT_OBJECT_0:
+    case WAIT_OBJECT_0 + 1:
+      break;
+    default:
+      GTEST_DEATH_TEST_CHECK_(false);  // Should not get here.
+  }
+
+  // The child has acquired the write end of the pipe or exited.
+  // We release the handle on our side and continue.
+  write_handle_.Reset();
+  event_handle_.Reset();
+
+  ReadAndInterpretStatusByte();
+
+  // Waits for the child process to exit if it haven't already. This
+  // returns immediately if the child has already exited, regardless of
+  // whether previous calls to WaitForMultipleObjects synchronized on this
+  // handle or not.
+  GTEST_DEATH_TEST_CHECK_(
+      WAIT_OBJECT_0 == ::WaitForSingleObject(child_handle_.Get(),
+                                             INFINITE));
+  DWORD status_code;
+  GTEST_DEATH_TEST_CHECK_(
+      ::GetExitCodeProcess(child_handle_.Get(), &status_code) != FALSE);
+  child_handle_.Reset();
+  set_status(static_cast<int>(status_code));
+  return status();
+}
+
+// The AssumeRole process for a Windows death test.  It creates a child
+// process with the same executable as the current process to run the
+// death test.  The child process is given the --gtest_filter and
+// --gtest_internal_run_death_test flags such that it knows to run the
+// current death test only.
+DeathTest::TestRole WindowsDeathTest::AssumeRole() {
+  const UnitTestImpl* const impl = GetUnitTestImpl();
+  const InternalRunDeathTestFlag* const flag =
+      impl->internal_run_death_test_flag();
+  const TestInfo* const info = impl->current_test_info();
+  const int death_test_index = info->result()->death_test_count();
+
+  if (flag != nullptr) {
+    // ParseInternalRunDeathTestFlag() has performed all the necessary
+    // processing.
+    set_write_fd(flag->write_fd());
+    return EXECUTE_TEST;
+  }
+
+  // WindowsDeathTest uses an anonymous pipe to communicate results of
+  // a death test.
+  SECURITY_ATTRIBUTES handles_are_inheritable = {sizeof(SECURITY_ATTRIBUTES),
+                                                 nullptr, TRUE};
+  HANDLE read_handle, write_handle;
+  GTEST_DEATH_TEST_CHECK_(
+      ::CreatePipe(&read_handle, &write_handle, &handles_are_inheritable,
+                   0)  // Default buffer size.
+      != FALSE);
+  set_read_fd(::_open_osfhandle(reinterpret_cast<intptr_t>(read_handle),
+                                O_RDONLY));
+  write_handle_.Reset(write_handle);
+  event_handle_.Reset(::CreateEvent(
+      &handles_are_inheritable,
+      TRUE,       // The event will automatically reset to non-signaled state.
+      FALSE,      // The initial state is non-signalled.
+      nullptr));  // The even is unnamed.
+  GTEST_DEATH_TEST_CHECK_(event_handle_.Get() != nullptr);
+  const std::string filter_flag = std::string("--") + GTEST_FLAG_PREFIX_ +
+                                  kFilterFlag + "=" + info->test_suite_name() +
+                                  "." + info->name();
+  const std::string internal_flag =
+      std::string("--") + GTEST_FLAG_PREFIX_ + kInternalRunDeathTestFlag +
+      "=" + file_ + "|" + StreamableToString(line_) + "|" +
+      StreamableToString(death_test_index) + "|" +
+      StreamableToString(static_cast<unsigned int>(::GetCurrentProcessId())) +
+      // size_t has the same width as pointers on both 32-bit and 64-bit
+      // Windows platforms.
+      // See http://msdn.microsoft.com/en-us/library/tcxf1dw6.aspx.
+      "|" + StreamableToString(reinterpret_cast<size_t>(write_handle)) +
+      "|" + StreamableToString(reinterpret_cast<size_t>(event_handle_.Get()));
+
+  char executable_path[_MAX_PATH + 1];  // NOLINT
+  GTEST_DEATH_TEST_CHECK_(_MAX_PATH + 1 != ::GetModuleFileNameA(nullptr,
+                                                                executable_path,
+                                                                _MAX_PATH));
+
+  std::string command_line =
+      std::string(::GetCommandLineA()) + " " + filter_flag + " \"" +
+      internal_flag + "\"";
+
+  DeathTest::set_last_death_test_message("");
+
+  CaptureStderr();
+  // Flush the log buffers since the log streams are shared with the child.
+  FlushInfoLog();
+
+  // The child process will share the standard handles with the parent.
+  STARTUPINFOA startup_info;
+  memset(&startup_info, 0, sizeof(STARTUPINFO));
+  startup_info.dwFlags = STARTF_USESTDHANDLES;
+  startup_info.hStdInput = ::GetStdHandle(STD_INPUT_HANDLE);
+  startup_info.hStdOutput = ::GetStdHandle(STD_OUTPUT_HANDLE);
+  startup_info.hStdError = ::GetStdHandle(STD_ERROR_HANDLE);
+
+  PROCESS_INFORMATION process_info;
+  GTEST_DEATH_TEST_CHECK_(
+      ::CreateProcessA(
+          executable_path, const_cast<char*>(command_line.c_str()),
+          nullptr,  // Retuned process handle is not inheritable.
+          nullptr,  // Retuned thread handle is not inheritable.
+          TRUE,  // Child inherits all inheritable handles (for write_handle_).
+          0x0,   // Default creation flags.
+          nullptr,  // Inherit the parent's environment.
+          UnitTest::GetInstance()->original_working_dir(), &startup_info,
+          &process_info) != FALSE);
+  child_handle_.Reset(process_info.hProcess);
+  ::CloseHandle(process_info.hThread);
+  set_spawned(true);
+  return OVERSEE_TEST;
+}
+
+# elif GTEST_OS_FUCHSIA
+
+class FuchsiaDeathTest : public DeathTestImpl {
+ public:
+  FuchsiaDeathTest(const char* a_statement, Matcher<const std::string&> matcher,
+                   const char* file, int line)
+      : DeathTestImpl(a_statement, std::move(matcher)),
+        file_(file),
+        line_(line) {}
+
+  // All of these virtual functions are inherited from DeathTest.
+  int Wait() override;
+  TestRole AssumeRole() override;
+  std::string GetErrorLogs() override;
+
+ private:
+  // The name of the file in which the death test is located.
+  const char* const file_;
+  // The line number on which the death test is located.
+  const int line_;
+  // The stderr data captured by the child process.
+  std::string captured_stderr_;
+
+  zx::process child_process_;
+  zx::channel exception_channel_;
+  zx::socket stderr_socket_;
+};
+
+// Utility class for accumulating command-line arguments.
+class Arguments {
+ public:
+  Arguments() { args_.push_back(nullptr); }
+
+  ~Arguments() {
+    for (std::vector<char*>::iterator i = args_.begin(); i != args_.end();
+         ++i) {
+      free(*i);
+    }
+  }
+  void AddArgument(const char* argument) {
+    args_.insert(args_.end() - 1, posix::StrDup(argument));
+  }
+
+  template <typename Str>
+  void AddArguments(const ::std::vector<Str>& arguments) {
+    for (typename ::std::vector<Str>::const_iterator i = arguments.begin();
+         i != arguments.end();
+         ++i) {
+      args_.insert(args_.end() - 1, posix::StrDup(i->c_str()));
+    }
+  }
+  char* const* Argv() {
+    return &args_[0];
+  }
+
+  int size() {
+    return static_cast<int>(args_.size()) - 1;
+  }
+
+ private:
+  std::vector<char*> args_;
+};
+
+// Waits for the child in a death test to exit, returning its exit
+// status, or 0 if no child process exists.  As a side effect, sets the
+// outcome data member.
+int FuchsiaDeathTest::Wait() {
+  const int kProcessKey = 0;
+  const int kSocketKey = 1;
+  const int kExceptionKey = 2;
+
+  if (!spawned())
+    return 0;
+
+  // Create a port to wait for socket/task/exception events.
+  zx_status_t status_zx;
+  zx::port port;
+  status_zx = zx::port::create(0, &port);
+  GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
+
+  // Register to wait for the child process to terminate.
+  status_zx = child_process_.wait_async(
+      port, kProcessKey, ZX_PROCESS_TERMINATED, 0);
+  GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
+
+  // Register to wait for the socket to be readable or closed.
+  status_zx = stderr_socket_.wait_async(
+      port, kSocketKey, ZX_SOCKET_READABLE | ZX_SOCKET_PEER_CLOSED, 0);
+  GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
+
+  // Register to wait for an exception.
+  status_zx = exception_channel_.wait_async(
+      port, kExceptionKey, ZX_CHANNEL_READABLE, 0);
+  GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
+
+  bool process_terminated = false;
+  bool socket_closed = false;
+  do {
+    zx_port_packet_t packet = {};
+    status_zx = port.wait(zx::time::infinite(), &packet);
+    GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
+
+    if (packet.key == kExceptionKey) {
+      // Process encountered an exception. Kill it directly rather than
+      // letting other handlers process the event. We will get a kProcessKey
+      // event when the process actually terminates.
+      status_zx = child_process_.kill();
+      GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
+    } else if (packet.key == kProcessKey) {
+      // Process terminated.
+      GTEST_DEATH_TEST_CHECK_(ZX_PKT_IS_SIGNAL_ONE(packet.type));
+      GTEST_DEATH_TEST_CHECK_(packet.signal.observed & ZX_PROCESS_TERMINATED);
+      process_terminated = true;
+    } else if (packet.key == kSocketKey) {
+      GTEST_DEATH_TEST_CHECK_(ZX_PKT_IS_SIGNAL_ONE(packet.type));
+      if (packet.signal.observed & ZX_SOCKET_READABLE) {
+        // Read data from the socket.
+        constexpr size_t kBufferSize = 1024;
+        do {
+          size_t old_length = captured_stderr_.length();
+          size_t bytes_read = 0;
+          captured_stderr_.resize(old_length + kBufferSize);
+          status_zx = stderr_socket_.read(
+              0, &captured_stderr_.front() + old_length, kBufferSize,
+              &bytes_read);
+          captured_stderr_.resize(old_length + bytes_read);
+        } while (status_zx == ZX_OK);
+        if (status_zx == ZX_ERR_PEER_CLOSED) {
+          socket_closed = true;
+        } else {
+          GTEST_DEATH_TEST_CHECK_(status_zx == ZX_ERR_SHOULD_WAIT);
+          status_zx = stderr_socket_.wait_async(
+              port, kSocketKey, ZX_SOCKET_READABLE | ZX_SOCKET_PEER_CLOSED, 0);
+          GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
+        }
+      } else {
+        GTEST_DEATH_TEST_CHECK_(packet.signal.observed & ZX_SOCKET_PEER_CLOSED);
+        socket_closed = true;
+      }
+    }
+  } while (!process_terminated && !socket_closed);
+
+  ReadAndInterpretStatusByte();
+
+  zx_info_process_t buffer;
+  status_zx = child_process_.get_info(ZX_INFO_PROCESS, &buffer, sizeof(buffer),
+                                      nullptr, nullptr);
+  GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
+
+  GTEST_DEATH_TEST_CHECK_(buffer.flags & ZX_INFO_PROCESS_FLAG_EXITED);
+  set_status(static_cast<int>(buffer.return_code));
+  return status();
+}
+
+// The AssumeRole process for a Fuchsia death test.  It creates a child
+// process with the same executable as the current process to run the
+// death test.  The child process is given the --gtest_filter and
+// --gtest_internal_run_death_test flags such that it knows to run the
+// current death test only.
+DeathTest::TestRole FuchsiaDeathTest::AssumeRole() {
+  const UnitTestImpl* const impl = GetUnitTestImpl();
+  const InternalRunDeathTestFlag* const flag =
+      impl->internal_run_death_test_flag();
+  const TestInfo* const info = impl->current_test_info();
+  const int death_test_index = info->result()->death_test_count();
+
+  if (flag != nullptr) {
+    // ParseInternalRunDeathTestFlag() has performed all the necessary
+    // processing.
+    set_write_fd(kFuchsiaReadPipeFd);
+    return EXECUTE_TEST;
+  }
+
+  // Flush the log buffers since the log streams are shared with the child.
+  FlushInfoLog();
+
+  // Build the child process command line.
+  const std::string filter_flag = std::string("--") + GTEST_FLAG_PREFIX_ +
+                                  kFilterFlag + "=" + info->test_suite_name() +
+                                  "." + info->name();
+  const std::string internal_flag =
+      std::string("--") + GTEST_FLAG_PREFIX_ + kInternalRunDeathTestFlag + "="
+      + file_ + "|"
+      + StreamableToString(line_) + "|"
+      + StreamableToString(death_test_index);
+  Arguments args;
+  args.AddArguments(GetInjectableArgvs());
+  args.AddArgument(filter_flag.c_str());
+  args.AddArgument(internal_flag.c_str());
+
+  // Build the pipe for communication with the child.
+  zx_status_t status;
+  zx_handle_t child_pipe_handle;
+  int child_pipe_fd;
+  status = fdio_pipe_half(&child_pipe_fd, &child_pipe_handle);
+  GTEST_DEATH_TEST_CHECK_(status == ZX_OK);
+  set_read_fd(child_pipe_fd);
+
+  // Set the pipe handle for the child.
+  fdio_spawn_action_t spawn_actions[2] = {};
+  fdio_spawn_action_t* add_handle_action = &spawn_actions[0];
+  add_handle_action->action = FDIO_SPAWN_ACTION_ADD_HANDLE;
+  add_handle_action->h.id = PA_HND(PA_FD, kFuchsiaReadPipeFd);
+  add_handle_action->h.handle = child_pipe_handle;
+
+  // Create a socket pair will be used to receive the child process' stderr.
+  zx::socket stderr_producer_socket;
+  status =
+      zx::socket::create(0, &stderr_producer_socket, &stderr_socket_);
+  GTEST_DEATH_TEST_CHECK_(status >= 0);
+  int stderr_producer_fd = -1;
+  status =
+      fdio_fd_create(stderr_producer_socket.release(), &stderr_producer_fd);
+  GTEST_DEATH_TEST_CHECK_(status >= 0);
+
+  // Make the stderr socket nonblocking.
+  GTEST_DEATH_TEST_CHECK_(fcntl(stderr_producer_fd, F_SETFL, 0) == 0);
+
+  fdio_spawn_action_t* add_stderr_action = &spawn_actions[1];
+  add_stderr_action->action = FDIO_SPAWN_ACTION_CLONE_FD;
+  add_stderr_action->fd.local_fd = stderr_producer_fd;
+  add_stderr_action->fd.target_fd = STDERR_FILENO;
+
+  // Create a child job.
+  zx_handle_t child_job = ZX_HANDLE_INVALID;
+  status = zx_job_create(zx_job_default(), 0, & child_job);
+  GTEST_DEATH_TEST_CHECK_(status == ZX_OK);
+  zx_policy_basic_t policy;
+  policy.condition = ZX_POL_NEW_ANY;
+  policy.policy = ZX_POL_ACTION_ALLOW;
+  status = zx_job_set_policy(
+      child_job, ZX_JOB_POL_RELATIVE, ZX_JOB_POL_BASIC, &policy, 1);
+  GTEST_DEATH_TEST_CHECK_(status == ZX_OK);
+
+  // Create an exception channel attached to the |child_job|, to allow
+  // us to suppress the system default exception handler from firing.
+  status =
+      zx_task_create_exception_channel(
+          child_job, 0, exception_channel_.reset_and_get_address());
+  GTEST_DEATH_TEST_CHECK_(status == ZX_OK);
+
+  // Spawn the child process.
+  status = fdio_spawn_etc(
+      child_job, FDIO_SPAWN_CLONE_ALL, args.Argv()[0], args.Argv(), nullptr,
+      2, spawn_actions, child_process_.reset_and_get_address(), nullptr);
+  GTEST_DEATH_TEST_CHECK_(status == ZX_OK);
+
+  set_spawned(true);
+  return OVERSEE_TEST;
+}
+
+std::string FuchsiaDeathTest::GetErrorLogs() {
+  return captured_stderr_;
+}
+
+#else  // We are neither on Windows, nor on Fuchsia.
+
+// ForkingDeathTest provides implementations for most of the abstract
+// methods of the DeathTest interface.  Only the AssumeRole method is
+// left undefined.
+class ForkingDeathTest : public DeathTestImpl {
+ public:
+  ForkingDeathTest(const char* statement, Matcher<const std::string&> matcher);
+
+  // All of these virtual functions are inherited from DeathTest.
+  int Wait() override;
+
+ protected:
+  void set_child_pid(pid_t child_pid) { child_pid_ = child_pid; }
+
+ private:
+  // PID of child process during death test; 0 in the child process itself.
+  pid_t child_pid_;
+};
+
+// Constructs a ForkingDeathTest.
+ForkingDeathTest::ForkingDeathTest(const char* a_statement,
+                                   Matcher<const std::string&> matcher)
+    : DeathTestImpl(a_statement, std::move(matcher)), child_pid_(-1) {}
+
+// Waits for the child in a death test to exit, returning its exit
+// status, or 0 if no child process exists.  As a side effect, sets the
+// outcome data member.
+int ForkingDeathTest::Wait() {
+  if (!spawned())
+    return 0;
+
+  ReadAndInterpretStatusByte();
+
+  int status_value;
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(waitpid(child_pid_, &status_value, 0));
+  set_status(status_value);
+  return status_value;
+}
+
+// A concrete death test class that forks, then immediately runs the test
+// in the child process.
+class NoExecDeathTest : public ForkingDeathTest {
+ public:
+  NoExecDeathTest(const char* a_statement, Matcher<const std::string&> matcher)
+      : ForkingDeathTest(a_statement, std::move(matcher)) {}
+  TestRole AssumeRole() override;
+};
+
+// The AssumeRole process for a fork-and-run death test.  It implements a
+// straightforward fork, with a simple pipe to transmit the status byte.
+DeathTest::TestRole NoExecDeathTest::AssumeRole() {
+  const size_t thread_count = GetThreadCount();
+  if (thread_count != 1) {
+    GTEST_LOG_(WARNING) << DeathTestThreadWarning(thread_count);
+  }
+
+  int pipe_fd[2];
+  GTEST_DEATH_TEST_CHECK_(pipe(pipe_fd) != -1);
+
+  DeathTest::set_last_death_test_message("");
+  CaptureStderr();
+  // When we fork the process below, the log file buffers are copied, but the
+  // file descriptors are shared.  We flush all log files here so that closing
+  // the file descriptors in the child process doesn't throw off the
+  // synchronization between descriptors and buffers in the parent process.
+  // This is as close to the fork as possible to avoid a race condition in case
+  // there are multiple threads running before the death test, and another
+  // thread writes to the log file.
+  FlushInfoLog();
+
+  const pid_t child_pid = fork();
+  GTEST_DEATH_TEST_CHECK_(child_pid != -1);
+  set_child_pid(child_pid);
+  if (child_pid == 0) {
+    GTEST_DEATH_TEST_CHECK_SYSCALL_(close(pipe_fd[0]));
+    set_write_fd(pipe_fd[1]);
+    // Redirects all logging to stderr in the child process to prevent
+    // concurrent writes to the log files.  We capture stderr in the parent
+    // process and append the child process' output to a log.
+    LogToStderr();
+    // Event forwarding to the listeners of event listener API mush be shut
+    // down in death test subprocesses.
+    GetUnitTestImpl()->listeners()->SuppressEventForwarding();
+    g_in_fast_death_test_child = true;
+    return EXECUTE_TEST;
+  } else {
+    GTEST_DEATH_TEST_CHECK_SYSCALL_(close(pipe_fd[1]));
+    set_read_fd(pipe_fd[0]);
+    set_spawned(true);
+    return OVERSEE_TEST;
+  }
+}
+
+// A concrete death test class that forks and re-executes the main
+// program from the beginning, with command-line flags set that cause
+// only this specific death test to be run.
+class ExecDeathTest : public ForkingDeathTest {
+ public:
+  ExecDeathTest(const char* a_statement, Matcher<const std::string&> matcher,
+                const char* file, int line)
+      : ForkingDeathTest(a_statement, std::move(matcher)),
+        file_(file),
+        line_(line) {}
+  TestRole AssumeRole() override;
+
+ private:
+  static ::std::vector<std::string> GetArgvsForDeathTestChildProcess() {
+    ::std::vector<std::string> args = GetInjectableArgvs();
+#  if defined(GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_)
+    ::std::vector<std::string> extra_args =
+        GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_();
+    args.insert(args.end(), extra_args.begin(), extra_args.end());
+#  endif  // defined(GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_)
+    return args;
+  }
+  // The name of the file in which the death test is located.
+  const char* const file_;
+  // The line number on which the death test is located.
+  const int line_;
+};
+
+// Utility class for accumulating command-line arguments.
+class Arguments {
+ public:
+  Arguments() { args_.push_back(nullptr); }
+
+  ~Arguments() {
+    for (std::vector<char*>::iterator i = args_.begin(); i != args_.end();
+         ++i) {
+      free(*i);
+    }
+  }
+  void AddArgument(const char* argument) {
+    args_.insert(args_.end() - 1, posix::StrDup(argument));
+  }
+
+  template <typename Str>
+  void AddArguments(const ::std::vector<Str>& arguments) {
+    for (typename ::std::vector<Str>::const_iterator i = arguments.begin();
+         i != arguments.end();
+         ++i) {
+      args_.insert(args_.end() - 1, posix::StrDup(i->c_str()));
+    }
+  }
+  char* const* Argv() {
+    return &args_[0];
+  }
+
+ private:
+  std::vector<char*> args_;
+};
+
+// A struct that encompasses the arguments to the child process of a
+// threadsafe-style death test process.
+struct ExecDeathTestArgs {
+  char* const* argv;  // Command-line arguments for the child's call to exec
+  int close_fd;       // File descriptor to close; the read end of a pipe
+};
+
+#  if GTEST_OS_QNX
+extern "C" char** environ;
+#  else  // GTEST_OS_QNX
+// The main function for a threadsafe-style death test child process.
+// This function is called in a clone()-ed process and thus must avoid
+// any potentially unsafe operations like malloc or libc functions.
+static int ExecDeathTestChildMain(void* child_arg) {
+  ExecDeathTestArgs* const args = static_cast<ExecDeathTestArgs*>(child_arg);
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(close(args->close_fd));
+
+  // We need to execute the test program in the same environment where
+  // it was originally invoked.  Therefore we change to the original
+  // working directory first.
+  const char* const original_dir =
+      UnitTest::GetInstance()->original_working_dir();
+  // We can safely call chdir() as it's a direct system call.
+  if (chdir(original_dir) != 0) {
+    DeathTestAbort(std::string("chdir(\"") + original_dir + "\") failed: " +
+                   GetLastErrnoDescription());
+    return EXIT_FAILURE;
+  }
+
+  // We can safely call execv() as it's almost a direct system call. We
+  // cannot use execvp() as it's a libc function and thus potentially
+  // unsafe.  Since execv() doesn't search the PATH, the user must
+  // invoke the test program via a valid path that contains at least
+  // one path separator.
+  execv(args->argv[0], args->argv);
+  DeathTestAbort(std::string("execv(") + args->argv[0] + ", ...) in " +
+                 original_dir + " failed: " +
+                 GetLastErrnoDescription());
+  return EXIT_FAILURE;
+}
+#  endif  // GTEST_OS_QNX
+
+#  if GTEST_HAS_CLONE
+// Two utility routines that together determine the direction the stack
+// grows.
+// This could be accomplished more elegantly by a single recursive
+// function, but we want to guard against the unlikely possibility of
+// a smart compiler optimizing the recursion away.
+//
+// GTEST_NO_INLINE_ is required to prevent GCC 4.6 from inlining
+// StackLowerThanAddress into StackGrowsDown, which then doesn't give
+// correct answer.
+static void StackLowerThanAddress(const void* ptr,
+                                  bool* result) GTEST_NO_INLINE_;
+// Make sure sanitizers do not tamper with the stack here.
+// Ideally, we want to use `__builtin_frame_address` instead of a local variable
+// address with sanitizer disabled, but it does not work when the
+// compiler optimizes the stack frame out, which happens on PowerPC targets.
+// HWAddressSanitizer add a random tag to the MSB of the local variable address,
+// making comparison result unpredictable.
+GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
+GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
+static void StackLowerThanAddress(const void* ptr, bool* result) {
+  int dummy = 0;
+  *result = std::less<const void*>()(&dummy, ptr);
+}
+
+// Make sure AddressSanitizer does not tamper with the stack here.
+GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
+GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
+static bool StackGrowsDown() {
+  int dummy = 0;
+  bool result;
+  StackLowerThanAddress(&dummy, &result);
+  return result;
+}
+#  endif  // GTEST_HAS_CLONE
+
+// Spawns a child process with the same executable as the current process in
+// a thread-safe manner and instructs it to run the death test.  The
+// implementation uses fork(2) + exec.  On systems where clone(2) is
+// available, it is used instead, being slightly more thread-safe.  On QNX,
+// fork supports only single-threaded environments, so this function uses
+// spawn(2) there instead.  The function dies with an error message if
+// anything goes wrong.
+static pid_t ExecDeathTestSpawnChild(char* const* argv, int close_fd) {
+  ExecDeathTestArgs args = { argv, close_fd };
+  pid_t child_pid = -1;
+
+#  if GTEST_OS_QNX
+  // Obtains the current directory and sets it to be closed in the child
+  // process.
+  const int cwd_fd = open(".", O_RDONLY);
+  GTEST_DEATH_TEST_CHECK_(cwd_fd != -1);
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(fcntl(cwd_fd, F_SETFD, FD_CLOEXEC));
+  // We need to execute the test program in the same environment where
+  // it was originally invoked.  Therefore we change to the original
+  // working directory first.
+  const char* const original_dir =
+      UnitTest::GetInstance()->original_working_dir();
+  // We can safely call chdir() as it's a direct system call.
+  if (chdir(original_dir) != 0) {
+    DeathTestAbort(std::string("chdir(\"") + original_dir + "\") failed: " +
+                   GetLastErrnoDescription());
+    return EXIT_FAILURE;
+  }
+
+  int fd_flags;
+  // Set close_fd to be closed after spawn.
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(fd_flags = fcntl(close_fd, F_GETFD));
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(fcntl(close_fd, F_SETFD,
+                                        fd_flags | FD_CLOEXEC));
+  struct inheritance inherit = {0};
+  // spawn is a system call.
+  child_pid = spawn(args.argv[0], 0, nullptr, &inherit, args.argv, environ);
+  // Restores the current working directory.
+  GTEST_DEATH_TEST_CHECK_(fchdir(cwd_fd) != -1);
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(close(cwd_fd));
+
+#  else   // GTEST_OS_QNX
+#   if GTEST_OS_LINUX
+  // When a SIGPROF signal is received while fork() or clone() are executing,
+  // the process may hang. To avoid this, we ignore SIGPROF here and re-enable
+  // it after the call to fork()/clone() is complete.
+  struct sigaction saved_sigprof_action;
+  struct sigaction ignore_sigprof_action;
+  memset(&ignore_sigprof_action, 0, sizeof(ignore_sigprof_action));
+  sigemptyset(&ignore_sigprof_action.sa_mask);
+  ignore_sigprof_action.sa_handler = SIG_IGN;
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(sigaction(
+      SIGPROF, &ignore_sigprof_action, &saved_sigprof_action));
+#   endif  // GTEST_OS_LINUX
+
+#   if GTEST_HAS_CLONE
+  const bool use_fork = GTEST_FLAG(death_test_use_fork);
+
+  if (!use_fork) {
+    static const bool stack_grows_down = StackGrowsDown();
+    const auto stack_size = static_cast<size_t>(getpagesize() * 2);
+    // MMAP_ANONYMOUS is not defined on Mac, so we use MAP_ANON instead.
+    void* const stack = mmap(nullptr, stack_size, PROT_READ | PROT_WRITE,
+                             MAP_ANON | MAP_PRIVATE, -1, 0);
+    GTEST_DEATH_TEST_CHECK_(stack != MAP_FAILED);
+
+    // Maximum stack alignment in bytes:  For a downward-growing stack, this
+    // amount is subtracted from size of the stack space to get an address
+    // that is within the stack space and is aligned on all systems we care
+    // about.  As far as I know there is no ABI with stack alignment greater
+    // than 64.  We assume stack and stack_size already have alignment of
+    // kMaxStackAlignment.
+    const size_t kMaxStackAlignment = 64;
+    void* const stack_top =
+        static_cast<char*>(stack) +
+            (stack_grows_down ? stack_size - kMaxStackAlignment : 0);
+    GTEST_DEATH_TEST_CHECK_(
+        static_cast<size_t>(stack_size) > kMaxStackAlignment &&
+        reinterpret_cast<uintptr_t>(stack_top) % kMaxStackAlignment == 0);
+
+    child_pid = clone(&ExecDeathTestChildMain, stack_top, SIGCHLD, &args);
+
+    GTEST_DEATH_TEST_CHECK_(munmap(stack, stack_size) != -1);
+  }
+#   else
+  const bool use_fork = true;
+#   endif  // GTEST_HAS_CLONE
+
+  if (use_fork && (child_pid = fork()) == 0) {
+      ExecDeathTestChildMain(&args);
+      _exit(0);
+  }
+#  endif  // GTEST_OS_QNX
+#  if GTEST_OS_LINUX
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(
+      sigaction(SIGPROF, &saved_sigprof_action, nullptr));
+#  endif  // GTEST_OS_LINUX
+
+  GTEST_DEATH_TEST_CHECK_(child_pid != -1);
+  return child_pid;
+}
+
+// The AssumeRole process for a fork-and-exec death test.  It re-executes the
+// main program from the beginning, setting the --gtest_filter
+// and --gtest_internal_run_death_test flags to cause only the current
+// death test to be re-run.
+DeathTest::TestRole ExecDeathTest::AssumeRole() {
+  const UnitTestImpl* const impl = GetUnitTestImpl();
+  const InternalRunDeathTestFlag* const flag =
+      impl->internal_run_death_test_flag();
+  const TestInfo* const info = impl->current_test_info();
+  const int death_test_index = info->result()->death_test_count();
+
+  if (flag != nullptr) {
+    set_write_fd(flag->write_fd());
+    return EXECUTE_TEST;
+  }
+
+  int pipe_fd[2];
+  GTEST_DEATH_TEST_CHECK_(pipe(pipe_fd) != -1);
+  // Clear the close-on-exec flag on the write end of the pipe, lest
+  // it be closed when the child process does an exec:
+  GTEST_DEATH_TEST_CHECK_(fcntl(pipe_fd[1], F_SETFD, 0) != -1);
+
+  const std::string filter_flag = std::string("--") + GTEST_FLAG_PREFIX_ +
+                                  kFilterFlag + "=" + info->test_suite_name() +
+                                  "." + info->name();
+  const std::string internal_flag =
+      std::string("--") + GTEST_FLAG_PREFIX_ + kInternalRunDeathTestFlag + "="
+      + file_ + "|" + StreamableToString(line_) + "|"
+      + StreamableToString(death_test_index) + "|"
+      + StreamableToString(pipe_fd[1]);
+  Arguments args;
+  args.AddArguments(GetArgvsForDeathTestChildProcess());
+  args.AddArgument(filter_flag.c_str());
+  args.AddArgument(internal_flag.c_str());
+
+  DeathTest::set_last_death_test_message("");
+
+  CaptureStderr();
+  // See the comment in NoExecDeathTest::AssumeRole for why the next line
+  // is necessary.
+  FlushInfoLog();
+
+  const pid_t child_pid = ExecDeathTestSpawnChild(args.Argv(), pipe_fd[0]);
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(close(pipe_fd[1]));
+  set_child_pid(child_pid);
+  set_read_fd(pipe_fd[0]);
+  set_spawned(true);
+  return OVERSEE_TEST;
+}
+
+# endif  // !GTEST_OS_WINDOWS
+
+// Creates a concrete DeathTest-derived class that depends on the
+// --gtest_death_test_style flag, and sets the pointer pointed to
+// by the "test" argument to its address.  If the test should be
+// skipped, sets that pointer to NULL.  Returns true, unless the
+// flag is set to an invalid value.
+bool DefaultDeathTestFactory::Create(const char* statement,
+                                     Matcher<const std::string&> matcher,
+                                     const char* file, int line,
+                                     DeathTest** test) {
+  UnitTestImpl* const impl = GetUnitTestImpl();
+  const InternalRunDeathTestFlag* const flag =
+      impl->internal_run_death_test_flag();
+  const int death_test_index = impl->current_test_info()
+      ->increment_death_test_count();
+
+  if (flag != nullptr) {
+    if (death_test_index > flag->index()) {
+      DeathTest::set_last_death_test_message(
+          "Death test count (" + StreamableToString(death_test_index)
+          + ") somehow exceeded expected maximum ("
+          + StreamableToString(flag->index()) + ")");
+      return false;
+    }
+
+    if (!(flag->file() == file && flag->line() == line &&
+          flag->index() == death_test_index)) {
+      *test = nullptr;
+      return true;
+    }
+  }
+
+# if GTEST_OS_WINDOWS
+
+  if (GTEST_FLAG(death_test_style) == "threadsafe" ||
+      GTEST_FLAG(death_test_style) == "fast") {
+    *test = new WindowsDeathTest(statement, std::move(matcher), file, line);
+  }
+
+# elif GTEST_OS_FUCHSIA
+
+  if (GTEST_FLAG(death_test_style) == "threadsafe" ||
+      GTEST_FLAG(death_test_style) == "fast") {
+    *test = new FuchsiaDeathTest(statement, std::move(matcher), file, line);
+  }
+
+# else
+
+  if (GTEST_FLAG(death_test_style) == "threadsafe") {
+    *test = new ExecDeathTest(statement, std::move(matcher), file, line);
+  } else if (GTEST_FLAG(death_test_style) == "fast") {
+    *test = new NoExecDeathTest(statement, std::move(matcher));
+  }
+
+# endif  // GTEST_OS_WINDOWS
+
+  else {  // NOLINT - this is more readable than unbalanced brackets inside #if.
+    DeathTest::set_last_death_test_message(
+        "Unknown death test style \"" + GTEST_FLAG(death_test_style)
+        + "\" encountered");
+    return false;
+  }
+
+  return true;
+}
+
+# if GTEST_OS_WINDOWS
+// Recreates the pipe and event handles from the provided parameters,
+// signals the event, and returns a file descriptor wrapped around the pipe
+// handle. This function is called in the child process only.
+static int GetStatusFileDescriptor(unsigned int parent_process_id,
+                            size_t write_handle_as_size_t,
+                            size_t event_handle_as_size_t) {
+  AutoHandle parent_process_handle(::OpenProcess(PROCESS_DUP_HANDLE,
+                                                   FALSE,  // Non-inheritable.
+                                                   parent_process_id));
+  if (parent_process_handle.Get() == INVALID_HANDLE_VALUE) {
+    DeathTestAbort("Unable to open parent process " +
+                   StreamableToString(parent_process_id));
+  }
+
+  GTEST_CHECK_(sizeof(HANDLE) <= sizeof(size_t));
+
+  const HANDLE write_handle =
+      reinterpret_cast<HANDLE>(write_handle_as_size_t);
+  HANDLE dup_write_handle;
+
+  // The newly initialized handle is accessible only in the parent
+  // process. To obtain one accessible within the child, we need to use
+  // DuplicateHandle.
+  if (!::DuplicateHandle(parent_process_handle.Get(), write_handle,
+                         ::GetCurrentProcess(), &dup_write_handle,
+                         0x0,    // Requested privileges ignored since
+                                 // DUPLICATE_SAME_ACCESS is used.
+                         FALSE,  // Request non-inheritable handler.
+                         DUPLICATE_SAME_ACCESS)) {
+    DeathTestAbort("Unable to duplicate the pipe handle " +
+                   StreamableToString(write_handle_as_size_t) +
+                   " from the parent process " +
+                   StreamableToString(parent_process_id));
+  }
+
+  const HANDLE event_handle = reinterpret_cast<HANDLE>(event_handle_as_size_t);
+  HANDLE dup_event_handle;
+
+  if (!::DuplicateHandle(parent_process_handle.Get(), event_handle,
+                         ::GetCurrentProcess(), &dup_event_handle,
+                         0x0,
+                         FALSE,
+                         DUPLICATE_SAME_ACCESS)) {
+    DeathTestAbort("Unable to duplicate the event handle " +
+                   StreamableToString(event_handle_as_size_t) +
+                   " from the parent process " +
+                   StreamableToString(parent_process_id));
+  }
+
+  const int write_fd =
+      ::_open_osfhandle(reinterpret_cast<intptr_t>(dup_write_handle), O_APPEND);
+  if (write_fd == -1) {
+    DeathTestAbort("Unable to convert pipe handle " +
+                   StreamableToString(write_handle_as_size_t) +
+                   " to a file descriptor");
+  }
+
+  // Signals the parent that the write end of the pipe has been acquired
+  // so the parent can release its own write end.
+  ::SetEvent(dup_event_handle);
+
+  return write_fd;
+}
+# endif  // GTEST_OS_WINDOWS
+
+// Returns a newly created InternalRunDeathTestFlag object with fields
+// initialized from the GTEST_FLAG(internal_run_death_test) flag if
+// the flag is specified; otherwise returns NULL.
+InternalRunDeathTestFlag* ParseInternalRunDeathTestFlag() {
+  if (GTEST_FLAG(internal_run_death_test) == "") return nullptr;
+
+  // GTEST_HAS_DEATH_TEST implies that we have ::std::string, so we
+  // can use it here.
+  int line = -1;
+  int index = -1;
+  ::std::vector< ::std::string> fields;
+  SplitString(GTEST_FLAG(internal_run_death_test).c_str(), '|', &fields);
+  int write_fd = -1;
+
+# if GTEST_OS_WINDOWS
+
+  unsigned int parent_process_id = 0;
+  size_t write_handle_as_size_t = 0;
+  size_t event_handle_as_size_t = 0;
+
+  if (fields.size() != 6
+      || !ParseNaturalNumber(fields[1], &line)
+      || !ParseNaturalNumber(fields[2], &index)
+      || !ParseNaturalNumber(fields[3], &parent_process_id)
+      || !ParseNaturalNumber(fields[4], &write_handle_as_size_t)
+      || !ParseNaturalNumber(fields[5], &event_handle_as_size_t)) {
+    DeathTestAbort("Bad --gtest_internal_run_death_test flag: " +
+                   GTEST_FLAG(internal_run_death_test));
+  }
+  write_fd = GetStatusFileDescriptor(parent_process_id,
+                                     write_handle_as_size_t,
+                                     event_handle_as_size_t);
+
+# elif GTEST_OS_FUCHSIA
+
+  if (fields.size() != 3
+      || !ParseNaturalNumber(fields[1], &line)
+      || !ParseNaturalNumber(fields[2], &index)) {
+    DeathTestAbort("Bad --gtest_internal_run_death_test flag: "
+        + GTEST_FLAG(internal_run_death_test));
+  }
+
+# else
+
+  if (fields.size() != 4
+      || !ParseNaturalNumber(fields[1], &line)
+      || !ParseNaturalNumber(fields[2], &index)
+      || !ParseNaturalNumber(fields[3], &write_fd)) {
+    DeathTestAbort("Bad --gtest_internal_run_death_test flag: "
+        + GTEST_FLAG(internal_run_death_test));
+  }
+
+# endif  // GTEST_OS_WINDOWS
+
+  return new InternalRunDeathTestFlag(fields[0], line, index, write_fd);
+}
+
+}  // namespace internal
+
+#endif  // GTEST_HAS_DEATH_TEST
+
+}  // namespace testing
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/src/gtest-filepath.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/src/gtest-filepath.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/src/gtest-filepath.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/src/gtest-filepath.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,369 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "gtest/internal/gtest-filepath.h"
+
+#include <stdlib.h>
+#include "gtest/internal/gtest-port.h"
+#include "gtest/gtest-message.h"
+
+#if GTEST_OS_WINDOWS_MOBILE
+# include <windows.h>
+#elif GTEST_OS_WINDOWS
+# include <direct.h>
+# include <io.h>
+#else
+# include <limits.h>
+# include <climits>  // Some Linux distributions define PATH_MAX here.
+#endif  // GTEST_OS_WINDOWS_MOBILE
+
+#include "gtest/internal/gtest-string.h"
+
+#if GTEST_OS_WINDOWS
+# define GTEST_PATH_MAX_ _MAX_PATH
+#elif defined(PATH_MAX)
+# define GTEST_PATH_MAX_ PATH_MAX
+#elif defined(_XOPEN_PATH_MAX)
+# define GTEST_PATH_MAX_ _XOPEN_PATH_MAX
+#else
+# define GTEST_PATH_MAX_ _POSIX_PATH_MAX
+#endif  // GTEST_OS_WINDOWS
+
+namespace testing {
+namespace internal {
+
+#if GTEST_OS_WINDOWS
+// On Windows, '\\' is the standard path separator, but many tools and the
+// Windows API also accept '/' as an alternate path separator. Unless otherwise
+// noted, a file path can contain either kind of path separators, or a mixture
+// of them.
+const char kPathSeparator = '\\';
+const char kAlternatePathSeparator = '/';
+const char kAlternatePathSeparatorString[] = "/";
+# if GTEST_OS_WINDOWS_MOBILE
+// Windows CE doesn't have a current directory. You should not use
+// the current directory in tests on Windows CE, but this at least
+// provides a reasonable fallback.
+const char kCurrentDirectoryString[] = "\\";
+// Windows CE doesn't define INVALID_FILE_ATTRIBUTES
+const DWORD kInvalidFileAttributes = 0xffffffff;
+# else
+const char kCurrentDirectoryString[] = ".\\";
+# endif  // GTEST_OS_WINDOWS_MOBILE
+#else
+const char kPathSeparator = '/';
+const char kCurrentDirectoryString[] = "./";
+#endif  // GTEST_OS_WINDOWS
+
+// Returns whether the given character is a valid path separator.
+static bool IsPathSeparator(char c) {
+#if GTEST_HAS_ALT_PATH_SEP_
+  return (c == kPathSeparator) || (c == kAlternatePathSeparator);
+#else
+  return c == kPathSeparator;
+#endif
+}
+
+// Returns the current working directory, or "" if unsuccessful.
+FilePath FilePath::GetCurrentDir() {
+#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE ||         \
+    GTEST_OS_WINDOWS_RT || GTEST_OS_ESP8266 || GTEST_OS_ESP32 || \
+    GTEST_OS_XTENSA
+  // These platforms do not have a current directory, so we just return
+  // something reasonable.
+  return FilePath(kCurrentDirectoryString);
+#elif GTEST_OS_WINDOWS
+  char cwd[GTEST_PATH_MAX_ + 1] = { '\0' };
+  return FilePath(_getcwd(cwd, sizeof(cwd)) == nullptr ? "" : cwd);
+#else
+  char cwd[GTEST_PATH_MAX_ + 1] = { '\0' };
+  char* result = getcwd(cwd, sizeof(cwd));
+# if GTEST_OS_NACL
+  // getcwd will likely fail in NaCl due to the sandbox, so return something
+  // reasonable. The user may have provided a shim implementation for getcwd,
+  // however, so fallback only when failure is detected.
+  return FilePath(result == nullptr ? kCurrentDirectoryString : cwd);
+# endif  // GTEST_OS_NACL
+  return FilePath(result == nullptr ? "" : cwd);
+#endif  // GTEST_OS_WINDOWS_MOBILE
+}
+
+// Returns a copy of the FilePath with the case-insensitive extension removed.
+// Example: FilePath("dir/file.exe").RemoveExtension("EXE") returns
+// FilePath("dir/file"). If a case-insensitive extension is not
+// found, returns a copy of the original FilePath.
+FilePath FilePath::RemoveExtension(const char* extension) const {
+  const std::string dot_extension = std::string(".") + extension;
+  if (String::EndsWithCaseInsensitive(pathname_, dot_extension)) {
+    return FilePath(pathname_.substr(
+        0, pathname_.length() - dot_extension.length()));
+  }
+  return *this;
+}
+
+// Returns a pointer to the last occurrence of a valid path separator in
+// the FilePath. On Windows, for example, both '/' and '\' are valid path
+// separators. Returns NULL if no path separator was found.
+const char* FilePath::FindLastPathSeparator() const {
+  const char* const last_sep = strrchr(c_str(), kPathSeparator);
+#if GTEST_HAS_ALT_PATH_SEP_
+  const char* const last_alt_sep = strrchr(c_str(), kAlternatePathSeparator);
+  // Comparing two pointers of which only one is NULL is undefined.
+  if (last_alt_sep != nullptr &&
+      (last_sep == nullptr || last_alt_sep > last_sep)) {
+    return last_alt_sep;
+  }
+#endif
+  return last_sep;
+}
+
+// Returns a copy of the FilePath with the directory part removed.
+// Example: FilePath("path/to/file").RemoveDirectoryName() returns
+// FilePath("file"). If there is no directory part ("just_a_file"), it returns
+// the FilePath unmodified. If there is no file part ("just_a_dir/") it
+// returns an empty FilePath ("").
+// On Windows platform, '\' is the path separator, otherwise it is '/'.
+FilePath FilePath::RemoveDirectoryName() const {
+  const char* const last_sep = FindLastPathSeparator();
+  return last_sep ? FilePath(last_sep + 1) : *this;
+}
+
+// RemoveFileName returns the directory path with the filename removed.
+// Example: FilePath("path/to/file").RemoveFileName() returns "path/to/".
+// If the FilePath is "a_file" or "/a_file", RemoveFileName returns
+// FilePath("./") or, on Windows, FilePath(".\\"). If the filepath does
+// not have a file, like "just/a/dir/", it returns the FilePath unmodified.
+// On Windows platform, '\' is the path separator, otherwise it is '/'.
+FilePath FilePath::RemoveFileName() const {
+  const char* const last_sep = FindLastPathSeparator();
+  std::string dir;
+  if (last_sep) {
+    dir = std::string(c_str(), static_cast<size_t>(last_sep + 1 - c_str()));
+  } else {
+    dir = kCurrentDirectoryString;
+  }
+  return FilePath(dir);
+}
+
+// Helper functions for naming files in a directory for xml output.
+
+// Given directory = "dir", base_name = "test", number = 0,
+// extension = "xml", returns "dir/test.xml". If number is greater
+// than zero (e.g., 12), returns "dir/test_12.xml".
+// On Windows platform, uses \ as the separator rather than /.
+FilePath FilePath::MakeFileName(const FilePath& directory,
+                                const FilePath& base_name,
+                                int number,
+                                const char* extension) {
+  std::string file;
+  if (number == 0) {
+    file = base_name.string() + "." + extension;
+  } else {
+    file = base_name.string() + "_" + StreamableToString(number)
+        + "." + extension;
+  }
+  return ConcatPaths(directory, FilePath(file));
+}
+
+// Given directory = "dir", relative_path = "test.xml", returns "dir/test.xml".
+// On Windows, uses \ as the separator rather than /.
+FilePath FilePath::ConcatPaths(const FilePath& directory,
+                               const FilePath& relative_path) {
+  if (directory.IsEmpty())
+    return relative_path;
+  const FilePath dir(directory.RemoveTrailingPathSeparator());
+  return FilePath(dir.string() + kPathSeparator + relative_path.string());
+}
+
+// Returns true if pathname describes something findable in the file-system,
+// either a file, directory, or whatever.
+bool FilePath::FileOrDirectoryExists() const {
+#if GTEST_OS_WINDOWS_MOBILE
+  LPCWSTR unicode = String::AnsiToUtf16(pathname_.c_str());
+  const DWORD attributes = GetFileAttributes(unicode);
+  delete [] unicode;
+  return attributes != kInvalidFileAttributes;
+#else
+  posix::StatStruct file_stat{};
+  return posix::Stat(pathname_.c_str(), &file_stat) == 0;
+#endif  // GTEST_OS_WINDOWS_MOBILE
+}
+
+// Returns true if pathname describes a directory in the file-system
+// that exists.
+bool FilePath::DirectoryExists() const {
+  bool result = false;
+#if GTEST_OS_WINDOWS
+  // Don't strip off trailing separator if path is a root directory on
+  // Windows (like "C:\\").
+  const FilePath& path(IsRootDirectory() ? *this :
+                                           RemoveTrailingPathSeparator());
+#else
+  const FilePath& path(*this);
+#endif
+
+#if GTEST_OS_WINDOWS_MOBILE
+  LPCWSTR unicode = String::AnsiToUtf16(path.c_str());
+  const DWORD attributes = GetFileAttributes(unicode);
+  delete [] unicode;
+  if ((attributes != kInvalidFileAttributes) &&
+      (attributes & FILE_ATTRIBUTE_DIRECTORY)) {
+    result = true;
+  }
+#else
+  posix::StatStruct file_stat{};
+  result = posix::Stat(path.c_str(), &file_stat) == 0 &&
+      posix::IsDir(file_stat);
+#endif  // GTEST_OS_WINDOWS_MOBILE
+
+  return result;
+}
+
+// Returns true if pathname describes a root directory. (Windows has one
+// root directory per disk drive.)
+bool FilePath::IsRootDirectory() const {
+#if GTEST_OS_WINDOWS
+  return pathname_.length() == 3 && IsAbsolutePath();
+#else
+  return pathname_.length() == 1 && IsPathSeparator(pathname_.c_str()[0]);
+#endif
+}
+
+// Returns true if pathname describes an absolute path.
+bool FilePath::IsAbsolutePath() const {
+  const char* const name = pathname_.c_str();
+#if GTEST_OS_WINDOWS
+  return pathname_.length() >= 3 &&
+     ((name[0] >= 'a' && name[0] <= 'z') ||
+      (name[0] >= 'A' && name[0] <= 'Z')) &&
+     name[1] == ':' &&
+     IsPathSeparator(name[2]);
+#else
+  return IsPathSeparator(name[0]);
+#endif
+}
+
+// Returns a pathname for a file that does not currently exist. The pathname
+// will be directory/base_name.extension or
+// directory/base_name_<number>.extension if directory/base_name.extension
+// already exists. The number will be incremented until a pathname is found
+// that does not already exist.
+// Examples: 'dir/foo_test.xml' or 'dir/foo_test_1.xml'.
+// There could be a race condition if two or more processes are calling this
+// function at the same time -- they could both pick the same filename.
+FilePath FilePath::GenerateUniqueFileName(const FilePath& directory,
+                                          const FilePath& base_name,
+                                          const char* extension) {
+  FilePath full_pathname;
+  int number = 0;
+  do {
+    full_pathname.Set(MakeFileName(directory, base_name, number++, extension));
+  } while (full_pathname.FileOrDirectoryExists());
+  return full_pathname;
+}
+
+// Returns true if FilePath ends with a path separator, which indicates that
+// it is intended to represent a directory. Returns false otherwise.
+// This does NOT check that a directory (or file) actually exists.
+bool FilePath::IsDirectory() const {
+  return !pathname_.empty() &&
+         IsPathSeparator(pathname_.c_str()[pathname_.length() - 1]);
+}
+
+// Create directories so that path exists. Returns true if successful or if
+// the directories already exist; returns false if unable to create directories
+// for any reason.
+bool FilePath::CreateDirectoriesRecursively() const {
+  if (!this->IsDirectory()) {
+    return false;
+  }
+
+  if (pathname_.length() == 0 || this->DirectoryExists()) {
+    return true;
+  }
+
+  const FilePath parent(this->RemoveTrailingPathSeparator().RemoveFileName());
+  return parent.CreateDirectoriesRecursively() && this->CreateFolder();
+}
+
+// Create the directory so that path exists. Returns true if successful or
+// if the directory already exists; returns false if unable to create the
+// directory for any reason, including if the parent directory does not
+// exist. Not named "CreateDirectory" because that's a macro on Windows.
+bool FilePath::CreateFolder() const {
+#if GTEST_OS_WINDOWS_MOBILE
+  FilePath removed_sep(this->RemoveTrailingPathSeparator());
+  LPCWSTR unicode = String::AnsiToUtf16(removed_sep.c_str());
+  int result = CreateDirectory(unicode, nullptr) ? 0 : -1;
+  delete [] unicode;
+#elif GTEST_OS_WINDOWS
+  int result = _mkdir(pathname_.c_str());
+#elif GTEST_OS_ESP8266 || GTEST_OS_XTENSA
+  // do nothing
+  int result = 0;
+#else
+  int result = mkdir(pathname_.c_str(), 0777);
+#endif  // GTEST_OS_WINDOWS_MOBILE
+
+  if (result == -1) {
+    return this->DirectoryExists();  // An error is OK if the directory exists.
+  }
+  return true;  // No error.
+}
+
+// If input name has a trailing separator character, remove it and return the
+// name, otherwise return the name string unmodified.
+// On Windows platform, uses \ as the separator, other platforms use /.
+FilePath FilePath::RemoveTrailingPathSeparator() const {
+  return IsDirectory()
+      ? FilePath(pathname_.substr(0, pathname_.length() - 1))
+      : *this;
+}
+
+// Removes any redundant separators that might be in the pathname.
+// For example, "bar///foo" becomes "bar/foo". Does not eliminate other
+// redundancies that might be in a pathname involving "." or "..".
+void FilePath::Normalize() {
+  auto out = pathname_.begin();
+
+  for (const char character : pathname_) {
+    if (!IsPathSeparator(character)) {
+      *(out++) = character;
+    } else if (out == pathname_.begin() || *std::prev(out) != kPathSeparator) {
+      *(out++) = kPathSeparator;
+    } else {
+      continue;
+    }
+  }
+
+  pathname_.erase(out, pathname_.end());
+}
+
+}  // namespace internal
+}  // namespace testing
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/src/gtest-internal-inl.h mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/src/gtest-internal-inl.h
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/src/gtest-internal-inl.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/src/gtest-internal-inl.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,1221 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Utility functions and classes used by the Google C++ testing framework.//
+// This file contains purely Google Test's internal implementation.  Please
+// DO NOT #INCLUDE IT IN A USER PROGRAM.
+
+#ifndef GOOGLETEST_SRC_GTEST_INTERNAL_INL_H_
+#define GOOGLETEST_SRC_GTEST_INTERNAL_INL_H_
+
+#ifndef _WIN32_WCE
+# include <errno.h>
+#endif  // !_WIN32_WCE
+#include <stddef.h>
+#include <stdlib.h>  // For strtoll/_strtoul64/malloc/free.
+#include <string.h>  // For memmove.
+
+#include <algorithm>
+#include <cstdint>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "gtest/internal/gtest-port.h"
+
+#if GTEST_CAN_STREAM_RESULTS_
+# include <arpa/inet.h>  // NOLINT
+# include <netdb.h>  // NOLINT
+#endif
+
+#if GTEST_OS_WINDOWS
+# include <windows.h>  // NOLINT
+#endif  // GTEST_OS_WINDOWS
+
+#include "gtest/gtest.h"
+#include "gtest/gtest-spi.h"
+
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
+/* class A needs to have dll-interface to be used by clients of class B */)
+
+namespace testing {
+
+// Declares the flags.
+//
+// We don't want the users to modify this flag in the code, but want
+// Google Test's own unit tests to be able to access it. Therefore we
+// declare it here as opposed to in gtest.h.
+GTEST_DECLARE_bool_(death_test_use_fork);
+
+namespace internal {
+
+// The value of GetTestTypeId() as seen from within the Google Test
+// library.  This is solely for testing GetTestTypeId().
+GTEST_API_ extern const TypeId kTestTypeIdInGoogleTest;
+
+// Names of the flags (needed for parsing Google Test flags).
+const char kAlsoRunDisabledTestsFlag[] = "also_run_disabled_tests";
+const char kBreakOnFailureFlag[] = "break_on_failure";
+const char kCatchExceptionsFlag[] = "catch_exceptions";
+const char kColorFlag[] = "color";
+const char kFailFast[] = "fail_fast";
+const char kFilterFlag[] = "filter";
+const char kListTestsFlag[] = "list_tests";
+const char kOutputFlag[] = "output";
+const char kBriefFlag[] = "brief";
+const char kPrintTimeFlag[] = "print_time";
+const char kPrintUTF8Flag[] = "print_utf8";
+const char kRandomSeedFlag[] = "random_seed";
+const char kRepeatFlag[] = "repeat";
+const char kShuffleFlag[] = "shuffle";
+const char kStackTraceDepthFlag[] = "stack_trace_depth";
+const char kStreamResultToFlag[] = "stream_result_to";
+const char kThrowOnFailureFlag[] = "throw_on_failure";
+const char kFlagfileFlag[] = "flagfile";
+
+// A valid random seed must be in [1, kMaxRandomSeed].
+const int kMaxRandomSeed = 99999;
+
+// g_help_flag is true if and only if the --help flag or an equivalent form
+// is specified on the command line.
+GTEST_API_ extern bool g_help_flag;
+
+// Returns the current time in milliseconds.
+GTEST_API_ TimeInMillis GetTimeInMillis();
+
+// Returns true if and only if Google Test should use colors in the output.
+GTEST_API_ bool ShouldUseColor(bool stdout_is_tty);
+
+// Formats the given time in milliseconds as seconds.
+GTEST_API_ std::string FormatTimeInMillisAsSeconds(TimeInMillis ms);
+
+// Converts the given time in milliseconds to a date string in the ISO 8601
+// format, without the timezone information.  N.B.: due to the use the
+// non-reentrant localtime() function, this function is not thread safe.  Do
+// not use it in any code that can be called from multiple threads.
+GTEST_API_ std::string FormatEpochTimeInMillisAsIso8601(TimeInMillis ms);
+
+// Parses a string for an Int32 flag, in the form of "--flag=value".
+//
+// On success, stores the value of the flag in *value, and returns
+// true.  On failure, returns false without changing *value.
+GTEST_API_ bool ParseInt32Flag(
+    const char* str, const char* flag, int32_t* value);
+
+// Returns a random seed in range [1, kMaxRandomSeed] based on the
+// given --gtest_random_seed flag value.
+inline int GetRandomSeedFromFlag(int32_t random_seed_flag) {
+  const unsigned int raw_seed = (random_seed_flag == 0) ?
+      static_cast<unsigned int>(GetTimeInMillis()) :
+      static_cast<unsigned int>(random_seed_flag);
+
+  // Normalizes the actual seed to range [1, kMaxRandomSeed] such that
+  // it's easy to type.
+  const int normalized_seed =
+      static_cast<int>((raw_seed - 1U) %
+                       static_cast<unsigned int>(kMaxRandomSeed)) + 1;
+  return normalized_seed;
+}
+
+// Returns the first valid random seed after 'seed'.  The behavior is
+// undefined if 'seed' is invalid.  The seed after kMaxRandomSeed is
+// considered to be 1.
+inline int GetNextRandomSeed(int seed) {
+  GTEST_CHECK_(1 <= seed && seed <= kMaxRandomSeed)
+      << "Invalid random seed " << seed << " - must be in [1, "
+      << kMaxRandomSeed << "].";
+  const int next_seed = seed + 1;
+  return (next_seed > kMaxRandomSeed) ? 1 : next_seed;
+}
+
+// This class saves the values of all Google Test flags in its c'tor, and
+// restores them in its d'tor.
+class GTestFlagSaver {
+ public:
+  // The c'tor.
+  GTestFlagSaver() {
+    also_run_disabled_tests_ = GTEST_FLAG(also_run_disabled_tests);
+    break_on_failure_ = GTEST_FLAG(break_on_failure);
+    catch_exceptions_ = GTEST_FLAG(catch_exceptions);
+    color_ = GTEST_FLAG(color);
+    death_test_style_ = GTEST_FLAG(death_test_style);
+    death_test_use_fork_ = GTEST_FLAG(death_test_use_fork);
+    fail_fast_ = GTEST_FLAG(fail_fast);
+    filter_ = GTEST_FLAG(filter);
+    internal_run_death_test_ = GTEST_FLAG(internal_run_death_test);
+    list_tests_ = GTEST_FLAG(list_tests);
+    output_ = GTEST_FLAG(output);
+    brief_ = GTEST_FLAG(brief);
+    print_time_ = GTEST_FLAG(print_time);
+    print_utf8_ = GTEST_FLAG(print_utf8);
+    random_seed_ = GTEST_FLAG(random_seed);
+    repeat_ = GTEST_FLAG(repeat);
+    shuffle_ = GTEST_FLAG(shuffle);
+    stack_trace_depth_ = GTEST_FLAG(stack_trace_depth);
+    stream_result_to_ = GTEST_FLAG(stream_result_to);
+    throw_on_failure_ = GTEST_FLAG(throw_on_failure);
+  }
+
+  // The d'tor is not virtual.  DO NOT INHERIT FROM THIS CLASS.
+  ~GTestFlagSaver() {
+    GTEST_FLAG(also_run_disabled_tests) = also_run_disabled_tests_;
+    GTEST_FLAG(break_on_failure) = break_on_failure_;
+    GTEST_FLAG(catch_exceptions) = catch_exceptions_;
+    GTEST_FLAG(color) = color_;
+    GTEST_FLAG(death_test_style) = death_test_style_;
+    GTEST_FLAG(death_test_use_fork) = death_test_use_fork_;
+    GTEST_FLAG(filter) = filter_;
+    GTEST_FLAG(fail_fast) = fail_fast_;
+    GTEST_FLAG(internal_run_death_test) = internal_run_death_test_;
+    GTEST_FLAG(list_tests) = list_tests_;
+    GTEST_FLAG(output) = output_;
+    GTEST_FLAG(brief) = brief_;
+    GTEST_FLAG(print_time) = print_time_;
+    GTEST_FLAG(print_utf8) = print_utf8_;
+    GTEST_FLAG(random_seed) = random_seed_;
+    GTEST_FLAG(repeat) = repeat_;
+    GTEST_FLAG(shuffle) = shuffle_;
+    GTEST_FLAG(stack_trace_depth) = stack_trace_depth_;
+    GTEST_FLAG(stream_result_to) = stream_result_to_;
+    GTEST_FLAG(throw_on_failure) = throw_on_failure_;
+  }
+
+ private:
+  // Fields for saving the original values of flags.
+  bool also_run_disabled_tests_;
+  bool break_on_failure_;
+  bool catch_exceptions_;
+  std::string color_;
+  std::string death_test_style_;
+  bool death_test_use_fork_;
+  bool fail_fast_;
+  std::string filter_;
+  std::string internal_run_death_test_;
+  bool list_tests_;
+  std::string output_;
+  bool brief_;
+  bool print_time_;
+  bool print_utf8_;
+  int32_t random_seed_;
+  int32_t repeat_;
+  bool shuffle_;
+  int32_t stack_trace_depth_;
+  std::string stream_result_to_;
+  bool throw_on_failure_;
+} GTEST_ATTRIBUTE_UNUSED_;
+
+// Converts a Unicode code point to a narrow string in UTF-8 encoding.
+// code_point parameter is of type UInt32 because wchar_t may not be
+// wide enough to contain a code point.
+// If the code_point is not a valid Unicode code point
+// (i.e. outside of Unicode range U+0 to U+10FFFF) it will be converted
+// to "(Invalid Unicode 0xXXXXXXXX)".
+GTEST_API_ std::string CodePointToUtf8(uint32_t code_point);
+
+// Converts a wide string to a narrow string in UTF-8 encoding.
+// The wide string is assumed to have the following encoding:
+//   UTF-16 if sizeof(wchar_t) == 2 (on Windows, Cygwin)
+//   UTF-32 if sizeof(wchar_t) == 4 (on Linux)
+// Parameter str points to a null-terminated wide string.
+// Parameter num_chars may additionally limit the number
+// of wchar_t characters processed. -1 is used when the entire string
+// should be processed.
+// If the string contains code points that are not valid Unicode code points
+// (i.e. outside of Unicode range U+0 to U+10FFFF) they will be output
+// as '(Invalid Unicode 0xXXXXXXXX)'. If the string is in UTF16 encoding
+// and contains invalid UTF-16 surrogate pairs, values in those pairs
+// will be encoded as individual Unicode characters from Basic Normal Plane.
+GTEST_API_ std::string WideStringToUtf8(const wchar_t* str, int num_chars);
+
+// Reads the GTEST_SHARD_STATUS_FILE environment variable, and creates the file
+// if the variable is present. If a file already exists at this location, this
+// function will write over it. If the variable is present, but the file cannot
+// be created, prints an error and exits.
+void WriteToShardStatusFileIfNeeded();
+
+// Checks whether sharding is enabled by examining the relevant
+// environment variable values. If the variables are present,
+// but inconsistent (e.g., shard_index >= total_shards), prints
+// an error and exits. If in_subprocess_for_death_test, sharding is
+// disabled because it must only be applied to the original test
+// process. Otherwise, we could filter out death tests we intended to execute.
+GTEST_API_ bool ShouldShard(const char* total_shards_str,
+                            const char* shard_index_str,
+                            bool in_subprocess_for_death_test);
+
+// Parses the environment variable var as a 32-bit integer. If it is unset,
+// returns default_val. If it is not a 32-bit integer, prints an error and
+// and aborts.
+GTEST_API_ int32_t Int32FromEnvOrDie(const char* env_var, int32_t default_val);
+
+// Given the total number of shards, the shard index, and the test id,
+// returns true if and only if the test should be run on this shard. The test id
+// is some arbitrary but unique non-negative integer assigned to each test
+// method. Assumes that 0 <= shard_index < total_shards.
+GTEST_API_ bool ShouldRunTestOnShard(
+    int total_shards, int shard_index, int test_id);
+
+// STL container utilities.
+
+// Returns the number of elements in the given container that satisfy
+// the given predicate.
+template <class Container, typename Predicate>
+inline int CountIf(const Container& c, Predicate predicate) {
+  // Implemented as an explicit loop since std::count_if() in libCstd on
+  // Solaris has a non-standard signature.
+  int count = 0;
+  for (typename Container::const_iterator it = c.begin(); it != c.end(); ++it) {
+    if (predicate(*it))
+      ++count;
+  }
+  return count;
+}
+
+// Applies a function/functor to each element in the container.
+template <class Container, typename Functor>
+void ForEach(const Container& c, Functor functor) {
+  std::for_each(c.begin(), c.end(), functor);
+}
+
+// Returns the i-th element of the vector, or default_value if i is not
+// in range [0, v.size()).
+template <typename E>
+inline E GetElementOr(const std::vector<E>& v, int i, E default_value) {
+  return (i < 0 || i >= static_cast<int>(v.size())) ? default_value
+                                                    : v[static_cast<size_t>(i)];
+}
+
+// Performs an in-place shuffle of a range of the vector's elements.
+// 'begin' and 'end' are element indices as an STL-style range;
+// i.e. [begin, end) are shuffled, where 'end' == size() means to
+// shuffle to the end of the vector.
+template <typename E>
+void ShuffleRange(internal::Random* random, int begin, int end,
+                  std::vector<E>* v) {
+  const int size = static_cast<int>(v->size());
+  GTEST_CHECK_(0 <= begin && begin <= size)
+      << "Invalid shuffle range start " << begin << ": must be in range [0, "
+      << size << "].";
+  GTEST_CHECK_(begin <= end && end <= size)
+      << "Invalid shuffle range finish " << end << ": must be in range ["
+      << begin << ", " << size << "].";
+
+  // Fisher-Yates shuffle, from
+  // http://en.wikipedia.org/wiki/Fisher-Yates_shuffle
+  for (int range_width = end - begin; range_width >= 2; range_width--) {
+    const int last_in_range = begin + range_width - 1;
+    const int selected =
+        begin +
+        static_cast<int>(random->Generate(static_cast<uint32_t>(range_width)));
+    std::swap((*v)[static_cast<size_t>(selected)],
+              (*v)[static_cast<size_t>(last_in_range)]);
+  }
+}
+
+// Performs an in-place shuffle of the vector's elements.
+template <typename E>
+inline void Shuffle(internal::Random* random, std::vector<E>* v) {
+  ShuffleRange(random, 0, static_cast<int>(v->size()), v);
+}
+
+// A function for deleting an object.  Handy for being used as a
+// functor.
+template <typename T>
+static void Delete(T* x) {
+  delete x;
+}
+
+// A predicate that checks the key of a TestProperty against a known key.
+//
+// TestPropertyKeyIs is copyable.
+class TestPropertyKeyIs {
+ public:
+  // Constructor.
+  //
+  // TestPropertyKeyIs has NO default constructor.
+  explicit TestPropertyKeyIs(const std::string& key) : key_(key) {}
+
+  // Returns true if and only if the test name of test property matches on key_.
+  bool operator()(const TestProperty& test_property) const {
+    return test_property.key() == key_;
+  }
+
+ private:
+  std::string key_;
+};
+
+// Class UnitTestOptions.
+//
+// This class contains functions for processing options the user
+// specifies when running the tests.  It has only static members.
+//
+// In most cases, the user can specify an option using either an
+// environment variable or a command line flag.  E.g. you can set the
+// test filter using either GTEST_FILTER or --gtest_filter.  If both
+// the variable and the flag are present, the latter overrides the
+// former.
+class GTEST_API_ UnitTestOptions {
+ public:
+  // Functions for processing the gtest_output flag.
+
+  // Returns the output format, or "" for normal printed output.
+  static std::string GetOutputFormat();
+
+  // Returns the absolute path of the requested output file, or the
+  // default (test_detail.xml in the original working directory) if
+  // none was explicitly specified.
+  static std::string GetAbsolutePathToOutputFile();
+
+  // Functions for processing the gtest_filter flag.
+
+  // Returns true if and only if the user-specified filter matches the test
+  // suite name and the test name.
+  static bool FilterMatchesTest(const std::string& test_suite_name,
+                                const std::string& test_name);
+
+#if GTEST_OS_WINDOWS
+  // Function for supporting the gtest_catch_exception flag.
+
+  // Returns EXCEPTION_EXECUTE_HANDLER if Google Test should handle the
+  // given SEH exception, or EXCEPTION_CONTINUE_SEARCH otherwise.
+  // This function is useful as an __except condition.
+  static int GTestShouldProcessSEH(DWORD exception_code);
+#endif  // GTEST_OS_WINDOWS
+
+  // Returns true if "name" matches the ':' separated list of glob-style
+  // filters in "filter".
+  static bool MatchesFilter(const std::string& name, const char* filter);
+};
+
+// Returns the current application's name, removing directory path if that
+// is present.  Used by UnitTestOptions::GetOutputFile.
+GTEST_API_ FilePath GetCurrentExecutableName();
+
+// The role interface for getting the OS stack trace as a string.
+class OsStackTraceGetterInterface {
+ public:
+  OsStackTraceGetterInterface() {}
+  virtual ~OsStackTraceGetterInterface() {}
+
+  // Returns the current OS stack trace as an std::string.  Parameters:
+  //
+  //   max_depth  - the maximum number of stack frames to be included
+  //                in the trace.
+  //   skip_count - the number of top frames to be skipped; doesn't count
+  //                against max_depth.
+  virtual std::string CurrentStackTrace(int max_depth, int skip_count) = 0;
+
+  // UponLeavingGTest() should be called immediately before Google Test calls
+  // user code. It saves some information about the current stack that
+  // CurrentStackTrace() will use to find and hide Google Test stack frames.
+  virtual void UponLeavingGTest() = 0;
+
+  // This string is inserted in place of stack frames that are part of
+  // Google Test's implementation.
+  static const char* const kElidedFramesMarker;
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(OsStackTraceGetterInterface);
+};
+
+// A working implementation of the OsStackTraceGetterInterface interface.
+class OsStackTraceGetter : public OsStackTraceGetterInterface {
+ public:
+  OsStackTraceGetter() {}
+
+  std::string CurrentStackTrace(int max_depth, int skip_count) override;
+  void UponLeavingGTest() override;
+
+ private:
+#if GTEST_HAS_ABSL
+  Mutex mutex_;  // Protects all internal state.
+
+  // We save the stack frame below the frame that calls user code.
+  // We do this because the address of the frame immediately below
+  // the user code changes between the call to UponLeavingGTest()
+  // and any calls to the stack trace code from within the user code.
+  void* caller_frame_ = nullptr;
+#endif  // GTEST_HAS_ABSL
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(OsStackTraceGetter);
+};
+
+// Information about a Google Test trace point.
+struct TraceInfo {
+  const char* file;
+  int line;
+  std::string message;
+};
+
+// This is the default global test part result reporter used in UnitTestImpl.
+// This class should only be used by UnitTestImpl.
+class DefaultGlobalTestPartResultReporter
+  : public TestPartResultReporterInterface {
+ public:
+  explicit DefaultGlobalTestPartResultReporter(UnitTestImpl* unit_test);
+  // Implements the TestPartResultReporterInterface. Reports the test part
+  // result in the current test.
+  void ReportTestPartResult(const TestPartResult& result) override;
+
+ private:
+  UnitTestImpl* const unit_test_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultGlobalTestPartResultReporter);
+};
+
+// This is the default per thread test part result reporter used in
+// UnitTestImpl. This class should only be used by UnitTestImpl.
+class DefaultPerThreadTestPartResultReporter
+    : public TestPartResultReporterInterface {
+ public:
+  explicit DefaultPerThreadTestPartResultReporter(UnitTestImpl* unit_test);
+  // Implements the TestPartResultReporterInterface. The implementation just
+  // delegates to the current global test part result reporter of *unit_test_.
+  void ReportTestPartResult(const TestPartResult& result) override;
+
+ private:
+  UnitTestImpl* const unit_test_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultPerThreadTestPartResultReporter);
+};
+
+// The private implementation of the UnitTest class.  We don't protect
+// the methods under a mutex, as this class is not accessible by a
+// user and the UnitTest class that delegates work to this class does
+// proper locking.
+class GTEST_API_ UnitTestImpl {
+ public:
+  explicit UnitTestImpl(UnitTest* parent);
+  virtual ~UnitTestImpl();
+
+  // There are two different ways to register your own TestPartResultReporter.
+  // You can register your own repoter to listen either only for test results
+  // from the current thread or for results from all threads.
+  // By default, each per-thread test result repoter just passes a new
+  // TestPartResult to the global test result reporter, which registers the
+  // test part result for the currently running test.
+
+  // Returns the global test part result reporter.
+  TestPartResultReporterInterface* GetGlobalTestPartResultReporter();
+
+  // Sets the global test part result reporter.
+  void SetGlobalTestPartResultReporter(
+      TestPartResultReporterInterface* reporter);
+
+  // Returns the test part result reporter for the current thread.
+  TestPartResultReporterInterface* GetTestPartResultReporterForCurrentThread();
+
+  // Sets the test part result reporter for the current thread.
+  void SetTestPartResultReporterForCurrentThread(
+      TestPartResultReporterInterface* reporter);
+
+  // Gets the number of successful test suites.
+  int successful_test_suite_count() const;
+
+  // Gets the number of failed test suites.
+  int failed_test_suite_count() const;
+
+  // Gets the number of all test suites.
+  int total_test_suite_count() const;
+
+  // Gets the number of all test suites that contain at least one test
+  // that should run.
+  int test_suite_to_run_count() const;
+
+  // Gets the number of successful tests.
+  int successful_test_count() const;
+
+  // Gets the number of skipped tests.
+  int skipped_test_count() const;
+
+  // Gets the number of failed tests.
+  int failed_test_count() const;
+
+  // Gets the number of disabled tests that will be reported in the XML report.
+  int reportable_disabled_test_count() const;
+
+  // Gets the number of disabled tests.
+  int disabled_test_count() const;
+
+  // Gets the number of tests to be printed in the XML report.
+  int reportable_test_count() const;
+
+  // Gets the number of all tests.
+  int total_test_count() const;
+
+  // Gets the number of tests that should run.
+  int test_to_run_count() const;
+
+  // Gets the time of the test program start, in ms from the start of the
+  // UNIX epoch.
+  TimeInMillis start_timestamp() const { return start_timestamp_; }
+
+  // Gets the elapsed time, in milliseconds.
+  TimeInMillis elapsed_time() const { return elapsed_time_; }
+
+  // Returns true if and only if the unit test passed (i.e. all test suites
+  // passed).
+  bool Passed() const { return !Failed(); }
+
+  // Returns true if and only if the unit test failed (i.e. some test suite
+  // failed or something outside of all tests failed).
+  bool Failed() const {
+    return failed_test_suite_count() > 0 || ad_hoc_test_result()->Failed();
+  }
+
+  // Gets the i-th test suite among all the test suites. i can range from 0 to
+  // total_test_suite_count() - 1. If i is not in that range, returns NULL.
+  const TestSuite* GetTestSuite(int i) const {
+    const int index = GetElementOr(test_suite_indices_, i, -1);
+    return index < 0 ? nullptr : test_suites_[static_cast<size_t>(i)];
+  }
+
+  //  Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  const TestCase* GetTestCase(int i) const { return GetTestSuite(i); }
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+  // Gets the i-th test suite among all the test suites. i can range from 0 to
+  // total_test_suite_count() - 1. If i is not in that range, returns NULL.
+  TestSuite* GetMutableSuiteCase(int i) {
+    const int index = GetElementOr(test_suite_indices_, i, -1);
+    return index < 0 ? nullptr : test_suites_[static_cast<size_t>(index)];
+  }
+
+  // Provides access to the event listener list.
+  TestEventListeners* listeners() { return &listeners_; }
+
+  // Returns the TestResult for the test that's currently running, or
+  // the TestResult for the ad hoc test if no test is running.
+  TestResult* current_test_result();
+
+  // Returns the TestResult for the ad hoc test.
+  const TestResult* ad_hoc_test_result() const { return &ad_hoc_test_result_; }
+
+  // Sets the OS stack trace getter.
+  //
+  // Does nothing if the input and the current OS stack trace getter
+  // are the same; otherwise, deletes the old getter and makes the
+  // input the current getter.
+  void set_os_stack_trace_getter(OsStackTraceGetterInterface* getter);
+
+  // Returns the current OS stack trace getter if it is not NULL;
+  // otherwise, creates an OsStackTraceGetter, makes it the current
+  // getter, and returns it.
+  OsStackTraceGetterInterface* os_stack_trace_getter();
+
+  // Returns the current OS stack trace as an std::string.
+  //
+  // The maximum number of stack frames to be included is specified by
+  // the gtest_stack_trace_depth flag.  The skip_count parameter
+  // specifies the number of top frames to be skipped, which doesn't
+  // count against the number of frames to be included.
+  //
+  // For example, if Foo() calls Bar(), which in turn calls
+  // CurrentOsStackTraceExceptTop(1), Foo() will be included in the
+  // trace but Bar() and CurrentOsStackTraceExceptTop() won't.
+  std::string CurrentOsStackTraceExceptTop(int skip_count) GTEST_NO_INLINE_;
+
+  // Finds and returns a TestSuite with the given name.  If one doesn't
+  // exist, creates one and returns it.
+  //
+  // Arguments:
+  //
+  //   test_suite_name: name of the test suite
+  //   type_param:      the name of the test's type parameter, or NULL if
+  //                    this is not a typed or a type-parameterized test.
+  //   set_up_tc:       pointer to the function that sets up the test suite
+  //   tear_down_tc:    pointer to the function that tears down the test suite
+  TestSuite* GetTestSuite(const char* test_suite_name, const char* type_param,
+                          internal::SetUpTestSuiteFunc set_up_tc,
+                          internal::TearDownTestSuiteFunc tear_down_tc);
+
+//  Legacy API is deprecated but still available
+#ifndef GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+  TestCase* GetTestCase(const char* test_case_name, const char* type_param,
+                        internal::SetUpTestSuiteFunc set_up_tc,
+                        internal::TearDownTestSuiteFunc tear_down_tc) {
+    return GetTestSuite(test_case_name, type_param, set_up_tc, tear_down_tc);
+  }
+#endif  //  GTEST_REMOVE_LEGACY_TEST_CASEAPI_
+
+  // Adds a TestInfo to the unit test.
+  //
+  // Arguments:
+  //
+  //   set_up_tc:    pointer to the function that sets up the test suite
+  //   tear_down_tc: pointer to the function that tears down the test suite
+  //   test_info:    the TestInfo object
+  void AddTestInfo(internal::SetUpTestSuiteFunc set_up_tc,
+                   internal::TearDownTestSuiteFunc tear_down_tc,
+                   TestInfo* test_info) {
+#if GTEST_HAS_DEATH_TEST
+    // In order to support thread-safe death tests, we need to
+    // remember the original working directory when the test program
+    // was first invoked.  We cannot do this in RUN_ALL_TESTS(), as
+    // the user may have changed the current directory before calling
+    // RUN_ALL_TESTS().  Therefore we capture the current directory in
+    // AddTestInfo(), which is called to register a TEST or TEST_F
+    // before main() is reached.
+    if (original_working_dir_.IsEmpty()) {
+      original_working_dir_.Set(FilePath::GetCurrentDir());
+      GTEST_CHECK_(!original_working_dir_.IsEmpty())
+          << "Failed to get the current working directory.";
+    }
+#endif  // GTEST_HAS_DEATH_TEST
+
+    GetTestSuite(test_info->test_suite_name(), test_info->type_param(),
+                 set_up_tc, tear_down_tc)
+        ->AddTestInfo(test_info);
+  }
+
+  // Returns ParameterizedTestSuiteRegistry object used to keep track of
+  // value-parameterized tests and instantiate and register them.
+  internal::ParameterizedTestSuiteRegistry& parameterized_test_registry() {
+    return parameterized_test_registry_;
+  }
+
+  std::set<std::string>* ignored_parameterized_test_suites() {
+    return &ignored_parameterized_test_suites_;
+  }
+
+  // Returns TypeParameterizedTestSuiteRegistry object used to keep track of
+  // type-parameterized tests and instantiations of them.
+  internal::TypeParameterizedTestSuiteRegistry&
+  type_parameterized_test_registry() {
+    return type_parameterized_test_registry_;
+  }
+
+  // Sets the TestSuite object for the test that's currently running.
+  void set_current_test_suite(TestSuite* a_current_test_suite) {
+    current_test_suite_ = a_current_test_suite;
+  }
+
+  // Sets the TestInfo object for the test that's currently running.  If
+  // current_test_info is NULL, the assertion results will be stored in
+  // ad_hoc_test_result_.
+  void set_current_test_info(TestInfo* a_current_test_info) {
+    current_test_info_ = a_current_test_info;
+  }
+
+  // Registers all parameterized tests defined using TEST_P and
+  // INSTANTIATE_TEST_SUITE_P, creating regular tests for each test/parameter
+  // combination. This method can be called more then once; it has guards
+  // protecting from registering the tests more then once.  If
+  // value-parameterized tests are disabled, RegisterParameterizedTests is
+  // present but does nothing.
+  void RegisterParameterizedTests();
+
+  // Runs all tests in this UnitTest object, prints the result, and
+  // returns true if all tests are successful.  If any exception is
+  // thrown during a test, this test is considered to be failed, but
+  // the rest of the tests will still be run.
+  bool RunAllTests();
+
+  // Clears the results of all tests, except the ad hoc tests.
+  void ClearNonAdHocTestResult() {
+    ForEach(test_suites_, TestSuite::ClearTestSuiteResult);
+  }
+
+  // Clears the results of ad-hoc test assertions.
+  void ClearAdHocTestResult() {
+    ad_hoc_test_result_.Clear();
+  }
+
+  // Adds a TestProperty to the current TestResult object when invoked in a
+  // context of a test or a test suite, or to the global property set. If the
+  // result already contains a property with the same key, the value will be
+  // updated.
+  void RecordProperty(const TestProperty& test_property);
+
+  enum ReactionToSharding {
+    HONOR_SHARDING_PROTOCOL,
+    IGNORE_SHARDING_PROTOCOL
+  };
+
+  // Matches the full name of each test against the user-specified
+  // filter to decide whether the test should run, then records the
+  // result in each TestSuite and TestInfo object.
+  // If shard_tests == HONOR_SHARDING_PROTOCOL, further filters tests
+  // based on sharding variables in the environment.
+  // Returns the number of tests that should run.
+  int FilterTests(ReactionToSharding shard_tests);
+
+  // Prints the names of the tests matching the user-specified filter flag.
+  void ListTestsMatchingFilter();
+
+  const TestSuite* current_test_suite() const { return current_test_suite_; }
+  TestInfo* current_test_info() { return current_test_info_; }
+  const TestInfo* current_test_info() const { return current_test_info_; }
+
+  // Returns the vector of environments that need to be set-up/torn-down
+  // before/after the tests are run.
+  std::vector<Environment*>& environments() { return environments_; }
+
+  // Getters for the per-thread Google Test trace stack.
+  std::vector<TraceInfo>& gtest_trace_stack() {
+    return *(gtest_trace_stack_.pointer());
+  }
+  const std::vector<TraceInfo>& gtest_trace_stack() const {
+    return gtest_trace_stack_.get();
+  }
+
+#if GTEST_HAS_DEATH_TEST
+  void InitDeathTestSubprocessControlInfo() {
+    internal_run_death_test_flag_.reset(ParseInternalRunDeathTestFlag());
+  }
+  // Returns a pointer to the parsed --gtest_internal_run_death_test
+  // flag, or NULL if that flag was not specified.
+  // This information is useful only in a death test child process.
+  // Must not be called before a call to InitGoogleTest.
+  const InternalRunDeathTestFlag* internal_run_death_test_flag() const {
+    return internal_run_death_test_flag_.get();
+  }
+
+  // Returns a pointer to the current death test factory.
+  internal::DeathTestFactory* death_test_factory() {
+    return death_test_factory_.get();
+  }
+
+  void SuppressTestEventsIfInSubprocess();
+
+  friend class ReplaceDeathTestFactory;
+#endif  // GTEST_HAS_DEATH_TEST
+
+  // Initializes the event listener performing XML output as specified by
+  // UnitTestOptions. Must not be called before InitGoogleTest.
+  void ConfigureXmlOutput();
+
+#if GTEST_CAN_STREAM_RESULTS_
+  // Initializes the event listener for streaming test results to a socket.
+  // Must not be called before InitGoogleTest.
+  void ConfigureStreamingOutput();
+#endif
+
+  // Performs initialization dependent upon flag values obtained in
+  // ParseGoogleTestFlagsOnly.  Is called from InitGoogleTest after the call to
+  // ParseGoogleTestFlagsOnly.  In case a user neglects to call InitGoogleTest
+  // this function is also called from RunAllTests.  Since this function can be
+  // called more than once, it has to be idempotent.
+  void PostFlagParsingInit();
+
+  // Gets the random seed used at the start of the current test iteration.
+  int random_seed() const { return random_seed_; }
+
+  // Gets the random number generator.
+  internal::Random* random() { return &random_; }
+
+  // Shuffles all test suites, and the tests within each test suite,
+  // making sure that death tests are still run first.
+  void ShuffleTests();
+
+  // Restores the test suites and tests to their order before the first shuffle.
+  void UnshuffleTests();
+
+  // Returns the value of GTEST_FLAG(catch_exceptions) at the moment
+  // UnitTest::Run() starts.
+  bool catch_exceptions() const { return catch_exceptions_; }
+
+ private:
+  friend class ::testing::UnitTest;
+
+  // Used by UnitTest::Run() to capture the state of
+  // GTEST_FLAG(catch_exceptions) at the moment it starts.
+  void set_catch_exceptions(bool value) { catch_exceptions_ = value; }
+
+  // The UnitTest object that owns this implementation object.
+  UnitTest* const parent_;
+
+  // The working directory when the first TEST() or TEST_F() was
+  // executed.
+  internal::FilePath original_working_dir_;
+
+  // The default test part result reporters.
+  DefaultGlobalTestPartResultReporter default_global_test_part_result_reporter_;
+  DefaultPerThreadTestPartResultReporter
+      default_per_thread_test_part_result_reporter_;
+
+  // Points to (but doesn't own) the global test part result reporter.
+  TestPartResultReporterInterface* global_test_part_result_repoter_;
+
+  // Protects read and write access to global_test_part_result_reporter_.
+  internal::Mutex global_test_part_result_reporter_mutex_;
+
+  // Points to (but doesn't own) the per-thread test part result reporter.
+  internal::ThreadLocal<TestPartResultReporterInterface*>
+      per_thread_test_part_result_reporter_;
+
+  // The vector of environments that need to be set-up/torn-down
+  // before/after the tests are run.
+  std::vector<Environment*> environments_;
+
+  // The vector of TestSuites in their original order.  It owns the
+  // elements in the vector.
+  std::vector<TestSuite*> test_suites_;
+
+  // Provides a level of indirection for the test suite list to allow
+  // easy shuffling and restoring the test suite order.  The i-th
+  // element of this vector is the index of the i-th test suite in the
+  // shuffled order.
+  std::vector<int> test_suite_indices_;
+
+  // ParameterizedTestRegistry object used to register value-parameterized
+  // tests.
+  internal::ParameterizedTestSuiteRegistry parameterized_test_registry_;
+  internal::TypeParameterizedTestSuiteRegistry
+      type_parameterized_test_registry_;
+
+  // The set holding the name of parameterized
+  // test suites that may go uninstantiated.
+  std::set<std::string> ignored_parameterized_test_suites_;
+
+  // Indicates whether RegisterParameterizedTests() has been called already.
+  bool parameterized_tests_registered_;
+
+  // Index of the last death test suite registered.  Initially -1.
+  int last_death_test_suite_;
+
+  // This points to the TestSuite for the currently running test.  It
+  // changes as Google Test goes through one test suite after another.
+  // When no test is running, this is set to NULL and Google Test
+  // stores assertion results in ad_hoc_test_result_.  Initially NULL.
+  TestSuite* current_test_suite_;
+
+  // This points to the TestInfo for the currently running test.  It
+  // changes as Google Test goes through one test after another.  When
+  // no test is running, this is set to NULL and Google Test stores
+  // assertion results in ad_hoc_test_result_.  Initially NULL.
+  TestInfo* current_test_info_;
+
+  // Normally, a user only writes assertions inside a TEST or TEST_F,
+  // or inside a function called by a TEST or TEST_F.  Since Google
+  // Test keeps track of which test is current running, it can
+  // associate such an assertion with the test it belongs to.
+  //
+  // If an assertion is encountered when no TEST or TEST_F is running,
+  // Google Test attributes the assertion result to an imaginary "ad hoc"
+  // test, and records the result in ad_hoc_test_result_.
+  TestResult ad_hoc_test_result_;
+
+  // The list of event listeners that can be used to track events inside
+  // Google Test.
+  TestEventListeners listeners_;
+
+  // The OS stack trace getter.  Will be deleted when the UnitTest
+  // object is destructed.  By default, an OsStackTraceGetter is used,
+  // but the user can set this field to use a custom getter if that is
+  // desired.
+  OsStackTraceGetterInterface* os_stack_trace_getter_;
+
+  // True if and only if PostFlagParsingInit() has been called.
+  bool post_flag_parse_init_performed_;
+
+  // The random number seed used at the beginning of the test run.
+  int random_seed_;
+
+  // Our random number generator.
+  internal::Random random_;
+
+  // The time of the test program start, in ms from the start of the
+  // UNIX epoch.
+  TimeInMillis start_timestamp_;
+
+  // How long the test took to run, in milliseconds.
+  TimeInMillis elapsed_time_;
+
+#if GTEST_HAS_DEATH_TEST
+  // The decomposed components of the gtest_internal_run_death_test flag,
+  // parsed when RUN_ALL_TESTS is called.
+  std::unique_ptr<InternalRunDeathTestFlag> internal_run_death_test_flag_;
+  std::unique_ptr<internal::DeathTestFactory> death_test_factory_;
+#endif  // GTEST_HAS_DEATH_TEST
+
+  // A per-thread stack of traces created by the SCOPED_TRACE() macro.
+  internal::ThreadLocal<std::vector<TraceInfo> > gtest_trace_stack_;
+
+  // The value of GTEST_FLAG(catch_exceptions) at the moment RunAllTests()
+  // starts.
+  bool catch_exceptions_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(UnitTestImpl);
+};  // class UnitTestImpl
+
+// Convenience function for accessing the global UnitTest
+// implementation object.
+inline UnitTestImpl* GetUnitTestImpl() {
+  return UnitTest::GetInstance()->impl();
+}
+
+#if GTEST_USES_SIMPLE_RE
+
+// Internal helper functions for implementing the simple regular
+// expression matcher.
+GTEST_API_ bool IsInSet(char ch, const char* str);
+GTEST_API_ bool IsAsciiDigit(char ch);
+GTEST_API_ bool IsAsciiPunct(char ch);
+GTEST_API_ bool IsRepeat(char ch);
+GTEST_API_ bool IsAsciiWhiteSpace(char ch);
+GTEST_API_ bool IsAsciiWordChar(char ch);
+GTEST_API_ bool IsValidEscape(char ch);
+GTEST_API_ bool AtomMatchesChar(bool escaped, char pattern, char ch);
+GTEST_API_ bool ValidateRegex(const char* regex);
+GTEST_API_ bool MatchRegexAtHead(const char* regex, const char* str);
+GTEST_API_ bool MatchRepetitionAndRegexAtHead(
+    bool escaped, char ch, char repeat, const char* regex, const char* str);
+GTEST_API_ bool MatchRegexAnywhere(const char* regex, const char* str);
+
+#endif  // GTEST_USES_SIMPLE_RE
+
+// Parses the command line for Google Test flags, without initializing
+// other parts of Google Test.
+GTEST_API_ void ParseGoogleTestFlagsOnly(int* argc, char** argv);
+GTEST_API_ void ParseGoogleTestFlagsOnly(int* argc, wchar_t** argv);
+
+#if GTEST_HAS_DEATH_TEST
+
+// Returns the message describing the last system error, regardless of the
+// platform.
+GTEST_API_ std::string GetLastErrnoDescription();
+
+// Attempts to parse a string into a positive integer pointed to by the
+// number parameter.  Returns true if that is possible.
+// GTEST_HAS_DEATH_TEST implies that we have ::std::string, so we can use
+// it here.
+template <typename Integer>
+bool ParseNaturalNumber(const ::std::string& str, Integer* number) {
+  // Fail fast if the given string does not begin with a digit;
+  // this bypasses strtoXXX's "optional leading whitespace and plus
+  // or minus sign" semantics, which are undesirable here.
+  if (str.empty() || !IsDigit(str[0])) {
+    return false;
+  }
+  errno = 0;
+
+  char* end;
+  // BiggestConvertible is the largest integer type that system-provided
+  // string-to-number conversion routines can return.
+  using BiggestConvertible = unsigned long long;  // NOLINT
+
+  const BiggestConvertible parsed = strtoull(str.c_str(), &end, 10);  // NOLINT
+  const bool parse_success = *end == '\0' && errno == 0;
+
+  GTEST_CHECK_(sizeof(Integer) <= sizeof(parsed));
+
+  const Integer result = static_cast<Integer>(parsed);
+  if (parse_success && static_cast<BiggestConvertible>(result) == parsed) {
+    *number = result;
+    return true;
+  }
+  return false;
+}
+#endif  // GTEST_HAS_DEATH_TEST
+
+// TestResult contains some private methods that should be hidden from
+// Google Test user but are required for testing. This class allow our tests
+// to access them.
+//
+// This class is supplied only for the purpose of testing Google Test's own
+// constructs. Do not use it in user tests, either directly or indirectly.
+class TestResultAccessor {
+ public:
+  static void RecordProperty(TestResult* test_result,
+                             const std::string& xml_element,
+                             const TestProperty& property) {
+    test_result->RecordProperty(xml_element, property);
+  }
+
+  static void ClearTestPartResults(TestResult* test_result) {
+    test_result->ClearTestPartResults();
+  }
+
+  static const std::vector<testing::TestPartResult>& test_part_results(
+      const TestResult& test_result) {
+    return test_result.test_part_results();
+  }
+};
+
+#if GTEST_CAN_STREAM_RESULTS_
+
+// Streams test results to the given port on the given host machine.
+class StreamingListener : public EmptyTestEventListener {
+ public:
+  // Abstract base class for writing strings to a socket.
+  class AbstractSocketWriter {
+   public:
+    virtual ~AbstractSocketWriter() {}
+
+    // Sends a string to the socket.
+    virtual void Send(const std::string& message) = 0;
+
+    // Closes the socket.
+    virtual void CloseConnection() {}
+
+    // Sends a string and a newline to the socket.
+    void SendLn(const std::string& message) { Send(message + "\n"); }
+  };
+
+  // Concrete class for actually writing strings to a socket.
+  class SocketWriter : public AbstractSocketWriter {
+   public:
+    SocketWriter(const std::string& host, const std::string& port)
+        : sockfd_(-1), host_name_(host), port_num_(port) {
+      MakeConnection();
+    }
+
+    ~SocketWriter() override {
+      if (sockfd_ != -1)
+        CloseConnection();
+    }
+
+    // Sends a string to the socket.
+    void Send(const std::string& message) override {
+      GTEST_CHECK_(sockfd_ != -1)
+          << "Send() can be called only when there is a connection.";
+
+      const auto len = static_cast<size_t>(message.length());
+      if (write(sockfd_, message.c_str(), len) != static_cast<ssize_t>(len)) {
+        GTEST_LOG_(WARNING)
+            << "stream_result_to: failed to stream to "
+            << host_name_ << ":" << port_num_;
+      }
+    }
+
+   private:
+    // Creates a client socket and connects to the server.
+    void MakeConnection();
+
+    // Closes the socket.
+    void CloseConnection() override {
+      GTEST_CHECK_(sockfd_ != -1)
+          << "CloseConnection() can be called only when there is a connection.";
+
+      close(sockfd_);
+      sockfd_ = -1;
+    }
+
+    int sockfd_;  // socket file descriptor
+    const std::string host_name_;
+    const std::string port_num_;
+
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(SocketWriter);
+  };  // class SocketWriter
+
+  // Escapes '=', '&', '%', and '\n' characters in str as "%xx".
+  static std::string UrlEncode(const char* str);
+
+  StreamingListener(const std::string& host, const std::string& port)
+      : socket_writer_(new SocketWriter(host, port)) {
+    Start();
+  }
+
+  explicit StreamingListener(AbstractSocketWriter* socket_writer)
+      : socket_writer_(socket_writer) { Start(); }
+
+  void OnTestProgramStart(const UnitTest& /* unit_test */) override {
+    SendLn("event=TestProgramStart");
+  }
+
+  void OnTestProgramEnd(const UnitTest& unit_test) override {
+    // Note that Google Test current only report elapsed time for each
+    // test iteration, not for the entire test program.
+    SendLn("event=TestProgramEnd&passed=" + FormatBool(unit_test.Passed()));
+
+    // Notify the streaming server to stop.
+    socket_writer_->CloseConnection();
+  }
+
+  void OnTestIterationStart(const UnitTest& /* unit_test */,
+                            int iteration) override {
+    SendLn("event=TestIterationStart&iteration=" +
+           StreamableToString(iteration));
+  }
+
+  void OnTestIterationEnd(const UnitTest& unit_test,
+                          int /* iteration */) override {
+    SendLn("event=TestIterationEnd&passed=" +
+           FormatBool(unit_test.Passed()) + "&elapsed_time=" +
+           StreamableToString(unit_test.elapsed_time()) + "ms");
+  }
+
+  // Note that "event=TestCaseStart" is a wire format and has to remain
+  // "case" for compatibility
+  void OnTestCaseStart(const TestCase& test_case) override {
+    SendLn(std::string("event=TestCaseStart&name=") + test_case.name());
+  }
+
+  // Note that "event=TestCaseEnd" is a wire format and has to remain
+  // "case" for compatibility
+  void OnTestCaseEnd(const TestCase& test_case) override {
+    SendLn("event=TestCaseEnd&passed=" + FormatBool(test_case.Passed()) +
+           "&elapsed_time=" + StreamableToString(test_case.elapsed_time()) +
+           "ms");
+  }
+
+  void OnTestStart(const TestInfo& test_info) override {
+    SendLn(std::string("event=TestStart&name=") + test_info.name());
+  }
+
+  void OnTestEnd(const TestInfo& test_info) override {
+    SendLn("event=TestEnd&passed=" +
+           FormatBool((test_info.result())->Passed()) +
+           "&elapsed_time=" +
+           StreamableToString((test_info.result())->elapsed_time()) + "ms");
+  }
+
+  void OnTestPartResult(const TestPartResult& test_part_result) override {
+    const char* file_name = test_part_result.file_name();
+    if (file_name == nullptr) file_name = "";
+    SendLn("event=TestPartResult&file=" + UrlEncode(file_name) +
+           "&line=" + StreamableToString(test_part_result.line_number()) +
+           "&message=" + UrlEncode(test_part_result.message()));
+  }
+
+ private:
+  // Sends the given message and a newline to the socket.
+  void SendLn(const std::string& message) { socket_writer_->SendLn(message); }
+
+  // Called at the start of streaming to notify the receiver what
+  // protocol we are using.
+  void Start() { SendLn("gtest_streaming_protocol_version=1.0"); }
+
+  std::string FormatBool(bool value) { return value ? "1" : "0"; }
+
+  const std::unique_ptr<AbstractSocketWriter> socket_writer_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(StreamingListener);
+};  // class StreamingListener
+
+#endif  // GTEST_CAN_STREAM_RESULTS_
+
+}  // namespace internal
+}  // namespace testing
+
+GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
+
+#endif  // GOOGLETEST_SRC_GTEST_INTERNAL_INL_H_
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/src/gtest_main.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/src/gtest_main.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/src/gtest_main.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/src/gtest_main.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,54 @@
+// Copyright 2006, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include <cstdio>
+#include "gtest/gtest.h"
+
+#if GTEST_OS_ESP8266 || GTEST_OS_ESP32
+#if GTEST_OS_ESP8266
+extern "C" {
+#endif
+void setup() {
+  testing::InitGoogleTest();
+}
+
+void loop() { RUN_ALL_TESTS(); }
+
+#if GTEST_OS_ESP8266
+}
+#endif
+
+#else
+
+GTEST_API_ int main(int argc, char **argv) {
+  printf("Running main() from %s\n", __FILE__);
+  testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}
+#endif
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/src/gtest-matchers.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/src/gtest-matchers.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/src/gtest-matchers.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/src/gtest-matchers.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,97 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// The Google C++ Testing and Mocking Framework (Google Test)
+//
+// This file implements just enough of the matcher interface to allow
+// EXPECT_DEATH and friends to accept a matcher argument.
+
+#include "gtest/internal/gtest-internal.h"
+#include "gtest/internal/gtest-port.h"
+#include "gtest/gtest-matchers.h"
+
+#include <string>
+
+namespace testing {
+
+// Constructs a matcher that matches a const std::string& whose value is
+// equal to s.
+Matcher<const std::string&>::Matcher(const std::string& s) { *this = Eq(s); }
+
+// Constructs a matcher that matches a const std::string& whose value is
+// equal to s.
+Matcher<const std::string&>::Matcher(const char* s) {
+  *this = Eq(std::string(s));
+}
+
+// Constructs a matcher that matches a std::string whose value is equal to
+// s.
+Matcher<std::string>::Matcher(const std::string& s) { *this = Eq(s); }
+
+// Constructs a matcher that matches a std::string whose value is equal to
+// s.
+Matcher<std::string>::Matcher(const char* s) { *this = Eq(std::string(s)); }
+
+#if GTEST_INTERNAL_HAS_STRING_VIEW
+// Constructs a matcher that matches a const StringView& whose value is
+// equal to s.
+Matcher<const internal::StringView&>::Matcher(const std::string& s) {
+  *this = Eq(s);
+}
+
+// Constructs a matcher that matches a const StringView& whose value is
+// equal to s.
+Matcher<const internal::StringView&>::Matcher(const char* s) {
+  *this = Eq(std::string(s));
+}
+
+// Constructs a matcher that matches a const StringView& whose value is
+// equal to s.
+Matcher<const internal::StringView&>::Matcher(internal::StringView s) {
+  *this = Eq(std::string(s));
+}
+
+// Constructs a matcher that matches a StringView whose value is equal to
+// s.
+Matcher<internal::StringView>::Matcher(const std::string& s) { *this = Eq(s); }
+
+// Constructs a matcher that matches a StringView whose value is equal to
+// s.
+Matcher<internal::StringView>::Matcher(const char* s) {
+  *this = Eq(std::string(s));
+}
+
+// Constructs a matcher that matches a StringView whose value is equal to
+// s.
+Matcher<internal::StringView>::Matcher(internal::StringView s) {
+  *this = Eq(std::string(s));
+}
+#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
+
+}  // namespace testing
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/src/gtest-port.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/src/gtest-port.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/src/gtest-port.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/src/gtest-port.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,1433 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+#include "gtest/internal/gtest-port.h"
+
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <cstdint>
+#include <fstream>
+#include <memory>
+
+#if GTEST_OS_WINDOWS
+# include <windows.h>
+# include <io.h>
+# include <sys/stat.h>
+# include <map>  // Used in ThreadLocal.
+# ifdef _MSC_VER
+#  include <crtdbg.h>
+# endif  // _MSC_VER
+#else
+# include <unistd.h>
+#endif  // GTEST_OS_WINDOWS
+
+#if GTEST_OS_MAC
+# include <mach/mach_init.h>
+# include <mach/task.h>
+# include <mach/vm_map.h>
+#endif  // GTEST_OS_MAC
+
+#if GTEST_OS_DRAGONFLY || GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD || \
+    GTEST_OS_NETBSD || GTEST_OS_OPENBSD
+# include <sys/sysctl.h>
+# if GTEST_OS_DRAGONFLY || GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD
+#  include <sys/user.h>
+# endif
+#endif
+
+#if GTEST_OS_QNX
+# include <devctl.h>
+# include <fcntl.h>
+# include <sys/procfs.h>
+#endif  // GTEST_OS_QNX
+
+#if GTEST_OS_AIX
+# include <procinfo.h>
+# include <sys/types.h>
+#endif  // GTEST_OS_AIX
+
+#if GTEST_OS_FUCHSIA
+# include <zircon/process.h>
+# include <zircon/syscalls.h>
+#endif  // GTEST_OS_FUCHSIA
+
+#include "gtest/gtest-spi.h"
+#include "gtest/gtest-message.h"
+#include "gtest/internal/gtest-internal.h"
+#include "gtest/internal/gtest-string.h"
+#include "src/gtest-internal-inl.h"
+
+namespace testing {
+namespace internal {
+
+#if defined(_MSC_VER) || defined(__BORLANDC__)
+// MSVC and C++Builder do not provide a definition of STDERR_FILENO.
+const int kStdOutFileno = 1;
+const int kStdErrFileno = 2;
+#else
+const int kStdOutFileno = STDOUT_FILENO;
+const int kStdErrFileno = STDERR_FILENO;
+#endif  // _MSC_VER
+
+#if GTEST_OS_LINUX
+
+namespace {
+template <typename T>
+T ReadProcFileField(const std::string& filename, int field) {
+  std::string dummy;
+  std::ifstream file(filename.c_str());
+  while (field-- > 0) {
+    file >> dummy;
+  }
+  T output = 0;
+  file >> output;
+  return output;
+}
+}  // namespace
+
+// Returns the number of active threads, or 0 when there is an error.
+size_t GetThreadCount() {
+  const std::string filename =
+      (Message() << "/proc/" << getpid() << "/stat").GetString();
+  return ReadProcFileField<size_t>(filename, 19);
+}
+
+#elif GTEST_OS_MAC
+
+size_t GetThreadCount() {
+  const task_t task = mach_task_self();
+  mach_msg_type_number_t thread_count;
+  thread_act_array_t thread_list;
+  const kern_return_t status = task_threads(task, &thread_list, &thread_count);
+  if (status == KERN_SUCCESS) {
+    // task_threads allocates resources in thread_list and we need to free them
+    // to avoid leaks.
+    vm_deallocate(task,
+                  reinterpret_cast<vm_address_t>(thread_list),
+                  sizeof(thread_t) * thread_count);
+    return static_cast<size_t>(thread_count);
+  } else {
+    return 0;
+  }
+}
+
+#elif GTEST_OS_DRAGONFLY || GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD || \
+      GTEST_OS_NETBSD
+
+#if GTEST_OS_NETBSD
+#undef KERN_PROC
+#define KERN_PROC KERN_PROC2
+#define kinfo_proc kinfo_proc2
+#endif
+
+#if GTEST_OS_DRAGONFLY
+#define KP_NLWP(kp) (kp.kp_nthreads)
+#elif GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD
+#define KP_NLWP(kp) (kp.ki_numthreads)
+#elif GTEST_OS_NETBSD
+#define KP_NLWP(kp) (kp.p_nlwps)
+#endif
+
+// Returns the number of threads running in the process, or 0 to indicate that
+// we cannot detect it.
+size_t GetThreadCount() {
+  int mib[] = {
+    CTL_KERN,
+    KERN_PROC,
+    KERN_PROC_PID,
+    getpid(),
+#if GTEST_OS_NETBSD
+    sizeof(struct kinfo_proc),
+    1,
+#endif
+  };
+  u_int miblen = sizeof(mib) / sizeof(mib[0]);
+  struct kinfo_proc info;
+  size_t size = sizeof(info);
+  if (sysctl(mib, miblen, &info, &size, NULL, 0)) {
+    return 0;
+  }
+  return static_cast<size_t>(KP_NLWP(info));
+}
+#elif GTEST_OS_OPENBSD
+
+// Returns the number of threads running in the process, or 0 to indicate that
+// we cannot detect it.
+size_t GetThreadCount() {
+  int mib[] = {
+    CTL_KERN,
+    KERN_PROC,
+    KERN_PROC_PID | KERN_PROC_SHOW_THREADS,
+    getpid(),
+    sizeof(struct kinfo_proc),
+    0,
+  };
+  u_int miblen = sizeof(mib) / sizeof(mib[0]);
+
+  // get number of structs
+  size_t size;
+  if (sysctl(mib, miblen, NULL, &size, NULL, 0)) {
+    return 0;
+  }
+
+  mib[5] = static_cast<int>(size / static_cast<size_t>(mib[4]));
+
+  // populate array of structs
+  struct kinfo_proc info[mib[5]];
+  if (sysctl(mib, miblen, &info, &size, NULL, 0)) {
+    return 0;
+  }
+
+  // exclude empty members
+  size_t nthreads = 0;
+  for (size_t i = 0; i < size / static_cast<size_t>(mib[4]); i++) {
+    if (info[i].p_tid != -1)
+      nthreads++;
+  }
+  return nthreads;
+}
+
+#elif GTEST_OS_QNX
+
+// Returns the number of threads running in the process, or 0 to indicate that
+// we cannot detect it.
+size_t GetThreadCount() {
+  const int fd = open("/proc/self/as", O_RDONLY);
+  if (fd < 0) {
+    return 0;
+  }
+  procfs_info process_info;
+  const int status =
+      devctl(fd, DCMD_PROC_INFO, &process_info, sizeof(process_info), nullptr);
+  close(fd);
+  if (status == EOK) {
+    return static_cast<size_t>(process_info.num_threads);
+  } else {
+    return 0;
+  }
+}
+
+#elif GTEST_OS_AIX
+
+size_t GetThreadCount() {
+  struct procentry64 entry;
+  pid_t pid = getpid();
+  int status = getprocs64(&entry, sizeof(entry), nullptr, 0, &pid, 1);
+  if (status == 1) {
+    return entry.pi_thcount;
+  } else {
+    return 0;
+  }
+}
+
+#elif GTEST_OS_FUCHSIA
+
+size_t GetThreadCount() {
+  int dummy_buffer;
+  size_t avail;
+  zx_status_t status = zx_object_get_info(
+      zx_process_self(),
+      ZX_INFO_PROCESS_THREADS,
+      &dummy_buffer,
+      0,
+      nullptr,
+      &avail);
+  if (status == ZX_OK) {
+    return avail;
+  } else {
+    return 0;
+  }
+}
+
+#else
+
+size_t GetThreadCount() {
+  // There's no portable way to detect the number of threads, so we just
+  // return 0 to indicate that we cannot detect it.
+  return 0;
+}
+
+#endif  // GTEST_OS_LINUX
+
+#if GTEST_IS_THREADSAFE && GTEST_OS_WINDOWS
+
+void SleepMilliseconds(int n) {
+  ::Sleep(static_cast<DWORD>(n));
+}
+
+AutoHandle::AutoHandle()
+    : handle_(INVALID_HANDLE_VALUE) {}
+
+AutoHandle::AutoHandle(Handle handle)
+    : handle_(handle) {}
+
+AutoHandle::~AutoHandle() {
+  Reset();
+}
+
+AutoHandle::Handle AutoHandle::Get() const {
+  return handle_;
+}
+
+void AutoHandle::Reset() {
+  Reset(INVALID_HANDLE_VALUE);
+}
+
+void AutoHandle::Reset(HANDLE handle) {
+  // Resetting with the same handle we already own is invalid.
+  if (handle_ != handle) {
+    if (IsCloseable()) {
+      ::CloseHandle(handle_);
+    }
+    handle_ = handle;
+  } else {
+    GTEST_CHECK_(!IsCloseable())
+        << "Resetting a valid handle to itself is likely a programmer error "
+            "and thus not allowed.";
+  }
+}
+
+bool AutoHandle::IsCloseable() const {
+  // Different Windows APIs may use either of these values to represent an
+  // invalid handle.
+  return handle_ != nullptr && handle_ != INVALID_HANDLE_VALUE;
+}
+
+Notification::Notification()
+    : event_(::CreateEvent(nullptr,     // Default security attributes.
+                           TRUE,        // Do not reset automatically.
+                           FALSE,       // Initially unset.
+                           nullptr)) {  // Anonymous event.
+  GTEST_CHECK_(event_.Get() != nullptr);
+}
+
+void Notification::Notify() {
+  GTEST_CHECK_(::SetEvent(event_.Get()) != FALSE);
+}
+
+void Notification::WaitForNotification() {
+  GTEST_CHECK_(
+      ::WaitForSingleObject(event_.Get(), INFINITE) == WAIT_OBJECT_0);
+}
+
+Mutex::Mutex()
+    : owner_thread_id_(0),
+      type_(kDynamic),
+      critical_section_init_phase_(0),
+      critical_section_(new CRITICAL_SECTION) {
+  ::InitializeCriticalSection(critical_section_);
+}
+
+Mutex::~Mutex() {
+  // Static mutexes are leaked intentionally. It is not thread-safe to try
+  // to clean them up.
+  if (type_ == kDynamic) {
+    ::DeleteCriticalSection(critical_section_);
+    delete critical_section_;
+    critical_section_ = nullptr;
+  }
+}
+
+void Mutex::Lock() {
+  ThreadSafeLazyInit();
+  ::EnterCriticalSection(critical_section_);
+  owner_thread_id_ = ::GetCurrentThreadId();
+}
+
+void Mutex::Unlock() {
+  ThreadSafeLazyInit();
+  // We don't protect writing to owner_thread_id_ here, as it's the
+  // caller's responsibility to ensure that the current thread holds the
+  // mutex when this is called.
+  owner_thread_id_ = 0;
+  ::LeaveCriticalSection(critical_section_);
+}
+
+// Does nothing if the current thread holds the mutex. Otherwise, crashes
+// with high probability.
+void Mutex::AssertHeld() {
+  ThreadSafeLazyInit();
+  GTEST_CHECK_(owner_thread_id_ == ::GetCurrentThreadId())
+      << "The current thread is not holding the mutex @" << this;
+}
+
+namespace {
+
+#ifdef _MSC_VER
+// Use the RAII idiom to flag mem allocs that are intentionally never
+// deallocated. The motivation is to silence the false positive mem leaks
+// that are reported by the debug version of MS's CRT which can only detect
+// if an alloc is missing a matching deallocation.
+// Example:
+//    MemoryIsNotDeallocated memory_is_not_deallocated;
+//    critical_section_ = new CRITICAL_SECTION;
+//
+class MemoryIsNotDeallocated
+{
+ public:
+  MemoryIsNotDeallocated() : old_crtdbg_flag_(0) {
+    old_crtdbg_flag_ = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
+    // Set heap allocation block type to _IGNORE_BLOCK so that MS debug CRT
+    // doesn't report mem leak if there's no matching deallocation.
+    _CrtSetDbgFlag(old_crtdbg_flag_ & ~_CRTDBG_ALLOC_MEM_DF);
+  }
+
+  ~MemoryIsNotDeallocated() {
+    // Restore the original _CRTDBG_ALLOC_MEM_DF flag
+    _CrtSetDbgFlag(old_crtdbg_flag_);
+  }
+
+ private:
+  int old_crtdbg_flag_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(MemoryIsNotDeallocated);
+};
+#endif  // _MSC_VER
+
+}  // namespace
+
+// Initializes owner_thread_id_ and critical_section_ in static mutexes.
+void Mutex::ThreadSafeLazyInit() {
+  // Dynamic mutexes are initialized in the constructor.
+  if (type_ == kStatic) {
+    switch (
+        ::InterlockedCompareExchange(&critical_section_init_phase_, 1L, 0L)) {
+      case 0:
+        // If critical_section_init_phase_ was 0 before the exchange, we
+        // are the first to test it and need to perform the initialization.
+        owner_thread_id_ = 0;
+        {
+          // Use RAII to flag that following mem alloc is never deallocated.
+#ifdef _MSC_VER
+          MemoryIsNotDeallocated memory_is_not_deallocated;
+#endif  // _MSC_VER
+          critical_section_ = new CRITICAL_SECTION;
+        }
+        ::InitializeCriticalSection(critical_section_);
+        // Updates the critical_section_init_phase_ to 2 to signal
+        // initialization complete.
+        GTEST_CHECK_(::InterlockedCompareExchange(
+                          &critical_section_init_phase_, 2L, 1L) ==
+                      1L);
+        break;
+      case 1:
+        // Somebody else is already initializing the mutex; spin until they
+        // are done.
+        while (::InterlockedCompareExchange(&critical_section_init_phase_,
+                                            2L,
+                                            2L) != 2L) {
+          // Possibly yields the rest of the thread's time slice to other
+          // threads.
+          ::Sleep(0);
+        }
+        break;
+
+      case 2:
+        break;  // The mutex is already initialized and ready for use.
+
+      default:
+        GTEST_CHECK_(false)
+            << "Unexpected value of critical_section_init_phase_ "
+            << "while initializing a static mutex.";
+    }
+  }
+}
+
+namespace {
+
+class ThreadWithParamSupport : public ThreadWithParamBase {
+ public:
+  static HANDLE CreateThread(Runnable* runnable,
+                             Notification* thread_can_start) {
+    ThreadMainParam* param = new ThreadMainParam(runnable, thread_can_start);
+    DWORD thread_id;
+    HANDLE thread_handle = ::CreateThread(
+        nullptr,  // Default security.
+        0,        // Default stack size.
+        &ThreadWithParamSupport::ThreadMain,
+        param,        // Parameter to ThreadMainStatic
+        0x0,          // Default creation flags.
+        &thread_id);  // Need a valid pointer for the call to work under Win98.
+    GTEST_CHECK_(thread_handle != nullptr)
+        << "CreateThread failed with error " << ::GetLastError() << ".";
+    if (thread_handle == nullptr) {
+      delete param;
+    }
+    return thread_handle;
+  }
+
+ private:
+  struct ThreadMainParam {
+    ThreadMainParam(Runnable* runnable, Notification* thread_can_start)
+        : runnable_(runnable),
+          thread_can_start_(thread_can_start) {
+    }
+    std::unique_ptr<Runnable> runnable_;
+    // Does not own.
+    Notification* thread_can_start_;
+  };
+
+  static DWORD WINAPI ThreadMain(void* ptr) {
+    // Transfers ownership.
+    std::unique_ptr<ThreadMainParam> param(static_cast<ThreadMainParam*>(ptr));
+    if (param->thread_can_start_ != nullptr)
+      param->thread_can_start_->WaitForNotification();
+    param->runnable_->Run();
+    return 0;
+  }
+
+  // Prohibit instantiation.
+  ThreadWithParamSupport();
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadWithParamSupport);
+};
+
+}  // namespace
+
+ThreadWithParamBase::ThreadWithParamBase(Runnable *runnable,
+                                         Notification* thread_can_start)
+      : thread_(ThreadWithParamSupport::CreateThread(runnable,
+                                                     thread_can_start)) {
+}
+
+ThreadWithParamBase::~ThreadWithParamBase() {
+  Join();
+}
+
+void ThreadWithParamBase::Join() {
+  GTEST_CHECK_(::WaitForSingleObject(thread_.Get(), INFINITE) == WAIT_OBJECT_0)
+      << "Failed to join the thread with error " << ::GetLastError() << ".";
+}
+
+// Maps a thread to a set of ThreadIdToThreadLocals that have values
+// instantiated on that thread and notifies them when the thread exits.  A
+// ThreadLocal instance is expected to persist until all threads it has
+// values on have terminated.
+class ThreadLocalRegistryImpl {
+ public:
+  // Registers thread_local_instance as having value on the current thread.
+  // Returns a value that can be used to identify the thread from other threads.
+  static ThreadLocalValueHolderBase* GetValueOnCurrentThread(
+      const ThreadLocalBase* thread_local_instance) {
+#ifdef _MSC_VER
+    MemoryIsNotDeallocated memory_is_not_deallocated;
+#endif  // _MSC_VER
+    DWORD current_thread = ::GetCurrentThreadId();
+    MutexLock lock(&mutex_);
+    ThreadIdToThreadLocals* const thread_to_thread_locals =
+        GetThreadLocalsMapLocked();
+    ThreadIdToThreadLocals::iterator thread_local_pos =
+        thread_to_thread_locals->find(current_thread);
+    if (thread_local_pos == thread_to_thread_locals->end()) {
+      thread_local_pos = thread_to_thread_locals->insert(
+          std::make_pair(current_thread, ThreadLocalValues())).first;
+      StartWatcherThreadFor(current_thread);
+    }
+    ThreadLocalValues& thread_local_values = thread_local_pos->second;
+    ThreadLocalValues::iterator value_pos =
+        thread_local_values.find(thread_local_instance);
+    if (value_pos == thread_local_values.end()) {
+      value_pos =
+          thread_local_values
+              .insert(std::make_pair(
+                  thread_local_instance,
+                  std::shared_ptr<ThreadLocalValueHolderBase>(
+                      thread_local_instance->NewValueForCurrentThread())))
+              .first;
+    }
+    return value_pos->second.get();
+  }
+
+  static void OnThreadLocalDestroyed(
+      const ThreadLocalBase* thread_local_instance) {
+    std::vector<std::shared_ptr<ThreadLocalValueHolderBase> > value_holders;
+    // Clean up the ThreadLocalValues data structure while holding the lock, but
+    // defer the destruction of the ThreadLocalValueHolderBases.
+    {
+      MutexLock lock(&mutex_);
+      ThreadIdToThreadLocals* const thread_to_thread_locals =
+          GetThreadLocalsMapLocked();
+      for (ThreadIdToThreadLocals::iterator it =
+          thread_to_thread_locals->begin();
+          it != thread_to_thread_locals->end();
+          ++it) {
+        ThreadLocalValues& thread_local_values = it->second;
+        ThreadLocalValues::iterator value_pos =
+            thread_local_values.find(thread_local_instance);
+        if (value_pos != thread_local_values.end()) {
+          value_holders.push_back(value_pos->second);
+          thread_local_values.erase(value_pos);
+          // This 'if' can only be successful at most once, so theoretically we
+          // could break out of the loop here, but we don't bother doing so.
+        }
+      }
+    }
+    // Outside the lock, let the destructor for 'value_holders' deallocate the
+    // ThreadLocalValueHolderBases.
+  }
+
+  static void OnThreadExit(DWORD thread_id) {
+    GTEST_CHECK_(thread_id != 0) << ::GetLastError();
+    std::vector<std::shared_ptr<ThreadLocalValueHolderBase> > value_holders;
+    // Clean up the ThreadIdToThreadLocals data structure while holding the
+    // lock, but defer the destruction of the ThreadLocalValueHolderBases.
+    {
+      MutexLock lock(&mutex_);
+      ThreadIdToThreadLocals* const thread_to_thread_locals =
+          GetThreadLocalsMapLocked();
+      ThreadIdToThreadLocals::iterator thread_local_pos =
+          thread_to_thread_locals->find(thread_id);
+      if (thread_local_pos != thread_to_thread_locals->end()) {
+        ThreadLocalValues& thread_local_values = thread_local_pos->second;
+        for (ThreadLocalValues::iterator value_pos =
+            thread_local_values.begin();
+            value_pos != thread_local_values.end();
+            ++value_pos) {
+          value_holders.push_back(value_pos->second);
+        }
+        thread_to_thread_locals->erase(thread_local_pos);
+      }
+    }
+    // Outside the lock, let the destructor for 'value_holders' deallocate the
+    // ThreadLocalValueHolderBases.
+  }
+
+ private:
+  // In a particular thread, maps a ThreadLocal object to its value.
+  typedef std::map<const ThreadLocalBase*,
+                   std::shared_ptr<ThreadLocalValueHolderBase> >
+      ThreadLocalValues;
+  // Stores all ThreadIdToThreadLocals having values in a thread, indexed by
+  // thread's ID.
+  typedef std::map<DWORD, ThreadLocalValues> ThreadIdToThreadLocals;
+
+  // Holds the thread id and thread handle that we pass from
+  // StartWatcherThreadFor to WatcherThreadFunc.
+  typedef std::pair<DWORD, HANDLE> ThreadIdAndHandle;
+
+  static void StartWatcherThreadFor(DWORD thread_id) {
+    // The returned handle will be kept in thread_map and closed by
+    // watcher_thread in WatcherThreadFunc.
+    HANDLE thread = ::OpenThread(SYNCHRONIZE | THREAD_QUERY_INFORMATION,
+                                 FALSE,
+                                 thread_id);
+    GTEST_CHECK_(thread != nullptr);
+    // We need to pass a valid thread ID pointer into CreateThread for it
+    // to work correctly under Win98.
+    DWORD watcher_thread_id;
+    HANDLE watcher_thread = ::CreateThread(
+        nullptr,  // Default security.
+        0,        // Default stack size
+        &ThreadLocalRegistryImpl::WatcherThreadFunc,
+        reinterpret_cast<LPVOID>(new ThreadIdAndHandle(thread_id, thread)),
+        CREATE_SUSPENDED, &watcher_thread_id);
+    GTEST_CHECK_(watcher_thread != nullptr);
+    // Give the watcher thread the same priority as ours to avoid being
+    // blocked by it.
+    ::SetThreadPriority(watcher_thread,
+                        ::GetThreadPriority(::GetCurrentThread()));
+    ::ResumeThread(watcher_thread);
+    ::CloseHandle(watcher_thread);
+  }
+
+  // Monitors exit from a given thread and notifies those
+  // ThreadIdToThreadLocals about thread termination.
+  static DWORD WINAPI WatcherThreadFunc(LPVOID param) {
+    const ThreadIdAndHandle* tah =
+        reinterpret_cast<const ThreadIdAndHandle*>(param);
+    GTEST_CHECK_(
+        ::WaitForSingleObject(tah->second, INFINITE) == WAIT_OBJECT_0);
+    OnThreadExit(tah->first);
+    ::CloseHandle(tah->second);
+    delete tah;
+    return 0;
+  }
+
+  // Returns map of thread local instances.
+  static ThreadIdToThreadLocals* GetThreadLocalsMapLocked() {
+    mutex_.AssertHeld();
+#ifdef _MSC_VER
+    MemoryIsNotDeallocated memory_is_not_deallocated;
+#endif  // _MSC_VER
+    static ThreadIdToThreadLocals* map = new ThreadIdToThreadLocals();
+    return map;
+  }
+
+  // Protects access to GetThreadLocalsMapLocked() and its return value.
+  static Mutex mutex_;
+  // Protects access to GetThreadMapLocked() and its return value.
+  static Mutex thread_map_mutex_;
+};
+
+Mutex ThreadLocalRegistryImpl::mutex_(Mutex::kStaticMutex);  // NOLINT
+Mutex ThreadLocalRegistryImpl::thread_map_mutex_(Mutex::kStaticMutex);  // NOLINT
+
+ThreadLocalValueHolderBase* ThreadLocalRegistry::GetValueOnCurrentThread(
+      const ThreadLocalBase* thread_local_instance) {
+  return ThreadLocalRegistryImpl::GetValueOnCurrentThread(
+      thread_local_instance);
+}
+
+void ThreadLocalRegistry::OnThreadLocalDestroyed(
+      const ThreadLocalBase* thread_local_instance) {
+  ThreadLocalRegistryImpl::OnThreadLocalDestroyed(thread_local_instance);
+}
+
+#endif  // GTEST_IS_THREADSAFE && GTEST_OS_WINDOWS
+
+#if GTEST_USES_POSIX_RE
+
+// Implements RE.  Currently only needed for death tests.
+
+RE::~RE() {
+  if (is_valid_) {
+    // regfree'ing an invalid regex might crash because the content
+    // of the regex is undefined. Since the regex's are essentially
+    // the same, one cannot be valid (or invalid) without the other
+    // being so too.
+    regfree(&partial_regex_);
+    regfree(&full_regex_);
+  }
+  free(const_cast<char*>(pattern_));
+}
+
+// Returns true if and only if regular expression re matches the entire str.
+bool RE::FullMatch(const char* str, const RE& re) {
+  if (!re.is_valid_) return false;
+
+  regmatch_t match;
+  return regexec(&re.full_regex_, str, 1, &match, 0) == 0;
+}
+
+// Returns true if and only if regular expression re matches a substring of
+// str (including str itself).
+bool RE::PartialMatch(const char* str, const RE& re) {
+  if (!re.is_valid_) return false;
+
+  regmatch_t match;
+  return regexec(&re.partial_regex_, str, 1, &match, 0) == 0;
+}
+
+// Initializes an RE from its string representation.
+void RE::Init(const char* regex) {
+  pattern_ = posix::StrDup(regex);
+
+  // Reserves enough bytes to hold the regular expression used for a
+  // full match.
+  const size_t full_regex_len = strlen(regex) + 10;
+  char* const full_pattern = new char[full_regex_len];
+
+  snprintf(full_pattern, full_regex_len, "^(%s)$", regex);
+  is_valid_ = regcomp(&full_regex_, full_pattern, REG_EXTENDED) == 0;
+  // We want to call regcomp(&partial_regex_, ...) even if the
+  // previous expression returns false.  Otherwise partial_regex_ may
+  // not be properly initialized can may cause trouble when it's
+  // freed.
+  //
+  // Some implementation of POSIX regex (e.g. on at least some
+  // versions of Cygwin) doesn't accept the empty string as a valid
+  // regex.  We change it to an equivalent form "()" to be safe.
+  if (is_valid_) {
+    const char* const partial_regex = (*regex == '\0') ? "()" : regex;
+    is_valid_ = regcomp(&partial_regex_, partial_regex, REG_EXTENDED) == 0;
+  }
+  EXPECT_TRUE(is_valid_)
+      << "Regular expression \"" << regex
+      << "\" is not a valid POSIX Extended regular expression.";
+
+  delete[] full_pattern;
+}
+
+#elif GTEST_USES_SIMPLE_RE
+
+// Returns true if and only if ch appears anywhere in str (excluding the
+// terminating '\0' character).
+bool IsInSet(char ch, const char* str) {
+  return ch != '\0' && strchr(str, ch) != nullptr;
+}
+
+// Returns true if and only if ch belongs to the given classification.
+// Unlike similar functions in <ctype.h>, these aren't affected by the
+// current locale.
+bool IsAsciiDigit(char ch) { return '0' <= ch && ch <= '9'; }
+bool IsAsciiPunct(char ch) {
+  return IsInSet(ch, "^-!\"#$%&'()*+,./:;<=>?@[\\]_`{|}~");
+}
+bool IsRepeat(char ch) { return IsInSet(ch, "?*+"); }
+bool IsAsciiWhiteSpace(char ch) { return IsInSet(ch, " \f\n\r\t\v"); }
+bool IsAsciiWordChar(char ch) {
+  return ('a' <= ch && ch <= 'z') || ('A' <= ch && ch <= 'Z') ||
+      ('0' <= ch && ch <= '9') || ch == '_';
+}
+
+// Returns true if and only if "\\c" is a supported escape sequence.
+bool IsValidEscape(char c) {
+  return (IsAsciiPunct(c) || IsInSet(c, "dDfnrsStvwW"));
+}
+
+// Returns true if and only if the given atom (specified by escaped and
+// pattern) matches ch.  The result is undefined if the atom is invalid.
+bool AtomMatchesChar(bool escaped, char pattern_char, char ch) {
+  if (escaped) {  // "\\p" where p is pattern_char.
+    switch (pattern_char) {
+      case 'd': return IsAsciiDigit(ch);
+      case 'D': return !IsAsciiDigit(ch);
+      case 'f': return ch == '\f';
+      case 'n': return ch == '\n';
+      case 'r': return ch == '\r';
+      case 's': return IsAsciiWhiteSpace(ch);
+      case 'S': return !IsAsciiWhiteSpace(ch);
+      case 't': return ch == '\t';
+      case 'v': return ch == '\v';
+      case 'w': return IsAsciiWordChar(ch);
+      case 'W': return !IsAsciiWordChar(ch);
+    }
+    return IsAsciiPunct(pattern_char) && pattern_char == ch;
+  }
+
+  return (pattern_char == '.' && ch != '\n') || pattern_char == ch;
+}
+
+// Helper function used by ValidateRegex() to format error messages.
+static std::string FormatRegexSyntaxError(const char* regex, int index) {
+  return (Message() << "Syntax error at index " << index
+          << " in simple regular expression \"" << regex << "\": ").GetString();
+}
+
+// Generates non-fatal failures and returns false if regex is invalid;
+// otherwise returns true.
+bool ValidateRegex(const char* regex) {
+  if (regex == nullptr) {
+    ADD_FAILURE() << "NULL is not a valid simple regular expression.";
+    return false;
+  }
+
+  bool is_valid = true;
+
+  // True if and only if ?, *, or + can follow the previous atom.
+  bool prev_repeatable = false;
+  for (int i = 0; regex[i]; i++) {
+    if (regex[i] == '\\') {  // An escape sequence
+      i++;
+      if (regex[i] == '\0') {
+        ADD_FAILURE() << FormatRegexSyntaxError(regex, i - 1)
+                      << "'\\' cannot appear at the end.";
+        return false;
+      }
+
+      if (!IsValidEscape(regex[i])) {
+        ADD_FAILURE() << FormatRegexSyntaxError(regex, i - 1)
+                      << "invalid escape sequence \"\\" << regex[i] << "\".";
+        is_valid = false;
+      }
+      prev_repeatable = true;
+    } else {  // Not an escape sequence.
+      const char ch = regex[i];
+
+      if (ch == '^' && i > 0) {
+        ADD_FAILURE() << FormatRegexSyntaxError(regex, i)
+                      << "'^' can only appear at the beginning.";
+        is_valid = false;
+      } else if (ch == '$' && regex[i + 1] != '\0') {
+        ADD_FAILURE() << FormatRegexSyntaxError(regex, i)
+                      << "'$' can only appear at the end.";
+        is_valid = false;
+      } else if (IsInSet(ch, "()[]{}|")) {
+        ADD_FAILURE() << FormatRegexSyntaxError(regex, i)
+                      << "'" << ch << "' is unsupported.";
+        is_valid = false;
+      } else if (IsRepeat(ch) && !prev_repeatable) {
+        ADD_FAILURE() << FormatRegexSyntaxError(regex, i)
+                      << "'" << ch << "' can only follow a repeatable token.";
+        is_valid = false;
+      }
+
+      prev_repeatable = !IsInSet(ch, "^$?*+");
+    }
+  }
+
+  return is_valid;
+}
+
+// Matches a repeated regex atom followed by a valid simple regular
+// expression.  The regex atom is defined as c if escaped is false,
+// or \c otherwise.  repeat is the repetition meta character (?, *,
+// or +).  The behavior is undefined if str contains too many
+// characters to be indexable by size_t, in which case the test will
+// probably time out anyway.  We are fine with this limitation as
+// std::string has it too.
+bool MatchRepetitionAndRegexAtHead(
+    bool escaped, char c, char repeat, const char* regex,
+    const char* str) {
+  const size_t min_count = (repeat == '+') ? 1 : 0;
+  const size_t max_count = (repeat == '?') ? 1 :
+      static_cast<size_t>(-1) - 1;
+  // We cannot call numeric_limits::max() as it conflicts with the
+  // max() macro on Windows.
+
+  for (size_t i = 0; i <= max_count; ++i) {
+    // We know that the atom matches each of the first i characters in str.
+    if (i >= min_count && MatchRegexAtHead(regex, str + i)) {
+      // We have enough matches at the head, and the tail matches too.
+      // Since we only care about *whether* the pattern matches str
+      // (as opposed to *how* it matches), there is no need to find a
+      // greedy match.
+      return true;
+    }
+    if (str[i] == '\0' || !AtomMatchesChar(escaped, c, str[i]))
+      return false;
+  }
+  return false;
+}
+
+// Returns true if and only if regex matches a prefix of str. regex must
+// be a valid simple regular expression and not start with "^", or the
+// result is undefined.
+bool MatchRegexAtHead(const char* regex, const char* str) {
+  if (*regex == '\0')  // An empty regex matches a prefix of anything.
+    return true;
+
+  // "$" only matches the end of a string.  Note that regex being
+  // valid guarantees that there's nothing after "$" in it.
+  if (*regex == '$')
+    return *str == '\0';
+
+  // Is the first thing in regex an escape sequence?
+  const bool escaped = *regex == '\\';
+  if (escaped)
+    ++regex;
+  if (IsRepeat(regex[1])) {
+    // MatchRepetitionAndRegexAtHead() calls MatchRegexAtHead(), so
+    // here's an indirect recursion.  It terminates as the regex gets
+    // shorter in each recursion.
+    return MatchRepetitionAndRegexAtHead(
+        escaped, regex[0], regex[1], regex + 2, str);
+  } else {
+    // regex isn't empty, isn't "$", and doesn't start with a
+    // repetition.  We match the first atom of regex with the first
+    // character of str and recurse.
+    return (*str != '\0') && AtomMatchesChar(escaped, *regex, *str) &&
+        MatchRegexAtHead(regex + 1, str + 1);
+  }
+}
+
+// Returns true if and only if regex matches any substring of str.  regex must
+// be a valid simple regular expression, or the result is undefined.
+//
+// The algorithm is recursive, but the recursion depth doesn't exceed
+// the regex length, so we won't need to worry about running out of
+// stack space normally.  In rare cases the time complexity can be
+// exponential with respect to the regex length + the string length,
+// but usually it's must faster (often close to linear).
+bool MatchRegexAnywhere(const char* regex, const char* str) {
+  if (regex == nullptr || str == nullptr) return false;
+
+  if (*regex == '^')
+    return MatchRegexAtHead(regex + 1, str);
+
+  // A successful match can be anywhere in str.
+  do {
+    if (MatchRegexAtHead(regex, str))
+      return true;
+  } while (*str++ != '\0');
+  return false;
+}
+
+// Implements the RE class.
+
+RE::~RE() {
+  free(const_cast<char*>(pattern_));
+  free(const_cast<char*>(full_pattern_));
+}
+
+// Returns true if and only if regular expression re matches the entire str.
+bool RE::FullMatch(const char* str, const RE& re) {
+  return re.is_valid_ && MatchRegexAnywhere(re.full_pattern_, str);
+}
+
+// Returns true if and only if regular expression re matches a substring of
+// str (including str itself).
+bool RE::PartialMatch(const char* str, const RE& re) {
+  return re.is_valid_ && MatchRegexAnywhere(re.pattern_, str);
+}
+
+// Initializes an RE from its string representation.
+void RE::Init(const char* regex) {
+  pattern_ = full_pattern_ = nullptr;
+  if (regex != nullptr) {
+    pattern_ = posix::StrDup(regex);
+  }
+
+  is_valid_ = ValidateRegex(regex);
+  if (!is_valid_) {
+    // No need to calculate the full pattern when the regex is invalid.
+    return;
+  }
+
+  const size_t len = strlen(regex);
+  // Reserves enough bytes to hold the regular expression used for a
+  // full match: we need space to prepend a '^', append a '$', and
+  // terminate the string with '\0'.
+  char* buffer = static_cast<char*>(malloc(len + 3));
+  full_pattern_ = buffer;
+
+  if (*regex != '^')
+    *buffer++ = '^';  // Makes sure full_pattern_ starts with '^'.
+
+  // We don't use snprintf or strncpy, as they trigger a warning when
+  // compiled with VC++ 8.0.
+  memcpy(buffer, regex, len);
+  buffer += len;
+
+  if (len == 0 || regex[len - 1] != '$')
+    *buffer++ = '$';  // Makes sure full_pattern_ ends with '$'.
+
+  *buffer = '\0';
+}
+
+#endif  // GTEST_USES_POSIX_RE
+
+const char kUnknownFile[] = "unknown file";
+
+// Formats a source file path and a line number as they would appear
+// in an error message from the compiler used to compile this code.
+GTEST_API_ ::std::string FormatFileLocation(const char* file, int line) {
+  const std::string file_name(file == nullptr ? kUnknownFile : file);
+
+  if (line < 0) {
+    return file_name + ":";
+  }
+#ifdef _MSC_VER
+  return file_name + "(" + StreamableToString(line) + "):";
+#else
+  return file_name + ":" + StreamableToString(line) + ":";
+#endif  // _MSC_VER
+}
+
+// Formats a file location for compiler-independent XML output.
+// Although this function is not platform dependent, we put it next to
+// FormatFileLocation in order to contrast the two functions.
+// Note that FormatCompilerIndependentFileLocation() does NOT append colon
+// to the file location it produces, unlike FormatFileLocation().
+GTEST_API_ ::std::string FormatCompilerIndependentFileLocation(
+    const char* file, int line) {
+  const std::string file_name(file == nullptr ? kUnknownFile : file);
+
+  if (line < 0)
+    return file_name;
+  else
+    return file_name + ":" + StreamableToString(line);
+}
+
+GTestLog::GTestLog(GTestLogSeverity severity, const char* file, int line)
+    : severity_(severity) {
+  const char* const marker =
+      severity == GTEST_INFO ?    "[  INFO ]" :
+      severity == GTEST_WARNING ? "[WARNING]" :
+      severity == GTEST_ERROR ?   "[ ERROR ]" : "[ FATAL ]";
+  GetStream() << ::std::endl << marker << " "
+              << FormatFileLocation(file, line).c_str() << ": ";
+}
+
+// Flushes the buffers and, if severity is GTEST_FATAL, aborts the program.
+GTestLog::~GTestLog() {
+  GetStream() << ::std::endl;
+  if (severity_ == GTEST_FATAL) {
+    fflush(stderr);
+    posix::Abort();
+  }
+}
+
+// Disable Microsoft deprecation warnings for POSIX functions called from
+// this class (creat, dup, dup2, and close)
+GTEST_DISABLE_MSC_DEPRECATED_PUSH_()
+
+#if GTEST_HAS_STREAM_REDIRECTION
+
+// Object that captures an output stream (stdout/stderr).
+class CapturedStream {
+ public:
+  // The ctor redirects the stream to a temporary file.
+  explicit CapturedStream(int fd) : fd_(fd), uncaptured_fd_(dup(fd)) {
+# if GTEST_OS_WINDOWS
+    char temp_dir_path[MAX_PATH + 1] = { '\0' };  // NOLINT
+    char temp_file_path[MAX_PATH + 1] = { '\0' };  // NOLINT
+
+    ::GetTempPathA(sizeof(temp_dir_path), temp_dir_path);
+    const UINT success = ::GetTempFileNameA(temp_dir_path,
+                                            "gtest_redir",
+                                            0,  // Generate unique file name.
+                                            temp_file_path);
+    GTEST_CHECK_(success != 0)
+        << "Unable to create a temporary file in " << temp_dir_path;
+    const int captured_fd = creat(temp_file_path, _S_IREAD | _S_IWRITE);
+    GTEST_CHECK_(captured_fd != -1) << "Unable to open temporary file "
+                                    << temp_file_path;
+    filename_ = temp_file_path;
+# else
+    // There's no guarantee that a test has write access to the current
+    // directory, so we create the temporary file in a temporary directory.
+    std::string name_template;
+
+#  if GTEST_OS_LINUX_ANDROID
+    // Note: Android applications are expected to call the framework's
+    // Context.getExternalStorageDirectory() method through JNI to get
+    // the location of the world-writable SD Card directory. However,
+    // this requires a Context handle, which cannot be retrieved
+    // globally from native code. Doing so also precludes running the
+    // code as part of a regular standalone executable, which doesn't
+    // run in a Dalvik process (e.g. when running it through 'adb shell').
+    //
+    // The location /data/local/tmp is directly accessible from native code.
+    // '/sdcard' and other variants cannot be relied on, as they are not
+    // guaranteed to be mounted, or may have a delay in mounting.
+    name_template = "/data/local/tmp/";
+#  elif GTEST_OS_IOS
+    char user_temp_dir[PATH_MAX + 1];
+
+    // Documented alternative to NSTemporaryDirectory() (for obtaining creating
+    // a temporary directory) at
+    // https://developer.apple.com/library/archive/documentation/Security/Conceptual/SecureCodingGuide/Articles/RaceConditions.html#//apple_ref/doc/uid/TP40002585-SW10
+    //
+    // _CS_DARWIN_USER_TEMP_DIR (as well as _CS_DARWIN_USER_CACHE_DIR) is not
+    // documented in the confstr() man page at
+    // https://developer.apple.com/library/archive/documentation/System/Conceptual/ManPages_iPhoneOS/man3/confstr.3.html#//apple_ref/doc/man/3/confstr
+    // but are still available, according to the WebKit patches at
+    // https://trac.webkit.org/changeset/262004/webkit
+    // https://trac.webkit.org/changeset/263705/webkit
+    //
+    // The confstr() implementation falls back to getenv("TMPDIR"). See
+    // https://opensource.apple.com/source/Libc/Libc-1439.100.3/gen/confstr.c.auto.html
+    ::confstr(_CS_DARWIN_USER_TEMP_DIR, user_temp_dir, sizeof(user_temp_dir));
+
+    name_template = user_temp_dir;
+    if (name_template.back() != GTEST_PATH_SEP_[0])
+      name_template.push_back(GTEST_PATH_SEP_[0]);
+#  else
+    name_template = "/tmp/";
+#  endif
+    name_template.append("gtest_captured_stream.XXXXXX");
+
+    // mkstemp() modifies the string bytes in place, and does not go beyond the
+    // string's length. This results in well-defined behavior in C++17.
+    //
+    // The const_cast is needed below C++17. The constraints on std::string
+    // implementations in C++11 and above make assumption behind the const_cast
+    // fairly safe.
+    const int captured_fd = ::mkstemp(const_cast<char*>(name_template.data()));
+    if (captured_fd == -1) {
+      GTEST_LOG_(WARNING)
+          << "Failed to create tmp file " << name_template
+          << " for test; does the test have access to the /tmp directory?";
+    }
+    filename_ = std::move(name_template);
+# endif  // GTEST_OS_WINDOWS
+    fflush(nullptr);
+    dup2(captured_fd, fd_);
+    close(captured_fd);
+  }
+
+  ~CapturedStream() {
+    remove(filename_.c_str());
+  }
+
+  std::string GetCapturedString() {
+    if (uncaptured_fd_ != -1) {
+      // Restores the original stream.
+      fflush(nullptr);
+      dup2(uncaptured_fd_, fd_);
+      close(uncaptured_fd_);
+      uncaptured_fd_ = -1;
+    }
+
+    FILE* const file = posix::FOpen(filename_.c_str(), "r");
+    if (file == nullptr) {
+      GTEST_LOG_(FATAL) << "Failed to open tmp file " << filename_
+                        << " for capturing stream.";
+    }
+    const std::string content = ReadEntireFile(file);
+    posix::FClose(file);
+    return content;
+  }
+
+ private:
+  const int fd_;  // A stream to capture.
+  int uncaptured_fd_;
+  // Name of the temporary file holding the stderr output.
+  ::std::string filename_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(CapturedStream);
+};
+
+GTEST_DISABLE_MSC_DEPRECATED_POP_()
+
+static CapturedStream* g_captured_stderr = nullptr;
+static CapturedStream* g_captured_stdout = nullptr;
+
+// Starts capturing an output stream (stdout/stderr).
+static void CaptureStream(int fd, const char* stream_name,
+                          CapturedStream** stream) {
+  if (*stream != nullptr) {
+    GTEST_LOG_(FATAL) << "Only one " << stream_name
+                      << " capturer can exist at a time.";
+  }
+  *stream = new CapturedStream(fd);
+}
+
+// Stops capturing the output stream and returns the captured string.
+static std::string GetCapturedStream(CapturedStream** captured_stream) {
+  const std::string content = (*captured_stream)->GetCapturedString();
+
+  delete *captured_stream;
+  *captured_stream = nullptr;
+
+  return content;
+}
+
+// Starts capturing stdout.
+void CaptureStdout() {
+  CaptureStream(kStdOutFileno, "stdout", &g_captured_stdout);
+}
+
+// Starts capturing stderr.
+void CaptureStderr() {
+  CaptureStream(kStdErrFileno, "stderr", &g_captured_stderr);
+}
+
+// Stops capturing stdout and returns the captured string.
+std::string GetCapturedStdout() {
+  return GetCapturedStream(&g_captured_stdout);
+}
+
+// Stops capturing stderr and returns the captured string.
+std::string GetCapturedStderr() {
+  return GetCapturedStream(&g_captured_stderr);
+}
+
+#endif  // GTEST_HAS_STREAM_REDIRECTION
+
+
+
+
+
+size_t GetFileSize(FILE* file) {
+  fseek(file, 0, SEEK_END);
+  return static_cast<size_t>(ftell(file));
+}
+
+std::string ReadEntireFile(FILE* file) {
+  const size_t file_size = GetFileSize(file);
+  char* const buffer = new char[file_size];
+
+  size_t bytes_last_read = 0;  // # of bytes read in the last fread()
+  size_t bytes_read = 0;       // # of bytes read so far
+
+  fseek(file, 0, SEEK_SET);
+
+  // Keeps reading the file until we cannot read further or the
+  // pre-determined file size is reached.
+  do {
+    bytes_last_read = fread(buffer+bytes_read, 1, file_size-bytes_read, file);
+    bytes_read += bytes_last_read;
+  } while (bytes_last_read > 0 && bytes_read < file_size);
+
+  const std::string content(buffer, bytes_read);
+  delete[] buffer;
+
+  return content;
+}
+
+#if GTEST_HAS_DEATH_TEST
+static const std::vector<std::string>* g_injected_test_argvs =
+    nullptr;  // Owned.
+
+std::vector<std::string> GetInjectableArgvs() {
+  if (g_injected_test_argvs != nullptr) {
+    return *g_injected_test_argvs;
+  }
+  return GetArgvs();
+}
+
+void SetInjectableArgvs(const std::vector<std::string>* new_argvs) {
+  if (g_injected_test_argvs != new_argvs) delete g_injected_test_argvs;
+  g_injected_test_argvs = new_argvs;
+}
+
+void SetInjectableArgvs(const std::vector<std::string>& new_argvs) {
+  SetInjectableArgvs(
+      new std::vector<std::string>(new_argvs.begin(), new_argvs.end()));
+}
+
+void ClearInjectableArgvs() {
+  delete g_injected_test_argvs;
+  g_injected_test_argvs = nullptr;
+}
+#endif  // GTEST_HAS_DEATH_TEST
+
+#if GTEST_OS_WINDOWS_MOBILE
+namespace posix {
+void Abort() {
+  DebugBreak();
+  TerminateProcess(GetCurrentProcess(), 1);
+}
+}  // namespace posix
+#endif  // GTEST_OS_WINDOWS_MOBILE
+
+// Returns the name of the environment variable corresponding to the
+// given flag.  For example, FlagToEnvVar("foo") will return
+// "GTEST_FOO" in the open-source version.
+static std::string FlagToEnvVar(const char* flag) {
+  const std::string full_flag =
+      (Message() << GTEST_FLAG_PREFIX_ << flag).GetString();
+
+  Message env_var;
+  for (size_t i = 0; i != full_flag.length(); i++) {
+    env_var << ToUpper(full_flag.c_str()[i]);
+  }
+
+  return env_var.GetString();
+}
+
+// Parses 'str' for a 32-bit signed integer.  If successful, writes
+// the result to *value and returns true; otherwise leaves *value
+// unchanged and returns false.
+bool ParseInt32(const Message& src_text, const char* str, int32_t* value) {
+  // Parses the environment variable as a decimal integer.
+  char* end = nullptr;
+  const long long_value = strtol(str, &end, 10);  // NOLINT
+
+  // Has strtol() consumed all characters in the string?
+  if (*end != '\0') {
+    // No - an invalid character was encountered.
+    Message msg;
+    msg << "WARNING: " << src_text
+        << " is expected to be a 32-bit integer, but actually"
+        << " has value \"" << str << "\".\n";
+    printf("%s", msg.GetString().c_str());
+    fflush(stdout);
+    return false;
+  }
+
+  // Is the parsed value in the range of an int32_t?
+  const auto result = static_cast<int32_t>(long_value);
+  if (long_value == LONG_MAX || long_value == LONG_MIN ||
+      // The parsed value overflows as a long.  (strtol() returns
+      // LONG_MAX or LONG_MIN when the input overflows.)
+      result != long_value
+      // The parsed value overflows as an int32_t.
+      ) {
+    Message msg;
+    msg << "WARNING: " << src_text
+        << " is expected to be a 32-bit integer, but actually"
+        << " has value " << str << ", which overflows.\n";
+    printf("%s", msg.GetString().c_str());
+    fflush(stdout);
+    return false;
+  }
+
+  *value = result;
+  return true;
+}
+
+// Reads and returns the Boolean environment variable corresponding to
+// the given flag; if it's not set, returns default_value.
+//
+// The value is considered true if and only if it's not "0".
+bool BoolFromGTestEnv(const char* flag, bool default_value) {
+#if defined(GTEST_GET_BOOL_FROM_ENV_)
+  return GTEST_GET_BOOL_FROM_ENV_(flag, default_value);
+#else
+  const std::string env_var = FlagToEnvVar(flag);
+  const char* const string_value = posix::GetEnv(env_var.c_str());
+  return string_value == nullptr ? default_value
+                                 : strcmp(string_value, "0") != 0;
+#endif  // defined(GTEST_GET_BOOL_FROM_ENV_)
+}
+
+// Reads and returns a 32-bit integer stored in the environment
+// variable corresponding to the given flag; if it isn't set or
+// doesn't represent a valid 32-bit integer, returns default_value.
+int32_t Int32FromGTestEnv(const char* flag, int32_t default_value) {
+#if defined(GTEST_GET_INT32_FROM_ENV_)
+  return GTEST_GET_INT32_FROM_ENV_(flag, default_value);
+#else
+  const std::string env_var = FlagToEnvVar(flag);
+  const char* const string_value = posix::GetEnv(env_var.c_str());
+  if (string_value == nullptr) {
+    // The environment variable is not set.
+    return default_value;
+  }
+
+  int32_t result = default_value;
+  if (!ParseInt32(Message() << "Environment variable " << env_var,
+                  string_value, &result)) {
+    printf("The default value %s is used.\n",
+           (Message() << default_value).GetString().c_str());
+    fflush(stdout);
+    return default_value;
+  }
+
+  return result;
+#endif  // defined(GTEST_GET_INT32_FROM_ENV_)
+}
+
+// As a special case for the 'output' flag, if GTEST_OUTPUT is not
+// set, we look for XML_OUTPUT_FILE, which is set by the Bazel build
+// system.  The value of XML_OUTPUT_FILE is a filename without the
+// "xml:" prefix of GTEST_OUTPUT.
+// Note that this is meant to be called at the call site so it does
+// not check that the flag is 'output'
+// In essence this checks an env variable called XML_OUTPUT_FILE
+// and if it is set we prepend "xml:" to its value, if it not set we return ""
+std::string OutputFlagAlsoCheckEnvVar(){
+  std::string default_value_for_output_flag = "";
+  const char* xml_output_file_env = posix::GetEnv("XML_OUTPUT_FILE");
+  if (nullptr != xml_output_file_env) {
+    default_value_for_output_flag = std::string("xml:") + xml_output_file_env;
+  }
+  return default_value_for_output_flag;
+}
+
+// Reads and returns the string environment variable corresponding to
+// the given flag; if it's not set, returns default_value.
+const char* StringFromGTestEnv(const char* flag, const char* default_value) {
+#if defined(GTEST_GET_STRING_FROM_ENV_)
+  return GTEST_GET_STRING_FROM_ENV_(flag, default_value);
+#else
+  const std::string env_var = FlagToEnvVar(flag);
+  const char* const value = posix::GetEnv(env_var.c_str());
+  return value == nullptr ? default_value : value;
+#endif  // defined(GTEST_GET_STRING_FROM_ENV_)
+}
+
+}  // namespace internal
+}  // namespace testing
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/src/gtest-printers.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/src/gtest-printers.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/src/gtest-printers.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/src/gtest-printers.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,533 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+// Google Test - The Google C++ Testing and Mocking Framework
+//
+// This file implements a universal value printer that can print a
+// value of any type T:
+//
+//   void ::testing::internal::UniversalPrinter<T>::Print(value, ostream_ptr);
+//
+// It uses the << operator when possible, and prints the bytes in the
+// object otherwise.  A user can override its behavior for a class
+// type Foo by defining either operator<<(::std::ostream&, const Foo&)
+// or void PrintTo(const Foo&, ::std::ostream*) in the namespace that
+// defines Foo.
+
+#include "gtest/gtest-printers.h"
+
+#include <stdio.h>
+
+#include <cctype>
+#include <cstdint>
+#include <cwchar>
+#include <ostream>  // NOLINT
+#include <string>
+#include <type_traits>
+
+#include "gtest/internal/gtest-port.h"
+#include "src/gtest-internal-inl.h"
+
+namespace testing {
+
+namespace {
+
+using ::std::ostream;
+
+// Prints a segment of bytes in the given object.
+GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
+GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
+GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
+GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
+void PrintByteSegmentInObjectTo(const unsigned char* obj_bytes, size_t start,
+                                size_t count, ostream* os) {
+  char text[5] = "";
+  for (size_t i = 0; i != count; i++) {
+    const size_t j = start + i;
+    if (i != 0) {
+      // Organizes the bytes into groups of 2 for easy parsing by
+      // human.
+      if ((j % 2) == 0)
+        *os << ' ';
+      else
+        *os << '-';
+    }
+    GTEST_SNPRINTF_(text, sizeof(text), "%02X", obj_bytes[j]);
+    *os << text;
+  }
+}
+
+// Prints the bytes in the given value to the given ostream.
+void PrintBytesInObjectToImpl(const unsigned char* obj_bytes, size_t count,
+                              ostream* os) {
+  // Tells the user how big the object is.
+  *os << count << "-byte object <";
+
+  const size_t kThreshold = 132;
+  const size_t kChunkSize = 64;
+  // If the object size is bigger than kThreshold, we'll have to omit
+  // some details by printing only the first and the last kChunkSize
+  // bytes.
+  if (count < kThreshold) {
+    PrintByteSegmentInObjectTo(obj_bytes, 0, count, os);
+  } else {
+    PrintByteSegmentInObjectTo(obj_bytes, 0, kChunkSize, os);
+    *os << " ... ";
+    // Rounds up to 2-byte boundary.
+    const size_t resume_pos = (count - kChunkSize + 1)/2*2;
+    PrintByteSegmentInObjectTo(obj_bytes, resume_pos, count - resume_pos, os);
+  }
+  *os << ">";
+}
+
+// Helpers for widening a character to char32_t. Since the standard does not
+// specify if char / wchar_t is signed or unsigned, it is important to first
+// convert it to the unsigned type of the same width before widening it to
+// char32_t.
+template <typename CharType>
+char32_t ToChar32(CharType in) {
+  return static_cast<char32_t>(
+      static_cast<typename std::make_unsigned<CharType>::type>(in));
+}
+
+}  // namespace
+
+namespace internal {
+
+// Delegates to PrintBytesInObjectToImpl() to print the bytes in the
+// given object.  The delegation simplifies the implementation, which
+// uses the << operator and thus is easier done outside of the
+// ::testing::internal namespace, which contains a << operator that
+// sometimes conflicts with the one in STL.
+void PrintBytesInObjectTo(const unsigned char* obj_bytes, size_t count,
+                          ostream* os) {
+  PrintBytesInObjectToImpl(obj_bytes, count, os);
+}
+
+// Depending on the value of a char (or wchar_t), we print it in one
+// of three formats:
+//   - as is if it's a printable ASCII (e.g. 'a', '2', ' '),
+//   - as a hexadecimal escape sequence (e.g. '\x7F'), or
+//   - as a special escape sequence (e.g. '\r', '\n').
+enum CharFormat {
+  kAsIs,
+  kHexEscape,
+  kSpecialEscape
+};
+
+// Returns true if c is a printable ASCII character.  We test the
+// value of c directly instead of calling isprint(), which is buggy on
+// Windows Mobile.
+inline bool IsPrintableAscii(char32_t c) { return 0x20 <= c && c <= 0x7E; }
+
+// Prints c (of type char, char8_t, char16_t, char32_t, or wchar_t) as a
+// character literal without the quotes, escaping it when necessary; returns how
+// c was formatted.
+template <typename Char>
+static CharFormat PrintAsCharLiteralTo(Char c, ostream* os) {
+  const char32_t u_c = ToChar32(c);
+  switch (u_c) {
+    case L'\0':
+      *os << "\\0";
+      break;
+    case L'\'':
+      *os << "\\'";
+      break;
+    case L'\\':
+      *os << "\\\\";
+      break;
+    case L'\a':
+      *os << "\\a";
+      break;
+    case L'\b':
+      *os << "\\b";
+      break;
+    case L'\f':
+      *os << "\\f";
+      break;
+    case L'\n':
+      *os << "\\n";
+      break;
+    case L'\r':
+      *os << "\\r";
+      break;
+    case L'\t':
+      *os << "\\t";
+      break;
+    case L'\v':
+      *os << "\\v";
+      break;
+    default:
+      if (IsPrintableAscii(u_c)) {
+        *os << static_cast<char>(c);
+        return kAsIs;
+      } else {
+        ostream::fmtflags flags = os->flags();
+        *os << "\\x" << std::hex << std::uppercase << static_cast<int>(u_c);
+        os->flags(flags);
+        return kHexEscape;
+      }
+  }
+  return kSpecialEscape;
+}
+
+// Prints a char32_t c as if it's part of a string literal, escaping it when
+// necessary; returns how c was formatted.
+static CharFormat PrintAsStringLiteralTo(char32_t c, ostream* os) {
+  switch (c) {
+    case L'\'':
+      *os << "'";
+      return kAsIs;
+    case L'"':
+      *os << "\\\"";
+      return kSpecialEscape;
+    default:
+      return PrintAsCharLiteralTo(c, os);
+  }
+}
+
+static const char* GetCharWidthPrefix(char) {
+  return "";
+}
+
+static const char* GetCharWidthPrefix(signed char) {
+  return "";
+}
+
+static const char* GetCharWidthPrefix(unsigned char) {
+  return "";
+}
+
+#ifdef __cpp_char8_t
+static const char* GetCharWidthPrefix(char8_t) {
+  return "u8";
+}
+#endif
+
+static const char* GetCharWidthPrefix(char16_t) {
+  return "u";
+}
+
+static const char* GetCharWidthPrefix(char32_t) {
+  return "U";
+}
+
+static const char* GetCharWidthPrefix(wchar_t) {
+  return "L";
+}
+
+// Prints a char c as if it's part of a string literal, escaping it when
+// necessary; returns how c was formatted.
+static CharFormat PrintAsStringLiteralTo(char c, ostream* os) {
+  return PrintAsStringLiteralTo(ToChar32(c), os);
+}
+
+#ifdef __cpp_char8_t
+static CharFormat PrintAsStringLiteralTo(char8_t c, ostream* os) {
+  return PrintAsStringLiteralTo(ToChar32(c), os);
+}
+#endif
+
+static CharFormat PrintAsStringLiteralTo(char16_t c, ostream* os) {
+  return PrintAsStringLiteralTo(ToChar32(c), os);
+}
+
+static CharFormat PrintAsStringLiteralTo(wchar_t c, ostream* os) {
+  return PrintAsStringLiteralTo(ToChar32(c), os);
+}
+
+// Prints a character c (of type char, char8_t, char16_t, char32_t, or wchar_t)
+// and its code. '\0' is printed as "'\\0'", other unprintable characters are
+// also properly escaped using the standard C++ escape sequence.
+template <typename Char>
+void PrintCharAndCodeTo(Char c, ostream* os) {
+  // First, print c as a literal in the most readable form we can find.
+  *os << GetCharWidthPrefix(c) << "'";
+  const CharFormat format = PrintAsCharLiteralTo(c, os);
+  *os << "'";
+
+  // To aid user debugging, we also print c's code in decimal, unless
+  // it's 0 (in which case c was printed as '\\0', making the code
+  // obvious).
+  if (c == 0)
+    return;
+  *os << " (" << static_cast<int>(c);
+
+  // For more convenience, we print c's code again in hexadecimal,
+  // unless c was already printed in the form '\x##' or the code is in
+  // [1, 9].
+  if (format == kHexEscape || (1 <= c && c <= 9)) {
+    // Do nothing.
+  } else {
+    *os << ", 0x" << String::FormatHexInt(static_cast<int>(c));
+  }
+  *os << ")";
+}
+
+void PrintTo(unsigned char c, ::std::ostream* os) { PrintCharAndCodeTo(c, os); }
+void PrintTo(signed char c, ::std::ostream* os) { PrintCharAndCodeTo(c, os); }
+
+// Prints a wchar_t as a symbol if it is printable or as its internal
+// code otherwise and also as its code.  L'\0' is printed as "L'\\0'".
+void PrintTo(wchar_t wc, ostream* os) { PrintCharAndCodeTo(wc, os); }
+
+// TODO(dcheng): Consider making this delegate to PrintCharAndCodeTo() as well.
+void PrintTo(char32_t c, ::std::ostream* os) {
+  *os << std::hex << "U+" << std::uppercase << std::setfill('0') << std::setw(4)
+      << static_cast<uint32_t>(c);
+}
+
+// Prints the given array of characters to the ostream.  CharType must be either
+// char, char8_t, char16_t, char32_t, or wchar_t.
+// The array starts at begin, the length is len, it may include '\0' characters
+// and may not be NUL-terminated.
+template <typename CharType>
+GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
+GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
+GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
+GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
+static CharFormat PrintCharsAsStringTo(
+    const CharType* begin, size_t len, ostream* os) {
+  const char* const quote_prefix = GetCharWidthPrefix(*begin);
+  *os << quote_prefix << "\"";
+  bool is_previous_hex = false;
+  CharFormat print_format = kAsIs;
+  for (size_t index = 0; index < len; ++index) {
+    const CharType cur = begin[index];
+    if (is_previous_hex && IsXDigit(cur)) {
+      // Previous character is of '\x..' form and this character can be
+      // interpreted as another hexadecimal digit in its number. Break string to
+      // disambiguate.
+      *os << "\" " << quote_prefix << "\"";
+    }
+    is_previous_hex = PrintAsStringLiteralTo(cur, os) == kHexEscape;
+    // Remember if any characters required hex escaping.
+    if (is_previous_hex) {
+      print_format = kHexEscape;
+    }
+  }
+  *os << "\"";
+  return print_format;
+}
+
+// Prints a (const) char/wchar_t array of 'len' elements, starting at address
+// 'begin'.  CharType must be either char or wchar_t.
+template <typename CharType>
+GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
+GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
+GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
+GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
+static void UniversalPrintCharArray(
+    const CharType* begin, size_t len, ostream* os) {
+  // The code
+  //   const char kFoo[] = "foo";
+  // generates an array of 4, not 3, elements, with the last one being '\0'.
+  //
+  // Therefore when printing a char array, we don't print the last element if
+  // it's '\0', such that the output matches the string literal as it's
+  // written in the source code.
+  if (len > 0 && begin[len - 1] == '\0') {
+    PrintCharsAsStringTo(begin, len - 1, os);
+    return;
+  }
+
+  // If, however, the last element in the array is not '\0', e.g.
+  //    const char kFoo[] = { 'f', 'o', 'o' };
+  // we must print the entire array.  We also print a message to indicate
+  // that the array is not NUL-terminated.
+  PrintCharsAsStringTo(begin, len, os);
+  *os << " (no terminating NUL)";
+}
+
+// Prints a (const) char array of 'len' elements, starting at address 'begin'.
+void UniversalPrintArray(const char* begin, size_t len, ostream* os) {
+  UniversalPrintCharArray(begin, len, os);
+}
+
+#ifdef __cpp_char8_t
+// Prints a (const) char8_t array of 'len' elements, starting at address
+// 'begin'.
+void UniversalPrintArray(const char8_t* begin, size_t len, ostream* os) {
+  UniversalPrintCharArray(begin, len, os);
+}
+#endif
+
+// Prints a (const) char16_t array of 'len' elements, starting at address
+// 'begin'.
+void UniversalPrintArray(const char16_t* begin, size_t len, ostream* os) {
+  UniversalPrintCharArray(begin, len, os);
+}
+
+// Prints a (const) char32_t array of 'len' elements, starting at address
+// 'begin'.
+void UniversalPrintArray(const char32_t* begin, size_t len, ostream* os) {
+  UniversalPrintCharArray(begin, len, os);
+}
+
+// Prints a (const) wchar_t array of 'len' elements, starting at address
+// 'begin'.
+void UniversalPrintArray(const wchar_t* begin, size_t len, ostream* os) {
+  UniversalPrintCharArray(begin, len, os);
+}
+
+namespace {
+
+// Prints a null-terminated C-style string to the ostream.
+template <typename Char>
+void PrintCStringTo(const Char* s, ostream* os) {
+  if (s == nullptr) {
+    *os << "NULL";
+  } else {
+    *os << ImplicitCast_<const void*>(s) << " pointing to ";
+    PrintCharsAsStringTo(s, std::char_traits<Char>::length(s), os);
+  }
+}
+
+}  // anonymous namespace
+
+void PrintTo(const char* s, ostream* os) { PrintCStringTo(s, os); }
+
+#ifdef __cpp_char8_t
+void PrintTo(const char8_t* s, ostream* os) { PrintCStringTo(s, os); }
+#endif
+
+void PrintTo(const char16_t* s, ostream* os) { PrintCStringTo(s, os); }
+
+void PrintTo(const char32_t* s, ostream* os) { PrintCStringTo(s, os); }
+
+// MSVC compiler can be configured to define whar_t as a typedef
+// of unsigned short. Defining an overload for const wchar_t* in that case
+// would cause pointers to unsigned shorts be printed as wide strings,
+// possibly accessing more memory than intended and causing invalid
+// memory accesses. MSVC defines _NATIVE_WCHAR_T_DEFINED symbol when
+// wchar_t is implemented as a native type.
+#if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED)
+// Prints the given wide C string to the ostream.
+void PrintTo(const wchar_t* s, ostream* os) { PrintCStringTo(s, os); }
+#endif  // wchar_t is native
+
+namespace {
+
+bool ContainsUnprintableControlCodes(const char* str, size_t length) {
+  const unsigned char *s = reinterpret_cast<const unsigned char *>(str);
+
+  for (size_t i = 0; i < length; i++) {
+    unsigned char ch = *s++;
+    if (std::iscntrl(ch)) {
+        switch (ch) {
+        case '\t':
+        case '\n':
+        case '\r':
+          break;
+        default:
+          return true;
+        }
+      }
+  }
+  return false;
+}
+
+bool IsUTF8TrailByte(unsigned char t) { return 0x80 <= t && t<= 0xbf; }
+
+bool IsValidUTF8(const char* str, size_t length) {
+  const unsigned char *s = reinterpret_cast<const unsigned char *>(str);
+
+  for (size_t i = 0; i < length;) {
+    unsigned char lead = s[i++];
+
+    if (lead <= 0x7f) {
+      continue;  // single-byte character (ASCII) 0..7F
+    }
+    if (lead < 0xc2) {
+      return false;  // trail byte or non-shortest form
+    } else if (lead <= 0xdf && (i + 1) <= length && IsUTF8TrailByte(s[i])) {
+      ++i;  // 2-byte character
+    } else if (0xe0 <= lead && lead <= 0xef && (i + 2) <= length &&
+               IsUTF8TrailByte(s[i]) &&
+               IsUTF8TrailByte(s[i + 1]) &&
+               // check for non-shortest form and surrogate
+               (lead != 0xe0 || s[i] >= 0xa0) &&
+               (lead != 0xed || s[i] < 0xa0)) {
+      i += 2;  // 3-byte character
+    } else if (0xf0 <= lead && lead <= 0xf4 && (i + 3) <= length &&
+               IsUTF8TrailByte(s[i]) &&
+               IsUTF8TrailByte(s[i + 1]) &&
+               IsUTF8TrailByte(s[i + 2]) &&
+               // check for non-shortest form
+               (lead != 0xf0 || s[i] >= 0x90) &&
+               (lead != 0xf4 || s[i] < 0x90)) {
+      i += 3;  // 4-byte character
+    } else {
+      return false;
+    }
+  }
+  return true;
+}
+
+void ConditionalPrintAsText(const char* str, size_t length, ostream* os) {
+  if (!ContainsUnprintableControlCodes(str, length) &&
+      IsValidUTF8(str, length)) {
+    *os << "\n    As Text: \"" << str << "\"";
+  }
+}
+
+}  // anonymous namespace
+
+void PrintStringTo(const ::std::string& s, ostream* os) {
+  if (PrintCharsAsStringTo(s.data(), s.size(), os) == kHexEscape) {
+    if (GTEST_FLAG(print_utf8)) {
+      ConditionalPrintAsText(s.data(), s.size(), os);
+    }
+  }
+}
+
+#ifdef __cpp_char8_t
+void PrintU8StringTo(const ::std::u8string& s, ostream* os) {
+  PrintCharsAsStringTo(s.data(), s.size(), os);
+}
+#endif
+
+void PrintU16StringTo(const ::std::u16string& s, ostream* os) {
+  PrintCharsAsStringTo(s.data(), s.size(), os);
+}
+
+void PrintU32StringTo(const ::std::u32string& s, ostream* os) {
+  PrintCharsAsStringTo(s.data(), s.size(), os);
+}
+
+#if GTEST_HAS_STD_WSTRING
+void PrintWideStringTo(const ::std::wstring& s, ostream* os) {
+  PrintCharsAsStringTo(s.data(), s.size(), os);
+}
+#endif  // GTEST_HAS_STD_WSTRING
+
+}  // namespace internal
+
+}  // namespace testing
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/src/gtest-test-part.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/src/gtest-test-part.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/src/gtest-test-part.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/src/gtest-test-part.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,108 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+//
+// The Google C++ Testing and Mocking Framework (Google Test)
+
+#include "gtest/gtest-test-part.h"
+
+#include "gtest/internal/gtest-port.h"
+#include "src/gtest-internal-inl.h"
+
+namespace testing {
+
+using internal::GetUnitTestImpl;
+
+// Gets the summary of the failure message by omitting the stack trace
+// in it.
+std::string TestPartResult::ExtractSummary(const char* message) {
+  const char* const stack_trace = strstr(message, internal::kStackTraceMarker);
+  return stack_trace == nullptr ? message : std::string(message, stack_trace);
+}
+
+// Prints a TestPartResult object.
+std::ostream& operator<<(std::ostream& os, const TestPartResult& result) {
+  return os << internal::FormatFileLocation(result.file_name(),
+                                            result.line_number())
+            << " "
+            << (result.type() == TestPartResult::kSuccess
+                    ? "Success"
+                    : result.type() == TestPartResult::kSkip
+                          ? "Skipped"
+                          : result.type() == TestPartResult::kFatalFailure
+                                ? "Fatal failure"
+                                : "Non-fatal failure")
+            << ":\n"
+            << result.message() << std::endl;
+}
+
+// Appends a TestPartResult to the array.
+void TestPartResultArray::Append(const TestPartResult& result) {
+  array_.push_back(result);
+}
+
+// Returns the TestPartResult at the given index (0-based).
+const TestPartResult& TestPartResultArray::GetTestPartResult(int index) const {
+  if (index < 0 || index >= size()) {
+    printf("\nInvalid index (%d) into TestPartResultArray.\n", index);
+    internal::posix::Abort();
+  }
+
+  return array_[static_cast<size_t>(index)];
+}
+
+// Returns the number of TestPartResult objects in the array.
+int TestPartResultArray::size() const {
+  return static_cast<int>(array_.size());
+}
+
+namespace internal {
+
+HasNewFatalFailureHelper::HasNewFatalFailureHelper()
+    : has_new_fatal_failure_(false),
+      original_reporter_(GetUnitTestImpl()->
+                         GetTestPartResultReporterForCurrentThread()) {
+  GetUnitTestImpl()->SetTestPartResultReporterForCurrentThread(this);
+}
+
+HasNewFatalFailureHelper::~HasNewFatalFailureHelper() {
+  GetUnitTestImpl()->SetTestPartResultReporterForCurrentThread(
+      original_reporter_);
+}
+
+void HasNewFatalFailureHelper::ReportTestPartResult(
+    const TestPartResult& result) {
+  if (result.fatally_failed())
+    has_new_fatal_failure_ = true;
+  original_reporter_->ReportTestPartResult(result);
+}
+
+}  // namespace internal
+
+}  // namespace testing
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/src/gtest-typed-test.cc mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/src/gtest-typed-test.cc
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/googletest/src/gtest-typed-test.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/googletest/src/gtest-typed-test.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,107 @@
+// Copyright 2008 Google Inc.
+// All Rights Reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+#include "gtest/gtest-typed-test.h"
+
+#include "gtest/gtest.h"
+
+namespace testing {
+namespace internal {
+
+// Skips to the first non-space char in str. Returns an empty string if str
+// contains only whitespace characters.
+static const char* SkipSpaces(const char* str) {
+  while (IsSpace(*str))
+    str++;
+  return str;
+}
+
+static std::vector<std::string> SplitIntoTestNames(const char* src) {
+  std::vector<std::string> name_vec;
+  src = SkipSpaces(src);
+  for (; src != nullptr; src = SkipComma(src)) {
+    name_vec.push_back(StripTrailingSpaces(GetPrefixUntilComma(src)));
+  }
+  return name_vec;
+}
+
+// Verifies that registered_tests match the test names in
+// registered_tests_; returns registered_tests if successful, or
+// aborts the program otherwise.
+const char* TypedTestSuitePState::VerifyRegisteredTestNames(
+    const char* test_suite_name, const char* file, int line,
+    const char* registered_tests) {
+  RegisterTypeParameterizedTestSuite(test_suite_name, CodeLocation(file, line));
+
+  typedef RegisteredTestsMap::const_iterator RegisteredTestIter;
+  registered_ = true;
+
+  std::vector<std::string> name_vec = SplitIntoTestNames(registered_tests);
+
+  Message errors;
+
+  std::set<std::string> tests;
+  for (std::vector<std::string>::const_iterator name_it = name_vec.begin();
+       name_it != name_vec.end(); ++name_it) {
+    const std::string& name = *name_it;
+    if (tests.count(name) != 0) {
+      errors << "Test " << name << " is listed more than once.\n";
+      continue;
+    }
+
+    if (registered_tests_.count(name) != 0) {
+      tests.insert(name);
+    } else {
+      errors << "No test named " << name
+             << " can be found in this test suite.\n";
+    }
+  }
+
+  for (RegisteredTestIter it = registered_tests_.begin();
+       it != registered_tests_.end();
+       ++it) {
+    if (tests.count(it->first) == 0) {
+      errors << "You forgot to list test " << it->first << ".\n";
+    }
+  }
+
+  const std::string& errors_str = errors.GetString();
+  if (errors_str != "") {
+    fprintf(stderr, "%s %s", FormatFileLocation(file, line).c_str(),
+            errors_str.c_str());
+    fflush(stderr);
+    posix::Abort();
+  }
+
+  return registered_tests;
+}
+
+}  // namespace internal
+}  // namespace testing
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/LICENSE mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/LICENSE
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/LICENSE	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/LICENSE	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,28 @@
+Copyright 2008, Google Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+    * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/README.md mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/README.md
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/README.md	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/README.md	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,140 @@
+# GoogleTest
+
+### Announcements
+
+#### Live at Head
+
+GoogleTest now follows the
+[Abseil Live at Head philosophy](https://abseil.io/about/philosophy#upgrade-support).
+We recommend using the latest commit in the `master` branch in your projects.
+
+#### Documentation Updates
+
+Our documentation is now live on GitHub Pages at
+https://google.github.io/googletest/. We recommend browsing the documentation on
+GitHub Pages rather than directly in the repository.
+
+#### Release 1.10.x
+
+[Release 1.10.x](https://github.com/google/googletest/releases/tag/release-1.10.0)
+is now available.
+
+#### Coming Soon
+
+*   We are planning to take a dependency on
+    [Abseil](https://github.com/abseil/abseil-cpp).
+*   More documentation improvements are planned.
+
+## Welcome to **GoogleTest**, Google's C++ test framework!
+
+This repository is a merger of the formerly separate GoogleTest and GoogleMock
+projects. These were so closely related that it makes sense to maintain and
+release them together.
+
+### Getting Started
+
+See the [GoogleTest User's Guide](https://google.github.io/googletest/) for
+documentation. We recommend starting with the
+[GoogleTest Primer](https://google.github.io/googletest/primer.html).
+
+More information about building GoogleTest can be found at
+[googletest/README.md](googletest/README.md).
+
+## Features
+
+*   An [xUnit](https://en.wikipedia.org/wiki/XUnit) test framework.
+*   Test discovery.
+*   A rich set of assertions.
+*   User-defined assertions.
+*   Death tests.
+*   Fatal and non-fatal failures.
+*   Value-parameterized tests.
+*   Type-parameterized tests.
+*   Various options for running the tests.
+*   XML test report generation.
+
+## Supported Platforms
+
+GoogleTest requires a codebase and compiler compliant with the C++11 standard or
+newer.
+
+The GoogleTest code is officially supported on the following platforms.
+Operating systems or tools not listed below are community-supported. For
+community-supported platforms, patches that do not complicate the code may be
+considered.
+
+If you notice any problems on your platform, please file an issue on the
+[GoogleTest GitHub Issue Tracker](https://github.com/google/googletest/issues).
+Pull requests containing fixes are welcome!
+
+### Operating Systems
+
+*   Linux
+*   macOS
+*   Windows
+
+### Compilers
+
+*   gcc 5.0+
+*   clang 5.0+
+*   MSVC 2015+
+
+**macOS users:** Xcode 9.3+ provides clang 5.0+.
+
+### Build Systems
+
+*   [Bazel](https://bazel.build/)
+*   [CMake](https://cmake.org/)
+
+**Note:** Bazel is the build system used by the team internally and in tests.
+CMake is supported on a best-effort basis and by the community.
+
+## Who Is Using GoogleTest?
+
+In addition to many internal projects at Google, GoogleTest is also used by the
+following notable projects:
+
+*   The [Chromium projects](http://www.chromium.org/) (behind the Chrome browser
+    and Chrome OS).
+*   The [LLVM](http://llvm.org/) compiler.
+*   [Protocol Buffers](https://github.com/google/protobuf), Google's data
+    interchange format.
+*   The [OpenCV](http://opencv.org/) computer vision library.
+
+## Related Open Source Projects
+
+[GTest Runner](https://github.com/nholthaus/gtest-runner) is a Qt5 based
+automated test-runner and Graphical User Interface with powerful features for
+Windows and Linux platforms.
+
+[GoogleTest UI](https://github.com/ospector/gtest-gbar) is a test runner that
+runs your test binary, allows you to track its progress via a progress bar, and
+displays a list of test failures. Clicking on one shows failure text. Google
+Test UI is written in C#.
+
+[GTest TAP Listener](https://github.com/kinow/gtest-tap-listener) is an event
+listener for GoogleTest that implements the
+[TAP protocol](https://en.wikipedia.org/wiki/Test_Anything_Protocol) for test
+result output. If your test runner understands TAP, you may find it useful.
+
+[gtest-parallel](https://github.com/google/gtest-parallel) is a test runner that
+runs tests from your binary in parallel to provide significant speed-up.
+
+[GoogleTest Adapter](https://marketplace.visualstudio.com/items?itemName=DavidSchuldenfrei.gtest-adapter)
+is a VS Code extension allowing to view GoogleTest in a tree view, and run/debug
+your tests.
+
+[C++ TestMate](https://github.com/matepek/vscode-catch2-test-adapter) is a VS
+Code extension allowing to view GoogleTest in a tree view, and run/debug your
+tests.
+
+[Cornichon](https://pypi.org/project/cornichon/) is a small Gherkin DSL parser
+that generates stub code for GoogleTest.
+
+## Contributing Changes
+
+Please read
+[`CONTRIBUTING.md`](https://github.com/google/googletest/blob/master/CONTRIBUTING.md)
+for details on how to contribute to this project.
+
+Happy testing!
diff -Nru mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/WORKSPACE mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/WORKSPACE
--- mysql-8.0-8.0.26/extra/googletest/googletest-release-1.11.0/WORKSPACE	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/googletest/googletest-release-1.11.0/WORKSPACE	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,24 @@
+workspace(name = "com_google_googletest")
+
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+http_archive(
+    name = "com_google_absl",
+    urls = ["https://github.com/abseil/abseil-cpp/archive/7971fb358ae376e016d2d4fc9327aad95659b25e.zip"],  # 2021-05-20T02:59:16Z
+    strip_prefix = "abseil-cpp-7971fb358ae376e016d2d4fc9327aad95659b25e",
+    sha256 = "aeba534f7307e36fe084b452299e49b97420667a8d28102cf9a0daeed340b859",
+)
+
+http_archive(
+  name = "rules_cc",
+  urls = ["https://github.com/bazelbuild/rules_cc/archive/68cb652a71e7e7e2858c50593e5a9e3b94e5b9a9.zip"],  # 2021-05-14T14:51:14Z
+  strip_prefix = "rules_cc-68cb652a71e7e7e2858c50593e5a9e3b94e5b9a9",
+  sha256 = "1e19e9a3bc3d4ee91d7fcad00653485ee6c798efbbf9588d40b34cbfbded143d",
+)
+
+http_archive(
+  name = "rules_python",
+  urls = ["https://github.com/bazelbuild/rules_python/archive/ed6cc8f2c3692a6a7f013ff8bc185ba77eb9b4d2.zip"],  # 2021-05-17T00:24:16Z
+  strip_prefix = "rules_python-ed6cc8f2c3692a6a7f013ff8bc185ba77eb9b4d2",
+  sha256 = "98b3c592faea9636ac8444bfd9de7f3fb4c60590932d6e6ac5946e3f8dbd5ff6",
+)
diff -Nru mysql-8.0-8.0.26/extra/icu/CMakeLists.txt mysql-8.0-8.0.27/extra/icu/CMakeLists.txt
--- mysql-8.0-8.0.26/extra/icu/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/icu/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -57,6 +57,11 @@
   )
 ENDIF()
 
+MY_CHECK_CXX_COMPILER_WARNING("-Wreturn-local-addr" HAS_WARN_FLAG)
+IF(HAS_WARN_FLAG)
+  LIST(APPEND ICU_LINUX_COMPILE_OPTIONS "${HAS_WARN_FLAG}")
+ENDIF()
+
 IF(MY_COMPILER_IS_GNU)
   LIST(APPEND ICU_LINUX_COMPILE_OPTIONS "-Wno-stringop-overflow")
 ENDIF()
diff -Nru mysql-8.0-8.0.26/extra/icu/source/common/CMakeLists.txt mysql-8.0-8.0.27/extra/icu/source/common/CMakeLists.txt
--- mysql-8.0-8.0.26/extra/icu/source/common/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/icu/source/common/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -203,6 +203,15 @@
   wintz.cpp
 )
 
+IF(APPLE)
+  LIST(REMOVE_ITEM ICU_COMMON_SOURCES
+    cwchar.cpp
+    icuplug.cpp
+    restrace.cpp
+    wintz.cpp
+    )
+ENDIF()
+
 ADD_LIBRARY(icuuc STATIC ${ICU_COMMON_SOURCES})
 
 # uidna_toASCII_59 is marked as deprecated
diff -Nru mysql-8.0-8.0.26/extra/icu/source/i18n/CMakeLists.txt mysql-8.0-8.0.27/extra/icu/source/i18n/CMakeLists.txt
--- mysql-8.0-8.0.26/extra/icu/source/i18n/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/icu/source/i18n/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -3,7 +3,8 @@
 
 PROJECT (ICU-i18n)
 
-SET_DIRECTORY_PROPERTIES(PROPERTIES INCLUDE_DIRECTORIES "${PROJECT_SOURCE_DIR}/../common;${PROJECT_SOURCE_DIR}")
+SET_DIRECTORY_PROPERTIES(PROPERTIES INCLUDE_DIRECTORIES
+  "${PROJECT_SOURCE_DIR}/../common;${PROJECT_SOURCE_DIR}")
 
 # Compiler errors when turning this one on.
 #ADD_DEFINITIONS(-DU_HIDE_DEPRECATED_API)
@@ -236,14 +237,19 @@
   utrans.cpp
   vtzone.cpp
   vzone.cpp
-  windtfmt.cpp
-  winnmfmt.cpp
-  wintzimpl.cpp
   zonemeta.cpp
   zrule.cpp
   ztrans.cpp
 )
 
+IF(WIN32)
+  LIST(APPEND ICU_SOURCES
+    windtfmt.cpp
+    winnmfmt.cpp
+    wintzimpl.cpp
+    )
+ENDIF()
+
 ADD_LIBRARY(icui18n STATIC ${ICU_SOURCES})
 
 IF(LINUX OR (SOLARIS AND MY_COMPILER_IS_GNU_OR_CLANG))
diff -Nru mysql-8.0-8.0.26/extra/libcbor/CHANGELOG.md mysql-8.0-8.0.27/extra/libcbor/CHANGELOG.md
--- mysql-8.0-8.0.26/extra/libcbor/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/CHANGELOG.md	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,102 @@
+Next
+---------------------
+- BUILD BREAKING: Use BUILD_SHARED_LIBS to determine how to build libraries (fixed Windows linkage) [[#148]](https://github.com/PJK/libcbor/pull/148) (by [intelligide@](https://github.com/intelligide))
+- BREAKING: Fix `cbor_tag_item` not increasing the reference count on the tagged item reference it returns [[Fixes #109](https://github.com/PJK/libcbor/issues/109)] (discovered bt [JohnGilmour](https://github.com/JohnGilmour))
+  - If you have previously relied on the broken behavior, you can use `cbor_move` to emulate as long as the returned handle is an "rvalue"
+
+0.7.0 (2020-04-25)
+---------------------
+- Fix bad encoding of NaN half-floats [[Fixes #53]](https://github.com/PJK/libcbor/issues/53) (discovered by [BSipos-RKF](https://github.com/BSipos-RKF))
+    - **Warning**: Previous versions encoded NaNs as `0xf9e700` instead of `0xf97e00`; if you rely on the broken behavior, this will be a breaking change
+- Fix potentially bad encoding of negative half-float with exponent < -14 [[Fixes #112]](https://github.com/PJK/libcbor/issues/112) (discovered by [yami36](https://github.com/yami36))
+- BREAKING: Improved bool support [[Fixes #63]](https://github.com/PJK/libcbor/issues/63)
+    - Rename `cbor_ctrl_is_bool` to `cbor_get_bool` and fix the behavior
+    - Add `cbor_set_bool`
+- Fix memory_allocation_test breaking the build without CBOR_CUSTOM_ALLOC [[Fixes #128]](https://github.com/PJK/libcbor/issues/128) (by [panlinux](https://github.com/panlinux))
+- [Fix a potential build issue where cJSON includes may be misconfigured](https://github.com/PJK/libcbor/pull/132)
+- Breaking: [Add a limit on the size of the decoding context stack](https://github.com/PJK/libcbor/pull/138) (by [James-ZHANG](https://github.com/James-ZHANG))
+    - If your usecase requires parsing very deeply nested structures, you might need to increase the default 2k limit via `CBOR_MAX_STACK_SIZE` 
+- Enable LTO/IPO based on [CheckIPOSupported](https://cmake.org/cmake/help/latest/module/CheckIPOSupported.html#module:CheckIPOSupported) [[#143]](https://github.com/PJK/libcbor/pull/143) (by [xanderlent](https://github.com/xanderlent))
+    - If you rely on LTO being enabled and use CMake version older than 3.9, you will need to re-enable it manually or upgrade your CMake 
+
+0.6.1 (2020-03-26)
+---------------------
+- [Fix bad shared library version number](https://github.com/PJK/libcbor/pull/131)
+    - **Warning**: Shared library built from the 0.6.0 release is erroneously marked as version "0.6.0", which makes it incompatible with future releases *including the v0.6.X line* even though they may be compatible API/ABI-wise. Refer to the documentation for the new SO versioning scheme.
+
+0.6.0 (2020-03-15)
+---------------------
+- Correctly set .so version [[Fixes #52]](https://github.com/PJK/libcbor/issues/52). 
+    - **Warning**: All previous releases will be identified as 0.0 by the linker.
+- Fix & prevent heap overflow error in example code [[#74]](https://github.com/PJK/libcbor/pull/74) [[#76]](https://github.com/PJK/libcbor/pull/76) (by @nevun)
+- Correctly set OSX dynamic library version [[Fixes #75]](https://github.com/PJK/libcbor/issues/75)
+- [Fix misplaced 0xFF bytes in maps possibly causing memory corruption](https://github.com/PJK/libcbor/pull/82)
+- BREAKING: Fix handling & cleanup of failed memory allocation in constructor
+  and builder helper functions [[Fixes #84]](https://github.com/PJK/libcbor/issues/84)
+  - All cbor_new_* and cbor_build_* functions will now explicitly return NULL when memory allocation fails
+  - It is up to the client to handle such cases
+- Globally enforced code style [[Fixes #83]](https://github.com/PJK/libcbor/issues/83)
+- Fix issue possible memory corruption bug on repeated 
+  cbor_(byte)string_add_chunk calls with intermittently failing realloc calls
+- Fix possibly misaligned reads and writes when endian.h is uses or when
+  running on a big-endian machine [[Fixes #99](https://github.com/PJK/libcbor/issues/99), [#100](https://github.com/PJK/libcbor/issues/100)]
+- [Improved CI setup with Travis-native arm64 support](https://github.com/PJK/libcbor/pull/116)
+- [Docs migrated to Sphinx 2.4 and Python3](https://github.com/PJK/libcbor/pull/117)
+
+0.5.0 (2017-02-06)
+---------------------
+- Remove cmocka from the subtree (always rely on system or user-provided version)
+- Windows CI
+- Only build tests if explicitly enabled (`-DWITH_TESTS=ON`)
+- Fixed static header declarations (by cedric-d)
+- Improved documentation (by Michael Richardson)
+- Improved `examples/readfile.c`
+- Reworked (re)allocation to handle huge inputs and overflows in size_t [[Fixes #16]](https://github.com/PJK/libcbor/issues/16)
+- Improvements to C++ linkage (corrected `cbor_empty_callbacks`, fixed `restrict` pointers) (by Dennis Bijwaard)
+- Fixed Linux installation directory depending on architecture [[Fixes #34]](https://github.com/PJK/libcbor/issues/34) (by jvymazal)
+- Improved 32-bit support [[Fixes #35]](https://github.com/PJK/libcbor/issues/35)
+- Fixed MSVC compatibility [[Fixes #31]](https://github.com/PJK/libcbor/issues/31)
+- Fixed and improved half-float encoding [[Fixes #5](https://github.com/PJK/libcbor/issues/5), [#11](https://github.com/PJK/libcbor/issues/11)]
+
+0.4.0 (2015-12-25)
+---------------------
+Breaks build & header compatibility due to:
+
+- Improved build configuration and feature check macros
+- Endianess configuration fixes (by Erwin Kroon and David Grigsby)
+- pkg-config compatibility (by Vincent Bernat)
+- enable use of versioned SONAME (by Vincent Bernat)
+- better fuzzer (wasn't random until now, ooops)
+
+0.3.1 (2015-05-21)
+---------------------
+- documentation and comments improvements, mostly for the API reference
+
+0.3.0 (2015-05-21)
+---------------------
+
+- Fixes, polishing, niceties across the code base
+- Updated examples
+- `cbor_copy`
+- `cbor_build_negint8`, 16, 32, 64, matching asserts
+- `cbor_build_stringn`
+- `cbor_build_tag`
+- `cbor_build_float2`, ...
+
+0.2.1 (2015-05-17)
+---------------------
+- C99 support
+
+0.2.0 (2015-05-17)
+---------------------
+
+- `cbor_ctrl_bool` -> `cbor_ctrl_is_bool`
+- Added `cbor_array_allocated` & map equivalent
+- Overhauled endianess conversion - ARM now works as expected
+- 'sort.c' example added
+- Significantly improved and doxyfied documentation
+
+0.1.0 (2015-05-06)
+---------------------
+
+The initial release, yay!
diff -Nru mysql-8.0-8.0.26/extra/libcbor/CMakeLists.txt mysql-8.0-8.0.27/extra/libcbor/CMakeLists.txt
--- mysql-8.0-8.0.26/extra/libcbor/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,145 @@
+#cmake_minimum_required(VERSION 2.8)
+
+set(VERSION "0.7.0")
+
+IF(POLICY CMP0048)
+  CMAKE_POLICY(SET CMP0048 NEW)
+  project(libcbor VERSION ${VERSION} LANGUAGES C)
+ELSE()
+  project(libcbor C)
+ENDIF()
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMakeModules/")
+include(CTest)
+
+SET(CBOR_VERSION_MAJOR "0")
+SET(CBOR_VERSION_MINOR "7")
+SET(CBOR_VERSION_PATCH "0")
+SET(CBOR_VERSION ${CBOR_VERSION_MAJOR}.${CBOR_VERSION_MINOR}.${CBOR_VERSION_PATCH})
+
+set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY true)
+include(CheckIncludeFiles)
+
+include(TestBigEndian)
+test_big_endian(BIG_ENDIAN)
+if(BIG_ENDIAN)
+    add_definitions(-DIS_BIG_ENDIAN)
+endif()
+
+option(CBOR_CUSTOM_ALLOC "Custom, dynamically defined allocator support" OFF)
+option(CBOR_PRETTY_PRINTER "Include a pretty-printing routine" ON)
+set(CBOR_BUFFER_GROWTH "2" CACHE STRING "Factor for buffer growth & shrinking")
+set(CBOR_MAX_STACK_SIZE "2048" CACHE STRING "maximum size for decoding context stack")
+
+option(WITH_TESTS "[TEST] Build unit tests (requires CMocka)" OFF)
+if(WITH_TESTS)
+    add_definitions(-DWITH_TESTS)
+endif(WITH_TESTS)
+
+option(WITH_EXAMPLES "Build examples" ON)
+
+option(HUGE_FUZZ "[TEST] Fuzz through 8GB of data in the test. Do not use with memory instrumentation!" OFF)
+if(HUGE_FUZZ)
+    add_definitions(-DHUGE_FUZZ)
+endif(HUGE_FUZZ)
+
+option(SANE_MALLOC "[TEST] Assume that malloc will not allocate multi-GB blocks. Tests only, platform specific" OFF)
+if(SANE_MALLOC)
+    add_definitions(-DSANE_MALLOC)
+endif(SANE_MALLOC)
+
+option(PRINT_FUZZ "[TEST] Print the fuzzer input" OFF)
+if(PRINT_FUZZ)
+    add_definitions(-DPRINT_FUZZ)
+endif(PRINT_FUZZ)
+
+set(CPACK_GENERATOR "DEB" "TGZ" "RPM")
+set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")
+set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Pavel Kalvoda")
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6")
+set(CPACK_PACKAGE_VERSION_MAJOR ${CBOR_VERSION_MAJOR})
+set(CPACK_PACKAGE_VERSION_MINOR ${CBOR_VERSION_MINOR})
+set(CPACK_PACKAGE_VERSION_PATCH ${CBOR_VERSION_PATCH})
+
+include(CPack)
+
+if(MINGW)
+    # https://github.com/PJK/libcbor/issues/13
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
+elseif(NOT MSVC)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -pedantic")
+endif()
+
+if(MSVC)
+    # This just doesn't work right -- https://msdn.microsoft.com/en-us/library/5ft82fed.aspx
+    set(CBOR_RESTRICT_SPECIFIER "")
+else()
+    set(CBOR_RESTRICT_SPECIFIER "restrict")
+
+    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -Wall -g -ggdb -DDEBUG=true")
+    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -Wall -DNDEBUG")
+
+endif()
+
+set(CMAKE_EXE_LINKER_FLAGS_DEBUG "-g")
+
+
+include(CheckTypeSize)
+check_type_size("size_t" SIZEOF_SIZE_T)
+if(SIZEOF_SIZE_T LESS 8)
+    message(WARNING "Your size_t is less than 8 bytes. Long items with 64b length specifiers might not work as expected. Make sure to run the tests!")
+else()
+    add_definitions(-DEIGHT_BYTE_SIZE_T)
+endif()
+
+enable_testing()
+
+set(CTEST_MEMORYCHECK_COMMAND "/usr/bin/valgrind")
+set(MEMORYCHECK_COMMAND_OPTIONS "--tool=memcheck --track-origins=yes --leak-check=full --error-exitcode=1")
+
+add_custom_target(coverage
+                  COMMAND ctest
+                  COMMAND lcov --capture --directory . --output-file coverage.info
+                  COMMAND genhtml coverage.info --highlight --legend --output-directory coverage_html
+                  COMMAND echo "Coverage report ready: file://${CMAKE_CURRENT_BINARY_DIR}/coverage_html/index.html")
+include_directories(src)
+
+
+option(COVERAGE "Enable code coverage instrumentation" OFF)
+if (COVERAGE)
+    message("Configuring code coverage instrumentation")
+    if(NOT CMAKE_C_COMPILER MATCHES "gcc")
+        message(WARNING "Gcov instrumentation only works with GCC")
+    endif()
+    # https://gcc.gnu.org/onlinedocs/gcc/Debugging-Options.html
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -fprofile-arcs -ftest-coverage --coverage")
+    set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -g -fprofile-arcs -ftest-coverage --coverage")
+endif (COVERAGE)
+
+# We want to generate configuration.h from the template and make it so that it is accessible using the same
+# path during both library build and installed header use, without littering the source dir.
+# Using cbor/configuration.h in the build dir works b/c headers will be installed to <prefix>/cbor
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/cbor/configuration.h.in ${PROJECT_BINARY_DIR}/cbor/configuration.h)
+# Make the header visible at compile time
+include_directories(${PROJECT_BINARY_DIR})
+
+# CMake >= 3.9.0 enables LTO for GCC and Clang with INTERPROCEDURAL_OPTIMIZATION
+# Policy CMP0069 enables this behavior when we set the minimum CMake version < 3.9.0
+# Checking for LTO support before setting INTERPROCEDURAL_OPTIMIZATION is mandatory with CMP0069 set to NEW.
+set(use_lto FALSE)
+if(${CMAKE_VERSION} VERSION_GREATER "3.9.0" OR ${CMAKE_VERSION} VERSION_EQUAL "3.9.0")
+    cmake_policy(SET CMP0069 NEW)
+    # Require LTO support to build libcbor with newer CMake versions
+    include(CheckIPOSupported)
+    check_ipo_supported(RESULT use_lto)
+endif(${CMAKE_VERSION} VERSION_GREATER "3.9.0" OR ${CMAKE_VERSION} VERSION_EQUAL "3.9.0")
+if(use_lto)
+    message(STATUS "LTO is enabled")
+else()
+    message(STATUS "LTO is not enabled")
+endif(use_lto)
+
+subdirs(src)
+if(use_lto)
+    set_property(DIRECTORY src PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
+endif(use_lto)
diff -Nru mysql-8.0-8.0.26/extra/libcbor/CMakeModules/FindCJSON.cmake mysql-8.0-8.0.27/extra/libcbor/CMakeModules/FindCJSON.cmake
--- mysql-8.0-8.0.26/extra/libcbor/CMakeModules/FindCJSON.cmake	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/CMakeModules/FindCJSON.cmake	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,9 @@
+include (LibFindMacros)
+
+find_path(CJSON_INCLUDE_DIR NAMES cjson/cJSON.h)
+find_library(CJSON_LIBRARY NAMES cjson)
+
+set(CJSON_PROCESS_INCLUDES CJSON_INCLUDE_DIR)
+set(CJSON_PROCESS_LIBS CJSON_LIBRARY)
+
+libfind_process(CJSON)
diff -Nru mysql-8.0-8.0.26/extra/libcbor/CMakeModules/FindCMocka.cmake mysql-8.0-8.0.27/extra/libcbor/CMakeModules/FindCMocka.cmake
--- mysql-8.0-8.0.26/extra/libcbor/CMakeModules/FindCMocka.cmake	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/CMakeModules/FindCMocka.cmake	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,49 @@
+# - Try to find CMocka
+# Once done this will define
+#
+#  CMOCKA_ROOT_DIR - Set this variable to the root installation of CMocka
+#
+# Read-Only variables:
+#  CMOCKA_FOUND - system has CMocka
+#  CMOCKA_INCLUDE_DIR - the CMocka include directory
+#  CMOCKA_LIBRARIES - Link these to use CMocka
+#  CMOCKA_DEFINITIONS - Compiler switches required for using CMocka
+#
+#=============================================================================
+#  Copyright (c) 2011-2012 Andreas Schneider <asn@cryptomilk.org>
+#
+#  Distributed under the OSI-approved BSD License (the "License");
+#  see accompanying file Copyright.txt for details.
+#
+#  This software is distributed WITHOUT ANY WARRANTY; without even the
+#  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#  See the License for more information.
+#=============================================================================
+#
+
+find_path(CMOCKA_INCLUDE_DIR
+    NAMES
+        cmocka.h
+    PATHS
+        ${CMOCKA_ROOT_DIR}/include
+)
+
+find_library(CMOCKA_LIBRARY
+    NAMES
+        cmocka cmocka_shared
+    PATHS
+        ${CMOCKA_ROOT_DIR}/include
+)
+
+if (CMOCKA_LIBRARY)
+  set(CMOCKA_LIBRARIES
+      ${CMOCKA_LIBRARIES}
+      ${CMOCKA_LIBRARY}
+  )
+endif (CMOCKA_LIBRARY)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(CMocka DEFAULT_MSG CMOCKA_LIBRARIES CMOCKA_INCLUDE_DIR)
+
+# show the CMOCKA_INCLUDE_DIR and CMOCKA_LIBRARIES variables only in the advanced view
+mark_as_advanced(CMOCKA_INCLUDE_DIR CMOCKA_LIBRARIES)
diff -Nru mysql-8.0-8.0.26/extra/libcbor/CMakeModules/LibFindMacros.cmake mysql-8.0-8.0.27/extra/libcbor/CMakeModules/LibFindMacros.cmake
--- mysql-8.0-8.0.26/extra/libcbor/CMakeModules/LibFindMacros.cmake	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/CMakeModules/LibFindMacros.cmake	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,120 @@
+#    Fetched from https://github.com/JonathanSalwan/Triton/blob/master/CMakeModules/LibFindMacros.cmake
+#
+#    Copyright:
+#
+#    * Jonathan Salwan (Quarkslab)
+#    * Pierrick Brunet (Quarkslab)
+#    * Romain Thomas (Quarkslab)
+#    * Florent Saudel (Bordeaux University)
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+# Works the same as find_package, but forwards the "REQUIRED" and "QUIET" arguments
+# used for the current package. For this to work, the first parameter must be the
+# prefix of the current package, then the prefix of the new package etc, which are
+# passed to find_package.
+macro (libfind_package PREFIX)
+    set (LIBFIND_PACKAGE_ARGS ${ARGN})
+    if (${PREFIX}_FIND_QUIETLY)
+        set (LIBFIND_PACKAGE_ARGS ${LIBFIND_PACKAGE_ARGS} QUIET)
+    endif (${PREFIX}_FIND_QUIETLY)
+    if (${PREFIX}_FIND_REQUIRED)
+        set (LIBFIND_PACKAGE_ARGS ${LIBFIND_PACKAGE_ARGS} REQUIRED)
+    endif (${PREFIX}_FIND_REQUIRED)
+    find_package(${LIBFIND_PACKAGE_ARGS})
+endmacro (libfind_package)
+
+# CMake developers made the UsePkgConfig system deprecated in the same release (2.6)
+# where they added pkg_check_modules. Consequently I need to support both in my scripts
+# to avoid those deprecated warnings. Here's a helper that does just that.
+# Works identically to pkg_check_modules, except that no checks are needed prior to use.
+macro (libfind_pkg_check_modules PREFIX PKGNAME)
+    if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
+        include(UsePkgConfig)
+        pkgconfig(${PKGNAME} ${PREFIX}_INCLUDE_DIRS ${PREFIX}_LIBRARY_DIRS ${PREFIX}_LDFLAGS ${PREFIX}_CFLAGS)
+    else (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
+        find_package(PkgConfig)
+        if (PKG_CONFIG_FOUND)
+            pkg_check_modules(${PREFIX} ${PKGNAME})
+        endif (PKG_CONFIG_FOUND)
+    endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
+endmacro (libfind_pkg_check_modules)
+
+# Do the final processing once the paths have been detected.
+# If include dirs are needed, ${PREFIX}_PROCESS_INCLUDES should be set to contain
+# all the variables, each of which contain one include directory.
+# Ditto for ${PREFIX}_PROCESS_LIBS and library files.
+# Will set ${PREFIX}_FOUND, ${PREFIX}_INCLUDE_DIRS and ${PREFIX}_LIBRARIES.
+# Also handles errors in case library detection was required, etc.
+macro (libfind_process PREFIX)
+    # Skip processing if already processed during this run
+    if (NOT ${PREFIX}_FOUND)
+        # Start with the assumption that the library was found
+        set (${PREFIX}_FOUND TRUE)
+
+        # Process all includes and set _FOUND to false if any are missing
+        foreach (i ${${PREFIX}_PROCESS_INCLUDES})
+            if (${i})
+                set (${PREFIX}_INCLUDE_DIRS ${${PREFIX}_INCLUDE_DIRS} ${${i}})
+                mark_as_advanced(${i})
+            else (${i})
+                set (${PREFIX}_FOUND FALSE)
+            endif (${i})
+        endforeach (i)
+
+        # Process all libraries and set _FOUND to false if any are missing
+        foreach (i ${${PREFIX}_PROCESS_LIBS})
+            if (${i})
+                set (${PREFIX}_LIBRARIES ${${PREFIX}_LIBRARIES} ${${i}})
+                mark_as_advanced(${i})
+            else (${i})
+                set (${PREFIX}_FOUND FALSE)
+            endif (${i})
+        endforeach (i)
+
+        # Print message and/or exit on fatal error
+        if (${PREFIX}_FOUND)
+            if (NOT ${PREFIX}_FIND_QUIETLY)
+                message (STATUS "Found ${PREFIX} include directory: ${${PREFIX}_INCLUDE_DIR}")
+                message (STATUS "Found ${PREFIX} library: ${${PREFIX}_LIBRARY}")
+            endif (NOT ${PREFIX}_FIND_QUIETLY)
+        else (${PREFIX}_FOUND)
+            if (${PREFIX}_FIND_REQUIRED)
+                foreach (i ${${PREFIX}_PROCESS_INCLUDES} ${${PREFIX}_PROCESS_LIBS})
+                    message("${i}=${${i}}")
+                endforeach (i)
+                message (FATAL_ERROR "Required library ${PREFIX} NOT FOUND.\nInstall the library (dev version) and try again. If the library is already installed, use ccmake to set the missing variables manually.")
+            endif (${PREFIX}_FIND_REQUIRED)
+        endif (${PREFIX}_FOUND)
+    endif (NOT ${PREFIX}_FOUND)
+endmacro (libfind_process)
+
+macro(libfind_library PREFIX basename)
+    set(TMP "")
+    if(MSVC80)
+        set(TMP -vc80)
+    endif(MSVC80)
+    if(MSVC90)
+        set(TMP -vc90)
+    endif(MSVC90)
+    set(${PREFIX}_LIBNAMES ${basename}${TMP})
+    if(${ARGC} GREATER 2)
+        set(${PREFIX}_LIBNAMES ${basename}${TMP}-${ARGV2})
+        string(REGEX REPLACE "\\." "_" TMP ${${PREFIX}_LIBNAMES})
+        set(${PREFIX}_LIBNAMES ${${PREFIX}_LIBNAMES} ${TMP})
+    endif(${ARGC} GREATER 2)
+    find_library(${PREFIX}_LIBRARY
+            NAMES ${${PREFIX}_LIBNAMES}
+            PATHS ${${PREFIX}_PKGCONF_LIBRARY_DIRS}
+            )
+endmacro(libfind_library)
diff -Nru mysql-8.0-8.0.26/extra/libcbor/doc/doxy_frontpage.md mysql-8.0-8.0.27/extra/libcbor/doc/doxy_frontpage.md
--- mysql-8.0-8.0.26/extra/libcbor/doc/doxy_frontpage.md	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/doc/doxy_frontpage.md	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,37 @@
+
+
+This is the development reference of [libcbor](https://github.com/PJK/libcbor). Looking for the [user documentation](https://libcbor.readthedocs.io/)?
+
+
+# Where to start
+
+A couple of pointers for you to start with: `0x00000000`, `0xDEADBEEF`.
+
+If you just want to peek under the hood, have a look at:
+ - \ref src/cbor/common.h
+ - \ref src/cbor/encoding.h
+ - \ref src/cbor.h
+
+If you want to implement your own decoder or see how the default one is made:
+ - \ref src/cbor/internal/builder_callbacks.h
+ - \ref src/cbor/internal/stack.h
+
+For details on encoding and packing (could be useful when porting to exotic platforms):
+ - \ref src/cbor/internal/encoders.h
+ - \ref src/cbor/internal/loaders.h
+
+Streaming driver:
+ - \ref src/cbor/streaming.h
+
+Manipulation routines for particular types:
+ - \ref src/cbor/ints.h
+ - \ref src/cbor/bytestrings.h
+ - \ref src/cbor/strings.h
+ - \ref src/cbor/arrays.h
+ - \ref src/cbor/maps.h
+ - \ref src/cbor/tags.h
+ - \ref src/cbor/floats_ctrls.h
+
+# How to contribute
+
+Please refer to [the repository](https://github.com/PJK/libcbor)
diff -Nru mysql-8.0-8.0.26/extra/libcbor/doc/make.bat mysql-8.0-8.0.27/extra/libcbor/doc/make.bat
--- mysql-8.0-8.0.26/extra/libcbor/doc/make.bat	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/doc/make.bat	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,242 @@
+@ECHO OFF
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+	set SPHINXBUILD=sphinx-build
+)
+set BUILDDIR=build
+set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% source
+set I18NSPHINXOPTS=%SPHINXOPTS% source
+if NOT "%PAPER%" == "" (
+	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
+	set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS%
+)
+
+if "%1" == "" goto help
+
+if "%1" == "help" (
+	:help
+	echo.Please use `make ^<target^>` where ^<target^> is one of
+	echo.  html       to make standalone HTML files
+	echo.  dirhtml    to make HTML files named index.html in directories
+	echo.  singlehtml to make a single large HTML file
+	echo.  pickle     to make pickle files
+	echo.  json       to make JSON files
+	echo.  htmlhelp   to make HTML files and a HTML help project
+	echo.  qthelp     to make HTML files and a qthelp project
+	echo.  devhelp    to make HTML files and a Devhelp project
+	echo.  epub       to make an epub
+	echo.  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter
+	echo.  text       to make text files
+	echo.  man        to make manual pages
+	echo.  texinfo    to make Texinfo files
+	echo.  gettext    to make PO message catalogs
+	echo.  changes    to make an overview over all changed/added/deprecated items
+	echo.  xml        to make Docutils-native XML files
+	echo.  pseudoxml  to make pseudoxml-XML files for display purposes
+	echo.  linkcheck  to check all external links for integrity
+	echo.  doctest    to run all doctests embedded in the documentation if enabled
+	goto end
+)
+
+if "%1" == "clean" (
+	for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
+	del /q /s %BUILDDIR%\*
+	goto end
+)
+
+
+%SPHINXBUILD% 2> nul
+if errorlevel 9009 (
+	echo.
+	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
+	echo.installed, then set the SPHINXBUILD environment variable to point
+	echo.to the full path of the 'sphinx-build' executable. Alternatively you
+	echo.may add the Sphinx directory to PATH.
+	echo.
+	echo.If you don't have Sphinx installed, grab it from
+	echo.http://sphinx-doc.org/
+	exit /b 1
+)
+
+if "%1" == "html" (
+	%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/html.
+	goto end
+)
+
+if "%1" == "dirhtml" (
+	%SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml.
+	goto end
+)
+
+if "%1" == "singlehtml" (
+	%SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml.
+	goto end
+)
+
+if "%1" == "pickle" (
+	%SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can process the pickle files.
+	goto end
+)
+
+if "%1" == "json" (
+	%SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can process the JSON files.
+	goto end
+)
+
+if "%1" == "htmlhelp" (
+	%SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can run HTML Help Workshop with the ^
+.hhp project file in %BUILDDIR%/htmlhelp.
+	goto end
+)
+
+if "%1" == "qthelp" (
+	%SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can run "qcollectiongenerator" with the ^
+.qhcp project file in %BUILDDIR%/qthelp, like this:
+	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\libcbor.qhcp
+	echo.To view the help file:
+	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\libcbor.ghc
+	goto end
+)
+
+if "%1" == "devhelp" (
+	%SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished.
+	goto end
+)
+
+if "%1" == "epub" (
+	%SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The epub file is in %BUILDDIR%/epub.
+	goto end
+)
+
+if "%1" == "latex" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; the LaTeX files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "latexpdf" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	cd %BUILDDIR%/latex
+	make all-pdf
+	cd %BUILDDIR%/..
+	echo.
+	echo.Build finished; the PDF files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "latexpdfja" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	cd %BUILDDIR%/latex
+	make all-pdf-ja
+	cd %BUILDDIR%/..
+	echo.
+	echo.Build finished; the PDF files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "text" (
+	%SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The text files are in %BUILDDIR%/text.
+	goto end
+)
+
+if "%1" == "man" (
+	%SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The manual pages are in %BUILDDIR%/man.
+	goto end
+)
+
+if "%1" == "texinfo" (
+	%SPHINXBUILD% -b texinfo %ALLSPHINXOPTS% %BUILDDIR%/texinfo
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The Texinfo files are in %BUILDDIR%/texinfo.
+	goto end
+)
+
+if "%1" == "gettext" (
+	%SPHINXBUILD% -b gettext %I18NSPHINXOPTS% %BUILDDIR%/locale
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The message catalogs are in %BUILDDIR%/locale.
+	goto end
+)
+
+if "%1" == "changes" (
+	%SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.The overview file is in %BUILDDIR%/changes.
+	goto end
+)
+
+if "%1" == "linkcheck" (
+	%SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Link check complete; look for any errors in the above output ^
+or in %BUILDDIR%/linkcheck/output.txt.
+	goto end
+)
+
+if "%1" == "doctest" (
+	%SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Testing of doctests in the sources finished, look at the ^
+results in %BUILDDIR%/doctest/output.txt.
+	goto end
+)
+
+if "%1" == "xml" (
+	%SPHINXBUILD% -b xml %ALLSPHINXOPTS% %BUILDDIR%/xml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The XML files are in %BUILDDIR%/xml.
+	goto end
+)
+
+if "%1" == "pseudoxml" (
+	%SPHINXBUILD% -b pseudoxml %ALLSPHINXOPTS% %BUILDDIR%/pseudoxml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The pseudo-XML files are in %BUILDDIR%/pseudoxml.
+	goto end
+)
+
+:end
diff -Nru mysql-8.0-8.0.26/extra/libcbor/doc/source/api/decoding.rst mysql-8.0-8.0.27/extra/libcbor/doc/source/api/decoding.rst
--- mysql-8.0-8.0.26/extra/libcbor/doc/source/api/decoding.rst	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/doc/source/api/decoding.rst	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,53 @@
+Decoding
+=============================
+
+The following diagram illustrates the relationship among different parts of libcbor from the decoding standpoint.
+
+::
+
+    ┌──────────────────────────────────────────────────────────────────────────────────────────────�
+    │                                                                                              │
+    │                                      Client application                                      │
+    │                                                                                              │
+    │                                                 ┌────────────────────────────────────────────┘
+    │                                                 │                     ↕
+    │                                                 │ ┌──────────────────────────────────────────�
+    │                                                 │ │                                          │
+    │                                                 │ │          Manipulation routines           │
+    │                                                 │ │                                          │
+    │           ┌─────────────────────────────────────┘ └──────────────────────────────────────────┘
+    │           │     ↑    ↑                  ↑                              ↑
+    │           │     │    │    ┌─────────────╫──────────┬───────────────────┴─�
+    │           │     │   CDS   │             ║          │                     │
+    │           │     │    │   PDS            ║         PDS                   PDS
+    │           │     ↓    ↓    ↓             ↓          ↓                     ↓
+    │           │ ┌─────────────────�   ┌────────────────────�   ┌────────────────────────────�
+    │           │ │                 │   │                    │   │                            │
+    │           │ │  Custom driver  │ ↔ │  Streaming driver  │ ↔ │       Default driver       │ ↔ CD
+    │           │ │                 │   │                    │   │                            │
+    └───────────┘ └─────────────────┘   └────────────────────┘   └────────────────────────────┘
+          ↕                ↕                        ↕                           ↕
+    ┌──────────────────────────────────────────────────────────────────────────────────────────────�
+    │                                                                                              │
+    │                            Stateless event─driven decoder                                    │
+    │                                                                                              │
+    └──────────────────────────────────────────────────────────────────────────────────────────────┘
+
+                  (PSD = Provided Data Structures, CDS = Custom Data Structures)
+
+This section will deal with the API that is labeled as the "Default driver" in the diagram. That is, routines that
+decode complete libcbor data items
+
+.. doxygenfunction:: cbor_load
+
+Associated data structures
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. doxygenenum:: cbor_error_code
+
+.. doxygenstruct:: cbor_load_result
+    :members:
+
+.. doxygenstruct:: cbor_error
+    :members:
+
diff -Nru mysql-8.0-8.0.26/extra/libcbor/doc/source/api/encoding.rst mysql-8.0-8.0.27/extra/libcbor/doc/source/api/encoding.rst
--- mysql-8.0-8.0.26/extra/libcbor/doc/source/api/encoding.rst	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/doc/source/api/encoding.rst	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,23 @@
+Encoding
+=============================
+
+The easiest way to encode data items is using the :func:`cbor_serialize` or :func:`cbor_serialize_alloc` functions:
+
+.. doxygenfunction:: cbor_serialize
+.. doxygenfunction:: cbor_serialize_alloc
+
+Type-specific serializers
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+In case you know the type of the item you want to serialize beforehand, you can use one
+of the type-specific serializers.
+
+.. note:: Unless compiled in debug mode, these do not verify the type. Passing an incorrect item will result in an undefined behavior.
+
+.. doxygenfunction:: cbor_serialize_uint
+.. doxygenfunction:: cbor_serialize_negint
+.. doxygenfunction:: cbor_serialize_bytestring
+.. doxygenfunction:: cbor_serialize_string
+.. doxygenfunction:: cbor_serialize_array
+.. doxygenfunction:: cbor_serialize_map
+.. doxygenfunction:: cbor_serialize_tag
+.. doxygenfunction:: cbor_serialize_float_ctrl
diff -Nru mysql-8.0-8.0.26/extra/libcbor/doc/source/api/item_reference_counting.rst mysql-8.0-8.0.27/extra/libcbor/doc/source/api/item_reference_counting.rst
--- mysql-8.0-8.0.26/extra/libcbor/doc/source/api/item_reference_counting.rst	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/doc/source/api/item_reference_counting.rst	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,41 @@
+Memory management and reference counting
+===============================================
+
+Due to the nature of its domain, *libcbor* will need to work with heap memory. The stateless decoder and encoder don't allocate any memory.
+
+If you have specific requirements, you should consider rolling your own driver for the stateless API.
+
+Using custom allocator
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+*libcbor* gives you with the ability to provide your own implementations of ``malloc``, ``realloc``, and ``free``. This can be useful if you are using a custom allocator throughout your application, or if you want to implement custom policies (e.g. tighter restrictions on the amount of allocated memory).
+
+In order to use this feature, *libcbor* has to be compiled with the :doc:`appropriate flags </getting_started>`. You can verify the configuration using the ``CBOR_CUSTOM_ALLOC`` macro. A simple usage might be as follows:
+
+.. code-block:: c
+
+	#if CBOR_CUSTOM_ALLOC
+		cbor_set_allocs(malloc, realloc, free);
+	#else
+	   #error "libcbor built with support for custom allocation is required"
+	#endif
+
+.. doxygenfunction:: cbor_set_allocs
+
+
+Reference counting
+^^^^^^^^^^^^^^^^^^^^^
+
+As CBOR items may require complex cleanups at the end of their lifetime, there is a reference counting mechanism in place. This also enables very simple GC when integrating *libcbor* into managed environment. Every item starts its life (by either explicit creation, or as a result of parsing) with reference count set to 1. When the refcount reaches zero, it will be destroyed.
+
+Items containing nested items will be destroyed recursively - refcount of every nested item will be decreased by one.
+
+The destruction is synchronous and renders any pointers to items with refcount zero invalid immediately after calling the :func:`cbor_decref`.
+
+
+.. doxygenfunction:: cbor_incref
+.. doxygenfunction:: cbor_decref
+.. doxygenfunction:: cbor_intermediate_decref
+.. doxygenfunction:: cbor_refcount
+.. doxygenfunction:: cbor_move
+.. doxygenfunction:: cbor_copy
diff -Nru mysql-8.0-8.0.26/extra/libcbor/doc/source/api/item_types.rst mysql-8.0-8.0.27/extra/libcbor/doc/source/api/item_types.rst
--- mysql-8.0-8.0.26/extra/libcbor/doc/source/api/item_types.rst	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/doc/source/api/item_types.rst	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,41 @@
+Types of items
+===============================================
+
+Every :type:`cbor_item_t` has a :type:`cbor_type` associated with it - these constants correspond to the types specified by the `CBOR standard <http://tools.ietf.org/html/rfc7049>`_:
+
+.. doxygenenum:: cbor_type
+
+To find out the type of an item, one can use
+
+.. doxygenfunction:: cbor_typeof
+
+Please note the distinction between functions like :func:`cbor_isa_uint()` and :func:`cbor_is_int()`. The following functions work solely with the major type value.
+
+
+Binary queries
+------------------------
+
+Alternatively, there are functions to query each particular type.
+
+.. warning:: Passing an invalid :type:`cbor_item_t` reference to any of these functions results in undefined behavior.
+
+.. doxygenfunction:: cbor_isa_uint
+.. doxygenfunction:: cbor_isa_negint
+.. doxygenfunction:: cbor_isa_bytestring
+.. doxygenfunction:: cbor_isa_string
+.. doxygenfunction:: cbor_isa_array
+.. doxygenfunction:: cbor_isa_map
+.. doxygenfunction:: cbor_isa_tag
+.. doxygenfunction:: cbor_isa_float_ctrl
+
+
+Logical queries
+------------------------
+
+These functions provide information about the item type from a more high-level perspective
+
+.. doxygenfunction:: cbor_is_int
+.. doxygenfunction:: cbor_is_float
+.. doxygenfunction:: cbor_is_bool
+.. doxygenfunction:: cbor_is_null
+.. doxygenfunction:: cbor_is_undef
diff -Nru mysql-8.0-8.0.26/extra/libcbor/doc/source/api/type_0_1.rst mysql-8.0-8.0.27/extra/libcbor/doc/source/api/type_0_1.rst
--- mysql-8.0-8.0.26/extra/libcbor/doc/source/api/type_0_1.rst	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/doc/source/api/type_0_1.rst	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,91 @@
+Types 0 & 1 – Positive and negative integers
+===============================================
+
+*CBOR* has two types of integers – positive (which may be effectively regarded as unsigned), and negative. There are four possible widths for an integer – 1, 2, 4, or 8 bytes. These are represented by
+
+.. doxygenenum:: cbor_int_width
+
+
+Type 0 - positive integers
+--------------------------
+==================================  =========================================
+Corresponding :type:`cbor_type`     ``CBOR_TYPE_UINT``
+Number of allocations               One per lifetime
+Storage requirements                ``sizeof(cbor_item_t) + sizeof(uint*_t)``
+==================================  =========================================
+
+**Note:** once a positive integer has been created, its width *cannot* be changed.
+
+Type 1 - negative integers
+--------------------------
+==================================  =========================================
+Corresponding :type:`cbor_type`     ``CBOR_TYPE_NEGINT``
+Number of allocations               One per lifetime
+Storage requirements                ``sizeof(cbor_item_t) + sizeof(uint*_t)``
+==================================  =========================================
+
+**Note:** once a positive integer has been created, its width *cannot* be changed.
+
+Type 0 & 1
+-------------
+Due to their largely similar semantics, the following functions can be used for both Type 0 and Type 1 items. One can convert between them freely using `the conversion functions <#dealing-with-signedness>`_.
+
+Actual Type of the integer can be checked using :doc:`item types API <item_types>`.
+
+
+
+An integer item is created with one of the four widths. Because integers' `storage is bundled together with the handle </internal#c.cbor_item_t.data>`_, the width cannot be changed over its lifetime.
+
+.. warning::
+
+    Due to the fact that CBOR negative integers represent integers in the range :math:`[-1, -2^N]`, ``cbor_set_uint`` API is somewhat counter-intuitive as the resulting logical value is 1 less. This behavior is necessary in order to permit uniform manipulation with the full range of permitted values. For example, the following snippet
+
+    .. code-block:: c
+
+        cbor_item_t * item = cbor_new_int8();
+        cbor_mark_negint(item);
+        cbor_set_uint8(0);
+
+    will produce an item with the logical value of :math:`-1`. There is, however, an upside to this as well: There is only one representation of zero.
+
+
+Building new items
+------------------------
+.. doxygenfunction:: cbor_build_uint8
+.. doxygenfunction:: cbor_build_uint16
+.. doxygenfunction:: cbor_build_uint32
+.. doxygenfunction:: cbor_build_uint64
+
+
+Retrieving values
+------------------------
+.. doxygenfunction:: cbor_get_uint8
+.. doxygenfunction:: cbor_get_uint16
+.. doxygenfunction:: cbor_get_uint32
+.. doxygenfunction:: cbor_get_uint64
+
+Setting values
+------------------------
+
+.. doxygenfunction:: cbor_set_uint8
+.. doxygenfunction:: cbor_set_uint16
+.. doxygenfunction:: cbor_set_uint32
+.. doxygenfunction:: cbor_set_uint64
+
+Dealing with width
+---------------------
+.. doxygenfunction:: cbor_int_get_width
+
+Dealing with signedness
+--------------------------
+
+.. doxygenfunction:: cbor_mark_uint
+.. doxygenfunction:: cbor_mark_negint
+
+Creating new items
+------------------------
+
+.. doxygenfunction:: cbor_new_int8
+.. doxygenfunction:: cbor_new_int16
+.. doxygenfunction:: cbor_new_int32
+.. doxygenfunction:: cbor_new_int64
diff -Nru mysql-8.0-8.0.26/extra/libcbor/doc/source/api/type_2.rst mysql-8.0-8.0.27/extra/libcbor/doc/source/api/type_2.rst
--- mysql-8.0-8.0.26/extra/libcbor/doc/source/api/type_2.rst	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/doc/source/api/type_2.rst	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,66 @@
+Type 2 – Byte strings
+=============================
+
+CBOR byte strings are just (ordered) series of bytes without further interpretation (unless there is a :doc:`tag <type_6>`). Byte string's length may or may not be known during encoding. These two kinds of byte strings can be distinguished using :func:`cbor_bytestring_is_definite` and :func:`cbor_bytestring_is_indefinite` respectively.
+
+In case a byte string is indefinite, it is encoded as a series of definite byte strings. These are called "chunks". For example, the encoded item
+
+::
+
+    0xf5	    Start indefinite byte string
+	0x41	    Byte string (1B long)
+	    0x00
+	0x41	    Byte string (1B long)
+	    0xff
+	0xff	    "Break" control token
+
+represents two bytes, ``0x00`` and ``0xff``. This on one hand enables streaming messages even before they are fully generated, but on the other hand it adds more complexity to the client code.
+
+
+==================================  ======================================================
+Corresponding :type:`cbor_type`     ``CBOR_TYPE_BYTESTRING``
+Number of allocations (definite)    One plus any manipulations with the data
+Number of allocations (indefinite)  One plus logarithmically many
+                                    reallocations relative  to chunk count
+Storage requirements (definite)     ``sizeof(cbor_item_t) + length(handle)``
+Storage requirements (indefinite)   ``sizeof(cbor_item_t) * (1 + chunk_count) + chunks``
+==================================  ======================================================
+
+
+Streaming indefinite byte strings
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Please refer to :doc:`/streaming`.
+
+Getting metadata
+~~~~~~~~~~~~~~~~~
+
+.. doxygenfunction:: cbor_bytestring_length
+.. doxygenfunction:: cbor_bytestring_is_definite
+.. doxygenfunction:: cbor_bytestring_is_indefinite
+.. doxygenfunction:: cbor_bytestring_chunk_count
+
+Reading data
+~~~~~~~~~~~~~
+
+.. doxygenfunction:: cbor_bytestring_handle
+.. doxygenfunction:: cbor_bytestring_chunks_handle
+
+Creating new items
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. doxygenfunction:: cbor_new_definite_bytestring
+.. doxygenfunction:: cbor_new_indefinite_bytestring
+
+
+Building items
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.. doxygenfunction:: cbor_build_bytestring
+
+
+Manipulating existing items
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. doxygenfunction:: cbor_bytestring_set_handle
+.. doxygenfunction:: cbor_bytestring_add_chunk
+
diff -Nru mysql-8.0-8.0.26/extra/libcbor/doc/source/api/type_3.rst mysql-8.0-8.0.27/extra/libcbor/doc/source/api/type_3.rst
--- mysql-8.0-8.0.26/extra/libcbor/doc/source/api/type_3.rst	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/doc/source/api/type_3.rst	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,55 @@
+Type 3 – UTF-8 strings 
+=============================
+
+CBOR strings work in much the same ways as :doc:`type_2`.
+
+==================================  ======================================================
+Corresponding :type:`cbor_type`     ``CBOR_TYPE_STRING``
+Number of allocations (definite)    One plus any manipulations with the data
+Number of allocations (indefinite)  One plus logarithmically many
+                                    reallocations relative  to chunk count
+Storage requirements (definite)     ``sizeof(cbor_item_t) + length(handle)``
+Storage requirements (indefinite)   ``sizeof(cbor_item_t) * (1 + chunk_count) + chunks``
+==================================  ======================================================
+
+Streaming indefinite strings
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Please refer to :doc:`/streaming`.
+
+UTF-8 encoding validation
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+*libcbor* considers UTF-8 encoding validity to be a part of the well-formedness notion of CBOR and therefore invalid UTF-8 strings will be rejected by the parser. Strings created by the user are not checked.
+
+
+Getting metadata
+~~~~~~~~~~~~~~~~~
+
+.. doxygenfunction:: cbor_string_length
+.. doxygenfunction:: cbor_string_is_definite
+.. doxygenfunction:: cbor_string_is_indefinite
+.. doxygenfunction:: cbor_string_chunk_count
+
+Reading data
+~~~~~~~~~~~~~
+
+.. doxygenfunction:: cbor_string_handle
+.. doxygenfunction:: cbor_string_chunks_handle
+
+Creating new items
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. doxygenfunction:: cbor_new_definite_string
+.. doxygenfunction:: cbor_new_indefinite_string
+
+
+Building items
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.. doxygenfunction:: cbor_build_string
+
+
+Manipulating existing items
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. doxygenfunction:: cbor_string_set_handle
+.. doxygenfunction:: cbor_string_add_chunk
diff -Nru mysql-8.0-8.0.26/extra/libcbor/doc/source/api/type_4.rst mysql-8.0-8.0.27/extra/libcbor/doc/source/api/type_4.rst
--- mysql-8.0-8.0.26/extra/libcbor/doc/source/api/type_4.rst	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/doc/source/api/type_4.rst	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,62 @@
+Type 4 – Arrays
+=============================
+
+CBOR arrays, just like :doc:`byte strings <type_2>` and :doc:`strings <type_3>`, can be encoded either as definite, or as indefinite.
+
+==================================  =====================================================================================
+Corresponding :type:`cbor_type`     ``CBOR_TYPE_ARRAY``
+Number of allocations (definite)    Two plus any manipulations with the data
+Number of allocations (indefinite)  Two plus logarithmically many
+                                    reallocations relative to additions
+Storage requirements (definite)     ``(sizeof(cbor_item_t) + 1) * size``
+Storage requirements (indefinite)   ``<= sizeof(cbor_item_t) + sizeof(cbor_item_t) * size * BUFFER_GROWTH``
+==================================  =====================================================================================
+
+
+Examples
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+::
+
+    0x9f        Start indefinite array
+        0x01        Unsigned integer 1
+        0xff        "Break" control token
+
+::
+
+    0x9f        Start array, 1B length follows
+    0x20        Unsigned integer 32
+        ...        32 items follow
+
+Streaming indefinite arrays
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Please refer to :doc:`/streaming`.
+
+Getting metadata
+~~~~~~~~~~~~~~~~~
+
+.. doxygenfunction:: cbor_array_size
+.. doxygenfunction:: cbor_array_allocated
+.. doxygenfunction:: cbor_array_is_definite
+.. doxygenfunction:: cbor_array_is_indefinite
+
+Reading data
+~~~~~~~~~~~~~
+
+.. doxygenfunction:: cbor_array_handle
+.. doxygenfunction:: cbor_array_get
+
+Creating new items
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. doxygenfunction:: cbor_new_definite_array
+.. doxygenfunction:: cbor_new_indefinite_array
+
+
+Modifying items
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. doxygenfunction:: cbor_array_push
+.. doxygenfunction:: cbor_array_replace
+.. doxygenfunction:: cbor_array_set
diff -Nru mysql-8.0-8.0.26/extra/libcbor/doc/source/api/type_5.rst mysql-8.0-8.0.27/extra/libcbor/doc/source/api/type_5.rst
--- mysql-8.0-8.0.26/extra/libcbor/doc/source/api/type_5.rst	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/doc/source/api/type_5.rst	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,44 @@
+Type 5 – Maps
+=============================
+
+CBOR maps are the plain old associate hash maps known from JSON and many other formats and languages, with one exception: any CBOR data item can be a key, not just strings. This is somewhat unusual and you, as an application developer, should keep that in mind.
+
+Maps can be either definite or indefinite, in much the same way as :doc:`type_4`.
+
+==================================  =====================================================================================
+Corresponding :type:`cbor_type`     ``CBOR_TYPE_MAP``
+Number of allocations (definite)    Two plus any manipulations with the data
+Number of allocations (indefinite)  Two plus logarithmically many
+                                    reallocations relative to additions
+Storage requirements (definite)     ``sizeof(cbor_pair) * size + sizeof(cbor_item_t)``
+Storage requirements (indefinite)   ``<= sizeof(cbor_item_t) + sizeof(cbor_pair) * size * BUFFER_GROWTH``
+==================================  =====================================================================================
+
+Streaming maps
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Please refer to :doc:`/streaming`.
+
+Getting metadata
+~~~~~~~~~~~~~~~~~
+.. doxygenfunction:: cbor_map_size
+.. doxygenfunction:: cbor_map_allocated
+.. doxygenfunction:: cbor_map_is_definite
+.. doxygenfunction:: cbor_map_is_indefinite
+
+Reading data
+~~~~~~~~~~~~~
+
+.. doxygenfunction:: cbor_map_handle
+
+Creating new items
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. doxygenfunction:: cbor_new_definite_map
+.. doxygenfunction:: cbor_new_indefinite_map
+
+
+Modifying items
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. doxygenfunction:: cbor_map_add
diff -Nru mysql-8.0-8.0.26/extra/libcbor/doc/source/api/type_6.rst mysql-8.0-8.0.27/extra/libcbor/doc/source/api/type_6.rst
--- mysql-8.0-8.0.26/extra/libcbor/doc/source/api/type_6.rst	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/doc/source/api/type_6.rst	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,21 @@
+Type 6 – Semantic tags 
+=============================
+
+Tag are additional metadata that can be used to extend or specialize the meaning or interpretation of the other data items.
+
+For example, one might tag an array of numbers to communicate that it should be interpreted as a vector.
+
+Please consult the official `IANA repository of CBOR tags <https://www.iana.org/assignments/cbor-tags/cbor-tags.xhtml>`_ before inventing new ones.
+
+==================================  ======================================================
+Corresponding :type:`cbor_type`     ``CBOR_TYPE_TAG``
+Number of allocations               One plus any manipulations with the data
+                                    reallocations relative  to chunk count
+Storage requirements                ``sizeof(cbor_item_t) + the tagged item``
+==================================  ======================================================
+
+.. doxygenfunction:: cbor_new_tag
+.. doxygenfunction:: cbor_tag_item
+.. doxygenfunction:: cbor_tag_value
+.. doxygenfunction:: cbor_tag_set_item
+
diff -Nru mysql-8.0-8.0.26/extra/libcbor/doc/source/api/type_7.rst mysql-8.0-8.0.27/extra/libcbor/doc/source/api/type_7.rst
--- mysql-8.0-8.0.26/extra/libcbor/doc/source/api/type_7.rst	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/doc/source/api/type_7.rst	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,75 @@
+Type 7 – Floats & control tokens
+=================================
+
+This type combines two completely unrelated types of items -- floating point numbers and special values such as true, false, null, etc. We refer to these special values as 'control values' or 'ctrls' for short throughout the code.
+
+Just like integers, they have different possible width (resulting in different value ranges and precisions).
+
+.. doxygenenum:: cbor_float_width
+
+==================================  =========================================
+Corresponding :type:`cbor_type`     ``CBOR_TYPE_FLOAT_CTRL``
+Number of allocations               One per lifetime
+Storage requirements                ``sizeof(cbor_item_t) + 1/4/8``
+==================================  =========================================
+
+Getting metadata
+~~~~~~~~~~~~~~~~~
+
+.. doxygenfunction:: cbor_float_ctrl_is_ctrl
+.. doxygenfunction:: cbor_float_get_width
+
+Reading data
+~~~~~~~~~~~~~
+
+.. doxygenfunction:: cbor_float_get_float2
+.. doxygenfunction:: cbor_float_get_float4
+.. doxygenfunction:: cbor_float_get_float8
+.. doxygenfunction:: cbor_float_get_float
+.. doxygenfunction:: cbor_ctrl_value
+.. doxygenfunction:: cbor_get_bool
+
+Creating new items
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. doxygenfunction:: cbor_new_ctrl
+.. doxygenfunction:: cbor_new_float2
+.. doxygenfunction:: cbor_new_float4
+.. doxygenfunction:: cbor_new_float8
+.. doxygenfunction:: cbor_new_null
+.. doxygenfunction:: cbor_new_undef
+
+
+Building items
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. doxygenfunction:: cbor_build_bool
+.. doxygenfunction:: cbor_build_ctrl
+.. doxygenfunction:: cbor_build_float2
+.. doxygenfunction:: cbor_build_float4
+.. doxygenfunction:: cbor_build_float8
+
+
+Manipulating existing items
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. doxygenfunction:: cbor_set_ctrl
+.. doxygenfunction:: cbor_set_bool
+.. doxygenfunction:: cbor_set_float2
+.. doxygenfunction:: cbor_set_float4
+.. doxygenfunction:: cbor_set_float8
+
+
+.. _api_type_7_hard_floats:
+
+Half floats
+~~~~~~~~~~~~
+CBOR supports two `bytes wide ("half-precision") <https://en.wikipedia.org/wiki/Half-precision_floating-point_format>`_
+floats which are not supported by the C language. *libcbor* represents them using `float <https://en.cppreference.com/w/c/language/type>` values throughout the API, which has important implications when manipulating these values.
+
+In particular, if a user uses some of the manipulation APIs
+(e.g. :func:`cbor_set_float2`, :func:`cbor_new_float2`)
+to introduce a value that doesn't have an exect half-float representation,
+the encoding semantics are given by :func:`cbor_encode_half` as follows:
+
+.. doxygenfunction:: cbor_encode_half
diff -Nru mysql-8.0-8.0.26/extra/libcbor/doc/source/api.rst mysql-8.0-8.0.27/extra/libcbor/doc/source/api.rst
--- mysql-8.0-8.0.26/extra/libcbor/doc/source/api.rst	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/doc/source/api.rst	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,39 @@
+API
+=======
+
+The data API is centered around :type:`cbor_item_t`, a generic handle for any CBOR item. There are functions to
+
+ - create items,
+ - set items' data,
+ - parse serialized data into items,
+ - manage, move, and links item together.
+
+The single most important thing to keep in mind is: :type:`cbor_item_t` **is an opaque type and should only be manipulated using the appropriate functions!** Think of it as an object.
+
+The *libcbor* API closely follows the semantics outlined by `CBOR standard <http://tools.ietf.org/html/rfc7049>`_. This part of the documentation provides a short overview of the CBOR constructs, as well as a general introduction to the *libcbor* API. Remaining reference can be found in the following files structured by data types.
+
+The API is designed to allow both very tight control & flexibility and general convenience with sane defaults. [#]_ For example, client with very specific requirements (constrained environment, custom application protocol built on top of CBOR, etc.) may choose to take full control (and responsibility) of memory and data structures management by interacting directly with the decoder. Other clients might want to take control of specific aspects (streamed collections, hash maps storage), but leave other responsibilities to *libcbor*. More general clients might prefer to be abstracted away from all aforementioned details and only be presented complete data structures.
+
+
+*libcbor* provides
+ - stateless encoders and decoders
+ - encoding and decoding *drivers*, routines that coordinate encoding and decoding of complex structures
+ - data structures to represent and transform CBOR structures
+ - routines for building and manipulating these structures
+ - utilities for inspection and debugging
+
+.. toctree::
+
+   api/item_types
+   api/item_reference_counting
+   api/decoding
+   api/encoding
+   api/type_0_1
+   api/type_2
+   api/type_3
+   api/type_4
+   api/type_5
+   api/type_6
+   api/type_7
+
+.. [#] http://softwareengineering.vazexqi.com/files/pattern.html
diff -Nru mysql-8.0-8.0.26/extra/libcbor/doc/source/changelog.rst mysql-8.0-8.0.27/extra/libcbor/doc/source/changelog.rst
--- mysql-8.0-8.0.26/extra/libcbor/doc/source/changelog.rst	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/doc/source/changelog.rst	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,4 @@
+Changelog
+==============
+
+.. include:: ../../CHANGELOG.md
diff -Nru mysql-8.0-8.0.26/extra/libcbor/doc/source/conf.py mysql-8.0-8.0.27/extra/libcbor/doc/source/conf.py
--- mysql-8.0-8.0.26/extra/libcbor/doc/source/conf.py	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/doc/source/conf.py	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,297 @@
+# -*- coding: utf-8 -*-
+#
+# libcbor documentation build configuration file, created by
+# sphinx-quickstart on Sun Jun  8 13:27:19 2014.
+#
+# This file is execfile()d with the current directory set to its
+# containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import sys
+import os
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#sys.path.insert(0, os.path.abspath('.'))
+sys.path.append(os.path.abspath(os.path.dirname(__file__)))
+
+# -- General configuration ------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = [
+    'breathe',
+    'sphinx.ext.mathjax',
+    'sphinx.ext.autodoc',
+    'sphinx.ext.ifconfig'
+]
+
+import subprocess, os
+
+# on_rtd is whether we are on readthedocs.org, this line of code grabbed from docs.readthedocs.org
+on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+print(subprocess.check_output('cd ../..; mkdir doc/build; doxygen', shell=True))
+
+if on_rtd:
+    print(subprocess.check_output('cd ../..; mkdir doc/build; doxygen', shell=True))
+
+
+print(os.getcwd())
+print(os.getcwd() + '/../build/doxygen/xml')
+
+breathe_projects = {
+    'libcbor': '../build/doxygen/xml'
+}
+
+breathe_default_project = "libcbor"
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix of source filenames.
+source_suffix = '.rst'
+
+# The encoding of source files.
+#source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = 'libcbor'
+copyright = '2014 - 2020, Pavel Kalvoda'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = '0.7'
+# The full version, including alpha/beta/rc tags.
+release = '0.7.0'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+# https://github.com/michaeljones/breathe/issues/197
+exclude_patterns = ['breathe/*']
+
+# The reST default role (used for this markup: `text`) to use for all
+# documents.
+breathe_domain_by_extension = {
+        "h" : "C",
+        }
+#default_role = 'c:func'
+primary_domain = "cpp"
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+# If true, keep warnings as "system message" paragraphs in the built documents.
+#keep_warnings = False
+
+
+# -- Options for HTML output ----------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+html_theme = 'default'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+#html_theme_path = []
+
+# The name for this set of Sphinx documents.  If None, it defaults to
+# "<project> v<release> documentation".
+#html_title = None
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#html_logo = None
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = []
+
+# Add any extra paths that contain custom files (such as robots.txt or
+# .htaccess) here, relative to this directory. These files are copied
+# directly to the root of the documentation.
+#html_extra_path = []
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+#html_domain_indices = True
+
+# If false, no index is generated.
+#html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = None
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'libcbordoc'
+
+
+# -- Options for LaTeX output ---------------------------------------------
+
+latex_elements = {
+# The paper size ('letterpaper' or 'a4paper').
+#'papersize': 'letterpaper',
+
+# The font size ('10pt', '11pt' or '12pt').
+#'pointsize': '10pt',
+
+# Additional stuff for the LaTeX preamble.
+#'preamble': '',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title,
+#  author, documentclass [howto, manual, or own class]).
+latex_documents = [
+  ('index', 'libcbor.tex', 'libcbor Documentation',
+   'Pavel Kalvoda', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# If true, show page references after internal links.
+#latex_show_pagerefs = False
+
+# If true, show URL addresses after external links.
+#latex_show_urls = False
+
+# Documents to append as an appendix to all manuals.
+#latex_appendices = []
+
+# If false, no module index is generated.
+#latex_domain_indices = True
+
+
+# -- Options for manual page output ---------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    ('index', 'libcbor', 'libcbor Documentation',
+     ['Pavel Kalvoda'], 1)
+]
+
+# If true, show URL addresses after external links.
+#man_show_urls = False
+
+
+# -- Options for Texinfo output -------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+texinfo_documents = [
+  ('index', 'libcbor', 'libcbor Documentation',
+   'Pavel Kalvoda', 'libcbor', 'C library for parsing and generating CBOR.',
+   'Miscellaneous'),
+]
+
+# Documents to append as an appendix to all manuals.
+#texinfo_appendices = []
+
+# If false, no module index is generated.
+#texinfo_domain_indices = True
+
+# How to display URL addresses: 'footnote', 'no', or 'inline'.
+#texinfo_show_urls = 'footnote'
+
+# If true, do not generate a @detailmenu in the "Top" node's menu.
+#texinfo_no_detailmenu = False
+
+
+if not on_rtd:  # only import and set the theme if we're building docs locally
+    import sphinx_rtd_theme
+    html_theme = 'sphinx_rtd_theme'
+    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+
+# otherwise, readthedocs.org uses their theme by default, so no need to specify it
+
diff -Nru mysql-8.0-8.0.26/extra/libcbor/doc/source/development.rst mysql-8.0-8.0.27/extra/libcbor/doc/source/development.rst
--- mysql-8.0-8.0.26/extra/libcbor/doc/source/development.rst	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/doc/source/development.rst	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,143 @@
+Development
+==========================
+
+Vision and principles
+---------------------------
+
+Consistency and coherence are one of the key characteristics of good software.
+While the reality is never black and white, it is important libcbor
+contributors are working towards the same high-level goal. This document
+attempts to set out the basic principles of libcbor and the rationale behind
+them. If you are contributing to libcbor or looking to evaluate whether libcbor
+is the right choice for your project, it might be worthwhile to skim through the
+section below.
+
+Mission statement
+~~~~~~~~~~~~~~~~~~~~~~
+
+*libcbor* is the compact, full-featured, and safe CBOR library that works
+everywhere.
+
+
+Goals
+~~~~~~~~~~~~~~~~~~~~~~
+
+RFC-conformance and full feature support
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Anything the standard allows, libcbor can do.
+
+**Why?** Because conformance and interoperability is the point of defining
+standards. Clients expect the support to be feature-complete and
+there is no significant complexity reduction that can be achieved by slightly
+cutting corners, which means that the incremental cost of full RFC support is
+comparatively small over "almost-conformance" seen in many alternatives.
+
+
+Safety
+^^^^^^^^^^^^^^^^^^^^^^
+
+Untrusted bytes from the network are the typical input.
+
+**Why?** Because it is the client expectation. Vast majority of security
+vulnerabilities are violations of contracts -- in other words, bugs -- anyway.
+
+
+Self-containment
+^^^^^^^^^^^^^^^^^^^^^^
+
+libcbor has no runtime dependencies.
+
+**Why?** Because any constraint imposed on libcbor has to be enforced
+transitively, which is difficult and leads to incompatibilities and
+distribution issues, especially in IoT applications.
+
+Portability
+^^^^^^^^^^^^^^^^^^^^^^
+
+If you can compile C for it, libcbor will work there.
+
+**Why?** Lowest-common-denominator solution for system-level and IoT software
+was the original niche of libcbor. Users who rely on libcbor expect future
+updates to work on their target platform.
+
+Stable and predictable API
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+libcbor will not break without a warning.
+
+**Why?** `Industry-standard <https://semver.org/>`_ versioning is a basic
+requirement for production-quality software. This is especially relevant in IoT
+environments where updates may be costly.
+
+Performance
+^^^^^^^^^^^^^^^^^^^^^^
+
+libcbor is fast and resource-efficient by design
+
+
+**Why?** Because the main maintainer is an avid hater of slow bloated software.
+Who wouldn't want more bang per their electricity buck?
+
+
+Non-goals
+~~~~~~~~~~~~~~~~~~~~~~
+
+ - Convenience -- libcbor only provides the minimum surface to make it usable
+ - FFI/SWIG/interop support -- libcbor is primarily a C library for C clients
+ - One-off usecases support -- although there are primitives to reuse, the
+   basic
+   assumption is that most clients want most of CBOR features
+
+
+Development dependencies
+---------------------------
+- `CMocka <http://cmocka.org/>`_ (testing)
+- `Python <https://www.python.org/>`_ and `pip <https://pypi.python.org/pypi/pip>`_ (Sphinx platform)
+- `Doxygen <http://www.stack.nl/~dimitri/doxygen/>`_
+- `Sphinx <http://sphinx-doc.org/>`_ (documentation)
+- There are some `Ruby <https://www.ruby-lang.org/en/>`_ scripts in ``misc``
+- `Valgrind <http://valgrind.org/>`_ (memory correctness & profiling)
+- `GCOV/LCOV <http://ltp.sourceforge.net/coverage/lcov.php>`_ (test coverage)
+- `clang-format`
+
+
+Installing *sphinx*
+~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: bash
+
+  pip install sphinx
+  pip install sphinx_rtd_theme
+  pip install breathe
+  pip install https://github.com/lepture/python-livereload/archive/master.zip
+  pip install sphinx-autobuild
+
+Further instructions on configuring advanced features can be found at `<http://read-the-docs.readthedocs.org/en/latest/install.html>`_.
+
+
+Live preview of docs
+~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: bash
+
+  cd doc
+  make livehtml
+
+
+Set up git hooks
+~~~~~~~~~~~~~~~~~
+
+A catch-all git hook that runs clang-format and automatically refreshes the `GH
+pages <https://pages.github.com/>`_  contents located in ``docs`` can be
+symlinked:
+
+.. code-block:: bash
+
+  ln -sf $(pwd)/misc/hooks/pre-commit .git/hooks
+
+
+Testing and code coverage
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Please refer to :doc:`tests`
diff -Nru mysql-8.0-8.0.26/extra/libcbor/doc/source/getting_started.rst mysql-8.0-8.0.27/extra/libcbor/doc/source/getting_started.rst
--- mysql-8.0-8.0.26/extra/libcbor/doc/source/getting_started.rst	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/doc/source/getting_started.rst	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,190 @@
+Getting started
+==========================
+
+Pre-built Linux packages are available in most mainstream distributions
+
+**Ubuntu, Debian, etc.**:
+
+.. code-block:: bash
+
+    apt-get install libcbor-dev
+
+**Fedora, openSUSE, etc.**:
+
+.. code-block:: bash
+
+    yum install libcbor-devel
+
+
+**OS X** users can use `Homebrew <http://brew.sh/>`_:
+
+.. code-block:: bash
+
+    brew install libcbor
+
+For other platforms, you will need to compile it from source.
+
+Building & installing libcbor
+------------------------------
+
+Prerequisites:
+ - C99 compiler
+ - CMake_ 2.8 or newer (might also be called ``cmakesetup``, ``cmake-gui`` or ``ccmake`` depending on the installed version and system)
+ - C build system CMake can target (make, Apple Xcode, MinGW, ...)
+
+.. _CMake: http://cmake.org/
+
+**Configuration options**
+
+A handful of configuration flags can be passed to `cmake`. The following table lists libcbor compile-time directives and several important generic flags.
+
+========================  =======================================================   ======================  =====================================================================================================================
+Option                    Meaning                                                   Default                 Possible values
+------------------------  -------------------------------------------------------   ----------------------  ---------------------------------------------------------------------------------------------------------------------
+``CMAKE_C_COMPILER``      C compiler to use                                         ``cc``                   ``gcc``, ``clang``, ``clang-3.5``, ...
+``CMAKE_INSTALL_PREFIX``  Installation prefix                                       System-dependent         ``/usr/local/lib``, ...
+``BUILD_SHARED_LIBS``     Build as a shared library                                 ``OFF``                  ``ON``, ``OFF``
+``HUGE_FUZZ``             :doc:`Fuzz test </tests>` with 8GB of data                ``OFF``                  ``ON``, ``OFF``
+``SANE_MALLOC``           Assume ``malloc`` will refuse unreasonable allocations    ``OFF``                  ``ON``, ``OFF``
+``COVERAGE``              Generate test coverage instrumentation                    ``OFF``                  ``ON``, ``OFF``
+``WITH_TESTS``            Build unit tests (see :doc:`development`)                 ``OFF``                  ``ON``, ``OFF``
+========================  =======================================================   ======================  =====================================================================================================================
+
+The following configuration options will also be defined as macros[#]_ in ``<cbor/common.h>`` and can therefore be used in client code:
+
+========================  =======================================================   ======================  =====================================================================================================================
+Option                    Meaning                                                   Default                 Possible values
+------------------------  -------------------------------------------------------   ----------------------  ---------------------------------------------------------------------------------------------------------------------
+``CBOR_CUSTOM_ALLOC``     Enable custom allocator support                           ``OFF``                  ``ON``, ``OFF``
+``CBOR_PRETTY_PRINTER``   Include a pretty-printing routine                         ``ON``                  ``ON``, ``OFF``
+``CBOR_BUFFER_GROWTH``    Factor for buffer growth & shrinking                       ``2``                    Decimals > 1
+========================  =======================================================   ======================  =====================================================================================================================
+
+.. [#] ``ON`` & ``OFF`` will be translated to ``1`` and ``0`` using `cmakedefine <https://cmake.org/cmake/help/v3.2/command/configure_file.html?highlight=cmakedefine>`_.
+
+If you want to pass other custom configuration options, please refer to `<http://www.cmake.org/Wiki/CMake_Useful_Variables>`_.
+
+**Building using make**
+
+CMake will generate a Makefile and other configuration files for the build. As a rule of thumb, you should configure the
+build *outside of the source tree* in order to keep different configurations isolated. If you are unsure where to
+execute the build, just use a temporary directory:
+
+.. code-block:: bash
+
+  cd $(mktemp -d /tmp/cbor_build.XXXX)
+
+Now, assuming you are in the directory where you want to build, build libcbor as a **static library**:
+
+.. code-block:: bash
+
+  cmake -DCMAKE_BUILD_TYPE=Release path_to_libcbor_dir
+  make cbor
+
+... or as a **dynamic library**:
+
+.. code-block:: bash
+
+  cmake -DCMAKE_BUILD_TYPE=Release  -DBUILD_SHARED_LIBS=ON path_to_libcbor_dir
+  make cbor
+
+To install locally:
+
+.. code-block:: bash
+
+  make install
+
+Root permissions are required on most systems when using the default installation prefix.
+
+
+**Portability**
+
+libcbor is highly portable and works on both little- and big-endian systems regardless of the operating system. After building
+on an exotic platform, you might wish to verify the result by running the :doc:`test suite </tests>`. If you encounter any problems, please
+report them to the `issue tracker <https://github.com/PJK/libcbor/issues>`_.
+
+libcbor is known to successfully work on ARM Android devices. Cross-compilation is possible with ``arm-linux-gnueabi-gcc``.
+
+
+Linking with libcbor
+---------------------
+
+If you include and linker paths include the directories to which libcbor has been installed, compiling programs that uses libcbor requires
+no extra considerations.
+
+You can verify that everything has been set up properly by creating a file with the following contents
+
+.. code-block:: c
+
+    #include <cbor.h>
+    #include <stdio.h>
+
+    int main(int argc, char * argv[])
+    {
+        printf("Hello from libcbor %s\n", CBOR_VERSION);
+    }
+
+
+and compiling it
+
+.. code-block:: bash
+
+    cc hello_cbor.c -lcbor -o hello_cbor
+
+
+libcbor also comes with `pkg-config <https://wiki.freedesktop.org/www/Software/pkg-config/>`_ support. If you install libcbor with a custom prefix, you can use pkg-config to resolve the headers and objects:
+
+.. code-block:: bash
+
+    cc $(pkg-config --cflags libcbor) hello_cbor.c $(pkg-config --libs libcbor) -o hello_cbor
+
+
+**A note on linkage**
+
+libcbor is primarily intended to be linked statically. The shared library versioning scheme generally follows `SemVer <https://semver.org/>`_, but is irregular for the 0.X.Y development branch for historical reasons. The following version identifiers are used as a part of the SONAME (Linux) or the dylib `"Compatibility version" <https://developer.apple.com/library/archive/documentation/DeveloperTools/Conceptual/DynamicLibraries/100-Articles/CreatingDynamicLibraries.html>`_ (OS X):
+
+  - 0.Y for the 0.Y.Z branch. Patches are backwards compatible, minor releases are generally not and require re-compilation of any dependent code.
+  - X for the X.Y.Z stable versions starting 1.X.Y. All minor release of the major version are backwards compatible.
+
+.. warning:: Please note that releases up to and including v0.6.0 `may export misleading .so/.dylib version number <https://github.com/PJK/libcbor/issues/52>`_.
+
+
+Troubleshooting
+---------------------
+
+**cbor.h not found**: The headers directory is probably not in your include path. First, verify the installation
+location by checking the installation log. If you used make, it will look something like
+
+.. code-block:: text
+
+    ...
+    -- Installing: /usr/local/include/cbor
+    -- Installing: /usr/local/include/cbor/callbacks.h
+    -- Installing: /usr/local/include/cbor/encoding.h
+    ...
+
+Make sure that ``CMAKE_INSTALL_PREFIX`` (if you provided it) was correct. Including the path path during compilation should suffice, e.g.:
+
+.. code-block:: bash
+
+    cc -I/usr/local/include hello_cbor.c -lcbor -o hello_cbor
+
+
+**cannot find -lcbor during linking**: Most likely the same problem as before. Include the installation directory in the
+linker shared path using ``-R``, e.g.:
+
+.. code-block:: bash
+
+    cc -Wl,-rpath,/usr/local/lib -lcbor -o hello_cbor
+
+**shared library missing during execution**: Verify the linkage using ``ldd``, ``otool``, or similar and adjust the compilation directives accordingly:
+
+.. code-block:: text
+
+    ⇒  ldd hello_cbor
+        linux-vdso.so.1 =>  (0x00007ffe85585000)
+        libcbor.so => /usr/local/lib/libcbor.so (0x00007f9af69da000)
+        libc.so.6 => /lib/x86_64-linux-gnu/libc.so.6 (0x00007f9af65eb000)
+        /lib64/ld-linux-x86-64.so.2 (0x00007f9af6be9000)
+
+**compilation failed**: If your compiler supports C99 yet the compilation has failed, please report the issue to the `issue tracker <https://github.com/PJK/libcbor/issues>`_.
diff -Nru mysql-8.0-8.0.26/extra/libcbor/doc/source/index.rst mysql-8.0-8.0.27/extra/libcbor/doc/source/index.rst
--- mysql-8.0-8.0.26/extra/libcbor/doc/source/index.rst	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/doc/source/index.rst	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,40 @@
+libcbor
+===================================
+
+Documentation for version |release|, updated on |today|.
+
+Overview
+--------
+*libcbor* is a C library for parsing and generating CBOR_, the general-purpose schema-less binary data format.
+
+
+Main features
+ - Complete RFC conformance [#]_
+ - Robust C99 implementation
+ - Layered architecture offers both control and convenience
+ - Flexible memory management
+ - No shared global state - threading friendly [#]_
+ - Proper handling of UTF-8
+ - Full support for streams & incremental processing
+ - Extensive documentation and test suite
+ - No runtime dependencies, small footprint
+
+.. [#] See :doc:`rfc_conformance`
+
+.. [#] With the exception of custom memory allocators (see :doc:`api/item_reference_counting`)
+
+Contents
+----------
+.. toctree::
+
+   getting_started
+   using
+   api
+   streaming
+   tests
+   rfc_conformance
+   internal
+   changelog
+   development
+
+.. _CBOR: http://tools.ietf.org/html/rfc7049
diff -Nru mysql-8.0-8.0.26/extra/libcbor/doc/source/internal.rst mysql-8.0-8.0.27/extra/libcbor/doc/source/internal.rst
--- mysql-8.0-8.0.26/extra/libcbor/doc/source/internal.rst	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/doc/source/internal.rst	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,128 @@
+Internal mechanics
+==========================
+
+Internal workings of *libcbor* are mostly derived from the specification. The purpose of this document is to describe technical choices made during design & implementation and to explicate the reasoning behind those choices.
+
+Terminology
+---------------
+===  ======================  ========================================================================================================================================
+MTB  Major Type Byte         http://tools.ietf.org/html/rfc7049#section-2.1
+---  ----------------------  ----------------------------------------------------------------------------------------------------------------------------------------
+DST  Dynamically Sized Type  Type whose storage requirements cannot be determined
+
+                             during compilation (originated in the `Rust <http://www.rust-lang.org/>`_ community)
+===  ======================  ========================================================================================================================================
+
+Conventions
+--------------
+API symbols start with ``cbor_`` or ``CBOR_`` prefix, internal symbols have ``_cbor_`` or ``_CBOR_`` prefix.
+
+Inspiration & related projects
+-------------------------------
+Most of the API is largely modelled after existing JSON libraries, including
+
+ - `Jansson <http://www.digip.org/jansson/>`_
+ - `json-c <https://github.com/json-c/json-c>`_
+ - Gnome's `JsonGlib <https://wiki.gnome.org/action/show/Projects/JsonGlib?action=show&redirect=JsonGlib>`_
+
+and also borrowing from
+
+ - `msgpack-c <https://github.com/msgpack/msgpack-c>`_
+ - `Google Protocol Buffers <http://code.google.com/p/protobuf/>`_.
+
+General notes on the API design
+--------------------------------
+The API design has two main driving priciples:
+
+ 1. Let the client manage the memory as much as possible
+ 2. Behave exactly as specified by the standard
+
+Combining these two principles in practice turns out to be quite difficult. Indefinite-length strings, arrays, and maps require client to handle every fixed-size chunk explicitly in order to
+
+ - ensure the client never runs out of memory due to *libcbor*
+ - use :func:`realloc` sparsely and predictably [#]_
+
+    - provide strong guarantees about its usage (to prevent latency spikes)
+    - provide APIs to avoid :func:`realloc` altogether
+ - allow proper handling of (streamed) data bigger than available memory
+
+ .. [#] Reasonable handling of DSTs requires reallocation if the API is to remain sane.
+
+
+Coding style
+-------------
+This code loosely follows the `Linux kernel coding style <https://www.kernel.org/doc/Documentation/CodingStyle>`_. Tabs are tabs, and they are 4 characters wide.
+
+
+Memory layout
+---------------
+CBOR is very dynamic in the sense that it contains many data elements of variable length, sometimes even indefinite length. This section describes internal representation of all CBOR data types.
+
+Generally speaking, data items consist of three parts:
+
+ - a generic :type:`handle <cbor_item_t>`,
+ - the associated :type:`metadata <cbor_item_metadata>`,
+ - and the actual data
+
+.. type:: cbor_item_t
+
+    Represents the item. Used as an opaque type
+
+    .. member:: cbor_type type
+
+        Type discriminator
+
+    .. member:: size_t refcount
+
+        Reference counter. Used by :func:`cbor_decref`, :func:`cbor_incref`
+
+    .. member:: union cbor_item_metadata metadata
+
+        Union discriminated by :member:`type`. Contains type-specific metadata
+
+    .. member:: unsigned char * data
+
+        Contains pointer to the actual data. Small, fixed size items (:doc:`api/type_0_1`, :doc:`api/type_6`, :doc:`api/type_7`) are allocated as a single memory block.
+
+        Consider the following snippet
+
+        .. code-block:: c
+
+            cbor_item_t * item = cbor_new_int8();
+
+        then the memory is laid out as follows
+
+        ::
+
+            +-----------+---------------+---------------+-----------------------------------++-----------+
+            |           |               |               |                                   ||           |
+            |   type    |   refcount    |   metadata    |              data                 ||  uint8_t  |
+            |           |               |               |   (= item + sizeof(cbor_item_t))  ||           |
+            +-----------+---------------+---------------+-----------------------------------++-----------+
+            ^                                                                                ^
+            |                                                                                |
+            +--- item                                                                        +--- item->data
+
+        Dynamically sized types (:doc:`api/type_2`, :doc:`api/type_3`, :doc:`api/type_4`, :doc:`api/type_5`) may store handle and data in separate locations. This enables creating large items (e.g :doc:`byte strings <api/type_2>`) without :func:`realloc` or copying large blocks of memory. One simply attaches the correct pointer to the handle.
+
+
+.. type:: cbor_item_metadata
+
+    Union type of the following members, based on the item type:
+
+    .. member:: struct _cbor_int_metadata int_metadata
+
+        Used both by both :doc:`api/type_0_1`
+
+    .. member:: struct _cbor_bytestring_metadata bytestring_metadata
+    .. member:: struct _cbor_string_metadata string_metadata
+    .. member:: struct _cbor_array_metadata array_metadata
+    .. member:: struct _cbor_map_metadata map_metadata
+    .. member:: struct _cbor_tag_metadata tag_metadata
+    .. member:: struct _cbor_float_ctrl_metadata float_ctrl_metadata
+
+Decoding
+---------
+
+As outlined in :doc:`api`, there decoding is based on the streaming decoder Essentially, the decoder is a custom set of callbacks for the streaming decoder.
+
diff -Nru mysql-8.0-8.0.26/extra/libcbor/doc/source/requirements.txt mysql-8.0-8.0.27/extra/libcbor/doc/source/requirements.txt
--- mysql-8.0-8.0.26/extra/libcbor/doc/source/requirements.txt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/doc/source/requirements.txt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,39 @@
+alabaster==0.7.12
+argh==0.26.2
+Babel==2.8.0
+breathe==4.14.1
+certifi==2019.11.28
+chardet==3.0.4
+Click==7.0
+docutils==0.16
+Flask==1.1.1
+idna==2.9
+imagesize==1.2.0
+itsdangerous==1.1.0
+Jinja2==2.10.1
+livereload==2.6.1
+MarkupSafe==1.1.1
+packaging==20.3
+pathtools==0.1.2
+port-for==0.3.1
+Pygments==2.6.1
+pyparsing==2.4.6
+pytz==2019.3
+PyYAML==5.3
+requests==2.23.0
+six==1.14.0
+snowballstemmer==2.0.0
+sortedcontainers==2.1.0
+Sphinx==2.4.4
+sphinx-autobuild==0.7.1
+sphinx-rtd-theme==0.4.3
+sphinxcontrib-applehelp==1.0.2
+sphinxcontrib-devhelp==1.0.2
+sphinxcontrib-htmlhelp==1.0.3
+sphinxcontrib-jsmath==1.0.1
+sphinxcontrib-qthelp==1.0.3
+sphinxcontrib-serializinghtml==1.1.4
+tornado==6.0.4
+urllib3==1.25.8
+watchdog==0.10.2
+Werkzeug==0.15.5
diff -Nru mysql-8.0-8.0.26/extra/libcbor/doc/source/rfc_conformance.rst mysql-8.0-8.0.27/extra/libcbor/doc/source/rfc_conformance.rst
--- mysql-8.0-8.0.26/extra/libcbor/doc/source/rfc_conformance.rst	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/doc/source/rfc_conformance.rst	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,17 @@
+RFC conformance
+=========================
+
+*libcbor* is, generally speaking, very faithful implementation of `RFC 7049 <http://tools.ietf.org/html/rfc7049>`_. There are, however, some limitations imposed by technical constraints.
+
+Bytestring length
+-------------------
+There is no explicit limitation of indefinite length byte strings. [#]_ *libcbor* will not handle byte strings with more chunks than the maximum value of :type:`size_t`. On any sane platform, such string would not fit in the memory anyway. It is, however, possible to process arbitrarily long strings and byte strings using the streaming decoder.
+
+.. [#] http://tools.ietf.org/html/rfc7049#section-2.2.2
+
+"Half-precision" IEEE 754 floats
+---------------------------------
+As of C99 and even C11, there is no standard implementation for 2 bytes floats. *libcbor* packs them as a `float <https://en.cppreference.com/w/c/language/type>`. When encoding, *libcbor* selects the appropriate wire representation based on metadata and the actual value. This applies both to canonical and normal mode.
+
+For more information on half-float serialization, please refer to the section on :ref:`api_type_7_hard_floats`.
+
diff -Nru mysql-8.0-8.0.26/extra/libcbor/doc/source/streaming/decoding.rst mysql-8.0-8.0.27/extra/libcbor/doc/source/streaming/decoding.rst
--- mysql-8.0-8.0.26/extra/libcbor/doc/source/streaming/decoding.rst	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/doc/source/streaming/decoding.rst	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,40 @@
+Decoding
+=============================
+
+Another way to decode data using libcbor is to specify a callbacks that will be invoked when upon finding certain items in the input. This API is provided by
+
+.. doxygenfunction:: cbor_stream_decode
+
+Usage example: https://github.com/PJK/libcbor/blob/master/examples/streaming_parser.c
+
+The callbacks are defined by
+
+.. doxygenstruct:: cbor_callbacks
+    :members:
+
+When building custom sets of callbacks, feel free to start from
+
+.. doxygenvariable:: cbor_empty_callbacks
+
+Related structures
+~~~~~~~~~~~~~~~~~~~~~
+
+.. doxygenenum:: cbor_decoder_status
+.. doxygenstruct:: cbor_decoder_result
+    :members:
+
+
+Callback types definition
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+.. doxygentypedef:: cbor_int8_callback
+.. doxygentypedef:: cbor_int16_callback
+.. doxygentypedef:: cbor_int32_callback
+.. doxygentypedef:: cbor_int64_callback
+.. doxygentypedef:: cbor_simple_callback
+.. doxygentypedef:: cbor_string_callback
+.. doxygentypedef:: cbor_collection_callback
+.. doxygentypedef:: cbor_float_callback
+.. doxygentypedef:: cbor_double_callback
+.. doxygentypedef:: cbor_bool_callback
diff -Nru mysql-8.0-8.0.26/extra/libcbor/doc/source/streaming/encoding.rst mysql-8.0-8.0.27/extra/libcbor/doc/source/streaming/encoding.rst
--- mysql-8.0-8.0.26/extra/libcbor/doc/source/streaming/encoding.rst	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/doc/source/streaming/encoding.rst	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,4 @@
+Encoding
+=============================
+
+TODO
diff -Nru mysql-8.0-8.0.26/extra/libcbor/doc/source/streaming.rst mysql-8.0-8.0.27/extra/libcbor/doc/source/streaming.rst
--- mysql-8.0-8.0.26/extra/libcbor/doc/source/streaming.rst	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/doc/source/streaming.rst	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,13 @@
+Streaming & indefinite items
+=============================
+
+CBOR :doc:`strings <api/type_2>`, :doc:`byte strings <api/type_3>`, :doc:`arrays <api/type_4>`, and :doc:`maps <api/type_5>` can be encoded as *indefinite*, meaning their length or size is not specified. Instead, they are divided into *chunks* (:doc:`strings <api/type_2>`, :doc:`byte strings <api/type_3>`), or explicitly terminated (:doc:`arrays <api/type_4>`, :doc:`maps <api/type_5>`).
+
+This is one of the most important (and due to poor implementations, underutilized) features of CBOR. It enables low-overhead streaming just about anywhere without dealing with channels or pub/sub mechanism. It is, however, important to recognize that CBOR streaming is not a substitute for  Websockets [#]_ and similar technologies.
+
+.. [#] :RFC:`6455`
+
+.. toctree::
+
+   streaming/decoding
+   streaming/encoding
diff -Nru mysql-8.0-8.0.26/extra/libcbor/doc/source/tests.rst mysql-8.0-8.0.27/extra/libcbor/doc/source/tests.rst
--- mysql-8.0-8.0.26/extra/libcbor/doc/source/tests.rst	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/doc/source/tests.rst	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,39 @@
+Tests
+=============
+
+Unit tests
+--------------
+
+There is a comprehensive test suite employing CMocka_. You can run all of them using ``ctest`` in the build directory. Individual tests are themselves runnable. Please refer to `CTest <http://www.cmake.org/Wiki/CMake/Testing_With_CTest>`_ documentation for detailed information on how to specify particular subset of tests.
+
+.. _CMocka: http://cmocka.org/
+
+Testing for memory leaks
+------------------------
+
+Every release is tested for memory correctness. You can run these tests by passing the ``-T memcheck`` flag to ``ctest``. [#]_
+
+.. [#] Project should be configured with ``-DCMAKE_BUILD_TYPE=Debug`` to obtain meaningful description of location of the leak. You might also need ``--dsymutil=yes`` on OS X.
+
+
+Code coverage
+-------------------
+
+Every release is inspected using `GCOV/LCOV <http://ltp.sourceforge.net/coverage/lcov.php>`_. Platform-independent code should be fully covered by the test suite. Simply run
+
+.. code-block:: bash
+
+  make coverage
+
+
+or alternatively run ``lcov`` by hand using
+
+.. code-block:: bash
+
+  lcov --capture --directory . --output-file coverage.info
+  genhtml coverage.info --output-directory out
+
+Fuzz testing
+-----------------
+
+Every release is tested using a fuzz test. In this test, a huge buffer filled with random data is passed to the decoder. We require that it either succeeds or fail with a sensible error, without leaking any memory. This is intended to simulate real-world situations where data received from the network are CBOR-decoded before any further processing.
diff -Nru mysql-8.0-8.0.26/extra/libcbor/doc/source/using.rst mysql-8.0-8.0.27/extra/libcbor/doc/source/using.rst
--- mysql-8.0-8.0.26/extra/libcbor/doc/source/using.rst	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/doc/source/using.rst	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,173 @@
+Usage & preliminaries
+=======================
+
+Version information
+--------------------
+
+libcbor exports its version using three self-explanatory macros:
+
+ - ``CBOR_MAJOR_VERSION``
+ - ``CBOR_MINOR_VERSION``
+ - ``CBOR_PATCH_VERSION``
+
+The ``CBOR_VERSION`` is a string concatenating these three identifiers into one (e.g. ``0.2.0``).
+
+In order to simplify version comparisons, the version is also exported as
+
+.. code-block:: c
+
+  #define CBOR_HEX_VERSION ((CBOR_MAJOR_VERSION << 16) | (CBOR_MINOR_VERSION << 8) | CBOR_PATCH_VERSION)
+
+Since macros are difficult to work with through FFIs, the same information is also available through three ``uint8_t`` constants,
+namely
+
+ - ``cbor_major_version``
+ - ``cbor_minor_version``
+ - ``cbor_patch_version``
+
+
+Headers to include
+---------------------
+
+The ``cbor.h`` header includes all the symbols. If, for any reason, you don't want to include all the exported symbols,
+feel free to use just some of the ``cbor/*.h`` headers:
+
+ - ``cbor/arrays.h`` - :doc:`api/type_4`
+ - ``cbor/bytestrings.h`` - :doc:`api/type_2`
+ - ``cbor/callbacks.h`` - Callbacks used for :doc:`streaming/decoding`
+ - ``cbor/common.h`` - Common utilities - always transitively included
+ - ``cbor/data.h`` - Data types definitions - always transitively included
+ - ``cbor/encoding.h`` - Streaming encoders for :doc:`streaming/encoding`
+ - ``cbor/floats_ctrls.h`` - :doc:`api/type_7`
+ - ``cbor/ints.h`` - :doc:`api/type_0_1`
+ - ``cbor/maps.h`` - :doc:`api/type_5`
+ - ``cbor/serialization.h`` - High level serialization such as :func:`cbor_serialize`
+ - ``cbor/streaming.h`` - Home of :func:`cbor_stream_decode`
+ - ``cbor/strings.h`` - :doc:`api/type_3`
+ - ``cbor/tags.h`` - :doc:`api/type_6`
+
+
+Using libcbor
+--------------
+
+If you want to get more familiar with CBOR, we recommend the `cbor.io <http://cbor.io/>`_ website. Once you get the grasp
+of what is it CBOR does, the examples (located in the ``examples`` directory) should give you a good feel of the API. The
+:doc:`API documentation <api>` should then provide with all the information you may need.
+
+
+**Creating and serializing items**
+
+.. code-block:: c
+
+    #include "cbor.h"
+    #include <stdio.h>
+
+    int main(int argc, char * argv[])
+    {
+        /* Preallocate the map structure */
+        cbor_item_t * root = cbor_new_definite_map(2);
+        /* Add the content */
+        cbor_map_add(root, (struct cbor_pair) {
+            .key = cbor_move(cbor_build_string("Is CBOR awesome?")),
+            .value = cbor_move(cbor_build_bool(true))
+        });
+        cbor_map_add(root, (struct cbor_pair) {
+            .key = cbor_move(cbor_build_uint8(42)),
+            .value = cbor_move(cbor_build_string("Is the answer"))
+        });
+        /* Output: `length` bytes of data in the `buffer` */
+        unsigned char * buffer;
+        size_t buffer_size, length = cbor_serialize_alloc(root, &buffer, &buffer_size);
+
+        fwrite(buffer, 1, length, stdout);
+        free(buffer);
+
+        fflush(stdout);
+        cbor_decref(&root);
+    }
+
+
+**Reading serialized data**
+
+.. code-block:: c
+
+    #include "cbor.h"
+    #include <stdio.h>
+
+    /*
+     * Reads data from a file. Example usage:
+     * $ ./examples/readfile examples/data/nested_array.cbor
+     */
+
+    int main(int argc, char * argv[])
+    {
+        FILE * f = fopen(argv[1], "rb");
+        fseek(f, 0, SEEK_END);
+        size_t length = (size_t)ftell(f);
+        fseek(f, 0, SEEK_SET);
+        unsigned char * buffer = malloc(length);
+        fread(buffer, length, 1, f);
+
+        /* Assuming `buffer` contains `info.st_size` bytes of input data */
+        struct cbor_load_result result;
+        cbor_item_t * item = cbor_load(buffer, length, &result);
+        /* Pretty-print the result */
+        cbor_describe(item, stdout);
+        fflush(stdout);
+        /* Deallocate the result */
+        cbor_decref(&item);
+
+        fclose(f);
+    }
+
+
+**Using the streaming parser**
+
+.. code-block:: c
+
+    #include "cbor.h"
+    #include <stdio.h>
+    #include <string.h>
+
+    /*
+     * Illustrates how one might skim through a map (which is assumed to have
+     * string keys and values only), looking for the value of a specific key
+     *
+     * Use the examples/data/map.cbor input to test this.
+     */
+
+    const char * key = "a secret key";
+    bool key_found = false;
+
+    void find_string(void * _ctx, cbor_data buffer, size_t len)
+    {
+        if (key_found) {
+            printf("Found the value: %*s\n", (int) len, buffer);
+            key_found = false;
+        } else if (len == strlen(key)) {
+            key_found = (memcmp(key, buffer, len) == 0);
+        }
+    }
+
+    int main(int argc, char * argv[])
+    {
+        FILE * f = fopen(argv[1], "rb");
+        fseek(f, 0, SEEK_END);
+        size_t length = (size_t)ftell(f);
+        fseek(f, 0, SEEK_SET);
+        unsigned char * buffer = malloc(length);
+        fread(buffer, length, 1, f);
+
+        struct cbor_callbacks callbacks = cbor_empty_callbacks;
+        struct cbor_decoder_result decode_result;
+        size_t bytes_read = 0;
+        callbacks.string = find_string;
+        while (bytes_read < length) {
+            decode_result = cbor_stream_decode(buffer + bytes_read,
+                                               length - bytes_read,
+                                               &callbacks, NULL);
+            bytes_read += decode_result.read;
+        }
+
+        fclose(f);
+    }
diff -Nru mysql-8.0-8.0.26/extra/libcbor/Doxyfile mysql-8.0-8.0.27/extra/libcbor/Doxyfile
--- mysql-8.0-8.0.26/extra/libcbor/Doxyfile	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/Doxyfile	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,2417 @@
+# Doxyfile 1.8.12
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
+
+PROJECT_NAME           = "libcbor"
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
+PROJECT_NUMBER         = 0.7.0
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          = "libcbor is a C library for parsing and generating CBOR, the general-purpose schema-less binary data format."
+
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
+
+PROJECT_LOGO           =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = doc/build/doxygen
+
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
+
+CREATE_SUBDIRS         = NO
+
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+# The default value is: YES.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
+
+ABBREVIATE_BRIEF       =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
+# description.
+# The default value is: NO.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+# The default value is: NO.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
+
+FULL_PATH_NAMES        = YES
+
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
+
+STRIP_FROM_PATH        =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
+
+STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
+
+JAVADOC_AUTOBRIEF      = YES
+
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
+# page for each member. If set to NO, the documentation of a member will be part
+# of the file/class/namespace that contains it.
+# The default value is: NO.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
+
+TAB_SIZE               = 4
+
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines.
+
+ALIASES                = "rst=\verbatim embed:rst:leading-asterisk" \
+                         "endrst=\endverbatim"
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
+
+TCL_SUBST              =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_FOR_C  = YES
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
+# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
+# Fortran. In the later case the parser tries to guess whether the code is fixed
+# or free formatted code, this is the default for Fortran type files), VHDL. For
+# instance to make doxygen treat .inc files as Fortran files (default is PHP),
+# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+#
+# Note: For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
+
+EXTENSION_MAPPING      =
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
+# to that level are automatically included in the table of contents, even if
+# they do not have an id attribute.
+# Note: This feature currently applies only to Markdown headings.
+# Minimum value: 0, maximum value: 99, default value: 0.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+TOC_INCLUDE_HEADINGS   = 0
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# If one adds a struct or class to a group and this option is enabled, then also
+# any nested class or struct is added to the same group. By default this option
+# is disabled and one has to add nested compounds explicitly via \ingroup.
+# The default value is: NO.
+
+GROUP_NESTED_COMPOUNDS = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
+
+SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
+
+EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
+
+EXTRACT_STATIC         = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO,
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. If set to YES, local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO, only methods in the interface are
+# included.
+# The default value is: NO.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO, these classes will be included in the various overviews. This option
+# has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO, these declarations will be
+# included in the documentation.
+# The default value is: NO.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO, these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES, upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES, the
+# scope will be hidden.
+# The default value is: NO.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
+# append additional text to a page's title, such as Class Reference. If set to
+# YES the compound reference will be hidden.
+# The default value is: NO.
+
+HIDE_COMPOUND_REFERENCE= NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order.
+# The default value is: YES.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
+# list. This list is created by putting \todo commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
+# list. This list is created by putting \test commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
+
+ENABLED_SECTIONS       =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES, the
+# list will mention the files that were used to generate the documentation.
+# The default value is: YES.
+
+SHOW_USED_FILES        = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
+LAYOUT_FILE            = doxygen-theme/DoxygenLayout.xml
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. See also \cite for info how to create references.
+
+CITE_BIB_FILES         =
+
+#---------------------------------------------------------------------------
+# Configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
+
+WARNINGS               = YES
+
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO, doxygen will only warn about wrong or incomplete
+# parameter documentation, but not about the absence of documentation.
+# The default value is: NO.
+
+WARN_NO_PARAMDOC       = NO
+
+# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
+# a warning is encountered.
+# The default value is: NO.
+
+WARN_AS_ERROR          = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
+
+WARN_LOGFILE           =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
+# Note: If this tag is empty the current directory is searched.
+
+INPUT                  = src \
+                         doc/doxy_frontpage.md
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: http://www.gnu.org/software/libiconv) for the list of
+# possible encodings.
+# The default value is: UTF-8.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# read by doxygen.
+#
+# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
+# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
+# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
+# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
+# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf.
+
+FILE_PATTERNS          =
+
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
+
+RECURSIVE              = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE                =
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+# The default value is: NO.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       =
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
+
+EXCLUDE_SYMBOLS        =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
+
+EXAMPLE_PATH           =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
+
+EXAMPLE_PATTERNS       =
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
+
+IMAGE_PATH             =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+FILTER_PATTERNS        =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
+
+FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE = doc/doxy_frontpage.md
+
+#---------------------------------------------------------------------------
+# Configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
+
+SOURCE_BROWSER         = YES
+
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
+
+REFERENCES_RELATION    = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see http://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
+
+VERBATIM_HEADERS       = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
+
+ALPHABETICAL_INDEX     = YES
+
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+IGNORE_PREFIX          =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# The default value is: YES.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_HEADER            =
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FOOTER            =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_STYLESHEET        =
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# cascading style sheets that are included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefore more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list). For an example see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  = doxygen-theme/customdoxygen.css
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the style sheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting this
+# to YES can help to show when doxygen was last run and thus if the
+# documentation is up to date.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_TIMESTAMP         = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: http://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_DOCSET        = NO
+
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_HTMLHELP      = NO
+
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
+# written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_FILE               =
+
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler (hhc.exe). If non-empty,
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+HHC_LOCATION           =
+
+# The GENERATE_CHI flag controls if a separate .chi index file is generated
+# (YES) or that it should be included in the master .chm file (NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+GENERATE_CHI           = NO
+
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_INDEX_ENCODING     =
+
+# The BINARY_TOC flag controls whether a binary table of contents is generated
+# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+TOC_EXPAND             = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
+# folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+DISABLE_INDEX          = NO
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_TREEVIEW      = NO
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+TREEVIEW_WIDTH         = 250
+
+# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# http://www.mathjax.org) which uses client side Javascript for the rendering
+# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from http://www.mathjax.org before deployment.
+# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS     =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SEARCHENGINE           = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript. There
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
+# The default value is: YES.
+
+GENERATE_LATEX         = YES
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PAPER_TYPE             = a4
+
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. The package can be specified just
+# by its name or with the correct syntax as to be used with the LaTeX
+# \usepackage command. To get the times font for instance you can specify :
+# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
+# To use the option intlimits with the amsmath package you can specify:
+# EXTRA_PACKAGES=[intlimits]{amsmath}
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
+# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
+# string, for the replacement values of the other commands the user is referred
+# to HTML_HEADER.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HEADER           =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_FOOTER           =
+
+# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# LaTeX style sheets that are included after the standard style sheets created
+# by doxygen. Using this option one can overrule certain style aspects. Doxygen
+# will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_STYLESHEET =
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES      =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PDF_HYPERLINKS         = YES
+
+# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES, to get a
+# higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BATCHMODE        = NO
+
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HIDE_INDICES     = NO
+
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE        = plain
+
+# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_TIMESTAMP        = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_EXTENSIONS_FILE    =
+
+# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
+# with syntax highlighting in the RTF output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_SOURCE_CODE        = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_EXTENSION          = .3
+
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR             =
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
+
+GENERATE_XML           = YES
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_OUTPUT             = xml
+
+# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
+# program listings (including syntax highlighting and cross-referencing
+# information) to the DOCBOOK output. Note that enabling this will significantly
+# increase the size of the DOCBOOK output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_PROGRAMLISTING = NO
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
+# AutoGen Definitions (see http://autogen.sf.net) file that captures the
+# structure of the code including all documentation. Note that this feature is
+# still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO, the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
+# in the source code. If set to NO, only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+MACRO_EXPANSION        = YES
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_ONLY_PREDEF     = YES
+
+# If the SEARCH_INCLUDES tag is set to YES, the include files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
+
+INCLUDE_PATH           =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+INCLUDE_FILE_PATTERNS  =
+
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+PREDEFINED             = CBOR_CUSTOM_ALLOC CBOR_RESTRICT_POINTER=
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_AS_DEFINED      = CBOR_RESTRICT_POINTER
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
+
+TAGFILES               =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
+
+GENERATE_TAGFILE       =
+
+# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
+# the class index. If set to NO, only the inherited external classes will be
+# listed.
+# The default value is: NO.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
+
+EXTERNAL_GROUPS        = YES
+
+# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
+
+CLASS_DIAGRAMS         = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            =
+
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               =
+
+# If set to YES the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: NO.
+
+HAVE_DOT               = NO
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NUM_THREADS        = 0
+
+# When you want a differently looking font in the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTNAME           = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTPATH           =
+
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LOOK               = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDE_GRAPH          = YES
+
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command. Disabling a call graph can be
+# accomplished by means of the command \hidecallgraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command. Disabling a caller graph can be
+# accomplished by means of the command \hidecallergraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. For an explanation of the image formats see the section
+# output formats in the documentation of the dot tool (Graphviz (see:
+# http://www.graphviz.org/)).
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo,
+# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
+# png:gdiplus:gdiplus.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_IMAGE_FORMAT       = png
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG        = NO
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_PATH               =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOTFILE_DIRS           =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           =
+
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           =
+
+# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file. If left blank, it is assumed
+# PlantUML is not used or called during a preprocessing step. Doxygen will
+# generate a warning when it encounters a \startuml command in this case and
+# will not generate output for the diagram.
+
+PLANTUML_JAR_PATH      =
+
+# When using plantuml, the specified paths are searched for files specified by
+# the !include statement in a plantuml block.
+
+PLANTUML_INCLUDE_PATH  =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_MULTI_TARGETS      = YES
+
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_CLEANUP            = YES
diff -Nru mysql-8.0-8.0.26/extra/libcbor/LICENSE.md mysql-8.0-8.0.27/extra/libcbor/LICENSE.md
--- mysql-8.0-8.0.26/extra/libcbor/LICENSE.md	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/LICENSE.md	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2014-2017 Pavel Kalvoda
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff -Nru mysql-8.0-8.0.26/extra/libcbor/oss-fuzz/build.sh mysql-8.0-8.0.27/extra/libcbor/oss-fuzz/build.sh
--- mysql-8.0-8.0.26/extra/libcbor/oss-fuzz/build.sh	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/oss-fuzz/build.sh	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,28 @@
+#!/bin/bash -eu
+# Copyright 2019 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+
+mkdir build
+cd build
+# We disable libcbor's default sanitizers since we'll be configuring them ourselves via CFLAGS.
+cmake -D CMAKE_BUILD_TYPE=Debug -D CMAKE_INSTALL_PREFIX="$WORK" -D CBOR_CUSTOM_ALLOC=ON -D SANITIZE=OFF ..
+make "-j$(nproc)"
+make install
+
+$CXX $CXXFLAGS -std=c++11 "-I$WORK/include" \
+    ../oss-fuzz/cbor_load_fuzzer.cc -o "$OUT/cbor_load_fuzzer" \
+    $LIB_FUZZING_ENGINE src/libcbor.a
+
diff -Nru mysql-8.0-8.0.26/extra/libcbor/oss-fuzz/cbor_load_fuzzer.cc mysql-8.0-8.0.27/extra/libcbor/oss-fuzz/cbor_load_fuzzer.cc
--- mysql-8.0-8.0.26/extra/libcbor/oss-fuzz/cbor_load_fuzzer.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/oss-fuzz/cbor_load_fuzzer.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,37 @@
+#include <cstdint>
+#include <cstdio>
+
+#include "cbor.h"
+
+void *limited_malloc(size_t size) {
+    if (size > 1 << 24) {
+        return nullptr;
+    }
+    return malloc(size);
+}
+
+struct State {
+    FILE* fout;
+
+    State() : fout(fopen("/dev/null", "r")) {
+        cbor_set_allocs(limited_malloc, realloc, free);
+    }
+};
+
+static State kState;
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
+    cbor_load_result result;
+    cbor_item_t *item = cbor_load(Data, Size, &result);
+    if (result.error.code == CBOR_ERR_NONE) {
+        cbor_describe(item, kState.fout);
+        unsigned char *buffer;
+        size_t buffer_size;
+        cbor_serialize_alloc(item, &buffer, &buffer_size);
+        free(buffer);
+        cbor_item_t *copied = cbor_copy(item);
+        cbor_decref(&copied);
+        cbor_decref(&item);
+    }
+    return 0;
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/README.md mysql-8.0-8.0.27/extra/libcbor/README.md
--- mysql-8.0-8.0.26/extra/libcbor/README.md	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/README.md	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,122 @@
+# [libcbor](https://github.com/PJK/libcbor)
+
+[![Build Status](https://travis-ci.org/PJK/libcbor.svg?branch=master)](https://travis-ci.org/PJK/libcbor)
+[![Build status](https://ci.appveyor.com/api/projects/status/8kkmvmefelsxp5u2?svg=true)](https://ci.appveyor.com/project/PJK/libcbor)
+[![Documentation Status](https://readthedocs.org/projects/libcbor/badge/?version=latest)](https://readthedocs.org/projects/libcbor/?badge=latest)
+[![latest packaged version(s)](https://repology.org/badge/latest-versions/libcbor.svg)](https://repology.org/project/libcbor/versions)
+[![codecov](https://codecov.io/gh/PJK/libcbor/branch/master/graph/badge.svg)](https://codecov.io/gh/PJK/libcbor)
+
+**libcbor** is a C library for parsing and generating [CBOR](http://tools.ietf.org/html/rfc7049), the general-purpose schema-less binary data format.
+
+## Main features
+ - Complete RFC conformance
+ - Robust C99 implementation
+ - Layered architecture offers both control and convenience
+ - Flexible memory management
+ - No shared global state - threading friendly
+ - Proper handling of UTF-8
+ - Full support for streams & incremental processing
+ - Extensive documentation and test suite
+ - No runtime dependencies, small footprint
+ 
+## Getting started
+
+### Compile from source
+
+```bash
+git clone https://github.com/PJK/libcbor
+cmake -DCMAKE_BUILD_TYPE=Release -DCBOR_CUSTOM_ALLOC=ON libcbor
+make
+make install
+```
+
+### Homebrew
+
+```bash
+brew install libcbor
+```
+
+### Ubuntu 18.04 and above
+
+```bash
+sudo add-apt-repository universe
+sudo apt-get install libcbor-dev
+```
+
+### Fedora & RPM friends
+
+```bash
+yum install libcbor-devel
+```
+
+### Others 
+
+<details>
+  <summary>Packaged libcbor is available from 15+ major repositories. Click here for more detail</summary>
+  
+  [![Packaging status](https://repology.org/badge/vertical-allrepos/libcbor.svg)](https://repology.org/project/libcbor/versions)
+</details>
+
+## Usage example
+
+```c
+#include <cbor.h>
+#include <stdio.h>
+
+int main(int argc, char * argv[])
+{
+	/* Preallocate the map structure */
+	cbor_item_t * root = cbor_new_definite_map(2);
+	/* Add the content */
+	cbor_map_add(root, (struct cbor_pair) {
+		.key = cbor_move(cbor_build_string("Is CBOR awesome?")),
+		.value = cbor_move(cbor_build_bool(true))
+	});
+	cbor_map_add(root, (struct cbor_pair) {
+		.key = cbor_move(cbor_build_uint8(42)),
+		.value = cbor_move(cbor_build_string("Is the answer"))
+	});
+	/* Output: `length` bytes of data in the `buffer` */
+	unsigned char * buffer;
+	size_t buffer_size,
+		length = cbor_serialize_alloc(root, &buffer, &buffer_size);
+
+	fwrite(buffer, 1, length, stdout);
+	free(buffer);
+
+	fflush(stdout);
+	cbor_decref(&root);
+}
+```
+
+## Documentation
+Get the latest documentation at [libcbor.readthedocs.org](http://libcbor.readthedocs.org/)
+
+## Contributions
+
+All bug reports and contributions are welcome. Please see https://github.com/PJK/libcbor for more info.
+
+Kudos to all the [contributors](https://github.com/PJK/libcbor/graphs/contributors)!
+
+## License
+The MIT License (MIT)
+
+Copyright (c) Pavel Kalvoda, 2014-2020
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/allocators.c mysql-8.0-8.0.27/extra/libcbor/src/allocators.c
--- mysql-8.0-8.0.26/extra/libcbor/src/allocators.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/allocators.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include "cbor/common.h"
+
+CBOR_EXPORT _cbor_malloc_t _cbor_malloc = malloc;
+CBOR_EXPORT _cbor_realloc_t _cbor_realloc = realloc;
+CBOR_EXPORT _cbor_free_t _cbor_free = free;
+
+void cbor_set_allocs(_cbor_malloc_t custom_malloc,
+                     _cbor_realloc_t custom_realloc, _cbor_free_t custom_free) {
+  _cbor_malloc = custom_malloc;
+  _cbor_realloc = custom_realloc;
+  _cbor_free = custom_free;
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor/arrays.c mysql-8.0-8.0.27/extra/libcbor/src/cbor/arrays.c
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor/arrays.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor/arrays.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include "arrays.h"
+#include <string.h>
+#include "internal/memory_utils.h"
+
+size_t cbor_array_size(const cbor_item_t *item) {
+  assert(cbor_isa_array(item));
+  return item->metadata.array_metadata.end_ptr;
+}
+
+size_t cbor_array_allocated(const cbor_item_t *item) {
+  assert(cbor_isa_array(item));
+  return item->metadata.array_metadata.allocated;
+}
+
+cbor_item_t *cbor_array_get(const cbor_item_t *item, size_t index) {
+  return cbor_incref(((cbor_item_t **)item->data)[index]);
+}
+
+bool cbor_array_set(cbor_item_t *item, size_t index, cbor_item_t *value) {
+  if (index == item->metadata.array_metadata.end_ptr) {
+    return cbor_array_push(item, value);
+  } else if (index < item->metadata.array_metadata.end_ptr) {
+    return cbor_array_replace(item, index, value);
+  } else {
+    return false;
+  }
+  // TODO: This is unreachable and the index checking logic above seems
+  // suspicious -- out of bounds index is a caller error. Figure out & fix.
+  return true;
+}
+
+bool cbor_array_replace(cbor_item_t *item, size_t index, cbor_item_t *value) {
+  if (index >= item->metadata.array_metadata.end_ptr) return false;
+  /* We cannot use cbor_array_get as that would increase the refcount */
+  cbor_intermediate_decref(((cbor_item_t **)item->data)[index]);
+  ((cbor_item_t **)item->data)[index] = cbor_incref(value);
+  return true;
+}
+
+bool cbor_array_push(cbor_item_t *array, cbor_item_t *pushee) {
+  assert(cbor_isa_array(array));
+  struct _cbor_array_metadata *metadata =
+      (struct _cbor_array_metadata *)&array->metadata;
+  cbor_item_t **data = (cbor_item_t **)array->data;
+  if (cbor_array_is_definite(array)) {
+    /* Do not reallocate definite arrays */
+    if (metadata->end_ptr >= metadata->allocated) {
+      return false;
+    }
+    data[metadata->end_ptr++] = pushee;
+  } else {
+    /* Exponential realloc */
+    if (metadata->end_ptr >= metadata->allocated) {
+      // Check for overflows first
+      // TODO: Explicitly test this
+      if (!_cbor_safe_to_multiply(CBOR_BUFFER_GROWTH, metadata->allocated)) {
+        return false;
+      }
+
+      size_t new_allocation = metadata->allocated == 0
+                                  ? 1
+                                  : CBOR_BUFFER_GROWTH * metadata->allocated;
+
+      unsigned char *new_data = _cbor_realloc_multiple(
+          array->data, sizeof(cbor_item_t *), new_allocation);
+      if (new_data == NULL) {
+        return false;
+      }
+
+      array->data = new_data;
+      metadata->allocated = new_allocation;
+    }
+    ((cbor_item_t **)array->data)[metadata->end_ptr++] = pushee;
+  }
+  cbor_incref(pushee);
+  return true;
+}
+
+bool cbor_array_is_definite(const cbor_item_t *item) {
+  assert(cbor_isa_array(item));
+  return item->metadata.array_metadata.type == _CBOR_METADATA_DEFINITE;
+}
+
+bool cbor_array_is_indefinite(const cbor_item_t *item) {
+  assert(cbor_isa_array(item));
+  return item->metadata.array_metadata.type == _CBOR_METADATA_INDEFINITE;
+}
+
+cbor_item_t **cbor_array_handle(const cbor_item_t *item) {
+  assert(cbor_isa_array(item));
+  return (cbor_item_t **)item->data;
+}
+
+cbor_item_t *cbor_new_definite_array(size_t size) {
+  cbor_item_t *item = _CBOR_MALLOC(sizeof(cbor_item_t));
+  _CBOR_NOTNULL(item);
+  cbor_item_t **data = _cbor_alloc_multiple(sizeof(cbor_item_t *), size);
+  _CBOR_DEPENDENT_NOTNULL(item, data);
+
+  for (size_t i = 0; i < size; i++) {
+    data[i] = NULL;
+  }
+
+  *item = (cbor_item_t){
+      .refcount = 1,
+      .type = CBOR_TYPE_ARRAY,
+      .metadata = {.array_metadata = {.type = _CBOR_METADATA_DEFINITE,
+                                      .allocated = size,
+                                      .end_ptr = 0}},
+      .data = (unsigned char *)data};
+
+  return item;
+}
+
+cbor_item_t *cbor_new_indefinite_array() {
+  cbor_item_t *item = _CBOR_MALLOC(sizeof(cbor_item_t));
+  _CBOR_NOTNULL(item);
+
+  *item = (cbor_item_t){
+      .refcount = 1,
+      .type = CBOR_TYPE_ARRAY,
+      .metadata = {.array_metadata = {.type = _CBOR_METADATA_INDEFINITE,
+                                      .allocated = 0,
+                                      .end_ptr = 0}},
+      .data = NULL /* Can be safely realloc-ed */
+  };
+  return item;
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor/arrays.h mysql-8.0-8.0.27/extra/libcbor/src/cbor/arrays.h
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor/arrays.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor/arrays.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#ifndef LIBCBOR_ARRAYS_H
+#define LIBCBOR_ARRAYS_H
+
+#include "cbor/cbor_export.h"
+#include "cbor/common.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** Get the number of members
+ *
+ * @param item[borrow] An array
+ * @return The number of members
+ */
+CBOR_EXPORT size_t cbor_array_size(const cbor_item_t* item);
+
+/** Get the size of the allocated storage
+ *
+ * @param item[borrow] An array
+ * @return The size of the allocated storage (number of items)
+ */
+CBOR_EXPORT size_t cbor_array_allocated(const cbor_item_t* item);
+
+/** Get item by index
+ *
+ * @param item[borrow] An array
+ * @param index The index
+ * @return **incref** The item, or `NULL` in case of boundary violation
+ */
+CBOR_EXPORT cbor_item_t* cbor_array_get(const cbor_item_t* item, size_t index);
+
+/** Set item by index
+ *
+ * Creating arrays with holes is not possible
+ *
+ * @param item[borrow] An array
+ * @param value[incref] The item to assign
+ * @param index The index, first item is 0.
+ * @return true on success, false on allocation failure.
+ */
+CBOR_EXPORT bool cbor_array_set(cbor_item_t* item, size_t index,
+                                cbor_item_t* value);
+
+/** Replace item at an index
+ *
+ * The item being replace will be #cbor_decref 'ed.
+ *
+ * @param item[borrow] An array
+ * @param value[incref] The item to assign
+ * @param index The index, first item is 0.
+ * @return true on success, false on allocation failure.
+ */
+CBOR_EXPORT bool cbor_array_replace(cbor_item_t* item, size_t index,
+                                    cbor_item_t* value);
+
+/** Is the array definite?
+ *
+ * @param item[borrow] An array
+ * @return Is the array definite?
+ */
+CBOR_EXPORT bool cbor_array_is_definite(const cbor_item_t* item);
+
+/** Is the array indefinite?
+ *
+ * @param item[borrow] An array
+ * @return Is the array indefinite?
+ */
+CBOR_EXPORT bool cbor_array_is_indefinite(const cbor_item_t* item);
+
+/** Get the array contents
+ *
+ * The items may be reordered and modified as long as references remain
+ * consistent.
+ *
+ * @param item[borrow] An array
+ * @return #cbor_array_size items
+ */
+CBOR_EXPORT cbor_item_t** cbor_array_handle(const cbor_item_t* item);
+
+/** Create new definite array
+ *
+ * @param size Number of slots to preallocate
+ * @return **new** array or `NULL` upon malloc failure
+ */
+CBOR_EXPORT cbor_item_t* cbor_new_definite_array(size_t size);
+
+/** Create new indefinite array
+ *
+ * @return **new** array or `NULL` upon malloc failure
+ */
+CBOR_EXPORT cbor_item_t* cbor_new_indefinite_array();
+
+/** Append to the end
+ *
+ * For indefinite items, storage may be realloacted. For definite items, only
+ * the preallocated capacity is available.
+ *
+ * @param array[borrow] An array
+ * @param pushee[incref] The item to push
+ * @return true on success, false on failure
+ */
+CBOR_EXPORT bool cbor_array_push(cbor_item_t* array, cbor_item_t* pushee);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // LIBCBOR_ARRAYS_H
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor/bytestrings.c mysql-8.0-8.0.27/extra/libcbor/src/cbor/bytestrings.c
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor/bytestrings.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor/bytestrings.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include "bytestrings.h"
+#include <string.h>
+#include "internal/memory_utils.h"
+
+size_t cbor_bytestring_length(const cbor_item_t *item) {
+  assert(cbor_isa_bytestring(item));
+  return item->metadata.bytestring_metadata.length;
+}
+
+unsigned char *cbor_bytestring_handle(const cbor_item_t *item) {
+  assert(cbor_isa_bytestring(item));
+  return item->data;
+}
+
+bool cbor_bytestring_is_definite(const cbor_item_t *item) {
+  assert(cbor_isa_bytestring(item));
+  return item->metadata.bytestring_metadata.type == _CBOR_METADATA_DEFINITE;
+}
+
+bool cbor_bytestring_is_indefinite(const cbor_item_t *item) {
+  return !cbor_bytestring_is_definite(item);
+}
+
+cbor_item_t *cbor_new_definite_bytestring() {
+  cbor_item_t *item = _CBOR_MALLOC(sizeof(cbor_item_t));
+  _CBOR_NOTNULL(item);
+  *item = (cbor_item_t){
+      .refcount = 1,
+      .type = CBOR_TYPE_BYTESTRING,
+      .metadata = {.bytestring_metadata = {_CBOR_METADATA_DEFINITE, 0}}};
+  return item;
+}
+
+cbor_item_t *cbor_new_indefinite_bytestring() {
+  cbor_item_t *item = _CBOR_MALLOC(sizeof(cbor_item_t));
+  _CBOR_NOTNULL(item);
+  *item = (cbor_item_t){
+      .refcount = 1,
+      .type = CBOR_TYPE_BYTESTRING,
+      .metadata = {.bytestring_metadata = {.type = _CBOR_METADATA_INDEFINITE,
+                                           .length = 0}},
+      .data = _CBOR_MALLOC(sizeof(struct cbor_indefinite_string_data))};
+  _CBOR_DEPENDENT_NOTNULL(item, item->data);
+  *((struct cbor_indefinite_string_data *)item->data) =
+      (struct cbor_indefinite_string_data){
+          .chunk_count = 0,
+          .chunk_capacity = 0,
+          .chunks = NULL,
+      };
+  return item;
+}
+
+cbor_item_t *cbor_build_bytestring(cbor_data handle, size_t length) {
+  cbor_item_t *item = cbor_new_definite_bytestring();
+  _CBOR_NOTNULL(item);
+  void *content = _CBOR_MALLOC(length);
+  _CBOR_DEPENDENT_NOTNULL(item, content);
+  memcpy(content, handle, length);
+  cbor_bytestring_set_handle(item, content, length);
+  return item;
+}
+
+void cbor_bytestring_set_handle(cbor_item_t *item,
+                                cbor_mutable_data CBOR_RESTRICT_POINTER data,
+                                size_t length) {
+  assert(cbor_isa_bytestring(item));
+  assert(cbor_bytestring_is_definite(item));
+  item->data = data;
+  item->metadata.bytestring_metadata.length = length;
+}
+
+cbor_item_t **cbor_bytestring_chunks_handle(const cbor_item_t *item) {
+  assert(cbor_isa_bytestring(item));
+  assert(cbor_bytestring_is_indefinite(item));
+  return ((struct cbor_indefinite_string_data *)item->data)->chunks;
+}
+
+size_t cbor_bytestring_chunk_count(const cbor_item_t *item) {
+  assert(cbor_isa_bytestring(item));
+  assert(cbor_bytestring_is_indefinite(item));
+  return ((struct cbor_indefinite_string_data *)item->data)->chunk_count;
+}
+
+bool cbor_bytestring_add_chunk(cbor_item_t *item, cbor_item_t *chunk) {
+  assert(cbor_isa_bytestring(item));
+  assert(cbor_bytestring_is_indefinite(item));
+  struct cbor_indefinite_string_data *data =
+      (struct cbor_indefinite_string_data *)item->data;
+  if (data->chunk_count == data->chunk_capacity) {
+    // TODO: Add a test for this
+    if (!_cbor_safe_to_multiply(CBOR_BUFFER_GROWTH, data->chunk_capacity)) {
+      return false;
+    }
+
+    size_t new_chunk_capacity =
+        data->chunk_capacity == 0 ? 1
+                                  : CBOR_BUFFER_GROWTH * (data->chunk_capacity);
+
+    cbor_item_t **new_chunks_data = _cbor_realloc_multiple(
+        data->chunks, sizeof(cbor_item_t *), new_chunk_capacity);
+
+    if (new_chunks_data == NULL) {
+      return false;
+    }
+    data->chunk_capacity = new_chunk_capacity;
+    data->chunks = new_chunks_data;
+  }
+  data->chunks[data->chunk_count++] = cbor_incref(chunk);
+  return true;
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor/bytestrings.h mysql-8.0-8.0.27/extra/libcbor/src/cbor/bytestrings.h
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor/bytestrings.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor/bytestrings.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#ifndef LIBCBOR_BYTESTRINGS_H
+#define LIBCBOR_BYTESTRINGS_H
+
+#include "cbor/cbor_export.h"
+#include "cbor/common.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * ============================================================================
+ * Byte string manipulation
+ * ============================================================================
+ */
+
+/** Returns the length of the binary data
+ *
+ * For definite byte strings only
+ *
+ * @param item[borrow] a definite bytestring
+ * @return length of the binary data. Zero if no chunk has been attached yet
+ */
+CBOR_EXPORT size_t cbor_bytestring_length(const cbor_item_t *item);
+
+/** Is the byte string definite?
+ *
+ * @param item[borrow] a byte string
+ * @return Is the byte string definite?
+ */
+CBOR_EXPORT bool cbor_bytestring_is_definite(const cbor_item_t *item);
+
+/** Is the byte string indefinite?
+ *
+ * @param item[borrow] a byte string
+ * @return Is the byte string indefinite?
+ */
+CBOR_EXPORT bool cbor_bytestring_is_indefinite(const cbor_item_t *item);
+
+/** Get the handle to the binary data
+ *
+ * Definite items only. Modifying the data is allowed. In that case, the caller
+ * takes responsibility for the effect on items this item might be a part of
+ *
+ * @param item[borrow] A definite byte string
+ * @return The address of the binary data. `NULL` if no data have been assigned
+ * yet.
+ */
+CBOR_EXPORT cbor_mutable_data cbor_bytestring_handle(const cbor_item_t *item);
+
+/** Set the handle to the binary data
+ *
+ * @param item[borrow] A definite byte string
+ * @param data The memory block. The caller gives up the ownership of the block.
+ * libcbor will deallocate it when appropriate using its free function
+ * @param length Length of the data block
+ */
+CBOR_EXPORT void cbor_bytestring_set_handle(
+    cbor_item_t *item, cbor_mutable_data CBOR_RESTRICT_POINTER data,
+    size_t length);
+
+/** Get the handle to the array of chunks
+ *
+ * Manipulations with the memory block (e.g. sorting it) are allowed, but the
+ * validity and the number of chunks must be retained.
+ *
+ * @param item[borrow] A indefinite byte string
+ * @return array of #cbor_bytestring_chunk_count definite bytestrings
+ */
+CBOR_EXPORT cbor_item_t **cbor_bytestring_chunks_handle(
+    const cbor_item_t *item);
+
+/** Get the number of chunks this string consist of
+ *
+ * @param item[borrow] A indefinite bytestring
+ * @return The chunk count. 0 for freshly created items.
+ */
+CBOR_EXPORT size_t cbor_bytestring_chunk_count(const cbor_item_t *item);
+
+/** Appends a chunk to the bytestring
+ *
+ * Indefinite byte strings only.
+ *
+ * May realloc the chunk storage.
+ *
+ * @param item[borrow] An indefinite byte string
+ * @param item[incref] A definite byte string
+ * @return true on success, false on realloc failure. In that case, the refcount
+ * of `chunk` is not increased and the `item` is left intact.
+ */
+CBOR_EXPORT bool cbor_bytestring_add_chunk(cbor_item_t *item,
+                                           cbor_item_t *chunk);
+
+/** Creates a new definite byte string
+ *
+ * The handle is initialized to `NULL` and length to 0
+ *
+ * @return **new** definite bytestring. `NULL` on malloc failure.
+ */
+CBOR_EXPORT cbor_item_t *cbor_new_definite_bytestring();
+
+/** Creates a new indefinite byte string
+ *
+ * The chunks array is initialized to `NULL` and chunkcount to 0
+ *
+ * @return **new** indefinite bytestring. `NULL` on malloc failure.
+ */
+CBOR_EXPORT cbor_item_t *cbor_new_indefinite_bytestring();
+
+/** Creates a new byte string and initializes it
+ *
+ * The `handle` will be copied to a newly allocated block
+ *
+ * @param handle Block of binary data
+ * @param length Length of `data`
+ * @return A **new** byte string with content `handle`. `NULL` on malloc
+ * failure.
+ */
+CBOR_EXPORT cbor_item_t *cbor_build_bytestring(cbor_data handle, size_t length);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // LIBCBOR_BYTESTRINGS_H
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor/callbacks.c mysql-8.0-8.0.27/extra/libcbor/src/cbor/callbacks.c
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor/callbacks.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor/callbacks.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include "callbacks.h"
+
+#define CBOR_DUMMY_CALLBACK \
+  {}
+
+void cbor_null_uint8_callback(void *_ctx, uint8_t _val) CBOR_DUMMY_CALLBACK
+
+    void cbor_null_uint16_callback(void *_ctx,
+                                   uint16_t _val) CBOR_DUMMY_CALLBACK
+
+    void cbor_null_uint32_callback(void *_ctx,
+                                   uint32_t _val) CBOR_DUMMY_CALLBACK
+
+    void cbor_null_uint64_callback(void *_ctx,
+                                   uint64_t _val) CBOR_DUMMY_CALLBACK
+
+    void cbor_null_negint8_callback(void *_ctx,
+                                    uint8_t _val) CBOR_DUMMY_CALLBACK
+
+    void cbor_null_negint16_callback(void *_ctx,
+                                     uint16_t _val) CBOR_DUMMY_CALLBACK
+
+    void cbor_null_negint32_callback(void *_ctx,
+                                     uint32_t _val) CBOR_DUMMY_CALLBACK
+
+    void cbor_null_negint64_callback(void *_ctx,
+                                     uint64_t _val) CBOR_DUMMY_CALLBACK
+
+    void cbor_null_string_callback(void *_ctx, cbor_data _val,
+                                   size_t _val2) CBOR_DUMMY_CALLBACK
+
+    void cbor_null_string_start_callback(void *_ctx) CBOR_DUMMY_CALLBACK
+
+    void cbor_null_byte_string_callback(void *_ctx, cbor_data _val,
+                                        size_t _val2) CBOR_DUMMY_CALLBACK
+
+    void cbor_null_byte_string_start_callback(void *_ctx) CBOR_DUMMY_CALLBACK
+
+    void cbor_null_array_start_callback(void *_ctx,
+                                        size_t _val) CBOR_DUMMY_CALLBACK
+
+    void cbor_null_indef_array_start_callback(void *_ctx) CBOR_DUMMY_CALLBACK
+
+    void cbor_null_map_start_callback(void *_ctx,
+                                      size_t _val) CBOR_DUMMY_CALLBACK
+
+    void cbor_null_indef_map_start_callback(void *_ctx) CBOR_DUMMY_CALLBACK
+
+    void cbor_null_tag_callback(void *_ctx, uint64_t _val) CBOR_DUMMY_CALLBACK
+
+    void cbor_null_float2_callback(void *_ctx, float _val) CBOR_DUMMY_CALLBACK
+
+    void cbor_null_float4_callback(void *_ctx, float _val) CBOR_DUMMY_CALLBACK
+
+    void cbor_null_float8_callback(void *_ctx, double _val) CBOR_DUMMY_CALLBACK
+
+    void cbor_null_null_callback(void *_ctx) CBOR_DUMMY_CALLBACK
+
+    void cbor_null_undefined_callback(void *_ctx) CBOR_DUMMY_CALLBACK
+
+    void cbor_null_boolean_callback(void *_ctx, bool _val) CBOR_DUMMY_CALLBACK
+
+    void cbor_null_indef_break_callback(void *_ctx) CBOR_DUMMY_CALLBACK
+
+    CBOR_EXPORT const struct cbor_callbacks cbor_empty_callbacks = {
+        /* Type 0 - Unsigned integers */
+        .uint8 = cbor_null_uint8_callback,
+        .uint16 = cbor_null_uint16_callback,
+        .uint32 = cbor_null_uint32_callback,
+        .uint64 = cbor_null_uint64_callback,
+
+        /* Type 1 - Negative integers */
+        .negint8 = cbor_null_negint8_callback,
+        .negint16 = cbor_null_negint16_callback,
+        .negint32 = cbor_null_negint32_callback,
+        .negint64 = cbor_null_negint64_callback,
+
+        /* Type 2 - Byte strings */
+        .byte_string_start = cbor_null_byte_string_start_callback,
+        .byte_string = cbor_null_byte_string_callback,
+
+        /* Type 3 - Strings */
+        .string_start = cbor_null_string_start_callback,
+        .string = cbor_null_string_callback,
+
+        /* Type 4 - Arrays */
+        .indef_array_start = cbor_null_indef_array_start_callback,
+        .array_start = cbor_null_array_start_callback,
+
+        /* Type 5 - Maps */
+        .indef_map_start = cbor_null_indef_map_start_callback,
+        .map_start = cbor_null_map_start_callback,
+
+        /* Type 6 - Tags */
+        .tag = cbor_null_tag_callback,
+
+        /* Type 7 - Floats & misc */
+        /* Type names cannot be member names */
+        .float2 = cbor_null_float2_callback,
+        /* 2B float is not supported in standard C */
+        .float4 = cbor_null_float4_callback,
+        .float8 = cbor_null_float8_callback,
+        .undefined = cbor_null_undefined_callback,
+        .null = cbor_null_null_callback,
+        .boolean = cbor_null_boolean_callback,
+
+        /* Shared indefinites */
+        .indef_break = cbor_null_indef_break_callback,
+};
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor/callbacks.h mysql-8.0-8.0.27/extra/libcbor/src/cbor/callbacks.h
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor/callbacks.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor/callbacks.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,187 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#ifndef LIBCBOR_CALLBACKS_H
+#define LIBCBOR_CALLBACKS_H
+
+#include "cbor/cbor_export.h"
+#include "cbor/common.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** Callback prototype */
+typedef void (*cbor_int8_callback)(void *, uint8_t);
+
+/** Callback prototype */
+typedef void (*cbor_int16_callback)(void *, uint16_t);
+
+/** Callback prototype */
+typedef void (*cbor_int32_callback)(void *, uint32_t);
+
+/** Callback prototype */
+typedef void (*cbor_int64_callback)(void *, uint64_t);
+
+/** Callback prototype */
+typedef void (*cbor_simple_callback)(void *);
+
+/** Callback prototype */
+typedef void (*cbor_string_callback)(void *, cbor_data, size_t);
+
+/** Callback prototype */
+typedef void (*cbor_collection_callback)(void *, size_t);
+
+/** Callback prototype */
+typedef void (*cbor_float_callback)(void *, float);
+
+/** Callback prototype */
+typedef void (*cbor_double_callback)(void *, double);
+
+/** Callback prototype */
+typedef void (*cbor_bool_callback)(void *, bool);
+
+/** Callback bundle -- passed to the decoder */
+struct cbor_callbacks {
+  /** Unsigned int */
+  cbor_int8_callback uint8;
+  /** Unsigned int */
+  cbor_int16_callback uint16;
+  /** Unsigned int */
+  cbor_int32_callback uint32;
+  /** Unsigned int */
+  cbor_int64_callback uint64;
+
+  /** Negative int */
+  cbor_int64_callback negint64;
+  /** Negative int */
+  cbor_int32_callback negint32;
+  /** Negative int */
+  cbor_int16_callback negint16;
+  /** Negative int */
+  cbor_int8_callback negint8;
+
+  /** Definite byte string */
+  cbor_simple_callback byte_string_start;
+  /** Indefinite byte string start */
+  cbor_string_callback byte_string;
+
+  /** Definite string */
+  cbor_string_callback string;
+  /** Indefinite string start */
+  cbor_simple_callback string_start;
+
+  /** Definite array */
+  cbor_simple_callback indef_array_start;
+  /** Indefinite array */
+  cbor_collection_callback array_start;
+
+  /** Definite map */
+  cbor_simple_callback indef_map_start;
+  /** Indefinite map */
+  cbor_collection_callback map_start;
+
+  /** Tags */
+  cbor_int64_callback tag;
+
+  /** Half float */
+  cbor_float_callback float2;
+  /** Single float */
+  cbor_float_callback float4;
+  /** Double float */
+  cbor_double_callback float8;
+  /** Undef */
+  cbor_simple_callback undefined;
+  /** Null */
+  cbor_simple_callback null;
+  /** Bool */
+  cbor_bool_callback boolean;
+
+  /** Indefinite item break */
+  cbor_simple_callback indef_break;
+};
+
+/** Dummy callback implementation - does nothing */
+CBOR_EXPORT void cbor_null_uint8_callback(void *, uint8_t);
+
+/** Dummy callback implementation - does nothing */
+CBOR_EXPORT void cbor_null_uint16_callback(void *, uint16_t);
+
+/** Dummy callback implementation - does nothing */
+CBOR_EXPORT void cbor_null_uint32_callback(void *, uint32_t);
+
+/** Dummy callback implementation - does nothing */
+CBOR_EXPORT void cbor_null_uint64_callback(void *, uint64_t);
+
+/** Dummy callback implementation - does nothing */
+CBOR_EXPORT void cbor_null_negint8_callback(void *, uint8_t);
+
+/** Dummy callback implementation - does nothing */
+CBOR_EXPORT void cbor_null_negint16_callback(void *, uint16_t);
+
+/** Dummy callback implementation - does nothing */
+CBOR_EXPORT void cbor_null_negint32_callback(void *, uint32_t);
+
+/** Dummy callback implementation - does nothing */
+CBOR_EXPORT void cbor_null_negint64_callback(void *, uint64_t);
+
+/** Dummy callback implementation - does nothing */
+CBOR_EXPORT void cbor_null_string_callback(void *, cbor_data, size_t);
+
+/** Dummy callback implementation - does nothing */
+CBOR_EXPORT void cbor_null_string_start_callback(void *);
+
+/** Dummy callback implementation - does nothing */
+CBOR_EXPORT void cbor_null_byte_string_callback(void *, cbor_data, size_t);
+
+/** Dummy callback implementation - does nothing */
+CBOR_EXPORT void cbor_null_byte_string_start_callback(void *);
+
+/** Dummy callback implementation - does nothing */
+CBOR_EXPORT void cbor_null_array_start_callback(void *, size_t);
+
+/** Dummy callback implementation - does nothing */
+CBOR_EXPORT void cbor_null_indef_array_start_callback(void *);
+
+/** Dummy callback implementation - does nothing */
+CBOR_EXPORT void cbor_null_map_start_callback(void *, size_t);
+
+/** Dummy callback implementation - does nothing */
+CBOR_EXPORT void cbor_null_indef_map_start_callback(void *);
+
+/** Dummy callback implementation - does nothing */
+CBOR_EXPORT void cbor_null_tag_callback(void *, uint64_t);
+
+/** Dummy callback implementation - does nothing */
+CBOR_EXPORT void cbor_null_float2_callback(void *, float);
+
+/** Dummy callback implementation - does nothing */
+CBOR_EXPORT void cbor_null_float4_callback(void *, float);
+
+/** Dummy callback implementation - does nothing */
+CBOR_EXPORT void cbor_null_float8_callback(void *, double);
+
+/** Dummy callback implementation - does nothing */
+CBOR_EXPORT void cbor_null_null_callback(void *);
+
+/** Dummy callback implementation - does nothing */
+CBOR_EXPORT void cbor_null_undefined_callback(void *);
+
+/** Dummy callback implementation - does nothing */
+CBOR_EXPORT void cbor_null_boolean_callback(void *, bool);
+
+/** Dummy callback implementation - does nothing */
+CBOR_EXPORT void cbor_null_indef_break_callback(void *);
+
+/** Dummy callback bundle - does nothing */
+CBOR_EXPORT extern const struct cbor_callbacks cbor_empty_callbacks;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // LIBCBOR_CALLBACKS_H
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor/common.c mysql-8.0-8.0.27/extra/libcbor/src/cbor/common.c
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor/common.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor/common.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include "cbor/common.h"
+#include "arrays.h"
+#include "bytestrings.h"
+#include "data.h"
+#include "floats_ctrls.h"
+#include "ints.h"
+#include "maps.h"
+#include "strings.h"
+#include "tags.h"
+
+bool cbor_isa_uint(const cbor_item_t *item) {
+  return item->type == CBOR_TYPE_UINT;
+}
+
+bool cbor_isa_negint(const cbor_item_t *item) {
+  return item->type == CBOR_TYPE_NEGINT;
+}
+
+bool cbor_isa_bytestring(const cbor_item_t *item) {
+  return item->type == CBOR_TYPE_BYTESTRING;
+}
+
+bool cbor_isa_string(const cbor_item_t *item) {
+  return item->type == CBOR_TYPE_STRING;
+}
+
+bool cbor_isa_array(const cbor_item_t *item) {
+  return item->type == CBOR_TYPE_ARRAY;
+}
+
+bool cbor_isa_map(const cbor_item_t *item) {
+  return item->type == CBOR_TYPE_MAP;
+}
+
+bool cbor_isa_tag(const cbor_item_t *item) {
+  return item->type == CBOR_TYPE_TAG;
+}
+
+bool cbor_isa_float_ctrl(const cbor_item_t *item) {
+  return item->type == CBOR_TYPE_FLOAT_CTRL;
+}
+
+cbor_type cbor_typeof(const cbor_item_t *item) { return item->type; }
+
+bool cbor_is_int(const cbor_item_t *item) {
+  return cbor_isa_uint(item) || cbor_isa_negint(item);
+}
+
+bool cbor_is_bool(const cbor_item_t *item) {
+  return cbor_isa_float_ctrl(item) &&
+         (cbor_ctrl_value(item) == CBOR_CTRL_FALSE ||
+          cbor_ctrl_value(item) == CBOR_CTRL_TRUE);
+}
+
+bool cbor_is_null(const cbor_item_t *item) {
+  return cbor_isa_float_ctrl(item) && cbor_ctrl_value(item) == CBOR_CTRL_NULL;
+}
+
+bool cbor_is_undef(const cbor_item_t *item) {
+  return cbor_isa_float_ctrl(item) && cbor_ctrl_value(item) == CBOR_CTRL_UNDEF;
+}
+
+bool cbor_is_float(const cbor_item_t *item) {
+  return cbor_isa_float_ctrl(item) && !cbor_float_ctrl_is_ctrl(item);
+}
+
+cbor_item_t *cbor_incref(cbor_item_t *item) {
+  item->refcount++;
+  return item;
+}
+
+void cbor_decref(cbor_item_t **item_ref) {
+  cbor_item_t *item = *item_ref;
+  assert(item->refcount > 0);
+  if (--item->refcount == 0) {
+    switch (item->type) {
+      case CBOR_TYPE_UINT:
+        /* Fallthrough */
+      case CBOR_TYPE_NEGINT:
+        /* Combined allocation, freeing the item suffices */
+        { break; }
+      case CBOR_TYPE_BYTESTRING: {
+        if (cbor_bytestring_is_definite(item)) {
+          _CBOR_FREE(item->data);
+        } else {
+          /* We need to decref all chunks */
+          cbor_item_t **handle = cbor_bytestring_chunks_handle(item);
+          for (size_t i = 0; i < cbor_bytestring_chunk_count(item); i++)
+            cbor_decref(&handle[i]);
+          _CBOR_FREE(
+              ((struct cbor_indefinite_string_data *)item->data)->chunks);
+          _CBOR_FREE(item->data);
+        }
+        break;
+      }
+      case CBOR_TYPE_STRING: {
+        if (cbor_string_is_definite(item)) {
+          _CBOR_FREE(item->data);
+        } else {
+          /* We need to decref all chunks */
+          cbor_item_t **handle = cbor_string_chunks_handle(item);
+          for (size_t i = 0; i < cbor_string_chunk_count(item); i++)
+            cbor_decref(&handle[i]);
+          _CBOR_FREE(
+              ((struct cbor_indefinite_string_data *)item->data)->chunks);
+          _CBOR_FREE(item->data);
+        }
+        break;
+      }
+      case CBOR_TYPE_ARRAY: {
+        /* Get all items and decref them */
+        cbor_item_t **handle = cbor_array_handle(item);
+        size_t size = cbor_array_size(item);
+        for (size_t i = 0; i < size; i++)
+          if (handle[i] != NULL) cbor_decref(&handle[i]);
+        _CBOR_FREE(item->data);
+        break;
+      }
+      case CBOR_TYPE_MAP: {
+        struct cbor_pair *handle = cbor_map_handle(item);
+        for (size_t i = 0; i < item->metadata.map_metadata.end_ptr;
+             i++, handle++) {
+          cbor_decref(&handle->key);
+          if (handle->value != NULL) cbor_decref(&handle->value);
+        }
+        _CBOR_FREE(item->data);
+        break;
+      };
+      case CBOR_TYPE_TAG: {
+        if (item->metadata.tag_metadata.tagged_item != NULL)
+          cbor_decref(&item->metadata.tag_metadata.tagged_item);
+        _CBOR_FREE(item->data);
+        break;
+      }
+      case CBOR_TYPE_FLOAT_CTRL: {
+        /* Floats have combined allocation */
+        break;
+      }
+    }
+    _CBOR_FREE(item);
+    // TODO
+    *item_ref = NULL;
+  }
+}
+
+void cbor_intermediate_decref(cbor_item_t *item) { cbor_decref(&item); }
+
+size_t cbor_refcount(const cbor_item_t *item) { return item->refcount; }
+
+cbor_item_t *cbor_move(cbor_item_t *item) {
+  item->refcount--;
+  return item;
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor/common.h mysql-8.0-8.0.27/extra/libcbor/src/cbor/common.h
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor/common.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor/common.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,294 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#ifndef LIBCBOR_COMMON_H
+#define LIBCBOR_COMMON_H
+
+#include <assert.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include "cbor/cbor_export.h"
+#include "cbor/configuration.h"
+#include "data.h"
+
+#ifdef __cplusplus
+extern "C" {
+
+/**
+ * C++ is not a subset of C99 -- 'restrict' qualifier is not a part of the
+ * language. This is a workaround to keep it in C headers -- compilers allow
+ * linking non-restrict signatures with restrict implementations.
+ *
+ * If you know a nicer way, please do let me know.
+ */
+#define CBOR_RESTRICT_POINTER
+
+#else
+
+// MSVC + C++ workaround
+#define CBOR_RESTRICT_POINTER CBOR_RESTRICT_SPECIFIER
+
+#endif
+
+static const uint8_t cbor_major_version = CBOR_MAJOR_VERSION;
+static const uint8_t cbor_minor_version = CBOR_MINOR_VERSION;
+static const uint8_t cbor_patch_version = CBOR_PATCH_VERSION;
+
+#define CBOR_VERSION         \
+  TO_STR(CBOR_MAJOR_VERSION) \
+  "." TO_STR(CBOR_MINOR_VERSION) "." TO_STR(CBOR_PATCH_VERSION)
+#define CBOR_HEX_VERSION \
+  ((CBOR_MAJOR_VERSION << 16) | (CBOR_MINOR_VERSION << 8) | CBOR_PATCH_VERSION)
+
+/* http://stackoverflow.com/questions/1644868/c-define-macro-for-debug-printing
+ */
+#ifdef DEBUG
+#include <stdio.h>
+#define debug_print(fmt, ...)                                           \
+  do {                                                                  \
+    if (DEBUG)                                                          \
+      fprintf(stderr, "%s:%d:%s(): " fmt, __FILE__, __LINE__, __func__, \
+              __VA_ARGS__);                                             \
+  } while (0)
+#else
+#define debug_print(fmt, ...) \
+  do {                        \
+  } while (0)
+#endif
+
+#define TO_STR_(x) #x
+#define TO_STR(x) TO_STR_(x) /* enables proper double expansion */
+
+// Macro to short-circuit builder functions when memory allocation fails
+#define _CBOR_NOTNULL(cbor_item) \
+  do {                           \
+    if (cbor_item == NULL) {     \
+      return NULL;               \
+    }                            \
+  } while (0)
+
+// Macro to short-circuit builders when memory allocation of nested data fails
+#define _CBOR_DEPENDENT_NOTNULL(cbor_item, pointer) \
+  do {                                              \
+    if (pointer == NULL) {                          \
+      _CBOR_FREE(cbor_item);                        \
+      return NULL;                                  \
+    }                                               \
+  } while (0)
+
+#if CBOR_CUSTOM_ALLOC
+
+typedef void *(*_cbor_malloc_t)(size_t);
+typedef void *(*_cbor_realloc_t)(void *, size_t);
+typedef void (*_cbor_free_t)(void *);
+
+CBOR_EXPORT extern _cbor_malloc_t _cbor_malloc;
+CBOR_EXPORT extern _cbor_realloc_t _cbor_realloc;
+CBOR_EXPORT extern _cbor_free_t _cbor_free;
+
+/** Sets the memory management routines to use.
+ *
+ * Only available when `CBOR_CUSTOM_ALLOC` is truthy
+ *
+ * \rst
+ * .. warning:: This function modifies the global state and should therefore be
+ * used accordingly. Changing the memory handlers while allocated items exist
+ * will result in a ``free``/``malloc`` mismatch. This function is not thread
+ * safe with respect to both itself and all the other *libcbor* functions that
+ * work with the heap.
+ * .. note:: `realloc` implementation must correctly support `NULL` reallocation
+ * (see e.g. http://en.cppreference.com/w/c/memory/realloc) \endrst
+ *
+ * @param custom_malloc malloc implementation
+ * @param custom_realloc realloc implementation
+ * @param custom_free free implementation
+ */
+CBOR_EXPORT void cbor_set_allocs(_cbor_malloc_t custom_malloc,
+                                 _cbor_realloc_t custom_realloc,
+                                 _cbor_free_t custom_free);
+
+#define _CBOR_MALLOC _cbor_malloc
+#define _CBOR_REALLOC _cbor_realloc
+#define _CBOR_FREE _cbor_free
+
+#else
+
+#define _CBOR_MALLOC malloc
+#define _CBOR_REALLOC realloc
+#define _CBOR_FREE free
+
+#endif
+
+/*
+ * ============================================================================
+ * Type manipulation
+ * ============================================================================
+ */
+
+/** Get the type of the item
+ *
+ * @param item[borrow]
+ * @return The type
+ */
+CBOR_EXPORT cbor_type cbor_typeof(
+    const cbor_item_t *item); /* Will be inlined iff link-time opt is enabled */
+
+/* Standard item types as described by the RFC */
+
+/** Does the item have the appropriate major type?
+ * @param item[borrow] the item
+ * @return Is the item an #CBOR_TYPE_UINT?
+ */
+CBOR_EXPORT bool cbor_isa_uint(const cbor_item_t *item);
+
+/** Does the item have the appropriate major type?
+ * @param item[borrow] the item
+ * @return Is the item a #CBOR_TYPE_NEGINT?
+ */
+CBOR_EXPORT bool cbor_isa_negint(const cbor_item_t *item);
+
+/** Does the item have the appropriate major type?
+ * @param item[borrow] the item
+ * @return Is the item a #CBOR_TYPE_BYTESTRING?
+ */
+CBOR_EXPORT bool cbor_isa_bytestring(const cbor_item_t *item);
+
+/** Does the item have the appropriate major type?
+ * @param item[borrow] the item
+ * @return Is the item a #CBOR_TYPE_STRING?
+ */
+CBOR_EXPORT bool cbor_isa_string(const cbor_item_t *item);
+
+/** Does the item have the appropriate major type?
+ * @param item[borrow] the item
+ * @return Is the item an #CBOR_TYPE_ARRAY?
+ */
+CBOR_EXPORT bool cbor_isa_array(const cbor_item_t *item);
+
+/** Does the item have the appropriate major type?
+ * @param item[borrow] the item
+ * @return Is the item a #CBOR_TYPE_MAP?
+ */
+CBOR_EXPORT bool cbor_isa_map(const cbor_item_t *item);
+
+/** Does the item have the appropriate major type?
+ * @param item[borrow] the item
+ * @return Is the item a #CBOR_TYPE_TAG?
+ */
+CBOR_EXPORT bool cbor_isa_tag(const cbor_item_t *item);
+
+/** Does the item have the appropriate major type?
+ * @param item[borrow] the item
+ * @return Is the item a #CBOR_TYPE_FLOAT_CTRL?
+ */
+CBOR_EXPORT bool cbor_isa_float_ctrl(const cbor_item_t *item);
+
+/* Practical types with respect to their semantics (but not tag values) */
+
+/** Is the item an integer, either positive or negative?
+ * @param item[borrow] the item
+ * @return  Is the item an integer, either positive or negative?
+ */
+CBOR_EXPORT bool cbor_is_int(const cbor_item_t *item);
+
+/** Is the item an a floating point number?
+ * @param item[borrow] the item
+ * @return  Is the item a floating point number?
+ */
+CBOR_EXPORT bool cbor_is_float(const cbor_item_t *item);
+
+/** Is the item an a boolean?
+ * @param item[borrow] the item
+ * @return  Is the item a boolean?
+ */
+CBOR_EXPORT bool cbor_is_bool(const cbor_item_t *item);
+
+/** Does this item represent `null`
+ * \rst
+ * .. warning:: This is in no way related to the value of the pointer. Passing a
+ * null pointer will most likely result in a crash. \endrst
+ * @param item[borrow] the item
+ * @return  Is the item (CBOR logical) null?
+ */
+CBOR_EXPORT bool cbor_is_null(const cbor_item_t *item);
+
+/** Does this item represent `undefined`
+ * \rst
+ * .. warning:: Care must be taken to distinguish nulls and undefined values in
+ * C. \endrst
+ * @param item[borrow] the item
+ * @return Is the item (CBOR logical) undefined?
+ */
+CBOR_EXPORT bool cbor_is_undef(const cbor_item_t *item);
+
+/*
+ * ============================================================================
+ * Memory management
+ * ============================================================================
+ */
+
+/** Increases the reference count by one
+ *
+ * No dependent items are affected.
+ *
+ * @param item[incref] item the item
+ * @return the input reference
+ */
+CBOR_EXPORT cbor_item_t *cbor_incref(cbor_item_t *item);
+
+/** Decreases the reference count by one, deallocating the item if needed
+ *
+ * In case the item is deallocated, the reference count of any dependent items
+ * is adjusted accordingly in a recursive manner.
+ *
+ * @param item[take] the item. Set to `NULL` if deallocated
+ */
+CBOR_EXPORT void cbor_decref(cbor_item_t **item);
+
+/** Decreases the reference count by one, deallocating the item if needed
+ *
+ * Convenience wrapper for #cbor_decref when its set-to-null behavior is not
+ * needed
+ *
+ * @param item[take] the item
+ */
+CBOR_EXPORT void cbor_intermediate_decref(cbor_item_t *item);
+
+/** Get the reference count
+ *
+ * \rst
+ * .. warning:: This does *not* account for transitive references.
+ * \endrst
+ *
+ * @param item[borrow] the item
+ * @return the reference count
+ */
+CBOR_EXPORT size_t cbor_refcount(const cbor_item_t *item);
+
+/** Provides CPP-like move construct
+ *
+ * Decreases the reference count by one, but does not deallocate the item even
+ * if its refcount reaches zero. This is useful for passing intermediate values
+ * to functions that increase reference count. Should only be used with
+ * functions that `incref` their arguments.
+ *
+ * \rst
+ * .. warning:: If the item is moved without correctly increasing the reference
+ * count afterwards, the memory will be leaked. \endrst
+ *
+ * @param item[take] the item
+ * @return the item with reference count decreased by one
+ */
+CBOR_EXPORT cbor_item_t *cbor_move(cbor_item_t *item);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // LIBCBOR_COMMON_H
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor/configuration.h.in mysql-8.0-8.0.27/extra/libcbor/src/cbor/configuration.h.in
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor/configuration.h.in	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor/configuration.h.in	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,16 @@
+#ifndef LIBCBOR_CONFIGURATION_H
+#define LIBCBOR_CONFIGURATION_H
+
+#define CBOR_MAJOR_VERSION ${CBOR_VERSION_MAJOR}
+#define CBOR_MINOR_VERSION ${CBOR_VERSION_MINOR}
+#define CBOR_PATCH_VERSION ${CBOR_VERSION_PATCH}
+
+#cmakedefine01 CBOR_CUSTOM_ALLOC
+#define CBOR_BUFFER_GROWTH ${CBOR_BUFFER_GROWTH}
+#define CBOR_MAX_STACK_SIZE ${CBOR_MAX_STACK_SIZE}
+#cmakedefine01 CBOR_PRETTY_PRINTER
+
+#define CBOR_RESTRICT_SPECIFIER ${CBOR_RESTRICT_SPECIFIER}
+#define CBOR_INLINE_SPECIFIER ${CBOR_INLINE_SPECIFIER}
+
+#endif //LIBCBOR_CONFIGURATION_H
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor/data.h mysql-8.0-8.0.27/extra/libcbor/src/cbor/data.h
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor/data.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor/data.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,232 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#ifndef LIBCBOR_DATA_H
+#define LIBCBOR_DATA_H
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef const unsigned char* cbor_data;
+typedef unsigned char* cbor_mutable_data;
+
+/** Specifies the Major type of ::cbor_item_t */
+typedef enum cbor_type {
+  CBOR_TYPE_UINT /** 0 - positive integers */
+  ,
+  CBOR_TYPE_NEGINT /** 1 - negative integers*/
+  ,
+  CBOR_TYPE_BYTESTRING /** 2 - byte strings */
+  ,
+  CBOR_TYPE_STRING /** 3 - strings */
+  ,
+  CBOR_TYPE_ARRAY /** 4 - arrays */
+  ,
+  CBOR_TYPE_MAP /** 5 - maps */
+  ,
+  CBOR_TYPE_TAG /** 6 - tags  */
+  ,
+  CBOR_TYPE_FLOAT_CTRL /** 7 - decimals and special values (true, false, nil,
+                          ...) */
+} cbor_type;
+
+/** Possible decoding errors */
+typedef enum {
+  CBOR_ERR_NONE,
+  CBOR_ERR_NOTENOUGHDATA,
+  CBOR_ERR_NODATA,
+  CBOR_ERR_MALFORMATED,
+  CBOR_ERR_MEMERROR /** Memory error - item allocation failed. Is it too big for
+                       your allocator? */
+  ,
+  CBOR_ERR_SYNTAXERROR /** Stack parsing algorithm failed */
+} cbor_error_code;
+
+/** Possible widths of #CBOR_TYPE_UINT items */
+typedef enum {
+  CBOR_INT_8,
+  CBOR_INT_16,
+  CBOR_INT_32,
+  CBOR_INT_64
+} cbor_int_width;
+
+/** Possible widths of #CBOR_TYPE_FLOAT_CTRL items */
+typedef enum {
+  CBOR_FLOAT_0 /** Internal use - ctrl and special values */
+  ,
+  CBOR_FLOAT_16 /** Half float */
+  ,
+  CBOR_FLOAT_32 /** Single float */
+  ,
+  CBOR_FLOAT_64 /** Double */
+} cbor_float_width;
+
+/** Metadata for dynamically sized types */
+typedef enum {
+  _CBOR_METADATA_DEFINITE,
+  _CBOR_METADATA_INDEFINITE
+} _cbor_dst_metadata;
+
+/** Semantic mapping for CTRL simple values */
+typedef enum {
+  CBOR_CTRL_NONE = 0,
+  CBOR_CTRL_FALSE = 20,
+  CBOR_CTRL_TRUE = 21,
+  CBOR_CTRL_NULL = 22,
+  CBOR_CTRL_UNDEF = 23
+} _cbor_ctrl;
+
+/** Integers specific metadata */
+struct _cbor_int_metadata {
+  cbor_int_width width;
+};
+
+/** Bytestrings specific metadata */
+struct _cbor_bytestring_metadata {
+  size_t length;
+  _cbor_dst_metadata type;
+};
+
+/** Strings specific metadata */
+struct _cbor_string_metadata {
+  size_t length;
+  size_t codepoint_count; /* Sum of chunks' codepoint_counts for indefinite
+                             strings */
+  _cbor_dst_metadata type;
+};
+
+/** Arrays specific metadata */
+struct _cbor_array_metadata {
+  size_t allocated;
+  size_t end_ptr;
+  _cbor_dst_metadata type;
+};
+
+/** Maps specific metadata */
+struct _cbor_map_metadata {
+  size_t allocated;
+  size_t end_ptr;
+  _cbor_dst_metadata type;
+};
+
+/** Arrays specific metadata
+ *
+ * The pointer is included - cbor_item_metadata is
+ * 2 * sizeof(size_t) + sizeof(_cbor_string_type_metadata),
+ * lets use the space
+ */
+struct _cbor_tag_metadata {
+  struct cbor_item_t* tagged_item;
+  uint64_t value;
+};
+
+/** Floats specific metadata - includes CTRL values */
+struct _cbor_float_ctrl_metadata {
+  cbor_float_width width;
+  uint8_t ctrl;
+};
+
+/** Raw memory casts helper */
+union _cbor_float_helper {
+  float as_float;
+  uint32_t as_uint;
+};
+
+/** Raw memory casts helper */
+union _cbor_double_helper {
+  double as_double;
+  uint64_t as_uint;
+};
+
+/** Union of metadata across all possible types - discriminated in #cbor_item_t
+ */
+union cbor_item_metadata {
+  struct _cbor_int_metadata int_metadata;
+  struct _cbor_bytestring_metadata bytestring_metadata;
+  struct _cbor_string_metadata string_metadata;
+  struct _cbor_array_metadata array_metadata;
+  struct _cbor_map_metadata map_metadata;
+  struct _cbor_tag_metadata tag_metadata;
+  struct _cbor_float_ctrl_metadata float_ctrl_metadata;
+};
+
+/** The item handle */
+typedef struct cbor_item_t {
+  /** Discriminated by type */
+  union cbor_item_metadata metadata;
+  /** Reference count - initialize to 0 */
+  size_t refcount;
+  /** Major type discriminator */
+  cbor_type type;
+  /** Raw data block - interpretation depends on metadata */
+  unsigned char* data;
+} cbor_item_t;
+
+/** Defines cbor_item_t#data structure for indefinite strings and bytestrings
+ *
+ * Used to cast the raw representation for a sane manipulation
+ */
+struct cbor_indefinite_string_data {
+  size_t chunk_count;
+  size_t chunk_capacity;
+  cbor_item_t** chunks;
+};
+
+/** High-level decoding error */
+struct cbor_error {
+  /** Aproximate position */
+  size_t position;
+  /** Description */
+  cbor_error_code code;
+};
+
+/** Simple pair of items for use in maps */
+struct cbor_pair {
+  cbor_item_t *key, *value;
+};
+
+/** High-level decoding result */
+struct cbor_load_result {
+  /** Error indicator */
+  struct cbor_error error;
+  /** Number of bytes read*/
+  size_t read;
+};
+
+/** Streaming decoder result - status */
+enum cbor_decoder_status {
+  CBOR_DECODER_FINISHED /** OK, finished */
+  ,
+  CBOR_DECODER_NEDATA /** Not enough data - mismatch with MTB */
+  ,
+  CBOR_DECODER_EBUFFER /** Buffer manipulation problem */
+  ,
+  CBOR_DECODER_ERROR /** Malformed or reserved MTB/value */
+};
+
+/** Streaming decoder result */
+struct cbor_decoder_result {
+  /** Bytes read */
+  size_t read;
+  /** The result */
+  enum cbor_decoder_status status;
+  /** When status == CBOR_DECODER_NEDATA,
+   *  the minimum number of bytes required to continue parsing */
+  size_t required;
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // LIBCBOR_DATA_H
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor/encoding.c mysql-8.0-8.0.27/extra/libcbor/src/cbor/encoding.c
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor/encoding.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor/encoding.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,192 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include "encoding.h"
+#include "internal/encoders.h"
+
+size_t cbor_encode_uint8(uint8_t value, unsigned char *buffer,
+                         size_t buffer_size) {
+  return _cbor_encode_uint8(value, buffer, buffer_size, 0x00);
+}
+
+size_t cbor_encode_uint16(uint16_t value, unsigned char *buffer,
+                          size_t buffer_size) {
+  return _cbor_encode_uint16(value, buffer, buffer_size, 0x00);
+}
+
+size_t cbor_encode_uint32(uint32_t value, unsigned char *buffer,
+                          size_t buffer_size) {
+  return _cbor_encode_uint32(value, buffer, buffer_size, 0x00);
+}
+
+size_t cbor_encode_uint64(uint64_t value, unsigned char *buffer,
+                          size_t buffer_size) {
+  return _cbor_encode_uint64(value, buffer, buffer_size, 0x00);
+}
+
+size_t cbor_encode_uint(uint64_t value, unsigned char *buffer,
+                        size_t buffer_size) {
+  return _cbor_encode_uint(value, buffer, buffer_size, 0x00);
+}
+
+size_t cbor_encode_negint8(uint8_t value, unsigned char *buffer,
+                           size_t buffer_size) {
+  return _cbor_encode_uint8(value, buffer, buffer_size, 0x20);
+}
+
+size_t cbor_encode_negint16(uint16_t value, unsigned char *buffer,
+                            size_t buffer_size) {
+  return _cbor_encode_uint16(value, buffer, buffer_size, 0x20);
+}
+
+size_t cbor_encode_negint32(uint32_t value, unsigned char *buffer,
+                            size_t buffer_size) {
+  return _cbor_encode_uint32(value, buffer, buffer_size, 0x20);
+}
+
+size_t cbor_encode_negint64(uint64_t value, unsigned char *buffer,
+                            size_t buffer_size) {
+  return _cbor_encode_uint64(value, buffer, buffer_size, 0x20);
+}
+
+size_t cbor_encode_negint(uint64_t value, unsigned char *buffer,
+                          size_t buffer_size) {
+  return _cbor_encode_uint(value, buffer, buffer_size, 0x20);
+}
+
+size_t cbor_encode_bytestring_start(size_t length, unsigned char *buffer,
+                                    size_t buffer_size) {
+  return _cbor_encode_uint((size_t)length, buffer, buffer_size, 0x40);
+}
+
+size_t _cbor_encode_byte(uint8_t value, unsigned char *buffer,
+                         size_t buffer_size) {
+  if (buffer_size >= 1) {
+    buffer[0] = value;
+    return 1;
+  } else
+    return 0;
+}
+
+size_t cbor_encode_indef_bytestring_start(unsigned char *buffer,
+                                          size_t buffer_size) {
+  return _cbor_encode_byte(0x5F, buffer, buffer_size);
+}
+
+size_t cbor_encode_string_start(size_t length, unsigned char *buffer,
+                                size_t buffer_size) {
+  return _cbor_encode_uint((size_t)length, buffer, buffer_size, 0x60);
+}
+
+size_t cbor_encode_indef_string_start(unsigned char *buffer,
+                                      size_t buffer_size) {
+  return _cbor_encode_byte(0x7F, buffer, buffer_size);
+}
+
+size_t cbor_encode_array_start(size_t length, unsigned char *buffer,
+                               size_t buffer_size) {
+  return _cbor_encode_uint((size_t)length, buffer, buffer_size, 0x80);
+}
+
+size_t cbor_encode_indef_array_start(unsigned char *buffer,
+                                     size_t buffer_size) {
+  return _cbor_encode_byte(0x9F, buffer, buffer_size);
+}
+
+size_t cbor_encode_map_start(size_t length, unsigned char *buffer,
+                             size_t buffer_size) {
+  return _cbor_encode_uint((size_t)length, buffer, buffer_size, 0xA0);
+}
+
+size_t cbor_encode_indef_map_start(unsigned char *buffer, size_t buffer_size) {
+  return _cbor_encode_byte(0xBF, buffer, buffer_size);
+}
+
+size_t cbor_encode_tag(uint64_t value, unsigned char *buffer,
+                       size_t buffer_size) {
+  return _cbor_encode_uint(value, buffer, buffer_size, 0xC0);
+}
+
+size_t cbor_encode_bool(bool value, unsigned char *buffer, size_t buffer_size) {
+  return value ? _cbor_encode_byte(0xF5, buffer, buffer_size)
+               : _cbor_encode_byte(0xF4, buffer, buffer_size);
+}
+
+size_t cbor_encode_null(unsigned char *buffer, size_t buffer_size) {
+  return _cbor_encode_byte(0xF6, buffer, buffer_size);
+}
+
+size_t cbor_encode_undef(unsigned char *buffer, size_t buffer_size) {
+  return _cbor_encode_byte(0xF7, buffer, buffer_size);
+}
+
+size_t cbor_encode_half(float value, unsigned char *buffer,
+                        size_t buffer_size) {
+  /* Assuming value is normalized */
+  uint32_t val = ((union _cbor_float_helper){.as_float = value}).as_uint;
+  uint16_t res;
+  uint8_t exp = (uint8_t)((val & 0x7F800000u) >>
+                          23u); /* 0b0111_1111_1000_0000_0000_0000_0000_0000 */
+  uint32_t mant =
+      val & 0x7FFFFFu; /* 0b0000_0000_0111_1111_1111_1111_1111_1111 */
+  if (exp == 0xFF) {   /* Infinity or NaNs */
+    if (value != value) {
+      res = (uint16_t)0x007e00; /* Not IEEE semantics - required by CBOR
+                                   [s. 3.9] */
+    } else {
+      res = (uint16_t)((val & 0x80000000u) >> 16u | 0x7C00u |
+                       (mant ? 1u : 0u) << 15u);
+    }
+  } else if (exp == 0x00) { /* Zeroes or subnorms */
+    res = (uint16_t)((val & 0x80000000u) >> 16u | mant >> 13u);
+  } else { /* Normal numbers */
+    int8_t logical_exp = (int8_t)(exp - 127);
+    assert(logical_exp == exp - 127);
+
+    // Now we know that 2^exp <= 0 logically
+    if (logical_exp < -24) {
+      /* No unambiguous representation exists, this float is not a half float
+         and is too small to be represented using a half, round off to zero.
+         Consistent with the reference implementation. */
+      res = 0;
+    } else if (logical_exp < -14) {
+      /* Offset the remaining decimal places by shifting the significand, the
+         value is lost. This is an implementation decision that works around the
+         absence of standard half-float in the language. */
+      res = (uint16_t)((val & 0x80000000u) >> 16u) |  // Extract sign bit
+            (uint16_t)(1u << (24u + logical_exp));
+    } else {
+      res = (uint16_t)((val & 0x80000000u) >> 16u |
+                       ((((uint8_t)logical_exp) + 15u) << 10u) |
+                       (uint16_t)(mant >> 13u));
+    }
+  }
+  return _cbor_encode_uint16(res, buffer, buffer_size, 0xE0);
+}
+
+size_t cbor_encode_single(float value, unsigned char *buffer,
+                          size_t buffer_size) {
+  return _cbor_encode_uint32(
+      ((union _cbor_float_helper){.as_float = value}).as_uint, buffer,
+      buffer_size, 0xE0);
+}
+
+size_t cbor_encode_double(double value, unsigned char *buffer,
+                          size_t buffer_size) {
+  return _cbor_encode_uint64(
+      ((union _cbor_double_helper){.as_double = value}).as_uint, buffer,
+      buffer_size, 0xE0);
+}
+
+size_t cbor_encode_break(unsigned char *buffer, size_t buffer_size) {
+  return _cbor_encode_byte(0xFF, buffer, buffer_size);
+}
+
+size_t cbor_encode_ctrl(uint8_t value, unsigned char *buffer,
+                        size_t buffer_size) {
+  return _cbor_encode_uint8(value, buffer, buffer_size, 0xE0);
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor/encoding.h mysql-8.0-8.0.27/extra/libcbor/src/cbor/encoding.h
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor/encoding.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor/encoding.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#ifndef LIBCBOR_ENCODING_H
+#define LIBCBOR_ENCODING_H
+
+#include "cbor/cbor_export.h"
+#include "cbor/common.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * ============================================================================
+ * Primitives encoding
+ * ============================================================================
+ */
+
+CBOR_EXPORT size_t cbor_encode_uint8(uint8_t, unsigned char *, size_t);
+
+CBOR_EXPORT size_t cbor_encode_uint16(uint16_t, unsigned char *, size_t);
+
+CBOR_EXPORT size_t cbor_encode_uint32(uint32_t, unsigned char *, size_t);
+
+CBOR_EXPORT size_t cbor_encode_uint64(uint64_t, unsigned char *, size_t);
+
+CBOR_EXPORT size_t cbor_encode_uint(uint64_t, unsigned char *, size_t);
+
+CBOR_EXPORT size_t cbor_encode_negint8(uint8_t, unsigned char *, size_t);
+
+CBOR_EXPORT size_t cbor_encode_negint16(uint16_t, unsigned char *, size_t);
+
+CBOR_EXPORT size_t cbor_encode_negint32(uint32_t, unsigned char *, size_t);
+
+CBOR_EXPORT size_t cbor_encode_negint64(uint64_t, unsigned char *, size_t);
+
+CBOR_EXPORT size_t cbor_encode_negint(uint64_t, unsigned char *, size_t);
+
+CBOR_EXPORT size_t cbor_encode_bytestring_start(size_t, unsigned char *,
+                                                size_t);
+
+CBOR_EXPORT size_t cbor_encode_indef_bytestring_start(unsigned char *, size_t);
+
+CBOR_EXPORT size_t cbor_encode_string_start(size_t, unsigned char *, size_t);
+
+CBOR_EXPORT size_t cbor_encode_indef_string_start(unsigned char *, size_t);
+
+CBOR_EXPORT size_t cbor_encode_array_start(size_t, unsigned char *, size_t);
+
+CBOR_EXPORT size_t cbor_encode_indef_array_start(unsigned char *, size_t);
+
+CBOR_EXPORT size_t cbor_encode_map_start(size_t, unsigned char *, size_t);
+
+CBOR_EXPORT size_t cbor_encode_indef_map_start(unsigned char *, size_t);
+
+CBOR_EXPORT size_t cbor_encode_tag(uint64_t, unsigned char *, size_t);
+
+CBOR_EXPORT size_t cbor_encode_bool(bool, unsigned char *, size_t);
+
+CBOR_EXPORT size_t cbor_encode_null(unsigned char *, size_t);
+
+CBOR_EXPORT size_t cbor_encode_undef(unsigned char *, size_t);
+
+/** Encodes a half-precision float
+ *
+ * Since there is no native representation or semantics for half floats
+ * in the language, we use single-precision floats, as every value that
+ * can be expressed as a half-float can also be expressed as a float.
+ *
+ * This however means that not all floats passed to this function can be
+ * unambiguously encoded. The behavior is as follows:
+ *  - Infinity, NaN are preserved
+ *  - Zero is preserved
+ *  - Denormalized numbers keep their sign bit and 10 most significant bit of
+ * the significand
+ *  - All other numbers
+ *   - If the logical value of the exponent is < -24, the output is zero
+ *   - If the logical value of the exponent is between -23 and -14, the output
+ *     is cut off to represent the 'magnitude' of the input, by which we
+ *     mean (-1)^{signbit} x 1.0e{exponent}. The value in the significand is
+ * lost.
+ *   - In all other cases, the sign bit, the exponent, and 10 most significant
+ * bits of the significand are kept
+ *
+ * @param value
+ * @param buffer Target buffer
+ * @param buffer_size Available space in the buffer
+ * @return number of bytes written
+ */
+CBOR_EXPORT size_t cbor_encode_half(float, unsigned char *, size_t);
+
+CBOR_EXPORT size_t cbor_encode_single(float, unsigned char *, size_t);
+
+CBOR_EXPORT size_t cbor_encode_double(double, unsigned char *, size_t);
+
+CBOR_EXPORT size_t cbor_encode_break(unsigned char *, size_t);
+
+CBOR_EXPORT size_t cbor_encode_ctrl(uint8_t, unsigned char *, size_t);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // LIBCBOR_ENCODING_H
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor/floats_ctrls.c mysql-8.0-8.0.27/extra/libcbor/src/cbor/floats_ctrls.c
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor/floats_ctrls.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor/floats_ctrls.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,189 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include "floats_ctrls.h"
+#include <math.h>
+#include "assert.h"
+
+cbor_float_width cbor_float_get_width(const cbor_item_t *item) {
+  assert(cbor_isa_float_ctrl(item));
+  return item->metadata.float_ctrl_metadata.width;
+}
+
+uint8_t cbor_ctrl_value(const cbor_item_t *item) {
+  assert(cbor_isa_float_ctrl(item));
+  assert(cbor_float_get_width(item) == CBOR_FLOAT_0);
+  return item->metadata.float_ctrl_metadata.ctrl;
+}
+
+bool cbor_float_ctrl_is_ctrl(const cbor_item_t *item) {
+  assert(cbor_isa_float_ctrl(item));
+  return cbor_float_get_width(item) == CBOR_FLOAT_0;
+}
+
+float cbor_float_get_float2(const cbor_item_t *item) {
+  assert(cbor_is_float(item));
+  assert(cbor_float_get_width(item) == CBOR_FLOAT_16);
+  return *(float *)item->data;
+}
+
+float cbor_float_get_float4(const cbor_item_t *item) {
+  assert(cbor_is_float(item));
+  assert(cbor_float_get_width(item) == CBOR_FLOAT_32);
+  return *(float *)item->data;
+}
+
+double cbor_float_get_float8(const cbor_item_t *item) {
+  assert(cbor_is_float(item));
+  assert(cbor_float_get_width(item) == CBOR_FLOAT_64);
+  return *(double *)item->data;
+}
+
+double cbor_float_get_float(const cbor_item_t *item) {
+  assert(cbor_is_float(item));
+  switch (cbor_float_get_width(item)) {
+    case CBOR_FLOAT_0:
+      return NAN;
+    case CBOR_FLOAT_16:
+      return cbor_float_get_float2(item);
+    case CBOR_FLOAT_32:
+      return cbor_float_get_float4(item);
+    case CBOR_FLOAT_64:
+      return cbor_float_get_float8(item);
+  }
+  return NAN; /* Compiler complaints */
+}
+
+bool cbor_get_bool(const cbor_item_t *item) {
+  assert(cbor_is_bool(item));
+  return item->metadata.float_ctrl_metadata.ctrl == CBOR_CTRL_TRUE;
+}
+
+void cbor_set_float2(cbor_item_t *item, float value) {
+  assert(cbor_is_float(item));
+  assert(cbor_float_get_width(item) == CBOR_FLOAT_16);
+  *((float *)item->data) = value;
+}
+
+void cbor_set_float4(cbor_item_t *item, float value) {
+  assert(cbor_is_float(item));
+  assert(cbor_float_get_width(item) == CBOR_FLOAT_32);
+  *((float *)item->data) = value;
+}
+
+void cbor_set_float8(cbor_item_t *item, double value) {
+  assert(cbor_is_float(item));
+  assert(cbor_float_get_width(item) == CBOR_FLOAT_64);
+  *((double *)item->data) = value;
+}
+
+void cbor_set_ctrl(cbor_item_t *item, uint8_t value) {
+  assert(cbor_isa_float_ctrl(item));
+  assert(cbor_float_get_width(item) == CBOR_FLOAT_0);
+  item->metadata.float_ctrl_metadata.ctrl = value;
+}
+
+void cbor_set_bool(cbor_item_t *item, bool value) {
+  assert(cbor_is_bool(item));
+  item->metadata.float_ctrl_metadata.ctrl =
+      value ? CBOR_CTRL_TRUE : CBOR_CTRL_FALSE;
+}
+
+cbor_item_t *cbor_new_ctrl() {
+  cbor_item_t *item = _CBOR_MALLOC(sizeof(cbor_item_t));
+  _CBOR_NOTNULL(item);
+
+  *item = (cbor_item_t){
+      .type = CBOR_TYPE_FLOAT_CTRL,
+      .data = NULL,
+      .refcount = 1,
+      .metadata = {.float_ctrl_metadata = {.width = CBOR_FLOAT_0,
+                                           .ctrl = CBOR_CTRL_NONE}}};
+  return item;
+}
+
+cbor_item_t *cbor_new_float2() {
+  cbor_item_t *item = _CBOR_MALLOC(sizeof(cbor_item_t) + 4);
+  _CBOR_NOTNULL(item);
+
+  *item = (cbor_item_t){
+      .type = CBOR_TYPE_FLOAT_CTRL,
+      .data = (unsigned char *)item + sizeof(cbor_item_t),
+      .refcount = 1,
+      .metadata = {.float_ctrl_metadata = {.width = CBOR_FLOAT_16}}};
+  return item;
+}
+
+cbor_item_t *cbor_new_float4() {
+  cbor_item_t *item = _CBOR_MALLOC(sizeof(cbor_item_t) + 4);
+  _CBOR_NOTNULL(item);
+
+  *item = (cbor_item_t){
+      .type = CBOR_TYPE_FLOAT_CTRL,
+      .data = (unsigned char *)item + sizeof(cbor_item_t),
+      .refcount = 1,
+      .metadata = {.float_ctrl_metadata = {.width = CBOR_FLOAT_32}}};
+  return item;
+}
+
+cbor_item_t *cbor_new_float8() {
+  cbor_item_t *item = _CBOR_MALLOC(sizeof(cbor_item_t) + 8);
+  _CBOR_NOTNULL(item);
+
+  *item = (cbor_item_t){
+      .type = CBOR_TYPE_FLOAT_CTRL,
+      .data = (unsigned char *)item + sizeof(cbor_item_t),
+      .refcount = 1,
+      .metadata = {.float_ctrl_metadata = {.width = CBOR_FLOAT_64}}};
+  return item;
+}
+
+cbor_item_t *cbor_new_null() {
+  cbor_item_t *item = cbor_new_ctrl();
+  _CBOR_NOTNULL(item);
+  cbor_set_ctrl(item, CBOR_CTRL_NULL);
+  return item;
+}
+
+cbor_item_t *cbor_new_undef() {
+  cbor_item_t *item = cbor_new_ctrl();
+  _CBOR_NOTNULL(item);
+  cbor_set_ctrl(item, CBOR_CTRL_UNDEF);
+  return item;
+}
+
+cbor_item_t *cbor_build_bool(bool value) {
+  return cbor_build_ctrl(value ? CBOR_CTRL_TRUE : CBOR_CTRL_FALSE);
+}
+
+cbor_item_t *cbor_build_float2(float value) {
+  cbor_item_t *item = cbor_new_float2();
+  _CBOR_NOTNULL(item);
+  cbor_set_float2(item, value);
+  return item;
+}
+
+cbor_item_t *cbor_build_float4(float value) {
+  cbor_item_t *item = cbor_new_float4();
+  _CBOR_NOTNULL(item);
+  cbor_set_float4(item, value);
+  return item;
+}
+
+cbor_item_t *cbor_build_float8(double value) {
+  cbor_item_t *item = cbor_new_float8();
+  _CBOR_NOTNULL(item);
+  cbor_set_float8(item, value);
+  return item;
+}
+
+cbor_item_t *cbor_build_ctrl(uint8_t value) {
+  cbor_item_t *item = cbor_new_ctrl();
+  _CBOR_NOTNULL(item);
+  cbor_set_ctrl(item, value);
+  return item;
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor/floats_ctrls.h mysql-8.0-8.0.27/extra/libcbor/src/cbor/floats_ctrls.h
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor/floats_ctrls.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor/floats_ctrls.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,212 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#ifndef LIBCBOR_FLOATS_CTRLS_H
+#define LIBCBOR_FLOATS_CTRLS_H
+
+#include "cbor/cbor_export.h"
+#include "cbor/common.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * ============================================================================
+ * Float manipulation
+ * ============================================================================
+ */
+
+/** Is this a ctrl value?
+ *
+ * @param item[borrow] A float or ctrl item
+ * @return Is this a ctrl value?
+ */
+CBOR_EXPORT bool cbor_float_ctrl_is_ctrl(const cbor_item_t *item);
+
+/** Get the float width
+ *
+ * @param item[borrow] A float or ctrl item
+ * @return The width.
+ */
+CBOR_EXPORT cbor_float_width cbor_float_get_width(const cbor_item_t *item);
+
+/** Get a half precision float
+ *
+ * The item must have the corresponding width
+ *
+ * @param[borrow] A half precision float
+ * @return half precision value
+ */
+CBOR_EXPORT float cbor_float_get_float2(const cbor_item_t *item);
+
+/** Get a single precision float
+ *
+ * The item must have the corresponding width
+ *
+ * @param[borrow] A signle precision float
+ * @return single precision value
+ */
+CBOR_EXPORT float cbor_float_get_float4(const cbor_item_t *item);
+
+/** Get a double precision float
+ *
+ * The item must have the corresponding width
+ *
+ * @param[borrow] A double precision float
+ * @return double precision value
+ */
+CBOR_EXPORT double cbor_float_get_float8(const cbor_item_t *item);
+
+/** Get the float value represented as double
+ *
+ * Can be used regardless of the width.
+ *
+ * @param[borrow] Any float
+ * @return double precision value
+ */
+CBOR_EXPORT double cbor_float_get_float(const cbor_item_t *item);
+
+/** Get value from a boolean ctrl item
+ *
+ * @param item[borrow] A ctrl item
+ * @return boolean value
+ */
+CBOR_EXPORT bool cbor_get_bool(const cbor_item_t *item);
+
+/** Constructs a new ctrl item
+ *
+ * The width cannot be changed once the item is created
+ *
+ * @return **new** 1B ctrl or `NULL` upon memory allocation failure
+ */
+CBOR_EXPORT cbor_item_t *cbor_new_ctrl();
+
+/** Constructs a new float item
+ *
+ * The width cannot be changed once the item is created
+ *
+ * @return **new** 2B float or `NULL` upon memory allocation failure
+ */
+CBOR_EXPORT cbor_item_t *cbor_new_float2();
+
+/** Constructs a new float item
+ *
+ * The width cannot be changed once the item is created
+ *
+ * @return **new** 4B float or `NULL` upon memory allocation failure
+ */
+CBOR_EXPORT cbor_item_t *cbor_new_float4();
+
+/** Constructs a new float item
+ *
+ * The width cannot be changed once the item is created
+ *
+ * @return **new** 8B float or `NULL` upon memory allocation failure
+ */
+CBOR_EXPORT cbor_item_t *cbor_new_float8();
+
+/** Constructs new null ctrl item
+ *
+ * @return **new** null ctrl item or `NULL` upon memory allocation failure
+ */
+CBOR_EXPORT cbor_item_t *cbor_new_null();
+
+/** Constructs new undef ctrl item
+ *
+ * @return **new** undef ctrl item or `NULL` upon memory allocation failure
+ */
+CBOR_EXPORT cbor_item_t *cbor_new_undef();
+
+/** Constructs new boolean ctrl item
+ *
+ * @param value The value to use
+ * @return **new** boolen ctrl item or `NULL` upon memory allocation failure
+ */
+CBOR_EXPORT cbor_item_t *cbor_build_bool(bool value);
+
+/** Assign a control value
+ *
+ * \rst
+ * .. warning:: It is possible to produce an invalid CBOR value by assigning a
+ * invalid value using this mechanism. Please consult the standard before use.
+ * \endrst
+ *
+ * @param item[borrow] A ctrl item
+ * @param value The simple value to assign. Please consult the standard for
+ * 	allowed values
+ */
+CBOR_EXPORT void cbor_set_ctrl(cbor_item_t *item, uint8_t value);
+
+/** Assign a boolean value to a boolean ctrl item
+ *
+ * @param item[borrow] A ctrl item
+ * @param value The simple value to assign.
+ */
+CBOR_EXPORT void cbor_set_bool(cbor_item_t *item, bool value);
+
+/** Assigns a float value
+ *
+ * @param item[borrow] A half precision float
+ * @param value The value to assign
+ */
+CBOR_EXPORT void cbor_set_float2(cbor_item_t *item, float value);
+
+/** Assigns a float value
+ *
+ * @param item[borrow] A single precision float
+ * @param value The value to assign
+ */
+CBOR_EXPORT void cbor_set_float4(cbor_item_t *item, float value);
+
+/** Assigns a float value
+ *
+ * @param item[borrow] A double precision float
+ * @param value The value to assign
+ */
+CBOR_EXPORT void cbor_set_float8(cbor_item_t *item, double value);
+
+/** Reads the control value
+ *
+ * @param item[borrow] A ctrl item
+ * @return the simple value
+ */
+CBOR_EXPORT uint8_t cbor_ctrl_value(const cbor_item_t *item);
+
+/** Constructs a new float
+ *
+ * @param value the value to use
+ * @return **new** float
+ */
+CBOR_EXPORT cbor_item_t *cbor_build_float2(float value);
+
+/** Constructs a new float
+ *
+ * @param value the value to use
+ * @return **new** float or `NULL` upon memory allocation failure
+ */
+CBOR_EXPORT cbor_item_t *cbor_build_float4(float value);
+
+/** Constructs a new float
+ *
+ * @param value the value to use
+ * @return **new** float or `NULL` upon memory allocation failure
+ */
+CBOR_EXPORT cbor_item_t *cbor_build_float8(double value);
+
+/** Constructs a ctrl item
+ *
+ * @param value the value to use
+ * @return **new** ctrl item or `NULL` upon memory allocation failure
+ */
+CBOR_EXPORT cbor_item_t *cbor_build_ctrl(uint8_t value);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // LIBCBOR_FLOATS_CTRLS_H
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor/internal/builder_callbacks.c mysql-8.0-8.0.27/extra/libcbor/src/cbor/internal/builder_callbacks.c
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor/internal/builder_callbacks.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor/internal/builder_callbacks.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,389 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include "builder_callbacks.h"
+#include <string.h>
+#include "../arrays.h"
+#include "../bytestrings.h"
+#include "../floats_ctrls.h"
+#include "../ints.h"
+#include "../maps.h"
+#include "../strings.h"
+#include "../tags.h"
+#include "unicode.h"
+
+void _cbor_builder_append(cbor_item_t *item,
+                          struct _cbor_decoder_context *ctx) {
+  if (ctx->stack->size == 0) {
+    /* Top level item */
+    ctx->root = item;
+  } else {
+    /* Part of a bigger structure */
+    switch (ctx->stack->top->item->type) {
+      case CBOR_TYPE_ARRAY: {
+        if (cbor_array_is_definite(ctx->stack->top->item)) {
+          /*
+           * We don't need an explicit check for whether the item still belongs
+           * into this array because if there are extra items, they will cause a
+           * syntax error when decoded.
+           */
+          assert(ctx->stack->top->subitems > 0);
+          cbor_array_push(ctx->stack->top->item, item);
+          ctx->stack->top->subitems--;
+          if (ctx->stack->top->subitems == 0) {
+            cbor_item_t *item = ctx->stack->top->item;
+            _cbor_stack_pop(ctx->stack);
+            _cbor_builder_append(item, ctx);
+          }
+          cbor_decref(&item);
+        } else {
+          /* Indefinite array, don't bother with subitems */
+          cbor_array_push(ctx->stack->top->item, item);
+          cbor_decref(&item);
+        }
+        break;
+      }
+      case CBOR_TYPE_MAP: {
+        /* We use 0 and 1 subitems to distinguish between keys and values in
+         * indefinite items */
+        if (ctx->stack->top->subitems % 2) {
+          /* Odd record, this is a value */
+          _cbor_map_add_value(ctx->stack->top->item, cbor_move(item));
+        } else {
+          /* Even record, this is a key */
+          _cbor_map_add_key(ctx->stack->top->item, cbor_move(item));
+        }
+        if (cbor_map_is_definite(ctx->stack->top->item)) {
+          ctx->stack->top->subitems--;
+          if (ctx->stack->top->subitems == 0) {
+            cbor_item_t *item = ctx->stack->top->item;
+            _cbor_stack_pop(ctx->stack);
+            _cbor_builder_append(item, ctx);
+          }
+        } else {
+          ctx->stack->top->subitems ^=
+              1; /* Flip the indicator for indefinite items */
+        }
+        break;
+      }
+      case CBOR_TYPE_TAG: {
+        assert(ctx->stack->top->subitems == 1);
+        cbor_tag_set_item(ctx->stack->top->item, item);
+        cbor_decref(&item); /* Give up on our reference */
+        cbor_item_t *item = ctx->stack->top->item;
+        _cbor_stack_pop(ctx->stack);
+        _cbor_builder_append(item, ctx);
+        break;
+      }
+      default: {
+        cbor_decref(&item);
+        ctx->syntax_error = true;
+      }
+    }
+  }
+}
+
+#define CHECK_RES(ctx, res)        \
+  do {                             \
+    if (res == NULL) {             \
+      ctx->creation_failed = true; \
+      return;                      \
+    }                              \
+  } while (0)
+
+#define PUSH_CTX_STACK(ctx, res, subitems)                     \
+  do {                                                         \
+    if (_cbor_stack_push(ctx->stack, res, subitems) == NULL) { \
+      cbor_decref(&res);                                       \
+      ctx->creation_failed = true;                             \
+    }                                                          \
+  } while (0)
+
+void cbor_builder_uint8_callback(void *context, uint8_t value) {
+  struct _cbor_decoder_context *ctx = context;
+  cbor_item_t *res = cbor_new_int8();
+  CHECK_RES(ctx, res);
+  cbor_mark_uint(res);
+  cbor_set_uint8(res, value);
+  _cbor_builder_append(res, ctx);
+}
+
+void cbor_builder_uint16_callback(void *context, uint16_t value) {
+  struct _cbor_decoder_context *ctx = context;
+  cbor_item_t *res = cbor_new_int16();
+  CHECK_RES(ctx, res);
+  cbor_mark_uint(res);
+  cbor_set_uint16(res, value);
+  _cbor_builder_append(res, ctx);
+}
+
+void cbor_builder_uint32_callback(void *context, uint32_t value) {
+  struct _cbor_decoder_context *ctx = context;
+  cbor_item_t *res = cbor_new_int32();
+  CHECK_RES(ctx, res);
+  cbor_mark_uint(res);
+  cbor_set_uint32(res, value);
+  _cbor_builder_append(res, ctx);
+}
+
+void cbor_builder_uint64_callback(void *context, uint64_t value) {
+  struct _cbor_decoder_context *ctx = context;
+  cbor_item_t *res = cbor_new_int64();
+  CHECK_RES(ctx, res);
+  cbor_mark_uint(res);
+  cbor_set_uint64(res, value);
+  _cbor_builder_append(res, ctx);
+}
+
+void cbor_builder_negint8_callback(void *context, uint8_t value) {
+  struct _cbor_decoder_context *ctx = context;
+  cbor_item_t *res = cbor_new_int8();
+  CHECK_RES(ctx, res);
+  cbor_mark_negint(res);
+  cbor_set_uint8(res, value);
+  _cbor_builder_append(res, ctx);
+}
+
+void cbor_builder_negint16_callback(void *context, uint16_t value) {
+  struct _cbor_decoder_context *ctx = context;
+  cbor_item_t *res = cbor_new_int16();
+  cbor_mark_negint(res);
+  cbor_set_uint16(res, value);
+  _cbor_builder_append(res, ctx);
+}
+
+void cbor_builder_negint32_callback(void *context, uint32_t value) {
+  struct _cbor_decoder_context *ctx = context;
+  cbor_item_t *res = cbor_new_int32();
+  CHECK_RES(ctx, res);
+  cbor_mark_negint(res);
+  cbor_set_uint32(res, value);
+  _cbor_builder_append(res, ctx);
+}
+
+void cbor_builder_negint64_callback(void *context, uint64_t value) {
+  struct _cbor_decoder_context *ctx = context;
+  cbor_item_t *res = cbor_new_int64();
+  CHECK_RES(ctx, res);
+  cbor_mark_negint(res);
+  cbor_set_uint64(res, value);
+  _cbor_builder_append(res, ctx);
+}
+
+void cbor_builder_byte_string_callback(void *context, cbor_data data,
+                                       size_t length) {
+  struct _cbor_decoder_context *ctx = context;
+  unsigned char *new_handle = _CBOR_MALLOC(length);
+  if (new_handle == NULL) {
+    ctx->creation_failed = true;
+    return;
+  }
+
+  memcpy(new_handle, data, length);
+  cbor_item_t *res = cbor_new_definite_bytestring();
+
+  if (res == NULL) {
+    _CBOR_FREE(new_handle);
+    ctx->creation_failed = true;
+    return;
+  }
+
+  cbor_bytestring_set_handle(res, new_handle, length);
+
+  if (ctx->stack->size > 0 && cbor_isa_bytestring(ctx->stack->top->item)) {
+    if (cbor_bytestring_is_indefinite(ctx->stack->top->item)) {
+      cbor_bytestring_add_chunk(ctx->stack->top->item, cbor_move(res));
+    } else {
+      cbor_decref(&res);
+      ctx->syntax_error = true;
+    }
+  } else {
+    _cbor_builder_append(res, ctx);
+  }
+}
+
+void cbor_builder_byte_string_start_callback(void *context) {
+  struct _cbor_decoder_context *ctx = context;
+  cbor_item_t *res = cbor_new_indefinite_bytestring();
+  CHECK_RES(ctx, res);
+  PUSH_CTX_STACK(ctx, res, 0);
+}
+
+void cbor_builder_string_callback(void *context, cbor_data data,
+                                  size_t length) {
+  struct _cbor_decoder_context *ctx = context;
+  struct _cbor_unicode_status unicode_status;
+
+  size_t codepoint_count =
+      _cbor_unicode_codepoint_count(data, length, &unicode_status);
+
+  if (unicode_status.status == _CBOR_UNICODE_BADCP) {
+    ctx->syntax_error = true;
+    return;
+  }
+
+  unsigned char *new_handle = _CBOR_MALLOC(length);
+
+  if (new_handle == NULL) {
+    ctx->creation_failed = true;
+    return;
+  }
+
+  memcpy(new_handle, data, length);
+  cbor_item_t *res = cbor_new_definite_string();
+  if (res == NULL) {
+    _CBOR_FREE(new_handle);
+    ctx->creation_failed = true;
+    return;
+  }
+  cbor_string_set_handle(res, new_handle, length);
+  res->metadata.string_metadata.codepoint_count = codepoint_count;
+
+  /* Careful here: order matters */
+  if (ctx->stack->size > 0 && cbor_isa_string(ctx->stack->top->item)) {
+    if (cbor_string_is_indefinite(ctx->stack->top->item)) {
+      cbor_string_add_chunk(ctx->stack->top->item, cbor_move(res));
+    } else {
+      cbor_decref(&res);
+      ctx->syntax_error = true;
+    }
+  } else {
+    _cbor_builder_append(res, ctx);
+  }
+}
+
+void cbor_builder_string_start_callback(void *context) {
+  struct _cbor_decoder_context *ctx = context;
+  cbor_item_t *res = cbor_new_indefinite_string();
+  CHECK_RES(ctx, res);
+  PUSH_CTX_STACK(ctx, res, 0);
+}
+
+void cbor_builder_array_start_callback(void *context, size_t size) {
+  struct _cbor_decoder_context *ctx = context;
+  cbor_item_t *res = cbor_new_definite_array(size);
+  CHECK_RES(ctx, res);
+  if (size > 0) {
+    PUSH_CTX_STACK(ctx, res, size);
+  } else {
+    _cbor_builder_append(res, ctx);
+  }
+}
+
+void cbor_builder_indef_array_start_callback(void *context) {
+  struct _cbor_decoder_context *ctx = context;
+  cbor_item_t *res = cbor_new_indefinite_array();
+  CHECK_RES(ctx, res);
+  PUSH_CTX_STACK(ctx, res, 0);
+}
+
+void cbor_builder_indef_map_start_callback(void *context) {
+  struct _cbor_decoder_context *ctx = context;
+  cbor_item_t *res = cbor_new_indefinite_map();
+  CHECK_RES(ctx, res);
+  PUSH_CTX_STACK(ctx, res, 0);
+}
+
+void cbor_builder_map_start_callback(void *context, size_t size) {
+  struct _cbor_decoder_context *ctx = context;
+  cbor_item_t *res = cbor_new_definite_map(size);
+  CHECK_RES(ctx, res);
+  if (size > 0) {
+    PUSH_CTX_STACK(ctx, res, size * 2);
+  } else {
+    _cbor_builder_append(res, ctx);
+  }
+}
+
+/**
+ * Is the (partially constructed) item indefinite?
+ */
+bool _cbor_is_indefinite(cbor_item_t *item) {
+  switch (item->type) {
+    case CBOR_TYPE_BYTESTRING:
+      return item->metadata.bytestring_metadata.type ==
+             _CBOR_METADATA_INDEFINITE;
+    case CBOR_TYPE_STRING:
+      return item->metadata.string_metadata.type == _CBOR_METADATA_INDEFINITE;
+    case CBOR_TYPE_ARRAY:
+      return item->metadata.array_metadata.type == _CBOR_METADATA_INDEFINITE;
+    case CBOR_TYPE_MAP:
+      return item->metadata.map_metadata.type == _CBOR_METADATA_INDEFINITE;
+    default:
+      return false;
+  }
+}
+
+void cbor_builder_indef_break_callback(void *context) {
+  struct _cbor_decoder_context *ctx = context;
+  /* There must be an item to break out of*/
+  if (ctx->stack->size > 0) {
+    cbor_item_t *item = ctx->stack->top->item;
+    if (_cbor_is_indefinite(
+            item) && /* Only indefinite items can be terminated by 0xFF */
+        /* Special case: we cannot append up if an indefinite map is incomplete
+           (we are expecting a value). */
+        (item->type != CBOR_TYPE_MAP || ctx->stack->top->subitems % 2 == 0)) {
+      _cbor_stack_pop(ctx->stack);
+      _cbor_builder_append(item, ctx);
+      return;
+    }
+  }
+
+  ctx->syntax_error = true;
+}
+
+void cbor_builder_float2_callback(void *context, float value) {
+  struct _cbor_decoder_context *ctx = context;
+  cbor_item_t *res = cbor_new_float2();
+  cbor_set_float2(res, value);
+  _cbor_builder_append(res, ctx);
+}
+
+void cbor_builder_float4_callback(void *context, float value) {
+  struct _cbor_decoder_context *ctx = context;
+  cbor_item_t *res = cbor_new_float4();
+  CHECK_RES(ctx, res);
+  cbor_set_float4(res, value);
+  _cbor_builder_append(res, ctx);
+}
+
+void cbor_builder_float8_callback(void *context, double value) {
+  struct _cbor_decoder_context *ctx = context;
+  cbor_item_t *res = cbor_new_float8();
+  CHECK_RES(ctx, res);
+  cbor_set_float8(res, value);
+  _cbor_builder_append(res, ctx);
+}
+
+void cbor_builder_null_callback(void *context) {
+  struct _cbor_decoder_context *ctx = context;
+  cbor_item_t *res = cbor_new_null();
+  CHECK_RES(ctx, res);
+  _cbor_builder_append(res, ctx);
+}
+
+void cbor_builder_undefined_callback(void *context) {
+  struct _cbor_decoder_context *ctx = context;
+  cbor_item_t *res = cbor_new_undef();
+  CHECK_RES(ctx, res);
+  _cbor_builder_append(res, ctx);
+}
+
+void cbor_builder_boolean_callback(void *context, bool value) {
+  struct _cbor_decoder_context *ctx = context;
+  cbor_item_t *res = cbor_build_bool(value);
+  CHECK_RES(ctx, res);
+  _cbor_builder_append(res, ctx);
+}
+
+void cbor_builder_tag_callback(void *context, uint64_t value) {
+  struct _cbor_decoder_context *ctx = context;
+  cbor_item_t *res = cbor_new_tag(value);
+  CHECK_RES(ctx, res);
+  PUSH_CTX_STACK(ctx, res, 1);
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor/internal/builder_callbacks.h mysql-8.0-8.0.27/extra/libcbor/src/cbor/internal/builder_callbacks.h
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor/internal/builder_callbacks.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor/internal/builder_callbacks.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#ifndef LIBCBOR_BUILDER_CALLBACKS_H
+#define LIBCBOR_BUILDER_CALLBACKS_H
+
+#include "../callbacks.h"
+#include "cbor/common.h"
+#include "stack.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** High-level decoding context */
+struct _cbor_decoder_context {
+  /** Callback creating the last item has failed */
+  bool creation_failed;
+  /** Stack expectation mismatch */
+  bool syntax_error;
+  cbor_item_t *root;
+  struct _cbor_stack *stack;
+};
+
+void cbor_builder_uint8_callback(void *, uint8_t);
+
+void cbor_builder_uint16_callback(void *, uint16_t);
+
+void cbor_builder_uint32_callback(void *, uint32_t);
+
+void cbor_builder_uint64_callback(void *, uint64_t);
+
+void cbor_builder_negint8_callback(void *, uint8_t);
+
+void cbor_builder_negint16_callback(void *, uint16_t);
+
+void cbor_builder_negint32_callback(void *, uint32_t);
+
+void cbor_builder_negint64_callback(void *, uint64_t);
+
+void cbor_builder_string_callback(void *, cbor_data, size_t);
+
+void cbor_builder_string_start_callback(void *);
+
+void cbor_builder_byte_string_callback(void *, cbor_data, size_t);
+
+void cbor_builder_byte_string_start_callback(void *);
+
+void cbor_builder_array_start_callback(void *, size_t);
+
+void cbor_builder_indef_array_start_callback(void *);
+
+void cbor_builder_map_start_callback(void *, size_t);
+
+void cbor_builder_indef_map_start_callback(void *);
+
+void cbor_builder_tag_callback(void *, uint64_t);
+
+void cbor_builder_float2_callback(void *, float);
+
+void cbor_builder_float4_callback(void *, float);
+
+void cbor_builder_float8_callback(void *, double);
+
+void cbor_builder_null_callback(void *);
+
+void cbor_builder_undefined_callback(void *);
+
+void cbor_builder_boolean_callback(void *, bool);
+
+void cbor_builder_indef_break_callback(void *);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // LIBCBOR_BUILDER_CALLBACKS_H
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor/internal/encoders.c mysql-8.0-8.0.27/extra/libcbor/src/cbor/internal/encoders.c
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor/internal/encoders.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor/internal/encoders.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include "encoders.h"
+#include <string.h>
+
+size_t _cbor_encode_uint8(uint8_t value, unsigned char *buffer,
+                          size_t buffer_size, uint8_t offset) {
+  if (value <= 23) {
+    if (buffer_size >= 1) {
+      buffer[0] = value + offset;
+      return 1;
+    }
+  } else {
+    if (buffer_size >= 2) {
+      buffer[0] = 0x18 + offset;
+      buffer[1] = value;
+      return 2;
+    }
+  }
+  return 0;
+}
+
+size_t _cbor_encode_uint16(uint16_t value, unsigned char *buffer,
+                           size_t buffer_size, uint8_t offset) {
+  if (buffer_size >= 3) {
+    buffer[0] = 0x19 + offset;
+
+#ifdef IS_BIG_ENDIAN
+    memcpy(buffer + 1, &value, 2);
+#else
+    buffer[1] = value >> 8;
+    buffer[2] = value;
+#endif
+
+    return 3;
+  } else
+    return 0;
+}
+
+size_t _cbor_encode_uint32(uint32_t value, unsigned char *buffer,
+                           size_t buffer_size, uint8_t offset) {
+  if (buffer_size >= 5) {
+    buffer[0] = 0x1A + offset;
+
+#ifdef IS_BIG_ENDIAN
+    memcpy(buffer + 1, &value, 4);
+#else
+    buffer[1] = value >> 24;
+    buffer[2] = value >> 16;
+    buffer[3] = value >> 8;
+    buffer[4] = value;
+#endif
+
+    return 5;
+  } else
+    return 0;
+}
+
+size_t _cbor_encode_uint64(uint64_t value, unsigned char *buffer,
+                           size_t buffer_size, uint8_t offset) {
+  if (buffer_size >= 9) {
+    buffer[0] = 0x1B + offset;
+
+#ifdef IS_BIG_ENDIAN
+    memcpy(buffer + 1, &value, 8);
+#else
+    buffer[1] = value >> 56;
+    buffer[2] = value >> 48;
+    buffer[3] = value >> 40;
+    buffer[4] = value >> 32;
+    buffer[5] = value >> 24;
+    buffer[6] = value >> 16;
+    buffer[7] = value >> 8;
+    buffer[8] = value;
+#endif
+
+    return 9;
+  } else
+    return 0;
+}
+
+size_t _cbor_encode_uint(uint64_t value, unsigned char *buffer,
+                         size_t buffer_size, uint8_t offset) {
+  if (value <= UINT16_MAX)
+    if (value <= UINT8_MAX)
+      return _cbor_encode_uint8((uint8_t)value, buffer, buffer_size, offset);
+    else
+      return _cbor_encode_uint16((uint16_t)value, buffer, buffer_size, offset);
+  else if (value <= UINT32_MAX)
+    return _cbor_encode_uint32((uint32_t)value, buffer, buffer_size, offset);
+  else
+    return _cbor_encode_uint64((uint64_t)value, buffer, buffer_size, offset);
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor/internal/encoders.h mysql-8.0-8.0.27/extra/libcbor/src/cbor/internal/encoders.h
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor/internal/encoders.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor/internal/encoders.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#ifndef LIBCBOR_ENCODERS_H
+#define LIBCBOR_ENCODERS_H
+
+#include "cbor/common.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+size_t _cbor_encode_uint8(uint8_t value, unsigned char *buffer,
+                          size_t buffer_size, uint8_t offset);
+
+size_t _cbor_encode_uint16(uint16_t value, unsigned char *buffer,
+                           size_t buffer_size, uint8_t offset);
+
+size_t _cbor_encode_uint32(uint32_t value, unsigned char *buffer,
+                           size_t buffer_size, uint8_t offset);
+
+size_t _cbor_encode_uint64(uint64_t value, unsigned char *buffer,
+                           size_t buffer_size, uint8_t offset);
+
+size_t _cbor_encode_uint(uint64_t value, unsigned char *buffer,
+                         size_t buffer_size, uint8_t offset);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // LIBCBOR_ENCODERS_H
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor/internal/loaders.c mysql-8.0-8.0.27/extra/libcbor/src/cbor/internal/loaders.c
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor/internal/loaders.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor/internal/loaders.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include "loaders.h"
+#include <math.h>
+#include <string.h>
+
+uint8_t _cbor_load_uint8(cbor_data source) { return (uint8_t)*source; }
+
+uint16_t _cbor_load_uint16(const unsigned char *source) {
+#ifdef IS_BIG_ENDIAN
+  uint16_t result;
+  memcpy(&result, source, 2);
+  return result;
+#else
+  return ((uint16_t) * (source + 0) << 8) + (uint8_t) * (source + 1);
+#endif
+}
+
+uint32_t _cbor_load_uint32(const unsigned char *source) {
+#ifdef IS_BIG_ENDIAN
+  uint32_t result;
+  memcpy(&result, source, 4);
+  return result;
+#else
+  return ((uint32_t) * (source + 0) << 0x18) +
+         ((uint32_t) * (source + 1) << 0x10) +
+         ((uint16_t) * (source + 2) << 0x08) + (uint8_t) * (source + 3);
+#endif
+}
+
+uint64_t _cbor_load_uint64(const unsigned char *source) {
+#ifdef IS_BIG_ENDIAN
+  uint64_t result;
+  memcpy(&result, source, 8);
+  return result;
+#else
+  return ((uint64_t) * (source + 0) << 0x38) +
+         ((uint64_t) * (source + 1) << 0x30) +
+         ((uint64_t) * (source + 2) << 0x28) +
+         ((uint64_t) * (source + 3) << 0x20) +
+         ((uint32_t) * (source + 4) << 0x18) +
+         ((uint32_t) * (source + 5) << 0x10) +
+         ((uint16_t) * (source + 6) << 0x08) + (uint8_t) * (source + 7);
+#endif
+}
+
+/* As per http://tools.ietf.org/html/rfc7049#appendix-D */
+float _cbor_decode_half(unsigned char *halfp) {
+  int half = (halfp[0] << 8) + halfp[1];
+  int exp = (half >> 10) & 0x1f;
+  int mant = half & 0x3ff;
+  double val;
+  if (exp == 0)
+    val = ldexp(mant, -24);
+  else if (exp != 31)
+    val = ldexp(mant + 1024, exp - 25);
+  else
+    val = mant == 0 ? INFINITY : NAN;
+  return (float)(half & 0x8000 ? -val : val);
+}
+
+double _cbor_load_half(cbor_data source) {
+  /* Discard const */
+  return _cbor_decode_half((unsigned char *)source);
+}
+
+float _cbor_load_float(cbor_data source) {
+  union _cbor_float_helper helper = {.as_uint = _cbor_load_uint32(source)};
+  return helper.as_float;
+}
+
+double _cbor_load_double(cbor_data source) {
+  union _cbor_double_helper helper = {.as_uint = _cbor_load_uint64(source)};
+  return helper.as_double;
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor/internal/loaders.h mysql-8.0-8.0.27/extra/libcbor/src/cbor/internal/loaders.h
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor/internal/loaders.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor/internal/loaders.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#ifndef LIBCBOR_LOADERS_H
+#define LIBCBOR_LOADERS_H
+
+#include "cbor/common.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Read the given uint from the given location, no questions asked */
+uint8_t _cbor_load_uint8(const unsigned char *source);
+
+uint16_t _cbor_load_uint16(const unsigned char *source);
+
+uint32_t _cbor_load_uint32(const unsigned char *source);
+
+uint64_t _cbor_load_uint64(const unsigned char *source);
+
+double _cbor_load_half(cbor_data source);
+
+float _cbor_load_float(cbor_data source);
+
+double _cbor_load_double(cbor_data source);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // LIBCBOR_LOADERS_H
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor/internal/memory_utils.c mysql-8.0-8.0.27/extra/libcbor/src/cbor/internal/memory_utils.c
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor/internal/memory_utils.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor/internal/memory_utils.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include "memory_utils.h"
+#include "cbor/common.h"
+
+// TODO: Consider builtins
+// (https://gcc.gnu.org/onlinedocs/gcc/Integer-Overflow-Builtins.html)
+
+/** Highest on bit position */
+size_t _cbor_highest_bit(size_t number) {
+  size_t bit = 0;
+  while (number != 0) {
+    bit++;
+    number >>= 1;
+  }
+
+  return bit;
+}
+
+bool _cbor_safe_to_multiply(size_t a, size_t b) {
+  return _cbor_highest_bit(a) + _cbor_highest_bit(b) <= sizeof(size_t) * 8;
+}
+
+void* _cbor_alloc_multiple(size_t item_size, size_t item_count) {
+  if (_cbor_safe_to_multiply(item_size, item_count)) {
+    return _CBOR_MALLOC(item_size * item_count);
+  } else {
+    return NULL;
+  }
+}
+
+void* _cbor_realloc_multiple(void* pointer, size_t item_size,
+                             size_t item_count) {
+  if (_cbor_safe_to_multiply(item_size, item_count)) {
+    return _CBOR_REALLOC(pointer, item_size * item_count);
+  } else {
+    return NULL;
+  }
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor/internal/memory_utils.h mysql-8.0-8.0.27/extra/libcbor/src/cbor/internal/memory_utils.h
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor/internal/memory_utils.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor/internal/memory_utils.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#ifndef LIBCBOR_MEMORY_UTILS_H
+#define LIBCBOR_MEMORY_UTILS_H
+
+#include <stdbool.h>
+#include <string.h>
+
+/** Can a and b be multiplied without overflowing size_t? */
+bool _cbor_safe_to_multiply(size_t a, size_t b);
+
+/** Overflow-proof contiguous array allocation
+ *
+ * @param item_size
+ * @param item_count
+ * @return Region of item_size * item_count bytes, or NULL if the total size
+ * overflows size_t or the underlying allocator failed
+ */
+void* _cbor_alloc_multiple(size_t item_size, size_t item_count);
+
+/** Overflow-proof contiguous array reallocation
+ *
+ * This implements the OpenBSD `reallocarray` functionality.
+ *
+ * @param pointer
+ * @param item_size
+ * @param item_count
+ * @return Realloc'd of item_size * item_count bytes, or NULL if the total size
+ * overflows size_t or the underlying allocator failed
+ */
+void* _cbor_realloc_multiple(void* pointer, size_t item_size,
+                             size_t item_count);
+
+#endif  // LIBCBOR_MEMORY_UTILS_H
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor/internal/stack.c mysql-8.0-8.0.27/extra/libcbor/src/cbor/internal/stack.c
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor/internal/stack.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor/internal/stack.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include "stack.h"
+
+struct _cbor_stack _cbor_stack_init() {
+  return (struct _cbor_stack){.top = NULL, .size = 0};
+}
+
+void _cbor_stack_pop(struct _cbor_stack *stack) {
+  struct _cbor_stack_record *top = stack->top;
+  stack->top = stack->top->lower;
+  _CBOR_FREE(top);
+  stack->size--;
+}
+
+struct _cbor_stack_record *_cbor_stack_push(struct _cbor_stack *stack,
+                                            cbor_item_t *item,
+                                            size_t subitems) {
+  if (stack->size == CBOR_MAX_STACK_SIZE) return NULL;
+  struct _cbor_stack_record *new_top =
+      _CBOR_MALLOC(sizeof(struct _cbor_stack_record));
+  if (new_top == NULL) return NULL;
+
+  *new_top = (struct _cbor_stack_record){stack->top, item, subitems};
+  stack->top = new_top;
+  stack->size++;
+  return new_top;
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor/internal/stack.h mysql-8.0-8.0.27/extra/libcbor/src/cbor/internal/stack.h
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor/internal/stack.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor/internal/stack.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#ifndef LIBCBOR_STACK_H
+#define LIBCBOR_STACK_H
+
+#include "cbor/common.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** Simple stack record for the parser */
+struct _cbor_stack_record {
+  struct _cbor_stack_record *lower;
+  cbor_item_t *item;
+  size_t subitems;
+};
+
+/** Stack handle - contents and size */
+struct _cbor_stack {
+  struct _cbor_stack_record *top;
+  size_t size;
+};
+
+struct _cbor_stack _cbor_stack_init();
+
+void _cbor_stack_pop(struct _cbor_stack *);
+
+struct _cbor_stack_record *_cbor_stack_push(struct _cbor_stack *, cbor_item_t *,
+                                            size_t);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // LIBCBOR_STACK_H
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor/internal/unicode.c mysql-8.0-8.0.27/extra/libcbor/src/cbor/internal/unicode.c
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor/internal/unicode.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor/internal/unicode.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include "unicode.h"
+
+#define UTF8_ACCEPT 0
+#define UTF8_REJECT 1
+
+static const uint8_t utf8d[] = {
+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0, /* 00..1f */
+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0, /* 20..3f */
+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0, /* 40..5f */
+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0, /* 60..7f */
+    1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,
+    1,   1,   1,   1,   1,   9,   9,   9,   9,   9,   9,
+    9,   9,   9,   9,   9,   9,   9,   9,   9,   9, /* 80..9f */
+    7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7,
+    7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7,
+    7,   7,   7,   7,   7,   7,   7,   7,   7,   7, /* a0..bf */
+    8,   8,   2,   2,   2,   2,   2,   2,   2,   2,   2,
+    2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,
+    2,   2,   2,   2,   2,   2,   2,   2,   2,   2, /* c0..df */
+    0xa, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3,
+    0x3, 0x3, 0x4, 0x3, 0x3, /* e0..ef */
+    0xb, 0x6, 0x6, 0x6, 0x5, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8,
+    0x8, 0x8, 0x8, 0x8, 0x8, /* f0..ff */
+    0x0, 0x1, 0x2, 0x3, 0x5, 0x8, 0x7, 0x1, 0x1, 0x1, 0x4,
+    0x6, 0x1, 0x1, 0x1, 0x1, /* s0..s0 */
+    1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,
+    1,   1,   1,   1,   1,   1,   0,   1,   1,   1,   1,
+    1,   0,   1,   0,   1,   1,   1,   1,   1,   1, /* s1..s2 */
+    1,   2,   1,   1,   1,   1,   1,   2,   1,   2,   1,
+    1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,
+    1,   2,   1,   1,   1,   1,   1,   1,   1,   1, /* s3..s4 */
+    1,   2,   1,   1,   1,   1,   1,   1,   1,   2,   1,
+    1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,
+    1,   3,   1,   3,   1,   1,   1,   1,   1,   1, /* s5..s6 */
+    1,   3,   1,   1,   1,   1,   1,   3,   1,   3,   1,
+    1,   1,   1,   1,   1,   1,   3,   1,   1,   1,   1,
+    1,   1,   1,   1,   1,   1,   1,   1,   1,   1, /* s7..s8 */
+};
+
+/* Copyright of this function: (c) 2008-2009 Bjoern Hoehrmann
+ * <bjoern@hoehrmann.de> */
+/* See http://bjoern.hoehrmann.de/utf-8/decoder/dfa/ for details. */
+uint32_t _cbor_unicode_decode(uint32_t* state, uint32_t* codep, uint32_t byte) {
+  uint32_t type = utf8d[byte];
+
+  *codep = (*state != UTF8_ACCEPT) ? (byte & 0x3fu) | (*codep << 6)
+                                   : (0xff >> type) & (byte);
+
+  *state = utf8d[256 + *state * 16 + type];
+  return *state;
+}
+
+size_t _cbor_unicode_codepoint_count(cbor_data source, size_t source_length,
+                                     struct _cbor_unicode_status* status) {
+  *status =
+      (struct _cbor_unicode_status){.location = 0, .status = _CBOR_UNICODE_OK};
+  uint32_t codepoint, state = UTF8_ACCEPT, res;
+  size_t pos = 0, count = 0;
+
+  for (; pos < source_length; pos++) {
+    res = _cbor_unicode_decode(&state, &codepoint, source[pos]);
+
+    if (res == UTF8_ACCEPT) {
+      count++;
+    } else if (res == UTF8_REJECT) {
+      goto error;
+    }
+  }
+
+  /* Unfinished multibyte codepoint */
+  if (state != UTF8_ACCEPT) goto error;
+
+  return count;
+
+error:
+  *status = (struct _cbor_unicode_status){.location = pos,
+                                          .status = _CBOR_UNICODE_BADCP};
+  return -1;
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor/internal/unicode.h mysql-8.0-8.0.27/extra/libcbor/src/cbor/internal/unicode.h
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor/internal/unicode.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor/internal/unicode.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#ifndef LIBCBOR_UNICODE_H
+#define LIBCBOR_UNICODE_H
+
+#include "cbor/common.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+enum _cbor_unicode_status_error { _CBOR_UNICODE_OK, _CBOR_UNICODE_BADCP };
+
+/** Signals unicode validation error and possibly its location */
+struct _cbor_unicode_status {
+  enum _cbor_unicode_status_error status;
+  size_t location;
+};
+
+size_t _cbor_unicode_codepoint_count(cbor_data source, size_t source_length,
+                                     struct _cbor_unicode_status* status);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // LIBCBOR_UNICODE_H
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor/ints.c mysql-8.0-8.0.27/extra/libcbor/src/cbor/ints.c
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor/ints.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor/ints.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,191 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include "ints.h"
+
+cbor_int_width cbor_int_get_width(const cbor_item_t *item) {
+  assert(cbor_is_int(item));
+  return item->metadata.int_metadata.width;
+}
+
+uint8_t cbor_get_uint8(const cbor_item_t *item) {
+  assert(cbor_is_int(item));
+  assert(cbor_int_get_width(item) == CBOR_INT_8);
+  return *item->data;
+}
+
+uint16_t cbor_get_uint16(const cbor_item_t *item) {
+  assert(cbor_is_int(item));
+  assert(cbor_int_get_width(item) == CBOR_INT_16);
+  return *(uint16_t *)item->data;
+}
+
+uint32_t cbor_get_uint32(const cbor_item_t *item) {
+  assert(cbor_is_int(item));
+  assert(cbor_int_get_width(item) == CBOR_INT_32);
+  return *(uint32_t *)item->data;
+}
+
+uint64_t cbor_get_uint64(const cbor_item_t *item) {
+  assert(cbor_is_int(item));
+  assert(cbor_int_get_width(item) == CBOR_INT_64);
+  return *(uint64_t *)item->data;
+}
+
+uint64_t cbor_get_int(const cbor_item_t *item) {
+  assert(cbor_is_int(item));
+  switch (cbor_int_get_width(item)) {
+    case CBOR_INT_8:
+      return cbor_get_uint8(item);
+    case CBOR_INT_16:
+      return cbor_get_uint16(item);
+    case CBOR_INT_32:
+      return cbor_get_uint32(item);
+    case CBOR_INT_64:
+      return cbor_get_uint64(item);
+  }
+  // TODO: This should be handled in a default branch
+  return 0xDEADBEEF; /* Compiler complaints */
+}
+
+void cbor_set_uint8(cbor_item_t *item, uint8_t value) {
+  assert(cbor_is_int(item));
+  assert(cbor_int_get_width(item) == CBOR_INT_8);
+  *item->data = value;
+}
+
+void cbor_set_uint16(cbor_item_t *item, uint16_t value) {
+  assert(cbor_is_int(item));
+  assert(cbor_int_get_width(item) == CBOR_INT_16);
+  *(uint16_t *)item->data = value;
+}
+
+void cbor_set_uint32(cbor_item_t *item, uint32_t value) {
+  assert(cbor_is_int(item));
+  assert(cbor_int_get_width(item) == CBOR_INT_32);
+  *(uint32_t *)item->data = value;
+}
+
+void cbor_set_uint64(cbor_item_t *item, uint64_t value) {
+  assert(cbor_is_int(item));
+  assert(cbor_int_get_width(item) == CBOR_INT_64);
+  *(uint64_t *)item->data = value;
+}
+
+void cbor_mark_uint(cbor_item_t *item) {
+  assert(cbor_is_int(item));
+  item->type = CBOR_TYPE_UINT;
+}
+
+void cbor_mark_negint(cbor_item_t *item) {
+  assert(cbor_is_int(item));
+  item->type = CBOR_TYPE_NEGINT;
+}
+
+cbor_item_t *cbor_new_int8() {
+  cbor_item_t *item = _CBOR_MALLOC(sizeof(cbor_item_t) + 1);
+  _CBOR_NOTNULL(item);
+  *item = (cbor_item_t){.data = (unsigned char *)item + sizeof(cbor_item_t),
+                        .refcount = 1,
+                        .metadata = {.int_metadata = {.width = CBOR_INT_8}},
+                        .type = CBOR_TYPE_UINT};
+  return item;
+}
+
+cbor_item_t *cbor_new_int16() {
+  cbor_item_t *item = _CBOR_MALLOC(sizeof(cbor_item_t) + 2);
+  _CBOR_NOTNULL(item);
+  *item = (cbor_item_t){.data = (unsigned char *)item + sizeof(cbor_item_t),
+                        .refcount = 1,
+                        .metadata = {.int_metadata = {.width = CBOR_INT_16}},
+                        .type = CBOR_TYPE_UINT};
+  return item;
+}
+
+cbor_item_t *cbor_new_int32() {
+  cbor_item_t *item = _CBOR_MALLOC(sizeof(cbor_item_t) + 4);
+  _CBOR_NOTNULL(item);
+  *item = (cbor_item_t){.data = (unsigned char *)item + sizeof(cbor_item_t),
+                        .refcount = 1,
+                        .metadata = {.int_metadata = {.width = CBOR_INT_32}},
+                        .type = CBOR_TYPE_UINT};
+  return item;
+}
+
+cbor_item_t *cbor_new_int64() {
+  cbor_item_t *item = _CBOR_MALLOC(sizeof(cbor_item_t) + 8);
+  _CBOR_NOTNULL(item);
+  *item = (cbor_item_t){.data = (unsigned char *)item + sizeof(cbor_item_t),
+                        .refcount = 1,
+                        .metadata = {.int_metadata = {.width = CBOR_INT_64}},
+                        .type = CBOR_TYPE_UINT};
+  return item;
+}
+
+cbor_item_t *cbor_build_uint8(uint8_t value) {
+  cbor_item_t *item = cbor_new_int8();
+  _CBOR_NOTNULL(item);
+  cbor_set_uint8(item, value);
+  cbor_mark_uint(item);
+  return item;
+}
+
+cbor_item_t *cbor_build_uint16(uint16_t value) {
+  cbor_item_t *item = cbor_new_int16();
+  _CBOR_NOTNULL(item);
+  cbor_set_uint16(item, value);
+  cbor_mark_uint(item);
+  return item;
+}
+
+cbor_item_t *cbor_build_uint32(uint32_t value) {
+  cbor_item_t *item = cbor_new_int32();
+  _CBOR_NOTNULL(item);
+  cbor_set_uint32(item, value);
+  cbor_mark_uint(item);
+  return item;
+}
+
+cbor_item_t *cbor_build_uint64(uint64_t value) {
+  cbor_item_t *item = cbor_new_int64();
+  _CBOR_NOTNULL(item);
+  cbor_set_uint64(item, value);
+  cbor_mark_uint(item);
+  return item;
+}
+
+cbor_item_t *cbor_build_negint8(uint8_t value) {
+  cbor_item_t *item = cbor_new_int8();
+  _CBOR_NOTNULL(item);
+  cbor_set_uint8(item, value);
+  cbor_mark_negint(item);
+  return item;
+}
+
+cbor_item_t *cbor_build_negint16(uint16_t value) {
+  cbor_item_t *item = cbor_new_int16();
+  _CBOR_NOTNULL(item);
+  cbor_set_uint16(item, value);
+  cbor_mark_negint(item);
+  return item;
+}
+
+cbor_item_t *cbor_build_negint32(uint32_t value) {
+  cbor_item_t *item = cbor_new_int32();
+  _CBOR_NOTNULL(item);
+  cbor_set_uint32(item, value);
+  cbor_mark_negint(item);
+  return item;
+}
+
+cbor_item_t *cbor_build_negint64(uint64_t value) {
+  cbor_item_t *item = cbor_new_int64();
+  _CBOR_NOTNULL(item);
+  cbor_set_uint64(item, value);
+  cbor_mark_negint(item);
+  return item;
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor/ints.h mysql-8.0-8.0.27/extra/libcbor/src/cbor/ints.h
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor/ints.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor/ints.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,210 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#ifndef LIBCBOR_INTS_H
+#define LIBCBOR_INTS_H
+
+#include "cbor/cbor_export.h"
+#include "cbor/common.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * ============================================================================
+ * Integer (uints and negints) manipulation
+ * ============================================================================
+ */
+
+/** Extracts the integer value
+ *
+ * @param item[borrow] positive or negative integer
+ * @return the value
+ */
+CBOR_EXPORT uint8_t cbor_get_uint8(const cbor_item_t *item);
+
+/** Extracts the integer value
+ *
+ * @param item[borrow] positive or negative integer
+ * @return the value
+ */
+CBOR_EXPORT uint16_t cbor_get_uint16(const cbor_item_t *item);
+
+/** Extracts the integer value
+ *
+ * @param item[borrow] positive or negative integer
+ * @return the value
+ */
+CBOR_EXPORT uint32_t cbor_get_uint32(const cbor_item_t *item);
+
+/** Extracts the integer value
+ *
+ * @param item[borrow] positive or negative integer
+ * @return the value
+ */
+CBOR_EXPORT uint64_t cbor_get_uint64(const cbor_item_t *item);
+
+/** Extracts the integer value
+ *
+ * @param item[borrow] positive or negative integer
+ * @return the value, extended to `uint64_t`
+ */
+CBOR_EXPORT uint64_t cbor_get_int(const cbor_item_t *item);
+
+/** Assigns the integer value
+ *
+ * @param item[borrow] positive or negative integer item
+ * @param value the value to assign. For negative integer, the logical value is
+ * `-value - 1`
+ */
+CBOR_EXPORT void cbor_set_uint8(cbor_item_t *item, uint8_t value);
+
+/** Assigns the integer value
+ *
+ * @param item[borrow] positive or negative integer item
+ * @param value the value to assign. For negative integer, the logical value is
+ * `-value - 1`
+ */
+CBOR_EXPORT void cbor_set_uint16(cbor_item_t *item, uint16_t value);
+
+/** Assigns the integer value
+ *
+ * @param item[borrow] positive or negative integer item
+ * @param value the value to assign. For negative integer, the logical value is
+ * `-value - 1`
+ */
+CBOR_EXPORT void cbor_set_uint32(cbor_item_t *item, uint32_t value);
+
+/** Assigns the integer value
+ *
+ * @param item[borrow] positive or negative integer item
+ * @param value the value to assign. For negative integer, the logical value is
+ * `-value - 1`
+ */
+CBOR_EXPORT void cbor_set_uint64(cbor_item_t *item, uint64_t value);
+
+/** Queries the integer width
+ *
+ *  @param item[borrow] positive or negative integer item
+ *  @return the width
+ */
+CBOR_EXPORT cbor_int_width cbor_int_get_width(const cbor_item_t *item);
+
+/** Marks the integer item as a positive integer
+ *
+ * The data value is not changed
+ *
+ * @param item[borrow] positive or negative integer item
+ */
+CBOR_EXPORT void cbor_mark_uint(cbor_item_t *item);
+
+/** Marks the integer item as a negative integer
+ *
+ * The data value is not changed
+ *
+ * @param item[borrow] positive or negative integer item
+ */
+CBOR_EXPORT void cbor_mark_negint(cbor_item_t *item);
+
+/** Allocates new integer with 1B width
+ *
+ * The width cannot be changed once allocated
+ *
+ * @return **new** positive integer or `NULL` on memory allocation failure. The
+ * value is not initialized
+ */
+CBOR_EXPORT cbor_item_t *cbor_new_int8();
+
+/** Allocates new integer with 2B width
+ *
+ * The width cannot be changed once allocated
+ *
+ * @return **new** positive integer or `NULL` on memory allocation failure. The
+ * value is not initialized
+ */
+CBOR_EXPORT cbor_item_t *cbor_new_int16();
+
+/** Allocates new integer with 4B width
+ *
+ * The width cannot be changed once allocated
+ *
+ * @return **new** positive integer or `NULL` on memory allocation failure. The
+ * value is not initialized
+ */
+CBOR_EXPORT cbor_item_t *cbor_new_int32();
+
+/** Allocates new integer with 8B width
+ *
+ * The width cannot be changed once allocated
+ *
+ * @return **new** positive integer or `NULL` on memory allocation failure. The
+ * value is not initialized
+ */
+CBOR_EXPORT cbor_item_t *cbor_new_int64();
+
+/** Constructs a new positive integer
+ *
+ * @param value the value to use
+ * @return **new** positive integer or `NULL` on memory allocation failure
+ */
+CBOR_EXPORT cbor_item_t *cbor_build_uint8(uint8_t value);
+
+/** Constructs a new positive integer
+ *
+ * @param value the value to use
+ * @return **new** positive integer or `NULL` on memory allocation failure
+ */
+CBOR_EXPORT cbor_item_t *cbor_build_uint16(uint16_t value);
+
+/** Constructs a new positive integer
+ *
+ * @param value the value to use
+ * @return **new** positive integer or `NULL` on memory allocation failure
+ */
+CBOR_EXPORT cbor_item_t *cbor_build_uint32(uint32_t value);
+
+/** Constructs a new positive integer
+ *
+ * @param value the value to use
+ * @return **new** positive integer or `NULL` on memory allocation failure
+ */
+CBOR_EXPORT cbor_item_t *cbor_build_uint64(uint64_t value);
+
+/** Constructs a new negative integer
+ *
+ * @param value the value to use
+ * @return **new** negative integer or `NULL` on memory allocation failure
+ */
+CBOR_EXPORT cbor_item_t *cbor_build_negint8(uint8_t value);
+
+/** Constructs a new negative integer
+ *
+ * @param value the value to use
+ * @return **new** negative integer or `NULL` on memory allocation failure
+ */
+CBOR_EXPORT cbor_item_t *cbor_build_negint16(uint16_t value);
+
+/** Constructs a new negative integer
+ *
+ * @param value the value to use
+ * @return **new** negative integer or `NULL` on memory allocation failure
+ */
+CBOR_EXPORT cbor_item_t *cbor_build_negint32(uint32_t value);
+
+/** Constructs a new negative integer
+ *
+ * @param value the value to use
+ * @return **new** negative integer or `NULL` on memory allocation failure
+ */
+CBOR_EXPORT cbor_item_t *cbor_build_negint64(uint64_t value);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // LIBCBOR_INTS_H
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor/maps.c mysql-8.0-8.0.27/extra/libcbor/src/cbor/maps.c
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor/maps.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor/maps.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include "maps.h"
+#include "internal/memory_utils.h"
+
+size_t cbor_map_size(const cbor_item_t *item) {
+  assert(cbor_isa_map(item));
+  return item->metadata.map_metadata.end_ptr;
+}
+
+size_t cbor_map_allocated(const cbor_item_t *item) {
+  assert(cbor_isa_map(item));
+  return item->metadata.map_metadata.allocated;
+}
+
+cbor_item_t *cbor_new_definite_map(size_t size) {
+  cbor_item_t *item = _CBOR_MALLOC(sizeof(cbor_item_t));
+  _CBOR_NOTNULL(item);
+
+  *item = (cbor_item_t){
+      .refcount = 1,
+      .type = CBOR_TYPE_MAP,
+      .metadata = {.map_metadata = {.allocated = size,
+                                    .type = _CBOR_METADATA_DEFINITE,
+                                    .end_ptr = 0}},
+      .data = _cbor_alloc_multiple(sizeof(struct cbor_pair), size)};
+  _CBOR_DEPENDENT_NOTNULL(item, item->data);
+
+  return item;
+}
+
+cbor_item_t *cbor_new_indefinite_map() {
+  cbor_item_t *item = _CBOR_MALLOC(sizeof(cbor_item_t));
+  _CBOR_NOTNULL(item);
+
+  *item = (cbor_item_t){
+      .refcount = 1,
+      .type = CBOR_TYPE_MAP,
+      .metadata = {.map_metadata = {.allocated = 0,
+                                    .type = _CBOR_METADATA_INDEFINITE,
+                                    .end_ptr = 0}},
+      .data = NULL};
+
+  return item;
+}
+
+bool _cbor_map_add_key(cbor_item_t *item, cbor_item_t *key) {
+  assert(cbor_isa_map(item));
+  struct _cbor_map_metadata *metadata =
+      (struct _cbor_map_metadata *)&item->metadata;
+  if (cbor_map_is_definite(item)) {
+    struct cbor_pair *data = cbor_map_handle(item);
+    if (metadata->end_ptr >= metadata->allocated) {
+      /* Don't realloc definite preallocated map */
+      return false;
+    }
+
+    data[metadata->end_ptr].key = key;
+    data[metadata->end_ptr++].value = NULL;
+  } else {
+    if (metadata->end_ptr >= metadata->allocated) {
+      /* Exponential realloc */
+      // Check for overflows first
+      // TODO: Explicitly test this
+      if (!_cbor_safe_to_multiply(CBOR_BUFFER_GROWTH, metadata->allocated)) {
+        return false;
+      }
+
+      size_t new_allocation = metadata->allocated == 0
+                                  ? 1
+                                  : CBOR_BUFFER_GROWTH * metadata->allocated;
+
+      unsigned char *new_data = _cbor_realloc_multiple(
+          item->data, sizeof(struct cbor_pair), new_allocation);
+
+      if (new_data == NULL) {
+        return false;
+      }
+
+      item->data = new_data;
+      metadata->allocated = new_allocation;
+    }
+    struct cbor_pair *data = cbor_map_handle(item);
+    data[metadata->end_ptr].key = key;
+    data[metadata->end_ptr++].value = NULL;
+  }
+  cbor_incref(key);
+  return true;
+}
+
+bool _cbor_map_add_value(cbor_item_t *item, cbor_item_t *value) {
+  assert(cbor_isa_map(item));
+  cbor_incref(value);
+  cbor_map_handle(item)[
+      /* Move one back since we are assuming _add_key (which increased the ptr)
+       * was the previous operation on this object */
+      item->metadata.map_metadata.end_ptr - 1]
+      .value = value;
+  return true;
+}
+
+bool cbor_map_add(cbor_item_t *item, struct cbor_pair pair) {
+  assert(cbor_isa_map(item));
+  if (!_cbor_map_add_key(item, pair.key)) return false;
+  return _cbor_map_add_value(item, pair.value);
+}
+
+bool cbor_map_is_definite(const cbor_item_t *item) {
+  assert(cbor_isa_map(item));
+  return item->metadata.map_metadata.type == _CBOR_METADATA_DEFINITE;
+}
+
+bool cbor_map_is_indefinite(const cbor_item_t *item) {
+  return !cbor_map_is_definite(item);
+}
+
+struct cbor_pair *cbor_map_handle(const cbor_item_t *item) {
+  assert(cbor_isa_map(item));
+  return (struct cbor_pair *)item->data;
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor/maps.h mysql-8.0-8.0.27/extra/libcbor/src/cbor/maps.h
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor/maps.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor/maps.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#ifndef LIBCBOR_MAPS_H
+#define LIBCBOR_MAPS_H
+
+#include "cbor/cbor_export.h"
+#include "cbor/common.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * ============================================================================
+ * Map manipulation
+ * ============================================================================
+ */
+
+/** Get the number of pairs
+ *
+ * @param item[borrow] A map
+ * @return The number of pairs
+ */
+CBOR_EXPORT size_t cbor_map_size(const cbor_item_t *item);
+
+/** Get the size of the allocated storage
+ *
+ * @param item[borrow] A map
+ * @return Allocated storage size (as the number of #cbor_pair items)
+ */
+CBOR_EXPORT size_t cbor_map_allocated(const cbor_item_t *item);
+
+/** Create a new definite map
+ *
+ * @param size The number of slots to preallocate
+ * @return **new** definite map. `NULL` on malloc failure.
+ */
+CBOR_EXPORT cbor_item_t *cbor_new_definite_map(size_t size);
+
+/** Create a new indefinite map
+ *
+ * @param size The number of slots to preallocate
+ * @return **new** definite map. `NULL` on malloc failure.
+ */
+CBOR_EXPORT cbor_item_t *cbor_new_indefinite_map();
+
+/** Add a pair to the map
+ *
+ * For definite maps, items can only be added to the preallocated space. For
+ * indefinite maps, the storage will be expanded as needed
+ *
+ * @param item[borrow] A map
+ * @param pair[incref] The key-value pair to add (incref is member-wise)
+ * @return `true` on success, `false` if either reallocation failed or the
+ * preallcoated storage is full
+ */
+CBOR_EXPORT bool cbor_map_add(cbor_item_t *item, struct cbor_pair pair);
+
+/** Add a key to the map
+ *
+ * Sets the value to `NULL`. Internal API.
+ *
+ * @param item[borrow] A map
+ * @param key[incref] The key
+ * @return `true` on success, `false` if either reallocation failed or the
+ * preallcoated storage is full
+ */
+CBOR_EXPORT bool _cbor_map_add_key(cbor_item_t *item, cbor_item_t *key);
+
+/** Add a value to the map
+ *
+ * Assumes that #_cbor_map_add_key has been called. Internal API.
+ *
+ * @param item[borrow] A map
+ * @param key[incref] The value
+ * @return `true` on success, `false` if either reallocation failed or the
+ * preallcoated storage is full
+ */
+CBOR_EXPORT bool _cbor_map_add_value(cbor_item_t *item, cbor_item_t *value);
+
+/** Is this map definite?
+ *
+ * @param item[borrow] A map
+ * @return Is this map definite?
+ */
+CBOR_EXPORT bool cbor_map_is_definite(const cbor_item_t *item);
+
+/** Is this map indefinite?
+ *
+ * @param item[borrow] A map
+ * @return Is this map indefinite?
+ */
+CBOR_EXPORT bool cbor_map_is_indefinite(const cbor_item_t *item);
+
+/** Get the pairs storage
+ *
+ * @param item[borrow] A map
+ * @return Array of #cbor_map_size pairs. Manipulation is possible as long as
+ * references remain valid.
+ */
+CBOR_EXPORT struct cbor_pair *cbor_map_handle(const cbor_item_t *item);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // LIBCBOR_MAPS_H
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor/serialization.c mysql-8.0-8.0.27/extra/libcbor/src/cbor/serialization.c
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor/serialization.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor/serialization.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,286 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include "serialization.h"
+#include <string.h>
+#include "cbor/arrays.h"
+#include "cbor/bytestrings.h"
+#include "cbor/floats_ctrls.h"
+#include "cbor/ints.h"
+#include "cbor/maps.h"
+#include "cbor/strings.h"
+#include "cbor/tags.h"
+#include "encoding.h"
+#include "internal/memory_utils.h"
+
+size_t cbor_serialize(const cbor_item_t *item, unsigned char *buffer,
+                      size_t buffer_size) {
+  switch (cbor_typeof(item)) {
+    case CBOR_TYPE_UINT:
+      return cbor_serialize_uint(item, buffer, buffer_size);
+    case CBOR_TYPE_NEGINT:
+      return cbor_serialize_negint(item, buffer, buffer_size);
+    case CBOR_TYPE_BYTESTRING:
+      return cbor_serialize_bytestring(item, buffer, buffer_size);
+    case CBOR_TYPE_STRING:
+      return cbor_serialize_string(item, buffer, buffer_size);
+    case CBOR_TYPE_ARRAY:
+      return cbor_serialize_array(item, buffer, buffer_size);
+    case CBOR_TYPE_MAP:
+      return cbor_serialize_map(item, buffer, buffer_size);
+    case CBOR_TYPE_TAG:
+      return cbor_serialize_tag(item, buffer, buffer_size);
+    case CBOR_TYPE_FLOAT_CTRL:
+      return cbor_serialize_float_ctrl(item, buffer, buffer_size);
+    default:
+      return 0;
+  }
+}
+
+size_t cbor_serialize_alloc(const cbor_item_t *item, unsigned char **buffer,
+                            size_t *buffer_size) {
+  size_t bfr_size = 32;
+  unsigned char *bfr = _CBOR_MALLOC(bfr_size), *tmp_bfr;
+  if (bfr == NULL) {
+    return 0;
+  }
+
+  size_t written;
+
+  /* This is waaay too optimistic - figure out something smarter (eventually) */
+  while ((written = cbor_serialize(item, bfr, bfr_size)) == 0) {
+    if (!_cbor_safe_to_multiply(CBOR_BUFFER_GROWTH, bfr_size)) {
+      _CBOR_FREE(bfr);
+      return 0;
+    }
+
+    tmp_bfr = _CBOR_REALLOC(bfr, bfr_size *= 2);
+
+    if (tmp_bfr == NULL) {
+      _CBOR_FREE(bfr);
+      return 0;
+    }
+    bfr = tmp_bfr;
+  }
+  *buffer = bfr;
+  *buffer_size = bfr_size;
+  return written;
+}
+
+size_t cbor_serialize_uint(const cbor_item_t *item, unsigned char *buffer,
+                           size_t buffer_size) {
+  assert(cbor_isa_uint(item));
+  switch (cbor_int_get_width(item)) {
+    case CBOR_INT_8:
+      return cbor_encode_uint8(cbor_get_uint8(item), buffer, buffer_size);
+    case CBOR_INT_16:
+      return cbor_encode_uint16(cbor_get_uint16(item), buffer, buffer_size);
+    case CBOR_INT_32:
+      return cbor_encode_uint32(cbor_get_uint32(item), buffer, buffer_size);
+    case CBOR_INT_64:
+      return cbor_encode_uint64(cbor_get_uint64(item), buffer, buffer_size);
+    default:
+      return 0;
+  }
+}
+
+size_t cbor_serialize_negint(const cbor_item_t *item, unsigned char *buffer,
+                             size_t buffer_size) {
+  assert(cbor_isa_negint(item));
+  switch (cbor_int_get_width(item)) {
+    case CBOR_INT_8:
+      return cbor_encode_negint8(cbor_get_uint8(item), buffer, buffer_size);
+    case CBOR_INT_16:
+      return cbor_encode_negint16(cbor_get_uint16(item), buffer, buffer_size);
+    case CBOR_INT_32:
+      return cbor_encode_negint32(cbor_get_uint32(item), buffer, buffer_size);
+    case CBOR_INT_64:
+      return cbor_encode_negint64(cbor_get_uint64(item), buffer, buffer_size);
+    default:
+      return 0;
+  }
+}
+
+size_t cbor_serialize_bytestring(const cbor_item_t *item, unsigned char *buffer,
+                                 size_t buffer_size) {
+  assert(cbor_isa_bytestring(item));
+  if (cbor_bytestring_is_definite(item)) {
+    size_t length = cbor_bytestring_length(item);
+    size_t written = cbor_encode_bytestring_start(length, buffer, buffer_size);
+    if (written && (buffer_size - written >= length)) {
+      memcpy(buffer + written, cbor_bytestring_handle(item), length);
+      return written + length;
+    } else
+      return 0;
+  } else {
+    assert(cbor_bytestring_is_indefinite(item));
+    size_t chunk_count = cbor_bytestring_chunk_count(item);
+    size_t written = cbor_encode_indef_bytestring_start(buffer, buffer_size);
+
+    if (written == 0) return 0;
+
+    cbor_item_t **chunks = cbor_bytestring_chunks_handle(item);
+    for (size_t i = 0; i < chunk_count; i++) {
+      size_t chunk_written = cbor_serialize_bytestring(
+          chunks[i], buffer + written, buffer_size - written);
+      if (chunk_written == 0)
+        return 0;
+      else
+        written += chunk_written;
+    }
+    if (cbor_encode_break(buffer + written, buffer_size - written) > 0)
+      return written + 1;
+    else
+      return 0;
+  }
+}
+
+size_t cbor_serialize_string(const cbor_item_t *item, unsigned char *buffer,
+                             size_t buffer_size) {
+  assert(cbor_isa_string(item));
+  if (cbor_string_is_definite(item)) {
+    size_t length = cbor_string_length(item);
+    size_t written = cbor_encode_string_start(length, buffer, buffer_size);
+    if (written && (buffer_size - written >= length)) {
+      memcpy(buffer + written, cbor_string_handle(item), length);
+      return written + length;
+    } else
+      return 0;
+  } else {
+    assert(cbor_string_is_indefinite(item));
+    size_t chunk_count = cbor_string_chunk_count(item);
+    size_t written = cbor_encode_indef_string_start(buffer, buffer_size);
+
+    if (written == 0) return 0;
+
+    cbor_item_t **chunks = cbor_string_chunks_handle(item);
+    for (size_t i = 0; i < chunk_count; i++) {
+      size_t chunk_written = cbor_serialize_string(chunks[i], buffer + written,
+                                                   buffer_size - written);
+      if (chunk_written == 0)
+        return 0;
+      else
+        written += chunk_written;
+    }
+    if (cbor_encode_break(buffer + written, buffer_size - written) > 0)
+      return written + 1;
+    else
+      return 0;
+  }
+}
+
+size_t cbor_serialize_array(const cbor_item_t *item, unsigned char *buffer,
+                            size_t buffer_size) {
+  assert(cbor_isa_array(item));
+  size_t size = cbor_array_size(item), written = 0;
+  cbor_item_t **handle = cbor_array_handle(item);
+  if (cbor_array_is_definite(item)) {
+    written = cbor_encode_array_start(size, buffer, buffer_size);
+  } else {
+    assert(cbor_array_is_indefinite(item));
+    written = cbor_encode_indef_array_start(buffer, buffer_size);
+  }
+  if (written == 0) return 0;
+
+  size_t item_written;
+  for (size_t i = 0; i < size; i++) {
+    item_written =
+        cbor_serialize(*(handle++), buffer + written, buffer_size - written);
+    if (item_written == 0)
+      return 0;
+    else
+      written += item_written;
+  }
+
+  if (cbor_array_is_definite(item)) {
+    return written;
+  } else {
+    assert(cbor_array_is_indefinite(item));
+    item_written = cbor_encode_break(buffer + written, buffer_size - written);
+    if (item_written == 0)
+      return 0;
+    else
+      return written + 1;
+  }
+}
+
+size_t cbor_serialize_map(const cbor_item_t *item, unsigned char *buffer,
+                          size_t buffer_size) {
+  assert(cbor_isa_map(item));
+  size_t size = cbor_map_size(item), written = 0;
+  struct cbor_pair *handle = cbor_map_handle(item);
+
+  if (cbor_map_is_definite(item)) {
+    written = cbor_encode_map_start(size, buffer, buffer_size);
+  } else {
+    assert(cbor_map_is_indefinite(item));
+    written = cbor_encode_indef_map_start(buffer, buffer_size);
+  }
+  if (written == 0) return 0;
+
+  size_t item_written;
+  for (size_t i = 0; i < size; i++) {
+    item_written =
+        cbor_serialize(handle->key, buffer + written, buffer_size - written);
+    if (item_written == 0)
+      return 0;
+    else
+      written += item_written;
+    item_written = cbor_serialize((handle++)->value, buffer + written,
+                                  buffer_size - written);
+    if (item_written == 0)
+      return 0;
+    else
+      written += item_written;
+  }
+
+  if (cbor_map_is_definite(item)) {
+    return written;
+  } else {
+    assert(cbor_map_is_indefinite(item));
+    item_written = cbor_encode_break(buffer + written, buffer_size - written);
+    if (item_written == 0)
+      return 0;
+    else
+      return written + 1;
+  }
+}
+
+size_t cbor_serialize_tag(const cbor_item_t *item, unsigned char *buffer,
+                          size_t buffer_size) {
+  assert(cbor_isa_tag(item));
+  size_t written = cbor_encode_tag(cbor_tag_value(item), buffer, buffer_size);
+  if (written == 0) return 0;
+
+  size_t item_written = cbor_serialize(cbor_move(cbor_tag_item(item)),
+                                       buffer + written, buffer_size - written);
+  if (item_written == 0)
+    return 0;
+  else
+    return written + item_written;
+}
+
+size_t cbor_serialize_float_ctrl(const cbor_item_t *item, unsigned char *buffer,
+                                 size_t buffer_size) {
+  assert(cbor_isa_float_ctrl(item));
+  switch (cbor_float_get_width(item)) {
+    case CBOR_FLOAT_0:
+      /* CTRL - special treatment */
+      return cbor_encode_ctrl(cbor_ctrl_value(item), buffer, buffer_size);
+    case CBOR_FLOAT_16:
+      return cbor_encode_half(cbor_float_get_float2(item), buffer, buffer_size);
+    case CBOR_FLOAT_32:
+      return cbor_encode_single(cbor_float_get_float4(item), buffer,
+                                buffer_size);
+    case CBOR_FLOAT_64:
+      return cbor_encode_double(cbor_float_get_float8(item), buffer,
+                                buffer_size);
+  }
+
+  /* Should never happen - make the compiler happy */
+  return 0;
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor/serialization.h mysql-8.0-8.0.27/extra/libcbor/src/cbor/serialization.h
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor/serialization.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor/serialization.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#ifndef LIBCBOR_SERIALIZATION_H
+#define LIBCBOR_SERIALIZATION_H
+
+#include "cbor/cbor_export.h"
+#include "cbor/common.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * ============================================================================
+ * High level encoding
+ * ============================================================================
+ */
+
+/** Serialize the given item
+ *
+ * @param item[borrow] A data item
+ * @param buffer Buffer to serialize to
+ * @param buffer_size Size of the \p buffer
+ * @return Length of the result. 0 on failure.
+ */
+CBOR_EXPORT size_t cbor_serialize(const cbor_item_t *item,
+                                  cbor_mutable_data buffer, size_t buffer_size);
+
+/** Serialize the given item, allocating buffers as needed
+ *
+ * \rst
+ * .. warning:: It is your responsibility to free the buffer using an
+ * appropriate ``free`` implementation. \endrst
+ *
+ * @param item[borrow] A data item
+ * @param buffer[out] Buffer containing the result
+ * @param buffer_size[out] Size of the \p buffer
+ * @return Length of the result. 0 on failure, in which case \p buffer is
+ * ``NULL``.
+ */
+CBOR_EXPORT size_t cbor_serialize_alloc(const cbor_item_t *item,
+                                        cbor_mutable_data *buffer,
+                                        size_t *buffer_size);
+
+/** Serialize an uint
+ *
+ * @param item[borrow] A uint
+ * @param buffer Buffer to serialize to
+ * @param buffer_size Size of the \p buffer
+ * @return Length of the result. 0 on failure.
+ */
+CBOR_EXPORT size_t cbor_serialize_uint(const cbor_item_t *, cbor_mutable_data,
+                                       size_t);
+
+/** Serialize a negint
+ *
+ * @param item[borrow] A neging
+ * @param buffer Buffer to serialize to
+ * @param buffer_size Size of the \p buffer
+ * @return Length of the result. 0 on failure.
+ */
+CBOR_EXPORT size_t cbor_serialize_negint(const cbor_item_t *, cbor_mutable_data,
+                                         size_t);
+
+/** Serialize a bytestring
+ *
+ * @param item[borrow] A bytestring
+ * @param buffer Buffer to serialize to
+ * @param buffer_size Size of the \p buffer
+ * @return Length of the result. 0 on failure.
+ */
+CBOR_EXPORT size_t cbor_serialize_bytestring(const cbor_item_t *,
+                                             cbor_mutable_data, size_t);
+
+/** Serialize a string
+ *
+ * @param item[borrow] A string
+ * @param buffer Buffer to serialize to
+ * @param buffer_size Size of the \p buffer
+ * @return Length of the result. 0 on failure.
+ */
+CBOR_EXPORT size_t cbor_serialize_string(const cbor_item_t *, cbor_mutable_data,
+                                         size_t);
+
+/** Serialize an array
+ *
+ * @param item[borrow] An array
+ * @param buffer Buffer to serialize to
+ * @param buffer_size Size of the \p buffer
+ * @return Length of the result. 0 on failure.
+ */
+CBOR_EXPORT size_t cbor_serialize_array(const cbor_item_t *, cbor_mutable_data,
+                                        size_t);
+
+/** Serialize a map
+ *
+ * @param item[borrow] A map
+ * @param buffer Buffer to serialize to
+ * @param buffer_size Size of the \p buffer
+ * @return Length of the result. 0 on failure.
+ */
+CBOR_EXPORT size_t cbor_serialize_map(const cbor_item_t *, cbor_mutable_data,
+                                      size_t);
+
+/** Serialize a tag
+ *
+ * @param item[borrow] A tag
+ * @param buffer Buffer to serialize to
+ * @param buffer_size Size of the \p buffer
+ * @return Length of the result. 0 on failure.
+ */
+CBOR_EXPORT size_t cbor_serialize_tag(const cbor_item_t *, cbor_mutable_data,
+                                      size_t);
+
+/** Serialize a
+ *
+ * @param item[borrow] A float or ctrl
+ * @param buffer Buffer to serialize to
+ * @param buffer_size Size of the \p buffer
+ * @return Length of the result. 0 on failure.
+ */
+CBOR_EXPORT size_t cbor_serialize_float_ctrl(const cbor_item_t *,
+                                             cbor_mutable_data, size_t);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // LIBCBOR_SERIALIZATION_H
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor/streaming.c mysql-8.0-8.0.27/extra/libcbor/src/cbor/streaming.c
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor/streaming.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor/streaming.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,667 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include "streaming.h"
+#include "internal/loaders.h"
+
+bool static _cbor_claim_bytes(size_t required, size_t provided,
+                              struct cbor_decoder_result *result) {
+  if (required > (provided - result->read)) {
+    /* We need to keep all the metadata if parsing is to be resumed */
+    result->read = 0;
+    result->status = CBOR_DECODER_NEDATA;
+    result->required = required;
+    return false;
+  } else {
+    result->read += required;
+    result->required = 0;
+    return true;
+  }
+}
+
+struct cbor_decoder_result cbor_stream_decode(
+    cbor_data source, size_t source_size,
+    const struct cbor_callbacks *callbacks, void *context) {
+  /* If we have no data, we cannot read even the MTB */
+  if (source_size < 1) {
+    return (struct cbor_decoder_result){0, CBOR_DECODER_EBUFFER};
+  }
+
+  /* If we have a byte, assume it's the MTB */
+  struct cbor_decoder_result result = {1, CBOR_DECODER_FINISHED};
+
+  switch (*source) {
+    case 0x00: /* Fallthrough */
+    case 0x01: /* Fallthrough */
+    case 0x02: /* Fallthrough */
+    case 0x03: /* Fallthrough */
+    case 0x04: /* Fallthrough */
+    case 0x05: /* Fallthrough */
+    case 0x06: /* Fallthrough */
+    case 0x07: /* Fallthrough */
+    case 0x08: /* Fallthrough */
+    case 0x09: /* Fallthrough */
+    case 0x0A: /* Fallthrough */
+    case 0x0B: /* Fallthrough */
+    case 0x0C: /* Fallthrough */
+    case 0x0D: /* Fallthrough */
+    case 0x0E: /* Fallthrough */
+    case 0x0F: /* Fallthrough */
+    case 0x10: /* Fallthrough */
+    case 0x11: /* Fallthrough */
+    case 0x12: /* Fallthrough */
+    case 0x13: /* Fallthrough */
+    case 0x14: /* Fallthrough */
+    case 0x15: /* Fallthrough */
+    case 0x16: /* Fallthrough */
+    case 0x17:
+      /* Embedded one byte unsigned integer */
+      {
+        callbacks->uint8(context, _cbor_load_uint8(source));
+        return result;
+      }
+    case 0x18:
+      /* One byte unsigned integer */
+      {
+        if (_cbor_claim_bytes(1, source_size, &result)) {
+          callbacks->uint8(context, _cbor_load_uint8(source + 1));
+        }
+        return result;
+      }
+    case 0x19:
+      /* Two bytes unsigned integer */
+      {
+        if (_cbor_claim_bytes(2, source_size, &result)) {
+          callbacks->uint16(context, _cbor_load_uint16(source + 1));
+        }
+        return result;
+      }
+    case 0x1A:
+      /* Four bytes unsigned integer */
+      {
+        if (_cbor_claim_bytes(4, source_size, &result)) {
+          callbacks->uint32(context, _cbor_load_uint32(source + 1));
+        }
+        return result;
+      }
+    case 0x1B:
+      /* Eight bytes unsigned integer */
+      {
+        if (_cbor_claim_bytes(8, source_size, &result)) {
+          callbacks->uint64(context, _cbor_load_uint64(source + 1));
+        }
+        return result;
+      }
+    case 0x1C: /* Fallthrough */
+    case 0x1D: /* Fallthrough */
+    case 0x1E: /* Fallthrough */
+    case 0x1F:
+      /* Reserved */
+      { return (struct cbor_decoder_result){0, CBOR_DECODER_ERROR}; }
+    case 0x20: /* Fallthrough */
+    case 0x21: /* Fallthrough */
+    case 0x22: /* Fallthrough */
+    case 0x23: /* Fallthrough */
+    case 0x24: /* Fallthrough */
+    case 0x25: /* Fallthrough */
+    case 0x26: /* Fallthrough */
+    case 0x27: /* Fallthrough */
+    case 0x28: /* Fallthrough */
+    case 0x29: /* Fallthrough */
+    case 0x2A: /* Fallthrough */
+    case 0x2B: /* Fallthrough */
+    case 0x2C: /* Fallthrough */
+    case 0x2D: /* Fallthrough */
+    case 0x2E: /* Fallthrough */
+    case 0x2F: /* Fallthrough */
+    case 0x30: /* Fallthrough */
+    case 0x31: /* Fallthrough */
+    case 0x32: /* Fallthrough */
+    case 0x33: /* Fallthrough */
+    case 0x34: /* Fallthrough */
+    case 0x35: /* Fallthrough */
+    case 0x36: /* Fallthrough */
+    case 0x37:
+      /* Embedded one byte negative integer */
+      {
+        callbacks->negint8(context,
+                           _cbor_load_uint8(source) - 0x20); /* 0x20 offset */
+        return result;
+      }
+    case 0x38:
+      /* One byte negative integer */
+      {
+        if (_cbor_claim_bytes(1, source_size, &result)) {
+          callbacks->negint8(context, _cbor_load_uint8(source + 1));
+        }
+        return result;
+      }
+    case 0x39:
+      /* Two bytes negative integer */
+      {
+        if (_cbor_claim_bytes(2, source_size, &result)) {
+          callbacks->negint16(context, _cbor_load_uint16(source + 1));
+        }
+        return result;
+      }
+    case 0x3A:
+      /* Four bytes negative integer */
+      {
+        if (_cbor_claim_bytes(4, source_size, &result)) {
+          callbacks->negint32(context, _cbor_load_uint32(source + 1));
+        }
+        return result;
+      }
+    case 0x3B:
+      /* Eight bytes negative integer */
+      {
+        if (_cbor_claim_bytes(8, source_size, &result)) {
+          callbacks->negint64(context, _cbor_load_uint64(source + 1));
+        }
+        return result;
+      }
+    case 0x3C: /* Fallthrough */
+    case 0x3D: /* Fallthrough */
+    case 0x3E: /* Fallthrough */
+    case 0x3F:
+      /* Reserved */
+      { return (struct cbor_decoder_result){0, CBOR_DECODER_ERROR}; }
+    case 0x40: /* Fallthrough */
+    case 0x41: /* Fallthrough */
+    case 0x42: /* Fallthrough */
+    case 0x43: /* Fallthrough */
+    case 0x44: /* Fallthrough */
+    case 0x45: /* Fallthrough */
+    case 0x46: /* Fallthrough */
+    case 0x47: /* Fallthrough */
+    case 0x48: /* Fallthrough */
+    case 0x49: /* Fallthrough */
+    case 0x4A: /* Fallthrough */
+    case 0x4B: /* Fallthrough */
+    case 0x4C: /* Fallthrough */
+    case 0x4D: /* Fallthrough */
+    case 0x4E: /* Fallthrough */
+    case 0x4F: /* Fallthrough */
+    case 0x50: /* Fallthrough */
+    case 0x51: /* Fallthrough */
+    case 0x52: /* Fallthrough */
+    case 0x53: /* Fallthrough */
+    case 0x54: /* Fallthrough */
+    case 0x55: /* Fallthrough */
+    case 0x56: /* Fallthrough */
+    case 0x57:
+      /* Embedded length byte string */
+      {
+        size_t length =
+            (size_t)_cbor_load_uint8(source) - 0x40; /* 0x40 offset */
+        if (_cbor_claim_bytes(length, source_size, &result)) {
+          callbacks->byte_string(context, source + 1, length);
+        }
+        return result;
+      }
+    case 0x58:
+      /* One byte length byte string */
+      // TODO template this?
+      {
+        if (_cbor_claim_bytes(1, source_size, &result)) {
+          size_t length = (size_t)_cbor_load_uint8(source + 1);
+          if (_cbor_claim_bytes(length, source_size, &result)) {
+            callbacks->byte_string(context, source + 1 + 1, length);
+          }
+        }
+        return result;
+      }
+    case 0x59:
+      /* Two bytes length byte string */
+      {
+        if (_cbor_claim_bytes(2, source_size, &result)) {
+          size_t length = (size_t)_cbor_load_uint16(source + 1);
+          if (_cbor_claim_bytes(length, source_size, &result)) {
+            callbacks->byte_string(context, source + 1 + 2, length);
+          }
+        }
+        return result;
+      }
+    case 0x5A:
+      /* Four bytes length byte string */
+      {
+        if (_cbor_claim_bytes(4, source_size, &result)) {
+          size_t length = (size_t)_cbor_load_uint32(source + 1);
+          if (_cbor_claim_bytes(length, source_size, &result)) {
+            callbacks->byte_string(context, source + 1 + 4, length);
+          }
+        }
+        return result;
+      }
+    case 0x5B:
+      /* Eight bytes length byte string */
+      {
+        if (_cbor_claim_bytes(8, source_size, &result)) {
+          size_t length = (size_t)_cbor_load_uint64(source + 1);
+          if (_cbor_claim_bytes(length, source_size, &result)) {
+            callbacks->byte_string(context, source + 1 + 8, length);
+          }
+        }
+        return result;
+      }
+    case 0x5C: /* Fallthrough */
+    case 0x5D: /* Fallthrough */
+    case 0x5E:
+      /* Reserved */
+      { return (struct cbor_decoder_result){0, CBOR_DECODER_ERROR}; }
+    case 0x5F:
+      /* Indefinite byte string */
+      {
+        callbacks->byte_string_start(context);
+        return result;
+      }
+    case 0x60: /* Fallthrough */
+    case 0x61: /* Fallthrough */
+    case 0x62: /* Fallthrough */
+    case 0x63: /* Fallthrough */
+    case 0x64: /* Fallthrough */
+    case 0x65: /* Fallthrough */
+    case 0x66: /* Fallthrough */
+    case 0x67: /* Fallthrough */
+    case 0x68: /* Fallthrough */
+    case 0x69: /* Fallthrough */
+    case 0x6A: /* Fallthrough */
+    case 0x6B: /* Fallthrough */
+    case 0x6C: /* Fallthrough */
+    case 0x6D: /* Fallthrough */
+    case 0x6E: /* Fallthrough */
+    case 0x6F: /* Fallthrough */
+    case 0x70: /* Fallthrough */
+    case 0x71: /* Fallthrough */
+    case 0x72: /* Fallthrough */
+    case 0x73: /* Fallthrough */
+    case 0x74: /* Fallthrough */
+    case 0x75: /* Fallthrough */
+    case 0x76: /* Fallthrough */
+    case 0x77:
+      /* Embedded one byte length string */
+      {
+        size_t length =
+            (size_t)_cbor_load_uint8(source) - 0x60; /* 0x60 offset */
+        if (_cbor_claim_bytes(length, source_size, &result)) {
+          callbacks->string(context, source + 1, length);
+        }
+        return result;
+      }
+    case 0x78:
+      /* One byte length string */
+      {
+        if (_cbor_claim_bytes(1, source_size, &result)) {
+          size_t length = (size_t)_cbor_load_uint8(source + 1);
+          if (_cbor_claim_bytes(length, source_size, &result)) {
+            callbacks->string(context, source + 1 + 1, length);
+          }
+        }
+        return result;
+      }
+    case 0x79:
+      /* Two bytes length string */
+      {
+        if (_cbor_claim_bytes(2, source_size, &result)) {
+          size_t length = (size_t)_cbor_load_uint16(source + 1);
+          if (_cbor_claim_bytes(length, source_size, &result)) {
+            callbacks->string(context, source + 1 + 2, length);
+          }
+        }
+        return result;
+      }
+    case 0x7A:
+      /* Four bytes length string */
+      {
+        if (_cbor_claim_bytes(4, source_size, &result)) {
+          size_t length = (size_t)_cbor_load_uint32(source + 1);
+          if (_cbor_claim_bytes(length, source_size, &result)) {
+            callbacks->string(context, source + 1 + 4, length);
+          }
+        }
+        return result;
+      }
+    case 0x7B:
+      /* Eight bytes length string */
+      {
+        if (_cbor_claim_bytes(8, source_size, &result)) {
+          size_t length = (size_t)_cbor_load_uint64(source + 1);
+          if (_cbor_claim_bytes(length, source_size, &result)) {
+            callbacks->string(context, source + 1 + 8, length);
+          }
+        }
+        return result;
+      }
+    case 0x7C: /* Fallthrough */
+    case 0x7D: /* Fallthrough */
+    case 0x7E:
+      /* Reserved */
+      { return (struct cbor_decoder_result){0, CBOR_DECODER_ERROR}; }
+    case 0x7F:
+      /* Indefinite length string */
+      {
+        callbacks->string_start(context);
+        return result;
+      }
+    case 0x80: /* Fallthrough */
+    case 0x81: /* Fallthrough */
+    case 0x82: /* Fallthrough */
+    case 0x83: /* Fallthrough */
+    case 0x84: /* Fallthrough */
+    case 0x85: /* Fallthrough */
+    case 0x86: /* Fallthrough */
+    case 0x87: /* Fallthrough */
+    case 0x88: /* Fallthrough */
+    case 0x89: /* Fallthrough */
+    case 0x8A: /* Fallthrough */
+    case 0x8B: /* Fallthrough */
+    case 0x8C: /* Fallthrough */
+    case 0x8D: /* Fallthrough */
+    case 0x8E: /* Fallthrough */
+    case 0x8F: /* Fallthrough */
+    case 0x90: /* Fallthrough */
+    case 0x91: /* Fallthrough */
+    case 0x92: /* Fallthrough */
+    case 0x93: /* Fallthrough */
+    case 0x94: /* Fallthrough */
+    case 0x95: /* Fallthrough */
+    case 0x96: /* Fallthrough */
+    case 0x97:
+      /* Embedded one byte length array */
+      {
+        callbacks->array_start(
+            context, (size_t)_cbor_load_uint8(source) - 0x80); /* 0x40 offset */
+        return result;
+      }
+    case 0x98:
+      /* One byte length array */
+      {
+        if (_cbor_claim_bytes(1, source_size, &result)) {
+          callbacks->array_start(context, (size_t)_cbor_load_uint8(source + 1));
+        }
+        return result;
+      }
+    case 0x99:
+      /* Two bytes length array */
+      {
+        if (_cbor_claim_bytes(2, source_size, &result)) {
+          callbacks->array_start(context,
+                                 (size_t)_cbor_load_uint16(source + 1));
+        }
+        return result;
+      }
+    case 0x9A:
+      /* Four bytes length array */
+      {
+        if (_cbor_claim_bytes(4, source_size, &result)) {
+          callbacks->array_start(context,
+                                 (size_t)_cbor_load_uint32(source + 1));
+        }
+        return result;
+      }
+    case 0x9B:
+      /* Eight bytes length array */
+      {
+        if (_cbor_claim_bytes(8, source_size, &result)) {
+          callbacks->array_start(context,
+                                 (size_t)_cbor_load_uint64(source + 1));
+        }
+        return result;
+      }
+    case 0x9C: /* Fallthrough */
+    case 0x9D: /* Fallthrough */
+    case 0x9E:
+      /* Reserved */
+      { return (struct cbor_decoder_result){0, CBOR_DECODER_ERROR}; }
+    case 0x9F:
+      /* Indefinite length array */
+      {
+        callbacks->indef_array_start(context);
+        return result;
+      }
+    case 0xA0: /* Fallthrough */
+    case 0xA1: /* Fallthrough */
+    case 0xA2: /* Fallthrough */
+    case 0xA3: /* Fallthrough */
+    case 0xA4: /* Fallthrough */
+    case 0xA5: /* Fallthrough */
+    case 0xA6: /* Fallthrough */
+    case 0xA7: /* Fallthrough */
+    case 0xA8: /* Fallthrough */
+    case 0xA9: /* Fallthrough */
+    case 0xAA: /* Fallthrough */
+    case 0xAB: /* Fallthrough */
+    case 0xAC: /* Fallthrough */
+    case 0xAD: /* Fallthrough */
+    case 0xAE: /* Fallthrough */
+    case 0xAF: /* Fallthrough */
+    case 0xB0: /* Fallthrough */
+    case 0xB1: /* Fallthrough */
+    case 0xB2: /* Fallthrough */
+    case 0xB3: /* Fallthrough */
+    case 0xB4: /* Fallthrough */
+    case 0xB5: /* Fallthrough */
+    case 0xB6: /* Fallthrough */
+    case 0xB7:
+      /* Embedded one byte length map */
+      {
+        callbacks->map_start(
+            context, (size_t)_cbor_load_uint8(source) - 0xA0); /* 0xA0 offset */
+        return result;
+      }
+    case 0xB8:
+      /* One byte length map */
+      {
+        if (_cbor_claim_bytes(1, source_size, &result)) {
+          callbacks->map_start(context, (size_t)_cbor_load_uint8(source + 1));
+        }
+        return result;
+      }
+    case 0xB9:
+      /* Two bytes length map */
+      {
+        if (_cbor_claim_bytes(2, source_size, &result)) {
+          callbacks->map_start(context, (size_t)_cbor_load_uint16(source + 1));
+        }
+        return result;
+      }
+    case 0xBA:
+      /* Four bytes length map */
+      {
+        if (_cbor_claim_bytes(4, source_size, &result)) {
+          callbacks->map_start(context, (size_t)_cbor_load_uint32(source + 1));
+        }
+        return result;
+      }
+    case 0xBB:
+      /* Eight bytes length map */
+      {
+        if (_cbor_claim_bytes(8, source_size, &result)) {
+          callbacks->map_start(context, (size_t)_cbor_load_uint64(source + 1));
+        }
+        return result;
+      }
+    case 0xBC: /* Fallthrough */
+    case 0xBD: /* Fallthrough */
+    case 0xBE:
+      /* Reserved */
+      { return (struct cbor_decoder_result){0, CBOR_DECODER_ERROR}; }
+    case 0xBF:
+      /* Indefinite length map */
+      {
+        callbacks->indef_map_start(context);
+        return result;
+      }
+    case 0xC0:
+      /* Text date/time - RFC 3339 tag, fallthrough */
+    case 0xC1:
+      /* Epoch date tag, fallthrough */
+    case 0xC2:
+      /* Positive bignum tag, fallthrough */
+    case 0xC3:
+      /* Negative bignum tag, fallthrough */
+    case 0xC4:
+      /* Fraction, fallthrough */
+    case 0xC5:
+      /* Big float */
+      {
+        callbacks->tag(context,
+                       _cbor_load_uint8(source) - 0xC0); /* 0xC0 offset */
+        return result;
+      }
+    case 0xC6: /* Fallthrough */
+    case 0xC7: /* Fallthrough */
+    case 0xC8: /* Fallthrough */
+    case 0xC9: /* Fallthrough */
+    case 0xCA: /* Fallthrough */
+    case 0xCB: /* Fallthrough */
+    case 0xCC: /* Fallthrough */
+    case 0xCD: /* Fallthrough */
+    case 0xCE: /* Fallthrough */
+    case 0xCF: /* Fallthrough */
+    case 0xD0: /* Fallthrough */
+    case 0xD1: /* Fallthrough */
+    case 0xD2: /* Fallthrough */
+    case 0xD3: /* Fallthrough */
+    case 0xD4: /* Unassigned tag value */
+    {
+      return (struct cbor_decoder_result){0, CBOR_DECODER_ERROR};
+    }
+    case 0xD5: /* Expected b64url conversion tag - fallthrough */
+    case 0xD6: /* Expected b64 conversion tag - fallthrough */
+    case 0xD7: /* Expected b16 conversion tag */
+    {
+      callbacks->tag(context,
+                     _cbor_load_uint8(source) - 0xC0); /* 0xC0 offset */
+      return result;
+    }
+    case 0xD8: /* 1B tag */
+    {
+      if (_cbor_claim_bytes(1, source_size, &result)) {
+        callbacks->tag(context, _cbor_load_uint8(source + 1));
+      }
+      return result;
+    }
+    case 0xD9: /* 2B tag */
+    {
+      if (_cbor_claim_bytes(2, source_size, &result)) {
+        callbacks->tag(context, _cbor_load_uint16(source + 1));
+      }
+      return result;
+    }
+    case 0xDA: /* 4B tag */
+    {
+      if (_cbor_claim_bytes(4, source_size, &result)) {
+        callbacks->tag(context, _cbor_load_uint32(source + 1));
+      }
+      return result;
+    }
+    case 0xDB: /* 8B tag */
+    {
+      if (_cbor_claim_bytes(8, source_size, &result)) {
+        callbacks->tag(context, _cbor_load_uint64(source + 1));
+      }
+      return result;
+    }
+    case 0xDC: /* Fallthrough */
+    case 0xDD: /* Fallthrough */
+    case 0xDE: /* Fallthrough */
+    case 0xDF: /* Reserved */
+    {
+      return (struct cbor_decoder_result){0, CBOR_DECODER_ERROR};
+    }
+    case 0xE0: /* Fallthrough */
+    case 0xE1: /* Fallthrough */
+    case 0xE2: /* Fallthrough */
+    case 0xE3: /* Fallthrough */
+    case 0xE4: /* Fallthrough */
+    case 0xE5: /* Fallthrough */
+    case 0xE6: /* Fallthrough */
+    case 0xE7: /* Fallthrough */
+    case 0xE8: /* Fallthrough */
+    case 0xE9: /* Fallthrough */
+    case 0xEA: /* Fallthrough */
+    case 0xEB: /* Fallthrough */
+    case 0xEC: /* Fallthrough */
+    case 0xED: /* Fallthrough */
+    case 0xEE: /* Fallthrough */
+    case 0xEF: /* Fallthrough */
+    case 0xF0: /* Fallthrough */
+    case 0xF1: /* Fallthrough */
+    case 0xF2: /* Fallthrough */
+    case 0xF3: /* Simple value - unassigned */
+    {
+      return (struct cbor_decoder_result){0, CBOR_DECODER_ERROR};
+    }
+    case 0xF4:
+      /* False */
+      {
+        callbacks->boolean(context, false);
+        return result;
+      }
+    case 0xF5:
+      /* True */
+      {
+        callbacks->boolean(context, true);
+        return result;
+      }
+    case 0xF6:
+      /* Null */
+      {
+        callbacks->null(context);
+        return result;
+      }
+    case 0xF7:
+      /* Undefined */
+      {
+        callbacks->undefined(context);
+        return result;
+      }
+    case 0xF8:
+      /* 1B simple value, unassigned */
+      { return (struct cbor_decoder_result){0, CBOR_DECODER_ERROR}; }
+    case 0xF9:
+      /* 2B float */
+      {
+        if (_cbor_claim_bytes(2, source_size, &result)) {
+          callbacks->float2(context, _cbor_load_half(source + 1));
+        }
+        return result;
+      }
+    case 0xFA:
+      /* 4B float */
+      {
+        if (_cbor_claim_bytes(4, source_size, &result)) {
+          callbacks->float4(context, _cbor_load_float(source + 1));
+        }
+        return result;
+      }
+    case 0xFB:
+      /* 8B float */
+      {
+        if (_cbor_claim_bytes(8, source_size, &result)) {
+          callbacks->float8(context, _cbor_load_double(source + 1));
+        }
+        return result;
+      }
+    case 0xFC: /* Fallthrough */
+    case 0xFD: /* Fallthrough */
+    case 0xFE:
+      /* Reserved */
+      { return (struct cbor_decoder_result){0, CBOR_DECODER_ERROR}; }
+    case 0xFF:
+      /* Break */
+      {
+        callbacks->indef_break(context);
+        return result;
+      }
+    default: /* Never happens - this shuts up the compiler */
+    {
+      return result;
+    }
+  }
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor/streaming.h mysql-8.0-8.0.27/extra/libcbor/src/cbor/streaming.h
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor/streaming.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor/streaming.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#ifndef LIBCBOR_STREAMING_H
+#define LIBCBOR_STREAMING_H
+
+#include "callbacks.h"
+#include "cbor/cbor_export.h"
+#include "cbor/common.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** Stateless decoder
+ *
+ * Will try parsing the \p buffer and will invoke the appropriate callback on
+ * success. Decodes one item at a time. No memory allocations occur.
+ *
+ * @param buffer Input buffer
+ * @param buffer_size Length of the buffer
+ * @param callbacks The callback bundle
+ * @param context An arbitrary pointer to allow for maintaining context.
+ */
+CBOR_EXPORT struct cbor_decoder_result cbor_stream_decode(
+    cbor_data buffer, size_t buffer_size,
+    const struct cbor_callbacks* callbacks, void* context);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // LIBCBOR_STREAMING_H
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor/strings.c mysql-8.0-8.0.27/extra/libcbor/src/cbor/strings.c
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor/strings.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor/strings.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include "strings.h"
+#include <string.h>
+#include "internal/memory_utils.h"
+
+cbor_item_t *cbor_new_definite_string() {
+  cbor_item_t *item = _CBOR_MALLOC(sizeof(cbor_item_t));
+  _CBOR_NOTNULL(item);
+  *item = (cbor_item_t){
+      .refcount = 1,
+      .type = CBOR_TYPE_STRING,
+      .metadata = {.string_metadata = {_CBOR_METADATA_DEFINITE, 0}}};
+  return item;
+}
+
+cbor_item_t *cbor_new_indefinite_string() {
+  cbor_item_t *item = _CBOR_MALLOC(sizeof(cbor_item_t));
+  _CBOR_NOTNULL(item);
+  *item = (cbor_item_t){
+      .refcount = 1,
+      .type = CBOR_TYPE_STRING,
+      .metadata = {.string_metadata = {.type = _CBOR_METADATA_INDEFINITE,
+                                       .length = 0}},
+      .data = _CBOR_MALLOC(sizeof(struct cbor_indefinite_string_data))};
+  _CBOR_DEPENDENT_NOTNULL(item, item->data);
+  *((struct cbor_indefinite_string_data *)item->data) =
+      (struct cbor_indefinite_string_data){
+          .chunk_count = 0,
+          .chunk_capacity = 0,
+          .chunks = NULL,
+      };
+  return item;
+}
+
+cbor_item_t *cbor_build_string(const char *val) {
+  cbor_item_t *item = cbor_new_definite_string();
+  _CBOR_NOTNULL(item);
+  size_t len = strlen(val);
+  unsigned char *handle = _CBOR_MALLOC(len);
+  _CBOR_DEPENDENT_NOTNULL(item, handle);
+  memcpy(handle, val, len);
+  cbor_string_set_handle(item, handle, len);
+  return item;
+}
+
+cbor_item_t *cbor_build_stringn(const char *val, size_t length) {
+  cbor_item_t *item = cbor_new_definite_string();
+  _CBOR_NOTNULL(item);
+  unsigned char *handle = _CBOR_MALLOC(length);
+  _CBOR_DEPENDENT_NOTNULL(item, handle);
+  memcpy(handle, val, length);
+  cbor_string_set_handle(item, handle, length);
+  return item;
+}
+
+void cbor_string_set_handle(cbor_item_t *item,
+                            cbor_mutable_data CBOR_RESTRICT_POINTER data,
+                            size_t length) {
+  assert(cbor_isa_string(item));
+  assert(cbor_string_is_definite(item));
+  item->data = data;
+  item->metadata.string_metadata.length = length;
+}
+
+cbor_item_t **cbor_string_chunks_handle(const cbor_item_t *item) {
+  assert(cbor_isa_string(item));
+  assert(cbor_string_is_indefinite(item));
+  return ((struct cbor_indefinite_string_data *)item->data)->chunks;
+}
+
+size_t cbor_string_chunk_count(const cbor_item_t *item) {
+  assert(cbor_isa_string(item));
+  assert(cbor_string_is_indefinite(item));
+  return ((struct cbor_indefinite_string_data *)item->data)->chunk_count;
+}
+
+bool cbor_string_add_chunk(cbor_item_t *item, cbor_item_t *chunk) {
+  assert(cbor_isa_string(item));
+  assert(cbor_string_is_indefinite(item));
+  struct cbor_indefinite_string_data *data =
+      (struct cbor_indefinite_string_data *)item->data;
+  if (data->chunk_count == data->chunk_capacity) {
+    // TODO: Add a test for this
+    if (!_cbor_safe_to_multiply(CBOR_BUFFER_GROWTH, data->chunk_capacity)) {
+      return false;
+    }
+
+    size_t new_chunk_capacity =
+        data->chunk_capacity == 0 ? 1
+                                  : CBOR_BUFFER_GROWTH * (data->chunk_capacity);
+    cbor_item_t **new_chunks_data = _cbor_realloc_multiple(
+        data->chunks, sizeof(cbor_item_t *), new_chunk_capacity);
+
+    if (new_chunks_data == NULL) {
+      return false;
+    }
+
+    data->chunk_capacity = new_chunk_capacity;
+    data->chunks = new_chunks_data;
+  }
+  data->chunks[data->chunk_count++] = cbor_incref(chunk);
+  return true;
+}
+
+size_t cbor_string_length(const cbor_item_t *item) {
+  assert(cbor_isa_string(item));
+  return item->metadata.string_metadata.length;
+}
+
+unsigned char *cbor_string_handle(const cbor_item_t *item) {
+  assert(cbor_isa_string(item));
+  return item->data;
+}
+
+size_t cbor_string_codepoint_count(const cbor_item_t *item) {
+  assert(cbor_isa_string(item));
+  return item->metadata.string_metadata.codepoint_count;
+}
+
+bool cbor_string_is_definite(const cbor_item_t *item) {
+  assert(cbor_isa_string(item));
+  return item->metadata.string_metadata.type == _CBOR_METADATA_DEFINITE;
+}
+
+bool cbor_string_is_indefinite(const cbor_item_t *item) {
+  return !cbor_string_is_definite(item);
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor/strings.h mysql-8.0-8.0.27/extra/libcbor/src/cbor/strings.h
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor/strings.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor/strings.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#ifndef LIBCBOR_STRINGS_H
+#define LIBCBOR_STRINGS_H
+
+#include "cbor/cbor_export.h"
+#include "cbor/common.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * ============================================================================
+ * String manipulation
+ * ============================================================================
+ */
+
+/** Returns the length of the underlying string
+ *
+ * For definite strings only
+ *
+ * @param item[borrow] a definite string
+ * @return length of the string. Zero if no chunk has been attached yet
+ */
+CBOR_EXPORT size_t cbor_string_length(const cbor_item_t *item);
+
+/** The number of codepoints in this string
+ *
+ * Might differ from length if there are multibyte ones
+ *
+ * @param item[borrow] A string
+ * @return The number of codepoints in this string
+ */
+CBOR_EXPORT size_t cbor_string_codepoint_count(const cbor_item_t *item);
+
+/** Is the string definite?
+ *
+ * @param item[borrow] a string
+ * @return Is the string definite?
+ */
+CBOR_EXPORT bool cbor_string_is_definite(const cbor_item_t *item);
+
+/** Is the string indefinite?
+ *
+ * @param item[borrow] a string
+ * @return Is the string indefinite?
+ */
+CBOR_EXPORT bool cbor_string_is_indefinite(const cbor_item_t *item);
+
+/** Get the handle to the underlying string
+ *
+ * Definite items only. Modifying the data is allowed. In that case, the caller
+ * takes responsibility for the effect on items this item might be a part of
+ *
+ * @param item[borrow] A definite string
+ * @return The address of the underlying string. `NULL` if no data have been
+ * assigned yet.
+ */
+CBOR_EXPORT cbor_mutable_data cbor_string_handle(const cbor_item_t *item);
+
+/** Set the handle to the underlying string
+ *
+ *
+ * \rst
+ * .. warning:: Using a pointer to a stack allocated constant is a common
+ * mistake. Lifetime of the string will expire when it goes out of scope and the
+ * CBOR item will be left inconsistent. \endrst
+ *
+ * @param item[borrow] A definite string
+ * @param data The memory block. The caller gives up the ownership of the block.
+ * libcbor will deallocate it when appropriate using its free function
+ * @param length Length of the data block
+ */
+CBOR_EXPORT void cbor_string_set_handle(
+    cbor_item_t *item, cbor_mutable_data CBOR_RESTRICT_POINTER data,
+    size_t length);
+
+/** Get the handle to the array of chunks
+ *
+ * Manipulations with the memory block (e.g. sorting it) are allowed, but the
+ * validity and the number of chunks must be retained.
+ *
+ * @param item[borrow] A indefinite string
+ * @return array of #cbor_string_chunk_count definite strings
+ */
+CBOR_EXPORT cbor_item_t **cbor_string_chunks_handle(const cbor_item_t *item);
+
+/** Get the number of chunks this string consist of
+ *
+ * @param item[borrow] A indefinite string
+ * @return The chunk count. 0 for freshly created items.
+ */
+CBOR_EXPORT size_t cbor_string_chunk_count(const cbor_item_t *item);
+
+/** Appends a chunk to the string
+ *
+ * Indefinite strings only.
+ *
+ * May realloc the chunk storage.
+ *
+ * @param item[borrow] An indefinite string
+ * @param item[incref] A definite string
+ * @return true on success. false on realloc failure. In that case, the refcount
+ * of `chunk` is not increased and the `item` is left intact.
+ */
+CBOR_EXPORT bool cbor_string_add_chunk(cbor_item_t *item, cbor_item_t *chunk);
+
+/** Creates a new definite string
+ *
+ * The handle is initialized to `NULL` and length to 0
+ *
+ * @return **new** definite string. `NULL` on malloc failure.
+ */
+CBOR_EXPORT cbor_item_t *cbor_new_definite_string();
+
+/** Creates a new indefinite string
+ *
+ * The chunks array is initialized to `NULL` and chunkcount to 0
+ *
+ * @return **new** indefinite string. `NULL` on malloc failure.
+ */
+CBOR_EXPORT cbor_item_t *cbor_new_indefinite_string();
+
+/** Creates a new string and initializes it
+ *
+ * The `val` will be copied to a newly allocated block
+ *
+ * @param val A null-terminated UTF-8 string
+ * @return A **new** string with content `handle`. `NULL` on malloc failure.
+ */
+CBOR_EXPORT cbor_item_t *cbor_build_string(const char *val);
+
+/** Creates a new string and initializes it
+ *
+ * The `handle` will be copied to a newly allocated block
+ *
+ * @param val A UTF-8 string, at least \p length long (excluding the null byte)
+ * @return A **new** string with content `handle`. `NULL` on malloc failure.
+ */
+CBOR_EXPORT cbor_item_t *cbor_build_stringn(const char *val, size_t length);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // LIBCBOR_STRINGS_H
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor/tags.c mysql-8.0-8.0.27/extra/libcbor/src/cbor/tags.c
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor/tags.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor/tags.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include "tags.h"
+
+cbor_item_t *cbor_new_tag(uint64_t value) {
+  cbor_item_t *item = _CBOR_MALLOC(sizeof(cbor_item_t));
+  _CBOR_NOTNULL(item);
+
+  *item = (cbor_item_t){
+      .refcount = 1,
+      .type = CBOR_TYPE_TAG,
+      .metadata = {.tag_metadata = {.value = value, .tagged_item = NULL}},
+      .data = NULL /* Never used */
+  };
+  return item;
+}
+
+cbor_item_t *cbor_tag_item(const cbor_item_t *item) {
+  assert(cbor_isa_tag(item));
+  return cbor_incref(item->metadata.tag_metadata.tagged_item);
+}
+
+uint64_t cbor_tag_value(const cbor_item_t *item) {
+  assert(cbor_isa_tag(item));
+  return item->metadata.tag_metadata.value;
+}
+
+void cbor_tag_set_item(cbor_item_t *item, cbor_item_t *tagged_item) {
+  assert(cbor_isa_tag(item));
+  cbor_incref(tagged_item);
+  item->metadata.tag_metadata.tagged_item = tagged_item;
+}
+
+cbor_item_t *cbor_build_tag(uint64_t value, cbor_item_t *item) {
+  cbor_item_t *res = cbor_new_tag(value);
+  cbor_tag_set_item(res, item);
+  return res;
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor/tags.h mysql-8.0-8.0.27/extra/libcbor/src/cbor/tags.h
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor/tags.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor/tags.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#ifndef LIBCBOR_TAGS_H
+#define LIBCBOR_TAGS_H
+
+#include "cbor/cbor_export.h"
+#include "cbor/common.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * ============================================================================
+ * Tag manipulation
+ * ============================================================================
+ */
+
+/** Create a new tag
+ *
+ * @param value The tag value. Please consult the tag repository
+ * @return **new** tag. Item reference is `NULL`. Returns `NULL` upon
+ * 	memory allocation failure
+ */
+CBOR_EXPORT cbor_item_t *cbor_new_tag(uint64_t value);
+
+/** Get the tagged item
+ *
+ * @param item[borrow] A tag
+ * @return **incref** the tagged item
+ */
+CBOR_EXPORT cbor_item_t *cbor_tag_item(const cbor_item_t *item);
+
+/** Get tag value
+ *
+ * @param item[borrow] A tag
+ * @return The tag value. Please consult the tag repository
+ */
+CBOR_EXPORT uint64_t cbor_tag_value(const cbor_item_t *item);
+
+/** Set the tagged item
+ *
+ * @param item[borrow] A tag
+ * @param tagged_item[incref] The item to tag
+ */
+CBOR_EXPORT void cbor_tag_set_item(cbor_item_t *item, cbor_item_t *tagged_item);
+
+/** Build a new tag
+ *
+ * @param item[incref] The tagee
+ * @param value Tag value
+ * @return **new** tag item
+ */
+CBOR_EXPORT cbor_item_t *cbor_build_tag(uint64_t value, cbor_item_t *item);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // LIBCBOR_TAGS_H
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor.c mysql-8.0-8.0.27/extra/libcbor/src/cbor.c
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,345 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include "cbor.h"
+#include "cbor/internal/builder_callbacks.h"
+#include "cbor/internal/loaders.h"
+
+cbor_item_t *cbor_load(cbor_data source, size_t source_size,
+                       struct cbor_load_result *result) {
+  /* Context stack */
+  static struct cbor_callbacks callbacks = {
+      .uint8 = &cbor_builder_uint8_callback,
+      .uint16 = &cbor_builder_uint16_callback,
+      .uint32 = &cbor_builder_uint32_callback,
+      .uint64 = &cbor_builder_uint64_callback,
+
+      .negint8 = &cbor_builder_negint8_callback,
+      .negint16 = &cbor_builder_negint16_callback,
+      .negint32 = &cbor_builder_negint32_callback,
+      .negint64 = &cbor_builder_negint64_callback,
+
+      .byte_string = &cbor_builder_byte_string_callback,
+      .byte_string_start = &cbor_builder_byte_string_start_callback,
+
+      .string = &cbor_builder_string_callback,
+      .string_start = &cbor_builder_string_start_callback,
+
+      .array_start = &cbor_builder_array_start_callback,
+      .indef_array_start = &cbor_builder_indef_array_start_callback,
+
+      .map_start = &cbor_builder_map_start_callback,
+      .indef_map_start = &cbor_builder_indef_map_start_callback,
+
+      .tag = &cbor_builder_tag_callback,
+
+      .null = &cbor_builder_null_callback,
+      .undefined = &cbor_builder_undefined_callback,
+      .boolean = &cbor_builder_boolean_callback,
+      .float2 = &cbor_builder_float2_callback,
+      .float4 = &cbor_builder_float4_callback,
+      .float8 = &cbor_builder_float8_callback,
+      .indef_break = &cbor_builder_indef_break_callback};
+
+  if (source_size == 0) {
+    result->error.code = CBOR_ERR_NODATA;
+    return NULL;
+  }
+  struct _cbor_stack stack = _cbor_stack_init();
+
+  /* Target for callbacks */
+  struct _cbor_decoder_context context = (struct _cbor_decoder_context){
+      .stack = &stack, .creation_failed = false, .syntax_error = false};
+  struct cbor_decoder_result decode_result;
+  *result =
+      (struct cbor_load_result){.read = 0, .error = {.code = CBOR_ERR_NONE}};
+
+  do {
+    if (source_size > result->read) { /* Check for overflows */
+      decode_result =
+          cbor_stream_decode(source + result->read, source_size - result->read,
+                             &callbacks, &context);
+    } else {
+      result->error = (struct cbor_error){.code = CBOR_ERR_NOTENOUGHDATA,
+                                          .position = result->read};
+      goto error;
+    }
+
+    switch (decode_result.status) {
+      case CBOR_DECODER_FINISHED:
+        /* Everything OK */
+        {
+          result->read += decode_result.read;
+          break;
+        }
+      case CBOR_DECODER_NEDATA:
+        /* Data length doesn't match MTB expectation */
+        {
+          result->error.code = CBOR_ERR_NOTENOUGHDATA;
+          goto error;
+        }
+      case CBOR_DECODER_EBUFFER:
+        /* Fallthrough */
+      case CBOR_DECODER_ERROR:
+        /* Reserved/malformated item */
+        {
+          result->error.code = CBOR_ERR_MALFORMATED;
+          goto error;
+        }
+    }
+
+    if (context.creation_failed) {
+      /* Most likely unsuccessful allocation - our callback has failed */
+      result->error.code = CBOR_ERR_MEMERROR;
+      goto error;
+    } else if (context.syntax_error) {
+      result->error.code = CBOR_ERR_SYNTAXERROR;
+      goto error;
+    }
+  } while (stack.size > 0);
+
+  /* Move the result before free */
+  cbor_item_t *result_item = context.root;
+  return result_item;
+
+error:
+  result->error.position = result->read;
+  // debug_print("Failed with decoder error %d at %d\n", result->error.code,
+  // result->error.position); cbor_describe(stack.top->item, stdout);
+  /* Free the stack */
+  while (stack.size > 0) {
+    cbor_decref(&stack.top->item);
+    _cbor_stack_pop(&stack);
+  }
+  return NULL;
+}
+
+static cbor_item_t *_cbor_copy_int(cbor_item_t *item, bool negative) {
+  cbor_item_t *res;
+  switch (cbor_int_get_width(item)) {
+    case CBOR_INT_8:
+      res = cbor_build_uint8(cbor_get_uint8(item));
+      break;
+    case CBOR_INT_16:
+      res = cbor_build_uint16(cbor_get_uint16(item));
+      break;
+    case CBOR_INT_32:
+      res = cbor_build_uint32(cbor_get_uint32(item));
+      break;
+    case CBOR_INT_64:
+      res = cbor_build_uint64(cbor_get_uint64(item));
+      break;
+    default:
+      return NULL;
+  }
+
+  if (negative) cbor_mark_negint(res);
+
+  return res;
+}
+
+static cbor_item_t *_cbor_copy_float_ctrl(cbor_item_t *item) {
+  switch (cbor_float_get_width(item)) {
+    case CBOR_FLOAT_0:
+      return cbor_build_ctrl(cbor_ctrl_value(item));
+    case CBOR_FLOAT_16:
+      return cbor_build_float2(cbor_float_get_float2(item));
+    case CBOR_FLOAT_32:
+      return cbor_build_float4(cbor_float_get_float4(item));
+    case CBOR_FLOAT_64:
+      return cbor_build_float8(cbor_float_get_float8(item));
+  }
+
+  return NULL;
+}
+
+cbor_item_t *cbor_copy(cbor_item_t *item) {
+  switch (cbor_typeof(item)) {
+    case CBOR_TYPE_UINT:
+      return _cbor_copy_int(item, false);
+    case CBOR_TYPE_NEGINT:
+      return _cbor_copy_int(item, true);
+    case CBOR_TYPE_BYTESTRING:
+      if (cbor_bytestring_is_definite(item)) {
+        return cbor_build_bytestring(cbor_bytestring_handle(item),
+                                     cbor_bytestring_length(item));
+      } else {
+        cbor_item_t *res = cbor_new_indefinite_bytestring();
+        for (size_t i = 0; i < cbor_bytestring_chunk_count(item); i++)
+          cbor_bytestring_add_chunk(
+              res,
+              cbor_move(cbor_copy(cbor_bytestring_chunks_handle(item)[i])));
+        return res;
+      }
+    case CBOR_TYPE_STRING:
+      if (cbor_string_is_definite(item)) {
+        return cbor_build_stringn((const char *)cbor_string_handle(item),
+                                  cbor_string_length(item));
+      } else {
+        cbor_item_t *res = cbor_new_indefinite_string();
+        for (size_t i = 0; i < cbor_string_chunk_count(item); i++)
+          cbor_string_add_chunk(
+              res, cbor_move(cbor_copy(cbor_string_chunks_handle(item)[i])));
+        return res;
+      }
+    case CBOR_TYPE_ARRAY: {
+      cbor_item_t *res;
+      if (cbor_array_is_definite(item))
+        res = cbor_new_definite_array(cbor_array_size(item));
+      else
+        res = cbor_new_indefinite_array();
+
+      for (size_t i = 0; i < cbor_array_size(item); i++)
+        cbor_array_push(
+            res, cbor_move(cbor_copy(cbor_move(cbor_array_get(item, i)))));
+      return res;
+    }
+    case CBOR_TYPE_MAP: {
+      cbor_item_t *res;
+      if (cbor_map_is_definite(item))
+        res = cbor_new_definite_map(cbor_map_size(item));
+      else
+        res = cbor_new_indefinite_map();
+
+      struct cbor_pair *it = cbor_map_handle(item);
+      for (size_t i = 0; i < cbor_map_size(item); i++)
+        cbor_map_add(res, (struct cbor_pair){
+                              .key = cbor_move(cbor_copy(it[i].key)),
+                              .value = cbor_move(cbor_copy(it[i].value))});
+      return res;
+    }
+    case CBOR_TYPE_TAG:
+      return cbor_build_tag(
+          cbor_tag_value(item),
+          cbor_move(cbor_copy(cbor_move(cbor_tag_item(item)))));
+    case CBOR_TYPE_FLOAT_CTRL:
+      return _cbor_copy_float_ctrl(item);
+  }
+
+  return NULL;
+}
+
+#if CBOR_PRETTY_PRINTER
+
+#include <inttypes.h>
+#include <locale.h>
+#include <stdlib.h>
+#include <wchar.h>
+
+static int _pow(int b, int ex) {
+  if (ex == 0) return 1;
+  int res = b;
+  while (--ex > 0) res *= b;
+  return res;
+}
+
+static void _cbor_nested_describe(cbor_item_t *item, FILE *out, int indent) {
+  setlocale(LC_ALL, "");
+  switch (cbor_typeof(item)) {
+    case CBOR_TYPE_UINT: {
+      fprintf(out, "%*s[CBOR_TYPE_UINT] ", indent, " ");
+      fprintf(out, "Width: %dB, ", _pow(2, cbor_int_get_width(item)));
+      fprintf(out, "Value: %" PRIu64 "\n", cbor_get_int(item));
+      break;
+    };
+    case CBOR_TYPE_NEGINT: {
+      fprintf(out, "%*s[CBOR_TYPE_NEGINT] ", indent, " ");
+      fprintf(out, "Width: %dB, ", _pow(2, cbor_int_get_width(item)));
+      fprintf(out, "Value: -%" PRIu64 " -1\n", cbor_get_int(item));
+      break;
+    };
+    case CBOR_TYPE_BYTESTRING: {
+      fprintf(out, "%*s[CBOR_TYPE_BYTESTRING] ", indent, " ");
+      if (cbor_bytestring_is_indefinite(item)) {
+        fprintf(out, "Indefinite, with %zu chunks:\n",
+                cbor_bytestring_chunk_count(item));
+        for (size_t i = 0; i < cbor_bytestring_chunk_count(item); i++)
+          _cbor_nested_describe(cbor_bytestring_chunks_handle(item)[i], out,
+                                indent + 4);
+      } else {
+        fprintf(out, "Definite, length %zuB\n", cbor_bytestring_length(item));
+      }
+      break;
+    };
+    case CBOR_TYPE_STRING: {
+      fprintf(out, "%*s[CBOR_TYPE_STRING] ", indent, " ");
+      if (cbor_string_is_indefinite(item)) {
+        fprintf(out, "Indefinite, with %zu chunks:\n",
+                cbor_string_chunk_count(item));
+        for (size_t i = 0; i < cbor_string_chunk_count(item); i++)
+          _cbor_nested_describe(cbor_string_chunks_handle(item)[i], out,
+                                indent + 4);
+      } else {
+        fprintf(out, "Definite, length %zuB, %zu codepoints\n",
+                cbor_string_length(item), cbor_string_codepoint_count(item));
+        /* Careful - this doesn't support multibyte characters! */
+        /* Printing those is out of the scope of this demo :) */
+        /* libICU is your friend */
+        fprintf(out, "%*s", indent + 4, " ");
+        /* XXX: no null at the end -> confused vprintf */
+        fwrite(cbor_string_handle(item), (int)cbor_string_length(item), 1, out);
+        fprintf(out, "\n");
+      }
+      break;
+    };
+    case CBOR_TYPE_ARRAY: {
+      fprintf(out, "%*s[CBOR_TYPE_ARRAY] ", indent, " ");
+      if (cbor_array_is_definite(item)) {
+        fprintf(out, "Definite, size: %zu\n", cbor_array_size(item));
+      } else {
+        fprintf(out, "Indefinite, size:  %zu\n", cbor_array_size(item));
+      }
+
+      for (size_t i = 0; i < cbor_array_size(item); i++)
+        _cbor_nested_describe(cbor_array_handle(item)[i], out, indent + 4);
+      break;
+    };
+    case CBOR_TYPE_MAP: {
+      fprintf(out, "%*s[CBOR_TYPE_MAP] ", indent, " ");
+      if (cbor_map_is_definite(item)) {
+        fprintf(out, "Definite, size: %zu\n", cbor_map_size(item));
+      } else {
+        fprintf(out, "Indefinite, size:  %zu\n", cbor_map_size(item));
+      }
+
+      for (size_t i = 0; i < cbor_map_size(item); i++) {
+        _cbor_nested_describe(cbor_map_handle(item)[i].key, out, indent + 4);
+        _cbor_nested_describe(cbor_map_handle(item)[i].value, out, indent + 4);
+      }
+      break;
+    };
+    case CBOR_TYPE_TAG: {
+      fprintf(out, "%*s[CBOR_TYPE_TAG] ", indent, " ");
+      fprintf(out, "Value: %" PRIu64 "\n", cbor_tag_value(item));
+      _cbor_nested_describe(cbor_move(cbor_tag_item(item)), out, indent + 4);
+      break;
+    };
+    case CBOR_TYPE_FLOAT_CTRL: {
+      fprintf(out, "%*s[CBOR_TYPE_FLOAT_CTRL] ", indent, " ");
+      if (cbor_float_ctrl_is_ctrl(item)) {
+        if (cbor_is_bool(item))
+          fprintf(out, "Bool: %s\n", cbor_get_bool(item) ? "true" : "false");
+        else if (cbor_is_undef(item))
+          fprintf(out, "Undefined\n");
+        else if (cbor_is_null(item))
+          fprintf(out, "Null\n");
+        else
+          fprintf(out, "Simple value %d\n", cbor_ctrl_value(item));
+      } else {
+        fprintf(out, "Width: %dB, ", _pow(2, cbor_float_get_width(item)));
+        fprintf(out, "value: %lf\n", cbor_float_get_float(item));
+      }
+      break;
+    };
+  }
+}
+
+void cbor_describe(cbor_item_t *item, FILE *out) {
+  _cbor_nested_describe(item, out, 0);
+}
+
+#endif
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/cbor.h mysql-8.0-8.0.27/extra/libcbor/src/cbor.h
--- mysql-8.0-8.0.26/extra/libcbor/src/cbor.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/cbor.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#ifndef LIBCBOR_H_
+#define LIBCBOR_H_
+
+#include "cbor/common.h"
+#include "cbor/data.h"
+
+#include "cbor/arrays.h"
+#include "cbor/bytestrings.h"
+#include "cbor/floats_ctrls.h"
+#include "cbor/ints.h"
+#include "cbor/maps.h"
+#include "cbor/strings.h"
+#include "cbor/tags.h"
+
+#include "cbor/callbacks.h"
+#include "cbor/cbor_export.h"
+#include "cbor/encoding.h"
+#include "cbor/serialization.h"
+#include "cbor/streaming.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * ============================================================================
+ * High level decoding
+ * ============================================================================
+ */
+
+/** Loads data item from a buffer
+ *
+ * @param source The buffer
+ * @param source_size
+ * @param result[out] Result indicator. #CBOR_ERR_NONE on success
+ * @return **new** CBOR item or `NULL` on failure. In that case, \p result
+ * contains location and description of the error.
+ */
+CBOR_EXPORT cbor_item_t* cbor_load(cbor_data source, size_t source_size,
+                                   struct cbor_load_result* result);
+
+/** Deep copy of an item
+ *
+ * All the reference counts in the new structure are set to one.
+ *
+ * @param item[borrow] item to copy
+ * @return **new** CBOR deep copy
+ */
+CBOR_EXPORT cbor_item_t* cbor_copy(cbor_item_t* item);
+
+#if CBOR_PRETTY_PRINTER
+#include <stdio.h>
+
+CBOR_EXPORT void cbor_describe(cbor_item_t* item, FILE* out);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // LIBCBOR_H_
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/CMakeLists.txt mysql-8.0-8.0.27/extra/libcbor/src/CMakeLists.txt
--- mysql-8.0-8.0.26/extra/libcbor/src/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,17 @@
+set(SOURCES cbor.c cbor/streaming.c cbor/internal/encoders.c cbor/internal/builder_callbacks.c cbor/internal/loaders.c cbor/internal/memory_utils.c cbor/internal/stack.c cbor/internal/unicode.c cbor/encoding.c cbor/serialization.c cbor/arrays.c cbor/common.c cbor/floats_ctrls.c cbor/bytestrings.c cbor/callbacks.c cbor/strings.c cbor/maps.c cbor/tags.c cbor/ints.c)
+
+include(GNUInstallDirs)
+set(CMAKE_SKIP_BUILD_RPATH FALSE)
+
+add_library(cbor STATIC ${SOURCES})
+
+target_include_directories(cbor PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+
+include(GenerateExportHeader)
+generate_export_header(cbor EXPORT_FILE_NAME ${CMAKE_CURRENT_BINARY_DIR}/cbor/cbor_export.h)
+target_include_directories(cbor PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
+
+set_target_properties(cbor PROPERTIES
+		VERSION ${CBOR_VERSION}
+		MACHO_COMPATIBILITY_VERSION ${CBOR_VERSION_MAJOR}.${CBOR_VERSION_MINOR}.0
+		SOVERSION ${CBOR_VERSION_MAJOR}.${CBOR_VERSION_MINOR})
diff -Nru mysql-8.0-8.0.26/extra/libcbor/src/libcbor.pc.in mysql-8.0-8.0.27/extra/libcbor/src/libcbor.pc.in
--- mysql-8.0-8.0.26/extra/libcbor/src/libcbor.pc.in	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/src/libcbor.pc.in	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,11 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+includedir=${prefix}/include
+
+Name: @PROJECT_NAME@
+Description: @PROJECT_NAME@ - CBOR protocol implementation
+URL: https://github.com/PJK/libcbor
+Version: @CBOR_VERSION@
+Libs: -L${libdir} -lcbor
+Cflags: -I${includedir}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/test/assertions.c mysql-8.0-8.0.27/extra/libcbor/test/assertions.c
--- mysql-8.0-8.0.26/extra/libcbor/test/assertions.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/test/assertions.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include "assertions.h"
+
+void assert_uint8(cbor_item_t* item, uint8_t num) {
+  assert_true(cbor_isa_uint(item));
+  assert_true(cbor_int_get_width(item) == CBOR_INT_8);
+  assert_true(cbor_get_uint8(item) == num);
+}
+
+void assert_uint16(cbor_item_t* item, uint16_t num) {
+  assert_true(cbor_isa_uint(item));
+  assert_true(cbor_int_get_width(item) == CBOR_INT_16);
+  assert_true(cbor_get_uint16(item) == num);
+}
+
+void assert_uint32(cbor_item_t* item, uint32_t num) {
+  assert_true(cbor_isa_uint(item));
+  assert_true(cbor_int_get_width(item) == CBOR_INT_32);
+  assert_true(cbor_get_uint32(item) == num);
+}
+
+void assert_uint64(cbor_item_t* item, uint64_t num) {
+  assert_true(cbor_isa_uint(item));
+  assert_true(cbor_int_get_width(item) == CBOR_INT_64);
+  assert_true(cbor_get_uint64(item) == num);
+}
+
+void assert_decoder_result(size_t read, enum cbor_decoder_status status,
+                           struct cbor_decoder_result result) {
+  assert_true(read == result.read);
+  assert_true(status == result.status);
+  assert_true(0 == result.required);
+}
+
+void assert_decoder_result_nedata(size_t required,
+                                  struct cbor_decoder_result result) {
+  assert_true(0 == result.read);
+  assert_true(CBOR_DECODER_NEDATA == result.status);
+  assert_int_equal((int)required, (int)result.required);
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/test/assertions.h mysql-8.0-8.0.27/extra/libcbor/test/assertions.h
--- mysql-8.0-8.0.26/extra/libcbor/test/assertions.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/test/assertions.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,21 @@
+#include <setjmp.h>
+#include <stdarg.h>
+#include <stddef.h>
+
+#include <cmocka.h>
+
+#include "cbor.h"
+
+#ifndef ASSERTIONS_H_
+#define ASSERTIONS_H_
+
+void assert_uint8(cbor_item_t* item, uint8_t num);
+void assert_uint16(cbor_item_t* item, uint16_t num);
+void assert_uint32(cbor_item_t* item, uint32_t num);
+void assert_uint64(cbor_item_t* item, uint64_t num);
+
+void assert_decoder_result(size_t, enum cbor_decoder_status,
+                           struct cbor_decoder_result);
+void assert_decoder_result_nedata(size_t, struct cbor_decoder_result);
+
+#endif
diff -Nru mysql-8.0-8.0.26/extra/libcbor/test/bad_inputs_test.c mysql-8.0-8.0.27/extra/libcbor/test/bad_inputs_test.c
--- mysql-8.0-8.0.26/extra/libcbor/test/bad_inputs_test.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/test/bad_inputs_test.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include <setjmp.h>
+#include <stdarg.h>
+#include <stddef.h>
+
+#include <cmocka.h>
+
+#include "cbor.h"
+
+/* These tests verify behavior on interesting randomly generated inputs from the
+ * fuzzer */
+
+cbor_item_t *item;
+struct cbor_load_result res;
+
+/* Map start + array with embedded length */
+unsigned char data1[] = {0xA9, 0x85};
+static void test_1(void **state) {
+  item = cbor_load(data1, 2, &res);
+  assert_null(item);
+  assert_true(res.error.code == CBOR_ERR_NOTENOUGHDATA);
+  assert_int_equal(res.error.position, 2);
+}
+
+unsigned char data2[] = {0x9D};
+static void test_2(void **state) {
+  item = cbor_load(data2, 1, &res);
+  assert_null(item);
+  assert_true(res.error.code == CBOR_ERR_MALFORMATED);
+  assert_int_equal(res.error.position, 0);
+}
+
+unsigned char data3[] = {0xD6};
+static void test_3(void **state) {
+  item = cbor_load(data3, 1, &res);
+  assert_null(item);
+  assert_true(res.error.code == CBOR_ERR_NOTENOUGHDATA);
+  assert_int_equal(res.error.position, 1);
+}
+
+#ifdef SANE_MALLOC
+unsigned char data4[] = {0xBA, 0xC1, 0xE8, 0x3E, 0xE7, 0x20, 0xA8};
+static void test_4(void **state) {
+  item = cbor_load(data4, 7, &res);
+  assert_null(item);
+  assert_true(res.error.code == CBOR_ERR_MEMERROR);
+  assert_int_equal(res.error.position, 5);
+}
+
+unsigned char data5[] = {0x9A, 0xDA, 0x3A, 0xB2, 0x7F, 0x29};
+static void test_5(void **state) {
+  assert_true(res.error.code == CBOR_ERR_MEMERROR);
+  item = cbor_load(data5, 6, &res);
+  assert_null(item);
+  assert_int_equal(res.error.position, 5);
+  /* Indef string expectation mismatch */
+}
+#endif
+
+unsigned char data6[] = {0x7F, 0x21, 0x4C, 0x02, 0x40};
+static void test_6(void **state) {
+  item = cbor_load(data6, 5, &res);
+  assert_null(item);
+  assert_true(res.error.code == CBOR_ERR_SYNTAXERROR);
+  assert_int_equal(res.error.position, 2);
+}
+
+#ifdef EIGHT_BYTE_SIZE_T
+/* Extremely high size value (overflows size_t in representation size). Only
+ * works with 64b sizes */
+unsigned char data7[] = {0xA2, 0x9B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
+                         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+static void test_7(void **state) {
+  item = cbor_load(data7, 16, &res);
+  assert_null(item);
+  assert_true(res.error.code == CBOR_ERR_MEMERROR);
+  assert_int_equal(res.error.position, 10);
+}
+#endif
+
+unsigned char data8[] = {0xA3, 0x64, 0x68, 0x61, 0x6C, 0x66, 0xFF, 0x00,
+                         0x00, 0x66, 0x73, 0x69, 0x6E, 0x67, 0x6C, 0x65,
+                         0xFA, 0x7F, 0x7F, 0xFF, 0xFF, 0x6D, 0x73, 0x69,
+                         0x6D, 0x70, 0x6C, 0x65, 0x20, 0x76, 0x61, 0x6C,
+                         0x75, 0x65, 0x73, 0x83, 0xF5, 0xF4, 0xF6};
+static void test_8(void **state) {
+  item = cbor_load(data8, 39, &res);
+  assert_null(item);
+  assert_true(res.error.code == CBOR_ERR_SYNTAXERROR);
+  assert_int_equal(res.error.position, 7);
+}
+
+unsigned char data9[] = {0xBF, 0x05, 0xFF, 0x00, 0x00, 0x00, 0x10, 0x04};
+static void test_9(void **state) {
+  item = cbor_load(data9, 8, &res);
+  assert_null(item);
+  assert_true(res.error.code == CBOR_ERR_SYNTAXERROR);
+  assert_int_equal(res.error.position, 3);
+}
+
+int main(void) {
+  const struct CMUnitTest tests[] = {
+      cmocka_unit_test(test_1), cmocka_unit_test(test_2),
+      cmocka_unit_test(test_3),
+#ifdef SANE_MALLOC
+      cmocka_unit_test(test_4), cmocka_unit_test(test_5),
+#endif
+      cmocka_unit_test(test_6),
+#ifdef EIGHT_BYTE_SIZE_T
+      cmocka_unit_test(test_7),
+#endif
+      cmocka_unit_test(test_8), cmocka_unit_test(test_9),
+  };
+  return cmocka_run_group_tests(tests, NULL, NULL);
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/test/callbacks_test.c mysql-8.0-8.0.27/extra/libcbor/test/callbacks_test.c
--- mysql-8.0-8.0.26/extra/libcbor/test/callbacks_test.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/test/callbacks_test.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include <setjmp.h>
+#include <stdarg.h>
+#include <stddef.h>
+
+#include <cmocka.h>
+
+#include "cbor.h"
+
+unsigned char data[] = {
+    0x93, 0x01, 0x19, 0x01, 0x01, 0x1A, 0x00, 0x01, 0x05, 0xB8, 0x1B, 0x00,
+    0x00, 0x00, 0x01, 0x8F, 0x5A, 0xE8, 0xB8, 0x20, 0x39, 0x01, 0x00, 0x3A,
+    0x00, 0x01, 0x05, 0xB7, 0x3B, 0x00, 0x00, 0x00, 0x01, 0x8F, 0x5A, 0xE8,
+    0xB7, 0x5F, 0x41, 0x01, 0x41, 0x02, 0xFF, 0x7F, 0x61, 0x61, 0x61, 0x62,
+    0xFF, 0x9F, 0xFF, 0xA1, 0x61, 0x61, 0x61, 0x62, 0xC0, 0xBF, 0xFF, 0xF9,
+    0x3C, 0x00, 0xFA, 0x47, 0xC3, 0x50, 0x00, 0xFB, 0x7E, 0x37, 0xE4, 0x3C,
+    0x88, 0x00, 0x75, 0x9C, 0xF6, 0xF7, 0xF5};
+
+/* Exercise the default callbacks */
+static void test_default_callbacks(void **state) {
+  size_t read = 0;
+  while (read < 79) {
+    struct cbor_decoder_result result =
+        cbor_stream_decode(data + read, 79 - read, &cbor_empty_callbacks, NULL);
+    read += result.read;
+  }
+}
+
+int main(void) {
+  const struct CMUnitTest tests[] = {
+
+      cmocka_unit_test(test_default_callbacks)};
+  return cmocka_run_group_tests(tests, NULL, NULL);
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/test/cbor_serialize_test.c mysql-8.0-8.0.27/extra/libcbor/test/cbor_serialize_test.c
--- mysql-8.0-8.0.26/extra/libcbor/test/cbor_serialize_test.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/test/cbor_serialize_test.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,323 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include <setjmp.h>
+#include <stdarg.h>
+#include <stddef.h>
+
+#include <cmocka.h>
+
+#include <math.h>
+#include <stdarg.h>
+#include <string.h>
+#include <strings.h>
+#include "cbor.h"
+
+unsigned char buffer[512];
+
+static void test_serialize_uint8(void **state) {
+  cbor_item_t *item = cbor_new_int8();
+  cbor_set_uint8(item, 0);
+  assert_int_equal(1, cbor_serialize(item, buffer, 512));
+  assert_memory_equal(buffer, (unsigned char[]){0x00}, 1);
+  cbor_decref(&item);
+}
+
+static void test_serialize_uint16(void **state) {
+  cbor_item_t *item = cbor_new_int16();
+  cbor_set_uint16(item, 1000);
+  assert_int_equal(3, cbor_serialize(item, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0x19, 0x03, 0xE8}), 3);
+  cbor_decref(&item);
+}
+
+static void test_serialize_uint32(void **state) {
+  cbor_item_t *item = cbor_new_int32();
+  cbor_set_uint32(item, 1000000);
+  assert_int_equal(5, cbor_serialize(item, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0x1A, 0x00, 0x0F, 0x42, 0x40}),
+                      5);
+  cbor_decref(&item);
+}
+
+static void test_serialize_uint64(void **state) {
+  cbor_item_t *item = cbor_new_int64();
+  cbor_set_uint64(item, 1000000000000);
+  assert_int_equal(9, cbor_serialize(item, buffer, 512));
+  assert_memory_equal(
+      buffer,
+      ((unsigned char[]){0x1B, 0x00, 0x00, 0x00, 0xE8, 0xD4, 0xA5, 0x10, 0x00}),
+      9);
+  cbor_decref(&item);
+}
+
+static void test_serialize_negint8(void **state) {
+  cbor_item_t *item = cbor_new_int8();
+  cbor_set_uint8(item, 0);
+  cbor_mark_negint(item);
+  assert_int_equal(1, cbor_serialize(item, buffer, 512));
+  assert_memory_equal(buffer, (unsigned char[]){0x20}, 1);
+  cbor_decref(&item);
+}
+
+static void test_serialize_negint16(void **state) {
+  cbor_item_t *item = cbor_new_int16();
+  cbor_set_uint16(item, 1000);
+  cbor_mark_negint(item);
+  assert_int_equal(3, cbor_serialize(item, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0x39, 0x03, 0xE8}), 3);
+  cbor_decref(&item);
+}
+
+static void test_serialize_negint32(void **state) {
+  cbor_item_t *item = cbor_new_int32();
+  cbor_set_uint32(item, 1000000);
+  cbor_mark_negint(item);
+  assert_int_equal(5, cbor_serialize(item, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0x3A, 0x00, 0x0F, 0x42, 0x40}),
+                      5);
+  cbor_decref(&item);
+}
+
+static void test_serialize_negint64(void **state) {
+  cbor_item_t *item = cbor_new_int64();
+  cbor_set_uint64(item, 1000000000000);
+  cbor_mark_negint(item);
+  assert_int_equal(9, cbor_serialize(item, buffer, 512));
+  assert_memory_equal(
+      buffer,
+      ((unsigned char[]){0x3B, 0x00, 0x00, 0x00, 0xE8, 0xD4, 0xA5, 0x10, 0x00}),
+      9);
+  cbor_decref(&item);
+}
+
+static void test_serialize_definite_bytestring(void **state) {
+  cbor_item_t *item = cbor_new_definite_bytestring();
+  unsigned char *data = malloc(256);
+  bzero(data, 256); /* Prevent undefined behavior in comparison */
+  cbor_bytestring_set_handle(item, data, 256);
+  assert_int_equal(256 + 3, cbor_serialize(item, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0x59, 0x01, 0x00}), 3);
+  assert_memory_equal(buffer + 3, data, 256);
+  cbor_decref(&item);
+}
+
+static void test_serialize_indefinite_bytestring(void **state) {
+  cbor_item_t *item = cbor_new_indefinite_bytestring();
+
+  cbor_item_t *chunk = cbor_new_definite_bytestring();
+  unsigned char *data = malloc(256);
+  bzero(data, 256); /* Prevent undefined behavior in comparison */
+  cbor_bytestring_set_handle(chunk, data, 256);
+
+  cbor_bytestring_add_chunk(item, cbor_move(chunk));
+  assert_int_equal(cbor_bytestring_chunk_count(item), 1);
+
+  assert_int_equal(1 + 3 + 256 + 1, cbor_serialize(item, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0x5F, 0x59, 0x01, 0x00}), 4);
+  assert_memory_equal(buffer + 4, data, 256);
+  assert_memory_equal(buffer + 4 + 256, ((unsigned char[]){0xFF}), 1);
+  cbor_decref(&item);
+}
+
+static void test_serialize_definite_string(void **state) {
+  cbor_item_t *item = cbor_new_definite_string();
+  unsigned char *data = malloc(12);
+  strncpy((char *)data, "Hello world!", 12);
+  cbor_string_set_handle(item, data, 12);
+  assert_int_equal(1 + 12, cbor_serialize(item, buffer, 512));
+  assert_memory_equal(
+      buffer,
+      ((unsigned char[]){0x6C, 0x48, 0x65, 0x6C, 0x6C, 0x6F, 0x20, 0x77, 0x6F,
+                         0x72, 0x6C, 0x64, 0x21}),
+      13);
+  cbor_decref(&item);
+}
+
+static void test_serialize_indefinite_string(void **state) {
+  cbor_item_t *item = cbor_new_indefinite_string();
+  cbor_item_t *chunk = cbor_new_definite_string();
+
+  unsigned char *data = malloc(12);
+  strncpy((char *)data, "Hello world!", 12);
+  cbor_string_set_handle(chunk, data, 12);
+
+  assert_true(cbor_string_add_chunk(item, cbor_move(chunk)));
+  assert_int_equal(cbor_string_chunk_count(item), 1);
+
+  assert_int_equal(15, cbor_serialize(item, buffer, 512));
+  assert_memory_equal(
+      buffer,
+      ((unsigned char[]){0x7F, 0x6C, 0x48, 0x65, 0x6C, 0x6C, 0x6F, 0x20, 0x77,
+                         0x6F, 0x72, 0x6C, 0x64, 0x21, 0xFF}),
+      15);
+  cbor_decref(&item);
+}
+
+static void test_serialize_definite_array(void **state) {
+  cbor_item_t *item = cbor_new_definite_array(2);
+  cbor_item_t *one = cbor_build_uint8(1);
+  cbor_item_t *two = cbor_build_uint8(2);
+
+  cbor_array_push(item, one);
+  cbor_array_set(item, 1, two);
+  cbor_array_replace(item, 0, one);
+
+  assert_int_equal(3, cbor_serialize(item, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0x82, 0x01, 0x02}), 3);
+  cbor_decref(&item);
+  cbor_decref(&one);
+  cbor_decref(&two);
+}
+
+static void test_serialize_indefinite_array(void **state) {
+  cbor_item_t *item = cbor_new_indefinite_array();
+  cbor_item_t *one = cbor_build_uint8(1);
+  cbor_item_t *two = cbor_build_uint8(2);
+
+  cbor_array_push(item, one);
+  cbor_array_push(item, two);
+
+  assert_int_equal(4, cbor_serialize(item, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0x9F, 0x01, 0x02, 0xFF}), 4);
+  cbor_decref(&item);
+  cbor_decref(&one);
+  cbor_decref(&two);
+}
+
+static void test_serialize_definite_map(void **state) {
+  cbor_item_t *item = cbor_new_definite_map(2);
+  cbor_item_t *one = cbor_build_uint8(1);
+  cbor_item_t *two = cbor_build_uint8(2);
+
+  cbor_map_add(item, (struct cbor_pair){.key = one, .value = two});
+  cbor_map_add(item, (struct cbor_pair){.key = two, .value = one});
+
+  assert_int_equal(5, cbor_serialize(item, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0xA2, 0x01, 0x02, 0x02, 0x01}),
+                      5);
+  cbor_decref(&item);
+  cbor_decref(&one);
+  cbor_decref(&two);
+}
+
+static void test_serialize_indefinite_map(void **state) {
+  cbor_item_t *item = cbor_new_indefinite_map(2);
+  cbor_item_t *one = cbor_build_uint8(1);
+  cbor_item_t *two = cbor_build_uint8(2);
+
+  assert_true(cbor_map_add(item, (struct cbor_pair){.key = one, .value = two}));
+  assert_true(cbor_map_add(item, (struct cbor_pair){.key = two, .value = one}));
+
+  assert_int_equal(6, cbor_serialize(item, buffer, 512));
+  assert_memory_equal(
+      buffer, ((unsigned char[]){0xBF, 0x01, 0x02, 0x02, 0x01, 0xFF}), 6);
+  cbor_decref(&item);
+  cbor_decref(&one);
+  cbor_decref(&two);
+}
+
+static void test_serialize_tags(void **state) {
+  cbor_item_t *item = cbor_new_tag(21);
+  cbor_item_t *one = cbor_build_uint8(1);
+  cbor_tag_set_item(item, one);
+
+  assert_int_equal(2, cbor_serialize(item, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0xD5, 0x01}), 2);
+  cbor_decref(&item);
+  cbor_decref(&one);
+}
+
+static void test_serialize_half(void **state) {
+  cbor_item_t *item = cbor_new_float2();
+  cbor_set_float2(item, NAN);
+
+  assert_int_equal(3, cbor_serialize(item, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0xF9, 0x7E, 0x00}), 3);
+  cbor_decref(&item);
+}
+
+static void test_serialize_single(void **state) {
+  cbor_item_t *item = cbor_new_float4();
+  cbor_set_float4(item, 100000.0f);
+
+  assert_int_equal(5, cbor_serialize(item, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0xFA, 0x47, 0xC3, 0x50, 0x00}),
+                      5);
+  cbor_decref(&item);
+}
+
+static void test_serialize_double(void **state) {
+  cbor_item_t *item = cbor_new_float8();
+  cbor_set_float8(item, -4.1);
+
+  assert_int_equal(9, cbor_serialize(item, buffer, 512));
+  assert_memory_equal(
+      buffer,
+      ((unsigned char[]){0xFB, 0xC0, 0x10, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66}),
+      9);
+  cbor_decref(&item);
+}
+
+static void test_serialize_ctrl(void **state) {
+  cbor_item_t *item = cbor_new_undef();
+
+  assert_int_equal(1, cbor_serialize(item, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0xF7}), 1);
+  cbor_decref(&item);
+}
+
+static void test_serialize_long_ctrl(void **state) {
+  cbor_item_t *item = cbor_new_ctrl();
+  cbor_set_ctrl(item, 254);
+
+  assert_int_equal(2, cbor_serialize(item, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0xF8, 0xFE}), 2);
+  cbor_decref(&item);
+}
+
+static void test_auto_serialize(void **state) {
+  cbor_item_t *item = cbor_new_definite_array(4);
+  for (size_t i = 0; i < 4; i++)
+    cbor_array_push(item, cbor_move(cbor_build_uint64(0)));
+
+  unsigned char *buffer;
+  size_t buffer_size;
+  assert_int_equal(37, cbor_serialize_alloc(item, &buffer, &buffer_size));
+  assert_int_equal(64, buffer_size);
+  assert_memory_equal(buffer, ((unsigned char[]){0x84, 0x1B}), 2);
+  cbor_decref(&item);
+  _CBOR_FREE(buffer);
+}
+
+int main(void) {
+  const struct CMUnitTest tests[] = {
+      cmocka_unit_test(test_serialize_uint8),
+      cmocka_unit_test(test_serialize_uint16),
+      cmocka_unit_test(test_serialize_uint32),
+      cmocka_unit_test(test_serialize_uint64),
+      cmocka_unit_test(test_serialize_negint8),
+      cmocka_unit_test(test_serialize_negint16),
+      cmocka_unit_test(test_serialize_negint32),
+      cmocka_unit_test(test_serialize_negint64),
+      cmocka_unit_test(test_serialize_definite_bytestring),
+      cmocka_unit_test(test_serialize_indefinite_bytestring),
+      cmocka_unit_test(test_serialize_definite_string),
+      cmocka_unit_test(test_serialize_indefinite_string),
+      cmocka_unit_test(test_serialize_definite_array),
+      cmocka_unit_test(test_serialize_indefinite_array),
+      cmocka_unit_test(test_serialize_definite_map),
+      cmocka_unit_test(test_serialize_indefinite_map),
+      cmocka_unit_test(test_serialize_tags),
+      cmocka_unit_test(test_serialize_half),
+      cmocka_unit_test(test_serialize_single),
+      cmocka_unit_test(test_serialize_double),
+      cmocka_unit_test(test_serialize_ctrl),
+      cmocka_unit_test(test_serialize_long_ctrl),
+      cmocka_unit_test(test_auto_serialize)};
+  return cmocka_run_group_tests(tests, NULL, NULL);
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/test/cbor_stream_decode_test.c mysql-8.0-8.0.27/extra/libcbor/test/cbor_stream_decode_test.c
--- mysql-8.0-8.0.26/extra/libcbor/test/cbor_stream_decode_test.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/test/cbor_stream_decode_test.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,547 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include <setjmp.h>
+#include <stdarg.h>
+#include <stddef.h>
+
+#include <cmocka.h>
+
+#include "assertions.h"
+#include "cbor.h"
+#include "stream_expectations.h"
+
+unsigned char embedded_uint8_data[] = {0x00, 0x01, 0x05, 0x17};
+static void test_uint8_embedded_decoding(void **state) {
+  assert_uint8_eq(0);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(embedded_uint8_data, 1));
+
+  assert_uint8_eq(1);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(embedded_uint8_data + 1, 1));
+
+  assert_uint8_eq(5);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(embedded_uint8_data + 2, 1));
+
+  assert_uint8_eq(23);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(embedded_uint8_data + 3, 1));
+}
+
+unsigned char uint8_data[] = {0x18, 0x83, 0x18, 0xFF};
+static void test_uint8_decoding(void **state) {
+  assert_uint8_eq(0x83);
+  assert_decoder_result(2, CBOR_DECODER_FINISHED, decode(uint8_data, 2));
+
+  assert_uint8_eq(0xFF);
+  assert_decoder_result(2, CBOR_DECODER_FINISHED, decode(uint8_data + 2, 2));
+}
+
+unsigned char uint16_data[] = {0x19, 0x01, 0xf4};
+static void test_uint16_decoding(void **state) {
+  assert_uint16_eq(500);
+  assert_decoder_result(3, CBOR_DECODER_FINISHED, decode(uint16_data, 3));
+}
+
+unsigned char uint32_data[] = {0x1a, 0xa5, 0xf7, 0x02, 0xb3};
+static void test_uint32_decoding(void **state) {
+  assert_uint32_eq((uint32_t)2784428723UL);
+  assert_decoder_result(5, CBOR_DECODER_FINISHED, decode(uint32_data, 5));
+}
+
+unsigned char uint64_data[] = {0x1b, 0xa5, 0xf7, 0x02, 0xb3,
+                               0xa5, 0xf7, 0x02, 0xb3};
+static void test_uint64_decoding(void **state) {
+  assert_uint64_eq(11959030306112471731ULL);
+  assert_decoder_result(9, CBOR_DECODER_FINISHED, decode(uint64_data, 9));
+}
+
+unsigned char embedded_negint8_data[] = {0x20, 0x21, 0x25, 0x37};
+static void test_negint8_embedded_decoding(void **state) {
+  assert_negint8_eq(0);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(embedded_negint8_data, 1));
+
+  assert_negint8_eq(1);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(embedded_negint8_data + 1, 1));
+
+  assert_negint8_eq(5);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(embedded_negint8_data + 2, 1));
+
+  assert_negint8_eq(23);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(embedded_negint8_data + 3, 1));
+}
+
+unsigned char negint8_data[] = {0x38, 0x83, 0x38, 0xFF};
+static void test_negint8_decoding(void **state) {
+  assert_negint8_eq(0x83);
+  assert_decoder_result(2, CBOR_DECODER_FINISHED, decode(negint8_data, 2));
+
+  assert_negint8_eq(0xFF);
+  assert_decoder_result(2, CBOR_DECODER_FINISHED, decode(negint8_data + 2, 2));
+}
+
+unsigned char negint16_data[] = {0x39, 0x01, 0xf4};
+static void test_negint16_decoding(void **state) {
+  assert_negint16_eq(500);
+  assert_decoder_result(3, CBOR_DECODER_FINISHED, decode(negint16_data, 3));
+}
+
+unsigned char negint32_data[] = {0x3a, 0xa5, 0xf7, 0x02, 0xb3};
+static void test_negint32_decoding(void **state) {
+  assert_negint32_eq((uint32_t)2784428723UL);
+  assert_decoder_result(5, CBOR_DECODER_FINISHED, decode(negint32_data, 5));
+}
+
+unsigned char negint64_data[] = {0x3b, 0xa5, 0xf7, 0x02, 0xb3,
+                                 0xa5, 0xf7, 0x02, 0xb3};
+static void test_negint64_decoding(void **state) {
+  assert_negint64_eq(11959030306112471731ULL);
+  assert_decoder_result(9, CBOR_DECODER_FINISHED, decode(negint64_data, 9));
+}
+
+unsigned char bstring_embedded_int8_data[] = {0x41, 0xFF};
+static void test_bstring_embedded_int8_decoding(void **state) {
+  assert_bstring_mem_eq(bstring_embedded_int8_data + 1, 1);
+  assert_decoder_result(2, CBOR_DECODER_FINISHED,
+                        decode(bstring_embedded_int8_data, 2));
+}
+
+unsigned char bstring_int8_data[] = {0x58, 0x00};
+static void test_bstring_int8_decoding(void **state) {
+  assert_bstring_mem_eq(bstring_int8_data + 2, 0);
+  assert_decoder_result(2, CBOR_DECODER_FINISHED, decode(bstring_int8_data, 2));
+}
+
+unsigned char bstring_int16_data[] = {0x59, 0x01, 0x5C /*, [348 bytes] */};
+static void test_bstring_int16_decoding(void **state) {
+  assert_bstring_mem_eq(bstring_int16_data + 3, 348);
+  assert_decoder_result(3 + 348, CBOR_DECODER_FINISHED,
+                        decode(bstring_int16_data, 3 + 348));
+}
+
+unsigned char bstring_int32_data[] = {0x5A, 0x00, 0x10, 0x10,
+                                      0x10 /*, [1052688 bytes] */};
+static void test_bstring_int32_decoding(void **state) {
+  assert_bstring_mem_eq(bstring_int32_data + 5, 1052688);
+  assert_decoder_result(5 + 1052688, CBOR_DECODER_FINISHED,
+                        decode(bstring_int32_data, 5 + 1052688));
+}
+
+#ifdef EIGHT_BYTE_SIZE_T
+unsigned char bstring_int64_data[] = {
+    0x5B, 0x00, 0x00, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x00 /*, [4294967296 bytes] */};
+static void test_bstring_int64_decoding(void **state) {
+  assert_bstring_mem_eq(bstring_int64_data + 9, 4294967296);
+  assert_decoder_result(9 + 4294967296, CBOR_DECODER_FINISHED,
+                        decode(bstring_int64_data, 9 + 4294967296));
+}
+#endif
+
+unsigned char bstring_indef_1_data[] = {0x5F, 0x40 /* Empty byte string */,
+                                        0xFF};
+static void test_bstring_indef_decoding_1(void **state) {
+  assert_bstring_indef_start();
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(bstring_indef_1_data, 3));
+
+  assert_bstring_mem_eq(bstring_indef_1_data + 2, 0);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(bstring_indef_1_data + 1, 2));
+
+  assert_indef_break();
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(bstring_indef_1_data + 2, 1));
+}
+
+unsigned char bstring_indef_2_data[] = {0x5F, 0xFF};
+static void test_bstring_indef_decoding_2(void **state) {
+  assert_bstring_indef_start();
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(bstring_indef_2_data, 2));
+
+  assert_indef_break();
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(bstring_indef_2_data + 1, 1));
+}
+
+unsigned char bstring_indef_3_data[] = {
+    0x5F, 0x40 /* Empty byte string */,      0x58,
+    0x01, 0xFF /* 1B 1 char bytes string */, 0xFF};
+static void test_bstring_indef_decoding_3(void **state) {
+  assert_bstring_indef_start();
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(bstring_indef_3_data, 6));
+
+  assert_bstring_mem_eq(bstring_indef_3_data + 2, 0);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(bstring_indef_3_data + 1, 5));
+
+  assert_bstring_mem_eq(bstring_indef_3_data + 4, 1);
+  assert_decoder_result(3, CBOR_DECODER_FINISHED,
+                        decode(bstring_indef_3_data + 2, 4));
+
+  assert_indef_break();
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(bstring_indef_3_data + 5, 1));
+}
+
+unsigned char array_embedded_int8_data[] = {0x80};
+static void test_array_embedded_int8_decoding(void **state) {
+  assert_array_start(0);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(array_embedded_int8_data, 1));
+}
+
+unsigned char array_int8_data[] = {0x98, 0x02, 0x00, 0x01};
+static void test_array_int8_decoding(void **state) {
+  assert_array_start(2);
+  assert_decoder_result(2, CBOR_DECODER_FINISHED, decode(array_int8_data, 4));
+
+  assert_uint8_eq(0);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(array_int8_data + 2, 2));
+
+  assert_uint8_eq(1);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(array_int8_data + 3, 1));
+}
+
+unsigned char array_int16_data[] = {0x99, 0x00, 0x02, 0x00, 0x01};
+static void test_array_int16_decoding(void **state) {
+  assert_array_start(2);
+  assert_decoder_result(3, CBOR_DECODER_FINISHED, decode(array_int16_data, 5));
+
+  assert_uint8_eq(0);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(array_int16_data + 3, 2));
+
+  assert_uint8_eq(1);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(array_int16_data + 4, 1));
+}
+
+unsigned char array_int32_data[] = {0x9A, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01};
+static void test_array_int32_decoding(void **state) {
+  assert_array_start(2);
+  assert_decoder_result(5, CBOR_DECODER_FINISHED, decode(array_int32_data, 7));
+
+  assert_uint8_eq(0);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(array_int32_data + 5, 2));
+
+  assert_uint8_eq(1);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(array_int32_data + 6, 1));
+}
+
+unsigned char array_int64_data[] = {0x9B, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                    0x00, 0x00, 0x02, 0x00, 0x01};
+static void test_array_int64_decoding(void **state) {
+  assert_array_start(2);
+  assert_decoder_result(9, CBOR_DECODER_FINISHED, decode(array_int64_data, 11));
+
+  assert_uint8_eq(0);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(array_int64_data + 9, 2));
+
+  assert_uint8_eq(1);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(array_int64_data + 10, 1));
+}
+
+unsigned char array_of_arrays_data[] = {0x82, 0x80, 0x80};
+static void test_array_of_arrays_decoding(void **state) {
+  assert_array_start(2);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(array_of_arrays_data, 3));
+
+  assert_array_start(0);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(array_of_arrays_data + 1, 2));
+
+  assert_array_start(0);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(array_of_arrays_data + 2, 1));
+}
+
+unsigned char indef_array_data_1[] = {0x9F, 0x00, 0x18, 0xFF, 0x9F, 0xFF, 0xFF};
+static void test_indef_array_decoding_1(void **state) {
+  assert_indef_array_start();
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(indef_array_data_1, 7));
+
+  assert_uint8_eq(0);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(indef_array_data_1 + 1, 6));
+
+  assert_uint8_eq(255);
+  assert_decoder_result(2, CBOR_DECODER_FINISHED,
+                        decode(indef_array_data_1 + 2, 4));
+
+  assert_indef_array_start();
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(indef_array_data_1 + 4, 3));
+
+  assert_indef_break();
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(indef_array_data_1 + 5, 2));
+
+  assert_indef_break();
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(indef_array_data_1 + 6, 1));
+}
+
+unsigned char map_embedded_int8_data[] = {0xa1, 0x01, 0x00};
+static void test_map_embedded_int8_decoding(void **state) {
+  assert_map_start(1);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(map_embedded_int8_data, 3));
+
+  assert_uint8_eq(1);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(map_embedded_int8_data + 1, 2));
+
+  assert_uint8_eq(0);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(map_embedded_int8_data + 2, 1));
+}
+
+unsigned char map_int8_data[] = {0xB8, 0x01, 0x00, 0x01};
+static void test_map_int8_decoding(void **state) {
+  assert_map_start(1);
+  assert_decoder_result(2, CBOR_DECODER_FINISHED, decode(map_int8_data, 4));
+
+  assert_uint8_eq(0);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED, decode(map_int8_data + 2, 2));
+
+  assert_uint8_eq(1);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED, decode(map_int8_data + 3, 1));
+}
+
+unsigned char map_int16_data[] = {0xB9, 0x00, 0x01, 0x00, 0x01};
+static void test_map_int16_decoding(void **state) {
+  assert_map_start(1);
+  assert_decoder_result(3, CBOR_DECODER_FINISHED, decode(map_int16_data, 5));
+
+  assert_uint8_eq(0);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(map_int16_data + 3, 2));
+
+  assert_uint8_eq(1);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(map_int16_data + 4, 1));
+}
+
+unsigned char map_int32_data[] = {0xBA, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01};
+static void test_map_int32_decoding(void **state) {
+  assert_map_start(1);
+  assert_decoder_result(5, CBOR_DECODER_FINISHED, decode(map_int32_data, 7));
+
+  assert_uint8_eq(0);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(map_int32_data + 5, 2));
+
+  assert_uint8_eq(1);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(map_int32_data + 6, 1));
+}
+
+unsigned char map_int64_data[] = {0xBB, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                  0x00, 0x00, 0x01, 0x00, 0x01};
+static void test_map_int64_decoding(void **state) {
+  assert_map_start(1);
+  assert_decoder_result(9, CBOR_DECODER_FINISHED, decode(map_int64_data, 11));
+
+  assert_uint8_eq(0);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(map_int64_data + 9, 2));
+
+  assert_uint8_eq(1);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(map_int64_data + 10, 1));
+}
+
+unsigned char indef_map_data_1[] = {0xBF, 0x00, 0x18, 0xFF, 0xFF};
+static void test_indef_map_decoding_1(void **state) {
+  assert_indef_map_start();
+  assert_decoder_result(1, CBOR_DECODER_FINISHED, decode(indef_map_data_1, 5));
+
+  assert_uint8_eq(0);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(indef_map_data_1 + 1, 4));
+
+  assert_uint8_eq(255);
+  assert_decoder_result(2, CBOR_DECODER_FINISHED,
+                        decode(indef_map_data_1 + 2, 3));
+
+  assert_indef_break();
+  assert_decoder_result(1, CBOR_DECODER_FINISHED,
+                        decode(indef_map_data_1 + 4, 1));
+}
+
+unsigned char map_nedata[] = {0xBB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                              0x00, 0x01, 0x19, 0x01, 0xf4, 0x01};
+static void test_nedata_map_decoding(void **state) {
+  assert_decoder_result_nedata(8, decode(map_nedata, 1));
+
+  assert_map_start(1);
+  assert_decoder_result(9, CBOR_DECODER_FINISHED, decode(map_nedata, 9));
+
+  assert_decoder_result_nedata(2, decode(map_nedata + 9, 1));
+
+  assert_uint16_eq(500);
+  assert_decoder_result(3, CBOR_DECODER_FINISHED, decode(map_nedata + 9, 3));
+
+  assert_uint8_eq(1);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED, decode(map_nedata + 12, 1));
+}
+
+unsigned char embedded_tag_data[] = {0xC1};
+static void test_embedded_tag_decoding(void **state) {
+  assert_tag_eq(1);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED, decode(embedded_tag_data, 1));
+}
+
+unsigned char int8_tag_data[] = {0xD8, 0xFE};
+static void test_int8_tag_decoding(void **state) {
+  assert_tag_eq(254);
+  assert_decoder_result(2, CBOR_DECODER_FINISHED, decode(int8_tag_data, 2));
+}
+
+unsigned char int16_tag_data[] = {0xD9, 0xFE, 0xFD};
+static void test_int16_tag_decoding(void **state) {
+  assert_tag_eq(65277);
+  assert_decoder_result(3, CBOR_DECODER_FINISHED, decode(int16_tag_data, 3));
+}
+
+unsigned char int32_tag_data[] = {0xDA, 0xFE, 0xFD, 0xFC, 0xFB};
+static void test_int32_tag_decoding(void **state) {
+  assert_tag_eq(4278058235ULL);
+  assert_decoder_result(5, CBOR_DECODER_FINISHED, decode(int32_tag_data, 5));
+}
+
+unsigned char int64_tag_data[] = {0xDB, 0xFE, 0xFD, 0xFC, 0xFB,
+                                  0xFA, 0xF9, 0xF8, 0xF7};
+static void test_int64_tag_decoding(void **state) {
+  assert_tag_eq(18374120213919168759ULL);
+  assert_decoder_result(9, CBOR_DECODER_FINISHED, decode(int64_tag_data, 9));
+}
+
+unsigned char bad_tag_data[] = {0xC6};
+static void test_bad_tag_decoding(void **state) {
+  assert_decoder_result(0, CBOR_DECODER_ERROR, decode(bad_tag_data, 1));
+}
+
+unsigned char float2_data[] = {0xF9, 0x7B, 0xFF};
+static void test_float2_decoding(void **state) {
+  assert_half(65504.0);
+  assert_decoder_result(3, CBOR_DECODER_FINISHED, decode(float2_data, 3));
+}
+
+unsigned char float4_data[] = {0xFA, 0x47, 0xC3, 0x50, 0x00};
+static void test_float4_decoding(void **state) {
+  assert_float(100000.0);
+  assert_decoder_result(5, CBOR_DECODER_FINISHED, decode(float4_data, 5));
+}
+
+unsigned char float8_data[] = {0xFB, 0xC0, 0x10, 0x66, 0x66,
+                               0x66, 0x66, 0x66, 0x66};
+static void test_float8_decoding(void **state) {
+  assert_double(-4.1);
+  assert_decoder_result(9, CBOR_DECODER_FINISHED, decode(float8_data, 9));
+}
+
+unsigned char false_data[] = {0xF4};
+static void test_false_decoding(void **state) {
+  assert_bool(false);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED, decode(false_data, 1));
+}
+
+unsigned char true_data[] = {0xF5};
+static void test_true_decoding(void **state) {
+  assert_bool(true);
+  assert_decoder_result(1, CBOR_DECODER_FINISHED, decode(true_data, 1));
+}
+
+unsigned char null_data[] = {0xF6};
+static void test_null_decoding(void **state) {
+  assert_nil();
+  assert_decoder_result(1, CBOR_DECODER_FINISHED, decode(null_data, 1));
+}
+
+unsigned char undef_data[] = {0xF7};
+static void test_undef_decoding(void **state) {
+  assert_undef();
+  assert_decoder_result(1, CBOR_DECODER_FINISHED, decode(undef_data, 1));
+}
+
+int main(void) {
+  set_decoder(&cbor_stream_decode);
+  const struct CMUnitTest tests[] = {
+      cmocka_unit_test(test_uint8_embedded_decoding),
+      cmocka_unit_test(test_uint8_decoding),
+      cmocka_unit_test(test_uint16_decoding),
+      cmocka_unit_test(test_uint32_decoding),
+      cmocka_unit_test(test_uint64_decoding),
+
+      cmocka_unit_test(test_negint8_embedded_decoding),
+      cmocka_unit_test(test_negint8_decoding),
+      cmocka_unit_test(test_negint16_decoding),
+      cmocka_unit_test(test_negint32_decoding),
+      cmocka_unit_test(test_negint64_decoding),
+
+      cmocka_unit_test(test_bstring_embedded_int8_decoding),
+      cmocka_unit_test(test_bstring_int8_decoding),
+      cmocka_unit_test(test_bstring_int16_decoding),
+      cmocka_unit_test(test_bstring_int32_decoding),
+#ifdef EIGHT_BYTE_SIZE_T
+      cmocka_unit_test(test_bstring_int64_decoding),
+#endif
+      cmocka_unit_test(test_bstring_indef_decoding_1),
+      cmocka_unit_test(test_bstring_indef_decoding_2),
+      cmocka_unit_test(test_bstring_indef_decoding_3),
+
+      cmocka_unit_test(test_array_embedded_int8_decoding),
+      cmocka_unit_test(test_array_int8_decoding),
+      cmocka_unit_test(test_array_int16_decoding),
+      cmocka_unit_test(test_array_int32_decoding),
+      cmocka_unit_test(test_array_int64_decoding),
+      cmocka_unit_test(test_array_of_arrays_decoding),
+      cmocka_unit_test(test_indef_array_decoding_1),
+
+      cmocka_unit_test(test_map_embedded_int8_decoding),
+      cmocka_unit_test(test_map_int8_decoding),
+      cmocka_unit_test(test_map_int16_decoding),
+      cmocka_unit_test(test_map_int32_decoding),
+      cmocka_unit_test(test_map_int64_decoding),
+      cmocka_unit_test(test_indef_map_decoding_1),
+      cmocka_unit_test(test_nedata_map_decoding),
+
+      cmocka_unit_test(test_embedded_tag_decoding),
+      cmocka_unit_test(test_int8_tag_decoding),
+      cmocka_unit_test(test_int16_tag_decoding),
+      cmocka_unit_test(test_int32_tag_decoding),
+      cmocka_unit_test(test_int64_tag_decoding),
+      cmocka_unit_test(test_bad_tag_decoding),
+
+      cmocka_unit_test(test_float2_decoding),
+      cmocka_unit_test(test_float4_decoding),
+      cmocka_unit_test(test_float8_decoding),
+
+      cmocka_unit_test(test_false_decoding),
+      cmocka_unit_test(test_true_decoding),
+      cmocka_unit_test(test_null_decoding),
+      cmocka_unit_test(test_undef_decoding)};
+  return cmocka_run_group_tests(tests, NULL, NULL);
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/test/CMakeLists.txt mysql-8.0-8.0.27/extra/libcbor/test/CMakeLists.txt
--- mysql-8.0-8.0.26/extra/libcbor/test/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/test/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,29 @@
+file(GLOB TESTS "*_test.c")
+
+if(NOT CBOR_CUSTOM_ALLOC)
+    # Memory allocation test requires custom allocator support to instrument it.
+    list(REMOVE_ITEM TESTS ${CMAKE_CURRENT_SOURCE_DIR}/memory_allocation_test.c)
+endif(NOT CBOR_CUSTOM_ALLOC)
+
+find_package(CMocka REQUIRED)
+
+message(STATUS "CMocka vars: ${CMOCKA_LIBRARIES} ${CMOCKA_INCLUDE_DIR}")
+
+foreach (TEST ${TESTS})
+    string(REGEX REPLACE ".*/([^/]+).c" "\\1" NAME ${TEST})
+    message("Adding test ${NAME}")
+    add_executable(${NAME} "${NAME}.c" assertions.c stream_expectations.c)
+    target_link_libraries(${NAME} ${CMOCKA_LIBRARIES})
+    target_link_libraries(${NAME} cbor)
+    target_include_directories(${NAME} PUBLIC ${CMOCKA_INCLUDE_DIR})
+    # See https://stackoverflow.com/a/10824578/499521
+    ADD_TEST(ctest_build_test_${NAME}
+            "${CMAKE_COMMAND}" --build ${CMAKE_BINARY_DIR} --target ${NAME})
+    ADD_TEST(ctest_run_${NAME} ${NAME})
+    SET_TESTS_PROPERTIES(ctest_run_${NAME}
+            PROPERTIES DEPENDS ctest_build_test_${NAME})
+    add_dependencies(coverage ${NAME})
+endforeach (TEST)
+
+add_executable(cpp_linkage_test cpp_linkage_test.cpp)
+target_link_libraries(cpp_linkage_test cbor)
\ No newline at end of file
diff -Nru mysql-8.0-8.0.26/extra/libcbor/test/copy_test.c mysql-8.0-8.0.27/extra/libcbor/test/copy_test.c
--- mysql-8.0-8.0.26/extra/libcbor/test/copy_test.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/test/copy_test.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,207 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include <setjmp.h>
+#include <stdarg.h>
+#include <stddef.h>
+
+#include <cmocka.h>
+
+#include "assertions.h"
+#include "cbor.h"
+
+cbor_item_t *item, *copy, *tmp;
+
+static void test_uints(void **state) {
+  item = cbor_build_uint8(10);
+  assert_uint8(copy = cbor_copy(item), 10);
+  cbor_decref(&item);
+  cbor_decref(&copy);
+
+  item = cbor_build_uint16(10);
+  assert_uint16(copy = cbor_copy(item), 10);
+  cbor_decref(&item);
+  cbor_decref(&copy);
+
+  item = cbor_build_uint32(10);
+  assert_uint32(copy = cbor_copy(item), 10);
+  cbor_decref(&item);
+  cbor_decref(&copy);
+
+  item = cbor_build_uint64(10);
+  assert_uint64(copy = cbor_copy(item), 10);
+  cbor_decref(&item);
+  cbor_decref(&copy);
+}
+
+static void test_negints(void **state) {
+  item = cbor_build_negint8(10);
+  assert_true(cbor_get_uint8(copy = cbor_copy(item)) == 10);
+  cbor_decref(&item);
+  cbor_decref(&copy);
+
+  item = cbor_build_negint16(10);
+  assert_true(cbor_get_uint16(copy = cbor_copy(item)) == 10);
+  cbor_decref(&item);
+  cbor_decref(&copy);
+
+  item = cbor_build_negint32(10);
+  assert_true(cbor_get_uint32(copy = cbor_copy(item)) == 10);
+  cbor_decref(&item);
+  cbor_decref(&copy);
+
+  item = cbor_build_negint64(10);
+  assert_true(cbor_get_uint64(copy = cbor_copy(item)) == 10);
+  cbor_decref(&item);
+  cbor_decref(&copy);
+}
+
+static void test_def_bytestring(void **state) {
+  item = cbor_build_bytestring((cbor_data) "abc", 3);
+  assert_memory_equal(cbor_bytestring_handle(copy = cbor_copy(item)),
+                      cbor_bytestring_handle(item), 3);
+  cbor_decref(&item);
+  cbor_decref(&copy);
+}
+
+static void test_indef_bytestring(void **state) {
+  item = cbor_new_indefinite_bytestring();
+  cbor_bytestring_add_chunk(
+      item, cbor_move(cbor_build_bytestring((cbor_data) "abc", 3)));
+  copy = cbor_copy(item);
+
+  assert_int_equal(cbor_bytestring_chunk_count(item),
+                   cbor_bytestring_chunk_count(copy));
+
+  assert_memory_equal(
+      cbor_bytestring_handle(cbor_bytestring_chunks_handle(copy)[0]), "abc", 3);
+  cbor_decref(&item);
+  cbor_decref(&copy);
+}
+
+static void test_def_string(void **state) {
+  item = cbor_build_string("abc");
+  assert_memory_equal(cbor_string_handle(copy = cbor_copy(item)),
+                      cbor_string_handle(item), 3);
+  cbor_decref(&item);
+  cbor_decref(&copy);
+}
+
+static void test_indef_string(void **state) {
+  item = cbor_new_indefinite_string();
+  cbor_string_add_chunk(item, cbor_move(cbor_build_string("abc")));
+  copy = cbor_copy(item);
+
+  assert_int_equal(cbor_string_chunk_count(item),
+                   cbor_string_chunk_count(copy));
+
+  assert_memory_equal(cbor_string_handle(cbor_string_chunks_handle(copy)[0]),
+                      "abc", 3);
+  cbor_decref(&item);
+  cbor_decref(&copy);
+}
+
+static void test_def_array(void **state) {
+  item = cbor_new_definite_array(1);
+  cbor_array_push(item, cbor_move(cbor_build_uint8(42)));
+
+  assert_uint8(tmp = cbor_array_get(copy = cbor_copy(item), 0), 42);
+  cbor_decref(&item);
+  cbor_decref(&copy);
+  cbor_decref(&tmp);
+}
+
+static void test_indef_array(void **state) {
+  item = cbor_new_indefinite_array();
+  cbor_array_push(item, cbor_move(cbor_build_uint8(42)));
+
+  assert_uint8(tmp = cbor_array_get(copy = cbor_copy(item), 0), 42);
+  cbor_decref(&item);
+  cbor_decref(&copy);
+  cbor_decref(&tmp);
+}
+
+static void test_def_map(void **state) {
+  item = cbor_new_definite_map(1);
+  cbor_map_add(item, (struct cbor_pair){
+                         .key = cbor_move(cbor_build_uint8(42)),
+                         .value = cbor_move(cbor_build_uint8(43)),
+                     });
+
+  assert_uint8(cbor_map_handle(copy = cbor_copy(item))[0].key, 42);
+
+  cbor_decref(&item);
+  cbor_decref(&copy);
+}
+
+static void test_indef_map(void **state) {
+  item = cbor_new_indefinite_map(1);
+  cbor_map_add(item, (struct cbor_pair){
+                         .key = cbor_move(cbor_build_uint8(42)),
+                         .value = cbor_move(cbor_build_uint8(43)),
+                     });
+
+  assert_uint8(cbor_map_handle(copy = cbor_copy(item))[0].key, 42);
+
+  cbor_decref(&item);
+  cbor_decref(&copy);
+}
+
+static void test_tag(void **state) {
+  item = cbor_build_tag(10, cbor_move(cbor_build_uint8(42)));
+
+  assert_uint8(cbor_move(cbor_tag_item(copy = cbor_copy(item))), 42);
+
+  cbor_decref(&item);
+  cbor_decref(&copy);
+}
+
+static void test_ctrls(void **state) {
+  item = cbor_new_null();
+  assert_true(cbor_is_null(copy = cbor_copy(item)));
+  cbor_decref(&item);
+  cbor_decref(&copy);
+}
+
+static void test_floats(void **state) {
+  item = cbor_build_float2(3.14f);
+  assert_true(cbor_float_get_float2(copy = cbor_copy(item)) ==
+              cbor_float_get_float2(item));
+  cbor_decref(&item);
+  cbor_decref(&copy);
+
+  item = cbor_build_float4(3.14f);
+  assert_true(cbor_float_get_float4(copy = cbor_copy(item)) ==
+              cbor_float_get_float4(item));
+  cbor_decref(&item);
+  cbor_decref(&copy);
+
+  item = cbor_build_float8(3.14);
+  assert_true(cbor_float_get_float8(copy = cbor_copy(item)) ==
+              cbor_float_get_float8(item));
+  cbor_decref(&item);
+  cbor_decref(&copy);
+}
+
+int main(void) {
+  const struct CMUnitTest tests[] = {
+
+      cmocka_unit_test(test_uints),
+      cmocka_unit_test(test_negints),
+      cmocka_unit_test(test_def_bytestring),
+      cmocka_unit_test(test_indef_bytestring),
+      cmocka_unit_test(test_def_string),
+      cmocka_unit_test(test_indef_string),
+      cmocka_unit_test(test_def_array),
+      cmocka_unit_test(test_indef_array),
+      cmocka_unit_test(test_def_map),
+      cmocka_unit_test(test_indef_map),
+      cmocka_unit_test(test_tag),
+      cmocka_unit_test(test_ctrls),
+      cmocka_unit_test(test_floats)};
+  return cmocka_run_group_tests(tests, NULL, NULL);
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/test/cpp_linkage_test.cpp mysql-8.0-8.0.27/extra/libcbor/test/cpp_linkage_test.cpp
--- mysql-8.0-8.0.26/extra/libcbor/test/cpp_linkage_test.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/test/cpp_linkage_test.cpp	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include <iostream>
+#include "cbor.h"
+
+int main() { std::cout << "Hello from libcbor " << CBOR_VERSION << std::endl; }
diff -Nru mysql-8.0-8.0.26/extra/libcbor/test/data/callbacks.diag mysql-8.0-8.0.27/extra/libcbor/test/data/callbacks.diag
--- mysql-8.0-8.0.26/extra/libcbor/test/data/callbacks.diag	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/test/data/callbacks.diag	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1 @@
+[1, 257, 67000, 6700067000, -1, -257, -67000, -6700067000, (_ h'01', h'02'), (_ "a", "b"), [_], {"a":"b"}, 0({_}), 1.0, 100000.0, 1.0e+300 , null, undefined, true]
diff -Nru mysql-8.0-8.0.26/extra/libcbor/test/data/pretty.cbor mysql-8.0-8.0.27/extra/libcbor/test/data/pretty.cbor
--- mysql-8.0-8.0.26/extra/libcbor/test/data/pretty.cbor	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/test/data/pretty.cbor	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,3 @@
+*** can't parse 101
+0x5B, 0x31, 0x2C, 0x20, 0x2D, 0x31, 0x2C, 0x20, 0x28, 0x5F, 0x20, 0x68, 0x27, 0x30, 0x31, 0x27, 0x2C, 0x20, 0x68, 0x27, 0x30, 0x32, 0x27, 0x29, 0x2C, 0x20, 0x28, 0x5F, 0x20, 0x22, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x22, 0x2C, 0x20, 0x22, 0x62, 0x22, 0x29, 0x2C, 0x20, 0x5B, 0x5F, 0x5D, 0x2C, 0x20, 0x7B, 0x22, 0x61, 0x62, 0x63, 0x22, 0x3A, 0x22, 0x62, 0x61, 0x22, 0x7D, 0x2C, 0x20, 0x30, 0x28, 0x7B, 0x5F, 0x7D, 0x29, 0x2C, 0x20, 0x33, 0x2E, 0x31, 0x34, 0x2C, 0x20, 0x6E, 0x75, 0x6C, 0x6C, 0x2C, 0x20, 0x75, 0x6E, 0x64, 0x65, 0x66, 0x69, 0x6E, 0x65, 0x64, 0x2C, 0x20, 0x74, 0x72, 0x75, 0x65, 0x5D, 0x0A
+*** Expected [ \t\n\r] at line 2, column 1 (byte 5) after 
diff -Nru mysql-8.0-8.0.26/extra/libcbor/test/data/pretty.diag mysql-8.0-8.0.27/extra/libcbor/test/data/pretty.diag
--- mysql-8.0-8.0.26/extra/libcbor/test/data/pretty.diag	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/test/data/pretty.diag	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1 @@
+[1, -1, (_ h'01', h'02'), (_ "abcdef", "b"), [_], {"abc":"ba"}, 0({_}), 3.14, null, undefined, true]
diff -Nru mysql-8.0-8.0.26/extra/libcbor/test/fuzz_test.c mysql-8.0-8.0.27/extra/libcbor/test/fuzz_test.c
--- mysql-8.0-8.0.26/extra/libcbor/test/fuzz_test.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/test/fuzz_test.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include <setjmp.h>
+#include <stdarg.h>
+#include <stddef.h>
+
+#include <cmocka.h>
+
+#include <time.h>
+#include "cbor.h"
+
+#ifdef HUGE_FUZZ
+#define ROUNDS 65536ULL
+#define MAXLEN 131072ULL
+#else
+#define ROUNDS 256ULL
+#define MAXLEN 2048ULL
+#endif
+
+#ifdef PRINT_FUZZ
+static void printmem(const unsigned char *ptr, size_t length) {
+  for (size_t i = 0; i < length; i++) printf("%02X", ptr[i]);
+  printf("\n");
+}
+#endif
+
+unsigned seed;
+
+#if CBOR_CUSTOM_ALLOC
+void *mock_malloc(size_t size) {
+  if (size > (1 << 19))
+    return NULL;
+  else
+    return malloc(size);
+}
+#endif
+
+static void run_round() {
+  cbor_item_t *item;
+  struct cbor_load_result res;
+
+  size_t length = rand() % MAXLEN + 1;
+  unsigned char *data = malloc(length);
+  for (size_t i = 0; i < length; i++) {
+    data[i] = rand() % 0xFF;
+  }
+
+#ifdef PRINT_FUZZ
+  printmem(data, length);
+#endif
+
+  item = cbor_load(data, length, &res);
+
+  if (res.error.code == CBOR_ERR_NONE) cbor_decref(&item);
+  /* Otherwise there should be nothing left behind by the decoder */
+
+  free(data);
+}
+
+static void fuzz(void **state) {
+#if CBOR_CUSTOM_ALLOC
+  cbor_set_allocs(mock_malloc, realloc, free);
+#endif
+  printf("Fuzzing %llu rounds of up to %llu bytes with seed %u\n", ROUNDS,
+         MAXLEN, seed);
+  srand(seed);
+
+  for (size_t i = 0; i < ROUNDS; i++) run_round();
+
+  printf("Successfully fuzzed through %llu kB of data\n",
+         (ROUNDS * MAXLEN) / 1024);
+}
+
+int main(int argc, char *argv[]) {
+  if (argc > 1)
+    seed = (unsigned)strtoul(argv[1], NULL, 10);
+  else
+    seed = (unsigned)time(NULL);
+
+  const struct CMUnitTest tests[] = {cmocka_unit_test(fuzz)};
+  return cmocka_run_group_tests(tests, NULL, NULL);
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/test/memory_allocation_test.c mysql-8.0-8.0.27/extra/libcbor/test/memory_allocation_test.c
--- mysql-8.0-8.0.26/extra/libcbor/test/memory_allocation_test.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/test/memory_allocation_test.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,277 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include <setjmp.h>
+#include <stdarg.h>
+#include <stddef.h>
+
+#include <cmocka.h>
+
+#include "cbor.h"
+
+// This test simulates cases when malloc unexpectedly fails and leaves a
+// possibly partially constructed object behind. It this is especially useful
+// in conjunction with the memory correctness check.
+//
+// WARNING: The test only works with CBOR_CUSTOM_ALLOC
+
+typedef enum call_expectation {
+  MALLOC,
+  MALLOC_FAIL,
+  REALLOC,
+  REALLOC_FAIL
+} call_expectation;
+
+// How many alloc calls we expect
+int alloc_calls_expected;
+// How many alloc calls we got
+int alloc_calls;
+// Array of booleans indicating whether to return a block or fail with NULL
+call_expectation *expectations;
+
+void set_mock_malloc(int calls, ...) {
+  va_list args;
+  va_start(args, calls);
+  alloc_calls_expected = calls;
+  alloc_calls = 0;
+  expectations = calloc(calls, sizeof(expectations));
+  for (int i = 0; i < calls; i++) {
+    // Promotable types, baby
+    expectations[i] = va_arg(args, call_expectation);
+  }
+  va_end(args);
+}
+
+void finalize_mock_malloc() {
+  assert_int_equal(alloc_calls, alloc_calls_expected);
+  free(expectations);
+}
+
+void *instrumented_malloc(size_t size) {
+  if (alloc_calls >= alloc_calls_expected) {
+    goto error;
+  }
+
+  if (expectations[alloc_calls] == MALLOC) {
+    alloc_calls++;
+    return malloc(size);
+  } else if (expectations[alloc_calls] == MALLOC_FAIL) {
+    alloc_calls++;
+    return NULL;
+  }
+
+error:
+  print_error("Unexpected call to malloc");
+  fail();
+  return NULL;
+}
+
+void *instrumented_realloc(void *ptr, size_t size) {
+  if (alloc_calls >= alloc_calls_expected) {
+    goto error;
+  }
+
+  if (expectations[alloc_calls] == REALLOC) {
+    alloc_calls++;
+    return realloc(ptr, size);
+  } else if (expectations[alloc_calls] == REALLOC_FAIL) {
+    alloc_calls++;
+    return NULL;
+  }
+
+error:
+  print_error("Unexpected call to realloc");
+  fail();
+  return NULL;
+}
+
+#define WITH_MOCK_MALLOC(block, malloc_calls, ...) \
+  do {                                             \
+    set_mock_malloc(malloc_calls, __VA_ARGS__);    \
+    block;                                         \
+    finalize_mock_malloc();                        \
+  } while (0)
+
+#define WITH_FAILING_MALLOC(block) WITH_MOCK_MALLOC(block, 1, MALLOC_FAIL)
+
+static void test_int_creation(void **state) {
+  WITH_FAILING_MALLOC({ assert_null(cbor_new_int8()); });
+  WITH_FAILING_MALLOC({ assert_null(cbor_new_int16()); });
+  WITH_FAILING_MALLOC({ assert_null(cbor_new_int32()); });
+  WITH_FAILING_MALLOC({ assert_null(cbor_new_int64()); });
+
+  WITH_FAILING_MALLOC({ assert_null(cbor_build_uint8(0xFF)); });
+  WITH_FAILING_MALLOC({ assert_null(cbor_build_uint16(0xFF)); });
+  WITH_FAILING_MALLOC({ assert_null(cbor_build_uint32(0xFF)); });
+  WITH_FAILING_MALLOC({ assert_null(cbor_build_uint64(0xFF)); });
+
+  WITH_FAILING_MALLOC({ assert_null(cbor_build_negint8(0xFF)); });
+  WITH_FAILING_MALLOC({ assert_null(cbor_build_negint16(0xFF)); });
+  WITH_FAILING_MALLOC({ assert_null(cbor_build_negint32(0xFF)); });
+  WITH_FAILING_MALLOC({ assert_null(cbor_build_negint64(0xFF)); });
+}
+
+static void test_bytestring_creation(void **state) {
+  WITH_FAILING_MALLOC({ assert_null(cbor_new_definite_bytestring()); });
+
+  WITH_FAILING_MALLOC({ assert_null(cbor_new_indefinite_bytestring()); });
+  WITH_MOCK_MALLOC({ assert_null(cbor_new_indefinite_bytestring()); }, 2,
+                   MALLOC, MALLOC_FAIL);
+
+  unsigned char bytes[] = {0, 0, 0xFF, 0xAB};
+
+  WITH_FAILING_MALLOC({ assert_null(cbor_build_bytestring(bytes, 4)); });
+  WITH_MOCK_MALLOC({ assert_null(cbor_build_bytestring(bytes, 4)); }, 2, MALLOC,
+                   MALLOC_FAIL);
+}
+
+static void test_string_creation(void **state) {
+  WITH_FAILING_MALLOC({ assert_null(cbor_new_definite_string()); });
+
+  WITH_FAILING_MALLOC({ assert_null(cbor_new_indefinite_string()); });
+  WITH_MOCK_MALLOC({ assert_null(cbor_new_indefinite_string()); }, 2, MALLOC,
+                   MALLOC_FAIL);
+
+  WITH_FAILING_MALLOC({ assert_null(cbor_build_string("Test")); });
+  WITH_MOCK_MALLOC({ assert_null(cbor_build_string("Test")); }, 2, MALLOC,
+                   MALLOC_FAIL);
+
+  WITH_FAILING_MALLOC({ assert_null(cbor_build_stringn("Test", 4)); });
+  WITH_MOCK_MALLOC({ assert_null(cbor_build_stringn("Test", 4)); }, 2, MALLOC,
+                   MALLOC_FAIL);
+}
+
+static void test_array_creation(void **state) {
+  WITH_FAILING_MALLOC({ assert_null(cbor_new_definite_array(42)); });
+  WITH_MOCK_MALLOC({ assert_null(cbor_new_definite_array(42)); }, 2, MALLOC,
+                   MALLOC_FAIL);
+
+  WITH_FAILING_MALLOC({ assert_null(cbor_new_indefinite_array()); });
+}
+
+static void test_map_creation(void **state) {
+  WITH_FAILING_MALLOC({ assert_null(cbor_new_definite_map(42)); });
+  WITH_MOCK_MALLOC({ assert_null(cbor_new_definite_map(42)); }, 2, MALLOC,
+                   MALLOC_FAIL);
+
+  WITH_FAILING_MALLOC({ assert_null(cbor_new_indefinite_map()); });
+}
+
+static void test_tag_creation(void **state) {
+  WITH_FAILING_MALLOC({ assert_null(cbor_new_tag(42)); });
+}
+
+static void test_float_ctrl_creation(void **state) {
+  WITH_FAILING_MALLOC({ assert_null(cbor_new_ctrl()); });
+  WITH_FAILING_MALLOC({ assert_null(cbor_new_float2()); });
+  WITH_FAILING_MALLOC({ assert_null(cbor_new_float4()); });
+  WITH_FAILING_MALLOC({ assert_null(cbor_new_float8()); });
+  WITH_FAILING_MALLOC({ assert_null(cbor_new_null()); });
+  WITH_FAILING_MALLOC({ assert_null(cbor_new_undef()); });
+
+  WITH_FAILING_MALLOC({ assert_null(cbor_build_bool(false)); });
+  WITH_FAILING_MALLOC({ assert_null(cbor_build_float2(3.14)); });
+  WITH_FAILING_MALLOC({ assert_null(cbor_build_float4(3.14)); });
+  WITH_FAILING_MALLOC({ assert_null(cbor_build_float8(3.14)); });
+  WITH_FAILING_MALLOC({ assert_null(cbor_build_ctrl(0xAF)); });
+}
+
+static void test_bytestring_add_chunk(void **state) {
+  unsigned char bytes[] = {0, 0, 0xFF, 0xAB};
+  WITH_MOCK_MALLOC(
+      {
+        cbor_item_t *bytestring = cbor_new_indefinite_bytestring();
+        cbor_item_t *chunk = cbor_build_bytestring(bytes, 4);
+
+        assert_false(cbor_bytestring_add_chunk(bytestring, chunk));
+        assert_int_equal(cbor_bytestring_chunk_count(bytestring), 0);
+        assert_int_equal(
+            ((struct cbor_indefinite_string_data *)bytestring->data)
+                ->chunk_capacity,
+            0);
+
+        cbor_decref(&chunk);
+        cbor_decref(&bytestring);
+      },
+      5, MALLOC, MALLOC, MALLOC, MALLOC, REALLOC_FAIL);
+}
+
+static void test_string_add_chunk(void **state) {
+  WITH_MOCK_MALLOC(
+      {
+        cbor_item_t *string = cbor_new_indefinite_string();
+        cbor_item_t *chunk = cbor_build_string("Hello!");
+
+        assert_false(cbor_string_add_chunk(string, chunk));
+        assert_int_equal(cbor_string_chunk_count(string), 0);
+        assert_int_equal(((struct cbor_indefinite_string_data *)string->data)
+                             ->chunk_capacity,
+                         0);
+
+        cbor_decref(&chunk);
+        cbor_decref(&string);
+      },
+      5, MALLOC, MALLOC, MALLOC, MALLOC, REALLOC_FAIL);
+}
+
+static void test_array_push(void **state) {
+  WITH_MOCK_MALLOC(
+      {
+        cbor_item_t *array = cbor_new_indefinite_array();
+        cbor_item_t *string = cbor_build_string("Hello!");
+
+        assert_false(cbor_array_push(array, string));
+        assert_int_equal(cbor_array_allocated(array), 0);
+        assert_null(array->data);
+        assert_int_equal(array->metadata.array_metadata.end_ptr, 0);
+
+        cbor_decref(&string);
+        cbor_decref(&array);
+      },
+      4, MALLOC, MALLOC, MALLOC, REALLOC_FAIL);
+}
+
+static void test_map_add(void **state) {
+  WITH_MOCK_MALLOC(
+      {
+        cbor_item_t *map = cbor_new_indefinite_map();
+        cbor_item_t *key = cbor_build_uint8(0);
+        cbor_item_t *value = cbor_build_bool(true);
+
+        assert_false(
+            cbor_map_add(map, (struct cbor_pair){.key = key, .value = value}));
+        assert_int_equal(cbor_map_allocated(map), 0);
+        assert_null(map->data);
+
+        cbor_decref(&map);
+        cbor_decref(&key);
+        cbor_decref(&value);
+      },
+      4, MALLOC, MALLOC, MALLOC, REALLOC_FAIL);
+}
+
+int main(void) {
+  cbor_set_allocs(instrumented_malloc, instrumented_realloc, free);
+
+  // TODO: string chunks realloc test
+  const struct CMUnitTest tests[] = {
+      cmocka_unit_test(test_int_creation),
+      cmocka_unit_test(test_bytestring_creation),
+      cmocka_unit_test(test_string_creation),
+      cmocka_unit_test(test_array_creation),
+      cmocka_unit_test(test_map_creation),
+      cmocka_unit_test(test_tag_creation),
+      cmocka_unit_test(test_float_ctrl_creation),
+
+      cmocka_unit_test(test_bytestring_add_chunk),
+      cmocka_unit_test(test_string_add_chunk),
+      cmocka_unit_test(test_array_push),
+      cmocka_unit_test(test_map_add),
+  };
+
+  return cmocka_run_group_tests(tests, NULL, NULL);
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/test/pretty_printer_test.c mysql-8.0-8.0.27/extra/libcbor/test/pretty_printer_test.c
--- mysql-8.0-8.0.26/extra/libcbor/test/pretty_printer_test.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/test/pretty_printer_test.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include <setjmp.h>
+#include <stdarg.h>
+#include <stddef.h>
+
+#include <cmocka.h>
+
+#include <stdio.h>
+#include "cbor.h"
+
+unsigned char data[] = {0x8B, 0x01, 0x20, 0x5F, 0x41, 0x01, 0x41, 0x02,
+                        0xFF, 0x7F, 0x61, 0x61, 0x61, 0x62, 0xFF, 0x9F,
+                        0xFF, 0xA1, 0x61, 0x61, 0x61, 0x62, 0xC0, 0xBF,
+                        0xFF, 0xFB, 0x40, 0x09, 0x1E, 0xB8, 0x51, 0xEB,
+                        0x85, 0x1F, 0xF6, 0xF7, 0xF5};
+
+static void test_pretty_printer(void **state) {
+#if CBOR_PRETTY_PRINTER
+  FILE *outfile = tmpfile();
+  struct cbor_load_result res;
+  cbor_item_t *item = cbor_load(data, 37, &res);
+  cbor_describe(item, outfile);
+  cbor_decref(&item);
+
+  item = cbor_new_ctrl();
+  cbor_set_ctrl(item, 1);
+  cbor_describe(item, outfile);
+  cbor_decref(&item);
+
+  fclose(outfile);
+#endif
+}
+
+int main(void) {
+  const struct CMUnitTest tests[] = {cmocka_unit_test(test_pretty_printer)};
+  return cmocka_run_group_tests(tests, NULL, NULL);
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/test/stack_over_limit_test.c mysql-8.0-8.0.27/extra/libcbor/test/stack_over_limit_test.c
--- mysql-8.0-8.0.26/extra/libcbor/test/stack_over_limit_test.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/test/stack_over_limit_test.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,35 @@
+#include <setjmp.h>
+#include <stdarg.h>
+#include <stddef.h>
+
+#include <cmocka.h>
+
+#include "assertions.h"
+#include "cbor.h"
+#include "stream_expectations.h"
+
+static size_t generate_overflow_data(unsigned char **overflow_data) {
+  int i;
+  *overflow_data = (unsigned char *)malloc(CBOR_MAX_STACK_SIZE + 3);
+  for (i = 0; i < CBOR_MAX_STACK_SIZE + 1; i++) {
+    (*overflow_data)[i] = 0xC2;  // tag of positive bignum
+  }
+  (*overflow_data)[CBOR_MAX_STACK_SIZE + 1] = 0x41;  // bytestring of length 1
+  (*overflow_data)[CBOR_MAX_STACK_SIZE + 2] = 0x01;  // a bignum of value 1
+  return CBOR_MAX_STACK_SIZE + 3;
+}
+
+static void test_stack_over_limit(void **state) {
+  unsigned char *overflow_data;
+  size_t overflow_data_len;
+  struct cbor_load_result res;
+  overflow_data_len = generate_overflow_data(&overflow_data);
+  cbor_load(overflow_data, overflow_data_len, &res);
+  free(overflow_data);
+  assert_int_equal(res.error.code, CBOR_ERR_MEMERROR);
+}
+
+int main() {
+  const struct CMUnitTest tests[] = {cmocka_unit_test(test_stack_over_limit)};
+  return cmocka_run_group_tests(tests, NULL, NULL);
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/test/stream_expectations.c mysql-8.0-8.0.27/extra/libcbor/test/stream_expectations.c
--- mysql-8.0-8.0.26/extra/libcbor/test/stream_expectations.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/test/stream_expectations.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,304 @@
+#include "stream_expectations.h"
+
+/* Ordered from 0 to queue_size - 1 */
+struct test_assertion assertions_queue[MAX_QUEUE_ITEMS];
+size_t queue_size = 0;
+size_t current_expectation = 0;
+decoder_t* decoder;
+
+void set_decoder(decoder_t* dec) { decoder = dec; }
+
+/* Callbacks */
+struct test_assertion current() {
+  return assertions_queue[current_expectation];
+}
+
+/* Assertions builders and matcher callbacks */
+
+void assert_uint8_eq(uint8_t actual) {
+  assertions_queue[queue_size++] = (struct test_assertion){
+      UINT8_EQ, (union test_expectation_data){.int8 = actual}};
+}
+
+void uint8_callback(void* context, uint8_t actual) {
+  assert_true(current().expectation == UINT8_EQ);
+  assert_true(current().data.int8 == actual);
+  current_expectation++;
+}
+
+void assert_uint16_eq(uint16_t actual) {
+  assertions_queue[queue_size++] = (struct test_assertion){
+      UINT16_EQ, (union test_expectation_data){.int16 = actual}};
+}
+
+void uint16_callback(void* context, uint16_t actual) {
+  assert_true(current().expectation == UINT16_EQ);
+  assert_true(current().data.int16 == actual);
+  current_expectation++;
+}
+
+void assert_uint32_eq(uint32_t actual) {
+  assertions_queue[queue_size++] = (struct test_assertion){
+      UINT32_EQ, (union test_expectation_data){.int32 = actual}};
+}
+
+void uint32_callback(void* context, uint32_t actual) {
+  assert_true(current().expectation == UINT32_EQ);
+  assert_true(current().data.int32 == actual);
+  current_expectation++;
+}
+
+void assert_uint64_eq(uint64_t actual) {
+  assertions_queue[queue_size++] = (struct test_assertion){
+      UINT64_EQ, (union test_expectation_data){.int64 = actual}};
+}
+
+void uint64_callback(void* context, uint64_t actual) {
+  assert_true(current().expectation == UINT64_EQ);
+  assert_true(current().data.int64 == actual);
+  current_expectation++;
+}
+
+void assert_negint8_eq(uint8_t actual) {
+  assertions_queue[queue_size++] = (struct test_assertion){
+      NEGINT8_EQ, (union test_expectation_data){.int8 = actual}};
+}
+
+void negint8_callback(void* context, uint8_t actual) {
+  assert_true(current().expectation == NEGINT8_EQ);
+  assert_true(current().data.int8 == actual);
+  current_expectation++;
+}
+
+void assert_negint16_eq(uint16_t actual) {
+  assertions_queue[queue_size++] = (struct test_assertion){
+      NEGINT16_EQ, (union test_expectation_data){.int16 = actual}};
+}
+
+void negint16_callback(void* context, uint16_t actual) {
+  assert_true(current().expectation == NEGINT16_EQ);
+  assert_true(current().data.int16 == actual);
+  current_expectation++;
+}
+
+void assert_negint32_eq(uint32_t actual) {
+  assertions_queue[queue_size++] = (struct test_assertion){
+      NEGINT32_EQ, (union test_expectation_data){.int32 = actual}};
+}
+
+void negint32_callback(void* context, uint32_t actual) {
+  assert_true(current().expectation == NEGINT32_EQ);
+  assert_true(current().data.int32 == actual);
+  current_expectation++;
+}
+
+void assert_negint64_eq(uint64_t actual) {
+  assertions_queue[queue_size++] = (struct test_assertion){
+      NEGINT64_EQ, (union test_expectation_data){.int64 = actual}};
+}
+
+void negint64_callback(void* context, uint64_t actual) {
+  assert_true(current().expectation == NEGINT64_EQ);
+  assert_true(current().data.int64 == actual);
+  current_expectation++;
+}
+
+void assert_bstring_mem_eq(cbor_data address, size_t length) {
+  assertions_queue[queue_size++] = (struct test_assertion){
+      BSTRING_MEM_EQ,
+      (union test_expectation_data){.string = {address, length}}};
+}
+
+void byte_string_callback(void* context, cbor_data address, size_t length) {
+  assert_true(current().expectation == BSTRING_MEM_EQ);
+  assert_true(current().data.string.address == address);
+  assert_true(current().data.string.length == length);
+  current_expectation++;
+}
+
+void assert_bstring_indef_start() {
+  assertions_queue[queue_size++] =
+      (struct test_assertion){.expectation = BSTRING_INDEF_START};
+}
+
+void byte_string_start_callback(void* context) {
+  assert_true(current().expectation == BSTRING_INDEF_START);
+  current_expectation++;
+}
+
+void assert_indef_break() {
+  assertions_queue[queue_size++] =
+      (struct test_assertion){.expectation = INDEF_BREAK};
+}
+
+void indef_break_callback(void* context) {
+  assert_true(current().expectation == INDEF_BREAK);
+  current_expectation++;
+}
+
+void assert_array_start(size_t length) {
+  assertions_queue[queue_size++] =
+      (struct test_assertion){ARRAY_START, {.length = length}};
+}
+
+void array_start_callback(void* context, size_t length) {
+  assert_true(current().expectation == ARRAY_START);
+  assert_true(current().data.length == length);
+  current_expectation++;
+}
+
+void assert_indef_array_start() {
+  assertions_queue[queue_size++] =
+      (struct test_assertion){.expectation = ARRAY_INDEF_START};
+}
+
+void indef_array_start_callback(void* context) {
+  assert_true(current().expectation == ARRAY_INDEF_START);
+  current_expectation++;
+}
+
+void assert_map_start(size_t length) {
+  assertions_queue[queue_size++] =
+      (struct test_assertion){MAP_START, {.length = length}};
+}
+
+void map_start_callback(void* context, size_t length) {
+  assert_true(current().expectation == MAP_START);
+  assert_true(current().data.length == length);
+  current_expectation++;
+}
+
+void assert_indef_map_start() {
+  assertions_queue[queue_size++] =
+      (struct test_assertion){.expectation = MAP_INDEF_START};
+}
+
+void indef_map_start_callback(void* context) {
+  assert_true(current().expectation == MAP_INDEF_START);
+  current_expectation++;
+}
+
+void assert_tag_eq(uint64_t value) {
+  assertions_queue[queue_size++] =
+      (struct test_assertion){TAG_EQ, {.int64 = value}};
+}
+
+void tag_callback(void* context, uint64_t value) {
+  assert_true(current().expectation == TAG_EQ);
+  assert_true(current().data.int64 == value);
+  current_expectation++;
+}
+
+void assert_half(float value) {
+  assertions_queue[queue_size++] =
+      (struct test_assertion){HALF_EQ, {.float2 = value}};
+}
+
+void half_callback(void* context, float actual) {
+  assert_true(current().expectation == HALF_EQ);
+  assert_true(current().data.float2 == actual);
+  current_expectation++;
+}
+
+void assert_float(float value) {
+  assertions_queue[queue_size++] =
+      (struct test_assertion){FLOAT_EQ, {.float4 = value}};
+}
+
+void float_callback(void* context, float actual) {
+  assert_true(current().expectation == FLOAT_EQ);
+  assert_true(current().data.float4 == actual);
+  current_expectation++;
+}
+
+void assert_double(double value) {
+  assertions_queue[queue_size++] =
+      (struct test_assertion){DOUBLE_EQ, {.float8 = value}};
+}
+
+void double_callback(void* context, double actual) {
+  assert_true(current().expectation == DOUBLE_EQ);
+  assert_true(current().data.float8 == actual);
+  current_expectation++;
+}
+
+void assert_bool(bool value) {
+  assertions_queue[queue_size++] =
+      (struct test_assertion){BOOL_EQ, {.boolean = value}};
+}
+
+void assert_nil() {
+  assertions_queue[queue_size++] = (struct test_assertion){.expectation = NIL};
+}
+
+void assert_undef() {
+  assertions_queue[queue_size++] =
+      (struct test_assertion){.expectation = UNDEF};
+}
+
+void bool_callback(void* context, bool actual) {
+  assert_true(current().expectation == BOOL_EQ);
+  assert_true(current().data.boolean == actual);
+  current_expectation++;
+}
+
+void null_callback(void* context) {
+  assert_true(current().expectation == NIL);
+  current_expectation++;
+}
+
+void undef_callback(void* context) {
+  assert_true(current().expectation == UNDEF);
+  current_expectation++;
+}
+
+const struct cbor_callbacks asserting_callbacks = {
+
+    .uint8 = &uint8_callback,
+
+    .uint16 = &uint16_callback,
+
+    .uint32 = &uint32_callback,
+
+    .uint64 = &uint64_callback,
+
+    .negint8 = &negint8_callback,
+
+    .negint16 = &negint16_callback,
+
+    .negint32 = &negint32_callback,
+
+    .negint64 = &negint64_callback,
+
+    .byte_string = &byte_string_callback,
+    .byte_string_start = &byte_string_start_callback,
+
+    .array_start = &array_start_callback,
+    .indef_array_start = &indef_array_start_callback,
+
+    .map_start = &map_start_callback,
+    .indef_map_start = &indef_map_start_callback,
+
+    .tag = &tag_callback,
+
+    .float2 = &half_callback,
+
+    .float4 = &float_callback,
+
+    .float8 = &double_callback,
+
+    .undefined = &undef_callback,
+    .boolean = &bool_callback,
+    .null = &null_callback,
+    .indef_break = &indef_break_callback};
+
+struct cbor_decoder_result decode(cbor_data source, size_t source_size) {
+  struct cbor_decoder_result result =
+      decoder(source, source_size, &asserting_callbacks, NULL);
+  /* Check remaining assertions */
+
+  assert_true(current_expectation == queue_size);
+  /* Clean up */
+  current_expectation = queue_size = 0;
+  return result;
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/test/stream_expectations.c.erb mysql-8.0-8.0.27/extra/libcbor/test/stream_expectations.c.erb
--- mysql-8.0-8.0.26/extra/libcbor/test/stream_expectations.c.erb	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/test/stream_expectations.c.erb	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,199 @@
+#include "stream_expectations.h"
+
+/* Ordered from 0 to queue_size - 1 */
+struct test_assertion assertions_queue[MAX_QUEUE_ITEMS];
+size_t queue_size = 0;
+size_t current_expectation = 0;
+decoder_t * decoder;
+
+
+void set_decoder(decoder_t * dec)
+{
+	decoder = dec;
+}
+
+/* Callbacks */
+struct test_assertion current()
+{
+	return assertions_queue[current_expectation];
+}
+
+/* Assertions builders and matcher callbacks */
+<% %w(u neg).each do |type| %>
+	<% [8, 16, 32, 64].each do |width| %>
+		void assert_<%= type %>int<%= width %>_eq(uint<%= width %>_t actual)
+		{
+			assertions_queue[queue_size++] = (struct test_assertion) { <%= type.upcase %>INT<%= width %>_EQ, (union test_expectation_data) { .int<%= width %> = actual } };
+		}
+
+		void <%= type %>int<%= width %>_callback(void * context, uint<%= width %>_t actual)
+		{
+			assert_true(current().expectation == <%= type.upcase %>INT<%= width %>_EQ);
+			assert_true(current().data.int<%= width %> == actual);
+			current_expectation++;
+		}
+	<% end %>
+<% end %>
+
+void assert_bstring_mem_eq(cbor_data address, size_t length)
+{
+	assertions_queue[queue_size++] = (struct test_assertion) { BSTRING_MEM_EQ, (union test_expectation_data) { .string = { address, length } } };
+}
+
+void byte_string_callback(void * context, cbor_data address, size_t length)
+{
+	assert_true(current().expectation == BSTRING_MEM_EQ);
+	assert_true(current().data.string.address == address);
+	assert_true(current().data.string.length == length);
+	current_expectation++;
+}
+
+void assert_bstring_indef_start()
+{
+	assertions_queue[queue_size++] = (struct test_assertion) { .expectation = BSTRING_INDEF_START };
+}
+
+void byte_string_start_callback(void * context)
+{
+	assert_true(current().expectation == BSTRING_INDEF_START);
+	current_expectation++;
+}
+
+void assert_indef_break()
+{
+	assertions_queue[queue_size++] = (struct test_assertion) { .expectation = INDEF_BREAK };
+}
+
+void indef_break_callback(void * context)
+{
+	assert_true(current().expectation == INDEF_BREAK);
+	current_expectation++;
+}
+
+<% %w(array map).each do |type| %>
+	void assert_<%= type %>_start(size_t length)
+	{
+		assertions_queue[queue_size++] = (struct test_assertion) { <%= type.upcase %>_START, { .length = length } };
+	}
+
+
+	void <%= type %>_start_callback(void * context, size_t length)
+	{
+		assert_true(current().expectation == <%= type.upcase %>_START);
+		assert_true(current().data.length == length);
+		current_expectation++;
+	}
+
+	void assert_indef_<%= type %>_start()
+	{
+		assertions_queue[queue_size++] = (struct test_assertion) { .expectation = <%= type.upcase %>_INDEF_START };
+	}
+
+	void indef_<%= type %>_start_callback(void * context)
+	{
+		assert_true(current().expectation == <%= type.upcase %>_INDEF_START);
+		current_expectation++;
+	}
+<% end %>
+
+void assert_tag_eq(uint64_t value)
+{
+	assertions_queue[queue_size++] = (struct test_assertion) { TAG_EQ , { .int64 = value } };
+}
+
+void tag_callback(void * context, uint64_t value)
+{
+	assert_true(current().expectation == TAG_EQ);
+	assert_true(current().data.int64 == value);
+	current_expectation++;
+}
+
+
+<% [['half', 2, 'float'], ['float', 4], ['double', 8]].each do |decimal| %>
+	void assert_<%= decimal[0] %>(<%= decimal[2] || decimal[0] %> value)
+	{
+		assertions_queue[queue_size++] = (struct test_assertion) { <%= decimal[0].upcase %>_EQ, { .float<%= decimal[1] %> = value } };
+	}
+
+	void <%= decimal[0] %>_callback(void * context, <%= decimal[2] || decimal[0] %> actual)
+	{
+		assert_true(current().expectation == <%= decimal[0].upcase %>_EQ);
+		assert_true(current().data.float<%= decimal[1] %> == actual);
+		current_expectation++;
+	}
+<% end %>
+
+void assert_bool(bool value)
+{
+	assertions_queue[queue_size++] = (struct test_assertion) { BOOL_EQ, { .boolean = value } };
+}
+
+void assert_nil()
+{
+	assertions_queue[queue_size++] = (struct test_assertion) { .expectation = NIL };
+}
+
+void assert_undef()
+{
+	assertions_queue[queue_size++] = (struct test_assertion) { .expectation = UNDEF };
+}
+
+
+void bool_callback(void * context, bool actual)
+{
+	assert_true(current().expectation == BOOL_EQ);
+	assert_true(current().data.boolean == actual);
+	current_expectation++;
+}
+
+void null_callback(void * context)
+{
+	assert_true(current().expectation == NIL);
+	current_expectation++;
+}
+
+void undef_callback(void * context)
+{
+	assert_true(current().expectation == UNDEF);
+	current_expectation++;
+}
+
+const struct cbor_callbacks asserting_callbacks = {
+	<% %w(u neg).each do |type| %>
+		<% [8, 16, 32, 64].each do |width| %>
+			.<%= type %>int<%= width %> = &<%= type %>int<%= width %>_callback,
+		<% end %>
+	<% end %>
+
+	.byte_string = &byte_string_callback,
+	.byte_string_start = &byte_string_start_callback,
+
+	<% %w(array map).each do |type| %>
+		.<%= type %>_start = &<%= type %>_start_callback,
+		.indef_<%= type %>_start = &indef_<%= type %>_start_callback,
+	<% end %>
+
+	.tag = &tag_callback,
+
+	<% [['half', 2], ['float', 4], ['double', 8]].each do |decimal| %>
+		.float<%= decimal[1] %> = &<%= decimal[0] %>_callback,
+	<% end %>
+
+	.undefined = &undef_callback,
+	.boolean = &bool_callback,
+	.null = &null_callback,
+	.indef_break = &indef_break_callback
+};
+
+struct cbor_decoder_result decode(cbor_data source, size_t source_size)
+{
+	struct cbor_decoder_result result = decoder(source, source_size, &asserting_callbacks, NULL);
+	/* Check remaining assertions */
+
+	assert_true(current_expectation == queue_size);
+	/* Clean up */
+	current_expectation = queue_size = 0;
+	return result;
+}
+
+
diff -Nru mysql-8.0-8.0.26/extra/libcbor/test/stream_expectations.h mysql-8.0-8.0.27/extra/libcbor/test/stream_expectations.h
--- mysql-8.0-8.0.26/extra/libcbor/test/stream_expectations.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/test/stream_expectations.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,147 @@
+/*
+ * This file provides testing tools for the streaming decoder. The intended
+ * usage is as follows: 1) SE API wrapper is initialized 2) Client builds
+ * (ordered) series of expectations 3) The decoder is executed 4) SE checks all
+ * assertions 5) Go to 2) if desired
+ */
+
+#ifndef STREAM_EXPECTATIONS_H_
+#define STREAM_EXPECTATIONS_H_
+
+#include <setjmp.h>
+#include <stdarg.h>
+#include <stddef.h>
+
+#include <cmocka.h>
+
+#include <stdint.h>
+#include "cbor.h"
+
+#define MAX_QUEUE_ITEMS 30
+
+enum test_expectation {
+  UINT8_EQ,
+  UINT16_EQ,
+  UINT32_EQ,
+  UINT64_EQ,
+
+  NEGINT8_EQ,
+  NEGINT16_EQ,
+  NEGINT32_EQ,
+  NEGINT64_EQ,
+
+  BSTRING_MEM_EQ, /* Matches length and memory address for definite byte strings
+                   */
+  BSTRING_INDEF_START,
+
+  ARRAY_START, /* Definite arrays only */
+  ARRAY_INDEF_START,
+
+  MAP_START, /* Definite maps only */
+  MAP_INDEF_START,
+
+  TAG_EQ,
+
+  HALF_EQ,
+  FLOAT_EQ,
+  DOUBLE_EQ,
+  BOOL_EQ,
+  NIL,
+  UNDEF,
+  INDEF_BREAK /* Expect "Break" */
+};
+
+union test_expectation_data {
+  uint8_t int8;
+  uint16_t int16;
+  uint32_t int32;
+  uint64_t int64;
+  struct string {
+    cbor_data address;
+    size_t length;
+  } string;
+  size_t length;
+  float float2;
+  float float4;
+  double float8;
+  bool boolean;
+};
+
+struct test_assertion {
+  enum test_expectation expectation;
+  union test_expectation_data data;
+};
+
+/* Tested function */
+typedef struct cbor_decoder_result decoder_t(cbor_data, size_t,
+                                             const struct cbor_callbacks *,
+                                             void *);
+
+void set_decoder(decoder_t *);
+struct cbor_decoder_result decode(cbor_data, size_t);
+
+/* Assertions builders */
+
+void assert_uint8_eq(uint8_t);
+void assert_uint16_eq(uint16_t);
+void assert_uint32_eq(uint32_t);
+void assert_uint64_eq(uint64_t);
+
+void assert_negint8_eq(uint8_t);
+void assert_negint16_eq(uint16_t);
+void assert_negint32_eq(uint32_t);
+void assert_negint64_eq(uint64_t);
+
+void assert_bstring_mem_eq(cbor_data, size_t);
+void assert_bstring_indef_start();
+
+void assert_array_start(size_t);
+void assert_indef_array_start();
+
+void assert_map_start(size_t);
+void assert_indef_map_start();
+
+void assert_tag_eq(uint64_t);
+
+void assert_half(float);
+void assert_float(float);
+void assert_double(double);
+
+void assert_bool(bool);
+void assert_nil(); /* assert_null already exists */
+void assert_undef();
+
+void assert_indef_break();
+
+/* Assertions verifying callbacks */
+void uint8_callback(void *, uint8_t);
+void uint16_callback(void *, uint16_t);
+void uint32_callback(void *, uint32_t);
+void uint64_callback(void *, uint64_t);
+
+void negint8_callback(void *, uint8_t);
+void negint16_callback(void *, uint16_t);
+void negint32_callback(void *, uint32_t);
+void negint64_callback(void *, uint64_t);
+
+void byte_string_callback(void *, cbor_data, size_t);
+void byte_string_start_callback(void *);
+
+void array_start_callback(void *, size_t);
+void indef_array_start_callback(void *);
+
+void map_start_callback(void *, size_t);
+void indef_map_start_callback(void *);
+
+void tag_callback(void *, uint64_t);
+
+void half_callback(void *, float);
+void float_callback(void *, float);
+void double_callback(void *, double);
+void indef_break_callback(void *);
+
+void bool_callback(void *, bool);
+void null_callback(void *);
+void undef_callback(void *);
+
+#endif
diff -Nru mysql-8.0-8.0.26/extra/libcbor/test/type_0_encoders_test.c mysql-8.0-8.0.27/extra/libcbor/test/type_0_encoders_test.c
--- mysql-8.0-8.0.26/extra/libcbor/test/type_0_encoders_test.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/test/type_0_encoders_test.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include <setjmp.h>
+#include <stdarg.h>
+#include <stddef.h>
+
+#include <cmocka.h>
+
+#include "cbor.h"
+
+unsigned char buffer[512];
+
+static void test_embedded_uint8(void **state) {
+  assert_int_equal(1, cbor_encode_uint8(14, buffer, 512));
+  assert_memory_equal(buffer, (unsigned char[]){0x0E}, 1);
+}
+
+static void test_uint8(void **state) {
+  assert_int_equal(0, cbor_encode_uint8(180, buffer, 1));
+  assert_int_equal(2, cbor_encode_uint8(255, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0x18, 0xFF}), 2);
+}
+
+static void test_uint16(void **state) {
+  assert_int_equal(0, cbor_encode_uint16(1000, buffer, 2));
+  assert_int_equal(3, cbor_encode_uint16(1000, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0x19, 0x03, 0xE8}), 3);
+}
+
+static void test_uint32(void **state) {
+  assert_int_equal(0, cbor_encode_uint32(1000000, buffer, 4));
+  assert_int_equal(5, cbor_encode_uint32(1000000, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0x1A, 0x00, 0x0F, 0x42, 0x40}),
+                      5);
+}
+
+static void test_uint64(void **state) {
+  assert_int_equal(0, cbor_encode_uint64(18446744073709551615ULL, buffer, 8));
+  assert_int_equal(9, cbor_encode_uint64(18446744073709551615ULL, buffer, 512));
+  assert_memory_equal(
+      buffer,
+      ((unsigned char[]){0x1B, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}),
+      9);
+}
+
+static void test_unspecified(void **state) {
+  assert_int_equal(9, cbor_encode_uint(18446744073709551615ULL, buffer, 512));
+  assert_memory_equal(
+      buffer,
+      ((unsigned char[]){0x1B, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}),
+      9);
+  assert_int_equal(5, cbor_encode_uint(1000000, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0x1A, 0x00, 0x0F, 0x42, 0x40}),
+                      5);
+  assert_int_equal(3, cbor_encode_uint(1000, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0x19, 0x03, 0xE8}), 3);
+  assert_int_equal(2, cbor_encode_uint(255, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0x18, 0xFF}), 2);
+}
+
+int main(void) {
+  const struct CMUnitTest tests[] = {cmocka_unit_test(test_embedded_uint8),
+                                     cmocka_unit_test(test_uint8),
+                                     cmocka_unit_test(test_uint16),
+                                     cmocka_unit_test(test_uint32),
+                                     cmocka_unit_test(test_uint64),
+                                     cmocka_unit_test(test_unspecified)};
+  return cmocka_run_group_tests(tests, NULL, NULL);
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/test/type_0_test.c mysql-8.0-8.0.27/extra/libcbor/test/type_0_test.c
--- mysql-8.0-8.0.26/extra/libcbor/test/type_0_test.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/test/type_0_test.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include <setjmp.h>
+#include <stdarg.h>
+#include <stddef.h>
+
+#include <cmocka.h>
+
+#include "cbor.h"
+
+cbor_item_t *number;
+struct cbor_load_result res;
+
+unsigned char data1[] = {0x02, 0xFF};
+unsigned char data2[] = {0x18, 0xFF, 0xFF};
+unsigned char data3[] = {0x19, 0x01, 0xf4, 0xFF};
+unsigned char data4[] = {0x1a, 0xa5, 0xf7, 0x02, 0xb3, 0xFF};
+unsigned char data5[] = {0x1b, 0xa5, 0xf7, 0x02, 0xb3,
+                         0xa5, 0xf7, 0x02, 0xb3, 0xFF};
+
+static void test_very_short_int(void **state) {
+  number = cbor_load(data1, 2, &res);
+  assert_true(cbor_typeof(number) == CBOR_TYPE_UINT);
+  assert_true(cbor_int_get_width(number) == CBOR_INT_8);
+  assert_true(cbor_isa_uint(number));
+  assert_false(cbor_isa_negint(number));
+  assert_true(cbor_get_uint8(number) == 2);
+  assert_true(res.error.code == 0);
+  assert_true(res.read == 1);
+  assert_true(cbor_is_int(number));
+  cbor_decref(&number);
+  assert_null(number);
+}
+
+static void test_incomplete_data(void **state) {
+  number = cbor_load(data2, 1, &res);
+  assert_null(number);
+  assert_true(res.error.code == CBOR_ERR_NOTENOUGHDATA);
+}
+
+static void test_short_int(void **state) {
+  number = cbor_load(data2, 3, &res);
+  assert_true(cbor_typeof(number) == CBOR_TYPE_UINT);
+  assert_true(cbor_int_get_width(number) == CBOR_INT_8);
+  assert_true(cbor_isa_uint(number));
+  assert_false(cbor_isa_negint(number));
+  assert_true(cbor_get_uint8(number) == 255);
+  assert_true(res.error.code == 0);
+  assert_true(res.read == 2);
+  assert_true(cbor_is_int(number));
+  cbor_decref(&number);
+  assert_null(number);
+}
+
+static void test_half_int(void **state) {
+  number = cbor_load(data3, 5, &res);
+  assert_true(cbor_typeof(number) == CBOR_TYPE_UINT);
+  assert_true(cbor_int_get_width(number) == CBOR_INT_16);
+  assert_true(cbor_isa_uint(number));
+  assert_false(cbor_isa_negint(number));
+  assert_true(cbor_get_uint16(number) == 500);
+  assert_true(res.error.code == 0);
+  assert_true(res.read == 3);
+  assert_true(cbor_is_int(number));
+  cbor_decref(&number);
+  assert_null(number);
+}
+
+static void test_int(void **state) {
+  number = cbor_load(data4, 6, &res);
+  assert_true(cbor_typeof(number) == CBOR_TYPE_UINT);
+  assert_true(cbor_int_get_width(number) == CBOR_INT_32);
+  assert_true(cbor_isa_uint(number));
+  assert_false(cbor_isa_negint(number));
+  assert_true(cbor_get_uint32(number) == 2784428723);
+  assert_true(res.error.code == 0);
+  assert_true(res.read == 5);
+  assert_true(cbor_is_int(number));
+  cbor_decref(&number);
+  assert_null(number);
+}
+
+static void test_long_int(void **state) {
+  number = cbor_load(data5, 10, &res);
+  assert_true(cbor_typeof(number) == CBOR_TYPE_UINT);
+  assert_true(cbor_int_get_width(number) == CBOR_INT_64);
+  assert_true(cbor_isa_uint(number));
+  assert_false(cbor_isa_negint(number));
+  assert_true(cbor_get_uint64(number) == 11959030306112471731ULL);
+  assert_true(res.error.code == 0);
+  assert_true(res.read == 9);
+  assert_true(cbor_is_int(number));
+  cbor_decref(&number);
+  assert_null(number);
+}
+
+static void test_refcounting(void **state) {
+  number = cbor_load(data5, 10, &res);
+  cbor_incref(number);
+  assert_true(number->refcount == 2);
+  cbor_decref(&number);
+  assert_non_null(number);
+  cbor_decref(&number);
+  assert_null(number);
+}
+
+static void test_empty_input(void **state) {
+  number = cbor_load(data5, 0, &res);
+  assert_null(number);
+  assert_true(res.error.code == CBOR_ERR_NODATA);
+}
+
+static void test_inline_creation(void **state) {
+  number = cbor_build_uint8(10);
+  assert_true(cbor_get_int(number) == 10);
+  cbor_decref(&number);
+
+  number = cbor_build_uint16(10);
+  assert_true(cbor_get_int(number) == 10);
+  cbor_decref(&number);
+
+  number = cbor_build_uint32(10);
+  assert_true(cbor_get_int(number) == 10);
+  cbor_decref(&number);
+
+  number = cbor_build_uint64(10);
+  assert_true(cbor_get_int(number) == 10);
+  cbor_decref(&number);
+}
+
+int main(void) {
+  const struct CMUnitTest tests[] = {cmocka_unit_test(test_very_short_int),
+                                     cmocka_unit_test(test_short_int),
+                                     cmocka_unit_test(test_half_int),
+                                     cmocka_unit_test(test_int),
+                                     cmocka_unit_test(test_long_int),
+                                     cmocka_unit_test(test_incomplete_data),
+                                     cmocka_unit_test(test_refcounting),
+                                     cmocka_unit_test(test_empty_input),
+                                     cmocka_unit_test(test_inline_creation)};
+  return cmocka_run_group_tests(tests, NULL, NULL);
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/test/type_1_encoders_test.c mysql-8.0-8.0.27/extra/libcbor/test/type_1_encoders_test.c
--- mysql-8.0-8.0.26/extra/libcbor/test/type_1_encoders_test.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/test/type_1_encoders_test.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include <setjmp.h>
+#include <stdarg.h>
+#include <stddef.h>
+
+#include <cmocka.h>
+
+#include "cbor.h"
+
+unsigned char buffer[512];
+
+static void test_embedded_negint8(void **state) {
+  assert_int_equal(1, cbor_encode_negint8(14, buffer, 512));
+  assert_memory_equal(buffer, (unsigned char[]){0x2E}, 1);
+}
+
+static void test_negint8(void **state) {
+  assert_int_equal(0, cbor_encode_negint8(180, buffer, 1));
+  assert_int_equal(2, cbor_encode_negint8(255, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0x38, 0xFF}), 2);
+}
+
+static void test_negint16(void **state) {
+  assert_int_equal(0, cbor_encode_negint16(1000, buffer, 2));
+  assert_int_equal(3, cbor_encode_negint16(1000, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0x39, 0x03, 0xE8}), 3);
+}
+
+static void test_negint32(void **state) {
+  assert_int_equal(0, cbor_encode_negint32(1000000, buffer, 4));
+  assert_int_equal(5, cbor_encode_negint32(1000000, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0x3A, 0x00, 0x0F, 0x42, 0x40}),
+                      5);
+}
+
+static void test_negint64(void **state) {
+  assert_int_equal(0, cbor_encode_negint64(18446744073709551615ULL, buffer, 8));
+  assert_int_equal(9,
+                   cbor_encode_negint64(18446744073709551615ULL, buffer, 512));
+  assert_memory_equal(
+      buffer,
+      ((unsigned char[]){0x3B, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}),
+      9);
+}
+
+static void test_unspecified(void **state) {
+  assert_int_equal(9, cbor_encode_negint(18446744073709551615ULL, buffer, 512));
+  assert_memory_equal(
+      buffer,
+      ((unsigned char[]){0x3B, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}),
+      9);
+  assert_int_equal(5, cbor_encode_negint(1000000, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0x3A, 0x00, 0x0F, 0x42, 0x40}),
+                      5);
+  assert_int_equal(3, cbor_encode_negint(1000, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0x39, 0x03, 0xE8}), 3);
+  assert_int_equal(2, cbor_encode_negint(255, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0x38, 0xFF}), 2);
+}
+
+int main(void) {
+  const struct CMUnitTest tests[] = {cmocka_unit_test(test_embedded_negint8),
+                                     cmocka_unit_test(test_negint8),
+                                     cmocka_unit_test(test_negint16),
+                                     cmocka_unit_test(test_negint32),
+                                     cmocka_unit_test(test_negint64),
+                                     cmocka_unit_test(test_unspecified)};
+  return cmocka_run_group_tests(tests, NULL, NULL);
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/test/type_1_test.c mysql-8.0-8.0.27/extra/libcbor/test/type_1_test.c
--- mysql-8.0-8.0.26/extra/libcbor/test/type_1_test.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/test/type_1_test.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include <setjmp.h>
+#include <stdarg.h>
+#include <stddef.h>
+
+#include <cmocka.h>
+
+#include "cbor.h"
+
+cbor_item_t *number;
+struct cbor_load_result res;
+
+unsigned char data1[] = {0x22, 0xFF};
+unsigned char data2[] = {0x38, 0xFF, 0xFF};
+unsigned char data3[] = {0x39, 0x01, 0xf4, 0xFF};
+unsigned char data4[] = {0x3a, 0xa5, 0xf7, 0x02, 0xb3, 0xFF};
+unsigned char data5[] = {0x3b, 0xa5, 0xf7, 0x02, 0xb3,
+                         0xa5, 0xf7, 0x02, 0xb3, 0xFF};
+
+static void test_very_short_int(void **state) {
+  number = cbor_load(data1, 2, &res);
+  assert_true(cbor_typeof(number) == CBOR_TYPE_NEGINT);
+  assert_true(cbor_int_get_width(number) == CBOR_INT_8);
+  assert_false(cbor_isa_uint(number));
+  assert_true(cbor_isa_negint(number));
+  assert_true(cbor_get_uint8(number) == 2);
+  assert_true(res.error.code == 0);
+  assert_true(res.read == 1);
+  assert_true(cbor_is_int(number));
+  cbor_decref(&number);
+  assert_null(number);
+}
+
+static void test_short_int(void **state) {
+  number = cbor_load(data2, 3, &res);
+  assert_true(cbor_typeof(number) == CBOR_TYPE_NEGINT);
+  assert_true(cbor_int_get_width(number) == CBOR_INT_8);
+  assert_false(cbor_isa_uint(number));
+  assert_true(cbor_isa_negint(number));
+  assert_true(cbor_get_uint8(number) == 255);
+  assert_true(res.error.code == 0);
+  assert_true(res.read == 2);
+  assert_true(cbor_is_int(number));
+  cbor_decref(&number);
+  assert_null(number);
+}
+
+static void test_half_int(void **state) {
+  number = cbor_load(data3, 5, &res);
+  assert_true(cbor_typeof(number) == CBOR_TYPE_NEGINT);
+  assert_true(cbor_int_get_width(number) == CBOR_INT_16);
+  assert_false(cbor_isa_uint(number));
+  assert_true(cbor_isa_negint(number));
+  assert_true(cbor_get_uint16(number) == 500);
+  assert_true(res.error.code == 0);
+  assert_true(res.read == 3);
+  assert_true(cbor_is_int(number));
+  cbor_decref(&number);
+  assert_null(number);
+}
+
+static void test_int(void **state) {
+  number = cbor_load(data4, 6, &res);
+  assert_true(cbor_typeof(number) == CBOR_TYPE_NEGINT);
+  assert_true(cbor_int_get_width(number) == CBOR_INT_32);
+  assert_false(cbor_isa_uint(number));
+  assert_true(cbor_isa_negint(number));
+  assert_true(cbor_get_uint32(number) == 2784428723);
+  assert_true(res.error.code == 0);
+  assert_true(res.read == 5);
+  assert_true(cbor_is_int(number));
+  cbor_decref(&number);
+  assert_null(number);
+}
+
+static void test_long_int(void **state) {
+  number = cbor_load(data5, 10, &res);
+  assert_true(cbor_typeof(number) == CBOR_TYPE_NEGINT);
+  assert_true(cbor_int_get_width(number) == CBOR_INT_64);
+  assert_false(cbor_isa_uint(number));
+  assert_true(cbor_isa_negint(number));
+  assert_true(cbor_get_uint64(number) == 11959030306112471731ULL);
+  assert_true(res.error.code == 0);
+  assert_true(res.read == 9);
+  assert_true(cbor_is_int(number));
+  cbor_decref(&number);
+  assert_null(number);
+}
+
+int main(void) {
+  const struct CMUnitTest tests[] = {
+      cmocka_unit_test(test_very_short_int), cmocka_unit_test(test_short_int),
+      cmocka_unit_test(test_half_int), cmocka_unit_test(test_int),
+      cmocka_unit_test(test_long_int)};
+  return cmocka_run_group_tests(tests, NULL, NULL);
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/test/type_2_encoders_test.c mysql-8.0-8.0.27/extra/libcbor/test/type_2_encoders_test.c
--- mysql-8.0-8.0.26/extra/libcbor/test/type_2_encoders_test.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/test/type_2_encoders_test.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include <setjmp.h>
+#include <stdarg.h>
+#include <stddef.h>
+
+#include <cmocka.h>
+
+#include "cbor.h"
+
+unsigned char buffer[512];
+
+static void test_embedded_bytestring_start(void **state) {
+  assert_int_equal(1, cbor_encode_bytestring_start(1, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0x41}), 1);
+}
+
+static void test_bytestring_start(void **state) {
+  assert_int_equal(5, cbor_encode_bytestring_start(1000000, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0x5A, 0x00, 0x0F, 0x42, 0x40}),
+                      5);
+}
+
+static void test_indef_bytestring_start(void **state) {
+  assert_int_equal(0, cbor_encode_indef_bytestring_start(buffer, 0));
+  assert_int_equal(1, cbor_encode_indef_bytestring_start(buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0x5F}), 1);
+}
+
+int main(void) {
+  const struct CMUnitTest tests[] = {
+      cmocka_unit_test(test_embedded_bytestring_start),
+      cmocka_unit_test(test_bytestring_start),
+      cmocka_unit_test(test_indef_bytestring_start)};
+  return cmocka_run_group_tests(tests, NULL, NULL);
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/test/type_2_test.c mysql-8.0-8.0.27/extra/libcbor/test/type_2_test.c
--- mysql-8.0-8.0.26/extra/libcbor/test/type_2_test.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/test/type_2_test.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,327 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include <setjmp.h>
+#include <stdarg.h>
+#include <stddef.h>
+
+#include <cmocka.h>
+
+#include "cbor.h"
+
+cbor_item_t *bs;
+struct cbor_load_result res;
+
+unsigned char data1[] = {0x40, 0xFF};
+unsigned char data2[] = {0x41, 0xA1};
+unsigned char data3[] = {0x58, 0x01, 0xA1, 0xFF};
+unsigned char data4[] = {
+    0x58, 0xFF, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09,
+    0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15,
+    0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21,
+    0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D,
+    0x2E, 0x2F, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,
+    0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45,
+    0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50, 0x51,
+    0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B, 0x5C, 0x5D,
+    0x5E, 0x5F, 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,
+    0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75,
+    0x76, 0x77, 0x78, 0x79, 0x7A, 0x7B, 0x7C, 0x7D, 0x7E, 0x7F, 0x80, 0x81,
+    0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D,
+    0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99,
+    0x9A, 0x9B, 0x9C, 0x9D, 0x9E, 0x9F, 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5,
+    0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1,
+    0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD,
+    0xBE, 0xBF, 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9,
+    0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5,
+    0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF, 0xE0, 0xE1,
+    0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED,
+    0xEE, 0xEF, 0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9,
+    0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF};
+unsigned char data5[] = {
+    0x59, 0x00, 0xFF, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+    0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14,
+    0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20,
+    0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C,
+    0x2D, 0x2E, 0x2F, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38,
+    0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F, 0x40, 0x41, 0x42, 0x43, 0x44,
+    0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50,
+    0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B, 0x5C,
+    0x5D, 0x5E, 0x5F, 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68,
+    0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x71, 0x72, 0x73, 0x74,
+    0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x7B, 0x7C, 0x7D, 0x7E, 0x7F, 0x80,
+    0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C,
+    0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98,
+    0x99, 0x9A, 0x9B, 0x9C, 0x9D, 0x9E, 0x9F, 0xA0, 0xA1, 0xA2, 0xA3, 0xA4,
+    0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0,
+    0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xBB, 0xBC,
+    0xBD, 0xBE, 0xBF, 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8,
+    0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4,
+    0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF, 0xE0,
+    0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xEC,
+    0xED, 0xEE, 0xEF, 0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8,
+    0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF};
+unsigned char data6[] = {
+    0x5A, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06,
+    0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12,
+    0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E,
+    0x1F, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A,
+    0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36,
+    0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F, 0x40, 0x41, 0x42,
+    0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E,
+    0x4F, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A,
+    0x5B, 0x5C, 0x5D, 0x5E, 0x5F, 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66,
+    0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x71, 0x72,
+    0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x7B, 0x7C, 0x7D, 0x7E,
+    0x7F, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A,
+    0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96,
+    0x97, 0x98, 0x99, 0x9A, 0x9B, 0x9C, 0x9D, 0x9E, 0x9F, 0xA0, 0xA1, 0xA2,
+    0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE,
+    0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA,
+    0xBB, 0xBC, 0xBD, 0xBE, 0xBF, 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6,
+    0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2,
+    0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE,
+    0xDF, 0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA,
+    0xEB, 0xEC, 0xED, 0xEE, 0xEF, 0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6,
+    0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF};
+unsigned char data7[] = {
+    0x5B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x01, 0x02,
+    0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E,
+    0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A,
+    0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26,
+    0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, 0x31, 0x32,
+    0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E,
+    0x3F, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A,
+    0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56,
+    0x57, 0x58, 0x59, 0x5A, 0x5B, 0x5C, 0x5D, 0x5E, 0x5F, 0x60, 0x61, 0x62,
+    0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E,
+    0x6F, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A,
+    0x7B, 0x7C, 0x7D, 0x7E, 0x7F, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86,
+    0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92,
+    0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A, 0x9B, 0x9C, 0x9D, 0x9E,
+    0x9F, 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA,
+    0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6,
+    0xB7, 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF, 0xC0, 0xC1, 0xC2,
+    0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE,
+    0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA,
+    0xDB, 0xDC, 0xDD, 0xDE, 0xDF, 0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6,
+    0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF, 0xF0, 0xF1, 0xF2,
+    0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE,
+    0xFF};
+unsigned char data8[] = {
+    0x5C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0xFF, 0x00, 0x01,
+    0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D,
+    0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19,
+    0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25,
+    0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, 0x31,
+    0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D,
+    0x3E, 0x3F, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49,
+    0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55,
+    0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B, 0x5C, 0x5D, 0x5E, 0x5F, 0x60, 0x61,
+    0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D,
+    0x6E, 0x6F, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79,
+    0x7A, 0x7B, 0x7C, 0x7D, 0x7E, 0x7F, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85,
+    0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91,
+    0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A, 0x9B, 0x9C, 0x9D,
+    0x9E, 0x9F, 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9,
+    0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5,
+    0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF, 0xC0, 0xC1,
+    0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD,
+    0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9,
+    0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF, 0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5,
+    0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF, 0xF0, 0xF1,
+    0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD,
+    0xFE, 0xFF};
+
+static void test_empty_bs(void **state) {
+  bs = cbor_load(data1, 2, &res);
+  assert_non_null(bs);
+  assert_true(cbor_typeof(bs) == CBOR_TYPE_BYTESTRING);
+  assert_true(cbor_isa_bytestring(bs));
+  assert_int_equal(cbor_bytestring_length(bs), 0);
+  assert_true(res.read == 1);
+  cbor_decref(&bs);
+  assert_null(bs);
+}
+
+static void test_embedded_bs(void **state) {
+  bs = cbor_load(data2, 2, &res);
+  assert_non_null(bs);
+  assert_true(cbor_typeof(bs) == CBOR_TYPE_BYTESTRING);
+  assert_true(cbor_isa_bytestring(bs));
+  assert_true(cbor_bytestring_length(bs) == 1);
+  assert_true(res.read == 2);
+  assert_true(*cbor_bytestring_handle(bs) == 0xA1);
+  assert_memory_equal(cbor_bytestring_handle(bs), data2 + 1, 1);
+  cbor_decref(&bs);
+  assert_null(bs);
+}
+
+static void test_notenough_data(void **state) {
+  bs = cbor_load(data3, 2, &res);
+  assert_null(bs);
+  assert_true(res.error.code == CBOR_ERR_NOTENOUGHDATA);
+}
+
+static void test_short_bs1(void **state) {
+  bs = cbor_load(data3, 4, &res);
+  assert_non_null(bs);
+  assert_true(cbor_typeof(bs) == CBOR_TYPE_BYTESTRING);
+  assert_true(cbor_isa_bytestring(bs));
+  assert_true(cbor_bytestring_length(bs) == 1);
+  assert_true(res.read == 3);
+  assert_true(*cbor_bytestring_handle(bs) == 0xA1);
+  assert_memory_equal(cbor_bytestring_handle(bs), data3 + 2, 1);
+  cbor_decref(&bs);
+  assert_null(bs);
+}
+
+static void test_short_bs2(void **state) {
+  bs = cbor_load(data4, 259, &res);
+  assert_non_null(bs);
+  assert_true(cbor_typeof(bs) == CBOR_TYPE_BYTESTRING);
+  assert_true(cbor_isa_bytestring(bs));
+  assert_true(cbor_bytestring_length(bs) == 255);
+  assert_true(res.read == 257);
+  assert_memory_equal(cbor_bytestring_handle(bs), data4 + 2, 0xFF);
+  cbor_decref(&bs);
+  assert_null(bs);
+}
+
+static void test_half_bs(void **state) {
+  bs = cbor_load(data5, 259, &res);
+  assert_non_null(bs);
+  assert_true(cbor_typeof(bs) == CBOR_TYPE_BYTESTRING);
+  assert_true(cbor_isa_bytestring(bs));
+  assert_true(cbor_bytestring_length(bs) == 255);
+  assert_true(res.read == 258);
+  assert_memory_equal(cbor_bytestring_handle(bs), data5 + 3, 0xFF);
+  cbor_decref(&bs);
+  assert_null(bs);
+}
+
+static void test_int_bs(void **state) {
+  bs = cbor_load(data6, 261, &res);
+  assert_non_null(bs);
+  assert_true(cbor_typeof(bs) == CBOR_TYPE_BYTESTRING);
+  assert_true(cbor_isa_bytestring(bs));
+  assert_true(cbor_bytestring_length(bs) == 255);
+  assert_true(res.read == 260);
+  assert_memory_equal(cbor_bytestring_handle(bs), data6 + 5, 0xFF);
+  cbor_decref(&bs);
+  assert_null(bs);
+}
+
+static void test_long_bs(void **state) {
+  bs = cbor_load(data7, 265, &res);
+  assert_non_null(bs);
+  assert_true(cbor_typeof(bs) == CBOR_TYPE_BYTESTRING);
+  assert_true(cbor_isa_bytestring(bs));
+  assert_true(cbor_bytestring_length(bs) == 255);
+  assert_true(res.read == 264);
+  assert_memory_equal(cbor_bytestring_handle(bs), data7 + 9, 0xFF);
+  cbor_decref(&bs);
+  assert_null(bs);
+}
+
+unsigned char data9[] = {0x5F, 0xFF};
+
+static void test_zero_indef(void **state) {
+  bs = cbor_load(data9, 2, &res);
+  assert_non_null(bs);
+  assert_true(cbor_typeof(bs) == CBOR_TYPE_BYTESTRING);
+  assert_true(cbor_isa_bytestring(bs));
+  assert_true(cbor_bytestring_is_indefinite(bs));
+  assert_true(cbor_bytestring_chunk_count(bs) == 0);
+  assert_true(res.read == 2);
+  cbor_decref(&bs);
+  assert_null(bs);
+}
+
+unsigned char data10[] = {0x5F, 0x58, 0x01, 0xA1, 0xFF, 0xFF};
+
+/*                          start |   bstring     | break| extra */
+
+static void test_short_indef(void **state) {
+  bs = cbor_load(data10, 6, &res);
+  assert_non_null(bs);
+  assert_true(cbor_typeof(bs) == CBOR_TYPE_BYTESTRING);
+  assert_true(cbor_isa_bytestring(bs));
+  assert_true(cbor_bytestring_length(bs) == 0);
+  assert_true(cbor_bytestring_is_indefinite(bs));
+  assert_true(cbor_bytestring_chunk_count(bs) == 1);
+  assert_true(res.read == 5);
+  assert_true(cbor_isa_bytestring(cbor_bytestring_chunks_handle(bs)[0]));
+  assert_true(cbor_bytestring_length(cbor_bytestring_chunks_handle(bs)[0]) ==
+              1);
+  assert_true(*cbor_bytestring_handle(cbor_bytestring_chunks_handle(bs)[0]) ==
+              0xA1);
+  cbor_decref(&bs);
+  assert_null(bs);
+}
+
+unsigned char data11[] = {0x5F, 0x58, 0x01, 0xA1, 0x58, 0x01, 0xA2, 0xFF, 0xFF};
+
+/*                          start |   bstring     |    bstring     | break|
+ * extra */
+
+static void test_two_indef(void **state) {
+  bs = cbor_load(data11, 9, &res);
+  assert_non_null(bs);
+  assert_int_equal(1, cbor_refcount(bs));
+  assert_true(cbor_typeof(bs) == CBOR_TYPE_BYTESTRING);
+  assert_true(cbor_isa_bytestring(bs));
+  assert_true(cbor_bytestring_length(bs) == 0);
+  assert_true(cbor_bytestring_is_indefinite(bs));
+  assert_true(cbor_bytestring_chunk_count(bs) == 2);
+  assert_true(res.read == 8);
+  assert_true(cbor_isa_bytestring(cbor_bytestring_chunks_handle(bs)[0]));
+  assert_true(cbor_bytestring_length(cbor_bytestring_chunks_handle(bs)[0]) ==
+              1);
+  assert_true(*cbor_bytestring_handle(cbor_bytestring_chunks_handle(bs)[0]) ==
+              0xA1);
+  assert_true(cbor_isa_bytestring(cbor_bytestring_chunks_handle(bs)[1]));
+  assert_true(cbor_bytestring_length(cbor_bytestring_chunks_handle(bs)[1]) ==
+              1);
+  assert_true(*cbor_bytestring_handle(cbor_bytestring_chunks_handle(bs)[1]) ==
+              0xA2);
+  cbor_decref(&bs);
+  assert_null(bs);
+}
+
+unsigned char data12[] = {0x5F, 0x58, 0x01};
+
+/*                          start |   bstring - too short */
+
+static void test_missing_indef(void **state) {
+  bs = cbor_load(data12, 3, &res);
+  assert_true(res.error.code == CBOR_ERR_NOTENOUGHDATA);
+  assert_null(bs);
+}
+
+static void test_inline_creation(void **state) {
+  bs = cbor_build_bytestring((cbor_data) "Hello!", 6);
+  assert_memory_equal(cbor_bytestring_handle(bs), "Hello!", 6);
+  cbor_decref(&bs);
+}
+
+int main(void) {
+  const struct CMUnitTest tests[] = {cmocka_unit_test(test_empty_bs),
+                                     cmocka_unit_test(test_embedded_bs),
+                                     cmocka_unit_test(test_notenough_data),
+                                     cmocka_unit_test(test_short_bs1),
+                                     cmocka_unit_test(test_short_bs2),
+                                     cmocka_unit_test(test_half_bs),
+                                     cmocka_unit_test(test_int_bs),
+                                     cmocka_unit_test(test_long_bs),
+                                     cmocka_unit_test(test_zero_indef),
+                                     cmocka_unit_test(test_short_indef),
+                                     cmocka_unit_test(test_two_indef),
+                                     cmocka_unit_test(test_missing_indef),
+                                     cmocka_unit_test(test_inline_creation)};
+  return cmocka_run_group_tests(tests, NULL, NULL);
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/test/type_3_encoders_test.c mysql-8.0-8.0.27/extra/libcbor/test/type_3_encoders_test.c
--- mysql-8.0-8.0.26/extra/libcbor/test/type_3_encoders_test.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/test/type_3_encoders_test.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include <setjmp.h>
+#include <stdarg.h>
+#include <stddef.h>
+
+#include <cmocka.h>
+
+#include "cbor.h"
+
+unsigned char buffer[512];
+
+static void test_embedded_string_start(void **state) {
+  assert_int_equal(1, cbor_encode_string_start(1, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0x61}), 1);
+}
+
+static void test_string_start(void **state) {
+  assert_int_equal(5, cbor_encode_string_start(1000000, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0x7A, 0x00, 0x0F, 0x42, 0x40}),
+                      5);
+}
+
+static void test_indef_string_start(void **state) {
+  assert_int_equal(1, cbor_encode_indef_string_start(buffer, 512));
+  assert_int_equal(0, cbor_encode_indef_string_start(buffer, 0));
+  assert_memory_equal(buffer, ((unsigned char[]){0x7F}), 1);
+}
+
+int main(void) {
+  const struct CMUnitTest tests[] = {
+      cmocka_unit_test(test_embedded_string_start),
+      cmocka_unit_test(test_string_start),
+      cmocka_unit_test(test_indef_string_start)};
+  return cmocka_run_group_tests(tests, NULL, NULL);
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/test/type_3_test.c mysql-8.0-8.0.27/extra/libcbor/test/type_3_test.c
--- mysql-8.0-8.0.26/extra/libcbor/test/type_3_test.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/test/type_3_test.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,242 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include <setjmp.h>
+#include <stdarg.h>
+#include <stddef.h>
+
+#include <cmocka.h>
+
+#include <string.h>
+#include "cbor.h"
+
+cbor_item_t *string;
+struct cbor_load_result res;
+
+unsigned char empty_string_data[] = {0x60};
+
+static void test_empty_string(void **state) {
+  string = cbor_load(empty_string_data, 1, &res);
+  assert_non_null(string);
+  assert_true(cbor_typeof(string) == CBOR_TYPE_STRING);
+  assert_true(cbor_isa_string(string));
+  assert_int_equal(cbor_string_length(string), 0);
+  assert_int_equal(cbor_string_codepoint_count(string), 0);
+  assert_true(res.read == 1);
+  cbor_decref(&string);
+  assert_null(string);
+}
+
+unsigned char short_string_data[] = {0x6C, 0x48, 0x65, 0x6C, 0x6C, 0x6F, 0x20,
+                                     0x77, 0x6F, 0x72, 0x6C, 0x64, 0x21};
+
+/*                              0x60 + 12 | Hello world! */
+static void test_short_string(void **state) {
+  string = cbor_load(short_string_data, 13, &res);
+  assert_non_null(string);
+  assert_true(cbor_typeof(string) == CBOR_TYPE_STRING);
+  assert_true(cbor_isa_string(string));
+  assert_int_equal(cbor_string_length(string), 12);
+  assert_int_equal(cbor_string_codepoint_count(string), 12);
+  assert_memory_equal(&"Hello world!", cbor_string_handle(string), 12);
+  assert_true(res.read == 13);
+  cbor_decref(&string);
+  assert_null(string);
+}
+
+unsigned char short_multibyte_string_data[] = {
+    0x6F, 0xC4, 0x8C, 0x61, 0x75, 0x65, 0x73, 0x20,
+    0xC3, 0x9F, 0x76, 0xC4, 0x9B, 0x74, 0x65, 0x21};
+
+/*                              0x60 + 15 | Čaues ßvěte! */
+static void test_short_multibyte_string(void **state) {
+  string = cbor_load(short_multibyte_string_data, 16, &res);
+  assert_non_null(string);
+  assert_true(cbor_typeof(string) == CBOR_TYPE_STRING);
+  assert_true(cbor_isa_string(string));
+  assert_int_equal(cbor_string_length(string), 15);
+  assert_int_equal(cbor_string_codepoint_count(string), 12);
+  assert_memory_equal(&"Čaues ßvěte!", cbor_string_handle(string), 15);
+  assert_true(res.read == 16);
+  cbor_decref(&string);
+  assert_null(string);
+}
+
+unsigned char int8_string_data[] = {
+    0x78, 0x96, 0x4C, 0x6F, 0x72, 0x65, 0x6D, 0x20, 0x69, 0x70, 0x73, 0x75,
+    0x6D, 0x20, 0x64, 0x6F, 0x6C, 0x6F, 0x72, 0x20, 0x73, 0x69, 0x74, 0x20,
+    0x61, 0x6D, 0x65, 0x74, 0x2C, 0x20, 0x63, 0x6F, 0x6E, 0x73, 0x65, 0x63,
+    0x74, 0x65, 0x74, 0x75, 0x72, 0x20, 0x61, 0x64, 0x69, 0x70, 0x69, 0x73,
+    0x63, 0x69, 0x6E, 0x67, 0x20, 0x65, 0x6C, 0x69, 0x74, 0x2E, 0x20, 0x44,
+    0x6F, 0x6E, 0x65, 0x63, 0x20, 0x6D, 0x69, 0x20, 0x74, 0x65, 0x6C, 0x6C,
+    0x75, 0x73, 0x2C, 0x20, 0x69, 0x61, 0x63, 0x75, 0x6C, 0x69, 0x73, 0x20,
+    0x6E, 0x65, 0x63, 0x20, 0x76, 0x65, 0x73, 0x74, 0x69, 0x62, 0x75, 0x6C,
+    0x75, 0x6D, 0x20, 0x71, 0x75, 0x69, 0x73, 0x2C, 0x20, 0x66, 0x65, 0x72,
+    0x6D, 0x65, 0x6E, 0x74, 0x75, 0x6D, 0x20, 0x6E, 0x6F, 0x6E, 0x20, 0x66,
+    0x65, 0x6C, 0x69, 0x73, 0x2E, 0x20, 0x4D, 0x61, 0x65, 0x63, 0x65, 0x6E,
+    0x61, 0x73, 0x20, 0x75, 0x74, 0x20, 0x6A, 0x75, 0x73, 0x74, 0x6F, 0x20,
+    0x70, 0x6F, 0x73, 0x75, 0x65, 0x72, 0x65, 0x2E};
+
+/*                                          150 | Lorem ....*/
+static void test_int8_string(void **state) {
+  string = cbor_load(int8_string_data, 152, &res);
+  assert_non_null(string);
+  assert_true(cbor_typeof(string) == CBOR_TYPE_STRING);
+  assert_true(cbor_isa_string(string));
+  assert_int_equal(cbor_string_length(string), 150);
+  assert_int_equal(cbor_string_codepoint_count(string), 150);
+  assert_memory_equal(
+		&"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec mi tellus, iaculis nec vestibulum quis, fermentum non felis. Maecenas ut justo posuere.",
+		cbor_string_handle(string),
+		150
+	);
+  assert_true(res.read == 152);
+  cbor_decref(&string);
+  assert_null(string);
+}
+
+unsigned char int16_string_data[] = {
+    0x79, 0x00, 0x96, 0x4C, 0x6F, 0x72, 0x65, 0x6D, 0x20, 0x69, 0x70, 0x73,
+    0x75, 0x6D, 0x20, 0x64, 0x6F, 0x6C, 0x6F, 0x72, 0x20, 0x73, 0x69, 0x74,
+    0x20, 0x61, 0x6D, 0x65, 0x74, 0x2C, 0x20, 0x63, 0x6F, 0x6E, 0x73, 0x65,
+    0x63, 0x74, 0x65, 0x74, 0x75, 0x72, 0x20, 0x61, 0x64, 0x69, 0x70, 0x69,
+    0x73, 0x63, 0x69, 0x6E, 0x67, 0x20, 0x65, 0x6C, 0x69, 0x74, 0x2E, 0x20,
+    0x44, 0x6F, 0x6E, 0x65, 0x63, 0x20, 0x6D, 0x69, 0x20, 0x74, 0x65, 0x6C,
+    0x6C, 0x75, 0x73, 0x2C, 0x20, 0x69, 0x61, 0x63, 0x75, 0x6C, 0x69, 0x73,
+    0x20, 0x6E, 0x65, 0x63, 0x20, 0x76, 0x65, 0x73, 0x74, 0x69, 0x62, 0x75,
+    0x6C, 0x75, 0x6D, 0x20, 0x71, 0x75, 0x69, 0x73, 0x2C, 0x20, 0x66, 0x65,
+    0x72, 0x6D, 0x65, 0x6E, 0x74, 0x75, 0x6D, 0x20, 0x6E, 0x6F, 0x6E, 0x20,
+    0x66, 0x65, 0x6C, 0x69, 0x73, 0x2E, 0x20, 0x4D, 0x61, 0x65, 0x63, 0x65,
+    0x6E, 0x61, 0x73, 0x20, 0x75, 0x74, 0x20, 0x6A, 0x75, 0x73, 0x74, 0x6F,
+    0x20, 0x70, 0x6F, 0x73, 0x75, 0x65, 0x72, 0x65, 0x2E};
+/*                                          150 | Lorem ....*/
+/* This valid but not realistic - length 150 could be encoded in a single
+ * uint8_t (but we need to keep the test files reasonably compact) */
+static void test_int16_string(void **state) {
+  string = cbor_load(int16_string_data, 153, &res);
+  assert_non_null(string);
+  assert_true(cbor_typeof(string) == CBOR_TYPE_STRING);
+  assert_true(cbor_isa_string(string));
+  assert_int_equal(cbor_string_length(string), 150);
+  assert_int_equal(cbor_string_codepoint_count(string), 150);
+  assert_memory_equal(
+		&"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec mi tellus, iaculis nec vestibulum quis, fermentum non felis. Maecenas ut justo posuere.",
+		cbor_string_handle(string),
+		150
+	);
+  assert_true(res.read == 153);
+  cbor_decref(&string);
+  assert_null(string);
+}
+
+unsigned char int32_string_data[] = {
+    0x7A, 0x00, 0x00, 0x00, 0x96, 0x4C, 0x6F, 0x72, 0x65, 0x6D, 0x20, 0x69,
+    0x70, 0x73, 0x75, 0x6D, 0x20, 0x64, 0x6F, 0x6C, 0x6F, 0x72, 0x20, 0x73,
+    0x69, 0x74, 0x20, 0x61, 0x6D, 0x65, 0x74, 0x2C, 0x20, 0x63, 0x6F, 0x6E,
+    0x73, 0x65, 0x63, 0x74, 0x65, 0x74, 0x75, 0x72, 0x20, 0x61, 0x64, 0x69,
+    0x70, 0x69, 0x73, 0x63, 0x69, 0x6E, 0x67, 0x20, 0x65, 0x6C, 0x69, 0x74,
+    0x2E, 0x20, 0x44, 0x6F, 0x6E, 0x65, 0x63, 0x20, 0x6D, 0x69, 0x20, 0x74,
+    0x65, 0x6C, 0x6C, 0x75, 0x73, 0x2C, 0x20, 0x69, 0x61, 0x63, 0x75, 0x6C,
+    0x69, 0x73, 0x20, 0x6E, 0x65, 0x63, 0x20, 0x76, 0x65, 0x73, 0x74, 0x69,
+    0x62, 0x75, 0x6C, 0x75, 0x6D, 0x20, 0x71, 0x75, 0x69, 0x73, 0x2C, 0x20,
+    0x66, 0x65, 0x72, 0x6D, 0x65, 0x6E, 0x74, 0x75, 0x6D, 0x20, 0x6E, 0x6F,
+    0x6E, 0x20, 0x66, 0x65, 0x6C, 0x69, 0x73, 0x2E, 0x20, 0x4D, 0x61, 0x65,
+    0x63, 0x65, 0x6E, 0x61, 0x73, 0x20, 0x75, 0x74, 0x20, 0x6A, 0x75, 0x73,
+    0x74, 0x6F, 0x20, 0x70, 0x6F, 0x73, 0x75, 0x65, 0x72, 0x65, 0x2E};
+
+/*                                          150 | Lorem ....*/
+static void test_int32_string(void **state) {
+  string = cbor_load(int32_string_data, 155, &res);
+  assert_non_null(string);
+  assert_true(cbor_typeof(string) == CBOR_TYPE_STRING);
+  assert_true(cbor_isa_string(string));
+  assert_int_equal(cbor_string_length(string), 150);
+  assert_int_equal(cbor_string_codepoint_count(string), 150);
+  assert_memory_equal(
+		&"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec mi tellus, iaculis nec vestibulum quis, fermentum non felis. Maecenas ut justo posuere.",
+		cbor_string_handle(string),
+		150
+	);
+  assert_true(res.read == 155);
+  cbor_decref(&string);
+  assert_null(string);
+}
+
+unsigned char int64_string_data[] = {
+    0x7B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x96, 0x4C, 0x6F, 0x72,
+    0x65, 0x6D, 0x20, 0x69, 0x70, 0x73, 0x75, 0x6D, 0x20, 0x64, 0x6F, 0x6C,
+    0x6F, 0x72, 0x20, 0x73, 0x69, 0x74, 0x20, 0x61, 0x6D, 0x65, 0x74, 0x2C,
+    0x20, 0x63, 0x6F, 0x6E, 0x73, 0x65, 0x63, 0x74, 0x65, 0x74, 0x75, 0x72,
+    0x20, 0x61, 0x64, 0x69, 0x70, 0x69, 0x73, 0x63, 0x69, 0x6E, 0x67, 0x20,
+    0x65, 0x6C, 0x69, 0x74, 0x2E, 0x20, 0x44, 0x6F, 0x6E, 0x65, 0x63, 0x20,
+    0x6D, 0x69, 0x20, 0x74, 0x65, 0x6C, 0x6C, 0x75, 0x73, 0x2C, 0x20, 0x69,
+    0x61, 0x63, 0x75, 0x6C, 0x69, 0x73, 0x20, 0x6E, 0x65, 0x63, 0x20, 0x76,
+    0x65, 0x73, 0x74, 0x69, 0x62, 0x75, 0x6C, 0x75, 0x6D, 0x20, 0x71, 0x75,
+    0x69, 0x73, 0x2C, 0x20, 0x66, 0x65, 0x72, 0x6D, 0x65, 0x6E, 0x74, 0x75,
+    0x6D, 0x20, 0x6E, 0x6F, 0x6E, 0x20, 0x66, 0x65, 0x6C, 0x69, 0x73, 0x2E,
+    0x20, 0x4D, 0x61, 0x65, 0x63, 0x65, 0x6E, 0x61, 0x73, 0x20, 0x75, 0x74,
+    0x20, 0x6A, 0x75, 0x73, 0x74, 0x6F, 0x20, 0x70, 0x6F, 0x73, 0x75, 0x65,
+    0x72, 0x65, 0x2E};
+
+/*                                          150 | Lorem ....*/
+static void test_int64_string(void **state) {
+  string = cbor_load(int64_string_data, 159, &res);
+  assert_non_null(string);
+  assert_true(cbor_typeof(string) == CBOR_TYPE_STRING);
+  assert_true(cbor_isa_string(string));
+  assert_int_equal(cbor_string_length(string), 150);
+  assert_int_equal(cbor_string_codepoint_count(string), 150);
+  assert_memory_equal(
+		&"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec mi tellus, iaculis nec vestibulum quis, fermentum non felis. Maecenas ut justo posuere.",
+		cbor_string_handle(string),
+		150
+	);
+  assert_true(res.read == 159);
+  cbor_decref(&string);
+  assert_null(string);
+}
+
+unsigned char short_indef_string_data[] = {0x7F, 0x78, 0x01, 0x65, 0xFF, 0xFF};
+
+/*                                         start |   string      | break| extra
+ */
+
+static void test_short_indef_string(void **state) {
+  string = cbor_load(short_indef_string_data, 6, &res);
+  assert_non_null(string);
+  assert_true(cbor_typeof(string) == CBOR_TYPE_STRING);
+  assert_true(cbor_isa_string(string));
+  assert_true(cbor_string_length(string) == 0);
+  assert_true(cbor_string_is_indefinite(string));
+  assert_true(cbor_string_chunk_count(string) == 1);
+  assert_true(res.read == 5);
+  assert_true(cbor_isa_string(cbor_string_chunks_handle(string)[0]));
+  assert_true(cbor_string_length(cbor_string_chunks_handle(string)[0]) == 1);
+  assert_true(*cbor_string_handle(cbor_string_chunks_handle(string)[0]) == 'e');
+  cbor_decref(&string);
+  assert_null(string);
+}
+
+static void test_inline_creation(void **state) {
+  string = cbor_build_string("Hello!");
+  assert_memory_equal(cbor_string_handle(string), "Hello!", strlen("Hello!"));
+  cbor_decref(&string);
+}
+
+int main(void) {
+  const struct CMUnitTest tests[] = {
+      cmocka_unit_test(test_empty_string),
+      cmocka_unit_test(test_short_string),
+      cmocka_unit_test(test_short_multibyte_string),
+      cmocka_unit_test(test_int8_string),
+      cmocka_unit_test(test_int16_string),
+      cmocka_unit_test(test_int32_string),
+      cmocka_unit_test(test_int64_string),
+      cmocka_unit_test(test_short_indef_string),
+      cmocka_unit_test(test_inline_creation)};
+  return cmocka_run_group_tests(tests, NULL, NULL);
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/test/type_4_encoders_test.c mysql-8.0-8.0.27/extra/libcbor/test/type_4_encoders_test.c
--- mysql-8.0-8.0.26/extra/libcbor/test/type_4_encoders_test.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/test/type_4_encoders_test.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include <setjmp.h>
+#include <stdarg.h>
+#include <stddef.h>
+
+#include <cmocka.h>
+
+#include "cbor.h"
+
+unsigned char buffer[512];
+
+static void test_embedded_array_start(void **state) {
+  assert_int_equal(1, cbor_encode_array_start(1, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0x81}), 1);
+}
+
+static void test_array_start(void **state) {
+  assert_int_equal(5, cbor_encode_array_start(1000000, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0x9A, 0x00, 0x0F, 0x42, 0x40}),
+                      5);
+}
+
+static void test_indef_array_start(void **state) {
+  assert_int_equal(1, cbor_encode_indef_array_start(buffer, 512));
+  assert_int_equal(0, cbor_encode_indef_array_start(buffer, 0));
+  assert_memory_equal(buffer, ((unsigned char[]){0x9F}), 1);
+}
+
+static void test_indef_array_encoding(void **state) {
+  cbor_item_t *array = cbor_new_indefinite_array();
+  cbor_item_t *one = cbor_build_uint8(1);
+  cbor_item_t *two = cbor_build_uint8(2);
+  cbor_array_push(array, one);
+  cbor_array_push(array, two);
+  assert_int_equal(4, cbor_serialize_array(array, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0x9F, 0x01, 0x02, 0xFF}), 4);
+  cbor_decref(&array);
+  cbor_decref(&one);
+  cbor_decref(&two);
+}
+
+int main(void) {
+  const struct CMUnitTest tests[] = {
+      cmocka_unit_test(test_embedded_array_start),
+      cmocka_unit_test(test_array_start),
+      cmocka_unit_test(test_indef_array_start),
+      cmocka_unit_test(test_indef_array_encoding)};
+  return cmocka_run_group_tests(tests, NULL, NULL);
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/test/type_4_test.c mysql-8.0-8.0.27/extra/libcbor/test/type_4_test.c
--- mysql-8.0-8.0.26/extra/libcbor/test/type_4_test.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/test/type_4_test.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include <setjmp.h>
+#include <stdarg.h>
+#include <stddef.h>
+
+#include <cmocka.h>
+
+#include "assertions.h"
+#include "cbor.h"
+
+cbor_item_t *arr;
+struct cbor_load_result res;
+
+unsigned char data1[] = {0x80, 0xFF};
+
+static void test_empty_array(void **state) {
+  arr = cbor_load(data1, 2, &res);
+  assert_non_null(arr);
+  assert_true(cbor_typeof(arr) == CBOR_TYPE_ARRAY);
+  assert_true(cbor_isa_array(arr));
+  assert_true(cbor_array_size(arr) == 0);
+  assert_true(res.read == 1);
+  cbor_decref(&arr);
+  assert_null(arr);
+}
+
+unsigned char data2[] = {0x81, 0x01, 0xFF};
+
+static void test_simple_array(void **state) {
+  arr = cbor_load(data2, 3, &res);
+  assert_non_null(arr);
+  assert_true(cbor_typeof(arr) == CBOR_TYPE_ARRAY);
+  assert_true(cbor_isa_array(arr));
+  assert_int_equal(cbor_array_size(arr), 1);
+  assert_true(res.read == 2);
+  assert_int_equal(cbor_array_allocated(arr), 1);
+  /* Check the values */
+  assert_uint8(cbor_array_handle(arr)[0], 1);
+  cbor_item_t *intermediate = cbor_array_get(arr, 0);
+  assert_uint8(intermediate, 1);
+
+  cbor_item_t *new_val = cbor_build_uint8(10);
+  assert_false(cbor_array_set(arr, 1, new_val));
+  assert_false(cbor_array_set(arr, 3, new_val));
+  cbor_decref(&new_val);
+
+  cbor_decref(&arr);
+  cbor_decref(&intermediate);
+  assert_null(arr);
+  assert_null(intermediate);
+}
+
+unsigned char data3[] = {0x82, 0x01, 0x81, 0x01, 0xFF};
+
+static void test_nested_arrays(void **state) {
+  arr = cbor_load(data3, 5, &res);
+  assert_non_null(arr);
+  assert_true(cbor_typeof(arr) == CBOR_TYPE_ARRAY);
+  assert_true(cbor_isa_array(arr));
+  assert_true(cbor_array_size(arr) == 2);
+  assert_true(res.read == 4);
+  /* Check the values */
+  assert_uint8(cbor_array_handle(arr)[0], 1);
+
+  cbor_item_t *nested = cbor_array_handle(arr)[1];
+  assert_true(cbor_isa_array(nested));
+  assert_true(cbor_array_size(nested) == 1);
+  assert_uint8(cbor_array_handle(nested)[0], 1);
+
+  cbor_decref(&arr);
+  assert_null(arr);
+}
+
+unsigned char test_indef_arrays_data[] = {0x9f, 0x01, 0x02, 0xFF};
+
+static void test_indef_arrays(void **state) {
+  arr = cbor_load(test_indef_arrays_data, 4, &res);
+  assert_non_null(arr);
+  assert_true(cbor_typeof(arr) == CBOR_TYPE_ARRAY);
+  assert_true(cbor_isa_array(arr));
+  assert_true(cbor_array_size(arr) == 2);
+  assert_true(res.read == 4);
+  /* Check the values */
+  assert_uint8(cbor_array_handle(arr)[0], 1);
+  assert_uint8(cbor_array_handle(arr)[1], 2);
+
+  assert_true(cbor_array_set(arr, 1, cbor_move(cbor_build_uint8(10))));
+
+  cbor_decref(&arr);
+  assert_null(arr);
+}
+
+unsigned char test_nested_indef_arrays_data[] = {0x9f, 0x01, 0x9f, 0x02,
+                                                 0xFF, 0x03, 0xFF};
+
+static void test_nested_indef_arrays(void **state) {
+  arr = cbor_load(test_nested_indef_arrays_data, 7, &res);
+  assert_non_null(arr);
+  assert_true(cbor_typeof(arr) == CBOR_TYPE_ARRAY);
+  assert_true(cbor_isa_array(arr));
+  assert_int_equal(cbor_array_size(arr), 3);
+  assert_true(res.read == 7);
+  /* Check the values */
+  assert_uint8(cbor_array_handle(arr)[0], 1);
+
+  cbor_item_t *nested = cbor_array_handle(arr)[1];
+  assert_true(cbor_isa_array(nested));
+  assert_true(cbor_array_size(nested) == 1);
+  assert_uint8(cbor_array_handle(nested)[0], 2);
+
+  cbor_decref(&arr);
+  assert_null(arr);
+}
+
+int main(void) {
+  const struct CMUnitTest tests[] = {
+      cmocka_unit_test(test_empty_array), cmocka_unit_test(test_simple_array),
+      cmocka_unit_test(test_nested_arrays), cmocka_unit_test(test_indef_arrays),
+      cmocka_unit_test(test_nested_indef_arrays)};
+  return cmocka_run_group_tests(tests, NULL, NULL);
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/test/type_5_encoders_test.c mysql-8.0-8.0.27/extra/libcbor/test/type_5_encoders_test.c
--- mysql-8.0-8.0.26/extra/libcbor/test/type_5_encoders_test.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/test/type_5_encoders_test.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include <setjmp.h>
+#include <stdarg.h>
+#include <stddef.h>
+
+#include <cmocka.h>
+
+#include "cbor.h"
+
+unsigned char buffer[512];
+
+static void test_embedded_map_start(void **state) {
+  assert_int_equal(1, cbor_encode_map_start(1, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0xA1}), 1);
+}
+
+static void test_map_start(void **state) {
+  assert_int_equal(5, cbor_encode_map_start(1000000, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0xBA, 0x00, 0x0F, 0x42, 0x40}),
+                      5);
+}
+
+static void test_indef_map_start(void **state) {
+  assert_int_equal(1, cbor_encode_indef_map_start(buffer, 512));
+  assert_int_equal(0, cbor_encode_indef_map_start(buffer, 0));
+  assert_memory_equal(buffer, ((unsigned char[]){0xBF}), 1);
+}
+
+int main(void) {
+  const struct CMUnitTest tests[] = {cmocka_unit_test(test_embedded_map_start),
+                                     cmocka_unit_test(test_map_start),
+                                     cmocka_unit_test(test_indef_map_start)};
+  return cmocka_run_group_tests(tests, NULL, NULL);
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/test/type_5_test.c mysql-8.0-8.0.27/extra/libcbor/test/type_5_test.c
--- mysql-8.0-8.0.26/extra/libcbor/test/type_5_test.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/test/type_5_test.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,190 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include <setjmp.h>
+#include <stdarg.h>
+#include <stddef.h>
+
+#include <cmocka.h>
+
+#include <string.h>
+#include "assertions.h"
+#include "cbor.h"
+
+cbor_item_t *map;
+struct cbor_load_result res;
+
+unsigned char empty_map[] = {0xA0};
+
+static void test_empty_map(void **state) {
+  map = cbor_load(empty_map, 1, &res);
+  assert_non_null(map);
+  assert_true(cbor_typeof(map) == CBOR_TYPE_MAP);
+  assert_true(cbor_isa_map(map));
+  assert_true(cbor_map_size(map) == 0);
+  assert_true(res.read == 1);
+  assert_int_equal(cbor_map_allocated(map), 0);
+  cbor_decref(&map);
+  assert_null(map);
+}
+
+unsigned char simple_map[] = {0xA2, 0x01, 0x02, 0x03, 0x04};
+
+/* {1: 2, 3: 4} */
+static void test_simple_map(void **state) {
+  map = cbor_load(simple_map, 5, &res);
+  assert_non_null(map);
+  assert_true(cbor_typeof(map) == CBOR_TYPE_MAP);
+  assert_true(cbor_isa_map(map));
+  assert_true(cbor_map_is_definite(map));
+  assert_true(cbor_map_size(map) == 2);
+  assert_true(res.read == 5);
+  struct cbor_pair *handle = cbor_map_handle(map);
+  assert_uint8(handle[0].key, 1);
+  assert_uint8(handle[0].value, 2);
+  assert_uint8(handle[1].key, 3);
+  assert_uint8(handle[1].value, 4);
+  cbor_decref(&map);
+  assert_null(map);
+}
+
+unsigned char simple_indef_map[] = {0xBF, 0x01, 0x02, 0x03, 0x04, 0xFF};
+
+/* {_ 1: 2, 3: 4} */
+static void test_indef_simple_map(void **state) {
+  map = cbor_load(simple_indef_map, 6, &res);
+  assert_non_null(map);
+  assert_true(cbor_typeof(map) == CBOR_TYPE_MAP);
+  assert_true(cbor_isa_map(map));
+  assert_true(cbor_map_is_indefinite(map));
+  assert_true(cbor_map_size(map) == 2);
+  assert_true(res.read == 6);
+  struct cbor_pair *handle = cbor_map_handle(map);
+  assert_uint8(handle[0].key, 1);
+  assert_uint8(handle[0].value, 2);
+  assert_uint8(handle[1].key, 3);
+  assert_uint8(handle[1].value, 4);
+  cbor_decref(&map);
+  assert_null(map);
+}
+
+//{
+//	"glossary": {
+//		"title": "example glossary"
+//	}
+//}
+unsigned char def_nested_map[] = {
+    0xA1, 0x68, 0x67, 0x6C, 0x6F, 0x73, 0x73, 0x61, 0x72, 0x79, 0xA1, 0x65,
+    0x74, 0x69, 0x74, 0x6C, 0x65, 0x70, 0x65, 0x78, 0x61, 0x6D, 0x70, 0x6C,
+    0x65, 0x20, 0x67, 0x6C, 0x6F, 0x73, 0x73, 0x61, 0x72, 0x79};
+
+static void test_def_nested_map(void **state) {
+  map = cbor_load(def_nested_map, 34, &res);
+  assert_non_null(map);
+  assert_true(cbor_typeof(map) == CBOR_TYPE_MAP);
+  assert_true(cbor_isa_map(map));
+  assert_true(cbor_map_is_definite(map));
+  assert_true(cbor_map_size(map) == 1);
+  assert_true(res.read == 34);
+  struct cbor_pair *handle = cbor_map_handle(map);
+  assert_true(cbor_typeof(handle[0].key) == CBOR_TYPE_STRING);
+  assert_true(cbor_typeof(handle[0].value) == CBOR_TYPE_MAP);
+  struct cbor_pair *inner_handle = cbor_map_handle(handle[0].value);
+  assert_true(cbor_typeof(inner_handle[0].key) == CBOR_TYPE_STRING);
+  assert_true(cbor_typeof(inner_handle[0].value) == CBOR_TYPE_STRING);
+  assert_memory_equal(cbor_string_handle(inner_handle[0].value),
+                      "example glossary", strlen("example glossary"));
+  cbor_decref(&map);
+  assert_null(map);
+}
+
+unsigned char streamed_key_map[] = {0xA1, 0x7F, 0x61, 0x61,
+                                    0x61, 0x62, 0xFF, 0xA0};
+
+/* '{ (_"a" "b"): {}}' */
+static void test_streamed_key_map(void **state) {
+  map = cbor_load(streamed_key_map, 8, &res);
+  assert_non_null(map);
+  assert_true(cbor_typeof(map) == CBOR_TYPE_MAP);
+  assert_true(cbor_isa_map(map));
+  assert_true(cbor_map_is_definite(map));
+  assert_true(cbor_map_size(map) == 1);
+  assert_true(res.read == 8);
+  struct cbor_pair *handle = cbor_map_handle(map);
+  assert_true(cbor_typeof(handle[0].key) == CBOR_TYPE_STRING);
+  assert_true(cbor_string_is_indefinite(handle[0].key));
+  assert_int_equal(cbor_string_chunk_count(handle[0].key), 2);
+  assert_true(cbor_isa_map(handle[0].value));
+  assert_int_equal(cbor_map_size(handle[0].value), 0);
+  cbor_decref(&map);
+  assert_null(map);
+}
+
+unsigned char streamed_kv_map[] = {0xA1, 0x7F, 0x61, 0x61, 0x61, 0x62, 0xFF,
+                                   0x7F, 0x61, 0x63, 0x61, 0x64, 0xFF};
+
+/* '{ (_"a" "b"): (_"c", "d")}' */
+static void test_streamed_kv_map(void **state) {
+  map = cbor_load(streamed_kv_map, 13, &res);
+  assert_non_null(map);
+  assert_true(cbor_typeof(map) == CBOR_TYPE_MAP);
+  assert_true(cbor_isa_map(map));
+  assert_true(cbor_map_is_definite(map));
+  assert_int_equal(cbor_map_size(map), 1);
+  assert_int_equal(res.read, 13);
+  struct cbor_pair *handle = cbor_map_handle(map);
+  assert_true(cbor_typeof(handle[0].key) == CBOR_TYPE_STRING);
+  assert_true(cbor_string_is_indefinite(handle[0].key));
+  assert_int_equal(cbor_string_chunk_count(handle[0].key), 2);
+  assert_true(cbor_typeof(handle[0].value) == CBOR_TYPE_STRING);
+  assert_true(cbor_string_is_indefinite(handle[0].value));
+  assert_int_equal(cbor_string_chunk_count(handle[0].value), 2);
+  assert_memory_equal(
+      cbor_string_handle(cbor_string_chunks_handle(handle[0].value)[1]), "d",
+      1);
+  cbor_decref(&map);
+  assert_null(map);
+}
+
+unsigned char streamed_streamed_kv_map[] = {0xBF, 0x7F, 0x61, 0x61, 0x61,
+                                            0x62, 0xFF, 0x7F, 0x61, 0x63,
+                                            0x61, 0x64, 0xFF, 0xFF};
+
+/* '{_ (_"a" "b"): (_"c", "d")}' */
+static void test_streamed_streamed_kv_map(void **state) {
+  map = cbor_load(streamed_streamed_kv_map, 14, &res);
+  assert_non_null(map);
+  assert_true(cbor_typeof(map) == CBOR_TYPE_MAP);
+  assert_true(cbor_isa_map(map));
+  assert_true(cbor_map_is_indefinite(map));
+  assert_int_equal(cbor_map_size(map), 1);
+  assert_int_equal(res.read, 14);
+  struct cbor_pair *handle = cbor_map_handle(map);
+  assert_true(cbor_typeof(handle[0].key) == CBOR_TYPE_STRING);
+  assert_true(cbor_string_is_indefinite(handle[0].key));
+  assert_int_equal(cbor_string_chunk_count(handle[0].key), 2);
+  assert_true(cbor_typeof(handle[0].value) == CBOR_TYPE_STRING);
+  assert_true(cbor_string_is_indefinite(handle[0].value));
+  assert_int_equal(cbor_string_chunk_count(handle[0].value), 2);
+  assert_memory_equal(
+      cbor_string_handle(cbor_string_chunks_handle(handle[0].value)[1]), "d",
+      1);
+  cbor_decref(&map);
+  assert_null(map);
+}
+
+int main(void) {
+  const struct CMUnitTest tests[] = {
+      cmocka_unit_test(test_empty_map),
+      cmocka_unit_test(test_simple_map),
+      cmocka_unit_test(test_indef_simple_map),
+      cmocka_unit_test(test_def_nested_map),
+      cmocka_unit_test(test_streamed_key_map),
+      cmocka_unit_test(test_streamed_kv_map),
+      cmocka_unit_test(test_streamed_streamed_kv_map)};
+  return cmocka_run_group_tests(tests, NULL, NULL);
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/test/type_6_encoders_test.c mysql-8.0-8.0.27/extra/libcbor/test/type_6_encoders_test.c
--- mysql-8.0-8.0.26/extra/libcbor/test/type_6_encoders_test.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/test/type_6_encoders_test.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include <setjmp.h>
+#include <stdarg.h>
+#include <stddef.h>
+
+#include <cmocka.h>
+
+#include "cbor.h"
+
+unsigned char buffer[512];
+
+static void test_embedded_tag(void **state) {
+  assert_int_equal(1, cbor_encode_tag(1, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0xC1}), 1);
+}
+
+static void test_tag(void **state) {
+  assert_int_equal(5, cbor_encode_tag(1000000, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0xDA, 0x00, 0x0F, 0x42, 0x40}),
+                      5);
+}
+
+int main(void) {
+  const struct CMUnitTest tests[] = {
+      cmocka_unit_test(test_embedded_tag),
+      cmocka_unit_test(test_tag),
+  };
+  return cmocka_run_group_tests(tests, NULL, NULL);
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/test/type_6_test.c mysql-8.0-8.0.27/extra/libcbor/test/type_6_test.c
--- mysql-8.0-8.0.26/extra/libcbor/test/type_6_test.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/test/type_6_test.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include <setjmp.h>
+#include <stdarg.h>
+#include <stddef.h>
+
+#include <cmocka.h>
+
+#include "assertions.h"
+#include "cbor.h"
+
+cbor_item_t *tag;
+struct cbor_load_result res;
+
+unsigned char embedded_tag_data[] = {0xC0, 0x00};
+
+static void test_refcounting(void **state) {
+  tag = cbor_load(embedded_tag_data, 2, &res);
+  assert_true(cbor_refcount(tag) == 1);
+  cbor_item_t *item = cbor_tag_item(tag);
+  assert_true(cbor_refcount(item) == 2);
+  cbor_decref(&tag);
+  assert_null(tag);
+  assert_true(cbor_refcount(item) == 1);
+  cbor_decref(&item);
+  assert_null(item);
+}
+
+/* Tag 0 + uint 0 */
+static void test_embedded_tag(void **state) {
+  tag = cbor_load(embedded_tag_data, 2, &res);
+  assert_true(cbor_typeof(tag) == CBOR_TYPE_TAG);
+  assert_true(cbor_tag_value(tag) == 0);
+  assert_uint8(cbor_move(cbor_tag_item(tag)), 0);
+  cbor_decref(&tag);
+  assert_null(tag);
+}
+
+unsigned char int8_tag_data[] = {0xD8, 0xFF, 0x01};
+
+/* Tag 255 + uint 1 */
+static void test_int8_tag(void **state) {
+  tag = cbor_load(int8_tag_data, 3, &res);
+  assert_true(cbor_typeof(tag) == CBOR_TYPE_TAG);
+  assert_true(cbor_tag_value(tag) == 255);
+  assert_uint8(cbor_move(cbor_tag_item(tag)), 1);
+  cbor_decref(&tag);
+  assert_null(tag);
+}
+
+unsigned char int16_tag_data[] = {0xD9, 0xFF, 0x00, 0x02};
+
+/* Tag 255 << 8 + uint 2 */
+static void test_int16_tag(void **state) {
+  tag = cbor_load(int16_tag_data, 4, &res);
+  assert_true(cbor_typeof(tag) == CBOR_TYPE_TAG);
+  assert_true(cbor_tag_value(tag) == 255 << 8);
+  assert_uint8(cbor_move(cbor_tag_item(tag)), 2);
+  cbor_decref(&tag);
+  assert_null(tag);
+}
+
+unsigned char int32_tag_data[] = {0xDA, 0xFF, 0x00, 0x00, 0x00, 0x03};
+
+/* uint 3 */
+static void test_int32_tag(void **state) {
+  tag = cbor_load(int32_tag_data, 6, &res);
+  assert_true(cbor_typeof(tag) == CBOR_TYPE_TAG);
+  assert_true(cbor_tag_value(tag) == 4278190080ULL);
+  assert_uint8(cbor_move(cbor_tag_item(tag)), 3);
+  cbor_decref(&tag);
+  assert_null(tag);
+}
+
+unsigned char int64_tag_data[] = {0xDB, 0xFF, 0x00, 0x00, 0x00,
+                                  0x00, 0x00, 0x00, 0x00, 0x04};
+
+/* uint 4 */
+static void test_int64_tag(void **state) {
+  tag = cbor_load(int64_tag_data, 10, &res);
+  assert_true(cbor_typeof(tag) == CBOR_TYPE_TAG);
+  assert_true(cbor_tag_value(tag) == 18374686479671623680ULL);
+  assert_uint8(cbor_move(cbor_tag_item(tag)), 4);
+  cbor_decref(&tag);
+  assert_null(tag);
+}
+
+unsigned char nested_tag_data[] = {0xC0, 0xC1, 0x18, 0x2A};
+
+/* Tag 0, tag 1 + uint 0 */
+static void test_nested_tag(void **state) {
+  tag = cbor_load(nested_tag_data, 4, &res);
+  assert_true(cbor_typeof(tag) == CBOR_TYPE_TAG);
+  assert_true(cbor_tag_value(tag) == 0);
+  cbor_item_t *nested_tag = cbor_tag_item(tag);
+  assert_true(cbor_typeof(nested_tag) == CBOR_TYPE_TAG);
+  assert_true(cbor_tag_value(nested_tag) == 1);
+  assert_uint8(cbor_move(cbor_tag_item(nested_tag)), 42);
+  cbor_decref(&tag);
+  assert_null(tag);
+  cbor_decref(&nested_tag);
+  assert_null(nested_tag);
+}
+
+int main(void) {
+  const struct CMUnitTest tests[] = {
+      cmocka_unit_test(test_refcounting), cmocka_unit_test(test_embedded_tag),
+      cmocka_unit_test(test_int8_tag),    cmocka_unit_test(test_int16_tag),
+      cmocka_unit_test(test_int32_tag),   cmocka_unit_test(test_int64_tag),
+      cmocka_unit_test(test_nested_tag)};
+  return cmocka_run_group_tests(tests, NULL, NULL);
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/test/type_7_encoders_test.c mysql-8.0-8.0.27/extra/libcbor/test/type_7_encoders_test.c
--- mysql-8.0-8.0.26/extra/libcbor/test/type_7_encoders_test.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/test/type_7_encoders_test.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include <setjmp.h>
+#include <stdarg.h>
+#include <stddef.h>
+
+#include <cmocka.h>
+
+#include <math.h>
+#include "cbor.h"
+
+unsigned char buffer[512];
+
+static void test_bools(void **state) {
+  assert_int_equal(1, cbor_encode_bool(false, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0xF4}), 1);
+  assert_int_equal(1, cbor_encode_bool(true, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0xF5}), 1);
+}
+
+static void test_null(void **state) {
+  assert_int_equal(1, cbor_encode_null(buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0xF6}), 1);
+}
+
+static void test_undef(void **state) {
+  assert_int_equal(1, cbor_encode_undef(buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0xF7}), 1);
+}
+
+static void test_break(void **state) {
+  assert_int_equal(1, cbor_encode_break(buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0xFF}), 1);
+}
+
+static void test_half(void **state) {
+  assert_int_equal(3, cbor_encode_half(1.5f, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0xF9, 0x3E, 0x00}), 3);
+
+  assert_int_equal(3, cbor_encode_half(-0.0f, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0xF9, 0x80, 0x00}), 3);
+
+  assert_int_equal(3, cbor_encode_half(0.0f, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0xF9, 0x00, 0x00}), 3);
+
+  assert_int_equal(3, cbor_encode_half(65504.0f, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0xF9, 0x7B, 0xFF}), 3);
+
+  assert_int_equal(3, cbor_encode_half(0.00006103515625f, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0xF9, 0x04, 0x00}), 3);
+
+  assert_int_equal(3, cbor_encode_half(-4.0f, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0xF9, 0xC4, 0x00}), 3);
+
+  /* Smallest representable value */
+  assert_int_equal(3, cbor_encode_half(5.960464477539063e-8f, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0xF9, 0x00, 0x01}), 3);
+
+  /* Smaller than the smallest, approximate magnitude representation */
+  assert_int_equal(3, cbor_encode_half(5.960464477539062e-8f, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0xF9, 0x00, 0x01}), 3);
+
+  /* Smaller than the smallest and even the magnitude cannot be represented,
+     round off to zero */
+  assert_int_equal(3, cbor_encode_half(1e-25f, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0xF9, 0x00, 0x00}), 3);
+
+  assert_int_equal(3, cbor_encode_half(1.1920928955078125e-7, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0xF9, 0x00, 0x02}), 3);
+
+  assert_int_equal(3, cbor_encode_half(-1.1920928955078124e-7, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0xF9, 0x80, 0x02}), 3);
+
+  assert_int_equal(3, cbor_encode_half(INFINITY, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0xF9, 0x7C, 0x00}), 3);
+}
+
+static void test_half_special(void **state) {
+  assert_int_equal(3, cbor_encode_half(NAN, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0xF9, 0x7E, 0x00}), 3);
+}
+
+static void test_float(void **state) {
+  assert_int_equal(5, cbor_encode_single(3.4028234663852886e+38, buffer, 512));
+  assert_memory_equal(buffer, ((unsigned char[]){0xFA, 0x7F, 0x7F, 0xFF, 0xFF}),
+                      5);
+}
+
+static void test_double(void **state) {
+  assert_int_equal(9, cbor_encode_double(1.0e+300, buffer, 512));
+  assert_memory_equal(
+      buffer,
+      ((unsigned char[]){0xFB, 0x7E, 0x37, 0xE4, 0x3C, 0x88, 0x00, 0x75, 0x9C}),
+      9);
+}
+
+int main(void) {
+  const struct CMUnitTest tests[] = {
+      cmocka_unit_test(test_bools),  cmocka_unit_test(test_null),
+      cmocka_unit_test(test_undef),  cmocka_unit_test(test_break),
+      cmocka_unit_test(test_half),   cmocka_unit_test(test_float),
+      cmocka_unit_test(test_double), cmocka_unit_test(test_half_special)};
+  return cmocka_run_group_tests(tests, NULL, NULL);
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/test/type_7_test.c mysql-8.0-8.0.27/extra/libcbor/test/type_7_test.c
--- mysql-8.0-8.0.26/extra/libcbor/test/type_7_test.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/test/type_7_test.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include <setjmp.h>
+#include <stdarg.h>
+#include <stddef.h>
+
+#include <cmocka.h>
+
+#include <tgmath.h>
+#include "assertions.h"
+#include "cbor.h"
+
+cbor_item_t *float_ctrl;
+struct cbor_load_result res;
+
+static const float eps = 0.00001f;
+
+unsigned char float2_data[] = {0xF9, 0x7B, 0xFF};
+
+static void test_float2(void **state) {
+  float_ctrl = cbor_load(float2_data, 3, &res);
+  assert_true(cbor_isa_float_ctrl(float_ctrl));
+  assert_true(cbor_is_float(float_ctrl));
+  assert_true(cbor_float_get_width(float_ctrl) == CBOR_FLOAT_16);
+  assert_true(cbor_float_get_float2(float_ctrl) == 65504.0F);
+  assert_true(fabs(cbor_float_get_float(float_ctrl) - 65504.0F) < eps);
+  cbor_decref(&float_ctrl);
+  assert_null(float_ctrl);
+}
+
+unsigned char float4_data[] = {0xFA, 0x47, 0xC3, 0x50, 0x00};
+
+static void test_float4(void **state) {
+  float_ctrl = cbor_load(float4_data, 5, &res);
+  assert_true(cbor_isa_float_ctrl(float_ctrl));
+  assert_true(cbor_is_float(float_ctrl));
+  assert_true(cbor_float_get_width(float_ctrl) == CBOR_FLOAT_32);
+  assert_true(cbor_float_get_float4(float_ctrl) == 100000.0F);
+  assert_true(fabs(cbor_float_get_float(float_ctrl) - 100000.0F) < eps);
+  cbor_decref(&float_ctrl);
+  assert_null(float_ctrl);
+}
+
+unsigned char float8_data[] = {0xFB, 0x7E, 0x37, 0xE4, 0x3C,
+                               0x88, 0x00, 0x75, 0x9C};
+
+static void test_float8(void **state) {
+  float_ctrl = cbor_load(float8_data, 9, &res);
+  assert_true(cbor_isa_float_ctrl(float_ctrl));
+  assert_true(cbor_is_float(float_ctrl));
+  assert_true(cbor_float_get_width(float_ctrl) == CBOR_FLOAT_64);
+  // XXX: the cast prevents promotion to 80-bit floats on 32-bit x86
+  assert_true(cbor_float_get_float8(float_ctrl) == (double)1.0e+300);
+  cbor_decref(&float_ctrl);
+  assert_null(float_ctrl);
+}
+
+unsigned char null_data[] = {0xF6};
+
+static void test_null(void **state) {
+  float_ctrl = cbor_load(null_data, 1, &res);
+  assert_true(cbor_isa_float_ctrl(float_ctrl));
+  assert_true(cbor_is_null(float_ctrl));
+  cbor_decref(&float_ctrl);
+  assert_null(float_ctrl);
+}
+
+unsigned char undef_data[] = {0xF7};
+
+static void test_undef(void **state) {
+  float_ctrl = cbor_load(undef_data, 1, &res);
+  assert_true(cbor_isa_float_ctrl(float_ctrl));
+  assert_true(cbor_is_undef(float_ctrl));
+  cbor_decref(&float_ctrl);
+  assert_null(float_ctrl);
+}
+
+unsigned char bool_data[] = {0xF4, 0xF5};
+
+static void test_bool(void **state) {
+  float_ctrl = cbor_load(bool_data, 1, &res);
+  assert_true(cbor_isa_float_ctrl(float_ctrl));
+  assert_true(cbor_is_bool(float_ctrl));
+  assert_false(cbor_get_bool(float_ctrl));
+  cbor_set_bool(float_ctrl, true);
+  assert_true(cbor_get_bool(float_ctrl));
+  cbor_decref(&float_ctrl);
+  assert_null(float_ctrl);
+
+  float_ctrl = cbor_load(bool_data + 1, 1, &res);
+  assert_true(cbor_isa_float_ctrl(float_ctrl));
+  assert_true(cbor_is_bool(float_ctrl));
+  assert_true(cbor_get_bool(float_ctrl));
+  cbor_set_bool(float_ctrl, false);
+  assert_false(cbor_get_bool(float_ctrl));
+  cbor_decref(&float_ctrl);
+  assert_null(float_ctrl);
+}
+
+int main(void) {
+  const struct CMUnitTest tests[] = {
+      cmocka_unit_test(test_float2), cmocka_unit_test(test_float4),
+      cmocka_unit_test(test_float8), cmocka_unit_test(test_null),
+      cmocka_unit_test(test_undef),  cmocka_unit_test(test_bool)};
+  return cmocka_run_group_tests(tests, NULL, NULL);
+}
diff -Nru mysql-8.0-8.0.26/extra/libcbor/test/unicode_test.c mysql-8.0-8.0.27/extra/libcbor/test/unicode_test.c
--- mysql-8.0-8.0.26/extra/libcbor/test/unicode_test.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libcbor/test/unicode_test.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2014-2020 Pavel Kalvoda <me@pavelkalvoda.com>
+ *
+ * libcbor is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include <setjmp.h>
+#include <stdarg.h>
+#include <stddef.h>
+
+#include <cmocka.h>
+
+#include "../src/cbor/internal/unicode.h"
+
+struct _cbor_unicode_status status;
+
+unsigned char missing_bytes_data[] = {0xC4, 0x8C};
+
+/* Capital accented C */
+static void test_missing_bytes(void **state) {
+  _cbor_unicode_codepoint_count(missing_bytes_data, 1, &status);
+  assert_true(status.status == _CBOR_UNICODE_BADCP);
+  _cbor_unicode_codepoint_count(missing_bytes_data, 2, &status);
+  assert_true(status.status == _CBOR_UNICODE_OK);
+}
+
+unsigned char invalid_sequence_data[] = {0x65, 0xC4, 0x00};
+
+/* e, invalid seq */
+static void test_invalid_sequence(void **state) {
+  _cbor_unicode_codepoint_count(invalid_sequence_data, 3, &status);
+  assert_true(status.status == _CBOR_UNICODE_BADCP);
+  assert_true(status.location == 2);
+}
+
+int main(void) {
+  const struct CMUnitTest tests[] = {cmocka_unit_test(test_missing_bytes),
+                                     cmocka_unit_test(test_invalid_sequence)};
+  return cmocka_run_group_tests(tests, NULL, NULL);
+}
diff -Nru mysql-8.0-8.0.26/extra/libevent/libevent-2.1.11-stable/CMakeLists.txt mysql-8.0-8.0.27/extra/libevent/libevent-2.1.11-stable/CMakeLists.txt
--- mysql-8.0-8.0.26/extra/libevent/libevent-2.1.11-stable/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libevent/libevent-2.1.11-stable/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -816,6 +816,10 @@
     signal.c
     strlcpy.c)
 
+IF(EVENT__HAVE_STRLCPY)
+  LIST(REMOVE_ITEM SRC_CORE strlcpy.c)
+ENDIF()
+
 if(EVENT__HAVE_SELECT)
     list(APPEND SRC_CORE select.c)
 endif()
@@ -969,6 +973,11 @@
     PROPERTIES COMPILE_FLAGS "-fvisibility=hidden")
 endif()
 
+MY_CHECK_C_COMPILER_FLAG("-Warray-parameter" HAVE_ARRAY_PARAMETER)
+IF(HAVE_ARRAY_PARAMETER)
+  TARGET_COMPILE_OPTIONS(event_core PRIVATE "-Wno-array-parameter")
+ENDIF()
+
 # Do not generate legacy event library, and do not install or test anything.
 RETURN()
 
diff -Nru mysql-8.0-8.0.26/extra/libfido2/CMakeLists.txt mysql-8.0-8.0.27/extra/libfido2/CMakeLists.txt
--- mysql-8.0-8.0.26/extra/libfido2/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,385 @@
+# Copyright (c) 2018 Yubico AB. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+# detect AppleClang; needs to come before project()
+cmake_policy(SET CMP0025 NEW)
+
+IF(POLICY CMP0075)
+# Keep NEW, set in cmake/cmake_policies.cmake
+# CMAKE_POLICY(SET CMP0075 OLD)
+ENDIF()
+
+project(libfido2 C)
+# cmake_minimum_required(VERSION 3.0)
+
+include(CheckCCompilerFlag)
+include(CheckFunctionExists)
+include(CheckLibraryExists)
+include(CheckSymbolExists)
+include(CheckIncludeFiles)
+include(CheckTypeSize)
+include(GNUInstallDirs)
+
+# set(CMAKE_COLOR_MAKEFILE off)
+# set(CMAKE_VERBOSE_MAKEFILE on)
+# set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
+set(FIDO_MAJOR "1")
+set(FIDO_MINOR "5")
+set(FIDO_PATCH "0")
+set(FIDO_VERSION ${FIDO_MAJOR}.${FIDO_MINOR}.${FIDO_PATCH})
+
+add_definitions(-D_FIDO_MAJOR=${FIDO_MAJOR})
+add_definitions(-D_FIDO_MINOR=${FIDO_MINOR})
+add_definitions(-D_FIDO_PATCH=${FIDO_PATCH})
+
+if(CYGWIN OR MSYS)
+	set(WIN32 1)
+	add_definitions(-DWINVER=0x0a00)
+endif()
+
+if(WIN32)
+	add_definitions(-DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0600)
+endif()
+
+if(APPLE)
+	set(CMAKE_INSTALL_NAME_DIR
+	    "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+endif()
+
+if(MSVC)
+  IF(NOT WIN32_CLANG)
+	set(MSVC_DISABLED_WARNINGS_LIST
+		"C4200" # nonstandard extension used: zero-sized array in
+			# struct/union;
+		"C4204" # nonstandard extension used: non-constant aggregate
+			# initializer;
+		"C4706" # assignment within conditional expression;
+		"C4996" # The POSIX name for this item is deprecated. Instead,
+			# use the ISO C and C++ conformant name
+		)
+	# The construction in the following 3 lines was taken from LibreSSL's
+	# CMakeLists.txt.
+	string(REPLACE "C" " -wd" MSVC_DISABLED_WARNINGS_STR
+	    ${MSVC_DISABLED_WARNINGS_LIST})
+	string(REGEX REPLACE "[/-]W[1234][ ]?" "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -MP -W4 -WX ${MSVC_DISABLED_WARNINGS_STR}")
+	set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /Z7")
+	set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /Zi")
+  ENDIF()
+else()
+	if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+      FIND_LIBRARY(UDEV_SYSTEM_LIBRARY NAMES udev)
+      if(NOT UDEV_SYSTEM_LIBRARY)
+        MESSAGE(FATAL_ERROR "Cannot find the libudev library ${UDEV_SYSTEM_LIBRARY}")
+      endif()
+      SET(UDEV_LIBRARIES ${UDEV_SYSTEM_LIBRARY})
+      FIND_PATH(UDEV_INCLUDE_DIRS NAMES libudev.h)
+	  include_directories(${UDEV_INCLUDE_DIRS})
+      # Define be32toh().
+	  add_definitions(-D_GNU_SOURCE)
+	  # If using hidapi, use hidapi-hidraw.
+	  set(HIDAPI_SUFFIX -hidraw)
+	  # Look for clock_gettime in librt.
+	  check_library_exists(rt clock_gettime "time.h" HAVE_CLOCK_GETTIME)
+	  if(HAVE_CLOCK_GETTIME)
+		set(BASE_LIBRARIES ${BASE_LIBRARIES} rt)
+		add_definitions(-DHAVE_CLOCK_GETTIME)
+      endif()
+    endif()
+
+	if(MINGW)
+		# MinGW is stuck with a flavour of C89.
+		add_definitions(-DFIDO_NO_DIAGNOSTIC)
+		add_definitions(-DWC_ERR_INVALID_CHARS=0x80)
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-parameter")
+	endif()
+
+	if(FREEBSD)
+	    SET(USE_HIDAPI ON)
+        add_definitions(-DUSE_HIDAPI)
+        find_library(HIDAPI NAMES hidapi${HIDAPI_SUFFIX})
+        set(HIDAPI_LIBRARIES ${HIDAPI})
+        find_path(HIDAPI_INCLUDE_DIRS NAMES hidapi/hidapi.h)
+        include_directories(${HIDAPI_INCLUDE_DIRS}/hidapi/)
+	endif()
+
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wshadow")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wwrite-strings")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-prototypes")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wbad-function-cast")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic-errors")
+	check_c_compiler_flag("-fstack-protector-all" HAVE_STACK_PROTECTOR_ALL)
+	if(HAVE_STACK_PROTECTOR_ALL)
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-all")
+	endif()
+
+	add_definitions(-D_DEFAULT_SOURCE)
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
+
+	set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g2")
+	set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -fno-omit-frame-pointer")
+
+	if(FUZZ)
+		if(LIBFUZZER)
+			set(FUZZ_LDFLAGS "-fsanitize=fuzzer")
+			set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=fuzzer-no-link")
+		endif()
+		add_definitions(-DFIDO_FUZZ)
+	endif()
+endif()
+
+# Use -Wshorten-64-to-32 if available.
+check_c_compiler_flag("-Wshorten-64-to-32" HAVE_SHORTEN_64_TO_32)
+if(HAVE_SHORTEN_64_TO_32)
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wshorten-64-to-32")
+endif()
+
+# Avoid https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66425
+if(CMAKE_COMPILER_IS_GNUCC)
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-result")
+endif()
+
+# Decide which keyword to use for thread-local storage.
+if(CMAKE_COMPILER_IS_GNUCC OR
+   CMAKE_C_COMPILER_ID STREQUAL "Clang" OR
+   CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
+	set(TLS "__thread")
+elseif(WIN32)
+	set(TLS "__declspec(thread)")
+endif()
+
+add_definitions(-DTLS=${TLS})
+
+# endian.h
+check_include_files(endian.h HAVE_ENDIAN_H)
+if(HAVE_ENDIAN_H)
+	add_definitions(-DHAVE_ENDIAN_H)
+endif()
+
+# err.h
+check_include_files(err.h HAVE_ERR_H)
+if(HAVE_ERR_H)
+	add_definitions(-DHAVE_ERR_H)
+endif()
+
+# unistd.h
+check_include_files(unistd.h HAVE_UNISTD_H)
+if(HAVE_UNISTD_H)
+	add_definitions(-DHAVE_UNISTD_H)
+endif()
+
+# signal.h
+check_include_files(signal.h HAVE_SIGNAL_H)
+if(HAVE_SIGNAL_H)
+	add_definitions(-DHAVE_SIGNAL_H)
+endif()
+
+# sys/random.h
+check_include_files(sys/random.h HAVE_SYS_RANDOM_H)
+if(HAVE_SYS_RANDOM_H)
+	add_definitions(-DHAVE_SYS_RANDOM_H)
+endif()
+
+# strlcpy
+check_function_exists(strlcpy HAVE_STRLCPY)
+if(HAVE_STRLCPY)
+	add_definitions(-DHAVE_STRLCPY)
+endif()
+
+# strlcat
+check_function_exists(strlcpy HAVE_STRLCAT)
+if(HAVE_STRLCAT)
+	add_definitions(-DHAVE_STRLCAT)
+endif()
+
+# recallocarray
+check_function_exists(recallocarray HAVE_RECALLOCARRAY)
+if(HAVE_RECALLOCARRAY)
+	add_definitions(-DHAVE_RECALLOCARRAY)
+endif()
+
+# XXX getpagesize is incorrectly detected when cross-compiling
+# with mingw on Linux. Avoid.
+if(NOT WIN32)
+	check_function_exists(getpagesize HAVE_GETPAGESIZE)
+endif()
+if(HAVE_GETPAGESIZE)
+	add_definitions(-DHAVE_GETPAGESIZE)
+endif()
+
+# sysconf
+check_function_exists(sysconf HAVE_SYSCONF)
+if(HAVE_SYSCONF)
+	add_definitions(-DHAVE_SYSCONF)
+endif()
+
+# memset_s
+if(APPLE)
+	add_definitions(-D__STDC_WANT_LIB_EXT1__=1)
+endif()
+check_function_exists(memset_s HAVE_MEMSET_S)
+if(HAVE_MEMSET_S)
+	add_definitions(-DHAVE_MEMSET_S)
+endif()
+
+# explicit_bzero
+if(NOT LIBFUZZER)
+	check_function_exists(explicit_bzero HAVE_EXPLICIT_BZERO)
+	if(HAVE_EXPLICIT_BZERO)
+		add_definitions(-DHAVE_EXPLICIT_BZERO)
+	endif()
+endif()
+
+# timingsafe_bcmp
+check_function_exists(timingsafe_bcmp HAVE_TIMINGSAFE_BCMP)
+if(HAVE_TIMINGSAFE_BCMP)
+	add_definitions(-DHAVE_TIMINGSAFE_BCMP)
+endif()
+
+# readpassphrase
+check_function_exists(readpassphrase HAVE_READPASSPHRASE)
+if(HAVE_READPASSPHRASE)
+	add_definitions(-DHAVE_READPASSPHRASE)
+endif()
+
+# getline
+check_function_exists(getline HAVE_GETLINE)
+if(HAVE_GETLINE)
+	add_definitions(-DHAVE_GETLINE)
+endif()
+
+# getopt
+check_function_exists(getopt HAVE_GETOPT)
+if(HAVE_GETOPT)
+	add_definitions(-DHAVE_GETOPT)
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wcast-qual")
+else()
+	if(CMAKE_COMPILER_IS_GNUCC)
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-discarded-qualifiers")
+	endif()
+	if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-incompatible-pointer-types-discards-qualifiers")
+	endif()
+endif()
+
+# usable sigaction
+set(CMAKE_EXTRA_INCLUDE_FILES signal.h)
+check_function_exists(sigaction HAVE_SIGACTION)
+check_type_size("sig_atomic_t" HAVE_SIG_ATOMIC_T)
+if(HAVE_SIGACTION AND (NOT HAVE_SIG_ATOMIC_T STREQUAL ""))
+	add_definitions(-DSIGNAL_EXAMPLE)
+endif()
+set(CMAKE_EXTRA_INCLUDE_FILES)
+
+# arc4random_buf
+check_function_exists(arc4random_buf HAVE_ARC4RANDOM_BUF)
+if(HAVE_ARC4RANDOM_BUF)
+	add_definitions(-DHAVE_ARC4RANDOM_BUF)
+endif()
+
+# getrandom
+check_function_exists(getrandom HAVE_GETRANDOM)
+if(HAVE_GETRANDOM)
+	add_definitions(-DHAVE_GETRANDOM)
+endif()
+
+# /dev/urandom
+if(UNIX)
+	add_definitions(-DHAVE_DEV_URANDOM)
+endif()
+
+# clock_gettime
+if(NOT HAVE_CLOCK_GETTIME)
+	check_function_exists(clock_gettime HAVE_CLOCK_GETTIME)
+	if(HAVE_CLOCK_GETTIME)
+		add_definitions(-DHAVE_CLOCK_GETTIME)
+	endif()
+endif()
+
+# timespecsub
+check_symbol_exists(timespecsub sys/time.h HAVE_TIMESPECSUB)
+if(HAVE_TIMESPECSUB)
+	add_definitions(-DHAVE_TIMESPECSUB)
+endif()
+
+# export list
+if(APPLE AND (CMAKE_C_COMPILER_ID STREQUAL "Clang" OR
+   CMAKE_C_COMPILER_ID STREQUAL "AppleClang"))
+	# clang + lld
+	string(CONCAT CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS}
+	    " -exported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/src/export.llvm")
+elseif(NOT MSVC)
+	# clang/gcc + gnu ld
+	if(FUZZ)
+		string(CONCAT CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS}
+                    " -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/fuzz/export.gnu")
+	else()
+		string(CONCAT CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS}
+                    " -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/src/export.gnu")
+	endif()
+	if(NOT WIN32)
+		string(CONCAT CMAKE_SHARED_LINKER_FLAGS
+		    ${CMAKE_SHARED_LINKER_FLAGS}
+		    " -Wl,-z,noexecstack -Wl,-z,relro,-z,now")
+		string(CONCAT CMAKE_EXE_LINKER_FLAGS
+		    ${CMAKE_EXE_LINKER_FLAGS}
+		    " -Wl,-z,noexecstack -Wl,-z,relro,-z,now")
+		if(FUZZ)
+			file(STRINGS fuzz/wrapped.sym WRAPPED_SYMBOLS)
+			foreach(s ${WRAPPED_SYMBOLS})
+				string(CONCAT CMAKE_SHARED_LINKER_FLAGS
+				    ${CMAKE_SHARED_LINKER_FLAGS}
+				    " -Wl,--wrap=${s}")
+			endforeach()
+		endif()
+	endif()
+else()
+	string(CONCAT CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS}
+	    " /def:\"${CMAKE_CURRENT_SOURCE_DIR}/src/export.msvc\"")
+endif()
+
+SET(CBOR_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/${CBOR_BUNDLE_SRC_PATH}
+                      ${CMAKE_SOURCE_DIR}/${CBOR_BUNDLE_SRC_PATH}/src
+                      ${CMAKE_BINARY_DIR}/${CBOR_BUNDLE_SRC_PATH})
+
+SET(CBOR_LIBRARY_DIRS ${CMAKE_BINARY_DIR}/${CBOR_BUNDLE_SRC_PATH})
+
+DISABLE_MISSING_PROFILE_WARNING()
+IF(FPROFILE_USE)
+  MY_CHECK_CXX_COMPILER_WARNING("-Wcoverage-mismatch" HAS_WARN_FLAG)
+  IF(HAS_WARN_FLAG)
+    STRING_APPEND(CMAKE_C_FLAGS " ${HAS_WARN_FLAG}")
+  ENDIF()
+ENDIF()
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src)
+include_directories(${CBOR_INCLUDE_DIRS})
+
+# This should not be necessary, we know where libcbor.a is,
+# and there is no need to set any RUNPATH in libfido2.so
+# link_directories(${CBOR_LIBRARY_DIRS})
+
+subdirs(src)
+#subdirs(examples)
+#subdirs(tools)
+
+# if(NOT WIN32)
+# 	if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+# 		if(NOT LIBFUZZER AND NOT FUZZ)
+# 			subdirs(regress)
+# 		endif()
+# 	endif()
+# 	if(FUZZ)
+# 		subdirs(fuzz)
+# 	endif()
+#
+# 	if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+# 		subdirs(udev)
+# 	endif()
+# endif()
diff -Nru mysql-8.0-8.0.26/extra/libfido2/fuzz/build-coverage mysql-8.0-8.0.27/extra/libfido2/fuzz/build-coverage
--- mysql-8.0-8.0.26/extra/libfido2/fuzz/build-coverage	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/fuzz/build-coverage	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,30 @@
+#!/bin/sh -eux
+
+# Copyright (c) 2019 Yubico AB. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+LIBCBOR="$1"
+LIBFIDO2="$2"
+
+CC="${CC:-clang}"
+CXX="${CXX:-clang++}"
+PKG_CONFIG_PATH="${PKG_CONFIG_PATH:-${LIBCBOR}/install/lib/pkgconfig}"
+export CC PKG_CONFIG_PATH
+
+# Clean up.
+rm -rf "${LIBCBOR}/build" "${LIBCBOR}/install" "${LIBFIDO2}/build"
+
+# Patch, build, and install libcbor.
+(cd "${LIBCBOR}" && patch -N -l -s -p0 < "${LIBFIDO2}/fuzz/README") || true
+mkdir "${LIBCBOR}/build" "${LIBCBOR}/install"
+(cd "${LIBCBOR}/build" && cmake -DCMAKE_INSTALL_PREFIX="${LIBCBOR}/install" ..)
+make -C "${LIBCBOR}/build" all install
+
+# Build libfido2.
+mkdir -p "${LIBFIDO2}/build"
+export CFLAGS="-fprofile-instr-generate -fcoverage-mapping"
+export LDFLAGS="${CFLAGS}"
+(cd "${LIBFIDO2}/build" && cmake -DFUZZ=1 -DLIBFUZZER=1 \
+    -DCMAKE_BUILD_TYPE=Debug ..)
+make -C "${LIBFIDO2}/build"
diff -Nru mysql-8.0-8.0.26/extra/libfido2/fuzz/CMakeLists.txt mysql-8.0-8.0.27/extra/libfido2/fuzz/CMakeLists.txt
--- mysql-8.0-8.0.26/extra/libfido2/fuzz/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/fuzz/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,43 @@
+# Copyright (c) 2019 Yubico AB. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+list(APPEND COMPAT_SOURCES
+	../openbsd-compat/strlcpy.c
+	../openbsd-compat/strlcat.c
+)
+
+list(APPEND COMMON_SOURCES
+	libfuzzer.c
+	mutator_aux.c
+)
+
+# fuzz_cred
+add_executable(fuzz_cred fuzz_cred.c ${COMMON_SOURCES} ${COMPAT_SOURCES})
+target_compile_options(fuzz_cred PRIVATE ${FUZZ_LDFLAGS})
+set_target_properties(fuzz_cred PROPERTIES LINK_FLAGS ${FUZZ_LDFLAGS})
+target_link_libraries(fuzz_cred fido2_shared)
+
+# fuzz_assert
+add_executable(fuzz_assert fuzz_assert.c ${COMMON_SOURCES} ${COMPAT_SOURCES})
+target_compile_options(fuzz_assert PRIVATE ${FUZZ_LDFLAGS})
+set_target_properties(fuzz_assert PROPERTIES LINK_FLAGS ${FUZZ_LDFLAGS})
+target_link_libraries(fuzz_assert fido2_shared)
+
+# fuzz_mgmt
+add_executable(fuzz_mgmt fuzz_mgmt.c ${COMMON_SOURCES} ${COMPAT_SOURCES})
+target_compile_options(fuzz_mgmt PRIVATE ${FUZZ_LDFLAGS})
+set_target_properties(fuzz_mgmt PROPERTIES LINK_FLAGS ${FUZZ_LDFLAGS})
+target_link_libraries(fuzz_mgmt fido2_shared)
+
+# fuzz_credman
+add_executable(fuzz_credman fuzz_credman.c ${COMMON_SOURCES} ${COMPAT_SOURCES})
+target_compile_options(fuzz_credman PRIVATE ${FUZZ_LDFLAGS})
+set_target_properties(fuzz_credman PROPERTIES LINK_FLAGS ${FUZZ_LDFLAGS})
+target_link_libraries(fuzz_credman fido2_shared)
+
+# fuzz_bio
+add_executable(fuzz_bio fuzz_bio.c ${COMMON_SOURCES} ${COMPAT_SOURCES})
+target_compile_options(fuzz_bio PRIVATE ${FUZZ_LDFLAGS})
+set_target_properties(fuzz_bio PROPERTIES LINK_FLAGS ${FUZZ_LDFLAGS})
+target_link_libraries(fuzz_bio fido2_shared)
diff -Nru mysql-8.0-8.0.26/extra/libfido2/fuzz/Dockerfile mysql-8.0-8.0.27/extra/libfido2/fuzz/Dockerfile
--- mysql-8.0-8.0.26/extra/libfido2/fuzz/Dockerfile	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/fuzz/Dockerfile	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,11 @@
+# Copyright (c) 2019 Yubico AB. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+FROM ubuntu:focal
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get update
+RUN apt-get install -y clang-10 cmake git libssl-dev libudev-dev make pkg-config
+RUN git clone --branch v0.7.0 https://github.com/PJK/libcbor
+RUN git clone https://github.com/yubico/libfido2
+RUN CC=clang-10 CXX=clang++-10 /libfido2/fuzz/build-coverage /libcbor /libfido2
diff -Nru mysql-8.0-8.0.26/extra/libfido2/fuzz/dummy.h mysql-8.0-8.0.27/extra/libfido2/fuzz/dummy.h
--- mysql-8.0-8.0.26/extra/libfido2/fuzz/dummy.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/fuzz/dummy.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2020 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#ifndef _DUMMY_H
+#define _DUMMY_H
+
+#include <stdint.h>
+
+const char dummy_name[] = "finger1";
+const char dummy_pin1[] = "skepp cg0u3;Y..";
+const char dummy_pin2[] = "bastilha 6rJrfQZI.";
+const char dummy_pin[] = "9}4gT:8d=A37Dh}U";
+const char dummy_rp_id[] = "localhost";
+const char dummy_rp_name[] = "sweet home localhost";
+const char dummy_user_icon[] = "an icon";
+const char dummy_user_name[] = "john smith";
+const char dummy_user_nick[] = "jsmith";
+const uint8_t dummy_id[] = { 0x5e, 0xd2 };
+
+const uint8_t dummy_user_id[] = {
+	0x78, 0x1c, 0x78, 0x60, 0xad, 0x88, 0xd2, 0x63,
+	0x32, 0x62, 0x2a, 0xf1, 0x74, 0x5d, 0xed, 0xb2,
+	0xe7, 0xa4, 0x2b, 0x44, 0x89, 0x29, 0x39, 0xc5,
+	0x56, 0x64, 0x01, 0x27, 0x0d, 0xbb, 0xc4, 0x49,
+};
+
+const uint8_t dummy_cred_id[] = {
+	0x4f, 0x72, 0x98, 0x42, 0x4a, 0xe1, 0x17, 0xa5,
+	0x85, 0xa0, 0xef, 0x3b, 0x11, 0x24, 0x4a, 0x3d,
+};
+
+const uint8_t dummy_cdh[] = {
+	0xec, 0x8d, 0x8f, 0x78, 0x42, 0x4a, 0x2b, 0xb7,
+	0x82, 0x34, 0xaa, 0xca, 0x07, 0xa1, 0xf6, 0x56,
+	0x42, 0x1c, 0xb6, 0xf6, 0xb3, 0x00, 0x86, 0x52,
+	0x35, 0x2d, 0xa2, 0x62, 0x4a, 0xbe, 0x89, 0x76,
+};
+
+const uint8_t dummy_es256[] = {
+	0xcc, 0x1b, 0x50, 0xac, 0xc4, 0x19, 0xf8, 0x3a,
+	0xee, 0x0a, 0x77, 0xd6, 0xf3, 0x53, 0xdb, 0xef,
+	0xf2, 0xb9, 0x5c, 0x2d, 0x8b, 0x1e, 0x52, 0x58,
+	0x88, 0xf4, 0x0b, 0x85, 0x1f, 0x40, 0x6d, 0x18,
+	0x15, 0xb3, 0xcc, 0x25, 0x7c, 0x38, 0x3d, 0xec,
+	0xdf, 0xad, 0xbd, 0x46, 0x91, 0xc3, 0xac, 0x30,
+	0x94, 0x2a, 0xf7, 0x78, 0x35, 0x70, 0x59, 0x6f,
+	0x28, 0xcb, 0x8e, 0x07, 0x85, 0xb5, 0x91, 0x96,
+};
+
+const uint8_t dummy_rs256[] = {
+	0xd2, 0xa8, 0xc0, 0x11, 0x82, 0x9e, 0x57, 0x2e,
+	0x60, 0xae, 0x8c, 0xb0, 0x09, 0xe1, 0x58, 0x2b,
+	0x99, 0xec, 0xc3, 0x11, 0x1b, 0xef, 0x81, 0x49,
+	0x34, 0x53, 0x6a, 0x01, 0x65, 0x2c, 0x24, 0x09,
+	0x30, 0x87, 0x98, 0x51, 0x6e, 0x30, 0x4f, 0x60,
+	0xbd, 0x54, 0xd2, 0x54, 0xbd, 0x94, 0x42, 0xdd,
+	0x63, 0xe5, 0x2c, 0xc6, 0x04, 0x32, 0xc0, 0x8f,
+	0x72, 0xd5, 0xb4, 0xf0, 0x4f, 0x42, 0xe5, 0xb0,
+	0xa2, 0x95, 0x11, 0xfe, 0xd8, 0xb0, 0x65, 0x34,
+	0xff, 0xfb, 0x44, 0x97, 0x52, 0xfc, 0x67, 0x23,
+	0x0b, 0xad, 0xf3, 0x3a, 0x82, 0xd4, 0x96, 0x10,
+	0x87, 0x6b, 0xfa, 0xd6, 0x51, 0x60, 0x3e, 0x1c,
+	0xae, 0x19, 0xb8, 0xce, 0x08, 0xae, 0x9a, 0xee,
+	0x78, 0x16, 0x22, 0xcc, 0x92, 0xcb, 0xa8, 0x95,
+	0x34, 0xe5, 0xb9, 0x42, 0x6a, 0xf0, 0x2e, 0x82,
+	0x1f, 0x4c, 0x7d, 0x84, 0x94, 0x68, 0x7b, 0x97,
+	0x2b, 0xf7, 0x7d, 0x67, 0x83, 0xbb, 0xc7, 0x8a,
+	0x31, 0x5a, 0xf3, 0x2a, 0x95, 0xdf, 0x63, 0xe7,
+	0x4e, 0xee, 0x26, 0xda, 0x87, 0x00, 0xe2, 0x23,
+	0x4a, 0x33, 0x9a, 0xa0, 0x1b, 0xce, 0x60, 0x1f,
+	0x98, 0xa1, 0xb0, 0xdb, 0xbf, 0x20, 0x59, 0x27,
+	0xf2, 0x06, 0xd9, 0xbe, 0x37, 0xa4, 0x03, 0x6b,
+	0x6a, 0x4e, 0xaf, 0x22, 0x68, 0xf3, 0xff, 0x28,
+	0x59, 0x05, 0xc9, 0xf1, 0x28, 0xf4, 0xbb, 0x35,
+	0xe0, 0xc2, 0x68, 0xc2, 0xaa, 0x54, 0xac, 0x8c,
+	0xc1, 0x69, 0x9e, 0x4b, 0x32, 0xfc, 0x53, 0x58,
+	0x85, 0x7d, 0x3f, 0x51, 0xd1, 0xc9, 0x03, 0x02,
+	0x13, 0x61, 0x62, 0xda, 0xf8, 0xfe, 0x3e, 0xc8,
+	0x95, 0x12, 0xfb, 0x0c, 0xdf, 0x06, 0x65, 0x6f,
+	0x23, 0xc7, 0x83, 0x7c, 0x50, 0x2d, 0x27, 0x25,
+	0x4d, 0xbf, 0x94, 0xf0, 0x89, 0x04, 0xb9, 0x2d,
+	0xc4, 0xa5, 0x32, 0xa9, 0x25, 0x0a, 0x99, 0x59,
+	0x01, 0x00, 0x01,
+};
+
+const uint8_t dummy_eddsa[] = {
+	0xfe, 0x8b, 0x61, 0x50, 0x31, 0x7a, 0xe6, 0xdf,
+	0xb1, 0x04, 0x9d, 0x4d, 0xb5, 0x7a, 0x5e, 0x96,
+	0x4c, 0xb2, 0xf9, 0x5f, 0x72, 0x47, 0xb5, 0x18,
+	0xe2, 0x39, 0xdf, 0x2f, 0x87, 0x19, 0xb3, 0x02,
+};
+
+#endif /* !_DUMMY_H */
diff -Nru mysql-8.0-8.0.26/extra/libfido2/fuzz/export.gnu mysql-8.0-8.0.27/extra/libfido2/fuzz/export.gnu
--- mysql-8.0-8.0.26/extra/libfido2/fuzz/export.gnu	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/fuzz/export.gnu	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,199 @@
+{
+	global:
+		eddsa_pk_free;
+		eddsa_pk_from_EVP_PKEY;
+		eddsa_pk_from_ptr;
+		eddsa_pk_new;
+		eddsa_pk_to_EVP_PKEY;
+		es256_pk_free;
+		es256_pk_from_EC_KEY;
+		es256_pk_from_ptr;
+		es256_pk_new;
+		es256_pk_to_EVP_PKEY;
+		fido_assert_allow_cred;
+		fido_assert_authdata_len;
+		fido_assert_authdata_ptr;
+		fido_assert_clientdata_hash_len;
+		fido_assert_clientdata_hash_ptr;
+		fido_assert_count;
+		fido_assert_flags;
+		fido_assert_free;
+		fido_assert_hmac_secret_len;
+		fido_assert_hmac_secret_ptr;
+		fido_assert_id_len;
+		fido_assert_id_ptr;
+		fido_assert_new;
+		fido_assert_rp_id;
+		fido_assert_set_authdata;
+		fido_assert_set_authdata_raw;
+		fido_assert_set_clientdata_hash;
+		fido_assert_set_count;
+		fido_assert_set_extensions;
+		fido_assert_set_hmac_salt;
+		fido_assert_set_options;
+		fido_assert_set_rp;
+		fido_assert_set_sig;
+		fido_assert_set_up;
+		fido_assert_set_uv;
+		fido_assert_sigcount;
+		fido_assert_sig_len;
+		fido_assert_sig_ptr;
+		fido_assert_user_display_name;
+		fido_assert_user_icon;
+		fido_assert_user_id_len;
+		fido_assert_user_id_ptr;
+		fido_assert_user_name;
+		fido_assert_verify;
+		fido_bio_dev_enroll_begin;
+		fido_bio_dev_enroll_cancel;
+		fido_bio_dev_enroll_continue;
+		fido_bio_dev_enroll_remove;
+		fido_bio_dev_get_info;
+		fido_bio_dev_get_template_array;
+		fido_bio_dev_set_template_name;
+		fido_bio_enroll_free;
+		fido_bio_enroll_last_status;
+		fido_bio_enroll_new;
+		fido_bio_enroll_remaining_samples;
+		fido_bio_info_free;
+		fido_bio_info_max_samples;
+		fido_bio_info_new;
+		fido_bio_info_type;
+		fido_bio_template;
+		fido_bio_template_array_count;
+		fido_bio_template_array_free;
+		fido_bio_template_array_new;
+		fido_bio_template_free;
+		fido_bio_template_id_len;
+		fido_bio_template_id_ptr;
+		fido_bio_template_name;
+		fido_bio_template_new;
+		fido_bio_template_set_id;
+		fido_bio_template_set_name;
+		fido_cbor_info_aaguid_len;
+		fido_cbor_info_aaguid_ptr;
+		fido_cbor_info_extensions_len;
+		fido_cbor_info_extensions_ptr;
+		fido_cbor_info_free;
+		fido_cbor_info_maxmsgsiz;
+		fido_cbor_info_maxcredcntlst;
+		fido_cbor_info_maxcredidlen;
+		fido_cbor_info_fwversion;
+		fido_cbor_info_new;
+		fido_cbor_info_options_len;
+		fido_cbor_info_options_name_ptr;
+		fido_cbor_info_options_value_ptr;
+		fido_cbor_info_protocols_len;
+		fido_cbor_info_protocols_ptr;
+		fido_cbor_info_versions_len;
+		fido_cbor_info_versions_ptr;
+		fido_cred_authdata_len;
+		fido_cred_authdata_ptr;
+		fido_cred_clientdata_hash_len;
+		fido_cred_clientdata_hash_ptr;
+		fido_cred_display_name;
+		fido_cred_exclude;
+		fido_cred_flags;
+		fido_cred_fmt;
+		fido_cred_free;
+		fido_cred_id_len;
+		fido_cred_id_ptr;
+		fido_cred_aaguid_len;
+		fido_cred_aaguid_ptr;
+		fido_credman_del_dev_rk;
+		fido_credman_get_dev_metadata;
+		fido_credman_get_dev_rk;
+		fido_credman_get_dev_rp;
+		fido_credman_metadata_free;
+		fido_credman_metadata_new;
+		fido_credman_rk;
+		fido_credman_rk_count;
+		fido_credman_rk_existing;
+		fido_credman_rk_free;
+		fido_credman_rk_new;
+		fido_credman_rk_remaining;
+		fido_credman_rp_count;
+		fido_credman_rp_free;
+		fido_credman_rp_id;
+		fido_credman_rp_id_hash_len;
+		fido_credman_rp_id_hash_ptr;
+		fido_credman_rp_name;
+		fido_credman_rp_new;
+		fido_cred_new;
+		fido_cred_prot;
+		fido_cred_pubkey_len;
+		fido_cred_pubkey_ptr;
+		fido_cred_rp_id;
+		fido_cred_rp_name;
+		fido_cred_set_authdata;
+		fido_cred_set_authdata_raw;
+		fido_cred_set_clientdata_hash;
+		fido_cred_set_extensions;
+		fido_cred_set_fmt;
+		fido_cred_set_options;
+		fido_cred_set_prot;
+		fido_cred_set_rk;
+		fido_cred_set_rp;
+		fido_cred_set_sig;
+		fido_cred_set_type;
+		fido_cred_set_user;
+		fido_cred_set_uv;
+		fido_cred_set_x509;
+		fido_cred_sig_len;
+		fido_cred_sig_ptr;
+		fido_cred_type;
+		fido_cred_user_id_len;
+		fido_cred_user_id_ptr;
+		fido_cred_user_name;
+		fido_cred_verify;
+		fido_cred_verify_self;
+		fido_cred_x5c_len;
+		fido_cred_x5c_ptr;
+		fido_dev_build;
+		fido_dev_cancel;
+		fido_dev_close;
+		fido_dev_flags;
+		fido_dev_force_fido2;
+		fido_dev_force_u2f;
+		fido_dev_free;
+		fido_dev_get_assert;
+		fido_dev_get_cbor_info;
+		fido_dev_get_retry_count;
+		fido_dev_get_touch_begin;
+		fido_dev_get_touch_status;
+		fido_dev_has_pin;
+		fido_dev_info_free;
+		fido_dev_info_manifest;
+		fido_dev_info_manufacturer_string;
+		fido_dev_info_new;
+		fido_dev_info_path;
+		fido_dev_info_product;
+		fido_dev_info_product_string;
+		fido_dev_info_ptr;
+		fido_dev_info_vendor;
+		fido_dev_is_fido2;
+		fido_dev_major;
+		fido_dev_make_cred;
+		fido_dev_minor;
+		fido_dev_new;
+		fido_dev_open;
+		fido_dev_protocol;
+		fido_dev_reset;
+		fido_dev_set_io_functions;
+		fido_dev_set_pin;
+		fido_dev_set_transport_functions;
+		fido_dev_supports_cred_prot;
+		fido_dev_supports_pin;
+		fido_init;
+		fido_set_log_handler;
+		fido_strerr;
+		rs256_pk_free;
+		rs256_pk_from_ptr;
+		rs256_pk_from_RSA;
+		rs256_pk_new;
+		rs256_pk_to_EVP_PKEY;
+		prng_init;
+		uniform_random;
+	local:
+		*;
+};
diff -Nru mysql-8.0-8.0.26/extra/libfido2/fuzz/functions.txt mysql-8.0-8.0.27/extra/libfido2/fuzz/functions.txt
--- mysql-8.0-8.0.26/extra/libfido2/fuzz/functions.txt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/fuzz/functions.txt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,599 @@
+File '/libfido2/src/aes256.c':
+Name                        Regions    Miss   Cover     Lines    Miss   Cover
+-----------------------------------------------------------------------------
+aes256_cbc_enc                   28       0 100.00%        41       0 100.00%
+aes256_cbc_dec                   28       0 100.00%        41       0 100.00%
+-----------------------------------------------------------------------------
+TOTAL                            56       0 100.00%        82       0 100.00%
+
+File '/libfido2/src/assert.c':
+Name                                  Regions    Miss   Cover     Lines    Miss   Cover
+---------------------------------------------------------------------------------------
+fido_dev_get_assert                        35       0 100.00%        38       0 100.00%
+fido_check_flags                           13       0 100.00%        18       0 100.00%
+fido_get_signed_hash                       32       0 100.00%        46       0 100.00%
+fido_verify_sig_es256                      17       2  88.24%        31       7  77.42%
+fido_verify_sig_rs256                      17       2  88.24%        31       7  77.42%
+fido_verify_sig_eddsa                      23       2  91.30%        43       7  83.72%
+fido_assert_verify                         48       4  91.67%        79       5  93.67%
+fido_assert_set_clientdata_hash             6       0 100.00%         6       0 100.00%
+fido_assert_set_hmac_salt                  10       0 100.00%         7       0 100.00%
+fido_assert_set_rp                         12       0 100.00%        14       0 100.00%
+fido_assert_allow_cred                     13       2  84.62%        29       3  89.66%
+fido_assert_set_extensions                  9       0 100.00%         8       0 100.00%
+fido_assert_set_options                     6       6   0.00%         6       6   0.00%
+fido_assert_set_up                          2       0 100.00%         5       0 100.00%
+fido_assert_set_uv                          2       0 100.00%         5       0 100.00%
+fido_assert_clientdata_hash_ptr             1       0 100.00%         3       0 100.00%
+fido_assert_clientdata_hash_len             1       0 100.00%         3       0 100.00%
+fido_assert_new                             1       0 100.00%         3       0 100.00%
+fido_assert_reset_tx                        1       0 100.00%        15       0 100.00%
+fido_assert_reset_rx                        6       0 100.00%        24       0 100.00%
+fido_assert_free                            6       0 100.00%        13       0 100.00%
+fido_assert_count                           1       0 100.00%         3       0 100.00%
+fido_assert_rp_id                           1       0 100.00%         3       0 100.00%
+fido_assert_flags                           4       0 100.00%         6       0 100.00%
+fido_assert_sigcount                        4       0 100.00%         6       0 100.00%
+fido_assert_authdata_ptr                    4       0 100.00%         6       0 100.00%
+fido_assert_authdata_len                    4       0 100.00%         6       0 100.00%
+fido_assert_sig_ptr                         4       0 100.00%         6       0 100.00%
+fido_assert_sig_len                         4       0 100.00%         6       0 100.00%
+fido_assert_id_ptr                          4       0 100.00%         6       0 100.00%
+fido_assert_id_len                          4       0 100.00%         6       0 100.00%
+fido_assert_user_id_ptr                     4       0 100.00%         6       0 100.00%
+fido_assert_user_id_len                     4       0 100.00%         6       0 100.00%
+fido_assert_user_icon                       4       0 100.00%         6       0 100.00%
+fido_assert_user_name                       4       0 100.00%         6       0 100.00%
+fido_assert_user_display_name               4       0 100.00%         6       0 100.00%
+fido_assert_hmac_secret_ptr                 4       0 100.00%         6       0 100.00%
+fido_assert_hmac_secret_len                 4       0 100.00%         6       0 100.00%
+fido_assert_set_authdata                   24       0 100.00%        35       0 100.00%
+fido_assert_set_authdata_raw               24       0 100.00%        34       0 100.00%
+fido_assert_set_sig                        14       0 100.00%        17       0 100.00%
+fido_assert_set_count                      10       0 100.00%        21       0 100.00%
+assert.c:fido_dev_get_assert_wait          21       0 100.00%        16       0 100.00%
+assert.c:fido_dev_get_assert_tx            58       4  93.10%        84      11  86.90%
+assert.c:fido_dev_get_assert_rx            19       0 100.00%        38       0 100.00%
+assert.c:adjust_assert_count               24       0 100.00%        33       0 100.00%
+assert.c:parse_assert_reply                11       0 100.00%        25       0 100.00%
+assert.c:fido_get_next_assert_tx            8       0 100.00%        10       0 100.00%
+assert.c:fido_get_next_assert_rx           15       2  86.67%        26       4  84.62%
+assert.c:decrypt_hmac_secrets               9       0 100.00%        15       0 100.00%
+assert.c:check_extensions                   4       0 100.00%         9       0 100.00%
+assert.c:fido_assert_clean_authdata         1       0 100.00%         9       0 100.00%
+assert.c:fido_assert_clean_sig              1       0 100.00%         5       0 100.00%
+---------------------------------------------------------------------------------------
+TOTAL                                     566      24  95.76%       900      50  94.44%
+
+File '/libfido2/src/authkey.c':
+Name                                  Regions    Miss   Cover     Lines    Miss   Cover
+---------------------------------------------------------------------------------------
+fido_dev_authkey                            1       0 100.00%         3       0 100.00%
+authkey.c:fido_dev_authkey_wait            10       0 100.00%         9       0 100.00%
+authkey.c:fido_dev_authkey_tx              19       0 100.00%        33       0 100.00%
+authkey.c:fido_dev_authkey_rx               6       0 100.00%        18       0 100.00%
+authkey.c:parse_authkey                     8       0 100.00%        12       0 100.00%
+---------------------------------------------------------------------------------------
+TOTAL                                      44       0 100.00%        75       0 100.00%
+
+File '/libfido2/src/bio.c':
+Name                                  Regions    Miss   Cover     Lines    Miss   Cover
+---------------------------------------------------------------------------------------
+fido_bio_dev_get_template_array             5       2  60.00%         6       0 100.00%
+fido_bio_dev_set_template_name              7       0 100.00%         6       0 100.00%
+fido_bio_dev_enroll_begin                  24       2  91.67%        36       0 100.00%
+fido_bio_dev_enroll_continue                5       2  60.00%         6       0 100.00%
+fido_bio_dev_enroll_cancel                  1       1   0.00%         3       3   0.00%
+fido_bio_dev_enroll_remove                  1       0 100.00%         3       0 100.00%
+fido_bio_dev_get_info                       1       0 100.00%         3       0 100.00%
+fido_bio_template_name                      1       0 100.00%         3       0 100.00%
+fido_bio_template_id_ptr                    1       0 100.00%         3       0 100.00%
+fido_bio_template_id_len                    1       0 100.00%         3       0 100.00%
+fido_bio_template_array_count               1       0 100.00%         3       0 100.00%
+fido_bio_template_array_new                 1       0 100.00%         3       0 100.00%
+fido_bio_template_new                       1       0 100.00%         3       0 100.00%
+fido_bio_template_array_free                6       0 100.00%        10       0 100.00%
+fido_bio_template_free                      6       0 100.00%        10       0 100.00%
+fido_bio_template_set_name                  8       0 100.00%         9       0 100.00%
+fido_bio_template_set_id                    8       0 100.00%        10       0 100.00%
+fido_bio_template                           4       0 100.00%         6       0 100.00%
+fido_bio_enroll_new                         1       0 100.00%         3       0 100.00%
+fido_bio_info_new                           1       0 100.00%         3       0 100.00%
+fido_bio_info_type                          1       0 100.00%         3       0 100.00%
+fido_bio_info_max_samples                   1       0 100.00%         3       0 100.00%
+fido_bio_enroll_free                        6       0 100.00%        11       0 100.00%
+fido_bio_info_free                          6       0 100.00%         9       0 100.00%
+fido_bio_enroll_remaining_samples           1       0 100.00%         3       0 100.00%
+fido_bio_enroll_last_status                 1       0 100.00%         3       0 100.00%
+bio.c:bio_get_template_array_wait          11       0 100.00%         9       0 100.00%
+bio.c:bio_tx                               43       0 100.00%        65       0 100.00%
+bio.c:bio_prepare_hmac                     18       0 100.00%        36       0 100.00%
+bio.c:bio_rx_template_array                11       0 100.00%        21       0 100.00%
+bio.c:bio_parse_template_array             26       1  96.15%        34       4  88.24%
+bio.c:decode_template_array                12       1  91.67%        23       3  86.96%
+bio.c:decode_template                       9       0 100.00%        18       0 100.00%
+bio.c:bio_set_template_name_wait           19       0 100.00%        24       0 100.00%
+bio.c:bio_enroll_begin_wait                17       0 100.00%        24       0 100.00%
+bio.c:bio_rx_enroll_begin                  15       0 100.00%        29       0 100.00%
+bio.c:bio_parse_enroll_status              20       0 100.00%        31       0 100.00%
+bio.c:bio_parse_template_id                 8       0 100.00%        12       0 100.00%
+bio.c:bio_enroll_continue_wait             19       0 100.00%        25       0 100.00%
+bio.c:bio_rx_enroll_continue               11       0 100.00%        22       0 100.00%
+bio.c:bio_enroll_cancel_wait               11      11   0.00%        12      12   0.00%
+bio.c:bio_enroll_remove_wait               17       0 100.00%        24       0 100.00%
+bio.c:bio_get_info_wait                    11       0 100.00%        11       0 100.00%
+bio.c:bio_rx_info                          11       0 100.00%        21       0 100.00%
+bio.c:bio_reset_info                        1       0 100.00%         4       0 100.00%
+bio.c:bio_parse_info                       20       0 100.00%        31       0 100.00%
+bio.c:bio_reset_template_array              4       0 100.00%         8       0 100.00%
+bio.c:bio_reset_template                    1       0 100.00%         6       0 100.00%
+bio.c:bio_reset_enroll                      3       0 100.00%         7       0 100.00%
+---------------------------------------------------------------------------------------
+TOTAL                                     418      20  95.22%       661      22  96.67%
+
+File '/libfido2/src/blob.c':
+Name                                  Regions    Miss   Cover     Lines    Miss   Cover
+---------------------------------------------------------------------------------------
+fido_blob_new                               1       0 100.00%         3       0 100.00%
+fido_blob_set                              11       0 100.00%        25       0 100.00%
+fido_blob_free                              8       0 100.00%        16       0 100.00%
+fido_free_blob_array                        9       0 100.00%        17       0 100.00%
+fido_blob_encode                            6       0 100.00%         6       0 100.00%
+fido_blob_decode                            1       0 100.00%         3       0 100.00%
+fido_blob_is_empty                          3       0 100.00%         3       0 100.00%
+---------------------------------------------------------------------------------------
+TOTAL                                      39       0 100.00%        73       0 100.00%
+
+File '/libfido2/src/buf.c':
+Name                                  Regions    Miss   Cover     Lines    Miss   Cover
+---------------------------------------------------------------------------------------
+fido_buf_read                               4       0 100.00%        10       0 100.00%
+fido_buf_write                              4       1  75.00%        10       1  90.00%
+---------------------------------------------------------------------------------------
+TOTAL                                       8       1  87.50%        20       1  95.00%
+
+File '/libfido2/src/cbor.c':
+Name                                  Regions    Miss   Cover     Lines    Miss   Cover
+---------------------------------------------------------------------------------------
+cbor_map_iter                              20       1  95.00%        30       4  86.67%
+cbor_array_iter                            12       0 100.00%        20       0 100.00%
+cbor_parse_reply                           27       0 100.00%        43       0 100.00%
+cbor_vector_free                            6       0 100.00%         5       0 100.00%
+cbor_bytestring_copy                       14       0 100.00%        22       0 100.00%
+cbor_string_copy                           14       0 100.00%        23       0 100.00%
+cbor_add_bytestring                        14       0 100.00%        26       0 100.00%
+cbor_add_string                            14       0 100.00%        26       0 100.00%
+cbor_add_bool                              14       0 100.00%        26       0 100.00%
+cbor_flatten_vector                        14       1  92.86%        21       1  95.24%
+cbor_build_frame                           15       0 100.00%        32       0 100.00%
+cbor_encode_rp_entity                      13       0 100.00%        14       0 100.00%
+cbor_encode_user_entity                    21       0 100.00%        18       0 100.00%
+cbor_encode_pubkey_param                   36       0 100.00%        48       0 100.00%
+cbor_encode_pubkey                         10       0 100.00%        13       0 100.00%
+cbor_encode_pubkey_list                    18       0 100.00%        23       0 100.00%
+cbor_encode_extensions                     28       0 100.00%        28       0 100.00%
+cbor_encode_options                        13       0 100.00%        14       0 100.00%
+cbor_encode_assert_options                 13       0 100.00%        14       0 100.00%
+cbor_encode_pin_auth                        8       0 100.00%        12       0 100.00%
+cbor_encode_pin_opt                         1       0 100.00%         3       0 100.00%
+cbor_encode_pin_enc                         4       0 100.00%        12       0 100.00%
+cbor_encode_change_pin_auth                39       0 100.00%        60       0 100.00%
+cbor_encode_set_pin_auth                   17       0 100.00%        28       0 100.00%
+cbor_encode_pin_hash_enc                   15       0 100.00%        27       0 100.00%
+cbor_encode_hmac_secret_param              41       1  97.56%        66       4  93.94%
+cbor_decode_fmt                             9       0 100.00%        18       0 100.00%
+cbor_decode_pubkey                         21       1  95.24%        32       2  93.75%
+cbor_decode_cred_authdata                  31       0 100.00%        47       0 100.00%
+cbor_decode_assert_authdata                23       0 100.00%        44       0 100.00%
+cbor_decode_attstmt                         8       0 100.00%        10       0 100.00%
+cbor_decode_uint64                          4       0 100.00%        10       0 100.00%
+cbor_decode_cred_id                         8       0 100.00%        10       0 100.00%
+cbor_decode_user                            8       0 100.00%        10       0 100.00%
+cbor_decode_rp_entity                       8       0 100.00%        10       0 100.00%
+cbor.c:ctap_check_cbor                     28       0 100.00%        32       0 100.00%
+cbor.c:check_key_type                       8       0 100.00%         9       0 100.00%
+cbor.c:cbor_add_arg                        13       0 100.00%        28       0 100.00%
+cbor.c:cbor_add_uint8                      14       0 100.00%        26       0 100.00%
+cbor.c:sha256                               7       0 100.00%        15       0 100.00%
+cbor.c:get_cose_alg                        36       0 100.00%        48       0 100.00%
+cbor.c:find_cose_alg                       35       0 100.00%        40       0 100.00%
+cbor.c:decode_attcred                      25       0 100.00%        58       0 100.00%
+cbor.c:decode_extensions                   14       0 100.00%        34       0 100.00%
+cbor.c:decode_extension                    27       2  92.59%        36       6  83.33%
+cbor.c:decode_hmac_secret                  16       0 100.00%        32       0 100.00%
+cbor.c:decode_hmac_secret_aux               7       0 100.00%        17       0 100.00%
+cbor.c:decode_attstmt_entry                38       0 100.00%        45       0 100.00%
+cbor.c:decode_x5c                           4       0 100.00%         8       0 100.00%
+cbor.c:decode_cred_id_entry                10       0 100.00%        23       0 100.00%
+cbor.c:decode_user_entry                   25       0 100.00%        39       0 100.00%
+cbor.c:decode_rp_entity_entry              15       0 100.00%        29       0 100.00%
+---------------------------------------------------------------------------------------
+TOTAL                                     883       6  99.32%      1364      17  98.75%
+
+File '/libfido2/src/cred.c':
+Name                                  Regions    Miss   Cover     Lines    Miss   Cover
+---------------------------------------------------------------------------------------
+fido_dev_make_cred                         12       0 100.00%        10       0 100.00%
+fido_check_rp_id                            4       0 100.00%        14       0 100.00%
+fido_cred_verify                           46       2  95.65%        71       3  95.77%
+fido_cred_verify_self                      54       4  92.59%        90       5  94.44%
+fido_cred_new                               1       0 100.00%         3       0 100.00%
+fido_cred_reset_tx                          1       0 100.00%        20       0 100.00%
+fido_cred_reset_rx                          1       0 100.00%         8       0 100.00%
+fido_cred_free                              6       1  83.33%        13       0 100.00%
+fido_cred_set_authdata                     22       0 100.00%        36       0 100.00%
+fido_cred_set_authdata_raw                 22       2  90.91%        35       4  88.57%
+fido_cred_set_x509                         12       0 100.00%        16       0 100.00%
+fido_cred_set_sig                          12       0 100.00%        16       0 100.00%
+fido_cred_exclude                          14       2  85.71%        25       3  88.00%
+fido_cred_set_clientdata_hash               6       0 100.00%         6       0 100.00%
+fido_cred_set_rp                           18       0 100.00%        26       0 100.00%
+fido_cred_set_user                         33       0 100.00%        50       0 100.00%
+fido_cred_set_extensions                   15       0 100.00%        12       0 100.00%
+fido_cred_set_options                       6       6   0.00%         6       6   0.00%
+fido_cred_set_rk                            2       0 100.00%         5       0 100.00%
+fido_cred_set_uv                            2       0 100.00%         5       0 100.00%
+fido_cred_set_prot                         21       0 100.00%        16       0 100.00%
+fido_cred_set_fmt                          16       4  75.00%        15       1  93.33%
+fido_cred_set_type                         17       0 100.00%         9       0 100.00%
+fido_cred_type                              1       0 100.00%         3       0 100.00%
+fido_cred_flags                             1       0 100.00%         3       0 100.00%
+fido_cred_clientdata_hash_ptr               1       0 100.00%         3       0 100.00%
+fido_cred_clientdata_hash_len               1       0 100.00%         3       0 100.00%
+fido_cred_x5c_ptr                           1       0 100.00%         3       0 100.00%
+fido_cred_x5c_len                           1       0 100.00%         3       0 100.00%
+fido_cred_sig_ptr                           1       0 100.00%         3       0 100.00%
+fido_cred_sig_len                           1       0 100.00%         3       0 100.00%
+fido_cred_authdata_ptr                      1       0 100.00%         3       0 100.00%
+fido_cred_authdata_len                      1       0 100.00%         3       0 100.00%
+fido_cred_pubkey_ptr                        9       0 100.00%        20       0 100.00%
+fido_cred_pubkey_len                        9       0 100.00%        20       0 100.00%
+fido_cred_id_ptr                            1       0 100.00%         3       0 100.00%
+fido_cred_id_len                            1       0 100.00%         3       0 100.00%
+fido_cred_aaguid_ptr                        1       0 100.00%         3       0 100.00%
+fido_cred_aaguid_len                        1       0 100.00%         3       0 100.00%
+fido_cred_prot                              1       0 100.00%         3       0 100.00%
+fido_cred_fmt                               1       0 100.00%         3       0 100.00%
+fido_cred_rp_id                             1       0 100.00%         3       0 100.00%
+fido_cred_rp_name                           1       0 100.00%         3       0 100.00%
+fido_cred_user_name                         1       0 100.00%         3       0 100.00%
+fido_cred_display_name                      1       0 100.00%         3       0 100.00%
+fido_cred_user_id_ptr                       1       0 100.00%         3       0 100.00%
+fido_cred_user_id_len                       1       0 100.00%         3       0 100.00%
+cred.c:fido_dev_make_cred_wait             10       0 100.00%         9       0 100.00%
+cred.c:fido_dev_make_cred_tx               59       0 100.00%        81       0 100.00%
+cred.c:fido_dev_make_cred_rx               21       0 100.00%        28       0 100.00%
+cred.c:parse_makecred_reply                10       0 100.00%        23       0 100.00%
+cred.c:check_extensions                     1       0 100.00%         3       0 100.00%
+cred.c:get_signed_hash_u2f                 22       0 100.00%        20       0 100.00%
+cred.c:verify_sig                          27       2  92.59%        40       7  82.50%
+cred.c:fido_cred_clean_authdata             1       0 100.00%         9       0 100.00%
+cred.c:fido_cred_clean_x509                 1       0 100.00%         5       0 100.00%
+cred.c:fido_cred_clean_sig                  1       0 100.00%         5       0 100.00%
+---------------------------------------------------------------------------------------
+TOTAL                                     536      23  95.71%       836      29  96.53%
+
+File '/libfido2/src/credman.c':
+Name                                  Regions    Miss   Cover     Lines    Miss   Cover
+---------------------------------------------------------------------------------------
+fido_credman_get_dev_metadata               9       2  77.78%         8       0 100.00%
+fido_credman_get_dev_rk                     9       2  77.78%         8       0 100.00%
+fido_credman_del_dev_rk                     9       2  77.78%         8       0 100.00%
+fido_credman_get_dev_rp                     9       2  77.78%         8       0 100.00%
+fido_credman_rk_new                         1       0 100.00%         3       0 100.00%
+fido_credman_rk_free                        6       1  83.33%        10       0 100.00%
+fido_credman_rk_count                       1       0 100.00%         3       0 100.00%
+fido_credman_rk                             4       0 100.00%         6       0 100.00%
+fido_credman_metadata_new                   1       0 100.00%         3       0 100.00%
+fido_credman_metadata_free                  6       1  83.33%         9       0 100.00%
+fido_credman_rk_existing                    1       0 100.00%         3       0 100.00%
+fido_credman_rk_remaining                   1       0 100.00%         3       0 100.00%
+fido_credman_rp_new                         1       0 100.00%         3       0 100.00%
+fido_credman_rp_free                        6       1  83.33%        10       0 100.00%
+fido_credman_rp_count                       1       0 100.00%         3       0 100.00%
+fido_credman_rp_id                          4       0 100.00%         6       0 100.00%
+fido_credman_rp_name                        4       0 100.00%         6       0 100.00%
+fido_credman_rp_id_hash_len                 4       0 100.00%         6       0 100.00%
+fido_credman_rp_id_hash_ptr                 4       0 100.00%         6       0 100.00%
+credman.c:credman_get_metadata_wait        11       0 100.00%         9       0 100.00%
+credman.c:credman_tx                       30       0 100.00%        53       0 100.00%
+credman.c:credman_prepare_hmac             21       1  95.24%        43       3  93.02%
+credman.c:credman_rx_metadata              11       0 100.00%        21       0 100.00%
+credman.c:credman_parse_metadata            9       0 100.00%        19       0 100.00%
+credman.c:credman_get_rk_wait              27       0 100.00%        26       0 100.00%
+credman.c:credman_rx_rk                    19       0 100.00%        36       0 100.00%
+credman.c:credman_parse_rk_count           16       0 100.00%        25       0 100.00%
+credman.c:credman_grow_array               17       2  88.24%        28       5  82.14%
+credman.c:credman_parse_rk                 22       0 100.00%        31       0 100.00%
+credman.c:credman_rx_next_rk               15       2  86.67%        26       4  84.62%
+credman.c:credman_del_rk_wait              16       0 100.00%        19       0 100.00%
+credman.c:credman_get_rp_wait              23       0 100.00%        16       0 100.00%
+credman.c:credman_rx_rp                    19       0 100.00%        36       0 100.00%
+credman.c:credman_parse_rp_count           16       0 100.00%        25       0 100.00%
+credman.c:credman_parse_rp                  9       0 100.00%        19       0 100.00%
+credman.c:credman_rx_next_rp               15       2  86.67%        26       4  84.62%
+credman.c:credman_reset_rk                  4       0 100.00%        10       0 100.00%
+credman.c:credman_reset_rp                  4       0 100.00%        15       0 100.00%
+---------------------------------------------------------------------------------------
+TOTAL                                     385      18  95.32%       595      16  97.31%
+
+File '/libfido2/src/dev.c':
+Name                                  Regions    Miss   Cover     Lines    Miss   Cover
+---------------------------------------------------------------------------------------
+fido_dev_register_manifest_func            10      10   0.00%        18      18   0.00%
+fido_dev_unregister_manifest_func           7       7   0.00%        13      13   0.00%
+fido_dev_info_manifest                     17      17   0.00%        24      24   0.00%
+fido_dev_open_with_info                     5       5   0.00%         6       6   0.00%
+fido_dev_open                               1       0 100.00%         3       0 100.00%
+fido_dev_close                              8       2  75.00%         9       0 100.00%
+fido_dev_cancel                            11       0 100.00%         9       0 100.00%
+fido_dev_get_touch_begin                   50       0 100.00%        68       0 100.00%
+fido_dev_get_touch_status                  17       0 100.00%        25       0 100.00%
+fido_dev_set_io_functions                  18       4  77.78%        17       6  64.71%
+fido_dev_set_transport_functions            6       6   0.00%        11      11   0.00%
+fido_init                                   7       1  85.71%         4       0 100.00%
+fido_dev_new                                5       0 100.00%        16       0 100.00%
+fido_dev_new_with_info                     17      17   0.00%        26      26   0.00%
+fido_dev_free                               6       0 100.00%        11       0 100.00%
+fido_dev_protocol                           1       0 100.00%         3       0 100.00%
+fido_dev_major                              1       0 100.00%         3       0 100.00%
+fido_dev_minor                              1       0 100.00%         3       0 100.00%
+fido_dev_build                              1       0 100.00%         3       0 100.00%
+fido_dev_flags                              1       0 100.00%         3       0 100.00%
+fido_dev_is_fido2                           2       0 100.00%         3       0 100.00%
+fido_dev_supports_pin                       3       0 100.00%         3       0 100.00%
+fido_dev_has_pin                            2       0 100.00%         3       0 100.00%
+fido_dev_supports_cred_prot                 2       0 100.00%         3       0 100.00%
+fido_dev_force_u2f                          2       0 100.00%         4       0 100.00%
+fido_dev_force_fido2                        2       2   0.00%         3       3   0.00%
+dev.c:find_manifest_func_node               5       5   0.00%         9       9   0.00%
+dev.c:fido_dev_open_wait                   10       0 100.00%         9       0 100.00%
+dev.c:fido_dev_open_tx                     51      13  74.51%        63      23  63.49%
+dev.c:obtain_nonce                          4       1  75.00%         5       1  80.00%
+dev.c:set_random_report_len                11       0 100.00%         6       0 100.00%
+dev.c:fido_dev_open_rx                     33       0 100.00%        56       0 100.00%
+dev.c:fido_dev_set_flags                   17       0 100.00%        24       0 100.00%
+---------------------------------------------------------------------------------------
+TOTAL                                     334      90  73.05%       466     140  69.96%
+
+File '/libfido2/src/ecdh.c':
+Name                                  Regions    Miss   Cover     Lines    Miss   Cover
+---------------------------------------------------------------------------------------
+fido_do_ecdh                               29       0 100.00%        44       0 100.00%
+ecdh.c:do_ecdh                             39       0 100.00%        60       0 100.00%
+---------------------------------------------------------------------------------------
+TOTAL                                      68       0 100.00%       104       0 100.00%
+
+File '/libfido2/src/eddsa.c':
+Name                                  Regions    Miss   Cover     Lines    Miss   Cover
+---------------------------------------------------------------------------------------
+eddsa_pk_decode                             8       0 100.00%        10       0 100.00%
+eddsa_pk_new                                1       0 100.00%         3       0 100.00%
+eddsa_pk_free                               6       0 100.00%        11       0 100.00%
+eddsa_pk_from_ptr                           6       0 100.00%         8       0 100.00%
+eddsa_pk_to_EVP_PKEY                        3       0 100.00%         9       0 100.00%
+eddsa_pk_from_EVP_PKEY                     14       0 100.00%        12       0 100.00%
+eddsa.c:decode_pubkey_point                 8       0 100.00%        14       0 100.00%
+eddsa.c:decode_coord                        8       0 100.00%        12       0 100.00%
+---------------------------------------------------------------------------------------
+TOTAL                                      54       0 100.00%        79       0 100.00%
+
+File '/libfido2/src/err.c':
+Name                                  Regions    Miss   Cover     Lines    Miss   Cover
+---------------------------------------------------------------------------------------
+fido_strerr                               112       8  92.86%       116       8  93.10%
+---------------------------------------------------------------------------------------
+TOTAL                                     112       8  92.86%       116       8  93.10%
+
+File '/libfido2/src/es256.c':
+Name                                  Regions    Miss   Cover     Lines    Miss   Cover
+---------------------------------------------------------------------------------------
+es256_pk_decode                             8       0 100.00%        10       0 100.00%
+es256_pk_encode                            56       0 100.00%        70       0 100.00%
+es256_sk_new                                1       0 100.00%         3       0 100.00%
+es256_sk_free                               6       0 100.00%        11       0 100.00%
+es256_pk_new                                1       0 100.00%         3       0 100.00%
+es256_pk_free                               6       0 100.00%        11       0 100.00%
+es256_pk_from_ptr                          11       0 100.00%        13       0 100.00%
+es256_pk_set_x                              1       0 100.00%         5       0 100.00%
+es256_pk_set_y                              1       0 100.00%         5       0 100.00%
+es256_sk_create                            39       0 100.00%        46       0 100.00%
+es256_pk_to_EVP_PKEY                       42       0 100.00%        66       0 100.00%
+es256_pk_from_EC_KEY                       38       0 100.00%        43       0 100.00%
+es256_sk_to_EVP_PKEY                       28       0 100.00%        50       0 100.00%
+es256_derive_pk                            25       0 100.00%        34       0 100.00%
+es256.c:decode_pubkey_point                 9       0 100.00%        16       0 100.00%
+es256.c:decode_coord                        8       0 100.00%        12       0 100.00%
+---------------------------------------------------------------------------------------
+TOTAL                                     280       0 100.00%       398       0 100.00%
+
+File '/libfido2/src/extern.h':
+Name                                  Regions    Miss   Cover     Lines    Miss   Cover
+---------------------------------------------------------------------------------------
+
+File '/libfido2/src/fido.h':
+Name                                  Regions    Miss   Cover     Lines    Miss   Cover
+---------------------------------------------------------------------------------------
+
+File '/libfido2/src/hid.c':
+Name                                  Regions    Miss   Cover     Lines    Miss   Cover
+---------------------------------------------------------------------------------------
+fido_dev_info_new                           1       1   0.00%         3       3   0.00%
+fido_dev_info_free                          9       9   0.00%        17      17   0.00%
+fido_dev_info_ptr                           1       1   0.00%         3       3   0.00%
+fido_dev_info_path                          1       1   0.00%         3       3   0.00%
+fido_dev_info_vendor                        1       1   0.00%         3       3   0.00%
+fido_dev_info_product                       1       1   0.00%         3       3   0.00%
+fido_dev_info_manufacturer_string           1       1   0.00%         3       3   0.00%
+fido_dev_info_product_string                1       1   0.00%         3       3   0.00%
+---------------------------------------------------------------------------------------
+TOTAL                                      16      16   0.00%        38      38   0.00%
+
+File '/libfido2/src/hid_linux.c':
+Name                                  Regions    Miss   Cover     Lines    Miss   Cover
+---------------------------------------------------------------------------------------
+fido_hid_manifest                          35      35   0.00%        50      50   0.00%
+fido_hid_open                              17      17   0.00%        22      22   0.00%
+fido_hid_close                              1       1   0.00%         6       6   0.00%
+fido_hid_read                              12      12   0.00%        21      21   0.00%
+fido_hid_write                              9       9   0.00%        16      16   0.00%
+fido_hid_report_in_len                      1       1   0.00%         5       5   0.00%
+fido_hid_report_out_len                     1       1   0.00%         5       5   0.00%
+hid_linux.c:copy_info                      30      30   0.00%        52      52   0.00%
+hid_linux.c:is_fido                         9       9   0.00%        23      23   0.00%
+hid_linux.c:get_usage_info                 16      16   0.00%        30      30   0.00%
+hid_linux.c:get_key_len                     6       6   0.00%        14      14   0.00%
+hid_linux.c:get_key_val                     6       6   0.00%        20      20   0.00%
+hid_linux.c:get_parent_attr                 6       6   0.00%        11      11   0.00%
+hid_linux.c:parse_uevent                   12      12   0.00%        28      28   0.00%
+hid_linux.c:get_usb_attr                    1       1   0.00%         3       3   0.00%
+hid_linux.c:get_report_descriptor          11      11   0.00%        18      18   0.00%
+hid_linux.c:get_report_sizes               19      19   0.00%        33      33   0.00%
+hid_linux.c:waitfd                         28      28   0.00%        43      43   0.00%
+hid_linux.c:timespec_to_ms                 15      15   0.00%        16      16   0.00%
+---------------------------------------------------------------------------------------
+TOTAL                                     235     235   0.00%       416     416   0.00%
+
+File '/libfido2/src/info.c':
+Name                                  Regions    Miss   Cover     Lines    Miss   Cover
+---------------------------------------------------------------------------------------
+fido_dev_get_cbor_info_wait                10       0 100.00%         9       0 100.00%
+fido_dev_get_cbor_info                      1       0 100.00%         3       0 100.00%
+fido_cbor_info_new                          1       0 100.00%         3       0 100.00%
+fido_cbor_info_free                         6       0 100.00%        14       0 100.00%
+fido_cbor_info_versions_ptr                 1       0 100.00%         3       0 100.00%
+fido_cbor_info_versions_len                 1       0 100.00%         3       0 100.00%
+fido_cbor_info_extensions_ptr               1       0 100.00%         3       0 100.00%
+fido_cbor_info_extensions_len               1       0 100.00%         3       0 100.00%
+fido_cbor_info_aaguid_ptr                   1       0 100.00%         3       0 100.00%
+fido_cbor_info_aaguid_len                   1       0 100.00%         3       0 100.00%
+fido_cbor_info_options_name_ptr             1       0 100.00%         3       0 100.00%
+fido_cbor_info_options_value_ptr            1       0 100.00%         3       0 100.00%
+fido_cbor_info_options_len                  1       0 100.00%         3       0 100.00%
+fido_cbor_info_maxmsgsiz                    1       0 100.00%         3       0 100.00%
+fido_cbor_info_maxcredcntlst                1       0 100.00%         3       0 100.00%
+fido_cbor_info_maxcredidlen                 1       0 100.00%         3       0 100.00%
+fido_cbor_info_fwversion                    1       0 100.00%         3       0 100.00%
+fido_cbor_info_protocols_ptr                1       0 100.00%         3       0 100.00%
+fido_cbor_info_protocols_len                1       0 100.00%         3       0 100.00%
+info.c:fido_dev_get_cbor_info_tx            8       0 100.00%        12       0 100.00%
+info.c:fido_dev_get_cbor_info_rx            6       0 100.00%        18       0 100.00%
+info.c:parse_reply_element                 16       0 100.00%        33       0 100.00%
+info.c:decode_versions                     12       0 100.00%        21       0 100.00%
+info.c:decode_version                       4       0 100.00%        14       0 100.00%
+info.c:decode_extensions                   12       0 100.00%        21       0 100.00%
+info.c:decode_extension                     4       0 100.00%        14       0 100.00%
+info.c:decode_aaguid                        8       0 100.00%        12       0 100.00%
+info.c:decode_options                      11       0 100.00%        18       0 100.00%
+info.c:decode_option                       11       0 100.00%        22       0 100.00%
+info.c:decode_protocols                    12       0 100.00%        21       0 100.00%
+info.c:decode_protocol                      6       0 100.00%        16       0 100.00%
+info.c:free_str_array                       4       0 100.00%         8       0 100.00%
+info.c:free_opt_array                       4       0 100.00%         9       0 100.00%
+info.c:free_byte_array                      1       0 100.00%         6       0 100.00%
+---------------------------------------------------------------------------------------
+TOTAL                                     152       0 100.00%       319       0 100.00%
+
+File '/libfido2/src/io.c':
+Name                                  Regions    Miss   Cover     Lines    Miss   Cover
+---------------------------------------------------------------------------------------
+fido_tx                                    13       1  92.31%        14       0 100.00%
+fido_rx                                    13       2  84.62%        19       3  84.21%
+fido_rx_cbor_status                         8       0 100.00%        12       0 100.00%
+io.c:tx_empty                               9       0 100.00%        17       0 100.00%
+io.c:tx                                    13       0 100.00%        21       0 100.00%
+io.c:tx_preamble                           16       1  93.75%        24       1  95.83%
+io.c:tx_frame                              15       1  93.33%        22       1  95.45%
+io.c:rx                                    40       2  95.00%        68       1  98.53%
+io.c:rx_preamble                           21       2  90.48%        28       5  82.14%
+io.c:rx_frame                               8       0 100.00%        11       0 100.00%
+---------------------------------------------------------------------------------------
+TOTAL                                     156       9  94.23%       236      11  95.34%
+
+File '/libfido2/src/iso7816.c':
+Name                                  Regions    Miss   Cover     Lines    Miss   Cover
+---------------------------------------------------------------------------------------
+iso7816_new                                 4       0 100.00%        19       0 100.00%
+iso7816_free                                6       0 100.00%        11       0 100.00%
+iso7816_add                                 6       1  83.33%        10       0 100.00%
+iso7816_ptr                                 1       0 100.00%         3       0 100.00%
+iso7816_len                                 1       0 100.00%         4       0 100.00%
+---------------------------------------------------------------------------------------
+TOTAL                                      18       1  94.44%        47       0 100.00%
+
+File '/libfido2/src/log.c':
+Name                                  Regions    Miss   Cover     Lines    Miss   Cover
+---------------------------------------------------------------------------------------
+fido_log_init                               1       0 100.00%         4       0 100.00%
+fido_log_debug                             11       1  90.91%        16       0 100.00%
+fido_log_xxd                               18       0 100.00%        23       0 100.00%
+fido_set_log_handler                        3       0 100.00%         4       0 100.00%
+log.c:log_on_stderr                         1       1   0.00%         3       3   0.00%
+---------------------------------------------------------------------------------------
+TOTAL                                      34       2  94.12%        50       3  94.00%
+
+File '/libfido2/src/pin.c':
+Name                                  Regions    Miss   Cover     Lines    Miss   Cover
+---------------------------------------------------------------------------------------
+fido_dev_get_pin_token                      1       0 100.00%         3       0 100.00%
+fido_dev_set_pin                            1       0 100.00%         3       0 100.00%
+fido_dev_get_retry_count                    1       0 100.00%         3       0 100.00%
+cbor_add_pin_params                        17       0 100.00%        27       0 100.00%
+pin.c:fido_dev_get_pin_token_wait          10       0 100.00%        10       0 100.00%
+pin.c:fido_dev_get_pin_token_tx            29       0 100.00%        40       0 100.00%
+pin.c:fido_dev_get_pin_token_rx            20       0 100.00%        36       0 100.00%
+pin.c:parse_pintoken                        8       0 100.00%        12       0 100.00%
+pin.c:fido_dev_set_pin_wait                16       0 100.00%        22       0 100.00%
+pin.c:fido_dev_change_pin_tx               41       0 100.00%        59       0 100.00%
+pin.c:pad64                                18       0 100.00%        24       0 100.00%
+pin.c:fido_dev_set_pin_tx                  33       0 100.00%        48       0 100.00%
+pin.c:fido_dev_get_retry_count_wait        10       0 100.00%         9       0 100.00%
+pin.c:fido_dev_get_retry_count_tx          19       0 100.00%        28       0 100.00%
+pin.c:fido_dev_get_retry_count_rx          11       0 100.00%        21       0 100.00%
+pin.c:parse_retry_count                    13       0 100.00%        20       0 100.00%
+---------------------------------------------------------------------------------------
+TOTAL                                     248       0 100.00%       365       0 100.00%
+
+File '/libfido2/src/reset.c':
+Name                                  Regions    Miss   Cover     Lines    Miss   Cover
+---------------------------------------------------------------------------------------
+fido_dev_reset                              1       0 100.00%         3       0 100.00%
+reset.c:fido_dev_reset_wait                10       0 100.00%         9       0 100.00%
+reset.c:fido_dev_reset_tx                   8       0 100.00%        10       0 100.00%
+---------------------------------------------------------------------------------------
+TOTAL                                      19       0 100.00%        22       0 100.00%
+
+File '/libfido2/src/rs256.c':
+Name                                  Regions    Miss   Cover     Lines    Miss   Cover
+---------------------------------------------------------------------------------------
+rs256_pk_decode                             8       0 100.00%        10       0 100.00%
+rs256_pk_new                                1       0 100.00%         3       0 100.00%
+rs256_pk_free                               6       0 100.00%        11       0 100.00%
+rs256_pk_from_ptr                           6       0 100.00%         8       0 100.00%
+rs256_pk_to_EVP_PKEY                       32       0 100.00%        48       0 100.00%
+rs256_pk_from_RSA                          32       4  87.50%        32       6  81.25%
+rs256.c:decode_rsa_pubkey                   9       1  88.89%        16       4  75.00%
+rs256.c:decode_bignum                       8       1  87.50%        12       3  75.00%
+---------------------------------------------------------------------------------------
+TOTAL                                     102       6  94.12%       140      13  90.71%
+
+File '/libfido2/src/u2f.c':
+Name                                  Regions    Miss   Cover     Lines    Miss   Cover
+---------------------------------------------------------------------------------------
+u2f_register                               70       1  98.57%        88       0 100.00%
+u2f_authenticate                           32       0 100.00%        44       0 100.00%
+u2f_get_touch_begin                        30       0 100.00%        46       0 100.00%
+u2f_get_touch_status                       18       0 100.00%        29       0 100.00%
+u2f.c:key_lookup                           44       0 100.00%        69       0 100.00%
+u2f.c:send_dummy_register                  31       1  96.77%        49       0 100.00%
+u2f.c:parse_register_reply                 57       0 100.00%        83       0 100.00%
+u2f.c:x5c_get                              21       1  95.24%        37       3  91.89%
+u2f.c:sig_get                               8       1  87.50%        16       6  62.50%
+u2f.c:encode_cred_authdata                 37       2  94.59%        82       6  92.68%
+u2f.c:cbor_blob_from_ec_point              22       0 100.00%        39       0 100.00%
+u2f.c:u2f_authenticate_single              36       0 100.00%        58       0 100.00%
+u2f.c:do_auth                              50       1  98.00%        71       0 100.00%
+u2f.c:parse_auth_reply                     23       2  91.30%        29       3  89.66%
+u2f.c:authdata_fake                        12       0 100.00%        34       0 100.00%
+---------------------------------------------------------------------------------------
+TOTAL                                     491       9  98.17%       774      18  97.67%
diff -Nru mysql-8.0-8.0.26/extra/libfido2/fuzz/fuzz_assert.c mysql-8.0-8.0.27/extra/libfido2/fuzz/fuzz_assert.c
--- mysql-8.0-8.0.26/extra/libfido2/fuzz/fuzz_assert.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/fuzz/fuzz_assert.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,484 @@
+/*
+ * Copyright (c) 2019 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <assert.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "mutator_aux.h"
+#include "wiredata_fido2.h"
+#include "wiredata_u2f.h"
+#include "dummy.h"
+
+#include "fido.h"
+#include "fido/es256.h"
+#include "fido/rs256.h"
+#include "fido/eddsa.h"
+
+#include "../openbsd-compat/openbsd-compat.h"
+
+/* Parameter set defining a FIDO2 get assertion operation. */
+struct param {
+	char pin[MAXSTR];
+	char rp_id[MAXSTR];
+	int ext;
+	int seed;
+	struct blob cdh;
+	struct blob cred;
+	struct blob es256;
+	struct blob rs256;
+	struct blob eddsa;
+	struct blob wire_data;
+	uint8_t cred_count;
+	uint8_t type;
+	uint8_t u2f;
+	uint8_t up;
+	uint8_t uv;
+};
+
+/*
+ * Collection of HID reports from an authenticator issued with a FIDO2
+ * get assertion using the example parameters above.
+ */
+static const uint8_t dummy_wire_data_fido[] = {
+	WIREDATA_CTAP_INIT,
+	WIREDATA_CTAP_CBOR_INFO,
+	WIREDATA_CTAP_CBOR_AUTHKEY,
+	WIREDATA_CTAP_CBOR_PINTOKEN,
+	WIREDATA_CTAP_CBOR_ASSERT,
+};
+
+/*
+ * Collection of HID reports from an authenticator issued with a U2F
+ * authentication using the example parameters above.
+ */
+static const uint8_t dummy_wire_data_u2f[] = {
+	WIREDATA_CTAP_INIT,
+	WIREDATA_CTAP_U2F_6985,
+	WIREDATA_CTAP_U2F_6985,
+	WIREDATA_CTAP_U2F_6985,
+	WIREDATA_CTAP_U2F_6985,
+	WIREDATA_CTAP_U2F_AUTH,
+};
+
+struct param *
+unpack(const uint8_t *ptr, size_t len)
+{
+	cbor_item_t *item = NULL, **v;
+	struct cbor_load_result cbor;
+	struct param *p;
+	int ok = -1;
+
+	if ((p = calloc(1, sizeof(*p))) == NULL ||
+	    (item = cbor_load(ptr, len, &cbor)) == NULL ||
+	    cbor.read != len ||
+	    cbor_isa_array(item) == false ||
+	    cbor_array_is_definite(item) == false ||
+	    cbor_array_size(item) != 15 ||
+	    (v = cbor_array_handle(item)) == NULL)
+		goto fail;
+
+	if (unpack_byte(v[0], &p->uv) < 0 ||
+	    unpack_byte(v[1], &p->up) < 0 ||
+	    unpack_byte(v[2], &p->u2f) < 0 ||
+	    unpack_byte(v[3], &p->type) < 0 ||
+	    unpack_byte(v[4], &p->cred_count) < 0 ||
+	    unpack_int(v[5], &p->ext) < 0 ||
+	    unpack_int(v[6], &p->seed) < 0 ||
+	    unpack_string(v[7], p->rp_id) < 0 ||
+	    unpack_string(v[8], p->pin) < 0 ||
+	    unpack_blob(v[9], &p->wire_data) < 0 ||
+	    unpack_blob(v[10], &p->rs256) < 0 ||
+	    unpack_blob(v[11], &p->es256) < 0 ||
+	    unpack_blob(v[12], &p->eddsa) < 0 ||
+	    unpack_blob(v[13], &p->cred) < 0 ||
+	    unpack_blob(v[14], &p->cdh) < 0)
+		goto fail;
+
+	ok = 0;
+fail:
+	if (ok < 0) {
+		free(p);
+		p = NULL;
+	}
+
+	if (item)
+		cbor_decref(&item);
+
+	return p;
+}
+
+size_t
+pack(uint8_t *ptr, size_t len, const struct param *p)
+{
+	cbor_item_t *argv[15], *array = NULL;
+	size_t cbor_alloc_len, cbor_len = 0;
+	unsigned char *cbor = NULL;
+
+	memset(argv, 0, sizeof(argv));
+
+	if ((array = cbor_new_definite_array(15)) == NULL ||
+	    (argv[0] = pack_byte(p->uv)) == NULL ||
+	    (argv[1] = pack_byte(p->up)) == NULL ||
+	    (argv[2] = pack_byte(p->u2f)) == NULL ||
+	    (argv[3] = pack_byte(p->type)) == NULL ||
+	    (argv[4] = pack_byte(p->cred_count)) == NULL ||
+	    (argv[5] = pack_int(p->ext)) == NULL ||
+	    (argv[6] = pack_int(p->seed)) == NULL ||
+	    (argv[7] = pack_string(p->rp_id)) == NULL ||
+	    (argv[8] = pack_string(p->pin)) == NULL ||
+	    (argv[9] = pack_blob(&p->wire_data)) == NULL ||
+	    (argv[10] = pack_blob(&p->rs256)) == NULL ||
+	    (argv[11] = pack_blob(&p->es256)) == NULL ||
+	    (argv[12] = pack_blob(&p->eddsa)) == NULL ||
+	    (argv[13] = pack_blob(&p->cred)) == NULL ||
+	    (argv[14] = pack_blob(&p->cdh)) == NULL)
+		goto fail;
+
+	for (size_t i = 0; i < 15; i++)
+		if (cbor_array_push(array, argv[i]) == false)
+			goto fail;
+
+	if ((cbor_len = cbor_serialize_alloc(array, &cbor,
+	    &cbor_alloc_len)) > len) {
+		cbor_len = 0;
+		goto fail;
+	}
+
+	memcpy(ptr, cbor, cbor_len);
+fail:
+	for (size_t i = 0; i < 15; i++)
+		if (argv[i])
+			cbor_decref(&argv[i]);
+
+	if (array)
+		cbor_decref(&array);
+
+	free(cbor);
+
+	return cbor_len;
+}
+
+size_t
+pack_dummy(uint8_t *ptr, size_t len)
+{
+	struct param dummy;
+	uint8_t blob[4096];
+	size_t blob_len;
+
+	memset(&dummy, 0, sizeof(dummy));
+
+	dummy.type = 1; /* rsa */
+	dummy.ext = FIDO_EXT_HMAC_SECRET;
+
+	strlcpy(dummy.pin, dummy_pin, sizeof(dummy.pin));
+	strlcpy(dummy.rp_id, dummy_rp_id, sizeof(dummy.rp_id));
+
+	dummy.cred.len = sizeof(dummy_cdh); /* XXX */
+	dummy.cdh.len = sizeof(dummy_cdh);
+	dummy.es256.len = sizeof(dummy_es256);
+	dummy.rs256.len = sizeof(dummy_rs256);
+	dummy.eddsa.len = sizeof(dummy_eddsa);
+	dummy.wire_data.len = sizeof(dummy_wire_data_fido);
+
+	memcpy(&dummy.cred.body, &dummy_cdh, dummy.cred.len); /* XXX */
+	memcpy(&dummy.cdh.body, &dummy_cdh, dummy.cdh.len);
+	memcpy(&dummy.wire_data.body, &dummy_wire_data_fido,
+	    dummy.wire_data.len);
+	memcpy(&dummy.es256.body, &dummy_es256, dummy.es256.len);
+	memcpy(&dummy.rs256.body, &dummy_rs256, dummy.rs256.len);
+	memcpy(&dummy.eddsa.body, &dummy_eddsa, dummy.eddsa.len);
+
+	assert((blob_len = pack(blob, sizeof(blob), &dummy)) != 0);
+
+	if (blob_len > len) {
+		memcpy(ptr, blob, len);
+		return len;
+	}
+
+	memcpy(ptr, blob, blob_len);
+
+	return blob_len;
+}
+
+static void
+get_assert(fido_assert_t *assert, uint8_t u2f, const struct blob *cdh,
+    const char *rp_id, int ext, uint8_t up, uint8_t uv, const char *pin,
+    uint8_t cred_count, const struct blob *cred)
+{
+	fido_dev_t *dev;
+	fido_dev_io_t io;
+
+	memset(&io, 0, sizeof(io));
+
+	io.open = dev_open;
+	io.close = dev_close;
+	io.read = dev_read;
+	io.write = dev_write;
+
+	if ((dev = fido_dev_new()) == NULL || fido_dev_set_io_functions(dev,
+	    &io) != FIDO_OK || fido_dev_open(dev, "nodev") != FIDO_OK) {
+		fido_dev_free(&dev);
+		return;
+	}
+
+	if (u2f & 1)
+		fido_dev_force_u2f(dev);
+	if (ext & 1)
+		fido_assert_set_extensions(assert, FIDO_EXT_HMAC_SECRET);
+	if (up & 1)
+		fido_assert_set_up(assert, FIDO_OPT_TRUE);
+	else if (u2f &1)
+		fido_assert_set_up(assert, FIDO_OPT_FALSE);
+	if (uv & 1)
+		fido_assert_set_uv(assert, FIDO_OPT_TRUE);
+
+	for (uint8_t i = 0; i < cred_count; i++)
+		fido_assert_allow_cred(assert, cred->body, cred->len);
+
+	fido_assert_set_clientdata_hash(assert, cdh->body, cdh->len);
+	fido_assert_set_rp(assert, rp_id);
+	/* XXX reuse cred as hmac salt */
+	fido_assert_set_hmac_salt(assert, cred->body, cred->len);
+
+	/* repeat memory operations to trigger reallocation paths */
+	fido_assert_set_clientdata_hash(assert, cdh->body, cdh->len);
+	fido_assert_set_rp(assert, rp_id);
+	fido_assert_set_hmac_salt(assert, cred->body, cred->len);
+
+	if (strlen(pin) == 0)
+		pin = NULL;
+
+	fido_dev_get_assert(dev, assert, u2f & 1 ? NULL : pin);
+
+	fido_dev_cancel(dev);
+	fido_dev_close(dev);
+	fido_dev_free(&dev);
+}
+
+static void
+verify_assert(int type, const unsigned char *cdh_ptr, size_t cdh_len,
+    const char *rp_id, const unsigned char *authdata_ptr, size_t authdata_len,
+    const unsigned char *sig_ptr, size_t sig_len, uint8_t up, uint8_t uv,
+    int ext, void *pk)
+{
+	fido_assert_t *assert = NULL;
+
+	if ((assert = fido_assert_new()) == NULL)
+		return;
+
+	fido_assert_set_clientdata_hash(assert, cdh_ptr, cdh_len);
+	fido_assert_set_rp(assert, rp_id);
+	fido_assert_set_count(assert, 1);
+
+	if (fido_assert_set_authdata(assert, 0, authdata_ptr,
+	    authdata_len) != FIDO_OK) {
+		fido_assert_set_authdata_raw(assert, 0, authdata_ptr,
+		    authdata_len);
+	}
+
+	if (up & 1)
+		fido_assert_set_up(assert, FIDO_OPT_TRUE);
+	if (uv & 1)
+		fido_assert_set_uv(assert, FIDO_OPT_TRUE);
+
+	fido_assert_set_extensions(assert, ext);
+	fido_assert_set_sig(assert, 0, sig_ptr, sig_len);
+
+	/* repeat memory operations to trigger reallocation paths */
+	if (fido_assert_set_authdata(assert, 0, authdata_ptr,
+	    authdata_len) != FIDO_OK) {
+		fido_assert_set_authdata_raw(assert, 0, authdata_ptr,
+		    authdata_len);
+	}
+	fido_assert_set_sig(assert, 0, sig_ptr, sig_len);
+
+	assert(fido_assert_verify(assert, 0, type, pk) != FIDO_OK);
+
+	fido_assert_free(&assert);
+}
+
+/*
+ * Do a dummy conversion to exercise rs256_pk_from_RSA().
+ */
+static void
+rs256_convert(const rs256_pk_t *k)
+{
+	EVP_PKEY *pkey = NULL;
+	rs256_pk_t *pk = NULL;
+	RSA *rsa = NULL;
+	volatile int r;
+
+	if ((pkey = rs256_pk_to_EVP_PKEY(k)) == NULL ||
+	    (pk = rs256_pk_new()) == NULL ||
+	    (rsa = EVP_PKEY_get0_RSA(pkey)) == NULL)
+		goto out;
+
+	r = rs256_pk_from_RSA(pk, rsa);
+out:
+	if (pk)
+		rs256_pk_free(&pk);
+	if (pkey)
+		EVP_PKEY_free(pkey);
+}
+
+/*
+ * Do a dummy conversion to exercise eddsa_pk_from_EVP_PKEY().
+ */
+static void
+eddsa_convert(const eddsa_pk_t *k)
+{
+	EVP_PKEY *pkey = NULL;
+	eddsa_pk_t *pk = NULL;
+	volatile int r;
+
+	if ((pkey = eddsa_pk_to_EVP_PKEY(k)) == NULL ||
+	    (pk = eddsa_pk_new()) == NULL)
+		goto out;
+
+	r = eddsa_pk_from_EVP_PKEY(pk, pkey);
+out:
+	if (pk)
+		eddsa_pk_free(&pk);
+	if (pkey)
+		EVP_PKEY_free(pkey);
+}
+
+void
+test(const struct param *p)
+{
+	fido_assert_t *assert = NULL;
+	es256_pk_t *es256_pk = NULL;
+	rs256_pk_t *rs256_pk = NULL;
+	eddsa_pk_t *eddsa_pk = NULL;
+	uint8_t flags;
+	uint32_t sigcount;
+	int cose_alg = 0;
+	void *pk;
+
+	prng_init((unsigned int)p->seed);
+	fido_init(FIDO_DEBUG);
+	fido_set_log_handler(consume_str);
+
+	switch (p->type & 3) {
+	case 0:
+		cose_alg = COSE_ES256;
+
+		if ((es256_pk = es256_pk_new()) == NULL)
+			return;
+
+		es256_pk_from_ptr(es256_pk, p->es256.body, p->es256.len);
+		pk = es256_pk;
+
+		break;
+	case 1:
+		cose_alg = COSE_RS256;
+
+		if ((rs256_pk = rs256_pk_new()) == NULL)
+			return;
+
+		rs256_pk_from_ptr(rs256_pk, p->rs256.body, p->rs256.len);
+		pk = rs256_pk;
+
+		rs256_convert(pk);
+
+		break;
+	default:
+		cose_alg = COSE_EDDSA;
+
+		if ((eddsa_pk = eddsa_pk_new()) == NULL)
+			return;
+
+		eddsa_pk_from_ptr(eddsa_pk, p->eddsa.body, p->eddsa.len);
+		pk = eddsa_pk;
+
+		eddsa_convert(pk);
+
+		break;
+	}
+
+	if ((assert = fido_assert_new()) == NULL)
+		goto out;
+
+	set_wire_data(p->wire_data.body, p->wire_data.len);
+
+	get_assert(assert, p->u2f, &p->cdh, p->rp_id, p->ext, p->up, p->uv,
+	    p->pin, p->cred_count, &p->cred);
+
+	/* XXX +1 on purpose */
+	for (size_t i = 0; i <= fido_assert_count(assert); i++) {
+		verify_assert(cose_alg,
+		    fido_assert_clientdata_hash_ptr(assert),
+		    fido_assert_clientdata_hash_len(assert),
+		    fido_assert_rp_id(assert),
+		    fido_assert_authdata_ptr(assert, i),
+		    fido_assert_authdata_len(assert, i),
+		    fido_assert_sig_ptr(assert, i),
+		    fido_assert_sig_len(assert, i), p->up, p->uv, p->ext, pk);
+		consume(fido_assert_id_ptr(assert, i),
+		    fido_assert_id_len(assert, i));
+		consume(fido_assert_user_id_ptr(assert, i),
+		    fido_assert_user_id_len(assert, i));
+		consume(fido_assert_hmac_secret_ptr(assert, i),
+		    fido_assert_hmac_secret_len(assert, i));
+		consume(fido_assert_user_icon(assert, i),
+		    xstrlen(fido_assert_user_icon(assert, i)));
+		consume(fido_assert_user_name(assert, i),
+		    xstrlen(fido_assert_user_name(assert, i)));
+		consume(fido_assert_user_display_name(assert, i),
+		    xstrlen(fido_assert_user_display_name(assert, i)));
+		flags = fido_assert_flags(assert, i);
+		consume(&flags, sizeof(flags));
+		sigcount = fido_assert_sigcount(assert, i);
+		consume(&sigcount, sizeof(sigcount));
+	}
+
+out:
+	es256_pk_free(&es256_pk);
+	rs256_pk_free(&rs256_pk);
+	eddsa_pk_free(&eddsa_pk);
+
+	fido_assert_free(&assert);
+}
+
+void
+mutate(struct param *p, unsigned int seed, unsigned int flags) NO_MSAN
+{
+	if (flags & MUTATE_SEED)
+		p->seed = (int)seed;
+
+	if (flags & MUTATE_PARAM) {
+		mutate_byte(&p->uv);
+		mutate_byte(&p->up);
+		mutate_byte(&p->u2f);
+		mutate_byte(&p->type);
+		mutate_byte(&p->cred_count);
+		mutate_int(&p->ext);
+		mutate_blob(&p->rs256);
+		mutate_blob(&p->es256);
+		mutate_blob(&p->eddsa);
+		mutate_blob(&p->cred);
+		mutate_blob(&p->cdh);
+		mutate_string(p->rp_id);
+		mutate_string(p->pin);
+	}
+
+	if (flags & MUTATE_WIREDATA) {
+		if (p->u2f & 1) {
+			p->wire_data.len = sizeof(dummy_wire_data_u2f);
+			memcpy(&p->wire_data.body, &dummy_wire_data_u2f,
+			    p->wire_data.len);
+		} else {
+			p->wire_data.len = sizeof(dummy_wire_data_fido);
+			memcpy(&p->wire_data.body, &dummy_wire_data_fido,
+			    p->wire_data.len);
+		}
+		mutate_blob(&p->wire_data);
+	}
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/fuzz/fuzz_bio.c mysql-8.0-8.0.27/extra/libfido2/fuzz/fuzz_bio.c
--- mysql-8.0-8.0.26/extra/libfido2/fuzz/fuzz_bio.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/fuzz/fuzz_bio.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,450 @@
+/*
+ * Copyright (c) 2019 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <assert.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "mutator_aux.h"
+#include "wiredata_fido2.h"
+#include "dummy.h"
+
+#include "fido.h"
+#include "fido/bio.h"
+
+#include "../openbsd-compat/openbsd-compat.h"
+
+/* Parameter set defining a FIDO2 credential management operation. */
+struct param {
+	char pin[MAXSTR];
+	char name[MAXSTR];
+	int seed;
+	struct blob id;
+	struct blob info_wire_data;
+	struct blob enroll_wire_data;
+	struct blob list_wire_data;
+	struct blob set_name_wire_data;
+	struct blob remove_wire_data;
+};
+
+/*
+ * Collection of HID reports from an authenticator issued with a FIDO2
+ * 'getFingerprintSensorInfo' bio enrollment command.
+ */
+static const uint8_t dummy_info_wire_data[] = {
+	WIREDATA_CTAP_INIT,
+	WIREDATA_CTAP_CBOR_INFO,
+	WIREDATA_CTAP_CBOR_BIO_INFO,
+};
+
+/*
+ * Collection of HID reports from an authenticator issued with FIDO2
+ * 'enrollBegin' + 'enrollCaptureNextSample' bio enrollment commands.
+ */
+static const uint8_t dummy_enroll_wire_data[] = {
+	WIREDATA_CTAP_INIT,
+	WIREDATA_CTAP_CBOR_INFO,
+	WIREDATA_CTAP_CBOR_AUTHKEY,
+	WIREDATA_CTAP_CBOR_PINTOKEN,
+	WIREDATA_CTAP_CBOR_BIO_ENROLL,
+};
+
+/*
+ * Collection of HID reports from an authenticator issued with a FIDO2
+ * 'enumerateEnrollments' bio enrollment command.
+ */
+static const uint8_t dummy_list_wire_data[] = {
+	WIREDATA_CTAP_INIT,
+	WIREDATA_CTAP_CBOR_INFO,
+	WIREDATA_CTAP_CBOR_AUTHKEY,
+	WIREDATA_CTAP_CBOR_PINTOKEN,
+	WIREDATA_CTAP_CBOR_BIO_ENUM,
+};
+
+/*
+ * Collection of HID reports from an authenticator issued with a FIDO2
+ * 'setFriendlyName' bio enrollment command.
+ */
+static const uint8_t dummy_set_name_wire_data[] = {
+	WIREDATA_CTAP_INIT,
+	WIREDATA_CTAP_CBOR_INFO,
+	WIREDATA_CTAP_CBOR_AUTHKEY,
+	WIREDATA_CTAP_CBOR_PINTOKEN,
+	WIREDATA_CTAP_CBOR_STATUS,
+};
+
+/*
+ * Collection of HID reports from an authenticator issued with a FIDO2
+ * 'removeEnrollment' bio enrollment command.
+ */
+static const uint8_t dummy_remove_wire_data[] = {
+	WIREDATA_CTAP_INIT,
+	WIREDATA_CTAP_CBOR_INFO,
+	WIREDATA_CTAP_CBOR_AUTHKEY,
+	WIREDATA_CTAP_CBOR_PINTOKEN,
+	WIREDATA_CTAP_CBOR_STATUS,
+};
+
+struct param *
+unpack(const uint8_t *ptr, size_t len)
+{
+	cbor_item_t *item = NULL, **v;
+	struct cbor_load_result cbor;
+	struct param *p;
+	int ok = -1;
+
+	if ((p = calloc(1, sizeof(*p))) == NULL ||
+	    (item = cbor_load(ptr, len, &cbor)) == NULL ||
+	    cbor.read != len ||
+	    cbor_isa_array(item) == false ||
+	    cbor_array_is_definite(item) == false ||
+	    cbor_array_size(item) != 9 ||
+	    (v = cbor_array_handle(item)) == NULL)
+		goto fail;
+
+	if (unpack_int(v[0], &p->seed) < 0 ||
+	    unpack_string(v[1], p->pin) < 0 ||
+	    unpack_string(v[2], p->name) < 0 ||
+	    unpack_blob(v[3], &p->id) < 0 ||
+	    unpack_blob(v[4], &p->info_wire_data) < 0 ||
+	    unpack_blob(v[5], &p->enroll_wire_data) < 0 ||
+	    unpack_blob(v[6], &p->list_wire_data) < 0 ||
+	    unpack_blob(v[7], &p->set_name_wire_data) < 0 ||
+	    unpack_blob(v[8], &p->remove_wire_data) < 0)
+		goto fail;
+
+	ok = 0;
+fail:
+	if (ok < 0) {
+		free(p);
+		p = NULL;
+	}
+
+	if (item)
+		cbor_decref(&item);
+
+	return p;
+}
+
+size_t
+pack(uint8_t *ptr, size_t len, const struct param *p)
+{
+	cbor_item_t *argv[9], *array = NULL;
+	size_t cbor_alloc_len, cbor_len = 0;
+	unsigned char *cbor = NULL;
+
+	memset(argv, 0, sizeof(argv));
+
+	if ((array = cbor_new_definite_array(9)) == NULL ||
+	    (argv[0] = pack_int(p->seed)) == NULL ||
+	    (argv[1] = pack_string(p->pin)) == NULL ||
+	    (argv[2] = pack_string(p->name)) == NULL ||
+	    (argv[3] = pack_blob(&p->id)) == NULL ||
+	    (argv[4] = pack_blob(&p->info_wire_data)) == NULL ||
+	    (argv[5] = pack_blob(&p->enroll_wire_data)) == NULL ||
+	    (argv[6] = pack_blob(&p->list_wire_data)) == NULL ||
+	    (argv[7] = pack_blob(&p->set_name_wire_data)) == NULL ||
+	    (argv[8] = pack_blob(&p->remove_wire_data)) == NULL)
+		goto fail;
+
+	for (size_t i = 0; i < 9; i++)
+		if (cbor_array_push(array, argv[i]) == false)
+			goto fail;
+
+	if ((cbor_len = cbor_serialize_alloc(array, &cbor,
+	    &cbor_alloc_len)) > len) {
+		cbor_len = 0;
+		goto fail;
+	}
+
+	memcpy(ptr, cbor, cbor_len);
+fail:
+	for (size_t i = 0; i < 9; i++)
+		if (argv[i])
+			cbor_decref(&argv[i]);
+
+	if (array)
+		cbor_decref(&array);
+
+	free(cbor);
+
+	return cbor_len;
+}
+
+size_t
+pack_dummy(uint8_t *ptr, size_t len)
+{
+	struct param dummy;
+	uint8_t	blob[4096];
+	size_t blob_len;
+
+	memset(&dummy, 0, sizeof(dummy));
+
+	strlcpy(dummy.pin, dummy_pin, sizeof(dummy.pin));
+	strlcpy(dummy.name, dummy_name, sizeof(dummy.name));
+
+	dummy.info_wire_data.len = sizeof(dummy_info_wire_data);
+	dummy.enroll_wire_data.len = sizeof(dummy_enroll_wire_data);
+	dummy.list_wire_data.len = sizeof(dummy_list_wire_data);
+	dummy.set_name_wire_data.len = sizeof(dummy_set_name_wire_data);
+	dummy.remove_wire_data.len = sizeof(dummy_remove_wire_data);
+	dummy.id.len = sizeof(dummy_id);
+
+	memcpy(&dummy.info_wire_data.body, &dummy_info_wire_data,
+	    dummy.info_wire_data.len);
+	memcpy(&dummy.enroll_wire_data.body, &dummy_enroll_wire_data,
+	    dummy.enroll_wire_data.len);
+	memcpy(&dummy.list_wire_data.body, &dummy_list_wire_data,
+	    dummy.list_wire_data.len);
+	memcpy(&dummy.set_name_wire_data.body, &dummy_set_name_wire_data,
+	    dummy.set_name_wire_data.len);
+	memcpy(&dummy.remove_wire_data.body, &dummy_remove_wire_data,
+	    dummy.remove_wire_data.len);
+	memcpy(&dummy.id.body, &dummy_id, dummy.id.len);
+
+	assert((blob_len = pack(blob, sizeof(blob), &dummy)) != 0);
+
+	if (blob_len > len) {
+		memcpy(ptr, blob, len);
+		return len;
+	}
+
+	memcpy(ptr, blob, blob_len);
+
+	return blob_len;
+}
+
+static fido_dev_t *
+prepare_dev(void)
+{
+	fido_dev_t *dev;
+	fido_dev_io_t io;
+	bool x;
+
+	memset(&io, 0, sizeof(io));
+
+	io.open = dev_open;
+	io.close = dev_close;
+	io.read = dev_read;
+	io.write = dev_write;
+
+	if ((dev = fido_dev_new()) == NULL || fido_dev_set_io_functions(dev,
+	    &io) != FIDO_OK || fido_dev_open(dev, "nodev") != FIDO_OK) {
+		fido_dev_free(&dev);
+		return NULL;
+	}
+
+	x = fido_dev_is_fido2(dev);
+	consume(&x, sizeof(x));
+	x = fido_dev_supports_pin(dev);
+	consume(&x, sizeof(x));
+	x = fido_dev_has_pin(dev);
+	consume(&x, sizeof(x));
+
+	return dev;
+}
+
+static void
+get_info(const struct param *p)
+{
+	fido_dev_t *dev = NULL;
+	fido_bio_info_t *i = NULL;
+	uint8_t type;
+	uint8_t max_samples;
+	int r;
+
+	set_wire_data(p->info_wire_data.body, p->info_wire_data.len);
+
+	if ((dev = prepare_dev()) == NULL || (i = fido_bio_info_new()) == NULL)
+		goto done;
+
+	r = fido_bio_dev_get_info(dev, i);
+	consume_str(fido_strerr(r));
+
+	type = fido_bio_info_type(i);
+	max_samples = fido_bio_info_max_samples(i);
+	consume(&type, sizeof(type));
+	consume(&max_samples, sizeof(max_samples));
+
+done:
+	if (dev)
+		fido_dev_close(dev);
+
+	fido_dev_free(&dev);
+	fido_bio_info_free(&i);
+}
+
+static void
+consume_template(const fido_bio_template_t *t)
+{
+	consume(fido_bio_template_name(t), xstrlen(fido_bio_template_name(t)));
+	consume(fido_bio_template_id_ptr(t), fido_bio_template_id_len(t));
+}
+
+static void
+consume_enroll(fido_bio_enroll_t *e)
+{
+	uint8_t last_status;
+	uint8_t remaining_samples;
+
+	last_status = fido_bio_enroll_last_status(e);
+	remaining_samples = fido_bio_enroll_remaining_samples(e);
+	consume(&last_status, sizeof(last_status));
+	consume(&remaining_samples, sizeof(remaining_samples));
+}
+
+static void
+enroll(const struct param *p)
+{
+	fido_dev_t *dev = NULL;
+	fido_bio_template_t *t = NULL;
+	fido_bio_enroll_t *e = NULL;
+	size_t cnt = 0;
+
+	set_wire_data(p->enroll_wire_data.body, p->enroll_wire_data.len);
+
+	if ((dev = prepare_dev()) == NULL ||
+	    (t = fido_bio_template_new()) == NULL ||
+	    (e = fido_bio_enroll_new()) == NULL)
+		goto done;
+
+	fido_bio_dev_enroll_begin(dev, t, e, p->seed, p->pin);
+
+	consume_template(t);
+	consume_enroll(e);
+
+	while (fido_bio_enroll_remaining_samples(e) > 0 && cnt++ < 5) {
+		fido_bio_dev_enroll_continue(dev, t, e, p->seed);
+		consume_template(t);
+		consume_enroll(e);
+	}
+
+done:
+	if (dev)
+		fido_dev_close(dev);
+
+	fido_dev_free(&dev);
+	fido_bio_template_free(&t);
+	fido_bio_enroll_free(&e);
+}
+
+static void
+list(const struct param *p)
+{
+	fido_dev_t *dev = NULL;
+	fido_bio_template_array_t *ta = NULL;
+	const fido_bio_template_t *t = NULL;
+
+	set_wire_data(p->list_wire_data.body, p->list_wire_data.len);
+
+	if ((dev = prepare_dev()) == NULL ||
+	    (ta = fido_bio_template_array_new()) == NULL)
+		goto done;
+
+	fido_bio_dev_get_template_array(dev, ta, p->pin);
+
+	/* +1 on purpose */
+	for (size_t i = 0; i < fido_bio_template_array_count(ta) + 1; i++)
+		if ((t = fido_bio_template(ta, i)) != NULL)
+			consume_template(t);
+
+done:
+	if (dev)
+		fido_dev_close(dev);
+
+	fido_dev_free(&dev);
+	fido_bio_template_array_free(&ta);
+}
+
+static void
+set_name(const struct param *p)
+{
+	fido_dev_t *dev = NULL;
+	fido_bio_template_t *t = NULL;
+
+	set_wire_data(p->set_name_wire_data.body, p->set_name_wire_data.len);
+
+	if ((dev = prepare_dev()) == NULL ||
+	    (t = fido_bio_template_new()) == NULL)
+		goto done;
+
+	fido_bio_template_set_name(t, p->name);
+	fido_bio_template_set_id(t, p->id.body, p->id.len);
+	consume_template(t);
+
+	fido_bio_dev_set_template_name(dev, t, p->pin);
+
+done:
+	if (dev)
+		fido_dev_close(dev);
+
+	fido_dev_free(&dev);
+	fido_bio_template_free(&t);
+}
+
+static void
+del(const struct param *p)
+{
+	fido_dev_t *dev = NULL;
+	fido_bio_template_t *t = NULL;
+	int r;
+
+	set_wire_data(p->remove_wire_data.body, p->remove_wire_data.len);
+
+	if ((dev = prepare_dev()) == NULL ||
+	    (t = fido_bio_template_new()) == NULL)
+		goto done;
+
+	r = fido_bio_template_set_id(t, p->id.body, p->id.len);
+	consume_template(t);
+	consume_str(fido_strerr(r));
+
+	fido_bio_dev_enroll_remove(dev, t, p->pin);
+
+done:
+	if (dev)
+		fido_dev_close(dev);
+
+	fido_dev_free(&dev);
+	fido_bio_template_free(&t);
+}
+
+void
+test(const struct param *p)
+{
+	prng_init((unsigned int)p->seed);
+	fido_init(FIDO_DEBUG);
+	fido_set_log_handler(consume_str);
+
+	get_info(p);
+	enroll(p);
+	list(p);
+	set_name(p);
+	del(p);
+}
+
+void
+mutate(struct param *p, unsigned int seed, unsigned int flags) NO_MSAN
+{
+	if (flags & MUTATE_SEED)
+		p->seed = (int)seed;
+
+	if (flags & MUTATE_PARAM) {
+		mutate_blob(&p->id);
+		mutate_string(p->pin);
+		mutate_string(p->name);
+	}
+
+	if (flags & MUTATE_WIREDATA) {
+		mutate_blob(&p->info_wire_data);
+		mutate_blob(&p->enroll_wire_data);
+		mutate_blob(&p->list_wire_data);
+		mutate_blob(&p->set_name_wire_data);
+		mutate_blob(&p->remove_wire_data);
+	}
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/fuzz/fuzz_cred.c mysql-8.0-8.0.27/extra/libfido2/fuzz/fuzz_cred.c
--- mysql-8.0-8.0.26/extra/libfido2/fuzz/fuzz_cred.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/fuzz/fuzz_cred.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,451 @@
+/*
+ * Copyright (c) 2019 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <assert.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "mutator_aux.h"
+#include "wiredata_fido2.h"
+#include "wiredata_u2f.h"
+#include "dummy.h"
+#include "fido.h"
+
+#include "../openbsd-compat/openbsd-compat.h"
+
+/* Parameter set defining a FIDO2 make credential operation. */
+struct param {
+	char pin[MAXSTR];
+	char rp_id[MAXSTR];
+	char rp_name[MAXSTR];
+	char user_icon[MAXSTR];
+	char user_name[MAXSTR];
+	char user_nick[MAXSTR];
+	int ext;
+	int seed;
+	struct blob cdh;
+	struct blob excl_cred;
+	struct blob user_id;
+	struct blob wire_data;
+	uint8_t excl_count;
+	uint8_t rk;
+	uint8_t type;
+	uint8_t u2f;
+	uint8_t uv;
+};
+
+/*
+ * Collection of HID reports from an authenticator issued with a FIDO2
+ * make credential using the example parameters above.
+ */
+static const uint8_t dummy_wire_data_fido[] = {
+	WIREDATA_CTAP_INIT,
+	WIREDATA_CTAP_CBOR_INFO,
+	WIREDATA_CTAP_CBOR_AUTHKEY,
+	WIREDATA_CTAP_CBOR_PINTOKEN,
+	WIREDATA_CTAP_KEEPALIVE,
+	WIREDATA_CTAP_KEEPALIVE,
+	WIREDATA_CTAP_KEEPALIVE,
+	WIREDATA_CTAP_CBOR_CRED,
+};
+
+/*
+ * Collection of HID reports from an authenticator issued with a U2F
+ * registration using the example parameters above.
+ */
+static const uint8_t dummy_wire_data_u2f[] = {
+	WIREDATA_CTAP_INIT,
+	WIREDATA_CTAP_U2F_6985,
+	WIREDATA_CTAP_U2F_6985,
+	WIREDATA_CTAP_U2F_6985,
+	WIREDATA_CTAP_U2F_6985,
+	WIREDATA_CTAP_U2F_6985,
+	WIREDATA_CTAP_U2F_REGISTER,
+};
+
+struct param *
+unpack(const uint8_t *ptr, size_t len)
+{
+	cbor_item_t *item = NULL, **v;
+	struct cbor_load_result cbor;
+	struct param *p;
+	int ok = -1;
+
+	if ((p = calloc(1, sizeof(*p))) == NULL ||
+	    (item = cbor_load(ptr, len, &cbor)) == NULL ||
+	    cbor.read != len ||
+	    cbor_isa_array(item) == false ||
+	    cbor_array_is_definite(item) == false ||
+	    cbor_array_size(item) != 17 ||
+	    (v = cbor_array_handle(item)) == NULL)
+		goto fail;
+
+	if (unpack_byte(v[0], &p->rk) < 0 ||
+	    unpack_byte(v[1], &p->type) < 0 ||
+	    unpack_byte(v[2], &p->u2f) < 0 ||
+	    unpack_byte(v[3], &p->uv) < 0 ||
+	    unpack_byte(v[4], &p->excl_count) < 0 ||
+	    unpack_int(v[5], &p->ext) < 0 ||
+	    unpack_int(v[6], &p->seed) < 0 ||
+	    unpack_string(v[7], p->pin) < 0 ||
+	    unpack_string(v[8], p->rp_id) < 0 ||
+	    unpack_string(v[9], p->rp_name) < 0 ||
+	    unpack_string(v[10], p->user_icon) < 0 ||
+	    unpack_string(v[11], p->user_name) < 0 ||
+	    unpack_string(v[12], p->user_nick) < 0 ||
+	    unpack_blob(v[13], &p->cdh) < 0 ||
+	    unpack_blob(v[14], &p->user_id) < 0 ||
+	    unpack_blob(v[15], &p->wire_data) < 0 ||
+	    unpack_blob(v[16], &p->excl_cred) < 0)
+		goto fail;
+
+	ok = 0;
+fail:
+	if (ok < 0) {
+		free(p);
+		p = NULL;
+	}
+
+	if (item)
+		cbor_decref(&item);
+
+	return p;
+}
+
+size_t
+pack(uint8_t *ptr, size_t len, const struct param *p)
+{
+	cbor_item_t *argv[17], *array = NULL;
+	size_t cbor_alloc_len, cbor_len = 0;
+	unsigned char *cbor = NULL;
+
+	memset(argv, 0, sizeof(argv));
+
+	if ((array = cbor_new_definite_array(17)) == NULL ||
+	    (argv[0] = pack_byte(p->rk)) == NULL ||
+	    (argv[1] = pack_byte(p->type)) == NULL ||
+	    (argv[2] = pack_byte(p->u2f)) == NULL ||
+	    (argv[3] = pack_byte(p->uv)) == NULL ||
+	    (argv[4] = pack_byte(p->excl_count)) == NULL ||
+	    (argv[5] = pack_int(p->ext)) == NULL ||
+	    (argv[6] = pack_int(p->seed)) == NULL ||
+	    (argv[7] = pack_string(p->pin)) == NULL ||
+	    (argv[8] = pack_string(p->rp_id)) == NULL ||
+	    (argv[9] = pack_string(p->rp_name)) == NULL ||
+	    (argv[10] = pack_string(p->user_icon)) == NULL ||
+	    (argv[11] = pack_string(p->user_name)) == NULL ||
+	    (argv[12] = pack_string(p->user_nick)) == NULL ||
+	    (argv[13] = pack_blob(&p->cdh)) == NULL ||
+	    (argv[14] = pack_blob(&p->user_id)) == NULL ||
+	    (argv[15] = pack_blob(&p->wire_data)) == NULL ||
+	    (argv[16] = pack_blob(&p->excl_cred)) == NULL)
+		goto fail;
+
+	for (size_t i = 0; i < 17; i++)
+		if (cbor_array_push(array, argv[i]) == false)
+			goto fail;
+
+	if ((cbor_len = cbor_serialize_alloc(array, &cbor,
+	    &cbor_alloc_len)) > len) {
+		cbor_len = 0;
+		goto fail;
+	}
+
+	memcpy(ptr, cbor, cbor_len);
+fail:
+	for (size_t i = 0; i < 17; i++)
+		if (argv[i])
+			cbor_decref(&argv[i]);
+
+	if (array)
+		cbor_decref(&array);
+
+	free(cbor);
+
+	return cbor_len;
+}
+
+size_t
+pack_dummy(uint8_t *ptr, size_t len)
+{
+	struct param dummy;
+	uint8_t blob[4096];
+	size_t blob_len;
+
+	memset(&dummy, 0, sizeof(dummy));
+
+	dummy.type = 1;
+	dummy.ext = FIDO_EXT_HMAC_SECRET;
+
+	strlcpy(dummy.pin, dummy_pin, sizeof(dummy.pin));
+	strlcpy(dummy.rp_id, dummy_rp_id, sizeof(dummy.rp_id));
+	strlcpy(dummy.rp_name, dummy_rp_name, sizeof(dummy.rp_name));
+	strlcpy(dummy.user_icon, dummy_user_icon, sizeof(dummy.user_icon));
+	strlcpy(dummy.user_name, dummy_user_name, sizeof(dummy.user_name));
+	strlcpy(dummy.user_nick, dummy_user_nick, sizeof(dummy.user_nick));
+
+	dummy.cdh.len = sizeof(dummy_cdh);
+	dummy.user_id.len = sizeof(dummy_user_id);
+	dummy.wire_data.len = sizeof(dummy_wire_data_fido);
+
+	memcpy(&dummy.cdh.body, &dummy_cdh, dummy.cdh.len);
+	memcpy(&dummy.user_id.body, &dummy_user_id, dummy.user_id.len);
+	memcpy(&dummy.wire_data.body, &dummy_wire_data_fido,
+	    dummy.wire_data.len);
+
+	assert((blob_len = pack(blob, sizeof(blob), &dummy)) != 0);
+
+	if (blob_len > len) {
+		memcpy(ptr, blob, len);
+		return len;
+	}
+
+	memcpy(ptr, blob, blob_len);
+
+	return blob_len;
+}
+
+static void
+make_cred(fido_cred_t *cred, uint8_t u2f, int type, const struct blob *cdh,
+    const char *rp_id, const char *rp_name, const struct blob *user_id,
+    const char *user_name, const char *user_nick, const char *user_icon,
+    int ext, uint8_t rk, uint8_t uv, const char *pin, uint8_t excl_count,
+    const struct blob *excl_cred)
+{
+	fido_dev_t *dev;
+	fido_dev_io_t io;
+
+	memset(&io, 0, sizeof(io));
+
+	io.open = dev_open;
+	io.close = dev_close;
+	io.read = dev_read;
+	io.write = dev_write;
+
+	if ((dev = fido_dev_new()) == NULL || fido_dev_set_io_functions(dev,
+	    &io) != FIDO_OK || fido_dev_open(dev, "nodev") != FIDO_OK) {
+		fido_dev_free(&dev);
+		return;
+	}
+
+	if (u2f & 1)
+		fido_dev_force_u2f(dev);
+
+	for (uint8_t i = 0; i < excl_count; i++)
+		fido_cred_exclude(cred, excl_cred->body, excl_cred->len);
+
+	fido_cred_set_type(cred, type);
+	fido_cred_set_clientdata_hash(cred, cdh->body, cdh->len);
+	fido_cred_set_rp(cred, rp_id, rp_name);
+	fido_cred_set_user(cred, user_id->body, user_id->len, user_name,
+	    user_nick, user_icon);
+	fido_cred_set_extensions(cred, ext);
+
+	if (rk & 1)
+		fido_cred_set_rk(cred, FIDO_OPT_TRUE);
+	if (uv & 1)
+		fido_cred_set_uv(cred, FIDO_OPT_TRUE);
+	if (user_id->len)
+		fido_cred_set_prot(cred, user_id->body[0] & 0x03);
+
+	/* repeat memory operations to trigger reallocation paths */
+	fido_cred_set_type(cred, type);
+	fido_cred_set_clientdata_hash(cred, cdh->body, cdh->len);
+	fido_cred_set_rp(cred, rp_id, rp_name);
+	fido_cred_set_user(cred, user_id->body, user_id->len, user_name,
+	    user_nick, user_icon);
+
+	if (strlen(pin) == 0)
+		pin = NULL;
+
+	fido_dev_make_cred(dev, cred, u2f & 1 ? NULL : pin);
+
+	fido_dev_cancel(dev);
+	fido_dev_close(dev);
+	fido_dev_free(&dev);
+}
+
+static void
+verify_cred(int type, const unsigned char *cdh_ptr, size_t cdh_len,
+    const char *rp_id, const char *rp_name, const unsigned char *authdata_ptr,
+    size_t authdata_len, int ext, uint8_t rk, uint8_t uv,
+    const unsigned char *x5c_ptr, size_t x5c_len, const unsigned char *sig_ptr,
+    size_t sig_len, const char *fmt, int prot)
+{
+	fido_cred_t *cred;
+	uint8_t flags;
+
+	if ((cred = fido_cred_new()) == NULL)
+		return;
+
+	fido_cred_set_type(cred, type);
+	fido_cred_set_clientdata_hash(cred, cdh_ptr, cdh_len);
+	fido_cred_set_rp(cred, rp_id, rp_name);
+	if (fido_cred_set_authdata(cred, authdata_ptr, authdata_len) != FIDO_OK)
+		fido_cred_set_authdata_raw(cred, authdata_ptr, authdata_len);
+	fido_cred_set_extensions(cred, ext);
+	fido_cred_set_x509(cred, x5c_ptr, x5c_len);
+	fido_cred_set_sig(cred, sig_ptr, sig_len);
+	fido_cred_set_prot(cred, prot);
+
+	if (rk & 1)
+		fido_cred_set_rk(cred, FIDO_OPT_TRUE);
+	if (uv & 1)
+		fido_cred_set_uv(cred, FIDO_OPT_TRUE);
+	if (fmt)
+		fido_cred_set_fmt(cred, fmt);
+
+	/* repeat memory operations to trigger reallocation paths */
+	if (fido_cred_set_authdata(cred, authdata_ptr, authdata_len) != FIDO_OK)
+		fido_cred_set_authdata_raw(cred, authdata_ptr, authdata_len);
+	fido_cred_set_x509(cred, x5c_ptr, x5c_len);
+	fido_cred_set_sig(cred, sig_ptr, sig_len);
+
+	assert(fido_cred_verify(cred) != FIDO_OK);
+	assert(fido_cred_verify_self(cred) != FIDO_OK);
+
+	consume(fido_cred_pubkey_ptr(cred), fido_cred_pubkey_len(cred));
+	consume(fido_cred_id_ptr(cred), fido_cred_id_len(cred));
+	consume(fido_cred_aaguid_ptr(cred), fido_cred_aaguid_len(cred));
+	consume(fido_cred_user_id_ptr(cred), fido_cred_user_id_len(cred));
+	consume(fido_cred_user_name(cred), xstrlen(fido_cred_user_name(cred)));
+	consume(fido_cred_display_name(cred),
+	    xstrlen(fido_cred_display_name(cred)));
+
+	flags = fido_cred_flags(cred);
+	consume(&flags, sizeof(flags));
+	type = fido_cred_type(cred);
+	consume(&type, sizeof(type));
+
+	fido_cred_free(&cred);
+}
+
+static void
+test_cred(const struct param *p)
+{
+	fido_cred_t *cred = NULL;
+	int cose_alg = 0;
+
+	if ((cred = fido_cred_new()) == NULL)
+		return;
+
+	switch (p->type & 3) {
+	case 0:
+		cose_alg = COSE_ES256;
+		break;
+	case 1:
+		cose_alg = COSE_RS256;
+		break;
+	default:
+		cose_alg = COSE_EDDSA;
+		break;
+	}
+
+	set_wire_data(p->wire_data.body, p->wire_data.len);
+
+	make_cred(cred, p->u2f, cose_alg, &p->cdh, p->rp_id, p->rp_name,
+	    &p->user_id, p->user_name, p->user_nick, p->user_icon, p->ext,
+	    p->rk, p->uv, p->pin, p->excl_count, &p->excl_cred);
+
+	verify_cred(cose_alg,
+	    fido_cred_clientdata_hash_ptr(cred),
+	    fido_cred_clientdata_hash_len(cred), fido_cred_rp_id(cred),
+	    fido_cred_rp_name(cred), fido_cred_authdata_ptr(cred),
+	    fido_cred_authdata_len(cred), p->ext, p->rk, p->uv,
+	    fido_cred_x5c_ptr(cred), fido_cred_x5c_len(cred),
+	    fido_cred_sig_ptr(cred), fido_cred_sig_len(cred),
+	    fido_cred_fmt(cred), fido_cred_prot(cred));
+
+	fido_cred_free(&cred);
+}
+
+static void
+test_touch(const struct param *p)
+{
+	fido_dev_t *dev;
+	fido_dev_io_t io;
+	int r;
+	int touched;
+
+	memset(&io, 0, sizeof(io));
+
+	io.open = dev_open;
+	io.close = dev_close;
+	io.read = dev_read;
+	io.write = dev_write;
+
+	set_wire_data(p->wire_data.body, p->wire_data.len);
+
+	if ((dev = fido_dev_new()) == NULL || fido_dev_set_io_functions(dev,
+	    &io) != FIDO_OK || fido_dev_open(dev, "nodev") != FIDO_OK) {
+		fido_dev_free(&dev);
+		return;
+	}
+
+	if (p->u2f & 1)
+		fido_dev_force_u2f(dev);
+
+	r = fido_dev_get_touch_begin(dev);
+	consume_str(fido_strerr(r));
+	r = fido_dev_get_touch_status(dev, &touched, -1);
+	consume_str(fido_strerr(r));
+	consume(&touched, sizeof(touched));
+
+	fido_dev_cancel(dev);
+	fido_dev_close(dev);
+	fido_dev_free(&dev);
+}
+
+void
+test(const struct param *p)
+{
+	prng_init((unsigned int)p->seed);
+	fido_init(FIDO_DEBUG);
+	fido_set_log_handler(consume_str);
+
+	test_cred(p);
+	test_touch(p);
+}
+
+void
+mutate(struct param *p, unsigned int seed, unsigned int flags) NO_MSAN
+{
+	if (flags & MUTATE_SEED)
+		p->seed = (int)seed;
+
+	if (flags & MUTATE_PARAM) {
+		mutate_byte(&p->rk);
+		mutate_byte(&p->type);
+		mutate_byte(&p->u2f);
+		mutate_byte(&p->uv);
+		mutate_byte(&p->excl_count);
+		mutate_int(&p->ext);
+		mutate_blob(&p->cdh);
+		mutate_blob(&p->user_id);
+		mutate_blob(&p->excl_cred);
+		mutate_string(p->pin);
+		mutate_string(p->user_icon);
+		mutate_string(p->user_name);
+		mutate_string(p->user_nick);
+		mutate_string(p->rp_id);
+		mutate_string(p->rp_name);
+	}
+
+	if (flags & MUTATE_WIREDATA) {
+		if (p->u2f & 1) {
+			p->wire_data.len = sizeof(dummy_wire_data_u2f);
+			memcpy(&p->wire_data.body, &dummy_wire_data_u2f,
+			    p->wire_data.len);
+		} else {
+			p->wire_data.len = sizeof(dummy_wire_data_fido);
+			memcpy(&p->wire_data.body, &dummy_wire_data_fido,
+			    p->wire_data.len);
+		}
+		mutate_blob(&p->wire_data);
+	}
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/fuzz/fuzz_credman.c mysql-8.0-8.0.27/extra/libfido2/fuzz/fuzz_credman.c
--- mysql-8.0-8.0.26/extra/libfido2/fuzz/fuzz_credman.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/fuzz/fuzz_credman.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,391 @@
+/*
+ * Copyright (c) 2019 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <assert.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "mutator_aux.h"
+#include "wiredata_fido2.h"
+#include "dummy.h"
+
+#include "fido.h"
+#include "fido/credman.h"
+
+#include "../openbsd-compat/openbsd-compat.h"
+
+/* Parameter set defining a FIDO2 credential management operation. */
+struct param {
+	char pin[MAXSTR];
+	char rp_id[MAXSTR];
+	int seed;
+	struct blob cred_id;
+	struct blob del_wire_data;
+	struct blob meta_wire_data;
+	struct blob rk_wire_data;
+	struct blob rp_wire_data;
+};
+
+/*
+ * Collection of HID reports from an authenticator issued with a FIDO2
+ * 'getCredsMetadata' credential management command.
+ */
+static const uint8_t dummy_meta_wire_data[] = {
+	WIREDATA_CTAP_INIT,
+	WIREDATA_CTAP_CBOR_INFO,
+	WIREDATA_CTAP_CBOR_AUTHKEY,
+	WIREDATA_CTAP_CBOR_PINTOKEN,
+	WIREDATA_CTAP_CBOR_CREDMAN_META,
+};
+
+/*
+ * Collection of HID reports from an authenticator issued with a FIDO2
+ * 'enumerateRPsBegin' credential management command.
+ */
+static const uint8_t dummy_rp_wire_data[] = {
+	WIREDATA_CTAP_INIT,
+	WIREDATA_CTAP_CBOR_INFO,
+	WIREDATA_CTAP_CBOR_AUTHKEY,
+	WIREDATA_CTAP_CBOR_PINTOKEN,
+	WIREDATA_CTAP_CBOR_CREDMAN_RPLIST,
+};
+
+/*
+ * Collection of HID reports from an authenticator issued with a FIDO2
+ * 'enumerateCredentialsBegin' credential management command.
+ */
+static const uint8_t dummy_rk_wire_data[] = {
+	WIREDATA_CTAP_INIT,
+	WIREDATA_CTAP_CBOR_INFO,
+	WIREDATA_CTAP_CBOR_AUTHKEY,
+	WIREDATA_CTAP_CBOR_PINTOKEN,
+	WIREDATA_CTAP_CBOR_CREDMAN_RKLIST,
+};
+
+/*
+ * Collection of HID reports from an authenticator issued with a FIDO2
+ * 'deleteCredential' credential management command.
+ */
+static const uint8_t dummy_del_wire_data[] = {
+	WIREDATA_CTAP_INIT,
+	WIREDATA_CTAP_CBOR_INFO,
+	WIREDATA_CTAP_CBOR_AUTHKEY,
+	WIREDATA_CTAP_CBOR_PINTOKEN,
+	WIREDATA_CTAP_CBOR_STATUS,
+};
+
+struct param *
+unpack(const uint8_t *ptr, size_t len)
+{
+	cbor_item_t *item = NULL, **v;
+	struct cbor_load_result cbor;
+	struct param *p;
+	int ok = -1;
+
+	if ((p = calloc(1, sizeof(*p))) == NULL ||
+	    (item = cbor_load(ptr, len, &cbor)) == NULL ||
+	    cbor.read != len ||
+	    cbor_isa_array(item) == false ||
+	    cbor_array_is_definite(item) == false ||
+	    cbor_array_size(item) != 8 ||
+	    (v = cbor_array_handle(item)) == NULL)
+		goto fail;
+
+	if (unpack_int(v[0], &p->seed) < 0 ||
+	    unpack_string(v[1], p->pin) < 0 ||
+	    unpack_string(v[2], p->rp_id) < 0 ||
+	    unpack_blob(v[3], &p->cred_id) < 0 ||
+	    unpack_blob(v[4], &p->meta_wire_data) < 0 ||
+	    unpack_blob(v[5], &p->rp_wire_data) < 0 ||
+	    unpack_blob(v[6], &p->rk_wire_data) < 0 ||
+	    unpack_blob(v[7], &p->del_wire_data) < 0)
+		goto fail;
+
+	ok = 0;
+fail:
+	if (ok < 0) {
+		free(p);
+		p = NULL;
+	}
+
+	if (item)
+		cbor_decref(&item);
+
+	return p;
+}
+
+size_t
+pack(uint8_t *ptr, size_t len, const struct param *p)
+{
+	cbor_item_t *argv[8], *array = NULL;
+	size_t cbor_alloc_len, cbor_len = 0;
+	unsigned char *cbor = NULL;
+
+	memset(argv, 0, sizeof(argv));
+
+	if ((array = cbor_new_definite_array(8)) == NULL ||
+	    (argv[0] = pack_int(p->seed)) == NULL ||
+	    (argv[1] = pack_string(p->pin)) == NULL ||
+	    (argv[2] = pack_string(p->rp_id)) == NULL ||
+	    (argv[3] = pack_blob(&p->cred_id)) == NULL ||
+	    (argv[4] = pack_blob(&p->meta_wire_data)) == NULL ||
+	    (argv[5] = pack_blob(&p->rp_wire_data)) == NULL ||
+	    (argv[6] = pack_blob(&p->rk_wire_data)) == NULL ||
+	    (argv[7] = pack_blob(&p->del_wire_data)) == NULL)
+		goto fail;
+
+	for (size_t i = 0; i < 8; i++)
+		if (cbor_array_push(array, argv[i]) == false)
+			goto fail;
+
+	if ((cbor_len = cbor_serialize_alloc(array, &cbor,
+	    &cbor_alloc_len)) > len) {
+		cbor_len = 0;
+		goto fail;
+	}
+
+	memcpy(ptr, cbor, cbor_len);
+fail:
+	for (size_t i = 0; i < 8; i++)
+		if (argv[i])
+			cbor_decref(&argv[i]);
+
+	if (array)
+		cbor_decref(&array);
+
+	free(cbor);
+
+	return cbor_len;
+}
+
+size_t
+pack_dummy(uint8_t *ptr, size_t len)
+{
+	struct param dummy;
+	uint8_t blob[4096];
+	size_t blob_len;
+
+	memset(&dummy, 0, sizeof(dummy));
+
+	strlcpy(dummy.pin, dummy_pin, sizeof(dummy.pin));
+	strlcpy(dummy.rp_id, dummy_rp_id, sizeof(dummy.rp_id));
+
+	dummy.meta_wire_data.len = sizeof(dummy_meta_wire_data);
+	dummy.rp_wire_data.len = sizeof(dummy_rp_wire_data);
+	dummy.rk_wire_data.len = sizeof(dummy_rk_wire_data);
+	dummy.del_wire_data.len = sizeof(dummy_del_wire_data);
+	dummy.cred_id.len = sizeof(dummy_cred_id);
+
+	memcpy(&dummy.meta_wire_data.body, &dummy_meta_wire_data,
+	    dummy.meta_wire_data.len);
+	memcpy(&dummy.rp_wire_data.body, &dummy_rp_wire_data,
+	    dummy.rp_wire_data.len);
+	memcpy(&dummy.rk_wire_data.body, &dummy_rk_wire_data,
+	    dummy.rk_wire_data.len);
+	memcpy(&dummy.del_wire_data.body, &dummy_del_wire_data,
+	    dummy.del_wire_data.len);
+	memcpy(&dummy.cred_id.body, &dummy_cred_id, dummy.cred_id.len);
+
+	assert((blob_len = pack(blob, sizeof(blob), &dummy)) != 0);
+
+	if (blob_len > len) {
+		memcpy(ptr, blob, len);
+		return len;
+	}
+
+	memcpy(ptr, blob, blob_len);
+
+	return blob_len;
+}
+
+static fido_dev_t *
+prepare_dev(void)
+{
+	fido_dev_t *dev;
+	fido_dev_io_t io;
+	bool x;
+
+	memset(&io, 0, sizeof(io));
+
+	io.open = dev_open;
+	io.close = dev_close;
+	io.read = dev_read;
+	io.write = dev_write;
+
+	if ((dev = fido_dev_new()) == NULL || fido_dev_set_io_functions(dev,
+	    &io) != FIDO_OK || fido_dev_open(dev, "nodev") != FIDO_OK) {
+		fido_dev_free(&dev);
+		return NULL;
+	}
+
+	x = fido_dev_is_fido2(dev);
+	consume(&x, sizeof(x));
+	x = fido_dev_supports_cred_prot(dev);
+	consume(&x, sizeof(x));
+
+	return dev;
+}
+
+static void
+get_metadata(const struct param *p)
+{
+	fido_dev_t *dev;
+	fido_credman_metadata_t *metadata;
+	uint64_t existing;
+	uint64_t remaining;
+
+	set_wire_data(p->meta_wire_data.body, p->meta_wire_data.len);
+
+	if ((dev = prepare_dev()) == NULL)
+		return;
+
+	if ((metadata = fido_credman_metadata_new()) == NULL) {
+		fido_dev_close(dev);
+		fido_dev_free(&dev);
+		return;
+	}
+
+	fido_credman_get_dev_metadata(dev, metadata, p->pin);
+
+	existing = fido_credman_rk_existing(metadata);
+	remaining = fido_credman_rk_remaining(metadata);
+	consume(&existing, sizeof(existing));
+	consume(&remaining, sizeof(remaining));
+
+	fido_credman_metadata_free(&metadata);
+	fido_dev_close(dev);
+	fido_dev_free(&dev);
+}
+
+static void
+get_rp_list(const struct param *p)
+{
+	fido_dev_t *dev;
+	fido_credman_rp_t *rp;
+
+	set_wire_data(p->rp_wire_data.body, p->rp_wire_data.len);
+
+	if ((dev = prepare_dev()) == NULL)
+		return;
+
+	if ((rp = fido_credman_rp_new()) == NULL) {
+		fido_dev_close(dev);
+		fido_dev_free(&dev);
+		return;
+	}
+
+	fido_credman_get_dev_rp(dev, rp, p->pin);
+
+	/* +1 on purpose */
+	for (size_t i = 0; i < fido_credman_rp_count(rp) + 1; i++) {
+		consume(fido_credman_rp_id_hash_ptr(rp, i),
+		    fido_credman_rp_id_hash_len(rp, i));
+		consume(fido_credman_rp_id(rp, i),
+		    xstrlen(fido_credman_rp_id(rp, i)));
+		consume(fido_credman_rp_name(rp, i),
+		    xstrlen(fido_credman_rp_name(rp, i)));
+	}
+
+	fido_credman_rp_free(&rp);
+	fido_dev_close(dev);
+	fido_dev_free(&dev);
+}
+
+static void
+get_rk_list(const struct param *p)
+{
+	fido_dev_t *dev;
+	fido_credman_rk_t *rk;
+	const fido_cred_t *cred;
+	int val;
+
+	set_wire_data(p->rk_wire_data.body, p->rk_wire_data.len);
+
+	if ((dev = prepare_dev()) == NULL)
+		return;
+
+	if ((rk = fido_credman_rk_new()) == NULL) {
+		fido_dev_close(dev);
+		fido_dev_free(&dev);
+		return;
+	}
+
+	fido_credman_get_dev_rk(dev, p->rp_id, rk, p->pin);
+
+	/* +1 on purpose */
+	for (size_t i = 0; i < fido_credman_rk_count(rk) + 1; i++) {
+		if ((cred = fido_credman_rk(rk, i)) == NULL) {
+			assert(i >= fido_credman_rk_count(rk));
+			continue;
+		}
+		val = fido_cred_type(cred);
+		consume(&val, sizeof(val));
+		consume(fido_cred_id_ptr(cred), fido_cred_id_len(cred));
+		consume(fido_cred_pubkey_ptr(cred), fido_cred_pubkey_len(cred));
+		consume(fido_cred_user_id_ptr(cred),
+		    fido_cred_user_id_len(cred));
+		consume(fido_cred_user_name(cred),
+		    xstrlen(fido_cred_user_name(cred)));
+		consume(fido_cred_display_name(cred),
+		    xstrlen(fido_cred_display_name(cred)));
+		val = fido_cred_prot(cred);
+		consume(&val, sizeof(val));
+	}
+
+	fido_credman_rk_free(&rk);
+	fido_dev_close(dev);
+	fido_dev_free(&dev);
+}
+
+static void
+del_rk(const struct param *p)
+{
+	fido_dev_t *dev;
+
+	set_wire_data(p->del_wire_data.body, p->del_wire_data.len);
+
+	if ((dev = prepare_dev()) == NULL)
+		return;
+
+	fido_credman_del_dev_rk(dev, p->cred_id.body, p->cred_id.len, p->pin);
+	fido_dev_close(dev);
+	fido_dev_free(&dev);
+}
+
+void
+test(const struct param *p)
+{
+	prng_init((unsigned int)p->seed);
+	fido_init(FIDO_DEBUG);
+	fido_set_log_handler(consume_str);
+
+	get_metadata(p);
+	get_rp_list(p);
+	get_rk_list(p);
+	del_rk(p);
+}
+
+void
+mutate(struct param *p, unsigned int seed, unsigned int flags) NO_MSAN
+{
+	if (flags & MUTATE_SEED)
+		p->seed = (int)seed;
+
+	if (flags & MUTATE_PARAM) {
+		mutate_blob(&p->cred_id);
+		mutate_string(p->pin);
+		mutate_string(p->rp_id);
+	}
+
+	if (flags & MUTATE_WIREDATA) {
+		mutate_blob(&p->meta_wire_data);
+		mutate_blob(&p->rp_wire_data);
+		mutate_blob(&p->rk_wire_data);
+		mutate_blob(&p->del_wire_data);
+	}
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/fuzz/fuzz_mgmt.c mysql-8.0-8.0.27/extra/libfido2/fuzz/fuzz_mgmt.c
--- mysql-8.0-8.0.26/extra/libfido2/fuzz/fuzz_mgmt.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/fuzz/fuzz_mgmt.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,377 @@
+/*
+ * Copyright (c) 2019 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <assert.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "mutator_aux.h"
+#include "wiredata_fido2.h"
+#include "dummy.h"
+#include "fido.h"
+
+#include "../openbsd-compat/openbsd-compat.h"
+
+struct param {
+	char pin1[MAXSTR];
+	char pin2[MAXSTR];
+	struct blob reset_wire_data;
+	struct blob info_wire_data;
+	struct blob set_pin_wire_data;
+	struct blob change_pin_wire_data;
+	struct blob retry_wire_data;
+	int seed;
+};
+
+static const uint8_t dummy_reset_wire_data[] = {
+	WIREDATA_CTAP_INIT,
+	WIREDATA_CTAP_CBOR_INFO,
+	WIREDATA_CTAP_KEEPALIVE,
+	WIREDATA_CTAP_KEEPALIVE,
+	WIREDATA_CTAP_KEEPALIVE,
+	WIREDATA_CTAP_CBOR_RESET,
+};
+
+static const uint8_t dummy_info_wire_data[] = {
+	WIREDATA_CTAP_INIT,
+	WIREDATA_CTAP_CBOR_INFO,
+	WIREDATA_CTAP_CBOR_INFO,
+};
+
+static const uint8_t dummy_set_pin_wire_data[] = {
+	WIREDATA_CTAP_INIT,
+	WIREDATA_CTAP_CBOR_INFO,
+	WIREDATA_CTAP_CBOR_AUTHKEY,
+	WIREDATA_CTAP_CBOR_STATUS,
+};
+
+static const uint8_t dummy_change_pin_wire_data[] = {
+	WIREDATA_CTAP_INIT,
+	WIREDATA_CTAP_CBOR_INFO,
+	WIREDATA_CTAP_CBOR_AUTHKEY,
+	WIREDATA_CTAP_CBOR_STATUS,
+};
+
+static const uint8_t dummy_retry_wire_data[] = {
+	WIREDATA_CTAP_INIT,
+	WIREDATA_CTAP_CBOR_INFO,
+	WIREDATA_CTAP_CBOR_RETRIES,
+};
+
+struct param *
+unpack(const uint8_t *ptr, size_t len)
+{
+	cbor_item_t *item = NULL, **v;
+	struct cbor_load_result cbor;
+	struct param *p;
+	int ok = -1;
+
+	if ((p = calloc(1, sizeof(*p))) == NULL ||
+	    (item = cbor_load(ptr, len, &cbor)) == NULL ||
+	    cbor.read != len ||
+	    cbor_isa_array(item) == false ||
+	    cbor_array_is_definite(item) == false ||
+	    cbor_array_size(item) != 8 ||
+	    (v = cbor_array_handle(item)) == NULL)
+		goto fail;
+
+	if (unpack_int(v[0], &p->seed) < 0 ||
+	    unpack_string(v[1], p->pin1) < 0 ||
+	    unpack_string(v[2], p->pin2) < 0 ||
+	    unpack_blob(v[3], &p->reset_wire_data) < 0 ||
+	    unpack_blob(v[4], &p->info_wire_data) < 0 ||
+	    unpack_blob(v[5], &p->set_pin_wire_data) < 0 ||
+	    unpack_blob(v[6], &p->change_pin_wire_data) < 0 ||
+	    unpack_blob(v[7], &p->retry_wire_data) < 0)
+		goto fail;
+
+	ok = 0;
+fail:
+	if (ok < 0) {
+		free(p);
+		p = NULL;
+	}
+
+	if (item)
+		cbor_decref(&item);
+
+	return p;
+}
+
+size_t
+pack(uint8_t *ptr, size_t len, const struct param *p)
+{
+	cbor_item_t *argv[8], *array = NULL;
+	size_t cbor_alloc_len, cbor_len = 0;
+	unsigned char *cbor = NULL;
+
+	memset(argv, 0, sizeof(argv));
+
+	if ((array = cbor_new_definite_array(8)) == NULL ||
+	    (argv[0] = pack_int(p->seed)) == NULL ||
+	    (argv[1] = pack_string(p->pin1)) == NULL ||
+	    (argv[2] = pack_string(p->pin2)) == NULL ||
+	    (argv[3] = pack_blob(&p->reset_wire_data)) == NULL ||
+	    (argv[4] = pack_blob(&p->info_wire_data)) == NULL ||
+	    (argv[5] = pack_blob(&p->set_pin_wire_data)) == NULL ||
+	    (argv[6] = pack_blob(&p->change_pin_wire_data)) == NULL ||
+	    (argv[7] = pack_blob(&p->retry_wire_data)) == NULL)
+		goto fail;
+
+	for (size_t i = 0; i < 8; i++)
+		if (cbor_array_push(array, argv[i]) == false)
+			goto fail;
+
+	if ((cbor_len = cbor_serialize_alloc(array, &cbor,
+	    &cbor_alloc_len)) > len) {
+		cbor_len = 0;
+		goto fail;
+	}
+
+	memcpy(ptr, cbor, cbor_len);
+fail:
+	for (size_t i = 0; i < 8; i++)
+		if (argv[i])
+			cbor_decref(&argv[i]);
+
+	if (array)
+		cbor_decref(&array);
+
+	free(cbor);
+
+	return cbor_len;
+}
+
+size_t
+pack_dummy(uint8_t *ptr, size_t len)
+{
+	struct param dummy;
+	uint8_t blob[4096];
+	size_t blob_len;
+
+	memset(&dummy, 0, sizeof(dummy));
+
+	strlcpy(dummy.pin1, dummy_pin1, sizeof(dummy.pin1));
+	strlcpy(dummy.pin2, dummy_pin2, sizeof(dummy.pin2));
+
+	dummy.reset_wire_data.len = sizeof(dummy_reset_wire_data);
+	dummy.info_wire_data.len = sizeof(dummy_info_wire_data);
+	dummy.set_pin_wire_data.len = sizeof(dummy_set_pin_wire_data);
+	dummy.change_pin_wire_data.len = sizeof(dummy_change_pin_wire_data);
+	dummy.retry_wire_data.len = sizeof(dummy_retry_wire_data);
+
+	memcpy(&dummy.reset_wire_data.body, &dummy_reset_wire_data,
+	    dummy.reset_wire_data.len);
+	memcpy(&dummy.info_wire_data.body, &dummy_info_wire_data,
+	    dummy.info_wire_data.len);
+	memcpy(&dummy.set_pin_wire_data.body, &dummy_set_pin_wire_data,
+	    dummy.set_pin_wire_data.len);
+	memcpy(&dummy.change_pin_wire_data.body, &dummy_change_pin_wire_data,
+	    dummy.change_pin_wire_data.len);
+	memcpy(&dummy.retry_wire_data.body, &dummy_retry_wire_data,
+	    dummy.retry_wire_data.len);
+
+	assert((blob_len = pack(blob, sizeof(blob), &dummy)) != 0);
+
+	if (blob_len > len) {
+		memcpy(ptr, blob, len);
+		return len;
+	}
+
+	memcpy(ptr, blob, blob_len);
+
+	return blob_len;
+}
+
+static fido_dev_t *
+prepare_dev(void)
+{
+	fido_dev_t *dev;
+	fido_dev_io_t io;
+
+	memset(&io, 0, sizeof(io));
+
+	io.open = dev_open;
+	io.close = dev_close;
+	io.read = dev_read;
+	io.write = dev_write;
+
+	if ((dev = fido_dev_new()) == NULL || fido_dev_set_io_functions(dev,
+	    &io) != FIDO_OK || fido_dev_open(dev, "nodev") != FIDO_OK) {
+		fido_dev_free(&dev);
+		return NULL;
+	}
+
+	return dev;
+}
+
+static void
+dev_reset(const struct param *p)
+{
+	fido_dev_t *dev;
+
+	set_wire_data(p->reset_wire_data.body, p->reset_wire_data.len);
+
+	if ((dev = prepare_dev()) == NULL)
+		return;
+
+	fido_dev_reset(dev);
+	fido_dev_close(dev);
+	fido_dev_free(&dev);
+}
+
+static void
+dev_get_cbor_info(const struct param *p)
+{
+	fido_dev_t *dev;
+	fido_cbor_info_t *ci;
+	uint64_t n;
+	uint8_t proto, major, minor, build, flags;
+
+	set_wire_data(p->info_wire_data.body, p->info_wire_data.len);
+
+	if ((dev = prepare_dev()) == NULL)
+		return;
+
+	proto = fido_dev_protocol(dev);
+	major = fido_dev_major(dev);
+	minor = fido_dev_minor(dev);
+	build = fido_dev_build(dev);
+	flags = fido_dev_flags(dev);
+
+	consume(&proto, sizeof(proto));
+	consume(&major, sizeof(major));
+	consume(&minor, sizeof(minor));
+	consume(&build, sizeof(build));
+	consume(&flags, sizeof(flags));
+
+	if ((ci = fido_cbor_info_new()) == NULL)
+		goto out;
+
+	fido_dev_get_cbor_info(dev, ci);
+
+	for (size_t i = 0; i < fido_cbor_info_versions_len(ci); i++) {
+		char * const *sa = fido_cbor_info_versions_ptr(ci);
+		consume(sa[i], strlen(sa[i]));
+	}
+
+	for (size_t i = 0; i < fido_cbor_info_extensions_len(ci); i++) {
+		char * const *sa = fido_cbor_info_extensions_ptr(ci);
+		consume(sa[i], strlen(sa[i]));
+	}
+
+	for (size_t i = 0; i < fido_cbor_info_options_len(ci); i++) {
+		char * const *sa = fido_cbor_info_options_name_ptr(ci);
+		const bool *va = fido_cbor_info_options_value_ptr(ci);
+		consume(sa[i], strlen(sa[i]));
+		consume(&va[i], sizeof(va[i]));
+	}
+
+	n = fido_cbor_info_maxmsgsiz(ci);
+	consume(&n, sizeof(n));
+
+	n = fido_cbor_info_maxcredcntlst(ci);
+	consume(&n, sizeof(n));
+
+	n = fido_cbor_info_maxcredidlen(ci);
+	consume(&n, sizeof(n));
+
+	n = fido_cbor_info_fwversion(ci);
+	consume(&n, sizeof(n));
+
+	consume(fido_cbor_info_aaguid_ptr(ci), fido_cbor_info_aaguid_len(ci));
+	consume(fido_cbor_info_protocols_ptr(ci),
+	    fido_cbor_info_protocols_len(ci));
+
+out:
+	fido_dev_close(dev);
+	fido_dev_free(&dev);
+
+	fido_cbor_info_free(&ci);
+}
+
+static void
+dev_set_pin(const struct param *p)
+{
+	fido_dev_t *dev;
+
+	set_wire_data(p->set_pin_wire_data.body, p->set_pin_wire_data.len);
+
+	if ((dev = prepare_dev()) == NULL)
+		return;
+
+	fido_dev_set_pin(dev, p->pin1, NULL);
+	fido_dev_close(dev);
+	fido_dev_free(&dev);
+}
+
+static void
+dev_change_pin(const struct param *p)
+{
+	fido_dev_t *dev;
+
+	set_wire_data(p->change_pin_wire_data.body, p->change_pin_wire_data.len);
+
+	if ((dev = prepare_dev()) == NULL)
+		return;
+
+	fido_dev_set_pin(dev, p->pin2, p->pin1);
+	fido_dev_close(dev);
+	fido_dev_free(&dev);
+}
+
+static void
+dev_get_retry_count(const struct param *p)
+{
+	fido_dev_t *dev;
+	int n = 0;
+
+	set_wire_data(p->retry_wire_data.body, p->retry_wire_data.len);
+
+	if ((dev = prepare_dev()) == NULL)
+		return;
+
+	fido_dev_get_retry_count(dev, &n);
+	consume(&n, sizeof(n));
+	fido_dev_close(dev);
+	fido_dev_free(&dev);
+}
+
+void
+test(const struct param *p)
+{
+	prng_init((unsigned int)p->seed);
+	fido_init(FIDO_DEBUG);
+	fido_set_log_handler(consume_str);
+
+	dev_reset(p);
+	dev_get_cbor_info(p);
+	dev_set_pin(p);
+	dev_change_pin(p);
+	dev_get_retry_count(p);
+}
+
+void
+mutate(struct param *p, unsigned int seed, unsigned int flags) NO_MSAN
+{
+	if (flags & MUTATE_SEED)
+		p->seed = (int)seed;
+
+	if (flags & MUTATE_PARAM) {
+		mutate_string(p->pin1);
+		mutate_string(p->pin2);
+	}
+
+	if (flags & MUTATE_WIREDATA) {
+		mutate_blob(&p->reset_wire_data);
+		mutate_blob(&p->info_wire_data);
+		mutate_blob(&p->set_pin_wire_data);
+		mutate_blob(&p->change_pin_wire_data);
+		mutate_blob(&p->retry_wire_data);
+	}
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/fuzz/libfuzzer.c mysql-8.0-8.0.27/extra/libfido2/fuzz/libfuzzer.c
--- mysql-8.0-8.0.26/extra/libfido2/fuzz/libfuzzer.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/fuzz/libfuzzer.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,174 @@
+/*
+ * Copyright (c) 2019 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <err.h>
+#include <fcntl.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "mutator_aux.h"
+
+static bool debug;
+static unsigned int flags = MUTATE_ALL;
+static unsigned long long test_fail;
+static unsigned long long test_total;
+static unsigned long long mutate_fail;
+static unsigned long long mutate_total;
+
+int LLVMFuzzerInitialize(int *, char ***);
+int LLVMFuzzerTestOneInput(const uint8_t *, size_t);
+size_t LLVMFuzzerCustomMutator(uint8_t *, size_t, size_t, unsigned int);
+
+static int
+save_seed(const char *opt)
+{
+	const char *path;
+	int fd = -1, status = 1;
+	void *buf = NULL;
+	const size_t buflen = 4096;
+	size_t n;
+	struct param *p = NULL;
+
+	if ((path = strchr(opt, '=')) == NULL || strlen(++path) == 0) {
+		warnx("usage: --fido-save-seed=<path>");
+		goto fail;
+	}
+
+	if ((fd = open(path, O_CREAT|O_TRUNC|O_WRONLY, 0644)) == -1) {
+		warn("open %s", path);
+		goto fail;
+	}
+
+	if ((buf = malloc(buflen)) == NULL) {
+		warn("malloc");
+		goto fail;
+	}
+
+	n = pack_dummy(buf, buflen);
+
+	if ((p = unpack(buf, n)) == NULL) {
+		warnx("unpack");
+		goto fail;
+	}
+
+	if (write(fd, buf, n) != (ssize_t)n) {
+		warn("write %s", path);
+		goto fail;
+	}
+
+	status = 0;
+fail:
+	if (fd != -1)
+		close(fd);
+	free(buf);
+	free(p);
+
+	return status;
+}
+
+static void
+parse_mutate_flags(const char *opt, unsigned int *mutate_flags)
+{
+	const char *f;
+
+	if ((f = strchr(opt, '=')) == NULL || strlen(++f) == 0)
+		errx(1, "usage: --fido-mutate=<flag>");
+
+	if (strcmp(f, "seed") == 0)
+		*mutate_flags |= MUTATE_SEED;
+	else if (strcmp(f, "param") == 0)
+		*mutate_flags |= MUTATE_PARAM;
+	else if (strcmp(f, "wiredata") == 0)
+		*mutate_flags |= MUTATE_WIREDATA;
+	else
+		errx(1, "--fido-mutate: unknown flag '%s'", f);
+}
+
+int
+LLVMFuzzerInitialize(int *argc, char ***argv)
+{
+	unsigned int mutate_flags = 0;
+
+	for (int i = 0; i < *argc; i++)
+		if (strcmp((*argv)[i], "--fido-debug") == 0) {
+			debug = 1;
+		} else if (strncmp((*argv)[i], "--fido-save-seed=", 17) == 0) {
+			exit(save_seed((*argv)[i]));
+		} else if (strncmp((*argv)[i], "--fido-mutate=", 14) == 0) {
+			parse_mutate_flags((*argv)[i], &mutate_flags);
+		}
+
+	if (mutate_flags)
+		flags = mutate_flags;
+
+	return 0;
+}
+
+int
+LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
+{
+	struct param *p;
+
+	if (++test_total % 100000 == 0 && debug) {
+		double r = (double)test_fail/(double)test_total * 100.0;
+		fprintf(stderr, "%s: %llu/%llu (%.2f%%)\n", __func__,
+		    test_fail, test_total, r);
+	}
+
+	if (size > 4096 || (p = unpack(data, size)) == NULL)
+		test_fail++;
+	else {
+		test(p);
+		free(p);
+	}
+
+	return 0;
+}
+
+size_t
+LLVMFuzzerCustomMutator(uint8_t *data, size_t size, size_t maxsize,
+    unsigned int seed) NO_MSAN
+{
+	struct param *p;
+	uint8_t blob[4096];
+	size_t blob_len;
+
+	memset(&p, 0, sizeof(p));
+
+#ifdef WITH_MSAN
+	__msan_unpoison(data, maxsize);
+#endif
+
+	if (++mutate_total % 100000 == 0 && debug) {
+		double r = (double)mutate_fail/(double)mutate_total * 100.0;
+		fprintf(stderr, "%s: %llu/%llu (%.2f%%)\n", __func__,
+		    mutate_fail, mutate_total, r);
+	}
+
+	if ((p = unpack(data, size)) == NULL) {
+		mutate_fail++;
+		return pack_dummy(data, maxsize);
+	}
+
+	mutate(p, seed, flags);
+
+	if ((blob_len = pack(blob, sizeof(blob), p)) == 0 ||
+	    blob_len > sizeof(blob) || blob_len > maxsize) {
+		mutate_fail++;
+		free(p);
+		return 0;
+	}
+
+	free(p);
+
+	memcpy(data, blob, blob_len);
+
+	return blob_len;
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/fuzz/mutator_aux.c mysql-8.0-8.0.27/extra/libfido2/fuzz/mutator_aux.c
--- mysql-8.0-8.0.26/extra/libfido2/fuzz/mutator_aux.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/fuzz/mutator_aux.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,221 @@
+/*
+ * Copyright (c) 2019 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <assert.h>
+#include <cbor.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "fido.h"
+#include "mutator_aux.h"
+
+size_t LLVMFuzzerMutate(uint8_t *, size_t, size_t);
+
+static const uint8_t *wire_data_ptr = NULL;
+static size_t wire_data_len = 0;
+
+size_t
+xstrlen(const char *s)
+{
+	if (s == NULL)
+		return 0;
+
+	return strlen(s);
+}
+
+void
+consume(const void *body, size_t len)
+{
+	const volatile uint8_t *ptr = body;
+	volatile uint8_t x = 0;
+
+#ifdef WITH_MSAN
+	__msan_check_mem_is_initialized(body, len);
+#endif
+
+	while (len--)
+		x ^= *ptr++;
+}
+
+void
+consume_str(const char *str)
+{
+	consume(str, strlen(str));
+}
+
+int
+unpack_int(cbor_item_t *item, int *v)
+{
+	if (cbor_is_int(item) == false ||
+	    cbor_int_get_width(item) != CBOR_INT_64)
+		return -1;
+
+	if (cbor_isa_uint(item))
+		*v = (int)cbor_get_uint64(item);
+	else
+		*v = (int)(-cbor_get_uint64(item) - 1);
+
+	return 0;
+}
+
+int
+unpack_string(cbor_item_t *item, char *v)
+{
+	size_t len;
+
+	if (cbor_isa_bytestring(item) == false ||
+	    (len = cbor_bytestring_length(item)) >= MAXSTR)
+		return -1;
+
+	memcpy(v, cbor_bytestring_handle(item), len);
+	v[len] = '\0';
+
+	return 0;
+}
+
+int
+unpack_byte(cbor_item_t *item, uint8_t *v)
+{
+	if (cbor_isa_uint(item) == false ||
+	    cbor_int_get_width(item) != CBOR_INT_8)
+		return -1;
+
+	*v = cbor_get_uint8(item);
+
+	return 0;
+}
+
+int
+unpack_blob(cbor_item_t *item, struct blob *v)
+{
+	if (cbor_isa_bytestring(item) == false ||
+	    (v->len = cbor_bytestring_length(item)) > sizeof(v->body))
+		return -1;
+
+	memcpy(v->body, cbor_bytestring_handle(item), v->len);
+
+	return 0;
+}
+
+cbor_item_t *
+pack_int(int v) NO_MSAN
+{
+	if (v < 0)
+		return cbor_build_negint64((uint64_t)(-(int64_t)v - 1));
+	else
+		return cbor_build_uint64((uint64_t)v);
+}
+
+cbor_item_t *
+pack_string(const char *v) NO_MSAN
+{
+	if (strlen(v) >= MAXSTR)
+		return NULL;
+
+	return cbor_build_bytestring((const unsigned char *)v, strlen(v));
+}
+
+cbor_item_t *
+pack_byte(uint8_t v) NO_MSAN
+{
+	return cbor_build_uint8(v);
+}
+
+cbor_item_t *
+pack_blob(const struct blob *v) NO_MSAN
+{
+	return cbor_build_bytestring(v->body, v->len);
+}
+
+void
+mutate_byte(uint8_t *b)
+{
+	LLVMFuzzerMutate(b, sizeof(*b), sizeof(*b));
+}
+
+void
+mutate_int(int *i)
+{
+	LLVMFuzzerMutate((uint8_t *)i, sizeof(*i), sizeof(*i));
+}
+
+void
+mutate_blob(struct blob *blob)
+{
+	blob->len = LLVMFuzzerMutate((uint8_t *)blob->body, blob->len,
+	    sizeof(blob->body));
+}
+
+void
+mutate_string(char *s)
+{
+	size_t n;
+
+	n = LLVMFuzzerMutate((uint8_t *)s, strlen(s), MAXSTR - 1);
+	s[n] = '\0';
+}
+
+void *
+dev_open(const char *path)
+{
+	(void)path;
+
+	return (void *)0xdeadbeef;
+}
+
+void
+dev_close(void *handle)
+{
+	assert(handle == (void *)0xdeadbeef);
+}
+
+int
+dev_read(void *handle, unsigned char *ptr, size_t len, int ms)
+{
+	size_t n;
+
+	(void)ms;
+
+	assert(handle == (void *)0xdeadbeef);
+	assert(len >= CTAP_MIN_REPORT_LEN && len <= CTAP_MAX_REPORT_LEN);
+
+	if (wire_data_len < len)
+		n = wire_data_len;
+	else
+		n = len;
+
+	memcpy(ptr, wire_data_ptr, n);
+
+	wire_data_ptr += n;
+	wire_data_len -= n;
+
+	return (int)n;
+}
+
+int
+dev_write(void *handle, const unsigned char *ptr, size_t len)
+{
+	assert(handle == (void *)0xdeadbeef);
+	assert(len >= CTAP_MIN_REPORT_LEN + 1 &&
+	    len <= CTAP_MAX_REPORT_LEN + 1);
+
+	consume(ptr, len);
+
+	if (uniform_random(400) < 1)
+		return -1;
+
+	return (int)len;
+}
+
+void
+set_wire_data(const uint8_t *ptr, size_t len)
+{
+	wire_data_ptr = ptr;
+	wire_data_len = len;
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/fuzz/mutator_aux.h mysql-8.0-8.0.27/extra/libfido2/fuzz/mutator_aux.h
--- mysql-8.0-8.0.26/extra/libfido2/fuzz/mutator_aux.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/fuzz/mutator_aux.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2019 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#ifndef _MUTATOR_AUX_H
+#define _MUTATOR_AUX_H
+
+#include <stddef.h>
+#include <stdint.h>
+#include <cbor.h>
+
+/*
+ * As of LLVM 10.0.0, MSAN support in libFuzzer was still experimental.
+ * We therefore have to be careful when using our custom mutator, or
+ * MSAN will flag uninitialised reads on memory populated by libFuzzer.
+ * Since there is no way to suppress MSAN without regenerating object
+ * code (in which case you might as well rebuild libFuzzer with MSAN),
+ * we adjust our mutator to make it less accurate while allowing
+ * fuzzing to proceed.
+ */
+
+#if defined(__has_feature)
+# if  __has_feature(memory_sanitizer)
+#  include <sanitizer/msan_interface.h>
+#  define NO_MSAN	__attribute__((no_sanitize("memory")))
+#  define WITH_MSAN	1
+# endif
+#endif
+
+#if !defined(WITH_MSAN)
+# define NO_MSAN
+#endif
+
+#define MUTATE_SEED	0x01
+#define MUTATE_PARAM	0x02
+#define MUTATE_WIREDATA	0x04
+#define MUTATE_ALL	(MUTATE_SEED | MUTATE_PARAM | MUTATE_WIREDATA)
+
+#define MAXSTR	1024
+#define MAXBLOB	3072
+
+struct blob {
+	uint8_t body[MAXBLOB];
+	size_t len;
+};
+
+struct param;
+
+struct param *unpack(const uint8_t *, size_t);
+size_t pack(uint8_t *, size_t, const struct param *);
+size_t pack_dummy(uint8_t *, size_t);
+void mutate(struct param *, unsigned int, unsigned int);
+void test(const struct param *);
+
+size_t xstrlen(const char *);
+void consume(const void *, size_t);
+void consume_str(const char *);
+
+int unpack_blob(cbor_item_t *, struct blob *);
+int unpack_byte(cbor_item_t *, uint8_t *);
+int unpack_int(cbor_item_t *, int *);
+int unpack_string(cbor_item_t *, char *);
+
+cbor_item_t *pack_blob(const struct blob *);
+cbor_item_t *pack_byte(uint8_t);
+cbor_item_t *pack_int(int);
+cbor_item_t *pack_string(const char *);
+
+void mutate_byte(uint8_t *);
+void mutate_int(int *);
+void mutate_blob(struct blob *);
+void mutate_string(char *);
+
+void *dev_open(const char *);
+void dev_close(void *);
+void set_wire_data(const uint8_t *, size_t);
+int dev_read(void *, unsigned char *, size_t, int);
+int dev_write(void *, const unsigned char *, size_t);
+
+void prng_init(unsigned long);
+unsigned long prng_uint32(void);
+
+uint32_t uniform_random(uint32_t);
+
+#endif /* !_MUTATOR_AUX_H */
diff -Nru mysql-8.0-8.0.26/extra/libfido2/fuzz/preload-fuzz.c mysql-8.0-8.0.27/extra/libfido2/fuzz/preload-fuzz.c
--- mysql-8.0-8.0.26/extra/libfido2/fuzz/preload-fuzz.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/fuzz/preload-fuzz.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2019 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+/*
+ * cc -fPIC -D_GNU_SOURCE -shared -o preload-fuzz.so preload-fuzz.c
+ * LD_PRELOAD=$(realpath preload-fuzz.so)
+ */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <dlfcn.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#define FUZZ_DEV_PREFIX	"nodev"
+
+static int               fd_fuzz = -1;
+static int              (*open_f)(const char *, int, mode_t);
+static int              (*close_f)(int);
+static ssize_t          (*write_f)(int, const void *, size_t);
+
+int
+open(const char *path, int flags, ...)
+{
+	va_list	ap;
+	mode_t	mode;
+
+	va_start(ap, flags);
+	mode = va_arg(ap, mode_t);
+	va_end(ap);
+
+	if (open_f == NULL) {
+		open_f = dlsym(RTLD_NEXT, "open");
+		if (open_f == NULL) {
+			warnx("%s: dlsym", __func__);
+			errno = EACCES;
+			return (-1);
+		}
+	}
+
+	if (strncmp(path, FUZZ_DEV_PREFIX, strlen(FUZZ_DEV_PREFIX)) != 0)
+		return (open_f(path, flags, mode));
+
+	if (fd_fuzz != -1) {
+		warnx("%s: fd_fuzz != -1", __func__);
+		errno = EACCES;
+		return (-1);
+	}
+
+	if ((fd_fuzz = dup(STDIN_FILENO)) < 0) {
+		warn("%s: dup", __func__);
+		errno = EACCES;
+		return (-1);
+	}
+
+	return (fd_fuzz);
+}
+
+int
+close(int fd)
+{
+	if (close_f == NULL) {
+		close_f = dlsym(RTLD_NEXT, "close");
+		if (close_f == NULL) {
+			warnx("%s: dlsym", __func__);
+			errno = EACCES;
+			return (-1);
+		}
+	}
+
+	if (fd == fd_fuzz)
+		fd_fuzz = -1;
+
+	return (close_f(fd));
+}
+
+ssize_t
+write(int fd, const void *buf, size_t nbytes)
+{
+	if (write_f == NULL) {
+		write_f = dlsym(RTLD_NEXT, "write");
+		if (write_f == NULL) {
+			warnx("%s: dlsym", __func__);
+			errno = EBADF;
+			return (-1);
+		}
+	}
+
+	if (fd != fd_fuzz)
+		return (write_f(fd, buf, nbytes));
+
+	return (nbytes);
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/fuzz/preload-snoop.c mysql-8.0-8.0.27/extra/libfido2/fuzz/preload-snoop.c
--- mysql-8.0-8.0.26/extra/libfido2/fuzz/preload-snoop.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/fuzz/preload-snoop.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,217 @@
+/*
+ * Copyright (c) 2019 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+/*
+ * cc -fPIC -D_GNU_SOURCE -shared -o preload-snoop.so preload-snoop.c
+ * LD_PRELOAD=$(realpath preload-snoop.so)
+ */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <dlfcn.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#define SNOOP_DEV_PREFIX	"/dev/hidraw"
+
+struct fd_tuple {
+	int snoop_in;
+	int snoop_out;
+	int real_dev;
+};
+
+static struct fd_tuple  *fd_tuple;
+static int              (*open_f)(const char *, int, mode_t);
+static int              (*close_f)(int);
+static ssize_t          (*read_f)(int, void *, size_t);
+static ssize_t          (*write_f)(int, const void *, size_t);
+
+static int
+get_fd(const char *hid_path, const char *suffix)
+{
+	char	*s = NULL;
+	char	 path[PATH_MAX];
+	int	 fd;
+	int	 r;
+
+	if ((s = strdup(hid_path)) == NULL) {
+		warnx("%s: strdup", __func__);
+		return (-1);
+	}
+
+	for (size_t i = 0; i < strlen(s); i++)
+		if (s[i] == '/')
+			s[i] = '_';
+
+	if ((r = snprintf(path, sizeof(path), "%s-%s", s, suffix)) < 0 ||
+	    (size_t)r >= sizeof(path)) {
+		warnx("%s: snprintf", __func__);
+		free(s);
+		return (-1);
+	}
+
+	free(s);
+	s = NULL;
+
+	if ((fd = open_f(path, O_CREAT | O_WRONLY, 0644)) < 0) {
+		warn("%s: open", __func__);
+		return (-1);
+	}
+
+	return (fd);
+}
+
+int
+open(const char *path, int flags, ...)
+{
+	va_list	ap;
+	mode_t	mode;
+
+	va_start(ap, flags);
+	mode = va_arg(ap, mode_t);
+	va_end(ap);
+
+	if (open_f == NULL) {
+		open_f = dlsym(RTLD_NEXT, "open");
+		if (open_f == NULL) {
+			warnx("%s: dlsym", __func__);
+			errno = EACCES;
+			return (-1);
+		}
+	}
+
+	if (strncmp(path, SNOOP_DEV_PREFIX, strlen(SNOOP_DEV_PREFIX)) != 0)
+		return (open_f(path, flags, mode));
+
+	if (fd_tuple != NULL) {
+		warnx("%s: fd_tuple != NULL", __func__);
+		errno = EACCES;
+		return (-1);
+	}
+
+	if ((fd_tuple = calloc(1, sizeof(*fd_tuple))) == NULL) {
+		warn("%s: calloc", __func__);
+		errno = ENOMEM;
+		return (-1);
+	}
+
+	fd_tuple->snoop_in = -1;
+	fd_tuple->snoop_out = -1;
+	fd_tuple->real_dev = -1;
+
+	if ((fd_tuple->snoop_in = get_fd(path, "in")) < 0 ||
+	    (fd_tuple->snoop_out = get_fd(path, "out")) < 0 ||
+	    (fd_tuple->real_dev = open_f(path, flags, mode)) < 0) {
+		warn("%s: get_fd/open", __func__);
+		goto fail;
+	}
+
+	return (fd_tuple->real_dev);
+fail:
+	if (fd_tuple->snoop_in != -1)
+		close(fd_tuple->snoop_in);
+	if (fd_tuple->snoop_out != -1)
+		close(fd_tuple->snoop_out);
+	if (fd_tuple->real_dev != -1)
+		close(fd_tuple->real_dev);
+
+	free(fd_tuple);
+	fd_tuple = NULL;
+
+	errno = EACCES;
+
+	return (-1);
+}
+
+int
+close(int fd)
+{
+	if (close_f == NULL) {
+		close_f = dlsym(RTLD_NEXT, "close");
+		if (close_f == NULL) {
+			warnx("%s: dlsym", __func__);
+			errno = EBADF;
+			return (-1);
+		}
+	}
+
+	if (fd_tuple == NULL || fd_tuple->real_dev != fd)
+		return (close_f(fd));
+
+	close_f(fd_tuple->snoop_in);
+	close_f(fd_tuple->snoop_out);
+	close_f(fd_tuple->real_dev);
+
+	free(fd_tuple);
+	fd_tuple = NULL;
+
+	return (0);
+}
+
+ssize_t
+read(int fd, void *buf, size_t nbytes)
+{
+	ssize_t n;
+
+	if (read_f == NULL) {
+		read_f = dlsym(RTLD_NEXT, "read");
+		if (read_f == NULL) {
+			warnx("%s: dlsym", __func__);
+			errno = EBADF;
+			return (-1);
+		}
+	}
+
+	if (write_f == NULL) {
+		write_f = dlsym(RTLD_NEXT, "write");
+		if (write_f == NULL) {
+			warnx("%s: dlsym", __func__);
+			errno = EBADF;
+			return (-1);
+		}
+	}
+
+	if (fd_tuple == NULL || fd_tuple->real_dev != fd)
+		return (read_f(fd, buf, nbytes));
+
+	if ((n = read_f(fd, buf, nbytes)) < 0 ||
+	    write_f(fd_tuple->snoop_in, buf, n) != n)
+		return (-1);
+
+	return (n);
+}
+
+ssize_t
+write(int fd, const void *buf, size_t nbytes)
+{
+	ssize_t n;
+
+	if (write_f == NULL) {
+		write_f = dlsym(RTLD_NEXT, "write");
+		if (write_f == NULL) {
+			warnx("%s: dlsym", __func__);
+			errno = EBADF;
+			return (-1);
+		}
+	}
+
+	if (fd_tuple == NULL || fd_tuple->real_dev != fd)
+		return (write_f(fd, buf, nbytes));
+
+	if ((n = write_f(fd, buf, nbytes)) < 0 ||
+	    write_f(fd_tuple->snoop_out, buf, n) != n)
+		return (-1);
+
+	return (n);
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/fuzz/prng.c mysql-8.0-8.0.27/extra/libfido2/fuzz/prng.c
--- mysql-8.0-8.0.26/extra/libfido2/fuzz/prng.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/fuzz/prng.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,113 @@
+/* 
+   A C-program for MT19937, with initialization improved 2002/1/26.
+   Coded by Takuji Nishimura and Makoto Matsumoto.
+
+   Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
+   All rights reserved.                          
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+     1. Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+
+     2. Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+     3. The names of its contributors may not be used to endorse or promote 
+        products derived from this software without specific prior written 
+        permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+   Any feedback is very welcome.
+   http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html
+   email: m-mat @ math.sci.hiroshima-u.ac.jp (remove space)
+*/
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "mutator_aux.h"
+
+#define init_genrand prng_init
+#define genrand_int32 prng_uint32
+
+/* Period parameters */  
+#define N 624
+#define M 397
+#define MATRIX_A 0x9908b0dfUL   /* constant vector a */
+#define UPPER_MASK 0x80000000UL /* most significant w-r bits */
+#define LOWER_MASK 0x7fffffffUL /* least significant r bits */
+
+int prng_up = 0;
+static unsigned long mt[N]; /* the array for the state vector  */
+static int mti=N+1; /* mti==N+1 means mt[N] is not initialized */
+
+/* initializes mt[N] with a seed */
+void init_genrand(unsigned long s)
+{
+    mt[0]= s & 0xffffffffUL;
+    for (mti=1; mti<N; mti++) {
+        mt[mti] = 
+            (1812433253UL * (mt[mti-1] ^ (mt[mti-1] >> 30)) +
+              (unsigned long)mti); 
+        /* See Knuth TAOCP Vol2. 3rd Ed. P.106 for multiplier. */
+        /* In the previous versions, MSBs of the seed affect   */
+        /* only MSBs of the array mt[].                        */
+        /* 2002/01/09 modified by Makoto Matsumoto             */
+        mt[mti] &= 0xffffffffUL;
+        /* for >32 bit machines */
+    }
+    prng_up = 1;
+}
+
+/* generates a random number on [0,0xffffffff]-interval */
+unsigned long genrand_int32(void)
+{
+    unsigned long y;
+    static unsigned long mag01[2]={0x0UL, MATRIX_A};
+    /* mag01[x] = x * MATRIX_A  for x=0,1 */
+
+    if (mti >= N) { /* generate N words at one time */
+        int kk;
+
+        assert(mti != N+1);
+
+        for (kk=0;kk<N-M;kk++) {
+            y = (mt[kk]&UPPER_MASK)|(mt[kk+1]&LOWER_MASK);
+            mt[kk] = mt[kk+M] ^ (y >> 1) ^ mag01[y & 0x1UL];
+        }
+        for (;kk<N-1;kk++) {
+            y = (mt[kk]&UPPER_MASK)|(mt[kk+1]&LOWER_MASK);
+            mt[kk] = mt[kk+(M-N)] ^ (y >> 1) ^ mag01[y & 0x1UL];
+        }
+        y = (mt[N-1]&UPPER_MASK)|(mt[0]&LOWER_MASK);
+        mt[N-1] = mt[M-1] ^ (y >> 1) ^ mag01[y & 0x1UL];
+
+        mti = 0;
+    }
+  
+    y = mt[mti++];
+
+    /* Tempering */
+    y ^= (y >> 11);
+    y ^= (y << 7) & 0x9d2c5680UL;
+    y ^= (y << 15) & 0xefc60000UL;
+    y ^= (y >> 18);
+
+    return y;
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/fuzz/README mysql-8.0-8.0.27/extra/libfido2/fuzz/README
--- mysql-8.0-8.0.26/extra/libfido2/fuzz/README	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/fuzz/README	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,33 @@
+libfido2 can be fuzzed using AFL or libFuzzer, with or without
+ASAN/MSAN/UBSAN.
+
+AFL is more convenient when fuzzing the path from the authenticator to
+libfido2 in an existing application. To do so, use preload-snoop.c with a real
+authenticator to obtain an initial corpus, rebuild libfido2 with -DFUZZ=1, and
+use preload-fuzz.c to read device data from stdin.
+
+libFuzzer is better suited for bespoke fuzzers; see fuzz_cred.c, fuzz_credman.c,
+fuzz_assert.c, and fuzz_mgmt.c for examples. To build these harnesses,
+use -DFUZZ=1 -DLIBFUZZER=1.
+
+To run under ASAN/MSAN/UBSAN, libfido2 needs to be linked against flavours of
+libcbor and OpenSSL built with the respective sanitiser. In order to keep
+memory utilisation at a manageable level, you can either enforce limits at
+the OS level (e.g. cgroups on Linux), or patch libcbor with the diff below.
+
+diff --git src/cbor/internal/memory_utils.c src/cbor/internal/memory_utils.c
+index aa049a2..e294b38 100644
+--- src/cbor/internal/memory_utils.c
++++ src/cbor/internal/memory_utils.c
+@@ -28,7 +28,10 @@ bool _cbor_safe_to_multiply(size_t a, size_t b) {
+ 
+ void* _cbor_alloc_multiple(size_t item_size, size_t item_count) {
+   if (_cbor_safe_to_multiply(item_size, item_count)) {
+-    return _CBOR_MALLOC(item_size * item_count);
++    if (item_count > 1000) {
++      return NULL;
++    } else
++      return _CBOR_MALLOC(item_size * item_count);
+   } else {
+     return NULL;
+   }
diff -Nru mysql-8.0-8.0.26/extra/libfido2/fuzz/summary.txt mysql-8.0-8.0.27/extra/libfido2/fuzz/summary.txt
--- mysql-8.0-8.0.26/extra/libfido2/fuzz/summary.txt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/fuzz/summary.txt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,42 @@
+Filename                             Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+fuzz/prng.c                               31                 0   100.00%           2                 0   100.00%          49                 0   100.00%
+fuzz/uniform_random.c                      7                 1    85.71%           1                 0   100.00%          23                 1    95.65%
+fuzz/wrap.c                                6                 0   100.00%           1                 0   100.00%           7                 0   100.00%
+openbsd-compat/explicit_bzero.c            4                 0   100.00%           1                 0   100.00%          12                 0   100.00%
+openbsd-compat/recallocarray.c            41                 7    82.93%           1                 0   100.00%          49                 7    85.71%
+openbsd-compat/strlcat.c                  12                 1    91.67%           1                 0   100.00%          25                 1    96.00%
+openbsd-compat/timingsafe_bcmp.c           4                 0   100.00%           1                 0   100.00%           8                 0   100.00%
+src/aes256.c                              56                 0   100.00%           2                 0   100.00%          82                 0   100.00%
+src/assert.c                             566                24    95.76%          53                 1    98.11%         900                50    94.44%
+src/authkey.c                             44                 0   100.00%           5                 0   100.00%          75                 0   100.00%
+src/bio.c                                418                20    95.22%          49                 2    95.92%         661                22    96.67%
+src/blob.c                                39                 0   100.00%           7                 0   100.00%          73                 0   100.00%
+src/buf.c                                  8                 1    87.50%           2                 0   100.00%          20                 1    95.00%
+src/cbor.c                               883                 6    99.32%          52                 0   100.00%        1364                17    98.75%
+src/cred.c                               536                23    95.71%          57                 1    98.25%         836                29    96.53%
+src/credman.c                            385                18    95.32%          38                 0   100.00%         595                16    97.31%
+src/dev.c                                334                90    73.05%          33                 8    75.76%         466               140    69.96%
+src/ecdh.c                                68                 0   100.00%           2                 0   100.00%         104                 0   100.00%
+src/eddsa.c                               54                 0   100.00%           8                 0   100.00%          79                 0   100.00%
+src/err.c                                112                 8    92.86%           1                 0   100.00%         116                 8    93.10%
+src/es256.c                              280                 0   100.00%          16                 0   100.00%         398                 0   100.00%
+src/hid.c                                 16                16     0.00%           8                 8     0.00%          38                38     0.00%
+src/hid_linux.c                          235               235     0.00%          19                19     0.00%         416               416     0.00%
+src/info.c                               152                 0   100.00%          34                 0   100.00%         319                 0   100.00%
+src/io.c                                 156                 9    94.23%          10                 0   100.00%         236                11    95.34%
+src/iso7816.c                             18                 1    94.44%           5                 0   100.00%          47                 0   100.00%
+src/log.c                                 34                 2    94.12%           5                 1    80.00%          50                 3    94.00%
+src/pin.c                                248                 0   100.00%          16                 0   100.00%         365                 0   100.00%
+src/reset.c                               19                 0   100.00%           3                 0   100.00%          22                 0   100.00%
+src/rs256.c                              102                 6    94.12%           8                 0   100.00%         140                13    90.71%
+src/u2f.c                                491                 9    98.17%          15                 0   100.00%         774                18    97.67%
+
+Files which contain no functions:
+openbsd-compat/time.h                      0                 0         -           0                 0         -           0                 0         -
+src/extern.h                               0                 0         -           0                 0         -           0                 0         -
+src/fido.h                                 0                 0         -           0                 0         -           0                 0         -
+src/fido/err.h                             0                 0         -           0                 0         -           0                 0         -
+src/fido/param.h                           0                 0         -           0                 0         -           0                 0         -
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+TOTAL                                   5359               477    91.10%         456                40    91.23%        8349               791    90.53%
diff -Nru mysql-8.0-8.0.26/extra/libfido2/fuzz/uniform_random.c mysql-8.0-8.0.27/extra/libfido2/fuzz/uniform_random.c
--- mysql-8.0-8.0.26/extra/libfido2/fuzz/uniform_random.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/fuzz/uniform_random.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <stdint.h>
+#include <stdlib.h>
+
+uint32_t uniform_random(uint32_t);
+unsigned long prng_uint32(void);
+
+/*
+ * Calculate a uniformly distributed random number less than upper_bound
+ * avoiding "modulo bias".
+ *
+ * Uniformity is achieved by generating new random numbers until the one
+ * returned is outside the range [0, 2**32 % upper_bound).  This
+ * guarantees the selected random number will be inside
+ * [2**32 % upper_bound, 2**32) which maps back to [0, upper_bound)
+ * after reduction modulo upper_bound.
+ */
+uint32_t
+uniform_random(uint32_t upper_bound)
+{
+	uint32_t r, min;
+
+	if (upper_bound < 2)
+		return 0;
+
+	/* 2**32 % x == (2**32 - x) % x */
+	min = -upper_bound % upper_bound;
+
+	/*
+	 * This could theoretically loop forever but each retry has
+	 * p > 0.5 (worst case, usually far better) of selecting a
+	 * number inside the range we need, so it should rarely need
+	 * to re-roll.
+	 */
+	for (;;) {
+		r = (uint32_t)prng_uint32();
+		if (r >= min)
+			break;
+	}
+
+	return r % upper_bound;
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/fuzz/wiredata_fido2.h mysql-8.0-8.0.27/extra/libfido2/fuzz/wiredata_fido2.h
--- mysql-8.0-8.0.26/extra/libfido2/fuzz/wiredata_fido2.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/fuzz/wiredata_fido2.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,569 @@
+/*
+ * Copyright (c) 2020 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#ifndef _WIREDATA_FIDO2_H
+#define _WIREDATA_FIDO2_H
+
+#define WIREDATA_CTAP_INIT				\
+	0xff, 0xff, 0xff, 0xff, 0x86, 0x00, 0x11, 0x80,	\
+	0x43, 0x56, 0x40, 0xb1, 0x4e, 0xd9, 0x2d, 0x00,	\
+	0x22, 0x00, 0x02, 0x02, 0x05, 0x02, 0x01, 0x05,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+#define WIREDATA_CTAP_KEEPALIVE				\
+	0x00, 0x22, 0x00, 0x02, 0xbb, 0x00, 0x01, 0x02,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+#define WIREDATA_CTAP_CBOR_INFO				\
+	0x00, 0x22, 0x00, 0x02, 0x90, 0x00, 0xb9, 0x00,	\
+	0xa9, 0x01, 0x83, 0x66, 0x55, 0x32, 0x46, 0x5f,	\
+	0x56, 0x32, 0x68, 0x46, 0x49, 0x44, 0x4f, 0x5f,	\
+	0x32, 0x5f, 0x30, 0x6c, 0x46, 0x49, 0x44, 0x4f,	\
+	0x5f, 0x32, 0x5f, 0x31, 0x5f, 0x50, 0x52, 0x45,	\
+	0x02, 0x82, 0x6b, 0x63, 0x72, 0x65, 0x64, 0x50,	\
+	0x72, 0x6f, 0x74, 0x65, 0x63, 0x74, 0x6b, 0x68,	\
+	0x6d, 0x61, 0x63, 0x2d, 0x73, 0x65, 0x63, 0x72,	\
+	0x00, 0x22, 0x00, 0x02, 0x00, 0x65, 0x74, 0x03,	\
+	0x50, 0x19, 0x56, 0xe5, 0xbd, 0xa3, 0x74, 0x45,	\
+	0xf1, 0xa8, 0x14, 0x35, 0x64, 0x03, 0xfd, 0xbc,	\
+	0x18, 0x04, 0xa5, 0x62, 0x72, 0x6b, 0xf5, 0x62,	\
+	0x75, 0x70, 0xf5, 0x64, 0x70, 0x6c, 0x61, 0x74,	\
+	0xf4, 0x69, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74,	\
+	0x50, 0x69, 0x6e, 0xf4, 0x75, 0x63, 0x72, 0x65,	\
+	0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x4d,	\
+	0x00, 0x22, 0x00, 0x02, 0x01, 0x67, 0x6d, 0x74,	\
+	0x50, 0x72, 0x65, 0x76, 0x69, 0x65, 0x77, 0xf5,	\
+	0x05, 0x19, 0x04, 0xb0, 0x06, 0x81, 0x01, 0x07,	\
+	0x08, 0x08, 0x18, 0x80, 0x0a, 0x82, 0xa2, 0x63,	\
+	0x61, 0x6c, 0x67, 0x26, 0x64, 0x74, 0x79, 0x70,	\
+	0x65, 0x6a, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63,	\
+	0x2d, 0x6b, 0x65, 0x79, 0xa2, 0x63, 0x61, 0x6c,	\
+	0x67, 0x27, 0x64, 0x74, 0x79, 0x70, 0x65, 0x6a,	\
+	0x00, 0x22, 0x00, 0x02, 0x02, 0x70, 0x75, 0x62,	\
+	0x6c, 0x69, 0x63, 0x2d, 0x6b, 0x65, 0x79, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+#define WIREDATA_CTAP_CBOR_RESET			\
+	0x00, 0x22, 0x00, 0x02, 0x90, 0x00, 0x01, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+#define WIREDATA_CTAP_CBOR_AUTHKEY			\
+	0x00, 0x22, 0x00, 0x02, 0x90, 0x00, 0x51, 0x00,	\
+	0xa1, 0x01, 0xa5, 0x01, 0x02, 0x03, 0x38, 0x18,	\
+	0x20, 0x01, 0x21, 0x58, 0x20, 0x2a, 0xb8, 0x2d,	\
+	0x36, 0x69, 0xab, 0x30, 0x9d, 0xe3, 0x5e, 0x9b,	\
+	0xfb, 0x94, 0xfc, 0x1d, 0x92, 0x95, 0xaf, 0x01,	\
+	0x47, 0xfe, 0x4b, 0x87, 0xe5, 0xcf, 0x3f, 0x05,	\
+	0x0b, 0x39, 0xda, 0x17, 0x49, 0x22, 0x58, 0x20,	\
+	0x15, 0x1b, 0xbe, 0x08, 0x78, 0x60, 0x4d, 0x3c,	\
+	0x00, 0x22, 0x00, 0x03, 0x00, 0x3f, 0xf1, 0x60,	\
+	0xa6, 0xd8, 0xf8, 0xed, 0xce, 0x4a, 0x30, 0x5d,	\
+	0x1a, 0xaf, 0x80, 0xc4, 0x0a, 0xd2, 0x6f, 0x77,	\
+	0x38, 0x12, 0x97, 0xaa, 0xbd, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+#define WIREDATA_CTAP_CBOR_PINTOKEN			\
+	0x00, 0x22, 0x00, 0x02, 0x90, 0x00, 0x14, 0x00,	\
+	0xa1, 0x02, 0x50, 0xee, 0x40, 0x4c, 0x85, 0xd7,	\
+	0xa1, 0x2f, 0x56, 0xc4, 0x4e, 0xc5, 0x93, 0x41,	\
+	0xd0, 0x3b, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+#define WIREDATA_CTAP_CBOR_STATUS			\
+	0x00, 0x22, 0x00, 0x02, 0x90, 0x00, 0x01, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+#define WIREDATA_CTAP_CBOR_RETRIES			\
+	0x00, 0x22, 0x00, 0x02, 0x90, 0x00, 0x04, 0x00,	\
+	0xa1, 0x03, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+#define WIREDATA_CTAP_CBOR_ASSERT			\
+	0x00, 0x22, 0x00, 0x02, 0x90, 0x00, 0xcb, 0x00,	\
+	0xa3, 0x01, 0xa2, 0x62, 0x69, 0x64, 0x58, 0x40,	\
+	0x4a, 0x4c, 0x9e, 0xcc, 0x81, 0x7d, 0x42, 0x03,	\
+	0x2b, 0x41, 0xd1, 0x38, 0xd3, 0x49, 0xb4, 0xfc,	\
+	0xfb, 0xe4, 0x4e, 0xe4, 0xff, 0x76, 0x34, 0x16,	\
+	0x68, 0x06, 0x9d, 0xa6, 0x01, 0x32, 0xb9, 0xff,	\
+	0xc2, 0x35, 0x0d, 0x89, 0x43, 0x66, 0x12, 0xf8,	\
+	0x8e, 0x5b, 0xde, 0xf4, 0xcc, 0xec, 0x9d, 0x03,	\
+	0x00, 0x92, 0x00, 0x0e, 0x00, 0x85, 0xc2, 0xf5,	\
+	0xe6, 0x8e, 0xeb, 0x3f, 0x3a, 0xec, 0xc3, 0x1d,	\
+	0x04, 0x6e, 0xf3, 0x5b, 0x88, 0x64, 0x74, 0x79,	\
+	0x70, 0x65, 0x6a, 0x70, 0x75, 0x62, 0x6c, 0x69,	\
+	0x63, 0x2d, 0x6b, 0x65, 0x79, 0x02, 0x58, 0x25,	\
+	0x49, 0x96, 0x0d, 0xe5, 0x88, 0x0e, 0x8c, 0x68,	\
+	0x74, 0x34, 0x17, 0x0f, 0x64, 0x76, 0x60, 0x5b,	\
+	0x8f, 0xe4, 0xae, 0xb9, 0xa2, 0x86, 0x32, 0xc7,	\
+	0x00, 0x92, 0x00, 0x0e, 0x01, 0x99, 0x5c, 0xf3,	\
+	0xba, 0x83, 0x1d, 0x97, 0x63, 0x04, 0x00, 0x00,	\
+	0x00, 0x09, 0x03, 0x58, 0x47, 0x30, 0x45, 0x02,	\
+	0x21, 0x00, 0xcf, 0x3f, 0x36, 0x0e, 0x1f, 0x6f,	\
+	0xd6, 0xa0, 0x9d, 0x13, 0xcf, 0x55, 0xf7, 0x49,	\
+	0x8f, 0xc8, 0xc9, 0x03, 0x12, 0x76, 0x41, 0x75,	\
+	0x7b, 0xb5, 0x0a, 0x90, 0xa5, 0x82, 0x26, 0xf1,	\
+	0x6b, 0x80, 0x02, 0x20, 0x34, 0x9b, 0x7a, 0x82,	\
+	0x00, 0x92, 0x00, 0x0e, 0x02, 0xd3, 0xe1, 0x79,	\
+	0x49, 0x55, 0x41, 0x9f, 0xa4, 0x06, 0x06, 0xbd,	\
+	0xc8, 0xb9, 0x2b, 0x5f, 0xe1, 0xa7, 0x99, 0x1c,	\
+	0xa1, 0xfc, 0x7e, 0x3e, 0xd5, 0x85, 0x2e, 0x11,	\
+	0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+#define WIREDATA_CTAP_CBOR_CRED				\
+	0x00, 0x91, 0x00, 0x03, 0x90, 0x03, 0xe1, 0x00,	\
+	0xa3, 0x01, 0x66, 0x70, 0x61, 0x63, 0x6b, 0x65,	\
+	0x64, 0x02, 0x58, 0xc4, 0x49, 0x96, 0x0d, 0xe5,	\
+	0x88, 0x0e, 0x8c, 0x68, 0x74, 0x34, 0x17, 0x0f,	\
+	0x64, 0x76, 0x60, 0x5b, 0x8f, 0xe4, 0xae, 0xb9,	\
+	0xa2, 0x86, 0x32, 0xc7, 0x99, 0x5c, 0xf3, 0xba,	\
+	0x83, 0x1d, 0x97, 0x63, 0x45, 0x00, 0x00, 0x00,	\
+	0x00, 0xf8, 0xa0, 0x11, 0xf3, 0x8c, 0x0a, 0x4d,	\
+	0x00, 0x91, 0x00, 0x03, 0x00, 0x15, 0x80, 0x06,	\
+	0x17, 0x11, 0x1f, 0x9e, 0xdc, 0x7d, 0x00, 0x40,	\
+	0xed, 0x88, 0x48, 0xa1, 0xdb, 0x56, 0x4d, 0x0f,	\
+	0x0d, 0xc8, 0x8f, 0x0f, 0xe9, 0x16, 0xb1, 0x78,	\
+	0xa9, 0x40, 0x98, 0x71, 0xa0, 0xb3, 0xf2, 0xcf,	\
+	0x05, 0x73, 0x6c, 0x12, 0xbf, 0x00, 0x96, 0xf3,	\
+	0x7b, 0x93, 0xba, 0x49, 0xee, 0x23, 0xb4, 0x78,	\
+	0x2e, 0xfb, 0xce, 0x27, 0xa8, 0xc2, 0x26, 0x78,	\
+	0x00, 0x91, 0x00, 0x03, 0x01, 0xcc, 0x95, 0x2d,	\
+	0x40, 0xdb, 0xd1, 0x40, 0x3d, 0x2b, 0xa3, 0x31,	\
+	0xa0, 0x75, 0x82, 0x63, 0xf0, 0xa5, 0x01, 0x02,	\
+	0x03, 0x26, 0x20, 0x01, 0x21, 0x58, 0x20, 0x9d,	\
+	0x95, 0xa1, 0xb5, 0xd6, 0x11, 0xbf, 0xe2, 0x28,	\
+	0xa0, 0x7f, 0xca, 0x1e, 0xd9, 0x09, 0x0f, 0x0d,	\
+	0xe7, 0x8e, 0x29, 0xe8, 0x2e, 0x11, 0xdb, 0x55,	\
+	0x62, 0x13, 0xd7, 0x26, 0xc2, 0x7e, 0x2b, 0x22,	\
+	0x00, 0x91, 0x00, 0x03, 0x02, 0x58, 0x20, 0xbe,	\
+	0x74, 0x2a, 0xac, 0xde, 0x11, 0x40, 0x76, 0x31,	\
+	0x0b, 0xed, 0x55, 0xde, 0xf3, 0x03, 0xe4, 0x1c,	\
+	0xac, 0x42, 0x63, 0x8f, 0xe8, 0x30, 0x63, 0xb7,	\
+	0x07, 0x4e, 0x5d, 0xfb, 0x17, 0x5e, 0x9b, 0x03,	\
+	0xa3, 0x63, 0x61, 0x6c, 0x67, 0x26, 0x63, 0x73,	\
+	0x69, 0x67, 0x58, 0x48, 0x30, 0x46, 0x02, 0x21,	\
+	0x00, 0xfb, 0xd1, 0x26, 0x76, 0x34, 0x74, 0xac,	\
+	0x00, 0x91, 0x00, 0x03, 0x03, 0xf6, 0xd8, 0x5c,	\
+	0x5d, 0xbc, 0xda, 0xe0, 0x43, 0xe0, 0xa5, 0x42,	\
+	0x9f, 0xc7, 0xe2, 0x18, 0x3e, 0xe2, 0x2c, 0x94,	\
+	0x78, 0xbf, 0x9c, 0xeb, 0x3e, 0x9d, 0x02, 0x21,	\
+	0x00, 0xab, 0x21, 0x1b, 0xc4, 0x30, 0x69, 0xee,	\
+	0x7f, 0x09, 0xe6, 0x6b, 0x99, 0x98, 0x34, 0x07,	\
+	0x7b, 0x9a, 0x58, 0xb2, 0xe8, 0x77, 0xe0, 0xba,	\
+	0x7d, 0xab, 0x65, 0xf8, 0xba, 0x2a, 0xcb, 0x9a,	\
+	0x00, 0x91, 0x00, 0x03, 0x04, 0x41, 0x63, 0x78,	\
+	0x35, 0x63, 0x81, 0x59, 0x02, 0xb3, 0x30, 0x82,	\
+	0x02, 0xaf, 0x30, 0x82, 0x01, 0x97, 0xa0, 0x03,	\
+	0x02, 0x01, 0x02, 0x02, 0x04, 0x48, 0x5b, 0x3d,	\
+	0xb6, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48,	\
+	0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00,	\
+	0x30, 0x21, 0x31, 0x1f, 0x30, 0x1d, 0x06, 0x03,	\
+	0x55, 0x04, 0x03, 0x0c, 0x16, 0x59, 0x75, 0x62,	\
+	0x00, 0x91, 0x00, 0x03, 0x05, 0x69, 0x63, 0x6f,	\
+	0x20, 0x46, 0x49, 0x44, 0x4f, 0x20, 0x50, 0x72,	\
+	0x65, 0x76, 0x69, 0x65, 0x77, 0x20, 0x43, 0x41,	\
+	0x30, 0x1e, 0x17, 0x0d, 0x31, 0x38, 0x30, 0x34,	\
+	0x31, 0x32, 0x31, 0x30, 0x35, 0x37, 0x31, 0x30,	\
+	0x5a, 0x17, 0x0d, 0x31, 0x38, 0x31, 0x32, 0x33,	\
+	0x31, 0x31, 0x30, 0x35, 0x37, 0x31, 0x30, 0x5a,	\
+	0x30, 0x6f, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03,	\
+	0x00, 0x91, 0x00, 0x03, 0x06, 0x55, 0x04, 0x06,	\
+	0x13, 0x02, 0x53, 0x45, 0x31, 0x12, 0x30, 0x10,	\
+	0x06, 0x03, 0x55, 0x04, 0x0a, 0x0c, 0x09, 0x59,	\
+	0x75, 0x62, 0x69, 0x63, 0x6f, 0x20, 0x41, 0x42,	\
+	0x31, 0x22, 0x30, 0x20, 0x06, 0x03, 0x55, 0x04,	\
+	0x0b, 0x0c, 0x19, 0x41, 0x75, 0x74, 0x68, 0x65,	\
+	0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x6f, 0x72,	\
+	0x20, 0x41, 0x74, 0x74, 0x65, 0x73, 0x74, 0x61,	\
+	0x00, 0x91, 0x00, 0x03, 0x07, 0x74, 0x69, 0x6f,	\
+	0x6e, 0x31, 0x28, 0x30, 0x26, 0x06, 0x03, 0x55,	\
+	0x04, 0x03, 0x0c, 0x1f, 0x59, 0x75, 0x62, 0x69,	\
+	0x63, 0x6f, 0x20, 0x55, 0x32, 0x46, 0x20, 0x45,	\
+	0x45, 0x20, 0x53, 0x65, 0x72, 0x69, 0x61, 0x6c,	\
+	0x20, 0x31, 0x32, 0x31, 0x33, 0x39, 0x33, 0x39,	\
+	0x31, 0x32, 0x36, 0x30, 0x59, 0x30, 0x13, 0x06,	\
+	0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01,	\
+	0x00, 0x91, 0x00, 0x03, 0x08, 0x06, 0x08, 0x2a,	\
+	0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03,	\
+	0x42, 0x00, 0x04, 0xfb, 0x2c, 0xdd, 0x30, 0x43,	\
+	0x28, 0xc5, 0x72, 0x4a, 0x50, 0xcc, 0xe6, 0xf6,	\
+	0x0b, 0xad, 0x7d, 0x27, 0xa9, 0x1b, 0x59, 0xe1,	\
+	0xe6, 0x6f, 0x29, 0x7b, 0x89, 0xc9, 0xd4, 0x3d,	\
+	0xc2, 0xb2, 0xc7, 0x78, 0x89, 0xb4, 0xf0, 0xff,	\
+	0x9d, 0x02, 0x28, 0xcb, 0x94, 0x6d, 0xfc, 0xe0,	\
+	0x00, 0x91, 0x00, 0x03, 0x09, 0x1b, 0x19, 0x58,	\
+	0x9b, 0x67, 0x80, 0x4a, 0xac, 0x97, 0x7f, 0x28,	\
+	0x18, 0x9c, 0xcd, 0xb3, 0x25, 0x74, 0xca, 0x28,	\
+	0xa3, 0x6c, 0x30, 0x6a, 0x30, 0x22, 0x06, 0x09,	\
+	0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xc4, 0x0a,	\
+	0x02, 0x04, 0x15, 0x31, 0x2e, 0x33, 0x2e, 0x36,	\
+	0x2e, 0x31, 0x2e, 0x34, 0x2e, 0x31, 0x2e, 0x34,	\
+	0x31, 0x34, 0x38, 0x32, 0x2e, 0x31, 0x2e, 0x36,	\
+	0x00, 0x91, 0x00, 0x03, 0x0a, 0x30, 0x13, 0x06,	\
+	0x0b, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0xe5,	\
+	0x1c, 0x02, 0x01, 0x01, 0x04, 0x04, 0x03, 0x02,	\
+	0x04, 0x30, 0x30, 0x21, 0x06, 0x0b, 0x2b, 0x06,	\
+	0x01, 0x04, 0x01, 0x82, 0xe5, 0x1c, 0x01, 0x01,	\
+	0x04, 0x04, 0x12, 0x04, 0x10, 0xf8, 0xa0, 0x11,	\
+	0xf3, 0x8c, 0x0a, 0x4d, 0x15, 0x80, 0x06, 0x17,	\
+	0x11, 0x1f, 0x9e, 0xdc, 0x7d, 0x30, 0x0c, 0x06,	\
+	0x00, 0x91, 0x00, 0x03, 0x0b, 0x03, 0x55, 0x1d,	\
+	0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00,	\
+	0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86,	\
+	0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, 0x03,	\
+	0x82, 0x01, 0x01, 0x00, 0x32, 0xf3, 0xe4, 0xbd,	\
+	0x58, 0xd7, 0x42, 0x2b, 0xaf, 0x49, 0x99, 0x86,	\
+	0x08, 0x1f, 0x0d, 0xa9, 0x3b, 0xc6, 0xaa, 0x1c,	\
+	0x72, 0x11, 0xf9, 0x28, 0x53, 0xeb, 0xf3, 0xeb,	\
+	0x00, 0x91, 0x00, 0x03, 0x0c, 0x73, 0xda, 0x69,	\
+	0x3b, 0x06, 0xde, 0x31, 0x33, 0x8e, 0x5d, 0x02,	\
+	0xec, 0xf6, 0x76, 0xe9, 0x5c, 0x42, 0xbe, 0xa5,	\
+	0x8f, 0x25, 0xd3, 0x37, 0x3f, 0x77, 0xbb, 0x2a,	\
+	0x9d, 0x7c, 0xb2, 0x3e, 0x11, 0x8c, 0x41, 0xd4,	\
+	0x9a, 0x4c, 0x9a, 0xd8, 0xf3, 0xe2, 0xa4, 0xec,	\
+	0x01, 0x77, 0x7a, 0x74, 0xa8, 0xc4, 0x12, 0x43,	\
+	0xc3, 0x1e, 0xce, 0x20, 0x8f, 0x2d, 0x0f, 0x6e,	\
+	0x00, 0x91, 0x00, 0x03, 0x0d, 0xbc, 0x61, 0x9b,	\
+	0xe1, 0x84, 0xa1, 0x72, 0xf6, 0xa9, 0xac, 0xcb,	\
+	0xf8, 0x73, 0x6d, 0x5b, 0xe2, 0x98, 0xb3, 0x6b,	\
+	0xec, 0xe7, 0x1e, 0x77, 0x8d, 0x0a, 0x69, 0xaa,	\
+	0xf9, 0x94, 0xb8, 0x63, 0x6d, 0xe8, 0xfa, 0xf6,	\
+	0x2f, 0xd3, 0xce, 0x7f, 0x04, 0x4c, 0x32, 0x2c,	\
+	0xf7, 0x26, 0x3e, 0x34, 0x99, 0xe6, 0xa5, 0xb2,	\
+	0xb0, 0x2a, 0xbb, 0xad, 0x5b, 0xd9, 0xec, 0xe5,	\
+	0x00, 0x91, 0x00, 0x03, 0x0e, 0xb0, 0x71, 0x4d,	\
+	0x73, 0xbb, 0x94, 0x61, 0x49, 0x9c, 0x94, 0x2a,	\
+	0x5f, 0x1d, 0xcc, 0xaf, 0x65, 0x03, 0x3b, 0x39,	\
+	0x39, 0xd4, 0x47, 0xd9, 0xfc, 0xc4, 0x7b, 0x0b,	\
+	0x16, 0xd8, 0xe9, 0x01, 0xfc, 0xec, 0x3f, 0x8c,	\
+	0x1b, 0xc0, 0xc6, 0xac, 0x0b, 0x5d, 0x74, 0xc7,	\
+	0xbb, 0x03, 0x05, 0x69, 0x17, 0xe9, 0x98, 0x1a,	\
+	0x19, 0xb9, 0x09, 0x5c, 0xa1, 0xf4, 0xab, 0x9f,	\
+	0x00, 0x91, 0x00, 0x03, 0x0f, 0x02, 0x7c, 0x28,	\
+	0x0f, 0x8a, 0xf9, 0xed, 0x1d, 0x29, 0x3c, 0xf6,	\
+	0xcc, 0x2f, 0x04, 0x6d, 0x9a, 0xd6, 0x62, 0xb4,	\
+	0xa9, 0x6e, 0xb1, 0xca, 0xca, 0xac, 0x5e, 0x05,	\
+	0x3e, 0x83, 0x91, 0x47, 0x7c, 0x1f, 0x8b, 0x60,	\
+	0x01, 0xde, 0x65, 0x3a, 0xbf, 0xf2, 0xaa, 0xbb,	\
+	0x55, 0x98, 0x86, 0x91, 0x7e, 0xad, 0x3b, 0x36,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+#define WIREDATA_CTAP_CBOR_CREDMAN_META			\
+	0x00, 0x12, 0x00, 0x04, 0x90, 0x00, 0x07, 0x00,	\
+	0xa2, 0x01, 0x00, 0x02, 0x18, 0x19, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+#define WIREDATA_CTAP_CBOR_CREDMAN_RPLIST		\
+	0x00, 0x15, 0x00, 0x02, 0x90, 0x00, 0x37, 0x00,	\
+	0xa3, 0x03, 0xa1, 0x62, 0x69, 0x64, 0x6a, 0x79,	\
+	0x75, 0x62, 0x69, 0x63, 0x6f, 0x2e, 0x63, 0x6f,	\
+	0x6d, 0x04, 0x58, 0x20, 0x37, 0x82, 0x09, 0xb7,	\
+	0x2d, 0xef, 0xcb, 0xa9, 0x1d, 0xcb, 0xf8, 0x54,	\
+	0xed, 0xb4, 0xda, 0xa6, 0x48, 0x82, 0x8a, 0x2c,	\
+	0xbd, 0x18, 0x0a, 0xfc, 0x77, 0xa7, 0x44, 0x34,	\
+	0x65, 0x5a, 0x1c, 0x7d, 0x05, 0x03, 0x00, 0x00,	\
+	0x00, 0x15, 0x00, 0x02, 0x90, 0x00, 0x36, 0x00,	\
+	0xa2, 0x03, 0xa1, 0x62, 0x69, 0x64, 0x6b, 0x79,	\
+	0x75, 0x62, 0x69, 0x6b, 0x65, 0x79, 0x2e, 0x6f,	\
+	0x72, 0x67, 0x04, 0x58, 0x20, 0x12, 0x6b, 0xba,	\
+	0x6a, 0x2d, 0x7a, 0x81, 0x84, 0x25, 0x7b, 0x74,	\
+	0xdd, 0x1d, 0xdd, 0x46, 0xb6, 0x2a, 0x8c, 0xa2,	\
+	0xa7, 0x83, 0xfe, 0xdb, 0x5b, 0x19, 0x48, 0x73,	\
+	0x55, 0xb7, 0xe3, 0x46, 0x09, 0x00, 0x00, 0x00,	\
+	0x00, 0x15, 0x00, 0x02, 0x90, 0x00, 0x37, 0x00,	\
+	0xa2, 0x03, 0xa1, 0x62, 0x69, 0x64, 0x6c, 0x77,	\
+	0x65, 0x62, 0x61, 0x75, 0x74, 0x68, 0x6e, 0x2e,	\
+	0x64, 0x65, 0x76, 0x04, 0x58, 0x20, 0xd6, 0x32,	\
+	0x7d, 0x8c, 0x6a, 0x5d, 0xe6, 0xae, 0x0e, 0x33,	\
+	0xd0, 0xa3, 0x31, 0xfb, 0x67, 0x77, 0xb9, 0x4e,	\
+	0xf4, 0x73, 0x19, 0xfe, 0x7e, 0xfd, 0xfa, 0x82,	\
+	0x70, 0x8e, 0x1f, 0xbb, 0xa2, 0x55, 0x00, 0x00
+
+#define WIREDATA_CTAP_CBOR_CREDMAN_RKLIST		\
+	0x00, 0x15, 0x00, 0x04, 0x90, 0x00, 0xc5, 0x00,	\
+	0xa5, 0x06, 0xa3, 0x62, 0x69, 0x64, 0x58, 0x20,	\
+	0xe4, 0xe1, 0x06, 0x31, 0xde, 0x00, 0x0f, 0x4f,	\
+	0x12, 0x6e, 0xc9, 0x68, 0x2d, 0x43, 0x3f, 0xf1,	\
+	0x02, 0x2c, 0x6e, 0xe6, 0x96, 0x10, 0xbf, 0x73,	\
+	0x35, 0xc9, 0x20, 0x27, 0x06, 0xba, 0x39, 0x09,	\
+	0x64, 0x6e, 0x61, 0x6d, 0x65, 0x6a, 0x62, 0x6f,	\
+	0x62, 0x20, 0x62, 0x61, 0x6e, 0x61, 0x6e, 0x61,	\
+	0x00, 0x15, 0x00, 0x04, 0x00, 0x6b, 0x64, 0x69,	\
+	0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d,	\
+	0x65, 0x67, 0x62, 0x62, 0x61, 0x6e, 0x61, 0x6e,	\
+	0x61, 0x07, 0xa2, 0x62, 0x69, 0x64, 0x50, 0x19,	\
+	0xf7, 0x78, 0x0c, 0xa0, 0xbc, 0xb9, 0xa6, 0xd5,	\
+	0x1e, 0xd7, 0x87, 0xfb, 0x6c, 0x80, 0x03, 0x64,	\
+	0x74, 0x79, 0x70, 0x65, 0x6a, 0x70, 0x75, 0x62,	\
+	0x6c, 0x69, 0x63, 0x2d, 0x6b, 0x65, 0x79, 0x08,	\
+	0x00, 0x15, 0x00, 0x04, 0x01, 0xa5, 0x01, 0x02,	\
+	0x03, 0x26, 0x20, 0x01, 0x21, 0x58, 0x20, 0x81,	\
+	0x6c, 0xdd, 0x8c, 0x8f, 0x8c, 0xc8, 0x43, 0xa7,	\
+	0xbb, 0x79, 0x51, 0x09, 0xb1, 0xdf, 0xbe, 0xc4,	\
+	0xa5, 0x54, 0x16, 0x9e, 0x58, 0x56, 0xb3, 0x0b,	\
+	0x34, 0x4f, 0xa5, 0x6c, 0x05, 0xa2, 0x21, 0x22,	\
+	0x58, 0x20, 0xcd, 0xc2, 0x0c, 0x99, 0x83, 0x5a,	\
+	0x61, 0x73, 0xd8, 0xe0, 0x74, 0x23, 0x46, 0x64,	\
+	0x00, 0x15, 0x00, 0x04, 0x02, 0x39, 0x4c, 0xb0,	\
+	0xf4, 0x6c, 0x0a, 0x37, 0x72, 0xaa, 0xa8, 0xea,	\
+	0x58, 0xd3, 0xd4, 0xe0, 0x51, 0xb2, 0x28, 0x09,	\
+	0x05, 0x0a, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x15, 0x00, 0x04, 0x90, 0x00, 0xa0, 0x00,	\
+	0xa4, 0x06, 0xa3, 0x62, 0x69, 0x64, 0x58, 0x20,	\
+	0x56, 0xa1, 0x3c, 0x06, 0x2b, 0xad, 0xa2, 0x21,	\
+	0x7d, 0xcd, 0x91, 0x08, 0x47, 0xa8, 0x8a, 0x06,	\
+	0x06, 0xf6, 0x66, 0x91, 0xf6, 0xeb, 0x89, 0xe4,	\
+	0xdf, 0x26, 0xbc, 0x46, 0x59, 0xc3, 0x7d, 0xc0,	\
+	0x64, 0x6e, 0x61, 0x6d, 0x65, 0x6a, 0x62, 0x6f,	\
+	0x62, 0x20, 0x62, 0x61, 0x6e, 0x61, 0x6e, 0x61,	\
+	0x00, 0x15, 0x00, 0x04, 0x00, 0x6b, 0x64, 0x69,	\
+	0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d,	\
+	0x65, 0x67, 0x62, 0x62, 0x61, 0x6e, 0x61, 0x6e,	\
+	0x61, 0x07, 0xa2, 0x62, 0x69, 0x64, 0x50, 0xd8,	\
+	0x27, 0x4b, 0x25, 0xed, 0x19, 0xef, 0x11, 0xaf,	\
+	0xa6, 0x89, 0x7b, 0x84, 0x50, 0xe7, 0x62, 0x64,	\
+	0x74, 0x79, 0x70, 0x65, 0x6a, 0x70, 0x75, 0x62,	\
+	0x6c, 0x69, 0x63, 0x2d, 0x6b, 0x65, 0x79, 0x08,	\
+	0x00, 0x15, 0x00, 0x04, 0x01, 0xa4, 0x01, 0x01,	\
+	0x03, 0x27, 0x20, 0x06, 0x21, 0x58, 0x20, 0x8d,	\
+	0xfe, 0x45, 0xd5, 0x7d, 0xb6, 0x17, 0xab, 0x86,	\
+	0x2d, 0x32, 0xf6, 0x85, 0xf0, 0x92, 0x76, 0xb7,	\
+	0xce, 0x73, 0xca, 0x4e, 0x0e, 0xfd, 0xd5, 0xdb,	\
+	0x2a, 0x1d, 0x55, 0x90, 0x96, 0x52, 0xc2, 0x0a,	\
+	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x15, 0x00, 0x04, 0x90, 0x00, 0xa0, 0x00,	\
+	0xa4, 0x06, 0xa3, 0x62, 0x69, 0x64, 0x58, 0x20,	\
+	0x04, 0x0e, 0x0f, 0xa0, 0xcd, 0x60, 0x35, 0x9a,	\
+	0xba, 0x47, 0x0c, 0x10, 0xb6, 0x82, 0x6e, 0x2f,	\
+	0x66, 0xb9, 0xa7, 0xcf, 0xd8, 0x47, 0xb4, 0x3d,	\
+	0xfd, 0x77, 0x1a, 0x38, 0x22, 0xa1, 0xda, 0xa5,	\
+	0x64, 0x6e, 0x61, 0x6d, 0x65, 0x6a, 0x62, 0x6f,	\
+	0x62, 0x20, 0x62, 0x61, 0x6e, 0x61, 0x6e, 0x61,	\
+	0x00, 0x15, 0x00, 0x04, 0x00, 0x6b, 0x64, 0x69,	\
+	0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d,	\
+	0x65, 0x67, 0x62, 0x62, 0x61, 0x6e, 0x61, 0x6e,	\
+	0x61, 0x07, 0xa2, 0x62, 0x69, 0x64, 0x50, 0x00,	\
+	0x5d, 0xdf, 0xef, 0xe2, 0xf3, 0x06, 0xb2, 0xa5,	\
+	0x46, 0x4d, 0x98, 0xbc, 0x14, 0x65, 0xc1, 0x64,	\
+	0x74, 0x79, 0x70, 0x65, 0x6a, 0x70, 0x75, 0x62,	\
+	0x6c, 0x69, 0x63, 0x2d, 0x6b, 0x65, 0x79, 0x08,	\
+	0x00, 0x15, 0x00, 0x04, 0x01, 0xa4, 0x01, 0x01,	\
+	0x03, 0x27, 0x20, 0x06, 0x21, 0x58, 0x20, 0x72,	\
+	0x79, 0x14, 0x69, 0xdf, 0xcb, 0x64, 0x75, 0xee,	\
+	0xd4, 0x45, 0x94, 0xbc, 0x48, 0x4d, 0x2a, 0x9f,	\
+	0xc9, 0xf4, 0xb5, 0x1b, 0x05, 0xa6, 0x5b, 0x54,	\
+	0x9a, 0xac, 0x6c, 0x2e, 0xc6, 0x90, 0x62, 0x0a,	\
+	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x15, 0x00, 0x04, 0x90, 0x00, 0xc3, 0x00,	\
+	0xa4, 0x06, 0xa3, 0x62, 0x69, 0x64, 0x58, 0x20,	\
+	0xce, 0x32, 0xd8, 0x79, 0xdd, 0x86, 0xa2, 0x42,	\
+	0x7c, 0xc3, 0xe1, 0x95, 0x12, 0x93, 0x1a, 0x03,	\
+	0xe6, 0x70, 0xb8, 0xff, 0xcd, 0xa5, 0xdf, 0x15,	\
+	0xfc, 0x88, 0x2a, 0xf5, 0x44, 0xf1, 0x33, 0x9c,	\
+	0x64, 0x6e, 0x61, 0x6d, 0x65, 0x6a, 0x62, 0x6f,	\
+	0x62, 0x20, 0x62, 0x61, 0x6e, 0x61, 0x6e, 0x61,	\
+	0x00, 0x15, 0x00, 0x04, 0x00, 0x6b, 0x64, 0x69,	\
+	0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d,	\
+	0x65, 0x67, 0x62, 0x62, 0x61, 0x6e, 0x61, 0x6e,	\
+	0x61, 0x07, 0xa2, 0x62, 0x69, 0x64, 0x50, 0x0a,	\
+	0x26, 0x5b, 0x7e, 0x1a, 0x2a, 0xba, 0x70, 0x5f,	\
+	0x18, 0x26, 0x14, 0xb2, 0x71, 0xca, 0x98, 0x64,	\
+	0x74, 0x79, 0x70, 0x65, 0x6a, 0x70, 0x75, 0x62,	\
+	0x6c, 0x69, 0x63, 0x2d, 0x6b, 0x65, 0x79, 0x08,	\
+	0x00, 0x15, 0x00, 0x04, 0x01, 0xa5, 0x01, 0x02,	\
+	0x03, 0x26, 0x20, 0x01, 0x21, 0x58, 0x20, 0x8b,	\
+	0x48, 0xf0, 0x69, 0xfb, 0x22, 0xfb, 0xf3, 0x86,	\
+	0x57, 0x7c, 0xdd, 0x82, 0x2c, 0x1c, 0x0c, 0xdc,	\
+	0x27, 0xe2, 0x6a, 0x4c, 0x1a, 0x10, 0x04, 0x27,	\
+	0x51, 0x3e, 0x2a, 0x9d, 0x3a, 0xb6, 0xb5, 0x22,	\
+	0x58, 0x20, 0x70, 0xfe, 0x91, 0x67, 0x64, 0x53,	\
+	0x63, 0x83, 0x72, 0x31, 0xe9, 0xe5, 0x20, 0xb7,	\
+	0x00, 0x15, 0x00, 0x04, 0x02, 0xee, 0xc9, 0xfb,	\
+	0x63, 0xd7, 0xe4, 0x76, 0x39, 0x80, 0x82, 0x74,	\
+	0xb8, 0xfa, 0x67, 0xf5, 0x1b, 0x8f, 0xe0, 0x0a,	\
+	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x15, 0x00, 0x04, 0x90, 0x00, 0xc3, 0x00,	\
+	0xa4, 0x06, 0xa3, 0x62, 0x69, 0x64, 0x58, 0x20,	\
+	0xf9, 0xa3, 0x67, 0xbf, 0x5e, 0x80, 0x95, 0xdb,	\
+	0x4c, 0xc5, 0x8f, 0x65, 0x36, 0xc5, 0xaf, 0xdd,	\
+	0x90, 0x2e, 0x62, 0x68, 0x67, 0x9c, 0xa2, 0x26,	\
+	0x2f, 0x2a, 0xf9, 0x3a, 0xda, 0x15, 0xf2, 0x27,	\
+	0x64, 0x6e, 0x61, 0x6d, 0x65, 0x6a, 0x62, 0x6f,	\
+	0x62, 0x20, 0x62, 0x61, 0x6e, 0x61, 0x6e, 0x61,	\
+	0x00, 0x15, 0x00, 0x04, 0x00, 0x6b, 0x64, 0x69,	\
+	0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d,	\
+	0x65, 0x67, 0x62, 0x62, 0x61, 0x6e, 0x61, 0x6e,	\
+	0x61, 0x07, 0xa2, 0x62, 0x69, 0x64, 0x50, 0xfb,	\
+	0xa6, 0xbe, 0xc1, 0x01, 0xf6, 0x7a, 0x81, 0xf9,	\
+	0xcd, 0x6d, 0x20, 0x41, 0x7a, 0x1c, 0x40, 0x64,	\
+	0x74, 0x79, 0x70, 0x65, 0x6a, 0x70, 0x75, 0x62,	\
+	0x6c, 0x69, 0x63, 0x2d, 0x6b, 0x65, 0x79, 0x08,	\
+	0x00, 0x15, 0x00, 0x04, 0x01, 0xa5, 0x01, 0x02,	\
+	0x03, 0x26, 0x20, 0x01, 0x21, 0x58, 0x20, 0xda,	\
+	0x2b, 0x53, 0xc3, 0xbe, 0x48, 0xf8, 0xab, 0xbd,	\
+	0x06, 0x28, 0x46, 0xfa, 0x35, 0xab, 0xf9, 0xc5,	\
+	0x2e, 0xfd, 0x3c, 0x38, 0x88, 0xb3, 0xe1, 0xa7,	\
+	0xc5, 0xc6, 0xed, 0x72, 0x54, 0x37, 0x93, 0x22,	\
+	0x58, 0x20, 0x12, 0x82, 0x32, 0x2d, 0xab, 0xbc,	\
+	0x64, 0xb3, 0xed, 0xcc, 0xd5, 0x22, 0xec, 0x79,	\
+	0x00, 0x15, 0x00, 0x04, 0x02, 0x4b, 0xe2, 0x4d,	\
+	0x0c, 0x4b, 0x8d, 0x31, 0x4c, 0xb4, 0x0f, 0xd4,	\
+	0xa9, 0xbe, 0x0c, 0xab, 0x9e, 0x0a, 0xc9, 0x0a,	\
+	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+#define WIREDATA_CTAP_CBOR_BIO_INFO			\
+	0x00, 0x10, 0x00, 0x04, 0x90, 0x00, 0x06, 0x00,	\
+	0xa2, 0x02, 0x01, 0x03, 0x04, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+#define WIREDATA_CTAP_CBOR_BIO_ENROLL			\
+	0x00, 0x0a, 0x00, 0x05, 0xbb, 0x00, 0x01, 0x02,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x0a, 0x00, 0x05, 0xbb, 0x00, 0x01, 0x02,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x0a, 0x00, 0x05, 0xbb, 0x00, 0x01, 0x02,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x0a, 0x00, 0x05, 0x90, 0x00, 0x0a, 0x00,	\
+	0xa3, 0x04, 0x42, 0x68, 0x96, 0x05, 0x00, 0x06,	\
+	0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x0a, 0x00, 0x05, 0xbb, 0x00, 0x01, 0x02,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x0a, 0x00, 0x05, 0xbb, 0x00, 0x01, 0x02,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x0a, 0x00, 0x05, 0x90, 0x00, 0x06, 0x00,	\
+	0xa2, 0x05, 0x00, 0x06, 0x01, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x0a, 0x00, 0x05, 0xbb, 0x00, 0x01, 0x02,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x0a, 0x00, 0x05, 0x90, 0x00, 0x06, 0x00,	\
+	0xa2, 0x05, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+#define WIREDATA_CTAP_CBOR_BIO_ENUM			\
+	0x00, 0x10, 0x00, 0x0f, 0x90, 0x00, 0x2e, 0x00,	\
+	0xa1, 0x07, 0x83, 0xa2, 0x01, 0x42, 0xce, 0xa3,	\
+	0x02, 0x67, 0x66, 0x69, 0x6e, 0x67, 0x65, 0x72,	\
+	0x31, 0xa2, 0x01, 0x42, 0xbf, 0x5e, 0x02, 0x67,	\
+	0x66, 0x69, 0x6e, 0x67, 0x65, 0x72, 0x32, 0xa2,	\
+	0x01, 0x42, 0x5e, 0xd2, 0x02, 0x67, 0x66, 0x69,	\
+	0x6e, 0x67, 0x65, 0x72, 0x33, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+#endif /* _WIREDATA_FIDO2_H */
diff -Nru mysql-8.0-8.0.26/extra/libfido2/fuzz/wiredata_u2f.h mysql-8.0-8.0.27/extra/libfido2/fuzz/wiredata_u2f.h
--- mysql-8.0-8.0.26/extra/libfido2/fuzz/wiredata_u2f.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/fuzz/wiredata_u2f.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2020 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#ifndef _WIREDATA_U2F_H
+#define _WIREDATA_U2F_H
+
+#define WIREDATA_CTAP_U2F_6985				\
+	0x00, 0x00, 0x99, 0x01, 0x83, 0x00, 0x02, 0x69,	\
+	0x85, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+#define WIREDATA_CTAP_U2F_AUTH				\
+	0x00, 0x00, 0x99, 0x01, 0x83, 0x00, 0x4e, 0x01,	\
+	0x00, 0x00, 0x00, 0x2c, 0x30, 0x45, 0x02, 0x20,	\
+	0x1c, 0xf5, 0x7c, 0xf6, 0xde, 0xbe, 0xe9, 0x86,	\
+	0xee, 0x97, 0xb7, 0x64, 0xa3, 0x4e, 0x7a, 0x70,	\
+	0x85, 0xd0, 0x66, 0xf9, 0xf0, 0xcd, 0x04, 0x5d,	\
+	0x97, 0xf2, 0x3c, 0x22, 0xe3, 0x0e, 0x61, 0xc8,	\
+	0x02, 0x21, 0x00, 0x97, 0xef, 0xae, 0x36, 0xe6,	\
+	0x17, 0x9f, 0x5e, 0x2d, 0xd7, 0x8c, 0x34, 0xa7,	\
+	0x00, 0x00, 0x99, 0x01, 0x00, 0xa1, 0xe9, 0xfb,	\
+	0x8f, 0x86, 0x8c, 0xe3, 0x1e, 0xde, 0x3f, 0x4e,	\
+	0x1b, 0xe1, 0x2f, 0x8f, 0x2f, 0xca, 0x42, 0x26,	\
+	0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+#define WIREDATA_CTAP_U2F_REGISTER			\
+	0x00, 0x00, 0x99, 0x01, 0x83, 0x03, 0x1e, 0x05,	\
+	0x04, 0x9f, 0xa0, 0xf9, 0x0d, 0x4c, 0xf4, 0xae,	\
+	0x96, 0x3c, 0xb7, 0x46, 0xb7, 0x5c, 0x9d, 0x8b,	\
+	0x48, 0x19, 0xdf, 0xc4, 0xad, 0xea, 0xb2, 0x70,	\
+	0x58, 0x72, 0xd9, 0xce, 0x75, 0xf5, 0xe6, 0x8e,	\
+	0x0f, 0x9c, 0x0e, 0x2e, 0x62, 0x3e, 0x91, 0xd3,	\
+	0x7b, 0x97, 0x46, 0x60, 0xb9, 0x57, 0x13, 0x97,	\
+	0x26, 0xae, 0x0f, 0xb3, 0x8f, 0x2e, 0x9b, 0x3f,	\
+	0x00, 0x00, 0x99, 0x01, 0x00, 0xa5, 0x55, 0xec,	\
+	0x8c, 0x25, 0x7c, 0x65, 0xb7, 0x09, 0x40, 0x48,	\
+	0xae, 0xa8, 0xcb, 0xa1, 0x91, 0xac, 0x40, 0x24,	\
+	0xf2, 0x34, 0x6e, 0x3a, 0x8f, 0xa5, 0xb7, 0x48,	\
+	0x54, 0x6e, 0xfb, 0xf4, 0x37, 0x88, 0x69, 0x79,	\
+	0x6f, 0x12, 0xc1, 0x32, 0xdf, 0x15, 0x5d, 0x6e,	\
+	0x82, 0x54, 0xc0, 0x6e, 0x56, 0x4f, 0x3a, 0x9c,	\
+	0xc3, 0x96, 0x7a, 0xde, 0xa5, 0xfe, 0xec, 0xd1,	\
+	0x00, 0x00, 0x99, 0x01, 0x01, 0x5a, 0x21, 0x85,	\
+	0x0e, 0x25, 0x7b, 0x8d, 0x6e, 0x1d, 0x32, 0x29,	\
+	0xdb, 0x21, 0xb0, 0xa3, 0x30, 0x82, 0x02, 0x4f,	\
+	0x30, 0x82, 0x01, 0x37, 0xa0, 0x03, 0x02, 0x01,	\
+	0x02, 0x02, 0x04, 0x2a, 0xd9, 0x6a, 0xf3, 0x30,	\
+	0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7,	\
+	0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, 0x30, 0x2e,	\
+	0x31, 0x2c, 0x30, 0x2a, 0x06, 0x03, 0x55, 0x04,	\
+	0x00, 0x00, 0x99, 0x01, 0x02, 0x03, 0x13, 0x23,	\
+	0x59, 0x75, 0x62, 0x69, 0x63, 0x6f, 0x20, 0x55,	\
+	0x32, 0x46, 0x20, 0x52, 0x6f, 0x6f, 0x74, 0x20,	\
+	0x43, 0x41, 0x20, 0x53, 0x65, 0x72, 0x69, 0x61,	\
+	0x6c, 0x20, 0x34, 0x35, 0x37, 0x32, 0x30, 0x30,	\
+	0x36, 0x33, 0x31, 0x30, 0x20, 0x17, 0x0d, 0x31,	\
+	0x34, 0x30, 0x38, 0x30, 0x31, 0x30, 0x30, 0x30,	\
+	0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x32, 0x30,	\
+	0x00, 0x00, 0x99, 0x01, 0x03, 0x35, 0x30, 0x30,	\
+	0x39, 0x30, 0x34, 0x30, 0x30, 0x30, 0x30, 0x30,	\
+	0x30, 0x5a, 0x30, 0x31, 0x31, 0x2f, 0x30, 0x2d,	\
+	0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x26, 0x59,	\
+	0x75, 0x62, 0x69, 0x63, 0x6f, 0x20, 0x55, 0x32,	\
+	0x46, 0x20, 0x45, 0x45, 0x20, 0x53, 0x65, 0x72,	\
+	0x69, 0x61, 0x6c, 0x20, 0x32, 0x33, 0x39, 0x32,	\
+	0x35, 0x37, 0x33, 0x34, 0x35, 0x31, 0x36, 0x35,	\
+	0x00, 0x00, 0x99, 0x01, 0x04, 0x35, 0x30, 0x33,	\
+	0x38, 0x37, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07,	\
+	0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06,	\
+	0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01,	\
+	0x07, 0x03, 0x42, 0x00, 0x04, 0x2f, 0xe1, 0xa2,	\
+	0x3e, 0xbf, 0xa5, 0x5b, 0x3e, 0x46, 0x1d, 0x59,	\
+	0xa4, 0x35, 0x22, 0xd7, 0x97, 0x48, 0x98, 0x1c,	\
+	0xba, 0x6d, 0x28, 0x9a, 0x98, 0xf1, 0xbd, 0x7d,	\
+	0x00, 0x00, 0x99, 0x01, 0x05, 0xff, 0x65, 0x66,	\
+	0x80, 0xdb, 0xbb, 0xed, 0xbc, 0x2b, 0xae, 0x60,	\
+	0x7e, 0x6e, 0xf7, 0x72, 0xf5, 0x76, 0xb0, 0x4d,	\
+	0x54, 0xc4, 0xe5, 0xf3, 0x2f, 0x59, 0x6f, 0x26,	\
+	0xe6, 0x11, 0x15, 0xc7, 0x27, 0x2c, 0xf6, 0xca,	\
+	0x75, 0x94, 0xa3, 0x3b, 0x30, 0x39, 0x30, 0x22,	\
+	0x06, 0x09, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82,	\
+	0xc4, 0x0a, 0x02, 0x04, 0x15, 0x31, 0x2e, 0x33,	\
+	0x00, 0x00, 0x99, 0x01, 0x06, 0x2e, 0x36, 0x2e,	\
+	0x31, 0x2e, 0x34, 0x2e, 0x31, 0x2e, 0x34, 0x31,	\
+	0x34, 0x38, 0x32, 0x2e, 0x31, 0x2e, 0x32, 0x30,	\
+	0x13, 0x06, 0x0b, 0x2b, 0x06, 0x01, 0x04, 0x01,	\
+	0x82, 0xe5, 0x1c, 0x02, 0x01, 0x01, 0x04, 0x04,	\
+	0x03, 0x02, 0x04, 0x30, 0x30, 0x0d, 0x06, 0x09,	\
+	0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01,	\
+	0x0b, 0x05, 0x00, 0x03, 0x82, 0x01, 0x01, 0x00,	\
+	0x00, 0x00, 0x99, 0x01, 0x07, 0x85, 0x6a, 0xfa,	\
+	0x8b, 0xcf, 0x4f, 0x3f, 0x62, 0x5f, 0x29, 0x1b,	\
+	0xc1, 0x15, 0x8e, 0x3c, 0x7e, 0xbd, 0x25, 0x52,	\
+	0xbc, 0xf7, 0x57, 0x07, 0x53, 0xf5, 0x12, 0x1d,	\
+	0xa6, 0xa5, 0x4d, 0x24, 0xcc, 0xcf, 0xae, 0x27,	\
+	0xce, 0xd6, 0xab, 0x31, 0x12, 0x8c, 0x29, 0x7e,	\
+	0x5b, 0x5b, 0x89, 0x05, 0xdd, 0xa0, 0x20, 0x17,	\
+	0x93, 0x1f, 0x1f, 0x5f, 0x59, 0x25, 0x93, 0x59,	\
+	0x00, 0x00, 0x99, 0x01, 0x08, 0x51, 0xfc, 0x00,	\
+	0x4b, 0xcb, 0xe2, 0x0a, 0xdd, 0x7d, 0x8d, 0x05,	\
+	0x2f, 0x95, 0x43, 0xb3, 0x49, 0x6c, 0x15, 0xb8,	\
+	0x31, 0x0e, 0x10, 0xcb, 0xd9, 0xbb, 0x05, 0x38,	\
+	0x27, 0x4f, 0x58, 0x3e, 0xad, 0x1f, 0x45, 0x12,	\
+	0x88, 0xc3, 0xea, 0x76, 0xd0, 0x70, 0xad, 0x44,	\
+	0xe5, 0x3a, 0xfe, 0xa8, 0xf2, 0x2d, 0x1f, 0x73,	\
+	0x62, 0x5f, 0xf2, 0xd5, 0x89, 0xfe, 0x30, 0xdf,	\
+	0x00, 0x00, 0x99, 0x01, 0x09, 0x26, 0x62, 0xcb,	\
+	0x7c, 0xbb, 0x7c, 0x99, 0x61, 0x80, 0xad, 0xcf,	\
+	0xa9, 0x8a, 0x4d, 0x01, 0x2c, 0xf3, 0x13, 0x46,	\
+	0xcd, 0x11, 0x74, 0x6a, 0x58, 0x48, 0xe8, 0xbe,	\
+	0xed, 0xf3, 0xe3, 0x0c, 0xcb, 0xd9, 0xc1, 0xdd,	\
+	0x22, 0x16, 0x71, 0xb2, 0x83, 0x88, 0x61, 0xf6,	\
+	0x5a, 0x45, 0x36, 0x23, 0xb5, 0x18, 0xd5, 0x56,	\
+	0x7f, 0xa8, 0xf0, 0xa3, 0xce, 0x10, 0x5d, 0xf4,	\
+	0x00, 0x00, 0x99, 0x01, 0x0a, 0xf1, 0x39, 0x53,	\
+	0xe1, 0x14, 0xea, 0x59, 0xe0, 0xa7, 0xf2, 0xfe,	\
+	0x66, 0x88, 0x67, 0x43, 0x2e, 0x52, 0xfd, 0x6a,	\
+	0x2f, 0x64, 0xf7, 0x3c, 0x48, 0xcd, 0x9b, 0x38,	\
+	0xf2, 0xdf, 0xba, 0x2c, 0x7a, 0x4b, 0x3b, 0x11,	\
+	0x28, 0xdf, 0x26, 0xd6, 0x6a, 0x24, 0xf8, 0x95,	\
+	0xdd, 0xa0, 0xb6, 0x11, 0x80, 0xf4, 0x14, 0x4f,	\
+	0x6b, 0x70, 0x75, 0xc3, 0x18, 0xa4, 0x9a, 0xe0,	\
+	0x00, 0x00, 0x99, 0x01, 0x0b, 0x8b, 0x58, 0xd3,	\
+	0x6a, 0xdb, 0x1e, 0x30, 0x53, 0x67, 0x2b, 0x17,	\
+	0xc5, 0xa1, 0x9f, 0x7f, 0x0a, 0x22, 0xf1, 0x0e,	\
+	0x94, 0x30, 0x44, 0x02, 0x20, 0x07, 0x5c, 0x4f,	\
+	0xd2, 0x83, 0xb6, 0x9f, 0x0a, 0x4a, 0x4d, 0x4b,	\
+	0x08, 0x35, 0xeb, 0xc0, 0x7e, 0x4a, 0x14, 0x2e,	\
+	0xc7, 0x8c, 0xd6, 0x64, 0x2f, 0xd3, 0x1e, 0xcc,	\
+	0xb5, 0xe8, 0x42, 0xea, 0xf6, 0x02, 0x20, 0x6b,	\
+	0x00, 0x00, 0x99, 0x01, 0x0c, 0x5a, 0xba, 0x4a,	\
+	0xc8, 0xd7, 0x89, 0xcc, 0x77, 0xe6, 0xb9, 0xa3,	\
+	0x34, 0xea, 0x06, 0x85, 0x72, 0xc6, 0x28, 0xa8,	\
+	0x7a, 0xaa, 0x19, 0x88, 0x34, 0xbb, 0xdc, 0x64,	\
+	0x90, 0x0a, 0xdb, 0x39, 0x90, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	\
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+#endif /* !_WIREDATA_U2F_H */
diff -Nru mysql-8.0-8.0.26/extra/libfido2/fuzz/wrap.c mysql-8.0-8.0.27/extra/libfido2/fuzz/wrap.c
--- mysql-8.0-8.0.26/extra/libfido2/fuzz/wrap.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/fuzz/wrap.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,549 @@
+/*
+ * Copyright (c) 2019 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <openssl/bn.h>
+#include <openssl/evp.h>
+#include <openssl/sha.h>
+
+#include <cbor.h>
+#include <fido.h>
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "mutator_aux.h"
+
+extern int prng_up;
+
+/*
+ * Build wrappers around functions of interest, and have them fail
+ * in a pseudo-random manner.
+ */
+
+#define WRAP(type, name, args, retval, param, prob)	\
+extern type __wrap_##name args;				\
+extern type __real_##name args;				\
+type __wrap_##name args {				\
+	if (prng_up && uniform_random(400) < (prob)) {	\
+		return (retval);			\
+	}						\
+							\
+	return (__real_##name param);			\
+}
+
+WRAP(void *,
+	malloc,
+	(size_t size),
+	NULL,
+	(size),
+	1
+)
+
+WRAP(void *,
+	calloc,
+	(size_t nmemb, size_t size),
+	NULL,
+	(nmemb, size),
+	1
+)
+
+WRAP(char *,
+	strdup,
+	(const char *s),
+	NULL,
+	(s),
+	1
+)
+
+WRAP(EVP_CIPHER_CTX *,
+	EVP_CIPHER_CTX_new,
+	(void),
+	NULL,
+	(),
+	1
+)
+
+WRAP(int, EVP_EncryptInit_ex,
+	(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, ENGINE *impl,
+	    const unsigned char *key, const unsigned char *iv),
+	0,
+	(ctx, type, impl, key, iv),
+	1
+)
+
+WRAP(int,
+	EVP_CIPHER_CTX_set_padding,
+	(EVP_CIPHER_CTX *x, int padding),
+	0,
+	(x, padding),
+	1
+)
+
+WRAP(int,
+	EVP_EncryptUpdate,
+	(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
+	    const unsigned char *in, int inl),
+	0,
+	(ctx, out, outl, in, inl),
+	1
+)
+
+WRAP(int,
+	EVP_DecryptInit_ex,
+	(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, ENGINE *impl,
+	    const unsigned char *key, const unsigned char *iv),
+	0,
+	(ctx, type, impl, key, iv),
+	1
+)
+
+WRAP(int,
+	EVP_DecryptUpdate,
+	(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
+	    const unsigned char *in, int inl),
+	0,
+	(ctx, out, outl, in, inl),
+	1
+)
+
+WRAP(int,
+	SHA256_Init,
+	(SHA256_CTX *c),
+	0,
+	(c),
+	1
+)
+
+WRAP(int,
+	SHA256_Update,
+	(SHA256_CTX *c, const void *data, size_t len),
+	0,
+	(c, data, len),
+	1
+)
+
+WRAP(int,
+	SHA256_Final,
+	(unsigned char *md, SHA256_CTX *c),
+	0,
+	(md, c),
+	1
+)
+
+WRAP(RSA *,
+	EVP_PKEY_get0_RSA,
+	(EVP_PKEY *pkey),
+	NULL,
+	(pkey),
+	1
+)
+
+WRAP(EC_KEY *,
+	EVP_PKEY_get0_EC_KEY,
+	(EVP_PKEY *pkey),
+	NULL,
+	(pkey),
+	1
+)
+
+WRAP(int,
+	EVP_PKEY_get_raw_public_key,
+	(const EVP_PKEY *pkey, unsigned char *pub, size_t *len),
+	0,
+	(pkey, pub, len),
+	1
+)
+
+WRAP(EVP_MD_CTX *,
+	EVP_MD_CTX_new,
+	(void),
+	NULL,
+	(),
+	1
+)
+
+WRAP(int,
+	EVP_DigestVerifyInit,
+	(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx, const EVP_MD *type, ENGINE *e,
+	    EVP_PKEY *pkey),
+	0,
+	(ctx, pctx, type, e, pkey),
+	1
+)
+
+WRAP(BIGNUM *,
+	BN_bin2bn,
+	(const unsigned char *s, int len, BIGNUM *ret),
+	NULL,
+	(s, len, ret),
+	1
+)
+
+WRAP(int,
+	BN_bn2bin,
+	(const BIGNUM *a, unsigned char *to),
+	-1,
+	(a, to),
+	1
+)
+
+WRAP(BIGNUM *,
+	BN_CTX_get,
+	(BN_CTX *ctx),
+	NULL,
+	(ctx),
+	1
+)
+
+WRAP(BN_CTX *,
+	BN_CTX_new,
+	(void),
+	NULL,
+	(),
+	1
+)
+
+WRAP(BIGNUM *,
+	BN_new,
+	(void),
+	NULL,
+	(),
+	1
+)
+
+WRAP(int,
+	RSA_set0_key,
+	(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d),
+	0,
+	(r, n, e, d),
+	1
+)
+
+WRAP(EC_KEY *,
+	EC_KEY_new_by_curve_name,
+	(int nid),
+	NULL,
+	(nid),
+	1
+)
+
+WRAP(const EC_GROUP *,
+	EC_KEY_get0_group,
+	(const EC_KEY *key),
+	NULL,
+	(key),
+	1
+)
+
+WRAP(const BIGNUM *,
+	EC_KEY_get0_private_key,
+	(const EC_KEY *key),
+	NULL,
+	(key),
+	1
+)
+
+WRAP(EC_POINT *,
+	EC_POINT_new,
+	(const EC_GROUP *group),
+	NULL,
+	(group),
+	1
+)
+
+WRAP(int,
+	EC_POINT_get_affine_coordinates_GFp,
+	(const EC_GROUP *group, const EC_POINT *p, BIGNUM *x, BIGNUM *y, BN_CTX *ctx),
+	0,
+	(group, p, x, y, ctx),
+	1
+)
+
+WRAP(EVP_PKEY *,
+	EVP_PKEY_new,
+	(void),
+	NULL,
+	(),
+	1
+)
+
+WRAP(int,
+	EVP_PKEY_assign,
+	(EVP_PKEY *pkey, int type, void *key),
+	0,
+	(pkey, type, key),
+	1
+)
+
+WRAP(int,
+	EVP_PKEY_keygen_init,
+	(EVP_PKEY_CTX *ctx),
+	0,
+	(ctx),
+	1
+)
+
+WRAP(int,
+	EVP_PKEY_keygen,
+	(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey),
+	0,
+	(ctx, ppkey),
+	1
+)
+
+WRAP(int,
+	EVP_PKEY_paramgen_init,
+	(EVP_PKEY_CTX *ctx),
+	0,
+	(ctx),
+	1
+)
+
+WRAP(int,
+	EVP_PKEY_paramgen,
+	(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey),
+	0,
+	(ctx, ppkey),
+	1
+)
+
+WRAP(EVP_PKEY *,
+	EVP_PKEY_new_raw_public_key,
+	(int type, ENGINE *e, const unsigned char *key, size_t keylen),
+	NULL,
+	(type, e, key, keylen),
+	1
+)
+
+WRAP(EVP_PKEY_CTX *,
+	EVP_PKEY_CTX_new,
+	(EVP_PKEY *pkey, ENGINE *e),
+	NULL,
+	(pkey, e),
+	1
+)
+
+WRAP(EVP_PKEY_CTX *,
+	EVP_PKEY_CTX_new_id,
+	(int id, ENGINE *e),
+	NULL,
+	(id, e),
+	1
+)
+
+WRAP(int,
+	EVP_PKEY_derive_init,
+	(EVP_PKEY_CTX *ctx),
+	0,
+	(ctx),
+	1
+)
+
+WRAP(int,
+	EVP_PKEY_derive_set_peer,
+	(EVP_PKEY_CTX *ctx, EVP_PKEY *peer),
+	0,
+	(ctx, peer),
+	1
+)
+
+WRAP(const EVP_MD *,
+	EVP_sha256,
+	(void),
+	NULL,
+	(),
+	1
+)
+
+WRAP(unsigned char *,
+	HMAC,
+	(const EVP_MD *evp_md, const void *key, int key_len,
+	    const unsigned char *d, int n, unsigned char *md,
+	    unsigned int *md_len),
+	NULL,
+	(evp_md, key, key_len, d, n, md, md_len),
+	1
+)
+
+WRAP(HMAC_CTX *,
+	HMAC_CTX_new,
+	(void),
+	NULL,
+	(),
+	1
+)
+
+WRAP(int,
+	HMAC_Init_ex,
+	(HMAC_CTX *ctx, const void *key, int key_len, const EVP_MD *md,
+	    ENGINE *impl),
+	0,
+	(ctx, key, key_len, md, impl),
+	1
+)
+
+WRAP(int,
+	HMAC_Update,
+	(HMAC_CTX *ctx, const unsigned char *data, int len),
+	0,
+	(ctx, data, len),
+	1
+)
+
+WRAP(int,
+	HMAC_Final,
+	(HMAC_CTX *ctx, unsigned char *md, unsigned int *len),
+	0,
+	(ctx, md, len),
+	1
+)
+
+WRAP(unsigned char *,
+	SHA256,
+	(const unsigned char *d, size_t n, unsigned char *md),
+	NULL,
+	(d, n, md),
+	1
+)
+
+WRAP(cbor_item_t *,
+	cbor_build_string,
+	(const char *val),
+	NULL,
+	(val),
+	1
+)
+
+WRAP(cbor_item_t *,
+	cbor_build_bytestring,
+	(cbor_data handle, size_t length),
+	NULL,
+	(handle, length),
+	1
+)
+
+WRAP(cbor_item_t *,
+	cbor_build_bool,
+	(bool value),
+	NULL,
+	(value),
+	1
+)
+
+WRAP(cbor_item_t *,
+	cbor_build_negint8,
+	(uint8_t value),
+	NULL,
+	(value),
+	1
+)
+
+WRAP(cbor_item_t *,
+	cbor_build_negint16,
+	(uint16_t value),
+	NULL,
+	(value),
+	1
+)
+
+WRAP(cbor_item_t *,
+	cbor_load,
+	(cbor_data source, size_t source_size, struct cbor_load_result *result),
+	NULL,
+	(source, source_size, result),
+	1
+)
+
+WRAP(cbor_item_t *,
+	cbor_build_uint8,
+	(uint8_t value),
+	NULL,
+	(value),
+	1
+)
+
+WRAP(cbor_item_t *,
+	cbor_build_uint32,
+	(uint32_t value),
+	NULL,
+	(value),
+	1
+)
+
+WRAP(struct cbor_pair *,
+	cbor_map_handle,
+	(const cbor_item_t *item),
+	NULL,
+	(item),
+	1
+)
+
+WRAP(cbor_item_t **,
+	cbor_array_handle,
+	(const cbor_item_t *item),
+	NULL,
+	(item),
+	1
+)
+
+WRAP(bool,
+	cbor_array_push,
+	(cbor_item_t *array, cbor_item_t *pushee),
+	false,
+	(array, pushee),
+	1
+)
+
+WRAP(bool,
+	cbor_map_add,
+	(cbor_item_t *item, struct cbor_pair pair),
+	false,
+	(item, pair),
+	1
+)
+
+WRAP(cbor_item_t *,
+	cbor_new_definite_map,
+	(size_t size),
+	NULL,
+	(size),
+	1
+)
+
+WRAP(cbor_item_t *,
+	cbor_new_definite_array,
+	(size_t size),
+	NULL,
+	(size),
+	1
+)
+
+WRAP(size_t,
+	cbor_serialize_alloc,
+	(const cbor_item_t *item, cbor_mutable_data *buffer,
+	    size_t *buffer_size),
+	0,
+	(item, buffer, buffer_size),
+	1
+)
+
+WRAP(int,
+	fido_tx,
+	(fido_dev_t *d, uint8_t cmd, const void *buf, size_t count),
+	-1,
+	(d, cmd, buf, count),
+	1
+)
+
+WRAP(int,
+	usleep,
+	(unsigned int usec),
+	-1,
+	(usec),
+	1
+)
diff -Nru mysql-8.0-8.0.26/extra/libfido2/fuzz/wrapped.sym mysql-8.0-8.0.27/extra/libfido2/fuzz/wrapped.sym
--- mysql-8.0-8.0.26/extra/libfido2/fuzz/wrapped.sym	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/fuzz/wrapped.sym	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,63 @@
+BN_bin2bn
+BN_bn2bin
+BN_CTX_get
+BN_CTX_new
+BN_new
+calloc
+cbor_array_handle
+cbor_array_push
+cbor_build_bool
+cbor_build_bytestring
+cbor_build_negint16
+cbor_build_negint8
+cbor_build_string
+cbor_build_uint32
+cbor_build_uint8
+cbor_load
+cbor_map_add
+cbor_map_handle
+cbor_new_definite_array
+cbor_new_definite_map
+cbor_serialize_alloc
+EC_KEY_get0_group
+EC_KEY_get0_private_key
+EC_KEY_new_by_curve_name
+EC_POINT_get_affine_coordinates_GFp
+EC_POINT_new
+EVP_CIPHER_CTX_new
+EVP_CIPHER_CTX_set_padding
+EVP_DecryptInit_ex
+EVP_DecryptUpdate
+EVP_DigestVerifyInit
+EVP_EncryptInit_ex
+EVP_EncryptUpdate
+EVP_MD_CTX_new
+EVP_PKEY_assign
+EVP_PKEY_CTX_new
+EVP_PKEY_CTX_new_id
+EVP_PKEY_derive_init
+EVP_PKEY_derive_set_peer
+EVP_PKEY_get0_EC_KEY
+EVP_PKEY_get0_RSA
+EVP_PKEY_get_raw_public_key
+EVP_PKEY_keygen
+EVP_PKEY_keygen_init
+EVP_PKEY_new
+EVP_PKEY_new_raw_public_key
+EVP_PKEY_paramgen
+EVP_PKEY_paramgen_init
+EVP_sha256
+fido_tx
+HMAC
+HMAC_CTX_new
+HMAC_Final
+HMAC_Init_ex
+HMAC_Update
+malloc
+RSA_set0_key
+SHA256
+SHA256_Final
+SHA256_Init
+SHA256_Update
+strdup
+usleep
diff -Nru mysql-8.0-8.0.26/extra/libfido2/LICENSE mysql-8.0-8.0.27/extra/libfido2/LICENSE
--- mysql-8.0-8.0.26/extra/libfido2/LICENSE	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/LICENSE	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,24 @@
+Copyright (c) 2018 Yubico AB. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+   2. Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in
+      the documentation and/or other materials provided with the
+      distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff -Nru mysql-8.0-8.0.26/extra/libfido2/man/CMakeLists.txt mysql-8.0-8.0.27/extra/libfido2/man/CMakeLists.txt
--- mysql-8.0-8.0.26/extra/libfido2/man/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/man/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,334 @@
+# Copyright (c) 2018 Yubico AB. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+find_program(MANDOC_PATH mandoc)
+find_program(GZIP_PATH gzip)
+
+message(STATUS "MANDOC_PATH: ${MANDOC_PATH}")
+message(STATUS "GZIP_PATH: ${GZIP_PATH}")
+
+list(APPEND MAN_SOURCES
+	eddsa_pk_new.3
+	es256_pk_new.3
+	fido2-assert.1
+	fido2-cred.1
+	fido2-token.1
+	fido_init.3
+	fido_assert_new.3
+	fido_assert_allow_cred.3
+	fido_assert_set_authdata.3
+	fido_assert_verify.3
+	fido_bio_dev_get_info.3
+	fido_bio_enroll_new.3
+	fido_bio_info_new.3
+	fido_bio_template.3
+	fido_cbor_info_new.3
+	fido_cred_new.3
+	fido_cred_exclude.3
+	fido_credman_metadata_new.3
+	fido_cred_set_authdata.3
+	fido_cred_verify.3
+	fido_dev_get_assert.3
+	fido_dev_get_touch_begin.3
+	fido_dev_info_manifest.3
+	fido_dev_make_cred.3
+	fido_dev_open.3
+	fido_dev_set_io_functions.3
+	fido_dev_set_pin.3
+	fido_strerr.3
+	rs256_pk_new.3
+)
+
+list(APPEND MAN_ALIAS
+	eddsa_pk_new eddsa_pk_free
+	eddsa_pk_new eddsa_pk_from_ptr
+	eddsa_pk_new eddsa_pk_to_EVP_PKEY
+	es256_pk_new es256_pk_free
+	es256_pk_new es256_pk_from_EC_KEY
+	es256_pk_new es256_pk_from_ptr
+	es256_pk_new es256_pk_to_EVP_PKEY
+	fido_assert_new fido_assert_authdata_len
+	fido_assert_new fido_assert_authdata_ptr
+	fido_assert_new fido_assert_clientdata_hash_len
+	fido_assert_new fido_assert_clientdata_hash_ptr
+	fido_assert_new fido_assert_count
+	fido_assert_new fido_assert_flags
+	fido_assert_new fido_assert_free
+	fido_assert_new fido_assert_hmac_secret_len
+	fido_assert_new fido_assert_hmac_secret_ptr
+	fido_assert_new fido_assert_id_len
+	fido_assert_new fido_assert_id_ptr
+	fido_assert_new fido_assert_rp_id
+	fido_assert_new fido_assert_sigcount
+	fido_assert_new fido_assert_sig_len
+	fido_assert_new fido_assert_sig_ptr
+	fido_assert_new fido_assert_user_display_name
+	fido_assert_new fido_assert_user_icon
+	fido_assert_new fido_assert_user_id_len
+	fido_assert_new fido_assert_user_id_ptr
+	fido_assert_new fido_assert_user_name
+	fido_assert_set_authdata fido_assert_set_clientdata_hash
+	fido_assert_set_authdata fido_assert_set_count
+	fido_assert_set_authdata fido_assert_set_extensions
+	fido_assert_set_authdata fido_assert_set_hmac_salt
+	fido_assert_set_authdata fido_assert_set_rp
+	fido_assert_set_authdata fido_assert_set_sig
+	fido_assert_set_authdata fido_assert_set_up
+	fido_assert_set_authdata fido_assert_set_uv
+	fido_bio_dev_get_info fido_bio_dev_enroll_begin
+	fido_bio_dev_get_info fido_bio_dev_enroll_cancel
+	fido_bio_dev_get_info fido_bio_dev_enroll_continue
+	fido_bio_dev_get_info fido_bio_dev_enroll_remove
+	fido_bio_dev_get_info fido_bio_dev_get_template_array
+	fido_bio_dev_get_info fido_bio_dev_set_template_name
+	fido_bio_enroll_new fido_bio_enroll_free
+	fido_bio_enroll_new fido_bio_enroll_last_status
+	fido_bio_enroll_new fido_bio_enroll_remaining_samples
+	fido_bio_info_new fido_bio_info_free
+	fido_bio_info_new fido_bio_info_max_samples
+	fido_bio_info_new fido_bio_info_type
+	fido_bio_template fido_bio_template_array_count
+	fido_bio_template fido_bio_template_array_free
+	fido_bio_template fido_bio_template_array_new
+	fido_bio_template fido_bio_template_free
+	fido_bio_template fido_bio_template_id_len
+	fido_bio_template fido_bio_template_id_ptr
+	fido_bio_template fido_bio_template_name
+	fido_bio_template fido_bio_template_new
+	fido_bio_template fido_bio_template_set_id
+	fido_bio_template fido_bio_template_set_name
+	fido_cbor_info_new fido_cbor_info_aaguid_len
+	fido_cbor_info_new fido_cbor_info_aaguid_ptr
+	fido_cbor_info_new fido_cbor_info_extensions_len
+	fido_cbor_info_new fido_cbor_info_extensions_ptr
+	fido_cbor_info_new fido_cbor_info_free
+	fido_cbor_info_new fido_cbor_info_maxmsgsiz
+	fido_cbor_info_new fido_cbor_info_maxcredcntlst;
+	fido_cbor_info_new fido_cbor_info_maxcredidlen;
+	fido_cbor_info_new fido_cbor_info_fwversion
+	fido_cbor_info_new fido_cbor_info_options_len
+	fido_cbor_info_new fido_cbor_info_options_name_ptr
+	fido_cbor_info_new fido_cbor_info_options_value_ptr
+	fido_cbor_info_new fido_cbor_info_protocols_len
+	fido_cbor_info_new fido_cbor_info_protocols_ptr
+	fido_cbor_info_new fido_cbor_info_versions_len
+	fido_cbor_info_new fido_cbor_info_versions_ptr
+	fido_cbor_info_new fido_dev_get_cbor_info
+	fido_cred_new fido_cred_authdata_len
+	fido_cred_new fido_cred_authdata_ptr
+	fido_cred_new fido_cred_clientdata_hash_len
+	fido_cred_new fido_cred_clientdata_hash_ptr
+	fido_cred_new fido_cred_display_name
+	fido_cred_new fido_cred_flags
+	fido_cred_new fido_cred_fmt
+	fido_cred_new fido_cred_free
+	fido_cred_new fido_cred_id_len
+	fido_cred_new fido_cred_id_ptr
+	fido_cred_new fido_cred_aaguid_len
+	fido_cred_new fido_cred_aaguid_ptr
+	fido_cred_new fido_cred_prot
+	fido_cred_new fido_cred_pubkey_len
+	fido_cred_new fido_cred_pubkey_ptr
+	fido_cred_new fido_cred_rp_id
+	fido_cred_new fido_cred_rp_name
+	fido_cred_new fido_cred_sig_len
+	fido_cred_new fido_cred_sig_ptr
+	fido_cred_new fido_cred_type
+	fido_cred_new fido_cred_user_name
+	fido_cred_new fido_cred_user_id_len
+	fido_cred_new fido_cred_user_id_ptr
+	fido_cred_new fido_cred_x5c_len
+	fido_cred_new fido_cred_x5c_ptr
+	fido_credman_metadata_new fido_credman_del_dev_rk
+	fido_credman_metadata_new fido_credman_get_dev_metadata
+	fido_credman_metadata_new fido_credman_get_dev_rk
+	fido_credman_metadata_new fido_credman_get_dev_rp
+	fido_credman_metadata_new fido_credman_metadata_free
+	fido_credman_metadata_new fido_credman_rk
+	fido_credman_metadata_new fido_credman_rk_count
+	fido_credman_metadata_new fido_credman_rk_existing
+	fido_credman_metadata_new fido_credman_rk_free
+	fido_credman_metadata_new fido_credman_rk_new
+	fido_credman_metadata_new fido_credman_rk_remaining
+	fido_credman_metadata_new fido_credman_rp_count
+	fido_credman_metadata_new fido_credman_rp_free
+	fido_credman_metadata_new fido_credman_rp_id
+	fido_credman_metadata_new fido_credman_rp_id_hash_len
+	fido_credman_metadata_new fido_credman_rp_id_hash_ptr
+	fido_credman_metadata_new fido_credman_rp_name
+	fido_credman_metadata_new fido_credman_rp_new
+	fido_cred_set_authdata fido_cred_set_authdata_raw
+	fido_cred_set_authdata fido_cred_set_clientdata_hash
+	fido_cred_set_authdata fido_cred_set_extensions
+	fido_cred_set_authdata fido_cred_set_fmt
+	fido_cred_set_authdata fido_cred_set_prot
+	fido_cred_set_authdata fido_cred_set_rk
+	fido_cred_set_authdata fido_cred_set_rp
+	fido_cred_set_authdata fido_cred_set_sig
+	fido_cred_set_authdata fido_cred_set_type
+	fido_cred_set_authdata fido_cred_set_user
+	fido_cred_set_authdata fido_cred_set_uv
+	fido_cred_set_authdata fido_cred_set_x509
+	fido_dev_info_manifest fido_dev_info_free
+	fido_dev_info_manifest fido_dev_info_manufacturer_string
+	fido_dev_info_manifest fido_dev_info_new
+	fido_dev_info_manifest fido_dev_info_path
+	fido_dev_info_manifest fido_dev_info_product
+	fido_dev_info_manifest fido_dev_info_product_string
+	fido_dev_info_manifest fido_dev_info_ptr
+	fido_dev_info_manifest fido_dev_info_vendor
+	fido_dev_open fido_dev_build
+	fido_dev_open fido_dev_cancel
+	fido_dev_open fido_dev_close
+	fido_dev_open fido_dev_flags
+	fido_dev_open fido_dev_force_fido2
+	fido_dev_open fido_dev_force_u2f
+	fido_dev_open fido_dev_free
+	fido_dev_open fido_dev_is_fido2
+	fido_dev_open fido_dev_supports_cred_prot
+	fido_dev_open fido_dev_supports_pin
+	fido_dev_open fido_dev_major
+	fido_dev_open fido_dev_minor
+	fido_dev_open fido_dev_new
+	fido_dev_open fido_dev_protocol
+	fido_dev_set_pin fido_dev_get_retry_count
+	fido_dev_set_pin fido_dev_reset
+	rs256_pk_new rs256_pk_free
+	rs256_pk_new rs256_pk_from_ptr
+	rs256_pk_new rs256_pk_from_RSA
+	rs256_pk_new rs256_pk_to_EVP_PKEY
+)
+
+list(LENGTH MAN_ALIAS MAN_ALIAS_LEN)
+math(EXPR MAN_ALIAS_MAX "${MAN_ALIAS_LEN} - 2")
+
+# man_copy
+foreach(f ${MAN_SOURCES})
+	add_custom_command(OUTPUT ${f}
+		COMMAND cp -f ${CMAKE_SOURCE_DIR}/man/${f} .
+		DEPENDS ${f})
+	list(APPEND COPY_FILES ${f})
+endforeach()
+
+# man_lint
+foreach(f ${MAN_SOURCES})
+	add_custom_command(OUTPUT ${f}.lint
+		COMMAND mandoc -T lint -W warning ${f} > ${f}.lint
+		DEPENDS ${f})
+	list(APPEND LINT_FILES ${f}.lint)
+endforeach()
+
+# man_html
+foreach(f ${MAN_SOURCES})
+	string(REGEX REPLACE ".[13]" "" g ${f})
+	add_custom_command(OUTPUT ${g}.html
+		COMMAND mandoc -T html -O man="%N.html",style=style.css -I os="Yubico AB" ${f} > ${g}.html
+		DEPENDS ${f})
+	list(APPEND HTML_FILES ${g}.html)
+endforeach()
+
+# man_html_partial
+foreach(f ${MAN_SOURCES})
+	string(REGEX REPLACE ".[13]" "" g ${f})
+	add_custom_command(OUTPUT ${g}.partial
+		COMMAND cat ${CMAKE_SOURCE_DIR}/man/dyc.css > ${g}.partial
+		COMMAND mandoc -T html -O man="%N.html",fragment ${f} >> ${g}.partial
+		DEPENDS ${f})
+	list(APPEND HTML_PARTIAL_FILES ${g}.partial)
+endforeach()
+
+# man_gzip
+foreach(f ${MAN_SOURCES})
+	add_custom_command(OUTPUT ${f}.gz
+		COMMAND gzip -cn ${f} > ${f}.gz
+		DEPENDS ${f})
+	list(APPEND GZ_FILES ${f}.gz)
+endforeach()
+
+macro(define_symlink_target NAME EXT)
+	foreach(i RANGE 0 ${MAN_ALIAS_MAX} 2)
+		math(EXPR j "${i} + 1")
+		list(GET MAN_ALIAS ${i} SRC)
+		list(GET MAN_ALIAS ${j} DST)
+		add_custom_command(OUTPUT ${DST}.${EXT}
+			COMMAND ln -sf ${SRC}.${EXT} ${DST}.${EXT})
+		list(APPEND ${NAME}_LINK_FILES ${DST}.${EXT})
+	endforeach()
+	add_custom_target(${NAME} DEPENDS ${${NAME}_LINK_FILES})
+endmacro()
+
+add_custom_target(man_copy DEPENDS ${COPY_FILES})
+add_custom_target(man_lint DEPENDS ${LINT_FILES})
+add_custom_target(man_html DEPENDS ${HTML_FILES})
+add_custom_target(man_html_partial DEPENDS ${HTML_PARTIAL_FILES})
+add_custom_target(man_gzip DEPENDS ${GZ_FILES})
+
+define_symlink_target(man_symlink 3)
+define_symlink_target(man_symlink_html html)
+define_symlink_target(man_symlink_html_partial partial)
+define_symlink_target(man_symlink_gzip 3.gz)
+
+add_dependencies(man_symlink man_copy)
+add_dependencies(man_lint man_symlink)
+add_dependencies(man_html man_lint)
+add_dependencies(man_symlink_html man_html)
+add_dependencies(man_html_partial man_lint)
+add_dependencies(man_symlink_html_partial man_html_partial)
+add_custom_target(man ALL)
+
+if(MANDOC_PATH)
+	add_dependencies(man man_symlink_html)
+	add_dependencies(man_gzip man_lint)
+	install(FILES ${CMAKE_SOURCE_DIR}/man/style.css
+		DESTINATION "${CMAKE_INSTALL_DOCDIR}/html")
+	foreach(f ${MAN_SOURCES})
+		string(REGEX REPLACE ".[13]" "" f ${f})
+		install(FILES ${CMAKE_BINARY_DIR}/man/${f}.html
+			DESTINATION "${CMAKE_INSTALL_DOCDIR}/html")
+	endforeach()
+	foreach(i RANGE 0 ${MAN_ALIAS_MAX} 2)
+		math(EXPR j "${i} + 1")
+		list(GET MAN_ALIAS ${j} DST)
+		install(FILES ${CMAKE_BINARY_DIR}/man/${DST}.html
+			DESTINATION "${CMAKE_INSTALL_DOCDIR}/html")
+	endforeach()
+endif()
+
+if(GZIP_PATH)
+	add_dependencies(man_gzip man_copy)
+	add_dependencies(man_symlink_gzip man_gzip)
+	add_dependencies(man man_symlink_gzip)
+	foreach(f ${MAN_SOURCES})
+		if (${f} MATCHES ".1$")
+			install(FILES ${CMAKE_BINARY_DIR}/man/${f}.gz
+				DESTINATION "${CMAKE_INSTALL_MANDIR}/man1")
+		elseif(${f} MATCHES ".3$")
+			install(FILES ${CMAKE_BINARY_DIR}/man/${f}.gz
+				DESTINATION "${CMAKE_INSTALL_MANDIR}/man3")
+		endif()
+	endforeach()
+	foreach(i RANGE 0 ${MAN_ALIAS_MAX} 2)
+		math(EXPR j "${i} + 1")
+		list(GET MAN_ALIAS ${j} DST)
+		install(FILES ${CMAKE_BINARY_DIR}/man/${DST}.3.gz
+			DESTINATION "${CMAKE_INSTALL_MANDIR}/man3")
+	endforeach()
+elseif(NOT MSVC)
+	add_dependencies(man man_symlink)
+	foreach(f ${MAN_SOURCES})
+		if (${f} MATCHES ".1$")
+			install(FILES ${CMAKE_BINARY_DIR}/man/${f}
+				DESTINATION "${CMAKE_INSTALL_MANDIR}/man1")
+		elseif(${f} MATCHES ".3$")
+			install(FILES ${CMAKE_BINARY_DIR}/man/${f}
+				DESTINATION "${CMAKE_INSTALL_MANDIR}/man3")
+		endif()
+	endforeach()
+	foreach(i RANGE 0 ${MAN_ALIAS_MAX} 2)
+		math(EXPR j "${i} + 1")
+		list(GET MAN_ALIAS ${j} DST)
+		install(FILES ${CMAKE_BINARY_DIR}/man/${DST}.3
+			DESTINATION "${CMAKE_INSTALL_MANDIR}/man3")
+	endforeach()
+endif()
diff -Nru mysql-8.0-8.0.26/extra/libfido2/man/dyc.css mysql-8.0-8.0.27/extra/libfido2/man/dyc.css
--- mysql-8.0-8.0.26/extra/libfido2/man/dyc.css	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/man/dyc.css	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,14 @@
+<style>
+    table.head, table.foot { width: 100%; }
+    td.head-rtitle, td.foot-os { text-align: right; }
+    td.head-vol { text-align: center; }
+    div.Pp { margin: 1ex 0ex; }
+    div.Nd, div.Bf, div.Op { display: inline; }
+    span.Pa, span.Ad { font-style: italic; }
+    span.Ms { font-weight: bold; }
+    dl.Bl-diag > dt { font-weight: bold; }
+    code.Nm, code.Fl, code.Cm, code.Ic, code.In, code.Fd, code.Fn,
+    code.Cd { font-weight: bold; font-family: monospace; }
+    var { font-family: monospace; }
+    .Sh { font-size: 1.5em; padding-top: 1em; padding-bottom: 1em; }
+</style>
diff -Nru mysql-8.0-8.0.26/extra/libfido2/man/eddsa_pk_new.3 mysql-8.0-8.0.27/extra/libfido2/man/eddsa_pk_new.3
--- mysql-8.0-8.0.26/extra/libfido2/man/eddsa_pk_new.3	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/man/eddsa_pk_new.3	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,122 @@
+.\" Copyright (c) 2019 Yubico AB. All rights reserved.
+.\" Use of this source code is governed by a BSD-style
+.\" license that can be found in the LICENSE file.
+.\"
+.Dd $Mdocdate: May 15 2019 $
+.Dt EDDSA_PK_NEW 3
+.Os
+.Sh NAME
+.Nm eddsa_pk_new ,
+.Nm eddsa_pk_free ,
+.Nm eddsa_pk_from_EVP_PKEY ,
+.Nm eddsa_pk_from_ptr ,
+.Nm eddsa_pk_to_EVP_PKEY
+.Nd FIDO 2 COSE EDDSA API
+.Sh SYNOPSIS
+.In openssl/evp.h
+.In fido/eddsa.h
+.Ft eddsa_pk_t *
+.Fn eddsa_pk_new "void"
+.Ft void
+.Fn eddsa_pk_free "eddsa_pk_t **pkp"
+.Ft int
+.Fn eddsa_pk_from_EVP_PKEY "eddsa_pk_t *pk" "const EVP_PKEY *pkey"
+.Ft int
+.Fn eddsa_pk_from_ptr "eddsa_pk_t *pk" "const void *ptr" "size_t len"
+.Ft EVP_PKEY *
+.Fn eddsa_pk_to_EVP_PKEY "const eddsa_pk_t *pk"
+.Sh DESCRIPTION
+EDDSA is the name given in the CBOR Object Signing and Encryption
+(COSE) RFC to EDDSA over Curve25519 with SHA-512.
+The COSE EDDSA API of
+.Em libfido2
+is an auxiliary API with routines to convert between the different
+EDDSA public key types used in
+.Em libfido2
+and
+.Em OpenSSL .
+.Pp
+In
+.Em libfido2 ,
+EDDSA public keys are abstracted by the
+.Vt eddsa_pk_t
+type.
+.Pp
+The
+.Fn eddsa_pk_new
+function returns a pointer to a newly allocated, empty
+.Vt eddsa_pk_t
+type.
+If memory cannot be allocated, NULL is returned.
+.Pp
+The
+.Fn eddsa_pk_free
+function releases the memory backing
+.Fa *pkp ,
+where
+.Fa *pkp
+must have been previously allocated by
+.Fn eddsa_pk_new .
+On return,
+.Fa *pkp
+is set to NULL.
+Either
+.Fa pkp
+or
+.Fa *pkp
+may be NULL, in which case
+.Fn eddsa_pk_free
+is a NOP.
+.Pp
+The
+.Fn eddsa_pk_from_EVP_PKEY
+function fills
+.Fa pk
+with the contents of
+.Fa pkey .
+No references to
+.Fa pkey
+are kept.
+.Pp
+The
+.Fn eddsa_pk_from_ptr
+function fills
+.Fa pk
+with the contents of
+.Fa ptr ,
+where
+.Fa ptr
+points to
+.Fa len
+bytes.
+No references to
+.Fa ptr
+are kept.
+.Pp
+The
+.Fn eddsa_pk_to_EVP_PKEY
+function converts
+.Fa pk
+to a newly allocated
+.Fa EVP_PKEY
+type with a reference count of 1.
+No internal references to the returned pointer are kept.
+If an error occurs,
+.Fn eddsa_pk_to_EVP_PKEY
+returns NULL.
+.Sh RETURN VALUES
+The
+.Fn eddsa_pk_from_EC_KEY
+and
+.Fn eddsa_pk_from_ptr
+functions return
+.Dv FIDO_OK
+on success.
+On error, a different error code defined in
+.In fido/err.h
+is returned.
+.Sh SEE ALSO
+.Xr es256_pk_new 3 ,
+.Xr fido_assert_verify 3 ,
+.Xr fido_cred_pubkey_ptr 3 ,
+.Xr rs256_pk_new 3
diff -Nru mysql-8.0-8.0.26/extra/libfido2/man/es256_pk_new.3 mysql-8.0-8.0.27/extra/libfido2/man/es256_pk_new.3
--- mysql-8.0-8.0.26/extra/libfido2/man/es256_pk_new.3	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/man/es256_pk_new.3	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,126 @@
+.\" Copyright (c) 2018 Yubico AB. All rights reserved.
+.\" Use of this source code is governed by a BSD-style
+.\" license that can be found in the LICENSE file.
+.\"
+.Dd $Mdocdate: May 24 2018 $
+.Dt ES256_PK_NEW 3
+.Os
+.Sh NAME
+.Nm es256_pk_new ,
+.Nm es256_pk_free ,
+.Nm es256_pk_from_EC_KEY ,
+.Nm es256_pk_from_ptr ,
+.Nm es256_pk_to_EVP_PKEY
+.Nd FIDO 2 COSE ES256 API
+.Sh SYNOPSIS
+.In openssl/ec.h
+.In fido/es256.h
+.Ft es256_pk_t *
+.Fn es256_pk_new "void"
+.Ft void
+.Fn es256_pk_free "es256_pk_t **pkp"
+.Ft int
+.Fn es256_pk_from_EC_KEY "es256_pk_t *pk" "const EC_KEY *ec"
+.Ft int
+.Fn es256_pk_from_ptr "es256_pk_t *pk" "const void *ptr" "size_t len"
+.Ft EVP_PKEY *
+.Fn es256_pk_to_EVP_PKEY "const es256_pk_t *pk"
+.Sh DESCRIPTION
+ES256 is the name given in the CBOR Object Signing and Encryption
+(COSE) RFC to ECDSA over P-256 with SHA-256.
+The COSE ES256 API of
+.Em libfido2
+is an auxiliary API with routines to convert between the different
+ECDSA public key types used in
+.Em libfido2
+and
+.Em OpenSSL .
+.Pp
+In
+.Em libfido2 ,
+ES256 public keys are abstracted by the
+.Vt es256_pk_t
+type.
+.Pp
+The
+.Fn es256_pk_new
+function returns a pointer to a newly allocated, empty
+.Vt es256_pk_t
+type.
+If memory cannot be allocated, NULL is returned.
+.Pp
+The
+.Fn es256_pk_free
+function releases the memory backing
+.Fa *pkp ,
+where
+.Fa *pkp
+must have been previously allocated by
+.Fn es256_pk_new .
+On return,
+.Fa *pkp
+is set to NULL.
+Either
+.Fa pkp
+or
+.Fa *pkp
+may be NULL, in which case
+.Fn es256_pk_free
+is a NOP.
+.Pp
+The
+.Fn es256_pk_from_EC_KEY
+function fills
+.Fa pk
+with the contents of
+.Fa ec .
+No references to
+.Fa ec
+are kept.
+.Pp
+The
+.Fn es256_pk_from_ptr
+function fills
+.Fa pk
+with the contents of
+.Fa ptr ,
+where
+.Fa ptr
+points to
+.Fa len
+bytes.
+The
+.Fa ptr
+pointer may point to an uncompressed point, or to the
+concatenation of the x and y coordinates.
+No references to
+.Fa ptr
+are kept.
+.Pp
+The
+.Fn es256_pk_to_EVP_PKEY
+function converts
+.Fa pk
+to a newly allocated
+.Fa EVP_PKEY
+type with a reference count of 1.
+No internal references to the returned pointer are kept.
+If an error occurs,
+.Fn es256_pk_to_EVP_PKEY
+returns NULL.
+.Sh RETURN VALUES
+The
+.Fn es256_pk_from_EC_KEY
+and
+.Fn es256_pk_from_ptr
+functions return
+.Dv FIDO_OK
+on success.
+On error, a different error code defined in
+.In fido/err.h
+is returned.
+.Sh SEE ALSO
+.Xr eddsa_pk_new 3 ,
+.Xr fido_assert_verify 3 ,
+.Xr fido_cred_pubkey_ptr 3 ,
+.Xr rs256_pk_new 3
diff -Nru mysql-8.0-8.0.26/extra/libfido2/man/fido2-assert.1 mysql-8.0-8.0.27/extra/libfido2/man/fido2-assert.1
--- mysql-8.0-8.0.26/extra/libfido2/man/fido2-assert.1	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/man/fido2-assert.1	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,245 @@
+.\" Copyright (c) 2018 Yubico AB. All rights reserved.
+.\" Use of this source code is governed by a BSD-style
+.\" license that can be found in the LICENSE file.
+.\"
+.Dd $Mdocdate: November 5 2019 $
+.Dt FIDO2-ASSERT 1
+.Os
+.Sh NAME
+.Nm fido2-assert
+.Nd get/verify a FIDO 2 assertion
+.Sh SYNOPSIS
+.Nm
+.Fl G
+.Op Fl dhpruv
+.Op Fl t Ar option
+.Op Fl i Ar input_file
+.Op Fl o Ar output_file
+.Ar device
+.Nm
+.Fl V
+.Op Fl dhpv
+.Op Fl i Ar input_file
+.Ar key_file
+.Op Ar type
+.Sh DESCRIPTION
+.Nm
+gets or verifies a FIDO 2 assertion.
+.Pp
+The input of
+.Nm
+is defined by the parameters of the assertion to be obtained/verified.
+See the
+.Sx INPUT FORMAT
+section for details.
+.Pp
+The output of
+.Nm
+is defined by the result of the selected operation.
+See the
+.Sx OUTPUT FORMAT
+section for details.
+.Pp
+If an assertion is successfully obtained or verified,
+.Nm
+exits 0.
+Otherwise,
+.Nm
+exits 1.
+.Pp
+The options are as follows:
+.Bl -tag -width Ds
+.It Fl G
+Tells
+.Nm
+to obtain a new assertion from
+.Ar device .
+.It Fl V
+Tells
+.Nm
+to verify an assertion using the PEM-encoded public key in
+.Ar key_file
+of type
+.Ar type ,
+where
+.Ar type
+may be
+.Em es256
+(denoting ECDSA over NIST P-256 with SHA-256),
+.Em rs256
+(denoting 2048-bit RSA with PKCS#1.5 padding and SHA-256), or
+.Em eddsa
+(denoting EDDSA over Curve25519 with SHA-512).
+If
+.Ar type
+is not specified,
+.Em es256
+is assumed.
+.It Fl h
+If obtaining an assertion, enable the FIDO2 hmac-secret
+extension.
+If verifying an assertion, check whether the extension data bit was
+signed by the authenticator.
+.It Fl d
+Causes
+.Nm
+to emit debugging output on
+.Em stderr .
+.It Fl i Ar input_file
+Tells
+.Nm
+to read the parameters of the assertion from
+.Ar input_file
+instead of
+.Em stdin .
+.It Fl o Ar output_file
+Tells
+.Nm
+to write output on
+.Ar output_file
+instead of
+.Em stdout .
+.It Fl p
+If obtaining an assertion, request user presence.
+If verifying an assertion, check whether the user presence bit was
+signed by the authenticator.
+.It Fl r
+Obtain an assertion using a resident credential.
+If
+.Fl r
+is specified,
+.Nm
+will not expect a credential id in its input, and may output
+multiple assertions.
+.It Fl t Ar option
+Toggles a key/value
+.Ar option ,
+where
+.Ar option
+is a string of the form
+.Dq key=value .
+The options supported at present are:
+.Bl -tag -width Ds
+.It Cm up Ns = Ns Ar true|false
+Asks the authenticator for user presence to be enabled or disabled.
+.It Cm uv Ns = Ns Ar true|false
+Asks the authenticator for user verification to be enabled or
+disabled.
+.It Cm pin Ns = Ns Ar true|false
+Tells
+.Nm
+whether to prompt for a PIN and request user verification.
+.El
+.Pp
+The
+.Fl t
+option may be specified multiple times.
+.It Fl u
+Obtain an assertion using U2F.
+By default,
+.Nm
+will use FIDO2 if supported by the authenticator, and fallback to
+U2F otherwise.
+.It Fl v
+If obtaining an assertion, prompt the user for a PIN and request
+user verification from the authenticator.
+If verifying an assertion, check whether the user verification bit
+was signed by the authenticator.
+.El
+.Pp
+If a
+.Em tty
+is available,
+.Nm
+will use it to obtain the PIN.
+Otherwise,
+.Em stdin
+is used.
+.Sh INPUT FORMAT
+The input of
+.Nm
+consists of base64 blobs and UTF-8 strings separated
+by newline characters ('\\n').
+.Pp
+When obtaining an assertion,
+.Nm
+expects its input to consist of:
+.Pp
+.Bl -enum -offset indent -compact
+.It
+client data hash (base64 blob);
+.It
+relying party id (UTF-8 string);
+.It
+credential id, if credential not resident (base64 blob);
+.It
+hmac salt, if the FIDO2 hmac-secret extension is enabled
+(base64 blob);
+.El
+.Pp
+When verifying an assertion,
+.Nm
+expects its input to consist of:
+.Pp
+.Bl -enum -offset indent -compact
+.It
+client data hash (base64 blob);
+.It
+relying party id (UTF-8 string);
+.It
+authenticator data (base64 blob);
+.It
+assertion signature (base64 blob);
+.El
+.Pp
+UTF-8 strings passed to
+.Nm
+must not contain embedded newline or NUL characters.
+.Sh OUTPUT FORMAT
+The output of
+.Nm
+consists of base64 blobs and UTF-8 strings separated
+by newline characters ('\\n').
+.Pp
+For each generated assertion,
+.Nm
+outputs:
+.Pp
+.Bl -enum -offset indent -compact
+.It
+client data hash (base64 blob);
+.It
+relying party id (UTF-8 string);
+.It
+authenticator data (base64 blob);
+.It
+assertion signature (base64 blob);
+.It
+user id, if credential resident (base64 blob);
+.It
+hmac secret, if the FIDO2 hmac-secret extension is enabled
+(base64 blob);
+.El
+.Pp
+When verifying an assertion,
+.Nm
+produces no output.
+.Sh EXAMPLES
+Assuming
+.Pa cred
+contains a
+.Em es256
+credential created according to the steps outlined in
+.Xr fido2-cred 1 ,
+obtain an assertion from an authenticator at
+.Pa /dev/hidraw5
+and verify it:
+.Pp
+.Dl $ echo assertion challenge | openssl sha256 -binary | base64 > assert_param
+.Dl $ echo relying party >> assert_param
+.Dl $ head -1 cred >> assert_param
+.Dl $ tail -n +2 cred > pubkey
+.Dl $ fido2-assert -G -i assert_param /dev/hidraw5 | fido2-assert -V pubkey es256
+.Sh SEE ALSO
+.Xr fido2-cred 1 ,
+.Xr fido2-token 1
diff -Nru mysql-8.0-8.0.26/extra/libfido2/man/fido2-cred.1 mysql-8.0-8.0.27/extra/libfido2/man/fido2-cred.1
--- mysql-8.0-8.0.26/extra/libfido2/man/fido2-cred.1	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/man/fido2-cred.1	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,246 @@
+.\" Copyright (c) 2018 Yubico AB. All rights reserved.
+.\" Use of this source code is governed by a BSD-style
+.\" license that can be found in the LICENSE file.
+.\"
+.Dd $Mdocdate: November 5 2019 $
+.Dt FIDO2-CRED 1
+.Os
+.Sh NAME
+.Nm fido2-cred
+.Nd make/verify a FIDO 2 credential
+.Sh SYNOPSIS
+.Nm
+.Fl M
+.Op Fl dhqruv
+.Op Fl c Ar cred_protect
+.Op Fl i Ar input_file
+.Op Fl o Ar output_file
+.Ar device
+.Op Ar type
+.Nm
+.Fl V
+.Op Fl dhv
+.Op Fl c Ar cred_protect
+.Op Fl i Ar input_file
+.Op Fl o Ar output_file
+.Op Ar type
+.Sh DESCRIPTION
+.Nm
+makes or verifies a FIDO 2 credential.
+.Pp
+A credential
+.Ar type
+may be
+.Em es256
+(denoting ECDSA over NIST P-256 with SHA-256),
+.Em rs256
+(denoting 2048-bit RSA with PKCS#1.5 padding and SHA-256), or
+.Em eddsa
+(denoting EDDSA over Curve25519 with SHA-512).
+If
+.Ar type
+is not specified,
+.Em es256
+is assumed.
+.Pp
+When making a credential, the authenticator may require the user
+to authenticate with a PIN.
+If the
+.Fl q
+option is not specified,
+.Nm
+will prompt the user for the PIN.
+If a
+.Em tty
+is available,
+.Nm
+will use it to obtain the PIN.
+Otherwise,
+.Em stdin
+is used.
+.Pp
+The input of
+.Nm
+is defined by the parameters of the credential to be made/verified.
+See the
+.Sx INPUT FORMAT
+section for details.
+.Pp
+The output of
+.Nm
+is defined by the result of the selected operation.
+See the
+.Sx OUTPUT FORMAT
+section for details.
+.Pp
+If a credential is successfully created or verified,
+.Nm
+exits 0.
+Otherwise,
+.Nm
+exits 1.
+.Pp
+The options are as follows:
+.Bl -tag -width Ds
+.It Fl M
+Tells
+.Nm
+to make a new credential on
+.Ar device .
+.It Fl V
+Tells
+.Nm
+to verify a credential.
+.It Fl c Ar cred_protect
+If making a credential, set the credential's protection level to
+.Ar cred_protect .
+If verifying a credential, check whether the credential's protection
+level was signed by the authenticator as
+.Ar cred_protect .
+.It Fl d
+Causes
+.Nm
+to emit debugging output on
+.Em stderr .
+.It Fl h
+If making a credential, enable the FIDO2 hmac-secret extension.
+If verifying a credential, check whether the extension data bit was
+signed by the authenticator.
+.It Fl i Ar input_file
+Tells
+.Nm
+to read the parameters of the credential from
+.Ar input_file
+instead of
+.Em stdin .
+.It Fl o Ar output_file
+Tells
+.Nm
+to write output on
+.Ar output_file
+instead of
+.Em stdout .
+.It Fl q
+Tells
+.Nm
+to be quiet.
+If a PIN is required and
+.Fl q
+is specified,
+.Nm
+will fail.
+.It Fl r
+Create a resident credential.
+.It Fl u
+Create a U2F credential.
+By default,
+.Nm
+will use FIDO2 if supported by the authenticator, and fallback to
+U2F otherwise.
+.It Fl v
+If making a credential, request user verification.
+If verifying a credential, check whether the user verification bit
+was signed by the authenticator.
+.El
+.Sh INPUT FORMAT
+The input of
+.Nm
+consists of base64 blobs and UTF-8 strings separated
+by newline characters ('\\n').
+.Pp
+When making a credential,
+.Nm
+expects its input to consist of:
+.Pp
+.Bl -enum -offset indent -compact
+.It
+client data hash (base64 blob);
+.It
+relying party id (UTF-8 string);
+.It
+user name (UTF-8 string);
+.It
+user id (base64 blob).
+.El
+.Pp
+When verifying a credential,
+.Nm
+expects its input to consist of:
+.Pp
+.Bl -enum -offset indent -compact
+.It
+client data hash (base64 blob);
+.It
+relying party id (UTF-8 string);
+.It
+credential format (UTF-8 string);
+.It
+authenticator data (base64 blob);
+.It
+credential id (base64 blob);
+.It
+attestation signature (base64 blob);
+.It
+attestation certificate (optional, base64 blob).
+.El
+.Pp
+UTF-8 strings passed to
+.Nm
+must not contain embedded newline or NUL characters.
+.Sh OUTPUT FORMAT
+The output of
+.Nm
+consists of base64 blobs, UTF-8 strings, and PEM-encoded public
+keys separated by newline characters ('\\n').
+.Pp
+Upon the successful generation of a credential,
+.Nm
+outputs:
+.Pp
+.Bl -enum -offset indent -compact
+.It
+client data hash (base64 blob);
+.It
+relying party id (UTF-8 string);
+.It
+credential format (UTF-8 string);
+.It
+authenticator data (base64 blob);
+.It
+credential id (base64 blob);
+.It
+attestation signature (base64 blob);
+.It
+attestation certificate, if present (base64 blob).
+.El
+.Pp
+Upon the successful verification of a credential,
+.Nm
+outputs:
+.Pp
+.Bl -enum -offset indent -compact
+.It
+credential id (base64 blob);
+.It
+PEM-encoded credential key.
+.El
+.Sh EXAMPLES
+Create a new
+.Em es256
+credential on
+.Pa /dev/hidraw5 ,
+verify it, and save the id and the public key of the credential in
+.Em cred :
+.Pp
+.Dl $ echo credential challenge | openssl sha256 -binary | base64 > cred_param
+.Dl $ echo relying party >> cred_param
+.Dl $ echo user name >> cred_param
+.Dl $ dd if=/dev/urandom bs=1 count=32 | base64 >> cred_param
+.Dl $ fido2-cred -M -i cred_param /dev/hidraw5 | fido2-cred -V -o cred
+.Sh SEE ALSO
+.Xr fido2-assert 1 ,
+.Xr fido2-token 1
+.Sh CAVEATS
+Please note that
+.Nm
+handles Basic Attestation and Self Attestation transparently.
diff -Nru mysql-8.0-8.0.26/extra/libfido2/man/fido2-token.1 mysql-8.0-8.0.27/extra/libfido2/man/fido2-token.1
--- mysql-8.0-8.0.26/extra/libfido2/man/fido2-token.1	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/man/fido2-token.1	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,160 @@
+.\" Copyright (c) 2018 Yubico AB. All rights reserved.
+.\" Use of this source code is governed by a BSD-style
+.\" license that can be found in the LICENSE file.
+.\"
+.Dd $Mdocdate: September 13 2019 $
+.Dt FIDO2-TOKEN 1
+.Os
+.Sh NAME
+.Nm fido2-token
+.Nd find and manage a FIDO 2 authenticator
+.Sh SYNOPSIS
+.Nm
+.Op Fl CR
+.Op Fl d
+.Ar device
+.Nm
+.Fl D
+.Op Fl de
+.Fl i
+.Ar id
+.Ar device
+.Nm
+.Fl I
+.Op Fl cd
+.Op Fl k Ar rp_id Fl i Ar cred_id
+.Ar device
+.Nm
+.Fl L
+.Op Fl der
+.Op Fl k Ar rp_id
+.Op device
+.Nm
+.Fl S
+.Op Fl de
+.Op Fl i Ar template_id Fl n Ar template_name
+.Ar device
+.Nm
+.Fl V
+.Sh DESCRIPTION
+.Nm
+manages a FIDO 2 authenticator.
+.Pp
+The options are as follows:
+.Bl -tag -width Ds
+.It Fl C Ar device
+Changes the PIN of
+.Ar device .
+The user will be prompted for the current and new PINs.
+.It Fl D Fl i Ar id Ar device
+Deletes the resident credential specified by
+.Ar id
+from
+.Ar device ,
+where
+.Ar id
+is the credential's base64-encoded id.
+The user will be prompted for the PIN.
+.It Fl D Fl e Fl i Ar id Ar device
+Deletes the biometric enrollment specified by
+.Ar id
+from
+.Ar device ,
+where
+.Ar id
+is the enrollment's template base64-encoded id.
+The user will be prompted for the PIN.
+.It Fl I Ar device
+Retrieves information on
+.Ar device .
+.It Fl I Fl c Ar device
+Retrieves resident credential metadata from
+.Ar device .
+The user will be prompted for the PIN.
+.It Fl I Fl k Ar rp_id Fl i Ar cred_id Ar device
+Prints the credential id (base64-encoded) and public key
+(PEM encoded) of the resident credential specified by
+.Ar rp_id
+and
+.Ar cred_id ,
+where
+.Ar rp_id
+is a UTF-8 relying party id, and
+.Ar cred_id
+is a base64-encoded credential id.
+The user will be prompted for the PIN.
+.It Fl L
+Produces a list of authenticators found by the operating system.
+.It Fl L Fl e Ar device
+Produces a list of biometric enrollments on
+.Ar device .
+The user will be prompted for the PIN.
+.It Fl L Fl r Ar device
+Produces a list of relying parties with resident credentials on
+.Ar device .
+The user will be prompted for the PIN.
+.It Fl L Fl k Ar rp_id Ar device
+Produces a list of resident credentials corresponding to
+relying party
+.Ar rp_id
+on
+.Ar device .
+The user will be prompted for the PIN.
+.It Fl R
+Performs a reset on
+.Ar device .
+.Nm
+will NOT prompt for confirmation.
+.It Fl S
+Sets the PIN of
+.Ar device .
+The user will be prompted for the PIN.
+.It Fl S Fl e Ar device
+Performs a new biometric enrollment on
+.Ar device .
+The user will be prompted for the PIN.
+.It Fl S Fl e Fl i Ar template_id Fl n Ar template_name Ar device
+Sets the friendly name of the biometric enrollment specified by
+.Ar template_id
+to
+.Ar template_name
+on
+.Ar device ,
+where
+.Ar template_id
+is base64-encoded and
+.Ar template_name
+is a UTF-8 string.
+The user will be prompted for the PIN.
+.It Fl V
+Prints version information.
+.It Fl d
+Causes
+.Nm
+to emit debugging output on
+.Em stderr .
+.El
+.Pp
+If a
+.Em tty
+is available,
+.Nm
+will use it to prompt for PINs.
+Otherwise,
+.Em stdin
+is used.
+.Pp
+.Nm
+exits 0 on success and 1 on error.
+.Sh SEE ALSO
+.Xr fido2-assert 1 ,
+.Xr fido2-cred 1
+.Sh CAVEATS
+The actual user-flow to perform a reset is outside the scope of the
+FIDO2 specification, and may therefore vary depending on the
+authenticator.
+Yubico authenticators do not allow resets after 5 seconds from
+power-up, and expect a reset to be confirmed by the user through
+touch within 30 seconds.
+.Pp
+An authenticator's path may contain spaces.
diff -Nru mysql-8.0-8.0.26/extra/libfido2/man/fido_assert_allow_cred.3 mysql-8.0-8.0.27/extra/libfido2/man/fido_assert_allow_cred.3
--- mysql-8.0-8.0.26/extra/libfido2/man/fido_assert_allow_cred.3	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/man/fido_assert_allow_cred.3	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,47 @@
+.\" Copyright (c) 2018 Yubico AB. All rights reserved.
+.\" Use of this source code is governed by a BSD-style
+.\" license that can be found in the LICENSE file.
+.\"
+.Dd $Mdocdate: May 23 2018 $
+.Dt FIDO_ASSERT_ALLOW_CRED 3
+.Os
+.Sh NAME
+.Nm fido_assert_allow_cred
+.Nd appends a credential ID to the list of credentials allowed in an assertion
+.Sh SYNOPSIS
+.In fido.h
+.Ft int
+.Fn fido_assert_allow_cred "fido_assert_t *assert" "const unsigned char *ptr" "size_t len"
+.Sh DESCRIPTION
+The
+.Fn fido_assert_allow_cred
+function adds
+.Fa ptr
+to the list of credentials allowed in
+.Fa assert ,
+where
+.Fa ptr
+points to a credential ID of
+.Fa len
+bytes.
+A copy of
+.Fa ptr
+is made, and no references to the passed pointer are kept.
+If
+.Fn fido_assert_allow_cred
+fails, the existing list of allowed credentials is preserved.
+.Pp
+For the format of a FIDO 2 credential ID, please refer to the
+Web Authentication (webauthn) standard.
+.Sh RETURN VALUES
+The error codes returned by
+.Fn fido_assert_allow_cred
+are defined in
+.In fido/err.h .
+On success,
+.Dv FIDO_OK
+is returned.
+.Sh SEE ALSO
+.Xr fido_assert_new 3 ,
+.Xr fido_assert_set_authdata 3 ,
+.Xr fido_dev_get_assert 3
diff -Nru mysql-8.0-8.0.26/extra/libfido2/man/fido_assert_new.3 mysql-8.0-8.0.27/extra/libfido2/man/fido_assert_new.3
--- mysql-8.0-8.0.26/extra/libfido2/man/fido_assert_new.3	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/man/fido_assert_new.3	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,217 @@
+.\" Copyright (c) 2018 Yubico AB. All rights reserved.
+.\" Use of this source code is governed by a BSD-style
+.\" license that can be found in the LICENSE file.
+.\"
+.Dd $Mdocdate: October 22 2019 $
+.Dt FIDO_ASSERT_NEW 3
+.Os
+.Sh NAME
+.Nm fido_assert_new ,
+.Nm fido_assert_free ,
+.Nm fido_assert_count ,
+.Nm fido_assert_rp_id ,
+.Nm fido_assert_user_display_name ,
+.Nm fido_assert_user_icon ,
+.Nm fido_assert_user_name ,
+.Nm fido_assert_authdata_ptr ,
+.Nm fido_assert_clientdata_hash_ptr ,
+.Nm fido_assert_hmac_secret_ptr ,
+.Nm fido_assert_user_id_ptr ,
+.Nm fido_assert_sig_ptr ,
+.Nm fido_assert_id_ptr ,
+.Nm fido_assert_authdata_len ,
+.Nm fido_assert_clientdata_hash_len ,
+.Nm fido_assert_hmac_secret_len ,
+.Nm fido_assert_user_id_len ,
+.Nm fido_assert_sig_len ,
+.Nm fido_assert_id_len ,
+.Nm fido_assert_sigcount ,
+.Nm fido_assert_flags
+.Nd FIDO 2 assertion API
+.Sh SYNOPSIS
+.In fido.h
+.Ft fido_assert_t *
+.Fn fido_assert_new "void"
+.Ft void
+.Fn fido_assert_free "fido_assert_t **assert_p"
+.Ft size_t
+.Fn fido_assert_count "const fido_assert_t *assert"
+.Ft const char *
+.Fn fido_assert_rp_id "const fido_assert_t *assert"
+.Ft const char *
+.Fn fido_assert_user_display_name "const fido_assert_t *assert" "size_t idx"
+.Ft const char *
+.Fn fido_assert_user_icon "const fido_assert_t *assert" "size_t idx"
+.Ft const char *
+.Fn fido_assert_user_name "const fido_assert_t *assert" "size_t idx"
+.Ft const unsigned char *
+.Fn fido_assert_authdata_ptr "const fido_assert_t *assert" "size_t idx"
+.Ft const unsigned char *
+.Fn fido_assert_clientdata_hash_ptr "const fido_assert_t *assert"
+.Ft const unsigned char *
+.Fn fido_assert_hmac_secret_ptr "const fido_assert_t *assert" "size_t idx"
+.Ft const unsigned char *
+.Fn fido_assert_user_id_ptr "const fido_assert_t *assert" "size_t idx"
+.Ft const unsigned char *
+.Fn fido_assert_sig_ptr "const fido_assert_t *assert" "size_t idx"
+.Ft const unsigned char *
+.Fn fido_assert_id_ptr "const fido_assert_t *assert" "size_t idx"
+.Ft size_t
+.Fn fido_assert_authdata_len "const fido_assert_t *assert" "size_t idx"
+.Ft size_t
+.Fn fido_assert_clientdata_hash_len "const fido_assert_t *assert"
+.Ft size_t
+.Fn fido_assert_hmac_secret_len "const fido_assert_t *assert" "size_t idx"
+.Ft size_t
+.Fn fido_assert_user_id_len "const fido_assert_t *assert" "size_t idx"
+.Ft size_t
+.Fn fido_assert_sig_len "const fido_assert_t *assert" "size_t idx"
+.Ft size_t
+.Fn fido_assert_id_len "const fido_assert_t *assert" "size_t idx"
+.Ft uint32_t
+.Fn fido_assert_sigcount "const fido_assert_t *assert" "size_t idx"
+.Ft uint8_t
+.Fn fido_assert_flags "const fido_assert_t *assert" "size_t idx"
+.Sh DESCRIPTION
+FIDO 2 assertions are abstracted in
+.Em libfido2
+by the
+.Vt fido_assert_t
+type.
+The functions described in this page allow a
+.Vt fido_assert_t
+type to be allocated, deallocated, and inspected.
+For other operations on
+.Vt fido_assert_t ,
+please refer to
+.Xr fido_assert_set_authdata 3 ,
+.Xr fido_assert_allow_cred 3 ,
+.Xr fido_assert_verify 3 ,
+and
+.Xr fido_dev_get_assert 3 .
+.Pp
+The
+.Fn fido_assert_new
+function returns a pointer to a newly allocated, empty
+.Vt fido_assert_t
+type.
+If memory cannot be allocated, NULL is returned.
+.Pp
+The
+.Fn fido_assert_free
+function releases the memory backing
+.Fa *assert_p ,
+where
+.Fa *assert_p
+must have been previously allocated by
+.Fn fido_assert_new .
+On return,
+.Fa *assert_p
+is set to NULL.
+Either
+.Fa assert_p
+or
+.Fa *assert_p
+may be NULL, in which case
+.Fn fido_assert_free
+is a NOP.
+.Pp
+The
+.Fn fido_assert_count
+function returns the number of statements in
+.Fa assert .
+.Pp
+The
+.Fn fido_assert_rp_id
+function returns a pointer to a NUL-terminated string holding the
+relying party ID of
+.Fa assert .
+.Pp
+The
+.Fn fido_assert_user_display_name ,
+.Fn fido_assert_user_icon ,
+and
+.Fn fido_assert_user_name ,
+functions return pointers to the user display name, icon, and
+name attributes of statement
+.Fa idx
+in
+.Fa assert .
+If not NULL, the values returned by these functions point to
+NUL-terminated UTF-8 strings.
+.Pp
+The
+.Fn fido_assert_user_id_ptr ,
+.Fn fido_assert_authdata_ptr ,
+.Fn fido_assert_hmac_secret_ptr ,
+.Fn fido_assert_sig_ptr ,
+and
+.Fn fido_assert_id_ptr
+functions return pointers to the user ID, authenticator data,
+hmac-secret, signature, and credential ID attributes of statement
+.Fa idx
+in
+.Fa assert .
+The
+.Fn fido_assert_user_id_len ,
+.Fn fido_assert_authdata_len ,
+.Fn fido_assert_hmac_secret_len ,
+.Fn fido_assert_sig_len ,
+and
+.Fn fido_assert_id_len
+functions can be used to retrieve the corresponding length of a
+specific attribute.
+.Pp
+The
+.Fn fido_assert_sigcount
+function can be used to obtain the signature counter of statement
+.Fa idx
+in
+.Fa assert .
+.Pp
+The
+.Fn fido_assert_flags
+function returns the authenticator data flags of statement
+.Fa idx
+in
+.Fa assert .
+.Pp
+Please note that the first statement in
+.Fa assert
+has an
+.Fa idx
+(index) value of 0.
+.Pp
+The authenticator data and signature parts of an assertion
+statement are typically passed to a FIDO 2 server for verification.
+.Pp
+The
+.Fn fido_assert_clientdata_hash_ptr
+function returns a pointer to the client data hash of
+.Fa assert .
+The corresponding length can be obtained by
+.Fn fido_assert_clientdata_hash_len .
+.Sh RETURN VALUES
+The
+.Fn fido_assert_user_display_name ,
+.Fn fido_assert_user_icon ,
+.Fn fido_assert_user_name ,
+.Fn fido_assert_authdata_ptr ,
+.Fn fido_assert_clientdata_hash_ptr ,
+.Fn fido_assert_user_id_ptr ,
+and
+.Fn fido_assert_sig_ptr
+functions return NULL if the respective field in
+.Fa assert
+is not set.
+If not NULL, returned pointers are guaranteed to exist until any API
+function that takes
+.Fa assert
+without the
+.Em const
+qualifier is invoked.
+.Sh SEE ALSO
+.Xr fido_assert_allow_cred 3 ,
+.Xr fido_assert_set_authdata 3 ,
+.Xr fido_assert_verify 3 ,
+.Xr fido_dev_get_assert 3
diff -Nru mysql-8.0-8.0.26/extra/libfido2/man/fido_assert_set_authdata.3 mysql-8.0-8.0.27/extra/libfido2/man/fido_assert_set_authdata.3
--- mysql-8.0-8.0.26/extra/libfido2/man/fido_assert_set_authdata.3	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/man/fido_assert_set_authdata.3	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,194 @@
+.\" Copyright (c) 2018 Yubico AB. All rights reserved.
+.\" Use of this source code is governed by a BSD-style
+.\" license that can be found in the LICENSE file.
+.\"
+.Dd $Mdocdate: May 23 2018 $
+.Dt FIDO_ASSERT_SET_AUTHDATA 3
+.Os
+.Sh NAME
+.Nm fido_assert_set_authdata ,
+.Nm fido_assert_set_authdata_raw ,
+.Nm fido_assert_set_clientdata_hash ,
+.Nm fido_assert_set_count ,
+.Nm fido_assert_set_extensions ,
+.Nm fido_assert_set_hmac_salt ,
+.Nm fido_assert_set_up ,
+.Nm fido_assert_set_uv ,
+.Nm fido_assert_set_rp ,
+.Nm fido_assert_set_sig
+.Nd set parameters of a FIDO 2 assertion
+.Sh SYNOPSIS
+.In fido.h
+.Bd -literal
+typedef enum {
+	FIDO_OPT_OMIT = 0, /* use authenticator's default */
+	FIDO_OPT_FALSE,    /* explicitly set option to false */
+        FIDO_OPT_TRUE,     /* explicitly set option to true */
+} fido_opt_t;
+.Ed
+.Ft int
+.Fn fido_assert_set_authdata "fido_assert_t *assert" " size_t idx" "const unsigned char *ptr" "size_t len"
+.Ft int
+.Fn fido_assert_set_authdata_raw "fido_assert_t *assert" " size_t idx" "const unsigned char *ptr" "size_t len"
+.Ft int
+.Fn fido_assert_set_clientdata_hash "fido_assert_t *assert" "const unsigned char *ptr" "size_t len"
+.Ft int
+.Fn fido_assert_set_count "fido_assert_t *assert" "size_t n"
+.Ft int
+.Fn fido_assert_set_extensions "fido_assert_t *assert" "int flags"
+.Ft int
+.Fn fido_assert_set_hmac_salt "fido_assert_t *assert" "const unsigned char *ptr" "size_t len"
+.Ft int
+.Fn fido_assert_set_up "fido_assert_t *assert" "fido_opt_t up"
+.Ft int
+.Fn fido_assert_set_uv "fido_assert_t *assert" "fido_opt_t uv"
+.Ft int
+.Fn fido_assert_set_rp "fido_assert_t *assert" "const char *id"
+.Ft int
+.Fn fido_assert_set_sig "fido_assert_t *assert" "size_t idx" "const unsigned char *ptr" "size_t len"
+.Sh DESCRIPTION
+The
+.Nm
+set of functions define the various parameters of a FIDO 2
+assertion, allowing a
+.Fa fido_assert_t
+type to be prepared for a subsequent call to
+.Xr fido_dev_get_assert 3
+or
+.Xr fido_assert_verify 3 .
+For the complete specification of a FIDO 2 assertion and the format
+of its constituent parts, please refer to the Web Authentication
+(webauthn) standard.
+.Pp
+The
+.Fn fido_assert_set_count
+function sets the number of assertion statements in
+.Fa assert
+to
+.Fa n .
+.Pp
+The
+.Fn fido_assert_set_authdata
+and
+.Fn fido_assert_set_sig
+functions set the authenticator data and signature parts of the
+statement with index
+.Fa idx
+of
+.Fa assert
+to
+.Fa ptr ,
+where
+.Fa ptr
+points to
+.Fa len
+bytes.
+A copy of
+.Fa ptr
+is made, and no references to the passed pointer are kept.
+Please note that the first assertion statement of
+.Fa assert
+has an
+.Fa idx
+of
+.Em 0 .
+The authenticator data passed to
+.Fn fido_assert_set_authdata
+must be a CBOR-encoded byte string, as obtained from
+.Fn fido_assert_authdata_ptr .
+Alternatively, a raw binary blob may be passed to
+.Fn fido_assert_set_authdata_raw .
+.Pp
+The
+.Fn fido_assert_set_clientdata_hash
+and
+.Fn fido_assert_set_hmac_salt
+functions set the client data hash and hmac-salt parts of
+.Fa assert
+to
+.Fa ptr ,
+where
+.Fa ptr
+points to
+.Fa len
+bytes.
+A copy of
+.Fa ptr
+is made, and no references to the passed pointer are kept.
+.Pp
+The
+.Fn fido_assert_set_rp
+function sets the relying party
+.Fa id
+of
+.Fa assert ,
+where
+.Fa id
+is a NUL-terminated UTF-8 string.
+The content of
+.Fa id
+is copied, and no references to the passed pointer are kept.
+.Pp
+The
+.Fn fido_assert_set_extensions
+function sets the extensions of
+.Fa assert
+to the bitmask
+.Fa flags .
+At the moment, only the
+.Dv FIDO_EXT_HMAC_SECRET
+extension is supported.
+If
+.Fa flags
+is zero, the extensions of
+.Fa assert
+are cleared.
+.Pp
+The
+.Fn fido_assert_set_up
+and
+.Fn fido_assert_set_uv
+functions set the
+.Fa up
+(user presence) and
+.Fa uv
+(user verification)
+attributes of
+.Fa assert .
+Both are
+.Dv FIDO_OPT_OMIT
+by default, allowing the authenticator to use its default settings.
+.Pp
+Use of the
+.Nm
+set of functions may happen in two distinct situations:
+when asking a FIDO device to produce a series of assertion
+statements, prior to
+.Xr fido_dev_get_assert 3
+(i.e, in the context of a FIDO client), or when verifying assertion
+statements using
+.Xr fido_assert_verify 3
+(i.e, in the context of a FIDO server).
+.Pp
+For a complete description of the generation of a FIDO 2 assertion
+and its verification, please refer to the FIDO 2 specification.
+An example of how to use the
+.Nm
+set of functions can be found in the
+.Pa examples/assert.c
+file shipped with
+.Em libfido2 .
+.Sh RETURN VALUES
+The
+.Nm
+functions return
+.Dv FIDO_OK
+on success.
+The error codes returned by the
+.Nm
+set of functions are defined in
+.In fido/err.h .
+.Sh SEE ALSO
+.Xr fido_assert_allow_cred 3 ,
+.Xr fido_assert_verify 3 ,
+.Xr fido_dev_get_assert 3
diff -Nru mysql-8.0-8.0.26/extra/libfido2/man/fido_assert_verify.3 mysql-8.0-8.0.27/extra/libfido2/man/fido_assert_verify.3
--- mysql-8.0-8.0.26/extra/libfido2/man/fido_assert_verify.3	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/man/fido_assert_verify.3	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,79 @@
+.\" Copyright (c) 2018 Yubico AB. All rights reserved.
+.\" Use of this source code is governed by a BSD-style
+.\" license that can be found in the LICENSE file.
+.\"
+.Dd $Mdocdate: May 24 2018 $
+.Dt FIDO_ASSERT_VERIFY 3
+.Os
+.Sh NAME
+.Nm fido_assert_verify
+.Nd verifies the signature of a FIDO 2 assertion statement
+.Sh SYNOPSIS
+.In fido.h
+.Ft int
+.Fn fido_assert_verify "fido_assert_t *assert" "size_t idx" "int cose_alg" "const void *pk"
+.Sh DESCRIPTION
+The
+.Fn fido_assert_verify
+function verifies whether the signature contained in statement index
+.Fa idx
+of
+.Fa assert
+matches the parameters of the assertion.
+Before using
+.Fn fido_assert_verify
+in a sensitive context, the reader is strongly encouraged to make
+herself familiar with the FIDO 2 assertion statement process
+as defined in the Web Authentication (webauthn) standard.
+.Pp
+A brief description follows:
+.Pp
+The
+.Fn fido_assert_verify
+function verifies whether the client data hash, relying party ID,
+user presence and user verification attributes of
+.Fa assert
+have been attested by the holder of the private counterpart of
+the public key
+.Fa pk
+of COSE type
+.Fa cose_alg ,
+where
+.Fa cose_alg
+is
+.Dv COSE_ES256 ,
+.Dv COSE_RS256 ,
+or
+.Dv COSE_EDDSA ,
+and
+.Fa pk
+points to a
+.Vt es256_pk_t ,
+.Vt rs256_pk_t ,
+or
+.Vt eddsa_pk_t
+type accordingly.
+.Pp
+Please note that the first statement in
+.Fa assert
+has an
+.Fa idx
+of 0.
+.Sh RETURN VALUES
+The error codes returned by
+.Fn fido_assert_verify
+are defined in
+.In fido/err.h .
+If
+statement
+.Fa idx
+of
+.Fa assert
+passes verification with
+.Fa pk ,
+then
+.Dv FIDO_OK
+is returned.
+.Sh SEE ALSO
+.Xr fido_assert_new 3 ,
+.Xr fido_assert_set_authdata 3
diff -Nru mysql-8.0-8.0.26/extra/libfido2/man/fido_bio_dev_get_info.3 mysql-8.0-8.0.27/extra/libfido2/man/fido_bio_dev_get_info.3
--- mysql-8.0-8.0.26/extra/libfido2/man/fido_bio_dev_get_info.3	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/man/fido_bio_dev_get_info.3	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,130 @@
+.\" Copyright (c) 2019 Yubico AB. All rights reserved.
+.\" Use of this source code is governed by a BSD-style
+.\" license that can be found in the LICENSE file.
+.\"
+.Dd $Mdocdate: September 13 2019 $
+.Dt FIDO_BIO_DEV_GET_INFO 3
+.Os
+.Sh NAME
+.Nm fido_bio_dev_get_info ,
+.Nm fido_bio_dev_enroll_begin ,
+.Nm fido_bio_dev_enroll_continue ,
+.Nm fido_bio_dev_enroll_cancel ,
+.Nm fido_bio_dev_enroll_remove ,
+.Nm fido_bio_dev_get_template_array ,
+.Nm fido_bio_dev_set_template_name
+.Nd FIDO 2 biometric authenticator API
+.Sh SYNOPSIS
+.In fido.h
+.In fido/bio.h
+.Ft int
+.Fn fido_bio_dev_get_info "fido_dev_t *dev" "fido_bio_info_t *info"
+.Ft int
+.Fn fido_bio_dev_enroll_begin "fido_dev_t *dev" "fido_bio_template_t *template" "fido_bio_enroll_t *enroll" "uint32_t timeout_ms" "const char *pin"
+.Ft int
+.Fn fido_bio_dev_enroll_continue "fido_dev_t *dev" "const fido_bio_template_t *template" "fido_bio_enroll_t *enroll" "uint32_t timeout_ms"
+.Ft int
+.Fn fido_bio_dev_enroll_cancel "fido_dev_t *dev"
+.Ft int
+.Fn fido_bio_dev_enroll_remove "fido_dev_t *dev" "const fido_bio_template_t *template" "const char *pin"
+.Ft int
+.Fn fido_bio_dev_get_template_array "fido_dev_t *dev" "fido_bio_template_array_t *template_array" "const char *pin"
+.Ft int
+.Fn fido_bio_dev_set_template_name "fido_dev_t *dev" "const fido_bio_template_t *template" "const char *pin"
+.Sh DESCRIPTION
+The functions described in this page allow biometric
+templates on a FIDO2 authenticator to be listed, created,
+removed, and customised.
+Please note that not all FIDO2 authenticators support biometric
+enrollment.
+For a description of the types involved, please refer to
+.Xr fido_bio_info_new 3 ,
+.Xr fido_bio_enroll_new 3 ,
+and
+.Xr fido_bio_template 3 .
+.Pp
+The
+.Fn fido_bio_dev_get_info
+function populates
+.Fa info
+with sensor information from
+.Fa dev .
+.Pp
+The
+.Fn fido_bio_dev_enroll_begin
+function initiates a biometric enrollment on
+.Fa dev ,
+instructing the authenticator to wait
+.Fa timeout_ms
+milliseconds.
+On success,
+.Fa template
+and
+.Fa enroll
+will be populated with the newly created template's
+information and enrollment status, respectively.
+.Pp
+The
+.Fn fido_bio_dev_enroll_continue
+function continues an ongoing enrollment on
+.Fa dev ,
+instructing the authenticator to wait
+.Fa timeout_ms
+milliseconds.
+On success,
+.Fa enroll
+will be updated to reflect the status of the biometric
+enrollment.
+.Pp
+The
+.Fn fido_bio_dev_enroll_cancel
+function cancels an ongoing enrollment on
+.Fa dev .
+.Pp
+The
+.Fn fido_bio_dev_enroll_remove
+function removes
+.Fa template
+from
+.Fa dev .
+.Pp
+The
+.Fn fido_bio_dev_get_template_array
+function populates
+.Fa template_array
+with the templates currently enrolled on
+.Fa dev .
+.Pp
+The
+.Fn fido_bio_dev_set_template_name
+function sets the friendly name of
+.Fa template
+on
+.Fa dev .
+.Pp
+The error codes returned by
+.Fn fido_bio_dev_get_info ,
+.Fn fido_bio_dev_enroll_begin ,
+.Fn fido_bio_dev_enroll_continue ,
+.Fn fido_bio_dev_enroll_cancel ,
+.Fn fido_bio_dev_enroll_remove ,
+.Fn fido_bio_dev_get_template_array ,
+and
+.Fn fido_bio_dev_set_template_name
+are defined in
+.In fido/err.h .
+On success,
+.Dv FIDO_OK
+is returned.
+.Sh SEE ALSO
+.Xr fido_bio_enroll_new 3 ,
+.Xr fido_bio_info_new 3 ,
+.Xr fido_bio_template 3
+.Sh CAVEATS
+Biometric enrollment is a tentative feature of FIDO 2.1.
+Applications willing to strictly abide by FIDO 2.0 should refrain
+from using biometric enrollment.
+Applications using biometric enrollment should ensure it is
+supported by the authenticator prior to using the API.
+Since FIDO 2.1 hasn't been finalised, there is a chance the
+functionality and associated data structures may change.
diff -Nru mysql-8.0-8.0.26/extra/libfido2/man/fido_bio_enroll_new.3 mysql-8.0-8.0.27/extra/libfido2/man/fido_bio_enroll_new.3
--- mysql-8.0-8.0.26/extra/libfido2/man/fido_bio_enroll_new.3	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/man/fido_bio_enroll_new.3	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,95 @@
+.\" Copyright (c) 2019 Yubico AB. All rights reserved.
+.\" Use of this source code is governed by a BSD-style
+.\" license that can be found in the LICENSE file.
+.\"
+.Dd $Mdocdate: September 13 2019 $
+.Dt FIDO_BIO_ENROLL_NEW 3
+.Os
+.Sh NAME
+.Nm fido_bio_enroll_new ,
+.Nm fido_bio_enroll_free ,
+.Nm fido_bio_enroll_last_status ,
+.Nm fido_bio_enroll_remaining_samples
+.Nd FIDO 2 biometric enrollment API
+.Sh SYNOPSIS
+.In fido.h
+.In fido/bio.h
+.Bd -literal
+#define FIDO_BIO_ENROLL_FP_GOOD				0x00
+#define FIDO_BIO_ENROLL_FP_TOO_HIGH			0x01
+#define FIDO_BIO_ENROLL_FP_TOO_LOW			0x02
+#define FIDO_BIO_ENROLL_FP_TOO_LEFT			0x03
+#define FIDO_BIO_ENROLL_FP_TOO_RIGHT			0x04
+#define FIDO_BIO_ENROLL_FP_TOO_FAST			0x05
+#define FIDO_BIO_ENROLL_FP_TOO_SLOW			0x06
+#define FIDO_BIO_ENROLL_FP_POOR_QUALITY			0x07
+#define FIDO_BIO_ENROLL_FP_TOO_SKEWED			0x08
+#define FIDO_BIO_ENROLL_FP_TOO_SHORT			0x09
+#define FIDO_BIO_ENROLL_FP_MERGE_FAILURE		0x0a
+#define FIDO_BIO_ENROLL_FP_EXISTS			0x0b
+#define FIDO_BIO_ENROLL_FP_DATABASE_FULL		0x0c
+#define FIDO_BIO_ENROLL_NO_USER_ACTIVITY		0x0d
+#define FIDO_BIO_ENROLL_NO_USER_PRESENCE_TRANSITION	0x0e
+.Ed
+.Ft fido_bio_enroll_t *
+.Fn fido_bio_enroll_new "void"
+.Ft void
+.Fn fido_bio_enroll_free "fido_bio_enroll_t **enroll_p"
+.Ft uint8_t
+.Fn fido_bio_enroll_last_status "const fido_bio_enroll_t *enroll"
+.Ft uint8_t
+.Fn fido_bio_enroll_remaining_samples "const fido_bio_enroll_t *enroll"
+.Sh DESCRIPTION
+Ongoing FIDO 2 biometric enrollments are abstracted in
+.Em libfido2
+by the
+.Vt fido_bio_enroll_t
+type.
+.Pp
+The functions described in this page allow a
+.Vt fido_bio_enroll_t
+type to be allocated, deallocated, and inspected.
+For device operations on
+.Vt fido_bio_enroll_t ,
+please refer to
+.Xr fido_bio_dev_get_info 3 .
+.Pp
+The
+.Fn fido_bio_enroll_new
+function returns a pointer to a newly allocated, empty
+.Vt fido_bio_enroll_t
+type.
+If memory cannot be allocated, NULL is returned.
+.Pp
+The
+.Fn fido_bio_enroll_free
+function releases the memory backing
+.Fa *enroll_p ,
+where
+.Fa *enroll_p
+must have been previously allocated by
+.Fn fido_bio_enroll_new .
+On return,
+.Fa *enroll_p
+is set to NULL.
+Either
+.Fa enroll_p
+or
+.Fa *enroll_p
+may be NULL, in which case
+.Fn fido_bio_enroll_free
+is a NOP.
+.Pp
+The
+.Fn fido_bio_enroll_last_status
+function returns the enrollment status of
+.Fa enroll .
+.Pp
+The
+.Fn fido_bio_enroll_remaining_samples
+function returns the number of samples left for
+.Fa enroll
+to complete.
+.Sh SEE ALSO
+.Xr fido_bio_dev_get_info 3 ,
+.Xr fido_bio_template 3
diff -Nru mysql-8.0-8.0.26/extra/libfido2/man/fido_bio_info_new.3 mysql-8.0-8.0.27/extra/libfido2/man/fido_bio_info_new.3
--- mysql-8.0-8.0.26/extra/libfido2/man/fido_bio_info_new.3	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/man/fido_bio_info_new.3	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,81 @@
+.\" Copyright (c) 2019 Yubico AB. All rights reserved.
+.\" Use of this source code is governed by a BSD-style
+.\" license that can be found in the LICENSE file.
+.\"
+.Dd $Mdocdate: September 13 2019 $
+.Dt FIDO_BIO_INFO_NEW 3
+.Os
+.Sh NAME
+.Nm fido_bio_info_new ,
+.Nm fido_bio_info_free ,
+.Nm fido_bio_info_type ,
+.Nm fido_bio_info_max_samples
+.Nd FIDO 2 biometric sensor information API
+.Sh SYNOPSIS
+.In fido.h
+.In fido/bio.h
+.Ft fido_bio_info_t *
+.Fn fido_bio_info_new "void"
+.Ft void
+.Fn fido_bio_info_free "fido_bio_info_t **info_p"
+.Ft uint8_t
+.Fn fido_bio_info_type "const fido_bio_info_t *info"
+.Ft uint8_t
+.Fn fido_bio_info_max_samples "const fido_bio_info_t *info"
+.Sh DESCRIPTION
+Biometric sensor metadata is abstracted in
+.Em libfido2
+by the
+.Vt fido_bio_info_t
+type.
+.Pp
+The functions described in this page allow a
+.Vt fido_bio_info_t
+type to be allocated, deallocated, and inspected.
+For device operations on
+.Vt fido_bio_info_t ,
+please refer to
+.Xr fido_bio_dev_get_info 3 .
+.Pp
+The
+.Fn fido_bio_info_new
+function returns a pointer to a newly allocated, empty
+.Vt fido_bio_info_t
+type.
+If memory cannot be allocated, NULL is returned.
+.Pp
+The
+.Fn fido_bio_info_free
+function releases the memory backing
+.Fa *info_p ,
+where
+.Fa *info_p
+must have been previously allocated by
+.Fn fido_bio_info_new .
+On return,
+.Fa *info_p
+is set to NULL.
+Either
+.Fa info_p
+or
+.Fa *info_p
+may be NULL, in which case
+.Fn fido_bio_info_free
+is a NOP.
+.Pp
+The
+.Fn fido_bio_info_type
+function returns the fingerprint sensor type, which is
+.Dv 1
+for touch sensors, and
+.Dv 2
+for swipe sensors.
+.Pp
+The
+.Fn fido_bio_info_max_samples
+function returns the maximum number of successful samples
+required for enrollment.
+.Sh SEE ALSO
+.Xr fido_bio_dev_get_info 3 ,
+.Xr fido_bio_enroll_new 3 ,
+.Xr fido_bio_template 3
diff -Nru mysql-8.0-8.0.26/extra/libfido2/man/fido_bio_template.3 mysql-8.0-8.0.27/extra/libfido2/man/fido_bio_template.3
--- mysql-8.0-8.0.26/extra/libfido2/man/fido_bio_template.3	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/man/fido_bio_template.3	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,169 @@
+.\" Copyright (c) 2019 Yubico AB. All rights reserved.
+.\" Use of this source code is governed by a BSD-style
+.\" license that can be found in the LICENSE file.
+.\"
+.Dd $Mdocdate: September 13 2019 $
+.Dt FIDO_BIO_TEMPLATE 3
+.Os
+.Sh NAME
+.Nm fido_bio_template ,
+.Nm fido_bio_template_array_count ,
+.Nm fido_bio_template_array_free ,
+.Nm fido_bio_template_array_new ,
+.Nm fido_bio_template_free ,
+.Nm fido_bio_template_id_len ,
+.Nm fido_bio_template_id_ptr ,
+.Nm fido_bio_template_name ,
+.Nm fido_bio_template_new ,
+.Nm fido_bio_template_set_id ,
+.Nm fido_bio_template_set_name
+.Nd FIDO 2 biometric template API
+.Sh SYNOPSIS
+.In fido.h
+.In fido/bio.h
+.Ft fido_bio_template_t *
+.Fn fido_bio_template_new "void"
+.Ft void
+.Fn fido_bio_template_free "fido_bio_template_t **template_p"
+.Ft const char *
+.Fn fido_bio_template_name "const fido_bio_template_t *template"
+.Ft const unsigned char *
+.Fn fido_bio_template_id_ptr "const fido_bio_template_t *template"
+.Ft size_t
+.Fn fido_bio_template_id_len "const fido_bio_template_t *template"
+.Ft int
+.Fn fido_bio_template_set_id "fido_bio_template_t *template" "const unsigned char *ptr" "size_t len"
+.Ft int
+.Fn fido_bio_template_set_name "fido_bio_template_t *template" "const char *name"
+.Ft fido_bio_template_array_t *
+.Fn fido_bio_template_array_new "void"
+.Ft void
+.Fn fido_bio_template_array_free "fido_bio_template_array_t **array_p"
+.Ft size_t
+.Fn fido_bio_template_array_count "const fido_bio_template_array_t *array"
+.Ft const fido_bio_template_t *
+.Fn fido_bio_template "const fido_bio_template_array_t *array" "size_t idx"
+.Sh DESCRIPTION
+Existing FIDO 2 biometric enrollments are abstracted in
+.Em libfido2
+by the
+.Vt fido_bio_template_t
+and
+.Vt fido_bio_template_array_t
+types.
+.Pp
+The functions described in this page allow a
+.Vt fido_bio_template_t
+type to be allocated, deallocated, changed, and inspected,
+and a
+.Vt fido_bio_template_array_t
+type to be allocated, deallocated, and inspected.
+For device operations on
+.Vt fido_bio_template_t
+and
+.Vt fido_bio_template_array_t ,
+please refer to
+.Xr fido_bio_dev_get_info 3 .
+.Pp
+The
+.Fn fido_bio_template_new
+function returns a pointer to a newly allocated, empty
+.Vt fido_bio_template_t
+type.
+If memory cannot be allocated, NULL is returned.
+.Pp
+The
+.Fn fido_bio_template_free
+function releases the memory backing
+.Fa *template_p ,
+where
+.Fa *template_p
+must have been previously allocated by
+.Fn fido_bio_template_new .
+On return,
+.Fa *template_p
+is set to NULL.
+Either
+.Fa template_p
+or
+.Fa *template_p
+may be NULL, in which case
+.Fn fido_bio_template_free
+is a NOP.
+.Pp
+The
+.Fn fido_bio_template_name
+function returns a pointer to a NUL-terminated string containing
+the friendly name of
+.Fa template ,
+or NULL if
+.Fa template
+does not have a friendly name set.
+.Pp
+The
+.Fn fido_bio_template_id_ptr
+function returns a pointer to the template id of
+.Fa template ,
+or NULL if
+.Fa template
+does not have an id.
+The corresponding length can be obtained by
+.Fn fido_bio_template_id_len .
+.Pp
+The
+.Fn fido_bio_template_set_name
+function sets the friendly name of
+.Fa template
+to
+.Fa name .
+If
+.Fa name
+is NULL, the friendly name of
+.Fa template
+is unset.
+.Pp
+The
+.Fn fido_bio_template_array_new
+function returns a pointer to a newly allocated, empty
+.Vt fido_bio_template_array_t
+type.
+If memory cannot be allocated, NULL is returned.
+.Pp
+The
+.Fn fido_bio_template_array_free
+function releases the memory backing
+.Fa *array_p ,
+where
+.Fa *array_p
+must have been previously allocated by
+.Fn fido_bio_template_array_new .
+On return,
+.Fa *array_p
+is set to NULL.
+Either
+.Fa array_p
+or
+.Fa *array_p
+may be NULL, in which case
+.Fn fido_bio_template_array_free
+is a NOP.
+.Pp
+The
+.Fn fido_bio_template_array_count
+function returns the number of templates in
+.Fa array .
+.Pp
+The
+.Fn fido_bio_template
+function returns a pointer to the template at index
+.Fa idx
+in
+.Fa array .
+Please note that the first template in
+.Fa array
+has an
+.Fa idx
+(index) value of 0.
+.Sh SEE ALSO
+.Xr fido_bio_dev_get_info 3 ,
+.Xr fido_bio_enroll_new 3
diff -Nru mysql-8.0-8.0.26/extra/libfido2/man/fido_cbor_info_new.3 mysql-8.0-8.0.27/extra/libfido2/man/fido_cbor_info_new.3
--- mysql-8.0-8.0.26/extra/libfido2/man/fido_cbor_info_new.3	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/man/fido_cbor_info_new.3	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,179 @@
+.\" Copyright (c) 2018 Yubico AB. All rights reserved.
+.\" Use of this source code is governed by a BSD-style
+.\" license that can be found in the LICENSE file.
+.\"
+.Dd $Mdocdate: May 24 2018 $
+.Dt FIDO_CBOR_INFO_NEW 3
+.Os
+.Sh NAME
+.Nm fido_cbor_info_new ,
+.Nm fido_cbor_info_free ,
+.Nm fido_dev_get_cbor_info ,
+.Nm fido_cbor_info_aaguid_ptr ,
+.Nm fido_cbor_info_extensions_ptr ,
+.Nm fido_cbor_info_protocols_ptr ,
+.Nm fido_cbor_info_versions_ptr ,
+.Nm fido_cbor_info_options_name_ptr ,
+.Nm fido_cbor_info_options_value_ptr ,
+.Nm fido_cbor_info_aaguid_len ,
+.Nm fido_cbor_info_extensions_len ,
+.Nm fido_cbor_info_protocols_len ,
+.Nm fido_cbor_info_versions_len ,
+.Nm fido_cbor_info_options_len ,
+.Nm fido_cbor_info_maxmsgsiz ,
+.Nm fido_cbor_info_maxcredcntlst ,
+.Nm fido_cbor_info_maxcredidlen ,
+.Nm fido_cbor_info_fwversion
+.Nd FIDO 2 CBOR Info API
+.Sh SYNOPSIS
+.In fido.h
+.Ft fido_cbor_info_t *
+.Fn fido_cbor_info_new "void"
+.Ft void
+.Fn fido_cbor_info_free "fido_cbor_info_t **ci_p"
+.Ft int
+.Fn fido_dev_get_cbor_info "fido_dev_t *dev" "fido_cbor_info_t *ci"
+.Ft const unsigned char *
+.Fn fido_cbor_info_aaguid_ptr "const fido_cbor_info_t *ci"
+.Ft char **
+.Fn fido_cbor_info_extensions_ptr "const fido_cbor_info_t *ci"
+.Ft const uint8_t *
+.Fn fido_cbor_info_protocols_ptr "const fido_cbor_info_t *ci"
+.Ft char **
+.Fn fido_cbor_info_versions_ptr "const fido_cbor_info_t *ci"
+.Ft char **
+.Fn fido_cbor_info_options_name_ptr "const fido_cbor_info_t *ci"
+.Ft const bool *
+.Fn fido_cbor_info_options_value_ptr "const fido_cbor_info_t *ci"
+.Ft size_t
+.Fn fido_cbor_info_aaguid_len "const fido_cbor_info_t *ci"
+.Ft size_t
+.Fn fido_cbor_info_extensions_len "const fido_cbor_info_t *ci"
+.Ft size_t
+.Fn fido_cbor_info_protocols_len "const fido_cbor_info_t *ci"
+.Ft size_t
+.Fn fido_cbor_info_versions_len "const fido_cbor_info_t *ci"
+.Ft size_t
+.Fn fido_cbor_info_options_len "const fido_cbor_info_t *ci"
+.Ft uint64_t
+.Fn fido_cbor_info_maxmsgsiz "const fido_cbor_info_t *ci"
+.Ft uint64_t
+.Fn fido_cbor_info_maxcredcntlst "const fido_cbor_info_t *ci"
+.Ft uint64_t
+.Fn fido_cbor_info_maxcredidlen "const fido_cbor_info_t *ci"
+.Ft uint64_t
+.Fn fido_cbor_info_fwversion "const fido_cbor_info_t *ci"
+.Sh DESCRIPTION
+The
+.Fn fido_cbor_info_new
+function returns a pointer to a newly allocated, empty
+.Vt fido_cbor_info_t
+type.
+If memory cannot be allocated, NULL is returned.
+.Pp
+The
+.Fn fido_cbor_info_free
+function releases the memory backing
+.Fa *ci_p ,
+where
+.Fa *ci_p
+must have been previously allocated by
+.Fn fido_cbor_info_new .
+On return,
+.Fa *ci_p
+is set to NULL.
+Either
+.Fa ci_p
+or
+.Fa *ci_p
+may be NULL, in which case
+.Fn fido_cbor_info_free
+is a NOP.
+.Pp
+The
+.Fn fido_dev_get_cbor_info
+function transmits a
+.Dv CTAP_CBOR_GETINFO
+command to
+.Fa dev
+and fills
+.Fa ci
+with attributes retrieved from the command's response.
+The
+.Fn fido_dev_get_cbor_info
+function may block.
+.Pp
+The
+.Fn fido_cbor_info_aaguid_ptr ,
+.Fn fido_cbor_info_extensions_ptr ,
+.Fn fido_cbor_info_protocols_ptr ,
+and
+.Fn fido_cbor_info_versions_ptr
+functions return pointers to the authenticator attestation GUID,
+supported extensions, PIN protocol and CTAP version strings of
+.Fa ci .
+The corresponding length of a given attribute can be
+obtained by
+.Fn fido_cbor_info_aaguid_len ,
+.Fn fido_cbor_info_extensions_len ,
+.Fn fido_cbor_info_protocols_len ,
+or
+.Fn fido_cbor_info_versions_len .
+.Pp
+The
+.Fn fido_cbor_info_options_name_ptr
+and
+.Fn fido_cbor_info_options_value_ptr
+functions return pointers to the array of option names and their
+respective values
+in
+.Fa ci .
+The length of the options array is returned by
+.Fn fido_cbor_info_options_len .
+.Pp
+The
+.Fn fido_cbor_info_maxmsgsiz
+function returns the maximum message size attribute of
+.Fa ci .
+.Pp
+The
+.Fn fido_cbor_info_maxcredcntlst
+function returns the maximum supported number of credentials in
+a single credential ID list as reported in
+.Fa ci .
+.Pp
+The
+.Fn fido_cbor_info_maxcredidlen
+function returns the maximum supported length of a credential ID
+as reported in
+.Fa ci .
+.Pp
+The
+.Fn fido_cbor_info_fwversion
+function returns the firmware version attribute of
+.Fa ci .
+.Pp
+A complete example of how to use these functions can be found in the
+.Pa example/info.c
+file shipped with
+.Em libfido2 .
+.Sh RETURN VALUES
+The
+.Fn fido_cbor_info_aaguid_ptr ,
+.Fn fido_cbor_info_extensions_ptr ,
+.Fn fido_cbor_info_protocols_ptr ,
+.Fn fido_cbor_info_versions_ptr ,
+.Fn fido_cbor_info_options_name_ptr ,
+and
+.Fn fido_cbor_info_options_value_ptr
+functions return NULL if the respective field in
+.Fa ci
+is absent.
+If not NULL, returned pointers are guaranteed to exist until any
+API function that takes
+.Fa ci
+without the
+.Em const
+qualifier is invoked.
+.Sh SEE ALSO
+.Xr fido_dev_open 3
diff -Nru mysql-8.0-8.0.26/extra/libfido2/man/fido_cred_exclude.3 mysql-8.0-8.0.27/extra/libfido2/man/fido_cred_exclude.3
--- mysql-8.0-8.0.26/extra/libfido2/man/fido_cred_exclude.3	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/man/fido_cred_exclude.3	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,60 @@
+.\" Copyright (c) 2018 Yubico AB. All rights reserved.
+.\" Use of this source code is governed by a BSD-style
+.\" license that can be found in the LICENSE file.
+.\"
+.Dd $Mdocdate: May 23 2018 $
+.Dt FIDO_CRED_EXCLUDE 3
+.Os
+.Sh NAME
+.Nm fido_cred_exclude
+.Nd appends a credential ID to a credential's list of excluded credentials
+.Sh SYNOPSIS
+.In fido.h
+.Ft int
+.Fn fido_cred_exclude "fido_cred_t *cred" "const unsigned char *ptr" "size_t len"
+.Sh DESCRIPTION
+The
+.Fn fido_cred_exclude
+function adds
+.Fa ptr
+to the list of credentials excluded by
+.Fa cred ,
+where
+.Fa ptr
+points to a credential ID of
+.Fa len
+bytes.
+A copy of
+.Fa ptr
+is made, and no references to the passed pointer are kept.
+If
+.Fn fido_cred_exclude
+fails, the existing list of excluded credentials is preserved.
+.Pp
+If
+.Nm
+returns success and
+.Fa cred
+is later passed to
+.Xr fido_dev_make_cred 3
+on a device that contains the credential
+denoted by
+.Fa ptr ,
+then
+.Xr fido_dev_make_cred 3
+will fail.
+.Pp
+For the format of a FIDO 2 credential ID, please refer to the
+Web Authentication (webauthn) standard.
+.Sh RETURN VALUES
+The error codes returned by
+.Fn fido_cred_exclude
+are defined in
+.In fido/err.h .
+On success,
+.Dv FIDO_OK
+is returned.
+.Sh SEE ALSO
+.Xr fido_cred_new 3 ,
+.Xr fido_cred_set_authdata 3 ,
+.Xr fido_dev_make_cred 3
diff -Nru mysql-8.0-8.0.26/extra/libfido2/man/fido_credman_metadata_new.3 mysql-8.0-8.0.27/extra/libfido2/man/fido_credman_metadata_new.3
--- mysql-8.0-8.0.26/extra/libfido2/man/fido_credman_metadata_new.3	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/man/fido_credman_metadata_new.3	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,308 @@
+.\" Copyright (c) 2019 Yubico AB. All rights reserved.
+.\" Use of this source code is governed by a BSD-style
+.\" license that can be found in the LICENSE file.
+.\"
+.Dd $Mdocdate: June 28 2019 $
+.Dt FIDO_CREDMAN_METADATA_NEW 3
+.Os
+.Sh NAME
+.Nm fido_credman_metadata_new ,
+.Nm fido_credman_rk_new ,
+.Nm fido_credman_rp_new ,
+.Nm fido_credman_metadata_free ,
+.Nm fido_credman_rk_free ,
+.Nm fido_credman_rp_free ,
+.Nm fido_credman_rk_existing ,
+.Nm fido_credman_rk_remaining ,
+.Nm fido_credman_rk ,
+.Nm fido_credman_rk_count ,
+.Nm fido_credman_rp_id ,
+.Nm fido_credman_rp_name ,
+.Nm fido_credman_rp_count ,
+.Nm fido_credman_rp_id_hash_ptr ,
+.Nm fido_credman_rp_id_hash_len ,
+.Nm fido_credman_get_dev_metadata ,
+.Nm fido_credman_get_dev_rk ,
+.Nm fido_credman_del_dev_rk ,
+.Nm fido_credman_get_dev_rp
+.Nd FIDO 2 credential management API
+.Sh SYNOPSIS
+.In fido.h
+.In fido/credman.h
+.Ft fido_credman_metadata_t *
+.Fn fido_credman_metadata_new "void"
+.Ft fido_credman_rk_t *
+.Fn fido_credman_rk_new "void"
+.Ft fido_credman_rp_t *
+.Fn fido_credman_rp_new "void"
+.Ft void
+.Fn fido_credman_metadata_free "fido_credman_metadata_t **metadata_p"
+.Ft void
+.Fn fido_credman_rk_free "fido_credman_rk_t **rk_p"
+.Ft void
+.Fn fido_credman_rp_free "fido_credman_rp_t **rp_p"
+.Ft uint64_t
+.Fn fido_credman_rk_existing "const fido_credman_metadata_t *metadata"
+.Ft uint64_t
+.Fn fido_credman_rk_remaining "const fido_credman_metadata_t *metadata"
+.Ft const fido_cred_t *
+.Fn fido_credman_rk "const fido_credman_rk_t *rk" "size_t idx"
+.Ft size_t
+.Fn fido_credman_rk_count "const fido_credman_rk_t *rk"
+.Ft const char *
+.Fn fido_credman_rp_id "const fido_credman_rp_t *rp" "size_t idx"
+.Ft const char *
+.Fn fido_credman_rp_name "const fido_credman_rp_t *rp" "size_t idx"
+.Ft size_t
+.Fn fido_credman_rp_count "const fido_credman_rp_t *rp"
+.Ft const unsigned char *
+.Fn fido_credman_rp_id_hash_ptr "const fido_credman_rp_t *rp" "size_t idx"
+.Ft size_t
+.Fn fido_credman_rp_id_hash_len "const fido_credman_rp_t *" "size_t idx"
+.Ft int
+.Fn fido_credman_get_dev_metadata "fido_dev_t *dev" "fido_credman_metadata_t *metadata" "const char *pin"
+.Ft int
+.Fn fido_credman_get_dev_rk "fido_dev_t *dev" "const char *rp_id" "fido_credman_rk_t *rk" "const char *pin"
+.Ft int
+.Fn fido_credman_del_dev_rk "fido_dev_t *dev" const unsigned char *cred_id" "size_t cred_id_len" "const char *pin"
+.Ft int
+.Fn fido_credman_get_dev_rp "fido_dev_t *dev" "fido_credman_rp_t *rp" "const char *pin"
+.Sh DESCRIPTION
+The credential management API of
+.Em libfido2
+allows resident credentials on a FIDO2 authenticator to be listed,
+inspected, and removed.
+Please note that not all FIDO2 authenticators support credential
+management.
+To obtain information on what an authenticator supports, please
+refer to
+.Xr fido_cbor_info_new 3 .
+.Pp
+The
+.Vt fido_credman_metadata_t
+type abstracts credential management metadata.
+.Pp
+The
+.Fn fido_credman_metadata_new
+function returns a pointer to a newly allocated, empty
+.Vt fido_credman_metadata_t
+type.
+If memory cannot be allocated, NULL is returned.
+.Pp
+The
+.Fn fido_credman_metadata_free
+function releases the memory backing
+.Fa *metadata_p ,
+where
+.Fa *metadata_p
+must have been previously allocated by
+.Fn fido_credman_metadata_new .
+On return,
+.Fa *metadata_p
+is set to NULL.
+Either
+.Fa metadata_p
+or
+.Fa *metadata_p
+may be NULL, in which case
+.Fn fido_credman_metadata_free
+is a NOP.
+.Pp
+The
+.Fn fido_credman_get_dev_metadata
+function populates
+.Fa metadata
+with information retrieved from
+.Fa dev .
+A valid
+.Fa pin
+must be provided.
+.Pp
+The
+.Fn fido_credman_rk_existing
+function inspects
+.Fa metadata
+and returns the number of resident credentials on the
+authenticator.
+The
+.Fn fido_credman_rk_remaining
+function inspects
+.Fa metadata
+and returns the estimated number of resident credentials that can
+be created on the authenticator.
+.Pp
+The
+.Vt fido_credman_rk_t
+type abstracts the set of resident credentials belonging to a
+given relying party.
+.Pp
+The
+.Fn fido_credman_rk_new
+function returns a pointer to a newly allocated, empty
+.Vt fido_credman_rk_t
+type.
+If memory cannot be allocated, NULL is returned.
+.Pp
+The
+.Fn fido_credman_rk_free
+function releases the memory backing
+.Fa *rk_p ,
+where
+.Fa *rk_p
+must have been previously allocated by
+.Fn fido_credman_rk_new .
+On return,
+.Fa *rk_p
+is set to NULL.
+Either
+.Fa rk_p
+or
+.Fa *rk_p
+may be NULL, in which case
+.Fn fido_credman_rk_free
+is a NOP.
+.Pp
+The
+.Fn fido_credman_get_dev_rk
+function populates
+.Fa rk
+with the set of resident credentials belonging to
+.Fa rp_id
+in
+.Fa dev .
+A valid
+.Fa pin
+must be provided.
+.Pp
+The
+.Fn fido_credman_rk_count
+function returns the number of resident credentials in
+.Fa rk .
+The
+.Fn fido_credman_rk
+function returns a pointer to the credential at index
+.Fa idx
+in
+.Fa rk .
+Please note that the first credential in
+.Fa rk
+has an
+.Fa idx
+(index) value of 0.
+.Pp
+The
+.Fn fido_credman_del_dev_rk
+function deletes the resident credential identified by
+.Fa cred_id
+from
+.Fa dev ,
+where
+.Fa cred_id
+points to
+.Fa cred_id_len
+bytes.
+A valid
+.Fa pin
+must be provided.
+.Pp
+The
+.Vt fido_credman_rp_t
+type abstracts information about a relying party.
+.Pp
+The
+.Fn fido_credman_rp_new
+function returns a pointer to a newly allocated, empty
+.Vt fido_credman_rp_t
+type.
+If memory cannot be allocated, NULL is returned.
+.Pp
+The
+.Fn fido_credman_rp_free
+function releases the memory backing
+.Fa *rp_p ,
+where
+.Fa *rp_p
+must have been previously allocated by
+.Fn fido_credman_rp_new .
+On return,
+.Fa *rp_p
+is set to NULL.
+Either
+.Fa rp_p
+or
+.Fa *rp_p
+may be NULL, in which case
+.Fn fido_credman_rp_free
+is a NOP.
+.Pp
+The
+.Fn fido_credman_get_dev_rp
+function populates
+.Fa rp
+with information about relying parties with resident credentials
+in
+.Fa dev .
+A valid
+.Fa pin
+must be provided.
+.Pp
+The
+.Fn fido_credman_rp_count
+function returns the number of relying parties in
+.Fa rp .
+.Pp
+The
+.Fn fido_credman_rp_id
+and
+.Fn fido_credman_rp_name
+functions return pointers to the id and name of relying party
+.Fa idx
+in
+.Fa rp .
+If not NULL, the values returned by these functions point to
+NUL-terminated UTF-8 strings.
+Please note that the first relying party in
+.Fa rp
+has an
+.Fa idx
+(index) value of 0.
+.Pp
+The
+.Fn fido_credman_rp_id_hash_ptr
+function returns a pointer to the hashed id of relying party
+.Fa idx
+in
+.Fa rp .
+The corresponding length can be obtained by
+.Fn fido_credman_rp_id_hash_len .
+Please note that the first relying party in
+.Fa rp
+has an
+.Fa idx
+(index) value of 0.
+.Sh RETURN VALUES
+The
+.Fn fido_credman_get_dev_metadata ,
+.Fn fido_credman_get_dev_rk ,
+.Fn fido_credman_del_dev_rk ,
+and
+.Fn  fido_credman_get_dev_rp
+functions return
+.Dv FIDO_OK
+on success.
+On error, a different error code defined in
+.In fido/err.h
+is returned.
+Functions returning pointers are not guaranteed to succeed, and
+should have their return values checked for NULL.
+.Sh SEE ALSO
+.Xr fido_cbor_info_new 3 ,
+.Xr fido_cred_new 3
+.Sh CAVEATS
+Credential management is a tentative feature of FIDO 2.1.
+Applications willing to strictly abide by FIDO 2.0 should refrain
+from using credential management.
+Applications using credential management should ensure it is
+supported by the authenticator prior to using the API.
+Since FIDO 2.1 hasn't been finalised, there is a chance the
+functionality and associated data structures may change.
diff -Nru mysql-8.0-8.0.26/extra/libfido2/man/fido_cred_new.3 mysql-8.0-8.0.27/extra/libfido2/man/fido_cred_new.3
--- mysql-8.0-8.0.26/extra/libfido2/man/fido_cred_new.3	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/man/fido_cred_new.3	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,228 @@
+.\" Copyright (c) 2018 Yubico AB. All rights reserved.
+.\" Use of this source code is governed by a BSD-style
+.\" license that can be found in the LICENSE file.
+.\"
+.Dd $Mdocdate: May 23 2018 $
+.Dt FIDO_CRED_NEW 3
+.Os
+.Sh NAME
+.Nm fido_cred_new ,
+.Nm fido_cred_free ,
+.Nm fido_cred_prot ,
+.Nm fido_cred_fmt ,
+.Nm fido_cred_rp_id ,
+.Nm fido_cred_rp_name ,
+.Nm fido_cred_user_name ,
+.Nm fido_cred_display_name ,
+.Nm fido_cred_authdata_ptr ,
+.Nm fido_cred_clientdata_hash_ptr ,
+.Nm fido_cred_id_ptr ,
+.Nm fido_cred_aaguid_ptr ,
+.Nm fido_cred_pubkey_ptr ,
+.Nm fido_cred_sig_ptr ,
+.Nm fido_cred_user_id_ptr ,
+.Nm fido_cred_x5c_ptr ,
+.Nm fido_cred_authdata_len ,
+.Nm fido_cred_clientdata_hash_len ,
+.Nm fido_cred_id_len ,
+.Nm fido_cred_aaguid_len ,
+.Nm fido_cred_pubkey_len ,
+.Nm fido_cred_sig_len ,
+.Nm fido_cred_user_id_len ,
+.Nm fido_cred_x5c_len ,
+.Nm fido_cred_type ,
+.Nm fido_cred_flags
+.Nd FIDO 2 credential API
+.Sh SYNOPSIS
+.In fido.h
+.Ft fido_cred_t *
+.Fn fido_cred_new "void"
+.Ft void
+.Fn fido_cred_free "fido_cred_t **cred_p"
+.Ft int
+.Fn fido_cred_prot "fido_cred_t *cred"
+.Ft const char *
+.Fn fido_cred_fmt "const fido_cred_t *cred"
+.Ft const char *
+.Fn fido_cred_rp_id "const fido_cred_t *cred"
+.Ft const char *
+.Fn fido_cred_rp_name "const fido_cred_t *cred"
+.Ft const char *
+.Fn fido_cred_user_name "const fido_cred_t *cred"
+.Ft const char *
+.Fn fido_cred_display_name "const fido_cred_t *cred"
+.Ft const unsigned char *
+.Fn fido_cred_authdata_ptr "const fido_cred_t *cred"
+.Ft const unsigned char *
+.Fn fido_cred_clientdata_hash_ptr "const fido_cred_t *cred"
+.Ft const unsigned char *
+.Fn fido_cred_id_ptr "const fido_cred_t *cred"
+.Ft const unsigned char *
+.Fn fido_cred_aaguid_ptr "const fido_cred_t *cred"
+.Ft const unsigned char *
+.Fn fido_cred_pubkey_ptr "const fido_cred_t *cred"
+.Ft const unsigned char *
+.Fn fido_cred_sig_ptr "const fido_cred_t *cred"
+.Ft const unsigned char *
+.Fn fido_cred_user_id_ptr "const fido_cred_t *cred"
+.Ft const unsigned char *
+.Fn fido_cred_x5c_ptr "const fido_cred_t *cred"
+.Ft size_t
+.Fn fido_cred_authdata_len "const fido_cred_t *cred"
+.Ft size_t
+.Fn fido_cred_clientdata_hash_len "const fido_cred_t *cred"
+.Ft size_t
+.Fn fido_cred_id_len "const fido_cred_t *cred"
+.Ft size_t
+.Fn fido_cred_aaguid_len "const fido_cred_t *cred"
+.Ft size_t
+.Fn fido_cred_pubkey_len "const fido_cred_t *cred"
+.Ft size_t
+.Fn fido_cred_sig_len "const fido_cred_t *cred"
+.Ft size_t
+.Fn fido_cred_user_id_len "const fido_cred_t *cred"
+.Ft size_t
+.Fn fido_cred_x5c_len "const fido_cred_t *cred"
+.Ft int
+.Fn fido_cred_type "const fido_cred_t *cred"
+.Ft uint8_t
+.Fn fido_cred_flags "const fido_cred_t *cred"
+.Sh DESCRIPTION
+FIDO 2 credentials are abstracted in
+.Em libfido2
+by the
+.Vt fido_cred_t
+type.
+The functions described in this page allow a
+.Vt fido_cred_t
+type to be allocated, deallocated, and inspected.
+For other operations on
+.Vt fido_cred_t ,
+please refer to
+.Xr fido_cred_set_authdata 3 ,
+.Xr fido_cred_exclude 3 ,
+.Xr fido_cred_verify 3 ,
+and
+.Xr fido_dev_make_cred 3 .
+.Pp
+The
+.Fn fido_cred_new
+function returns a pointer to a newly allocated, empty
+.Vt fido_cred_t
+type.
+If memory cannot be allocated, NULL is returned.
+.Pp
+The
+.Fn fido_cred_free
+function releases the memory backing
+.Fa *cred_p ,
+where
+.Fa *cred_p
+must have been previously allocated by
+.Fn fido_cred_new .
+On return,
+.Fa *cred_p
+is set to NULL.
+Either
+.Fa cred_p
+or
+.Fa *cred_p
+may be NULL, in which case
+.Fn fido_cred_free
+is a NOP.
+.Pp
+The
+.Fn fido_cred_prot
+function returns the protection of
+.Fa cred .
+See
+.Xr fido_cred_set_prot 3
+for the values understood by
+.Em libfido2 .
+.Pp
+The
+.Fn fido_cred_fmt
+function returns a pointer to a NUL-terminated string containing
+the format of
+.Fa cred ,
+or NULL if
+.Fa cred
+does not have a format set.
+.Pp
+The
+.Fn fido_cred_rp_id ,
+.Fn fido_cred_rp_name ,
+.Fn fido_cred_user_name ,
+and
+.Fn fido_cred_display_name
+functions return pointers to NUL-terminated strings holding the
+relying party ID, relying party name, user name, and user display
+name attributes of
+.Fa cred ,
+or NULL if the respective entry is not set.
+.Pp
+The
+.Fn fido_cred_authdata_ptr ,
+.Fn fido_cred_clientdata_hash_ptr ,
+.Fn fido_cred_id_ptr ,
+.Fn fido_cred_aaguid_ptr ,
+.Fn fido_cred_pubkey_ptr ,
+.Fn fido_cred_sig_ptr ,
+.Fn fido_cred_user_id_ptr ,
+and
+.Fn fido_cred_x5c_ptr
+functions return pointers to the authenticator data, client data
+hash, ID, authenticator attestation GUID, public key, signature,
+user ID, and x509 certificate parts of
+.Fa cred ,
+or NULL if the respective entry is not set.
+.Pp
+The corresponding length can be obtained by
+.Fn fido_cred_authdata_len ,
+.Fn fido_cred_clientdata_hash_len ,
+.Fn fido_cred_id_len ,
+.Fn fido_cred_aaguid_len ,
+.Fn fido_cred_pubkey_len ,
+.Fn fido_cred_sig_len ,
+.Fn fido_cred_user_id_len ,
+and
+.Fn fido_cred_x5c_len .
+.Pp
+The authenticator data, x509 certificate, and signature parts of a
+credential are typically passed to a FIDO 2 server for verification.
+.Pp
+The
+.Fn fido_cred_type
+function returns the COSE algorithm of
+.Fa cred .
+.Pp
+The
+.Fn fido_cred_flags
+function returns the authenticator data flags of
+.Fa cred .
+.Sh RETURN VALUES
+The authenticator data returned by
+.Fn fido_cred_authdata_ptr
+is a CBOR-encoded byte string, as obtained from the authenticator.
+.Pp
+If not NULL, pointers returned by
+.Fn fido_cred_fmt ,
+.Fn fido_cred_authdata_ptr ,
+.Fn fido_cred_clientdata_hash_ptr ,
+.Fn fido_cred_id_ptr ,
+.Fn fido_cred_aaguid_ptr ,
+.Fn fido_cred_pubkey_ptr ,
+.Fn fido_cred_sig_ptr ,
+and
+.Fn fido_cred_x5c_ptr
+are guaranteed to exist until any API function that takes
+.Fa cred
+without the
+.Em const
+qualifier is invoked.
+.Sh SEE ALSO
+.Xr fido_cred_exclude 3 ,
+.Xr fido_cred_set_authdata 3 ,
+.Xr fido_cred_verify 3 ,
+.Xr fido_credman_metadata_new 3 ,
+.Xr fido_dev_make_cred 3
diff -Nru mysql-8.0-8.0.26/extra/libfido2/man/fido_cred_set_authdata.3 mysql-8.0-8.0.27/extra/libfido2/man/fido_cred_set_authdata.3
--- mysql-8.0-8.0.26/extra/libfido2/man/fido_cred_set_authdata.3	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/man/fido_cred_set_authdata.3	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,263 @@
+.\" Copyright (c) 2018 Yubico AB. All rights reserved.
+.\" Use of this source code is governed by a BSD-style
+.\" license that can be found in the LICENSE file.
+.\"
+.Dd $Mdocdate: May 23 2018 $
+.Dt FIDO_CRED_SET_AUTHDATA 3
+.Os
+.Sh NAME
+.Nm fido_cred_set_authdata ,
+.Nm fido_cred_set_authdata_raw ,
+.Nm fido_cred_set_x509 ,
+.Nm fido_cred_set_sig ,
+.Nm fido_cred_set_clientdata_hash ,
+.Nm fido_cred_set_rp ,
+.Nm fido_cred_set_user ,
+.Nm fido_cred_set_extensions ,
+.Nm fido_cred_set_prot ,
+.Nm fido_cred_set_rk ,
+.Nm fido_cred_set_uv ,
+.Nm fido_cred_set_fmt ,
+.Nm fido_cred_set_type
+.Nd set parameters of a FIDO 2 credential
+.Sh SYNOPSIS
+.In fido.h
+.Bd -literal
+typedef enum {
+	FIDO_OPT_OMIT = 0, /* use authenticator's default */
+	FIDO_OPT_FALSE,    /* explicitly set option to false */
+        FIDO_OPT_TRUE,     /* explicitly set option to true */
+} fido_opt_t;
+.Ed
+.Ft int
+.Fn fido_cred_set_authdata "fido_cred_t *cred" "const unsigned char *ptr" "size_t len"
+.Ft int
+.Fn fido_cred_set_authdata_raw "fido_cred_t *cred" "const unsigned char *ptr" "size_t len"
+.Ft int
+.Fn fido_cred_set_x509 "fido_cred_t *cred" "const unsigned char *ptr" "size_t len"
+.Ft int
+.Fn fido_cred_set_sig "fido_cred_t *cred" "const unsigned char *ptr" "size_t len"
+.Ft int
+.Fn fido_cred_set_clientdata_hash "fido_cred_t *cred" "const unsigned char *ptr" "size_t len"
+.Ft int
+.Fn fido_cred_set_rp "fido_cred_t *cred" "const char *id" "const char *name"
+.Ft int
+.Fn fido_cred_set_user "fido_cred_t *cred" "const unsigned char *user_id" "size_t user_id_len" "const char *name" "const char *display_name" "const char *icon"
+.Ft int
+.Fn fido_cred_set_extensions "fido_cred_t *cred" "int flags"
+.Ft int
+.Fn fido_cred_set_prot "fido_cred_t *cred" "int prot"
+.Ft int
+.Fn fido_cred_set_rk "fido_cred_t *cred" "fido_opt_t rk"
+.Ft int
+.Fn fido_cred_set_uv "fido_cred_t *cred" "fido_opt_t uv"
+.Ft int
+.Fn fido_cred_set_fmt "fido_cred_t *cred" "const char *ptr"
+.Ft int
+.Fn fido_cred_set_type "fido_cred_t *cred" "int cose_alg"
+.Sh DESCRIPTION
+The
+.Nm
+set of functions define the various parameters of a FIDO 2
+credential, allowing a
+.Fa fido_cred_t
+type to be prepared for a subsequent call to
+.Xr fido_dev_make_cred 3
+or
+.Xr fido_cred_verify 3 .
+For the complete specification of a FIDO 2 credential and the format
+of its constituent parts, please refer to the Web Authentication
+(webauthn) standard.
+.Pp
+The
+.Fn fido_cred_set_authdata ,
+.Fn fido_cred_set_x509 ,
+.Fn fido_cred_set_sig ,
+and
+.Fn fido_cred_set_clientdata_hash
+functions set the authenticator data, attestation certificate,
+signature and client data hash parts of
+.Fa cred
+to
+.Fa ptr ,
+where
+.Fa ptr
+points to
+.Fa len
+bytes.
+A copy of
+.Fa ptr
+is made, and no references to the passed pointer are kept.
+The authenticator data passed to
+.Fn fido_cred_set_authdata
+must be a CBOR-encoded byte string, as obtained from
+.Fn fido_cred_authdata_ptr .
+Alternatively, a raw binary blob may be passed to
+.Fn fido_cred_set_authdata_raw .
+.Pp
+The
+.Fn fido_cred_set_rp
+function sets the relying party
+.Fa id
+and
+.Fa name
+parameters of
+.Fa cred ,
+where
+.Fa id
+and
+.Fa name
+are NUL-terminated UTF-8 strings.
+The contents of
+.Fa id
+and
+.Fa name
+are copied, and no references to the passed pointers are kept.
+.Pp
+The
+.Fn fido_cred_set_user
+function sets the user attributes of
+.Fa cred ,
+where
+.Fa user_id
+points to
+.Fa user_id_len
+bytes and
+.Fa name ,
+.Fa display_name ,
+and
+.Fa icon
+are NUL-terminated UTF-8 strings.
+The contents of
+.Fa user_id ,
+.Fa name ,
+.Fa display_name ,
+and
+.Fa icon
+are copied, and no references to the passed pointers are kept.
+Previously set user attributes are flushed.
+The
+.Fa user_id ,
+.Fa name ,
+.Fa display_name ,
+and
+.Fa icon
+parameters may be NULL.
+.Pp
+The
+.Fn fido_cred_set_extensions
+function sets the extensions of
+.Fa cred
+to the bitmask
+.Fa flags .
+At the moment, only the
+.Dv FIDO_EXT_HMAC_SECRET
+and
+.Dv FIDO_EXT_CRED_PROTECT
+extensions are supported.
+If
+.Fa flags
+is zero, the extensions of
+.Fa cred
+are cleared.
+.Pp
+The
+.Fn fido_cred_set_prot
+function sets the protection of
+.Fa cred
+to the scalar
+.Fa prot .
+At the moment, only the
+.Dv FIDO_CRED_PROT_UV_OPTIONAL ,
+.Dv FIDO_CRED_PROT_UV_OPTIONAL_WITH_ID ,
+and
+.Dv FIDO_CRED_PROT_UV_REQUIRED
+protections are supported.
+If
+.Fa prot
+is zero, the protection of
+.Fa cred
+is cleared.
+.Pp
+The
+.Fn fido_cred_set_rk
+and
+.Fn fido_cred_set_uv
+functions set the
+.Em rk
+(resident key)
+and
+.Em uv
+(user verification)
+attributes of
+.Fa cred .
+Both are
+.Dv FIDO_OPT_OMIT
+by default, allowing the authenticator to use its default settings.
+.Pp
+The
+.Fn fido_cred_set_fmt
+function sets the format of
+.Fa cred
+to
+.Fa fmt ,
+where
+.Fa fmt
+must be either
+.Vt "packed"
+(the format used in FIDO 2)
+or
+.Vt "fido-u2f"
+(the format used by U2F).
+A copy of
+.Fa fmt
+is made, and no references to the passed pointer are kept.
+Note that not all authenticators support FIDO2 and therefore may not
+be able to generate
+.Vt "packed" .
+.Pp
+The
+.Fn fido_cred_set_type
+function sets the type of
+.Fa cred to
+.Fa cose_alg ,
+where
+.Fa cose_alg
+is
+.Dv COSE_ES256 ,
+.Dv COSE_RS256 ,
+or
+.Dv COSE_EDDSA .
+The type of a credential may only be set once.
+Note that not all authenticators support COSE_RS256 or COSE_EDDSA.
+.Pp
+Use of the
+.Nm
+set of functions may happen in two distinct situations:
+when generating a new credential on a FIDO device, prior to
+.Xr fido_dev_make_cred 3
+(i.e, in the context of a FIDO client), or when validating
+a generated credential using
+.Xr fido_cred_verify 3
+(i.e, in the context of a FIDO server).
+.Pp
+For a complete description of the generation of a FIDO 2 credential
+and its verification, please refer to the FIDO 2 specification.
+A concrete utilisation example of the
+.Nm
+set of functions can be found in the
+.Pa cred.c
+example shipped with
+.Em libfido2 .
+.Sh RETURN VALUES
+The error codes returned by the
+.Nm
+set of functions are defined in
+.In fido/err.h .
+On success,
+.Dv FIDO_OK
+is returned.
+.Sh SEE ALSO
+.Xr fido_cred_exclude 3 ,
+.Xr fido_cred_verify 3 ,
+.Xr fido_dev_make_cred 3
diff -Nru mysql-8.0-8.0.26/extra/libfido2/man/fido_cred_verify.3 mysql-8.0-8.0.27/extra/libfido2/man/fido_cred_verify.3
--- mysql-8.0-8.0.26/extra/libfido2/man/fido_cred_verify.3	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/man/fido_cred_verify.3	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,64 @@
+.\" Copyright (c) 2018 Yubico AB. All rights reserved.
+.\" Use of this source code is governed by a BSD-style
+.\" license that can be found in the LICENSE file.
+.\"
+.Dd $Mdocdate: May 23 2018 $
+.Dt FIDO_CRED_VERIFY 3
+.Os
+.Sh NAME
+.Nm fido_cred_verify
+.Nd verifies the signature of a FIDO 2 credential
+.Sh SYNOPSIS
+.In fido.h
+.Ft int
+.Fn fido_cred_verify "const fido_cred_t *cred"
+.Sh DESCRIPTION
+The
+.Fn fido_cred_verify
+function verifies whether the signature contained in
+.Fa cred
+matches the attributes of the credential.
+Before using
+.Fn fido_cred_verify
+in a sensitive context, the reader is strongly encouraged to make
+herself familiar with the FIDO 2 credential attestation process
+as defined in the Web Authentication (webauthn) standard.
+.Pp
+A brief description follows:
+.Pp
+The
+.Fn fido_cred_verify
+function verifies whether the client data hash, relying party ID,
+credential ID, type, and resident key and user verification
+attributes of
+.Fa cred
+have been attested by the holder of the private counterpart of
+the public key contained in the credential's x509 certificate.
+.Pp
+Please note that the x509 certificate itself is not verified.
+.Pp
+The attestation statement formats supported by
+.Fn fido_cred_verify
+are
+.Em packed
+and
+.Em fido-u2f .
+The attestation type implemented by
+.Fn fido_cred_verify
+is
+.Em Basic Attestation .
+The attestation key pair is assumed to be of the type ES256.
+Other attestation formats and types are not supported.
+.Sh RETURN VALUES
+The error codes returned by
+.Fn fido_cred_verify
+are defined in
+.In fido/err.h .
+If
+.Fa cred
+passes verification, then
+.Dv FIDO_OK
+is returned.
+.Sh SEE ALSO
+.Xr fido_cred_new 3 ,
+.Xr fido_cred_set_authdata 3
diff -Nru mysql-8.0-8.0.26/extra/libfido2/man/fido_dev_get_assert.3 mysql-8.0-8.0.27/extra/libfido2/man/fido_dev_get_assert.3
--- mysql-8.0-8.0.26/extra/libfido2/man/fido_dev_get_assert.3	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/man/fido_dev_get_assert.3	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,76 @@
+.\" Copyright (c) 2018 Yubico AB. All rights reserved.
+.\" Use of this source code is governed by a BSD-style
+.\" license that can be found in the LICENSE file.
+.\"
+.Dd $Mdocdate: May 24 2018 $
+.Dt FIDO_DEV_GET_ASSERT 3
+.Os
+.Sh NAME
+.Nm fido_dev_get_assert
+.Nd obtains an assertion from a FIDO device
+.Sh SYNOPSIS
+.In fido.h
+.Ft int
+.Fn fido_dev_get_assert "fido_dev_t *dev" " fido_assert_t *assert" "const char *pin"
+.Sh DESCRIPTION
+The
+.Fn fido_dev_get_assert
+function asks the FIDO device represented by
+.Fa dev
+for an assertion according to the following parameters defined in
+.Fa assert :
+.Pp
+.Bl -dash -compact
+.It
+.Nm relying party ID ;
+.It
+.Nm client data hash ;
+.It
+.Nm list of allowed credential IDs ;
+.It
+.Nm user presence and user verification attributes .
+.El
+.Pp
+See
+.Xr fido_assert_set_authdata 3
+for information on how these values are set.
+.Pp
+If a PIN is not needed to authenticate the request against
+.Fa dev ,
+then
+.Fa pin
+may be NULL.
+Otherwise
+.Fa pin
+must point to a NUL-terminated UTF-8 string.
+.Pp
+After a successful call to
+.Fn fido_dev_get_assert ,
+the
+.Xr fido_assert_count 3 ,
+.Xr fido_assert_user_display_name 3 ,
+.Xr fido_assert_user_icon 3 ,
+.Xr fido_assert_user_name 3 ,
+.Xr fido_assert_authdata_ptr 3 ,
+.Xr fido_assert_user_id_ptr 3 ,
+.Xr fido_assert_sig_ptr 3 ,
+and
+.Xr fido_assert_sigcount 3
+functions may be invoked on
+.Fa assert
+to retrieve the various attributes of the generated assertion.
+.Pp
+Please note that
+.Fn fido_dev_get_assert
+is synchronous and will block if necessary.
+.Sh RETURN VALUES
+The error codes returned by
+.Fn fido_dev_get_assert
+are defined in
+.In fido/err.h .
+On success,
+.Dv FIDO_OK
+is returned.
+.Sh SEE ALSO
+.Xr fido_assert_new 3 ,
+.Xr fido_assert_set_authdata 3
diff -Nru mysql-8.0-8.0.26/extra/libfido2/man/fido_dev_get_touch_begin.3 mysql-8.0-8.0.27/extra/libfido2/man/fido_dev_get_touch_begin.3
--- mysql-8.0-8.0.26/extra/libfido2/man/fido_dev_get_touch_begin.3	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/man/fido_dev_get_touch_begin.3	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,73 @@
+.\" Copyright (c) 2020 Yubico AB. All rights reserved.
+.\" Use of this source code is governed by a BSD-style
+.\" license that can be found in the LICENSE file.
+.\"
+.Dd $Mdocdate: August 5 2020 $
+.Dt FIDO_DEV_GET_TOUCH_BEGIN 3
+.Os
+.Sh NAME
+.Nm fido_dev_get_touch_begin ,
+.Nm fido_dev_get_touch_status
+.Nd asynchronously wait for touch on a FIDO 2 authenticator
+.Sh SYNOPSIS
+.In fido.h
+.Ft int
+.Fn fido_dev_get_touch_begin "fido_dev_t *dev"
+.Ft int
+.Fn fido_dev_get_touch_status "fido_dev_t *dev" "int *touched" "int ms"
+.Sh DESCRIPTION
+The functions described in this page allow an application to
+asynchronously wait for touch on a FIDO authenticator.
+This is useful when multiple authenticators are present and
+the application needs to know which one to use.
+.Pp
+The
+.Fn fido_dev_get_touch_begin
+function initiates a touch request on
+.Fa dev .
+.Pp
+The
+.Fn fido_dev_get_touch_status
+function continues an ongoing touch request on
+.Fa dev ,
+blocking up to
+.Fa ms
+milliseconds.
+On success,
+.Fa touched
+will be updated to reflect the touch request status.
+If
+.Fa touched
+is 1, the device was touched, and the touch request is
+terminated.
+If
+.Fa touched
+is 0, the application may call
+.Fn fido_dev_get_touch_status
+to continue the touch request, or
+.Fn fido_dev_cancel
+to terminate it.
+.Sh RETURN VALUES
+The error codes returned by
+.Fn fido_dev_get_touch_begin
+and
+.Fn fido_dev_get_touch_status
+are defined in
+.In fido/err.h .
+On success,
+.Dv FIDO_OK
+is returned.
+.Sh EXAMPLES
+Please refer to
+.Em examples/select.c
+in
+.Em libfido2's
+source tree.
+.Sh SEE ALSO
+.Xr fido_dev_cancel 3
+.Sh CAVEATS
+The
+.Fn fido_dev_get_touch_status
+function will cause a command to be transmitted to U2F
+authenticators.
+These transmissions should not exceed a frequency of 5Hz.
diff -Nru mysql-8.0-8.0.26/extra/libfido2/man/fido_dev_info_manifest.3 mysql-8.0-8.0.27/extra/libfido2/man/fido_dev_info_manifest.3
--- mysql-8.0-8.0.26/extra/libfido2/man/fido_dev_info_manifest.3	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/man/fido_dev_info_manifest.3	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,143 @@
+.\" Copyright (c) 2018 Yubico AB. All rights reserved.
+.\" Use of this source code is governed by a BSD-style
+.\" license that can be found in the LICENSE file.
+.\"
+.Dd $Mdocdate: May 25 2018 $
+.Dt FIDO_DEV_INFO_MANIFEST 3
+.Os
+.Sh NAME
+.Nm fido_dev_info_manifest ,
+.Nm fido_dev_info_new ,
+.Nm fido_dev_info_free ,
+.Nm fido_dev_info_ptr ,
+.Nm fido_dev_info_path ,
+.Nm fido_dev_info_product ,
+.Nm fido_dev_info_vendor ,
+.Nm fido_dev_info_manufacturer_string ,
+.Nm fido_dev_info_product_string
+.Nd FIDO 2 device discovery functions
+.Sh SYNOPSIS
+.In fido.h
+.Ft int
+.Fn fido_dev_info_manifest "fido_dev_info_t *devlist" "size_t ilen" "size_t *olen"
+.Ft fido_dev_info_t *
+.Fn fido_dev_info_new "size_t n"
+.Ft void
+.Fn fido_dev_info_free "fido_dev_info_t **devlist_p" "size_t n"
+.Ft const fido_dev_info_t *
+.Fn fido_dev_info_ptr "const fido_dev_info_t *devlist" "size_t i"
+.Ft const char *
+.Fn fido_dev_info_path "const fido_dev_info_t *di"
+.Ft int16_t
+.Fn fido_dev_info_product "const fido_dev_info_t *di"
+.Ft int16_t
+.Fn fido_dev_info_vendor "const fido_dev_info_t *di"
+.Ft const char *
+.Fn fido_dev_info_manufacturer_string "const fido_dev_info_t *di"
+.Ft const char *
+.Fn fido_dev_info_product_string "const fido_dev_info_t *di"
+.Sh DESCRIPTION
+The
+.Fn fido_dev_info_manifest
+function fills
+.Fa devlist
+with up to
+.Fa ilen
+FIDO devices found by the underlying operating system.
+Currently only USB HID devices are supported.
+The number of discovered devices is returned in
+.Fa olen ,
+where
+.Fa olen
+is an addressable pointer.
+.Pp
+The
+.Fn fido_dev_info_new
+function returns a pointer to a newly allocated, empty device list
+with
+.Fa n
+available slots.
+If memory is not available, NULL is returned.
+.Pp
+The
+.Fn fido_dev_info_free
+function releases the memory backing
+.Fa *devlist_p ,
+where
+.Fa *devlist_p
+must have been previously allocated by
+.Fn fido_dev_info_new .
+The number
+.Fa n
+of allocated slots must also be provided.
+On return,
+.Fa *devlist_p
+is set to NULL.
+Either
+.Fa devlist_p
+or
+.Fa *devlist_p
+may be NULL, in which case
+.Fn fido_dev_info_free
+is a NOP.
+.Pp
+The
+.Fn fido_dev_info_ptr
+function returns a pointer to slot number
+.Fa i
+of
+.Fa devlist .
+It is the caller's responsibility to ensure that
+.Fa i
+is bounded.
+Please note that the first slot has index 0.
+.Pp
+The
+.Fn fido_dev_info_path
+returns the filesystem path or subsystem-specific identification
+string of
+.Fa di .
+.Pp
+The
+.Fn fido_dev_info_product
+function returns the product ID of
+.Fa di .
+.Pp
+The
+.Fn fido_dev_info_vendor
+function returns the vendor ID of
+.Fa di .
+.Pp
+The
+.Fn fido_dev_info_manufacturer_string
+function returns the manufacturer string of
+.Fa di .
+.Pp
+The
+.Fn fido_dev_info_product_string
+function returns the product string of
+.Fa di .
+.Pp
+An example of how to use the functions described in this document
+can be found in the
+.Pa examples/manifest.c
+file shipped with
+.Em libfido2 .
+.Sh RETURN VALUES
+The
+.Fn fido_dev_info_manifest
+function always returns
+.Dv FIDO_OK .
+If a discovery error occurs, the
+.Fa olen
+pointer is set to 0.
+.Pp
+The pointers returned by
+.Fn fido_dev_info_ptr ,
+.Fn fido_dev_info_path ,
+.Fn fido_dev_info_manufacturer_string ,
+and
+.Fn fido_dev_info_product_string
+are guaranteed to exist until
+.Fn fido_dev_info_free
+is called on the corresponding device list.
diff -Nru mysql-8.0-8.0.26/extra/libfido2/man/fido_dev_make_cred.3 mysql-8.0-8.0.27/extra/libfido2/man/fido_dev_make_cred.3
--- mysql-8.0-8.0.26/extra/libfido2/man/fido_dev_make_cred.3	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/man/fido_dev_make_cred.3	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,77 @@
+.\" Copyright (c) 2018 Yubico AB. All rights reserved.
+.\" Use of this source code is governed by a BSD-style
+.\" license that can be found in the LICENSE file.
+.\"
+.Dd $Mdocdate: May 23 2018 $
+.Dt FIDO_DEV_MAKE_CRED 3
+.Os
+.Sh NAME
+.Nm fido_dev_make_cred
+.Nd generates a new credential on a FIDO device
+.Sh SYNOPSIS
+.In fido.h
+.Ft int
+.Fn fido_dev_make_cred "fido_dev_t *dev" " fido_cred_t *cred" "const char *pin"
+.Sh DESCRIPTION
+The
+.Fn fido_dev_make_cred
+function asks the FIDO device represented by
+.Fa dev
+to generate a new credential according to the following parameters
+defined in
+.Fa cred :
+.Pp
+.Bl -dash -compact
+.It
+.Nm type ;
+.It
+.Nm client data hash ;
+.It
+.Nm relying party ;
+.It
+.Nm user attributes ;
+.It
+.Nm list of excluded credential IDs ;
+.It
+.Nm resident key and user verification attributes .
+.El
+.Pp
+See
+.Xr fido_cred_set_authdata 3
+for information on how these values are set.
+.Pp
+If a PIN is not needed to authenticate the request against
+.Fa dev ,
+then
+.Fa pin
+may be NULL.
+Otherwise
+.Fa pin
+must point to a NUL-terminated UTF-8 string.
+.Pp
+After a successful call to
+.Fn fido_dev_make_cred ,
+the
+.Xr fido_cred_authdata_ptr 3 ,
+.Xr fido_cred_pubkey_ptr 3 ,
+.Xr fido_cred_x5c_ptr 3 ,
+and
+.Xr fido_cred_sig_ptr 3
+functions may be invoked on
+.Fa cred
+to retrieve the various parts of the generated credential.
+.Pp
+Please note that
+.Fn fido_dev_make_cred
+is synchronous and will block if necessary.
+.Sh RETURN VALUES
+The error codes returned by
+.Fn fido_dev_make_cred
+are defined in
+.In fido/err.h .
+On success,
+.Dv FIDO_OK
+is returned.
+.Sh SEE ALSO
+.Xr fido_cred_new 3 ,
+.Xr fido_cred_set_authdata 3
diff -Nru mysql-8.0-8.0.26/extra/libfido2/man/fido_dev_open.3 mysql-8.0-8.0.27/extra/libfido2/man/fido_dev_open.3
--- mysql-8.0-8.0.26/extra/libfido2/man/fido_dev_open.3	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/man/fido_dev_open.3	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,192 @@
+.\" Copyright (c) 2018 Yubico AB. All rights reserved.
+.\" Use of this source code is governed by a BSD-style
+.\" license that can be found in the LICENSE file.
+.\"
+.Dd $Mdocdate: May 25 2018 $
+.Dt FIDO_DEV_OPEN 3
+.Os
+.Sh NAME
+.Nm fido_dev_open ,
+.Nm fido_dev_close ,
+.Nm fido_dev_cancel ,
+.Nm fido_dev_new ,
+.Nm fido_dev_free ,
+.Nm fido_dev_force_fido2 ,
+.Nm fido_dev_force_u2f ,
+.Nm fido_dev_is_fido2 ,
+.Nm fido_dev_supports_cred_prot ,
+.Nm fido_dev_supports_pin ,
+.Nm fido_dev_has_pin ,
+.Nm fido_dev_protocol ,
+.Nm fido_dev_build ,
+.Nm fido_dev_flags ,
+.Nm fido_dev_major ,
+.Nm fido_dev_minor
+.Nd FIDO 2 device open/close and related functions
+.Sh SYNOPSIS
+.In fido.h
+.Ft int
+.Fn fido_dev_open "fido_dev_t *dev" "const char *path"
+.Ft int
+.Fn fido_dev_close "fido_dev_t *dev"
+.Ft int
+.Fn fido_dev_cancel "fido_dev_t *dev"
+.Ft fido_dev_t *
+.Fn fido_dev_new "void"
+.Ft void
+.Fn fido_dev_free "fido_dev_t **dev_p"
+.Ft void
+.Fn fido_dev_force_fido2 "fido_dev_t *dev"
+.Ft void
+.Fn fido_dev_force_u2f "fido_dev_t *dev"
+.Ft bool
+.Fn fido_dev_is_fido2 "const fido_dev_t *dev"
+.Ft bool
+.Fn fido_dev_supports_cred_prot "const fido_dev_t *dev"
+.Ft bool
+.Fn fido_dev_supports_pin "const fido_dev_t *dev"
+.Ft bool
+.Fn fido_dev_has_pin "const fido_dev_t *dev"
+.Ft uint8_t
+.Fn fido_dev_protocol "const fido_dev_t *dev"
+.Ft uint8_t
+.Fn fido_dev_build "const fido_dev_t *dev"
+.Ft uint8_t
+.Fn fido_dev_flags "const fido_dev_t *dev"
+.Ft uint8_t
+.Fn fido_dev_major "const fido_dev_t *dev"
+.Ft uint8_t
+.Fn fido_dev_minor "const fido_dev_t *dev"
+.Sh DESCRIPTION
+The
+.Fn fido_dev_open
+function opens the device pointed to by
+.Fa path ,
+where
+.Fa dev
+is a freshly allocated or otherwise closed
+.Vt fido_dev_t .
+.Pp
+The
+.Fn fido_dev_close
+function closes the device represented by
+.Fa dev .
+If
+.Fa dev
+is already closed,
+.Fn fido_dev_close
+is a NOP.
+.Pp
+The
+.Fn fido_dev_cancel
+function cancels any pending requests on
+.Fa dev .
+.Pp
+The
+.Fn fido_dev_new
+function returns a pointer to a newly allocated, empty
+.Vt fido_dev_t .
+If memory cannot be allocated, NULL is returned.
+.Pp
+The
+.Fn fido_dev_free
+function releases the memory backing
+.Fa *dev_p ,
+where
+.Fa *dev_p
+must have been previously allocated by
+.Fn fido_dev_new .
+On return,
+.Fa *dev_p
+is set to NULL.
+Either
+.Fa dev_p
+or
+.Fa *dev_p
+may be NULL, in which case
+.Fn fido_dev_free
+is a NOP.
+.Pp
+The
+.Fn fido_dev_force_fido2
+function can be used to force CTAP2 communication with
+.Fa dev .
+.Pp
+The
+.Fn fido_dev_force_u2f
+function can be used to force CTAP1 (U2F) communication with
+.Fa dev .
+.Pp
+The
+.Fn fido_dev_is_fido2
+function returns
+.Dv true
+if
+.Fa dev
+is a FIDO 2 device.
+.Pp
+The
+.Fn fido_dev_supports_cred_prot
+function returns
+.Dv true
+if
+.Fa dev
+supports FIDO 2.1 Credential Protection.
+.Pp
+The
+.Fn fido_dev_supports_pin
+function returns
+.Dv true
+if
+.Fa dev
+supports FIDO 2.0 Client PINs.
+.Pp
+The
+.Fn fido_dev_has_pin
+function returns
+.Dv true
+if
+.Fa dev
+has a FIDO 2.0 Client PIN set.
+.Pp
+The
+.Fn fido_dev_protocol
+function returns the CTAPHID protocol version identifier of
+.Fa dev .
+.Pp
+The
+.Fn fido_dev_build
+function returns the CTAPHID build version number of
+.Fa dev .
+.Pp
+The
+.Fn fido_dev_flags
+function returns the CTAPHID capabilities flags of
+.Fa dev .
+.Pp
+The
+.Fn fido_dev_major
+function returns the CTAPHID major version number of
+.Fa dev .
+.Pp
+The
+.Fn fido_dev_minor
+function returns the CTAPHID minor version number of
+.Fa dev .
+.Pp
+For the format and meaning of the CTAPHID parameters returned by
+functions above, please refer to the FIDO Client to Authenticator
+Protocol (CTAP) specification.
+.Sh RETURN VALUES
+On success,
+.Fn fido_dev_open
+and
+.Fn fido_dev_close
+return
+.Dv FIDO_OK .
+On error, a different error code defined in
+.In fido/err.h
+is returned.
+.Sh SEE ALSO
+.Xr fido_dev_info_manifest 3 ,
+.Xr fido_dev_set_io_functions 3
diff -Nru mysql-8.0-8.0.26/extra/libfido2/man/fido_dev_set_io_functions.3 mysql-8.0-8.0.27/extra/libfido2/man/fido_dev_set_io_functions.3
--- mysql-8.0-8.0.26/extra/libfido2/man/fido_dev_set_io_functions.3	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/man/fido_dev_set_io_functions.3	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,152 @@
+.\" Copyright (c) 2018 Yubico AB. All rights reserved.
+.\" Use of this source code is governed by a BSD-style
+.\" license that can be found in the LICENSE file.
+.\"
+.Dd $Mdocdate: May 25 2018 $
+.Dt FIDO_DEV_SET_IO_FUNCTIONS 3
+.Os
+.Sh NAME
+.Nm fido_dev_set_io_functions
+.Nd FIDO 2 device I/O interface
+.Sh SYNOPSIS
+.In fido.h
+.Bd -literal
+typedef void *fido_dev_io_open_t(const char *);
+typedef void  fido_dev_io_close_t(void *);
+typedef int   fido_dev_io_read_t(void *, unsigned char *, size_t, int);
+typedef int   fido_dev_io_write_t(void *, const unsigned char *, size_t);
+typedef int   fido_dev_io_rx_t(struct fido_dev *, uint8_t, unsigned char *, size_t, int);
+typedef int   fido_dev_io_tx_t(struct fido_dev *, uint8_t, const unsigned char *, size_t);
+
+typedef struct fido_dev_io {
+	fido_dev_io_open_t  *open;
+	fido_dev_io_close_t *close;
+	fido_dev_io_read_t  *read;
+	fido_dev_io_write_t *write;
+	fido_dev_io_rx_t    *rx;
+	fido_dev_io_tx_t    *tx;
+} fido_dev_io_t;
+.Ed
+.Ft int
+.Fn fido_dev_set_io_functions "fido_dev_t *dev" "const fido_dev_io_t *io"
+.Sh DESCRIPTION
+The
+.Nm
+interface defines the I/O and transmission handlers used to talk to
+.Fa dev .
+Its usage is optional.
+By default,
+.Em libfido2
+will use the operating system's native HID interface to talk CTAP2 to
+a FIDO device.
+.Pp
+A
+.Vt fido_dev_io_open_t
+function is expected to return a non-NULL opaque pointer on success,
+and NULL on error.
+The returned opaque pointer is never dereferenced by
+.Em libfido2 .
+.Pp
+A
+.Vt fido_dev_io_close_t
+function receives the opaque handle obtained from
+.Vt fido_dev_io_open_t .
+It is not expected to be idempotent.
+.Pp
+A
+.Vt fido_dev_io_read_t
+function reads a single HID report from
+.Fa dev .
+The first parameter taken is the opaque handle obtained from
+.Vt fido_dev_io_open_t .
+The read buffer is pointed to by the second parameter, and the
+third parameter holds its size.
+The last argument passed to
+.Vt fido_dev_io_read_t
+is the number of milliseconds the caller is willing to sleep,
+should the call need to block.
+If this value holds -1,
+.Vt fido_dev_io_read_t
+may block indefinitely.
+The number of bytes read is returned.
+On error, -1 is returned.
+.Pp
+A
+.Vt fido_dev_io_write_t
+function writes a single HID report to
+.Fa dev .
+The first parameter taken is the opaque handle returned by
+.Vt fido_dev_io_open_t .
+The write buffer is pointed to by the second parameter, and the
+third parameter holds its size.
+A
+.Vt fido_dev_io_write_t
+function may block.
+The number of bytes written is returned.
+On error, -1 is returned.
+.Pp
+A
+.Vt fido_dev_io_rx_t
+function receives a complete CTAP2 message from
+.Fa dev .
+The first parameter taken is a pointer to
+.Fa dev .
+The second parameter holds the expected CTAP2 command byte.
+The read buffer is pointed to by the third parameter, and the
+fourth parameter holds its size.
+The last argument passed to
+.Vt fido_dev_io_rx_t
+is the number of milliseconds the caller is willing to sleep,
+should the call need to block.
+If this value holds -1,
+.Vt fido_dev_io_rx_t
+may block indefinitely.
+The number of bytes read is returned.
+On error, -1 is returned.
+.Pp
+A
+.Vt fido_dev_io_tx_t
+function transmits a complete CTAP2 message to
+.Fa dev .
+The first parameter taken is a pointer to
+.Fa dev .
+The second parameter holds the CTAP2 command byte.
+The write buffer is pointed to by the third parameter, and the
+fourth parameter holds its size.
+A
+.Vt fido_dev_io_tx_t
+function may block.
+On success, 0 is returned.
+On error, -1 is returned.
+.Pp
+When calling
+.Fn fido_dev_set_io_functions ,
+the
+.Fa open ,
+.Fa close ,
+.Fa read
+and
+.Fa write
+fields of
+.Fa io
+may not be NULL.
+Either
+.Fa rx
+or
+.Fa tx
+may be NULL, in which case
+.Em libfido2
+uses its corresponding CTAP2 HID transport method.
+.Pp
+No references to
+.Fa io
+are held by
+.Fn fido_dev_set_io_functions .
+.Sh RETURN VALUES
+On success,
+.Fn fido_dev_set_io_functions
+returns
+.Dv FIDO_OK .
+On error, a different error code defined in
+.In fido/err.h
+is returned.
diff -Nru mysql-8.0-8.0.26/extra/libfido2/man/fido_dev_set_pin.3 mysql-8.0-8.0.27/extra/libfido2/man/fido_dev_set_pin.3
--- mysql-8.0-8.0.26/extra/libfido2/man/fido_dev_set_pin.3	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/man/fido_dev_set_pin.3	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,88 @@
+.\" Copyright (c) 2018 Yubico AB. All rights reserved.
+.\" Use of this source code is governed by a BSD-style
+.\" license that can be found in the LICENSE file.
+.\"
+.Dd $Mdocdate: May 25 2018 $
+.Dt FIDO_DEV_SET_PIN 3
+.Os
+.Sh NAME
+.Nm fido_dev_set_pin ,
+.Nm fido_dev_get_retry_count ,
+.Nm fido_dev_reset
+.Nd FIDO 2 device management functions
+.Sh SYNOPSIS
+.In fido.h
+.Ft int
+.Fn fido_dev_set_pin "fido_dev_t *dev" "const char *pin" "const char *oldpin"
+.Ft int
+.Fn fido_dev_get_retry_count "fido_dev_t *dev" "int *retries"
+.Ft int
+.Fn fido_dev_reset "fido_dev_t *dev"
+.Sh DESCRIPTION
+The
+.Fn fido_dev_set_pin
+function sets the PIN of device
+.Fa dev
+to
+.Fa pin ,
+where
+.Fa pin
+is a NUL-terminated UTF-8 string.
+If
+.Fa oldpin
+is not NULL, the device's PIN is changed from
+.Fa oldpin
+to
+.Fa pin ,
+where
+.Fa pin
+and
+.Fa oldpin
+are NUL-terminated UTF-8 strings.
+.Pp
+The
+.Fn fido_dev_get_retry_count
+function fills
+.Fa retries
+with the number of PIN retries left in
+.Fa dev
+before lock-out, where
+.Fa retries
+is an addressable pointer.
+.Pp
+The
+.Fn fido_dev_reset
+function performs a reset on
+.Fa dev ,
+resetting the device's PIN and erasing credentials stored on the
+device.
+.Pp
+Please note that
+.Fn fido_dev_set_pin ,
+.Fn fido_dev_get_retry_count ,
+and
+.Fn fido_dev_reset
+are synchronous and will block if necessary.
+.Sh RETURN VALUES
+The error codes returned by
+.Fn fido_dev_set_pin ,
+.Fn fido_dev_get_retry_count ,
+and
+.Fn fido_dev_reset
+are defined in
+.In fido/err.h .
+On success,
+.Dv FIDO_OK
+is returned.
+.Sh CAVEATS
+Regarding
+.Fn fido_dev_reset ,
+the actual user-flow to perform a reset is outside the scope of the
+FIDO2 specification, and may therefore vary depending on the
+authenticator.
+Yubico authenticators will return
+.Dv FIDO_ERR_NOT_ALLOWED
+if a reset is issued later than 5 seconds after power-up, and
+.Dv FIDO_ERR_ACTION_TIMEOUT
+if the user fails to confirm the reset by touching the key
+within 30 seconds.
diff -Nru mysql-8.0-8.0.26/extra/libfido2/man/fido_init.3 mysql-8.0-8.0.27/extra/libfido2/man/fido_init.3
--- mysql-8.0-8.0.26/extra/libfido2/man/fido_init.3	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/man/fido_init.3	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,40 @@
+.\" Copyright (c) 2018 Yubico AB. All rights reserved.
+.\" Use of this source code is governed by a BSD-style
+.\" license that can be found in the LICENSE file.
+.\"
+.Dd $Mdocdate: May 25 2018 $
+.Dt FIDO_INIT 3
+.Os
+.Sh NAME
+.Nm fido_init
+.Nd initialise the FIDO 2 library
+.Sh SYNOPSIS
+.In fido.h
+.Ft void
+.Fn fido_init "int flags"
+.Sh DESCRIPTION
+The
+.Fn fido_init
+function initialises the
+.Em libfido2
+library.
+Its invocation must precede that of any other
+.Em libfido2
+function.
+If
+.Dv FIDO_DEBUG
+is set in
+.Fa flags ,
+then
+debug output will be emitted by
+.Em libfido2
+on
+.Em stderr .
+Alternatively, the
+.Ev FIDO_DEBUG
+environment variable may be set.
+.Sh SEE ALSO
+.Xr fido_assert_new 3 ,
+.Xr fido_cred_new 3 ,
+.Xr fido_dev_info_manifest 3 ,
+.Xr fido_dev_open 3
diff -Nru mysql-8.0-8.0.26/extra/libfido2/man/fido_strerr.3 mysql-8.0-8.0.27/extra/libfido2/man/fido_strerr.3
--- mysql-8.0-8.0.26/extra/libfido2/man/fido_strerr.3	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/man/fido_strerr.3	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,27 @@
+.\" Copyright (c) 2018 Yubico AB. All rights reserved.
+.\" Use of this source code is governed by a BSD-style
+.\" license that can be found in the LICENSE file.
+.\"
+.Dd $Mdocdate: May 25 2018 $
+.Dt FIDO_STRERR 3
+.Os
+.Sh NAME
+.Nm fido_strerr
+.Nd FIDO 2 error codes
+.Sh SYNOPSIS
+.In fido.h
+.Ft const char *
+.Fn fido_strerr "int n"
+.Sh DESCRIPTION
+The
+.Fn fido_strerr
+function translates the error code
+.Fa n
+into a readable string,
+where
+.Fa n
+is an error code defined in
+.In fido/err.h .
+.Fn fido_strerr
+never returns NULL.
+Returned pointers point to static strings.
diff -Nru mysql-8.0-8.0.26/extra/libfido2/man/NOTES mysql-8.0-8.0.27/extra/libfido2/man/NOTES
--- mysql-8.0-8.0.26/extra/libfido2/man/NOTES	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/man/NOTES	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,7 @@
+To generate .partial files for https://developers.yubico.com/:
+
+$ make -C build man_symlink_html_partial
+$ (cd build/man && pax -p p -r -w *.partial /tmp/partial)
+
+Use mandoc 1.14.4. Otherwise, adjust dyc.css to mandoc's HTML
+output.
diff -Nru mysql-8.0-8.0.26/extra/libfido2/man/rs256_pk_new.3 mysql-8.0-8.0.27/extra/libfido2/man/rs256_pk_new.3
--- mysql-8.0-8.0.26/extra/libfido2/man/rs256_pk_new.3	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/man/rs256_pk_new.3	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,122 @@
+.\" Copyright (c) 2018 Yubico AB. All rights reserved.
+.\" Use of this source code is governed by a BSD-style
+.\" license that can be found in the LICENSE file.
+.\"
+.Dd $Mdocdate: May 24 2018 $
+.Dt RS256_PK_NEW 3
+.Os
+.Sh NAME
+.Nm rs256_pk_new ,
+.Nm rs256_pk_free ,
+.Nm rs256_pk_from_RSA ,
+.Nm rs256_pk_from_ptr ,
+.Nm rs256_pk_to_EVP_PKEY
+.Nd FIDO 2 COSE RS256 API
+.Sh SYNOPSIS
+.In openssl/rsa.h
+.In fido/rs256.h
+.Ft rs256_pk_t *
+.Fn rs256_pk_new "void"
+.Ft void
+.Fn rs256_pk_free "rs256_pk_t **pkp"
+.Ft int
+.Fn rs256_pk_from_RSA "rs256_pk_t *pk" "const RSA *rsa"
+.Ft int
+.Fn rs256_pk_from_ptr "rs256_pk_t *pk" "const void *ptr" "size_t len"
+.Ft EVP_PKEY *
+.Fn rs256_pk_to_EVP_PKEY "const rs256_pk_t *pk"
+.Sh DESCRIPTION
+RS256 is the name given in the CBOR Object Signing and Encryption
+(COSE) RFC to PKCS#1.5 2048-bit RSA with SHA-256.
+The COSE RS256 API of
+.Em libfido2
+is an auxiliary API with routines to convert between the different
+RSA public key types used in
+.Em libfido2
+and
+.Em OpenSSL .
+.Pp
+In
+.Em libfido2 ,
+RS256 public keys are abstracted by the
+.Vt rs256_pk_t
+type.
+.Pp
+The
+.Fn rs256_pk_new
+function returns a pointer to a newly allocated, empty
+.Vt rs256_pk_t
+type.
+If memory cannot be allocated, NULL is returned.
+.Pp
+The
+.Fn rs256_pk_free
+function releases the memory backing
+.Fa *pkp ,
+where
+.Fa *pkp
+must have been previously allocated by
+.Fn rs256_pk_new .
+On return,
+.Fa *pkp
+is set to NULL.
+Either
+.Fa pkp
+or
+.Fa *pkp
+may be NULL, in which case
+.Fn rs256_pk_free
+is a NOP.
+.Pp
+The
+.Fn rs256_pk_from_RSA
+function fills
+.Fa pk
+with the contents of
+.Fa rsa .
+No references to
+.Fa rsa
+are kept.
+.Pp
+The
+.Fn rs256_pk_from_ptr
+function fills
+.Fa pk
+with the contents of
+.Fa ptr ,
+where
+.Fa ptr
+points to
+.Fa len
+bytes.
+No references to
+.Fa ptr
+are kept.
+.Pp
+The
+.Fn rs256_pk_to_EVP_PKEY
+function converts
+.Fa pk
+to a newly allocated
+.Fa EVP_PKEY
+type with a reference count of 1.
+No internal references to the returned pointer are kept.
+If an error occurs,
+.Fn rs256_pk_to_EVP_PKEY
+returns NULL.
+.Sh RETURN VALUES
+The
+.Fn rs256_pk_from_RSA
+and
+.Fn rs256_pk_from_ptr
+functions return
+.Dv FIDO_OK
+on success.
+On error, a different error code defined in
+.In fido/err.h
+is returned.
+.Sh SEE ALSO
+.Xr eddsa_pk_new 3 ,
+.Xr es256_pk_new 3 ,
+.Xr fido_assert_verify 3 ,
+.Xr fido_cred_pubkey_ptr 3
diff -Nru mysql-8.0-8.0.26/extra/libfido2/man/style.css mysql-8.0-8.0.27/extra/libfido2/man/style.css
--- mysql-8.0-8.0.26/extra/libfido2/man/style.css	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/man/style.css	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,24 @@
+* { margin: 0; padding: 0; }
+
+body {
+	font-family: monospace;
+	font-size: 1em;
+	margin: 2% auto;
+	max-width: 54em;
+}
+
+ul { margin-left: 1em; }
+a { color: #009900; }
+.Sh { font-size: 1em; padding-top: 1em; padding-bottom: 1em; }
+.foot { padding-top: 1em; }
+
+table.head, table.foot { width: 100%; }
+td.head-rtitle, td.foot-os { text-align: right; }
+td.head-vol { text-align: center; }
+div.Pp { margin: 1ex 0ex; }
+div.Nd, div.Bf, div.Op { display: inline; }
+span.Pa, span.Ad { font-style: italic; }
+span.Ms { font-weight: bold; }
+dl.Bl-diag > dt { font-weight: bold; }
+code.Nm, code.Fl, code.Cm, code.Ic, code.In, code.Fd, code.Fn,
+code.Cd { font-weight: bold; font-family: inherit; }
diff -Nru mysql-8.0-8.0.26/extra/libfido2/NEWS mysql-8.0-8.0.27/extra/libfido2/NEWS
--- mysql-8.0-8.0.26/extra/libfido2/NEWS	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/NEWS	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,110 @@
+* Version 1.5.0 (2020-09-01)
+ ** hid_linux: return FIDO_OK if no devices are found.
+ ** hid_osx:
+  - repair communication with U2F tokens, gh#166;
+  - reliability fixes.
+ ** fido2-{assert,cred}: new options to explicitly toggle UP, UV.
+ ** Support for configurable report lengths.
+ ** New API calls:
+  - fido_cbor_info_maxcredcntlst;
+  - fido_cbor_info_maxcredidlen;
+  - fido_cred_aaguid_len;
+  - fido_cred_aaguid_ptr;
+  - fido_dev_get_touch_begin;
+  - fido_dev_get_touch_status.
+ ** Use COSE_ECDH_ES256 with CTAP_CBOR_CLIENT_PIN; gh#154.
+ ** Allow CTAP messages up to 2048 bytes; gh#171.
+ ** Ensure we only list USB devices by default.
+
+* Version 1.4.0 (2020-04-15)
+ ** hid_hidapi: hidapi backend; enable with -DUSE_HIDAPI=1.
+ ** Fall back to U2F if the key claims to, but does not support FIDO2.
+ ** FIDO2 credential protection (credprot) support.
+ ** New API calls:
+  - fido_cbor_info_fwversion;
+  - fido_cred_prot;
+  - fido_cred_set_prot;
+  - fido_dev_set_transport_functions;
+  - fido_set_log_handler.
+ ** Support for FreeBSD.
+ ** Support for C++.
+ ** Support for MSYS.
+ ** Fixed EdDSA and RSA self-attestation.
+
+* Version 1.3.1 (2020-02-19)
+ ** fix zero-ing of le1 and le2 when talking to a U2F device.
+ ** dropping sk-libfido2 middleware, please find it in the openssh tree.
+
+* Version 1.3.0 (2019-11-28)
+ ** assert/hmac: encode public key as per spec, gh#60.
+ ** fido2-cred: fix creation of resident keys.
+ ** fido2-{assert,cred}: support for hmac-secret extension.
+ ** hid_osx: detect device removal, gh#56.
+ ** hid_osx: fix device detection in MacOS Catalina.
+ ** New API calls:
+  - fido_assert_set_authdata_raw;
+  - fido_assert_sigcount;
+  - fido_cred_set_authdata_raw;
+  - fido_dev_cancel.
+ ** Middleware library for use by OpenSSH.
+ ** Support for biometric enrollment.
+ ** Support for OpenBSD.
+ ** Support for self-attestation.
+
+* Version 1.2.0 (released 2019-07-26)
+ ** Credential management support.
+ ** New API reflecting FIDO's 3-state booleans (true, false, absent):
+  - fido_assert_set_up;
+  - fido_assert_set_uv;
+  - fido_cred_set_rk;
+  - fido_cred_set_uv.
+ ** Command-line tools for Windows.
+ ** Documentation and reliability fixes.
+ ** fido_{assert,cred}_set_options() are now marked as deprecated.
+
+* Version 1.1.0 (released 2019-05-08)
+ ** MacOS: fix IOKit crash on HID read.
+ ** Windows: fix contents of release file.
+ ** EdDSA (Ed25519) support.
+ ** fido_dev_make_cred: fix order of CBOR map keys.
+ ** fido_dev_get_assert: plug memory leak when operating on U2F devices.
+
+* Version 1.0.0 (released 2019-03-21)
+ ** Native HID support on Linux, MacOS, and Windows.
+ ** fido2-{assert,cred}: new -u option to force U2F on dual authenticators.
+ ** fido2-assert: support for multiple resident keys with the same RP.
+ ** Strict checks for CTAP2 compliance on received CBOR payloads.
+ ** Better fuzzing harnesses.
+ ** Documentation and reliability fixes.
+
+* Version 0.4.0 (released 2019-01-07)
+ ** fido2-assert: print the user id for resident credentials.
+ ** Fix encoding of COSE algorithms when making a credential.
+ ** Rework purpose of fido_cred_set_type; no ABI change.
+ ** Minor documentation and code fixes.
+
+* Version 0.3.0 (released 2018-09-11)
+ ** Various reliability fixes.
+ ** Merged fuzzing instrumentation.
+ ** Added regress tests.
+ ** Added support for FIDO 2's hmac-secret extension.
+ ** New API calls:
+  - fido_assert_hmac_secret_len;
+  - fido_assert_hmac_secret_ptr;
+  - fido_assert_set_extensions;
+  - fido_assert_set_hmac_salt;
+  - fido_cred_set_extensions;
+  - fido_dev_force_fido2.
+ ** Support for native builds with Microsoft Visual Studio 17.
+
+* Version 0.2.0 (released 2018-06-20)
+ ** Added command-line tools.
+ ** Added a couple of missing get functions.
+
+* Version 0.1.1 (released 2018-06-05)
+ ** Added documentation.
+ ** Added OpenSSL 1.0 support.
+ ** Minor fixes.
+
+* Version 0.1.0 (released 2018-05-18)
+ ** First beta release.
diff -Nru mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/bsd-getline.c mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/bsd-getline.c
--- mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/bsd-getline.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/bsd-getline.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,115 @@
+/*	$NetBSD: getline.c,v 1.1.1.6 2015/01/02 20:34:27 christos Exp $	*/
+
+/*	NetBSD: getline.c,v 1.2 2014/09/16 17:23:50 christos Exp 	*/
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* NETBSD ORIGINAL: external/bsd/file/dist/src/getline.c */
+
+#include "openbsd-compat.h"
+
+#if 0
+#include "file.h"
+#endif
+
+#if !HAVE_GETLINE
+#include <stdlib.h>
+#include <stdio.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <errno.h>
+#include <string.h>
+
+static ssize_t
+getdelim(char **buf, size_t *bufsiz, int delimiter, FILE *fp)
+{
+	char *ptr, *eptr;
+
+
+	if (*buf == NULL || *bufsiz == 0) {
+		if ((*buf = malloc(BUFSIZ)) == NULL)
+			return -1;
+		*bufsiz = BUFSIZ;
+	}
+
+	for (ptr = *buf, eptr = *buf + *bufsiz;;) {
+		int c = fgetc(fp);
+		if (c == -1) {
+			if (feof(fp)) {
+				ssize_t diff = (ssize_t)(ptr - *buf);
+				if (diff != 0) {
+					*ptr = '\0';
+					return diff;
+				}
+			}
+			return -1;
+		}
+		*ptr++ = (char)c;
+		if (c == delimiter) {
+			*ptr = '\0';
+			return ptr - *buf;
+		}
+		if (ptr + 2 >= eptr) {
+			char *nbuf;
+			size_t nbufsiz = *bufsiz * 2;
+			ssize_t d = ptr - *buf;
+			if ((nbuf = realloc(*buf, nbufsiz)) == NULL)
+				return -1;
+			*buf = nbuf;
+			*bufsiz = nbufsiz;
+			eptr = nbuf + nbufsiz;
+			ptr = nbuf + d;
+		}
+	}
+}
+
+ssize_t
+getline(char **buf, size_t *bufsiz, FILE *fp)
+{
+	return getdelim(buf, bufsiz, '\n', fp);
+}
+
+#endif
+
+#ifdef TEST
+int
+main(int argc, char *argv[])
+{
+	char *p = NULL;
+	ssize_t len;
+	size_t n = 0;
+
+	while ((len = getline(&p, &n, stdin)) != -1)
+		(void)printf("%" SIZE_T_FORMAT "d %s", len, p);
+	free(p);
+	return 0;
+}
+#endif
diff -Nru mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/bsd-getpagesize.c mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/bsd-getpagesize.c
--- mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/bsd-getpagesize.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/bsd-getpagesize.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,27 @@
+/* Placed in the public domain */
+
+#include "openbsd-compat.h"
+
+#if !defined(HAVE_GETPAGESIZE)
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <limits.h>
+
+int
+getpagesize(void)
+{
+#if defined(HAVE_SYSCONF) && defined(_SC_PAGESIZE)
+	long r = sysconf(_SC_PAGESIZE);
+	if (r > 0 && r < INT_MAX)
+		return (int)r;
+#endif
+	/*
+	 * This is at the lower end of common values and appropriate for
+	 * our current use of getpagesize() in recallocarray().
+	 */
+	return 4096;
+}
+
+#endif /* !defined(HAVE_GETPAGESIZE) */
diff -Nru mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/clock_gettime.c mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/clock_gettime.c
--- mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/clock_gettime.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/clock_gettime.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2020 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include "openbsd-compat.h"
+
+#if !defined(HAVE_CLOCK_GETTIME)
+
+#if _WIN32
+int
+clock_gettime(clockid_t clock_id, struct timespec *tp)
+{
+	ULONGLONG ms;
+
+	if (clock_id != CLOCK_MONOTONIC) {
+		errno = EINVAL;
+		return (-1);
+	}
+
+	ms = GetTickCount64();
+	tp->tv_sec = ms / 1000L;
+	tp->tv_nsec = (ms % 1000L) * 1000000L;
+
+	return (0);
+}
+#else
+#error "please provide an implementation of clock_gettime() for your platform"
+#endif /* _WIN32 */
+
+#endif /* !defined(HAVE_CLOCK_GETTIME) */
diff -Nru mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/err.h mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/err.h
--- mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/err.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/err.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,85 @@
+/*
+ * Public domain
+ * err.h compatibility shim
+ */
+
+#ifndef _COMPAT_ERR_H
+#define _COMPAT_ERR_H
+
+#if !defined(HAVE_ERR_H)
+
+#include <errno.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#if defined(_MSC_VER)
+__declspec(noreturn)
+#else
+__attribute__((noreturn))
+#endif
+static inline void
+err(int eval, const char *fmt, ...)
+{
+	int sverrno = errno;
+	va_list ap;
+
+	va_start(ap, fmt);
+	if (fmt != NULL) {
+		vfprintf(stderr, fmt, ap);
+		fprintf(stderr, ": ");
+	}
+	va_end(ap);
+	fprintf(stderr, "%s\n", strerror(sverrno));
+	exit(eval);
+}
+
+#if defined(_MSC_VER)
+__declspec(noreturn)
+#else
+__attribute__((noreturn))
+#endif
+static inline void
+errx(int eval, const char *fmt, ...)
+{
+	va_list ap;
+
+	va_start(ap, fmt);
+	if (fmt != NULL)
+		vfprintf(stderr, fmt, ap);
+	va_end(ap);
+	fprintf(stderr, "\n");
+	exit(eval);
+}
+
+static inline void
+warn(const char *fmt, ...)
+{
+	int sverrno = errno;
+	va_list ap;
+
+	va_start(ap, fmt);
+	if (fmt != NULL) {
+		vfprintf(stderr, fmt, ap);
+		fprintf(stderr, ": ");
+	}
+	va_end(ap);
+	fprintf(stderr, "%s\n", strerror(sverrno));
+}
+
+static inline void
+warnx(const char *fmt, ...)
+{
+	va_list ap;
+
+	va_start(ap, fmt);
+	if (fmt != NULL)
+		vfprintf(stderr, fmt, ap);
+	va_end(ap);
+	fprintf(stderr, "\n");
+}
+
+#endif /* !defined(HAVE_ERR_H) */
+
+#endif /* _COMPAT_ERR_H */
diff -Nru mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/explicit_bzero.c mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/explicit_bzero.c
--- mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/explicit_bzero.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/explicit_bzero.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,57 @@
+/* OPENBSD ORIGINAL: lib/libc/string/explicit_bzero.c */
+/*	$OpenBSD: explicit_bzero.c,v 1.1 2014/01/22 21:06:45 tedu Exp $ */
+/*
+ * Public domain.
+ * Written by Ted Unangst
+ */
+
+#include "openbsd-compat.h"
+
+#if !defined(HAVE_EXPLICIT_BZERO) && !defined(_WIN32)
+
+#include <string.h>
+
+/*
+ * explicit_bzero - don't let the compiler optimize away bzero
+ */
+
+#ifdef HAVE_MEMSET_S
+
+void
+explicit_bzero(void *p, size_t n)
+{
+	if (n == 0)
+		return;
+	(void)memset_s(p, n, 0, n);
+}
+
+#else /* HAVE_MEMSET_S */
+
+/*
+ * Indirect bzero through a volatile pointer to hopefully avoid
+ * dead-store optimisation eliminating the call.
+ */
+static void (* volatile ssh_bzero)(void *, size_t) = bzero;
+
+void
+explicit_bzero(void *p, size_t n)
+{
+	if (n == 0)
+		return;
+	/*
+	 * clang -fsanitize=memory needs to intercept memset-like functions
+	 * to correctly detect memory initialisation. Make sure one is called
+	 * directly since our indirection trick above successfully confuses it.
+	 */
+#if defined(__has_feature)
+# if __has_feature(memory_sanitizer)
+	memset(p, 0, n);
+# endif
+#endif
+
+	ssh_bzero(p, n);
+}
+
+#endif /* HAVE_MEMSET_S */
+
+#endif /* !defined(HAVE_EXPLICIT_BZERO) && !defined(_WIN32) */
diff -Nru mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/explicit_bzero_win32.c mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/explicit_bzero_win32.c
--- mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/explicit_bzero_win32.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/explicit_bzero_win32.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,19 @@
+/*
+ * Public domain.
+ * Win32 explicit_bzero compatibility shim.
+ */
+
+#include "openbsd-compat.h"
+
+#if !defined(HAVE_EXPLICIT_BZERO) && defined(_WIN32)
+
+#include <windows.h>
+#include <string.h>
+
+void
+explicit_bzero(void *buf, size_t len)
+{
+	SecureZeroMemory(buf, len);
+}
+
+#endif /* !defined(HAVE_EXPLICIT_BZERO) && defined(_WIN32) */
diff -Nru mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/getopt.h mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/getopt.h
--- mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/getopt.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/getopt.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,74 @@
+/*	$OpenBSD: getopt.h,v 1.2 2008/06/26 05:42:04 ray Exp $	*/
+/*	$NetBSD: getopt.h,v 1.4 2000/07/07 10:43:54 ad Exp $	*/
+
+/*-
+ * Copyright (c) 2000 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Dieter Baron and Thomas Klausner.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _GETOPT_H_
+#define _GETOPT_H_
+
+/*
+ * GNU-like getopt_long() and 4.4BSD getsubopt()/optreset extensions
+ */
+#define no_argument        0
+#define required_argument  1
+#define optional_argument  2
+
+struct option {
+	/* name of long option */
+	const char *name;
+	/*
+	 * one of no_argument, required_argument, and optional_argument:
+	 * whether option takes an argument
+	 */
+	int has_arg;
+	/* if not NULL, set *flag to val when option found */
+	int *flag;
+	/* if flag not NULL, value to set *flag to; else return value */
+	int val;
+};
+
+int	 getopt_long(int, char * const *, const char *,
+	    const struct option *, int *);
+int	 getopt_long_only(int, char * const *, const char *,
+	    const struct option *, int *);
+#ifndef _GETOPT_DEFINED_
+#define _GETOPT_DEFINED_
+int	 getopt(int, char * const *, const char *);
+int	 getsubopt(char **, char * const *, char **);
+
+extern   char *optarg;                  /* getopt(3) external variables */
+extern   int opterr;
+extern   int optind;
+extern   int optopt;
+extern   int optreset;
+extern   char *suboptarg;               /* getsubopt(3) external variable */
+#endif
+ 
+#endif /* !_GETOPT_H_ */
diff -Nru mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/getopt_long.c mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/getopt_long.c
--- mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/getopt_long.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/getopt_long.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,523 @@
+/*	$OpenBSD: getopt_long.c,v 1.25 2011/03/05 22:10:11 guenther Exp $	*/
+/*	$NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $	*/
+
+/*
+ * Copyright (c) 2002 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Sponsored in part by the Defense Advanced Research Projects
+ * Agency (DARPA) and Air Force Research Laboratory, Air Force
+ * Materiel Command, USAF, under agreement number F39502-99-1-0512.
+ */
+/*-
+ * Copyright (c) 2000 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Dieter Baron and Thomas Klausner.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* OPENBSD ORIGINAL: lib/libc/stdlib/getopt_long.c */
+#include "openbsd-compat.h"
+
+#if !defined(HAVE_GETOPT)
+
+#if 0
+#include <err.h>
+#include <getopt.h>
+#endif
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+
+int	opterr = 1;		/* if error message should be printed */
+int	optind = 1;		/* index into parent argv vector */
+int	optopt = '?';		/* character checked for validity */
+int	optreset;		/* reset getopt */
+char    *optarg;		/* argument associated with option */
+
+#define PRINT_ERROR	((opterr) && (*options != ':'))
+
+#define FLAG_PERMUTE	0x01	/* permute non-options to the end of argv */
+#define FLAG_ALLARGS	0x02	/* treat non-options as args to option "-1" */
+#define FLAG_LONGONLY	0x04	/* operate as getopt_long_only */
+
+/* return values */
+#define	BADCH		(int)'?'
+#define	BADARG		((*options == ':') ? (int)':' : (int)'?')
+#define	INORDER 	(int)1
+
+#define	EMSG		""
+
+static int getopt_internal(int, char * const *, const char *,
+			   const struct option *, int *, int);
+static int parse_long_options(char * const *, const char *,
+			      const struct option *, int *, int);
+static int gcd(int, int);
+static void permute_args(int, int, int, char * const *);
+
+static char *place = EMSG; /* option letter processing */
+
+/* XXX: set optreset to 1 rather than these two */
+static int nonopt_start = -1; /* first non option argument (for permute) */
+static int nonopt_end = -1;   /* first option after non options (for permute) */
+
+/* Error messages */
+static const char recargchar[] = "option requires an argument -- %c";
+static const char recargstring[] = "option requires an argument -- %s";
+static const char ambig[] = "ambiguous option -- %.*s";
+static const char noarg[] = "option doesn't take an argument -- %.*s";
+static const char illoptchar[] = "unknown option -- %c";
+static const char illoptstring[] = "unknown option -- %s";
+
+/*
+ * Compute the greatest common divisor of a and b.
+ */
+static int
+gcd(int a, int b)
+{
+	int c;
+
+	c = a % b;
+	while (c != 0) {
+		a = b;
+		b = c;
+		c = a % b;
+	}
+
+	return (b);
+}
+
+/*
+ * Exchange the block from nonopt_start to nonopt_end with the block
+ * from nonopt_end to opt_end (keeping the same order of arguments
+ * in each block).
+ */
+static void
+permute_args(int panonopt_start, int panonopt_end, int opt_end,
+	char * const *nargv)
+{
+	int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos;
+	char *swap;
+
+	/*
+	 * compute lengths of blocks and number and size of cycles
+	 */
+	nnonopts = panonopt_end - panonopt_start;
+	nopts = opt_end - panonopt_end;
+	ncycle = gcd(nnonopts, nopts);
+	cyclelen = (opt_end - panonopt_start) / ncycle;
+
+	for (i = 0; i < ncycle; i++) {
+		cstart = panonopt_end+i;
+		pos = cstart;
+		for (j = 0; j < cyclelen; j++) {
+			if (pos >= panonopt_end)
+				pos -= nnonopts;
+			else
+				pos += nopts;
+			swap = nargv[pos];
+			/* LINTED const cast */
+			((char **) nargv)[pos] = nargv[cstart];
+			/* LINTED const cast */
+			((char **)nargv)[cstart] = swap;
+		}
+	}
+}
+
+/*
+ * parse_long_options --
+ *	Parse long options in argc/argv argument vector.
+ * Returns -1 if short_too is set and the option does not match long_options.
+ */
+static int
+parse_long_options(char * const *nargv, const char *options,
+	const struct option *long_options, int *idx, int short_too)
+{
+	char *current_argv, *has_equal;
+	size_t current_argv_len;
+	int i, match;
+
+	current_argv = place;
+	match = -1;
+
+	optind++;
+
+	if ((has_equal = strchr(current_argv, '=')) != NULL) {
+		/* argument found (--option=arg) */
+		current_argv_len = has_equal - current_argv;
+		has_equal++;
+	} else
+		current_argv_len = strlen(current_argv);
+
+	for (i = 0; long_options[i].name; i++) {
+		/* find matching long option */
+		if (strncmp(current_argv, long_options[i].name,
+		    current_argv_len))
+			continue;
+
+		if (strlen(long_options[i].name) == current_argv_len) {
+			/* exact match */
+			match = i;
+			break;
+		}
+		/*
+		 * If this is a known short option, don't allow
+		 * a partial match of a single character.
+		 */
+		if (short_too && current_argv_len == 1)
+			continue;
+
+		if (match == -1)	/* partial match */
+			match = i;
+		else {
+			/* ambiguous abbreviation */
+			if (PRINT_ERROR)
+				warnx(ambig, (int)current_argv_len,
+				     current_argv);
+			optopt = 0;
+			return (BADCH);
+		}
+	}
+	if (match != -1) {		/* option found */
+		if (long_options[match].has_arg == no_argument
+		    && has_equal) {
+			if (PRINT_ERROR)
+				warnx(noarg, (int)current_argv_len,
+				     current_argv);
+			/*
+			 * XXX: GNU sets optopt to val regardless of flag
+			 */
+			if (long_options[match].flag == NULL)
+				optopt = long_options[match].val;
+			else
+				optopt = 0;
+			return (BADARG);
+		}
+		if (long_options[match].has_arg == required_argument ||
+		    long_options[match].has_arg == optional_argument) {
+			if (has_equal)
+				optarg = has_equal;
+			else if (long_options[match].has_arg ==
+			    required_argument) {
+				/*
+				 * optional argument doesn't use next nargv
+				 */
+				optarg = nargv[optind++];
+			}
+		}
+		if ((long_options[match].has_arg == required_argument)
+		    && (optarg == NULL)) {
+			/*
+			 * Missing argument; leading ':' indicates no error
+			 * should be generated.
+			 */
+			if (PRINT_ERROR)
+				warnx(recargstring,
+				    current_argv);
+			/*
+			 * XXX: GNU sets optopt to val regardless of flag
+			 */
+			if (long_options[match].flag == NULL)
+				optopt = long_options[match].val;
+			else
+				optopt = 0;
+			--optind;
+			return (BADARG);
+		}
+	} else {			/* unknown option */
+		if (short_too) {
+			--optind;
+			return (-1);
+		}
+		if (PRINT_ERROR)
+			warnx(illoptstring, current_argv);
+		optopt = 0;
+		return (BADCH);
+	}
+	if (idx)
+		*idx = match;
+	if (long_options[match].flag) {
+		*long_options[match].flag = long_options[match].val;
+		return (0);
+	} else
+		return (long_options[match].val);
+}
+
+/*
+ * getopt_internal --
+ *	Parse argc/argv argument vector.  Called by user level routines.
+ */
+static int
+getopt_internal(int nargc, char * const *nargv, const char *options,
+	const struct option *long_options, int *idx, int flags)
+{
+	char *oli;				/* option letter list index */
+	int optchar, short_too;
+	static int posixly_correct = -1;
+
+	if (options == NULL)
+		return (-1);
+
+	/*
+	 * XXX Some GNU programs (like cvs) set optind to 0 instead of
+	 * XXX using optreset.  Work around this braindamage.
+	 */
+	if (optind == 0)
+		optind = optreset = 1;
+
+	/*
+	 * Disable GNU extensions if POSIXLY_CORRECT is set or options
+	 * string begins with a '+'.
+	 */
+	if (posixly_correct == -1 || optreset)
+		posixly_correct = (getenv("POSIXLY_CORRECT") != NULL);
+	if (*options == '-')
+		flags |= FLAG_ALLARGS;
+	else if (posixly_correct || *options == '+')
+		flags &= ~FLAG_PERMUTE;
+	if (*options == '+' || *options == '-')
+		options++;
+
+	optarg = NULL;
+	if (optreset)
+		nonopt_start = nonopt_end = -1;
+start:
+	if (optreset || !*place) {		/* update scanning pointer */
+		optreset = 0;
+		if (optind >= nargc) {          /* end of argument vector */
+			place = EMSG;
+			if (nonopt_end != -1) {
+				/* do permutation, if we have to */
+				permute_args(nonopt_start, nonopt_end,
+				    optind, nargv);
+				optind -= nonopt_end - nonopt_start;
+			}
+			else if (nonopt_start != -1) {
+				/*
+				 * If we skipped non-options, set optind
+				 * to the first of them.
+				 */
+				optind = nonopt_start;
+			}
+			nonopt_start = nonopt_end = -1;
+			return (-1);
+		}
+		if (*(place = nargv[optind]) != '-' ||
+		    (place[1] == '\0' && strchr(options, '-') == NULL)) {
+			place = EMSG;		/* found non-option */
+			if (flags & FLAG_ALLARGS) {
+				/*
+				 * GNU extension:
+				 * return non-option as argument to option 1
+				 */
+				optarg = nargv[optind++];
+				return (INORDER);
+			}
+			if (!(flags & FLAG_PERMUTE)) {
+				/*
+				 * If no permutation wanted, stop parsing
+				 * at first non-option.
+				 */
+				return (-1);
+			}
+			/* do permutation */
+			if (nonopt_start == -1)
+				nonopt_start = optind;
+			else if (nonopt_end != -1) {
+				permute_args(nonopt_start, nonopt_end,
+				    optind, nargv);
+				nonopt_start = optind -
+				    (nonopt_end - nonopt_start);
+				nonopt_end = -1;
+			}
+			optind++;
+			/* process next argument */
+			goto start;
+		}
+		if (nonopt_start != -1 && nonopt_end == -1)
+			nonopt_end = optind;
+
+		/*
+		 * If we have "-" do nothing, if "--" we are done.
+		 */
+		if (place[1] != '\0' && *++place == '-' && place[1] == '\0') {
+			optind++;
+			place = EMSG;
+			/*
+			 * We found an option (--), so if we skipped
+			 * non-options, we have to permute.
+			 */
+			if (nonopt_end != -1) {
+				permute_args(nonopt_start, nonopt_end,
+				    optind, nargv);
+				optind -= nonopt_end - nonopt_start;
+			}
+			nonopt_start = nonopt_end = -1;
+			return (-1);
+		}
+	}
+
+	/*
+	 * Check long options if:
+	 *  1) we were passed some
+	 *  2) the arg is not just "-"
+	 *  3) either the arg starts with -- we are getopt_long_only()
+	 */
+	if (long_options != NULL && place != nargv[optind] &&
+	    (*place == '-' || (flags & FLAG_LONGONLY))) {
+		short_too = 0;
+		if (*place == '-')
+			place++;		/* --foo long option */
+		else if (*place != ':' && strchr(options, *place) != NULL)
+			short_too = 1;		/* could be short option too */
+
+		optchar = parse_long_options(nargv, options, long_options,
+		    idx, short_too);
+		if (optchar != -1) {
+			place = EMSG;
+			return (optchar);
+		}
+	}
+
+	if ((optchar = (int)*place++) == (int)':' ||
+	    (optchar == (int)'-' && *place != '\0') ||
+	    (oli = strchr(options, optchar)) == NULL) {
+		/*
+		 * If the user specified "-" and  '-' isn't listed in
+		 * options, return -1 (non-option) as per POSIX.
+		 * Otherwise, it is an unknown option character (or ':').
+		 */
+		if (optchar == (int)'-' && *place == '\0')
+			return (-1);
+		if (!*place)
+			++optind;
+		if (PRINT_ERROR)
+			warnx(illoptchar, optchar);
+		optopt = optchar;
+		return (BADCH);
+	}
+	if (long_options != NULL && optchar == 'W' && oli[1] == ';') {
+		/* -W long-option */
+		if (*place)			/* no space */
+			/* NOTHING */;
+		else if (++optind >= nargc) {	/* no arg */
+			place = EMSG;
+			if (PRINT_ERROR)
+				warnx(recargchar, optchar);
+			optopt = optchar;
+			return (BADARG);
+		} else				/* white space */
+			place = nargv[optind];
+		optchar = parse_long_options(nargv, options, long_options,
+		    idx, 0);
+		place = EMSG;
+		return (optchar);
+	}
+	if (*++oli != ':') {			/* doesn't take argument */
+		if (!*place)
+			++optind;
+	} else {				/* takes (optional) argument */
+		optarg = NULL;
+		if (*place)			/* no white space */
+			optarg = place;
+		else if (oli[1] != ':') {	/* arg not optional */
+			if (++optind >= nargc) {	/* no arg */
+				place = EMSG;
+				if (PRINT_ERROR)
+					warnx(recargchar, optchar);
+				optopt = optchar;
+				return (BADARG);
+			} else
+				optarg = nargv[optind];
+		}
+		place = EMSG;
+		++optind;
+	}
+	/* dump back option letter */
+	return (optchar);
+}
+
+/*
+ * getopt --
+ *	Parse argc/argv argument vector.
+ *
+ * [eventually this will replace the BSD getopt]
+ */
+int
+getopt(int nargc, char * const *nargv, const char *options)
+{
+
+	/*
+	 * We don't pass FLAG_PERMUTE to getopt_internal() since
+	 * the BSD getopt(3) (unlike GNU) has never done this.
+	 *
+	 * Furthermore, since many privileged programs call getopt()
+	 * before dropping privileges it makes sense to keep things
+	 * as simple (and bug-free) as possible.
+	 */
+	return (getopt_internal(nargc, nargv, options, NULL, NULL, 0));
+}
+
+#if 0
+/*
+ * getopt_long --
+ *	Parse argc/argv argument vector.
+ */
+int
+getopt_long(int nargc, char * const *nargv, const char *options,
+    const struct option *long_options, int *idx)
+{
+
+	return (getopt_internal(nargc, nargv, options, long_options, idx,
+	    FLAG_PERMUTE));
+}
+
+/*
+ * getopt_long_only --
+ *	Parse argc/argv argument vector.
+ */
+int
+getopt_long_only(int nargc, char * const *nargv, const char *options,
+    const struct option *long_options, int *idx)
+{
+
+	return (getopt_internal(nargc, nargv, options, long_options, idx,
+	    FLAG_PERMUTE|FLAG_LONGONLY));
+}
+#endif
+
+#endif /* !defined(HAVE_GETOPT) */
diff -Nru mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/openbsd-compat.h mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/openbsd-compat.h
--- mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/openbsd-compat.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/openbsd-compat.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#ifndef _OPENBSD_COMPAT_H
+#define _OPENBSD_COMPAT_H
+
+#if defined(_MSC_VER)
+#include "types.h"
+#endif
+
+#if defined(HAVE_ENDIAN_H)
+#include <endian.h>
+#endif
+
+#if defined(__APPLE__) && !defined(HAVE_ENDIAN_H)
+#include <libkern/OSByteOrder.h>
+#define be16toh(x) OSSwapBigToHostInt16((x))
+#define htobe16(x) OSSwapHostToBigInt16((x))
+#define be32toh(x) OSSwapBigToHostInt32((x))
+#endif /* __APPLE__ && !HAVE_ENDIAN_H */
+
+#if defined(_WIN32) && !defined(HAVE_ENDIAN_H)
+#include <winsock2.h>
+#if !defined(_MSC_VER)
+#include <sys/param.h>
+#endif
+#define be16toh(x) ntohs((x))
+#define htobe16(x) htons((x))
+#define be32toh(x) ntohl((x))
+#endif /* _WIN32 && !HAVE_ENDIAN_H */
+
+#if defined(__FreeBSD__) && !defined(HAVE_ENDIAN_H)
+#include <sys/endian.h>
+#endif
+
+#include <stdlib.h>
+
+#if !defined(HAVE_STRLCAT)
+size_t strlcat(char *, const char *, size_t);
+#endif
+
+#if !defined(HAVE_STRLCPY)
+size_t strlcpy(char *, const char *, size_t);
+#endif
+
+#if !defined(HAVE_RECALLOCARRAY)
+void *recallocarray(void *, size_t, size_t, size_t);
+#endif
+
+#if !defined(HAVE_EXPLICIT_BZERO)
+void explicit_bzero(void *, size_t);
+#endif
+
+#if !defined(HAVE_GETPAGESIZE)
+int getpagesize(void);
+#endif
+
+#if !defined(HAVE_TIMINGSAFE_BCMP)
+int timingsafe_bcmp(const void *, const void *, size_t);
+#endif
+
+#if !defined(HAVE_READPASSPHRASE)
+#include "readpassphrase.h"
+#else
+#include <readpassphrase.h>
+#endif
+
+#include <openssl/opensslv.h>
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#define EVP_PKEY_get0_EC_KEY(x) ((x)->pkey.ec)
+#define EVP_PKEY_get0_RSA(x) ((x)->pkey.rsa)
+#endif
+
+#if !defined(HAVE_ERR_H)
+#include "err.h"
+#else
+#include <err.h>
+#endif
+
+#if !defined(HAVE_GETOPT)
+#include "getopt.h"
+#else
+#include <unistd.h>
+#endif
+
+#if !defined(HAVE_GETLINE)
+#include <stdio.h>
+ssize_t getline(char **, size_t *, FILE *);
+#endif
+
+#include "time.h"
+
+#endif /* !_OPENBSD_COMPAT_H */
diff -Nru mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/posix_win.c mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/posix_win.c
--- mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/posix_win.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/posix_win.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,61 @@
+/*
+ * Public domain
+ *
+ * File IO compatibility shims
+ * Brent Cook <bcook@openbsd.org>
+ */
+
+#define NO_REDEF_POSIX_FUNCTIONS
+
+#include <windows.h>
+
+#include <errno.h>
+#include <io.h>
+
+#include "posix_win.h"
+
+int
+posix_open(const char *path, ...)
+{
+	va_list ap;
+	int mode = 0;
+	int flags;
+
+	va_start(ap, path);
+	flags = va_arg(ap, int);
+	if (flags & O_CREAT)
+		mode = va_arg(ap, int);
+	va_end(ap);
+
+	flags |= O_BINARY | O_NOINHERIT;
+
+	return (open(path, flags, mode));
+}
+
+int
+posix_close(int fd)
+{
+	return (close(fd));
+}
+
+ssize_t
+posix_read(int fd, void *buf, size_t count)
+{
+	if (count > INT_MAX) {
+		errno = EINVAL;
+		return (-1);
+	}
+
+	return (read(fd, buf, (unsigned int)count));
+}
+
+ssize_t
+posix_write(int fd, const void *buf, size_t count)
+{
+	if (count > INT_MAX) {
+		errno = EINVAL;
+		return (-1);
+	}
+
+	return (write(fd, buf, (unsigned int)count));
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/posix_win.h mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/posix_win.h
--- mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/posix_win.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/posix_win.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,47 @@
+/*
+ * Public domain
+ *
+ * BSD socket emulation code for Winsock2
+ * Brent Cook <bcook@openbsd.org>
+ */
+
+#ifndef _COMPAT_POSIX_WIN_H
+#define _COMPAT_POSIX_WIN_H
+
+#ifdef _WIN32
+
+#include <windows.h>
+
+#include <errno.h>
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#if _MSC_VER >= 1900
+#include <../ucrt/fcntl.h>
+#else
+#include <../include/fcntl.h>
+#endif
+
+#include "types.h"
+
+int posix_open(const char *path, ...);
+
+int posix_close(int fd);
+
+ssize_t posix_read(int fd, void *buf, size_t count);
+
+ssize_t posix_write(int fd, const void *buf, size_t count);
+
+#ifndef NO_REDEF_POSIX_FUNCTIONS
+#define open(path, ...) posix_open(path, __VA_ARGS__)
+#define close(fd) posix_close(fd)
+#define read(fd, buf, count) posix_read(fd, buf, count)
+#define write(fd, buf, count) posix_write(fd, buf, count)
+#endif
+
+#endif /* _WIN32 */
+
+#endif /* !_COMPAT_POSIX_WIN_H */
diff -Nru mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/readpassphrase.c mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/readpassphrase.c
--- mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/readpassphrase.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/readpassphrase.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,214 @@
+/*	$OpenBSD: readpassphrase.c,v 1.26 2016/10/18 12:47:18 millert Exp $	*/
+
+/*
+ * Copyright (c) 2000-2002, 2007, 2010
+ *	Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Sponsored in part by the Defense Advanced Research Projects
+ * Agency (DARPA) and Air Force Research Laboratory, Air Force
+ * Materiel Command, USAF, under agreement number F39502-99-1-0512.
+ */
+
+/* OPENBSD ORIGINAL: lib/libc/gen/readpassphrase.c */
+
+#include "openbsd-compat.h"
+
+#ifndef HAVE_READPASSPHRASE
+
+#include <termios.h>
+#include <signal.h>
+#include <ctype.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <paths.h>
+
+#ifndef _PATH_TTY
+# define _PATH_TTY "/dev/tty"
+#endif
+
+#ifndef TCSASOFT
+/* If we don't have TCSASOFT define it so that ORing it it below is a no-op. */
+# define TCSASOFT 0
+#endif
+
+/* SunOS 4.x which lacks _POSIX_VDISABLE, but has VDISABLE */
+#if !defined(_POSIX_VDISABLE) && defined(VDISABLE)
+#  define _POSIX_VDISABLE       VDISABLE
+#endif
+
+static volatile sig_atomic_t signo[NSIG];
+
+static void handler(int);
+
+char *
+readpassphrase(const char *prompt, char *buf, size_t bufsiz, int flags)
+{
+	ssize_t nr;
+	int input, output, save_errno, i, need_restart;
+	char ch, *p, *end;
+	struct termios term, oterm;
+	struct sigaction sa, savealrm, saveint, savehup, savequit, saveterm;
+	struct sigaction savetstp, savettin, savettou, savepipe;
+
+	/* I suppose we could alloc on demand in this case (XXX). */
+	if (bufsiz == 0) {
+		errno = EINVAL;
+		return(NULL);
+	}
+
+restart:
+	for (i = 0; i < NSIG; i++)
+		signo[i] = 0;
+	need_restart = 0;
+	/*
+	 * Read and write to /dev/tty if available.  If not, read from
+	 * stdin and write to stderr unless a tty is required.
+	 */
+	if ((flags & RPP_STDIN) ||
+	    (input = output = open(_PATH_TTY, O_RDWR)) == -1) {
+		if (flags & RPP_REQUIRE_TTY) {
+			errno = ENOTTY;
+			return(NULL);
+		}
+		input = STDIN_FILENO;
+		output = STDERR_FILENO;
+	}
+
+	/*
+	 * Turn off echo if possible.
+	 * If we are using a tty but are not the foreground pgrp this will
+	 * generate SIGTTOU, so do it *before* installing the signal handlers.
+	 */
+	if (input != STDIN_FILENO && tcgetattr(input, &oterm) == 0) {
+		memcpy(&term, &oterm, sizeof(term));
+		if (!(flags & RPP_ECHO_ON))
+			term.c_lflag &= ~(ECHO | ECHONL);
+#ifdef VSTATUS
+		if (term.c_cc[VSTATUS] != _POSIX_VDISABLE)
+			term.c_cc[VSTATUS] = _POSIX_VDISABLE;
+#endif
+		(void)tcsetattr(input, TCSAFLUSH|TCSASOFT, &term);
+	} else {
+		memset(&term, 0, sizeof(term));
+		term.c_lflag |= ECHO;
+		memset(&oterm, 0, sizeof(oterm));
+		oterm.c_lflag |= ECHO;
+	}
+
+	/*
+	 * Catch signals that would otherwise cause the user to end
+	 * up with echo turned off in the shell.  Don't worry about
+	 * things like SIGXCPU and SIGVTALRM for now.
+	 */
+	sigemptyset(&sa.sa_mask);
+	sa.sa_flags = 0;		/* don't restart system calls */
+	sa.sa_handler = handler;
+	(void)sigaction(SIGALRM, &sa, &savealrm);
+	(void)sigaction(SIGHUP, &sa, &savehup);
+	(void)sigaction(SIGINT, &sa, &saveint);
+	(void)sigaction(SIGPIPE, &sa, &savepipe);
+	(void)sigaction(SIGQUIT, &sa, &savequit);
+	(void)sigaction(SIGTERM, &sa, &saveterm);
+	(void)sigaction(SIGTSTP, &sa, &savetstp);
+	(void)sigaction(SIGTTIN, &sa, &savettin);
+	(void)sigaction(SIGTTOU, &sa, &savettou);
+
+	if (!(flags & RPP_STDIN))
+		(void)write(output, prompt, strlen(prompt));
+	end = buf + bufsiz - 1;
+	p = buf;
+	while ((nr = read(input, &ch, 1)) == 1 && ch != '\n' && ch != '\r') {
+		if (p < end) {
+			if ((flags & RPP_SEVENBIT))
+				ch &= 0x7f;
+			if (isalpha((unsigned char)ch)) {
+				if ((flags & RPP_FORCELOWER))
+					ch = (char)tolower((unsigned char)ch);
+				if ((flags & RPP_FORCEUPPER))
+					ch = (char)toupper((unsigned char)ch);
+			}
+			*p++ = ch;
+		}
+	}
+	*p = '\0';
+	save_errno = errno;
+	if (!(term.c_lflag & ECHO))
+		(void)write(output, "\n", 1);
+
+	/* Restore old terminal settings and signals. */
+	if (memcmp(&term, &oterm, sizeof(term)) != 0) {
+		const int sigttou = signo[SIGTTOU];
+
+		/* Ignore SIGTTOU generated when we are not the fg pgrp. */
+		while (tcsetattr(input, TCSAFLUSH|TCSASOFT, &oterm) == -1 &&
+		    errno == EINTR && !signo[SIGTTOU])
+			continue;
+		signo[SIGTTOU] = sigttou;
+	}
+	(void)sigaction(SIGALRM, &savealrm, NULL);
+	(void)sigaction(SIGHUP, &savehup, NULL);
+	(void)sigaction(SIGINT, &saveint, NULL);
+	(void)sigaction(SIGQUIT, &savequit, NULL);
+	(void)sigaction(SIGPIPE, &savepipe, NULL);
+	(void)sigaction(SIGTERM, &saveterm, NULL);
+	(void)sigaction(SIGTSTP, &savetstp, NULL);
+	(void)sigaction(SIGTTIN, &savettin, NULL);
+	(void)sigaction(SIGTTOU, &savettou, NULL);
+	if (input != STDIN_FILENO)
+		(void)close(input);
+
+	/*
+	 * If we were interrupted by a signal, resend it to ourselves
+	 * now that we have restored the signal handlers.
+	 */
+	for (i = 0; i < NSIG; i++) {
+		if (signo[i]) {
+			kill(getpid(), i);
+			switch (i) {
+			case SIGTSTP:
+			case SIGTTIN:
+			case SIGTTOU:
+				need_restart = 1;
+			}
+		}
+	}
+	if (need_restart)
+		goto restart;
+
+	if (save_errno)
+		errno = save_errno;
+	return(nr == -1 ? NULL : buf);
+}
+
+#if 0
+char *
+getpass(const char *prompt)
+{
+	static char buf[_PASSWORD_LEN + 1];
+
+	return(readpassphrase(prompt, buf, sizeof(buf), RPP_ECHO_OFF));
+}
+#endif
+
+static void handler(int s)
+{
+
+	signo[s] = 1;
+}
+#endif /* HAVE_READPASSPHRASE */
diff -Nru mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/readpassphrase.h mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/readpassphrase.h
--- mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/readpassphrase.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/readpassphrase.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,44 @@
+/*	$OpenBSD: readpassphrase.h,v 1.5 2003/06/17 21:56:23 millert Exp $	*/
+
+/*
+ * Copyright (c) 2000, 2002 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Sponsored in part by the Defense Advanced Research Projects
+ * Agency (DARPA) and Air Force Research Laboratory, Air Force
+ * Materiel Command, USAF, under agreement number F39502-99-1-0512.
+ */
+
+/* OPENBSD ORIGINAL: include/readpassphrase.h */
+
+#ifndef _READPASSPHRASE_H_
+#define _READPASSPHRASE_H_
+
+#ifndef HAVE_READPASSPHRASE
+
+#include <stdlib.h>
+
+#define RPP_ECHO_OFF    0x00		/* Turn off echo (default). */
+#define RPP_ECHO_ON     0x01		/* Leave echo on. */
+#define RPP_REQUIRE_TTY 0x02		/* Fail if there is no tty. */
+#define RPP_FORCELOWER  0x04		/* Force input to lower case. */
+#define RPP_FORCEUPPER  0x08		/* Force input to upper case. */
+#define RPP_SEVENBIT    0x10		/* Strip the high bit from input. */
+#define RPP_STDIN       0x20		/* Read from stdin, not /dev/tty */
+
+char * readpassphrase(const char *, char *, size_t, int);
+
+#endif /* HAVE_READPASSPHRASE */
+
+#endif /* !_READPASSPHRASE_H_ */
diff -Nru mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/readpassphrase_win32.c mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/readpassphrase_win32.c
--- mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/readpassphrase_win32.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/readpassphrase_win32.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,131 @@
+/*
+* Author: Manoj Ampalam <manoj.ampalam@microsoft.com>
+*
+* Author: Bryan Berns <berns@uwalumni.com>
+*   Modified group detection use s4u token information 
+*
+* Copyright(c) 2016 Microsoft Corp.
+* All rights reserved
+*
+* Misc Unix POSIX routine implementations for Windows
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met :
+*
+* 1. Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* 2. Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and / or other materials provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES(INCLUDING, BUT
+* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#define UMDF_USING_NTSTATUS 
+#define SECURITY_WIN32
+#include <windows.h>
+#include <stdio.h>
+#include <time.h>
+#include <shlwapi.h>
+#include <conio.h>
+#include <lm.h>
+#include <sddl.h>
+#include <aclapi.h>
+#include <ntsecapi.h>
+#include <security.h>
+#include <ntstatus.h>
+#include <wchar.h>
+
+#include "openbsd-compat.h"
+
+#ifndef HAVE_READPASSPHRASE
+
+/*on error returns NULL and sets errno*/
+static wchar_t *
+utf8_to_utf16(const char *utf8)
+{
+	int needed = 0;
+	wchar_t* utf16 = NULL;
+	if ((needed = MultiByteToWideChar(CP_UTF8, 0, utf8, -1, NULL, 0)) == 0 ||
+	    (utf16 = malloc(needed * sizeof(wchar_t))) == NULL ||
+	    MultiByteToWideChar(CP_UTF8, 0, utf8, -1, utf16, needed) == 0) {
+		/* debug3("failed to convert utf8 payload:%s error:%d", utf8, GetLastError()); */
+		errno = ENOMEM;
+		return NULL;
+	}
+
+	return utf16;
+}
+
+char *
+readpassphrase(const char *prompt, char *outBuf, size_t outBufLen, int flags)
+{
+	size_t current_index = 0;
+	char ch;
+	wchar_t* wtmp = NULL;
+
+	if (outBufLen == 0) {
+		errno = EINVAL;
+		return NULL;
+	}
+
+	while (_kbhit()) _getch();
+
+	wtmp = utf8_to_utf16(prompt);
+	if (wtmp == NULL)
+		errx(1, "unable to alloc memory");
+
+	_cputws(wtmp);
+	free(wtmp);
+
+	while (current_index < outBufLen - 1) {
+		ch = (char)_getch();
+		
+		if (ch == '\r') {
+			if (_kbhit()) _getch(); /* read linefeed if its there */
+			break;
+		} else if (ch == '\n') {
+			break;
+		} else if (ch == '\b') { /* backspace */
+			if (current_index > 0) {
+				if (flags & RPP_ECHO_ON)
+					printf_s("%c \b", ch);
+
+				current_index--; /* overwrite last character */
+			}
+		} else if (ch == '\003') { /* exit on Ctrl+C */
+			errx(1, "");
+		} else {
+			if (flags & RPP_SEVENBIT)
+				ch &= 0x7f;
+
+			if (isalpha((unsigned char)ch)) {
+				if(flags & RPP_FORCELOWER)
+					ch = (char)tolower((unsigned char)ch);
+				if(flags & RPP_FORCEUPPER)
+					ch = (char)toupper((unsigned char)ch);
+			}
+
+			outBuf[current_index++] = ch;
+			if(flags & RPP_ECHO_ON)
+				printf_s("%c", ch);
+		}
+	}
+
+	outBuf[current_index] = '\0';
+	_cputs("\n");
+
+	return outBuf;
+}
+
+#endif /* HAVE_READPASSPHRASE */
diff -Nru mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/recallocarray.c mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/recallocarray.c
--- mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/recallocarray.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/recallocarray.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,91 @@
+/*	$OpenBSD: recallocarray.c,v 1.1 2017/03/06 18:44:21 otto Exp $	*/
+/*
+ * Copyright (c) 2008, 2017 Otto Moerbeek <otto@drijf.net>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* OPENBSD ORIGINAL: lib/libc/stdlib/recallocarray.c */
+
+#include "openbsd-compat.h"
+
+#if !defined(HAVE_RECALLOCARRAY)
+
+#include <errno.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+/*
+ * This is sqrt(SIZE_MAX+1), as s1*s2 <= SIZE_MAX
+ * if both s1 < MUL_NO_OVERFLOW and s2 < MUL_NO_OVERFLOW
+ */
+#define MUL_NO_OVERFLOW ((size_t)1 << (sizeof(size_t) * 4))
+
+void *
+recallocarray(void *ptr, size_t oldnmemb, size_t newnmemb, size_t size)
+{
+	size_t oldsize, newsize;
+	void *newptr;
+
+	if (ptr == NULL)
+		return calloc(newnmemb, size);
+
+	if ((newnmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) &&
+	    newnmemb > 0 && SIZE_MAX / newnmemb < size) {
+		errno = ENOMEM;
+		return NULL;
+	}
+	newsize = newnmemb * size;
+
+	if ((oldnmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) &&
+	    oldnmemb > 0 && SIZE_MAX / oldnmemb < size) {
+		errno = EINVAL;
+		return NULL;
+	}
+	oldsize = oldnmemb * size;
+	
+	/*
+	 * Don't bother too much if we're shrinking just a bit,
+	 * we do not shrink for series of small steps, oh well.
+	 */
+	if (newsize <= oldsize) {
+		size_t d = oldsize - newsize;
+
+		if (d < oldsize / 2 && d < (size_t)getpagesize()) {
+			memset((char *)ptr + newsize, 0, d);
+			return ptr;
+		}
+	}
+
+	newptr = malloc(newsize);
+	if (newptr == NULL)
+		return NULL;
+
+	if (newsize > oldsize) {
+		memcpy(newptr, ptr, oldsize);
+		memset((char *)newptr + oldsize, 0, newsize - oldsize);
+	} else
+		memcpy(newptr, ptr, newsize);
+
+	explicit_bzero(ptr, oldsize);
+	free(ptr);
+
+	return newptr;
+}
+/* DEF_WEAK(recallocarray); */
+
+#endif /* !defined(HAVE_RECALLOCARRAY) */
diff -Nru mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/strlcat.c mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/strlcat.c
--- mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/strlcat.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/strlcat.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,63 @@
+/*	$OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $	*/
+
+/*
+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* OPENBSD ORIGINAL: lib/libc/string/strlcat.c */
+
+#include "openbsd-compat.h"
+
+#if !defined(HAVE_STRLCAT)
+
+#include <sys/types.h>
+#include <string.h>
+
+/*
+ * Appends src to string dst of size siz (unlike strncat, siz is the
+ * full size of dst, not space left).  At most siz-1 characters
+ * will be copied.  Always NUL terminates (unless siz <= strlen(dst)).
+ * Returns strlen(src) + MIN(siz, strlen(initial dst)).
+ * If retval >= siz, truncation occurred.
+ */
+size_t
+strlcat(char *dst, const char *src, size_t siz)
+{
+	char *d = dst;
+	const char *s = src;
+	size_t n = siz;
+	size_t dlen;
+
+	/* Find the end of dst and adjust bytes left but don't go past end */
+	while (n-- != 0 && *d != '\0')
+		d++;
+	dlen = d - dst;
+	n = siz - dlen;
+
+	if (n == 0)
+		return(dlen + strlen(s));
+	while (*s != '\0') {
+		if (n != 1) {
+			*d++ = *s;
+			n--;
+		}
+		s++;
+	}
+	*d = '\0';
+
+	return(dlen + (s - src));	/* count does not include NUL */
+}
+
+#endif /* !defined(HAVE_STRLCAT) */
diff -Nru mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/strlcpy.c mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/strlcpy.c
--- mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/strlcpy.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/strlcpy.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,59 @@
+/*	$OpenBSD: strlcpy.c,v 1.11 2006/05/05 15:27:38 millert Exp $	*/
+
+/*
+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* OPENBSD ORIGINAL: lib/libc/string/strlcpy.c */
+
+#include "openbsd-compat.h"
+
+#if !defined(HAVE_STRLCPY)
+
+#include <sys/types.h>
+#include <string.h>
+
+/*
+ * Copy src to string dst of size siz.  At most siz-1 characters
+ * will be copied.  Always NUL terminates (unless siz == 0).
+ * Returns strlen(src); if retval >= siz, truncation occurred.
+ */
+size_t
+strlcpy(char *dst, const char *src, size_t siz)
+{
+	char *d = dst;
+	const char *s = src;
+	size_t n = siz;
+
+	/* Copy as many bytes as will fit */
+	if (n != 0) {
+		while (--n != 0) {
+			if ((*d++ = *s++) == '\0')
+				break;
+		}
+	}
+
+	/* Not enough room in dst, add NUL and traverse rest of src */
+	if (n == 0) {
+		if (siz != 0)
+			*d = '\0';		/* NUL-terminate dst */
+		while (*s++)
+			;
+	}
+
+	return(s - src - 1);	/* count does not include NUL */
+}
+
+#endif /* !defined(HAVE_STRLCPY) */
diff -Nru mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/time.h mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/time.h
--- mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/time.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/time.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,49 @@
+/*
+ * Public domain
+ * sys/time.h compatibility shim
+ */
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1900)
+#include <../ucrt/time.h>
+#elif defined(_MSC_VER) && (_MSC_VER < 1900)
+#include <../include/time.h>
+#else
+#include <time.h>
+#endif
+
+#ifndef _COMPAT_TIME_H
+#define _COMPAT_TIME_H
+
+#ifndef CLOCK_MONOTONIC
+#define CLOCK_MONOTONIC CLOCK_REALTIME
+#endif
+
+#ifndef CLOCK_REALTIME
+#define CLOCK_REALTIME 0
+#endif
+
+#ifndef HAVE_CLOCK_GETTIME
+/*
+Causing error on MacOS
+typedef int clockid_t;
+int clock_gettime(clockid_t, struct timespec *);
+*/
+#endif
+
+#ifdef HAVE_TIMESPECSUB
+#include <sys/time.h>
+#endif
+
+#ifndef HAVE_TIMESPECSUB
+#define timespecsub(tsp, usp, vsp)                                      \
+        do {                                                            \
+                (vsp)->tv_sec = (tsp)->tv_sec - (usp)->tv_sec;          \
+                (vsp)->tv_nsec = (tsp)->tv_nsec - (usp)->tv_nsec;       \
+                if ((vsp)->tv_nsec < 0) {                               \
+                        (vsp)->tv_sec--;                                \
+                        (vsp)->tv_nsec += 1000000000L;                  \
+                }                                                       \
+        } while (0)
+#endif
+
+#endif /* _COMPAT_TIME_H */
diff -Nru mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/timingsafe_bcmp.c mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/timingsafe_bcmp.c
--- mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/timingsafe_bcmp.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/timingsafe_bcmp.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,35 @@
+/*	$OpenBSD: timingsafe_bcmp.c,v 1.1 2010/09/24 13:33:00 matthew Exp $	*/
+/*
+ * Copyright (c) 2010 Damien Miller.  All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* OPENBSD ORIGINAL: lib/libc/string/timingsafe_bcmp.c */
+
+#include "openbsd-compat.h"
+
+#if !defined(HAVE_TIMINGSAFE_BCMP)
+
+int
+timingsafe_bcmp(const void *b1, const void *b2, size_t n)
+{
+	const unsigned char *p1 = b1, *p2 = b2;
+	int ret = 0;
+
+	for (; n > 0; n--)
+		ret |= *p1++ ^ *p2++;
+	return (ret != 0);
+}
+
+#endif /* !defined(HAVE_TIMINGSAFE_BCMP) */
diff -Nru mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/types.h mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/types.h
--- mysql-8.0-8.0.26/extra/libfido2/openbsd-compat/types.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/openbsd-compat/types.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,64 @@
+/*
+ * Public domain
+ * sys/types.h compatibility shim
+ */
+
+#ifdef _MSC_VER
+#if _MSC_VER >= 1900
+#include <../ucrt/sys/types.h>
+#else
+#include <../include/sys/types.h>
+#endif
+#endif
+
+#ifndef _COMPAT_TYPES_H
+#define _COMPAT_TYPES_H
+
+#include <stdint.h>
+
+#ifdef __MINGW32__
+#include <_bsd_types.h>
+typedef uint32_t        in_addr_t;
+typedef uint32_t        uid_t;
+#endif
+
+#ifdef _MSC_VER
+#include <basetsd.h>
+typedef SSIZE_T ssize_t;
+
+#ifndef SSIZE_MAX
+#ifdef _WIN64
+#define SSIZE_MAX _I64_MAX
+#else
+#define SSIZE_MAX INT_MAX
+#endif
+#endif
+
+#endif
+
+#if !defined(HAVE_ATTRIBUTE__BOUNDED__) && !defined(__bounded__)
+# define __bounded__(x, y, z)
+#endif
+
+#ifdef _WIN32
+#define __warn_references(sym,msg)
+#else
+
+#ifndef __warn_references
+
+#ifndef __STRING
+#define __STRING(x) #x
+#endif
+
+#if defined(__GNUC__)  && defined (HAS_GNU_WARNING_LONG)
+#define __warn_references(sym,msg)          \
+  __asm__(".section .gnu.warning." __STRING(sym)  \
+         "\n\t.ascii \"" msg "\"\n\t.text");
+#else
+#define __warn_references(sym,msg)
+#endif
+
+#endif /* __warn_references */
+#endif /* _WIN32 */
+
+#endif /* !_COMPAT_TYPES_H */
diff -Nru mysql-8.0-8.0.26/extra/libfido2/README.adoc mysql-8.0-8.0.27/extra/libfido2/README.adoc
--- mysql-8.0-8.0.26/extra/libfido2/README.adoc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/README.adoc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,86 @@
+== libfido2
+
+image:https://github.com/yubico/libfido2/workflows/linux/badge.svg["Linux Build Status (github actions)", link="https://github.com/Yubico/libfido2/actions"]
+image:https://github.com/yubico/libfido2/workflows/macos/badge.svg["macOS Build Status (github actions)", link="https://github.com/Yubico/libfido2/actions"]
+image:https://github.com/yubico/libfido2/workflows/windows/badge.svg["Windows Build Status (github actions)", link="https://github.com/Yubico/libfido2/actions"]
+image:https://github.com/yubico/libfido2/workflows/fuzzer/badge.svg["Fuzz Status (github actions)", link="https://github.com/Yubico/libfido2/actions"]
+image:https://oss-fuzz-build-logs.storage.googleapis.com/badges/libfido2.svg["Fuzz Status (oss-fuzz)", link="https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:libfido2"]
+
+*libfido2* provides library functionality and command-line tools to
+communicate with a FIDO device over USB, and to verify attestation and
+assertion signatures.
+
+*libfido2* supports the FIDO U2F (CTAP 1) and FIDO 2.0 (CTAP 2) protocols.
+
+For usage, see the `examples/` directory.
+
+=== License
+
+*libfido2* is licensed under the BSD 2-clause license. See the LICENSE
+file for the full license text.
+
+=== Supported Platforms
+
+*libfido2* is known to work on Linux, MacOS, Windows, and OpenBSD.
+
+=== Documentation
+
+Documentation is available in troff and HTML formats. An
+https://developers.yubico.com/libfido2/Manuals/[online mirror of *libfido2*'s documentation]
+is also available.
+
+=== Installation
+
+==== Releases
+
+The current release of *libfido2* is 1.5.0. Please consult Yubico's
+https://developers.yubico.com/libfido2/Releases[release page] for source
+and binary releases.
+
+==== Ubuntu 20.04 (Focal)
+
+  $ sudo apt install libfido2-1
+  $ sudo apt install libfido2-dev
+  $ sudo apt install libfido2-doc
+
+==== Ubuntu 18.04 (Bionic) and 16.04 (Xenial)
+
+  $ sudo apt install software-properties-common
+  $ sudo apt-add-repository ppa:yubico/stable
+  $ sudo apt update
+  $ sudo apt install libfido2-dev
+
+==== MacOS
+
+  $ brew install libfido2
+
+Or from source, on UNIX-like systems:
+
+  $ (rm -rf build && mkdir build && cd build && cmake ..)
+  $ make -C build
+  $ sudo make -C build install
+
+Depending on the platform,
+https://www.freedesktop.org/wiki/Software/pkg-config/[pkg-config] may need to
+be installed, or the PKG_CONFIG_PATH environment variable set.
+
+*libfido2* depends on https://github.com/pjk/libcbor[libcbor] and
+https://www.openssl.org[OpenSSL]. On Linux, libudev (part of
+https://www.freedesktop.org/wiki/Software/systemd[systemd]) is also required.
+
+For complete, OS-specific installation instructions, please refer to the
+`.actions/` (Linux, MacOS) and `windows/` directories.
+
+On Linux, you will need to add a udev rule to be able to access the FIDO
+device, or run as root. For example, the udev rule may contain the following:
+
+----
+#udev rule for allowing HID access to Yubico devices for FIDO support.
+
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", \
+  MODE="0664", GROUP="plugdev", ATTRS{idVendor}=="1050"
+----
+
+On Windows 1903 and newer versions, access to FIDO devices has been restricted
+to applications using the operating system's native API. Use of *libfido2*
+is still possible in privileged applications.
diff -Nru mysql-8.0-8.0.26/extra/libfido2/regress/assert.c mysql-8.0-8.0.27/extra/libfido2/regress/assert.c
--- mysql-8.0-8.0.26/extra/libfido2/regress/assert.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/regress/assert.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,515 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <assert.h>
+#include <fido.h>
+#include <fido/es256.h>
+#include <fido/rs256.h>
+#include <string.h>
+
+#define FAKE_DEV_HANDLE	((void *)0xdeadbeef)
+
+static const unsigned char es256_pk[64] = {
+	0x34, 0xeb, 0x99, 0x77, 0x02, 0x9c, 0x36, 0x38,
+	0xbb, 0xc2, 0xae, 0xa0, 0xa0, 0x18, 0xc6, 0x64,
+	0xfc, 0xe8, 0x49, 0x92, 0xd7, 0x74, 0x9e, 0x0c,
+	0x46, 0x8c, 0x9d, 0xa6, 0xdf, 0x46, 0xf7, 0x84,
+	0x60, 0x1e, 0x0f, 0x8b, 0x23, 0x85, 0x4a, 0x9a,
+	0xec, 0xc1, 0x08, 0x9f, 0x30, 0xd0, 0x0d, 0xd7,
+	0x76, 0x7b, 0x55, 0x48, 0x91, 0x7c, 0x4f, 0x0f,
+	0x64, 0x1a, 0x1d, 0xf8, 0xbe, 0x14, 0x90, 0x8a,
+};
+
+static const unsigned char cdh[32] = {
+	0xec, 0x8d, 0x8f, 0x78, 0x42, 0x4a, 0x2b, 0xb7,
+	0x82, 0x34, 0xaa, 0xca, 0x07, 0xa1, 0xf6, 0x56,
+	0x42, 0x1c, 0xb6, 0xf6, 0xb3, 0x00, 0x86, 0x52,
+	0x35, 0x2d, 0xa2, 0x62, 0x4a, 0xbe, 0x89, 0x76,
+};
+
+static const unsigned char authdata[39] = {
+	0x58, 0x25, 0x49, 0x96, 0x0d, 0xe5, 0x88, 0x0e,
+	0x8c, 0x68, 0x74, 0x34, 0x17, 0x0f, 0x64, 0x76,
+	0x60, 0x5b, 0x8f, 0xe4, 0xae, 0xb9, 0xa2, 0x86,
+	0x32, 0xc7, 0x99, 0x5c, 0xf3, 0xba, 0x83, 0x1d,
+	0x97, 0x63, 0x00, 0x00, 0x00, 0x00, 0x03,
+};
+
+static const unsigned char sig[72] = {
+	0x30, 0x46, 0x02, 0x21, 0x00, 0xf6, 0xd1, 0xa3,
+	0xd5, 0x24, 0x2b, 0xde, 0xee, 0xa0, 0x90, 0x89,
+	0xcd, 0xf8, 0x9e, 0xbd, 0x6b, 0x4d, 0x55, 0x79,
+	0xe4, 0xc1, 0x42, 0x27, 0xb7, 0x9b, 0x9b, 0xa4,
+	0x0a, 0xe2, 0x47, 0x64, 0x0e, 0x02, 0x21, 0x00,
+	0xe5, 0xc9, 0xc2, 0x83, 0x47, 0x31, 0xc7, 0x26,
+	0xe5, 0x25, 0xb2, 0xb4, 0x39, 0xa7, 0xfc, 0x3d,
+	0x70, 0xbe, 0xe9, 0x81, 0x0d, 0x4a, 0x62, 0xa9,
+	0xab, 0x4a, 0x91, 0xc0, 0x7d, 0x2d, 0x23, 0x1e,
+};
+
+static void *
+dummy_open(const char *path)
+{
+	(void)path;
+
+	return (FAKE_DEV_HANDLE);
+}
+
+static void
+dummy_close(void *handle)
+{
+	assert(handle == FAKE_DEV_HANDLE);
+}
+
+static int
+dummy_read(void *handle, unsigned char *buf, size_t len, int ms)
+{
+	(void)handle;
+	(void)buf;
+	(void)len;
+	(void)ms;
+
+	abort();
+	/* NOTREACHED */
+}
+
+static int
+dummy_write(void *handle, const unsigned char *buf, size_t len)
+{
+	(void)handle;
+	(void)buf;
+	(void)len;
+
+	abort();
+	/* NOTREACHED */
+}
+
+static fido_assert_t *
+alloc_assert(void)
+{
+	fido_assert_t *a;
+
+	a = fido_assert_new();
+	assert(a != NULL);
+
+	return (a);
+}
+
+static void
+free_assert(fido_assert_t *a)
+{
+	fido_assert_free(&a);
+	assert(a == NULL);
+}
+
+static fido_dev_t *
+alloc_dev(void)
+{
+	fido_dev_t *d;
+
+	d = fido_dev_new();
+	assert(d != NULL);
+
+	return (d);
+}
+
+static void
+free_dev(fido_dev_t *d)
+{
+	fido_dev_free(&d);
+	assert(d == NULL);
+}
+
+static es256_pk_t *
+alloc_es256_pk(void)
+{
+	es256_pk_t *pk;
+
+	pk = es256_pk_new();
+	assert(pk != NULL);
+
+	return (pk);
+}
+
+static void
+free_es256_pk(es256_pk_t *pk)
+{
+	es256_pk_free(&pk);
+	assert(pk == NULL);
+}
+
+static rs256_pk_t *
+alloc_rs256_pk(void)
+{
+	rs256_pk_t *pk;
+
+	pk = rs256_pk_new();
+	assert(pk != NULL);
+
+	return (pk);
+}
+
+static void
+free_rs256_pk(rs256_pk_t *pk)
+{
+	rs256_pk_free(&pk);
+	assert(pk == NULL);
+}
+
+static void
+empty_assert(fido_dev_t *d, fido_assert_t *a, size_t idx)
+{
+	es256_pk_t *es256;
+	rs256_pk_t *rs256;
+
+	assert(fido_assert_flags(a, idx) == 0);
+	assert(fido_assert_authdata_len(a, idx) == 0);
+	assert(fido_assert_authdata_ptr(a, idx) == NULL);
+	assert(fido_assert_clientdata_hash_len(a) == 0);
+	assert(fido_assert_clientdata_hash_ptr(a) == NULL);
+	assert(fido_assert_id_len(a, idx) == 0);
+	assert(fido_assert_id_ptr(a, idx) == NULL);
+	assert(fido_assert_rp_id(a) == NULL);
+	assert(fido_assert_sig_len(a, idx) == 0);
+	assert(fido_assert_sig_ptr(a, idx) == NULL);
+	assert(fido_assert_user_display_name(a, idx) == NULL);
+	assert(fido_assert_user_icon(a, idx) == NULL);
+	assert(fido_assert_user_id_len(a, idx) == 0);
+	assert(fido_assert_user_id_ptr(a, idx) == NULL);
+	assert(fido_assert_user_name(a, idx) == NULL);
+
+	es256 = alloc_es256_pk();
+	rs256 = alloc_rs256_pk();
+
+	fido_dev_force_u2f(d);
+	assert(fido_dev_get_assert(d, a, NULL) == FIDO_ERR_INVALID_ARGUMENT);
+	assert(fido_dev_get_assert(d, a, "") == FIDO_ERR_INVALID_ARGUMENT);
+	assert(fido_assert_verify(a, idx, COSE_ES256,
+	    NULL) == FIDO_ERR_INVALID_ARGUMENT);
+	assert(fido_assert_verify(a, idx, COSE_ES256,
+	    es256) == FIDO_ERR_INVALID_ARGUMENT);
+	assert(fido_assert_verify(a, idx, COSE_RS256,
+	    rs256) == FIDO_ERR_INVALID_ARGUMENT);
+
+	fido_dev_force_fido2(d);
+	assert(fido_dev_get_assert(d, a, NULL) == FIDO_ERR_INVALID_ARGUMENT);
+	assert(fido_dev_get_assert(d, a, "") == FIDO_ERR_INVALID_ARGUMENT);
+	assert(fido_assert_verify(a, idx, COSE_ES256,
+	    NULL) == FIDO_ERR_INVALID_ARGUMENT);
+	assert(fido_assert_verify(a, idx, COSE_ES256,
+	    es256) == FIDO_ERR_INVALID_ARGUMENT);
+	assert(fido_assert_verify(a, idx, COSE_RS256,
+	    rs256) == FIDO_ERR_INVALID_ARGUMENT);
+
+	free_es256_pk(es256);
+	free_rs256_pk(rs256);
+}
+
+static void
+empty_assert_tests(void)
+{
+	fido_assert_t *a;
+	fido_dev_t *d;
+	fido_dev_io_t io_f;
+	size_t i;
+
+	memset(&io_f, 0, sizeof(io_f));
+
+	a = alloc_assert();
+	d = alloc_dev();
+
+	io_f.open = dummy_open;
+	io_f.close = dummy_close;
+	io_f.read = dummy_read;
+	io_f.write = dummy_write;
+
+	assert(fido_dev_set_io_functions(d, &io_f) == FIDO_OK);
+
+	empty_assert(d, a, 0);
+	assert(fido_assert_count(a) == 0);
+	assert(fido_assert_set_count(a, 4) == FIDO_OK);
+	assert(fido_assert_count(a) == 4);
+	for (i = 0; i < 4; i++) {
+		empty_assert(d, a, i);
+	}
+	empty_assert(d, a, 10);
+	free_assert(a);
+	free_dev(d);
+}
+
+static void
+valid_assert(void)
+{
+	fido_assert_t *a;
+	es256_pk_t *pk;
+
+	a = alloc_assert();
+	pk = alloc_es256_pk();
+	assert(es256_pk_from_ptr(pk, es256_pk, sizeof(es256_pk)) == FIDO_OK);
+	assert(fido_assert_set_clientdata_hash(a, cdh, sizeof(cdh)) == FIDO_OK);
+	assert(fido_assert_set_rp(a, "localhost") == FIDO_OK);
+	assert(fido_assert_set_count(a, 1) == FIDO_OK);
+	assert(fido_assert_set_authdata(a, 0, authdata,
+	    sizeof(authdata)) == FIDO_OK);
+	assert(fido_assert_set_up(a, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_assert_set_uv(a, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_assert_set_sig(a, 0, sig, sizeof(sig)) == FIDO_OK);
+	assert(fido_assert_verify(a, 0, COSE_ES256, pk) == FIDO_OK);
+	free_assert(a);
+	free_es256_pk(pk);
+}
+
+static void
+no_cdh(void)
+{
+	fido_assert_t *a;
+	es256_pk_t *pk;
+
+	a = alloc_assert();
+	pk = alloc_es256_pk();
+	assert(es256_pk_from_ptr(pk, es256_pk, sizeof(es256_pk)) == FIDO_OK);
+	assert(fido_assert_set_rp(a, "localhost") == FIDO_OK);
+	assert(fido_assert_set_count(a, 1) == FIDO_OK);
+	assert(fido_assert_set_authdata(a, 0, authdata,
+	    sizeof(authdata)) == FIDO_OK);
+	assert(fido_assert_set_up(a, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_assert_set_uv(a, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_assert_set_sig(a, 0, sig, sizeof(sig)) == FIDO_OK);
+	assert(fido_assert_verify(a, 0, COSE_ES256,
+	    pk) == FIDO_ERR_INVALID_ARGUMENT);
+	free_assert(a);
+	free_es256_pk(pk);
+}
+
+static void
+no_rp(void)
+{
+	fido_assert_t *a;
+	es256_pk_t *pk;
+
+	a = alloc_assert();
+	pk = alloc_es256_pk();
+	assert(es256_pk_from_ptr(pk, es256_pk, sizeof(es256_pk)) == FIDO_OK);
+	assert(fido_assert_set_clientdata_hash(a, cdh, sizeof(cdh)) == FIDO_OK);
+	assert(fido_assert_set_count(a, 1) == FIDO_OK);
+	assert(fido_assert_set_authdata(a, 0, authdata,
+	    sizeof(authdata)) == FIDO_OK);
+	assert(fido_assert_set_up(a, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_assert_set_uv(a, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_assert_set_sig(a, 0, sig, sizeof(sig)) == FIDO_OK);
+	assert(fido_assert_verify(a, 0, COSE_ES256,
+	    pk) == FIDO_ERR_INVALID_ARGUMENT);
+	free_assert(a);
+	free_es256_pk(pk);
+}
+
+static void
+no_authdata(void)
+{
+	fido_assert_t *a;
+	es256_pk_t *pk;
+
+	a = alloc_assert();
+	pk = alloc_es256_pk();
+	assert(es256_pk_from_ptr(pk, es256_pk, sizeof(es256_pk)) == FIDO_OK);
+	assert(fido_assert_set_clientdata_hash(a, cdh, sizeof(cdh)) == FIDO_OK);
+	assert(fido_assert_set_rp(a, "localhost") == FIDO_OK);
+	assert(fido_assert_set_count(a, 1) == FIDO_OK);
+	assert(fido_assert_set_up(a, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_assert_set_uv(a, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_assert_set_sig(a, 0, sig, sizeof(sig)) == FIDO_OK);
+	assert(fido_assert_verify(a, 0, COSE_ES256,
+	    pk) == FIDO_ERR_INVALID_ARGUMENT);
+	free_assert(a);
+	free_es256_pk(pk);
+}
+
+static void
+no_sig(void)
+{
+	fido_assert_t *a;
+	es256_pk_t *pk;
+
+	a = alloc_assert();
+	pk = alloc_es256_pk();
+	assert(es256_pk_from_ptr(pk, es256_pk, sizeof(es256_pk)) == FIDO_OK);
+	assert(fido_assert_set_clientdata_hash(a, cdh, sizeof(cdh)) == FIDO_OK);
+	assert(fido_assert_set_rp(a, "localhost") == FIDO_OK);
+	assert(fido_assert_set_count(a, 1) == FIDO_OK);
+	assert(fido_assert_set_authdata(a, 0, authdata,
+	    sizeof(authdata)) == FIDO_OK);
+	assert(fido_assert_set_up(a, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_assert_set_uv(a, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_assert_verify(a, 0, COSE_ES256,
+	    pk) == FIDO_ERR_INVALID_ARGUMENT);
+	free_assert(a);
+	free_es256_pk(pk);
+}
+
+static void
+junk_cdh(void)
+{
+	fido_assert_t *a;
+	es256_pk_t *pk;
+	unsigned char *junk;
+
+	junk = malloc(sizeof(cdh));
+	assert(junk != NULL);
+	memcpy(junk, cdh, sizeof(cdh));
+	junk[0] = ~junk[0];
+
+	a = alloc_assert();
+	pk = alloc_es256_pk();
+	assert(es256_pk_from_ptr(pk, es256_pk, sizeof(es256_pk)) == FIDO_OK);
+	assert(fido_assert_set_clientdata_hash(a, junk, sizeof(cdh)) == FIDO_OK);
+	assert(fido_assert_set_rp(a, "localhost") == FIDO_OK);
+	assert(fido_assert_set_count(a, 1) == FIDO_OK);
+	assert(fido_assert_set_authdata(a, 0, authdata,
+	    sizeof(authdata)) == FIDO_OK);
+	assert(fido_assert_set_up(a, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_assert_set_uv(a, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_assert_set_sig(a, 0, sig, sizeof(sig)) == FIDO_OK);
+	assert(fido_assert_verify(a, 0, COSE_ES256, pk) == FIDO_ERR_INVALID_SIG);
+	free_assert(a);
+	free_es256_pk(pk);
+	free(junk);
+}
+
+static void
+junk_rp(void)
+{
+	fido_assert_t *a;
+	es256_pk_t *pk;
+
+	a = alloc_assert();
+	pk = alloc_es256_pk();
+	assert(es256_pk_from_ptr(pk, es256_pk, sizeof(es256_pk)) == FIDO_OK);
+	assert(fido_assert_set_clientdata_hash(a, cdh, sizeof(cdh)) == FIDO_OK);
+	assert(fido_assert_set_rp(a, "potato") == FIDO_OK);
+	assert(fido_assert_set_count(a, 1) == FIDO_OK);
+	assert(fido_assert_set_authdata(a, 0, authdata,
+	    sizeof(authdata)) == FIDO_OK);
+	assert(fido_assert_set_up(a, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_assert_set_uv(a, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_assert_set_sig(a, 0, sig, sizeof(sig)) == FIDO_OK);
+	assert(fido_assert_verify(a, 0, COSE_ES256,
+	    pk) == FIDO_ERR_INVALID_PARAM);
+	free_assert(a);
+	free_es256_pk(pk);
+}
+
+static void
+junk_authdata(void)
+{
+	fido_assert_t *a;
+	unsigned char *junk;
+
+	junk = malloc(sizeof(authdata));
+	assert(junk != NULL);
+	memcpy(junk, authdata, sizeof(authdata));
+	junk[0] = ~junk[0];
+
+	a = alloc_assert();
+	assert(fido_assert_set_count(a, 1) == FIDO_OK);
+	assert(fido_assert_set_authdata(a, 0, junk,
+	    sizeof(authdata)) == FIDO_ERR_INVALID_ARGUMENT);
+	free_assert(a);
+	free(junk);
+}
+
+static void
+junk_sig(void)
+{
+	fido_assert_t *a;
+	es256_pk_t *pk;
+	unsigned char *junk;
+
+	junk = malloc(sizeof(sig));
+	assert(junk != NULL);
+	memcpy(junk, sig, sizeof(sig));
+	junk[0] = ~junk[0];
+
+	a = alloc_assert();
+	pk = alloc_es256_pk();
+	assert(es256_pk_from_ptr(pk, es256_pk, sizeof(es256_pk)) == FIDO_OK);
+	assert(fido_assert_set_clientdata_hash(a, cdh, sizeof(cdh)) == FIDO_OK);
+	assert(fido_assert_set_rp(a, "localhost") == FIDO_OK);
+	assert(fido_assert_set_count(a, 1) == FIDO_OK);
+	assert(fido_assert_set_authdata(a, 0, authdata,
+	    sizeof(authdata)) == FIDO_OK);
+	assert(fido_assert_set_up(a, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_assert_set_uv(a, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_assert_set_sig(a, 0, junk, sizeof(sig)) == FIDO_OK);
+	assert(fido_assert_verify(a, 0, COSE_ES256, pk) == FIDO_ERR_INVALID_SIG);
+	free_assert(a);
+	free_es256_pk(pk);
+	free(junk);
+}
+
+static void
+wrong_options(void)
+{
+	fido_assert_t *a;
+	es256_pk_t *pk;
+
+	a = alloc_assert();
+	pk = alloc_es256_pk();
+	assert(es256_pk_from_ptr(pk, es256_pk, sizeof(es256_pk)) == FIDO_OK);
+	assert(fido_assert_set_clientdata_hash(a, cdh, sizeof(cdh)) == FIDO_OK);
+	assert(fido_assert_set_rp(a, "localhost") == FIDO_OK);
+	assert(fido_assert_set_count(a, 1) == FIDO_OK);
+	assert(fido_assert_set_authdata(a, 0, authdata,
+	    sizeof(authdata)) == FIDO_OK);
+	assert(fido_assert_set_up(a, FIDO_OPT_TRUE) == FIDO_OK);
+	assert(fido_assert_set_uv(a, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_assert_set_sig(a, 0, sig, sizeof(sig)) == FIDO_OK);
+	assert(fido_assert_verify(a, 0, COSE_ES256,
+	    pk) == FIDO_ERR_INVALID_PARAM);
+	assert(fido_assert_set_up(a, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_assert_set_uv(a, FIDO_OPT_TRUE) == FIDO_OK);
+	assert(fido_assert_verify(a, 0, COSE_ES256,
+	    pk) == FIDO_ERR_INVALID_PARAM);
+	assert(fido_assert_set_up(a, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_assert_set_uv(a, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_assert_verify(a, 0, COSE_ES256, pk) == FIDO_OK);
+	free_assert(a);
+	free_es256_pk(pk);
+}
+
+/* cbor_serialize_alloc misuse */
+static void
+bad_cbor_serialize(void)
+{
+	fido_assert_t *a;
+
+	a = alloc_assert();
+	assert(fido_assert_set_count(a, 1) == FIDO_OK);
+	assert(fido_assert_set_authdata(a, 0, authdata,
+	    sizeof(authdata)) == FIDO_OK);
+	assert(fido_assert_authdata_len(a, 0) == sizeof(authdata));
+	free_assert(a);
+}
+
+int
+main(void)
+{
+	fido_init(0);
+
+	empty_assert_tests();
+	valid_assert();
+	no_cdh();
+	no_rp();
+	no_authdata();
+	no_sig();
+	junk_cdh();
+	junk_rp();
+	junk_authdata();
+	junk_sig();
+	wrong_options();
+	bad_cbor_serialize();
+
+	exit(0);
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/regress/CMakeLists.txt mysql-8.0-8.0.27/extra/libfido2/regress/CMakeLists.txt
--- mysql-8.0-8.0.26/extra/libfido2/regress/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/regress/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,16 @@
+# Copyright (c) 2018 Yubico AB. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+add_custom_target(regress ALL)
+
+macro(add_regress_test NAME SOURCES)
+	add_executable(${NAME} ${SOURCES})
+	target_link_libraries(${NAME} fido2_shared)
+	add_custom_command(TARGET regress POST_BUILD COMMAND ${NAME}
+		DEPENDS ${NAME})
+endmacro()
+
+add_regress_test(regress_cred cred.c)
+add_regress_test(regress_assert assert.c)
+add_regress_test(regress_dev dev.c)
diff -Nru mysql-8.0-8.0.26/extra/libfido2/regress/cred.c mysql-8.0-8.0.27/extra/libfido2/regress/cred.c
--- mysql-8.0-8.0.26/extra/libfido2/regress/cred.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/regress/cred.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,897 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <assert.h>
+#include <fido.h>
+#include <string.h>
+
+#define FAKE_DEV_HANDLE	((void *)0xdeadbeef)
+
+static const unsigned char cdh[32] = {
+	0xf9, 0x64, 0x57, 0xe7, 0x2d, 0x97, 0xf6, 0xbb,
+	0xdd, 0xd7, 0xfb, 0x06, 0x37, 0x62, 0xea, 0x26,
+	0x20, 0x44, 0x8e, 0x69, 0x7c, 0x03, 0xf2, 0x31,
+	0x2f, 0x99, 0xdc, 0xaf, 0x3e, 0x8a, 0x91, 0x6b,
+};
+
+static const unsigned char authdata[198] = {
+	0x58, 0xc4, 0x49, 0x96, 0x0d, 0xe5, 0x88, 0x0e,
+	0x8c, 0x68, 0x74, 0x34, 0x17, 0x0f, 0x64, 0x76,
+	0x60, 0x5b, 0x8f, 0xe4, 0xae, 0xb9, 0xa2, 0x86,
+	0x32, 0xc7, 0x99, 0x5c, 0xf3, 0xba, 0x83, 0x1d,
+	0x97, 0x63, 0x41, 0x00, 0x00, 0x00, 0x00, 0xf8,
+	0xa0, 0x11, 0xf3, 0x8c, 0x0a, 0x4d, 0x15, 0x80,
+	0x06, 0x17, 0x11, 0x1f, 0x9e, 0xdc, 0x7d, 0x00,
+	0x40, 0x53, 0xfb, 0xdf, 0xaa, 0xce, 0x63, 0xde,
+	0xc5, 0xfe, 0x47, 0xe6, 0x52, 0xeb, 0xf3, 0x5d,
+	0x53, 0xa8, 0xbf, 0x9d, 0xd6, 0x09, 0x6b, 0x5e,
+	0x7f, 0xe0, 0x0d, 0x51, 0x30, 0x85, 0x6a, 0xda,
+	0x68, 0x70, 0x85, 0xb0, 0xdb, 0x08, 0x0b, 0x83,
+	0x2c, 0xef, 0x44, 0xe2, 0x36, 0x88, 0xee, 0x76,
+	0x90, 0x6e, 0x7b, 0x50, 0x3e, 0x9a, 0xa0, 0xd6,
+	0x3c, 0x34, 0xe3, 0x83, 0xe7, 0xd1, 0xbd, 0x9f,
+	0x25, 0xa5, 0x01, 0x02, 0x03, 0x26, 0x20, 0x01,
+	0x21, 0x58, 0x20, 0x17, 0x5b, 0x27, 0xa6, 0x56,
+	0xb2, 0x26, 0x0c, 0x26, 0x0c, 0x55, 0x42, 0x78,
+	0x17, 0x5d, 0x4c, 0xf8, 0xa2, 0xfd, 0x1b, 0xb9,
+	0x54, 0xdf, 0xd5, 0xeb, 0xbf, 0x22, 0x64, 0xf5,
+	0x21, 0x9a, 0xc6, 0x22, 0x58, 0x20, 0x87, 0x5f,
+	0x90, 0xe6, 0xfd, 0x71, 0x27, 0x9f, 0xeb, 0xe3,
+	0x03, 0x44, 0xbc, 0x8d, 0x49, 0xc6, 0x1c, 0x31,
+	0x3b, 0x72, 0xae, 0xd4, 0x53, 0xb1, 0xfe, 0x5d,
+	0xe1, 0x30, 0xfc, 0x2b, 0x1e, 0xd2,
+};
+
+static const unsigned char authdata_dupkeys[200] = {
+	0x58, 0xc6, 0x49, 0x96, 0x0d, 0xe5, 0x88, 0x0e,
+	0x8c, 0x68, 0x74, 0x34, 0x17, 0x0f, 0x64, 0x76,
+	0x60, 0x5b, 0x8f, 0xe4, 0xae, 0xb9, 0xa2, 0x86,
+	0x32, 0xc7, 0x99, 0x5c, 0xf3, 0xba, 0x83, 0x1d,
+	0x97, 0x63, 0x41, 0x00, 0x00, 0x00, 0x00, 0xf8,
+	0xa0, 0x11, 0xf3, 0x8c, 0x0a, 0x4d, 0x15, 0x80,
+	0x06, 0x17, 0x11, 0x1f, 0x9e, 0xdc, 0x7d, 0x00,
+	0x40, 0x53, 0xfb, 0xdf, 0xaa, 0xce, 0x63, 0xde,
+	0xc5, 0xfe, 0x47, 0xe6, 0x52, 0xeb, 0xf3, 0x5d,
+	0x53, 0xa8, 0xbf, 0x9d, 0xd6, 0x09, 0x6b, 0x5e,
+	0x7f, 0xe0, 0x0d, 0x51, 0x30, 0x85, 0x6a, 0xda,
+	0x68, 0x70, 0x85, 0xb0, 0xdb, 0x08, 0x0b, 0x83,
+	0x2c, 0xef, 0x44, 0xe2, 0x36, 0x88, 0xee, 0x76,
+	0x90, 0x6e, 0x7b, 0x50, 0x3e, 0x9a, 0xa0, 0xd6,
+	0x3c, 0x34, 0xe3, 0x83, 0xe7, 0xd1, 0xbd, 0x9f,
+	0x25, 0xa6, 0x01, 0x02, 0x01, 0x02, 0x03, 0x26,
+	0x20, 0x01, 0x21, 0x58, 0x20, 0x17, 0x5b, 0x27,
+	0xa6, 0x56, 0xb2, 0x26, 0x0c, 0x26, 0x0c, 0x55,
+	0x42, 0x78, 0x17, 0x5d, 0x4c, 0xf8, 0xa2, 0xfd,
+	0x1b, 0xb9, 0x54, 0xdf, 0xd5, 0xeb, 0xbf, 0x22,
+	0x64, 0xf5, 0x21, 0x9a, 0xc6, 0x22, 0x58, 0x20,
+	0x87, 0x5f, 0x90, 0xe6, 0xfd, 0x71, 0x27, 0x9f,
+	0xeb, 0xe3, 0x03, 0x44, 0xbc, 0x8d, 0x49, 0xc6,
+	0x1c, 0x31, 0x3b, 0x72, 0xae, 0xd4, 0x53, 0xb1,
+	0xfe, 0x5d, 0xe1, 0x30, 0xfc, 0x2b, 0x1e, 0xd2,
+};
+
+static const unsigned char authdata_unsorted_keys[198] = {
+	0x58, 0xc4, 0x49, 0x96, 0x0d, 0xe5, 0x88, 0x0e,
+	0x8c, 0x68, 0x74, 0x34, 0x17, 0x0f, 0x64, 0x76,
+	0x60, 0x5b, 0x8f, 0xe4, 0xae, 0xb9, 0xa2, 0x86,
+	0x32, 0xc7, 0x99, 0x5c, 0xf3, 0xba, 0x83, 0x1d,
+	0x97, 0x63, 0x41, 0x00, 0x00, 0x00, 0x00, 0xf8,
+	0xa0, 0x11, 0xf3, 0x8c, 0x0a, 0x4d, 0x15, 0x80,
+	0x06, 0x17, 0x11, 0x1f, 0x9e, 0xdc, 0x7d, 0x00,
+	0x40, 0x53, 0xfb, 0xdf, 0xaa, 0xce, 0x63, 0xde,
+	0xc5, 0xfe, 0x47, 0xe6, 0x52, 0xeb, 0xf3, 0x5d,
+	0x53, 0xa8, 0xbf, 0x9d, 0xd6, 0x09, 0x6b, 0x5e,
+	0x7f, 0xe0, 0x0d, 0x51, 0x30, 0x85, 0x6a, 0xda,
+	0x68, 0x70, 0x85, 0xb0, 0xdb, 0x08, 0x0b, 0x83,
+	0x2c, 0xef, 0x44, 0xe2, 0x36, 0x88, 0xee, 0x76,
+	0x90, 0x6e, 0x7b, 0x50, 0x3e, 0x9a, 0xa0, 0xd6,
+	0x3c, 0x34, 0xe3, 0x83, 0xe7, 0xd1, 0xbd, 0x9f,
+	0x25, 0xa5, 0x03, 0x26, 0x01, 0x02, 0x20, 0x01,
+	0x21, 0x58, 0x20, 0x17, 0x5b, 0x27, 0xa6, 0x56,
+	0xb2, 0x26, 0x0c, 0x26, 0x0c, 0x55, 0x42, 0x78,
+	0x17, 0x5d, 0x4c, 0xf8, 0xa2, 0xfd, 0x1b, 0xb9,
+	0x54, 0xdf, 0xd5, 0xeb, 0xbf, 0x22, 0x64, 0xf5,
+	0x21, 0x9a, 0xc6, 0x22, 0x58, 0x20, 0x87, 0x5f,
+	0x90, 0xe6, 0xfd, 0x71, 0x27, 0x9f, 0xeb, 0xe3,
+	0x03, 0x44, 0xbc, 0x8d, 0x49, 0xc6, 0x1c, 0x31,
+	0x3b, 0x72, 0xae, 0xd4, 0x53, 0xb1, 0xfe, 0x5d,
+	0xe1, 0x30, 0xfc, 0x2b, 0x1e, 0xd2,
+};
+
+static const unsigned char x509[742] = {
+	0x30, 0x82, 0x02, 0xe2, 0x30, 0x81, 0xcb, 0x02,
+	0x01, 0x01, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86,
+	0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05,
+	0x00, 0x30, 0x1d, 0x31, 0x1b, 0x30, 0x19, 0x06,
+	0x03, 0x55, 0x04, 0x03, 0x13, 0x12, 0x59, 0x75,
+	0x62, 0x69, 0x63, 0x6f, 0x20, 0x55, 0x32, 0x46,
+	0x20, 0x54, 0x65, 0x73, 0x74, 0x20, 0x43, 0x41,
+	0x30, 0x1e, 0x17, 0x0d, 0x31, 0x34, 0x30, 0x35,
+	0x31, 0x35, 0x31, 0x32, 0x35, 0x38, 0x35, 0x34,
+	0x5a, 0x17, 0x0d, 0x31, 0x34, 0x30, 0x36, 0x31,
+	0x34, 0x31, 0x32, 0x35, 0x38, 0x35, 0x34, 0x5a,
+	0x30, 0x1d, 0x31, 0x1b, 0x30, 0x19, 0x06, 0x03,
+	0x55, 0x04, 0x03, 0x13, 0x12, 0x59, 0x75, 0x62,
+	0x69, 0x63, 0x6f, 0x20, 0x55, 0x32, 0x46, 0x20,
+	0x54, 0x65, 0x73, 0x74, 0x20, 0x45, 0x45, 0x30,
+	0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48,
+	0xce, 0x3d, 0x02, 0x01, 0x06, 0x08, 0x2a, 0x86,
+	0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42,
+	0x00, 0x04, 0xdb, 0x0a, 0xdb, 0xf5, 0x21, 0xc7,
+	0x5c, 0xce, 0x63, 0xdc, 0xa6, 0xe1, 0xe8, 0x25,
+	0x06, 0x0d, 0x94, 0xe6, 0x27, 0x54, 0x19, 0x4f,
+	0x9d, 0x24, 0xaf, 0x26, 0x1a, 0xbe, 0xad, 0x99,
+	0x44, 0x1f, 0x95, 0xa3, 0x71, 0x91, 0x0a, 0x3a,
+	0x20, 0xe7, 0x3e, 0x91, 0x5e, 0x13, 0xe8, 0xbe,
+	0x38, 0x05, 0x7a, 0xd5, 0x7a, 0xa3, 0x7e, 0x76,
+	0x90, 0x8f, 0xaf, 0xe2, 0x8a, 0x94, 0xb6, 0x30,
+	0xeb, 0x9d, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86,
+	0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05,
+	0x00, 0x03, 0x82, 0x02, 0x01, 0x00, 0x95, 0x40,
+	0x6b, 0x50, 0x61, 0x7d, 0xad, 0x84, 0xa3, 0xb4,
+	0xeb, 0x88, 0x0f, 0xe3, 0x30, 0x0f, 0x2d, 0xa2,
+	0x0a, 0x00, 0xd9, 0x25, 0x04, 0xee, 0x72, 0xfa,
+	0x67, 0xdf, 0x58, 0x51, 0x0f, 0x0b, 0x47, 0x02,
+	0x9c, 0x3e, 0x41, 0x29, 0x4a, 0x93, 0xac, 0x29,
+	0x85, 0x89, 0x2d, 0xa4, 0x7a, 0x81, 0x32, 0x28,
+	0x57, 0x71, 0x01, 0xef, 0xa8, 0x42, 0x88, 0x16,
+	0x96, 0x37, 0x91, 0xd5, 0xdf, 0xe0, 0x8f, 0xc9,
+	0x3c, 0x8d, 0xb0, 0xcd, 0x89, 0x70, 0x82, 0xec,
+	0x79, 0xd3, 0xc6, 0x78, 0x73, 0x29, 0x32, 0xe5,
+	0xab, 0x6c, 0xbd, 0x56, 0x9f, 0xd5, 0x45, 0x91,
+	0xce, 0xc1, 0xdd, 0x8d, 0x64, 0xdc, 0xe9, 0x9c,
+	0x1f, 0x5e, 0x3c, 0xd2, 0xaf, 0x51, 0xa5, 0x82,
+	0x18, 0xaf, 0xe0, 0x37, 0xe7, 0x32, 0x9e, 0x76,
+	0x05, 0x77, 0x02, 0x7b, 0xe6, 0x24, 0xa0, 0x31,
+	0x56, 0x1b, 0xfd, 0x19, 0xc5, 0x71, 0xd3, 0xf0,
+	0x9e, 0xc0, 0x73, 0x05, 0x4e, 0xbc, 0x85, 0xb8,
+	0x53, 0x9e, 0xef, 0xc5, 0xbc, 0x9c, 0x56, 0xa3,
+	0xba, 0xd9, 0x27, 0x6a, 0xbb, 0xa9, 0x7a, 0x40,
+	0xd7, 0x47, 0x8b, 0x55, 0x72, 0x6b, 0xe3, 0xfe,
+	0x28, 0x49, 0x71, 0x24, 0xf4, 0x8f, 0xf4, 0x20,
+	0x81, 0xea, 0x38, 0xff, 0x7c, 0x0a, 0x4f, 0xdf,
+	0x02, 0x82, 0x39, 0x81, 0x82, 0x3b, 0xca, 0x09,
+	0xdd, 0xca, 0xaa, 0x0f, 0x27, 0xf5, 0xa4, 0x83,
+	0x55, 0x6c, 0x9a, 0x39, 0x9b, 0x15, 0x3a, 0x16,
+	0x63, 0xdc, 0x5b, 0xf9, 0xac, 0x5b, 0xbc, 0xf7,
+	0x9f, 0xbe, 0x0f, 0x8a, 0xa2, 0x3c, 0x31, 0x13,
+	0xa3, 0x32, 0x48, 0xca, 0x58, 0x87, 0xf8, 0x7b,
+	0xa0, 0xa1, 0x0a, 0x6a, 0x60, 0x96, 0x93, 0x5f,
+	0x5d, 0x26, 0x9e, 0x63, 0x1d, 0x09, 0xae, 0x9a,
+	0x41, 0xe5, 0xbd, 0x08, 0x47, 0xfe, 0xe5, 0x09,
+	0x9b, 0x20, 0xfd, 0x12, 0xe2, 0xe6, 0x40, 0x7f,
+	0xba, 0x4a, 0x61, 0x33, 0x66, 0x0d, 0x0e, 0x73,
+	0xdb, 0xb0, 0xd5, 0xa2, 0x9a, 0x9a, 0x17, 0x0d,
+	0x34, 0x30, 0x85, 0x6a, 0x42, 0x46, 0x9e, 0xff,
+	0x34, 0x8f, 0x5f, 0x87, 0x6c, 0x35, 0xe7, 0xa8,
+	0x4d, 0x35, 0xeb, 0xc1, 0x41, 0xaa, 0x8a, 0xd2,
+	0xda, 0x19, 0xaa, 0x79, 0xa2, 0x5f, 0x35, 0x2c,
+	0xa0, 0xfd, 0x25, 0xd3, 0xf7, 0x9d, 0x25, 0x18,
+	0x2d, 0xfa, 0xb4, 0xbc, 0xbb, 0x07, 0x34, 0x3c,
+	0x8d, 0x81, 0xbd, 0xf4, 0xe9, 0x37, 0xdb, 0x39,
+	0xe9, 0xd1, 0x45, 0x5b, 0x20, 0x41, 0x2f, 0x2d,
+	0x27, 0x22, 0xdc, 0x92, 0x74, 0x8a, 0x92, 0xd5,
+	0x83, 0xfd, 0x09, 0xfb, 0x13, 0x9b, 0xe3, 0x39,
+	0x7a, 0x6b, 0x5c, 0xfa, 0xe6, 0x76, 0x9e, 0xe0,
+	0xe4, 0xe3, 0xef, 0xad, 0xbc, 0xfd, 0x42, 0x45,
+	0x9a, 0xd4, 0x94, 0xd1, 0x7e, 0x8d, 0xa7, 0xd8,
+	0x05, 0xd5, 0xd3, 0x62, 0xcf, 0x15, 0xcf, 0x94,
+	0x7d, 0x1f, 0x5b, 0x58, 0x20, 0x44, 0x20, 0x90,
+	0x71, 0xbe, 0x66, 0xe9, 0x9a, 0xab, 0x74, 0x32,
+	0x70, 0x53, 0x1d, 0x69, 0xed, 0x87, 0x66, 0xf4,
+	0x09, 0x4f, 0xca, 0x25, 0x30, 0xc2, 0x63, 0x79,
+	0x00, 0x3c, 0xb1, 0x9b, 0x39, 0x3f, 0x00, 0xe0,
+	0xa8, 0x88, 0xef, 0x7a, 0x51, 0x5b, 0xe7, 0xbd,
+	0x49, 0x64, 0xda, 0x41, 0x7b, 0x24, 0xc3, 0x71,
+	0x22, 0xfd, 0xd1, 0xd1, 0x20, 0xb3, 0x3f, 0x97,
+	0xd3, 0x97, 0xb2, 0xaa, 0x18, 0x1c, 0x9e, 0x03,
+	0x77, 0x7b, 0x5b, 0x7e, 0xf9, 0xa3, 0xa0, 0xd6,
+	0x20, 0x81, 0x2c, 0x38, 0x8f, 0x9d, 0x25, 0xde,
+	0xe9, 0xc8, 0xf5, 0xdd, 0x6a, 0x47, 0x9c, 0x65,
+	0x04, 0x5a, 0x56, 0xe6, 0xc2, 0xeb, 0xf2, 0x02,
+	0x97, 0xe1, 0xb9, 0xd8, 0xe1, 0x24, 0x76, 0x9f,
+	0x23, 0x62, 0x39, 0x03, 0x4b, 0xc8, 0xf7, 0x34,
+	0x07, 0x49, 0xd6, 0xe7, 0x4d, 0x9a,
+};
+
+const unsigned char sig[70] = {
+	0x30, 0x44, 0x02, 0x20, 0x54, 0x92, 0x28, 0x3b,
+	0x83, 0x33, 0x47, 0x56, 0x68, 0x79, 0xb2, 0x0c,
+	0x84, 0x80, 0xcc, 0x67, 0x27, 0x8b, 0xfa, 0x48,
+	0x43, 0x0d, 0x3c, 0xb4, 0x02, 0x36, 0x87, 0x97,
+	0x3e, 0xdf, 0x2f, 0x65, 0x02, 0x20, 0x1b, 0x56,
+	0x17, 0x06, 0xe2, 0x26, 0x0f, 0x6a, 0xe9, 0xa9,
+	0x70, 0x99, 0x62, 0xeb, 0x3a, 0x04, 0x1a, 0xc4,
+	0xa7, 0x03, 0x28, 0x56, 0x7c, 0xed, 0x47, 0x08,
+	0x68, 0x73, 0x6a, 0xb6, 0x89, 0x0d,
+};
+
+const unsigned char pubkey[64] = {
+	0x17, 0x5b, 0x27, 0xa6, 0x56, 0xb2, 0x26, 0x0c,
+	0x26, 0x0c, 0x55, 0x42, 0x78, 0x17, 0x5d, 0x4c,
+	0xf8, 0xa2, 0xfd, 0x1b, 0xb9, 0x54, 0xdf, 0xd5,
+	0xeb, 0xbf, 0x22, 0x64, 0xf5, 0x21, 0x9a, 0xc6,
+	0x87, 0x5f, 0x90, 0xe6, 0xfd, 0x71, 0x27, 0x9f,
+	0xeb, 0xe3, 0x03, 0x44, 0xbc, 0x8d, 0x49, 0xc6,
+	0x1c, 0x31, 0x3b, 0x72, 0xae, 0xd4, 0x53, 0xb1,
+	0xfe, 0x5d, 0xe1, 0x30, 0xfc, 0x2b, 0x1e, 0xd2,
+};
+
+const unsigned char id[64] = {
+	0x53, 0xfb, 0xdf, 0xaa, 0xce, 0x63, 0xde, 0xc5,
+	0xfe, 0x47, 0xe6, 0x52, 0xeb, 0xf3, 0x5d, 0x53,
+	0xa8, 0xbf, 0x9d, 0xd6, 0x09, 0x6b, 0x5e, 0x7f,
+	0xe0, 0x0d, 0x51, 0x30, 0x85, 0x6a, 0xda, 0x68,
+	0x70, 0x85, 0xb0, 0xdb, 0x08, 0x0b, 0x83, 0x2c,
+	0xef, 0x44, 0xe2, 0x36, 0x88, 0xee, 0x76, 0x90,
+	0x6e, 0x7b, 0x50, 0x3e, 0x9a, 0xa0, 0xd6, 0x3c,
+	0x34, 0xe3, 0x83, 0xe7, 0xd1, 0xbd, 0x9f, 0x25,
+};
+
+/*
+ * Security Key By Yubico
+ * 5.1.X
+ * f8a011f3-8c0a-4d15-8006-17111f9edc7d
+*/
+const unsigned char aaguid[16] = {
+	0xf8, 0xa0, 0x11, 0xf3, 0x8c, 0x0a, 0x4d, 0x15,
+	0x80, 0x06, 0x17, 0x11, 0x1f, 0x9e, 0xdc, 0x7d,
+};
+
+const char rp_id[] = "localhost";
+const char rp_name[] = "sweet home localhost";
+
+static void *
+dummy_open(const char *path)
+{
+	(void)path;
+
+	return (FAKE_DEV_HANDLE);
+}
+
+static void
+dummy_close(void *handle)
+{
+	assert(handle == FAKE_DEV_HANDLE);
+}
+
+static int
+dummy_read(void *handle, unsigned char *buf, size_t len, int ms)
+{
+	(void)handle;
+	(void)buf;
+	(void)len;
+	(void)ms;
+
+	abort();
+	/* NOTREACHED */
+}
+
+static int
+dummy_write(void *handle, const unsigned char *buf, size_t len)
+{
+	(void)handle;
+	(void)buf;
+	(void)len;
+
+	abort();
+	/* NOTREACHED */
+}
+
+static fido_cred_t *
+alloc_cred(void)
+{
+	fido_cred_t *c;
+
+	c = fido_cred_new();
+	assert(c != NULL);
+
+	return (c);
+}
+
+static void
+free_cred(fido_cred_t *c)
+{
+	fido_cred_free(&c);
+	assert(c == NULL);
+}
+
+static fido_dev_t *
+alloc_dev(void)
+{
+	fido_dev_t *d;
+
+	d = fido_dev_new();
+	assert(d != NULL);
+
+	return (d);
+}
+
+static void
+free_dev(fido_dev_t *d)
+{
+	fido_dev_free(&d);
+	assert(d == NULL);
+}
+
+static void
+empty_cred(void)
+{
+	fido_cred_t *c;
+	fido_dev_t *d;
+	fido_dev_io_t io_f;
+
+	c = alloc_cred();
+	assert(fido_cred_authdata_len(c) == 0);
+	assert(fido_cred_authdata_ptr(c) == NULL);
+	assert(fido_cred_clientdata_hash_len(c) == 0);
+	assert(fido_cred_clientdata_hash_ptr(c) == NULL);
+	assert(fido_cred_flags(c) == 0);
+	assert(fido_cred_fmt(c) == NULL);
+	assert(fido_cred_id_len(c) == 0);
+	assert(fido_cred_id_ptr(c) == NULL);
+	assert(fido_cred_prot(c) == 0);
+	assert(fido_cred_pubkey_len(c) == 0);
+	assert(fido_cred_pubkey_ptr(c) == NULL);
+	assert(fido_cred_rp_id(c) == NULL);
+	assert(fido_cred_rp_name(c) == NULL);
+	assert(fido_cred_sig_len(c) == 0);
+	assert(fido_cred_sig_ptr(c) == NULL);
+	assert(fido_cred_x5c_len(c) == 0);
+	assert(fido_cred_x5c_ptr(c) == NULL);
+	assert(fido_cred_verify(c) == FIDO_ERR_INVALID_ARGUMENT);
+
+	memset(&io_f, 0, sizeof(io_f));
+
+	io_f.open = dummy_open;
+	io_f.close = dummy_close;
+	io_f.read = dummy_read;
+	io_f.write = dummy_write;
+
+	d = alloc_dev();
+
+	fido_dev_force_u2f(d);
+	assert(fido_dev_set_io_functions(d, &io_f) == FIDO_OK);
+	assert(fido_dev_make_cred(d, c, NULL) == FIDO_ERR_INVALID_ARGUMENT);
+	assert(fido_dev_make_cred(d, c, "") == FIDO_ERR_UNSUPPORTED_OPTION);
+	assert(fido_cred_verify(c) == FIDO_ERR_INVALID_ARGUMENT);
+
+	fido_dev_force_fido2(d);
+	assert(fido_dev_set_io_functions(d, &io_f) == FIDO_OK);
+	assert(fido_dev_make_cred(d, c, NULL) == FIDO_ERR_INVALID_ARGUMENT);
+	assert(fido_dev_make_cred(d, c, "") == FIDO_ERR_INVALID_ARGUMENT);
+	assert(fido_cred_verify(c) == FIDO_ERR_INVALID_ARGUMENT);
+
+	free_cred(c);
+	free_dev(d);
+}
+
+static void
+valid_cred(void)
+{
+	fido_cred_t *c;
+
+	c = alloc_cred();
+	assert(fido_cred_set_type(c, COSE_ES256) == FIDO_OK);
+	assert(fido_cred_set_clientdata_hash(c, cdh, sizeof(cdh)) == FIDO_OK);
+	assert(fido_cred_set_rp(c, rp_id, rp_name) == FIDO_OK);
+	assert(fido_cred_set_authdata(c, authdata, sizeof(authdata)) == FIDO_OK);
+	assert(fido_cred_set_rk(c, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_cred_set_uv(c, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_cred_set_x509(c, x509, sizeof(x509)) == FIDO_OK);
+	assert(fido_cred_set_sig(c, sig, sizeof(sig)) == FIDO_OK);
+	assert(fido_cred_set_fmt(c, "packed") == FIDO_OK);
+	assert(fido_cred_verify(c) == FIDO_OK);
+	assert(fido_cred_prot(c) == 0);
+	assert(fido_cred_pubkey_len(c) == sizeof(pubkey));
+	assert(memcmp(fido_cred_pubkey_ptr(c), pubkey, sizeof(pubkey)) == 0);
+	assert(fido_cred_id_len(c) == sizeof(id));
+	assert(memcmp(fido_cred_id_ptr(c), id, sizeof(id)) == 0);
+	assert(fido_cred_aaguid_len(c) == sizeof(aaguid));
+	assert(memcmp(fido_cred_aaguid_ptr(c), aaguid, sizeof(aaguid)) == 0);
+	free_cred(c);
+}
+
+static void
+no_cdh(void)
+{
+	fido_cred_t *c;
+
+	c = alloc_cred();
+	assert(fido_cred_set_type(c, COSE_ES256) == FIDO_OK);
+	assert(fido_cred_set_rp(c, rp_id, rp_name) == FIDO_OK);
+	assert(fido_cred_set_authdata(c, authdata, sizeof(authdata)) == FIDO_OK);
+	assert(fido_cred_set_rk(c, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_cred_set_uv(c, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_cred_set_x509(c, x509, sizeof(x509)) == FIDO_OK);
+	assert(fido_cred_set_sig(c, sig, sizeof(sig)) == FIDO_OK);
+	assert(fido_cred_set_fmt(c, "packed") == FIDO_OK);
+	assert(fido_cred_verify(c) == FIDO_ERR_INVALID_ARGUMENT);
+	assert(fido_cred_pubkey_len(c) == sizeof(pubkey));
+	assert(memcmp(fido_cred_pubkey_ptr(c), pubkey, sizeof(pubkey)) == 0);
+	assert(fido_cred_id_len(c) == sizeof(id));
+	assert(memcmp(fido_cred_id_ptr(c), id, sizeof(id)) == 0);
+	assert(fido_cred_aaguid_len(c) == sizeof(aaguid));
+	assert(memcmp(fido_cred_aaguid_ptr(c), aaguid, sizeof(aaguid)) == 0);
+	free_cred(c);
+}
+
+static void
+no_rp_id(void)
+{
+	fido_cred_t *c;
+
+	c = alloc_cred();
+	assert(fido_cred_set_type(c, COSE_ES256) == FIDO_OK);
+	assert(fido_cred_set_clientdata_hash(c, cdh, sizeof(cdh)) == FIDO_OK);
+	assert(fido_cred_set_authdata(c, authdata, sizeof(authdata)) == FIDO_OK);
+	assert(fido_cred_set_rk(c, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_cred_set_uv(c, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_cred_set_x509(c, x509, sizeof(x509)) == FIDO_OK);
+	assert(fido_cred_set_sig(c, sig, sizeof(sig)) == FIDO_OK);
+	assert(fido_cred_set_fmt(c, "packed") == FIDO_OK);
+	assert(fido_cred_verify(c) == FIDO_ERR_INVALID_ARGUMENT);
+	assert(fido_cred_pubkey_len(c) == sizeof(pubkey));
+	assert(memcmp(fido_cred_pubkey_ptr(c), pubkey, sizeof(pubkey)) == 0);
+	assert(fido_cred_id_len(c) == sizeof(id));
+	assert(memcmp(fido_cred_id_ptr(c), id, sizeof(id)) == 0);
+	assert(fido_cred_aaguid_len(c) == sizeof(aaguid));
+	assert(memcmp(fido_cred_aaguid_ptr(c), aaguid, sizeof(aaguid)) == 0);
+	free_cred(c);
+}
+
+static void
+no_rp_name(void)
+{
+	fido_cred_t *c;
+
+	c = alloc_cred();
+	assert(fido_cred_set_type(c, COSE_ES256) == FIDO_OK);
+	assert(fido_cred_set_rp(c, rp_id, NULL) == FIDO_OK);
+	assert(fido_cred_set_clientdata_hash(c, cdh, sizeof(cdh)) == FIDO_OK);
+	assert(fido_cred_set_authdata(c, authdata, sizeof(authdata)) == FIDO_OK);
+	assert(fido_cred_set_rk(c, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_cred_set_uv(c, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_cred_set_x509(c, x509, sizeof(x509)) == FIDO_OK);
+	assert(fido_cred_set_sig(c, sig, sizeof(sig)) == FIDO_OK);
+	assert(fido_cred_set_fmt(c, "packed") == FIDO_OK);
+	assert(fido_cred_verify(c) == FIDO_OK);
+	assert(fido_cred_pubkey_len(c) == sizeof(pubkey));
+	assert(memcmp(fido_cred_pubkey_ptr(c), pubkey, sizeof(pubkey)) == 0);
+	assert(fido_cred_id_len(c) == sizeof(id));
+	assert(memcmp(fido_cred_id_ptr(c), id, sizeof(id)) == 0);
+	assert(fido_cred_aaguid_len(c) == sizeof(aaguid));
+	assert(memcmp(fido_cred_aaguid_ptr(c), aaguid, sizeof(aaguid)) == 0);
+	free_cred(c);
+}
+
+static void
+no_authdata(void)
+{
+	fido_cred_t *c;
+	unsigned char *unset;
+
+	unset = calloc(1, sizeof(aaguid));
+	assert(unset != NULL);
+
+	c = alloc_cred();
+	assert(fido_cred_set_type(c, COSE_ES256) == FIDO_OK);
+	assert(fido_cred_set_clientdata_hash(c, cdh, sizeof(cdh)) == FIDO_OK);
+	assert(fido_cred_set_rp(c, rp_id, rp_name) == FIDO_OK);
+	assert(fido_cred_set_rk(c, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_cred_set_uv(c, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_cred_set_x509(c, x509, sizeof(x509)) == FIDO_OK);
+	assert(fido_cred_set_sig(c, sig, sizeof(sig)) == FIDO_OK);
+	assert(fido_cred_set_fmt(c, "packed") == FIDO_OK);
+	assert(fido_cred_verify(c) == FIDO_ERR_INVALID_ARGUMENT);
+	assert(fido_cred_pubkey_len(c) == 0);
+	assert(fido_cred_pubkey_ptr(c) == NULL);
+	assert(fido_cred_id_len(c) == 0);
+	assert(fido_cred_id_ptr(c) == NULL);
+	assert(fido_cred_aaguid_len(c) == sizeof(aaguid));
+	assert(memcmp(fido_cred_aaguid_ptr(c), unset, sizeof(aaguid)) == 0);
+	free_cred(c);
+	free(unset);
+}
+
+static void
+no_x509(void)
+{
+	fido_cred_t *c;
+
+	c = alloc_cred();
+	assert(fido_cred_set_type(c, COSE_ES256) == FIDO_OK);
+	assert(fido_cred_set_clientdata_hash(c, cdh, sizeof(cdh)) == FIDO_OK);
+	assert(fido_cred_set_rp(c, rp_id, rp_name) == FIDO_OK);
+	assert(fido_cred_set_authdata(c, authdata, sizeof(authdata)) == FIDO_OK);
+	assert(fido_cred_set_rk(c, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_cred_set_uv(c, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_cred_set_sig(c, sig, sizeof(sig)) == FIDO_OK);
+	assert(fido_cred_set_fmt(c, "packed") == FIDO_OK);
+	assert(fido_cred_verify(c) == FIDO_ERR_INVALID_ARGUMENT);
+	assert(fido_cred_pubkey_len(c) == sizeof(pubkey));
+	assert(memcmp(fido_cred_pubkey_ptr(c), pubkey, sizeof(pubkey)) == 0);
+	assert(fido_cred_id_len(c) == sizeof(id));
+	assert(memcmp(fido_cred_id_ptr(c), id, sizeof(id)) == 0);
+	assert(fido_cred_aaguid_len(c) == sizeof(aaguid));
+	assert(memcmp(fido_cred_aaguid_ptr(c), aaguid, sizeof(aaguid)) == 0);
+	free_cred(c);
+}
+
+static void
+no_sig(void)
+{
+	fido_cred_t *c;
+
+	c = alloc_cred();
+	assert(fido_cred_set_type(c, COSE_ES256) == FIDO_OK);
+	assert(fido_cred_set_clientdata_hash(c, cdh, sizeof(cdh)) == FIDO_OK);
+	assert(fido_cred_set_rp(c, rp_id, rp_name) == FIDO_OK);
+	assert(fido_cred_set_authdata(c, authdata, sizeof(authdata)) == FIDO_OK);
+	assert(fido_cred_set_rk(c, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_cred_set_uv(c, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_cred_set_x509(c, x509, sizeof(x509)) == FIDO_OK);
+	assert(fido_cred_set_fmt(c, "packed") == FIDO_OK);
+	assert(fido_cred_verify(c) == FIDO_ERR_INVALID_ARGUMENT);
+	assert(fido_cred_pubkey_len(c) == sizeof(pubkey));
+	assert(memcmp(fido_cred_pubkey_ptr(c), pubkey, sizeof(pubkey)) == 0);
+	assert(fido_cred_id_len(c) == sizeof(id));
+	assert(memcmp(fido_cred_id_ptr(c), id, sizeof(id)) == 0);
+	assert(fido_cred_aaguid_len(c) == sizeof(aaguid));
+	assert(memcmp(fido_cred_aaguid_ptr(c), aaguid, sizeof(aaguid)) == 0);
+	free_cred(c);
+}
+
+static void
+no_fmt(void)
+{
+	fido_cred_t *c;
+
+	c = alloc_cred();
+	assert(fido_cred_set_type(c, COSE_ES256) == FIDO_OK);
+	assert(fido_cred_set_clientdata_hash(c, cdh, sizeof(cdh)) == FIDO_OK);
+	assert(fido_cred_set_rp(c, rp_id, rp_name) == FIDO_OK);
+	assert(fido_cred_set_authdata(c, authdata, sizeof(authdata)) == FIDO_OK);
+	assert(fido_cred_set_rk(c, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_cred_set_uv(c, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_cred_set_x509(c, x509, sizeof(x509)) == FIDO_OK);
+	assert(fido_cred_set_sig(c, sig, sizeof(sig)) == FIDO_OK);
+	assert(fido_cred_verify(c) == FIDO_ERR_INVALID_ARGUMENT);
+	assert(fido_cred_pubkey_len(c) == sizeof(pubkey));
+	assert(memcmp(fido_cred_pubkey_ptr(c), pubkey, sizeof(pubkey)) == 0);
+	assert(fido_cred_id_len(c) == sizeof(id));
+	assert(memcmp(fido_cred_id_ptr(c), id, sizeof(id)) == 0);
+	assert(fido_cred_aaguid_len(c) == sizeof(aaguid));
+	assert(memcmp(fido_cred_aaguid_ptr(c), aaguid, sizeof(aaguid)) == 0);
+	free_cred(c);
+}
+
+static void
+wrong_options(void)
+{
+	fido_cred_t *c;
+
+	c = alloc_cred();
+	assert(fido_cred_set_type(c, COSE_ES256) == FIDO_OK);
+	assert(fido_cred_set_clientdata_hash(c, cdh, sizeof(cdh)) == FIDO_OK);
+	assert(fido_cred_set_rp(c, rp_id, rp_name) == FIDO_OK);
+	assert(fido_cred_set_authdata(c, authdata, sizeof(authdata)) == FIDO_OK);
+	assert(fido_cred_set_rk(c, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_cred_set_uv(c, FIDO_OPT_TRUE) == FIDO_OK);
+	assert(fido_cred_set_x509(c, x509, sizeof(x509)) == FIDO_OK);
+	assert(fido_cred_set_sig(c, sig, sizeof(sig)) == FIDO_OK);
+	assert(fido_cred_set_fmt(c, "packed") == FIDO_OK);
+	assert(fido_cred_verify(c) == FIDO_ERR_INVALID_PARAM);
+	assert(fido_cred_pubkey_len(c) == sizeof(pubkey));
+	assert(memcmp(fido_cred_pubkey_ptr(c), pubkey, sizeof(pubkey)) == 0);
+	assert(fido_cred_id_len(c) == sizeof(id));
+	assert(memcmp(fido_cred_id_ptr(c), id, sizeof(id)) == 0);
+	assert(fido_cred_aaguid_len(c) == sizeof(aaguid));
+	assert(memcmp(fido_cred_aaguid_ptr(c), aaguid, sizeof(aaguid)) == 0);
+	free_cred(c);
+}
+
+static void
+junk_cdh(void)
+{
+	fido_cred_t *c;
+	unsigned char *junk;
+
+	junk = malloc(sizeof(cdh));
+	assert(junk != NULL);
+	memcpy(junk, cdh, sizeof(cdh));
+	junk[0] = ~junk[0];
+
+	c = alloc_cred();
+	assert(fido_cred_set_type(c, COSE_ES256) == FIDO_OK);
+	assert(fido_cred_set_clientdata_hash(c, junk, sizeof(cdh)) == FIDO_OK);
+	assert(fido_cred_set_rp(c, rp_id, rp_name) == FIDO_OK);
+	assert(fido_cred_set_authdata(c, authdata, sizeof(authdata)) == FIDO_OK);
+	assert(fido_cred_set_rk(c, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_cred_set_uv(c, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_cred_set_x509(c, x509, sizeof(x509)) == FIDO_OK);
+	assert(fido_cred_set_sig(c, sig, sizeof(sig)) == FIDO_OK);
+	assert(fido_cred_set_fmt(c, "packed") == FIDO_OK);
+	assert(fido_cred_verify(c) == FIDO_ERR_INVALID_SIG);
+	assert(fido_cred_pubkey_len(c) == sizeof(pubkey));
+	assert(memcmp(fido_cred_pubkey_ptr(c), pubkey, sizeof(pubkey)) == 0);
+	assert(fido_cred_id_len(c) == sizeof(id));
+	assert(memcmp(fido_cred_id_ptr(c), id, sizeof(id)) == 0);
+	assert(fido_cred_aaguid_len(c) == sizeof(aaguid));
+	assert(memcmp(fido_cred_aaguid_ptr(c), aaguid, sizeof(aaguid)) == 0);
+	free_cred(c);
+	free(junk);
+}
+
+static void
+junk_rp_id(void)
+{
+	fido_cred_t *c;
+
+	c = alloc_cred();
+	assert(fido_cred_set_type(c, COSE_ES256) == FIDO_OK);
+	assert(fido_cred_set_clientdata_hash(c, cdh, sizeof(cdh)) == FIDO_OK);
+	assert(fido_cred_set_rp(c, "potato", rp_name) == FIDO_OK);
+	assert(fido_cred_set_authdata(c, authdata, sizeof(authdata)) == FIDO_OK);
+	assert(fido_cred_set_rk(c, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_cred_set_uv(c, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_cred_set_x509(c, x509, sizeof(x509)) == FIDO_OK);
+	assert(fido_cred_set_sig(c, sig, sizeof(sig)) == FIDO_OK);
+	assert(fido_cred_set_fmt(c, "packed") == FIDO_OK);
+	assert(fido_cred_verify(c) == FIDO_ERR_INVALID_PARAM);
+	assert(fido_cred_pubkey_len(c) == sizeof(pubkey));
+	assert(memcmp(fido_cred_pubkey_ptr(c), pubkey, sizeof(pubkey)) == 0);
+	assert(fido_cred_id_len(c) == sizeof(id));
+	assert(memcmp(fido_cred_id_ptr(c), id, sizeof(id)) == 0);
+	assert(fido_cred_aaguid_len(c) == sizeof(aaguid));
+	assert(memcmp(fido_cred_aaguid_ptr(c), aaguid, sizeof(aaguid)) == 0);
+	free_cred(c);
+}
+
+static void
+junk_rp_name(void)
+{
+	fido_cred_t *c;
+
+	c = alloc_cred();
+	assert(fido_cred_set_type(c, COSE_ES256) == FIDO_OK);
+	assert(fido_cred_set_clientdata_hash(c, cdh, sizeof(cdh)) == FIDO_OK);
+	assert(fido_cred_set_rp(c, rp_id, "potato") == FIDO_OK);
+	assert(fido_cred_set_authdata(c, authdata, sizeof(authdata)) == FIDO_OK);
+	assert(fido_cred_set_rk(c, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_cred_set_uv(c, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_cred_set_x509(c, x509, sizeof(x509)) == FIDO_OK);
+	assert(fido_cred_set_sig(c, sig, sizeof(sig)) == FIDO_OK);
+	assert(fido_cred_set_fmt(c, "packed") == FIDO_OK);
+	assert(fido_cred_verify(c) == FIDO_OK);
+	assert(fido_cred_pubkey_len(c) == sizeof(pubkey));
+	assert(memcmp(fido_cred_pubkey_ptr(c), pubkey, sizeof(pubkey)) == 0);
+	assert(fido_cred_id_len(c) == sizeof(id));
+	assert(memcmp(fido_cred_id_ptr(c), id, sizeof(id)) == 0);
+	assert(fido_cred_aaguid_len(c) == sizeof(aaguid));
+	assert(memcmp(fido_cred_aaguid_ptr(c), aaguid, sizeof(aaguid)) == 0);
+	free_cred(c);
+}
+
+static void
+junk_authdata(void)
+{
+	fido_cred_t *c;
+	unsigned char *junk;
+	unsigned char *unset;
+
+	junk = malloc(sizeof(authdata));
+	assert(junk != NULL);
+	memcpy(junk, authdata, sizeof(authdata));
+	junk[0] = ~junk[0];
+
+	unset = calloc(1, sizeof(aaguid));
+	assert(unset != NULL);
+
+	c = alloc_cred();
+	assert(fido_cred_set_authdata(c, junk,
+	    sizeof(authdata)) == FIDO_ERR_INVALID_ARGUMENT);
+	assert(fido_cred_authdata_len(c) == 0);
+	assert(fido_cred_authdata_ptr(c) == NULL);
+	assert(fido_cred_flags(c) == 0);
+	assert(fido_cred_fmt(c) == NULL);
+	assert(fido_cred_id_len(c) == 0);
+	assert(fido_cred_id_ptr(c) == NULL);
+	assert(fido_cred_pubkey_len(c) == 0);
+	assert(fido_cred_pubkey_ptr(c) == NULL);
+	assert(fido_cred_rp_id(c) == NULL);
+	assert(fido_cred_rp_name(c) == NULL);
+	assert(fido_cred_sig_len(c) == 0);
+	assert(fido_cred_sig_ptr(c) == NULL);
+	assert(fido_cred_x5c_len(c) == 0);
+	assert(fido_cred_x5c_ptr(c) == NULL);
+	assert(fido_cred_aaguid_len(c) == sizeof(aaguid));
+	assert(memcmp(fido_cred_aaguid_ptr(c), unset, sizeof(aaguid)) == 0);
+	assert(fido_cred_verify(c) == FIDO_ERR_INVALID_ARGUMENT);
+	free_cred(c);
+	free(junk);
+	free(unset);
+}
+
+static void
+junk_sig(void)
+{
+	fido_cred_t *c;
+	unsigned char *junk;
+
+	junk = malloc(sizeof(sig));
+	assert(junk != NULL);
+	memcpy(junk, sig, sizeof(sig));
+	junk[0] = ~junk[0];
+
+	c = alloc_cred();
+	assert(fido_cred_set_type(c, COSE_ES256) == FIDO_OK);
+	assert(fido_cred_set_clientdata_hash(c, cdh, sizeof(cdh)) == FIDO_OK);
+	assert(fido_cred_set_rp(c, rp_id, rp_name) == FIDO_OK);
+	assert(fido_cred_set_authdata(c, authdata, sizeof(authdata)) == FIDO_OK);
+	assert(fido_cred_set_rk(c, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_cred_set_uv(c, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_cred_set_x509(c, x509, sizeof(x509)) == FIDO_OK);
+	assert(fido_cred_set_sig(c, junk, sizeof(sig)) == FIDO_OK);
+	assert(fido_cred_set_fmt(c, "packed") == FIDO_OK);
+	assert(fido_cred_verify(c) == FIDO_ERR_INVALID_SIG);
+	assert(fido_cred_pubkey_len(c) == sizeof(pubkey));
+	assert(memcmp(fido_cred_pubkey_ptr(c), pubkey, sizeof(pubkey)) == 0);
+	assert(fido_cred_id_len(c) == sizeof(id));
+	assert(memcmp(fido_cred_id_ptr(c), id, sizeof(id)) == 0);
+	assert(fido_cred_aaguid_len(c) == sizeof(aaguid));
+	assert(memcmp(fido_cred_aaguid_ptr(c), aaguid, sizeof(aaguid)) == 0);
+	free_cred(c);
+	free(junk);
+}
+
+static void
+junk_x509(void)
+{
+	fido_cred_t *c;
+	unsigned char *junk;
+
+	junk = malloc(sizeof(x509));
+	assert(junk != NULL);
+	memcpy(junk, x509, sizeof(x509));
+	junk[0] = ~junk[0];
+
+	c = alloc_cred();
+	assert(fido_cred_set_type(c, COSE_ES256) == FIDO_OK);
+	assert(fido_cred_set_clientdata_hash(c, cdh, sizeof(cdh)) == FIDO_OK);
+	assert(fido_cred_set_rp(c, rp_id, rp_name) == FIDO_OK);
+	assert(fido_cred_set_authdata(c, authdata, sizeof(authdata)) == FIDO_OK);
+	assert(fido_cred_set_rk(c, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_cred_set_uv(c, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_cred_set_x509(c, junk, sizeof(x509)) == FIDO_OK);
+	assert(fido_cred_set_sig(c, sig, sizeof(sig)) == FIDO_OK);
+	assert(fido_cred_set_fmt(c, "packed") == FIDO_OK);
+	assert(fido_cred_verify(c) == FIDO_ERR_INVALID_SIG);
+	assert(fido_cred_pubkey_len(c) == sizeof(pubkey));
+	assert(memcmp(fido_cred_pubkey_ptr(c), pubkey, sizeof(pubkey)) == 0);
+	assert(fido_cred_id_len(c) == sizeof(id));
+	assert(memcmp(fido_cred_id_ptr(c), id, sizeof(id)) == 0);
+	assert(fido_cred_aaguid_len(c) == sizeof(aaguid));
+	assert(memcmp(fido_cred_aaguid_ptr(c), aaguid, sizeof(aaguid)) == 0);
+	free_cred(c);
+	free(junk);
+}
+
+/* github issue #6 */
+static void
+invalid_type(void)
+{
+	fido_cred_t *c;
+	unsigned char *unset;
+
+	unset = calloc(1, sizeof(aaguid));
+	assert(unset != NULL);
+
+	c = alloc_cred();
+	assert(fido_cred_set_type(c, COSE_RS256) == FIDO_OK);
+	assert(fido_cred_set_clientdata_hash(c, cdh, sizeof(cdh)) == FIDO_OK);
+	assert(fido_cred_set_rp(c, rp_id, rp_name) == FIDO_OK);
+	assert(fido_cred_set_authdata(c, authdata, sizeof(authdata)) == FIDO_ERR_INVALID_ARGUMENT);
+	assert(fido_cred_set_rk(c, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_cred_set_uv(c, FIDO_OPT_FALSE) == FIDO_OK);
+	assert(fido_cred_set_x509(c, x509, sizeof(x509)) == FIDO_OK);
+	assert(fido_cred_set_sig(c, sig, sizeof(sig)) == FIDO_OK);
+	assert(fido_cred_set_fmt(c, "packed") == FIDO_OK);
+	assert(fido_cred_verify(c) == FIDO_ERR_INVALID_ARGUMENT);
+	assert(fido_cred_pubkey_len(c) == 0);
+	assert(fido_cred_pubkey_ptr(c) == NULL);
+	assert(fido_cred_id_len(c) == 0);
+	assert(fido_cred_id_ptr(c) == NULL);
+	assert(fido_cred_aaguid_len(c) == sizeof(aaguid));
+	assert(memcmp(fido_cred_aaguid_ptr(c), unset, sizeof(aaguid)) == 0);
+	free_cred(c);
+	free(unset);
+}
+
+/* cbor_serialize_alloc misuse */
+static void
+bad_cbor_serialize(void)
+{
+	fido_cred_t *c;
+
+	c = alloc_cred();
+	assert(fido_cred_set_type(c, COSE_ES256) == FIDO_OK);
+	assert(fido_cred_set_authdata(c, authdata, sizeof(authdata)) == FIDO_OK);
+	assert(fido_cred_authdata_len(c) == sizeof(authdata));
+	free_cred(c);
+}
+
+static void
+duplicate_keys(void)
+{
+	fido_cred_t *c;
+
+	c = alloc_cred();
+	assert(fido_cred_set_type(c, COSE_ES256) == FIDO_OK);
+	assert(fido_cred_set_authdata(c, authdata_dupkeys,
+	    sizeof(authdata_dupkeys)) == FIDO_ERR_INVALID_ARGUMENT);
+	free_cred(c);
+}
+
+static void
+unsorted_keys(void)
+{
+	fido_cred_t *c;
+
+	c = alloc_cred();
+	assert(fido_cred_set_type(c, COSE_ES256) == FIDO_OK);
+	assert(fido_cred_set_authdata(c, authdata_unsorted_keys,
+	    sizeof(authdata_unsorted_keys)) == FIDO_ERR_INVALID_ARGUMENT);
+	free_cred(c);
+}
+
+static void
+wrong_credprot(void)
+{
+	fido_cred_t *c;
+
+	c = alloc_cred();
+	assert(fido_cred_set_type(c, COSE_ES256) == FIDO_OK);
+	assert(fido_cred_set_clientdata_hash(c, cdh, sizeof(cdh)) == FIDO_OK);
+	assert(fido_cred_set_rp(c, rp_id, rp_name) == FIDO_OK);
+	assert(fido_cred_set_x509(c, x509, sizeof(x509)) == FIDO_OK);
+	assert(fido_cred_set_sig(c, sig, sizeof(sig)) == FIDO_OK);
+	assert(fido_cred_set_fmt(c, "packed") == FIDO_OK);
+	assert(fido_cred_set_prot(c, FIDO_CRED_PROT_UV_OPTIONAL_WITH_ID) == FIDO_OK);
+	assert(fido_cred_set_authdata(c, authdata, sizeof(authdata)) == FIDO_OK);
+	assert(fido_cred_verify(c) == FIDO_ERR_INVALID_PARAM);
+	free_cred(c);
+}
+
+int
+main(void)
+{
+	fido_init(0);
+
+	empty_cred();
+	valid_cred();
+	no_cdh();
+	no_rp_id();
+	no_rp_name();
+	no_authdata();
+	no_x509();
+	no_sig();
+	no_fmt();
+	junk_cdh();
+	junk_rp_id();
+	junk_rp_name();
+	junk_authdata();
+	junk_x509();
+	junk_sig();
+	wrong_options();
+	invalid_type();
+	bad_cbor_serialize();
+	duplicate_keys();
+	unsorted_keys();
+	wrong_credprot();
+
+	exit(0);
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/regress/dev.c mysql-8.0-8.0.27/extra/libfido2/regress/dev.c
--- mysql-8.0-8.0.26/extra/libfido2/regress/dev.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/regress/dev.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2019 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <assert.h>
+#include <fido.h>
+#include <string.h>
+
+#define FAKE_DEV_HANDLE	((void *)0xdeadbeef)
+#define REPORT_LEN	(64 + 1)
+
+static void *
+dummy_open(const char *path)
+{
+	(void)path;
+
+	return (FAKE_DEV_HANDLE);
+}
+
+static void
+dummy_close(void *handle)
+{
+	assert(handle == FAKE_DEV_HANDLE);
+}
+
+static int
+dummy_read(void *handle, unsigned char *ptr, size_t len, int ms)
+{
+	(void)ptr;
+	(void)len;
+	(void)ms;
+
+	assert(handle == FAKE_DEV_HANDLE);
+
+	return (-1);
+}
+
+static int
+dummy_write(void *handle, const unsigned char *ptr, size_t len)
+{
+	assert(handle == FAKE_DEV_HANDLE);
+	assert(ptr != NULL);
+	assert(len == REPORT_LEN);
+
+	return ((int)len);
+}
+
+/* gh#56 */
+static void
+open_iff_ok(void)
+{
+	fido_dev_t	*dev = NULL;
+	fido_dev_io_t	 io;
+
+	memset(&io, 0, sizeof(io));
+
+	io.open = dummy_open;
+	io.close = dummy_close;
+	io.read = dummy_read;
+	io.write = dummy_write;
+
+	assert((dev = fido_dev_new()) != NULL);
+	assert(fido_dev_set_io_functions(dev, &io) == FIDO_OK);
+	assert(fido_dev_open(dev, "dummy") == FIDO_ERR_RX);
+	assert(fido_dev_close(dev) == FIDO_ERR_INVALID_ARGUMENT);
+
+	fido_dev_free(&dev);
+}
+
+int
+main(void)
+{
+	fido_init(0);
+
+	open_iff_ok();
+
+	exit(0);
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/aes256.c mysql-8.0-8.0.27/extra/libfido2/src/aes256.c
--- mysql-8.0-8.0.26/extra/libfido2/src/aes256.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/aes256.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <openssl/evp.h>
+#include <string.h>
+
+#include "fido.h"
+
+int
+aes256_cbc_enc(const fido_blob_t *key, const fido_blob_t *in, fido_blob_t *out)
+{
+	EVP_CIPHER_CTX	*ctx = NULL;
+	unsigned char	 iv[32];
+	int		 len;
+	int		 ok = -1;
+
+	memset(iv, 0, sizeof(iv));
+	out->ptr = NULL;
+	out->len = 0;
+
+	/* sanity check */
+	if (in->len > INT_MAX || (in->len % 16) != 0 ||
+	    (out->ptr = calloc(1, in->len)) == NULL) {
+		fido_log_debug("%s: in->len=%zu", __func__, in->len);
+		goto fail;
+	}
+
+	if ((ctx = EVP_CIPHER_CTX_new()) == NULL || key->len != 32 ||
+	    !EVP_EncryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, key->ptr, iv) ||
+	    !EVP_CIPHER_CTX_set_padding(ctx, 0) ||
+	    !EVP_EncryptUpdate(ctx, out->ptr, &len, in->ptr, (int)in->len) ||
+	    len < 0 || (size_t)len != in->len) {
+		fido_log_debug("%s: EVP_Encrypt", __func__);
+		goto fail;
+	}
+
+	out->len = (size_t)len;
+
+	ok = 0;
+fail:
+	if (ctx != NULL)
+		EVP_CIPHER_CTX_free(ctx);
+
+	if (ok < 0) {
+		free(out->ptr);
+		out->ptr = NULL;
+		out->len = 0;
+	}
+
+	return (ok);
+}
+
+int
+aes256_cbc_dec(const fido_blob_t *key, const fido_blob_t *in, fido_blob_t *out)
+{
+	EVP_CIPHER_CTX	*ctx = NULL;
+	unsigned char	 iv[32];
+	int		 len;
+	int		 ok = -1;
+
+	memset(iv, 0, sizeof(iv));
+	out->ptr = NULL;
+	out->len = 0;
+
+	/* sanity check */
+	if (in->len > INT_MAX || (in->len % 16) != 0 ||
+	    (out->ptr = calloc(1, in->len)) == NULL) {
+		fido_log_debug("%s: in->len=%zu", __func__, in->len);
+		goto fail;
+	}
+
+	if ((ctx = EVP_CIPHER_CTX_new()) == NULL || key->len != 32 ||
+	    !EVP_DecryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, key->ptr, iv) ||
+	    !EVP_CIPHER_CTX_set_padding(ctx, 0) ||
+	    !EVP_DecryptUpdate(ctx, out->ptr, &len, in->ptr, (int)in->len) ||
+	    len < 0 || (size_t)len > in->len + 32) {
+		fido_log_debug("%s: EVP_Decrypt", __func__);
+		goto fail;
+	}
+
+	out->len = (size_t)len;
+
+	ok = 0;
+fail:
+	if (ctx != NULL)
+		EVP_CIPHER_CTX_free(ctx);
+
+	if (ok < 0) {
+		free(out->ptr);
+		out->ptr = NULL;
+		out->len = 0;
+	}
+
+	return (ok);
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/assert.c mysql-8.0-8.0.27/extra/libfido2/src/assert.c
--- mysql-8.0-8.0.26/extra/libfido2/src/assert.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/assert.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,1089 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <openssl/ec.h>
+#include <openssl/ecdsa.h>
+#include <openssl/evp.h>
+#include <openssl/sha.h>
+
+#include <string.h>
+#include "fido.h"
+#include "fido/es256.h"
+#include "fido/rs256.h"
+#include "fido/eddsa.h"
+
+static int
+adjust_assert_count(const cbor_item_t *key, const cbor_item_t *val, void *arg)
+{
+	fido_assert_t	*assert = arg;
+	uint64_t	 n;
+
+	/* numberOfCredentials; see section 6.2 */
+	if (cbor_isa_uint(key) == false ||
+	    cbor_int_get_width(key) != CBOR_INT_8 ||
+	    cbor_get_uint8(key) != 5) {
+		fido_log_debug("%s: cbor_type", __func__);
+		return (0); /* ignore */
+	}
+
+	if (cbor_decode_uint64(val, &n) < 0 || n > SIZE_MAX) {
+		fido_log_debug("%s: cbor_decode_uint64", __func__);
+		return (-1);
+	}
+
+	if (assert->stmt_len != 0 || assert->stmt_cnt != 1 ||
+	    (size_t)n < assert->stmt_cnt) {
+		fido_log_debug("%s: stmt_len=%zu, stmt_cnt=%zu, n=%zu",
+		    __func__, assert->stmt_len, assert->stmt_cnt, (size_t)n);
+		return (-1);
+	}
+
+	if (fido_assert_set_count(assert, (size_t)n) != FIDO_OK) {
+		fido_log_debug("%s: fido_assert_set_count", __func__);
+		return (-1);
+	}
+
+	assert->stmt_len = 0; /* XXX */
+
+	return (0);
+}
+
+static int
+parse_assert_reply(const cbor_item_t *key, const cbor_item_t *val, void *arg)
+{
+	fido_assert_stmt *stmt = arg;
+
+	if (cbor_isa_uint(key) == false ||
+	    cbor_int_get_width(key) != CBOR_INT_8) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (0); /* ignore */
+	}
+
+	switch (cbor_get_uint8(key)) {
+	case 1: /* credential id */
+		return (cbor_decode_cred_id(val, &stmt->id));
+	case 2: /* authdata */
+		return (cbor_decode_assert_authdata(val, &stmt->authdata_cbor,
+		    &stmt->authdata, &stmt->authdata_ext,
+		    &stmt->hmac_secret_enc));
+	case 3: /* signature */
+		return (fido_blob_decode(val, &stmt->sig));
+	case 4: /* user attributes */
+		return (cbor_decode_user(val, &stmt->user));
+	default: /* ignore */
+		fido_log_debug("%s: cbor type", __func__);
+		return (0);
+	}
+}
+
+static int
+fido_dev_get_assert_tx(fido_dev_t *dev, fido_assert_t *assert,
+    const es256_pk_t *pk, const fido_blob_t *ecdh, const char *pin)
+{
+	fido_blob_t	 f;
+	cbor_item_t	*argv[7];
+	int		 r;
+
+	memset(argv, 0, sizeof(argv));
+	memset(&f, 0, sizeof(f));
+
+	/* do we have everything we need? */
+	if (assert->rp_id == NULL || assert->cdh.ptr == NULL) {
+		fido_log_debug("%s: rp_id=%p, cdh.ptr=%p", __func__,
+		    (void *)assert->rp_id, (void *)assert->cdh.ptr);
+		r = FIDO_ERR_INVALID_ARGUMENT;
+		goto fail;
+	}
+
+	if ((argv[0] = cbor_build_string(assert->rp_id)) == NULL ||
+	    (argv[1] = fido_blob_encode(&assert->cdh)) == NULL) {
+		fido_log_debug("%s: cbor encode", __func__);
+		r = FIDO_ERR_INTERNAL;
+		goto fail;
+	}
+
+	/* allowed credentials */
+	if (assert->allow_list.len) {
+		const fido_blob_array_t *cl = &assert->allow_list;
+		if ((argv[2] = cbor_encode_pubkey_list(cl)) == NULL) {
+			fido_log_debug("%s: cbor_encode_pubkey_list", __func__);
+			r = FIDO_ERR_INTERNAL;
+			goto fail;
+		}
+	}
+
+	/* hmac-secret extension */
+	if (assert->ext & FIDO_EXT_HMAC_SECRET)
+		if ((argv[3] = cbor_encode_hmac_secret_param(ecdh, pk,
+		    &assert->hmac_salt)) == NULL) {
+			fido_log_debug("%s: cbor_encode_hmac_secret_param",
+			    __func__);
+			r = FIDO_ERR_INTERNAL;
+			goto fail;
+		}
+
+	/* options */
+	if (assert->up != FIDO_OPT_OMIT || assert->uv != FIDO_OPT_OMIT)
+		if ((argv[4] = cbor_encode_assert_options(assert->up,
+		    assert->uv)) == NULL) {
+			fido_log_debug("%s: cbor_encode_assert_options",
+			    __func__);
+			r = FIDO_ERR_INTERNAL;
+			goto fail;
+		}
+
+	/* pin authentication */
+	if (pin) {
+		if (pk == NULL || ecdh == NULL) {
+			fido_log_debug("%s: pin=%p, pk=%p, ecdh=%p", __func__,
+			    (const void *)pin, (const void *)pk,
+			    (const void *)ecdh);
+			r = FIDO_ERR_INVALID_ARGUMENT;
+			goto fail;
+		}
+		if ((r = cbor_add_pin_params(dev, &assert->cdh, pk, ecdh, pin,
+		    &argv[5], &argv[6])) != FIDO_OK) {
+			fido_log_debug("%s: cbor_add_pin_params", __func__);
+			goto fail;
+		}
+	}
+
+	/* frame and transmit */
+	if (cbor_build_frame(CTAP_CBOR_ASSERT, argv, nitems(argv), &f) < 0 ||
+	    fido_tx(dev, CTAP_CMD_CBOR, f.ptr, f.len) < 0) {
+		fido_log_debug("%s: fido_tx", __func__);
+		r = FIDO_ERR_TX;
+		goto fail;
+	}
+
+	r = FIDO_OK;
+fail:
+	cbor_vector_free(argv, nitems(argv));
+	free(f.ptr);
+
+	return (r);
+}
+
+static int
+fido_dev_get_assert_rx(fido_dev_t *dev, fido_assert_t *assert, int ms)
+{
+	unsigned char	reply[FIDO_MAXMSG];
+	int		reply_len;
+	int		r;
+
+	fido_assert_reset_rx(assert);
+
+	if ((reply_len = fido_rx(dev, CTAP_CMD_CBOR, &reply, sizeof(reply),
+	    ms)) < 0) {
+		fido_log_debug("%s: fido_rx", __func__);
+		return (FIDO_ERR_RX);
+	}
+
+	/* start with room for a single assertion */
+	if ((assert->stmt = calloc(1, sizeof(fido_assert_stmt))) == NULL)
+		return (FIDO_ERR_INTERNAL);
+
+	assert->stmt_len = 0;
+	assert->stmt_cnt = 1;
+
+	/* adjust as needed */
+	if ((r = cbor_parse_reply(reply, (size_t)reply_len, assert,
+	    adjust_assert_count)) != FIDO_OK) {
+		fido_log_debug("%s: adjust_assert_count", __func__);
+		return (r);
+	}
+
+	/* parse the first assertion */
+	if ((r = cbor_parse_reply(reply, (size_t)reply_len,
+	    &assert->stmt[assert->stmt_len], parse_assert_reply)) != FIDO_OK) {
+		fido_log_debug("%s: parse_assert_reply", __func__);
+		return (r);
+	}
+
+	assert->stmt_len++;
+
+	return (FIDO_OK);
+}
+
+static int
+fido_get_next_assert_tx(fido_dev_t *dev)
+{
+	const unsigned char cbor[] = { CTAP_CBOR_NEXT_ASSERT };
+
+	if (fido_tx(dev, CTAP_CMD_CBOR, cbor, sizeof(cbor)) < 0) {
+		fido_log_debug("%s: fido_tx", __func__);
+		return (FIDO_ERR_TX);
+	}
+
+	return (FIDO_OK);
+}
+
+static int
+fido_get_next_assert_rx(fido_dev_t *dev, fido_assert_t *assert, int ms)
+{
+	unsigned char	reply[FIDO_MAXMSG];
+	int		reply_len;
+	int		r;
+
+	if ((reply_len = fido_rx(dev, CTAP_CMD_CBOR, &reply, sizeof(reply),
+	    ms)) < 0) {
+		fido_log_debug("%s: fido_rx", __func__);
+		return (FIDO_ERR_RX);
+	}
+
+	/* sanity check */
+	if (assert->stmt_len >= assert->stmt_cnt) {
+		fido_log_debug("%s: stmt_len=%zu, stmt_cnt=%zu", __func__,
+		    assert->stmt_len, assert->stmt_cnt);
+		return (FIDO_ERR_INTERNAL);
+	}
+
+	if ((r = cbor_parse_reply(reply, (size_t)reply_len,
+	    &assert->stmt[assert->stmt_len], parse_assert_reply)) != FIDO_OK) {
+		fido_log_debug("%s: parse_assert_reply", __func__);
+		return (r);
+	}
+
+	return (FIDO_OK);
+}
+
+static int
+fido_dev_get_assert_wait(fido_dev_t *dev, fido_assert_t *assert,
+    const es256_pk_t *pk, const fido_blob_t *ecdh, const char *pin, int ms)
+{
+	int r;
+
+	if ((r = fido_dev_get_assert_tx(dev, assert, pk, ecdh, pin)) != FIDO_OK ||
+	    (r = fido_dev_get_assert_rx(dev, assert, ms)) != FIDO_OK)
+		return (r);
+
+	while (assert->stmt_len < assert->stmt_cnt) {
+		if ((r = fido_get_next_assert_tx(dev)) != FIDO_OK ||
+		    (r = fido_get_next_assert_rx(dev, assert, ms)) != FIDO_OK)
+			return (r);
+		assert->stmt_len++;
+	}
+
+	return (FIDO_OK);
+}
+
+static int
+decrypt_hmac_secrets(fido_assert_t *assert, const fido_blob_t *key)
+{
+	for (size_t i = 0; i < assert->stmt_cnt; i++) {
+		fido_assert_stmt *stmt = &assert->stmt[i];
+		if (stmt->hmac_secret_enc.ptr != NULL) {
+			if (aes256_cbc_dec(key, &stmt->hmac_secret_enc,
+			    &stmt->hmac_secret) < 0) {
+				fido_log_debug("%s: aes256_cbc_dec %zu",
+				    __func__, i);
+				return (-1);
+			}
+		}
+	}
+
+	return (0);
+}
+
+int
+fido_dev_get_assert(fido_dev_t *dev, fido_assert_t *assert, const char *pin)
+{
+	fido_blob_t	*ecdh = NULL;
+	es256_pk_t	*pk = NULL;
+	int		 r;
+
+	if (assert->rp_id == NULL || assert->cdh.ptr == NULL) {
+		fido_log_debug("%s: rp_id=%p, cdh.ptr=%p", __func__,
+		    (void *)assert->rp_id, (void *)assert->cdh.ptr);
+		return (FIDO_ERR_INVALID_ARGUMENT);
+	}
+
+	if (fido_dev_is_fido2(dev) == false) {
+		if (pin != NULL || assert->ext != 0)
+			return (FIDO_ERR_UNSUPPORTED_OPTION);
+		return (u2f_authenticate(dev, assert, -1));
+	}
+
+	if (pin != NULL || assert->ext != 0) {
+		if ((r = fido_do_ecdh(dev, &pk, &ecdh)) != FIDO_OK) {
+			fido_log_debug("%s: fido_do_ecdh", __func__);
+			goto fail;
+		}
+	}
+
+	r = fido_dev_get_assert_wait(dev, assert, pk, ecdh, pin, -1);
+	if (r == FIDO_OK && assert->ext & FIDO_EXT_HMAC_SECRET)
+		if (decrypt_hmac_secrets(assert, ecdh) < 0) {
+			fido_log_debug("%s: decrypt_hmac_secrets", __func__);
+			r = FIDO_ERR_INTERNAL;
+			goto fail;
+		}
+
+fail:
+	es256_pk_free(&pk);
+	fido_blob_free(&ecdh);
+
+	return (r);
+}
+
+int
+fido_check_flags(uint8_t flags, fido_opt_t up, fido_opt_t uv)
+{
+	fido_log_debug("%s: flags=%02x", __func__, flags);
+	fido_log_debug("%s: up=%d, uv=%d", __func__, up, uv);
+
+	if (up == FIDO_OPT_TRUE &&
+	    (flags & CTAP_AUTHDATA_USER_PRESENT) == 0) {
+		fido_log_debug("%s: CTAP_AUTHDATA_USER_PRESENT", __func__);
+		return (-1); /* user not present */
+	}
+
+	if (uv == FIDO_OPT_TRUE &&
+	    (flags & CTAP_AUTHDATA_USER_VERIFIED) == 0) {
+		fido_log_debug("%s: CTAP_AUTHDATA_USER_VERIFIED", __func__);
+		return (-1); /* user not verified */
+	}
+
+	return (0);
+}
+
+static int
+check_extensions(int authdata_ext, int ext)
+{
+	if (authdata_ext != ext) {
+		fido_log_debug("%s: authdata_ext=0x%x != ext=0x%x", __func__,
+		    authdata_ext, ext);
+		return (-1);
+	}
+
+	return (0);
+}
+
+int
+fido_get_signed_hash(int cose_alg, fido_blob_t *dgst, const fido_blob_t *clientdata,
+    const fido_blob_t *authdata_cbor)
+{
+	cbor_item_t		*item = NULL;
+	unsigned char		*authdata_ptr = NULL;
+	size_t			 authdata_len;
+	struct cbor_load_result	 cbor;
+	SHA256_CTX		 ctx;
+	int			 ok = -1;
+
+	if ((item = cbor_load(authdata_cbor->ptr, authdata_cbor->len,
+	    &cbor)) == NULL || cbor_isa_bytestring(item) == false ||
+	    cbor_bytestring_is_definite(item) == false) {
+		fido_log_debug("%s: authdata", __func__);
+		goto fail;
+	}
+
+	authdata_ptr = cbor_bytestring_handle(item);
+	authdata_len = cbor_bytestring_length(item);
+
+	if (cose_alg != COSE_EDDSA) {
+		if (dgst->len < SHA256_DIGEST_LENGTH || SHA256_Init(&ctx) == 0 ||
+		    SHA256_Update(&ctx, authdata_ptr, authdata_len) == 0 ||
+		    SHA256_Update(&ctx, clientdata->ptr, clientdata->len) == 0 ||
+		    SHA256_Final(dgst->ptr, &ctx) == 0) {
+			fido_log_debug("%s: sha256", __func__);
+			goto fail;
+		}
+		dgst->len = SHA256_DIGEST_LENGTH;
+	} else {
+		if (SIZE_MAX - authdata_len < clientdata->len ||
+		    dgst->len < authdata_len + clientdata->len) {
+			fido_log_debug("%s: memcpy", __func__);
+			goto fail;
+		}
+		memcpy(dgst->ptr, authdata_ptr, authdata_len);
+		memcpy(dgst->ptr + authdata_len, clientdata->ptr,
+		    clientdata->len);
+		dgst->len = authdata_len + clientdata->len;
+	}
+
+	ok = 0;
+fail:
+	if (item != NULL)
+		cbor_decref(&item);
+
+	return (ok);
+}
+
+int
+fido_verify_sig_es256(const fido_blob_t *dgst, const es256_pk_t *pk,
+    const fido_blob_t *sig)
+{
+	EVP_PKEY	*pkey = NULL;
+	EC_KEY		*ec = NULL;
+	int		 ok = -1;
+
+	/* ECDSA_verify needs ints */
+	if (dgst->len > INT_MAX || sig->len > INT_MAX) {
+		fido_log_debug("%s: dgst->len=%zu, sig->len=%zu", __func__,
+		    dgst->len, sig->len);
+		return (-1);
+	}
+
+	if ((pkey = es256_pk_to_EVP_PKEY(pk)) == NULL ||
+	    (ec = EVP_PKEY_get0_EC_KEY(pkey)) == NULL) {
+		fido_log_debug("%s: pk -> ec", __func__);
+		goto fail;
+	}
+
+	if (ECDSA_verify(0, dgst->ptr, (int)dgst->len, sig->ptr,
+	    (int)sig->len, ec) != 1) {
+		fido_log_debug("%s: ECDSA_verify", __func__);
+		goto fail;
+	}
+
+	ok = 0;
+fail:
+	if (pkey != NULL)
+		EVP_PKEY_free(pkey);
+
+	return (ok);
+}
+
+int
+fido_verify_sig_rs256(const fido_blob_t *dgst, const rs256_pk_t *pk,
+    const fido_blob_t *sig)
+{
+	EVP_PKEY	*pkey = NULL;
+	RSA		*rsa = NULL;
+	int		 ok = -1;
+
+	/* RSA_verify needs unsigned ints */
+	if (dgst->len > UINT_MAX || sig->len > UINT_MAX) {
+		fido_log_debug("%s: dgst->len=%zu, sig->len=%zu", __func__,
+		    dgst->len, sig->len);
+		return (-1);
+	}
+
+	if ((pkey = rs256_pk_to_EVP_PKEY(pk)) == NULL ||
+	    (rsa = EVP_PKEY_get0_RSA(pkey)) == NULL) {
+		fido_log_debug("%s: pk -> ec", __func__);
+		goto fail;
+	}
+
+	if (RSA_verify(NID_sha256, dgst->ptr, (unsigned int)dgst->len, sig->ptr,
+	    (unsigned int)sig->len, rsa) != 1) {
+		fido_log_debug("%s: RSA_verify", __func__);
+		goto fail;
+	}
+
+	ok = 0;
+fail:
+	if (pkey != NULL)
+		EVP_PKEY_free(pkey);
+
+	return (ok);
+}
+
+int
+fido_verify_sig_eddsa(const fido_blob_t *dgst, const eddsa_pk_t *pk,
+    const fido_blob_t *sig)
+{
+	EVP_PKEY	*pkey = NULL;
+	EVP_MD_CTX	*mdctx = NULL;
+	int		 ok = -1;
+
+	/* EVP_DigestVerify needs ints */
+	if (dgst->len > INT_MAX || sig->len > INT_MAX) {
+		fido_log_debug("%s: dgst->len=%zu, sig->len=%zu", __func__,
+		    dgst->len, sig->len);
+		return (-1);
+	}
+
+	if ((pkey = eddsa_pk_to_EVP_PKEY(pk)) == NULL) {
+		fido_log_debug("%s: pk -> pkey", __func__);
+		goto fail;
+	}
+
+	if ((mdctx = EVP_MD_CTX_new()) == NULL) {
+		fido_log_debug("%s: EVP_MD_CTX_new", __func__);
+		goto fail;
+	}
+
+	if (EVP_DigestVerifyInit(mdctx, NULL, NULL, NULL, pkey) != 1) {
+		fido_log_debug("%s: EVP_DigestVerifyInit", __func__);
+		goto fail;
+	}
+
+	if (EVP_DigestVerify(mdctx, sig->ptr, sig->len, dgst->ptr,
+	    dgst->len) != 1) {
+		fido_log_debug("%s: EVP_DigestVerify", __func__);
+		goto fail;
+	}
+
+	ok = 0;
+fail:
+	if (mdctx != NULL)
+		EVP_MD_CTX_free(mdctx);
+
+	if (pkey != NULL)
+		EVP_PKEY_free(pkey);
+
+	return (ok);
+}
+
+int
+fido_assert_verify(const fido_assert_t *assert, size_t idx, int cose_alg,
+    const void *pk)
+{
+	unsigned char		 buf[1024]; /* XXX */
+	fido_blob_t		 dgst;
+	const fido_assert_stmt	*stmt = NULL;
+	int			 ok = -1;
+	int			 r;
+
+	dgst.ptr = buf;
+	dgst.len = sizeof(buf);
+
+	if (idx >= assert->stmt_len || pk == NULL) {
+		r = FIDO_ERR_INVALID_ARGUMENT;
+		goto out;
+	}
+
+	stmt = &assert->stmt[idx];
+
+	/* do we have everything we need? */
+	if (assert->cdh.ptr == NULL || assert->rp_id == NULL ||
+	    stmt->authdata_cbor.ptr == NULL || stmt->sig.ptr == NULL) {
+		fido_log_debug("%s: cdh=%p, rp_id=%s, authdata=%p, sig=%p",
+		    __func__, (void *)assert->cdh.ptr, assert->rp_id,
+		    (void *)stmt->authdata_cbor.ptr, (void *)stmt->sig.ptr);
+		r = FIDO_ERR_INVALID_ARGUMENT;
+		goto out;
+	}
+
+	if (fido_check_flags(stmt->authdata.flags, assert->up,
+	    assert->uv) < 0) {
+		fido_log_debug("%s: fido_check_flags", __func__);
+		r = FIDO_ERR_INVALID_PARAM;
+		goto out;
+	}
+
+	if (check_extensions(stmt->authdata_ext, assert->ext) < 0) {
+		fido_log_debug("%s: check_extensions", __func__);
+		r = FIDO_ERR_INVALID_PARAM;
+		goto out;
+	}
+
+	if (fido_check_rp_id(assert->rp_id, stmt->authdata.rp_id_hash) != 0) {
+		fido_log_debug("%s: fido_check_rp_id", __func__);
+		r = FIDO_ERR_INVALID_PARAM;
+		goto out;
+	}
+
+	if (fido_get_signed_hash(cose_alg, &dgst, &assert->cdh,
+	    &stmt->authdata_cbor) < 0) {
+		fido_log_debug("%s: fido_get_signed_hash", __func__);
+		r = FIDO_ERR_INTERNAL;
+		goto out;
+	}
+
+	switch (cose_alg) {
+	case COSE_ES256:
+		ok = fido_verify_sig_es256(&dgst, pk, &stmt->sig);
+		break;
+	case COSE_RS256:
+		ok = fido_verify_sig_rs256(&dgst, pk, &stmt->sig);
+		break;
+	case COSE_EDDSA:
+		ok = fido_verify_sig_eddsa(&dgst, pk, &stmt->sig);
+		break;
+	default:
+		fido_log_debug("%s: unsupported cose_alg %d", __func__,
+		    cose_alg);
+		r = FIDO_ERR_UNSUPPORTED_OPTION;
+		goto out;
+	}
+
+	if (ok < 0)
+		r = FIDO_ERR_INVALID_SIG;
+	else
+		r = FIDO_OK;
+out:
+	explicit_bzero(buf, sizeof(buf));
+
+	return (r);
+}
+
+int
+fido_assert_set_clientdata_hash(fido_assert_t *assert,
+    const unsigned char *hash, size_t hash_len)
+{
+	if (fido_blob_set(&assert->cdh, hash, hash_len) < 0)
+		return (FIDO_ERR_INVALID_ARGUMENT);
+
+	return (FIDO_OK);
+}
+
+int
+fido_assert_set_hmac_salt(fido_assert_t *assert, const unsigned char *salt,
+    size_t salt_len)
+{
+	if ((salt_len != 32 && salt_len != 64) ||
+	    fido_blob_set(&assert->hmac_salt, salt, salt_len) < 0)
+		return (FIDO_ERR_INVALID_ARGUMENT);
+
+	return (FIDO_OK);
+}
+
+int
+fido_assert_set_rp(fido_assert_t *assert, const char *id)
+{
+	if (assert->rp_id != NULL) {
+		free(assert->rp_id);
+		assert->rp_id = NULL;
+	}
+
+	if (id == NULL)
+		return (FIDO_ERR_INVALID_ARGUMENT);
+
+	if ((assert->rp_id = strdup(id)) == NULL)
+		return (FIDO_ERR_INTERNAL);
+
+	return (FIDO_OK);
+}
+
+int
+fido_assert_allow_cred(fido_assert_t *assert, const unsigned char *ptr,
+    size_t len)
+{
+	fido_blob_t	 id;
+	fido_blob_t	*list_ptr;
+	int		 r;
+
+	memset(&id, 0, sizeof(id));
+
+	if (assert->allow_list.len == SIZE_MAX) {
+		r = FIDO_ERR_INVALID_ARGUMENT;
+		goto fail;
+	}
+
+	if (fido_blob_set(&id, ptr, len) < 0 || (list_ptr =
+	    recallocarray(assert->allow_list.ptr, assert->allow_list.len,
+	    assert->allow_list.len + 1, sizeof(fido_blob_t))) == NULL) {
+		r = FIDO_ERR_INVALID_ARGUMENT;
+		goto fail;
+	}
+
+	list_ptr[assert->allow_list.len++] = id;
+	assert->allow_list.ptr = list_ptr;
+
+	return (FIDO_OK);
+fail:
+	free(id.ptr);
+
+	return (r);
+
+}
+
+int
+fido_assert_set_extensions(fido_assert_t *assert, int ext)
+{
+	if (ext != 0 && ext != FIDO_EXT_HMAC_SECRET)
+		return (FIDO_ERR_INVALID_ARGUMENT);
+
+	assert->ext = ext;
+
+	return (FIDO_OK);
+}
+
+int
+fido_assert_set_options(fido_assert_t *assert, bool up, bool uv)
+{
+	assert->up = up ? FIDO_OPT_TRUE : FIDO_OPT_FALSE;
+	assert->uv = uv ? FIDO_OPT_TRUE : FIDO_OPT_FALSE;
+
+	return (FIDO_OK);
+}
+
+int
+fido_assert_set_up(fido_assert_t *assert, fido_opt_t up)
+{
+	assert->up = up;
+
+	return (FIDO_OK);
+}
+
+int
+fido_assert_set_uv(fido_assert_t *assert, fido_opt_t uv)
+{
+	assert->uv = uv;
+
+	return (FIDO_OK);
+}
+
+const unsigned char *
+fido_assert_clientdata_hash_ptr(const fido_assert_t *assert)
+{
+	return (assert->cdh.ptr);
+}
+
+size_t
+fido_assert_clientdata_hash_len(const fido_assert_t *assert)
+{
+	return (assert->cdh.len);
+}
+
+fido_assert_t *
+fido_assert_new(void)
+{
+	return (calloc(1, sizeof(fido_assert_t)));
+}
+
+void
+fido_assert_reset_tx(fido_assert_t *assert)
+{
+	free(assert->rp_id);
+	free(assert->cdh.ptr);
+	free(assert->hmac_salt.ptr);
+	fido_free_blob_array(&assert->allow_list);
+
+	memset(&assert->cdh, 0, sizeof(assert->cdh));
+	memset(&assert->hmac_salt, 0, sizeof(assert->hmac_salt));
+	memset(&assert->allow_list, 0, sizeof(assert->allow_list));
+
+	assert->rp_id = NULL;
+	assert->up = FIDO_OPT_OMIT;
+	assert->uv = FIDO_OPT_OMIT;
+	assert->ext = 0;
+}
+
+void
+fido_assert_reset_rx(fido_assert_t *assert)
+{
+	for (size_t i = 0; i < assert->stmt_cnt; i++) {
+		free(assert->stmt[i].user.id.ptr);
+		free(assert->stmt[i].user.icon);
+		free(assert->stmt[i].user.name);
+		free(assert->stmt[i].user.display_name);
+		free(assert->stmt[i].id.ptr);
+		if (assert->stmt[i].hmac_secret.ptr != NULL) {
+			explicit_bzero(assert->stmt[i].hmac_secret.ptr,
+			    assert->stmt[i].hmac_secret.len);
+		}
+		free(assert->stmt[i].hmac_secret.ptr);
+		free(assert->stmt[i].hmac_secret_enc.ptr);
+		free(assert->stmt[i].authdata_cbor.ptr);
+		free(assert->stmt[i].sig.ptr);
+		memset(&assert->stmt[i], 0, sizeof(assert->stmt[i]));
+	}
+
+	free(assert->stmt);
+
+	assert->stmt = NULL;
+	assert->stmt_len = 0;
+	assert->stmt_cnt = 0;
+}
+
+void
+fido_assert_free(fido_assert_t **assert_p)
+{
+	fido_assert_t *assert;
+
+	if (assert_p == NULL || (assert = *assert_p) == NULL)
+		return;
+
+	fido_assert_reset_tx(assert);
+	fido_assert_reset_rx(assert);
+
+	free(assert);
+
+	*assert_p = NULL;
+}
+
+size_t
+fido_assert_count(const fido_assert_t *assert)
+{
+	return (assert->stmt_len);
+}
+
+const char *
+fido_assert_rp_id(const fido_assert_t *assert)
+{
+	return (assert->rp_id);
+}
+
+uint8_t
+fido_assert_flags(const fido_assert_t *assert, size_t idx)
+{
+	if (idx >= assert->stmt_len)
+		return (0);
+
+	return (assert->stmt[idx].authdata.flags);
+}
+
+uint32_t
+fido_assert_sigcount(const fido_assert_t *assert, size_t idx)
+{
+	if (idx >= assert->stmt_len)
+		return (0);
+
+	return (assert->stmt[idx].authdata.sigcount);
+}
+
+const unsigned char *
+fido_assert_authdata_ptr(const fido_assert_t *assert, size_t idx)
+{
+	if (idx >= assert->stmt_len)
+		return (NULL);
+
+	return (assert->stmt[idx].authdata_cbor.ptr);
+}
+
+size_t
+fido_assert_authdata_len(const fido_assert_t *assert, size_t idx)
+{
+	if (idx >= assert->stmt_len)
+		return (0);
+
+	return (assert->stmt[idx].authdata_cbor.len);
+}
+
+const unsigned char *
+fido_assert_sig_ptr(const fido_assert_t *assert, size_t idx)
+{
+	if (idx >= assert->stmt_len)
+		return (NULL);
+
+	return (assert->stmt[idx].sig.ptr);
+}
+
+size_t
+fido_assert_sig_len(const fido_assert_t *assert, size_t idx)
+{
+	if (idx >= assert->stmt_len)
+		return (0);
+
+	return (assert->stmt[idx].sig.len);
+}
+
+const unsigned char *
+fido_assert_id_ptr(const fido_assert_t *assert, size_t idx)
+{
+	if (idx >= assert->stmt_len)
+		return (NULL);
+
+	return (assert->stmt[idx].id.ptr);
+}
+
+size_t
+fido_assert_id_len(const fido_assert_t *assert, size_t idx)
+{
+	if (idx >= assert->stmt_len)
+		return (0);
+
+	return (assert->stmt[idx].id.len);
+}
+
+const unsigned char *
+fido_assert_user_id_ptr(const fido_assert_t *assert, size_t idx)
+{
+	if (idx >= assert->stmt_len)
+		return (NULL);
+
+	return (assert->stmt[idx].user.id.ptr);
+}
+
+size_t
+fido_assert_user_id_len(const fido_assert_t *assert, size_t idx)
+{
+	if (idx >= assert->stmt_len)
+		return (0);
+
+	return (assert->stmt[idx].user.id.len);
+}
+
+const char *
+fido_assert_user_icon(const fido_assert_t *assert, size_t idx)
+{
+	if (idx >= assert->stmt_len)
+		return (NULL);
+
+	return (assert->stmt[idx].user.icon);
+}
+
+const char *
+fido_assert_user_name(const fido_assert_t *assert, size_t idx)
+{
+	if (idx >= assert->stmt_len)
+		return (NULL);
+
+	return (assert->stmt[idx].user.name);
+}
+
+const char *
+fido_assert_user_display_name(const fido_assert_t *assert, size_t idx)
+{
+	if (idx >= assert->stmt_len)
+		return (NULL);
+
+	return (assert->stmt[idx].user.display_name);
+}
+
+const unsigned char *
+fido_assert_hmac_secret_ptr(const fido_assert_t *assert, size_t idx)
+{
+	if (idx >= assert->stmt_len)
+		return (NULL);
+
+	return (assert->stmt[idx].hmac_secret.ptr);
+}
+
+size_t
+fido_assert_hmac_secret_len(const fido_assert_t *assert, size_t idx)
+{
+	if (idx >= assert->stmt_len)
+		return (0);
+
+	return (assert->stmt[idx].hmac_secret.len);
+}
+
+static void
+fido_assert_clean_authdata(fido_assert_stmt *as)
+{
+	free(as->authdata_cbor.ptr);
+	free(as->hmac_secret_enc.ptr);
+
+	memset(&as->authdata_ext, 0, sizeof(as->authdata_ext));
+	memset(&as->authdata_cbor, 0, sizeof(as->authdata_cbor));
+	memset(&as->authdata, 0, sizeof(as->authdata));
+	memset(&as->hmac_secret_enc, 0, sizeof(as->hmac_secret_enc));
+}
+
+int
+fido_assert_set_authdata(fido_assert_t *assert, size_t idx,
+    const unsigned char *ptr, size_t len)
+{
+	cbor_item_t		*item = NULL;
+	fido_assert_stmt	*stmt = NULL;
+	struct cbor_load_result	 cbor;
+	int			 r;
+
+	if (idx >= assert->stmt_len || ptr == NULL || len == 0)
+		return (FIDO_ERR_INVALID_ARGUMENT);
+
+	stmt = &assert->stmt[idx];
+	fido_assert_clean_authdata(stmt);
+
+	if ((item = cbor_load(ptr, len, &cbor)) == NULL) {
+		fido_log_debug("%s: cbor_load", __func__);
+		r = FIDO_ERR_INVALID_ARGUMENT;
+		goto fail;
+	}
+
+	if (cbor_decode_assert_authdata(item, &stmt->authdata_cbor,
+	    &stmt->authdata, &stmt->authdata_ext, &stmt->hmac_secret_enc) < 0) {
+		fido_log_debug("%s: cbor_decode_assert_authdata", __func__);
+		r = FIDO_ERR_INVALID_ARGUMENT;
+		goto fail;
+	}
+
+	r = FIDO_OK;
+fail:
+	if (item != NULL)
+		cbor_decref(&item);
+
+	if (r != FIDO_OK)
+		fido_assert_clean_authdata(stmt);
+
+	return (r);
+}
+
+int
+fido_assert_set_authdata_raw(fido_assert_t *assert, size_t idx,
+    const unsigned char *ptr, size_t len)
+{
+	cbor_item_t		*item = NULL;
+	fido_assert_stmt	*stmt = NULL;
+	int			 r;
+
+	if (idx >= assert->stmt_len || ptr == NULL || len == 0)
+		return (FIDO_ERR_INVALID_ARGUMENT);
+
+	stmt = &assert->stmt[idx];
+	fido_assert_clean_authdata(stmt);
+
+	if ((item = cbor_build_bytestring(ptr, len)) == NULL) {
+		fido_log_debug("%s: cbor_build_bytestring", __func__);
+		r = FIDO_ERR_INTERNAL;
+		goto fail;
+	}
+
+	if (cbor_decode_assert_authdata(item, &stmt->authdata_cbor,
+	    &stmt->authdata, &stmt->authdata_ext, &stmt->hmac_secret_enc) < 0) {
+		fido_log_debug("%s: cbor_decode_assert_authdata", __func__);
+		r = FIDO_ERR_INVALID_ARGUMENT;
+		goto fail;
+	}
+
+	r = FIDO_OK;
+fail:
+	if (item != NULL)
+		cbor_decref(&item);
+
+	if (r != FIDO_OK)
+		fido_assert_clean_authdata(stmt);
+
+	return (r);
+}
+
+static void
+fido_assert_clean_sig(fido_assert_stmt *as)
+{
+	free(as->sig.ptr);
+	as->sig.ptr = NULL;
+	as->sig.len = 0;
+}
+
+int
+fido_assert_set_sig(fido_assert_t *a, size_t idx, const unsigned char *ptr,
+    size_t len)
+{
+	unsigned char *sig;
+
+	if (idx >= a->stmt_len || ptr == NULL || len == 0)
+		return (FIDO_ERR_INVALID_ARGUMENT);
+
+	fido_assert_clean_sig(&a->stmt[idx]);
+
+	if ((sig = malloc(len)) == NULL)
+		return (FIDO_ERR_INTERNAL);
+
+	memcpy(sig, ptr, len);
+	a->stmt[idx].sig.ptr = sig;
+	a->stmt[idx].sig.len = len;
+
+	return (FIDO_OK);
+}
+
+/* XXX shrinking leaks memory; fortunately that shouldn't happen */
+int
+fido_assert_set_count(fido_assert_t *assert, size_t n)
+{
+	void *new_stmt;
+
+#ifdef FIDO_FUZZ
+	if (n > UINT8_MAX) {
+		fido_log_debug("%s: n > UINT8_MAX", __func__);
+		return (FIDO_ERR_INTERNAL);
+	}
+#endif
+
+	new_stmt = recallocarray(assert->stmt, assert->stmt_cnt, n,
+	    sizeof(fido_assert_stmt));
+	if (new_stmt == NULL)
+		return (FIDO_ERR_INTERNAL);
+
+	assert->stmt = new_stmt;
+	assert->stmt_cnt = n;
+	assert->stmt_len = n;
+
+	return (FIDO_OK);
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/authkey.c mysql-8.0-8.0.27/extra/libfido2/src/authkey.c
--- mysql-8.0-8.0.26/extra/libfido2/src/authkey.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/authkey.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <string.h>
+#include "fido.h"
+
+static int
+parse_authkey(const cbor_item_t *key, const cbor_item_t *val, void *arg)
+{
+	es256_pk_t *authkey = arg;
+
+	if (cbor_isa_uint(key) == false ||
+	    cbor_int_get_width(key) != CBOR_INT_8 ||
+	    cbor_get_uint8(key) != 1) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (0); /* ignore */
+	}
+
+	return (es256_pk_decode(val, authkey));
+}
+
+static int
+fido_dev_authkey_tx(fido_dev_t *dev)
+{
+	fido_blob_t	 f;
+	cbor_item_t	*argv[2];
+	int		 r;
+
+	fido_log_debug("%s: dev=%p", __func__, (void *)dev);
+
+	memset(&f, 0, sizeof(f));
+	memset(argv, 0, sizeof(argv));
+
+	/* add command parameters */
+	if ((argv[0] = cbor_build_uint8(1)) == NULL ||
+	    (argv[1] = cbor_build_uint8(2)) == NULL) {
+		fido_log_debug("%s: cbor_build", __func__);
+		r = FIDO_ERR_INTERNAL;
+		goto fail;
+	}
+
+	/* frame and transmit */
+	if (cbor_build_frame(CTAP_CBOR_CLIENT_PIN, argv, nitems(argv),
+	    &f) < 0 || fido_tx(dev, CTAP_CMD_CBOR, f.ptr, f.len) < 0) {
+		fido_log_debug("%s: fido_tx", __func__);
+		r = FIDO_ERR_TX;
+		goto fail;
+	}
+
+	r = FIDO_OK;
+fail:
+	cbor_vector_free(argv, nitems(argv));
+	free(f.ptr);
+
+	return (r);
+}
+
+static int
+fido_dev_authkey_rx(fido_dev_t *dev, es256_pk_t *authkey, int ms)
+{
+	unsigned char	reply[FIDO_MAXMSG];
+	int		reply_len;
+
+	fido_log_debug("%s: dev=%p, authkey=%p, ms=%d", __func__, (void *)dev,
+	    (void *)authkey, ms);
+
+	memset(authkey, 0, sizeof(*authkey));
+
+	if ((reply_len = fido_rx(dev, CTAP_CMD_CBOR, &reply, sizeof(reply),
+	    ms)) < 0) {
+		fido_log_debug("%s: fido_rx", __func__);
+		return (FIDO_ERR_RX);
+	}
+
+	return (cbor_parse_reply(reply, (size_t)reply_len, authkey,
+	    parse_authkey));
+}
+
+static int
+fido_dev_authkey_wait(fido_dev_t *dev, es256_pk_t *authkey, int ms)
+{
+	int r;
+
+	if ((r = fido_dev_authkey_tx(dev)) != FIDO_OK ||
+	    (r = fido_dev_authkey_rx(dev, authkey, ms)) != FIDO_OK)
+		return (r);
+
+	return (FIDO_OK);
+}
+
+int
+fido_dev_authkey(fido_dev_t *dev, es256_pk_t *authkey)
+{
+	return (fido_dev_authkey_wait(dev, authkey, -1));
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/bio.c mysql-8.0-8.0.27/extra/libfido2/src/bio.c
--- mysql-8.0-8.0.26/extra/libfido2/src/bio.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/bio.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,844 @@
+/*
+ * Copyright (c) 2019 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <string.h>
+
+#include "fido.h"
+#include "fido/bio.h"
+#include "fido/es256.h"
+
+#define CMD_ENROLL_BEGIN	0x01
+#define CMD_ENROLL_NEXT		0x02
+#define CMD_ENROLL_CANCEL	0x03
+#define CMD_ENUM		0x04
+#define CMD_SET_NAME		0x05
+#define CMD_ENROLL_REMOVE	0x06
+#define CMD_GET_INFO		0x07
+
+static int
+bio_prepare_hmac(uint8_t cmd, cbor_item_t **argv, size_t argc,
+    cbor_item_t **param, fido_blob_t *hmac_data)
+{
+	const uint8_t	 prefix[2] = { 0x01 /* modality */, cmd };
+	int		 ok = -1;
+	size_t		 cbor_alloc_len;
+	size_t		 cbor_len;
+	unsigned char	*cbor = NULL;
+
+	if (argv == NULL || param == NULL)
+		return (fido_blob_set(hmac_data, prefix, sizeof(prefix)));
+
+	if ((*param = cbor_flatten_vector(argv, argc)) == NULL) {
+		fido_log_debug("%s: cbor_flatten_vector", __func__);
+		goto fail;
+	}
+
+	if ((cbor_len = cbor_serialize_alloc(*param, &cbor,
+	    &cbor_alloc_len)) == 0 || cbor_len > SIZE_MAX - sizeof(prefix)) {
+		fido_log_debug("%s: cbor_serialize_alloc", __func__);
+		goto fail;
+	}
+
+	if ((hmac_data->ptr = malloc(cbor_len + sizeof(prefix))) == NULL) {
+		fido_log_debug("%s: malloc", __func__);
+		goto fail;
+	}
+
+	memcpy(hmac_data->ptr, prefix, sizeof(prefix));
+	memcpy(hmac_data->ptr + sizeof(prefix), cbor, cbor_len);
+	hmac_data->len = cbor_len + sizeof(prefix);
+
+	ok = 0;
+fail:
+	free(cbor);
+
+	return (ok);
+}
+
+static int
+bio_tx(fido_dev_t *dev, uint8_t cmd, cbor_item_t **sub_argv, size_t sub_argc,
+    const char *pin, const fido_blob_t *token)
+{
+	cbor_item_t	*argv[5];
+	es256_pk_t	*pk = NULL;
+	fido_blob_t	*ecdh = NULL;
+	fido_blob_t	 f;
+	fido_blob_t	 hmac;
+	int		 r = FIDO_ERR_INTERNAL;
+
+	memset(&f, 0, sizeof(f));
+	memset(&hmac, 0, sizeof(hmac));
+	memset(&argv, 0, sizeof(argv));
+
+	/* modality, subCommand */
+	if ((argv[0] = cbor_build_uint8(1)) == NULL ||
+	    (argv[1] = cbor_build_uint8(cmd)) == NULL) {
+		fido_log_debug("%s: cbor encode", __func__);
+		goto fail;
+	}
+
+	/* subParams */
+	if (pin || token) {
+		if (bio_prepare_hmac(cmd, sub_argv, sub_argc, &argv[2],
+		    &hmac) < 0) {
+			fido_log_debug("%s: bio_prepare_hmac", __func__);
+			goto fail;
+		}
+	}
+
+	/* pinProtocol, pinAuth */
+	if (pin) {
+		if ((r = fido_do_ecdh(dev, &pk, &ecdh)) != FIDO_OK) {
+			fido_log_debug("%s: fido_do_ecdh", __func__);
+			goto fail;
+		}
+		if ((r = cbor_add_pin_params(dev, &hmac, pk, ecdh, pin,
+		    &argv[4], &argv[3])) != FIDO_OK) {
+			fido_log_debug("%s: cbor_add_pin_params", __func__);
+			goto fail;
+		}
+	} else if (token) {
+		if ((argv[3] = cbor_encode_pin_opt()) == NULL ||
+		    (argv[4] = cbor_encode_pin_auth(token, &hmac)) == NULL) {
+			fido_log_debug("%s: encode pin", __func__);
+			goto fail;
+		}
+	}
+
+	/* framing and transmission */
+	if (cbor_build_frame(CTAP_CBOR_BIO_ENROLL_PRE, argv, nitems(argv),
+	    &f) < 0 || fido_tx(dev, CTAP_CMD_CBOR, f.ptr, f.len) < 0) {
+		fido_log_debug("%s: fido_tx", __func__);
+		r = FIDO_ERR_TX;
+		goto fail;
+	}
+
+	r = FIDO_OK;
+fail:
+	cbor_vector_free(argv, nitems(argv));
+	es256_pk_free(&pk);
+	fido_blob_free(&ecdh);
+	free(f.ptr);
+	free(hmac.ptr);
+
+	return (r);
+}
+
+static void
+bio_reset_template(fido_bio_template_t *t)
+{
+	free(t->name);
+	free(t->id.ptr);
+	t->name = NULL;
+	memset(&t->id, 0, sizeof(t->id));
+}
+
+static void
+bio_reset_template_array(fido_bio_template_array_t *ta)
+{
+	for (size_t i = 0; i < ta->n_alloc; i++)
+		bio_reset_template(&ta->ptr[i]);
+
+	free(ta->ptr);
+	ta->ptr = NULL;
+	memset(ta, 0, sizeof(*ta));
+}
+
+static int
+decode_template(const cbor_item_t *key, const cbor_item_t *val, void *arg)
+{
+	fido_bio_template_t *t = arg;
+
+	if (cbor_isa_uint(key) == false ||
+	    cbor_int_get_width(key) != CBOR_INT_8) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (0); /* ignore */
+	}
+
+	switch (cbor_get_uint8(key)) {
+	case 1: /* id */
+		return (fido_blob_decode(val, &t->id));
+	case 2: /* name */
+		return (cbor_string_copy(val, &t->name));
+	}
+
+	return (0); /* ignore */
+}
+
+static int
+decode_template_array(const cbor_item_t *item, void *arg)
+{
+	fido_bio_template_array_t *ta = arg;
+
+	if (cbor_isa_map(item) == false ||
+	    cbor_map_is_definite(item) == false) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (-1);
+	}
+
+	if (ta->n_rx >= ta->n_alloc) {
+		fido_log_debug("%s: n_rx >= n_alloc", __func__);
+		return (-1);
+	}
+
+	if (cbor_map_iter(item, &ta->ptr[ta->n_rx], decode_template) < 0) {
+		fido_log_debug("%s: decode_template", __func__);
+		return (-1);
+	}
+
+	ta->n_rx++;
+
+	return (0);
+}
+
+static int
+bio_parse_template_array(const cbor_item_t *key, const cbor_item_t *val,
+    void *arg)
+{
+	fido_bio_template_array_t *ta = arg;
+
+	if (cbor_isa_uint(key) == false ||
+	    cbor_int_get_width(key) != CBOR_INT_8 ||
+	    cbor_get_uint8(key) != 7) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (0); /* ignore */
+	}
+
+	if (cbor_isa_array(val) == false ||
+	    cbor_array_is_definite(val) == false) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (-1);
+	}
+
+	if (ta->ptr != NULL || ta->n_alloc != 0 || ta->n_rx != 0) {
+		fido_log_debug("%s: ptr != NULL || n_alloc != 0 || n_rx != 0",
+		    __func__);
+		return (-1);
+	}
+
+	if ((ta->ptr = calloc(cbor_array_size(val), sizeof(*ta->ptr))) == NULL)
+		return (-1);
+
+	ta->n_alloc = cbor_array_size(val);
+
+	if (cbor_array_iter(val, ta, decode_template_array) < 0) {
+		fido_log_debug("%s: decode_template_array", __func__);
+		return (-1);
+	}
+
+	return (0);
+}
+
+static int
+bio_rx_template_array(fido_dev_t *dev, fido_bio_template_array_t *ta, int ms)
+{
+	unsigned char	reply[FIDO_MAXMSG];
+	int		reply_len;
+	int		r;
+
+	bio_reset_template_array(ta);
+
+	if ((reply_len = fido_rx(dev, CTAP_CMD_CBOR, &reply, sizeof(reply),
+	    ms)) < 0) {
+		fido_log_debug("%s: fido_rx", __func__);
+		return (FIDO_ERR_RX);
+	}
+
+	if ((r = cbor_parse_reply(reply, (size_t)reply_len, ta,
+	    bio_parse_template_array)) != FIDO_OK) {
+		fido_log_debug("%s: bio_parse_template_array" , __func__);
+		return (r);
+	}
+
+	return (FIDO_OK);
+}
+
+static int
+bio_get_template_array_wait(fido_dev_t *dev, fido_bio_template_array_t *ta,
+    const char *pin, int ms)
+{
+	int r;
+
+	if ((r = bio_tx(dev, CMD_ENUM, NULL, 0, pin, NULL)) != FIDO_OK ||
+	    (r = bio_rx_template_array(dev, ta, ms)) != FIDO_OK)
+		return (r);
+
+	return (FIDO_OK);
+}
+
+int
+fido_bio_dev_get_template_array(fido_dev_t *dev, fido_bio_template_array_t *ta,
+    const char *pin)
+{
+	if (pin == NULL)
+		return (FIDO_ERR_INVALID_ARGUMENT);
+
+	return (bio_get_template_array_wait(dev, ta, pin, -1));
+}
+
+static int
+bio_set_template_name_wait(fido_dev_t *dev, const fido_bio_template_t *t,
+    const char *pin, int ms)
+{
+	cbor_item_t	*argv[2];
+	int		 r = FIDO_ERR_INTERNAL;
+
+	memset(&argv, 0, sizeof(argv));
+
+	if ((argv[0] = fido_blob_encode(&t->id)) == NULL ||
+	    (argv[1] = cbor_build_string(t->name)) == NULL) {
+		fido_log_debug("%s: cbor encode", __func__);
+		goto fail;
+	}
+
+	if ((r = bio_tx(dev, CMD_SET_NAME, argv, 2, pin, NULL)) != FIDO_OK ||
+	    (r = fido_rx_cbor_status(dev, ms)) != FIDO_OK) {
+		fido_log_debug("%s: tx/rx", __func__);
+		goto fail;
+	}
+
+	r = FIDO_OK;
+fail:
+	cbor_vector_free(argv, nitems(argv));
+
+	return (r);
+}
+
+int
+fido_bio_dev_set_template_name(fido_dev_t *dev, const fido_bio_template_t *t,
+    const char *pin)
+{
+	if (pin == NULL || t->name == NULL)
+		return (FIDO_ERR_INVALID_ARGUMENT);
+
+	return (bio_set_template_name_wait(dev, t, pin, -1));
+}
+
+static void
+bio_reset_enroll(fido_bio_enroll_t *e)
+{
+	e->remaining_samples = 0;
+	e->last_status = 0;
+
+	if (e->token)
+		fido_blob_free(&e->token);
+}
+
+static int
+bio_parse_enroll_status(const cbor_item_t *key, const cbor_item_t *val,
+    void *arg)
+{
+	fido_bio_enroll_t *e = arg;
+	uint64_t x;
+
+	if (cbor_isa_uint(key) == false ||
+	    cbor_int_get_width(key) != CBOR_INT_8) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (0); /* ignore */
+	}
+
+	switch (cbor_get_uint8(key)) {
+	case 5:
+		if (cbor_decode_uint64(val, &x) < 0 || x > UINT8_MAX) {
+			fido_log_debug("%s: cbor_decode_uint64", __func__);
+			return (-1);
+		}
+		e->last_status = (uint8_t)x;
+		break;
+	case 6:
+		if (cbor_decode_uint64(val, &x) < 0 || x > UINT8_MAX) {
+			fido_log_debug("%s: cbor_decode_uint64", __func__);
+			return (-1);
+		}
+		e->remaining_samples = (uint8_t)x;
+		break;
+	default:
+		return (0); /* ignore */
+	}
+
+	return (0);
+}
+
+static int
+bio_parse_template_id(const cbor_item_t *key, const cbor_item_t *val,
+    void *arg)
+{
+	fido_blob_t *id = arg;
+
+	if (cbor_isa_uint(key) == false ||
+	    cbor_int_get_width(key) != CBOR_INT_8 ||
+	    cbor_get_uint8(key) != 4) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (0); /* ignore */
+	}
+
+	return (fido_blob_decode(val, id));
+}
+
+static int
+bio_rx_enroll_begin(fido_dev_t *dev, fido_bio_template_t *t,
+    fido_bio_enroll_t *e, int ms)
+{
+	unsigned char	reply[FIDO_MAXMSG];
+	int		reply_len;
+	int		r;
+
+	bio_reset_template(t);
+
+	e->remaining_samples = 0;
+	e->last_status = 0;
+
+	if ((reply_len = fido_rx(dev, CTAP_CMD_CBOR, &reply, sizeof(reply),
+	    ms)) < 0) {
+		fido_log_debug("%s: fido_rx", __func__);
+		return (FIDO_ERR_RX);
+	}
+
+	if ((r = cbor_parse_reply(reply, (size_t)reply_len, e,
+	    bio_parse_enroll_status)) != FIDO_OK) {
+		fido_log_debug("%s: bio_parse_enroll_status", __func__);
+		return (r);
+	}
+	if ((r = cbor_parse_reply(reply, (size_t)reply_len, &t->id,
+	    bio_parse_template_id)) != FIDO_OK) {
+		fido_log_debug("%s: bio_parse_template_id", __func__);
+		return (r);
+	}
+
+	return (FIDO_OK);
+}
+
+static int
+bio_enroll_begin_wait(fido_dev_t *dev, fido_bio_template_t *t,
+    fido_bio_enroll_t *e, uint32_t timo_ms, int ms)
+{
+	cbor_item_t	*argv[3];
+	const uint8_t	 cmd = CMD_ENROLL_BEGIN;
+	int		 r = FIDO_ERR_INTERNAL;
+
+	memset(&argv, 0, sizeof(argv));
+
+	if ((argv[2] = cbor_build_uint32(timo_ms)) == NULL) {
+		fido_log_debug("%s: cbor encode", __func__);
+		goto fail;
+	}
+
+	if ((r = bio_tx(dev, cmd, argv, 3, NULL, e->token)) != FIDO_OK ||
+	    (r = bio_rx_enroll_begin(dev, t, e, ms)) != FIDO_OK) {
+		fido_log_debug("%s: tx/rx", __func__);
+		goto fail;
+	}
+
+	r = FIDO_OK;
+fail:
+	cbor_vector_free(argv, nitems(argv));
+
+	return (r);
+}
+
+int
+fido_bio_dev_enroll_begin(fido_dev_t *dev, fido_bio_template_t *t,
+    fido_bio_enroll_t *e, uint32_t timo_ms, const char *pin)
+{
+	es256_pk_t	*pk = NULL;
+	fido_blob_t	*ecdh = NULL;
+	fido_blob_t	*token = NULL;
+	int		 r;
+
+	if (pin == NULL || e->token != NULL)
+		return (FIDO_ERR_INVALID_ARGUMENT);
+
+	if ((token = fido_blob_new()) == NULL) {
+		r = FIDO_ERR_INTERNAL;
+		goto fail;
+	}
+
+	if ((r = fido_do_ecdh(dev, &pk, &ecdh)) != FIDO_OK) {
+		fido_log_debug("%s: fido_do_ecdh", __func__);
+		goto fail;
+	}
+
+	if ((r = fido_dev_get_pin_token(dev, pin, ecdh, pk, token)) != FIDO_OK) {
+		fido_log_debug("%s: fido_dev_get_pin_token", __func__);
+		goto fail;
+	}
+
+	e->token = token;
+	token = NULL;
+fail:
+	es256_pk_free(&pk);
+	fido_blob_free(&ecdh);
+	fido_blob_free(&token);
+
+	if (r != FIDO_OK)
+		return (r);
+
+	return (bio_enroll_begin_wait(dev, t, e, timo_ms, -1));
+}
+
+static int
+bio_rx_enroll_continue(fido_dev_t *dev, fido_bio_enroll_t *e, int ms)
+{
+	unsigned char	reply[FIDO_MAXMSG];
+	int		reply_len;
+	int		r;
+
+	e->remaining_samples = 0;
+	e->last_status = 0;
+
+	if ((reply_len = fido_rx(dev, CTAP_CMD_CBOR, &reply, sizeof(reply),
+	    ms)) < 0) {
+		fido_log_debug("%s: fido_rx", __func__);
+		return (FIDO_ERR_RX);
+	}
+
+	if ((r = cbor_parse_reply(reply, (size_t)reply_len, e,
+	    bio_parse_enroll_status)) != FIDO_OK) {
+		fido_log_debug("%s: bio_parse_enroll_status", __func__);
+		return (r);
+	}
+
+	return (FIDO_OK);
+}
+
+static int
+bio_enroll_continue_wait(fido_dev_t *dev, const fido_bio_template_t *t,
+    fido_bio_enroll_t *e, uint32_t timo_ms, int ms)
+{
+	cbor_item_t	*argv[3];
+	const uint8_t	 cmd = CMD_ENROLL_NEXT;
+	int		 r = FIDO_ERR_INTERNAL;
+
+	memset(&argv, 0, sizeof(argv));
+
+	if ((argv[0] = fido_blob_encode(&t->id)) == NULL ||
+	    (argv[2] = cbor_build_uint32(timo_ms)) == NULL) {
+		fido_log_debug("%s: cbor encode", __func__);
+		goto fail;
+	}
+
+	if ((r = bio_tx(dev, cmd, argv, 3, NULL, e->token)) != FIDO_OK ||
+	    (r = bio_rx_enroll_continue(dev, e, ms)) != FIDO_OK) {
+		fido_log_debug("%s: tx/rx", __func__);
+		goto fail;
+	}
+
+	r = FIDO_OK;
+fail:
+	cbor_vector_free(argv, nitems(argv));
+
+	return (r);
+}
+
+int
+fido_bio_dev_enroll_continue(fido_dev_t *dev, const fido_bio_template_t *t,
+    fido_bio_enroll_t *e, uint32_t timo_ms)
+{
+	if (e->token == NULL)
+		return (FIDO_ERR_INVALID_ARGUMENT);
+
+	return (bio_enroll_continue_wait(dev, t, e, timo_ms, -1));
+}
+
+static int
+bio_enroll_cancel_wait(fido_dev_t *dev, int ms)
+{
+	const uint8_t	cmd = CMD_ENROLL_CANCEL;
+	int		r;
+
+	if ((r = bio_tx(dev, cmd, NULL, 0, NULL, NULL)) != FIDO_OK ||
+	    (r = fido_rx_cbor_status(dev, ms)) != FIDO_OK) {
+		fido_log_debug("%s: tx/rx", __func__);
+		return (r);
+	}
+
+	return (FIDO_OK);
+}
+
+int
+fido_bio_dev_enroll_cancel(fido_dev_t *dev)
+{
+	return (bio_enroll_cancel_wait(dev, -1));
+}
+
+static int
+bio_enroll_remove_wait(fido_dev_t *dev, const fido_bio_template_t *t,
+    const char *pin, int ms)
+{
+	cbor_item_t	*argv[1];
+	const uint8_t	 cmd = CMD_ENROLL_REMOVE;
+	int		 r = FIDO_ERR_INTERNAL;
+
+	memset(&argv, 0, sizeof(argv));
+
+	if ((argv[0] = fido_blob_encode(&t->id)) == NULL) {
+		fido_log_debug("%s: cbor encode", __func__);
+		goto fail;
+	}
+
+	if ((r = bio_tx(dev, cmd, argv, 1, pin, NULL)) != FIDO_OK ||
+	    (r = fido_rx_cbor_status(dev, ms)) != FIDO_OK) {
+		fido_log_debug("%s: tx/rx", __func__);
+		goto fail;
+	}
+
+	r = FIDO_OK;
+fail:
+	cbor_vector_free(argv, nitems(argv));
+
+	return (r);
+}
+
+int
+fido_bio_dev_enroll_remove(fido_dev_t *dev, const fido_bio_template_t *t,
+    const char *pin)
+{
+	return (bio_enroll_remove_wait(dev, t, pin, -1));
+}
+
+static void
+bio_reset_info(fido_bio_info_t *i)
+{
+	i->type = 0;
+	i->max_samples = 0;
+}
+
+static int
+bio_parse_info(const cbor_item_t *key, const cbor_item_t *val, void *arg)
+{
+	fido_bio_info_t	*i = arg;
+	uint64_t	 x;
+
+	if (cbor_isa_uint(key) == false ||
+	    cbor_int_get_width(key) != CBOR_INT_8) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (0); /* ignore */
+	}
+
+	switch (cbor_get_uint8(key)) {
+	case 2:
+		if (cbor_decode_uint64(val, &x) < 0 || x > UINT8_MAX) {
+			fido_log_debug("%s: cbor_decode_uint64", __func__);
+			return (-1);
+		}
+		i->type = (uint8_t)x;
+		break;
+	case 3:
+		if (cbor_decode_uint64(val, &x) < 0 || x > UINT8_MAX) {
+			fido_log_debug("%s: cbor_decode_uint64", __func__);
+			return (-1);
+		}
+		i->max_samples = (uint8_t)x;
+		break;
+	default:
+		return (0); /* ignore */
+	}
+
+	return (0);
+}
+
+static int
+bio_rx_info(fido_dev_t *dev, fido_bio_info_t *i, int ms)
+{
+	unsigned char	reply[FIDO_MAXMSG];
+	int		reply_len;
+	int		r;
+
+	bio_reset_info(i);
+
+	if ((reply_len = fido_rx(dev, CTAP_CMD_CBOR, &reply, sizeof(reply),
+	    ms)) < 0) {
+		fido_log_debug("%s: fido_rx", __func__);
+		return (FIDO_ERR_RX);
+	}
+
+	if ((r = cbor_parse_reply(reply, (size_t)reply_len, i,
+	    bio_parse_info)) != FIDO_OK) {
+		fido_log_debug("%s: bio_parse_info" , __func__);
+		return (r);
+	}
+
+	return (FIDO_OK);
+}
+
+static int
+bio_get_info_wait(fido_dev_t *dev, fido_bio_info_t *i, int ms)
+{
+	int r;
+
+	if ((r = bio_tx(dev, CMD_GET_INFO, NULL, 0, NULL, NULL)) != FIDO_OK ||
+	    (r = bio_rx_info(dev, i, ms)) != FIDO_OK) {
+		fido_log_debug("%s: tx/rx", __func__);
+		return (r);
+	}
+
+	return (FIDO_OK);
+}
+
+int
+fido_bio_dev_get_info(fido_dev_t *dev, fido_bio_info_t *i)
+{
+	return (bio_get_info_wait(dev, i, -1));
+}
+
+const char *
+fido_bio_template_name(const fido_bio_template_t *t)
+{
+	return (t->name);
+}
+
+const unsigned char *
+fido_bio_template_id_ptr(const fido_bio_template_t *t)
+{
+	return (t->id.ptr);
+}
+
+size_t
+fido_bio_template_id_len(const fido_bio_template_t *t)
+{
+	return (t->id.len);
+}
+
+size_t
+fido_bio_template_array_count(const fido_bio_template_array_t *ta)
+{
+	return (ta->n_rx);
+}
+
+fido_bio_template_array_t *
+fido_bio_template_array_new(void)
+{
+	return (calloc(1, sizeof(fido_bio_template_array_t)));
+}
+
+fido_bio_template_t *
+fido_bio_template_new(void)
+{
+	return (calloc(1, sizeof(fido_bio_template_t)));
+}
+
+void
+fido_bio_template_array_free(fido_bio_template_array_t **tap)
+{
+	fido_bio_template_array_t *ta;
+
+	if (tap == NULL || (ta = *tap) == NULL)
+		return;
+
+	bio_reset_template_array(ta);
+	free(ta);
+	*tap = NULL;
+}
+
+void
+fido_bio_template_free(fido_bio_template_t **tp)
+{
+	fido_bio_template_t *t;
+
+	if (tp == NULL || (t = *tp) == NULL)
+		return;
+
+	bio_reset_template(t);
+	free(t);
+	*tp = NULL;
+}
+
+int
+fido_bio_template_set_name(fido_bio_template_t *t, const char *name)
+{
+	free(t->name);
+	t->name = NULL;
+
+	if (name && (t->name = strdup(name)) == NULL)
+		return (FIDO_ERR_INTERNAL);
+
+	return (FIDO_OK);
+}
+
+int
+fido_bio_template_set_id(fido_bio_template_t *t, const unsigned char *ptr,
+    size_t len)
+{
+	free(t->id.ptr);
+	t->id.ptr = NULL;
+	t->id.len = 0;
+
+	if (ptr && fido_blob_set(&t->id, ptr, len) < 0)
+		return (FIDO_ERR_INTERNAL);
+
+	return (FIDO_OK);
+}
+
+const fido_bio_template_t *
+fido_bio_template(const fido_bio_template_array_t *ta, size_t idx)
+{
+	if (idx >= ta->n_alloc)
+		return (NULL);
+
+	return (&ta->ptr[idx]);
+}
+
+fido_bio_enroll_t *
+fido_bio_enroll_new(void)
+{
+	return (calloc(1, sizeof(fido_bio_enroll_t)));
+}
+
+fido_bio_info_t *
+fido_bio_info_new(void)
+{
+	return (calloc(1, sizeof(fido_bio_info_t)));
+}
+
+uint8_t
+fido_bio_info_type(const fido_bio_info_t *i)
+{
+	return (i->type);
+}
+
+uint8_t
+fido_bio_info_max_samples(const fido_bio_info_t *i)
+{
+	return (i->max_samples);
+}
+
+void
+fido_bio_enroll_free(fido_bio_enroll_t **ep)
+{
+	fido_bio_enroll_t *e;
+
+	if (ep == NULL || (e = *ep) == NULL)
+		return;
+
+	bio_reset_enroll(e);
+
+	free(e);
+	*ep = NULL;
+}
+
+void
+fido_bio_info_free(fido_bio_info_t **ip)
+{
+	fido_bio_info_t *i;
+
+	if (ip == NULL || (i = *ip) == NULL)
+		return;
+
+	free(i);
+	*ip = NULL;
+}
+
+uint8_t
+fido_bio_enroll_remaining_samples(const fido_bio_enroll_t *e)
+{
+	return (e->remaining_samples);
+}
+
+uint8_t
+fido_bio_enroll_last_status(const fido_bio_enroll_t *e)
+{
+	return (e->last_status);
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/blob.c mysql-8.0-8.0.27/extra/libfido2/src/blob.c
--- mysql-8.0-8.0.26/extra/libfido2/src/blob.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/blob.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <string.h>
+#include "fido.h"
+
+fido_blob_t *
+fido_blob_new(void)
+{
+	return (calloc(1, sizeof(fido_blob_t)));
+}
+
+int
+fido_blob_set(fido_blob_t *b, const unsigned char *ptr, size_t len)
+{
+	if (b->ptr != NULL) {
+		explicit_bzero(b->ptr, b->len);
+		free(b->ptr);
+		b->ptr = NULL;
+	}
+
+	b->len = 0;
+
+	if (ptr == NULL || len == 0) {
+		fido_log_debug("%s: ptr=%p, len=%zu", __func__,
+		    (const void *)ptr, len);
+		return (-1);
+	}
+
+	if ((b->ptr = malloc(len)) == NULL) {
+		fido_log_debug("%s: malloc", __func__);
+		return (-1);
+	}
+
+	memcpy(b->ptr, ptr, len);
+	b->len = len;
+
+	return (0);
+}
+
+void
+fido_blob_free(fido_blob_t **bp)
+{
+	fido_blob_t *b;
+
+	if (bp == NULL || (b = *bp) == NULL)
+		return;
+
+	if (b->ptr) {
+		explicit_bzero(b->ptr, b->len);
+		free(b->ptr);
+	}
+
+	explicit_bzero(b, sizeof(*b));
+	free(b);
+
+	*bp = NULL;
+}
+
+void
+fido_free_blob_array(fido_blob_array_t *array)
+{
+	if (array->ptr == NULL)
+		return;
+
+	for (size_t i = 0; i < array->len; i++) {
+		fido_blob_t *b = &array->ptr[i];
+		if (b->ptr != NULL) {
+			explicit_bzero(b->ptr, b->len);
+			free(b->ptr);
+			b->ptr = NULL;
+		}
+	}
+
+	free(array->ptr);
+	array->ptr = NULL;
+	array->len = 0;
+}
+
+cbor_item_t *
+fido_blob_encode(const fido_blob_t *b)
+{
+	if (b == NULL || b->ptr == NULL)
+		return (NULL);
+
+	return (cbor_build_bytestring(b->ptr, b->len));
+}
+
+int
+fido_blob_decode(const cbor_item_t *item, fido_blob_t *b)
+{
+	return (cbor_bytestring_copy(item, &b->ptr, &b->len));
+}
+
+int
+fido_blob_is_empty(const fido_blob_t *b)
+{
+	return (b->ptr == NULL || b->len == 0);
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/blob.h mysql-8.0-8.0.27/extra/libfido2/src/blob.h
--- mysql-8.0-8.0.26/extra/libfido2/src/blob.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/blob.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#ifndef _BLOB_H
+#define _BLOB_H
+
+#include <cbor.h>
+#include <stdlib.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+typedef struct fido_blob {
+	unsigned char	*ptr;
+	size_t		 len;
+} fido_blob_t;
+
+typedef struct fido_blob_array {
+	fido_blob_t	*ptr;
+	size_t		 len;
+} fido_blob_array_t;
+
+cbor_item_t *fido_blob_encode(const fido_blob_t *);
+fido_blob_t *fido_blob_new(void);
+int fido_blob_decode(const cbor_item_t *, fido_blob_t *);
+int fido_blob_is_empty(const fido_blob_t *);
+int fido_blob_set(fido_blob_t *, const unsigned char *, size_t);
+void fido_blob_free(fido_blob_t **);
+void fido_free_blob_array(fido_blob_array_t *);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !_BLOB_H */
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/buf.c mysql-8.0-8.0.27/extra/libfido2/src/buf.c
--- mysql-8.0-8.0.26/extra/libfido2/src/buf.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/buf.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <string.h>
+#include "fido.h"
+
+int
+fido_buf_read(const unsigned char **buf, size_t *len, void *dst, size_t count)
+{
+	if (count > *len)
+		return (-1);
+
+	memcpy(dst, *buf, count);
+	*buf += count;
+	*len -= count;
+
+	return (0);
+}
+
+int
+fido_buf_write(unsigned char **buf, size_t *len, const void *src, size_t count)
+{
+	if (count > *len)
+		return (-1);
+
+	memcpy(*buf, src, count);
+	*buf += count;
+	*len -= count;
+
+	return (0);
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/cbor.c mysql-8.0-8.0.27/extra/libfido2/src/cbor.c
--- mysql-8.0-8.0.26/extra/libfido2/src/cbor.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/cbor.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,1569 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <openssl/evp.h>
+#include <openssl/hmac.h>
+#include <openssl/sha.h>
+
+#include <string.h>
+#include "fido.h"
+
+static int
+check_key_type(cbor_item_t *item)
+{
+	if (item->type == CBOR_TYPE_UINT || item->type == CBOR_TYPE_NEGINT ||
+	    item->type == CBOR_TYPE_STRING)
+		return (0);
+
+	fido_log_debug("%s: invalid type: %d", __func__, item->type);
+
+	return (-1);
+}
+
+/*
+ * Validate CTAP2 canonical CBOR encoding rules for maps.
+ */
+static int
+ctap_check_cbor(cbor_item_t *prev, cbor_item_t *curr)
+{
+	size_t	curr_len;
+	size_t	prev_len;
+
+	if (check_key_type(prev) < 0 || check_key_type(curr) < 0)
+		return (-1);
+
+	if (prev->type != curr->type) {
+		if (prev->type < curr->type)
+			return (0);
+		fido_log_debug("%s: unsorted types", __func__);
+		return (-1);
+	}
+
+	if (curr->type == CBOR_TYPE_UINT || curr->type == CBOR_TYPE_NEGINT) {
+		if (cbor_int_get_width(curr) >= cbor_int_get_width(prev) &&
+		    cbor_get_int(curr) > cbor_get_int(prev))
+			return (0);
+	} else {
+		curr_len = cbor_string_length(curr);
+		prev_len = cbor_string_length(prev);
+
+		if (curr_len > prev_len || (curr_len == prev_len &&
+		    memcmp(cbor_string_handle(prev), cbor_string_handle(curr),
+		    curr_len) < 0))
+			return (0);
+	}
+
+	fido_log_debug("%s: invalid cbor", __func__);
+
+	return (-1);
+}
+
+int
+cbor_map_iter(const cbor_item_t *item, void *arg, int(*f)(const cbor_item_t *,
+    const cbor_item_t *, void *))
+{
+	struct cbor_pair	*v;
+	size_t			 n;
+
+	if ((v = cbor_map_handle(item)) == NULL) {
+		fido_log_debug("%s: cbor_map_handle", __func__);
+		return (-1);
+	}
+
+	n = cbor_map_size(item);
+
+	for (size_t i = 0; i < n; i++) {
+		if (v[i].key == NULL || v[i].value == NULL) {
+			fido_log_debug("%s: key=%p, value=%p for i=%zu",
+			    __func__, (void *)v[i].key, (void *)v[i].value, i);
+			return (-1);
+		}
+		if (i && ctap_check_cbor(v[i - 1].key, v[i].key) < 0) {
+			fido_log_debug("%s: ctap_check_cbor", __func__);
+			return (-1);
+		}
+		if (f(v[i].key, v[i].value, arg) < 0) {
+			fido_log_debug("%s: iterator < 0 on i=%zu", __func__,
+			    i);
+			return (-1);
+		}
+	}
+
+	return (0);
+}
+
+int
+cbor_array_iter(const cbor_item_t *item, void *arg, int(*f)(const cbor_item_t *,
+    void *))
+{
+	cbor_item_t	**v;
+	size_t		  n;
+
+	if ((v = cbor_array_handle(item)) == NULL) {
+		fido_log_debug("%s: cbor_array_handle", __func__);
+		return (-1);
+	}
+
+	n = cbor_array_size(item);
+
+	for (size_t i = 0; i < n; i++)
+		if (v[i] == NULL || f(v[i], arg) < 0) {
+			fido_log_debug("%s: iterator < 0 on i=%zu,%p",
+			    __func__, i, (void *)v[i]);
+			return (-1);
+		}
+
+	return (0);
+}
+
+int
+cbor_parse_reply(const unsigned char *blob, size_t blob_len, void *arg,
+    int(*parser)(const cbor_item_t *, const cbor_item_t *, void *))
+{
+	cbor_item_t		*item = NULL;
+	struct cbor_load_result	 cbor;
+	int			 r;
+
+	if (blob_len < 1) {
+		fido_log_debug("%s: blob_len=%zu", __func__, blob_len);
+		r = FIDO_ERR_RX;
+		goto fail;
+	}
+
+	if (blob[0] != FIDO_OK) {
+		fido_log_debug("%s: blob[0]=0x%02x", __func__, blob[0]);
+		r = blob[0];
+		goto fail;
+	}
+
+	if ((item = cbor_load(blob + 1, blob_len - 1, &cbor)) == NULL) {
+		fido_log_debug("%s: cbor_load", __func__);
+		r = FIDO_ERR_RX_NOT_CBOR;
+		goto fail;
+	}
+
+	if (cbor_isa_map(item) == false ||
+	    cbor_map_is_definite(item) == false) {
+		fido_log_debug("%s: cbor type", __func__);
+		r = FIDO_ERR_RX_INVALID_CBOR;
+		goto fail;
+	}
+
+	if (cbor_map_iter(item, arg, parser) < 0) {
+		fido_log_debug("%s: cbor_map_iter", __func__);
+		r = FIDO_ERR_RX_INVALID_CBOR;
+		goto fail;
+	}
+
+	r = FIDO_OK;
+fail:
+	if (item != NULL)
+		cbor_decref(&item);
+
+	return (r);
+}
+
+void
+cbor_vector_free(cbor_item_t **item, size_t len)
+{
+	for (size_t i = 0; i < len; i++)
+		if (item[i] != NULL)
+			cbor_decref(&item[i]);
+}
+
+int
+cbor_bytestring_copy(const cbor_item_t *item, unsigned char **buf, size_t *len)
+{
+	if (*buf != NULL || *len != 0) {
+		fido_log_debug("%s: dup", __func__);
+		return (-1);
+	}
+
+	if (cbor_isa_bytestring(item) == false ||
+	    cbor_bytestring_is_definite(item) == false) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (-1);
+	}
+
+	*len = cbor_bytestring_length(item);
+	if ((*buf = malloc(*len)) == NULL) {
+		*len = 0;
+		return (-1);
+	}
+
+	memcpy(*buf, cbor_bytestring_handle(item), *len);
+
+	return (0);
+}
+
+int
+cbor_string_copy(const cbor_item_t *item, char **str)
+{
+	size_t len;
+
+	if (*str != NULL) {
+		fido_log_debug("%s: dup", __func__);
+		return (-1);
+	}
+
+	if (cbor_isa_string(item) == false ||
+	    cbor_string_is_definite(item) == false) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (-1);
+	}
+
+	if ((len = cbor_string_length(item)) == SIZE_MAX ||
+	    (*str = malloc(len + 1)) == NULL)
+		return (-1);
+
+	memcpy(*str, cbor_string_handle(item), len);
+	(*str)[len] = '\0';
+
+	return (0);
+}
+
+int
+cbor_add_bytestring(cbor_item_t *item, const char *key,
+    const unsigned char *value, size_t value_len)
+{
+	struct cbor_pair pair;
+	int ok = -1;
+
+	memset(&pair, 0, sizeof(pair));
+
+	if ((pair.key = cbor_build_string(key)) == NULL ||
+	    (pair.value = cbor_build_bytestring(value, value_len)) == NULL) {
+		fido_log_debug("%s: cbor_build", __func__);
+		goto fail;
+	}
+
+	if (!cbor_map_add(item, pair)) {
+		fido_log_debug("%s: cbor_map_add", __func__);
+		goto fail;
+	}
+
+	ok = 0;
+fail:
+	if (pair.key)
+		cbor_decref(&pair.key);
+	if (pair.value)
+		cbor_decref(&pair.value);
+
+	return (ok);
+}
+
+int
+cbor_add_string(cbor_item_t *item, const char *key, const char *value)
+{
+	struct cbor_pair pair;
+	int ok = -1;
+
+	memset(&pair, 0, sizeof(pair));
+
+	if ((pair.key = cbor_build_string(key)) == NULL ||
+	    (pair.value = cbor_build_string(value)) == NULL) {
+		fido_log_debug("%s: cbor_build", __func__);
+		goto fail;
+	}
+
+	if (!cbor_map_add(item, pair)) {
+		fido_log_debug("%s: cbor_map_add", __func__);
+		goto fail;
+	}
+
+	ok = 0;
+fail:
+	if (pair.key)
+		cbor_decref(&pair.key);
+	if (pair.value)
+		cbor_decref(&pair.value);
+
+	return (ok);
+}
+
+int
+cbor_add_bool(cbor_item_t *item, const char *key, fido_opt_t value)
+{
+	struct cbor_pair pair;
+	int ok = -1;
+
+	memset(&pair, 0, sizeof(pair));
+
+	if ((pair.key = cbor_build_string(key)) == NULL ||
+	    (pair.value = cbor_build_bool(value == FIDO_OPT_TRUE)) == NULL) {
+		fido_log_debug("%s: cbor_build", __func__);
+		goto fail;
+	}
+
+	if (!cbor_map_add(item, pair)) {
+		fido_log_debug("%s: cbor_map_add", __func__);
+		goto fail;
+	}
+
+	ok = 0;
+fail:
+	if (pair.key)
+		cbor_decref(&pair.key);
+	if (pair.value)
+		cbor_decref(&pair.value);
+
+	return (ok);
+}
+
+static int
+cbor_add_uint8(cbor_item_t *item, const char *key, uint8_t value)
+{
+	struct cbor_pair pair;
+	int ok = -1;
+
+	memset(&pair, 0, sizeof(pair));
+
+	if ((pair.key = cbor_build_string(key)) == NULL ||
+	    (pair.value = cbor_build_uint8(value)) == NULL) {
+		fido_log_debug("%s: cbor_build", __func__);
+		goto fail;
+	}
+
+	if (!cbor_map_add(item, pair)) {
+		fido_log_debug("%s: cbor_map_add", __func__);
+		goto fail;
+	}
+
+	ok = 0;
+fail:
+	if (pair.key)
+		cbor_decref(&pair.key);
+	if (pair.value)
+		cbor_decref(&pair.value);
+
+	return (ok);
+}
+
+static int
+cbor_add_arg(cbor_item_t *item, uint8_t n, cbor_item_t *arg)
+{
+	struct cbor_pair pair;
+	int ok = -1;
+
+	memset(&pair, 0, sizeof(pair));
+
+	if (arg == NULL)
+		return (0); /* empty argument */
+
+	if ((pair.key = cbor_build_uint8(n)) == NULL) {
+		fido_log_debug("%s: cbor_build", __func__);
+		goto fail;
+	}
+
+	pair.value = arg;
+
+	if (!cbor_map_add(item, pair)) {
+		fido_log_debug("%s: cbor_map_add", __func__);
+		goto fail;
+	}
+
+	ok = 0;
+fail:
+	if (pair.key)
+		cbor_decref(&pair.key);
+
+	return (ok);
+}
+
+cbor_item_t *
+cbor_flatten_vector(cbor_item_t *argv[], size_t argc)
+{
+	cbor_item_t	*map;
+	uint8_t		 i;
+
+	if (argc > UINT8_MAX - 1)
+		return (NULL);
+
+	if ((map = cbor_new_definite_map(argc)) == NULL)
+		return (NULL);
+
+	for (i = 0; i < argc; i++)
+		if (cbor_add_arg(map, (uint8_t)(i + 1), argv[i]) < 0)
+			break;
+
+	if (i != argc) {
+		cbor_decref(&map);
+		map = NULL;
+	}
+
+	return (map);
+}
+
+int
+cbor_build_frame(uint8_t cmd, cbor_item_t *argv[], size_t argc, fido_blob_t *f)
+{
+	cbor_item_t	*flat = NULL;
+	unsigned char	*cbor = NULL;
+	size_t		 cbor_len;
+	size_t		 cbor_alloc_len;
+	int		 ok = -1;
+
+	if ((flat = cbor_flatten_vector(argv, argc)) == NULL)
+		goto fail;
+
+	cbor_len = cbor_serialize_alloc(flat, &cbor, &cbor_alloc_len);
+	if (cbor_len == 0 || cbor_len == SIZE_MAX) {
+		fido_log_debug("%s: cbor_len=%zu", __func__, cbor_len);
+		goto fail;
+	}
+
+	if ((f->ptr = malloc(cbor_len + 1)) == NULL)
+		goto fail;
+
+	f->len = cbor_len + 1;
+	f->ptr[0] = cmd;
+	memcpy(f->ptr + 1, cbor, f->len - 1);
+
+	ok = 0;
+fail:
+	if (flat != NULL)
+		cbor_decref(&flat);
+
+	free(cbor);
+
+	return (ok);
+}
+
+cbor_item_t *
+cbor_encode_rp_entity(const fido_rp_t *rp)
+{
+	cbor_item_t *item = NULL;
+
+	if ((item = cbor_new_definite_map(2)) == NULL)
+		return (NULL);
+
+	if ((rp->id && cbor_add_string(item, "id", rp->id) < 0) ||
+	    (rp->name && cbor_add_string(item, "name", rp->name) < 0)) {
+		cbor_decref(&item);
+		return (NULL);
+	}
+
+	return (item);
+}
+
+cbor_item_t *
+cbor_encode_user_entity(const fido_user_t *user)
+{
+	cbor_item_t		*item = NULL;
+	const fido_blob_t	*id = &user->id;
+	const char		*display = user->display_name;
+
+	if ((item = cbor_new_definite_map(4)) == NULL)
+		return (NULL);
+
+	if ((id->ptr && cbor_add_bytestring(item, "id", id->ptr, id->len) < 0) ||
+	    (user->icon && cbor_add_string(item, "icon", user->icon) < 0) ||
+	    (user->name && cbor_add_string(item, "name", user->name) < 0) ||
+	    (display && cbor_add_string(item, "displayName", display) < 0)) {
+		cbor_decref(&item);
+		return (NULL);
+	}
+
+	return (item);
+}
+
+cbor_item_t *
+cbor_encode_pubkey_param(int cose_alg)
+{
+	cbor_item_t		*item = NULL;
+	cbor_item_t		*body = NULL;
+	struct cbor_pair	 alg;
+	int			 ok = -1;
+
+	memset(&alg, 0, sizeof(alg));
+
+	if ((item = cbor_new_definite_array(1)) == NULL ||
+	    (body = cbor_new_definite_map(2)) == NULL ||
+	    cose_alg > -1 || cose_alg < INT16_MIN)
+		goto fail;
+
+	alg.key = cbor_build_string("alg");
+
+	if (-cose_alg - 1 > UINT8_MAX)
+		alg.value = cbor_build_negint16((uint16_t)(-cose_alg - 1));
+	else
+		alg.value = cbor_build_negint8((uint8_t)(-cose_alg - 1));
+
+	if (alg.key == NULL || alg.value == NULL) {
+		fido_log_debug("%s: cbor_build", __func__);
+		goto fail;
+	}
+
+	if (cbor_map_add(body, alg) == false ||
+	    cbor_add_string(body, "type", "public-key") < 0 ||
+	    cbor_array_push(item, body) == false)
+		goto fail;
+
+	ok  = 0;
+fail:
+	if (ok < 0) {
+		if (item != NULL) {
+			cbor_decref(&item);
+			item = NULL;
+		}
+	}
+
+	if (body != NULL)
+		cbor_decref(&body);
+	if (alg.key != NULL)
+		cbor_decref(&alg.key);
+	if (alg.value != NULL)
+		cbor_decref(&alg.value);
+
+	return (item);
+}
+
+cbor_item_t *
+cbor_encode_pubkey(const fido_blob_t *pubkey)
+{
+	cbor_item_t *cbor_key = NULL;
+
+	if ((cbor_key = cbor_new_definite_map(2)) == NULL ||
+	    cbor_add_bytestring(cbor_key, "id", pubkey->ptr, pubkey->len) < 0 ||
+	    cbor_add_string(cbor_key, "type", "public-key") < 0) {
+		if (cbor_key)
+			cbor_decref(&cbor_key);
+		return (NULL);
+	}
+
+	return (cbor_key);
+}
+
+cbor_item_t *
+cbor_encode_pubkey_list(const fido_blob_array_t *list)
+{
+	cbor_item_t	*array = NULL;
+	cbor_item_t	*key = NULL;
+
+	if ((array = cbor_new_definite_array(list->len)) == NULL)
+		goto fail;
+
+	for (size_t i = 0; i < list->len; i++) {
+		if ((key = cbor_encode_pubkey(&list->ptr[i])) == NULL ||
+		    cbor_array_push(array, key) == false)
+			goto fail;
+		cbor_decref(&key);
+	}
+
+	return (array);
+fail:
+	if (key != NULL)
+		cbor_decref(&key);
+	if (array != NULL)
+		cbor_decref(&array);
+
+	return (NULL);
+}
+
+cbor_item_t *
+cbor_encode_extensions(const fido_cred_ext_t *ext)
+{
+	cbor_item_t *item = NULL;
+	size_t size = 0;
+
+	if (ext->mask & FIDO_EXT_HMAC_SECRET)
+		size++;
+	if (ext->mask & FIDO_EXT_CRED_PROTECT)
+		size++;
+	if (size == 0 || (item = cbor_new_definite_map(size)) == NULL)
+		return (NULL);
+
+	if (ext->mask & FIDO_EXT_HMAC_SECRET) {
+		if (cbor_add_bool(item, "hmac-secret", FIDO_OPT_TRUE) < 0) {
+			cbor_decref(&item);
+			return (NULL);
+		}
+	}
+	if (ext->mask & FIDO_EXT_CRED_PROTECT) {
+		if (ext->prot < 0 || ext->prot > UINT8_MAX ||
+		    cbor_add_uint8(item, "credProtect",
+		    (uint8_t)ext->prot) < 0) {
+			cbor_decref(&item);
+			return (NULL);
+		}
+	}
+
+	return (item);
+}
+
+cbor_item_t *
+cbor_encode_options(fido_opt_t rk, fido_opt_t uv)
+{
+	cbor_item_t *item = NULL;
+
+	if ((item = cbor_new_definite_map(2)) == NULL)
+		return (NULL);
+
+	if ((rk != FIDO_OPT_OMIT && cbor_add_bool(item, "rk", rk) < 0) ||
+	    (uv != FIDO_OPT_OMIT && cbor_add_bool(item, "uv", uv) < 0)) {
+		cbor_decref(&item);
+		return (NULL);
+	}
+
+	return (item);
+}
+
+cbor_item_t *
+cbor_encode_assert_options(fido_opt_t up, fido_opt_t uv)
+{
+	cbor_item_t *item = NULL;
+
+	if ((item = cbor_new_definite_map(2)) == NULL)
+		return (NULL);
+
+	if ((up != FIDO_OPT_OMIT && cbor_add_bool(item, "up", up) < 0) ||
+	    (uv != FIDO_OPT_OMIT && cbor_add_bool(item, "uv", uv) < 0)) {
+		cbor_decref(&item);
+		return (NULL);
+	}
+
+	return (item);
+}
+
+cbor_item_t *
+cbor_encode_pin_auth(const fido_blob_t *hmac_key, const fido_blob_t *data)
+{
+	const EVP_MD	*md = NULL;
+	unsigned char	 dgst[SHA256_DIGEST_LENGTH];
+	unsigned int	 dgst_len;
+
+	if ((md = EVP_sha256()) == NULL || HMAC(md, hmac_key->ptr,
+	    (int)hmac_key->len, data->ptr, data->len, dgst,
+	    &dgst_len) == NULL || dgst_len != SHA256_DIGEST_LENGTH)
+		return (NULL);
+
+	return (cbor_build_bytestring(dgst, 16));
+}
+
+cbor_item_t *
+cbor_encode_pin_opt(void)
+{
+	return (cbor_build_uint8(1));
+}
+
+cbor_item_t *
+cbor_encode_pin_enc(const fido_blob_t *key, const fido_blob_t *pin)
+{
+	fido_blob_t	 pe;
+	cbor_item_t	*item = NULL;
+
+	if (aes256_cbc_enc(key, pin, &pe) < 0)
+		return (NULL);
+
+	item = cbor_build_bytestring(pe.ptr, pe.len);
+	free(pe.ptr);
+
+	return (item);
+}
+
+static int
+sha256(const unsigned char *data, size_t data_len, fido_blob_t *digest)
+{
+	if ((digest->ptr = calloc(1, SHA256_DIGEST_LENGTH)) == NULL)
+		return (-1);
+
+	digest->len = SHA256_DIGEST_LENGTH;
+
+	if (SHA256(data, data_len, digest->ptr) != digest->ptr) {
+		free(digest->ptr);
+		digest->ptr = NULL;
+		digest->len = 0;
+		return (-1);
+	}
+
+	return (0);
+}
+
+cbor_item_t *
+cbor_encode_change_pin_auth(const fido_blob_t *key, const fido_blob_t *new_pin,
+    const fido_blob_t *pin)
+{
+	unsigned char	 dgst[SHA256_DIGEST_LENGTH];
+	unsigned int	 dgst_len;
+	cbor_item_t	*item = NULL;
+	const EVP_MD	*md = NULL;
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+	HMAC_CTX	 ctx;
+#else
+	HMAC_CTX	*ctx = NULL;
+#endif
+	fido_blob_t	*npe = NULL; /* new pin, encrypted */
+	fido_blob_t	*ph = NULL;  /* pin hash */
+	fido_blob_t	*phe = NULL; /* pin hash, encrypted */
+
+	if ((npe = fido_blob_new()) == NULL ||
+	    (ph = fido_blob_new()) == NULL ||
+	    (phe = fido_blob_new()) == NULL)
+		goto fail;
+
+	if (aes256_cbc_enc(key, new_pin, npe) < 0) {
+		fido_log_debug("%s: aes256_cbc_enc 1", __func__);
+		goto fail;
+	}
+
+	if (sha256(pin->ptr, pin->len, ph) < 0 || ph->len < 16) {
+		fido_log_debug("%s: sha256", __func__);
+		goto fail;
+	}
+
+	ph->len = 16; /* first 16 bytes */
+
+	if (aes256_cbc_enc(key, ph, phe) < 0) {
+		fido_log_debug("%s: aes256_cbc_enc 2", __func__);
+		goto fail;
+	}
+
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+	HMAC_CTX_init(&ctx);
+
+	if ((md = EVP_sha256()) == NULL ||
+	    HMAC_Init_ex(&ctx, key->ptr, (int)key->len, md, NULL) == 0 ||
+	    HMAC_Update(&ctx, npe->ptr, npe->len) == 0 ||
+	    HMAC_Update(&ctx, phe->ptr, phe->len) == 0 ||
+	    HMAC_Final(&ctx, dgst, &dgst_len) == 0 || dgst_len != 32) {
+		fido_log_debug("%s: HMAC", __func__);
+		goto fail;
+	}
+#else
+	if ((ctx = HMAC_CTX_new()) == NULL ||
+	    (md = EVP_sha256())  == NULL ||
+	    HMAC_Init_ex(ctx, key->ptr, (int)key->len, md, NULL) == 0 ||
+	    HMAC_Update(ctx, npe->ptr, npe->len) == 0 ||
+	    HMAC_Update(ctx, phe->ptr, phe->len) == 0 ||
+	    HMAC_Final(ctx, dgst, &dgst_len) == 0 || dgst_len != 32) {
+		fido_log_debug("%s: HMAC", __func__);
+		goto fail;
+	}
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+
+	if ((item = cbor_build_bytestring(dgst, 16)) == NULL) {
+		fido_log_debug("%s: cbor_build_bytestring", __func__);
+		goto fail;
+	}
+
+fail:
+	fido_blob_free(&npe);
+	fido_blob_free(&ph);
+	fido_blob_free(&phe);
+
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+	if (ctx != NULL)
+		HMAC_CTX_free(ctx);
+#endif
+
+	return (item);
+}
+
+cbor_item_t *
+cbor_encode_set_pin_auth(const fido_blob_t *key, const fido_blob_t *pin)
+{
+	const EVP_MD	*md = NULL;
+	unsigned char	 dgst[SHA256_DIGEST_LENGTH];
+	unsigned int	 dgst_len;
+	cbor_item_t	*item = NULL;
+	fido_blob_t	*pe = NULL;
+
+	if ((pe = fido_blob_new()) == NULL)
+		goto fail;
+
+	if (aes256_cbc_enc(key, pin, pe) < 0) {
+		fido_log_debug("%s: aes256_cbc_enc", __func__);
+		goto fail;
+	}
+
+	if ((md = EVP_sha256()) == NULL || key->len != 32 || HMAC(md, key->ptr,
+	    (int)key->len, pe->ptr, pe->len, dgst, &dgst_len) == NULL ||
+	    dgst_len != SHA256_DIGEST_LENGTH) {
+		fido_log_debug("%s: HMAC", __func__);
+		goto fail;
+	}
+
+	item = cbor_build_bytestring(dgst, 16);
+fail:
+	fido_blob_free(&pe);
+
+	return (item);
+}
+
+cbor_item_t *
+cbor_encode_pin_hash_enc(const fido_blob_t *shared, const fido_blob_t *pin)
+{
+	cbor_item_t	*item = NULL;
+	fido_blob_t	*ph = NULL;
+	fido_blob_t	*phe = NULL;
+
+	if ((ph = fido_blob_new()) == NULL || (phe = fido_blob_new()) == NULL)
+		goto fail;
+
+	if (sha256(pin->ptr, pin->len, ph) < 0 || ph->len < 16) {
+		fido_log_debug("%s: SHA256", __func__);
+		goto fail;
+	}
+
+	ph->len = 16; /* first 16 bytes */
+
+	if (aes256_cbc_enc(shared, ph, phe) < 0) {
+		fido_log_debug("%s: aes256_cbc_enc", __func__);
+		goto fail;
+	}
+
+	item = cbor_build_bytestring(phe->ptr, phe->len);
+fail:
+	fido_blob_free(&ph);
+	fido_blob_free(&phe);
+
+	return (item);
+}
+
+cbor_item_t *
+cbor_encode_hmac_secret_param(const fido_blob_t *ecdh, const es256_pk_t *pk,
+    const fido_blob_t *hmac_salt)
+{
+	cbor_item_t		*item = NULL;
+	cbor_item_t		*param = NULL;
+	cbor_item_t		*argv[3];
+	struct cbor_pair	 pair;
+
+	memset(argv, 0, sizeof(argv));
+	memset(&pair, 0, sizeof(pair));
+
+	if (ecdh == NULL || pk == NULL || hmac_salt->ptr == NULL) {
+		fido_log_debug("%s: ecdh=%p, pk=%p, hmac_salt->ptr=%p",
+		    __func__, (const void *)ecdh, (const void *)pk,
+		    (const void *)hmac_salt->ptr);
+		goto fail;
+	}
+
+	if (hmac_salt->len != 32 && hmac_salt->len != 64) {
+		fido_log_debug("%s: hmac_salt->len=%zu", __func__,
+		    hmac_salt->len);
+		goto fail;
+	}
+
+	/* XXX not pin, but salt */
+	if ((argv[0] = es256_pk_encode(pk, 1)) == NULL ||
+	    (argv[1] = cbor_encode_pin_enc(ecdh, hmac_salt)) == NULL ||
+	    (argv[2] = cbor_encode_set_pin_auth(ecdh, hmac_salt)) == NULL) {
+		fido_log_debug("%s: cbor encode", __func__);
+		goto fail;
+	}
+
+	if ((param = cbor_flatten_vector(argv, 3)) == NULL) {
+		fido_log_debug("%s: cbor_flatten_vector", __func__);
+		goto fail;
+	}
+
+	if ((item = cbor_new_definite_map(1)) == NULL) {
+		fido_log_debug("%s: cbor_new_definite_map", __func__);
+		goto fail;
+	}
+
+	if ((pair.key = cbor_build_string("hmac-secret")) == NULL) {
+		fido_log_debug("%s: cbor_build", __func__);
+		goto fail;
+	}
+
+	pair.value = param;
+
+	if (!cbor_map_add(item, pair)) {
+		fido_log_debug("%s: cbor_map_add", __func__);
+		cbor_decref(&item);
+		item = NULL;
+		goto fail;
+	}
+
+fail:
+	for (size_t i = 0; i < 3; i++)
+		if (argv[i] != NULL)
+			cbor_decref(&argv[i]);
+
+	if (param != NULL)
+		cbor_decref(&param);
+	if (pair.key != NULL)
+		cbor_decref(&pair.key);
+
+	return (item);
+}
+
+int
+cbor_decode_fmt(const cbor_item_t *item, char **fmt)
+{
+	char	*type = NULL;
+
+	if (cbor_string_copy(item, &type) < 0) {
+		fido_log_debug("%s: cbor_string_copy", __func__);
+		return (-1);
+	}
+
+	if (strcmp(type, "packed") && strcmp(type, "fido-u2f")) {
+		fido_log_debug("%s: type=%s", __func__, type);
+		free(type);
+		return (-1);
+	}
+
+	*fmt = type;
+
+	return (0);
+}
+
+struct cose_key {
+	int kty;
+	int alg;
+	int crv;
+};
+
+static int
+find_cose_alg(const cbor_item_t *key, const cbor_item_t *val, void *arg)
+{
+	struct cose_key *cose_key = arg;
+
+	if (cbor_isa_uint(key) == true &&
+	    cbor_int_get_width(key) == CBOR_INT_8) {
+		switch (cbor_get_uint8(key)) {
+		case 1:
+			if (cbor_isa_uint(val) == false ||
+			    cbor_get_int(val) > INT_MAX || cose_key->kty != 0) {
+				fido_log_debug("%s: kty", __func__);
+				return (-1);
+			}
+
+			cose_key->kty = (int)cbor_get_int(val);
+
+			break;
+		case 3:
+			if (cbor_isa_negint(val) == false ||
+			    cbor_get_int(val) > INT_MAX || cose_key->alg != 0) {
+				fido_log_debug("%s: alg", __func__);
+				return (-1);
+			}
+
+			cose_key->alg = -(int)cbor_get_int(val) - 1;
+
+			break;
+		}
+	} else if (cbor_isa_negint(key) == true &&
+	    cbor_int_get_width(key) == CBOR_INT_8) {
+		if (cbor_get_uint8(key) == 0) {
+			/* get crv if not rsa, otherwise ignore */
+			if (cbor_isa_uint(val) == true &&
+			    cbor_get_int(val) <= INT_MAX &&
+			    cose_key->crv == 0)
+				cose_key->crv = (int)cbor_get_int(val);
+		}
+	}
+
+	return (0);
+}
+
+static int
+get_cose_alg(const cbor_item_t *item, int *cose_alg)
+{
+	struct cose_key cose_key;
+
+	memset(&cose_key, 0, sizeof(cose_key));
+
+	*cose_alg = 0;
+
+	if (cbor_isa_map(item) == false ||
+	    cbor_map_is_definite(item) == false ||
+	    cbor_map_iter(item, &cose_key, find_cose_alg) < 0) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (-1);
+	}
+
+	switch (cose_key.alg) {
+	case COSE_ES256:
+		if (cose_key.kty != COSE_KTY_EC2 ||
+		    cose_key.crv != COSE_P256) {
+			fido_log_debug("%s: invalid kty/crv", __func__);
+			return (-1);
+		}
+
+		break;
+	case COSE_EDDSA:
+		if (cose_key.kty != COSE_KTY_OKP ||
+		    cose_key.crv != COSE_ED25519) {
+			fido_log_debug("%s: invalid kty/crv", __func__);
+			return (-1);
+		}
+
+		break;
+	case COSE_RS256:
+		if (cose_key.kty != COSE_KTY_RSA) {
+			fido_log_debug("%s: invalid kty/crv", __func__);
+			return (-1);
+		}
+
+		break;
+	default:
+		fido_log_debug("%s: unknown alg %d", __func__, cose_key.alg);
+
+		return (-1);
+	}
+
+	*cose_alg = cose_key.alg;
+
+	return (0);
+}
+
+int
+cbor_decode_pubkey(const cbor_item_t *item, int *type, void *key)
+{
+	if (get_cose_alg(item, type) < 0) {
+		fido_log_debug("%s: get_cose_alg", __func__);
+		return (-1);
+	}
+
+	switch (*type) {
+	case COSE_ES256:
+		if (es256_pk_decode(item, key) < 0) {
+			fido_log_debug("%s: es256_pk_decode", __func__);
+			return (-1);
+		}
+		break;
+	case COSE_RS256:
+		if (rs256_pk_decode(item, key) < 0) {
+			fido_log_debug("%s: rs256_pk_decode", __func__);
+			return (-1);
+		}
+		break;
+	case COSE_EDDSA:
+		if (eddsa_pk_decode(item, key) < 0) {
+			fido_log_debug("%s: eddsa_pk_decode", __func__);
+			return (-1);
+		}
+		break;
+	default:
+		fido_log_debug("%s: invalid cose_alg %d", __func__, *type);
+		return (-1);
+	}
+
+	return (0);
+}
+
+static int
+decode_attcred(const unsigned char **buf, size_t *len, int cose_alg,
+    fido_attcred_t *attcred)
+{
+	cbor_item_t		*item = NULL;
+	struct cbor_load_result	 cbor;
+	uint16_t		 id_len;
+	int			 ok = -1;
+
+	fido_log_debug("%s: buf=%p, len=%zu", __func__, (const void *)*buf,
+	    *len);
+
+	if (fido_buf_read(buf, len, &attcred->aaguid,
+	    sizeof(attcred->aaguid)) < 0) {
+		fido_log_debug("%s: fido_buf_read aaguid", __func__);
+		return (-1);
+	}
+
+	if (fido_buf_read(buf, len, &id_len, sizeof(id_len)) < 0) {
+		fido_log_debug("%s: fido_buf_read id_len", __func__);
+		return (-1);
+	}
+
+	attcred->id.len = (size_t)be16toh(id_len);
+	if ((attcred->id.ptr = malloc(attcred->id.len)) == NULL)
+		return (-1);
+
+	fido_log_debug("%s: attcred->id.len=%zu", __func__, attcred->id.len);
+
+	if (fido_buf_read(buf, len, attcred->id.ptr, attcred->id.len) < 0) {
+		fido_log_debug("%s: fido_buf_read id", __func__);
+		return (-1);
+	}
+
+	if ((item = cbor_load(*buf, *len, &cbor)) == NULL) {
+		fido_log_debug("%s: cbor_load", __func__);
+		fido_log_xxd(*buf, *len);
+		goto fail;
+	}
+
+	if (cbor_decode_pubkey(item, &attcred->type, &attcred->pubkey) < 0) {
+		fido_log_debug("%s: cbor_decode_pubkey", __func__);
+		goto fail;
+	}
+
+	if (attcred->type != cose_alg) {
+		fido_log_debug("%s: cose_alg mismatch (%d != %d)", __func__,
+		    attcred->type, cose_alg);
+		goto fail;
+	}
+
+	*buf += cbor.read;
+	*len -= cbor.read;
+
+	ok = 0;
+fail:
+	if (item != NULL)
+		cbor_decref(&item);
+
+	return (ok);
+}
+
+static int
+decode_extension(const cbor_item_t *key, const cbor_item_t *val, void *arg)
+{
+	fido_cred_ext_t	*authdata_ext = arg;
+	char		*type = NULL;
+	int		 ok = -1;
+
+	if (cbor_string_copy(key, &type) < 0) {
+		fido_log_debug("%s: cbor type", __func__);
+		ok = 0; /* ignore */
+		goto out;
+	}
+
+	if (strcmp(type, "hmac-secret") == 0) {
+		if (cbor_isa_float_ctrl(val) == false ||
+		    cbor_float_get_width(val) != CBOR_FLOAT_0 ||
+		    cbor_is_bool(val) == false) {
+			fido_log_debug("%s: cbor type", __func__);
+			goto out;
+		}
+		if (cbor_ctrl_value(val) == CBOR_CTRL_TRUE)
+			authdata_ext->mask |= FIDO_EXT_HMAC_SECRET;
+	} else if (strcmp(type, "credProtect") == 0) {
+		if (cbor_isa_uint(val) == false ||
+		    cbor_int_get_width(val) != CBOR_INT_8) {
+			fido_log_debug("%s: cbor type", __func__);
+			goto out;
+		}
+		authdata_ext->mask |= FIDO_EXT_CRED_PROTECT;
+		authdata_ext->prot = cbor_get_uint8(val);
+	}
+
+	ok = 0;
+out:
+	free(type);
+
+	return (ok);
+}
+
+static int
+decode_extensions(const unsigned char **buf, size_t *len,
+    fido_cred_ext_t *authdata_ext)
+{
+	cbor_item_t		*item = NULL;
+	struct cbor_load_result	 cbor;
+	int			 ok = -1;
+
+	fido_log_debug("%s: buf=%p, len=%zu", __func__, (const void *)*buf,
+	    *len);
+	fido_log_xxd(*buf, *len);
+
+	memset(authdata_ext, 0, sizeof(*authdata_ext));
+
+	if ((item = cbor_load(*buf, *len, &cbor)) == NULL) {
+		fido_log_debug("%s: cbor_load", __func__);
+		fido_log_xxd(*buf, *len);
+		goto fail;
+	}
+
+	if (cbor_isa_map(item) == false ||
+	    cbor_map_is_definite(item) == false ||
+	    cbor_map_iter(item, authdata_ext, decode_extension) < 0) {
+		fido_log_debug("%s: cbor type", __func__);
+		goto fail;
+	}
+
+	*buf += cbor.read;
+	*len -= cbor.read;
+
+	ok = 0;
+fail:
+	if (item != NULL)
+		cbor_decref(&item);
+
+	return (ok);
+}
+
+static int
+decode_hmac_secret_aux(const cbor_item_t *key, const cbor_item_t *val, void *arg)
+{
+	fido_blob_t	*out = arg;
+	char		*type = NULL;
+	int		 ok = -1;
+
+	if (cbor_string_copy(key, &type) < 0 || strcmp(type, "hmac-secret")) {
+		fido_log_debug("%s: cbor type", __func__);
+		ok = 0; /* ignore */
+		goto out;
+	}
+
+	ok = cbor_bytestring_copy(val, &out->ptr, &out->len);
+out:
+	free(type);
+
+	return (ok);
+}
+
+static int
+decode_hmac_secret(const unsigned char **buf, size_t *len, fido_blob_t *out)
+{
+	cbor_item_t		*item = NULL;
+	struct cbor_load_result	 cbor;
+	int			 ok = -1;
+
+	fido_log_debug("%s: buf=%p, len=%zu", __func__, (const void *)*buf,
+	    *len);
+
+	if ((item = cbor_load(*buf, *len, &cbor)) == NULL) {
+		fido_log_debug("%s: cbor_load", __func__);
+		fido_log_xxd(*buf, *len);
+		goto fail;
+	}
+
+	if (cbor_isa_map(item) == false ||
+	    cbor_map_is_definite(item) == false ||
+	    cbor_map_size(item) != 1 ||
+	    cbor_map_iter(item, out, decode_hmac_secret_aux) < 0) {
+		fido_log_debug("%s: cbor type", __func__);
+		goto fail;
+	}
+
+	*buf += cbor.read;
+	*len -= cbor.read;
+
+	ok = 0;
+fail:
+	if (item != NULL)
+		cbor_decref(&item);
+
+	return (ok);
+}
+
+int
+cbor_decode_cred_authdata(const cbor_item_t *item, int cose_alg,
+    fido_blob_t *authdata_cbor, fido_authdata_t *authdata,
+    fido_attcred_t *attcred, fido_cred_ext_t *authdata_ext)
+{
+	const unsigned char	*buf = NULL;
+	size_t			 len;
+	size_t			 alloc_len;
+
+	if (cbor_isa_bytestring(item) == false ||
+	    cbor_bytestring_is_definite(item) == false) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (-1);
+	}
+
+	if (authdata_cbor->ptr != NULL ||
+	    (authdata_cbor->len = cbor_serialize_alloc(item,
+	    &authdata_cbor->ptr, &alloc_len)) == 0) {
+		fido_log_debug("%s: cbor_serialize_alloc", __func__);
+		return (-1);
+	}
+
+	buf = cbor_bytestring_handle(item);
+	len = cbor_bytestring_length(item);
+
+	fido_log_debug("%s: buf=%p, len=%zu", __func__, (const void *)buf, len);
+	fido_log_xxd(buf, len);
+
+	if (fido_buf_read(&buf, &len, authdata, sizeof(*authdata)) < 0) {
+		fido_log_debug("%s: fido_buf_read", __func__);
+		return (-1);
+	}
+
+	authdata->sigcount = be32toh(authdata->sigcount);
+
+	if (attcred != NULL) {
+		if ((authdata->flags & CTAP_AUTHDATA_ATT_CRED) == 0 ||
+		    decode_attcred(&buf, &len, cose_alg, attcred) < 0)
+			return (-1);
+	}
+
+	if (authdata_ext != NULL) {
+		if ((authdata->flags & CTAP_AUTHDATA_EXT_DATA) != 0 &&
+		    decode_extensions(&buf, &len, authdata_ext) < 0)
+			return (-1);
+	}
+
+	/* XXX we should probably ensure that len == 0 at this point */
+
+	return (FIDO_OK);
+}
+
+int
+cbor_decode_assert_authdata(const cbor_item_t *item, fido_blob_t *authdata_cbor,
+    fido_authdata_t *authdata, int *authdata_ext, fido_blob_t *hmac_secret_enc)
+{
+	const unsigned char	*buf = NULL;
+	size_t			 len;
+	size_t			 alloc_len;
+
+	if (cbor_isa_bytestring(item) == false ||
+	    cbor_bytestring_is_definite(item) == false) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (-1);
+	}
+
+	if (authdata_cbor->ptr != NULL ||
+	    (authdata_cbor->len = cbor_serialize_alloc(item,
+	    &authdata_cbor->ptr, &alloc_len)) == 0) {
+		fido_log_debug("%s: cbor_serialize_alloc", __func__);
+		return (-1);
+	}
+
+	buf = cbor_bytestring_handle(item);
+	len = cbor_bytestring_length(item);
+
+	fido_log_debug("%s: buf=%p, len=%zu", __func__, (const void *)buf, len);
+
+	if (fido_buf_read(&buf, &len, authdata, sizeof(*authdata)) < 0) {
+		fido_log_debug("%s: fido_buf_read", __func__);
+		return (-1);
+	}
+
+	authdata->sigcount = be32toh(authdata->sigcount);
+
+	*authdata_ext = 0;
+	if ((authdata->flags & CTAP_AUTHDATA_EXT_DATA) != 0) {
+		/* XXX semantic leap: extensions -> hmac_secret */
+		if (decode_hmac_secret(&buf, &len, hmac_secret_enc) < 0) {
+			fido_log_debug("%s: decode_hmac_secret", __func__);
+			return (-1);
+		}
+		*authdata_ext = FIDO_EXT_HMAC_SECRET;
+	}
+
+	/* XXX we should probably ensure that len == 0 at this point */
+
+	return (FIDO_OK);
+}
+
+static int
+decode_x5c(const cbor_item_t *item, void *arg)
+{
+	fido_blob_t *x5c = arg;
+
+	if (x5c->len)
+		return (0); /* ignore */
+
+	return (cbor_bytestring_copy(item, &x5c->ptr, &x5c->len));
+}
+
+static int
+decode_attstmt_entry(const cbor_item_t *key, const cbor_item_t *val, void *arg)
+{
+	fido_attstmt_t	*attstmt = arg;
+	char		*name = NULL;
+	int		 cose_alg = 0;
+	int		 ok = -1;
+
+	if (cbor_string_copy(key, &name) < 0) {
+		fido_log_debug("%s: cbor type", __func__);
+		ok = 0; /* ignore */
+		goto out;
+	}
+
+	if (!strcmp(name, "alg")) {
+		if (cbor_isa_negint(val) == false ||
+		    cbor_get_int(val) > UINT16_MAX) {
+			fido_log_debug("%s: alg", __func__);
+			goto out;
+		}
+		if ((cose_alg = -(int)cbor_get_int(val) - 1) != COSE_ES256 &&
+		    cose_alg != COSE_RS256 && cose_alg != COSE_EDDSA) {
+			fido_log_debug("%s: unsupported cose_alg=%d", __func__,
+			    cose_alg);
+			goto out;
+		}
+	} else if (!strcmp(name, "sig")) {
+		if (cbor_bytestring_copy(val, &attstmt->sig.ptr,
+		    &attstmt->sig.len) < 0) {
+			fido_log_debug("%s: sig", __func__);
+			goto out;
+		}
+	} else if (!strcmp(name, "x5c")) {
+		if (cbor_isa_array(val) == false ||
+		    cbor_array_is_definite(val) == false ||
+		    cbor_array_iter(val, &attstmt->x5c, decode_x5c) < 0) {
+			fido_log_debug("%s: x5c", __func__);
+			goto out;
+		}
+	}
+
+	ok = 0;
+out:
+	free(name);
+
+	return (ok);
+}
+
+int
+cbor_decode_attstmt(const cbor_item_t *item, fido_attstmt_t *attstmt)
+{
+	if (cbor_isa_map(item) == false ||
+	    cbor_map_is_definite(item) == false ||
+	    cbor_map_iter(item, attstmt, decode_attstmt_entry) < 0) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (-1);
+	}
+
+	return (0);
+}
+
+int
+cbor_decode_uint64(const cbor_item_t *item, uint64_t *n)
+{
+	if (cbor_isa_uint(item) == false) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (-1);
+	}
+
+	*n = cbor_get_int(item);
+
+	return (0);
+}
+
+static int
+decode_cred_id_entry(const cbor_item_t *key, const cbor_item_t *val, void *arg)
+{
+	fido_blob_t	*id = arg;
+	char		*name = NULL;
+	int		 ok = -1;
+
+	if (cbor_string_copy(key, &name) < 0) {
+		fido_log_debug("%s: cbor type", __func__);
+		ok = 0; /* ignore */
+		goto out;
+	}
+
+	if (!strcmp(name, "id"))
+		if (cbor_bytestring_copy(val, &id->ptr, &id->len) < 0) {
+			fido_log_debug("%s: cbor_bytestring_copy", __func__);
+			goto out;
+		}
+
+	ok = 0;
+out:
+	free(name);
+
+	return (ok);
+}
+
+int
+cbor_decode_cred_id(const cbor_item_t *item, fido_blob_t *id)
+{
+	if (cbor_isa_map(item) == false ||
+	    cbor_map_is_definite(item) == false ||
+	    cbor_map_iter(item, id, decode_cred_id_entry) < 0) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (-1);
+	}
+
+	return (0);
+}
+
+static int
+decode_user_entry(const cbor_item_t *key, const cbor_item_t *val, void *arg)
+{
+	fido_user_t	*user = arg;
+	char		*name = NULL;
+	int		 ok = -1;
+
+	if (cbor_string_copy(key, &name) < 0) {
+		fido_log_debug("%s: cbor type", __func__);
+		ok = 0; /* ignore */
+		goto out;
+	}
+
+	if (!strcmp(name, "icon")) {
+		if (cbor_string_copy(val, &user->icon) < 0) {
+			fido_log_debug("%s: icon", __func__);
+			goto out;
+		}
+	} else if (!strcmp(name, "name")) {
+		if (cbor_string_copy(val, &user->name) < 0) {
+			fido_log_debug("%s: name", __func__);
+			goto out;
+		}
+	} else if (!strcmp(name, "displayName")) {
+		if (cbor_string_copy(val, &user->display_name) < 0) {
+			fido_log_debug("%s: display_name", __func__);
+			goto out;
+		}
+	} else if (!strcmp(name, "id")) {
+		if (cbor_bytestring_copy(val, &user->id.ptr, &user->id.len) < 0) {
+			fido_log_debug("%s: id", __func__);
+			goto out;
+		}
+	}
+
+	ok = 0;
+out:
+	free(name);
+
+	return (ok);
+}
+
+int
+cbor_decode_user(const cbor_item_t *item, fido_user_t *user)
+{
+	if (cbor_isa_map(item) == false ||
+	    cbor_map_is_definite(item) == false ||
+	    cbor_map_iter(item, user, decode_user_entry) < 0) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (-1);
+	}
+
+	return (0);
+}
+
+static int
+decode_rp_entity_entry(const cbor_item_t *key, const cbor_item_t *val,
+    void *arg)
+{
+	fido_rp_t	*rp = arg;
+	char		*name = NULL;
+	int		 ok = -1;
+
+	if (cbor_string_copy(key, &name) < 0) {
+		fido_log_debug("%s: cbor type", __func__);
+		ok = 0; /* ignore */
+		goto out;
+	}
+
+	if (!strcmp(name, "id")) {
+		if (cbor_string_copy(val, &rp->id) < 0) {
+			fido_log_debug("%s: id", __func__);
+			goto out;
+		}
+	} else if (!strcmp(name, "name")) {
+		if (cbor_string_copy(val, &rp->name) < 0) {
+			fido_log_debug("%s: name", __func__);
+			goto out;
+		}
+	}
+
+	ok = 0;
+out:
+	free(name);
+
+	return (ok);
+}
+
+int
+cbor_decode_rp_entity(const cbor_item_t *item, fido_rp_t *rp)
+{
+	if (cbor_isa_map(item) == false ||
+	    cbor_map_is_definite(item) == false ||
+	    cbor_map_iter(item, rp, decode_rp_entity_entry) < 0) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (-1);
+	}
+
+	return (0);
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/CMakeLists.txt mysql-8.0-8.0.27/extra/libfido2/src/CMakeLists.txt
--- mysql-8.0-8.0.26/extra/libfido2/src/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,105 @@
+# Copyright (c) 2018 Yubico AB. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+add_definitions(-D_FIDO_INTERNAL)
+
+list(APPEND FIDO_SOURCES
+	aes256.c
+	assert.c
+	authkey.c
+	bio.c
+	blob.c
+	buf.c
+	cbor.c
+	cred.c
+	credman.c
+	dev.c
+	ecdh.c
+	eddsa.c
+	err.c
+	es256.c
+	hid.c
+	info.c
+	io.c
+	iso7816.c
+	log.c
+	pin.c
+	reset.c
+	rs256.c
+	u2f.c
+)
+
+if(FUZZ)
+	list(APPEND FIDO_SOURCES ../fuzz/prng.c)
+	list(APPEND FIDO_SOURCES ../fuzz/uniform_random.c)
+	list(APPEND FIDO_SOURCES ../fuzz/wrap.c)
+endif()
+
+if(USE_HIDAPI)
+	list(APPEND FIDO_SOURCES hid_hidapi.c)
+elseif(WIN32)
+	list(APPEND FIDO_SOURCES hid_win.c)
+elseif(APPLE)
+	list(APPEND FIDO_SOURCES hid_osx.c)
+elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+	list(APPEND FIDO_SOURCES hid_linux.c)
+elseif(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
+	list(APPEND FIDO_SOURCES hid_openbsd.c)
+else()
+	message(FATAL_ERROR "please define a hid backend for your platform")
+endif()
+
+if(NOT MSVC)
+	set_source_files_properties(${FIDO_SOURCES} PROPERTIES COMPILE_FLAGS
+	    "-Wconversion -Wsign-conversion")
+endif()
+
+list(APPEND COMPAT_SOURCES
+	../openbsd-compat/bsd-getpagesize.c
+	../openbsd-compat/explicit_bzero.c
+	../openbsd-compat/explicit_bzero_win32.c
+	../openbsd-compat/recallocarray.c
+	../openbsd-compat/strlcat.c
+	../openbsd-compat/timingsafe_bcmp.c
+)
+
+# dynamic library
+add_library(fido2 SHARED ${FIDO_SOURCES} ${COMPAT_SOURCES})
+
+target_link_libraries(fido2 cbor ${CRYPTO_LIBRARY}
+	${UDEV_LIBRARIES} ${BASE_LIBRARIES} ${HIDAPI_LIBRARIES})
+if(WIN32)
+	if (MINGW)
+		target_link_libraries(fido2 wsock32 ws2_32 bcrypt
+			setupapi hid)
+	else()
+		target_link_libraries(fido2 wsock32 ws2_32 bcrypt
+			SetupAPI hid)
+	endif()
+elseif(APPLE)
+	target_link_libraries(fido2 "-framework CoreFoundation"
+		"-framework IOKit")
+endif()
+
+set_target_properties(fido2 PROPERTIES OUTPUT_NAME fido2
+	VERSION ${FIDO_VERSION} SOVERSION ${FIDO_MAJOR})
+
+SET_TARGET_PROPERTIES(fido2 PROPERTIES
+  DEBUG_POSTFIX ""
+  LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/library_output_directory
+  RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/library_output_directory
+  )
+
+IF(WITH_AUTHENTICATION_FIDO OR WITH_AUTHENTICATION_CLIENT_PLUGINS)
+  INSTALL_PRIVATE_LIBRARY(fido2)
+ENDIF()
+ADD_OBJDUMP_TARGET(show_fido2 "$<TARGET_FILE:fido2>" DEPENDS fido2)
+
+# On Linux libcrypto.so.1.1 will be installed in the same
+# directory as libfido2.so.1
+IF(CRYPTO_CUSTOM_LIBRARY)
+  ADD_INSTALL_RPATH(fido2 "\$ORIGIN")
+ENDIF()
+
+SET_PATH_TO_CUSTOM_SSL_FOR_APPLE(fido2)
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/cred.c mysql-8.0-8.0.27/extra/libfido2/src/cred.c
--- mysql-8.0-8.0.26/extra/libfido2/src/cred.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/cred.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,1028 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <openssl/ec.h>
+#include <openssl/evp.h>
+#include <openssl/sha.h>
+#include <openssl/x509.h>
+
+#include <string.h>
+#include "fido.h"
+#include "fido/es256.h"
+
+static int
+parse_makecred_reply(const cbor_item_t *key, const cbor_item_t *val, void *arg)
+{
+	fido_cred_t *cred = arg;
+
+	if (cbor_isa_uint(key) == false ||
+	    cbor_int_get_width(key) != CBOR_INT_8) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (0); /* ignore */
+	}
+
+	switch (cbor_get_uint8(key)) {
+	case 1: /* fmt */
+		return (cbor_decode_fmt(val, &cred->fmt));
+	case 2: /* authdata */
+		return (cbor_decode_cred_authdata(val, cred->type,
+		    &cred->authdata_cbor, &cred->authdata, &cred->attcred,
+		    &cred->authdata_ext));
+	case 3: /* attestation statement */
+		return (cbor_decode_attstmt(val, &cred->attstmt));
+	default: /* ignore */
+		fido_log_debug("%s: cbor type", __func__);
+		return (0);
+	}
+}
+
+static int
+fido_dev_make_cred_tx(fido_dev_t *dev, fido_cred_t *cred, const char *pin)
+{
+	fido_blob_t	 f;
+	fido_blob_t	*ecdh = NULL;
+	es256_pk_t	*pk = NULL;
+	cbor_item_t	*argv[9];
+	int		 r;
+
+	memset(&f, 0, sizeof(f));
+	memset(argv, 0, sizeof(argv));
+
+	if (cred->cdh.ptr == NULL || cred->type == 0) {
+		fido_log_debug("%s: cdh=%p, type=%d", __func__,
+		    (void *)cred->cdh.ptr, cred->type);
+		r = FIDO_ERR_INVALID_ARGUMENT;
+		goto fail;
+	}
+
+	if ((argv[0] = fido_blob_encode(&cred->cdh)) == NULL ||
+	    (argv[1] = cbor_encode_rp_entity(&cred->rp)) == NULL ||
+	    (argv[2] = cbor_encode_user_entity(&cred->user)) == NULL ||
+	    (argv[3] = cbor_encode_pubkey_param(cred->type)) == NULL) {
+		fido_log_debug("%s: cbor encode", __func__);
+		r = FIDO_ERR_INTERNAL;
+		goto fail;
+	}
+
+	/* excluded credentials */
+	if (cred->excl.len)
+		if ((argv[4] = cbor_encode_pubkey_list(&cred->excl)) == NULL) {
+			fido_log_debug("%s: cbor_encode_pubkey_list", __func__);
+			r = FIDO_ERR_INTERNAL;
+			goto fail;
+		}
+
+	/* extensions */
+	if (cred->ext.mask)
+		if ((argv[5] = cbor_encode_extensions(&cred->ext)) == NULL) {
+			fido_log_debug("%s: cbor_encode_extensions", __func__);
+			r = FIDO_ERR_INTERNAL;
+			goto fail;
+		}
+
+	/* options */
+	if (cred->rk != FIDO_OPT_OMIT || cred->uv != FIDO_OPT_OMIT)
+		if ((argv[6] = cbor_encode_options(cred->rk,
+		    cred->uv)) == NULL) {
+			fido_log_debug("%s: cbor_encode_options", __func__);
+			r = FIDO_ERR_INTERNAL;
+			goto fail;
+		}
+
+	/* pin authentication */
+	if (pin) {
+		if ((r = fido_do_ecdh(dev, &pk, &ecdh)) != FIDO_OK) {
+			fido_log_debug("%s: fido_do_ecdh", __func__);
+			goto fail;
+		}
+		if ((r = cbor_add_pin_params(dev, &cred->cdh, pk, ecdh, pin,
+		    &argv[7], &argv[8])) != FIDO_OK) {
+			fido_log_debug("%s: cbor_add_pin_params", __func__);
+			goto fail;
+		}
+	}
+
+	/* framing and transmission */
+	if (cbor_build_frame(CTAP_CBOR_MAKECRED, argv, nitems(argv), &f) < 0 ||
+	    fido_tx(dev, CTAP_CMD_CBOR, f.ptr, f.len) < 0) {
+		fido_log_debug("%s: fido_tx", __func__);
+		r = FIDO_ERR_TX;
+		goto fail;
+	}
+
+	r = FIDO_OK;
+fail:
+	es256_pk_free(&pk);
+	fido_blob_free(&ecdh);
+	cbor_vector_free(argv, nitems(argv));
+	free(f.ptr);
+
+	return (r);
+}
+
+static int
+fido_dev_make_cred_rx(fido_dev_t *dev, fido_cred_t *cred, int ms)
+{
+	unsigned char	reply[FIDO_MAXMSG];
+	int		reply_len;
+	int		r;
+
+	fido_cred_reset_rx(cred);
+
+	if ((reply_len = fido_rx(dev, CTAP_CMD_CBOR, &reply, sizeof(reply),
+	    ms)) < 0) {
+		fido_log_debug("%s: fido_rx", __func__);
+		return (FIDO_ERR_RX);
+	}
+
+	if ((r = cbor_parse_reply(reply, (size_t)reply_len, cred,
+	    parse_makecred_reply)) != FIDO_OK) {
+		fido_log_debug("%s: parse_makecred_reply", __func__);
+		return (r);
+	}
+
+	if (cred->fmt == NULL || fido_blob_is_empty(&cred->authdata_cbor) ||
+	    fido_blob_is_empty(&cred->attcred.id) ||
+	    fido_blob_is_empty(&cred->attstmt.sig)) {
+		fido_cred_reset_rx(cred);
+		return (FIDO_ERR_INVALID_CBOR);
+	}
+
+	return (FIDO_OK);
+}
+
+static int
+fido_dev_make_cred_wait(fido_dev_t *dev, fido_cred_t *cred, const char *pin, int ms)
+{
+	int  r;
+
+	if ((r = fido_dev_make_cred_tx(dev, cred, pin)) != FIDO_OK ||
+	    (r = fido_dev_make_cred_rx(dev, cred, ms)) != FIDO_OK)
+		return (r);
+
+	return (FIDO_OK);
+}
+
+int
+fido_dev_make_cred(fido_dev_t *dev, fido_cred_t *cred, const char *pin)
+{
+	if (fido_dev_is_fido2(dev) == false) {
+		if (pin != NULL || cred->rk == FIDO_OPT_TRUE ||
+		    cred->ext.mask != 0)
+			return (FIDO_ERR_UNSUPPORTED_OPTION);
+		return (u2f_register(dev, cred, -1));
+	}
+
+	return (fido_dev_make_cred_wait(dev, cred, pin, -1));
+}
+
+static int
+check_extensions(const fido_cred_ext_t *authdata_ext, const fido_cred_ext_t *ext)
+{
+	return (timingsafe_bcmp(authdata_ext, ext, sizeof(*authdata_ext)));
+}
+
+int
+fido_check_rp_id(const char *id, const unsigned char *obtained_hash)
+{
+	unsigned char expected_hash[SHA256_DIGEST_LENGTH];
+
+	explicit_bzero(expected_hash, sizeof(expected_hash));
+
+	if (SHA256((const unsigned char *)id, strlen(id),
+	    expected_hash) != expected_hash) {
+		fido_log_debug("%s: sha256", __func__);
+		return (-1);
+	}
+
+	return (timingsafe_bcmp(expected_hash, obtained_hash,
+	    SHA256_DIGEST_LENGTH));
+}
+
+static int
+get_signed_hash_u2f(fido_blob_t *dgst, const unsigned char *rp_id,
+    size_t rp_id_len, const fido_blob_t *clientdata, const fido_blob_t *id,
+    const es256_pk_t *pk)
+{
+	const uint8_t		zero = 0;
+	const uint8_t		four = 4; /* uncompressed point */
+	SHA256_CTX		ctx;
+
+	if (dgst->len != SHA256_DIGEST_LENGTH || SHA256_Init(&ctx) == 0 ||
+	    SHA256_Update(&ctx, &zero, sizeof(zero)) == 0 ||
+	    SHA256_Update(&ctx, rp_id, rp_id_len) == 0 ||
+	    SHA256_Update(&ctx, clientdata->ptr, clientdata->len) == 0 ||
+	    SHA256_Update(&ctx, id->ptr, id->len) == 0 ||
+	    SHA256_Update(&ctx, &four, sizeof(four)) == 0 ||
+	    SHA256_Update(&ctx, pk->x, sizeof(pk->x)) == 0 ||
+	    SHA256_Update(&ctx, pk->y, sizeof(pk->y)) == 0 ||
+	    SHA256_Final(dgst->ptr, &ctx) == 0) {
+		fido_log_debug("%s: sha256", __func__);
+		return (-1);
+	}
+
+	return (0);
+}
+
+static int
+verify_sig(const fido_blob_t *dgst, const fido_blob_t *x5c,
+    const fido_blob_t *sig)
+{
+	BIO		*rawcert = NULL;
+	X509		*cert = NULL;
+	EVP_PKEY	*pkey = NULL;
+	EC_KEY		*ec;
+	int		 ok = -1;
+
+	/* openssl needs ints */
+	if (dgst->len > INT_MAX || x5c->len > INT_MAX || sig->len > INT_MAX) {
+		fido_log_debug("%s: dgst->len=%zu, x5c->len=%zu, sig->len=%zu",
+		    __func__, dgst->len, x5c->len, sig->len);
+		return (-1);
+	}
+
+	/* fetch key from x509 */
+	if ((rawcert = BIO_new_mem_buf(x5c->ptr, (int)x5c->len)) == NULL ||
+	    (cert = d2i_X509_bio(rawcert, NULL)) == NULL ||
+	    (pkey = X509_get_pubkey(cert)) == NULL ||
+	    (ec = EVP_PKEY_get0_EC_KEY(pkey)) == NULL) {
+		fido_log_debug("%s: x509 key", __func__);
+		goto fail;
+	}
+
+	if (ECDSA_verify(0, dgst->ptr, (int)dgst->len, sig->ptr,
+	    (int)sig->len, ec) != 1) {
+		fido_log_debug("%s: ECDSA_verify", __func__);
+		goto fail;
+	}
+
+	ok = 0;
+fail:
+	if (rawcert != NULL)
+		BIO_free(rawcert);
+	if (cert != NULL)
+		X509_free(cert);
+	if (pkey != NULL)
+		EVP_PKEY_free(pkey);
+
+	return (ok);
+}
+
+int
+fido_cred_verify(const fido_cred_t *cred)
+{
+	unsigned char	buf[SHA256_DIGEST_LENGTH];
+	fido_blob_t	dgst;
+	int		r;
+
+	dgst.ptr = buf;
+	dgst.len = sizeof(buf);
+
+	/* do we have everything we need? */
+	if (cred->cdh.ptr == NULL || cred->authdata_cbor.ptr == NULL ||
+	    cred->attstmt.x5c.ptr == NULL || cred->attstmt.sig.ptr == NULL ||
+	    cred->fmt == NULL || cred->attcred.id.ptr == NULL ||
+	    cred->rp.id == NULL) {
+		fido_log_debug("%s: cdh=%p, authdata=%p, x5c=%p, sig=%p, "
+		    "fmt=%p id=%p, rp.id=%s", __func__, (void *)cred->cdh.ptr,
+		    (void *)cred->authdata_cbor.ptr,
+		    (void *)cred->attstmt.x5c.ptr,
+		    (void *)cred->attstmt.sig.ptr, (void *)cred->fmt,
+		    (void *)cred->attcred.id.ptr, cred->rp.id);
+		r = FIDO_ERR_INVALID_ARGUMENT;
+		goto out;
+	}
+
+	if (fido_check_rp_id(cred->rp.id, cred->authdata.rp_id_hash) != 0) {
+		fido_log_debug("%s: fido_check_rp_id", __func__);
+		r = FIDO_ERR_INVALID_PARAM;
+		goto out;
+	}
+
+	if (fido_check_flags(cred->authdata.flags, FIDO_OPT_TRUE,
+	    cred->uv) < 0) {
+		fido_log_debug("%s: fido_check_flags", __func__);
+		r = FIDO_ERR_INVALID_PARAM;
+		goto out;
+	}
+
+	if (check_extensions(&cred->authdata_ext, &cred->ext) != 0) {
+		fido_log_debug("%s: check_extensions", __func__);
+		r = FIDO_ERR_INVALID_PARAM;
+		goto out;
+	}
+
+	if (!strcmp(cred->fmt, "packed")) {
+		if (fido_get_signed_hash(COSE_ES256, &dgst, &cred->cdh,
+		    &cred->authdata_cbor) < 0) {
+			fido_log_debug("%s: fido_get_signed_hash", __func__);
+			r = FIDO_ERR_INTERNAL;
+			goto out;
+		}
+	} else {
+		if (get_signed_hash_u2f(&dgst, cred->authdata.rp_id_hash,
+		    sizeof(cred->authdata.rp_id_hash), &cred->cdh,
+		    &cred->attcred.id, &cred->attcred.pubkey.es256) < 0) {
+			fido_log_debug("%s: get_signed_hash_u2f", __func__);
+			r = FIDO_ERR_INTERNAL;
+			goto out;
+		}
+	}
+
+	if (verify_sig(&dgst, &cred->attstmt.x5c, &cred->attstmt.sig) < 0) {
+		fido_log_debug("%s: verify_sig", __func__);
+		r = FIDO_ERR_INVALID_SIG;
+		goto out;
+	}
+
+	r = FIDO_OK;
+out:
+	explicit_bzero(buf, sizeof(buf));
+
+	return (r);
+}
+
+int
+fido_cred_verify_self(const fido_cred_t *cred)
+{
+	unsigned char	buf[1024]; /* XXX */
+	fido_blob_t	dgst;
+	int		ok = -1;
+	int		r;
+
+	dgst.ptr = buf;
+	dgst.len = sizeof(buf);
+
+	/* do we have everything we need? */
+	if (cred->cdh.ptr == NULL || cred->authdata_cbor.ptr == NULL ||
+	    cred->attstmt.x5c.ptr != NULL || cred->attstmt.sig.ptr == NULL ||
+	    cred->fmt == NULL || cred->attcred.id.ptr == NULL ||
+	    cred->rp.id == NULL) {
+		fido_log_debug("%s: cdh=%p, authdata=%p, x5c=%p, sig=%p, "
+		    "fmt=%p id=%p, rp.id=%s", __func__, (void *)cred->cdh.ptr,
+		    (void *)cred->authdata_cbor.ptr,
+		    (void *)cred->attstmt.x5c.ptr,
+		    (void *)cred->attstmt.sig.ptr, (void *)cred->fmt,
+		    (void *)cred->attcred.id.ptr, cred->rp.id);
+		r = FIDO_ERR_INVALID_ARGUMENT;
+		goto out;
+	}
+
+	if (fido_check_rp_id(cred->rp.id, cred->authdata.rp_id_hash) != 0) {
+		fido_log_debug("%s: fido_check_rp_id", __func__);
+		r = FIDO_ERR_INVALID_PARAM;
+		goto out;
+	}
+
+	if (fido_check_flags(cred->authdata.flags, FIDO_OPT_TRUE,
+	    cred->uv) < 0) {
+		fido_log_debug("%s: fido_check_flags", __func__);
+		r = FIDO_ERR_INVALID_PARAM;
+		goto out;
+	}
+
+	if (check_extensions(&cred->authdata_ext, &cred->ext) != 0) {
+		fido_log_debug("%s: check_extensions", __func__);
+		r = FIDO_ERR_INVALID_PARAM;
+		goto out;
+	}
+
+	if (!strcmp(cred->fmt, "packed")) {
+		if (fido_get_signed_hash(cred->attcred.type, &dgst, &cred->cdh,
+		    &cred->authdata_cbor) < 0) {
+			fido_log_debug("%s: fido_get_signed_hash", __func__);
+			r = FIDO_ERR_INTERNAL;
+			goto out;
+		}
+	} else {
+		if (get_signed_hash_u2f(&dgst, cred->authdata.rp_id_hash,
+		    sizeof(cred->authdata.rp_id_hash), &cred->cdh,
+		    &cred->attcred.id, &cred->attcred.pubkey.es256) < 0) {
+			fido_log_debug("%s: get_signed_hash_u2f", __func__);
+			r = FIDO_ERR_INTERNAL;
+			goto out;
+		}
+	}
+
+	switch (cred->attcred.type) {
+	case COSE_ES256:
+		ok = fido_verify_sig_es256(&dgst, &cred->attcred.pubkey.es256,
+		    &cred->attstmt.sig);
+		break;
+	case COSE_RS256:
+		ok = fido_verify_sig_rs256(&dgst, &cred->attcred.pubkey.rs256,
+		    &cred->attstmt.sig);
+		break;
+	case COSE_EDDSA:
+		ok = fido_verify_sig_eddsa(&dgst, &cred->attcred.pubkey.eddsa,
+		    &cred->attstmt.sig);
+		break;
+	default:
+		fido_log_debug("%s: unsupported cose_alg %d", __func__,
+		    cred->attcred.type);
+		r = FIDO_ERR_UNSUPPORTED_OPTION;
+		goto out;
+	}
+
+	if (ok < 0)
+		r = FIDO_ERR_INVALID_SIG;
+	else
+		r = FIDO_OK;
+
+out:
+	explicit_bzero(buf, sizeof(buf));
+
+	return (r);
+}
+
+fido_cred_t *
+fido_cred_new(void)
+{
+	return (calloc(1, sizeof(fido_cred_t)));
+}
+
+static void
+fido_cred_clean_authdata(fido_cred_t *cred)
+{
+	free(cred->authdata_cbor.ptr);
+	free(cred->attcred.id.ptr);
+
+	memset(&cred->authdata_ext, 0, sizeof(cred->authdata_ext));
+	memset(&cred->authdata_cbor, 0, sizeof(cred->authdata_cbor));
+	memset(&cred->authdata, 0, sizeof(cred->authdata));
+	memset(&cred->attcred, 0, sizeof(cred->attcred));
+}
+
+void
+fido_cred_reset_tx(fido_cred_t *cred)
+{
+	free(cred->cdh.ptr);
+	free(cred->rp.id);
+	free(cred->rp.name);
+	free(cred->user.id.ptr);
+	free(cred->user.icon);
+	free(cred->user.name);
+	free(cred->user.display_name);
+	fido_free_blob_array(&cred->excl);
+
+	memset(&cred->cdh, 0, sizeof(cred->cdh));
+	memset(&cred->rp, 0, sizeof(cred->rp));
+	memset(&cred->user, 0, sizeof(cred->user));
+	memset(&cred->excl, 0, sizeof(cred->excl));
+	memset(&cred->ext, 0, sizeof(cred->ext));
+
+	cred->type = 0;
+	cred->rk = FIDO_OPT_OMIT;
+	cred->uv = FIDO_OPT_OMIT;
+}
+
+static void
+fido_cred_clean_x509(fido_cred_t *cred)
+{
+	free(cred->attstmt.x5c.ptr);
+	cred->attstmt.x5c.ptr = NULL;
+	cred->attstmt.x5c.len = 0;
+}
+
+static void
+fido_cred_clean_sig(fido_cred_t *cred)
+{
+	free(cred->attstmt.sig.ptr);
+	cred->attstmt.sig.ptr = NULL;
+	cred->attstmt.sig.len = 0;
+}
+
+void
+fido_cred_reset_rx(fido_cred_t *cred)
+{
+	free(cred->fmt);
+	cred->fmt = NULL;
+
+	fido_cred_clean_authdata(cred);
+	fido_cred_clean_x509(cred);
+	fido_cred_clean_sig(cred);
+}
+
+void
+fido_cred_free(fido_cred_t **cred_p)
+{
+	fido_cred_t *cred;
+
+	if (cred_p == NULL || (cred = *cred_p) == NULL)
+		return;
+
+	fido_cred_reset_tx(cred);
+	fido_cred_reset_rx(cred);
+
+	free(cred);
+
+	*cred_p = NULL;
+}
+
+int
+fido_cred_set_authdata(fido_cred_t *cred, const unsigned char *ptr, size_t len)
+{
+	cbor_item_t		*item = NULL;
+	struct cbor_load_result	 cbor;
+	int			 r;
+
+	fido_cred_clean_authdata(cred);
+
+	if (ptr == NULL || len == 0) {
+		r = FIDO_ERR_INVALID_ARGUMENT;
+		goto fail;
+	}
+
+	if ((item = cbor_load(ptr, len, &cbor)) == NULL) {
+		fido_log_debug("%s: cbor_load", __func__);
+		r = FIDO_ERR_INVALID_ARGUMENT;
+		goto fail;
+	}
+
+	if (cbor_decode_cred_authdata(item, cred->type, &cred->authdata_cbor,
+	    &cred->authdata, &cred->attcred, &cred->authdata_ext) < 0) {
+		fido_log_debug("%s: cbor_decode_cred_authdata", __func__);
+		r = FIDO_ERR_INVALID_ARGUMENT;
+		goto fail;
+	}
+
+	r = FIDO_OK;
+fail:
+	if (item != NULL)
+		cbor_decref(&item);
+
+	if (r != FIDO_OK)
+		fido_cred_clean_authdata(cred);
+
+	return (r);
+
+}
+
+int
+fido_cred_set_authdata_raw(fido_cred_t *cred, const unsigned char *ptr,
+    size_t len)
+{
+	cbor_item_t		*item = NULL;
+	int			 r;
+
+	fido_cred_clean_authdata(cred);
+
+	if (ptr == NULL || len == 0) {
+		r = FIDO_ERR_INVALID_ARGUMENT;
+		goto fail;
+	}
+
+	if ((item = cbor_build_bytestring(ptr, len)) == NULL) {
+		fido_log_debug("%s: cbor_build_bytestring", __func__);
+		r = FIDO_ERR_INTERNAL;
+		goto fail;
+	}
+
+	if (cbor_decode_cred_authdata(item, cred->type, &cred->authdata_cbor,
+	    &cred->authdata, &cred->attcred, &cred->authdata_ext) < 0) {
+		fido_log_debug("%s: cbor_decode_cred_authdata", __func__);
+		r = FIDO_ERR_INVALID_ARGUMENT;
+		goto fail;
+	}
+
+	r = FIDO_OK;
+fail:
+	if (item != NULL)
+		cbor_decref(&item);
+
+	if (r != FIDO_OK)
+		fido_cred_clean_authdata(cred);
+
+	return (r);
+
+}
+
+int
+fido_cred_set_x509(fido_cred_t *cred, const unsigned char *ptr, size_t len)
+{
+	unsigned char *x509;
+
+	fido_cred_clean_x509(cred);
+
+	if (ptr == NULL || len == 0)
+		return (FIDO_ERR_INVALID_ARGUMENT);
+	if ((x509 = malloc(len)) == NULL)
+		return (FIDO_ERR_INTERNAL);
+
+	memcpy(x509, ptr, len);
+	cred->attstmt.x5c.ptr = x509;
+	cred->attstmt.x5c.len = len;
+
+	return (FIDO_OK);
+}
+
+int
+fido_cred_set_sig(fido_cred_t *cred, const unsigned char *ptr, size_t len)
+{
+	unsigned char *sig;
+
+	fido_cred_clean_sig(cred);
+
+	if (ptr == NULL || len == 0)
+		return (FIDO_ERR_INVALID_ARGUMENT);
+	if ((sig = malloc(len)) == NULL)
+		return (FIDO_ERR_INTERNAL);
+
+	memcpy(sig, ptr, len);
+	cred->attstmt.sig.ptr = sig;
+	cred->attstmt.sig.len = len;
+
+	return (FIDO_OK);
+}
+
+int
+fido_cred_exclude(fido_cred_t *cred, const unsigned char *id_ptr, size_t id_len)
+{
+	fido_blob_t id_blob;
+	fido_blob_t *list_ptr;
+
+	memset(&id_blob, 0, sizeof(id_blob));
+
+	if (fido_blob_set(&id_blob, id_ptr, id_len) < 0)
+		return (FIDO_ERR_INVALID_ARGUMENT);
+
+	if (cred->excl.len == SIZE_MAX) {
+		free(id_blob.ptr);
+		return (FIDO_ERR_INVALID_ARGUMENT);
+	}
+
+	if ((list_ptr = recallocarray(cred->excl.ptr, cred->excl.len,
+	    cred->excl.len + 1, sizeof(fido_blob_t))) == NULL) {
+		free(id_blob.ptr);
+		return (FIDO_ERR_INTERNAL);
+	}
+
+	list_ptr[cred->excl.len++] = id_blob;
+	cred->excl.ptr = list_ptr;
+
+	return (FIDO_OK);
+}
+
+int
+fido_cred_set_clientdata_hash(fido_cred_t *cred, const unsigned char *hash,
+    size_t hash_len)
+{
+	if (fido_blob_set(&cred->cdh, hash, hash_len) < 0)
+		return (FIDO_ERR_INVALID_ARGUMENT);
+
+	return (FIDO_OK);
+}
+
+int
+fido_cred_set_rp(fido_cred_t *cred, const char *id, const char *name)
+{
+	fido_rp_t *rp = &cred->rp;
+
+	if (rp->id != NULL) {
+		free(rp->id);
+		rp->id = NULL;
+	}
+	if (rp->name != NULL) {
+		free(rp->name);
+		rp->name = NULL;
+	}
+
+	if (id != NULL && (rp->id = strdup(id)) == NULL)
+		goto fail;
+	if (name != NULL && (rp->name = strdup(name)) == NULL)
+		goto fail;
+
+	return (FIDO_OK);
+fail:
+	free(rp->id);
+	free(rp->name);
+	rp->id = NULL;
+	rp->name = NULL;
+
+	return (FIDO_ERR_INTERNAL);
+}
+
+int
+fido_cred_set_user(fido_cred_t *cred, const unsigned char *user_id,
+    size_t user_id_len, const char *name, const char *display_name,
+    const char *icon)
+{
+	fido_user_t *up = &cred->user;
+
+	if (up->id.ptr != NULL) {
+		free(up->id.ptr);
+		up->id.ptr = NULL;
+		up->id.len = 0;
+	}
+	if (up->name != NULL) {
+		free(up->name);
+		up->name = NULL;
+	}
+	if (up->display_name != NULL) {
+		free(up->display_name);
+		up->display_name = NULL;
+	}
+	if (up->icon != NULL) {
+		free(up->icon);
+		up->icon = NULL;
+	}
+
+	if (user_id != NULL) {
+		if ((up->id.ptr = malloc(user_id_len)) == NULL)
+			goto fail;
+		memcpy(up->id.ptr, user_id, user_id_len);
+		up->id.len = user_id_len;
+	}
+	if (name != NULL && (up->name = strdup(name)) == NULL)
+		goto fail;
+	if (display_name != NULL &&
+	    (up->display_name = strdup(display_name)) == NULL)
+		goto fail;
+	if (icon != NULL && (up->icon = strdup(icon)) == NULL)
+		goto fail;
+
+	return (FIDO_OK);
+fail:
+	free(up->id.ptr);
+	free(up->name);
+	free(up->display_name);
+	free(up->icon);
+
+	up->id.ptr = NULL;
+	up->id.len = 0;
+	up->name = NULL;
+	up->display_name = NULL;
+	up->icon = NULL;
+
+	return (FIDO_ERR_INTERNAL);
+}
+
+int
+fido_cred_set_extensions(fido_cred_t *cred, int ext)
+{
+	if (ext == 0)
+		cred->ext.mask = 0;
+	else {
+		if (ext != FIDO_EXT_HMAC_SECRET &&
+		    ext != FIDO_EXT_CRED_PROTECT)
+			return (FIDO_ERR_INVALID_ARGUMENT);
+		cred->ext.mask |= ext;
+	}
+
+	return (FIDO_OK);
+}
+
+int
+fido_cred_set_options(fido_cred_t *cred, bool rk, bool uv)
+{
+	cred->rk = rk ? FIDO_OPT_TRUE : FIDO_OPT_FALSE;
+	cred->uv = uv ? FIDO_OPT_TRUE : FIDO_OPT_FALSE;
+
+	return (FIDO_OK);
+}
+
+int
+fido_cred_set_rk(fido_cred_t *cred, fido_opt_t rk)
+{
+	cred->rk = rk;
+
+	return (FIDO_OK);
+}
+
+int
+fido_cred_set_uv(fido_cred_t *cred, fido_opt_t uv)
+{
+	cred->uv = uv;
+
+	return (FIDO_OK);
+}
+
+int
+fido_cred_set_prot(fido_cred_t *cred, int prot)
+{
+	if (prot == 0) {
+		cred->ext.mask &= ~FIDO_EXT_CRED_PROTECT;
+		cred->ext.prot = 0;
+	} else {
+		if (prot != FIDO_CRED_PROT_UV_OPTIONAL &&
+		    prot != FIDO_CRED_PROT_UV_OPTIONAL_WITH_ID &&
+		    prot != FIDO_CRED_PROT_UV_REQUIRED)
+			return (FIDO_ERR_INVALID_ARGUMENT);
+
+		cred->ext.mask |= FIDO_EXT_CRED_PROTECT;
+		cred->ext.prot = prot;
+	}
+
+	return (FIDO_OK);
+}
+
+int
+fido_cred_set_fmt(fido_cred_t *cred, const char *fmt)
+{
+	free(cred->fmt);
+	cred->fmt = NULL;
+
+	if (fmt == NULL)
+		return (FIDO_ERR_INVALID_ARGUMENT);
+
+	if (strcmp(fmt, "packed") && strcmp(fmt, "fido-u2f"))
+		return (FIDO_ERR_INVALID_ARGUMENT);
+
+	if ((cred->fmt = strdup(fmt)) == NULL)
+		return (FIDO_ERR_INTERNAL);
+
+	return (FIDO_OK);
+}
+
+int
+fido_cred_set_type(fido_cred_t *cred, int cose_alg)
+{
+	if ((cose_alg != COSE_ES256 && cose_alg != COSE_RS256 &&
+	    cose_alg != COSE_EDDSA) || cred->type != 0)
+		return (FIDO_ERR_INVALID_ARGUMENT);
+
+	cred->type = cose_alg;
+
+	return (FIDO_OK);
+}
+
+int
+fido_cred_type(const fido_cred_t *cred)
+{
+	return (cred->type);
+}
+
+uint8_t
+fido_cred_flags(const fido_cred_t *cred)
+{
+	return (cred->authdata.flags);
+}
+
+const unsigned char *
+fido_cred_clientdata_hash_ptr(const fido_cred_t *cred)
+{
+	return (cred->cdh.ptr);
+}
+
+size_t
+fido_cred_clientdata_hash_len(const fido_cred_t *cred)
+{
+	return (cred->cdh.len);
+}
+
+const unsigned char *
+fido_cred_x5c_ptr(const fido_cred_t *cred)
+{
+	return (cred->attstmt.x5c.ptr);
+}
+
+size_t
+fido_cred_x5c_len(const fido_cred_t *cred)
+{
+	return (cred->attstmt.x5c.len);
+}
+
+const unsigned char *
+fido_cred_sig_ptr(const fido_cred_t *cred)
+{
+	return (cred->attstmt.sig.ptr);
+}
+
+size_t
+fido_cred_sig_len(const fido_cred_t *cred)
+{
+	return (cred->attstmt.sig.len);
+}
+
+const unsigned char *
+fido_cred_authdata_ptr(const fido_cred_t *cred)
+{
+	return (cred->authdata_cbor.ptr);
+}
+
+size_t
+fido_cred_authdata_len(const fido_cred_t *cred)
+{
+	return (cred->authdata_cbor.len);
+}
+
+const unsigned char *
+fido_cred_pubkey_ptr(const fido_cred_t *cred)
+{
+	const void *ptr;
+
+	switch (cred->attcred.type) {
+	case COSE_ES256:
+		ptr = &cred->attcred.pubkey.es256;
+		break;
+	case COSE_RS256:
+		ptr = &cred->attcred.pubkey.rs256;
+		break;
+	case COSE_EDDSA:
+		ptr = &cred->attcred.pubkey.eddsa;
+		break;
+	default:
+		ptr = NULL;
+		break;
+	}
+
+	return (ptr);
+}
+
+size_t
+fido_cred_pubkey_len(const fido_cred_t *cred)
+{
+	size_t len;
+
+	switch (cred->attcred.type) {
+	case COSE_ES256:
+		len = sizeof(cred->attcred.pubkey.es256);
+		break;
+	case COSE_RS256:
+		len = sizeof(cred->attcred.pubkey.rs256);
+		break;
+	case COSE_EDDSA:
+		len = sizeof(cred->attcred.pubkey.eddsa);
+		break;
+	default:
+		len = 0;
+		break;
+	}
+
+	return (len);
+}
+
+const unsigned char *
+fido_cred_id_ptr(const fido_cred_t *cred)
+{
+	return (cred->attcred.id.ptr);
+}
+
+size_t
+fido_cred_id_len(const fido_cred_t *cred)
+{
+	return (cred->attcred.id.len);
+}
+
+const unsigned char *
+fido_cred_aaguid_ptr(const fido_cred_t *cred)
+{
+	return (cred->attcred.aaguid);
+}
+
+size_t
+fido_cred_aaguid_len(const fido_cred_t *cred)
+{
+	return (sizeof(cred->attcred.aaguid));
+}
+
+int
+fido_cred_prot(const fido_cred_t *cred)
+{
+	return (cred->ext.prot);
+}
+
+const char *
+fido_cred_fmt(const fido_cred_t *cred)
+{
+	return (cred->fmt);
+}
+
+const char *
+fido_cred_rp_id(const fido_cred_t *cred)
+{
+	return (cred->rp.id);
+}
+
+const char *
+fido_cred_rp_name(const fido_cred_t *cred)
+{
+	return (cred->rp.name);
+}
+
+const char *
+fido_cred_user_name(const fido_cred_t *cred)
+{
+	return (cred->user.name);
+}
+
+const char *
+fido_cred_display_name(const fido_cred_t *cred)
+{
+	return (cred->user.display_name);
+}
+
+const unsigned char *
+fido_cred_user_id_ptr(const fido_cred_t *cred)
+{
+	return (cred->user.id.ptr);
+}
+
+size_t
+fido_cred_user_id_len(const fido_cred_t *cred)
+{
+	return (cred->user.id.len);
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/credman.c mysql-8.0-8.0.27/extra/libfido2/src/credman.c
--- mysql-8.0-8.0.26/extra/libfido2/src/credman.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/credman.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,742 @@
+/*
+ * Copyright (c) 2019 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <openssl/sha.h>
+
+#include <string.h>
+
+#include "fido.h"
+#include "fido/credman.h"
+#include "fido/es256.h"
+
+#define CMD_CRED_METADATA	0x01
+#define CMD_RP_BEGIN		0x02
+#define CMD_RP_NEXT		0x03
+#define CMD_RK_BEGIN		0x04
+#define CMD_RK_NEXT		0x05
+#define CMD_DELETE_CRED		0x06
+
+static int
+credman_grow_array(void **ptr, size_t *n_alloc, size_t *n_rx, size_t n,
+    size_t size)
+{
+	void *new_ptr;
+
+#ifdef FIDO_FUZZ
+	if (n > UINT8_MAX) {
+		fido_log_debug("%s: n > UINT8_MAX", __func__);
+		return (-1);
+	}
+#endif
+
+	if (n < *n_alloc)
+		return (0);
+
+	/* sanity check */
+	if (*n_rx > 0 || *n_rx > *n_alloc || n < *n_alloc) {
+		fido_log_debug("%s: n=%zu, n_rx=%zu, n_alloc=%zu", __func__, n,
+		    *n_rx, *n_alloc);
+		return (-1);
+	}
+
+	if ((new_ptr = recallocarray(*ptr, *n_alloc, n, size)) == NULL)
+		return (-1);
+
+	*ptr = new_ptr;
+	*n_alloc = n;
+
+	return (0);
+}
+
+static int
+credman_prepare_hmac(uint8_t cmd, const fido_blob_t *body, cbor_item_t **param,
+    fido_blob_t *hmac_data)
+{
+	cbor_item_t *param_cbor[2];
+	size_t n;
+	int ok = -1;
+
+	memset(&param_cbor, 0, sizeof(param_cbor));
+
+	if (body == NULL)
+		return (fido_blob_set(hmac_data, &cmd, sizeof(cmd)));
+
+	switch (cmd) {
+	case CMD_RK_BEGIN:
+		n = 1;
+		param_cbor[n - 1] = fido_blob_encode(body);
+		break;
+	case CMD_DELETE_CRED:
+		n = 2;
+		param_cbor[n - 1] = cbor_encode_pubkey(body);
+		break;
+	default:
+		fido_log_debug("%s: unknown cmd=0x%02x", __func__, cmd);
+		return (-1);
+	}
+
+	if (param_cbor[n - 1] == NULL) {
+		fido_log_debug("%s: cbor encode", __func__);
+		return (-1);
+	}
+	if ((*param = cbor_flatten_vector(param_cbor, n)) == NULL) {
+		fido_log_debug("%s: cbor_flatten_vector", __func__);
+		goto fail;
+	}
+	if (cbor_build_frame(cmd, param_cbor, n, hmac_data) < 0) {
+		fido_log_debug("%s: cbor_build_frame", __func__);
+		goto fail;
+	}
+
+	ok = 0;
+fail:
+	cbor_vector_free(param_cbor, nitems(param_cbor));
+
+	return (ok);
+}
+
+static int
+credman_tx(fido_dev_t *dev, uint8_t cmd, const fido_blob_t *param,
+    const char *pin)
+{
+	fido_blob_t	 f;
+	fido_blob_t	*ecdh = NULL;
+	fido_blob_t	 hmac;
+	es256_pk_t	*pk = NULL;
+	cbor_item_t	*argv[4];
+	int		 r = FIDO_ERR_INTERNAL;
+
+	memset(&f, 0, sizeof(f));
+	memset(&hmac, 0, sizeof(hmac));
+	memset(&argv, 0, sizeof(argv));
+
+	/* subCommand */
+	if ((argv[0] = cbor_build_uint8(cmd)) == NULL) {
+		fido_log_debug("%s: cbor encode", __func__);
+		goto fail;
+	}
+
+	/* pinProtocol, pinAuth */
+	if (pin != NULL) {
+		if (credman_prepare_hmac(cmd, param, &argv[1], &hmac) < 0) {
+			fido_log_debug("%s: credman_prepare_hmac", __func__);
+			goto fail;
+		}
+		if ((r = fido_do_ecdh(dev, &pk, &ecdh)) != FIDO_OK) {
+			fido_log_debug("%s: fido_do_ecdh", __func__);
+			goto fail;
+		}
+		if ((r = cbor_add_pin_params(dev, &hmac, pk, ecdh, pin,
+		    &argv[3], &argv[2])) != FIDO_OK) {
+			fido_log_debug("%s: cbor_add_pin_params", __func__);
+			goto fail;
+		}
+	}
+
+	/* framing and transmission */
+	if (cbor_build_frame(CTAP_CBOR_CRED_MGMT_PRE, argv, nitems(argv),
+	    &f) < 0 || fido_tx(dev, CTAP_CMD_CBOR, f.ptr, f.len) < 0) {
+		fido_log_debug("%s: fido_tx", __func__);
+		r = FIDO_ERR_TX;
+		goto fail;
+	}
+
+	r = FIDO_OK;
+fail:
+	es256_pk_free(&pk);
+	fido_blob_free(&ecdh);
+	cbor_vector_free(argv, nitems(argv));
+	free(f.ptr);
+	free(hmac.ptr);
+
+	return (r);
+}
+
+static int
+credman_parse_metadata(const cbor_item_t *key, const cbor_item_t *val,
+    void *arg)
+{
+	fido_credman_metadata_t *metadata = arg;
+
+	if (cbor_isa_uint(key) == false ||
+	    cbor_int_get_width(key) != CBOR_INT_8) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (0); /* ignore */
+	}
+
+	switch (cbor_get_uint8(key)) {
+	case 1:
+		return (cbor_decode_uint64(val, &metadata->rk_existing));
+	case 2:
+		return (cbor_decode_uint64(val, &metadata->rk_remaining));
+	default:
+		fido_log_debug("%s: cbor type", __func__);
+		return (0); /* ignore */
+	}
+}
+
+static int
+credman_rx_metadata(fido_dev_t *dev, fido_credman_metadata_t *metadata, int ms)
+{
+	unsigned char	reply[FIDO_MAXMSG];
+	int		reply_len;
+	int		r;
+
+	memset(metadata, 0, sizeof(*metadata));
+
+	if ((reply_len = fido_rx(dev, CTAP_CMD_CBOR, &reply, sizeof(reply),
+	    ms)) < 0) {
+		fido_log_debug("%s: fido_rx", __func__);
+		return (FIDO_ERR_RX);
+	}
+
+	if ((r = cbor_parse_reply(reply, (size_t)reply_len, metadata,
+	    credman_parse_metadata)) != FIDO_OK) {
+		fido_log_debug("%s: credman_parse_metadata", __func__);
+		return (r);
+	}
+
+	return (FIDO_OK);
+}
+
+static int
+credman_get_metadata_wait(fido_dev_t *dev, fido_credman_metadata_t *metadata,
+    const char *pin, int ms)
+{
+	int r;
+
+	if ((r = credman_tx(dev, CMD_CRED_METADATA, NULL, pin)) != FIDO_OK ||
+	    (r = credman_rx_metadata(dev, metadata, ms)) != FIDO_OK)
+		return (r);
+
+	return (FIDO_OK);
+}
+
+int
+fido_credman_get_dev_metadata(fido_dev_t *dev, fido_credman_metadata_t *metadata,
+    const char *pin)
+{
+	if (fido_dev_is_fido2(dev) == false)
+		return (FIDO_ERR_INVALID_COMMAND);
+	if (pin == NULL)
+		return (FIDO_ERR_INVALID_ARGUMENT);
+
+	return (credman_get_metadata_wait(dev, metadata, pin, -1));
+}
+
+static int
+credman_parse_rk(const cbor_item_t *key, const cbor_item_t *val, void *arg)
+{
+	fido_cred_t	*cred = arg;
+	uint64_t	 prot;
+
+	if (cbor_isa_uint(key) == false ||
+	    cbor_int_get_width(key) != CBOR_INT_8) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (0); /* ignore */
+	}
+
+	switch (cbor_get_uint8(key)) {
+	case 6: /* user entity */
+		return (cbor_decode_user(val, &cred->user));
+	case 7:
+		return (cbor_decode_cred_id(val, &cred->attcred.id));
+	case 8:
+		if (cbor_decode_pubkey(val, &cred->attcred.type,
+		    &cred->attcred.pubkey) < 0)
+			return (-1);
+		cred->type = cred->attcred.type; /* XXX */
+		return (0);
+	case 10:
+		if (cbor_decode_uint64(val, &prot) < 0 || prot > INT_MAX ||
+		    fido_cred_set_prot(cred, (int)prot) != FIDO_OK)
+			return (-1);
+		return (0);
+	default:
+		fido_log_debug("%s: cbor type", __func__);
+		return (0); /* ignore */
+	}
+}
+
+static void
+credman_reset_rk(fido_credman_rk_t *rk)
+{
+	for (size_t i = 0; i < rk->n_alloc; i++) {
+		fido_cred_reset_tx(&rk->ptr[i]);
+		fido_cred_reset_rx(&rk->ptr[i]);
+	}
+
+	free(rk->ptr);
+	rk->ptr = NULL;
+	memset(rk, 0, sizeof(*rk));
+}
+
+static int
+credman_parse_rk_count(const cbor_item_t *key, const cbor_item_t *val,
+    void *arg)
+{
+	fido_credman_rk_t *rk = arg;
+	uint64_t n;
+
+	/* totalCredentials */
+	if (cbor_isa_uint(key) == false ||
+	    cbor_int_get_width(key) != CBOR_INT_8 ||
+	    cbor_get_uint8(key) != 9) {
+		fido_log_debug("%s: cbor_type", __func__);
+		return (0); /* ignore */
+	}
+
+	if (cbor_decode_uint64(val, &n) < 0 || n > SIZE_MAX) {
+		fido_log_debug("%s: cbor_decode_uint64", __func__);
+		return (-1);
+	}
+
+	if (credman_grow_array((void **)&rk->ptr, &rk->n_alloc, &rk->n_rx,
+	    (size_t)n, sizeof(*rk->ptr)) < 0) {
+		fido_log_debug("%s: credman_grow_array", __func__);
+		return (-1);
+	}
+
+	return (0);
+}
+
+static int
+credman_rx_rk(fido_dev_t *dev, fido_credman_rk_t *rk, int ms)
+{
+	unsigned char	reply[FIDO_MAXMSG];
+	int		reply_len;
+	int		r;
+
+	credman_reset_rk(rk);
+
+	if ((reply_len = fido_rx(dev, CTAP_CMD_CBOR, &reply, sizeof(reply),
+	    ms)) < 0) {
+		fido_log_debug("%s: fido_rx", __func__);
+		return (FIDO_ERR_RX);
+	}
+
+	/* adjust as needed */
+	if ((r = cbor_parse_reply(reply, (size_t)reply_len, rk,
+	    credman_parse_rk_count)) != FIDO_OK) {
+		fido_log_debug("%s: credman_parse_rk_count", __func__);
+		return (r);
+	}
+
+	if (rk->n_alloc == 0) {
+		fido_log_debug("%s: n_alloc=0", __func__);
+		return (FIDO_OK);
+	}
+
+	/* parse the first rk */
+	if ((r = cbor_parse_reply(reply, (size_t)reply_len, &rk->ptr[0],
+	    credman_parse_rk)) != FIDO_OK) {
+		fido_log_debug("%s: credman_parse_rk", __func__);
+		return (r);
+	}
+
+	rk->n_rx++;
+
+	return (FIDO_OK);
+}
+
+static int
+credman_rx_next_rk(fido_dev_t *dev, fido_credman_rk_t *rk, int ms)
+{
+	unsigned char	reply[FIDO_MAXMSG];
+	int		reply_len;
+	int		r;
+
+	if ((reply_len = fido_rx(dev, CTAP_CMD_CBOR, &reply, sizeof(reply),
+	    ms)) < 0) {
+		fido_log_debug("%s: fido_rx", __func__);
+		return (FIDO_ERR_RX);
+	}
+
+	/* sanity check */
+	if (rk->n_rx >= rk->n_alloc) {
+		fido_log_debug("%s: n_rx=%zu, n_alloc=%zu", __func__, rk->n_rx,
+		    rk->n_alloc);
+		return (FIDO_ERR_INTERNAL);
+	}
+
+	if ((r = cbor_parse_reply(reply, (size_t)reply_len, &rk->ptr[rk->n_rx],
+	    credman_parse_rk)) != FIDO_OK) {
+		fido_log_debug("%s: credman_parse_rk", __func__);
+		return (r);
+	}
+
+	return (FIDO_OK);
+}
+
+static int
+credman_get_rk_wait(fido_dev_t *dev, const char *rp_id, fido_credman_rk_t *rk,
+    const char *pin, int ms)
+{
+	fido_blob_t	rp_dgst;
+	uint8_t		dgst[SHA256_DIGEST_LENGTH];
+	int		r;
+
+	if (SHA256((const unsigned char *)rp_id, strlen(rp_id), dgst) != dgst) {
+		fido_log_debug("%s: sha256", __func__);
+		return (FIDO_ERR_INTERNAL);
+	}
+
+	rp_dgst.ptr = dgst;
+	rp_dgst.len = sizeof(dgst);
+
+	if ((r = credman_tx(dev, CMD_RK_BEGIN, &rp_dgst, pin)) != FIDO_OK ||
+	    (r = credman_rx_rk(dev, rk, ms)) != FIDO_OK)
+		return (r);
+
+	while (rk->n_rx < rk->n_alloc) {
+		if ((r = credman_tx(dev, CMD_RK_NEXT, NULL, NULL)) != FIDO_OK ||
+		    (r = credman_rx_next_rk(dev, rk, ms)) != FIDO_OK)
+			return (r);
+		rk->n_rx++;
+	}
+
+	return (FIDO_OK);
+}
+
+int
+fido_credman_get_dev_rk(fido_dev_t *dev, const char *rp_id,
+    fido_credman_rk_t *rk, const char *pin)
+{
+	if (fido_dev_is_fido2(dev) == false)
+		return (FIDO_ERR_INVALID_COMMAND);
+	if (pin == NULL)
+		return (FIDO_ERR_INVALID_ARGUMENT);
+
+	return (credman_get_rk_wait(dev, rp_id, rk, pin, -1));
+}
+
+static int
+credman_del_rk_wait(fido_dev_t *dev, const unsigned char *cred_id,
+    size_t cred_id_len, const char *pin, int ms)
+{
+	fido_blob_t cred;
+	int r;
+
+	memset(&cred, 0, sizeof(cred));
+
+	if (fido_blob_set(&cred, cred_id, cred_id_len) < 0)
+		return (FIDO_ERR_INVALID_ARGUMENT);
+
+	if ((r = credman_tx(dev, CMD_DELETE_CRED, &cred, pin)) != FIDO_OK ||
+	    (r = fido_rx_cbor_status(dev, ms)) != FIDO_OK)
+		goto fail;
+
+	r = FIDO_OK;
+fail:
+	free(cred.ptr);
+
+	return (r);
+}
+
+int
+fido_credman_del_dev_rk(fido_dev_t *dev, const unsigned char *cred_id,
+    size_t cred_id_len, const char *pin)
+{
+	if (fido_dev_is_fido2(dev) == false)
+		return (FIDO_ERR_INVALID_COMMAND);
+	if (pin == NULL)
+		return (FIDO_ERR_INVALID_ARGUMENT);
+
+	return (credman_del_rk_wait(dev, cred_id, cred_id_len, pin, -1));
+}
+
+static int
+credman_parse_rp(const cbor_item_t *key, const cbor_item_t *val, void *arg)
+{
+	struct fido_credman_single_rp *rp = arg;
+
+	if (cbor_isa_uint(key) == false ||
+	    cbor_int_get_width(key) != CBOR_INT_8) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (0); /* ignore */
+	}
+
+	switch (cbor_get_uint8(key)) {
+	case 3:
+		return (cbor_decode_rp_entity(val, &rp->rp_entity));
+	case 4:
+		return (fido_blob_decode(val, &rp->rp_id_hash));
+	default:
+		fido_log_debug("%s: cbor type", __func__);
+		return (0); /* ignore */
+	}
+}
+
+static void
+credman_reset_rp(fido_credman_rp_t *rp)
+{
+	for (size_t i = 0; i < rp->n_alloc; i++) {
+		free(rp->ptr[i].rp_entity.id);
+		free(rp->ptr[i].rp_entity.name);
+		rp->ptr[i].rp_entity.id = NULL;
+		rp->ptr[i].rp_entity.name = NULL;
+		free(rp->ptr[i].rp_id_hash.ptr);
+		memset(&rp->ptr[i].rp_id_hash, 0,
+		    sizeof(rp->ptr[i].rp_id_hash));
+	}
+
+	free(rp->ptr);
+	rp->ptr = NULL;
+	memset(rp, 0, sizeof(*rp));
+}
+
+static int
+credman_parse_rp_count(const cbor_item_t *key, const cbor_item_t *val,
+    void *arg)
+{
+	fido_credman_rp_t *rp = arg;
+	uint64_t n;
+
+	/* totalRPs */
+	if (cbor_isa_uint(key) == false ||
+	    cbor_int_get_width(key) != CBOR_INT_8 ||
+	    cbor_get_uint8(key) != 5) {
+		fido_log_debug("%s: cbor_type", __func__);
+		return (0); /* ignore */
+	}
+
+	if (cbor_decode_uint64(val, &n) < 0 || n > SIZE_MAX) {
+		fido_log_debug("%s: cbor_decode_uint64", __func__);
+		return (-1);
+	}
+
+	if (credman_grow_array((void **)&rp->ptr, &rp->n_alloc, &rp->n_rx,
+	    (size_t)n, sizeof(*rp->ptr)) < 0) {
+		fido_log_debug("%s: credman_grow_array", __func__);
+		return (-1);
+	}
+
+	return (0);
+}
+
+static int
+credman_rx_rp(fido_dev_t *dev, fido_credman_rp_t *rp, int ms)
+{
+	unsigned char	reply[FIDO_MAXMSG];
+	int		reply_len;
+	int		r;
+
+	credman_reset_rp(rp);
+
+	if ((reply_len = fido_rx(dev, CTAP_CMD_CBOR, &reply, sizeof(reply),
+	    ms)) < 0) {
+		fido_log_debug("%s: fido_rx", __func__);
+		return (FIDO_ERR_RX);
+	}
+
+	/* adjust as needed */
+	if ((r = cbor_parse_reply(reply, (size_t)reply_len, rp,
+	    credman_parse_rp_count)) != FIDO_OK) {
+		fido_log_debug("%s: credman_parse_rp_count", __func__);
+		return (r);
+	}
+
+	if (rp->n_alloc == 0) {
+		fido_log_debug("%s: n_alloc=0", __func__);
+		return (FIDO_OK);
+	}
+
+	/* parse the first rp */
+	if ((r = cbor_parse_reply(reply, (size_t)reply_len, &rp->ptr[0],
+	    credman_parse_rp)) != FIDO_OK) {
+		fido_log_debug("%s: credman_parse_rp", __func__);
+		return (r);
+	}
+
+	rp->n_rx++;
+
+	return (FIDO_OK);
+}
+
+static int
+credman_rx_next_rp(fido_dev_t *dev, fido_credman_rp_t *rp, int ms)
+{
+	unsigned char	reply[FIDO_MAXMSG];
+	int		reply_len;
+	int		r;
+
+	if ((reply_len = fido_rx(dev, CTAP_CMD_CBOR, &reply, sizeof(reply),
+	    ms)) < 0) {
+		fido_log_debug("%s: fido_rx", __func__);
+		return (FIDO_ERR_RX);
+	}
+
+	/* sanity check */
+	if (rp->n_rx >= rp->n_alloc) {
+		fido_log_debug("%s: n_rx=%zu, n_alloc=%zu", __func__, rp->n_rx,
+		    rp->n_alloc);
+		return (FIDO_ERR_INTERNAL);
+	}
+
+	if ((r = cbor_parse_reply(reply, (size_t)reply_len, &rp->ptr[rp->n_rx],
+	    credman_parse_rp)) != FIDO_OK) {
+		fido_log_debug("%s: credman_parse_rp", __func__);
+		return (r);
+	}
+
+	return (FIDO_OK);
+}
+
+static int
+credman_get_rp_wait(fido_dev_t *dev, fido_credman_rp_t *rp, const char *pin,
+    int ms)
+{
+	int r;
+
+	if ((r = credman_tx(dev, CMD_RP_BEGIN, NULL, pin)) != FIDO_OK ||
+	    (r = credman_rx_rp(dev, rp, ms)) != FIDO_OK)
+		return (r);
+
+	while (rp->n_rx < rp->n_alloc) {
+		if ((r = credman_tx(dev, CMD_RP_NEXT, NULL, NULL)) != FIDO_OK ||
+		    (r = credman_rx_next_rp(dev, rp, ms)) != FIDO_OK)
+			return (r);
+		rp->n_rx++;
+	}
+
+	return (FIDO_OK);
+}
+
+int
+fido_credman_get_dev_rp(fido_dev_t *dev, fido_credman_rp_t *rp, const char *pin)
+{
+	if (fido_dev_is_fido2(dev) == false)
+		return (FIDO_ERR_INVALID_COMMAND);
+	if (pin == NULL)
+		return (FIDO_ERR_INVALID_ARGUMENT);
+
+	return (credman_get_rp_wait(dev, rp, pin, -1));
+}
+
+fido_credman_rk_t *
+fido_credman_rk_new(void)
+{
+	return (calloc(1, sizeof(fido_credman_rk_t)));
+}
+
+void
+fido_credman_rk_free(fido_credman_rk_t **rk_p)
+{
+	fido_credman_rk_t *rk;
+
+	if (rk_p == NULL || (rk = *rk_p) == NULL)
+		return;
+
+	credman_reset_rk(rk);
+	free(rk);
+	*rk_p = NULL;
+}
+
+size_t
+fido_credman_rk_count(const fido_credman_rk_t *rk)
+{
+	return (rk->n_rx);
+}
+
+const fido_cred_t *
+fido_credman_rk(const fido_credman_rk_t *rk, size_t idx)
+{
+	if (idx >= rk->n_alloc)
+		return (NULL);
+
+	return (&rk->ptr[idx]);
+}
+
+fido_credman_metadata_t *
+fido_credman_metadata_new(void)
+{
+	return (calloc(1, sizeof(fido_credman_metadata_t)));
+}
+
+void
+fido_credman_metadata_free(fido_credman_metadata_t **metadata_p)
+{
+	fido_credman_metadata_t *metadata;
+
+	if (metadata_p == NULL || (metadata = *metadata_p) == NULL)
+		return;
+
+	free(metadata);
+	*metadata_p = NULL;
+}
+
+uint64_t
+fido_credman_rk_existing(const fido_credman_metadata_t *metadata)
+{
+	return (metadata->rk_existing);
+}
+
+uint64_t
+fido_credman_rk_remaining(const fido_credman_metadata_t *metadata)
+{
+	return (metadata->rk_remaining);
+}
+
+fido_credman_rp_t *
+fido_credman_rp_new(void)
+{
+	return (calloc(1, sizeof(fido_credman_rp_t)));
+}
+
+void
+fido_credman_rp_free(fido_credman_rp_t **rp_p)
+{
+	fido_credman_rp_t *rp;
+
+	if (rp_p == NULL || (rp = *rp_p) == NULL)
+		return;
+
+	credman_reset_rp(rp);
+	free(rp);
+	*rp_p = NULL;
+}
+
+size_t
+fido_credman_rp_count(const fido_credman_rp_t *rp)
+{
+	return (rp->n_rx);
+}
+
+const char *
+fido_credman_rp_id(const fido_credman_rp_t *rp, size_t idx)
+{
+	if (idx >= rp->n_alloc)
+		return (NULL);
+
+	return (rp->ptr[idx].rp_entity.id);
+}
+
+const char *
+fido_credman_rp_name(const fido_credman_rp_t *rp, size_t idx)
+{
+	if (idx >= rp->n_alloc)
+		return (NULL);
+
+	return (rp->ptr[idx].rp_entity.name);
+}
+
+size_t
+fido_credman_rp_id_hash_len(const fido_credman_rp_t *rp, size_t idx)
+{
+	if (idx >= rp->n_alloc)
+		return (0);
+
+	return (rp->ptr[idx].rp_id_hash.len);
+}
+
+const unsigned char *
+fido_credman_rp_id_hash_ptr(const fido_credman_rp_t *rp, size_t idx)
+{
+	if (idx >= rp->n_alloc)
+		return (NULL);
+
+	return (rp->ptr[idx].rp_id_hash.ptr);
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/dev.c mysql-8.0-8.0.27/extra/libfido2/src/dev.c
--- mysql-8.0-8.0.26/extra/libfido2/src/dev.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/dev.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,656 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#ifdef HAVE_SYS_RANDOM_H
+#include <sys/random.h>
+#endif
+
+#include <openssl/sha.h>
+
+#include <fcntl.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "fido.h"
+
+#if defined(_WIN32)
+#include <windows.h>
+
+#include <winternl.h>
+#include <winerror.h>
+#include <stdio.h>
+#include <bcrypt.h>
+#include <sal.h>
+
+static int
+obtain_nonce(uint64_t *nonce)
+{
+	NTSTATUS status;
+
+	status = BCryptGenRandom(NULL, (unsigned char *)nonce, sizeof(*nonce),
+	    BCRYPT_USE_SYSTEM_PREFERRED_RNG);
+
+	if (!NT_SUCCESS(status))
+		return (-1);
+
+	return (0);
+}
+#elif defined(HAVE_ARC4RANDOM_BUF)
+static int
+obtain_nonce(uint64_t *nonce)
+{
+	arc4random_buf(nonce, sizeof(*nonce));
+	return (0);
+}
+#elif defined(HAVE_GETRANDOM)
+static int
+obtain_nonce(uint64_t *nonce)
+{
+	if (getrandom(nonce, sizeof(*nonce), 0) < 0)
+		return (-1);
+	return (0);
+}
+#elif defined(HAVE_DEV_URANDOM)
+static int
+obtain_nonce(uint64_t *nonce)
+{
+	int	fd = -1;
+	int	ok = -1;
+	ssize_t	r;
+
+	if ((fd = open(FIDO_RANDOM_DEV, O_RDONLY)) < 0)
+		goto fail;
+	if ((r = read(fd, nonce, sizeof(*nonce))) < 0 ||
+	    (size_t)r != sizeof(*nonce))
+		goto fail;
+
+	ok = 0;
+fail:
+	if (fd != -1)
+		close(fd);
+
+	return (ok);
+}
+#else
+#error "please provide an implementation of obtain_nonce() for your platform"
+#endif /* _WIN32 */
+
+#ifndef TLS
+#define TLS
+#endif
+
+typedef struct dev_manifest_func_node {
+	dev_manifest_func_t manifest_func;
+	struct dev_manifest_func_node *next;
+} dev_manifest_func_node_t;
+
+static TLS dev_manifest_func_node_t *manifest_funcs = NULL;
+
+static void
+find_manifest_func_node(dev_manifest_func_t f, dev_manifest_func_node_t **curr,
+    dev_manifest_func_node_t **prev)
+{
+	*prev = NULL;
+	*curr = manifest_funcs;
+
+	while (*curr != NULL && (*curr)->manifest_func != f) {
+		*prev = *curr;
+		*curr = (*curr)->next;
+	}
+}
+
+#ifdef FIDO_FUZZ
+static void
+set_random_report_len(fido_dev_t *dev)
+{
+	dev->rx_len = CTAP_MIN_REPORT_LEN +
+	    uniform_random(CTAP_MAX_REPORT_LEN - CTAP_MIN_REPORT_LEN + 1);
+	dev->tx_len = CTAP_MIN_REPORT_LEN +
+	    uniform_random(CTAP_MAX_REPORT_LEN - CTAP_MIN_REPORT_LEN + 1);
+}
+#endif
+
+static void
+fido_dev_set_flags(fido_dev_t *dev, const fido_cbor_info_t *info)
+{
+	char * const	*ptr;
+	const bool	*val;
+	size_t		 len;
+
+	ptr = fido_cbor_info_extensions_ptr(info);
+	len = fido_cbor_info_extensions_len(info);
+
+	for (size_t i = 0; i < len; i++)
+		if (strcmp(ptr[i], "credProtect") == 0)
+			dev->flags |= FIDO_DEV_CRED_PROT;
+
+	ptr = fido_cbor_info_options_name_ptr(info);
+	val = fido_cbor_info_options_value_ptr(info);
+	len = fido_cbor_info_options_len(info);
+
+	for (size_t i = 0; i < len; i++)
+		if (strcmp(ptr[i], "clientPin") == 0) {
+			if (val[i] == true)
+				dev->flags |= FIDO_DEV_PIN_SET;
+			else
+				dev->flags |= FIDO_DEV_PIN_UNSET;
+		}
+}
+
+static int
+fido_dev_open_tx(fido_dev_t *dev, const char *path)
+{
+	const uint8_t	cmd = CTAP_CMD_INIT;
+	int		r;
+
+	if (dev->io_handle != NULL) {
+		fido_log_debug("%s: handle=%p", __func__, dev->io_handle);
+		return (FIDO_ERR_INVALID_ARGUMENT);
+	}
+
+	if (dev->io.open == NULL || dev->io.close == NULL) {
+		fido_log_debug("%s: NULL open/close", __func__);
+		return (FIDO_ERR_INVALID_ARGUMENT);
+	}
+
+	if (obtain_nonce(&dev->nonce) < 0) {
+		fido_log_debug("%s: obtain_nonce", __func__);
+		return (FIDO_ERR_INTERNAL);
+	}
+
+	if ((dev->io_handle = dev->io.open(path)) == NULL) {
+		fido_log_debug("%s: dev->io.open", __func__);
+		return (FIDO_ERR_INTERNAL);
+	}
+
+	if (dev->io_own) {
+		dev->rx_len = CTAP_MAX_REPORT_LEN;
+		dev->tx_len = CTAP_MAX_REPORT_LEN;
+	} else {
+		dev->rx_len = fido_hid_report_in_len(dev->io_handle);
+		dev->tx_len = fido_hid_report_out_len(dev->io_handle);
+	}
+
+#ifdef FIDO_FUZZ
+	set_random_report_len(dev);
+#endif
+
+	if (dev->rx_len < CTAP_MIN_REPORT_LEN ||
+	    dev->rx_len > CTAP_MAX_REPORT_LEN) {
+		fido_log_debug("%s: invalid rx_len %zu", __func__, dev->rx_len);
+		r = FIDO_ERR_RX;
+		goto fail;
+	}
+
+	if (dev->tx_len < CTAP_MIN_REPORT_LEN ||
+	    dev->tx_len > CTAP_MAX_REPORT_LEN) {
+		fido_log_debug("%s: invalid tx_len %zu", __func__, dev->tx_len);
+		r = FIDO_ERR_TX;
+		goto fail;
+	}
+
+	if (fido_tx(dev, cmd, &dev->nonce, sizeof(dev->nonce)) < 0) {
+		fido_log_debug("%s: fido_tx", __func__);
+		r = FIDO_ERR_TX;
+		goto fail;
+	}
+
+	return (FIDO_OK);
+fail:
+	dev->io.close(dev->io_handle);
+	dev->io_handle = NULL;
+
+	return (r);
+}
+
+static int
+fido_dev_open_rx(fido_dev_t *dev, int ms)
+{
+	fido_cbor_info_t	*info = NULL;
+	int			 reply_len;
+	int			 r;
+
+	if ((reply_len = fido_rx(dev, CTAP_CMD_INIT, &dev->attr,
+	    sizeof(dev->attr), ms)) < 0) {
+		fido_log_debug("%s: fido_rx", __func__);
+		r = FIDO_ERR_RX;
+		goto fail;
+	}
+
+#ifdef FIDO_FUZZ
+	dev->attr.nonce = dev->nonce;
+#endif
+
+	if ((size_t)reply_len != sizeof(dev->attr) ||
+	    dev->attr.nonce != dev->nonce) {
+		fido_log_debug("%s: invalid nonce", __func__);
+		r = FIDO_ERR_RX;
+		goto fail;
+	}
+
+	dev->flags = 0;
+	dev->cid = dev->attr.cid;
+
+	if (fido_dev_is_fido2(dev)) {
+		if ((info = fido_cbor_info_new()) == NULL) {
+			fido_log_debug("%s: fido_cbor_info_new", __func__);
+			r = FIDO_ERR_INTERNAL;
+			goto fail;
+		}
+		if (fido_dev_get_cbor_info_wait(dev, info, ms) != FIDO_OK) {
+			fido_log_debug("%s: falling back to u2f", __func__);
+			fido_dev_force_u2f(dev);
+		} else {
+			fido_dev_set_flags(dev, info);
+		}
+	}
+
+	if (fido_dev_is_fido2(dev) && info != NULL) {
+		fido_log_debug("%s: FIDO_MAXMSG=%d, maxmsgsiz=%lu", __func__,
+		    FIDO_MAXMSG, (unsigned long)fido_cbor_info_maxmsgsiz(info));
+	}
+
+	r = FIDO_OK;
+fail:
+	fido_cbor_info_free(&info);
+
+	if (r != FIDO_OK) {
+		dev->io.close(dev->io_handle);
+		dev->io_handle = NULL;
+	}
+
+	return (r);
+}
+
+static int
+fido_dev_open_wait(fido_dev_t *dev, const char *path, int ms)
+{
+	int r;
+
+	if ((r = fido_dev_open_tx(dev, path)) != FIDO_OK ||
+	    (r = fido_dev_open_rx(dev, ms)) != FIDO_OK)
+		return (r);
+
+	return (FIDO_OK);
+}
+
+int
+fido_dev_register_manifest_func(const dev_manifest_func_t f)
+{
+	dev_manifest_func_node_t *prev, *curr, *n;
+
+	find_manifest_func_node(f, &curr, &prev);
+	if (curr != NULL)
+		return (FIDO_OK);
+
+	if ((n = calloc(1, sizeof(*n))) == NULL) {
+		fido_log_debug("%s: calloc", __func__);
+		return (FIDO_ERR_INTERNAL);
+	}
+
+	n->manifest_func = f;
+	n->next = manifest_funcs;
+	manifest_funcs = n;
+
+	return (FIDO_OK);
+}
+
+void
+fido_dev_unregister_manifest_func(const dev_manifest_func_t f)
+{
+	dev_manifest_func_node_t *prev, *curr;
+
+	find_manifest_func_node(f, &curr, &prev);
+	if (curr == NULL)
+		return;
+	if (prev != NULL)
+		prev->next = curr->next;
+	else
+		manifest_funcs = curr->next;
+
+	free(curr);
+}
+
+int
+fido_dev_info_manifest(fido_dev_info_t *devlist, size_t ilen, size_t *olen)
+{
+	dev_manifest_func_node_t	*curr = NULL;
+	dev_manifest_func_t		 m_func;
+	size_t				 curr_olen;
+	int				 r;
+
+	*olen = 0;
+
+	if (fido_dev_register_manifest_func(fido_hid_manifest) != FIDO_OK)
+		return (FIDO_ERR_INTERNAL);
+
+	for (curr = manifest_funcs; curr != NULL; curr = curr->next) {
+		curr_olen = 0;
+		m_func = curr->manifest_func;
+		r = m_func(devlist + *olen, ilen - *olen, &curr_olen);
+		if (r != FIDO_OK)
+			return (r);
+		*olen += curr_olen;
+		if (*olen == ilen)
+			break;
+	}
+
+	return (FIDO_OK);
+}
+
+int
+fido_dev_open_with_info(fido_dev_t *dev)
+{
+	if (dev->path == NULL)
+		return (FIDO_ERR_INVALID_ARGUMENT);
+
+	return (fido_dev_open_wait(dev, dev->path, -1));
+}
+
+int
+fido_dev_open(fido_dev_t *dev, const char *path)
+{
+	return (fido_dev_open_wait(dev, path, -1));
+}
+
+int
+fido_dev_close(fido_dev_t *dev)
+{
+	if (dev->io_handle == NULL || dev->io.close == NULL)
+		return (FIDO_ERR_INVALID_ARGUMENT);
+
+	dev->io.close(dev->io_handle);
+	dev->io_handle = NULL;
+
+	return (FIDO_OK);
+}
+
+int
+fido_dev_cancel(fido_dev_t *dev)
+{
+	if (fido_dev_is_fido2(dev) == false)
+		return (FIDO_ERR_INVALID_ARGUMENT);
+
+	if (fido_tx(dev, CTAP_CMD_CANCEL, NULL, 0) < 0)
+		return (FIDO_ERR_TX);
+
+	return (FIDO_OK);
+}
+
+int
+fido_dev_get_touch_begin(fido_dev_t *dev)
+{
+	fido_blob_t	 f;
+	cbor_item_t	*argv[9];
+	const char	*clientdata = FIDO_DUMMY_CLIENTDATA;
+	const uint8_t	 user_id = FIDO_DUMMY_USER_ID;
+	unsigned char	 cdh[SHA256_DIGEST_LENGTH];
+	fido_rp_t	 rp;
+	fido_user_t	 user;
+	int		 r = FIDO_ERR_INTERNAL;
+
+	memset(&f, 0, sizeof(f));
+	memset(argv, 0, sizeof(argv));
+	memset(cdh, 0, sizeof(cdh));
+	memset(&rp, 0, sizeof(rp));
+	memset(&user, 0, sizeof(user));
+
+	if (fido_dev_is_fido2(dev) == false)
+		return (u2f_get_touch_begin(dev));
+
+	if (SHA256((const void *)clientdata, strlen(clientdata), cdh) != cdh) {
+		fido_log_debug("%s: sha256", __func__);
+		return (FIDO_ERR_INTERNAL);
+	}
+
+	if ((rp.id = strdup(FIDO_DUMMY_RP_ID)) == NULL ||
+	    (user.name = strdup(FIDO_DUMMY_USER_NAME)) == NULL) {
+		fido_log_debug("%s: strdup", __func__);
+		goto fail;
+	}
+
+	if (fido_blob_set(&user.id, &user_id, sizeof(user_id)) < 0) {
+		fido_log_debug("%s: fido_blob_set", __func__);
+		goto fail;
+	}
+
+	if ((argv[0] = cbor_build_bytestring(cdh, sizeof(cdh))) == NULL ||
+	    (argv[1] = cbor_encode_rp_entity(&rp)) == NULL ||
+	    (argv[2] = cbor_encode_user_entity(&user)) == NULL ||
+	    (argv[3] = cbor_encode_pubkey_param(COSE_ES256)) == NULL) {
+		fido_log_debug("%s: cbor encode", __func__);
+		goto fail;
+	}
+
+	if (fido_dev_supports_pin(dev)) {
+		if ((argv[7] = cbor_new_definite_bytestring()) == NULL ||
+		    (argv[8] = cbor_encode_pin_opt()) == NULL) {
+			fido_log_debug("%s: cbor encode", __func__);
+			goto fail;
+		}
+	}
+
+	if (cbor_build_frame(CTAP_CBOR_MAKECRED, argv, nitems(argv), &f) < 0 ||
+	    fido_tx(dev, CTAP_CMD_CBOR, f.ptr, f.len) < 0) {
+		fido_log_debug("%s: fido_tx", __func__);
+		r = FIDO_ERR_TX;
+		goto fail;
+	}
+
+	r = FIDO_OK;
+fail:
+	cbor_vector_free(argv, nitems(argv));
+	free(f.ptr);
+	free(rp.id);
+	free(user.name);
+	free(user.id.ptr);
+
+	return (r);
+}
+
+int
+fido_dev_get_touch_status(fido_dev_t *dev, int *touched, int ms)
+{
+	int r;
+
+	*touched = 0;
+
+	if (fido_dev_is_fido2(dev) == false)
+		return (u2f_get_touch_status(dev, touched, ms));
+
+	switch ((r = fido_rx_cbor_status(dev, ms))) {
+	case FIDO_ERR_PIN_AUTH_INVALID:
+	case FIDO_ERR_PIN_INVALID:
+	case FIDO_ERR_PIN_NOT_SET:
+	case FIDO_ERR_SUCCESS:
+		*touched = 1;
+		break;
+	case FIDO_ERR_RX:
+		/* ignore */
+		break;
+	default:
+		fido_log_debug("%s: fido_rx_cbor_status", __func__);
+		return (r);
+	}
+
+	return (FIDO_OK);
+}
+
+int
+fido_dev_set_io_functions(fido_dev_t *dev, const fido_dev_io_t *io)
+{
+	if (dev->io_handle != NULL) {
+		fido_log_debug("%s: non-NULL handle", __func__);
+		return (FIDO_ERR_INVALID_ARGUMENT);
+	}
+
+	if (io == NULL || io->open == NULL || io->close == NULL ||
+	    io->read == NULL || io->write == NULL) {
+		fido_log_debug("%s: NULL function", __func__);
+		return (FIDO_ERR_INVALID_ARGUMENT);
+	}
+
+	dev->io = *io;
+	dev->io_own = true;
+
+	return (FIDO_OK);
+}
+
+int
+fido_dev_set_transport_functions(fido_dev_t *dev, const fido_dev_transport_t *t)
+{
+	if (dev->io_handle != NULL) {
+		fido_log_debug("%s: non-NULL handle", __func__);
+		return (FIDO_ERR_INVALID_ARGUMENT);
+	}
+
+	dev->transport = *t;
+	dev->io_own = true;
+
+	return (FIDO_OK);
+}
+
+void
+fido_init(int flags)
+{
+	if (flags & FIDO_DEBUG || getenv("FIDO_DEBUG") != NULL)
+		fido_log_init();
+}
+
+fido_dev_t *
+fido_dev_new(void)
+{
+	fido_dev_t *dev;
+
+	if ((dev = calloc(1, sizeof(*dev))) == NULL)
+		return (NULL);
+
+	dev->cid = CTAP_CID_BROADCAST;
+	dev->io = (fido_dev_io_t) {
+		&fido_hid_open,
+		&fido_hid_close,
+		&fido_hid_read,
+		&fido_hid_write,
+	};
+
+	return (dev);
+}
+
+fido_dev_t *
+fido_dev_new_with_info(const fido_dev_info_t *di)
+{
+	fido_dev_t *dev;
+
+	if ((dev = calloc(1, sizeof(*dev))) == NULL)
+		return (NULL);
+
+	dev->cid = CTAP_CID_BROADCAST;
+
+	if (di->io.open == NULL || di->io.close == NULL ||
+	    di->io.read == NULL || di->io.write == NULL) {
+		fido_log_debug("%s: NULL function", __func__);
+		fido_dev_free(&dev);
+		return (NULL);
+	}
+
+	dev->io = di->io;
+	dev->transport = di->transport;
+
+	if ((dev->path = strdup(di->path)) == NULL) {
+		fido_log_debug("%s: strdup", __func__);
+		fido_dev_free(&dev);
+		return (NULL);
+	}
+
+	return (dev);
+}
+
+void
+fido_dev_free(fido_dev_t **dev_p)
+{
+	fido_dev_t *dev;
+
+	if (dev_p == NULL || (dev = *dev_p) == NULL)
+		return;
+
+	free(dev->path);
+	free(dev);
+
+	*dev_p = NULL;
+}
+
+uint8_t
+fido_dev_protocol(const fido_dev_t *dev)
+{
+	return (dev->attr.protocol);
+}
+
+uint8_t
+fido_dev_major(const fido_dev_t *dev)
+{
+	return (dev->attr.major);
+}
+
+uint8_t
+fido_dev_minor(const fido_dev_t *dev)
+{
+	return (dev->attr.minor);
+}
+
+uint8_t
+fido_dev_build(const fido_dev_t *dev)
+{
+	return (dev->attr.build);
+}
+
+uint8_t
+fido_dev_flags(const fido_dev_t *dev)
+{
+	return (dev->attr.flags);
+}
+
+bool
+fido_dev_is_fido2(const fido_dev_t *dev)
+{
+	return (dev->attr.flags & FIDO_CAP_CBOR);
+}
+
+bool
+fido_dev_supports_pin(const fido_dev_t *dev)
+{
+	return (dev->flags & (FIDO_DEV_PIN_SET|FIDO_DEV_PIN_UNSET));
+}
+
+bool
+fido_dev_has_pin(const fido_dev_t *dev)
+{
+	return (dev->flags & FIDO_DEV_PIN_SET);
+}
+
+bool
+fido_dev_supports_cred_prot(const fido_dev_t *dev)
+{
+	return (dev->flags & FIDO_DEV_CRED_PROT);
+}
+
+void
+fido_dev_force_u2f(fido_dev_t *dev)
+{
+	dev->attr.flags &= (uint8_t)~FIDO_CAP_CBOR;
+	dev->flags = 0;
+}
+
+void
+fido_dev_force_fido2(fido_dev_t *dev)
+{
+	dev->attr.flags |= FIDO_CAP_CBOR;
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/diff_exports.sh mysql-8.0-8.0.27/extra/libfido2/src/diff_exports.sh
--- mysql-8.0-8.0.26/extra/libfido2/src/diff_exports.sh	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/diff_exports.sh	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,26 @@
+#!/bin/sh -u
+
+# Copyright (c) 2018 Yubico AB. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+for f in export.gnu export.llvm export.msvc; do
+	if [ ! -f "${f}" ]; then
+		exit 1
+	fi
+done
+
+TMPDIR="$(mktemp -d)"
+GNU="${TMPDIR}/gnu"
+LLVM="${TMPDIR}/llvm"
+MSVC="${TMPDIR}/msvc"
+
+awk '/^[^*{}]+;$/' export.gnu | tr -d '\t;' | sort > "${GNU}"
+sed 's/^_//' export.llvm | sort > "${LLVM}"
+grep -v '^EXPORTS$' export.msvc | sort > "${MSVC}"
+diff -u "${GNU}" "${LLVM}" && diff -u "${MSVC}" "${LLVM}"
+ERROR=$?
+rm "${GNU}" "${LLVM}" "${MSVC}"
+rmdir "${TMPDIR}"
+
+exit ${ERROR}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/ecdh.c mysql-8.0-8.0.27/extra/libfido2/src/ecdh.c
--- mysql-8.0-8.0.26/extra/libfido2/src/ecdh.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/ecdh.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <openssl/evp.h>
+#include <openssl/sha.h>
+
+#include "fido.h"
+#include "fido/es256.h"
+
+static int
+do_ecdh(const es256_sk_t *sk, const es256_pk_t *pk, fido_blob_t **ecdh)
+{
+	EVP_PKEY	*pk_evp = NULL;
+	EVP_PKEY	*sk_evp = NULL;
+	EVP_PKEY_CTX	*ctx = NULL;
+	fido_blob_t	*secret = NULL;
+	int		 ok = -1;
+
+	*ecdh = NULL;
+
+	/* allocate blobs for secret & ecdh */
+	if ((secret = fido_blob_new()) == NULL ||
+	    (*ecdh = fido_blob_new()) == NULL)
+		goto fail;
+
+	/* wrap the keys as openssl objects */
+	if ((pk_evp = es256_pk_to_EVP_PKEY(pk)) == NULL ||
+	    (sk_evp = es256_sk_to_EVP_PKEY(sk)) == NULL) {
+		fido_log_debug("%s: es256_to_EVP_PKEY", __func__);
+		goto fail;
+	}
+
+	/* set ecdh parameters */
+	if ((ctx = EVP_PKEY_CTX_new(sk_evp, NULL)) == NULL ||
+	    EVP_PKEY_derive_init(ctx) <= 0 ||
+	    EVP_PKEY_derive_set_peer(ctx, pk_evp) <= 0) {
+		fido_log_debug("%s: EVP_PKEY_derive_init", __func__);
+		goto fail;
+	}
+
+	/* perform ecdh */
+	if (EVP_PKEY_derive(ctx, NULL, &secret->len) <= 0 ||
+	    (secret->ptr = calloc(1, secret->len)) == NULL ||
+	    EVP_PKEY_derive(ctx, secret->ptr, &secret->len) <= 0) {
+		fido_log_debug("%s: EVP_PKEY_derive", __func__);
+		goto fail;
+	}
+
+	/* use sha256 as a kdf on the resulting secret */
+	(*ecdh)->len = SHA256_DIGEST_LENGTH;
+	if (((*ecdh)->ptr = calloc(1, (*ecdh)->len)) == NULL ||
+	    SHA256(secret->ptr, secret->len, (*ecdh)->ptr) != (*ecdh)->ptr) {
+		fido_log_debug("%s: sha256", __func__);
+		goto fail;
+	}
+
+	ok = 0;
+fail:
+	if (pk_evp != NULL)
+		EVP_PKEY_free(pk_evp);
+	if (sk_evp != NULL)
+		EVP_PKEY_free(sk_evp);
+	if (ctx != NULL)
+		EVP_PKEY_CTX_free(ctx);
+	if (ok < 0)
+		fido_blob_free(ecdh);
+
+	fido_blob_free(&secret);
+
+	return (ok);
+}
+
+int
+fido_do_ecdh(fido_dev_t *dev, es256_pk_t **pk, fido_blob_t **ecdh)
+{
+	es256_sk_t	*sk = NULL; /* our private key */
+	es256_pk_t	*ak = NULL; /* authenticator's public key */
+	int		 r;
+
+	*pk = NULL; /* our public key; returned */
+	*ecdh = NULL; /* shared ecdh secret; returned */
+
+	if ((sk = es256_sk_new()) == NULL || (*pk = es256_pk_new()) == NULL) {
+		r = FIDO_ERR_INTERNAL;
+		goto fail;
+	}
+
+	if (es256_sk_create(sk) < 0 || es256_derive_pk(sk, *pk) < 0) {
+		fido_log_debug("%s: es256_derive_pk", __func__);
+		r = FIDO_ERR_INTERNAL;
+		goto fail;
+	}
+
+	if ((ak = es256_pk_new()) == NULL ||
+	    fido_dev_authkey(dev, ak) != FIDO_OK) {
+		fido_log_debug("%s: fido_dev_authkey", __func__);
+		r = FIDO_ERR_INTERNAL;
+		goto fail;
+	}
+
+	if (do_ecdh(sk, ak, ecdh) < 0) {
+		fido_log_debug("%s: do_ecdh", __func__);
+		r = FIDO_ERR_INTERNAL;
+		goto fail;
+	}
+
+	r = FIDO_OK;
+fail:
+	es256_sk_free(&sk);
+	es256_pk_free(&ak);
+
+	if (r != FIDO_OK) {
+		es256_pk_free(pk);
+		fido_blob_free(ecdh);
+	}
+
+	return (r);
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/eddsa.c mysql-8.0-8.0.27/extra/libfido2/src/eddsa.c
--- mysql-8.0-8.0.26/extra/libfido2/src/eddsa.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/eddsa.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) 2019 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <openssl/bn.h>
+#include <openssl/ec.h>
+#include <openssl/evp.h>
+#include <openssl/obj_mac.h>
+
+#include <string.h>
+#include "fido.h"
+#include "fido/eddsa.h"
+
+#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10101000L
+EVP_PKEY *
+EVP_PKEY_new_raw_public_key(int type, ENGINE *e, const unsigned char *key,
+    size_t keylen)
+{
+	(void)type;
+	(void)e;
+	(void)key;
+	(void)keylen;
+
+	fido_log_debug("%s: unimplemented", __func__);
+
+	return (NULL);
+}
+
+int
+EVP_PKEY_get_raw_public_key(const EVP_PKEY *pkey, unsigned char *pub,
+    size_t *len)
+{
+	(void)pkey;
+	(void)pub;
+	(void)len;
+
+	fido_log_debug("%s: unimplemented", __func__);
+
+	return (0);
+}
+
+int
+EVP_DigestVerify(EVP_MD_CTX *ctx, const unsigned char *sigret, size_t siglen,
+    const unsigned char *tbs, size_t tbslen)
+{
+	(void)ctx;
+	(void)sigret;
+	(void)siglen;
+	(void)tbs;
+	(void)tbslen;
+
+	fido_log_debug("%s: unimplemented", __func__);
+
+	return (0);
+}
+#endif /* LIBRESSL_VERSION_NUMBER || OPENSSL_VERSION_NUMBER < 0x10101000L */
+
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+EVP_MD_CTX *
+EVP_MD_CTX_new(void)
+{
+	fido_log_debug("%s: unimplemented", __func__);
+
+	return (NULL);
+}
+
+void
+EVP_MD_CTX_free(EVP_MD_CTX *ctx)
+{
+	(void)ctx;
+}
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+
+static int
+decode_coord(const cbor_item_t *item, void *xy, size_t xy_len)
+{
+	if (cbor_isa_bytestring(item) == false ||
+	    cbor_bytestring_is_definite(item) == false ||
+	    cbor_bytestring_length(item) != xy_len) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (-1);
+	}
+
+	memcpy(xy, cbor_bytestring_handle(item), xy_len);
+
+	return (0);
+}
+
+static int
+decode_pubkey_point(const cbor_item_t *key, const cbor_item_t *val, void *arg)
+{
+	eddsa_pk_t *k = arg;
+
+	if (cbor_isa_negint(key) == false ||
+	    cbor_int_get_width(key) != CBOR_INT_8)
+		return (0); /* ignore */
+
+	switch (cbor_get_uint8(key)) {
+	case 1: /* x coordinate */
+		return (decode_coord(val, &k->x, sizeof(k->x)));
+	}
+
+	return (0); /* ignore */
+}
+
+int
+eddsa_pk_decode(const cbor_item_t *item, eddsa_pk_t *k)
+{
+	if (cbor_isa_map(item) == false ||
+	    cbor_map_is_definite(item) == false ||
+	    cbor_map_iter(item, k, decode_pubkey_point) < 0) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (-1);
+	}
+
+	return (0);
+}
+
+eddsa_pk_t *
+eddsa_pk_new(void)
+{
+	return (calloc(1, sizeof(eddsa_pk_t)));
+}
+
+void
+eddsa_pk_free(eddsa_pk_t **pkp)
+{
+	eddsa_pk_t *pk;
+
+	if (pkp == NULL || (pk = *pkp) == NULL)
+		return;
+
+	explicit_bzero(pk, sizeof(*pk));
+	free(pk);
+
+	*pkp = NULL;
+}
+
+int
+eddsa_pk_from_ptr(eddsa_pk_t *pk, const void *ptr, size_t len)
+{
+	if (len < sizeof(*pk))
+		return (FIDO_ERR_INVALID_ARGUMENT);
+
+	memcpy(pk, ptr, sizeof(*pk));
+
+	return (FIDO_OK);
+}
+
+EVP_PKEY *
+eddsa_pk_to_EVP_PKEY(const eddsa_pk_t *k)
+{
+	EVP_PKEY *pkey = NULL;
+
+	if ((pkey = EVP_PKEY_new_raw_public_key(EVP_PKEY_ED25519, NULL, k->x,
+	    sizeof(k->x))) == NULL)
+		fido_log_debug("%s: EVP_PKEY_new_raw_public_key", __func__);
+
+	return (pkey);
+}
+
+int
+eddsa_pk_from_EVP_PKEY(eddsa_pk_t *pk, const EVP_PKEY *pkey)
+{
+	size_t len = 0;
+
+	if (EVP_PKEY_get_raw_public_key(pkey, NULL, &len) != 1 ||
+	    len != sizeof(pk->x))
+		return (FIDO_ERR_INTERNAL);
+	if (EVP_PKEY_get_raw_public_key(pkey, pk->x, &len) != 1 ||
+	    len != sizeof(pk->x))
+		return (FIDO_ERR_INTERNAL);
+
+	return (FIDO_OK);
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/err.c mysql-8.0-8.0.27/extra/libfido2/src/err.c
--- mysql-8.0-8.0.26/extra/libfido2/src/err.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/err.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include "fido/err.h"
+
+const char *
+fido_strerr(int n)
+{
+	switch (n) {
+	case FIDO_ERR_SUCCESS:
+		return "FIDO_ERR_SUCCESS";
+	case FIDO_ERR_INVALID_COMMAND:
+		return "FIDO_ERR_INVALID_COMMAND";
+	case FIDO_ERR_INVALID_PARAMETER:
+		return "FIDO_ERR_INVALID_PARAMETER";
+	case FIDO_ERR_INVALID_LENGTH:
+		return "FIDO_ERR_INVALID_LENGTH";
+	case FIDO_ERR_INVALID_SEQ:
+		return "FIDO_ERR_INVALID_SEQ";
+	case FIDO_ERR_TIMEOUT:
+		return "FIDO_ERR_TIMEOUT";
+	case FIDO_ERR_CHANNEL_BUSY:
+		return "FIDO_ERR_CHANNEL_BUSY";
+	case FIDO_ERR_LOCK_REQUIRED:
+		return "FIDO_ERR_LOCK_REQUIRED";
+	case FIDO_ERR_INVALID_CHANNEL:
+		return "FIDO_ERR_INVALID_CHANNEL";
+	case FIDO_ERR_CBOR_UNEXPECTED_TYPE:
+		return "FIDO_ERR_CBOR_UNEXPECTED_TYPE";
+	case FIDO_ERR_INVALID_CBOR:
+		return "FIDO_ERR_INVALID_CBOR";
+	case FIDO_ERR_MISSING_PARAMETER:
+		return "FIDO_ERR_MISSING_PARAMETER";
+	case FIDO_ERR_LIMIT_EXCEEDED:
+		return "FIDO_ERR_LIMIT_EXCEEDED";
+	case FIDO_ERR_UNSUPPORTED_EXTENSION:
+		return "FIDO_ERR_UNSUPPORTED_EXTENSION";
+	case FIDO_ERR_FP_DATABASE_FULL:
+		return "FIDO_ERR_FP_DATABASE_FULL";
+	case FIDO_ERR_CREDENTIAL_EXCLUDED:
+		return "FIDO_ERR_CREDENTIAL_EXCLUDED";
+	case FIDO_ERR_PROCESSING:
+		return "FIDO_ERR_PROCESSING";
+	case FIDO_ERR_INVALID_CREDENTIAL:
+		return "FIDO_ERR_INVALID_CREDENTIAL";
+	case FIDO_ERR_USER_ACTION_PENDING:
+		return "FIDO_ERR_USER_ACTION_PENDING";
+	case FIDO_ERR_OPERATION_PENDING:
+		return "FIDO_ERR_OPERATION_PENDING";
+	case FIDO_ERR_NO_OPERATIONS:
+		return "FIDO_ERR_NO_OPERATIONS";
+	case FIDO_ERR_UNSUPPORTED_ALGORITHM:
+		return "FIDO_ERR_UNSUPPORTED_ALGORITHM";
+	case FIDO_ERR_OPERATION_DENIED:
+		return "FIDO_ERR_OPERATION_DENIED";
+	case FIDO_ERR_KEY_STORE_FULL:
+		return "FIDO_ERR_KEY_STORE_FULL";
+	case FIDO_ERR_NOT_BUSY:
+		return "FIDO_ERR_NOT_BUSY";
+	case FIDO_ERR_NO_OPERATION_PENDING:
+		return "FIDO_ERR_NO_OPERATION_PENDING";
+	case FIDO_ERR_UNSUPPORTED_OPTION:
+		return "FIDO_ERR_UNSUPPORTED_OPTION";
+	case FIDO_ERR_INVALID_OPTION:
+		return "FIDO_ERR_INVALID_OPTION";
+	case FIDO_ERR_KEEPALIVE_CANCEL:
+		return "FIDO_ERR_KEEPALIVE_CANCEL";
+	case FIDO_ERR_NO_CREDENTIALS:
+		return "FIDO_ERR_NO_CREDENTIALS";
+	case FIDO_ERR_USER_ACTION_TIMEOUT:
+		return "FIDO_ERR_USER_ACTION_TIMEOUT";
+	case FIDO_ERR_NOT_ALLOWED:
+		return "FIDO_ERR_NOT_ALLOWED";
+	case FIDO_ERR_PIN_INVALID:
+		return "FIDO_ERR_PIN_INVALID";
+	case FIDO_ERR_PIN_BLOCKED:
+		return "FIDO_ERR_PIN_BLOCKED";
+	case FIDO_ERR_PIN_AUTH_INVALID:
+		return "FIDO_ERR_PIN_AUTH_INVALID";
+	case FIDO_ERR_PIN_AUTH_BLOCKED:
+		return "FIDO_ERR_PIN_AUTH_BLOCKED";
+	case FIDO_ERR_PIN_NOT_SET:
+		return "FIDO_ERR_PIN_NOT_SET";
+	case FIDO_ERR_PIN_REQUIRED:
+		return "FIDO_ERR_PIN_REQUIRED";
+	case FIDO_ERR_PIN_POLICY_VIOLATION:
+		return "FIDO_ERR_PIN_POLICY_VIOLATION";
+	case FIDO_ERR_PIN_TOKEN_EXPIRED:
+		return "FIDO_ERR_PIN_TOKEN_EXPIRED";
+	case FIDO_ERR_REQUEST_TOO_LARGE:
+		return "FIDO_ERR_REQUEST_TOO_LARGE";
+	case FIDO_ERR_ACTION_TIMEOUT:
+		return "FIDO_ERR_ACTION_TIMEOUT";
+	case FIDO_ERR_UP_REQUIRED:
+		return "FIDO_ERR_UP_REQUIRED";
+	case FIDO_ERR_UV_BLOCKED:
+		return "FIDO_ERR_UV_BLOCKED";
+	case FIDO_ERR_ERR_OTHER:
+		return "FIDO_ERR_ERR_OTHER";
+	case FIDO_ERR_SPEC_LAST:
+		return "FIDO_ERR_SPEC_LAST";
+	case FIDO_ERR_TX:
+		return "FIDO_ERR_TX";
+	case FIDO_ERR_RX:
+		return "FIDO_ERR_RX";
+	case FIDO_ERR_RX_NOT_CBOR:
+		return "FIDO_ERR_RX_NOT_CBOR";
+	case FIDO_ERR_RX_INVALID_CBOR:
+		return "FIDO_ERR_RX_INVALID_CBOR";
+	case FIDO_ERR_INVALID_PARAM:
+		return "FIDO_ERR_INVALID_PARAM";
+	case FIDO_ERR_INVALID_SIG:
+		return "FIDO_ERR_INVALID_SIG";
+	case FIDO_ERR_INVALID_ARGUMENT:
+		return "FIDO_ERR_INVALID_ARGUMENT";
+	case FIDO_ERR_USER_PRESENCE_REQUIRED:
+		return "FIDO_ERR_USER_PRESENCE_REQUIRED";
+	case FIDO_ERR_INTERNAL:
+		return "FIDO_ERR_INTERNAL";
+	default:
+		return "FIDO_ERR_UNKNOWN";
+	}
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/es256.c mysql-8.0-8.0.27/extra/libfido2/src/es256.c
--- mysql-8.0-8.0.26/extra/libfido2/src/es256.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/es256.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,460 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <openssl/bn.h>
+#include <openssl/ec.h>
+#include <openssl/evp.h>
+#include <openssl/obj_mac.h>
+
+#include <string.h>
+#include "fido.h"
+#include "fido/es256.h"
+
+static int
+decode_coord(const cbor_item_t *item, void *xy, size_t xy_len)
+{
+	if (cbor_isa_bytestring(item) == false ||
+	    cbor_bytestring_is_definite(item) == false ||
+	    cbor_bytestring_length(item) != xy_len) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (-1);
+	}
+
+	memcpy(xy, cbor_bytestring_handle(item), xy_len);
+
+	return (0);
+}
+
+static int
+decode_pubkey_point(const cbor_item_t *key, const cbor_item_t *val, void *arg)
+{
+	es256_pk_t *k = arg;
+
+	if (cbor_isa_negint(key) == false ||
+	    cbor_int_get_width(key) != CBOR_INT_8)
+		return (0); /* ignore */
+
+	switch (cbor_get_uint8(key)) {
+	case 1: /* x coordinate */
+		return (decode_coord(val, &k->x, sizeof(k->x)));
+	case 2: /* y coordinate */
+		return (decode_coord(val, &k->y, sizeof(k->y)));
+	}
+
+	return (0); /* ignore */
+}
+
+int
+es256_pk_decode(const cbor_item_t *item, es256_pk_t *k)
+{
+	if (cbor_isa_map(item) == false ||
+	    cbor_map_is_definite(item) == false ||
+	    cbor_map_iter(item, k, decode_pubkey_point) < 0) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (-1);
+	}
+
+	return (0);
+}
+
+cbor_item_t *
+es256_pk_encode(const es256_pk_t *pk, int ecdh)
+{
+	cbor_item_t		*item = NULL;
+	struct cbor_pair	 argv[5];
+	int			 alg;
+	int			 ok = -1;
+
+	memset(argv, 0, sizeof(argv));
+
+	if ((item = cbor_new_definite_map(5)) == NULL)
+		goto fail;
+
+	/* kty */
+	if ((argv[0].key = cbor_build_uint8(1)) == NULL ||
+	    (argv[0].value = cbor_build_uint8(2)) == NULL ||
+	    !cbor_map_add(item, argv[0]))
+		goto fail;
+
+	/*
+	 * "The COSEAlgorithmIdentifier used is -25 (ECDH-ES +
+	 * HKDF-256) although this is NOT the algorithm actually
+	 * used. Setting this to a different value may result in
+	 * compatibility issues."
+	 */
+	if (ecdh)
+		alg = COSE_ECDH_ES256;
+	else
+		alg = COSE_ES256;
+
+	/* alg */
+	if ((argv[1].key = cbor_build_uint8(3)) == NULL ||
+	    (argv[1].value = cbor_build_negint8((uint8_t)(-alg - 1))) == NULL ||
+	    !cbor_map_add(item, argv[1]))
+		goto fail;
+
+	/* crv */
+	if ((argv[2].key = cbor_build_negint8(0)) == NULL ||
+	    (argv[2].value = cbor_build_uint8(1)) == NULL ||
+	    !cbor_map_add(item, argv[2]))
+		goto fail;
+
+	/* x */
+	if ((argv[3].key = cbor_build_negint8(1)) == NULL ||
+	    (argv[3].value = cbor_build_bytestring(pk->x,
+	    sizeof(pk->x))) == NULL || !cbor_map_add(item, argv[3]))
+		goto fail;
+
+	/* y */
+	if ((argv[4].key = cbor_build_negint8(2)) == NULL ||
+	    (argv[4].value = cbor_build_bytestring(pk->y,
+	    sizeof(pk->y))) == NULL || !cbor_map_add(item, argv[4]))
+		goto fail;
+
+	ok = 0;
+fail:
+	if (ok < 0) {
+		if (item != NULL) {
+			cbor_decref(&item);
+			item = NULL;
+		}
+	}
+
+	for (size_t i = 0; i < 5; i++) {
+		if (argv[i].key)
+			cbor_decref(&argv[i].key);
+		if (argv[i].value)
+			cbor_decref(&argv[i].value);
+	}
+
+	return (item);
+}
+
+es256_sk_t *
+es256_sk_new(void)
+{
+	return (calloc(1, sizeof(es256_sk_t)));
+}
+
+void
+es256_sk_free(es256_sk_t **skp)
+{
+	es256_sk_t *sk;
+
+	if (skp == NULL || (sk = *skp) == NULL)
+		return;
+
+	explicit_bzero(sk, sizeof(*sk));
+	free(sk);
+
+	*skp = NULL;
+}
+
+es256_pk_t *
+es256_pk_new(void)
+{
+	return (calloc(1, sizeof(es256_pk_t)));
+}
+
+void
+es256_pk_free(es256_pk_t **pkp)
+{
+	es256_pk_t *pk;
+
+	if (pkp == NULL || (pk = *pkp) == NULL)
+		return;
+
+	explicit_bzero(pk, sizeof(*pk));
+	free(pk);
+
+	*pkp = NULL;
+}
+
+int
+es256_pk_from_ptr(es256_pk_t *pk, const void *ptr, size_t len)
+{
+	const uint8_t *p = ptr;
+
+	if (len < sizeof(*pk))
+		return (FIDO_ERR_INVALID_ARGUMENT);
+
+	if (len == sizeof(*pk) + 1 && *p == 0x04)
+		memcpy(pk, ++p, sizeof(*pk)); /* uncompressed format */
+	else
+		memcpy(pk, ptr, sizeof(*pk)); /* libfido2 x||y format */
+
+	return (FIDO_OK);
+}
+
+int
+es256_pk_set_x(es256_pk_t *pk, const unsigned char *x)
+{
+	memcpy(pk->x, x, sizeof(pk->x));
+
+	return (0);
+}
+
+int
+es256_pk_set_y(es256_pk_t *pk, const unsigned char *y)
+{
+	memcpy(pk->y, y, sizeof(pk->y));
+
+	return (0);
+}
+
+int
+es256_sk_create(es256_sk_t *key)
+{
+	EVP_PKEY_CTX	*pctx = NULL;
+	EVP_PKEY_CTX	*kctx = NULL;
+	EVP_PKEY	*p = NULL;
+	EVP_PKEY	*k = NULL;
+	const EC_KEY	*ec;
+	const BIGNUM	*d;
+	const int	 nid = NID_X9_62_prime256v1;
+	int		 n;
+	int		 ok = -1;
+
+	if ((pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_EC, NULL)) == NULL ||
+	    EVP_PKEY_paramgen_init(pctx) <= 0 ||
+	    EVP_PKEY_CTX_set_ec_paramgen_curve_nid(pctx, nid) <= 0 ||
+	    EVP_PKEY_paramgen(pctx, &p) <= 0) {
+		fido_log_debug("%s: EVP_PKEY_paramgen", __func__);
+		goto fail;
+	}
+
+	if ((kctx = EVP_PKEY_CTX_new(p, NULL)) == NULL ||
+	    EVP_PKEY_keygen_init(kctx) <= 0 || EVP_PKEY_keygen(kctx, &k) <= 0) {
+		fido_log_debug("%s: EVP_PKEY_keygen", __func__);
+		goto fail;
+	}
+
+	if ((ec = EVP_PKEY_get0_EC_KEY(k)) == NULL ||
+	    (d = EC_KEY_get0_private_key(ec)) == NULL ||
+	    (n = BN_num_bytes(d)) < 0 || (size_t)n > sizeof(key->d) ||
+	    (n = BN_bn2bin(d, key->d)) < 0 || (size_t)n > sizeof(key->d)) {
+		fido_log_debug("%s: EC_KEY_get0_private_key", __func__);
+		goto fail;
+	}
+
+	ok = 0;
+fail:
+	if (p != NULL)
+		EVP_PKEY_free(p);
+	if (k != NULL)
+		EVP_PKEY_free(k);
+	if (pctx != NULL)
+		EVP_PKEY_CTX_free(pctx);
+	if (kctx != NULL)
+		EVP_PKEY_CTX_free(kctx);
+
+	return (ok);
+}
+
+EVP_PKEY *
+es256_pk_to_EVP_PKEY(const es256_pk_t *k)
+{
+	BN_CTX		*bnctx = NULL;
+	EC_KEY		*ec = NULL;
+	EC_POINT	*q = NULL;
+	EVP_PKEY	*pkey = NULL;
+	BIGNUM		*x = NULL;
+	BIGNUM		*y = NULL;
+	const EC_GROUP	*g = NULL;
+	const int	 nid = NID_X9_62_prime256v1;
+	int		 ok = -1;
+
+	if ((bnctx = BN_CTX_new()) == NULL)
+		goto fail;
+
+	BN_CTX_start(bnctx);
+
+	if ((x = BN_CTX_get(bnctx)) == NULL ||
+	    (y = BN_CTX_get(bnctx)) == NULL)
+		goto fail;
+
+	if (BN_bin2bn(k->x, sizeof(k->x), x) == NULL ||
+	    BN_bin2bn(k->y, sizeof(k->y), y) == NULL) {
+		fido_log_debug("%s: BN_bin2bn", __func__);
+		goto fail;
+	}
+
+	if ((ec = EC_KEY_new_by_curve_name(nid)) == NULL ||
+	    (g = EC_KEY_get0_group(ec)) == NULL) {
+		fido_log_debug("%s: EC_KEY init", __func__);
+		goto fail;
+	}
+
+	if ((q = EC_POINT_new(g)) == NULL ||
+	    EC_POINT_set_affine_coordinates_GFp(g, q, x, y, bnctx) == 0 ||
+	    EC_KEY_set_public_key(ec, q) == 0) {
+		fido_log_debug("%s: EC_KEY_set_public_key", __func__);
+		goto fail;
+	}
+
+	if ((pkey = EVP_PKEY_new()) == NULL ||
+	    EVP_PKEY_assign_EC_KEY(pkey, ec) == 0) {
+		fido_log_debug("%s: EVP_PKEY_assign_EC_KEY", __func__);
+		goto fail;
+	}
+
+	ec = NULL; /* at this point, ec belongs to evp */
+
+	ok = 0;
+fail:
+	if (bnctx != NULL) {
+		BN_CTX_end(bnctx);
+		BN_CTX_free(bnctx);
+	}
+
+	if (ec != NULL)
+		EC_KEY_free(ec);
+	if (q != NULL)
+		EC_POINT_free(q);
+
+	if (ok < 0 && pkey != NULL) {
+		EVP_PKEY_free(pkey);
+		pkey = NULL;
+	}
+
+	return (pkey);
+}
+
+int
+es256_pk_from_EC_KEY(es256_pk_t *pk, const EC_KEY *ec)
+{
+	BN_CTX		*bnctx = NULL;
+	BIGNUM		*x = NULL;
+	BIGNUM		*y = NULL;
+	const EC_POINT	*q = NULL;
+	const EC_GROUP	*g = NULL;
+	int		 ok = FIDO_ERR_INTERNAL;
+	int		 n;
+
+	if ((q = EC_KEY_get0_public_key(ec)) == NULL ||
+	    (g = EC_KEY_get0_group(ec)) == NULL ||
+	    (bnctx = BN_CTX_new()) == NULL)
+		goto fail;
+
+	BN_CTX_start(bnctx);
+
+	if ((x = BN_CTX_get(bnctx)) == NULL ||
+	    (y = BN_CTX_get(bnctx)) == NULL)
+		goto fail;
+
+	if (EC_POINT_get_affine_coordinates_GFp(g, q, x, y, bnctx) == 0 ||
+	    (n = BN_num_bytes(x)) < 0 || (size_t)n > sizeof(pk->x) ||
+	    (n = BN_num_bytes(y)) < 0 || (size_t)n > sizeof(pk->y)) {
+		fido_log_debug("%s: EC_POINT_get_affine_coordinates_GFp",
+		    __func__);
+		goto fail;
+	}
+
+	if ((n = BN_bn2bin(x, pk->x)) < 0 || (size_t)n > sizeof(pk->x) ||
+	    (n = BN_bn2bin(y, pk->y)) < 0 || (size_t)n > sizeof(pk->y)) {
+		fido_log_debug("%s: BN_bn2bin", __func__);
+		goto fail;
+	}
+
+	ok = FIDO_OK;
+fail:
+	if (bnctx != NULL) {
+		BN_CTX_end(bnctx);
+		BN_CTX_free(bnctx);
+	}
+
+	return (ok);
+}
+
+EVP_PKEY *
+es256_sk_to_EVP_PKEY(const es256_sk_t *k)
+{
+	BN_CTX		*bnctx = NULL;
+	EC_KEY		*ec = NULL;
+	EVP_PKEY	*pkey = NULL;
+	BIGNUM		*d = NULL;
+	const int	 nid = NID_X9_62_prime256v1;
+	int		 ok = -1;
+
+	if ((bnctx = BN_CTX_new()) == NULL)
+		goto fail;
+
+	BN_CTX_start(bnctx);
+
+	if ((d = BN_CTX_get(bnctx)) == NULL ||
+	    BN_bin2bn(k->d, sizeof(k->d), d) == NULL) {
+		fido_log_debug("%s: BN_bin2bn", __func__);
+		goto fail;
+	}
+
+	if ((ec = EC_KEY_new_by_curve_name(nid)) == NULL ||
+	    EC_KEY_set_private_key(ec, d) == 0) {
+		fido_log_debug("%s: EC_KEY_set_private_key", __func__);
+		goto fail;
+	}
+
+	if ((pkey = EVP_PKEY_new()) == NULL ||
+	    EVP_PKEY_assign_EC_KEY(pkey, ec) == 0) {
+		fido_log_debug("%s: EVP_PKEY_assign_EC_KEY", __func__);
+		goto fail;
+	}
+
+	ec = NULL; /* at this point, ec belongs to evp */
+
+	ok = 0;
+fail:
+	if (bnctx != NULL) {
+		BN_CTX_end(bnctx);
+		BN_CTX_free(bnctx);
+	}
+
+	if (ec != NULL)
+		EC_KEY_free(ec);
+
+	if (ok < 0 && pkey != NULL) {
+		EVP_PKEY_free(pkey);
+		pkey = NULL;
+	}
+
+	return (pkey);
+}
+
+int
+es256_derive_pk(const es256_sk_t *sk, es256_pk_t *pk)
+{
+	BIGNUM		*d = NULL;
+	EC_KEY		*ec = NULL;
+	EC_POINT	*q = NULL;
+	const EC_GROUP	*g = NULL;
+	const int	 nid = NID_X9_62_prime256v1;
+	int		 ok = -1;
+
+	if ((d = BN_bin2bn(sk->d, (int)sizeof(sk->d), NULL)) == NULL ||
+	    (ec = EC_KEY_new_by_curve_name(nid)) == NULL ||
+	    (g = EC_KEY_get0_group(ec)) == NULL ||
+	    (q = EC_POINT_new(g)) == NULL) {
+		fido_log_debug("%s: get", __func__);
+		goto fail;
+	}
+
+	if (EC_POINT_mul(g, q, d, NULL, NULL, NULL) == 0 ||
+	    EC_KEY_set_public_key(ec, q) == 0 ||
+	    es256_pk_from_EC_KEY(pk, ec) != FIDO_OK) {
+		fido_log_debug("%s: set", __func__);
+		goto fail;
+	}
+
+	ok = 0;
+fail:
+	if (d != NULL)
+		BN_clear_free(d);
+	if (q != NULL)
+		EC_POINT_free(q);
+	if (ec != NULL)
+		EC_KEY_free(ec);
+
+	return (ok);
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/export.gnu mysql-8.0-8.0.27/extra/libfido2/src/export.gnu
--- mysql-8.0-8.0.26/extra/libfido2/src/export.gnu	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/export.gnu	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,199 @@
+{
+	global:
+		eddsa_pk_free;
+		eddsa_pk_from_EVP_PKEY;
+		eddsa_pk_from_ptr;
+		eddsa_pk_new;
+		eddsa_pk_to_EVP_PKEY;
+		es256_pk_free;
+		es256_pk_from_EC_KEY;
+		es256_pk_from_ptr;
+		es256_pk_new;
+		es256_pk_to_EVP_PKEY;
+		fido_assert_allow_cred;
+		fido_assert_authdata_len;
+		fido_assert_authdata_ptr;
+		fido_assert_clientdata_hash_len;
+		fido_assert_clientdata_hash_ptr;
+		fido_assert_count;
+		fido_assert_flags;
+		fido_assert_free;
+		fido_assert_hmac_secret_len;
+		fido_assert_hmac_secret_ptr;
+		fido_assert_id_len;
+		fido_assert_id_ptr;
+		fido_assert_new;
+		fido_assert_rp_id;
+		fido_assert_set_authdata;
+		fido_assert_set_authdata_raw;
+		fido_assert_set_clientdata_hash;
+		fido_assert_set_count;
+		fido_assert_set_extensions;
+		fido_assert_set_hmac_salt;
+		fido_assert_set_options;
+		fido_assert_set_rp;
+		fido_assert_set_sig;
+		fido_assert_set_up;
+		fido_assert_set_uv;
+		fido_assert_sigcount;
+		fido_assert_sig_len;
+		fido_assert_sig_ptr;
+		fido_assert_user_display_name;
+		fido_assert_user_icon;
+		fido_assert_user_id_len;
+		fido_assert_user_id_ptr;
+		fido_assert_user_name;
+		fido_assert_verify;
+		fido_bio_dev_enroll_begin;
+		fido_bio_dev_enroll_cancel;
+		fido_bio_dev_enroll_continue;
+		fido_bio_dev_enroll_remove;
+		fido_bio_dev_get_info;
+		fido_bio_dev_get_template_array;
+		fido_bio_dev_set_template_name;
+		fido_bio_enroll_free;
+		fido_bio_enroll_last_status;
+		fido_bio_enroll_new;
+		fido_bio_enroll_remaining_samples;
+		fido_bio_info_free;
+		fido_bio_info_max_samples;
+		fido_bio_info_new;
+		fido_bio_info_type;
+		fido_bio_template;
+		fido_bio_template_array_count;
+		fido_bio_template_array_free;
+		fido_bio_template_array_new;
+		fido_bio_template_free;
+		fido_bio_template_id_len;
+		fido_bio_template_id_ptr;
+		fido_bio_template_name;
+		fido_bio_template_new;
+		fido_bio_template_set_id;
+		fido_bio_template_set_name;
+		fido_cbor_info_aaguid_len;
+		fido_cbor_info_aaguid_ptr;
+		fido_cbor_info_extensions_len;
+		fido_cbor_info_extensions_ptr;
+		fido_cbor_info_free;
+		fido_cbor_info_maxmsgsiz;
+		fido_cbor_info_maxcredcntlst;
+		fido_cbor_info_maxcredidlen;
+		fido_cbor_info_fwversion;
+		fido_cbor_info_new;
+		fido_cbor_info_options_len;
+		fido_cbor_info_options_name_ptr;
+		fido_cbor_info_options_value_ptr;
+		fido_cbor_info_protocols_len;
+		fido_cbor_info_protocols_ptr;
+		fido_cbor_info_versions_len;
+		fido_cbor_info_versions_ptr;
+		fido_cred_authdata_len;
+		fido_cred_authdata_ptr;
+		fido_cred_clientdata_hash_len;
+		fido_cred_clientdata_hash_ptr;
+		fido_cred_display_name;
+		fido_cred_exclude;
+		fido_cred_flags;
+		fido_cred_fmt;
+		fido_cred_free;
+		fido_cred_id_len;
+		fido_cred_id_ptr;
+		fido_cred_aaguid_len;
+		fido_cred_aaguid_ptr;
+		fido_credman_del_dev_rk;
+		fido_credman_get_dev_metadata;
+		fido_credman_get_dev_rk;
+		fido_credman_get_dev_rp;
+		fido_credman_metadata_free;
+		fido_credman_metadata_new;
+		fido_credman_rk;
+		fido_credman_rk_count;
+		fido_credman_rk_existing;
+		fido_credman_rk_free;
+		fido_credman_rk_new;
+		fido_credman_rk_remaining;
+		fido_credman_rp_count;
+		fido_credman_rp_free;
+		fido_credman_rp_id;
+		fido_credman_rp_id_hash_len;
+		fido_credman_rp_id_hash_ptr;
+		fido_credman_rp_name;
+		fido_credman_rp_new;
+		fido_cred_new;
+		fido_cred_prot;
+		fido_cred_pubkey_len;
+		fido_cred_pubkey_ptr;
+		fido_cred_rp_id;
+		fido_cred_rp_name;
+		fido_cred_set_authdata;
+		fido_cred_set_authdata_raw;
+		fido_cred_set_clientdata_hash;
+		fido_cred_set_extensions;
+		fido_cred_set_fmt;
+		fido_cred_set_options;
+		fido_cred_set_prot;
+		fido_cred_set_rk;
+		fido_cred_set_rp;
+		fido_cred_set_sig;
+		fido_cred_set_type;
+		fido_cred_set_user;
+		fido_cred_set_uv;
+		fido_cred_set_x509;
+		fido_cred_sig_len;
+		fido_cred_sig_ptr;
+		fido_cred_type;
+		fido_cred_user_id_len;
+		fido_cred_user_id_ptr;
+		fido_cred_user_name;
+		fido_cred_verify;
+		fido_cred_verify_self;
+		fido_cred_x5c_len;
+		fido_cred_x5c_ptr;
+		fido_dev_build;
+		fido_dev_cancel;
+		fido_dev_close;
+		fido_dev_flags;
+		fido_dev_force_fido2;
+		fido_dev_force_u2f;
+		fido_dev_free;
+		fido_dev_get_assert;
+		fido_dev_get_cbor_info;
+		fido_dev_get_retry_count;
+		fido_dev_get_touch_begin;
+		fido_dev_get_touch_status;
+		fido_dev_has_pin;
+		fido_dev_info_free;
+		fido_dev_info_manifest;
+		fido_dev_info_manufacturer_string;
+		fido_dev_info_new;
+		fido_dev_info_path;
+		fido_dev_info_product;
+		fido_dev_info_product_string;
+		fido_dev_info_ptr;
+		fido_dev_info_vendor;
+		fido_dev_is_fido2;
+		fido_dev_major;
+		fido_dev_make_cred;
+		fido_dev_minor;
+		fido_dev_new;
+                fido_dev_new_with_info;
+		fido_dev_open;
+                fido_dev_open_with_info;
+		fido_dev_protocol;
+		fido_dev_reset;
+		fido_dev_set_io_functions;
+		fido_dev_set_pin;
+		fido_dev_set_transport_functions;
+		fido_dev_supports_cred_prot;
+		fido_dev_supports_pin;
+		fido_init;
+		fido_set_log_handler;
+		fido_strerr;
+		rs256_pk_free;
+		rs256_pk_from_ptr;
+		rs256_pk_from_RSA;
+		rs256_pk_new;
+		rs256_pk_to_EVP_PKEY;
+	local:
+		*;
+};
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/export.llvm mysql-8.0-8.0.27/extra/libfido2/src/export.llvm
--- mysql-8.0-8.0.26/extra/libfido2/src/export.llvm	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/export.llvm	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,194 @@
+_eddsa_pk_free
+_eddsa_pk_from_EVP_PKEY
+_eddsa_pk_from_ptr
+_eddsa_pk_new
+_eddsa_pk_to_EVP_PKEY
+_es256_pk_free
+_es256_pk_from_EC_KEY
+_es256_pk_from_ptr
+_es256_pk_new
+_es256_pk_to_EVP_PKEY
+_fido_assert_allow_cred
+_fido_assert_authdata_len
+_fido_assert_authdata_ptr
+_fido_assert_clientdata_hash_len
+_fido_assert_clientdata_hash_ptr
+_fido_assert_count
+_fido_assert_flags
+_fido_assert_free
+_fido_assert_hmac_secret_len
+_fido_assert_hmac_secret_ptr
+_fido_assert_id_len
+_fido_assert_id_ptr
+_fido_assert_new
+_fido_assert_rp_id
+_fido_assert_set_authdata
+_fido_assert_set_authdata_raw
+_fido_assert_set_clientdata_hash
+_fido_assert_set_count
+_fido_assert_set_extensions
+_fido_assert_set_hmac_salt
+_fido_assert_set_options
+_fido_assert_set_rp
+_fido_assert_set_sig
+_fido_assert_set_up
+_fido_assert_set_uv
+_fido_assert_sigcount
+_fido_assert_sig_len
+_fido_assert_sig_ptr
+_fido_assert_user_display_name
+_fido_assert_user_icon
+_fido_assert_user_id_len
+_fido_assert_user_id_ptr
+_fido_assert_user_name
+_fido_assert_verify
+_fido_bio_dev_enroll_begin
+_fido_bio_dev_enroll_cancel
+_fido_bio_dev_enroll_continue
+_fido_bio_dev_enroll_remove
+_fido_bio_dev_get_info
+_fido_bio_dev_get_template_array
+_fido_bio_dev_set_template_name
+_fido_bio_enroll_free
+_fido_bio_enroll_last_status
+_fido_bio_enroll_new
+_fido_bio_enroll_remaining_samples
+_fido_bio_info_free
+_fido_bio_info_max_samples
+_fido_bio_info_new
+_fido_bio_info_type
+_fido_bio_template
+_fido_bio_template_array_count
+_fido_bio_template_array_free
+_fido_bio_template_array_new
+_fido_bio_template_free
+_fido_bio_template_id_len
+_fido_bio_template_id_ptr
+_fido_bio_template_name
+_fido_bio_template_new
+_fido_bio_template_set_id
+_fido_bio_template_set_name
+_fido_cbor_info_aaguid_len
+_fido_cbor_info_aaguid_ptr
+_fido_cbor_info_extensions_len
+_fido_cbor_info_extensions_ptr
+_fido_cbor_info_free
+_fido_cbor_info_maxmsgsiz
+_fido_cbor_info_maxcredcntlst
+_fido_cbor_info_maxcredidlen
+_fido_cbor_info_fwversion
+_fido_cbor_info_new
+_fido_cbor_info_options_len
+_fido_cbor_info_options_name_ptr
+_fido_cbor_info_options_value_ptr
+_fido_cbor_info_protocols_len
+_fido_cbor_info_protocols_ptr
+_fido_cbor_info_versions_len
+_fido_cbor_info_versions_ptr
+_fido_cred_authdata_len
+_fido_cred_authdata_ptr
+_fido_cred_clientdata_hash_len
+_fido_cred_clientdata_hash_ptr
+_fido_cred_display_name
+_fido_cred_exclude
+_fido_cred_flags
+_fido_cred_fmt
+_fido_cred_free
+_fido_cred_id_len
+_fido_cred_id_ptr
+_fido_cred_aaguid_len
+_fido_cred_aaguid_ptr
+_fido_credman_del_dev_rk
+_fido_credman_get_dev_metadata
+_fido_credman_get_dev_rk
+_fido_credman_get_dev_rp
+_fido_credman_metadata_free
+_fido_credman_metadata_new
+_fido_credman_rk
+_fido_credman_rk_count
+_fido_credman_rk_existing
+_fido_credman_rk_free
+_fido_credman_rk_new
+_fido_credman_rk_remaining
+_fido_credman_rp_count
+_fido_credman_rp_free
+_fido_credman_rp_id
+_fido_credman_rp_id_hash_len
+_fido_credman_rp_id_hash_ptr
+_fido_credman_rp_name
+_fido_credman_rp_new
+_fido_cred_new
+_fido_cred_prot
+_fido_cred_pubkey_len
+_fido_cred_pubkey_ptr
+_fido_cred_rp_id
+_fido_cred_rp_name
+_fido_cred_set_authdata
+_fido_cred_set_authdata_raw
+_fido_cred_set_clientdata_hash
+_fido_cred_set_extensions
+_fido_cred_set_fmt
+_fido_cred_set_options
+_fido_cred_set_prot
+_fido_cred_set_rk
+_fido_cred_set_rp
+_fido_cred_set_sig
+_fido_cred_set_type
+_fido_cred_set_user
+_fido_cred_set_uv
+_fido_cred_set_x509
+_fido_cred_sig_len
+_fido_cred_sig_ptr
+_fido_cred_type
+_fido_cred_user_id_len
+_fido_cred_user_id_ptr
+_fido_cred_user_name
+_fido_cred_verify
+_fido_cred_verify_self
+_fido_cred_x5c_len
+_fido_cred_x5c_ptr
+_fido_dev_build
+_fido_dev_cancel
+_fido_dev_close
+_fido_dev_flags
+_fido_dev_force_fido2
+_fido_dev_force_u2f
+_fido_dev_free
+_fido_dev_get_assert
+_fido_dev_get_cbor_info
+_fido_dev_get_retry_count
+_fido_dev_get_touch_begin
+_fido_dev_get_touch_status
+_fido_dev_has_pin
+_fido_dev_info_free
+_fido_dev_info_manifest
+_fido_dev_info_manufacturer_string
+_fido_dev_info_new
+_fido_dev_info_path
+_fido_dev_info_product
+_fido_dev_info_product_string
+_fido_dev_info_ptr
+_fido_dev_info_vendor
+_fido_dev_is_fido2
+_fido_dev_major
+_fido_dev_make_cred
+_fido_dev_minor
+_fido_dev_new
+_fido_dev_new_with_info
+_fido_dev_open
+_fido_dev_open_with_info
+_fido_dev_protocol
+_fido_dev_reset
+_fido_dev_set_io_functions
+_fido_dev_set_pin
+_fido_dev_set_transport_functions
+_fido_dev_supports_cred_prot
+_fido_dev_supports_pin
+_fido_init
+_fido_set_log_handler
+_fido_strerr
+_rs256_pk_free
+_rs256_pk_from_ptr
+_rs256_pk_from_RSA
+_rs256_pk_new
+_rs256_pk_to_EVP_PKEY
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/export.msvc mysql-8.0-8.0.27/extra/libfido2/src/export.msvc
--- mysql-8.0-8.0.26/extra/libfido2/src/export.msvc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/export.msvc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,195 @@
+EXPORTS
+eddsa_pk_free
+eddsa_pk_from_EVP_PKEY
+eddsa_pk_from_ptr
+eddsa_pk_new
+eddsa_pk_to_EVP_PKEY
+es256_pk_free
+es256_pk_from_EC_KEY
+es256_pk_from_ptr
+es256_pk_new
+es256_pk_to_EVP_PKEY
+fido_assert_allow_cred
+fido_assert_authdata_len
+fido_assert_authdata_ptr
+fido_assert_clientdata_hash_len
+fido_assert_clientdata_hash_ptr
+fido_assert_count
+fido_assert_flags
+fido_assert_free
+fido_assert_hmac_secret_len
+fido_assert_hmac_secret_ptr
+fido_assert_id_len
+fido_assert_id_ptr
+fido_assert_new
+fido_assert_rp_id
+fido_assert_set_authdata
+fido_assert_set_authdata_raw
+fido_assert_set_clientdata_hash
+fido_assert_set_count
+fido_assert_set_extensions
+fido_assert_set_hmac_salt
+fido_assert_set_options
+fido_assert_set_rp
+fido_assert_set_sig
+fido_assert_set_up
+fido_assert_set_uv
+fido_assert_sigcount
+fido_assert_sig_len
+fido_assert_sig_ptr
+fido_assert_user_display_name
+fido_assert_user_icon
+fido_assert_user_id_len
+fido_assert_user_id_ptr
+fido_assert_user_name
+fido_assert_verify
+fido_bio_dev_enroll_begin
+fido_bio_dev_enroll_cancel
+fido_bio_dev_enroll_continue
+fido_bio_dev_enroll_remove
+fido_bio_dev_get_info
+fido_bio_dev_get_template_array
+fido_bio_dev_set_template_name
+fido_bio_enroll_free
+fido_bio_enroll_last_status
+fido_bio_enroll_new
+fido_bio_enroll_remaining_samples
+fido_bio_info_free
+fido_bio_info_max_samples
+fido_bio_info_new
+fido_bio_info_type
+fido_bio_template
+fido_bio_template_array_count
+fido_bio_template_array_free
+fido_bio_template_array_new
+fido_bio_template_free
+fido_bio_template_id_len
+fido_bio_template_id_ptr
+fido_bio_template_name
+fido_bio_template_new
+fido_bio_template_set_id
+fido_bio_template_set_name
+fido_cbor_info_aaguid_len
+fido_cbor_info_aaguid_ptr
+fido_cbor_info_extensions_len
+fido_cbor_info_extensions_ptr
+fido_cbor_info_free
+fido_cbor_info_maxmsgsiz
+fido_cbor_info_maxcredcntlst
+fido_cbor_info_maxcredidlen
+fido_cbor_info_fwversion
+fido_cbor_info_new
+fido_cbor_info_options_len
+fido_cbor_info_options_name_ptr
+fido_cbor_info_options_value_ptr
+fido_cbor_info_protocols_len
+fido_cbor_info_protocols_ptr
+fido_cbor_info_versions_len
+fido_cbor_info_versions_ptr
+fido_cred_authdata_len
+fido_cred_authdata_ptr
+fido_cred_clientdata_hash_len
+fido_cred_clientdata_hash_ptr
+fido_cred_display_name
+fido_cred_exclude
+fido_cred_flags
+fido_cred_fmt
+fido_cred_free
+fido_cred_id_len
+fido_cred_id_ptr
+fido_cred_aaguid_len
+fido_cred_aaguid_ptr
+fido_credman_del_dev_rk
+fido_credman_get_dev_metadata
+fido_credman_get_dev_rk
+fido_credman_get_dev_rp
+fido_credman_metadata_free
+fido_credman_metadata_new
+fido_credman_rk
+fido_credman_rk_count
+fido_credman_rk_existing
+fido_credman_rk_free
+fido_credman_rk_new
+fido_credman_rk_remaining
+fido_credman_rp_count
+fido_credman_rp_free
+fido_credman_rp_id
+fido_credman_rp_id_hash_len
+fido_credman_rp_id_hash_ptr
+fido_credman_rp_name
+fido_credman_rp_new
+fido_cred_new
+fido_cred_prot
+fido_cred_pubkey_len
+fido_cred_pubkey_ptr
+fido_cred_rp_id
+fido_cred_rp_name
+fido_cred_set_authdata
+fido_cred_set_authdata_raw
+fido_cred_set_clientdata_hash
+fido_cred_set_extensions
+fido_cred_set_fmt
+fido_cred_set_options
+fido_cred_set_prot
+fido_cred_set_rk
+fido_cred_set_rp
+fido_cred_set_sig
+fido_cred_set_type
+fido_cred_set_user
+fido_cred_set_uv
+fido_cred_set_x509
+fido_cred_sig_len
+fido_cred_sig_ptr
+fido_cred_type
+fido_cred_user_id_len
+fido_cred_user_id_ptr
+fido_cred_user_name
+fido_cred_verify
+fido_cred_verify_self
+fido_cred_x5c_len
+fido_cred_x5c_ptr
+fido_dev_build
+fido_dev_cancel
+fido_dev_close
+fido_dev_flags
+fido_dev_force_fido2
+fido_dev_force_u2f
+fido_dev_free
+fido_dev_get_assert
+fido_dev_get_cbor_info
+fido_dev_get_retry_count
+fido_dev_get_touch_begin
+fido_dev_get_touch_status
+fido_dev_has_pin
+fido_dev_info_free
+fido_dev_info_manifest
+fido_dev_info_manufacturer_string
+fido_dev_info_new
+fido_dev_info_path
+fido_dev_info_product
+fido_dev_info_product_string
+fido_dev_info_ptr
+fido_dev_info_vendor
+fido_dev_is_fido2
+fido_dev_major
+fido_dev_make_cred
+fido_dev_minor
+fido_dev_new
+fido_dev_new_with_info
+fido_dev_open
+fido_dev_open_with_info
+fido_dev_protocol
+fido_dev_reset
+fido_dev_set_io_functions
+fido_dev_set_pin
+fido_dev_set_transport_functions
+fido_dev_supports_cred_prot
+fido_dev_supports_pin
+fido_init
+fido_set_log_handler
+fido_strerr
+rs256_pk_free
+rs256_pk_from_ptr
+rs256_pk_from_RSA
+rs256_pk_new
+rs256_pk_to_EVP_PKEY
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/extern.h mysql-8.0-8.0.27/extra/libfido2/src/extern.h
--- mysql-8.0-8.0.26/extra/libfido2/src/extern.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/extern.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#ifndef _EXTERN_H
+#define _EXTERN_H
+
+#include <stdint.h>
+
+#include "fido/types.h"
+#include "blob.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/* aes256 */
+int aes256_cbc_dec(const fido_blob_t *, const fido_blob_t *, fido_blob_t *);
+int aes256_cbc_enc(const fido_blob_t *, const fido_blob_t *, fido_blob_t *);
+
+/* cbor encoding functions */
+cbor_item_t *cbor_flatten_vector(cbor_item_t **, size_t);
+cbor_item_t *cbor_encode_assert_options(fido_opt_t, fido_opt_t);
+cbor_item_t *cbor_encode_change_pin_auth(const fido_blob_t *,
+    const fido_blob_t *, const fido_blob_t *);
+cbor_item_t *cbor_encode_extensions(const fido_cred_ext_t *);
+cbor_item_t *cbor_encode_hmac_secret_param(const fido_blob_t *,
+    const es256_pk_t *, const fido_blob_t *);
+cbor_item_t *cbor_encode_options(fido_opt_t, fido_opt_t);
+cbor_item_t *cbor_encode_pin_auth(const fido_blob_t *, const fido_blob_t *);
+cbor_item_t *cbor_encode_pin_enc(const fido_blob_t *, const fido_blob_t *);
+cbor_item_t *cbor_encode_pin_hash_enc(const fido_blob_t *, const fido_blob_t *);
+cbor_item_t *cbor_encode_pin_opt(void);
+cbor_item_t *cbor_encode_pubkey(const fido_blob_t *);
+cbor_item_t *cbor_encode_pubkey_list(const fido_blob_array_t *);
+cbor_item_t *cbor_encode_pubkey_param(int);
+cbor_item_t *cbor_encode_rp_entity(const fido_rp_t *);
+cbor_item_t *cbor_encode_set_pin_auth(const fido_blob_t *, const fido_blob_t *);
+cbor_item_t *cbor_encode_user_entity(const fido_user_t *);
+cbor_item_t *es256_pk_encode(const es256_pk_t *, int);
+
+/* cbor decoding functions */
+int cbor_decode_attstmt(const cbor_item_t *, fido_attstmt_t *);
+int cbor_decode_cred_authdata(const cbor_item_t *, int, fido_blob_t *,
+    fido_authdata_t *, fido_attcred_t *, fido_cred_ext_t *);
+int cbor_decode_assert_authdata(const cbor_item_t *, fido_blob_t *,
+    fido_authdata_t *, int *, fido_blob_t *);
+int cbor_decode_cred_id(const cbor_item_t *, fido_blob_t *);
+int cbor_decode_fmt(const cbor_item_t *, char **);
+int cbor_decode_pubkey(const cbor_item_t *, int *, void *);
+int cbor_decode_rp_entity(const cbor_item_t *, fido_rp_t *);
+int cbor_decode_uint64(const cbor_item_t *, uint64_t *);
+int cbor_decode_user(const cbor_item_t *, fido_user_t *);
+int es256_pk_decode(const cbor_item_t *, es256_pk_t *);
+int rs256_pk_decode(const cbor_item_t *, rs256_pk_t *);
+int eddsa_pk_decode(const cbor_item_t *, eddsa_pk_t *);
+
+/* auxiliary cbor routines */
+int cbor_add_bool(cbor_item_t *, const char *, fido_opt_t);
+int cbor_add_bytestring(cbor_item_t *, const char *, const unsigned char *,
+    size_t);
+int cbor_add_string(cbor_item_t *, const char *, const char *);
+int cbor_array_iter(const cbor_item_t *, void *, int(*)(const cbor_item_t *,
+    void *));
+int cbor_build_frame(uint8_t, cbor_item_t *[], size_t, fido_blob_t *);
+int cbor_bytestring_copy(const cbor_item_t *, unsigned char **, size_t *);
+int cbor_map_iter(const cbor_item_t *, void *, int(*)(const cbor_item_t *,
+    const cbor_item_t *, void *));
+int cbor_string_copy(const cbor_item_t *, char **);
+int cbor_parse_reply(const unsigned char *, size_t, void *,
+    int(*)(const cbor_item_t *, const cbor_item_t *, void *));
+int cbor_add_pin_params(fido_dev_t *, const fido_blob_t *, const es256_pk_t *,
+    const fido_blob_t *,const char *, cbor_item_t **, cbor_item_t **);
+void cbor_vector_free(cbor_item_t **, size_t);
+
+#ifndef nitems
+#define nitems(_a)	(sizeof((_a)) / sizeof((_a)[0]))
+#endif
+
+/* buf */
+int fido_buf_read(const unsigned char **, size_t *, void *, size_t);
+int fido_buf_write(unsigned char **, size_t *, const void *, size_t);
+
+/* hid i/o */
+void *fido_hid_open(const char *);
+void  fido_hid_close(void *);
+int fido_hid_read(void *, unsigned char *, size_t, int);
+int fido_hid_write(void *, const unsigned char *, size_t);
+size_t fido_hid_report_in_len(void *);
+size_t fido_hid_report_out_len(void *);
+
+/* generic i/o */
+int fido_rx_cbor_status(fido_dev_t *, int);
+int fido_rx(fido_dev_t *, uint8_t, void *, size_t, int);
+int fido_tx(fido_dev_t *, uint8_t, const void *, size_t);
+
+/* log */
+#ifdef FIDO_NO_DIAGNOSTIC
+#define fido_log_init(...)	do { /* nothing */ } while (0)
+#define fido_log_debug(...)	do { /* nothing */ } while (0)
+#define fido_log_xxd(...)	do { /* nothing */ } while (0)
+#else
+#ifdef __GNUC__
+void fido_log_init(void);
+void fido_log_debug(const char *, ...)
+    __attribute__((__format__ (printf, 1, 2)));
+void fido_log_xxd(const void *, size_t);
+#else
+void fido_log_init(void);
+void fido_log_debug(const char *, ...);
+void fido_log_xxd(const void *, size_t);
+#endif /* __GNUC__ */
+#endif /* FIDO_NO_DIAGNOSTIC */
+
+/* u2f */
+int u2f_register(fido_dev_t *, fido_cred_t *, int);
+int u2f_authenticate(fido_dev_t *, fido_assert_t *, int);
+int u2f_get_touch_begin(fido_dev_t *);
+int u2f_get_touch_status(fido_dev_t *, int *, int);
+
+/* unexposed fido ops */
+int fido_dev_authkey(fido_dev_t *, es256_pk_t *);
+int fido_dev_get_cbor_info_wait(fido_dev_t *, fido_cbor_info_t *, int);
+int fido_dev_get_pin_token(fido_dev_t *, const char *, const fido_blob_t *,
+    const es256_pk_t *, fido_blob_t *);
+int fido_do_ecdh(fido_dev_t *, es256_pk_t **, fido_blob_t **);
+
+/* misc */
+void fido_assert_reset_rx(fido_assert_t *);
+void fido_assert_reset_tx(fido_assert_t *);
+void fido_cred_reset_rx(fido_cred_t *);
+void fido_cred_reset_tx(fido_cred_t *);
+int fido_check_rp_id(const char *, const unsigned char *);
+int fido_check_flags(uint8_t, fido_opt_t, fido_opt_t);
+
+/* crypto */
+int fido_verify_sig_es256(const fido_blob_t *, const es256_pk_t *,
+    const fido_blob_t *);
+int fido_verify_sig_rs256(const fido_blob_t *, const rs256_pk_t *,
+    const fido_blob_t *);
+int fido_verify_sig_eddsa(const fido_blob_t *, const eddsa_pk_t *,
+    const fido_blob_t *);
+int fido_get_signed_hash(int, fido_blob_t *, const fido_blob_t *,
+    const fido_blob_t *);
+
+/* hid device manifest */
+int fido_hid_manifest(fido_dev_info_t *, size_t, size_t *);
+
+/* device manifest registration */
+typedef int (*dev_manifest_func_t)(fido_dev_info_t *, size_t, size_t *);
+int fido_dev_register_manifest_func(const dev_manifest_func_t);
+void fido_dev_unregister_manifest_func(const dev_manifest_func_t);
+
+/* fuzzing instrumentation */
+#ifdef FIDO_FUZZ
+uint32_t uniform_random(uint32_t);
+#endif
+
+/* internal device capability flags */
+#define FIDO_DEV_PIN_SET	0x01
+#define FIDO_DEV_PIN_UNSET	0x02
+#define FIDO_DEV_CRED_PROT	0x04
+
+/* miscellanea */
+#define FIDO_DUMMY_CLIENTDATA	""
+#define FIDO_DUMMY_RP_ID	"localhost"
+#define FIDO_DUMMY_USER_NAME	"dummy"
+#define FIDO_DUMMY_USER_ID	1
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !_EXTERN_H */
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/fido/bio.h mysql-8.0-8.0.27/extra/libfido2/src/fido/bio.h
--- mysql-8.0-8.0.26/extra/libfido2/src/fido/bio.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/fido/bio.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2019 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#ifndef _FIDO_BIO_H
+#define _FIDO_BIO_H
+
+#include <stdint.h>
+#include <stdlib.h>
+
+#ifdef _FIDO_INTERNAL
+#include "blob.h"
+#include "fido/err.h"
+#include "fido/param.h"
+#include "fido/types.h"
+#else
+#include <fido.h>
+#include <fido/err.h>
+#include <fido/param.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#ifdef _FIDO_INTERNAL
+struct fido_bio_template {
+	fido_blob_t id;
+	char *name;
+};
+
+struct fido_bio_template_array {
+	struct fido_bio_template *ptr;
+	size_t n_alloc; /* number of allocated entries */
+	size_t n_rx;    /* number of populated entries */
+};
+
+struct fido_bio_enroll {
+	uint8_t remaining_samples;
+	uint8_t last_status;
+	fido_blob_t *token;
+};
+
+struct fido_bio_info {
+	uint8_t type;
+	uint8_t max_samples;
+};
+#endif
+
+typedef struct fido_bio_template fido_bio_template_t;
+typedef struct fido_bio_template_array fido_bio_template_array_t;
+typedef struct fido_bio_enroll fido_bio_enroll_t;
+typedef struct fido_bio_info fido_bio_info_t;
+
+#define FIDO_BIO_ENROLL_FP_GOOD				0x00
+#define FIDO_BIO_ENROLL_FP_TOO_HIGH			0x01
+#define FIDO_BIO_ENROLL_FP_TOO_LOW			0x02
+#define FIDO_BIO_ENROLL_FP_TOO_LEFT			0x03
+#define FIDO_BIO_ENROLL_FP_TOO_RIGHT			0x04
+#define FIDO_BIO_ENROLL_FP_TOO_FAST			0x05
+#define FIDO_BIO_ENROLL_FP_TOO_SLOW			0x06
+#define FIDO_BIO_ENROLL_FP_POOR_QUALITY			0x07
+#define FIDO_BIO_ENROLL_FP_TOO_SKEWED			0x08
+#define FIDO_BIO_ENROLL_FP_TOO_SHORT			0x09
+#define FIDO_BIO_ENROLL_FP_MERGE_FAILURE		0x0a
+#define FIDO_BIO_ENROLL_FP_EXISTS			0x0b
+#define FIDO_BIO_ENROLL_FP_DATABASE_FULL		0x0c
+#define FIDO_BIO_ENROLL_NO_USER_ACTIVITY		0x0d
+#define FIDO_BIO_ENROLL_NO_USER_PRESENCE_TRANSITION	0x0e
+
+const char *fido_bio_template_name(const fido_bio_template_t *);
+const fido_bio_template_t *fido_bio_template(const fido_bio_template_array_t *,
+    size_t);
+const unsigned char *fido_bio_template_id_ptr(const fido_bio_template_t *);
+fido_bio_enroll_t *fido_bio_enroll_new(void);
+fido_bio_info_t *fido_bio_info_new(void);
+fido_bio_template_array_t *fido_bio_template_array_new(void);
+fido_bio_template_t *fido_bio_template_new(void);
+int fido_bio_dev_enroll_begin(fido_dev_t *, fido_bio_template_t *,
+    fido_bio_enroll_t *, uint32_t, const char *);
+int fido_bio_dev_enroll_cancel(fido_dev_t *);
+int fido_bio_dev_enroll_continue(fido_dev_t *, const fido_bio_template_t *,
+    fido_bio_enroll_t *, uint32_t);
+int fido_bio_dev_enroll_remove(fido_dev_t *, const fido_bio_template_t *,
+    const char *);
+int fido_bio_dev_get_info(fido_dev_t *, fido_bio_info_t *);
+int fido_bio_dev_get_template_array(fido_dev_t *, fido_bio_template_array_t *,
+    const char *);
+int fido_bio_dev_set_template_name(fido_dev_t *, const fido_bio_template_t *,
+    const char *);
+int fido_bio_template_set_id(fido_bio_template_t *, const unsigned char *,
+    size_t);
+int fido_bio_template_set_name(fido_bio_template_t *, const char *);
+size_t fido_bio_template_array_count(const fido_bio_template_array_t *);
+size_t fido_bio_template_id_len(const fido_bio_template_t *);
+uint8_t fido_bio_enroll_last_status(const fido_bio_enroll_t *);
+uint8_t fido_bio_enroll_remaining_samples(const fido_bio_enroll_t *);
+uint8_t fido_bio_info_max_samples(const fido_bio_info_t *);
+uint8_t fido_bio_info_type(const fido_bio_info_t *);
+void fido_bio_enroll_free(fido_bio_enroll_t **);
+void fido_bio_info_free(fido_bio_info_t **);
+void fido_bio_template_array_free(fido_bio_template_array_t **);
+void fido_bio_template_free(fido_bio_template_t **);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !_FIDO_BIO_H */
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/fido/credman.h mysql-8.0-8.0.27/extra/libfido2/src/fido/credman.h
--- mysql-8.0-8.0.26/extra/libfido2/src/fido/credman.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/fido/credman.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2019 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#ifndef _FIDO_CREDMAN_H
+#define _FIDO_CREDMAN_H
+
+#include <stdint.h>
+#include <stdlib.h>
+
+#ifdef _FIDO_INTERNAL
+#include "blob.h"
+#include "fido/err.h"
+#include "fido/param.h"
+#include "fido/types.h"
+#else
+#include <fido.h>
+#include <fido/err.h>
+#include <fido/param.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#ifdef _FIDO_INTERNAL
+struct fido_credman_metadata {
+	uint64_t rk_existing;
+	uint64_t rk_remaining;
+};
+
+struct fido_credman_single_rp {
+	fido_rp_t rp_entity;
+	fido_blob_t rp_id_hash;
+};
+
+struct fido_credman_rp {
+	struct fido_credman_single_rp *ptr;
+	size_t n_alloc; /* number of allocated entries */
+	size_t n_rx;    /* number of populated entries */
+};
+
+struct fido_credman_rk {
+	fido_cred_t *ptr;
+	size_t n_alloc; /* number of allocated entries */
+	size_t n_rx;    /* number of populated entries */
+};
+#endif
+
+typedef struct fido_credman_metadata fido_credman_metadata_t;
+typedef struct fido_credman_rk fido_credman_rk_t;
+typedef struct fido_credman_rp fido_credman_rp_t;
+
+const char *fido_credman_rp_id(const fido_credman_rp_t *, size_t);
+const char *fido_credman_rp_name(const fido_credman_rp_t *, size_t);
+
+const fido_cred_t *fido_credman_rk(const fido_credman_rk_t *, size_t);
+const unsigned char *fido_credman_rp_id_hash_ptr(const fido_credman_rp_t *,
+    size_t);
+
+fido_credman_metadata_t *fido_credman_metadata_new(void);
+fido_credman_rk_t *fido_credman_rk_new(void);
+fido_credman_rp_t *fido_credman_rp_new(void);
+
+int fido_credman_del_dev_rk(fido_dev_t *, const unsigned char *, size_t,
+    const char *);
+int fido_credman_get_dev_metadata(fido_dev_t *, fido_credman_metadata_t *,
+    const char *);
+int fido_credman_get_dev_rk(fido_dev_t *, const char *, fido_credman_rk_t *,
+    const char *);
+int fido_credman_get_dev_rp(fido_dev_t *, fido_credman_rp_t *, const char *);
+
+size_t fido_credman_rk_count(const fido_credman_rk_t *);
+size_t fido_credman_rp_count(const fido_credman_rp_t *);
+size_t fido_credman_rp_id_hash_len(const fido_credman_rp_t *, size_t);
+
+uint64_t fido_credman_rk_existing(const fido_credman_metadata_t *);
+uint64_t fido_credman_rk_remaining(const fido_credman_metadata_t *);
+
+void fido_credman_metadata_free(fido_credman_metadata_t **);
+void fido_credman_rk_free(fido_credman_rk_t **);
+void fido_credman_rp_free(fido_credman_rp_t **);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !_FIDO_CREDMAN_H */
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/fido/eddsa.h mysql-8.0-8.0.27/extra/libfido2/src/fido/eddsa.h
--- mysql-8.0-8.0.26/extra/libfido2/src/fido/eddsa.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/fido/eddsa.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2019 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#ifndef _FIDO_EDDSA_H
+#define _FIDO_EDDSA_H
+
+#include <openssl/ec.h>
+
+#include <stdint.h>
+#include <stdlib.h>
+
+#ifdef _FIDO_INTERNAL
+#include "types.h"
+#else
+#include <fido.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+eddsa_pk_t *eddsa_pk_new(void);
+void eddsa_pk_free(eddsa_pk_t **);
+EVP_PKEY *eddsa_pk_to_EVP_PKEY(const eddsa_pk_t *);
+
+int eddsa_pk_from_EVP_PKEY(eddsa_pk_t *, const EVP_PKEY *);
+int eddsa_pk_from_ptr(eddsa_pk_t *, const void *, size_t);
+
+#ifdef _FIDO_INTERNAL
+
+#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10101000L
+#define EVP_PKEY_ED25519 EVP_PKEY_NONE
+int EVP_PKEY_get_raw_public_key(const EVP_PKEY *, unsigned char *, size_t *);
+EVP_PKEY *EVP_PKEY_new_raw_public_key(int, ENGINE *, const unsigned char *,
+    size_t);
+int EVP_DigestVerify(EVP_MD_CTX *, const unsigned char *, size_t,
+    const unsigned char *, size_t);
+#endif /* LIBRESSL_VERSION_NUMBER || OPENSSL_VERSION_NUMBER < 0x10101000L */
+
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+EVP_MD_CTX *EVP_MD_CTX_new(void);
+void EVP_MD_CTX_free(EVP_MD_CTX *);
+#endif
+
+#endif /* _FIDO_INTERNAL */
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !_FIDO_EDDSA_H */
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/fido/err.h mysql-8.0-8.0.27/extra/libfido2/src/fido/err.h
--- mysql-8.0-8.0.26/extra/libfido2/src/fido/err.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/fido/err.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#ifndef _FIDO_ERR_H
+#define _FIDO_ERR_H
+
+#define	FIDO_ERR_SUCCESS		0x00
+#define FIDO_ERR_INVALID_COMMAND	0x01
+#define FIDO_ERR_INVALID_PARAMETER	0x02
+#define FIDO_ERR_INVALID_LENGTH		0x03
+#define FIDO_ERR_INVALID_SEQ		0x04
+#define FIDO_ERR_TIMEOUT		0x05
+#define FIDO_ERR_CHANNEL_BUSY		0x06
+#define FIDO_ERR_LOCK_REQUIRED		0x0a
+#define FIDO_ERR_INVALID_CHANNEL	0x0b
+#define FIDO_ERR_CBOR_UNEXPECTED_TYPE	0x11
+#define FIDO_ERR_INVALID_CBOR		0x12
+#define FIDO_ERR_MISSING_PARAMETER	0x14
+#define FIDO_ERR_LIMIT_EXCEEDED		0x15
+#define FIDO_ERR_UNSUPPORTED_EXTENSION	0x16
+#define FIDO_ERR_FP_DATABASE_FULL	0x17
+#define FIDO_ERR_CREDENTIAL_EXCLUDED	0x19
+#define FIDO_ERR_PROCESSING		0x21
+#define FIDO_ERR_INVALID_CREDENTIAL	0x22
+#define FIDO_ERR_USER_ACTION_PENDING	0x23
+#define FIDO_ERR_OPERATION_PENDING	0x24
+#define FIDO_ERR_NO_OPERATIONS		0x25
+#define FIDO_ERR_UNSUPPORTED_ALGORITHM	0x26
+#define FIDO_ERR_OPERATION_DENIED	0x27
+#define FIDO_ERR_KEY_STORE_FULL		0x28
+#define FIDO_ERR_NOT_BUSY		0x29
+#define FIDO_ERR_NO_OPERATION_PENDING	0x2a
+#define FIDO_ERR_UNSUPPORTED_OPTION	0x2b
+#define FIDO_ERR_INVALID_OPTION		0x2c
+#define FIDO_ERR_KEEPALIVE_CANCEL	0x2d
+#define FIDO_ERR_NO_CREDENTIALS		0x2e
+#define FIDO_ERR_USER_ACTION_TIMEOUT	0x2f
+#define FIDO_ERR_NOT_ALLOWED		0x30
+#define FIDO_ERR_PIN_INVALID		0x31
+#define FIDO_ERR_PIN_BLOCKED		0x32
+#define FIDO_ERR_PIN_AUTH_INVALID	0x33
+#define FIDO_ERR_PIN_AUTH_BLOCKED	0x34
+#define FIDO_ERR_PIN_NOT_SET		0x35
+#define FIDO_ERR_PIN_REQUIRED		0x36
+#define FIDO_ERR_PIN_POLICY_VIOLATION	0x37
+#define FIDO_ERR_PIN_TOKEN_EXPIRED	0x38
+#define FIDO_ERR_REQUEST_TOO_LARGE	0x39
+#define FIDO_ERR_ACTION_TIMEOUT		0x3a
+#define FIDO_ERR_UP_REQUIRED		0x3b
+#define FIDO_ERR_UV_BLOCKED		0x3c
+#define FIDO_ERR_ERR_OTHER		0x7f
+#define FIDO_ERR_SPEC_LAST		0xdf
+
+/* defined internally */
+#define FIDO_OK				FIDO_ERR_SUCCESS
+#define FIDO_ERR_TX			-1
+#define FIDO_ERR_RX			-2
+#define FIDO_ERR_RX_NOT_CBOR		-3
+#define FIDO_ERR_RX_INVALID_CBOR	-4
+#define FIDO_ERR_INVALID_PARAM		-5
+#define FIDO_ERR_INVALID_SIG		-6
+#define FIDO_ERR_INVALID_ARGUMENT	-7
+#define FIDO_ERR_USER_PRESENCE_REQUIRED	-8
+#define FIDO_ERR_INTERNAL		-9
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+const char *fido_strerr(int);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* _FIDO_ERR_H */
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/fido/es256.h mysql-8.0-8.0.27/extra/libfido2/src/fido/es256.h
--- mysql-8.0-8.0.26/extra/libfido2/src/fido/es256.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/fido/es256.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#ifndef _FIDO_ES256_H
+#define _FIDO_ES256_H
+
+#include <openssl/ec.h>
+
+#include <stdint.h>
+#include <stdlib.h>
+
+#ifdef _FIDO_INTERNAL
+#include "types.h"
+#else
+#include <fido.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+es256_pk_t *es256_pk_new(void);
+void es256_pk_free(es256_pk_t **);
+EVP_PKEY *es256_pk_to_EVP_PKEY(const es256_pk_t *);
+
+int es256_pk_from_EC_KEY(es256_pk_t *, const EC_KEY *);
+int es256_pk_from_ptr(es256_pk_t *, const void *, size_t);
+
+#ifdef _FIDO_INTERNAL
+es256_sk_t *es256_sk_new(void);
+void es256_sk_free(es256_sk_t **);
+EVP_PKEY *es256_sk_to_EVP_PKEY(const es256_sk_t *);
+
+int es256_derive_pk(const es256_sk_t *, es256_pk_t *);
+int es256_sk_create(es256_sk_t *);
+
+int es256_pk_set_x(es256_pk_t *, const unsigned char *);
+int es256_pk_set_y(es256_pk_t *, const unsigned char *);
+#endif
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !_FIDO_ES256_H */
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/fido/param.h mysql-8.0-8.0.27/extra/libfido2/src/fido/param.h
--- mysql-8.0-8.0.26/extra/libfido2/src/fido/param.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/fido/param.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#ifndef _FIDO_PARAM_H
+#define _FIDO_PARAM_H
+
+/* Authentication data flags. */
+#define CTAP_AUTHDATA_USER_PRESENT	0x01
+#define CTAP_AUTHDATA_USER_VERIFIED	0x04
+#define CTAP_AUTHDATA_ATT_CRED		0x40
+#define CTAP_AUTHDATA_EXT_DATA		0x80
+
+/* CTAPHID command opcodes. */
+#define CTAP_CMD_PING			0x01
+#define CTAP_CMD_MSG			0x03
+#define CTAP_CMD_LOCK			0x04
+#define CTAP_CMD_INIT			0x06
+#define CTAP_CMD_WINK			0x08
+#define CTAP_CMD_CBOR			0x10
+#define CTAP_CMD_CANCEL			0x11
+#define CTAP_KEEPALIVE			0x3b
+#define CTAP_FRAME_INIT			0x80
+
+/* CTAPHID CBOR command opcodes. */
+#define CTAP_CBOR_MAKECRED		0x01
+#define CTAP_CBOR_ASSERT		0x02
+#define CTAP_CBOR_GETINFO		0x04
+#define CTAP_CBOR_CLIENT_PIN		0x06
+#define CTAP_CBOR_RESET			0x07
+#define CTAP_CBOR_NEXT_ASSERT		0x08
+#define CTAP_CBOR_BIO_ENROLL_PRE	0x40
+#define CTAP_CBOR_CRED_MGMT_PRE		0x41
+
+/* U2F command opcodes. */
+#define U2F_CMD_REGISTER		0x01
+#define U2F_CMD_AUTH			0x02
+
+/* U2F command flags. */
+#define U2F_AUTH_SIGN			0x03
+#define U2F_AUTH_CHECK			0x07
+
+/* ISO7816-4 status words. */
+#define SW_CONDITIONS_NOT_SATISFIED	0x6985
+#define SW_WRONG_DATA			0x6a80
+#define SW_NO_ERROR			0x9000
+
+/* HID Broadcast channel ID. */
+#define CTAP_CID_BROADCAST		0xffffffff
+
+#define CTAP_INIT_HEADER_LEN		7
+#define CTAP_CONT_HEADER_LEN		5
+
+/* Maximum length of a CTAP HID report in bytes. */
+#define CTAP_MAX_REPORT_LEN		64
+
+/* Minimum length of a CTAP HID report in bytes. */
+#define CTAP_MIN_REPORT_LEN		(CTAP_INIT_HEADER_LEN + 1)
+
+/* Randomness device on UNIX-like platforms. */
+#ifndef FIDO_RANDOM_DEV
+#define FIDO_RANDOM_DEV			"/dev/urandom"
+#endif
+
+/* Maximum message size in bytes. */
+#ifndef FIDO_MAXMSG
+#define FIDO_MAXMSG	2048
+#endif
+
+/* CTAP capability bits. */
+#define FIDO_CAP_WINK	0x01 /* if set, device supports CTAP_CMD_WINK */
+#define FIDO_CAP_CBOR	0x04 /* if set, device supports CTAP_CMD_CBOR */
+#define FIDO_CAP_NMSG	0x08 /* if set, device doesn't support CTAP_CMD_MSG */
+
+/* Supported COSE algorithms. */
+#define	COSE_ES256	-7
+#define	COSE_EDDSA	-8
+#define	COSE_ECDH_ES256	-25
+#define	COSE_RS256	-257
+
+/* Supported COSE types. */
+#define COSE_KTY_OKP	1
+#define COSE_KTY_EC2	2
+#define COSE_KTY_RSA	3
+
+/* Supported curves. */
+#define COSE_P256	1
+#define COSE_ED25519	6
+
+/* Supported extensions. */
+#define FIDO_EXT_HMAC_SECRET	0x01
+#define FIDO_EXT_CRED_PROTECT	0x02
+
+/* Supported credential protection policies. */
+#define FIDO_CRED_PROT_UV_OPTIONAL		0x01
+#define FIDO_CRED_PROT_UV_OPTIONAL_WITH_ID	0x02
+#define FIDO_CRED_PROT_UV_REQUIRED		0x03
+
+#endif /* !_FIDO_PARAM_H */
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/fido/rs256.h mysql-8.0-8.0.27/extra/libfido2/src/fido/rs256.h
--- mysql-8.0-8.0.26/extra/libfido2/src/fido/rs256.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/fido/rs256.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#ifndef _FIDO_RS256_H
+#define _FIDO_RS256_H
+
+#include <openssl/rsa.h>
+
+#include <stdint.h>
+#include <stdlib.h>
+
+#ifdef _FIDO_INTERNAL
+#include "types.h"
+#else
+#include <fido.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+rs256_pk_t *rs256_pk_new(void);
+void rs256_pk_free(rs256_pk_t **);
+EVP_PKEY *rs256_pk_to_EVP_PKEY(const rs256_pk_t *);
+
+int rs256_pk_from_RSA(rs256_pk_t *, const RSA *);
+int rs256_pk_from_ptr(rs256_pk_t *, const void *, size_t);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !_FIDO_RS256_H */
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/fido/types.h mysql-8.0-8.0.27/extra/libfido2/src/fido/types.h
--- mysql-8.0-8.0.26/extra/libfido2/src/fido/types.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/fido/types.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,241 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#ifndef _FIDO_TYPES_H
+#define _FIDO_TYPES_H
+
+#include <stddef.h>
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+struct fido_dev;
+
+typedef void *fido_dev_io_open_t(const char *);
+typedef void  fido_dev_io_close_t(void *);
+typedef int   fido_dev_io_read_t(void *, unsigned char *, size_t, int);
+typedef int   fido_dev_io_write_t(void *, const unsigned char *, size_t);
+typedef int   fido_dev_rx_t(struct fido_dev *, uint8_t, unsigned char *, size_t, int);
+typedef int   fido_dev_tx_t(struct fido_dev *, uint8_t, const unsigned char *, size_t);
+
+typedef struct fido_dev_io {
+	fido_dev_io_open_t  *open;
+	fido_dev_io_close_t *close;
+	fido_dev_io_read_t  *read;
+	fido_dev_io_write_t *write;
+} fido_dev_io_t;
+
+typedef struct fido_dev_transport {
+	fido_dev_rx_t *rx;
+	fido_dev_tx_t *tx;
+} fido_dev_transport_t;
+
+typedef enum {
+	FIDO_OPT_OMIT = 0, /* use authenticator's default */
+	FIDO_OPT_FALSE,    /* explicitly set option to false */
+	FIDO_OPT_TRUE,     /* explicitly set option to true */
+} fido_opt_t;
+
+typedef void fido_log_handler_t(const char *);
+
+#ifdef _FIDO_INTERNAL
+#include "packed.h"
+#include "blob.h"
+
+/* COSE ES256 (ECDSA over P-256 with SHA-256) public key */
+typedef struct es256_pk {
+	unsigned char	x[32];
+	unsigned char	y[32];
+} es256_pk_t;
+
+/* COSE ES256 (ECDSA over P-256 with SHA-256) (secret) key */
+typedef struct es256_sk {
+	unsigned char	d[32];
+} es256_sk_t;
+
+/* COSE RS256 (2048-bit RSA with PKCS1 padding and SHA-256) public key */
+typedef struct rs256_pk {
+	unsigned char n[256];
+	unsigned char e[3];
+} rs256_pk_t;
+
+/* COSE EDDSA (ED25519) */
+typedef struct eddsa_pk {
+	unsigned char x[32];
+} eddsa_pk_t;
+
+PACKED_TYPE(fido_authdata_t,
+struct fido_authdata {
+	unsigned char rp_id_hash[32]; /* sha256 of fido_rp.id */
+	uint8_t       flags;          /* user present/verified */
+	uint32_t      sigcount;       /* signature counter */
+	/* actually longer */
+})
+
+PACKED_TYPE(fido_attcred_raw_t,
+struct fido_attcred_raw {
+	unsigned char aaguid[16]; /* credential's aaguid */
+	uint16_t      id_len;     /* credential id length */
+	uint8_t       body[];     /* credential id + pubkey */
+})
+
+typedef struct fido_attcred {
+	unsigned char aaguid[16]; /* credential's aaguid */
+	fido_blob_t   id;         /* credential id */
+	int           type;       /* credential's cose algorithm */
+	union {                   /* credential's public key */
+		es256_pk_t es256;
+		rs256_pk_t rs256;
+		eddsa_pk_t eddsa;
+	} pubkey;
+} fido_attcred_t;
+
+typedef struct fido_attstmt {
+	fido_blob_t x5c; /* attestation certificate */
+	fido_blob_t sig; /* attestation signature */
+} fido_attstmt_t;
+
+typedef struct fido_rp {
+	char *id;   /* relying party id */
+	char *name; /* relying party name */
+} fido_rp_t;
+
+typedef struct fido_user {
+	fido_blob_t  id;           /* required */
+	char        *icon;         /* optional */
+	char        *name;         /* optional */
+	char        *display_name; /* required */
+} fido_user_t;
+
+typedef struct fido_cred_ext {
+	int mask; /* enabled extensions */
+	int prot; /* protection policy */
+} fido_cred_ext_t;
+
+typedef struct fido_cred {
+	fido_blob_t       cdh;           /* client data hash */
+	fido_rp_t         rp;            /* relying party */
+	fido_user_t       user;          /* user entity */
+	fido_blob_array_t excl;          /* list of credential ids to exclude */
+	fido_opt_t        rk;            /* resident key */
+	fido_opt_t        uv;            /* user verification */
+	fido_cred_ext_t   ext;           /* extensions */
+	int               type;          /* cose algorithm */
+	char             *fmt;           /* credential format */
+	fido_cred_ext_t   authdata_ext;  /* decoded extensions */
+	fido_blob_t       authdata_cbor; /* raw cbor payload */
+	fido_authdata_t   authdata;      /* decoded authdata payload */
+	fido_attcred_t    attcred;       /* returned credential (key + id) */
+	fido_attstmt_t    attstmt;       /* attestation statement (x509 + sig) */
+} fido_cred_t;
+
+typedef struct _fido_assert_stmt {
+	fido_blob_t     id;              /* credential id */
+	fido_user_t     user;            /* user attributes */
+	fido_blob_t     hmac_secret_enc; /* hmac secret, encrypted */
+	fido_blob_t     hmac_secret;     /* hmac secret */
+	int             authdata_ext;    /* decoded extensions */
+	fido_blob_t     authdata_cbor;   /* raw cbor payload */
+	fido_authdata_t authdata;        /* decoded authdata payload */
+	fido_blob_t     sig;             /* signature of cdh + authdata */
+} fido_assert_stmt;
+
+typedef struct fido_assert {
+	char              *rp_id;        /* relying party id */
+	fido_blob_t        cdh;          /* client data hash */
+	fido_blob_t        hmac_salt;    /* optional hmac-secret salt */
+	fido_blob_array_t  allow_list;   /* list of allowed credentials */
+	fido_opt_t         up;           /* user presence */
+	fido_opt_t         uv;           /* user verification */
+	int                ext;          /* enabled extensions */
+	fido_assert_stmt  *stmt;         /* array of expected assertions */
+	size_t             stmt_cnt;     /* number of allocated assertions */
+	size_t             stmt_len;     /* number of received assertions */
+} fido_assert_t;
+
+typedef struct fido_opt_array {
+	char **name;
+	bool *value;
+	size_t len;
+} fido_opt_array_t;
+
+typedef struct fido_str_array {
+	char **ptr;
+	size_t len;
+} fido_str_array_t;
+
+typedef struct fido_byte_array {
+	uint8_t *ptr;
+	size_t len;
+} fido_byte_array_t;
+
+typedef struct fido_cbor_info {
+	fido_str_array_t  versions;      /* supported versions: fido2|u2f */
+	fido_str_array_t  extensions;    /* list of supported extensions */
+	unsigned char     aaguid[16];    /* aaguid */
+	fido_opt_array_t  options;       /* list of supported options */
+	uint64_t          maxmsgsiz;     /* maximum message size */
+	fido_byte_array_t protocols;     /* supported pin protocols */
+	uint64_t          maxcredcntlst; /* max number of credentials in list */
+	uint64_t          maxcredidlen;  /* max credential ID length */
+	uint64_t          fwversion;     /* firmware version */
+} fido_cbor_info_t;
+
+typedef struct fido_dev_info {
+	char                 *path;         /* device path */
+	int16_t               vendor_id;    /* 2-byte vendor id */
+	int16_t               product_id;   /* 2-byte product id */
+	char                 *manufacturer; /* manufacturer string */
+	char                 *product;      /* product string */
+	fido_dev_io_t         io;           /* i/o functions */
+	fido_dev_transport_t  transport;    /* transport functions */
+} fido_dev_info_t;
+
+PACKED_TYPE(fido_ctap_info_t,
+/* defined in section 8.1.9.1.3 (CTAPHID_INIT) of the fido2 ctap spec */
+struct fido_ctap_info {
+	uint64_t nonce;    /* echoed nonce */
+	uint32_t cid;      /* channel id */
+	uint8_t  protocol; /* ctaphid protocol id */
+	uint8_t  major;    /* major version number */
+	uint8_t  minor;    /* minor version number */
+	uint8_t  build;    /* build version number */
+	uint8_t  flags;    /* capabilities flags; see FIDO_CAP_* */
+})
+
+typedef struct fido_dev {
+	uint64_t              nonce;     /* issued nonce */
+	fido_ctap_info_t      attr;      /* device attributes */
+	uint32_t              cid;       /* assigned channel id */
+	char                 *path;      /* device path */
+	void                 *io_handle; /* abstract i/o handle */
+	fido_dev_io_t         io;        /* i/o functions */
+	bool                  io_own;    /* device has own io/transport */
+	size_t                rx_len;    /* length of HID input reports */
+	size_t                tx_len;    /* length of HID output reports */
+	int                   flags;     /* internal flags; see FIDO_DEV_* */
+	fido_dev_transport_t  transport; /* transport functions */
+} fido_dev_t;
+
+#else
+typedef struct fido_assert fido_assert_t;
+typedef struct fido_cbor_info fido_cbor_info_t;
+typedef struct fido_cred fido_cred_t;
+typedef struct fido_dev fido_dev_t;
+typedef struct fido_dev_info fido_dev_info_t;
+typedef struct es256_pk es256_pk_t;
+typedef struct es256_sk es256_sk_t;
+typedef struct rs256_pk rs256_pk_t;
+typedef struct eddsa_pk eddsa_pk_t;
+#endif /* _FIDO_INTERNAL */
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !_FIDO_TYPES_H */
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/fido.h mysql-8.0-8.0.27/extra/libfido2/src/fido.h
--- mysql-8.0-8.0.26/extra/libfido2/src/fido.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/fido.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,196 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#ifndef _FIDO_H
+#define _FIDO_H
+
+#include <openssl/ec.h>
+#include <openssl/evp.h>
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#ifdef _FIDO_INTERNAL
+#include <cbor.h>
+#include <limits.h>
+
+#include "blob.h"
+#include "../openbsd-compat/openbsd-compat.h"
+#include "iso7816.h"
+#include "extern.h"
+#endif
+
+#include "fido/err.h"
+#include "fido/param.h"
+#include "fido/types.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#ifdef _MSC_VER
+#define FIDO_DEPRECATED(reason) __declspec(deprecated(reason))
+#else
+#define FIDO_DEPRECATED(reason) __attribute__((__deprecated__(reason)))
+#endif
+
+fido_assert_t *fido_assert_new(void);
+fido_cred_t *fido_cred_new(void);
+fido_dev_t *fido_dev_new(void);
+fido_dev_t *fido_dev_new_with_info(const fido_dev_info_t *);
+fido_dev_info_t *fido_dev_info_new(size_t);
+fido_cbor_info_t *fido_cbor_info_new(void);
+
+void fido_assert_free(fido_assert_t **);
+void fido_cbor_info_free(fido_cbor_info_t **);
+void fido_cred_free(fido_cred_t **);
+void fido_dev_force_fido2(fido_dev_t *);
+void fido_dev_force_u2f(fido_dev_t *);
+void fido_dev_free(fido_dev_t **);
+void fido_dev_info_free(fido_dev_info_t **, size_t);
+
+/* fido_init() flags. */
+#define FIDO_DEBUG	0x01
+
+void fido_init(int);
+void fido_set_log_handler(fido_log_handler_t *);
+
+const unsigned char *fido_assert_authdata_ptr(const fido_assert_t *, size_t);
+const unsigned char *fido_assert_clientdata_hash_ptr(const fido_assert_t *);
+const unsigned char *fido_assert_hmac_secret_ptr(const fido_assert_t *, size_t);
+const unsigned char *fido_assert_id_ptr(const fido_assert_t *, size_t);
+const unsigned char *fido_assert_sig_ptr(const fido_assert_t *, size_t);
+const unsigned char *fido_assert_user_id_ptr(const fido_assert_t *, size_t);
+
+char **fido_cbor_info_extensions_ptr(const fido_cbor_info_t *);
+char **fido_cbor_info_options_name_ptr(const fido_cbor_info_t *);
+char **fido_cbor_info_versions_ptr(const fido_cbor_info_t *);
+const bool *fido_cbor_info_options_value_ptr(const fido_cbor_info_t *);
+const char *fido_assert_rp_id(const fido_assert_t *);
+const char *fido_assert_user_display_name(const fido_assert_t *, size_t);
+const char *fido_assert_user_icon(const fido_assert_t *, size_t);
+const char *fido_assert_user_name(const fido_assert_t *, size_t);
+const char *fido_cred_display_name(const fido_cred_t *);
+const char *fido_cred_fmt(const fido_cred_t *);
+const char *fido_cred_rp_id(const fido_cred_t *);
+const char *fido_cred_rp_name(const fido_cred_t *);
+const char *fido_cred_user_name(const fido_cred_t *);
+const char *fido_dev_info_manufacturer_string(const fido_dev_info_t *);
+const char *fido_dev_info_path(const fido_dev_info_t *);
+const char *fido_dev_info_product_string(const fido_dev_info_t *);
+const fido_dev_info_t *fido_dev_info_ptr(const fido_dev_info_t *, size_t);
+const uint8_t *fido_cbor_info_protocols_ptr(const fido_cbor_info_t *);
+const unsigned char *fido_cbor_info_aaguid_ptr(const fido_cbor_info_t *);
+const unsigned char *fido_cred_authdata_ptr(const fido_cred_t *);
+const unsigned char *fido_cred_clientdata_hash_ptr(const fido_cred_t *);
+const unsigned char *fido_cred_id_ptr(const fido_cred_t *);
+const unsigned char *fido_cred_aaguid_ptr(const fido_cred_t *);
+const unsigned char *fido_cred_user_id_ptr(const fido_cred_t *);
+const unsigned char *fido_cred_pubkey_ptr(const fido_cred_t *);
+const unsigned char *fido_cred_sig_ptr(const fido_cred_t *);
+const unsigned char *fido_cred_x5c_ptr(const fido_cred_t *);
+
+int fido_assert_allow_cred(fido_assert_t *, const unsigned char *, size_t);
+int fido_assert_set_authdata(fido_assert_t *, size_t, const unsigned char *,
+    size_t);
+int fido_assert_set_authdata_raw(fido_assert_t *, size_t, const unsigned char *,
+    size_t);
+int fido_assert_set_clientdata_hash(fido_assert_t *, const unsigned char *,
+    size_t);
+int fido_assert_set_count(fido_assert_t *, size_t);
+int fido_assert_set_extensions(fido_assert_t *, int);
+int fido_assert_set_hmac_salt(fido_assert_t *, const unsigned char *, size_t);
+FIDO_DEPRECATED("use fido_assert_set_up/fido_assert_set_uv")
+int fido_assert_set_options(fido_assert_t *, bool, bool);
+int fido_assert_set_rp(fido_assert_t *, const char *);
+int fido_assert_set_up(fido_assert_t *, fido_opt_t);
+int fido_assert_set_uv(fido_assert_t *, fido_opt_t);
+int fido_assert_set_sig(fido_assert_t *, size_t, const unsigned char *, size_t);
+int fido_assert_verify(const fido_assert_t *, size_t, int, const void *);
+int fido_cred_exclude(fido_cred_t *, const unsigned char *, size_t);
+int fido_cred_prot(const fido_cred_t *);
+int fido_cred_set_authdata(fido_cred_t *, const unsigned char *, size_t);
+int fido_cred_set_authdata_raw(fido_cred_t *, const unsigned char *, size_t);
+int fido_cred_set_clientdata_hash(fido_cred_t *, const unsigned char *, size_t);
+int fido_cred_set_extensions(fido_cred_t *, int);
+int fido_cred_set_fmt(fido_cred_t *, const char *);
+FIDO_DEPRECATED("use fido_cred_set_rk/fido_cred_set_uv")
+int fido_cred_set_options(fido_cred_t *, bool, bool);
+int fido_cred_set_prot(fido_cred_t *, int);
+int fido_cred_set_rk(fido_cred_t *, fido_opt_t);
+int fido_cred_set_rp(fido_cred_t *, const char *, const char *);
+int fido_cred_set_sig(fido_cred_t *, const unsigned char *, size_t);
+int fido_cred_set_type(fido_cred_t *, int);
+int fido_cred_set_uv(fido_cred_t *, fido_opt_t);
+int fido_cred_type(const fido_cred_t *);
+int fido_cred_set_user(fido_cred_t *, const unsigned char *, size_t,
+    const char *, const char *, const char *);
+int fido_cred_set_x509(fido_cred_t *, const unsigned char *, size_t);
+int fido_cred_verify(const fido_cred_t *);
+int fido_cred_verify_self(const fido_cred_t *);
+int fido_dev_cancel(fido_dev_t *);
+int fido_dev_close(fido_dev_t *);
+int fido_dev_get_assert(fido_dev_t *, fido_assert_t *, const char *);
+int fido_dev_get_cbor_info(fido_dev_t *, fido_cbor_info_t *);
+int fido_dev_get_retry_count(fido_dev_t *, int *);
+int fido_dev_get_touch_begin(fido_dev_t *);
+int fido_dev_get_touch_status(fido_dev_t *, int *, int);
+int fido_dev_info_manifest(fido_dev_info_t *, size_t, size_t *);
+int fido_dev_make_cred(fido_dev_t *, fido_cred_t *, const char *);
+int fido_dev_open_with_info(fido_dev_t *);
+int fido_dev_open(fido_dev_t *, const char *);
+int fido_dev_reset(fido_dev_t *);
+int fido_dev_set_io_functions(fido_dev_t *, const fido_dev_io_t *);
+int fido_dev_set_pin(fido_dev_t *, const char *, const char *);
+int fido_dev_set_transport_functions(fido_dev_t *, const fido_dev_transport_t *);
+
+size_t fido_assert_authdata_len(const fido_assert_t *, size_t);
+size_t fido_assert_clientdata_hash_len(const fido_assert_t *);
+size_t fido_assert_count(const fido_assert_t *);
+size_t fido_assert_hmac_secret_len(const fido_assert_t *, size_t);
+size_t fido_assert_id_len(const fido_assert_t *, size_t);
+size_t fido_assert_sig_len(const fido_assert_t *, size_t);
+size_t fido_assert_user_id_len(const fido_assert_t *, size_t);
+size_t fido_cbor_info_aaguid_len(const fido_cbor_info_t *);
+size_t fido_cbor_info_extensions_len(const fido_cbor_info_t *);
+size_t fido_cbor_info_options_len(const fido_cbor_info_t *);
+size_t fido_cbor_info_protocols_len(const fido_cbor_info_t *);
+size_t fido_cbor_info_versions_len(const fido_cbor_info_t *);
+size_t fido_cred_authdata_len(const fido_cred_t *);
+size_t fido_cred_clientdata_hash_len(const fido_cred_t *);
+size_t fido_cred_id_len(const fido_cred_t *);
+size_t fido_cred_aaguid_len(const fido_cred_t *);
+size_t fido_cred_user_id_len(const fido_cred_t *);
+size_t fido_cred_pubkey_len(const fido_cred_t *);
+size_t fido_cred_sig_len(const fido_cred_t *);
+size_t fido_cred_x5c_len(const fido_cred_t *);
+
+uint8_t  fido_assert_flags(const fido_assert_t *, size_t);
+uint32_t fido_assert_sigcount(const fido_assert_t *, size_t);
+uint8_t  fido_cred_flags(const fido_cred_t *);
+uint8_t  fido_dev_protocol(const fido_dev_t *);
+uint8_t  fido_dev_major(const fido_dev_t *);
+uint8_t  fido_dev_minor(const fido_dev_t *);
+uint8_t  fido_dev_build(const fido_dev_t *);
+uint8_t  fido_dev_flags(const fido_dev_t *);
+int16_t  fido_dev_info_vendor(const fido_dev_info_t *);
+int16_t  fido_dev_info_product(const fido_dev_info_t *);
+uint64_t fido_cbor_info_maxmsgsiz(const fido_cbor_info_t *);
+uint64_t fido_cbor_info_maxcredcntlst(const fido_cbor_info_t *);
+uint64_t fido_cbor_info_maxcredidlen(const fido_cbor_info_t *);
+uint64_t fido_cbor_info_fwversion(const fido_cbor_info_t *);
+
+bool fido_dev_has_pin(const fido_dev_t *);
+bool fido_dev_is_fido2(const fido_dev_t *);
+bool fido_dev_supports_pin(const fido_dev_t *);
+bool fido_dev_supports_cred_prot(const fido_dev_t *);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !_FIDO_H */
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/hid.c mysql-8.0-8.0.27/extra/libfido2/src/hid.c
--- mysql-8.0-8.0.26/extra/libfido2/src/hid.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/hid.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <string.h>
+#include "fido.h"
+
+fido_dev_info_t *
+fido_dev_info_new(size_t n)
+{
+	return (calloc(n, sizeof(fido_dev_info_t)));
+}
+
+void
+fido_dev_info_free(fido_dev_info_t **devlist_p, size_t n)
+{
+	fido_dev_info_t *devlist;
+
+	if (devlist_p == NULL || (devlist = *devlist_p) == NULL)
+		return;
+
+	for (size_t i = 0; i < n; i++) {
+		const fido_dev_info_t *di = &devlist[i];
+		free(di->path);
+		free(di->manufacturer);
+		free(di->product);
+	}
+
+	free(devlist);
+
+	*devlist_p = NULL;
+}
+
+const fido_dev_info_t *
+fido_dev_info_ptr(const fido_dev_info_t *devlist, size_t i)
+{
+	return (&devlist[i]);
+}
+
+const char *
+fido_dev_info_path(const fido_dev_info_t *di)
+{
+	return (di->path);
+}
+
+int16_t
+fido_dev_info_vendor(const fido_dev_info_t *di)
+{
+	return (di->vendor_id);
+}
+
+int16_t
+fido_dev_info_product(const fido_dev_info_t *di)
+{
+	return (di->product_id);
+}
+
+const char *
+fido_dev_info_manufacturer_string(const fido_dev_info_t *di)
+{
+	return (di->manufacturer);
+}
+
+const char *
+fido_dev_info_product_string(const fido_dev_info_t *di)
+{
+	return (di->product);
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/hid_hidapi.c mysql-8.0-8.0.27/extra/libfido2/src/hid_hidapi.c
--- mysql-8.0-8.0.26/extra/libfido2/src/hid_hidapi.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/hid_hidapi.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,336 @@
+/*
+ * Copyright (c) 2019 Google LLC. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#ifdef __linux__
+#include <sys/ioctl.h>
+#include <linux/hidraw.h>
+#include <linux/input.h>
+#include <fcntl.h>
+#endif
+
+#include <hidapi.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+
+#include "fido.h"
+
+struct hid_hidapi {
+	void *handle;
+	size_t report_in_len;
+	size_t report_out_len;
+};
+
+static size_t
+fido_wcslen(const wchar_t *wcs)
+{
+	size_t l = 0;
+	while (*wcs++ != L'\0')
+		l++;
+	return l;
+}
+
+static char *
+wcs_to_cs(const wchar_t *wcs)
+{
+	char *cs;
+	size_t i;
+
+	if (wcs == NULL || (cs = calloc(fido_wcslen(wcs) + 1, 1)) == NULL)
+		return NULL;
+
+	for (i = 0; i < fido_wcslen(wcs); i++) {
+		if (wcs[i] >= 128) {
+			/* give up on parsing non-ASCII text */
+			free(cs);
+			return strdup("hidapi device");
+		}
+		cs[i] = (char)wcs[i];
+	}
+
+	return cs;
+}
+
+static int
+copy_info(fido_dev_info_t *di, const struct hid_device_info *d)
+{
+	memset(di, 0, sizeof(*di));
+
+	if (d->path != NULL)
+		di->path = strdup(d->path);
+	else
+		di->path = strdup("");
+
+	if (d->manufacturer_string != NULL)
+		di->manufacturer = wcs_to_cs(d->manufacturer_string);
+	else
+		di->manufacturer = strdup("");
+
+	if (d->product_string != NULL)
+		di->product = wcs_to_cs(d->product_string);
+	else
+		di->product = strdup("");
+
+	if (di->path == NULL ||
+	    di->manufacturer == NULL ||
+	    di->product == NULL) {
+		free(di->path);
+		free(di->manufacturer);
+		free(di->product);
+		explicit_bzero(di, sizeof(*di));
+		return -1;
+	}
+
+	di->product_id = (int16_t)d->product_id;
+	di->vendor_id = (int16_t)d->vendor_id;
+	di->io = (fido_dev_io_t) {
+		&fido_hid_open,
+		&fido_hid_close,
+		&fido_hid_read,
+		&fido_hid_write,
+	};
+
+	return 0;
+}
+
+#ifdef __linux__
+static int
+get_key_len(uint8_t tag, uint8_t *key, size_t *key_len)
+{
+	*key = tag & 0xfc;
+	if ((*key & 0xf0) == 0xf0) {
+		fido_log_debug("%s: *key=0x%02x", __func__, *key);
+		return -1;
+	}
+
+	*key_len = tag & 0x3;
+	if (*key_len == 3) {
+		*key_len = 4;
+	}
+
+	return 0;
+}
+
+static int
+get_key_val(const void *body, size_t key_len, uint32_t *val)
+{
+	const uint8_t *ptr = body;
+
+	switch (key_len) {
+	case 0:
+		*val = 0;
+		break;
+	case 1:
+		*val = ptr[0];
+		break;
+	case 2:
+		*val = (uint32_t)((ptr[1] << 8) | ptr[0]);
+		break;
+	default:
+		fido_log_debug("%s: key_len=%zu", __func__, key_len);
+		return -1;
+	}
+
+	return 0;
+}
+
+static int
+get_usage_info(const struct hidraw_report_descriptor *hrd, uint32_t *usage_page,
+    uint32_t *usage)
+{
+	const uint8_t *ptr = hrd->value;
+	size_t len = hrd->size;
+
+	while (len > 0) {
+		const uint8_t tag = ptr[0];
+
+		ptr++;
+		len--;
+
+		uint8_t  key;
+		size_t   key_len;
+		uint32_t key_val;
+
+		if (get_key_len(tag, &key, &key_len) < 0 || key_len > len ||
+		    get_key_val(ptr, key_len, &key_val) < 0) {
+			return -1;
+		}
+
+		if (key == 0x4) {
+			*usage_page = key_val;
+		} else if (key == 0x8) {
+			*usage = key_val;
+		}
+
+		ptr += key_len;
+		len -= key_len;
+	}
+
+	return 0;
+}
+
+static int
+get_report_descriptor(const char *path, struct hidraw_report_descriptor *hrd)
+{
+	int fd;
+	int s = -1;
+	int ok = -1;
+
+	if ((fd = open(path, O_RDONLY)) < 0) {
+		fido_log_debug("%s: open", __func__);
+		return -1;
+	}
+
+	if (ioctl(fd, HIDIOCGRDESCSIZE, &s) < 0 || s < 0 ||
+	    (unsigned)s > HID_MAX_DESCRIPTOR_SIZE) {
+		fido_log_debug("%s: ioctl HIDIOCGRDESCSIZE", __func__);
+		goto fail;
+	}
+
+	hrd->size = (unsigned)s;
+
+	if (ioctl(fd, HIDIOCGRDESC, hrd) < 0) {
+		fido_log_debug("%s: ioctl HIDIOCGRDESC", __func__);
+		goto fail;
+	}
+
+	ok = 0;
+fail:
+	if (fd != -1)
+		close(fd);
+
+	return ok;
+}
+
+static bool
+is_fido(const struct hid_device_info *hdi)
+{
+	uint32_t usage = 0;
+	uint32_t usage_page = 0;
+	struct hidraw_report_descriptor hrd;
+
+	memset(&hrd, 0, sizeof(hrd));
+
+	if (get_report_descriptor(hdi->path, &hrd) < 0 ||
+	    get_usage_info(&hrd, &usage_page, &usage) < 0) {
+		return false;
+	}
+
+	return usage_page == 0xf1d0;
+}
+#elif defined(_WIN32) || defined(__APPLE__)
+static bool
+is_fido(const struct hid_device_info *hdi)
+{
+	return hdi->usage_page == 0xf1d0;
+}
+#else
+static bool
+is_fido(const struct hid_device_info *hdi)
+{
+	(void)hdi;
+	fido_log_debug("%s: assuming FIDO HID", __func__);
+	return true;
+}
+#endif
+
+void *
+fido_hid_open(const char *path)
+{
+	struct hid_hidapi *ctx;
+
+	if ((ctx = calloc(1, sizeof(*ctx))) == NULL) {
+		return (NULL);
+	}
+
+	if ((ctx->handle = hid_open_path(path)) == NULL) {
+		free(ctx);
+		return (NULL);
+	}
+
+	ctx->report_in_len = ctx->report_out_len = CTAP_MAX_REPORT_LEN;
+
+	return ctx;
+}
+
+void
+fido_hid_close(void *handle)
+{
+	struct hid_hidapi *ctx = handle;
+
+	hid_close(ctx->handle);
+	free(ctx);
+}
+
+int
+fido_hid_read(void *handle, unsigned char *buf, size_t len, int ms)
+{
+	struct hid_hidapi *ctx = handle;
+
+	if (len != ctx->report_in_len) {
+		fido_log_debug("%s: len %zu", __func__, len);
+		return -1;
+	}
+
+	return hid_read_timeout(ctx->handle, buf, len, ms);
+}
+
+int
+fido_hid_write(void *handle, const unsigned char *buf, size_t len)
+{
+	struct hid_hidapi *ctx = handle;
+
+	if (len != ctx->report_out_len + 1) {
+		fido_log_debug("%s: len %zu", __func__, len);
+		return -1;
+	}
+
+	return hid_write(ctx->handle, buf, len);
+}
+
+int
+fido_hid_manifest(fido_dev_info_t *devlist, size_t ilen, size_t *olen)
+{
+	struct hid_device_info *hdi;
+
+	*olen = 0;
+
+	if (ilen == 0)
+		return FIDO_OK; /* nothing to do */
+	if (devlist == NULL)
+		return FIDO_ERR_INVALID_ARGUMENT;
+	if ((hdi = hid_enumerate(0, 0)) == NULL)
+		return FIDO_OK; /* nothing to do */
+
+	for (struct hid_device_info *d = hdi; d != NULL; d = d->next) {
+		if (is_fido(d) == false)
+			continue;
+		if (copy_info(&devlist[*olen], d) == 0) {
+			if (++(*olen) == ilen)
+				break;
+		}
+	}
+
+	hid_free_enumeration(hdi);
+
+	return FIDO_OK;
+}
+
+size_t
+fido_hid_report_in_len(void *handle)
+{
+	struct hid_hidapi *ctx = handle;
+
+	return (ctx->report_in_len);
+}
+
+size_t
+fido_hid_report_out_len(void *handle)
+{
+	struct hid_hidapi *ctx = handle;
+
+	return (ctx->report_out_len);
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/hid_linux.c mysql-8.0-8.0.27/extra/libfido2/src/hid_linux.c
--- mysql-8.0-8.0.26/extra/libfido2/src/hid_linux.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/hid_linux.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,504 @@
+/*
+ * Copyright (c) 2019 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <sys/types.h>
+
+#include <sys/ioctl.h>
+#include <linux/hidraw.h>
+#include <linux/input.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <libudev.h>
+#include <poll.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "fido.h"
+
+struct hid_linux {
+	int	fd;
+	size_t	report_in_len;
+	size_t	report_out_len;
+};
+
+static int
+get_key_len(uint8_t tag, uint8_t *key, size_t *key_len)
+{
+	*key = tag & 0xfc;
+	if ((*key & 0xf0) == 0xf0) {
+		fido_log_debug("%s: *key=0x%02x", __func__, *key);
+		return (-1);
+	}
+
+	*key_len = tag & 0x3;
+	if (*key_len == 3) {
+		*key_len = 4;
+	}
+
+	return (0);
+}
+
+static int
+get_key_val(const void *body, size_t key_len, uint32_t *val)
+{
+	const uint8_t *ptr = body;
+
+	switch (key_len) {
+	case 0:
+		*val = 0;
+		break;
+	case 1:
+		*val = ptr[0];
+		break;
+	case 2:
+		*val = (uint32_t)((ptr[1] << 8) | ptr[0]);
+		break;
+	default:
+		fido_log_debug("%s: key_len=%zu", __func__, key_len);
+		return (-1);
+	}
+
+	return (0);
+}
+
+static int
+get_usage_info(const struct hidraw_report_descriptor *hrd, uint32_t *usage_page,
+    uint32_t *usage)
+{
+	const uint8_t	*ptr = hrd->value;
+	size_t		 len = hrd->size;
+
+	while (len > 0) {
+		const uint8_t tag = ptr[0];
+		ptr++;
+		len--;
+
+		uint8_t  key;
+		size_t   key_len;
+		uint32_t key_val;
+
+		if (get_key_len(tag, &key, &key_len) < 0 || key_len > len ||
+		    get_key_val(ptr, key_len, &key_val) < 0) {
+			return (-1);
+		}
+
+		if (key == 0x4) {
+			*usage_page = key_val;
+		} else if (key == 0x8) {
+			*usage = key_val;
+		}
+
+		ptr += key_len;
+		len -= key_len;
+	}
+
+	return (0);
+}
+
+static int
+get_report_sizes(const struct hidraw_report_descriptor *hrd,
+    size_t *report_in_len, size_t *report_out_len)
+{
+	const uint8_t	*ptr = hrd->value;
+	size_t		 len = hrd->size;
+	uint32_t	 report_size = 0;
+
+	while (len > 0) {
+		const uint8_t tag = ptr[0];
+		ptr++;
+		len--;
+
+		uint8_t  key;
+		size_t   key_len;
+		uint32_t key_val;
+
+		if (get_key_len(tag, &key, &key_len) < 0 || key_len > len ||
+		    get_key_val(ptr, key_len, &key_val) < 0) {
+			return (-1);
+		}
+
+		if (key == 0x94) {
+			report_size = key_val;
+		} else if (key == 0x80) {
+			*report_in_len = (size_t)report_size;
+		} else if (key == 0x90) {
+			*report_out_len = (size_t)report_size;
+		}
+
+		ptr += key_len;
+		len -= key_len;
+	}
+
+	return (0);
+}
+
+static int
+get_report_descriptor(int fd, struct hidraw_report_descriptor *hrd)
+{
+	int s = -1;
+
+	if (ioctl(fd, HIDIOCGRDESCSIZE, &s) < 0 || s < 0 ||
+	    (unsigned)s > HID_MAX_DESCRIPTOR_SIZE) {
+		fido_log_debug("%s: ioctl HIDIOCGRDESCSIZE", __func__);
+		return (-1);
+	}
+
+	hrd->size = (unsigned)s;
+
+	if (ioctl(fd, HIDIOCGRDESC, hrd) < 0) {
+		fido_log_debug("%s: ioctl HIDIOCGRDESC", __func__);
+		return (-1);
+	}
+
+	return (0);
+}
+
+static bool
+is_fido(const char *path)
+{
+	int				fd;
+	uint32_t			usage = 0;
+	uint32_t			usage_page = 0;
+	struct hidraw_report_descriptor	hrd;
+
+	memset(&hrd, 0, sizeof(hrd));
+
+	if ((fd = open(path, O_RDONLY)) == -1) {
+		fido_log_debug("%s: open", __func__);
+		return (false);
+	}
+
+	if (get_report_descriptor(fd, &hrd) < 0 ||
+	    get_usage_info(&hrd, &usage_page, &usage) < 0) {
+		close(fd);
+		return (false);
+	}
+
+	close(fd);
+
+	return (usage_page == 0xf1d0);
+}
+
+static int
+parse_uevent(const char *uevent, int *bus, int16_t *vendor_id,
+    int16_t *product_id)
+{
+	char			*cp;
+	char			*p;
+	char			*s;
+	int			 ok = -1;
+	short unsigned int	 x;
+	short unsigned int	 y;
+	short unsigned int	 z;
+
+	if ((s = cp = strdup(uevent)) == NULL)
+		return (-1);
+
+	while ((p = strsep(&cp, "\n")) != NULL && *p != '\0') {
+		if (strncmp(p, "HID_ID=", 7) == 0) {
+			if (sscanf(p + 7, "%hx:%hx:%hx", &x, &y, &z) == 3) {
+				*bus = (int)x;
+				*vendor_id = (int16_t)y;
+				*product_id = (int16_t)z;
+				ok = 0;
+				break;
+			}
+		}
+	}
+
+	free(s);
+
+	return (ok);
+}
+
+static char *
+get_parent_attr(struct udev_device *dev, const char *subsystem,
+    const char *devtype, const char *attr)
+{
+	struct udev_device	*parent;
+	const char		*value;
+
+	if ((parent = udev_device_get_parent_with_subsystem_devtype(dev,
+	    subsystem, devtype)) == NULL || (value =
+	    udev_device_get_sysattr_value(parent, attr)) == NULL)
+		return (NULL);
+
+	return (strdup(value));
+}
+
+static char *
+get_usb_attr(struct udev_device *dev, const char *attr)
+{
+	return (get_parent_attr(dev, "usb", "usb_device", attr));
+}
+
+static int
+copy_info(fido_dev_info_t *di, struct udev *udev,
+    struct udev_list_entry *udev_entry)
+{
+	const char		*name;
+	const char		*path;
+	char			*uevent = NULL;
+	struct udev_device	*dev = NULL;
+	int			 bus = 0;
+	int			 ok = -1;
+
+	memset(di, 0, sizeof(*di));
+
+	if ((name = udev_list_entry_get_name(udev_entry)) == NULL ||
+	    (dev = udev_device_new_from_syspath(udev, name)) == NULL ||
+	    (path = udev_device_get_devnode(dev)) == NULL ||
+	    is_fido(path) == 0)
+		goto fail;
+
+	if ((uevent = get_parent_attr(dev, "hid", NULL, "uevent")) == NULL ||
+	    parse_uevent(uevent, &bus, &di->vendor_id, &di->product_id) < 0) {
+		fido_log_debug("%s: uevent", __func__);
+		goto fail;
+	}
+
+#ifndef FIDO_HID_ANY
+	if (bus != BUS_USB) {
+		fido_log_debug("%s: bus", __func__);
+		goto fail;
+	}
+#endif
+
+	di->path = strdup(path);
+	di->manufacturer = get_usb_attr(dev, "manufacturer");
+	di->product = get_usb_attr(dev, "product");
+
+	if (di->path == NULL || di->manufacturer == NULL || di->product == NULL)
+		goto fail;
+
+	ok = 0;
+fail:
+	if (dev != NULL)
+		udev_device_unref(dev);
+
+	free(uevent);
+
+	if (ok < 0) {
+		free(di->path);
+		free(di->manufacturer);
+		free(di->product);
+		explicit_bzero(di, sizeof(*di));
+	}
+
+	return (ok);
+}
+
+int
+fido_hid_manifest(fido_dev_info_t *devlist, size_t ilen, size_t *olen)
+{
+	struct udev		*udev = NULL;
+	struct udev_enumerate	*udev_enum = NULL;
+	struct udev_list_entry	*udev_list;
+	struct udev_list_entry	*udev_entry;
+	int			 r = FIDO_ERR_INTERNAL;
+
+	*olen = 0;
+
+	if (ilen == 0)
+		return (FIDO_OK); /* nothing to do */
+
+	if (devlist == NULL)
+		return (FIDO_ERR_INVALID_ARGUMENT);
+
+	if ((udev = udev_new()) == NULL ||
+	    (udev_enum = udev_enumerate_new(udev)) == NULL)
+		goto fail;
+
+	if (udev_enumerate_add_match_subsystem(udev_enum, "hidraw") < 0 ||
+	    udev_enumerate_scan_devices(udev_enum) < 0)
+		goto fail;
+
+	if ((udev_list = udev_enumerate_get_list_entry(udev_enum)) == NULL) {
+		r = FIDO_OK; /* zero hidraw devices */
+		goto fail;
+	}
+
+	udev_list_entry_foreach(udev_entry, udev_list) {
+		if (copy_info(&devlist[*olen], udev, udev_entry) == 0) {
+			devlist[*olen].io = (fido_dev_io_t) {
+				fido_hid_open,
+				fido_hid_close,
+				fido_hid_read,
+				fido_hid_write,
+			};
+			if (++(*olen) == ilen)
+				break;
+		}
+	}
+
+	r = FIDO_OK;
+fail:
+	if (udev_enum != NULL)
+		udev_enumerate_unref(udev_enum);
+	if (udev != NULL)
+		udev_unref(udev);
+
+	return (r);
+}
+
+void *
+fido_hid_open(const char *path)
+{
+	struct hid_linux		*ctx;
+	struct hidraw_report_descriptor	 hrd;
+
+	if ((ctx = calloc(1, sizeof(*ctx))) == NULL)
+		return (NULL);
+
+	if ((ctx->fd = open(path, O_RDWR)) < 0) {
+		free(ctx);
+		return (NULL);
+	}
+
+	if (get_report_descriptor(ctx->fd, &hrd) < 0 || get_report_sizes(&hrd,
+	    &ctx->report_in_len, &ctx->report_out_len) < 0 ||
+	    ctx->report_in_len == 0 || ctx->report_out_len == 0) {
+		fido_log_debug("%s: using default report sizes", __func__);
+		ctx->report_in_len = CTAP_MAX_REPORT_LEN;
+		ctx->report_out_len = CTAP_MAX_REPORT_LEN;
+	}
+
+	return (ctx);
+}
+
+void
+fido_hid_close(void *handle)
+{
+	struct hid_linux *ctx = handle;
+
+	close(ctx->fd);
+	free(ctx);
+}
+
+static int
+timespec_to_ms(const struct timespec *ts, int upper_bound)
+{
+	int64_t x;
+	int64_t y;
+
+	if (ts->tv_sec < 0 || (uint64_t)ts->tv_sec > INT64_MAX / 1000LL ||
+	    ts->tv_nsec < 0 || (uint64_t)ts->tv_nsec / 1000000LL > INT64_MAX)
+		return (upper_bound);
+
+	x = ts->tv_sec * 1000LL;
+	y = ts->tv_nsec / 1000000LL;
+
+	if (INT64_MAX - x < y || x + y > upper_bound)
+		return (upper_bound);
+
+	return (int)(x + y);
+}
+
+static int
+waitfd(int fd, int ms)
+{
+	struct timespec	ts_start;
+	struct timespec	ts_now;
+	struct timespec	ts_delta;
+	struct pollfd	pfd;
+	int		ms_remain;
+	int		r;
+
+	if (ms < 0)
+		return (0);
+
+	memset(&pfd, 0, sizeof(pfd));
+	pfd.events = POLLIN;
+	pfd.fd = fd;
+
+	if (clock_gettime(CLOCK_MONOTONIC, &ts_start) != 0) {
+		fido_log_debug("%s: clock_gettime: %s", __func__,
+		    strerror(errno));
+		return (-1);
+	}
+
+	for (ms_remain = ms; ms_remain > 0;) {
+		if ((r = poll(&pfd, 1, ms_remain)) > 0)
+			return (0);
+		else if (r == 0)
+			break;
+		else if (errno != EINTR) {
+			fido_log_debug("%s: poll: %s", __func__,
+			    strerror(errno));
+			return (-1);
+		}
+		/* poll interrupted - subtract time already waited */
+		if (clock_gettime(CLOCK_MONOTONIC, &ts_now) != 0) {
+			fido_log_debug("%s: clock_gettime: %s", __func__,
+			    strerror(errno));
+			return (-1);
+		}
+		timespecsub(&ts_now, &ts_start, &ts_delta);
+		ms_remain = ms - timespec_to_ms(&ts_delta, ms);
+	}
+
+	return (-1);
+}
+
+int
+fido_hid_read(void *handle, unsigned char *buf, size_t len, int ms)
+{
+	struct hid_linux	*ctx = handle;
+	ssize_t			 r;
+
+	if (len != ctx->report_in_len) {
+		fido_log_debug("%s: len %zu", __func__, len);
+		return (-1);
+	}
+
+	if (waitfd(ctx->fd, ms) < 0) {
+		fido_log_debug("%s: fd not ready", __func__);
+		return (-1);
+	}
+
+	if ((r = read(ctx->fd, buf, len)) < 0 || (size_t)r != len) {
+		fido_log_debug("%s: read", __func__);
+		return (-1);
+	}
+
+	return ((int)r);
+}
+
+int
+fido_hid_write(void *handle, const unsigned char *buf, size_t len)
+{
+	struct hid_linux	*ctx = handle;
+	ssize_t			 r;
+
+	if (len != ctx->report_out_len + 1) {
+		fido_log_debug("%s: len %zu", __func__, len);
+		return (-1);
+	}
+
+	if ((r = write(ctx->fd, buf, len)) < 0 || (size_t)r != len) {
+		fido_log_debug("%s: write", __func__);
+		return (-1);
+	}
+
+	return ((int)r);
+}
+
+size_t
+fido_hid_report_in_len(void *handle)
+{
+	struct hid_linux *ctx = handle;
+
+	return (ctx->report_in_len);
+}
+
+size_t
+fido_hid_report_out_len(void *handle)
+{
+	struct hid_linux *ctx = handle;
+
+	return (ctx->report_out_len);
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/hid_openbsd.c mysql-8.0-8.0.27/extra/libfido2/src/hid_openbsd.c
--- mysql-8.0-8.0.26/extra/libfido2/src/hid_openbsd.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/hid_openbsd.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,240 @@
+/*
+ * Copyright (c) 2019 Google LLC. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <sys/types.h>
+
+#include <sys/ioctl.h>
+#include <dev/usb/usb.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <string.h>
+#include <unistd.h>
+#include <poll.h>
+
+#include "fido.h"
+
+#define MAX_UHID	64
+
+struct hid_openbsd {
+	int fd;
+	size_t report_in_len;
+	size_t report_out_len;
+};
+
+int
+fido_hid_manifest(fido_dev_info_t *devlist, size_t ilen, size_t *olen)
+{
+	size_t i;
+	char path[64];
+	int fd;
+	struct usb_device_info udi;
+	fido_dev_info_t *di;
+
+	if (ilen == 0)
+		return (FIDO_OK); /* nothing to do */
+
+	if (devlist == NULL || olen == NULL)
+		return (FIDO_ERR_INVALID_ARGUMENT);
+
+	for (i = *olen = 0; i < MAX_UHID && *olen < ilen; i++) {
+		snprintf(path, sizeof(path), "/dev/fido/%zu", i);
+		if ((fd = open(path, O_RDWR)) == -1) {
+			if (errno != ENOENT && errno != ENXIO) {
+				fido_log_debug("%s: open %s: %s", __func__,
+				    path, strerror(errno));
+			}
+			continue;
+		}
+
+		memset(&udi, 0, sizeof(udi));
+		if (ioctl(fd, USB_GET_DEVICEINFO, &udi) != 0) {
+			fido_log_debug("%s: get device info %s: %s", __func__,
+			    path, strerror(errno));
+			close(fd);
+			continue;
+		}
+		close(fd);
+
+		fido_log_debug("%s: %s: bus = 0x%02x, addr = 0x%02x",
+		    __func__, path, udi.udi_bus, udi.udi_addr);
+		fido_log_debug("%s: %s: vendor = \"%s\", product = \"%s\"",
+		    __func__, path, udi.udi_vendor, udi.udi_product);
+		fido_log_debug("%s: %s: productNo = 0x%04x, vendorNo = 0x%04x, "
+		    "releaseNo = 0x%04x", __func__, path, udi.udi_productNo,
+		    udi.udi_vendorNo, udi.udi_releaseNo);
+
+		di = &devlist[*olen];
+		memset(di, 0, sizeof(*di));
+		di->io = (fido_dev_io_t) {
+			fido_hid_open,
+			fido_hid_close,
+			fido_hid_read,
+			fido_hid_write,
+		};
+		if ((di->path = strdup(path)) == NULL ||
+		    (di->manufacturer = strdup(udi.udi_vendor)) == NULL ||
+		    (di->product = strdup(udi.udi_product)) == NULL) {
+			free(di->path);
+			free(di->manufacturer);
+			free(di->product);
+			explicit_bzero(di, sizeof(*di));
+			return FIDO_ERR_INTERNAL;
+		}
+		di->vendor_id = (int16_t)udi.udi_vendorNo;
+		di->product_id = (int16_t)udi.udi_productNo;
+		(*olen)++;
+	}
+
+	return FIDO_OK;
+}
+
+/*
+ * Workaround for OpenBSD <=6.6-current (as of 201910) bug that loses
+ * sync of DATA0/DATA1 sequence bit across uhid open/close.
+ * Send pings until we get a response - early pings with incorrect
+ * sequence bits will be ignored as duplicate packets by the device.
+ */
+static int
+terrible_ping_kludge(struct hid_openbsd *ctx)
+{
+	u_char data[256];
+	int i, n;
+	struct pollfd pfd;
+
+	if (sizeof(data) < ctx->report_out_len + 1)
+		return -1;
+	for (i = 0; i < 4; i++) {
+		memset(data, 0, sizeof(data));
+		/* broadcast channel ID */
+		data[1] = 0xff;
+		data[2] = 0xff;
+		data[3] = 0xff;
+		data[4] = 0xff;
+		/* Ping command */
+		data[5] = 0x81;
+		/* One byte ping only, Vasili */
+		data[6] = 0;
+		data[7] = 1;
+		fido_log_debug("%s: send ping %d", __func__, i);
+		if (fido_hid_write(ctx, data, ctx->report_out_len + 1) == -1)
+			return -1;
+		fido_log_debug("%s: wait reply", __func__);
+		memset(&pfd, 0, sizeof(pfd));
+		pfd.fd = ctx->fd;
+		pfd.events = POLLIN;
+		if ((n = poll(&pfd, 1, 100)) == -1) {
+			fido_log_debug("%s: poll: %s", __func__, strerror(errno));
+			return -1;
+		} else if (n == 0) {
+			fido_log_debug("%s: timed out", __func__);
+			continue;
+		}
+		if (fido_hid_read(ctx, data, ctx->report_out_len, 250) == -1)
+			return -1;
+		/*
+		 * Ping isn't always supported on the broadcast channel,
+		 * so we might get an error, but we don't care - we're
+		 * synched now.
+		 */
+		fido_log_debug("%s: got reply", __func__);
+		fido_log_xxd(data, ctx->report_out_len);
+		return 0;
+	}
+	fido_log_debug("%s: no response", __func__);
+	return -1;
+}
+
+void *
+fido_hid_open(const char *path)
+{
+	struct hid_openbsd *ret = NULL;
+
+	if ((ret = calloc(1, sizeof(*ret))) == NULL ||
+	    (ret->fd = open(path, O_RDWR)) < 0) {
+		free(ret);
+		return (NULL);
+	}
+	ret->report_in_len = ret->report_out_len = CTAP_MAX_REPORT_LEN;
+	fido_log_debug("%s: inlen = %zu outlen = %zu", __func__,
+	    ret->report_in_len, ret->report_out_len);
+
+	/*
+	 * OpenBSD (as of 201910) has a bug that causes it to lose
+	 * track of the DATA0/DATA1 sequence toggle across uhid device
+	 * open and close. This is a terrible hack to work around it.
+	 */
+	if (terrible_ping_kludge(ret) != 0) {
+		fido_hid_close(ret);
+		return NULL;
+	}
+
+	return (ret);
+}
+
+void
+fido_hid_close(void *handle)
+{
+	struct hid_openbsd *ctx = (struct hid_openbsd *)handle;
+
+	close(ctx->fd);
+	free(ctx);
+}
+
+int
+fido_hid_read(void *handle, unsigned char *buf, size_t len, int ms)
+{
+	struct hid_openbsd *ctx = (struct hid_openbsd *)handle;
+	ssize_t r;
+
+	(void)ms; /* XXX */
+
+	if (len != ctx->report_in_len) {
+		fido_log_debug("%s: invalid len: got %zu, want %zu", __func__,
+		    len, ctx->report_in_len);
+		return (-1);
+	}
+	if ((r = read(ctx->fd, buf, len)) == -1 || (size_t)r != len) {
+		fido_log_debug("%s: read: %s", __func__, strerror(errno));
+		return (-1);
+	}
+	return ((int)len);
+}
+
+int
+fido_hid_write(void *handle, const unsigned char *buf, size_t len)
+{
+	struct hid_openbsd *ctx = (struct hid_openbsd *)handle;
+	ssize_t r;
+
+	if (len != ctx->report_out_len + 1) {
+		fido_log_debug("%s: invalid len: got %zu, want %zu", __func__,
+		    len, ctx->report_out_len);
+		return (-1);
+	}
+	if ((r = write(ctx->fd, buf + 1, len - 1)) == -1 ||
+	    (size_t)r != len - 1) {
+		fido_log_debug("%s: write: %s", __func__, strerror(errno));
+		return (-1);
+	}
+	return ((int)len);
+}
+
+size_t
+fido_hid_report_in_len(void *handle)
+{
+	struct hid_openbsd *ctx = handle;
+
+	return (ctx->report_in_len);
+}
+
+size_t
+fido_hid_report_out_len(void *handle)
+{
+	struct hid_openbsd *ctx = handle;
+
+	return (ctx->report_out_len);
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/hid_osx.c mysql-8.0-8.0.27/extra/libfido2/src/hid_osx.c
--- mysql-8.0-8.0.26/extra/libfido2/src/hid_osx.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/hid_osx.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,556 @@
+/*
+ * Copyright (c) 2019 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <sys/types.h>
+
+#include <fcntl.h>
+#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include <CoreFoundation/CoreFoundation.h>
+#include <IOKit/IOKitLib.h>
+#include <IOKit/hid/IOHIDKeys.h>
+#include <IOKit/hid/IOHIDManager.h>
+
+#include "fido.h"
+
+struct hid_osx {
+	IOHIDDeviceRef	ref;
+	CFStringRef	loop_id;
+	int		report_pipe[2];
+	size_t		report_in_len;
+	size_t		report_out_len;
+	unsigned char	report[CTAP_MAX_REPORT_LEN];
+};
+
+static int
+get_int32(IOHIDDeviceRef dev, CFStringRef key, int32_t *v)
+{
+	CFTypeRef ref;
+
+	if ((ref = IOHIDDeviceGetProperty(dev, key)) == NULL ||
+	    CFGetTypeID(ref) != CFNumberGetTypeID()) {
+		fido_log_debug("%s: IOHIDDeviceGetProperty", __func__);
+		return (-1);
+	}
+
+	if (CFNumberGetType(ref) != kCFNumberSInt32Type &&
+	    CFNumberGetType(ref) != kCFNumberSInt64Type) {
+		fido_log_debug("%s: CFNumberGetType", __func__);
+		return (-1);
+	}
+
+	if (CFNumberGetValue(ref, kCFNumberSInt32Type, v) == false) {
+		fido_log_debug("%s: CFNumberGetValue", __func__);
+		return (-1);
+	}
+
+	return (0);
+}
+
+static int
+get_utf8(IOHIDDeviceRef dev, CFStringRef key, void *buf, size_t len)
+{
+	CFTypeRef ref;
+
+	memset(buf, 0, len);
+
+	if ((ref = IOHIDDeviceGetProperty(dev, key)) == NULL ||
+	    CFGetTypeID(ref) != CFStringGetTypeID()) {
+		fido_log_debug("%s: IOHIDDeviceGetProperty", __func__);
+		return (-1);
+	}
+
+	if (CFStringGetCString(ref, buf, (long)len,
+	    kCFStringEncodingUTF8) == false) {
+		fido_log_debug("%s: CFStringGetCString", __func__);
+		return (-1);
+	}
+
+	return (0);
+}
+
+static int
+get_report_len(IOHIDDeviceRef dev, int dir, size_t *report_len)
+{
+	CFStringRef	key;
+	int32_t		v;
+
+	if (dir == 0)
+		key = CFSTR(kIOHIDMaxInputReportSizeKey);
+	else
+		key = CFSTR(kIOHIDMaxOutputReportSizeKey);
+
+	if (get_int32(dev, key, &v) < 0) {
+		fido_log_debug("%s: get_int32/%d", __func__, dir);
+		return (-1);
+	}
+
+	if ((*report_len = (size_t)v) > CTAP_MAX_REPORT_LEN) {
+		fido_log_debug("%s: report_len=%zu", __func__, *report_len);
+		return (-1);
+	}
+
+	return (0);
+}
+
+static int
+get_id(IOHIDDeviceRef dev, int16_t *vendor_id, int16_t *product_id)
+{
+	int32_t	vendor;
+	int32_t product;
+
+	if (get_int32(dev, CFSTR(kIOHIDVendorIDKey), &vendor) < 0 ||
+	    vendor > UINT16_MAX) {
+		fido_log_debug("%s: get_int32 vendor", __func__);
+		return (-1);
+	}
+
+	if (get_int32(dev, CFSTR(kIOHIDProductIDKey), &product) < 0 ||
+	    product > UINT16_MAX) {
+		fido_log_debug("%s: get_int32 product", __func__);
+		return (-1);
+	}
+
+	*vendor_id = (int16_t)vendor;
+	*product_id = (int16_t)product;
+
+	return (0);
+}
+
+static int
+get_str(IOHIDDeviceRef dev, char **manufacturer, char **product)
+{
+	char	buf[512];
+	int	ok = -1;
+
+	*manufacturer = NULL;
+	*product = NULL;
+
+	if (get_utf8(dev, CFSTR(kIOHIDManufacturerKey), buf, sizeof(buf)) < 0) {
+		fido_log_debug("%s: get_utf8 manufacturer", __func__);
+		goto fail;
+	}
+
+	if ((*manufacturer = strdup(buf)) == NULL) {
+		fido_log_debug("%s: strdup manufacturer", __func__);
+		goto fail;
+	}
+
+	if (get_utf8(dev, CFSTR(kIOHIDProductKey), buf, sizeof(buf)) < 0) {
+		fido_log_debug("%s: get_utf8 product", __func__);
+		goto fail;
+	}
+
+	if ((*product = strdup(buf)) == NULL) {
+		fido_log_debug("%s: strdup product", __func__);
+		goto fail;
+	}
+
+	ok = 0;
+fail:
+	if (ok < 0) {
+		free(*manufacturer);
+		free(*product);
+		*manufacturer = NULL;
+		*product = NULL;
+	}
+
+	return (ok);
+}
+
+static char *
+get_path(IOHIDDeviceRef dev)
+{
+	io_service_t	s;
+	io_string_t	path;
+
+	if ((s = IOHIDDeviceGetService(dev)) == MACH_PORT_NULL) {
+		fido_log_debug("%s: IOHIDDeviceGetService", __func__);
+		return (NULL);
+	}
+
+	if (IORegistryEntryGetPath(s, kIOServicePlane, path) != KERN_SUCCESS) {
+		fido_log_debug("%s: IORegistryEntryGetPath", __func__);
+		return (NULL);
+	}
+
+	return (strdup(path));
+}
+
+static bool
+is_fido(IOHIDDeviceRef dev)
+{
+	char		buf[32];
+	uint32_t	usage_page;
+
+	if (get_int32(dev, CFSTR(kIOHIDPrimaryUsagePageKey),
+	    (int32_t *)&usage_page) < 0 || usage_page != 0xf1d0)
+		return (false);
+
+	if (get_utf8(dev, CFSTR(kIOHIDTransportKey), buf, sizeof(buf)) < 0) {
+		fido_log_debug("%s: get_utf8 transport", __func__);
+		return (false);
+	}
+
+#ifndef FIDO_HID_ANY
+	if (strcasecmp(buf, "usb") != 0) {
+		fido_log_debug("%s: transport", __func__);
+		return (false);
+	}
+#endif
+
+	return (true);
+}
+
+static int
+copy_info(fido_dev_info_t *di, IOHIDDeviceRef dev)
+{
+	memset(di, 0, sizeof(*di));
+
+	if (is_fido(dev) == false)
+		return (-1);
+
+	if (get_id(dev, &di->vendor_id, &di->product_id) < 0 ||
+	    get_str(dev, &di->manufacturer, &di->product) < 0 ||
+	    (di->path = get_path(dev)) == NULL) {
+		free(di->path);
+		free(di->manufacturer);
+		free(di->product);
+		explicit_bzero(di, sizeof(*di));
+		return (-1);
+	}
+
+	return (0);
+}
+
+int
+fido_hid_manifest(fido_dev_info_t *devlist, size_t ilen, size_t *olen)
+{
+	IOHIDManagerRef	 manager = NULL;
+	CFSetRef	 devset = NULL;
+	size_t		 devcnt;
+	CFIndex		 n;
+	IOHIDDeviceRef	*devs = NULL;
+	int		 r = FIDO_ERR_INTERNAL;
+
+	*olen = 0;
+
+	if (ilen == 0)
+		return (FIDO_OK); /* nothing to do */
+
+	if (devlist == NULL)
+		return (FIDO_ERR_INVALID_ARGUMENT);
+
+	if ((manager = IOHIDManagerCreate(kCFAllocatorDefault,
+	    kIOHIDManagerOptionNone)) == NULL) {
+		fido_log_debug("%s: IOHIDManagerCreate", __func__);
+		goto fail;
+	}
+
+	IOHIDManagerSetDeviceMatching(manager, NULL);
+
+	if ((devset = IOHIDManagerCopyDevices(manager)) == NULL) {
+		fido_log_debug("%s: IOHIDManagerCopyDevices", __func__);
+		goto fail;
+	}
+
+	if ((n = CFSetGetCount(devset)) < 0) {
+		fido_log_debug("%s: CFSetGetCount", __func__);
+		goto fail;
+	}
+
+	devcnt = (size_t)n;
+
+	if ((devs = calloc(devcnt, sizeof(*devs))) == NULL) {
+		fido_log_debug("%s: calloc", __func__);
+		goto fail;
+	}
+
+	CFSetGetValues(devset, (void *)devs);
+
+	for (size_t i = 0; i < devcnt; i++) {
+		if (copy_info(&devlist[*olen], devs[i]) == 0) {
+			devlist[*olen].io = (fido_dev_io_t) {
+				fido_hid_open,
+				fido_hid_close,
+				fido_hid_read,
+				fido_hid_write,
+			};
+			if (++(*olen) == ilen)
+				break;
+		}
+	}
+
+	r = FIDO_OK;
+fail:
+	if (manager != NULL)
+		CFRelease(manager);
+	if (devset != NULL)
+		CFRelease(devset);
+
+	free(devs);
+
+	return (r);
+}
+
+static void
+report_callback(void *context, IOReturn result, void *dev, IOHIDReportType type,
+    uint32_t id, uint8_t *ptr, CFIndex len)
+{
+	struct hid_osx	*ctx = context;
+	ssize_t		 r;
+
+	(void)dev;
+
+	if (result != kIOReturnSuccess || type != kIOHIDReportTypeInput ||
+	    id != 0 || len < 0 || (size_t)len != ctx->report_in_len) {
+		fido_log_debug("%s: io error", __func__);
+		return;
+	}
+
+	if ((r = write(ctx->report_pipe[1], ptr, (size_t)len)) < 0 ||
+	    (size_t)r != (size_t)len) {
+		fido_log_debug("%s: write", __func__);
+		return;
+	}
+}
+
+static void
+removal_callback(void *context, IOReturn result, void *sender)
+{
+	(void)context;
+	(void)result;
+	(void)sender;
+
+	CFRunLoopStop(CFRunLoopGetMain());
+}
+
+static int
+set_nonblock(int fd)
+{
+	int flags;
+
+	if ((flags = fcntl(fd, F_GETFL)) == -1) {
+		fido_log_debug("%s: fcntl F_GETFL", __func__);
+		return (-1);
+	}
+
+	if (fcntl(fd, F_SETFL, flags | O_NONBLOCK) == -1) {
+		fido_log_debug("%s: fcntl, F_SETFL", __func__);
+		return (-1);
+	}
+
+	return (0);
+}
+
+static int
+disable_sigpipe(int fd)
+{
+	int disabled = 1;
+
+	if (fcntl(fd, F_SETNOSIGPIPE, &disabled) == -1) {
+		fido_log_debug("%s: fcntl F_SETNOSIGPIPE", __func__);
+		return (-1);
+	}
+
+	return (0);
+}
+
+void *
+fido_hid_open(const char *path)
+{
+	struct hid_osx		*ctx;
+	io_registry_entry_t	 entry = MACH_PORT_NULL;
+	char			 loop_id[32];
+	int			 ok = -1;
+	int			 r;
+
+	if ((ctx = calloc(1, sizeof(*ctx))) == NULL) {
+		fido_log_debug("%s: calloc", __func__);
+		goto fail;
+	}
+
+	ctx->report_pipe[0] = -1;
+	ctx->report_pipe[1] = -1;
+
+	if (pipe(ctx->report_pipe) == -1) {
+		fido_log_debug("%s: pipe", __func__);
+		goto fail;
+	}
+
+	if (set_nonblock(ctx->report_pipe[0]) < 0 ||
+	    set_nonblock(ctx->report_pipe[1]) < 0) {
+		fido_log_debug("%s: set_nonblock", __func__);
+		goto fail;
+	}
+
+	if (disable_sigpipe(ctx->report_pipe[1]) < 0) {
+		fido_log_debug("%s: disable_sigpipe", __func__);
+		goto fail;
+	}
+
+	if ((entry = IORegistryEntryFromPath(kIOMasterPortDefault,
+	    path)) == MACH_PORT_NULL) {
+		fido_log_debug("%s: IORegistryEntryFromPath", __func__);
+		goto fail;
+	}
+
+	if ((ctx->ref = IOHIDDeviceCreate(kCFAllocatorDefault,
+	    entry)) == NULL) {
+		fido_log_debug("%s: IOHIDDeviceCreate", __func__);
+		goto fail;
+	}
+
+	if (get_report_len(ctx->ref, 0, &ctx->report_in_len) < 0 ||
+	    get_report_len(ctx->ref, 1, &ctx->report_out_len) < 0) {
+		fido_log_debug("%s: get_report_len", __func__);
+		goto fail;
+	}
+
+	if (ctx->report_in_len > sizeof(ctx->report)) {
+		fido_log_debug("%s: report_in_len=%zu", __func__,
+		    ctx->report_in_len);
+		goto fail;
+	}
+
+	if (IOHIDDeviceOpen(ctx->ref,
+	    kIOHIDOptionsTypeSeizeDevice) != kIOReturnSuccess) {
+		fido_log_debug("%s: IOHIDDeviceOpen", __func__);
+		goto fail;
+	}
+
+	if ((r = snprintf(loop_id, sizeof(loop_id), "fido2-%p",
+	    (void *)ctx->ref)) < 0 || (size_t)r >= sizeof(loop_id)) {
+		fido_log_debug("%s: snprintf", __func__);
+		goto fail;
+	}
+
+	if ((ctx->loop_id = CFStringCreateWithCString(NULL, loop_id,
+	    kCFStringEncodingASCII)) == NULL) {
+		fido_log_debug("%s: CFStringCreateWithCString", __func__);
+		goto fail;
+	}
+
+	IOHIDDeviceRegisterInputReportCallback(ctx->ref, ctx->report,
+	    (long)ctx->report_in_len, &report_callback, ctx);
+	IOHIDDeviceRegisterRemovalCallback(ctx->ref, &removal_callback, ctx);
+	IOHIDDeviceScheduleWithRunLoop(ctx->ref, CFRunLoopGetMain(),
+	    ctx->loop_id);
+
+	ok = 0;
+fail:
+	if (entry != MACH_PORT_NULL)
+		IOObjectRelease(entry);
+
+	if (ok < 0 && ctx != NULL) {
+		if (ctx->ref != NULL)
+			CFRelease(ctx->ref);
+		if (ctx->loop_id != NULL)
+			CFRelease(ctx->loop_id);
+		if (ctx->report_pipe[0] != -1)
+			close(ctx->report_pipe[0]);
+		if (ctx->report_pipe[1] != -1)
+			close(ctx->report_pipe[1]);
+		free(ctx);
+		ctx = NULL;
+	}
+
+	return (ctx);
+}
+
+void
+fido_hid_close(void *handle)
+{
+	struct hid_osx *ctx = handle;
+
+	IOHIDDeviceRegisterInputReportCallback(ctx->ref, ctx->report,
+	    (long)ctx->report_in_len, NULL, ctx);
+	IOHIDDeviceRegisterRemovalCallback(ctx->ref, NULL, NULL);
+	IOHIDDeviceUnscheduleFromRunLoop(ctx->ref, CFRunLoopGetMain(),
+	    ctx->loop_id);
+
+	if (IOHIDDeviceClose(ctx->ref,
+	    kIOHIDOptionsTypeSeizeDevice) != kIOReturnSuccess)
+		fido_log_debug("%s: IOHIDDeviceClose", __func__);
+
+	CFRelease(ctx->ref);
+	CFRelease(ctx->loop_id);
+
+	explicit_bzero(ctx->report, sizeof(ctx->report));
+	close(ctx->report_pipe[0]);
+	close(ctx->report_pipe[1]);
+
+	free(ctx);
+}
+
+int
+fido_hid_read(void *handle, unsigned char *buf, size_t len, int ms)
+{
+	struct hid_osx		*ctx = handle;
+	ssize_t			 r;
+
+	explicit_bzero(buf, len);
+	explicit_bzero(ctx->report, sizeof(ctx->report));
+
+	if (len != ctx->report_in_len || len > sizeof(ctx->report)) {
+		fido_log_debug("%s: len %zu", __func__, len);
+		return (-1);
+	}
+
+	if (ms == -1)
+		ms = 5000; /* wait 5 seconds by default */
+
+	if (CFRunLoopGetCurrent() != CFRunLoopGetMain())
+		fido_log_debug("%s: CFRunLoopGetCurrent != CFRunLoopGetMain",
+		    __func__);
+
+	CFRunLoopRunInMode(ctx->loop_id, (double)ms/1000.0, true);
+
+	if ((r = read(ctx->report_pipe[0], buf, len)) < 0 || (size_t)r != len) {
+		fido_log_debug("%s: read", __func__);
+		return (-1);
+	}
+
+	return ((int)len);
+}
+
+int
+fido_hid_write(void *handle, const unsigned char *buf, size_t len)
+{
+	struct hid_osx *ctx = handle;
+
+	if (len != ctx->report_out_len + 1 || len > LONG_MAX) {
+		fido_log_debug("%s: len %zu", __func__, len);
+		return (-1);
+	}
+
+	if (IOHIDDeviceSetReport(ctx->ref, kIOHIDReportTypeOutput, 0, buf + 1,
+	    (long)(len - 1)) != kIOReturnSuccess) {
+		fido_log_debug("%s: IOHIDDeviceSetReport", __func__);
+		return (-1);
+	}
+
+	return ((int)len);
+}
+
+size_t
+fido_hid_report_in_len(void *handle)
+{
+	struct hid_osx *ctx = handle;
+
+	return (ctx->report_in_len);
+}
+
+size_t
+fido_hid_report_out_len(void *handle)
+{
+	struct hid_osx *ctx = handle;
+
+	return (ctx->report_out_len);
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/hid_win.c mysql-8.0-8.0.27/extra/libfido2/src/hid_win.c
--- mysql-8.0-8.0.26/extra/libfido2/src/hid_win.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/hid_win.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,530 @@
+/*
+ * Copyright (c) 2019 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <sys/types.h>
+
+#include <fcntl.h>
+#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <windows.h>
+#include <setupapi.h>
+#include <initguid.h>
+#include <devpkey.h>
+#include <devpropdef.h>
+#include <hidclass.h>
+#include <hidsdi.h>
+
+#include "fido.h"
+
+#if defined(__MINGW32__) &&  __MINGW64_VERSION_MAJOR < 6
+WINSETUPAPI WINBOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO,
+    PSP_DEVINFO_DATA, const DEVPROPKEY *, DEVPROPTYPE *, PBYTE,
+    DWORD, PDWORD, DWORD);
+#endif
+
+#if defined(__MINGW32__)
+DEFINE_DEVPROPKEY(DEVPKEY_Device_Parent, 0x4340a6c5, 0x93fa, 0x4706, 0x97,
+    0x2c, 0x7b, 0x64, 0x80, 0x08, 0xa5, 0xa7, 8);
+#endif
+
+struct hid_win {
+	HANDLE		dev;
+	OVERLAPPED	overlap;
+	int		report_pending;
+	size_t		report_in_len;
+	size_t		report_out_len;
+	unsigned char	report[1 + CTAP_MAX_REPORT_LEN];
+};
+
+static bool
+is_fido(HANDLE dev)
+{
+	PHIDP_PREPARSED_DATA	data = NULL;
+	HIDP_CAPS		caps;
+	int			fido = 0;
+
+	if (HidD_GetPreparsedData(dev, &data) == false) {
+		fido_log_debug("%s: HidD_GetPreparsedData", __func__);
+		goto fail;
+	}
+
+	if (HidP_GetCaps(data, &caps) != HIDP_STATUS_SUCCESS) {
+		fido_log_debug("%s: HidP_GetCaps", __func__);
+		goto fail;
+	}
+
+	fido = (uint16_t)caps.UsagePage == 0xf1d0;
+fail:
+	if (data != NULL)
+		HidD_FreePreparsedData(data);
+
+	return (fido);
+}
+
+static int
+get_report_len(HANDLE dev, int dir, size_t *report_len)
+{
+	PHIDP_PREPARSED_DATA	data = NULL;
+	HIDP_CAPS		caps;
+	USHORT			v;
+	int			ok = -1;
+
+	if (HidD_GetPreparsedData(dev, &data) == false) {
+		fido_log_debug("%s: HidD_GetPreparsedData/%d", __func__, dir);
+		goto fail;
+	}
+
+	if (HidP_GetCaps(data, &caps) != HIDP_STATUS_SUCCESS) {
+		fido_log_debug("%s: HidP_GetCaps/%d", __func__, dir);
+		goto fail;
+	}
+
+	if (dir == 0)
+		v = caps.InputReportByteLength;
+	else
+		v = caps.OutputReportByteLength;
+
+	if ((*report_len = (size_t)v) == 0) {
+		fido_log_debug("%s: report_len == 0", __func__);
+		goto fail;
+	}
+
+	ok = 0;
+fail:
+	if (data != NULL)
+		HidD_FreePreparsedData(data);
+
+	return (ok);
+}
+
+static int
+get_int(HANDLE dev, int16_t *vendor_id, int16_t *product_id)
+{
+	HIDD_ATTRIBUTES attr;
+
+	attr.Size = sizeof(attr);
+
+	if (HidD_GetAttributes(dev, &attr) == false ||
+	    attr.VendorID > INT16_MAX || attr.ProductID > INT16_MAX) {
+		fido_log_debug("%s: HidD_GetAttributes", __func__);
+		return (-1);
+	}
+
+	*vendor_id = (int16_t)attr.VendorID;
+	*product_id = (int16_t)attr.ProductID;
+
+	return (0);
+}
+
+static int
+get_str(HANDLE dev, char **manufacturer, char **product)
+{
+	wchar_t	buf[512];
+	int	utf8_len;
+	int	ok = -1;
+
+	*manufacturer = NULL;
+	*product = NULL;
+
+	if (HidD_GetManufacturerString(dev, &buf, sizeof(buf)) == false) {
+		fido_log_debug("%s: HidD_GetManufacturerString", __func__);
+		goto fail;
+	}
+
+	if ((utf8_len = WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, buf,
+	    -1, NULL, 0, NULL, NULL)) <= 0 || utf8_len > 128) {
+		fido_log_debug("%s: WideCharToMultiByte", __func__);
+		goto fail;
+	}
+
+	if ((*manufacturer = malloc((size_t)utf8_len)) == NULL) {
+		fido_log_debug("%s: malloc", __func__);
+		goto fail;
+	}
+
+	if (WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, buf, -1,
+	    *manufacturer, utf8_len, NULL, NULL) != utf8_len) {
+		fido_log_debug("%s: WideCharToMultiByte", __func__);
+		goto fail;
+	}
+
+	if (HidD_GetProductString(dev, &buf, sizeof(buf)) == false) {
+		fido_log_debug("%s: HidD_GetProductString", __func__);
+		goto fail;
+	}
+
+	if ((utf8_len = WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, buf,
+	    -1, NULL, 0, NULL, NULL)) <= 0 || utf8_len > 128) {
+		fido_log_debug("%s: WideCharToMultiByte", __func__);
+		goto fail;
+	}
+
+	if ((*product = malloc((size_t)utf8_len)) == NULL) {
+		fido_log_debug("%s: malloc", __func__);
+		goto fail;
+	}
+
+	if (WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, buf, -1,
+	    *product, utf8_len, NULL, NULL) != utf8_len) {
+		fido_log_debug("%s: WideCharToMultiByte", __func__);
+		goto fail;
+	}
+
+	ok = 0;
+fail:
+	if (ok < 0) {
+		free(*manufacturer);
+		free(*product);
+		*manufacturer = NULL;
+		*product = NULL;
+	}
+
+	return (ok);
+}
+
+static char *
+get_path(HDEVINFO devinfo, SP_DEVICE_INTERFACE_DATA *ifdata)
+{
+	SP_DEVICE_INTERFACE_DETAIL_DATA_A	*ifdetail = NULL;
+	char					*path = NULL;
+	DWORD					 len = 0;
+
+	/*
+	 * "Get the required buffer size. Call SetupDiGetDeviceInterfaceDetail
+	 * with a NULL DeviceInterfaceDetailData pointer, a
+	 * DeviceInterfaceDetailDataSize of zero, and a valid RequiredSize
+	 * variable. In response to such a call, this function returns the
+	 * required buffer size at RequiredSize and fails with GetLastError
+	 * returning ERROR_INSUFFICIENT_BUFFER."
+	 */
+	if (SetupDiGetDeviceInterfaceDetailA(devinfo, ifdata, NULL, 0, &len,
+	    NULL) != false || GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
+		fido_log_debug("%s: SetupDiGetDeviceInterfaceDetailA 1",
+		    __func__);
+		goto fail;
+	}
+
+	if ((ifdetail = malloc(len)) == NULL) {
+		fido_log_debug("%s: malloc", __func__);
+		goto fail;
+	}
+
+	ifdetail->cbSize = sizeof(*ifdetail);
+
+	if (SetupDiGetDeviceInterfaceDetailA(devinfo, ifdata, ifdetail, len,
+	    NULL, NULL) == false) {
+		fido_log_debug("%s: SetupDiGetDeviceInterfaceDetailA 2",
+		    __func__);
+		goto fail;
+	}
+
+	if ((path = strdup(ifdetail->DevicePath)) == NULL) {
+		fido_log_debug("%s: strdup", __func__);
+		goto fail;
+	}
+
+fail:
+	free(ifdetail);
+
+	return (path);
+}
+
+#ifndef FIDO_HID_ANY
+static bool
+hid_ok(HDEVINFO devinfo, DWORD idx)
+{
+	SP_DEVINFO_DATA	 devinfo_data;
+	wchar_t		*parent = NULL;
+	DWORD		 parent_type = DEVPROP_TYPE_STRING;
+	DWORD		 len = 0;
+	bool		 ok = false;
+
+	memset(&devinfo_data, 0, sizeof(devinfo_data));
+	devinfo_data.cbSize = sizeof(devinfo_data);
+
+	if (SetupDiEnumDeviceInfo(devinfo, idx, &devinfo_data) == false) {
+		fido_log_debug("%s: SetupDiEnumDeviceInfo", __func__);
+		goto fail;
+	}
+
+	if (SetupDiGetDevicePropertyW(devinfo, &devinfo_data,
+	    &DEVPKEY_Device_Parent, &parent_type, NULL, 0, &len, 0) != false ||
+	    GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
+		fido_log_debug("%s: SetupDiGetDevicePropertyW 1", __func__);
+		goto fail;
+	}
+
+	if ((parent = malloc(len)) == NULL) {
+		fido_log_debug("%s: malloc", __func__);
+		goto fail;
+	}
+
+	if (SetupDiGetDevicePropertyW(devinfo, &devinfo_data,
+	    &DEVPKEY_Device_Parent, &parent_type, (PBYTE)parent, len, NULL,
+	    0) == false) {
+		fido_log_debug("%s: SetupDiGetDevicePropertyW 2", __func__);
+		goto fail;
+	}
+
+	ok = wcsncmp(parent, L"USB\\", 4) == 0;
+fail:
+	free(parent);
+
+	return (ok);
+}
+#endif
+
+static int
+copy_info(fido_dev_info_t *di, HDEVINFO devinfo, DWORD idx,
+    SP_DEVICE_INTERFACE_DATA *ifdata)
+{
+	HANDLE	dev = INVALID_HANDLE_VALUE;
+	int	ok = -1;
+
+	memset(di, 0, sizeof(*di));
+
+	if ((di->path = get_path(devinfo, ifdata)) == NULL) {
+		fido_log_debug("%s: get_path", __func__);
+		goto fail;
+	}
+
+	fido_log_debug("%s: path=%s", __func__, di->path);
+
+#ifndef FIDO_HID_ANY
+	if (hid_ok(devinfo, idx) == false) {
+		fido_log_debug("%s: hid_ok", __func__);
+		goto fail;
+	}
+#endif
+
+	dev = CreateFileA(di->path, 0, FILE_SHARE_READ | FILE_SHARE_WRITE,
+	    NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+	if (dev == INVALID_HANDLE_VALUE) {
+		fido_log_debug("%s: CreateFileA", __func__);
+		goto fail;
+	}
+
+	if (is_fido(dev) == false) {
+		fido_log_debug("%s: is_fido", __func__);
+		goto fail;
+	}
+
+	if (get_int(dev, &di->vendor_id, &di->product_id) < 0 ||
+	    get_str(dev, &di->manufacturer, &di->product) < 0) {
+		fido_log_debug("%s: get_int/get_str", __func__);
+		goto fail;
+	}
+
+	ok = 0;
+fail:
+	if (dev != INVALID_HANDLE_VALUE)
+		CloseHandle(dev);
+
+	if (ok < 0) {
+		free(di->path);
+		free(di->manufacturer);
+		free(di->product);
+		explicit_bzero(di, sizeof(*di));
+	}
+
+	return (ok);
+}
+
+int
+fido_hid_manifest(fido_dev_info_t *devlist, size_t ilen, size_t *olen)
+{
+	GUID				hid_guid = GUID_DEVINTERFACE_HID;
+	HDEVINFO			devinfo = INVALID_HANDLE_VALUE;
+	SP_DEVICE_INTERFACE_DATA	ifdata;
+	DWORD				idx;
+	int				r = FIDO_ERR_INTERNAL;
+
+	*olen = 0;
+
+	if (ilen == 0)
+		return (FIDO_OK); /* nothing to do */
+	if (devlist == NULL)
+		return (FIDO_ERR_INVALID_ARGUMENT);
+
+	if ((devinfo = SetupDiGetClassDevsA(&hid_guid, NULL, NULL,
+	    DIGCF_DEVICEINTERFACE | DIGCF_PRESENT)) == INVALID_HANDLE_VALUE) {
+		fido_log_debug("%s: SetupDiGetClassDevsA", __func__);
+		goto fail;
+	}
+
+	ifdata.cbSize = sizeof(SP_DEVICE_INTERFACE_DATA);
+
+	for (idx = 0; SetupDiEnumDeviceInterfaces(devinfo, NULL, &hid_guid,
+	    idx, &ifdata) == true; idx++) {
+		if (copy_info(&devlist[*olen], devinfo, idx, &ifdata) == 0) {
+			devlist[*olen].io = (fido_dev_io_t) {
+				fido_hid_open,
+				fido_hid_close,
+				fido_hid_read,
+				fido_hid_write,
+			};
+			if (++(*olen) == ilen)
+				break;
+		}
+	}
+
+	r = FIDO_OK;
+fail:
+	if (devinfo != INVALID_HANDLE_VALUE)
+		SetupDiDestroyDeviceInfoList(devinfo);
+
+	return (r);
+}
+
+void *
+fido_hid_open(const char *path)
+{
+	struct hid_win *ctx;
+
+	if ((ctx = calloc(1, sizeof(*ctx))) == NULL)
+		return (NULL);
+
+	ctx->dev = CreateFileA(path, GENERIC_READ | GENERIC_WRITE,
+	    FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING,
+	    FILE_FLAG_OVERLAPPED, NULL);
+
+	if (ctx->dev == INVALID_HANDLE_VALUE) {
+		free(ctx);
+		return (NULL);
+	}
+
+	if ((ctx->overlap.hEvent = CreateEventA(NULL, FALSE, FALSE,
+	    NULL)) == NULL) {
+		fido_log_debug("%s: CreateEventA", __func__);
+		fido_hid_close(ctx);
+		return (NULL);
+	}
+
+	if (get_report_len(ctx->dev, 0, &ctx->report_in_len) < 0 ||
+	    get_report_len(ctx->dev, 1, &ctx->report_out_len) < 0) {
+		fido_log_debug("%s: get_report_len", __func__);
+		fido_hid_close(ctx);
+		return (NULL);
+	}
+
+	return (ctx);
+}
+
+void
+fido_hid_close(void *handle)
+{
+	struct hid_win *ctx = handle;
+
+	if (ctx->overlap.hEvent != NULL) {
+		if (ctx->report_pending) {
+			fido_log_debug("%s: report_pending", __func__);
+			CancelIo(ctx->dev);
+		}
+		CloseHandle(ctx->overlap.hEvent);
+	}
+
+	explicit_bzero(ctx->report, sizeof(ctx->report));
+	CloseHandle(ctx->dev);
+	free(ctx);
+}
+
+int
+fido_hid_read(void *handle, unsigned char *buf, size_t len, int ms)
+{
+	struct hid_win	*ctx = handle;
+	DWORD		 n;
+
+	if (len != ctx->report_in_len - 1 || len > sizeof(ctx->report) - 1) {
+		fido_log_debug("%s: len %zu", __func__, len);
+		return (-1);
+	}
+
+	if (ctx->report_pending == 0) {
+		memset(&ctx->report, 0, sizeof(ctx->report));
+		ResetEvent(ctx->overlap.hEvent);
+		if (ReadFile(ctx->dev, ctx->report, (DWORD)(len + 1), &n,
+		    &ctx->overlap) == 0 && GetLastError() != ERROR_IO_PENDING) {
+			CancelIo(ctx->dev);
+			fido_log_debug("%s: ReadFile", __func__);
+			return (-1);
+		}
+		ctx->report_pending = 1;
+	}
+
+	if (ms > -1 && WaitForSingleObject(ctx->overlap.hEvent,
+	    (DWORD)ms) != WAIT_OBJECT_0)
+		return (0);
+
+	ctx->report_pending = 0;
+
+	if (GetOverlappedResult(ctx->dev, &ctx->overlap, &n, TRUE) == 0) {
+		fido_log_debug("%s: GetOverlappedResult", __func__);
+		return (-1);
+	}
+
+	if (n != len + 1) {
+		fido_log_debug("%s: expected %zu, got %zu", __func__,
+		    len + 1, (size_t)n);
+		return (-1);
+	}
+
+	memcpy(buf, ctx->report + 1, len);
+	explicit_bzero(ctx->report, sizeof(ctx->report));
+
+	return ((int)len);
+}
+
+int
+fido_hid_write(void *handle, const unsigned char *buf, size_t len)
+{
+	struct hid_win	*ctx = handle;
+	OVERLAPPED	 overlap;
+	DWORD		 n;
+
+	memset(&overlap, 0, sizeof(overlap));
+
+	if (len != ctx->report_out_len) {
+		fido_log_debug("%s: len %zu", __func__, len);
+		return (-1);
+	}
+
+	if (WriteFile(ctx->dev, buf, (DWORD)len, NULL, &overlap) == 0 &&
+	    GetLastError() != ERROR_IO_PENDING) {
+		fido_log_debug("%s: WriteFile", __func__);
+		return (-1);
+	}
+
+	if (GetOverlappedResult(ctx->dev, &overlap, &n, TRUE) == 0) {
+		fido_log_debug("%s: GetOverlappedResult", __func__);
+		return (-1);
+	}
+
+	if (n != len) {
+		fido_log_debug("%s: expected %zu, got %zu", __func__, len,
+		    (size_t)n);
+		return (-1);
+	}
+
+	return ((int)len);
+}
+
+size_t
+fido_hid_report_in_len(void *handle)
+{
+	struct hid_win *ctx = handle;
+
+	return (ctx->report_in_len - 1);
+}
+
+size_t
+fido_hid_report_out_len(void *handle)
+{
+	struct hid_win *ctx = handle;
+
+	return (ctx->report_out_len - 1);
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/info.c mysql-8.0-8.0.27/extra/libfido2/src/info.c
--- mysql-8.0-8.0.26/extra/libfido2/src/info.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/info.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,433 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <string.h>
+#include "fido.h"
+
+static int
+decode_version(const cbor_item_t *item, void *arg)
+{
+	fido_str_array_t	*v = arg;
+	const size_t		 i = v->len;
+
+	/* keep ptr[x] and len consistent */
+	if (cbor_string_copy(item, &v->ptr[i]) < 0) {
+		fido_log_debug("%s: cbor_string_copy", __func__);
+		return (-1);
+	}
+
+	v->len++;
+
+	return (0);
+}
+
+static int
+decode_versions(const cbor_item_t *item, fido_str_array_t *v)
+{
+	v->ptr = NULL;
+	v->len = 0;
+
+	if (cbor_isa_array(item) == false ||
+	    cbor_array_is_definite(item) == false) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (-1);
+	}
+
+	v->ptr = calloc(cbor_array_size(item), sizeof(char *));
+	if (v->ptr == NULL)
+		return (-1);
+
+	if (cbor_array_iter(item, v, decode_version) < 0) {
+		fido_log_debug("%s: decode_version", __func__);
+		return (-1);
+	}
+
+	return (0);
+}
+
+static int
+decode_extension(const cbor_item_t *item, void *arg)
+{
+	fido_str_array_t	*e = arg;
+	const size_t		 i = e->len;
+
+	/* keep ptr[x] and len consistent */
+	if (cbor_string_copy(item, &e->ptr[i]) < 0) {
+		fido_log_debug("%s: cbor_string_copy", __func__);
+		return (-1);
+	}
+
+	e->len++;
+
+	return (0);
+}
+
+static int
+decode_extensions(const cbor_item_t *item, fido_str_array_t *e)
+{
+	e->ptr = NULL;
+	e->len = 0;
+
+	if (cbor_isa_array(item) == false ||
+	    cbor_array_is_definite(item) == false) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (-1);
+	}
+
+	e->ptr = calloc(cbor_array_size(item), sizeof(char *));
+	if (e->ptr == NULL)
+		return (-1);
+
+	if (cbor_array_iter(item, e, decode_extension) < 0) {
+		fido_log_debug("%s: decode_extension", __func__);
+		return (-1);
+	}
+
+	return (0);
+}
+
+static int
+decode_aaguid(const cbor_item_t *item, unsigned char *aaguid, size_t aaguid_len)
+{
+	if (cbor_isa_bytestring(item) == false ||
+	    cbor_bytestring_is_definite(item) == false ||
+	    cbor_bytestring_length(item) != aaguid_len) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (-1);
+	}
+
+	memcpy(aaguid, cbor_bytestring_handle(item), aaguid_len);
+
+	return (0);
+}
+
+static int
+decode_option(const cbor_item_t *key, const cbor_item_t *val, void *arg)
+{
+	fido_opt_array_t	*o = arg;
+	const size_t		 i = o->len;
+
+	if (cbor_isa_float_ctrl(val) == false ||
+	    cbor_float_get_width(val) != CBOR_FLOAT_0 ||
+	    cbor_is_bool(val) == false) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (0); /* ignore */
+	}
+
+	if (cbor_string_copy(key, &o->name[i]) < 0) {
+		fido_log_debug("%s: cbor_string_copy", __func__);
+		return (0); /* ignore */
+	}
+
+	/* keep name/value and len consistent */
+	o->value[i] = cbor_ctrl_value(val) == CBOR_CTRL_TRUE;
+	o->len++;
+
+	return (0);
+}
+
+static int
+decode_options(const cbor_item_t *item, fido_opt_array_t *o)
+{
+	o->name = NULL;
+	o->value = NULL;
+	o->len = 0;
+
+	if (cbor_isa_map(item) == false ||
+	    cbor_map_is_definite(item) == false) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (-1);
+	}
+
+	o->name = calloc(cbor_map_size(item), sizeof(char *));
+	o->value = calloc(cbor_map_size(item), sizeof(bool));
+	if (o->name == NULL || o->value == NULL)
+		return (-1);
+
+	return (cbor_map_iter(item, o, decode_option));
+}
+
+static int
+decode_protocol(const cbor_item_t *item, void *arg)
+{
+	fido_byte_array_t	*p = arg;
+	const size_t		 i = p->len;
+
+	if (cbor_isa_uint(item) == false ||
+	    cbor_int_get_width(item) != CBOR_INT_8) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (-1);
+	}
+
+	/* keep ptr[x] and len consistent */
+	p->ptr[i] = cbor_get_uint8(item);
+	p->len++;
+
+	return (0);
+}
+
+static int
+decode_protocols(const cbor_item_t *item, fido_byte_array_t *p)
+{
+	p->ptr = NULL;
+	p->len = 0;
+
+	if (cbor_isa_array(item) == false ||
+	    cbor_array_is_definite(item) == false) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (-1);
+	}
+
+	p->ptr = calloc(cbor_array_size(item), sizeof(uint8_t));
+	if (p->ptr == NULL)
+		return (-1);
+
+	if (cbor_array_iter(item, p, decode_protocol) < 0) {
+		fido_log_debug("%s: decode_protocol", __func__);
+		return (-1);
+	}
+
+	return (0);
+}
+
+static int
+parse_reply_element(const cbor_item_t *key, const cbor_item_t *val, void *arg)
+{
+	fido_cbor_info_t *ci = arg;
+
+	if (cbor_isa_uint(key) == false ||
+	    cbor_int_get_width(key) != CBOR_INT_8) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (0); /* ignore */
+	}
+
+	switch (cbor_get_uint8(key)) {
+	case 1: /* versions */
+		return (decode_versions(val, &ci->versions));
+	case 2: /* extensions */
+		return (decode_extensions(val, &ci->extensions));
+	case 3: /* aaguid */
+		return (decode_aaguid(val, ci->aaguid, sizeof(ci->aaguid)));
+	case 4: /* options */
+		return (decode_options(val, &ci->options));
+	case 5: /* maxMsgSize */
+		return (cbor_decode_uint64(val, &ci->maxmsgsiz));
+	case 6: /* pinProtocols */
+		return (decode_protocols(val, &ci->protocols));
+	case 7: /* maxCredentialCountInList */
+		return (cbor_decode_uint64(val, &ci->maxcredcntlst));
+	case 8: /* maxCredentialIdLength */
+		return (cbor_decode_uint64(val, &ci->maxcredidlen));
+	case 14: /* fwVersion */
+		return (cbor_decode_uint64(val, &ci->fwversion));
+	default: /* ignore */
+		fido_log_debug("%s: cbor type", __func__);
+		return (0);
+	}
+}
+
+static int
+fido_dev_get_cbor_info_tx(fido_dev_t *dev)
+{
+	const unsigned char cbor[] = { CTAP_CBOR_GETINFO };
+
+	fido_log_debug("%s: dev=%p", __func__, (void *)dev);
+
+	if (fido_tx(dev, CTAP_CMD_CBOR, cbor, sizeof(cbor)) < 0) {
+		fido_log_debug("%s: fido_tx", __func__);
+		return (FIDO_ERR_TX);
+	}
+
+	return (FIDO_OK);
+}
+
+static int
+fido_dev_get_cbor_info_rx(fido_dev_t *dev, fido_cbor_info_t *ci, int ms)
+{
+	unsigned char	reply[FIDO_MAXMSG];
+	int		reply_len;
+
+	fido_log_debug("%s: dev=%p, ci=%p, ms=%d", __func__, (void *)dev,
+	    (void *)ci, ms);
+
+	memset(ci, 0, sizeof(*ci));
+
+	if ((reply_len = fido_rx(dev, CTAP_CMD_CBOR, &reply, sizeof(reply),
+	    ms)) < 0) {
+		fido_log_debug("%s: fido_rx", __func__);
+		return (FIDO_ERR_RX);
+	}
+
+	return (cbor_parse_reply(reply, (size_t)reply_len, ci,
+	    parse_reply_element));
+}
+
+int
+fido_dev_get_cbor_info_wait(fido_dev_t *dev, fido_cbor_info_t *ci, int ms)
+{
+	int r;
+
+	if ((r = fido_dev_get_cbor_info_tx(dev)) != FIDO_OK ||
+	    (r = fido_dev_get_cbor_info_rx(dev, ci, ms)) != FIDO_OK)
+		return (r);
+
+	return (FIDO_OK);
+}
+
+int
+fido_dev_get_cbor_info(fido_dev_t *dev, fido_cbor_info_t *ci)
+{
+	return (fido_dev_get_cbor_info_wait(dev, ci, -1));
+}
+
+/*
+ * get/set functions for fido_cbor_info_t; always at the end of the file
+ */
+
+fido_cbor_info_t *
+fido_cbor_info_new(void)
+{
+	return (calloc(1, sizeof(fido_cbor_info_t)));
+}
+
+static void
+free_str_array(fido_str_array_t *sa)
+{
+	for (size_t i = 0; i < sa->len; i++)
+		free(sa->ptr[i]);
+
+	free(sa->ptr);
+	sa->ptr = NULL;
+	sa->len = 0;
+}
+
+static void
+free_opt_array(fido_opt_array_t *oa)
+{
+	for (size_t i = 0; i < oa->len; i++)
+		free(oa->name[i]);
+
+	free(oa->name);
+	free(oa->value);
+	oa->name = NULL;
+	oa->value = NULL;
+}
+
+static void
+free_byte_array(fido_byte_array_t *ba)
+{
+	free(ba->ptr);
+
+	ba->ptr = NULL;
+	ba->len = 0;
+}
+
+void
+fido_cbor_info_free(fido_cbor_info_t **ci_p)
+{
+	fido_cbor_info_t *ci;
+
+	if (ci_p == NULL || (ci = *ci_p) ==  NULL)
+		return;
+
+	free_str_array(&ci->versions);
+	free_str_array(&ci->extensions);
+	free_opt_array(&ci->options);
+	free_byte_array(&ci->protocols);
+	free(ci);
+
+	*ci_p = NULL;
+}
+
+char **
+fido_cbor_info_versions_ptr(const fido_cbor_info_t *ci)
+{
+	return (ci->versions.ptr);
+}
+
+size_t
+fido_cbor_info_versions_len(const fido_cbor_info_t *ci)
+{
+	return (ci->versions.len);
+}
+
+char **
+fido_cbor_info_extensions_ptr(const fido_cbor_info_t *ci)
+{
+	return (ci->extensions.ptr);
+}
+
+size_t
+fido_cbor_info_extensions_len(const fido_cbor_info_t *ci)
+{
+	return (ci->extensions.len);
+}
+
+const unsigned char *
+fido_cbor_info_aaguid_ptr(const fido_cbor_info_t *ci)
+{
+	return (ci->aaguid);
+}
+
+size_t
+fido_cbor_info_aaguid_len(const fido_cbor_info_t *ci)
+{
+	return (sizeof(ci->aaguid));
+}
+
+char **
+fido_cbor_info_options_name_ptr(const fido_cbor_info_t *ci)
+{
+	return (ci->options.name);
+}
+
+const bool *
+fido_cbor_info_options_value_ptr(const fido_cbor_info_t *ci)
+{
+	return (ci->options.value);
+}
+
+size_t
+fido_cbor_info_options_len(const fido_cbor_info_t *ci)
+{
+	return (ci->options.len);
+}
+
+uint64_t
+fido_cbor_info_maxmsgsiz(const fido_cbor_info_t *ci)
+{
+	return (ci->maxmsgsiz);
+}
+
+uint64_t
+fido_cbor_info_maxcredcntlst(const fido_cbor_info_t *ci)
+{
+	return (ci->maxcredcntlst);
+}
+
+uint64_t
+fido_cbor_info_maxcredidlen(const fido_cbor_info_t *ci)
+{
+	return (ci->maxcredidlen);
+}
+
+uint64_t
+fido_cbor_info_fwversion(const fido_cbor_info_t *ci)
+{
+	return (ci->fwversion);
+}
+
+const uint8_t *
+fido_cbor_info_protocols_ptr(const fido_cbor_info_t *ci)
+{
+	return (ci->protocols.ptr);
+}
+
+size_t
+fido_cbor_info_protocols_len(const fido_cbor_info_t *ci)
+{
+	return (ci->protocols.len);
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/io.c mysql-8.0-8.0.27/extra/libfido2/src/io.c
--- mysql-8.0-8.0.26/extra/libfido2/src/io.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/io.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,300 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "fido.h"
+#include "packed.h"
+
+PACKED_TYPE(frame_t,
+struct frame {
+	uint32_t cid; /* channel id */
+	union {
+		uint8_t type;
+		struct {
+			uint8_t cmd;
+			uint8_t bcnth;
+			uint8_t bcntl;
+			uint8_t data[CTAP_MAX_REPORT_LEN - CTAP_INIT_HEADER_LEN];
+		} init;
+		struct {
+			uint8_t seq;
+			uint8_t data[CTAP_MAX_REPORT_LEN - CTAP_CONT_HEADER_LEN];
+		} cont;
+	} body;
+})
+
+#ifndef MIN
+#define MIN(x, y) ((x) > (y) ? (y) : (x))
+#endif
+
+static int
+tx_empty(fido_dev_t *d, uint8_t cmd)
+{
+	struct frame	*fp;
+	unsigned char	 pkt[sizeof(*fp) + 1];
+	const size_t	 len = d->tx_len + 1;
+	int		 n;
+
+	memset(&pkt, 0, sizeof(pkt));
+	fp = (struct frame *)(pkt + 1);
+	fp->cid = d->cid;
+	fp->body.init.cmd = CTAP_FRAME_INIT | cmd;
+
+	if (len > sizeof(pkt) || (n = d->io.write(d->io_handle, pkt,
+	    len)) < 0 || (size_t)n != len)
+		return (-1);
+
+	return (0);
+}
+
+static size_t
+tx_preamble(fido_dev_t *d, uint8_t cmd, const void *buf, size_t count)
+{
+	struct frame	*fp;
+	unsigned char	 pkt[sizeof(*fp) + 1];
+	const size_t	 len = d->tx_len + 1;
+	int		 n;
+
+	if (d->tx_len - CTAP_INIT_HEADER_LEN > sizeof(fp->body.init.data))
+		return (0);
+
+	memset(&pkt, 0, sizeof(pkt));
+	fp = (struct frame *)(pkt + 1);
+	fp->cid = d->cid;
+	fp->body.init.cmd = CTAP_FRAME_INIT | cmd;
+	fp->body.init.bcnth = (count >> 8) & 0xff;
+	fp->body.init.bcntl = count & 0xff;
+	count = MIN(count, d->tx_len - CTAP_INIT_HEADER_LEN);
+	memcpy(&fp->body.init.data, buf, count);
+
+	if (len > sizeof(pkt) || (n = d->io.write(d->io_handle, pkt,
+	    len)) < 0 || (size_t)n != len)
+		return (0);
+
+	return (count);
+}
+
+static size_t
+tx_frame(fido_dev_t *d, uint8_t seq, const void *buf, size_t count)
+{
+	struct frame	*fp;
+	unsigned char	 pkt[sizeof(*fp) + 1];
+	const size_t	 len = d->tx_len + 1;
+	int		 n;
+
+	if (d->tx_len - CTAP_CONT_HEADER_LEN > sizeof(fp->body.cont.data))
+		return (0);
+
+	memset(&pkt, 0, sizeof(pkt));
+	fp = (struct frame *)(pkt + 1);
+	fp->cid = d->cid;
+	fp->body.cont.seq = seq;
+	count = MIN(count, d->tx_len - CTAP_CONT_HEADER_LEN);
+	memcpy(&fp->body.cont.data, buf, count);
+
+	if (len > sizeof(pkt) || (n = d->io.write(d->io_handle, pkt,
+	    len)) < 0 || (size_t)n != len)
+		return (0);
+
+	return (count);
+}
+
+static int
+tx(fido_dev_t *d, uint8_t cmd, const unsigned char *buf, size_t count)
+{
+	size_t n, sent;
+
+	if ((sent = tx_preamble(d, cmd, buf, count)) == 0) {
+		fido_log_debug("%s: tx_preamble", __func__);
+		return (-1);
+	}
+
+	for (uint8_t seq = 0; sent < count; sent += n) {
+		if (seq & 0x80) {
+			fido_log_debug("%s: seq & 0x80", __func__);
+			return (-1);
+		}
+		if ((n = tx_frame(d, seq++, buf + sent, count - sent)) == 0) {
+			fido_log_debug("%s: tx_frame", __func__);
+			return (-1);
+		}
+	}
+
+	return (0);
+}
+
+int
+fido_tx(fido_dev_t *d, uint8_t cmd, const void *buf, size_t count)
+{
+	fido_log_debug("%s: d=%p, cmd=0x%02x, buf=%p, count=%zu", __func__,
+	    (void *)d, cmd, (const void *)buf, count);
+	fido_log_xxd(buf, count);
+
+	if (d->transport.tx != NULL)
+		return (d->transport.tx(d, cmd, buf, count));
+	if (d->io_handle == NULL || d->io.write == NULL || count > UINT16_MAX) {
+		fido_log_debug("%s: invalid argument", __func__);
+		return (-1);
+	}
+
+	return (count == 0 ? tx_empty(d, cmd) : tx(d, cmd, buf, count));
+}
+
+static int
+rx_frame(fido_dev_t *d, struct frame *fp, int ms)
+{
+	int n;
+
+	memset(fp, 0, sizeof(*fp));
+
+	if (d->rx_len > sizeof(*fp) || (n = d->io.read(d->io_handle,
+	    (unsigned char *)fp, d->rx_len, ms)) < 0 || (size_t)n != d->rx_len)
+		return (-1);
+
+	return (0);
+}
+
+static int
+rx_preamble(fido_dev_t *d, uint8_t cmd, struct frame *fp, int ms)
+{
+	do {
+		if (rx_frame(d, fp, ms) < 0)
+			return (-1);
+#ifdef FIDO_FUZZ
+		fp->cid = d->cid;
+#endif
+	} while (fp->cid == d->cid &&
+	    fp->body.init.cmd == (CTAP_FRAME_INIT | CTAP_KEEPALIVE));
+
+	if (d->rx_len > sizeof(*fp))
+		return (-1);
+
+	fido_log_debug("%s: initiation frame at %p", __func__, (void *)fp);
+	fido_log_xxd(fp, d->rx_len);
+
+#ifdef FIDO_FUZZ
+	fp->body.init.cmd = (CTAP_FRAME_INIT | cmd);
+#endif
+
+	if (fp->cid != d->cid || fp->body.init.cmd != (CTAP_FRAME_INIT | cmd)) {
+		fido_log_debug("%s: cid (0x%x, 0x%x), cmd (0x%02x, 0x%02x)",
+		    __func__, fp->cid, d->cid, fp->body.init.cmd, cmd);
+		return (-1);
+	}
+
+	return (0);
+}
+
+static int
+rx(fido_dev_t *d, uint8_t cmd, unsigned char *buf, size_t count, int ms)
+{
+	struct frame f;
+	size_t r, payload_len, init_data_len, cont_data_len;
+
+	if (d->rx_len <= CTAP_INIT_HEADER_LEN ||
+	    d->rx_len <= CTAP_CONT_HEADER_LEN)
+		return (-1);
+
+	init_data_len = d->rx_len - CTAP_INIT_HEADER_LEN;
+	cont_data_len = d->rx_len - CTAP_CONT_HEADER_LEN;
+
+	if (init_data_len > sizeof(f.body.init.data) ||
+	    cont_data_len > sizeof(f.body.cont.data))
+		return (-1);
+
+	if (rx_preamble(d, cmd, &f, ms) < 0) {
+		fido_log_debug("%s: rx_preamble", __func__);
+		return (-1);
+	}
+
+	payload_len = (size_t)((f.body.init.bcnth << 8) | f.body.init.bcntl);
+	fido_log_debug("%s: payload_len=%zu", __func__, payload_len);
+
+	if (count < payload_len) {
+		fido_log_debug("%s: count < payload_len", __func__);
+		return (-1);
+	}
+
+	if (payload_len < init_data_len) {
+		memcpy(buf, f.body.init.data, payload_len);
+		return ((int)payload_len);
+	}
+
+	memcpy(buf, f.body.init.data, init_data_len);
+	r = init_data_len;
+
+	for (int seq = 0; r < payload_len; seq++) {
+		if (rx_frame(d, &f, ms) < 0) {
+			fido_log_debug("%s: rx_frame", __func__);
+			return (-1);
+		}
+
+		fido_log_debug("%s: continuation frame at %p", __func__,
+		    (void *)&f);
+		fido_log_xxd(&f, d->rx_len);
+
+#ifdef FIDO_FUZZ
+		f.cid = d->cid;
+		f.body.cont.seq = (uint8_t)seq;
+#endif
+
+		if (f.cid != d->cid || f.body.cont.seq != seq) {
+			fido_log_debug("%s: cid (0x%x, 0x%x), seq (%d, %d)",
+			    __func__, f.cid, d->cid, f.body.cont.seq, seq);
+			return (-1);
+		}
+
+		if (payload_len - r > cont_data_len) {
+			memcpy(buf + r, f.body.cont.data, cont_data_len);
+			r += cont_data_len;
+		} else {
+			memcpy(buf + r, f.body.cont.data, payload_len - r);
+			r += payload_len - r; /* break */
+		}
+	}
+
+	return ((int)r);
+}
+
+int
+fido_rx(fido_dev_t *d, uint8_t cmd, void *buf, size_t count, int ms)
+{
+	int n;
+
+	fido_log_debug("%s: d=%p, cmd=0x%02x, buf=%p, count=%zu, ms=%d",
+	    __func__, (void *)d, cmd, (const void *)buf, count, ms);
+
+	if (d->transport.rx != NULL)
+		return (d->transport.rx(d, cmd, buf, count, ms));
+	if (d->io_handle == NULL || d->io.read == NULL || count > UINT16_MAX) {
+		fido_log_debug("%s: invalid argument", __func__);
+		return (-1);
+	}
+	if ((n = rx(d, cmd, buf, count, ms)) >= 0) {
+		fido_log_debug("%s: buf=%p, len=%d", __func__, (void *)buf, n);
+		fido_log_xxd(buf, (size_t)n);
+	}
+
+	return (n);
+}
+
+int
+fido_rx_cbor_status(fido_dev_t *d, int ms)
+{
+	unsigned char	reply[FIDO_MAXMSG];
+	int		reply_len;
+
+	if ((reply_len = fido_rx(d, CTAP_CMD_CBOR, &reply, sizeof(reply),
+	    ms)) < 0 || (size_t)reply_len < 1) {
+		fido_log_debug("%s: fido_rx", __func__);
+		return (FIDO_ERR_RX);
+	}
+
+	return (reply[0]);
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/iso7816.c mysql-8.0-8.0.27/extra/libfido2/src/iso7816.c
--- mysql-8.0-8.0.26/extra/libfido2/src/iso7816.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/iso7816.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <string.h>
+#include "fido.h"
+
+iso7816_apdu_t *
+iso7816_new(uint8_t ins, uint8_t p1, uint16_t payload_len)
+{
+	iso7816_apdu_t	*apdu;
+	size_t		 alloc_len;
+
+	alloc_len = sizeof(iso7816_apdu_t) + payload_len + 2; /* le1 le2 */
+
+	if ((apdu = calloc(1, alloc_len)) == NULL)
+		return (NULL);
+
+	apdu->alloc_len = alloc_len;
+	apdu->payload_len = payload_len;
+	apdu->payload_ptr = apdu->payload;
+	apdu->header.ins = ins;
+	apdu->header.p1 = p1;
+	apdu->header.lc2 = (uint8_t)((payload_len >> 8) & 0xff);
+	apdu->header.lc3 = (uint8_t)(payload_len & 0xff);
+
+	return (apdu);
+}
+
+void
+iso7816_free(iso7816_apdu_t **apdu_p)
+{
+	iso7816_apdu_t *apdu;
+
+	if (apdu_p == NULL || (apdu = *apdu_p) == NULL)
+		return;
+
+	explicit_bzero(apdu, apdu->alloc_len);
+	free(apdu);
+
+	*apdu_p = NULL;
+}
+
+int
+iso7816_add(iso7816_apdu_t *apdu, const void *buf, size_t cnt)
+{
+	if (cnt > apdu->payload_len || cnt > UINT16_MAX)
+		return (-1);
+
+	memcpy(apdu->payload_ptr, buf, cnt);
+	apdu->payload_ptr += cnt;
+	apdu->payload_len = (uint16_t)(apdu->payload_len - cnt);
+
+	return (0);
+}
+
+const unsigned char *
+iso7816_ptr(const iso7816_apdu_t *apdu)
+{
+	return ((const unsigned char *)&apdu->header);
+}
+
+size_t
+iso7816_len(const iso7816_apdu_t *apdu)
+{
+	return (apdu->alloc_len - sizeof(apdu->alloc_len) -
+	    sizeof(apdu->payload_len) - sizeof(apdu->payload_ptr));
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/iso7816.h mysql-8.0-8.0.27/extra/libfido2/src/iso7816.h
--- mysql-8.0-8.0.26/extra/libfido2/src/iso7816.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/iso7816.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#ifndef _ISO7816_H
+#define _ISO7816_H
+
+#include <stdint.h>
+#include <stdlib.h>
+
+#include "packed.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+PACKED_TYPE(iso7816_header_t,
+struct iso7816_header {
+	uint8_t cla;
+	uint8_t ins;
+	uint8_t p1;
+	uint8_t p2;
+	uint8_t lc1;
+	uint8_t lc2;
+	uint8_t lc3;
+})
+
+PACKED_TYPE(iso7816_apdu_t,
+struct iso7816_apdu {
+	size_t            alloc_len;
+	uint16_t          payload_len;
+	uint8_t          *payload_ptr;
+	iso7816_header_t  header;
+	uint8_t           payload[];
+})
+
+const unsigned char *iso7816_ptr(const iso7816_apdu_t *);
+int iso7816_add(iso7816_apdu_t *, const void *, size_t);
+iso7816_apdu_t *iso7816_new(uint8_t, uint8_t, uint16_t);
+size_t iso7816_len(const iso7816_apdu_t *);
+void iso7816_free(iso7816_apdu_t **);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !_ISO7816_H */
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/libfido2.pc.in mysql-8.0-8.0.27/extra/libfido2/src/libfido2.pc.in
--- mysql-8.0-8.0.26/extra/libfido2/src/libfido2.pc.in	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/libfido2.pc.in	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,12 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+includedir=${prefix}/include
+
+Name: @PROJECT_NAME@
+Description: A FIDO2 library
+URL: https://github.com/yubico/libfido2
+Version: @FIDO_VERSION@
+Requires: libcrypto
+Libs: -L${libdir} -lfido2
+Cflags: -I${includedir}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/log.c mysql-8.0-8.0.27/extra/libfido2/src/log.c
--- mysql-8.0-8.0.26/extra/libfido2/src/log.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/log.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "fido.h"
+
+#ifndef FIDO_NO_DIAGNOSTIC
+
+#define XXDLEN	32
+#define XXDROW	128
+#define LINELEN	256
+
+#ifndef TLS
+#define TLS
+#endif
+
+static TLS int logging;
+static TLS fido_log_handler_t *log_handler;
+
+static void
+log_on_stderr(const char *str)
+{
+	fprintf(stderr, "%s", str);
+}
+
+void
+fido_log_init(void)
+{
+	logging = 1;
+	log_handler = log_on_stderr;
+}
+
+void
+fido_log_debug(const char *fmt, ...)
+{
+	char line[LINELEN];
+	va_list ap;
+	int r;
+
+	if (!logging || log_handler == NULL)
+		return;
+
+	va_start(ap, fmt);
+	r = vsnprintf(line, sizeof(line) - 1, fmt, ap);
+	va_end(ap);
+	if (r < 0 || (size_t)r >= sizeof(line) - 1)
+		return;
+	strlcat(line, "\n", sizeof(line));
+	log_handler(line);
+}
+
+void
+fido_log_xxd(const void *buf, size_t count)
+{
+	const uint8_t *ptr = buf;
+	char row[XXDROW];
+	char xxd[XXDLEN];
+
+	if (!logging || log_handler == NULL || count == 0)
+		return;
+
+	*row = '\0';
+
+	for (size_t i = 0; i < count; i++) {
+		*xxd = '\0';
+		if (i % 16 == 0)
+			snprintf(xxd, sizeof(xxd), "%04zu: %02x", i, *ptr++);
+		else
+			snprintf(xxd, sizeof(xxd), " %02x", *ptr++);
+		strlcat(row, xxd, sizeof(row));
+		if (i % 16 == 15 || i == count - 1) {
+			fido_log_debug("%s", row);
+			*row = '\0';
+		}
+	}
+}
+
+void
+fido_set_log_handler(fido_log_handler_t *handler)
+{
+	if (handler != NULL)
+		log_handler = handler;
+}
+
+#endif /* !FIDO_NO_DIAGNOSTIC */
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/packed.h mysql-8.0-8.0.27/extra/libfido2/src/packed.h
--- mysql-8.0-8.0.26/extra/libfido2/src/packed.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/packed.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#ifndef _PACKED_H
+#define _PACKED_H
+
+#if defined(__GNUC__)
+#define PACKED_TYPE(type, def)	\
+	typedef def __attribute__ ((__packed__)) type;
+#elif defined(_MSC_VER)
+#define PACKED_TYPE(type, def)	\
+	__pragma(pack(push, 1))	\
+	typedef def type;	\
+	__pragma(pack(pop))
+#else
+#error "please provide a way to define packed types on your platform"
+#endif
+
+#endif /* !_PACKED_H */
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/pin.c mysql-8.0-8.0.27/extra/libfido2/src/pin.c
--- mysql-8.0-8.0.26/extra/libfido2/src/pin.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/pin.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,526 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <string.h>
+
+#include "fido.h"
+#include "fido/es256.h"
+
+static int
+parse_pintoken(const cbor_item_t *key, const cbor_item_t *val, void *arg)
+{
+	fido_blob_t *token = arg;
+
+	if (cbor_isa_uint(key) == false ||
+	    cbor_int_get_width(key) != CBOR_INT_8 ||
+	    cbor_get_uint8(key) != 2) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (0); /* ignore */
+	}
+
+	return (fido_blob_decode(val, token));
+}
+
+#ifdef FIDO_UVTOKEN
+static int
+parse_uvtoken(const cbor_item_t *key, const cbor_item_t *val, void *arg)
+{
+	return (parse_pintoken(key, val, arg));
+}
+#endif /* FIDO_UVTOKEN */
+
+static int
+fido_dev_get_pin_token_tx(fido_dev_t *dev, const char *pin,
+    const fido_blob_t *ecdh, const es256_pk_t *pk)
+{
+	fido_blob_t	 f;
+	fido_blob_t	*p = NULL;
+	cbor_item_t	*argv[6];
+	int		 r;
+
+	memset(&f, 0, sizeof(f));
+	memset(argv, 0, sizeof(argv));
+
+	if ((p = fido_blob_new()) == NULL || fido_blob_set(p,
+	    (const unsigned char *)pin, strlen(pin)) < 0) {
+		fido_log_debug("%s: fido_blob_set", __func__);
+		r = FIDO_ERR_INVALID_ARGUMENT;
+		goto fail;
+	}
+
+	if ((argv[0] = cbor_build_uint8(1)) == NULL ||
+	    (argv[1] = cbor_build_uint8(5)) == NULL ||
+	    (argv[2] = es256_pk_encode(pk, 1)) == NULL ||
+	    (argv[5] = cbor_encode_pin_hash_enc(ecdh, p)) == NULL) {
+		fido_log_debug("%s: cbor encode", __func__);
+		r = FIDO_ERR_INTERNAL;
+		goto fail;
+	}
+
+	if (cbor_build_frame(CTAP_CBOR_CLIENT_PIN, argv, nitems(argv),
+	    &f) < 0 || fido_tx(dev, CTAP_CMD_CBOR, f.ptr, f.len) < 0) {
+		fido_log_debug("%s: fido_tx", __func__);
+		r = FIDO_ERR_TX;
+		goto fail;
+	}
+
+	r = FIDO_OK;
+fail:
+	cbor_vector_free(argv, nitems(argv));
+	fido_blob_free(&p);
+	free(f.ptr);
+
+	return (r);
+}
+
+#ifdef FIDO_UVTOKEN
+static int
+fido_dev_get_uv_token_tx(fido_dev_t *dev, const es256_pk_t *pk)
+{
+	fido_blob_t	 f;
+	cbor_item_t	*argv[3];
+	int		 r;
+
+	memset(&f, 0, sizeof(f));
+	memset(argv, 0, sizeof(argv));
+
+	if ((argv[0] = cbor_build_uint8(1)) == NULL ||
+	    (argv[1] = cbor_build_uint8(6)) == NULL ||
+	    (argv[2] = es256_pk_encode(pk, 1)) == NULL) {
+		fido_log_debug("%s: cbor encode", __func__);
+		r = FIDO_ERR_INTERNAL;
+		goto fail;
+	}
+
+	if (cbor_build_frame(CTAP_CBOR_CLIENT_PIN, argv, nitems(argv),
+	    &f) < 0 || fido_tx(dev, CTAP_CMD_CBOR, f.ptr, f.len) < 0) {
+		fido_log_debug("%s:  fido_tx", __func__);
+		r = FIDO_ERR_TX;
+		goto fail;
+	}
+
+	r = FIDO_OK;
+fail:
+	cbor_vector_free(argv, nitems(argv));
+	free(f.ptr);
+
+	return (r);
+}
+#endif /* FIDO_UVTOKEN */
+
+static int
+fido_dev_get_pin_token_rx(fido_dev_t *dev, const fido_blob_t *ecdh,
+    fido_blob_t *token, int ms)
+{
+	fido_blob_t	*aes_token = NULL;
+	unsigned char	 reply[FIDO_MAXMSG];
+	int		 reply_len;
+	int		 r;
+
+	if ((aes_token = fido_blob_new()) == NULL) {
+		r = FIDO_ERR_INTERNAL;
+		goto fail;
+	}
+
+	if ((reply_len = fido_rx(dev, CTAP_CMD_CBOR, &reply, sizeof(reply),
+	    ms)) < 0) {
+		fido_log_debug("%s: fido_rx", __func__);
+		r = FIDO_ERR_RX;
+		goto fail;
+	}
+
+	if ((r = cbor_parse_reply(reply, (size_t)reply_len, aes_token,
+	    parse_pintoken)) != FIDO_OK) {
+		fido_log_debug("%s: parse_pintoken", __func__);
+		goto fail;
+	}
+
+	if  (aes256_cbc_dec(ecdh, aes_token, token) < 0) {
+		fido_log_debug("%s: aes256_cbc_dec", __func__);
+		r = FIDO_ERR_RX;
+		goto fail;
+	}
+
+	r = FIDO_OK;
+fail:
+	fido_blob_free(&aes_token);
+
+	return (r);
+}
+
+#ifdef FIDO_UVTOKEN
+static int
+fido_dev_get_uv_token_rx(fido_dev_t *dev, const  fido_blob_t *ecdh,
+    fido_blob_t *token, int ms)
+{
+	fido_blob_t	*aes_token = NULL;
+	unsigned char	 reply[FIDO_MAXMSG];
+	int		 reply_len;
+	int		 r;
+
+	if ((aes_token = fido_blob_new()) == NULL) {
+		r = FIDO_ERR_INTERNAL;
+		goto fail;
+	}
+
+	if ((reply_len = fido_rx(dev, CTAP_CMD_CBOR, &reply, sizeof(reply),
+	    ms)) < 0) {
+		fido_log_debug("%s: fido_rx", __func__);
+		r = FIDO_ERR_RX;
+		goto fail;
+	}
+
+	if ((r = cbor_parse_reply(reply, (size_t)reply_len, aes_token,
+	    parse_uvtoken)) != FIDO_OK) {
+		fido_log_debug("%s: parse_uvtoken", __func__);
+		goto fail;
+	}
+
+	if (aes256_cbc_dec(ecdh, aes_token, token) < 0) {
+		fido_log_debug("%s: aes256_cbc_dec", __func__);
+		r = FIDO_ERR_RX;
+		goto fail;
+	}
+
+	r = FIDO_OK;
+fail:
+	fido_blob_free(&aes_token);
+
+	return (r);
+}
+#endif /* FIDO_UVTOKEN */
+
+static int
+fido_dev_get_pin_token_wait(fido_dev_t *dev, const char *pin,
+    const fido_blob_t *ecdh, const es256_pk_t *pk, fido_blob_t *token, int ms)
+{
+	int r;
+
+#ifdef FIDO_UVTOKEN
+	if (getenv("FIDO_UVTOKEN") != NULL) {
+		if ((r = fido_dev_get_uv_token_tx(dev, pk)) != FIDO_OK ||
+		    (r = fido_dev_get_uv_token_rx(dev, ecdh, token, ms)) != FIDO_OK)
+			return (r);
+	} else {
+		if ((r = fido_dev_get_pin_token_tx(dev, pin, ecdh, pk)) != FIDO_OK ||
+		    (r = fido_dev_get_pin_token_rx(dev, ecdh, token, ms)) != FIDO_OK)
+			return (r);
+	}
+#else
+	if ((r = fido_dev_get_pin_token_tx(dev, pin, ecdh, pk)) != FIDO_OK ||
+	    (r = fido_dev_get_pin_token_rx(dev, ecdh, token, ms)) != FIDO_OK)
+		return (r);
+#endif
+
+	return (FIDO_OK);
+}
+
+int
+fido_dev_get_pin_token(fido_dev_t *dev, const char *pin,
+    const fido_blob_t *ecdh, const es256_pk_t *pk, fido_blob_t *token)
+{
+	return (fido_dev_get_pin_token_wait(dev, pin, ecdh, pk, token, -1));
+}
+
+static int
+pad64(const char *pin, fido_blob_t **ppin)
+{
+	size_t	pin_len;
+	size_t	ppin_len;
+
+	pin_len = strlen(pin);
+	if (pin_len < 4 || pin_len > 255) {
+		fido_log_debug("%s: invalid pin length", __func__);
+		return (FIDO_ERR_PIN_POLICY_VIOLATION);
+	}
+
+	if ((*ppin = fido_blob_new()) == NULL)
+		return (FIDO_ERR_INTERNAL);
+
+	ppin_len = (pin_len + 63U) & ~63U;
+	if (ppin_len < pin_len || ((*ppin)->ptr = calloc(1, ppin_len)) == NULL) {
+		fido_blob_free(ppin);
+		return (FIDO_ERR_INTERNAL);
+	}
+
+	memcpy((*ppin)->ptr, pin, pin_len);
+	(*ppin)->len = ppin_len;
+
+	return (FIDO_OK);
+}
+
+static int
+fido_dev_change_pin_tx(fido_dev_t *dev, const char *pin, const char *oldpin)
+{
+	fido_blob_t	 f;
+	fido_blob_t	*ppin = NULL;
+	fido_blob_t	*ecdh = NULL;
+	fido_blob_t	*opin = NULL;
+	cbor_item_t	*argv[6];
+	es256_pk_t	*pk = NULL;
+	int r;
+
+	memset(&f, 0, sizeof(f));
+	memset(argv, 0, sizeof(argv));
+
+	if ((opin = fido_blob_new()) == NULL || fido_blob_set(opin,
+	    (const unsigned char *)oldpin, strlen(oldpin)) < 0) {
+		fido_log_debug("%s: fido_blob_set", __func__);
+		r = FIDO_ERR_INVALID_ARGUMENT;
+		goto fail;
+	}
+
+	if ((r = pad64(pin, &ppin)) != FIDO_OK) {
+		fido_log_debug("%s: pad64", __func__);
+		goto fail;
+	}
+
+	if ((r = fido_do_ecdh(dev, &pk, &ecdh)) != FIDO_OK) {
+		fido_log_debug("%s: fido_do_ecdh", __func__);
+		goto fail;
+	}
+
+	if ((argv[0] = cbor_build_uint8(1)) == NULL ||
+	    (argv[1] = cbor_build_uint8(4)) == NULL ||
+	    (argv[2] = es256_pk_encode(pk, 1)) == NULL ||
+	    (argv[3] = cbor_encode_change_pin_auth(ecdh, ppin, opin)) == NULL ||
+	    (argv[4] = cbor_encode_pin_enc(ecdh, ppin)) == NULL ||
+	    (argv[5] = cbor_encode_pin_hash_enc(ecdh, opin)) == NULL) {
+		fido_log_debug("%s: cbor encode", __func__);
+		r = FIDO_ERR_INTERNAL;
+		goto fail;
+	}
+
+	if (cbor_build_frame(CTAP_CBOR_CLIENT_PIN, argv, nitems(argv),
+	    &f) < 0 || fido_tx(dev, CTAP_CMD_CBOR, f.ptr, f.len) < 0) {
+		fido_log_debug("%s: fido_tx", __func__);
+		r = FIDO_ERR_TX;
+		goto fail;
+	}
+
+	r = FIDO_OK;
+fail:
+	cbor_vector_free(argv, nitems(argv));
+	es256_pk_free(&pk);
+	fido_blob_free(&ppin);
+	fido_blob_free(&ecdh);
+	fido_blob_free(&opin);
+	free(f.ptr);
+
+	return (r);
+
+}
+
+static int
+fido_dev_set_pin_tx(fido_dev_t *dev, const char *pin)
+{
+	fido_blob_t	 f;
+	fido_blob_t	*ppin = NULL;
+	fido_blob_t	*ecdh = NULL;
+	cbor_item_t	*argv[5];
+	es256_pk_t	*pk = NULL;
+	int		 r;
+
+	memset(&f, 0, sizeof(f));
+	memset(argv, 0, sizeof(argv));
+
+	if ((r = pad64(pin, &ppin)) != FIDO_OK) {
+		fido_log_debug("%s: pad64", __func__);
+		goto fail;
+	}
+
+	if ((r = fido_do_ecdh(dev, &pk, &ecdh)) != FIDO_OK) {
+		fido_log_debug("%s: fido_do_ecdh", __func__);
+		goto fail;
+	}
+
+	if ((argv[0] = cbor_build_uint8(1)) == NULL ||
+	    (argv[1] = cbor_build_uint8(3)) == NULL ||
+	    (argv[2] = es256_pk_encode(pk, 1)) == NULL ||
+	    (argv[3] = cbor_encode_set_pin_auth(ecdh, ppin)) == NULL ||
+	    (argv[4] = cbor_encode_pin_enc(ecdh, ppin)) == NULL) {
+		fido_log_debug("%s: cbor encode", __func__);
+		r = FIDO_ERR_INTERNAL;
+		goto fail;
+	}
+
+	if (cbor_build_frame(CTAP_CBOR_CLIENT_PIN, argv, nitems(argv),
+	    &f) < 0 || fido_tx(dev, CTAP_CMD_CBOR, f.ptr, f.len) < 0) {
+		fido_log_debug("%s: fido_tx", __func__);
+		r = FIDO_ERR_TX;
+		goto fail;
+	}
+
+	r = FIDO_OK;
+fail:
+	cbor_vector_free(argv, nitems(argv));
+	es256_pk_free(&pk);
+	fido_blob_free(&ppin);
+	fido_blob_free(&ecdh);
+	free(f.ptr);
+
+	return (r);
+}
+
+static int
+fido_dev_set_pin_wait(fido_dev_t *dev, const char *pin, const char *oldpin,
+    int ms)
+{
+	int r;
+
+	if (oldpin != NULL) {
+		if ((r = fido_dev_change_pin_tx(dev, pin, oldpin)) != FIDO_OK) {
+			fido_log_debug("%s: fido_dev_change_pin_tx", __func__);
+			return (r);
+		}
+	} else {
+		if ((r = fido_dev_set_pin_tx(dev, pin)) != FIDO_OK) {
+			fido_log_debug("%s: fido_dev_set_pin_tx", __func__);
+			return (r);
+		}
+	}
+
+	if ((r = fido_rx_cbor_status(dev, ms)) != FIDO_OK) {
+		fido_log_debug("%s: fido_rx_cbor_status", __func__);
+		return (r);
+	}
+
+	return (FIDO_OK);
+}
+
+int
+fido_dev_set_pin(fido_dev_t *dev, const char *pin, const char *oldpin)
+{
+	return (fido_dev_set_pin_wait(dev, pin, oldpin, -1));
+}
+
+static int
+parse_retry_count(const cbor_item_t *key, const cbor_item_t *val, void *arg)
+{
+	int		*retries = arg;
+	uint64_t	 n;
+
+	if (cbor_isa_uint(key) == false ||
+	    cbor_int_get_width(key) != CBOR_INT_8 ||
+	    cbor_get_uint8(key) != 3) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (0); /* ignore */
+	}
+
+	if (cbor_decode_uint64(val, &n) < 0 || n > INT_MAX) {
+		fido_log_debug("%s: cbor_decode_uint64", __func__);
+		return (-1);
+	}
+
+	*retries = (int)n;
+
+	return (0);
+}
+
+static int
+fido_dev_get_retry_count_tx(fido_dev_t *dev)
+{
+	fido_blob_t	 f;
+	cbor_item_t	*argv[2];
+	int		 r;
+
+	memset(&f, 0, sizeof(f));
+	memset(argv, 0, sizeof(argv));
+
+	if ((argv[0] = cbor_build_uint8(1)) == NULL ||
+	    (argv[1] = cbor_build_uint8(1)) == NULL) {
+		r = FIDO_ERR_INTERNAL;
+		goto fail;
+	}
+
+	if (cbor_build_frame(CTAP_CBOR_CLIENT_PIN, argv, nitems(argv),
+	    &f) < 0 || fido_tx(dev, CTAP_CMD_CBOR, f.ptr, f.len) < 0) {
+		fido_log_debug("%s: fido_tx", __func__);
+		r = FIDO_ERR_TX;
+		goto fail;
+	}
+
+	r = FIDO_OK;
+fail:
+	cbor_vector_free(argv, nitems(argv));
+	free(f.ptr);
+
+	return (r);
+}
+
+static int
+fido_dev_get_retry_count_rx(fido_dev_t *dev, int *retries, int ms)
+{
+	unsigned char	reply[FIDO_MAXMSG];
+	int		reply_len;
+	int		r;
+
+	*retries = 0;
+
+	if ((reply_len = fido_rx(dev, CTAP_CMD_CBOR, &reply, sizeof(reply),
+	    ms)) < 0) {
+		fido_log_debug("%s: fido_rx", __func__);
+		return (FIDO_ERR_RX);
+	}
+
+	if ((r = cbor_parse_reply(reply, (size_t)reply_len, retries,
+	    parse_retry_count)) != FIDO_OK) {
+		fido_log_debug("%s: parse_retry_count", __func__);
+		return (r);
+	}
+
+	return (FIDO_OK);
+}
+
+static int
+fido_dev_get_retry_count_wait(fido_dev_t *dev, int *retries, int ms)
+{
+	int r;
+
+	if ((r = fido_dev_get_retry_count_tx(dev)) != FIDO_OK ||
+	    (r = fido_dev_get_retry_count_rx(dev, retries, ms)) != FIDO_OK)
+		return (r);
+
+	return (FIDO_OK);
+}
+
+int
+fido_dev_get_retry_count(fido_dev_t *dev, int *retries)
+{
+	return (fido_dev_get_retry_count_wait(dev, retries, -1));
+}
+
+int
+cbor_add_pin_params(fido_dev_t *dev, const fido_blob_t *hmac_data,
+    const es256_pk_t *pk, const fido_blob_t *ecdh, const char *pin,
+    cbor_item_t **auth, cbor_item_t **opt)
+{
+	fido_blob_t	*token = NULL;
+	int		 r;
+
+	if ((token = fido_blob_new()) == NULL) {
+		r = FIDO_ERR_INTERNAL;
+		goto fail;
+	}
+
+	if ((r = fido_dev_get_pin_token(dev, pin, ecdh, pk, token)) != FIDO_OK) {
+		fido_log_debug("%s: fido_dev_get_pin_token", __func__);
+		goto fail;
+	}
+
+	if ((*auth = cbor_encode_pin_auth(token, hmac_data)) == NULL ||
+	    (*opt = cbor_encode_pin_opt()) == NULL) {
+		fido_log_debug("%s: cbor encode", __func__);
+		r = FIDO_ERR_INTERNAL;
+		goto fail;
+	}
+
+	r = FIDO_OK;
+fail:
+	fido_blob_free(&token);
+
+	return (r);
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/reset.c mysql-8.0-8.0.27/extra/libfido2/src/reset.c
--- mysql-8.0-8.0.26/extra/libfido2/src/reset.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/reset.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <stdlib.h>
+#include "fido.h"
+
+static int
+fido_dev_reset_tx(fido_dev_t *dev)
+{
+	const unsigned char cbor[] = { CTAP_CBOR_RESET };
+
+	if (fido_tx(dev, CTAP_CMD_CBOR, cbor, sizeof(cbor)) < 0) {
+		fido_log_debug("%s: fido_tx", __func__);
+		return (FIDO_ERR_TX);
+	}
+
+	return (FIDO_OK);
+}
+
+static int
+fido_dev_reset_wait(fido_dev_t *dev, int ms)
+{
+	int r;
+
+	if ((r = fido_dev_reset_tx(dev)) != FIDO_OK ||
+	    (r = fido_rx_cbor_status(dev, ms)) != FIDO_OK)
+		return (r);
+
+	return (FIDO_OK);
+}
+
+int
+fido_dev_reset(fido_dev_t *dev)
+{
+	return (fido_dev_reset_wait(dev, -1));
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/rs256.c mysql-8.0-8.0.27/extra/libfido2/src/rs256.c
--- mysql-8.0-8.0.26/extra/libfido2/src/rs256.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/rs256.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,204 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <openssl/bn.h>
+#include <openssl/rsa.h>
+#include <openssl/evp.h>
+#include <openssl/obj_mac.h>
+
+#include <string.h>
+#include "fido.h"
+#include "fido/rs256.h"
+
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+static int
+RSA_bits(const RSA *r)
+{
+	return (BN_num_bits(r->n));
+}
+
+static int
+RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
+{
+	r->n = n;
+	r->e = e;
+	r->d = d;
+
+	return (1);
+}
+
+static void
+RSA_get0_key(const RSA *r, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
+{
+	*n = r->n;
+	*e = r->e;
+	*d = r->d;
+}
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+
+static int
+decode_bignum(const cbor_item_t *item, void *ptr, size_t len)
+{
+	if (cbor_isa_bytestring(item) == false ||
+	    cbor_bytestring_is_definite(item) == false ||
+	    cbor_bytestring_length(item) != len) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (-1);
+	}
+
+	memcpy(ptr, cbor_bytestring_handle(item), len);
+
+	return (0);
+}
+
+static int
+decode_rsa_pubkey(const cbor_item_t *key, const cbor_item_t *val, void *arg)
+{
+	rs256_pk_t *k = arg;
+
+	if (cbor_isa_negint(key) == false ||
+	    cbor_int_get_width(key) != CBOR_INT_8)
+		return (0); /* ignore */
+
+	switch (cbor_get_uint8(key)) {
+	case 0: /* modulus */
+		return (decode_bignum(val, &k->n, sizeof(k->n)));
+	case 1: /* public exponent */
+		return (decode_bignum(val, &k->e, sizeof(k->e)));
+	}
+
+	return (0); /* ignore */
+}
+
+int
+rs256_pk_decode(const cbor_item_t *item, rs256_pk_t *k)
+{
+	if (cbor_isa_map(item) == false ||
+	    cbor_map_is_definite(item) == false ||
+	    cbor_map_iter(item, k, decode_rsa_pubkey) < 0) {
+		fido_log_debug("%s: cbor type", __func__);
+		return (-1);
+	}
+
+	return (0);
+}
+
+rs256_pk_t *
+rs256_pk_new(void)
+{
+	return (calloc(1, sizeof(rs256_pk_t)));
+}
+
+void
+rs256_pk_free(rs256_pk_t **pkp)
+{
+	rs256_pk_t *pk;
+
+	if (pkp == NULL || (pk = *pkp) == NULL)
+		return;
+
+	explicit_bzero(pk, sizeof(*pk));
+	free(pk);
+
+	*pkp = NULL;
+}
+
+int
+rs256_pk_from_ptr(rs256_pk_t *pk, const void *ptr, size_t len)
+{
+	if (len < sizeof(*pk))
+		return (FIDO_ERR_INVALID_ARGUMENT);
+
+	memcpy(pk, ptr, sizeof(*pk));
+
+	return (FIDO_OK);
+}
+
+EVP_PKEY *
+rs256_pk_to_EVP_PKEY(const rs256_pk_t *k)
+{
+	RSA		*rsa = NULL;
+	EVP_PKEY	*pkey = NULL;
+	BIGNUM		*n = NULL;
+	BIGNUM		*e = NULL;
+	int		 ok = -1;
+
+	if ((n = BN_new()) == NULL || (e = BN_new()) == NULL)
+		goto fail;
+
+	if (BN_bin2bn(k->n, sizeof(k->n), n) == NULL ||
+	    BN_bin2bn(k->e, sizeof(k->e), e) == NULL) {
+		fido_log_debug("%s: BN_bin2bn", __func__);
+		goto fail;
+	}
+
+	if ((rsa = RSA_new()) == NULL || RSA_set0_key(rsa, n, e, NULL) == 0) {
+		fido_log_debug("%s: RSA_set0_key", __func__);
+		goto fail;
+	}
+
+	/* at this point, n and e belong to rsa */
+	n = NULL;
+	e = NULL;
+
+	if ((pkey = EVP_PKEY_new()) == NULL ||
+	    EVP_PKEY_assign_RSA(pkey, rsa) == 0) {
+		fido_log_debug("%s: EVP_PKEY_assign_RSA", __func__);
+		goto fail;
+	}
+
+	rsa = NULL; /* at this point, rsa belongs to evp */
+
+	ok = 0;
+fail:
+	if (n != NULL)
+		BN_free(n);
+	if (e != NULL)
+		BN_free(e);
+	if (rsa != NULL)
+		RSA_free(rsa);
+	if (ok < 0 && pkey != NULL) {
+		EVP_PKEY_free(pkey);
+		pkey = NULL;
+	}
+
+	return (pkey);
+}
+
+int
+rs256_pk_from_RSA(rs256_pk_t *pk, const RSA *rsa)
+{
+	const BIGNUM	*n = NULL;
+	const BIGNUM	*e = NULL;
+	const BIGNUM	*d = NULL;
+	int		 k;
+
+	if (RSA_bits(rsa) != 2048) {
+		fido_log_debug("%s: invalid key length", __func__);
+		return (FIDO_ERR_INVALID_ARGUMENT);
+	}
+
+	RSA_get0_key(rsa, &n, &e, &d);
+
+	if (n == NULL || e == NULL) {
+		fido_log_debug("%s: RSA_get0_key", __func__);
+		return (FIDO_ERR_INTERNAL);
+	}
+
+	if ((k = BN_num_bytes(n)) < 0 || (size_t)k > sizeof(pk->n) ||
+	    (k = BN_num_bytes(e)) < 0 || (size_t)k > sizeof(pk->e)) {
+		fido_log_debug("%s: invalid key", __func__);
+		return (FIDO_ERR_INTERNAL);
+	}
+
+	if ((k = BN_bn2bin(n, pk->n)) < 0 || (size_t)k > sizeof(pk->n) ||
+	    (k = BN_bn2bin(e, pk->e)) < 0 || (size_t)k > sizeof(pk->e)) {
+		fido_log_debug("%s: BN_bn2bin", __func__);
+		return (FIDO_ERR_INTERNAL);
+	}
+
+	return (FIDO_OK);
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/src/u2f.c mysql-8.0-8.0.27/extra/libfido2/src/u2f.c
--- mysql-8.0-8.0.26/extra/libfido2/src/u2f.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/src/u2f.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,853 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <openssl/sha.h>
+#include <openssl/x509.h>
+
+#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "fido.h"
+#include "fido/es256.h"
+
+#if defined(_MSC_VER)
+static int
+usleep(unsigned int usec)
+{
+	Sleep(usec / 1000);
+
+	return (0);
+}
+#endif
+
+static int
+sig_get(fido_blob_t *sig, const unsigned char **buf, size_t *len)
+{
+	sig->len = *len; /* consume the whole buffer */
+	if ((sig->ptr = calloc(1, sig->len)) == NULL ||
+	    fido_buf_read(buf, len, sig->ptr, sig->len) < 0) {
+		fido_log_debug("%s: fido_buf_read", __func__);
+		if (sig->ptr != NULL) {
+			explicit_bzero(sig->ptr, sig->len);
+			free(sig->ptr);
+			sig->ptr = NULL;
+			sig->len = 0;
+			return (-1);
+		}
+	}
+
+	return (0);
+}
+
+static int
+x5c_get(fido_blob_t *x5c, const unsigned char **buf, size_t *len)
+{
+	X509	*cert = NULL;
+	int	 ok = -1;
+
+	if (*len > LONG_MAX) {
+		fido_log_debug("%s: invalid len %zu", __func__, *len);
+		goto fail;
+	}
+
+	/* find out the certificate's length */
+	const unsigned char *end = *buf;
+	if ((cert = d2i_X509(NULL, &end, (long)*len)) == NULL || end <= *buf ||
+	    (x5c->len = (size_t)(end - *buf)) >= *len) {
+		fido_log_debug("%s: d2i_X509", __func__);
+		goto fail;
+	}
+
+	/* read accordingly */
+	if ((x5c->ptr = calloc(1, x5c->len)) == NULL ||
+	    fido_buf_read(buf, len, x5c->ptr, x5c->len) < 0) {
+		fido_log_debug("%s: fido_buf_read", __func__);
+		goto fail;
+	}
+
+	ok = 0;
+fail:
+	if (cert != NULL)
+		X509_free(cert);
+
+	if (ok < 0) {
+		free(x5c->ptr);
+		x5c->ptr = NULL;
+		x5c->len = 0;
+	}
+
+	return (ok);
+}
+
+static int
+authdata_fake(const char *rp_id, uint8_t flags, uint32_t sigcount,
+    fido_blob_t *fake_cbor_ad)
+{
+	fido_authdata_t	 ad;
+	cbor_item_t	*item = NULL;
+	size_t		 alloc_len;
+
+	memset(&ad, 0, sizeof(ad));
+
+	if (SHA256((const void *)rp_id, strlen(rp_id),
+	    ad.rp_id_hash) != ad.rp_id_hash) {
+		fido_log_debug("%s: sha256", __func__);
+		return (-1);
+	}
+
+	ad.flags = flags; /* XXX translate? */
+	ad.sigcount = sigcount;
+
+	if ((item = cbor_build_bytestring((const unsigned char *)&ad,
+	    sizeof(ad))) == NULL) {
+		fido_log_debug("%s: cbor_build_bytestring", __func__);
+		return (-1);
+	}
+
+	if (fake_cbor_ad->ptr != NULL ||
+	    (fake_cbor_ad->len = cbor_serialize_alloc(item, &fake_cbor_ad->ptr,
+	    &alloc_len)) == 0) {
+		fido_log_debug("%s: cbor_serialize_alloc", __func__);
+		cbor_decref(&item);
+		return (-1);
+	}
+
+	cbor_decref(&item);
+
+	return (0);
+}
+
+/* TODO: use u2f_get_touch_begin & u2f_get_touch_status instead */
+static int
+send_dummy_register(fido_dev_t *dev, int ms)
+{
+	iso7816_apdu_t	*apdu = NULL;
+	unsigned char	 challenge[SHA256_DIGEST_LENGTH];
+	unsigned char	 application[SHA256_DIGEST_LENGTH];
+	unsigned char	 reply[FIDO_MAXMSG];
+	int		 r;
+
+#ifdef FIDO_FUZZ
+	ms = 0; /* XXX */
+#endif
+
+	/* dummy challenge & application */
+	memset(&challenge, 0xff, sizeof(challenge));
+	memset(&application, 0xff, sizeof(application));
+
+	if ((apdu = iso7816_new(U2F_CMD_REGISTER, 0, 2 *
+	    SHA256_DIGEST_LENGTH)) == NULL ||
+	    iso7816_add(apdu, &challenge, sizeof(challenge)) < 0 ||
+	    iso7816_add(apdu, &application, sizeof(application)) < 0) {
+		fido_log_debug("%s: iso7816", __func__);
+		r = FIDO_ERR_INTERNAL;
+		goto fail;
+	}
+
+	do {
+		if (fido_tx(dev, CTAP_CMD_MSG, iso7816_ptr(apdu),
+		    iso7816_len(apdu)) < 0) {
+			fido_log_debug("%s: fido_tx", __func__);
+			r = FIDO_ERR_TX;
+			goto fail;
+		}
+		if (fido_rx(dev, CTAP_CMD_MSG, &reply, sizeof(reply), ms) < 2) {
+			fido_log_debug("%s: fido_rx", __func__);
+			r = FIDO_ERR_RX;
+			goto fail;
+		}
+		if (usleep((unsigned)(ms == -1 ? 100 : ms) * 1000) < 0) {
+			fido_log_debug("%s: usleep", __func__);
+			r = FIDO_ERR_RX;
+			goto fail;
+		}
+	} while (((reply[0] << 8) | reply[1]) == SW_CONDITIONS_NOT_SATISFIED);
+
+	r = FIDO_OK;
+fail:
+	iso7816_free(&apdu);
+
+	return (r);
+}
+
+static int
+key_lookup(fido_dev_t *dev, const char *rp_id, const fido_blob_t *key_id,
+    int *found, int ms)
+{
+	iso7816_apdu_t	*apdu = NULL;
+	unsigned char	 challenge[SHA256_DIGEST_LENGTH];
+	unsigned char	 rp_id_hash[SHA256_DIGEST_LENGTH];
+	unsigned char	 reply[FIDO_MAXMSG];
+	uint8_t		 key_id_len;
+	int		 r;
+
+	if (key_id->len > UINT8_MAX || rp_id == NULL) {
+		fido_log_debug("%s: key_id->len=%zu, rp_id=%p", __func__,
+		    key_id->len, (const void *)rp_id);
+		r = FIDO_ERR_INVALID_ARGUMENT;
+		goto fail;
+	}
+
+	memset(&challenge, 0xff, sizeof(challenge));
+	memset(&rp_id_hash, 0, sizeof(rp_id_hash));
+
+	if (SHA256((const void *)rp_id, strlen(rp_id),
+	    rp_id_hash) != rp_id_hash) {
+		fido_log_debug("%s: sha256", __func__);
+		r = FIDO_ERR_INTERNAL;
+		goto fail;
+	}
+
+	key_id_len = (uint8_t)key_id->len;
+
+	if ((apdu = iso7816_new(U2F_CMD_AUTH, U2F_AUTH_CHECK, (uint16_t)(2 *
+	    SHA256_DIGEST_LENGTH + sizeof(key_id_len) + key_id_len))) == NULL ||
+	    iso7816_add(apdu, &challenge, sizeof(challenge)) < 0 ||
+	    iso7816_add(apdu, &rp_id_hash, sizeof(rp_id_hash)) < 0 ||
+	    iso7816_add(apdu, &key_id_len, sizeof(key_id_len)) < 0 ||
+	    iso7816_add(apdu, key_id->ptr, key_id_len) < 0) {
+		fido_log_debug("%s: iso7816", __func__);
+		r = FIDO_ERR_INTERNAL;
+		goto fail;
+	}
+
+	if (fido_tx(dev, CTAP_CMD_MSG, iso7816_ptr(apdu),
+	    iso7816_len(apdu)) < 0) {
+		fido_log_debug("%s: fido_tx", __func__);
+		r = FIDO_ERR_TX;
+		goto fail;
+	}
+	if (fido_rx(dev, CTAP_CMD_MSG, &reply, sizeof(reply), ms) != 2) {
+		fido_log_debug("%s: fido_rx", __func__);
+		r = FIDO_ERR_RX;
+		goto fail;
+	}
+
+	switch ((reply[0] << 8) | reply[1]) {
+	case SW_CONDITIONS_NOT_SATISFIED:
+		*found = 1; /* key exists */
+		break;
+	case SW_WRONG_DATA:
+		*found = 0; /* key does not exist */
+		break;
+	default:
+		/* unexpected sw */
+		r = FIDO_ERR_INTERNAL;
+		goto fail;
+	}
+
+	r = FIDO_OK;
+fail:
+	iso7816_free(&apdu);
+
+	return (r);
+}
+
+static int
+parse_auth_reply(fido_blob_t *sig, fido_blob_t *ad, const char *rp_id,
+    const unsigned char *reply, size_t len)
+{
+	uint8_t		flags;
+	uint32_t	sigcount;
+
+	if (len < 2 || ((reply[len - 2] << 8) | reply[len - 1]) != SW_NO_ERROR) {
+		fido_log_debug("%s: unexpected sw", __func__);
+		return (FIDO_ERR_RX);
+	}
+
+	len -= 2;
+
+	if (fido_buf_read(&reply, &len, &flags, sizeof(flags)) < 0 ||
+	    fido_buf_read(&reply, &len, &sigcount, sizeof(sigcount)) < 0) {
+		fido_log_debug("%s: fido_buf_read", __func__);
+		return (FIDO_ERR_RX);
+	}
+
+	if (sig_get(sig, &reply, &len) < 0) {
+		fido_log_debug("%s: sig_get", __func__);
+		return (FIDO_ERR_RX);
+	}
+
+	if (authdata_fake(rp_id, flags, sigcount, ad) < 0) {
+		fido_log_debug("%s; authdata_fake", __func__);
+		return (FIDO_ERR_RX);
+	}
+
+	return (FIDO_OK);
+}
+
+static int
+do_auth(fido_dev_t *dev, const fido_blob_t *cdh, const char *rp_id,
+    const fido_blob_t *key_id, fido_blob_t *sig, fido_blob_t *ad, int ms)
+{
+	iso7816_apdu_t	*apdu = NULL;
+	unsigned char	 rp_id_hash[SHA256_DIGEST_LENGTH];
+	unsigned char	 reply[FIDO_MAXMSG];
+	int		 reply_len;
+	uint8_t		 key_id_len;
+	int		 r;
+
+#ifdef FIDO_FUZZ
+	ms = 0; /* XXX */
+#endif
+
+	if (cdh->len != SHA256_DIGEST_LENGTH || key_id->len > UINT8_MAX ||
+	    rp_id == NULL) {
+		r = FIDO_ERR_INVALID_ARGUMENT;
+		goto fail;
+	}
+
+	memset(&rp_id_hash, 0, sizeof(rp_id_hash));
+
+	if (SHA256((const void *)rp_id, strlen(rp_id),
+	    rp_id_hash) != rp_id_hash) {
+		fido_log_debug("%s: sha256", __func__);
+		r = FIDO_ERR_INTERNAL;
+		goto fail;
+	}
+
+	key_id_len = (uint8_t)key_id->len;
+
+	if ((apdu = iso7816_new(U2F_CMD_AUTH, U2F_AUTH_SIGN, (uint16_t)(2 *
+	    SHA256_DIGEST_LENGTH + sizeof(key_id_len) + key_id_len))) == NULL ||
+	    iso7816_add(apdu, cdh->ptr, cdh->len) < 0 ||
+	    iso7816_add(apdu, &rp_id_hash, sizeof(rp_id_hash)) < 0 ||
+	    iso7816_add(apdu, &key_id_len, sizeof(key_id_len)) < 0 ||
+	    iso7816_add(apdu, key_id->ptr, key_id_len) < 0) {
+		fido_log_debug("%s: iso7816", __func__);
+		r = FIDO_ERR_INTERNAL;
+		goto fail;
+	}
+
+	do {
+		if (fido_tx(dev, CTAP_CMD_MSG, iso7816_ptr(apdu),
+		    iso7816_len(apdu)) < 0) {
+			fido_log_debug("%s: fido_tx", __func__);
+			r = FIDO_ERR_TX;
+			goto fail;
+		}
+		if ((reply_len = fido_rx(dev, CTAP_CMD_MSG, &reply,
+		    sizeof(reply), ms)) < 2) {
+			fido_log_debug("%s: fido_rx", __func__);
+			r = FIDO_ERR_RX;
+			goto fail;
+		}
+		if (usleep((unsigned)(ms == -1 ? 100 : ms) * 1000) < 0) {
+			fido_log_debug("%s: usleep", __func__);
+			r = FIDO_ERR_RX;
+			goto fail;
+		}
+	} while (((reply[0] << 8) | reply[1]) == SW_CONDITIONS_NOT_SATISFIED);
+
+	if ((r = parse_auth_reply(sig, ad, rp_id, reply,
+	    (size_t)reply_len)) != FIDO_OK) {
+		fido_log_debug("%s: parse_auth_reply", __func__);
+		goto fail;
+	}
+
+fail:
+	iso7816_free(&apdu);
+
+	return (r);
+}
+
+static int
+cbor_blob_from_ec_point(const uint8_t *ec_point, size_t ec_point_len,
+    fido_blob_t *cbor_blob)
+{
+	es256_pk_t	*pk = NULL;
+	cbor_item_t	*pk_cbor = NULL;
+	size_t		 alloc_len;
+	int		 ok = -1;
+
+	/* only handle uncompressed points */
+	if (ec_point_len != 65 || ec_point[0] != 0x04) {
+		fido_log_debug("%s: unexpected format", __func__);
+		goto fail;
+	}
+
+	if ((pk = es256_pk_new()) == NULL ||
+	    es256_pk_set_x(pk, &ec_point[1]) < 0 ||
+	    es256_pk_set_y(pk, &ec_point[33]) < 0) {
+		fido_log_debug("%s: es256_pk_set", __func__);
+		goto fail;
+	}
+
+	if ((pk_cbor = es256_pk_encode(pk, 0)) == NULL) {
+		fido_log_debug("%s: es256_pk_encode", __func__);
+		goto fail;
+	}
+
+	if ((cbor_blob->len = cbor_serialize_alloc(pk_cbor, &cbor_blob->ptr,
+	    &alloc_len)) != 77) {
+		fido_log_debug("%s: cbor_serialize_alloc", __func__);
+		goto fail;
+	}
+
+	ok = 0;
+fail:
+	es256_pk_free(&pk);
+
+	if (pk_cbor)
+		cbor_decref(&pk_cbor);
+
+	return (ok);
+}
+
+static int
+encode_cred_authdata(const char *rp_id, const uint8_t *kh, uint8_t kh_len,
+    const uint8_t *pubkey, size_t pubkey_len, fido_blob_t *out)
+{
+	fido_authdata_t	 	 authdata;
+	fido_attcred_raw_t	 attcred_raw;
+	fido_blob_t		 pk_blob;
+	fido_blob_t		 authdata_blob;
+	cbor_item_t		*authdata_cbor = NULL;
+	unsigned char		*ptr;
+	size_t			 len;
+	size_t			 alloc_len;
+	int			 ok = -1;
+
+	memset(&pk_blob, 0, sizeof(pk_blob));
+	memset(&authdata, 0, sizeof(authdata));
+	memset(&authdata_blob, 0, sizeof(authdata_blob));
+	memset(out, 0, sizeof(*out));
+
+	if (rp_id == NULL) {
+		fido_log_debug("%s: NULL rp_id", __func__);
+		goto fail;
+	}
+
+	if (cbor_blob_from_ec_point(pubkey, pubkey_len, &pk_blob) < 0) {
+		fido_log_debug("%s: cbor_blob_from_ec_point", __func__);
+		goto fail;
+	}
+
+	if (SHA256((const void *)rp_id, strlen(rp_id),
+	    authdata.rp_id_hash) != authdata.rp_id_hash) {
+		fido_log_debug("%s: sha256", __func__);
+		goto fail;
+	}
+
+	authdata.flags = (CTAP_AUTHDATA_ATT_CRED | CTAP_AUTHDATA_USER_PRESENT);
+	authdata.sigcount = 0;
+
+	memset(&attcred_raw.aaguid, 0, sizeof(attcred_raw.aaguid));
+	attcred_raw.id_len = htobe16(kh_len);
+
+	len = authdata_blob.len = sizeof(authdata) + sizeof(attcred_raw) +
+	    kh_len + pk_blob.len;
+	ptr = authdata_blob.ptr = calloc(1, authdata_blob.len);
+
+	fido_log_debug("%s: ptr=%p, len=%zu", __func__, (void *)ptr, len);
+
+	if (authdata_blob.ptr == NULL)
+		goto fail;
+
+	if (fido_buf_write(&ptr, &len, &authdata, sizeof(authdata)) < 0 ||
+	    fido_buf_write(&ptr, &len, &attcred_raw, sizeof(attcred_raw)) < 0 ||
+	    fido_buf_write(&ptr, &len, kh, kh_len) < 0 ||
+	    fido_buf_write(&ptr, &len, pk_blob.ptr, pk_blob.len) < 0) {
+		fido_log_debug("%s: fido_buf_write", __func__);
+		goto fail;
+	}
+
+	if ((authdata_cbor = fido_blob_encode(&authdata_blob)) == NULL) {
+		fido_log_debug("%s: fido_blob_encode", __func__);
+		goto fail;
+	}
+
+	if ((out->len = cbor_serialize_alloc(authdata_cbor, &out->ptr,
+	    &alloc_len)) == 0) {
+		fido_log_debug("%s: cbor_serialize_alloc", __func__);
+		goto fail;
+	}
+
+	ok = 0;
+fail:
+	if (authdata_cbor)
+		cbor_decref(&authdata_cbor);
+
+	if (pk_blob.ptr) {
+		explicit_bzero(pk_blob.ptr, pk_blob.len);
+		free(pk_blob.ptr);
+	}
+	if (authdata_blob.ptr) {
+		explicit_bzero(authdata_blob.ptr, authdata_blob.len);
+		free(authdata_blob.ptr);
+	}
+
+	return (ok);
+}
+
+static int
+parse_register_reply(fido_cred_t *cred, const unsigned char *reply, size_t len)
+{
+	fido_blob_t	 x5c;
+	fido_blob_t	 sig;
+	fido_blob_t	 ad;
+	uint8_t		 dummy;
+	uint8_t		 pubkey[65];
+	uint8_t		 kh_len = 0;
+	uint8_t		*kh = NULL;
+	int		 r;
+
+	memset(&x5c, 0, sizeof(x5c));
+	memset(&sig, 0, sizeof(sig));
+	memset(&ad, 0, sizeof(ad));
+	r = FIDO_ERR_RX;
+
+	/* status word */
+	if (len < 2 || ((reply[len - 2] << 8) | reply[len - 1]) != SW_NO_ERROR) {
+		fido_log_debug("%s: unexpected sw", __func__);
+		goto fail;
+	}
+
+	len -= 2;
+
+	/* reserved byte */
+	if (fido_buf_read(&reply, &len, &dummy, sizeof(dummy)) < 0 ||
+	    dummy != 0x05) {
+		fido_log_debug("%s: reserved byte", __func__);
+		goto fail;
+	}
+
+	/* pubkey + key handle */
+	if (fido_buf_read(&reply, &len, &pubkey, sizeof(pubkey)) < 0 ||
+	    fido_buf_read(&reply, &len, &kh_len, sizeof(kh_len)) < 0 ||
+	    (kh = calloc(1, kh_len)) == NULL ||
+	    fido_buf_read(&reply, &len, kh, kh_len) < 0) {
+		fido_log_debug("%s: fido_buf_read", __func__);
+		goto fail;
+	}
+
+	/* x5c + sig */
+	if (x5c_get(&x5c, &reply, &len) < 0 ||
+	    sig_get(&sig, &reply, &len) < 0) {
+		fido_log_debug("%s: x5c || sig", __func__);
+		goto fail;
+	}
+
+	/* authdata */
+	if (encode_cred_authdata(cred->rp.id, kh, kh_len, pubkey,
+	    sizeof(pubkey), &ad) < 0) {
+		fido_log_debug("%s: encode_cred_authdata", __func__);
+		goto fail;
+	}
+
+	if (fido_cred_set_fmt(cred, "fido-u2f") != FIDO_OK ||
+	    fido_cred_set_authdata(cred, ad.ptr, ad.len) != FIDO_OK ||
+	    fido_cred_set_x509(cred, x5c.ptr, x5c.len) != FIDO_OK ||
+	    fido_cred_set_sig(cred, sig.ptr, sig.len) != FIDO_OK) {
+		fido_log_debug("%s: fido_cred_set", __func__);
+		r = FIDO_ERR_INTERNAL;
+		goto fail;
+	}
+
+	r = FIDO_OK;
+fail:
+	if (kh) {
+		explicit_bzero(kh, kh_len);
+		free(kh);
+	}
+	if (x5c.ptr) {
+		explicit_bzero(x5c.ptr, x5c.len);
+		free(x5c.ptr);
+	}
+	if (sig.ptr) {
+		explicit_bzero(sig.ptr, sig.len);
+		free(sig.ptr);
+	}
+	if (ad.ptr) {
+		explicit_bzero(ad.ptr, ad.len);
+		free(ad.ptr);
+	}
+
+	return (r);
+}
+
+int
+u2f_register(fido_dev_t *dev, fido_cred_t *cred, int ms)
+{
+	iso7816_apdu_t	*apdu = NULL;
+	unsigned char	 rp_id_hash[SHA256_DIGEST_LENGTH];
+	unsigned char	 reply[FIDO_MAXMSG];
+	int		 reply_len;
+	int		 found;
+	int		 r;
+
+#ifdef FIDO_FUZZ
+	ms = 0; /* XXX */
+#endif
+
+	if (cred->rk == FIDO_OPT_TRUE || cred->uv == FIDO_OPT_TRUE) {
+		fido_log_debug("%s: rk=%d, uv=%d", __func__, cred->rk,
+		    cred->uv);
+		return (FIDO_ERR_UNSUPPORTED_OPTION);
+	}
+
+	if (cred->type != COSE_ES256 || cred->cdh.ptr == NULL ||
+	    cred->rp.id == NULL || cred->cdh.len != SHA256_DIGEST_LENGTH) {
+		fido_log_debug("%s: type=%d, cdh=(%p,%zu)" , __func__,
+		    cred->type, (void *)cred->cdh.ptr, cred->cdh.len);
+		return (FIDO_ERR_INVALID_ARGUMENT);
+	}
+
+	for (size_t i = 0; i < cred->excl.len; i++) {
+		if ((r = key_lookup(dev, cred->rp.id, &cred->excl.ptr[i],
+		    &found, ms)) != FIDO_OK) {
+			fido_log_debug("%s: key_lookup", __func__);
+			return (r);
+		}
+		if (found) {
+			if ((r = send_dummy_register(dev, ms)) != FIDO_OK) {
+				fido_log_debug("%s: send_dummy_register",
+				    __func__);
+				return (r);
+			}
+			return (FIDO_ERR_CREDENTIAL_EXCLUDED);
+		}
+	}
+
+	memset(&rp_id_hash, 0, sizeof(rp_id_hash));
+
+	if (SHA256((const void *)cred->rp.id, strlen(cred->rp.id),
+	    rp_id_hash) != rp_id_hash) {
+		fido_log_debug("%s: sha256", __func__);
+		return (FIDO_ERR_INTERNAL);
+	}
+
+	if ((apdu = iso7816_new(U2F_CMD_REGISTER, 0, 2 *
+	    SHA256_DIGEST_LENGTH)) == NULL ||
+	    iso7816_add(apdu, cred->cdh.ptr, cred->cdh.len) < 0 ||
+	    iso7816_add(apdu, rp_id_hash, sizeof(rp_id_hash)) < 0) {
+		fido_log_debug("%s: iso7816", __func__);
+		r = FIDO_ERR_INTERNAL;
+		goto fail;
+	}
+
+	do {
+		if (fido_tx(dev, CTAP_CMD_MSG, iso7816_ptr(apdu),
+		    iso7816_len(apdu)) < 0) {
+			fido_log_debug("%s: fido_tx", __func__);
+			r = FIDO_ERR_TX;
+			goto fail;
+		}
+		if ((reply_len = fido_rx(dev, CTAP_CMD_MSG, &reply,
+		    sizeof(reply), ms)) < 2) {
+			fido_log_debug("%s: fido_rx", __func__);
+			r = FIDO_ERR_RX;
+			goto fail;
+		}
+		if (usleep((unsigned)(ms == -1 ? 100 : ms) * 1000) < 0) {
+			fido_log_debug("%s: usleep", __func__);
+			r = FIDO_ERR_RX;
+			goto fail;
+		}
+	} while (((reply[0] << 8) | reply[1]) == SW_CONDITIONS_NOT_SATISFIED);
+
+	if ((r = parse_register_reply(cred, reply,
+	    (size_t)reply_len)) != FIDO_OK) {
+		fido_log_debug("%s: parse_register_reply", __func__);
+		goto fail;
+	}
+fail:
+	iso7816_free(&apdu);
+
+	return (r);
+}
+
+static int
+u2f_authenticate_single(fido_dev_t *dev, const fido_blob_t *key_id,
+    fido_assert_t *fa, size_t idx, int ms)
+{
+	fido_blob_t	sig;
+	fido_blob_t	ad;
+	int		found;
+	int		r;
+
+	memset(&sig, 0, sizeof(sig));
+	memset(&ad, 0, sizeof(ad));
+
+	if ((r = key_lookup(dev, fa->rp_id, key_id, &found, ms)) != FIDO_OK) {
+		fido_log_debug("%s: key_lookup", __func__);
+		goto fail;
+	}
+
+	if (!found) {
+		fido_log_debug("%s: not found", __func__);
+		r = FIDO_ERR_CREDENTIAL_EXCLUDED;
+		goto fail;
+	}
+
+	if (fido_blob_set(&fa->stmt[idx].id, key_id->ptr, key_id->len) < 0) {
+		fido_log_debug("%s: fido_blob_set", __func__);
+		r = FIDO_ERR_INTERNAL;
+		goto fail;
+	}
+
+	if (fa->up == FIDO_OPT_FALSE) {
+		fido_log_debug("%s: checking for key existence only", __func__);
+		r = FIDO_ERR_USER_PRESENCE_REQUIRED;
+		goto fail;
+	}
+
+	if ((r = do_auth(dev, &fa->cdh, fa->rp_id, key_id, &sig, &ad,
+	    ms)) != FIDO_OK) {
+		fido_log_debug("%s: do_auth", __func__);
+		goto fail;
+	}
+
+	if (fido_assert_set_authdata(fa, idx, ad.ptr, ad.len) != FIDO_OK ||
+	    fido_assert_set_sig(fa, idx, sig.ptr, sig.len) != FIDO_OK) {
+		fido_log_debug("%s: fido_assert_set", __func__);
+		r = FIDO_ERR_INTERNAL;
+		goto fail;
+	}
+
+	r = FIDO_OK;
+fail:
+	if (sig.ptr) {
+		explicit_bzero(sig.ptr, sig.len);
+		free(sig.ptr);
+	}
+	if (ad.ptr) {
+		explicit_bzero(ad.ptr, ad.len);
+		free(ad.ptr);
+	}
+
+	return (r);
+}
+
+int
+u2f_authenticate(fido_dev_t *dev, fido_assert_t *fa, int ms)
+{
+	size_t	nfound = 0;
+	size_t	nauth_ok = 0;
+	int	r;
+
+	if (fa->uv == FIDO_OPT_TRUE || fa->allow_list.ptr == NULL) {
+		fido_log_debug("%s: uv=%d, allow_list=%p", __func__, fa->uv,
+		    (void *)fa->allow_list.ptr);
+		return (FIDO_ERR_UNSUPPORTED_OPTION);
+	}
+
+	if ((r = fido_assert_set_count(fa, fa->allow_list.len)) != FIDO_OK) {
+		fido_log_debug("%s: fido_assert_set_count", __func__);
+		return (r);
+	}
+
+	for (size_t i = 0; i < fa->allow_list.len; i++) {
+		switch ((r = u2f_authenticate_single(dev,
+		    &fa->allow_list.ptr[i], fa, nfound, ms))) {
+		case FIDO_OK:
+			nauth_ok++;
+			/* FALLTHROUGH */
+		case FIDO_ERR_USER_PRESENCE_REQUIRED:
+			nfound++;
+			break;
+		default:
+			if (r != FIDO_ERR_CREDENTIAL_EXCLUDED) {
+				fido_log_debug("%s: u2f_authenticate_single",
+				    __func__);
+				return (r);
+			}
+			/* ignore credentials that don't exist */
+		}
+	}
+
+	fa->stmt_len = nfound;
+
+	if (nfound == 0)
+		return (FIDO_ERR_NO_CREDENTIALS);
+	if (nauth_ok == 0)
+		return (FIDO_ERR_USER_PRESENCE_REQUIRED);
+
+	return (FIDO_OK);
+}
+
+int
+u2f_get_touch_begin(fido_dev_t *dev)
+{
+	iso7816_apdu_t	*apdu = NULL;
+	const char	*clientdata = FIDO_DUMMY_CLIENTDATA;
+	const char	*rp_id = FIDO_DUMMY_RP_ID;
+	unsigned char	 clientdata_hash[SHA256_DIGEST_LENGTH];
+	unsigned char	 rp_id_hash[SHA256_DIGEST_LENGTH];
+	unsigned char	 reply[FIDO_MAXMSG];
+	int		 r;
+
+	memset(&clientdata_hash, 0, sizeof(clientdata_hash));
+	memset(&rp_id_hash, 0, sizeof(rp_id_hash));
+
+	if (SHA256((const void *)clientdata, strlen(clientdata),
+	    clientdata_hash) != clientdata_hash || SHA256((const void *)rp_id,
+	    strlen(rp_id), rp_id_hash) != rp_id_hash) {
+		fido_log_debug("%s: sha256", __func__);
+		return (FIDO_ERR_INTERNAL);
+	}
+
+	if ((apdu = iso7816_new(U2F_CMD_REGISTER, 0, 2 *
+	    SHA256_DIGEST_LENGTH)) == NULL ||
+	    iso7816_add(apdu, clientdata_hash, sizeof(clientdata_hash)) < 0 ||
+	    iso7816_add(apdu, rp_id_hash, sizeof(rp_id_hash)) < 0) {
+		fido_log_debug("%s: iso7816", __func__);
+		r = FIDO_ERR_INTERNAL;
+		goto fail;
+	}
+
+	if (dev->attr.flags & FIDO_CAP_WINK) {
+		fido_tx(dev, CTAP_CMD_WINK, NULL, 0);
+		fido_rx(dev, CTAP_CMD_WINK, &reply, sizeof(reply), 200);
+	}
+
+	if (fido_tx(dev, CTAP_CMD_MSG, iso7816_ptr(apdu),
+	    iso7816_len(apdu)) < 0) {
+		fido_log_debug("%s: fido_tx", __func__);
+		r = FIDO_ERR_TX;
+		goto fail;
+	}
+
+	r = FIDO_OK;
+fail:
+	iso7816_free(&apdu);
+
+	return (r);
+}
+
+int
+u2f_get_touch_status(fido_dev_t *dev, int *touched, int ms)
+{
+	unsigned char	reply[FIDO_MAXMSG];
+	int		reply_len;
+	int		r;
+
+	if ((reply_len = fido_rx(dev, CTAP_CMD_MSG, &reply, sizeof(reply),
+	    ms)) < 2) {
+		fido_log_debug("%s: fido_rx", __func__);
+		return (FIDO_OK); /* ignore */
+	}
+
+	switch ((reply[reply_len - 2] << 8) | reply[reply_len - 1]) {
+	case SW_CONDITIONS_NOT_SATISFIED:
+		if ((r = u2f_get_touch_begin(dev)) != FIDO_OK) {
+			fido_log_debug("%s: u2f_get_touch_begin", __func__);
+			return (r);
+		}
+		*touched = 0;
+		break;
+	case SW_NO_ERROR:
+		*touched = 1;
+		break;
+	default:
+		fido_log_debug("%s: unexpected sw", __func__);
+		return (FIDO_ERR_RX);
+	}
+
+	return (FIDO_OK);
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/tools/assert_get.c mysql-8.0-8.0.27/extra/libfido2/tools/assert_get.c
--- mysql-8.0-8.0.26/extra/libfido2/tools/assert_get.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/tools/assert_get.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,299 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <fido.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "../openbsd-compat/openbsd-compat.h"
+#include "extern.h"
+
+struct toggle {
+	fido_opt_t up;
+	fido_opt_t uv;
+	fido_opt_t pin;
+};
+
+static const char *
+opt2str(fido_opt_t v)
+{
+	switch (v) {
+	case FIDO_OPT_OMIT:
+		return "omit";
+	case FIDO_OPT_TRUE:
+		return "true";
+	case FIDO_OPT_FALSE:
+		return "false";
+	default:
+		return "unknown";
+	}
+}
+
+static void
+parse_toggle(const char *str, struct toggle *opt)
+{
+	fido_opt_t *k;
+	fido_opt_t  v;
+	char *assignment;
+	char *key;
+	char *val;
+
+	if ((assignment = strdup(str)) == NULL)
+		err(1, "strdup");
+	if ((val = strchr(assignment, '=')) == NULL)
+		errx(1, "invalid assignment '%s'", assignment);
+
+	key = assignment;
+	*val++ = '\0';
+
+	if (!strcmp(val, "true"))
+		v = FIDO_OPT_TRUE;
+	else if (!strcmp(val, "false"))
+		v = FIDO_OPT_FALSE;
+	else
+		errx(1, "unknown value '%s'", val);
+
+	if (!strcmp(key, "up"))
+		k = &opt->up;
+	else if (!strcmp(key, "uv"))
+		k = &opt->uv;
+	else if (!strcmp(key, "pin"))
+		k = &opt->pin;
+	else
+		errx(1, "unknown key '%s'", key);
+
+	free(assignment);
+
+	*k = v;
+}
+
+static fido_assert_t *
+prepare_assert(FILE *in_f, int flags, const struct toggle *opt)
+{
+	fido_assert_t *assert = NULL;
+	struct blob cdh;
+	struct blob id;
+	struct blob hmac_salt;
+	char *rpid = NULL;
+	int r;
+
+	memset(&cdh, 0, sizeof(cdh));
+	memset(&id, 0, sizeof(id));
+	memset(&hmac_salt, 0, sizeof(hmac_salt));
+
+	r = base64_read(in_f, &cdh);
+	r |= string_read(in_f, &rpid);
+	if ((flags & FLAG_RK) == 0)
+		r |= base64_read(in_f, &id);
+	if (flags & FLAG_HMAC)
+		r |= base64_read(in_f, &hmac_salt);
+	if (r < 0)
+		errx(1, "input error");
+
+	if (flags & FLAG_DEBUG) {
+		fprintf(stderr, "client data hash:\n");
+		xxd(cdh.ptr, cdh.len);
+		fprintf(stderr, "relying party id: %s\n", rpid);
+		if ((flags & FLAG_RK) == 0) {
+			fprintf(stderr, "credential id:\n");
+			xxd(id.ptr, id.len);
+		}
+		fprintf(stderr, "up=%s\n", opt2str(opt->up));
+		fprintf(stderr, "uv=%s\n", opt2str(opt->uv));
+		fprintf(stderr, "pin=%s\n", opt2str(opt->pin));
+	}
+
+	if ((assert = fido_assert_new()) == NULL)
+		errx(1, "fido_assert_new");
+
+	if ((r = fido_assert_set_clientdata_hash(assert, cdh.ptr,
+	    cdh.len)) != FIDO_OK ||
+	    (r = fido_assert_set_rp(assert, rpid)) != FIDO_OK)
+		errx(1, "fido_assert_set: %s", fido_strerr(r));
+	if ((r = fido_assert_set_up(assert, opt->up)) != FIDO_OK)
+		errx(1, "fido_assert_set_up: %s", fido_strerr(r));
+	if ((r = fido_assert_set_uv(assert, opt->uv)) != FIDO_OK)
+		errx(1, "fido_assert_set_uv: %s", fido_strerr(r));
+
+	if (flags & FLAG_HMAC) {
+		if ((r = fido_assert_set_extensions(assert,
+		    FIDO_EXT_HMAC_SECRET)) != FIDO_OK)
+			errx(1, "fido_assert_set_extensions: %s",
+			    fido_strerr(r));
+		if ((r = fido_assert_set_hmac_salt(assert, hmac_salt.ptr,
+		    hmac_salt.len)) != FIDO_OK)
+			errx(1, "fido_assert_set_hmac_salt: %s",
+			    fido_strerr(r));
+	}
+	if ((flags & FLAG_RK) == 0) {
+		if ((r = fido_assert_allow_cred(assert, id.ptr,
+		    id.len)) != FIDO_OK)
+			errx(1, "fido_assert_allow_cred: %s", fido_strerr(r));
+	}
+
+	free(hmac_salt.ptr);
+	free(cdh.ptr);
+	free(id.ptr);
+	free(rpid);
+
+	return (assert);
+}
+
+static void
+print_assert(FILE *out_f, const fido_assert_t *assert, size_t idx, int flags)
+{
+	char *cdh = NULL;
+	char *authdata = NULL;
+	char *sig = NULL;
+	char *user_id = NULL;
+	char *hmac_secret = NULL;
+	int r;
+
+	r = base64_encode(fido_assert_clientdata_hash_ptr(assert),
+	    fido_assert_clientdata_hash_len(assert), &cdh);
+	r |= base64_encode(fido_assert_authdata_ptr(assert, idx),
+	    fido_assert_authdata_len(assert, 0), &authdata);
+	r |= base64_encode(fido_assert_sig_ptr(assert, idx),
+	    fido_assert_sig_len(assert, idx), &sig);
+	if (flags & FLAG_RK)
+		r |= base64_encode(fido_assert_user_id_ptr(assert, idx),
+		    fido_assert_user_id_len(assert, idx), &user_id);
+	if (flags & FLAG_HMAC)
+		r |= base64_encode(fido_assert_hmac_secret_ptr(assert, idx),
+		    fido_assert_hmac_secret_len(assert, idx), &hmac_secret);
+	if (r < 0)
+		errx(1, "output error");
+
+	fprintf(out_f, "%s\n", cdh);
+	fprintf(out_f, "%s\n", fido_assert_rp_id(assert));
+	fprintf(out_f, "%s\n", authdata);
+	fprintf(out_f, "%s\n", sig);
+	if (flags & FLAG_RK)
+		fprintf(out_f, "%s\n", user_id);
+	if (hmac_secret) {
+		fprintf(out_f, "%s\n", hmac_secret);
+		explicit_bzero(hmac_secret, strlen(hmac_secret));
+	}
+
+	free(hmac_secret);
+	free(cdh);
+	free(authdata);
+	free(sig);
+	free(user_id);
+}
+
+int
+assert_get(int argc, char **argv)
+{
+	fido_dev_t *dev = NULL;
+	fido_assert_t *assert = NULL;
+	struct toggle opt;
+	char pin[1024];
+	char prompt[1024];
+	char *in_path = NULL;
+	char *out_path = NULL;
+	FILE *in_f = NULL;
+	FILE *out_f = NULL;
+	int flags = 0;
+	int ch;
+	int r;
+
+	opt.up = opt.uv = opt.pin = FIDO_OPT_OMIT;
+
+	while ((ch = getopt(argc, argv, "dhi:o:prt:uv")) != -1) {
+		switch (ch) {
+		case 'd':
+			flags |= FLAG_DEBUG;
+			break;
+		case 'h':
+			flags |= FLAG_HMAC;
+			break;
+		case 'i':
+			in_path = optarg;
+			break;
+		case 'o':
+			out_path = optarg;
+			break;
+		case 'p':
+			opt.up = FIDO_OPT_TRUE;
+			break;
+		case 'r':
+			flags |= FLAG_RK;
+			break;
+		case 't' :
+			parse_toggle(optarg, &opt);
+			break;
+		case 'u':
+			flags |= FLAG_U2F;
+			break;
+		case 'v':
+			/* -v implies both pin and uv for historical reasons */
+			opt.pin = FIDO_OPT_TRUE;
+			opt.uv = FIDO_OPT_TRUE;
+			break;
+		default:
+			usage();
+		}
+	}
+
+	argc -= optind;
+	argv += optind;
+
+	if (argc < 1)
+		usage();
+
+	in_f = open_read(in_path);
+	out_f = open_write(out_path);
+
+	fido_init((flags & FLAG_DEBUG) ? FIDO_DEBUG : 0);
+
+	assert = prepare_assert(in_f, flags, &opt);
+
+	dev = open_dev(argv[0]);
+	if (flags & FLAG_U2F)
+		fido_dev_force_u2f(dev);
+
+	if (opt.pin == FIDO_OPT_TRUE) {
+		r = snprintf(prompt, sizeof(prompt), "Enter PIN for %s: ",
+		    argv[0]);
+		if (r < 0 || (size_t)r >= sizeof(prompt))
+			errx(1, "snprintf");
+		if (!readpassphrase(prompt, pin, sizeof(pin), RPP_ECHO_OFF))
+			errx(1, "readpassphrase");
+		r = fido_dev_get_assert(dev, assert, pin);
+	} else
+		r = fido_dev_get_assert(dev, assert, NULL);
+
+	explicit_bzero(pin, sizeof(pin));
+
+	if (r != FIDO_OK)
+		errx(1, "fido_dev_get_assert: %s", fido_strerr(r));
+
+	if (flags & FLAG_RK) {
+		for (size_t idx = 0; idx < fido_assert_count(assert); idx++)
+			print_assert(out_f, assert, idx, flags);
+	} else {
+		if (fido_assert_count(assert) != 1)
+			errx(1, "fido_assert_count: %zu",
+			    fido_assert_count(assert));
+		print_assert(out_f, assert, 0, flags);
+	}
+
+	fido_dev_close(dev);
+	fido_dev_free(&dev);
+	fido_assert_free(&assert);
+
+	fclose(in_f);
+	fclose(out_f);
+	in_f = NULL;
+	out_f = NULL;
+
+	exit(0);
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/tools/assert_verify.c mysql-8.0-8.0.27/extra/libfido2/tools/assert_verify.c
--- mysql-8.0-8.0.26/extra/libfido2/tools/assert_verify.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/tools/assert_verify.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,193 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <fido.h>
+#include <fido/es256.h>
+#include <fido/rs256.h>
+#include <fido/eddsa.h>
+
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "../openbsd-compat/openbsd-compat.h"
+#include "extern.h"
+
+static fido_assert_t *
+prepare_assert(FILE *in_f, int flags)
+{
+	fido_assert_t *assert = NULL;
+	struct blob cdh;
+	struct blob authdata;
+	struct blob sig;
+	char *rpid = NULL;
+	int r;
+
+	memset(&cdh, 0, sizeof(cdh));
+	memset(&authdata, 0, sizeof(authdata));
+	memset(&sig, 0, sizeof(sig));
+
+	r = base64_read(in_f, &cdh);
+	r |= string_read(in_f, &rpid);
+	r |= base64_read(in_f, &authdata);
+	r |= base64_read(in_f, &sig);
+	if (r < 0)
+		errx(1, "input error");
+
+	if (flags & FLAG_DEBUG) {
+		fprintf(stderr, "client data hash:\n");
+		xxd(cdh.ptr, cdh.len);
+		fprintf(stderr, "relying party id: %s\n", rpid);
+		fprintf(stderr, "authenticator data:\n");
+		xxd(authdata.ptr, authdata.len);
+		fprintf(stderr, "signature:\n");
+		xxd(sig.ptr, sig.len);
+	}
+
+	if ((assert = fido_assert_new()) == NULL)
+		errx(1, "fido_assert_new");
+	if ((r = fido_assert_set_count(assert, 1)) != FIDO_OK)
+		errx(1, "fido_assert_count: %s", fido_strerr(r));
+
+	if ((r = fido_assert_set_clientdata_hash(assert, cdh.ptr,
+	    cdh.len)) != FIDO_OK ||
+	    (r = fido_assert_set_rp(assert, rpid)) != FIDO_OK ||
+	    (r = fido_assert_set_authdata(assert, 0, authdata.ptr,
+	    authdata.len)) != FIDO_OK ||
+	    (r = fido_assert_set_sig(assert, 0, sig.ptr, sig.len)) != FIDO_OK)
+		errx(1, "fido_assert_set: %s", fido_strerr(r));
+
+	if (flags & FLAG_UP) {
+		if ((r = fido_assert_set_up(assert, FIDO_OPT_TRUE)) != FIDO_OK)
+			errx(1, "fido_assert_set_up: %s", fido_strerr(r));
+	}
+	if (flags & FLAG_UV) {
+		if ((r = fido_assert_set_uv(assert, FIDO_OPT_TRUE)) != FIDO_OK)
+			errx(1, "fido_assert_set_uv: %s", fido_strerr(r));
+	}
+	if (flags & FLAG_HMAC) {
+		if ((r = fido_assert_set_extensions(assert,
+		    FIDO_EXT_HMAC_SECRET)) != FIDO_OK)
+			errx(1, "fido_assert_set_extensions: %s",
+			    fido_strerr(r));
+	}
+
+	free(cdh.ptr);
+	free(authdata.ptr);
+	free(sig.ptr);
+	free(rpid);
+
+	return (assert);
+}
+
+static void *
+load_pubkey(int type, const char *file)
+{
+	EC_KEY *ec = NULL;
+	RSA *rsa = NULL;
+	EVP_PKEY *eddsa = NULL;
+	es256_pk_t *es256_pk = NULL;
+	rs256_pk_t *rs256_pk = NULL;
+	eddsa_pk_t *eddsa_pk = NULL;
+	void *pk = NULL;
+
+	if (type == COSE_ES256) {
+		if ((ec = read_ec_pubkey(file)) == NULL)
+			errx(1, "read_ec_pubkey");
+		if ((es256_pk = es256_pk_new()) == NULL)
+			errx(1, "es256_pk_new");
+		if (es256_pk_from_EC_KEY(es256_pk, ec) != FIDO_OK)
+			errx(1, "es256_pk_from_EC_KEY");
+
+		pk = es256_pk;
+		EC_KEY_free(ec);
+	} else if (type == COSE_RS256) {
+		if ((rsa = read_rsa_pubkey(file)) == NULL)
+			errx(1, "read_rsa_pubkey");
+		if ((rs256_pk = rs256_pk_new()) == NULL)
+			errx(1, "rs256_pk_new");
+		if (rs256_pk_from_RSA(rs256_pk, rsa) != FIDO_OK)
+			errx(1, "rs256_pk_from_RSA");
+
+		pk = rs256_pk;
+		RSA_free(rsa);
+	} else if (type == COSE_EDDSA) {
+		if ((eddsa = read_eddsa_pubkey(file)) == NULL)
+			errx(1, "read_eddsa_pubkey");
+		if ((eddsa_pk = eddsa_pk_new()) == NULL)
+			errx(1, "eddsa_pk_new");
+		if (eddsa_pk_from_EVP_PKEY(eddsa_pk, eddsa) != FIDO_OK)
+			errx(1, "eddsa_pk_from_EVP_PKEY");
+
+		pk = eddsa_pk;
+		EVP_PKEY_free(eddsa);
+	}
+
+	return (pk);
+}
+
+int
+assert_verify(int argc, char **argv)
+{
+	fido_assert_t *assert = NULL;
+	void *pk = NULL;
+	char *in_path = NULL;
+	FILE *in_f = NULL;
+	int type = COSE_ES256;
+	int flags = 0;
+	int ch;
+	int r;
+
+	while ((ch = getopt(argc, argv, "dhi:pv")) != -1) {
+		switch (ch) {
+		case 'd':
+			flags |= FLAG_DEBUG;
+			break;
+		case 'h':
+			flags |= FLAG_HMAC;
+			break;
+		case 'i':
+			in_path = optarg;
+			break;
+		case 'p':
+			flags |= FLAG_UP;
+			break;
+		case 'v':
+			flags |= FLAG_UV;
+			break;
+		default:
+			usage();
+		}
+	}
+
+	argc -= optind;
+	argv += optind;
+
+	if (argc < 1 || argc > 2)
+		usage();
+
+	in_f = open_read(in_path);
+
+	if (argc > 1 && cose_type(argv[1], &type) < 0)
+		errx(1, "unknown type %s", argv[1]);
+
+	fido_init((flags & FLAG_DEBUG) ? FIDO_DEBUG : 0);
+
+	pk = load_pubkey(type, argv[0]);
+	assert = prepare_assert(in_f, flags);
+	if ((r = fido_assert_verify(assert, 0, type, pk)) != FIDO_OK)
+		errx(1, "fido_assert_verify: %s", fido_strerr(r));
+	fido_assert_free(&assert);
+
+	fclose(in_f);
+	in_f = NULL;
+
+	exit(0);
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/tools/base64.c mysql-8.0-8.0.27/extra/libfido2/tools/base64.c
--- mysql-8.0-8.0.26/extra/libfido2/tools/base64.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/tools/base64.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <openssl/bio.h>
+#include <openssl/evp.h>
+
+#include <limits.h>
+#include <stdint.h>
+#include <string.h>
+
+#include "../openbsd-compat/openbsd-compat.h"
+#include "extern.h"
+
+int
+base64_encode(const void *ptr, size_t len, char **out)
+{
+	BIO  *bio_b64 = NULL;
+	BIO  *bio_mem = NULL;
+	char *b64_ptr = NULL;
+	long  b64_len;
+	int   n;
+	int   ok = -1;
+
+	if (ptr == NULL || out == NULL || len > INT_MAX)
+		return (-1);
+
+	*out = NULL;
+
+	if ((bio_b64 = BIO_new(BIO_f_base64())) == NULL)
+		goto fail;
+	if ((bio_mem = BIO_new(BIO_s_mem())) == NULL)
+		goto fail;
+
+	BIO_set_flags(bio_b64, BIO_FLAGS_BASE64_NO_NL);
+	BIO_push(bio_b64, bio_mem);
+
+	n = BIO_write(bio_b64, ptr, (int)len);
+	if (n < 0 || (size_t)n != len)
+		goto fail;
+
+	if (BIO_flush(bio_b64) < 0)
+		goto fail;
+
+	b64_len = BIO_get_mem_data(bio_b64, &b64_ptr);
+	if (b64_len < 0 || (size_t)b64_len == SIZE_MAX || b64_ptr == NULL)
+		goto fail;
+	if ((*out = calloc(1, (size_t)b64_len + 1)) == NULL)
+		goto fail;
+
+	memcpy(*out, b64_ptr, (size_t)b64_len);
+	ok = 0;
+
+fail:
+	BIO_free(bio_b64);
+	BIO_free(bio_mem);
+
+	return (ok);
+}
+
+int
+base64_decode(const char *in, void **ptr, size_t *len)
+{
+	BIO    *bio_mem = NULL;
+	BIO    *bio_b64 = NULL;
+	size_t  alloc_len;
+	int     n;
+	int     ok = -1;
+
+	if (in == NULL || ptr == NULL || len == NULL || strlen(in) > INT_MAX)
+		return (-1);
+
+	*ptr = NULL;
+	*len = 0;
+
+	if ((bio_b64 = BIO_new(BIO_f_base64())) == NULL)
+		goto fail;
+	if ((bio_mem = BIO_new_mem_buf((const void *)in, -1)) == NULL)
+		goto fail;
+
+	BIO_set_flags(bio_b64, BIO_FLAGS_BASE64_NO_NL);
+	BIO_push(bio_b64, bio_mem);
+
+	alloc_len = strlen(in);
+	if ((*ptr = calloc(1, alloc_len)) == NULL)
+		goto fail;
+
+	n = BIO_read(bio_b64, *ptr, (int)alloc_len);
+	if (n <= 0 || BIO_eof(bio_b64) == 0)
+		goto fail;
+
+	*len = (size_t)n;
+	ok = 0;
+
+fail:
+	BIO_free(bio_b64);
+	BIO_free(bio_mem);
+
+	if (ok < 0) {
+		free(*ptr);
+		*ptr = NULL;
+		*len = 0;
+	}
+
+	return (ok);
+}
+
+int
+base64_read(FILE *f, struct blob *out)
+{
+	char *line = NULL;
+	size_t linesize = 0;
+	ssize_t n;
+
+	out->ptr = NULL;
+	out->len = 0;
+
+	if ((n = getline(&line, &linesize, f)) <= 0 ||
+	    (size_t)n != strlen(line)) {
+		free(line); /* XXX should be free'd _even_ if getline() fails */
+		return (-1);
+	}
+
+	if (base64_decode(line, (void **)&out->ptr, &out->len) < 0) {
+		free(line);
+		return (-1);
+	}
+
+	free(line);
+
+	return (0);
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/tools/bio.c mysql-8.0-8.0.27/extra/libfido2/tools/bio.c
--- mysql-8.0-8.0.26/extra/libfido2/tools/bio.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/tools/bio.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,269 @@
+/*
+ * Copyright (c) 2019 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <fido.h>
+#include <fido/bio.h>
+
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "../openbsd-compat/openbsd-compat.h"
+#include "extern.h"
+
+static void
+print_template(const fido_bio_template_array_t *ta, size_t idx)
+{
+	char				*id = NULL;
+	const fido_bio_template_t	*t = NULL;
+
+	if ((t = fido_bio_template(ta, idx)) == NULL)
+		errx(1, "fido_bio_template");
+
+	if (base64_encode(fido_bio_template_id_ptr(t),
+	    fido_bio_template_id_len(t), &id) < 0)
+		errx(1, "output error");
+
+	printf("%02u: %s %s\n", (unsigned)idx, id, fido_bio_template_name(t));
+
+	free(id);
+}
+
+int
+bio_list(char *path)
+{
+	char				 pin[1024];
+	fido_bio_template_array_t	*ta = NULL;
+	fido_dev_t			*dev = NULL;
+	int				 r;
+
+	if (path == NULL)
+		usage();
+	if ((ta = fido_bio_template_array_new()) == NULL)
+		errx(1, "fido_bio_template_array_new");
+
+	dev = open_dev(path);
+	read_pin(path, pin, sizeof(pin));
+	r = fido_bio_dev_get_template_array(dev, ta, pin);
+	explicit_bzero(pin, sizeof(pin));
+
+	if (r != FIDO_OK)
+		errx(1, "fido_bio_dev_get_template_array: %s", fido_strerr(r));
+	for (size_t i = 0; i < fido_bio_template_array_count(ta); i++)
+		print_template(ta, i);
+
+	fido_bio_template_array_free(&ta);
+	fido_dev_close(dev);
+	fido_dev_free(&dev);
+
+	exit(0);
+}
+
+int
+bio_set_name(char *path, char *id, char *name)
+{
+	char			 pin[1024];
+	fido_bio_template_t	*t = NULL;
+	fido_dev_t		*dev = NULL;
+	int			 r;
+	size_t			 id_blob_len = 0;
+	void			*id_blob_ptr = NULL;
+
+	if (path == NULL)
+		usage();
+	if ((t = fido_bio_template_new()) == NULL)
+		errx(1, "fido_bio_template_new");
+
+	if (base64_decode(id, &id_blob_ptr, &id_blob_len) < 0)
+		errx(1, "base64_decode");
+
+	if ((r = fido_bio_template_set_name(t, name)) != FIDO_OK)
+		errx(1, "fido_bio_template_set_name: %s", fido_strerr(r));
+	if ((r = fido_bio_template_set_id(t, id_blob_ptr,
+	    id_blob_len)) != FIDO_OK)
+		errx(1, "fido_bio_template_set_id: %s", fido_strerr(r));
+
+	dev = open_dev(path);
+	read_pin(path, pin, sizeof(pin));
+	r = fido_bio_dev_set_template_name(dev, t, pin);
+	explicit_bzero(pin, sizeof(pin));
+
+	if (r != FIDO_OK)
+		errx(1, "fido_bio_dev_set_template_name: %s", fido_strerr(r));
+
+	free(id_blob_ptr);
+	fido_bio_template_free(&t);
+	fido_dev_close(dev);
+	fido_dev_free(&dev);
+
+	exit(0);
+}
+
+static const char *
+plural(uint8_t n)
+{
+	if (n == 1)
+		return "";
+	return "s";
+}
+
+static const char *
+enroll_strerr(uint8_t n)
+{
+	switch (n) {
+	case FIDO_BIO_ENROLL_FP_GOOD:
+		return "Sample ok";
+	case FIDO_BIO_ENROLL_FP_TOO_HIGH:
+		return "Sample too high";
+	case FIDO_BIO_ENROLL_FP_TOO_LOW:
+		return "Sample too low";
+	case FIDO_BIO_ENROLL_FP_TOO_LEFT:
+		return "Sample too left";
+	case FIDO_BIO_ENROLL_FP_TOO_RIGHT:
+		return "Sample too right";
+	case FIDO_BIO_ENROLL_FP_TOO_FAST:
+		return "Sample too fast";
+	case FIDO_BIO_ENROLL_FP_TOO_SLOW:
+		return "Sample too slow";
+	case FIDO_BIO_ENROLL_FP_POOR_QUALITY:
+		return "Poor quality sample";
+	case FIDO_BIO_ENROLL_FP_TOO_SKEWED:
+		return "Sample too skewed";
+	case FIDO_BIO_ENROLL_FP_TOO_SHORT:
+		return "Sample too short";
+	case FIDO_BIO_ENROLL_FP_MERGE_FAILURE:
+		return "Sample merge failure";
+	case FIDO_BIO_ENROLL_FP_EXISTS:
+		return "Sample exists";
+	case FIDO_BIO_ENROLL_FP_DATABASE_FULL:
+		return "Fingerprint database full";
+	case FIDO_BIO_ENROLL_NO_USER_ACTIVITY:
+		return "No user activity";
+	case FIDO_BIO_ENROLL_NO_USER_PRESENCE_TRANSITION:
+		return "No user presence transition";
+	default:
+		return "Unknown error";
+	}
+}
+
+int
+bio_enroll(char *path)
+{
+	char			 pin[1024];
+	fido_bio_enroll_t	*e = NULL;
+	fido_bio_template_t	*t = NULL;
+	fido_dev_t		*dev = NULL;
+	int			 r;
+
+	if (path == NULL)
+		usage();
+	if ((t = fido_bio_template_new()) == NULL)
+		errx(1, "fido_bio_template_new");
+	if ((e = fido_bio_enroll_new()) == NULL)
+		errx(1, "fido_bio_enroll_new");
+
+	dev = open_dev(path);
+	read_pin(path, pin, sizeof(pin));
+
+	printf("Touch your security key.\n");
+
+	r = fido_bio_dev_enroll_begin(dev, t, e, 10000, pin);
+	explicit_bzero(pin, sizeof(pin));
+	if (r != FIDO_OK)
+		errx(1, "fido_bio_dev_enroll_begin: %s", fido_strerr(r));
+
+	printf("%s.\n", enroll_strerr(fido_bio_enroll_last_status(e)));
+
+	while (fido_bio_enroll_remaining_samples(e) > 0) {
+		printf("Touch your security key (%u sample%s left).\n",
+		    (unsigned)fido_bio_enroll_remaining_samples(e),
+		    plural(fido_bio_enroll_remaining_samples(e)));
+		if ((r = fido_bio_dev_enroll_continue(dev, t, e,
+		    10000)) != FIDO_OK) {
+			errx(1, "fido_bio_dev_enroll_continue: %s",
+			    fido_strerr(r));
+		}
+		printf("%s.\n", enroll_strerr(fido_bio_enroll_last_status(e)));
+	}
+
+	fido_bio_template_free(&t);
+	fido_bio_enroll_free(&e);
+	fido_dev_close(dev);
+	fido_dev_free(&dev);
+
+	exit(0);
+}
+
+int
+bio_delete(fido_dev_t *dev, char *path, char *id)
+{
+	char			 pin[1024];
+	fido_bio_template_t	*t = NULL;
+	int			 r;
+	size_t			 id_blob_len = 0;
+	void			*id_blob_ptr = NULL;
+
+	if (path == NULL)
+		usage();
+	if ((t = fido_bio_template_new()) == NULL)
+		errx(1, "fido_bio_template_new");
+
+	if (base64_decode(id, &id_blob_ptr, &id_blob_len) < 0)
+		errx(1, "base64_decode");
+	if ((r = fido_bio_template_set_id(t, id_blob_ptr,
+	    id_blob_len)) != FIDO_OK)
+		errx(1, "fido_bio_template_set_id: %s", fido_strerr(r));
+
+	read_pin(path, pin, sizeof(pin));
+	r = fido_bio_dev_enroll_remove(dev, t, pin);
+	explicit_bzero(pin, sizeof(pin));
+
+	if (r != FIDO_OK)
+		errx(1, "fido_bio_dev_enroll_remove: %s", fido_strerr(r));
+
+	free(id_blob_ptr);
+	fido_bio_template_free(&t);
+	fido_dev_close(dev);
+	fido_dev_free(&dev);
+
+	exit(0);
+}
+
+static const char *
+type_str(uint8_t t)
+{
+	switch (t) {
+	case 1:
+		return "touch";
+	case 2:
+		return "swipe";
+	default:
+		return "unknown";
+	}
+}
+
+void
+bio_info(fido_dev_t *dev)
+{
+	fido_bio_info_t	*i = NULL;
+
+	if ((i = fido_bio_info_new()) == NULL)
+		errx(1, "fido_bio_info_new");
+	if (fido_bio_dev_get_info(dev, i) != FIDO_OK) {
+		fido_bio_info_free(&i);
+		return;
+	}
+
+	printf("sensor type: %u (%s)\n", (unsigned)fido_bio_info_type(i),
+	    type_str(fido_bio_info_type(i)));
+	printf("max samples: %u\n", (unsigned)fido_bio_info_max_samples(i));
+
+	fido_bio_info_free(&i);
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/tools/CMakeLists.txt mysql-8.0-8.0.27/extra/libfido2/tools/CMakeLists.txt
--- mysql-8.0-8.0.26/extra/libfido2/tools/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/tools/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,64 @@
+# Copyright (c) 2018 Yubico AB. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+list(APPEND COMPAT_SOURCES
+	../openbsd-compat/explicit_bzero.c
+	../openbsd-compat/strlcpy.c
+	../openbsd-compat/strlcat.c
+)
+
+if(WIN32 AND NOT CYGWIN AND NOT MSYS)
+	list(APPEND COMPAT_SOURCES
+		../openbsd-compat/bsd-getline.c
+		../openbsd-compat/explicit_bzero_win32.c
+		../openbsd-compat/getopt_long.c
+		../openbsd-compat/posix_win.c
+		../openbsd-compat/readpassphrase_win32.c
+	)
+else()
+	list(APPEND COMPAT_SOURCES ../openbsd-compat/readpassphrase.c)
+endif()
+
+if(NOT MSVC)
+	set_source_files_properties(assert_get.c assert_verify.c base64.c bio.c
+	    cred_make.c cred_verify.c credman.c fido2-assert.c fido2-cred.c
+	    fido2-token.c pin.c token.c util.c PROPERTIES COMPILE_FLAGS
+            "-Wconversion -Wsign-conversion")
+endif()
+
+add_executable(fido2-cred
+	fido2-cred.c
+	cred_make.c
+	cred_verify.c
+	base64.c
+	util.c
+	${COMPAT_SOURCES}
+)
+
+add_executable(fido2-assert
+	fido2-assert.c
+	assert_get.c
+	assert_verify.c
+	base64.c
+	util.c
+	${COMPAT_SOURCES}
+)
+
+add_executable(fido2-token
+	fido2-token.c
+	base64.c
+	bio.c
+	credman.c
+	pin.c
+	token.c
+	util.c
+	${COMPAT_SOURCES}
+)
+
+target_link_libraries(fido2-cred ${CRYPTO_LIBRARY} fido2_shared)
+target_link_libraries(fido2-assert ${CRYPTO_LIBRARY} fido2_shared)
+target_link_libraries(fido2-token ${CRYPTO_LIBRARY} fido2_shared)
+
+install(TARGETS fido2-cred fido2-assert fido2-token
+	DESTINATION ${CMAKE_INSTALL_BINDIR})
diff -Nru mysql-8.0-8.0.26/extra/libfido2/tools/cred_make.c mysql-8.0-8.0.27/extra/libfido2/tools/cred_make.c
--- mysql-8.0-8.0.26/extra/libfido2/tools/cred_make.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/tools/cred_make.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,225 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <fido.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "../openbsd-compat/openbsd-compat.h"
+#include "extern.h"
+
+static fido_cred_t *
+prepare_cred(FILE *in_f, int type, int flags)
+{
+	fido_cred_t *cred = NULL;
+	struct blob cdh;
+	struct blob uid;
+	char *rpid = NULL;
+	char *uname = NULL;
+	int r;
+
+	memset(&cdh, 0, sizeof(cdh));
+	memset(&uid, 0, sizeof(uid));
+
+	r = base64_read(in_f, &cdh);
+	r |= string_read(in_f, &rpid);
+	r |= string_read(in_f, &uname);
+	r |= base64_read(in_f, &uid);
+	if (r < 0)
+		errx(1, "input error");
+
+	if (flags & FLAG_DEBUG) {
+		fprintf(stderr, "client data hash:\n");
+		xxd(cdh.ptr, cdh.len);
+		fprintf(stderr, "relying party id: %s\n", rpid);
+		fprintf(stderr, "user name: %s\n", uname);
+		fprintf(stderr, "user id:\n");
+		xxd(uid.ptr, uid.len);
+	}
+
+	if ((cred = fido_cred_new()) == NULL)
+		errx(1, "fido_cred_new");
+
+	if ((r = fido_cred_set_type(cred, type)) != FIDO_OK ||
+	    (r = fido_cred_set_clientdata_hash(cred, cdh.ptr,
+	    cdh.len)) != FIDO_OK ||
+	    (r = fido_cred_set_rp(cred, rpid, NULL)) != FIDO_OK ||
+	    (r = fido_cred_set_user(cred, uid.ptr, uid.len, uname, NULL,
+	    NULL)) != FIDO_OK)
+		errx(1, "fido_cred_set: %s", fido_strerr(r));
+
+	if (flags & FLAG_RK) {
+		if ((r = fido_cred_set_rk(cred, FIDO_OPT_TRUE)) != FIDO_OK)
+			errx(1, "fido_cred_set_rk: %s", fido_strerr(r));
+	}
+	if (flags & FLAG_UV) {
+		if ((r = fido_cred_set_uv(cred, FIDO_OPT_TRUE)) != FIDO_OK)
+			errx(1, "fido_cred_set_uv: %s", fido_strerr(r));
+	}
+	if (flags & FLAG_HMAC) {
+		if ((r = fido_cred_set_extensions(cred,
+		    FIDO_EXT_HMAC_SECRET)) != FIDO_OK)
+			errx(1, "fido_cred_set_extensions: %s", fido_strerr(r));
+	}
+
+	free(cdh.ptr);
+	free(uid.ptr);
+	free(rpid);
+	free(uname);
+
+	return (cred);
+}
+
+static void
+print_attcred(FILE *out_f, const fido_cred_t *cred)
+{
+	char *cdh = NULL;
+	char *authdata = NULL;
+	char *id = NULL;
+	char *sig = NULL;
+	char *x5c = NULL;
+	int r;
+
+	r = base64_encode(fido_cred_clientdata_hash_ptr(cred),
+	    fido_cred_clientdata_hash_len(cred), &cdh);
+	r |= base64_encode(fido_cred_authdata_ptr(cred),
+	    fido_cred_authdata_len(cred), &authdata);
+	r |= base64_encode(fido_cred_id_ptr(cred), fido_cred_id_len(cred),
+	    &id);
+	r |= base64_encode(fido_cred_sig_ptr(cred), fido_cred_sig_len(cred),
+	    &sig);
+	if (fido_cred_x5c_ptr(cred) != NULL)
+		r |= base64_encode(fido_cred_x5c_ptr(cred),
+		    fido_cred_x5c_len(cred), &x5c);
+	if (r < 0)
+		errx(1, "output error");
+
+	fprintf(out_f, "%s\n", cdh);
+	fprintf(out_f, "%s\n", fido_cred_rp_id(cred));
+	fprintf(out_f, "%s\n", fido_cred_fmt(cred));
+	fprintf(out_f, "%s\n", authdata);
+	fprintf(out_f, "%s\n", id);
+	fprintf(out_f, "%s\n", sig);
+	if (x5c != NULL)
+		fprintf(out_f, "%s\n", x5c);
+
+	free(cdh);
+	free(authdata);
+	free(id);
+	free(sig);
+	free(x5c);
+}
+
+int
+cred_make(int argc, char **argv)
+{
+	fido_dev_t *dev = NULL;
+	fido_cred_t *cred = NULL;
+	char prompt[1024];
+	char pin[1024];
+	char *in_path = NULL;
+	char *out_path = NULL;
+	FILE *in_f = NULL;
+	FILE *out_f = NULL;
+	int type = COSE_ES256;
+	int flags = 0;
+	int cred_protect = -1;
+	int ch;
+	int r;
+
+	while ((ch = getopt(argc, argv, "c:dhi:o:qruv")) != -1) {
+		switch (ch) {
+		case 'c':
+			if ((cred_protect = base10(optarg)) < 0)
+				errx(1, "-c: invalid argument '%s'", optarg);
+			break;
+		case 'd':
+			flags |= FLAG_DEBUG;
+			break;
+		case 'h':
+			flags |= FLAG_HMAC;
+			break;
+		case 'i':
+			in_path = optarg;
+			break;
+		case 'o':
+			out_path = optarg;
+			break;
+		case 'q':
+			flags |= FLAG_QUIET;
+			break;
+		case 'r':
+			flags |= FLAG_RK;
+			break;
+		case 'u':
+			flags |= FLAG_U2F;
+			break;
+		case 'v':
+			flags |= FLAG_UV;
+			break;
+		default:
+			usage();
+		}
+	}
+
+	argc -= optind;
+	argv += optind;
+
+	if (argc < 1 || argc > 2)
+		usage();
+
+	in_f = open_read(in_path);
+	out_f = open_write(out_path);
+
+	if (argc > 1 && cose_type(argv[1], &type) < 0)
+		errx(1, "unknown type %s", argv[1]);
+
+	fido_init((flags & FLAG_DEBUG) ? FIDO_DEBUG : 0);
+
+	cred = prepare_cred(in_f, type, flags);
+
+	dev = open_dev(argv[0]);
+	if (flags & FLAG_U2F)
+		fido_dev_force_u2f(dev);
+
+	if (cred_protect > 0) {
+		r = fido_cred_set_prot(cred, cred_protect);
+		if (r != FIDO_OK) {
+			errx(1, "fido_cred_set_prot: %s", fido_strerr(r));
+		}
+	}
+
+	r = fido_dev_make_cred(dev, cred, NULL);
+	if (r == FIDO_ERR_PIN_REQUIRED && !(flags & FLAG_QUIET)) {
+		r = snprintf(prompt, sizeof(prompt), "Enter PIN for %s: ",
+		    argv[0]);
+		if (r < 0 || (size_t)r >= sizeof(prompt))
+			errx(1, "snprintf");
+		if (!readpassphrase(prompt, pin, sizeof(pin), RPP_ECHO_OFF))
+			errx(1, "readpassphrase");
+		r = fido_dev_make_cred(dev, cred, pin);
+	}
+
+	explicit_bzero(pin, sizeof(pin));
+	if (r != FIDO_OK)
+		errx(1, "fido_dev_make_cred: %s", fido_strerr(r));
+	print_attcred(out_f, cred);
+
+	fido_dev_close(dev);
+	fido_dev_free(&dev);
+	fido_cred_free(&cred);
+
+	fclose(in_f);
+	fclose(out_f);
+	in_f = NULL;
+	out_f = NULL;
+
+	exit(0);
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/tools/credman.c mysql-8.0-8.0.27/extra/libfido2/tools/credman.c
--- mysql-8.0-8.0.26/extra/libfido2/tools/credman.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/tools/credman.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,226 @@
+/*
+ * Copyright (c) 2019 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <fido.h>
+#include <fido/credman.h>
+
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "../openbsd-compat/openbsd-compat.h"
+#include "extern.h"
+
+int
+credman_get_metadata(fido_dev_t *dev, const char *path)
+{
+	fido_credman_metadata_t *metadata = NULL;
+	char pin[1024];
+	int r;
+
+	if ((metadata = fido_credman_metadata_new()) == NULL)
+		errx(1, "fido_credman_metadata_new");
+
+	read_pin(path, pin, sizeof(pin));
+	r = fido_credman_get_dev_metadata(dev, metadata, pin);
+	explicit_bzero(pin, sizeof(pin));
+
+	if (r != FIDO_OK)
+		errx(1, "fido_credman_get_dev_metadata: %s", fido_strerr(r));
+
+	printf("existing rk(s): %u\n",
+	    (unsigned)fido_credman_rk_existing(metadata));
+	printf("remaining rk(s): %u\n",
+	    (unsigned)fido_credman_rk_remaining(metadata));
+
+	fido_credman_metadata_free(&metadata);
+	fido_dev_close(dev);
+	fido_dev_free(&dev);
+
+	exit(0);
+}
+
+static void
+print_rp(fido_credman_rp_t *rp, size_t idx)
+{
+	char *rp_id_hash = NULL;
+
+	if (base64_encode(fido_credman_rp_id_hash_ptr(rp, idx),
+	    fido_credman_rp_id_hash_len(rp, idx), &rp_id_hash) < 0)
+		errx(1, "output error");
+
+	printf("%02u: %s %s\n", (unsigned)idx, rp_id_hash,
+	    fido_credman_rp_id(rp, idx));
+
+	free(rp_id_hash);
+	rp_id_hash = NULL;
+}
+
+int
+credman_list_rp(char *path)
+{
+	fido_dev_t *dev = NULL;
+	fido_credman_rp_t *rp = NULL;
+	char pin[1024];
+	int r;
+
+	if (path == NULL)
+		usage();
+	if ((rp = fido_credman_rp_new()) == NULL)
+		errx(1, "fido_credman_rp_new");
+
+	dev = open_dev(path);
+	read_pin(path, pin, sizeof(pin));
+	r = fido_credman_get_dev_rp(dev, rp, pin);
+	explicit_bzero(pin, sizeof(pin));
+
+	if (r != FIDO_OK)
+		errx(1, "fido_credman_get_dev_rp: %s", fido_strerr(r));
+
+	for (size_t i = 0; i < fido_credman_rp_count(rp); i++)
+		print_rp(rp, i);
+
+	fido_credman_rp_free(&rp);
+	fido_dev_close(dev);
+	fido_dev_free(&dev);
+
+	exit(0);
+}
+
+static void
+print_rk(const fido_credman_rk_t *rk, size_t idx)
+{
+	const fido_cred_t *cred;
+	char *id = NULL;
+	char *user_id = NULL;
+	const char *type;
+	const char *prot;
+
+	if ((cred = fido_credman_rk(rk, idx)) == NULL)
+		errx(1, "fido_credman_rk");
+	if (base64_encode(fido_cred_id_ptr(cred), fido_cred_id_len(cred),
+	    &id) < 0 || base64_encode(fido_cred_user_id_ptr(cred),
+	    fido_cred_user_id_len(cred), &user_id) < 0)
+		errx(1, "output error");
+
+	type = cose_string(fido_cred_type(cred));
+	prot = prot_string(fido_cred_prot(cred));
+
+	printf("%02u: %s %s %s %s %s\n", (unsigned)idx, id,
+	    fido_cred_display_name(cred), user_id, type, prot);
+
+	free(user_id);
+	free(id);
+	user_id = NULL;
+	id = NULL;
+}
+
+int
+credman_list_rk(char *path, const char *rp_id)
+{
+	fido_dev_t *dev = NULL;
+	fido_credman_rk_t *rk = NULL;
+	char pin[1024];
+	int r;
+
+	if (path == NULL)
+		usage();
+	if ((rk = fido_credman_rk_new()) == NULL)
+		errx(1, "fido_credman_rk_new");
+
+	dev = open_dev(path);
+	read_pin(path, pin, sizeof(pin));
+	r = fido_credman_get_dev_rk(dev, rp_id, rk, pin);
+	explicit_bzero(pin, sizeof(pin));
+
+	if (r != FIDO_OK)
+		errx(1, "fido_credman_get_dev_rk: %s", fido_strerr(r));
+	for (size_t i = 0; i < fido_credman_rk_count(rk); i++)
+		print_rk(rk, i);
+
+	fido_credman_rk_free(&rk);
+	fido_dev_close(dev);
+	fido_dev_free(&dev);
+
+	exit(0);
+}
+
+int
+credman_print_rk(fido_dev_t *dev, const char *path, char *rp_id, char *cred_id)
+{
+	const fido_cred_t *cred = NULL;
+	fido_credman_rk_t *rk = NULL;
+	char pin[1024];
+	void *cred_id_ptr = NULL;
+	size_t cred_id_len = 0;
+	int r;
+
+	if ((rk = fido_credman_rk_new()) == NULL)
+		errx(1, "fido_credman_rk_new");
+	if (base64_decode(cred_id, &cred_id_ptr, &cred_id_len) < 0)
+		errx(1, "base64_decode");
+
+	read_pin(path, pin, sizeof(pin));
+	r = fido_credman_get_dev_rk(dev, rp_id, rk, pin);
+	explicit_bzero(pin, sizeof(pin));
+
+	if (r != FIDO_OK)
+		errx(1, "fido_credman_get_dev_rk: %s", fido_strerr(r));
+
+	for (size_t i = 0; i < fido_credman_rk_count(rk); i++) {
+		if ((cred = fido_credman_rk(rk, i)) == NULL ||
+		    fido_cred_id_ptr(cred) == NULL)
+			errx(1, "output error");
+		if (cred_id_len != fido_cred_id_len(cred) ||
+		    memcmp(cred_id_ptr, fido_cred_id_ptr(cred), cred_id_len))
+			continue;
+		print_cred(stdout, fido_cred_type(cred), cred);
+		goto out;
+	}
+
+	errx(1, "credential not found");
+
+out:
+	free(cred_id_ptr);
+	cred_id_ptr = NULL;
+
+	fido_credman_rk_free(&rk);
+	fido_dev_close(dev);
+	fido_dev_free(&dev);
+
+	exit(0);
+}
+
+int
+credman_delete_rk(fido_dev_t *dev, const char *path, char *id)
+{
+	char pin[1024];
+	void *id_ptr = NULL;
+	size_t id_len = 0;
+	int r;
+
+	if (base64_decode(id, &id_ptr, &id_len) < 0)
+		errx(1, "base64_decode");
+
+	read_pin(path, pin, sizeof(pin));
+	r = fido_credman_del_dev_rk(dev, id_ptr, id_len, pin);
+	explicit_bzero(pin, sizeof(pin));
+
+	if (r != FIDO_OK)
+		errx(1, "fido_credman_del_dev_rk: %s", fido_strerr(r));
+
+	free(id_ptr);
+	id_ptr = NULL;
+
+	fido_dev_close(dev);
+	fido_dev_free(&dev);
+
+	exit(0);
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/tools/cred_verify.c mysql-8.0-8.0.27/extra/libfido2/tools/cred_verify.c
--- mysql-8.0-8.0.26/extra/libfido2/tools/cred_verify.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/tools/cred_verify.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,181 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <fido.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "../openbsd-compat/openbsd-compat.h"
+#include "extern.h"
+
+static fido_cred_t *
+prepare_cred(FILE *in_f, int type, int flags)
+{
+	fido_cred_t *cred = NULL;
+	struct blob cdh;
+	struct blob authdata;
+	struct blob id;
+	struct blob sig;
+	struct blob x5c;
+	char *rpid = NULL;
+	char *fmt = NULL;
+	int r;
+
+	memset(&cdh, 0, sizeof(cdh));
+	memset(&authdata, 0, sizeof(authdata));
+	memset(&id, 0, sizeof(id));
+	memset(&sig, 0, sizeof(sig));
+	memset(&x5c, 0, sizeof(x5c));
+
+	r = base64_read(in_f, &cdh);
+	r |= string_read(in_f, &rpid);
+	r |= string_read(in_f, &fmt);
+	r |= base64_read(in_f, &authdata);
+	r |= base64_read(in_f, &id);
+	r |= base64_read(in_f, &sig);
+	if (r < 0)
+		errx(1, "input error");
+
+	(void)base64_read(in_f, &x5c);
+
+	if (flags & FLAG_DEBUG) {
+		fprintf(stderr, "client data hash:\n");
+		xxd(cdh.ptr, cdh.len);
+		fprintf(stderr, "relying party id: %s\n", rpid);
+		fprintf(stderr, "format: %s\n", fmt);
+		fprintf(stderr, "authenticator data:\n");
+		xxd(authdata.ptr, authdata.len);
+		fprintf(stderr, "credential id:\n");
+		xxd(id.ptr, id.len);
+		fprintf(stderr, "signature:\n");
+		xxd(sig.ptr, sig.len);
+		fprintf(stderr, "x509:\n");
+		xxd(x5c.ptr, x5c.len);
+	}
+
+	if ((cred = fido_cred_new()) == NULL)
+		errx(1, "fido_cred_new");
+
+	if ((r = fido_cred_set_type(cred, type)) != FIDO_OK ||
+	    (r = fido_cred_set_clientdata_hash(cred, cdh.ptr,
+	    cdh.len)) != FIDO_OK ||
+	    (r = fido_cred_set_rp(cred, rpid, NULL)) != FIDO_OK ||
+	    (r = fido_cred_set_authdata(cred, authdata.ptr,
+	    authdata.len)) != FIDO_OK ||
+	    (r = fido_cred_set_sig(cred, sig.ptr, sig.len)) != FIDO_OK ||
+	    (r = fido_cred_set_fmt(cred, fmt)) != FIDO_OK)
+		errx(1, "fido_cred_set: %s", fido_strerr(r));
+
+	if (x5c.ptr != NULL) {
+		if ((r = fido_cred_set_x509(cred, x5c.ptr, x5c.len)) != FIDO_OK)
+			errx(1, "fido_cred_set_x509: %s", fido_strerr(r));
+	}
+
+	if (flags & FLAG_UV) {
+		if ((r = fido_cred_set_uv(cred, FIDO_OPT_TRUE)) != FIDO_OK)
+			errx(1, "fido_cred_set_uv: %s", fido_strerr(r));
+	}
+	if (flags & FLAG_HMAC) {
+		if ((r = fido_cred_set_extensions(cred,
+		    FIDO_EXT_HMAC_SECRET)) != FIDO_OK)
+			errx(1, "fido_cred_set_extensions: %s", fido_strerr(r));
+	}
+
+	free(cdh.ptr);
+	free(authdata.ptr);
+	free(id.ptr);
+	free(sig.ptr);
+	free(x5c.ptr);
+	free(rpid);
+	free(fmt);
+
+	return (cred);
+}
+
+int
+cred_verify(int argc, char **argv)
+{
+	fido_cred_t *cred = NULL;
+	char *in_path = NULL;
+	char *out_path = NULL;
+	FILE *in_f = NULL;
+	FILE *out_f = NULL;
+	int type = COSE_ES256;
+	int flags = 0;
+	int cred_prot = -1;
+	int ch;
+	int r;
+
+	while ((ch = getopt(argc, argv, "c:dhi:o:v")) != -1) {
+		switch (ch) {
+		case 'c':
+			if ((cred_prot = base10(optarg)) < 0)
+				errx(1, "-c: invalid argument '%s'", optarg);
+			break;
+		case 'd':
+			flags |= FLAG_DEBUG;
+			break;
+		case 'h':
+			flags |= FLAG_HMAC;
+			break;
+		case 'i':
+			in_path = optarg;
+			break;
+		case 'o':
+			out_path = optarg;
+			break;
+		case 'v':
+			flags |= FLAG_UV;
+			break;
+		default:
+			usage();
+		}
+	}
+
+	argc -= optind;
+	argv += optind;
+
+	if (argc > 1)
+		usage();
+
+	in_f = open_read(in_path);
+	out_f = open_write(out_path);
+
+	if (argc > 0 && cose_type(argv[0], &type) < 0)
+		errx(1, "unknown type %s", argv[0]);
+
+	fido_init((flags & FLAG_DEBUG) ? FIDO_DEBUG : 0);
+	cred = prepare_cred(in_f, type, flags);
+
+	if (cred_prot > 0) {
+		r = fido_cred_set_prot(cred, cred_prot);
+		if (r != FIDO_OK) {
+			errx(1, "fido_cred_set_prot: %s", fido_strerr(r));
+		}
+	}
+
+	if (fido_cred_x5c_ptr(cred) == NULL) {
+		if ((r = fido_cred_verify_self(cred)) != FIDO_OK)
+			errx(1, "fido_cred_verify_self: %s", fido_strerr(r));
+	} else {
+		if ((r = fido_cred_verify(cred)) != FIDO_OK)
+			errx(1, "fido_cred_verify: %s", fido_strerr(r));
+	}
+
+	print_cred(out_f, type, cred);
+	fido_cred_free(&cred);
+
+	fclose(in_f);
+	fclose(out_f);
+	in_f = NULL;
+	out_f = NULL;
+
+	exit(0);
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/tools/extern.h mysql-8.0-8.0.27/extra/libfido2/tools/extern.h
--- mysql-8.0-8.0.26/extra/libfido2/tools/extern.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/tools/extern.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#ifndef _EXTERN_H_
+#define _EXTERN_H_
+
+#include <stddef.h>
+#include <stdio.h>
+
+#include <openssl/ec.h>
+#include <fido.h>
+
+struct blob {
+	unsigned char *ptr;
+	size_t len;
+};
+
+#define TOKEN_OPT	"CDILPRSVbcdei:k:n:r"
+
+#define FLAG_DEBUG	0x01
+#define FLAG_QUIET	0x02
+#define FLAG_RK		0x04
+#define FLAG_UV		0x08
+#define FLAG_U2F	0x10
+#define FLAG_HMAC	0x20
+#define FLAG_UP		0x40
+
+EC_KEY *read_ec_pubkey(const char *);
+fido_dev_t *open_dev(const char *);
+FILE *open_read(const char *);
+FILE *open_write(const char *);
+const char *cose_string(int);
+const char *prot_string(int);
+int assert_get(int, char **);
+int assert_verify(int, char **);
+int base64_decode(const char *, void **, size_t *);
+int base64_encode(const void *, size_t, char **);
+int base64_read(FILE *, struct blob *);
+int bio_delete(fido_dev_t *, char *, char *);
+int bio_enroll(char *);
+void bio_info(fido_dev_t *);
+int bio_list(char *);
+int bio_set_name(char *, char *, char *);
+int cose_type(const char *, int *);
+int cred_make(int, char **);
+int cred_verify(int, char **);
+int credman_delete_rk(fido_dev_t *, const char *, char *);
+int credman_get_metadata(fido_dev_t *, const char *);
+int credman_list_rk(char *, const char *);
+int credman_list_rp(char *);
+int credman_print_rk(fido_dev_t *, const char *, char *, char *);
+int pin_change(char *);
+int pin_set(char *);
+int string_read(FILE *, char **);
+int token_delete(int, char **, char *);
+int token_info(int, char **, char *);
+int token_list(int, char **, char *);
+int token_reset(char *);
+int token_set(int, char **, char *);
+int write_ec_pubkey(FILE *, const void *, size_t);
+int write_rsa_pubkey(FILE *, const void *, size_t);
+RSA *read_rsa_pubkey(const char *);
+EVP_PKEY *read_eddsa_pubkey(const char *);
+int write_eddsa_pubkey(FILE *, const void *, size_t);
+void print_cred(FILE *, int, const fido_cred_t *);
+void read_pin(const char *, char *, size_t);
+void usage(void);
+void xxd(const void *, size_t);
+int base10(const char *);
+
+#endif /* _EXTERN_H_ */
diff -Nru mysql-8.0-8.0.26/extra/libfido2/tools/fido2-assert.c mysql-8.0-8.0.27/extra/libfido2/tools/fido2-assert.c
--- mysql-8.0-8.0.26/extra/libfido2/tools/fido2-assert.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/tools/fido2-assert.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+/*
+ * Example usage:
+ *
+ * $ echo assertion challenge | openssl sha256 -binary | base64 > assert_param
+ * $ echo relying party >> assert_param
+ * $ head -1 cred >> assert_param # credential id
+ * $ tail -n +2 cred > pubkey # credential pubkey
+ * $ fido2-assert -G -i assert_param /dev/hidraw5 | fido2-assert -V pubkey rs256
+ *
+ * See blurb in fido2-cred.c on how to obtain cred.
+ */
+
+#include <fido.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "../openbsd-compat/openbsd-compat.h"
+#include "extern.h"
+
+void
+usage(void)
+{
+	fprintf(stderr,
+"usage: fido2-assert -G [-dhpruv] [-t option] [-i input_file] [-o output_file] device\n"
+"       fido2-assert -V [-dhpv] [-i input_file] key_file [type]\n"
+	);
+
+	exit(1);
+}
+
+int
+main(int argc, char **argv)
+{
+	if (argc < 2 || strlen(argv[1]) != 2 || argv[1][0] != '-')
+		usage();
+
+	switch (argv[1][1]) {
+	case 'G':
+		return (assert_get(--argc, ++argv));
+	case 'V':
+		return (assert_verify(--argc, ++argv));
+	}
+
+	usage();
+
+	/* NOTREACHED */
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/tools/fido2-attach.sh mysql-8.0-8.0.27/extra/libfido2/tools/fido2-attach.sh
--- mysql-8.0-8.0.26/extra/libfido2/tools/fido2-attach.sh	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/tools/fido2-attach.sh	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# Copyright (c) 2020 Yubico AB. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+DEV=""
+
+while [ -z "${DEV}" ]; do
+	sleep .5
+	DEV="$(fido2-token -L | sed 's/^\(.*\): .*$/\1/;q')"
+done
+
+printf '%s\n' "${DEV}"
diff -Nru mysql-8.0-8.0.26/extra/libfido2/tools/fido2-cred.c mysql-8.0-8.0.27/extra/libfido2/tools/fido2-cred.c
--- mysql-8.0-8.0.26/extra/libfido2/tools/fido2-cred.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/tools/fido2-cred.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+/*
+ * Example usage:
+ *
+ * $ echo credential challenge | openssl sha256 -binary | base64 > cred_param
+ * $ echo relying party >> cred_param
+ * $ echo user name >> cred_param
+ * $ dd if=/dev/urandom bs=1 count=32 | base64 >> cred_param
+ * $ fido2-cred -M -i cred_param /dev/hidraw5 | fido2-cred -V -o cred
+ */
+
+#include <fido.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "../openbsd-compat/openbsd-compat.h"
+#include "extern.h"
+
+void
+usage(void)
+{
+	fprintf(stderr,
+"usage: fido2-cred -M [-dhqruv] [-c cred_protect] [-i input_file] [-o output_file] device [type]\n"
+"       fido2-cred -V [-dhv] [-c cred_protect] [-i input_file] [-o output_file] [type]\n"
+	);
+
+	exit(1);
+}
+
+int
+main(int argc, char **argv)
+{
+	if (argc < 2 || strlen(argv[1]) != 2 || argv[1][0] != '-')
+		usage();
+
+	switch (argv[1][1]) {
+	case 'M':
+		return (cred_make(--argc, ++argv));
+	case 'V':
+		return (cred_verify(--argc, ++argv));
+	}
+
+	usage();
+
+	/* NOTREACHED */
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/tools/fido2-detach.sh mysql-8.0-8.0.27/extra/libfido2/tools/fido2-detach.sh
--- mysql-8.0-8.0.26/extra/libfido2/tools/fido2-detach.sh	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/tools/fido2-detach.sh	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# Copyright (c) 2020 Yubico AB. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+DEV="$(fido2-token -L | sed 's/^\(.*\): .*$/\1/;q')"
+
+while [ -n "${DEV}" ]; do
+	sleep .5
+	DEV="$(fido2-token -L | sed 's/^\(.*\): .*$/\1/;q')"
+done
diff -Nru mysql-8.0-8.0.26/extra/libfido2/tools/fido2-token.c mysql-8.0-8.0.27/extra/libfido2/tools/fido2-token.c
--- mysql-8.0-8.0.26/extra/libfido2/tools/fido2-token.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/tools/fido2-token.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <fido.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "../openbsd-compat/openbsd-compat.h"
+#include "extern.h"
+
+static int action;
+
+void
+usage(void)
+{
+	fprintf(stderr,
+"usage: fido2-token [-CR] [-d] device\n"
+"       fido2-token -D [-de] -i id device\n"
+"       fido2-token -I [-cd] [-k rp_id -i cred_id] device\n"
+"       fido2-token -L [-der] [-k rp_id] [device]\n"
+"       fido2-token -S [-de] [-i template_id -n template_name] device\n"
+"       fido2-token -V\n"
+	);
+
+	exit(1);
+}
+
+static void
+setaction(int ch)
+{
+	if (action)
+		usage();
+	action = ch;
+}
+
+int
+main(int argc, char **argv)
+{
+	int ch;
+	int flags = 0;
+	char *device;
+
+	while ((ch = getopt(argc, argv, TOKEN_OPT)) != -1) {
+		switch (ch) {
+		case 'b':
+		case 'c':
+		case 'e':
+		case 'i':
+		case 'k':
+		case 'n':
+		case 'r':
+			break; /* ignore */
+		case 'd':
+			flags = FIDO_DEBUG;
+			break;
+		default:
+			setaction(ch);
+			break;
+		}
+	}
+
+	if (argc - optind == 1)
+		device = argv[optind];
+	else
+		device = NULL;
+
+	fido_init(flags);
+
+	switch (action) {
+	case 'C':
+		return (pin_change(device));
+	case 'D':
+		return (token_delete(argc, argv, device));
+	case 'I':
+		return (token_info(argc, argv, device));
+	case 'L':
+		return (token_list(argc, argv, device));
+	case 'R':
+		return (token_reset(device));
+	case 'S':
+		return (token_set(argc, argv, device));
+	case 'V':
+		fprintf(stderr, "%d.%d.%d\n", _FIDO_MAJOR, _FIDO_MINOR,
+		    _FIDO_PATCH);
+		exit(0);
+	}
+
+	usage();
+
+	/* NOTREACHED */
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/tools/fido2-unprot.sh mysql-8.0-8.0.27/extra/libfido2/tools/fido2-unprot.sh
--- mysql-8.0-8.0.26/extra/libfido2/tools/fido2-unprot.sh	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/tools/fido2-unprot.sh	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,75 @@
+#!/bin/sh
+
+# Copyright (c) 2020 Fabian Henneke.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+
+if [ $(uname) != "Linux" ] ; then
+   echo "Can only run on Linux"
+   exit 1
+fi
+
+TOKEN_VERSION=$(${FIDO_TOOLS_PREFIX}fido2-token -V 2>&1)
+if [ $? -ne 0 ] ; then
+    echo "Please install libfido2 1.5.0 or higher"
+    exit
+fi
+
+TOKEN_VERSION_MAJOR=$(echo "$TOKEN_VERSION" | cut -d. -f1)
+TOKEN_VERSION_MINOR=$(echo "$TOKEN_VERSION" | cut -d. -f2)
+if [ $TOKEN_VERSION_MAJOR -eq 0 -o $TOKEN_VERSION_MAJOR -eq 1 -a $TOKEN_VERSION_MINOR -lt 5 ] ; then
+    echo "Please install libfido2 1.5.0 or higher (current version: $TOKEN_VERSION)"
+    exit 1
+fi
+
+set -e
+
+TOKEN_OUTPUT=$(${FIDO_TOOLS_PREFIX}fido2-token -L)
+DEV_PATH_NAMES=$(echo "$TOKEN_OUTPUT" | sed -r 's/^(.*): .*\((.*)\)$/\1 \2/g')
+DEV_COUNT=$(echo "$DEV_PATH_NAMES" | wc -l)
+
+for i in $(seq 1 $DEV_COUNT)
+do
+    DEV_PATH_NAME=$(echo "$DEV_PATH_NAMES" | sed "${i}q;d")
+    DEV_PATH=$(echo "$DEV_PATH_NAME" | cut -d' ' -f1)
+    DEV_NAME=$(echo "$DEV_PATH_NAME" | cut -d' ' -f1 --complement)
+    DEV_PRETTY=$(echo "$DEV_NAME (at '$DEV_PATH')")
+    if expr match "$(${FIDO_TOOLS_PREFIX}fido2-token -I $DEV_PATH)" ".* credMgmt.* clientPin.*\|.* clientPin.* credMgmt.*" > /dev/null ; then
+        printf "Enter PIN for $DEV_PRETTY once (ignore further prompts): "
+        stty -echo
+        read PIN
+        stty echo
+        printf "\n"
+        RESIDENT_RPS=$(echo "${PIN}\n" | setsid -w ${FIDO_TOOLS_PREFIX}fido2-token -L -r $DEV_PATH | cut -d' ' -f3)
+        printf "\n"
+        RESIDENT_RPS_COUNT=$(echo "$RESIDENT_RPS" | wc -l)
+        FOUND=0
+        for j in $(seq 1 $DEV_RESIDENT_RPS_COUNT)
+        do
+            RESIDENT_RP=$(echo "$RESIDENT_RPS" | sed "${j}q;d")
+            UNPROT_CREDS=$(echo "${PIN}\n" | setsid -w ${FIDO_TOOLS_PREFIX}fido2-token -L -k $RESIDENT_RP $DEV_PATH | grep ' uvopt$' | cut -d' ' -f2,3,4)
+            printf "\n"
+            UNPROT_CREDS_COUNT=$(echo "$UNPROT_CREDS" | wc -l)
+            if [ $UNPROT_CREDS_COUNT -gt 0 ] ; then
+                FOUND=1
+                echo "Unprotected credentials on $DEV_PRETTY for '$RESIDENT_RP':"
+                echo "$UNPROT_CREDS"
+            fi
+        done
+        if [ $FOUND -eq 0 ] ; then
+            echo "No unprotected credentials on $DEV_PRETTY"
+        fi
+    else
+        echo "$DEV_PRETTY cannot enumerate credentials"
+        echo "Discovering unprotected SSH credentials only..."
+        STUB_HASH=$(echo -n "" | openssl sha256 -binary | base64)
+        printf "$STUB_HASH\nssh:\n" | ${FIDO_TOOLS_PREFIX}fido2-assert -G -r -t up=false $DEV_PATH 2> /dev/null || ASSERT_EXIT_CODE=$?
+        if [ $ASSERT_EXIT_CODE -eq 0 ] ; then
+            echo "Found an unprotected SSH credential on $DEV_PRETTY!"
+        else
+            echo "No unprotected SSH credentials (default settings) on $DEV_PRETTY"
+        fi
+    fi
+    printf "\n"
+done
diff -Nru mysql-8.0-8.0.26/extra/libfido2/tools/include_check.sh mysql-8.0-8.0.27/extra/libfido2/tools/include_check.sh
--- mysql-8.0-8.0.26/extra/libfido2/tools/include_check.sh	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/tools/include_check.sh	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+# Copyright (c) 2019 Yubico AB. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+check() {
+	for f in $(find $1 -maxdepth 1 -name '*.h'); do
+		echo "#include \"$f\"" | \
+			cc $CFLAGS -Isrc -xc -c - -o /dev/null 2>&1
+		echo "$f $CFLAGS $?"
+	done
+}
+
+check examples
+check fuzz
+check openbsd-compat
+CFLAGS="${CFLAGS} -D_FIDO_INTERNAL" check src
+check src/fido.h
+check src/fido
+check tools
diff -Nru mysql-8.0-8.0.26/extra/libfido2/tools/pin.c mysql-8.0-8.0.27/extra/libfido2/tools/pin.c
--- mysql-8.0-8.0.26/extra/libfido2/tools/pin.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/tools/pin.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,146 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <fido.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "../openbsd-compat/openbsd-compat.h"
+#include "extern.h"
+
+int
+pin_set(char *path)
+{
+	fido_dev_t *dev = NULL;
+	char prompt[1024];
+	char pin1[1024];
+	char pin2[1024];
+	int r;
+	int status = 1;
+
+	if (path == NULL)
+		usage();
+
+	dev = open_dev(path);
+
+	r = snprintf(prompt, sizeof(prompt), "Enter new PIN for %s: ", path);
+	if (r < 0 || (size_t)r >= sizeof(prompt)) {
+		warnx("snprintf");
+		goto out;
+	}
+
+	if (!readpassphrase(prompt, pin1, sizeof(pin1), RPP_ECHO_OFF)) {
+		warnx("readpassphrase");
+		goto out;
+	}
+
+	r = snprintf(prompt, sizeof(prompt), "Enter the same PIN again: ");
+	if (r < 0 || (size_t)r >= sizeof(prompt)) {
+		warnx("snprintf");
+		goto out;
+	}
+
+	if (!readpassphrase(prompt, pin2, sizeof(pin2), RPP_ECHO_OFF)) {
+		warnx("readpassphrase");
+		goto out;
+	}
+
+	if (strcmp(pin1, pin2) != 0) {
+		fprintf(stderr, "PINs do not match. Try again.\n");
+		goto out;
+	}
+
+	if ((r = fido_dev_set_pin(dev, pin1, NULL)) != FIDO_OK) {
+		warnx("fido_dev_set_pin: %s", fido_strerr(r));
+		goto out;
+	}
+
+	fido_dev_close(dev);
+	fido_dev_free(&dev);
+
+	status = 0;
+out:
+	explicit_bzero(pin1, sizeof(pin1));
+	explicit_bzero(pin2, sizeof(pin2));
+
+	exit(status);
+}
+
+int
+pin_change(char *path)
+{
+	fido_dev_t *dev = NULL;
+	char prompt[1024];
+	char pin0[1024];
+	char pin1[1024];
+	char pin2[1024];
+	int r;
+	int status = 1;
+
+	if (path == NULL)
+		usage();
+
+	dev = open_dev(path);
+
+	r = snprintf(prompt, sizeof(prompt), "Enter current PIN for %s: ", path);
+	if (r < 0 || (size_t)r >= sizeof(prompt)) {
+		warnx("snprintf");
+		goto out;
+	}
+
+	if (!readpassphrase(prompt, pin0, sizeof(pin0), RPP_ECHO_OFF)) {
+		warnx("readpassphrase");
+		goto out;
+	}
+
+	r = snprintf(prompt, sizeof(prompt), "Enter new PIN for %s: ", path);
+	if (r < 0 || (size_t)r >= sizeof(prompt)) {
+		warnx("snprintf");
+		goto out;
+	}
+
+	if (!readpassphrase(prompt, pin1, sizeof(pin1), RPP_ECHO_OFF)) {
+		warnx("readpassphrase");
+		goto out;
+	}
+
+	r = snprintf(prompt, sizeof(prompt), "Enter the same PIN again: ");
+	if (r < 0 || (size_t)r >= sizeof(prompt)) {
+		warnx("snprintf");
+		goto out;
+	}
+
+	if (!readpassphrase(prompt, pin2, sizeof(pin2), RPP_ECHO_OFF)) {
+		warnx("readpassphrase");
+		goto out;
+	}
+
+	if (strcmp(pin1, pin2) != 0) {
+		fprintf(stderr, "PINs do not match. Try again.\n");
+		goto out;
+	}
+
+	if ((r = fido_dev_set_pin(dev, pin1, pin0)) != FIDO_OK) {
+		warnx("fido_dev_set_pin: %s", fido_strerr(r));
+		goto out;
+	}
+
+	fido_dev_close(dev);
+	fido_dev_free(&dev);
+
+	status = 0;
+out:
+	explicit_bzero(pin0, sizeof(pin0));
+	explicit_bzero(pin1, sizeof(pin1));
+	explicit_bzero(pin2, sizeof(pin2));
+
+	exit(status);
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/tools/test.sh mysql-8.0-8.0.27/extra/libfido2/tools/test.sh
--- mysql-8.0-8.0.26/extra/libfido2/tools/test.sh	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/tools/test.sh	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,96 @@
+#!/bin/bash -e
+#
+# Copyright (c) 2018 Yubico AB. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+if [[ "$#" -ne 1 ]]; then
+	echo "usage: test.sh device" 1>&2
+	exit 1
+fi
+
+read -p "This script will reset the authenticator at $1, permanently erasing "\
+"its credentials. Are you *SURE* you want to proceed (yes/no)? "
+if [[ "${REPLY}" != "yes" ]]; then
+	exit 1
+fi
+
+echo "Resetting authenticator... (tap to continue!)"
+fido2-token -R $1
+
+CRED_PARAM="$(mktemp /tmp/cred_param.XXXXXXXX)"
+ASSERT_PARAM="$(mktemp /tmp/assert_param.XXXXXXXX)"
+ASSERT_PUBKEY="$(mktemp /tmp/assert_pubkey.XXXXXXXX)"
+ES256_CRED="$(mktemp /tmp/es256_cred.XXXXXXX)"
+ES256_CRED_R="$(mktemp /tmp/es256_cred_r.XXXXXXXX)"
+
+cleanup() {
+	echo "Cleaning up..."
+	[[ "${CRED_PARAM}" != "" ]] && rm "${CRED_PARAM}"
+	[[ "${ASSERT_PARAM}" != "" ]] && rm "${ASSERT_PARAM}"
+	[[ "${ASSERT_PUBKEY}" != "" ]] && rm "${ASSERT_PUBKEY}"
+	[[ "${ES256_CRED}" != "" ]] && rm "${ES256_CRED}"
+	[[ "${ES256_CRED_R}" != "" ]] && rm "${ES256_CRED_R}"
+}
+
+trap cleanup EXIT
+
+dd if=/dev/urandom bs=1 count=32 2>/dev/null | base64 > "${CRED_PARAM}"
+echo "Boring Relying Party" >> "${CRED_PARAM}"
+echo "Boring User Name" >> "${CRED_PARAM}"
+dd if=/dev/urandom bs=1 count=32 2>/dev/null | base64 >> "${CRED_PARAM}"
+echo "Credential parameters:"
+cat "${CRED_PARAM}"
+
+echo "Generating non-resident ES256 credential... (tap to continue!)"
+fido2-cred -M -i "${CRED_PARAM}" $1 | fido2-cred -V | tee "${ES256_CRED}"
+echo "Generating resident ES256 credential... (tap to continue!)"
+fido2-cred -M -r -i "${CRED_PARAM}" $1 | fido2-cred -V | tee "${ES256_CRED_R}"
+
+PIN1="$(dd if=/dev/urandom | tr -cd '[:print:]' | fold -w50 | head -1)"
+PIN2="$(dd if=/dev/urandom | tr -cd '[:print:]' | fold -w50 | head -1)"
+
+echo "Setting ${PIN1} as the PIN..."
+echo -e "${PIN1}\n${PIN1}" | setsid -w fido2-token -S $1
+echo "Changing PIN from ${PIN1} to ${PIN2}..."
+echo -e "${PIN1}\n${PIN2}\n${PIN2}" | setsid -w fido2-token -C $1
+echo ""
+
+echo "Testing non-resident ES256 credential..."
+echo "Getting assertion without user presence verification..."
+dd if=/dev/urandom bs=1 count=32 2>/dev/null | base64 > "${ASSERT_PARAM}"
+echo "Boring Relying Party" >> "${ASSERT_PARAM}"
+head -1 "${ES256_CRED}" >> "${ASSERT_PARAM}"
+tail -n +2 "${ES256_CRED}" > "${ASSERT_PUBKEY}"
+echo "Assertion parameters:"
+cat "${ASSERT_PARAM}"
+fido2-assert -G -i "${ASSERT_PARAM}" $1 | fido2-assert -V "${ASSERT_PUBKEY}" 
+echo "Checking that the user presence bit is observed..."
+! fido2-assert -G -i "${ASSERT_PARAM}" $1 | fido2-assert -V -p "${ASSERT_PUBKEY}"
+echo "Checking that the user verification bit is observed..."
+! fido2-assert -G -i "${ASSERT_PARAM}" $1 | fido2-assert -V -v "${ASSERT_PUBKEY}"
+echo "Getting assertion _with_ user presence verification... (tap to continue!)"
+fido2-assert -G -p -i "${ASSERT_PARAM}" $1 | fido2-assert -V -p "${ASSERT_PUBKEY}" 
+echo "Getting assertion  _with_ user verification..."
+echo -e "${PIN2}\n" | setsid -w fido2-assert -G -v -i "${ASSERT_PARAM}" $1 | \
+	fido2-assert -V -v "${ASSERT_PUBKEY}" 
+echo ""
+
+echo "Testing resident ES256 credential..."
+echo "Getting assertion without user presence verification..."
+dd if=/dev/urandom bs=1 count=32 2>/dev/null | base64 > "${ASSERT_PARAM}"
+echo "Boring Relying Party" >> "${ASSERT_PARAM}"
+tail -n +2 "${ES256_CRED_R}" > "${ASSERT_PUBKEY}"
+echo "Assertion parameters:"
+cat "${ASSERT_PARAM}"
+fido2-assert -G -r -i "${ASSERT_PARAM}" $1 | fido2-assert -V "${ASSERT_PUBKEY}" 
+echo "Checking that the user presence bit is observed..."
+! fido2-assert -G -r -i "${ASSERT_PARAM}" $1 | fido2-assert -V -p "${ASSERT_PUBKEY}"
+echo "Checking that the user verification bit is observed..."
+! fido2-assert -G -r -i "${ASSERT_PARAM}" $1 | fido2-assert -V -v "${ASSERT_PUBKEY}"
+echo "Getting assertion _with_ user presence verification... (tap to continue!)"
+fido2-assert -G -r -p -i "${ASSERT_PARAM}" $1 | fido2-assert -V -p "${ASSERT_PUBKEY}" 
+echo "Getting assertion _with_ user verification..."
+echo -e "${PIN2}\n" | setsid -w fido2-assert -G -v -r -i "${ASSERT_PARAM}" $1 | \
+	fido2-assert -V -v "${ASSERT_PUBKEY}" 
+echo ""
diff -Nru mysql-8.0-8.0.26/extra/libfido2/tools/token.c mysql-8.0-8.0.27/extra/libfido2/tools/token.c
--- mysql-8.0-8.0.26/extra/libfido2/tools/token.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/tools/token.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,391 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <fido.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "../openbsd-compat/openbsd-compat.h"
+#include "extern.h"
+
+static void
+format_flags(char *ret, size_t retlen, uint8_t flags)
+{
+	memset(ret, 0, retlen);
+
+	if (flags & FIDO_CAP_WINK) {
+		if (strlcat(ret, "wink,", retlen) >= retlen)
+			goto toolong;
+	} else {
+		if (strlcat(ret, "nowink,", retlen) >= retlen)
+			goto toolong;
+	}
+
+	if (flags & FIDO_CAP_CBOR) {
+		if (strlcat(ret, " cbor,", retlen) >= retlen)
+			goto toolong;
+	} else {
+		if (strlcat(ret, " nocbor,", retlen) >= retlen)
+			goto toolong;
+	}
+
+	if (flags & FIDO_CAP_NMSG) {
+		if (strlcat(ret, " nomsg", retlen) >= retlen)
+			goto toolong;
+	} else {
+		if (strlcat(ret, " msg", retlen) >= retlen)
+			goto toolong;
+	}
+
+	return;
+toolong:
+	strlcpy(ret, "toolong", retlen);
+}
+
+static void
+print_attr(const fido_dev_t *dev)
+{
+	char flags_txt[128];
+
+	printf("proto: 0x%02x\n", fido_dev_protocol(dev));
+	printf("major: 0x%02x\n", fido_dev_major(dev));
+	printf("minor: 0x%02x\n", fido_dev_minor(dev));
+	printf("build: 0x%02x\n", fido_dev_build(dev));
+
+	format_flags(flags_txt, sizeof(flags_txt), fido_dev_flags(dev));
+	printf("caps: 0x%02x (%s)\n", fido_dev_flags(dev), flags_txt);
+}
+
+static void
+print_str_array(const char *label, char * const *sa, size_t len)
+{
+	if (len == 0)
+		return;
+
+	printf("%s strings: ", label);
+
+	for (size_t i = 0; i < len; i++)
+		printf("%s%s", i > 0 ? ", " : "", sa[i]);
+
+	printf("\n");
+}
+
+static void
+print_opt_array(const char *label, char * const *name, const bool *value,
+    size_t len)
+{
+	if (len == 0)
+		return;
+
+	printf("%s: ", label);
+
+	for (size_t i = 0; i < len; i++)
+		printf("%s%s%s", i > 0 ? ", " : "",
+		    value[i] ? "" : "no", name[i]);
+
+	printf("\n");
+}
+
+static void
+print_aaguid(const unsigned char *buf, size_t buflen)
+{
+	printf("aaguid: ");
+
+	while (buflen--)
+		printf("%02x", *buf++);
+
+	printf("\n");
+}
+
+static void
+print_maxmsgsiz(uint64_t maxmsgsiz)
+{
+	printf("maxmsgsiz: %d\n", (int)maxmsgsiz);
+}
+
+static void
+print_maxcredcntlst(uint64_t maxcredcntlst)
+{
+	printf("maxcredcntlst: %d\n", (int)maxcredcntlst);
+}
+
+static void
+print_maxcredidlen(uint64_t maxcredidlen)
+{
+	printf("maxcredlen: %d\n", (int)maxcredidlen);
+}
+
+static void
+print_fwversion(uint64_t fwversion)
+{
+	printf("fwversion: 0x%x\n", (int)fwversion);
+}
+
+static void
+print_byte_array(const char *label, const uint8_t *ba, size_t len)
+{
+	if (len == 0)
+		return;
+
+	printf("%s: ", label);
+
+	for (size_t i = 0; i < len; i++)
+		printf("%s%u", i > 0 ? ", " : "", (unsigned)ba[i]);
+
+	printf("\n");
+}
+
+int
+token_info(int argc, char **argv, char *path)
+{
+	char			*cred_id = NULL;
+	char			*rp_id = NULL;
+	fido_cbor_info_t	*ci = NULL;
+	fido_dev_t		*dev = NULL;
+	int			 ch;
+	int			 credman = 0;
+	int			 r;
+	int			 retrycnt;
+
+	optind = 1;
+
+	while ((ch = getopt(argc, argv, TOKEN_OPT)) != -1) {
+		switch (ch) {
+		case 'c':
+			credman = 1;
+			break;
+		case 'i':
+			cred_id = optarg;
+			break;
+		case 'k':
+			rp_id = optarg;
+			break;
+		default:
+			break; /* ignore */
+		}
+	}
+
+	if (path == NULL || (credman && (cred_id != NULL || rp_id != NULL)))
+		usage();
+
+	dev = open_dev(path);
+
+	if (credman)
+		return (credman_get_metadata(dev, path));
+	if (cred_id && rp_id)
+		return (credman_print_rk(dev, path, rp_id, cred_id));
+	if (cred_id || rp_id)
+		usage();
+
+	print_attr(dev);
+
+	if (fido_dev_is_fido2(dev) == false)
+		goto end;
+	if ((ci = fido_cbor_info_new()) == NULL)
+		errx(1, "fido_cbor_info_new");
+	if ((r = fido_dev_get_cbor_info(dev, ci)) != FIDO_OK)
+		errx(1, "fido_dev_get_cbor_info: %s (0x%x)", fido_strerr(r), r);
+
+	/* print supported protocol versions */
+	print_str_array("version", fido_cbor_info_versions_ptr(ci),
+	    fido_cbor_info_versions_len(ci));
+
+	/* print supported extensions */
+	print_str_array("extension", fido_cbor_info_extensions_ptr(ci),
+	    fido_cbor_info_extensions_len(ci));
+
+	/* print aaguid */
+	print_aaguid(fido_cbor_info_aaguid_ptr(ci),
+	    fido_cbor_info_aaguid_len(ci));
+
+	/* print supported options */
+	print_opt_array("options", fido_cbor_info_options_name_ptr(ci),
+	    fido_cbor_info_options_value_ptr(ci),
+	    fido_cbor_info_options_len(ci));
+
+	/* print maximum message size */
+	print_maxmsgsiz(fido_cbor_info_maxmsgsiz(ci));
+
+	/* print maximum number of credentials allowed in credential lists */
+	print_maxcredcntlst(fido_cbor_info_maxcredcntlst(ci));
+
+	/* print maximum length of a credential ID */
+	print_maxcredidlen(fido_cbor_info_maxcredidlen(ci));
+
+	/* print firmware version */
+	print_fwversion(fido_cbor_info_fwversion(ci));
+
+	/* print supported pin protocols */
+	print_byte_array("pin protocols", fido_cbor_info_protocols_ptr(ci),
+	    fido_cbor_info_protocols_len(ci));
+
+	if (fido_dev_get_retry_count(dev, &retrycnt) != FIDO_OK)
+		printf("pin retries: undefined\n");
+	else
+		printf("pin retries: %d\n", retrycnt);
+
+	bio_info(dev);
+
+	fido_cbor_info_free(&ci);
+end:
+	fido_dev_close(dev);
+	fido_dev_free(&dev);
+
+	exit(0);
+}
+
+int
+token_reset(char *path)
+{
+	fido_dev_t *dev = NULL;
+	int r;
+
+	if (path == NULL)
+		usage();
+
+	dev = open_dev(path);
+	if ((r = fido_dev_reset(dev)) != FIDO_OK)
+		errx(1, "fido_dev_reset: %s", fido_strerr(r));
+
+	fido_dev_close(dev);
+	fido_dev_free(&dev);
+
+	exit(0);
+}
+
+int
+token_set(int argc, char **argv, char *path)
+{
+	char	*id = NULL;
+	char	*name = NULL;
+	int	 ch;
+	int	 enroll = 0;
+
+	optind = 1;
+
+	while ((ch = getopt(argc, argv, TOKEN_OPT)) != -1) {
+		switch (ch) {
+		case 'e':
+			enroll = 1;
+			break;
+		case 'i':
+			id = optarg;
+			break;
+		case 'n':
+			name = optarg;
+			break;
+		default:
+			break; /* ignore */
+		}
+	}
+
+	if (enroll) {
+		if (id && name)
+			return (bio_set_name(path, id, name));
+		if (!id && !name)
+			return (bio_enroll(path));
+		usage();
+	}
+
+	return (pin_set(path));
+}
+
+int
+token_list(int argc, char **argv, char *path)
+{
+	fido_dev_info_t *devlist;
+	size_t ndevs;
+	const char *rp_id = NULL;
+	int enrolls = 0;
+	int keys = 0;
+	int rplist = 0;
+	int ch;
+	int r;
+
+	optind = 1;
+
+	while ((ch = getopt(argc, argv, TOKEN_OPT)) != -1) {
+		switch (ch) {
+		case 'e':
+			enrolls = 1;
+			break;
+		case 'k':
+			keys = 1;
+			rp_id = optarg;
+			break;
+		case 'r':
+			rplist = 1;
+			break;
+		default:
+			break; /* ignore */
+		}
+	}
+
+	if (enrolls)
+		return (bio_list(path));
+	if (keys)
+		return (credman_list_rk(path, rp_id));
+	if (rplist)
+		return (credman_list_rp(path));
+
+	if ((devlist = fido_dev_info_new(64)) == NULL)
+		errx(1, "fido_dev_info_new");
+	if ((r = fido_dev_info_manifest(devlist, 64, &ndevs)) != FIDO_OK)
+		errx(1, "fido_dev_info_manifest: %s (0x%x)", fido_strerr(r), r);
+
+	for (size_t i = 0; i < ndevs; i++) {
+		const fido_dev_info_t *di = fido_dev_info_ptr(devlist, i);
+		printf("%s: vendor=0x%04x, product=0x%04x (%s %s)\n",
+		    fido_dev_info_path(di),
+		    (uint16_t)fido_dev_info_vendor(di),
+		    (uint16_t)fido_dev_info_product(di),
+		    fido_dev_info_manufacturer_string(di),
+		    fido_dev_info_product_string(di));
+	}
+
+	fido_dev_info_free(&devlist, ndevs);
+
+	exit(0);
+}
+
+int
+token_delete(int argc, char **argv, char *path)
+{
+	char		*id = NULL;
+	fido_dev_t	*dev = NULL;
+	int		 ch;
+	int		 enroll = 0;
+
+	optind = 1;
+
+	while ((ch = getopt(argc, argv, TOKEN_OPT)) != -1) {
+		switch (ch) {
+		case 'e':
+			enroll = 1;
+			break;
+		case 'i':
+			id = optarg;
+			break;
+		default:
+			break; /* ignore */
+		}
+	}
+
+	if (path == NULL || id == NULL)
+		usage();
+
+	dev = open_dev(path);
+
+	if (id && !enroll)
+		return (credman_delete_rk(dev, path, id));
+
+	return (bio_delete(dev, path, id));
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/tools/util.c mysql-8.0-8.0.27/extra/libfido2/tools/util.c
--- mysql-8.0-8.0.26/extra/libfido2/tools/util.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/tools/util.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,432 @@
+/*
+ * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <openssl/ec.h>
+#include <openssl/evp.h>
+#include <openssl/pem.h>
+
+#include <fido.h>
+#include <fido/es256.h>
+#include <fido/rs256.h>
+#include <fido/eddsa.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "../openbsd-compat/openbsd-compat.h"
+#ifdef _MSC_VER
+#include "../openbsd-compat/posix_win.h"
+#endif
+
+#include "extern.h"
+
+void
+read_pin(const char *path, char *buf, size_t len)
+{
+	char prompt[1024];
+	int r;
+
+	r = snprintf(prompt, sizeof(prompt), "Enter PIN for %s: ", path);
+	if (r < 0 || (size_t)r >= sizeof(prompt))
+		errx(1, "snprintf");
+	if (!readpassphrase(prompt, buf, len, RPP_ECHO_OFF))
+		errx(1, "readpassphrase");
+}
+
+FILE *
+open_write(const char *file)
+{
+	int fd;
+	FILE *f;
+
+	if (file == NULL || strcmp(file, "-") == 0)
+		return (stdout);
+	if ((fd = open(file, O_WRONLY | O_CREAT, 0600)) < 0)
+		err(1, "open %s", file);
+	if ((f = fdopen(fd, "w")) == NULL)
+		err(1, "fdopen %s", file);
+
+	return (f);
+}
+
+FILE *
+open_read(const char *file)
+{
+	int fd;
+	FILE *f;
+
+	if (file == NULL || strcmp(file, "-") == 0) {
+#ifdef FIDO_FUZZ
+		setvbuf(stdin, NULL, _IONBF, 0);
+#endif
+		return (stdin);
+	}
+	if ((fd = open(file, O_RDONLY)) < 0)
+		err(1, "open %s", file);
+	if ((f = fdopen(fd, "r")) == NULL)
+		err(1, "fdopen %s", file);
+
+	return (f);
+}
+
+int
+base10(const char *str)
+{
+	char *ep;
+	long long ll;
+
+	ll = strtoll(str, &ep, 10);
+	if (str == ep || *ep != '\0')
+		return (-1);
+	else if (ll == LLONG_MIN && errno == ERANGE)
+		return (-1);
+	else if (ll == LLONG_MAX && errno == ERANGE)
+		return (-1);
+	else if (ll < 0 || ll > INT_MAX)
+		return (-1);
+
+	return ((int)ll);
+}
+
+void
+xxd(const void *buf, size_t count)
+{
+	const uint8_t	*ptr = buf;
+	size_t		 i;
+
+	fprintf(stderr, "  ");
+
+	for (i = 0; i < count; i++) {
+		fprintf(stderr, "%02x ", *ptr++);
+		if ((i + 1) % 16 == 0 && i + 1 < count)
+			fprintf(stderr, "\n  ");
+	}
+
+	fprintf(stderr, "\n");
+	fflush(stderr);
+}
+
+int
+string_read(FILE *f, char **out)
+{
+	char *line = NULL;
+	size_t linesize = 0;
+	ssize_t n;
+
+	*out = NULL;
+
+	if ((n = getline(&line, &linesize, f)) <= 0 ||
+	    (size_t)n != strlen(line)) {
+		free(line);
+		return (-1);
+	}
+
+	line[n - 1] = '\0'; /* trim \n */
+	*out = line;
+
+	return (0);
+}
+
+fido_dev_t *
+open_dev(const char *path)
+{
+	fido_dev_t *dev;
+	int r;
+
+	if ((dev = fido_dev_new()) == NULL)
+		errx(1, "fido_dev_new");
+
+	r = fido_dev_open(dev, path);
+	if (r != FIDO_OK)
+		errx(1, "fido_dev_open %s: %s", path, fido_strerr(r));
+
+	return (dev);
+}
+
+EC_KEY *
+read_ec_pubkey(const char *path)
+{
+	FILE *fp = NULL;
+	EVP_PKEY *pkey = NULL;
+	EC_KEY *ec = NULL;
+
+	if ((fp = fopen(path, "r")) == NULL) {
+		warn("fopen");
+		goto fail;
+	}
+
+	if ((pkey = PEM_read_PUBKEY(fp, NULL, NULL, NULL)) == NULL) {
+		warnx("PEM_read_PUBKEY");
+		goto fail;
+	}
+	if ((ec = EVP_PKEY_get1_EC_KEY(pkey)) == NULL) {
+		warnx("EVP_PKEY_get1_EC_KEY");
+		goto fail;
+	}
+
+fail:
+	if (fp) {
+		fclose(fp);
+	}
+	if (pkey) {
+		EVP_PKEY_free(pkey);
+	}
+
+	return (ec);
+}
+
+int
+write_ec_pubkey(FILE *f, const void *ptr, size_t len)
+{
+	EVP_PKEY *pkey = NULL;
+	es256_pk_t *pk = NULL;
+	int ok = -1;
+
+	if ((pk = es256_pk_new()) == NULL) {
+		warnx("es256_pk_new");
+		goto fail;
+	}
+
+	if (es256_pk_from_ptr(pk, ptr, len) != FIDO_OK) {
+		warnx("es256_pk_from_ptr");
+		goto fail;
+	}
+
+	if ((pkey = es256_pk_to_EVP_PKEY(pk)) == NULL) {
+		warnx("es256_pk_to_EVP_PKEY");
+		goto fail;
+	}
+
+	if (PEM_write_PUBKEY(f, pkey) == 0) {
+		warnx("PEM_write_PUBKEY");
+		goto fail;
+	}
+
+	ok = 0;
+fail:
+	es256_pk_free(&pk);
+
+	if (pkey != NULL) {
+		EVP_PKEY_free(pkey);
+	}
+
+	return (ok);
+}
+
+RSA *
+read_rsa_pubkey(const char *path)
+{
+	FILE *fp = NULL;
+	EVP_PKEY *pkey = NULL;
+	RSA *rsa = NULL;
+
+	if ((fp = fopen(path, "r")) == NULL) {
+		warn("fopen");
+		goto fail;
+	}
+
+	if ((pkey = PEM_read_PUBKEY(fp, NULL, NULL, NULL)) == NULL) {
+		warnx("PEM_read_PUBKEY");
+		goto fail;
+	}
+	if ((rsa = EVP_PKEY_get1_RSA(pkey)) == NULL) {
+		warnx("EVP_PKEY_get1_RSA");
+		goto fail;
+	}
+
+fail:
+	if (fp) {
+		fclose(fp);
+	}
+	if (pkey) {
+		EVP_PKEY_free(pkey);
+	}
+
+	return (rsa);
+}
+
+int
+write_rsa_pubkey(FILE *f, const void *ptr, size_t len)
+{
+	EVP_PKEY *pkey = NULL;
+	rs256_pk_t *pk = NULL;
+	int ok = -1;
+
+	if ((pk = rs256_pk_new()) == NULL) {
+		warnx("rs256_pk_new");
+		goto fail;
+	}
+
+	if (rs256_pk_from_ptr(pk, ptr, len) != FIDO_OK) {
+		warnx("rs256_pk_from_ptr");
+		goto fail;
+	}
+
+	if ((pkey = rs256_pk_to_EVP_PKEY(pk)) == NULL) {
+		warnx("rs256_pk_to_EVP_PKEY");
+		goto fail;
+	}
+
+	if (PEM_write_PUBKEY(f, pkey) == 0) {
+		warnx("PEM_write_PUBKEY");
+		goto fail;
+	}
+
+	ok = 0;
+fail:
+	rs256_pk_free(&pk);
+
+	if (pkey != NULL) {
+		EVP_PKEY_free(pkey);
+	}
+
+	return (ok);
+}
+
+EVP_PKEY *
+read_eddsa_pubkey(const char *path)
+{
+	FILE *fp = NULL;
+	EVP_PKEY *pkey = NULL;
+
+	if ((fp = fopen(path, "r")) == NULL) {
+		warn("fopen");
+		goto fail;
+	}
+
+	if ((pkey = PEM_read_PUBKEY(fp, NULL, NULL, NULL)) == NULL) {
+		warnx("PEM_read_PUBKEY");
+		goto fail;
+	}
+
+fail:
+	if (fp) {
+		fclose(fp);
+	}
+
+	return (pkey);
+}
+
+int
+write_eddsa_pubkey(FILE *f, const void *ptr, size_t len)
+{
+	EVP_PKEY *pkey = NULL;
+	eddsa_pk_t *pk = NULL;
+	int ok = -1;
+
+	if ((pk = eddsa_pk_new()) == NULL) {
+		warnx("eddsa_pk_new");
+		goto fail;
+	}
+
+	if (eddsa_pk_from_ptr(pk, ptr, len) != FIDO_OK) {
+		warnx("eddsa_pk_from_ptr");
+		goto fail;
+	}
+
+	if ((pkey = eddsa_pk_to_EVP_PKEY(pk)) == NULL) {
+		warnx("eddsa_pk_to_EVP_PKEY");
+		goto fail;
+	}
+
+	if (PEM_write_PUBKEY(f, pkey) == 0) {
+		warnx("PEM_write_PUBKEY");
+		goto fail;
+	}
+
+	ok = 0;
+fail:
+	eddsa_pk_free(&pk);
+
+	if (pkey != NULL) {
+		EVP_PKEY_free(pkey);
+	}
+
+	return (ok);
+}
+
+void
+print_cred(FILE *out_f, int type, const fido_cred_t *cred)
+{
+	char *id;
+	int r;
+
+	r = base64_encode(fido_cred_id_ptr(cred), fido_cred_id_len(cred), &id);
+	if (r < 0)
+		errx(1, "output error");
+
+	fprintf(out_f, "%s\n", id);
+
+	if (type == COSE_ES256) {
+		write_ec_pubkey(out_f, fido_cred_pubkey_ptr(cred),
+		    fido_cred_pubkey_len(cred));
+	} else if (type == COSE_RS256) {
+		write_rsa_pubkey(out_f, fido_cred_pubkey_ptr(cred),
+		    fido_cred_pubkey_len(cred));
+	} else if (type == COSE_EDDSA) {
+		write_eddsa_pubkey(out_f, fido_cred_pubkey_ptr(cred),
+		    fido_cred_pubkey_len(cred));
+	} else {
+		errx(1, "print_cred: unknown type");
+	}
+
+	free(id);
+}
+
+int
+cose_type(const char *str, int *type)
+{
+	if (strcmp(str, "es256") == 0)
+		*type = COSE_ES256;
+	else if (strcmp(str, "rs256") == 0)
+		*type = COSE_RS256;
+	else if (strcmp(str, "eddsa") == 0)
+		*type = COSE_EDDSA;
+	else {
+		*type = 0;
+		return (-1);
+	}
+
+	return (0);
+}
+
+const char *
+cose_string(int type)
+{
+	switch (type) {
+	case COSE_EDDSA:
+		return ("eddsa");
+	case COSE_ES256:
+		return ("es256");
+	case COSE_RS256:
+		return ("rs256");
+	default:
+		return ("unknown");
+	}
+}
+
+const char *
+prot_string(int prot)
+{
+	switch (prot) {
+	case FIDO_CRED_PROT_UV_OPTIONAL:
+		return ("uvopt");
+	case FIDO_CRED_PROT_UV_OPTIONAL_WITH_ID:
+		return ("uvopt+id");
+	case FIDO_CRED_PROT_UV_REQUIRED:
+		return ("uvreq");
+	default:
+		return ("unknown");
+	}
+}
diff -Nru mysql-8.0-8.0.26/extra/libfido2/udev/70-u2f.rules mysql-8.0-8.0.27/extra/libfido2/udev/70-u2f.rules
--- mysql-8.0-8.0.26/extra/libfido2/udev/70-u2f.rules	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/udev/70-u2f.rules	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,175 @@
+# Copyright (c) 2020 Yubico AB. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+# This file is automatically generated, and should
+# be used with udev 188 or newer.
+
+ACTION!="add|change", GOTO="fido_end"
+
+# ellipticSecure MIRKey by STMicroelectronics
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="a2ac", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# Unknown product by STMicroelectronics
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="a2ca", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# Unknown product by STMicroelectronics
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="cdab", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# Infineon FIDO by Infineon Technologies
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="058b", ATTRS{idProduct}=="022d", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# Kensington VeriMark by Synaptics Inc.
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="06cb", ATTRS{idProduct}=="0088", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# FS ePass FIDO by Feitian Technologies Co., Ltd.
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="096e", ATTRS{idProduct}=="0850", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# Unknown product by Feitian Technologies Co., Ltd.
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="096e", ATTRS{idProduct}=="0852", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# Unknown product by Feitian Technologies Co., Ltd.
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="096e", ATTRS{idProduct}=="0853", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# Unknown product by Feitian Technologies Co., Ltd.
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="096e", ATTRS{idProduct}=="0854", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# Unknown product by Feitian Technologies Co., Ltd.
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="096e", ATTRS{idProduct}=="0856", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# Unknown product by Feitian Technologies Co., Ltd.
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="096e", ATTRS{idProduct}=="0858", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# FS MultiPass FIDO U2F by Feitian Technologies Co., Ltd.
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="096e", ATTRS{idProduct}=="085a", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# Unknown product by Feitian Technologies Co., Ltd.
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="096e", ATTRS{idProduct}=="085b", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# Unknown product by Feitian Technologies Co., Ltd.
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="096e", ATTRS{idProduct}=="085d", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# Hypersecu HyperFIDO by Feitian Technologies Co., Ltd.
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="096e", ATTRS{idProduct}=="0880", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# YubiKey NEO FIDO by Yubico AB
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0113", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# YubiKey NEO OTP+FIDO by Yubico AB
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0114", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# YubiKey NEO FIDO+CCID by Yubico AB
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0115", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# YubiKey NEO OTP+FIDO+CCID by Yubico AB
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0116", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# Security Key by Yubico by Yubico AB
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0120", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# Unknown product by Yubico AB
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0121", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# Gnubby U2F by Yubico AB
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0200", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# YubiKey 4 FIDO by Yubico AB
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0402", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# YubiKey 4 OTP+FIDO by Yubico AB
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0403", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# YubiKey 4 FIDO+CCID by Yubico AB
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0406", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# YubiKey 4 OTP+FIDO+CCID by Yubico AB
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0407", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# YubiKey Plus by Yubico AB
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0410", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# U2F Zero by Silicon Laboratories, Inc.
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="10c4", ATTRS{idProduct}=="8acf", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# SoloKeys SoloHacker by pid.codes
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="5070", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# SoloKeys SoloBoot by pid.codes
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="50b0", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# SatoshiLabs TREZOR by pid.codes
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="53c1", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# Google Titan U2F by Google Inc.
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="18d1", ATTRS{idProduct}=="5026", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# VASCO SecureClick by VASCO Data Security NV
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1a44", ATTRS{idProduct}=="00bb", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# OnlyKey (FIDO2/U2F) by OpenMoko, Inc.
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1d50", ATTRS{idProduct}=="60fc", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# Neowave Keydo AES by NEOWAVE
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1e0d", ATTRS{idProduct}=="f1ae", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# Neowave Keydo by NEOWAVE
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1e0d", ATTRS{idProduct}=="f1d0", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# Thethis Key by Shenzhen Excelsecu Data Technology Co., Ltd.
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1ea8", ATTRS{idProduct}=="f025", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# ExcelSecu FIDO2 Security Key by Shenzhen Excelsecu Data Technology Co., Ltd.
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1ea8", ATTRS{idProduct}=="fc25", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# GoTrust Idem Key by NXP Semiconductors
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1fc9", ATTRS{idProduct}=="f143", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# Nitrokey FIDO U2F by Flirc
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="4287", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# Nitrokey FIDO2 by Flirc
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="42b1", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# Safetech SafeKey by Flirc
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="42b3", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# JaCarta U2F by Aladdin Software Security R.D.
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="24dc", ATTRS{idProduct}=="0101", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# JaCarta U2F by Aladdin Software Security R.D.
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="24dc", ATTRS{idProduct}=="0501", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# Happlink Security Key by Plug�up
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="2581", ATTRS{idProduct}=="f1d0", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# Bluink Key by Bluink Ltd
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="2abe", ATTRS{idProduct}=="1002", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# Ledger Nano S by LEDGER
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="2c97", ATTRS{idProduct}=="0001", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# Ledger Nano X by LEDGER
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="2c97", ATTRS{idProduct}=="0004", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# Hypersecu HyperFIDO by Hypersecu Information Systems, Inc.
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="2ccf", ATTRS{idProduct}=="0880", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# eWBM FIDO2 Goldengate 310 by eWBM Co., Ltd.
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="311f", ATTRS{idProduct}=="4a1a", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# eWBM FIDO2 Goldengate 320 by eWBM Co., Ltd.
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="311f", ATTRS{idProduct}=="4c2a", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# eWBM FIDO2 Goldengate 500 by eWBM Co., Ltd.
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="311f", ATTRS{idProduct}=="5c2f", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# eWBM FIDO2 Goldengate 450 by eWBM Co., Ltd.
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="311f", ATTRS{idProduct}=="f47c", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# Longmai mFIDO by Unknown vendor
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="4c4d", ATTRS{idProduct}=="f703", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+# SatoshiLabs TREZOR by SatoshiLabs
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="534c", ATTRS{idProduct}=="0001", TAG+="uaccess", GROUP="plugdev", MODE="0660"
+
+LABEL="fido_end"
diff -Nru mysql-8.0-8.0.26/extra/libfido2/udev/check.sh mysql-8.0-8.0.27/extra/libfido2/udev/check.sh
--- mysql-8.0-8.0.26/extra/libfido2/udev/check.sh	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/udev/check.sh	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,31 @@
+#!/bin/sh -u
+
+# Copyright (c) 2020 Yubico AB. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+sort_by_id() {
+	awk '{ printf "%d\n", $3 }' | sort -Cnu
+}
+
+if ! grep '^vendor' "$1" | sort_by_id; then
+	echo unsorted vendor section 1>&2
+	exit 1
+fi
+
+VENDORS=$(grep '^vendor' "$1" | awk '{ print $2 }')
+PRODUCTS=$(grep '^product' "$1" | awk '{ print $2 }' | uniq)
+
+if [ "${VENDORS}" != "${PRODUCTS}" ]; then
+	echo vendors: "$(echo "${VENDORS}" | tr '\n' ',')" 1>&2
+	echo products: "$(echo "${PRODUCTS}" | tr '\n' ',')" 1>&2
+	echo vendors and products in different order 1>&2
+	exit 2
+fi
+
+for v in ${VENDORS}; do
+	if ! grep "^product ${v}" "$1" | sort_by_id; then
+		echo "${v}": unsorted product section 1>&2
+		exit 3
+	fi
+done
diff -Nru mysql-8.0-8.0.26/extra/libfido2/udev/CMakeLists.txt mysql-8.0-8.0.27/extra/libfido2/udev/CMakeLists.txt
--- mysql-8.0-8.0.26/extra/libfido2/udev/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/udev/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,7 @@
+# Copyright (c) 2018 Yubico AB. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+if(UDEV_RULES_DIR)
+	install(FILES 70-u2f.rules DESTINATION ${UDEV_RULES_DIR})
+endif()
diff -Nru mysql-8.0-8.0.26/extra/libfido2/udev/fidodevs mysql-8.0-8.0.27/extra/libfido2/udev/fidodevs
--- mysql-8.0-8.0.26/extra/libfido2/udev/fidodevs	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/udev/fidodevs	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,110 @@
+# Copyright (c) 2020 Yubico AB. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+# After modifying this file, regenerate 70-u2f.rules:
+# ./genrules.awk fidodevs > 70-u2f.rules
+
+# List of known vendors. Sorted by vendor ID.
+
+vendor STMICRO		0x0483	STMicroelectronics
+vendor INFINEON		0x058b	Infineon Technologies
+vendor SYNAPTICS	0x06cb	Synaptics Inc.
+vendor FEITIAN		0x096e	Feitian Technologies Co., Ltd.
+vendor YUBICO		0x1050	Yubico AB
+vendor SILICON		0x10c4	Silicon Laboratories, Inc.
+vendor PIDCODES		0x1209	pid.codes
+vendor GOOGLE		0x18d1	Google Inc.
+vendor VASCO		0x1a44	VASCO Data Security NV
+vendor OPENMOKO		0x1d50	OpenMoko, Inc.
+vendor NEOWAVE		0x1e0d	NEOWAVE
+vendor EXCELSECU	0x1ea8	Shenzhen Excelsecu Data Technology Co., Ltd.
+vendor NXP		0x1fc9	NXP Semiconductors
+vendor FLIRC		0x20a0	Flirc
+vendor ALLADIN		0x24dc	Aladdin Software Security R.D.
+vendor PLUGUP		0x2581	Plug�up
+vendor BLUINK		0x2abe	Bluink Ltd
+vendor LEDGER		0x2c97	LEDGER
+vendor HYPERSECU	0x2ccf	Hypersecu Information Systems, Inc.
+vendor EWBM		0x311f	eWBM Co., Ltd.
+vendor UNKNOWN1		0x4c4d	Unknown vendor
+vendor SATOSHI		0x534c	SatoshiLabs
+
+# List of known products. Grouped by vendor; sorted by product ID.
+
+product STMICRO 	0xa2ac	ellipticSecure MIRKey
+product STMICRO 	0xa2ca	Unknown product
+product STMICRO		0xcdab	Unknown product
+
+product INFINEON	0x022d	Infineon FIDO
+
+product SYNAPTICS	0x0088	Kensington VeriMark
+
+product FEITIAN		0x0850	FS ePass FIDO
+product FEITIAN		0x0852	Unknown product
+product FEITIAN		0x0853	Unknown product
+product FEITIAN		0x0854	Unknown product
+product FEITIAN		0x0856	Unknown product
+product FEITIAN		0x0858	Unknown product
+product FEITIAN		0x085a	FS MultiPass FIDO U2F
+product FEITIAN		0x085b	Unknown product
+product FEITIAN		0x085d	Unknown product
+product FEITIAN		0x0880	Hypersecu HyperFIDO
+
+product YUBICO		0x0113	YubiKey NEO FIDO
+product YUBICO		0x0114	YubiKey NEO OTP+FIDO
+product YUBICO		0x0115	YubiKey NEO FIDO+CCID
+product YUBICO		0x0116	YubiKey NEO OTP+FIDO+CCID
+product YUBICO		0x0120	Security Key by Yubico
+product YUBICO		0x0121	Unknown product
+product YUBICO		0x0200	Gnubby U2F
+product YUBICO		0x0402	YubiKey 4 FIDO
+product YUBICO		0x0403	YubiKey 4 OTP+FIDO
+product YUBICO		0x0406	YubiKey 4 FIDO+CCID
+product YUBICO		0x0407	YubiKey 4 OTP+FIDO+CCID
+product YUBICO		0x0410	YubiKey Plus
+
+product SILICON		0x8acf	U2F Zero
+
+product PIDCODES	0x5070	SoloKeys SoloHacker
+product PIDCODES	0x50b0	SoloKeys SoloBoot
+product PIDCODES	0x53c1	SatoshiLabs TREZOR
+
+product GOOGLE		0x5026	Google Titan U2F
+
+product VASCO		0x00bb	VASCO SecureClick
+
+product OPENMOKO	0x60fc	OnlyKey (FIDO2/U2F)
+
+product NEOWAVE		0xf1ae	Neowave Keydo AES
+product NEOWAVE		0xf1d0	Neowave Keydo
+
+product EXCELSECU	0xf025	Thethis Key
+product EXCELSECU	0xfc25	ExcelSecu FIDO2 Security Key
+
+product NXP		0xf143	GoTrust Idem Key
+
+product FLIRC		0x4287	Nitrokey FIDO U2F
+product FLIRC		0x42b1	Nitrokey FIDO2
+product FLIRC		0x42b3	Safetech SafeKey
+
+product ALLADIN		0x0101	JaCarta U2F
+product ALLADIN		0x0501	JaCarta U2F
+
+product PLUGUP		0xf1d0	Happlink Security Key
+
+product BLUINK		0x1002	Bluink Key
+
+product LEDGER		0x0001	Ledger Nano S
+product LEDGER		0x0004	Ledger Nano X
+
+product HYPERSECU	0x0880	Hypersecu HyperFIDO
+
+product EWBM		0x4a1a	eWBM FIDO2 Goldengate 310
+product EWBM		0x4c2a	eWBM FIDO2 Goldengate 320
+product EWBM		0x5c2f	eWBM FIDO2 Goldengate 500
+product EWBM		0xf47c	eWBM FIDO2 Goldengate 450
+
+product UNKNOWN1	0xf703	Longmai mFIDO
+
+product SATOSHI		0x0001	SatoshiLabs TREZOR
diff -Nru mysql-8.0-8.0.26/extra/libfido2/udev/genrules.awk mysql-8.0-8.0.27/extra/libfido2/udev/genrules.awk
--- mysql-8.0-8.0.26/extra/libfido2/udev/genrules.awk	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/libfido2/udev/genrules.awk	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,55 @@
+#!/usr/bin/awk -f
+
+# Copyright (c) 2020 Yubico AB. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+NR == 1 {
+	print "# Copyright (c) 2020 Yubico AB. All rights reserved."
+	print "# Use of this source code is governed by a BSD-style"
+	print "# license that can be found in the LICENSE file."
+	print ""
+	print "# This file is automatically generated, and should"
+	print "# be used with udev 188 or newer."
+	print ""
+	print "ACTION!=\"add|change\", GOTO=\"fido_end\""
+
+	next
+}
+
+$1 == "vendor" {
+	sub("0x", "", $3)
+	vendors[$2, "id"] = $3
+
+	f = 4
+	while (f <= NF) {
+		vendors[$2, "name"] = vendors[$2, "name"] " " $f
+		f++
+	}
+}
+
+$1 == "product" {
+	sub("0x", "", $3)
+	name = ""
+
+	f = 4
+	while (f <= NF) {
+		name = name " " $f
+		f++
+	}
+
+	line = "\n#" name " by" vendors[$2, "name"]"\n"
+	line = line"KERNEL==\"hidraw*\""
+	line = line", SUBSYSTEM==\"hidraw\""
+	line = line", ATTRS{idVendor}==\""vendors[$2, "id"]"\""
+	line = line", ATTRS{idProduct}==\""$3"\""
+	line = line", TAG+=\"uaccess\""
+	line = line", GROUP=\"plugdev\""
+	line = line", MODE=\"0660\""
+
+	print line
+}
+
+END {
+	print "\nLABEL=\"fido_end\""
+}
diff -Nru mysql-8.0-8.0.26/extra/lz4/lz4-1.9.3/lz4.c mysql-8.0-8.0.27/extra/lz4/lz4-1.9.3/lz4.c
--- mysql-8.0-8.0.26/extra/lz4/lz4-1.9.3/lz4.c	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/lz4/lz4-1.9.3/lz4.c	2021-09-28 11:46:34.000000000 +0000
@@ -115,6 +115,7 @@
 
 #define LZ4_STATIC_LINKING_ONLY  /* LZ4_DISTANCE_MAX */
 #include "lz4.h"
+#include "my_compiler.h"
 /* see also "memory routines" below */
 
 
@@ -860,6 +861,7 @@
                  const dict_directive dictDirective,
                  const dictIssue_directive dictIssue,
                  const int acceleration)
+SUPPRESS_UBSAN_CLANG10
 {
     int result;
     const BYTE* ip = (const BYTE*) source;
@@ -1566,6 +1568,7 @@
                                 const char* source, char* dest,
                                 int inputSize, int maxOutputSize,
                                 int acceleration)
+SUPPRESS_UBSAN_CLANG10
 {
     const tableType_t tableType = byU32;
     LZ4_stream_t_internal* streamPtr = &LZ4_stream->internal_donotuse;
diff -Nru mysql-8.0-8.0.26/extra/lz4/lz4-1.9.3/lz4frame.c mysql-8.0-8.0.27/extra/lz4/lz4-1.9.3/lz4frame.c
--- mysql-8.0-8.0.26/extra/lz4/lz4-1.9.3/lz4frame.c	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/lz4/lz4-1.9.3/lz4frame.c	2021-09-28 11:46:34.000000000 +0000
@@ -96,6 +96,7 @@
 #define XXH_STATIC_LINKING_ONLY
 #include "xxhash.h"
 
+#include "my_compiler.h"
 
 /*-************************************
 *  Debug
@@ -826,6 +827,7 @@
                            void* dstBuffer, size_t dstCapacity,
                      const void* srcBuffer, size_t srcSize,
                      const LZ4F_compressOptions_t* compressOptionsPtr)
+SUPPRESS_UBSAN_CLANG10
 {
     LZ4F_compressOptions_t cOptionsNull;
     size_t const blockSize = cctxPtr->maxBlockSize;
diff -Nru mysql-8.0-8.0.26/extra/lz4/lz4-1.9.3/lz4hc.c mysql-8.0-8.0.27/extra/lz4/lz4-1.9.3/lz4hc.c
--- mysql-8.0-8.0.26/extra/lz4/lz4-1.9.3/lz4hc.c	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/lz4/lz4-1.9.3/lz4hc.c	2021-09-28 11:46:34.000000000 +0000
@@ -51,7 +51,7 @@
 /*===    Dependency    ===*/
 #define LZ4_HC_STATIC_LINKING_ONLY
 #include "lz4hc.h"
-
+#include "my_compiler.h"
 
 /*===   Common definitions   ===*/
 #if defined(__GNUC__)
@@ -1025,6 +1025,7 @@
 }
 
 void LZ4_resetStreamHC_fast (LZ4_streamHC_t* LZ4_streamHCPtr, int compressionLevel)
+SUPPRESS_UBSAN_CLANG10
 {
     DEBUGLOG(4, "LZ4_resetStreamHC_fast(%p, %d)", LZ4_streamHCPtr, compressionLevel);
     if (LZ4_streamHCPtr->internal_donotuse.dirty) {
diff -Nru mysql-8.0-8.0.26/extra/protobuf/CMakeLists.txt mysql-8.0-8.0.27/extra/protobuf/CMakeLists.txt
--- mysql-8.0-8.0.26/extra/protobuf/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/protobuf/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -78,6 +78,11 @@
   STRING_APPEND(CMAKE_CXX_FLAGS " ${HAS_WARN_FLAG}")
 ENDIF()
 
+MY_CHECK_CXX_COMPILER_WARNING("-Wstringop-overflow" HAS_WARN_FLAG)
+IF(HAS_WARN_FLAG)
+  STRING_APPEND(CMAKE_CXX_FLAGS " ${HAS_WARN_FLAG}")
+ENDIF()
+
 SET(protobuf_BUILD_TESTS OFF CACHE INTERNAL "")
 SET(protobuf_BUILD_EXAMPLES OFF CACHE INTERNAL "")
 SET(protobuf_BUILD_SHARED_LIBS ON CACHE INTERNAL "")
diff -Nru mysql-8.0-8.0.26/extra/protobuf/protobuf-3.11.4/cmake/CMakeLists.txt mysql-8.0-8.0.27/extra/protobuf/protobuf-3.11.4/cmake/CMakeLists.txt
--- mysql-8.0-8.0.26/extra/protobuf/protobuf-3.11.4/cmake/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/protobuf/protobuf-3.11.4/cmake/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -23,18 +23,16 @@
 if (CYGWIN)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
 else()
-  ### cmake 3.9.1 does not understand that Developer Studio understands C++14
-  IF(NOT SOLARIS)
-    # https://developercommunity.visualstudio.com/content/problem/665343/
-    # vs2019-stl-with-clang-cl-and-stdc14-generates-dupl.html
-    IF(WIN32_CLANG)
-      set(CMAKE_CXX_STANDARD 17)
-    ELSE()
-      set(CMAKE_CXX_STANDARD 14)
-    ENDIF()
-    set(CMAKE_CXX_STANDARD_REQUIRED ON)
-    set(CMAKE_CXX_EXTENSIONS OFF)
+  # https://developercommunity.visualstudio.com/content/problem/665343/
+  # vs2019-stl-with-clang-cl-and-stdc14-generates-dupl.html
+  IF(WIN32_CLANG)
+    set(CMAKE_CXX_STANDARD 17)
+  ELSE()
+    # Not all cmake versions support 17 here, so leave it at 14.
+    set(CMAKE_CXX_STANDARD 14)
   ENDIF()
+  set(CMAKE_CXX_STANDARD_REQUIRED ON)
+  set(CMAKE_CXX_EXTENSIONS OFF)
 endif()
 
 # Options
diff -Nru mysql-8.0-8.0.26/extra/protobuf/protobuf-3.11.4/cmake/libprotoc.cmake mysql-8.0-8.0.27/extra/protobuf/protobuf-3.11.4/cmake/libprotoc.cmake
--- mysql-8.0-8.0.26/extra/protobuf/protobuf-3.11.4/cmake/libprotoc.cmake	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/protobuf/protobuf-3.11.4/cmake/libprotoc.cmake	2021-09-28 11:46:34.000000000 +0000
@@ -165,16 +165,8 @@
 )
 endif()
 
-### The custom command using xprotocol_plugin hangs on solaris if
-### libprotoc is a shared library.
-### TODO: should we make it STATIC on all platforms?
-IF(SOLARIS)
-  add_library(libprotoc STATIC
-    ${libprotoc_files} ${libprotoc_headers})
-ELSE()
-  add_library(libprotoc ${protobuf_SHARED_OR_STATIC}
-    ${libprotoc_files} ${libprotoc_headers} ${libprotoc_rc_files})
-ENDIF()
+add_library(libprotoc ${protobuf_SHARED_OR_STATIC}
+  ${libprotoc_files} ${libprotoc_headers} ${libprotoc_rc_files})
 
 target_link_libraries(libprotoc libprotobuf)
 if(MSVC AND protobuf_BUILD_SHARED_LIBS)
@@ -190,7 +182,7 @@
 add_library(protobuf::libprotoc ALIAS libprotoc)
 
 ###
-IF(protobuf_BUILD_SHARED_LIBS AND NOT SOLARIS)
+IF(protobuf_BUILD_SHARED_LIBS)
   SET_TARGET_PROPERTIES(libprotoc PROPERTIES
     DEBUG_POSTFIX ""
     LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/library_output_directory
diff -Nru mysql-8.0-8.0.26/extra/zstd/CMakeLists.txt mysql-8.0-8.0.27/extra/zstd/CMakeLists.txt
--- mysql-8.0-8.0.26/extra/zstd/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -11,42 +11,43 @@
 # CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9)
 
 SET(ZSTD_SRCS
-  lib/common/debug.c
-  lib/common/entropy_common.c
-  lib/common/error_private.c
-  lib/common/fse_decompress.c
-  lib/common/pool.c
-  lib/common/threading.c
-  lib/common/xxhash.c
-  lib/common/zstd_common.c
-  lib/compress/fse_compress.c
-  lib/compress/hist.c
-  lib/compress/huf_compress.c
-  lib/compress/zstd_compress.c
-  lib/compress/zstd_compress_literals.c
-  lib/compress/zstd_compress_sequences.c
-  lib/compress/zstd_double_fast.c
-  lib/compress/zstd_fast.c
-  lib/compress/zstd_lazy.c
-  lib/compress/zstd_ldm.c
-  lib/compress/zstdmt_compress.c
-  lib/compress/zstd_opt.c
-  lib/decompress/huf_decompress.c
-  lib/decompress/zstd_ddict.c
-  lib/decompress/zstd_decompress_block.c
-  lib/decompress/zstd_decompress.c
-  lib/deprecated/zbuff_common.c
-  lib/deprecated/zbuff_compress.c
-  lib/deprecated/zbuff_decompress.c
-  lib/dictBuilder/cover.c
-  lib/dictBuilder/divsufsort.c
-  lib/dictBuilder/fastcover.c
-  lib/dictBuilder/zdict.c
+  ${ZSTD_VERSION_DIR}/lib/common/debug.c
+  ${ZSTD_VERSION_DIR}/lib/common/entropy_common.c
+  ${ZSTD_VERSION_DIR}/lib/common/error_private.c
+  ${ZSTD_VERSION_DIR}/lib/common/fse_decompress.c
+  ${ZSTD_VERSION_DIR}/lib/common/pool.c
+  ${ZSTD_VERSION_DIR}/lib/common/threading.c
+  ${ZSTD_VERSION_DIR}/lib/common/xxhash.c
+  ${ZSTD_VERSION_DIR}/lib/common/zstd_common.c
+
+  ${ZSTD_VERSION_DIR}/lib/compress/fse_compress.c
+  ${ZSTD_VERSION_DIR}/lib/compress/hist.c
+  ${ZSTD_VERSION_DIR}/lib/compress/huf_compress.c
+  ${ZSTD_VERSION_DIR}/lib/compress/zstd_compress.c
+  ${ZSTD_VERSION_DIR}/lib/compress/zstd_compress_literals.c
+  ${ZSTD_VERSION_DIR}/lib/compress/zstd_compress_sequences.c
+  ${ZSTD_VERSION_DIR}/lib/compress/zstd_compress_superblock.c
+  ${ZSTD_VERSION_DIR}/lib/compress/zstd_double_fast.c
+  ${ZSTD_VERSION_DIR}/lib/compress/zstd_fast.c
+  ${ZSTD_VERSION_DIR}/lib/compress/zstd_lazy.c
+  ${ZSTD_VERSION_DIR}/lib/compress/zstd_ldm.c
+  ${ZSTD_VERSION_DIR}/lib/compress/zstdmt_compress.c
+  ${ZSTD_VERSION_DIR}/lib/compress/zstd_opt.c
+
+  ${ZSTD_VERSION_DIR}/lib/decompress/huf_decompress.c
+  ${ZSTD_VERSION_DIR}/lib/decompress/zstd_ddict.c
+  ${ZSTD_VERSION_DIR}/lib/decompress/zstd_decompress_block.c
+  ${ZSTD_VERSION_DIR}/lib/decompress/zstd_decompress.c
+
+  ${ZSTD_VERSION_DIR}/lib/dictBuilder/cover.c
+  ${ZSTD_VERSION_DIR}/lib/dictBuilder/divsufsort.c
+  ${ZSTD_VERSION_DIR}/lib/dictBuilder/fastcover.c
+  ${ZSTD_VERSION_DIR}/lib/dictBuilder/zdict.c
 )
 
 ADD_CONVENIENCE_LIBRARY(zstd
   ${ZSTD_SRCS}
-  INCLUDE_DIRECTORIES lib/common
+  INCLUDE_DIRECTORIES ${ZSTD_VERSION_DIR}/lib/common
   )
 
 MY_CHECK_CXX_COMPILER_WARNING("-Wmissing-profile" HAS_MISSING_PROFILE)
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/common/bitstream.h mysql-8.0-8.0.27/extra/zstd/lib/common/bitstream.h
--- mysql-8.0-8.0.26/extra/zstd/lib/common/bitstream.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/common/bitstream.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,459 +0,0 @@
-/* ******************************************************************
-   bitstream
-   Part of FSE library
-   Copyright (C) 2013-present, Yann Collet.
-
-   BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are
-   met:
-
-       * Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-       * Redistributions in binary form must reproduce the above
-   copyright notice, this list of conditions and the following disclaimer
-   in the documentation and/or other materials provided with the
-   distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-   You can contact the author at :
-   - Source repository : https://github.com/Cyan4973/FiniteStateEntropy
-****************************************************************** */
-#ifndef BITSTREAM_H_MODULE
-#define BITSTREAM_H_MODULE
-
-#if defined (__cplusplus)
-extern "C" {
-#endif
-
-/*
-*  This API consists of small unitary functions, which must be inlined for best performance.
-*  Since link-time-optimization is not available for all compilers,
-*  these functions are defined into a .h to be included.
-*/
-
-/*-****************************************
-*  Dependencies
-******************************************/
-#include "mem.h"            /* unaligned access routines */
-#include "debug.h"          /* assert(), DEBUGLOG(), RAWLOG() */
-#include "error_private.h"  /* error codes and messages */
-
-
-/*=========================================
-*  Target specific
-=========================================*/
-#if defined(__BMI__) && defined(__GNUC__)
-#  include <immintrin.h>   /* support for bextr (experimental) */
-#elif defined(__ICCARM__)
-#  include <intrinsics.h>
-#endif
-
-#define STREAM_ACCUMULATOR_MIN_32  25
-#define STREAM_ACCUMULATOR_MIN_64  57
-#define STREAM_ACCUMULATOR_MIN    ((U32)(MEM_32bits() ? STREAM_ACCUMULATOR_MIN_32 : STREAM_ACCUMULATOR_MIN_64))
-
-
-/*-******************************************
-*  bitStream encoding API (write forward)
-********************************************/
-/* bitStream can mix input from multiple sources.
- * A critical property of these streams is that they encode and decode in **reverse** direction.
- * So the first bit sequence you add will be the last to be read, like a LIFO stack.
- */
-typedef struct {
-    size_t bitContainer;
-    unsigned bitPos;
-    char*  startPtr;
-    char*  ptr;
-    char*  endPtr;
-} BIT_CStream_t;
-
-MEM_STATIC size_t BIT_initCStream(BIT_CStream_t* bitC, void* dstBuffer, size_t dstCapacity);
-MEM_STATIC void   BIT_addBits(BIT_CStream_t* bitC, size_t value, unsigned nbBits);
-MEM_STATIC void   BIT_flushBits(BIT_CStream_t* bitC);
-MEM_STATIC size_t BIT_closeCStream(BIT_CStream_t* bitC);
-
-/* Start with initCStream, providing the size of buffer to write into.
-*  bitStream will never write outside of this buffer.
-*  `dstCapacity` must be >= sizeof(bitD->bitContainer), otherwise @return will be an error code.
-*
-*  bits are first added to a local register.
-*  Local register is size_t, hence 64-bits on 64-bits systems, or 32-bits on 32-bits systems.
-*  Writing data into memory is an explicit operation, performed by the flushBits function.
-*  Hence keep track how many bits are potentially stored into local register to avoid register overflow.
-*  After a flushBits, a maximum of 7 bits might still be stored into local register.
-*
-*  Avoid storing elements of more than 24 bits if you want compatibility with 32-bits bitstream readers.
-*
-*  Last operation is to close the bitStream.
-*  The function returns the final size of CStream in bytes.
-*  If data couldn't fit into `dstBuffer`, it will return a 0 ( == not storable)
-*/
-
-
-/*-********************************************
-*  bitStream decoding API (read backward)
-**********************************************/
-typedef struct {
-    size_t   bitContainer;
-    unsigned bitsConsumed;
-    const char* ptr;
-    const char* start;
-    const char* limitPtr;
-} BIT_DStream_t;
-
-typedef enum { BIT_DStream_unfinished = 0,
-               BIT_DStream_endOfBuffer = 1,
-               BIT_DStream_completed = 2,
-               BIT_DStream_overflow = 3 } BIT_DStream_status;  /* result of BIT_reloadDStream() */
-               /* 1,2,4,8 would be better for bitmap combinations, but slows down performance a bit ... :( */
-
-MEM_STATIC size_t   BIT_initDStream(BIT_DStream_t* bitD, const void* srcBuffer, size_t srcSize);
-MEM_STATIC size_t   BIT_readBits(BIT_DStream_t* bitD, unsigned nbBits);
-MEM_STATIC BIT_DStream_status BIT_reloadDStream(BIT_DStream_t* bitD);
-MEM_STATIC unsigned BIT_endOfDStream(const BIT_DStream_t* bitD);
-
-
-/* Start by invoking BIT_initDStream().
-*  A chunk of the bitStream is then stored into a local register.
-*  Local register size is 64-bits on 64-bits systems, 32-bits on 32-bits systems (size_t).
-*  You can then retrieve bitFields stored into the local register, **in reverse order**.
-*  Local register is explicitly reloaded from memory by the BIT_reloadDStream() method.
-*  A reload guarantee a minimum of ((8*sizeof(bitD->bitContainer))-7) bits when its result is BIT_DStream_unfinished.
-*  Otherwise, it can be less than that, so proceed accordingly.
-*  Checking if DStream has reached its end can be performed with BIT_endOfDStream().
-*/
-
-
-/*-****************************************
-*  unsafe API
-******************************************/
-MEM_STATIC void BIT_addBitsFast(BIT_CStream_t* bitC, size_t value, unsigned nbBits);
-/* faster, but works only if value is "clean", meaning all high bits above nbBits are 0 */
-
-MEM_STATIC void BIT_flushBitsFast(BIT_CStream_t* bitC);
-/* unsafe version; does not check buffer overflow */
-
-MEM_STATIC size_t BIT_readBitsFast(BIT_DStream_t* bitD, unsigned nbBits);
-/* faster, but works only if nbBits >= 1 */
-
-
-
-/*-**************************************************************
-*  Internal functions
-****************************************************************/
-MEM_STATIC unsigned BIT_highbit32 (U32 val)
-{
-    assert(val != 0);
-    {
-#   if defined(_MSC_VER)   /* Visual */
-        unsigned long r=0;
-        _BitScanReverse ( &r, val );
-        return (unsigned) r;
-#   elif defined(__GNUC__) && (__GNUC__ >= 3)   /* Use GCC Intrinsic */
-        return 31 - __builtin_clz (val);
-#   elif defined(__ICCARM__)    /* IAR Intrinsic */
-        return 31 - __CLZ(val);
-#   else   /* Software version */
-        static const unsigned DeBruijnClz[32] = { 0,  9,  1, 10, 13, 21,  2, 29,
-                                                 11, 14, 16, 18, 22, 25,  3, 30,
-                                                  8, 12, 20, 28, 15, 17, 24,  7,
-                                                 19, 27, 23,  6, 26,  5,  4, 31 };
-        U32 v = val;
-        v |= v >> 1;
-        v |= v >> 2;
-        v |= v >> 4;
-        v |= v >> 8;
-        v |= v >> 16;
-        return DeBruijnClz[ (U32) (v * 0x07C4ACDDU) >> 27];
-#   endif
-    }
-}
-
-/*=====    Local Constants   =====*/
-static const unsigned BIT_mask[] = {
-    0,          1,         3,         7,         0xF,       0x1F,
-    0x3F,       0x7F,      0xFF,      0x1FF,     0x3FF,     0x7FF,
-    0xFFF,      0x1FFF,    0x3FFF,    0x7FFF,    0xFFFF,    0x1FFFF,
-    0x3FFFF,    0x7FFFF,   0xFFFFF,   0x1FFFFF,  0x3FFFFF,  0x7FFFFF,
-    0xFFFFFF,   0x1FFFFFF, 0x3FFFFFF, 0x7FFFFFF, 0xFFFFFFF, 0x1FFFFFFF,
-    0x3FFFFFFF, 0x7FFFFFFF}; /* up to 31 bits */
-#define BIT_MASK_SIZE (sizeof(BIT_mask) / sizeof(BIT_mask[0]))
-
-/*-**************************************************************
-*  bitStream encoding
-****************************************************************/
-/*! BIT_initCStream() :
- *  `dstCapacity` must be > sizeof(size_t)
- *  @return : 0 if success,
- *            otherwise an error code (can be tested using ERR_isError()) */
-MEM_STATIC size_t BIT_initCStream(BIT_CStream_t* bitC,
-                                  void* startPtr, size_t dstCapacity)
-{
-    bitC->bitContainer = 0;
-    bitC->bitPos = 0;
-    bitC->startPtr = (char*)startPtr;
-    bitC->ptr = bitC->startPtr;
-    bitC->endPtr = bitC->startPtr + dstCapacity - sizeof(bitC->bitContainer);
-    if (dstCapacity <= sizeof(bitC->bitContainer)) return ERROR(dstSize_tooSmall);
-    return 0;
-}
-
-/*! BIT_addBits() :
- *  can add up to 31 bits into `bitC`.
- *  Note : does not check for register overflow ! */
-MEM_STATIC void BIT_addBits(BIT_CStream_t* bitC,
-                            size_t value, unsigned nbBits)
-{
-    MEM_STATIC_ASSERT(BIT_MASK_SIZE == 32);
-    assert(nbBits < BIT_MASK_SIZE);
-    assert(nbBits + bitC->bitPos < sizeof(bitC->bitContainer) * 8);
-    bitC->bitContainer |= (value & BIT_mask[nbBits]) << bitC->bitPos;
-    bitC->bitPos += nbBits;
-}
-
-/*! BIT_addBitsFast() :
- *  works only if `value` is _clean_,
- *  meaning all high bits above nbBits are 0 */
-MEM_STATIC void BIT_addBitsFast(BIT_CStream_t* bitC,
-                                size_t value, unsigned nbBits)
-{
-    assert((value>>nbBits) == 0);
-    assert(nbBits + bitC->bitPos < sizeof(bitC->bitContainer) * 8);
-    bitC->bitContainer |= value << bitC->bitPos;
-    bitC->bitPos += nbBits;
-}
-
-/*! BIT_flushBitsFast() :
- *  assumption : bitContainer has not overflowed
- *  unsafe version; does not check buffer overflow */
-MEM_STATIC void BIT_flushBitsFast(BIT_CStream_t* bitC)
-{
-    size_t const nbBytes = bitC->bitPos >> 3;
-    assert(bitC->bitPos < sizeof(bitC->bitContainer) * 8);
-    MEM_writeLEST(bitC->ptr, bitC->bitContainer);
-    bitC->ptr += nbBytes;
-    assert(bitC->ptr <= bitC->endPtr);
-    bitC->bitPos &= 7;
-    bitC->bitContainer >>= nbBytes*8;
-}
-
-/*! BIT_flushBits() :
- *  assumption : bitContainer has not overflowed
- *  safe version; check for buffer overflow, and prevents it.
- *  note : does not signal buffer overflow.
- *  overflow will be revealed later on using BIT_closeCStream() */
-MEM_STATIC void BIT_flushBits(BIT_CStream_t* bitC)
-{
-    size_t const nbBytes = bitC->bitPos >> 3;
-    assert(bitC->bitPos < sizeof(bitC->bitContainer) * 8);
-    MEM_writeLEST(bitC->ptr, bitC->bitContainer);
-    bitC->ptr += nbBytes;
-    if (bitC->ptr > bitC->endPtr) bitC->ptr = bitC->endPtr;
-    bitC->bitPos &= 7;
-    bitC->bitContainer >>= nbBytes*8;
-}
-
-/*! BIT_closeCStream() :
- *  @return : size of CStream, in bytes,
- *            or 0 if it could not fit into dstBuffer */
-MEM_STATIC size_t BIT_closeCStream(BIT_CStream_t* bitC)
-{
-    BIT_addBitsFast(bitC, 1, 1);   /* endMark */
-    BIT_flushBits(bitC);
-    if (bitC->ptr >= bitC->endPtr) return 0; /* overflow detected */
-    return (bitC->ptr - bitC->startPtr) + (bitC->bitPos > 0);
-}
-
-
-/*-********************************************************
-*  bitStream decoding
-**********************************************************/
-/*! BIT_initDStream() :
- *  Initialize a BIT_DStream_t.
- * `bitD` : a pointer to an already allocated BIT_DStream_t structure.
- * `srcSize` must be the *exact* size of the bitStream, in bytes.
- * @return : size of stream (== srcSize), or an errorCode if a problem is detected
- */
-MEM_STATIC size_t BIT_initDStream(BIT_DStream_t* bitD, const void* srcBuffer, size_t srcSize)
-{
-    if (srcSize < 1) { memset(bitD, 0, sizeof(*bitD)); return ERROR(srcSize_wrong); }
-
-    bitD->start = (const char*)srcBuffer;
-    bitD->limitPtr = bitD->start + sizeof(bitD->bitContainer);
-
-    if (srcSize >=  sizeof(bitD->bitContainer)) {  /* normal case */
-        bitD->ptr   = (const char*)srcBuffer + srcSize - sizeof(bitD->bitContainer);
-        bitD->bitContainer = MEM_readLEST(bitD->ptr);
-        { BYTE const lastByte = ((const BYTE*)srcBuffer)[srcSize-1];
-          bitD->bitsConsumed = lastByte ? 8 - BIT_highbit32(lastByte) : 0;  /* ensures bitsConsumed is always set */
-          if (lastByte == 0) return ERROR(GENERIC); /* endMark not present */ }
-    } else {
-        bitD->ptr   = bitD->start;
-        bitD->bitContainer = *(const BYTE*)(bitD->start);
-        switch(srcSize)
-        {
-        case 7: bitD->bitContainer += (size_t)(((const BYTE*)(srcBuffer))[6]) << (sizeof(bitD->bitContainer)*8 - 16);
-                /* fall-through */
-
-        case 6: bitD->bitContainer += (size_t)(((const BYTE*)(srcBuffer))[5]) << (sizeof(bitD->bitContainer)*8 - 24);
-                /* fall-through */
-
-        case 5: bitD->bitContainer += (size_t)(((const BYTE*)(srcBuffer))[4]) << (sizeof(bitD->bitContainer)*8 - 32);
-                /* fall-through */
-
-        case 4: bitD->bitContainer += (size_t)(((const BYTE*)(srcBuffer))[3]) << 24;
-                /* fall-through */
-
-        case 3: bitD->bitContainer += (size_t)(((const BYTE*)(srcBuffer))[2]) << 16;
-                /* fall-through */
-
-        case 2: bitD->bitContainer += (size_t)(((const BYTE*)(srcBuffer))[1]) <<  8;
-                /* fall-through */
-
-        default: break;
-        }
-        {   BYTE const lastByte = ((const BYTE*)srcBuffer)[srcSize-1];
-            bitD->bitsConsumed = lastByte ? 8 - BIT_highbit32(lastByte) : 0;
-            if (lastByte == 0) return ERROR(corruption_detected);  /* endMark not present */
-        }
-        bitD->bitsConsumed += (U32)(sizeof(bitD->bitContainer) - srcSize)*8;
-    }
-
-    return srcSize;
-}
-
-MEM_STATIC size_t BIT_getUpperBits(size_t bitContainer, U32 const start)
-{
-    return bitContainer >> start;
-}
-
-MEM_STATIC size_t BIT_getMiddleBits(size_t bitContainer, U32 const start, U32 const nbBits)
-{
-    U32 const regMask = sizeof(bitContainer)*8 - 1;
-    /* if start > regMask, bitstream is corrupted, and result is undefined */
-    assert(nbBits < BIT_MASK_SIZE);
-    return (bitContainer >> (start & regMask)) & BIT_mask[nbBits];
-}
-
-MEM_STATIC size_t BIT_getLowerBits(size_t bitContainer, U32 const nbBits)
-{
-    assert(nbBits < BIT_MASK_SIZE);
-    return bitContainer & BIT_mask[nbBits];
-}
-
-/*! BIT_lookBits() :
- *  Provides next n bits from local register.
- *  local register is not modified.
- *  On 32-bits, maxNbBits==24.
- *  On 64-bits, maxNbBits==56.
- * @return : value extracted */
-MEM_STATIC size_t BIT_lookBits(const BIT_DStream_t* bitD, U32 nbBits)
-{
-    /* arbitrate between double-shift and shift+mask */
-#if 1
-    /* if bitD->bitsConsumed + nbBits > sizeof(bitD->bitContainer)*8,
-     * bitstream is likely corrupted, and result is undefined */
-    return BIT_getMiddleBits(bitD->bitContainer, (sizeof(bitD->bitContainer)*8) - bitD->bitsConsumed - nbBits, nbBits);
-#else
-    /* this code path is slower on my os-x laptop */
-    U32 const regMask = sizeof(bitD->bitContainer)*8 - 1;
-    return ((bitD->bitContainer << (bitD->bitsConsumed & regMask)) >> 1) >> ((regMask-nbBits) & regMask);
-#endif
-}
-
-/*! BIT_lookBitsFast() :
- *  unsafe version; only works if nbBits >= 1 */
-MEM_STATIC size_t BIT_lookBitsFast(const BIT_DStream_t* bitD, U32 nbBits)
-{
-    U32 const regMask = sizeof(bitD->bitContainer)*8 - 1;
-    assert(nbBits >= 1);
-    return (bitD->bitContainer << (bitD->bitsConsumed & regMask)) >> (((regMask+1)-nbBits) & regMask);
-}
-
-MEM_STATIC void BIT_skipBits(BIT_DStream_t* bitD, U32 nbBits)
-{
-    bitD->bitsConsumed += nbBits;
-}
-
-/*! BIT_readBits() :
- *  Read (consume) next n bits from local register and update.
- *  Pay attention to not read more than nbBits contained into local register.
- * @return : extracted value. */
-MEM_STATIC size_t BIT_readBits(BIT_DStream_t* bitD, unsigned nbBits)
-{
-    size_t const value = BIT_lookBits(bitD, nbBits);
-    BIT_skipBits(bitD, nbBits);
-    return value;
-}
-
-/*! BIT_readBitsFast() :
- *  unsafe version; only works only if nbBits >= 1 */
-MEM_STATIC size_t BIT_readBitsFast(BIT_DStream_t* bitD, unsigned nbBits)
-{
-    size_t const value = BIT_lookBitsFast(bitD, nbBits);
-    assert(nbBits >= 1);
-    BIT_skipBits(bitD, nbBits);
-    return value;
-}
-
-/*! BIT_reloadDStream() :
- *  Refill `bitD` from buffer previously set in BIT_initDStream() .
- *  This function is safe, it guarantees it will not read beyond src buffer.
- * @return : status of `BIT_DStream_t` internal register.
- *           when status == BIT_DStream_unfinished, internal register is filled with at least 25 or 57 bits */
-MEM_STATIC BIT_DStream_status BIT_reloadDStream(BIT_DStream_t* bitD)
-{
-    if (bitD->bitsConsumed > (sizeof(bitD->bitContainer)*8))  /* overflow detected, like end of stream */
-        return BIT_DStream_overflow;
-
-    if (bitD->ptr >= bitD->limitPtr) {
-        bitD->ptr -= bitD->bitsConsumed >> 3;
-        bitD->bitsConsumed &= 7;
-        bitD->bitContainer = MEM_readLEST(bitD->ptr);
-        return BIT_DStream_unfinished;
-    }
-    if (bitD->ptr == bitD->start) {
-        if (bitD->bitsConsumed < sizeof(bitD->bitContainer)*8) return BIT_DStream_endOfBuffer;
-        return BIT_DStream_completed;
-    }
-    /* start < ptr < limitPtr */
-    {   U32 nbBytes = bitD->bitsConsumed >> 3;
-        BIT_DStream_status result = BIT_DStream_unfinished;
-        if (bitD->ptr - nbBytes < bitD->start) {
-            nbBytes = (U32)(bitD->ptr - bitD->start);  /* ptr > start */
-            result = BIT_DStream_endOfBuffer;
-        }
-        bitD->ptr -= nbBytes;
-        bitD->bitsConsumed -= nbBytes*8;
-        bitD->bitContainer = MEM_readLEST(bitD->ptr);   /* reminder : srcSize > sizeof(bitD->bitContainer), otherwise bitD->ptr == bitD->start */
-        return result;
-    }
-}
-
-/*! BIT_endOfDStream() :
- * @return : 1 if DStream has _exactly_ reached its end (all bits consumed).
- */
-MEM_STATIC unsigned BIT_endOfDStream(const BIT_DStream_t* DStream)
-{
-    return ((DStream->ptr == DStream->start) && (DStream->bitsConsumed == sizeof(DStream->bitContainer)*8));
-}
-
-#if defined (__cplusplus)
-}
-#endif
-
-#endif /* BITSTREAM_H_MODULE */
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/common/compiler.h mysql-8.0-8.0.27/extra/zstd/lib/common/compiler.h
--- mysql-8.0-8.0.26/extra/zstd/lib/common/compiler.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/common/compiler.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,147 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
-#ifndef ZSTD_COMPILER_H
-#define ZSTD_COMPILER_H
-
-/*-*******************************************************
-*  Compiler specifics
-*********************************************************/
-/* force inlining */
-
-#if !defined(ZSTD_NO_INLINE)
-#if defined (__GNUC__) || defined(__cplusplus) || defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L   /* C99 */
-#  define INLINE_KEYWORD inline
-#else
-#  define INLINE_KEYWORD
-#endif
-
-#if defined(__GNUC__) || defined(__ICCARM__)
-#  define FORCE_INLINE_ATTR __attribute__((always_inline))
-#elif defined(_MSC_VER)
-#  define FORCE_INLINE_ATTR __forceinline
-#else
-#  define FORCE_INLINE_ATTR
-#endif
-
-#else
-
-#define INLINE_KEYWORD
-#define FORCE_INLINE_ATTR
-
-#endif
-
-/**
- * FORCE_INLINE_TEMPLATE is used to define C "templates", which take constant
- * parameters. They must be inlined for the compiler to eliminate the constant
- * branches.
- */
-#define FORCE_INLINE_TEMPLATE static INLINE_KEYWORD FORCE_INLINE_ATTR
-/**
- * HINT_INLINE is used to help the compiler generate better code. It is *not*
- * used for "templates", so it can be tweaked based on the compilers
- * performance.
- *
- * gcc-4.8 and gcc-4.9 have been shown to benefit from leaving off the
- * always_inline attribute.
- *
- * clang up to 5.0.0 (trunk) benefit tremendously from the always_inline
- * attribute.
- */
-#if !defined(__clang__) && defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 8 && __GNUC__ < 5
-#  define HINT_INLINE static INLINE_KEYWORD
-#else
-#  define HINT_INLINE static INLINE_KEYWORD FORCE_INLINE_ATTR
-#endif
-
-/* force no inlining */
-#ifdef _MSC_VER
-#  define FORCE_NOINLINE static __declspec(noinline)
-#else
-#  if defined(__GNUC__) || defined(__ICCARM__)
-#    define FORCE_NOINLINE static __attribute__((__noinline__))
-#  else
-#    define FORCE_NOINLINE static
-#  endif
-#endif
-
-/* target attribute */
-#ifndef __has_attribute
-  #define __has_attribute(x) 0  /* Compatibility with non-clang compilers. */
-#endif
-#if defined(__GNUC__) || defined(__ICCARM__)
-#  define TARGET_ATTRIBUTE(target) __attribute__((__target__(target)))
-#else
-#  define TARGET_ATTRIBUTE(target)
-#endif
-
-/* Enable runtime BMI2 dispatch based on the CPU.
- * Enabled for clang & gcc >=4.8 on x86 when BMI2 isn't enabled by default.
- */
-#ifndef DYNAMIC_BMI2
-  #if ((defined(__clang__) && __has_attribute(__target__)) \
-      || (defined(__GNUC__) \
-          && (__GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)))) \
-      && (defined(__x86_64__) || defined(_M_X86)) \
-      && !defined(__BMI2__)
-  #  define DYNAMIC_BMI2 1
-  #else
-  #  define DYNAMIC_BMI2 0
-  #endif
-#endif
-
-/* prefetch
- * can be disabled, by declaring NO_PREFETCH build macro */
-#if defined(NO_PREFETCH)
-#  define PREFETCH_L1(ptr)  (void)(ptr)  /* disabled */
-#  define PREFETCH_L2(ptr)  (void)(ptr)  /* disabled */
-#else
-#  if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_I86))  /* _mm_prefetch() is not defined outside of x86/x64 */
-#    include <mmintrin.h>   /* https://msdn.microsoft.com/fr-fr/library/84szxsww(v=vs.90).aspx */
-#    define PREFETCH_L1(ptr)  _mm_prefetch((const char*)(ptr), _MM_HINT_T0)
-#    define PREFETCH_L2(ptr)  _mm_prefetch((const char*)(ptr), _MM_HINT_T1)
-#  elif defined(__GNUC__) && ( (__GNUC__ >= 4) || ( (__GNUC__ == 3) && (__GNUC_MINOR__ >= 1) ) )
-#    define PREFETCH_L1(ptr)  __builtin_prefetch((ptr), 0 /* rw==read */, 3 /* locality */)
-#    define PREFETCH_L2(ptr)  __builtin_prefetch((ptr), 0 /* rw==read */, 2 /* locality */)
-#  else
-#    define PREFETCH_L1(ptr) (void)(ptr)  /* disabled */
-#    define PREFETCH_L2(ptr) (void)(ptr)  /* disabled */
-#  endif
-#endif  /* NO_PREFETCH */
-
-#define CACHELINE_SIZE 64
-
-#define PREFETCH_AREA(p, s)  {            \
-    const char* const _ptr = (const char*)(p);  \
-    size_t const _size = (size_t)(s);     \
-    size_t _pos;                          \
-    for (_pos=0; _pos<_size; _pos+=CACHELINE_SIZE) {  \
-        PREFETCH_L2(_ptr + _pos);         \
-    }                                     \
-}
-
-/* vectorization */
-#if !defined(__clang__) && defined(__GNUC__)
-#  define DONT_VECTORIZE __attribute__((optimize("no-tree-vectorize")))
-#else
-#  define DONT_VECTORIZE
-#endif
-
-/* disable warnings */
-#ifdef _MSC_VER    /* Visual Studio */
-#  include <intrin.h>                    /* For Visual 2005 */
-#  pragma warning(disable : 4100)        /* disable: C4100: unreferenced formal parameter */
-#  pragma warning(disable : 4127)        /* disable: C4127: conditional expression is constant */
-#  pragma warning(disable : 4204)        /* disable: C4204: non-constant aggregate initializer */
-#  pragma warning(disable : 4214)        /* disable: C4214: non-int bitfields */
-#  pragma warning(disable : 4324)        /* disable: C4324: padded structure */
-#endif
-
-#endif /* ZSTD_COMPILER_H */
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/common/cpu.h mysql-8.0-8.0.27/extra/zstd/lib/common/cpu.h
--- mysql-8.0-8.0.26/extra/zstd/lib/common/cpu.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/common/cpu.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,215 +0,0 @@
-/*
- * Copyright (c) 2018-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
-#ifndef ZSTD_COMMON_CPU_H
-#define ZSTD_COMMON_CPU_H
-
-/**
- * Implementation taken from folly/CpuId.h
- * https://github.com/facebook/folly/blob/master/folly/CpuId.h
- */
-
-#include <string.h>
-
-#include "mem.h"
-
-#ifdef _MSC_VER
-#include <intrin.h>
-#endif
-
-typedef struct {
-    U32 f1c;
-    U32 f1d;
-    U32 f7b;
-    U32 f7c;
-} ZSTD_cpuid_t;
-
-MEM_STATIC ZSTD_cpuid_t ZSTD_cpuid(void) {
-    U32 f1c = 0;
-    U32 f1d = 0;
-    U32 f7b = 0;
-    U32 f7c = 0;
-#if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_IX86))
-    int reg[4];
-    __cpuid((int*)reg, 0);
-    {
-        int const n = reg[0];
-        if (n >= 1) {
-            __cpuid((int*)reg, 1);
-            f1c = (U32)reg[2];
-            f1d = (U32)reg[3];
-        }
-        if (n >= 7) {
-            __cpuidex((int*)reg, 7, 0);
-            f7b = (U32)reg[1];
-            f7c = (U32)reg[2];
-        }
-    }
-#elif defined(__i386__) && defined(__PIC__) && !defined(__clang__) && defined(__GNUC__)
-    /* The following block like the normal cpuid branch below, but gcc
-     * reserves ebx for use of its pic register so we must specially
-     * handle the save and restore to avoid clobbering the register
-     */
-    U32 n;
-    __asm__(
-        "pushl %%ebx\n\t"
-        "cpuid\n\t"
-        "popl %%ebx\n\t"
-        : "=a"(n)
-        : "a"(0)
-        : "ecx", "edx");
-    if (n >= 1) {
-      U32 f1a;
-      __asm__(
-          "pushl %%ebx\n\t"
-          "cpuid\n\t"
-          "popl %%ebx\n\t"
-          : "=a"(f1a), "=c"(f1c), "=d"(f1d)
-          : "a"(1));
-    }
-    if (n >= 7) {
-      __asm__(
-          "pushl %%ebx\n\t"
-          "cpuid\n\t"
-          "movl %%ebx, %%eax\n\t"
-          "popl %%ebx"
-          : "=a"(f7b), "=c"(f7c)
-          : "a"(7), "c"(0)
-          : "edx");
-    }
-#elif defined(__x86_64__) || defined(_M_X64) || defined(__i386__)
-    U32 n;
-    __asm__("cpuid" : "=a"(n) : "a"(0) : "ebx", "ecx", "edx");
-    if (n >= 1) {
-      U32 f1a;
-      __asm__("cpuid" : "=a"(f1a), "=c"(f1c), "=d"(f1d) : "a"(1) : "ebx");
-    }
-    if (n >= 7) {
-      U32 f7a;
-      __asm__("cpuid"
-              : "=a"(f7a), "=b"(f7b), "=c"(f7c)
-              : "a"(7), "c"(0)
-              : "edx");
-    }
-#endif
-    {
-        ZSTD_cpuid_t cpuid;
-        cpuid.f1c = f1c;
-        cpuid.f1d = f1d;
-        cpuid.f7b = f7b;
-        cpuid.f7c = f7c;
-        return cpuid;
-    }
-}
-
-#define X(name, r, bit)                                                        \
-  MEM_STATIC int ZSTD_cpuid_##name(ZSTD_cpuid_t const cpuid) {                 \
-    return ((cpuid.r) & (1U << bit)) != 0;                                     \
-  }
-
-/* cpuid(1): Processor Info and Feature Bits. */
-#define C(name, bit) X(name, f1c, bit)
-  C(sse3, 0)
-  C(pclmuldq, 1)
-  C(dtes64, 2)
-  C(monitor, 3)
-  C(dscpl, 4)
-  C(vmx, 5)
-  C(smx, 6)
-  C(eist, 7)
-  C(tm2, 8)
-  C(ssse3, 9)
-  C(cnxtid, 10)
-  C(fma, 12)
-  C(cx16, 13)
-  C(xtpr, 14)
-  C(pdcm, 15)
-  C(pcid, 17)
-  C(dca, 18)
-  C(sse41, 19)
-  C(sse42, 20)
-  C(x2apic, 21)
-  C(movbe, 22)
-  C(popcnt, 23)
-  C(tscdeadline, 24)
-  C(aes, 25)
-  C(xsave, 26)
-  C(osxsave, 27)
-  C(avx, 28)
-  C(f16c, 29)
-  C(rdrand, 30)
-#undef C
-#define D(name, bit) X(name, f1d, bit)
-  D(fpu, 0)
-  D(vme, 1)
-  D(de, 2)
-  D(pse, 3)
-  D(tsc, 4)
-  D(msr, 5)
-  D(pae, 6)
-  D(mce, 7)
-  D(cx8, 8)
-  D(apic, 9)
-  D(sep, 11)
-  D(mtrr, 12)
-  D(pge, 13)
-  D(mca, 14)
-  D(cmov, 15)
-  D(pat, 16)
-  D(pse36, 17)
-  D(psn, 18)
-  D(clfsh, 19)
-  D(ds, 21)
-  D(acpi, 22)
-  D(mmx, 23)
-  D(fxsr, 24)
-  D(sse, 25)
-  D(sse2, 26)
-  D(ss, 27)
-  D(htt, 28)
-  D(tm, 29)
-  D(pbe, 31)
-#undef D
-
-/* cpuid(7): Extended Features. */
-#define B(name, bit) X(name, f7b, bit)
-  B(bmi1, 3)
-  B(hle, 4)
-  B(avx2, 5)
-  B(smep, 7)
-  B(bmi2, 8)
-  B(erms, 9)
-  B(invpcid, 10)
-  B(rtm, 11)
-  B(mpx, 14)
-  B(avx512f, 16)
-  B(avx512dq, 17)
-  B(rdseed, 18)
-  B(adx, 19)
-  B(smap, 20)
-  B(avx512ifma, 21)
-  B(pcommit, 22)
-  B(clflushopt, 23)
-  B(clwb, 24)
-  B(avx512pf, 26)
-  B(avx512er, 27)
-  B(avx512cd, 28)
-  B(sha, 29)
-  B(avx512bw, 30)
-  B(avx512vl, 31)
-#undef B
-#define C(name, bit) X(name, f7c, bit)
-  C(prefetchwt1, 0)
-  C(avx512vbmi, 1)
-#undef C
-
-#undef X
-
-#endif /* ZSTD_COMMON_CPU_H */
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/common/debug.c mysql-8.0-8.0.27/extra/zstd/lib/common/debug.c
--- mysql-8.0-8.0.26/extra/zstd/lib/common/debug.c	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/common/debug.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-/* ******************************************************************
-   debug
-   Part of FSE library
-   Copyright (C) 2013-present, Yann Collet.
-
-   BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are
-   met:
-
-       * Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-       * Redistributions in binary form must reproduce the above
-   copyright notice, this list of conditions and the following disclaimer
-   in the documentation and/or other materials provided with the
-   distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-   You can contact the author at :
-   - Source repository : https://github.com/Cyan4973/FiniteStateEntropy
-****************************************************************** */
-
-
-/*
- * This module only hosts one global variable
- * which can be used to dynamically influence the verbosity of traces,
- * such as DEBUGLOG and RAWLOG
- */
-
-#include "debug.h"
-
-int g_debuglevel = DEBUGLEVEL;
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/common/debug.h mysql-8.0-8.0.27/extra/zstd/lib/common/debug.h
--- mysql-8.0-8.0.26/extra/zstd/lib/common/debug.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/common/debug.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,134 +0,0 @@
-/* ******************************************************************
-   debug
-   Part of FSE library
-   Copyright (C) 2013-present, Yann Collet.
-
-   BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are
-   met:
-
-       * Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-       * Redistributions in binary form must reproduce the above
-   copyright notice, this list of conditions and the following disclaimer
-   in the documentation and/or other materials provided with the
-   distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-   You can contact the author at :
-   - Source repository : https://github.com/Cyan4973/FiniteStateEntropy
-****************************************************************** */
-
-
-/*
- * The purpose of this header is to enable debug functions.
- * They regroup assert(), DEBUGLOG() and RAWLOG() for run-time,
- * and DEBUG_STATIC_ASSERT() for compile-time.
- *
- * By default, DEBUGLEVEL==0, which means run-time debug is disabled.
- *
- * Level 1 enables assert() only.
- * Starting level 2, traces can be generated and pushed to stderr.
- * The higher the level, the more verbose the traces.
- *
- * It's possible to dynamically adjust level using variable g_debug_level,
- * which is only declared if DEBUGLEVEL>=2,
- * and is a global variable, not multi-thread protected (use with care)
- */
-
-#ifndef DEBUG_H_12987983217
-#define DEBUG_H_12987983217
-
-#if defined (__cplusplus)
-extern "C" {
-#endif
-
-
-/* static assert is triggered at compile time, leaving no runtime artefact.
- * static assert only works with compile-time constants.
- * Also, this variant can only be used inside a function. */
-#define DEBUG_STATIC_ASSERT(c) (void)sizeof(char[(c) ? 1 : -1])
-
-
-/* DEBUGLEVEL is expected to be defined externally,
- * typically through compiler command line.
- * Value must be a number. */
-#ifndef DEBUGLEVEL
-#  define DEBUGLEVEL 0
-#endif
-
-
-/* DEBUGFILE can be defined externally,
- * typically through compiler command line.
- * note : currently useless.
- * Value must be stderr or stdout */
-#ifndef DEBUGFILE
-#  define DEBUGFILE stderr
-#endif
-
-
-/* recommended values for DEBUGLEVEL :
- * 0 : release mode, no debug, all run-time checks disabled
- * 1 : enables assert() only, no display
- * 2 : reserved, for currently active debug path
- * 3 : events once per object lifetime (CCtx, CDict, etc.)
- * 4 : events once per frame
- * 5 : events once per block
- * 6 : events once per sequence (verbose)
- * 7+: events at every position (*very* verbose)
- *
- * It's generally inconvenient to output traces > 5.
- * In which case, it's possible to selectively trigger high verbosity levels
- * by modifying g_debug_level.
- */
-
-#if (DEBUGLEVEL>=1)
-#  include <assert.h>
-#else
-#  ifndef assert   /* assert may be already defined, due to prior #include <assert.h> */
-#    define assert(condition) ((void)0)   /* disable assert (default) */
-#  endif
-#endif
-
-#if (DEBUGLEVEL>=2)
-#  include <stdio.h>
-extern int g_debuglevel; /* the variable is only declared,
-                            it actually lives in debug.c,
-                            and is shared by the whole process.
-                            It's not thread-safe.
-                            It's useful when enabling very verbose levels
-                            on selective conditions (such as position in src) */
-
-#  define RAWLOG(l, ...) {                                      \
-                if (l<=g_debuglevel) {                          \
-                    fprintf(stderr, __VA_ARGS__);               \
-            }   }
-#  define DEBUGLOG(l, ...) {                                    \
-                if (l<=g_debuglevel) {                          \
-                    fprintf(stderr, __FILE__ ": " __VA_ARGS__); \
-                    fprintf(stderr, " \n");                     \
-            }   }
-#else
-#  define RAWLOG(l, ...)      {}    /* disabled */
-#  define DEBUGLOG(l, ...)    {}    /* disabled */
-#endif
-
-
-#if defined (__cplusplus)
-}
-#endif
-
-#endif /* DEBUG_H_12987983217 */
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/common/entropy_common.c mysql-8.0-8.0.27/extra/zstd/lib/common/entropy_common.c
--- mysql-8.0-8.0.26/extra/zstd/lib/common/entropy_common.c	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/common/entropy_common.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,236 +0,0 @@
-/*
-   Common functions of New Generation Entropy library
-   Copyright (C) 2016, Yann Collet.
-
-   BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are
-   met:
-
-       * Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-       * Redistributions in binary form must reproduce the above
-   copyright notice, this list of conditions and the following disclaimer
-   in the documentation and/or other materials provided with the
-   distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-    You can contact the author at :
-    - FSE+HUF source repository : https://github.com/Cyan4973/FiniteStateEntropy
-    - Public forum : https://groups.google.com/forum/#!forum/lz4c
-*************************************************************************** */
-
-/* *************************************
-*  Dependencies
-***************************************/
-#include "mem.h"
-#include "error_private.h"       /* ERR_*, ERROR */
-#define FSE_STATIC_LINKING_ONLY  /* FSE_MIN_TABLELOG */
-#include "fse.h"
-#define HUF_STATIC_LINKING_ONLY  /* HUF_TABLELOG_ABSOLUTEMAX */
-#include "huf.h"
-
-
-/*===   Version   ===*/
-unsigned FSE_versionNumber(void) { return FSE_VERSION_NUMBER; }
-
-
-/*===   Error Management   ===*/
-unsigned FSE_isError(size_t code) { return ERR_isError(code); }
-const char* FSE_getErrorName(size_t code) { return ERR_getErrorName(code); }
-
-unsigned HUF_isError(size_t code) { return ERR_isError(code); }
-const char* HUF_getErrorName(size_t code) { return ERR_getErrorName(code); }
-
-
-/*-**************************************************************
-*  FSE NCount encoding-decoding
-****************************************************************/
-size_t FSE_readNCount (short* normalizedCounter, unsigned* maxSVPtr, unsigned* tableLogPtr,
-                 const void* headerBuffer, size_t hbSize)
-{
-    const BYTE* const istart = (const BYTE*) headerBuffer;
-    const BYTE* const iend = istart + hbSize;
-    const BYTE* ip = istart;
-    int nbBits;
-    int remaining;
-    int threshold;
-    U32 bitStream;
-    int bitCount;
-    unsigned charnum = 0;
-    int previous0 = 0;
-
-    if (hbSize < 4) {
-        /* This function only works when hbSize >= 4 */
-        char buffer[4];
-        memset(buffer, 0, sizeof(buffer));
-        memcpy(buffer, headerBuffer, hbSize);
-        {   size_t const countSize = FSE_readNCount(normalizedCounter, maxSVPtr, tableLogPtr,
-                                                    buffer, sizeof(buffer));
-            if (FSE_isError(countSize)) return countSize;
-            if (countSize > hbSize) return ERROR(corruption_detected);
-            return countSize;
-    }   }
-    assert(hbSize >= 4);
-
-    /* init */
-    memset(normalizedCounter, 0, (*maxSVPtr+1) * sizeof(normalizedCounter[0]));   /* all symbols not present in NCount have a frequency of 0 */
-    bitStream = MEM_readLE32(ip);
-    nbBits = (bitStream & 0xF) + FSE_MIN_TABLELOG;   /* extract tableLog */
-    if (nbBits > FSE_TABLELOG_ABSOLUTE_MAX) return ERROR(tableLog_tooLarge);
-    bitStream >>= 4;
-    bitCount = 4;
-    *tableLogPtr = nbBits;
-    remaining = (1<<nbBits)+1;
-    threshold = 1<<nbBits;
-    nbBits++;
-
-    while ((remaining>1) & (charnum<=*maxSVPtr)) {
-        if (previous0) {
-            unsigned n0 = charnum;
-            while ((bitStream & 0xFFFF) == 0xFFFF) {
-                n0 += 24;
-                if (ip < iend-5) {
-                    ip += 2;
-                    bitStream = MEM_readLE32(ip) >> bitCount;
-                } else {
-                    bitStream >>= 16;
-                    bitCount   += 16;
-            }   }
-            while ((bitStream & 3) == 3) {
-                n0 += 3;
-                bitStream >>= 2;
-                bitCount += 2;
-            }
-            n0 += bitStream & 3;
-            bitCount += 2;
-            if (n0 > *maxSVPtr) return ERROR(maxSymbolValue_tooSmall);
-            while (charnum < n0) normalizedCounter[charnum++] = 0;
-            if ((ip <= iend-7) || (ip + (bitCount>>3) <= iend-4)) {
-                assert((bitCount >> 3) <= 3); /* For first condition to work */
-                ip += bitCount>>3;
-                bitCount &= 7;
-                bitStream = MEM_readLE32(ip) >> bitCount;
-            } else {
-                bitStream >>= 2;
-        }   }
-        {   int const max = (2*threshold-1) - remaining;
-            int count;
-
-            if ((bitStream & (threshold-1)) < (U32)max) {
-                count = bitStream & (threshold-1);
-                bitCount += nbBits-1;
-            } else {
-                count = bitStream & (2*threshold-1);
-                if (count >= threshold) count -= max;
-                bitCount += nbBits;
-            }
-
-            count--;   /* extra accuracy */
-            remaining -= count < 0 ? -count : count;   /* -1 means +1 */
-            normalizedCounter[charnum++] = (short)count;
-            previous0 = !count;
-            while (remaining < threshold) {
-                nbBits--;
-                threshold >>= 1;
-            }
-
-            if ((ip <= iend-7) || (ip + (bitCount>>3) <= iend-4)) {
-                ip += bitCount>>3;
-                bitCount &= 7;
-            } else {
-                bitCount -= (int)(8 * (iend - 4 - ip));
-                ip = iend - 4;
-            }
-            bitStream = MEM_readLE32(ip) >> (bitCount & 31);
-    }   }   /* while ((remaining>1) & (charnum<=*maxSVPtr)) */
-    if (remaining != 1) return ERROR(corruption_detected);
-    if (bitCount > 32) return ERROR(corruption_detected);
-    *maxSVPtr = charnum-1;
-
-    ip += (bitCount+7)>>3;
-    return ip-istart;
-}
-
-
-/*! HUF_readStats() :
-    Read compact Huffman tree, saved by HUF_writeCTable().
-    `huffWeight` is destination buffer.
-    `rankStats` is assumed to be a table of at least HUF_TABLELOG_MAX U32.
-    @return : size read from `src` , or an error Code .
-    Note : Needed by HUF_readCTable() and HUF_readDTableX?() .
-*/
-size_t HUF_readStats(BYTE* huffWeight, size_t hwSize, U32* rankStats,
-                     U32* nbSymbolsPtr, U32* tableLogPtr,
-                     const void* src, size_t srcSize)
-{
-    U32 weightTotal;
-    const BYTE* ip = (const BYTE*) src;
-    size_t iSize;
-    size_t oSize;
-
-    if (!srcSize) return ERROR(srcSize_wrong);
-    iSize = ip[0];
-    /* memset(huffWeight, 0, hwSize);   *//* is not necessary, even though some analyzer complain ... */
-
-    if (iSize >= 128) {  /* special header */
-        oSize = iSize - 127;
-        iSize = ((oSize+1)/2);
-        if (iSize+1 > srcSize) return ERROR(srcSize_wrong);
-        if (oSize >= hwSize) return ERROR(corruption_detected);
-        ip += 1;
-        {   U32 n;
-            for (n=0; n<oSize; n+=2) {
-                huffWeight[n]   = ip[n/2] >> 4;
-                huffWeight[n+1] = ip[n/2] & 15;
-    }   }   }
-    else  {   /* header compressed with FSE (normal case) */
-        FSE_DTable fseWorkspace[FSE_DTABLE_SIZE_U32(6)];  /* 6 is max possible tableLog for HUF header (maybe even 5, to be tested) */
-        if (iSize+1 > srcSize) return ERROR(srcSize_wrong);
-        oSize = FSE_decompress_wksp(huffWeight, hwSize-1, ip+1, iSize, fseWorkspace, 6);   /* max (hwSize-1) values decoded, as last one is implied */
-        if (FSE_isError(oSize)) return oSize;
-    }
-
-    /* collect weight stats */
-    memset(rankStats, 0, (HUF_TABLELOG_MAX + 1) * sizeof(U32));
-    weightTotal = 0;
-    {   U32 n; for (n=0; n<oSize; n++) {
-            if (huffWeight[n] >= HUF_TABLELOG_MAX) return ERROR(corruption_detected);
-            rankStats[huffWeight[n]]++;
-            weightTotal += (1 << huffWeight[n]) >> 1;
-    }   }
-    if (weightTotal == 0) return ERROR(corruption_detected);
-
-    /* get last non-null symbol weight (implied, total must be 2^n) */
-    {   U32 const tableLog = BIT_highbit32(weightTotal) + 1;
-        if (tableLog > HUF_TABLELOG_MAX) return ERROR(corruption_detected);
-        *tableLogPtr = tableLog;
-        /* determine last weight */
-        {   U32 const total = 1 << tableLog;
-            U32 const rest = total - weightTotal;
-            U32 const verif = 1 << BIT_highbit32(rest);
-            U32 const lastWeight = BIT_highbit32(rest) + 1;
-            if (verif != rest) return ERROR(corruption_detected);    /* last value must be a clean power of 2 */
-            huffWeight[oSize] = (BYTE)lastWeight;
-            rankStats[lastWeight]++;
-    }   }
-
-    /* check tree construction validity */
-    if ((rankStats[1] < 2) || (rankStats[1] & 1)) return ERROR(corruption_detected);   /* by construction : at least 2 elts of rank 1, must be even */
-
-    /* results */
-    *nbSymbolsPtr = (U32)(oSize+1);
-    return iSize+1;
-}
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/common/error_private.c mysql-8.0-8.0.27/extra/zstd/lib/common/error_private.c
--- mysql-8.0-8.0.26/extra/zstd/lib/common/error_private.c	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/common/error_private.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
-/* The purpose of this file is to have a single list of error strings embedded in binary */
-
-#include "error_private.h"
-
-const char* ERR_getErrorString(ERR_enum code)
-{
-#ifdef ZSTD_STRIP_ERROR_STRINGS
-    (void)code;
-    return "Error strings stripped";
-#else
-    static const char* const notErrorCode = "Unspecified error code";
-    switch( code )
-    {
-    case PREFIX(no_error): return "No error detected";
-    case PREFIX(GENERIC):  return "Error (generic)";
-    case PREFIX(prefix_unknown): return "Unknown frame descriptor";
-    case PREFIX(version_unsupported): return "Version not supported";
-    case PREFIX(frameParameter_unsupported): return "Unsupported frame parameter";
-    case PREFIX(frameParameter_windowTooLarge): return "Frame requires too much memory for decoding";
-    case PREFIX(corruption_detected): return "Corrupted block detected";
-    case PREFIX(checksum_wrong): return "Restored data doesn't match checksum";
-    case PREFIX(parameter_unsupported): return "Unsupported parameter";
-    case PREFIX(parameter_outOfBound): return "Parameter is out of bound";
-    case PREFIX(init_missing): return "Context should be init first";
-    case PREFIX(memory_allocation): return "Allocation error : not enough memory";
-    case PREFIX(workSpace_tooSmall): return "workSpace buffer is not large enough";
-    case PREFIX(stage_wrong): return "Operation not authorized at current processing stage";
-    case PREFIX(tableLog_tooLarge): return "tableLog requires too much memory : unsupported";
-    case PREFIX(maxSymbolValue_tooLarge): return "Unsupported max Symbol Value : too large";
-    case PREFIX(maxSymbolValue_tooSmall): return "Specified maxSymbolValue is too small";
-    case PREFIX(dictionary_corrupted): return "Dictionary is corrupted";
-    case PREFIX(dictionary_wrong): return "Dictionary mismatch";
-    case PREFIX(dictionaryCreation_failed): return "Cannot create Dictionary from provided samples";
-    case PREFIX(dstSize_tooSmall): return "Destination buffer is too small";
-    case PREFIX(srcSize_wrong): return "Src size is incorrect";
-    case PREFIX(dstBuffer_null): return "Operation on NULL destination buffer";
-        /* following error codes are not stable and may be removed or changed in a future version */
-    case PREFIX(frameIndex_tooLarge): return "Frame index is too large";
-    case PREFIX(seekableIO): return "An I/O error occurred when reading/seeking";
-    case PREFIX(maxCode):
-    default: return notErrorCode;
-    }
-#endif
-}
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/common/error_private.h mysql-8.0-8.0.27/extra/zstd/lib/common/error_private.h
--- mysql-8.0-8.0.26/extra/zstd/lib/common/error_private.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/common/error_private.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
-/* Note : this module is expected to remain private, do not expose it */
-
-#ifndef ERROR_H_MODULE
-#define ERROR_H_MODULE
-
-#if defined (__cplusplus)
-extern "C" {
-#endif
-
-
-/* ****************************************
-*  Dependencies
-******************************************/
-#include <stddef.h>        /* size_t */
-#include "zstd_errors.h"  /* enum list */
-
-
-/* ****************************************
-*  Compiler-specific
-******************************************/
-#if defined(__GNUC__)
-#  define ERR_STATIC static __attribute__((unused))
-#elif defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */)
-#  define ERR_STATIC static inline
-#elif defined(_MSC_VER)
-#  define ERR_STATIC static __inline
-#else
-#  define ERR_STATIC static  /* this version may generate warnings for unused static functions; disable the relevant warning */
-#endif
-
-
-/*-****************************************
-*  Customization (error_public.h)
-******************************************/
-typedef ZSTD_ErrorCode ERR_enum;
-#define PREFIX(name) ZSTD_error_##name
-
-
-/*-****************************************
-*  Error codes handling
-******************************************/
-#undef ERROR   /* reported already defined on VS 2015 (Rich Geldreich) */
-#define ERROR(name) ZSTD_ERROR(name)
-#define ZSTD_ERROR(name) ((size_t)-PREFIX(name))
-
-ERR_STATIC unsigned ERR_isError(size_t code) { return (code > ERROR(maxCode)); }
-
-ERR_STATIC ERR_enum ERR_getErrorCode(size_t code) { if (!ERR_isError(code)) return (ERR_enum)0; return (ERR_enum) (0-code); }
-
-
-/*-****************************************
-*  Error Strings
-******************************************/
-
-const char* ERR_getErrorString(ERR_enum code);   /* error_private.c */
-
-ERR_STATIC const char* ERR_getErrorName(size_t code)
-{
-    return ERR_getErrorString(ERR_getErrorCode(code));
-}
-
-#if defined (__cplusplus)
-}
-#endif
-
-#endif /* ERROR_H_MODULE */
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/common/fse_decompress.c mysql-8.0-8.0.27/extra/zstd/lib/common/fse_decompress.c
--- mysql-8.0-8.0.26/extra/zstd/lib/common/fse_decompress.c	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/common/fse_decompress.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,309 +0,0 @@
-/* ******************************************************************
-   FSE : Finite State Entropy decoder
-   Copyright (C) 2013-2015, Yann Collet.
-
-   BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are
-   met:
-
-       * Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-       * Redistributions in binary form must reproduce the above
-   copyright notice, this list of conditions and the following disclaimer
-   in the documentation and/or other materials provided with the
-   distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-    You can contact the author at :
-    - FSE source repository : https://github.com/Cyan4973/FiniteStateEntropy
-    - Public forum : https://groups.google.com/forum/#!forum/lz4c
-****************************************************************** */
-
-
-/* **************************************************************
-*  Includes
-****************************************************************/
-#include <stdlib.h>     /* malloc, free, qsort */
-#include <string.h>     /* memcpy, memset */
-#include "bitstream.h"
-#include "compiler.h"
-#define FSE_STATIC_LINKING_ONLY
-#include "fse.h"
-#include "error_private.h"
-
-
-/* **************************************************************
-*  Error Management
-****************************************************************/
-#define FSE_isError ERR_isError
-#define FSE_STATIC_ASSERT(c) DEBUG_STATIC_ASSERT(c)   /* use only *after* variable declarations */
-
-/* check and forward error code */
-#define CHECK_F(f) { size_t const e = f; if (FSE_isError(e)) return e; }
-
-
-/* **************************************************************
-*  Templates
-****************************************************************/
-/*
-  designed to be included
-  for type-specific functions (template emulation in C)
-  Objective is to write these functions only once, for improved maintenance
-*/
-
-/* safety checks */
-#ifndef FSE_FUNCTION_EXTENSION
-#  error "FSE_FUNCTION_EXTENSION must be defined"
-#endif
-#ifndef FSE_FUNCTION_TYPE
-#  error "FSE_FUNCTION_TYPE must be defined"
-#endif
-
-/* Function names */
-#define FSE_CAT(X,Y) X##Y
-#define FSE_FUNCTION_NAME(X,Y) FSE_CAT(X,Y)
-#define FSE_TYPE_NAME(X,Y) FSE_CAT(X,Y)
-
-
-/* Function templates */
-FSE_DTable* FSE_createDTable (unsigned tableLog)
-{
-    if (tableLog > FSE_TABLELOG_ABSOLUTE_MAX) tableLog = FSE_TABLELOG_ABSOLUTE_MAX;
-    return (FSE_DTable*)malloc( FSE_DTABLE_SIZE_U32(tableLog) * sizeof (U32) );
-}
-
-void FSE_freeDTable (FSE_DTable* dt)
-{
-    free(dt);
-}
-
-size_t FSE_buildDTable(FSE_DTable* dt, const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog)
-{
-    void* const tdPtr = dt+1;   /* because *dt is unsigned, 32-bits aligned on 32-bits */
-    FSE_DECODE_TYPE* const tableDecode = (FSE_DECODE_TYPE*) (tdPtr);
-    U16 symbolNext[FSE_MAX_SYMBOL_VALUE+1];
-
-    U32 const maxSV1 = maxSymbolValue + 1;
-    U32 const tableSize = 1 << tableLog;
-    U32 highThreshold = tableSize-1;
-
-    /* Sanity Checks */
-    if (maxSymbolValue > FSE_MAX_SYMBOL_VALUE) return ERROR(maxSymbolValue_tooLarge);
-    if (tableLog > FSE_MAX_TABLELOG) return ERROR(tableLog_tooLarge);
-
-    /* Init, lay down lowprob symbols */
-    {   FSE_DTableHeader DTableH;
-        DTableH.tableLog = (U16)tableLog;
-        DTableH.fastMode = 1;
-        {   S16 const largeLimit= (S16)(1 << (tableLog-1));
-            U32 s;
-            for (s=0; s<maxSV1; s++) {
-                if (normalizedCounter[s]==-1) {
-                    tableDecode[highThreshold--].symbol = (FSE_FUNCTION_TYPE)s;
-                    symbolNext[s] = 1;
-                } else {
-                    if (normalizedCounter[s] >= largeLimit) DTableH.fastMode=0;
-                    symbolNext[s] = normalizedCounter[s];
-        }   }   }
-        memcpy(dt, &DTableH, sizeof(DTableH));
-    }
-
-    /* Spread symbols */
-    {   U32 const tableMask = tableSize-1;
-        U32 const step = FSE_TABLESTEP(tableSize);
-        U32 s, position = 0;
-        for (s=0; s<maxSV1; s++) {
-            int i;
-            for (i=0; i<normalizedCounter[s]; i++) {
-                tableDecode[position].symbol = (FSE_FUNCTION_TYPE)s;
-                position = (position + step) & tableMask;
-                while (position > highThreshold) position = (position + step) & tableMask;   /* lowprob area */
-        }   }
-        if (position!=0) return ERROR(GENERIC);   /* position must reach all cells once, otherwise normalizedCounter is incorrect */
-    }
-
-    /* Build Decoding table */
-    {   U32 u;
-        for (u=0; u<tableSize; u++) {
-            FSE_FUNCTION_TYPE const symbol = (FSE_FUNCTION_TYPE)(tableDecode[u].symbol);
-            U32 const nextState = symbolNext[symbol]++;
-            tableDecode[u].nbBits = (BYTE) (tableLog - BIT_highbit32(nextState) );
-            tableDecode[u].newState = (U16) ( (nextState << tableDecode[u].nbBits) - tableSize);
-    }   }
-
-    return 0;
-}
-
-
-#ifndef FSE_COMMONDEFS_ONLY
-
-/*-*******************************************************
-*  Decompression (Byte symbols)
-*********************************************************/
-size_t FSE_buildDTable_rle (FSE_DTable* dt, BYTE symbolValue)
-{
-    void* ptr = dt;
-    FSE_DTableHeader* const DTableH = (FSE_DTableHeader*)ptr;
-    void* dPtr = dt + 1;
-    FSE_decode_t* const cell = (FSE_decode_t*)dPtr;
-
-    DTableH->tableLog = 0;
-    DTableH->fastMode = 0;
-
-    cell->newState = 0;
-    cell->symbol = symbolValue;
-    cell->nbBits = 0;
-
-    return 0;
-}
-
-
-size_t FSE_buildDTable_raw (FSE_DTable* dt, unsigned nbBits)
-{
-    void* ptr = dt;
-    FSE_DTableHeader* const DTableH = (FSE_DTableHeader*)ptr;
-    void* dPtr = dt + 1;
-    FSE_decode_t* const dinfo = (FSE_decode_t*)dPtr;
-    const unsigned tableSize = 1 << nbBits;
-    const unsigned tableMask = tableSize - 1;
-    const unsigned maxSV1 = tableMask+1;
-    unsigned s;
-
-    /* Sanity checks */
-    if (nbBits < 1) return ERROR(GENERIC);         /* min size */
-
-    /* Build Decoding Table */
-    DTableH->tableLog = (U16)nbBits;
-    DTableH->fastMode = 1;
-    for (s=0; s<maxSV1; s++) {
-        dinfo[s].newState = 0;
-        dinfo[s].symbol = (BYTE)s;
-        dinfo[s].nbBits = (BYTE)nbBits;
-    }
-
-    return 0;
-}
-
-FORCE_INLINE_TEMPLATE size_t FSE_decompress_usingDTable_generic(
-          void* dst, size_t maxDstSize,
-    const void* cSrc, size_t cSrcSize,
-    const FSE_DTable* dt, const unsigned fast)
-{
-    BYTE* const ostart = (BYTE*) dst;
-    BYTE* op = ostart;
-    BYTE* const omax = op + maxDstSize;
-    BYTE* const olimit = omax-3;
-
-    BIT_DStream_t bitD;
-    FSE_DState_t state1;
-    FSE_DState_t state2;
-
-    /* Init */
-    CHECK_F(BIT_initDStream(&bitD, cSrc, cSrcSize));
-
-    FSE_initDState(&state1, &bitD, dt);
-    FSE_initDState(&state2, &bitD, dt);
-
-#define FSE_GETSYMBOL(statePtr) fast ? FSE_decodeSymbolFast(statePtr, &bitD) : FSE_decodeSymbol(statePtr, &bitD)
-
-    /* 4 symbols per loop */
-    for ( ; (BIT_reloadDStream(&bitD)==BIT_DStream_unfinished) & (op<olimit) ; op+=4) {
-        op[0] = FSE_GETSYMBOL(&state1);
-
-        if (FSE_MAX_TABLELOG*2+7 > sizeof(bitD.bitContainer)*8)    /* This test must be static */
-            BIT_reloadDStream(&bitD);
-
-        op[1] = FSE_GETSYMBOL(&state2);
-
-        if (FSE_MAX_TABLELOG*4+7 > sizeof(bitD.bitContainer)*8)    /* This test must be static */
-            { if (BIT_reloadDStream(&bitD) > BIT_DStream_unfinished) { op+=2; break; } }
-
-        op[2] = FSE_GETSYMBOL(&state1);
-
-        if (FSE_MAX_TABLELOG*2+7 > sizeof(bitD.bitContainer)*8)    /* This test must be static */
-            BIT_reloadDStream(&bitD);
-
-        op[3] = FSE_GETSYMBOL(&state2);
-    }
-
-    /* tail */
-    /* note : BIT_reloadDStream(&bitD) >= FSE_DStream_partiallyFilled; Ends at exactly BIT_DStream_completed */
-    while (1) {
-        if (op>(omax-2)) return ERROR(dstSize_tooSmall);
-        *op++ = FSE_GETSYMBOL(&state1);
-        if (BIT_reloadDStream(&bitD)==BIT_DStream_overflow) {
-            *op++ = FSE_GETSYMBOL(&state2);
-            break;
-        }
-
-        if (op>(omax-2)) return ERROR(dstSize_tooSmall);
-        *op++ = FSE_GETSYMBOL(&state2);
-        if (BIT_reloadDStream(&bitD)==BIT_DStream_overflow) {
-            *op++ = FSE_GETSYMBOL(&state1);
-            break;
-    }   }
-
-    return op-ostart;
-}
-
-
-size_t FSE_decompress_usingDTable(void* dst, size_t originalSize,
-                            const void* cSrc, size_t cSrcSize,
-                            const FSE_DTable* dt)
-{
-    const void* ptr = dt;
-    const FSE_DTableHeader* DTableH = (const FSE_DTableHeader*)ptr;
-    const U32 fastMode = DTableH->fastMode;
-
-    /* select fast mode (static) */
-    if (fastMode) return FSE_decompress_usingDTable_generic(dst, originalSize, cSrc, cSrcSize, dt, 1);
-    return FSE_decompress_usingDTable_generic(dst, originalSize, cSrc, cSrcSize, dt, 0);
-}
-
-
-size_t FSE_decompress_wksp(void* dst, size_t dstCapacity, const void* cSrc, size_t cSrcSize, FSE_DTable* workSpace, unsigned maxLog)
-{
-    const BYTE* const istart = (const BYTE*)cSrc;
-    const BYTE* ip = istart;
-    short counting[FSE_MAX_SYMBOL_VALUE+1];
-    unsigned tableLog;
-    unsigned maxSymbolValue = FSE_MAX_SYMBOL_VALUE;
-
-    /* normal FSE decoding mode */
-    size_t const NCountLength = FSE_readNCount (counting, &maxSymbolValue, &tableLog, istart, cSrcSize);
-    if (FSE_isError(NCountLength)) return NCountLength;
-    //if (NCountLength >= cSrcSize) return ERROR(srcSize_wrong);   /* too small input size; supposed to be already checked in NCountLength, only remaining case : NCountLength==cSrcSize */
-    if (tableLog > maxLog) return ERROR(tableLog_tooLarge);
-    ip += NCountLength;
-    cSrcSize -= NCountLength;
-
-    CHECK_F( FSE_buildDTable (workSpace, counting, maxSymbolValue, tableLog) );
-
-    return FSE_decompress_usingDTable (dst, dstCapacity, ip, cSrcSize, workSpace);   /* always return, even if it is an error code */
-}
-
-
-typedef FSE_DTable DTable_max_t[FSE_DTABLE_SIZE_U32(FSE_MAX_TABLELOG)];
-
-size_t FSE_decompress(void* dst, size_t dstCapacity, const void* cSrc, size_t cSrcSize)
-{
-    DTable_max_t dt;   /* Static analyzer seems unable to understand this table will be properly initialized later */
-    return FSE_decompress_wksp(dst, dstCapacity, cSrc, cSrcSize, dt, FSE_MAX_TABLELOG);
-}
-
-
-
-#endif   /* FSE_COMMONDEFS_ONLY */
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/common/fse.h mysql-8.0-8.0.27/extra/zstd/lib/common/fse.h
--- mysql-8.0-8.0.26/extra/zstd/lib/common/fse.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/common/fse.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,708 +0,0 @@
-/* ******************************************************************
-   FSE : Finite State Entropy codec
-   Public Prototypes declaration
-   Copyright (C) 2013-2016, Yann Collet.
-
-   BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are
-   met:
-
-       * Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-       * Redistributions in binary form must reproduce the above
-   copyright notice, this list of conditions and the following disclaimer
-   in the documentation and/or other materials provided with the
-   distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-   You can contact the author at :
-   - Source repository : https://github.com/Cyan4973/FiniteStateEntropy
-****************************************************************** */
-
-#if defined (__cplusplus)
-extern "C" {
-#endif
-
-#ifndef FSE_H
-#define FSE_H
-
-
-/*-*****************************************
-*  Dependencies
-******************************************/
-#include <stddef.h>    /* size_t, ptrdiff_t */
-
-
-/*-*****************************************
-*  FSE_PUBLIC_API : control library symbols visibility
-******************************************/
-#if defined(FSE_DLL_EXPORT) && (FSE_DLL_EXPORT==1) && defined(__GNUC__) && (__GNUC__ >= 4)
-#  define FSE_PUBLIC_API __attribute__ ((visibility ("default")))
-#elif defined(FSE_DLL_EXPORT) && (FSE_DLL_EXPORT==1)   /* Visual expected */
-#  define FSE_PUBLIC_API __declspec(dllexport)
-#elif defined(FSE_DLL_IMPORT) && (FSE_DLL_IMPORT==1)
-#  define FSE_PUBLIC_API __declspec(dllimport) /* It isn't required but allows to generate better code, saving a function pointer load from the IAT and an indirect jump.*/
-#else
-#  define FSE_PUBLIC_API
-#endif
-
-/*------   Version   ------*/
-#define FSE_VERSION_MAJOR    0
-#define FSE_VERSION_MINOR    9
-#define FSE_VERSION_RELEASE  0
-
-#define FSE_LIB_VERSION FSE_VERSION_MAJOR.FSE_VERSION_MINOR.FSE_VERSION_RELEASE
-#define FSE_QUOTE(str) #str
-#define FSE_EXPAND_AND_QUOTE(str) FSE_QUOTE(str)
-#define FSE_VERSION_STRING FSE_EXPAND_AND_QUOTE(FSE_LIB_VERSION)
-
-#define FSE_VERSION_NUMBER  (FSE_VERSION_MAJOR *100*100 + FSE_VERSION_MINOR *100 + FSE_VERSION_RELEASE)
-FSE_PUBLIC_API unsigned FSE_versionNumber(void);   /**< library version number; to be used when checking dll version */
-
-
-/*-****************************************
-*  FSE simple functions
-******************************************/
-/*! FSE_compress() :
-    Compress content of buffer 'src', of size 'srcSize', into destination buffer 'dst'.
-    'dst' buffer must be already allocated. Compression runs faster is dstCapacity >= FSE_compressBound(srcSize).
-    @return : size of compressed data (<= dstCapacity).
-    Special values : if return == 0, srcData is not compressible => Nothing is stored within dst !!!
-                     if return == 1, srcData is a single byte symbol * srcSize times. Use RLE compression instead.
-                     if FSE_isError(return), compression failed (more details using FSE_getErrorName())
-*/
-FSE_PUBLIC_API size_t FSE_compress(void* dst, size_t dstCapacity,
-                             const void* src, size_t srcSize);
-
-/*! FSE_decompress():
-    Decompress FSE data from buffer 'cSrc', of size 'cSrcSize',
-    into already allocated destination buffer 'dst', of size 'dstCapacity'.
-    @return : size of regenerated data (<= maxDstSize),
-              or an error code, which can be tested using FSE_isError() .
-
-    ** Important ** : FSE_decompress() does not decompress non-compressible nor RLE data !!!
-    Why ? : making this distinction requires a header.
-    Header management is intentionally delegated to the user layer, which can better manage special cases.
-*/
-FSE_PUBLIC_API size_t FSE_decompress(void* dst,  size_t dstCapacity,
-                               const void* cSrc, size_t cSrcSize);
-
-
-/*-*****************************************
-*  Tool functions
-******************************************/
-FSE_PUBLIC_API size_t FSE_compressBound(size_t size);       /* maximum compressed size */
-
-/* Error Management */
-FSE_PUBLIC_API unsigned    FSE_isError(size_t code);        /* tells if a return value is an error code */
-FSE_PUBLIC_API const char* FSE_getErrorName(size_t code);   /* provides error code string (useful for debugging) */
-
-
-/*-*****************************************
-*  FSE advanced functions
-******************************************/
-/*! FSE_compress2() :
-    Same as FSE_compress(), but allows the selection of 'maxSymbolValue' and 'tableLog'
-    Both parameters can be defined as '0' to mean : use default value
-    @return : size of compressed data
-    Special values : if return == 0, srcData is not compressible => Nothing is stored within cSrc !!!
-                     if return == 1, srcData is a single byte symbol * srcSize times. Use RLE compression.
-                     if FSE_isError(return), it's an error code.
-*/
-FSE_PUBLIC_API size_t FSE_compress2 (void* dst, size_t dstSize, const void* src, size_t srcSize, unsigned maxSymbolValue, unsigned tableLog);
-
-
-/*-*****************************************
-*  FSE detailed API
-******************************************/
-/*!
-FSE_compress() does the following:
-1. count symbol occurrence from source[] into table count[] (see hist.h)
-2. normalize counters so that sum(count[]) == Power_of_2 (2^tableLog)
-3. save normalized counters to memory buffer using writeNCount()
-4. build encoding table 'CTable' from normalized counters
-5. encode the data stream using encoding table 'CTable'
-
-FSE_decompress() does the following:
-1. read normalized counters with readNCount()
-2. build decoding table 'DTable' from normalized counters
-3. decode the data stream using decoding table 'DTable'
-
-The following API allows targeting specific sub-functions for advanced tasks.
-For example, it's possible to compress several blocks using the same 'CTable',
-or to save and provide normalized distribution using external method.
-*/
-
-/* *** COMPRESSION *** */
-
-/*! FSE_optimalTableLog():
-    dynamically downsize 'tableLog' when conditions are met.
-    It saves CPU time, by using smaller tables, while preserving or even improving compression ratio.
-    @return : recommended tableLog (necessarily <= 'maxTableLog') */
-FSE_PUBLIC_API unsigned FSE_optimalTableLog(unsigned maxTableLog, size_t srcSize, unsigned maxSymbolValue);
-
-/*! FSE_normalizeCount():
-    normalize counts so that sum(count[]) == Power_of_2 (2^tableLog)
-    'normalizedCounter' is a table of short, of minimum size (maxSymbolValue+1).
-    @return : tableLog,
-              or an errorCode, which can be tested using FSE_isError() */
-FSE_PUBLIC_API size_t FSE_normalizeCount(short* normalizedCounter, unsigned tableLog,
-                    const unsigned* count, size_t srcSize, unsigned maxSymbolValue);
-
-/*! FSE_NCountWriteBound():
-    Provides the maximum possible size of an FSE normalized table, given 'maxSymbolValue' and 'tableLog'.
-    Typically useful for allocation purpose. */
-FSE_PUBLIC_API size_t FSE_NCountWriteBound(unsigned maxSymbolValue, unsigned tableLog);
-
-/*! FSE_writeNCount():
-    Compactly save 'normalizedCounter' into 'buffer'.
-    @return : size of the compressed table,
-              or an errorCode, which can be tested using FSE_isError(). */
-FSE_PUBLIC_API size_t FSE_writeNCount (void* buffer, size_t bufferSize,
-                                 const short* normalizedCounter,
-                                 unsigned maxSymbolValue, unsigned tableLog);
-
-/*! Constructor and Destructor of FSE_CTable.
-    Note that FSE_CTable size depends on 'tableLog' and 'maxSymbolValue' */
-typedef unsigned FSE_CTable;   /* don't allocate that. It's only meant to be more restrictive than void* */
-FSE_PUBLIC_API FSE_CTable* FSE_createCTable (unsigned maxSymbolValue, unsigned tableLog);
-FSE_PUBLIC_API void        FSE_freeCTable (FSE_CTable* ct);
-
-/*! FSE_buildCTable():
-    Builds `ct`, which must be already allocated, using FSE_createCTable().
-    @return : 0, or an errorCode, which can be tested using FSE_isError() */
-FSE_PUBLIC_API size_t FSE_buildCTable(FSE_CTable* ct, const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog);
-
-/*! FSE_compress_usingCTable():
-    Compress `src` using `ct` into `dst` which must be already allocated.
-    @return : size of compressed data (<= `dstCapacity`),
-              or 0 if compressed data could not fit into `dst`,
-              or an errorCode, which can be tested using FSE_isError() */
-FSE_PUBLIC_API size_t FSE_compress_usingCTable (void* dst, size_t dstCapacity, const void* src, size_t srcSize, const FSE_CTable* ct);
-
-/*!
-Tutorial :
-----------
-The first step is to count all symbols. FSE_count() does this job very fast.
-Result will be saved into 'count', a table of unsigned int, which must be already allocated, and have 'maxSymbolValuePtr[0]+1' cells.
-'src' is a table of bytes of size 'srcSize'. All values within 'src' MUST be <= maxSymbolValuePtr[0]
-maxSymbolValuePtr[0] will be updated, with its real value (necessarily <= original value)
-FSE_count() will return the number of occurrence of the most frequent symbol.
-This can be used to know if there is a single symbol within 'src', and to quickly evaluate its compressibility.
-If there is an error, the function will return an ErrorCode (which can be tested using FSE_isError()).
-
-The next step is to normalize the frequencies.
-FSE_normalizeCount() will ensure that sum of frequencies is == 2 ^'tableLog'.
-It also guarantees a minimum of 1 to any Symbol with frequency >= 1.
-You can use 'tableLog'==0 to mean "use default tableLog value".
-If you are unsure of which tableLog value to use, you can ask FSE_optimalTableLog(),
-which will provide the optimal valid tableLog given sourceSize, maxSymbolValue, and a user-defined maximum (0 means "default").
-
-The result of FSE_normalizeCount() will be saved into a table,
-called 'normalizedCounter', which is a table of signed short.
-'normalizedCounter' must be already allocated, and have at least 'maxSymbolValue+1' cells.
-The return value is tableLog if everything proceeded as expected.
-It is 0 if there is a single symbol within distribution.
-If there is an error (ex: invalid tableLog value), the function will return an ErrorCode (which can be tested using FSE_isError()).
-
-'normalizedCounter' can be saved in a compact manner to a memory area using FSE_writeNCount().
-'buffer' must be already allocated.
-For guaranteed success, buffer size must be at least FSE_headerBound().
-The result of the function is the number of bytes written into 'buffer'.
-If there is an error, the function will return an ErrorCode (which can be tested using FSE_isError(); ex : buffer size too small).
-
-'normalizedCounter' can then be used to create the compression table 'CTable'.
-The space required by 'CTable' must be already allocated, using FSE_createCTable().
-You can then use FSE_buildCTable() to fill 'CTable'.
-If there is an error, both functions will return an ErrorCode (which can be tested using FSE_isError()).
-
-'CTable' can then be used to compress 'src', with FSE_compress_usingCTable().
-Similar to FSE_count(), the convention is that 'src' is assumed to be a table of char of size 'srcSize'
-The function returns the size of compressed data (without header), necessarily <= `dstCapacity`.
-If it returns '0', compressed data could not fit into 'dst'.
-If there is an error, the function will return an ErrorCode (which can be tested using FSE_isError()).
-*/
-
-
-/* *** DECOMPRESSION *** */
-
-/*! FSE_readNCount():
-    Read compactly saved 'normalizedCounter' from 'rBuffer'.
-    @return : size read from 'rBuffer',
-              or an errorCode, which can be tested using FSE_isError().
-              maxSymbolValuePtr[0] and tableLogPtr[0] will also be updated with their respective values */
-FSE_PUBLIC_API size_t FSE_readNCount (short* normalizedCounter,
-                           unsigned* maxSymbolValuePtr, unsigned* tableLogPtr,
-                           const void* rBuffer, size_t rBuffSize);
-
-/*! Constructor and Destructor of FSE_DTable.
-    Note that its size depends on 'tableLog' */
-typedef unsigned FSE_DTable;   /* don't allocate that. It's just a way to be more restrictive than void* */
-FSE_PUBLIC_API FSE_DTable* FSE_createDTable(unsigned tableLog);
-FSE_PUBLIC_API void        FSE_freeDTable(FSE_DTable* dt);
-
-/*! FSE_buildDTable():
-    Builds 'dt', which must be already allocated, using FSE_createDTable().
-    return : 0, or an errorCode, which can be tested using FSE_isError() */
-FSE_PUBLIC_API size_t FSE_buildDTable (FSE_DTable* dt, const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog);
-
-/*! FSE_decompress_usingDTable():
-    Decompress compressed source `cSrc` of size `cSrcSize` using `dt`
-    into `dst` which must be already allocated.
-    @return : size of regenerated data (necessarily <= `dstCapacity`),
-              or an errorCode, which can be tested using FSE_isError() */
-FSE_PUBLIC_API size_t FSE_decompress_usingDTable(void* dst, size_t dstCapacity, const void* cSrc, size_t cSrcSize, const FSE_DTable* dt);
-
-/*!
-Tutorial :
-----------
-(Note : these functions only decompress FSE-compressed blocks.
- If block is uncompressed, use memcpy() instead
- If block is a single repeated byte, use memset() instead )
-
-The first step is to obtain the normalized frequencies of symbols.
-This can be performed by FSE_readNCount() if it was saved using FSE_writeNCount().
-'normalizedCounter' must be already allocated, and have at least 'maxSymbolValuePtr[0]+1' cells of signed short.
-In practice, that means it's necessary to know 'maxSymbolValue' beforehand,
-or size the table to handle worst case situations (typically 256).
-FSE_readNCount() will provide 'tableLog' and 'maxSymbolValue'.
-The result of FSE_readNCount() is the number of bytes read from 'rBuffer'.
-Note that 'rBufferSize' must be at least 4 bytes, even if useful information is less than that.
-If there is an error, the function will return an error code, which can be tested using FSE_isError().
-
-The next step is to build the decompression tables 'FSE_DTable' from 'normalizedCounter'.
-This is performed by the function FSE_buildDTable().
-The space required by 'FSE_DTable' must be already allocated using FSE_createDTable().
-If there is an error, the function will return an error code, which can be tested using FSE_isError().
-
-`FSE_DTable` can then be used to decompress `cSrc`, with FSE_decompress_usingDTable().
-`cSrcSize` must be strictly correct, otherwise decompression will fail.
-FSE_decompress_usingDTable() result will tell how many bytes were regenerated (<=`dstCapacity`).
-If there is an error, the function will return an error code, which can be tested using FSE_isError(). (ex: dst buffer too small)
-*/
-
-#endif  /* FSE_H */
-
-#if defined(FSE_STATIC_LINKING_ONLY) && !defined(FSE_H_FSE_STATIC_LINKING_ONLY)
-#define FSE_H_FSE_STATIC_LINKING_ONLY
-
-/* *** Dependency *** */
-#include "bitstream.h"
-
-
-/* *****************************************
-*  Static allocation
-*******************************************/
-/* FSE buffer bounds */
-#define FSE_NCOUNTBOUND 512
-#define FSE_BLOCKBOUND(size) (size + (size>>7))
-#define FSE_COMPRESSBOUND(size) (FSE_NCOUNTBOUND + FSE_BLOCKBOUND(size))   /* Macro version, useful for static allocation */
-
-/* It is possible to statically allocate FSE CTable/DTable as a table of FSE_CTable/FSE_DTable using below macros */
-#define FSE_CTABLE_SIZE_U32(maxTableLog, maxSymbolValue)   (1 + (1<<(maxTableLog-1)) + ((maxSymbolValue+1)*2))
-#define FSE_DTABLE_SIZE_U32(maxTableLog)                   (1 + (1<<maxTableLog))
-
-/* or use the size to malloc() space directly. Pay attention to alignment restrictions though */
-#define FSE_CTABLE_SIZE(maxTableLog, maxSymbolValue)   (FSE_CTABLE_SIZE_U32(maxTableLog, maxSymbolValue) * sizeof(FSE_CTable))
-#define FSE_DTABLE_SIZE(maxTableLog)                   (FSE_DTABLE_SIZE_U32(maxTableLog) * sizeof(FSE_DTable))
-
-
-/* *****************************************
- *  FSE advanced API
- ***************************************** */
-
-unsigned FSE_optimalTableLog_internal(unsigned maxTableLog, size_t srcSize, unsigned maxSymbolValue, unsigned minus);
-/**< same as FSE_optimalTableLog(), which used `minus==2` */
-
-/* FSE_compress_wksp() :
- * Same as FSE_compress2(), but using an externally allocated scratch buffer (`workSpace`).
- * FSE_WKSP_SIZE_U32() provides the minimum size required for `workSpace` as a table of FSE_CTable.
- */
-#define FSE_WKSP_SIZE_U32(maxTableLog, maxSymbolValue)   ( FSE_CTABLE_SIZE_U32(maxTableLog, maxSymbolValue) + ((maxTableLog > 12) ? (1 << (maxTableLog - 2)) : 1024) )
-size_t FSE_compress_wksp (void* dst, size_t dstSize, const void* src, size_t srcSize, unsigned maxSymbolValue, unsigned tableLog, void* workSpace, size_t wkspSize);
-
-size_t FSE_buildCTable_raw (FSE_CTable* ct, unsigned nbBits);
-/**< build a fake FSE_CTable, designed for a flat distribution, where each symbol uses nbBits */
-
-size_t FSE_buildCTable_rle (FSE_CTable* ct, unsigned char symbolValue);
-/**< build a fake FSE_CTable, designed to compress always the same symbolValue */
-
-/* FSE_buildCTable_wksp() :
- * Same as FSE_buildCTable(), but using an externally allocated scratch buffer (`workSpace`).
- * `wkspSize` must be >= `(1<<tableLog)`.
- */
-size_t FSE_buildCTable_wksp(FSE_CTable* ct, const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog, void* workSpace, size_t wkspSize);
-
-size_t FSE_buildDTable_raw (FSE_DTable* dt, unsigned nbBits);
-/**< build a fake FSE_DTable, designed to read a flat distribution where each symbol uses nbBits */
-
-size_t FSE_buildDTable_rle (FSE_DTable* dt, unsigned char symbolValue);
-/**< build a fake FSE_DTable, designed to always generate the same symbolValue */
-
-size_t FSE_decompress_wksp(void* dst, size_t dstCapacity, const void* cSrc, size_t cSrcSize, FSE_DTable* workSpace, unsigned maxLog);
-/**< same as FSE_decompress(), using an externally allocated `workSpace` produced with `FSE_DTABLE_SIZE_U32(maxLog)` */
-
-typedef enum {
-   FSE_repeat_none,  /**< Cannot use the previous table */
-   FSE_repeat_check, /**< Can use the previous table but it must be checked */
-   FSE_repeat_valid  /**< Can use the previous table and it is assumed to be valid */
- } FSE_repeat;
-
-/* *****************************************
-*  FSE symbol compression API
-*******************************************/
-/*!
-   This API consists of small unitary functions, which highly benefit from being inlined.
-   Hence their body are included in next section.
-*/
-typedef struct {
-    ptrdiff_t   value;
-    const void* stateTable;
-    const void* symbolTT;
-    unsigned    stateLog;
-} FSE_CState_t;
-
-static void FSE_initCState(FSE_CState_t* CStatePtr, const FSE_CTable* ct);
-
-static void FSE_encodeSymbol(BIT_CStream_t* bitC, FSE_CState_t* CStatePtr, unsigned symbol);
-
-static void FSE_flushCState(BIT_CStream_t* bitC, const FSE_CState_t* CStatePtr);
-
-/**<
-These functions are inner components of FSE_compress_usingCTable().
-They allow the creation of custom streams, mixing multiple tables and bit sources.
-
-A key property to keep in mind is that encoding and decoding are done **in reverse direction**.
-So the first symbol you will encode is the last you will decode, like a LIFO stack.
-
-You will need a few variables to track your CStream. They are :
-
-FSE_CTable    ct;         // Provided by FSE_buildCTable()
-BIT_CStream_t bitStream;  // bitStream tracking structure
-FSE_CState_t  state;      // State tracking structure (can have several)
-
-
-The first thing to do is to init bitStream and state.
-    size_t errorCode = BIT_initCStream(&bitStream, dstBuffer, maxDstSize);
-    FSE_initCState(&state, ct);
-
-Note that BIT_initCStream() can produce an error code, so its result should be tested, using FSE_isError();
-You can then encode your input data, byte after byte.
-FSE_encodeSymbol() outputs a maximum of 'tableLog' bits at a time.
-Remember decoding will be done in reverse direction.
-    FSE_encodeByte(&bitStream, &state, symbol);
-
-At any time, you can also add any bit sequence.
-Note : maximum allowed nbBits is 25, for compatibility with 32-bits decoders
-    BIT_addBits(&bitStream, bitField, nbBits);
-
-The above methods don't commit data to memory, they just store it into local register, for speed.
-Local register size is 64-bits on 64-bits systems, 32-bits on 32-bits systems (size_t).
-Writing data to memory is a manual operation, performed by the flushBits function.
-    BIT_flushBits(&bitStream);
-
-Your last FSE encoding operation shall be to flush your last state value(s).
-    FSE_flushState(&bitStream, &state);
-
-Finally, you must close the bitStream.
-The function returns the size of CStream in bytes.
-If data couldn't fit into dstBuffer, it will return a 0 ( == not compressible)
-If there is an error, it returns an errorCode (which can be tested using FSE_isError()).
-    size_t size = BIT_closeCStream(&bitStream);
-*/
-
-
-/* *****************************************
-*  FSE symbol decompression API
-*******************************************/
-typedef struct {
-    size_t      state;
-    const void* table;   /* precise table may vary, depending on U16 */
-} FSE_DState_t;
-
-
-static void     FSE_initDState(FSE_DState_t* DStatePtr, BIT_DStream_t* bitD, const FSE_DTable* dt);
-
-static unsigned char FSE_decodeSymbol(FSE_DState_t* DStatePtr, BIT_DStream_t* bitD);
-
-static unsigned FSE_endOfDState(const FSE_DState_t* DStatePtr);
-
-/**<
-Let's now decompose FSE_decompress_usingDTable() into its unitary components.
-You will decode FSE-encoded symbols from the bitStream,
-and also any other bitFields you put in, **in reverse order**.
-
-You will need a few variables to track your bitStream. They are :
-
-BIT_DStream_t DStream;    // Stream context
-FSE_DState_t  DState;     // State context. Multiple ones are possible
-FSE_DTable*   DTablePtr;  // Decoding table, provided by FSE_buildDTable()
-
-The first thing to do is to init the bitStream.
-    errorCode = BIT_initDStream(&DStream, srcBuffer, srcSize);
-
-You should then retrieve your initial state(s)
-(in reverse flushing order if you have several ones) :
-    errorCode = FSE_initDState(&DState, &DStream, DTablePtr);
-
-You can then decode your data, symbol after symbol.
-For information the maximum number of bits read by FSE_decodeSymbol() is 'tableLog'.
-Keep in mind that symbols are decoded in reverse order, like a LIFO stack (last in, first out).
-    unsigned char symbol = FSE_decodeSymbol(&DState, &DStream);
-
-You can retrieve any bitfield you eventually stored into the bitStream (in reverse order)
-Note : maximum allowed nbBits is 25, for 32-bits compatibility
-    size_t bitField = BIT_readBits(&DStream, nbBits);
-
-All above operations only read from local register (which size depends on size_t).
-Refueling the register from memory is manually performed by the reload method.
-    endSignal = FSE_reloadDStream(&DStream);
-
-BIT_reloadDStream() result tells if there is still some more data to read from DStream.
-BIT_DStream_unfinished : there is still some data left into the DStream.
-BIT_DStream_endOfBuffer : Dstream reached end of buffer. Its container may no longer be completely filled.
-BIT_DStream_completed : Dstream reached its exact end, corresponding in general to decompression completed.
-BIT_DStream_tooFar : Dstream went too far. Decompression result is corrupted.
-
-When reaching end of buffer (BIT_DStream_endOfBuffer), progress slowly, notably if you decode multiple symbols per loop,
-to properly detect the exact end of stream.
-After each decoded symbol, check if DStream is fully consumed using this simple test :
-    BIT_reloadDStream(&DStream) >= BIT_DStream_completed
-
-When it's done, verify decompression is fully completed, by checking both DStream and the relevant states.
-Checking if DStream has reached its end is performed by :
-    BIT_endOfDStream(&DStream);
-Check also the states. There might be some symbols left there, if some high probability ones (>50%) are possible.
-    FSE_endOfDState(&DState);
-*/
-
-
-/* *****************************************
-*  FSE unsafe API
-*******************************************/
-static unsigned char FSE_decodeSymbolFast(FSE_DState_t* DStatePtr, BIT_DStream_t* bitD);
-/* faster, but works only if nbBits is always >= 1 (otherwise, result will be corrupted) */
-
-
-/* *****************************************
-*  Implementation of inlined functions
-*******************************************/
-typedef struct {
-    int deltaFindState;
-    U32 deltaNbBits;
-} FSE_symbolCompressionTransform; /* total 8 bytes */
-
-MEM_STATIC void FSE_initCState(FSE_CState_t* statePtr, const FSE_CTable* ct)
-{
-    const void* ptr = ct;
-    const U16* u16ptr = (const U16*) ptr;
-    const U32 tableLog = MEM_read16(ptr);
-    statePtr->value = (ptrdiff_t)1<<tableLog;
-    statePtr->stateTable = u16ptr+2;
-    statePtr->symbolTT = ct + 1 + (tableLog ? (1<<(tableLog-1)) : 1);
-    statePtr->stateLog = tableLog;
-}
-
-
-/*! FSE_initCState2() :
-*   Same as FSE_initCState(), but the first symbol to include (which will be the last to be read)
-*   uses the smallest state value possible, saving the cost of this symbol */
-MEM_STATIC void FSE_initCState2(FSE_CState_t* statePtr, const FSE_CTable* ct, U32 symbol)
-{
-    FSE_initCState(statePtr, ct);
-    {   const FSE_symbolCompressionTransform symbolTT = ((const FSE_symbolCompressionTransform*)(statePtr->symbolTT))[symbol];
-        const U16* stateTable = (const U16*)(statePtr->stateTable);
-        U32 nbBitsOut  = (U32)((symbolTT.deltaNbBits + (1<<15)) >> 16);
-        statePtr->value = (nbBitsOut << 16) - symbolTT.deltaNbBits;
-        statePtr->value = stateTable[(statePtr->value >> nbBitsOut) + symbolTT.deltaFindState];
-    }
-}
-
-MEM_STATIC void FSE_encodeSymbol(BIT_CStream_t* bitC, FSE_CState_t* statePtr, unsigned symbol)
-{
-    FSE_symbolCompressionTransform const symbolTT = ((const FSE_symbolCompressionTransform*)(statePtr->symbolTT))[symbol];
-    const U16* const stateTable = (const U16*)(statePtr->stateTable);
-    U32 const nbBitsOut  = (U32)((statePtr->value + symbolTT.deltaNbBits) >> 16);
-    BIT_addBits(bitC, statePtr->value, nbBitsOut);
-    statePtr->value = stateTable[ (statePtr->value >> nbBitsOut) + symbolTT.deltaFindState];
-}
-
-MEM_STATIC void FSE_flushCState(BIT_CStream_t* bitC, const FSE_CState_t* statePtr)
-{
-    BIT_addBits(bitC, statePtr->value, statePtr->stateLog);
-    BIT_flushBits(bitC);
-}
-
-
-/* FSE_getMaxNbBits() :
- * Approximate maximum cost of a symbol, in bits.
- * Fractional get rounded up (i.e : a symbol with a normalized frequency of 3 gives the same result as a frequency of 2)
- * note 1 : assume symbolValue is valid (<= maxSymbolValue)
- * note 2 : if freq[symbolValue]==0, @return a fake cost of tableLog+1 bits */
-MEM_STATIC U32 FSE_getMaxNbBits(const void* symbolTTPtr, U32 symbolValue)
-{
-    const FSE_symbolCompressionTransform* symbolTT = (const FSE_symbolCompressionTransform*) symbolTTPtr;
-    return (symbolTT[symbolValue].deltaNbBits + ((1<<16)-1)) >> 16;
-}
-
-/* FSE_bitCost() :
- * Approximate symbol cost, as fractional value, using fixed-point format (accuracyLog fractional bits)
- * note 1 : assume symbolValue is valid (<= maxSymbolValue)
- * note 2 : if freq[symbolValue]==0, @return a fake cost of tableLog+1 bits */
-MEM_STATIC U32 FSE_bitCost(const void* symbolTTPtr, U32 tableLog, U32 symbolValue, U32 accuracyLog)
-{
-    const FSE_symbolCompressionTransform* symbolTT = (const FSE_symbolCompressionTransform*) symbolTTPtr;
-    U32 const minNbBits = symbolTT[symbolValue].deltaNbBits >> 16;
-    U32 const threshold = (minNbBits+1) << 16;
-    assert(tableLog < 16);
-    assert(accuracyLog < 31-tableLog);  /* ensure enough room for renormalization double shift */
-    {   U32 const tableSize = 1 << tableLog;
-        U32 const deltaFromThreshold = threshold - (symbolTT[symbolValue].deltaNbBits + tableSize);
-        U32 const normalizedDeltaFromThreshold = (deltaFromThreshold << accuracyLog) >> tableLog;   /* linear interpolation (very approximate) */
-        U32 const bitMultiplier = 1 << accuracyLog;
-        assert(symbolTT[symbolValue].deltaNbBits + tableSize <= threshold);
-        assert(normalizedDeltaFromThreshold <= bitMultiplier);
-        return (minNbBits+1)*bitMultiplier - normalizedDeltaFromThreshold;
-    }
-}
-
-
-/* ======    Decompression    ====== */
-
-typedef struct {
-    U16 tableLog;
-    U16 fastMode;
-} FSE_DTableHeader;   /* sizeof U32 */
-
-typedef struct
-{
-    unsigned short newState;
-    unsigned char  symbol;
-    unsigned char  nbBits;
-} FSE_decode_t;   /* size == U32 */
-
-MEM_STATIC void FSE_initDState(FSE_DState_t* DStatePtr, BIT_DStream_t* bitD, const FSE_DTable* dt)
-{
-    const void* ptr = dt;
-    const FSE_DTableHeader* const DTableH = (const FSE_DTableHeader*)ptr;
-    DStatePtr->state = BIT_readBits(bitD, DTableH->tableLog);
-    BIT_reloadDStream(bitD);
-    DStatePtr->table = dt + 1;
-}
-
-MEM_STATIC BYTE FSE_peekSymbol(const FSE_DState_t* DStatePtr)
-{
-    FSE_decode_t const DInfo = ((const FSE_decode_t*)(DStatePtr->table))[DStatePtr->state];
-    return DInfo.symbol;
-}
-
-MEM_STATIC void FSE_updateState(FSE_DState_t* DStatePtr, BIT_DStream_t* bitD)
-{
-    FSE_decode_t const DInfo = ((const FSE_decode_t*)(DStatePtr->table))[DStatePtr->state];
-    U32 const nbBits = DInfo.nbBits;
-    size_t const lowBits = BIT_readBits(bitD, nbBits);
-    DStatePtr->state = DInfo.newState + lowBits;
-}
-
-MEM_STATIC BYTE FSE_decodeSymbol(FSE_DState_t* DStatePtr, BIT_DStream_t* bitD)
-{
-    FSE_decode_t const DInfo = ((const FSE_decode_t*)(DStatePtr->table))[DStatePtr->state];
-    U32 const nbBits = DInfo.nbBits;
-    BYTE const symbol = DInfo.symbol;
-    size_t const lowBits = BIT_readBits(bitD, nbBits);
-
-    DStatePtr->state = DInfo.newState + lowBits;
-    return symbol;
-}
-
-/*! FSE_decodeSymbolFast() :
-    unsafe, only works if no symbol has a probability > 50% */
-MEM_STATIC BYTE FSE_decodeSymbolFast(FSE_DState_t* DStatePtr, BIT_DStream_t* bitD)
-{
-    FSE_decode_t const DInfo = ((const FSE_decode_t*)(DStatePtr->table))[DStatePtr->state];
-    U32 const nbBits = DInfo.nbBits;
-    BYTE const symbol = DInfo.symbol;
-    size_t const lowBits = BIT_readBitsFast(bitD, nbBits);
-
-    DStatePtr->state = DInfo.newState + lowBits;
-    return symbol;
-}
-
-MEM_STATIC unsigned FSE_endOfDState(const FSE_DState_t* DStatePtr)
-{
-    return DStatePtr->state == 0;
-}
-
-
-
-#ifndef FSE_COMMONDEFS_ONLY
-
-/* **************************************************************
-*  Tuning parameters
-****************************************************************/
-/*!MEMORY_USAGE :
-*  Memory usage formula : N->2^N Bytes (examples : 10 -> 1KB; 12 -> 4KB ; 16 -> 64KB; 20 -> 1MB; etc.)
-*  Increasing memory usage improves compression ratio
-*  Reduced memory usage can improve speed, due to cache effect
-*  Recommended max value is 14, for 16KB, which nicely fits into Intel x86 L1 cache */
-#ifndef FSE_MAX_MEMORY_USAGE
-#  define FSE_MAX_MEMORY_USAGE 14
-#endif
-#ifndef FSE_DEFAULT_MEMORY_USAGE
-#  define FSE_DEFAULT_MEMORY_USAGE 13
-#endif
-
-/*!FSE_MAX_SYMBOL_VALUE :
-*  Maximum symbol value authorized.
-*  Required for proper stack allocation */
-#ifndef FSE_MAX_SYMBOL_VALUE
-#  define FSE_MAX_SYMBOL_VALUE 255
-#endif
-
-/* **************************************************************
-*  template functions type & suffix
-****************************************************************/
-#define FSE_FUNCTION_TYPE BYTE
-#define FSE_FUNCTION_EXTENSION
-#define FSE_DECODE_TYPE FSE_decode_t
-
-
-#endif   /* !FSE_COMMONDEFS_ONLY */
-
-
-/* ***************************************************************
-*  Constants
-*****************************************************************/
-#define FSE_MAX_TABLELOG  (FSE_MAX_MEMORY_USAGE-2)
-#define FSE_MAX_TABLESIZE (1U<<FSE_MAX_TABLELOG)
-#define FSE_MAXTABLESIZE_MASK (FSE_MAX_TABLESIZE-1)
-#define FSE_DEFAULT_TABLELOG (FSE_DEFAULT_MEMORY_USAGE-2)
-#define FSE_MIN_TABLELOG 5
-
-#define FSE_TABLELOG_ABSOLUTE_MAX 15
-#if FSE_MAX_TABLELOG > FSE_TABLELOG_ABSOLUTE_MAX
-#  error "FSE_MAX_TABLELOG > FSE_TABLELOG_ABSOLUTE_MAX is not supported"
-#endif
-
-#define FSE_TABLESTEP(tableSize) ((tableSize>>1) + (tableSize>>3) + 3)
-
-
-#endif /* FSE_STATIC_LINKING_ONLY */
-
-
-#if defined (__cplusplus)
-}
-#endif
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/common/huf.h mysql-8.0-8.0.27/extra/zstd/lib/common/huf.h
--- mysql-8.0-8.0.26/extra/zstd/lib/common/huf.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/common/huf.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,358 +0,0 @@
-/* ******************************************************************
-   huff0 huffman codec,
-   part of Finite State Entropy library
-   Copyright (C) 2013-present, Yann Collet.
-
-   BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are
-   met:
-
-       * Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-       * Redistributions in binary form must reproduce the above
-   copyright notice, this list of conditions and the following disclaimer
-   in the documentation and/or other materials provided with the
-   distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-   You can contact the author at :
-   - Source repository : https://github.com/Cyan4973/FiniteStateEntropy
-****************************************************************** */
-
-#if defined (__cplusplus)
-extern "C" {
-#endif
-
-#ifndef HUF_H_298734234
-#define HUF_H_298734234
-
-/* *** Dependencies *** */
-#include <stddef.h>    /* size_t */
-
-
-/* *** library symbols visibility *** */
-/* Note : when linking with -fvisibility=hidden on gcc, or by default on Visual,
- *        HUF symbols remain "private" (internal symbols for library only).
- *        Set macro FSE_DLL_EXPORT to 1 if you want HUF symbols visible on DLL interface */
-#if defined(FSE_DLL_EXPORT) && (FSE_DLL_EXPORT==1) && defined(__GNUC__) && (__GNUC__ >= 4)
-#  define HUF_PUBLIC_API __attribute__ ((visibility ("default")))
-#elif defined(FSE_DLL_EXPORT) && (FSE_DLL_EXPORT==1)   /* Visual expected */
-#  define HUF_PUBLIC_API __declspec(dllexport)
-#elif defined(FSE_DLL_IMPORT) && (FSE_DLL_IMPORT==1)
-#  define HUF_PUBLIC_API __declspec(dllimport)  /* not required, just to generate faster code (saves a function pointer load from IAT and an indirect jump) */
-#else
-#  define HUF_PUBLIC_API
-#endif
-
-
-/* ========================== */
-/* ***  simple functions  *** */
-/* ========================== */
-
-/** HUF_compress() :
- *  Compress content from buffer 'src', of size 'srcSize', into buffer 'dst'.
- * 'dst' buffer must be already allocated.
- *  Compression runs faster if `dstCapacity` >= HUF_compressBound(srcSize).
- * `srcSize` must be <= `HUF_BLOCKSIZE_MAX` == 128 KB.
- * @return : size of compressed data (<= `dstCapacity`).
- *  Special values : if return == 0, srcData is not compressible => Nothing is stored within dst !!!
- *                   if HUF_isError(return), compression failed (more details using HUF_getErrorName())
- */
-HUF_PUBLIC_API size_t HUF_compress(void* dst, size_t dstCapacity,
-                             const void* src, size_t srcSize);
-
-/** HUF_decompress() :
- *  Decompress HUF data from buffer 'cSrc', of size 'cSrcSize',
- *  into already allocated buffer 'dst', of minimum size 'dstSize'.
- * `originalSize` : **must** be the ***exact*** size of original (uncompressed) data.
- *  Note : in contrast with FSE, HUF_decompress can regenerate
- *         RLE (cSrcSize==1) and uncompressed (cSrcSize==dstSize) data,
- *         because it knows size to regenerate (originalSize).
- * @return : size of regenerated data (== originalSize),
- *           or an error code, which can be tested using HUF_isError()
- */
-HUF_PUBLIC_API size_t HUF_decompress(void* dst,  size_t originalSize,
-                               const void* cSrc, size_t cSrcSize);
-
-
-/* ***   Tool functions *** */
-#define HUF_BLOCKSIZE_MAX (128 * 1024)                  /**< maximum input size for a single block compressed with HUF_compress */
-HUF_PUBLIC_API size_t HUF_compressBound(size_t size);   /**< maximum compressed size (worst case) */
-
-/* Error Management */
-HUF_PUBLIC_API unsigned    HUF_isError(size_t code);       /**< tells if a return value is an error code */
-HUF_PUBLIC_API const char* HUF_getErrorName(size_t code);  /**< provides error code string (useful for debugging) */
-
-
-/* ***   Advanced function   *** */
-
-/** HUF_compress2() :
- *  Same as HUF_compress(), but offers control over `maxSymbolValue` and `tableLog`.
- * `maxSymbolValue` must be <= HUF_SYMBOLVALUE_MAX .
- * `tableLog` must be `<= HUF_TABLELOG_MAX` . */
-HUF_PUBLIC_API size_t HUF_compress2 (void* dst, size_t dstCapacity,
-                               const void* src, size_t srcSize,
-                               unsigned maxSymbolValue, unsigned tableLog);
-
-/** HUF_compress4X_wksp() :
- *  Same as HUF_compress2(), but uses externally allocated `workSpace`.
- * `workspace` must have minimum alignment of 4, and be at least as large as HUF_WORKSPACE_SIZE */
-#define HUF_WORKSPACE_SIZE (6 << 10)
-#define HUF_WORKSPACE_SIZE_U32 (HUF_WORKSPACE_SIZE / sizeof(U32))
-HUF_PUBLIC_API size_t HUF_compress4X_wksp (void* dst, size_t dstCapacity,
-                                     const void* src, size_t srcSize,
-                                     unsigned maxSymbolValue, unsigned tableLog,
-                                     void* workSpace, size_t wkspSize);
-
-#endif   /* HUF_H_298734234 */
-
-/* ******************************************************************
- *  WARNING !!
- *  The following section contains advanced and experimental definitions
- *  which shall never be used in the context of a dynamic library,
- *  because they are not guaranteed to remain stable in the future.
- *  Only consider them in association with static linking.
- * *****************************************************************/
-#if defined(HUF_STATIC_LINKING_ONLY) && !defined(HUF_H_HUF_STATIC_LINKING_ONLY)
-#define HUF_H_HUF_STATIC_LINKING_ONLY
-
-/* *** Dependencies *** */
-#include "mem.h"   /* U32 */
-
-
-/* *** Constants *** */
-#define HUF_TABLELOG_MAX      12      /* max runtime value of tableLog (due to static allocation); can be modified up to HUF_ABSOLUTEMAX_TABLELOG */
-#define HUF_TABLELOG_DEFAULT  11      /* default tableLog value when none specified */
-#define HUF_SYMBOLVALUE_MAX  255
-
-#define HUF_TABLELOG_ABSOLUTEMAX  15  /* absolute limit of HUF_MAX_TABLELOG. Beyond that value, code does not work */
-#if (HUF_TABLELOG_MAX > HUF_TABLELOG_ABSOLUTEMAX)
-#  error "HUF_TABLELOG_MAX is too large !"
-#endif
-
-
-/* ****************************************
-*  Static allocation
-******************************************/
-/* HUF buffer bounds */
-#define HUF_CTABLEBOUND 129
-#define HUF_BLOCKBOUND(size) (size + (size>>8) + 8)   /* only true when incompressible is pre-filtered with fast heuristic */
-#define HUF_COMPRESSBOUND(size) (HUF_CTABLEBOUND + HUF_BLOCKBOUND(size))   /* Macro version, useful for static allocation */
-
-/* static allocation of HUF's Compression Table */
-#define HUF_CTABLE_SIZE_U32(maxSymbolValue)   ((maxSymbolValue)+1)   /* Use tables of U32, for proper alignment */
-#define HUF_CTABLE_SIZE(maxSymbolValue)       (HUF_CTABLE_SIZE_U32(maxSymbolValue) * sizeof(U32))
-#define HUF_CREATE_STATIC_CTABLE(name, maxSymbolValue) \
-    U32 name##hb[HUF_CTABLE_SIZE_U32(maxSymbolValue)]; \
-    void* name##hv = &(name##hb); \
-    HUF_CElt* name = (HUF_CElt*)(name##hv)   /* no final ; */
-
-/* static allocation of HUF's DTable */
-typedef U32 HUF_DTable;
-#define HUF_DTABLE_SIZE(maxTableLog)   (1 + (1<<(maxTableLog)))
-#define HUF_CREATE_STATIC_DTABLEX1(DTable, maxTableLog) \
-        HUF_DTable DTable[HUF_DTABLE_SIZE((maxTableLog)-1)] = { ((U32)((maxTableLog)-1) * 0x01000001) }
-#define HUF_CREATE_STATIC_DTABLEX2(DTable, maxTableLog) \
-        HUF_DTable DTable[HUF_DTABLE_SIZE(maxTableLog)] = { ((U32)(maxTableLog) * 0x01000001) }
-
-
-/* ****************************************
-*  Advanced decompression functions
-******************************************/
-size_t HUF_decompress4X1 (void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize);   /**< single-symbol decoder */
-#ifndef HUF_FORCE_DECOMPRESS_X1
-size_t HUF_decompress4X2 (void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize);   /**< double-symbols decoder */
-#endif
-
-size_t HUF_decompress4X_DCtx (HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize);   /**< decodes RLE and uncompressed */
-size_t HUF_decompress4X_hufOnly(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize); /**< considers RLE and uncompressed as errors */
-size_t HUF_decompress4X_hufOnly_wksp(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize, void* workSpace, size_t wkspSize); /**< considers RLE and uncompressed as errors */
-size_t HUF_decompress4X1_DCtx(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize);   /**< single-symbol decoder */
-size_t HUF_decompress4X1_DCtx_wksp(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize, void* workSpace, size_t wkspSize);   /**< single-symbol decoder */
-#ifndef HUF_FORCE_DECOMPRESS_X1
-size_t HUF_decompress4X2_DCtx(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize);   /**< double-symbols decoder */
-size_t HUF_decompress4X2_DCtx_wksp(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize, void* workSpace, size_t wkspSize);   /**< double-symbols decoder */
-#endif
-
-
-/* ****************************************
- *  HUF detailed API
- * ****************************************/
-
-/*! HUF_compress() does the following:
- *  1. count symbol occurrence from source[] into table count[] using FSE_count() (exposed within "fse.h")
- *  2. (optional) refine tableLog using HUF_optimalTableLog()
- *  3. build Huffman table from count using HUF_buildCTable()
- *  4. save Huffman table to memory buffer using HUF_writeCTable()
- *  5. encode the data stream using HUF_compress4X_usingCTable()
- *
- *  The following API allows targeting specific sub-functions for advanced tasks.
- *  For example, it's possible to compress several blocks using the same 'CTable',
- *  or to save and regenerate 'CTable' using external methods.
- */
-unsigned HUF_optimalTableLog(unsigned maxTableLog, size_t srcSize, unsigned maxSymbolValue);
-typedef struct HUF_CElt_s HUF_CElt;   /* incomplete type */
-size_t HUF_buildCTable (HUF_CElt* CTable, const unsigned* count, unsigned maxSymbolValue, unsigned maxNbBits);   /* @return : maxNbBits; CTable and count can overlap. In which case, CTable will overwrite count content */
-size_t HUF_writeCTable (void* dst, size_t maxDstSize, const HUF_CElt* CTable, unsigned maxSymbolValue, unsigned huffLog);
-size_t HUF_compress4X_usingCTable(void* dst, size_t dstSize, const void* src, size_t srcSize, const HUF_CElt* CTable);
-
-typedef enum {
-   HUF_repeat_none,  /**< Cannot use the previous table */
-   HUF_repeat_check, /**< Can use the previous table but it must be checked. Note : The previous table must have been constructed by HUF_compress{1, 4}X_repeat */
-   HUF_repeat_valid  /**< Can use the previous table and it is assumed to be valid */
- } HUF_repeat;
-/** HUF_compress4X_repeat() :
- *  Same as HUF_compress4X_wksp(), but considers using hufTable if *repeat != HUF_repeat_none.
- *  If it uses hufTable it does not modify hufTable or repeat.
- *  If it doesn't, it sets *repeat = HUF_repeat_none, and it sets hufTable to the table used.
- *  If preferRepeat then the old table will always be used if valid. */
-size_t HUF_compress4X_repeat(void* dst, size_t dstSize,
-                       const void* src, size_t srcSize,
-                       unsigned maxSymbolValue, unsigned tableLog,
-                       void* workSpace, size_t wkspSize,    /**< `workSpace` must be aligned on 4-bytes boundaries, `wkspSize` must be >= HUF_WORKSPACE_SIZE */
-                       HUF_CElt* hufTable, HUF_repeat* repeat, int preferRepeat, int bmi2);
-
-/** HUF_buildCTable_wksp() :
- *  Same as HUF_buildCTable(), but using externally allocated scratch buffer.
- * `workSpace` must be aligned on 4-bytes boundaries, and its size must be >= HUF_CTABLE_WORKSPACE_SIZE.
- */
-#define HUF_CTABLE_WORKSPACE_SIZE_U32 (2*HUF_SYMBOLVALUE_MAX +1 +1)
-#define HUF_CTABLE_WORKSPACE_SIZE (HUF_CTABLE_WORKSPACE_SIZE_U32 * sizeof(unsigned))
-size_t HUF_buildCTable_wksp (HUF_CElt* tree,
-                       const unsigned* count, U32 maxSymbolValue, U32 maxNbBits,
-                             void* workSpace, size_t wkspSize);
-
-/*! HUF_readStats() :
- *  Read compact Huffman tree, saved by HUF_writeCTable().
- * `huffWeight` is destination buffer.
- * @return : size read from `src` , or an error Code .
- *  Note : Needed by HUF_readCTable() and HUF_readDTableXn() . */
-size_t HUF_readStats(BYTE* huffWeight, size_t hwSize,
-                     U32* rankStats, U32* nbSymbolsPtr, U32* tableLogPtr,
-                     const void* src, size_t srcSize);
-
-/** HUF_readCTable() :
- *  Loading a CTable saved with HUF_writeCTable() */
-size_t HUF_readCTable (HUF_CElt* CTable, unsigned* maxSymbolValuePtr, const void* src, size_t srcSize);
-
-/** HUF_getNbBits() :
- *  Read nbBits from CTable symbolTable, for symbol `symbolValue` presumed <= HUF_SYMBOLVALUE_MAX
- *  Note 1 : is not inlined, as HUF_CElt definition is private
- *  Note 2 : const void* used, so that it can provide a statically allocated table as argument (which uses type U32) */
-U32 HUF_getNbBits(const void* symbolTable, U32 symbolValue);
-
-/*
- * HUF_decompress() does the following:
- * 1. select the decompression algorithm (X1, X2) based on pre-computed heuristics
- * 2. build Huffman table from save, using HUF_readDTableX?()
- * 3. decode 1 or 4 segments in parallel using HUF_decompress?X?_usingDTable()
- */
-
-/** HUF_selectDecoder() :
- *  Tells which decoder is likely to decode faster,
- *  based on a set of pre-computed metrics.
- * @return : 0==HUF_decompress4X1, 1==HUF_decompress4X2 .
- *  Assumption : 0 < dstSize <= 128 KB */
-U32 HUF_selectDecoder (size_t dstSize, size_t cSrcSize);
-
-/**
- *  The minimum workspace size for the `workSpace` used in
- *  HUF_readDTableX1_wksp() and HUF_readDTableX2_wksp().
- *
- *  The space used depends on HUF_TABLELOG_MAX, ranging from ~1500 bytes when
- *  HUF_TABLE_LOG_MAX=12 to ~1850 bytes when HUF_TABLE_LOG_MAX=15.
- *  Buffer overflow errors may potentially occur if code modifications result in
- *  a required workspace size greater than that specified in the following
- *  macro.
- */
-#define HUF_DECOMPRESS_WORKSPACE_SIZE (2 << 10)
-#define HUF_DECOMPRESS_WORKSPACE_SIZE_U32 (HUF_DECOMPRESS_WORKSPACE_SIZE / sizeof(U32))
-
-#ifndef HUF_FORCE_DECOMPRESS_X2
-size_t HUF_readDTableX1 (HUF_DTable* DTable, const void* src, size_t srcSize);
-size_t HUF_readDTableX1_wksp (HUF_DTable* DTable, const void* src, size_t srcSize, void* workSpace, size_t wkspSize);
-#endif
-#ifndef HUF_FORCE_DECOMPRESS_X1
-size_t HUF_readDTableX2 (HUF_DTable* DTable, const void* src, size_t srcSize);
-size_t HUF_readDTableX2_wksp (HUF_DTable* DTable, const void* src, size_t srcSize, void* workSpace, size_t wkspSize);
-#endif
-
-size_t HUF_decompress4X_usingDTable(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const HUF_DTable* DTable);
-#ifndef HUF_FORCE_DECOMPRESS_X2
-size_t HUF_decompress4X1_usingDTable(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const HUF_DTable* DTable);
-#endif
-#ifndef HUF_FORCE_DECOMPRESS_X1
-size_t HUF_decompress4X2_usingDTable(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const HUF_DTable* DTable);
-#endif
-
-
-/* ====================== */
-/* single stream variants */
-/* ====================== */
-
-size_t HUF_compress1X (void* dst, size_t dstSize, const void* src, size_t srcSize, unsigned maxSymbolValue, unsigned tableLog);
-size_t HUF_compress1X_wksp (void* dst, size_t dstSize, const void* src, size_t srcSize, unsigned maxSymbolValue, unsigned tableLog, void* workSpace, size_t wkspSize);  /**< `workSpace` must be a table of at least HUF_WORKSPACE_SIZE_U32 unsigned */
-size_t HUF_compress1X_usingCTable(void* dst, size_t dstSize, const void* src, size_t srcSize, const HUF_CElt* CTable);
-/** HUF_compress1X_repeat() :
- *  Same as HUF_compress1X_wksp(), but considers using hufTable if *repeat != HUF_repeat_none.
- *  If it uses hufTable it does not modify hufTable or repeat.
- *  If it doesn't, it sets *repeat = HUF_repeat_none, and it sets hufTable to the table used.
- *  If preferRepeat then the old table will always be used if valid. */
-size_t HUF_compress1X_repeat(void* dst, size_t dstSize,
-                       const void* src, size_t srcSize,
-                       unsigned maxSymbolValue, unsigned tableLog,
-                       void* workSpace, size_t wkspSize,   /**< `workSpace` must be aligned on 4-bytes boundaries, `wkspSize` must be >= HUF_WORKSPACE_SIZE */
-                       HUF_CElt* hufTable, HUF_repeat* repeat, int preferRepeat, int bmi2);
-
-size_t HUF_decompress1X1 (void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize);   /* single-symbol decoder */
-#ifndef HUF_FORCE_DECOMPRESS_X1
-size_t HUF_decompress1X2 (void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize);   /* double-symbol decoder */
-#endif
-
-size_t HUF_decompress1X_DCtx (HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize);
-size_t HUF_decompress1X_DCtx_wksp (HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize, void* workSpace, size_t wkspSize);
-#ifndef HUF_FORCE_DECOMPRESS_X2
-size_t HUF_decompress1X1_DCtx(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize);   /**< single-symbol decoder */
-size_t HUF_decompress1X1_DCtx_wksp(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize, void* workSpace, size_t wkspSize);   /**< single-symbol decoder */
-#endif
-#ifndef HUF_FORCE_DECOMPRESS_X1
-size_t HUF_decompress1X2_DCtx(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize);   /**< double-symbols decoder */
-size_t HUF_decompress1X2_DCtx_wksp(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize, void* workSpace, size_t wkspSize);   /**< double-symbols decoder */
-#endif
-
-size_t HUF_decompress1X_usingDTable(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const HUF_DTable* DTable);   /**< automatic selection of sing or double symbol decoder, based on DTable */
-#ifndef HUF_FORCE_DECOMPRESS_X2
-size_t HUF_decompress1X1_usingDTable(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const HUF_DTable* DTable);
-#endif
-#ifndef HUF_FORCE_DECOMPRESS_X1
-size_t HUF_decompress1X2_usingDTable(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const HUF_DTable* DTable);
-#endif
-
-/* BMI2 variants.
- * If the CPU has BMI2 support, pass bmi2=1, otherwise pass bmi2=0.
- */
-size_t HUF_decompress1X_usingDTable_bmi2(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const HUF_DTable* DTable, int bmi2);
-#ifndef HUF_FORCE_DECOMPRESS_X2
-size_t HUF_decompress1X1_DCtx_wksp_bmi2(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize, void* workSpace, size_t wkspSize, int bmi2);
-#endif
-size_t HUF_decompress4X_usingDTable_bmi2(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const HUF_DTable* DTable, int bmi2);
-size_t HUF_decompress4X_hufOnly_wksp_bmi2(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize, void* workSpace, size_t wkspSize, int bmi2);
-
-#endif /* HUF_STATIC_LINKING_ONLY */
-
-#if defined (__cplusplus)
-}
-#endif
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/common/mem.h mysql-8.0-8.0.27/extra/zstd/lib/common/mem.h
--- mysql-8.0-8.0.26/extra/zstd/lib/common/mem.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/common/mem.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,380 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
-#ifndef MEM_H_MODULE
-#define MEM_H_MODULE
-
-#if defined (__cplusplus)
-extern "C" {
-#endif
-
-/*-****************************************
-*  Dependencies
-******************************************/
-#include <stddef.h>     /* size_t, ptrdiff_t */
-#include <string.h>     /* memcpy */
-
-
-/*-****************************************
-*  Compiler specifics
-******************************************/
-#if defined(_MSC_VER)   /* Visual Studio */
-#   include <stdlib.h>  /* _byteswap_ulong */
-#   include <intrin.h>  /* _byteswap_* */
-#endif
-#if defined(__GNUC__)
-#  define MEM_STATIC static __inline __attribute__((unused))
-#elif defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */)
-#  define MEM_STATIC static inline
-#elif defined(_MSC_VER)
-#  define MEM_STATIC static __inline
-#else
-#  define MEM_STATIC static  /* this version may generate warnings for unused static functions; disable the relevant warning */
-#endif
-
-#ifndef __has_builtin
-#  define __has_builtin(x) 0  /* compat. with non-clang compilers */
-#endif
-
-/* code only tested on 32 and 64 bits systems */
-#define MEM_STATIC_ASSERT(c)   { enum { MEM_static_assert = 1/(int)(!!(c)) }; }
-MEM_STATIC void MEM_check(void) { MEM_STATIC_ASSERT((sizeof(size_t)==4) || (sizeof(size_t)==8)); }
-
-
-/*-**************************************************************
-*  Basic Types
-*****************************************************************/
-#if  !defined (__VMS) && (defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) )
-# include <stdint.h>
-  typedef   uint8_t BYTE;
-  typedef  uint16_t U16;
-  typedef   int16_t S16;
-  typedef  uint32_t U32;
-  typedef   int32_t S32;
-  typedef  uint64_t U64;
-  typedef   int64_t S64;
-#else
-# include <limits.h>
-#if CHAR_BIT != 8
-#  error "this implementation requires char to be exactly 8-bit type"
-#endif
-  typedef unsigned char      BYTE;
-#if USHRT_MAX != 65535
-#  error "this implementation requires short to be exactly 16-bit type"
-#endif
-  typedef unsigned short      U16;
-  typedef   signed short      S16;
-#if UINT_MAX != 4294967295
-#  error "this implementation requires int to be exactly 32-bit type"
-#endif
-  typedef unsigned int        U32;
-  typedef   signed int        S32;
-/* note : there are no limits defined for long long type in C90.
- * limits exist in C99, however, in such case, <stdint.h> is preferred */
-  typedef unsigned long long  U64;
-  typedef   signed long long  S64;
-#endif
-
-
-/*-**************************************************************
-*  Memory I/O
-*****************************************************************/
-/* MEM_FORCE_MEMORY_ACCESS :
- * By default, access to unaligned memory is controlled by `memcpy()`, which is safe and portable.
- * Unfortunately, on some target/compiler combinations, the generated assembly is sub-optimal.
- * The below switch allow to select different access method for improved performance.
- * Method 0 (default) : use `memcpy()`. Safe and portable.
- * Method 1 : `__packed` statement. It depends on compiler extension (i.e., not portable).
- *            This method is safe if your compiler supports it, and *generally* as fast or faster than `memcpy`.
- * Method 2 : direct access. This method is portable but violate C standard.
- *            It can generate buggy code on targets depending on alignment.
- *            In some circumstances, it's the only known way to get the most performance (i.e. GCC + ARMv6)
- * See http://fastcompression.blogspot.fr/2015/08/accessing-unaligned-memory.html for details.
- * Prefer these methods in priority order (0 > 1 > 2)
- */
-#ifndef MEM_FORCE_MEMORY_ACCESS   /* can be defined externally, on command line for example */
-#  if defined(__GNUC__) && ( defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) )
-#    define MEM_FORCE_MEMORY_ACCESS 2
-#  elif defined(__INTEL_COMPILER) || defined(__GNUC__) || defined(__ICCARM__)
-#    define MEM_FORCE_MEMORY_ACCESS 1
-#  endif
-#endif
-
-MEM_STATIC unsigned MEM_32bits(void) { return sizeof(size_t)==4; }
-MEM_STATIC unsigned MEM_64bits(void) { return sizeof(size_t)==8; }
-
-MEM_STATIC unsigned MEM_isLittleEndian(void)
-{
-    const union { U32 u; BYTE c[4]; } one = { 1 };   /* don't use static : performance detrimental  */
-    return one.c[0];
-}
-
-#if defined(MEM_FORCE_MEMORY_ACCESS) && (MEM_FORCE_MEMORY_ACCESS==2)
-
-/* violates C standard, by lying on structure alignment.
-Only use if no other choice to achieve best performance on target platform */
-MEM_STATIC U16 MEM_read16(const void* memPtr) { return *(const U16*) memPtr; }
-MEM_STATIC U32 MEM_read32(const void* memPtr) { return *(const U32*) memPtr; }
-MEM_STATIC U64 MEM_read64(const void* memPtr) { return *(const U64*) memPtr; }
-MEM_STATIC size_t MEM_readST(const void* memPtr) { return *(const size_t*) memPtr; }
-
-MEM_STATIC void MEM_write16(void* memPtr, U16 value) { *(U16*)memPtr = value; }
-MEM_STATIC void MEM_write32(void* memPtr, U32 value) { *(U32*)memPtr = value; }
-MEM_STATIC void MEM_write64(void* memPtr, U64 value) { *(U64*)memPtr = value; }
-
-#elif defined(MEM_FORCE_MEMORY_ACCESS) && (MEM_FORCE_MEMORY_ACCESS==1)
-
-/* __pack instructions are safer, but compiler specific, hence potentially problematic for some compilers */
-/* currently only defined for gcc and icc */
-#if defined(_MSC_VER) || (defined(__INTEL_COMPILER) && defined(WIN32))
-    __pragma( pack(push, 1) )
-    typedef struct { U16 v; } unalign16;
-    typedef struct { U32 v; } unalign32;
-    typedef struct { U64 v; } unalign64;
-    typedef struct { size_t v; } unalignArch;
-    __pragma( pack(pop) )
-#else
-    typedef struct { U16 v; } __attribute__((packed)) unalign16;
-    typedef struct { U32 v; } __attribute__((packed)) unalign32;
-    typedef struct { U64 v; } __attribute__((packed)) unalign64;
-    typedef struct { size_t v; } __attribute__((packed)) unalignArch;
-#endif
-
-MEM_STATIC U16 MEM_read16(const void* ptr) { return ((const unalign16*)ptr)->v; }
-MEM_STATIC U32 MEM_read32(const void* ptr) { return ((const unalign32*)ptr)->v; }
-MEM_STATIC U64 MEM_read64(const void* ptr) { return ((const unalign64*)ptr)->v; }
-MEM_STATIC size_t MEM_readST(const void* ptr) { return ((const unalignArch*)ptr)->v; }
-
-MEM_STATIC void MEM_write16(void* memPtr, U16 value) { ((unalign16*)memPtr)->v = value; }
-MEM_STATIC void MEM_write32(void* memPtr, U32 value) { ((unalign32*)memPtr)->v = value; }
-MEM_STATIC void MEM_write64(void* memPtr, U64 value) { ((unalign64*)memPtr)->v = value; }
-
-#else
-
-/* default method, safe and standard.
-   can sometimes prove slower */
-
-MEM_STATIC U16 MEM_read16(const void* memPtr)
-{
-    U16 val; memcpy(&val, memPtr, sizeof(val)); return val;
-}
-
-MEM_STATIC U32 MEM_read32(const void* memPtr)
-{
-    U32 val; memcpy(&val, memPtr, sizeof(val)); return val;
-}
-
-MEM_STATIC U64 MEM_read64(const void* memPtr)
-{
-    U64 val; memcpy(&val, memPtr, sizeof(val)); return val;
-}
-
-MEM_STATIC size_t MEM_readST(const void* memPtr)
-{
-    size_t val; memcpy(&val, memPtr, sizeof(val)); return val;
-}
-
-MEM_STATIC void MEM_write16(void* memPtr, U16 value)
-{
-    memcpy(memPtr, &value, sizeof(value));
-}
-
-MEM_STATIC void MEM_write32(void* memPtr, U32 value)
-{
-    memcpy(memPtr, &value, sizeof(value));
-}
-
-MEM_STATIC void MEM_write64(void* memPtr, U64 value)
-{
-    memcpy(memPtr, &value, sizeof(value));
-}
-
-#endif /* MEM_FORCE_MEMORY_ACCESS */
-
-MEM_STATIC U32 MEM_swap32(U32 in)
-{
-#if defined(_MSC_VER)     /* Visual Studio */
-    return _byteswap_ulong(in);
-#elif (defined (__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 403)) \
-  || (defined(__clang__) && __has_builtin(__builtin_bswap32))
-    return __builtin_bswap32(in);
-#else
-    return  ((in << 24) & 0xff000000 ) |
-            ((in <<  8) & 0x00ff0000 ) |
-            ((in >>  8) & 0x0000ff00 ) |
-            ((in >> 24) & 0x000000ff );
-#endif
-}
-
-MEM_STATIC U64 MEM_swap64(U64 in)
-{
-#if defined(_MSC_VER)     /* Visual Studio */
-    return _byteswap_uint64(in);
-#elif (defined (__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 403)) \
-  || (defined(__clang__) && __has_builtin(__builtin_bswap64))
-    return __builtin_bswap64(in);
-#else
-    return  ((in << 56) & 0xff00000000000000ULL) |
-            ((in << 40) & 0x00ff000000000000ULL) |
-            ((in << 24) & 0x0000ff0000000000ULL) |
-            ((in << 8)  & 0x000000ff00000000ULL) |
-            ((in >> 8)  & 0x00000000ff000000ULL) |
-            ((in >> 24) & 0x0000000000ff0000ULL) |
-            ((in >> 40) & 0x000000000000ff00ULL) |
-            ((in >> 56) & 0x00000000000000ffULL);
-#endif
-}
-
-MEM_STATIC size_t MEM_swapST(size_t in)
-{
-    if (MEM_32bits())
-        return (size_t)MEM_swap32((U32)in);
-    else
-        return (size_t)MEM_swap64((U64)in);
-}
-
-/*=== Little endian r/w ===*/
-
-MEM_STATIC U16 MEM_readLE16(const void* memPtr)
-{
-    if (MEM_isLittleEndian())
-        return MEM_read16(memPtr);
-    else {
-        const BYTE* p = (const BYTE*)memPtr;
-        return (U16)(p[0] + (p[1]<<8));
-    }
-}
-
-MEM_STATIC void MEM_writeLE16(void* memPtr, U16 val)
-{
-    if (MEM_isLittleEndian()) {
-        MEM_write16(memPtr, val);
-    } else {
-        BYTE* p = (BYTE*)memPtr;
-        p[0] = (BYTE)val;
-        p[1] = (BYTE)(val>>8);
-    }
-}
-
-MEM_STATIC U32 MEM_readLE24(const void* memPtr)
-{
-    return MEM_readLE16(memPtr) + (((const BYTE*)memPtr)[2] << 16);
-}
-
-MEM_STATIC void MEM_writeLE24(void* memPtr, U32 val)
-{
-    MEM_writeLE16(memPtr, (U16)val);
-    ((BYTE*)memPtr)[2] = (BYTE)(val>>16);
-}
-
-MEM_STATIC U32 MEM_readLE32(const void* memPtr)
-{
-    if (MEM_isLittleEndian())
-        return MEM_read32(memPtr);
-    else
-        return MEM_swap32(MEM_read32(memPtr));
-}
-
-MEM_STATIC void MEM_writeLE32(void* memPtr, U32 val32)
-{
-    if (MEM_isLittleEndian())
-        MEM_write32(memPtr, val32);
-    else
-        MEM_write32(memPtr, MEM_swap32(val32));
-}
-
-MEM_STATIC U64 MEM_readLE64(const void* memPtr)
-{
-    if (MEM_isLittleEndian())
-        return MEM_read64(memPtr);
-    else
-        return MEM_swap64(MEM_read64(memPtr));
-}
-
-MEM_STATIC void MEM_writeLE64(void* memPtr, U64 val64)
-{
-    if (MEM_isLittleEndian())
-        MEM_write64(memPtr, val64);
-    else
-        MEM_write64(memPtr, MEM_swap64(val64));
-}
-
-MEM_STATIC size_t MEM_readLEST(const void* memPtr)
-{
-    if (MEM_32bits())
-        return (size_t)MEM_readLE32(memPtr);
-    else
-        return (size_t)MEM_readLE64(memPtr);
-}
-
-MEM_STATIC void MEM_writeLEST(void* memPtr, size_t val)
-{
-    if (MEM_32bits())
-        MEM_writeLE32(memPtr, (U32)val);
-    else
-        MEM_writeLE64(memPtr, (U64)val);
-}
-
-/*=== Big endian r/w ===*/
-
-MEM_STATIC U32 MEM_readBE32(const void* memPtr)
-{
-    if (MEM_isLittleEndian())
-        return MEM_swap32(MEM_read32(memPtr));
-    else
-        return MEM_read32(memPtr);
-}
-
-MEM_STATIC void MEM_writeBE32(void* memPtr, U32 val32)
-{
-    if (MEM_isLittleEndian())
-        MEM_write32(memPtr, MEM_swap32(val32));
-    else
-        MEM_write32(memPtr, val32);
-}
-
-MEM_STATIC U64 MEM_readBE64(const void* memPtr)
-{
-    if (MEM_isLittleEndian())
-        return MEM_swap64(MEM_read64(memPtr));
-    else
-        return MEM_read64(memPtr);
-}
-
-MEM_STATIC void MEM_writeBE64(void* memPtr, U64 val64)
-{
-    if (MEM_isLittleEndian())
-        MEM_write64(memPtr, MEM_swap64(val64));
-    else
-        MEM_write64(memPtr, val64);
-}
-
-MEM_STATIC size_t MEM_readBEST(const void* memPtr)
-{
-    if (MEM_32bits())
-        return (size_t)MEM_readBE32(memPtr);
-    else
-        return (size_t)MEM_readBE64(memPtr);
-}
-
-MEM_STATIC void MEM_writeBEST(void* memPtr, size_t val)
-{
-    if (MEM_32bits())
-        MEM_writeBE32(memPtr, (U32)val);
-    else
-        MEM_writeBE64(memPtr, (U64)val);
-}
-
-
-#if defined (__cplusplus)
-}
-#endif
-
-#endif /* MEM_H_MODULE */
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/common/my_zstd_xxhash.h mysql-8.0-8.0.27/extra/zstd/lib/common/my_zstd_xxhash.h
--- mysql-8.0-8.0.26/extra/zstd/lib/common/my_zstd_xxhash.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/common/my_zstd_xxhash.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-#ifndef MY_ZSTD_XXHASH_H_INCLUDED
-#define MY_ZSTD_XXHASH_H_INCLUDED
-
-/*
-  Copyright (c) 2016, 2021, Oracle 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,
-  as published by the Free Software Foundation.
-
-  This program is also distributed with certain software (including
-  but not limited to OpenSSL) that is licensed under separate terms,
-  as designated in a particular file or component or in included license
-  documentation.  The authors of MySQL hereby grant you an additional
-  permission to link the program and your derivative works with the
-  separately licensed software that they have included with MySQL.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License, version 2.0, for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  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.
-#undef  XXH_NAMESPACE
-#define XXH_NAMESPACE MY_ZSTD_
-
-#include "./xxhash.h"  // IWYU pragma: export
-
-#endif // MY_ZSTD_XXHASH_H_INCLUDED
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/common/pool.c mysql-8.0-8.0.27/extra/zstd/lib/common/pool.c
--- mysql-8.0-8.0.26/extra/zstd/lib/common/pool.c	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/common/pool.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,340 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
-
-/* ======   Dependencies   ======= */
-#include <stddef.h>    /* size_t */
-#include "debug.h"     /* assert */
-#include "zstd_internal.h"  /* ZSTD_malloc, ZSTD_free */
-#include "pool.h"
-
-/* ======   Compiler specifics   ====== */
-#if defined(_MSC_VER)
-#  pragma warning(disable : 4204)        /* disable: C4204: non-constant aggregate initializer */
-#endif
-
-
-#ifdef ZSTD_MULTITHREAD
-
-#include "threading.h"   /* pthread adaptation */
-
-/* A job is a function and an opaque argument */
-typedef struct POOL_job_s {
-    POOL_function function;
-    void *opaque;
-} POOL_job;
-
-struct POOL_ctx_s {
-    ZSTD_customMem customMem;
-    /* Keep track of the threads */
-    ZSTD_pthread_t* threads;
-    size_t threadCapacity;
-    size_t threadLimit;
-
-    /* The queue is a circular buffer */
-    POOL_job *queue;
-    size_t queueHead;
-    size_t queueTail;
-    size_t queueSize;
-
-    /* The number of threads working on jobs */
-    size_t numThreadsBusy;
-    /* Indicates if the queue is empty */
-    int queueEmpty;
-
-    /* The mutex protects the queue */
-    ZSTD_pthread_mutex_t queueMutex;
-    /* Condition variable for pushers to wait on when the queue is full */
-    ZSTD_pthread_cond_t queuePushCond;
-    /* Condition variables for poppers to wait on when the queue is empty */
-    ZSTD_pthread_cond_t queuePopCond;
-    /* Indicates if the queue is shutting down */
-    int shutdown;
-};
-
-/* POOL_thread() :
- * Work thread for the thread pool.
- * Waits for jobs and executes them.
- * @returns : NULL on failure else non-null.
- */
-static void* POOL_thread(void* opaque) {
-    POOL_ctx* const ctx = (POOL_ctx*)opaque;
-    if (!ctx) { return NULL; }
-    for (;;) {
-        /* Lock the mutex and wait for a non-empty queue or until shutdown */
-        ZSTD_pthread_mutex_lock(&ctx->queueMutex);
-
-        while ( ctx->queueEmpty
-            || (ctx->numThreadsBusy >= ctx->threadLimit) ) {
-            if (ctx->shutdown) {
-                /* even if !queueEmpty, (possible if numThreadsBusy >= threadLimit),
-                 * a few threads will be shutdown while !queueEmpty,
-                 * but enough threads will remain active to finish the queue */
-                ZSTD_pthread_mutex_unlock(&ctx->queueMutex);
-                return opaque;
-            }
-            ZSTD_pthread_cond_wait(&ctx->queuePopCond, &ctx->queueMutex);
-        }
-        /* Pop a job off the queue */
-        {   POOL_job const job = ctx->queue[ctx->queueHead];
-            ctx->queueHead = (ctx->queueHead + 1) % ctx->queueSize;
-            ctx->numThreadsBusy++;
-            ctx->queueEmpty = ctx->queueHead == ctx->queueTail;
-            /* Unlock the mutex, signal a pusher, and run the job */
-            ZSTD_pthread_cond_signal(&ctx->queuePushCond);
-            ZSTD_pthread_mutex_unlock(&ctx->queueMutex);
-
-            job.function(job.opaque);
-
-            /* If the intended queue size was 0, signal after finishing job */
-            ZSTD_pthread_mutex_lock(&ctx->queueMutex);
-            ctx->numThreadsBusy--;
-            if (ctx->queueSize == 1) {
-                ZSTD_pthread_cond_signal(&ctx->queuePushCond);
-            }
-            ZSTD_pthread_mutex_unlock(&ctx->queueMutex);
-        }
-    }  /* for (;;) */
-    assert(0);  /* Unreachable */
-}
-
-POOL_ctx* POOL_create(size_t numThreads, size_t queueSize) {
-    return POOL_create_advanced(numThreads, queueSize, ZSTD_defaultCMem);
-}
-
-POOL_ctx* POOL_create_advanced(size_t numThreads, size_t queueSize,
-                               ZSTD_customMem customMem) {
-    POOL_ctx* ctx;
-    /* Check parameters */
-    if (!numThreads) { return NULL; }
-    /* Allocate the context and zero initialize */
-    ctx = (POOL_ctx*)ZSTD_calloc(sizeof(POOL_ctx), customMem);
-    if (!ctx) { return NULL; }
-    /* Initialize the job queue.
-     * It needs one extra space since one space is wasted to differentiate
-     * empty and full queues.
-     */
-    ctx->queueSize = queueSize + 1;
-    ctx->queue = (POOL_job*)ZSTD_malloc(ctx->queueSize * sizeof(POOL_job), customMem);
-    ctx->queueHead = 0;
-    ctx->queueTail = 0;
-    ctx->numThreadsBusy = 0;
-    ctx->queueEmpty = 1;
-    (void)ZSTD_pthread_mutex_init(&ctx->queueMutex, NULL);
-    (void)ZSTD_pthread_cond_init(&ctx->queuePushCond, NULL);
-    (void)ZSTD_pthread_cond_init(&ctx->queuePopCond, NULL);
-    ctx->shutdown = 0;
-    /* Allocate space for the thread handles */
-    ctx->threads = (ZSTD_pthread_t*)ZSTD_malloc(numThreads * sizeof(ZSTD_pthread_t), customMem);
-    ctx->threadCapacity = 0;
-    ctx->customMem = customMem;
-    /* Check for errors */
-    if (!ctx->threads || !ctx->queue) { POOL_free(ctx); return NULL; }
-    /* Initialize the threads */
-    {   size_t i;
-        for (i = 0; i < numThreads; ++i) {
-            if (ZSTD_pthread_create(&ctx->threads[i], NULL, &POOL_thread, ctx)) {
-                ctx->threadCapacity = i;
-                POOL_free(ctx);
-                return NULL;
-        }   }
-        ctx->threadCapacity = numThreads;
-        ctx->threadLimit = numThreads;
-    }
-    return ctx;
-}
-
-/*! POOL_join() :
-    Shutdown the queue, wake any sleeping threads, and join all of the threads.
-*/
-static void POOL_join(POOL_ctx* ctx) {
-    /* Shut down the queue */
-    ZSTD_pthread_mutex_lock(&ctx->queueMutex);
-    ctx->shutdown = 1;
-    ZSTD_pthread_mutex_unlock(&ctx->queueMutex);
-    /* Wake up sleeping threads */
-    ZSTD_pthread_cond_broadcast(&ctx->queuePushCond);
-    ZSTD_pthread_cond_broadcast(&ctx->queuePopCond);
-    /* Join all of the threads */
-    {   size_t i;
-        for (i = 0; i < ctx->threadCapacity; ++i) {
-            ZSTD_pthread_join(ctx->threads[i], NULL);  /* note : could fail */
-    }   }
-}
-
-void POOL_free(POOL_ctx *ctx) {
-    if (!ctx) { return; }
-    POOL_join(ctx);
-    ZSTD_pthread_mutex_destroy(&ctx->queueMutex);
-    ZSTD_pthread_cond_destroy(&ctx->queuePushCond);
-    ZSTD_pthread_cond_destroy(&ctx->queuePopCond);
-    ZSTD_free(ctx->queue, ctx->customMem);
-    ZSTD_free(ctx->threads, ctx->customMem);
-    ZSTD_free(ctx, ctx->customMem);
-}
-
-
-
-size_t POOL_sizeof(POOL_ctx *ctx) {
-    if (ctx==NULL) return 0;  /* supports sizeof NULL */
-    return sizeof(*ctx)
-        + ctx->queueSize * sizeof(POOL_job)
-        + ctx->threadCapacity * sizeof(ZSTD_pthread_t);
-}
-
-
-/* @return : 0 on success, 1 on error */
-static int POOL_resize_internal(POOL_ctx* ctx, size_t numThreads)
-{
-    if (numThreads <= ctx->threadCapacity) {
-        if (!numThreads) return 1;
-        ctx->threadLimit = numThreads;
-        return 0;
-    }
-    /* numThreads > threadCapacity */
-    {   ZSTD_pthread_t* const threadPool = (ZSTD_pthread_t*)ZSTD_malloc(numThreads * sizeof(ZSTD_pthread_t), ctx->customMem);
-        if (!threadPool) return 1;
-        /* replace existing thread pool */
-        memcpy(threadPool, ctx->threads, ctx->threadCapacity * sizeof(*threadPool));
-        ZSTD_free(ctx->threads, ctx->customMem);
-        ctx->threads = threadPool;
-        /* Initialize additional threads */
-        {   size_t threadId;
-            for (threadId = ctx->threadCapacity; threadId < numThreads; ++threadId) {
-                if (ZSTD_pthread_create(&threadPool[threadId], NULL, &POOL_thread, ctx)) {
-                    ctx->threadCapacity = threadId;
-                    return 1;
-            }   }
-    }   }
-    /* successfully expanded */
-    ctx->threadCapacity = numThreads;
-    ctx->threadLimit = numThreads;
-    return 0;
-}
-
-/* @return : 0 on success, 1 on error */
-int POOL_resize(POOL_ctx* ctx, size_t numThreads)
-{
-    int result;
-    if (ctx==NULL) return 1;
-    ZSTD_pthread_mutex_lock(&ctx->queueMutex);
-    result = POOL_resize_internal(ctx, numThreads);
-    ZSTD_pthread_cond_broadcast(&ctx->queuePopCond);
-    ZSTD_pthread_mutex_unlock(&ctx->queueMutex);
-    return result;
-}
-
-/**
- * Returns 1 if the queue is full and 0 otherwise.
- *
- * When queueSize is 1 (pool was created with an intended queueSize of 0),
- * then a queue is empty if there is a thread free _and_ no job is waiting.
- */
-static int isQueueFull(POOL_ctx const* ctx) {
-    if (ctx->queueSize > 1) {
-        return ctx->queueHead == ((ctx->queueTail + 1) % ctx->queueSize);
-    } else {
-        return (ctx->numThreadsBusy == ctx->threadLimit) ||
-               !ctx->queueEmpty;
-    }
-}
-
-
-static void POOL_add_internal(POOL_ctx* ctx, POOL_function function, void *opaque)
-{
-    POOL_job const job = {function, opaque};
-    assert(ctx != NULL);
-    if (ctx->shutdown) return;
-
-    ctx->queueEmpty = 0;
-    ctx->queue[ctx->queueTail] = job;
-    ctx->queueTail = (ctx->queueTail + 1) % ctx->queueSize;
-    ZSTD_pthread_cond_signal(&ctx->queuePopCond);
-}
-
-void POOL_add(POOL_ctx* ctx, POOL_function function, void* opaque)
-{
-    assert(ctx != NULL);
-    ZSTD_pthread_mutex_lock(&ctx->queueMutex);
-    /* Wait until there is space in the queue for the new job */
-    while (isQueueFull(ctx) && (!ctx->shutdown)) {
-        ZSTD_pthread_cond_wait(&ctx->queuePushCond, &ctx->queueMutex);
-    }
-    POOL_add_internal(ctx, function, opaque);
-    ZSTD_pthread_mutex_unlock(&ctx->queueMutex);
-}
-
-
-int POOL_tryAdd(POOL_ctx* ctx, POOL_function function, void* opaque)
-{
-    assert(ctx != NULL);
-    ZSTD_pthread_mutex_lock(&ctx->queueMutex);
-    if (isQueueFull(ctx)) {
-        ZSTD_pthread_mutex_unlock(&ctx->queueMutex);
-        return 0;
-    }
-    POOL_add_internal(ctx, function, opaque);
-    ZSTD_pthread_mutex_unlock(&ctx->queueMutex);
-    return 1;
-}
-
-
-#else  /* ZSTD_MULTITHREAD  not defined */
-
-/* ========================== */
-/* No multi-threading support */
-/* ========================== */
-
-
-/* We don't need any data, but if it is empty, malloc() might return NULL. */
-struct POOL_ctx_s {
-    int dummy;
-};
-static POOL_ctx g_ctx;
-
-POOL_ctx* POOL_create(size_t numThreads, size_t queueSize) {
-    return POOL_create_advanced(numThreads, queueSize, ZSTD_defaultCMem);
-}
-
-POOL_ctx* POOL_create_advanced(size_t numThreads, size_t queueSize, ZSTD_customMem customMem) {
-    (void)numThreads;
-    (void)queueSize;
-    (void)customMem;
-    return &g_ctx;
-}
-
-void POOL_free(POOL_ctx* ctx) {
-    assert(!ctx || ctx == &g_ctx);
-    (void)ctx;
-}
-
-int POOL_resize(POOL_ctx* ctx, size_t numThreads) {
-    (void)ctx; (void)numThreads;
-    return 0;
-}
-
-void POOL_add(POOL_ctx* ctx, POOL_function function, void* opaque) {
-    (void)ctx;
-    function(opaque);
-}
-
-int POOL_tryAdd(POOL_ctx* ctx, POOL_function function, void* opaque) {
-    (void)ctx;
-    function(opaque);
-    return 1;
-}
-
-size_t POOL_sizeof(POOL_ctx* ctx) {
-    if (ctx==NULL) return 0;  /* supports sizeof NULL */
-    assert(ctx == &g_ctx);
-    return sizeof(*ctx);
-}
-
-#endif  /* ZSTD_MULTITHREAD */
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/common/pool.h mysql-8.0-8.0.27/extra/zstd/lib/common/pool.h
--- mysql-8.0-8.0.26/extra/zstd/lib/common/pool.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/common/pool.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
-#ifndef POOL_H
-#define POOL_H
-
-#if defined (__cplusplus)
-extern "C" {
-#endif
-
-
-#include <stddef.h>   /* size_t */
-#define ZSTD_STATIC_LINKING_ONLY   /* ZSTD_customMem */
-#include "zstd.h"
-
-typedef struct POOL_ctx_s POOL_ctx;
-
-/*! POOL_create() :
- *  Create a thread pool with at most `numThreads` threads.
- * `numThreads` must be at least 1.
- *  The maximum number of queued jobs before blocking is `queueSize`.
- * @return : POOL_ctx pointer on success, else NULL.
-*/
-POOL_ctx* POOL_create(size_t numThreads, size_t queueSize);
-
-POOL_ctx* POOL_create_advanced(size_t numThreads, size_t queueSize,
-                               ZSTD_customMem customMem);
-
-/*! POOL_free() :
- *  Free a thread pool returned by POOL_create().
- */
-void POOL_free(POOL_ctx* ctx);
-
-/*! POOL_resize() :
- *  Expands or shrinks pool's number of threads.
- *  This is more efficient than releasing + creating a new context,
- *  since it tries to preserve and re-use existing threads.
- * `numThreads` must be at least 1.
- * @return : 0 when resize was successful,
- *           !0 (typically 1) if there is an error.
- *    note : only numThreads can be resized, queueSize remains unchanged.
- */
-int POOL_resize(POOL_ctx* ctx, size_t numThreads);
-
-/*! POOL_sizeof() :
- * @return threadpool memory usage
- *  note : compatible with NULL (returns 0 in this case)
- */
-size_t POOL_sizeof(POOL_ctx* ctx);
-
-/*! POOL_function :
- *  The function type that can be added to a thread pool.
- */
-typedef void (*POOL_function)(void*);
-
-/*! POOL_add() :
- *  Add the job `function(opaque)` to the thread pool. `ctx` must be valid.
- *  Possibly blocks until there is room in the queue.
- *  Note : The function may be executed asynchronously,
- *         therefore, `opaque` must live until function has been completed.
- */
-void POOL_add(POOL_ctx* ctx, POOL_function function, void* opaque);
-
-
-/*! POOL_tryAdd() :
- *  Add the job `function(opaque)` to thread pool _if_ a worker is available.
- *  Returns immediately even if not (does not block).
- * @return : 1 if successful, 0 if not.
- */
-int POOL_tryAdd(POOL_ctx* ctx, POOL_function function, void* opaque);
-
-
-#if defined (__cplusplus)
-}
-#endif
-
-#endif
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/common/threading.c mysql-8.0-8.0.27/extra/zstd/lib/common/threading.c
--- mysql-8.0-8.0.26/extra/zstd/lib/common/threading.c	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/common/threading.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
-/**
- * Copyright (c) 2016 Tino Reichardt
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- *
- * You can contact the author at:
- * - zstdmt source repository: https://github.com/mcmilk/zstdmt
- */
-
-/**
- * This file will hold wrapper for systems, which do not support pthreads
- */
-
-/* create fake symbol to avoid empty translation unit warning */
-int g_ZSTD_threading_useless_symbol;
-
-#if defined(ZSTD_MULTITHREAD) && defined(_WIN32)
-
-/**
- * Windows minimalist Pthread Wrapper, based on :
- * http://www.cse.wustl.edu/~schmidt/win32-cv-1.html
- */
-
-
-/* ===  Dependencies  === */
-#include <process.h>
-#include <errno.h>
-#include "threading.h"
-
-
-/* ===  Implementation  === */
-
-static unsigned __stdcall worker(void *arg)
-{
-    ZSTD_pthread_t* const thread = (ZSTD_pthread_t*) arg;
-    thread->arg = thread->start_routine(thread->arg);
-    return 0;
-}
-
-int ZSTD_pthread_create(ZSTD_pthread_t* thread, const void* unused,
-            void* (*start_routine) (void*), void* arg)
-{
-    (void)unused;
-    thread->arg = arg;
-    thread->start_routine = start_routine;
-    thread->handle = (HANDLE) _beginthreadex(NULL, 0, worker, thread, 0, NULL);
-
-    if (!thread->handle)
-        return errno;
-    else
-        return 0;
-}
-
-int ZSTD_pthread_join(ZSTD_pthread_t thread, void **value_ptr)
-{
-    DWORD result;
-
-    if (!thread.handle) return 0;
-
-    result = WaitForSingleObject(thread.handle, INFINITE);
-    switch (result) {
-    case WAIT_OBJECT_0:
-        if (value_ptr) *value_ptr = thread.arg;
-        return 0;
-    case WAIT_ABANDONED:
-        return EINVAL;
-    default:
-        return GetLastError();
-    }
-}
-
-#endif   /* ZSTD_MULTITHREAD */
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/common/threading.h mysql-8.0-8.0.27/extra/zstd/lib/common/threading.h
--- mysql-8.0-8.0.26/extra/zstd/lib/common/threading.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/common/threading.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,123 +0,0 @@
-/**
- * Copyright (c) 2016 Tino Reichardt
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- *
- * You can contact the author at:
- * - zstdmt source repository: https://github.com/mcmilk/zstdmt
- */
-
-#ifndef THREADING_H_938743
-#define THREADING_H_938743
-
-#if defined (__cplusplus)
-extern "C" {
-#endif
-
-#if defined(ZSTD_MULTITHREAD) && defined(_WIN32)
-
-/**
- * Windows minimalist Pthread Wrapper, based on :
- * http://www.cse.wustl.edu/~schmidt/win32-cv-1.html
- */
-#ifdef WINVER
-#  undef WINVER
-#endif
-#define WINVER       0x0600
-
-#ifdef _WIN32_WINNT
-#  undef _WIN32_WINNT
-#endif
-#define _WIN32_WINNT 0x0600
-
-#ifndef WIN32_LEAN_AND_MEAN
-#  define WIN32_LEAN_AND_MEAN
-#endif
-
-#undef ERROR   /* reported already defined on VS 2015 (Rich Geldreich) */
-#include <windows.h>
-#undef ERROR
-#define ERROR(name) ZSTD_ERROR(name)
-
-
-/* mutex */
-#define ZSTD_pthread_mutex_t           CRITICAL_SECTION
-#define ZSTD_pthread_mutex_init(a, b)  ((void)(b), InitializeCriticalSection((a)), 0)
-#define ZSTD_pthread_mutex_destroy(a)  DeleteCriticalSection((a))
-#define ZSTD_pthread_mutex_lock(a)     EnterCriticalSection((a))
-#define ZSTD_pthread_mutex_unlock(a)   LeaveCriticalSection((a))
-
-/* condition variable */
-#define ZSTD_pthread_cond_t             CONDITION_VARIABLE
-#define ZSTD_pthread_cond_init(a, b)    ((void)(b), InitializeConditionVariable((a)), 0)
-#define ZSTD_pthread_cond_destroy(a)    ((void)(a))
-#define ZSTD_pthread_cond_wait(a, b)    SleepConditionVariableCS((a), (b), INFINITE)
-#define ZSTD_pthread_cond_signal(a)     WakeConditionVariable((a))
-#define ZSTD_pthread_cond_broadcast(a)  WakeAllConditionVariable((a))
-
-/* ZSTD_pthread_create() and ZSTD_pthread_join() */
-typedef struct {
-    HANDLE handle;
-    void* (*start_routine)(void*);
-    void* arg;
-} ZSTD_pthread_t;
-
-int ZSTD_pthread_create(ZSTD_pthread_t* thread, const void* unused,
-                   void* (*start_routine) (void*), void* arg);
-
-int ZSTD_pthread_join(ZSTD_pthread_t thread, void** value_ptr);
-
-/**
- * add here more wrappers as required
- */
-
-
-#elif defined(ZSTD_MULTITHREAD)   /* posix assumed ; need a better detection method */
-/* ===   POSIX Systems   === */
-#  include <pthread.h>
-
-#define ZSTD_pthread_mutex_t            pthread_mutex_t
-#define ZSTD_pthread_mutex_init(a, b)   pthread_mutex_init((a), (b))
-#define ZSTD_pthread_mutex_destroy(a)   pthread_mutex_destroy((a))
-#define ZSTD_pthread_mutex_lock(a)      pthread_mutex_lock((a))
-#define ZSTD_pthread_mutex_unlock(a)    pthread_mutex_unlock((a))
-
-#define ZSTD_pthread_cond_t             pthread_cond_t
-#define ZSTD_pthread_cond_init(a, b)    pthread_cond_init((a), (b))
-#define ZSTD_pthread_cond_destroy(a)    pthread_cond_destroy((a))
-#define ZSTD_pthread_cond_wait(a, b)    pthread_cond_wait((a), (b))
-#define ZSTD_pthread_cond_signal(a)     pthread_cond_signal((a))
-#define ZSTD_pthread_cond_broadcast(a)  pthread_cond_broadcast((a))
-
-#define ZSTD_pthread_t                  pthread_t
-#define ZSTD_pthread_create(a, b, c, d) pthread_create((a), (b), (c), (d))
-#define ZSTD_pthread_join(a, b)         pthread_join((a),(b))
-
-#else  /* ZSTD_MULTITHREAD not defined */
-/* No multithreading support */
-
-typedef int ZSTD_pthread_mutex_t;
-#define ZSTD_pthread_mutex_init(a, b)   ((void)(a), (void)(b), 0)
-#define ZSTD_pthread_mutex_destroy(a)   ((void)(a))
-#define ZSTD_pthread_mutex_lock(a)      ((void)(a))
-#define ZSTD_pthread_mutex_unlock(a)    ((void)(a))
-
-typedef int ZSTD_pthread_cond_t;
-#define ZSTD_pthread_cond_init(a, b)    ((void)(a), (void)(b), 0)
-#define ZSTD_pthread_cond_destroy(a)    ((void)(a))
-#define ZSTD_pthread_cond_wait(a, b)    ((void)(a), (void)(b))
-#define ZSTD_pthread_cond_signal(a)     ((void)(a))
-#define ZSTD_pthread_cond_broadcast(a)  ((void)(a))
-
-/* do not use ZSTD_pthread_t */
-
-#endif /* ZSTD_MULTITHREAD */
-
-#if defined (__cplusplus)
-}
-#endif
-
-#endif /* THREADING_H_938743 */
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/common/xxhash.c mysql-8.0-8.0.27/extra/zstd/lib/common/xxhash.c
--- mysql-8.0-8.0.26/extra/zstd/lib/common/xxhash.c	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/common/xxhash.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,882 +0,0 @@
-/*
-*  xxHash - Fast Hash algorithm
-*  Copyright (C) 2012-2016, Yann Collet
-*
-*  BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
-*
-*  Redistribution and use in source and binary forms, with or without
-*  modification, are permitted provided that the following conditions are
-*  met:
-*
-*  * Redistributions of source code must retain the above copyright
-*  notice, this list of conditions and the following disclaimer.
-*  * Redistributions in binary form must reproduce the above
-*  copyright notice, this list of conditions and the following disclaimer
-*  in the documentation and/or other materials provided with the
-*  distribution.
-*
-*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-*  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-*  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-*  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-*  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-*  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-*  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-*  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*  You can contact the author at :
-*  - xxHash homepage: http://www.xxhash.com
-*  - xxHash source repository : https://github.com/Cyan4973/xxHash
-*/
-
-
-/* *************************************
-*  Tuning parameters
-***************************************/
-/*!XXH_FORCE_MEMORY_ACCESS :
- * By default, access to unaligned memory is controlled by `memcpy()`, which is safe and portable.
- * Unfortunately, on some target/compiler combinations, the generated assembly is sub-optimal.
- * The below switch allow to select different access method for improved performance.
- * Method 0 (default) : use `memcpy()`. Safe and portable.
- * Method 1 : `__packed` statement. It depends on compiler extension (ie, not portable).
- *            This method is safe if your compiler supports it, and *generally* as fast or faster than `memcpy`.
- * Method 2 : direct access. This method doesn't depend on compiler but violate C standard.
- *            It can generate buggy code on targets which do not support unaligned memory accesses.
- *            But in some circumstances, it's the only known way to get the most performance (ie GCC + ARMv6)
- * See http://stackoverflow.com/a/32095106/646947 for details.
- * Prefer these methods in priority order (0 > 1 > 2)
- */
-#ifndef XXH_FORCE_MEMORY_ACCESS   /* can be defined externally, on command line for example */
-#  if defined(__GNUC__) && ( defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) )
-#    define XXH_FORCE_MEMORY_ACCESS 2
-#  elif (defined(__INTEL_COMPILER) && !defined(WIN32)) || \
-  (defined(__GNUC__) && ( defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7S__) )) || \
-  defined(__ICCARM__)
-#    define XXH_FORCE_MEMORY_ACCESS 1
-#  endif
-#endif
-
-/*!XXH_ACCEPT_NULL_INPUT_POINTER :
- * If the input pointer is a null pointer, xxHash default behavior is to trigger a memory access error, since it is a bad pointer.
- * When this option is enabled, xxHash output for null input pointers will be the same as a null-length input.
- * By default, this option is disabled. To enable it, uncomment below define :
- */
-/* #define XXH_ACCEPT_NULL_INPUT_POINTER 1 */
-
-/*!XXH_FORCE_NATIVE_FORMAT :
- * By default, xxHash library provides endian-independent Hash values, based on little-endian convention.
- * Results are therefore identical for little-endian and big-endian CPU.
- * This comes at a performance cost for big-endian CPU, since some swapping is required to emulate little-endian format.
- * Should endian-independence be of no importance for your application, you may set the #define below to 1,
- * to improve speed for Big-endian CPU.
- * This option has no impact on Little_Endian CPU.
- */
-#ifndef XXH_FORCE_NATIVE_FORMAT   /* can be defined externally */
-#  define XXH_FORCE_NATIVE_FORMAT 0
-#endif
-
-/*!XXH_FORCE_ALIGN_CHECK :
- * This is a minor performance trick, only useful with lots of very small keys.
- * It means : check for aligned/unaligned input.
- * The check costs one initial branch per hash; set to 0 when the input data
- * is guaranteed to be aligned.
- */
-#ifndef XXH_FORCE_ALIGN_CHECK /* can be defined externally */
-#  if defined(__i386) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_X64)
-#    define XXH_FORCE_ALIGN_CHECK 0
-#  else
-#    define XXH_FORCE_ALIGN_CHECK 1
-#  endif
-#endif
-
-
-/* *************************************
-*  Includes & Memory related functions
-***************************************/
-/* Modify the local functions below should you wish to use some other memory routines */
-/* for malloc(), free() */
-#include <stdlib.h>
-#include <stddef.h>     /* size_t */
-static void* XXH_malloc(size_t s) { return malloc(s); }
-static void  XXH_free  (void* p)  { free(p); }
-/* for memcpy() */
-#include <string.h>
-static void* XXH_memcpy(void* dest, const void* src, size_t size) { return memcpy(dest,src,size); }
-
-#ifndef XXH_STATIC_LINKING_ONLY
-#  define XXH_STATIC_LINKING_ONLY
-#endif
-#include "my_zstd_xxhash.h"
-
-
-/* *************************************
-*  Compiler Specific Options
-***************************************/
-#if defined (__GNUC__) || defined(__cplusplus) || defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L   /* C99 */
-#  define INLINE_KEYWORD inline
-#else
-#  define INLINE_KEYWORD
-#endif
-
-#if defined(__GNUC__) || defined(__ICCARM__)
-#  define FORCE_INLINE_ATTR __attribute__((always_inline))
-#elif defined(_MSC_VER)
-#  define FORCE_INLINE_ATTR __forceinline
-#else
-#  define FORCE_INLINE_ATTR
-#endif
-
-#define FORCE_INLINE_TEMPLATE static INLINE_KEYWORD FORCE_INLINE_ATTR
-
-
-#ifdef _MSC_VER
-#  pragma warning(disable : 4127)      /* disable: C4127: conditional expression is constant */
-#endif
-
-
-/* *************************************
-*  Basic Types
-***************************************/
-#ifndef MEM_MODULE
-# define MEM_MODULE
-# if !defined (__VMS) && (defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) )
-#   include <stdint.h>
-    typedef uint8_t  BYTE;
-    typedef uint16_t U16;
-    typedef uint32_t U32;
-    typedef  int32_t S32;
-    typedef uint64_t U64;
-#  else
-    typedef unsigned char      BYTE;
-    typedef unsigned short     U16;
-    typedef unsigned int       U32;
-    typedef   signed int       S32;
-    typedef unsigned long long U64;   /* if your compiler doesn't support unsigned long long, replace by another 64-bit type here. Note that xxhash.h will also need to be updated. */
-#  endif
-#endif
-
-
-#if (defined(XXH_FORCE_MEMORY_ACCESS) && (XXH_FORCE_MEMORY_ACCESS==2))
-
-/* Force direct memory access. Only works on CPU which support unaligned memory access in hardware */
-static U32 XXH_read32(const void* memPtr) { return *(const U32*) memPtr; }
-static U64 XXH_read64(const void* memPtr) { return *(const U64*) memPtr; }
-
-#elif (defined(XXH_FORCE_MEMORY_ACCESS) && (XXH_FORCE_MEMORY_ACCESS==1))
-
-/* __pack instructions are safer, but compiler specific, hence potentially problematic for some compilers */
-/* currently only defined for gcc and icc */
-typedef union { U32 u32; U64 u64; } __attribute__((packed)) unalign;
-
-static U32 XXH_read32(const void* ptr) { return ((const unalign*)ptr)->u32; }
-static U64 XXH_read64(const void* ptr) { return ((const unalign*)ptr)->u64; }
-
-#else
-
-/* portable and safe solution. Generally efficient.
- * see : http://stackoverflow.com/a/32095106/646947
- */
-
-static U32 XXH_read32(const void* memPtr)
-{
-    U32 val;
-    memcpy(&val, memPtr, sizeof(val));
-    return val;
-}
-
-static U64 XXH_read64(const void* memPtr)
-{
-    U64 val;
-    memcpy(&val, memPtr, sizeof(val));
-    return val;
-}
-
-#endif   /* XXH_FORCE_DIRECT_MEMORY_ACCESS */
-
-
-/* ****************************************
-*  Compiler-specific Functions and Macros
-******************************************/
-#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
-
-/* Note : although _rotl exists for minGW (GCC under windows), performance seems poor */
-#if defined(_MSC_VER)
-#  define XXH_rotl32(x,r) _rotl(x,r)
-#  define XXH_rotl64(x,r) _rotl64(x,r)
-#else
-#if defined(__ICCARM__)
-#  include <intrinsics.h>
-#  define XXH_rotl32(x,r) __ROR(x,(32 - r))
-#else
-#  define XXH_rotl32(x,r) ((x << r) | (x >> (32 - r)))
-#endif
-#  define XXH_rotl64(x,r) ((x << r) | (x >> (64 - r)))
-#endif
-
-#if defined(_MSC_VER)     /* Visual Studio */
-#  define XXH_swap32 _byteswap_ulong
-#  define XXH_swap64 _byteswap_uint64
-#elif GCC_VERSION >= 403
-#  define XXH_swap32 __builtin_bswap32
-#  define XXH_swap64 __builtin_bswap64
-#else
-static U32 XXH_swap32 (U32 x)
-{
-    return  ((x << 24) & 0xff000000 ) |
-            ((x <<  8) & 0x00ff0000 ) |
-            ((x >>  8) & 0x0000ff00 ) |
-            ((x >> 24) & 0x000000ff );
-}
-static U64 XXH_swap64 (U64 x)
-{
-    return  ((x << 56) & 0xff00000000000000ULL) |
-            ((x << 40) & 0x00ff000000000000ULL) |
-            ((x << 24) & 0x0000ff0000000000ULL) |
-            ((x << 8)  & 0x000000ff00000000ULL) |
-            ((x >> 8)  & 0x00000000ff000000ULL) |
-            ((x >> 24) & 0x0000000000ff0000ULL) |
-            ((x >> 40) & 0x000000000000ff00ULL) |
-            ((x >> 56) & 0x00000000000000ffULL);
-}
-#endif
-
-
-/* *************************************
-*  Architecture Macros
-***************************************/
-typedef enum { XXH_bigEndian=0, XXH_littleEndian=1 } XXH_endianess;
-
-/* XXH_CPU_LITTLE_ENDIAN can be defined externally, for example on the compiler command line */
-#ifndef XXH_CPU_LITTLE_ENDIAN
-    static const int g_one = 1;
-#   define XXH_CPU_LITTLE_ENDIAN   (*(const char*)(&g_one))
-#endif
-
-
-/* ***************************
-*  Memory reads
-*****************************/
-typedef enum { XXH_aligned, XXH_unaligned } XXH_alignment;
-
-FORCE_INLINE_TEMPLATE U32 XXH_readLE32_align(const void* ptr, XXH_endianess endian, XXH_alignment align)
-{
-    if (align==XXH_unaligned)
-        return endian==XXH_littleEndian ? XXH_read32(ptr) : XXH_swap32(XXH_read32(ptr));
-    else
-        return endian==XXH_littleEndian ? *(const U32*)ptr : XXH_swap32(*(const U32*)ptr);
-}
-
-FORCE_INLINE_TEMPLATE U32 XXH_readLE32(const void* ptr, XXH_endianess endian)
-{
-    return XXH_readLE32_align(ptr, endian, XXH_unaligned);
-}
-
-static U32 XXH_readBE32(const void* ptr)
-{
-    return XXH_CPU_LITTLE_ENDIAN ? XXH_swap32(XXH_read32(ptr)) : XXH_read32(ptr);
-}
-
-FORCE_INLINE_TEMPLATE U64 XXH_readLE64_align(const void* ptr, XXH_endianess endian, XXH_alignment align)
-{
-    if (align==XXH_unaligned)
-        return endian==XXH_littleEndian ? XXH_read64(ptr) : XXH_swap64(XXH_read64(ptr));
-    else
-        return endian==XXH_littleEndian ? *(const U64*)ptr : XXH_swap64(*(const U64*)ptr);
-}
-
-FORCE_INLINE_TEMPLATE U64 XXH_readLE64(const void* ptr, XXH_endianess endian)
-{
-    return XXH_readLE64_align(ptr, endian, XXH_unaligned);
-}
-
-static U64 XXH_readBE64(const void* ptr)
-{
-    return XXH_CPU_LITTLE_ENDIAN ? XXH_swap64(XXH_read64(ptr)) : XXH_read64(ptr);
-}
-
-
-/* *************************************
-*  Macros
-***************************************/
-#define XXH_STATIC_ASSERT(c)   { enum { XXH_static_assert = 1/(int)(!!(c)) }; }    /* use only *after* variable declarations */
-
-
-/* *************************************
-*  Constants
-***************************************/
-static const U32 PRIME32_1 = 2654435761U;
-static const U32 PRIME32_2 = 2246822519U;
-static const U32 PRIME32_3 = 3266489917U;
-static const U32 PRIME32_4 =  668265263U;
-static const U32 PRIME32_5 =  374761393U;
-
-static const U64 PRIME64_1 = 11400714785074694791ULL;
-static const U64 PRIME64_2 = 14029467366897019727ULL;
-static const U64 PRIME64_3 =  1609587929392839161ULL;
-static const U64 PRIME64_4 =  9650029242287828579ULL;
-static const U64 PRIME64_5 =  2870177450012600261ULL;
-
-XXH_PUBLIC_API unsigned XXH_versionNumber (void) { return XXH_VERSION_NUMBER; }
-
-
-/* **************************
-*  Utils
-****************************/
-XXH_PUBLIC_API void XXH32_copyState(XXH32_state_t* restrict dstState, const XXH32_state_t* restrict srcState)
-{
-    memcpy(dstState, srcState, sizeof(*dstState));
-}
-
-XXH_PUBLIC_API void XXH64_copyState(XXH64_state_t* restrict dstState, const XXH64_state_t* restrict srcState)
-{
-    memcpy(dstState, srcState, sizeof(*dstState));
-}
-
-
-/* ***************************
-*  Simple Hash Functions
-*****************************/
-
-static U32 XXH32_round(U32 seed, U32 input)
-{
-    seed += input * PRIME32_2;
-    seed  = XXH_rotl32(seed, 13);
-    seed *= PRIME32_1;
-    return seed;
-}
-
-FORCE_INLINE_TEMPLATE U32 XXH32_endian_align(const void* input, size_t len, U32 seed, XXH_endianess endian, XXH_alignment align)
-{
-    const BYTE* p = (const BYTE*)input;
-    const BYTE* bEnd = p + len;
-    U32 h32;
-#define XXH_get32bits(p) XXH_readLE32_align(p, endian, align)
-
-#ifdef XXH_ACCEPT_NULL_INPUT_POINTER
-    if (p==NULL) {
-        len=0;
-        bEnd=p=(const BYTE*)(size_t)16;
-    }
-#endif
-
-    if (len>=16) {
-        const BYTE* const limit = bEnd - 16;
-        U32 v1 = seed + PRIME32_1 + PRIME32_2;
-        U32 v2 = seed + PRIME32_2;
-        U32 v3 = seed + 0;
-        U32 v4 = seed - PRIME32_1;
-
-        do {
-            v1 = XXH32_round(v1, XXH_get32bits(p)); p+=4;
-            v2 = XXH32_round(v2, XXH_get32bits(p)); p+=4;
-            v3 = XXH32_round(v3, XXH_get32bits(p)); p+=4;
-            v4 = XXH32_round(v4, XXH_get32bits(p)); p+=4;
-        } while (p<=limit);
-
-        h32 = XXH_rotl32(v1, 1) + XXH_rotl32(v2, 7) + XXH_rotl32(v3, 12) + XXH_rotl32(v4, 18);
-    } else {
-        h32  = seed + PRIME32_5;
-    }
-
-    h32 += (U32) len;
-
-    while (p+4<=bEnd) {
-        h32 += XXH_get32bits(p) * PRIME32_3;
-        h32  = XXH_rotl32(h32, 17) * PRIME32_4 ;
-        p+=4;
-    }
-
-    while (p<bEnd) {
-        h32 += (*p) * PRIME32_5;
-        h32 = XXH_rotl32(h32, 11) * PRIME32_1 ;
-        p++;
-    }
-
-    h32 ^= h32 >> 15;
-    h32 *= PRIME32_2;
-    h32 ^= h32 >> 13;
-    h32 *= PRIME32_3;
-    h32 ^= h32 >> 16;
-
-    return h32;
-}
-
-
-XXH_PUBLIC_API unsigned int XXH32 (const void* input, size_t len, unsigned int seed)
-{
-#if 0
-    /* Simple version, good for code maintenance, but unfortunately slow for small inputs */
-    XXH32_CREATESTATE_STATIC(state);
-    XXH32_reset(state, seed);
-    XXH32_update(state, input, len);
-    return XXH32_digest(state);
-#else
-    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
-
-    if (XXH_FORCE_ALIGN_CHECK) {
-        if ((((size_t)input) & 3) == 0) {   /* Input is 4-bytes aligned, leverage the speed benefit */
-            if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
-                return XXH32_endian_align(input, len, seed, XXH_littleEndian, XXH_aligned);
-            else
-                return XXH32_endian_align(input, len, seed, XXH_bigEndian, XXH_aligned);
-    }   }
-
-    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
-        return XXH32_endian_align(input, len, seed, XXH_littleEndian, XXH_unaligned);
-    else
-        return XXH32_endian_align(input, len, seed, XXH_bigEndian, XXH_unaligned);
-#endif
-}
-
-
-static U64 XXH64_round(U64 acc, U64 input)
-{
-    acc += input * PRIME64_2;
-    acc  = XXH_rotl64(acc, 31);
-    acc *= PRIME64_1;
-    return acc;
-}
-
-static U64 XXH64_mergeRound(U64 acc, U64 val)
-{
-    val  = XXH64_round(0, val);
-    acc ^= val;
-    acc  = acc * PRIME64_1 + PRIME64_4;
-    return acc;
-}
-
-FORCE_INLINE_TEMPLATE U64 XXH64_endian_align(const void* input, size_t len, U64 seed, XXH_endianess endian, XXH_alignment align)
-{
-    const BYTE* p = (const BYTE*)input;
-    const BYTE* const bEnd = p + len;
-    U64 h64;
-#define XXH_get64bits(p) XXH_readLE64_align(p, endian, align)
-
-#ifdef XXH_ACCEPT_NULL_INPUT_POINTER
-    if (p==NULL) {
-        len=0;
-        bEnd=p=(const BYTE*)(size_t)32;
-    }
-#endif
-
-    if (len>=32) {
-        const BYTE* const limit = bEnd - 32;
-        U64 v1 = seed + PRIME64_1 + PRIME64_2;
-        U64 v2 = seed + PRIME64_2;
-        U64 v3 = seed + 0;
-        U64 v4 = seed - PRIME64_1;
-
-        do {
-            v1 = XXH64_round(v1, XXH_get64bits(p)); p+=8;
-            v2 = XXH64_round(v2, XXH_get64bits(p)); p+=8;
-            v3 = XXH64_round(v3, XXH_get64bits(p)); p+=8;
-            v4 = XXH64_round(v4, XXH_get64bits(p)); p+=8;
-        } while (p<=limit);
-
-        h64 = XXH_rotl64(v1, 1) + XXH_rotl64(v2, 7) + XXH_rotl64(v3, 12) + XXH_rotl64(v4, 18);
-        h64 = XXH64_mergeRound(h64, v1);
-        h64 = XXH64_mergeRound(h64, v2);
-        h64 = XXH64_mergeRound(h64, v3);
-        h64 = XXH64_mergeRound(h64, v4);
-
-    } else {
-        h64  = seed + PRIME64_5;
-    }
-
-    h64 += (U64) len;
-
-    while (p+8<=bEnd) {
-        U64 const k1 = XXH64_round(0, XXH_get64bits(p));
-        h64 ^= k1;
-        h64  = XXH_rotl64(h64,27) * PRIME64_1 + PRIME64_4;
-        p+=8;
-    }
-
-    if (p+4<=bEnd) {
-        h64 ^= (U64)(XXH_get32bits(p)) * PRIME64_1;
-        h64 = XXH_rotl64(h64, 23) * PRIME64_2 + PRIME64_3;
-        p+=4;
-    }
-
-    while (p<bEnd) {
-        h64 ^= (*p) * PRIME64_5;
-        h64 = XXH_rotl64(h64, 11) * PRIME64_1;
-        p++;
-    }
-
-    h64 ^= h64 >> 33;
-    h64 *= PRIME64_2;
-    h64 ^= h64 >> 29;
-    h64 *= PRIME64_3;
-    h64 ^= h64 >> 32;
-
-    return h64;
-}
-
-
-XXH_PUBLIC_API unsigned long long XXH64 (const void* input, size_t len, unsigned long long seed)
-{
-#if 0
-    /* Simple version, good for code maintenance, but unfortunately slow for small inputs */
-    XXH64_CREATESTATE_STATIC(state);
-    XXH64_reset(state, seed);
-    XXH64_update(state, input, len);
-    return XXH64_digest(state);
-#else
-    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
-
-    if (XXH_FORCE_ALIGN_CHECK) {
-        if ((((size_t)input) & 7)==0) {  /* Input is aligned, let's leverage the speed advantage */
-            if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
-                return XXH64_endian_align(input, len, seed, XXH_littleEndian, XXH_aligned);
-            else
-                return XXH64_endian_align(input, len, seed, XXH_bigEndian, XXH_aligned);
-    }   }
-
-    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
-        return XXH64_endian_align(input, len, seed, XXH_littleEndian, XXH_unaligned);
-    else
-        return XXH64_endian_align(input, len, seed, XXH_bigEndian, XXH_unaligned);
-#endif
-}
-
-
-/* **************************************************
-*  Advanced Hash Functions
-****************************************************/
-
-XXH_PUBLIC_API XXH32_state_t* XXH32_createState(void)
-{
-    return (XXH32_state_t*)XXH_malloc(sizeof(XXH32_state_t));
-}
-XXH_PUBLIC_API XXH_errorcode XXH32_freeState(XXH32_state_t* statePtr)
-{
-    XXH_free(statePtr);
-    return XXH_OK;
-}
-
-XXH_PUBLIC_API XXH64_state_t* XXH64_createState(void)
-{
-    return (XXH64_state_t*)XXH_malloc(sizeof(XXH64_state_t));
-}
-XXH_PUBLIC_API XXH_errorcode XXH64_freeState(XXH64_state_t* statePtr)
-{
-    XXH_free(statePtr);
-    return XXH_OK;
-}
-
-
-/*** Hash feed ***/
-
-XXH_PUBLIC_API XXH_errorcode XXH32_reset(XXH32_state_t* statePtr, unsigned int seed)
-{
-    XXH32_state_t state;   /* using a local state to memcpy() in order to avoid strict-aliasing warnings */
-    memset(&state, 0, sizeof(state)-4);   /* do not write into reserved, for future removal */
-    state.v1 = seed + PRIME32_1 + PRIME32_2;
-    state.v2 = seed + PRIME32_2;
-    state.v3 = seed + 0;
-    state.v4 = seed - PRIME32_1;
-    memcpy(statePtr, &state, sizeof(state));
-    return XXH_OK;
-}
-
-
-XXH_PUBLIC_API XXH_errorcode XXH64_reset(XXH64_state_t* statePtr, unsigned long long seed)
-{
-    XXH64_state_t state;   /* using a local state to memcpy() in order to avoid strict-aliasing warnings */
-    memset(&state, 0, sizeof(state)-8);   /* do not write into reserved, for future removal */
-    state.v1 = seed + PRIME64_1 + PRIME64_2;
-    state.v2 = seed + PRIME64_2;
-    state.v3 = seed + 0;
-    state.v4 = seed - PRIME64_1;
-    memcpy(statePtr, &state, sizeof(state));
-    return XXH_OK;
-}
-
-
-FORCE_INLINE_TEMPLATE XXH_errorcode XXH32_update_endian (XXH32_state_t* state, const void* input, size_t len, XXH_endianess endian)
-{
-    const BYTE* p = (const BYTE*)input;
-    const BYTE* const bEnd = p + len;
-
-#ifdef XXH_ACCEPT_NULL_INPUT_POINTER
-    if (input==NULL) return XXH_ERROR;
-#endif
-
-    state->total_len_32 += (unsigned)len;
-    state->large_len |= (len>=16) | (state->total_len_32>=16);
-
-    if (state->memsize + len < 16)  {   /* fill in tmp buffer */
-        XXH_memcpy((BYTE*)(state->mem32) + state->memsize, input, len);
-        state->memsize += (unsigned)len;
-        return XXH_OK;
-    }
-
-    if (state->memsize) {   /* some data left from previous update */
-        XXH_memcpy((BYTE*)(state->mem32) + state->memsize, input, 16-state->memsize);
-        {   const U32* p32 = state->mem32;
-            state->v1 = XXH32_round(state->v1, XXH_readLE32(p32, endian)); p32++;
-            state->v2 = XXH32_round(state->v2, XXH_readLE32(p32, endian)); p32++;
-            state->v3 = XXH32_round(state->v3, XXH_readLE32(p32, endian)); p32++;
-            state->v4 = XXH32_round(state->v4, XXH_readLE32(p32, endian)); p32++;
-        }
-        p += 16-state->memsize;
-        state->memsize = 0;
-    }
-
-    if (p <= bEnd-16) {
-        const BYTE* const limit = bEnd - 16;
-        U32 v1 = state->v1;
-        U32 v2 = state->v2;
-        U32 v3 = state->v3;
-        U32 v4 = state->v4;
-
-        do {
-            v1 = XXH32_round(v1, XXH_readLE32(p, endian)); p+=4;
-            v2 = XXH32_round(v2, XXH_readLE32(p, endian)); p+=4;
-            v3 = XXH32_round(v3, XXH_readLE32(p, endian)); p+=4;
-            v4 = XXH32_round(v4, XXH_readLE32(p, endian)); p+=4;
-        } while (p<=limit);
-
-        state->v1 = v1;
-        state->v2 = v2;
-        state->v3 = v3;
-        state->v4 = v4;
-    }
-
-    if (p < bEnd) {
-        XXH_memcpy(state->mem32, p, (size_t)(bEnd-p));
-        state->memsize = (unsigned)(bEnd-p);
-    }
-
-    return XXH_OK;
-}
-
-XXH_PUBLIC_API XXH_errorcode XXH32_update (XXH32_state_t* state_in, const void* input, size_t len)
-{
-    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
-
-    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
-        return XXH32_update_endian(state_in, input, len, XXH_littleEndian);
-    else
-        return XXH32_update_endian(state_in, input, len, XXH_bigEndian);
-}
-
-
-
-FORCE_INLINE_TEMPLATE U32 XXH32_digest_endian (const XXH32_state_t* state, XXH_endianess endian)
-{
-    const BYTE * p = (const BYTE*)state->mem32;
-    const BYTE* const bEnd = (const BYTE*)(state->mem32) + state->memsize;
-    U32 h32;
-
-    if (state->large_len) {
-        h32 = XXH_rotl32(state->v1, 1) + XXH_rotl32(state->v2, 7) + XXH_rotl32(state->v3, 12) + XXH_rotl32(state->v4, 18);
-    } else {
-        h32 = state->v3 /* == seed */ + PRIME32_5;
-    }
-
-    h32 += state->total_len_32;
-
-    while (p+4<=bEnd) {
-        h32 += XXH_readLE32(p, endian) * PRIME32_3;
-        h32  = XXH_rotl32(h32, 17) * PRIME32_4;
-        p+=4;
-    }
-
-    while (p<bEnd) {
-        h32 += (*p) * PRIME32_5;
-        h32  = XXH_rotl32(h32, 11) * PRIME32_1;
-        p++;
-    }
-
-    h32 ^= h32 >> 15;
-    h32 *= PRIME32_2;
-    h32 ^= h32 >> 13;
-    h32 *= PRIME32_3;
-    h32 ^= h32 >> 16;
-
-    return h32;
-}
-
-
-XXH_PUBLIC_API unsigned int XXH32_digest (const XXH32_state_t* state_in)
-{
-    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
-
-    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
-        return XXH32_digest_endian(state_in, XXH_littleEndian);
-    else
-        return XXH32_digest_endian(state_in, XXH_bigEndian);
-}
-
-
-
-/* **** XXH64 **** */
-
-FORCE_INLINE_TEMPLATE XXH_errorcode XXH64_update_endian (XXH64_state_t* state, const void* input, size_t len, XXH_endianess endian)
-{
-    const BYTE* p = (const BYTE*)input;
-    const BYTE* const bEnd = p + len;
-
-#ifdef XXH_ACCEPT_NULL_INPUT_POINTER
-    if (input==NULL) return XXH_ERROR;
-#endif
-
-    state->total_len += len;
-
-    if (state->memsize + len < 32) {  /* fill in tmp buffer */
-        XXH_memcpy(((BYTE*)state->mem64) + state->memsize, input, len);
-        state->memsize += (U32)len;
-        return XXH_OK;
-    }
-
-    if (state->memsize) {   /* tmp buffer is full */
-        XXH_memcpy(((BYTE*)state->mem64) + state->memsize, input, 32-state->memsize);
-        state->v1 = XXH64_round(state->v1, XXH_readLE64(state->mem64+0, endian));
-        state->v2 = XXH64_round(state->v2, XXH_readLE64(state->mem64+1, endian));
-        state->v3 = XXH64_round(state->v3, XXH_readLE64(state->mem64+2, endian));
-        state->v4 = XXH64_round(state->v4, XXH_readLE64(state->mem64+3, endian));
-        p += 32-state->memsize;
-        state->memsize = 0;
-    }
-
-    if (p+32 <= bEnd) {
-        const BYTE* const limit = bEnd - 32;
-        U64 v1 = state->v1;
-        U64 v2 = state->v2;
-        U64 v3 = state->v3;
-        U64 v4 = state->v4;
-
-        do {
-            v1 = XXH64_round(v1, XXH_readLE64(p, endian)); p+=8;
-            v2 = XXH64_round(v2, XXH_readLE64(p, endian)); p+=8;
-            v3 = XXH64_round(v3, XXH_readLE64(p, endian)); p+=8;
-            v4 = XXH64_round(v4, XXH_readLE64(p, endian)); p+=8;
-        } while (p<=limit);
-
-        state->v1 = v1;
-        state->v2 = v2;
-        state->v3 = v3;
-        state->v4 = v4;
-    }
-
-    if (p < bEnd) {
-        XXH_memcpy(state->mem64, p, (size_t)(bEnd-p));
-        state->memsize = (unsigned)(bEnd-p);
-    }
-
-    return XXH_OK;
-}
-
-XXH_PUBLIC_API XXH_errorcode XXH64_update (XXH64_state_t* state_in, const void* input, size_t len)
-{
-    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
-
-    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
-        return XXH64_update_endian(state_in, input, len, XXH_littleEndian);
-    else
-        return XXH64_update_endian(state_in, input, len, XXH_bigEndian);
-}
-
-
-
-FORCE_INLINE_TEMPLATE U64 XXH64_digest_endian (const XXH64_state_t* state, XXH_endianess endian)
-{
-    const BYTE * p = (const BYTE*)state->mem64;
-    const BYTE* const bEnd = (const BYTE*)state->mem64 + state->memsize;
-    U64 h64;
-
-    if (state->total_len >= 32) {
-        U64 const v1 = state->v1;
-        U64 const v2 = state->v2;
-        U64 const v3 = state->v3;
-        U64 const v4 = state->v4;
-
-        h64 = XXH_rotl64(v1, 1) + XXH_rotl64(v2, 7) + XXH_rotl64(v3, 12) + XXH_rotl64(v4, 18);
-        h64 = XXH64_mergeRound(h64, v1);
-        h64 = XXH64_mergeRound(h64, v2);
-        h64 = XXH64_mergeRound(h64, v3);
-        h64 = XXH64_mergeRound(h64, v4);
-    } else {
-        h64  = state->v3 + PRIME64_5;
-    }
-
-    h64 += (U64) state->total_len;
-
-    while (p+8<=bEnd) {
-        U64 const k1 = XXH64_round(0, XXH_readLE64(p, endian));
-        h64 ^= k1;
-        h64  = XXH_rotl64(h64,27) * PRIME64_1 + PRIME64_4;
-        p+=8;
-    }
-
-    if (p+4<=bEnd) {
-        h64 ^= (U64)(XXH_readLE32(p, endian)) * PRIME64_1;
-        h64  = XXH_rotl64(h64, 23) * PRIME64_2 + PRIME64_3;
-        p+=4;
-    }
-
-    while (p<bEnd) {
-        h64 ^= (*p) * PRIME64_5;
-        h64  = XXH_rotl64(h64, 11) * PRIME64_1;
-        p++;
-    }
-
-    h64 ^= h64 >> 33;
-    h64 *= PRIME64_2;
-    h64 ^= h64 >> 29;
-    h64 *= PRIME64_3;
-    h64 ^= h64 >> 32;
-
-    return h64;
-}
-
-
-XXH_PUBLIC_API unsigned long long XXH64_digest (const XXH64_state_t* state_in)
-{
-    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
-
-    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
-        return XXH64_digest_endian(state_in, XXH_littleEndian);
-    else
-        return XXH64_digest_endian(state_in, XXH_bigEndian);
-}
-
-
-/* **************************
-*  Canonical representation
-****************************/
-
-/*! Default XXH result types are basic unsigned 32 and 64 bits.
-*   The canonical representation follows human-readable write convention, aka big-endian (large digits first).
-*   These functions allow transformation of hash result into and from its canonical format.
-*   This way, hash values can be written into a file or buffer, and remain comparable across different systems and programs.
-*/
-
-XXH_PUBLIC_API void XXH32_canonicalFromHash(XXH32_canonical_t* dst, XXH32_hash_t hash)
-{
-    XXH_STATIC_ASSERT(sizeof(XXH32_canonical_t) == sizeof(XXH32_hash_t));
-    if (XXH_CPU_LITTLE_ENDIAN) hash = XXH_swap32(hash);
-    memcpy(dst, &hash, sizeof(*dst));
-}
-
-XXH_PUBLIC_API void XXH64_canonicalFromHash(XXH64_canonical_t* dst, XXH64_hash_t hash)
-{
-    XXH_STATIC_ASSERT(sizeof(XXH64_canonical_t) == sizeof(XXH64_hash_t));
-    if (XXH_CPU_LITTLE_ENDIAN) hash = XXH_swap64(hash);
-    memcpy(dst, &hash, sizeof(*dst));
-}
-
-XXH_PUBLIC_API XXH32_hash_t XXH32_hashFromCanonical(const XXH32_canonical_t* src)
-{
-    return XXH_readBE32(src);
-}
-
-XXH_PUBLIC_API XXH64_hash_t XXH64_hashFromCanonical(const XXH64_canonical_t* src)
-{
-    return XXH_readBE64(src);
-}
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/common/xxhash.h mysql-8.0-8.0.27/extra/zstd/lib/common/xxhash.h
--- mysql-8.0-8.0.26/extra/zstd/lib/common/xxhash.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/common/xxhash.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,305 +0,0 @@
-/*
-   xxHash - Extremely Fast Hash algorithm
-   Header File
-   Copyright (C) 2012-2016, Yann Collet.
-
-   BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are
-   met:
-
-       * Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-       * Redistributions in binary form must reproduce the above
-   copyright notice, this list of conditions and the following disclaimer
-   in the documentation and/or other materials provided with the
-   distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-   You can contact the author at :
-   - xxHash source repository : https://github.com/Cyan4973/xxHash
-*/
-
-/* Notice extracted from xxHash homepage :
-
-xxHash is an extremely fast Hash algorithm, running at RAM speed limits.
-It also successfully passes all tests from the SMHasher suite.
-
-Comparison (single thread, Windows Seven 32 bits, using SMHasher on a Core 2 Duo @3GHz)
-
-Name            Speed       Q.Score   Author
-xxHash          5.4 GB/s     10
-CrapWow         3.2 GB/s      2       Andrew
-MumurHash 3a    2.7 GB/s     10       Austin Appleby
-SpookyHash      2.0 GB/s     10       Bob Jenkins
-SBox            1.4 GB/s      9       Bret Mulvey
-Lookup3         1.2 GB/s      9       Bob Jenkins
-SuperFastHash   1.2 GB/s      1       Paul Hsieh
-CityHash64      1.05 GB/s    10       Pike & Alakuijala
-FNV             0.55 GB/s     5       Fowler, Noll, Vo
-CRC32           0.43 GB/s     9
-MD5-32          0.33 GB/s    10       Ronald L. Rivest
-SHA1-32         0.28 GB/s    10
-
-Q.Score is a measure of quality of the hash function.
-It depends on successfully passing SMHasher test set.
-10 is a perfect score.
-
-A 64-bits version, named XXH64, is available since r35.
-It offers much better speed, but for 64-bits applications only.
-Name     Speed on 64 bits    Speed on 32 bits
-XXH64       13.8 GB/s            1.9 GB/s
-XXH32        6.8 GB/s            6.0 GB/s
-*/
-
-#if defined (__cplusplus)
-extern "C" {
-#endif
-
-#ifndef XXHASH_H_5627135585666179
-#define XXHASH_H_5627135585666179 1
-
-
-/* ****************************
-*  Definitions
-******************************/
-#include <stddef.h>   /* size_t */
-typedef enum { XXH_OK=0, XXH_ERROR } XXH_errorcode;
-
-
-/* ****************************
-*  API modifier
-******************************/
-/** XXH_PRIVATE_API
-*   This is useful if you want to include xxhash functions in `static` mode
-*   in order to inline them, and remove their symbol from the public list.
-*   Methodology :
-*     #define XXH_PRIVATE_API
-*     #include "xxhash.h"
-*   `xxhash.c` is automatically included.
-*   It's not useful to compile and link it as a separate module anymore.
-*/
-#ifdef XXH_PRIVATE_API
-#  ifndef XXH_STATIC_LINKING_ONLY
-#    define XXH_STATIC_LINKING_ONLY
-#  endif
-#  if defined(__GNUC__)
-#    define XXH_PUBLIC_API static __inline __attribute__((unused))
-#  elif defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */)
-#    define XXH_PUBLIC_API static inline
-#  elif defined(_MSC_VER)
-#    define XXH_PUBLIC_API static __inline
-#  else
-#    define XXH_PUBLIC_API static   /* this version may generate warnings for unused static functions; disable the relevant warning */
-#  endif
-#else
-#  define XXH_PUBLIC_API   /* do nothing */
-#endif /* XXH_PRIVATE_API */
-
-/*!XXH_NAMESPACE, aka Namespace Emulation :
-
-If you want to include _and expose_ xxHash functions from within your own library,
-but also want to avoid symbol collisions with another library which also includes xxHash,
-
-you can use XXH_NAMESPACE, to automatically prefix any public symbol from xxhash library
-with the value of XXH_NAMESPACE (so avoid to keep it NULL and avoid numeric values).
-
-Note that no change is required within the calling program as long as it includes `xxhash.h` :
-regular symbol name will be automatically translated by this header.
-*/
-#ifdef XXH_NAMESPACE
-#  define XXH_CAT(A,B) A##B
-#  define XXH_NAME2(A,B) XXH_CAT(A,B)
-#  define XXH32 XXH_NAME2(XXH_NAMESPACE, XXH32)
-#  define XXH64 XXH_NAME2(XXH_NAMESPACE, XXH64)
-#  define XXH_versionNumber XXH_NAME2(XXH_NAMESPACE, XXH_versionNumber)
-#  define XXH32_createState XXH_NAME2(XXH_NAMESPACE, XXH32_createState)
-#  define XXH64_createState XXH_NAME2(XXH_NAMESPACE, XXH64_createState)
-#  define XXH32_freeState XXH_NAME2(XXH_NAMESPACE, XXH32_freeState)
-#  define XXH64_freeState XXH_NAME2(XXH_NAMESPACE, XXH64_freeState)
-#  define XXH32_reset XXH_NAME2(XXH_NAMESPACE, XXH32_reset)
-#  define XXH64_reset XXH_NAME2(XXH_NAMESPACE, XXH64_reset)
-#  define XXH32_update XXH_NAME2(XXH_NAMESPACE, XXH32_update)
-#  define XXH64_update XXH_NAME2(XXH_NAMESPACE, XXH64_update)
-#  define XXH32_digest XXH_NAME2(XXH_NAMESPACE, XXH32_digest)
-#  define XXH64_digest XXH_NAME2(XXH_NAMESPACE, XXH64_digest)
-#  define XXH32_copyState XXH_NAME2(XXH_NAMESPACE, XXH32_copyState)
-#  define XXH64_copyState XXH_NAME2(XXH_NAMESPACE, XXH64_copyState)
-#  define XXH32_canonicalFromHash XXH_NAME2(XXH_NAMESPACE, XXH32_canonicalFromHash)
-#  define XXH64_canonicalFromHash XXH_NAME2(XXH_NAMESPACE, XXH64_canonicalFromHash)
-#  define XXH32_hashFromCanonical XXH_NAME2(XXH_NAMESPACE, XXH32_hashFromCanonical)
-#  define XXH64_hashFromCanonical XXH_NAME2(XXH_NAMESPACE, XXH64_hashFromCanonical)
-#endif
-
-
-/* *************************************
-*  Version
-***************************************/
-#define XXH_VERSION_MAJOR    0
-#define XXH_VERSION_MINOR    6
-#define XXH_VERSION_RELEASE  2
-#define XXH_VERSION_NUMBER  (XXH_VERSION_MAJOR *100*100 + XXH_VERSION_MINOR *100 + XXH_VERSION_RELEASE)
-XXH_PUBLIC_API unsigned XXH_versionNumber (void);
-
-
-/* ****************************
-*  Simple Hash Functions
-******************************/
-typedef unsigned int       XXH32_hash_t;
-typedef unsigned long long XXH64_hash_t;
-
-XXH_PUBLIC_API XXH32_hash_t XXH32 (const void* input, size_t length, unsigned int seed);
-XXH_PUBLIC_API XXH64_hash_t XXH64 (const void* input, size_t length, unsigned long long seed);
-
-/*!
-XXH32() :
-    Calculate the 32-bits hash of sequence "length" bytes stored at memory address "input".
-    The memory between input & input+length must be valid (allocated and read-accessible).
-    "seed" can be used to alter the result predictably.
-    Speed on Core 2 Duo @ 3 GHz (single thread, SMHasher benchmark) : 5.4 GB/s
-XXH64() :
-    Calculate the 64-bits hash of sequence of length "len" stored at memory address "input".
-    "seed" can be used to alter the result predictably.
-    This function runs 2x faster on 64-bits systems, but slower on 32-bits systems (see benchmark).
-*/
-
-
-/* ****************************
-*  Streaming Hash Functions
-******************************/
-typedef struct XXH32_state_s XXH32_state_t;   /* incomplete type */
-typedef struct XXH64_state_s XXH64_state_t;   /* incomplete type */
-
-/*! State allocation, compatible with dynamic libraries */
-
-XXH_PUBLIC_API XXH32_state_t* XXH32_createState(void);
-XXH_PUBLIC_API XXH_errorcode  XXH32_freeState(XXH32_state_t* statePtr);
-
-XXH_PUBLIC_API XXH64_state_t* XXH64_createState(void);
-XXH_PUBLIC_API XXH_errorcode  XXH64_freeState(XXH64_state_t* statePtr);
-
-
-/* hash streaming */
-
-XXH_PUBLIC_API XXH_errorcode XXH32_reset  (XXH32_state_t* statePtr, unsigned int seed);
-XXH_PUBLIC_API XXH_errorcode XXH32_update (XXH32_state_t* statePtr, const void* input, size_t length);
-XXH_PUBLIC_API XXH32_hash_t  XXH32_digest (const XXH32_state_t* statePtr);
-
-XXH_PUBLIC_API XXH_errorcode XXH64_reset  (XXH64_state_t* statePtr, unsigned long long seed);
-XXH_PUBLIC_API XXH_errorcode XXH64_update (XXH64_state_t* statePtr, const void* input, size_t length);
-XXH_PUBLIC_API XXH64_hash_t  XXH64_digest (const XXH64_state_t* statePtr);
-
-/*
-These functions generate the xxHash of an input provided in multiple segments.
-Note that, for small input, they are slower than single-call functions, due to state management.
-For small input, prefer `XXH32()` and `XXH64()` .
-
-XXH state must first be allocated, using XXH*_createState() .
-
-Start a new hash by initializing state with a seed, using XXH*_reset().
-
-Then, feed the hash state by calling XXH*_update() as many times as necessary.
-Obviously, input must be allocated and read accessible.
-The function returns an error code, with 0 meaning OK, and any other value meaning there is an error.
-
-Finally, a hash value can be produced anytime, by using XXH*_digest().
-This function returns the nn-bits hash as an int or long long.
-
-It's still possible to continue inserting input into the hash state after a digest,
-and generate some new hashes later on, by calling again XXH*_digest().
-
-When done, free XXH state space if it was allocated dynamically.
-*/
-
-
-/* **************************
-*  Utils
-****************************/
-#if !(defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L))   /* ! C99 */
-#  define restrict   /* disable restrict */
-#endif
-
-XXH_PUBLIC_API void XXH32_copyState(XXH32_state_t* restrict dst_state, const XXH32_state_t* restrict src_state);
-XXH_PUBLIC_API void XXH64_copyState(XXH64_state_t* restrict dst_state, const XXH64_state_t* restrict src_state);
-
-
-/* **************************
-*  Canonical representation
-****************************/
-/* Default result type for XXH functions are primitive unsigned 32 and 64 bits.
-*  The canonical representation uses human-readable write convention, aka big-endian (large digits first).
-*  These functions allow transformation of hash result into and from its canonical format.
-*  This way, hash values can be written into a file / memory, and remain comparable on different systems and programs.
-*/
-typedef struct { unsigned char digest[4]; } XXH32_canonical_t;
-typedef struct { unsigned char digest[8]; } XXH64_canonical_t;
-
-XXH_PUBLIC_API void XXH32_canonicalFromHash(XXH32_canonical_t* dst, XXH32_hash_t hash);
-XXH_PUBLIC_API void XXH64_canonicalFromHash(XXH64_canonical_t* dst, XXH64_hash_t hash);
-
-XXH_PUBLIC_API XXH32_hash_t XXH32_hashFromCanonical(const XXH32_canonical_t* src);
-XXH_PUBLIC_API XXH64_hash_t XXH64_hashFromCanonical(const XXH64_canonical_t* src);
-
-#endif /* XXHASH_H_5627135585666179 */
-
-
-
-/* ================================================================================================
-   This section contains definitions which are not guaranteed to remain stable.
-   They may change in future versions, becoming incompatible with a different version of the library.
-   They shall only be used with static linking.
-   Never use these definitions in association with dynamic linking !
-=================================================================================================== */
-#if defined(XXH_STATIC_LINKING_ONLY) && !defined(XXH_STATIC_H_3543687687345)
-#define XXH_STATIC_H_3543687687345
-
-/* These definitions are only meant to allow allocation of XXH state
-   statically, on stack, or in a struct for example.
-   Do not use members directly. */
-
-   struct XXH32_state_s {
-       unsigned total_len_32;
-       unsigned large_len;
-       unsigned v1;
-       unsigned v2;
-       unsigned v3;
-       unsigned v4;
-       unsigned mem32[4];   /* buffer defined as U32 for alignment */
-       unsigned memsize;
-       unsigned reserved;   /* never read nor write, will be removed in a future version */
-   };   /* typedef'd to XXH32_state_t */
-
-   struct XXH64_state_s {
-       unsigned long long total_len;
-       unsigned long long v1;
-       unsigned long long v2;
-       unsigned long long v3;
-       unsigned long long v4;
-       unsigned long long mem64[4];   /* buffer defined as U64 for alignment */
-       unsigned memsize;
-       unsigned reserved[2];          /* never read nor write, will be removed in a future version */
-   };   /* typedef'd to XXH64_state_t */
-
-
-#  ifdef XXH_PRIVATE_API
-#    include "xxhash.c"   /* include xxhash functions as `static`, for inlining */
-#  endif
-
-#endif /* XXH_STATIC_LINKING_ONLY && XXH_STATIC_H_3543687687345 */
-
-
-#if defined (__cplusplus)
-}
-#endif
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/common/zstd_common.c mysql-8.0-8.0.27/extra/zstd/lib/common/zstd_common.c
--- mysql-8.0-8.0.26/extra/zstd/lib/common/zstd_common.c	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/common/zstd_common.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
-
-
-/*-*************************************
-*  Dependencies
-***************************************/
-#include <stdlib.h>      /* malloc, calloc, free */
-#include <string.h>      /* memset */
-#include "error_private.h"
-#include "zstd_internal.h"
-
-
-/*-****************************************
-*  Version
-******************************************/
-unsigned ZSTD_versionNumber(void) { return ZSTD_VERSION_NUMBER; }
-
-const char* ZSTD_versionString(void) { return ZSTD_VERSION_STRING; }
-
-
-/*-****************************************
-*  ZSTD Error Management
-******************************************/
-#undef ZSTD_isError   /* defined within zstd_internal.h */
-/*! ZSTD_isError() :
- *  tells if a return value is an error code
- *  symbol is required for external callers */
-unsigned ZSTD_isError(size_t code) { return ERR_isError(code); }
-
-/*! ZSTD_getErrorName() :
- *  provides error code string from function result (useful for debugging) */
-const char* ZSTD_getErrorName(size_t code) { return ERR_getErrorName(code); }
-
-/*! ZSTD_getError() :
- *  convert a `size_t` function result into a proper ZSTD_errorCode enum */
-ZSTD_ErrorCode ZSTD_getErrorCode(size_t code) { return ERR_getErrorCode(code); }
-
-/*! ZSTD_getErrorString() :
- *  provides error code string from enum */
-const char* ZSTD_getErrorString(ZSTD_ErrorCode code) { return ERR_getErrorString(code); }
-
-
-
-/*=**************************************************************
-*  Custom allocator
-****************************************************************/
-void* ZSTD_malloc(size_t size, ZSTD_customMem customMem)
-{
-    if (customMem.customAlloc)
-        return customMem.customAlloc(customMem.opaque, size);
-    return malloc(size);
-}
-
-void* ZSTD_calloc(size_t size, ZSTD_customMem customMem)
-{
-    if (customMem.customAlloc) {
-        /* calloc implemented as malloc+memset;
-         * not as efficient as calloc, but next best guess for custom malloc */
-        void* const ptr = customMem.customAlloc(customMem.opaque, size);
-        memset(ptr, 0, size);
-        return ptr;
-    }
-    return calloc(1, size);
-}
-
-void ZSTD_free(void* ptr, ZSTD_customMem customMem)
-{
-    if (ptr!=NULL) {
-        if (customMem.customFree)
-            customMem.customFree(customMem.opaque, ptr);
-        else
-            free(ptr);
-    }
-}
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/common/zstd_errors.h mysql-8.0-8.0.27/extra/zstd/lib/common/zstd_errors.h
--- mysql-8.0-8.0.26/extra/zstd/lib/common/zstd_errors.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/common/zstd_errors.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
-#ifndef ZSTD_ERRORS_H_398273423
-#define ZSTD_ERRORS_H_398273423
-
-#if defined (__cplusplus)
-extern "C" {
-#endif
-
-/*===== dependency =====*/
-#include <stddef.h>   /* size_t */
-
-
-/* =====   ZSTDERRORLIB_API : control library symbols visibility   ===== */
-#ifndef ZSTDERRORLIB_VISIBILITY
-#  if defined(__GNUC__) && (__GNUC__ >= 4)
-#    define ZSTDERRORLIB_VISIBILITY __attribute__ ((visibility ("default")))
-#  else
-#    define ZSTDERRORLIB_VISIBILITY
-#  endif
-#endif
-#if defined(ZSTD_DLL_EXPORT) && (ZSTD_DLL_EXPORT==1)
-#  define ZSTDERRORLIB_API __declspec(dllexport) ZSTDERRORLIB_VISIBILITY
-#elif defined(ZSTD_DLL_IMPORT) && (ZSTD_DLL_IMPORT==1)
-#  define ZSTDERRORLIB_API __declspec(dllimport) ZSTDERRORLIB_VISIBILITY /* It isn't required but allows to generate better code, saving a function pointer load from the IAT and an indirect jump.*/
-#else
-#  define ZSTDERRORLIB_API ZSTDERRORLIB_VISIBILITY
-#endif
-
-/*-*********************************************
- *  Error codes list
- *-*********************************************
- *  Error codes _values_ are pinned down since v1.3.1 only.
- *  Therefore, don't rely on values if you may link to any version < v1.3.1.
- *
- *  Only values < 100 are considered stable.
- *
- *  note 1 : this API shall be used with static linking only.
- *           dynamic linking is not yet officially supported.
- *  note 2 : Prefer relying on the enum than on its value whenever possible
- *           This is the only supported way to use the error list < v1.3.1
- *  note 3 : ZSTD_isError() is always correct, whatever the library version.
- **********************************************/
-typedef enum {
-  ZSTD_error_no_error = 0,
-  ZSTD_error_GENERIC  = 1,
-  ZSTD_error_prefix_unknown                = 10,
-  ZSTD_error_version_unsupported           = 12,
-  ZSTD_error_frameParameter_unsupported    = 14,
-  ZSTD_error_frameParameter_windowTooLarge = 16,
-  ZSTD_error_corruption_detected = 20,
-  ZSTD_error_checksum_wrong      = 22,
-  ZSTD_error_dictionary_corrupted      = 30,
-  ZSTD_error_dictionary_wrong          = 32,
-  ZSTD_error_dictionaryCreation_failed = 34,
-  ZSTD_error_parameter_unsupported   = 40,
-  ZSTD_error_parameter_outOfBound    = 42,
-  ZSTD_error_tableLog_tooLarge       = 44,
-  ZSTD_error_maxSymbolValue_tooLarge = 46,
-  ZSTD_error_maxSymbolValue_tooSmall = 48,
-  ZSTD_error_stage_wrong       = 60,
-  ZSTD_error_init_missing      = 62,
-  ZSTD_error_memory_allocation = 64,
-  ZSTD_error_workSpace_tooSmall= 66,
-  ZSTD_error_dstSize_tooSmall = 70,
-  ZSTD_error_srcSize_wrong    = 72,
-  ZSTD_error_dstBuffer_null   = 74,
-  /* following error codes are __NOT STABLE__, they can be removed or changed in future versions */
-  ZSTD_error_frameIndex_tooLarge = 100,
-  ZSTD_error_seekableIO          = 102,
-  ZSTD_error_maxCode = 120  /* never EVER use this value directly, it can change in future versions! Use ZSTD_isError() instead */
-} ZSTD_ErrorCode;
-
-/*! ZSTD_getErrorCode() :
-    convert a `size_t` function result into a `ZSTD_ErrorCode` enum type,
-    which can be used to compare with enum list published above */
-ZSTDERRORLIB_API ZSTD_ErrorCode ZSTD_getErrorCode(size_t functionResult);
-ZSTDERRORLIB_API const char* ZSTD_getErrorString(ZSTD_ErrorCode code);   /**< Same as ZSTD_getErrorName, but using a `ZSTD_ErrorCode` enum argument */
-
-
-#if defined (__cplusplus)
-}
-#endif
-
-#endif /* ZSTD_ERRORS_H_398273423 */
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/common/zstd_internal.h mysql-8.0-8.0.27/extra/zstd/lib/common/zstd_internal.h
--- mysql-8.0-8.0.26/extra/zstd/lib/common/zstd_internal.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/common/zstd_internal.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,373 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
-#ifndef ZSTD_CCOMMON_H_MODULE
-#define ZSTD_CCOMMON_H_MODULE
-
-/* this module contains definitions which must be identical
- * across compression, decompression and dictBuilder.
- * It also contains a few functions useful to at least 2 of them
- * and which benefit from being inlined */
-
-/*-*************************************
-*  Dependencies
-***************************************/
-#include "compiler.h"
-#include "mem.h"
-#include "debug.h"                 /* assert, DEBUGLOG, RAWLOG, g_debuglevel */
-#include "error_private.h"
-#define ZSTD_STATIC_LINKING_ONLY
-#include "zstd.h"
-#define FSE_STATIC_LINKING_ONLY
-#include "fse.h"
-#define HUF_STATIC_LINKING_ONLY
-#include "huf.h"
-#ifndef XXH_STATIC_LINKING_ONLY
-#  define XXH_STATIC_LINKING_ONLY  /* XXH64_state_t */
-#endif
-#include "my_zstd_xxhash.h"                /* XXH_reset, update, digest */
-
-#if defined (__cplusplus)
-extern "C" {
-#endif
-
-/* ---- static assert (debug) --- */
-#define ZSTD_STATIC_ASSERT(c) DEBUG_STATIC_ASSERT(c)
-#define ZSTD_isError ERR_isError   /* for inlining */
-#define FSE_isError  ERR_isError
-#define HUF_isError  ERR_isError
-
-
-/*-*************************************
-*  shared macros
-***************************************/
-#undef MIN
-#undef MAX
-#define MIN(a,b) ((a)<(b) ? (a) : (b))
-#define MAX(a,b) ((a)>(b) ? (a) : (b))
-
-/**
- * Return the specified error if the condition evaluates to true.
- *
- * In debug modes, prints additional information.
- * In order to do that (particularly, printing the conditional that failed),
- * this can't just wrap RETURN_ERROR().
- */
-#define RETURN_ERROR_IF(cond, err, ...) \
-  if (cond) { \
-    RAWLOG(3, "%s:%d: ERROR!: check %s failed, returning %s", __FILE__, __LINE__, ZSTD_QUOTE(cond), ZSTD_QUOTE(ERROR(err))); \
-    RAWLOG(3, ": " __VA_ARGS__); \
-    RAWLOG(3, "\n"); \
-    return ERROR(err); \
-  }
-
-/**
- * Unconditionally return the specified error.
- *
- * In debug modes, prints additional information.
- */
-#define RETURN_ERROR(err, ...) \
-  do { \
-    RAWLOG(3, "%s:%d: ERROR!: unconditional check failed, returning %s", __FILE__, __LINE__, ZSTD_QUOTE(ERROR(err))); \
-    RAWLOG(3, ": " __VA_ARGS__); \
-    RAWLOG(3, "\n"); \
-    return ERROR(err); \
-  } while(0);
-
-/**
- * If the provided expression evaluates to an error code, returns that error code.
- *
- * In debug modes, prints additional information.
- */
-#define FORWARD_IF_ERROR(err, ...) \
-  do { \
-    size_t const err_code = (err); \
-    if (ERR_isError(err_code)) { \
-      RAWLOG(3, "%s:%d: ERROR!: forwarding error in %s: %s", __FILE__, __LINE__, ZSTD_QUOTE(err), ERR_getErrorName(err_code)); \
-      RAWLOG(3, ": " __VA_ARGS__); \
-      RAWLOG(3, "\n"); \
-      return err_code; \
-    } \
-  } while(0);
-
-
-/*-*************************************
-*  Common constants
-***************************************/
-#define ZSTD_OPT_NUM    (1<<12)
-
-#define ZSTD_REP_NUM      3                 /* number of repcodes */
-#define ZSTD_REP_MOVE     (ZSTD_REP_NUM-1)
-static const U32 repStartValue[ZSTD_REP_NUM] = { 1, 4, 8 };
-
-#define KB *(1 <<10)
-#define MB *(1 <<20)
-#define GB *(1U<<30)
-
-#define BIT7 128
-#define BIT6  64
-#define BIT5  32
-#define BIT4  16
-#define BIT1   2
-#define BIT0   1
-
-#define ZSTD_WINDOWLOG_ABSOLUTEMIN 10
-static const size_t ZSTD_fcs_fieldSize[4] = { 0, 2, 4, 8 };
-static const size_t ZSTD_did_fieldSize[4] = { 0, 1, 2, 4 };
-
-#define ZSTD_FRAMEIDSIZE 4   /* magic number size */
-
-#define ZSTD_BLOCKHEADERSIZE 3   /* C standard doesn't allow `static const` variable to be init using another `static const` variable */
-static const size_t ZSTD_blockHeaderSize = ZSTD_BLOCKHEADERSIZE;
-typedef enum { bt_raw, bt_rle, bt_compressed, bt_reserved } blockType_e;
-
-#define MIN_SEQUENCES_SIZE 1 /* nbSeq==0 */
-#define MIN_CBLOCK_SIZE (1 /*litCSize*/ + 1 /* RLE or RAW */ + MIN_SEQUENCES_SIZE /* nbSeq==0 */)   /* for a non-null block */
-
-#define HufLog 12
-typedef enum { set_basic, set_rle, set_compressed, set_repeat } symbolEncodingType_e;
-
-#define LONGNBSEQ 0x7F00
-
-#define MINMATCH 3
-
-#define Litbits  8
-#define MaxLit ((1<<Litbits) - 1)
-#define MaxML   52
-#define MaxLL   35
-#define DefaultMaxOff 28
-#define MaxOff  31
-#define MaxSeq MAX(MaxLL, MaxML)   /* Assumption : MaxOff < MaxLL,MaxML */
-#define MLFSELog    9
-#define LLFSELog    9
-#define OffFSELog   8
-#define MaxFSELog  MAX(MAX(MLFSELog, LLFSELog), OffFSELog)
-
-static const U32 LL_bits[MaxLL+1] = { 0, 0, 0, 0, 0, 0, 0, 0,
-                                      0, 0, 0, 0, 0, 0, 0, 0,
-                                      1, 1, 1, 1, 2, 2, 3, 3,
-                                      4, 6, 7, 8, 9,10,11,12,
-                                     13,14,15,16 };
-static const S16 LL_defaultNorm[MaxLL+1] = { 4, 3, 2, 2, 2, 2, 2, 2,
-                                             2, 2, 2, 2, 2, 1, 1, 1,
-                                             2, 2, 2, 2, 2, 2, 2, 2,
-                                             2, 3, 2, 1, 1, 1, 1, 1,
-                                            -1,-1,-1,-1 };
-#define LL_DEFAULTNORMLOG 6  /* for static allocation */
-static const U32 LL_defaultNormLog = LL_DEFAULTNORMLOG;
-
-static const U32 ML_bits[MaxML+1] = { 0, 0, 0, 0, 0, 0, 0, 0,
-                                      0, 0, 0, 0, 0, 0, 0, 0,
-                                      0, 0, 0, 0, 0, 0, 0, 0,
-                                      0, 0, 0, 0, 0, 0, 0, 0,
-                                      1, 1, 1, 1, 2, 2, 3, 3,
-                                      4, 4, 5, 7, 8, 9,10,11,
-                                     12,13,14,15,16 };
-static const S16 ML_defaultNorm[MaxML+1] = { 1, 4, 3, 2, 2, 2, 2, 2,
-                                             2, 1, 1, 1, 1, 1, 1, 1,
-                                             1, 1, 1, 1, 1, 1, 1, 1,
-                                             1, 1, 1, 1, 1, 1, 1, 1,
-                                             1, 1, 1, 1, 1, 1, 1, 1,
-                                             1, 1, 1, 1, 1, 1,-1,-1,
-                                            -1,-1,-1,-1,-1 };
-#define ML_DEFAULTNORMLOG 6  /* for static allocation */
-static const U32 ML_defaultNormLog = ML_DEFAULTNORMLOG;
-
-static const S16 OF_defaultNorm[DefaultMaxOff+1] = { 1, 1, 1, 1, 1, 1, 2, 2,
-                                                     2, 1, 1, 1, 1, 1, 1, 1,
-                                                     1, 1, 1, 1, 1, 1, 1, 1,
-                                                    -1,-1,-1,-1,-1 };
-#define OF_DEFAULTNORMLOG 5  /* for static allocation */
-static const U32 OF_defaultNormLog = OF_DEFAULTNORMLOG;
-
-
-/*-*******************************************
-*  Shared functions to include for inlining
-*********************************************/
-static void ZSTD_copy8(void* dst, const void* src) { memcpy(dst, src, 8); }
-
-#define COPY8(d,s) { ZSTD_copy8(d,s); d+=8; s+=8; }
-static void ZSTD_copy16(void* dst, const void* src) { memcpy(dst, src, 16); }
-#define COPY16(d,s) { ZSTD_copy16(d,s); d+=16; s+=16; }
-
-#define WILDCOPY_OVERLENGTH 8
-#define VECLEN 16
-
-typedef enum {
-    ZSTD_no_overlap,
-    ZSTD_overlap_src_before_dst,
-    /*  ZSTD_overlap_dst_before_src, */
-} ZSTD_overlap_e;
-
-/*! ZSTD_wildcopy() :
- *  custom version of memcpy(), can overwrite up to WILDCOPY_OVERLENGTH bytes (if length==0) */
-MEM_STATIC FORCE_INLINE_ATTR DONT_VECTORIZE
-void ZSTD_wildcopy(void* dst, const void* src, ptrdiff_t length, ZSTD_overlap_e ovtype)
-{
-    ptrdiff_t diff = (BYTE*)dst - (const BYTE*)src;
-    const BYTE* ip = (const BYTE*)src;
-    BYTE* op = (BYTE*)dst;
-    BYTE* const oend = op + length;
-
-    assert(diff >= 8 || (ovtype == ZSTD_no_overlap && diff < -8));
-    if (length < VECLEN || (ovtype == ZSTD_overlap_src_before_dst && diff < VECLEN)) {
-      do
-          COPY8(op, ip)
-      while (op < oend);
-    }
-    else {
-      if ((length & 8) == 0)
-        COPY8(op, ip);
-      do {
-        COPY16(op, ip);
-      }
-      while (op < oend);
-    }
-}
-
-/*! ZSTD_wildcopy_16min() :
- *  same semantics as ZSTD_wilcopy() except guaranteed to be able to copy 16 bytes at the start */
-MEM_STATIC FORCE_INLINE_ATTR DONT_VECTORIZE
-void ZSTD_wildcopy_16min(void* dst, const void* src, ptrdiff_t length, ZSTD_overlap_e ovtype)
-{
-    ptrdiff_t diff = (BYTE*)dst - (const BYTE*)src;
-    const BYTE* ip = (const BYTE*)src;
-    BYTE* op = (BYTE*)dst;
-    BYTE* const oend = op + length;
-
-    assert(length >= 8);
-    assert(diff >= 8 || (ovtype == ZSTD_no_overlap && diff < -8));
-
-    if (ovtype == ZSTD_overlap_src_before_dst && diff < VECLEN) {
-      do
-          COPY8(op, ip)
-      while (op < oend);
-    }
-    else {
-      if ((length & 8) == 0)
-        COPY8(op, ip);
-      do {
-        COPY16(op, ip);
-      }
-      while (op < oend);
-    }
-}
-
-MEM_STATIC void ZSTD_wildcopy_e(void* dst, const void* src, void* dstEnd)   /* should be faster for decoding, but strangely, not verified on all platform */
-{
-    const BYTE* ip = (const BYTE*)src;
-    BYTE* op = (BYTE*)dst;
-    BYTE* const oend = (BYTE*)dstEnd;
-    do
-        COPY8(op, ip)
-    while (op < oend);
-}
-
-
-/*-*******************************************
-*  Private declarations
-*********************************************/
-typedef struct seqDef_s {
-    U32 offset;
-    U16 litLength;
-    U16 matchLength;
-} seqDef;
-
-typedef struct {
-    seqDef* sequencesStart;
-    seqDef* sequences;
-    BYTE* litStart;
-    BYTE* lit;
-    BYTE* llCode;
-    BYTE* mlCode;
-    BYTE* ofCode;
-    size_t maxNbSeq;
-    size_t maxNbLit;
-    U32   longLengthID;   /* 0 == no longLength; 1 == Lit.longLength; 2 == Match.longLength; */
-    U32   longLengthPos;
-} seqStore_t;
-
-/**
- * Contains the compressed frame size and an upper-bound for the decompressed frame size.
- * Note: before using `compressedSize`, check for errors using ZSTD_isError().
- *       similarly, before using `decompressedBound`, check for errors using:
- *          `decompressedBound != ZSTD_CONTENTSIZE_ERROR`
- */
-typedef struct {
-    size_t compressedSize;
-    unsigned long long decompressedBound;
-} ZSTD_frameSizeInfo;   /* decompress & legacy */
-
-const seqStore_t* ZSTD_getSeqStore(const ZSTD_CCtx* ctx);   /* compress & dictBuilder */
-void ZSTD_seqToCodes(const seqStore_t* seqStorePtr);   /* compress, dictBuilder, decodeCorpus (shouldn't get its definition from here) */
-
-/* custom memory allocation functions */
-void* ZSTD_malloc(size_t size, ZSTD_customMem customMem);
-void* ZSTD_calloc(size_t size, ZSTD_customMem customMem);
-void ZSTD_free(void* ptr, ZSTD_customMem customMem);
-
-
-MEM_STATIC U32 ZSTD_highbit32(U32 val)   /* compress, dictBuilder, decodeCorpus */
-{
-    assert(val != 0);
-    {
-#   if defined(_MSC_VER)   /* Visual */
-        unsigned long r=0;
-        _BitScanReverse(&r, val);
-        return (unsigned)r;
-#   elif defined(__GNUC__) && (__GNUC__ >= 3)   /* GCC Intrinsic */
-        return 31 - __builtin_clz(val);
-#   elif defined(__ICCARM__)    /* IAR Intrinsic */
-        return 31 - __CLZ(val);
-#   else   /* Software version */
-        static const U32 DeBruijnClz[32] = { 0, 9, 1, 10, 13, 21, 2, 29, 11, 14, 16, 18, 22, 25, 3, 30, 8, 12, 20, 28, 15, 17, 24, 7, 19, 27, 23, 6, 26, 5, 4, 31 };
-        U32 v = val;
-        v |= v >> 1;
-        v |= v >> 2;
-        v |= v >> 4;
-        v |= v >> 8;
-        v |= v >> 16;
-        return DeBruijnClz[(v * 0x07C4ACDDU) >> 27];
-#   endif
-    }
-}
-
-
-/* ZSTD_invalidateRepCodes() :
- * ensures next compression will not use repcodes from previous block.
- * Note : only works with regular variant;
- *        do not use with extDict variant ! */
-void ZSTD_invalidateRepCodes(ZSTD_CCtx* cctx);   /* zstdmt, adaptive_compression (shouldn't get this definition from here) */
-
-
-typedef struct {
-    blockType_e blockType;
-    U32 lastBlock;
-    U32 origSize;
-} blockProperties_t;   /* declared here for decompress and fullbench */
-
-/*! ZSTD_getcBlockSize() :
- *  Provides the size of compressed block from block header `src` */
-/* Used by: decompress, fullbench (does not get its definition from here) */
-size_t ZSTD_getcBlockSize(const void* src, size_t srcSize,
-                          blockProperties_t* bpPtr);
-
-/*! ZSTD_decodeSeqHeaders() :
- *  decode sequence header from src */
-/* Used by: decompress, fullbench (does not get its definition from here) */
-size_t ZSTD_decodeSeqHeaders(ZSTD_DCtx* dctx, int* nbSeqPtr,
-                       const void* src, size_t srcSize);
-
-
-#if defined (__cplusplus)
-}
-#endif
-
-#endif   /* ZSTD_CCOMMON_H_MODULE */
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/compress/fse_compress.c mysql-8.0-8.0.27/extra/zstd/lib/compress/fse_compress.c
--- mysql-8.0-8.0.26/extra/zstd/lib/compress/fse_compress.c	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/compress/fse_compress.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,721 +0,0 @@
-/* ******************************************************************
-   FSE : Finite State Entropy encoder
-   Copyright (C) 2013-present, Yann Collet.
-
-   BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are
-   met:
-
-       * Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-       * Redistributions in binary form must reproduce the above
-   copyright notice, this list of conditions and the following disclaimer
-   in the documentation and/or other materials provided with the
-   distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-    You can contact the author at :
-    - FSE source repository : https://github.com/Cyan4973/FiniteStateEntropy
-    - Public forum : https://groups.google.com/forum/#!forum/lz4c
-****************************************************************** */
-
-/* **************************************************************
-*  Includes
-****************************************************************/
-#include <stdlib.h>     /* malloc, free, qsort */
-#include <string.h>     /* memcpy, memset */
-#include "compiler.h"
-#include "mem.h"        /* U32, U16, etc. */
-#include "debug.h"      /* assert, DEBUGLOG */
-#include "hist.h"       /* HIST_count_wksp */
-#include "bitstream.h"
-#define FSE_STATIC_LINKING_ONLY
-#include "fse.h"
-#include "error_private.h"
-
-
-/* **************************************************************
-*  Error Management
-****************************************************************/
-#define FSE_isError ERR_isError
-
-
-/* **************************************************************
-*  Templates
-****************************************************************/
-/*
-  designed to be included
-  for type-specific functions (template emulation in C)
-  Objective is to write these functions only once, for improved maintenance
-*/
-
-/* safety checks */
-#ifndef FSE_FUNCTION_EXTENSION
-#  error "FSE_FUNCTION_EXTENSION must be defined"
-#endif
-#ifndef FSE_FUNCTION_TYPE
-#  error "FSE_FUNCTION_TYPE must be defined"
-#endif
-
-/* Function names */
-#define FSE_CAT(X,Y) X##Y
-#define FSE_FUNCTION_NAME(X,Y) FSE_CAT(X,Y)
-#define FSE_TYPE_NAME(X,Y) FSE_CAT(X,Y)
-
-
-/* Function templates */
-
-/* FSE_buildCTable_wksp() :
- * Same as FSE_buildCTable(), but using an externally allocated scratch buffer (`workSpace`).
- * wkspSize should be sized to handle worst case situation, which is `1<<max_tableLog * sizeof(FSE_FUNCTION_TYPE)`
- * workSpace must also be properly aligned with FSE_FUNCTION_TYPE requirements
- */
-size_t FSE_buildCTable_wksp(FSE_CTable* ct,
-                      const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog,
-                            void* workSpace, size_t wkspSize)
-{
-    U32 const tableSize = 1 << tableLog;
-    U32 const tableMask = tableSize - 1;
-    void* const ptr = ct;
-    U16* const tableU16 = ( (U16*) ptr) + 2;
-    void* const FSCT = ((U32*)ptr) + 1 /* header */ + (tableLog ? tableSize>>1 : 1) ;
-    FSE_symbolCompressionTransform* const symbolTT = (FSE_symbolCompressionTransform*) (FSCT);
-    U32 const step = FSE_TABLESTEP(tableSize);
-    U32 cumul[FSE_MAX_SYMBOL_VALUE+2];
-
-    FSE_FUNCTION_TYPE* const tableSymbol = (FSE_FUNCTION_TYPE*)workSpace;
-    U32 highThreshold = tableSize-1;
-
-    /* CTable header */
-    if (((size_t)1 << tableLog) * sizeof(FSE_FUNCTION_TYPE) > wkspSize) return ERROR(tableLog_tooLarge);
-    tableU16[-2] = (U16) tableLog;
-    tableU16[-1] = (U16) maxSymbolValue;
-    assert(tableLog < 16);   /* required for threshold strategy to work */
-
-    /* For explanations on how to distribute symbol values over the table :
-     * http://fastcompression.blogspot.fr/2014/02/fse-distributing-symbol-values.html */
-
-     #ifdef __clang_analyzer__
-     memset(tableSymbol, 0, sizeof(*tableSymbol) * tableSize);   /* useless initialization, just to keep scan-build happy */
-     #endif
-
-    /* symbol start positions */
-    {   U32 u;
-        cumul[0] = 0;
-        for (u=1; u <= maxSymbolValue+1; u++) {
-            if (normalizedCounter[u-1]==-1) {  /* Low proba symbol */
-                cumul[u] = cumul[u-1] + 1;
-                tableSymbol[highThreshold--] = (FSE_FUNCTION_TYPE)(u-1);
-            } else {
-                cumul[u] = cumul[u-1] + normalizedCounter[u-1];
-        }   }
-        cumul[maxSymbolValue+1] = tableSize+1;
-    }
-
-    /* Spread symbols */
-    {   U32 position = 0;
-        U32 symbol;
-        for (symbol=0; symbol<=maxSymbolValue; symbol++) {
-            int nbOccurrences;
-            int const freq = normalizedCounter[symbol];
-            for (nbOccurrences=0; nbOccurrences<freq; nbOccurrences++) {
-                tableSymbol[position] = (FSE_FUNCTION_TYPE)symbol;
-                position = (position + step) & tableMask;
-                while (position > highThreshold)
-                    position = (position + step) & tableMask;   /* Low proba area */
-        }   }
-
-        assert(position==0);  /* Must have initialized all positions */
-    }
-
-    /* Build table */
-    {   U32 u; for (u=0; u<tableSize; u++) {
-        FSE_FUNCTION_TYPE s = tableSymbol[u];   /* note : static analyzer may not understand tableSymbol is properly initialized */
-        tableU16[cumul[s]++] = (U16) (tableSize+u);   /* TableU16 : sorted by symbol order; gives next state value */
-    }   }
-
-    /* Build Symbol Transformation Table */
-    {   unsigned total = 0;
-        unsigned s;
-        for (s=0; s<=maxSymbolValue; s++) {
-            switch (normalizedCounter[s])
-            {
-            case  0:
-                /* filling nonetheless, for compatibility with FSE_getMaxNbBits() */
-                symbolTT[s].deltaNbBits = ((tableLog+1) << 16) - (1<<tableLog);
-                break;
-
-            case -1:
-            case  1:
-                symbolTT[s].deltaNbBits = (tableLog << 16) - (1<<tableLog);
-                symbolTT[s].deltaFindState = total - 1;
-                total ++;
-                break;
-            default :
-                {
-                    U32 const maxBitsOut = tableLog - BIT_highbit32 (normalizedCounter[s]-1);
-                    U32 const minStatePlus = normalizedCounter[s] << maxBitsOut;
-                    symbolTT[s].deltaNbBits = (maxBitsOut << 16) - minStatePlus;
-                    symbolTT[s].deltaFindState = total - normalizedCounter[s];
-                    total +=  normalizedCounter[s];
-    }   }   }   }
-
-#if 0  /* debug : symbol costs */
-    DEBUGLOG(5, "\n --- table statistics : ");
-    {   U32 symbol;
-        for (symbol=0; symbol<=maxSymbolValue; symbol++) {
-            DEBUGLOG(5, "%3u: w=%3i,   maxBits=%u, fracBits=%.2f",
-                symbol, normalizedCounter[symbol],
-                FSE_getMaxNbBits(symbolTT, symbol),
-                (double)FSE_bitCost(symbolTT, tableLog, symbol, 8) / 256);
-        }
-    }
-#endif
-
-    return 0;
-}
-
-
-size_t FSE_buildCTable(FSE_CTable* ct, const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog)
-{
-    FSE_FUNCTION_TYPE tableSymbol[FSE_MAX_TABLESIZE];   /* memset() is not necessary, even if static analyzer complain about it */
-    return FSE_buildCTable_wksp(ct, normalizedCounter, maxSymbolValue, tableLog, tableSymbol, sizeof(tableSymbol));
-}
-
-
-
-#ifndef FSE_COMMONDEFS_ONLY
-
-
-/*-**************************************************************
-*  FSE NCount encoding
-****************************************************************/
-size_t FSE_NCountWriteBound(unsigned maxSymbolValue, unsigned tableLog)
-{
-    size_t const maxHeaderSize = (((maxSymbolValue+1) * tableLog) >> 3) + 3;
-    return maxSymbolValue ? maxHeaderSize : FSE_NCOUNTBOUND;  /* maxSymbolValue==0 ? use default */
-}
-
-static size_t
-FSE_writeNCount_generic (void* header, size_t headerBufferSize,
-                   const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog,
-                         unsigned writeIsSafe)
-{
-    BYTE* const ostart = (BYTE*) header;
-    BYTE* out = ostart;
-    BYTE* const oend = ostart + headerBufferSize;
-    int nbBits;
-    const int tableSize = 1 << tableLog;
-    int remaining;
-    int threshold;
-    U32 bitStream = 0;
-    int bitCount = 0;
-    unsigned symbol = 0;
-    unsigned const alphabetSize = maxSymbolValue + 1;
-    int previousIs0 = 0;
-
-    /* Table Size */
-    bitStream += (tableLog-FSE_MIN_TABLELOG) << bitCount;
-    bitCount  += 4;
-
-    /* Init */
-    remaining = tableSize+1;   /* +1 for extra accuracy */
-    threshold = tableSize;
-    nbBits = tableLog+1;
-
-    while ((symbol < alphabetSize) && (remaining>1)) {  /* stops at 1 */
-        if (previousIs0) {
-            unsigned start = symbol;
-            while ((symbol < alphabetSize) && !normalizedCounter[symbol]) symbol++;
-            if (symbol == alphabetSize) break;   /* incorrect distribution */
-            while (symbol >= start+24) {
-                start+=24;
-                bitStream += 0xFFFFU << bitCount;
-                if ((!writeIsSafe) && (out > oend-2))
-                    return ERROR(dstSize_tooSmall);   /* Buffer overflow */
-                out[0] = (BYTE) bitStream;
-                out[1] = (BYTE)(bitStream>>8);
-                out+=2;
-                bitStream>>=16;
-            }
-            while (symbol >= start+3) {
-                start+=3;
-                bitStream += 3 << bitCount;
-                bitCount += 2;
-            }
-            bitStream += (symbol-start) << bitCount;
-            bitCount += 2;
-            if (bitCount>16) {
-                if ((!writeIsSafe) && (out > oend - 2))
-                    return ERROR(dstSize_tooSmall);   /* Buffer overflow */
-                out[0] = (BYTE)bitStream;
-                out[1] = (BYTE)(bitStream>>8);
-                out += 2;
-                bitStream >>= 16;
-                bitCount -= 16;
-        }   }
-        {   int count = normalizedCounter[symbol++];
-            int const max = (2*threshold-1) - remaining;
-            remaining -= count < 0 ? -count : count;
-            count++;   /* +1 for extra accuracy */
-            if (count>=threshold)
-                count += max;   /* [0..max[ [max..threshold[ (...) [threshold+max 2*threshold[ */
-            bitStream += count << bitCount;
-            bitCount  += nbBits;
-            bitCount  -= (count<max);
-            previousIs0  = (count==1);
-            if (remaining<1) return ERROR(GENERIC);
-            while (remaining<threshold) { nbBits--; threshold>>=1; }
-        }
-        if (bitCount>16) {
-            if ((!writeIsSafe) && (out > oend - 2))
-                return ERROR(dstSize_tooSmall);   /* Buffer overflow */
-            out[0] = (BYTE)bitStream;
-            out[1] = (BYTE)(bitStream>>8);
-            out += 2;
-            bitStream >>= 16;
-            bitCount -= 16;
-    }   }
-
-    if (remaining != 1)
-        return ERROR(GENERIC);  /* incorrect normalized distribution */
-    assert(symbol <= alphabetSize);
-
-    /* flush remaining bitStream */
-    if ((!writeIsSafe) && (out > oend - 2))
-        return ERROR(dstSize_tooSmall);   /* Buffer overflow */
-    out[0] = (BYTE)bitStream;
-    out[1] = (BYTE)(bitStream>>8);
-    out+= (bitCount+7) /8;
-
-    return (out-ostart);
-}
-
-
-size_t FSE_writeNCount (void* buffer, size_t bufferSize,
-                  const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog)
-{
-    if (tableLog > FSE_MAX_TABLELOG) return ERROR(tableLog_tooLarge);   /* Unsupported */
-    if (tableLog < FSE_MIN_TABLELOG) return ERROR(GENERIC);   /* Unsupported */
-
-    if (bufferSize < FSE_NCountWriteBound(maxSymbolValue, tableLog))
-        return FSE_writeNCount_generic(buffer, bufferSize, normalizedCounter, maxSymbolValue, tableLog, 0);
-
-    return FSE_writeNCount_generic(buffer, bufferSize, normalizedCounter, maxSymbolValue, tableLog, 1 /* write in buffer is safe */);
-}
-
-
-/*-**************************************************************
-*  FSE Compression Code
-****************************************************************/
-
-FSE_CTable* FSE_createCTable (unsigned maxSymbolValue, unsigned tableLog)
-{
-    size_t size;
-    if (tableLog > FSE_TABLELOG_ABSOLUTE_MAX) tableLog = FSE_TABLELOG_ABSOLUTE_MAX;
-    size = FSE_CTABLE_SIZE_U32 (tableLog, maxSymbolValue) * sizeof(U32);
-    return (FSE_CTable*)malloc(size);
-}
-
-void FSE_freeCTable (FSE_CTable* ct) { free(ct); }
-
-/* provides the minimum logSize to safely represent a distribution */
-static unsigned FSE_minTableLog(size_t srcSize, unsigned maxSymbolValue)
-{
-    U32 minBitsSrc = BIT_highbit32((U32)(srcSize)) + 1;
-    U32 minBitsSymbols = BIT_highbit32(maxSymbolValue) + 2;
-    U32 minBits = minBitsSrc < minBitsSymbols ? minBitsSrc : minBitsSymbols;
-    assert(srcSize > 1); /* Not supported, RLE should be used instead */
-    return minBits;
-}
-
-unsigned FSE_optimalTableLog_internal(unsigned maxTableLog, size_t srcSize, unsigned maxSymbolValue, unsigned minus)
-{
-    U32 maxBitsSrc = BIT_highbit32((U32)(srcSize - 1)) - minus;
-    U32 tableLog = maxTableLog;
-    U32 minBits = FSE_minTableLog(srcSize, maxSymbolValue);
-    assert(srcSize > 1); /* Not supported, RLE should be used instead */
-    if (tableLog==0) tableLog = FSE_DEFAULT_TABLELOG;
-    if (maxBitsSrc < tableLog) tableLog = maxBitsSrc;   /* Accuracy can be reduced */
-    if (minBits > tableLog) tableLog = minBits;   /* Need a minimum to safely represent all symbol values */
-    if (tableLog < FSE_MIN_TABLELOG) tableLog = FSE_MIN_TABLELOG;
-    if (tableLog > FSE_MAX_TABLELOG) tableLog = FSE_MAX_TABLELOG;
-    return tableLog;
-}
-
-unsigned FSE_optimalTableLog(unsigned maxTableLog, size_t srcSize, unsigned maxSymbolValue)
-{
-    return FSE_optimalTableLog_internal(maxTableLog, srcSize, maxSymbolValue, 2);
-}
-
-
-/* Secondary normalization method.
-   To be used when primary method fails. */
-
-static size_t FSE_normalizeM2(short* norm, U32 tableLog, const unsigned* count, size_t total, U32 maxSymbolValue)
-{
-    short const NOT_YET_ASSIGNED = -2;
-    U32 s;
-    U32 distributed = 0;
-    U32 ToDistribute;
-
-    /* Init */
-    U32 const lowThreshold = (U32)(total >> tableLog);
-    U32 lowOne = (U32)((total * 3) >> (tableLog + 1));
-
-    for (s=0; s<=maxSymbolValue; s++) {
-        if (count[s] == 0) {
-            norm[s]=0;
-            continue;
-        }
-        if (count[s] <= lowThreshold) {
-            norm[s] = -1;
-            distributed++;
-            total -= count[s];
-            continue;
-        }
-        if (count[s] <= lowOne) {
-            norm[s] = 1;
-            distributed++;
-            total -= count[s];
-            continue;
-        }
-
-        norm[s]=NOT_YET_ASSIGNED;
-    }
-    ToDistribute = (1 << tableLog) - distributed;
-
-    if (ToDistribute == 0)
-        return 0;
-
-    if ((total / ToDistribute) > lowOne) {
-        /* risk of rounding to zero */
-        lowOne = (U32)((total * 3) / (ToDistribute * 2));
-        for (s=0; s<=maxSymbolValue; s++) {
-            if ((norm[s] == NOT_YET_ASSIGNED) && (count[s] <= lowOne)) {
-                norm[s] = 1;
-                distributed++;
-                total -= count[s];
-                continue;
-        }   }
-        ToDistribute = (1 << tableLog) - distributed;
-    }
-
-    if (distributed == maxSymbolValue+1) {
-        /* all values are pretty poor;
-           probably incompressible data (should have already been detected);
-           find max, then give all remaining points to max */
-        U32 maxV = 0, maxC = 0;
-        for (s=0; s<=maxSymbolValue; s++)
-            if (count[s] > maxC) { maxV=s; maxC=count[s]; }
-        norm[maxV] += (short)ToDistribute;
-        return 0;
-    }
-
-    if (total == 0) {
-        /* all of the symbols were low enough for the lowOne or lowThreshold */
-        for (s=0; ToDistribute > 0; s = (s+1)%(maxSymbolValue+1))
-            if (norm[s] > 0) { ToDistribute--; norm[s]++; }
-        return 0;
-    }
-
-    {   U64 const vStepLog = 62 - tableLog;
-        U64 const mid = (1ULL << (vStepLog-1)) - 1;
-        U64 const rStep = ((((U64)1<<vStepLog) * ToDistribute) + mid) / total;   /* scale on remaining */
-        U64 tmpTotal = mid;
-        for (s=0; s<=maxSymbolValue; s++) {
-            if (norm[s]==NOT_YET_ASSIGNED) {
-                U64 const end = tmpTotal + (count[s] * rStep);
-                U32 const sStart = (U32)(tmpTotal >> vStepLog);
-                U32 const sEnd = (U32)(end >> vStepLog);
-                U32 const weight = sEnd - sStart;
-                if (weight < 1)
-                    return ERROR(GENERIC);
-                norm[s] = (short)weight;
-                tmpTotal = end;
-    }   }   }
-
-    return 0;
-}
-
-
-size_t FSE_normalizeCount (short* normalizedCounter, unsigned tableLog,
-                           const unsigned* count, size_t total,
-                           unsigned maxSymbolValue)
-{
-    /* Sanity checks */
-    if (tableLog==0) tableLog = FSE_DEFAULT_TABLELOG;
-    if (tableLog < FSE_MIN_TABLELOG) return ERROR(GENERIC);   /* Unsupported size */
-    if (tableLog > FSE_MAX_TABLELOG) return ERROR(tableLog_tooLarge);   /* Unsupported size */
-    if (tableLog < FSE_minTableLog(total, maxSymbolValue)) return ERROR(GENERIC);   /* Too small tableLog, compression potentially impossible */
-
-    {   static U32 const rtbTable[] = {     0, 473195, 504333, 520860, 550000, 700000, 750000, 830000 };
-        U64 const scale = 62 - tableLog;
-        U64 const step = ((U64)1<<62) / total;   /* <== here, one division ! */
-        U64 const vStep = 1ULL<<(scale-20);
-        int stillToDistribute = 1<<tableLog;
-        unsigned s;
-        unsigned largest=0;
-        short largestP=0;
-        U32 lowThreshold = (U32)(total >> tableLog);
-
-        for (s=0; s<=maxSymbolValue; s++) {
-            if (count[s] == total) return 0;   /* rle special case */
-            if (count[s] == 0) { normalizedCounter[s]=0; continue; }
-            if (count[s] <= lowThreshold) {
-                normalizedCounter[s] = -1;
-                stillToDistribute--;
-            } else {
-                short proba = (short)((count[s]*step) >> scale);
-                if (proba<8) {
-                    U64 restToBeat = vStep * rtbTable[proba];
-                    proba += (count[s]*step) - ((U64)proba<<scale) > restToBeat;
-                }
-                if (proba > largestP) { largestP=proba; largest=s; }
-                normalizedCounter[s] = proba;
-                stillToDistribute -= proba;
-        }   }
-        if (-stillToDistribute >= (normalizedCounter[largest] >> 1)) {
-            /* corner case, need another normalization method */
-            size_t const errorCode = FSE_normalizeM2(normalizedCounter, tableLog, count, total, maxSymbolValue);
-            if (FSE_isError(errorCode)) return errorCode;
-        }
-        else normalizedCounter[largest] += (short)stillToDistribute;
-    }
-
-#if 0
-    {   /* Print Table (debug) */
-        U32 s;
-        U32 nTotal = 0;
-        for (s=0; s<=maxSymbolValue; s++)
-            RAWLOG(2, "%3i: %4i \n", s, normalizedCounter[s]);
-        for (s=0; s<=maxSymbolValue; s++)
-            nTotal += abs(normalizedCounter[s]);
-        if (nTotal != (1U<<tableLog))
-            RAWLOG(2, "Warning !!! Total == %u != %u !!!", nTotal, 1U<<tableLog);
-        getchar();
-    }
-#endif
-
-    return tableLog;
-}
-
-
-/* fake FSE_CTable, for raw (uncompressed) input */
-size_t FSE_buildCTable_raw (FSE_CTable* ct, unsigned nbBits)
-{
-    const unsigned tableSize = 1 << nbBits;
-    const unsigned tableMask = tableSize - 1;
-    const unsigned maxSymbolValue = tableMask;
-    void* const ptr = ct;
-    U16* const tableU16 = ( (U16*) ptr) + 2;
-    void* const FSCT = ((U32*)ptr) + 1 /* header */ + (tableSize>>1);   /* assumption : tableLog >= 1 */
-    FSE_symbolCompressionTransform* const symbolTT = (FSE_symbolCompressionTransform*) (FSCT);
-    unsigned s;
-
-    /* Sanity checks */
-    if (nbBits < 1) return ERROR(GENERIC);             /* min size */
-
-    /* header */
-    tableU16[-2] = (U16) nbBits;
-    tableU16[-1] = (U16) maxSymbolValue;
-
-    /* Build table */
-    for (s=0; s<tableSize; s++)
-        tableU16[s] = (U16)(tableSize + s);
-
-    /* Build Symbol Transformation Table */
-    {   const U32 deltaNbBits = (nbBits << 16) - (1 << nbBits);
-        for (s=0; s<=maxSymbolValue; s++) {
-            symbolTT[s].deltaNbBits = deltaNbBits;
-            symbolTT[s].deltaFindState = s-1;
-    }   }
-
-    return 0;
-}
-
-/* fake FSE_CTable, for rle input (always same symbol) */
-size_t FSE_buildCTable_rle (FSE_CTable* ct, BYTE symbolValue)
-{
-    void* ptr = ct;
-    U16* tableU16 = ( (U16*) ptr) + 2;
-    void* FSCTptr = (U32*)ptr + 2;
-    FSE_symbolCompressionTransform* symbolTT = (FSE_symbolCompressionTransform*) FSCTptr;
-
-    /* header */
-    tableU16[-2] = (U16) 0;
-    tableU16[-1] = (U16) symbolValue;
-
-    /* Build table */
-    tableU16[0] = 0;
-    tableU16[1] = 0;   /* just in case */
-
-    /* Build Symbol Transformation Table */
-    symbolTT[symbolValue].deltaNbBits = 0;
-    symbolTT[symbolValue].deltaFindState = 0;
-
-    return 0;
-}
-
-
-static size_t FSE_compress_usingCTable_generic (void* dst, size_t dstSize,
-                           const void* src, size_t srcSize,
-                           const FSE_CTable* ct, const unsigned fast)
-{
-    const BYTE* const istart = (const BYTE*) src;
-    const BYTE* const iend = istart + srcSize;
-    const BYTE* ip=iend;
-
-    BIT_CStream_t bitC;
-    FSE_CState_t CState1, CState2;
-
-    /* init */
-    if (srcSize <= 2) return 0;
-    { size_t const initError = BIT_initCStream(&bitC, dst, dstSize);
-      if (FSE_isError(initError)) return 0; /* not enough space available to write a bitstream */ }
-
-#define FSE_FLUSHBITS(s)  (fast ? BIT_flushBitsFast(s) : BIT_flushBits(s))
-
-    if (srcSize & 1) {
-        FSE_initCState2(&CState1, ct, *--ip);
-        FSE_initCState2(&CState2, ct, *--ip);
-        FSE_encodeSymbol(&bitC, &CState1, *--ip);
-        FSE_FLUSHBITS(&bitC);
-    } else {
-        FSE_initCState2(&CState2, ct, *--ip);
-        FSE_initCState2(&CState1, ct, *--ip);
-    }
-
-    /* join to mod 4 */
-    srcSize -= 2;
-    if ((sizeof(bitC.bitContainer)*8 > FSE_MAX_TABLELOG*4+7 ) && (srcSize & 2)) {  /* test bit 2 */
-        FSE_encodeSymbol(&bitC, &CState2, *--ip);
-        FSE_encodeSymbol(&bitC, &CState1, *--ip);
-        FSE_FLUSHBITS(&bitC);
-    }
-
-    /* 2 or 4 encoding per loop */
-    while ( ip>istart ) {
-
-        FSE_encodeSymbol(&bitC, &CState2, *--ip);
-
-        if (sizeof(bitC.bitContainer)*8 < FSE_MAX_TABLELOG*2+7 )   /* this test must be static */
-            FSE_FLUSHBITS(&bitC);
-
-        FSE_encodeSymbol(&bitC, &CState1, *--ip);
-
-        if (sizeof(bitC.bitContainer)*8 > FSE_MAX_TABLELOG*4+7 ) {  /* this test must be static */
-            FSE_encodeSymbol(&bitC, &CState2, *--ip);
-            FSE_encodeSymbol(&bitC, &CState1, *--ip);
-        }
-
-        FSE_FLUSHBITS(&bitC);
-    }
-
-    FSE_flushCState(&bitC, &CState2);
-    FSE_flushCState(&bitC, &CState1);
-    return BIT_closeCStream(&bitC);
-}
-
-size_t FSE_compress_usingCTable (void* dst, size_t dstSize,
-                           const void* src, size_t srcSize,
-                           const FSE_CTable* ct)
-{
-    unsigned const fast = (dstSize >= FSE_BLOCKBOUND(srcSize));
-
-    if (fast)
-        return FSE_compress_usingCTable_generic(dst, dstSize, src, srcSize, ct, 1);
-    else
-        return FSE_compress_usingCTable_generic(dst, dstSize, src, srcSize, ct, 0);
-}
-
-
-size_t FSE_compressBound(size_t size) { return FSE_COMPRESSBOUND(size); }
-
-#define CHECK_V_F(e, f) size_t const e = f; if (ERR_isError(e)) return e
-#define CHECK_F(f)   { CHECK_V_F(_var_err__, f); }
-
-/* FSE_compress_wksp() :
- * Same as FSE_compress2(), but using an externally allocated scratch buffer (`workSpace`).
- * `wkspSize` size must be `(1<<tableLog)`.
- */
-size_t FSE_compress_wksp (void* dst, size_t dstSize, const void* src, size_t srcSize, unsigned maxSymbolValue, unsigned tableLog, void* workSpace, size_t wkspSize)
-{
-    BYTE* const ostart = (BYTE*) dst;
-    BYTE* op = ostart;
-    BYTE* const oend = ostart + dstSize;
-
-    unsigned count[FSE_MAX_SYMBOL_VALUE+1];
-    S16   norm[FSE_MAX_SYMBOL_VALUE+1];
-    FSE_CTable* CTable = (FSE_CTable*)workSpace;
-    size_t const CTableSize = FSE_CTABLE_SIZE_U32(tableLog, maxSymbolValue);
-    void* scratchBuffer = (void*)(CTable + CTableSize);
-    size_t const scratchBufferSize = wkspSize - (CTableSize * sizeof(FSE_CTable));
-
-    /* init conditions */
-    if (wkspSize < FSE_WKSP_SIZE_U32(tableLog, maxSymbolValue)) return ERROR(tableLog_tooLarge);
-    if (srcSize <= 1) return 0;  /* Not compressible */
-    if (!maxSymbolValue) maxSymbolValue = FSE_MAX_SYMBOL_VALUE;
-    if (!tableLog) tableLog = FSE_DEFAULT_TABLELOG;
-
-    /* Scan input and build symbol stats */
-    {   CHECK_V_F(maxCount, HIST_count_wksp(count, &maxSymbolValue, src, srcSize, scratchBuffer, scratchBufferSize) );
-        if (maxCount == srcSize) return 1;   /* only a single symbol in src : rle */
-        if (maxCount == 1) return 0;         /* each symbol present maximum once => not compressible */
-        if (maxCount < (srcSize >> 7)) return 0;   /* Heuristic : not compressible enough */
-    }
-
-    tableLog = FSE_optimalTableLog(tableLog, srcSize, maxSymbolValue);
-    CHECK_F( FSE_normalizeCount(norm, tableLog, count, srcSize, maxSymbolValue) );
-
-    /* Write table description header */
-    {   CHECK_V_F(nc_err, FSE_writeNCount(op, oend-op, norm, maxSymbolValue, tableLog) );
-        op += nc_err;
-    }
-
-    /* Compress */
-    CHECK_F( FSE_buildCTable_wksp(CTable, norm, maxSymbolValue, tableLog, scratchBuffer, scratchBufferSize) );
-    {   CHECK_V_F(cSize, FSE_compress_usingCTable(op, oend - op, src, srcSize, CTable) );
-        if (cSize == 0) return 0;   /* not enough space for compressed data */
-        op += cSize;
-    }
-
-    /* check compressibility */
-    if ( (size_t)(op-ostart) >= srcSize-1 ) return 0;
-
-    return op-ostart;
-}
-
-typedef struct {
-    FSE_CTable CTable_max[FSE_CTABLE_SIZE_U32(FSE_MAX_TABLELOG, FSE_MAX_SYMBOL_VALUE)];
-    BYTE scratchBuffer[1 << FSE_MAX_TABLELOG];
-} fseWkspMax_t;
-
-size_t FSE_compress2 (void* dst, size_t dstCapacity, const void* src, size_t srcSize, unsigned maxSymbolValue, unsigned tableLog)
-{
-    fseWkspMax_t scratchBuffer;
-    DEBUG_STATIC_ASSERT(sizeof(scratchBuffer) >= FSE_WKSP_SIZE_U32(FSE_MAX_TABLELOG, FSE_MAX_SYMBOL_VALUE));   /* compilation failures here means scratchBuffer is not large enough */
-    if (tableLog > FSE_MAX_TABLELOG) return ERROR(tableLog_tooLarge);
-    return FSE_compress_wksp(dst, dstCapacity, src, srcSize, maxSymbolValue, tableLog, &scratchBuffer, sizeof(scratchBuffer));
-}
-
-size_t FSE_compress (void* dst, size_t dstCapacity, const void* src, size_t srcSize)
-{
-    return FSE_compress2(dst, dstCapacity, src, srcSize, FSE_MAX_SYMBOL_VALUE, FSE_DEFAULT_TABLELOG);
-}
-
-
-#endif   /* FSE_COMMONDEFS_ONLY */
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/compress/hist.c mysql-8.0-8.0.27/extra/zstd/lib/compress/hist.c
--- mysql-8.0-8.0.26/extra/zstd/lib/compress/hist.c	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/compress/hist.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,203 +0,0 @@
-/* ******************************************************************
-   hist : Histogram functions
-   part of Finite State Entropy project
-   Copyright (C) 2013-present, Yann Collet.
-
-   BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are
-   met:
-
-       * Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-       * Redistributions in binary form must reproduce the above
-   copyright notice, this list of conditions and the following disclaimer
-   in the documentation and/or other materials provided with the
-   distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-    You can contact the author at :
-    - FSE source repository : https://github.com/Cyan4973/FiniteStateEntropy
-    - Public forum : https://groups.google.com/forum/#!forum/lz4c
-****************************************************************** */
-
-/* --- dependencies --- */
-#include "mem.h"             /* U32, BYTE, etc. */
-#include "debug.h"           /* assert, DEBUGLOG */
-#include "error_private.h"   /* ERROR */
-#include "hist.h"
-
-
-/* --- Error management --- */
-unsigned HIST_isError(size_t code) { return ERR_isError(code); }
-
-/*-**************************************************************
- *  Histogram functions
- ****************************************************************/
-unsigned HIST_count_simple(unsigned* count, unsigned* maxSymbolValuePtr,
-                           const void* src, size_t srcSize)
-{
-    const BYTE* ip = (const BYTE*)src;
-    const BYTE* const end = ip + srcSize;
-    unsigned maxSymbolValue = *maxSymbolValuePtr;
-    unsigned largestCount=0;
-
-    memset(count, 0, (maxSymbolValue+1) * sizeof(*count));
-    if (srcSize==0) { *maxSymbolValuePtr = 0; return 0; }
-
-    while (ip<end) {
-        assert(*ip <= maxSymbolValue);
-        count[*ip++]++;
-    }
-
-    while (!count[maxSymbolValue]) maxSymbolValue--;
-    *maxSymbolValuePtr = maxSymbolValue;
-
-    {   U32 s;
-        for (s=0; s<=maxSymbolValue; s++)
-            if (count[s] > largestCount) largestCount = count[s];
-    }
-
-    return largestCount;
-}
-
-typedef enum { trustInput, checkMaxSymbolValue } HIST_checkInput_e;
-
-/* HIST_count_parallel_wksp() :
- * store histogram into 4 intermediate tables, recombined at the end.
- * this design makes better use of OoO cpus,
- * and is noticeably faster when some values are heavily repeated.
- * But it needs some additional workspace for intermediate tables.
- * `workSpace` size must be a table of size >= HIST_WKSP_SIZE_U32.
- * @return : largest histogram frequency,
- *           or an error code (notably when histogram would be larger than *maxSymbolValuePtr). */
-static size_t HIST_count_parallel_wksp(
-                                unsigned* count, unsigned* maxSymbolValuePtr,
-                                const void* source, size_t sourceSize,
-                                HIST_checkInput_e check,
-                                U32* const workSpace)
-{
-    const BYTE* ip = (const BYTE*)source;
-    const BYTE* const iend = ip+sourceSize;
-    unsigned maxSymbolValue = *maxSymbolValuePtr;
-    unsigned max=0;
-    U32* const Counting1 = workSpace;
-    U32* const Counting2 = Counting1 + 256;
-    U32* const Counting3 = Counting2 + 256;
-    U32* const Counting4 = Counting3 + 256;
-
-    memset(workSpace, 0, 4*256*sizeof(unsigned));
-
-    /* safety checks */
-    if (!sourceSize) {
-        memset(count, 0, maxSymbolValue + 1);
-        *maxSymbolValuePtr = 0;
-        return 0;
-    }
-    if (!maxSymbolValue) maxSymbolValue = 255;            /* 0 == default */
-
-    /* by stripes of 16 bytes */
-    {   U32 cached = MEM_read32(ip); ip += 4;
-        while (ip < iend-15) {
-            U32 c = cached; cached = MEM_read32(ip); ip += 4;
-            Counting1[(BYTE) c     ]++;
-            Counting2[(BYTE)(c>>8) ]++;
-            Counting3[(BYTE)(c>>16)]++;
-            Counting4[       c>>24 ]++;
-            c = cached; cached = MEM_read32(ip); ip += 4;
-            Counting1[(BYTE) c     ]++;
-            Counting2[(BYTE)(c>>8) ]++;
-            Counting3[(BYTE)(c>>16)]++;
-            Counting4[       c>>24 ]++;
-            c = cached; cached = MEM_read32(ip); ip += 4;
-            Counting1[(BYTE) c     ]++;
-            Counting2[(BYTE)(c>>8) ]++;
-            Counting3[(BYTE)(c>>16)]++;
-            Counting4[       c>>24 ]++;
-            c = cached; cached = MEM_read32(ip); ip += 4;
-            Counting1[(BYTE) c     ]++;
-            Counting2[(BYTE)(c>>8) ]++;
-            Counting3[(BYTE)(c>>16)]++;
-            Counting4[       c>>24 ]++;
-        }
-        ip-=4;
-    }
-
-    /* finish last symbols */
-    while (ip<iend) Counting1[*ip++]++;
-
-    if (check) {   /* verify stats will fit into destination table */
-        U32 s; for (s=255; s>maxSymbolValue; s--) {
-            Counting1[s] += Counting2[s] + Counting3[s] + Counting4[s];
-            if (Counting1[s]) return ERROR(maxSymbolValue_tooSmall);
-    }   }
-
-    {   U32 s;
-        if (maxSymbolValue > 255) maxSymbolValue = 255;
-        for (s=0; s<=maxSymbolValue; s++) {
-            count[s] = Counting1[s] + Counting2[s] + Counting3[s] + Counting4[s];
-            if (count[s] > max) max = count[s];
-    }   }
-
-    while (!count[maxSymbolValue]) maxSymbolValue--;
-    *maxSymbolValuePtr = maxSymbolValue;
-    return (size_t)max;
-}
-
-/* HIST_countFast_wksp() :
- * Same as HIST_countFast(), but using an externally provided scratch buffer.
- * `workSpace` is a writable buffer which must be 4-bytes aligned,
- * `workSpaceSize` must be >= HIST_WKSP_SIZE
- */
-size_t HIST_countFast_wksp(unsigned* count, unsigned* maxSymbolValuePtr,
-                          const void* source, size_t sourceSize,
-                          void* workSpace, size_t workSpaceSize)
-{
-    if (sourceSize < 1500) /* heuristic threshold */
-        return HIST_count_simple(count, maxSymbolValuePtr, source, sourceSize);
-    if ((size_t)workSpace & 3) return ERROR(GENERIC);  /* must be aligned on 4-bytes boundaries */
-    if (workSpaceSize < HIST_WKSP_SIZE) return ERROR(workSpace_tooSmall);
-    return HIST_count_parallel_wksp(count, maxSymbolValuePtr, source, sourceSize, trustInput, (U32*)workSpace);
-}
-
-/* fast variant (unsafe : won't check if src contains values beyond count[] limit) */
-size_t HIST_countFast(unsigned* count, unsigned* maxSymbolValuePtr,
-                     const void* source, size_t sourceSize)
-{
-    unsigned tmpCounters[HIST_WKSP_SIZE_U32];
-    return HIST_countFast_wksp(count, maxSymbolValuePtr, source, sourceSize, tmpCounters, sizeof(tmpCounters));
-}
-
-/* HIST_count_wksp() :
- * Same as HIST_count(), but using an externally provided scratch buffer.
- * `workSpace` size must be table of >= HIST_WKSP_SIZE_U32 unsigned */
-size_t HIST_count_wksp(unsigned* count, unsigned* maxSymbolValuePtr,
-                       const void* source, size_t sourceSize,
-                       void* workSpace, size_t workSpaceSize)
-{
-    if ((size_t)workSpace & 3) return ERROR(GENERIC);  /* must be aligned on 4-bytes boundaries */
-    if (workSpaceSize < HIST_WKSP_SIZE) return ERROR(workSpace_tooSmall);
-    if (*maxSymbolValuePtr < 255)
-        return HIST_count_parallel_wksp(count, maxSymbolValuePtr, source, sourceSize, checkMaxSymbolValue, (U32*)workSpace);
-    *maxSymbolValuePtr = 255;
-    return HIST_countFast_wksp(count, maxSymbolValuePtr, source, sourceSize, workSpace, workSpaceSize);
-}
-
-size_t HIST_count(unsigned* count, unsigned* maxSymbolValuePtr,
-                 const void* src, size_t srcSize)
-{
-    unsigned tmpCounters[HIST_WKSP_SIZE_U32];
-    return HIST_count_wksp(count, maxSymbolValuePtr, src, srcSize, tmpCounters, sizeof(tmpCounters));
-}
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/compress/hist.h mysql-8.0-8.0.27/extra/zstd/lib/compress/hist.h
--- mysql-8.0-8.0.26/extra/zstd/lib/compress/hist.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/compress/hist.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,95 +0,0 @@
-/* ******************************************************************
-   hist : Histogram functions
-   part of Finite State Entropy project
-   Copyright (C) 2013-present, Yann Collet.
-
-   BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are
-   met:
-
-       * Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-       * Redistributions in binary form must reproduce the above
-   copyright notice, this list of conditions and the following disclaimer
-   in the documentation and/or other materials provided with the
-   distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-    You can contact the author at :
-    - FSE source repository : https://github.com/Cyan4973/FiniteStateEntropy
-    - Public forum : https://groups.google.com/forum/#!forum/lz4c
-****************************************************************** */
-
-/* --- dependencies --- */
-#include <stddef.h>   /* size_t */
-
-
-/* --- simple histogram functions --- */
-
-/*! HIST_count():
- *  Provides the precise count of each byte within a table 'count'.
- * 'count' is a table of unsigned int, of minimum size (*maxSymbolValuePtr+1).
- *  Updates *maxSymbolValuePtr with actual largest symbol value detected.
- * @return : count of the most frequent symbol (which isn't identified).
- *           or an error code, which can be tested using HIST_isError().
- *           note : if return == srcSize, there is only one symbol.
- */
-size_t HIST_count(unsigned* count, unsigned* maxSymbolValuePtr,
-                  const void* src, size_t srcSize);
-
-unsigned HIST_isError(size_t code);  /**< tells if a return value is an error code */
-
-
-/* --- advanced histogram functions --- */
-
-#define HIST_WKSP_SIZE_U32 1024
-#define HIST_WKSP_SIZE    (HIST_WKSP_SIZE_U32 * sizeof(unsigned))
-/** HIST_count_wksp() :
- *  Same as HIST_count(), but using an externally provided scratch buffer.
- *  Benefit is this function will use very little stack space.
- * `workSpace` is a writable buffer which must be 4-bytes aligned,
- * `workSpaceSize` must be >= HIST_WKSP_SIZE
- */
-size_t HIST_count_wksp(unsigned* count, unsigned* maxSymbolValuePtr,
-                       const void* src, size_t srcSize,
-                       void* workSpace, size_t workSpaceSize);
-
-/** HIST_countFast() :
- *  same as HIST_count(), but blindly trusts that all byte values within src are <= *maxSymbolValuePtr.
- *  This function is unsafe, and will segfault if any value within `src` is `> *maxSymbolValuePtr`
- */
-size_t HIST_countFast(unsigned* count, unsigned* maxSymbolValuePtr,
-                      const void* src, size_t srcSize);
-
-/** HIST_countFast_wksp() :
- *  Same as HIST_countFast(), but using an externally provided scratch buffer.
- * `workSpace` is a writable buffer which must be 4-bytes aligned,
- * `workSpaceSize` must be >= HIST_WKSP_SIZE
- */
-size_t HIST_countFast_wksp(unsigned* count, unsigned* maxSymbolValuePtr,
-                           const void* src, size_t srcSize,
-                           void* workSpace, size_t workSpaceSize);
-
-/*! HIST_count_simple() :
- *  Same as HIST_countFast(), this function is unsafe,
- *  and will segfault if any value within `src` is `> *maxSymbolValuePtr`.
- *  It is also a bit slower for large inputs.
- *  However, it does not need any additional memory (not even on stack).
- * @return : count of the most frequent symbol.
- *  Note this function doesn't produce any error (i.e. it must succeed).
- */
-unsigned HIST_count_simple(unsigned* count, unsigned* maxSymbolValuePtr,
-                           const void* src, size_t srcSize);
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/compress/huf_compress.c mysql-8.0-8.0.27/extra/zstd/lib/compress/huf_compress.c
--- mysql-8.0-8.0.26/extra/zstd/lib/compress/huf_compress.c	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/compress/huf_compress.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,798 +0,0 @@
-/* ******************************************************************
-   Huffman encoder, part of New Generation Entropy library
-   Copyright (C) 2013-2016, Yann Collet.
-
-   BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are
-   met:
-
-       * Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-       * Redistributions in binary form must reproduce the above
-   copyright notice, this list of conditions and the following disclaimer
-   in the documentation and/or other materials provided with the
-   distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-    You can contact the author at :
-    - FSE+HUF source repository : https://github.com/Cyan4973/FiniteStateEntropy
-    - Public forum : https://groups.google.com/forum/#!forum/lz4c
-****************************************************************** */
-
-/* **************************************************************
-*  Compiler specifics
-****************************************************************/
-#ifdef _MSC_VER    /* Visual Studio */
-#  pragma warning(disable : 4127)        /* disable: C4127: conditional expression is constant */
-#endif
-
-
-/* **************************************************************
-*  Includes
-****************************************************************/
-#include <string.h>     /* memcpy, memset */
-#include <stdio.h>      /* printf (debug) */
-#include "compiler.h"
-#include "bitstream.h"
-#include "hist.h"
-#define FSE_STATIC_LINKING_ONLY   /* FSE_optimalTableLog_internal */
-#include "fse.h"        /* header compression */
-#define HUF_STATIC_LINKING_ONLY
-#include "huf.h"
-#include "error_private.h"
-
-
-/* **************************************************************
-*  Error Management
-****************************************************************/
-#define HUF_isError ERR_isError
-#define HUF_STATIC_ASSERT(c) DEBUG_STATIC_ASSERT(c)   /* use only *after* variable declarations */
-#define CHECK_V_F(e, f) size_t const e = f; if (ERR_isError(e)) return e
-#define CHECK_F(f)   { CHECK_V_F(_var_err__, f); }
-
-
-/* **************************************************************
-*  Utils
-****************************************************************/
-unsigned HUF_optimalTableLog(unsigned maxTableLog, size_t srcSize, unsigned maxSymbolValue)
-{
-    return FSE_optimalTableLog_internal(maxTableLog, srcSize, maxSymbolValue, 1);
-}
-
-
-/* *******************************************************
-*  HUF : Huffman block compression
-*********************************************************/
-/* HUF_compressWeights() :
- * Same as FSE_compress(), but dedicated to huff0's weights compression.
- * The use case needs much less stack memory.
- * Note : all elements within weightTable are supposed to be <= HUF_TABLELOG_MAX.
- */
-#define MAX_FSE_TABLELOG_FOR_HUFF_HEADER 6
-static size_t HUF_compressWeights (void* dst, size_t dstSize, const void* weightTable, size_t wtSize)
-{
-    BYTE* const ostart = (BYTE*) dst;
-    BYTE* op = ostart;
-    BYTE* const oend = ostart + dstSize;
-
-    unsigned maxSymbolValue = HUF_TABLELOG_MAX;
-    U32 tableLog = MAX_FSE_TABLELOG_FOR_HUFF_HEADER;
-
-    FSE_CTable CTable[FSE_CTABLE_SIZE_U32(MAX_FSE_TABLELOG_FOR_HUFF_HEADER, HUF_TABLELOG_MAX)];
-    BYTE scratchBuffer[1<<MAX_FSE_TABLELOG_FOR_HUFF_HEADER];
-
-    unsigned count[HUF_TABLELOG_MAX+1];
-    S16 norm[HUF_TABLELOG_MAX+1];
-
-    /* init conditions */
-    if (wtSize <= 1) return 0;  /* Not compressible */
-
-    /* Scan input and build symbol stats */
-    {   unsigned const maxCount = HIST_count_simple(count, &maxSymbolValue, weightTable, wtSize);   /* never fails */
-        if (maxCount == wtSize) return 1;   /* only a single symbol in src : rle */
-        if (maxCount == 1) return 0;        /* each symbol present maximum once => not compressible */
-    }
-
-    tableLog = FSE_optimalTableLog(tableLog, wtSize, maxSymbolValue);
-    CHECK_F( FSE_normalizeCount(norm, tableLog, count, wtSize, maxSymbolValue) );
-
-    /* Write table description header */
-    {   CHECK_V_F(hSize, FSE_writeNCount(op, oend-op, norm, maxSymbolValue, tableLog) );
-        op += hSize;
-    }
-
-    /* Compress */
-    CHECK_F( FSE_buildCTable_wksp(CTable, norm, maxSymbolValue, tableLog, scratchBuffer, sizeof(scratchBuffer)) );
-    {   CHECK_V_F(cSize, FSE_compress_usingCTable(op, oend - op, weightTable, wtSize, CTable) );
-        if (cSize == 0) return 0;   /* not enough space for compressed data */
-        op += cSize;
-    }
-
-    return op-ostart;
-}
-
-
-struct HUF_CElt_s {
-  U16  val;
-  BYTE nbBits;
-};   /* typedef'd to HUF_CElt within "huf.h" */
-
-/*! HUF_writeCTable() :
-    `CTable` : Huffman tree to save, using huf representation.
-    @return : size of saved CTable */
-size_t HUF_writeCTable (void* dst, size_t maxDstSize,
-                        const HUF_CElt* CTable, unsigned maxSymbolValue, unsigned huffLog)
-{
-    BYTE bitsToWeight[HUF_TABLELOG_MAX + 1];   /* precomputed conversion table */
-    BYTE huffWeight[HUF_SYMBOLVALUE_MAX];
-    BYTE* op = (BYTE*)dst;
-    U32 n;
-
-     /* check conditions */
-    if (maxSymbolValue > HUF_SYMBOLVALUE_MAX) return ERROR(maxSymbolValue_tooLarge);
-
-    /* convert to weight */
-    bitsToWeight[0] = 0;
-    for (n=1; n<huffLog+1; n++)
-        bitsToWeight[n] = (BYTE)(huffLog + 1 - n);
-    for (n=0; n<maxSymbolValue; n++)
-        huffWeight[n] = bitsToWeight[CTable[n].nbBits];
-
-    /* attempt weights compression by FSE */
-    {   CHECK_V_F(hSize, HUF_compressWeights(op+1, maxDstSize-1, huffWeight, maxSymbolValue) );
-        if ((hSize>1) & (hSize < maxSymbolValue/2)) {   /* FSE compressed */
-            op[0] = (BYTE)hSize;
-            return hSize+1;
-    }   }
-
-    /* write raw values as 4-bits (max : 15) */
-    if (maxSymbolValue > (256-128)) return ERROR(GENERIC);   /* should not happen : likely means source cannot be compressed */
-    if (((maxSymbolValue+1)/2) + 1 > maxDstSize) return ERROR(dstSize_tooSmall);   /* not enough space within dst buffer */
-    op[0] = (BYTE)(128 /*special case*/ + (maxSymbolValue-1));
-    huffWeight[maxSymbolValue] = 0;   /* to be sure it doesn't cause msan issue in final combination */
-    for (n=0; n<maxSymbolValue; n+=2)
-        op[(n/2)+1] = (BYTE)((huffWeight[n] << 4) + huffWeight[n+1]);
-    return ((maxSymbolValue+1)/2) + 1;
-}
-
-
-size_t HUF_readCTable (HUF_CElt* CTable, unsigned* maxSymbolValuePtr, const void* src, size_t srcSize)
-{
-    BYTE huffWeight[HUF_SYMBOLVALUE_MAX + 1];   /* init not required, even though some static analyzer may complain */
-    U32 rankVal[HUF_TABLELOG_ABSOLUTEMAX + 1];   /* large enough for values from 0 to 16 */
-    U32 tableLog = 0;
-    U32 nbSymbols = 0;
-
-    /* get symbol weights */
-    CHECK_V_F(readSize, HUF_readStats(huffWeight, HUF_SYMBOLVALUE_MAX+1, rankVal, &nbSymbols, &tableLog, src, srcSize));
-
-    /* check result */
-    if (tableLog > HUF_TABLELOG_MAX) return ERROR(tableLog_tooLarge);
-    if (nbSymbols > *maxSymbolValuePtr+1) return ERROR(maxSymbolValue_tooSmall);
-
-    /* Prepare base value per rank */
-    {   U32 n, nextRankStart = 0;
-        for (n=1; n<=tableLog; n++) {
-            U32 current = nextRankStart;
-            nextRankStart += (rankVal[n] << (n-1));
-            rankVal[n] = current;
-    }   }
-
-    /* fill nbBits */
-    {   U32 n; for (n=0; n<nbSymbols; n++) {
-            const U32 w = huffWeight[n];
-            CTable[n].nbBits = (BYTE)(tableLog + 1 - w);
-    }   }
-
-    /* fill val */
-    {   U16 nbPerRank[HUF_TABLELOG_MAX+2]  = {0};  /* support w=0=>n=tableLog+1 */
-        U16 valPerRank[HUF_TABLELOG_MAX+2] = {0};
-        { U32 n; for (n=0; n<nbSymbols; n++) nbPerRank[CTable[n].nbBits]++; }
-        /* determine stating value per rank */
-        valPerRank[tableLog+1] = 0;   /* for w==0 */
-        {   U16 min = 0;
-            U32 n; for (n=tableLog; n>0; n--) {  /* start at n=tablelog <-> w=1 */
-                valPerRank[n] = min;     /* get starting value within each rank */
-                min += nbPerRank[n];
-                min >>= 1;
-        }   }
-        /* assign value within rank, symbol order */
-        { U32 n; for (n=0; n<nbSymbols; n++) CTable[n].val = valPerRank[CTable[n].nbBits]++; }
-    }
-
-    *maxSymbolValuePtr = nbSymbols - 1;
-    return readSize;
-}
-
-U32 HUF_getNbBits(const void* symbolTable, U32 symbolValue)
-{
-    const HUF_CElt* table = (const HUF_CElt*)symbolTable;
-    assert(symbolValue <= HUF_SYMBOLVALUE_MAX);
-    return table[symbolValue].nbBits;
-}
-
-
-typedef struct nodeElt_s {
-    U32 count;
-    U16 parent;
-    BYTE byte;
-    BYTE nbBits;
-} nodeElt;
-
-static U32 HUF_setMaxHeight(nodeElt* huffNode, U32 lastNonNull, U32 maxNbBits)
-{
-    const U32 largestBits = huffNode[lastNonNull].nbBits;
-    if (largestBits <= maxNbBits) return largestBits;   /* early exit : no elt > maxNbBits */
-
-    /* there are several too large elements (at least >= 2) */
-    {   int totalCost = 0;
-        const U32 baseCost = 1 << (largestBits - maxNbBits);
-        U32 n = lastNonNull;
-
-        while (huffNode[n].nbBits > maxNbBits) {
-            totalCost += baseCost - (1 << (largestBits - huffNode[n].nbBits));
-            huffNode[n].nbBits = (BYTE)maxNbBits;
-            n --;
-        }  /* n stops at huffNode[n].nbBits <= maxNbBits */
-        while (huffNode[n].nbBits == maxNbBits) n--;   /* n end at index of smallest symbol using < maxNbBits */
-
-        /* renorm totalCost */
-        totalCost >>= (largestBits - maxNbBits);  /* note : totalCost is necessarily a multiple of baseCost */
-
-        /* repay normalized cost */
-        {   U32 const noSymbol = 0xF0F0F0F0;
-            U32 rankLast[HUF_TABLELOG_MAX+2];
-            int pos;
-
-            /* Get pos of last (smallest) symbol per rank */
-            memset(rankLast, 0xF0, sizeof(rankLast));
-            {   U32 currentNbBits = maxNbBits;
-                for (pos=n ; pos >= 0; pos--) {
-                    if (huffNode[pos].nbBits >= currentNbBits) continue;
-                    currentNbBits = huffNode[pos].nbBits;   /* < maxNbBits */
-                    rankLast[maxNbBits-currentNbBits] = pos;
-            }   }
-
-            while (totalCost > 0) {
-                U32 nBitsToDecrease = BIT_highbit32(totalCost) + 1;
-                for ( ; nBitsToDecrease > 1; nBitsToDecrease--) {
-                    U32 highPos = rankLast[nBitsToDecrease];
-                    U32 lowPos = rankLast[nBitsToDecrease-1];
-                    if (highPos == noSymbol) continue;
-                    if (lowPos == noSymbol) break;
-                    {   U32 const highTotal = huffNode[highPos].count;
-                        U32 const lowTotal = 2 * huffNode[lowPos].count;
-                        if (highTotal <= lowTotal) break;
-                }   }
-                /* only triggered when no more rank 1 symbol left => find closest one (note : there is necessarily at least one !) */
-                /* HUF_MAX_TABLELOG test just to please gcc 5+; but it should not be necessary */
-                while ((nBitsToDecrease<=HUF_TABLELOG_MAX) && (rankLast[nBitsToDecrease] == noSymbol))
-                    nBitsToDecrease ++;
-                totalCost -= 1 << (nBitsToDecrease-1);
-                if (rankLast[nBitsToDecrease-1] == noSymbol)
-                    rankLast[nBitsToDecrease-1] = rankLast[nBitsToDecrease];   /* this rank is no longer empty */
-                huffNode[rankLast[nBitsToDecrease]].nbBits ++;
-                if (rankLast[nBitsToDecrease] == 0)    /* special case, reached largest symbol */
-                    rankLast[nBitsToDecrease] = noSymbol;
-                else {
-                    rankLast[nBitsToDecrease]--;
-                    if (huffNode[rankLast[nBitsToDecrease]].nbBits != maxNbBits-nBitsToDecrease)
-                        rankLast[nBitsToDecrease] = noSymbol;   /* this rank is now empty */
-            }   }   /* while (totalCost > 0) */
-
-            while (totalCost < 0) {  /* Sometimes, cost correction overshoot */
-                if (rankLast[1] == noSymbol) {  /* special case : no rank 1 symbol (using maxNbBits-1); let's create one from largest rank 0 (using maxNbBits) */
-                    while (huffNode[n].nbBits == maxNbBits) n--;
-                    huffNode[n+1].nbBits--;
-                    rankLast[1] = n+1;
-                    totalCost++;
-                    continue;
-                }
-                huffNode[ rankLast[1] + 1 ].nbBits--;
-                rankLast[1]++;
-                totalCost ++;
-    }   }   }   /* there are several too large elements (at least >= 2) */
-
-    return maxNbBits;
-}
-
-
-typedef struct {
-    U32 base;
-    U32 current;
-} rankPos;
-
-static void HUF_sort(nodeElt* huffNode, const unsigned* count, U32 maxSymbolValue)
-{
-    rankPos rank[32];
-    U32 n;
-
-    memset(rank, 0, sizeof(rank));
-    for (n=0; n<=maxSymbolValue; n++) {
-        U32 r = BIT_highbit32(count[n] + 1);
-        rank[r].base ++;
-    }
-    for (n=30; n>0; n--) rank[n-1].base += rank[n].base;
-    for (n=0; n<32; n++) rank[n].current = rank[n].base;
-    for (n=0; n<=maxSymbolValue; n++) {
-        U32 const c = count[n];
-        U32 const r = BIT_highbit32(c+1) + 1;
-        U32 pos = rank[r].current++;
-        while ((pos > rank[r].base) && (c > huffNode[pos-1].count)) {
-            huffNode[pos] = huffNode[pos-1];
-            pos--;
-        }
-        huffNode[pos].count = c;
-        huffNode[pos].byte  = (BYTE)n;
-    }
-}
-
-
-/** HUF_buildCTable_wksp() :
- *  Same as HUF_buildCTable(), but using externally allocated scratch buffer.
- *  `workSpace` must be aligned on 4-bytes boundaries, and be at least as large as a table of HUF_CTABLE_WORKSPACE_SIZE_U32 unsigned.
- */
-#define STARTNODE (HUF_SYMBOLVALUE_MAX+1)
-typedef nodeElt huffNodeTable[HUF_CTABLE_WORKSPACE_SIZE_U32];
-size_t HUF_buildCTable_wksp (HUF_CElt* tree, const unsigned* count, U32 maxSymbolValue, U32 maxNbBits, void* workSpace, size_t wkspSize)
-{
-    nodeElt* const huffNode0 = (nodeElt*)workSpace;
-    nodeElt* const huffNode = huffNode0+1;
-    U32 n, nonNullRank;
-    int lowS, lowN;
-    U16 nodeNb = STARTNODE;
-    U32 nodeRoot;
-
-    /* safety checks */
-    if (((size_t)workSpace & 3) != 0) return ERROR(GENERIC);  /* must be aligned on 4-bytes boundaries */
-    if (wkspSize < sizeof(huffNodeTable)) return ERROR(workSpace_tooSmall);
-    if (maxNbBits == 0) maxNbBits = HUF_TABLELOG_DEFAULT;
-    if (maxSymbolValue > HUF_SYMBOLVALUE_MAX) return ERROR(maxSymbolValue_tooLarge);
-    memset(huffNode0, 0, sizeof(huffNodeTable));
-
-    /* sort, decreasing order */
-    HUF_sort(huffNode, count, maxSymbolValue);
-
-    /* init for parents */
-    nonNullRank = maxSymbolValue;
-    while(huffNode[nonNullRank].count == 0) nonNullRank--;
-    lowS = nonNullRank; nodeRoot = nodeNb + lowS - 1; lowN = nodeNb;
-    huffNode[nodeNb].count = huffNode[lowS].count + huffNode[lowS-1].count;
-    huffNode[lowS].parent = huffNode[lowS-1].parent = nodeNb;
-    nodeNb++; lowS-=2;
-    for (n=nodeNb; n<=nodeRoot; n++) huffNode[n].count = (U32)(1U<<30);
-    huffNode0[0].count = (U32)(1U<<31);  /* fake entry, strong barrier */
-
-    /* create parents */
-    while (nodeNb <= nodeRoot) {
-        U32 n1 = (huffNode[lowS].count < huffNode[lowN].count) ? lowS-- : lowN++;
-        U32 n2 = (huffNode[lowS].count < huffNode[lowN].count) ? lowS-- : lowN++;
-        huffNode[nodeNb].count = huffNode[n1].count + huffNode[n2].count;
-        huffNode[n1].parent = huffNode[n2].parent = nodeNb;
-        nodeNb++;
-    }
-
-    /* distribute weights (unlimited tree height) */
-    huffNode[nodeRoot].nbBits = 0;
-    for (n=nodeRoot-1; n>=STARTNODE; n--)
-        huffNode[n].nbBits = huffNode[ huffNode[n].parent ].nbBits + 1;
-    for (n=0; n<=nonNullRank; n++)
-        huffNode[n].nbBits = huffNode[ huffNode[n].parent ].nbBits + 1;
-
-    /* enforce maxTableLog */
-    maxNbBits = HUF_setMaxHeight(huffNode, nonNullRank, maxNbBits);
-
-    /* fill result into tree (val, nbBits) */
-    {   U16 nbPerRank[HUF_TABLELOG_MAX+1] = {0};
-        U16 valPerRank[HUF_TABLELOG_MAX+1] = {0};
-        if (maxNbBits > HUF_TABLELOG_MAX) return ERROR(GENERIC);   /* check fit into table */
-        for (n=0; n<=nonNullRank; n++)
-            nbPerRank[huffNode[n].nbBits]++;
-        /* determine stating value per rank */
-        {   U16 min = 0;
-            for (n=maxNbBits; n>0; n--) {
-                valPerRank[n] = min;      /* get starting value within each rank */
-                min += nbPerRank[n];
-                min >>= 1;
-        }   }
-        for (n=0; n<=maxSymbolValue; n++)
-            tree[huffNode[n].byte].nbBits = huffNode[n].nbBits;   /* push nbBits per symbol, symbol order */
-        for (n=0; n<=maxSymbolValue; n++)
-            tree[n].val = valPerRank[tree[n].nbBits]++;   /* assign value within rank, symbol order */
-    }
-
-    return maxNbBits;
-}
-
-/** HUF_buildCTable() :
- * @return : maxNbBits
- *  Note : count is used before tree is written, so they can safely overlap
- */
-size_t HUF_buildCTable (HUF_CElt* tree, const unsigned* count, unsigned maxSymbolValue, unsigned maxNbBits)
-{
-    huffNodeTable nodeTable;
-    return HUF_buildCTable_wksp(tree, count, maxSymbolValue, maxNbBits, nodeTable, sizeof(nodeTable));
-}
-
-static size_t HUF_estimateCompressedSize(HUF_CElt* CTable, const unsigned* count, unsigned maxSymbolValue)
-{
-    size_t nbBits = 0;
-    int s;
-    for (s = 0; s <= (int)maxSymbolValue; ++s) {
-        nbBits += CTable[s].nbBits * count[s];
-    }
-    return nbBits >> 3;
-}
-
-static int HUF_validateCTable(const HUF_CElt* CTable, const unsigned* count, unsigned maxSymbolValue) {
-  int bad = 0;
-  int s;
-  for (s = 0; s <= (int)maxSymbolValue; ++s) {
-    bad |= (count[s] != 0) & (CTable[s].nbBits == 0);
-  }
-  return !bad;
-}
-
-size_t HUF_compressBound(size_t size) { return HUF_COMPRESSBOUND(size); }
-
-FORCE_INLINE_TEMPLATE void
-HUF_encodeSymbol(BIT_CStream_t* bitCPtr, U32 symbol, const HUF_CElt* CTable)
-{
-    BIT_addBitsFast(bitCPtr, CTable[symbol].val, CTable[symbol].nbBits);
-}
-
-#define HUF_FLUSHBITS(s)  BIT_flushBits(s)
-
-#define HUF_FLUSHBITS_1(stream) \
-    if (sizeof((stream)->bitContainer)*8 < HUF_TABLELOG_MAX*2+7) HUF_FLUSHBITS(stream)
-
-#define HUF_FLUSHBITS_2(stream) \
-    if (sizeof((stream)->bitContainer)*8 < HUF_TABLELOG_MAX*4+7) HUF_FLUSHBITS(stream)
-
-FORCE_INLINE_TEMPLATE size_t
-HUF_compress1X_usingCTable_internal_body(void* dst, size_t dstSize,
-                                   const void* src, size_t srcSize,
-                                   const HUF_CElt* CTable)
-{
-    const BYTE* ip = (const BYTE*) src;
-    BYTE* const ostart = (BYTE*)dst;
-    BYTE* const oend = ostart + dstSize;
-    BYTE* op = ostart;
-    size_t n;
-    BIT_CStream_t bitC;
-
-    /* init */
-    if (dstSize < 8) return 0;   /* not enough space to compress */
-    { size_t const initErr = BIT_initCStream(&bitC, op, oend-op);
-      if (HUF_isError(initErr)) return 0; }
-
-    n = srcSize & ~3;  /* join to mod 4 */
-    switch (srcSize & 3)
-    {
-        case 3 : HUF_encodeSymbol(&bitC, ip[n+ 2], CTable);
-                 HUF_FLUSHBITS_2(&bitC);
-		 /* fall-through */
-        case 2 : HUF_encodeSymbol(&bitC, ip[n+ 1], CTable);
-                 HUF_FLUSHBITS_1(&bitC);
-		 /* fall-through */
-        case 1 : HUF_encodeSymbol(&bitC, ip[n+ 0], CTable);
-                 HUF_FLUSHBITS(&bitC);
-		 /* fall-through */
-        case 0 : /* fall-through */
-        default: break;
-    }
-
-    for (; n>0; n-=4) {  /* note : n&3==0 at this stage */
-        HUF_encodeSymbol(&bitC, ip[n- 1], CTable);
-        HUF_FLUSHBITS_1(&bitC);
-        HUF_encodeSymbol(&bitC, ip[n- 2], CTable);
-        HUF_FLUSHBITS_2(&bitC);
-        HUF_encodeSymbol(&bitC, ip[n- 3], CTable);
-        HUF_FLUSHBITS_1(&bitC);
-        HUF_encodeSymbol(&bitC, ip[n- 4], CTable);
-        HUF_FLUSHBITS(&bitC);
-    }
-
-    return BIT_closeCStream(&bitC);
-}
-
-#if DYNAMIC_BMI2
-
-static TARGET_ATTRIBUTE("bmi2") size_t
-HUF_compress1X_usingCTable_internal_bmi2(void* dst, size_t dstSize,
-                                   const void* src, size_t srcSize,
-                                   const HUF_CElt* CTable)
-{
-    return HUF_compress1X_usingCTable_internal_body(dst, dstSize, src, srcSize, CTable);
-}
-
-static size_t
-HUF_compress1X_usingCTable_internal_default(void* dst, size_t dstSize,
-                                      const void* src, size_t srcSize,
-                                      const HUF_CElt* CTable)
-{
-    return HUF_compress1X_usingCTable_internal_body(dst, dstSize, src, srcSize, CTable);
-}
-
-static size_t
-HUF_compress1X_usingCTable_internal(void* dst, size_t dstSize,
-                              const void* src, size_t srcSize,
-                              const HUF_CElt* CTable, const int bmi2)
-{
-    if (bmi2) {
-        return HUF_compress1X_usingCTable_internal_bmi2(dst, dstSize, src, srcSize, CTable);
-    }
-    return HUF_compress1X_usingCTable_internal_default(dst, dstSize, src, srcSize, CTable);
-}
-
-#else
-
-static size_t
-HUF_compress1X_usingCTable_internal(void* dst, size_t dstSize,
-                              const void* src, size_t srcSize,
-                              const HUF_CElt* CTable, const int bmi2)
-{
-    (void)bmi2;
-    return HUF_compress1X_usingCTable_internal_body(dst, dstSize, src, srcSize, CTable);
-}
-
-#endif
-
-size_t HUF_compress1X_usingCTable(void* dst, size_t dstSize, const void* src, size_t srcSize, const HUF_CElt* CTable)
-{
-    return HUF_compress1X_usingCTable_internal(dst, dstSize, src, srcSize, CTable, /* bmi2 */ 0);
-}
-
-
-static size_t
-HUF_compress4X_usingCTable_internal(void* dst, size_t dstSize,
-                              const void* src, size_t srcSize,
-                              const HUF_CElt* CTable, int bmi2)
-{
-    size_t const segmentSize = (srcSize+3)/4;   /* first 3 segments */
-    const BYTE* ip = (const BYTE*) src;
-    const BYTE* const iend = ip + srcSize;
-    BYTE* const ostart = (BYTE*) dst;
-    BYTE* const oend = ostart + dstSize;
-    BYTE* op = ostart;
-
-    if (dstSize < 6 + 1 + 1 + 1 + 8) return 0;   /* minimum space to compress successfully */
-    if (srcSize < 12) return 0;   /* no saving possible : too small input */
-    op += 6;   /* jumpTable */
-
-    {   CHECK_V_F(cSize, HUF_compress1X_usingCTable_internal(op, oend-op, ip, segmentSize, CTable, bmi2) );
-        if (cSize==0) return 0;
-        assert(cSize <= 65535);
-        MEM_writeLE16(ostart, (U16)cSize);
-        op += cSize;
-    }
-
-    ip += segmentSize;
-    {   CHECK_V_F(cSize, HUF_compress1X_usingCTable_internal(op, oend-op, ip, segmentSize, CTable, bmi2) );
-        if (cSize==0) return 0;
-        assert(cSize <= 65535);
-        MEM_writeLE16(ostart+2, (U16)cSize);
-        op += cSize;
-    }
-
-    ip += segmentSize;
-    {   CHECK_V_F(cSize, HUF_compress1X_usingCTable_internal(op, oend-op, ip, segmentSize, CTable, bmi2) );
-        if (cSize==0) return 0;
-        assert(cSize <= 65535);
-        MEM_writeLE16(ostart+4, (U16)cSize);
-        op += cSize;
-    }
-
-    ip += segmentSize;
-    {   CHECK_V_F(cSize, HUF_compress1X_usingCTable_internal(op, oend-op, ip, iend-ip, CTable, bmi2) );
-        if (cSize==0) return 0;
-        op += cSize;
-    }
-
-    return op-ostart;
-}
-
-size_t HUF_compress4X_usingCTable(void* dst, size_t dstSize, const void* src, size_t srcSize, const HUF_CElt* CTable)
-{
-    return HUF_compress4X_usingCTable_internal(dst, dstSize, src, srcSize, CTable, /* bmi2 */ 0);
-}
-
-typedef enum { HUF_singleStream, HUF_fourStreams } HUF_nbStreams_e;
-
-static size_t HUF_compressCTable_internal(
-                BYTE* const ostart, BYTE* op, BYTE* const oend,
-                const void* src, size_t srcSize,
-                HUF_nbStreams_e nbStreams, const HUF_CElt* CTable, const int bmi2)
-{
-    size_t const cSize = (nbStreams==HUF_singleStream) ?
-                         HUF_compress1X_usingCTable_internal(op, oend - op, src, srcSize, CTable, bmi2) :
-                         HUF_compress4X_usingCTable_internal(op, oend - op, src, srcSize, CTable, bmi2);
-    if (HUF_isError(cSize)) { return cSize; }
-    if (cSize==0) { return 0; }   /* uncompressible */
-    op += cSize;
-    /* check compressibility */
-    if ((size_t)(op-ostart) >= srcSize-1) { return 0; }
-    return op-ostart;
-}
-
-typedef struct {
-    unsigned count[HUF_SYMBOLVALUE_MAX + 1];
-    HUF_CElt CTable[HUF_SYMBOLVALUE_MAX + 1];
-    huffNodeTable nodeTable;
-} HUF_compress_tables_t;
-
-/* HUF_compress_internal() :
- * `workSpace` must a table of at least HUF_WORKSPACE_SIZE_U32 unsigned */
-static size_t
-HUF_compress_internal (void* dst, size_t dstSize,
-                 const void* src, size_t srcSize,
-                       unsigned maxSymbolValue, unsigned huffLog,
-                       HUF_nbStreams_e nbStreams,
-                       void* workSpace, size_t wkspSize,
-                       HUF_CElt* oldHufTable, HUF_repeat* repeat, int preferRepeat,
-                 const int bmi2)
-{
-    HUF_compress_tables_t* const table = (HUF_compress_tables_t*)workSpace;
-    BYTE* const ostart = (BYTE*)dst;
-    BYTE* const oend = ostart + dstSize;
-    BYTE* op = ostart;
-
-    /* checks & inits */
-    if (((size_t)workSpace & 3) != 0) return ERROR(GENERIC);  /* must be aligned on 4-bytes boundaries */
-    if (wkspSize < HUF_WORKSPACE_SIZE) return ERROR(workSpace_tooSmall);
-    if (!srcSize) return 0;  /* Uncompressed */
-    if (!dstSize) return 0;  /* cannot fit anything within dst budget */
-    if (srcSize > HUF_BLOCKSIZE_MAX) return ERROR(srcSize_wrong);   /* current block size limit */
-    if (huffLog > HUF_TABLELOG_MAX) return ERROR(tableLog_tooLarge);
-    if (maxSymbolValue > HUF_SYMBOLVALUE_MAX) return ERROR(maxSymbolValue_tooLarge);
-    if (!maxSymbolValue) maxSymbolValue = HUF_SYMBOLVALUE_MAX;
-    if (!huffLog) huffLog = HUF_TABLELOG_DEFAULT;
-
-    /* Heuristic : If old table is valid, use it for small inputs */
-    if (preferRepeat && repeat && *repeat == HUF_repeat_valid) {
-        return HUF_compressCTable_internal(ostart, op, oend,
-                                           src, srcSize,
-                                           nbStreams, oldHufTable, bmi2);
-    }
-
-    /* Scan input and build symbol stats */
-    {   CHECK_V_F(largest, HIST_count_wksp (table->count, &maxSymbolValue, (const BYTE*)src, srcSize, workSpace, wkspSize) );
-        if (largest == srcSize) { *ostart = ((const BYTE*)src)[0]; return 1; }   /* single symbol, rle */
-        if (largest <= (srcSize >> 7)+4) return 0;   /* heuristic : probably not compressible enough */
-    }
-
-    /* Check validity of previous table */
-    if ( repeat
-      && *repeat == HUF_repeat_check
-      && !HUF_validateCTable(oldHufTable, table->count, maxSymbolValue)) {
-        *repeat = HUF_repeat_none;
-    }
-    /* Heuristic : use existing table for small inputs */
-    if (preferRepeat && repeat && *repeat != HUF_repeat_none) {
-        return HUF_compressCTable_internal(ostart, op, oend,
-                                           src, srcSize,
-                                           nbStreams, oldHufTable, bmi2);
-    }
-
-    /* Build Huffman Tree */
-    huffLog = HUF_optimalTableLog(huffLog, srcSize, maxSymbolValue);
-    {   size_t const maxBits = HUF_buildCTable_wksp(table->CTable, table->count,
-                                            maxSymbolValue, huffLog,
-                                            table->nodeTable, sizeof(table->nodeTable));
-        CHECK_F(maxBits);
-        huffLog = (U32)maxBits;
-        /* Zero unused symbols in CTable, so we can check it for validity */
-        memset(table->CTable + (maxSymbolValue + 1), 0,
-               sizeof(table->CTable) - ((maxSymbolValue + 1) * sizeof(HUF_CElt)));
-    }
-
-    /* Write table description header */
-    {   CHECK_V_F(hSize, HUF_writeCTable (op, dstSize, table->CTable, maxSymbolValue, huffLog) );
-        /* Check if using previous huffman table is beneficial */
-        if (repeat && *repeat != HUF_repeat_none) {
-            size_t const oldSize = HUF_estimateCompressedSize(oldHufTable, table->count, maxSymbolValue);
-            size_t const newSize = HUF_estimateCompressedSize(table->CTable, table->count, maxSymbolValue);
-            if (oldSize <= hSize + newSize || hSize + 12 >= srcSize) {
-                return HUF_compressCTable_internal(ostart, op, oend,
-                                                   src, srcSize,
-                                                   nbStreams, oldHufTable, bmi2);
-        }   }
-
-        /* Use the new huffman table */
-        if (hSize + 12ul >= srcSize) { return 0; }
-        op += hSize;
-        if (repeat) { *repeat = HUF_repeat_none; }
-        if (oldHufTable)
-            memcpy(oldHufTable, table->CTable, sizeof(table->CTable));  /* Save new table */
-    }
-    return HUF_compressCTable_internal(ostart, op, oend,
-                                       src, srcSize,
-                                       nbStreams, table->CTable, bmi2);
-}
-
-
-size_t HUF_compress1X_wksp (void* dst, size_t dstSize,
-                      const void* src, size_t srcSize,
-                      unsigned maxSymbolValue, unsigned huffLog,
-                      void* workSpace, size_t wkspSize)
-{
-    return HUF_compress_internal(dst, dstSize, src, srcSize,
-                                 maxSymbolValue, huffLog, HUF_singleStream,
-                                 workSpace, wkspSize,
-                                 NULL, NULL, 0, 0 /*bmi2*/);
-}
-
-size_t HUF_compress1X_repeat (void* dst, size_t dstSize,
-                      const void* src, size_t srcSize,
-                      unsigned maxSymbolValue, unsigned huffLog,
-                      void* workSpace, size_t wkspSize,
-                      HUF_CElt* hufTable, HUF_repeat* repeat, int preferRepeat, int bmi2)
-{
-    return HUF_compress_internal(dst, dstSize, src, srcSize,
-                                 maxSymbolValue, huffLog, HUF_singleStream,
-                                 workSpace, wkspSize, hufTable,
-                                 repeat, preferRepeat, bmi2);
-}
-
-size_t HUF_compress1X (void* dst, size_t dstSize,
-                 const void* src, size_t srcSize,
-                 unsigned maxSymbolValue, unsigned huffLog)
-{
-    unsigned workSpace[HUF_WORKSPACE_SIZE_U32];
-    return HUF_compress1X_wksp(dst, dstSize, src, srcSize, maxSymbolValue, huffLog, workSpace, sizeof(workSpace));
-}
-
-/* HUF_compress4X_repeat():
- * compress input using 4 streams.
- * provide workspace to generate compression tables */
-size_t HUF_compress4X_wksp (void* dst, size_t dstSize,
-                      const void* src, size_t srcSize,
-                      unsigned maxSymbolValue, unsigned huffLog,
-                      void* workSpace, size_t wkspSize)
-{
-    return HUF_compress_internal(dst, dstSize, src, srcSize,
-                                 maxSymbolValue, huffLog, HUF_fourStreams,
-                                 workSpace, wkspSize,
-                                 NULL, NULL, 0, 0 /*bmi2*/);
-}
-
-/* HUF_compress4X_repeat():
- * compress input using 4 streams.
- * re-use an existing huffman compression table */
-size_t HUF_compress4X_repeat (void* dst, size_t dstSize,
-                      const void* src, size_t srcSize,
-                      unsigned maxSymbolValue, unsigned huffLog,
-                      void* workSpace, size_t wkspSize,
-                      HUF_CElt* hufTable, HUF_repeat* repeat, int preferRepeat, int bmi2)
-{
-    return HUF_compress_internal(dst, dstSize, src, srcSize,
-                                 maxSymbolValue, huffLog, HUF_fourStreams,
-                                 workSpace, wkspSize,
-                                 hufTable, repeat, preferRepeat, bmi2);
-}
-
-size_t HUF_compress2 (void* dst, size_t dstSize,
-                const void* src, size_t srcSize,
-                unsigned maxSymbolValue, unsigned huffLog)
-{
-    unsigned workSpace[HUF_WORKSPACE_SIZE_U32];
-    return HUF_compress4X_wksp(dst, dstSize, src, srcSize, maxSymbolValue, huffLog, workSpace, sizeof(workSpace));
-}
-
-size_t HUF_compress (void* dst, size_t maxDstSize, const void* src, size_t srcSize)
-{
-    return HUF_compress2(dst, maxDstSize, src, srcSize, 255, HUF_TABLELOG_DEFAULT);
-}
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/compress/zstd_compress.c mysql-8.0-8.0.27/extra/zstd/lib/compress/zstd_compress.c
--- mysql-8.0-8.0.26/extra/zstd/lib/compress/zstd_compress.c	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/compress/zstd_compress.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,3909 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
-/*-*************************************
-*  Dependencies
-***************************************/
-#include <limits.h>         /* INT_MAX */
-#include <string.h>         /* memset */
-#include "my_compiler.h"
-#include "cpu.h"
-#include "mem.h"
-#include "hist.h"           /* HIST_countFast_wksp */
-#define FSE_STATIC_LINKING_ONLY   /* FSE_encodeSymbol */
-#include "fse.h"
-#define HUF_STATIC_LINKING_ONLY
-#include "huf.h"
-#include "zstd_compress_internal.h"
-#include "zstd_compress_sequences.h"
-#include "zstd_compress_literals.h"
-#include "zstd_fast.h"
-#include "zstd_double_fast.h"
-#include "zstd_lazy.h"
-#include "zstd_opt.h"
-#include "zstd_ldm.h"
-
-
-/*-*************************************
-*  Helper functions
-***************************************/
-size_t ZSTD_compressBound(size_t srcSize) {
-    return ZSTD_COMPRESSBOUND(srcSize);
-}
-
-
-/*-*************************************
-*  Context memory management
-***************************************/
-struct ZSTD_CDict_s {
-    void* dictBuffer;
-    const void* dictContent;
-    size_t dictContentSize;
-    void* workspace;
-    size_t workspaceSize;
-    ZSTD_matchState_t matchState;
-    ZSTD_compressedBlockState_t cBlockState;
-    ZSTD_customMem customMem;
-    U32 dictID;
-};  /* typedef'd to ZSTD_CDict within "zstd.h" */
-
-ZSTD_CCtx* ZSTD_createCCtx(void)
-{
-    return ZSTD_createCCtx_advanced(ZSTD_defaultCMem);
-}
-
-static void ZSTD_initCCtx(ZSTD_CCtx* cctx, ZSTD_customMem memManager)
-{
-    assert(cctx != NULL);
-    memset(cctx, 0, sizeof(*cctx));
-    cctx->customMem = memManager;
-    cctx->bmi2 = ZSTD_cpuid_bmi2(ZSTD_cpuid());
-    {   size_t const err = ZSTD_CCtx_reset(cctx, ZSTD_reset_parameters);
-        assert(!ZSTD_isError(err));
-        (void)err;
-    }
-}
-
-ZSTD_CCtx* ZSTD_createCCtx_advanced(ZSTD_customMem customMem)
-{
-    ZSTD_STATIC_ASSERT(zcss_init==0);
-    ZSTD_STATIC_ASSERT(ZSTD_CONTENTSIZE_UNKNOWN==(0ULL - 1));
-    if (!customMem.customAlloc ^ !customMem.customFree) return NULL;
-    {   ZSTD_CCtx* const cctx = (ZSTD_CCtx*)ZSTD_malloc(sizeof(ZSTD_CCtx), customMem);
-        if (!cctx) return NULL;
-        ZSTD_initCCtx(cctx, customMem);
-        return cctx;
-    }
-}
-
-ZSTD_CCtx* ZSTD_initStaticCCtx(void *workspace, size_t workspaceSize)
-{
-    ZSTD_CCtx* const cctx = (ZSTD_CCtx*) workspace;
-    if (workspaceSize <= sizeof(ZSTD_CCtx)) return NULL;  /* minimum size */
-    if ((size_t)workspace & 7) return NULL;  /* must be 8-aligned */
-    memset(workspace, 0, workspaceSize);   /* may be a bit generous, could memset be smaller ? */
-    cctx->staticSize = workspaceSize;
-    cctx->workSpace = (void*)(cctx+1);
-    cctx->workSpaceSize = workspaceSize - sizeof(ZSTD_CCtx);
-
-    /* statically sized space. entropyWorkspace never moves (but prev/next block swap places) */
-    if (cctx->workSpaceSize < HUF_WORKSPACE_SIZE + 2 * sizeof(ZSTD_compressedBlockState_t)) return NULL;
-    assert(((size_t)cctx->workSpace & (sizeof(void*)-1)) == 0);   /* ensure correct alignment */
-    cctx->blockState.prevCBlock = (ZSTD_compressedBlockState_t*)cctx->workSpace;
-    cctx->blockState.nextCBlock = cctx->blockState.prevCBlock + 1;
-    {
-        void* const ptr = cctx->blockState.nextCBlock + 1;
-        cctx->entropyWorkspace = (U32*)ptr;
-    }
-    cctx->bmi2 = ZSTD_cpuid_bmi2(ZSTD_cpuid());
-    return cctx;
-}
-
-/**
- * Clears and frees all of the dictionaries in the CCtx.
- */
-static void ZSTD_clearAllDicts(ZSTD_CCtx* cctx)
-{
-    ZSTD_free(cctx->localDict.dictBuffer, cctx->customMem);
-    ZSTD_freeCDict(cctx->localDict.cdict);
-    memset(&cctx->localDict, 0, sizeof(cctx->localDict));
-    memset(&cctx->prefixDict, 0, sizeof(cctx->prefixDict));
-    cctx->cdict = NULL;
-}
-
-static size_t ZSTD_sizeof_localDict(ZSTD_localDict dict)
-{
-    size_t const bufferSize = dict.dictBuffer != NULL ? dict.dictSize : 0;
-    size_t const cdictSize = ZSTD_sizeof_CDict(dict.cdict);
-    return bufferSize + cdictSize;
-}
-
-static void ZSTD_freeCCtxContent(ZSTD_CCtx* cctx)
-{
-    assert(cctx != NULL);
-    assert(cctx->staticSize == 0);
-    ZSTD_free(cctx->workSpace, cctx->customMem); cctx->workSpace = NULL;
-    ZSTD_clearAllDicts(cctx);
-#ifdef ZSTD_MULTITHREAD
-    ZSTDMT_freeCCtx(cctx->mtctx); cctx->mtctx = NULL;
-#endif
-}
-
-size_t ZSTD_freeCCtx(ZSTD_CCtx* cctx)
-{
-    if (cctx==NULL) return 0;   /* support free on NULL */
-    RETURN_ERROR_IF(cctx->staticSize, memory_allocation,
-                    "not compatible with static CCtx");
-    ZSTD_freeCCtxContent(cctx);
-    ZSTD_free(cctx, cctx->customMem);
-    return 0;
-}
-
-
-static size_t ZSTD_sizeof_mtctx(const ZSTD_CCtx* cctx)
-{
-#ifdef ZSTD_MULTITHREAD
-    return ZSTDMT_sizeof_CCtx(cctx->mtctx);
-#else
-    (void)cctx;
-    return 0;
-#endif
-}
-
-
-size_t ZSTD_sizeof_CCtx(const ZSTD_CCtx* cctx)
-{
-    if (cctx==NULL) return 0;   /* support sizeof on NULL */
-    return sizeof(*cctx) + cctx->workSpaceSize
-           + ZSTD_sizeof_localDict(cctx->localDict)
-           + ZSTD_sizeof_mtctx(cctx);
-}
-
-size_t ZSTD_sizeof_CStream(const ZSTD_CStream* zcs)
-{
-    return ZSTD_sizeof_CCtx(zcs);  /* same object */
-}
-
-/* private API call, for dictBuilder only */
-const seqStore_t* ZSTD_getSeqStore(const ZSTD_CCtx* ctx) { return &(ctx->seqStore); }
-
-static ZSTD_CCtx_params ZSTD_makeCCtxParamsFromCParams(
-        ZSTD_compressionParameters cParams)
-{
-    ZSTD_CCtx_params cctxParams;
-    memset(&cctxParams, 0, sizeof(cctxParams));
-    cctxParams.cParams = cParams;
-    cctxParams.compressionLevel = ZSTD_CLEVEL_DEFAULT;  /* should not matter, as all cParams are presumed properly defined */
-    assert(!ZSTD_checkCParams(cParams));
-    cctxParams.fParams.contentSizeFlag = 1;
-    return cctxParams;
-}
-
-static ZSTD_CCtx_params* ZSTD_createCCtxParams_advanced(
-        ZSTD_customMem customMem)
-{
-    ZSTD_CCtx_params* params;
-    if (!customMem.customAlloc ^ !customMem.customFree) return NULL;
-    params = (ZSTD_CCtx_params*)ZSTD_calloc(
-            sizeof(ZSTD_CCtx_params), customMem);
-    if (!params) { return NULL; }
-    params->customMem = customMem;
-    params->compressionLevel = ZSTD_CLEVEL_DEFAULT;
-    params->fParams.contentSizeFlag = 1;
-    return params;
-}
-
-ZSTD_CCtx_params* ZSTD_createCCtxParams(void)
-{
-    return ZSTD_createCCtxParams_advanced(ZSTD_defaultCMem);
-}
-
-size_t ZSTD_freeCCtxParams(ZSTD_CCtx_params* params)
-{
-    if (params == NULL) { return 0; }
-    ZSTD_free(params, params->customMem);
-    return 0;
-}
-
-size_t ZSTD_CCtxParams_reset(ZSTD_CCtx_params* params)
-{
-    return ZSTD_CCtxParams_init(params, ZSTD_CLEVEL_DEFAULT);
-}
-
-size_t ZSTD_CCtxParams_init(ZSTD_CCtx_params* cctxParams, int compressionLevel) {
-    RETURN_ERROR_IF(!cctxParams, GENERIC);
-    memset(cctxParams, 0, sizeof(*cctxParams));
-    cctxParams->compressionLevel = compressionLevel;
-    cctxParams->fParams.contentSizeFlag = 1;
-    return 0;
-}
-
-size_t ZSTD_CCtxParams_init_advanced(ZSTD_CCtx_params* cctxParams, ZSTD_parameters params)
-{
-    RETURN_ERROR_IF(!cctxParams, GENERIC);
-    FORWARD_IF_ERROR( ZSTD_checkCParams(params.cParams) );
-    memset(cctxParams, 0, sizeof(*cctxParams));
-    cctxParams->cParams = params.cParams;
-    cctxParams->fParams = params.fParams;
-    cctxParams->compressionLevel = ZSTD_CLEVEL_DEFAULT;   /* should not matter, as all cParams are presumed properly defined */
-    assert(!ZSTD_checkCParams(params.cParams));
-    return 0;
-}
-
-/* ZSTD_assignParamsToCCtxParams() :
- * params is presumed valid at this stage */
-static ZSTD_CCtx_params ZSTD_assignParamsToCCtxParams(
-        ZSTD_CCtx_params cctxParams, ZSTD_parameters params)
-{
-    ZSTD_CCtx_params ret = cctxParams;
-    ret.cParams = params.cParams;
-    ret.fParams = params.fParams;
-    ret.compressionLevel = ZSTD_CLEVEL_DEFAULT;   /* should not matter, as all cParams are presumed properly defined */
-    assert(!ZSTD_checkCParams(params.cParams));
-    return ret;
-}
-
-ZSTD_bounds ZSTD_cParam_getBounds(ZSTD_cParameter param)
-{
-    ZSTD_bounds bounds = { 0, 0, 0 };
-
-    switch(param)
-    {
-    case ZSTD_c_compressionLevel:
-        bounds.lowerBound = ZSTD_minCLevel();
-        bounds.upperBound = ZSTD_maxCLevel();
-        return bounds;
-
-    case ZSTD_c_windowLog:
-        bounds.lowerBound = ZSTD_WINDOWLOG_MIN;
-        bounds.upperBound = ZSTD_WINDOWLOG_MAX;
-        return bounds;
-
-    case ZSTD_c_hashLog:
-        bounds.lowerBound = ZSTD_HASHLOG_MIN;
-        bounds.upperBound = ZSTD_HASHLOG_MAX;
-        return bounds;
-
-    case ZSTD_c_chainLog:
-        bounds.lowerBound = ZSTD_CHAINLOG_MIN;
-        bounds.upperBound = ZSTD_CHAINLOG_MAX;
-        return bounds;
-
-    case ZSTD_c_searchLog:
-        bounds.lowerBound = ZSTD_SEARCHLOG_MIN;
-        bounds.upperBound = ZSTD_SEARCHLOG_MAX;
-        return bounds;
-
-    case ZSTD_c_minMatch:
-        bounds.lowerBound = ZSTD_MINMATCH_MIN;
-        bounds.upperBound = ZSTD_MINMATCH_MAX;
-        return bounds;
-
-    case ZSTD_c_targetLength:
-        bounds.lowerBound = ZSTD_TARGETLENGTH_MIN;
-        bounds.upperBound = ZSTD_TARGETLENGTH_MAX;
-        return bounds;
-
-    case ZSTD_c_strategy:
-        bounds.lowerBound = ZSTD_STRATEGY_MIN;
-        bounds.upperBound = ZSTD_STRATEGY_MAX;
-        return bounds;
-
-    case ZSTD_c_contentSizeFlag:
-        bounds.lowerBound = 0;
-        bounds.upperBound = 1;
-        return bounds;
-
-    case ZSTD_c_checksumFlag:
-        bounds.lowerBound = 0;
-        bounds.upperBound = 1;
-        return bounds;
-
-    case ZSTD_c_dictIDFlag:
-        bounds.lowerBound = 0;
-        bounds.upperBound = 1;
-        return bounds;
-
-    case ZSTD_c_nbWorkers:
-        bounds.lowerBound = 0;
-#ifdef ZSTD_MULTITHREAD
-        bounds.upperBound = ZSTDMT_NBWORKERS_MAX;
-#else
-        bounds.upperBound = 0;
-#endif
-        return bounds;
-
-    case ZSTD_c_jobSize:
-        bounds.lowerBound = 0;
-#ifdef ZSTD_MULTITHREAD
-        bounds.upperBound = ZSTDMT_JOBSIZE_MAX;
-#else
-        bounds.upperBound = 0;
-#endif
-        return bounds;
-
-    case ZSTD_c_overlapLog:
-        bounds.lowerBound = ZSTD_OVERLAPLOG_MIN;
-        bounds.upperBound = ZSTD_OVERLAPLOG_MAX;
-        return bounds;
-
-    case ZSTD_c_enableLongDistanceMatching:
-        bounds.lowerBound = 0;
-        bounds.upperBound = 1;
-        return bounds;
-
-    case ZSTD_c_ldmHashLog:
-        bounds.lowerBound = ZSTD_LDM_HASHLOG_MIN;
-        bounds.upperBound = ZSTD_LDM_HASHLOG_MAX;
-        return bounds;
-
-    case ZSTD_c_ldmMinMatch:
-        bounds.lowerBound = ZSTD_LDM_MINMATCH_MIN;
-        bounds.upperBound = ZSTD_LDM_MINMATCH_MAX;
-        return bounds;
-
-    case ZSTD_c_ldmBucketSizeLog:
-        bounds.lowerBound = ZSTD_LDM_BUCKETSIZELOG_MIN;
-        bounds.upperBound = ZSTD_LDM_BUCKETSIZELOG_MAX;
-        return bounds;
-
-    case ZSTD_c_ldmHashRateLog:
-        bounds.lowerBound = ZSTD_LDM_HASHRATELOG_MIN;
-        bounds.upperBound = ZSTD_LDM_HASHRATELOG_MAX;
-        return bounds;
-
-    /* experimental parameters */
-    case ZSTD_c_rsyncable:
-        bounds.lowerBound = 0;
-        bounds.upperBound = 1;
-        return bounds;
-
-    case ZSTD_c_forceMaxWindow :
-        bounds.lowerBound = 0;
-        bounds.upperBound = 1;
-        return bounds;
-
-    case ZSTD_c_format:
-        ZSTD_STATIC_ASSERT(ZSTD_f_zstd1 < ZSTD_f_zstd1_magicless);
-        bounds.lowerBound = ZSTD_f_zstd1;
-        bounds.upperBound = ZSTD_f_zstd1_magicless;   /* note : how to ensure at compile time that this is the highest value enum ? */
-        return bounds;
-
-    case ZSTD_c_forceAttachDict:
-        ZSTD_STATIC_ASSERT(ZSTD_dictDefaultAttach < ZSTD_dictForceCopy);
-        bounds.lowerBound = ZSTD_dictDefaultAttach;
-        bounds.upperBound = ZSTD_dictForceCopy;       /* note : how to ensure at compile time that this is the highest value enum ? */
-        return bounds;
-
-    case ZSTD_c_literalCompressionMode:
-        ZSTD_STATIC_ASSERT(ZSTD_lcm_auto < ZSTD_lcm_huffman && ZSTD_lcm_huffman < ZSTD_lcm_uncompressed);
-        bounds.lowerBound = ZSTD_lcm_auto;
-        bounds.upperBound = ZSTD_lcm_uncompressed;
-        return bounds;
-
-    case ZSTD_c_targetCBlockSize:
-        bounds.lowerBound = ZSTD_TARGETCBLOCKSIZE_MIN;
-        bounds.upperBound = ZSTD_TARGETCBLOCKSIZE_MAX;
-        return bounds;
-
-    default:
-        {   ZSTD_bounds const boundError = { ERROR(parameter_unsupported), 0, 0 };
-            return boundError;
-        }
-    }
-}
-
-/* ZSTD_cParam_clampBounds:
- * Clamps the value into the bounded range.
- */
-static size_t ZSTD_cParam_clampBounds(ZSTD_cParameter cParam, int* value)
-{
-    ZSTD_bounds const bounds = ZSTD_cParam_getBounds(cParam);
-    if (ZSTD_isError(bounds.error)) return bounds.error;
-    if (*value < bounds.lowerBound) *value = bounds.lowerBound;
-    if (*value > bounds.upperBound) *value = bounds.upperBound;
-    return 0;
-}
-
-#define BOUNDCHECK(cParam, val) { \
-    RETURN_ERROR_IF(!ZSTD_cParam_withinBounds(cParam,val), \
-                    parameter_outOfBound); \
-}
-
-
-static int ZSTD_isUpdateAuthorized(ZSTD_cParameter param)
-{
-    switch(param)
-    {
-    case ZSTD_c_compressionLevel:
-    case ZSTD_c_hashLog:
-    case ZSTD_c_chainLog:
-    case ZSTD_c_searchLog:
-    case ZSTD_c_minMatch:
-    case ZSTD_c_targetLength:
-    case ZSTD_c_strategy:
-        return 1;
-
-    case ZSTD_c_format:
-    case ZSTD_c_windowLog:
-    case ZSTD_c_contentSizeFlag:
-    case ZSTD_c_checksumFlag:
-    case ZSTD_c_dictIDFlag:
-    case ZSTD_c_forceMaxWindow :
-    case ZSTD_c_nbWorkers:
-    case ZSTD_c_jobSize:
-    case ZSTD_c_overlapLog:
-    case ZSTD_c_rsyncable:
-    case ZSTD_c_enableLongDistanceMatching:
-    case ZSTD_c_ldmHashLog:
-    case ZSTD_c_ldmMinMatch:
-    case ZSTD_c_ldmBucketSizeLog:
-    case ZSTD_c_ldmHashRateLog:
-    case ZSTD_c_forceAttachDict:
-    case ZSTD_c_literalCompressionMode:
-    case ZSTD_c_targetCBlockSize:
-    default:
-        return 0;
-    }
-}
-
-size_t ZSTD_CCtx_setParameter(ZSTD_CCtx* cctx, ZSTD_cParameter param, int value)
-{
-    DEBUGLOG(4, "ZSTD_CCtx_setParameter (%i, %i)", (int)param, value);
-    if (cctx->streamStage != zcss_init) {
-        if (ZSTD_isUpdateAuthorized(param)) {
-            cctx->cParamsChanged = 1;
-        } else {
-            RETURN_ERROR(stage_wrong);
-    }   }
-
-    switch(param)
-    {
-    case ZSTD_c_nbWorkers:
-        RETURN_ERROR_IF((value!=0) && cctx->staticSize, parameter_unsupported,
-                        "MT not compatible with static alloc");
-        break;
-
-    case ZSTD_c_compressionLevel:
-    case ZSTD_c_windowLog:
-    case ZSTD_c_hashLog:
-    case ZSTD_c_chainLog:
-    case ZSTD_c_searchLog:
-    case ZSTD_c_minMatch:
-    case ZSTD_c_targetLength:
-    case ZSTD_c_strategy:
-    case ZSTD_c_ldmHashRateLog:
-    case ZSTD_c_format:
-    case ZSTD_c_contentSizeFlag:
-    case ZSTD_c_checksumFlag:
-    case ZSTD_c_dictIDFlag:
-    case ZSTD_c_forceMaxWindow:
-    case ZSTD_c_forceAttachDict:
-    case ZSTD_c_literalCompressionMode:
-    case ZSTD_c_jobSize:
-    case ZSTD_c_overlapLog:
-    case ZSTD_c_rsyncable:
-    case ZSTD_c_enableLongDistanceMatching:
-    case ZSTD_c_ldmHashLog:
-    case ZSTD_c_ldmMinMatch:
-    case ZSTD_c_ldmBucketSizeLog:
-    case ZSTD_c_targetCBlockSize:
-        break;
-
-    default: RETURN_ERROR(parameter_unsupported);
-    }
-    return ZSTD_CCtxParams_setParameter(&cctx->requestedParams, param, value);
-}
-
-size_t ZSTD_CCtxParams_setParameter(ZSTD_CCtx_params* CCtxParams,
-                                    ZSTD_cParameter param, int value)
-{
-    DEBUGLOG(4, "ZSTD_CCtxParams_setParameter (%i, %i)", (int)param, value);
-    switch(param)
-    {
-    case ZSTD_c_format :
-        BOUNDCHECK(ZSTD_c_format, value);
-        CCtxParams->format = (ZSTD_format_e)value;
-        return (size_t)CCtxParams->format;
-
-    case ZSTD_c_compressionLevel : {
-        FORWARD_IF_ERROR(ZSTD_cParam_clampBounds(param, &value));
-        if (value) {  /* 0 : does not change current level */
-            CCtxParams->compressionLevel = value;
-        }
-        if (CCtxParams->compressionLevel >= 0) return CCtxParams->compressionLevel;
-        return 0;  /* return type (size_t) cannot represent negative values */
-    }
-
-    case ZSTD_c_windowLog :
-        if (value!=0)   /* 0 => use default */
-            BOUNDCHECK(ZSTD_c_windowLog, value);
-        CCtxParams->cParams.windowLog = value;
-        return CCtxParams->cParams.windowLog;
-
-    case ZSTD_c_hashLog :
-        if (value!=0)   /* 0 => use default */
-            BOUNDCHECK(ZSTD_c_hashLog, value);
-        CCtxParams->cParams.hashLog = value;
-        return CCtxParams->cParams.hashLog;
-
-    case ZSTD_c_chainLog :
-        if (value!=0)   /* 0 => use default */
-            BOUNDCHECK(ZSTD_c_chainLog, value);
-        CCtxParams->cParams.chainLog = value;
-        return CCtxParams->cParams.chainLog;
-
-    case ZSTD_c_searchLog :
-        if (value!=0)   /* 0 => use default */
-            BOUNDCHECK(ZSTD_c_searchLog, value);
-        CCtxParams->cParams.searchLog = value;
-        return value;
-
-    case ZSTD_c_minMatch :
-        if (value!=0)   /* 0 => use default */
-            BOUNDCHECK(ZSTD_c_minMatch, value);
-        CCtxParams->cParams.minMatch = value;
-        return CCtxParams->cParams.minMatch;
-
-    case ZSTD_c_targetLength :
-        BOUNDCHECK(ZSTD_c_targetLength, value);
-        CCtxParams->cParams.targetLength = value;
-        return CCtxParams->cParams.targetLength;
-
-    case ZSTD_c_strategy :
-        if (value!=0)   /* 0 => use default */
-            BOUNDCHECK(ZSTD_c_strategy, value);
-        CCtxParams->cParams.strategy = (ZSTD_strategy)value;
-        return (size_t)CCtxParams->cParams.strategy;
-
-    case ZSTD_c_contentSizeFlag :
-        /* Content size written in frame header _when known_ (default:1) */
-        DEBUGLOG(4, "set content size flag = %u", (value!=0));
-        CCtxParams->fParams.contentSizeFlag = value != 0;
-        return CCtxParams->fParams.contentSizeFlag;
-
-    case ZSTD_c_checksumFlag :
-        /* A 32-bits content checksum will be calculated and written at end of frame (default:0) */
-        CCtxParams->fParams.checksumFlag = value != 0;
-        return CCtxParams->fParams.checksumFlag;
-
-    case ZSTD_c_dictIDFlag : /* When applicable, dictionary's dictID is provided in frame header (default:1) */
-        DEBUGLOG(4, "set dictIDFlag = %u", (value!=0));
-        CCtxParams->fParams.noDictIDFlag = !value;
-        return !CCtxParams->fParams.noDictIDFlag;
-
-    case ZSTD_c_forceMaxWindow :
-        CCtxParams->forceWindow = (value != 0);
-        return CCtxParams->forceWindow;
-
-    case ZSTD_c_forceAttachDict : {
-        const ZSTD_dictAttachPref_e pref = (ZSTD_dictAttachPref_e)value;
-        BOUNDCHECK(ZSTD_c_forceAttachDict, pref);
-        CCtxParams->attachDictPref = pref;
-        return CCtxParams->attachDictPref;
-    }
-
-    case ZSTD_c_literalCompressionMode : {
-        const ZSTD_literalCompressionMode_e lcm = (ZSTD_literalCompressionMode_e)value;
-        BOUNDCHECK(ZSTD_c_literalCompressionMode, lcm);
-        CCtxParams->literalCompressionMode = lcm;
-        return CCtxParams->literalCompressionMode;
-    }
-
-    case ZSTD_c_nbWorkers :
-#ifndef ZSTD_MULTITHREAD
-        RETURN_ERROR_IF(value!=0, parameter_unsupported, "not compiled with multithreading");
-        return 0;
-#else
-        FORWARD_IF_ERROR(ZSTD_cParam_clampBounds(param, &value));
-        CCtxParams->nbWorkers = value;
-        return CCtxParams->nbWorkers;
-#endif
-
-    case ZSTD_c_jobSize :
-#ifndef ZSTD_MULTITHREAD
-        RETURN_ERROR_IF(value!=0, parameter_unsupported, "not compiled with multithreading");
-        return 0;
-#else
-        /* Adjust to the minimum non-default value. */
-        if (value != 0 && value < ZSTDMT_JOBSIZE_MIN)
-            value = ZSTDMT_JOBSIZE_MIN;
-        FORWARD_IF_ERROR(ZSTD_cParam_clampBounds(param, &value));
-        assert(value >= 0);
-        CCtxParams->jobSize = value;
-        return CCtxParams->jobSize;
-#endif
-
-    case ZSTD_c_overlapLog :
-#ifndef ZSTD_MULTITHREAD
-        RETURN_ERROR_IF(value!=0, parameter_unsupported, "not compiled with multithreading");
-        return 0;
-#else
-        FORWARD_IF_ERROR(ZSTD_cParam_clampBounds(ZSTD_c_overlapLog, &value));
-        CCtxParams->overlapLog = value;
-        return CCtxParams->overlapLog;
-#endif
-
-    case ZSTD_c_rsyncable :
-#ifndef ZSTD_MULTITHREAD
-        RETURN_ERROR_IF(value!=0, parameter_unsupported, "not compiled with multithreading");
-        return 0;
-#else
-        FORWARD_IF_ERROR(ZSTD_cParam_clampBounds(ZSTD_c_overlapLog, &value));
-        CCtxParams->rsyncable = value;
-        return CCtxParams->rsyncable;
-#endif
-
-    case ZSTD_c_enableLongDistanceMatching :
-        CCtxParams->ldmParams.enableLdm = (value!=0);
-        return CCtxParams->ldmParams.enableLdm;
-
-    case ZSTD_c_ldmHashLog :
-        if (value!=0)   /* 0 ==> auto */
-            BOUNDCHECK(ZSTD_c_ldmHashLog, value);
-        CCtxParams->ldmParams.hashLog = value;
-        return CCtxParams->ldmParams.hashLog;
-
-    case ZSTD_c_ldmMinMatch :
-        if (value!=0)   /* 0 ==> default */
-            BOUNDCHECK(ZSTD_c_ldmMinMatch, value);
-        CCtxParams->ldmParams.minMatchLength = value;
-        return CCtxParams->ldmParams.minMatchLength;
-
-    case ZSTD_c_ldmBucketSizeLog :
-        if (value!=0)   /* 0 ==> default */
-            BOUNDCHECK(ZSTD_c_ldmBucketSizeLog, value);
-        CCtxParams->ldmParams.bucketSizeLog = value;
-        return CCtxParams->ldmParams.bucketSizeLog;
-
-    case ZSTD_c_ldmHashRateLog :
-        RETURN_ERROR_IF(value > ZSTD_WINDOWLOG_MAX - ZSTD_HASHLOG_MIN,
-                        parameter_outOfBound);
-        CCtxParams->ldmParams.hashRateLog = value;
-        return CCtxParams->ldmParams.hashRateLog;
-
-    case ZSTD_c_targetCBlockSize :
-        if (value!=0)   /* 0 ==> default */
-            BOUNDCHECK(ZSTD_c_targetCBlockSize, value);
-        CCtxParams->targetCBlockSize = value;
-        return CCtxParams->targetCBlockSize;
-
-    default: RETURN_ERROR(parameter_unsupported, "unknown parameter");
-    }
-}
-
-size_t ZSTD_CCtx_getParameter(ZSTD_CCtx* cctx, ZSTD_cParameter param, int* value)
-{
-    return ZSTD_CCtxParams_getParameter(&cctx->requestedParams, param, value);
-}
-
-size_t ZSTD_CCtxParams_getParameter(
-        ZSTD_CCtx_params* CCtxParams, ZSTD_cParameter param, int* value)
-{
-    switch(param)
-    {
-    case ZSTD_c_format :
-        *value = CCtxParams->format;
-        break;
-    case ZSTD_c_compressionLevel :
-        *value = CCtxParams->compressionLevel;
-        break;
-    case ZSTD_c_windowLog :
-        *value = (int)CCtxParams->cParams.windowLog;
-        break;
-    case ZSTD_c_hashLog :
-        *value = (int)CCtxParams->cParams.hashLog;
-        break;
-    case ZSTD_c_chainLog :
-        *value = (int)CCtxParams->cParams.chainLog;
-        break;
-    case ZSTD_c_searchLog :
-        *value = CCtxParams->cParams.searchLog;
-        break;
-    case ZSTD_c_minMatch :
-        *value = CCtxParams->cParams.minMatch;
-        break;
-    case ZSTD_c_targetLength :
-        *value = CCtxParams->cParams.targetLength;
-        break;
-    case ZSTD_c_strategy :
-        *value = (unsigned)CCtxParams->cParams.strategy;
-        break;
-    case ZSTD_c_contentSizeFlag :
-        *value = CCtxParams->fParams.contentSizeFlag;
-        break;
-    case ZSTD_c_checksumFlag :
-        *value = CCtxParams->fParams.checksumFlag;
-        break;
-    case ZSTD_c_dictIDFlag :
-        *value = !CCtxParams->fParams.noDictIDFlag;
-        break;
-    case ZSTD_c_forceMaxWindow :
-        *value = CCtxParams->forceWindow;
-        break;
-    case ZSTD_c_forceAttachDict :
-        *value = CCtxParams->attachDictPref;
-        break;
-    case ZSTD_c_literalCompressionMode :
-        *value = CCtxParams->literalCompressionMode;
-        break;
-    case ZSTD_c_nbWorkers :
-#ifndef ZSTD_MULTITHREAD
-        assert(CCtxParams->nbWorkers == 0);
-#endif
-        *value = CCtxParams->nbWorkers;
-        break;
-    case ZSTD_c_jobSize :
-#ifndef ZSTD_MULTITHREAD
-        RETURN_ERROR(parameter_unsupported, "not compiled with multithreading");
-#else
-        assert(CCtxParams->jobSize <= INT_MAX);
-        *value = (int)CCtxParams->jobSize;
-        break;
-#endif
-    case ZSTD_c_overlapLog :
-#ifndef ZSTD_MULTITHREAD
-        RETURN_ERROR(parameter_unsupported, "not compiled with multithreading");
-#else
-        *value = CCtxParams->overlapLog;
-        break;
-#endif
-    case ZSTD_c_rsyncable :
-#ifndef ZSTD_MULTITHREAD
-        RETURN_ERROR(parameter_unsupported, "not compiled with multithreading");
-#else
-        *value = CCtxParams->rsyncable;
-        break;
-#endif
-    case ZSTD_c_enableLongDistanceMatching :
-        *value = CCtxParams->ldmParams.enableLdm;
-        break;
-    case ZSTD_c_ldmHashLog :
-        *value = CCtxParams->ldmParams.hashLog;
-        break;
-    case ZSTD_c_ldmMinMatch :
-        *value = CCtxParams->ldmParams.minMatchLength;
-        break;
-    case ZSTD_c_ldmBucketSizeLog :
-        *value = CCtxParams->ldmParams.bucketSizeLog;
-        break;
-    case ZSTD_c_ldmHashRateLog :
-        *value = CCtxParams->ldmParams.hashRateLog;
-        break;
-    case ZSTD_c_targetCBlockSize :
-        *value = (int)CCtxParams->targetCBlockSize;
-        break;
-    default: RETURN_ERROR(parameter_unsupported, "unknown parameter");
-    }
-    return 0;
-}
-
-/** ZSTD_CCtx_setParametersUsingCCtxParams() :
- *  just applies `params` into `cctx`
- *  no action is performed, parameters are merely stored.
- *  If ZSTDMT is enabled, parameters are pushed to cctx->mtctx.
- *    This is possible even if a compression is ongoing.
- *    In which case, new parameters will be applied on the fly, starting with next compression job.
- */
-size_t ZSTD_CCtx_setParametersUsingCCtxParams(
-        ZSTD_CCtx* cctx, const ZSTD_CCtx_params* params)
-{
-    DEBUGLOG(4, "ZSTD_CCtx_setParametersUsingCCtxParams");
-    RETURN_ERROR_IF(cctx->streamStage != zcss_init, stage_wrong);
-    RETURN_ERROR_IF(cctx->cdict, stage_wrong);
-
-    cctx->requestedParams = *params;
-    return 0;
-}
-
-ZSTDLIB_API size_t ZSTD_CCtx_setPledgedSrcSize(ZSTD_CCtx* cctx, unsigned long long pledgedSrcSize)
-{
-    DEBUGLOG(4, "ZSTD_CCtx_setPledgedSrcSize to %u bytes", (U32)pledgedSrcSize);
-    RETURN_ERROR_IF(cctx->streamStage != zcss_init, stage_wrong);
-    cctx->pledgedSrcSizePlusOne = pledgedSrcSize+1;
-    return 0;
-}
-
-/**
- * Initializes the local dict using the requested parameters.
- * NOTE: This does not use the pledged src size, because it may be used for more
- * than one compression.
- */
-static size_t ZSTD_initLocalDict(ZSTD_CCtx* cctx)
-{
-    ZSTD_localDict* const dl = &cctx->localDict;
-    ZSTD_compressionParameters const cParams = ZSTD_getCParamsFromCCtxParams(
-            &cctx->requestedParams, 0, dl->dictSize);
-    if (dl->dict == NULL) {
-        /* No local dictionary. */
-        assert(dl->dictBuffer == NULL);
-        assert(dl->cdict == NULL);
-        assert(dl->dictSize == 0);
-        return 0;
-    }
-    if (dl->cdict != NULL) {
-        assert(cctx->cdict == dl->cdict);
-        /* Local dictionary already initialized. */
-        return 0;
-    }
-    assert(dl->dictSize > 0);
-    assert(cctx->cdict == NULL);
-    assert(cctx->prefixDict.dict == NULL);
-
-    dl->cdict = ZSTD_createCDict_advanced(
-            dl->dict,
-            dl->dictSize,
-            ZSTD_dlm_byRef,
-            dl->dictContentType,
-            cParams,
-            cctx->customMem);
-    RETURN_ERROR_IF(!dl->cdict, memory_allocation);
-    cctx->cdict = dl->cdict;
-    return 0;
-}
-
-size_t ZSTD_CCtx_loadDictionary_advanced(
-        ZSTD_CCtx* cctx, const void* dict, size_t dictSize,
-        ZSTD_dictLoadMethod_e dictLoadMethod, ZSTD_dictContentType_e dictContentType)
-{
-    RETURN_ERROR_IF(cctx->streamStage != zcss_init, stage_wrong);
-    RETURN_ERROR_IF(cctx->staticSize, memory_allocation,
-                    "no malloc for static CCtx");
-    DEBUGLOG(4, "ZSTD_CCtx_loadDictionary_advanced (size: %u)", (U32)dictSize);
-    ZSTD_clearAllDicts(cctx);  /* in case one already exists */
-    if (dict == NULL || dictSize == 0)  /* no dictionary mode */
-        return 0;
-    if (dictLoadMethod == ZSTD_dlm_byRef) {
-        cctx->localDict.dict = dict;
-    } else {
-        void* dictBuffer = ZSTD_malloc(dictSize, cctx->customMem);
-        RETURN_ERROR_IF(!dictBuffer, memory_allocation);
-        memcpy(dictBuffer, dict, dictSize);
-        cctx->localDict.dictBuffer = dictBuffer;
-        cctx->localDict.dict = dictBuffer;
-    }
-    cctx->localDict.dictSize = dictSize;
-    cctx->localDict.dictContentType = dictContentType;
-    return 0;
-}
-
-ZSTDLIB_API size_t ZSTD_CCtx_loadDictionary_byReference(
-      ZSTD_CCtx* cctx, const void* dict, size_t dictSize)
-{
-    return ZSTD_CCtx_loadDictionary_advanced(
-            cctx, dict, dictSize, ZSTD_dlm_byRef, ZSTD_dct_auto);
-}
-
-ZSTDLIB_API size_t ZSTD_CCtx_loadDictionary(ZSTD_CCtx* cctx, const void* dict, size_t dictSize)
-{
-    return ZSTD_CCtx_loadDictionary_advanced(
-            cctx, dict, dictSize, ZSTD_dlm_byCopy, ZSTD_dct_auto);
-}
-
-
-size_t ZSTD_CCtx_refCDict(ZSTD_CCtx* cctx, const ZSTD_CDict* cdict)
-{
-    RETURN_ERROR_IF(cctx->streamStage != zcss_init, stage_wrong);
-    /* Free the existing local cdict (if any) to save memory. */
-    ZSTD_clearAllDicts(cctx);
-    cctx->cdict = cdict;
-    return 0;
-}
-
-size_t ZSTD_CCtx_refPrefix(ZSTD_CCtx* cctx, const void* prefix, size_t prefixSize)
-{
-    return ZSTD_CCtx_refPrefix_advanced(cctx, prefix, prefixSize, ZSTD_dct_rawContent);
-}
-
-size_t ZSTD_CCtx_refPrefix_advanced(
-        ZSTD_CCtx* cctx, const void* prefix, size_t prefixSize, ZSTD_dictContentType_e dictContentType)
-{
-    RETURN_ERROR_IF(cctx->streamStage != zcss_init, stage_wrong);
-    ZSTD_clearAllDicts(cctx);
-    cctx->prefixDict.dict = prefix;
-    cctx->prefixDict.dictSize = prefixSize;
-    cctx->prefixDict.dictContentType = dictContentType;
-    return 0;
-}
-
-/*! ZSTD_CCtx_reset() :
- *  Also dumps dictionary */
-size_t ZSTD_CCtx_reset(ZSTD_CCtx* cctx, ZSTD_ResetDirective reset)
-{
-    if ( (reset == ZSTD_reset_session_only)
-      || (reset == ZSTD_reset_session_and_parameters) ) {
-        cctx->streamStage = zcss_init;
-        cctx->pledgedSrcSizePlusOne = 0;
-    }
-    if ( (reset == ZSTD_reset_parameters)
-      || (reset == ZSTD_reset_session_and_parameters) ) {
-        RETURN_ERROR_IF(cctx->streamStage != zcss_init, stage_wrong);
-        ZSTD_clearAllDicts(cctx);
-        return ZSTD_CCtxParams_reset(&cctx->requestedParams);
-    }
-    return 0;
-}
-
-
-/** ZSTD_checkCParams() :
-    control CParam values remain within authorized range.
-    @return : 0, or an error code if one value is beyond authorized range */
-size_t ZSTD_checkCParams(ZSTD_compressionParameters cParams)
-{
-    BOUNDCHECK(ZSTD_c_windowLog, (int)cParams.windowLog);
-    BOUNDCHECK(ZSTD_c_chainLog,  (int)cParams.chainLog);
-    BOUNDCHECK(ZSTD_c_hashLog,   (int)cParams.hashLog);
-    BOUNDCHECK(ZSTD_c_searchLog, (int)cParams.searchLog);
-    BOUNDCHECK(ZSTD_c_minMatch,  (int)cParams.minMatch);
-    BOUNDCHECK(ZSTD_c_targetLength,(int)cParams.targetLength);
-    BOUNDCHECK(ZSTD_c_strategy,  cParams.strategy);
-    return 0;
-}
-
-/** ZSTD_clampCParams() :
- *  make CParam values within valid range.
- *  @return : valid CParams */
-static ZSTD_compressionParameters
-ZSTD_clampCParams(ZSTD_compressionParameters cParams)
-{
-#   define CLAMP_TYPE(cParam, val, type) {                                \
-        ZSTD_bounds const bounds = ZSTD_cParam_getBounds(cParam);         \
-        if ((int)val<bounds.lowerBound) val=(type)bounds.lowerBound;      \
-        else if ((int)val>bounds.upperBound) val=(type)bounds.upperBound; \
-    }
-#   define CLAMP(cParam, val) CLAMP_TYPE(cParam, val, unsigned)
-    CLAMP(ZSTD_c_windowLog, cParams.windowLog);
-    CLAMP(ZSTD_c_chainLog,  cParams.chainLog);
-    CLAMP(ZSTD_c_hashLog,   cParams.hashLog);
-    CLAMP(ZSTD_c_searchLog, cParams.searchLog);
-    CLAMP(ZSTD_c_minMatch,  cParams.minMatch);
-    CLAMP(ZSTD_c_targetLength,cParams.targetLength);
-    CLAMP_TYPE(ZSTD_c_strategy,cParams.strategy, ZSTD_strategy);
-    return cParams;
-}
-
-/** ZSTD_cycleLog() :
- *  condition for correct operation : hashLog > 1 */
-static U32 ZSTD_cycleLog(U32 hashLog, ZSTD_strategy strat)
-{
-    U32 const btScale = ((U32)strat >= (U32)ZSTD_btlazy2);
-    return hashLog - btScale;
-}
-
-/** ZSTD_adjustCParams_internal() :
- *  optimize `cPar` for a specified input (`srcSize` and `dictSize`).
- *  mostly downsize to reduce memory consumption and initialization latency.
- * `srcSize` can be ZSTD_CONTENTSIZE_UNKNOWN when not known.
- *  note : for the time being, `srcSize==0` means "unknown" too, for compatibility with older convention.
- *  condition : cPar is presumed validated (can be checked using ZSTD_checkCParams()). */
-static ZSTD_compressionParameters
-ZSTD_adjustCParams_internal(ZSTD_compressionParameters cPar,
-                            unsigned long long srcSize,
-                            size_t dictSize)
-{
-    static const U64 minSrcSize = 513; /* (1<<9) + 1 */
-    static const U64 maxWindowResize = 1ULL << (ZSTD_WINDOWLOG_MAX-1);
-    assert(ZSTD_checkCParams(cPar)==0);
-
-    if (dictSize && (srcSize+1<2) /* ZSTD_CONTENTSIZE_UNKNOWN and 0 mean "unknown" */ )
-        srcSize = minSrcSize;  /* presumed small when there is a dictionary */
-    else if (srcSize == 0)
-        srcSize = ZSTD_CONTENTSIZE_UNKNOWN;  /* 0 == unknown : presumed large */
-
-    /* resize windowLog if input is small enough, to use less memory */
-    if ( (srcSize < maxWindowResize)
-      && (dictSize < maxWindowResize) )  {
-        U32 const tSize = (U32)(srcSize + dictSize);
-        static U32 const hashSizeMin = 1 << ZSTD_HASHLOG_MIN;
-        U32 const srcLog = (tSize < hashSizeMin) ? ZSTD_HASHLOG_MIN :
-                            ZSTD_highbit32(tSize-1) + 1;
-        if (cPar.windowLog > srcLog) cPar.windowLog = srcLog;
-    }
-    if (cPar.hashLog > cPar.windowLog+1) cPar.hashLog = cPar.windowLog+1;
-    {   U32 const cycleLog = ZSTD_cycleLog(cPar.chainLog, cPar.strategy);
-        if (cycleLog > cPar.windowLog)
-            cPar.chainLog -= (cycleLog - cPar.windowLog);
-    }
-
-    if (cPar.windowLog < ZSTD_WINDOWLOG_ABSOLUTEMIN)
-        cPar.windowLog = ZSTD_WINDOWLOG_ABSOLUTEMIN;  /* minimum wlog required for valid frame header */
-
-    return cPar;
-}
-
-ZSTD_compressionParameters
-ZSTD_adjustCParams(ZSTD_compressionParameters cPar,
-                   unsigned long long srcSize,
-                   size_t dictSize)
-{
-    cPar = ZSTD_clampCParams(cPar);   /* resulting cPar is necessarily valid (all parameters within range) */
-    return ZSTD_adjustCParams_internal(cPar, srcSize, dictSize);
-}
-
-ZSTD_compressionParameters ZSTD_getCParamsFromCCtxParams(
-        const ZSTD_CCtx_params* CCtxParams, U64 srcSizeHint, size_t dictSize)
-{
-    ZSTD_compressionParameters cParams = ZSTD_getCParams(CCtxParams->compressionLevel, srcSizeHint, dictSize);
-    if (CCtxParams->ldmParams.enableLdm) cParams.windowLog = ZSTD_LDM_DEFAULT_WINDOW_LOG;
-    if (CCtxParams->cParams.windowLog) cParams.windowLog = CCtxParams->cParams.windowLog;
-    if (CCtxParams->cParams.hashLog) cParams.hashLog = CCtxParams->cParams.hashLog;
-    if (CCtxParams->cParams.chainLog) cParams.chainLog = CCtxParams->cParams.chainLog;
-    if (CCtxParams->cParams.searchLog) cParams.searchLog = CCtxParams->cParams.searchLog;
-    if (CCtxParams->cParams.minMatch) cParams.minMatch = CCtxParams->cParams.minMatch;
-    if (CCtxParams->cParams.targetLength) cParams.targetLength = CCtxParams->cParams.targetLength;
-    if (CCtxParams->cParams.strategy) cParams.strategy = CCtxParams->cParams.strategy;
-    assert(!ZSTD_checkCParams(cParams));
-    return ZSTD_adjustCParams_internal(cParams, srcSizeHint, dictSize);
-}
-
-static size_t
-ZSTD_sizeof_matchState(const ZSTD_compressionParameters* const cParams,
-                       const U32 forCCtx)
-{
-    size_t const chainSize = (cParams->strategy == ZSTD_fast) ? 0 : ((size_t)1 << cParams->chainLog);
-    size_t const hSize = ((size_t)1) << cParams->hashLog;
-    U32    const hashLog3 = (forCCtx && cParams->minMatch==3) ? MIN(ZSTD_HASHLOG3_MAX, cParams->windowLog) : 0;
-    size_t const h3Size = ((size_t)1) << hashLog3;
-    size_t const tableSpace = (chainSize + hSize + h3Size) * sizeof(U32);
-    size_t const optPotentialSpace = ((MaxML+1) + (MaxLL+1) + (MaxOff+1) + (1<<Litbits)) * sizeof(U32)
-                          + (ZSTD_OPT_NUM+1) * (sizeof(ZSTD_match_t)+sizeof(ZSTD_optimal_t));
-    size_t const optSpace = (forCCtx && (cParams->strategy >= ZSTD_btopt))
-                                ? optPotentialSpace
-                                : 0;
-    DEBUGLOG(4, "chainSize: %u - hSize: %u - h3Size: %u",
-                (U32)chainSize, (U32)hSize, (U32)h3Size);
-    return tableSpace + optSpace;
-}
-
-size_t ZSTD_estimateCCtxSize_usingCCtxParams(const ZSTD_CCtx_params* params)
-{
-    RETURN_ERROR_IF(params->nbWorkers > 0, GENERIC, "Estimate CCtx size is supported for single-threaded compression only.");
-    {   ZSTD_compressionParameters const cParams =
-                ZSTD_getCParamsFromCCtxParams(params, 0, 0);
-        size_t const blockSize = MIN(ZSTD_BLOCKSIZE_MAX, (size_t)1 << cParams.windowLog);
-        U32    const divider = (cParams.minMatch==3) ? 3 : 4;
-        size_t const maxNbSeq = blockSize / divider;
-        size_t const tokenSpace = WILDCOPY_OVERLENGTH + blockSize + 11*maxNbSeq;
-        size_t const entropySpace = HUF_WORKSPACE_SIZE;
-        size_t const blockStateSpace = 2 * sizeof(ZSTD_compressedBlockState_t);
-        size_t const matchStateSize = ZSTD_sizeof_matchState(&cParams, /* forCCtx */ 1);
-
-        size_t const ldmSpace = ZSTD_ldm_getTableSize(params->ldmParams);
-        size_t const ldmSeqSpace = ZSTD_ldm_getMaxNbSeq(params->ldmParams, blockSize) * sizeof(rawSeq);
-
-        size_t const neededSpace = entropySpace + blockStateSpace + tokenSpace +
-                                   matchStateSize + ldmSpace + ldmSeqSpace;
-
-        DEBUGLOG(5, "sizeof(ZSTD_CCtx) : %u", (U32)sizeof(ZSTD_CCtx));
-        DEBUGLOG(5, "estimate workSpace : %u", (U32)neededSpace);
-        return sizeof(ZSTD_CCtx) + neededSpace;
-    }
-}
-
-size_t ZSTD_estimateCCtxSize_usingCParams(ZSTD_compressionParameters cParams)
-{
-    ZSTD_CCtx_params const params = ZSTD_makeCCtxParamsFromCParams(cParams);
-    return ZSTD_estimateCCtxSize_usingCCtxParams(&params);
-}
-
-static size_t ZSTD_estimateCCtxSize_internal(int compressionLevel)
-{
-    ZSTD_compressionParameters const cParams = ZSTD_getCParams(compressionLevel, 0, 0);
-    return ZSTD_estimateCCtxSize_usingCParams(cParams);
-}
-
-size_t ZSTD_estimateCCtxSize(int compressionLevel)
-{
-    int level;
-    size_t memBudget = 0;
-    for (level=MIN(compressionLevel, 1); level<=compressionLevel; level++) {
-        size_t const newMB = ZSTD_estimateCCtxSize_internal(level);
-        if (newMB > memBudget) memBudget = newMB;
-    }
-    return memBudget;
-}
-
-size_t ZSTD_estimateCStreamSize_usingCCtxParams(const ZSTD_CCtx_params* params)
-{
-    RETURN_ERROR_IF(params->nbWorkers > 0, GENERIC, "Estimate CCtx size is supported for single-threaded compression only.");
-    {   ZSTD_compressionParameters const cParams =
-                ZSTD_getCParamsFromCCtxParams(params, 0, 0);
-        size_t const CCtxSize = ZSTD_estimateCCtxSize_usingCCtxParams(params);
-        size_t const blockSize = MIN(ZSTD_BLOCKSIZE_MAX, (size_t)1 << cParams.windowLog);
-        size_t const inBuffSize = ((size_t)1 << cParams.windowLog) + blockSize;
-        size_t const outBuffSize = ZSTD_compressBound(blockSize) + 1;
-        size_t const streamingSize = inBuffSize + outBuffSize;
-
-        return CCtxSize + streamingSize;
-    }
-}
-
-size_t ZSTD_estimateCStreamSize_usingCParams(ZSTD_compressionParameters cParams)
-{
-    ZSTD_CCtx_params const params = ZSTD_makeCCtxParamsFromCParams(cParams);
-    return ZSTD_estimateCStreamSize_usingCCtxParams(&params);
-}
-
-static size_t ZSTD_estimateCStreamSize_internal(int compressionLevel)
-{
-    ZSTD_compressionParameters const cParams = ZSTD_getCParams(compressionLevel, 0, 0);
-    return ZSTD_estimateCStreamSize_usingCParams(cParams);
-}
-
-size_t ZSTD_estimateCStreamSize(int compressionLevel)
-{
-    int level;
-    size_t memBudget = 0;
-    for (level=MIN(compressionLevel, 1); level<=compressionLevel; level++) {
-        size_t const newMB = ZSTD_estimateCStreamSize_internal(level);
-        if (newMB > memBudget) memBudget = newMB;
-    }
-    return memBudget;
-}
-
-/* ZSTD_getFrameProgression():
- * tells how much data has been consumed (input) and produced (output) for current frame.
- * able to count progression inside worker threads (non-blocking mode).
- */
-ZSTD_frameProgression ZSTD_getFrameProgression(const ZSTD_CCtx* cctx)
-{
-#ifdef ZSTD_MULTITHREAD
-    if (cctx->appliedParams.nbWorkers > 0) {
-        return ZSTDMT_getFrameProgression(cctx->mtctx);
-    }
-#endif
-    {   ZSTD_frameProgression fp;
-        size_t const buffered = (cctx->inBuff == NULL) ? 0 :
-                                cctx->inBuffPos - cctx->inToCompress;
-        if (buffered) assert(cctx->inBuffPos >= cctx->inToCompress);
-        assert(buffered <= ZSTD_BLOCKSIZE_MAX);
-        fp.ingested = cctx->consumedSrcSize + buffered;
-        fp.consumed = cctx->consumedSrcSize;
-        fp.produced = cctx->producedCSize;
-        fp.flushed  = cctx->producedCSize;   /* simplified; some data might still be left within streaming output buffer */
-        fp.currentJobID = 0;
-        fp.nbActiveWorkers = 0;
-        return fp;
-}   }
-
-/*! ZSTD_toFlushNow()
- *  Only useful for multithreading scenarios currently (nbWorkers >= 1).
- */
-size_t ZSTD_toFlushNow(ZSTD_CCtx* cctx)
-{
-#ifdef ZSTD_MULTITHREAD
-    if (cctx->appliedParams.nbWorkers > 0) {
-        return ZSTDMT_toFlushNow(cctx->mtctx);
-    }
-#endif
-    (void)cctx;
-    return 0;   /* over-simplification; could also check if context is currently running in streaming mode, and in which case, report how many bytes are left to be flushed within output buffer */
-}
-
-
-
-static U32 ZSTD_equivalentCParams(ZSTD_compressionParameters cParams1,
-                                  ZSTD_compressionParameters cParams2)
-{
-    return (cParams1.hashLog  == cParams2.hashLog)
-         & (cParams1.chainLog == cParams2.chainLog)
-         & (cParams1.strategy == cParams2.strategy)   /* opt parser space */
-         & ((cParams1.minMatch==3) == (cParams2.minMatch==3));  /* hashlog3 space */
-}
-
-static void ZSTD_assertEqualCParams(ZSTD_compressionParameters cParams1,
-                                    ZSTD_compressionParameters cParams2)
-{
-    (void)cParams1;
-    (void)cParams2;
-    assert(cParams1.windowLog    == cParams2.windowLog);
-    assert(cParams1.chainLog     == cParams2.chainLog);
-    assert(cParams1.hashLog      == cParams2.hashLog);
-    assert(cParams1.searchLog    == cParams2.searchLog);
-    assert(cParams1.minMatch     == cParams2.minMatch);
-    assert(cParams1.targetLength == cParams2.targetLength);
-    assert(cParams1.strategy     == cParams2.strategy);
-}
-
-/** The parameters are equivalent if ldm is not enabled in both sets or
- *  all the parameters are equivalent. */
-static U32 ZSTD_equivalentLdmParams(ldmParams_t ldmParams1,
-                                    ldmParams_t ldmParams2)
-{
-    return (!ldmParams1.enableLdm && !ldmParams2.enableLdm) ||
-           (ldmParams1.enableLdm == ldmParams2.enableLdm &&
-            ldmParams1.hashLog == ldmParams2.hashLog &&
-            ldmParams1.bucketSizeLog == ldmParams2.bucketSizeLog &&
-            ldmParams1.minMatchLength == ldmParams2.minMatchLength &&
-            ldmParams1.hashRateLog == ldmParams2.hashRateLog);
-}
-
-typedef enum { ZSTDb_not_buffered, ZSTDb_buffered } ZSTD_buffered_policy_e;
-
-/* ZSTD_sufficientBuff() :
- * check internal buffers exist for streaming if buffPol == ZSTDb_buffered .
- * Note : they are assumed to be correctly sized if ZSTD_equivalentCParams()==1 */
-static U32 ZSTD_sufficientBuff(size_t bufferSize1, size_t maxNbSeq1,
-                            size_t maxNbLit1,
-                            ZSTD_buffered_policy_e buffPol2,
-                            ZSTD_compressionParameters cParams2,
-                            U64 pledgedSrcSize)
-{
-    size_t const windowSize2 = MAX(1, (size_t)MIN(((U64)1 << cParams2.windowLog), pledgedSrcSize));
-    size_t const blockSize2 = MIN(ZSTD_BLOCKSIZE_MAX, windowSize2);
-    size_t const maxNbSeq2 = blockSize2 / ((cParams2.minMatch == 3) ? 3 : 4);
-    size_t const maxNbLit2 = blockSize2;
-    size_t const neededBufferSize2 = (buffPol2==ZSTDb_buffered) ? windowSize2 + blockSize2 : 0;
-    DEBUGLOG(4, "ZSTD_sufficientBuff: is neededBufferSize2=%u <= bufferSize1=%u",
-                (U32)neededBufferSize2, (U32)bufferSize1);
-    DEBUGLOG(4, "ZSTD_sufficientBuff: is maxNbSeq2=%u <= maxNbSeq1=%u",
-                (U32)maxNbSeq2, (U32)maxNbSeq1);
-    DEBUGLOG(4, "ZSTD_sufficientBuff: is maxNbLit2=%u <= maxNbLit1=%u",
-                (U32)maxNbLit2, (U32)maxNbLit1);
-    return (maxNbLit2 <= maxNbLit1)
-         & (maxNbSeq2 <= maxNbSeq1)
-         & (neededBufferSize2 <= bufferSize1);
-}
-
-/** Equivalence for resetCCtx purposes */
-static U32 ZSTD_equivalentParams(ZSTD_CCtx_params params1,
-                                 ZSTD_CCtx_params params2,
-                                 size_t buffSize1,
-                                 size_t maxNbSeq1, size_t maxNbLit1,
-                                 ZSTD_buffered_policy_e buffPol2,
-                                 U64 pledgedSrcSize)
-{
-    DEBUGLOG(4, "ZSTD_equivalentParams: pledgedSrcSize=%u", (U32)pledgedSrcSize);
-    if (!ZSTD_equivalentCParams(params1.cParams, params2.cParams)) {
-      DEBUGLOG(4, "ZSTD_equivalentCParams() == 0");
-      return 0;
-    }
-    if (!ZSTD_equivalentLdmParams(params1.ldmParams, params2.ldmParams)) {
-      DEBUGLOG(4, "ZSTD_equivalentLdmParams() == 0");
-      return 0;
-    }
-    if (!ZSTD_sufficientBuff(buffSize1, maxNbSeq1, maxNbLit1, buffPol2,
-                             params2.cParams, pledgedSrcSize)) {
-      DEBUGLOG(4, "ZSTD_sufficientBuff() == 0");
-      return 0;
-    }
-    return 1;
-}
-
-static void ZSTD_reset_compressedBlockState(ZSTD_compressedBlockState_t* bs)
-{
-    int i;
-    for (i = 0; i < ZSTD_REP_NUM; ++i)
-        bs->rep[i] = repStartValue[i];
-    bs->entropy.huf.repeatMode = HUF_repeat_none;
-    bs->entropy.fse.offcode_repeatMode = FSE_repeat_none;
-    bs->entropy.fse.matchlength_repeatMode = FSE_repeat_none;
-    bs->entropy.fse.litlength_repeatMode = FSE_repeat_none;
-}
-
-/*! ZSTD_invalidateMatchState()
- *  Invalidate all the matches in the match finder tables.
- *  Requires nextSrc and base to be set (can be NULL).
- */
-static void ZSTD_invalidateMatchState(ZSTD_matchState_t* ms)
-{
-    ZSTD_window_clear(&ms->window);
-
-    ms->nextToUpdate = ms->window.dictLimit;
-    ms->loadedDictEnd = 0;
-    ms->opt.litLengthSum = 0;  /* force reset of btopt stats */
-    ms->dictMatchState = NULL;
-}
-
-/*! ZSTD_continueCCtx() :
- *  reuse CCtx without reset (note : requires no dictionary) */
-static size_t ZSTD_continueCCtx(ZSTD_CCtx* cctx, ZSTD_CCtx_params params, U64 pledgedSrcSize)
-{
-    size_t const windowSize = MAX(1, (size_t)MIN(((U64)1 << params.cParams.windowLog), pledgedSrcSize));
-    size_t const blockSize = MIN(ZSTD_BLOCKSIZE_MAX, windowSize);
-    DEBUGLOG(4, "ZSTD_continueCCtx: re-use context in place");
-
-    cctx->blockSize = blockSize;   /* previous block size could be different even for same windowLog, due to pledgedSrcSize */
-    cctx->appliedParams = params;
-    cctx->blockState.matchState.cParams = params.cParams;
-    cctx->pledgedSrcSizePlusOne = pledgedSrcSize+1;
-    cctx->consumedSrcSize = 0;
-    cctx->producedCSize = 0;
-    if (pledgedSrcSize == ZSTD_CONTENTSIZE_UNKNOWN)
-        cctx->appliedParams.fParams.contentSizeFlag = 0;
-    DEBUGLOG(4, "pledged content size : %u ; flag : %u",
-        (U32)pledgedSrcSize, cctx->appliedParams.fParams.contentSizeFlag);
-    cctx->stage = ZSTDcs_init;
-    cctx->dictID = 0;
-    if (params.ldmParams.enableLdm)
-        ZSTD_window_clear(&cctx->ldmState.window);
-    ZSTD_referenceExternalSequences(cctx, NULL, 0);
-    ZSTD_invalidateMatchState(&cctx->blockState.matchState);
-    ZSTD_reset_compressedBlockState(cctx->blockState.prevCBlock);
-    XXH64_reset(&cctx->xxhState, 0);
-    return 0;
-}
-
-typedef enum { ZSTDcrp_continue, ZSTDcrp_noMemset } ZSTD_compResetPolicy_e;
-
-typedef enum { ZSTD_resetTarget_CDict, ZSTD_resetTarget_CCtx } ZSTD_resetTarget_e;
-
-static void*
-ZSTD_reset_matchState(ZSTD_matchState_t* ms,
-                      void* ptr,
-                const ZSTD_compressionParameters* cParams,
-                      ZSTD_compResetPolicy_e const crp, ZSTD_resetTarget_e const forWho)
-SUPPRESS_UBSAN_CLANG10
-{
-    size_t const chainSize = (cParams->strategy == ZSTD_fast) ? 0 : ((size_t)1 << cParams->chainLog);
-    size_t const hSize = ((size_t)1) << cParams->hashLog;
-    U32    const hashLog3 = ((forWho == ZSTD_resetTarget_CCtx) && cParams->minMatch==3) ? MIN(ZSTD_HASHLOG3_MAX, cParams->windowLog) : 0;
-    size_t const h3Size = ((size_t)1) << hashLog3;
-    size_t const tableSpace = (chainSize + hSize + h3Size) * sizeof(U32);
-
-    assert(((size_t)ptr & 3) == 0);
-
-    ms->hashLog3 = hashLog3;
-    memset(&ms->window, 0, sizeof(ms->window));
-    ms->window.dictLimit = 1;    /* start from 1, so that 1st position is valid */
-    ms->window.lowLimit = 1;     /* it ensures first and later CCtx usages compress the same */
-    ms->window.nextSrc = ms->window.base + 1;   /* see issue #1241 */
-    ZSTD_invalidateMatchState(ms);
-
-    /* opt parser space */
-    if ((forWho == ZSTD_resetTarget_CCtx) && (cParams->strategy >= ZSTD_btopt)) {
-        DEBUGLOG(4, "reserving optimal parser space");
-        ms->opt.litFreq = (unsigned*)ptr;
-        ms->opt.litLengthFreq = ms->opt.litFreq + (1<<Litbits);
-        ms->opt.matchLengthFreq = ms->opt.litLengthFreq + (MaxLL+1);
-        ms->opt.offCodeFreq = ms->opt.matchLengthFreq + (MaxML+1);
-        ptr = ms->opt.offCodeFreq + (MaxOff+1);
-        ms->opt.matchTable = (ZSTD_match_t*)ptr;
-        ptr = ms->opt.matchTable + ZSTD_OPT_NUM+1;
-        ms->opt.priceTable = (ZSTD_optimal_t*)ptr;
-        ptr = ms->opt.priceTable + ZSTD_OPT_NUM+1;
-    }
-
-    /* table Space */
-    DEBUGLOG(4, "reset table : %u", crp!=ZSTDcrp_noMemset);
-    assert(((size_t)ptr & 3) == 0);  /* ensure ptr is properly aligned */
-    if (crp!=ZSTDcrp_noMemset) memset(ptr, 0, tableSpace);   /* reset tables only */
-    ms->hashTable = (U32*)(ptr);
-    ms->chainTable = ms->hashTable + hSize;
-    ms->hashTable3 = ms->chainTable + chainSize;
-    ptr = ms->hashTable3 + h3Size;
-
-    ms->cParams = *cParams;
-
-    assert(((size_t)ptr & 3) == 0);
-    return ptr;
-}
-
-/* ZSTD_indexTooCloseToMax() :
- * minor optimization : prefer memset() rather than reduceIndex()
- * which is measurably slow in some circumstances (reported for Visual Studio).
- * Works when re-using a context for a lot of smallish inputs :
- * if all inputs are smaller than ZSTD_INDEXOVERFLOW_MARGIN,
- * memset() will be triggered before reduceIndex().
- */
-#define ZSTD_INDEXOVERFLOW_MARGIN (16 MB)
-static int ZSTD_indexTooCloseToMax(ZSTD_window_t w)
-{
-    return (size_t)(w.nextSrc - w.base) > (ZSTD_CURRENT_MAX - ZSTD_INDEXOVERFLOW_MARGIN);
-}
-
-#define ZSTD_WORKSPACETOOLARGE_FACTOR 3 /* define "workspace is too large" as this number of times larger than needed */
-#define ZSTD_WORKSPACETOOLARGE_MAXDURATION 128  /* when workspace is continuously too large
-                                         * during at least this number of times,
-                                         * context's memory usage is considered wasteful,
-                                         * because it's sized to handle a worst case scenario which rarely happens.
-                                         * In which case, resize it down to free some memory */
-
-/*! ZSTD_resetCCtx_internal() :
-    note : `params` are assumed fully validated at this stage */
-static size_t ZSTD_resetCCtx_internal(ZSTD_CCtx* zc,
-                                      ZSTD_CCtx_params params,
-                                      U64 const pledgedSrcSize,
-                                      ZSTD_compResetPolicy_e const crp,
-                                      ZSTD_buffered_policy_e const zbuff)
-{
-    DEBUGLOG(4, "ZSTD_resetCCtx_internal: pledgedSrcSize=%u, wlog=%u",
-                (U32)pledgedSrcSize, params.cParams.windowLog);
-    assert(!ZSTD_isError(ZSTD_checkCParams(params.cParams)));
-
-    if (crp == ZSTDcrp_continue) {
-        if (ZSTD_equivalentParams(zc->appliedParams, params,
-                                  zc->inBuffSize,
-                                  zc->seqStore.maxNbSeq, zc->seqStore.maxNbLit,
-                                  zbuff, pledgedSrcSize) ) {
-            DEBUGLOG(4, "ZSTD_equivalentParams()==1 -> consider continue mode");
-            zc->workSpaceOversizedDuration += (zc->workSpaceOversizedDuration > 0);   /* if it was too large, it still is */
-            if (zc->workSpaceOversizedDuration <= ZSTD_WORKSPACETOOLARGE_MAXDURATION) {
-                DEBUGLOG(4, "continue mode confirmed (wLog1=%u, blockSize1=%zu)",
-                            zc->appliedParams.cParams.windowLog, zc->blockSize);
-                if (ZSTD_indexTooCloseToMax(zc->blockState.matchState.window)) {
-                    /* prefer a reset, faster than a rescale */
-                    ZSTD_reset_matchState(&zc->blockState.matchState,
-                                           zc->entropyWorkspace + HUF_WORKSPACE_SIZE_U32,
-                                          &params.cParams,
-                                           crp, ZSTD_resetTarget_CCtx);
-                }
-                return ZSTD_continueCCtx(zc, params, pledgedSrcSize);
-    }   }   }
-    DEBUGLOG(4, "ZSTD_equivalentParams()==0 -> reset CCtx");
-
-    if (params.ldmParams.enableLdm) {
-        /* Adjust long distance matching parameters */
-        ZSTD_ldm_adjustParameters(&params.ldmParams, &params.cParams);
-        assert(params.ldmParams.hashLog >= params.ldmParams.bucketSizeLog);
-        assert(params.ldmParams.hashRateLog < 32);
-        zc->ldmState.hashPower = ZSTD_rollingHash_primePower(params.ldmParams.minMatchLength);
-    }
-
-    {   size_t const windowSize = MAX(1, (size_t)MIN(((U64)1 << params.cParams.windowLog), pledgedSrcSize));
-        size_t const blockSize = MIN(ZSTD_BLOCKSIZE_MAX, windowSize);
-        U32    const divider = (params.cParams.minMatch==3) ? 3 : 4;
-        size_t const maxNbSeq = blockSize / divider;
-        size_t const tokenSpace = WILDCOPY_OVERLENGTH + blockSize + 11*maxNbSeq;
-        size_t const buffOutSize = (zbuff==ZSTDb_buffered) ? ZSTD_compressBound(blockSize)+1 : 0;
-        size_t const buffInSize = (zbuff==ZSTDb_buffered) ? windowSize + blockSize : 0;
-        size_t const matchStateSize = ZSTD_sizeof_matchState(&params.cParams, /* forCCtx */ 1);
-        size_t const maxNbLdmSeq = ZSTD_ldm_getMaxNbSeq(params.ldmParams, blockSize);
-        void* ptr;   /* used to partition workSpace */
-
-        /* Check if workSpace is large enough, alloc a new one if needed */
-        {   size_t const entropySpace = HUF_WORKSPACE_SIZE;
-            size_t const blockStateSpace = 2 * sizeof(ZSTD_compressedBlockState_t);
-            size_t const bufferSpace = buffInSize + buffOutSize;
-            size_t const ldmSpace = ZSTD_ldm_getTableSize(params.ldmParams);
-            size_t const ldmSeqSpace = maxNbLdmSeq * sizeof(rawSeq);
-
-            size_t const neededSpace = entropySpace + blockStateSpace + ldmSpace +
-                                       ldmSeqSpace + matchStateSize + tokenSpace +
-                                       bufferSpace;
-
-            int const workSpaceTooSmall = zc->workSpaceSize < neededSpace;
-            int const workSpaceTooLarge = zc->workSpaceSize > ZSTD_WORKSPACETOOLARGE_FACTOR * neededSpace;
-            int const workSpaceWasteful = workSpaceTooLarge && (zc->workSpaceOversizedDuration > ZSTD_WORKSPACETOOLARGE_MAXDURATION);
-            zc->workSpaceOversizedDuration = workSpaceTooLarge ? zc->workSpaceOversizedDuration+1 : 0;
-
-            DEBUGLOG(4, "Need %zuKB workspace, including %zuKB for match state, and %zuKB for buffers",
-                        neededSpace>>10, matchStateSize>>10, bufferSpace>>10);
-            DEBUGLOG(4, "windowSize: %zu - blockSize: %zu", windowSize, blockSize);
-
-            if (workSpaceTooSmall || workSpaceWasteful) {
-                DEBUGLOG(4, "Resize workSpaceSize from %zuKB to %zuKB",
-                            zc->workSpaceSize >> 10,
-                            neededSpace >> 10);
-
-                RETURN_ERROR_IF(zc->staticSize, memory_allocation, "static cctx : no resize");
-
-                zc->workSpaceSize = 0;
-                ZSTD_free(zc->workSpace, zc->customMem);
-                zc->workSpace = ZSTD_malloc(neededSpace, zc->customMem);
-                RETURN_ERROR_IF(zc->workSpace == NULL, memory_allocation);
-                zc->workSpaceSize = neededSpace;
-                zc->workSpaceOversizedDuration = 0;
-
-                /* Statically sized space.
-                 * entropyWorkspace never moves,
-                 * though prev/next block swap places */
-                assert(((size_t)zc->workSpace & 3) == 0);   /* ensure correct alignment */
-                assert(zc->workSpaceSize >= 2 * sizeof(ZSTD_compressedBlockState_t));
-                zc->blockState.prevCBlock = (ZSTD_compressedBlockState_t*)zc->workSpace;
-                zc->blockState.nextCBlock = zc->blockState.prevCBlock + 1;
-                ptr = zc->blockState.nextCBlock + 1;
-                zc->entropyWorkspace = (U32*)ptr;
-        }   }
-
-        /* init params */
-        zc->appliedParams = params;
-        zc->blockState.matchState.cParams = params.cParams;
-        zc->pledgedSrcSizePlusOne = pledgedSrcSize+1;
-        zc->consumedSrcSize = 0;
-        zc->producedCSize = 0;
-        if (pledgedSrcSize == ZSTD_CONTENTSIZE_UNKNOWN)
-            zc->appliedParams.fParams.contentSizeFlag = 0;
-        DEBUGLOG(4, "pledged content size : %u ; flag : %u",
-            (unsigned)pledgedSrcSize, zc->appliedParams.fParams.contentSizeFlag);
-        zc->blockSize = blockSize;
-
-        XXH64_reset(&zc->xxhState, 0);
-        zc->stage = ZSTDcs_init;
-        zc->dictID = 0;
-
-        ZSTD_reset_compressedBlockState(zc->blockState.prevCBlock);
-
-        ptr = ZSTD_reset_matchState(&zc->blockState.matchState,
-                                     zc->entropyWorkspace + HUF_WORKSPACE_SIZE_U32,
-                                    &params.cParams,
-                                     crp, ZSTD_resetTarget_CCtx);
-
-        /* ldm hash table */
-        /* initialize bucketOffsets table later for pointer alignment */
-        if (params.ldmParams.enableLdm) {
-            size_t const ldmHSize = ((size_t)1) << params.ldmParams.hashLog;
-            memset(ptr, 0, ldmHSize * sizeof(ldmEntry_t));
-            assert(((size_t)ptr & 3) == 0); /* ensure ptr is properly aligned */
-            zc->ldmState.hashTable = (ldmEntry_t*)ptr;
-            ptr = zc->ldmState.hashTable + ldmHSize;
-            zc->ldmSequences = (rawSeq*)ptr;
-            ptr = zc->ldmSequences + maxNbLdmSeq;
-            zc->maxNbLdmSequences = maxNbLdmSeq;
-
-            memset(&zc->ldmState.window, 0, sizeof(zc->ldmState.window));
-        }
-        assert(((size_t)ptr & 3) == 0); /* ensure ptr is properly aligned */
-
-        /* sequences storage */
-        zc->seqStore.maxNbSeq = maxNbSeq;
-        zc->seqStore.sequencesStart = (seqDef*)ptr;
-        ptr = zc->seqStore.sequencesStart + maxNbSeq;
-        zc->seqStore.llCode = (BYTE*) ptr;
-        zc->seqStore.mlCode = zc->seqStore.llCode + maxNbSeq;
-        zc->seqStore.ofCode = zc->seqStore.mlCode + maxNbSeq;
-        zc->seqStore.litStart = zc->seqStore.ofCode + maxNbSeq;
-        /* ZSTD_wildcopy() is used to copy into the literals buffer,
-         * so we have to oversize the buffer by WILDCOPY_OVERLENGTH bytes.
-         */
-        zc->seqStore.maxNbLit = blockSize;
-        ptr = zc->seqStore.litStart + blockSize + WILDCOPY_OVERLENGTH;
-
-        /* ldm bucketOffsets table */
-        if (params.ldmParams.enableLdm) {
-            size_t const ldmBucketSize =
-                  ((size_t)1) << (params.ldmParams.hashLog -
-                                  params.ldmParams.bucketSizeLog);
-            memset(ptr, 0, ldmBucketSize);
-            zc->ldmState.bucketOffsets = (BYTE*)ptr;
-            ptr = zc->ldmState.bucketOffsets + ldmBucketSize;
-            ZSTD_window_clear(&zc->ldmState.window);
-        }
-        ZSTD_referenceExternalSequences(zc, NULL, 0);
-
-        /* buffers */
-        zc->inBuffSize = buffInSize;
-        zc->inBuff = (char*)ptr;
-        zc->outBuffSize = buffOutSize;
-        zc->outBuff = zc->inBuff + buffInSize;
-
-        return 0;
-    }
-}
-
-/* ZSTD_invalidateRepCodes() :
- * ensures next compression will not use repcodes from previous block.
- * Note : only works with regular variant;
- *        do not use with extDict variant ! */
-void ZSTD_invalidateRepCodes(ZSTD_CCtx* cctx) {
-    int i;
-    for (i=0; i<ZSTD_REP_NUM; i++) cctx->blockState.prevCBlock->rep[i] = 0;
-    assert(!ZSTD_window_hasExtDict(cctx->blockState.matchState.window));
-}
-
-/* These are the approximate sizes for each strategy past which copying the
- * dictionary tables into the working context is faster than using them
- * in-place.
- */
-static const size_t attachDictSizeCutoffs[ZSTD_STRATEGY_MAX+1] = {
-    8 KB,  /* unused */
-    8 KB,  /* ZSTD_fast */
-    16 KB, /* ZSTD_dfast */
-    32 KB, /* ZSTD_greedy */
-    32 KB, /* ZSTD_lazy */
-    32 KB, /* ZSTD_lazy2 */
-    32 KB, /* ZSTD_btlazy2 */
-    32 KB, /* ZSTD_btopt */
-    8 KB,  /* ZSTD_btultra */
-    8 KB   /* ZSTD_btultra2 */
-};
-
-static int ZSTD_shouldAttachDict(const ZSTD_CDict* cdict,
-                                 ZSTD_CCtx_params params,
-                                 U64 pledgedSrcSize)
-{
-    size_t cutoff = attachDictSizeCutoffs[cdict->matchState.cParams.strategy];
-    return ( pledgedSrcSize <= cutoff
-          || pledgedSrcSize == ZSTD_CONTENTSIZE_UNKNOWN
-          || params.attachDictPref == ZSTD_dictForceAttach )
-        && params.attachDictPref != ZSTD_dictForceCopy
-        && !params.forceWindow; /* dictMatchState isn't correctly
-                                 * handled in _enforceMaxDist */
-}
-
-static size_t
-ZSTD_resetCCtx_byAttachingCDict(ZSTD_CCtx* cctx,
-                        const ZSTD_CDict* cdict,
-                        ZSTD_CCtx_params params,
-                        U64 pledgedSrcSize,
-                        ZSTD_buffered_policy_e zbuff)
-{
-    {   const ZSTD_compressionParameters* const cdict_cParams = &cdict->matchState.cParams;
-        unsigned const windowLog = params.cParams.windowLog;
-        assert(windowLog != 0);
-        /* Resize working context table params for input only, since the dict
-         * has its own tables. */
-        params.cParams = ZSTD_adjustCParams_internal(*cdict_cParams, pledgedSrcSize, 0);
-        params.cParams.windowLog = windowLog;
-        ZSTD_resetCCtx_internal(cctx, params, pledgedSrcSize,
-                                ZSTDcrp_continue, zbuff);
-        assert(cctx->appliedParams.cParams.strategy == cdict_cParams->strategy);
-    }
-
-    {   const U32 cdictEnd = (U32)( cdict->matchState.window.nextSrc
-                                  - cdict->matchState.window.base);
-        const U32 cdictLen = cdictEnd - cdict->matchState.window.dictLimit;
-        if (cdictLen == 0) {
-            /* don't even attach dictionaries with no contents */
-            DEBUGLOG(4, "skipping attaching empty dictionary");
-        } else {
-            DEBUGLOG(4, "attaching dictionary into context");
-            cctx->blockState.matchState.dictMatchState = &cdict->matchState;
-
-            /* prep working match state so dict matches never have negative indices
-             * when they are translated to the working context's index space. */
-            if (cctx->blockState.matchState.window.dictLimit < cdictEnd) {
-                cctx->blockState.matchState.window.nextSrc =
-                    cctx->blockState.matchState.window.base + cdictEnd;
-                ZSTD_window_clear(&cctx->blockState.matchState.window);
-            }
-            /* loadedDictEnd is expressed within the referential of the active context */
-            cctx->blockState.matchState.loadedDictEnd = cctx->blockState.matchState.window.dictLimit;
-    }   }
-
-    cctx->dictID = cdict->dictID;
-
-    /* copy block state */
-    memcpy(cctx->blockState.prevCBlock, &cdict->cBlockState, sizeof(cdict->cBlockState));
-
-    return 0;
-}
-
-static size_t ZSTD_resetCCtx_byCopyingCDict(ZSTD_CCtx* cctx,
-                            const ZSTD_CDict* cdict,
-                            ZSTD_CCtx_params params,
-                            U64 pledgedSrcSize,
-                            ZSTD_buffered_policy_e zbuff)
-{
-    const ZSTD_compressionParameters *cdict_cParams = &cdict->matchState.cParams;
-
-    DEBUGLOG(4, "copying dictionary into context");
-
-    {   unsigned const windowLog = params.cParams.windowLog;
-        assert(windowLog != 0);
-        /* Copy only compression parameters related to tables. */
-        params.cParams = *cdict_cParams;
-        params.cParams.windowLog = windowLog;
-        ZSTD_resetCCtx_internal(cctx, params, pledgedSrcSize,
-                                ZSTDcrp_noMemset, zbuff);
-        assert(cctx->appliedParams.cParams.strategy == cdict_cParams->strategy);
-        assert(cctx->appliedParams.cParams.hashLog == cdict_cParams->hashLog);
-        assert(cctx->appliedParams.cParams.chainLog == cdict_cParams->chainLog);
-    }
-
-    /* copy tables */
-    {   size_t const chainSize = (cdict_cParams->strategy == ZSTD_fast) ? 0 : ((size_t)1 << cdict_cParams->chainLog);
-        size_t const hSize =  (size_t)1 << cdict_cParams->hashLog;
-        size_t const tableSpace = (chainSize + hSize) * sizeof(U32);
-        assert((U32*)cctx->blockState.matchState.chainTable == (U32*)cctx->blockState.matchState.hashTable + hSize);  /* chainTable must follow hashTable */
-        assert((U32*)cctx->blockState.matchState.hashTable3 == (U32*)cctx->blockState.matchState.chainTable + chainSize);
-        assert((U32*)cdict->matchState.chainTable == (U32*)cdict->matchState.hashTable + hSize);  /* chainTable must follow hashTable */
-        assert((U32*)cdict->matchState.hashTable3 == (U32*)cdict->matchState.chainTable + chainSize);
-        memcpy(cctx->blockState.matchState.hashTable, cdict->matchState.hashTable, tableSpace);   /* presumes all tables follow each other */
-    }
-
-    /* Zero the hashTable3, since the cdict never fills it */
-    {   size_t const h3Size = (size_t)1 << cctx->blockState.matchState.hashLog3;
-        assert(cdict->matchState.hashLog3 == 0);
-        memset(cctx->blockState.matchState.hashTable3, 0, h3Size * sizeof(U32));
-    }
-
-    /* copy dictionary offsets */
-    {   ZSTD_matchState_t const* srcMatchState = &cdict->matchState;
-        ZSTD_matchState_t* dstMatchState = &cctx->blockState.matchState;
-        dstMatchState->window       = srcMatchState->window;
-        dstMatchState->nextToUpdate = srcMatchState->nextToUpdate;
-        dstMatchState->loadedDictEnd= srcMatchState->loadedDictEnd;
-    }
-
-    cctx->dictID = cdict->dictID;
-
-    /* copy block state */
-    memcpy(cctx->blockState.prevCBlock, &cdict->cBlockState, sizeof(cdict->cBlockState));
-
-    return 0;
-}
-
-/* We have a choice between copying the dictionary context into the working
- * context, or referencing the dictionary context from the working context
- * in-place. We decide here which strategy to use. */
-static size_t ZSTD_resetCCtx_usingCDict(ZSTD_CCtx* cctx,
-                            const ZSTD_CDict* cdict,
-                            ZSTD_CCtx_params params,
-                            U64 pledgedSrcSize,
-                            ZSTD_buffered_policy_e zbuff)
-{
-
-    DEBUGLOG(4, "ZSTD_resetCCtx_usingCDict (pledgedSrcSize=%u)",
-                (unsigned)pledgedSrcSize);
-
-    if (ZSTD_shouldAttachDict(cdict, params, pledgedSrcSize)) {
-        return ZSTD_resetCCtx_byAttachingCDict(
-            cctx, cdict, params, pledgedSrcSize, zbuff);
-    } else {
-        return ZSTD_resetCCtx_byCopyingCDict(
-            cctx, cdict, params, pledgedSrcSize, zbuff);
-    }
-}
-
-/*! ZSTD_copyCCtx_internal() :
- *  Duplicate an existing context `srcCCtx` into another one `dstCCtx`.
- *  Only works during stage ZSTDcs_init (i.e. after creation, but before first call to ZSTD_compressContinue()).
- *  The "context", in this case, refers to the hash and chain tables,
- *  entropy tables, and dictionary references.
- * `windowLog` value is enforced if != 0, otherwise value is copied from srcCCtx.
- * @return : 0, or an error code */
-static size_t ZSTD_copyCCtx_internal(ZSTD_CCtx* dstCCtx,
-                            const ZSTD_CCtx* srcCCtx,
-                            ZSTD_frameParameters fParams,
-                            U64 pledgedSrcSize,
-                            ZSTD_buffered_policy_e zbuff)
-{
-    DEBUGLOG(5, "ZSTD_copyCCtx_internal");
-    RETURN_ERROR_IF(srcCCtx->stage!=ZSTDcs_init, stage_wrong);
-
-    memcpy(&dstCCtx->customMem, &srcCCtx->customMem, sizeof(ZSTD_customMem));
-    {   ZSTD_CCtx_params params = dstCCtx->requestedParams;
-        /* Copy only compression parameters related to tables. */
-        params.cParams = srcCCtx->appliedParams.cParams;
-        params.fParams = fParams;
-        ZSTD_resetCCtx_internal(dstCCtx, params, pledgedSrcSize,
-                                ZSTDcrp_noMemset, zbuff);
-        assert(dstCCtx->appliedParams.cParams.windowLog == srcCCtx->appliedParams.cParams.windowLog);
-        assert(dstCCtx->appliedParams.cParams.strategy == srcCCtx->appliedParams.cParams.strategy);
-        assert(dstCCtx->appliedParams.cParams.hashLog == srcCCtx->appliedParams.cParams.hashLog);
-        assert(dstCCtx->appliedParams.cParams.chainLog == srcCCtx->appliedParams.cParams.chainLog);
-        assert(dstCCtx->blockState.matchState.hashLog3 == srcCCtx->blockState.matchState.hashLog3);
-    }
-
-    /* copy tables */
-    {   size_t const chainSize = (srcCCtx->appliedParams.cParams.strategy == ZSTD_fast) ? 0 : ((size_t)1 << srcCCtx->appliedParams.cParams.chainLog);
-        size_t const hSize =  (size_t)1 << srcCCtx->appliedParams.cParams.hashLog;
-        size_t const h3Size = (size_t)1 << srcCCtx->blockState.matchState.hashLog3;
-        size_t const tableSpace = (chainSize + hSize + h3Size) * sizeof(U32);
-        assert((U32*)dstCCtx->blockState.matchState.chainTable == (U32*)dstCCtx->blockState.matchState.hashTable + hSize);  /* chainTable must follow hashTable */
-        assert((U32*)dstCCtx->blockState.matchState.hashTable3 == (U32*)dstCCtx->blockState.matchState.chainTable + chainSize);
-        memcpy(dstCCtx->blockState.matchState.hashTable, srcCCtx->blockState.matchState.hashTable, tableSpace);   /* presumes all tables follow each other */
-    }
-
-    /* copy dictionary offsets */
-    {
-        const ZSTD_matchState_t* srcMatchState = &srcCCtx->blockState.matchState;
-        ZSTD_matchState_t* dstMatchState = &dstCCtx->blockState.matchState;
-        dstMatchState->window       = srcMatchState->window;
-        dstMatchState->nextToUpdate = srcMatchState->nextToUpdate;
-        dstMatchState->loadedDictEnd= srcMatchState->loadedDictEnd;
-    }
-    dstCCtx->dictID = srcCCtx->dictID;
-
-    /* copy block state */
-    memcpy(dstCCtx->blockState.prevCBlock, srcCCtx->blockState.prevCBlock, sizeof(*srcCCtx->blockState.prevCBlock));
-
-    return 0;
-}
-
-/*! ZSTD_copyCCtx() :
- *  Duplicate an existing context `srcCCtx` into another one `dstCCtx`.
- *  Only works during stage ZSTDcs_init (i.e. after creation, but before first call to ZSTD_compressContinue()).
- *  pledgedSrcSize==0 means "unknown".
-*   @return : 0, or an error code */
-size_t ZSTD_copyCCtx(ZSTD_CCtx* dstCCtx, const ZSTD_CCtx* srcCCtx, unsigned long long pledgedSrcSize)
-{
-    ZSTD_frameParameters fParams = { 1 /*content*/, 0 /*checksum*/, 0 /*noDictID*/ };
-    ZSTD_buffered_policy_e const zbuff = (ZSTD_buffered_policy_e)(srcCCtx->inBuffSize>0);
-    ZSTD_STATIC_ASSERT((U32)ZSTDb_buffered==1);
-    if (pledgedSrcSize==0) pledgedSrcSize = ZSTD_CONTENTSIZE_UNKNOWN;
-    fParams.contentSizeFlag = (pledgedSrcSize != ZSTD_CONTENTSIZE_UNKNOWN);
-
-    return ZSTD_copyCCtx_internal(dstCCtx, srcCCtx,
-                                fParams, pledgedSrcSize,
-                                zbuff);
-}
-
-
-#define ZSTD_ROWSIZE 16
-/*! ZSTD_reduceTable() :
- *  reduce table indexes by `reducerValue`, or squash to zero.
- *  PreserveMark preserves "unsorted mark" for btlazy2 strategy.
- *  It must be set to a clear 0/1 value, to remove branch during inlining.
- *  Presume table size is a multiple of ZSTD_ROWSIZE
- *  to help auto-vectorization */
-FORCE_INLINE_TEMPLATE void
-ZSTD_reduceTable_internal (U32* const table, U32 const size, U32 const reducerValue, int const preserveMark)
-{
-    int const nbRows = (int)size / ZSTD_ROWSIZE;
-    int cellNb = 0;
-    int rowNb;
-    assert((size & (ZSTD_ROWSIZE-1)) == 0);  /* multiple of ZSTD_ROWSIZE */
-    assert(size < (1U<<31));   /* can be casted to int */
-    for (rowNb=0 ; rowNb < nbRows ; rowNb++) {
-        int column;
-        for (column=0; column<ZSTD_ROWSIZE; column++) {
-            if (preserveMark) {
-                U32 const adder = (table[cellNb] == ZSTD_DUBT_UNSORTED_MARK) ? reducerValue : 0;
-                table[cellNb] += adder;
-            }
-            if (table[cellNb] < reducerValue) table[cellNb] = 0;
-            else table[cellNb] -= reducerValue;
-            cellNb++;
-    }   }
-}
-
-static void ZSTD_reduceTable(U32* const table, U32 const size, U32 const reducerValue)
-{
-    ZSTD_reduceTable_internal(table, size, reducerValue, 0);
-}
-
-static void ZSTD_reduceTable_btlazy2(U32* const table, U32 const size, U32 const reducerValue)
-{
-    ZSTD_reduceTable_internal(table, size, reducerValue, 1);
-}
-
-/*! ZSTD_reduceIndex() :
-*   rescale all indexes to avoid future overflow (indexes are U32) */
-static void ZSTD_reduceIndex (ZSTD_matchState_t* ms, ZSTD_CCtx_params const* params, const U32 reducerValue)
-{
-    {   U32 const hSize = (U32)1 << params->cParams.hashLog;
-        ZSTD_reduceTable(ms->hashTable, hSize, reducerValue);
-    }
-
-    if (params->cParams.strategy != ZSTD_fast) {
-        U32 const chainSize = (U32)1 << params->cParams.chainLog;
-        if (params->cParams.strategy == ZSTD_btlazy2)
-            ZSTD_reduceTable_btlazy2(ms->chainTable, chainSize, reducerValue);
-        else
-            ZSTD_reduceTable(ms->chainTable, chainSize, reducerValue);
-    }
-
-    if (ms->hashLog3) {
-        U32 const h3Size = (U32)1 << ms->hashLog3;
-        ZSTD_reduceTable(ms->hashTable3, h3Size, reducerValue);
-    }
-}
-
-
-/*-*******************************************************
-*  Block entropic compression
-*********************************************************/
-
-/* See doc/zstd_compression_format.md for detailed format description */
-
-static size_t ZSTD_noCompressBlock (void* dst, size_t dstCapacity, const void* src, size_t srcSize, U32 lastBlock)
-{
-    U32 const cBlockHeader24 = lastBlock + (((U32)bt_raw)<<1) + (U32)(srcSize << 3);
-    RETURN_ERROR_IF(srcSize + ZSTD_blockHeaderSize > dstCapacity,
-                    dstSize_tooSmall);
-    MEM_writeLE24(dst, cBlockHeader24);
-    memcpy((BYTE*)dst + ZSTD_blockHeaderSize, src, srcSize);
-    return ZSTD_blockHeaderSize + srcSize;
-}
-
-void ZSTD_seqToCodes(const seqStore_t* seqStorePtr)
-{
-    const seqDef* const sequences = seqStorePtr->sequencesStart;
-    BYTE* const llCodeTable = seqStorePtr->llCode;
-    BYTE* const ofCodeTable = seqStorePtr->ofCode;
-    BYTE* const mlCodeTable = seqStorePtr->mlCode;
-    U32 const nbSeq = (U32)(seqStorePtr->sequences - seqStorePtr->sequencesStart);
-    U32 u;
-    assert(nbSeq <= seqStorePtr->maxNbSeq);
-    for (u=0; u<nbSeq; u++) {
-        U32 const llv = sequences[u].litLength;
-        U32 const mlv = sequences[u].matchLength;
-        llCodeTable[u] = (BYTE)ZSTD_LLcode(llv);
-        ofCodeTable[u] = (BYTE)ZSTD_highbit32(sequences[u].offset);
-        mlCodeTable[u] = (BYTE)ZSTD_MLcode(mlv);
-    }
-    if (seqStorePtr->longLengthID==1)
-        llCodeTable[seqStorePtr->longLengthPos] = MaxLL;
-    if (seqStorePtr->longLengthID==2)
-        mlCodeTable[seqStorePtr->longLengthPos] = MaxML;
-}
-
-static int ZSTD_disableLiteralsCompression(const ZSTD_CCtx_params* cctxParams)
-{
-    switch (cctxParams->literalCompressionMode) {
-    case ZSTD_lcm_huffman:
-        return 0;
-    case ZSTD_lcm_uncompressed:
-        return 1;
-    default:
-        assert(0 /* impossible: pre-validated */);
-        /* fall-through */
-    case ZSTD_lcm_auto:
-        return (cctxParams->cParams.strategy == ZSTD_fast) && (cctxParams->cParams.targetLength > 0);
-    }
-}
-
-/* ZSTD_compressSequences_internal():
- * actually compresses both literals and sequences */
-MEM_STATIC size_t
-ZSTD_compressSequences_internal(seqStore_t* seqStorePtr,
-                          const ZSTD_entropyCTables_t* prevEntropy,
-                                ZSTD_entropyCTables_t* nextEntropy,
-                          const ZSTD_CCtx_params* cctxParams,
-                                void* dst, size_t dstCapacity,
-                                void* workspace, size_t wkspSize,
-                          const int bmi2)
-{
-    const int longOffsets = cctxParams->cParams.windowLog > STREAM_ACCUMULATOR_MIN;
-    ZSTD_strategy const strategy = cctxParams->cParams.strategy;
-    unsigned count[MaxSeq+1];
-    FSE_CTable* CTable_LitLength = nextEntropy->fse.litlengthCTable;
-    FSE_CTable* CTable_OffsetBits = nextEntropy->fse.offcodeCTable;
-    FSE_CTable* CTable_MatchLength = nextEntropy->fse.matchlengthCTable;
-    U32 LLtype, Offtype, MLtype;   /* compressed, raw or rle */
-    const seqDef* const sequences = seqStorePtr->sequencesStart;
-    const BYTE* const ofCodeTable = seqStorePtr->ofCode;
-    const BYTE* const llCodeTable = seqStorePtr->llCode;
-    const BYTE* const mlCodeTable = seqStorePtr->mlCode;
-    BYTE* const ostart = (BYTE*)dst;
-    BYTE* const oend = ostart + dstCapacity;
-    BYTE* op = ostart;
-    size_t const nbSeq = (size_t)(seqStorePtr->sequences - seqStorePtr->sequencesStart);
-    BYTE* seqHead;
-    BYTE* lastNCount = NULL;
-
-    DEBUGLOG(5, "ZSTD_compressSequences_internal (nbSeq=%zu)", nbSeq);
-    ZSTD_STATIC_ASSERT(HUF_WORKSPACE_SIZE >= (1<<MAX(MLFSELog,LLFSELog)));
-
-    /* Compress literals */
-    {   const BYTE* const literals = seqStorePtr->litStart;
-        size_t const litSize = (size_t)(seqStorePtr->lit - literals);
-        size_t const cSize = ZSTD_compressLiterals(
-                                    &prevEntropy->huf, &nextEntropy->huf,
-                                    cctxParams->cParams.strategy,
-                                    ZSTD_disableLiteralsCompression(cctxParams),
-                                    op, dstCapacity,
-                                    literals, litSize,
-                                    workspace, wkspSize,
-                                    bmi2);
-        FORWARD_IF_ERROR(cSize);
-        assert(cSize <= dstCapacity);
-        op += cSize;
-    }
-
-    /* Sequences Header */
-    RETURN_ERROR_IF((oend-op) < 3 /*max nbSeq Size*/ + 1 /*seqHead*/,
-                    dstSize_tooSmall);
-    if (nbSeq < 0x7F)
-        *op++ = (BYTE)nbSeq;
-    else if (nbSeq < LONGNBSEQ)
-        op[0] = (BYTE)((nbSeq>>8) + 0x80), op[1] = (BYTE)nbSeq, op+=2;
-    else
-        op[0]=0xFF, MEM_writeLE16(op+1, (U16)(nbSeq - LONGNBSEQ)), op+=3;
-    assert(op <= oend);
-    if (nbSeq==0) {
-        /* Copy the old tables over as if we repeated them */
-        memcpy(&nextEntropy->fse, &prevEntropy->fse, sizeof(prevEntropy->fse));
-        return (size_t)(op - ostart);
-    }
-
-    /* seqHead : flags for FSE encoding type */
-    seqHead = op++;
-    assert(op <= oend);
-
-    /* convert length/distances into codes */
-    ZSTD_seqToCodes(seqStorePtr);
-    /* build CTable for Literal Lengths */
-    {   unsigned max = MaxLL;
-        size_t const mostFrequent = HIST_countFast_wksp(count, &max, llCodeTable, nbSeq, workspace, wkspSize);   /* can't fail */
-        DEBUGLOG(5, "Building LL table");
-        nextEntropy->fse.litlength_repeatMode = prevEntropy->fse.litlength_repeatMode;
-        LLtype = ZSTD_selectEncodingType(&nextEntropy->fse.litlength_repeatMode,
-                                        count, max, mostFrequent, nbSeq,
-                                        LLFSELog, prevEntropy->fse.litlengthCTable,
-                                        LL_defaultNorm, LL_defaultNormLog,
-                                        ZSTD_defaultAllowed, strategy);
-        assert(set_basic < set_compressed && set_rle < set_compressed);
-        assert(!(LLtype < set_compressed && nextEntropy->fse.litlength_repeatMode != FSE_repeat_none)); /* We don't copy tables */
-        {   size_t const countSize = ZSTD_buildCTable(op, (size_t)(oend - op), CTable_LitLength, LLFSELog, (symbolEncodingType_e)LLtype,
-                                                    count, max, llCodeTable, nbSeq, LL_defaultNorm, LL_defaultNormLog, MaxLL,
-                                                    prevEntropy->fse.litlengthCTable, sizeof(prevEntropy->fse.litlengthCTable),
-                                                    workspace, wkspSize);
-            FORWARD_IF_ERROR(countSize);
-            if (LLtype == set_compressed)
-                lastNCount = op;
-            op += countSize;
-            assert(op <= oend);
-    }   }
-    /* build CTable for Offsets */
-    {   unsigned max = MaxOff;
-        size_t const mostFrequent = HIST_countFast_wksp(count, &max, ofCodeTable, nbSeq, workspace, wkspSize);  /* can't fail */
-        /* We can only use the basic table if max <= DefaultMaxOff, otherwise the offsets are too large */
-        ZSTD_defaultPolicy_e const defaultPolicy = (max <= DefaultMaxOff) ? ZSTD_defaultAllowed : ZSTD_defaultDisallowed;
-        DEBUGLOG(5, "Building OF table");
-        nextEntropy->fse.offcode_repeatMode = prevEntropy->fse.offcode_repeatMode;
-        Offtype = ZSTD_selectEncodingType(&nextEntropy->fse.offcode_repeatMode,
-                                        count, max, mostFrequent, nbSeq,
-                                        OffFSELog, prevEntropy->fse.offcodeCTable,
-                                        OF_defaultNorm, OF_defaultNormLog,
-                                        defaultPolicy, strategy);
-        assert(!(Offtype < set_compressed && nextEntropy->fse.offcode_repeatMode != FSE_repeat_none)); /* We don't copy tables */
-        {   size_t const countSize = ZSTD_buildCTable(op, (size_t)(oend - op), CTable_OffsetBits, OffFSELog, (symbolEncodingType_e)Offtype,
-                                                    count, max, ofCodeTable, nbSeq, OF_defaultNorm, OF_defaultNormLog, DefaultMaxOff,
-                                                    prevEntropy->fse.offcodeCTable, sizeof(prevEntropy->fse.offcodeCTable),
-                                                    workspace, wkspSize);
-            FORWARD_IF_ERROR(countSize);
-            if (Offtype == set_compressed)
-                lastNCount = op;
-            op += countSize;
-            assert(op <= oend);
-    }   }
-    /* build CTable for MatchLengths */
-    {   unsigned max = MaxML;
-        size_t const mostFrequent = HIST_countFast_wksp(count, &max, mlCodeTable, nbSeq, workspace, wkspSize);   /* can't fail */
-        DEBUGLOG(5, "Building ML table (remaining space : %i)", (int)(oend-op));
-        nextEntropy->fse.matchlength_repeatMode = prevEntropy->fse.matchlength_repeatMode;
-        MLtype = ZSTD_selectEncodingType(&nextEntropy->fse.matchlength_repeatMode,
-                                        count, max, mostFrequent, nbSeq,
-                                        MLFSELog, prevEntropy->fse.matchlengthCTable,
-                                        ML_defaultNorm, ML_defaultNormLog,
-                                        ZSTD_defaultAllowed, strategy);
-        assert(!(MLtype < set_compressed && nextEntropy->fse.matchlength_repeatMode != FSE_repeat_none)); /* We don't copy tables */
-        {   size_t const countSize = ZSTD_buildCTable(op, (size_t)(oend - op), CTable_MatchLength, MLFSELog, (symbolEncodingType_e)MLtype,
-                                                    count, max, mlCodeTable, nbSeq, ML_defaultNorm, ML_defaultNormLog, MaxML,
-                                                    prevEntropy->fse.matchlengthCTable, sizeof(prevEntropy->fse.matchlengthCTable),
-                                                    workspace, wkspSize);
-            FORWARD_IF_ERROR(countSize);
-            if (MLtype == set_compressed)
-                lastNCount = op;
-            op += countSize;
-            assert(op <= oend);
-    }   }
-
-    *seqHead = (BYTE)((LLtype<<6) + (Offtype<<4) + (MLtype<<2));
-
-    {   size_t const bitstreamSize = ZSTD_encodeSequences(
-                                        op, (size_t)(oend - op),
-                                        CTable_MatchLength, mlCodeTable,
-                                        CTable_OffsetBits, ofCodeTable,
-                                        CTable_LitLength, llCodeTable,
-                                        sequences, nbSeq,
-                                        longOffsets, bmi2);
-        FORWARD_IF_ERROR(bitstreamSize);
-        op += bitstreamSize;
-        assert(op <= oend);
-        /* zstd versions <= 1.3.4 mistakenly report corruption when
-         * FSE_readNCount() receives a buffer < 4 bytes.
-         * Fixed by https://github.com/facebook/zstd/pull/1146.
-         * This can happen when the last set_compressed table present is 2
-         * bytes and the bitstream is only one byte.
-         * In this exceedingly rare case, we will simply emit an uncompressed
-         * block, since it isn't worth optimizing.
-         */
-        if (lastNCount && (op - lastNCount) < 4) {
-            /* NCountSize >= 2 && bitstreamSize > 0 ==> lastCountSize == 3 */
-            assert(op - lastNCount == 3);
-            DEBUGLOG(5, "Avoiding bug in zstd decoder in versions <= 1.3.4 by "
-                        "emitting an uncompressed block.");
-            return 0;
-        }
-    }
-
-    DEBUGLOG(5, "compressed block size : %u", (unsigned)(op - ostart));
-    return (size_t)(op - ostart);
-}
-
-MEM_STATIC size_t
-ZSTD_compressSequences(seqStore_t* seqStorePtr,
-                       const ZSTD_entropyCTables_t* prevEntropy,
-                             ZSTD_entropyCTables_t* nextEntropy,
-                       const ZSTD_CCtx_params* cctxParams,
-                             void* dst, size_t dstCapacity,
-                             size_t srcSize,
-                             void* workspace, size_t wkspSize,
-                             int bmi2)
-{
-    size_t const cSize = ZSTD_compressSequences_internal(
-                            seqStorePtr, prevEntropy, nextEntropy, cctxParams,
-                            dst, dstCapacity,
-                            workspace, wkspSize, bmi2);
-    if (cSize == 0) return 0;
-    /* When srcSize <= dstCapacity, there is enough space to write a raw uncompressed block.
-     * Since we ran out of space, block must be not compressible, so fall back to raw uncompressed block.
-     */
-    if ((cSize == ERROR(dstSize_tooSmall)) & (srcSize <= dstCapacity))
-        return 0;  /* block not compressed */
-    FORWARD_IF_ERROR(cSize);
-
-    /* Check compressibility */
-    {   size_t const maxCSize = srcSize - ZSTD_minGain(srcSize, cctxParams->cParams.strategy);
-        if (cSize >= maxCSize) return 0;  /* block not compressed */
-    }
-
-    return cSize;
-}
-
-/* ZSTD_selectBlockCompressor() :
- * Not static, but internal use only (used by long distance matcher)
- * assumption : strat is a valid strategy */
-ZSTD_blockCompressor ZSTD_selectBlockCompressor(ZSTD_strategy strat, ZSTD_dictMode_e dictMode)
-{
-    static const ZSTD_blockCompressor blockCompressor[3][ZSTD_STRATEGY_MAX+1] = {
-        { ZSTD_compressBlock_fast  /* default for 0 */,
-          ZSTD_compressBlock_fast,
-          ZSTD_compressBlock_doubleFast,
-          ZSTD_compressBlock_greedy,
-          ZSTD_compressBlock_lazy,
-          ZSTD_compressBlock_lazy2,
-          ZSTD_compressBlock_btlazy2,
-          ZSTD_compressBlock_btopt,
-          ZSTD_compressBlock_btultra,
-          ZSTD_compressBlock_btultra2 },
-        { ZSTD_compressBlock_fast_extDict  /* default for 0 */,
-          ZSTD_compressBlock_fast_extDict,
-          ZSTD_compressBlock_doubleFast_extDict,
-          ZSTD_compressBlock_greedy_extDict,
-          ZSTD_compressBlock_lazy_extDict,
-          ZSTD_compressBlock_lazy2_extDict,
-          ZSTD_compressBlock_btlazy2_extDict,
-          ZSTD_compressBlock_btopt_extDict,
-          ZSTD_compressBlock_btultra_extDict,
-          ZSTD_compressBlock_btultra_extDict },
-        { ZSTD_compressBlock_fast_dictMatchState  /* default for 0 */,
-          ZSTD_compressBlock_fast_dictMatchState,
-          ZSTD_compressBlock_doubleFast_dictMatchState,
-          ZSTD_compressBlock_greedy_dictMatchState,
-          ZSTD_compressBlock_lazy_dictMatchState,
-          ZSTD_compressBlock_lazy2_dictMatchState,
-          ZSTD_compressBlock_btlazy2_dictMatchState,
-          ZSTD_compressBlock_btopt_dictMatchState,
-          ZSTD_compressBlock_btultra_dictMatchState,
-          ZSTD_compressBlock_btultra_dictMatchState }
-    };
-    ZSTD_blockCompressor selectedCompressor;
-    ZSTD_STATIC_ASSERT((unsigned)ZSTD_fast == 1);
-
-    assert(ZSTD_cParam_withinBounds(ZSTD_c_strategy, strat));
-    selectedCompressor = blockCompressor[(int)dictMode][(int)strat];
-    assert(selectedCompressor != NULL);
-    return selectedCompressor;
-}
-
-static void ZSTD_storeLastLiterals(seqStore_t* seqStorePtr,
-                                   const BYTE* anchor, size_t lastLLSize)
-{
-    memcpy(seqStorePtr->lit, anchor, lastLLSize);
-    seqStorePtr->lit += lastLLSize;
-}
-
-void ZSTD_resetSeqStore(seqStore_t* ssPtr)
-{
-    ssPtr->lit = ssPtr->litStart;
-    ssPtr->sequences = ssPtr->sequencesStart;
-    ssPtr->longLengthID = 0;
-}
-
-typedef enum { ZSTDbss_compress, ZSTDbss_noCompress } ZSTD_buildSeqStore_e;
-
-static size_t ZSTD_buildSeqStore(ZSTD_CCtx* zc, const void* src, size_t srcSize)
-{
-    ZSTD_matchState_t* const ms = &zc->blockState.matchState;
-    DEBUGLOG(5, "ZSTD_buildSeqStore (srcSize=%zu)", srcSize);
-    assert(srcSize <= ZSTD_BLOCKSIZE_MAX);
-    /* Assert that we have correctly flushed the ctx params into the ms's copy */
-    ZSTD_assertEqualCParams(zc->appliedParams.cParams, ms->cParams);
-    if (srcSize < MIN_CBLOCK_SIZE+ZSTD_blockHeaderSize+1) {
-        ZSTD_ldm_skipSequences(&zc->externSeqStore, srcSize, zc->appliedParams.cParams.minMatch);
-        return ZSTDbss_noCompress; /* don't even attempt compression below a certain srcSize */
-    }
-    ZSTD_resetSeqStore(&(zc->seqStore));
-    /* required for optimal parser to read stats from dictionary */
-    ms->opt.symbolCosts = &zc->blockState.prevCBlock->entropy;
-    /* tell the optimal parser how we expect to compress literals */
-    ms->opt.literalCompressionMode = zc->appliedParams.literalCompressionMode;
-    /* a gap between an attached dict and the current window is not safe,
-     * they must remain adjacent,
-     * and when that stops being the case, the dict must be unset */
-    assert(ms->dictMatchState == NULL || ms->loadedDictEnd == ms->window.dictLimit);
-
-    /* limited update after a very long match */
-    {   const BYTE* const base = ms->window.base;
-        const BYTE* const istart = (const BYTE*)src;
-        const U32 current = (U32)(istart-base);
-        if (sizeof(ptrdiff_t)==8) assert(istart - base < (ptrdiff_t)(U32)(-1));   /* ensure no overflow */
-        if (current > ms->nextToUpdate + 384)
-            ms->nextToUpdate = current - MIN(192, (U32)(current - ms->nextToUpdate - 384));
-    }
-
-    /* select and store sequences */
-    {   ZSTD_dictMode_e const dictMode = ZSTD_matchState_dictMode(ms);
-        size_t lastLLSize;
-        {   int i;
-            for (i = 0; i < ZSTD_REP_NUM; ++i)
-                zc->blockState.nextCBlock->rep[i] = zc->blockState.prevCBlock->rep[i];
-        }
-        if (zc->externSeqStore.pos < zc->externSeqStore.size) {
-            assert(!zc->appliedParams.ldmParams.enableLdm);
-            /* Updates ldmSeqStore.pos */
-            lastLLSize =
-                ZSTD_ldm_blockCompress(&zc->externSeqStore,
-                                       ms, &zc->seqStore,
-                                       zc->blockState.nextCBlock->rep,
-                                       src, srcSize);
-            assert(zc->externSeqStore.pos <= zc->externSeqStore.size);
-        } else if (zc->appliedParams.ldmParams.enableLdm) {
-            rawSeqStore_t ldmSeqStore = {NULL, 0, 0, 0};
-
-            ldmSeqStore.seq = zc->ldmSequences;
-            ldmSeqStore.capacity = zc->maxNbLdmSequences;
-            /* Updates ldmSeqStore.size */
-            FORWARD_IF_ERROR(ZSTD_ldm_generateSequences(&zc->ldmState, &ldmSeqStore,
-                                               &zc->appliedParams.ldmParams,
-                                               src, srcSize));
-            /* Updates ldmSeqStore.pos */
-            lastLLSize =
-                ZSTD_ldm_blockCompress(&ldmSeqStore,
-                                       ms, &zc->seqStore,
-                                       zc->blockState.nextCBlock->rep,
-                                       src, srcSize);
-            assert(ldmSeqStore.pos == ldmSeqStore.size);
-        } else {   /* not long range mode */
-            ZSTD_blockCompressor const blockCompressor = ZSTD_selectBlockCompressor(zc->appliedParams.cParams.strategy, dictMode);
-            lastLLSize = blockCompressor(ms, &zc->seqStore, zc->blockState.nextCBlock->rep, src, srcSize);
-        }
-        {   const BYTE* const lastLiterals = (const BYTE*)src + srcSize - lastLLSize;
-            ZSTD_storeLastLiterals(&zc->seqStore, lastLiterals, lastLLSize);
-    }   }
-    return ZSTDbss_compress;
-}
-
-static size_t ZSTD_compressBlock_internal(ZSTD_CCtx* zc,
-                                        void* dst, size_t dstCapacity,
-                                        const void* src, size_t srcSize)
-{
-    size_t cSize;
-    DEBUGLOG(5, "ZSTD_compressBlock_internal (dstCapacity=%u, dictLimit=%u, nextToUpdate=%u)",
-                (unsigned)dstCapacity, (unsigned)zc->blockState.matchState.window.dictLimit,
-                (unsigned)zc->blockState.matchState.nextToUpdate);
-
-    {   const size_t bss = ZSTD_buildSeqStore(zc, src, srcSize);
-        FORWARD_IF_ERROR(bss);
-        if (bss == ZSTDbss_noCompress) { cSize = 0; goto out; }
-    }
-
-    /* encode sequences and literals */
-    cSize = ZSTD_compressSequences(&zc->seqStore,
-            &zc->blockState.prevCBlock->entropy, &zc->blockState.nextCBlock->entropy,
-            &zc->appliedParams,
-            dst, dstCapacity,
-            srcSize,
-            zc->entropyWorkspace, HUF_WORKSPACE_SIZE /* statically allocated in resetCCtx */,
-            zc->bmi2);
-
-out:
-    if (!ZSTD_isError(cSize) && cSize != 0) {
-        /* confirm repcodes and entropy tables when emitting a compressed block */
-        ZSTD_compressedBlockState_t* const tmp = zc->blockState.prevCBlock;
-        zc->blockState.prevCBlock = zc->blockState.nextCBlock;
-        zc->blockState.nextCBlock = tmp;
-    }
-    /* We check that dictionaries have offset codes available for the first
-     * block. After the first block, the offcode table might not have large
-     * enough codes to represent the offsets in the data.
-     */
-    if (zc->blockState.prevCBlock->entropy.fse.offcode_repeatMode == FSE_repeat_valid)
-        zc->blockState.prevCBlock->entropy.fse.offcode_repeatMode = FSE_repeat_check;
-
-    return cSize;
-}
-
-
-static void ZSTD_overflowCorrectIfNeeded(ZSTD_matchState_t* ms, ZSTD_CCtx_params const* params, void const* ip, void const* iend)
-{
-    if (ZSTD_window_needOverflowCorrection(ms->window, iend)) {
-        U32 const maxDist = (U32)1 << params->cParams.windowLog;
-        U32 const cycleLog = ZSTD_cycleLog(params->cParams.chainLog, params->cParams.strategy);
-        U32 const correction = ZSTD_window_correctOverflow(&ms->window, cycleLog, maxDist, ip);
-        ZSTD_STATIC_ASSERT(ZSTD_CHAINLOG_MAX <= 30);
-        ZSTD_STATIC_ASSERT(ZSTD_WINDOWLOG_MAX_32 <= 30);
-        ZSTD_STATIC_ASSERT(ZSTD_WINDOWLOG_MAX <= 31);
-        ZSTD_reduceIndex(ms, params, correction);
-        if (ms->nextToUpdate < correction) ms->nextToUpdate = 0;
-        else ms->nextToUpdate -= correction;
-        /* invalidate dictionaries on overflow correction */
-        ms->loadedDictEnd = 0;
-        ms->dictMatchState = NULL;
-    }
-}
-
-
-/*! ZSTD_compress_frameChunk() :
-*   Compress a chunk of data into one or multiple blocks.
-*   All blocks will be terminated, all input will be consumed.
-*   Function will issue an error if there is not enough `dstCapacity` to hold the compressed content.
-*   Frame is supposed already started (header already produced)
-*   @return : compressed size, or an error code
-*/
-static size_t ZSTD_compress_frameChunk (ZSTD_CCtx* cctx,
-                                     void* dst, size_t dstCapacity,
-                               const void* src, size_t srcSize,
-                                     U32 lastFrameChunk)
-{
-    size_t blockSize = cctx->blockSize;
-    size_t remaining = srcSize;
-    const BYTE* ip = (const BYTE*)src;
-    BYTE* const ostart = (BYTE*)dst;
-    BYTE* op = ostart;
-    U32 const maxDist = (U32)1 << cctx->appliedParams.cParams.windowLog;
-    assert(cctx->appliedParams.cParams.windowLog <= ZSTD_WINDOWLOG_MAX);
-
-    DEBUGLOG(5, "ZSTD_compress_frameChunk (blockSize=%u)", (unsigned)blockSize);
-    if (cctx->appliedParams.fParams.checksumFlag && srcSize)
-        XXH64_update(&cctx->xxhState, src, srcSize);
-
-    while (remaining) {
-        ZSTD_matchState_t* const ms = &cctx->blockState.matchState;
-        U32 const lastBlock = lastFrameChunk & (blockSize >= remaining);
-
-        RETURN_ERROR_IF(dstCapacity < ZSTD_blockHeaderSize + MIN_CBLOCK_SIZE,
-                        dstSize_tooSmall,
-                        "not enough space to store compressed block");
-        if (remaining < blockSize) blockSize = remaining;
-
-        ZSTD_overflowCorrectIfNeeded(ms, &cctx->appliedParams, ip, ip + blockSize);
-        ZSTD_checkDictValidity(&ms->window, ip + blockSize, maxDist, &ms->loadedDictEnd, &ms->dictMatchState);
-
-        /* Ensure hash/chain table insertion resumes no sooner than lowlimit */
-        if (ms->nextToUpdate < ms->window.lowLimit) ms->nextToUpdate = ms->window.lowLimit;
-
-        {   size_t cSize = ZSTD_compressBlock_internal(cctx,
-                                op+ZSTD_blockHeaderSize, dstCapacity-ZSTD_blockHeaderSize,
-                                ip, blockSize);
-            FORWARD_IF_ERROR(cSize);
-
-            if (cSize == 0) {  /* block is not compressible */
-                cSize = ZSTD_noCompressBlock(op, dstCapacity, ip, blockSize, lastBlock);
-                FORWARD_IF_ERROR(cSize);
-            } else {
-                U32 const cBlockHeader24 = lastBlock + (((U32)bt_compressed)<<1) + (U32)(cSize << 3);
-                MEM_writeLE24(op, cBlockHeader24);
-                cSize += ZSTD_blockHeaderSize;
-            }
-
-            ip += blockSize;
-            assert(remaining >= blockSize);
-            remaining -= blockSize;
-            op += cSize;
-            assert(dstCapacity >= cSize);
-            dstCapacity -= cSize;
-            DEBUGLOG(5, "ZSTD_compress_frameChunk: adding a block of size %u",
-                        (unsigned)cSize);
-    }   }
-
-    if (lastFrameChunk && (op>ostart)) cctx->stage = ZSTDcs_ending;
-    return (size_t)(op-ostart);
-}
-
-
-static size_t ZSTD_writeFrameHeader(void* dst, size_t dstCapacity,
-                                    ZSTD_CCtx_params params, U64 pledgedSrcSize, U32 dictID)
-{   BYTE* const op = (BYTE*)dst;
-    U32   const dictIDSizeCodeLength = (dictID>0) + (dictID>=256) + (dictID>=65536);   /* 0-3 */
-    U32   const dictIDSizeCode = params.fParams.noDictIDFlag ? 0 : dictIDSizeCodeLength;   /* 0-3 */
-    U32   const checksumFlag = params.fParams.checksumFlag>0;
-    U32   const windowSize = (U32)1 << params.cParams.windowLog;
-    U32   const singleSegment = params.fParams.contentSizeFlag && (windowSize >= pledgedSrcSize);
-    BYTE  const windowLogByte = (BYTE)((params.cParams.windowLog - ZSTD_WINDOWLOG_ABSOLUTEMIN) << 3);
-    U32   const fcsCode = params.fParams.contentSizeFlag ?
-                     (pledgedSrcSize>=256) + (pledgedSrcSize>=65536+256) + (pledgedSrcSize>=0xFFFFFFFFU) : 0;  /* 0-3 */
-    BYTE  const frameHeaderDescriptionByte = (BYTE)(dictIDSizeCode + (checksumFlag<<2) + (singleSegment<<5) + (fcsCode<<6) );
-    size_t pos=0;
-
-    assert(!(params.fParams.contentSizeFlag && pledgedSrcSize == ZSTD_CONTENTSIZE_UNKNOWN));
-    RETURN_ERROR_IF(dstCapacity < ZSTD_FRAMEHEADERSIZE_MAX, dstSize_tooSmall);
-    DEBUGLOG(4, "ZSTD_writeFrameHeader : dictIDFlag : %u ; dictID : %u ; dictIDSizeCode : %u",
-                !params.fParams.noDictIDFlag, (unsigned)dictID, (unsigned)dictIDSizeCode);
-
-    if (params.format == ZSTD_f_zstd1) {
-        MEM_writeLE32(dst, ZSTD_MAGICNUMBER);
-        pos = 4;
-    }
-    op[pos++] = frameHeaderDescriptionByte;
-    if (!singleSegment) op[pos++] = windowLogByte;
-    switch(dictIDSizeCode)
-    {
-        default:  assert(0); /* impossible */
-        case 0 : break;
-        case 1 : op[pos] = (BYTE)(dictID); pos++; break;
-        case 2 : MEM_writeLE16(op+pos, (U16)dictID); pos+=2; break;
-        case 3 : MEM_writeLE32(op+pos, dictID); pos+=4; break;
-    }
-    switch(fcsCode)
-    {
-        default:  assert(0); /* impossible */
-        case 0 : if (singleSegment) op[pos++] = (BYTE)(pledgedSrcSize); break;
-        case 1 : MEM_writeLE16(op+pos, (U16)(pledgedSrcSize-256)); pos+=2; break;
-        case 2 : MEM_writeLE32(op+pos, (U32)(pledgedSrcSize)); pos+=4; break;
-        case 3 : MEM_writeLE64(op+pos, (U64)(pledgedSrcSize)); pos+=8; break;
-    }
-    return pos;
-}
-
-/* ZSTD_writeLastEmptyBlock() :
- * output an empty Block with end-of-frame mark to complete a frame
- * @return : size of data written into `dst` (== ZSTD_blockHeaderSize (defined in zstd_internal.h))
- *           or an error code if `dstCapacity` is too small (<ZSTD_blockHeaderSize)
- */
-size_t ZSTD_writeLastEmptyBlock(void* dst, size_t dstCapacity)
-{
-    RETURN_ERROR_IF(dstCapacity < ZSTD_blockHeaderSize, dstSize_tooSmall);
-    {   U32 const cBlockHeader24 = 1 /*lastBlock*/ + (((U32)bt_raw)<<1);  /* 0 size */
-        MEM_writeLE24(dst, cBlockHeader24);
-        return ZSTD_blockHeaderSize;
-    }
-}
-
-size_t ZSTD_referenceExternalSequences(ZSTD_CCtx* cctx, rawSeq* seq, size_t nbSeq)
-{
-    RETURN_ERROR_IF(cctx->stage != ZSTDcs_init, stage_wrong);
-    RETURN_ERROR_IF(cctx->appliedParams.ldmParams.enableLdm,
-                    parameter_unsupported);
-    cctx->externSeqStore.seq = seq;
-    cctx->externSeqStore.size = nbSeq;
-    cctx->externSeqStore.capacity = nbSeq;
-    cctx->externSeqStore.pos = 0;
-    return 0;
-}
-
-
-static size_t ZSTD_compressContinue_internal (ZSTD_CCtx* cctx,
-                              void* dst, size_t dstCapacity,
-                        const void* src, size_t srcSize,
-                               U32 frame, U32 lastFrameChunk)
-{
-    ZSTD_matchState_t* const ms = &cctx->blockState.matchState;
-    size_t fhSize = 0;
-
-    DEBUGLOG(5, "ZSTD_compressContinue_internal, stage: %u, srcSize: %u",
-                cctx->stage, (unsigned)srcSize);
-    RETURN_ERROR_IF(cctx->stage==ZSTDcs_created, stage_wrong,
-                    "missing init (ZSTD_compressBegin)");
-
-    if (frame && (cctx->stage==ZSTDcs_init)) {
-        fhSize = ZSTD_writeFrameHeader(dst, dstCapacity, cctx->appliedParams,
-                                       cctx->pledgedSrcSizePlusOne-1, cctx->dictID);
-        FORWARD_IF_ERROR(fhSize);
-        assert(fhSize <= dstCapacity);
-        dstCapacity -= fhSize;
-        dst = (char*)dst + fhSize;
-        cctx->stage = ZSTDcs_ongoing;
-    }
-
-    if (!srcSize) return fhSize;  /* do not generate an empty block if no input */
-
-    if (!ZSTD_window_update(&ms->window, src, srcSize)) {
-        ms->nextToUpdate = ms->window.dictLimit;
-    }
-    if (cctx->appliedParams.ldmParams.enableLdm) {
-        ZSTD_window_update(&cctx->ldmState.window, src, srcSize);
-    }
-
-    if (!frame) {
-        /* overflow check and correction for block mode */
-        ZSTD_overflowCorrectIfNeeded(ms, &cctx->appliedParams, src, (BYTE const*)src + srcSize);
-    }
-
-    DEBUGLOG(5, "ZSTD_compressContinue_internal (blockSize=%u)", (unsigned)cctx->blockSize);
-    {   size_t const cSize = frame ?
-                             ZSTD_compress_frameChunk (cctx, dst, dstCapacity, src, srcSize, lastFrameChunk) :
-                             ZSTD_compressBlock_internal (cctx, dst, dstCapacity, src, srcSize);
-        FORWARD_IF_ERROR(cSize);
-        cctx->consumedSrcSize += srcSize;
-        cctx->producedCSize += (cSize + fhSize);
-        assert(!(cctx->appliedParams.fParams.contentSizeFlag && cctx->pledgedSrcSizePlusOne == 0));
-        if (cctx->pledgedSrcSizePlusOne != 0) {  /* control src size */
-            ZSTD_STATIC_ASSERT(ZSTD_CONTENTSIZE_UNKNOWN == (unsigned long long)-1);
-            RETURN_ERROR_IF(
-                cctx->consumedSrcSize+1 > cctx->pledgedSrcSizePlusOne,
-                srcSize_wrong,
-                "error : pledgedSrcSize = %u, while realSrcSize >= %u",
-                (unsigned)cctx->pledgedSrcSizePlusOne-1,
-                (unsigned)cctx->consumedSrcSize);
-        }
-        return cSize + fhSize;
-    }
-}
-
-size_t ZSTD_compressContinue (ZSTD_CCtx* cctx,
-                              void* dst, size_t dstCapacity,
-                        const void* src, size_t srcSize)
-{
-    DEBUGLOG(5, "ZSTD_compressContinue (srcSize=%u)", (unsigned)srcSize);
-    return ZSTD_compressContinue_internal(cctx, dst, dstCapacity, src, srcSize, 1 /* frame mode */, 0 /* last chunk */);
-}
-
-
-size_t ZSTD_getBlockSize(const ZSTD_CCtx* cctx)
-{
-    ZSTD_compressionParameters const cParams = cctx->appliedParams.cParams;
-    assert(!ZSTD_checkCParams(cParams));
-    return MIN (ZSTD_BLOCKSIZE_MAX, (U32)1 << cParams.windowLog);
-}
-
-size_t ZSTD_compressBlock(ZSTD_CCtx* cctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize)
-{
-    DEBUGLOG(5, "ZSTD_compressBlock: srcSize = %u", (unsigned)srcSize);
-    { size_t const blockSizeMax = ZSTD_getBlockSize(cctx);
-      RETURN_ERROR_IF(srcSize > blockSizeMax, srcSize_wrong); }
-
-    return ZSTD_compressContinue_internal(cctx, dst, dstCapacity, src, srcSize, 0 /* frame mode */, 0 /* last chunk */);
-}
-
-/*! ZSTD_loadDictionaryContent() :
- *  @return : 0, or an error code
- */
-static size_t ZSTD_loadDictionaryContent(ZSTD_matchState_t* ms,
-                                         ZSTD_CCtx_params const* params,
-                                         const void* src, size_t srcSize,
-                                         ZSTD_dictTableLoadMethod_e dtlm)
-{
-    const BYTE* ip = (const BYTE*) src;
-    const BYTE* const iend = ip + srcSize;
-
-    ZSTD_window_update(&ms->window, src, srcSize);
-    ms->loadedDictEnd = params->forceWindow ? 0 : (U32)(iend - ms->window.base);
-
-    /* Assert that we the ms params match the params we're being given */
-    ZSTD_assertEqualCParams(params->cParams, ms->cParams);
-
-    if (srcSize <= HASH_READ_SIZE) return 0;
-
-    while (iend - ip > HASH_READ_SIZE) {
-        size_t const remaining = (size_t)(iend - ip);
-        size_t const chunk = MIN(remaining, ZSTD_CHUNKSIZE_MAX);
-        const BYTE* const ichunk = ip + chunk;
-
-        ZSTD_overflowCorrectIfNeeded(ms, params, ip, ichunk);
-
-        switch(params->cParams.strategy)
-        {
-        case ZSTD_fast:
-            ZSTD_fillHashTable(ms, ichunk, dtlm);
-            break;
-        case ZSTD_dfast:
-            ZSTD_fillDoubleHashTable(ms, ichunk, dtlm);
-            break;
-
-        case ZSTD_greedy:
-        case ZSTD_lazy:
-        case ZSTD_lazy2:
-            if (chunk >= HASH_READ_SIZE)
-                ZSTD_insertAndFindFirstIndex(ms, ichunk-HASH_READ_SIZE);
-            break;
-
-        case ZSTD_btlazy2:   /* we want the dictionary table fully sorted */
-        case ZSTD_btopt:
-        case ZSTD_btultra:
-        case ZSTD_btultra2:
-            if (chunk >= HASH_READ_SIZE)
-                ZSTD_updateTree(ms, ichunk-HASH_READ_SIZE, ichunk);
-            break;
-
-        default:
-            assert(0);  /* not possible : not a valid strategy id */
-        }
-
-        ip = ichunk;
-    }
-
-    ms->nextToUpdate = (U32)(iend - ms->window.base);
-    return 0;
-}
-
-
-/* Dictionaries that assign zero probability to symbols that show up causes problems
-   when FSE encoding.  Refuse dictionaries that assign zero probability to symbols
-   that we may encounter during compression.
-   NOTE: This behavior is not standard and could be improved in the future. */
-static size_t ZSTD_checkDictNCount(short* normalizedCounter, unsigned dictMaxSymbolValue, unsigned maxSymbolValue) {
-    U32 s;
-    RETURN_ERROR_IF(dictMaxSymbolValue < maxSymbolValue, dictionary_corrupted);
-    for (s = 0; s <= maxSymbolValue; ++s) {
-        RETURN_ERROR_IF(normalizedCounter[s] == 0, dictionary_corrupted);
-    }
-    return 0;
-}
-
-
-/* Dictionary format :
- * See :
- * https://github.com/facebook/zstd/blob/master/doc/zstd_compression_format.md#dictionary-format
- */
-/*! ZSTD_loadZstdDictionary() :
- * @return : dictID, or an error code
- *  assumptions : magic number supposed already checked
- *                dictSize supposed > 8
- */
-static size_t ZSTD_loadZstdDictionary(ZSTD_compressedBlockState_t* bs,
-                                      ZSTD_matchState_t* ms,
-                                      ZSTD_CCtx_params const* params,
-                                      const void* dict, size_t dictSize,
-                                      ZSTD_dictTableLoadMethod_e dtlm,
-                                      void* workspace)
-{
-    const BYTE* dictPtr = (const BYTE*)dict;
-    const BYTE* const dictEnd = dictPtr + dictSize;
-    short offcodeNCount[MaxOff+1];
-    unsigned offcodeMaxValue = MaxOff;
-    size_t dictID;
-
-    ZSTD_STATIC_ASSERT(HUF_WORKSPACE_SIZE >= (1<<MAX(MLFSELog,LLFSELog)));
-    assert(dictSize > 8);
-    assert(MEM_readLE32(dictPtr) == ZSTD_MAGIC_DICTIONARY);
-
-    dictPtr += 4;   /* skip magic number */
-    dictID = params->fParams.noDictIDFlag ? 0 :  MEM_readLE32(dictPtr);
-    dictPtr += 4;
-
-    {   unsigned maxSymbolValue = 255;
-        size_t const hufHeaderSize = HUF_readCTable((HUF_CElt*)bs->entropy.huf.CTable, &maxSymbolValue, dictPtr, dictEnd-dictPtr);
-        RETURN_ERROR_IF(HUF_isError(hufHeaderSize), dictionary_corrupted);
-        RETURN_ERROR_IF(maxSymbolValue < 255, dictionary_corrupted);
-        dictPtr += hufHeaderSize;
-    }
-
-    {   unsigned offcodeLog;
-        size_t const offcodeHeaderSize = FSE_readNCount(offcodeNCount, &offcodeMaxValue, &offcodeLog, dictPtr, dictEnd-dictPtr);
-        RETURN_ERROR_IF(FSE_isError(offcodeHeaderSize), dictionary_corrupted);
-        RETURN_ERROR_IF(offcodeLog > OffFSELog, dictionary_corrupted);
-        /* Defer checking offcodeMaxValue because we need to know the size of the dictionary content */
-        /* fill all offset symbols to avoid garbage at end of table */
-        RETURN_ERROR_IF(FSE_isError(FSE_buildCTable_wksp(
-                bs->entropy.fse.offcodeCTable,
-                offcodeNCount, MaxOff, offcodeLog,
-                workspace, HUF_WORKSPACE_SIZE)),
-            dictionary_corrupted);
-        dictPtr += offcodeHeaderSize;
-    }
-
-    {   short matchlengthNCount[MaxML+1];
-        unsigned matchlengthMaxValue = MaxML, matchlengthLog;
-        size_t const matchlengthHeaderSize = FSE_readNCount(matchlengthNCount, &matchlengthMaxValue, &matchlengthLog, dictPtr, dictEnd-dictPtr);
-        RETURN_ERROR_IF(FSE_isError(matchlengthHeaderSize), dictionary_corrupted);
-        RETURN_ERROR_IF(matchlengthLog > MLFSELog, dictionary_corrupted);
-        /* Every match length code must have non-zero probability */
-        FORWARD_IF_ERROR( ZSTD_checkDictNCount(matchlengthNCount, matchlengthMaxValue, MaxML));
-        RETURN_ERROR_IF(FSE_isError(FSE_buildCTable_wksp(
-                bs->entropy.fse.matchlengthCTable,
-                matchlengthNCount, matchlengthMaxValue, matchlengthLog,
-                workspace, HUF_WORKSPACE_SIZE)),
-            dictionary_corrupted);
-        dictPtr += matchlengthHeaderSize;
-    }
-
-    {   short litlengthNCount[MaxLL+1];
-        unsigned litlengthMaxValue = MaxLL, litlengthLog;
-        size_t const litlengthHeaderSize = FSE_readNCount(litlengthNCount, &litlengthMaxValue, &litlengthLog, dictPtr, dictEnd-dictPtr);
-        RETURN_ERROR_IF(FSE_isError(litlengthHeaderSize), dictionary_corrupted);
-        RETURN_ERROR_IF(litlengthLog > LLFSELog, dictionary_corrupted);
-        /* Every literal length code must have non-zero probability */
-        FORWARD_IF_ERROR( ZSTD_checkDictNCount(litlengthNCount, litlengthMaxValue, MaxLL));
-        RETURN_ERROR_IF(FSE_isError(FSE_buildCTable_wksp(
-                bs->entropy.fse.litlengthCTable,
-                litlengthNCount, litlengthMaxValue, litlengthLog,
-                workspace, HUF_WORKSPACE_SIZE)),
-            dictionary_corrupted);
-        dictPtr += litlengthHeaderSize;
-    }
-
-    RETURN_ERROR_IF(dictPtr+12 > dictEnd, dictionary_corrupted);
-    bs->rep[0] = MEM_readLE32(dictPtr+0);
-    bs->rep[1] = MEM_readLE32(dictPtr+4);
-    bs->rep[2] = MEM_readLE32(dictPtr+8);
-    dictPtr += 12;
-
-    {   size_t const dictContentSize = (size_t)(dictEnd - dictPtr);
-        U32 offcodeMax = MaxOff;
-        if (dictContentSize <= ((U32)-1) - 128 KB) {
-            U32 const maxOffset = (U32)dictContentSize + 128 KB; /* The maximum offset that must be supported */
-            offcodeMax = ZSTD_highbit32(maxOffset); /* Calculate minimum offset code required to represent maxOffset */
-        }
-        /* All offset values <= dictContentSize + 128 KB must be representable */
-        FORWARD_IF_ERROR(ZSTD_checkDictNCount(offcodeNCount, offcodeMaxValue, MIN(offcodeMax, MaxOff)));
-        /* All repCodes must be <= dictContentSize and != 0*/
-        {   U32 u;
-            for (u=0; u<3; u++) {
-                RETURN_ERROR_IF(bs->rep[u] == 0, dictionary_corrupted);
-                RETURN_ERROR_IF(bs->rep[u] > dictContentSize, dictionary_corrupted);
-        }   }
-
-        bs->entropy.huf.repeatMode = HUF_repeat_valid;
-        bs->entropy.fse.offcode_repeatMode = FSE_repeat_valid;
-        bs->entropy.fse.matchlength_repeatMode = FSE_repeat_valid;
-        bs->entropy.fse.litlength_repeatMode = FSE_repeat_valid;
-        FORWARD_IF_ERROR(ZSTD_loadDictionaryContent(ms, params, dictPtr, dictContentSize, dtlm));
-        return dictID;
-    }
-}
-
-/** ZSTD_compress_insertDictionary() :
-*   @return : dictID, or an error code */
-static size_t
-ZSTD_compress_insertDictionary(ZSTD_compressedBlockState_t* bs,
-                               ZSTD_matchState_t* ms,
-                         const ZSTD_CCtx_params* params,
-                         const void* dict, size_t dictSize,
-                               ZSTD_dictContentType_e dictContentType,
-                               ZSTD_dictTableLoadMethod_e dtlm,
-                               void* workspace)
-{
-    DEBUGLOG(4, "ZSTD_compress_insertDictionary (dictSize=%u)", (U32)dictSize);
-    if ((dict==NULL) || (dictSize<=8)) return 0;
-
-    ZSTD_reset_compressedBlockState(bs);
-
-    /* dict restricted modes */
-    if (dictContentType == ZSTD_dct_rawContent)
-        return ZSTD_loadDictionaryContent(ms, params, dict, dictSize, dtlm);
-
-    if (MEM_readLE32(dict) != ZSTD_MAGIC_DICTIONARY) {
-        if (dictContentType == ZSTD_dct_auto) {
-            DEBUGLOG(4, "raw content dictionary detected");
-            return ZSTD_loadDictionaryContent(ms, params, dict, dictSize, dtlm);
-        }
-        RETURN_ERROR_IF(dictContentType == ZSTD_dct_fullDict, dictionary_wrong);
-        assert(0);   /* impossible */
-    }
-
-    /* dict as full zstd dictionary */
-    return ZSTD_loadZstdDictionary(bs, ms, params, dict, dictSize, dtlm, workspace);
-}
-
-/*! ZSTD_compressBegin_internal() :
- * @return : 0, or an error code */
-static size_t ZSTD_compressBegin_internal(ZSTD_CCtx* cctx,
-                                    const void* dict, size_t dictSize,
-                                    ZSTD_dictContentType_e dictContentType,
-                                    ZSTD_dictTableLoadMethod_e dtlm,
-                                    const ZSTD_CDict* cdict,
-                                    ZSTD_CCtx_params params, U64 pledgedSrcSize,
-                                    ZSTD_buffered_policy_e zbuff)
-{
-    DEBUGLOG(4, "ZSTD_compressBegin_internal: wlog=%u", params.cParams.windowLog);
-    /* params are supposed to be fully validated at this point */
-    assert(!ZSTD_isError(ZSTD_checkCParams(params.cParams)));
-    assert(!((dict) && (cdict)));  /* either dict or cdict, not both */
-
-    if (cdict && cdict->dictContentSize>0) {
-        return ZSTD_resetCCtx_usingCDict(cctx, cdict, params, pledgedSrcSize, zbuff);
-    }
-
-    FORWARD_IF_ERROR( ZSTD_resetCCtx_internal(cctx, params, pledgedSrcSize,
-                                     ZSTDcrp_continue, zbuff) );
-    {   size_t const dictID = ZSTD_compress_insertDictionary(
-                cctx->blockState.prevCBlock, &cctx->blockState.matchState,
-                &params, dict, dictSize, dictContentType, dtlm, cctx->entropyWorkspace);
-        FORWARD_IF_ERROR(dictID);
-        assert(dictID <= UINT_MAX);
-        cctx->dictID = (U32)dictID;
-    }
-    return 0;
-}
-
-size_t ZSTD_compressBegin_advanced_internal(ZSTD_CCtx* cctx,
-                                    const void* dict, size_t dictSize,
-                                    ZSTD_dictContentType_e dictContentType,
-                                    ZSTD_dictTableLoadMethod_e dtlm,
-                                    const ZSTD_CDict* cdict,
-                                    ZSTD_CCtx_params params,
-                                    unsigned long long pledgedSrcSize)
-{
-    DEBUGLOG(4, "ZSTD_compressBegin_advanced_internal: wlog=%u", params.cParams.windowLog);
-    /* compression parameters verification and optimization */
-    FORWARD_IF_ERROR( ZSTD_checkCParams(params.cParams) );
-    return ZSTD_compressBegin_internal(cctx,
-                                       dict, dictSize, dictContentType, dtlm,
-                                       cdict,
-                                       params, pledgedSrcSize,
-                                       ZSTDb_not_buffered);
-}
-
-/*! ZSTD_compressBegin_advanced() :
-*   @return : 0, or an error code */
-size_t ZSTD_compressBegin_advanced(ZSTD_CCtx* cctx,
-                             const void* dict, size_t dictSize,
-                                   ZSTD_parameters params, unsigned long long pledgedSrcSize)
-{
-    ZSTD_CCtx_params const cctxParams =
-            ZSTD_assignParamsToCCtxParams(cctx->requestedParams, params);
-    return ZSTD_compressBegin_advanced_internal(cctx,
-                                            dict, dictSize, ZSTD_dct_auto, ZSTD_dtlm_fast,
-                                            NULL /*cdict*/,
-                                            cctxParams, pledgedSrcSize);
-}
-
-size_t ZSTD_compressBegin_usingDict(ZSTD_CCtx* cctx, const void* dict, size_t dictSize, int compressionLevel)
-{
-    ZSTD_parameters const params = ZSTD_getParams(compressionLevel, ZSTD_CONTENTSIZE_UNKNOWN, dictSize);
-    ZSTD_CCtx_params const cctxParams =
-            ZSTD_assignParamsToCCtxParams(cctx->requestedParams, params);
-    DEBUGLOG(4, "ZSTD_compressBegin_usingDict (dictSize=%u)", (unsigned)dictSize);
-    return ZSTD_compressBegin_internal(cctx, dict, dictSize, ZSTD_dct_auto, ZSTD_dtlm_fast, NULL,
-                                       cctxParams, ZSTD_CONTENTSIZE_UNKNOWN, ZSTDb_not_buffered);
-}
-
-size_t ZSTD_compressBegin(ZSTD_CCtx* cctx, int compressionLevel)
-{
-    return ZSTD_compressBegin_usingDict(cctx, NULL, 0, compressionLevel);
-}
-
-
-/*! ZSTD_writeEpilogue() :
-*   Ends a frame.
-*   @return : nb of bytes written into dst (or an error code) */
-static size_t ZSTD_writeEpilogue(ZSTD_CCtx* cctx, void* dst, size_t dstCapacity)
-{
-    BYTE* const ostart = (BYTE*)dst;
-    BYTE* op = ostart;
-    size_t fhSize = 0;
-
-    DEBUGLOG(4, "ZSTD_writeEpilogue");
-    RETURN_ERROR_IF(cctx->stage == ZSTDcs_created, stage_wrong, "init missing");
-
-    /* special case : empty frame */
-    if (cctx->stage == ZSTDcs_init) {
-        fhSize = ZSTD_writeFrameHeader(dst, dstCapacity, cctx->appliedParams, 0, 0);
-        FORWARD_IF_ERROR(fhSize);
-        dstCapacity -= fhSize;
-        op += fhSize;
-        cctx->stage = ZSTDcs_ongoing;
-    }
-
-    if (cctx->stage != ZSTDcs_ending) {
-        /* write one last empty block, make it the "last" block */
-        U32 const cBlockHeader24 = 1 /* last block */ + (((U32)bt_raw)<<1) + 0;
-        RETURN_ERROR_IF(dstCapacity<4, dstSize_tooSmall);
-        MEM_writeLE32(op, cBlockHeader24);
-        op += ZSTD_blockHeaderSize;
-        dstCapacity -= ZSTD_blockHeaderSize;
-    }
-
-    if (cctx->appliedParams.fParams.checksumFlag) {
-        U32 const checksum = (U32) XXH64_digest(&cctx->xxhState);
-        RETURN_ERROR_IF(dstCapacity<4, dstSize_tooSmall);
-        DEBUGLOG(4, "ZSTD_writeEpilogue: write checksum : %08X", (unsigned)checksum);
-        MEM_writeLE32(op, checksum);
-        op += 4;
-    }
-
-    cctx->stage = ZSTDcs_created;  /* return to "created but no init" status */
-    return op-ostart;
-}
-
-size_t ZSTD_compressEnd (ZSTD_CCtx* cctx,
-                         void* dst, size_t dstCapacity,
-                   const void* src, size_t srcSize)
-{
-    size_t endResult;
-    size_t const cSize = ZSTD_compressContinue_internal(cctx,
-                                dst, dstCapacity, src, srcSize,
-                                1 /* frame mode */, 1 /* last chunk */);
-    FORWARD_IF_ERROR(cSize);
-    endResult = ZSTD_writeEpilogue(cctx, (char*)dst + cSize, dstCapacity-cSize);
-    FORWARD_IF_ERROR(endResult);
-    assert(!(cctx->appliedParams.fParams.contentSizeFlag && cctx->pledgedSrcSizePlusOne == 0));
-    if (cctx->pledgedSrcSizePlusOne != 0) {  /* control src size */
-        ZSTD_STATIC_ASSERT(ZSTD_CONTENTSIZE_UNKNOWN == (unsigned long long)-1);
-        DEBUGLOG(4, "end of frame : controlling src size");
-        RETURN_ERROR_IF(
-            cctx->pledgedSrcSizePlusOne != cctx->consumedSrcSize+1,
-            srcSize_wrong,
-             "error : pledgedSrcSize = %u, while realSrcSize = %u",
-            (unsigned)cctx->pledgedSrcSizePlusOne-1,
-            (unsigned)cctx->consumedSrcSize);
-    }
-    return cSize + endResult;
-}
-
-
-static size_t ZSTD_compress_internal (ZSTD_CCtx* cctx,
-                                      void* dst, size_t dstCapacity,
-                                const void* src, size_t srcSize,
-                                const void* dict,size_t dictSize,
-                                      ZSTD_parameters params)
-{
-    ZSTD_CCtx_params const cctxParams =
-            ZSTD_assignParamsToCCtxParams(cctx->requestedParams, params);
-    DEBUGLOG(4, "ZSTD_compress_internal");
-    return ZSTD_compress_advanced_internal(cctx,
-                                           dst, dstCapacity,
-                                           src, srcSize,
-                                           dict, dictSize,
-                                           cctxParams);
-}
-
-size_t ZSTD_compress_advanced (ZSTD_CCtx* cctx,
-                               void* dst, size_t dstCapacity,
-                         const void* src, size_t srcSize,
-                         const void* dict,size_t dictSize,
-                               ZSTD_parameters params)
-{
-    DEBUGLOG(4, "ZSTD_compress_advanced");
-    FORWARD_IF_ERROR(ZSTD_checkCParams(params.cParams));
-    return ZSTD_compress_internal(cctx,
-                                  dst, dstCapacity,
-                                  src, srcSize,
-                                  dict, dictSize,
-                                  params);
-}
-
-/* Internal */
-size_t ZSTD_compress_advanced_internal(
-        ZSTD_CCtx* cctx,
-        void* dst, size_t dstCapacity,
-        const void* src, size_t srcSize,
-        const void* dict,size_t dictSize,
-        ZSTD_CCtx_params params)
-{
-    DEBUGLOG(4, "ZSTD_compress_advanced_internal (srcSize:%u)", (unsigned)srcSize);
-    FORWARD_IF_ERROR( ZSTD_compressBegin_internal(cctx,
-                         dict, dictSize, ZSTD_dct_auto, ZSTD_dtlm_fast, NULL,
-                         params, srcSize, ZSTDb_not_buffered) );
-    return ZSTD_compressEnd(cctx, dst, dstCapacity, src, srcSize);
-}
-
-size_t ZSTD_compress_usingDict(ZSTD_CCtx* cctx,
-                               void* dst, size_t dstCapacity,
-                         const void* src, size_t srcSize,
-                         const void* dict, size_t dictSize,
-                               int compressionLevel)
-{
-    ZSTD_parameters const params = ZSTD_getParams(compressionLevel, srcSize + (!srcSize), dict ? dictSize : 0);
-    ZSTD_CCtx_params cctxParams = ZSTD_assignParamsToCCtxParams(cctx->requestedParams, params);
-    assert(params.fParams.contentSizeFlag == 1);
-    return ZSTD_compress_advanced_internal(cctx, dst, dstCapacity, src, srcSize, dict, dictSize, cctxParams);
-}
-
-size_t ZSTD_compressCCtx(ZSTD_CCtx* cctx,
-                         void* dst, size_t dstCapacity,
-                   const void* src, size_t srcSize,
-                         int compressionLevel)
-{
-    DEBUGLOG(4, "ZSTD_compressCCtx (srcSize=%u)", (unsigned)srcSize);
-    assert(cctx != NULL);
-    return ZSTD_compress_usingDict(cctx, dst, dstCapacity, src, srcSize, NULL, 0, compressionLevel);
-}
-
-size_t ZSTD_compress(void* dst, size_t dstCapacity,
-               const void* src, size_t srcSize,
-                     int compressionLevel)
-{
-    size_t result;
-    ZSTD_CCtx ctxBody;
-    ZSTD_initCCtx(&ctxBody, ZSTD_defaultCMem);
-    result = ZSTD_compressCCtx(&ctxBody, dst, dstCapacity, src, srcSize, compressionLevel);
-    ZSTD_freeCCtxContent(&ctxBody);   /* can't free ctxBody itself, as it's on stack; free only heap content */
-    return result;
-}
-
-
-/* =====  Dictionary API  ===== */
-
-/*! ZSTD_estimateCDictSize_advanced() :
- *  Estimate amount of memory that will be needed to create a dictionary with following arguments */
-size_t ZSTD_estimateCDictSize_advanced(
-        size_t dictSize, ZSTD_compressionParameters cParams,
-        ZSTD_dictLoadMethod_e dictLoadMethod)
-{
-    DEBUGLOG(5, "sizeof(ZSTD_CDict) : %u", (unsigned)sizeof(ZSTD_CDict));
-    return sizeof(ZSTD_CDict) + HUF_WORKSPACE_SIZE + ZSTD_sizeof_matchState(&cParams, /* forCCtx */ 0)
-           + (dictLoadMethod == ZSTD_dlm_byRef ? 0 : dictSize);
-}
-
-size_t ZSTD_estimateCDictSize(size_t dictSize, int compressionLevel)
-{
-    ZSTD_compressionParameters const cParams = ZSTD_getCParams(compressionLevel, 0, dictSize);
-    return ZSTD_estimateCDictSize_advanced(dictSize, cParams, ZSTD_dlm_byCopy);
-}
-
-size_t ZSTD_sizeof_CDict(const ZSTD_CDict* cdict)
-{
-    if (cdict==NULL) return 0;   /* support sizeof on NULL */
-    DEBUGLOG(5, "sizeof(*cdict) : %u", (unsigned)sizeof(*cdict));
-    return cdict->workspaceSize + (cdict->dictBuffer ? cdict->dictContentSize : 0) + sizeof(*cdict);
-}
-
-static size_t ZSTD_initCDict_internal(
-                    ZSTD_CDict* cdict,
-              const void* dictBuffer, size_t dictSize,
-                    ZSTD_dictLoadMethod_e dictLoadMethod,
-                    ZSTD_dictContentType_e dictContentType,
-                    ZSTD_compressionParameters cParams)
-{
-    DEBUGLOG(3, "ZSTD_initCDict_internal (dictContentType:%u)", (unsigned)dictContentType);
-    assert(!ZSTD_checkCParams(cParams));
-    cdict->matchState.cParams = cParams;
-    if ((dictLoadMethod == ZSTD_dlm_byRef) || (!dictBuffer) || (!dictSize)) {
-        cdict->dictBuffer = NULL;
-        cdict->dictContent = dictBuffer;
-    } else {
-        void* const internalBuffer = ZSTD_malloc(dictSize, cdict->customMem);
-        cdict->dictBuffer = internalBuffer;
-        cdict->dictContent = internalBuffer;
-        RETURN_ERROR_IF(!internalBuffer, memory_allocation);
-        memcpy(internalBuffer, dictBuffer, dictSize);
-    }
-    cdict->dictContentSize = dictSize;
-
-    /* Reset the state to no dictionary */
-    ZSTD_reset_compressedBlockState(&cdict->cBlockState);
-    {   void* const end = ZSTD_reset_matchState(&cdict->matchState,
-                            (U32*)cdict->workspace + HUF_WORKSPACE_SIZE_U32,
-                            &cParams,
-                             ZSTDcrp_continue, ZSTD_resetTarget_CDict);
-        assert(end == (char*)cdict->workspace + cdict->workspaceSize);
-        (void)end;
-    }
-    /* (Maybe) load the dictionary
-     * Skips loading the dictionary if it is <= 8 bytes.
-     */
-    {   ZSTD_CCtx_params params;
-        memset(&params, 0, sizeof(params));
-        params.compressionLevel = ZSTD_CLEVEL_DEFAULT;
-        params.fParams.contentSizeFlag = 1;
-        params.cParams = cParams;
-        {   size_t const dictID = ZSTD_compress_insertDictionary(
-                    &cdict->cBlockState, &cdict->matchState, &params,
-                    cdict->dictContent, cdict->dictContentSize,
-                    dictContentType, ZSTD_dtlm_full, cdict->workspace);
-            FORWARD_IF_ERROR(dictID);
-            assert(dictID <= (size_t)(U32)-1);
-            cdict->dictID = (U32)dictID;
-        }
-    }
-
-    return 0;
-}
-
-ZSTD_CDict* ZSTD_createCDict_advanced(const void* dictBuffer, size_t dictSize,
-                                      ZSTD_dictLoadMethod_e dictLoadMethod,
-                                      ZSTD_dictContentType_e dictContentType,
-                                      ZSTD_compressionParameters cParams, ZSTD_customMem customMem)
-{
-    DEBUGLOG(3, "ZSTD_createCDict_advanced, mode %u", (unsigned)dictContentType);
-    if (!customMem.customAlloc ^ !customMem.customFree) return NULL;
-
-    {   ZSTD_CDict* const cdict = (ZSTD_CDict*)ZSTD_malloc(sizeof(ZSTD_CDict), customMem);
-        size_t const workspaceSize = HUF_WORKSPACE_SIZE + ZSTD_sizeof_matchState(&cParams, /* forCCtx */ 0);
-        void* const workspace = ZSTD_malloc(workspaceSize, customMem);
-
-        if (!cdict || !workspace) {
-            ZSTD_free(cdict, customMem);
-            ZSTD_free(workspace, customMem);
-            return NULL;
-        }
-        cdict->customMem = customMem;
-        cdict->workspace = workspace;
-        cdict->workspaceSize = workspaceSize;
-        if (ZSTD_isError( ZSTD_initCDict_internal(cdict,
-                                        dictBuffer, dictSize,
-                                        dictLoadMethod, dictContentType,
-                                        cParams) )) {
-            ZSTD_freeCDict(cdict);
-            return NULL;
-        }
-
-        return cdict;
-    }
-}
-
-ZSTD_CDict* ZSTD_createCDict(const void* dict, size_t dictSize, int compressionLevel)
-{
-    ZSTD_compressionParameters cParams = ZSTD_getCParams(compressionLevel, 0, dictSize);
-    return ZSTD_createCDict_advanced(dict, dictSize,
-                                     ZSTD_dlm_byCopy, ZSTD_dct_auto,
-                                     cParams, ZSTD_defaultCMem);
-}
-
-ZSTD_CDict* ZSTD_createCDict_byReference(const void* dict, size_t dictSize, int compressionLevel)
-{
-    ZSTD_compressionParameters cParams = ZSTD_getCParams(compressionLevel, 0, dictSize);
-    return ZSTD_createCDict_advanced(dict, dictSize,
-                                     ZSTD_dlm_byRef, ZSTD_dct_auto,
-                                     cParams, ZSTD_defaultCMem);
-}
-
-size_t ZSTD_freeCDict(ZSTD_CDict* cdict)
-{
-    if (cdict==NULL) return 0;   /* support free on NULL */
-    {   ZSTD_customMem const cMem = cdict->customMem;
-        ZSTD_free(cdict->workspace, cMem);
-        ZSTD_free(cdict->dictBuffer, cMem);
-        ZSTD_free(cdict, cMem);
-        return 0;
-    }
-}
-
-/*! ZSTD_initStaticCDict_advanced() :
- *  Generate a digested dictionary in provided memory area.
- *  workspace: The memory area to emplace the dictionary into.
- *             Provided pointer must 8-bytes aligned.
- *             It must outlive dictionary usage.
- *  workspaceSize: Use ZSTD_estimateCDictSize()
- *                 to determine how large workspace must be.
- *  cParams : use ZSTD_getCParams() to transform a compression level
- *            into its relevants cParams.
- * @return : pointer to ZSTD_CDict*, or NULL if error (size too small)
- *  Note : there is no corresponding "free" function.
- *         Since workspace was allocated externally, it must be freed externally.
- */
-const ZSTD_CDict* ZSTD_initStaticCDict(
-                                 void* workspace, size_t workspaceSize,
-                           const void* dict, size_t dictSize,
-                                 ZSTD_dictLoadMethod_e dictLoadMethod,
-                                 ZSTD_dictContentType_e dictContentType,
-                                 ZSTD_compressionParameters cParams)
-{
-    size_t const matchStateSize = ZSTD_sizeof_matchState(&cParams, /* forCCtx */ 0);
-    size_t const neededSize = sizeof(ZSTD_CDict) + (dictLoadMethod == ZSTD_dlm_byRef ? 0 : dictSize)
-                            + HUF_WORKSPACE_SIZE + matchStateSize;
-    ZSTD_CDict* const cdict = (ZSTD_CDict*) workspace;
-    void* ptr;
-    if ((size_t)workspace & 7) return NULL;  /* 8-aligned */
-    DEBUGLOG(4, "(workspaceSize < neededSize) : (%u < %u) => %u",
-        (unsigned)workspaceSize, (unsigned)neededSize, (unsigned)(workspaceSize < neededSize));
-    if (workspaceSize < neededSize) return NULL;
-
-    if (dictLoadMethod == ZSTD_dlm_byCopy) {
-        memcpy(cdict+1, dict, dictSize);
-        dict = cdict+1;
-        ptr = (char*)workspace + sizeof(ZSTD_CDict) + dictSize;
-    } else {
-        ptr = cdict+1;
-    }
-    cdict->workspace = ptr;
-    cdict->workspaceSize = HUF_WORKSPACE_SIZE + matchStateSize;
-
-    if (ZSTD_isError( ZSTD_initCDict_internal(cdict,
-                                              dict, dictSize,
-                                              ZSTD_dlm_byRef, dictContentType,
-                                              cParams) ))
-        return NULL;
-
-    return cdict;
-}
-
-ZSTD_compressionParameters ZSTD_getCParamsFromCDict(const ZSTD_CDict* cdict)
-{
-    assert(cdict != NULL);
-    return cdict->matchState.cParams;
-}
-
-/* ZSTD_compressBegin_usingCDict_advanced() :
- * cdict must be != NULL */
-size_t ZSTD_compressBegin_usingCDict_advanced(
-    ZSTD_CCtx* const cctx, const ZSTD_CDict* const cdict,
-    ZSTD_frameParameters const fParams, unsigned long long const pledgedSrcSize)
-{
-    DEBUGLOG(4, "ZSTD_compressBegin_usingCDict_advanced");
-    RETURN_ERROR_IF(cdict==NULL, dictionary_wrong);
-    {   ZSTD_CCtx_params params = cctx->requestedParams;
-        params.cParams = ZSTD_getCParamsFromCDict(cdict);
-        /* Increase window log to fit the entire dictionary and source if the
-         * source size is known. Limit the increase to 19, which is the
-         * window log for compression level 1 with the largest source size.
-         */
-        if (pledgedSrcSize != ZSTD_CONTENTSIZE_UNKNOWN) {
-            U32 const limitedSrcSize = (U32)MIN(pledgedSrcSize, 1U << 19);
-            U32 const limitedSrcLog = limitedSrcSize > 1 ? ZSTD_highbit32(limitedSrcSize - 1) + 1 : 1;
-            params.cParams.windowLog = MAX(params.cParams.windowLog, limitedSrcLog);
-        }
-        params.fParams = fParams;
-        return ZSTD_compressBegin_internal(cctx,
-                                           NULL, 0, ZSTD_dct_auto, ZSTD_dtlm_fast,
-                                           cdict,
-                                           params, pledgedSrcSize,
-                                           ZSTDb_not_buffered);
-    }
-}
-
-/* ZSTD_compressBegin_usingCDict() :
- * pledgedSrcSize=0 means "unknown"
- * if pledgedSrcSize>0, it will enable contentSizeFlag */
-size_t ZSTD_compressBegin_usingCDict(ZSTD_CCtx* cctx, const ZSTD_CDict* cdict)
-{
-    ZSTD_frameParameters const fParams = { 0 /*content*/, 0 /*checksum*/, 0 /*noDictID*/ };
-    DEBUGLOG(4, "ZSTD_compressBegin_usingCDict : dictIDFlag == %u", !fParams.noDictIDFlag);
-    return ZSTD_compressBegin_usingCDict_advanced(cctx, cdict, fParams, ZSTD_CONTENTSIZE_UNKNOWN);
-}
-
-size_t ZSTD_compress_usingCDict_advanced(ZSTD_CCtx* cctx,
-                                void* dst, size_t dstCapacity,
-                                const void* src, size_t srcSize,
-                                const ZSTD_CDict* cdict, ZSTD_frameParameters fParams)
-{
-    FORWARD_IF_ERROR(ZSTD_compressBegin_usingCDict_advanced(cctx, cdict, fParams, srcSize));   /* will check if cdict != NULL */
-    return ZSTD_compressEnd(cctx, dst, dstCapacity, src, srcSize);
-}
-
-/*! ZSTD_compress_usingCDict() :
- *  Compression using a digested Dictionary.
- *  Faster startup than ZSTD_compress_usingDict(), recommended when same dictionary is used multiple times.
- *  Note that compression parameters are decided at CDict creation time
- *  while frame parameters are hardcoded */
-size_t ZSTD_compress_usingCDict(ZSTD_CCtx* cctx,
-                                void* dst, size_t dstCapacity,
-                                const void* src, size_t srcSize,
-                                const ZSTD_CDict* cdict)
-{
-    ZSTD_frameParameters const fParams = { 1 /*content*/, 0 /*checksum*/, 0 /*noDictID*/ };
-    return ZSTD_compress_usingCDict_advanced(cctx, dst, dstCapacity, src, srcSize, cdict, fParams);
-}
-
-
-
-/* ******************************************************************
-*  Streaming
-********************************************************************/
-
-ZSTD_CStream* ZSTD_createCStream(void)
-{
-    DEBUGLOG(3, "ZSTD_createCStream");
-    return ZSTD_createCStream_advanced(ZSTD_defaultCMem);
-}
-
-ZSTD_CStream* ZSTD_initStaticCStream(void *workspace, size_t workspaceSize)
-{
-    return ZSTD_initStaticCCtx(workspace, workspaceSize);
-}
-
-ZSTD_CStream* ZSTD_createCStream_advanced(ZSTD_customMem customMem)
-{   /* CStream and CCtx are now same object */
-    return ZSTD_createCCtx_advanced(customMem);
-}
-
-size_t ZSTD_freeCStream(ZSTD_CStream* zcs)
-{
-    return ZSTD_freeCCtx(zcs);   /* same object */
-}
-
-
-
-/*======   Initialization   ======*/
-
-size_t ZSTD_CStreamInSize(void)  { return ZSTD_BLOCKSIZE_MAX; }
-
-size_t ZSTD_CStreamOutSize(void)
-{
-    return ZSTD_compressBound(ZSTD_BLOCKSIZE_MAX) + ZSTD_blockHeaderSize + 4 /* 32-bits hash */ ;
-}
-
-static size_t ZSTD_resetCStream_internal(ZSTD_CStream* cctx,
-                    const void* const dict, size_t const dictSize, ZSTD_dictContentType_e const dictContentType,
-                    const ZSTD_CDict* const cdict,
-                    ZSTD_CCtx_params params, unsigned long long const pledgedSrcSize)
-{
-    DEBUGLOG(4, "ZSTD_resetCStream_internal");
-    /* Finalize the compression parameters */
-    params.cParams = ZSTD_getCParamsFromCCtxParams(&params, pledgedSrcSize, dictSize);
-    /* params are supposed to be fully validated at this point */
-    assert(!ZSTD_isError(ZSTD_checkCParams(params.cParams)));
-    assert(!((dict) && (cdict)));  /* either dict or cdict, not both */
-
-    FORWARD_IF_ERROR( ZSTD_compressBegin_internal(cctx,
-                                         dict, dictSize, dictContentType, ZSTD_dtlm_fast,
-                                         cdict,
-                                         params, pledgedSrcSize,
-                                         ZSTDb_buffered) );
-
-    cctx->inToCompress = 0;
-    cctx->inBuffPos = 0;
-    cctx->inBuffTarget = cctx->blockSize
-                      + (cctx->blockSize == pledgedSrcSize);   /* for small input: avoid automatic flush on reaching end of block, since it would require to add a 3-bytes null block to end frame */
-    cctx->outBuffContentSize = cctx->outBuffFlushedSize = 0;
-    cctx->streamStage = zcss_load;
-    cctx->frameEnded = 0;
-    return 0;   /* ready to go */
-}
-
-/* ZSTD_resetCStream():
- * pledgedSrcSize == 0 means "unknown" */
-size_t ZSTD_resetCStream(ZSTD_CStream* zcs, unsigned long long pss)
-{
-    /* temporary : 0 interpreted as "unknown" during transition period.
-     * Users willing to specify "unknown" **must** use ZSTD_CONTENTSIZE_UNKNOWN.
-     * 0 will be interpreted as "empty" in the future.
-     */
-    U64 const pledgedSrcSize = (pss==0) ? ZSTD_CONTENTSIZE_UNKNOWN : pss;
-    DEBUGLOG(4, "ZSTD_resetCStream: pledgedSrcSize = %u", (unsigned)pledgedSrcSize);
-    FORWARD_IF_ERROR( ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only) );
-    FORWARD_IF_ERROR( ZSTD_CCtx_setPledgedSrcSize(zcs, pledgedSrcSize) );
-    return 0;
-}
-
-/*! ZSTD_initCStream_internal() :
- *  Note : for lib/compress only. Used by zstdmt_compress.c.
- *  Assumption 1 : params are valid
- *  Assumption 2 : either dict, or cdict, is defined, not both */
-size_t ZSTD_initCStream_internal(ZSTD_CStream* zcs,
-                    const void* dict, size_t dictSize, const ZSTD_CDict* cdict,
-                    ZSTD_CCtx_params params, unsigned long long pledgedSrcSize)
-{
-    DEBUGLOG(4, "ZSTD_initCStream_internal");
-    FORWARD_IF_ERROR( ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only) );
-    FORWARD_IF_ERROR( ZSTD_CCtx_setPledgedSrcSize(zcs, pledgedSrcSize) );
-    assert(!ZSTD_isError(ZSTD_checkCParams(params.cParams)));
-    zcs->requestedParams = params;
-    assert(!((dict) && (cdict)));  /* either dict or cdict, not both */
-    if (dict) {
-        FORWARD_IF_ERROR( ZSTD_CCtx_loadDictionary(zcs, dict, dictSize) );
-    } else {
-        /* Dictionary is cleared if !cdict */
-        FORWARD_IF_ERROR( ZSTD_CCtx_refCDict(zcs, cdict) );
-    }
-    return 0;
-}
-
-/* ZSTD_initCStream_usingCDict_advanced() :
- * same as ZSTD_initCStream_usingCDict(), with control over frame parameters */
-size_t ZSTD_initCStream_usingCDict_advanced(ZSTD_CStream* zcs,
-                                            const ZSTD_CDict* cdict,
-                                            ZSTD_frameParameters fParams,
-                                            unsigned long long pledgedSrcSize)
-{
-    DEBUGLOG(4, "ZSTD_initCStream_usingCDict_advanced");
-    FORWARD_IF_ERROR( ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only) );
-    FORWARD_IF_ERROR( ZSTD_CCtx_setPledgedSrcSize(zcs, pledgedSrcSize) );
-    zcs->requestedParams.fParams = fParams;
-    FORWARD_IF_ERROR( ZSTD_CCtx_refCDict(zcs, cdict) );
-    return 0;
-}
-
-/* note : cdict must outlive compression session */
-size_t ZSTD_initCStream_usingCDict(ZSTD_CStream* zcs, const ZSTD_CDict* cdict)
-{
-    DEBUGLOG(4, "ZSTD_initCStream_usingCDict");
-    FORWARD_IF_ERROR( ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only) );
-    FORWARD_IF_ERROR( ZSTD_CCtx_refCDict(zcs, cdict) );
-    return 0;
-}
-
-
-/* ZSTD_initCStream_advanced() :
- * pledgedSrcSize must be exact.
- * if srcSize is not known at init time, use value ZSTD_CONTENTSIZE_UNKNOWN.
- * dict is loaded with default parameters ZSTD_dm_auto and ZSTD_dlm_byCopy. */
-size_t ZSTD_initCStream_advanced(ZSTD_CStream* zcs,
-                                 const void* dict, size_t dictSize,
-                                 ZSTD_parameters params, unsigned long long pss)
-{
-    /* for compatibility with older programs relying on this behavior.
-     * Users should now specify ZSTD_CONTENTSIZE_UNKNOWN.
-     * This line will be removed in the future.
-     */
-    U64 const pledgedSrcSize = (pss==0 && params.fParams.contentSizeFlag==0) ? ZSTD_CONTENTSIZE_UNKNOWN : pss;
-    DEBUGLOG(4, "ZSTD_initCStream_advanced");
-    FORWARD_IF_ERROR( ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only) );
-    FORWARD_IF_ERROR( ZSTD_CCtx_setPledgedSrcSize(zcs, pledgedSrcSize) );
-    FORWARD_IF_ERROR( ZSTD_checkCParams(params.cParams) );
-    zcs->requestedParams = ZSTD_assignParamsToCCtxParams(zcs->requestedParams, params);
-    FORWARD_IF_ERROR( ZSTD_CCtx_loadDictionary(zcs, dict, dictSize) );
-    return 0;
-}
-
-size_t ZSTD_initCStream_usingDict(ZSTD_CStream* zcs, const void* dict, size_t dictSize, int compressionLevel)
-{
-    DEBUGLOG(4, "ZSTD_initCStream_usingDict");
-    FORWARD_IF_ERROR( ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only) );
-    FORWARD_IF_ERROR( ZSTD_CCtx_setParameter(zcs, ZSTD_c_compressionLevel, compressionLevel) );
-    FORWARD_IF_ERROR( ZSTD_CCtx_loadDictionary(zcs, dict, dictSize) );
-    return 0;
-}
-
-size_t ZSTD_initCStream_srcSize(ZSTD_CStream* zcs, int compressionLevel, unsigned long long pss)
-{
-    /* temporary : 0 interpreted as "unknown" during transition period.
-     * Users willing to specify "unknown" **must** use ZSTD_CONTENTSIZE_UNKNOWN.
-     * 0 will be interpreted as "empty" in the future.
-     */
-    U64 const pledgedSrcSize = (pss==0) ? ZSTD_CONTENTSIZE_UNKNOWN : pss;
-    DEBUGLOG(4, "ZSTD_initCStream_srcSize");
-    FORWARD_IF_ERROR( ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only) );
-    FORWARD_IF_ERROR( ZSTD_CCtx_refCDict(zcs, NULL) );
-    FORWARD_IF_ERROR( ZSTD_CCtx_setParameter(zcs, ZSTD_c_compressionLevel, compressionLevel) );
-    FORWARD_IF_ERROR( ZSTD_CCtx_setPledgedSrcSize(zcs, pledgedSrcSize) );
-    return 0;
-}
-
-size_t ZSTD_initCStream(ZSTD_CStream* zcs, int compressionLevel)
-{
-    DEBUGLOG(4, "ZSTD_initCStream");
-    FORWARD_IF_ERROR( ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only) );
-    FORWARD_IF_ERROR( ZSTD_CCtx_refCDict(zcs, NULL) );
-    FORWARD_IF_ERROR( ZSTD_CCtx_setParameter(zcs, ZSTD_c_compressionLevel, compressionLevel) );
-    return 0;
-}
-
-/*======   Compression   ======*/
-
-static size_t ZSTD_nextInputSizeHint(const ZSTD_CCtx* cctx)
-{
-    size_t hintInSize = cctx->inBuffTarget - cctx->inBuffPos;
-    if (hintInSize==0) hintInSize = cctx->blockSize;
-    return hintInSize;
-}
-
-static size_t ZSTD_limitCopy(void* dst, size_t dstCapacity,
-                       const void* src, size_t srcSize)
-{
-    size_t const length = MIN(dstCapacity, srcSize);
-    if (length) memcpy(dst, src, length);
-    return length;
-}
-
-/** ZSTD_compressStream_generic():
- *  internal function for all *compressStream*() variants
- *  non-static, because can be called from zstdmt_compress.c
- * @return : hint size for next input */
-static size_t ZSTD_compressStream_generic(ZSTD_CStream* zcs,
-                                          ZSTD_outBuffer* output,
-                                          ZSTD_inBuffer* input,
-                                          ZSTD_EndDirective const flushMode)
-SUPPRESS_UBSAN_CLANG10
-{
-    const char* const istart = (const char*)input->src;
-    const char* const iend = istart + input->size;
-    const char* ip = istart + input->pos;
-    char* const ostart = (char*)output->dst;
-    char* const oend = ostart + output->size;
-    char* op = ostart + output->pos;
-    U32 someMoreWork = 1;
-
-    /* check expectations */
-    DEBUGLOG(5, "ZSTD_compressStream_generic, flush=%u", (unsigned)flushMode);
-    assert(zcs->inBuff != NULL);
-    assert(zcs->inBuffSize > 0);
-    assert(zcs->outBuff !=  NULL);
-    assert(zcs->outBuffSize > 0);
-    assert(output->pos <= output->size);
-    assert(input->pos <= input->size);
-
-    while (someMoreWork) {
-        switch(zcs->streamStage)
-        {
-        case zcss_init:
-            RETURN_ERROR(init_missing, "call ZSTD_initCStream() first!");
-
-        case zcss_load:
-            if ( (flushMode == ZSTD_e_end)
-              && ((size_t)(oend-op) >= ZSTD_compressBound(iend-ip))  /* enough dstCapacity */
-              && (zcs->inBuffPos == 0) ) {
-                /* shortcut to compression pass directly into output buffer */
-                size_t const cSize = ZSTD_compressEnd(zcs,
-                                                op, oend-op, ip, iend-ip);
-                DEBUGLOG(4, "ZSTD_compressEnd : cSize=%u", (unsigned)cSize);
-                FORWARD_IF_ERROR(cSize);
-                ip = iend;
-                op += cSize;
-                zcs->frameEnded = 1;
-                ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only);
-                someMoreWork = 0; break;
-            }
-            /* complete loading into inBuffer */
-            {   size_t const toLoad = zcs->inBuffTarget - zcs->inBuffPos;
-                size_t const loaded = ZSTD_limitCopy(
-                                        zcs->inBuff + zcs->inBuffPos, toLoad,
-                                        ip, iend-ip);
-                zcs->inBuffPos += loaded;
-                ip += loaded;
-                if ( (flushMode == ZSTD_e_continue)
-                  && (zcs->inBuffPos < zcs->inBuffTarget) ) {
-                    /* not enough input to fill full block : stop here */
-                    someMoreWork = 0; break;
-                }
-                if ( (flushMode == ZSTD_e_flush)
-                  && (zcs->inBuffPos == zcs->inToCompress) ) {
-                    /* empty */
-                    someMoreWork = 0; break;
-                }
-            }
-            /* compress current block (note : this stage cannot be stopped in the middle) */
-            DEBUGLOG(5, "stream compression stage (flushMode==%u)", flushMode);
-            {   void* cDst;
-                size_t cSize;
-                size_t const iSize = zcs->inBuffPos - zcs->inToCompress;
-                size_t oSize = oend-op;
-                unsigned const lastBlock = (flushMode == ZSTD_e_end) && (ip==iend);
-                if (oSize >= ZSTD_compressBound(iSize))
-                    cDst = op;   /* compress into output buffer, to skip flush stage */
-                else
-                    cDst = zcs->outBuff, oSize = zcs->outBuffSize;
-                cSize = lastBlock ?
-                        ZSTD_compressEnd(zcs, cDst, oSize,
-                                    zcs->inBuff + zcs->inToCompress, iSize) :
-                        ZSTD_compressContinue(zcs, cDst, oSize,
-                                    zcs->inBuff + zcs->inToCompress, iSize);
-                FORWARD_IF_ERROR(cSize);
-                zcs->frameEnded = lastBlock;
-                /* prepare next block */
-                zcs->inBuffTarget = zcs->inBuffPos + zcs->blockSize;
-                if (zcs->inBuffTarget > zcs->inBuffSize)
-                    zcs->inBuffPos = 0, zcs->inBuffTarget = zcs->blockSize;
-                DEBUGLOG(5, "inBuffTarget:%u / inBuffSize:%u",
-                         (unsigned)zcs->inBuffTarget, (unsigned)zcs->inBuffSize);
-                if (!lastBlock)
-                    assert(zcs->inBuffTarget <= zcs->inBuffSize);
-                zcs->inToCompress = zcs->inBuffPos;
-                if (cDst == op) {  /* no need to flush */
-                    op += cSize;
-                    if (zcs->frameEnded) {
-                        DEBUGLOG(5, "Frame completed directly in outBuffer");
-                        someMoreWork = 0;
-                        ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only);
-                    }
-                    break;
-                }
-                zcs->outBuffContentSize = cSize;
-                zcs->outBuffFlushedSize = 0;
-                zcs->streamStage = zcss_flush; /* pass-through to flush stage */
-            }
-	    /* fall-through */
-        case zcss_flush:
-            DEBUGLOG(5, "flush stage");
-            {   size_t const toFlush = zcs->outBuffContentSize - zcs->outBuffFlushedSize;
-                size_t const flushed = ZSTD_limitCopy(op, (size_t)(oend-op),
-                            zcs->outBuff + zcs->outBuffFlushedSize, toFlush);
-                DEBUGLOG(5, "toFlush: %u into %u ==> flushed: %u",
-                            (unsigned)toFlush, (unsigned)(oend-op), (unsigned)flushed);
-                op += flushed;
-                zcs->outBuffFlushedSize += flushed;
-                if (toFlush!=flushed) {
-                    /* flush not fully completed, presumably because dst is too small */
-                    assert(op==oend);
-                    someMoreWork = 0;
-                    break;
-                }
-                zcs->outBuffContentSize = zcs->outBuffFlushedSize = 0;
-                if (zcs->frameEnded) {
-                    DEBUGLOG(5, "Frame completed on flush");
-                    someMoreWork = 0;
-                    ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only);
-                    break;
-                }
-                zcs->streamStage = zcss_load;
-                break;
-            }
-
-        default: /* impossible */
-            assert(0);
-        }
-    }
-
-    input->pos = ip - istart;
-    output->pos = op - ostart;
-    if (zcs->frameEnded) return 0;
-    return ZSTD_nextInputSizeHint(zcs);
-}
-
-static size_t ZSTD_nextInputSizeHint_MTorST(const ZSTD_CCtx* cctx)
-{
-#ifdef ZSTD_MULTITHREAD
-    if (cctx->appliedParams.nbWorkers >= 1) {
-        assert(cctx->mtctx != NULL);
-        return ZSTDMT_nextInputSizeHint(cctx->mtctx);
-    }
-#endif
-    return ZSTD_nextInputSizeHint(cctx);
-
-}
-
-size_t ZSTD_compressStream(ZSTD_CStream* zcs, ZSTD_outBuffer* output, ZSTD_inBuffer* input)
-{
-    FORWARD_IF_ERROR( ZSTD_compressStream2(zcs, output, input, ZSTD_e_continue) );
-    return ZSTD_nextInputSizeHint_MTorST(zcs);
-}
-
-
-size_t ZSTD_compressStream2( ZSTD_CCtx* cctx,
-                             ZSTD_outBuffer* output,
-                             ZSTD_inBuffer* input,
-                             ZSTD_EndDirective endOp)
-{
-    DEBUGLOG(5, "ZSTD_compressStream2, endOp=%u ", (unsigned)endOp);
-    /* check conditions */
-    RETURN_ERROR_IF(output->pos > output->size, GENERIC);
-    RETURN_ERROR_IF(input->pos  > input->size, GENERIC);
-    assert(cctx!=NULL);
-
-    /* transparent initialization stage */
-    if (cctx->streamStage == zcss_init) {
-        ZSTD_CCtx_params params = cctx->requestedParams;
-        ZSTD_prefixDict const prefixDict = cctx->prefixDict;
-        FORWARD_IF_ERROR( ZSTD_initLocalDict(cctx) ); /* Init the local dict if present. */
-        memset(&cctx->prefixDict, 0, sizeof(cctx->prefixDict));   /* single usage */
-        assert(prefixDict.dict==NULL || cctx->cdict==NULL);    /* only one can be set */
-        DEBUGLOG(4, "ZSTD_compressStream2 : transparent init stage");
-        if (endOp == ZSTD_e_end) cctx->pledgedSrcSizePlusOne = input->size + 1;  /* auto-fix pledgedSrcSize */
-        params.cParams = ZSTD_getCParamsFromCCtxParams(
-                &cctx->requestedParams, cctx->pledgedSrcSizePlusOne-1, 0 /*dictSize*/);
-
-
-#ifdef ZSTD_MULTITHREAD
-        if ((cctx->pledgedSrcSizePlusOne-1) <= ZSTDMT_JOBSIZE_MIN) {
-            params.nbWorkers = 0; /* do not invoke multi-threading when src size is too small */
-        }
-        if (params.nbWorkers > 0) {
-            /* mt context creation */
-            if (cctx->mtctx == NULL) {
-                DEBUGLOG(4, "ZSTD_compressStream2: creating new mtctx for nbWorkers=%u",
-                            params.nbWorkers);
-                cctx->mtctx = ZSTDMT_createCCtx_advanced(params.nbWorkers, cctx->customMem);
-                RETURN_ERROR_IF(cctx->mtctx == NULL, memory_allocation);
-            }
-            /* mt compression */
-            DEBUGLOG(4, "call ZSTDMT_initCStream_internal as nbWorkers=%u", params.nbWorkers);
-            FORWARD_IF_ERROR( ZSTDMT_initCStream_internal(
-                        cctx->mtctx,
-                        prefixDict.dict, prefixDict.dictSize, ZSTD_dct_rawContent,
-                        cctx->cdict, params, cctx->pledgedSrcSizePlusOne-1) );
-            cctx->streamStage = zcss_load;
-            cctx->appliedParams.nbWorkers = params.nbWorkers;
-        } else
-#endif
-        {   FORWARD_IF_ERROR( ZSTD_resetCStream_internal(cctx,
-                            prefixDict.dict, prefixDict.dictSize, prefixDict.dictContentType,
-                            cctx->cdict,
-                            params, cctx->pledgedSrcSizePlusOne-1) );
-            assert(cctx->streamStage == zcss_load);
-            assert(cctx->appliedParams.nbWorkers == 0);
-    }   }
-    /* end of transparent initialization stage */
-
-    /* compression stage */
-#ifdef ZSTD_MULTITHREAD
-    if (cctx->appliedParams.nbWorkers > 0) {
-        int const forceMaxProgress = (endOp == ZSTD_e_flush || endOp == ZSTD_e_end);
-        size_t flushMin;
-        assert(forceMaxProgress || endOp == ZSTD_e_continue /* Protection for a new flush type */);
-        if (cctx->cParamsChanged) {
-            ZSTDMT_updateCParams_whileCompressing(cctx->mtctx, &cctx->requestedParams);
-            cctx->cParamsChanged = 0;
-        }
-        do {
-            flushMin = ZSTDMT_compressStream_generic(cctx->mtctx, output, input, endOp);
-            if ( ZSTD_isError(flushMin)
-              || (endOp == ZSTD_e_end && flushMin == 0) ) { /* compression completed */
-                ZSTD_CCtx_reset(cctx, ZSTD_reset_session_only);
-            }
-            FORWARD_IF_ERROR(flushMin);
-        } while (forceMaxProgress && flushMin != 0 && output->pos < output->size);
-        DEBUGLOG(5, "completed ZSTD_compressStream2 delegating to ZSTDMT_compressStream_generic");
-        /* Either we don't require maximum forward progress, we've finished the
-         * flush, or we are out of output space.
-         */
-        assert(!forceMaxProgress || flushMin == 0 || output->pos == output->size);
-        return flushMin;
-    }
-#endif
-    FORWARD_IF_ERROR( ZSTD_compressStream_generic(cctx, output, input, endOp) );
-    DEBUGLOG(5, "completed ZSTD_compressStream2");
-    return cctx->outBuffContentSize - cctx->outBuffFlushedSize; /* remaining to flush */
-}
-
-size_t ZSTD_compressStream2_simpleArgs (
-                            ZSTD_CCtx* cctx,
-                            void* dst, size_t dstCapacity, size_t* dstPos,
-                      const void* src, size_t srcSize, size_t* srcPos,
-                            ZSTD_EndDirective endOp)
-{
-    ZSTD_outBuffer output = { dst, dstCapacity, *dstPos };
-    ZSTD_inBuffer  input  = { src, srcSize, *srcPos };
-    /* ZSTD_compressStream2() will check validity of dstPos and srcPos */
-    size_t const cErr = ZSTD_compressStream2(cctx, &output, &input, endOp);
-    *dstPos = output.pos;
-    *srcPos = input.pos;
-    return cErr;
-}
-
-size_t ZSTD_compress2(ZSTD_CCtx* cctx,
-                      void* dst, size_t dstCapacity,
-                      const void* src, size_t srcSize)
-{
-    ZSTD_CCtx_reset(cctx, ZSTD_reset_session_only);
-    {   size_t oPos = 0;
-        size_t iPos = 0;
-        size_t const result = ZSTD_compressStream2_simpleArgs(cctx,
-                                        dst, dstCapacity, &oPos,
-                                        src, srcSize, &iPos,
-                                        ZSTD_e_end);
-        FORWARD_IF_ERROR(result);
-        if (result != 0) {  /* compression not completed, due to lack of output space */
-            assert(oPos == dstCapacity);
-            RETURN_ERROR(dstSize_tooSmall);
-        }
-        assert(iPos == srcSize);   /* all input is expected consumed */
-        return oPos;
-    }
-}
-
-/*======   Finalize   ======*/
-
-/*! ZSTD_flushStream() :
- * @return : amount of data remaining to flush */
-size_t ZSTD_flushStream(ZSTD_CStream* zcs, ZSTD_outBuffer* output)
-{
-    ZSTD_inBuffer input = { NULL, 0, 0 };
-    return ZSTD_compressStream2(zcs, output, &input, ZSTD_e_flush);
-}
-
-
-size_t ZSTD_endStream(ZSTD_CStream* zcs, ZSTD_outBuffer* output)
-{
-    ZSTD_inBuffer input = { NULL, 0, 0 };
-    size_t const remainingToFlush = ZSTD_compressStream2(zcs, output, &input, ZSTD_e_end);
-    FORWARD_IF_ERROR( remainingToFlush );
-    if (zcs->appliedParams.nbWorkers > 0) return remainingToFlush;   /* minimal estimation */
-    /* single thread mode : attempt to calculate remaining to flush more precisely */
-    {   size_t const lastBlockSize = zcs->frameEnded ? 0 : ZSTD_BLOCKHEADERSIZE;
-        size_t const checksumSize = (size_t)(zcs->frameEnded ? 0 : zcs->appliedParams.fParams.checksumFlag * 4);
-        size_t const toFlush = remainingToFlush + lastBlockSize + checksumSize;
-        DEBUGLOG(4, "ZSTD_endStream : remaining to flush : %u", (unsigned)toFlush);
-        return toFlush;
-    }
-}
-
-
-/*-=====  Pre-defined compression levels  =====-*/
-
-#define ZSTD_MAX_CLEVEL     22
-int ZSTD_maxCLevel(void) { return ZSTD_MAX_CLEVEL; }
-int ZSTD_minCLevel(void) { return (int)-ZSTD_TARGETLENGTH_MAX; }
-
-static const ZSTD_compressionParameters ZSTD_defaultCParameters[4][ZSTD_MAX_CLEVEL+1] = {
-{   /* "default" - for any srcSize > 256 KB */
-    /* W,  C,  H,  S,  L, TL, strat */
-    { 19, 12, 13,  1,  6,  1, ZSTD_fast    },  /* base for negative levels */
-    { 19, 13, 14,  1,  7,  0, ZSTD_fast    },  /* level  1 */
-    { 20, 15, 16,  1,  6,  0, ZSTD_fast    },  /* level  2 */
-    { 21, 16, 17,  1,  5,  1, ZSTD_dfast   },  /* level  3 */
-    { 21, 18, 18,  1,  5,  1, ZSTD_dfast   },  /* level  4 */
-    { 21, 18, 19,  2,  5,  2, ZSTD_greedy  },  /* level  5 */
-    { 21, 19, 19,  3,  5,  4, ZSTD_greedy  },  /* level  6 */
-    { 21, 19, 19,  3,  5,  8, ZSTD_lazy    },  /* level  7 */
-    { 21, 19, 19,  3,  5, 16, ZSTD_lazy2   },  /* level  8 */
-    { 21, 19, 20,  4,  5, 16, ZSTD_lazy2   },  /* level  9 */
-    { 22, 20, 21,  4,  5, 16, ZSTD_lazy2   },  /* level 10 */
-    { 22, 21, 22,  4,  5, 16, ZSTD_lazy2   },  /* level 11 */
-    { 22, 21, 22,  5,  5, 16, ZSTD_lazy2   },  /* level 12 */
-    { 22, 21, 22,  5,  5, 32, ZSTD_btlazy2 },  /* level 13 */
-    { 22, 22, 23,  5,  5, 32, ZSTD_btlazy2 },  /* level 14 */
-    { 22, 23, 23,  6,  5, 32, ZSTD_btlazy2 },  /* level 15 */
-    { 22, 22, 22,  5,  5, 48, ZSTD_btopt   },  /* level 16 */
-    { 23, 23, 22,  5,  4, 64, ZSTD_btopt   },  /* level 17 */
-    { 23, 23, 22,  6,  3, 64, ZSTD_btultra },  /* level 18 */
-    { 23, 24, 22,  7,  3,256, ZSTD_btultra2},  /* level 19 */
-    { 25, 25, 23,  7,  3,256, ZSTD_btultra2},  /* level 20 */
-    { 26, 26, 24,  7,  3,512, ZSTD_btultra2},  /* level 21 */
-    { 27, 27, 25,  9,  3,999, ZSTD_btultra2},  /* level 22 */
-},
-{   /* for srcSize <= 256 KB */
-    /* W,  C,  H,  S,  L,  T, strat */
-    { 18, 12, 13,  1,  5,  1, ZSTD_fast    },  /* base for negative levels */
-    { 18, 13, 14,  1,  6,  0, ZSTD_fast    },  /* level  1 */
-    { 18, 14, 14,  1,  5,  1, ZSTD_dfast   },  /* level  2 */
-    { 18, 16, 16,  1,  4,  1, ZSTD_dfast   },  /* level  3 */
-    { 18, 16, 17,  2,  5,  2, ZSTD_greedy  },  /* level  4.*/
-    { 18, 18, 18,  3,  5,  2, ZSTD_greedy  },  /* level  5.*/
-    { 18, 18, 19,  3,  5,  4, ZSTD_lazy    },  /* level  6.*/
-    { 18, 18, 19,  4,  4,  4, ZSTD_lazy    },  /* level  7 */
-    { 18, 18, 19,  4,  4,  8, ZSTD_lazy2   },  /* level  8 */
-    { 18, 18, 19,  5,  4,  8, ZSTD_lazy2   },  /* level  9 */
-    { 18, 18, 19,  6,  4,  8, ZSTD_lazy2   },  /* level 10 */
-    { 18, 18, 19,  5,  4, 12, ZSTD_btlazy2 },  /* level 11.*/
-    { 18, 19, 19,  7,  4, 12, ZSTD_btlazy2 },  /* level 12.*/
-    { 18, 18, 19,  4,  4, 16, ZSTD_btopt   },  /* level 13 */
-    { 18, 18, 19,  4,  3, 32, ZSTD_btopt   },  /* level 14.*/
-    { 18, 18, 19,  6,  3,128, ZSTD_btopt   },  /* level 15.*/
-    { 18, 19, 19,  6,  3,128, ZSTD_btultra },  /* level 16.*/
-    { 18, 19, 19,  8,  3,256, ZSTD_btultra },  /* level 17.*/
-    { 18, 19, 19,  6,  3,128, ZSTD_btultra2},  /* level 18.*/
-    { 18, 19, 19,  8,  3,256, ZSTD_btultra2},  /* level 19.*/
-    { 18, 19, 19, 10,  3,512, ZSTD_btultra2},  /* level 20.*/
-    { 18, 19, 19, 12,  3,512, ZSTD_btultra2},  /* level 21.*/
-    { 18, 19, 19, 13,  3,999, ZSTD_btultra2},  /* level 22.*/
-},
-{   /* for srcSize <= 128 KB */
-    /* W,  C,  H,  S,  L,  T, strat */
-    { 17, 12, 12,  1,  5,  1, ZSTD_fast    },  /* base for negative levels */
-    { 17, 12, 13,  1,  6,  0, ZSTD_fast    },  /* level  1 */
-    { 17, 13, 15,  1,  5,  0, ZSTD_fast    },  /* level  2 */
-    { 17, 15, 16,  2,  5,  1, ZSTD_dfast   },  /* level  3 */
-    { 17, 17, 17,  2,  4,  1, ZSTD_dfast   },  /* level  4 */
-    { 17, 16, 17,  3,  4,  2, ZSTD_greedy  },  /* level  5 */
-    { 17, 17, 17,  3,  4,  4, ZSTD_lazy    },  /* level  6 */
-    { 17, 17, 17,  3,  4,  8, ZSTD_lazy2   },  /* level  7 */
-    { 17, 17, 17,  4,  4,  8, ZSTD_lazy2   },  /* level  8 */
-    { 17, 17, 17,  5,  4,  8, ZSTD_lazy2   },  /* level  9 */
-    { 17, 17, 17,  6,  4,  8, ZSTD_lazy2   },  /* level 10 */
-    { 17, 17, 17,  5,  4,  8, ZSTD_btlazy2 },  /* level 11 */
-    { 17, 18, 17,  7,  4, 12, ZSTD_btlazy2 },  /* level 12 */
-    { 17, 18, 17,  3,  4, 12, ZSTD_btopt   },  /* level 13.*/
-    { 17, 18, 17,  4,  3, 32, ZSTD_btopt   },  /* level 14.*/
-    { 17, 18, 17,  6,  3,256, ZSTD_btopt   },  /* level 15.*/
-    { 17, 18, 17,  6,  3,128, ZSTD_btultra },  /* level 16.*/
-    { 17, 18, 17,  8,  3,256, ZSTD_btultra },  /* level 17.*/
-    { 17, 18, 17, 10,  3,512, ZSTD_btultra },  /* level 18.*/
-    { 17, 18, 17,  5,  3,256, ZSTD_btultra2},  /* level 19.*/
-    { 17, 18, 17,  7,  3,512, ZSTD_btultra2},  /* level 20.*/
-    { 17, 18, 17,  9,  3,512, ZSTD_btultra2},  /* level 21.*/
-    { 17, 18, 17, 11,  3,999, ZSTD_btultra2},  /* level 22.*/
-},
-{   /* for srcSize <= 16 KB */
-    /* W,  C,  H,  S,  L,  T, strat */
-    { 14, 12, 13,  1,  5,  1, ZSTD_fast    },  /* base for negative levels */
-    { 14, 14, 15,  1,  5,  0, ZSTD_fast    },  /* level  1 */
-    { 14, 14, 15,  1,  4,  0, ZSTD_fast    },  /* level  2 */
-    { 14, 14, 15,  2,  4,  1, ZSTD_dfast   },  /* level  3 */
-    { 14, 14, 14,  4,  4,  2, ZSTD_greedy  },  /* level  4 */
-    { 14, 14, 14,  3,  4,  4, ZSTD_lazy    },  /* level  5.*/
-    { 14, 14, 14,  4,  4,  8, ZSTD_lazy2   },  /* level  6 */
-    { 14, 14, 14,  6,  4,  8, ZSTD_lazy2   },  /* level  7 */
-    { 14, 14, 14,  8,  4,  8, ZSTD_lazy2   },  /* level  8.*/
-    { 14, 15, 14,  5,  4,  8, ZSTD_btlazy2 },  /* level  9.*/
-    { 14, 15, 14,  9,  4,  8, ZSTD_btlazy2 },  /* level 10.*/
-    { 14, 15, 14,  3,  4, 12, ZSTD_btopt   },  /* level 11.*/
-    { 14, 15, 14,  4,  3, 24, ZSTD_btopt   },  /* level 12.*/
-    { 14, 15, 14,  5,  3, 32, ZSTD_btultra },  /* level 13.*/
-    { 14, 15, 15,  6,  3, 64, ZSTD_btultra },  /* level 14.*/
-    { 14, 15, 15,  7,  3,256, ZSTD_btultra },  /* level 15.*/
-    { 14, 15, 15,  5,  3, 48, ZSTD_btultra2},  /* level 16.*/
-    { 14, 15, 15,  6,  3,128, ZSTD_btultra2},  /* level 17.*/
-    { 14, 15, 15,  7,  3,256, ZSTD_btultra2},  /* level 18.*/
-    { 14, 15, 15,  8,  3,256, ZSTD_btultra2},  /* level 19.*/
-    { 14, 15, 15,  8,  3,512, ZSTD_btultra2},  /* level 20.*/
-    { 14, 15, 15,  9,  3,512, ZSTD_btultra2},  /* level 21.*/
-    { 14, 15, 15, 10,  3,999, ZSTD_btultra2},  /* level 22.*/
-},
-};
-
-/*! ZSTD_getCParams() :
- * @return ZSTD_compressionParameters structure for a selected compression level, srcSize and dictSize.
- *  Size values are optional, provide 0 if not known or unused */
-ZSTD_compressionParameters ZSTD_getCParams(int compressionLevel, unsigned long long srcSizeHint, size_t dictSize)
-{
-    size_t const addedSize = srcSizeHint ? 0 : 500;
-    U64 const rSize = srcSizeHint+dictSize ? srcSizeHint+dictSize+addedSize : ZSTD_CONTENTSIZE_UNKNOWN;  /* intentional overflow for srcSizeHint == ZSTD_CONTENTSIZE_UNKNOWN */
-    U32 const tableID = (rSize <= 256 KB) + (rSize <= 128 KB) + (rSize <= 16 KB);
-    int row = compressionLevel;
-    DEBUGLOG(5, "ZSTD_getCParams (cLevel=%i)", compressionLevel);
-    if (compressionLevel == 0) row = ZSTD_CLEVEL_DEFAULT;   /* 0 == default */
-    if (compressionLevel < 0) row = 0;   /* entry 0 is baseline for fast mode */
-    if (compressionLevel > ZSTD_MAX_CLEVEL) row = ZSTD_MAX_CLEVEL;
-    {   ZSTD_compressionParameters cp = ZSTD_defaultCParameters[tableID][row];
-        if (compressionLevel < 0) cp.targetLength = (unsigned)(-compressionLevel);   /* acceleration factor */
-        return ZSTD_adjustCParams_internal(cp, srcSizeHint, dictSize);               /* refine parameters based on srcSize & dictSize */
-    }
-}
-
-/*! ZSTD_getParams() :
- *  same idea as ZSTD_getCParams()
- * @return a `ZSTD_parameters` structure (instead of `ZSTD_compressionParameters`).
- *  Fields of `ZSTD_frameParameters` are set to default values */
-ZSTD_parameters ZSTD_getParams(int compressionLevel, unsigned long long srcSizeHint, size_t dictSize) {
-    ZSTD_parameters params;
-    ZSTD_compressionParameters const cParams = ZSTD_getCParams(compressionLevel, srcSizeHint, dictSize);
-    DEBUGLOG(5, "ZSTD_getParams (cLevel=%i)", compressionLevel);
-    memset(&params, 0, sizeof(params));
-    params.cParams = cParams;
-    params.fParams.contentSizeFlag = 1;
-    return params;
-}
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/compress/zstd_compress_internal.h mysql-8.0-8.0.27/extra/zstd/lib/compress/zstd_compress_internal.h
--- mysql-8.0-8.0.26/extra/zstd/lib/compress/zstd_compress_internal.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/compress/zstd_compress_internal.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,963 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
-/* This header contains definitions
- * that shall **only** be used by modules within lib/compress.
- */
-
-#ifndef ZSTD_COMPRESS_H
-#define ZSTD_COMPRESS_H
-
-/*-*************************************
-*  Dependencies
-***************************************/
-#include "zstd_internal.h"
-#include "my_compiler.h"
-#ifdef ZSTD_MULTITHREAD
-#  include "zstdmt_compress.h"
-#endif
-
-#if defined (__cplusplus)
-extern "C" {
-#endif
-
-
-/*-*************************************
-*  Constants
-***************************************/
-#define kSearchStrength      8
-#define HASH_READ_SIZE       8
-#define ZSTD_DUBT_UNSORTED_MARK 1   /* For btlazy2 strategy, index ZSTD_DUBT_UNSORTED_MARK==1 means "unsorted".
-                                       It could be confused for a real successor at index "1", if sorted as larger than its predecessor.
-                                       It's not a big deal though : candidate will just be sorted again.
-                                       Additionally, candidate position 1 will be lost.
-                                       But candidate 1 cannot hide a large tree of candidates, so it's a minimal loss.
-                                       The benefit is that ZSTD_DUBT_UNSORTED_MARK cannot be mishandled after table re-use with a different strategy.
-                                       This constant is required by ZSTD_compressBlock_btlazy2() and ZSTD_reduceTable_internal() */
-
-
-/*-*************************************
-*  Context memory management
-***************************************/
-typedef enum { ZSTDcs_created=0, ZSTDcs_init, ZSTDcs_ongoing, ZSTDcs_ending } ZSTD_compressionStage_e;
-typedef enum { zcss_init=0, zcss_load, zcss_flush } ZSTD_cStreamStage;
-
-typedef struct ZSTD_prefixDict_s {
-    const void* dict;
-    size_t dictSize;
-    ZSTD_dictContentType_e dictContentType;
-} ZSTD_prefixDict;
-
-typedef struct {
-    void* dictBuffer;
-    void const* dict;
-    size_t dictSize;
-    ZSTD_dictContentType_e dictContentType;
-    ZSTD_CDict* cdict;
-} ZSTD_localDict;
-
-typedef struct {
-    U32 CTable[HUF_CTABLE_SIZE_U32(255)];
-    HUF_repeat repeatMode;
-} ZSTD_hufCTables_t;
-
-typedef struct {
-    FSE_CTable offcodeCTable[FSE_CTABLE_SIZE_U32(OffFSELog, MaxOff)];
-    FSE_CTable matchlengthCTable[FSE_CTABLE_SIZE_U32(MLFSELog, MaxML)];
-    FSE_CTable litlengthCTable[FSE_CTABLE_SIZE_U32(LLFSELog, MaxLL)];
-    FSE_repeat offcode_repeatMode;
-    FSE_repeat matchlength_repeatMode;
-    FSE_repeat litlength_repeatMode;
-} ZSTD_fseCTables_t;
-
-typedef struct {
-    ZSTD_hufCTables_t huf;
-    ZSTD_fseCTables_t fse;
-} ZSTD_entropyCTables_t;
-
-typedef struct {
-    U32 off;
-    U32 len;
-} ZSTD_match_t;
-
-typedef struct {
-    int price;
-    U32 off;
-    U32 mlen;
-    U32 litlen;
-    U32 rep[ZSTD_REP_NUM];
-} ZSTD_optimal_t;
-
-typedef enum { zop_dynamic=0, zop_predef } ZSTD_OptPrice_e;
-
-typedef struct {
-    /* All tables are allocated inside cctx->workspace by ZSTD_resetCCtx_internal() */
-    unsigned* litFreq;           /* table of literals statistics, of size 256 */
-    unsigned* litLengthFreq;     /* table of litLength statistics, of size (MaxLL+1) */
-    unsigned* matchLengthFreq;   /* table of matchLength statistics, of size (MaxML+1) */
-    unsigned* offCodeFreq;       /* table of offCode statistics, of size (MaxOff+1) */
-    ZSTD_match_t* matchTable;    /* list of found matches, of size ZSTD_OPT_NUM+1 */
-    ZSTD_optimal_t* priceTable;  /* All positions tracked by optimal parser, of size ZSTD_OPT_NUM+1 */
-
-    U32  litSum;                 /* nb of literals */
-    U32  litLengthSum;           /* nb of litLength codes */
-    U32  matchLengthSum;         /* nb of matchLength codes */
-    U32  offCodeSum;             /* nb of offset codes */
-    U32  litSumBasePrice;        /* to compare to log2(litfreq) */
-    U32  litLengthSumBasePrice;  /* to compare to log2(llfreq)  */
-    U32  matchLengthSumBasePrice;/* to compare to log2(mlfreq)  */
-    U32  offCodeSumBasePrice;    /* to compare to log2(offreq)  */
-    ZSTD_OptPrice_e priceType;   /* prices can be determined dynamically, or follow a pre-defined cost structure */
-    const ZSTD_entropyCTables_t* symbolCosts;  /* pre-calculated dictionary statistics */
-    ZSTD_literalCompressionMode_e literalCompressionMode;
-} optState_t;
-
-typedef struct {
-  ZSTD_entropyCTables_t entropy;
-  U32 rep[ZSTD_REP_NUM];
-} ZSTD_compressedBlockState_t;
-
-typedef struct {
-    BYTE const* nextSrc;    /* next block here to continue on current prefix */
-    BYTE const* base;       /* All regular indexes relative to this position */
-    BYTE const* dictBase;   /* extDict indexes relative to this position */
-    U32 dictLimit;          /* below that point, need extDict */
-    U32 lowLimit;           /* below that point, no more valid data */
-} ZSTD_window_t;
-
-typedef struct ZSTD_matchState_t ZSTD_matchState_t;
-struct ZSTD_matchState_t {
-    ZSTD_window_t window;   /* State for window round buffer management */
-    U32 loadedDictEnd;      /* index of end of dictionary, within context's referential.
-                             * When loadedDictEnd != 0, a dictionary is in use, and still valid.
-                             * This relies on a mechanism to set loadedDictEnd=0 when dictionary is no longer within distance.
-                             * Such mechanism is provided within ZSTD_window_enforceMaxDist() and ZSTD_checkDictValidity().
-                             * When dict referential is copied into active context (i.e. not attached),
-                             * loadedDictEnd == dictSize, since referential starts from zero.
-                             */
-    U32 nextToUpdate;       /* index from which to continue table update */
-    U32 hashLog3;           /* dispatch table for matches of len==3 : larger == faster, more memory */
-    U32* hashTable;
-    U32* hashTable3;
-    U32* chainTable;
-    optState_t opt;         /* optimal parser state */
-    const ZSTD_matchState_t* dictMatchState;
-    ZSTD_compressionParameters cParams;
-};
-
-typedef struct {
-    ZSTD_compressedBlockState_t* prevCBlock;
-    ZSTD_compressedBlockState_t* nextCBlock;
-    ZSTD_matchState_t matchState;
-} ZSTD_blockState_t;
-
-typedef struct {
-    U32 offset;
-    U32 checksum;
-} ldmEntry_t;
-
-typedef struct {
-    ZSTD_window_t window;   /* State for the window round buffer management */
-    ldmEntry_t* hashTable;
-    BYTE* bucketOffsets;    /* Next position in bucket to insert entry */
-    U64 hashPower;          /* Used to compute the rolling hash.
-                             * Depends on ldmParams.minMatchLength */
-} ldmState_t;
-
-typedef struct {
-    U32 enableLdm;          /* 1 if enable long distance matching */
-    U32 hashLog;            /* Log size of hashTable */
-    U32 bucketSizeLog;      /* Log bucket size for collision resolution, at most 8 */
-    U32 minMatchLength;     /* Minimum match length */
-    U32 hashRateLog;       /* Log number of entries to skip */
-    U32 windowLog;          /* Window log for the LDM */
-} ldmParams_t;
-
-typedef struct {
-    U32 offset;
-    U32 litLength;
-    U32 matchLength;
-} rawSeq;
-
-typedef struct {
-  rawSeq* seq;     /* The start of the sequences */
-  size_t pos;      /* The position where reading stopped. <= size. */
-  size_t size;     /* The number of sequences. <= capacity. */
-  size_t capacity; /* The capacity starting from `seq` pointer */
-} rawSeqStore_t;
-
-struct ZSTD_CCtx_params_s {
-    ZSTD_format_e format;
-    ZSTD_compressionParameters cParams;
-    ZSTD_frameParameters fParams;
-
-    int compressionLevel;
-    int forceWindow;           /* force back-references to respect limit of
-                                * 1<<wLog, even for dictionary */
-    size_t targetCBlockSize;   /* Tries to fit compressed block size to be around targetCBlockSize.
-                                * No target when targetCBlockSize == 0.
-                                * There is no guarantee on compressed block size */
-
-    ZSTD_dictAttachPref_e attachDictPref;
-    ZSTD_literalCompressionMode_e literalCompressionMode;
-
-    /* Multithreading: used to pass parameters to mtctx */
-    int nbWorkers;
-    size_t jobSize;
-    int overlapLog;
-    int rsyncable;
-
-    /* Long distance matching parameters */
-    ldmParams_t ldmParams;
-
-    /* Internal use, for createCCtxParams() and freeCCtxParams() only */
-    ZSTD_customMem customMem;
-};  /* typedef'd to ZSTD_CCtx_params within "zstd.h" */
-
-struct ZSTD_CCtx_s {
-    ZSTD_compressionStage_e stage;
-    int cParamsChanged;                  /* == 1 if cParams(except wlog) or compression level are changed in requestedParams. Triggers transmission of new params to ZSTDMT (if available) then reset to 0. */
-    int bmi2;                            /* == 1 if the CPU supports BMI2 and 0 otherwise. CPU support is determined dynamically once per context lifetime. */
-    ZSTD_CCtx_params requestedParams;
-    ZSTD_CCtx_params appliedParams;
-    U32   dictID;
-
-    int workSpaceOversizedDuration;
-    void* workSpace;
-    size_t workSpaceSize;
-    size_t blockSize;
-    unsigned long long pledgedSrcSizePlusOne;  /* this way, 0 (default) == unknown */
-    unsigned long long consumedSrcSize;
-    unsigned long long producedCSize;
-    XXH64_state_t xxhState;
-    ZSTD_customMem customMem;
-    size_t staticSize;
-
-    seqStore_t seqStore;      /* sequences storage ptrs */
-    ldmState_t ldmState;      /* long distance matching state */
-    rawSeq* ldmSequences;     /* Storage for the ldm output sequences */
-    size_t maxNbLdmSequences;
-    rawSeqStore_t externSeqStore; /* Mutable reference to external sequences */
-    ZSTD_blockState_t blockState;
-    U32* entropyWorkspace;  /* entropy workspace of HUF_WORKSPACE_SIZE bytes */
-
-    /* streaming */
-    char*  inBuff;
-    size_t inBuffSize;
-    size_t inToCompress;
-    size_t inBuffPos;
-    size_t inBuffTarget;
-    char*  outBuff;
-    size_t outBuffSize;
-    size_t outBuffContentSize;
-    size_t outBuffFlushedSize;
-    ZSTD_cStreamStage streamStage;
-    U32    frameEnded;
-
-    /* Dictionary */
-    ZSTD_localDict localDict;
-    const ZSTD_CDict* cdict;
-    ZSTD_prefixDict prefixDict;   /* single-usage dictionary */
-
-    /* Multi-threading */
-#ifdef ZSTD_MULTITHREAD
-    ZSTDMT_CCtx* mtctx;
-#endif
-};
-
-typedef enum { ZSTD_dtlm_fast, ZSTD_dtlm_full } ZSTD_dictTableLoadMethod_e;
-
-typedef enum { ZSTD_noDict = 0, ZSTD_extDict = 1, ZSTD_dictMatchState = 2 } ZSTD_dictMode_e;
-
-
-typedef size_t (*ZSTD_blockCompressor) (
-        ZSTD_matchState_t* bs, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize);
-ZSTD_blockCompressor ZSTD_selectBlockCompressor(ZSTD_strategy strat, ZSTD_dictMode_e dictMode);
-
-
-MEM_STATIC U32 ZSTD_LLcode(U32 litLength)
-{
-    static const BYTE LL_Code[64] = {  0,  1,  2,  3,  4,  5,  6,  7,
-                                       8,  9, 10, 11, 12, 13, 14, 15,
-                                      16, 16, 17, 17, 18, 18, 19, 19,
-                                      20, 20, 20, 20, 21, 21, 21, 21,
-                                      22, 22, 22, 22, 22, 22, 22, 22,
-                                      23, 23, 23, 23, 23, 23, 23, 23,
-                                      24, 24, 24, 24, 24, 24, 24, 24,
-                                      24, 24, 24, 24, 24, 24, 24, 24 };
-    static const U32 LL_deltaCode = 19;
-    return (litLength > 63) ? ZSTD_highbit32(litLength) + LL_deltaCode : LL_Code[litLength];
-}
-
-/* ZSTD_MLcode() :
- * note : mlBase = matchLength - MINMATCH;
- *        because it's the format it's stored in seqStore->sequences */
-MEM_STATIC U32 ZSTD_MLcode(U32 mlBase)
-{
-    static const BYTE ML_Code[128] = { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
-                                      16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-                                      32, 32, 33, 33, 34, 34, 35, 35, 36, 36, 36, 36, 37, 37, 37, 37,
-                                      38, 38, 38, 38, 38, 38, 38, 38, 39, 39, 39, 39, 39, 39, 39, 39,
-                                      40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
-                                      41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-                                      42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42,
-                                      42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42 };
-    static const U32 ML_deltaCode = 36;
-    return (mlBase > 127) ? ZSTD_highbit32(mlBase) + ML_deltaCode : ML_Code[mlBase];
-}
-
-/* ZSTD_cParam_withinBounds:
- * @return 1 if value is within cParam bounds,
- * 0 otherwise */
-MEM_STATIC int ZSTD_cParam_withinBounds(ZSTD_cParameter cParam, int value)
-{
-    ZSTD_bounds const bounds = ZSTD_cParam_getBounds(cParam);
-    if (ZSTD_isError(bounds.error)) return 0;
-    if (value < bounds.lowerBound) return 0;
-    if (value > bounds.upperBound) return 0;
-    return 1;
-}
-
-/* ZSTD_minGain() :
- * minimum compression required
- * to generate a compress block or a compressed literals section.
- * note : use same formula for both situations */
-MEM_STATIC size_t ZSTD_minGain(size_t srcSize, ZSTD_strategy strat)
-{
-    U32 const minlog = (strat>=ZSTD_btultra) ? (U32)(strat) - 1 : 6;
-    ZSTD_STATIC_ASSERT(ZSTD_btultra == 8);
-    assert(ZSTD_cParam_withinBounds(ZSTD_c_strategy, strat));
-    return (srcSize >> minlog) + 2;
-}
-
-/*! ZSTD_storeSeq() :
- *  Store a sequence (literal length, literals, offset code and match length code) into seqStore_t.
- *  `offsetCode` : distance to match + 3 (values 1-3 are repCodes).
- *  `mlBase` : matchLength - MINMATCH
-*/
-MEM_STATIC void ZSTD_storeSeq(seqStore_t* seqStorePtr, size_t litLength, const void* literals, U32 offsetCode, size_t mlBase)
-{
-#if defined(DEBUGLEVEL) && (DEBUGLEVEL >= 6)
-    static const BYTE* g_start = NULL;
-    if (g_start==NULL) g_start = (const BYTE*)literals;  /* note : index only works for compression within a single segment */
-    {   U32 const pos = (U32)((const BYTE*)literals - g_start);
-        DEBUGLOG(6, "Cpos%7u :%3u literals, match%4u bytes at offCode%7u",
-               pos, (U32)litLength, (U32)mlBase+MINMATCH, (U32)offsetCode);
-    }
-#endif
-    assert((size_t)(seqStorePtr->sequences - seqStorePtr->sequencesStart) < seqStorePtr->maxNbSeq);
-    /* copy Literals */
-    assert(seqStorePtr->maxNbLit <= 128 KB);
-    assert(seqStorePtr->lit + litLength <= seqStorePtr->litStart + seqStorePtr->maxNbLit);
-    ZSTD_wildcopy(seqStorePtr->lit, literals, (ptrdiff_t)litLength, ZSTD_no_overlap);
-    seqStorePtr->lit += litLength;
-
-    /* literal Length */
-    if (litLength>0xFFFF) {
-        assert(seqStorePtr->longLengthID == 0); /* there can only be a single long length */
-        seqStorePtr->longLengthID = 1;
-        seqStorePtr->longLengthPos = (U32)(seqStorePtr->sequences - seqStorePtr->sequencesStart);
-    }
-    seqStorePtr->sequences[0].litLength = (U16)litLength;
-
-    /* match offset */
-    seqStorePtr->sequences[0].offset = offsetCode + 1;
-
-    /* match Length */
-    if (mlBase>0xFFFF) {
-        assert(seqStorePtr->longLengthID == 0); /* there can only be a single long length */
-        seqStorePtr->longLengthID = 2;
-        seqStorePtr->longLengthPos = (U32)(seqStorePtr->sequences - seqStorePtr->sequencesStart);
-    }
-    seqStorePtr->sequences[0].matchLength = (U16)mlBase;
-
-    seqStorePtr->sequences++;
-}
-
-
-/*-*************************************
-*  Match length counter
-***************************************/
-static unsigned ZSTD_NbCommonBytes (size_t val)
-{
-    if (MEM_isLittleEndian()) {
-        if (MEM_64bits()) {
-#       if defined(_MSC_VER) && defined(_WIN64)
-            unsigned long r = 0;
-            _BitScanForward64( &r, (U64)val );
-            return (unsigned)(r>>3);
-#       elif defined(__GNUC__) && (__GNUC__ >= 4)
-            return (__builtin_ctzll((U64)val) >> 3);
-#       else
-            static const int DeBruijnBytePos[64] = { 0, 0, 0, 0, 0, 1, 1, 2,
-                                                     0, 3, 1, 3, 1, 4, 2, 7,
-                                                     0, 2, 3, 6, 1, 5, 3, 5,
-                                                     1, 3, 4, 4, 2, 5, 6, 7,
-                                                     7, 0, 1, 2, 3, 3, 4, 6,
-                                                     2, 6, 5, 5, 3, 4, 5, 6,
-                                                     7, 1, 2, 4, 6, 4, 4, 5,
-                                                     7, 2, 6, 5, 7, 6, 7, 7 };
-            return DeBruijnBytePos[((U64)((val & -(long long)val) * 0x0218A392CDABBD3FULL)) >> 58];
-#       endif
-        } else { /* 32 bits */
-#       if defined(_MSC_VER)
-            unsigned long r=0;
-            _BitScanForward( &r, (U32)val );
-            return (unsigned)(r>>3);
-#       elif defined(__GNUC__) && (__GNUC__ >= 3)
-            return (__builtin_ctz((U32)val) >> 3);
-#       else
-            static const int DeBruijnBytePos[32] = { 0, 0, 3, 0, 3, 1, 3, 0,
-                                                     3, 2, 2, 1, 3, 2, 0, 1,
-                                                     3, 3, 1, 2, 2, 2, 2, 0,
-                                                     3, 1, 2, 0, 1, 0, 1, 1 };
-            return DeBruijnBytePos[((U32)((val & -(S32)val) * 0x077CB531U)) >> 27];
-#       endif
-        }
-    } else {  /* Big Endian CPU */
-        if (MEM_64bits()) {
-#       if defined(_MSC_VER) && defined(_WIN64)
-            unsigned long r = 0;
-            _BitScanReverse64( &r, val );
-            return (unsigned)(r>>3);
-#       elif defined(__GNUC__) && (__GNUC__ >= 4)
-            return (__builtin_clzll(val) >> 3);
-#       else
-            unsigned r;
-            const unsigned n32 = sizeof(size_t)*4;   /* calculate this way due to compiler complaining in 32-bits mode */
-            if (!(val>>n32)) { r=4; } else { r=0; val>>=n32; }
-            if (!(val>>16)) { r+=2; val>>=8; } else { val>>=24; }
-            r += (!val);
-            return r;
-#       endif
-        } else { /* 32 bits */
-#       if defined(_MSC_VER)
-            unsigned long r = 0;
-            _BitScanReverse( &r, (unsigned long)val );
-            return (unsigned)(r>>3);
-#       elif defined(__GNUC__) && (__GNUC__ >= 3)
-            return (__builtin_clz((U32)val) >> 3);
-#       else
-            unsigned r;
-            if (!(val>>16)) { r=2; val>>=8; } else { r=0; val>>=24; }
-            r += (!val);
-            return r;
-#       endif
-    }   }
-}
-
-
-MEM_STATIC size_t ZSTD_count(const BYTE* pIn, const BYTE* pMatch, const BYTE* const pInLimit)
-{
-    const BYTE* const pStart = pIn;
-    const BYTE* const pInLoopLimit = pInLimit - (sizeof(size_t)-1);
-
-    if (pIn < pInLoopLimit) {
-        { size_t const diff = MEM_readST(pMatch) ^ MEM_readST(pIn);
-          if (diff) return ZSTD_NbCommonBytes(diff); }
-        pIn+=sizeof(size_t); pMatch+=sizeof(size_t);
-        while (pIn < pInLoopLimit) {
-            size_t const diff = MEM_readST(pMatch) ^ MEM_readST(pIn);
-            if (!diff) { pIn+=sizeof(size_t); pMatch+=sizeof(size_t); continue; }
-            pIn += ZSTD_NbCommonBytes(diff);
-            return (size_t)(pIn - pStart);
-    }   }
-    if (MEM_64bits() && (pIn<(pInLimit-3)) && (MEM_read32(pMatch) == MEM_read32(pIn))) { pIn+=4; pMatch+=4; }
-    if ((pIn<(pInLimit-1)) && (MEM_read16(pMatch) == MEM_read16(pIn))) { pIn+=2; pMatch+=2; }
-    if ((pIn<pInLimit) && (*pMatch == *pIn)) pIn++;
-    return (size_t)(pIn - pStart);
-}
-
-/** ZSTD_count_2segments() :
- *  can count match length with `ip` & `match` in 2 different segments.
- *  convention : on reaching mEnd, match count continue starting from iStart
- */
-MEM_STATIC size_t
-ZSTD_count_2segments(const BYTE* ip, const BYTE* match,
-                     const BYTE* iEnd, const BYTE* mEnd, const BYTE* iStart)
-{
-    const BYTE* const vEnd = MIN( ip + (mEnd - match), iEnd);
-    size_t const matchLength = ZSTD_count(ip, match, vEnd);
-    if (match + matchLength != mEnd) return matchLength;
-    DEBUGLOG(7, "ZSTD_count_2segments: found a 2-parts match (current length==%zu)", matchLength);
-    DEBUGLOG(7, "distance from match beginning to end dictionary = %zi", mEnd - match);
-    DEBUGLOG(7, "distance from current pos to end buffer = %zi", iEnd - ip);
-    DEBUGLOG(7, "next byte : ip==%02X, istart==%02X", ip[matchLength], *iStart);
-    DEBUGLOG(7, "final match length = %zu", matchLength + ZSTD_count(ip+matchLength, iStart, iEnd));
-    return matchLength + ZSTD_count(ip+matchLength, iStart, iEnd);
-}
-
-
-/*-*************************************
- *  Hashes
- ***************************************/
-static const U32 prime3bytes = 506832829U;
-static U32    ZSTD_hash3(U32 u, U32 h) { return ((u << (32-24)) * prime3bytes)  >> (32-h) ; }
-MEM_STATIC size_t ZSTD_hash3Ptr(const void* ptr, U32 h) { return ZSTD_hash3(MEM_readLE32(ptr), h); } /* only in zstd_opt.h */
-
-static const U32 prime4bytes = 2654435761U;
-static U32    ZSTD_hash4(U32 u, U32 h) { return (u * prime4bytes) >> (32-h) ; }
-static size_t ZSTD_hash4Ptr(const void* ptr, U32 h) { return ZSTD_hash4(MEM_read32(ptr), h); }
-
-static const U64 prime5bytes = 889523592379ULL;
-static size_t ZSTD_hash5(U64 u, U32 h) { return (size_t)(((u  << (64-40)) * prime5bytes) >> (64-h)) ; }
-static size_t ZSTD_hash5Ptr(const void* p, U32 h) { return ZSTD_hash5(MEM_readLE64(p), h); }
-
-static const U64 prime6bytes = 227718039650203ULL;
-static size_t ZSTD_hash6(U64 u, U32 h) { return (size_t)(((u  << (64-48)) * prime6bytes) >> (64-h)) ; }
-static size_t ZSTD_hash6Ptr(const void* p, U32 h) { return ZSTD_hash6(MEM_readLE64(p), h); }
-
-static const U64 prime7bytes = 58295818150454627ULL;
-static size_t ZSTD_hash7(U64 u, U32 h) { return (size_t)(((u  << (64-56)) * prime7bytes) >> (64-h)) ; }
-static size_t ZSTD_hash7Ptr(const void* p, U32 h) { return ZSTD_hash7(MEM_readLE64(p), h); }
-
-static const U64 prime8bytes = 0xCF1BBCDCB7A56463ULL;
-static size_t ZSTD_hash8(U64 u, U32 h) { return (size_t)(((u) * prime8bytes) >> (64-h)) ; }
-static size_t ZSTD_hash8Ptr(const void* p, U32 h) { return ZSTD_hash8(MEM_readLE64(p), h); }
-
-MEM_STATIC size_t ZSTD_hashPtr(const void* p, U32 hBits, U32 mls)
-{
-    switch(mls)
-    {
-    default:
-    case 4: return ZSTD_hash4Ptr(p, hBits);
-    case 5: return ZSTD_hash5Ptr(p, hBits);
-    case 6: return ZSTD_hash6Ptr(p, hBits);
-    case 7: return ZSTD_hash7Ptr(p, hBits);
-    case 8: return ZSTD_hash8Ptr(p, hBits);
-    }
-}
-
-/** ZSTD_ipow() :
- * Return base^exponent.
- */
-static U64 ZSTD_ipow(U64 base, U64 exponent)
-{
-    U64 power = 1;
-    while (exponent) {
-      if (exponent & 1) power *= base;
-      exponent >>= 1;
-      base *= base;
-    }
-    return power;
-}
-
-#define ZSTD_ROLL_HASH_CHAR_OFFSET 10
-
-/** ZSTD_rollingHash_append() :
- * Add the buffer to the hash value.
- */
-static U64 ZSTD_rollingHash_append(U64 hash, void const* buf, size_t size)
-{
-    BYTE const* istart = (BYTE const*)buf;
-    size_t pos;
-    for (pos = 0; pos < size; ++pos) {
-        hash *= prime8bytes;
-        hash += istart[pos] + ZSTD_ROLL_HASH_CHAR_OFFSET;
-    }
-    return hash;
-}
-
-/** ZSTD_rollingHash_compute() :
- * Compute the rolling hash value of the buffer.
- */
-MEM_STATIC U64 ZSTD_rollingHash_compute(void const* buf, size_t size)
-{
-    return ZSTD_rollingHash_append(0, buf, size);
-}
-
-/** ZSTD_rollingHash_primePower() :
- * Compute the primePower to be passed to ZSTD_rollingHash_rotate() for a hash
- * over a window of length bytes.
- */
-MEM_STATIC U64 ZSTD_rollingHash_primePower(U32 length)
-{
-    return ZSTD_ipow(prime8bytes, length - 1);
-}
-
-/** ZSTD_rollingHash_rotate() :
- * Rotate the rolling hash by one byte.
- */
-MEM_STATIC U64 ZSTD_rollingHash_rotate(U64 hash, BYTE toRemove, BYTE toAdd, U64 primePower)
-{
-    hash -= (toRemove + ZSTD_ROLL_HASH_CHAR_OFFSET) * primePower;
-    hash *= prime8bytes;
-    hash += toAdd + ZSTD_ROLL_HASH_CHAR_OFFSET;
-    return hash;
-}
-
-/*-*************************************
-*  Round buffer management
-***************************************/
-#if (ZSTD_WINDOWLOG_MAX_64 > 31)
-# error "ZSTD_WINDOWLOG_MAX is too large : would overflow ZSTD_CURRENT_MAX"
-#endif
-/* Max current allowed */
-#define ZSTD_CURRENT_MAX ((3U << 29) + (1U << ZSTD_WINDOWLOG_MAX))
-/* Maximum chunk size before overflow correction needs to be called again */
-#define ZSTD_CHUNKSIZE_MAX                                                     \
-    ( ((U32)-1)                  /* Maximum ending current index */            \
-    - ZSTD_CURRENT_MAX)          /* Maximum beginning lowLimit */
-
-/**
- * ZSTD_window_clear():
- * Clears the window containing the history by simply setting it to empty.
- */
-MEM_STATIC void ZSTD_window_clear(ZSTD_window_t* window)
-{
-    size_t const endT = (size_t)(window->nextSrc - window->base);
-    U32 const end = (U32)endT;
-
-    window->lowLimit = end;
-    window->dictLimit = end;
-}
-
-/**
- * ZSTD_window_hasExtDict():
- * Returns non-zero if the window has a non-empty extDict.
- */
-MEM_STATIC U32 ZSTD_window_hasExtDict(ZSTD_window_t const window)
-{
-    return window.lowLimit < window.dictLimit;
-}
-
-/**
- * ZSTD_matchState_dictMode():
- * Inspects the provided matchState and figures out what dictMode should be
- * passed to the compressor.
- */
-MEM_STATIC ZSTD_dictMode_e ZSTD_matchState_dictMode(const ZSTD_matchState_t *ms)
-{
-    return ZSTD_window_hasExtDict(ms->window) ?
-        ZSTD_extDict :
-        ms->dictMatchState != NULL ?
-            ZSTD_dictMatchState :
-            ZSTD_noDict;
-}
-
-/**
- * ZSTD_window_needOverflowCorrection():
- * Returns non-zero if the indices are getting too large and need overflow
- * protection.
- */
-MEM_STATIC U32 ZSTD_window_needOverflowCorrection(ZSTD_window_t const window,
-                                                  void const* srcEnd)
-{
-    U32 const current = (U32)((BYTE const*)srcEnd - window.base);
-    return current > ZSTD_CURRENT_MAX;
-}
-
-/**
- * ZSTD_window_correctOverflow():
- * Reduces the indices to protect from index overflow.
- * Returns the correction made to the indices, which must be applied to every
- * stored index.
- *
- * The least significant cycleLog bits of the indices must remain the same,
- * which may be 0. Every index up to maxDist in the past must be valid.
- * NOTE: (maxDist & cycleMask) must be zero.
- */
-MEM_STATIC U32 ZSTD_window_correctOverflow(ZSTD_window_t* window, U32 cycleLog,
-                                           U32 maxDist, void const* src)
-{
-    /* preemptive overflow correction:
-     * 1. correction is large enough:
-     *    lowLimit > (3<<29) ==> current > 3<<29 + 1<<windowLog
-     *    1<<windowLog <= newCurrent < 1<<chainLog + 1<<windowLog
-     *
-     *    current - newCurrent
-     *    > (3<<29 + 1<<windowLog) - (1<<windowLog + 1<<chainLog)
-     *    > (3<<29) - (1<<chainLog)
-     *    > (3<<29) - (1<<30)             (NOTE: chainLog <= 30)
-     *    > 1<<29
-     *
-     * 2. (ip+ZSTD_CHUNKSIZE_MAX - cctx->base) doesn't overflow:
-     *    After correction, current is less than (1<<chainLog + 1<<windowLog).
-     *    In 64-bit mode we are safe, because we have 64-bit ptrdiff_t.
-     *    In 32-bit mode we are safe, because (chainLog <= 29), so
-     *    ip+ZSTD_CHUNKSIZE_MAX - cctx->base < 1<<32.
-     * 3. (cctx->lowLimit + 1<<windowLog) < 1<<32:
-     *    windowLog <= 31 ==> 3<<29 + 1<<windowLog < 7<<29 < 1<<32.
-     */
-    U32 const cycleMask = (1U << cycleLog) - 1;
-    U32 const current = (U32)((BYTE const*)src - window->base);
-    U32 const newCurrent = (current & cycleMask) + maxDist;
-    U32 const correction = current - newCurrent;
-    assert((maxDist & cycleMask) == 0);
-    assert(current > newCurrent);
-    /* Loose bound, should be around 1<<29 (see above) */
-    assert(correction > 1<<28);
-
-    window->base += correction;
-    window->dictBase += correction;
-    window->lowLimit -= correction;
-    window->dictLimit -= correction;
-
-    DEBUGLOG(4, "Correction of 0x%x bytes to lowLimit=0x%x", correction,
-             window->lowLimit);
-    return correction;
-}
-
-/**
- * ZSTD_window_enforceMaxDist():
- * Updates lowLimit so that:
- *    (srcEnd - base) - lowLimit == maxDist + loadedDictEnd
- *
- * It ensures index is valid as long as index >= lowLimit.
- * This must be called before a block compression call.
- *
- * loadedDictEnd is only defined if a dictionary is in use for current compression.
- * As the name implies, loadedDictEnd represents the index at end of dictionary.
- * The value lies within context's referential, it can be directly compared to blockEndIdx.
- *
- * If loadedDictEndPtr is NULL, no dictionary is in use, and we use loadedDictEnd == 0.
- * If loadedDictEndPtr is not NULL, we set it to zero after updating lowLimit.
- * This is because dictionaries are allowed to be referenced fully
- * as long as the last byte of the dictionary is in the window.
- * Once input has progressed beyond window size, dictionary cannot be referenced anymore.
- *
- * In normal dict mode, the dictionary lies between lowLimit and dictLimit.
- * In dictMatchState mode, lowLimit and dictLimit are the same,
- * and the dictionary is below them.
- * forceWindow and dictMatchState are therefore incompatible.
- */
-MEM_STATIC void
-ZSTD_window_enforceMaxDist(ZSTD_window_t* window,
-                     const void* blockEnd,
-                           U32   maxDist,
-                           U32*  loadedDictEndPtr,
-                     const ZSTD_matchState_t** dictMatchStatePtr)
-{
-    U32 const blockEndIdx = (U32)((BYTE const*)blockEnd - window->base);
-    U32 const loadedDictEnd = (loadedDictEndPtr != NULL) ? *loadedDictEndPtr : 0;
-    DEBUGLOG(5, "ZSTD_window_enforceMaxDist: blockEndIdx=%u, maxDist=%u, loadedDictEnd=%u",
-                (unsigned)blockEndIdx, (unsigned)maxDist, (unsigned)loadedDictEnd);
-
-    /* - When there is no dictionary : loadedDictEnd == 0.
-         In which case, the test (blockEndIdx > maxDist) is merely to avoid
-         overflowing next operation `newLowLimit = blockEndIdx - maxDist`.
-       - When there is a standard dictionary :
-         Index referential is copied from the dictionary,
-         which means it starts from 0.
-         In which case, loadedDictEnd == dictSize,
-         and it makes sense to compare `blockEndIdx > maxDist + dictSize`
-         since `blockEndIdx` also starts from zero.
-       - When there is an attached dictionary :
-         loadedDictEnd is expressed within the referential of the context,
-         so it can be directly compared against blockEndIdx.
-    */
-    if (blockEndIdx > maxDist + loadedDictEnd) {
-        U32 const newLowLimit = blockEndIdx - maxDist;
-        if (window->lowLimit < newLowLimit) window->lowLimit = newLowLimit;
-        if (window->dictLimit < window->lowLimit) {
-            DEBUGLOG(5, "Update dictLimit to match lowLimit, from %u to %u",
-                        (unsigned)window->dictLimit, (unsigned)window->lowLimit);
-            window->dictLimit = window->lowLimit;
-        }
-        /* On reaching window size, dictionaries are invalidated */
-        if (loadedDictEndPtr) *loadedDictEndPtr = 0;
-        if (dictMatchStatePtr) *dictMatchStatePtr = NULL;
-    }
-}
-
-/* Similar to ZSTD_window_enforceMaxDist(),
- * but only invalidates dictionary
- * when input progresses beyond window size.
- * assumption : loadedDictEndPtr and dictMatchStatePtr are valid (non NULL)
- *              loadedDictEnd uses same referential as window->base
- *              maxDist is the window size */
-MEM_STATIC void
-ZSTD_checkDictValidity(const ZSTD_window_t* window,
-                       const void* blockEnd,
-                             U32   maxDist,
-                             U32*  loadedDictEndPtr,
-                       const ZSTD_matchState_t** dictMatchStatePtr)
-{
-    assert(loadedDictEndPtr != NULL);
-    assert(dictMatchStatePtr != NULL);
-    {   U32 const blockEndIdx = (U32)((BYTE const*)blockEnd - window->base);
-        U32 const loadedDictEnd = *loadedDictEndPtr;
-        DEBUGLOG(5, "ZSTD_checkDictValidity: blockEndIdx=%u, maxDist=%u, loadedDictEnd=%u",
-                    (unsigned)blockEndIdx, (unsigned)maxDist, (unsigned)loadedDictEnd);
-        assert(blockEndIdx >= loadedDictEnd);
-
-        if (blockEndIdx > loadedDictEnd + maxDist) {
-            /* On reaching window size, dictionaries are invalidated.
-             * For simplification, if window size is reached anywhere within next block,
-             * the dictionary is invalidated for the full block.
-             */
-            DEBUGLOG(6, "invalidating dictionary for current block (distance > windowSize)");
-            *loadedDictEndPtr = 0;
-            *dictMatchStatePtr = NULL;
-        } else {
-            if (*loadedDictEndPtr != 0) {
-                DEBUGLOG(6, "dictionary considered valid for current block");
-    }   }   }
-}
-
-/**
- * ZSTD_window_update():
- * Updates the window by appending [src, src + srcSize) to the window.
- * If it is not contiguous, the current prefix becomes the extDict, and we
- * forget about the extDict. Handles overlap of the prefix and extDict.
- * Returns non-zero if the segment is contiguous.
- */
-MEM_STATIC U32 ZSTD_window_update(ZSTD_window_t* window,
-                                  void const* src, size_t srcSize)
-SUPPRESS_UBSAN_CLANG10
-{
-    BYTE const* const ip = (BYTE const*)src;
-    U32 contiguous = 1;
-    DEBUGLOG(5, "ZSTD_window_update");
-    /* Check if blocks follow each other */
-    if (src != window->nextSrc) {
-        /* not contiguous */
-        size_t const distanceFromBase = (size_t)(window->nextSrc - window->base);
-        DEBUGLOG(5, "Non contiguous blocks, new segment starts at %u", window->dictLimit);
-        window->lowLimit = window->dictLimit;
-        assert(distanceFromBase == (size_t)(U32)distanceFromBase);  /* should never overflow */
-        window->dictLimit = (U32)distanceFromBase;
-        window->dictBase = window->base;
-        window->base = ip - distanceFromBase;
-        // ms->nextToUpdate = window->dictLimit;
-        if (window->dictLimit - window->lowLimit < HASH_READ_SIZE) window->lowLimit = window->dictLimit;   /* too small extDict */
-        contiguous = 0;
-    }
-    window->nextSrc = ip + srcSize;
-    /* if input and dictionary overlap : reduce dictionary (area presumed modified by input) */
-    if ( (ip+srcSize > window->dictBase + window->lowLimit)
-       & (ip < window->dictBase + window->dictLimit)) {
-        ptrdiff_t const highInputIdx = (ip + srcSize) - window->dictBase;
-        U32 const lowLimitMax = (highInputIdx > (ptrdiff_t)window->dictLimit) ? window->dictLimit : (U32)highInputIdx;
-        window->lowLimit = lowLimitMax;
-        DEBUGLOG(5, "Overlapping extDict and input : new lowLimit = %u", window->lowLimit);
-    }
-    return contiguous;
-}
-
-MEM_STATIC U32 ZSTD_getLowestMatchIndex(const ZSTD_matchState_t* ms, U32 current, unsigned windowLog)
-{
-    U32    const maxDistance = 1U << windowLog;
-    U32    const lowestValid = ms->window.lowLimit;
-    U32    const withinWindow = (current - lowestValid > maxDistance) ? current - maxDistance : lowestValid;
-    U32    const isDictionary = (ms->loadedDictEnd != 0);
-    U32    const matchLowest = isDictionary ? lowestValid : withinWindow;
-    return matchLowest;
-}
-
-
-
-/* debug functions */
-#if (DEBUGLEVEL>=2)
-
-MEM_STATIC double ZSTD_fWeight(U32 rawStat)
-{
-    U32 const fp_accuracy = 8;
-    U32 const fp_multiplier = (1 << fp_accuracy);
-    U32 const newStat = rawStat + 1;
-    U32 const hb = ZSTD_highbit32(newStat);
-    U32 const BWeight = hb * fp_multiplier;
-    U32 const FWeight = (newStat << fp_accuracy) >> hb;
-    U32 const weight = BWeight + FWeight;
-    assert(hb + fp_accuracy < 31);
-    return (double)weight / fp_multiplier;
-}
-
-/* display a table content,
- * listing each element, its frequency, and its predicted bit cost */
-MEM_STATIC void ZSTD_debugTable(const U32* table, U32 max)
-{
-    unsigned u, sum;
-    for (u=0, sum=0; u<=max; u++) sum += table[u];
-    DEBUGLOG(2, "total nb elts: %u", sum);
-    for (u=0; u<=max; u++) {
-        DEBUGLOG(2, "%2u: %5u  (%.2f)",
-                u, table[u], ZSTD_fWeight(sum) - ZSTD_fWeight(table[u]) );
-    }
-}
-
-#endif
-
-
-#if defined (__cplusplus)
-}
-#endif
-
-
-/* ==============================================================
- * Private declarations
- * These prototypes shall only be called from within lib/compress
- * ============================================================== */
-
-/* ZSTD_getCParamsFromCCtxParams() :
- * cParams are built depending on compressionLevel, src size hints,
- * LDM and manually set compression parameters.
- */
-ZSTD_compressionParameters ZSTD_getCParamsFromCCtxParams(
-        const ZSTD_CCtx_params* CCtxParams, U64 srcSizeHint, size_t dictSize);
-
-/*! ZSTD_initCStream_internal() :
- *  Private use only. Init streaming operation.
- *  expects params to be valid.
- *  must receive dict, or cdict, or none, but not both.
- *  @return : 0, or an error code */
-size_t ZSTD_initCStream_internal(ZSTD_CStream* zcs,
-                     const void* dict, size_t dictSize,
-                     const ZSTD_CDict* cdict,
-                     ZSTD_CCtx_params  params, unsigned long long pledgedSrcSize);
-
-void ZSTD_resetSeqStore(seqStore_t* ssPtr);
-
-/*! ZSTD_getCParamsFromCDict() :
- *  as the name implies */
-ZSTD_compressionParameters ZSTD_getCParamsFromCDict(const ZSTD_CDict* cdict);
-
-/* ZSTD_compressBegin_advanced_internal() :
- * Private use only. To be called from zstdmt_compress.c. */
-size_t ZSTD_compressBegin_advanced_internal(ZSTD_CCtx* cctx,
-                                    const void* dict, size_t dictSize,
-                                    ZSTD_dictContentType_e dictContentType,
-                                    ZSTD_dictTableLoadMethod_e dtlm,
-                                    const ZSTD_CDict* cdict,
-                                    ZSTD_CCtx_params params,
-                                    unsigned long long pledgedSrcSize);
-
-/* ZSTD_compress_advanced_internal() :
- * Private use only. To be called from zstdmt_compress.c. */
-size_t ZSTD_compress_advanced_internal(ZSTD_CCtx* cctx,
-                                       void* dst, size_t dstCapacity,
-                                 const void* src, size_t srcSize,
-                                 const void* dict,size_t dictSize,
-                                 ZSTD_CCtx_params params);
-
-
-/* ZSTD_writeLastEmptyBlock() :
- * output an empty Block with end-of-frame mark to complete a frame
- * @return : size of data written into `dst` (== ZSTD_blockHeaderSize (defined in zstd_internal.h))
- *           or an error code if `dstCapacity` is too small (<ZSTD_blockHeaderSize)
- */
-size_t ZSTD_writeLastEmptyBlock(void* dst, size_t dstCapacity);
-
-
-/* ZSTD_referenceExternalSequences() :
- * Must be called before starting a compression operation.
- * seqs must parse a prefix of the source.
- * This cannot be used when long range matching is enabled.
- * Zstd will use these sequences, and pass the literals to a secondary block
- * compressor.
- * @return : An error code on failure.
- * NOTE: seqs are not verified! Invalid sequences can cause out-of-bounds memory
- * access and data corruption.
- */
-size_t ZSTD_referenceExternalSequences(ZSTD_CCtx* cctx, rawSeq* seq, size_t nbSeq);
-
-
-#endif /* ZSTD_COMPRESS_H */
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/compress/zstd_compress_literals.c mysql-8.0-8.0.27/extra/zstd/lib/compress/zstd_compress_literals.c
--- mysql-8.0-8.0.26/extra/zstd/lib/compress/zstd_compress_literals.c	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/compress/zstd_compress_literals.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,149 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
- /*-*************************************
- *  Dependencies
- ***************************************/
-#include "zstd_compress_literals.h"
-
-size_t ZSTD_noCompressLiterals (void* dst, size_t dstCapacity, const void* src, size_t srcSize)
-{
-    BYTE* const ostart = (BYTE* const)dst;
-    U32   const flSize = 1 + (srcSize>31) + (srcSize>4095);
-
-    RETURN_ERROR_IF(srcSize + flSize > dstCapacity, dstSize_tooSmall);
-
-    switch(flSize)
-    {
-        case 1: /* 2 - 1 - 5 */
-            ostart[0] = (BYTE)((U32)set_basic + (srcSize<<3));
-            break;
-        case 2: /* 2 - 2 - 12 */
-            MEM_writeLE16(ostart, (U16)((U32)set_basic + (1<<2) + (srcSize<<4)));
-            break;
-        case 3: /* 2 - 2 - 20 */
-            MEM_writeLE32(ostart, (U32)((U32)set_basic + (3<<2) + (srcSize<<4)));
-            break;
-        default:   /* not necessary : flSize is {1,2,3} */
-            assert(0);
-    }
-
-    memcpy(ostart + flSize, src, srcSize);
-    return srcSize + flSize;
-}
-
-size_t ZSTD_compressRleLiteralsBlock (void* dst, size_t dstCapacity, const void* src, size_t srcSize)
-{
-    BYTE* const ostart = (BYTE* const)dst;
-    U32   const flSize = 1 + (srcSize>31) + (srcSize>4095);
-
-    (void)dstCapacity;  /* dstCapacity already guaranteed to be >=4, hence large enough */
-
-    switch(flSize)
-    {
-        case 1: /* 2 - 1 - 5 */
-            ostart[0] = (BYTE)((U32)set_rle + (srcSize<<3));
-            break;
-        case 2: /* 2 - 2 - 12 */
-            MEM_writeLE16(ostart, (U16)((U32)set_rle + (1<<2) + (srcSize<<4)));
-            break;
-        case 3: /* 2 - 2 - 20 */
-            MEM_writeLE32(ostart, (U32)((U32)set_rle + (3<<2) + (srcSize<<4)));
-            break;
-        default:   /* not necessary : flSize is {1,2,3} */
-            assert(0);
-    }
-
-    ostart[flSize] = *(const BYTE*)src;
-    return flSize+1;
-}
-
-size_t ZSTD_compressLiterals (ZSTD_hufCTables_t const* prevHuf,
-                              ZSTD_hufCTables_t* nextHuf,
-                              ZSTD_strategy strategy, int disableLiteralCompression,
-                              void* dst, size_t dstCapacity,
-                        const void* src, size_t srcSize,
-                              void* workspace, size_t wkspSize,
-                        const int bmi2)
-{
-    size_t const minGain = ZSTD_minGain(srcSize, strategy);
-    size_t const lhSize = 3 + (srcSize >= 1 KB) + (srcSize >= 16 KB);
-    BYTE*  const ostart = (BYTE*)dst;
-    U32 singleStream = srcSize < 256;
-    symbolEncodingType_e hType = set_compressed;
-    size_t cLitSize;
-
-    DEBUGLOG(5,"ZSTD_compressLiterals (disableLiteralCompression=%i)",
-                disableLiteralCompression);
-
-    /* Prepare nextEntropy assuming reusing the existing table */
-    memcpy(nextHuf, prevHuf, sizeof(*prevHuf));
-
-    if (disableLiteralCompression)
-        return ZSTD_noCompressLiterals(dst, dstCapacity, src, srcSize);
-
-    /* small ? don't even attempt compression (speed opt) */
-#   define COMPRESS_LITERALS_SIZE_MIN 63
-    {   size_t const minLitSize = (prevHuf->repeatMode == HUF_repeat_valid) ? 6 : COMPRESS_LITERALS_SIZE_MIN;
-        if (srcSize <= minLitSize) return ZSTD_noCompressLiterals(dst, dstCapacity, src, srcSize);
-    }
-
-    RETURN_ERROR_IF(dstCapacity < lhSize+1, dstSize_tooSmall, "not enough space for compression");
-    {   HUF_repeat repeat = prevHuf->repeatMode;
-        int const preferRepeat = strategy < ZSTD_lazy ? srcSize <= 1024 : 0;
-        if (repeat == HUF_repeat_valid && lhSize == 3) singleStream = 1;
-        cLitSize = singleStream ? HUF_compress1X_repeat(ostart+lhSize, dstCapacity-lhSize, src, srcSize, 255, 11,
-                                      workspace, wkspSize, (HUF_CElt*)nextHuf->CTable, &repeat, preferRepeat, bmi2)
-                                : HUF_compress4X_repeat(ostart+lhSize, dstCapacity-lhSize, src, srcSize, 255, 11,
-                                      workspace, wkspSize, (HUF_CElt*)nextHuf->CTable, &repeat, preferRepeat, bmi2);
-        if (repeat != HUF_repeat_none) {
-            /* reused the existing table */
-            hType = set_repeat;
-        }
-    }
-
-    if ((cLitSize==0) | (cLitSize >= srcSize - minGain) | ERR_isError(cLitSize)) {
-        memcpy(nextHuf, prevHuf, sizeof(*prevHuf));
-        return ZSTD_noCompressLiterals(dst, dstCapacity, src, srcSize);
-    }
-    if (cLitSize==1) {
-        memcpy(nextHuf, prevHuf, sizeof(*prevHuf));
-        return ZSTD_compressRleLiteralsBlock(dst, dstCapacity, src, srcSize);
-    }
-
-    if (hType == set_compressed) {
-        /* using a newly constructed table */
-        nextHuf->repeatMode = HUF_repeat_check;
-    }
-
-    /* Build header */
-    switch(lhSize)
-    {
-    case 3: /* 2 - 2 - 10 - 10 */
-        {   U32 const lhc = hType + ((!singleStream) << 2) + ((U32)srcSize<<4) + ((U32)cLitSize<<14);
-            MEM_writeLE24(ostart, lhc);
-            break;
-        }
-    case 4: /* 2 - 2 - 14 - 14 */
-        {   U32 const lhc = hType + (2 << 2) + ((U32)srcSize<<4) + ((U32)cLitSize<<18);
-            MEM_writeLE32(ostart, lhc);
-            break;
-        }
-    case 5: /* 2 - 2 - 18 - 18 */
-        {   U32 const lhc = hType + (3 << 2) + ((U32)srcSize<<4) + ((U32)cLitSize<<22);
-            MEM_writeLE32(ostart, lhc);
-            ostart[4] = (BYTE)(cLitSize >> 10);
-            break;
-        }
-    default:  /* not possible : lhSize is {3,4,5} */
-        assert(0);
-    }
-    return lhSize+cLitSize;
-}
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/compress/zstd_compress_literals.h mysql-8.0-8.0.27/extra/zstd/lib/compress/zstd_compress_literals.h
--- mysql-8.0-8.0.26/extra/zstd/lib/compress/zstd_compress_literals.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/compress/zstd_compress_literals.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
-#ifndef ZSTD_COMPRESS_LITERALS_H
-#define ZSTD_COMPRESS_LITERALS_H
-
-#include "zstd_compress_internal.h" /* ZSTD_hufCTables_t, ZSTD_minGain() */
-
-
-size_t ZSTD_noCompressLiterals (void* dst, size_t dstCapacity, const void* src, size_t srcSize);
-
-size_t ZSTD_compressRleLiteralsBlock (void* dst, size_t dstCapacity, const void* src, size_t srcSize);
-
-size_t ZSTD_compressLiterals (ZSTD_hufCTables_t const* prevHuf,
-                              ZSTD_hufCTables_t* nextHuf,
-                              ZSTD_strategy strategy, int disableLiteralCompression,
-                              void* dst, size_t dstCapacity,
-                        const void* src, size_t srcSize,
-                              void* workspace, size_t wkspSize,
-                        const int bmi2);
-
-#endif /* ZSTD_COMPRESS_LITERALS_H */
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/compress/zstd_compress_sequences.c mysql-8.0-8.0.27/extra/zstd/lib/compress/zstd_compress_sequences.c
--- mysql-8.0-8.0.26/extra/zstd/lib/compress/zstd_compress_sequences.c	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/compress/zstd_compress_sequences.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,415 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
- /*-*************************************
- *  Dependencies
- ***************************************/
-#include "zstd_compress_sequences.h"
-
-/**
- * -log2(x / 256) lookup table for x in [0, 256).
- * If x == 0: Return 0
- * Else: Return floor(-log2(x / 256) * 256)
- */
-static unsigned const kInverseProbabilityLog256[256] = {
-    0,    2048, 1792, 1642, 1536, 1453, 1386, 1329, 1280, 1236, 1197, 1162,
-    1130, 1100, 1073, 1047, 1024, 1001, 980,  960,  941,  923,  906,  889,
-    874,  859,  844,  830,  817,  804,  791,  779,  768,  756,  745,  734,
-    724,  714,  704,  694,  685,  676,  667,  658,  650,  642,  633,  626,
-    618,  610,  603,  595,  588,  581,  574,  567,  561,  554,  548,  542,
-    535,  529,  523,  517,  512,  506,  500,  495,  489,  484,  478,  473,
-    468,  463,  458,  453,  448,  443,  438,  434,  429,  424,  420,  415,
-    411,  407,  402,  398,  394,  390,  386,  382,  377,  373,  370,  366,
-    362,  358,  354,  350,  347,  343,  339,  336,  332,  329,  325,  322,
-    318,  315,  311,  308,  305,  302,  298,  295,  292,  289,  286,  282,
-    279,  276,  273,  270,  267,  264,  261,  258,  256,  253,  250,  247,
-    244,  241,  239,  236,  233,  230,  228,  225,  222,  220,  217,  215,
-    212,  209,  207,  204,  202,  199,  197,  194,  192,  190,  187,  185,
-    182,  180,  178,  175,  173,  171,  168,  166,  164,  162,  159,  157,
-    155,  153,  151,  149,  146,  144,  142,  140,  138,  136,  134,  132,
-    130,  128,  126,  123,  121,  119,  117,  115,  114,  112,  110,  108,
-    106,  104,  102,  100,  98,   96,   94,   93,   91,   89,   87,   85,
-    83,   82,   80,   78,   76,   74,   73,   71,   69,   67,   66,   64,
-    62,   61,   59,   57,   55,   54,   52,   50,   49,   47,   46,   44,
-    42,   41,   39,   37,   36,   34,   33,   31,   30,   28,   26,   25,
-    23,   22,   20,   19,   17,   16,   14,   13,   11,   10,   8,    7,
-    5,    4,    2,    1,
-};
-
-static unsigned ZSTD_getFSEMaxSymbolValue(FSE_CTable const* ctable) {
-  void const* ptr = ctable;
-  U16 const* u16ptr = (U16 const*)ptr;
-  U32 const maxSymbolValue = MEM_read16(u16ptr + 1);
-  return maxSymbolValue;
-}
-
-/**
- * Returns the cost in bytes of encoding the normalized count header.
- * Returns an error if any of the helper functions return an error.
- */
-static size_t ZSTD_NCountCost(unsigned const* count, unsigned const max,
-                              size_t const nbSeq, unsigned const FSELog)
-{
-    BYTE wksp[FSE_NCOUNTBOUND];
-    S16 norm[MaxSeq + 1];
-    const U32 tableLog = FSE_optimalTableLog(FSELog, nbSeq, max);
-    FORWARD_IF_ERROR(FSE_normalizeCount(norm, tableLog, count, nbSeq, max));
-    return FSE_writeNCount(wksp, sizeof(wksp), norm, max, tableLog);
-}
-
-/**
- * Returns the cost in bits of encoding the distribution described by count
- * using the entropy bound.
- */
-static size_t ZSTD_entropyCost(unsigned const* count, unsigned const max, size_t const total)
-{
-    unsigned cost = 0;
-    unsigned s;
-    for (s = 0; s <= max; ++s) {
-        unsigned norm = (unsigned)((256 * count[s]) / total);
-        if (count[s] != 0 && norm == 0)
-            norm = 1;
-        assert(count[s] < total);
-        cost += count[s] * kInverseProbabilityLog256[norm];
-    }
-    return cost >> 8;
-}
-
-/**
- * Returns the cost in bits of encoding the distribution in count using ctable.
- * Returns an error if ctable cannot represent all the symbols in count.
- */
-static size_t ZSTD_fseBitCost(
-    FSE_CTable const* ctable,
-    unsigned const* count,
-    unsigned const max)
-{
-    unsigned const kAccuracyLog = 8;
-    size_t cost = 0;
-    unsigned s;
-    FSE_CState_t cstate;
-    FSE_initCState(&cstate, ctable);
-    RETURN_ERROR_IF(ZSTD_getFSEMaxSymbolValue(ctable) < max, GENERIC,
-                    "Repeat FSE_CTable has maxSymbolValue %u < %u",
-                    ZSTD_getFSEMaxSymbolValue(ctable), max);
-    for (s = 0; s <= max; ++s) {
-        unsigned const tableLog = cstate.stateLog;
-        unsigned const badCost = (tableLog + 1) << kAccuracyLog;
-        unsigned const bitCost = FSE_bitCost(cstate.symbolTT, tableLog, s, kAccuracyLog);
-        if (count[s] == 0)
-            continue;
-        RETURN_ERROR_IF(bitCost >= badCost, GENERIC,
-                        "Repeat FSE_CTable has Prob[%u] == 0", s);
-        cost += count[s] * bitCost;
-    }
-    return cost >> kAccuracyLog;
-}
-
-/**
- * Returns the cost in bits of encoding the distribution in count using the
- * table described by norm. The max symbol support by norm is assumed >= max.
- * norm must be valid for every symbol with non-zero probability in count.
- */
-static size_t ZSTD_crossEntropyCost(short const* norm, unsigned accuracyLog,
-                                    unsigned const* count, unsigned const max)
-{
-    unsigned const shift = 8 - accuracyLog;
-    size_t cost = 0;
-    unsigned s;
-    assert(accuracyLog <= 8);
-    for (s = 0; s <= max; ++s) {
-        unsigned const normAcc = norm[s] != -1 ? norm[s] : 1;
-        unsigned const norm256 = normAcc << shift;
-        assert(norm256 > 0);
-        assert(norm256 < 256);
-        cost += count[s] * kInverseProbabilityLog256[norm256];
-    }
-    return cost >> 8;
-}
-
-symbolEncodingType_e
-ZSTD_selectEncodingType(
-        FSE_repeat* repeatMode, unsigned const* count, unsigned const max,
-        size_t const mostFrequent, size_t nbSeq, unsigned const FSELog,
-        FSE_CTable const* prevCTable,
-        short const* defaultNorm, U32 defaultNormLog,
-        ZSTD_defaultPolicy_e const isDefaultAllowed,
-        ZSTD_strategy const strategy)
-{
-    ZSTD_STATIC_ASSERT(ZSTD_defaultDisallowed == 0 && ZSTD_defaultAllowed != 0);
-    if (mostFrequent == nbSeq) {
-        *repeatMode = FSE_repeat_none;
-        if (isDefaultAllowed && nbSeq <= 2) {
-            /* Prefer set_basic over set_rle when there are 2 or less symbols,
-             * since RLE uses 1 byte, but set_basic uses 5-6 bits per symbol.
-             * If basic encoding isn't possible, always choose RLE.
-             */
-            DEBUGLOG(5, "Selected set_basic");
-            return set_basic;
-        }
-        DEBUGLOG(5, "Selected set_rle");
-        return set_rle;
-    }
-    if (strategy < ZSTD_lazy) {
-        if (isDefaultAllowed) {
-            size_t const staticFse_nbSeq_max = 1000;
-            size_t const mult = 10 - strategy;
-            size_t const baseLog = 3;
-            size_t const dynamicFse_nbSeq_min = (((size_t)1 << defaultNormLog) * mult) >> baseLog;  /* 28-36 for offset, 56-72 for lengths */
-            assert(defaultNormLog >= 5 && defaultNormLog <= 6);  /* xx_DEFAULTNORMLOG */
-            assert(mult <= 9 && mult >= 7);
-            if ( (*repeatMode == FSE_repeat_valid)
-              && (nbSeq < staticFse_nbSeq_max) ) {
-                DEBUGLOG(5, "Selected set_repeat");
-                return set_repeat;
-            }
-            if ( (nbSeq < dynamicFse_nbSeq_min)
-              || (mostFrequent < (nbSeq >> (defaultNormLog-1))) ) {
-                DEBUGLOG(5, "Selected set_basic");
-                /* The format allows default tables to be repeated, but it isn't useful.
-                 * When using simple heuristics to select encoding type, we don't want
-                 * to confuse these tables with dictionaries. When running more careful
-                 * analysis, we don't need to waste time checking both repeating tables
-                 * and default tables.
-                 */
-                *repeatMode = FSE_repeat_none;
-                return set_basic;
-            }
-        }
-    } else {
-        size_t const basicCost = isDefaultAllowed ? ZSTD_crossEntropyCost(defaultNorm, defaultNormLog, count, max) : ERROR(GENERIC);
-        size_t const repeatCost = *repeatMode != FSE_repeat_none ? ZSTD_fseBitCost(prevCTable, count, max) : ERROR(GENERIC);
-        size_t const NCountCost = ZSTD_NCountCost(count, max, nbSeq, FSELog);
-        size_t const compressedCost = (NCountCost << 3) + ZSTD_entropyCost(count, max, nbSeq);
-
-        if (isDefaultAllowed) {
-            assert(!ZSTD_isError(basicCost));
-            assert(!(*repeatMode == FSE_repeat_valid && ZSTD_isError(repeatCost)));
-        }
-        assert(!ZSTD_isError(NCountCost));
-        assert(compressedCost < ERROR(maxCode));
-        DEBUGLOG(5, "Estimated bit costs: basic=%u\trepeat=%u\tcompressed=%u",
-                    (unsigned)basicCost, (unsigned)repeatCost, (unsigned)compressedCost);
-        if (basicCost <= repeatCost && basicCost <= compressedCost) {
-            DEBUGLOG(5, "Selected set_basic");
-            assert(isDefaultAllowed);
-            *repeatMode = FSE_repeat_none;
-            return set_basic;
-        }
-        if (repeatCost <= compressedCost) {
-            DEBUGLOG(5, "Selected set_repeat");
-            assert(!ZSTD_isError(repeatCost));
-            return set_repeat;
-        }
-        assert(compressedCost < basicCost && compressedCost < repeatCost);
-    }
-    DEBUGLOG(5, "Selected set_compressed");
-    *repeatMode = FSE_repeat_check;
-    return set_compressed;
-}
-
-size_t
-ZSTD_buildCTable(void* dst, size_t dstCapacity,
-                FSE_CTable* nextCTable, U32 FSELog, symbolEncodingType_e type,
-                unsigned* count, U32 max,
-                const BYTE* codeTable, size_t nbSeq,
-                const S16* defaultNorm, U32 defaultNormLog, U32 defaultMax,
-                const FSE_CTable* prevCTable, size_t prevCTableSize,
-                void* workspace, size_t workspaceSize)
-{
-    BYTE* op = (BYTE*)dst;
-    const BYTE* const oend = op + dstCapacity;
-    DEBUGLOG(6, "ZSTD_buildCTable (dstCapacity=%u)", (unsigned)dstCapacity);
-
-    switch (type) {
-    case set_rle:
-        FORWARD_IF_ERROR(FSE_buildCTable_rle(nextCTable, (BYTE)max));
-        RETURN_ERROR_IF(dstCapacity==0, dstSize_tooSmall);
-        *op = codeTable[0];
-        return 1;
-    case set_repeat:
-        memcpy(nextCTable, prevCTable, prevCTableSize);
-        return 0;
-    case set_basic:
-        FORWARD_IF_ERROR(FSE_buildCTable_wksp(nextCTable, defaultNorm, defaultMax, defaultNormLog, workspace, workspaceSize));  /* note : could be pre-calculated */
-        return 0;
-    case set_compressed: {
-        S16 norm[MaxSeq + 1];
-        size_t nbSeq_1 = nbSeq;
-        const U32 tableLog = FSE_optimalTableLog(FSELog, nbSeq, max);
-        if (count[codeTable[nbSeq-1]] > 1) {
-            count[codeTable[nbSeq-1]]--;
-            nbSeq_1--;
-        }
-        assert(nbSeq_1 > 1);
-        FORWARD_IF_ERROR(FSE_normalizeCount(norm, tableLog, count, nbSeq_1, max));
-        {   size_t const NCountSize = FSE_writeNCount(op, oend - op, norm, max, tableLog);   /* overflow protected */
-            FORWARD_IF_ERROR(NCountSize);
-            FORWARD_IF_ERROR(FSE_buildCTable_wksp(nextCTable, norm, max, tableLog, workspace, workspaceSize));
-            return NCountSize;
-        }
-    }
-    default: assert(0); RETURN_ERROR(GENERIC);
-    }
-}
-
-FORCE_INLINE_TEMPLATE size_t
-ZSTD_encodeSequences_body(
-            void* dst, size_t dstCapacity,
-            FSE_CTable const* CTable_MatchLength, BYTE const* mlCodeTable,
-            FSE_CTable const* CTable_OffsetBits, BYTE const* ofCodeTable,
-            FSE_CTable const* CTable_LitLength, BYTE const* llCodeTable,
-            seqDef const* sequences, size_t nbSeq, int longOffsets)
-{
-    BIT_CStream_t blockStream;
-    FSE_CState_t  stateMatchLength;
-    FSE_CState_t  stateOffsetBits;
-    FSE_CState_t  stateLitLength;
-
-    RETURN_ERROR_IF(
-        ERR_isError(BIT_initCStream(&blockStream, dst, dstCapacity)),
-        dstSize_tooSmall, "not enough space remaining");
-    DEBUGLOG(6, "available space for bitstream : %i  (dstCapacity=%u)",
-                (int)(blockStream.endPtr - blockStream.startPtr),
-                (unsigned)dstCapacity);
-
-    /* first symbols */
-    FSE_initCState2(&stateMatchLength, CTable_MatchLength, mlCodeTable[nbSeq-1]);
-    FSE_initCState2(&stateOffsetBits,  CTable_OffsetBits,  ofCodeTable[nbSeq-1]);
-    FSE_initCState2(&stateLitLength,   CTable_LitLength,   llCodeTable[nbSeq-1]);
-    BIT_addBits(&blockStream, sequences[nbSeq-1].litLength, LL_bits[llCodeTable[nbSeq-1]]);
-    if (MEM_32bits()) BIT_flushBits(&blockStream);
-    BIT_addBits(&blockStream, sequences[nbSeq-1].matchLength, ML_bits[mlCodeTable[nbSeq-1]]);
-    if (MEM_32bits()) BIT_flushBits(&blockStream);
-    if (longOffsets) {
-        U32 const ofBits = ofCodeTable[nbSeq-1];
-        int const extraBits = ofBits - MIN(ofBits, STREAM_ACCUMULATOR_MIN-1);
-        if (extraBits) {
-            BIT_addBits(&blockStream, sequences[nbSeq-1].offset, extraBits);
-            BIT_flushBits(&blockStream);
-        }
-        BIT_addBits(&blockStream, sequences[nbSeq-1].offset >> extraBits,
-                    ofBits - extraBits);
-    } else {
-        BIT_addBits(&blockStream, sequences[nbSeq-1].offset, ofCodeTable[nbSeq-1]);
-    }
-    BIT_flushBits(&blockStream);
-
-    {   size_t n;
-        for (n=nbSeq-2 ; n<nbSeq ; n--) {      /* intentional underflow */
-            BYTE const llCode = llCodeTable[n];
-            BYTE const ofCode = ofCodeTable[n];
-            BYTE const mlCode = mlCodeTable[n];
-            U32  const llBits = LL_bits[llCode];
-            U32  const ofBits = ofCode;
-            U32  const mlBits = ML_bits[mlCode];
-            DEBUGLOG(6, "encoding: litlen:%2u - matchlen:%2u - offCode:%7u",
-                        (unsigned)sequences[n].litLength,
-                        (unsigned)sequences[n].matchLength + MINMATCH,
-                        (unsigned)sequences[n].offset);
-                                                                            /* 32b*/  /* 64b*/
-                                                                            /* (7)*/  /* (7)*/
-            FSE_encodeSymbol(&blockStream, &stateOffsetBits, ofCode);       /* 15 */  /* 15 */
-            FSE_encodeSymbol(&blockStream, &stateMatchLength, mlCode);      /* 24 */  /* 24 */
-            if (MEM_32bits()) BIT_flushBits(&blockStream);                  /* (7)*/
-            FSE_encodeSymbol(&blockStream, &stateLitLength, llCode);        /* 16 */  /* 33 */
-            if (MEM_32bits() || (ofBits+mlBits+llBits >= 64-7-(LLFSELog+MLFSELog+OffFSELog)))
-                BIT_flushBits(&blockStream);                                /* (7)*/
-            BIT_addBits(&blockStream, sequences[n].litLength, llBits);
-            if (MEM_32bits() && ((llBits+mlBits)>24)) BIT_flushBits(&blockStream);
-            BIT_addBits(&blockStream, sequences[n].matchLength, mlBits);
-            if (MEM_32bits() || (ofBits+mlBits+llBits > 56)) BIT_flushBits(&blockStream);
-            if (longOffsets) {
-                int const extraBits = ofBits - MIN(ofBits, STREAM_ACCUMULATOR_MIN-1);
-                if (extraBits) {
-                    BIT_addBits(&blockStream, sequences[n].offset, extraBits);
-                    BIT_flushBits(&blockStream);                            /* (7)*/
-                }
-                BIT_addBits(&blockStream, sequences[n].offset >> extraBits,
-                            ofBits - extraBits);                            /* 31 */
-            } else {
-                BIT_addBits(&blockStream, sequences[n].offset, ofBits);     /* 31 */
-            }
-            BIT_flushBits(&blockStream);                                    /* (7)*/
-            DEBUGLOG(7, "remaining space : %i", (int)(blockStream.endPtr - blockStream.ptr));
-    }   }
-
-    DEBUGLOG(6, "ZSTD_encodeSequences: flushing ML state with %u bits", stateMatchLength.stateLog);
-    FSE_flushCState(&blockStream, &stateMatchLength);
-    DEBUGLOG(6, "ZSTD_encodeSequences: flushing Off state with %u bits", stateOffsetBits.stateLog);
-    FSE_flushCState(&blockStream, &stateOffsetBits);
-    DEBUGLOG(6, "ZSTD_encodeSequences: flushing LL state with %u bits", stateLitLength.stateLog);
-    FSE_flushCState(&blockStream, &stateLitLength);
-
-    {   size_t const streamSize = BIT_closeCStream(&blockStream);
-        RETURN_ERROR_IF(streamSize==0, dstSize_tooSmall, "not enough space");
-        return streamSize;
-    }
-}
-
-static size_t
-ZSTD_encodeSequences_default(
-            void* dst, size_t dstCapacity,
-            FSE_CTable const* CTable_MatchLength, BYTE const* mlCodeTable,
-            FSE_CTable const* CTable_OffsetBits, BYTE const* ofCodeTable,
-            FSE_CTable const* CTable_LitLength, BYTE const* llCodeTable,
-            seqDef const* sequences, size_t nbSeq, int longOffsets)
-{
-    return ZSTD_encodeSequences_body(dst, dstCapacity,
-                                    CTable_MatchLength, mlCodeTable,
-                                    CTable_OffsetBits, ofCodeTable,
-                                    CTable_LitLength, llCodeTable,
-                                    sequences, nbSeq, longOffsets);
-}
-
-
-#if DYNAMIC_BMI2
-
-static TARGET_ATTRIBUTE("bmi2") size_t
-ZSTD_encodeSequences_bmi2(
-            void* dst, size_t dstCapacity,
-            FSE_CTable const* CTable_MatchLength, BYTE const* mlCodeTable,
-            FSE_CTable const* CTable_OffsetBits, BYTE const* ofCodeTable,
-            FSE_CTable const* CTable_LitLength, BYTE const* llCodeTable,
-            seqDef const* sequences, size_t nbSeq, int longOffsets)
-{
-    return ZSTD_encodeSequences_body(dst, dstCapacity,
-                                    CTable_MatchLength, mlCodeTable,
-                                    CTable_OffsetBits, ofCodeTable,
-                                    CTable_LitLength, llCodeTable,
-                                    sequences, nbSeq, longOffsets);
-}
-
-#endif
-
-size_t ZSTD_encodeSequences(
-            void* dst, size_t dstCapacity,
-            FSE_CTable const* CTable_MatchLength, BYTE const* mlCodeTable,
-            FSE_CTable const* CTable_OffsetBits, BYTE const* ofCodeTable,
-            FSE_CTable const* CTable_LitLength, BYTE const* llCodeTable,
-            seqDef const* sequences, size_t nbSeq, int longOffsets, int bmi2)
-{
-    DEBUGLOG(5, "ZSTD_encodeSequences: dstCapacity = %u", (unsigned)dstCapacity);
-#if DYNAMIC_BMI2
-    if (bmi2) {
-        return ZSTD_encodeSequences_bmi2(dst, dstCapacity,
-                                         CTable_MatchLength, mlCodeTable,
-                                         CTable_OffsetBits, ofCodeTable,
-                                         CTable_LitLength, llCodeTable,
-                                         sequences, nbSeq, longOffsets);
-    }
-#endif
-    (void)bmi2;
-    return ZSTD_encodeSequences_default(dst, dstCapacity,
-                                        CTable_MatchLength, mlCodeTable,
-                                        CTable_OffsetBits, ofCodeTable,
-                                        CTable_LitLength, llCodeTable,
-                                        sequences, nbSeq, longOffsets);
-}
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/compress/zstd_compress_sequences.h mysql-8.0-8.0.27/extra/zstd/lib/compress/zstd_compress_sequences.h
--- mysql-8.0-8.0.26/extra/zstd/lib/compress/zstd_compress_sequences.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/compress/zstd_compress_sequences.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
-#ifndef ZSTD_COMPRESS_SEQUENCES_H
-#define ZSTD_COMPRESS_SEQUENCES_H
-
-#include "fse.h" /* FSE_repeat, FSE_CTable */
-#include "zstd_internal.h" /* symbolEncodingType_e, ZSTD_strategy */
-
-typedef enum {
-    ZSTD_defaultDisallowed = 0,
-    ZSTD_defaultAllowed = 1
-} ZSTD_defaultPolicy_e;
-
-symbolEncodingType_e
-ZSTD_selectEncodingType(
-        FSE_repeat* repeatMode, unsigned const* count, unsigned const max,
-        size_t const mostFrequent, size_t nbSeq, unsigned const FSELog,
-        FSE_CTable const* prevCTable,
-        short const* defaultNorm, U32 defaultNormLog,
-        ZSTD_defaultPolicy_e const isDefaultAllowed,
-        ZSTD_strategy const strategy);
-
-size_t
-ZSTD_buildCTable(void* dst, size_t dstCapacity,
-                FSE_CTable* nextCTable, U32 FSELog, symbolEncodingType_e type,
-                unsigned* count, U32 max,
-                const BYTE* codeTable, size_t nbSeq,
-                const S16* defaultNorm, U32 defaultNormLog, U32 defaultMax,
-                const FSE_CTable* prevCTable, size_t prevCTableSize,
-                void* workspace, size_t workspaceSize);
-
-size_t ZSTD_encodeSequences(
-            void* dst, size_t dstCapacity,
-            FSE_CTable const* CTable_MatchLength, BYTE const* mlCodeTable,
-            FSE_CTable const* CTable_OffsetBits, BYTE const* ofCodeTable,
-            FSE_CTable const* CTable_LitLength, BYTE const* llCodeTable,
-            seqDef const* sequences, size_t nbSeq, int longOffsets, int bmi2);
-
-#endif /* ZSTD_COMPRESS_SEQUENCES_H */
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/compress/zstd_double_fast.c mysql-8.0-8.0.27/extra/zstd/lib/compress/zstd_double_fast.c
--- mysql-8.0-8.0.26/extra/zstd/lib/compress/zstd_double_fast.c	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/compress/zstd_double_fast.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,520 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
-#include "zstd_compress_internal.h"
-#include "zstd_double_fast.h"
-
-#include "my_compiler.h"
-
-void ZSTD_fillDoubleHashTable(ZSTD_matchState_t* ms,
-                              void const* end, ZSTD_dictTableLoadMethod_e dtlm)
-{
-    const ZSTD_compressionParameters* const cParams = &ms->cParams;
-    U32* const hashLarge = ms->hashTable;
-    U32  const hBitsL = cParams->hashLog;
-    U32  const mls = cParams->minMatch;
-    U32* const hashSmall = ms->chainTable;
-    U32  const hBitsS = cParams->chainLog;
-    const BYTE* const base = ms->window.base;
-    const BYTE* ip = base + ms->nextToUpdate;
-    const BYTE* const iend = ((const BYTE*)end) - HASH_READ_SIZE;
-    const U32 fastHashFillStep = 3;
-
-    /* Always insert every fastHashFillStep position into the hash tables.
-     * Insert the other positions into the large hash table if their entry
-     * is empty.
-     */
-    for (; ip + fastHashFillStep - 1 <= iend; ip += fastHashFillStep) {
-        U32 const current = (U32)(ip - base);
-        U32 i;
-        for (i = 0; i < fastHashFillStep; ++i) {
-            size_t const smHash = ZSTD_hashPtr(ip + i, hBitsS, mls);
-            size_t const lgHash = ZSTD_hashPtr(ip + i, hBitsL, 8);
-            if (i == 0)
-                hashSmall[smHash] = current + i;
-            if (i == 0 || hashLarge[lgHash] == 0)
-                hashLarge[lgHash] = current + i;
-            /* Only load extra positions for ZSTD_dtlm_full */
-            if (dtlm == ZSTD_dtlm_fast)
-                break;
-    }   }
-}
-
-
-FORCE_INLINE_TEMPLATE
-size_t ZSTD_compressBlock_doubleFast_generic(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize,
-        U32 const mls /* template */, ZSTD_dictMode_e const dictMode)
-SUPPRESS_UBSAN_CLANG10
-{
-    ZSTD_compressionParameters const* cParams = &ms->cParams;
-    U32* const hashLong = ms->hashTable;
-    const U32 hBitsL = cParams->hashLog;
-    U32* const hashSmall = ms->chainTable;
-    const U32 hBitsS = cParams->chainLog;
-    const BYTE* const base = ms->window.base;
-    const BYTE* const istart = (const BYTE*)src;
-    const BYTE* ip = istart;
-    const BYTE* anchor = istart;
-    const U32 endIndex = (U32)((size_t)(istart - base) + srcSize);
-    const U32 lowestValid = ms->window.dictLimit;
-    const U32 maxDistance = 1U << cParams->windowLog;
-    /* presumes that, if there is a dictionary, it must be using Attach mode */
-    const U32 prefixLowestIndex = (endIndex - lowestValid > maxDistance) ? endIndex - maxDistance : lowestValid;
-    const BYTE* const prefixLowest = base + prefixLowestIndex;
-    const BYTE* const iend = istart + srcSize;
-    const BYTE* const ilimit = iend - HASH_READ_SIZE;
-    U32 offset_1=rep[0], offset_2=rep[1];
-    U32 offsetSaved = 0;
-
-    const ZSTD_matchState_t* const dms = ms->dictMatchState;
-    const ZSTD_compressionParameters* const dictCParams =
-                                     dictMode == ZSTD_dictMatchState ?
-                                     &dms->cParams : NULL;
-    const U32* const dictHashLong  = dictMode == ZSTD_dictMatchState ?
-                                     dms->hashTable : NULL;
-    const U32* const dictHashSmall = dictMode == ZSTD_dictMatchState ?
-                                     dms->chainTable : NULL;
-    const U32 dictStartIndex       = dictMode == ZSTD_dictMatchState ?
-                                     dms->window.dictLimit : 0;
-    const BYTE* const dictBase     = dictMode == ZSTD_dictMatchState ?
-                                     dms->window.base : NULL;
-    const BYTE* const dictStart    = dictMode == ZSTD_dictMatchState ?
-                                     dictBase + dictStartIndex : NULL;
-    const BYTE* const dictEnd      = dictMode == ZSTD_dictMatchState ?
-                                     dms->window.nextSrc : NULL;
-    const U32 dictIndexDelta       = dictMode == ZSTD_dictMatchState ?
-                                     prefixLowestIndex - (U32)(dictEnd - dictBase) :
-                                     0;
-    const U32 dictHBitsL           = dictMode == ZSTD_dictMatchState ?
-                                     dictCParams->hashLog : hBitsL;
-    const U32 dictHBitsS           = dictMode == ZSTD_dictMatchState ?
-                                     dictCParams->chainLog : hBitsS;
-    const U32 dictAndPrefixLength  = (U32)(ip - prefixLowest + dictEnd - dictStart);
-
-    DEBUGLOG(5, "ZSTD_compressBlock_doubleFast_generic");
-
-    assert(dictMode == ZSTD_noDict || dictMode == ZSTD_dictMatchState);
-
-    /* if a dictionary is attached, it must be within window range */
-    if (dictMode == ZSTD_dictMatchState) {
-        assert(lowestValid + maxDistance >= endIndex);
-    }
-
-    /* init */
-    ip += (dictAndPrefixLength == 0);
-    if (dictMode == ZSTD_noDict) {
-        U32 const maxRep = (U32)(ip - prefixLowest);
-        if (offset_2 > maxRep) offsetSaved = offset_2, offset_2 = 0;
-        if (offset_1 > maxRep) offsetSaved = offset_1, offset_1 = 0;
-    }
-    if (dictMode == ZSTD_dictMatchState) {
-        /* dictMatchState repCode checks don't currently handle repCode == 0
-         * disabling. */
-        assert(offset_1 <= dictAndPrefixLength);
-        assert(offset_2 <= dictAndPrefixLength);
-    }
-
-    /* Main Search Loop */
-    while (ip < ilimit) {   /* < instead of <=, because repcode check at (ip+1) */
-        size_t mLength;
-        U32 offset;
-        size_t const h2 = ZSTD_hashPtr(ip, hBitsL, 8);
-        size_t const h = ZSTD_hashPtr(ip, hBitsS, mls);
-        size_t const dictHL = ZSTD_hashPtr(ip, dictHBitsL, 8);
-        size_t const dictHS = ZSTD_hashPtr(ip, dictHBitsS, mls);
-        U32 const current = (U32)(ip-base);
-        U32 const matchIndexL = hashLong[h2];
-        U32 matchIndexS = hashSmall[h];
-        const BYTE* matchLong = base + matchIndexL;
-        const BYTE* match = base + matchIndexS;
-        const U32 repIndex = current + 1 - offset_1;
-        const BYTE* repMatch = (dictMode == ZSTD_dictMatchState
-                            && repIndex < prefixLowestIndex) ?
-                               dictBase + (repIndex - dictIndexDelta) :
-                               base + repIndex;
-        hashLong[h2] = hashSmall[h] = current;   /* update hash tables */
-
-        /* check dictMatchState repcode */
-        if (dictMode == ZSTD_dictMatchState
-            && ((U32)((prefixLowestIndex-1) - repIndex) >= 3 /* intentional underflow */)
-            && (MEM_read32(repMatch) == MEM_read32(ip+1)) ) {
-            const BYTE* repMatchEnd = repIndex < prefixLowestIndex ? dictEnd : iend;
-            mLength = ZSTD_count_2segments(ip+1+4, repMatch+4, iend, repMatchEnd, prefixLowest) + 4;
-            ip++;
-            ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, 0, mLength-MINMATCH);
-            goto _match_stored;
-        }
-
-        /* check noDict repcode */
-        if ( dictMode == ZSTD_noDict
-          && ((offset_1 > 0) & (MEM_read32(ip+1-offset_1) == MEM_read32(ip+1)))) {
-            mLength = ZSTD_count(ip+1+4, ip+1+4-offset_1, iend) + 4;
-            ip++;
-            ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, 0, mLength-MINMATCH);
-            goto _match_stored;
-        }
-
-        if (matchIndexL > prefixLowestIndex) {
-            /* check prefix long match */
-            if (MEM_read64(matchLong) == MEM_read64(ip)) {
-                mLength = ZSTD_count(ip+8, matchLong+8, iend) + 8;
-                offset = (U32)(ip-matchLong);
-                while (((ip>anchor) & (matchLong>prefixLowest)) && (ip[-1] == matchLong[-1])) { ip--; matchLong--; mLength++; } /* catch up */
-                goto _match_found;
-            }
-        } else if (dictMode == ZSTD_dictMatchState) {
-            /* check dictMatchState long match */
-            U32 const dictMatchIndexL = dictHashLong[dictHL];
-            const BYTE* dictMatchL = dictBase + dictMatchIndexL;
-            assert(dictMatchL < dictEnd);
-
-            if (dictMatchL > dictStart && MEM_read64(dictMatchL) == MEM_read64(ip)) {
-                mLength = ZSTD_count_2segments(ip+8, dictMatchL+8, iend, dictEnd, prefixLowest) + 8;
-                offset = (U32)(current - dictMatchIndexL - dictIndexDelta);
-                while (((ip>anchor) & (dictMatchL>dictStart)) && (ip[-1] == dictMatchL[-1])) { ip--; dictMatchL--; mLength++; } /* catch up */
-                goto _match_found;
-        }   }
-
-        if (matchIndexS > prefixLowestIndex) {
-            /* check prefix short match */
-            if (MEM_read32(match) == MEM_read32(ip)) {
-                goto _search_next_long;
-            }
-        } else if (dictMode == ZSTD_dictMatchState) {
-            /* check dictMatchState short match */
-            U32 const dictMatchIndexS = dictHashSmall[dictHS];
-            match = dictBase + dictMatchIndexS;
-            matchIndexS = dictMatchIndexS + dictIndexDelta;
-
-            if (match > dictStart && MEM_read32(match) == MEM_read32(ip)) {
-                goto _search_next_long;
-        }   }
-
-        ip += ((ip-anchor) >> kSearchStrength) + 1;
-        continue;
-
-_search_next_long:
-
-        {   size_t const hl3 = ZSTD_hashPtr(ip+1, hBitsL, 8);
-            size_t const dictHLNext = ZSTD_hashPtr(ip+1, dictHBitsL, 8);
-            U32 const matchIndexL3 = hashLong[hl3];
-            const BYTE* matchL3 = base + matchIndexL3;
-            hashLong[hl3] = current + 1;
-
-            /* check prefix long +1 match */
-            if (matchIndexL3 > prefixLowestIndex) {
-                if (MEM_read64(matchL3) == MEM_read64(ip+1)) {
-                    mLength = ZSTD_count(ip+9, matchL3+8, iend) + 8;
-                    ip++;
-                    offset = (U32)(ip-matchL3);
-                    while (((ip>anchor) & (matchL3>prefixLowest)) && (ip[-1] == matchL3[-1])) { ip--; matchL3--; mLength++; } /* catch up */
-                    goto _match_found;
-                }
-            } else if (dictMode == ZSTD_dictMatchState) {
-                /* check dict long +1 match */
-                U32 const dictMatchIndexL3 = dictHashLong[dictHLNext];
-                const BYTE* dictMatchL3 = dictBase + dictMatchIndexL3;
-                assert(dictMatchL3 < dictEnd);
-                if (dictMatchL3 > dictStart && MEM_read64(dictMatchL3) == MEM_read64(ip+1)) {
-                    mLength = ZSTD_count_2segments(ip+1+8, dictMatchL3+8, iend, dictEnd, prefixLowest) + 8;
-                    ip++;
-                    offset = (U32)(current + 1 - dictMatchIndexL3 - dictIndexDelta);
-                    while (((ip>anchor) & (dictMatchL3>dictStart)) && (ip[-1] == dictMatchL3[-1])) { ip--; dictMatchL3--; mLength++; } /* catch up */
-                    goto _match_found;
-        }   }   }
-
-        /* if no long +1 match, explore the short match we found */
-        if (dictMode == ZSTD_dictMatchState && matchIndexS < prefixLowestIndex) {
-            mLength = ZSTD_count_2segments(ip+4, match+4, iend, dictEnd, prefixLowest) + 4;
-            offset = (U32)(current - matchIndexS);
-            while (((ip>anchor) & (match>dictStart)) && (ip[-1] == match[-1])) { ip--; match--; mLength++; } /* catch up */
-        } else {
-            mLength = ZSTD_count(ip+4, match+4, iend) + 4;
-            offset = (U32)(ip - match);
-            while (((ip>anchor) & (match>prefixLowest)) && (ip[-1] == match[-1])) { ip--; match--; mLength++; } /* catch up */
-        }
-
-        /* fall-through */
-
-_match_found:
-        offset_2 = offset_1;
-        offset_1 = offset;
-
-        ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, offset + ZSTD_REP_MOVE, mLength-MINMATCH);
-
-_match_stored:
-        /* match found */
-        ip += mLength;
-        anchor = ip;
-
-        if (ip <= ilimit) {
-            /* Complementary insertion */
-            /* done after iLimit test, as candidates could be > iend-8 */
-            {   U32 const indexToInsert = current+2;
-                hashLong[ZSTD_hashPtr(base+indexToInsert, hBitsL, 8)] = indexToInsert;
-                hashLong[ZSTD_hashPtr(ip-2, hBitsL, 8)] = (U32)(ip-2-base);
-                hashSmall[ZSTD_hashPtr(base+indexToInsert, hBitsS, mls)] = indexToInsert;
-                hashSmall[ZSTD_hashPtr(ip-1, hBitsS, mls)] = (U32)(ip-1-base);
-            }
-
-            /* check immediate repcode */
-            if (dictMode == ZSTD_dictMatchState) {
-                while (ip <= ilimit) {
-                    U32 const current2 = (U32)(ip-base);
-                    U32 const repIndex2 = current2 - offset_2;
-                    const BYTE* repMatch2 = dictMode == ZSTD_dictMatchState
-                        && repIndex2 < prefixLowestIndex ?
-                            dictBase - dictIndexDelta + repIndex2 :
-                            base + repIndex2;
-                    if ( ((U32)((prefixLowestIndex-1) - (U32)repIndex2) >= 3 /* intentional overflow */)
-                       && (MEM_read32(repMatch2) == MEM_read32(ip)) ) {
-                        const BYTE* const repEnd2 = repIndex2 < prefixLowestIndex ? dictEnd : iend;
-                        size_t const repLength2 = ZSTD_count_2segments(ip+4, repMatch2+4, iend, repEnd2, prefixLowest) + 4;
-                        U32 tmpOffset = offset_2; offset_2 = offset_1; offset_1 = tmpOffset;   /* swap offset_2 <=> offset_1 */
-                        ZSTD_storeSeq(seqStore, 0, anchor, 0, repLength2-MINMATCH);
-                        hashSmall[ZSTD_hashPtr(ip, hBitsS, mls)] = current2;
-                        hashLong[ZSTD_hashPtr(ip, hBitsL, 8)] = current2;
-                        ip += repLength2;
-                        anchor = ip;
-                        continue;
-                    }
-                    break;
-            }   }
-
-            if (dictMode == ZSTD_noDict) {
-                while ( (ip <= ilimit)
-                     && ( (offset_2>0)
-                        & (MEM_read32(ip) == MEM_read32(ip - offset_2)) )) {
-                    /* store sequence */
-                    size_t const rLength = ZSTD_count(ip+4, ip+4-offset_2, iend) + 4;
-                    U32 const tmpOff = offset_2; offset_2 = offset_1; offset_1 = tmpOff;  /* swap offset_2 <=> offset_1 */
-                    hashSmall[ZSTD_hashPtr(ip, hBitsS, mls)] = (U32)(ip-base);
-                    hashLong[ZSTD_hashPtr(ip, hBitsL, 8)] = (U32)(ip-base);
-                    ZSTD_storeSeq(seqStore, 0, anchor, 0, rLength-MINMATCH);
-                    ip += rLength;
-                    anchor = ip;
-                    continue;   /* faster when present ... (?) */
-        }   }   }
-    }   /* while (ip < ilimit) */
-
-    /* save reps for next block */
-    rep[0] = offset_1 ? offset_1 : offsetSaved;
-    rep[1] = offset_2 ? offset_2 : offsetSaved;
-
-    /* Return the last literals size */
-    return (size_t)(iend - anchor);
-}
-
-
-size_t ZSTD_compressBlock_doubleFast(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize)
-{
-    const U32 mls = ms->cParams.minMatch;
-    switch(mls)
-    {
-    default: /* includes case 3 */
-    case 4 :
-        return ZSTD_compressBlock_doubleFast_generic(ms, seqStore, rep, src, srcSize, 4, ZSTD_noDict);
-    case 5 :
-        return ZSTD_compressBlock_doubleFast_generic(ms, seqStore, rep, src, srcSize, 5, ZSTD_noDict);
-    case 6 :
-        return ZSTD_compressBlock_doubleFast_generic(ms, seqStore, rep, src, srcSize, 6, ZSTD_noDict);
-    case 7 :
-        return ZSTD_compressBlock_doubleFast_generic(ms, seqStore, rep, src, srcSize, 7, ZSTD_noDict);
-    }
-}
-
-
-size_t ZSTD_compressBlock_doubleFast_dictMatchState(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize)
-{
-    const U32 mls = ms->cParams.minMatch;
-    switch(mls)
-    {
-    default: /* includes case 3 */
-    case 4 :
-        return ZSTD_compressBlock_doubleFast_generic(ms, seqStore, rep, src, srcSize, 4, ZSTD_dictMatchState);
-    case 5 :
-        return ZSTD_compressBlock_doubleFast_generic(ms, seqStore, rep, src, srcSize, 5, ZSTD_dictMatchState);
-    case 6 :
-        return ZSTD_compressBlock_doubleFast_generic(ms, seqStore, rep, src, srcSize, 6, ZSTD_dictMatchState);
-    case 7 :
-        return ZSTD_compressBlock_doubleFast_generic(ms, seqStore, rep, src, srcSize, 7, ZSTD_dictMatchState);
-    }
-}
-
-
-static size_t ZSTD_compressBlock_doubleFast_extDict_generic(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize,
-        U32 const mls /* template */)
-{
-    ZSTD_compressionParameters const* cParams = &ms->cParams;
-    U32* const hashLong = ms->hashTable;
-    U32  const hBitsL = cParams->hashLog;
-    U32* const hashSmall = ms->chainTable;
-    U32  const hBitsS = cParams->chainLog;
-    const BYTE* const istart = (const BYTE*)src;
-    const BYTE* ip = istart;
-    const BYTE* anchor = istart;
-    const BYTE* const iend = istart + srcSize;
-    const BYTE* const ilimit = iend - 8;
-    const BYTE* const base = ms->window.base;
-    const U32   endIndex = (U32)((size_t)(istart - base) + srcSize);
-    const U32   lowLimit = ZSTD_getLowestMatchIndex(ms, endIndex, cParams->windowLog);
-    const U32   dictStartIndex = lowLimit;
-    const U32   dictLimit = ms->window.dictLimit;
-    const U32   prefixStartIndex = (dictLimit > lowLimit) ? dictLimit : lowLimit;
-    const BYTE* const prefixStart = base + prefixStartIndex;
-    const BYTE* const dictBase = ms->window.dictBase;
-    const BYTE* const dictStart = dictBase + dictStartIndex;
-    const BYTE* const dictEnd = dictBase + prefixStartIndex;
-    U32 offset_1=rep[0], offset_2=rep[1];
-
-    DEBUGLOG(5, "ZSTD_compressBlock_doubleFast_extDict_generic (srcSize=%zu)", srcSize);
-
-    /* if extDict is invalidated due to maxDistance, switch to "regular" variant */
-    if (prefixStartIndex == dictStartIndex)
-        return ZSTD_compressBlock_doubleFast_generic(ms, seqStore, rep, src, srcSize, mls, ZSTD_noDict);
-
-    /* Search Loop */
-    while (ip < ilimit) {  /* < instead of <=, because (ip+1) */
-        const size_t hSmall = ZSTD_hashPtr(ip, hBitsS, mls);
-        const U32 matchIndex = hashSmall[hSmall];
-        const BYTE* const matchBase = matchIndex < prefixStartIndex ? dictBase : base;
-        const BYTE* match = matchBase + matchIndex;
-
-        const size_t hLong = ZSTD_hashPtr(ip, hBitsL, 8);
-        const U32 matchLongIndex = hashLong[hLong];
-        const BYTE* const matchLongBase = matchLongIndex < prefixStartIndex ? dictBase : base;
-        const BYTE* matchLong = matchLongBase + matchLongIndex;
-
-        const U32 current = (U32)(ip-base);
-        const U32 repIndex = current + 1 - offset_1;   /* offset_1 expected <= current +1 */
-        const BYTE* const repBase = repIndex < prefixStartIndex ? dictBase : base;
-        const BYTE* const repMatch = repBase + repIndex;
-        size_t mLength;
-        hashSmall[hSmall] = hashLong[hLong] = current;   /* update hash table */
-
-        if ((((U32)((prefixStartIndex-1) - repIndex) >= 3) /* intentional underflow : ensure repIndex doesn't overlap dict + prefix */
-            & (repIndex > dictStartIndex))
-          && (MEM_read32(repMatch) == MEM_read32(ip+1)) ) {
-            const BYTE* repMatchEnd = repIndex < prefixStartIndex ? dictEnd : iend;
-            mLength = ZSTD_count_2segments(ip+1+4, repMatch+4, iend, repMatchEnd, prefixStart) + 4;
-            ip++;
-            ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, 0, mLength-MINMATCH);
-        } else {
-            if ((matchLongIndex > dictStartIndex) && (MEM_read64(matchLong) == MEM_read64(ip))) {
-                const BYTE* const matchEnd = matchLongIndex < prefixStartIndex ? dictEnd : iend;
-                const BYTE* const lowMatchPtr = matchLongIndex < prefixStartIndex ? dictStart : prefixStart;
-                U32 offset;
-                mLength = ZSTD_count_2segments(ip+8, matchLong+8, iend, matchEnd, prefixStart) + 8;
-                offset = current - matchLongIndex;
-                while (((ip>anchor) & (matchLong>lowMatchPtr)) && (ip[-1] == matchLong[-1])) { ip--; matchLong--; mLength++; }   /* catch up */
-                offset_2 = offset_1;
-                offset_1 = offset;
-                ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, offset + ZSTD_REP_MOVE, mLength-MINMATCH);
-
-            } else if ((matchIndex > dictStartIndex) && (MEM_read32(match) == MEM_read32(ip))) {
-                size_t const h3 = ZSTD_hashPtr(ip+1, hBitsL, 8);
-                U32 const matchIndex3 = hashLong[h3];
-                const BYTE* const match3Base = matchIndex3 < prefixStartIndex ? dictBase : base;
-                const BYTE* match3 = match3Base + matchIndex3;
-                U32 offset;
-                hashLong[h3] = current + 1;
-                if ( (matchIndex3 > dictStartIndex) && (MEM_read64(match3) == MEM_read64(ip+1)) ) {
-                    const BYTE* const matchEnd = matchIndex3 < prefixStartIndex ? dictEnd : iend;
-                    const BYTE* const lowMatchPtr = matchIndex3 < prefixStartIndex ? dictStart : prefixStart;
-                    mLength = ZSTD_count_2segments(ip+9, match3+8, iend, matchEnd, prefixStart) + 8;
-                    ip++;
-                    offset = current+1 - matchIndex3;
-                    while (((ip>anchor) & (match3>lowMatchPtr)) && (ip[-1] == match3[-1])) { ip--; match3--; mLength++; } /* catch up */
-                } else {
-                    const BYTE* const matchEnd = matchIndex < prefixStartIndex ? dictEnd : iend;
-                    const BYTE* const lowMatchPtr = matchIndex < prefixStartIndex ? dictStart : prefixStart;
-                    mLength = ZSTD_count_2segments(ip+4, match+4, iend, matchEnd, prefixStart) + 4;
-                    offset = current - matchIndex;
-                    while (((ip>anchor) & (match>lowMatchPtr)) && (ip[-1] == match[-1])) { ip--; match--; mLength++; }   /* catch up */
-                }
-                offset_2 = offset_1;
-                offset_1 = offset;
-                ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, offset + ZSTD_REP_MOVE, mLength-MINMATCH);
-
-            } else {
-                ip += ((ip-anchor) >> kSearchStrength) + 1;
-                continue;
-        }   }
-
-        /* move to next sequence start */
-        ip += mLength;
-        anchor = ip;
-
-        if (ip <= ilimit) {
-            /* Complementary insertion */
-            /* done after iLimit test, as candidates could be > iend-8 */
-            {   U32 const indexToInsert = current+2;
-                hashLong[ZSTD_hashPtr(base+indexToInsert, hBitsL, 8)] = indexToInsert;
-                hashLong[ZSTD_hashPtr(ip-2, hBitsL, 8)] = (U32)(ip-2-base);
-                hashSmall[ZSTD_hashPtr(base+indexToInsert, hBitsS, mls)] = indexToInsert;
-                hashSmall[ZSTD_hashPtr(ip-1, hBitsS, mls)] = (U32)(ip-1-base);
-            }
-
-            /* check immediate repcode */
-            while (ip <= ilimit) {
-                U32 const current2 = (U32)(ip-base);
-                U32 const repIndex2 = current2 - offset_2;
-                const BYTE* repMatch2 = repIndex2 < prefixStartIndex ? dictBase + repIndex2 : base + repIndex2;
-                if ( (((U32)((prefixStartIndex-1) - repIndex2) >= 3)   /* intentional overflow : ensure repIndex2 doesn't overlap dict + prefix */
-                    & (repIndex2 > dictStartIndex))
-                  && (MEM_read32(repMatch2) == MEM_read32(ip)) ) {
-                    const BYTE* const repEnd2 = repIndex2 < prefixStartIndex ? dictEnd : iend;
-                    size_t const repLength2 = ZSTD_count_2segments(ip+4, repMatch2+4, iend, repEnd2, prefixStart) + 4;
-                    U32 const tmpOffset = offset_2; offset_2 = offset_1; offset_1 = tmpOffset;   /* swap offset_2 <=> offset_1 */
-                    ZSTD_storeSeq(seqStore, 0, anchor, 0, repLength2-MINMATCH);
-                    hashSmall[ZSTD_hashPtr(ip, hBitsS, mls)] = current2;
-                    hashLong[ZSTD_hashPtr(ip, hBitsL, 8)] = current2;
-                    ip += repLength2;
-                    anchor = ip;
-                    continue;
-                }
-                break;
-    }   }   }
-
-    /* save reps for next block */
-    rep[0] = offset_1;
-    rep[1] = offset_2;
-
-    /* Return the last literals size */
-    return (size_t)(iend - anchor);
-}
-
-
-size_t ZSTD_compressBlock_doubleFast_extDict(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize)
-{
-    U32 const mls = ms->cParams.minMatch;
-    switch(mls)
-    {
-    default: /* includes case 3 */
-    case 4 :
-        return ZSTD_compressBlock_doubleFast_extDict_generic(ms, seqStore, rep, src, srcSize, 4);
-    case 5 :
-        return ZSTD_compressBlock_doubleFast_extDict_generic(ms, seqStore, rep, src, srcSize, 5);
-    case 6 :
-        return ZSTD_compressBlock_doubleFast_extDict_generic(ms, seqStore, rep, src, srcSize, 6);
-    case 7 :
-        return ZSTD_compressBlock_doubleFast_extDict_generic(ms, seqStore, rep, src, srcSize, 7);
-    }
-}
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/compress/zstd_double_fast.h mysql-8.0-8.0.27/extra/zstd/lib/compress/zstd_double_fast.h
--- mysql-8.0-8.0.26/extra/zstd/lib/compress/zstd_double_fast.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/compress/zstd_double_fast.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
-#ifndef ZSTD_DOUBLE_FAST_H
-#define ZSTD_DOUBLE_FAST_H
-
-#if defined (__cplusplus)
-extern "C" {
-#endif
-
-#include "mem.h"      /* U32 */
-#include "zstd_compress_internal.h"     /* ZSTD_CCtx, size_t */
-
-void ZSTD_fillDoubleHashTable(ZSTD_matchState_t* ms,
-                              void const* end, ZSTD_dictTableLoadMethod_e dtlm);
-size_t ZSTD_compressBlock_doubleFast(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize);
-size_t ZSTD_compressBlock_doubleFast_dictMatchState(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize);
-size_t ZSTD_compressBlock_doubleFast_extDict(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize);
-
-
-#if defined (__cplusplus)
-}
-#endif
-
-#endif /* ZSTD_DOUBLE_FAST_H */
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/compress/zstd_fast.c mysql-8.0-8.0.27/extra/zstd/lib/compress/zstd_fast.c
--- mysql-8.0-8.0.26/extra/zstd/lib/compress/zstd_fast.c	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/compress/zstd_fast.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,493 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
-#include "zstd_compress_internal.h"
-#include "zstd_fast.h"
-
-
-void ZSTD_fillHashTable(ZSTD_matchState_t* ms,
-                        const void* const end,
-                        ZSTD_dictTableLoadMethod_e dtlm)
-{
-    const ZSTD_compressionParameters* const cParams = &ms->cParams;
-    U32* const hashTable = ms->hashTable;
-    U32  const hBits = cParams->hashLog;
-    U32  const mls = cParams->minMatch;
-    const BYTE* const base = ms->window.base;
-    const BYTE* ip = base + ms->nextToUpdate;
-    const BYTE* const iend = ((const BYTE*)end) - HASH_READ_SIZE;
-    const U32 fastHashFillStep = 3;
-
-    /* Always insert every fastHashFillStep position into the hash table.
-     * Insert the other positions if their hash entry is empty.
-     */
-    for ( ; ip + fastHashFillStep < iend + 2; ip += fastHashFillStep) {
-        U32 const current = (U32)(ip - base);
-        size_t const hash0 = ZSTD_hashPtr(ip, hBits, mls);
-        hashTable[hash0] = current;
-        if (dtlm == ZSTD_dtlm_fast) continue;
-        /* Only load extra positions for ZSTD_dtlm_full */
-        {   U32 p;
-            for (p = 1; p < fastHashFillStep; ++p) {
-                size_t const hash = ZSTD_hashPtr(ip + p, hBits, mls);
-                if (hashTable[hash] == 0) {  /* not yet filled */
-                    hashTable[hash] = current + p;
-    }   }   }   }
-}
-
-
-FORCE_INLINE_TEMPLATE
-size_t ZSTD_compressBlock_fast_generic(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize,
-        U32 const mls)
-{
-    const ZSTD_compressionParameters* const cParams = &ms->cParams;
-    U32* const hashTable = ms->hashTable;
-    U32 const hlog = cParams->hashLog;
-    /* support stepSize of 0 */
-    size_t const stepSize = cParams->targetLength + !(cParams->targetLength) + 1;
-    const BYTE* const base = ms->window.base;
-    const BYTE* const istart = (const BYTE*)src;
-    /* We check ip0 (ip + 0) and ip1 (ip + 1) each loop */
-    const BYTE* ip0 = istart;
-    const BYTE* ip1;
-    const BYTE* anchor = istart;
-    const U32   endIndex = (U32)((size_t)(istart - base) + srcSize);
-    const U32   maxDistance = 1U << cParams->windowLog;
-    const U32   validStartIndex = ms->window.dictLimit;
-    const U32   prefixStartIndex = (endIndex - validStartIndex > maxDistance) ? endIndex - maxDistance : validStartIndex;
-    const BYTE* const prefixStart = base + prefixStartIndex;
-    const BYTE* const iend = istart + srcSize;
-    const BYTE* const ilimit = iend - HASH_READ_SIZE;
-    U32 offset_1=rep[0], offset_2=rep[1];
-    U32 offsetSaved = 0;
-
-    /* init */
-    DEBUGLOG(5, "ZSTD_compressBlock_fast_generic");
-    ip0 += (ip0 == prefixStart);
-    ip1 = ip0 + 1;
-    {
-        U32 const maxRep = (U32)(ip0 - prefixStart);
-        if (offset_2 > maxRep) offsetSaved = offset_2, offset_2 = 0;
-        if (offset_1 > maxRep) offsetSaved = offset_1, offset_1 = 0;
-    }
-
-    /* Main Search Loop */
-    while (ip1 < ilimit) {   /* < instead of <=, because check at ip0+2 */
-        size_t mLength;
-        BYTE const* ip2 = ip0 + 2;
-        size_t const h0 = ZSTD_hashPtr(ip0, hlog, mls);
-        U32 const val0 = MEM_read32(ip0);
-        size_t const h1 = ZSTD_hashPtr(ip1, hlog, mls);
-        U32 const val1 = MEM_read32(ip1);
-        U32 const current0 = (U32)(ip0-base);
-        U32 const current1 = (U32)(ip1-base);
-        U32 const matchIndex0 = hashTable[h0];
-        U32 const matchIndex1 = hashTable[h1];
-        BYTE const* repMatch = ip2-offset_1;
-        const BYTE* match0 = base + matchIndex0;
-        const BYTE* match1 = base + matchIndex1;
-        U32 offcode;
-        hashTable[h0] = current0;   /* update hash table */
-        hashTable[h1] = current1;   /* update hash table */
-
-        assert(ip0 + 1 == ip1);
-
-        if ((offset_1 > 0) & (MEM_read32(repMatch) == MEM_read32(ip2))) {
-            mLength = ip2[-1] == repMatch[-1] ? 1 : 0;
-            ip0 = ip2 - mLength;
-            match0 = repMatch - mLength;
-            offcode = 0;
-            goto _match;
-        }
-        if ((matchIndex0 > prefixStartIndex) && MEM_read32(match0) == val0) {
-            /* found a regular match */
-            goto _offset;
-        }
-        if ((matchIndex1 > prefixStartIndex) && MEM_read32(match1) == val1) {
-            /* found a regular match after one literal */
-            ip0 = ip1;
-            match0 = match1;
-            goto _offset;
-        }
-        {
-            size_t const step = ((ip0-anchor) >> (kSearchStrength - 1)) + stepSize;
-            assert(step >= 2);
-            ip0 += step;
-            ip1 += step;
-            continue;
-        }
-_offset: /* Requires: ip0, match0 */
-        /* Compute the offset code */
-        offset_2 = offset_1;
-        offset_1 = (U32)(ip0-match0);
-        offcode = offset_1 + ZSTD_REP_MOVE;
-        mLength = 0;
-        /* Count the backwards match length */
-        while (((ip0>anchor) & (match0>prefixStart))
-             && (ip0[-1] == match0[-1])) { ip0--; match0--; mLength++; } /* catch up */
-
-_match: /* Requires: ip0, match0, offcode */
-        /* Count the forward length */
-        mLength += ZSTD_count(ip0+mLength+4, match0+mLength+4, iend) + 4;
-        ZSTD_storeSeq(seqStore, ip0-anchor, anchor, offcode, mLength-MINMATCH);
-        /* match found */
-        ip0 += mLength;
-        anchor = ip0;
-        ip1 = ip0 + 1;
-
-        if (ip0 <= ilimit) {
-            /* Fill Table */
-            assert(base+current0+2 > istart);  /* check base overflow */
-            hashTable[ZSTD_hashPtr(base+current0+2, hlog, mls)] = current0+2;  /* here because current+2 could be > iend-8 */
-            hashTable[ZSTD_hashPtr(ip0-2, hlog, mls)] = (U32)(ip0-2-base);
-
-            while ( (ip0 <= ilimit)
-                 && ( (offset_2>0)
-                    & (MEM_read32(ip0) == MEM_read32(ip0 - offset_2)) )) {
-                /* store sequence */
-                size_t const rLength = ZSTD_count(ip0+4, ip0+4-offset_2, iend) + 4;
-                U32 const tmpOff = offset_2; offset_2 = offset_1; offset_1 = tmpOff;  /* swap offset_2 <=> offset_1 */
-                hashTable[ZSTD_hashPtr(ip0, hlog, mls)] = (U32)(ip0-base);
-                ip0 += rLength;
-                ip1 = ip0 + 1;
-                ZSTD_storeSeq(seqStore, 0, anchor, 0, rLength-MINMATCH);
-                anchor = ip0;
-                continue;   /* faster when present (confirmed on gcc-8) ... (?) */
-            }
-        }
-    }
-
-    /* save reps for next block */
-    rep[0] = offset_1 ? offset_1 : offsetSaved;
-    rep[1] = offset_2 ? offset_2 : offsetSaved;
-
-    /* Return the last literals size */
-    return (size_t)(iend - anchor);
-}
-
-
-size_t ZSTD_compressBlock_fast(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize)
-{
-    ZSTD_compressionParameters const* cParams = &ms->cParams;
-    U32 const mls = cParams->minMatch;
-    assert(ms->dictMatchState == NULL);
-    switch(mls)
-    {
-    default: /* includes case 3 */
-    case 4 :
-        return ZSTD_compressBlock_fast_generic(ms, seqStore, rep, src, srcSize, 4);
-    case 5 :
-        return ZSTD_compressBlock_fast_generic(ms, seqStore, rep, src, srcSize, 5);
-    case 6 :
-        return ZSTD_compressBlock_fast_generic(ms, seqStore, rep, src, srcSize, 6);
-    case 7 :
-        return ZSTD_compressBlock_fast_generic(ms, seqStore, rep, src, srcSize, 7);
-    }
-}
-
-FORCE_INLINE_TEMPLATE
-size_t ZSTD_compressBlock_fast_dictMatchState_generic(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize, U32 const mls)
-{
-    const ZSTD_compressionParameters* const cParams = &ms->cParams;
-    U32* const hashTable = ms->hashTable;
-    U32 const hlog = cParams->hashLog;
-    /* support stepSize of 0 */
-    U32 const stepSize = cParams->targetLength + !(cParams->targetLength);
-    const BYTE* const base = ms->window.base;
-    const BYTE* const istart = (const BYTE*)src;
-    const BYTE* ip = istart;
-    const BYTE* anchor = istart;
-    const U32   prefixStartIndex = ms->window.dictLimit;
-    const BYTE* const prefixStart = base + prefixStartIndex;
-    const BYTE* const iend = istart + srcSize;
-    const BYTE* const ilimit = iend - HASH_READ_SIZE;
-    U32 offset_1=rep[0], offset_2=rep[1];
-    U32 offsetSaved = 0;
-
-    const ZSTD_matchState_t* const dms = ms->dictMatchState;
-    const ZSTD_compressionParameters* const dictCParams = &dms->cParams ;
-    const U32* const dictHashTable = dms->hashTable;
-    const U32 dictStartIndex       = dms->window.dictLimit;
-    const BYTE* const dictBase     = dms->window.base;
-    const BYTE* const dictStart    = dictBase + dictStartIndex;
-    const BYTE* const dictEnd      = dms->window.nextSrc;
-    const U32 dictIndexDelta       = prefixStartIndex - (U32)(dictEnd - dictBase);
-    const U32 dictAndPrefixLength  = (U32)(ip - prefixStart + dictEnd - dictStart);
-    const U32 dictHLog             = dictCParams->hashLog;
-
-    /* if a dictionary is still attached, it necessarily means that
-     * it is within window size. So we just check it. */
-    const U32 maxDistance = 1U << cParams->windowLog;
-    const U32 endIndex = (U32)((size_t)(ip - base) + srcSize);
-    assert(endIndex - prefixStartIndex <= maxDistance);
-    (void)maxDistance; (void)endIndex;   /* these variables are not used when assert() is disabled */
-
-    /* ensure there will be no no underflow
-     * when translating a dict index into a local index */
-    assert(prefixStartIndex >= (U32)(dictEnd - dictBase));
-
-    /* init */
-    DEBUGLOG(5, "ZSTD_compressBlock_fast_dictMatchState_generic");
-    ip += (dictAndPrefixLength == 0);
-    /* dictMatchState repCode checks don't currently handle repCode == 0
-     * disabling. */
-    assert(offset_1 <= dictAndPrefixLength);
-    assert(offset_2 <= dictAndPrefixLength);
-
-    /* Main Search Loop */
-    while (ip < ilimit) {   /* < instead of <=, because repcode check at (ip+1) */
-        size_t mLength;
-        size_t const h = ZSTD_hashPtr(ip, hlog, mls);
-        U32 const current = (U32)(ip-base);
-        U32 const matchIndex = hashTable[h];
-        const BYTE* match = base + matchIndex;
-        const U32 repIndex = current + 1 - offset_1;
-        const BYTE* repMatch = (repIndex < prefixStartIndex) ?
-                               dictBase + (repIndex - dictIndexDelta) :
-                               base + repIndex;
-        hashTable[h] = current;   /* update hash table */
-
-        if ( ((U32)((prefixStartIndex-1) - repIndex) >= 3) /* intentional underflow : ensure repIndex isn't overlapping dict + prefix */
-          && (MEM_read32(repMatch) == MEM_read32(ip+1)) ) {
-            const BYTE* const repMatchEnd = repIndex < prefixStartIndex ? dictEnd : iend;
-            mLength = ZSTD_count_2segments(ip+1+4, repMatch+4, iend, repMatchEnd, prefixStart) + 4;
-            ip++;
-            ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, 0, mLength-MINMATCH);
-        } else if ( (matchIndex <= prefixStartIndex) ) {
-            size_t const dictHash = ZSTD_hashPtr(ip, dictHLog, mls);
-            U32 const dictMatchIndex = dictHashTable[dictHash];
-            const BYTE* dictMatch = dictBase + dictMatchIndex;
-            if (dictMatchIndex <= dictStartIndex ||
-                MEM_read32(dictMatch) != MEM_read32(ip)) {
-                assert(stepSize >= 1);
-                ip += ((ip-anchor) >> kSearchStrength) + stepSize;
-                continue;
-            } else {
-                /* found a dict match */
-                U32 const offset = (U32)(current-dictMatchIndex-dictIndexDelta);
-                mLength = ZSTD_count_2segments(ip+4, dictMatch+4, iend, dictEnd, prefixStart) + 4;
-                while (((ip>anchor) & (dictMatch>dictStart))
-                     && (ip[-1] == dictMatch[-1])) {
-                    ip--; dictMatch--; mLength++;
-                } /* catch up */
-                offset_2 = offset_1;
-                offset_1 = offset;
-                ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, offset + ZSTD_REP_MOVE, mLength-MINMATCH);
-            }
-        } else if (MEM_read32(match) != MEM_read32(ip)) {
-            /* it's not a match, and we're not going to check the dictionary */
-            assert(stepSize >= 1);
-            ip += ((ip-anchor) >> kSearchStrength) + stepSize;
-            continue;
-        } else {
-            /* found a regular match */
-            U32 const offset = (U32)(ip-match);
-            mLength = ZSTD_count(ip+4, match+4, iend) + 4;
-            while (((ip>anchor) & (match>prefixStart))
-                 && (ip[-1] == match[-1])) { ip--; match--; mLength++; } /* catch up */
-            offset_2 = offset_1;
-            offset_1 = offset;
-            ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, offset + ZSTD_REP_MOVE, mLength-MINMATCH);
-        }
-
-        /* match found */
-        ip += mLength;
-        anchor = ip;
-
-        if (ip <= ilimit) {
-            /* Fill Table */
-            assert(base+current+2 > istart);  /* check base overflow */
-            hashTable[ZSTD_hashPtr(base+current+2, hlog, mls)] = current+2;  /* here because current+2 could be > iend-8 */
-            hashTable[ZSTD_hashPtr(ip-2, hlog, mls)] = (U32)(ip-2-base);
-
-            /* check immediate repcode */
-            while (ip <= ilimit) {
-                U32 const current2 = (U32)(ip-base);
-                U32 const repIndex2 = current2 - offset_2;
-                const BYTE* repMatch2 = repIndex2 < prefixStartIndex ?
-                        dictBase - dictIndexDelta + repIndex2 :
-                        base + repIndex2;
-                if ( ((U32)((prefixStartIndex-1) - (U32)repIndex2) >= 3 /* intentional overflow */)
-                   && (MEM_read32(repMatch2) == MEM_read32(ip)) ) {
-                    const BYTE* const repEnd2 = repIndex2 < prefixStartIndex ? dictEnd : iend;
-                    size_t const repLength2 = ZSTD_count_2segments(ip+4, repMatch2+4, iend, repEnd2, prefixStart) + 4;
-                    U32 tmpOffset = offset_2; offset_2 = offset_1; offset_1 = tmpOffset;   /* swap offset_2 <=> offset_1 */
-                    ZSTD_storeSeq(seqStore, 0, anchor, 0, repLength2-MINMATCH);
-                    hashTable[ZSTD_hashPtr(ip, hlog, mls)] = current2;
-                    ip += repLength2;
-                    anchor = ip;
-                    continue;
-                }
-                break;
-            }
-        }
-    }
-
-    /* save reps for next block */
-    rep[0] = offset_1 ? offset_1 : offsetSaved;
-    rep[1] = offset_2 ? offset_2 : offsetSaved;
-
-    /* Return the last literals size */
-    return (size_t)(iend - anchor);
-}
-
-size_t ZSTD_compressBlock_fast_dictMatchState(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize)
-{
-    ZSTD_compressionParameters const* cParams = &ms->cParams;
-    U32 const mls = cParams->minMatch;
-    assert(ms->dictMatchState != NULL);
-    switch(mls)
-    {
-    default: /* includes case 3 */
-    case 4 :
-        return ZSTD_compressBlock_fast_dictMatchState_generic(ms, seqStore, rep, src, srcSize, 4);
-    case 5 :
-        return ZSTD_compressBlock_fast_dictMatchState_generic(ms, seqStore, rep, src, srcSize, 5);
-    case 6 :
-        return ZSTD_compressBlock_fast_dictMatchState_generic(ms, seqStore, rep, src, srcSize, 6);
-    case 7 :
-        return ZSTD_compressBlock_fast_dictMatchState_generic(ms, seqStore, rep, src, srcSize, 7);
-    }
-}
-
-
-static size_t ZSTD_compressBlock_fast_extDict_generic(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize, U32 const mls)
-{
-    const ZSTD_compressionParameters* const cParams = &ms->cParams;
-    U32* const hashTable = ms->hashTable;
-    U32 const hlog = cParams->hashLog;
-    /* support stepSize of 0 */
-    U32 const stepSize = cParams->targetLength + !(cParams->targetLength);
-    const BYTE* const base = ms->window.base;
-    const BYTE* const dictBase = ms->window.dictBase;
-    const BYTE* const istart = (const BYTE*)src;
-    const BYTE* ip = istart;
-    const BYTE* anchor = istart;
-    const U32   endIndex = (U32)((size_t)(istart - base) + srcSize);
-    const U32   lowLimit = ZSTD_getLowestMatchIndex(ms, endIndex, cParams->windowLog);
-    const U32   dictStartIndex = lowLimit;
-    const BYTE* const dictStart = dictBase + dictStartIndex;
-    const U32   dictLimit = ms->window.dictLimit;
-    const U32   prefixStartIndex = dictLimit < lowLimit ? lowLimit : dictLimit;
-    const BYTE* const prefixStart = base + prefixStartIndex;
-    const BYTE* const dictEnd = dictBase + prefixStartIndex;
-    const BYTE* const iend = istart + srcSize;
-    const BYTE* const ilimit = iend - 8;
-    U32 offset_1=rep[0], offset_2=rep[1];
-
-    DEBUGLOG(5, "ZSTD_compressBlock_fast_extDict_generic");
-
-    /* switch to "regular" variant if extDict is invalidated due to maxDistance */
-    if (prefixStartIndex == dictStartIndex)
-        return ZSTD_compressBlock_fast_generic(ms, seqStore, rep, src, srcSize, mls);
-
-    /* Search Loop */
-    while (ip < ilimit) {  /* < instead of <=, because (ip+1) */
-        const size_t h = ZSTD_hashPtr(ip, hlog, mls);
-        const U32    matchIndex = hashTable[h];
-        const BYTE* const matchBase = matchIndex < prefixStartIndex ? dictBase : base;
-        const BYTE*  match = matchBase + matchIndex;
-        const U32    current = (U32)(ip-base);
-        const U32    repIndex = current + 1 - offset_1;
-        const BYTE* const repBase = repIndex < prefixStartIndex ? dictBase : base;
-        const BYTE* const repMatch = repBase + repIndex;
-        size_t mLength;
-        hashTable[h] = current;   /* update hash table */
-        assert(offset_1 <= current +1);   /* check repIndex */
-
-        if ( (((U32)((prefixStartIndex-1) - repIndex) >= 3) /* intentional underflow */ & (repIndex > dictStartIndex))
-           && (MEM_read32(repMatch) == MEM_read32(ip+1)) ) {
-            const BYTE* const repMatchEnd = repIndex < prefixStartIndex ? dictEnd : iend;
-            mLength = ZSTD_count_2segments(ip+1 +4, repMatch +4, iend, repMatchEnd, prefixStart) + 4;
-            ip++;
-            ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, 0, mLength-MINMATCH);
-        } else {
-            if ( (matchIndex < dictStartIndex) ||
-                 (MEM_read32(match) != MEM_read32(ip)) ) {
-                assert(stepSize >= 1);
-                ip += ((ip-anchor) >> kSearchStrength) + stepSize;
-                continue;
-            }
-            {   const BYTE* const matchEnd = matchIndex < prefixStartIndex ? dictEnd : iend;
-                const BYTE* const lowMatchPtr = matchIndex < prefixStartIndex ? dictStart : prefixStart;
-                U32 offset;
-                mLength = ZSTD_count_2segments(ip+4, match+4, iend, matchEnd, prefixStart) + 4;
-                while (((ip>anchor) & (match>lowMatchPtr)) && (ip[-1] == match[-1])) { ip--; match--; mLength++; }   /* catch up */
-                offset = current - matchIndex;
-                offset_2 = offset_1;
-                offset_1 = offset;
-                ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, offset + ZSTD_REP_MOVE, mLength-MINMATCH);
-        }   }
-
-        /* found a match : store it */
-        ip += mLength;
-        anchor = ip;
-
-        if (ip <= ilimit) {
-            /* Fill Table */
-            hashTable[ZSTD_hashPtr(base+current+2, hlog, mls)] = current+2;
-            hashTable[ZSTD_hashPtr(ip-2, hlog, mls)] = (U32)(ip-2-base);
-            /* check immediate repcode */
-            while (ip <= ilimit) {
-                U32 const current2 = (U32)(ip-base);
-                U32 const repIndex2 = current2 - offset_2;
-                const BYTE* repMatch2 = repIndex2 < prefixStartIndex ? dictBase + repIndex2 : base + repIndex2;
-                if ( (((U32)((prefixStartIndex-1) - repIndex2) >= 3) & (repIndex2 > dictStartIndex))  /* intentional overflow */
-                   && (MEM_read32(repMatch2) == MEM_read32(ip)) ) {
-                    const BYTE* const repEnd2 = repIndex2 < prefixStartIndex ? dictEnd : iend;
-                    size_t const repLength2 = ZSTD_count_2segments(ip+4, repMatch2+4, iend, repEnd2, prefixStart) + 4;
-                    U32 const tmpOffset = offset_2; offset_2 = offset_1; offset_1 = tmpOffset;   /* swap offset_2 <=> offset_1 */
-                    ZSTD_storeSeq(seqStore, 0, anchor, 0, repLength2-MINMATCH);
-                    hashTable[ZSTD_hashPtr(ip, hlog, mls)] = current2;
-                    ip += repLength2;
-                    anchor = ip;
-                    continue;
-                }
-                break;
-    }   }   }
-
-    /* save reps for next block */
-    rep[0] = offset_1;
-    rep[1] = offset_2;
-
-    /* Return the last literals size */
-    return (size_t)(iend - anchor);
-}
-
-
-size_t ZSTD_compressBlock_fast_extDict(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize)
-{
-    ZSTD_compressionParameters const* cParams = &ms->cParams;
-    U32 const mls = cParams->minMatch;
-    switch(mls)
-    {
-    default: /* includes case 3 */
-    case 4 :
-        return ZSTD_compressBlock_fast_extDict_generic(ms, seqStore, rep, src, srcSize, 4);
-    case 5 :
-        return ZSTD_compressBlock_fast_extDict_generic(ms, seqStore, rep, src, srcSize, 5);
-    case 6 :
-        return ZSTD_compressBlock_fast_extDict_generic(ms, seqStore, rep, src, srcSize, 6);
-    case 7 :
-        return ZSTD_compressBlock_fast_extDict_generic(ms, seqStore, rep, src, srcSize, 7);
-    }
-}
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/compress/zstd_fast.h mysql-8.0-8.0.27/extra/zstd/lib/compress/zstd_fast.h
--- mysql-8.0-8.0.26/extra/zstd/lib/compress/zstd_fast.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/compress/zstd_fast.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
-#ifndef ZSTD_FAST_H
-#define ZSTD_FAST_H
-
-#if defined (__cplusplus)
-extern "C" {
-#endif
-
-#include "mem.h"      /* U32 */
-#include "zstd_compress_internal.h"
-
-void ZSTD_fillHashTable(ZSTD_matchState_t* ms,
-                        void const* end, ZSTD_dictTableLoadMethod_e dtlm);
-size_t ZSTD_compressBlock_fast(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize);
-size_t ZSTD_compressBlock_fast_dictMatchState(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize);
-size_t ZSTD_compressBlock_fast_extDict(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize);
-
-#if defined (__cplusplus)
-}
-#endif
-
-#endif /* ZSTD_FAST_H */
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/compress/zstd_lazy.c mysql-8.0-8.0.27/extra/zstd/lib/compress/zstd_lazy.c
--- mysql-8.0-8.0.26/extra/zstd/lib/compress/zstd_lazy.c	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/compress/zstd_lazy.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1120 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
-#include "zstd_compress_internal.h"
-#include "zstd_lazy.h"
-
-#include "my_compiler.h"
-
-/*-*************************************
-*  Binary Tree search
-***************************************/
-
-static void
-ZSTD_updateDUBT(ZSTD_matchState_t* ms,
-                const BYTE* ip, const BYTE* iend,
-                U32 mls)
-{
-    const ZSTD_compressionParameters* const cParams = &ms->cParams;
-    U32* const hashTable = ms->hashTable;
-    U32  const hashLog = cParams->hashLog;
-
-    U32* const bt = ms->chainTable;
-    U32  const btLog  = cParams->chainLog - 1;
-    U32  const btMask = (1 << btLog) - 1;
-
-    const BYTE* const base = ms->window.base;
-    U32 const target = (U32)(ip - base);
-    U32 idx = ms->nextToUpdate;
-
-    if (idx != target)
-        DEBUGLOG(7, "ZSTD_updateDUBT, from %u to %u (dictLimit:%u)",
-                    idx, target, ms->window.dictLimit);
-    assert(ip + 8 <= iend);   /* condition for ZSTD_hashPtr */
-    (void)iend;
-
-    assert(idx >= ms->window.dictLimit);   /* condition for valid base+idx */
-    for ( ; idx < target ; idx++) {
-        size_t const h  = ZSTD_hashPtr(base + idx, hashLog, mls);   /* assumption : ip + 8 <= iend */
-        U32    const matchIndex = hashTable[h];
-
-        U32*   const nextCandidatePtr = bt + 2*(idx&btMask);
-        U32*   const sortMarkPtr  = nextCandidatePtr + 1;
-
-        DEBUGLOG(8, "ZSTD_updateDUBT: insert %u", idx);
-        hashTable[h] = idx;   /* Update Hash Table */
-        *nextCandidatePtr = matchIndex;   /* update BT like a chain */
-        *sortMarkPtr = ZSTD_DUBT_UNSORTED_MARK;
-    }
-    ms->nextToUpdate = target;
-}
-
-
-/** ZSTD_insertDUBT1() :
- *  sort one already inserted but unsorted position
- *  assumption : current >= btlow == (current - btmask)
- *  doesn't fail */
-static void
-ZSTD_insertDUBT1(ZSTD_matchState_t* ms,
-                 U32 current, const BYTE* inputEnd,
-                 U32 nbCompares, U32 btLow,
-                 const ZSTD_dictMode_e dictMode)
-SUPPRESS_UBSAN_CLANG10
-{
-    const ZSTD_compressionParameters* const cParams = &ms->cParams;
-    U32* const bt = ms->chainTable;
-    U32  const btLog  = cParams->chainLog - 1;
-    U32  const btMask = (1 << btLog) - 1;
-    size_t commonLengthSmaller=0, commonLengthLarger=0;
-    const BYTE* const base = ms->window.base;
-    const BYTE* const dictBase = ms->window.dictBase;
-    const U32 dictLimit = ms->window.dictLimit;
-    const BYTE* const ip = (current>=dictLimit) ? base + current : dictBase + current;
-    const BYTE* const iend = (current>=dictLimit) ? inputEnd : dictBase + dictLimit;
-    const BYTE* const dictEnd = dictBase + dictLimit;
-    const BYTE* const prefixStart = base + dictLimit;
-    const BYTE* match;
-    U32* smallerPtr = bt + 2*(current&btMask);
-    U32* largerPtr  = smallerPtr + 1;
-    U32 matchIndex = *smallerPtr;   /* this candidate is unsorted : next sorted candidate is reached through *smallerPtr, while *largerPtr contains previous unsorted candidate (which is already saved and can be overwritten) */
-    U32 dummy32;   /* to be nullified at the end */
-    U32 const windowValid = ms->window.lowLimit;
-    U32 const maxDistance = 1U << cParams->windowLog;
-    U32 const windowLow = (current - windowValid > maxDistance) ? current - maxDistance : windowValid;
-
-
-    DEBUGLOG(8, "ZSTD_insertDUBT1(%u) (dictLimit=%u, lowLimit=%u)",
-                current, dictLimit, windowLow);
-    assert(current >= btLow);
-    assert(ip < iend);   /* condition for ZSTD_count */
-
-    while (nbCompares-- && (matchIndex > windowLow)) {
-        U32* const nextPtr = bt + 2*(matchIndex & btMask);
-        size_t matchLength = MIN(commonLengthSmaller, commonLengthLarger);   /* guaranteed minimum nb of common bytes */
-        assert(matchIndex < current);
-        /* note : all candidates are now supposed sorted,
-         * but it's still possible to have nextPtr[1] == ZSTD_DUBT_UNSORTED_MARK
-         * when a real index has the same value as ZSTD_DUBT_UNSORTED_MARK */
-
-        if ( (dictMode != ZSTD_extDict)
-          || (matchIndex+matchLength >= dictLimit)  /* both in current segment*/
-          || (current < dictLimit) /* both in extDict */) {
-            const BYTE* const mBase = ( (dictMode != ZSTD_extDict)
-                                     || (matchIndex+matchLength >= dictLimit)) ?
-                                        base : dictBase;
-            assert( (matchIndex+matchLength >= dictLimit)   /* might be wrong if extDict is incorrectly set to 0 */
-                 || (current < dictLimit) );
-            match = mBase + matchIndex;
-            matchLength += ZSTD_count(ip+matchLength, match+matchLength, iend);
-        } else {
-            match = dictBase + matchIndex;
-            matchLength += ZSTD_count_2segments(ip+matchLength, match+matchLength, iend, dictEnd, prefixStart);
-            if (matchIndex+matchLength >= dictLimit)
-                match = base + matchIndex;   /* preparation for next read of match[matchLength] */
-        }
-
-        DEBUGLOG(8, "ZSTD_insertDUBT1: comparing %u with %u : found %u common bytes ",
-                    current, matchIndex, (U32)matchLength);
-
-        if (ip+matchLength == iend) {   /* equal : no way to know if inf or sup */
-            break;   /* drop , to guarantee consistency ; miss a bit of compression, but other solutions can corrupt tree */
-        }
-
-        if (match[matchLength] < ip[matchLength]) {  /* necessarily within buffer */
-            /* match is smaller than current */
-            *smallerPtr = matchIndex;             /* update smaller idx */
-            commonLengthSmaller = matchLength;    /* all smaller will now have at least this guaranteed common length */
-            if (matchIndex <= btLow) { smallerPtr=&dummy32; break; }   /* beyond tree size, stop searching */
-            DEBUGLOG(8, "ZSTD_insertDUBT1: %u (>btLow=%u) is smaller : next => %u",
-                        matchIndex, btLow, nextPtr[1]);
-            smallerPtr = nextPtr+1;               /* new "candidate" => larger than match, which was smaller than target */
-            matchIndex = nextPtr[1];              /* new matchIndex, larger than previous and closer to current */
-        } else {
-            /* match is larger than current */
-            *largerPtr = matchIndex;
-            commonLengthLarger = matchLength;
-            if (matchIndex <= btLow) { largerPtr=&dummy32; break; }   /* beyond tree size, stop searching */
-            DEBUGLOG(8, "ZSTD_insertDUBT1: %u (>btLow=%u) is larger => %u",
-                        matchIndex, btLow, nextPtr[0]);
-            largerPtr = nextPtr;
-            matchIndex = nextPtr[0];
-    }   }
-
-    *smallerPtr = *largerPtr = 0;
-}
-
-
-static size_t
-ZSTD_DUBT_findBetterDictMatch (
-        ZSTD_matchState_t* ms,
-        const BYTE* const ip, const BYTE* const iend,
-        size_t* offsetPtr,
-        size_t bestLength,
-        U32 nbCompares,
-        U32 const mls,
-        const ZSTD_dictMode_e dictMode)
-{
-    const ZSTD_matchState_t * const dms = ms->dictMatchState;
-    const ZSTD_compressionParameters* const dmsCParams = &dms->cParams;
-    const U32 * const dictHashTable = dms->hashTable;
-    U32         const hashLog = dmsCParams->hashLog;
-    size_t      const h  = ZSTD_hashPtr(ip, hashLog, mls);
-    U32               dictMatchIndex = dictHashTable[h];
-
-    const BYTE* const base = ms->window.base;
-    const BYTE* const prefixStart = base + ms->window.dictLimit;
-    U32         const current = (U32)(ip-base);
-    const BYTE* const dictBase = dms->window.base;
-    const BYTE* const dictEnd = dms->window.nextSrc;
-    U32         const dictHighLimit = (U32)(dms->window.nextSrc - dms->window.base);
-    U32         const dictLowLimit = dms->window.lowLimit;
-    U32         const dictIndexDelta = ms->window.lowLimit - dictHighLimit;
-
-    U32*        const dictBt = dms->chainTable;
-    U32         const btLog  = dmsCParams->chainLog - 1;
-    U32         const btMask = (1 << btLog) - 1;
-    U32         const btLow = (btMask >= dictHighLimit - dictLowLimit) ? dictLowLimit : dictHighLimit - btMask;
-
-    size_t commonLengthSmaller=0, commonLengthLarger=0;
-
-    (void)dictMode;
-    assert(dictMode == ZSTD_dictMatchState);
-
-    while (nbCompares-- && (dictMatchIndex > dictLowLimit)) {
-        U32* const nextPtr = dictBt + 2*(dictMatchIndex & btMask);
-        size_t matchLength = MIN(commonLengthSmaller, commonLengthLarger);   /* guaranteed minimum nb of common bytes */
-        const BYTE* match = dictBase + dictMatchIndex;
-        matchLength += ZSTD_count_2segments(ip+matchLength, match+matchLength, iend, dictEnd, prefixStart);
-        if (dictMatchIndex+matchLength >= dictHighLimit)
-            match = base + dictMatchIndex + dictIndexDelta;   /* to prepare for next usage of match[matchLength] */
-
-        if (matchLength > bestLength) {
-            U32 matchIndex = dictMatchIndex + dictIndexDelta;
-            if ( (4*(int)(matchLength-bestLength)) > (int)(ZSTD_highbit32(current-matchIndex+1) - ZSTD_highbit32((U32)offsetPtr[0]+1)) ) {
-                DEBUGLOG(9, "ZSTD_DUBT_findBetterDictMatch(%u) : found better match length %u -> %u and offsetCode %u -> %u (dictMatchIndex %u, matchIndex %u)",
-                    current, (U32)bestLength, (U32)matchLength, (U32)*offsetPtr, ZSTD_REP_MOVE + current - matchIndex, dictMatchIndex, matchIndex);
-                bestLength = matchLength, *offsetPtr = ZSTD_REP_MOVE + current - matchIndex;
-            }
-            if (ip+matchLength == iend) {   /* reached end of input : ip[matchLength] is not valid, no way to know if it's larger or smaller than match */
-                break;   /* drop, to guarantee consistency (miss a little bit of compression) */
-            }
-        }
-
-        if (match[matchLength] < ip[matchLength]) {
-            if (dictMatchIndex <= btLow) { break; }   /* beyond tree size, stop the search */
-            commonLengthSmaller = matchLength;    /* all smaller will now have at least this guaranteed common length */
-            dictMatchIndex = nextPtr[1];              /* new matchIndex larger than previous (closer to current) */
-        } else {
-            /* match is larger than current */
-            if (dictMatchIndex <= btLow) { break; }   /* beyond tree size, stop the search */
-            commonLengthLarger = matchLength;
-            dictMatchIndex = nextPtr[0];
-        }
-    }
-
-    if (bestLength >= MINMATCH) {
-        U32 const mIndex = current - ((U32)*offsetPtr - ZSTD_REP_MOVE); (void)mIndex;
-        DEBUGLOG(8, "ZSTD_DUBT_findBetterDictMatch(%u) : found match of length %u and offsetCode %u (pos %u)",
-                    current, (U32)bestLength, (U32)*offsetPtr, mIndex);
-    }
-    return bestLength;
-
-}
-
-
-static size_t
-ZSTD_DUBT_findBestMatch(ZSTD_matchState_t* ms,
-                        const BYTE* const ip, const BYTE* const iend,
-                        size_t* offsetPtr,
-                        U32 const mls,
-                        const ZSTD_dictMode_e dictMode)
-SUPPRESS_UBSAN_CLANG10
-{
-    const ZSTD_compressionParameters* const cParams = &ms->cParams;
-    U32*   const hashTable = ms->hashTable;
-    U32    const hashLog = cParams->hashLog;
-    size_t const h  = ZSTD_hashPtr(ip, hashLog, mls);
-    U32          matchIndex  = hashTable[h];
-
-    const BYTE* const base = ms->window.base;
-    U32    const current = (U32)(ip-base);
-    U32    const windowLow = ZSTD_getLowestMatchIndex(ms, current, cParams->windowLog);
-
-    U32*   const bt = ms->chainTable;
-    U32    const btLog  = cParams->chainLog - 1;
-    U32    const btMask = (1 << btLog) - 1;
-    U32    const btLow = (btMask >= current) ? 0 : current - btMask;
-    U32    const unsortLimit = MAX(btLow, windowLow);
-
-    U32*         nextCandidate = bt + 2*(matchIndex&btMask);
-    U32*         unsortedMark = bt + 2*(matchIndex&btMask) + 1;
-    U32          nbCompares = 1U << cParams->searchLog;
-    U32          nbCandidates = nbCompares;
-    U32          previousCandidate = 0;
-
-    DEBUGLOG(7, "ZSTD_DUBT_findBestMatch (%u) ", current);
-    assert(ip <= iend-8);   /* required for h calculation */
-
-    /* reach end of unsorted candidates list */
-    while ( (matchIndex > unsortLimit)
-         && (*unsortedMark == ZSTD_DUBT_UNSORTED_MARK)
-         && (nbCandidates > 1) ) {
-        DEBUGLOG(8, "ZSTD_DUBT_findBestMatch: candidate %u is unsorted",
-                    matchIndex);
-        *unsortedMark = previousCandidate;  /* the unsortedMark becomes a reversed chain, to move up back to original position */
-        previousCandidate = matchIndex;
-        matchIndex = *nextCandidate;
-        nextCandidate = bt + 2*(matchIndex&btMask);
-        unsortedMark = bt + 2*(matchIndex&btMask) + 1;
-        nbCandidates --;
-    }
-
-    /* nullify last candidate if it's still unsorted
-     * simplification, detrimental to compression ratio, beneficial for speed */
-    if ( (matchIndex > unsortLimit)
-      && (*unsortedMark==ZSTD_DUBT_UNSORTED_MARK) ) {
-        DEBUGLOG(7, "ZSTD_DUBT_findBestMatch: nullify last unsorted candidate %u",
-                    matchIndex);
-        *nextCandidate = *unsortedMark = 0;
-    }
-
-    /* batch sort stacked candidates */
-    matchIndex = previousCandidate;
-    while (matchIndex) {  /* will end on matchIndex == 0 */
-        U32* const nextCandidateIdxPtr = bt + 2*(matchIndex&btMask) + 1;
-        U32 const nextCandidateIdx = *nextCandidateIdxPtr;
-        ZSTD_insertDUBT1(ms, matchIndex, iend,
-                         nbCandidates, unsortLimit, dictMode);
-        matchIndex = nextCandidateIdx;
-        nbCandidates++;
-    }
-
-    /* find longest match */
-    {   size_t commonLengthSmaller = 0, commonLengthLarger = 0;
-        const BYTE* const dictBase = ms->window.dictBase;
-        const U32 dictLimit = ms->window.dictLimit;
-        const BYTE* const dictEnd = dictBase + dictLimit;
-        const BYTE* const prefixStart = base + dictLimit;
-        U32* smallerPtr = bt + 2*(current&btMask);
-        U32* largerPtr  = bt + 2*(current&btMask) + 1;
-        U32 matchEndIdx = current + 8 + 1;
-        U32 dummy32;   /* to be nullified at the end */
-        size_t bestLength = 0;
-
-        matchIndex  = hashTable[h];
-        hashTable[h] = current;   /* Update Hash Table */
-
-        while (nbCompares-- && (matchIndex > windowLow)) {
-            U32* const nextPtr = bt + 2*(matchIndex & btMask);
-            size_t matchLength = MIN(commonLengthSmaller, commonLengthLarger);   /* guaranteed minimum nb of common bytes */
-            const BYTE* match;
-
-            if ((dictMode != ZSTD_extDict) || (matchIndex+matchLength >= dictLimit)) {
-                match = base + matchIndex;
-                matchLength += ZSTD_count(ip+matchLength, match+matchLength, iend);
-            } else {
-                match = dictBase + matchIndex;
-                matchLength += ZSTD_count_2segments(ip+matchLength, match+matchLength, iend, dictEnd, prefixStart);
-                if (matchIndex+matchLength >= dictLimit)
-                    match = base + matchIndex;   /* to prepare for next usage of match[matchLength] */
-            }
-
-            if (matchLength > bestLength) {
-                if (matchLength > matchEndIdx - matchIndex)
-                    matchEndIdx = matchIndex + (U32)matchLength;
-                if ( (4*(int)(matchLength-bestLength)) > (int)(ZSTD_highbit32(current-matchIndex+1) - ZSTD_highbit32((U32)offsetPtr[0]+1)) )
-                    bestLength = matchLength, *offsetPtr = ZSTD_REP_MOVE + current - matchIndex;
-                if (ip+matchLength == iend) {   /* equal : no way to know if inf or sup */
-                    if (dictMode == ZSTD_dictMatchState) {
-                        nbCompares = 0; /* in addition to avoiding checking any
-                                         * further in this loop, make sure we
-                                         * skip checking in the dictionary. */
-                    }
-                    break;   /* drop, to guarantee consistency (miss a little bit of compression) */
-                }
-            }
-
-            if (match[matchLength] < ip[matchLength]) {
-                /* match is smaller than current */
-                *smallerPtr = matchIndex;             /* update smaller idx */
-                commonLengthSmaller = matchLength;    /* all smaller will now have at least this guaranteed common length */
-                if (matchIndex <= btLow) { smallerPtr=&dummy32; break; }   /* beyond tree size, stop the search */
-                smallerPtr = nextPtr+1;               /* new "smaller" => larger of match */
-                matchIndex = nextPtr[1];              /* new matchIndex larger than previous (closer to current) */
-            } else {
-                /* match is larger than current */
-                *largerPtr = matchIndex;
-                commonLengthLarger = matchLength;
-                if (matchIndex <= btLow) { largerPtr=&dummy32; break; }   /* beyond tree size, stop the search */
-                largerPtr = nextPtr;
-                matchIndex = nextPtr[0];
-        }   }
-
-        *smallerPtr = *largerPtr = 0;
-
-        if (dictMode == ZSTD_dictMatchState && nbCompares) {
-            bestLength = ZSTD_DUBT_findBetterDictMatch(
-                    ms, ip, iend,
-                    offsetPtr, bestLength, nbCompares,
-                    mls, dictMode);
-        }
-
-        assert(matchEndIdx > current+8); /* ensure nextToUpdate is increased */
-        ms->nextToUpdate = matchEndIdx - 8;   /* skip repetitive patterns */
-        if (bestLength >= MINMATCH) {
-            U32 const mIndex = current - ((U32)*offsetPtr - ZSTD_REP_MOVE); (void)mIndex;
-            DEBUGLOG(8, "ZSTD_DUBT_findBestMatch(%u) : found match of length %u and offsetCode %u (pos %u)",
-                        current, (U32)bestLength, (U32)*offsetPtr, mIndex);
-        }
-        return bestLength;
-    }
-}
-
-
-/** ZSTD_BtFindBestMatch() : Tree updater, providing best match */
-FORCE_INLINE_TEMPLATE size_t
-ZSTD_BtFindBestMatch( ZSTD_matchState_t* ms,
-                const BYTE* const ip, const BYTE* const iLimit,
-                      size_t* offsetPtr,
-                const U32 mls /* template */,
-                const ZSTD_dictMode_e dictMode)
-{
-    DEBUGLOG(7, "ZSTD_BtFindBestMatch");
-    if (ip < ms->window.base + ms->nextToUpdate) return 0;   /* skipped area */
-    ZSTD_updateDUBT(ms, ip, iLimit, mls);
-    return ZSTD_DUBT_findBestMatch(ms, ip, iLimit, offsetPtr, mls, dictMode);
-}
-
-
-static size_t
-ZSTD_BtFindBestMatch_selectMLS (  ZSTD_matchState_t* ms,
-                            const BYTE* ip, const BYTE* const iLimit,
-                                  size_t* offsetPtr)
-{
-    switch(ms->cParams.minMatch)
-    {
-    default : /* includes case 3 */
-    case 4 : return ZSTD_BtFindBestMatch(ms, ip, iLimit, offsetPtr, 4, ZSTD_noDict);
-    case 5 : return ZSTD_BtFindBestMatch(ms, ip, iLimit, offsetPtr, 5, ZSTD_noDict);
-    case 7 :
-    case 6 : return ZSTD_BtFindBestMatch(ms, ip, iLimit, offsetPtr, 6, ZSTD_noDict);
-    }
-}
-
-
-static size_t ZSTD_BtFindBestMatch_dictMatchState_selectMLS (
-                        ZSTD_matchState_t* ms,
-                        const BYTE* ip, const BYTE* const iLimit,
-                        size_t* offsetPtr)
-{
-    switch(ms->cParams.minMatch)
-    {
-    default : /* includes case 3 */
-    case 4 : return ZSTD_BtFindBestMatch(ms, ip, iLimit, offsetPtr, 4, ZSTD_dictMatchState);
-    case 5 : return ZSTD_BtFindBestMatch(ms, ip, iLimit, offsetPtr, 5, ZSTD_dictMatchState);
-    case 7 :
-    case 6 : return ZSTD_BtFindBestMatch(ms, ip, iLimit, offsetPtr, 6, ZSTD_dictMatchState);
-    }
-}
-
-
-static size_t ZSTD_BtFindBestMatch_extDict_selectMLS (
-                        ZSTD_matchState_t* ms,
-                        const BYTE* ip, const BYTE* const iLimit,
-                        size_t* offsetPtr)
-{
-    switch(ms->cParams.minMatch)
-    {
-    default : /* includes case 3 */
-    case 4 : return ZSTD_BtFindBestMatch(ms, ip, iLimit, offsetPtr, 4, ZSTD_extDict);
-    case 5 : return ZSTD_BtFindBestMatch(ms, ip, iLimit, offsetPtr, 5, ZSTD_extDict);
-    case 7 :
-    case 6 : return ZSTD_BtFindBestMatch(ms, ip, iLimit, offsetPtr, 6, ZSTD_extDict);
-    }
-}
-
-
-
-/* *********************************
-*  Hash Chain
-***********************************/
-#define NEXT_IN_CHAIN(d, mask)   chainTable[(d) & (mask)]
-
-/* Update chains up to ip (excluded)
-   Assumption : always within prefix (i.e. not within extDict) */
-static U32 ZSTD_insertAndFindFirstIndex_internal(
-                        ZSTD_matchState_t* ms,
-                        const ZSTD_compressionParameters* const cParams,
-                        const BYTE* ip, U32 const mls)
-{
-    U32* const hashTable  = ms->hashTable;
-    const U32 hashLog = cParams->hashLog;
-    U32* const chainTable = ms->chainTable;
-    const U32 chainMask = (1 << cParams->chainLog) - 1;
-    const BYTE* const base = ms->window.base;
-    const U32 target = (U32)(ip - base);
-    U32 idx = ms->nextToUpdate;
-
-    while(idx < target) { /* catch up */
-        size_t const h = ZSTD_hashPtr(base+idx, hashLog, mls);
-        NEXT_IN_CHAIN(idx, chainMask) = hashTable[h];
-        hashTable[h] = idx;
-        idx++;
-    }
-
-    ms->nextToUpdate = target;
-    return hashTable[ZSTD_hashPtr(ip, hashLog, mls)];
-}
-
-U32 ZSTD_insertAndFindFirstIndex(ZSTD_matchState_t* ms, const BYTE* ip) {
-    const ZSTD_compressionParameters* const cParams = &ms->cParams;
-    return ZSTD_insertAndFindFirstIndex_internal(ms, cParams, ip, ms->cParams.minMatch);
-}
-
-
-/* inlining is important to hardwire a hot branch (template emulation) */
-FORCE_INLINE_TEMPLATE
-size_t ZSTD_HcFindBestMatch_generic (
-                        ZSTD_matchState_t* ms,
-                        const BYTE* const ip, const BYTE* const iLimit,
-                        size_t* offsetPtr,
-                        const U32 mls, const ZSTD_dictMode_e dictMode)
-SUPPRESS_UBSAN_CLANG10
-{
-    const ZSTD_compressionParameters* const cParams = &ms->cParams;
-    U32* const chainTable = ms->chainTable;
-    const U32 chainSize = (1 << cParams->chainLog);
-    const U32 chainMask = chainSize-1;
-    const BYTE* const base = ms->window.base;
-    const BYTE* const dictBase = ms->window.dictBase;
-    const U32 dictLimit = ms->window.dictLimit;
-    const BYTE* const prefixStart = base + dictLimit;
-    const BYTE* const dictEnd = dictBase + dictLimit;
-    const U32 current = (U32)(ip-base);
-    const U32 maxDistance = 1U << cParams->windowLog;
-    const U32 lowestValid = ms->window.lowLimit;
-    const U32 withinMaxDistance = (current - lowestValid > maxDistance) ? current - maxDistance : lowestValid;
-    const U32 isDictionary = (ms->loadedDictEnd != 0);
-    const U32 lowLimit = isDictionary ? lowestValid : withinMaxDistance;
-    const U32 minChain = current > chainSize ? current - chainSize : 0;
-    U32 nbAttempts = 1U << cParams->searchLog;
-    size_t ml=4-1;
-
-    /* HC4 match finder */
-    U32 matchIndex = ZSTD_insertAndFindFirstIndex_internal(ms, cParams, ip, mls);
-
-    for ( ; (matchIndex>lowLimit) & (nbAttempts>0) ; nbAttempts--) {
-        size_t currentMl=0;
-        if ((dictMode != ZSTD_extDict) || matchIndex >= dictLimit) {
-            const BYTE* const match = base + matchIndex;
-            assert(matchIndex >= dictLimit);   /* ensures this is true if dictMode != ZSTD_extDict */
-            if (match[ml] == ip[ml])   /* potentially better */
-                currentMl = ZSTD_count(ip, match, iLimit);
-        } else {
-            const BYTE* const match = dictBase + matchIndex;
-            assert(match+4 <= dictEnd);
-            if (MEM_read32(match) == MEM_read32(ip))   /* assumption : matchIndex <= dictLimit-4 (by table construction) */
-                currentMl = ZSTD_count_2segments(ip+4, match+4, iLimit, dictEnd, prefixStart) + 4;
-        }
-
-        /* save best solution */
-        if (currentMl > ml) {
-            ml = currentMl;
-            *offsetPtr = current - matchIndex + ZSTD_REP_MOVE;
-            if (ip+currentMl == iLimit) break; /* best possible, avoids read overflow on next attempt */
-        }
-
-        if (matchIndex <= minChain) break;
-        matchIndex = NEXT_IN_CHAIN(matchIndex, chainMask);
-    }
-
-    if (dictMode == ZSTD_dictMatchState) {
-        const ZSTD_matchState_t* const dms = ms->dictMatchState;
-        const U32* const dmsChainTable = dms->chainTable;
-        const U32 dmsChainSize         = (1 << dms->cParams.chainLog);
-        const U32 dmsChainMask         = dmsChainSize - 1;
-        const U32 dmsLowestIndex       = dms->window.dictLimit;
-        const BYTE* const dmsBase      = dms->window.base;
-        const BYTE* const dmsEnd       = dms->window.nextSrc;
-        const U32 dmsSize              = (U32)(dmsEnd - dmsBase);
-        const U32 dmsIndexDelta        = dictLimit - dmsSize;
-        const U32 dmsMinChain = dmsSize > dmsChainSize ? dmsSize - dmsChainSize : 0;
-
-        matchIndex = dms->hashTable[ZSTD_hashPtr(ip, dms->cParams.hashLog, mls)];
-
-        for ( ; (matchIndex>dmsLowestIndex) & (nbAttempts>0) ; nbAttempts--) {
-            size_t currentMl=0;
-            const BYTE* const match = dmsBase + matchIndex;
-            assert(match+4 <= dmsEnd);
-            if (MEM_read32(match) == MEM_read32(ip))   /* assumption : matchIndex <= dictLimit-4 (by table construction) */
-                currentMl = ZSTD_count_2segments(ip+4, match+4, iLimit, dmsEnd, prefixStart) + 4;
-
-            /* save best solution */
-            if (currentMl > ml) {
-                ml = currentMl;
-                *offsetPtr = current - (matchIndex + dmsIndexDelta) + ZSTD_REP_MOVE;
-                if (ip+currentMl == iLimit) break; /* best possible, avoids read overflow on next attempt */
-            }
-
-            if (matchIndex <= dmsMinChain) break;
-            matchIndex = dmsChainTable[matchIndex & dmsChainMask];
-        }
-    }
-
-    return ml;
-}
-
-
-FORCE_INLINE_TEMPLATE size_t ZSTD_HcFindBestMatch_selectMLS (
-                        ZSTD_matchState_t* ms,
-                        const BYTE* ip, const BYTE* const iLimit,
-                        size_t* offsetPtr)
-{
-    switch(ms->cParams.minMatch)
-    {
-    default : /* includes case 3 */
-    case 4 : return ZSTD_HcFindBestMatch_generic(ms, ip, iLimit, offsetPtr, 4, ZSTD_noDict);
-    case 5 : return ZSTD_HcFindBestMatch_generic(ms, ip, iLimit, offsetPtr, 5, ZSTD_noDict);
-    case 7 :
-    case 6 : return ZSTD_HcFindBestMatch_generic(ms, ip, iLimit, offsetPtr, 6, ZSTD_noDict);
-    }
-}
-
-
-static size_t ZSTD_HcFindBestMatch_dictMatchState_selectMLS (
-                        ZSTD_matchState_t* ms,
-                        const BYTE* ip, const BYTE* const iLimit,
-                        size_t* offsetPtr)
-{
-    switch(ms->cParams.minMatch)
-    {
-    default : /* includes case 3 */
-    case 4 : return ZSTD_HcFindBestMatch_generic(ms, ip, iLimit, offsetPtr, 4, ZSTD_dictMatchState);
-    case 5 : return ZSTD_HcFindBestMatch_generic(ms, ip, iLimit, offsetPtr, 5, ZSTD_dictMatchState);
-    case 7 :
-    case 6 : return ZSTD_HcFindBestMatch_generic(ms, ip, iLimit, offsetPtr, 6, ZSTD_dictMatchState);
-    }
-}
-
-
-FORCE_INLINE_TEMPLATE size_t ZSTD_HcFindBestMatch_extDict_selectMLS (
-                        ZSTD_matchState_t* ms,
-                        const BYTE* ip, const BYTE* const iLimit,
-                        size_t* offsetPtr)
-{
-    switch(ms->cParams.minMatch)
-    {
-    default : /* includes case 3 */
-    case 4 : return ZSTD_HcFindBestMatch_generic(ms, ip, iLimit, offsetPtr, 4, ZSTD_extDict);
-    case 5 : return ZSTD_HcFindBestMatch_generic(ms, ip, iLimit, offsetPtr, 5, ZSTD_extDict);
-    case 7 :
-    case 6 : return ZSTD_HcFindBestMatch_generic(ms, ip, iLimit, offsetPtr, 6, ZSTD_extDict);
-    }
-}
-
-
-/* *******************************
-*  Common parser - lazy strategy
-*********************************/
-typedef enum { search_hashChain, search_binaryTree } searchMethod_e;
-
-FORCE_INLINE_TEMPLATE size_t
-ZSTD_compressBlock_lazy_generic(
-                        ZSTD_matchState_t* ms, seqStore_t* seqStore,
-                        U32 rep[ZSTD_REP_NUM],
-                        const void* src, size_t srcSize,
-                        const searchMethod_e searchMethod, const U32 depth,
-                        ZSTD_dictMode_e const dictMode)
-SUPPRESS_UBSAN_CLANG10
-{
-    const BYTE* const istart = (const BYTE*)src;
-    const BYTE* ip = istart;
-    const BYTE* anchor = istart;
-    const BYTE* const iend = istart + srcSize;
-    const BYTE* const ilimit = iend - 8;
-    const BYTE* const base = ms->window.base;
-    const U32 prefixLowestIndex = ms->window.dictLimit;
-    const BYTE* const prefixLowest = base + prefixLowestIndex;
-
-    typedef size_t (*searchMax_f)(
-                        ZSTD_matchState_t* ms,
-                        const BYTE* ip, const BYTE* iLimit, size_t* offsetPtr);
-    searchMax_f const searchMax = dictMode == ZSTD_dictMatchState ?
-        (searchMethod==search_binaryTree ? ZSTD_BtFindBestMatch_dictMatchState_selectMLS
-                                         : ZSTD_HcFindBestMatch_dictMatchState_selectMLS) :
-        (searchMethod==search_binaryTree ? ZSTD_BtFindBestMatch_selectMLS
-                                         : ZSTD_HcFindBestMatch_selectMLS);
-    U32 offset_1 = rep[0], offset_2 = rep[1], savedOffset=0;
-
-    const ZSTD_matchState_t* const dms = ms->dictMatchState;
-    const U32 dictLowestIndex      = dictMode == ZSTD_dictMatchState ?
-                                     dms->window.dictLimit : 0;
-    const BYTE* const dictBase     = dictMode == ZSTD_dictMatchState ?
-                                     dms->window.base : NULL;
-    const BYTE* const dictLowest   = dictMode == ZSTD_dictMatchState ?
-                                     dictBase + dictLowestIndex : NULL;
-    const BYTE* const dictEnd      = dictMode == ZSTD_dictMatchState ?
-                                     dms->window.nextSrc : NULL;
-    const U32 dictIndexDelta       = dictMode == ZSTD_dictMatchState ?
-                                     prefixLowestIndex - (U32)(dictEnd - dictBase) :
-                                     0;
-    const U32 dictAndPrefixLength = (U32)(ip - prefixLowest + dictEnd - dictLowest);
-
-    /* init */
-    ip += (dictAndPrefixLength == 0);
-    if (dictMode == ZSTD_noDict) {
-        U32 const maxRep = (U32)(ip - prefixLowest);
-        if (offset_2 > maxRep) savedOffset = offset_2, offset_2 = 0;
-        if (offset_1 > maxRep) savedOffset = offset_1, offset_1 = 0;
-    }
-    if (dictMode == ZSTD_dictMatchState) {
-        /* dictMatchState repCode checks don't currently handle repCode == 0
-         * disabling. */
-        assert(offset_1 <= dictAndPrefixLength);
-        assert(offset_2 <= dictAndPrefixLength);
-    }
-
-    /* Match Loop */
-    while (ip < ilimit) {
-        size_t matchLength=0;
-        size_t offset=0;
-        const BYTE* start=ip+1;
-
-        /* check repCode */
-        if (dictMode == ZSTD_dictMatchState) {
-            const U32 repIndex = (U32)(ip - base) + 1 - offset_1;
-            const BYTE* repMatch = (dictMode == ZSTD_dictMatchState
-                                && repIndex < prefixLowestIndex) ?
-                                   dictBase + (repIndex - dictIndexDelta) :
-                                   base + repIndex;
-            if (((U32)((prefixLowestIndex-1) - repIndex) >= 3 /* intentional underflow */)
-                && (MEM_read32(repMatch) == MEM_read32(ip+1)) ) {
-                const BYTE* repMatchEnd = repIndex < prefixLowestIndex ? dictEnd : iend;
-                matchLength = ZSTD_count_2segments(ip+1+4, repMatch+4, iend, repMatchEnd, prefixLowest) + 4;
-                if (depth==0) goto _storeSequence;
-            }
-        }
-        if ( dictMode == ZSTD_noDict
-          && ((offset_1 > 0) & (MEM_read32(ip+1-offset_1) == MEM_read32(ip+1)))) {
-            matchLength = ZSTD_count(ip+1+4, ip+1+4-offset_1, iend) + 4;
-            if (depth==0) goto _storeSequence;
-        }
-
-        /* first search (depth 0) */
-        {   size_t offsetFound = 999999999;
-            size_t const ml2 = searchMax(ms, ip, iend, &offsetFound);
-            if (ml2 > matchLength)
-                matchLength = ml2, start = ip, offset=offsetFound;
-        }
-
-        if (matchLength < 4) {
-            ip += ((ip-anchor) >> kSearchStrength) + 1;   /* jump faster over incompressible sections */
-            continue;
-        }
-
-        /* let's try to find a better solution */
-        if (depth>=1)
-        while (ip<ilimit) {
-            ip ++;
-            if ( (dictMode == ZSTD_noDict)
-              && (offset) && ((offset_1>0) & (MEM_read32(ip) == MEM_read32(ip - offset_1)))) {
-                size_t const mlRep = ZSTD_count(ip+4, ip+4-offset_1, iend) + 4;
-                int const gain2 = (int)(mlRep * 3);
-                int const gain1 = (int)(matchLength*3 - ZSTD_highbit32((U32)offset+1) + 1);
-                if ((mlRep >= 4) && (gain2 > gain1))
-                    matchLength = mlRep, offset = 0, start = ip;
-            }
-            if (dictMode == ZSTD_dictMatchState) {
-                const U32 repIndex = (U32)(ip - base) - offset_1;
-                const BYTE* repMatch = repIndex < prefixLowestIndex ?
-                               dictBase + (repIndex - dictIndexDelta) :
-                               base + repIndex;
-                if (((U32)((prefixLowestIndex-1) - repIndex) >= 3 /* intentional underflow */)
-                    && (MEM_read32(repMatch) == MEM_read32(ip)) ) {
-                    const BYTE* repMatchEnd = repIndex < prefixLowestIndex ? dictEnd : iend;
-                    size_t const mlRep = ZSTD_count_2segments(ip+4, repMatch+4, iend, repMatchEnd, prefixLowest) + 4;
-                    int const gain2 = (int)(mlRep * 3);
-                    int const gain1 = (int)(matchLength*3 - ZSTD_highbit32((U32)offset+1) + 1);
-                    if ((mlRep >= 4) && (gain2 > gain1))
-                        matchLength = mlRep, offset = 0, start = ip;
-                }
-            }
-            {   size_t offset2=999999999;
-                size_t const ml2 = searchMax(ms, ip, iend, &offset2);
-                int const gain2 = (int)(ml2*4 - ZSTD_highbit32((U32)offset2+1));   /* raw approx */
-                int const gain1 = (int)(matchLength*4 - ZSTD_highbit32((U32)offset+1) + 4);
-                if ((ml2 >= 4) && (gain2 > gain1)) {
-                    matchLength = ml2, offset = offset2, start = ip;
-                    continue;   /* search a better one */
-            }   }
-
-            /* let's find an even better one */
-            if ((depth==2) && (ip<ilimit)) {
-                ip ++;
-                if ( (dictMode == ZSTD_noDict)
-                  && (offset) && ((offset_1>0) & (MEM_read32(ip) == MEM_read32(ip - offset_1)))) {
-                    size_t const mlRep = ZSTD_count(ip+4, ip+4-offset_1, iend) + 4;
-                    int const gain2 = (int)(mlRep * 4);
-                    int const gain1 = (int)(matchLength*4 - ZSTD_highbit32((U32)offset+1) + 1);
-                    if ((mlRep >= 4) && (gain2 > gain1))
-                        matchLength = mlRep, offset = 0, start = ip;
-                }
-                if (dictMode == ZSTD_dictMatchState) {
-                    const U32 repIndex = (U32)(ip - base) - offset_1;
-                    const BYTE* repMatch = repIndex < prefixLowestIndex ?
-                                   dictBase + (repIndex - dictIndexDelta) :
-                                   base + repIndex;
-                    if (((U32)((prefixLowestIndex-1) - repIndex) >= 3 /* intentional underflow */)
-                        && (MEM_read32(repMatch) == MEM_read32(ip)) ) {
-                        const BYTE* repMatchEnd = repIndex < prefixLowestIndex ? dictEnd : iend;
-                        size_t const mlRep = ZSTD_count_2segments(ip+4, repMatch+4, iend, repMatchEnd, prefixLowest) + 4;
-                        int const gain2 = (int)(mlRep * 4);
-                        int const gain1 = (int)(matchLength*4 - ZSTD_highbit32((U32)offset+1) + 1);
-                        if ((mlRep >= 4) && (gain2 > gain1))
-                            matchLength = mlRep, offset = 0, start = ip;
-                    }
-                }
-                {   size_t offset2=999999999;
-                    size_t const ml2 = searchMax(ms, ip, iend, &offset2);
-                    int const gain2 = (int)(ml2*4 - ZSTD_highbit32((U32)offset2+1));   /* raw approx */
-                    int const gain1 = (int)(matchLength*4 - ZSTD_highbit32((U32)offset+1) + 7);
-                    if ((ml2 >= 4) && (gain2 > gain1)) {
-                        matchLength = ml2, offset = offset2, start = ip;
-                        continue;
-            }   }   }
-            break;  /* nothing found : store previous solution */
-        }
-
-        /* NOTE:
-         * start[-offset+ZSTD_REP_MOVE-1] is undefined behavior.
-         * (-offset+ZSTD_REP_MOVE-1) is unsigned, and is added to start, which
-         * overflows the pointer, which is undefined behavior.
-         */
-        /* catch up */
-        if (offset) {
-            if (dictMode == ZSTD_noDict) {
-                while ( ((start > anchor) & (start - (offset-ZSTD_REP_MOVE) > prefixLowest))
-                     && (start[-1] == (start-(offset-ZSTD_REP_MOVE))[-1]) )  /* only search for offset within prefix */
-                    { start--; matchLength++; }
-            }
-            if (dictMode == ZSTD_dictMatchState) {
-                U32 const matchIndex = (U32)((start-base) - (offset - ZSTD_REP_MOVE));
-                const BYTE* match = (matchIndex < prefixLowestIndex) ? dictBase + matchIndex - dictIndexDelta : base + matchIndex;
-                const BYTE* const mStart = (matchIndex < prefixLowestIndex) ? dictLowest : prefixLowest;
-                while ((start>anchor) && (match>mStart) && (start[-1] == match[-1])) { start--; match--; matchLength++; }  /* catch up */
-            }
-            offset_2 = offset_1; offset_1 = (U32)(offset - ZSTD_REP_MOVE);
-        }
-        /* store sequence */
-_storeSequence:
-        {   size_t const litLength = start - anchor;
-            ZSTD_storeSeq(seqStore, litLength, anchor, (U32)offset, matchLength-MINMATCH);
-            anchor = ip = start + matchLength;
-        }
-
-        /* check immediate repcode */
-        if (dictMode == ZSTD_dictMatchState) {
-            while (ip <= ilimit) {
-                U32 const current2 = (U32)(ip-base);
-                U32 const repIndex = current2 - offset_2;
-                const BYTE* repMatch = dictMode == ZSTD_dictMatchState
-                    && repIndex < prefixLowestIndex ?
-                        dictBase - dictIndexDelta + repIndex :
-                        base + repIndex;
-                if ( ((U32)((prefixLowestIndex-1) - (U32)repIndex) >= 3 /* intentional overflow */)
-                   && (MEM_read32(repMatch) == MEM_read32(ip)) ) {
-                    const BYTE* const repEnd2 = repIndex < prefixLowestIndex ? dictEnd : iend;
-                    matchLength = ZSTD_count_2segments(ip+4, repMatch+4, iend, repEnd2, prefixLowest) + 4;
-                    offset = offset_2; offset_2 = offset_1; offset_1 = (U32)offset;   /* swap offset_2 <=> offset_1 */
-                    ZSTD_storeSeq(seqStore, 0, anchor, 0, matchLength-MINMATCH);
-                    ip += matchLength;
-                    anchor = ip;
-                    continue;
-                }
-                break;
-            }
-        }
-
-        if (dictMode == ZSTD_noDict) {
-            while ( ((ip <= ilimit) & (offset_2>0))
-                 && (MEM_read32(ip) == MEM_read32(ip - offset_2)) ) {
-                /* store sequence */
-                matchLength = ZSTD_count(ip+4, ip+4-offset_2, iend) + 4;
-                offset = offset_2; offset_2 = offset_1; offset_1 = (U32)offset; /* swap repcodes */
-                ZSTD_storeSeq(seqStore, 0, anchor, 0, matchLength-MINMATCH);
-                ip += matchLength;
-                anchor = ip;
-                continue;   /* faster when present ... (?) */
-    }   }   }
-
-    /* Save reps for next block */
-    rep[0] = offset_1 ? offset_1 : savedOffset;
-    rep[1] = offset_2 ? offset_2 : savedOffset;
-
-    /* Return the last literals size */
-    return (size_t)(iend - anchor);
-}
-
-
-size_t ZSTD_compressBlock_btlazy2(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize)
-{
-    return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_binaryTree, 2, ZSTD_noDict);
-}
-
-size_t ZSTD_compressBlock_lazy2(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize)
-{
-    return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_hashChain, 2, ZSTD_noDict);
-}
-
-size_t ZSTD_compressBlock_lazy(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize)
-{
-    return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_hashChain, 1, ZSTD_noDict);
-}
-
-size_t ZSTD_compressBlock_greedy(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize)
-{
-    return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_hashChain, 0, ZSTD_noDict);
-}
-
-size_t ZSTD_compressBlock_btlazy2_dictMatchState(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize)
-{
-    return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_binaryTree, 2, ZSTD_dictMatchState);
-}
-
-size_t ZSTD_compressBlock_lazy2_dictMatchState(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize)
-{
-    return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_hashChain, 2, ZSTD_dictMatchState);
-}
-
-size_t ZSTD_compressBlock_lazy_dictMatchState(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize)
-{
-    return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_hashChain, 1, ZSTD_dictMatchState);
-}
-
-size_t ZSTD_compressBlock_greedy_dictMatchState(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize)
-{
-    return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_hashChain, 0, ZSTD_dictMatchState);
-}
-
-
-FORCE_INLINE_TEMPLATE
-size_t ZSTD_compressBlock_lazy_extDict_generic(
-                        ZSTD_matchState_t* ms, seqStore_t* seqStore,
-                        U32 rep[ZSTD_REP_NUM],
-                        const void* src, size_t srcSize,
-                        const searchMethod_e searchMethod, const U32 depth)
-{
-    const BYTE* const istart = (const BYTE*)src;
-    const BYTE* ip = istart;
-    const BYTE* anchor = istart;
-    const BYTE* const iend = istart + srcSize;
-    const BYTE* const ilimit = iend - 8;
-    const BYTE* const base = ms->window.base;
-    const U32 dictLimit = ms->window.dictLimit;
-    const U32 lowestIndex = ms->window.lowLimit;
-    const BYTE* const prefixStart = base + dictLimit;
-    const BYTE* const dictBase = ms->window.dictBase;
-    const BYTE* const dictEnd  = dictBase + dictLimit;
-    const BYTE* const dictStart  = dictBase + lowestIndex;
-
-    typedef size_t (*searchMax_f)(
-                        ZSTD_matchState_t* ms,
-                        const BYTE* ip, const BYTE* iLimit, size_t* offsetPtr);
-    searchMax_f searchMax = searchMethod==search_binaryTree ? ZSTD_BtFindBestMatch_extDict_selectMLS : ZSTD_HcFindBestMatch_extDict_selectMLS;
-
-    U32 offset_1 = rep[0], offset_2 = rep[1];
-
-    /* init */
-    ip += (ip == prefixStart);
-
-    /* Match Loop */
-    while (ip < ilimit) {
-        size_t matchLength=0;
-        size_t offset=0;
-        const BYTE* start=ip+1;
-        U32 current = (U32)(ip-base);
-
-        /* check repCode */
-        {   const U32 repIndex = (U32)(current+1 - offset_1);
-            const BYTE* const repBase = repIndex < dictLimit ? dictBase : base;
-            const BYTE* const repMatch = repBase + repIndex;
-            if (((U32)((dictLimit-1) - repIndex) >= 3) & (repIndex > lowestIndex))   /* intentional overflow */
-            if (MEM_read32(ip+1) == MEM_read32(repMatch)) {
-                /* repcode detected we should take it */
-                const BYTE* const repEnd = repIndex < dictLimit ? dictEnd : iend;
-                matchLength = ZSTD_count_2segments(ip+1+4, repMatch+4, iend, repEnd, prefixStart) + 4;
-                if (depth==0) goto _storeSequence;
-        }   }
-
-        /* first search (depth 0) */
-        {   size_t offsetFound = 999999999;
-            size_t const ml2 = searchMax(ms, ip, iend, &offsetFound);
-            if (ml2 > matchLength)
-                matchLength = ml2, start = ip, offset=offsetFound;
-        }
-
-         if (matchLength < 4) {
-            ip += ((ip-anchor) >> kSearchStrength) + 1;   /* jump faster over incompressible sections */
-            continue;
-        }
-
-        /* let's try to find a better solution */
-        if (depth>=1)
-        while (ip<ilimit) {
-            ip ++;
-            current++;
-            /* check repCode */
-            if (offset) {
-                const U32 repIndex = (U32)(current - offset_1);
-                const BYTE* const repBase = repIndex < dictLimit ? dictBase : base;
-                const BYTE* const repMatch = repBase + repIndex;
-                if (((U32)((dictLimit-1) - repIndex) >= 3) & (repIndex > lowestIndex))  /* intentional overflow */
-                if (MEM_read32(ip) == MEM_read32(repMatch)) {
-                    /* repcode detected */
-                    const BYTE* const repEnd = repIndex < dictLimit ? dictEnd : iend;
-                    size_t const repLength = ZSTD_count_2segments(ip+4, repMatch+4, iend, repEnd, prefixStart) + 4;
-                    int const gain2 = (int)(repLength * 3);
-                    int const gain1 = (int)(matchLength*3 - ZSTD_highbit32((U32)offset+1) + 1);
-                    if ((repLength >= 4) && (gain2 > gain1))
-                        matchLength = repLength, offset = 0, start = ip;
-            }   }
-
-            /* search match, depth 1 */
-            {   size_t offset2=999999999;
-                size_t const ml2 = searchMax(ms, ip, iend, &offset2);
-                int const gain2 = (int)(ml2*4 - ZSTD_highbit32((U32)offset2+1));   /* raw approx */
-                int const gain1 = (int)(matchLength*4 - ZSTD_highbit32((U32)offset+1) + 4);
-                if ((ml2 >= 4) && (gain2 > gain1)) {
-                    matchLength = ml2, offset = offset2, start = ip;
-                    continue;   /* search a better one */
-            }   }
-
-            /* let's find an even better one */
-            if ((depth==2) && (ip<ilimit)) {
-                ip ++;
-                current++;
-                /* check repCode */
-                if (offset) {
-                    const U32 repIndex = (U32)(current - offset_1);
-                    const BYTE* const repBase = repIndex < dictLimit ? dictBase : base;
-                    const BYTE* const repMatch = repBase + repIndex;
-                    if (((U32)((dictLimit-1) - repIndex) >= 3) & (repIndex > lowestIndex))  /* intentional overflow */
-                    if (MEM_read32(ip) == MEM_read32(repMatch)) {
-                        /* repcode detected */
-                        const BYTE* const repEnd = repIndex < dictLimit ? dictEnd : iend;
-                        size_t const repLength = ZSTD_count_2segments(ip+4, repMatch+4, iend, repEnd, prefixStart) + 4;
-                        int const gain2 = (int)(repLength * 4);
-                        int const gain1 = (int)(matchLength*4 - ZSTD_highbit32((U32)offset+1) + 1);
-                        if ((repLength >= 4) && (gain2 > gain1))
-                            matchLength = repLength, offset = 0, start = ip;
-                }   }
-
-                /* search match, depth 2 */
-                {   size_t offset2=999999999;
-                    size_t const ml2 = searchMax(ms, ip, iend, &offset2);
-                    int const gain2 = (int)(ml2*4 - ZSTD_highbit32((U32)offset2+1));   /* raw approx */
-                    int const gain1 = (int)(matchLength*4 - ZSTD_highbit32((U32)offset+1) + 7);
-                    if ((ml2 >= 4) && (gain2 > gain1)) {
-                        matchLength = ml2, offset = offset2, start = ip;
-                        continue;
-            }   }   }
-            break;  /* nothing found : store previous solution */
-        }
-
-        /* catch up */
-        if (offset) {
-            U32 const matchIndex = (U32)((start-base) - (offset - ZSTD_REP_MOVE));
-            const BYTE* match = (matchIndex < dictLimit) ? dictBase + matchIndex : base + matchIndex;
-            const BYTE* const mStart = (matchIndex < dictLimit) ? dictStart : prefixStart;
-            while ((start>anchor) && (match>mStart) && (start[-1] == match[-1])) { start--; match--; matchLength++; }  /* catch up */
-            offset_2 = offset_1; offset_1 = (U32)(offset - ZSTD_REP_MOVE);
-        }
-
-        /* store sequence */
-_storeSequence:
-        {   size_t const litLength = start - anchor;
-            ZSTD_storeSeq(seqStore, litLength, anchor, (U32)offset, matchLength-MINMATCH);
-            anchor = ip = start + matchLength;
-        }
-
-        /* check immediate repcode */
-        while (ip <= ilimit) {
-            const U32 repIndex = (U32)((ip-base) - offset_2);
-            const BYTE* const repBase = repIndex < dictLimit ? dictBase : base;
-            const BYTE* const repMatch = repBase + repIndex;
-            if (((U32)((dictLimit-1) - repIndex) >= 3) & (repIndex > lowestIndex))  /* intentional overflow */
-            if (MEM_read32(ip) == MEM_read32(repMatch)) {
-                /* repcode detected we should take it */
-                const BYTE* const repEnd = repIndex < dictLimit ? dictEnd : iend;
-                matchLength = ZSTD_count_2segments(ip+4, repMatch+4, iend, repEnd, prefixStart) + 4;
-                offset = offset_2; offset_2 = offset_1; offset_1 = (U32)offset;   /* swap offset history */
-                ZSTD_storeSeq(seqStore, 0, anchor, 0, matchLength-MINMATCH);
-                ip += matchLength;
-                anchor = ip;
-                continue;   /* faster when present ... (?) */
-            }
-            break;
-    }   }
-
-    /* Save reps for next block */
-    rep[0] = offset_1;
-    rep[1] = offset_2;
-
-    /* Return the last literals size */
-    return (size_t)(iend - anchor);
-}
-
-
-size_t ZSTD_compressBlock_greedy_extDict(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize)
-{
-    return ZSTD_compressBlock_lazy_extDict_generic(ms, seqStore, rep, src, srcSize, search_hashChain, 0);
-}
-
-size_t ZSTD_compressBlock_lazy_extDict(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize)
-
-{
-    return ZSTD_compressBlock_lazy_extDict_generic(ms, seqStore, rep, src, srcSize, search_hashChain, 1);
-}
-
-size_t ZSTD_compressBlock_lazy2_extDict(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize)
-
-{
-    return ZSTD_compressBlock_lazy_extDict_generic(ms, seqStore, rep, src, srcSize, search_hashChain, 2);
-}
-
-size_t ZSTD_compressBlock_btlazy2_extDict(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize)
-
-{
-    return ZSTD_compressBlock_lazy_extDict_generic(ms, seqStore, rep, src, srcSize, search_binaryTree, 2);
-}
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/compress/zstd_lazy.h mysql-8.0-8.0.27/extra/zstd/lib/compress/zstd_lazy.h
--- mysql-8.0-8.0.26/extra/zstd/lib/compress/zstd_lazy.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/compress/zstd_lazy.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
-#ifndef ZSTD_LAZY_H
-#define ZSTD_LAZY_H
-
-#if defined (__cplusplus)
-extern "C" {
-#endif
-
-#include "zstd_compress_internal.h"
-
-U32 ZSTD_insertAndFindFirstIndex(ZSTD_matchState_t* ms, const BYTE* ip);
-
-void ZSTD_preserveUnsortedMark (U32* const table, U32 const size, U32 const reducerValue);  /*! used in ZSTD_reduceIndex(). preemptively increase value of ZSTD_DUBT_UNSORTED_MARK */
-
-size_t ZSTD_compressBlock_btlazy2(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize);
-size_t ZSTD_compressBlock_lazy2(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize);
-size_t ZSTD_compressBlock_lazy(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize);
-size_t ZSTD_compressBlock_greedy(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize);
-
-size_t ZSTD_compressBlock_btlazy2_dictMatchState(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize);
-size_t ZSTD_compressBlock_lazy2_dictMatchState(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize);
-size_t ZSTD_compressBlock_lazy_dictMatchState(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize);
-size_t ZSTD_compressBlock_greedy_dictMatchState(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize);
-
-size_t ZSTD_compressBlock_greedy_extDict(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize);
-size_t ZSTD_compressBlock_lazy_extDict(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize);
-size_t ZSTD_compressBlock_lazy2_extDict(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize);
-size_t ZSTD_compressBlock_btlazy2_extDict(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize);
-
-#if defined (__cplusplus)
-}
-#endif
-
-#endif /* ZSTD_LAZY_H */
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/compress/zstd_ldm.c mysql-8.0-8.0.27/extra/zstd/lib/compress/zstd_ldm.c
--- mysql-8.0-8.0.26/extra/zstd/lib/compress/zstd_ldm.c	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/compress/zstd_ldm.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,597 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- */
-
-#include "zstd_ldm.h"
-
-#include "debug.h"
-#include "zstd_fast.h"          /* ZSTD_fillHashTable() */
-#include "zstd_double_fast.h"   /* ZSTD_fillDoubleHashTable() */
-
-#define LDM_BUCKET_SIZE_LOG 3
-#define LDM_MIN_MATCH_LENGTH 64
-#define LDM_HASH_RLOG 7
-#define LDM_HASH_CHAR_OFFSET 10
-
-void ZSTD_ldm_adjustParameters(ldmParams_t* params,
-                               ZSTD_compressionParameters const* cParams)
-{
-    params->windowLog = cParams->windowLog;
-    ZSTD_STATIC_ASSERT(LDM_BUCKET_SIZE_LOG <= ZSTD_LDM_BUCKETSIZELOG_MAX);
-    DEBUGLOG(4, "ZSTD_ldm_adjustParameters");
-    if (!params->bucketSizeLog) params->bucketSizeLog = LDM_BUCKET_SIZE_LOG;
-    if (!params->minMatchLength) params->minMatchLength = LDM_MIN_MATCH_LENGTH;
-    if (cParams->strategy >= ZSTD_btopt) {
-      /* Get out of the way of the optimal parser */
-      U32 const minMatch = MAX(cParams->targetLength, params->minMatchLength);
-      assert(minMatch >= ZSTD_LDM_MINMATCH_MIN);
-      assert(minMatch <= ZSTD_LDM_MINMATCH_MAX);
-      params->minMatchLength = minMatch;
-    }
-    if (params->hashLog == 0) {
-        params->hashLog = MAX(ZSTD_HASHLOG_MIN, params->windowLog - LDM_HASH_RLOG);
-        assert(params->hashLog <= ZSTD_HASHLOG_MAX);
-    }
-    if (params->hashRateLog == 0) {
-        params->hashRateLog = params->windowLog < params->hashLog
-                                   ? 0
-                                   : params->windowLog - params->hashLog;
-    }
-    params->bucketSizeLog = MIN(params->bucketSizeLog, params->hashLog);
-}
-
-size_t ZSTD_ldm_getTableSize(ldmParams_t params)
-{
-    size_t const ldmHSize = ((size_t)1) << params.hashLog;
-    size_t const ldmBucketSizeLog = MIN(params.bucketSizeLog, params.hashLog);
-    size_t const ldmBucketSize =
-        ((size_t)1) << (params.hashLog - ldmBucketSizeLog);
-    size_t const totalSize = ldmBucketSize + ldmHSize * sizeof(ldmEntry_t);
-    return params.enableLdm ? totalSize : 0;
-}
-
-size_t ZSTD_ldm_getMaxNbSeq(ldmParams_t params, size_t maxChunkSize)
-{
-    return params.enableLdm ? (maxChunkSize / params.minMatchLength) : 0;
-}
-
-/** ZSTD_ldm_getSmallHash() :
- *  numBits should be <= 32
- *  If numBits==0, returns 0.
- *  @return : the most significant numBits of value. */
-static U32 ZSTD_ldm_getSmallHash(U64 value, U32 numBits)
-{
-    assert(numBits <= 32);
-    return numBits == 0 ? 0 : (U32)(value >> (64 - numBits));
-}
-
-/** ZSTD_ldm_getChecksum() :
- *  numBitsToDiscard should be <= 32
- *  @return : the next most significant 32 bits after numBitsToDiscard */
-static U32 ZSTD_ldm_getChecksum(U64 hash, U32 numBitsToDiscard)
-{
-    assert(numBitsToDiscard <= 32);
-    return (hash >> (64 - 32 - numBitsToDiscard)) & 0xFFFFFFFF;
-}
-
-/** ZSTD_ldm_getTag() ;
- *  Given the hash, returns the most significant numTagBits bits
- *  after (32 + hbits) bits.
- *
- *  If there are not enough bits remaining, return the last
- *  numTagBits bits. */
-static U32 ZSTD_ldm_getTag(U64 hash, U32 hbits, U32 numTagBits)
-{
-    assert(numTagBits < 32 && hbits <= 32);
-    if (32 - hbits < numTagBits) {
-        return hash & (((U32)1 << numTagBits) - 1);
-    } else {
-        return (hash >> (32 - hbits - numTagBits)) & (((U32)1 << numTagBits) - 1);
-    }
-}
-
-/** ZSTD_ldm_getBucket() :
- *  Returns a pointer to the start of the bucket associated with hash. */
-static ldmEntry_t* ZSTD_ldm_getBucket(
-        ldmState_t* ldmState, size_t hash, ldmParams_t const ldmParams)
-{
-    return ldmState->hashTable + (hash << ldmParams.bucketSizeLog);
-}
-
-/** ZSTD_ldm_insertEntry() :
- *  Insert the entry with corresponding hash into the hash table */
-static void ZSTD_ldm_insertEntry(ldmState_t* ldmState,
-                                 size_t const hash, const ldmEntry_t entry,
-                                 ldmParams_t const ldmParams)
-{
-    BYTE* const bucketOffsets = ldmState->bucketOffsets;
-    *(ZSTD_ldm_getBucket(ldmState, hash, ldmParams) + bucketOffsets[hash]) = entry;
-    bucketOffsets[hash]++;
-    bucketOffsets[hash] &= ((U32)1 << ldmParams.bucketSizeLog) - 1;
-}
-
-/** ZSTD_ldm_makeEntryAndInsertByTag() :
- *
- *  Gets the small hash, checksum, and tag from the rollingHash.
- *
- *  If the tag matches (1 << ldmParams.hashRateLog)-1, then
- *  creates an ldmEntry from the offset, and inserts it into the hash table.
- *
- *  hBits is the length of the small hash, which is the most significant hBits
- *  of rollingHash. The checksum is the next 32 most significant bits, followed
- *  by ldmParams.hashRateLog bits that make up the tag. */
-static void ZSTD_ldm_makeEntryAndInsertByTag(ldmState_t* ldmState,
-                                             U64 const rollingHash,
-                                             U32 const hBits,
-                                             U32 const offset,
-                                             ldmParams_t const ldmParams)
-{
-    U32 const tag = ZSTD_ldm_getTag(rollingHash, hBits, ldmParams.hashRateLog);
-    U32 const tagMask = ((U32)1 << ldmParams.hashRateLog) - 1;
-    if (tag == tagMask) {
-        U32 const hash = ZSTD_ldm_getSmallHash(rollingHash, hBits);
-        U32 const checksum = ZSTD_ldm_getChecksum(rollingHash, hBits);
-        ldmEntry_t entry;
-        entry.offset = offset;
-        entry.checksum = checksum;
-        ZSTD_ldm_insertEntry(ldmState, hash, entry, ldmParams);
-    }
-}
-
-/** ZSTD_ldm_countBackwardsMatch() :
- *  Returns the number of bytes that match backwards before pIn and pMatch.
- *
- *  We count only bytes where pMatch >= pBase and pIn >= pAnchor. */
-static size_t ZSTD_ldm_countBackwardsMatch(
-            const BYTE* pIn, const BYTE* pAnchor,
-            const BYTE* pMatch, const BYTE* pBase)
-{
-    size_t matchLength = 0;
-    while (pIn > pAnchor && pMatch > pBase && pIn[-1] == pMatch[-1]) {
-        pIn--;
-        pMatch--;
-        matchLength++;
-    }
-    return matchLength;
-}
-
-/** ZSTD_ldm_fillFastTables() :
- *
- *  Fills the relevant tables for the ZSTD_fast and ZSTD_dfast strategies.
- *  This is similar to ZSTD_loadDictionaryContent.
- *
- *  The tables for the other strategies are filled within their
- *  block compressors. */
-static size_t ZSTD_ldm_fillFastTables(ZSTD_matchState_t* ms,
-                                      void const* end)
-{
-    const BYTE* const iend = (const BYTE*)end;
-
-    switch(ms->cParams.strategy)
-    {
-    case ZSTD_fast:
-        ZSTD_fillHashTable(ms, iend, ZSTD_dtlm_fast);
-        break;
-
-    case ZSTD_dfast:
-        ZSTD_fillDoubleHashTable(ms, iend, ZSTD_dtlm_fast);
-        break;
-
-    case ZSTD_greedy:
-    case ZSTD_lazy:
-    case ZSTD_lazy2:
-    case ZSTD_btlazy2:
-    case ZSTD_btopt:
-    case ZSTD_btultra:
-    case ZSTD_btultra2:
-        break;
-    default:
-        assert(0);  /* not possible : not a valid strategy id */
-    }
-
-    return 0;
-}
-
-/** ZSTD_ldm_fillLdmHashTable() :
- *
- *  Fills hashTable from (lastHashed + 1) to iend (non-inclusive).
- *  lastHash is the rolling hash that corresponds to lastHashed.
- *
- *  Returns the rolling hash corresponding to position iend-1. */
-static U64 ZSTD_ldm_fillLdmHashTable(ldmState_t* state,
-                                     U64 lastHash, const BYTE* lastHashed,
-                                     const BYTE* iend, const BYTE* base,
-                                     U32 hBits, ldmParams_t const ldmParams)
-{
-    U64 rollingHash = lastHash;
-    const BYTE* cur = lastHashed + 1;
-
-    while (cur < iend) {
-        rollingHash = ZSTD_rollingHash_rotate(rollingHash, cur[-1],
-                                              cur[ldmParams.minMatchLength-1],
-                                              state->hashPower);
-        ZSTD_ldm_makeEntryAndInsertByTag(state,
-                                         rollingHash, hBits,
-                                         (U32)(cur - base), ldmParams);
-        ++cur;
-    }
-    return rollingHash;
-}
-
-
-/** ZSTD_ldm_limitTableUpdate() :
- *
- *  Sets cctx->nextToUpdate to a position corresponding closer to anchor
- *  if it is far way
- *  (after a long match, only update tables a limited amount). */
-static void ZSTD_ldm_limitTableUpdate(ZSTD_matchState_t* ms, const BYTE* anchor)
-{
-    U32 const current = (U32)(anchor - ms->window.base);
-    if (current > ms->nextToUpdate + 1024) {
-        ms->nextToUpdate =
-            current - MIN(512, current - ms->nextToUpdate - 1024);
-    }
-}
-
-static size_t ZSTD_ldm_generateSequences_internal(
-        ldmState_t* ldmState, rawSeqStore_t* rawSeqStore,
-        ldmParams_t const* params, void const* src, size_t srcSize)
-{
-    /* LDM parameters */
-    int const extDict = ZSTD_window_hasExtDict(ldmState->window);
-    U32 const minMatchLength = params->minMatchLength;
-    U64 const hashPower = ldmState->hashPower;
-    U32 const hBits = params->hashLog - params->bucketSizeLog;
-    U32 const ldmBucketSize = 1U << params->bucketSizeLog;
-    U32 const hashRateLog = params->hashRateLog;
-    U32 const ldmTagMask = (1U << params->hashRateLog) - 1;
-    /* Prefix and extDict parameters */
-    U32 const dictLimit = ldmState->window.dictLimit;
-    U32 const lowestIndex = extDict ? ldmState->window.lowLimit : dictLimit;
-    BYTE const* const base = ldmState->window.base;
-    BYTE const* const dictBase = extDict ? ldmState->window.dictBase : NULL;
-    BYTE const* const dictStart = extDict ? dictBase + lowestIndex : NULL;
-    BYTE const* const dictEnd = extDict ? dictBase + dictLimit : NULL;
-    BYTE const* const lowPrefixPtr = base + dictLimit;
-    /* Input bounds */
-    BYTE const* const istart = (BYTE const*)src;
-    BYTE const* const iend = istart + srcSize;
-    BYTE const* const ilimit = iend - MAX(minMatchLength, HASH_READ_SIZE);
-    /* Input positions */
-    BYTE const* anchor = istart;
-    BYTE const* ip = istart;
-    /* Rolling hash */
-    BYTE const* lastHashed = NULL;
-    U64 rollingHash = 0;
-
-    while (ip <= ilimit) {
-        size_t mLength;
-        U32 const current = (U32)(ip - base);
-        size_t forwardMatchLength = 0, backwardMatchLength = 0;
-        ldmEntry_t* bestEntry = NULL;
-        if (ip != istart) {
-            rollingHash = ZSTD_rollingHash_rotate(rollingHash, lastHashed[0],
-                                                  lastHashed[minMatchLength],
-                                                  hashPower);
-        } else {
-            rollingHash = ZSTD_rollingHash_compute(ip, minMatchLength);
-        }
-        lastHashed = ip;
-
-        /* Do not insert and do not look for a match */
-        if (ZSTD_ldm_getTag(rollingHash, hBits, hashRateLog) != ldmTagMask) {
-           ip++;
-           continue;
-        }
-
-        /* Get the best entry and compute the match lengths */
-        {
-            ldmEntry_t* const bucket =
-                ZSTD_ldm_getBucket(ldmState,
-                                   ZSTD_ldm_getSmallHash(rollingHash, hBits),
-                                   *params);
-            ldmEntry_t* cur;
-            size_t bestMatchLength = 0;
-            U32 const checksum = ZSTD_ldm_getChecksum(rollingHash, hBits);
-
-            for (cur = bucket; cur < bucket + ldmBucketSize; ++cur) {
-                size_t curForwardMatchLength, curBackwardMatchLength,
-                       curTotalMatchLength;
-                if (cur->checksum != checksum || cur->offset <= lowestIndex) {
-                    continue;
-                }
-                if (extDict) {
-                    BYTE const* const curMatchBase =
-                        cur->offset < dictLimit ? dictBase : base;
-                    BYTE const* const pMatch = curMatchBase + cur->offset;
-                    BYTE const* const matchEnd =
-                        cur->offset < dictLimit ? dictEnd : iend;
-                    BYTE const* const lowMatchPtr =
-                        cur->offset < dictLimit ? dictStart : lowPrefixPtr;
-
-                    curForwardMatchLength = ZSTD_count_2segments(
-                                                ip, pMatch, iend,
-                                                matchEnd, lowPrefixPtr);
-                    if (curForwardMatchLength < minMatchLength) {
-                        continue;
-                    }
-                    curBackwardMatchLength =
-                        ZSTD_ldm_countBackwardsMatch(ip, anchor, pMatch,
-                                                     lowMatchPtr);
-                    curTotalMatchLength = curForwardMatchLength +
-                                          curBackwardMatchLength;
-                } else { /* !extDict */
-                    BYTE const* const pMatch = base + cur->offset;
-                    curForwardMatchLength = ZSTD_count(ip, pMatch, iend);
-                    if (curForwardMatchLength < minMatchLength) {
-                        continue;
-                    }
-                    curBackwardMatchLength =
-                        ZSTD_ldm_countBackwardsMatch(ip, anchor, pMatch,
-                                                     lowPrefixPtr);
-                    curTotalMatchLength = curForwardMatchLength +
-                                          curBackwardMatchLength;
-                }
-
-                if (curTotalMatchLength > bestMatchLength) {
-                    bestMatchLength = curTotalMatchLength;
-                    forwardMatchLength = curForwardMatchLength;
-                    backwardMatchLength = curBackwardMatchLength;
-                    bestEntry = cur;
-                }
-            }
-        }
-
-        /* No match found -- continue searching */
-        if (bestEntry == NULL) {
-            ZSTD_ldm_makeEntryAndInsertByTag(ldmState, rollingHash,
-                                             hBits, current,
-                                             *params);
-            ip++;
-            continue;
-        }
-
-        /* Match found */
-        mLength = forwardMatchLength + backwardMatchLength;
-        ip -= backwardMatchLength;
-
-        {
-            /* Store the sequence:
-             * ip = current - backwardMatchLength
-             * The match is at (bestEntry->offset - backwardMatchLength)
-             */
-            U32 const matchIndex = bestEntry->offset;
-            U32 const offset = current - matchIndex;
-            rawSeq* const seq = rawSeqStore->seq + rawSeqStore->size;
-
-            /* Out of sequence storage */
-            if (rawSeqStore->size == rawSeqStore->capacity)
-                return ERROR(dstSize_tooSmall);
-            seq->litLength = (U32)(ip - anchor);
-            seq->matchLength = (U32)mLength;
-            seq->offset = offset;
-            rawSeqStore->size++;
-        }
-
-        /* Insert the current entry into the hash table */
-        ZSTD_ldm_makeEntryAndInsertByTag(ldmState, rollingHash, hBits,
-                                         (U32)(lastHashed - base),
-                                         *params);
-
-        assert(ip + backwardMatchLength == lastHashed);
-
-        /* Fill the hash table from lastHashed+1 to ip+mLength*/
-        /* Heuristic: don't need to fill the entire table at end of block */
-        if (ip + mLength <= ilimit) {
-            rollingHash = ZSTD_ldm_fillLdmHashTable(
-                              ldmState, rollingHash, lastHashed,
-                              ip + mLength, base, hBits, *params);
-            lastHashed = ip + mLength - 1;
-        }
-        ip += mLength;
-        anchor = ip;
-    }
-    return iend - anchor;
-}
-
-/*! ZSTD_ldm_reduceTable() :
- *  reduce table indexes by `reducerValue` */
-static void ZSTD_ldm_reduceTable(ldmEntry_t* const table, U32 const size,
-                                 U32 const reducerValue)
-{
-    U32 u;
-    for (u = 0; u < size; u++) {
-        if (table[u].offset < reducerValue) table[u].offset = 0;
-        else table[u].offset -= reducerValue;
-    }
-}
-
-size_t ZSTD_ldm_generateSequences(
-        ldmState_t* ldmState, rawSeqStore_t* sequences,
-        ldmParams_t const* params, void const* src, size_t srcSize)
-{
-    U32 const maxDist = 1U << params->windowLog;
-    BYTE const* const istart = (BYTE const*)src;
-    BYTE const* const iend = istart + srcSize;
-    size_t const kMaxChunkSize = 1 << 20;
-    size_t const nbChunks = (srcSize / kMaxChunkSize) + ((srcSize % kMaxChunkSize) != 0);
-    size_t chunk;
-    size_t leftoverSize = 0;
-
-    assert(ZSTD_CHUNKSIZE_MAX >= kMaxChunkSize);
-    /* Check that ZSTD_window_update() has been called for this chunk prior
-     * to passing it to this function.
-     */
-    assert(ldmState->window.nextSrc >= (BYTE const*)src + srcSize);
-    /* The input could be very large (in zstdmt), so it must be broken up into
-     * chunks to enforce the maximum distance and handle overflow correction.
-     */
-    assert(sequences->pos <= sequences->size);
-    assert(sequences->size <= sequences->capacity);
-    for (chunk = 0; chunk < nbChunks && sequences->size < sequences->capacity; ++chunk) {
-        BYTE const* const chunkStart = istart + chunk * kMaxChunkSize;
-        size_t const remaining = (size_t)(iend - chunkStart);
-        BYTE const *const chunkEnd =
-            (remaining < kMaxChunkSize) ? iend : chunkStart + kMaxChunkSize;
-        size_t const chunkSize = chunkEnd - chunkStart;
-        size_t newLeftoverSize;
-        size_t const prevSize = sequences->size;
-
-        assert(chunkStart < iend);
-        /* 1. Perform overflow correction if necessary. */
-        if (ZSTD_window_needOverflowCorrection(ldmState->window, chunkEnd)) {
-            U32 const ldmHSize = 1U << params->hashLog;
-            U32 const correction = ZSTD_window_correctOverflow(
-                &ldmState->window, /* cycleLog */ 0, maxDist, chunkStart);
-            ZSTD_ldm_reduceTable(ldmState->hashTable, ldmHSize, correction);
-        }
-        /* 2. We enforce the maximum offset allowed.
-         *
-         * kMaxChunkSize should be small enough that we don't lose too much of
-         * the window through early invalidation.
-         * TODO: * Test the chunk size.
-         *       * Try invalidation after the sequence generation and test the
-         *         the offset against maxDist directly.
-         */
-        ZSTD_window_enforceMaxDist(&ldmState->window, chunkEnd, maxDist, NULL, NULL);
-        /* 3. Generate the sequences for the chunk, and get newLeftoverSize. */
-        newLeftoverSize = ZSTD_ldm_generateSequences_internal(
-            ldmState, sequences, params, chunkStart, chunkSize);
-        if (ZSTD_isError(newLeftoverSize))
-            return newLeftoverSize;
-        /* 4. We add the leftover literals from previous iterations to the first
-         *    newly generated sequence, or add the `newLeftoverSize` if none are
-         *    generated.
-         */
-        /* Prepend the leftover literals from the last call */
-        if (prevSize < sequences->size) {
-            sequences->seq[prevSize].litLength += (U32)leftoverSize;
-            leftoverSize = newLeftoverSize;
-        } else {
-            assert(newLeftoverSize == chunkSize);
-            leftoverSize += chunkSize;
-        }
-    }
-    return 0;
-}
-
-void ZSTD_ldm_skipSequences(rawSeqStore_t* rawSeqStore, size_t srcSize, U32 const minMatch) {
-    while (srcSize > 0 && rawSeqStore->pos < rawSeqStore->size) {
-        rawSeq* seq = rawSeqStore->seq + rawSeqStore->pos;
-        if (srcSize <= seq->litLength) {
-            /* Skip past srcSize literals */
-            seq->litLength -= (U32)srcSize;
-            return;
-        }
-        srcSize -= seq->litLength;
-        seq->litLength = 0;
-        if (srcSize < seq->matchLength) {
-            /* Skip past the first srcSize of the match */
-            seq->matchLength -= (U32)srcSize;
-            if (seq->matchLength < minMatch) {
-                /* The match is too short, omit it */
-                if (rawSeqStore->pos + 1 < rawSeqStore->size) {
-                    seq[1].litLength += seq[0].matchLength;
-                }
-                rawSeqStore->pos++;
-            }
-            return;
-        }
-        srcSize -= seq->matchLength;
-        seq->matchLength = 0;
-        rawSeqStore->pos++;
-    }
-}
-
-/**
- * If the sequence length is longer than remaining then the sequence is split
- * between this block and the next.
- *
- * Returns the current sequence to handle, or if the rest of the block should
- * be literals, it returns a sequence with offset == 0.
- */
-static rawSeq maybeSplitSequence(rawSeqStore_t* rawSeqStore,
-                                 U32 const remaining, U32 const minMatch)
-{
-    rawSeq sequence = rawSeqStore->seq[rawSeqStore->pos];
-    assert(sequence.offset > 0);
-    /* Likely: No partial sequence */
-    if (remaining >= sequence.litLength + sequence.matchLength) {
-        rawSeqStore->pos++;
-        return sequence;
-    }
-    /* Cut the sequence short (offset == 0 ==> rest is literals). */
-    if (remaining <= sequence.litLength) {
-        sequence.offset = 0;
-    } else if (remaining < sequence.litLength + sequence.matchLength) {
-        sequence.matchLength = remaining - sequence.litLength;
-        if (sequence.matchLength < minMatch) {
-            sequence.offset = 0;
-        }
-    }
-    /* Skip past `remaining` bytes for the future sequences. */
-    ZSTD_ldm_skipSequences(rawSeqStore, remaining, minMatch);
-    return sequence;
-}
-
-size_t ZSTD_ldm_blockCompress(rawSeqStore_t* rawSeqStore,
-    ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-    void const* src, size_t srcSize)
-{
-    const ZSTD_compressionParameters* const cParams = &ms->cParams;
-    unsigned const minMatch = cParams->minMatch;
-    ZSTD_blockCompressor const blockCompressor =
-        ZSTD_selectBlockCompressor(cParams->strategy, ZSTD_matchState_dictMode(ms));
-    /* Input bounds */
-    BYTE const* const istart = (BYTE const*)src;
-    BYTE const* const iend = istart + srcSize;
-    /* Input positions */
-    BYTE const* ip = istart;
-
-    DEBUGLOG(5, "ZSTD_ldm_blockCompress: srcSize=%zu", srcSize);
-    assert(rawSeqStore->pos <= rawSeqStore->size);
-    assert(rawSeqStore->size <= rawSeqStore->capacity);
-    /* Loop through each sequence and apply the block compressor to the lits */
-    while (rawSeqStore->pos < rawSeqStore->size && ip < iend) {
-        /* maybeSplitSequence updates rawSeqStore->pos */
-        rawSeq const sequence = maybeSplitSequence(rawSeqStore,
-                                                   (U32)(iend - ip), minMatch);
-        int i;
-        /* End signal */
-        if (sequence.offset == 0)
-            break;
-
-        assert(sequence.offset <= (1U << cParams->windowLog));
-        assert(ip + sequence.litLength + sequence.matchLength <= iend);
-
-        /* Fill tables for block compressor */
-        ZSTD_ldm_limitTableUpdate(ms, ip);
-        ZSTD_ldm_fillFastTables(ms, ip);
-        /* Run the block compressor */
-        DEBUGLOG(5, "calling block compressor on segment of size %u", sequence.litLength);
-        {
-            size_t const newLitLength =
-                blockCompressor(ms, seqStore, rep, ip, sequence.litLength);
-            ip += sequence.litLength;
-            /* Update the repcodes */
-            for (i = ZSTD_REP_NUM - 1; i > 0; i--)
-                rep[i] = rep[i-1];
-            rep[0] = sequence.offset;
-            /* Store the sequence */
-            ZSTD_storeSeq(seqStore, newLitLength, ip - newLitLength,
-                          sequence.offset + ZSTD_REP_MOVE,
-                          sequence.matchLength - MINMATCH);
-            ip += sequence.matchLength;
-        }
-    }
-    /* Fill the tables for the block compressor */
-    ZSTD_ldm_limitTableUpdate(ms, ip);
-    ZSTD_ldm_fillFastTables(ms, ip);
-    /* Compress the last literals */
-    return blockCompressor(ms, seqStore, rep, ip, iend - ip);
-}
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/compress/zstd_ldm.h mysql-8.0-8.0.27/extra/zstd/lib/compress/zstd_ldm.h
--- mysql-8.0-8.0.26/extra/zstd/lib/compress/zstd_ldm.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/compress/zstd_ldm.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- */
-
-#ifndef ZSTD_LDM_H
-#define ZSTD_LDM_H
-
-#if defined (__cplusplus)
-extern "C" {
-#endif
-
-#include "zstd_compress_internal.h"   /* ldmParams_t, U32 */
-#include "zstd.h"   /* ZSTD_CCtx, size_t */
-
-/*-*************************************
-*  Long distance matching
-***************************************/
-
-#define ZSTD_LDM_DEFAULT_WINDOW_LOG ZSTD_WINDOWLOG_LIMIT_DEFAULT
-
-/**
- * ZSTD_ldm_generateSequences():
- *
- * Generates the sequences using the long distance match finder.
- * Generates long range matching sequences in `sequences`, which parse a prefix
- * of the source. `sequences` must be large enough to store every sequence,
- * which can be checked with `ZSTD_ldm_getMaxNbSeq()`.
- * @returns 0 or an error code.
- *
- * NOTE: The user must have called ZSTD_window_update() for all of the input
- * they have, even if they pass it to ZSTD_ldm_generateSequences() in chunks.
- * NOTE: This function returns an error if it runs out of space to store
- *       sequences.
- */
-size_t ZSTD_ldm_generateSequences(
-            ldmState_t* ldms, rawSeqStore_t* sequences,
-            ldmParams_t const* params, void const* src, size_t srcSize);
-
-/**
- * ZSTD_ldm_blockCompress():
- *
- * Compresses a block using the predefined sequences, along with a secondary
- * block compressor. The literals section of every sequence is passed to the
- * secondary block compressor, and those sequences are interspersed with the
- * predefined sequences. Returns the length of the last literals.
- * Updates `rawSeqStore.pos` to indicate how many sequences have been consumed.
- * `rawSeqStore.seq` may also be updated to split the last sequence between two
- * blocks.
- * @return The length of the last literals.
- *
- * NOTE: The source must be at most the maximum block size, but the predefined
- * sequences can be any size, and may be longer than the block. In the case that
- * they are longer than the block, the last sequences may need to be split into
- * two. We handle that case correctly, and update `rawSeqStore` appropriately.
- * NOTE: This function does not return any errors.
- */
-size_t ZSTD_ldm_blockCompress(rawSeqStore_t* rawSeqStore,
-            ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-            void const* src, size_t srcSize);
-
-/**
- * ZSTD_ldm_skipSequences():
- *
- * Skip past `srcSize` bytes worth of sequences in `rawSeqStore`.
- * Avoids emitting matches less than `minMatch` bytes.
- * Must be called for data with is not passed to ZSTD_ldm_blockCompress().
- */
-void ZSTD_ldm_skipSequences(rawSeqStore_t* rawSeqStore, size_t srcSize,
-    U32 const minMatch);
-
-
-/** ZSTD_ldm_getTableSize() :
- *  Estimate the space needed for long distance matching tables or 0 if LDM is
- *  disabled.
- */
-size_t ZSTD_ldm_getTableSize(ldmParams_t params);
-
-/** ZSTD_ldm_getSeqSpace() :
- *  Return an upper bound on the number of sequences that can be produced by
- *  the long distance matcher, or 0 if LDM is disabled.
- */
-size_t ZSTD_ldm_getMaxNbSeq(ldmParams_t params, size_t maxChunkSize);
-
-/** ZSTD_ldm_adjustParameters() :
- *  If the params->hashRateLog is not set, set it to its default value based on
- *  windowLog and params->hashLog.
- *
- *  Ensures that params->bucketSizeLog is <= params->hashLog (setting it to
- *  params->hashLog if it is not).
- *
- *  Ensures that the minMatchLength >= targetLength during optimal parsing.
- */
-void ZSTD_ldm_adjustParameters(ldmParams_t* params,
-                               ZSTD_compressionParameters const* cParams);
-
-#if defined (__cplusplus)
-}
-#endif
-
-#endif /* ZSTD_FAST_H */
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/compress/zstdmt_compress.c mysql-8.0-8.0.27/extra/zstd/lib/compress/zstdmt_compress.c
--- mysql-8.0-8.0.26/extra/zstd/lib/compress/zstdmt_compress.c	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/compress/zstdmt_compress.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,2110 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
-
-/* ======   Compiler specifics   ====== */
-#if defined(_MSC_VER)
-#  pragma warning(disable : 4204)   /* disable: C4204: non-constant aggregate initializer */
-#endif
-
-
-/* ======   Constants   ====== */
-#define ZSTDMT_OVERLAPLOG_DEFAULT 0
-
-
-/* ======   Dependencies   ====== */
-#include <string.h>      /* memcpy, memset */
-#include <limits.h>      /* INT_MAX, UINT_MAX */
-#include "mem.h"         /* MEM_STATIC */
-#include "pool.h"        /* threadpool */
-#include "threading.h"   /* mutex */
-#include "zstd_compress_internal.h"  /* MIN, ERROR, ZSTD_*, ZSTD_highbit32 */
-#include "zstd_ldm.h"
-#include "zstdmt_compress.h"
-
-/* Guards code to support resizing the SeqPool.
- * We will want to resize the SeqPool to save memory in the future.
- * Until then, comment the code out since it is unused.
- */
-#define ZSTD_RESIZE_SEQPOOL 0
-
-/* ======   Debug   ====== */
-#if defined(DEBUGLEVEL) && (DEBUGLEVEL>=2) \
-    && !defined(_MSC_VER) \
-    && !defined(__MINGW32__)
-
-#  include <stdio.h>
-#  include <unistd.h>
-#  include <sys/times.h>
-
-#  define DEBUG_PRINTHEX(l,p,n) {            \
-    unsigned debug_u;                        \
-    for (debug_u=0; debug_u<(n); debug_u++)  \
-        RAWLOG(l, "%02X ", ((const unsigned char*)(p))[debug_u]); \
-    RAWLOG(l, " \n");                        \
-}
-
-static unsigned long long GetCurrentClockTimeMicroseconds(void)
-{
-   static clock_t _ticksPerSecond = 0;
-   if (_ticksPerSecond <= 0) _ticksPerSecond = sysconf(_SC_CLK_TCK);
-
-   {   struct tms junk; clock_t newTicks = (clock_t) times(&junk);
-       return ((((unsigned long long)newTicks)*(1000000))/_ticksPerSecond);
-}  }
-
-#define MUTEX_WAIT_TIME_DLEVEL 6
-#define ZSTD_PTHREAD_MUTEX_LOCK(mutex) {          \
-    if (DEBUGLEVEL >= MUTEX_WAIT_TIME_DLEVEL) {   \
-        unsigned long long const beforeTime = GetCurrentClockTimeMicroseconds(); \
-        ZSTD_pthread_mutex_lock(mutex);           \
-        {   unsigned long long const afterTime = GetCurrentClockTimeMicroseconds(); \
-            unsigned long long const elapsedTime = (afterTime-beforeTime); \
-            if (elapsedTime > 1000) {  /* or whatever threshold you like; I'm using 1 millisecond here */ \
-                DEBUGLOG(MUTEX_WAIT_TIME_DLEVEL, "Thread took %llu microseconds to acquire mutex %s \n", \
-                   elapsedTime, #mutex);          \
-        }   }                                     \
-    } else {                                      \
-        ZSTD_pthread_mutex_lock(mutex);           \
-    }                                             \
-}
-
-#else
-
-#  define ZSTD_PTHREAD_MUTEX_LOCK(m) ZSTD_pthread_mutex_lock(m)
-#  define DEBUG_PRINTHEX(l,p,n) {}
-
-#endif
-
-
-/* =====   Buffer Pool   ===== */
-/* a single Buffer Pool can be invoked from multiple threads in parallel */
-
-typedef struct buffer_s {
-    void* start;
-    size_t capacity;
-} buffer_t;
-
-static const buffer_t g_nullBuffer = { NULL, 0 };
-
-typedef struct ZSTDMT_bufferPool_s {
-    ZSTD_pthread_mutex_t poolMutex;
-    size_t bufferSize;
-    unsigned totalBuffers;
-    unsigned nbBuffers;
-    ZSTD_customMem cMem;
-    buffer_t bTable[1];   /* variable size */
-} ZSTDMT_bufferPool;
-
-static ZSTDMT_bufferPool* ZSTDMT_createBufferPool(unsigned nbWorkers, ZSTD_customMem cMem)
-{
-    unsigned const maxNbBuffers = 2*nbWorkers + 3;
-    ZSTDMT_bufferPool* const bufPool = (ZSTDMT_bufferPool*)ZSTD_calloc(
-        sizeof(ZSTDMT_bufferPool) + (maxNbBuffers-1) * sizeof(buffer_t), cMem);
-    if (bufPool==NULL) return NULL;
-    if (ZSTD_pthread_mutex_init(&bufPool->poolMutex, NULL)) {
-        ZSTD_free(bufPool, cMem);
-        return NULL;
-    }
-    bufPool->bufferSize = 64 KB;
-    bufPool->totalBuffers = maxNbBuffers;
-    bufPool->nbBuffers = 0;
-    bufPool->cMem = cMem;
-    return bufPool;
-}
-
-static void ZSTDMT_freeBufferPool(ZSTDMT_bufferPool* bufPool)
-{
-    unsigned u;
-    DEBUGLOG(3, "ZSTDMT_freeBufferPool (address:%08X)", (U32)(size_t)bufPool);
-    if (!bufPool) return;   /* compatibility with free on NULL */
-    for (u=0; u<bufPool->totalBuffers; u++) {
-        DEBUGLOG(4, "free buffer %2u (address:%08X)", u, (U32)(size_t)bufPool->bTable[u].start);
-        ZSTD_free(bufPool->bTable[u].start, bufPool->cMem);
-    }
-    ZSTD_pthread_mutex_destroy(&bufPool->poolMutex);
-    ZSTD_free(bufPool, bufPool->cMem);
-}
-
-/* only works at initialization, not during compression */
-static size_t ZSTDMT_sizeof_bufferPool(ZSTDMT_bufferPool* bufPool)
-{
-    size_t const poolSize = sizeof(*bufPool)
-                          + (bufPool->totalBuffers - 1) * sizeof(buffer_t);
-    unsigned u;
-    size_t totalBufferSize = 0;
-    ZSTD_pthread_mutex_lock(&bufPool->poolMutex);
-    for (u=0; u<bufPool->totalBuffers; u++)
-        totalBufferSize += bufPool->bTable[u].capacity;
-    ZSTD_pthread_mutex_unlock(&bufPool->poolMutex);
-
-    return poolSize + totalBufferSize;
-}
-
-/* ZSTDMT_setBufferSize() :
- * all future buffers provided by this buffer pool will have _at least_ this size
- * note : it's better for all buffers to have same size,
- * as they become freely interchangeable, reducing malloc/free usages and memory fragmentation */
-static void ZSTDMT_setBufferSize(ZSTDMT_bufferPool* const bufPool, size_t const bSize)
-{
-    ZSTD_pthread_mutex_lock(&bufPool->poolMutex);
-    DEBUGLOG(4, "ZSTDMT_setBufferSize: bSize = %u", (U32)bSize);
-    bufPool->bufferSize = bSize;
-    ZSTD_pthread_mutex_unlock(&bufPool->poolMutex);
-}
-
-
-static ZSTDMT_bufferPool* ZSTDMT_expandBufferPool(ZSTDMT_bufferPool* srcBufPool, U32 nbWorkers)
-{
-    unsigned const maxNbBuffers = 2*nbWorkers + 3;
-    if (srcBufPool==NULL) return NULL;
-    if (srcBufPool->totalBuffers >= maxNbBuffers) /* good enough */
-        return srcBufPool;
-    /* need a larger buffer pool */
-    {   ZSTD_customMem const cMem = srcBufPool->cMem;
-        size_t const bSize = srcBufPool->bufferSize;   /* forward parameters */
-        ZSTDMT_bufferPool* newBufPool;
-        ZSTDMT_freeBufferPool(srcBufPool);
-        newBufPool = ZSTDMT_createBufferPool(nbWorkers, cMem);
-        if (newBufPool==NULL) return newBufPool;
-        ZSTDMT_setBufferSize(newBufPool, bSize);
-        return newBufPool;
-    }
-}
-
-/** ZSTDMT_getBuffer() :
- *  assumption : bufPool must be valid
- * @return : a buffer, with start pointer and size
- *  note: allocation may fail, in this case, start==NULL and size==0 */
-static buffer_t ZSTDMT_getBuffer(ZSTDMT_bufferPool* bufPool)
-{
-    size_t const bSize = bufPool->bufferSize;
-    DEBUGLOG(5, "ZSTDMT_getBuffer: bSize = %u", (U32)bufPool->bufferSize);
-    ZSTD_pthread_mutex_lock(&bufPool->poolMutex);
-    if (bufPool->nbBuffers) {   /* try to use an existing buffer */
-        buffer_t const buf = bufPool->bTable[--(bufPool->nbBuffers)];
-        size_t const availBufferSize = buf.capacity;
-        bufPool->bTable[bufPool->nbBuffers] = g_nullBuffer;
-        if ((availBufferSize >= bSize) & ((availBufferSize>>3) <= bSize)) {
-            /* large enough, but not too much */
-            DEBUGLOG(5, "ZSTDMT_getBuffer: provide buffer %u of size %u",
-                        bufPool->nbBuffers, (U32)buf.capacity);
-            ZSTD_pthread_mutex_unlock(&bufPool->poolMutex);
-            return buf;
-        }
-        /* size conditions not respected : scratch this buffer, create new one */
-        DEBUGLOG(5, "ZSTDMT_getBuffer: existing buffer does not meet size conditions => freeing");
-        ZSTD_free(buf.start, bufPool->cMem);
-    }
-    ZSTD_pthread_mutex_unlock(&bufPool->poolMutex);
-    /* create new buffer */
-    DEBUGLOG(5, "ZSTDMT_getBuffer: create a new buffer");
-    {   buffer_t buffer;
-        void* const start = ZSTD_malloc(bSize, bufPool->cMem);
-        buffer.start = start;   /* note : start can be NULL if malloc fails ! */
-        buffer.capacity = (start==NULL) ? 0 : bSize;
-        if (start==NULL) {
-            DEBUGLOG(5, "ZSTDMT_getBuffer: buffer allocation failure !!");
-        } else {
-            DEBUGLOG(5, "ZSTDMT_getBuffer: created buffer of size %u", (U32)bSize);
-        }
-        return buffer;
-    }
-}
-
-#if ZSTD_RESIZE_SEQPOOL
-/** ZSTDMT_resizeBuffer() :
- * assumption : bufPool must be valid
- * @return : a buffer that is at least the buffer pool buffer size.
- *           If a reallocation happens, the data in the input buffer is copied.
- */
-static buffer_t ZSTDMT_resizeBuffer(ZSTDMT_bufferPool* bufPool, buffer_t buffer)
-{
-    size_t const bSize = bufPool->bufferSize;
-    if (buffer.capacity < bSize) {
-        void* const start = ZSTD_malloc(bSize, bufPool->cMem);
-        buffer_t newBuffer;
-        newBuffer.start = start;
-        newBuffer.capacity = start == NULL ? 0 : bSize;
-        if (start != NULL) {
-            assert(newBuffer.capacity >= buffer.capacity);
-            memcpy(newBuffer.start, buffer.start, buffer.capacity);
-            DEBUGLOG(5, "ZSTDMT_resizeBuffer: created buffer of size %u", (U32)bSize);
-            return newBuffer;
-        }
-        DEBUGLOG(5, "ZSTDMT_resizeBuffer: buffer allocation failure !!");
-    }
-    return buffer;
-}
-#endif
-
-/* store buffer for later re-use, up to pool capacity */
-static void ZSTDMT_releaseBuffer(ZSTDMT_bufferPool* bufPool, buffer_t buf)
-{
-    DEBUGLOG(5, "ZSTDMT_releaseBuffer");
-    if (buf.start == NULL) return;   /* compatible with release on NULL */
-    ZSTD_pthread_mutex_lock(&bufPool->poolMutex);
-    if (bufPool->nbBuffers < bufPool->totalBuffers) {
-        bufPool->bTable[bufPool->nbBuffers++] = buf;  /* stored for later use */
-        DEBUGLOG(5, "ZSTDMT_releaseBuffer: stored buffer of size %u in slot %u",
-                    (U32)buf.capacity, (U32)(bufPool->nbBuffers-1));
-        ZSTD_pthread_mutex_unlock(&bufPool->poolMutex);
-        return;
-    }
-    ZSTD_pthread_mutex_unlock(&bufPool->poolMutex);
-    /* Reached bufferPool capacity (should not happen) */
-    DEBUGLOG(5, "ZSTDMT_releaseBuffer: pool capacity reached => freeing ");
-    ZSTD_free(buf.start, bufPool->cMem);
-}
-
-
-/* =====   Seq Pool Wrapper   ====== */
-
-static rawSeqStore_t kNullRawSeqStore = {NULL, 0, 0, 0};
-
-typedef ZSTDMT_bufferPool ZSTDMT_seqPool;
-
-static size_t ZSTDMT_sizeof_seqPool(ZSTDMT_seqPool* seqPool)
-{
-    return ZSTDMT_sizeof_bufferPool(seqPool);
-}
-
-static rawSeqStore_t bufferToSeq(buffer_t buffer)
-{
-    rawSeqStore_t seq = {NULL, 0, 0, 0};
-    seq.seq = (rawSeq*)buffer.start;
-    seq.capacity = buffer.capacity / sizeof(rawSeq);
-    return seq;
-}
-
-static buffer_t seqToBuffer(rawSeqStore_t seq)
-{
-    buffer_t buffer;
-    buffer.start = seq.seq;
-    buffer.capacity = seq.capacity * sizeof(rawSeq);
-    return buffer;
-}
-
-static rawSeqStore_t ZSTDMT_getSeq(ZSTDMT_seqPool* seqPool)
-{
-    if (seqPool->bufferSize == 0) {
-        return kNullRawSeqStore;
-    }
-    return bufferToSeq(ZSTDMT_getBuffer(seqPool));
-}
-
-#if ZSTD_RESIZE_SEQPOOL
-static rawSeqStore_t ZSTDMT_resizeSeq(ZSTDMT_seqPool* seqPool, rawSeqStore_t seq)
-{
-  return bufferToSeq(ZSTDMT_resizeBuffer(seqPool, seqToBuffer(seq)));
-}
-#endif
-
-static void ZSTDMT_releaseSeq(ZSTDMT_seqPool* seqPool, rawSeqStore_t seq)
-{
-  ZSTDMT_releaseBuffer(seqPool, seqToBuffer(seq));
-}
-
-static void ZSTDMT_setNbSeq(ZSTDMT_seqPool* const seqPool, size_t const nbSeq)
-{
-  ZSTDMT_setBufferSize(seqPool, nbSeq * sizeof(rawSeq));
-}
-
-static ZSTDMT_seqPool* ZSTDMT_createSeqPool(unsigned nbWorkers, ZSTD_customMem cMem)
-{
-    ZSTDMT_seqPool* const seqPool = ZSTDMT_createBufferPool(nbWorkers, cMem);
-    if (seqPool == NULL) return NULL;
-    ZSTDMT_setNbSeq(seqPool, 0);
-    return seqPool;
-}
-
-static void ZSTDMT_freeSeqPool(ZSTDMT_seqPool* seqPool)
-{
-    ZSTDMT_freeBufferPool(seqPool);
-}
-
-static ZSTDMT_seqPool* ZSTDMT_expandSeqPool(ZSTDMT_seqPool* pool, U32 nbWorkers)
-{
-    return ZSTDMT_expandBufferPool(pool, nbWorkers);
-}
-
-
-/* =====   CCtx Pool   ===== */
-/* a single CCtx Pool can be invoked from multiple threads in parallel */
-
-typedef struct {
-    ZSTD_pthread_mutex_t poolMutex;
-    int totalCCtx;
-    int availCCtx;
-    ZSTD_customMem cMem;
-    ZSTD_CCtx* cctx[1];   /* variable size */
-} ZSTDMT_CCtxPool;
-
-/* note : all CCtx borrowed from the pool should be released back to the pool _before_ freeing the pool */
-static void ZSTDMT_freeCCtxPool(ZSTDMT_CCtxPool* pool)
-{
-    int cid;
-    for (cid=0; cid<pool->totalCCtx; cid++)
-        ZSTD_freeCCtx(pool->cctx[cid]);  /* note : compatible with free on NULL */
-    ZSTD_pthread_mutex_destroy(&pool->poolMutex);
-    ZSTD_free(pool, pool->cMem);
-}
-
-/* ZSTDMT_createCCtxPool() :
- * implies nbWorkers >= 1 , checked by caller ZSTDMT_createCCtx() */
-static ZSTDMT_CCtxPool* ZSTDMT_createCCtxPool(int nbWorkers,
-                                              ZSTD_customMem cMem)
-{
-    ZSTDMT_CCtxPool* const cctxPool = (ZSTDMT_CCtxPool*) ZSTD_calloc(
-        sizeof(ZSTDMT_CCtxPool) + (nbWorkers-1)*sizeof(ZSTD_CCtx*), cMem);
-    assert(nbWorkers > 0);
-    if (!cctxPool) return NULL;
-    if (ZSTD_pthread_mutex_init(&cctxPool->poolMutex, NULL)) {
-        ZSTD_free(cctxPool, cMem);
-        return NULL;
-    }
-    cctxPool->cMem = cMem;
-    cctxPool->totalCCtx = nbWorkers;
-    cctxPool->availCCtx = 1;   /* at least one cctx for single-thread mode */
-    cctxPool->cctx[0] = ZSTD_createCCtx_advanced(cMem);
-    if (!cctxPool->cctx[0]) { ZSTDMT_freeCCtxPool(cctxPool); return NULL; }
-    DEBUGLOG(3, "cctxPool created, with %u workers", nbWorkers);
-    return cctxPool;
-}
-
-static ZSTDMT_CCtxPool* ZSTDMT_expandCCtxPool(ZSTDMT_CCtxPool* srcPool,
-                                              int nbWorkers)
-{
-    if (srcPool==NULL) return NULL;
-    if (nbWorkers <= srcPool->totalCCtx) return srcPool;   /* good enough */
-    /* need a larger cctx pool */
-    {   ZSTD_customMem const cMem = srcPool->cMem;
-        ZSTDMT_freeCCtxPool(srcPool);
-        return ZSTDMT_createCCtxPool(nbWorkers, cMem);
-    }
-}
-
-/* only works during initialization phase, not during compression */
-static size_t ZSTDMT_sizeof_CCtxPool(ZSTDMT_CCtxPool* cctxPool)
-{
-    ZSTD_pthread_mutex_lock(&cctxPool->poolMutex);
-    {   unsigned const nbWorkers = cctxPool->totalCCtx;
-        size_t const poolSize = sizeof(*cctxPool)
-                                + (nbWorkers-1) * sizeof(ZSTD_CCtx*);
-        unsigned u;
-        size_t totalCCtxSize = 0;
-        for (u=0; u<nbWorkers; u++) {
-            totalCCtxSize += ZSTD_sizeof_CCtx(cctxPool->cctx[u]);
-        }
-        ZSTD_pthread_mutex_unlock(&cctxPool->poolMutex);
-        assert(nbWorkers > 0);
-        return poolSize + totalCCtxSize;
-    }
-}
-
-static ZSTD_CCtx* ZSTDMT_getCCtx(ZSTDMT_CCtxPool* cctxPool)
-{
-    DEBUGLOG(5, "ZSTDMT_getCCtx");
-    ZSTD_pthread_mutex_lock(&cctxPool->poolMutex);
-    if (cctxPool->availCCtx) {
-        cctxPool->availCCtx--;
-        {   ZSTD_CCtx* const cctx = cctxPool->cctx[cctxPool->availCCtx];
-            ZSTD_pthread_mutex_unlock(&cctxPool->poolMutex);
-            return cctx;
-    }   }
-    ZSTD_pthread_mutex_unlock(&cctxPool->poolMutex);
-    DEBUGLOG(5, "create one more CCtx");
-    return ZSTD_createCCtx_advanced(cctxPool->cMem);   /* note : can be NULL, when creation fails ! */
-}
-
-static void ZSTDMT_releaseCCtx(ZSTDMT_CCtxPool* pool, ZSTD_CCtx* cctx)
-{
-    if (cctx==NULL) return;   /* compatibility with release on NULL */
-    ZSTD_pthread_mutex_lock(&pool->poolMutex);
-    if (pool->availCCtx < pool->totalCCtx)
-        pool->cctx[pool->availCCtx++] = cctx;
-    else {
-        /* pool overflow : should not happen, since totalCCtx==nbWorkers */
-        DEBUGLOG(4, "CCtx pool overflow : free cctx");
-        ZSTD_freeCCtx(cctx);
-    }
-    ZSTD_pthread_mutex_unlock(&pool->poolMutex);
-}
-
-/* ====   Serial State   ==== */
-
-typedef struct {
-    void const* start;
-    size_t size;
-} range_t;
-
-typedef struct {
-    /* All variables in the struct are protected by mutex. */
-    ZSTD_pthread_mutex_t mutex;
-    ZSTD_pthread_cond_t cond;
-    ZSTD_CCtx_params params;
-    ldmState_t ldmState;
-    XXH64_state_t xxhState;
-    unsigned nextJobID;
-    /* Protects ldmWindow.
-     * Must be acquired after the main mutex when acquiring both.
-     */
-    ZSTD_pthread_mutex_t ldmWindowMutex;
-    ZSTD_pthread_cond_t ldmWindowCond;  /* Signaled when ldmWindow is updated */
-    ZSTD_window_t ldmWindow;  /* A thread-safe copy of ldmState.window */
-} serialState_t;
-
-static int ZSTDMT_serialState_reset(serialState_t* serialState, ZSTDMT_seqPool* seqPool, ZSTD_CCtx_params params, size_t jobSize)
-{
-    /* Adjust parameters */
-    if (params.ldmParams.enableLdm) {
-        DEBUGLOG(4, "LDM window size = %u KB", (1U << params.cParams.windowLog) >> 10);
-        ZSTD_ldm_adjustParameters(&params.ldmParams, &params.cParams);
-        assert(params.ldmParams.hashLog >= params.ldmParams.bucketSizeLog);
-        assert(params.ldmParams.hashRateLog < 32);
-        serialState->ldmState.hashPower =
-                ZSTD_rollingHash_primePower(params.ldmParams.minMatchLength);
-    } else {
-        memset(&params.ldmParams, 0, sizeof(params.ldmParams));
-    }
-    serialState->nextJobID = 0;
-    if (params.fParams.checksumFlag)
-        XXH64_reset(&serialState->xxhState, 0);
-    if (params.ldmParams.enableLdm) {
-        ZSTD_customMem cMem = params.customMem;
-        unsigned const hashLog = params.ldmParams.hashLog;
-        size_t const hashSize = ((size_t)1 << hashLog) * sizeof(ldmEntry_t);
-        unsigned const bucketLog =
-            params.ldmParams.hashLog - params.ldmParams.bucketSizeLog;
-        size_t const bucketSize = (size_t)1 << bucketLog;
-        unsigned const prevBucketLog =
-            serialState->params.ldmParams.hashLog -
-            serialState->params.ldmParams.bucketSizeLog;
-        /* Size the seq pool tables */
-        ZSTDMT_setNbSeq(seqPool, ZSTD_ldm_getMaxNbSeq(params.ldmParams, jobSize));
-        /* Reset the window */
-        ZSTD_window_clear(&serialState->ldmState.window);
-        serialState->ldmWindow = serialState->ldmState.window;
-        /* Resize tables and output space if necessary. */
-        if (serialState->ldmState.hashTable == NULL || serialState->params.ldmParams.hashLog < hashLog) {
-            ZSTD_free(serialState->ldmState.hashTable, cMem);
-            serialState->ldmState.hashTable = (ldmEntry_t*)ZSTD_malloc(hashSize, cMem);
-        }
-        if (serialState->ldmState.bucketOffsets == NULL || prevBucketLog < bucketLog) {
-            ZSTD_free(serialState->ldmState.bucketOffsets, cMem);
-            serialState->ldmState.bucketOffsets = (BYTE*)ZSTD_malloc(bucketSize, cMem);
-        }
-        if (!serialState->ldmState.hashTable || !serialState->ldmState.bucketOffsets)
-            return 1;
-        /* Zero the tables */
-        memset(serialState->ldmState.hashTable, 0, hashSize);
-        memset(serialState->ldmState.bucketOffsets, 0, bucketSize);
-    }
-    serialState->params = params;
-    serialState->params.jobSize = (U32)jobSize;
-    return 0;
-}
-
-static int ZSTDMT_serialState_init(serialState_t* serialState)
-{
-    int initError = 0;
-    memset(serialState, 0, sizeof(*serialState));
-    initError |= ZSTD_pthread_mutex_init(&serialState->mutex, NULL);
-    initError |= ZSTD_pthread_cond_init(&serialState->cond, NULL);
-    initError |= ZSTD_pthread_mutex_init(&serialState->ldmWindowMutex, NULL);
-    initError |= ZSTD_pthread_cond_init(&serialState->ldmWindowCond, NULL);
-    return initError;
-}
-
-static void ZSTDMT_serialState_free(serialState_t* serialState)
-{
-    ZSTD_customMem cMem = serialState->params.customMem;
-    ZSTD_pthread_mutex_destroy(&serialState->mutex);
-    ZSTD_pthread_cond_destroy(&serialState->cond);
-    ZSTD_pthread_mutex_destroy(&serialState->ldmWindowMutex);
-    ZSTD_pthread_cond_destroy(&serialState->ldmWindowCond);
-    ZSTD_free(serialState->ldmState.hashTable, cMem);
-    ZSTD_free(serialState->ldmState.bucketOffsets, cMem);
-}
-
-static void ZSTDMT_serialState_update(serialState_t* serialState,
-                                      ZSTD_CCtx* jobCCtx, rawSeqStore_t seqStore,
-                                      range_t src, unsigned jobID)
-{
-    /* Wait for our turn */
-    ZSTD_PTHREAD_MUTEX_LOCK(&serialState->mutex);
-    while (serialState->nextJobID < jobID) {
-        DEBUGLOG(5, "wait for serialState->cond");
-        ZSTD_pthread_cond_wait(&serialState->cond, &serialState->mutex);
-    }
-    /* A future job may error and skip our job */
-    if (serialState->nextJobID == jobID) {
-        /* It is now our turn, do any processing necessary */
-        if (serialState->params.ldmParams.enableLdm) {
-            size_t error;
-            assert(seqStore.seq != NULL && seqStore.pos == 0 &&
-                   seqStore.size == 0 && seqStore.capacity > 0);
-            assert(src.size <= serialState->params.jobSize);
-            ZSTD_window_update(&serialState->ldmState.window, src.start, src.size);
-            error = ZSTD_ldm_generateSequences(
-                &serialState->ldmState, &seqStore,
-                &serialState->params.ldmParams, src.start, src.size);
-            /* We provide a large enough buffer to never fail. */
-            assert(!ZSTD_isError(error)); (void)error;
-            /* Update ldmWindow to match the ldmState.window and signal the main
-             * thread if it is waiting for a buffer.
-             */
-            ZSTD_PTHREAD_MUTEX_LOCK(&serialState->ldmWindowMutex);
-            serialState->ldmWindow = serialState->ldmState.window;
-            ZSTD_pthread_cond_signal(&serialState->ldmWindowCond);
-            ZSTD_pthread_mutex_unlock(&serialState->ldmWindowMutex);
-        }
-        if (serialState->params.fParams.checksumFlag && src.size > 0)
-            XXH64_update(&serialState->xxhState, src.start, src.size);
-    }
-    /* Now it is the next jobs turn */
-    serialState->nextJobID++;
-    ZSTD_pthread_cond_broadcast(&serialState->cond);
-    ZSTD_pthread_mutex_unlock(&serialState->mutex);
-
-    if (seqStore.size > 0) {
-        size_t const err = ZSTD_referenceExternalSequences(
-            jobCCtx, seqStore.seq, seqStore.size);
-        assert(serialState->params.ldmParams.enableLdm);
-        assert(!ZSTD_isError(err));
-        (void)err;
-    }
-}
-
-static void ZSTDMT_serialState_ensureFinished(serialState_t* serialState,
-                                              unsigned jobID, size_t cSize)
-{
-    ZSTD_PTHREAD_MUTEX_LOCK(&serialState->mutex);
-    if (serialState->nextJobID <= jobID) {
-        assert(ZSTD_isError(cSize)); (void)cSize;
-        DEBUGLOG(5, "Skipping past job %u because of error", jobID);
-        serialState->nextJobID = jobID + 1;
-        ZSTD_pthread_cond_broadcast(&serialState->cond);
-
-        ZSTD_PTHREAD_MUTEX_LOCK(&serialState->ldmWindowMutex);
-        ZSTD_window_clear(&serialState->ldmWindow);
-        ZSTD_pthread_cond_signal(&serialState->ldmWindowCond);
-        ZSTD_pthread_mutex_unlock(&serialState->ldmWindowMutex);
-    }
-    ZSTD_pthread_mutex_unlock(&serialState->mutex);
-
-}
-
-
-/* ------------------------------------------ */
-/* =====          Worker thread         ===== */
-/* ------------------------------------------ */
-
-static const range_t kNullRange = { NULL, 0 };
-
-typedef struct {
-    size_t   consumed;                   /* SHARED - set0 by mtctx, then modified by worker AND read by mtctx */
-    size_t   cSize;                      /* SHARED - set0 by mtctx, then modified by worker AND read by mtctx, then set0 by mtctx */
-    ZSTD_pthread_mutex_t job_mutex;      /* Thread-safe - used by mtctx and worker */
-    ZSTD_pthread_cond_t job_cond;        /* Thread-safe - used by mtctx and worker */
-    ZSTDMT_CCtxPool* cctxPool;           /* Thread-safe - used by mtctx and (all) workers */
-    ZSTDMT_bufferPool* bufPool;          /* Thread-safe - used by mtctx and (all) workers */
-    ZSTDMT_seqPool* seqPool;             /* Thread-safe - used by mtctx and (all) workers */
-    serialState_t* serial;               /* Thread-safe - used by mtctx and (all) workers */
-    buffer_t dstBuff;                    /* set by worker (or mtctx), then read by worker & mtctx, then modified by mtctx => no barrier */
-    range_t prefix;                      /* set by mtctx, then read by worker & mtctx => no barrier */
-    range_t src;                         /* set by mtctx, then read by worker & mtctx => no barrier */
-    unsigned jobID;                      /* set by mtctx, then read by worker => no barrier */
-    unsigned firstJob;                   /* set by mtctx, then read by worker => no barrier */
-    unsigned lastJob;                    /* set by mtctx, then read by worker => no barrier */
-    ZSTD_CCtx_params params;             /* set by mtctx, then read by worker => no barrier */
-    const ZSTD_CDict* cdict;             /* set by mtctx, then read by worker => no barrier */
-    unsigned long long fullFrameSize;    /* set by mtctx, then read by worker => no barrier */
-    size_t   dstFlushed;                 /* used only by mtctx */
-    unsigned frameChecksumNeeded;        /* used only by mtctx */
-} ZSTDMT_jobDescription;
-
-#define JOB_ERROR(e) {                          \
-    ZSTD_PTHREAD_MUTEX_LOCK(&job->job_mutex);   \
-    job->cSize = e;                             \
-    ZSTD_pthread_mutex_unlock(&job->job_mutex); \
-    goto _endJob;                               \
-}
-
-/* ZSTDMT_compressionJob() is a POOL_function type */
-static void ZSTDMT_compressionJob(void* jobDescription)
-{
-    ZSTDMT_jobDescription* const job = (ZSTDMT_jobDescription*)jobDescription;
-    ZSTD_CCtx_params jobParams = job->params;   /* do not modify job->params ! copy it, modify the copy */
-    ZSTD_CCtx* const cctx = ZSTDMT_getCCtx(job->cctxPool);
-    rawSeqStore_t rawSeqStore = ZSTDMT_getSeq(job->seqPool);
-    buffer_t dstBuff = job->dstBuff;
-    size_t lastCBlockSize = 0;
-
-    /* resources */
-    if (cctx==NULL) JOB_ERROR(ERROR(memory_allocation));
-    if (dstBuff.start == NULL) {   /* streaming job : doesn't provide a dstBuffer */
-        dstBuff = ZSTDMT_getBuffer(job->bufPool);
-        if (dstBuff.start==NULL) JOB_ERROR(ERROR(memory_allocation));
-        job->dstBuff = dstBuff;   /* this value can be read in ZSTDMT_flush, when it copies the whole job */
-    }
-    if (jobParams.ldmParams.enableLdm && rawSeqStore.seq == NULL)
-        JOB_ERROR(ERROR(memory_allocation));
-
-    /* Don't compute the checksum for chunks, since we compute it externally,
-     * but write it in the header.
-     */
-    if (job->jobID != 0) jobParams.fParams.checksumFlag = 0;
-    /* Don't run LDM for the chunks, since we handle it externally */
-    jobParams.ldmParams.enableLdm = 0;
-
-
-    /* init */
-    if (job->cdict) {
-        size_t const initError = ZSTD_compressBegin_advanced_internal(cctx, NULL, 0, ZSTD_dct_auto, ZSTD_dtlm_fast, job->cdict, jobParams, job->fullFrameSize);
-        assert(job->firstJob);  /* only allowed for first job */
-        if (ZSTD_isError(initError)) JOB_ERROR(initError);
-    } else {  /* srcStart points at reloaded section */
-        U64 const pledgedSrcSize = job->firstJob ? job->fullFrameSize : job->src.size;
-        {   size_t const forceWindowError = ZSTD_CCtxParams_setParameter(&jobParams, ZSTD_c_forceMaxWindow, !job->firstJob);
-            if (ZSTD_isError(forceWindowError)) JOB_ERROR(forceWindowError);
-        }
-        {   size_t const initError = ZSTD_compressBegin_advanced_internal(cctx,
-                                        job->prefix.start, job->prefix.size, ZSTD_dct_rawContent, /* load dictionary in "content-only" mode (no header analysis) */
-                                        ZSTD_dtlm_fast,
-                                        NULL, /*cdict*/
-                                        jobParams, pledgedSrcSize);
-            if (ZSTD_isError(initError)) JOB_ERROR(initError);
-    }   }
-
-    /* Perform serial step as early as possible, but after CCtx initialization */
-    ZSTDMT_serialState_update(job->serial, cctx, rawSeqStore, job->src, job->jobID);
-
-    if (!job->firstJob) {  /* flush and overwrite frame header when it's not first job */
-        size_t const hSize = ZSTD_compressContinue(cctx, dstBuff.start, dstBuff.capacity, job->src.start, 0);
-        if (ZSTD_isError(hSize)) JOB_ERROR(hSize);
-        DEBUGLOG(5, "ZSTDMT_compressionJob: flush and overwrite %u bytes of frame header (not first job)", (U32)hSize);
-        ZSTD_invalidateRepCodes(cctx);
-    }
-
-    /* compress */
-    {   size_t const chunkSize = 4*ZSTD_BLOCKSIZE_MAX;
-        int const nbChunks = (int)((job->src.size + (chunkSize-1)) / chunkSize);
-        const BYTE* ip = (const BYTE*) job->src.start;
-        BYTE* const ostart = (BYTE*)dstBuff.start;
-        BYTE* op = ostart;
-        BYTE* oend = op + dstBuff.capacity;
-        int chunkNb;
-        if (sizeof(size_t) > sizeof(int)) assert(job->src.size < ((size_t)INT_MAX) * chunkSize);   /* check overflow */
-        DEBUGLOG(5, "ZSTDMT_compressionJob: compress %u bytes in %i blocks", (U32)job->src.size, nbChunks);
-        assert(job->cSize == 0);
-        for (chunkNb = 1; chunkNb < nbChunks; chunkNb++) {
-            size_t const cSize = ZSTD_compressContinue(cctx, op, oend-op, ip, chunkSize);
-            if (ZSTD_isError(cSize)) JOB_ERROR(cSize);
-            ip += chunkSize;
-            op += cSize; assert(op < oend);
-            /* stats */
-            ZSTD_PTHREAD_MUTEX_LOCK(&job->job_mutex);
-            job->cSize += cSize;
-            job->consumed = chunkSize * chunkNb;
-            DEBUGLOG(5, "ZSTDMT_compressionJob: compress new block : cSize==%u bytes (total: %u)",
-                        (U32)cSize, (U32)job->cSize);
-            ZSTD_pthread_cond_signal(&job->job_cond);   /* warns some more data is ready to be flushed */
-            ZSTD_pthread_mutex_unlock(&job->job_mutex);
-        }
-        /* last block */
-        assert(chunkSize > 0);
-        assert((chunkSize & (chunkSize - 1)) == 0);  /* chunkSize must be power of 2 for mask==(chunkSize-1) to work */
-        if ((nbChunks > 0) | job->lastJob /*must output a "last block" flag*/ ) {
-            size_t const lastBlockSize1 = job->src.size & (chunkSize-1);
-            size_t const lastBlockSize = ((lastBlockSize1==0) & (job->src.size>=chunkSize)) ? chunkSize : lastBlockSize1;
-            size_t const cSize = (job->lastJob) ?
-                 ZSTD_compressEnd     (cctx, op, oend-op, ip, lastBlockSize) :
-                 ZSTD_compressContinue(cctx, op, oend-op, ip, lastBlockSize);
-            if (ZSTD_isError(cSize)) JOB_ERROR(cSize);
-            lastCBlockSize = cSize;
-    }   }
-
-_endJob:
-    ZSTDMT_serialState_ensureFinished(job->serial, job->jobID, job->cSize);
-    if (job->prefix.size > 0)
-        DEBUGLOG(5, "Finished with prefix: %zx", (size_t)job->prefix.start);
-    DEBUGLOG(5, "Finished with source: %zx", (size_t)job->src.start);
-    /* release resources */
-    ZSTDMT_releaseSeq(job->seqPool, rawSeqStore);
-    ZSTDMT_releaseCCtx(job->cctxPool, cctx);
-    /* report */
-    ZSTD_PTHREAD_MUTEX_LOCK(&job->job_mutex);
-    if (ZSTD_isError(job->cSize)) assert(lastCBlockSize == 0);
-    job->cSize += lastCBlockSize;
-    job->consumed = job->src.size;  /* when job->consumed == job->src.size , compression job is presumed completed */
-    ZSTD_pthread_cond_signal(&job->job_cond);
-    ZSTD_pthread_mutex_unlock(&job->job_mutex);
-}
-
-
-/* ------------------------------------------ */
-/* =====   Multi-threaded compression   ===== */
-/* ------------------------------------------ */
-
-typedef struct {
-    range_t prefix;         /* read-only non-owned prefix buffer */
-    buffer_t buffer;
-    size_t filled;
-} inBuff_t;
-
-typedef struct {
-  BYTE* buffer;     /* The round input buffer. All jobs get references
-                     * to pieces of the buffer. ZSTDMT_tryGetInputRange()
-                     * handles handing out job input buffers, and makes
-                     * sure it doesn't overlap with any pieces still in use.
-                     */
-  size_t capacity;  /* The capacity of buffer. */
-  size_t pos;       /* The position of the current inBuff in the round
-                     * buffer. Updated past the end if the inBuff once
-                     * the inBuff is sent to the worker thread.
-                     * pos <= capacity.
-                     */
-} roundBuff_t;
-
-static const roundBuff_t kNullRoundBuff = {NULL, 0, 0};
-
-#define RSYNC_LENGTH 32
-
-typedef struct {
-  U64 hash;
-  U64 hitMask;
-  U64 primePower;
-} rsyncState_t;
-
-struct ZSTDMT_CCtx_s {
-    POOL_ctx* factory;
-    ZSTDMT_jobDescription* jobs;
-    ZSTDMT_bufferPool* bufPool;
-    ZSTDMT_CCtxPool* cctxPool;
-    ZSTDMT_seqPool* seqPool;
-    ZSTD_CCtx_params params;
-    size_t targetSectionSize;
-    size_t targetPrefixSize;
-    int jobReady;        /* 1 => one job is already prepared, but pool has shortage of workers. Don't create a new job. */
-    inBuff_t inBuff;
-    roundBuff_t roundBuff;
-    serialState_t serial;
-    rsyncState_t rsync;
-    unsigned singleBlockingThread;
-    unsigned jobIDMask;
-    unsigned doneJobID;
-    unsigned nextJobID;
-    unsigned frameEnded;
-    unsigned allJobsCompleted;
-    unsigned long long frameContentSize;
-    unsigned long long consumed;
-    unsigned long long produced;
-    ZSTD_customMem cMem;
-    ZSTD_CDict* cdictLocal;
-    const ZSTD_CDict* cdict;
-};
-
-static void ZSTDMT_freeJobsTable(ZSTDMT_jobDescription* jobTable, U32 nbJobs, ZSTD_customMem cMem)
-{
-    U32 jobNb;
-    if (jobTable == NULL) return;
-    for (jobNb=0; jobNb<nbJobs; jobNb++) {
-        ZSTD_pthread_mutex_destroy(&jobTable[jobNb].job_mutex);
-        ZSTD_pthread_cond_destroy(&jobTable[jobNb].job_cond);
-    }
-    ZSTD_free(jobTable, cMem);
-}
-
-/* ZSTDMT_allocJobsTable()
- * allocate and init a job table.
- * update *nbJobsPtr to next power of 2 value, as size of table */
-static ZSTDMT_jobDescription* ZSTDMT_createJobsTable(U32* nbJobsPtr, ZSTD_customMem cMem)
-{
-    U32 const nbJobsLog2 = ZSTD_highbit32(*nbJobsPtr) + 1;
-    U32 const nbJobs = 1 << nbJobsLog2;
-    U32 jobNb;
-    ZSTDMT_jobDescription* const jobTable = (ZSTDMT_jobDescription*)
-                ZSTD_calloc(nbJobs * sizeof(ZSTDMT_jobDescription), cMem);
-    int initError = 0;
-    if (jobTable==NULL) return NULL;
-    *nbJobsPtr = nbJobs;
-    for (jobNb=0; jobNb<nbJobs; jobNb++) {
-        initError |= ZSTD_pthread_mutex_init(&jobTable[jobNb].job_mutex, NULL);
-        initError |= ZSTD_pthread_cond_init(&jobTable[jobNb].job_cond, NULL);
-    }
-    if (initError != 0) {
-        ZSTDMT_freeJobsTable(jobTable, nbJobs, cMem);
-        return NULL;
-    }
-    return jobTable;
-}
-
-static size_t ZSTDMT_expandJobsTable (ZSTDMT_CCtx* mtctx, U32 nbWorkers) {
-    U32 nbJobs = nbWorkers + 2;
-    if (nbJobs > mtctx->jobIDMask+1) {  /* need more job capacity */
-        ZSTDMT_freeJobsTable(mtctx->jobs, mtctx->jobIDMask+1, mtctx->cMem);
-        mtctx->jobIDMask = 0;
-        mtctx->jobs = ZSTDMT_createJobsTable(&nbJobs, mtctx->cMem);
-        if (mtctx->jobs==NULL) return ERROR(memory_allocation);
-        assert((nbJobs != 0) && ((nbJobs & (nbJobs - 1)) == 0));  /* ensure nbJobs is a power of 2 */
-        mtctx->jobIDMask = nbJobs - 1;
-    }
-    return 0;
-}
-
-
-/* ZSTDMT_CCtxParam_setNbWorkers():
- * Internal use only */
-size_t ZSTDMT_CCtxParam_setNbWorkers(ZSTD_CCtx_params* params, unsigned nbWorkers)
-{
-    return ZSTD_CCtxParams_setParameter(params, ZSTD_c_nbWorkers, (int)nbWorkers);
-}
-
-MEM_STATIC ZSTDMT_CCtx* ZSTDMT_createCCtx_advanced_internal(unsigned nbWorkers, ZSTD_customMem cMem)
-{
-    ZSTDMT_CCtx* mtctx;
-    U32 nbJobs = nbWorkers + 2;
-    int initError;
-    DEBUGLOG(3, "ZSTDMT_createCCtx_advanced (nbWorkers = %u)", nbWorkers);
-
-    if (nbWorkers < 1) return NULL;
-    nbWorkers = MIN(nbWorkers , ZSTDMT_NBWORKERS_MAX);
-    if ((cMem.customAlloc!=NULL) ^ (cMem.customFree!=NULL))
-        /* invalid custom allocator */
-        return NULL;
-
-    mtctx = (ZSTDMT_CCtx*) ZSTD_calloc(sizeof(ZSTDMT_CCtx), cMem);
-    if (!mtctx) return NULL;
-    ZSTDMT_CCtxParam_setNbWorkers(&mtctx->params, nbWorkers);
-    mtctx->cMem = cMem;
-    mtctx->allJobsCompleted = 1;
-    mtctx->factory = POOL_create_advanced(nbWorkers, 0, cMem);
-    mtctx->jobs = ZSTDMT_createJobsTable(&nbJobs, cMem);
-    assert(nbJobs > 0); assert((nbJobs & (nbJobs - 1)) == 0);  /* ensure nbJobs is a power of 2 */
-    mtctx->jobIDMask = nbJobs - 1;
-    mtctx->bufPool = ZSTDMT_createBufferPool(nbWorkers, cMem);
-    mtctx->cctxPool = ZSTDMT_createCCtxPool(nbWorkers, cMem);
-    mtctx->seqPool = ZSTDMT_createSeqPool(nbWorkers, cMem);
-    initError = ZSTDMT_serialState_init(&mtctx->serial);
-    mtctx->roundBuff = kNullRoundBuff;
-    if (!mtctx->factory | !mtctx->jobs | !mtctx->bufPool | !mtctx->cctxPool | !mtctx->seqPool | initError) {
-        ZSTDMT_freeCCtx(mtctx);
-        return NULL;
-    }
-    DEBUGLOG(3, "mt_cctx created, for %u threads", nbWorkers);
-    return mtctx;
-}
-
-ZSTDMT_CCtx* ZSTDMT_createCCtx_advanced(unsigned nbWorkers, ZSTD_customMem cMem)
-{
-#ifdef ZSTD_MULTITHREAD
-    return ZSTDMT_createCCtx_advanced_internal(nbWorkers, cMem);
-#else
-    (void)nbWorkers;
-    (void)cMem;
-    return NULL;
-#endif
-}
-
-ZSTDMT_CCtx* ZSTDMT_createCCtx(unsigned nbWorkers)
-{
-    return ZSTDMT_createCCtx_advanced(nbWorkers, ZSTD_defaultCMem);
-}
-
-
-/* ZSTDMT_releaseAllJobResources() :
- * note : ensure all workers are killed first ! */
-static void ZSTDMT_releaseAllJobResources(ZSTDMT_CCtx* mtctx)
-{
-    unsigned jobID;
-    DEBUGLOG(3, "ZSTDMT_releaseAllJobResources");
-    for (jobID=0; jobID <= mtctx->jobIDMask; jobID++) {
-        DEBUGLOG(4, "job%02u: release dst address %08X", jobID, (U32)(size_t)mtctx->jobs[jobID].dstBuff.start);
-        ZSTDMT_releaseBuffer(mtctx->bufPool, mtctx->jobs[jobID].dstBuff);
-        mtctx->jobs[jobID].dstBuff = g_nullBuffer;
-        mtctx->jobs[jobID].cSize = 0;
-    }
-    memset(mtctx->jobs, 0, (mtctx->jobIDMask+1)*sizeof(ZSTDMT_jobDescription));
-    mtctx->inBuff.buffer = g_nullBuffer;
-    mtctx->inBuff.filled = 0;
-    mtctx->allJobsCompleted = 1;
-}
-
-static void ZSTDMT_waitForAllJobsCompleted(ZSTDMT_CCtx* mtctx)
-{
-    DEBUGLOG(4, "ZSTDMT_waitForAllJobsCompleted");
-    while (mtctx->doneJobID < mtctx->nextJobID) {
-        unsigned const jobID = mtctx->doneJobID & mtctx->jobIDMask;
-        ZSTD_PTHREAD_MUTEX_LOCK(&mtctx->jobs[jobID].job_mutex);
-        while (mtctx->jobs[jobID].consumed < mtctx->jobs[jobID].src.size) {
-            DEBUGLOG(4, "waiting for jobCompleted signal from job %u", mtctx->doneJobID);   /* we want to block when waiting for data to flush */
-            ZSTD_pthread_cond_wait(&mtctx->jobs[jobID].job_cond, &mtctx->jobs[jobID].job_mutex);
-        }
-        ZSTD_pthread_mutex_unlock(&mtctx->jobs[jobID].job_mutex);
-        mtctx->doneJobID++;
-    }
-}
-
-size_t ZSTDMT_freeCCtx(ZSTDMT_CCtx* mtctx)
-{
-    if (mtctx==NULL) return 0;   /* compatible with free on NULL */
-    POOL_free(mtctx->factory);   /* stop and free worker threads */
-    ZSTDMT_releaseAllJobResources(mtctx);  /* release job resources into pools first */
-    ZSTDMT_freeJobsTable(mtctx->jobs, mtctx->jobIDMask+1, mtctx->cMem);
-    ZSTDMT_freeBufferPool(mtctx->bufPool);
-    ZSTDMT_freeCCtxPool(mtctx->cctxPool);
-    ZSTDMT_freeSeqPool(mtctx->seqPool);
-    ZSTDMT_serialState_free(&mtctx->serial);
-    ZSTD_freeCDict(mtctx->cdictLocal);
-    if (mtctx->roundBuff.buffer)
-        ZSTD_free(mtctx->roundBuff.buffer, mtctx->cMem);
-    ZSTD_free(mtctx, mtctx->cMem);
-    return 0;
-}
-
-size_t ZSTDMT_sizeof_CCtx(ZSTDMT_CCtx* mtctx)
-{
-    if (mtctx == NULL) return 0;   /* supports sizeof NULL */
-    return sizeof(*mtctx)
-            + POOL_sizeof(mtctx->factory)
-            + ZSTDMT_sizeof_bufferPool(mtctx->bufPool)
-            + (mtctx->jobIDMask+1) * sizeof(ZSTDMT_jobDescription)
-            + ZSTDMT_sizeof_CCtxPool(mtctx->cctxPool)
-            + ZSTDMT_sizeof_seqPool(mtctx->seqPool)
-            + ZSTD_sizeof_CDict(mtctx->cdictLocal)
-            + mtctx->roundBuff.capacity;
-}
-
-/* Internal only */
-size_t
-ZSTDMT_CCtxParam_setMTCtxParameter(ZSTD_CCtx_params* params,
-                                   ZSTDMT_parameter parameter,
-                                   int value)
-{
-    DEBUGLOG(4, "ZSTDMT_CCtxParam_setMTCtxParameter");
-    switch(parameter)
-    {
-    case ZSTDMT_p_jobSize :
-        DEBUGLOG(4, "ZSTDMT_CCtxParam_setMTCtxParameter : set jobSize to %i", value);
-        return ZSTD_CCtxParams_setParameter(params, ZSTD_c_jobSize, value);
-    case ZSTDMT_p_overlapLog :
-        DEBUGLOG(4, "ZSTDMT_p_overlapLog : %i", value);
-        return ZSTD_CCtxParams_setParameter(params, ZSTD_c_overlapLog, value);
-    case ZSTDMT_p_rsyncable :
-        DEBUGLOG(4, "ZSTD_p_rsyncable : %i", value);
-        return ZSTD_CCtxParams_setParameter(params, ZSTD_c_rsyncable, value);
-    default :
-        return ERROR(parameter_unsupported);
-    }
-}
-
-size_t ZSTDMT_setMTCtxParameter(ZSTDMT_CCtx* mtctx, ZSTDMT_parameter parameter, int value)
-{
-    DEBUGLOG(4, "ZSTDMT_setMTCtxParameter");
-    return ZSTDMT_CCtxParam_setMTCtxParameter(&mtctx->params, parameter, value);
-}
-
-size_t ZSTDMT_getMTCtxParameter(ZSTDMT_CCtx* mtctx, ZSTDMT_parameter parameter, int* value)
-{
-    switch (parameter) {
-    case ZSTDMT_p_jobSize:
-        return ZSTD_CCtxParams_getParameter(&mtctx->params, ZSTD_c_jobSize, value);
-    case ZSTDMT_p_overlapLog:
-        return ZSTD_CCtxParams_getParameter(&mtctx->params, ZSTD_c_overlapLog, value);
-    case ZSTDMT_p_rsyncable:
-        return ZSTD_CCtxParams_getParameter(&mtctx->params, ZSTD_c_rsyncable, value);
-    default:
-        return ERROR(parameter_unsupported);
-    }
-}
-
-/* Sets parameters relevant to the compression job,
- * initializing others to default values. */
-static ZSTD_CCtx_params ZSTDMT_initJobCCtxParams(ZSTD_CCtx_params const params)
-{
-    ZSTD_CCtx_params jobParams = params;
-    /* Clear parameters related to multithreading */
-    jobParams.forceWindow = 0;
-    jobParams.nbWorkers = 0;
-    jobParams.jobSize = 0;
-    jobParams.overlapLog = 0;
-    jobParams.rsyncable = 0;
-    memset(&jobParams.ldmParams, 0, sizeof(ldmParams_t));
-    memset(&jobParams.customMem, 0, sizeof(ZSTD_customMem));
-    return jobParams;
-}
-
-
-/* ZSTDMT_resize() :
- * @return : error code if fails, 0 on success */
-static size_t ZSTDMT_resize(ZSTDMT_CCtx* mtctx, unsigned nbWorkers)
-{
-    if (POOL_resize(mtctx->factory, nbWorkers)) return ERROR(memory_allocation);
-    FORWARD_IF_ERROR( ZSTDMT_expandJobsTable(mtctx, nbWorkers) );
-    mtctx->bufPool = ZSTDMT_expandBufferPool(mtctx->bufPool, nbWorkers);
-    if (mtctx->bufPool == NULL) return ERROR(memory_allocation);
-    mtctx->cctxPool = ZSTDMT_expandCCtxPool(mtctx->cctxPool, nbWorkers);
-    if (mtctx->cctxPool == NULL) return ERROR(memory_allocation);
-    mtctx->seqPool = ZSTDMT_expandSeqPool(mtctx->seqPool, nbWorkers);
-    if (mtctx->seqPool == NULL) return ERROR(memory_allocation);
-    ZSTDMT_CCtxParam_setNbWorkers(&mtctx->params, nbWorkers);
-    return 0;
-}
-
-
-/*! ZSTDMT_updateCParams_whileCompressing() :
- *  Updates a selected set of compression parameters, remaining compatible with currently active frame.
- *  New parameters will be applied to next compression job. */
-void ZSTDMT_updateCParams_whileCompressing(ZSTDMT_CCtx* mtctx, const ZSTD_CCtx_params* cctxParams)
-{
-    U32 const saved_wlog = mtctx->params.cParams.windowLog;   /* Do not modify windowLog while compressing */
-    int const compressionLevel = cctxParams->compressionLevel;
-    DEBUGLOG(5, "ZSTDMT_updateCParams_whileCompressing (level:%i)",
-                compressionLevel);
-    mtctx->params.compressionLevel = compressionLevel;
-    {   ZSTD_compressionParameters cParams = ZSTD_getCParamsFromCCtxParams(cctxParams, 0, 0);
-        cParams.windowLog = saved_wlog;
-        mtctx->params.cParams = cParams;
-    }
-}
-
-/* ZSTDMT_getFrameProgression():
- * tells how much data has been consumed (input) and produced (output) for current frame.
- * able to count progression inside worker threads.
- * Note : mutex will be acquired during statistics collection inside workers. */
-ZSTD_frameProgression ZSTDMT_getFrameProgression(ZSTDMT_CCtx* mtctx)
-{
-    ZSTD_frameProgression fps;
-    DEBUGLOG(5, "ZSTDMT_getFrameProgression");
-    fps.ingested = mtctx->consumed + mtctx->inBuff.filled;
-    fps.consumed = mtctx->consumed;
-    fps.produced = fps.flushed = mtctx->produced;
-    fps.currentJobID = mtctx->nextJobID;
-    fps.nbActiveWorkers = 0;
-    {   unsigned jobNb;
-        unsigned lastJobNb = mtctx->nextJobID + mtctx->jobReady; assert(mtctx->jobReady <= 1);
-        DEBUGLOG(6, "ZSTDMT_getFrameProgression: jobs: from %u to <%u (jobReady:%u)",
-                    mtctx->doneJobID, lastJobNb, mtctx->jobReady)
-        for (jobNb = mtctx->doneJobID ; jobNb < lastJobNb ; jobNb++) {
-            unsigned const wJobID = jobNb & mtctx->jobIDMask;
-            ZSTDMT_jobDescription* jobPtr = &mtctx->jobs[wJobID];
-            ZSTD_pthread_mutex_lock(&jobPtr->job_mutex);
-            {   size_t const cResult = jobPtr->cSize;
-                size_t const produced = ZSTD_isError(cResult) ? 0 : cResult;
-                size_t const flushed = ZSTD_isError(cResult) ? 0 : jobPtr->dstFlushed;
-                assert(flushed <= produced);
-                fps.ingested += jobPtr->src.size;
-                fps.consumed += jobPtr->consumed;
-                fps.produced += produced;
-                fps.flushed  += flushed;
-                fps.nbActiveWorkers += (jobPtr->consumed < jobPtr->src.size);
-            }
-            ZSTD_pthread_mutex_unlock(&mtctx->jobs[wJobID].job_mutex);
-        }
-    }
-    return fps;
-}
-
-
-size_t ZSTDMT_toFlushNow(ZSTDMT_CCtx* mtctx)
-{
-    size_t toFlush;
-    unsigned const jobID = mtctx->doneJobID;
-    assert(jobID <= mtctx->nextJobID);
-    if (jobID == mtctx->nextJobID) return 0;   /* no active job => nothing to flush */
-
-    /* look into oldest non-fully-flushed job */
-    {   unsigned const wJobID = jobID & mtctx->jobIDMask;
-        ZSTDMT_jobDescription* const jobPtr = &mtctx->jobs[wJobID];
-        ZSTD_pthread_mutex_lock(&jobPtr->job_mutex);
-        {   size_t const cResult = jobPtr->cSize;
-            size_t const produced = ZSTD_isError(cResult) ? 0 : cResult;
-            size_t const flushed = ZSTD_isError(cResult) ? 0 : jobPtr->dstFlushed;
-            assert(flushed <= produced);
-            assert(jobPtr->consumed <= jobPtr->src.size);
-            toFlush = produced - flushed;
-            /* if toFlush==0, nothing is available to flush.
-             * However, jobID is expected to still be active:
-             * if jobID was already completed and fully flushed,
-             * ZSTDMT_flushProduced() should have already moved onto next job.
-             * Therefore, some input has not yet been consumed. */
-            if (toFlush==0) {
-                assert(jobPtr->consumed < jobPtr->src.size);
-            }
-        }
-        ZSTD_pthread_mutex_unlock(&mtctx->jobs[wJobID].job_mutex);
-    }
-
-    return toFlush;
-}
-
-
-/* ------------------------------------------ */
-/* =====   Multi-threaded compression   ===== */
-/* ------------------------------------------ */
-
-static unsigned ZSTDMT_computeTargetJobLog(ZSTD_CCtx_params const params)
-{
-    unsigned jobLog;
-    if (params.ldmParams.enableLdm) {
-        /* In Long Range Mode, the windowLog is typically oversized.
-         * In which case, it's preferable to determine the jobSize
-         * based on chainLog instead. */
-        jobLog = MAX(21, params.cParams.chainLog + 4);
-    } else {
-        jobLog = MAX(20, params.cParams.windowLog + 2);
-    }
-    return MIN(jobLog, (unsigned)ZSTDMT_JOBLOG_MAX);
-}
-
-static int ZSTDMT_overlapLog_default(ZSTD_strategy strat)
-{
-    switch(strat)
-    {
-        case ZSTD_btultra2:
-            return 9;
-        case ZSTD_btultra:
-        case ZSTD_btopt:
-            return 8;
-        case ZSTD_btlazy2:
-        case ZSTD_lazy2:
-            return 7;
-        case ZSTD_lazy:
-        case ZSTD_greedy:
-        case ZSTD_dfast:
-        case ZSTD_fast:
-        default:;
-    }
-    return 6;
-}
-
-static int ZSTDMT_overlapLog(int ovlog, ZSTD_strategy strat)
-{
-    assert(0 <= ovlog && ovlog <= 9);
-    if (ovlog == 0) return ZSTDMT_overlapLog_default(strat);
-    return ovlog;
-}
-
-static size_t ZSTDMT_computeOverlapSize(ZSTD_CCtx_params const params)
-{
-    int const overlapRLog = 9 - ZSTDMT_overlapLog(params.overlapLog, params.cParams.strategy);
-    int ovLog = (overlapRLog >= 8) ? 0 : (params.cParams.windowLog - overlapRLog);
-    assert(0 <= overlapRLog && overlapRLog <= 8);
-    if (params.ldmParams.enableLdm) {
-        /* In Long Range Mode, the windowLog is typically oversized.
-         * In which case, it's preferable to determine the jobSize
-         * based on chainLog instead.
-         * Then, ovLog becomes a fraction of the jobSize, rather than windowSize */
-        ovLog = MIN(params.cParams.windowLog, ZSTDMT_computeTargetJobLog(params) - 2)
-                - overlapRLog;
-    }
-    assert(0 <= ovLog && ovLog <= ZSTD_WINDOWLOG_MAX);
-    DEBUGLOG(4, "overlapLog : %i", params.overlapLog);
-    DEBUGLOG(4, "overlap size : %i", 1 << ovLog);
-    return (ovLog==0) ? 0 : (size_t)1 << ovLog;
-}
-
-static unsigned
-ZSTDMT_computeNbJobs(ZSTD_CCtx_params params, size_t srcSize, unsigned nbWorkers)
-{
-    assert(nbWorkers>0);
-    {   size_t const jobSizeTarget = (size_t)1 << ZSTDMT_computeTargetJobLog(params);
-        size_t const jobMaxSize = jobSizeTarget << 2;
-        size_t const passSizeMax = jobMaxSize * nbWorkers;
-        unsigned const multiplier = (unsigned)(srcSize / passSizeMax) + 1;
-        unsigned const nbJobsLarge = multiplier * nbWorkers;
-        unsigned const nbJobsMax = (unsigned)(srcSize / jobSizeTarget) + 1;
-        unsigned const nbJobsSmall = MIN(nbJobsMax, nbWorkers);
-        return (multiplier>1) ? nbJobsLarge : nbJobsSmall;
-}   }
-
-/* ZSTDMT_compress_advanced_internal() :
- * This is a blocking function : it will only give back control to caller after finishing its compression job.
- */
-static size_t ZSTDMT_compress_advanced_internal(
-                ZSTDMT_CCtx* mtctx,
-                void* dst, size_t dstCapacity,
-          const void* src, size_t srcSize,
-          const ZSTD_CDict* cdict,
-                ZSTD_CCtx_params params)
-{
-    ZSTD_CCtx_params const jobParams = ZSTDMT_initJobCCtxParams(params);
-    size_t const overlapSize = ZSTDMT_computeOverlapSize(params);
-    unsigned const nbJobs = ZSTDMT_computeNbJobs(params, srcSize, params.nbWorkers);
-    size_t const proposedJobSize = (srcSize + (nbJobs-1)) / nbJobs;
-    size_t const avgJobSize = (((proposedJobSize-1) & 0x1FFFF) < 0x7FFF) ? proposedJobSize + 0xFFFF : proposedJobSize;   /* avoid too small last block */
-    const char* const srcStart = (const char*)src;
-    size_t remainingSrcSize = srcSize;
-    unsigned const compressWithinDst = (dstCapacity >= ZSTD_compressBound(srcSize)) ? nbJobs : (unsigned)(dstCapacity / ZSTD_compressBound(avgJobSize));  /* presumes avgJobSize >= 256 KB, which should be the case */
-    size_t frameStartPos = 0, dstBufferPos = 0;
-    assert(jobParams.nbWorkers == 0);
-    assert(mtctx->cctxPool->totalCCtx == params.nbWorkers);
-
-    params.jobSize = (U32)avgJobSize;
-    DEBUGLOG(4, "ZSTDMT_compress_advanced_internal: nbJobs=%2u (rawSize=%u bytes; fixedSize=%u) ",
-                nbJobs, (U32)proposedJobSize, (U32)avgJobSize);
-
-    if ((nbJobs==1) | (params.nbWorkers<=1)) {   /* fallback to single-thread mode : this is a blocking invocation anyway */
-        ZSTD_CCtx* const cctx = mtctx->cctxPool->cctx[0];
-        DEBUGLOG(4, "ZSTDMT_compress_advanced_internal: fallback to single-thread mode");
-        if (cdict) return ZSTD_compress_usingCDict_advanced(cctx, dst, dstCapacity, src, srcSize, cdict, jobParams.fParams);
-        return ZSTD_compress_advanced_internal(cctx, dst, dstCapacity, src, srcSize, NULL, 0, jobParams);
-    }
-
-    assert(avgJobSize >= 256 KB);  /* condition for ZSTD_compressBound(A) + ZSTD_compressBound(B) <= ZSTD_compressBound(A+B), required to compress directly into Dst (no additional buffer) */
-    ZSTDMT_setBufferSize(mtctx->bufPool, ZSTD_compressBound(avgJobSize) );
-    if (ZSTDMT_serialState_reset(&mtctx->serial, mtctx->seqPool, params, avgJobSize))
-        return ERROR(memory_allocation);
-
-    FORWARD_IF_ERROR( ZSTDMT_expandJobsTable(mtctx, nbJobs) );  /* only expands if necessary */
-
-    {   unsigned u;
-        for (u=0; u<nbJobs; u++) {
-            size_t const jobSize = MIN(remainingSrcSize, avgJobSize);
-            size_t const dstBufferCapacity = ZSTD_compressBound(jobSize);
-            buffer_t const dstAsBuffer = { (char*)dst + dstBufferPos, dstBufferCapacity };
-            buffer_t const dstBuffer = u < compressWithinDst ? dstAsBuffer : g_nullBuffer;
-            size_t dictSize = u ? overlapSize : 0;
-
-            mtctx->jobs[u].prefix.start = srcStart + frameStartPos - dictSize;
-            mtctx->jobs[u].prefix.size = dictSize;
-            mtctx->jobs[u].src.start = srcStart + frameStartPos;
-            mtctx->jobs[u].src.size = jobSize; assert(jobSize > 0);  /* avoid job.src.size == 0 */
-            mtctx->jobs[u].consumed = 0;
-            mtctx->jobs[u].cSize = 0;
-            mtctx->jobs[u].cdict = (u==0) ? cdict : NULL;
-            mtctx->jobs[u].fullFrameSize = srcSize;
-            mtctx->jobs[u].params = jobParams;
-            /* do not calculate checksum within sections, but write it in header for first section */
-            mtctx->jobs[u].dstBuff = dstBuffer;
-            mtctx->jobs[u].cctxPool = mtctx->cctxPool;
-            mtctx->jobs[u].bufPool = mtctx->bufPool;
-            mtctx->jobs[u].seqPool = mtctx->seqPool;
-            mtctx->jobs[u].serial = &mtctx->serial;
-            mtctx->jobs[u].jobID = u;
-            mtctx->jobs[u].firstJob = (u==0);
-            mtctx->jobs[u].lastJob = (u==nbJobs-1);
-
-            DEBUGLOG(5, "ZSTDMT_compress_advanced_internal: posting job %u  (%u bytes)", u, (U32)jobSize);
-            DEBUG_PRINTHEX(6, mtctx->jobs[u].prefix.start, 12);
-            POOL_add(mtctx->factory, ZSTDMT_compressionJob, &mtctx->jobs[u]);
-
-            frameStartPos += jobSize;
-            dstBufferPos += dstBufferCapacity;
-            remainingSrcSize -= jobSize;
-    }   }
-
-    /* collect result */
-    {   size_t error = 0, dstPos = 0;
-        unsigned jobID;
-        for (jobID=0; jobID<nbJobs; jobID++) {
-            DEBUGLOG(5, "waiting for job %u ", jobID);
-            ZSTD_PTHREAD_MUTEX_LOCK(&mtctx->jobs[jobID].job_mutex);
-            while (mtctx->jobs[jobID].consumed < mtctx->jobs[jobID].src.size) {
-                DEBUGLOG(5, "waiting for jobCompleted signal from job %u", jobID);
-                ZSTD_pthread_cond_wait(&mtctx->jobs[jobID].job_cond, &mtctx->jobs[jobID].job_mutex);
-            }
-            ZSTD_pthread_mutex_unlock(&mtctx->jobs[jobID].job_mutex);
-            DEBUGLOG(5, "ready to write job %u ", jobID);
-
-            {   size_t const cSize = mtctx->jobs[jobID].cSize;
-                if (ZSTD_isError(cSize)) error = cSize;
-                if ((!error) && (dstPos + cSize > dstCapacity)) error = ERROR(dstSize_tooSmall);
-                if (jobID) {   /* note : job 0 is written directly at dst, which is correct position */
-                    if (!error)
-                        memmove((char*)dst + dstPos, mtctx->jobs[jobID].dstBuff.start, cSize);  /* may overlap when job compressed within dst */
-                    if (jobID >= compressWithinDst) {  /* job compressed into its own buffer, which must be released */
-                        DEBUGLOG(5, "releasing buffer %u>=%u", jobID, compressWithinDst);
-                        ZSTDMT_releaseBuffer(mtctx->bufPool, mtctx->jobs[jobID].dstBuff);
-                }   }
-                mtctx->jobs[jobID].dstBuff = g_nullBuffer;
-                mtctx->jobs[jobID].cSize = 0;
-                dstPos += cSize ;
-            }
-        }  /* for (jobID=0; jobID<nbJobs; jobID++) */
-
-        DEBUGLOG(4, "checksumFlag : %u ", params.fParams.checksumFlag);
-        if (params.fParams.checksumFlag) {
-            U32 const checksum = (U32)XXH64_digest(&mtctx->serial.xxhState);
-            if (dstPos + 4 > dstCapacity) {
-                error = ERROR(dstSize_tooSmall);
-            } else {
-                DEBUGLOG(4, "writing checksum : %08X \n", checksum);
-                MEM_writeLE32((char*)dst + dstPos, checksum);
-                dstPos += 4;
-        }   }
-
-        if (!error) DEBUGLOG(4, "compressed size : %u  ", (U32)dstPos);
-        return error ? error : dstPos;
-    }
-}
-
-size_t ZSTDMT_compress_advanced(ZSTDMT_CCtx* mtctx,
-                                void* dst, size_t dstCapacity,
-                          const void* src, size_t srcSize,
-                          const ZSTD_CDict* cdict,
-                                ZSTD_parameters params,
-                                int overlapLog)
-{
-    ZSTD_CCtx_params cctxParams = mtctx->params;
-    cctxParams.cParams = params.cParams;
-    cctxParams.fParams = params.fParams;
-    assert(ZSTD_OVERLAPLOG_MIN <= overlapLog && overlapLog <= ZSTD_OVERLAPLOG_MAX);
-    cctxParams.overlapLog = overlapLog;
-    return ZSTDMT_compress_advanced_internal(mtctx,
-                                             dst, dstCapacity,
-                                             src, srcSize,
-                                             cdict, cctxParams);
-}
-
-
-size_t ZSTDMT_compressCCtx(ZSTDMT_CCtx* mtctx,
-                           void* dst, size_t dstCapacity,
-                     const void* src, size_t srcSize,
-                           int compressionLevel)
-{
-    ZSTD_parameters params = ZSTD_getParams(compressionLevel, srcSize, 0);
-    int const overlapLog = ZSTDMT_overlapLog_default(params.cParams.strategy);
-    params.fParams.contentSizeFlag = 1;
-    return ZSTDMT_compress_advanced(mtctx, dst, dstCapacity, src, srcSize, NULL, params, overlapLog);
-}
-
-
-/* ====================================== */
-/* =======      Streaming API     ======= */
-/* ====================================== */
-
-size_t ZSTDMT_initCStream_internal(
-        ZSTDMT_CCtx* mtctx,
-        const void* dict, size_t dictSize, ZSTD_dictContentType_e dictContentType,
-        const ZSTD_CDict* cdict, ZSTD_CCtx_params params,
-        unsigned long long pledgedSrcSize)
-{
-    DEBUGLOG(4, "ZSTDMT_initCStream_internal (pledgedSrcSize=%u, nbWorkers=%u, cctxPool=%u)",
-                (U32)pledgedSrcSize, params.nbWorkers, mtctx->cctxPool->totalCCtx);
-
-    /* params supposed partially fully validated at this point */
-    assert(!ZSTD_isError(ZSTD_checkCParams(params.cParams)));
-    assert(!((dict) && (cdict)));  /* either dict or cdict, not both */
-
-    /* init */
-    if (params.nbWorkers != mtctx->params.nbWorkers)
-        FORWARD_IF_ERROR( ZSTDMT_resize(mtctx, params.nbWorkers) );
-
-    if (params.jobSize != 0 && params.jobSize < ZSTDMT_JOBSIZE_MIN) params.jobSize = ZSTDMT_JOBSIZE_MIN;
-    if (params.jobSize > (size_t)ZSTDMT_JOBSIZE_MAX) params.jobSize = (size_t)ZSTDMT_JOBSIZE_MAX;
-
-    mtctx->singleBlockingThread = (pledgedSrcSize <= ZSTDMT_JOBSIZE_MIN);  /* do not trigger multi-threading when srcSize is too small */
-    if (mtctx->singleBlockingThread) {
-        ZSTD_CCtx_params const singleThreadParams = ZSTDMT_initJobCCtxParams(params);
-        DEBUGLOG(5, "ZSTDMT_initCStream_internal: switch to single blocking thread mode");
-        assert(singleThreadParams.nbWorkers == 0);
-        return ZSTD_initCStream_internal(mtctx->cctxPool->cctx[0],
-                                         dict, dictSize, cdict,
-                                         singleThreadParams, pledgedSrcSize);
-    }
-
-    DEBUGLOG(4, "ZSTDMT_initCStream_internal: %u workers", params.nbWorkers);
-
-    if (mtctx->allJobsCompleted == 0) {   /* previous compression not correctly finished */
-        ZSTDMT_waitForAllJobsCompleted(mtctx);
-        ZSTDMT_releaseAllJobResources(mtctx);
-        mtctx->allJobsCompleted = 1;
-    }
-
-    mtctx->params = params;
-    mtctx->frameContentSize = pledgedSrcSize;
-    if (dict) {
-        ZSTD_freeCDict(mtctx->cdictLocal);
-        mtctx->cdictLocal = ZSTD_createCDict_advanced(dict, dictSize,
-                                                    ZSTD_dlm_byCopy, dictContentType, /* note : a loadPrefix becomes an internal CDict */
-                                                    params.cParams, mtctx->cMem);
-        mtctx->cdict = mtctx->cdictLocal;
-        if (mtctx->cdictLocal == NULL) return ERROR(memory_allocation);
-    } else {
-        ZSTD_freeCDict(mtctx->cdictLocal);
-        mtctx->cdictLocal = NULL;
-        mtctx->cdict = cdict;
-    }
-
-    mtctx->targetPrefixSize = ZSTDMT_computeOverlapSize(params);
-    DEBUGLOG(4, "overlapLog=%i => %u KB", params.overlapLog, (U32)(mtctx->targetPrefixSize>>10));
-    mtctx->targetSectionSize = params.jobSize;
-    if (mtctx->targetSectionSize == 0) {
-        mtctx->targetSectionSize = 1ULL << ZSTDMT_computeTargetJobLog(params);
-    }
-    assert(mtctx->targetSectionSize <= (size_t)ZSTDMT_JOBSIZE_MAX);
-
-    if (params.rsyncable) {
-        /* Aim for the targetsectionSize as the average job size. */
-        U32 const jobSizeMB = (U32)(mtctx->targetSectionSize >> 20);
-        U32 const rsyncBits = ZSTD_highbit32(jobSizeMB) + 20;
-        assert(jobSizeMB >= 1);
-        DEBUGLOG(4, "rsyncLog = %u", rsyncBits);
-        mtctx->rsync.hash = 0;
-        mtctx->rsync.hitMask = (1ULL << rsyncBits) - 1;
-        mtctx->rsync.primePower = ZSTD_rollingHash_primePower(RSYNC_LENGTH);
-    }
-    if (mtctx->targetSectionSize < mtctx->targetPrefixSize) mtctx->targetSectionSize = mtctx->targetPrefixSize;  /* job size must be >= overlap size */
-    DEBUGLOG(4, "Job Size : %u KB (note : set to %u)", (U32)(mtctx->targetSectionSize>>10), (U32)params.jobSize);
-    DEBUGLOG(4, "inBuff Size : %u KB", (U32)(mtctx->targetSectionSize>>10));
-    ZSTDMT_setBufferSize(mtctx->bufPool, ZSTD_compressBound(mtctx->targetSectionSize));
-    {
-        /* If ldm is enabled we need windowSize space. */
-        size_t const windowSize = mtctx->params.ldmParams.enableLdm ? (1U << mtctx->params.cParams.windowLog) : 0;
-        /* Two buffers of slack, plus extra space for the overlap
-         * This is the minimum slack that LDM works with. One extra because
-         * flush might waste up to targetSectionSize-1 bytes. Another extra
-         * for the overlap (if > 0), then one to fill which doesn't overlap
-         * with the LDM window.
-         */
-        size_t const nbSlackBuffers = 2 + (mtctx->targetPrefixSize > 0);
-        size_t const slackSize = mtctx->targetSectionSize * nbSlackBuffers;
-        /* Compute the total size, and always have enough slack */
-        size_t const nbWorkers = MAX(mtctx->params.nbWorkers, 1);
-        size_t const sectionsSize = mtctx->targetSectionSize * nbWorkers;
-        size_t const capacity = MAX(windowSize, sectionsSize) + slackSize;
-        if (mtctx->roundBuff.capacity < capacity) {
-            if (mtctx->roundBuff.buffer)
-                ZSTD_free(mtctx->roundBuff.buffer, mtctx->cMem);
-            mtctx->roundBuff.buffer = (BYTE*)ZSTD_malloc(capacity, mtctx->cMem);
-            if (mtctx->roundBuff.buffer == NULL) {
-                mtctx->roundBuff.capacity = 0;
-                return ERROR(memory_allocation);
-            }
-            mtctx->roundBuff.capacity = capacity;
-        }
-    }
-    DEBUGLOG(4, "roundBuff capacity : %u KB", (U32)(mtctx->roundBuff.capacity>>10));
-    mtctx->roundBuff.pos = 0;
-    mtctx->inBuff.buffer = g_nullBuffer;
-    mtctx->inBuff.filled = 0;
-    mtctx->inBuff.prefix = kNullRange;
-    mtctx->doneJobID = 0;
-    mtctx->nextJobID = 0;
-    mtctx->frameEnded = 0;
-    mtctx->allJobsCompleted = 0;
-    mtctx->consumed = 0;
-    mtctx->produced = 0;
-    if (ZSTDMT_serialState_reset(&mtctx->serial, mtctx->seqPool, params, mtctx->targetSectionSize))
-        return ERROR(memory_allocation);
-    return 0;
-}
-
-size_t ZSTDMT_initCStream_advanced(ZSTDMT_CCtx* mtctx,
-                             const void* dict, size_t dictSize,
-                                   ZSTD_parameters params,
-                                   unsigned long long pledgedSrcSize)
-{
-    ZSTD_CCtx_params cctxParams = mtctx->params;  /* retrieve sticky params */
-    DEBUGLOG(4, "ZSTDMT_initCStream_advanced (pledgedSrcSize=%u)", (U32)pledgedSrcSize);
-    cctxParams.cParams = params.cParams;
-    cctxParams.fParams = params.fParams;
-    return ZSTDMT_initCStream_internal(mtctx, dict, dictSize, ZSTD_dct_auto, NULL,
-                                       cctxParams, pledgedSrcSize);
-}
-
-size_t ZSTDMT_initCStream_usingCDict(ZSTDMT_CCtx* mtctx,
-                               const ZSTD_CDict* cdict,
-                                     ZSTD_frameParameters fParams,
-                                     unsigned long long pledgedSrcSize)
-{
-    ZSTD_CCtx_params cctxParams = mtctx->params;
-    if (cdict==NULL) return ERROR(dictionary_wrong);   /* method incompatible with NULL cdict */
-    cctxParams.cParams = ZSTD_getCParamsFromCDict(cdict);
-    cctxParams.fParams = fParams;
-    return ZSTDMT_initCStream_internal(mtctx, NULL, 0 /*dictSize*/, ZSTD_dct_auto, cdict,
-                                       cctxParams, pledgedSrcSize);
-}
-
-
-/* ZSTDMT_resetCStream() :
- * pledgedSrcSize can be zero == unknown (for the time being)
- * prefer using ZSTD_CONTENTSIZE_UNKNOWN,
- * as `0` might mean "empty" in the future */
-size_t ZSTDMT_resetCStream(ZSTDMT_CCtx* mtctx, unsigned long long pledgedSrcSize)
-{
-    if (!pledgedSrcSize) pledgedSrcSize = ZSTD_CONTENTSIZE_UNKNOWN;
-    return ZSTDMT_initCStream_internal(mtctx, NULL, 0, ZSTD_dct_auto, 0, mtctx->params,
-                                       pledgedSrcSize);
-}
-
-size_t ZSTDMT_initCStream(ZSTDMT_CCtx* mtctx, int compressionLevel) {
-    ZSTD_parameters const params = ZSTD_getParams(compressionLevel, ZSTD_CONTENTSIZE_UNKNOWN, 0);
-    ZSTD_CCtx_params cctxParams = mtctx->params;   /* retrieve sticky params */
-    DEBUGLOG(4, "ZSTDMT_initCStream (cLevel=%i)", compressionLevel);
-    cctxParams.cParams = params.cParams;
-    cctxParams.fParams = params.fParams;
-    return ZSTDMT_initCStream_internal(mtctx, NULL, 0, ZSTD_dct_auto, NULL, cctxParams, ZSTD_CONTENTSIZE_UNKNOWN);
-}
-
-
-/* ZSTDMT_writeLastEmptyBlock()
- * Write a single empty block with an end-of-frame to finish a frame.
- * Job must be created from streaming variant.
- * This function is always successful if expected conditions are fulfilled.
- */
-static void ZSTDMT_writeLastEmptyBlock(ZSTDMT_jobDescription* job)
-{
-    assert(job->lastJob == 1);
-    assert(job->src.size == 0);   /* last job is empty -> will be simplified into a last empty block */
-    assert(job->firstJob == 0);   /* cannot be first job, as it also needs to create frame header */
-    assert(job->dstBuff.start == NULL);   /* invoked from streaming variant only (otherwise, dstBuff might be user's output) */
-    job->dstBuff = ZSTDMT_getBuffer(job->bufPool);
-    if (job->dstBuff.start == NULL) {
-      job->cSize = ERROR(memory_allocation);
-      return;
-    }
-    assert(job->dstBuff.capacity >= ZSTD_blockHeaderSize);   /* no buffer should ever be that small */
-    job->src = kNullRange;
-    job->cSize = ZSTD_writeLastEmptyBlock(job->dstBuff.start, job->dstBuff.capacity);
-    assert(!ZSTD_isError(job->cSize));
-    assert(job->consumed == 0);
-}
-
-static size_t ZSTDMT_createCompressionJob(ZSTDMT_CCtx* mtctx, size_t srcSize, ZSTD_EndDirective endOp)
-{
-    unsigned const jobID = mtctx->nextJobID & mtctx->jobIDMask;
-    int const endFrame = (endOp == ZSTD_e_end);
-
-    if (mtctx->nextJobID > mtctx->doneJobID + mtctx->jobIDMask) {
-        DEBUGLOG(5, "ZSTDMT_createCompressionJob: will not create new job : table is full");
-        assert((mtctx->nextJobID & mtctx->jobIDMask) == (mtctx->doneJobID & mtctx->jobIDMask));
-        return 0;
-    }
-
-    if (!mtctx->jobReady) {
-        BYTE const* src = (BYTE const*)mtctx->inBuff.buffer.start;
-        DEBUGLOG(5, "ZSTDMT_createCompressionJob: preparing job %u to compress %u bytes with %u preload ",
-                    mtctx->nextJobID, (U32)srcSize, (U32)mtctx->inBuff.prefix.size);
-        mtctx->jobs[jobID].src.start = src;
-        mtctx->jobs[jobID].src.size = srcSize;
-        assert(mtctx->inBuff.filled >= srcSize);
-        mtctx->jobs[jobID].prefix = mtctx->inBuff.prefix;
-        mtctx->jobs[jobID].consumed = 0;
-        mtctx->jobs[jobID].cSize = 0;
-        mtctx->jobs[jobID].params = mtctx->params;
-        mtctx->jobs[jobID].cdict = mtctx->nextJobID==0 ? mtctx->cdict : NULL;
-        mtctx->jobs[jobID].fullFrameSize = mtctx->frameContentSize;
-        mtctx->jobs[jobID].dstBuff = g_nullBuffer;
-        mtctx->jobs[jobID].cctxPool = mtctx->cctxPool;
-        mtctx->jobs[jobID].bufPool = mtctx->bufPool;
-        mtctx->jobs[jobID].seqPool = mtctx->seqPool;
-        mtctx->jobs[jobID].serial = &mtctx->serial;
-        mtctx->jobs[jobID].jobID = mtctx->nextJobID;
-        mtctx->jobs[jobID].firstJob = (mtctx->nextJobID==0);
-        mtctx->jobs[jobID].lastJob = endFrame;
-        mtctx->jobs[jobID].frameChecksumNeeded = mtctx->params.fParams.checksumFlag && endFrame && (mtctx->nextJobID>0);
-        mtctx->jobs[jobID].dstFlushed = 0;
-
-        /* Update the round buffer pos and clear the input buffer to be reset */
-        mtctx->roundBuff.pos += srcSize;
-        mtctx->inBuff.buffer = g_nullBuffer;
-        mtctx->inBuff.filled = 0;
-        /* Set the prefix */
-        if (!endFrame) {
-            size_t const newPrefixSize = MIN(srcSize, mtctx->targetPrefixSize);
-            mtctx->inBuff.prefix.start = src + srcSize - newPrefixSize;
-            mtctx->inBuff.prefix.size = newPrefixSize;
-        } else {   /* endFrame==1 => no need for another input buffer */
-            mtctx->inBuff.prefix = kNullRange;
-            mtctx->frameEnded = endFrame;
-            if (mtctx->nextJobID == 0) {
-                /* single job exception : checksum is already calculated directly within worker thread */
-                mtctx->params.fParams.checksumFlag = 0;
-        }   }
-
-        if ( (srcSize == 0)
-          && (mtctx->nextJobID>0)/*single job must also write frame header*/ ) {
-            DEBUGLOG(5, "ZSTDMT_createCompressionJob: creating a last empty block to end frame");
-            assert(endOp == ZSTD_e_end);  /* only possible case : need to end the frame with an empty last block */
-            ZSTDMT_writeLastEmptyBlock(mtctx->jobs + jobID);
-            mtctx->nextJobID++;
-            return 0;
-        }
-    }
-
-    DEBUGLOG(5, "ZSTDMT_createCompressionJob: posting job %u : %u bytes  (end:%u, jobNb == %u (mod:%u))",
-                mtctx->nextJobID,
-                (U32)mtctx->jobs[jobID].src.size,
-                mtctx->jobs[jobID].lastJob,
-                mtctx->nextJobID,
-                jobID);
-    if (POOL_tryAdd(mtctx->factory, ZSTDMT_compressionJob, &mtctx->jobs[jobID])) {
-        mtctx->nextJobID++;
-        mtctx->jobReady = 0;
-    } else {
-        DEBUGLOG(5, "ZSTDMT_createCompressionJob: no worker available for job %u", mtctx->nextJobID);
-        mtctx->jobReady = 1;
-    }
-    return 0;
-}
-
-
-/*! ZSTDMT_flushProduced() :
- *  flush whatever data has been produced but not yet flushed in current job.
- *  move to next job if current one is fully flushed.
- * `output` : `pos` will be updated with amount of data flushed .
- * `blockToFlush` : if >0, the function will block and wait if there is no data available to flush .
- * @return : amount of data remaining within internal buffer, 0 if no more, 1 if unknown but > 0, or an error code */
-static size_t ZSTDMT_flushProduced(ZSTDMT_CCtx* mtctx, ZSTD_outBuffer* output, unsigned blockToFlush, ZSTD_EndDirective end)
-{
-    unsigned const wJobID = mtctx->doneJobID & mtctx->jobIDMask;
-    DEBUGLOG(5, "ZSTDMT_flushProduced (blocking:%u , job %u <= %u)",
-                blockToFlush, mtctx->doneJobID, mtctx->nextJobID);
-    assert(output->size >= output->pos);
-
-    ZSTD_PTHREAD_MUTEX_LOCK(&mtctx->jobs[wJobID].job_mutex);
-    if (  blockToFlush
-      && (mtctx->doneJobID < mtctx->nextJobID) ) {
-        assert(mtctx->jobs[wJobID].dstFlushed <= mtctx->jobs[wJobID].cSize);
-        while (mtctx->jobs[wJobID].dstFlushed == mtctx->jobs[wJobID].cSize) {  /* nothing to flush */
-            if (mtctx->jobs[wJobID].consumed == mtctx->jobs[wJobID].src.size) {
-                DEBUGLOG(5, "job %u is completely consumed (%u == %u) => don't wait for cond, there will be none",
-                            mtctx->doneJobID, (U32)mtctx->jobs[wJobID].consumed, (U32)mtctx->jobs[wJobID].src.size);
-                break;
-            }
-            DEBUGLOG(5, "waiting for something to flush from job %u (currently flushed: %u bytes)",
-                        mtctx->doneJobID, (U32)mtctx->jobs[wJobID].dstFlushed);
-            ZSTD_pthread_cond_wait(&mtctx->jobs[wJobID].job_cond, &mtctx->jobs[wJobID].job_mutex);  /* block when nothing to flush but some to come */
-    }   }
-
-    /* try to flush something */
-    {   size_t cSize = mtctx->jobs[wJobID].cSize;                  /* shared */
-        size_t const srcConsumed = mtctx->jobs[wJobID].consumed;   /* shared */
-        size_t const srcSize = mtctx->jobs[wJobID].src.size;       /* read-only, could be done after mutex lock, but no-declaration-after-statement */
-        ZSTD_pthread_mutex_unlock(&mtctx->jobs[wJobID].job_mutex);
-        if (ZSTD_isError(cSize)) {
-            DEBUGLOG(5, "ZSTDMT_flushProduced: job %u : compression error detected : %s",
-                        mtctx->doneJobID, ZSTD_getErrorName(cSize));
-            ZSTDMT_waitForAllJobsCompleted(mtctx);
-            ZSTDMT_releaseAllJobResources(mtctx);
-            return cSize;
-        }
-        /* add frame checksum if necessary (can only happen once) */
-        assert(srcConsumed <= srcSize);
-        if ( (srcConsumed == srcSize)   /* job completed -> worker no longer active */
-          && mtctx->jobs[wJobID].frameChecksumNeeded ) {
-            U32 const checksum = (U32)XXH64_digest(&mtctx->serial.xxhState);
-            DEBUGLOG(4, "ZSTDMT_flushProduced: writing checksum : %08X \n", checksum);
-            MEM_writeLE32((char*)mtctx->jobs[wJobID].dstBuff.start + mtctx->jobs[wJobID].cSize, checksum);
-            cSize += 4;
-            mtctx->jobs[wJobID].cSize += 4;  /* can write this shared value, as worker is no longer active */
-            mtctx->jobs[wJobID].frameChecksumNeeded = 0;
-        }
-
-        if (cSize > 0) {   /* compression is ongoing or completed */
-            size_t const toFlush = MIN(cSize - mtctx->jobs[wJobID].dstFlushed, output->size - output->pos);
-            DEBUGLOG(5, "ZSTDMT_flushProduced: Flushing %u bytes from job %u (completion:%u/%u, generated:%u)",
-                        (U32)toFlush, mtctx->doneJobID, (U32)srcConsumed, (U32)srcSize, (U32)cSize);
-            assert(mtctx->doneJobID < mtctx->nextJobID);
-            assert(cSize >= mtctx->jobs[wJobID].dstFlushed);
-            assert(mtctx->jobs[wJobID].dstBuff.start != NULL);
-            memcpy((char*)output->dst + output->pos,
-                   (const char*)mtctx->jobs[wJobID].dstBuff.start + mtctx->jobs[wJobID].dstFlushed,
-                   toFlush);
-            output->pos += toFlush;
-            mtctx->jobs[wJobID].dstFlushed += toFlush;  /* can write : this value is only used by mtctx */
-
-            if ( (srcConsumed == srcSize)    /* job is completed */
-              && (mtctx->jobs[wJobID].dstFlushed == cSize) ) {   /* output buffer fully flushed => free this job position */
-                DEBUGLOG(5, "Job %u completed (%u bytes), moving to next one",
-                        mtctx->doneJobID, (U32)mtctx->jobs[wJobID].dstFlushed);
-                ZSTDMT_releaseBuffer(mtctx->bufPool, mtctx->jobs[wJobID].dstBuff);
-                DEBUGLOG(5, "dstBuffer released");
-                mtctx->jobs[wJobID].dstBuff = g_nullBuffer;
-                mtctx->jobs[wJobID].cSize = 0;   /* ensure this job slot is considered "not started" in future check */
-                mtctx->consumed += srcSize;
-                mtctx->produced += cSize;
-                mtctx->doneJobID++;
-        }   }
-
-        /* return value : how many bytes left in buffer ; fake it to 1 when unknown but >0 */
-        if (cSize > mtctx->jobs[wJobID].dstFlushed) return (cSize - mtctx->jobs[wJobID].dstFlushed);
-        if (srcSize > srcConsumed) return 1;   /* current job not completely compressed */
-    }
-    if (mtctx->doneJobID < mtctx->nextJobID) return 1;   /* some more jobs ongoing */
-    if (mtctx->jobReady) return 1;      /* one job is ready to push, just not yet in the list */
-    if (mtctx->inBuff.filled > 0) return 1;   /* input is not empty, and still needs to be converted into a job */
-    mtctx->allJobsCompleted = mtctx->frameEnded;   /* all jobs are entirely flushed => if this one is last one, frame is completed */
-    if (end == ZSTD_e_end) return !mtctx->frameEnded;  /* for ZSTD_e_end, question becomes : is frame completed ? instead of : are internal buffers fully flushed ? */
-    return 0;   /* internal buffers fully flushed */
-}
-
-/**
- * Returns the range of data used by the earliest job that is not yet complete.
- * If the data of the first job is broken up into two segments, we cover both
- * sections.
- */
-static range_t ZSTDMT_getInputDataInUse(ZSTDMT_CCtx* mtctx)
-{
-    unsigned const firstJobID = mtctx->doneJobID;
-    unsigned const lastJobID = mtctx->nextJobID;
-    unsigned jobID;
-
-    for (jobID = firstJobID; jobID < lastJobID; ++jobID) {
-        unsigned const wJobID = jobID & mtctx->jobIDMask;
-        size_t consumed;
-
-        ZSTD_PTHREAD_MUTEX_LOCK(&mtctx->jobs[wJobID].job_mutex);
-        consumed = mtctx->jobs[wJobID].consumed;
-        ZSTD_pthread_mutex_unlock(&mtctx->jobs[wJobID].job_mutex);
-
-        if (consumed < mtctx->jobs[wJobID].src.size) {
-            range_t range = mtctx->jobs[wJobID].prefix;
-            if (range.size == 0) {
-                /* Empty prefix */
-                range = mtctx->jobs[wJobID].src;
-            }
-            /* Job source in multiple segments not supported yet */
-            assert(range.start <= mtctx->jobs[wJobID].src.start);
-            return range;
-        }
-    }
-    return kNullRange;
-}
-
-/**
- * Returns non-zero iff buffer and range overlap.
- */
-static int ZSTDMT_isOverlapped(buffer_t buffer, range_t range)
-{
-    BYTE const* const bufferStart = (BYTE const*)buffer.start;
-    BYTE const* const bufferEnd = bufferStart + buffer.capacity;
-    BYTE const* const rangeStart = (BYTE const*)range.start;
-    BYTE const* const rangeEnd = rangeStart + range.size;
-
-    if (rangeStart == NULL || bufferStart == NULL)
-        return 0;
-    /* Empty ranges cannot overlap */
-    if (bufferStart == bufferEnd || rangeStart == rangeEnd)
-        return 0;
-
-    return bufferStart < rangeEnd && rangeStart < bufferEnd;
-}
-
-static int ZSTDMT_doesOverlapWindow(buffer_t buffer, ZSTD_window_t window)
-{
-    range_t extDict;
-    range_t prefix;
-
-    DEBUGLOG(5, "ZSTDMT_doesOverlapWindow");
-    extDict.start = window.dictBase + window.lowLimit;
-    extDict.size = window.dictLimit - window.lowLimit;
-
-    prefix.start = window.base + window.dictLimit;
-    prefix.size = window.nextSrc - (window.base + window.dictLimit);
-    DEBUGLOG(5, "extDict [0x%zx, 0x%zx)",
-                (size_t)extDict.start,
-                (size_t)extDict.start + extDict.size);
-    DEBUGLOG(5, "prefix  [0x%zx, 0x%zx)",
-                (size_t)prefix.start,
-                (size_t)prefix.start + prefix.size);
-
-    return ZSTDMT_isOverlapped(buffer, extDict)
-        || ZSTDMT_isOverlapped(buffer, prefix);
-}
-
-static void ZSTDMT_waitForLdmComplete(ZSTDMT_CCtx* mtctx, buffer_t buffer)
-{
-    if (mtctx->params.ldmParams.enableLdm) {
-        ZSTD_pthread_mutex_t* mutex = &mtctx->serial.ldmWindowMutex;
-        DEBUGLOG(5, "ZSTDMT_waitForLdmComplete");
-        DEBUGLOG(5, "source  [0x%zx, 0x%zx)",
-                    (size_t)buffer.start,
-                    (size_t)buffer.start + buffer.capacity);
-        ZSTD_PTHREAD_MUTEX_LOCK(mutex);
-        while (ZSTDMT_doesOverlapWindow(buffer, mtctx->serial.ldmWindow)) {
-            DEBUGLOG(5, "Waiting for LDM to finish...");
-            ZSTD_pthread_cond_wait(&mtctx->serial.ldmWindowCond, mutex);
-        }
-        DEBUGLOG(6, "Done waiting for LDM to finish");
-        ZSTD_pthread_mutex_unlock(mutex);
-    }
-}
-
-/**
- * Attempts to set the inBuff to the next section to fill.
- * If any part of the new section is still in use we give up.
- * Returns non-zero if the buffer is filled.
- */
-static int ZSTDMT_tryGetInputRange(ZSTDMT_CCtx* mtctx)
-{
-    range_t const inUse = ZSTDMT_getInputDataInUse(mtctx);
-    size_t const spaceLeft = mtctx->roundBuff.capacity - mtctx->roundBuff.pos;
-    size_t const target = mtctx->targetSectionSize;
-    buffer_t buffer;
-
-    DEBUGLOG(5, "ZSTDMT_tryGetInputRange");
-    assert(mtctx->inBuff.buffer.start == NULL);
-    assert(mtctx->roundBuff.capacity >= target);
-
-    if (spaceLeft < target) {
-        /* ZSTD_invalidateRepCodes() doesn't work for extDict variants.
-         * Simply copy the prefix to the beginning in that case.
-         */
-        BYTE* const start = (BYTE*)mtctx->roundBuff.buffer;
-        size_t const prefixSize = mtctx->inBuff.prefix.size;
-
-        buffer.start = start;
-        buffer.capacity = prefixSize;
-        if (ZSTDMT_isOverlapped(buffer, inUse)) {
-            DEBUGLOG(5, "Waiting for buffer...");
-            return 0;
-        }
-        ZSTDMT_waitForLdmComplete(mtctx, buffer);
-        memmove(start, mtctx->inBuff.prefix.start, prefixSize);
-        mtctx->inBuff.prefix.start = start;
-        mtctx->roundBuff.pos = prefixSize;
-    }
-    buffer.start = mtctx->roundBuff.buffer + mtctx->roundBuff.pos;
-    buffer.capacity = target;
-
-    if (ZSTDMT_isOverlapped(buffer, inUse)) {
-        DEBUGLOG(5, "Waiting for buffer...");
-        return 0;
-    }
-    assert(!ZSTDMT_isOverlapped(buffer, mtctx->inBuff.prefix));
-
-    ZSTDMT_waitForLdmComplete(mtctx, buffer);
-
-    DEBUGLOG(5, "Using prefix range [%zx, %zx)",
-                (size_t)mtctx->inBuff.prefix.start,
-                (size_t)mtctx->inBuff.prefix.start + mtctx->inBuff.prefix.size);
-    DEBUGLOG(5, "Using source range [%zx, %zx)",
-                (size_t)buffer.start,
-                (size_t)buffer.start + buffer.capacity);
-
-
-    mtctx->inBuff.buffer = buffer;
-    mtctx->inBuff.filled = 0;
-    assert(mtctx->roundBuff.pos + buffer.capacity <= mtctx->roundBuff.capacity);
-    return 1;
-}
-
-typedef struct {
-  size_t toLoad;  /* The number of bytes to load from the input. */
-  int flush;      /* Boolean declaring if we must flush because we found a synchronization point. */
-} syncPoint_t;
-
-/**
- * Searches through the input for a synchronization point. If one is found, we
- * will instruct the caller to flush, and return the number of bytes to load.
- * Otherwise, we will load as many bytes as possible and instruct the caller
- * to continue as normal.
- */
-static syncPoint_t
-findSynchronizationPoint(ZSTDMT_CCtx const* mtctx, ZSTD_inBuffer const input)
-{
-    BYTE const* const istart = (BYTE const*)input.src + input.pos;
-    U64 const primePower = mtctx->rsync.primePower;
-    U64 const hitMask = mtctx->rsync.hitMask;
-
-    syncPoint_t syncPoint;
-    U64 hash;
-    BYTE const* prev;
-    size_t pos;
-
-    syncPoint.toLoad = MIN(input.size - input.pos, mtctx->targetSectionSize - mtctx->inBuff.filled);
-    syncPoint.flush = 0;
-    if (!mtctx->params.rsyncable)
-        /* Rsync is disabled. */
-        return syncPoint;
-    if (mtctx->inBuff.filled + syncPoint.toLoad < RSYNC_LENGTH)
-        /* Not enough to compute the hash.
-         * We will miss any synchronization points in this RSYNC_LENGTH byte
-         * window. However, since it depends only in the internal buffers, if the
-         * state is already synchronized, we will remain synchronized.
-         * Additionally, the probability that we miss a synchronization point is
-         * low: RSYNC_LENGTH / targetSectionSize.
-         */
-        return syncPoint;
-    /* Initialize the loop variables. */
-    if (mtctx->inBuff.filled >= RSYNC_LENGTH) {
-        /* We have enough bytes buffered to initialize the hash.
-         * Start scanning at the beginning of the input.
-         */
-        pos = 0;
-        prev = (BYTE const*)mtctx->inBuff.buffer.start + mtctx->inBuff.filled - RSYNC_LENGTH;
-        hash = ZSTD_rollingHash_compute(prev, RSYNC_LENGTH);
-    } else {
-        /* We don't have enough bytes buffered to initialize the hash, but
-         * we know we have at least RSYNC_LENGTH bytes total.
-         * Start scanning after the first RSYNC_LENGTH bytes less the bytes
-         * already buffered.
-         */
-        pos = RSYNC_LENGTH - mtctx->inBuff.filled;
-        prev = (BYTE const*)mtctx->inBuff.buffer.start - pos;
-        hash = ZSTD_rollingHash_compute(mtctx->inBuff.buffer.start, mtctx->inBuff.filled);
-        hash = ZSTD_rollingHash_append(hash, istart, pos);
-    }
-    /* Starting with the hash of the previous RSYNC_LENGTH bytes, roll
-     * through the input. If we hit a synchronization point, then cut the
-     * job off, and tell the compressor to flush the job. Otherwise, load
-     * all the bytes and continue as normal.
-     * If we go too long without a synchronization point (targetSectionSize)
-     * then a block will be emitted anyways, but this is okay, since if we
-     * are already synchronized we will remain synchronized.
-     */
-    for (; pos < syncPoint.toLoad; ++pos) {
-        BYTE const toRemove = pos < RSYNC_LENGTH ? prev[pos] : istart[pos - RSYNC_LENGTH];
-        /* if (pos >= RSYNC_LENGTH) assert(ZSTD_rollingHash_compute(istart + pos - RSYNC_LENGTH, RSYNC_LENGTH) == hash); */
-        hash = ZSTD_rollingHash_rotate(hash, toRemove, istart[pos], primePower);
-        if ((hash & hitMask) == hitMask) {
-            syncPoint.toLoad = pos + 1;
-            syncPoint.flush = 1;
-            break;
-        }
-    }
-    return syncPoint;
-}
-
-size_t ZSTDMT_nextInputSizeHint(const ZSTDMT_CCtx* mtctx)
-{
-    size_t hintInSize = mtctx->targetSectionSize - mtctx->inBuff.filled;
-    if (hintInSize==0) hintInSize = mtctx->targetSectionSize;
-    return hintInSize;
-}
-
-/** ZSTDMT_compressStream_generic() :
- *  internal use only - exposed to be invoked from zstd_compress.c
- *  assumption : output and input are valid (pos <= size)
- * @return : minimum amount of data remaining to flush, 0 if none */
-size_t ZSTDMT_compressStream_generic(ZSTDMT_CCtx* mtctx,
-                                     ZSTD_outBuffer* output,
-                                     ZSTD_inBuffer* input,
-                                     ZSTD_EndDirective endOp)
-{
-    unsigned forwardInputProgress = 0;
-    DEBUGLOG(5, "ZSTDMT_compressStream_generic (endOp=%u, srcSize=%u)",
-                (U32)endOp, (U32)(input->size - input->pos));
-    assert(output->pos <= output->size);
-    assert(input->pos  <= input->size);
-
-    if (mtctx->singleBlockingThread) {  /* delegate to single-thread (synchronous) */
-        return ZSTD_compressStream2(mtctx->cctxPool->cctx[0], output, input, endOp);
-    }
-
-    if ((mtctx->frameEnded) && (endOp==ZSTD_e_continue)) {
-        /* current frame being ended. Only flush/end are allowed */
-        return ERROR(stage_wrong);
-    }
-
-    /* single-pass shortcut (note : synchronous-mode) */
-    if ( (!mtctx->params.rsyncable)   /* rsyncable mode is disabled */
-      && (mtctx->nextJobID == 0)      /* just started */
-      && (mtctx->inBuff.filled == 0)  /* nothing buffered */
-      && (!mtctx->jobReady)           /* no job already created */
-      && (endOp == ZSTD_e_end)        /* end order */
-      && (output->size - output->pos >= ZSTD_compressBound(input->size - input->pos)) ) { /* enough space in dst */
-        size_t const cSize = ZSTDMT_compress_advanced_internal(mtctx,
-                (char*)output->dst + output->pos, output->size - output->pos,
-                (const char*)input->src + input->pos, input->size - input->pos,
-                mtctx->cdict, mtctx->params);
-        if (ZSTD_isError(cSize)) return cSize;
-        input->pos = input->size;
-        output->pos += cSize;
-        mtctx->allJobsCompleted = 1;
-        mtctx->frameEnded = 1;
-        return 0;
-    }
-
-    /* fill input buffer */
-    if ( (!mtctx->jobReady)
-      && (input->size > input->pos) ) {   /* support NULL input */
-        if (mtctx->inBuff.buffer.start == NULL) {
-            assert(mtctx->inBuff.filled == 0); /* Can't fill an empty buffer */
-            if (!ZSTDMT_tryGetInputRange(mtctx)) {
-                /* It is only possible for this operation to fail if there are
-                 * still compression jobs ongoing.
-                 */
-                DEBUGLOG(5, "ZSTDMT_tryGetInputRange failed");
-                assert(mtctx->doneJobID != mtctx->nextJobID);
-            } else
-                DEBUGLOG(5, "ZSTDMT_tryGetInputRange completed successfully : mtctx->inBuff.buffer.start = %p", mtctx->inBuff.buffer.start);
-        }
-        if (mtctx->inBuff.buffer.start != NULL) {
-            syncPoint_t const syncPoint = findSynchronizationPoint(mtctx, *input);
-            if (syncPoint.flush && endOp == ZSTD_e_continue) {
-                endOp = ZSTD_e_flush;
-            }
-            assert(mtctx->inBuff.buffer.capacity >= mtctx->targetSectionSize);
-            DEBUGLOG(5, "ZSTDMT_compressStream_generic: adding %u bytes on top of %u to buffer of size %u",
-                        (U32)syncPoint.toLoad, (U32)mtctx->inBuff.filled, (U32)mtctx->targetSectionSize);
-            memcpy((char*)mtctx->inBuff.buffer.start + mtctx->inBuff.filled, (const char*)input->src + input->pos, syncPoint.toLoad);
-            input->pos += syncPoint.toLoad;
-            mtctx->inBuff.filled += syncPoint.toLoad;
-            forwardInputProgress = syncPoint.toLoad>0;
-        }
-        if ((input->pos < input->size) && (endOp == ZSTD_e_end))
-            endOp = ZSTD_e_flush;   /* can't end now : not all input consumed */
-    }
-
-    if ( (mtctx->jobReady)
-      || (mtctx->inBuff.filled >= mtctx->targetSectionSize)  /* filled enough : let's compress */
-      || ((endOp != ZSTD_e_continue) && (mtctx->inBuff.filled > 0))  /* something to flush : let's go */
-      || ((endOp == ZSTD_e_end) && (!mtctx->frameEnded)) ) {   /* must finish the frame with a zero-size block */
-        size_t const jobSize = mtctx->inBuff.filled;
-        assert(mtctx->inBuff.filled <= mtctx->targetSectionSize);
-        FORWARD_IF_ERROR( ZSTDMT_createCompressionJob(mtctx, jobSize, endOp) );
-    }
-
-    /* check for potential compressed data ready to be flushed */
-    {   size_t const remainingToFlush = ZSTDMT_flushProduced(mtctx, output, !forwardInputProgress, endOp); /* block if there was no forward input progress */
-        if (input->pos < input->size) return MAX(remainingToFlush, 1);  /* input not consumed : do not end flush yet */
-        DEBUGLOG(5, "end of ZSTDMT_compressStream_generic: remainingToFlush = %u", (U32)remainingToFlush);
-        return remainingToFlush;
-    }
-}
-
-
-size_t ZSTDMT_compressStream(ZSTDMT_CCtx* mtctx, ZSTD_outBuffer* output, ZSTD_inBuffer* input)
-{
-    FORWARD_IF_ERROR( ZSTDMT_compressStream_generic(mtctx, output, input, ZSTD_e_continue) );
-
-    /* recommended next input size : fill current input buffer */
-    return mtctx->targetSectionSize - mtctx->inBuff.filled;   /* note : could be zero when input buffer is fully filled and no more availability to create new job */
-}
-
-
-static size_t ZSTDMT_flushStream_internal(ZSTDMT_CCtx* mtctx, ZSTD_outBuffer* output, ZSTD_EndDirective endFrame)
-{
-    size_t const srcSize = mtctx->inBuff.filled;
-    DEBUGLOG(5, "ZSTDMT_flushStream_internal");
-
-    if ( mtctx->jobReady     /* one job ready for a worker to pick up */
-      || (srcSize > 0)       /* still some data within input buffer */
-      || ((endFrame==ZSTD_e_end) && !mtctx->frameEnded)) {  /* need a last 0-size block to end frame */
-           DEBUGLOG(5, "ZSTDMT_flushStream_internal : create a new job (%u bytes, end:%u)",
-                        (U32)srcSize, (U32)endFrame);
-        FORWARD_IF_ERROR( ZSTDMT_createCompressionJob(mtctx, srcSize, endFrame) );
-    }
-
-    /* check if there is any data available to flush */
-    return ZSTDMT_flushProduced(mtctx, output, 1 /* blockToFlush */, endFrame);
-}
-
-
-size_t ZSTDMT_flushStream(ZSTDMT_CCtx* mtctx, ZSTD_outBuffer* output)
-{
-    DEBUGLOG(5, "ZSTDMT_flushStream");
-    if (mtctx->singleBlockingThread)
-        return ZSTD_flushStream(mtctx->cctxPool->cctx[0], output);
-    return ZSTDMT_flushStream_internal(mtctx, output, ZSTD_e_flush);
-}
-
-size_t ZSTDMT_endStream(ZSTDMT_CCtx* mtctx, ZSTD_outBuffer* output)
-{
-    DEBUGLOG(4, "ZSTDMT_endStream");
-    if (mtctx->singleBlockingThread)
-        return ZSTD_endStream(mtctx->cctxPool->cctx[0], output);
-    return ZSTDMT_flushStream_internal(mtctx, output, ZSTD_e_end);
-}
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/compress/zstdmt_compress.h mysql-8.0-8.0.27/extra/zstd/lib/compress/zstdmt_compress.h
--- mysql-8.0-8.0.26/extra/zstd/lib/compress/zstdmt_compress.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/compress/zstdmt_compress.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,192 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
- #ifndef ZSTDMT_COMPRESS_H
- #define ZSTDMT_COMPRESS_H
-
- #if defined (__cplusplus)
- extern "C" {
- #endif
-
-
-/* Note : This is an internal API.
- *        These APIs used to be exposed with ZSTDLIB_API,
- *        because it used to be the only way to invoke MT compression.
- *        Now, it's recommended to use ZSTD_compress2 and ZSTD_compressStream2()
- *        instead.
- *
- *        If you depend on these APIs and can't switch, then define
- *        ZSTD_LEGACY_MULTITHREADED_API when making the dynamic library.
- *        However, we may completely remove these functions in a future
- *        release, so please switch soon.
- *
- *        This API requires ZSTD_MULTITHREAD to be defined during compilation,
- *        otherwise ZSTDMT_createCCtx*() will fail.
- */
-
-#ifdef ZSTD_LEGACY_MULTITHREADED_API
-#  define ZSTDMT_API ZSTDLIB_API
-#else
-#  define ZSTDMT_API
-#endif
-
-/* ===   Dependencies   === */
-#include <stddef.h>                /* size_t */
-#define ZSTD_STATIC_LINKING_ONLY   /* ZSTD_parameters */
-#include "zstd.h"            /* ZSTD_inBuffer, ZSTD_outBuffer, ZSTDLIB_API */
-
-
-/* ===   Constants   === */
-#ifndef ZSTDMT_NBWORKERS_MAX
-#  define ZSTDMT_NBWORKERS_MAX 200
-#endif
-#ifndef ZSTDMT_JOBSIZE_MIN
-#  define ZSTDMT_JOBSIZE_MIN (1 MB)
-#endif
-#define ZSTDMT_JOBLOG_MAX   (MEM_32bits() ? 29 : 30)
-#define ZSTDMT_JOBSIZE_MAX  (MEM_32bits() ? (512 MB) : (1024 MB))
-
-
-/* ===   Memory management   === */
-typedef struct ZSTDMT_CCtx_s ZSTDMT_CCtx;
-/* Requires ZSTD_MULTITHREAD to be defined during compilation, otherwise it will return NULL. */
-ZSTDMT_API ZSTDMT_CCtx* ZSTDMT_createCCtx(unsigned nbWorkers);
-/* Requires ZSTD_MULTITHREAD to be defined during compilation, otherwise it will return NULL. */
-ZSTDMT_API ZSTDMT_CCtx* ZSTDMT_createCCtx_advanced(unsigned nbWorkers,
-                                                    ZSTD_customMem cMem);
-ZSTDMT_API size_t ZSTDMT_freeCCtx(ZSTDMT_CCtx* mtctx);
-
-ZSTDMT_API size_t ZSTDMT_sizeof_CCtx(ZSTDMT_CCtx* mtctx);
-
-
-/* ===   Simple one-pass compression function   === */
-
-ZSTDMT_API size_t ZSTDMT_compressCCtx(ZSTDMT_CCtx* mtctx,
-                                       void* dst, size_t dstCapacity,
-                                 const void* src, size_t srcSize,
-                                       int compressionLevel);
-
-
-
-/* ===   Streaming functions   === */
-
-ZSTDMT_API size_t ZSTDMT_initCStream(ZSTDMT_CCtx* mtctx, int compressionLevel);
-ZSTDMT_API size_t ZSTDMT_resetCStream(ZSTDMT_CCtx* mtctx, unsigned long long pledgedSrcSize);  /**< if srcSize is not known at reset time, use ZSTD_CONTENTSIZE_UNKNOWN. Note: for compatibility with older programs, 0 means the same as ZSTD_CONTENTSIZE_UNKNOWN, but it will change in the future to mean "empty" */
-
-ZSTDMT_API size_t ZSTDMT_nextInputSizeHint(const ZSTDMT_CCtx* mtctx);
-ZSTDMT_API size_t ZSTDMT_compressStream(ZSTDMT_CCtx* mtctx, ZSTD_outBuffer* output, ZSTD_inBuffer* input);
-
-ZSTDMT_API size_t ZSTDMT_flushStream(ZSTDMT_CCtx* mtctx, ZSTD_outBuffer* output);   /**< @return : 0 == all flushed; >0 : still some data to be flushed; or an error code (ZSTD_isError()) */
-ZSTDMT_API size_t ZSTDMT_endStream(ZSTDMT_CCtx* mtctx, ZSTD_outBuffer* output);     /**< @return : 0 == all flushed; >0 : still some data to be flushed; or an error code (ZSTD_isError()) */
-
-
-/* ===   Advanced functions and parameters  === */
-
-ZSTDMT_API size_t ZSTDMT_compress_advanced(ZSTDMT_CCtx* mtctx,
-                                          void* dst, size_t dstCapacity,
-                                    const void* src, size_t srcSize,
-                                    const ZSTD_CDict* cdict,
-                                          ZSTD_parameters params,
-                                          int overlapLog);
-
-ZSTDMT_API size_t ZSTDMT_initCStream_advanced(ZSTDMT_CCtx* mtctx,
-                                        const void* dict, size_t dictSize,   /* dict can be released after init, a local copy is preserved within zcs */
-                                        ZSTD_parameters params,
-                                        unsigned long long pledgedSrcSize);  /* pledgedSrcSize is optional and can be zero == unknown */
-
-ZSTDMT_API size_t ZSTDMT_initCStream_usingCDict(ZSTDMT_CCtx* mtctx,
-                                        const ZSTD_CDict* cdict,
-                                        ZSTD_frameParameters fparams,
-                                        unsigned long long pledgedSrcSize);  /* note : zero means empty */
-
-/* ZSTDMT_parameter :
- * List of parameters that can be set using ZSTDMT_setMTCtxParameter() */
-typedef enum {
-    ZSTDMT_p_jobSize,     /* Each job is compressed in parallel. By default, this value is dynamically determined depending on compression parameters. Can be set explicitly here. */
-    ZSTDMT_p_overlapLog,  /* Each job may reload a part of previous job to enhance compression ratio; 0 == no overlap, 6(default) == use 1/8th of window, >=9 == use full window. This is a "sticky" parameter : its value will be re-used on next compression job */
-    ZSTDMT_p_rsyncable    /* Enables rsyncable mode. */
-} ZSTDMT_parameter;
-
-/* ZSTDMT_setMTCtxParameter() :
- * allow setting individual parameters, one at a time, among a list of enums defined in ZSTDMT_parameter.
- * The function must be called typically after ZSTD_createCCtx() but __before ZSTDMT_init*() !__
- * Parameters not explicitly reset by ZSTDMT_init*() remain the same in consecutive compression sessions.
- * @return : 0, or an error code (which can be tested using ZSTD_isError()) */
-ZSTDMT_API size_t ZSTDMT_setMTCtxParameter(ZSTDMT_CCtx* mtctx, ZSTDMT_parameter parameter, int value);
-
-/* ZSTDMT_getMTCtxParameter() :
- * Query the ZSTDMT_CCtx for a parameter value.
- * @return : 0, or an error code (which can be tested using ZSTD_isError()) */
-ZSTDMT_API size_t ZSTDMT_getMTCtxParameter(ZSTDMT_CCtx* mtctx, ZSTDMT_parameter parameter, int* value);
-
-
-/*! ZSTDMT_compressStream_generic() :
- *  Combines ZSTDMT_compressStream() with optional ZSTDMT_flushStream() or ZSTDMT_endStream()
- *  depending on flush directive.
- * @return : minimum amount of data still to be flushed
- *           0 if fully flushed
- *           or an error code
- *  note : needs to be init using any ZSTD_initCStream*() variant */
-ZSTDMT_API size_t ZSTDMT_compressStream_generic(ZSTDMT_CCtx* mtctx,
-                                                ZSTD_outBuffer* output,
-                                                ZSTD_inBuffer* input,
-                                                ZSTD_EndDirective endOp);
-
-
-/* ========================================================
- * ===  Private interface, for use by ZSTD_compress.c   ===
- * ===  Not exposed in libzstd. Never invoke directly   ===
- * ======================================================== */
-
- /*! ZSTDMT_toFlushNow()
-  *  Tell how many bytes are ready to be flushed immediately.
-  *  Probe the oldest active job (not yet entirely flushed) and check its output buffer.
-  *  If return 0, it means there is no active job,
-  *  or, it means oldest job is still active, but everything produced has been flushed so far,
-  *  therefore flushing is limited by speed of oldest job. */
-size_t ZSTDMT_toFlushNow(ZSTDMT_CCtx* mtctx);
-
-/*! ZSTDMT_CCtxParam_setMTCtxParameter()
- *  like ZSTDMT_setMTCtxParameter(), but into a ZSTD_CCtx_Params */
-size_t ZSTDMT_CCtxParam_setMTCtxParameter(ZSTD_CCtx_params* params, ZSTDMT_parameter parameter, int value);
-
-/*! ZSTDMT_CCtxParam_setNbWorkers()
- *  Set nbWorkers, and clamp it.
- *  Also reset jobSize and overlapLog */
-size_t ZSTDMT_CCtxParam_setNbWorkers(ZSTD_CCtx_params* params, unsigned nbWorkers);
-
-/*! ZSTDMT_updateCParams_whileCompressing() :
- *  Updates only a selected set of compression parameters, to remain compatible with current frame.
- *  New parameters will be applied to next compression job. */
-void ZSTDMT_updateCParams_whileCompressing(ZSTDMT_CCtx* mtctx, const ZSTD_CCtx_params* cctxParams);
-
-/*! ZSTDMT_getFrameProgression():
- *  tells how much data has been consumed (input) and produced (output) for current frame.
- *  able to count progression inside worker threads.
- */
-ZSTD_frameProgression ZSTDMT_getFrameProgression(ZSTDMT_CCtx* mtctx);
-
-
-/*! ZSTDMT_initCStream_internal() :
- *  Private use only. Init streaming operation.
- *  expects params to be valid.
- *  must receive dict, or cdict, or none, but not both.
- *  @return : 0, or an error code */
-size_t ZSTDMT_initCStream_internal(ZSTDMT_CCtx* zcs,
-                    const void* dict, size_t dictSize, ZSTD_dictContentType_e dictContentType,
-                    const ZSTD_CDict* cdict,
-                    ZSTD_CCtx_params params, unsigned long long pledgedSrcSize);
-
-
-#if defined (__cplusplus)
-}
-#endif
-
-#endif   /* ZSTDMT_COMPRESS_H */
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/compress/zstd_opt.c mysql-8.0-8.0.27/extra/zstd/lib/compress/zstd_opt.c
--- mysql-8.0-8.0.26/extra/zstd/lib/compress/zstd_opt.c	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/compress/zstd_opt.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1249 +0,0 @@
-/*
- * Copyright (c) 2016-present, Przemyslaw Skibinski, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
-#include "zstd_compress_internal.h"
-#include "hist.h"
-#include "zstd_opt.h"
-
-#include "my_compiler.h"
-
-#define ZSTD_LITFREQ_ADD    2   /* scaling factor for litFreq, so that frequencies adapt faster to new stats */
-#define ZSTD_FREQ_DIV       4   /* log factor when using previous stats to init next stats */
-#define ZSTD_MAX_PRICE     (1<<30)
-
-#define ZSTD_PREDEF_THRESHOLD 1024   /* if srcSize < ZSTD_PREDEF_THRESHOLD, symbols' cost is assumed static, directly determined by pre-defined distributions */
-
-
-/*-*************************************
-*  Price functions for optimal parser
-***************************************/
-
-#if 0    /* approximation at bit level */
-#  define BITCOST_ACCURACY 0
-#  define BITCOST_MULTIPLIER (1 << BITCOST_ACCURACY)
-#  define WEIGHT(stat)  ((void)opt, ZSTD_bitWeight(stat))
-#elif 0  /* fractional bit accuracy */
-#  define BITCOST_ACCURACY 8
-#  define BITCOST_MULTIPLIER (1 << BITCOST_ACCURACY)
-#  define WEIGHT(stat,opt) ((void)opt, ZSTD_fracWeight(stat))
-#else    /* opt==approx, ultra==accurate */
-#  define BITCOST_ACCURACY 8
-#  define BITCOST_MULTIPLIER (1 << BITCOST_ACCURACY)
-#  define WEIGHT(stat,opt) (opt ? ZSTD_fracWeight(stat) : ZSTD_bitWeight(stat))
-#endif
-
-MEM_STATIC U32 ZSTD_bitWeight(U32 stat)
-{
-    return (ZSTD_highbit32(stat+1) * BITCOST_MULTIPLIER);
-}
-
-MEM_STATIC U32 ZSTD_fracWeight(U32 rawStat)
-{
-    U32 const stat = rawStat + 1;
-    U32 const hb = ZSTD_highbit32(stat);
-    U32 const BWeight = hb * BITCOST_MULTIPLIER;
-    U32 const FWeight = (stat << BITCOST_ACCURACY) >> hb;
-    U32 const weight = BWeight + FWeight;
-    assert(hb + BITCOST_ACCURACY < 31);
-    return weight;
-}
-
-#if (DEBUGLEVEL>=2)
-/* debugging function,
- * @return price in bytes as fractional value
- * for debug messages only */
-MEM_STATIC double ZSTD_fCost(U32 price)
-{
-    return (double)price / (BITCOST_MULTIPLIER*8);
-}
-#endif
-
-static int ZSTD_compressedLiterals(optState_t const* const optPtr)
-{
-    return optPtr->literalCompressionMode != ZSTD_lcm_uncompressed;
-}
-
-static void ZSTD_setBasePrices(optState_t* optPtr, int optLevel)
-{
-    if (ZSTD_compressedLiterals(optPtr))
-        optPtr->litSumBasePrice = WEIGHT(optPtr->litSum, optLevel);
-    optPtr->litLengthSumBasePrice = WEIGHT(optPtr->litLengthSum, optLevel);
-    optPtr->matchLengthSumBasePrice = WEIGHT(optPtr->matchLengthSum, optLevel);
-    optPtr->offCodeSumBasePrice = WEIGHT(optPtr->offCodeSum, optLevel);
-}
-
-
-/* ZSTD_downscaleStat() :
- * reduce all elements in table by a factor 2^(ZSTD_FREQ_DIV+malus)
- * return the resulting sum of elements */
-static U32 ZSTD_downscaleStat(unsigned* table, U32 lastEltIndex, int malus)
-{
-    U32 s, sum=0;
-    DEBUGLOG(5, "ZSTD_downscaleStat (nbElts=%u)", (unsigned)lastEltIndex+1);
-    assert(ZSTD_FREQ_DIV+malus > 0 && ZSTD_FREQ_DIV+malus < 31);
-    for (s=0; s<lastEltIndex+1; s++) {
-        table[s] = 1 + (table[s] >> (ZSTD_FREQ_DIV+malus));
-        sum += table[s];
-    }
-    return sum;
-}
-
-/* ZSTD_rescaleFreqs() :
- * if first block (detected by optPtr->litLengthSum == 0) : init statistics
- *    take hints from dictionary if there is one
- *    or init from zero, using src for literals stats, or flat 1 for match symbols
- * otherwise downscale existing stats, to be used as seed for next block.
- */
-static void
-ZSTD_rescaleFreqs(optState_t* const optPtr,
-            const BYTE* const src, size_t const srcSize,
-                  int const optLevel)
-{
-    int const compressedLiterals = ZSTD_compressedLiterals(optPtr);
-    DEBUGLOG(5, "ZSTD_rescaleFreqs (srcSize=%u)", (unsigned)srcSize);
-    optPtr->priceType = zop_dynamic;
-
-    if (optPtr->litLengthSum == 0) {  /* first block : init */
-        if (srcSize <= ZSTD_PREDEF_THRESHOLD) {  /* heuristic */
-            DEBUGLOG(5, "(srcSize <= ZSTD_PREDEF_THRESHOLD) => zop_predef");
-            optPtr->priceType = zop_predef;
-        }
-
-        assert(optPtr->symbolCosts != NULL);
-        if (optPtr->symbolCosts->huf.repeatMode == HUF_repeat_valid) {
-            /* huffman table presumed generated by dictionary */
-            optPtr->priceType = zop_dynamic;
-
-            if (compressedLiterals) {
-                unsigned lit;
-                assert(optPtr->litFreq != NULL);
-                optPtr->litSum = 0;
-                for (lit=0; lit<=MaxLit; lit++) {
-                    U32 const scaleLog = 11;   /* scale to 2K */
-                    U32 const bitCost = HUF_getNbBits(optPtr->symbolCosts->huf.CTable, lit);
-                    assert(bitCost <= scaleLog);
-                    optPtr->litFreq[lit] = bitCost ? 1 << (scaleLog-bitCost) : 1 /*minimum to calculate cost*/;
-                    optPtr->litSum += optPtr->litFreq[lit];
-            }   }
-
-            {   unsigned ll;
-                FSE_CState_t llstate;
-                FSE_initCState(&llstate, optPtr->symbolCosts->fse.litlengthCTable);
-                optPtr->litLengthSum = 0;
-                for (ll=0; ll<=MaxLL; ll++) {
-                    U32 const scaleLog = 10;   /* scale to 1K */
-                    U32 const bitCost = FSE_getMaxNbBits(llstate.symbolTT, ll);
-                    assert(bitCost < scaleLog);
-                    optPtr->litLengthFreq[ll] = bitCost ? 1 << (scaleLog-bitCost) : 1 /*minimum to calculate cost*/;
-                    optPtr->litLengthSum += optPtr->litLengthFreq[ll];
-            }   }
-
-            {   unsigned ml;
-                FSE_CState_t mlstate;
-                FSE_initCState(&mlstate, optPtr->symbolCosts->fse.matchlengthCTable);
-                optPtr->matchLengthSum = 0;
-                for (ml=0; ml<=MaxML; ml++) {
-                    U32 const scaleLog = 10;
-                    U32 const bitCost = FSE_getMaxNbBits(mlstate.symbolTT, ml);
-                    assert(bitCost < scaleLog);
-                    optPtr->matchLengthFreq[ml] = bitCost ? 1 << (scaleLog-bitCost) : 1 /*minimum to calculate cost*/;
-                    optPtr->matchLengthSum += optPtr->matchLengthFreq[ml];
-            }   }
-
-            {   unsigned of;
-                FSE_CState_t ofstate;
-                FSE_initCState(&ofstate, optPtr->symbolCosts->fse.offcodeCTable);
-                optPtr->offCodeSum = 0;
-                for (of=0; of<=MaxOff; of++) {
-                    U32 const scaleLog = 10;
-                    U32 const bitCost = FSE_getMaxNbBits(ofstate.symbolTT, of);
-                    assert(bitCost < scaleLog);
-                    optPtr->offCodeFreq[of] = bitCost ? 1 << (scaleLog-bitCost) : 1 /*minimum to calculate cost*/;
-                    optPtr->offCodeSum += optPtr->offCodeFreq[of];
-            }   }
-
-        } else {  /* not a dictionary */
-
-            assert(optPtr->litFreq != NULL);
-            if (compressedLiterals) {
-                unsigned lit = MaxLit;
-                HIST_count_simple(optPtr->litFreq, &lit, src, srcSize);   /* use raw first block to init statistics */
-                optPtr->litSum = ZSTD_downscaleStat(optPtr->litFreq, MaxLit, 1);
-            }
-
-            {   unsigned ll;
-                for (ll=0; ll<=MaxLL; ll++)
-                    optPtr->litLengthFreq[ll] = 1;
-            }
-            optPtr->litLengthSum = MaxLL+1;
-
-            {   unsigned ml;
-                for (ml=0; ml<=MaxML; ml++)
-                    optPtr->matchLengthFreq[ml] = 1;
-            }
-            optPtr->matchLengthSum = MaxML+1;
-
-            {   unsigned of;
-                for (of=0; of<=MaxOff; of++)
-                    optPtr->offCodeFreq[of] = 1;
-            }
-            optPtr->offCodeSum = MaxOff+1;
-
-        }
-
-    } else {   /* new block : re-use previous statistics, scaled down */
-
-        if (compressedLiterals)
-            optPtr->litSum = ZSTD_downscaleStat(optPtr->litFreq, MaxLit, 1);
-        optPtr->litLengthSum = ZSTD_downscaleStat(optPtr->litLengthFreq, MaxLL, 0);
-        optPtr->matchLengthSum = ZSTD_downscaleStat(optPtr->matchLengthFreq, MaxML, 0);
-        optPtr->offCodeSum = ZSTD_downscaleStat(optPtr->offCodeFreq, MaxOff, 0);
-    }
-
-    ZSTD_setBasePrices(optPtr, optLevel);
-}
-
-/* ZSTD_rawLiteralsCost() :
- * price of literals (only) in specified segment (which length can be 0).
- * does not include price of literalLength symbol */
-static U32 ZSTD_rawLiteralsCost(const BYTE* const literals, U32 const litLength,
-                                const optState_t* const optPtr,
-                                int optLevel)
-{
-    if (litLength == 0) return 0;
-
-    if (!ZSTD_compressedLiterals(optPtr))
-        return (litLength << 3) * BITCOST_MULTIPLIER;  /* Uncompressed - 8 bytes per literal. */
-
-    if (optPtr->priceType == zop_predef)
-        return (litLength*6) * BITCOST_MULTIPLIER;  /* 6 bit per literal - no statistic used */
-
-    /* dynamic statistics */
-    {   U32 price = litLength * optPtr->litSumBasePrice;
-        U32 u;
-        for (u=0; u < litLength; u++) {
-            assert(WEIGHT(optPtr->litFreq[literals[u]], optLevel) <= optPtr->litSumBasePrice);   /* literal cost should never be negative */
-            price -= WEIGHT(optPtr->litFreq[literals[u]], optLevel);
-        }
-        return price;
-    }
-}
-
-/* ZSTD_litLengthPrice() :
- * cost of literalLength symbol */
-static U32 ZSTD_litLengthPrice(U32 const litLength, const optState_t* const optPtr, int optLevel)
-{
-    if (optPtr->priceType == zop_predef) return WEIGHT(litLength, optLevel);
-
-    /* dynamic statistics */
-    {   U32 const llCode = ZSTD_LLcode(litLength);
-        return (LL_bits[llCode] * BITCOST_MULTIPLIER)
-             + optPtr->litLengthSumBasePrice
-             - WEIGHT(optPtr->litLengthFreq[llCode], optLevel);
-    }
-}
-
-/* ZSTD_litLengthContribution() :
- * @return ( cost(litlength) - cost(0) )
- * this value can then be added to rawLiteralsCost()
- * to provide a cost which is directly comparable to a match ending at same position */
-static int ZSTD_litLengthContribution(U32 const litLength, const optState_t* const optPtr, int optLevel)
-{
-    if (optPtr->priceType >= zop_predef) return (int)WEIGHT(litLength, optLevel);
-
-    /* dynamic statistics */
-    {   U32 const llCode = ZSTD_LLcode(litLength);
-        int const contribution = (int)(LL_bits[llCode] * BITCOST_MULTIPLIER)
-                               + (int)WEIGHT(optPtr->litLengthFreq[0], optLevel)   /* note: log2litLengthSum cancel out */
-                               - (int)WEIGHT(optPtr->litLengthFreq[llCode], optLevel);
-#if 1
-        return contribution;
-#else
-        return MAX(0, contribution); /* sometimes better, sometimes not ... */
-#endif
-    }
-}
-
-/* ZSTD_literalsContribution() :
- * creates a fake cost for the literals part of a sequence
- * which can be compared to the ending cost of a match
- * should a new match start at this position */
-static int ZSTD_literalsContribution(const BYTE* const literals, U32 const litLength,
-                                     const optState_t* const optPtr,
-                                     int optLevel)
-{
-    int const contribution = (int)ZSTD_rawLiteralsCost(literals, litLength, optPtr, optLevel)
-                           + ZSTD_litLengthContribution(litLength, optPtr, optLevel);
-    return contribution;
-}
-
-/* ZSTD_getMatchPrice() :
- * Provides the cost of the match part (offset + matchLength) of a sequence
- * Must be combined with ZSTD_fullLiteralsCost() to get the full cost of a sequence.
- * optLevel: when <2, favors small offset for decompression speed (improved cache efficiency) */
-FORCE_INLINE_TEMPLATE U32
-ZSTD_getMatchPrice(U32 const offset,
-                   U32 const matchLength,
-             const optState_t* const optPtr,
-                   int const optLevel)
-{
-    U32 price;
-    U32 const offCode = ZSTD_highbit32(offset+1);
-    U32 const mlBase = matchLength - MINMATCH;
-    assert(matchLength >= MINMATCH);
-
-    if (optPtr->priceType == zop_predef)  /* fixed scheme, do not use statistics */
-        return WEIGHT(mlBase, optLevel) + ((16 + offCode) * BITCOST_MULTIPLIER);
-
-    /* dynamic statistics */
-    price = (offCode * BITCOST_MULTIPLIER) + (optPtr->offCodeSumBasePrice - WEIGHT(optPtr->offCodeFreq[offCode], optLevel));
-    if ((optLevel<2) /*static*/ && offCode >= 20)
-        price += (offCode-19)*2 * BITCOST_MULTIPLIER; /* handicap for long distance offsets, favor decompression speed */
-
-    /* match Length */
-    {   U32 const mlCode = ZSTD_MLcode(mlBase);
-        price += (ML_bits[mlCode] * BITCOST_MULTIPLIER) + (optPtr->matchLengthSumBasePrice - WEIGHT(optPtr->matchLengthFreq[mlCode], optLevel));
-    }
-
-    price += BITCOST_MULTIPLIER / 5;   /* heuristic : make matches a bit more costly to favor less sequences -> faster decompression speed */
-
-    DEBUGLOG(8, "ZSTD_getMatchPrice(ml:%u) = %u", matchLength, price);
-    return price;
-}
-
-/* ZSTD_updateStats() :
- * assumption : literals + litLengtn <= iend */
-static void ZSTD_updateStats(optState_t* const optPtr,
-                             U32 litLength, const BYTE* literals,
-                             U32 offsetCode, U32 matchLength)
-{
-    /* literals */
-    if (ZSTD_compressedLiterals(optPtr)) {
-        U32 u;
-        for (u=0; u < litLength; u++)
-            optPtr->litFreq[literals[u]] += ZSTD_LITFREQ_ADD;
-        optPtr->litSum += litLength*ZSTD_LITFREQ_ADD;
-    }
-
-    /* literal Length */
-    {   U32 const llCode = ZSTD_LLcode(litLength);
-        optPtr->litLengthFreq[llCode]++;
-        optPtr->litLengthSum++;
-    }
-
-    /* match offset code (0-2=>repCode; 3+=>offset+2) */
-    {   U32 const offCode = ZSTD_highbit32(offsetCode+1);
-        assert(offCode <= MaxOff);
-        optPtr->offCodeFreq[offCode]++;
-        optPtr->offCodeSum++;
-    }
-
-    /* match Length */
-    {   U32 const mlBase = matchLength - MINMATCH;
-        U32 const mlCode = ZSTD_MLcode(mlBase);
-        optPtr->matchLengthFreq[mlCode]++;
-        optPtr->matchLengthSum++;
-    }
-}
-
-
-/* ZSTD_readMINMATCH() :
- * function safe only for comparisons
- * assumption : memPtr must be at least 4 bytes before end of buffer */
-MEM_STATIC U32 ZSTD_readMINMATCH(const void* memPtr, U32 length)
-{
-    switch (length)
-    {
-    default :
-    case 4 : return MEM_read32(memPtr);
-    case 3 : if (MEM_isLittleEndian())
-                return MEM_read32(memPtr)<<8;
-             else
-                return MEM_read32(memPtr)>>8;
-    }
-}
-
-
-/* Update hashTable3 up to ip (excluded)
-   Assumption : always within prefix (i.e. not within extDict) */
-static U32 ZSTD_insertAndFindFirstIndexHash3 (ZSTD_matchState_t* ms,
-                                              U32* nextToUpdate3,
-                                              const BYTE* const ip)
-{
-    U32* const hashTable3 = ms->hashTable3;
-    U32 const hashLog3 = ms->hashLog3;
-    const BYTE* const base = ms->window.base;
-    U32 idx = *nextToUpdate3;
-    U32 const target = (U32)(ip - base);
-    size_t const hash3 = ZSTD_hash3Ptr(ip, hashLog3);
-    assert(hashLog3 > 0);
-
-    while(idx < target) {
-        hashTable3[ZSTD_hash3Ptr(base+idx, hashLog3)] = idx;
-        idx++;
-    }
-
-    *nextToUpdate3 = target;
-    return hashTable3[hash3];
-}
-
-
-/*-*************************************
-*  Binary Tree search
-***************************************/
-/** ZSTD_insertBt1() : add one or multiple positions to tree.
- *  ip : assumed <= iend-8 .
- * @return : nb of positions added */
-static U32 ZSTD_insertBt1(
-                ZSTD_matchState_t* ms,
-                const BYTE* const ip, const BYTE* const iend,
-                U32 const mls, const int extDict)
-SUPPRESS_UBSAN_CLANG10
-{
-    const ZSTD_compressionParameters* const cParams = &ms->cParams;
-    U32*   const hashTable = ms->hashTable;
-    U32    const hashLog = cParams->hashLog;
-    size_t const h  = ZSTD_hashPtr(ip, hashLog, mls);
-    U32*   const bt = ms->chainTable;
-    U32    const btLog  = cParams->chainLog - 1;
-    U32    const btMask = (1 << btLog) - 1;
-    U32 matchIndex = hashTable[h];
-    size_t commonLengthSmaller=0, commonLengthLarger=0;
-    const BYTE* const base = ms->window.base;
-    const BYTE* const dictBase = ms->window.dictBase;
-    const U32 dictLimit = ms->window.dictLimit;
-    const BYTE* const dictEnd = dictBase + dictLimit;
-    const BYTE* const prefixStart = base + dictLimit;
-    const BYTE* match;
-    const U32 current = (U32)(ip-base);
-    const U32 btLow = btMask >= current ? 0 : current - btMask;
-    U32* smallerPtr = bt + 2*(current&btMask);
-    U32* largerPtr  = smallerPtr + 1;
-    U32 dummy32;   /* to be nullified at the end */
-    U32 const windowLow = ms->window.lowLimit;
-    U32 matchEndIdx = current+8+1;
-    size_t bestLength = 8;
-    U32 nbCompares = 1U << cParams->searchLog;
-#ifdef ZSTD_C_PREDICT
-    U32 predictedSmall = *(bt + 2*((current-1)&btMask) + 0);
-    U32 predictedLarge = *(bt + 2*((current-1)&btMask) + 1);
-    predictedSmall += (predictedSmall>0);
-    predictedLarge += (predictedLarge>0);
-#endif /* ZSTD_C_PREDICT */
-
-    DEBUGLOG(8, "ZSTD_insertBt1 (%u)", current);
-
-    assert(ip <= iend-8);   /* required for h calculation */
-    hashTable[h] = current;   /* Update Hash Table */
-
-    assert(windowLow > 0);
-    while (nbCompares-- && (matchIndex >= windowLow)) {
-        U32* const nextPtr = bt + 2*(matchIndex & btMask);
-        size_t matchLength = MIN(commonLengthSmaller, commonLengthLarger);   /* guaranteed minimum nb of common bytes */
-        assert(matchIndex < current);
-
-#ifdef ZSTD_C_PREDICT   /* note : can create issues when hlog small <= 11 */
-        const U32* predictPtr = bt + 2*((matchIndex-1) & btMask);   /* written this way, as bt is a roll buffer */
-        if (matchIndex == predictedSmall) {
-            /* no need to check length, result known */
-            *smallerPtr = matchIndex;
-            if (matchIndex <= btLow) { smallerPtr=&dummy32; break; }   /* beyond tree size, stop the search */
-            smallerPtr = nextPtr+1;               /* new "smaller" => larger of match */
-            matchIndex = nextPtr[1];              /* new matchIndex larger than previous (closer to current) */
-            predictedSmall = predictPtr[1] + (predictPtr[1]>0);
-            continue;
-        }
-        if (matchIndex == predictedLarge) {
-            *largerPtr = matchIndex;
-            if (matchIndex <= btLow) { largerPtr=&dummy32; break; }   /* beyond tree size, stop the search */
-            largerPtr = nextPtr;
-            matchIndex = nextPtr[0];
-            predictedLarge = predictPtr[0] + (predictPtr[0]>0);
-            continue;
-        }
-#endif
-
-        if (!extDict || (matchIndex+matchLength >= dictLimit)) {
-            assert(matchIndex+matchLength >= dictLimit);   /* might be wrong if actually extDict */
-            match = base + matchIndex;
-            matchLength += ZSTD_count(ip+matchLength, match+matchLength, iend);
-        } else {
-            match = dictBase + matchIndex;
-            matchLength += ZSTD_count_2segments(ip+matchLength, match+matchLength, iend, dictEnd, prefixStart);
-            if (matchIndex+matchLength >= dictLimit)
-                match = base + matchIndex;   /* to prepare for next usage of match[matchLength] */
-        }
-
-        if (matchLength > bestLength) {
-            bestLength = matchLength;
-            if (matchLength > matchEndIdx - matchIndex)
-                matchEndIdx = matchIndex + (U32)matchLength;
-        }
-
-        if (ip+matchLength == iend) {   /* equal : no way to know if inf or sup */
-            break;   /* drop , to guarantee consistency ; miss a bit of compression, but other solutions can corrupt tree */
-        }
-
-        if (match[matchLength] < ip[matchLength]) {  /* necessarily within buffer */
-            /* match is smaller than current */
-            *smallerPtr = matchIndex;             /* update smaller idx */
-            commonLengthSmaller = matchLength;    /* all smaller will now have at least this guaranteed common length */
-            if (matchIndex <= btLow) { smallerPtr=&dummy32; break; }   /* beyond tree size, stop searching */
-            smallerPtr = nextPtr+1;               /* new "candidate" => larger than match, which was smaller than target */
-            matchIndex = nextPtr[1];              /* new matchIndex, larger than previous and closer to current */
-        } else {
-            /* match is larger than current */
-            *largerPtr = matchIndex;
-            commonLengthLarger = matchLength;
-            if (matchIndex <= btLow) { largerPtr=&dummy32; break; }   /* beyond tree size, stop searching */
-            largerPtr = nextPtr;
-            matchIndex = nextPtr[0];
-    }   }
-
-    *smallerPtr = *largerPtr = 0;
-    {   U32 positions = 0;
-        if (bestLength > 384) positions = MIN(192, (U32)(bestLength - 384));   /* speed optimization */
-        assert(matchEndIdx > current + 8);
-        return MAX(positions, matchEndIdx - (current + 8));
-    }
-}
-
-FORCE_INLINE_TEMPLATE
-void ZSTD_updateTree_internal(
-                ZSTD_matchState_t* ms,
-                const BYTE* const ip, const BYTE* const iend,
-                const U32 mls, const ZSTD_dictMode_e dictMode)
-{
-    const BYTE* const base = ms->window.base;
-    U32 const target = (U32)(ip - base);
-    U32 idx = ms->nextToUpdate;
-    DEBUGLOG(6, "ZSTD_updateTree_internal, from %u to %u  (dictMode:%u)",
-                idx, target, dictMode);
-
-    while(idx < target) {
-        U32 const forward = ZSTD_insertBt1(ms, base+idx, iend, mls, dictMode == ZSTD_extDict);
-        assert(idx < (U32)(idx + forward));
-        idx += forward;
-    }
-    assert((size_t)(ip - base) <= (size_t)(U32)(-1));
-    assert((size_t)(iend - base) <= (size_t)(U32)(-1));
-    ms->nextToUpdate = target;
-}
-
-void ZSTD_updateTree(ZSTD_matchState_t* ms, const BYTE* ip, const BYTE* iend) {
-    ZSTD_updateTree_internal(ms, ip, iend, ms->cParams.minMatch, ZSTD_noDict);
-}
-
-FORCE_INLINE_TEMPLATE
-U32 ZSTD_insertBtAndGetAllMatches (
-                    ZSTD_match_t* matches,   /* store result (found matches) in this table (presumed large enough) */
-                    ZSTD_matchState_t* ms,
-                    U32* nextToUpdate3,
-                    const BYTE* const ip, const BYTE* const iLimit, const ZSTD_dictMode_e dictMode,
-                    const U32 rep[ZSTD_REP_NUM],
-                    U32 const ll0,   /* tells if associated literal length is 0 or not. This value must be 0 or 1 */
-                    const U32 lengthToBeat,
-                    U32 const mls /* template */)
-SUPPRESS_UBSAN_CLANG10
-{
-    const ZSTD_compressionParameters* const cParams = &ms->cParams;
-    U32 const sufficient_len = MIN(cParams->targetLength, ZSTD_OPT_NUM -1);
-    const BYTE* const base = ms->window.base;
-    U32 const current = (U32)(ip-base);
-    U32 const hashLog = cParams->hashLog;
-    U32 const minMatch = (mls==3) ? 3 : 4;
-    U32* const hashTable = ms->hashTable;
-    size_t const h  = ZSTD_hashPtr(ip, hashLog, mls);
-    U32 matchIndex  = hashTable[h];
-    U32* const bt   = ms->chainTable;
-    U32 const btLog = cParams->chainLog - 1;
-    U32 const btMask= (1U << btLog) - 1;
-    size_t commonLengthSmaller=0, commonLengthLarger=0;
-    const BYTE* const dictBase = ms->window.dictBase;
-    U32 const dictLimit = ms->window.dictLimit;
-    const BYTE* const dictEnd = dictBase + dictLimit;
-    const BYTE* const prefixStart = base + dictLimit;
-    U32 const btLow = (btMask >= current) ? 0 : current - btMask;
-    U32 const windowLow = ZSTD_getLowestMatchIndex(ms, current, cParams->windowLog);
-    U32 const matchLow = windowLow ? windowLow : 1;
-    U32* smallerPtr = bt + 2*(current&btMask);
-    U32* largerPtr  = bt + 2*(current&btMask) + 1;
-    U32 matchEndIdx = current+8+1;   /* farthest referenced position of any match => detects repetitive patterns */
-    U32 dummy32;   /* to be nullified at the end */
-    U32 mnum = 0;
-    U32 nbCompares = 1U << cParams->searchLog;
-
-    const ZSTD_matchState_t* dms    = dictMode == ZSTD_dictMatchState ? ms->dictMatchState : NULL;
-    const ZSTD_compressionParameters* const dmsCParams =
-                                      dictMode == ZSTD_dictMatchState ? &dms->cParams : NULL;
-    const BYTE* const dmsBase       = dictMode == ZSTD_dictMatchState ? dms->window.base : NULL;
-    const BYTE* const dmsEnd        = dictMode == ZSTD_dictMatchState ? dms->window.nextSrc : NULL;
-    U32         const dmsHighLimit  = dictMode == ZSTD_dictMatchState ? (U32)(dmsEnd - dmsBase) : 0;
-    U32         const dmsLowLimit   = dictMode == ZSTD_dictMatchState ? dms->window.lowLimit : 0;
-    U32         const dmsIndexDelta = dictMode == ZSTD_dictMatchState ? windowLow - dmsHighLimit : 0;
-    U32         const dmsHashLog    = dictMode == ZSTD_dictMatchState ? dmsCParams->hashLog : hashLog;
-    U32         const dmsBtLog      = dictMode == ZSTD_dictMatchState ? dmsCParams->chainLog - 1 : btLog;
-    U32         const dmsBtMask     = dictMode == ZSTD_dictMatchState ? (1U << dmsBtLog) - 1 : 0;
-    U32         const dmsBtLow      = dictMode == ZSTD_dictMatchState && dmsBtMask < dmsHighLimit - dmsLowLimit ? dmsHighLimit - dmsBtMask : dmsLowLimit;
-
-    size_t bestLength = lengthToBeat-1;
-    DEBUGLOG(8, "ZSTD_insertBtAndGetAllMatches: current=%u", current);
-
-    /* check repCode */
-    assert(ll0 <= 1);   /* necessarily 1 or 0 */
-    {   U32 const lastR = ZSTD_REP_NUM + ll0;
-        U32 repCode;
-        for (repCode = ll0; repCode < lastR; repCode++) {
-            U32 const repOffset = (repCode==ZSTD_REP_NUM) ? (rep[0] - 1) : rep[repCode];
-            U32 const repIndex = current - repOffset;
-            U32 repLen = 0;
-            assert(current >= dictLimit);
-            if (repOffset-1 /* intentional overflow, discards 0 and -1 */ < current-dictLimit) {  /* equivalent to `current > repIndex >= dictLimit` */
-                if (ZSTD_readMINMATCH(ip, minMatch) == ZSTD_readMINMATCH(ip - repOffset, minMatch)) {
-                    repLen = (U32)ZSTD_count(ip+minMatch, ip+minMatch-repOffset, iLimit) + minMatch;
-                }
-            } else {  /* repIndex < dictLimit || repIndex >= current */
-                const BYTE* const repMatch = dictMode == ZSTD_dictMatchState ?
-                                             dmsBase + repIndex - dmsIndexDelta :
-                                             dictBase + repIndex;
-                assert(current >= windowLow);
-                if ( dictMode == ZSTD_extDict
-                  && ( ((repOffset-1) /*intentional overflow*/ < current - windowLow)  /* equivalent to `current > repIndex >= windowLow` */
-                     & (((U32)((dictLimit-1) - repIndex) >= 3) ) /* intentional overflow : do not test positions overlapping 2 memory segments */)
-                  && (ZSTD_readMINMATCH(ip, minMatch) == ZSTD_readMINMATCH(repMatch, minMatch)) ) {
-                    repLen = (U32)ZSTD_count_2segments(ip+minMatch, repMatch+minMatch, iLimit, dictEnd, prefixStart) + minMatch;
-                }
-                if (dictMode == ZSTD_dictMatchState
-                  && ( ((repOffset-1) /*intentional overflow*/ < current - (dmsLowLimit + dmsIndexDelta))  /* equivalent to `current > repIndex >= dmsLowLimit` */
-                     & ((U32)((dictLimit-1) - repIndex) >= 3) ) /* intentional overflow : do not test positions overlapping 2 memory segments */
-                  && (ZSTD_readMINMATCH(ip, minMatch) == ZSTD_readMINMATCH(repMatch, minMatch)) ) {
-                    repLen = (U32)ZSTD_count_2segments(ip+minMatch, repMatch+minMatch, iLimit, dmsEnd, prefixStart) + minMatch;
-            }   }
-            /* save longer solution */
-            if (repLen > bestLength) {
-                DEBUGLOG(8, "found repCode %u (ll0:%u, offset:%u) of length %u",
-                            repCode, ll0, repOffset, repLen);
-                bestLength = repLen;
-                matches[mnum].off = repCode - ll0;
-                matches[mnum].len = (U32)repLen;
-                mnum++;
-                if ( (repLen > sufficient_len)
-                   | (ip+repLen == iLimit) ) {  /* best possible */
-                    return mnum;
-    }   }   }   }
-
-    /* HC3 match finder */
-    if ((mls == 3) /*static*/ && (bestLength < mls)) {
-        U32 const matchIndex3 = ZSTD_insertAndFindFirstIndexHash3(ms, nextToUpdate3, ip);
-        if ((matchIndex3 >= matchLow)
-          & (current - matchIndex3 < (1<<18)) /*heuristic : longer distance likely too expensive*/ ) {
-            size_t mlen;
-            if ((dictMode == ZSTD_noDict) /*static*/ || (dictMode == ZSTD_dictMatchState) /*static*/ || (matchIndex3 >= dictLimit)) {
-                const BYTE* const match = base + matchIndex3;
-                mlen = ZSTD_count(ip, match, iLimit);
-            } else {
-                const BYTE* const match = dictBase + matchIndex3;
-                mlen = ZSTD_count_2segments(ip, match, iLimit, dictEnd, prefixStart);
-            }
-
-            /* save best solution */
-            if (mlen >= mls /* == 3 > bestLength */) {
-                DEBUGLOG(8, "found small match with hlog3, of length %u",
-                            (U32)mlen);
-                bestLength = mlen;
-                assert(current > matchIndex3);
-                assert(mnum==0);  /* no prior solution */
-                matches[0].off = (current - matchIndex3) + ZSTD_REP_MOVE;
-                matches[0].len = (U32)mlen;
-                mnum = 1;
-                if ( (mlen > sufficient_len) |
-                     (ip+mlen == iLimit) ) {  /* best possible length */
-                    ms->nextToUpdate = current+1;  /* skip insertion */
-                    return 1;
-        }   }   }
-        /* no dictMatchState lookup: dicts don't have a populated HC3 table */
-    }
-
-    hashTable[h] = current;   /* Update Hash Table */
-
-    while (nbCompares-- && (matchIndex >= matchLow)) {
-        U32* const nextPtr = bt + 2*(matchIndex & btMask);
-        const BYTE* match;
-        size_t matchLength = MIN(commonLengthSmaller, commonLengthLarger);   /* guaranteed minimum nb of common bytes */
-        assert(current > matchIndex);
-
-        if ((dictMode == ZSTD_noDict) || (dictMode == ZSTD_dictMatchState) || (matchIndex+matchLength >= dictLimit)) {
-            assert(matchIndex+matchLength >= dictLimit);  /* ensure the condition is correct when !extDict */
-            match = base + matchIndex;
-            if (matchIndex >= dictLimit) assert(memcmp(match, ip, matchLength) == 0);  /* ensure early section of match is equal as expected */
-            matchLength += ZSTD_count(ip+matchLength, match+matchLength, iLimit);
-        } else {
-            match = dictBase + matchIndex;
-            assert(memcmp(match, ip, matchLength) == 0);  /* ensure early section of match is equal as expected */
-            matchLength += ZSTD_count_2segments(ip+matchLength, match+matchLength, iLimit, dictEnd, prefixStart);
-            if (matchIndex+matchLength >= dictLimit)
-                match = base + matchIndex;   /* prepare for match[matchLength] read */
-        }
-
-        if (matchLength > bestLength) {
-            DEBUGLOG(8, "found match of length %u at distance %u (offCode=%u)",
-                    (U32)matchLength, current - matchIndex, current - matchIndex + ZSTD_REP_MOVE);
-            assert(matchEndIdx > matchIndex);
-            if (matchLength > matchEndIdx - matchIndex)
-                matchEndIdx = matchIndex + (U32)matchLength;
-            bestLength = matchLength;
-            matches[mnum].off = (current - matchIndex) + ZSTD_REP_MOVE;
-            matches[mnum].len = (U32)matchLength;
-            mnum++;
-            if ( (matchLength > ZSTD_OPT_NUM)
-               | (ip+matchLength == iLimit) /* equal : no way to know if inf or sup */) {
-                if (dictMode == ZSTD_dictMatchState) nbCompares = 0; /* break should also skip searching dms */
-                break; /* drop, to preserve bt consistency (miss a little bit of compression) */
-            }
-        }
-
-        if (match[matchLength] < ip[matchLength]) {
-            /* match smaller than current */
-            *smallerPtr = matchIndex;             /* update smaller idx */
-            commonLengthSmaller = matchLength;    /* all smaller will now have at least this guaranteed common length */
-            if (matchIndex <= btLow) { smallerPtr=&dummy32; break; }   /* beyond tree size, stop the search */
-            smallerPtr = nextPtr+1;               /* new candidate => larger than match, which was smaller than current */
-            matchIndex = nextPtr[1];              /* new matchIndex, larger than previous, closer to current */
-        } else {
-            *largerPtr = matchIndex;
-            commonLengthLarger = matchLength;
-            if (matchIndex <= btLow) { largerPtr=&dummy32; break; }   /* beyond tree size, stop the search */
-            largerPtr = nextPtr;
-            matchIndex = nextPtr[0];
-    }   }
-
-    *smallerPtr = *largerPtr = 0;
-
-    if (dictMode == ZSTD_dictMatchState && nbCompares) {
-        size_t const dmsH = ZSTD_hashPtr(ip, dmsHashLog, mls);
-        U32 dictMatchIndex = dms->hashTable[dmsH];
-        const U32* const dmsBt = dms->chainTable;
-        commonLengthSmaller = commonLengthLarger = 0;
-        while (nbCompares-- && (dictMatchIndex > dmsLowLimit)) {
-            const U32* const nextPtr = dmsBt + 2*(dictMatchIndex & dmsBtMask);
-            size_t matchLength = MIN(commonLengthSmaller, commonLengthLarger);   /* guaranteed minimum nb of common bytes */
-            const BYTE* match = dmsBase + dictMatchIndex;
-            matchLength += ZSTD_count_2segments(ip+matchLength, match+matchLength, iLimit, dmsEnd, prefixStart);
-            if (dictMatchIndex+matchLength >= dmsHighLimit)
-                match = base + dictMatchIndex + dmsIndexDelta;   /* to prepare for next usage of match[matchLength] */
-
-            if (matchLength > bestLength) {
-                matchIndex = dictMatchIndex + dmsIndexDelta;
-                DEBUGLOG(8, "found dms match of length %u at distance %u (offCode=%u)",
-                        (U32)matchLength, current - matchIndex, current - matchIndex + ZSTD_REP_MOVE);
-                if (matchLength > matchEndIdx - matchIndex)
-                    matchEndIdx = matchIndex + (U32)matchLength;
-                bestLength = matchLength;
-                matches[mnum].off = (current - matchIndex) + ZSTD_REP_MOVE;
-                matches[mnum].len = (U32)matchLength;
-                mnum++;
-                if ( (matchLength > ZSTD_OPT_NUM)
-                   | (ip+matchLength == iLimit) /* equal : no way to know if inf or sup */) {
-                    break;   /* drop, to guarantee consistency (miss a little bit of compression) */
-                }
-            }
-
-            if (dictMatchIndex <= dmsBtLow) { break; }   /* beyond tree size, stop the search */
-            if (match[matchLength] < ip[matchLength]) {
-                commonLengthSmaller = matchLength;    /* all smaller will now have at least this guaranteed common length */
-                dictMatchIndex = nextPtr[1];              /* new matchIndex larger than previous (closer to current) */
-            } else {
-                /* match is larger than current */
-                commonLengthLarger = matchLength;
-                dictMatchIndex = nextPtr[0];
-            }
-        }
-    }
-
-    assert(matchEndIdx > current+8);
-    ms->nextToUpdate = matchEndIdx - 8;  /* skip repetitive patterns */
-    return mnum;
-}
-
-
-FORCE_INLINE_TEMPLATE U32 ZSTD_BtGetAllMatches (
-                        ZSTD_match_t* matches,   /* store result (match found, increasing size) in this table */
-                        ZSTD_matchState_t* ms,
-                        U32* nextToUpdate3,
-                        const BYTE* ip, const BYTE* const iHighLimit, const ZSTD_dictMode_e dictMode,
-                        const U32 rep[ZSTD_REP_NUM],
-                        U32 const ll0,
-                        U32 const lengthToBeat)
-{
-    const ZSTD_compressionParameters* const cParams = &ms->cParams;
-    U32 const matchLengthSearch = cParams->minMatch;
-    DEBUGLOG(8, "ZSTD_BtGetAllMatches");
-    if (ip < ms->window.base + ms->nextToUpdate) return 0;   /* skipped area */
-    ZSTD_updateTree_internal(ms, ip, iHighLimit, matchLengthSearch, dictMode);
-    switch(matchLengthSearch)
-    {
-    case 3 : return ZSTD_insertBtAndGetAllMatches(matches, ms, nextToUpdate3, ip, iHighLimit, dictMode, rep, ll0, lengthToBeat, 3);
-    default :
-    case 4 : return ZSTD_insertBtAndGetAllMatches(matches, ms, nextToUpdate3, ip, iHighLimit, dictMode, rep, ll0, lengthToBeat, 4);
-    case 5 : return ZSTD_insertBtAndGetAllMatches(matches, ms, nextToUpdate3, ip, iHighLimit, dictMode, rep, ll0, lengthToBeat, 5);
-    case 7 :
-    case 6 : return ZSTD_insertBtAndGetAllMatches(matches, ms, nextToUpdate3, ip, iHighLimit, dictMode, rep, ll0, lengthToBeat, 6);
-    }
-}
-
-
-/*-*******************************
-*  Optimal parser
-*********************************/
-typedef struct repcodes_s {
-    U32 rep[3];
-} repcodes_t;
-
-static repcodes_t ZSTD_updateRep(U32 const rep[3], U32 const offset, U32 const ll0)
-{
-    repcodes_t newReps;
-    if (offset >= ZSTD_REP_NUM) {  /* full offset */
-        newReps.rep[2] = rep[1];
-        newReps.rep[1] = rep[0];
-        newReps.rep[0] = offset - ZSTD_REP_MOVE;
-    } else {   /* repcode */
-        U32 const repCode = offset + ll0;
-        if (repCode > 0) {  /* note : if repCode==0, no change */
-            U32 const currentOffset = (repCode==ZSTD_REP_NUM) ? (rep[0] - 1) : rep[repCode];
-            newReps.rep[2] = (repCode >= 2) ? rep[1] : rep[2];
-            newReps.rep[1] = rep[0];
-            newReps.rep[0] = currentOffset;
-        } else {   /* repCode == 0 */
-            memcpy(&newReps, rep, sizeof(newReps));
-        }
-    }
-    return newReps;
-}
-
-
-static U32 ZSTD_totalLen(ZSTD_optimal_t sol)
-{
-    return sol.litlen + sol.mlen;
-}
-
-#if 0 /* debug */
-
-static void
-listStats(const U32* table, int lastEltID)
-{
-    int const nbElts = lastEltID + 1;
-    int enb;
-    for (enb=0; enb < nbElts; enb++) {
-        (void)table;
-        //RAWLOG(2, "%3i:%3i,  ", enb, table[enb]);
-        RAWLOG(2, "%4i,", table[enb]);
-    }
-    RAWLOG(2, " \n");
-}
-
-#endif
-
-FORCE_INLINE_TEMPLATE size_t
-ZSTD_compressBlock_opt_generic(ZSTD_matchState_t* ms,
-                               seqStore_t* seqStore,
-                               U32 rep[ZSTD_REP_NUM],
-                         const void* src, size_t srcSize,
-                         const int optLevel,
-                         const ZSTD_dictMode_e dictMode)
-{
-    optState_t* const optStatePtr = &ms->opt;
-    const BYTE* const istart = (const BYTE*)src;
-    const BYTE* ip = istart;
-    const BYTE* anchor = istart;
-    const BYTE* const iend = istart + srcSize;
-    const BYTE* const ilimit = iend - 8;
-    const BYTE* const base = ms->window.base;
-    const BYTE* const prefixStart = base + ms->window.dictLimit;
-    const ZSTD_compressionParameters* const cParams = &ms->cParams;
-
-    U32 const sufficient_len = MIN(cParams->targetLength, ZSTD_OPT_NUM -1);
-    U32 const minMatch = (cParams->minMatch == 3) ? 3 : 4;
-    U32 nextToUpdate3 = ms->nextToUpdate;
-
-    ZSTD_optimal_t* const opt = optStatePtr->priceTable;
-    ZSTD_match_t* const matches = optStatePtr->matchTable;
-    ZSTD_optimal_t lastSequence;
-
-    /* init */
-    DEBUGLOG(5, "ZSTD_compressBlock_opt_generic: current=%u, prefix=%u, nextToUpdate=%u",
-                (U32)(ip - base), ms->window.dictLimit, ms->nextToUpdate);
-    assert(optLevel <= 2);
-    ZSTD_rescaleFreqs(optStatePtr, (const BYTE*)src, srcSize, optLevel);
-    ip += (ip==prefixStart);
-
-    /* Match Loop */
-    while (ip < ilimit) {
-        U32 cur, last_pos = 0;
-
-        /* find first match */
-        {   U32 const litlen = (U32)(ip - anchor);
-            U32 const ll0 = !litlen;
-            U32 const nbMatches = ZSTD_BtGetAllMatches(matches, ms, &nextToUpdate3, ip, iend, dictMode, rep, ll0, minMatch);
-            if (!nbMatches) { ip++; continue; }
-
-            /* initialize opt[0] */
-            { U32 i ; for (i=0; i<ZSTD_REP_NUM; i++) opt[0].rep[i] = rep[i]; }
-            opt[0].mlen = 0;  /* means is_a_literal */
-            opt[0].litlen = litlen;
-            opt[0].price = ZSTD_literalsContribution(anchor, litlen, optStatePtr, optLevel);
-
-            /* large match -> immediate encoding */
-            {   U32 const maxML = matches[nbMatches-1].len;
-                U32 const maxOffset = matches[nbMatches-1].off;
-                DEBUGLOG(6, "found %u matches of maxLength=%u and maxOffCode=%u at cPos=%u => start new series",
-                            nbMatches, maxML, maxOffset, (U32)(ip-prefixStart));
-
-                if (maxML > sufficient_len) {
-                    lastSequence.litlen = litlen;
-                    lastSequence.mlen = maxML;
-                    lastSequence.off = maxOffset;
-                    DEBUGLOG(6, "large match (%u>%u), immediate encoding",
-                                maxML, sufficient_len);
-                    cur = 0;
-                    last_pos = ZSTD_totalLen(lastSequence);
-                    goto _shortestPath;
-            }   }
-
-            /* set prices for first matches starting position == 0 */
-            {   U32 const literalsPrice = opt[0].price + ZSTD_litLengthPrice(0, optStatePtr, optLevel);
-                U32 pos;
-                U32 matchNb;
-                for (pos = 1; pos < minMatch; pos++) {
-                    opt[pos].price = ZSTD_MAX_PRICE;   /* mlen, litlen and price will be fixed during forward scanning */
-                }
-                for (matchNb = 0; matchNb < nbMatches; matchNb++) {
-                    U32 const offset = matches[matchNb].off;
-                    U32 const end = matches[matchNb].len;
-                    repcodes_t const repHistory = ZSTD_updateRep(rep, offset, ll0);
-                    for ( ; pos <= end ; pos++ ) {
-                        U32 const matchPrice = ZSTD_getMatchPrice(offset, pos, optStatePtr, optLevel);
-                        U32 const sequencePrice = literalsPrice + matchPrice;
-                        DEBUGLOG(7, "rPos:%u => set initial price : %.2f",
-                                    pos, ZSTD_fCost(sequencePrice));
-                        opt[pos].mlen = pos;
-                        opt[pos].off = offset;
-                        opt[pos].litlen = litlen;
-                        opt[pos].price = sequencePrice;
-                        ZSTD_STATIC_ASSERT(sizeof(opt[pos].rep) == sizeof(repHistory));
-                        memcpy(opt[pos].rep, &repHistory, sizeof(repHistory));
-                }   }
-                last_pos = pos-1;
-            }
-        }
-
-        /* check further positions */
-        for (cur = 1; cur <= last_pos; cur++) {
-            const BYTE* const inr = ip + cur;
-            assert(cur < ZSTD_OPT_NUM);
-            DEBUGLOG(7, "cPos:%zi==rPos:%u", inr-istart, cur)
-
-            /* Fix current position with one literal if cheaper */
-            {   U32 const litlen = (opt[cur-1].mlen == 0) ? opt[cur-1].litlen + 1 : 1;
-                int const price = opt[cur-1].price
-                                + ZSTD_rawLiteralsCost(ip+cur-1, 1, optStatePtr, optLevel)
-                                + ZSTD_litLengthPrice(litlen, optStatePtr, optLevel)
-                                - ZSTD_litLengthPrice(litlen-1, optStatePtr, optLevel);
-                assert(price < 1000000000); /* overflow check */
-                if (price <= opt[cur].price) {
-                    DEBUGLOG(7, "cPos:%zi==rPos:%u : better price (%.2f<=%.2f) using literal (ll==%u) (hist:%u,%u,%u)",
-                                inr-istart, cur, ZSTD_fCost(price), ZSTD_fCost(opt[cur].price), litlen,
-                                opt[cur-1].rep[0], opt[cur-1].rep[1], opt[cur-1].rep[2]);
-                    opt[cur].mlen = 0;
-                    opt[cur].off = 0;
-                    opt[cur].litlen = litlen;
-                    opt[cur].price = price;
-                    memcpy(opt[cur].rep, opt[cur-1].rep, sizeof(opt[cur].rep));
-                } else {
-                    DEBUGLOG(7, "cPos:%zi==rPos:%u : literal would cost more (%.2f>%.2f) (hist:%u,%u,%u)",
-                                inr-istart, cur, ZSTD_fCost(price), ZSTD_fCost(opt[cur].price),
-                                opt[cur].rep[0], opt[cur].rep[1], opt[cur].rep[2]);
-                }
-            }
-
-            /* last match must start at a minimum distance of 8 from oend */
-            if (inr > ilimit) continue;
-
-            if (cur == last_pos) break;
-
-            if ( (optLevel==0) /*static_test*/
-              && (opt[cur+1].price <= opt[cur].price + (BITCOST_MULTIPLIER/2)) ) {
-                DEBUGLOG(7, "move to next rPos:%u : price is <=", cur+1);
-                continue;  /* skip unpromising positions; about ~+6% speed, -0.01 ratio */
-            }
-
-            {   U32 const ll0 = (opt[cur].mlen != 0);
-                U32 const litlen = (opt[cur].mlen == 0) ? opt[cur].litlen : 0;
-                U32 const previousPrice = opt[cur].price;
-                U32 const basePrice = previousPrice + ZSTD_litLengthPrice(0, optStatePtr, optLevel);
-                U32 const nbMatches = ZSTD_BtGetAllMatches(matches, ms, &nextToUpdate3, inr, iend, dictMode, opt[cur].rep, ll0, minMatch);
-                U32 matchNb;
-                if (!nbMatches) {
-                    DEBUGLOG(7, "rPos:%u : no match found", cur);
-                    continue;
-                }
-
-                {   U32 const maxML = matches[nbMatches-1].len;
-                    DEBUGLOG(7, "cPos:%zi==rPos:%u, found %u matches, of maxLength=%u",
-                                inr-istart, cur, nbMatches, maxML);
-
-                    if ( (maxML > sufficient_len)
-                      || (cur + maxML >= ZSTD_OPT_NUM) ) {
-                        lastSequence.mlen = maxML;
-                        lastSequence.off = matches[nbMatches-1].off;
-                        lastSequence.litlen = litlen;
-                        cur -= (opt[cur].mlen==0) ? opt[cur].litlen : 0;  /* last sequence is actually only literals, fix cur to last match - note : may underflow, in which case, it's first sequence, and it's okay */
-                        last_pos = cur + ZSTD_totalLen(lastSequence);
-                        if (cur > ZSTD_OPT_NUM) cur = 0;   /* underflow => first match */
-                        goto _shortestPath;
-                }   }
-
-                /* set prices using matches found at position == cur */
-                for (matchNb = 0; matchNb < nbMatches; matchNb++) {
-                    U32 const offset = matches[matchNb].off;
-                    repcodes_t const repHistory = ZSTD_updateRep(opt[cur].rep, offset, ll0);
-                    U32 const lastML = matches[matchNb].len;
-                    U32 const startML = (matchNb>0) ? matches[matchNb-1].len+1 : minMatch;
-                    U32 mlen;
-
-                    DEBUGLOG(7, "testing match %u => offCode=%4u, mlen=%2u, llen=%2u",
-                                matchNb, matches[matchNb].off, lastML, litlen);
-
-                    for (mlen = lastML; mlen >= startML; mlen--) {  /* scan downward */
-                        U32 const pos = cur + mlen;
-                        int const price = basePrice + ZSTD_getMatchPrice(offset, mlen, optStatePtr, optLevel);
-
-                        if ((pos > last_pos) || (price < opt[pos].price)) {
-                            DEBUGLOG(7, "rPos:%u (ml=%2u) => new better price (%.2f<%.2f)",
-                                        pos, mlen, ZSTD_fCost(price), ZSTD_fCost(opt[pos].price));
-                            while (last_pos < pos) { opt[last_pos+1].price = ZSTD_MAX_PRICE; last_pos++; }   /* fill empty positions */
-                            opt[pos].mlen = mlen;
-                            opt[pos].off = offset;
-                            opt[pos].litlen = litlen;
-                            opt[pos].price = price;
-                            ZSTD_STATIC_ASSERT(sizeof(opt[pos].rep) == sizeof(repHistory));
-                            memcpy(opt[pos].rep, &repHistory, sizeof(repHistory));
-                        } else {
-                            DEBUGLOG(7, "rPos:%u (ml=%2u) => new price is worse (%.2f>=%.2f)",
-                                        pos, mlen, ZSTD_fCost(price), ZSTD_fCost(opt[pos].price));
-                            if (optLevel==0) break;  /* early update abort; gets ~+10% speed for about -0.01 ratio loss */
-                        }
-            }   }   }
-        }  /* for (cur = 1; cur <= last_pos; cur++) */
-
-        lastSequence = opt[last_pos];
-        cur = last_pos > ZSTD_totalLen(lastSequence) ? last_pos - ZSTD_totalLen(lastSequence) : 0;  /* single sequence, and it starts before `ip` */
-        assert(cur < ZSTD_OPT_NUM);  /* control overflow*/
-
-_shortestPath:   /* cur, last_pos, best_mlen, best_off have to be set */
-        assert(opt[0].mlen == 0);
-
-        {   U32 const storeEnd = cur + 1;
-            U32 storeStart = storeEnd;
-            U32 seqPos = cur;
-
-            DEBUGLOG(6, "start reverse traversal (last_pos:%u, cur:%u)",
-                        last_pos, cur); (void)last_pos;
-            assert(storeEnd < ZSTD_OPT_NUM);
-            DEBUGLOG(6, "last sequence copied into pos=%u (llen=%u,mlen=%u,ofc=%u)",
-                        storeEnd, lastSequence.litlen, lastSequence.mlen, lastSequence.off);
-            opt[storeEnd] = lastSequence;
-            while (seqPos > 0) {
-                U32 const backDist = ZSTD_totalLen(opt[seqPos]);
-                storeStart--;
-                DEBUGLOG(6, "sequence from rPos=%u copied into pos=%u (llen=%u,mlen=%u,ofc=%u)",
-                            seqPos, storeStart, opt[seqPos].litlen, opt[seqPos].mlen, opt[seqPos].off);
-                opt[storeStart] = opt[seqPos];
-                seqPos = (seqPos > backDist) ? seqPos - backDist : 0;
-            }
-
-            /* save sequences */
-            DEBUGLOG(6, "sending selected sequences into seqStore")
-            {   U32 storePos;
-                for (storePos=storeStart; storePos <= storeEnd; storePos++) {
-                    U32 const llen = opt[storePos].litlen;
-                    U32 const mlen = opt[storePos].mlen;
-                    U32 const offCode = opt[storePos].off;
-                    U32 const advance = llen + mlen;
-                    DEBUGLOG(6, "considering seq starting at %zi, llen=%u, mlen=%u",
-                                anchor - istart, (unsigned)llen, (unsigned)mlen);
-
-                    if (mlen==0) {  /* only literals => must be last "sequence", actually starting a new stream of sequences */
-                        assert(storePos == storeEnd);   /* must be last sequence */
-                        ip = anchor + llen;     /* last "sequence" is a bunch of literals => don't progress anchor */
-                        continue;   /* will finish */
-                    }
-
-                    /* repcodes update : like ZSTD_updateRep(), but update in place */
-                    if (offCode >= ZSTD_REP_NUM) {  /* full offset */
-                        rep[2] = rep[1];
-                        rep[1] = rep[0];
-                        rep[0] = offCode - ZSTD_REP_MOVE;
-                    } else {   /* repcode */
-                        U32 const repCode = offCode + (llen==0);
-                        if (repCode) {  /* note : if repCode==0, no change */
-                            U32 const currentOffset = (repCode==ZSTD_REP_NUM) ? (rep[0] - 1) : rep[repCode];
-                            if (repCode >= 2) rep[2] = rep[1];
-                            rep[1] = rep[0];
-                            rep[0] = currentOffset;
-                    }   }
-
-                    assert(anchor + llen <= iend);
-                    ZSTD_updateStats(optStatePtr, llen, anchor, offCode, mlen);
-                    ZSTD_storeSeq(seqStore, llen, anchor, offCode, mlen-MINMATCH);
-                    anchor += advance;
-                    ip = anchor;
-            }   }
-            ZSTD_setBasePrices(optStatePtr, optLevel);
-        }
-
-    }   /* while (ip < ilimit) */
-
-    /* Return the last literals size */
-    return (size_t)(iend - anchor);
-}
-
-
-size_t ZSTD_compressBlock_btopt(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        const void* src, size_t srcSize)
-{
-    DEBUGLOG(5, "ZSTD_compressBlock_btopt");
-    return ZSTD_compressBlock_opt_generic(ms, seqStore, rep, src, srcSize, 0 /*optLevel*/, ZSTD_noDict);
-}
-
-
-/* used in 2-pass strategy */
-static U32 ZSTD_upscaleStat(unsigned* table, U32 lastEltIndex, int bonus)
-{
-    U32 s, sum=0;
-    assert(ZSTD_FREQ_DIV+bonus >= 0);
-    for (s=0; s<lastEltIndex+1; s++) {
-        table[s] <<= ZSTD_FREQ_DIV+bonus;
-        table[s]--;
-        sum += table[s];
-    }
-    return sum;
-}
-
-/* used in 2-pass strategy */
-MEM_STATIC void ZSTD_upscaleStats(optState_t* optPtr)
-{
-    if (ZSTD_compressedLiterals(optPtr))
-        optPtr->litSum = ZSTD_upscaleStat(optPtr->litFreq, MaxLit, 0);
-    optPtr->litLengthSum = ZSTD_upscaleStat(optPtr->litLengthFreq, MaxLL, 0);
-    optPtr->matchLengthSum = ZSTD_upscaleStat(optPtr->matchLengthFreq, MaxML, 0);
-    optPtr->offCodeSum = ZSTD_upscaleStat(optPtr->offCodeFreq, MaxOff, 0);
-}
-
-/* ZSTD_initStats_ultra():
- * make a first compression pass, just to seed stats with more accurate starting values.
- * only works on first block, with no dictionary and no ldm.
- * this function cannot error, hence its contract must be respected.
- */
-static void
-ZSTD_initStats_ultra(ZSTD_matchState_t* ms,
-                     seqStore_t* seqStore,
-                     U32 rep[ZSTD_REP_NUM],
-               const void* src, size_t srcSize)
-{
-    U32 tmpRep[ZSTD_REP_NUM];  /* updated rep codes will sink here */
-    memcpy(tmpRep, rep, sizeof(tmpRep));
-
-    DEBUGLOG(4, "ZSTD_initStats_ultra (srcSize=%zu)", srcSize);
-    assert(ms->opt.litLengthSum == 0);    /* first block */
-    assert(seqStore->sequences == seqStore->sequencesStart);   /* no ldm */
-    assert(ms->window.dictLimit == ms->window.lowLimit);   /* no dictionary */
-    assert(ms->window.dictLimit - ms->nextToUpdate <= 1);  /* no prefix (note: intentional overflow, defined as 2-complement) */
-
-    ZSTD_compressBlock_opt_generic(ms, seqStore, tmpRep, src, srcSize, 2 /*optLevel*/, ZSTD_noDict);   /* generate stats into ms->opt*/
-
-    /* invalidate first scan from history */
-    ZSTD_resetSeqStore(seqStore);
-    ms->window.base -= srcSize;
-    ms->window.dictLimit += (U32)srcSize;
-    ms->window.lowLimit = ms->window.dictLimit;
-    ms->nextToUpdate = ms->window.dictLimit;
-
-    /* re-inforce weight of collected statistics */
-    ZSTD_upscaleStats(&ms->opt);
-}
-
-size_t ZSTD_compressBlock_btultra(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        const void* src, size_t srcSize)
-{
-    DEBUGLOG(5, "ZSTD_compressBlock_btultra (srcSize=%zu)", srcSize);
-    return ZSTD_compressBlock_opt_generic(ms, seqStore, rep, src, srcSize, 2 /*optLevel*/, ZSTD_noDict);
-}
-
-size_t ZSTD_compressBlock_btultra2(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        const void* src, size_t srcSize)
-{
-    U32 const current = (U32)((const BYTE*)src - ms->window.base);
-    DEBUGLOG(5, "ZSTD_compressBlock_btultra2 (srcSize=%zu)", srcSize);
-
-    /* 2-pass strategy:
-     * this strategy makes a first pass over first block to collect statistics
-     * and seed next round's statistics with it.
-     * After 1st pass, function forgets everything, and starts a new block.
-     * Consequently, this can only work if no data has been previously loaded in tables,
-     * aka, no dictionary, no prefix, no ldm preprocessing.
-     * The compression ratio gain is generally small (~0.5% on first block),
-     * the cost is 2x cpu time on first block. */
-    assert(srcSize <= ZSTD_BLOCKSIZE_MAX);
-    if ( (ms->opt.litLengthSum==0)   /* first block */
-      && (seqStore->sequences == seqStore->sequencesStart)  /* no ldm */
-      && (ms->window.dictLimit == ms->window.lowLimit)   /* no dictionary */
-      && (current == ms->window.dictLimit)   /* start of frame, nothing already loaded nor skipped */
-      && (srcSize > ZSTD_PREDEF_THRESHOLD)
-      ) {
-        ZSTD_initStats_ultra(ms, seqStore, rep, src, srcSize);
-    }
-
-    return ZSTD_compressBlock_opt_generic(ms, seqStore, rep, src, srcSize, 2 /*optLevel*/, ZSTD_noDict);
-}
-
-size_t ZSTD_compressBlock_btopt_dictMatchState(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        const void* src, size_t srcSize)
-{
-    return ZSTD_compressBlock_opt_generic(ms, seqStore, rep, src, srcSize, 0 /*optLevel*/, ZSTD_dictMatchState);
-}
-
-size_t ZSTD_compressBlock_btultra_dictMatchState(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        const void* src, size_t srcSize)
-{
-    return ZSTD_compressBlock_opt_generic(ms, seqStore, rep, src, srcSize, 2 /*optLevel*/, ZSTD_dictMatchState);
-}
-
-size_t ZSTD_compressBlock_btopt_extDict(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        const void* src, size_t srcSize)
-{
-    return ZSTD_compressBlock_opt_generic(ms, seqStore, rep, src, srcSize, 0 /*optLevel*/, ZSTD_extDict);
-}
-
-size_t ZSTD_compressBlock_btultra_extDict(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        const void* src, size_t srcSize)
-{
-    return ZSTD_compressBlock_opt_generic(ms, seqStore, rep, src, srcSize, 2 /*optLevel*/, ZSTD_extDict);
-}
-
-/* note : no btultra2 variant for extDict nor dictMatchState,
- * because btultra2 is not meant to work with dictionaries
- * and is only specific for the first block (no prefix) */
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/compress/zstd_opt.h mysql-8.0-8.0.27/extra/zstd/lib/compress/zstd_opt.h
--- mysql-8.0-8.0.26/extra/zstd/lib/compress/zstd_opt.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/compress/zstd_opt.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
-#ifndef ZSTD_OPT_H
-#define ZSTD_OPT_H
-
-#if defined (__cplusplus)
-extern "C" {
-#endif
-
-#include "zstd_compress_internal.h"
-
-/* used in ZSTD_loadDictionaryContent() */
-void ZSTD_updateTree(ZSTD_matchState_t* ms, const BYTE* ip, const BYTE* iend);
-
-size_t ZSTD_compressBlock_btopt(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize);
-size_t ZSTD_compressBlock_btultra(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize);
-size_t ZSTD_compressBlock_btultra2(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize);
-
-
-size_t ZSTD_compressBlock_btopt_dictMatchState(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize);
-size_t ZSTD_compressBlock_btultra_dictMatchState(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize);
-
-size_t ZSTD_compressBlock_btopt_extDict(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize);
-size_t ZSTD_compressBlock_btultra_extDict(
-        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-        void const* src, size_t srcSize);
-
-        /* note : no btultra2 variant for extDict nor dictMatchState,
-         * because btultra2 is not meant to work with dictionaries
-         * and is only specific for the first block (no prefix) */
-
-#if defined (__cplusplus)
-}
-#endif
-
-#endif /* ZSTD_OPT_H */
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/decompress/huf_decompress.c mysql-8.0-8.0.27/extra/zstd/lib/decompress/huf_decompress.c
--- mysql-8.0-8.0.26/extra/zstd/lib/decompress/huf_decompress.c	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/decompress/huf_decompress.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1232 +0,0 @@
-/* ******************************************************************
-   huff0 huffman decoder,
-   part of Finite State Entropy library
-   Copyright (C) 2013-present, Yann Collet.
-
-   BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are
-   met:
-
-       * Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-       * Redistributions in binary form must reproduce the above
-   copyright notice, this list of conditions and the following disclaimer
-   in the documentation and/or other materials provided with the
-   distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-    You can contact the author at :
-    - FSE+HUF source repository : https://github.com/Cyan4973/FiniteStateEntropy
-****************************************************************** */
-
-/* **************************************************************
-*  Dependencies
-****************************************************************/
-#include <string.h>     /* memcpy, memset */
-#include "compiler.h"
-#include "bitstream.h"  /* BIT_* */
-#include "fse.h"        /* to compress headers */
-#define HUF_STATIC_LINKING_ONLY
-#include "huf.h"
-#include "error_private.h"
-
-/* **************************************************************
-*  Macros
-****************************************************************/
-
-/* These two optional macros force the use one way or another of the two
- * Huffman decompression implementations. You can't force in both directions
- * at the same time.
- */
-#if defined(HUF_FORCE_DECOMPRESS_X1) && \
-    defined(HUF_FORCE_DECOMPRESS_X2)
-#error "Cannot force the use of the X1 and X2 decoders at the same time!"
-#endif
-
-
-/* **************************************************************
-*  Error Management
-****************************************************************/
-#define HUF_isError ERR_isError
-#define CHECK_F(f) { size_t const err_ = (f); if (HUF_isError(err_)) return err_; }
-
-
-/* **************************************************************
-*  Byte alignment for workSpace management
-****************************************************************/
-#define HUF_ALIGN(x, a)         HUF_ALIGN_MASK((x), (a) - 1)
-#define HUF_ALIGN_MASK(x, mask) (((x) + (mask)) & ~(mask))
-
-
-/* **************************************************************
-*  BMI2 Variant Wrappers
-****************************************************************/
-#if DYNAMIC_BMI2
-
-#define HUF_DGEN(fn)                                                        \
-                                                                            \
-    static size_t fn##_default(                                             \
-                  void* dst,  size_t dstSize,                               \
-            const void* cSrc, size_t cSrcSize,                              \
-            const HUF_DTable* DTable)                                       \
-    {                                                                       \
-        return fn##_body(dst, dstSize, cSrc, cSrcSize, DTable);             \
-    }                                                                       \
-                                                                            \
-    static TARGET_ATTRIBUTE("bmi2") size_t fn##_bmi2(                       \
-                  void* dst,  size_t dstSize,                               \
-            const void* cSrc, size_t cSrcSize,                              \
-            const HUF_DTable* DTable)                                       \
-    {                                                                       \
-        return fn##_body(dst, dstSize, cSrc, cSrcSize, DTable);             \
-    }                                                                       \
-                                                                            \
-    static size_t fn(void* dst, size_t dstSize, void const* cSrc,           \
-                     size_t cSrcSize, HUF_DTable const* DTable, int bmi2)   \
-    {                                                                       \
-        if (bmi2) {                                                         \
-            return fn##_bmi2(dst, dstSize, cSrc, cSrcSize, DTable);         \
-        }                                                                   \
-        return fn##_default(dst, dstSize, cSrc, cSrcSize, DTable);          \
-    }
-
-#else
-
-#define HUF_DGEN(fn)                                                        \
-    static size_t fn(void* dst, size_t dstSize, void const* cSrc,           \
-                     size_t cSrcSize, HUF_DTable const* DTable, int bmi2)   \
-    {                                                                       \
-        (void)bmi2;                                                         \
-        return fn##_body(dst, dstSize, cSrc, cSrcSize, DTable);             \
-    }
-
-#endif
-
-
-/*-***************************/
-/*  generic DTableDesc       */
-/*-***************************/
-typedef struct { BYTE maxTableLog; BYTE tableType; BYTE tableLog; BYTE reserved; } DTableDesc;
-
-static DTableDesc HUF_getDTableDesc(const HUF_DTable* table)
-{
-    DTableDesc dtd;
-    memcpy(&dtd, table, sizeof(dtd));
-    return dtd;
-}
-
-
-#ifndef HUF_FORCE_DECOMPRESS_X2
-
-/*-***************************/
-/*  single-symbol decoding   */
-/*-***************************/
-typedef struct { BYTE byte; BYTE nbBits; } HUF_DEltX1;   /* single-symbol decoding */
-
-size_t HUF_readDTableX1_wksp(HUF_DTable* DTable, const void* src, size_t srcSize, void* workSpace, size_t wkspSize)
-{
-    U32 tableLog = 0;
-    U32 nbSymbols = 0;
-    size_t iSize;
-    void* const dtPtr = DTable + 1;
-    HUF_DEltX1* const dt = (HUF_DEltX1*)dtPtr;
-
-    U32* rankVal;
-    BYTE* huffWeight;
-    size_t spaceUsed32 = 0;
-
-    rankVal = (U32 *)workSpace + spaceUsed32;
-    spaceUsed32 += HUF_TABLELOG_ABSOLUTEMAX + 1;
-    huffWeight = (BYTE *)((U32 *)workSpace + spaceUsed32);
-    spaceUsed32 += HUF_ALIGN(HUF_SYMBOLVALUE_MAX + 1, sizeof(U32)) >> 2;
-
-    if ((spaceUsed32 << 2) > wkspSize) return ERROR(tableLog_tooLarge);
-
-    DEBUG_STATIC_ASSERT(sizeof(DTableDesc) == sizeof(HUF_DTable));
-    /* memset(huffWeight, 0, sizeof(huffWeight)); */   /* is not necessary, even though some analyzer complain ... */
-
-    iSize = HUF_readStats(huffWeight, HUF_SYMBOLVALUE_MAX + 1, rankVal, &nbSymbols, &tableLog, src, srcSize);
-    if (HUF_isError(iSize)) return iSize;
-
-    /* Table header */
-    {   DTableDesc dtd = HUF_getDTableDesc(DTable);
-        if (tableLog > (U32)(dtd.maxTableLog+1)) return ERROR(tableLog_tooLarge);   /* DTable too small, Huffman tree cannot fit in */
-        dtd.tableType = 0;
-        dtd.tableLog = (BYTE)tableLog;
-        memcpy(DTable, &dtd, sizeof(dtd));
-    }
-
-    /* Calculate starting value for each rank */
-    {   U32 n, nextRankStart = 0;
-        for (n=1; n<tableLog+1; n++) {
-            U32 const current = nextRankStart;
-            nextRankStart += (rankVal[n] << (n-1));
-            rankVal[n] = current;
-    }   }
-
-    /* fill DTable */
-    {   U32 n;
-        for (n=0; n<nbSymbols; n++) {
-            U32 const w = huffWeight[n];
-            U32 const length = (1 << w) >> 1;
-            U32 u;
-            HUF_DEltX1 D;
-            D.byte = (BYTE)n; D.nbBits = (BYTE)(tableLog + 1 - w);
-            for (u = rankVal[w]; u < rankVal[w] + length; u++)
-                dt[u] = D;
-            rankVal[w] += length;
-    }   }
-
-    return iSize;
-}
-
-size_t HUF_readDTableX1(HUF_DTable* DTable, const void* src, size_t srcSize)
-{
-    U32 workSpace[HUF_DECOMPRESS_WORKSPACE_SIZE_U32];
-    return HUF_readDTableX1_wksp(DTable, src, srcSize,
-                                 workSpace, sizeof(workSpace));
-}
-
-FORCE_INLINE_TEMPLATE BYTE
-HUF_decodeSymbolX1(BIT_DStream_t* Dstream, const HUF_DEltX1* dt, const U32 dtLog)
-{
-    size_t const val = BIT_lookBitsFast(Dstream, dtLog); /* note : dtLog >= 1 */
-    BYTE const c = dt[val].byte;
-    BIT_skipBits(Dstream, dt[val].nbBits);
-    return c;
-}
-
-#define HUF_DECODE_SYMBOLX1_0(ptr, DStreamPtr) \
-    *ptr++ = HUF_decodeSymbolX1(DStreamPtr, dt, dtLog)
-
-#define HUF_DECODE_SYMBOLX1_1(ptr, DStreamPtr)  \
-    if (MEM_64bits() || (HUF_TABLELOG_MAX<=12)) \
-        HUF_DECODE_SYMBOLX1_0(ptr, DStreamPtr)
-
-#define HUF_DECODE_SYMBOLX1_2(ptr, DStreamPtr) \
-    if (MEM_64bits()) \
-        HUF_DECODE_SYMBOLX1_0(ptr, DStreamPtr)
-
-HINT_INLINE size_t
-HUF_decodeStreamX1(BYTE* p, BIT_DStream_t* const bitDPtr, BYTE* const pEnd, const HUF_DEltX1* const dt, const U32 dtLog)
-{
-    BYTE* const pStart = p;
-
-    /* up to 4 symbols at a time */
-    while ((BIT_reloadDStream(bitDPtr) == BIT_DStream_unfinished) & (p < pEnd-3)) {
-        HUF_DECODE_SYMBOLX1_2(p, bitDPtr);
-        HUF_DECODE_SYMBOLX1_1(p, bitDPtr);
-        HUF_DECODE_SYMBOLX1_2(p, bitDPtr);
-        HUF_DECODE_SYMBOLX1_0(p, bitDPtr);
-    }
-
-    /* [0-3] symbols remaining */
-    if (MEM_32bits())
-        while ((BIT_reloadDStream(bitDPtr) == BIT_DStream_unfinished) & (p < pEnd))
-            HUF_DECODE_SYMBOLX1_0(p, bitDPtr);
-
-    /* no more data to retrieve from bitstream, no need to reload */
-    while (p < pEnd)
-        HUF_DECODE_SYMBOLX1_0(p, bitDPtr);
-
-    return pEnd-pStart;
-}
-
-FORCE_INLINE_TEMPLATE size_t
-HUF_decompress1X1_usingDTable_internal_body(
-          void* dst,  size_t dstSize,
-    const void* cSrc, size_t cSrcSize,
-    const HUF_DTable* DTable)
-{
-    BYTE* op = (BYTE*)dst;
-    BYTE* const oend = op + dstSize;
-    const void* dtPtr = DTable + 1;
-    const HUF_DEltX1* const dt = (const HUF_DEltX1*)dtPtr;
-    BIT_DStream_t bitD;
-    DTableDesc const dtd = HUF_getDTableDesc(DTable);
-    U32 const dtLog = dtd.tableLog;
-
-    CHECK_F( BIT_initDStream(&bitD, cSrc, cSrcSize) );
-
-    HUF_decodeStreamX1(op, &bitD, oend, dt, dtLog);
-
-    if (!BIT_endOfDStream(&bitD)) return ERROR(corruption_detected);
-
-    return dstSize;
-}
-
-FORCE_INLINE_TEMPLATE size_t
-HUF_decompress4X1_usingDTable_internal_body(
-          void* dst,  size_t dstSize,
-    const void* cSrc, size_t cSrcSize,
-    const HUF_DTable* DTable)
-{
-    /* Check */
-    if (cSrcSize < 10) return ERROR(corruption_detected);  /* strict minimum : jump table + 1 byte per stream */
-
-    {   const BYTE* const istart = (const BYTE*) cSrc;
-        BYTE* const ostart = (BYTE*) dst;
-        BYTE* const oend = ostart + dstSize;
-        const void* const dtPtr = DTable + 1;
-        const HUF_DEltX1* const dt = (const HUF_DEltX1*)dtPtr;
-
-        /* Init */
-        BIT_DStream_t bitD1;
-        BIT_DStream_t bitD2;
-        BIT_DStream_t bitD3;
-        BIT_DStream_t bitD4;
-        size_t const length1 = MEM_readLE16(istart);
-        size_t const length2 = MEM_readLE16(istart+2);
-        size_t const length3 = MEM_readLE16(istart+4);
-        size_t const length4 = cSrcSize - (length1 + length2 + length3 + 6);
-        const BYTE* const istart1 = istart + 6;  /* jumpTable */
-        const BYTE* const istart2 = istart1 + length1;
-        const BYTE* const istart3 = istart2 + length2;
-        const BYTE* const istart4 = istart3 + length3;
-        const size_t segmentSize = (dstSize+3) / 4;
-        BYTE* const opStart2 = ostart + segmentSize;
-        BYTE* const opStart3 = opStart2 + segmentSize;
-        BYTE* const opStart4 = opStart3 + segmentSize;
-        BYTE* op1 = ostart;
-        BYTE* op2 = opStart2;
-        BYTE* op3 = opStart3;
-        BYTE* op4 = opStart4;
-        U32 endSignal = BIT_DStream_unfinished;
-        DTableDesc const dtd = HUF_getDTableDesc(DTable);
-        U32 const dtLog = dtd.tableLog;
-
-        if (length4 > cSrcSize) return ERROR(corruption_detected);   /* overflow */
-        CHECK_F( BIT_initDStream(&bitD1, istart1, length1) );
-        CHECK_F( BIT_initDStream(&bitD2, istart2, length2) );
-        CHECK_F( BIT_initDStream(&bitD3, istart3, length3) );
-        CHECK_F( BIT_initDStream(&bitD4, istart4, length4) );
-
-        /* up to 16 symbols per loop (4 symbols per stream) in 64-bit mode */
-        endSignal = BIT_reloadDStream(&bitD1) | BIT_reloadDStream(&bitD2) | BIT_reloadDStream(&bitD3) | BIT_reloadDStream(&bitD4);
-        while ( (endSignal==BIT_DStream_unfinished) && (op4<(oend-3)) ) {
-            HUF_DECODE_SYMBOLX1_2(op1, &bitD1);
-            HUF_DECODE_SYMBOLX1_2(op2, &bitD2);
-            HUF_DECODE_SYMBOLX1_2(op3, &bitD3);
-            HUF_DECODE_SYMBOLX1_2(op4, &bitD4);
-            HUF_DECODE_SYMBOLX1_1(op1, &bitD1);
-            HUF_DECODE_SYMBOLX1_1(op2, &bitD2);
-            HUF_DECODE_SYMBOLX1_1(op3, &bitD3);
-            HUF_DECODE_SYMBOLX1_1(op4, &bitD4);
-            HUF_DECODE_SYMBOLX1_2(op1, &bitD1);
-            HUF_DECODE_SYMBOLX1_2(op2, &bitD2);
-            HUF_DECODE_SYMBOLX1_2(op3, &bitD3);
-            HUF_DECODE_SYMBOLX1_2(op4, &bitD4);
-            HUF_DECODE_SYMBOLX1_0(op1, &bitD1);
-            HUF_DECODE_SYMBOLX1_0(op2, &bitD2);
-            HUF_DECODE_SYMBOLX1_0(op3, &bitD3);
-            HUF_DECODE_SYMBOLX1_0(op4, &bitD4);
-            BIT_reloadDStream(&bitD1);
-            BIT_reloadDStream(&bitD2);
-            BIT_reloadDStream(&bitD3);
-            BIT_reloadDStream(&bitD4);
-        }
-
-        /* check corruption */
-        /* note : should not be necessary : op# advance in lock step, and we control op4.
-         *        but curiously, binary generated by gcc 7.2 & 7.3 with -mbmi2 runs faster when >=1 test is present */
-        if (op1 > opStart2) return ERROR(corruption_detected);
-        if (op2 > opStart3) return ERROR(corruption_detected);
-        if (op3 > opStart4) return ERROR(corruption_detected);
-        /* note : op4 supposed already verified within main loop */
-
-        /* finish bitStreams one by one */
-        HUF_decodeStreamX1(op1, &bitD1, opStart2, dt, dtLog);
-        HUF_decodeStreamX1(op2, &bitD2, opStart3, dt, dtLog);
-        HUF_decodeStreamX1(op3, &bitD3, opStart4, dt, dtLog);
-        HUF_decodeStreamX1(op4, &bitD4, oend,     dt, dtLog);
-
-        /* check */
-        { U32 const endCheck = BIT_endOfDStream(&bitD1) & BIT_endOfDStream(&bitD2) & BIT_endOfDStream(&bitD3) & BIT_endOfDStream(&bitD4);
-          if (!endCheck) return ERROR(corruption_detected); }
-
-        /* decoded size */
-        return dstSize;
-    }
-}
-
-
-typedef size_t (*HUF_decompress_usingDTable_t)(void *dst, size_t dstSize,
-                                               const void *cSrc,
-                                               size_t cSrcSize,
-                                               const HUF_DTable *DTable);
-
-HUF_DGEN(HUF_decompress1X1_usingDTable_internal)
-HUF_DGEN(HUF_decompress4X1_usingDTable_internal)
-
-
-
-size_t HUF_decompress1X1_usingDTable(
-          void* dst,  size_t dstSize,
-    const void* cSrc, size_t cSrcSize,
-    const HUF_DTable* DTable)
-{
-    DTableDesc dtd = HUF_getDTableDesc(DTable);
-    if (dtd.tableType != 0) return ERROR(GENERIC);
-    return HUF_decompress1X1_usingDTable_internal(dst, dstSize, cSrc, cSrcSize, DTable, /* bmi2 */ 0);
-}
-
-size_t HUF_decompress1X1_DCtx_wksp(HUF_DTable* DCtx, void* dst, size_t dstSize,
-                                   const void* cSrc, size_t cSrcSize,
-                                   void* workSpace, size_t wkspSize)
-{
-    const BYTE* ip = (const BYTE*) cSrc;
-
-    size_t const hSize = HUF_readDTableX1_wksp(DCtx, cSrc, cSrcSize, workSpace, wkspSize);
-    if (HUF_isError(hSize)) return hSize;
-    if (hSize >= cSrcSize) return ERROR(srcSize_wrong);
-    ip += hSize; cSrcSize -= hSize;
-
-    return HUF_decompress1X1_usingDTable_internal(dst, dstSize, ip, cSrcSize, DCtx, /* bmi2 */ 0);
-}
-
-
-size_t HUF_decompress1X1_DCtx(HUF_DTable* DCtx, void* dst, size_t dstSize,
-                              const void* cSrc, size_t cSrcSize)
-{
-    U32 workSpace[HUF_DECOMPRESS_WORKSPACE_SIZE_U32];
-    return HUF_decompress1X1_DCtx_wksp(DCtx, dst, dstSize, cSrc, cSrcSize,
-                                       workSpace, sizeof(workSpace));
-}
-
-size_t HUF_decompress1X1 (void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize)
-{
-    HUF_CREATE_STATIC_DTABLEX1(DTable, HUF_TABLELOG_MAX);
-    return HUF_decompress1X1_DCtx (DTable, dst, dstSize, cSrc, cSrcSize);
-}
-
-size_t HUF_decompress4X1_usingDTable(
-          void* dst,  size_t dstSize,
-    const void* cSrc, size_t cSrcSize,
-    const HUF_DTable* DTable)
-{
-    DTableDesc dtd = HUF_getDTableDesc(DTable);
-    if (dtd.tableType != 0) return ERROR(GENERIC);
-    return HUF_decompress4X1_usingDTable_internal(dst, dstSize, cSrc, cSrcSize, DTable, /* bmi2 */ 0);
-}
-
-static size_t HUF_decompress4X1_DCtx_wksp_bmi2(HUF_DTable* dctx, void* dst, size_t dstSize,
-                                   const void* cSrc, size_t cSrcSize,
-                                   void* workSpace, size_t wkspSize, int bmi2)
-{
-    const BYTE* ip = (const BYTE*) cSrc;
-
-    size_t const hSize = HUF_readDTableX1_wksp (dctx, cSrc, cSrcSize,
-                                                workSpace, wkspSize);
-    if (HUF_isError(hSize)) return hSize;
-    if (hSize >= cSrcSize) return ERROR(srcSize_wrong);
-    ip += hSize; cSrcSize -= hSize;
-
-    return HUF_decompress4X1_usingDTable_internal(dst, dstSize, ip, cSrcSize, dctx, bmi2);
-}
-
-size_t HUF_decompress4X1_DCtx_wksp(HUF_DTable* dctx, void* dst, size_t dstSize,
-                                   const void* cSrc, size_t cSrcSize,
-                                   void* workSpace, size_t wkspSize)
-{
-    return HUF_decompress4X1_DCtx_wksp_bmi2(dctx, dst, dstSize, cSrc, cSrcSize, workSpace, wkspSize, 0);
-}
-
-
-size_t HUF_decompress4X1_DCtx (HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize)
-{
-    U32 workSpace[HUF_DECOMPRESS_WORKSPACE_SIZE_U32];
-    return HUF_decompress4X1_DCtx_wksp(dctx, dst, dstSize, cSrc, cSrcSize,
-                                       workSpace, sizeof(workSpace));
-}
-size_t HUF_decompress4X1 (void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize)
-{
-    HUF_CREATE_STATIC_DTABLEX1(DTable, HUF_TABLELOG_MAX);
-    return HUF_decompress4X1_DCtx(DTable, dst, dstSize, cSrc, cSrcSize);
-}
-
-#endif /* HUF_FORCE_DECOMPRESS_X2 */
-
-
-#ifndef HUF_FORCE_DECOMPRESS_X1
-
-/* *************************/
-/* double-symbols decoding */
-/* *************************/
-
-typedef struct { U16 sequence; BYTE nbBits; BYTE length; } HUF_DEltX2;  /* double-symbols decoding */
-typedef struct { BYTE symbol; BYTE weight; } sortedSymbol_t;
-typedef U32 rankValCol_t[HUF_TABLELOG_MAX + 1];
-typedef rankValCol_t rankVal_t[HUF_TABLELOG_MAX];
-
-
-/* HUF_fillDTableX2Level2() :
- * `rankValOrigin` must be a table of at least (HUF_TABLELOG_MAX + 1) U32 */
-static void HUF_fillDTableX2Level2(HUF_DEltX2* DTable, U32 sizeLog, const U32 consumed,
-                           const U32* rankValOrigin, const int minWeight,
-                           const sortedSymbol_t* sortedSymbols, const U32 sortedListSize,
-                           U32 nbBitsBaseline, U16 baseSeq)
-{
-    HUF_DEltX2 DElt;
-    U32 rankVal[HUF_TABLELOG_MAX + 1];
-
-    /* get pre-calculated rankVal */
-    memcpy(rankVal, rankValOrigin, sizeof(rankVal));
-
-    /* fill skipped values */
-    if (minWeight>1) {
-        U32 i, skipSize = rankVal[minWeight];
-        MEM_writeLE16(&(DElt.sequence), baseSeq);
-        DElt.nbBits   = (BYTE)(consumed);
-        DElt.length   = 1;
-        for (i = 0; i < skipSize; i++)
-            DTable[i] = DElt;
-    }
-
-    /* fill DTable */
-    {   U32 s; for (s=0; s<sortedListSize; s++) {   /* note : sortedSymbols already skipped */
-            const U32 symbol = sortedSymbols[s].symbol;
-            const U32 weight = sortedSymbols[s].weight;
-            const U32 nbBits = nbBitsBaseline - weight;
-            const U32 length = 1 << (sizeLog-nbBits);
-            const U32 start = rankVal[weight];
-            U32 i = start;
-            const U32 end = start + length;
-
-            MEM_writeLE16(&(DElt.sequence), (U16)(baseSeq + (symbol << 8)));
-            DElt.nbBits = (BYTE)(nbBits + consumed);
-            DElt.length = 2;
-            do { DTable[i++] = DElt; } while (i<end);   /* since length >= 1 */
-
-            rankVal[weight] += length;
-    }   }
-}
-
-
-static void HUF_fillDTableX2(HUF_DEltX2* DTable, const U32 targetLog,
-                           const sortedSymbol_t* sortedList, const U32 sortedListSize,
-                           const U32* rankStart, rankVal_t rankValOrigin, const U32 maxWeight,
-                           const U32 nbBitsBaseline)
-{
-    U32 rankVal[HUF_TABLELOG_MAX + 1];
-    const int scaleLog = nbBitsBaseline - targetLog;   /* note : targetLog >= srcLog, hence scaleLog <= 1 */
-    const U32 minBits  = nbBitsBaseline - maxWeight;
-    U32 s;
-
-    memcpy(rankVal, rankValOrigin, sizeof(rankVal));
-
-    /* fill DTable */
-    for (s=0; s<sortedListSize; s++) {
-        const U16 symbol = sortedList[s].symbol;
-        const U32 weight = sortedList[s].weight;
-        const U32 nbBits = nbBitsBaseline - weight;
-        const U32 start = rankVal[weight];
-        const U32 length = 1 << (targetLog-nbBits);
-
-        if (targetLog-nbBits >= minBits) {   /* enough room for a second symbol */
-            U32 sortedRank;
-            int minWeight = nbBits + scaleLog;
-            if (minWeight < 1) minWeight = 1;
-            sortedRank = rankStart[minWeight];
-            HUF_fillDTableX2Level2(DTable+start, targetLog-nbBits, nbBits,
-                           rankValOrigin[nbBits], minWeight,
-                           sortedList+sortedRank, sortedListSize-sortedRank,
-                           nbBitsBaseline, symbol);
-        } else {
-            HUF_DEltX2 DElt;
-            MEM_writeLE16(&(DElt.sequence), symbol);
-            DElt.nbBits = (BYTE)(nbBits);
-            DElt.length = 1;
-            {   U32 const end = start + length;
-                U32 u;
-                for (u = start; u < end; u++) DTable[u] = DElt;
-        }   }
-        rankVal[weight] += length;
-    }
-}
-
-size_t HUF_readDTableX2_wksp(HUF_DTable* DTable,
-                       const void* src, size_t srcSize,
-                             void* workSpace, size_t wkspSize)
-{
-    U32 tableLog, maxW, sizeOfSort, nbSymbols;
-    DTableDesc dtd = HUF_getDTableDesc(DTable);
-    U32 const maxTableLog = dtd.maxTableLog;
-    size_t iSize;
-    void* dtPtr = DTable+1;   /* force compiler to avoid strict-aliasing */
-    HUF_DEltX2* const dt = (HUF_DEltX2*)dtPtr;
-    U32 *rankStart;
-
-    rankValCol_t* rankVal;
-    U32* rankStats;
-    U32* rankStart0;
-    sortedSymbol_t* sortedSymbol;
-    BYTE* weightList;
-    size_t spaceUsed32 = 0;
-
-    rankVal = (rankValCol_t *)((U32 *)workSpace + spaceUsed32);
-    spaceUsed32 += (sizeof(rankValCol_t) * HUF_TABLELOG_MAX) >> 2;
-    rankStats = (U32 *)workSpace + spaceUsed32;
-    spaceUsed32 += HUF_TABLELOG_MAX + 1;
-    rankStart0 = (U32 *)workSpace + spaceUsed32;
-    spaceUsed32 += HUF_TABLELOG_MAX + 2;
-    sortedSymbol = (sortedSymbol_t *)workSpace + (spaceUsed32 * sizeof(U32)) / sizeof(sortedSymbol_t);
-    spaceUsed32 += HUF_ALIGN(sizeof(sortedSymbol_t) * (HUF_SYMBOLVALUE_MAX + 1), sizeof(U32)) >> 2;
-    weightList = (BYTE *)((U32 *)workSpace + spaceUsed32);
-    spaceUsed32 += HUF_ALIGN(HUF_SYMBOLVALUE_MAX + 1, sizeof(U32)) >> 2;
-
-    if ((spaceUsed32 << 2) > wkspSize) return ERROR(tableLog_tooLarge);
-
-    rankStart = rankStart0 + 1;
-    memset(rankStats, 0, sizeof(U32) * (2 * HUF_TABLELOG_MAX + 2 + 1));
-
-    DEBUG_STATIC_ASSERT(sizeof(HUF_DEltX2) == sizeof(HUF_DTable));   /* if compiler fails here, assertion is wrong */
-    if (maxTableLog > HUF_TABLELOG_MAX) return ERROR(tableLog_tooLarge);
-    /* memset(weightList, 0, sizeof(weightList)); */  /* is not necessary, even though some analyzer complain ... */
-
-    iSize = HUF_readStats(weightList, HUF_SYMBOLVALUE_MAX + 1, rankStats, &nbSymbols, &tableLog, src, srcSize);
-    if (HUF_isError(iSize)) return iSize;
-
-    /* check result */
-    if (tableLog > maxTableLog) return ERROR(tableLog_tooLarge);   /* DTable can't fit code depth */
-
-    /* find maxWeight */
-    for (maxW = tableLog; rankStats[maxW]==0; maxW--) {}  /* necessarily finds a solution before 0 */
-
-    /* Get start index of each weight */
-    {   U32 w, nextRankStart = 0;
-        for (w=1; w<maxW+1; w++) {
-            U32 current = nextRankStart;
-            nextRankStart += rankStats[w];
-            rankStart[w] = current;
-        }
-        rankStart[0] = nextRankStart;   /* put all 0w symbols at the end of sorted list*/
-        sizeOfSort = nextRankStart;
-    }
-
-    /* sort symbols by weight */
-    {   U32 s;
-        for (s=0; s<nbSymbols; s++) {
-            U32 const w = weightList[s];
-            U32 const r = rankStart[w]++;
-            sortedSymbol[r].symbol = (BYTE)s;
-            sortedSymbol[r].weight = (BYTE)w;
-        }
-        rankStart[0] = 0;   /* forget 0w symbols; this is beginning of weight(1) */
-    }
-
-    /* Build rankVal */
-    {   U32* const rankVal0 = rankVal[0];
-        {   int const rescale = (maxTableLog-tableLog) - 1;   /* tableLog <= maxTableLog */
-            U32 nextRankVal = 0;
-            U32 w;
-            for (w=1; w<maxW+1; w++) {
-                U32 current = nextRankVal;
-                nextRankVal += rankStats[w] << (w+rescale);
-                rankVal0[w] = current;
-        }   }
-        {   U32 const minBits = tableLog+1 - maxW;
-            U32 consumed;
-            for (consumed = minBits; consumed < maxTableLog - minBits + 1; consumed++) {
-                U32* const rankValPtr = rankVal[consumed];
-                U32 w;
-                for (w = 1; w < maxW+1; w++) {
-                    rankValPtr[w] = rankVal0[w] >> consumed;
-    }   }   }   }
-
-    HUF_fillDTableX2(dt, maxTableLog,
-                   sortedSymbol, sizeOfSort,
-                   rankStart0, rankVal, maxW,
-                   tableLog+1);
-
-    dtd.tableLog = (BYTE)maxTableLog;
-    dtd.tableType = 1;
-    memcpy(DTable, &dtd, sizeof(dtd));
-    return iSize;
-}
-
-size_t HUF_readDTableX2(HUF_DTable* DTable, const void* src, size_t srcSize)
-{
-  U32 workSpace[HUF_DECOMPRESS_WORKSPACE_SIZE_U32];
-  return HUF_readDTableX2_wksp(DTable, src, srcSize,
-                               workSpace, sizeof(workSpace));
-}
-
-
-FORCE_INLINE_TEMPLATE U32
-HUF_decodeSymbolX2(void* op, BIT_DStream_t* DStream, const HUF_DEltX2* dt, const U32 dtLog)
-{
-    size_t const val = BIT_lookBitsFast(DStream, dtLog);   /* note : dtLog >= 1 */
-    memcpy(op, dt+val, 2);
-    BIT_skipBits(DStream, dt[val].nbBits);
-    return dt[val].length;
-}
-
-FORCE_INLINE_TEMPLATE U32
-HUF_decodeLastSymbolX2(void* op, BIT_DStream_t* DStream, const HUF_DEltX2* dt, const U32 dtLog)
-{
-    size_t const val = BIT_lookBitsFast(DStream, dtLog);   /* note : dtLog >= 1 */
-    memcpy(op, dt+val, 1);
-    if (dt[val].length==1) BIT_skipBits(DStream, dt[val].nbBits);
-    else {
-        if (DStream->bitsConsumed < (sizeof(DStream->bitContainer)*8)) {
-            BIT_skipBits(DStream, dt[val].nbBits);
-            if (DStream->bitsConsumed > (sizeof(DStream->bitContainer)*8))
-                /* ugly hack; works only because it's the last symbol. Note : can't easily extract nbBits from just this symbol */
-                DStream->bitsConsumed = (sizeof(DStream->bitContainer)*8);
-    }   }
-    return 1;
-}
-
-#define HUF_DECODE_SYMBOLX2_0(ptr, DStreamPtr) \
-    ptr += HUF_decodeSymbolX2(ptr, DStreamPtr, dt, dtLog)
-
-#define HUF_DECODE_SYMBOLX2_1(ptr, DStreamPtr) \
-    if (MEM_64bits() || (HUF_TABLELOG_MAX<=12)) \
-        ptr += HUF_decodeSymbolX2(ptr, DStreamPtr, dt, dtLog)
-
-#define HUF_DECODE_SYMBOLX2_2(ptr, DStreamPtr) \
-    if (MEM_64bits()) \
-        ptr += HUF_decodeSymbolX2(ptr, DStreamPtr, dt, dtLog)
-
-HINT_INLINE size_t
-HUF_decodeStreamX2(BYTE* p, BIT_DStream_t* bitDPtr, BYTE* const pEnd,
-                const HUF_DEltX2* const dt, const U32 dtLog)
-{
-    BYTE* const pStart = p;
-
-    /* up to 8 symbols at a time */
-    while ((BIT_reloadDStream(bitDPtr) == BIT_DStream_unfinished) & (p < pEnd-(sizeof(bitDPtr->bitContainer)-1))) {
-        HUF_DECODE_SYMBOLX2_2(p, bitDPtr);
-        HUF_DECODE_SYMBOLX2_1(p, bitDPtr);
-        HUF_DECODE_SYMBOLX2_2(p, bitDPtr);
-        HUF_DECODE_SYMBOLX2_0(p, bitDPtr);
-    }
-
-    /* closer to end : up to 2 symbols at a time */
-    while ((BIT_reloadDStream(bitDPtr) == BIT_DStream_unfinished) & (p <= pEnd-2))
-        HUF_DECODE_SYMBOLX2_0(p, bitDPtr);
-
-    while (p <= pEnd-2)
-        HUF_DECODE_SYMBOLX2_0(p, bitDPtr);   /* no need to reload : reached the end of DStream */
-
-    if (p < pEnd)
-        p += HUF_decodeLastSymbolX2(p, bitDPtr, dt, dtLog);
-
-    return p-pStart;
-}
-
-FORCE_INLINE_TEMPLATE size_t
-HUF_decompress1X2_usingDTable_internal_body(
-          void* dst,  size_t dstSize,
-    const void* cSrc, size_t cSrcSize,
-    const HUF_DTable* DTable)
-{
-    BIT_DStream_t bitD;
-
-    /* Init */
-    CHECK_F( BIT_initDStream(&bitD, cSrc, cSrcSize) );
-
-    /* decode */
-    {   BYTE* const ostart = (BYTE*) dst;
-        BYTE* const oend = ostart + dstSize;
-        const void* const dtPtr = DTable+1;   /* force compiler to not use strict-aliasing */
-        const HUF_DEltX2* const dt = (const HUF_DEltX2*)dtPtr;
-        DTableDesc const dtd = HUF_getDTableDesc(DTable);
-        HUF_decodeStreamX2(ostart, &bitD, oend, dt, dtd.tableLog);
-    }
-
-    /* check */
-    if (!BIT_endOfDStream(&bitD)) return ERROR(corruption_detected);
-
-    /* decoded size */
-    return dstSize;
-}
-
-
-FORCE_INLINE_TEMPLATE size_t
-HUF_decompress4X2_usingDTable_internal_body(
-          void* dst,  size_t dstSize,
-    const void* cSrc, size_t cSrcSize,
-    const HUF_DTable* DTable)
-{
-    if (cSrcSize < 10) return ERROR(corruption_detected);   /* strict minimum : jump table + 1 byte per stream */
-
-    {   const BYTE* const istart = (const BYTE*) cSrc;
-        BYTE* const ostart = (BYTE*) dst;
-        BYTE* const oend = ostart + dstSize;
-        const void* const dtPtr = DTable+1;
-        const HUF_DEltX2* const dt = (const HUF_DEltX2*)dtPtr;
-
-        /* Init */
-        BIT_DStream_t bitD1;
-        BIT_DStream_t bitD2;
-        BIT_DStream_t bitD3;
-        BIT_DStream_t bitD4;
-        size_t const length1 = MEM_readLE16(istart);
-        size_t const length2 = MEM_readLE16(istart+2);
-        size_t const length3 = MEM_readLE16(istart+4);
-        size_t const length4 = cSrcSize - (length1 + length2 + length3 + 6);
-        const BYTE* const istart1 = istart + 6;  /* jumpTable */
-        const BYTE* const istart2 = istart1 + length1;
-        const BYTE* const istart3 = istart2 + length2;
-        const BYTE* const istart4 = istart3 + length3;
-        size_t const segmentSize = (dstSize+3) / 4;
-        BYTE* const opStart2 = ostart + segmentSize;
-        BYTE* const opStart3 = opStart2 + segmentSize;
-        BYTE* const opStart4 = opStart3 + segmentSize;
-        BYTE* op1 = ostart;
-        BYTE* op2 = opStart2;
-        BYTE* op3 = opStart3;
-        BYTE* op4 = opStart4;
-        U32 endSignal;
-        DTableDesc const dtd = HUF_getDTableDesc(DTable);
-        U32 const dtLog = dtd.tableLog;
-
-        if (length4 > cSrcSize) return ERROR(corruption_detected);   /* overflow */
-        CHECK_F( BIT_initDStream(&bitD1, istart1, length1) );
-        CHECK_F( BIT_initDStream(&bitD2, istart2, length2) );
-        CHECK_F( BIT_initDStream(&bitD3, istart3, length3) );
-        CHECK_F( BIT_initDStream(&bitD4, istart4, length4) );
-
-        /* 16-32 symbols per loop (4-8 symbols per stream) */
-        endSignal = BIT_reloadDStream(&bitD1) | BIT_reloadDStream(&bitD2) | BIT_reloadDStream(&bitD3) | BIT_reloadDStream(&bitD4);
-        for ( ; (endSignal==BIT_DStream_unfinished) & (op4<(oend-(sizeof(bitD4.bitContainer)-1))) ; ) {
-            HUF_DECODE_SYMBOLX2_2(op1, &bitD1);
-            HUF_DECODE_SYMBOLX2_2(op2, &bitD2);
-            HUF_DECODE_SYMBOLX2_2(op3, &bitD3);
-            HUF_DECODE_SYMBOLX2_2(op4, &bitD4);
-            HUF_DECODE_SYMBOLX2_1(op1, &bitD1);
-            HUF_DECODE_SYMBOLX2_1(op2, &bitD2);
-            HUF_DECODE_SYMBOLX2_1(op3, &bitD3);
-            HUF_DECODE_SYMBOLX2_1(op4, &bitD4);
-            HUF_DECODE_SYMBOLX2_2(op1, &bitD1);
-            HUF_DECODE_SYMBOLX2_2(op2, &bitD2);
-            HUF_DECODE_SYMBOLX2_2(op3, &bitD3);
-            HUF_DECODE_SYMBOLX2_2(op4, &bitD4);
-            HUF_DECODE_SYMBOLX2_0(op1, &bitD1);
-            HUF_DECODE_SYMBOLX2_0(op2, &bitD2);
-            HUF_DECODE_SYMBOLX2_0(op3, &bitD3);
-            HUF_DECODE_SYMBOLX2_0(op4, &bitD4);
-
-            endSignal = BIT_reloadDStream(&bitD1) | BIT_reloadDStream(&bitD2) | BIT_reloadDStream(&bitD3) | BIT_reloadDStream(&bitD4);
-        }
-
-        /* check corruption */
-        if (op1 > opStart2) return ERROR(corruption_detected);
-        if (op2 > opStart3) return ERROR(corruption_detected);
-        if (op3 > opStart4) return ERROR(corruption_detected);
-        /* note : op4 already verified within main loop */
-
-        /* finish bitStreams one by one */
-        HUF_decodeStreamX2(op1, &bitD1, opStart2, dt, dtLog);
-        HUF_decodeStreamX2(op2, &bitD2, opStart3, dt, dtLog);
-        HUF_decodeStreamX2(op3, &bitD3, opStart4, dt, dtLog);
-        HUF_decodeStreamX2(op4, &bitD4, oend,     dt, dtLog);
-
-        /* check */
-        { U32 const endCheck = BIT_endOfDStream(&bitD1) & BIT_endOfDStream(&bitD2) & BIT_endOfDStream(&bitD3) & BIT_endOfDStream(&bitD4);
-          if (!endCheck) return ERROR(corruption_detected); }
-
-        /* decoded size */
-        return dstSize;
-    }
-}
-
-HUF_DGEN(HUF_decompress1X2_usingDTable_internal)
-HUF_DGEN(HUF_decompress4X2_usingDTable_internal)
-
-size_t HUF_decompress1X2_usingDTable(
-          void* dst,  size_t dstSize,
-    const void* cSrc, size_t cSrcSize,
-    const HUF_DTable* DTable)
-{
-    DTableDesc dtd = HUF_getDTableDesc(DTable);
-    if (dtd.tableType != 1) return ERROR(GENERIC);
-    return HUF_decompress1X2_usingDTable_internal(dst, dstSize, cSrc, cSrcSize, DTable, /* bmi2 */ 0);
-}
-
-size_t HUF_decompress1X2_DCtx_wksp(HUF_DTable* DCtx, void* dst, size_t dstSize,
-                                   const void* cSrc, size_t cSrcSize,
-                                   void* workSpace, size_t wkspSize)
-{
-    const BYTE* ip = (const BYTE*) cSrc;
-
-    size_t const hSize = HUF_readDTableX2_wksp(DCtx, cSrc, cSrcSize,
-                                               workSpace, wkspSize);
-    if (HUF_isError(hSize)) return hSize;
-    if (hSize >= cSrcSize) return ERROR(srcSize_wrong);
-    ip += hSize; cSrcSize -= hSize;
-
-    return HUF_decompress1X2_usingDTable_internal(dst, dstSize, ip, cSrcSize, DCtx, /* bmi2 */ 0);
-}
-
-
-size_t HUF_decompress1X2_DCtx(HUF_DTable* DCtx, void* dst, size_t dstSize,
-                              const void* cSrc, size_t cSrcSize)
-{
-    U32 workSpace[HUF_DECOMPRESS_WORKSPACE_SIZE_U32];
-    return HUF_decompress1X2_DCtx_wksp(DCtx, dst, dstSize, cSrc, cSrcSize,
-                                       workSpace, sizeof(workSpace));
-}
-
-size_t HUF_decompress1X2 (void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize)
-{
-    HUF_CREATE_STATIC_DTABLEX2(DTable, HUF_TABLELOG_MAX);
-    return HUF_decompress1X2_DCtx(DTable, dst, dstSize, cSrc, cSrcSize);
-}
-
-size_t HUF_decompress4X2_usingDTable(
-          void* dst,  size_t dstSize,
-    const void* cSrc, size_t cSrcSize,
-    const HUF_DTable* DTable)
-{
-    DTableDesc dtd = HUF_getDTableDesc(DTable);
-    if (dtd.tableType != 1) return ERROR(GENERIC);
-    return HUF_decompress4X2_usingDTable_internal(dst, dstSize, cSrc, cSrcSize, DTable, /* bmi2 */ 0);
-}
-
-static size_t HUF_decompress4X2_DCtx_wksp_bmi2(HUF_DTable* dctx, void* dst, size_t dstSize,
-                                   const void* cSrc, size_t cSrcSize,
-                                   void* workSpace, size_t wkspSize, int bmi2)
-{
-    const BYTE* ip = (const BYTE*) cSrc;
-
-    size_t hSize = HUF_readDTableX2_wksp(dctx, cSrc, cSrcSize,
-                                         workSpace, wkspSize);
-    if (HUF_isError(hSize)) return hSize;
-    if (hSize >= cSrcSize) return ERROR(srcSize_wrong);
-    ip += hSize; cSrcSize -= hSize;
-
-    return HUF_decompress4X2_usingDTable_internal(dst, dstSize, ip, cSrcSize, dctx, bmi2);
-}
-
-size_t HUF_decompress4X2_DCtx_wksp(HUF_DTable* dctx, void* dst, size_t dstSize,
-                                   const void* cSrc, size_t cSrcSize,
-                                   void* workSpace, size_t wkspSize)
-{
-    return HUF_decompress4X2_DCtx_wksp_bmi2(dctx, dst, dstSize, cSrc, cSrcSize, workSpace, wkspSize, /* bmi2 */ 0);
-}
-
-
-size_t HUF_decompress4X2_DCtx(HUF_DTable* dctx, void* dst, size_t dstSize,
-                              const void* cSrc, size_t cSrcSize)
-{
-    U32 workSpace[HUF_DECOMPRESS_WORKSPACE_SIZE_U32];
-    return HUF_decompress4X2_DCtx_wksp(dctx, dst, dstSize, cSrc, cSrcSize,
-                                       workSpace, sizeof(workSpace));
-}
-
-size_t HUF_decompress4X2 (void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize)
-{
-    HUF_CREATE_STATIC_DTABLEX2(DTable, HUF_TABLELOG_MAX);
-    return HUF_decompress4X2_DCtx(DTable, dst, dstSize, cSrc, cSrcSize);
-}
-
-#endif /* HUF_FORCE_DECOMPRESS_X1 */
-
-
-/* ***********************************/
-/* Universal decompression selectors */
-/* ***********************************/
-
-size_t HUF_decompress1X_usingDTable(void* dst, size_t maxDstSize,
-                                    const void* cSrc, size_t cSrcSize,
-                                    const HUF_DTable* DTable)
-{
-    DTableDesc const dtd = HUF_getDTableDesc(DTable);
-#if defined(HUF_FORCE_DECOMPRESS_X1)
-    (void)dtd;
-    assert(dtd.tableType == 0);
-    return HUF_decompress1X1_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, /* bmi2 */ 0);
-#elif defined(HUF_FORCE_DECOMPRESS_X2)
-    (void)dtd;
-    assert(dtd.tableType == 1);
-    return HUF_decompress1X2_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, /* bmi2 */ 0);
-#else
-    return dtd.tableType ? HUF_decompress1X2_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, /* bmi2 */ 0) :
-                           HUF_decompress1X1_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, /* bmi2 */ 0);
-#endif
-}
-
-size_t HUF_decompress4X_usingDTable(void* dst, size_t maxDstSize,
-                                    const void* cSrc, size_t cSrcSize,
-                                    const HUF_DTable* DTable)
-{
-    DTableDesc const dtd = HUF_getDTableDesc(DTable);
-#if defined(HUF_FORCE_DECOMPRESS_X1)
-    (void)dtd;
-    assert(dtd.tableType == 0);
-    return HUF_decompress4X1_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, /* bmi2 */ 0);
-#elif defined(HUF_FORCE_DECOMPRESS_X2)
-    (void)dtd;
-    assert(dtd.tableType == 1);
-    return HUF_decompress4X2_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, /* bmi2 */ 0);
-#else
-    return dtd.tableType ? HUF_decompress4X2_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, /* bmi2 */ 0) :
-                           HUF_decompress4X1_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, /* bmi2 */ 0);
-#endif
-}
-
-
-#if !defined(HUF_FORCE_DECOMPRESS_X1) && !defined(HUF_FORCE_DECOMPRESS_X2)
-typedef struct { U32 tableTime; U32 decode256Time; } algo_time_t;
-static const algo_time_t algoTime[16 /* Quantization */][3 /* single, double, quad */] =
-{
-    /* single, double, quad */
-    {{0,0}, {1,1}, {2,2}},  /* Q==0 : impossible */
-    {{0,0}, {1,1}, {2,2}},  /* Q==1 : impossible */
-    {{  38,130}, {1313, 74}, {2151, 38}},   /* Q == 2 : 12-18% */
-    {{ 448,128}, {1353, 74}, {2238, 41}},   /* Q == 3 : 18-25% */
-    {{ 556,128}, {1353, 74}, {2238, 47}},   /* Q == 4 : 25-32% */
-    {{ 714,128}, {1418, 74}, {2436, 53}},   /* Q == 5 : 32-38% */
-    {{ 883,128}, {1437, 74}, {2464, 61}},   /* Q == 6 : 38-44% */
-    {{ 897,128}, {1515, 75}, {2622, 68}},   /* Q == 7 : 44-50% */
-    {{ 926,128}, {1613, 75}, {2730, 75}},   /* Q == 8 : 50-56% */
-    {{ 947,128}, {1729, 77}, {3359, 77}},   /* Q == 9 : 56-62% */
-    {{1107,128}, {2083, 81}, {4006, 84}},   /* Q ==10 : 62-69% */
-    {{1177,128}, {2379, 87}, {4785, 88}},   /* Q ==11 : 69-75% */
-    {{1242,128}, {2415, 93}, {5155, 84}},   /* Q ==12 : 75-81% */
-    {{1349,128}, {2644,106}, {5260,106}},   /* Q ==13 : 81-87% */
-    {{1455,128}, {2422,124}, {4174,124}},   /* Q ==14 : 87-93% */
-    {{ 722,128}, {1891,145}, {1936,146}},   /* Q ==15 : 93-99% */
-};
-#endif
-
-/** HUF_selectDecoder() :
- *  Tells which decoder is likely to decode faster,
- *  based on a set of pre-computed metrics.
- * @return : 0==HUF_decompress4X1, 1==HUF_decompress4X2 .
- *  Assumption : 0 < dstSize <= 128 KB */
-U32 HUF_selectDecoder (size_t dstSize, size_t cSrcSize)
-{
-    assert(dstSize > 0);
-    assert(dstSize <= 128*1024);
-#if defined(HUF_FORCE_DECOMPRESS_X1)
-    (void)dstSize;
-    (void)cSrcSize;
-    return 0;
-#elif defined(HUF_FORCE_DECOMPRESS_X2)
-    (void)dstSize;
-    (void)cSrcSize;
-    return 1;
-#else
-    /* decoder timing evaluation */
-    {   U32 const Q = (cSrcSize >= dstSize) ? 15 : (U32)(cSrcSize * 16 / dstSize);   /* Q < 16 */
-        U32 const D256 = (U32)(dstSize >> 8);
-        U32 const DTime0 = algoTime[Q][0].tableTime + (algoTime[Q][0].decode256Time * D256);
-        U32 DTime1 = algoTime[Q][1].tableTime + (algoTime[Q][1].decode256Time * D256);
-        DTime1 += DTime1 >> 3;  /* advantage to algorithm using less memory, to reduce cache eviction */
-        return DTime1 < DTime0;
-    }
-#endif
-}
-
-
-typedef size_t (*decompressionAlgo)(void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize);
-
-size_t HUF_decompress (void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize)
-{
-#if !defined(HUF_FORCE_DECOMPRESS_X1) && !defined(HUF_FORCE_DECOMPRESS_X2)
-    static const decompressionAlgo decompress[2] = { HUF_decompress4X1, HUF_decompress4X2 };
-#endif
-
-    /* validation checks */
-    if (dstSize == 0) return ERROR(dstSize_tooSmall);
-    if (cSrcSize > dstSize) return ERROR(corruption_detected);   /* invalid */
-    if (cSrcSize == dstSize) { memcpy(dst, cSrc, dstSize); return dstSize; }   /* not compressed */
-    if (cSrcSize == 1) { memset(dst, *(const BYTE*)cSrc, dstSize); return dstSize; }   /* RLE */
-
-    {   U32 const algoNb = HUF_selectDecoder(dstSize, cSrcSize);
-#if defined(HUF_FORCE_DECOMPRESS_X1)
-        (void)algoNb;
-        assert(algoNb == 0);
-        return HUF_decompress4X1(dst, dstSize, cSrc, cSrcSize);
-#elif defined(HUF_FORCE_DECOMPRESS_X2)
-        (void)algoNb;
-        assert(algoNb == 1);
-        return HUF_decompress4X2(dst, dstSize, cSrc, cSrcSize);
-#else
-        return decompress[algoNb](dst, dstSize, cSrc, cSrcSize);
-#endif
-    }
-}
-
-size_t HUF_decompress4X_DCtx (HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize)
-{
-    /* validation checks */
-    if (dstSize == 0) return ERROR(dstSize_tooSmall);
-    if (cSrcSize > dstSize) return ERROR(corruption_detected);   /* invalid */
-    if (cSrcSize == dstSize) { memcpy(dst, cSrc, dstSize); return dstSize; }   /* not compressed */
-    if (cSrcSize == 1) { memset(dst, *(const BYTE*)cSrc, dstSize); return dstSize; }   /* RLE */
-
-    {   U32 const algoNb = HUF_selectDecoder(dstSize, cSrcSize);
-#if defined(HUF_FORCE_DECOMPRESS_X1)
-        (void)algoNb;
-        assert(algoNb == 0);
-        return HUF_decompress4X1_DCtx(dctx, dst, dstSize, cSrc, cSrcSize);
-#elif defined(HUF_FORCE_DECOMPRESS_X2)
-        (void)algoNb;
-        assert(algoNb == 1);
-        return HUF_decompress4X2_DCtx(dctx, dst, dstSize, cSrc, cSrcSize);
-#else
-        return algoNb ? HUF_decompress4X2_DCtx(dctx, dst, dstSize, cSrc, cSrcSize) :
-                        HUF_decompress4X1_DCtx(dctx, dst, dstSize, cSrc, cSrcSize) ;
-#endif
-    }
-}
-
-size_t HUF_decompress4X_hufOnly(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize)
-{
-    U32 workSpace[HUF_DECOMPRESS_WORKSPACE_SIZE_U32];
-    return HUF_decompress4X_hufOnly_wksp(dctx, dst, dstSize, cSrc, cSrcSize,
-                                         workSpace, sizeof(workSpace));
-}
-
-
-size_t HUF_decompress4X_hufOnly_wksp(HUF_DTable* dctx, void* dst,
-                                     size_t dstSize, const void* cSrc,
-                                     size_t cSrcSize, void* workSpace,
-                                     size_t wkspSize)
-{
-    /* validation checks */
-    if (dstSize == 0) return ERROR(dstSize_tooSmall);
-    if (cSrcSize == 0) return ERROR(corruption_detected);
-
-    {   U32 const algoNb = HUF_selectDecoder(dstSize, cSrcSize);
-#if defined(HUF_FORCE_DECOMPRESS_X1)
-        (void)algoNb;
-        assert(algoNb == 0);
-        return HUF_decompress4X1_DCtx_wksp(dctx, dst, dstSize, cSrc, cSrcSize, workSpace, wkspSize);
-#elif defined(HUF_FORCE_DECOMPRESS_X2)
-        (void)algoNb;
-        assert(algoNb == 1);
-        return HUF_decompress4X2_DCtx_wksp(dctx, dst, dstSize, cSrc, cSrcSize, workSpace, wkspSize);
-#else
-        return algoNb ? HUF_decompress4X2_DCtx_wksp(dctx, dst, dstSize, cSrc,
-                            cSrcSize, workSpace, wkspSize):
-                        HUF_decompress4X1_DCtx_wksp(dctx, dst, dstSize, cSrc, cSrcSize, workSpace, wkspSize);
-#endif
-    }
-}
-
-size_t HUF_decompress1X_DCtx_wksp(HUF_DTable* dctx, void* dst, size_t dstSize,
-                                  const void* cSrc, size_t cSrcSize,
-                                  void* workSpace, size_t wkspSize)
-{
-    /* validation checks */
-    if (dstSize == 0) return ERROR(dstSize_tooSmall);
-    if (cSrcSize > dstSize) return ERROR(corruption_detected);   /* invalid */
-    if (cSrcSize == dstSize) { memcpy(dst, cSrc, dstSize); return dstSize; }   /* not compressed */
-    if (cSrcSize == 1) { memset(dst, *(const BYTE*)cSrc, dstSize); return dstSize; }   /* RLE */
-
-    {   U32 const algoNb = HUF_selectDecoder(dstSize, cSrcSize);
-#if defined(HUF_FORCE_DECOMPRESS_X1)
-        (void)algoNb;
-        assert(algoNb == 0);
-        return HUF_decompress1X1_DCtx_wksp(dctx, dst, dstSize, cSrc,
-                                cSrcSize, workSpace, wkspSize);
-#elif defined(HUF_FORCE_DECOMPRESS_X2)
-        (void)algoNb;
-        assert(algoNb == 1);
-        return HUF_decompress1X2_DCtx_wksp(dctx, dst, dstSize, cSrc,
-                                cSrcSize, workSpace, wkspSize);
-#else
-        return algoNb ? HUF_decompress1X2_DCtx_wksp(dctx, dst, dstSize, cSrc,
-                                cSrcSize, workSpace, wkspSize):
-                        HUF_decompress1X1_DCtx_wksp(dctx, dst, dstSize, cSrc,
-                                cSrcSize, workSpace, wkspSize);
-#endif
-    }
-}
-
-size_t HUF_decompress1X_DCtx(HUF_DTable* dctx, void* dst, size_t dstSize,
-                             const void* cSrc, size_t cSrcSize)
-{
-    U32 workSpace[HUF_DECOMPRESS_WORKSPACE_SIZE_U32];
-    return HUF_decompress1X_DCtx_wksp(dctx, dst, dstSize, cSrc, cSrcSize,
-                                      workSpace, sizeof(workSpace));
-}
-
-
-size_t HUF_decompress1X_usingDTable_bmi2(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const HUF_DTable* DTable, int bmi2)
-{
-    DTableDesc const dtd = HUF_getDTableDesc(DTable);
-#if defined(HUF_FORCE_DECOMPRESS_X1)
-    (void)dtd;
-    assert(dtd.tableType == 0);
-    return HUF_decompress1X1_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, bmi2);
-#elif defined(HUF_FORCE_DECOMPRESS_X2)
-    (void)dtd;
-    assert(dtd.tableType == 1);
-    return HUF_decompress1X2_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, bmi2);
-#else
-    return dtd.tableType ? HUF_decompress1X2_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, bmi2) :
-                           HUF_decompress1X1_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, bmi2);
-#endif
-}
-
-#ifndef HUF_FORCE_DECOMPRESS_X2
-size_t HUF_decompress1X1_DCtx_wksp_bmi2(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize, void* workSpace, size_t wkspSize, int bmi2)
-{
-    const BYTE* ip = (const BYTE*) cSrc;
-
-    size_t const hSize = HUF_readDTableX1_wksp(dctx, cSrc, cSrcSize, workSpace, wkspSize);
-    if (HUF_isError(hSize)) return hSize;
-    if (hSize >= cSrcSize) return ERROR(srcSize_wrong);
-    ip += hSize; cSrcSize -= hSize;
-
-    return HUF_decompress1X1_usingDTable_internal(dst, dstSize, ip, cSrcSize, dctx, bmi2);
-}
-#endif
-
-size_t HUF_decompress4X_usingDTable_bmi2(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const HUF_DTable* DTable, int bmi2)
-{
-    DTableDesc const dtd = HUF_getDTableDesc(DTable);
-#if defined(HUF_FORCE_DECOMPRESS_X1)
-    (void)dtd;
-    assert(dtd.tableType == 0);
-    return HUF_decompress4X1_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, bmi2);
-#elif defined(HUF_FORCE_DECOMPRESS_X2)
-    (void)dtd;
-    assert(dtd.tableType == 1);
-    return HUF_decompress4X2_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, bmi2);
-#else
-    return dtd.tableType ? HUF_decompress4X2_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, bmi2) :
-                           HUF_decompress4X1_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, bmi2);
-#endif
-}
-
-size_t HUF_decompress4X_hufOnly_wksp_bmi2(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize, void* workSpace, size_t wkspSize, int bmi2)
-{
-    /* validation checks */
-    if (dstSize == 0) return ERROR(dstSize_tooSmall);
-    if (cSrcSize == 0) return ERROR(corruption_detected);
-
-    {   U32 const algoNb = HUF_selectDecoder(dstSize, cSrcSize);
-#if defined(HUF_FORCE_DECOMPRESS_X1)
-        (void)algoNb;
-        assert(algoNb == 0);
-        return HUF_decompress4X1_DCtx_wksp_bmi2(dctx, dst, dstSize, cSrc, cSrcSize, workSpace, wkspSize, bmi2);
-#elif defined(HUF_FORCE_DECOMPRESS_X2)
-        (void)algoNb;
-        assert(algoNb == 1);
-        return HUF_decompress4X2_DCtx_wksp_bmi2(dctx, dst, dstSize, cSrc, cSrcSize, workSpace, wkspSize, bmi2);
-#else
-        return algoNb ? HUF_decompress4X2_DCtx_wksp_bmi2(dctx, dst, dstSize, cSrc, cSrcSize, workSpace, wkspSize, bmi2) :
-                        HUF_decompress4X1_DCtx_wksp_bmi2(dctx, dst, dstSize, cSrc, cSrcSize, workSpace, wkspSize, bmi2);
-#endif
-    }
-}
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/decompress/zstd_ddict.c mysql-8.0-8.0.27/extra/zstd/lib/decompress/zstd_ddict.c
--- mysql-8.0-8.0.26/extra/zstd/lib/decompress/zstd_ddict.c	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/decompress/zstd_ddict.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,240 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
-/* zstd_ddict.c :
- * concentrates all logic that needs to know the internals of ZSTD_DDict object */
-
-/*-*******************************************************
-*  Dependencies
-*********************************************************/
-#include <string.h>      /* memcpy, memmove, memset */
-#include "cpu.h"         /* bmi2 */
-#include "mem.h"         /* low level memory routines */
-#define FSE_STATIC_LINKING_ONLY
-#include "fse.h"
-#define HUF_STATIC_LINKING_ONLY
-#include "huf.h"
-#include "zstd_decompress_internal.h"
-#include "zstd_ddict.h"
-
-#if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT>=1)
-#  include "zstd_legacy.h"
-#endif
-
-
-
-/*-*******************************************************
-*  Types
-*********************************************************/
-struct ZSTD_DDict_s {
-    void* dictBuffer;
-    const void* dictContent;
-    size_t dictSize;
-    ZSTD_entropyDTables_t entropy;
-    U32 dictID;
-    U32 entropyPresent;
-    ZSTD_customMem cMem;
-};  /* typedef'd to ZSTD_DDict within "zstd.h" */
-
-const void* ZSTD_DDict_dictContent(const ZSTD_DDict* ddict)
-{
-    assert(ddict != NULL);
-    return ddict->dictContent;
-}
-
-size_t ZSTD_DDict_dictSize(const ZSTD_DDict* ddict)
-{
-    assert(ddict != NULL);
-    return ddict->dictSize;
-}
-
-void ZSTD_copyDDictParameters(ZSTD_DCtx* dctx, const ZSTD_DDict* ddict)
-{
-    DEBUGLOG(4, "ZSTD_copyDDictParameters");
-    assert(dctx != NULL);
-    assert(ddict != NULL);
-    dctx->dictID = ddict->dictID;
-    dctx->prefixStart = ddict->dictContent;
-    dctx->virtualStart = ddict->dictContent;
-    dctx->dictEnd = (const BYTE*)ddict->dictContent + ddict->dictSize;
-    dctx->previousDstEnd = dctx->dictEnd;
-    if (ddict->entropyPresent) {
-        dctx->litEntropy = 1;
-        dctx->fseEntropy = 1;
-        dctx->LLTptr = ddict->entropy.LLTable;
-        dctx->MLTptr = ddict->entropy.MLTable;
-        dctx->OFTptr = ddict->entropy.OFTable;
-        dctx->HUFptr = ddict->entropy.hufTable;
-        dctx->entropy.rep[0] = ddict->entropy.rep[0];
-        dctx->entropy.rep[1] = ddict->entropy.rep[1];
-        dctx->entropy.rep[2] = ddict->entropy.rep[2];
-    } else {
-        dctx->litEntropy = 0;
-        dctx->fseEntropy = 0;
-    }
-}
-
-
-static size_t
-ZSTD_loadEntropy_intoDDict(ZSTD_DDict* ddict,
-                           ZSTD_dictContentType_e dictContentType)
-{
-    ddict->dictID = 0;
-    ddict->entropyPresent = 0;
-    if (dictContentType == ZSTD_dct_rawContent) return 0;
-
-    if (ddict->dictSize < 8) {
-        if (dictContentType == ZSTD_dct_fullDict)
-            return ERROR(dictionary_corrupted);   /* only accept specified dictionaries */
-        return 0;   /* pure content mode */
-    }
-    {   U32 const magic = MEM_readLE32(ddict->dictContent);
-        if (magic != ZSTD_MAGIC_DICTIONARY) {
-            if (dictContentType == ZSTD_dct_fullDict)
-                return ERROR(dictionary_corrupted);   /* only accept specified dictionaries */
-            return 0;   /* pure content mode */
-        }
-    }
-    ddict->dictID = MEM_readLE32((const char*)ddict->dictContent + ZSTD_FRAMEIDSIZE);
-
-    /* load entropy tables */
-    RETURN_ERROR_IF(ZSTD_isError(ZSTD_loadDEntropy(
-            &ddict->entropy, ddict->dictContent, ddict->dictSize)),
-        dictionary_corrupted);
-    ddict->entropyPresent = 1;
-    return 0;
-}
-
-
-static size_t ZSTD_initDDict_internal(ZSTD_DDict* ddict,
-                                      const void* dict, size_t dictSize,
-                                      ZSTD_dictLoadMethod_e dictLoadMethod,
-                                      ZSTD_dictContentType_e dictContentType)
-{
-    if ((dictLoadMethod == ZSTD_dlm_byRef) || (!dict) || (!dictSize)) {
-        ddict->dictBuffer = NULL;
-        ddict->dictContent = dict;
-        if (!dict) dictSize = 0;
-    } else {
-        void* const internalBuffer = ZSTD_malloc(dictSize, ddict->cMem);
-        ddict->dictBuffer = internalBuffer;
-        ddict->dictContent = internalBuffer;
-        if (!internalBuffer) return ERROR(memory_allocation);
-        memcpy(internalBuffer, dict, dictSize);
-    }
-    ddict->dictSize = dictSize;
-    ddict->entropy.hufTable[0] = (HUF_DTable)((HufLog)*0x1000001);  /* cover both little and big endian */
-
-    /* parse dictionary content */
-    FORWARD_IF_ERROR( ZSTD_loadEntropy_intoDDict(ddict, dictContentType) );
-
-    return 0;
-}
-
-ZSTD_DDict* ZSTD_createDDict_advanced(const void* dict, size_t dictSize,
-                                      ZSTD_dictLoadMethod_e dictLoadMethod,
-                                      ZSTD_dictContentType_e dictContentType,
-                                      ZSTD_customMem customMem)
-{
-    if (!customMem.customAlloc ^ !customMem.customFree) return NULL;
-
-    {   ZSTD_DDict* const ddict = (ZSTD_DDict*) ZSTD_malloc(sizeof(ZSTD_DDict), customMem);
-        if (ddict == NULL) return NULL;
-        ddict->cMem = customMem;
-        {   size_t const initResult = ZSTD_initDDict_internal(ddict,
-                                            dict, dictSize,
-                                            dictLoadMethod, dictContentType);
-            if (ZSTD_isError(initResult)) {
-                ZSTD_freeDDict(ddict);
-                return NULL;
-        }   }
-        return ddict;
-    }
-}
-
-/*! ZSTD_createDDict() :
-*   Create a digested dictionary, to start decompression without startup delay.
-*   `dict` content is copied inside DDict.
-*   Consequently, `dict` can be released after `ZSTD_DDict` creation */
-ZSTD_DDict* ZSTD_createDDict(const void* dict, size_t dictSize)
-{
-    ZSTD_customMem const allocator = { NULL, NULL, NULL };
-    return ZSTD_createDDict_advanced(dict, dictSize, ZSTD_dlm_byCopy, ZSTD_dct_auto, allocator);
-}
-
-/*! ZSTD_createDDict_byReference() :
- *  Create a digested dictionary, to start decompression without startup delay.
- *  Dictionary content is simply referenced, it will be accessed during decompression.
- *  Warning : dictBuffer must outlive DDict (DDict must be freed before dictBuffer) */
-ZSTD_DDict* ZSTD_createDDict_byReference(const void* dictBuffer, size_t dictSize)
-{
-    ZSTD_customMem const allocator = { NULL, NULL, NULL };
-    return ZSTD_createDDict_advanced(dictBuffer, dictSize, ZSTD_dlm_byRef, ZSTD_dct_auto, allocator);
-}
-
-
-const ZSTD_DDict* ZSTD_initStaticDDict(
-                                void* sBuffer, size_t sBufferSize,
-                                const void* dict, size_t dictSize,
-                                ZSTD_dictLoadMethod_e dictLoadMethod,
-                                ZSTD_dictContentType_e dictContentType)
-{
-    size_t const neededSpace = sizeof(ZSTD_DDict)
-                             + (dictLoadMethod == ZSTD_dlm_byRef ? 0 : dictSize);
-    ZSTD_DDict* const ddict = (ZSTD_DDict*)sBuffer;
-    assert(sBuffer != NULL);
-    assert(dict != NULL);
-    if ((size_t)sBuffer & 7) return NULL;   /* 8-aligned */
-    if (sBufferSize < neededSpace) return NULL;
-    if (dictLoadMethod == ZSTD_dlm_byCopy) {
-        memcpy(ddict+1, dict, dictSize);  /* local copy */
-        dict = ddict+1;
-    }
-    if (ZSTD_isError( ZSTD_initDDict_internal(ddict,
-                                              dict, dictSize,
-                                              ZSTD_dlm_byRef, dictContentType) ))
-        return NULL;
-    return ddict;
-}
-
-
-size_t ZSTD_freeDDict(ZSTD_DDict* ddict)
-{
-    if (ddict==NULL) return 0;   /* support free on NULL */
-    {   ZSTD_customMem const cMem = ddict->cMem;
-        ZSTD_free(ddict->dictBuffer, cMem);
-        ZSTD_free(ddict, cMem);
-        return 0;
-    }
-}
-
-/*! ZSTD_estimateDDictSize() :
- *  Estimate amount of memory that will be needed to create a dictionary for decompression.
- *  Note : dictionary created by reference using ZSTD_dlm_byRef are smaller */
-size_t ZSTD_estimateDDictSize(size_t dictSize, ZSTD_dictLoadMethod_e dictLoadMethod)
-{
-    return sizeof(ZSTD_DDict) + (dictLoadMethod == ZSTD_dlm_byRef ? 0 : dictSize);
-}
-
-size_t ZSTD_sizeof_DDict(const ZSTD_DDict* ddict)
-{
-    if (ddict==NULL) return 0;   /* support sizeof on NULL */
-    return sizeof(*ddict) + (ddict->dictBuffer ? ddict->dictSize : 0) ;
-}
-
-/*! ZSTD_getDictID_fromDDict() :
- *  Provides the dictID of the dictionary loaded into `ddict`.
- *  If @return == 0, the dictionary is not conformant to Zstandard specification, or empty.
- *  Non-conformant dictionaries can still be loaded, but as content-only dictionaries. */
-unsigned ZSTD_getDictID_fromDDict(const ZSTD_DDict* ddict)
-{
-    if (ddict==NULL) return 0;
-    return ZSTD_getDictID_fromDict(ddict->dictContent, ddict->dictSize);
-}
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/decompress/zstd_ddict.h mysql-8.0-8.0.27/extra/zstd/lib/decompress/zstd_ddict.h
--- mysql-8.0-8.0.26/extra/zstd/lib/decompress/zstd_ddict.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/decompress/zstd_ddict.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
-
-#ifndef ZSTD_DDICT_H
-#define ZSTD_DDICT_H
-
-/*-*******************************************************
- *  Dependencies
- *********************************************************/
-#include <stddef.h>   /* size_t */
-#include "zstd.h"     /* ZSTD_DDict, and several public functions */
-
-
-/*-*******************************************************
- *  Interface
- *********************************************************/
-
-/* note: several prototypes are already published in `zstd.h` :
- * ZSTD_createDDict()
- * ZSTD_createDDict_byReference()
- * ZSTD_createDDict_advanced()
- * ZSTD_freeDDict()
- * ZSTD_initStaticDDict()
- * ZSTD_sizeof_DDict()
- * ZSTD_estimateDDictSize()
- * ZSTD_getDictID_fromDict()
- */
-
-const void* ZSTD_DDict_dictContent(const ZSTD_DDict* ddict);
-size_t ZSTD_DDict_dictSize(const ZSTD_DDict* ddict);
-
-void ZSTD_copyDDictParameters(ZSTD_DCtx* dctx, const ZSTD_DDict* ddict);
-
-
-
-#endif /* ZSTD_DDICT_H */
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/decompress/zstd_decompress_block.c mysql-8.0-8.0.27/extra/zstd/lib/decompress/zstd_decompress_block.c
--- mysql-8.0-8.0.26/extra/zstd/lib/decompress/zstd_decompress_block.c	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/decompress/zstd_decompress_block.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1325 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
-/* zstd_decompress_block :
- * this module takes care of decompressing _compressed_ block */
-
-/*-*******************************************************
-*  Dependencies
-*********************************************************/
-#include <string.h>      /* memcpy, memmove, memset */
-#include "compiler.h"    /* prefetch */
-#include "cpu.h"         /* bmi2 */
-#include "mem.h"         /* low level memory routines */
-#define FSE_STATIC_LINKING_ONLY
-#include "fse.h"
-#define HUF_STATIC_LINKING_ONLY
-#include "huf.h"
-#include "zstd_internal.h"
-#include "zstd_decompress_internal.h"   /* ZSTD_DCtx */
-#include "zstd_ddict.h"  /* ZSTD_DDictDictContent */
-#include "zstd_decompress_block.h"
-
-/*_*******************************************************
-*  Macros
-**********************************************************/
-
-/* These two optional macros force the use one way or another of the two
- * ZSTD_decompressSequences implementations. You can't force in both directions
- * at the same time.
- */
-#if defined(ZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT) && \
-    defined(ZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG)
-#error "Cannot force the use of the short and the long ZSTD_decompressSequences variants!"
-#endif
-
-
-/*_*******************************************************
-*  Memory operations
-**********************************************************/
-static void ZSTD_copy4(void* dst, const void* src) { memcpy(dst, src, 4); }
-
-
-/*-*************************************************************
- *   Block decoding
- ***************************************************************/
-
-/*! ZSTD_getcBlockSize() :
- *  Provides the size of compressed block from block header `src` */
-size_t ZSTD_getcBlockSize(const void* src, size_t srcSize,
-                          blockProperties_t* bpPtr)
-{
-    RETURN_ERROR_IF(srcSize < ZSTD_blockHeaderSize, srcSize_wrong);
-
-    {   U32 const cBlockHeader = MEM_readLE24(src);
-        U32 const cSize = cBlockHeader >> 3;
-        bpPtr->lastBlock = cBlockHeader & 1;
-        bpPtr->blockType = (blockType_e)((cBlockHeader >> 1) & 3);
-        bpPtr->origSize = cSize;   /* only useful for RLE */
-        if (bpPtr->blockType == bt_rle) return 1;
-        RETURN_ERROR_IF(bpPtr->blockType == bt_reserved, corruption_detected);
-        return cSize;
-    }
-}
-
-
-/* Hidden declaration for fullbench */
-size_t ZSTD_decodeLiteralsBlock(ZSTD_DCtx* dctx,
-                          const void* src, size_t srcSize);
-/*! ZSTD_decodeLiteralsBlock() :
- * @return : nb of bytes read from src (< srcSize )
- *  note : symbol not declared but exposed for fullbench */
-size_t ZSTD_decodeLiteralsBlock(ZSTD_DCtx* dctx,
-                          const void* src, size_t srcSize)   /* note : srcSize < BLOCKSIZE */
-{
-    DEBUGLOG(5, "ZSTD_decodeLiteralsBlock");
-    RETURN_ERROR_IF(srcSize < MIN_CBLOCK_SIZE, corruption_detected);
-
-    {   const BYTE* const istart = (const BYTE*) src;
-        symbolEncodingType_e const litEncType = (symbolEncodingType_e)(istart[0] & 3);
-
-        switch(litEncType)
-        {
-        case set_repeat:
-            DEBUGLOG(5, "set_repeat flag : re-using stats from previous compressed literals block");
-            RETURN_ERROR_IF(dctx->litEntropy==0, dictionary_corrupted);
-            /* fall-through */
-
-        case set_compressed:
-            RETURN_ERROR_IF(srcSize < 5, corruption_detected, "srcSize >= MIN_CBLOCK_SIZE == 3; here we need up to 5 for case 3");
-            {   size_t lhSize, litSize, litCSize;
-                U32 singleStream=0;
-                U32 const lhlCode = (istart[0] >> 2) & 3;
-                U32 const lhc = MEM_readLE32(istart);
-                size_t hufSuccess;
-                switch(lhlCode)
-                {
-                case 0: case 1: default:   /* note : default is impossible, since lhlCode into [0..3] */
-                    /* 2 - 2 - 10 - 10 */
-                    singleStream = !lhlCode;
-                    lhSize = 3;
-                    litSize  = (lhc >> 4) & 0x3FF;
-                    litCSize = (lhc >> 14) & 0x3FF;
-                    break;
-                case 2:
-                    /* 2 - 2 - 14 - 14 */
-                    lhSize = 4;
-                    litSize  = (lhc >> 4) & 0x3FFF;
-                    litCSize = lhc >> 18;
-                    break;
-                case 3:
-                    /* 2 - 2 - 18 - 18 */
-                    lhSize = 5;
-                    litSize  = (lhc >> 4) & 0x3FFFF;
-                    litCSize = (lhc >> 22) + ((size_t)istart[4] << 10);
-                    break;
-                }
-                RETURN_ERROR_IF(litSize > ZSTD_BLOCKSIZE_MAX, corruption_detected);
-                RETURN_ERROR_IF(litCSize + lhSize > srcSize, corruption_detected);
-
-                /* prefetch huffman table if cold */
-                if (dctx->ddictIsCold && (litSize > 768 /* heuristic */)) {
-                    PREFETCH_AREA(dctx->HUFptr, sizeof(dctx->entropy.hufTable));
-                }
-
-                if (litEncType==set_repeat) {
-                    if (singleStream) {
-                        hufSuccess = HUF_decompress1X_usingDTable_bmi2(
-                            dctx->litBuffer, litSize, istart+lhSize, litCSize,
-                            dctx->HUFptr, dctx->bmi2);
-                    } else {
-                        hufSuccess = HUF_decompress4X_usingDTable_bmi2(
-                            dctx->litBuffer, litSize, istart+lhSize, litCSize,
-                            dctx->HUFptr, dctx->bmi2);
-                    }
-                } else {
-                    if (singleStream) {
-#if defined(HUF_FORCE_DECOMPRESS_X2)
-                        hufSuccess = HUF_decompress1X_DCtx_wksp(
-                            dctx->entropy.hufTable, dctx->litBuffer, litSize,
-                            istart+lhSize, litCSize, dctx->workspace,
-                            sizeof(dctx->workspace));
-#else
-                        hufSuccess = HUF_decompress1X1_DCtx_wksp_bmi2(
-                            dctx->entropy.hufTable, dctx->litBuffer, litSize,
-                            istart+lhSize, litCSize, dctx->workspace,
-                            sizeof(dctx->workspace), dctx->bmi2);
-#endif
-                    } else {
-                        hufSuccess = HUF_decompress4X_hufOnly_wksp_bmi2(
-                            dctx->entropy.hufTable, dctx->litBuffer, litSize,
-                            istart+lhSize, litCSize, dctx->workspace,
-                            sizeof(dctx->workspace), dctx->bmi2);
-                    }
-                }
-
-                RETURN_ERROR_IF(HUF_isError(hufSuccess), corruption_detected);
-
-                dctx->litPtr = dctx->litBuffer;
-                dctx->litSize = litSize;
-                dctx->litEntropy = 1;
-                if (litEncType==set_compressed) dctx->HUFptr = dctx->entropy.hufTable;
-                memset(dctx->litBuffer + dctx->litSize, 0, WILDCOPY_OVERLENGTH);
-                return litCSize + lhSize;
-            }
-
-        case set_basic:
-            {   size_t litSize, lhSize;
-                U32 const lhlCode = ((istart[0]) >> 2) & 3;
-                switch(lhlCode)
-                {
-                case 0: case 2: default:   /* note : default is impossible, since lhlCode into [0..3] */
-                    lhSize = 1;
-                    litSize = istart[0] >> 3;
-                    break;
-                case 1:
-                    lhSize = 2;
-                    litSize = MEM_readLE16(istart) >> 4;
-                    break;
-                case 3:
-                    lhSize = 3;
-                    litSize = MEM_readLE24(istart) >> 4;
-                    break;
-                }
-
-                if (lhSize+litSize+WILDCOPY_OVERLENGTH > srcSize) {  /* risk reading beyond src buffer with wildcopy */
-                    RETURN_ERROR_IF(litSize+lhSize > srcSize, corruption_detected);
-                    memcpy(dctx->litBuffer, istart+lhSize, litSize);
-                    dctx->litPtr = dctx->litBuffer;
-                    dctx->litSize = litSize;
-                    memset(dctx->litBuffer + dctx->litSize, 0, WILDCOPY_OVERLENGTH);
-                    return lhSize+litSize;
-                }
-                /* direct reference into compressed stream */
-                dctx->litPtr = istart+lhSize;
-                dctx->litSize = litSize;
-                return lhSize+litSize;
-            }
-
-        case set_rle:
-            {   U32 const lhlCode = ((istart[0]) >> 2) & 3;
-                size_t litSize, lhSize;
-                switch(lhlCode)
-                {
-                case 0: case 2: default:   /* note : default is impossible, since lhlCode into [0..3] */
-                    lhSize = 1;
-                    litSize = istart[0] >> 3;
-                    break;
-                case 1:
-                    lhSize = 2;
-                    litSize = MEM_readLE16(istart) >> 4;
-                    break;
-                case 3:
-                    lhSize = 3;
-                    litSize = MEM_readLE24(istart) >> 4;
-                    RETURN_ERROR_IF(srcSize<4, corruption_detected, "srcSize >= MIN_CBLOCK_SIZE == 3; here we need lhSize+1 = 4");
-                    break;
-                }
-                RETURN_ERROR_IF(litSize > ZSTD_BLOCKSIZE_MAX, corruption_detected);
-                memset(dctx->litBuffer, istart[lhSize], litSize + WILDCOPY_OVERLENGTH);
-                dctx->litPtr = dctx->litBuffer;
-                dctx->litSize = litSize;
-                return lhSize+1;
-            }
-        default:
-            RETURN_ERROR(corruption_detected, "impossible");
-        }
-    }
-}
-
-/* Default FSE distribution tables.
- * These are pre-calculated FSE decoding tables using default distributions as defined in specification :
- * https://github.com/facebook/zstd/blob/master/doc/zstd_compression_format.md#default-distributions
- * They were generated programmatically with following method :
- * - start from default distributions, present in /lib/common/zstd_internal.h
- * - generate tables normally, using ZSTD_buildFSETable()
- * - printout the content of tables
- * - pretify output, report below, test with fuzzer to ensure it's correct */
-
-/* Default FSE distribution table for Literal Lengths */
-static const ZSTD_seqSymbol LL_defaultDTable[(1<<LL_DEFAULTNORMLOG)+1] = {
-     {  1,  1,  1, LL_DEFAULTNORMLOG},  /* header : fastMode, tableLog */
-     /* nextState, nbAddBits, nbBits, baseVal */
-     {  0,  0,  4,    0},  { 16,  0,  4,    0},
-     { 32,  0,  5,    1},  {  0,  0,  5,    3},
-     {  0,  0,  5,    4},  {  0,  0,  5,    6},
-     {  0,  0,  5,    7},  {  0,  0,  5,    9},
-     {  0,  0,  5,   10},  {  0,  0,  5,   12},
-     {  0,  0,  6,   14},  {  0,  1,  5,   16},
-     {  0,  1,  5,   20},  {  0,  1,  5,   22},
-     {  0,  2,  5,   28},  {  0,  3,  5,   32},
-     {  0,  4,  5,   48},  { 32,  6,  5,   64},
-     {  0,  7,  5,  128},  {  0,  8,  6,  256},
-     {  0, 10,  6, 1024},  {  0, 12,  6, 4096},
-     { 32,  0,  4,    0},  {  0,  0,  4,    1},
-     {  0,  0,  5,    2},  { 32,  0,  5,    4},
-     {  0,  0,  5,    5},  { 32,  0,  5,    7},
-     {  0,  0,  5,    8},  { 32,  0,  5,   10},
-     {  0,  0,  5,   11},  {  0,  0,  6,   13},
-     { 32,  1,  5,   16},  {  0,  1,  5,   18},
-     { 32,  1,  5,   22},  {  0,  2,  5,   24},
-     { 32,  3,  5,   32},  {  0,  3,  5,   40},
-     {  0,  6,  4,   64},  { 16,  6,  4,   64},
-     { 32,  7,  5,  128},  {  0,  9,  6,  512},
-     {  0, 11,  6, 2048},  { 48,  0,  4,    0},
-     { 16,  0,  4,    1},  { 32,  0,  5,    2},
-     { 32,  0,  5,    3},  { 32,  0,  5,    5},
-     { 32,  0,  5,    6},  { 32,  0,  5,    8},
-     { 32,  0,  5,    9},  { 32,  0,  5,   11},
-     { 32,  0,  5,   12},  {  0,  0,  6,   15},
-     { 32,  1,  5,   18},  { 32,  1,  5,   20},
-     { 32,  2,  5,   24},  { 32,  2,  5,   28},
-     { 32,  3,  5,   40},  { 32,  4,  5,   48},
-     {  0, 16,  6,65536},  {  0, 15,  6,32768},
-     {  0, 14,  6,16384},  {  0, 13,  6, 8192},
-};   /* LL_defaultDTable */
-
-/* Default FSE distribution table for Offset Codes */
-static const ZSTD_seqSymbol OF_defaultDTable[(1<<OF_DEFAULTNORMLOG)+1] = {
-    {  1,  1,  1, OF_DEFAULTNORMLOG},  /* header : fastMode, tableLog */
-    /* nextState, nbAddBits, nbBits, baseVal */
-    {  0,  0,  5,    0},     {  0,  6,  4,   61},
-    {  0,  9,  5,  509},     {  0, 15,  5,32765},
-    {  0, 21,  5,2097149},   {  0,  3,  5,    5},
-    {  0,  7,  4,  125},     {  0, 12,  5, 4093},
-    {  0, 18,  5,262141},    {  0, 23,  5,8388605},
-    {  0,  5,  5,   29},     {  0,  8,  4,  253},
-    {  0, 14,  5,16381},     {  0, 20,  5,1048573},
-    {  0,  2,  5,    1},     { 16,  7,  4,  125},
-    {  0, 11,  5, 2045},     {  0, 17,  5,131069},
-    {  0, 22,  5,4194301},   {  0,  4,  5,   13},
-    { 16,  8,  4,  253},     {  0, 13,  5, 8189},
-    {  0, 19,  5,524285},    {  0,  1,  5,    1},
-    { 16,  6,  4,   61},     {  0, 10,  5, 1021},
-    {  0, 16,  5,65533},     {  0, 28,  5,268435453},
-    {  0, 27,  5,134217725}, {  0, 26,  5,67108861},
-    {  0, 25,  5,33554429},  {  0, 24,  5,16777213},
-};   /* OF_defaultDTable */
-
-
-/* Default FSE distribution table for Match Lengths */
-static const ZSTD_seqSymbol ML_defaultDTable[(1<<ML_DEFAULTNORMLOG)+1] = {
-    {  1,  1,  1, ML_DEFAULTNORMLOG},  /* header : fastMode, tableLog */
-    /* nextState, nbAddBits, nbBits, baseVal */
-    {  0,  0,  6,    3},  {  0,  0,  4,    4},
-    { 32,  0,  5,    5},  {  0,  0,  5,    6},
-    {  0,  0,  5,    8},  {  0,  0,  5,    9},
-    {  0,  0,  5,   11},  {  0,  0,  6,   13},
-    {  0,  0,  6,   16},  {  0,  0,  6,   19},
-    {  0,  0,  6,   22},  {  0,  0,  6,   25},
-    {  0,  0,  6,   28},  {  0,  0,  6,   31},
-    {  0,  0,  6,   34},  {  0,  1,  6,   37},
-    {  0,  1,  6,   41},  {  0,  2,  6,   47},
-    {  0,  3,  6,   59},  {  0,  4,  6,   83},
-    {  0,  7,  6,  131},  {  0,  9,  6,  515},
-    { 16,  0,  4,    4},  {  0,  0,  4,    5},
-    { 32,  0,  5,    6},  {  0,  0,  5,    7},
-    { 32,  0,  5,    9},  {  0,  0,  5,   10},
-    {  0,  0,  6,   12},  {  0,  0,  6,   15},
-    {  0,  0,  6,   18},  {  0,  0,  6,   21},
-    {  0,  0,  6,   24},  {  0,  0,  6,   27},
-    {  0,  0,  6,   30},  {  0,  0,  6,   33},
-    {  0,  1,  6,   35},  {  0,  1,  6,   39},
-    {  0,  2,  6,   43},  {  0,  3,  6,   51},
-    {  0,  4,  6,   67},  {  0,  5,  6,   99},
-    {  0,  8,  6,  259},  { 32,  0,  4,    4},
-    { 48,  0,  4,    4},  { 16,  0,  4,    5},
-    { 32,  0,  5,    7},  { 32,  0,  5,    8},
-    { 32,  0,  5,   10},  { 32,  0,  5,   11},
-    {  0,  0,  6,   14},  {  0,  0,  6,   17},
-    {  0,  0,  6,   20},  {  0,  0,  6,   23},
-    {  0,  0,  6,   26},  {  0,  0,  6,   29},
-    {  0,  0,  6,   32},  {  0, 16,  6,65539},
-    {  0, 15,  6,32771},  {  0, 14,  6,16387},
-    {  0, 13,  6, 8195},  {  0, 12,  6, 4099},
-    {  0, 11,  6, 2051},  {  0, 10,  6, 1027},
-};   /* ML_defaultDTable */
-
-
-static void ZSTD_buildSeqTable_rle(ZSTD_seqSymbol* dt, U32 baseValue, U32 nbAddBits)
-{
-    void* ptr = dt;
-    ZSTD_seqSymbol_header* const DTableH = (ZSTD_seqSymbol_header*)ptr;
-    ZSTD_seqSymbol* const cell = dt + 1;
-
-    DTableH->tableLog = 0;
-    DTableH->fastMode = 0;
-
-    cell->nbBits = 0;
-    cell->nextState = 0;
-    assert(nbAddBits < 255);
-    cell->nbAdditionalBits = (BYTE)nbAddBits;
-    cell->baseValue = baseValue;
-}
-
-
-/* ZSTD_buildFSETable() :
- * generate FSE decoding table for one symbol (ll, ml or off)
- * cannot fail if input is valid =>
- * all inputs are presumed validated at this stage */
-void
-ZSTD_buildFSETable(ZSTD_seqSymbol* dt,
-            const short* normalizedCounter, unsigned maxSymbolValue,
-            const U32* baseValue, const U32* nbAdditionalBits,
-            unsigned tableLog)
-{
-    ZSTD_seqSymbol* const tableDecode = dt+1;
-    U16 symbolNext[MaxSeq+1];
-
-    U32 const maxSV1 = maxSymbolValue + 1;
-    U32 const tableSize = 1 << tableLog;
-    U32 highThreshold = tableSize-1;
-
-    /* Sanity Checks */
-    assert(maxSymbolValue <= MaxSeq);
-    assert(tableLog <= MaxFSELog);
-
-    /* Init, lay down lowprob symbols */
-    {   ZSTD_seqSymbol_header DTableH;
-        DTableH.tableLog = tableLog;
-        DTableH.fastMode = 1;
-        {   S16 const largeLimit= (S16)(1 << (tableLog-1));
-            U32 s;
-            for (s=0; s<maxSV1; s++) {
-                if (normalizedCounter[s]==-1) {
-                    tableDecode[highThreshold--].baseValue = s;
-                    symbolNext[s] = 1;
-                } else {
-                    if (normalizedCounter[s] >= largeLimit) DTableH.fastMode=0;
-                    assert(normalizedCounter[s]>=0);
-                    symbolNext[s] = (U16)normalizedCounter[s];
-        }   }   }
-        memcpy(dt, &DTableH, sizeof(DTableH));
-    }
-
-    /* Spread symbols */
-    {   U32 const tableMask = tableSize-1;
-        U32 const step = FSE_TABLESTEP(tableSize);
-        U32 s, position = 0;
-        for (s=0; s<maxSV1; s++) {
-            int i;
-            for (i=0; i<normalizedCounter[s]; i++) {
-                tableDecode[position].baseValue = s;
-                position = (position + step) & tableMask;
-                while (position > highThreshold) position = (position + step) & tableMask;   /* lowprob area */
-        }   }
-        assert(position == 0); /* position must reach all cells once, otherwise normalizedCounter is incorrect */
-    }
-
-    /* Build Decoding table */
-    {   U32 u;
-        for (u=0; u<tableSize; u++) {
-            U32 const symbol = tableDecode[u].baseValue;
-            U32 const nextState = symbolNext[symbol]++;
-            tableDecode[u].nbBits = (BYTE) (tableLog - BIT_highbit32(nextState) );
-            tableDecode[u].nextState = (U16) ( (nextState << tableDecode[u].nbBits) - tableSize);
-            assert(nbAdditionalBits[symbol] < 255);
-            tableDecode[u].nbAdditionalBits = (BYTE)nbAdditionalBits[symbol];
-            tableDecode[u].baseValue = baseValue[symbol];
-    }   }
-}
-
-
-/*! ZSTD_buildSeqTable() :
- * @return : nb bytes read from src,
- *           or an error code if it fails */
-static size_t ZSTD_buildSeqTable(ZSTD_seqSymbol* DTableSpace, const ZSTD_seqSymbol** DTablePtr,
-                                 symbolEncodingType_e type, unsigned max, U32 maxLog,
-                                 const void* src, size_t srcSize,
-                                 const U32* baseValue, const U32* nbAdditionalBits,
-                                 const ZSTD_seqSymbol* defaultTable, U32 flagRepeatTable,
-                                 int ddictIsCold, int nbSeq)
-{
-    switch(type)
-    {
-    case set_rle :
-        RETURN_ERROR_IF(!srcSize, srcSize_wrong);
-        RETURN_ERROR_IF((*(const BYTE*)src) > max, corruption_detected);
-        {   U32 const symbol = *(const BYTE*)src;
-            U32 const baseline = baseValue[symbol];
-            U32 const nbBits = nbAdditionalBits[symbol];
-            ZSTD_buildSeqTable_rle(DTableSpace, baseline, nbBits);
-        }
-        *DTablePtr = DTableSpace;
-        return 1;
-    case set_basic :
-        *DTablePtr = defaultTable;
-        return 0;
-    case set_repeat:
-        RETURN_ERROR_IF(!flagRepeatTable, corruption_detected);
-        /* prefetch FSE table if used */
-        if (ddictIsCold && (nbSeq > 24 /* heuristic */)) {
-            const void* const pStart = *DTablePtr;
-            size_t const pSize = sizeof(ZSTD_seqSymbol) * (SEQSYMBOL_TABLE_SIZE(maxLog));
-            PREFETCH_AREA(pStart, pSize);
-        }
-        return 0;
-    case set_compressed :
-        {   unsigned tableLog;
-            S16 norm[MaxSeq+1];
-            size_t const headerSize = FSE_readNCount(norm, &max, &tableLog, src, srcSize);
-            RETURN_ERROR_IF(FSE_isError(headerSize), corruption_detected);
-            RETURN_ERROR_IF(tableLog > maxLog, corruption_detected);
-            ZSTD_buildFSETable(DTableSpace, norm, max, baseValue, nbAdditionalBits, tableLog);
-            *DTablePtr = DTableSpace;
-            return headerSize;
-        }
-    default :
-        assert(0);
-        RETURN_ERROR(GENERIC, "impossible");
-    }
-}
-
-size_t ZSTD_decodeSeqHeaders(ZSTD_DCtx* dctx, int* nbSeqPtr,
-                             const void* src, size_t srcSize)
-{
-    const BYTE* const istart = (const BYTE* const)src;
-    const BYTE* const iend = istart + srcSize;
-    const BYTE* ip = istart;
-    int nbSeq;
-    DEBUGLOG(5, "ZSTD_decodeSeqHeaders");
-
-    /* check */
-    RETURN_ERROR_IF(srcSize < MIN_SEQUENCES_SIZE, srcSize_wrong);
-
-    /* SeqHead */
-    nbSeq = *ip++;
-    if (!nbSeq) {
-        *nbSeqPtr=0;
-        RETURN_ERROR_IF(srcSize != 1, srcSize_wrong);
-        return 1;
-    }
-    if (nbSeq > 0x7F) {
-        if (nbSeq == 0xFF) {
-            RETURN_ERROR_IF(ip+2 > iend, srcSize_wrong);
-            nbSeq = MEM_readLE16(ip) + LONGNBSEQ, ip+=2;
-        } else {
-            RETURN_ERROR_IF(ip >= iend, srcSize_wrong);
-            nbSeq = ((nbSeq-0x80)<<8) + *ip++;
-        }
-    }
-    *nbSeqPtr = nbSeq;
-
-    /* FSE table descriptors */
-    RETURN_ERROR_IF(ip+1 > iend, srcSize_wrong); /* minimum possible size: 1 byte for symbol encoding types */
-    {   symbolEncodingType_e const LLtype = (symbolEncodingType_e)(*ip >> 6);
-        symbolEncodingType_e const OFtype = (symbolEncodingType_e)((*ip >> 4) & 3);
-        symbolEncodingType_e const MLtype = (symbolEncodingType_e)((*ip >> 2) & 3);
-        ip++;
-
-        /* Build DTables */
-        {   size_t const llhSize = ZSTD_buildSeqTable(dctx->entropy.LLTable, &dctx->LLTptr,
-                                                      LLtype, MaxLL, LLFSELog,
-                                                      ip, iend-ip,
-                                                      LL_base, LL_bits,
-                                                      LL_defaultDTable, dctx->fseEntropy,
-                                                      dctx->ddictIsCold, nbSeq);
-            RETURN_ERROR_IF(ZSTD_isError(llhSize), corruption_detected);
-            ip += llhSize;
-        }
-
-        {   size_t const ofhSize = ZSTD_buildSeqTable(dctx->entropy.OFTable, &dctx->OFTptr,
-                                                      OFtype, MaxOff, OffFSELog,
-                                                      ip, iend-ip,
-                                                      OF_base, OF_bits,
-                                                      OF_defaultDTable, dctx->fseEntropy,
-                                                      dctx->ddictIsCold, nbSeq);
-            RETURN_ERROR_IF(ZSTD_isError(ofhSize), corruption_detected);
-            ip += ofhSize;
-        }
-
-        {   size_t const mlhSize = ZSTD_buildSeqTable(dctx->entropy.MLTable, &dctx->MLTptr,
-                                                      MLtype, MaxML, MLFSELog,
-                                                      ip, iend-ip,
-                                                      ML_base, ML_bits,
-                                                      ML_defaultDTable, dctx->fseEntropy,
-                                                      dctx->ddictIsCold, nbSeq);
-            RETURN_ERROR_IF(ZSTD_isError(mlhSize), corruption_detected);
-            ip += mlhSize;
-        }
-    }
-
-    return ip-istart;
-}
-
-
-typedef struct {
-    size_t litLength;
-    size_t matchLength;
-    size_t offset;
-    const BYTE* match;
-} seq_t;
-
-typedef struct {
-    size_t state;
-    const ZSTD_seqSymbol* table;
-} ZSTD_fseState;
-
-typedef struct {
-    BIT_DStream_t DStream;
-    ZSTD_fseState stateLL;
-    ZSTD_fseState stateOffb;
-    ZSTD_fseState stateML;
-    size_t prevOffset[ZSTD_REP_NUM];
-    const BYTE* prefixStart;
-    const BYTE* dictEnd;
-    size_t pos;
-} seqState_t;
-
-
-/* ZSTD_execSequenceLast7():
- * exceptional case : decompress a match starting within last 7 bytes of output buffer.
- * requires more careful checks, to ensure there is no overflow.
- * performance does not matter though.
- * note : this case is supposed to be never generated "naturally" by reference encoder,
- *        since in most cases it needs at least 8 bytes to look for a match.
- *        but it's allowed by the specification. */
-FORCE_NOINLINE
-size_t ZSTD_execSequenceLast7(BYTE* op,
-                              BYTE* const oend, seq_t sequence,
-                              const BYTE** litPtr, const BYTE* const litLimit,
-                              const BYTE* const base, const BYTE* const vBase, const BYTE* const dictEnd)
-{
-    BYTE* const oLitEnd = op + sequence.litLength;
-    size_t const sequenceLength = sequence.litLength + sequence.matchLength;
-    BYTE* const oMatchEnd = op + sequenceLength;   /* risk : address space overflow (32-bits) */
-    const BYTE* const iLitEnd = *litPtr + sequence.litLength;
-    const BYTE* match = oLitEnd - sequence.offset;
-
-    /* check */
-    RETURN_ERROR_IF(oMatchEnd>oend, dstSize_tooSmall, "last match must fit within dstBuffer");
-    RETURN_ERROR_IF(iLitEnd > litLimit, corruption_detected, "try to read beyond literal buffer");
-
-    /* copy literals */
-    while (op < oLitEnd) *op++ = *(*litPtr)++;
-
-    /* copy Match */
-    if (sequence.offset > (size_t)(oLitEnd - base)) {
-        /* offset beyond prefix */
-        RETURN_ERROR_IF(sequence.offset > (size_t)(oLitEnd - vBase),corruption_detected);
-        match = dictEnd - (base-match);
-        if (match + sequence.matchLength <= dictEnd) {
-            memmove(oLitEnd, match, sequence.matchLength);
-            return sequenceLength;
-        }
-        /* span extDict & currentPrefixSegment */
-        {   size_t const length1 = dictEnd - match;
-            memmove(oLitEnd, match, length1);
-            op = oLitEnd + length1;
-            sequence.matchLength -= length1;
-            match = base;
-    }   }
-    while (op < oMatchEnd) *op++ = *match++;
-    return sequenceLength;
-}
-
-
-HINT_INLINE
-size_t ZSTD_execSequence(BYTE* op,
-                         BYTE* const oend, seq_t sequence,
-                         const BYTE** litPtr, const BYTE* const litLimit,
-                         const BYTE* const prefixStart, const BYTE* const virtualStart, const BYTE* const dictEnd)
-{
-    BYTE* const oLitEnd = op + sequence.litLength;
-    size_t const sequenceLength = sequence.litLength + sequence.matchLength;
-    BYTE* const oMatchEnd = op + sequenceLength;   /* risk : address space overflow (32-bits) */
-    BYTE* const oend_w = oend - WILDCOPY_OVERLENGTH;
-    const BYTE* const iLitEnd = *litPtr + sequence.litLength;
-    const BYTE* match = oLitEnd - sequence.offset;
-
-    /* check */
-    RETURN_ERROR_IF(oMatchEnd>oend, dstSize_tooSmall, "last match must start at a minimum distance of WILDCOPY_OVERLENGTH from oend");
-    RETURN_ERROR_IF(iLitEnd > litLimit, corruption_detected, "over-read beyond lit buffer");
-    if (oLitEnd>oend_w) return ZSTD_execSequenceLast7(op, oend, sequence, litPtr, litLimit, prefixStart, virtualStart, dictEnd);
-
-    /* copy Literals */
-    if (sequence.litLength > 8)
-        ZSTD_wildcopy_16min(op, (*litPtr), sequence.litLength, ZSTD_no_overlap);   /* note : since oLitEnd <= oend-WILDCOPY_OVERLENGTH, no risk of overwrite beyond oend */
-    else
-        ZSTD_copy8(op, *litPtr);
-    op = oLitEnd;
-    *litPtr = iLitEnd;   /* update for next sequence */
-
-    /* copy Match */
-    if (sequence.offset > (size_t)(oLitEnd - prefixStart)) {
-        /* offset beyond prefix -> go into extDict */
-        RETURN_ERROR_IF(sequence.offset > (size_t)(oLitEnd - virtualStart), corruption_detected);
-        match = dictEnd + (match - prefixStart);
-        if (match + sequence.matchLength <= dictEnd) {
-            memmove(oLitEnd, match, sequence.matchLength);
-            return sequenceLength;
-        }
-        /* span extDict & currentPrefixSegment */
-        {   size_t const length1 = dictEnd - match;
-            memmove(oLitEnd, match, length1);
-            op = oLitEnd + length1;
-            sequence.matchLength -= length1;
-            match = prefixStart;
-            if (op > oend_w || sequence.matchLength < MINMATCH) {
-              U32 i;
-              for (i = 0; i < sequence.matchLength; ++i) op[i] = match[i];
-              return sequenceLength;
-            }
-    }   }
-    /* Requirement: op <= oend_w && sequence.matchLength >= MINMATCH */
-
-    /* match within prefix */
-    if (sequence.offset < 8) {
-        /* close range match, overlap */
-        static const U32 dec32table[] = { 0, 1, 2, 1, 4, 4, 4, 4 };   /* added */
-        static const int dec64table[] = { 8, 8, 8, 7, 8, 9,10,11 };   /* subtracted */
-        int const sub2 = dec64table[sequence.offset];
-        op[0] = match[0];
-        op[1] = match[1];
-        op[2] = match[2];
-        op[3] = match[3];
-        match += dec32table[sequence.offset];
-        ZSTD_copy4(op+4, match);
-        match -= sub2;
-    } else {
-        ZSTD_copy8(op, match);
-    }
-    op += 8; match += 8;
-
-    if (oMatchEnd > oend-(16-MINMATCH)) {
-        if (op < oend_w) {
-            ZSTD_wildcopy(op, match, oend_w - op, ZSTD_overlap_src_before_dst);
-            match += oend_w - op;
-            op = oend_w;
-        }
-        while (op < oMatchEnd) *op++ = *match++;
-    } else {
-        ZSTD_wildcopy(op, match, (ptrdiff_t)sequence.matchLength-8, ZSTD_overlap_src_before_dst);   /* works even if matchLength < 8 */
-    }
-    return sequenceLength;
-}
-
-
-HINT_INLINE
-size_t ZSTD_execSequenceLong(BYTE* op,
-                             BYTE* const oend, seq_t sequence,
-                             const BYTE** litPtr, const BYTE* const litLimit,
-                             const BYTE* const prefixStart, const BYTE* const dictStart, const BYTE* const dictEnd)
-{
-    BYTE* const oLitEnd = op + sequence.litLength;
-    size_t const sequenceLength = sequence.litLength + sequence.matchLength;
-    BYTE* const oMatchEnd = op + sequenceLength;   /* risk : address space overflow (32-bits) */
-    BYTE* const oend_w = oend - WILDCOPY_OVERLENGTH;
-    const BYTE* const iLitEnd = *litPtr + sequence.litLength;
-    const BYTE* match = sequence.match;
-
-    /* check */
-    RETURN_ERROR_IF(oMatchEnd > oend, dstSize_tooSmall, "last match must start at a minimum distance of WILDCOPY_OVERLENGTH from oend");
-    RETURN_ERROR_IF(iLitEnd > litLimit, corruption_detected, "over-read beyond lit buffer");
-    if (oLitEnd > oend_w) return ZSTD_execSequenceLast7(op, oend, sequence, litPtr, litLimit, prefixStart, dictStart, dictEnd);
-
-    /* copy Literals */
-    if (sequence.litLength > 8)
-        ZSTD_wildcopy_16min(op, *litPtr, sequence.litLength, ZSTD_no_overlap);   /* note : since oLitEnd <= oend-WILDCOPY_OVERLENGTH, no risk of overwrite beyond oend */
-    else
-        ZSTD_copy8(op, *litPtr);  /* note : op <= oLitEnd <= oend_w == oend - 8 */
-
-    op = oLitEnd;
-    *litPtr = iLitEnd;   /* update for next sequence */
-
-    /* copy Match */
-    if (sequence.offset > (size_t)(oLitEnd - prefixStart)) {
-        /* offset beyond prefix */
-        RETURN_ERROR_IF(sequence.offset > (size_t)(oLitEnd - dictStart), corruption_detected);
-        if (match + sequence.matchLength <= dictEnd) {
-            memmove(oLitEnd, match, sequence.matchLength);
-            return sequenceLength;
-        }
-        /* span extDict & currentPrefixSegment */
-        {   size_t const length1 = dictEnd - match;
-            memmove(oLitEnd, match, length1);
-            op = oLitEnd + length1;
-            sequence.matchLength -= length1;
-            match = prefixStart;
-            if (op > oend_w || sequence.matchLength < MINMATCH) {
-              U32 i;
-              for (i = 0; i < sequence.matchLength; ++i) op[i] = match[i];
-              return sequenceLength;
-            }
-    }   }
-    assert(op <= oend_w);
-    assert(sequence.matchLength >= MINMATCH);
-
-    /* match within prefix */
-    if (sequence.offset < 8) {
-        /* close range match, overlap */
-        static const U32 dec32table[] = { 0, 1, 2, 1, 4, 4, 4, 4 };   /* added */
-        static const int dec64table[] = { 8, 8, 8, 7, 8, 9,10,11 };   /* subtracted */
-        int const sub2 = dec64table[sequence.offset];
-        op[0] = match[0];
-        op[1] = match[1];
-        op[2] = match[2];
-        op[3] = match[3];
-        match += dec32table[sequence.offset];
-        ZSTD_copy4(op+4, match);
-        match -= sub2;
-    } else {
-        ZSTD_copy8(op, match);
-    }
-    op += 8; match += 8;
-
-    if (oMatchEnd > oend-(16-MINMATCH)) {
-        if (op < oend_w) {
-            ZSTD_wildcopy(op, match, oend_w - op, ZSTD_overlap_src_before_dst);
-            match += oend_w - op;
-            op = oend_w;
-        }
-        while (op < oMatchEnd) *op++ = *match++;
-    } else {
-        ZSTD_wildcopy(op, match, (ptrdiff_t)sequence.matchLength-8, ZSTD_overlap_src_before_dst);   /* works even if matchLength < 8 */
-    }
-    return sequenceLength;
-}
-
-static void
-ZSTD_initFseState(ZSTD_fseState* DStatePtr, BIT_DStream_t* bitD, const ZSTD_seqSymbol* dt)
-{
-    const void* ptr = dt;
-    const ZSTD_seqSymbol_header* const DTableH = (const ZSTD_seqSymbol_header*)ptr;
-    DStatePtr->state = BIT_readBits(bitD, DTableH->tableLog);
-    DEBUGLOG(6, "ZSTD_initFseState : val=%u using %u bits",
-                (U32)DStatePtr->state, DTableH->tableLog);
-    BIT_reloadDStream(bitD);
-    DStatePtr->table = dt + 1;
-}
-
-FORCE_INLINE_TEMPLATE void
-ZSTD_updateFseState(ZSTD_fseState* DStatePtr, BIT_DStream_t* bitD)
-{
-    ZSTD_seqSymbol const DInfo = DStatePtr->table[DStatePtr->state];
-    U32 const nbBits = DInfo.nbBits;
-    size_t const lowBits = BIT_readBits(bitD, nbBits);
-    DStatePtr->state = DInfo.nextState + lowBits;
-}
-
-/* We need to add at most (ZSTD_WINDOWLOG_MAX_32 - 1) bits to read the maximum
- * offset bits. But we can only read at most (STREAM_ACCUMULATOR_MIN_32 - 1)
- * bits before reloading. This value is the maximum number of bytes we read
- * after reloading when we are decoding long offsets.
- */
-#define LONG_OFFSETS_MAX_EXTRA_BITS_32                       \
-    (ZSTD_WINDOWLOG_MAX_32 > STREAM_ACCUMULATOR_MIN_32       \
-        ? ZSTD_WINDOWLOG_MAX_32 - STREAM_ACCUMULATOR_MIN_32  \
-        : 0)
-
-typedef enum { ZSTD_lo_isRegularOffset, ZSTD_lo_isLongOffset=1 } ZSTD_longOffset_e;
-
-#ifndef ZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG
-FORCE_INLINE_TEMPLATE seq_t
-ZSTD_decodeSequence(seqState_t* seqState, const ZSTD_longOffset_e longOffsets)
-{
-    seq_t seq;
-    U32 const llBits = seqState->stateLL.table[seqState->stateLL.state].nbAdditionalBits;
-    U32 const mlBits = seqState->stateML.table[seqState->stateML.state].nbAdditionalBits;
-    U32 const ofBits = seqState->stateOffb.table[seqState->stateOffb.state].nbAdditionalBits;
-    U32 const totalBits = llBits+mlBits+ofBits;
-    U32 const llBase = seqState->stateLL.table[seqState->stateLL.state].baseValue;
-    U32 const mlBase = seqState->stateML.table[seqState->stateML.state].baseValue;
-    U32 const ofBase = seqState->stateOffb.table[seqState->stateOffb.state].baseValue;
-
-    /* sequence */
-    {   size_t offset;
-        if (!ofBits)
-            offset = 0;
-        else {
-            ZSTD_STATIC_ASSERT(ZSTD_lo_isLongOffset == 1);
-            ZSTD_STATIC_ASSERT(LONG_OFFSETS_MAX_EXTRA_BITS_32 == 5);
-            assert(ofBits <= MaxOff);
-            if (MEM_32bits() && longOffsets && (ofBits >= STREAM_ACCUMULATOR_MIN_32)) {
-                U32 const extraBits = ofBits - MIN(ofBits, 32 - seqState->DStream.bitsConsumed);
-                offset = ofBase + (BIT_readBitsFast(&seqState->DStream, ofBits - extraBits) << extraBits);
-                BIT_reloadDStream(&seqState->DStream);
-                if (extraBits) offset += BIT_readBitsFast(&seqState->DStream, extraBits);
-                assert(extraBits <= LONG_OFFSETS_MAX_EXTRA_BITS_32);   /* to avoid another reload */
-            } else {
-                offset = ofBase + BIT_readBitsFast(&seqState->DStream, ofBits/*>0*/);   /* <=  (ZSTD_WINDOWLOG_MAX-1) bits */
-                if (MEM_32bits()) BIT_reloadDStream(&seqState->DStream);
-            }
-        }
-
-        if (ofBits <= 1) {
-            offset += (llBase==0);
-            if (offset) {
-                size_t temp = (offset==3) ? seqState->prevOffset[0] - 1 : seqState->prevOffset[offset];
-                temp += !temp;   /* 0 is not valid; input is corrupted; force offset to 1 */
-                if (offset != 1) seqState->prevOffset[2] = seqState->prevOffset[1];
-                seqState->prevOffset[1] = seqState->prevOffset[0];
-                seqState->prevOffset[0] = offset = temp;
-            } else {  /* offset == 0 */
-                offset = seqState->prevOffset[0];
-            }
-        } else {
-            seqState->prevOffset[2] = seqState->prevOffset[1];
-            seqState->prevOffset[1] = seqState->prevOffset[0];
-            seqState->prevOffset[0] = offset;
-        }
-        seq.offset = offset;
-    }
-
-    seq.matchLength = mlBase
-                    + ((mlBits>0) ? BIT_readBitsFast(&seqState->DStream, mlBits/*>0*/) : 0);  /* <=  16 bits */
-    if (MEM_32bits() && (mlBits+llBits >= STREAM_ACCUMULATOR_MIN_32-LONG_OFFSETS_MAX_EXTRA_BITS_32))
-        BIT_reloadDStream(&seqState->DStream);
-    if (MEM_64bits() && (totalBits >= STREAM_ACCUMULATOR_MIN_64-(LLFSELog+MLFSELog+OffFSELog)))
-        BIT_reloadDStream(&seqState->DStream);
-    /* Ensure there are enough bits to read the rest of data in 64-bit mode. */
-    ZSTD_STATIC_ASSERT(16+LLFSELog+MLFSELog+OffFSELog < STREAM_ACCUMULATOR_MIN_64);
-
-    seq.litLength = llBase
-                  + ((llBits>0) ? BIT_readBitsFast(&seqState->DStream, llBits/*>0*/) : 0);    /* <=  16 bits */
-    if (MEM_32bits())
-        BIT_reloadDStream(&seqState->DStream);
-
-    DEBUGLOG(6, "seq: litL=%u, matchL=%u, offset=%u",
-                (U32)seq.litLength, (U32)seq.matchLength, (U32)seq.offset);
-
-    /* ANS state update */
-    ZSTD_updateFseState(&seqState->stateLL, &seqState->DStream);    /* <=  9 bits */
-    ZSTD_updateFseState(&seqState->stateML, &seqState->DStream);    /* <=  9 bits */
-    if (MEM_32bits()) BIT_reloadDStream(&seqState->DStream);    /* <= 18 bits */
-    ZSTD_updateFseState(&seqState->stateOffb, &seqState->DStream);  /* <=  8 bits */
-
-    return seq;
-}
-
-FORCE_INLINE_TEMPLATE size_t
-DONT_VECTORIZE
-ZSTD_decompressSequences_body( ZSTD_DCtx* dctx,
-                               void* dst, size_t maxDstSize,
-                         const void* seqStart, size_t seqSize, int nbSeq,
-                         const ZSTD_longOffset_e isLongOffset)
-{
-    const BYTE* ip = (const BYTE*)seqStart;
-    const BYTE* const iend = ip + seqSize;
-    BYTE* const ostart = (BYTE* const)dst;
-    BYTE* const oend = ostart + maxDstSize;
-    BYTE* op = ostart;
-    const BYTE* litPtr = dctx->litPtr;
-    const BYTE* const litEnd = litPtr + dctx->litSize;
-    const BYTE* const prefixStart = (const BYTE*) (dctx->prefixStart);
-    const BYTE* const vBase = (const BYTE*) (dctx->virtualStart);
-    const BYTE* const dictEnd = (const BYTE*) (dctx->dictEnd);
-    DEBUGLOG(5, "ZSTD_decompressSequences_body");
-
-    /* Regen sequences */
-    if (nbSeq) {
-        seqState_t seqState;
-        dctx->fseEntropy = 1;
-        { U32 i; for (i=0; i<ZSTD_REP_NUM; i++) seqState.prevOffset[i] = dctx->entropy.rep[i]; }
-        RETURN_ERROR_IF(
-            ERR_isError(BIT_initDStream(&seqState.DStream, ip, iend-ip)),
-            corruption_detected);
-        ZSTD_initFseState(&seqState.stateLL, &seqState.DStream, dctx->LLTptr);
-        ZSTD_initFseState(&seqState.stateOffb, &seqState.DStream, dctx->OFTptr);
-        ZSTD_initFseState(&seqState.stateML, &seqState.DStream, dctx->MLTptr);
-
-        ZSTD_STATIC_ASSERT(
-                BIT_DStream_unfinished < BIT_DStream_completed &&
-                BIT_DStream_endOfBuffer < BIT_DStream_completed &&
-                BIT_DStream_completed < BIT_DStream_overflow);
-
-        for ( ; (BIT_reloadDStream(&(seqState.DStream)) <= BIT_DStream_completed) && nbSeq ; ) {
-            nbSeq--;
-            {   seq_t const sequence = ZSTD_decodeSequence(&seqState, isLongOffset);
-                size_t const oneSeqSize = ZSTD_execSequence(op, oend, sequence, &litPtr, litEnd, prefixStart, vBase, dictEnd);
-                DEBUGLOG(6, "regenerated sequence size : %u", (U32)oneSeqSize);
-                if (ZSTD_isError(oneSeqSize)) return oneSeqSize;
-                op += oneSeqSize;
-        }   }
-
-        /* check if reached exact end */
-        DEBUGLOG(5, "ZSTD_decompressSequences_body: after decode loop, remaining nbSeq : %i", nbSeq);
-        RETURN_ERROR_IF(nbSeq, corruption_detected);
-        RETURN_ERROR_IF(BIT_reloadDStream(&seqState.DStream) < BIT_DStream_completed, corruption_detected);
-        /* save reps for next block */
-        { U32 i; for (i=0; i<ZSTD_REP_NUM; i++) dctx->entropy.rep[i] = (U32)(seqState.prevOffset[i]); }
-    }
-
-    /* last literal segment */
-    {   size_t const lastLLSize = litEnd - litPtr;
-        RETURN_ERROR_IF(lastLLSize > (size_t)(oend-op), dstSize_tooSmall);
-        memcpy(op, litPtr, lastLLSize);
-        op += lastLLSize;
-    }
-
-    return op-ostart;
-}
-
-static size_t
-ZSTD_decompressSequences_default(ZSTD_DCtx* dctx,
-                                 void* dst, size_t maxDstSize,
-                           const void* seqStart, size_t seqSize, int nbSeq,
-                           const ZSTD_longOffset_e isLongOffset)
-{
-    return ZSTD_decompressSequences_body(dctx, dst, maxDstSize, seqStart, seqSize, nbSeq, isLongOffset);
-}
-#endif /* ZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG */
-
-
-
-#ifndef ZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT
-FORCE_INLINE_TEMPLATE seq_t
-ZSTD_decodeSequenceLong(seqState_t* seqState, ZSTD_longOffset_e const longOffsets)
-{
-    seq_t seq;
-    U32 const llBits = seqState->stateLL.table[seqState->stateLL.state].nbAdditionalBits;
-    U32 const mlBits = seqState->stateML.table[seqState->stateML.state].nbAdditionalBits;
-    U32 const ofBits = seqState->stateOffb.table[seqState->stateOffb.state].nbAdditionalBits;
-    U32 const totalBits = llBits+mlBits+ofBits;
-    U32 const llBase = seqState->stateLL.table[seqState->stateLL.state].baseValue;
-    U32 const mlBase = seqState->stateML.table[seqState->stateML.state].baseValue;
-    U32 const ofBase = seqState->stateOffb.table[seqState->stateOffb.state].baseValue;
-
-    /* sequence */
-    {   size_t offset;
-        if (!ofBits)
-            offset = 0;
-        else {
-            ZSTD_STATIC_ASSERT(ZSTD_lo_isLongOffset == 1);
-            ZSTD_STATIC_ASSERT(LONG_OFFSETS_MAX_EXTRA_BITS_32 == 5);
-            assert(ofBits <= MaxOff);
-            if (MEM_32bits() && longOffsets) {
-                U32 const extraBits = ofBits - MIN(ofBits, STREAM_ACCUMULATOR_MIN_32-1);
-                offset = ofBase + (BIT_readBitsFast(&seqState->DStream, ofBits - extraBits) << extraBits);
-                if (MEM_32bits() || extraBits) BIT_reloadDStream(&seqState->DStream);
-                if (extraBits) offset += BIT_readBitsFast(&seqState->DStream, extraBits);
-            } else {
-                offset = ofBase + BIT_readBitsFast(&seqState->DStream, ofBits);   /* <=  (ZSTD_WINDOWLOG_MAX-1) bits */
-                if (MEM_32bits()) BIT_reloadDStream(&seqState->DStream);
-            }
-        }
-
-        if (ofBits <= 1) {
-            offset += (llBase==0);
-            if (offset) {
-                size_t temp = (offset==3) ? seqState->prevOffset[0] - 1 : seqState->prevOffset[offset];
-                temp += !temp;   /* 0 is not valid; input is corrupted; force offset to 1 */
-                if (offset != 1) seqState->prevOffset[2] = seqState->prevOffset[1];
-                seqState->prevOffset[1] = seqState->prevOffset[0];
-                seqState->prevOffset[0] = offset = temp;
-            } else {
-                offset = seqState->prevOffset[0];
-            }
-        } else {
-            seqState->prevOffset[2] = seqState->prevOffset[1];
-            seqState->prevOffset[1] = seqState->prevOffset[0];
-            seqState->prevOffset[0] = offset;
-        }
-        seq.offset = offset;
-    }
-
-    seq.matchLength = mlBase + ((mlBits>0) ? BIT_readBitsFast(&seqState->DStream, mlBits) : 0);  /* <=  16 bits */
-    if (MEM_32bits() && (mlBits+llBits >= STREAM_ACCUMULATOR_MIN_32-LONG_OFFSETS_MAX_EXTRA_BITS_32))
-        BIT_reloadDStream(&seqState->DStream);
-    if (MEM_64bits() && (totalBits >= STREAM_ACCUMULATOR_MIN_64-(LLFSELog+MLFSELog+OffFSELog)))
-        BIT_reloadDStream(&seqState->DStream);
-    /* Verify that there is enough bits to read the rest of the data in 64-bit mode. */
-    ZSTD_STATIC_ASSERT(16+LLFSELog+MLFSELog+OffFSELog < STREAM_ACCUMULATOR_MIN_64);
-
-    seq.litLength = llBase + ((llBits>0) ? BIT_readBitsFast(&seqState->DStream, llBits) : 0);    /* <=  16 bits */
-    if (MEM_32bits())
-        BIT_reloadDStream(&seqState->DStream);
-
-    {   size_t const pos = seqState->pos + seq.litLength;
-        const BYTE* const matchBase = (seq.offset > pos) ? seqState->dictEnd : seqState->prefixStart;
-        seq.match = matchBase + pos - seq.offset;  /* note : this operation can overflow when seq.offset is really too large, which can only happen when input is corrupted.
-                                                    * No consequence though : no memory access will occur, overly large offset will be detected in ZSTD_execSequenceLong() */
-        seqState->pos = pos + seq.matchLength;
-    }
-
-    /* ANS state update */
-    ZSTD_updateFseState(&seqState->stateLL, &seqState->DStream);    /* <=  9 bits */
-    ZSTD_updateFseState(&seqState->stateML, &seqState->DStream);    /* <=  9 bits */
-    if (MEM_32bits()) BIT_reloadDStream(&seqState->DStream);    /* <= 18 bits */
-    ZSTD_updateFseState(&seqState->stateOffb, &seqState->DStream);  /* <=  8 bits */
-
-    return seq;
-}
-
-FORCE_INLINE_TEMPLATE size_t
-ZSTD_decompressSequencesLong_body(
-                               ZSTD_DCtx* dctx,
-                               void* dst, size_t maxDstSize,
-                         const void* seqStart, size_t seqSize, int nbSeq,
-                         const ZSTD_longOffset_e isLongOffset)
-{
-    const BYTE* ip = (const BYTE*)seqStart;
-    const BYTE* const iend = ip + seqSize;
-    BYTE* const ostart = (BYTE* const)dst;
-    BYTE* const oend = ostart + maxDstSize;
-    BYTE* op = ostart;
-    const BYTE* litPtr = dctx->litPtr;
-    const BYTE* const litEnd = litPtr + dctx->litSize;
-    const BYTE* const prefixStart = (const BYTE*) (dctx->prefixStart);
-    const BYTE* const dictStart = (const BYTE*) (dctx->virtualStart);
-    const BYTE* const dictEnd = (const BYTE*) (dctx->dictEnd);
-
-    /* Regen sequences */
-    if (nbSeq) {
-#define STORED_SEQS 4
-#define STORED_SEQS_MASK (STORED_SEQS-1)
-#define ADVANCED_SEQS 4
-        seq_t sequences[STORED_SEQS];
-        int const seqAdvance = MIN(nbSeq, ADVANCED_SEQS);
-        seqState_t seqState;
-        int seqNb;
-        dctx->fseEntropy = 1;
-        { int i; for (i=0; i<ZSTD_REP_NUM; i++) seqState.prevOffset[i] = dctx->entropy.rep[i]; }
-        seqState.prefixStart = prefixStart;
-        seqState.pos = (size_t)(op-prefixStart);
-        seqState.dictEnd = dictEnd;
-        assert(iend >= ip);
-        RETURN_ERROR_IF(
-            ERR_isError(BIT_initDStream(&seqState.DStream, ip, iend-ip)),
-            corruption_detected);
-        ZSTD_initFseState(&seqState.stateLL, &seqState.DStream, dctx->LLTptr);
-        ZSTD_initFseState(&seqState.stateOffb, &seqState.DStream, dctx->OFTptr);
-        ZSTD_initFseState(&seqState.stateML, &seqState.DStream, dctx->MLTptr);
-
-        /* prepare in advance */
-        for (seqNb=0; (BIT_reloadDStream(&seqState.DStream) <= BIT_DStream_completed) && (seqNb<seqAdvance); seqNb++) {
-            sequences[seqNb] = ZSTD_decodeSequenceLong(&seqState, isLongOffset);
-            PREFETCH_L1(sequences[seqNb].match); PREFETCH_L1(sequences[seqNb].match + sequences[seqNb].matchLength - 1); /* note : it's safe to invoke PREFETCH() on any memory address, including invalid ones */
-        }
-        RETURN_ERROR_IF(seqNb<seqAdvance, corruption_detected);
-
-        /* decode and decompress */
-        for ( ; (BIT_reloadDStream(&(seqState.DStream)) <= BIT_DStream_completed) && (seqNb<nbSeq) ; seqNb++) {
-            seq_t const sequence = ZSTD_decodeSequenceLong(&seqState, isLongOffset);
-            size_t const oneSeqSize = ZSTD_execSequenceLong(op, oend, sequences[(seqNb-ADVANCED_SEQS) & STORED_SEQS_MASK], &litPtr, litEnd, prefixStart, dictStart, dictEnd);
-            if (ZSTD_isError(oneSeqSize)) return oneSeqSize;
-            PREFETCH_L1(sequence.match); PREFETCH_L1(sequence.match + sequence.matchLength - 1); /* note : it's safe to invoke PREFETCH() on any memory address, including invalid ones */
-            sequences[seqNb & STORED_SEQS_MASK] = sequence;
-            op += oneSeqSize;
-        }
-        RETURN_ERROR_IF(seqNb<nbSeq, corruption_detected);
-
-        /* finish queue */
-        seqNb -= seqAdvance;
-        for ( ; seqNb<nbSeq ; seqNb++) {
-            size_t const oneSeqSize = ZSTD_execSequenceLong(op, oend, sequences[seqNb&STORED_SEQS_MASK], &litPtr, litEnd, prefixStart, dictStart, dictEnd);
-            if (ZSTD_isError(oneSeqSize)) return oneSeqSize;
-            op += oneSeqSize;
-        }
-
-        /* save reps for next block */
-        { U32 i; for (i=0; i<ZSTD_REP_NUM; i++) dctx->entropy.rep[i] = (U32)(seqState.prevOffset[i]); }
-    }
-
-    /* last literal segment */
-    {   size_t const lastLLSize = litEnd - litPtr;
-        RETURN_ERROR_IF(lastLLSize > (size_t)(oend-op), dstSize_tooSmall);
-        memcpy(op, litPtr, lastLLSize);
-        op += lastLLSize;
-    }
-
-    return op-ostart;
-}
-
-static size_t
-ZSTD_decompressSequencesLong_default(ZSTD_DCtx* dctx,
-                                 void* dst, size_t maxDstSize,
-                           const void* seqStart, size_t seqSize, int nbSeq,
-                           const ZSTD_longOffset_e isLongOffset)
-{
-    return ZSTD_decompressSequencesLong_body(dctx, dst, maxDstSize, seqStart, seqSize, nbSeq, isLongOffset);
-}
-#endif /* ZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT */
-
-
-
-#if DYNAMIC_BMI2
-
-#ifndef ZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG
-static TARGET_ATTRIBUTE("bmi2") size_t
-DONT_VECTORIZE
-ZSTD_decompressSequences_bmi2(ZSTD_DCtx* dctx,
-                                 void* dst, size_t maxDstSize,
-                           const void* seqStart, size_t seqSize, int nbSeq,
-                           const ZSTD_longOffset_e isLongOffset)
-{
-    return ZSTD_decompressSequences_body(dctx, dst, maxDstSize, seqStart, seqSize, nbSeq, isLongOffset);
-}
-#endif /* ZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG */
-
-#ifndef ZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT
-static TARGET_ATTRIBUTE("bmi2") size_t
-ZSTD_decompressSequencesLong_bmi2(ZSTD_DCtx* dctx,
-                                 void* dst, size_t maxDstSize,
-                           const void* seqStart, size_t seqSize, int nbSeq,
-                           const ZSTD_longOffset_e isLongOffset)
-{
-    return ZSTD_decompressSequencesLong_body(dctx, dst, maxDstSize, seqStart, seqSize, nbSeq, isLongOffset);
-}
-#endif /* ZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT */
-
-#endif /* DYNAMIC_BMI2 */
-
-typedef size_t (*ZSTD_decompressSequences_t)(
-                            ZSTD_DCtx* dctx,
-                            void* dst, size_t maxDstSize,
-                            const void* seqStart, size_t seqSize, int nbSeq,
-                            const ZSTD_longOffset_e isLongOffset);
-
-#ifndef ZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG
-static size_t
-ZSTD_decompressSequences(ZSTD_DCtx* dctx, void* dst, size_t maxDstSize,
-                   const void* seqStart, size_t seqSize, int nbSeq,
-                   const ZSTD_longOffset_e isLongOffset)
-{
-    DEBUGLOG(5, "ZSTD_decompressSequences");
-#if DYNAMIC_BMI2
-    if (dctx->bmi2) {
-        return ZSTD_decompressSequences_bmi2(dctx, dst, maxDstSize, seqStart, seqSize, nbSeq, isLongOffset);
-    }
-#endif
-  return ZSTD_decompressSequences_default(dctx, dst, maxDstSize, seqStart, seqSize, nbSeq, isLongOffset);
-}
-#endif /* ZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG */
-
-
-#ifndef ZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT
-/* ZSTD_decompressSequencesLong() :
- * decompression function triggered when a minimum share of offsets is considered "long",
- * aka out of cache.
- * note : "long" definition seems overloaded here, sometimes meaning "wider than bitstream register", and sometimes meaning "farther than memory cache distance".
- * This function will try to mitigate main memory latency through the use of prefetching */
-static size_t
-ZSTD_decompressSequencesLong(ZSTD_DCtx* dctx,
-                             void* dst, size_t maxDstSize,
-                             const void* seqStart, size_t seqSize, int nbSeq,
-                             const ZSTD_longOffset_e isLongOffset)
-{
-    DEBUGLOG(5, "ZSTD_decompressSequencesLong");
-#if DYNAMIC_BMI2
-    if (dctx->bmi2) {
-        return ZSTD_decompressSequencesLong_bmi2(dctx, dst, maxDstSize, seqStart, seqSize, nbSeq, isLongOffset);
-    }
-#endif
-  return ZSTD_decompressSequencesLong_default(dctx, dst, maxDstSize, seqStart, seqSize, nbSeq, isLongOffset);
-}
-#endif /* ZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT */
-
-
-
-#if !defined(ZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT) && \
-    !defined(ZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG)
-/* ZSTD_getLongOffsetsShare() :
- * condition : offTable must be valid
- * @return : "share" of long offsets (arbitrarily defined as > (1<<23))
- *           compared to maximum possible of (1<<OffFSELog) */
-static unsigned
-ZSTD_getLongOffsetsShare(const ZSTD_seqSymbol* offTable)
-{
-    const void* ptr = offTable;
-    U32 const tableLog = ((const ZSTD_seqSymbol_header*)ptr)[0].tableLog;
-    const ZSTD_seqSymbol* table = offTable + 1;
-    U32 const max = 1 << tableLog;
-    U32 u, total = 0;
-    DEBUGLOG(5, "ZSTD_getLongOffsetsShare: (tableLog=%u)", tableLog);
-
-    assert(max <= (1 << OffFSELog));  /* max not too large */
-    for (u=0; u<max; u++) {
-        if (table[u].nbAdditionalBits > 22) total += 1;
-    }
-
-    assert(tableLog <= OffFSELog);
-    total <<= (OffFSELog - tableLog);  /* scale to OffFSELog */
-
-    return total;
-}
-#endif
-
-
-size_t
-ZSTD_decompressBlock_internal(ZSTD_DCtx* dctx,
-                              void* dst, size_t dstCapacity,
-                        const void* src, size_t srcSize, const int frame)
-{   /* blockType == blockCompressed */
-    const BYTE* ip = (const BYTE*)src;
-    /* isLongOffset must be true if there are long offsets.
-     * Offsets are long if they are larger than 2^STREAM_ACCUMULATOR_MIN.
-     * We don't expect that to be the case in 64-bit mode.
-     * In block mode, window size is not known, so we have to be conservative.
-     * (note: but it could be evaluated from current-lowLimit)
-     */
-    ZSTD_longOffset_e const isLongOffset = (ZSTD_longOffset_e)(MEM_32bits() && (!frame || (dctx->fParams.windowSize > (1ULL << STREAM_ACCUMULATOR_MIN))));
-    DEBUGLOG(5, "ZSTD_decompressBlock_internal (size : %u)", (U32)srcSize);
-
-    RETURN_ERROR_IF(srcSize >= ZSTD_BLOCKSIZE_MAX, srcSize_wrong);
-
-    /* Decode literals section */
-    {   size_t const litCSize = ZSTD_decodeLiteralsBlock(dctx, src, srcSize);
-        DEBUGLOG(5, "ZSTD_decodeLiteralsBlock : %u", (U32)litCSize);
-        if (ZSTD_isError(litCSize)) return litCSize;
-        ip += litCSize;
-        srcSize -= litCSize;
-    }
-
-    /* Build Decoding Tables */
-    {
-        /* These macros control at build-time which decompressor implementation
-         * we use. If neither is defined, we do some inspection and dispatch at
-         * runtime.
-         */
-#if !defined(ZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT) && \
-    !defined(ZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG)
-        int usePrefetchDecoder = dctx->ddictIsCold;
-#endif
-        int nbSeq;
-        size_t const seqHSize = ZSTD_decodeSeqHeaders(dctx, &nbSeq, ip, srcSize);
-        if (ZSTD_isError(seqHSize)) return seqHSize;
-        ip += seqHSize;
-        srcSize -= seqHSize;
-
-#if !defined(ZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT) && \
-    !defined(ZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG)
-        if ( !usePrefetchDecoder
-          && (!frame || (dctx->fParams.windowSize > (1<<24)))
-          && (nbSeq>ADVANCED_SEQS) ) {  /* could probably use a larger nbSeq limit */
-            U32 const shareLongOffsets = ZSTD_getLongOffsetsShare(dctx->OFTptr);
-            U32 const minShare = MEM_64bits() ? 7 : 20; /* heuristic values, correspond to 2.73% and 7.81% */
-            usePrefetchDecoder = (shareLongOffsets >= minShare);
-        }
-#endif
-
-        dctx->ddictIsCold = 0;
-
-#if !defined(ZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT) && \
-    !defined(ZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG)
-        if (usePrefetchDecoder)
-#endif
-#ifndef ZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT
-            return ZSTD_decompressSequencesLong(dctx, dst, dstCapacity, ip, srcSize, nbSeq, isLongOffset);
-#endif
-
-#ifndef ZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG
-        /* else */
-        return ZSTD_decompressSequences(dctx, dst, dstCapacity, ip, srcSize, nbSeq, isLongOffset);
-#endif
-    }
-}
-
-
-size_t ZSTD_decompressBlock(ZSTD_DCtx* dctx,
-                            void* dst, size_t dstCapacity,
-                      const void* src, size_t srcSize)
-{
-    size_t dSize;
-    ZSTD_checkContinuity(dctx, dst);
-    dSize = ZSTD_decompressBlock_internal(dctx, dst, dstCapacity, src, srcSize, /* frame */ 0);
-    dctx->previousDstEnd = (char*)dst + dSize;
-    return dSize;
-}
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/decompress/zstd_decompress_block.h mysql-8.0-8.0.27/extra/zstd/lib/decompress/zstd_decompress_block.h
--- mysql-8.0-8.0.26/extra/zstd/lib/decompress/zstd_decompress_block.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/decompress/zstd_decompress_block.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
-
-#ifndef ZSTD_DEC_BLOCK_H
-#define ZSTD_DEC_BLOCK_H
-
-/*-*******************************************************
- *  Dependencies
- *********************************************************/
-#include <stddef.h>   /* size_t */
-#include "zstd.h"    /* DCtx, and some public functions */
-#include "zstd_internal.h"  /* blockProperties_t, and some public functions */
-#include "zstd_decompress_internal.h"  /* ZSTD_seqSymbol */
-
-
-/* ===   Prototypes   === */
-
-/* note: prototypes already published within `zstd.h` :
- * ZSTD_decompressBlock()
- */
-
-/* note: prototypes already published within `zstd_internal.h` :
- * ZSTD_getcBlockSize()
- * ZSTD_decodeSeqHeaders()
- */
-
-
-/* ZSTD_decompressBlock_internal() :
- * decompress block, starting at `src`,
- * into destination buffer `dst`.
- * @return : decompressed block size,
- *           or an error code (which can be tested using ZSTD_isError())
- */
-size_t ZSTD_decompressBlock_internal(ZSTD_DCtx* dctx,
-                               void* dst, size_t dstCapacity,
-                         const void* src, size_t srcSize, const int frame);
-
-/* ZSTD_buildFSETable() :
- * generate FSE decoding table for one symbol (ll, ml or off)
- * this function must be called with valid parameters only
- * (dt is large enough, normalizedCounter distribution total is a power of 2, max is within range, etc.)
- * in which case it cannot fail.
- * Internal use only.
- */
-void ZSTD_buildFSETable(ZSTD_seqSymbol* dt,
-             const short* normalizedCounter, unsigned maxSymbolValue,
-             const U32* baseValue, const U32* nbAdditionalBits,
-                   unsigned tableLog);
-
-
-#endif /* ZSTD_DEC_BLOCK_H */
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/decompress/zstd_decompress.c mysql-8.0-8.0.27/extra/zstd/lib/decompress/zstd_decompress.c
--- mysql-8.0-8.0.26/extra/zstd/lib/decompress/zstd_decompress.c	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/decompress/zstd_decompress.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1771 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
-
-/* ***************************************************************
-*  Tuning parameters
-*****************************************************************/
-/*!
- * HEAPMODE :
- * Select how default decompression function ZSTD_decompress() allocates its context,
- * on stack (0), or into heap (1, default; requires malloc()).
- * Note that functions with explicit context such as ZSTD_decompressDCtx() are unaffected.
- */
-#ifndef ZSTD_HEAPMODE
-#  define ZSTD_HEAPMODE 1
-#endif
-
-/*!
-*  LEGACY_SUPPORT :
-*  if set to 1+, ZSTD_decompress() can decode older formats (v0.1+)
-*/
-#ifndef ZSTD_LEGACY_SUPPORT
-#  define ZSTD_LEGACY_SUPPORT 0
-#endif
-
-/*!
- *  MAXWINDOWSIZE_DEFAULT :
- *  maximum window size accepted by DStream __by default__.
- *  Frames requiring more memory will be rejected.
- *  It's possible to set a different limit using ZSTD_DCtx_setMaxWindowSize().
- */
-#ifndef ZSTD_MAXWINDOWSIZE_DEFAULT
-#  define ZSTD_MAXWINDOWSIZE_DEFAULT (((U32)1 << ZSTD_WINDOWLOG_LIMIT_DEFAULT) + 1)
-#endif
-
-/*!
- *  NO_FORWARD_PROGRESS_MAX :
- *  maximum allowed nb of calls to ZSTD_decompressStream()
- *  without any forward progress
- *  (defined as: no byte read from input, and no byte flushed to output)
- *  before triggering an error.
- */
-#ifndef ZSTD_NO_FORWARD_PROGRESS_MAX
-#  define ZSTD_NO_FORWARD_PROGRESS_MAX 16
-#endif
-
-
-/*-*******************************************************
-*  Dependencies
-*********************************************************/
-#include <string.h>      /* memcpy, memmove, memset */
-#include "cpu.h"         /* bmi2 */
-#include "mem.h"         /* low level memory routines */
-#define FSE_STATIC_LINKING_ONLY
-#include "fse.h"
-#define HUF_STATIC_LINKING_ONLY
-#include "huf.h"
-#include "zstd_internal.h"  /* blockProperties_t */
-#include "zstd_decompress_internal.h"   /* ZSTD_DCtx */
-#include "zstd_ddict.h"  /* ZSTD_DDictDictContent */
-#include "zstd_decompress_block.h"   /* ZSTD_decompressBlock_internal */
-
-#if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT>=1)
-#  include "zstd_legacy.h"
-#endif
-
-
-/*-*************************************************************
-*   Context management
-***************************************************************/
-size_t ZSTD_sizeof_DCtx (const ZSTD_DCtx* dctx)
-{
-    if (dctx==NULL) return 0;   /* support sizeof NULL */
-    return sizeof(*dctx)
-           + ZSTD_sizeof_DDict(dctx->ddictLocal)
-           + dctx->inBuffSize + dctx->outBuffSize;
-}
-
-size_t ZSTD_estimateDCtxSize(void) { return sizeof(ZSTD_DCtx); }
-
-
-static size_t ZSTD_startingInputLength(ZSTD_format_e format)
-{
-    size_t const startingInputLength = (format==ZSTD_f_zstd1_magicless) ?
-                    ZSTD_FRAMEHEADERSIZE_PREFIX - ZSTD_FRAMEIDSIZE :
-                    ZSTD_FRAMEHEADERSIZE_PREFIX;
-    ZSTD_STATIC_ASSERT(ZSTD_FRAMEHEADERSIZE_PREFIX >= ZSTD_FRAMEIDSIZE);
-    /* only supports formats ZSTD_f_zstd1 and ZSTD_f_zstd1_magicless */
-    assert( (format == ZSTD_f_zstd1) || (format == ZSTD_f_zstd1_magicless) );
-    return startingInputLength;
-}
-
-static void ZSTD_initDCtx_internal(ZSTD_DCtx* dctx)
-{
-    dctx->format = ZSTD_f_zstd1;  /* ZSTD_decompressBegin() invokes ZSTD_startingInputLength() with argument dctx->format */
-    dctx->staticSize  = 0;
-    dctx->maxWindowSize = ZSTD_MAXWINDOWSIZE_DEFAULT;
-    dctx->ddict       = NULL;
-    dctx->ddictLocal  = NULL;
-    dctx->dictEnd     = NULL;
-    dctx->ddictIsCold = 0;
-    dctx->dictUses = ZSTD_dont_use;
-    dctx->inBuff      = NULL;
-    dctx->inBuffSize  = 0;
-    dctx->outBuffSize = 0;
-    dctx->streamStage = zdss_init;
-    dctx->legacyContext = NULL;
-    dctx->previousLegacyVersion = 0;
-    dctx->noForwardProgress = 0;
-    dctx->bmi2 = ZSTD_cpuid_bmi2(ZSTD_cpuid());
-}
-
-ZSTD_DCtx* ZSTD_initStaticDCtx(void *workspace, size_t workspaceSize)
-{
-    ZSTD_DCtx* const dctx = (ZSTD_DCtx*) workspace;
-
-    if ((size_t)workspace & 7) return NULL;  /* 8-aligned */
-    if (workspaceSize < sizeof(ZSTD_DCtx)) return NULL;  /* minimum size */
-
-    ZSTD_initDCtx_internal(dctx);
-    dctx->staticSize = workspaceSize;
-    dctx->inBuff = (char*)(dctx+1);
-    return dctx;
-}
-
-ZSTD_DCtx* ZSTD_createDCtx_advanced(ZSTD_customMem customMem)
-{
-    if (!customMem.customAlloc ^ !customMem.customFree) return NULL;
-
-    {   ZSTD_DCtx* const dctx = (ZSTD_DCtx*)ZSTD_malloc(sizeof(*dctx), customMem);
-        if (!dctx) return NULL;
-        dctx->customMem = customMem;
-        ZSTD_initDCtx_internal(dctx);
-        return dctx;
-    }
-}
-
-ZSTD_DCtx* ZSTD_createDCtx(void)
-{
-    DEBUGLOG(3, "ZSTD_createDCtx");
-    return ZSTD_createDCtx_advanced(ZSTD_defaultCMem);
-}
-
-static void ZSTD_clearDict(ZSTD_DCtx* dctx)
-{
-    ZSTD_freeDDict(dctx->ddictLocal);
-    dctx->ddictLocal = NULL;
-    dctx->ddict = NULL;
-    dctx->dictUses = ZSTD_dont_use;
-}
-
-size_t ZSTD_freeDCtx(ZSTD_DCtx* dctx)
-{
-    if (dctx==NULL) return 0;   /* support free on NULL */
-    RETURN_ERROR_IF(dctx->staticSize, memory_allocation, "not compatible with static DCtx");
-    {   ZSTD_customMem const cMem = dctx->customMem;
-        ZSTD_clearDict(dctx);
-        ZSTD_free(dctx->inBuff, cMem);
-        dctx->inBuff = NULL;
-#if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT >= 1)
-        if (dctx->legacyContext)
-            ZSTD_freeLegacyStreamContext(dctx->legacyContext, dctx->previousLegacyVersion);
-#endif
-        ZSTD_free(dctx, cMem);
-        return 0;
-    }
-}
-
-/* no longer useful */
-void ZSTD_copyDCtx(ZSTD_DCtx* dstDCtx, const ZSTD_DCtx* srcDCtx)
-{
-    size_t const toCopy = (size_t)((char*)(&dstDCtx->inBuff) - (char*)dstDCtx);
-    memcpy(dstDCtx, srcDCtx, toCopy);  /* no need to copy workspace */
-}
-
-
-/*-*************************************************************
- *   Frame header decoding
- ***************************************************************/
-
-/*! ZSTD_isFrame() :
- *  Tells if the content of `buffer` starts with a valid Frame Identifier.
- *  Note : Frame Identifier is 4 bytes. If `size < 4`, @return will always be 0.
- *  Note 2 : Legacy Frame Identifiers are considered valid only if Legacy Support is enabled.
- *  Note 3 : Skippable Frame Identifiers are considered valid. */
-unsigned ZSTD_isFrame(const void* buffer, size_t size)
-{
-    if (size < ZSTD_FRAMEIDSIZE) return 0;
-    {   U32 const magic = MEM_readLE32(buffer);
-        if (magic == ZSTD_MAGICNUMBER) return 1;
-        if ((magic & ZSTD_MAGIC_SKIPPABLE_MASK) == ZSTD_MAGIC_SKIPPABLE_START) return 1;
-    }
-#if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT >= 1)
-    if (ZSTD_isLegacy(buffer, size)) return 1;
-#endif
-    return 0;
-}
-
-/** ZSTD_frameHeaderSize_internal() :
- *  srcSize must be large enough to reach header size fields.
- *  note : only works for formats ZSTD_f_zstd1 and ZSTD_f_zstd1_magicless.
- * @return : size of the Frame Header
- *           or an error code, which can be tested with ZSTD_isError() */
-static size_t ZSTD_frameHeaderSize_internal(const void* src, size_t srcSize, ZSTD_format_e format)
-{
-    size_t const minInputSize = ZSTD_startingInputLength(format);
-    RETURN_ERROR_IF(srcSize < minInputSize, srcSize_wrong);
-
-    {   BYTE const fhd = ((const BYTE*)src)[minInputSize-1];
-        U32 const dictID= fhd & 3;
-        U32 const singleSegment = (fhd >> 5) & 1;
-        U32 const fcsId = fhd >> 6;
-        return minInputSize + !singleSegment
-             + ZSTD_did_fieldSize[dictID] + ZSTD_fcs_fieldSize[fcsId]
-             + (singleSegment && !fcsId);
-    }
-}
-
-/** ZSTD_frameHeaderSize() :
- *  srcSize must be >= ZSTD_frameHeaderSize_prefix.
- * @return : size of the Frame Header,
- *           or an error code (if srcSize is too small) */
-size_t ZSTD_frameHeaderSize(const void* src, size_t srcSize)
-{
-    return ZSTD_frameHeaderSize_internal(src, srcSize, ZSTD_f_zstd1);
-}
-
-
-/** ZSTD_getFrameHeader_advanced() :
- *  decode Frame Header, or require larger `srcSize`.
- *  note : only works for formats ZSTD_f_zstd1 and ZSTD_f_zstd1_magicless
- * @return : 0, `zfhPtr` is correctly filled,
- *          >0, `srcSize` is too small, value is wanted `srcSize` amount,
- *           or an error code, which can be tested using ZSTD_isError() */
-size_t ZSTD_getFrameHeader_advanced(ZSTD_frameHeader* zfhPtr, const void* src, size_t srcSize, ZSTD_format_e format)
-{
-    const BYTE* ip = (const BYTE*)src;
-    size_t const minInputSize = ZSTD_startingInputLength(format);
-
-    memset(zfhPtr, 0, sizeof(*zfhPtr));   /* not strictly necessary, but static analyzer do not understand that zfhPtr is only going to be read only if return value is zero, since they are 2 different signals */
-    if (srcSize < minInputSize) return minInputSize;
-    RETURN_ERROR_IF(src==NULL, GENERIC, "invalid parameter");
-
-    if ( (format != ZSTD_f_zstd1_magicless)
-      && (MEM_readLE32(src) != ZSTD_MAGICNUMBER) ) {
-        if ((MEM_readLE32(src) & ZSTD_MAGIC_SKIPPABLE_MASK) == ZSTD_MAGIC_SKIPPABLE_START) {
-            /* skippable frame */
-            if (srcSize < ZSTD_SKIPPABLEHEADERSIZE)
-                return ZSTD_SKIPPABLEHEADERSIZE; /* magic number + frame length */
-            memset(zfhPtr, 0, sizeof(*zfhPtr));
-            zfhPtr->frameContentSize = MEM_readLE32((const char *)src + ZSTD_FRAMEIDSIZE);
-            zfhPtr->frameType = ZSTD_skippableFrame;
-            return 0;
-        }
-        RETURN_ERROR(prefix_unknown);
-    }
-
-    /* ensure there is enough `srcSize` to fully read/decode frame header */
-    {   size_t const fhsize = ZSTD_frameHeaderSize_internal(src, srcSize, format);
-        if (srcSize < fhsize) return fhsize;
-        zfhPtr->headerSize = (U32)fhsize;
-    }
-
-    {   BYTE const fhdByte = ip[minInputSize-1];
-        size_t pos = minInputSize;
-        U32 const dictIDSizeCode = fhdByte&3;
-        U32 const checksumFlag = (fhdByte>>2)&1;
-        U32 const singleSegment = (fhdByte>>5)&1;
-        U32 const fcsID = fhdByte>>6;
-        U64 windowSize = 0;
-        U32 dictID = 0;
-        U64 frameContentSize = ZSTD_CONTENTSIZE_UNKNOWN;
-        RETURN_ERROR_IF((fhdByte & 0x08) != 0, frameParameter_unsupported,
-                        "reserved bits, must be zero");
-
-        if (!singleSegment) {
-            BYTE const wlByte = ip[pos++];
-            U32 const windowLog = (wlByte >> 3) + ZSTD_WINDOWLOG_ABSOLUTEMIN;
-            RETURN_ERROR_IF(windowLog > ZSTD_WINDOWLOG_MAX, frameParameter_windowTooLarge);
-            windowSize = (1ULL << windowLog);
-            windowSize += (windowSize >> 3) * (wlByte&7);
-        }
-        switch(dictIDSizeCode)
-        {
-            default: assert(0);  /* impossible */
-            case 0 : break;
-            case 1 : dictID = ip[pos]; pos++; break;
-            case 2 : dictID = MEM_readLE16(ip+pos); pos+=2; break;
-            case 3 : dictID = MEM_readLE32(ip+pos); pos+=4; break;
-        }
-        switch(fcsID)
-        {
-            default: assert(0);  /* impossible */
-            case 0 : if (singleSegment) frameContentSize = ip[pos]; break;
-            case 1 : frameContentSize = MEM_readLE16(ip+pos)+256; break;
-            case 2 : frameContentSize = MEM_readLE32(ip+pos); break;
-            case 3 : frameContentSize = MEM_readLE64(ip+pos); break;
-        }
-        if (singleSegment) windowSize = frameContentSize;
-
-        zfhPtr->frameType = ZSTD_frame;
-        zfhPtr->frameContentSize = frameContentSize;
-        zfhPtr->windowSize = windowSize;
-        zfhPtr->blockSizeMax = (unsigned) MIN(windowSize, ZSTD_BLOCKSIZE_MAX);
-        zfhPtr->dictID = dictID;
-        zfhPtr->checksumFlag = checksumFlag;
-    }
-    return 0;
-}
-
-/** ZSTD_getFrameHeader() :
- *  decode Frame Header, or require larger `srcSize`.
- *  note : this function does not consume input, it only reads it.
- * @return : 0, `zfhPtr` is correctly filled,
- *          >0, `srcSize` is too small, value is wanted `srcSize` amount,
- *           or an error code, which can be tested using ZSTD_isError() */
-size_t ZSTD_getFrameHeader(ZSTD_frameHeader* zfhPtr, const void* src, size_t srcSize)
-{
-    return ZSTD_getFrameHeader_advanced(zfhPtr, src, srcSize, ZSTD_f_zstd1);
-}
-
-
-/** ZSTD_getFrameContentSize() :
- *  compatible with legacy mode
- * @return : decompressed size of the single frame pointed to be `src` if known, otherwise
- *         - ZSTD_CONTENTSIZE_UNKNOWN if the size cannot be determined
- *         - ZSTD_CONTENTSIZE_ERROR if an error occurred (e.g. invalid magic number, srcSize too small) */
-unsigned long long ZSTD_getFrameContentSize(const void *src, size_t srcSize)
-{
-#if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT >= 1)
-    if (ZSTD_isLegacy(src, srcSize)) {
-        unsigned long long const ret = ZSTD_getDecompressedSize_legacy(src, srcSize);
-        return ret == 0 ? ZSTD_CONTENTSIZE_UNKNOWN : ret;
-    }
-#endif
-    {   ZSTD_frameHeader zfh;
-        if (ZSTD_getFrameHeader(&zfh, src, srcSize) != 0)
-            return ZSTD_CONTENTSIZE_ERROR;
-        if (zfh.frameType == ZSTD_skippableFrame) {
-            return 0;
-        } else {
-            return zfh.frameContentSize;
-    }   }
-}
-
-static size_t readSkippableFrameSize(void const* src, size_t srcSize)
-{
-    size_t const skippableHeaderSize = ZSTD_SKIPPABLEHEADERSIZE;
-    U32 sizeU32;
-
-    RETURN_ERROR_IF(srcSize < ZSTD_SKIPPABLEHEADERSIZE, srcSize_wrong);
-
-    sizeU32 = MEM_readLE32((BYTE const*)src + ZSTD_FRAMEIDSIZE);
-    RETURN_ERROR_IF((U32)(sizeU32 + ZSTD_SKIPPABLEHEADERSIZE) < sizeU32,
-                    frameParameter_unsupported);
-    {
-        size_t const skippableSize = skippableHeaderSize + sizeU32;
-        RETURN_ERROR_IF(skippableSize > srcSize, srcSize_wrong);
-        return skippableSize;
-    }
-}
-
-/** ZSTD_findDecompressedSize() :
- *  compatible with legacy mode
- *  `srcSize` must be the exact length of some number of ZSTD compressed and/or
- *      skippable frames
- *  @return : decompressed size of the frames contained */
-unsigned long long ZSTD_findDecompressedSize(const void* src, size_t srcSize)
-{
-    unsigned long long totalDstSize = 0;
-
-    while (srcSize >= ZSTD_FRAMEHEADERSIZE_PREFIX) {
-        U32 const magicNumber = MEM_readLE32(src);
-
-        if ((magicNumber & ZSTD_MAGIC_SKIPPABLE_MASK) == ZSTD_MAGIC_SKIPPABLE_START) {
-            size_t const skippableSize = readSkippableFrameSize(src, srcSize);
-            if (ZSTD_isError(skippableSize)) {
-                return ZSTD_CONTENTSIZE_ERROR;
-            }
-            assert(skippableSize <= srcSize);
-
-            src = (const BYTE *)src + skippableSize;
-            srcSize -= skippableSize;
-            continue;
-        }
-
-        {   unsigned long long const ret = ZSTD_getFrameContentSize(src, srcSize);
-            if (ret >= ZSTD_CONTENTSIZE_ERROR) return ret;
-
-            /* check for overflow */
-            if (totalDstSize + ret < totalDstSize) return ZSTD_CONTENTSIZE_ERROR;
-            totalDstSize += ret;
-        }
-        {   size_t const frameSrcSize = ZSTD_findFrameCompressedSize(src, srcSize);
-            if (ZSTD_isError(frameSrcSize)) {
-                return ZSTD_CONTENTSIZE_ERROR;
-            }
-
-            src = (const BYTE *)src + frameSrcSize;
-            srcSize -= frameSrcSize;
-        }
-    }  /* while (srcSize >= ZSTD_frameHeaderSize_prefix) */
-
-    if (srcSize) return ZSTD_CONTENTSIZE_ERROR;
-
-    return totalDstSize;
-}
-
-/** ZSTD_getDecompressedSize() :
- *  compatible with legacy mode
- * @return : decompressed size if known, 0 otherwise
-             note : 0 can mean any of the following :
-                   - frame content is empty
-                   - decompressed size field is not present in frame header
-                   - frame header unknown / not supported
-                   - frame header not complete (`srcSize` too small) */
-unsigned long long ZSTD_getDecompressedSize(const void* src, size_t srcSize)
-{
-    unsigned long long const ret = ZSTD_getFrameContentSize(src, srcSize);
-    ZSTD_STATIC_ASSERT(ZSTD_CONTENTSIZE_ERROR < ZSTD_CONTENTSIZE_UNKNOWN);
-    return (ret >= ZSTD_CONTENTSIZE_ERROR) ? 0 : ret;
-}
-
-
-/** ZSTD_decodeFrameHeader() :
- * `headerSize` must be the size provided by ZSTD_frameHeaderSize().
- * @return : 0 if success, or an error code, which can be tested using ZSTD_isError() */
-static size_t ZSTD_decodeFrameHeader(ZSTD_DCtx* dctx, const void* src, size_t headerSize)
-{
-    size_t const result = ZSTD_getFrameHeader_advanced(&(dctx->fParams), src, headerSize, dctx->format);
-    if (ZSTD_isError(result)) return result;    /* invalid header */
-    RETURN_ERROR_IF(result>0, srcSize_wrong, "headerSize too small");
-#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
-    /* Skip the dictID check in fuzzing mode, because it makes the search
-     * harder.
-     */
-    RETURN_ERROR_IF(dctx->fParams.dictID && (dctx->dictID != dctx->fParams.dictID),
-                    dictionary_wrong);
-#endif
-    if (dctx->fParams.checksumFlag) XXH64_reset(&dctx->xxhState, 0);
-    return 0;
-}
-
-static ZSTD_frameSizeInfo ZSTD_errorFrameSizeInfo(size_t ret)
-{
-    ZSTD_frameSizeInfo frameSizeInfo;
-    frameSizeInfo.compressedSize = ret;
-    frameSizeInfo.decompressedBound = ZSTD_CONTENTSIZE_ERROR;
-    return frameSizeInfo;
-}
-
-static ZSTD_frameSizeInfo ZSTD_findFrameSizeInfo(const void* src, size_t srcSize)
-{
-    ZSTD_frameSizeInfo frameSizeInfo;
-    memset(&frameSizeInfo, 0, sizeof(ZSTD_frameSizeInfo));
-
-#if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT >= 1)
-    if (ZSTD_isLegacy(src, srcSize))
-        return ZSTD_findFrameSizeInfoLegacy(src, srcSize);
-#endif
-
-    if ((srcSize >= ZSTD_SKIPPABLEHEADERSIZE)
-        && (MEM_readLE32(src) & ZSTD_MAGIC_SKIPPABLE_MASK) == ZSTD_MAGIC_SKIPPABLE_START) {
-        frameSizeInfo.compressedSize = readSkippableFrameSize(src, srcSize);
-        assert(ZSTD_isError(frameSizeInfo.compressedSize) ||
-               frameSizeInfo.compressedSize <= srcSize);
-        return frameSizeInfo;
-    } else {
-        const BYTE* ip = (const BYTE*)src;
-        const BYTE* const ipstart = ip;
-        size_t remainingSize = srcSize;
-        size_t nbBlocks = 0;
-        ZSTD_frameHeader zfh;
-
-        /* Extract Frame Header */
-        {   size_t const ret = ZSTD_getFrameHeader(&zfh, src, srcSize);
-            if (ZSTD_isError(ret))
-                return ZSTD_errorFrameSizeInfo(ret);
-            if (ret > 0)
-                return ZSTD_errorFrameSizeInfo(ERROR(srcSize_wrong));
-        }
-
-        ip += zfh.headerSize;
-        remainingSize -= zfh.headerSize;
-
-        /* Iterate over each block */
-        while (1) {
-            blockProperties_t blockProperties;
-            size_t const cBlockSize = ZSTD_getcBlockSize(ip, remainingSize, &blockProperties);
-            if (ZSTD_isError(cBlockSize))
-                return ZSTD_errorFrameSizeInfo(cBlockSize);
-
-            if (ZSTD_blockHeaderSize + cBlockSize > remainingSize)
-                return ZSTD_errorFrameSizeInfo(ERROR(srcSize_wrong));
-
-            ip += ZSTD_blockHeaderSize + cBlockSize;
-            remainingSize -= ZSTD_blockHeaderSize + cBlockSize;
-            nbBlocks++;
-
-            if (blockProperties.lastBlock) break;
-        }
-
-        /* Final frame content checksum */
-        if (zfh.checksumFlag) {
-            if (remainingSize < 4)
-                return ZSTD_errorFrameSizeInfo(ERROR(srcSize_wrong));
-            ip += 4;
-        }
-
-        frameSizeInfo.compressedSize = ip - ipstart;
-        frameSizeInfo.decompressedBound = (zfh.frameContentSize != ZSTD_CONTENTSIZE_UNKNOWN)
-                                        ? zfh.frameContentSize
-                                        : nbBlocks * zfh.blockSizeMax;
-        return frameSizeInfo;
-    }
-}
-
-/** ZSTD_findFrameCompressedSize() :
- *  compatible with legacy mode
- *  `src` must point to the start of a ZSTD frame, ZSTD legacy frame, or skippable frame
- *  `srcSize` must be at least as large as the frame contained
- *  @return : the compressed size of the frame starting at `src` */
-size_t ZSTD_findFrameCompressedSize(const void *src, size_t srcSize)
-{
-    ZSTD_frameSizeInfo const frameSizeInfo = ZSTD_findFrameSizeInfo(src, srcSize);
-    return frameSizeInfo.compressedSize;
-}
-
-/** ZSTD_decompressBound() :
- *  compatible with legacy mode
- *  `src` must point to the start of a ZSTD frame or a skippeable frame
- *  `srcSize` must be at least as large as the frame contained
- *  @return : the maximum decompressed size of the compressed source
- */
-unsigned long long ZSTD_decompressBound(const void* src, size_t srcSize)
-{
-    unsigned long long bound = 0;
-    /* Iterate over each frame */
-    while (srcSize > 0) {
-        ZSTD_frameSizeInfo const frameSizeInfo = ZSTD_findFrameSizeInfo(src, srcSize);
-        size_t const compressedSize = frameSizeInfo.compressedSize;
-        unsigned long long const decompressedBound = frameSizeInfo.decompressedBound;
-        if (ZSTD_isError(compressedSize) || decompressedBound == ZSTD_CONTENTSIZE_ERROR)
-            return ZSTD_CONTENTSIZE_ERROR;
-        assert(srcSize >= compressedSize);
-        src = (const BYTE*)src + compressedSize;
-        srcSize -= compressedSize;
-        bound += decompressedBound;
-    }
-    return bound;
-}
-
-
-/*-*************************************************************
- *   Frame decoding
- ***************************************************************/
-
-
-void ZSTD_checkContinuity(ZSTD_DCtx* dctx, const void* dst)
-{
-    if (dst != dctx->previousDstEnd) {   /* not contiguous */
-        dctx->dictEnd = dctx->previousDstEnd;
-        dctx->virtualStart = (const char*)dst - ((const char*)(dctx->previousDstEnd) - (const char*)(dctx->prefixStart));
-        dctx->prefixStart = dst;
-        dctx->previousDstEnd = dst;
-    }
-}
-
-/** ZSTD_insertBlock() :
- *  insert `src` block into `dctx` history. Useful to track uncompressed blocks. */
-size_t ZSTD_insertBlock(ZSTD_DCtx* dctx, const void* blockStart, size_t blockSize)
-{
-    DEBUGLOG(5, "ZSTD_insertBlock: %u bytes", (unsigned)blockSize);
-    ZSTD_checkContinuity(dctx, blockStart);
-    dctx->previousDstEnd = (const char*)blockStart + blockSize;
-    return blockSize;
-}
-
-
-static size_t ZSTD_copyRawBlock(void* dst, size_t dstCapacity,
-                          const void* src, size_t srcSize)
-{
-    DEBUGLOG(5, "ZSTD_copyRawBlock");
-    if (dst == NULL) {
-        if (srcSize == 0) return 0;
-        RETURN_ERROR(dstBuffer_null);
-    }
-    RETURN_ERROR_IF(srcSize > dstCapacity, dstSize_tooSmall);
-    memcpy(dst, src, srcSize);
-    return srcSize;
-}
-
-static size_t ZSTD_setRleBlock(void* dst, size_t dstCapacity,
-                               BYTE b,
-                               size_t regenSize)
-{
-    if (dst == NULL) {
-        if (regenSize == 0) return 0;
-        RETURN_ERROR(dstBuffer_null);
-    }
-    RETURN_ERROR_IF(regenSize > dstCapacity, dstSize_tooSmall);
-    memset(dst, b, regenSize);
-    return regenSize;
-}
-
-
-/*! ZSTD_decompressFrame() :
- * @dctx must be properly initialized
- *  will update *srcPtr and *srcSizePtr,
- *  to make *srcPtr progress by one frame. */
-static size_t ZSTD_decompressFrame(ZSTD_DCtx* dctx,
-                                   void* dst, size_t dstCapacity,
-                             const void** srcPtr, size_t *srcSizePtr)
-{
-    const BYTE* ip = (const BYTE*)(*srcPtr);
-    BYTE* const ostart = (BYTE* const)dst;
-    BYTE* const oend = ostart + dstCapacity;
-    BYTE* op = ostart;
-    size_t remainingSrcSize = *srcSizePtr;
-
-    DEBUGLOG(4, "ZSTD_decompressFrame (srcSize:%i)", (int)*srcSizePtr);
-
-    /* check */
-    RETURN_ERROR_IF(
-        remainingSrcSize < ZSTD_FRAMEHEADERSIZE_MIN+ZSTD_blockHeaderSize,
-        srcSize_wrong);
-
-    /* Frame Header */
-    {   size_t const frameHeaderSize = ZSTD_frameHeaderSize(ip, ZSTD_FRAMEHEADERSIZE_PREFIX);
-        if (ZSTD_isError(frameHeaderSize)) return frameHeaderSize;
-        RETURN_ERROR_IF(remainingSrcSize < frameHeaderSize+ZSTD_blockHeaderSize,
-                        srcSize_wrong);
-        FORWARD_IF_ERROR( ZSTD_decodeFrameHeader(dctx, ip, frameHeaderSize) );
-        ip += frameHeaderSize; remainingSrcSize -= frameHeaderSize;
-    }
-
-    /* Loop on each block */
-    while (1) {
-        size_t decodedSize;
-        blockProperties_t blockProperties;
-        size_t const cBlockSize = ZSTD_getcBlockSize(ip, remainingSrcSize, &blockProperties);
-        if (ZSTD_isError(cBlockSize)) return cBlockSize;
-
-        ip += ZSTD_blockHeaderSize;
-        remainingSrcSize -= ZSTD_blockHeaderSize;
-        RETURN_ERROR_IF(cBlockSize > remainingSrcSize, srcSize_wrong);
-
-        switch(blockProperties.blockType)
-        {
-        case bt_compressed:
-            decodedSize = ZSTD_decompressBlock_internal(dctx, op, oend-op, ip, cBlockSize, /* frame */ 1);
-            break;
-        case bt_raw :
-            decodedSize = ZSTD_copyRawBlock(op, oend-op, ip, cBlockSize);
-            break;
-        case bt_rle :
-            decodedSize = ZSTD_setRleBlock(op, oend-op, *ip, blockProperties.origSize);
-            break;
-        case bt_reserved :
-        default:
-            RETURN_ERROR(corruption_detected);
-        }
-
-        if (ZSTD_isError(decodedSize)) return decodedSize;
-        if (dctx->fParams.checksumFlag)
-            XXH64_update(&dctx->xxhState, op, decodedSize);
-        op += decodedSize;
-        ip += cBlockSize;
-        remainingSrcSize -= cBlockSize;
-        if (blockProperties.lastBlock) break;
-    }
-
-    if (dctx->fParams.frameContentSize != ZSTD_CONTENTSIZE_UNKNOWN) {
-        RETURN_ERROR_IF((U64)(op-ostart) != dctx->fParams.frameContentSize,
-                        corruption_detected);
-    }
-    if (dctx->fParams.checksumFlag) { /* Frame content checksum verification */
-        U32 const checkCalc = (U32)XXH64_digest(&dctx->xxhState);
-        U32 checkRead;
-        RETURN_ERROR_IF(remainingSrcSize<4, checksum_wrong);
-        checkRead = MEM_readLE32(ip);
-        RETURN_ERROR_IF(checkRead != checkCalc, checksum_wrong);
-        ip += 4;
-        remainingSrcSize -= 4;
-    }
-
-    /* Allow caller to get size read */
-    *srcPtr = ip;
-    *srcSizePtr = remainingSrcSize;
-    return op-ostart;
-}
-
-static size_t ZSTD_decompressMultiFrame(ZSTD_DCtx* dctx,
-                                        void* dst, size_t dstCapacity,
-                                  const void* src, size_t srcSize,
-                                  const void* dict, size_t dictSize,
-                                  const ZSTD_DDict* ddict)
-{
-    void* const dststart = dst;
-    int moreThan1Frame = 0;
-
-    DEBUGLOG(5, "ZSTD_decompressMultiFrame");
-    assert(dict==NULL || ddict==NULL);  /* either dict or ddict set, not both */
-
-    if (ddict) {
-        dict = ZSTD_DDict_dictContent(ddict);
-        dictSize = ZSTD_DDict_dictSize(ddict);
-    }
-
-    while (srcSize >= ZSTD_FRAMEHEADERSIZE_PREFIX) {
-
-#if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT >= 1)
-        if (ZSTD_isLegacy(src, srcSize)) {
-            size_t decodedSize;
-            size_t const frameSize = ZSTD_findFrameCompressedSizeLegacy(src, srcSize);
-            if (ZSTD_isError(frameSize)) return frameSize;
-            RETURN_ERROR_IF(dctx->staticSize, memory_allocation,
-                "legacy support is not compatible with static dctx");
-
-            decodedSize = ZSTD_decompressLegacy(dst, dstCapacity, src, frameSize, dict, dictSize);
-            if (ZSTD_isError(decodedSize)) return decodedSize;
-
-            assert(decodedSize <=- dstCapacity);
-            dst = (BYTE*)dst + decodedSize;
-            dstCapacity -= decodedSize;
-
-            src = (const BYTE*)src + frameSize;
-            srcSize -= frameSize;
-
-            continue;
-        }
-#endif
-
-        {   U32 const magicNumber = MEM_readLE32(src);
-            DEBUGLOG(4, "reading magic number %08X (expecting %08X)",
-                        (unsigned)magicNumber, ZSTD_MAGICNUMBER);
-            if ((magicNumber & ZSTD_MAGIC_SKIPPABLE_MASK) == ZSTD_MAGIC_SKIPPABLE_START) {
-                size_t const skippableSize = readSkippableFrameSize(src, srcSize);
-                FORWARD_IF_ERROR(skippableSize);
-                assert(skippableSize <= srcSize);
-
-                src = (const BYTE *)src + skippableSize;
-                srcSize -= skippableSize;
-                continue;
-        }   }
-
-        if (ddict) {
-            /* we were called from ZSTD_decompress_usingDDict */
-            FORWARD_IF_ERROR(ZSTD_decompressBegin_usingDDict(dctx, ddict));
-        } else {
-            /* this will initialize correctly with no dict if dict == NULL, so
-             * use this in all cases but ddict */
-            FORWARD_IF_ERROR(ZSTD_decompressBegin_usingDict(dctx, dict, dictSize));
-        }
-        ZSTD_checkContinuity(dctx, dst);
-
-        {   const size_t res = ZSTD_decompressFrame(dctx, dst, dstCapacity,
-                                                    &src, &srcSize);
-            RETURN_ERROR_IF(
-                (ZSTD_getErrorCode(res) == ZSTD_error_prefix_unknown)
-             && (moreThan1Frame==1),
-                srcSize_wrong,
-                "at least one frame successfully completed, but following "
-                "bytes are garbage: it's more likely to be a srcSize error, "
-                "specifying more bytes than compressed size of frame(s). This "
-                "error message replaces ERROR(prefix_unknown), which would be "
-                "confusing, as the first header is actually correct. Note that "
-                "one could be unlucky, it might be a corruption error instead, "
-                "happening right at the place where we expect zstd magic "
-                "bytes. But this is _much_ less likely than a srcSize field "
-                "error.");
-            if (ZSTD_isError(res)) return res;
-            assert(res <= dstCapacity);
-            dst = (BYTE*)dst + res;
-            dstCapacity -= res;
-        }
-        moreThan1Frame = 1;
-    }  /* while (srcSize >= ZSTD_frameHeaderSize_prefix) */
-
-    RETURN_ERROR_IF(srcSize, srcSize_wrong, "input not entirely consumed");
-
-    return (BYTE*)dst - (BYTE*)dststart;
-}
-
-size_t ZSTD_decompress_usingDict(ZSTD_DCtx* dctx,
-                                 void* dst, size_t dstCapacity,
-                           const void* src, size_t srcSize,
-                           const void* dict, size_t dictSize)
-{
-    return ZSTD_decompressMultiFrame(dctx, dst, dstCapacity, src, srcSize, dict, dictSize, NULL);
-}
-
-
-static ZSTD_DDict const* ZSTD_getDDict(ZSTD_DCtx* dctx)
-{
-    switch (dctx->dictUses) {
-    default:
-        assert(0 /* Impossible */);
-        /* fall-through */
-    case ZSTD_dont_use:
-        ZSTD_clearDict(dctx);
-        return NULL;
-    case ZSTD_use_indefinitely:
-        return dctx->ddict;
-    case ZSTD_use_once:
-        dctx->dictUses = ZSTD_dont_use;
-        return dctx->ddict;
-    }
-}
-
-size_t ZSTD_decompressDCtx(ZSTD_DCtx* dctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize)
-{
-    return ZSTD_decompress_usingDDict(dctx, dst, dstCapacity, src, srcSize, ZSTD_getDDict(dctx));
-}
-
-
-size_t ZSTD_decompress(void* dst, size_t dstCapacity, const void* src, size_t srcSize)
-{
-#if defined(ZSTD_HEAPMODE) && (ZSTD_HEAPMODE>=1)
-    size_t regenSize;
-    ZSTD_DCtx* const dctx = ZSTD_createDCtx();
-    RETURN_ERROR_IF(dctx==NULL, memory_allocation);
-    regenSize = ZSTD_decompressDCtx(dctx, dst, dstCapacity, src, srcSize);
-    ZSTD_freeDCtx(dctx);
-    return regenSize;
-#else   /* stack mode */
-    ZSTD_DCtx dctx;
-    ZSTD_initDCtx_internal(&dctx);
-    return ZSTD_decompressDCtx(&dctx, dst, dstCapacity, src, srcSize);
-#endif
-}
-
-
-/*-**************************************
-*   Advanced Streaming Decompression API
-*   Bufferless and synchronous
-****************************************/
-size_t ZSTD_nextSrcSizeToDecompress(ZSTD_DCtx* dctx) { return dctx->expected; }
-
-ZSTD_nextInputType_e ZSTD_nextInputType(ZSTD_DCtx* dctx) {
-    switch(dctx->stage)
-    {
-    default:   /* should not happen */
-        assert(0);
-    case ZSTDds_getFrameHeaderSize:
-    case ZSTDds_decodeFrameHeader:
-        return ZSTDnit_frameHeader;
-    case ZSTDds_decodeBlockHeader:
-        return ZSTDnit_blockHeader;
-    case ZSTDds_decompressBlock:
-        return ZSTDnit_block;
-    case ZSTDds_decompressLastBlock:
-        return ZSTDnit_lastBlock;
-    case ZSTDds_checkChecksum:
-        return ZSTDnit_checksum;
-    case ZSTDds_decodeSkippableHeader:
-    case ZSTDds_skipFrame:
-        return ZSTDnit_skippableFrame;
-    }
-}
-
-static int ZSTD_isSkipFrame(ZSTD_DCtx* dctx) { return dctx->stage == ZSTDds_skipFrame; }
-
-/** ZSTD_decompressContinue() :
- *  srcSize : must be the exact nb of bytes expected (see ZSTD_nextSrcSizeToDecompress())
- *  @return : nb of bytes generated into `dst` (necessarily <= `dstCapacity)
- *            or an error code, which can be tested using ZSTD_isError() */
-size_t ZSTD_decompressContinue(ZSTD_DCtx* dctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize)
-{
-    DEBUGLOG(5, "ZSTD_decompressContinue (srcSize:%u)", (unsigned)srcSize);
-    /* Sanity check */
-    RETURN_ERROR_IF(srcSize != dctx->expected, srcSize_wrong, "not allowed");
-    if (dstCapacity) ZSTD_checkContinuity(dctx, dst);
-
-    switch (dctx->stage)
-    {
-    case ZSTDds_getFrameHeaderSize :
-        assert(src != NULL);
-        if (dctx->format == ZSTD_f_zstd1) {  /* allows header */
-            assert(srcSize >= ZSTD_FRAMEIDSIZE);  /* to read skippable magic number */
-            if ((MEM_readLE32(src) & ZSTD_MAGIC_SKIPPABLE_MASK) == ZSTD_MAGIC_SKIPPABLE_START) {        /* skippable frame */
-                memcpy(dctx->headerBuffer, src, srcSize);
-                dctx->expected = ZSTD_SKIPPABLEHEADERSIZE - srcSize;  /* remaining to load to get full skippable frame header */
-                dctx->stage = ZSTDds_decodeSkippableHeader;
-                return 0;
-        }   }
-        dctx->headerSize = ZSTD_frameHeaderSize_internal(src, srcSize, dctx->format);
-        if (ZSTD_isError(dctx->headerSize)) return dctx->headerSize;
-        memcpy(dctx->headerBuffer, src, srcSize);
-        dctx->expected = dctx->headerSize - srcSize;
-        dctx->stage = ZSTDds_decodeFrameHeader;
-        return 0;
-
-    case ZSTDds_decodeFrameHeader:
-        assert(src != NULL);
-        memcpy(dctx->headerBuffer + (dctx->headerSize - srcSize), src, srcSize);
-        FORWARD_IF_ERROR(ZSTD_decodeFrameHeader(dctx, dctx->headerBuffer, dctx->headerSize));
-        dctx->expected = ZSTD_blockHeaderSize;
-        dctx->stage = ZSTDds_decodeBlockHeader;
-        return 0;
-
-    case ZSTDds_decodeBlockHeader:
-        {   blockProperties_t bp;
-            size_t const cBlockSize = ZSTD_getcBlockSize(src, ZSTD_blockHeaderSize, &bp);
-            if (ZSTD_isError(cBlockSize)) return cBlockSize;
-            RETURN_ERROR_IF(cBlockSize > dctx->fParams.blockSizeMax, corruption_detected, "Block Size Exceeds Maximum");
-            dctx->expected = cBlockSize;
-            dctx->bType = bp.blockType;
-            dctx->rleSize = bp.origSize;
-            if (cBlockSize) {
-                dctx->stage = bp.lastBlock ? ZSTDds_decompressLastBlock : ZSTDds_decompressBlock;
-                return 0;
-            }
-            /* empty block */
-            if (bp.lastBlock) {
-                if (dctx->fParams.checksumFlag) {
-                    dctx->expected = 4;
-                    dctx->stage = ZSTDds_checkChecksum;
-                } else {
-                    dctx->expected = 0; /* end of frame */
-                    dctx->stage = ZSTDds_getFrameHeaderSize;
-                }
-            } else {
-                dctx->expected = ZSTD_blockHeaderSize;  /* jump to next header */
-                dctx->stage = ZSTDds_decodeBlockHeader;
-            }
-            return 0;
-        }
-
-    case ZSTDds_decompressLastBlock:
-    case ZSTDds_decompressBlock:
-        DEBUGLOG(5, "ZSTD_decompressContinue: case ZSTDds_decompressBlock");
-        {   size_t rSize;
-            switch(dctx->bType)
-            {
-            case bt_compressed:
-                DEBUGLOG(5, "ZSTD_decompressContinue: case bt_compressed");
-                rSize = ZSTD_decompressBlock_internal(dctx, dst, dstCapacity, src, srcSize, /* frame */ 1);
-                break;
-            case bt_raw :
-                rSize = ZSTD_copyRawBlock(dst, dstCapacity, src, srcSize);
-                break;
-            case bt_rle :
-                rSize = ZSTD_setRleBlock(dst, dstCapacity, *(const BYTE*)src, dctx->rleSize);
-                break;
-            case bt_reserved :   /* should never happen */
-            default:
-                RETURN_ERROR(corruption_detected);
-            }
-            if (ZSTD_isError(rSize)) return rSize;
-            RETURN_ERROR_IF(rSize > dctx->fParams.blockSizeMax, corruption_detected, "Decompressed Block Size Exceeds Maximum");
-            DEBUGLOG(5, "ZSTD_decompressContinue: decoded size from block : %u", (unsigned)rSize);
-            dctx->decodedSize += rSize;
-            if (dctx->fParams.checksumFlag) XXH64_update(&dctx->xxhState, dst, rSize);
-
-            if (dctx->stage == ZSTDds_decompressLastBlock) {   /* end of frame */
-                DEBUGLOG(4, "ZSTD_decompressContinue: decoded size from frame : %u", (unsigned)dctx->decodedSize);
-                RETURN_ERROR_IF(
-                    dctx->fParams.frameContentSize != ZSTD_CONTENTSIZE_UNKNOWN
-                 && dctx->decodedSize != dctx->fParams.frameContentSize,
-                    corruption_detected);
-                if (dctx->fParams.checksumFlag) {  /* another round for frame checksum */
-                    dctx->expected = 4;
-                    dctx->stage = ZSTDds_checkChecksum;
-                } else {
-                    dctx->expected = 0;   /* ends here */
-                    dctx->stage = ZSTDds_getFrameHeaderSize;
-                }
-            } else {
-                dctx->stage = ZSTDds_decodeBlockHeader;
-                dctx->expected = ZSTD_blockHeaderSize;
-                dctx->previousDstEnd = (char*)dst + rSize;
-            }
-            return rSize;
-        }
-
-    case ZSTDds_checkChecksum:
-        assert(srcSize == 4);  /* guaranteed by dctx->expected */
-        {   U32 const h32 = (U32)XXH64_digest(&dctx->xxhState);
-            U32 const check32 = MEM_readLE32(src);
-            DEBUGLOG(4, "ZSTD_decompressContinue: checksum : calculated %08X :: %08X read", (unsigned)h32, (unsigned)check32);
-            RETURN_ERROR_IF(check32 != h32, checksum_wrong);
-            dctx->expected = 0;
-            dctx->stage = ZSTDds_getFrameHeaderSize;
-            return 0;
-        }
-
-    case ZSTDds_decodeSkippableHeader:
-        assert(src != NULL);
-        assert(srcSize <= ZSTD_SKIPPABLEHEADERSIZE);
-        memcpy(dctx->headerBuffer + (ZSTD_SKIPPABLEHEADERSIZE - srcSize), src, srcSize);   /* complete skippable header */
-        dctx->expected = MEM_readLE32(dctx->headerBuffer + ZSTD_FRAMEIDSIZE);   /* note : dctx->expected can grow seriously large, beyond local buffer size */
-        dctx->stage = ZSTDds_skipFrame;
-        return 0;
-
-    case ZSTDds_skipFrame:
-        dctx->expected = 0;
-        dctx->stage = ZSTDds_getFrameHeaderSize;
-        return 0;
-
-    default:
-        assert(0);   /* impossible */
-        RETURN_ERROR(GENERIC);   /* some compiler require default to do something */
-    }
-}
-
-
-static size_t ZSTD_refDictContent(ZSTD_DCtx* dctx, const void* dict, size_t dictSize)
-{
-    dctx->dictEnd = dctx->previousDstEnd;
-    dctx->virtualStart = (const char*)dict - ((const char*)(dctx->previousDstEnd) - (const char*)(dctx->prefixStart));
-    dctx->prefixStart = dict;
-    dctx->previousDstEnd = (const char*)dict + dictSize;
-    return 0;
-}
-
-/*! ZSTD_loadDEntropy() :
- *  dict : must point at beginning of a valid zstd dictionary.
- * @return : size of entropy tables read */
-size_t
-ZSTD_loadDEntropy(ZSTD_entropyDTables_t* entropy,
-                  const void* const dict, size_t const dictSize)
-{
-    const BYTE* dictPtr = (const BYTE*)dict;
-    const BYTE* const dictEnd = dictPtr + dictSize;
-
-    RETURN_ERROR_IF(dictSize <= 8, dictionary_corrupted);
-    assert(MEM_readLE32(dict) == ZSTD_MAGIC_DICTIONARY);   /* dict must be valid */
-    dictPtr += 8;   /* skip header = magic + dictID */
-
-    ZSTD_STATIC_ASSERT(offsetof(ZSTD_entropyDTables_t, OFTable) == offsetof(ZSTD_entropyDTables_t, LLTable) + sizeof(entropy->LLTable));
-    ZSTD_STATIC_ASSERT(offsetof(ZSTD_entropyDTables_t, MLTable) == offsetof(ZSTD_entropyDTables_t, OFTable) + sizeof(entropy->OFTable));
-    ZSTD_STATIC_ASSERT(sizeof(entropy->LLTable) + sizeof(entropy->OFTable) + sizeof(entropy->MLTable) >= HUF_DECOMPRESS_WORKSPACE_SIZE);
-    {   void* const workspace = &entropy->LLTable;   /* use fse tables as temporary workspace; implies fse tables are grouped together */
-        size_t const workspaceSize = sizeof(entropy->LLTable) + sizeof(entropy->OFTable) + sizeof(entropy->MLTable);
-#ifdef HUF_FORCE_DECOMPRESS_X1
-        /* in minimal huffman, we always use X1 variants */
-        size_t const hSize = HUF_readDTableX1_wksp(entropy->hufTable,
-                                                dictPtr, dictEnd - dictPtr,
-                                                workspace, workspaceSize);
-#else
-        size_t const hSize = HUF_readDTableX2_wksp(entropy->hufTable,
-                                                dictPtr, dictEnd - dictPtr,
-                                                workspace, workspaceSize);
-#endif
-        RETURN_ERROR_IF(HUF_isError(hSize), dictionary_corrupted);
-        dictPtr += hSize;
-    }
-
-    {   short offcodeNCount[MaxOff+1];
-        unsigned offcodeMaxValue = MaxOff, offcodeLog;
-        size_t const offcodeHeaderSize = FSE_readNCount(offcodeNCount, &offcodeMaxValue, &offcodeLog, dictPtr, dictEnd-dictPtr);
-        RETURN_ERROR_IF(FSE_isError(offcodeHeaderSize), dictionary_corrupted);
-        RETURN_ERROR_IF(offcodeMaxValue > MaxOff, dictionary_corrupted);
-        RETURN_ERROR_IF(offcodeLog > OffFSELog, dictionary_corrupted);
-        ZSTD_buildFSETable( entropy->OFTable,
-                            offcodeNCount, offcodeMaxValue,
-                            OF_base, OF_bits,
-                            offcodeLog);
-        dictPtr += offcodeHeaderSize;
-    }
-
-    {   short matchlengthNCount[MaxML+1];
-        unsigned matchlengthMaxValue = MaxML, matchlengthLog;
-        size_t const matchlengthHeaderSize = FSE_readNCount(matchlengthNCount, &matchlengthMaxValue, &matchlengthLog, dictPtr, dictEnd-dictPtr);
-        RETURN_ERROR_IF(FSE_isError(matchlengthHeaderSize), dictionary_corrupted);
-        RETURN_ERROR_IF(matchlengthMaxValue > MaxML, dictionary_corrupted);
-        RETURN_ERROR_IF(matchlengthLog > MLFSELog, dictionary_corrupted);
-        ZSTD_buildFSETable( entropy->MLTable,
-                            matchlengthNCount, matchlengthMaxValue,
-                            ML_base, ML_bits,
-                            matchlengthLog);
-        dictPtr += matchlengthHeaderSize;
-    }
-
-    {   short litlengthNCount[MaxLL+1];
-        unsigned litlengthMaxValue = MaxLL, litlengthLog;
-        size_t const litlengthHeaderSize = FSE_readNCount(litlengthNCount, &litlengthMaxValue, &litlengthLog, dictPtr, dictEnd-dictPtr);
-        RETURN_ERROR_IF(FSE_isError(litlengthHeaderSize), dictionary_corrupted);
-        RETURN_ERROR_IF(litlengthMaxValue > MaxLL, dictionary_corrupted);
-        RETURN_ERROR_IF(litlengthLog > LLFSELog, dictionary_corrupted);
-        ZSTD_buildFSETable( entropy->LLTable,
-                            litlengthNCount, litlengthMaxValue,
-                            LL_base, LL_bits,
-                            litlengthLog);
-        dictPtr += litlengthHeaderSize;
-    }
-
-    RETURN_ERROR_IF(dictPtr+12 > dictEnd, dictionary_corrupted);
-    {   int i;
-        size_t const dictContentSize = (size_t)(dictEnd - (dictPtr+12));
-        for (i=0; i<3; i++) {
-            U32 const rep = MEM_readLE32(dictPtr); dictPtr += 4;
-            RETURN_ERROR_IF(rep==0 || rep >= dictContentSize,
-                            dictionary_corrupted);
-            entropy->rep[i] = rep;
-    }   }
-
-    return dictPtr - (const BYTE*)dict;
-}
-
-static size_t ZSTD_decompress_insertDictionary(ZSTD_DCtx* dctx, const void* dict, size_t dictSize)
-{
-    if (dictSize < 8) return ZSTD_refDictContent(dctx, dict, dictSize);
-    {   U32 const magic = MEM_readLE32(dict);
-        if (magic != ZSTD_MAGIC_DICTIONARY) {
-            return ZSTD_refDictContent(dctx, dict, dictSize);   /* pure content mode */
-    }   }
-    dctx->dictID = MEM_readLE32((const char*)dict + ZSTD_FRAMEIDSIZE);
-
-    /* load entropy tables */
-    {   size_t const eSize = ZSTD_loadDEntropy(&dctx->entropy, dict, dictSize);
-        RETURN_ERROR_IF(ZSTD_isError(eSize), dictionary_corrupted);
-        dict = (const char*)dict + eSize;
-        dictSize -= eSize;
-    }
-    dctx->litEntropy = dctx->fseEntropy = 1;
-
-    /* reference dictionary content */
-    return ZSTD_refDictContent(dctx, dict, dictSize);
-}
-
-size_t ZSTD_decompressBegin(ZSTD_DCtx* dctx)
-{
-    assert(dctx != NULL);
-    dctx->expected = ZSTD_startingInputLength(dctx->format);  /* dctx->format must be properly set */
-    dctx->stage = ZSTDds_getFrameHeaderSize;
-    dctx->decodedSize = 0;
-    dctx->previousDstEnd = NULL;
-    dctx->prefixStart = NULL;
-    dctx->virtualStart = NULL;
-    dctx->dictEnd = NULL;
-    dctx->entropy.hufTable[0] = (HUF_DTable)((HufLog)*0x1000001);  /* cover both little and big endian */
-    dctx->litEntropy = dctx->fseEntropy = 0;
-    dctx->dictID = 0;
-    ZSTD_STATIC_ASSERT(sizeof(dctx->entropy.rep) == sizeof(repStartValue));
-    memcpy(dctx->entropy.rep, repStartValue, sizeof(repStartValue));  /* initial repcodes */
-    dctx->LLTptr = dctx->entropy.LLTable;
-    dctx->MLTptr = dctx->entropy.MLTable;
-    dctx->OFTptr = dctx->entropy.OFTable;
-    dctx->HUFptr = dctx->entropy.hufTable;
-    return 0;
-}
-
-size_t ZSTD_decompressBegin_usingDict(ZSTD_DCtx* dctx, const void* dict, size_t dictSize)
-{
-    FORWARD_IF_ERROR( ZSTD_decompressBegin(dctx) );
-    if (dict && dictSize)
-        RETURN_ERROR_IF(
-            ZSTD_isError(ZSTD_decompress_insertDictionary(dctx, dict, dictSize)),
-            dictionary_corrupted);
-    return 0;
-}
-
-
-/* ======   ZSTD_DDict   ====== */
-
-size_t ZSTD_decompressBegin_usingDDict(ZSTD_DCtx* dctx, const ZSTD_DDict* ddict)
-{
-    DEBUGLOG(4, "ZSTD_decompressBegin_usingDDict");
-    assert(dctx != NULL);
-    if (ddict) {
-        const char* const dictStart = (const char*)ZSTD_DDict_dictContent(ddict);
-        size_t const dictSize = ZSTD_DDict_dictSize(ddict);
-        const void* const dictEnd = dictStart + dictSize;
-        dctx->ddictIsCold = (dctx->dictEnd != dictEnd);
-        DEBUGLOG(4, "DDict is %s",
-                    dctx->ddictIsCold ? "~cold~" : "hot!");
-    }
-    FORWARD_IF_ERROR( ZSTD_decompressBegin(dctx) );
-    if (ddict) {   /* NULL ddict is equivalent to no dictionary */
-        ZSTD_copyDDictParameters(dctx, ddict);
-    }
-    return 0;
-}
-
-/*! ZSTD_getDictID_fromDict() :
- *  Provides the dictID stored within dictionary.
- *  if @return == 0, the dictionary is not conformant with Zstandard specification.
- *  It can still be loaded, but as a content-only dictionary. */
-unsigned ZSTD_getDictID_fromDict(const void* dict, size_t dictSize)
-{
-    if (dictSize < 8) return 0;
-    if (MEM_readLE32(dict) != ZSTD_MAGIC_DICTIONARY) return 0;
-    return MEM_readLE32((const char*)dict + ZSTD_FRAMEIDSIZE);
-}
-
-/*! ZSTD_getDictID_fromFrame() :
- *  Provides the dictID required to decompress frame stored within `src`.
- *  If @return == 0, the dictID could not be decoded.
- *  This could for one of the following reasons :
- *  - The frame does not require a dictionary (most common case).
- *  - The frame was built with dictID intentionally removed.
- *    Needed dictionary is a hidden information.
- *    Note : this use case also happens when using a non-conformant dictionary.
- *  - `srcSize` is too small, and as a result, frame header could not be decoded.
- *    Note : possible if `srcSize < ZSTD_FRAMEHEADERSIZE_MAX`.
- *  - This is not a Zstandard frame.
- *  When identifying the exact failure cause, it's possible to use
- *  ZSTD_getFrameHeader(), which will provide a more precise error code. */
-unsigned ZSTD_getDictID_fromFrame(const void* src, size_t srcSize)
-{
-    ZSTD_frameHeader zfp = { 0, 0, 0, ZSTD_frame, 0, 0, 0 };
-    size_t const hError = ZSTD_getFrameHeader(&zfp, src, srcSize);
-    if (ZSTD_isError(hError)) return 0;
-    return zfp.dictID;
-}
-
-
-/*! ZSTD_decompress_usingDDict() :
-*   Decompression using a pre-digested Dictionary
-*   Use dictionary without significant overhead. */
-size_t ZSTD_decompress_usingDDict(ZSTD_DCtx* dctx,
-                                  void* dst, size_t dstCapacity,
-                            const void* src, size_t srcSize,
-                            const ZSTD_DDict* ddict)
-{
-    /* pass content and size in case legacy frames are encountered */
-    return ZSTD_decompressMultiFrame(dctx, dst, dstCapacity, src, srcSize,
-                                     NULL, 0,
-                                     ddict);
-}
-
-
-/*=====================================
-*   Streaming decompression
-*====================================*/
-
-ZSTD_DStream* ZSTD_createDStream(void)
-{
-    DEBUGLOG(3, "ZSTD_createDStream");
-    return ZSTD_createDStream_advanced(ZSTD_defaultCMem);
-}
-
-ZSTD_DStream* ZSTD_initStaticDStream(void *workspace, size_t workspaceSize)
-{
-    return ZSTD_initStaticDCtx(workspace, workspaceSize);
-}
-
-ZSTD_DStream* ZSTD_createDStream_advanced(ZSTD_customMem customMem)
-{
-    return ZSTD_createDCtx_advanced(customMem);
-}
-
-size_t ZSTD_freeDStream(ZSTD_DStream* zds)
-{
-    return ZSTD_freeDCtx(zds);
-}
-
-
-/* ***  Initialization  *** */
-
-size_t ZSTD_DStreamInSize(void)  { return ZSTD_BLOCKSIZE_MAX + ZSTD_blockHeaderSize; }
-size_t ZSTD_DStreamOutSize(void) { return ZSTD_BLOCKSIZE_MAX; }
-
-size_t ZSTD_DCtx_loadDictionary_advanced(ZSTD_DCtx* dctx,
-                                   const void* dict, size_t dictSize,
-                                         ZSTD_dictLoadMethod_e dictLoadMethod,
-                                         ZSTD_dictContentType_e dictContentType)
-{
-    RETURN_ERROR_IF(dctx->streamStage != zdss_init, stage_wrong);
-    ZSTD_clearDict(dctx);
-    if (dict && dictSize >= 8) {
-        dctx->ddictLocal = ZSTD_createDDict_advanced(dict, dictSize, dictLoadMethod, dictContentType, dctx->customMem);
-        RETURN_ERROR_IF(dctx->ddictLocal == NULL, memory_allocation);
-        dctx->ddict = dctx->ddictLocal;
-        dctx->dictUses = ZSTD_use_indefinitely;
-    }
-    return 0;
-}
-
-size_t ZSTD_DCtx_loadDictionary_byReference(ZSTD_DCtx* dctx, const void* dict, size_t dictSize)
-{
-    return ZSTD_DCtx_loadDictionary_advanced(dctx, dict, dictSize, ZSTD_dlm_byRef, ZSTD_dct_auto);
-}
-
-size_t ZSTD_DCtx_loadDictionary(ZSTD_DCtx* dctx, const void* dict, size_t dictSize)
-{
-    return ZSTD_DCtx_loadDictionary_advanced(dctx, dict, dictSize, ZSTD_dlm_byCopy, ZSTD_dct_auto);
-}
-
-size_t ZSTD_DCtx_refPrefix_advanced(ZSTD_DCtx* dctx, const void* prefix, size_t prefixSize, ZSTD_dictContentType_e dictContentType)
-{
-    FORWARD_IF_ERROR(ZSTD_DCtx_loadDictionary_advanced(dctx, prefix, prefixSize, ZSTD_dlm_byRef, dictContentType));
-    dctx->dictUses = ZSTD_use_once;
-    return 0;
-}
-
-size_t ZSTD_DCtx_refPrefix(ZSTD_DCtx* dctx, const void* prefix, size_t prefixSize)
-{
-    return ZSTD_DCtx_refPrefix_advanced(dctx, prefix, prefixSize, ZSTD_dct_rawContent);
-}
-
-
-/* ZSTD_initDStream_usingDict() :
- * return : expected size, aka ZSTD_FRAMEHEADERSIZE_PREFIX.
- * this function cannot fail */
-size_t ZSTD_initDStream_usingDict(ZSTD_DStream* zds, const void* dict, size_t dictSize)
-{
-    DEBUGLOG(4, "ZSTD_initDStream_usingDict");
-    FORWARD_IF_ERROR( ZSTD_DCtx_reset(zds, ZSTD_reset_session_only) );
-    FORWARD_IF_ERROR( ZSTD_DCtx_loadDictionary(zds, dict, dictSize) );
-    return ZSTD_FRAMEHEADERSIZE_PREFIX;
-}
-
-/* note : this variant can't fail */
-size_t ZSTD_initDStream(ZSTD_DStream* zds)
-{
-    DEBUGLOG(4, "ZSTD_initDStream");
-    return ZSTD_initDStream_usingDDict(zds, NULL);
-}
-
-/* ZSTD_initDStream_usingDDict() :
- * ddict will just be referenced, and must outlive decompression session
- * this function cannot fail */
-size_t ZSTD_initDStream_usingDDict(ZSTD_DStream* dctx, const ZSTD_DDict* ddict)
-{
-    FORWARD_IF_ERROR( ZSTD_DCtx_reset(dctx, ZSTD_reset_session_only) );
-    FORWARD_IF_ERROR( ZSTD_DCtx_refDDict(dctx, ddict) );
-    return ZSTD_FRAMEHEADERSIZE_PREFIX;
-}
-
-/* ZSTD_resetDStream() :
- * return : expected size, aka ZSTD_FRAMEHEADERSIZE_PREFIX.
- * this function cannot fail */
-size_t ZSTD_resetDStream(ZSTD_DStream* dctx)
-{
-    FORWARD_IF_ERROR(ZSTD_DCtx_reset(dctx, ZSTD_reset_session_only));
-    return ZSTD_FRAMEHEADERSIZE_PREFIX;
-}
-
-
-size_t ZSTD_DCtx_refDDict(ZSTD_DCtx* dctx, const ZSTD_DDict* ddict)
-{
-    RETURN_ERROR_IF(dctx->streamStage != zdss_init, stage_wrong);
-    ZSTD_clearDict(dctx);
-    if (ddict) {
-        dctx->ddict = ddict;
-        dctx->dictUses = ZSTD_use_indefinitely;
-    }
-    return 0;
-}
-
-/* ZSTD_DCtx_setMaxWindowSize() :
- * note : no direct equivalence in ZSTD_DCtx_setParameter,
- * since this version sets windowSize, and the other sets windowLog */
-size_t ZSTD_DCtx_setMaxWindowSize(ZSTD_DCtx* dctx, size_t maxWindowSize)
-{
-    ZSTD_bounds const bounds = ZSTD_dParam_getBounds(ZSTD_d_windowLogMax);
-    size_t const min = (size_t)1 << bounds.lowerBound;
-    size_t const max = (size_t)1 << bounds.upperBound;
-    RETURN_ERROR_IF(dctx->streamStage != zdss_init, stage_wrong);
-    RETURN_ERROR_IF(maxWindowSize < min, parameter_outOfBound);
-    RETURN_ERROR_IF(maxWindowSize > max, parameter_outOfBound);
-    dctx->maxWindowSize = maxWindowSize;
-    return 0;
-}
-
-size_t ZSTD_DCtx_setFormat(ZSTD_DCtx* dctx, ZSTD_format_e format)
-{
-    return ZSTD_DCtx_setParameter(dctx, ZSTD_d_format, format);
-}
-
-ZSTD_bounds ZSTD_dParam_getBounds(ZSTD_dParameter dParam)
-{
-    ZSTD_bounds bounds = { 0, 0, 0 };
-    switch(dParam) {
-        case ZSTD_d_windowLogMax:
-            bounds.lowerBound = ZSTD_WINDOWLOG_ABSOLUTEMIN;
-            bounds.upperBound = ZSTD_WINDOWLOG_MAX;
-            return bounds;
-        case ZSTD_d_format:
-            bounds.lowerBound = (int)ZSTD_f_zstd1;
-            bounds.upperBound = (int)ZSTD_f_zstd1_magicless;
-            ZSTD_STATIC_ASSERT(ZSTD_f_zstd1 < ZSTD_f_zstd1_magicless);
-            return bounds;
-        default:;
-    }
-    bounds.error = ERROR(parameter_unsupported);
-    return bounds;
-}
-
-/* ZSTD_dParam_withinBounds:
- * @return 1 if value is within dParam bounds,
- * 0 otherwise */
-static int ZSTD_dParam_withinBounds(ZSTD_dParameter dParam, int value)
-{
-    ZSTD_bounds const bounds = ZSTD_dParam_getBounds(dParam);
-    if (ZSTD_isError(bounds.error)) return 0;
-    if (value < bounds.lowerBound) return 0;
-    if (value > bounds.upperBound) return 0;
-    return 1;
-}
-
-#define CHECK_DBOUNDS(p,v) {                \
-    RETURN_ERROR_IF(!ZSTD_dParam_withinBounds(p, v), parameter_outOfBound); \
-}
-
-size_t ZSTD_DCtx_setParameter(ZSTD_DCtx* dctx, ZSTD_dParameter dParam, int value)
-{
-    RETURN_ERROR_IF(dctx->streamStage != zdss_init, stage_wrong);
-    switch(dParam) {
-        case ZSTD_d_windowLogMax:
-            if (value == 0) value = ZSTD_WINDOWLOG_LIMIT_DEFAULT;
-            CHECK_DBOUNDS(ZSTD_d_windowLogMax, value);
-            dctx->maxWindowSize = ((size_t)1) << value;
-            return 0;
-        case ZSTD_d_format:
-            CHECK_DBOUNDS(ZSTD_d_format, value);
-            dctx->format = (ZSTD_format_e)value;
-            return 0;
-        default:;
-    }
-    RETURN_ERROR(parameter_unsupported);
-}
-
-size_t ZSTD_DCtx_reset(ZSTD_DCtx* dctx, ZSTD_ResetDirective reset)
-{
-    if ( (reset == ZSTD_reset_session_only)
-      || (reset == ZSTD_reset_session_and_parameters) ) {
-        dctx->streamStage = zdss_init;
-        dctx->noForwardProgress = 0;
-    }
-    if ( (reset == ZSTD_reset_parameters)
-      || (reset == ZSTD_reset_session_and_parameters) ) {
-        RETURN_ERROR_IF(dctx->streamStage != zdss_init, stage_wrong);
-        ZSTD_clearDict(dctx);
-        dctx->format = ZSTD_f_zstd1;
-        dctx->maxWindowSize = ZSTD_MAXWINDOWSIZE_DEFAULT;
-    }
-    return 0;
-}
-
-
-size_t ZSTD_sizeof_DStream(const ZSTD_DStream* dctx)
-{
-    return ZSTD_sizeof_DCtx(dctx);
-}
-
-size_t ZSTD_decodingBufferSize_min(unsigned long long windowSize, unsigned long long frameContentSize)
-{
-    size_t const blockSize = (size_t) MIN(windowSize, ZSTD_BLOCKSIZE_MAX);
-    unsigned long long const neededRBSize = windowSize + blockSize + (WILDCOPY_OVERLENGTH * 2);
-    unsigned long long const neededSize = MIN(frameContentSize, neededRBSize);
-    size_t const minRBSize = (size_t) neededSize;
-    RETURN_ERROR_IF((unsigned long long)minRBSize != neededSize,
-                    frameParameter_windowTooLarge);
-    return minRBSize;
-}
-
-size_t ZSTD_estimateDStreamSize(size_t windowSize)
-{
-    size_t const blockSize = MIN(windowSize, ZSTD_BLOCKSIZE_MAX);
-    size_t const inBuffSize = blockSize;  /* no block can be larger */
-    size_t const outBuffSize = ZSTD_decodingBufferSize_min(windowSize, ZSTD_CONTENTSIZE_UNKNOWN);
-    return ZSTD_estimateDCtxSize() + inBuffSize + outBuffSize;
-}
-
-size_t ZSTD_estimateDStreamSize_fromFrame(const void* src, size_t srcSize)
-{
-    U32 const windowSizeMax = 1U << ZSTD_WINDOWLOG_MAX;   /* note : should be user-selectable, but requires an additional parameter (or a dctx) */
-    ZSTD_frameHeader zfh;
-    size_t const err = ZSTD_getFrameHeader(&zfh, src, srcSize);
-    if (ZSTD_isError(err)) return err;
-    RETURN_ERROR_IF(err>0, srcSize_wrong);
-    RETURN_ERROR_IF(zfh.windowSize > windowSizeMax,
-                    frameParameter_windowTooLarge);
-    return ZSTD_estimateDStreamSize((size_t)zfh.windowSize);
-}
-
-
-/* *****   Decompression   ***** */
-
-MEM_STATIC size_t ZSTD_limitCopy(void* dst, size_t dstCapacity, const void* src, size_t srcSize)
-{
-    size_t const length = MIN(dstCapacity, srcSize);
-    memcpy(dst, src, length);
-    return length;
-}
-
-
-size_t ZSTD_decompressStream(ZSTD_DStream* zds, ZSTD_outBuffer* output, ZSTD_inBuffer* input)
-{
-    const char* const istart = (const char*)(input->src) + input->pos;
-    const char* const iend = (const char*)(input->src) + input->size;
-    const char* ip = istart;
-    char* const ostart = (char*)(output->dst) + output->pos;
-    char* const oend = (char*)(output->dst) + output->size;
-    char* op = ostart;
-    U32 someMoreWork = 1;
-
-    DEBUGLOG(5, "ZSTD_decompressStream");
-    RETURN_ERROR_IF(
-        input->pos > input->size,
-        srcSize_wrong,
-        "forbidden. in: pos: %u   vs size: %u",
-        (U32)input->pos, (U32)input->size);
-    RETURN_ERROR_IF(
-        output->pos > output->size,
-        dstSize_tooSmall,
-        "forbidden. out: pos: %u   vs size: %u",
-        (U32)output->pos, (U32)output->size);
-    DEBUGLOG(5, "input size : %u", (U32)(input->size - input->pos));
-
-    while (someMoreWork) {
-        switch(zds->streamStage)
-        {
-        case zdss_init :
-            DEBUGLOG(5, "stage zdss_init => transparent reset ");
-            zds->streamStage = zdss_loadHeader;
-            zds->lhSize = zds->inPos = zds->outStart = zds->outEnd = 0;
-            zds->legacyVersion = 0;
-            zds->hostageByte = 0;
-            /* fall-through */
-
-        case zdss_loadHeader :
-            DEBUGLOG(5, "stage zdss_loadHeader (srcSize : %u)", (U32)(iend - ip));
-#if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT>=1)
-            if (zds->legacyVersion) {
-                RETURN_ERROR_IF(zds->staticSize, memory_allocation,
-                    "legacy support is incompatible with static dctx");
-                {   size_t const hint = ZSTD_decompressLegacyStream(zds->legacyContext, zds->legacyVersion, output, input);
-                    if (hint==0) zds->streamStage = zdss_init;
-                    return hint;
-            }   }
-#endif
-            {   size_t const hSize = ZSTD_getFrameHeader_advanced(&zds->fParams, zds->headerBuffer, zds->lhSize, zds->format);
-                DEBUGLOG(5, "header size : %u", (U32)hSize);
-                if (ZSTD_isError(hSize)) {
-#if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT>=1)
-                    U32 const legacyVersion = ZSTD_isLegacy(istart, iend-istart);
-                    if (legacyVersion) {
-                        ZSTD_DDict const* const ddict = ZSTD_getDDict(zds);
-                        const void* const dict = ddict ? ZSTD_DDict_dictContent(ddict) : NULL;
-                        size_t const dictSize = ddict ? ZSTD_DDict_dictSize(ddict) : 0;
-                        DEBUGLOG(5, "ZSTD_decompressStream: detected legacy version v0.%u", legacyVersion);
-                        RETURN_ERROR_IF(zds->staticSize, memory_allocation,
-                            "legacy support is incompatible with static dctx");
-                        FORWARD_IF_ERROR(ZSTD_initLegacyStream(&zds->legacyContext,
-                                    zds->previousLegacyVersion, legacyVersion,
-                                    dict, dictSize));
-                        zds->legacyVersion = zds->previousLegacyVersion = legacyVersion;
-                        {   size_t const hint = ZSTD_decompressLegacyStream(zds->legacyContext, legacyVersion, output, input);
-                            if (hint==0) zds->streamStage = zdss_init;   /* or stay in stage zdss_loadHeader */
-                            return hint;
-                    }   }
-#endif
-                    return hSize;   /* error */
-                }
-                if (hSize != 0) {   /* need more input */
-                    size_t const toLoad = hSize - zds->lhSize;   /* if hSize!=0, hSize > zds->lhSize */
-                    size_t const remainingInput = (size_t)(iend-ip);
-                    assert(iend >= ip);
-                    if (toLoad > remainingInput) {   /* not enough input to load full header */
-                        if (remainingInput > 0) {
-                            memcpy(zds->headerBuffer + zds->lhSize, ip, remainingInput);
-                            zds->lhSize += remainingInput;
-                        }
-                        input->pos = input->size;
-                        return (MAX(ZSTD_FRAMEHEADERSIZE_MIN, hSize) - zds->lhSize) + ZSTD_blockHeaderSize;   /* remaining header bytes + next block header */
-                    }
-                    assert(ip != NULL);
-                    memcpy(zds->headerBuffer + zds->lhSize, ip, toLoad); zds->lhSize = hSize; ip += toLoad;
-                    break;
-            }   }
-
-            /* check for single-pass mode opportunity */
-            if (zds->fParams.frameContentSize && zds->fParams.windowSize /* skippable frame if == 0 */
-                && (U64)(size_t)(oend-op) >= zds->fParams.frameContentSize) {
-                size_t const cSize = ZSTD_findFrameCompressedSize(istart, iend-istart);
-                if (cSize <= (size_t)(iend-istart)) {
-                    /* shortcut : using single-pass mode */
-                    size_t const decompressedSize = ZSTD_decompress_usingDDict(zds, op, oend-op, istart, cSize, ZSTD_getDDict(zds));
-                    if (ZSTD_isError(decompressedSize)) return decompressedSize;
-                    DEBUGLOG(4, "shortcut to single-pass ZSTD_decompress_usingDDict()")
-                    ip = istart + cSize;
-                    op += decompressedSize;
-                    zds->expected = 0;
-                    zds->streamStage = zdss_init;
-                    someMoreWork = 0;
-                    break;
-            }   }
-
-            /* Consume header (see ZSTDds_decodeFrameHeader) */
-            DEBUGLOG(4, "Consume header");
-            FORWARD_IF_ERROR(ZSTD_decompressBegin_usingDDict(zds, ZSTD_getDDict(zds)));
-
-            if ((MEM_readLE32(zds->headerBuffer) & ZSTD_MAGIC_SKIPPABLE_MASK) == ZSTD_MAGIC_SKIPPABLE_START) {  /* skippable frame */
-                zds->expected = MEM_readLE32(zds->headerBuffer + ZSTD_FRAMEIDSIZE);
-                zds->stage = ZSTDds_skipFrame;
-            } else {
-                FORWARD_IF_ERROR(ZSTD_decodeFrameHeader(zds, zds->headerBuffer, zds->lhSize));
-                zds->expected = ZSTD_blockHeaderSize;
-                zds->stage = ZSTDds_decodeBlockHeader;
-            }
-
-            /* control buffer memory usage */
-            DEBUGLOG(4, "Control max memory usage (%u KB <= max %u KB)",
-                        (U32)(zds->fParams.windowSize >>10),
-                        (U32)(zds->maxWindowSize >> 10) );
-            zds->fParams.windowSize = MAX(zds->fParams.windowSize, 1U << ZSTD_WINDOWLOG_ABSOLUTEMIN);
-            RETURN_ERROR_IF(zds->fParams.windowSize > zds->maxWindowSize,
-                            frameParameter_windowTooLarge);
-
-            /* Adapt buffer sizes to frame header instructions */
-            {   size_t const neededInBuffSize = MAX(zds->fParams.blockSizeMax, 4 /* frame checksum */);
-                size_t const neededOutBuffSize = ZSTD_decodingBufferSize_min(zds->fParams.windowSize, zds->fParams.frameContentSize);
-                if ((zds->inBuffSize < neededInBuffSize) || (zds->outBuffSize < neededOutBuffSize)) {
-                    size_t const bufferSize = neededInBuffSize + neededOutBuffSize;
-                    DEBUGLOG(4, "inBuff  : from %u to %u",
-                                (U32)zds->inBuffSize, (U32)neededInBuffSize);
-                    DEBUGLOG(4, "outBuff : from %u to %u",
-                                (U32)zds->outBuffSize, (U32)neededOutBuffSize);
-                    if (zds->staticSize) {  /* static DCtx */
-                        DEBUGLOG(4, "staticSize : %u", (U32)zds->staticSize);
-                        assert(zds->staticSize >= sizeof(ZSTD_DCtx));  /* controlled at init */
-                        RETURN_ERROR_IF(
-                            bufferSize > zds->staticSize - sizeof(ZSTD_DCtx),
-                            memory_allocation);
-                    } else {
-                        ZSTD_free(zds->inBuff, zds->customMem);
-                        zds->inBuffSize = 0;
-                        zds->outBuffSize = 0;
-                        zds->inBuff = (char*)ZSTD_malloc(bufferSize, zds->customMem);
-                        RETURN_ERROR_IF(zds->inBuff == NULL, memory_allocation);
-                    }
-                    zds->inBuffSize = neededInBuffSize;
-                    zds->outBuff = zds->inBuff + zds->inBuffSize;
-                    zds->outBuffSize = neededOutBuffSize;
-            }   }
-            zds->streamStage = zdss_read;
-            /* fall-through */
-
-        case zdss_read:
-            DEBUGLOG(5, "stage zdss_read");
-            {   size_t const neededInSize = ZSTD_nextSrcSizeToDecompress(zds);
-                DEBUGLOG(5, "neededInSize = %u", (U32)neededInSize);
-                if (neededInSize==0) {  /* end of frame */
-                    zds->streamStage = zdss_init;
-                    someMoreWork = 0;
-                    break;
-                }
-                if ((size_t)(iend-ip) >= neededInSize) {  /* decode directly from src */
-                    int const isSkipFrame = ZSTD_isSkipFrame(zds);
-                    size_t const decodedSize = ZSTD_decompressContinue(zds,
-                        zds->outBuff + zds->outStart, (isSkipFrame ? 0 : zds->outBuffSize - zds->outStart),
-                        ip, neededInSize);
-                    if (ZSTD_isError(decodedSize)) return decodedSize;
-                    ip += neededInSize;
-                    if (!decodedSize && !isSkipFrame) break;   /* this was just a header */
-                    zds->outEnd = zds->outStart + decodedSize;
-                    zds->streamStage = zdss_flush;
-                    break;
-            }   }
-            if (ip==iend) { someMoreWork = 0; break; }   /* no more input */
-            zds->streamStage = zdss_load;
-            /* fall-through */
-
-        case zdss_load:
-            {   size_t const neededInSize = ZSTD_nextSrcSizeToDecompress(zds);
-                size_t const toLoad = neededInSize - zds->inPos;
-                int const isSkipFrame = ZSTD_isSkipFrame(zds);
-                size_t loadedSize;
-                if (isSkipFrame) {
-                    loadedSize = MIN(toLoad, (size_t)(iend-ip));
-                } else {
-                    RETURN_ERROR_IF(toLoad > zds->inBuffSize - zds->inPos,
-                                    corruption_detected,
-                                    "should never happen");
-                    loadedSize = ZSTD_limitCopy(zds->inBuff + zds->inPos, toLoad, ip, iend-ip);
-                }
-                ip += loadedSize;
-                zds->inPos += loadedSize;
-                if (loadedSize < toLoad) { someMoreWork = 0; break; }   /* not enough input, wait for more */
-
-                /* decode loaded input */
-                {   size_t const decodedSize = ZSTD_decompressContinue(zds,
-                        zds->outBuff + zds->outStart, zds->outBuffSize - zds->outStart,
-                        zds->inBuff, neededInSize);
-                    if (ZSTD_isError(decodedSize)) return decodedSize;
-                    zds->inPos = 0;   /* input is consumed */
-                    if (!decodedSize && !isSkipFrame) { zds->streamStage = zdss_read; break; }   /* this was just a header */
-                    zds->outEnd = zds->outStart +  decodedSize;
-            }   }
-            zds->streamStage = zdss_flush;
-            /* fall-through */
-
-        case zdss_flush:
-            {   size_t const toFlushSize = zds->outEnd - zds->outStart;
-                size_t const flushedSize = ZSTD_limitCopy(op, oend-op, zds->outBuff + zds->outStart, toFlushSize);
-                op += flushedSize;
-                zds->outStart += flushedSize;
-                if (flushedSize == toFlushSize) {  /* flush completed */
-                    zds->streamStage = zdss_read;
-                    if ( (zds->outBuffSize < zds->fParams.frameContentSize)
-                      && (zds->outStart + zds->fParams.blockSizeMax > zds->outBuffSize) ) {
-                        DEBUGLOG(5, "restart filling outBuff from beginning (left:%i, needed:%u)",
-                                (int)(zds->outBuffSize - zds->outStart),
-                                (U32)zds->fParams.blockSizeMax);
-                        zds->outStart = zds->outEnd = 0;
-                    }
-                    break;
-            }   }
-            /* cannot complete flush */
-            someMoreWork = 0;
-            break;
-
-        default:
-            assert(0);    /* impossible */
-            RETURN_ERROR(GENERIC);   /* some compiler require default to do something */
-    }   }
-
-    /* result */
-    input->pos = (size_t)(ip - (const char*)(input->src));
-    output->pos = (size_t)(op - (char*)(output->dst));
-    if ((ip==istart) && (op==ostart)) {  /* no forward progress */
-        zds->noForwardProgress ++;
-        if (zds->noForwardProgress >= ZSTD_NO_FORWARD_PROGRESS_MAX) {
-            RETURN_ERROR_IF(op==oend, dstSize_tooSmall);
-            RETURN_ERROR_IF(ip==iend, srcSize_wrong);
-            assert(0);
-        }
-    } else {
-        zds->noForwardProgress = 0;
-    }
-    {   size_t nextSrcSizeHint = ZSTD_nextSrcSizeToDecompress(zds);
-        if (!nextSrcSizeHint) {   /* frame fully decoded */
-            if (zds->outEnd == zds->outStart) {  /* output fully flushed */
-                if (zds->hostageByte) {
-                    if (input->pos >= input->size) {
-                        /* can't release hostage (not present) */
-                        zds->streamStage = zdss_read;
-                        return 1;
-                    }
-                    input->pos++;  /* release hostage */
-                }   /* zds->hostageByte */
-                return 0;
-            }  /* zds->outEnd == zds->outStart */
-            if (!zds->hostageByte) { /* output not fully flushed; keep last byte as hostage; will be released when all output is flushed */
-                input->pos--;   /* note : pos > 0, otherwise, impossible to finish reading last block */
-                zds->hostageByte=1;
-            }
-            return 1;
-        }  /* nextSrcSizeHint==0 */
-        nextSrcSizeHint += ZSTD_blockHeaderSize * (ZSTD_nextInputType(zds) == ZSTDnit_block);   /* preload header of next block */
-        assert(zds->inPos <= nextSrcSizeHint);
-        nextSrcSizeHint -= zds->inPos;   /* part already loaded*/
-        return nextSrcSizeHint;
-    }
-}
-
-size_t ZSTD_decompressStream_simpleArgs (
-                            ZSTD_DCtx* dctx,
-                            void* dst, size_t dstCapacity, size_t* dstPos,
-                      const void* src, size_t srcSize, size_t* srcPos)
-{
-    ZSTD_outBuffer output = { dst, dstCapacity, *dstPos };
-    ZSTD_inBuffer  input  = { src, srcSize, *srcPos };
-    /* ZSTD_compress_generic() will check validity of dstPos and srcPos */
-    size_t const cErr = ZSTD_decompressStream(dctx, &output, &input);
-    *dstPos = output.pos;
-    *srcPos = input.pos;
-    return cErr;
-}
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/decompress/zstd_decompress_internal.h mysql-8.0-8.0.27/extra/zstd/lib/decompress/zstd_decompress_internal.h
--- mysql-8.0-8.0.26/extra/zstd/lib/decompress/zstd_decompress_internal.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/decompress/zstd_decompress_internal.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,175 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
-
-/* zstd_decompress_internal:
- * objects and definitions shared within lib/decompress modules */
-
- #ifndef ZSTD_DECOMPRESS_INTERNAL_H
- #define ZSTD_DECOMPRESS_INTERNAL_H
-
-
-/*-*******************************************************
- *  Dependencies
- *********************************************************/
-#include "mem.h"             /* BYTE, U16, U32 */
-#include "zstd_internal.h"   /* ZSTD_seqSymbol */
-
-
-
-/*-*******************************************************
- *  Constants
- *********************************************************/
-static const U32 LL_base[MaxLL+1] = {
-                 0,    1,    2,     3,     4,     5,     6,      7,
-                 8,    9,   10,    11,    12,    13,    14,     15,
-                16,   18,   20,    22,    24,    28,    32,     40,
-                48,   64, 0x80, 0x100, 0x200, 0x400, 0x800, 0x1000,
-                0x2000, 0x4000, 0x8000, 0x10000 };
-
-static const U32 OF_base[MaxOff+1] = {
-                 0,        1,       1,       5,     0xD,     0x1D,     0x3D,     0x7D,
-                 0xFD,   0x1FD,   0x3FD,   0x7FD,   0xFFD,   0x1FFD,   0x3FFD,   0x7FFD,
-                 0xFFFD, 0x1FFFD, 0x3FFFD, 0x7FFFD, 0xFFFFD, 0x1FFFFD, 0x3FFFFD, 0x7FFFFD,
-                 0xFFFFFD, 0x1FFFFFD, 0x3FFFFFD, 0x7FFFFFD, 0xFFFFFFD, 0x1FFFFFFD, 0x3FFFFFFD, 0x7FFFFFFD };
-
-static const U32 OF_bits[MaxOff+1] = {
-                     0,  1,  2,  3,  4,  5,  6,  7,
-                     8,  9, 10, 11, 12, 13, 14, 15,
-                    16, 17, 18, 19, 20, 21, 22, 23,
-                    24, 25, 26, 27, 28, 29, 30, 31 };
-
-static const U32 ML_base[MaxML+1] = {
-                     3,  4,  5,    6,     7,     8,     9,    10,
-                    11, 12, 13,   14,    15,    16,    17,    18,
-                    19, 20, 21,   22,    23,    24,    25,    26,
-                    27, 28, 29,   30,    31,    32,    33,    34,
-                    35, 37, 39,   41,    43,    47,    51,    59,
-                    67, 83, 99, 0x83, 0x103, 0x203, 0x403, 0x803,
-                    0x1003, 0x2003, 0x4003, 0x8003, 0x10003 };
-
-
-/*-*******************************************************
- *  Decompression types
- *********************************************************/
- typedef struct {
-     U32 fastMode;
-     U32 tableLog;
- } ZSTD_seqSymbol_header;
-
- typedef struct {
-     U16  nextState;
-     BYTE nbAdditionalBits;
-     BYTE nbBits;
-     U32  baseValue;
- } ZSTD_seqSymbol;
-
- #define SEQSYMBOL_TABLE_SIZE(log)   (1 + (1 << (log)))
-
-typedef struct {
-    ZSTD_seqSymbol LLTable[SEQSYMBOL_TABLE_SIZE(LLFSELog)];    /* Note : Space reserved for FSE Tables */
-    ZSTD_seqSymbol OFTable[SEQSYMBOL_TABLE_SIZE(OffFSELog)];   /* is also used as temporary workspace while building hufTable during DDict creation */
-    ZSTD_seqSymbol MLTable[SEQSYMBOL_TABLE_SIZE(MLFSELog)];    /* and therefore must be at least HUF_DECOMPRESS_WORKSPACE_SIZE large */
-    HUF_DTable hufTable[HUF_DTABLE_SIZE(HufLog)];  /* can accommodate HUF_decompress4X */
-    U32 rep[ZSTD_REP_NUM];
-} ZSTD_entropyDTables_t;
-
-typedef enum { ZSTDds_getFrameHeaderSize, ZSTDds_decodeFrameHeader,
-               ZSTDds_decodeBlockHeader, ZSTDds_decompressBlock,
-               ZSTDds_decompressLastBlock, ZSTDds_checkChecksum,
-               ZSTDds_decodeSkippableHeader, ZSTDds_skipFrame } ZSTD_dStage;
-
-typedef enum { zdss_init=0, zdss_loadHeader,
-               zdss_read, zdss_load, zdss_flush } ZSTD_dStreamStage;
-
-typedef enum {
-    ZSTD_use_indefinitely = -1,  /* Use the dictionary indefinitely */
-    ZSTD_dont_use = 0,           /* Do not use the dictionary (if one exists free it) */
-    ZSTD_use_once = 1            /* Use the dictionary once and set to ZSTD_dont_use */
-} ZSTD_dictUses_e;
-
-struct ZSTD_DCtx_s
-{
-    const ZSTD_seqSymbol* LLTptr;
-    const ZSTD_seqSymbol* MLTptr;
-    const ZSTD_seqSymbol* OFTptr;
-    const HUF_DTable* HUFptr;
-    ZSTD_entropyDTables_t entropy;
-    U32 workspace[HUF_DECOMPRESS_WORKSPACE_SIZE_U32];   /* space needed when building huffman tables */
-    const void* previousDstEnd;   /* detect continuity */
-    const void* prefixStart;      /* start of current segment */
-    const void* virtualStart;     /* virtual start of previous segment if it was just before current one */
-    const void* dictEnd;          /* end of previous segment */
-    size_t expected;
-    ZSTD_frameHeader fParams;
-    U64 decodedSize;
-    blockType_e bType;            /* used in ZSTD_decompressContinue(), store blockType between block header decoding and block decompression stages */
-    ZSTD_dStage stage;
-    U32 litEntropy;
-    U32 fseEntropy;
-    XXH64_state_t xxhState;
-    size_t headerSize;
-    ZSTD_format_e format;
-    const BYTE* litPtr;
-    ZSTD_customMem customMem;
-    size_t litSize;
-    size_t rleSize;
-    size_t staticSize;
-    int bmi2;                     /* == 1 if the CPU supports BMI2 and 0 otherwise. CPU support is determined dynamically once per context lifetime. */
-
-    /* dictionary */
-    ZSTD_DDict* ddictLocal;
-    const ZSTD_DDict* ddict;     /* set by ZSTD_initDStream_usingDDict(), or ZSTD_DCtx_refDDict() */
-    U32 dictID;
-    int ddictIsCold;             /* if == 1 : dictionary is "new" for working context, and presumed "cold" (not in cpu cache) */
-    ZSTD_dictUses_e dictUses;
-
-    /* streaming */
-    ZSTD_dStreamStage streamStage;
-    char*  inBuff;
-    size_t inBuffSize;
-    size_t inPos;
-    size_t maxWindowSize;
-    char*  outBuff;
-    size_t outBuffSize;
-    size_t outStart;
-    size_t outEnd;
-    size_t lhSize;
-    void* legacyContext;
-    U32 previousLegacyVersion;
-    U32 legacyVersion;
-    U32 hostageByte;
-    int noForwardProgress;
-
-    /* workspace */
-    BYTE litBuffer[ZSTD_BLOCKSIZE_MAX + WILDCOPY_OVERLENGTH];
-    BYTE headerBuffer[ZSTD_FRAMEHEADERSIZE_MAX];
-};  /* typedef'd to ZSTD_DCtx within "zstd.h" */
-
-
-/*-*******************************************************
- *  Shared internal functions
- *********************************************************/
-
-/*! ZSTD_loadDEntropy() :
- *  dict : must point at beginning of a valid zstd dictionary.
- * @return : size of entropy tables read */
-size_t ZSTD_loadDEntropy(ZSTD_entropyDTables_t* entropy,
-                   const void* const dict, size_t const dictSize);
-
-/*! ZSTD_checkContinuity() :
- *  check if next `dst` follows previous position, where decompression ended.
- *  If yes, do nothing (continue on current segment).
- *  If not, classify previous segment as "external dictionary", and start a new segment.
- *  This function cannot fail. */
-void ZSTD_checkContinuity(ZSTD_DCtx* dctx, const void* dst);
-
-
-#endif /* ZSTD_DECOMPRESS_INTERNAL_H */
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/deprecated/zbuff_common.c mysql-8.0-8.0.27/extra/zstd/lib/deprecated/zbuff_common.c
--- mysql-8.0-8.0.26/extra/zstd/lib/deprecated/zbuff_common.c	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/deprecated/zbuff_common.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
-/*-*************************************
-*  Dependencies
-***************************************/
-#include "error_private.h"
-#include "zbuff.h"
-
-/*-****************************************
-*  ZBUFF Error Management  (deprecated)
-******************************************/
-
-/*! ZBUFF_isError() :
-*   tells if a return value is an error code */
-unsigned ZBUFF_isError(size_t errorCode) { return ERR_isError(errorCode); }
-/*! ZBUFF_getErrorName() :
-*   provides error code string from function result (useful for debugging) */
-const char* ZBUFF_getErrorName(size_t errorCode) { return ERR_getErrorName(errorCode); }
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/deprecated/zbuff_compress.c mysql-8.0-8.0.27/extra/zstd/lib/deprecated/zbuff_compress.c
--- mysql-8.0-8.0.26/extra/zstd/lib/deprecated/zbuff_compress.c	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/deprecated/zbuff_compress.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,147 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
-
-
-/* *************************************
-*  Dependencies
-***************************************/
-#define ZBUFF_STATIC_LINKING_ONLY
-#include "zbuff.h"
-
-
-/*-***********************************************************
-*  Streaming compression
-*
-*  A ZBUFF_CCtx object is required to track streaming operation.
-*  Use ZBUFF_createCCtx() and ZBUFF_freeCCtx() to create/release resources.
-*  Use ZBUFF_compressInit() to start a new compression operation.
-*  ZBUFF_CCtx objects can be reused multiple times.
-*
-*  Use ZBUFF_compressContinue() repetitively to consume your input.
-*  *srcSizePtr and *dstCapacityPtr can be any size.
-*  The function will report how many bytes were read or written by modifying *srcSizePtr and *dstCapacityPtr.
-*  Note that it may not consume the entire input, in which case it's up to the caller to call again the function with remaining input.
-*  The content of dst will be overwritten (up to *dstCapacityPtr) at each function call, so save its content if it matters or change dst .
-*  @return : a hint to preferred nb of bytes to use as input for next function call (it's only a hint, to improve latency)
-*            or an error code, which can be tested using ZBUFF_isError().
-*
-*  ZBUFF_compressFlush() can be used to instruct ZBUFF to compress and output whatever remains within its buffer.
-*  Note that it will not output more than *dstCapacityPtr.
-*  Therefore, some content might still be left into its internal buffer if dst buffer is too small.
-*  @return : nb of bytes still present into internal buffer (0 if it's empty)
-*            or an error code, which can be tested using ZBUFF_isError().
-*
-*  ZBUFF_compressEnd() instructs to finish a frame.
-*  It will perform a flush and write frame epilogue.
-*  Similar to ZBUFF_compressFlush(), it may not be able to output the entire internal buffer content if *dstCapacityPtr is too small.
-*  @return : nb of bytes still present into internal buffer (0 if it's empty)
-*            or an error code, which can be tested using ZBUFF_isError().
-*
-*  Hint : recommended buffer sizes (not compulsory)
-*  input : ZSTD_BLOCKSIZE_MAX (128 KB), internal unit size, it improves latency to use this value.
-*  output : ZSTD_compressBound(ZSTD_BLOCKSIZE_MAX) + ZSTD_blockHeaderSize + ZBUFF_endFrameSize : ensures it's always possible to write/flush/end a full block at best speed.
-* ***********************************************************/
-
-ZBUFF_CCtx* ZBUFF_createCCtx(void)
-{
-    return ZSTD_createCStream();
-}
-
-ZBUFF_CCtx* ZBUFF_createCCtx_advanced(ZSTD_customMem customMem)
-{
-    return ZSTD_createCStream_advanced(customMem);
-}
-
-size_t ZBUFF_freeCCtx(ZBUFF_CCtx* zbc)
-{
-    return ZSTD_freeCStream(zbc);
-}
-
-
-/* ======   Initialization   ====== */
-
-size_t ZBUFF_compressInit_advanced(ZBUFF_CCtx* zbc,
-                                   const void* dict, size_t dictSize,
-                                   ZSTD_parameters params, unsigned long long pledgedSrcSize)
-{
-    if (pledgedSrcSize==0) pledgedSrcSize = ZSTD_CONTENTSIZE_UNKNOWN;  /* preserve "0 == unknown" behavior */
-    return ZSTD_initCStream_advanced(zbc, dict, dictSize, params, pledgedSrcSize);
-}
-
-
-size_t ZBUFF_compressInitDictionary(ZBUFF_CCtx* zbc, const void* dict, size_t dictSize, int compressionLevel)
-{
-    return ZSTD_initCStream_usingDict(zbc, dict, dictSize, compressionLevel);
-}
-
-size_t ZBUFF_compressInit(ZBUFF_CCtx* zbc, int compressionLevel)
-{
-    return ZSTD_initCStream(zbc, compressionLevel);
-}
-
-/* ======   Compression   ====== */
-
-
-size_t ZBUFF_compressContinue(ZBUFF_CCtx* zbc,
-                              void* dst, size_t* dstCapacityPtr,
-                        const void* src, size_t* srcSizePtr)
-{
-    size_t result;
-    ZSTD_outBuffer outBuff;
-    ZSTD_inBuffer inBuff;
-    outBuff.dst = dst;
-    outBuff.pos = 0;
-    outBuff.size = *dstCapacityPtr;
-    inBuff.src = src;
-    inBuff.pos = 0;
-    inBuff.size = *srcSizePtr;
-    result = ZSTD_compressStream(zbc, &outBuff, &inBuff);
-    *dstCapacityPtr = outBuff.pos;
-    *srcSizePtr = inBuff.pos;
-    return result;
-}
-
-
-
-/* ======   Finalize   ====== */
-
-size_t ZBUFF_compressFlush(ZBUFF_CCtx* zbc, void* dst, size_t* dstCapacityPtr)
-{
-    size_t result;
-    ZSTD_outBuffer outBuff;
-    outBuff.dst = dst;
-    outBuff.pos = 0;
-    outBuff.size = *dstCapacityPtr;
-    result = ZSTD_flushStream(zbc, &outBuff);
-    *dstCapacityPtr = outBuff.pos;
-    return result;
-}
-
-
-size_t ZBUFF_compressEnd(ZBUFF_CCtx* zbc, void* dst, size_t* dstCapacityPtr)
-{
-    size_t result;
-    ZSTD_outBuffer outBuff;
-    outBuff.dst = dst;
-    outBuff.pos = 0;
-    outBuff.size = *dstCapacityPtr;
-    result = ZSTD_endStream(zbc, &outBuff);
-    *dstCapacityPtr = outBuff.pos;
-    return result;
-}
-
-
-
-/* *************************************
-*  Tool functions
-***************************************/
-size_t ZBUFF_recommendedCInSize(void)  { return ZSTD_CStreamInSize(); }
-size_t ZBUFF_recommendedCOutSize(void) { return ZSTD_CStreamOutSize(); }
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/deprecated/zbuff_decompress.c mysql-8.0-8.0.27/extra/zstd/lib/deprecated/zbuff_decompress.c
--- mysql-8.0-8.0.26/extra/zstd/lib/deprecated/zbuff_decompress.c	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/deprecated/zbuff_decompress.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
-
-
-/* *************************************
-*  Dependencies
-***************************************/
-#define ZBUFF_STATIC_LINKING_ONLY
-#include "zbuff.h"
-
-
-ZBUFF_DCtx* ZBUFF_createDCtx(void)
-{
-    return ZSTD_createDStream();
-}
-
-ZBUFF_DCtx* ZBUFF_createDCtx_advanced(ZSTD_customMem customMem)
-{
-    return ZSTD_createDStream_advanced(customMem);
-}
-
-size_t ZBUFF_freeDCtx(ZBUFF_DCtx* zbd)
-{
-    return ZSTD_freeDStream(zbd);
-}
-
-
-/* *** Initialization *** */
-
-size_t ZBUFF_decompressInitDictionary(ZBUFF_DCtx* zbd, const void* dict, size_t dictSize)
-{
-    return ZSTD_initDStream_usingDict(zbd, dict, dictSize);
-}
-
-size_t ZBUFF_decompressInit(ZBUFF_DCtx* zbd)
-{
-    return ZSTD_initDStream(zbd);
-}
-
-
-/* *** Decompression *** */
-
-size_t ZBUFF_decompressContinue(ZBUFF_DCtx* zbd,
-                                void* dst, size_t* dstCapacityPtr,
-                          const void* src, size_t* srcSizePtr)
-{
-    ZSTD_outBuffer outBuff;
-    ZSTD_inBuffer inBuff;
-    size_t result;
-    outBuff.dst  = dst;
-    outBuff.pos  = 0;
-    outBuff.size = *dstCapacityPtr;
-    inBuff.src  = src;
-    inBuff.pos  = 0;
-    inBuff.size = *srcSizePtr;
-    result = ZSTD_decompressStream(zbd, &outBuff, &inBuff);
-    *dstCapacityPtr = outBuff.pos;
-    *srcSizePtr = inBuff.pos;
-    return result;
-}
-
-
-/* *************************************
-*  Tool functions
-***************************************/
-size_t ZBUFF_recommendedDInSize(void)  { return ZSTD_DStreamInSize(); }
-size_t ZBUFF_recommendedDOutSize(void) { return ZSTD_DStreamOutSize(); }
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/deprecated/zbuff.h mysql-8.0-8.0.27/extra/zstd/lib/deprecated/zbuff.h
--- mysql-8.0-8.0.26/extra/zstd/lib/deprecated/zbuff.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/deprecated/zbuff.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,213 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
-/* ***************************************************************
-*  NOTES/WARNINGS
-******************************************************************/
-/* The streaming API defined here is deprecated.
- * Consider migrating towards ZSTD_compressStream() API in `zstd.h`
- * See 'lib/README.md'.
- *****************************************************************/
-
-
-#if defined (__cplusplus)
-extern "C" {
-#endif
-
-#ifndef ZSTD_BUFFERED_H_23987
-#define ZSTD_BUFFERED_H_23987
-
-/* *************************************
-*  Dependencies
-***************************************/
-#include <stddef.h>      /* size_t */
-#include "zstd.h"        /* ZSTD_CStream, ZSTD_DStream, ZSTDLIB_API */
-
-
-/* ***************************************************************
-*  Compiler specifics
-*****************************************************************/
-/* Deprecation warnings */
-/* Should these warnings be a problem,
-   it is generally possible to disable them,
-   typically with -Wno-deprecated-declarations for gcc
-   or _CRT_SECURE_NO_WARNINGS in Visual.
-   Otherwise, it's also possible to define ZBUFF_DISABLE_DEPRECATE_WARNINGS */
-#ifdef ZBUFF_DISABLE_DEPRECATE_WARNINGS
-#  define ZBUFF_DEPRECATED(message) ZSTDLIB_API  /* disable deprecation warnings */
-#else
-#  if defined (__cplusplus) && (__cplusplus >= 201402) /* C++14 or greater */
-#    define ZBUFF_DEPRECATED(message) [[deprecated(message)]] ZSTDLIB_API
-#  elif (defined(__GNUC__) && (__GNUC__ >= 5)) || defined(__clang__)
-#    define ZBUFF_DEPRECATED(message) ZSTDLIB_API __attribute__((deprecated(message)))
-#  elif defined(__GNUC__) && (__GNUC__ >= 3)
-#    define ZBUFF_DEPRECATED(message) ZSTDLIB_API __attribute__((deprecated))
-#  elif defined(_MSC_VER)
-#    define ZBUFF_DEPRECATED(message) ZSTDLIB_API __declspec(deprecated(message))
-#  else
-#    pragma message("WARNING: You need to implement ZBUFF_DEPRECATED for this compiler")
-#    define ZBUFF_DEPRECATED(message) ZSTDLIB_API
-#  endif
-#endif /* ZBUFF_DISABLE_DEPRECATE_WARNINGS */
-
-
-/* *************************************
-*  Streaming functions
-***************************************/
-/* This is the easier "buffered" streaming API,
-*  using an internal buffer to lift all restrictions on user-provided buffers
-*  which can be any size, any place, for both input and output.
-*  ZBUFF and ZSTD are 100% interoperable,
-*  frames created by one can be decoded by the other one */
-
-typedef ZSTD_CStream ZBUFF_CCtx;
-ZBUFF_DEPRECATED("use ZSTD_createCStream") ZBUFF_CCtx* ZBUFF_createCCtx(void);
-ZBUFF_DEPRECATED("use ZSTD_freeCStream")   size_t      ZBUFF_freeCCtx(ZBUFF_CCtx* cctx);
-
-ZBUFF_DEPRECATED("use ZSTD_initCStream")           size_t ZBUFF_compressInit(ZBUFF_CCtx* cctx, int compressionLevel);
-ZBUFF_DEPRECATED("use ZSTD_initCStream_usingDict") size_t ZBUFF_compressInitDictionary(ZBUFF_CCtx* cctx, const void* dict, size_t dictSize, int compressionLevel);
-
-ZBUFF_DEPRECATED("use ZSTD_compressStream") size_t ZBUFF_compressContinue(ZBUFF_CCtx* cctx, void* dst, size_t* dstCapacityPtr, const void* src, size_t* srcSizePtr);
-ZBUFF_DEPRECATED("use ZSTD_flushStream")    size_t ZBUFF_compressFlush(ZBUFF_CCtx* cctx, void* dst, size_t* dstCapacityPtr);
-ZBUFF_DEPRECATED("use ZSTD_endStream")      size_t ZBUFF_compressEnd(ZBUFF_CCtx* cctx, void* dst, size_t* dstCapacityPtr);
-
-/*-*************************************************
-*  Streaming compression - howto
-*
-*  A ZBUFF_CCtx object is required to track streaming operation.
-*  Use ZBUFF_createCCtx() and ZBUFF_freeCCtx() to create/release resources.
-*  ZBUFF_CCtx objects can be reused multiple times.
-*
-*  Start by initializing ZBUF_CCtx.
-*  Use ZBUFF_compressInit() to start a new compression operation.
-*  Use ZBUFF_compressInitDictionary() for a compression which requires a dictionary.
-*
-*  Use ZBUFF_compressContinue() repetitively to consume input stream.
-*  *srcSizePtr and *dstCapacityPtr can be any size.
-*  The function will report how many bytes were read or written within *srcSizePtr and *dstCapacityPtr.
-*  Note that it may not consume the entire input, in which case it's up to the caller to present again remaining data.
-*  The content of `dst` will be overwritten (up to *dstCapacityPtr) at each call, so save its content if it matters or change @dst .
-*  @return : a hint to preferred nb of bytes to use as input for next function call (it's just a hint, to improve latency)
-*            or an error code, which can be tested using ZBUFF_isError().
-*
-*  At any moment, it's possible to flush whatever data remains within buffer, using ZBUFF_compressFlush().
-*  The nb of bytes written into `dst` will be reported into *dstCapacityPtr.
-*  Note that the function cannot output more than *dstCapacityPtr,
-*  therefore, some content might still be left into internal buffer if *dstCapacityPtr is too small.
-*  @return : nb of bytes still present into internal buffer (0 if it's empty)
-*            or an error code, which can be tested using ZBUFF_isError().
-*
-*  ZBUFF_compressEnd() instructs to finish a frame.
-*  It will perform a flush and write frame epilogue.
-*  The epilogue is required for decoders to consider a frame completed.
-*  Similar to ZBUFF_compressFlush(), it may not be able to output the entire internal buffer content if *dstCapacityPtr is too small.
-*  In which case, call again ZBUFF_compressFlush() to complete the flush.
-*  @return : nb of bytes still present into internal buffer (0 if it's empty)
-*            or an error code, which can be tested using ZBUFF_isError().
-*
-*  Hint : _recommended buffer_ sizes (not compulsory) : ZBUFF_recommendedCInSize() / ZBUFF_recommendedCOutSize()
-*  input : ZBUFF_recommendedCInSize==128 KB block size is the internal unit, use this value to reduce intermediate stages (better latency)
-*  output : ZBUFF_recommendedCOutSize==ZSTD_compressBound(128 KB) + 3 + 3 : ensures it's always possible to write/flush/end a full block. Skip some buffering.
-*  By using both, it ensures that input will be entirely consumed, and output will always contain the result, reducing intermediate buffering.
-* **************************************************/
-
-
-typedef ZSTD_DStream ZBUFF_DCtx;
-ZBUFF_DEPRECATED("use ZSTD_createDStream") ZBUFF_DCtx* ZBUFF_createDCtx(void);
-ZBUFF_DEPRECATED("use ZSTD_freeDStream")   size_t      ZBUFF_freeDCtx(ZBUFF_DCtx* dctx);
-
-ZBUFF_DEPRECATED("use ZSTD_initDStream")           size_t ZBUFF_decompressInit(ZBUFF_DCtx* dctx);
-ZBUFF_DEPRECATED("use ZSTD_initDStream_usingDict") size_t ZBUFF_decompressInitDictionary(ZBUFF_DCtx* dctx, const void* dict, size_t dictSize);
-
-ZBUFF_DEPRECATED("use ZSTD_decompressStream") size_t ZBUFF_decompressContinue(ZBUFF_DCtx* dctx,
-                                            void* dst, size_t* dstCapacityPtr,
-                                      const void* src, size_t* srcSizePtr);
-
-/*-***************************************************************************
-*  Streaming decompression howto
-*
-*  A ZBUFF_DCtx object is required to track streaming operations.
-*  Use ZBUFF_createDCtx() and ZBUFF_freeDCtx() to create/release resources.
-*  Use ZBUFF_decompressInit() to start a new decompression operation,
-*   or ZBUFF_decompressInitDictionary() if decompression requires a dictionary.
-*  Note that ZBUFF_DCtx objects can be re-init multiple times.
-*
-*  Use ZBUFF_decompressContinue() repetitively to consume your input.
-*  *srcSizePtr and *dstCapacityPtr can be any size.
-*  The function will report how many bytes were read or written by modifying *srcSizePtr and *dstCapacityPtr.
-*  Note that it may not consume the entire input, in which case it's up to the caller to present remaining input again.
-*  The content of `dst` will be overwritten (up to *dstCapacityPtr) at each function call, so save its content if it matters, or change `dst`.
-*  @return : 0 when a frame is completely decoded and fully flushed,
-*            1 when there is still some data left within internal buffer to flush,
-*            >1 when more data is expected, with value being a suggested next input size (it's just a hint, which helps latency),
-*            or an error code, which can be tested using ZBUFF_isError().
-*
-*  Hint : recommended buffer sizes (not compulsory) : ZBUFF_recommendedDInSize() and ZBUFF_recommendedDOutSize()
-*  output : ZBUFF_recommendedDOutSize== 128 KB block size is the internal unit, it ensures it's always possible to write a full block when decoded.
-*  input  : ZBUFF_recommendedDInSize == 128KB + 3;
-*           just follow indications from ZBUFF_decompressContinue() to minimize latency. It should always be <= 128 KB + 3 .
-* *******************************************************************************/
-
-
-/* *************************************
-*  Tool functions
-***************************************/
-ZBUFF_DEPRECATED("use ZSTD_isError")      unsigned ZBUFF_isError(size_t errorCode);
-ZBUFF_DEPRECATED("use ZSTD_getErrorName") const char* ZBUFF_getErrorName(size_t errorCode);
-
-/** Functions below provide recommended buffer sizes for Compression or Decompression operations.
-*   These sizes are just hints, they tend to offer better latency */
-ZBUFF_DEPRECATED("use ZSTD_CStreamInSize")  size_t ZBUFF_recommendedCInSize(void);
-ZBUFF_DEPRECATED("use ZSTD_CStreamOutSize") size_t ZBUFF_recommendedCOutSize(void);
-ZBUFF_DEPRECATED("use ZSTD_DStreamInSize")  size_t ZBUFF_recommendedDInSize(void);
-ZBUFF_DEPRECATED("use ZSTD_DStreamOutSize") size_t ZBUFF_recommendedDOutSize(void);
-
-#endif  /* ZSTD_BUFFERED_H_23987 */
-
-
-#ifdef ZBUFF_STATIC_LINKING_ONLY
-#ifndef ZBUFF_STATIC_H_30298098432
-#define ZBUFF_STATIC_H_30298098432
-
-/* ====================================================================================
- * The definitions in this section are considered experimental.
- * They should never be used in association with a dynamic library, as they may change in the future.
- * They are provided for advanced usages.
- * Use them only in association with static linking.
- * ==================================================================================== */
-
-/*--- Dependency ---*/
-#define ZSTD_STATIC_LINKING_ONLY   /* ZSTD_parameters, ZSTD_customMem */
-#include "zstd.h"
-
-
-/*--- Custom memory allocator ---*/
-/*! ZBUFF_createCCtx_advanced() :
- *  Create a ZBUFF compression context using external alloc and free functions */
-ZBUFF_DEPRECATED("use ZSTD_createCStream_advanced") ZBUFF_CCtx* ZBUFF_createCCtx_advanced(ZSTD_customMem customMem);
-
-/*! ZBUFF_createDCtx_advanced() :
- *  Create a ZBUFF decompression context using external alloc and free functions */
-ZBUFF_DEPRECATED("use ZSTD_createDStream_advanced") ZBUFF_DCtx* ZBUFF_createDCtx_advanced(ZSTD_customMem customMem);
-
-
-/*--- Advanced Streaming Initialization ---*/
-ZBUFF_DEPRECATED("use ZSTD_initDStream_usingDict") size_t ZBUFF_compressInit_advanced(ZBUFF_CCtx* zbc,
-                                               const void* dict, size_t dictSize,
-                                               ZSTD_parameters params, unsigned long long pledgedSrcSize);
-
-
-#endif    /* ZBUFF_STATIC_H_30298098432 */
-#endif    /* ZBUFF_STATIC_LINKING_ONLY */
-
-
-#if defined (__cplusplus)
-}
-#endif
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/dictBuilder/cover.c mysql-8.0-8.0.27/extra/zstd/lib/dictBuilder/cover.c
--- mysql-8.0-8.0.26/extra/zstd/lib/dictBuilder/cover.c	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/dictBuilder/cover.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1237 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
-/* *****************************************************************************
- * Constructs a dictionary using a heuristic based on the following paper:
- *
- * Liao, Petri, Moffat, Wirth
- * Effective Construction of Relative Lempel-Ziv Dictionaries
- * Published in WWW 2016.
- *
- * Adapted from code originally written by @ot (Giuseppe Ottaviano).
- ******************************************************************************/
-
-/*-*************************************
-*  Dependencies
-***************************************/
-#include <stdio.h>  /* fprintf */
-#include <stdlib.h> /* malloc, free, qsort */
-#include <string.h> /* memset */
-#include <time.h>   /* clock */
-
-#include "mem.h" /* read */
-#include "pool.h"
-#include "threading.h"
-#include "cover.h"
-#include "zstd_internal.h" /* includes zstd.h */
-#ifndef ZDICT_STATIC_LINKING_ONLY
-#define ZDICT_STATIC_LINKING_ONLY
-#endif
-#include "zdict.h"
-
-/*-*************************************
-*  Constants
-***************************************/
-#define COVER_MAX_SAMPLES_SIZE (sizeof(size_t) == 8 ? ((unsigned)-1) : ((unsigned)1 GB))
-#define DEFAULT_SPLITPOINT 1.0
-
-/*-*************************************
-*  Console display
-***************************************/
-static int g_displayLevel = 2;
-#define DISPLAY(...)                                                           \
-  {                                                                            \
-    fprintf(stderr, __VA_ARGS__);                                              \
-    fflush(stderr);                                                            \
-  }
-#define LOCALDISPLAYLEVEL(displayLevel, l, ...)                                \
-  if (displayLevel >= l) {                                                     \
-    DISPLAY(__VA_ARGS__);                                                      \
-  } /* 0 : no display;   1: errors;   2: default;  3: details;  4: debug */
-#define DISPLAYLEVEL(l, ...) LOCALDISPLAYLEVEL(g_displayLevel, l, __VA_ARGS__)
-
-#define LOCALDISPLAYUPDATE(displayLevel, l, ...)                               \
-  if (displayLevel >= l) {                                                     \
-    if ((clock() - g_time > refreshRate) || (displayLevel >= 4)) {             \
-      g_time = clock();                                                        \
-      DISPLAY(__VA_ARGS__);                                                    \
-    }                                                                          \
-  }
-#define DISPLAYUPDATE(l, ...) LOCALDISPLAYUPDATE(g_displayLevel, l, __VA_ARGS__)
-static const clock_t refreshRate = CLOCKS_PER_SEC * 15 / 100;
-static clock_t g_time = 0;
-
-/*-*************************************
-* Hash table
-***************************************
-* A small specialized hash map for storing activeDmers.
-* The map does not resize, so if it becomes full it will loop forever.
-* Thus, the map must be large enough to store every value.
-* The map implements linear probing and keeps its load less than 0.5.
-*/
-
-#define MAP_EMPTY_VALUE ((U32)-1)
-typedef struct COVER_map_pair_t_s {
-  U32 key;
-  U32 value;
-} COVER_map_pair_t;
-
-typedef struct COVER_map_s {
-  COVER_map_pair_t *data;
-  U32 sizeLog;
-  U32 size;
-  U32 sizeMask;
-} COVER_map_t;
-
-/**
- * Clear the map.
- */
-static void COVER_map_clear(COVER_map_t *map) {
-  memset(map->data, MAP_EMPTY_VALUE, map->size * sizeof(COVER_map_pair_t));
-}
-
-/**
- * Initializes a map of the given size.
- * Returns 1 on success and 0 on failure.
- * The map must be destroyed with COVER_map_destroy().
- * The map is only guaranteed to be large enough to hold size elements.
- */
-static int COVER_map_init(COVER_map_t *map, U32 size) {
-  map->sizeLog = ZSTD_highbit32(size) + 2;
-  map->size = (U32)1 << map->sizeLog;
-  map->sizeMask = map->size - 1;
-  map->data = (COVER_map_pair_t *)malloc(map->size * sizeof(COVER_map_pair_t));
-  if (!map->data) {
-    map->sizeLog = 0;
-    map->size = 0;
-    return 0;
-  }
-  COVER_map_clear(map);
-  return 1;
-}
-
-/**
- * Internal hash function
- */
-static const U32 prime4bytes = 2654435761U;
-static U32 COVER_map_hash(COVER_map_t *map, U32 key) {
-  return (key * prime4bytes) >> (32 - map->sizeLog);
-}
-
-/**
- * Helper function that returns the index that a key should be placed into.
- */
-static U32 COVER_map_index(COVER_map_t *map, U32 key) {
-  const U32 hash = COVER_map_hash(map, key);
-  U32 i;
-  for (i = hash;; i = (i + 1) & map->sizeMask) {
-    COVER_map_pair_t *pos = &map->data[i];
-    if (pos->value == MAP_EMPTY_VALUE) {
-      return i;
-    }
-    if (pos->key == key) {
-      return i;
-    }
-  }
-}
-
-/**
- * Returns the pointer to the value for key.
- * If key is not in the map, it is inserted and the value is set to 0.
- * The map must not be full.
- */
-static U32 *COVER_map_at(COVER_map_t *map, U32 key) {
-  COVER_map_pair_t *pos = &map->data[COVER_map_index(map, key)];
-  if (pos->value == MAP_EMPTY_VALUE) {
-    pos->key = key;
-    pos->value = 0;
-  }
-  return &pos->value;
-}
-
-/**
- * Deletes key from the map if present.
- */
-static void COVER_map_remove(COVER_map_t *map, U32 key) {
-  U32 i = COVER_map_index(map, key);
-  COVER_map_pair_t *del = &map->data[i];
-  U32 shift = 1;
-  if (del->value == MAP_EMPTY_VALUE) {
-    return;
-  }
-  for (i = (i + 1) & map->sizeMask;; i = (i + 1) & map->sizeMask) {
-    COVER_map_pair_t *const pos = &map->data[i];
-    /* If the position is empty we are done */
-    if (pos->value == MAP_EMPTY_VALUE) {
-      del->value = MAP_EMPTY_VALUE;
-      return;
-    }
-    /* If pos can be moved to del do so */
-    if (((i - COVER_map_hash(map, pos->key)) & map->sizeMask) >= shift) {
-      del->key = pos->key;
-      del->value = pos->value;
-      del = pos;
-      shift = 1;
-    } else {
-      ++shift;
-    }
-  }
-}
-
-/**
- * Destroys a map that is inited with COVER_map_init().
- */
-static void COVER_map_destroy(COVER_map_t *map) {
-  if (map->data) {
-    free(map->data);
-  }
-  map->data = NULL;
-  map->size = 0;
-}
-
-/*-*************************************
-* Context
-***************************************/
-
-typedef struct {
-  const BYTE *samples;
-  size_t *offsets;
-  const size_t *samplesSizes;
-  size_t nbSamples;
-  size_t nbTrainSamples;
-  size_t nbTestSamples;
-  U32 *suffix;
-  size_t suffixSize;
-  U32 *freqs;
-  U32 *dmerAt;
-  unsigned d;
-} COVER_ctx_t;
-
-/* We need a global context for qsort... */
-static COVER_ctx_t *g_ctx = NULL;
-
-/*-*************************************
-*  Helper functions
-***************************************/
-
-/**
- * Returns the sum of the sample sizes.
- */
-size_t COVER_sum(const size_t *samplesSizes, unsigned nbSamples) {
-  size_t sum = 0;
-  unsigned i;
-  for (i = 0; i < nbSamples; ++i) {
-    sum += samplesSizes[i];
-  }
-  return sum;
-}
-
-/**
- * Returns -1 if the dmer at lp is less than the dmer at rp.
- * Return 0 if the dmers at lp and rp are equal.
- * Returns 1 if the dmer at lp is greater than the dmer at rp.
- */
-static int COVER_cmp(COVER_ctx_t *ctx, const void *lp, const void *rp) {
-  U32 const lhs = *(U32 const *)lp;
-  U32 const rhs = *(U32 const *)rp;
-  return memcmp(ctx->samples + lhs, ctx->samples + rhs, ctx->d);
-}
-/**
- * Faster version for d <= 8.
- */
-static int COVER_cmp8(COVER_ctx_t *ctx, const void *lp, const void *rp) {
-  U64 const mask = (ctx->d == 8) ? (U64)-1 : (((U64)1 << (8 * ctx->d)) - 1);
-  U64 const lhs = MEM_readLE64(ctx->samples + *(U32 const *)lp) & mask;
-  U64 const rhs = MEM_readLE64(ctx->samples + *(U32 const *)rp) & mask;
-  if (lhs < rhs) {
-    return -1;
-  }
-  return (lhs > rhs);
-}
-
-/**
- * Same as COVER_cmp() except ties are broken by pointer value
- * NOTE: g_ctx must be set to call this function.  A global is required because
- * qsort doesn't take an opaque pointer.
- */
-static int COVER_strict_cmp(const void *lp, const void *rp) {
-  int result = COVER_cmp(g_ctx, lp, rp);
-  if (result == 0) {
-    result = lp < rp ? -1 : 1;
-  }
-  return result;
-}
-/**
- * Faster version for d <= 8.
- */
-static int COVER_strict_cmp8(const void *lp, const void *rp) {
-  int result = COVER_cmp8(g_ctx, lp, rp);
-  if (result == 0) {
-    result = lp < rp ? -1 : 1;
-  }
-  return result;
-}
-
-/**
- * Returns the first pointer in [first, last) whose element does not compare
- * less than value.  If no such element exists it returns last.
- */
-static const size_t *COVER_lower_bound(const size_t *first, const size_t *last,
-                                       size_t value) {
-  size_t count = last - first;
-  while (count != 0) {
-    size_t step = count / 2;
-    const size_t *ptr = first;
-    ptr += step;
-    if (*ptr < value) {
-      first = ++ptr;
-      count -= step + 1;
-    } else {
-      count = step;
-    }
-  }
-  return first;
-}
-
-/**
- * Generic groupBy function.
- * Groups an array sorted by cmp into groups with equivalent values.
- * Calls grp for each group.
- */
-static void
-COVER_groupBy(const void *data, size_t count, size_t size, COVER_ctx_t *ctx,
-              int (*cmp)(COVER_ctx_t *, const void *, const void *),
-              void (*grp)(COVER_ctx_t *, const void *, const void *)) {
-  const BYTE *ptr = (const BYTE *)data;
-  size_t num = 0;
-  while (num < count) {
-    const BYTE *grpEnd = ptr + size;
-    ++num;
-    while (num < count && cmp(ctx, ptr, grpEnd) == 0) {
-      grpEnd += size;
-      ++num;
-    }
-    grp(ctx, ptr, grpEnd);
-    ptr = grpEnd;
-  }
-}
-
-/*-*************************************
-*  Cover functions
-***************************************/
-
-/**
- * Called on each group of positions with the same dmer.
- * Counts the frequency of each dmer and saves it in the suffix array.
- * Fills `ctx->dmerAt`.
- */
-static void COVER_group(COVER_ctx_t *ctx, const void *group,
-                        const void *groupEnd) {
-  /* The group consists of all the positions with the same first d bytes. */
-  const U32 *grpPtr = (const U32 *)group;
-  const U32 *grpEnd = (const U32 *)groupEnd;
-  /* The dmerId is how we will reference this dmer.
-   * This allows us to map the whole dmer space to a much smaller space, the
-   * size of the suffix array.
-   */
-  const U32 dmerId = (U32)(grpPtr - ctx->suffix);
-  /* Count the number of samples this dmer shows up in */
-  U32 freq = 0;
-  /* Details */
-  const size_t *curOffsetPtr = ctx->offsets;
-  const size_t *offsetsEnd = ctx->offsets + ctx->nbSamples;
-  /* Once *grpPtr >= curSampleEnd this occurrence of the dmer is in a
-   * different sample than the last.
-   */
-  size_t curSampleEnd = ctx->offsets[0];
-  for (; grpPtr != grpEnd; ++grpPtr) {
-    /* Save the dmerId for this position so we can get back to it. */
-    ctx->dmerAt[*grpPtr] = dmerId;
-    /* Dictionaries only help for the first reference to the dmer.
-     * After that zstd can reference the match from the previous reference.
-     * So only count each dmer once for each sample it is in.
-     */
-    if (*grpPtr < curSampleEnd) {
-      continue;
-    }
-    freq += 1;
-    /* Binary search to find the end of the sample *grpPtr is in.
-     * In the common case that grpPtr + 1 == grpEnd we can skip the binary
-     * search because the loop is over.
-     */
-    if (grpPtr + 1 != grpEnd) {
-      const size_t *sampleEndPtr =
-          COVER_lower_bound(curOffsetPtr, offsetsEnd, *grpPtr);
-      curSampleEnd = *sampleEndPtr;
-      curOffsetPtr = sampleEndPtr + 1;
-    }
-  }
-  /* At this point we are never going to look at this segment of the suffix
-   * array again.  We take advantage of this fact to save memory.
-   * We store the frequency of the dmer in the first position of the group,
-   * which is dmerId.
-   */
-  ctx->suffix[dmerId] = freq;
-}
-
-
-/**
- * Selects the best segment in an epoch.
- * Segments of are scored according to the function:
- *
- * Let F(d) be the frequency of dmer d.
- * Let S_i be the dmer at position i of segment S which has length k.
- *
- *     Score(S) = F(S_1) + F(S_2) + ... + F(S_{k-d+1})
- *
- * Once the dmer d is in the dictionary we set F(d) = 0.
- */
-static COVER_segment_t COVER_selectSegment(const COVER_ctx_t *ctx, U32 *freqs,
-                                           COVER_map_t *activeDmers, U32 begin,
-                                           U32 end,
-                                           ZDICT_cover_params_t parameters) {
-  /* Constants */
-  const U32 k = parameters.k;
-  const U32 d = parameters.d;
-  const U32 dmersInK = k - d + 1;
-  /* Try each segment (activeSegment) and save the best (bestSegment) */
-  COVER_segment_t bestSegment = {0, 0, 0};
-  COVER_segment_t activeSegment;
-  /* Reset the activeDmers in the segment */
-  COVER_map_clear(activeDmers);
-  /* The activeSegment starts at the beginning of the epoch. */
-  activeSegment.begin = begin;
-  activeSegment.end = begin;
-  activeSegment.score = 0;
-  /* Slide the activeSegment through the whole epoch.
-   * Save the best segment in bestSegment.
-   */
-  while (activeSegment.end < end) {
-    /* The dmerId for the dmer at the next position */
-    U32 newDmer = ctx->dmerAt[activeSegment.end];
-    /* The entry in activeDmers for this dmerId */
-    U32 *newDmerOcc = COVER_map_at(activeDmers, newDmer);
-    /* If the dmer isn't already present in the segment add its score. */
-    if (*newDmerOcc == 0) {
-      /* The paper suggest using the L-0.5 norm, but experiments show that it
-       * doesn't help.
-       */
-      activeSegment.score += freqs[newDmer];
-    }
-    /* Add the dmer to the segment */
-    activeSegment.end += 1;
-    *newDmerOcc += 1;
-
-    /* If the window is now too large, drop the first position */
-    if (activeSegment.end - activeSegment.begin == dmersInK + 1) {
-      U32 delDmer = ctx->dmerAt[activeSegment.begin];
-      U32 *delDmerOcc = COVER_map_at(activeDmers, delDmer);
-      activeSegment.begin += 1;
-      *delDmerOcc -= 1;
-      /* If this is the last occurrence of the dmer, subtract its score */
-      if (*delDmerOcc == 0) {
-        COVER_map_remove(activeDmers, delDmer);
-        activeSegment.score -= freqs[delDmer];
-      }
-    }
-
-    /* If this segment is the best so far save it */
-    if (activeSegment.score > bestSegment.score) {
-      bestSegment = activeSegment;
-    }
-  }
-  {
-    /* Trim off the zero frequency head and tail from the segment. */
-    U32 newBegin = bestSegment.end;
-    U32 newEnd = bestSegment.begin;
-    U32 pos;
-    for (pos = bestSegment.begin; pos != bestSegment.end; ++pos) {
-      U32 freq = freqs[ctx->dmerAt[pos]];
-      if (freq != 0) {
-        newBegin = MIN(newBegin, pos);
-        newEnd = pos + 1;
-      }
-    }
-    bestSegment.begin = newBegin;
-    bestSegment.end = newEnd;
-  }
-  {
-    /* Zero out the frequency of each dmer covered by the chosen segment. */
-    U32 pos;
-    for (pos = bestSegment.begin; pos != bestSegment.end; ++pos) {
-      freqs[ctx->dmerAt[pos]] = 0;
-    }
-  }
-  return bestSegment;
-}
-
-/**
- * Check the validity of the parameters.
- * Returns non-zero if the parameters are valid and 0 otherwise.
- */
-static int COVER_checkParameters(ZDICT_cover_params_t parameters,
-                                 size_t maxDictSize) {
-  /* k and d are required parameters */
-  if (parameters.d == 0 || parameters.k == 0) {
-    return 0;
-  }
-  /* k <= maxDictSize */
-  if (parameters.k > maxDictSize) {
-    return 0;
-  }
-  /* d <= k */
-  if (parameters.d > parameters.k) {
-    return 0;
-  }
-  /* 0 < splitPoint <= 1 */
-  if (parameters.splitPoint <= 0 || parameters.splitPoint > 1){
-    return 0;
-  }
-  return 1;
-}
-
-/**
- * Clean up a context initialized with `COVER_ctx_init()`.
- */
-static void COVER_ctx_destroy(COVER_ctx_t *ctx) {
-  if (!ctx) {
-    return;
-  }
-  if (ctx->suffix) {
-    free(ctx->suffix);
-    ctx->suffix = NULL;
-  }
-  if (ctx->freqs) {
-    free(ctx->freqs);
-    ctx->freqs = NULL;
-  }
-  if (ctx->dmerAt) {
-    free(ctx->dmerAt);
-    ctx->dmerAt = NULL;
-  }
-  if (ctx->offsets) {
-    free(ctx->offsets);
-    ctx->offsets = NULL;
-  }
-}
-
-/**
- * Prepare a context for dictionary building.
- * The context is only dependent on the parameter `d` and can used multiple
- * times.
- * Returns 0 on success or error code on error.
- * The context must be destroyed with `COVER_ctx_destroy()`.
- */
-static size_t COVER_ctx_init(COVER_ctx_t *ctx, const void *samplesBuffer,
-                          const size_t *samplesSizes, unsigned nbSamples,
-                          unsigned d, double splitPoint) {
-  const BYTE *const samples = (const BYTE *)samplesBuffer;
-  const size_t totalSamplesSize = COVER_sum(samplesSizes, nbSamples);
-  /* Split samples into testing and training sets */
-  const unsigned nbTrainSamples = splitPoint < 1.0 ? (unsigned)((double)nbSamples * splitPoint) : nbSamples;
-  const unsigned nbTestSamples = splitPoint < 1.0 ? nbSamples - nbTrainSamples : nbSamples;
-  const size_t trainingSamplesSize = splitPoint < 1.0 ? COVER_sum(samplesSizes, nbTrainSamples) : totalSamplesSize;
-  const size_t testSamplesSize = splitPoint < 1.0 ? COVER_sum(samplesSizes + nbTrainSamples, nbTestSamples) : totalSamplesSize;
-  /* Checks */
-  if (totalSamplesSize < MAX(d, sizeof(U64)) ||
-      totalSamplesSize >= (size_t)COVER_MAX_SAMPLES_SIZE) {
-    DISPLAYLEVEL(1, "Total samples size is too large (%u MB), maximum size is %u MB\n",
-                 (unsigned)(totalSamplesSize>>20), (COVER_MAX_SAMPLES_SIZE >> 20));
-    return ERROR(srcSize_wrong);
-  }
-  /* Check if there are at least 5 training samples */
-  if (nbTrainSamples < 5) {
-    DISPLAYLEVEL(1, "Total number of training samples is %u and is invalid.", nbTrainSamples);
-    return ERROR(srcSize_wrong);
-  }
-  /* Check if there's testing sample */
-  if (nbTestSamples < 1) {
-    DISPLAYLEVEL(1, "Total number of testing samples is %u and is invalid.", nbTestSamples);
-    return ERROR(srcSize_wrong);
-  }
-  /* Zero the context */
-  memset(ctx, 0, sizeof(*ctx));
-  DISPLAYLEVEL(2, "Training on %u samples of total size %u\n", nbTrainSamples,
-               (unsigned)trainingSamplesSize);
-  DISPLAYLEVEL(2, "Testing on %u samples of total size %u\n", nbTestSamples,
-               (unsigned)testSamplesSize);
-  ctx->samples = samples;
-  ctx->samplesSizes = samplesSizes;
-  ctx->nbSamples = nbSamples;
-  ctx->nbTrainSamples = nbTrainSamples;
-  ctx->nbTestSamples = nbTestSamples;
-  /* Partial suffix array */
-  ctx->suffixSize = trainingSamplesSize - MAX(d, sizeof(U64)) + 1;
-  ctx->suffix = (U32 *)malloc(ctx->suffixSize * sizeof(U32));
-  /* Maps index to the dmerID */
-  ctx->dmerAt = (U32 *)malloc(ctx->suffixSize * sizeof(U32));
-  /* The offsets of each file */
-  ctx->offsets = (size_t *)malloc((nbSamples + 1) * sizeof(size_t));
-  if (!ctx->suffix || !ctx->dmerAt || !ctx->offsets) {
-    DISPLAYLEVEL(1, "Failed to allocate scratch buffers\n");
-    COVER_ctx_destroy(ctx);
-    return ERROR(memory_allocation);
-  }
-  ctx->freqs = NULL;
-  ctx->d = d;
-
-  /* Fill offsets from the samplesSizes */
-  {
-    U32 i;
-    ctx->offsets[0] = 0;
-    for (i = 1; i <= nbSamples; ++i) {
-      ctx->offsets[i] = ctx->offsets[i - 1] + samplesSizes[i - 1];
-    }
-  }
-  DISPLAYLEVEL(2, "Constructing partial suffix array\n");
-  {
-    /* suffix is a partial suffix array.
-     * It only sorts suffixes by their first parameters.d bytes.
-     * The sort is stable, so each dmer group is sorted by position in input.
-     */
-    U32 i;
-    for (i = 0; i < ctx->suffixSize; ++i) {
-      ctx->suffix[i] = i;
-    }
-    /* qsort doesn't take an opaque pointer, so pass as a global.
-     * On OpenBSD qsort() is not guaranteed to be stable, their mergesort() is.
-     */
-    g_ctx = ctx;
-#if defined(__OpenBSD__)
-    mergesort(ctx->suffix, ctx->suffixSize, sizeof(U32),
-          (ctx->d <= 8 ? &COVER_strict_cmp8 : &COVER_strict_cmp));
-#else
-    qsort(ctx->suffix, ctx->suffixSize, sizeof(U32),
-          (ctx->d <= 8 ? &COVER_strict_cmp8 : &COVER_strict_cmp));
-#endif
-  }
-  DISPLAYLEVEL(2, "Computing frequencies\n");
-  /* For each dmer group (group of positions with the same first d bytes):
-   * 1. For each position we set dmerAt[position] = dmerID.  The dmerID is
-   *    (groupBeginPtr - suffix).  This allows us to go from position to
-   *    dmerID so we can look up values in freq.
-   * 2. We calculate how many samples the dmer occurs in and save it in
-   *    freqs[dmerId].
-   */
-  COVER_groupBy(ctx->suffix, ctx->suffixSize, sizeof(U32), ctx,
-                (ctx->d <= 8 ? &COVER_cmp8 : &COVER_cmp), &COVER_group);
-  ctx->freqs = ctx->suffix;
-  ctx->suffix = NULL;
-  return 0;
-}
-
-void COVER_warnOnSmallCorpus(size_t maxDictSize, size_t nbDmers, int displayLevel)
-{
-  const double ratio = (double)nbDmers / maxDictSize;
-  if (ratio >= 10) {
-      return;
-  }
-  LOCALDISPLAYLEVEL(displayLevel, 1,
-                    "WARNING: The maximum dictionary size %u is too large "
-                    "compared to the source size %u! "
-                    "size(source)/size(dictionary) = %f, but it should be >= "
-                    "10! This may lead to a subpar dictionary! We recommend "
-                    "training on sources at least 10x, and up to 100x the "
-                    "size of the dictionary!\n", (U32)maxDictSize,
-                    (U32)nbDmers, ratio);
-}
-
-COVER_epoch_info_t COVER_computeEpochs(U32 maxDictSize,
-                                       U32 nbDmers, U32 k, U32 passes)
-{
-  const U32 minEpochSize = k * 10;
-  COVER_epoch_info_t epochs;
-  epochs.num = MAX(1, maxDictSize / k / passes);
-  epochs.size = nbDmers / epochs.num;
-  if (epochs.size >= minEpochSize) {
-      assert(epochs.size * epochs.num <= nbDmers);
-      return epochs;
-  }
-  epochs.size = MIN(minEpochSize, nbDmers);
-  epochs.num = nbDmers / epochs.size;
-  assert(epochs.size * epochs.num <= nbDmers);
-  return epochs;
-}
-
-/**
- * Given the prepared context build the dictionary.
- */
-static size_t COVER_buildDictionary(const COVER_ctx_t *ctx, U32 *freqs,
-                                    COVER_map_t *activeDmers, void *dictBuffer,
-                                    size_t dictBufferCapacity,
-                                    ZDICT_cover_params_t parameters) {
-  BYTE *const dict = (BYTE *)dictBuffer;
-  size_t tail = dictBufferCapacity;
-  /* Divide the data into epochs. We will select one segment from each epoch. */
-  const COVER_epoch_info_t epochs = COVER_computeEpochs(
-      (U32)dictBufferCapacity, (U32)ctx->suffixSize, parameters.k, 4);
-  const size_t maxZeroScoreRun = MAX(10, MIN(100, epochs.num >> 3));
-  size_t zeroScoreRun = 0;
-  size_t epoch;
-  DISPLAYLEVEL(2, "Breaking content into %u epochs of size %u\n",
-                (U32)epochs.num, (U32)epochs.size);
-  /* Loop through the epochs until there are no more segments or the dictionary
-   * is full.
-   */
-  for (epoch = 0; tail > 0; epoch = (epoch + 1) % epochs.num) {
-    const U32 epochBegin = (U32)(epoch * epochs.size);
-    const U32 epochEnd = epochBegin + epochs.size;
-    size_t segmentSize;
-    /* Select a segment */
-    COVER_segment_t segment = COVER_selectSegment(
-        ctx, freqs, activeDmers, epochBegin, epochEnd, parameters);
-    /* If the segment covers no dmers, then we are out of content.
-     * There may be new content in other epochs, for continue for some time.
-     */
-    if (segment.score == 0) {
-      if (++zeroScoreRun >= maxZeroScoreRun) {
-          break;
-      }
-      continue;
-    }
-    zeroScoreRun = 0;
-    /* Trim the segment if necessary and if it is too small then we are done */
-    segmentSize = MIN(segment.end - segment.begin + parameters.d - 1, tail);
-    if (segmentSize < parameters.d) {
-      break;
-    }
-    /* We fill the dictionary from the back to allow the best segments to be
-     * referenced with the smallest offsets.
-     */
-    tail -= segmentSize;
-    memcpy(dict + tail, ctx->samples + segment.begin, segmentSize);
-    DISPLAYUPDATE(
-        2, "\r%u%%       ",
-        (unsigned)(((dictBufferCapacity - tail) * 100) / dictBufferCapacity));
-  }
-  DISPLAYLEVEL(2, "\r%79s\r", "");
-  return tail;
-}
-
-ZDICTLIB_API size_t ZDICT_trainFromBuffer_cover(
-    void *dictBuffer, size_t dictBufferCapacity,
-    const void *samplesBuffer, const size_t *samplesSizes, unsigned nbSamples,
-    ZDICT_cover_params_t parameters)
-{
-  BYTE* const dict = (BYTE*)dictBuffer;
-  COVER_ctx_t ctx;
-  COVER_map_t activeDmers;
-  parameters.splitPoint = 1.0;
-  /* Initialize global data */
-  g_displayLevel = parameters.zParams.notificationLevel;
-  /* Checks */
-  if (!COVER_checkParameters(parameters, dictBufferCapacity)) {
-    DISPLAYLEVEL(1, "Cover parameters incorrect\n");
-    return ERROR(parameter_outOfBound);
-  }
-  if (nbSamples == 0) {
-    DISPLAYLEVEL(1, "Cover must have at least one input file\n");
-    return ERROR(srcSize_wrong);
-  }
-  if (dictBufferCapacity < ZDICT_DICTSIZE_MIN) {
-    DISPLAYLEVEL(1, "dictBufferCapacity must be at least %u\n",
-                 ZDICT_DICTSIZE_MIN);
-    return ERROR(dstSize_tooSmall);
-  }
-  /* Initialize context and activeDmers */
-  {
-    size_t const initVal = COVER_ctx_init(&ctx, samplesBuffer, samplesSizes, nbSamples,
-                      parameters.d, parameters.splitPoint);
-    if (ZSTD_isError(initVal)) {
-      return initVal;
-    }
-  }
-  COVER_warnOnSmallCorpus(dictBufferCapacity, ctx.suffixSize, g_displayLevel);
-  if (!COVER_map_init(&activeDmers, parameters.k - parameters.d + 1)) {
-    DISPLAYLEVEL(1, "Failed to allocate dmer map: out of memory\n");
-    COVER_ctx_destroy(&ctx);
-    return ERROR(memory_allocation);
-  }
-
-  DISPLAYLEVEL(2, "Building dictionary\n");
-  {
-    const size_t tail =
-        COVER_buildDictionary(&ctx, ctx.freqs, &activeDmers, dictBuffer,
-                              dictBufferCapacity, parameters);
-    const size_t dictionarySize = ZDICT_finalizeDictionary(
-        dict, dictBufferCapacity, dict + tail, dictBufferCapacity - tail,
-        samplesBuffer, samplesSizes, nbSamples, parameters.zParams);
-    if (!ZSTD_isError(dictionarySize)) {
-      DISPLAYLEVEL(2, "Constructed dictionary of size %u\n",
-                   (unsigned)dictionarySize);
-    }
-    COVER_ctx_destroy(&ctx);
-    COVER_map_destroy(&activeDmers);
-    return dictionarySize;
-  }
-}
-
-
-
-size_t COVER_checkTotalCompressedSize(const ZDICT_cover_params_t parameters,
-                                    const size_t *samplesSizes, const BYTE *samples,
-                                    size_t *offsets,
-                                    size_t nbTrainSamples, size_t nbSamples,
-                                    BYTE *const dict, size_t dictBufferCapacity) {
-  size_t totalCompressedSize = ERROR(GENERIC);
-  /* Pointers */
-  ZSTD_CCtx *cctx;
-  ZSTD_CDict *cdict;
-  void *dst;
-  /* Local variables */
-  size_t dstCapacity;
-  size_t i;
-  /* Allocate dst with enough space to compress the maximum sized sample */
-  {
-    size_t maxSampleSize = 0;
-    i = parameters.splitPoint < 1.0 ? nbTrainSamples : 0;
-    for (; i < nbSamples; ++i) {
-      maxSampleSize = MAX(samplesSizes[i], maxSampleSize);
-    }
-    dstCapacity = ZSTD_compressBound(maxSampleSize);
-    dst = malloc(dstCapacity);
-  }
-  /* Create the cctx and cdict */
-  cctx = ZSTD_createCCtx();
-  cdict = ZSTD_createCDict(dict, dictBufferCapacity,
-                           parameters.zParams.compressionLevel);
-  if (!dst || !cctx || !cdict) {
-    goto _compressCleanup;
-  }
-  /* Compress each sample and sum their sizes (or error) */
-  totalCompressedSize = dictBufferCapacity;
-  i = parameters.splitPoint < 1.0 ? nbTrainSamples : 0;
-  for (; i < nbSamples; ++i) {
-    const size_t size = ZSTD_compress_usingCDict(
-        cctx, dst, dstCapacity, samples + offsets[i],
-        samplesSizes[i], cdict);
-    if (ZSTD_isError(size)) {
-      totalCompressedSize = size;
-      goto _compressCleanup;
-    }
-    totalCompressedSize += size;
-  }
-_compressCleanup:
-  ZSTD_freeCCtx(cctx);
-  ZSTD_freeCDict(cdict);
-  if (dst) {
-    free(dst);
-  }
-  return totalCompressedSize;
-}
-
-
-/**
- * Initialize the `COVER_best_t`.
- */
-void COVER_best_init(COVER_best_t *best) {
-  if (best==NULL) return; /* compatible with init on NULL */
-  (void)ZSTD_pthread_mutex_init(&best->mutex, NULL);
-  (void)ZSTD_pthread_cond_init(&best->cond, NULL);
-  best->liveJobs = 0;
-  best->dict = NULL;
-  best->dictSize = 0;
-  best->compressedSize = (size_t)-1;
-  memset(&best->parameters, 0, sizeof(best->parameters));
-}
-
-/**
- * Wait until liveJobs == 0.
- */
-void COVER_best_wait(COVER_best_t *best) {
-  if (!best) {
-    return;
-  }
-  ZSTD_pthread_mutex_lock(&best->mutex);
-  while (best->liveJobs != 0) {
-    ZSTD_pthread_cond_wait(&best->cond, &best->mutex);
-  }
-  ZSTD_pthread_mutex_unlock(&best->mutex);
-}
-
-/**
- * Call COVER_best_wait() and then destroy the COVER_best_t.
- */
-void COVER_best_destroy(COVER_best_t *best) {
-  if (!best) {
-    return;
-  }
-  COVER_best_wait(best);
-  if (best->dict) {
-    free(best->dict);
-  }
-  ZSTD_pthread_mutex_destroy(&best->mutex);
-  ZSTD_pthread_cond_destroy(&best->cond);
-}
-
-/**
- * Called when a thread is about to be launched.
- * Increments liveJobs.
- */
-void COVER_best_start(COVER_best_t *best) {
-  if (!best) {
-    return;
-  }
-  ZSTD_pthread_mutex_lock(&best->mutex);
-  ++best->liveJobs;
-  ZSTD_pthread_mutex_unlock(&best->mutex);
-}
-
-/**
- * Called when a thread finishes executing, both on error or success.
- * Decrements liveJobs and signals any waiting threads if liveJobs == 0.
- * If this dictionary is the best so far save it and its parameters.
- */
-void COVER_best_finish(COVER_best_t *best, ZDICT_cover_params_t parameters,
-                              COVER_dictSelection_t selection) {
-  void* dict = selection.dictContent;
-  size_t compressedSize = selection.totalCompressedSize;
-  size_t dictSize = selection.dictSize;
-  if (!best) {
-    return;
-  }
-  {
-    size_t liveJobs;
-    ZSTD_pthread_mutex_lock(&best->mutex);
-    --best->liveJobs;
-    liveJobs = best->liveJobs;
-    /* If the new dictionary is better */
-    if (compressedSize < best->compressedSize) {
-      /* Allocate space if necessary */
-      if (!best->dict || best->dictSize < dictSize) {
-        if (best->dict) {
-          free(best->dict);
-        }
-        best->dict = malloc(dictSize);
-        if (!best->dict) {
-          best->compressedSize = ERROR(GENERIC);
-          best->dictSize = 0;
-          ZSTD_pthread_cond_signal(&best->cond);
-          ZSTD_pthread_mutex_unlock(&best->mutex);
-          return;
-        }
-      }
-      /* Save the dictionary, parameters, and size */
-      if (!dict) {
-        return;
-      }
-      memcpy(best->dict, dict, dictSize);
-      best->dictSize = dictSize;
-      best->parameters = parameters;
-      best->compressedSize = compressedSize;
-    }
-    if (liveJobs == 0) {
-      ZSTD_pthread_cond_broadcast(&best->cond);
-    }
-    ZSTD_pthread_mutex_unlock(&best->mutex);
-  }
-}
-
-COVER_dictSelection_t COVER_dictSelectionError(size_t error) {
-    COVER_dictSelection_t selection = { NULL, 0, error };
-    return selection;
-}
-
-unsigned COVER_dictSelectionIsError(COVER_dictSelection_t selection) {
-  return (ZSTD_isError(selection.totalCompressedSize) || !selection.dictContent);
-}
-
-void COVER_dictSelectionFree(COVER_dictSelection_t selection){
-  free(selection.dictContent);
-}
-
-COVER_dictSelection_t COVER_selectDict(BYTE* customDictContent,
-        size_t dictContentSize, const BYTE* samplesBuffer, const size_t* samplesSizes, unsigned nbFinalizeSamples,
-        size_t nbCheckSamples, size_t nbSamples, ZDICT_cover_params_t params, size_t* offsets, size_t totalCompressedSize) {
-
-  size_t largestDict = 0;
-  size_t largestCompressed = 0;
-  BYTE* customDictContentEnd = customDictContent + dictContentSize;
-
-  BYTE * largestDictbuffer = (BYTE *)malloc(dictContentSize);
-  BYTE * candidateDictBuffer = (BYTE *)malloc(dictContentSize);
-  double regressionTolerance = ((double)params.shrinkDictMaxRegression / 100.0) + 1.00;
-
-  if (!largestDictbuffer || !candidateDictBuffer) {
-    free(largestDictbuffer);
-    free(candidateDictBuffer);
-    return COVER_dictSelectionError(dictContentSize);
-  }
-
-  /* Initial dictionary size and compressed size */
-  memcpy(largestDictbuffer, customDictContent, dictContentSize);
-  dictContentSize = ZDICT_finalizeDictionary(
-    largestDictbuffer, dictContentSize, customDictContent, dictContentSize,
-    samplesBuffer, samplesSizes, nbFinalizeSamples, params.zParams);
-
-  if (ZDICT_isError(dictContentSize)) {
-    free(largestDictbuffer);
-    free(candidateDictBuffer);
-    return COVER_dictSelectionError(dictContentSize);
-  }
-
-  totalCompressedSize = COVER_checkTotalCompressedSize(params, samplesSizes,
-                                                       samplesBuffer, offsets,
-                                                       nbCheckSamples, nbSamples,
-                                                       largestDictbuffer, dictContentSize);
-
-  if (ZSTD_isError(totalCompressedSize)) {
-    free(largestDictbuffer);
-    free(candidateDictBuffer);
-    return COVER_dictSelectionError(totalCompressedSize);
-  }
-
-  if (params.shrinkDict == 0) {
-    COVER_dictSelection_t selection = { largestDictbuffer, dictContentSize, totalCompressedSize };
-    free(candidateDictBuffer);
-    return selection;
-  }
-
-  largestDict = dictContentSize;
-  largestCompressed = totalCompressedSize;
-  dictContentSize = ZDICT_DICTSIZE_MIN;
-
-  /* Largest dict is initially at least ZDICT_DICTSIZE_MIN */
-  while (dictContentSize < largestDict) {
-    memcpy(candidateDictBuffer, largestDictbuffer, largestDict);
-    dictContentSize = ZDICT_finalizeDictionary(
-      candidateDictBuffer, dictContentSize, customDictContentEnd - dictContentSize, dictContentSize,
-      samplesBuffer, samplesSizes, nbFinalizeSamples, params.zParams);
-
-    if (ZDICT_isError(dictContentSize)) {
-      free(largestDictbuffer);
-      free(candidateDictBuffer);
-      return COVER_dictSelectionError(dictContentSize);
-
-    }
-
-    totalCompressedSize = COVER_checkTotalCompressedSize(params, samplesSizes,
-                                                         samplesBuffer, offsets,
-                                                         nbCheckSamples, nbSamples,
-                                                         candidateDictBuffer, dictContentSize);
-
-    if (ZSTD_isError(totalCompressedSize)) {
-      free(largestDictbuffer);
-      free(candidateDictBuffer);
-      return COVER_dictSelectionError(totalCompressedSize);
-    }
-
-    if (totalCompressedSize <= largestCompressed * regressionTolerance) {
-      COVER_dictSelection_t selection = { candidateDictBuffer, dictContentSize, totalCompressedSize };
-      free(largestDictbuffer);
-      return selection;
-    }
-    dictContentSize *= 2;
-  }
-  dictContentSize = largestDict;
-  totalCompressedSize = largestCompressed;
-  {
-    COVER_dictSelection_t selection = { largestDictbuffer, dictContentSize, totalCompressedSize };
-    free(candidateDictBuffer);
-    return selection;
-  }
-}
-
-/**
- * Parameters for COVER_tryParameters().
- */
-typedef struct COVER_tryParameters_data_s {
-  const COVER_ctx_t *ctx;
-  COVER_best_t *best;
-  size_t dictBufferCapacity;
-  ZDICT_cover_params_t parameters;
-} COVER_tryParameters_data_t;
-
-/**
- * Tries a set of parameters and updates the COVER_best_t with the results.
- * This function is thread safe if zstd is compiled with multithreaded support.
- * It takes its parameters as an *OWNING* opaque pointer to support threading.
- */
-static void COVER_tryParameters(void *opaque) {
-  /* Save parameters as local variables */
-  COVER_tryParameters_data_t *const data = (COVER_tryParameters_data_t *)opaque;
-  const COVER_ctx_t *const ctx = data->ctx;
-  const ZDICT_cover_params_t parameters = data->parameters;
-  size_t dictBufferCapacity = data->dictBufferCapacity;
-  size_t totalCompressedSize = ERROR(GENERIC);
-  /* Allocate space for hash table, dict, and freqs */
-  COVER_map_t activeDmers;
-  BYTE *const dict = (BYTE * const)malloc(dictBufferCapacity);
-  COVER_dictSelection_t selection = COVER_dictSelectionError(ERROR(GENERIC));
-  U32 *freqs = (U32 *)malloc(ctx->suffixSize * sizeof(U32));
-  if (!COVER_map_init(&activeDmers, parameters.k - parameters.d + 1)) {
-    DISPLAYLEVEL(1, "Failed to allocate dmer map: out of memory\n");
-    goto _cleanup;
-  }
-  if (!dict || !freqs) {
-    DISPLAYLEVEL(1, "Failed to allocate buffers: out of memory\n");
-    goto _cleanup;
-  }
-  /* Copy the frequencies because we need to modify them */
-  memcpy(freqs, ctx->freqs, ctx->suffixSize * sizeof(U32));
-  /* Build the dictionary */
-  {
-    const size_t tail = COVER_buildDictionary(ctx, freqs, &activeDmers, dict,
-                                              dictBufferCapacity, parameters);
-    selection = COVER_selectDict(dict + tail, dictBufferCapacity - tail,
-        ctx->samples, ctx->samplesSizes, (unsigned)ctx->nbTrainSamples, ctx->nbTrainSamples, ctx->nbSamples, parameters, ctx->offsets,
-        totalCompressedSize);
-
-    if (COVER_dictSelectionIsError(selection)) {
-      DISPLAYLEVEL(1, "Failed to select dictionary\n");
-      goto _cleanup;
-    }
-  }
-_cleanup:
-  free(dict);
-  COVER_best_finish(data->best, parameters, selection);
-  free(data);
-  COVER_map_destroy(&activeDmers);
-  COVER_dictSelectionFree(selection);
-  if (freqs) {
-    free(freqs);
-  }
-}
-
-ZDICTLIB_API size_t ZDICT_optimizeTrainFromBuffer_cover(
-    void *dictBuffer, size_t dictBufferCapacity, const void *samplesBuffer,
-    const size_t *samplesSizes, unsigned nbSamples,
-    ZDICT_cover_params_t *parameters) {
-  /* constants */
-  const unsigned nbThreads = parameters->nbThreads;
-  const double splitPoint =
-      parameters->splitPoint <= 0.0 ? DEFAULT_SPLITPOINT : parameters->splitPoint;
-  const unsigned kMinD = parameters->d == 0 ? 6 : parameters->d;
-  const unsigned kMaxD = parameters->d == 0 ? 8 : parameters->d;
-  const unsigned kMinK = parameters->k == 0 ? 50 : parameters->k;
-  const unsigned kMaxK = parameters->k == 0 ? 2000 : parameters->k;
-  const unsigned kSteps = parameters->steps == 0 ? 40 : parameters->steps;
-  const unsigned kStepSize = MAX((kMaxK - kMinK) / kSteps, 1);
-  const unsigned kIterations =
-      (1 + (kMaxD - kMinD) / 2) * (1 + (kMaxK - kMinK) / kStepSize);
-  const unsigned shrinkDict = 0;
-  /* Local variables */
-  const int displayLevel = parameters->zParams.notificationLevel;
-  unsigned iteration = 1;
-  unsigned d;
-  unsigned k;
-  COVER_best_t best;
-  POOL_ctx *pool = NULL;
-  int warned = 0;
-
-  /* Checks */
-  if (splitPoint <= 0 || splitPoint > 1) {
-    LOCALDISPLAYLEVEL(displayLevel, 1, "Incorrect parameters\n");
-    return ERROR(parameter_outOfBound);
-  }
-  if (kMinK < kMaxD || kMaxK < kMinK) {
-    LOCALDISPLAYLEVEL(displayLevel, 1, "Incorrect parameters\n");
-    return ERROR(parameter_outOfBound);
-  }
-  if (nbSamples == 0) {
-    DISPLAYLEVEL(1, "Cover must have at least one input file\n");
-    return ERROR(srcSize_wrong);
-  }
-  if (dictBufferCapacity < ZDICT_DICTSIZE_MIN) {
-    DISPLAYLEVEL(1, "dictBufferCapacity must be at least %u\n",
-                 ZDICT_DICTSIZE_MIN);
-    return ERROR(dstSize_tooSmall);
-  }
-  if (nbThreads > 1) {
-    pool = POOL_create(nbThreads, 1);
-    if (!pool) {
-      return ERROR(memory_allocation);
-    }
-  }
-  /* Initialization */
-  COVER_best_init(&best);
-  /* Turn down global display level to clean up display at level 2 and below */
-  g_displayLevel = displayLevel == 0 ? 0 : displayLevel - 1;
-  /* Loop through d first because each new value needs a new context */
-  LOCALDISPLAYLEVEL(displayLevel, 2, "Trying %u different sets of parameters\n",
-                    kIterations);
-  for (d = kMinD; d <= kMaxD; d += 2) {
-    /* Initialize the context for this value of d */
-    COVER_ctx_t ctx;
-    LOCALDISPLAYLEVEL(displayLevel, 3, "d=%u\n", d);
-    {
-      const size_t initVal = COVER_ctx_init(&ctx, samplesBuffer, samplesSizes, nbSamples, d, splitPoint);
-      if (ZSTD_isError(initVal)) {
-        LOCALDISPLAYLEVEL(displayLevel, 1, "Failed to initialize context\n");
-        COVER_best_destroy(&best);
-        POOL_free(pool);
-        return initVal;
-      }
-    }
-    if (!warned) {
-      COVER_warnOnSmallCorpus(dictBufferCapacity, ctx.suffixSize, displayLevel);
-      warned = 1;
-    }
-    /* Loop through k reusing the same context */
-    for (k = kMinK; k <= kMaxK; k += kStepSize) {
-      /* Prepare the arguments */
-      COVER_tryParameters_data_t *data = (COVER_tryParameters_data_t *)malloc(
-          sizeof(COVER_tryParameters_data_t));
-      LOCALDISPLAYLEVEL(displayLevel, 3, "k=%u\n", k);
-      if (!data) {
-        LOCALDISPLAYLEVEL(displayLevel, 1, "Failed to allocate parameters\n");
-        COVER_best_destroy(&best);
-        COVER_ctx_destroy(&ctx);
-        POOL_free(pool);
-        return ERROR(memory_allocation);
-      }
-      data->ctx = &ctx;
-      data->best = &best;
-      data->dictBufferCapacity = dictBufferCapacity;
-      data->parameters = *parameters;
-      data->parameters.k = k;
-      data->parameters.d = d;
-      data->parameters.splitPoint = splitPoint;
-      data->parameters.steps = kSteps;
-      data->parameters.shrinkDict = shrinkDict;
-      data->parameters.zParams.notificationLevel = g_displayLevel;
-      /* Check the parameters */
-      if (!COVER_checkParameters(data->parameters, dictBufferCapacity)) {
-        DISPLAYLEVEL(1, "Cover parameters incorrect\n");
-        free(data);
-        continue;
-      }
-      /* Call the function and pass ownership of data to it */
-      COVER_best_start(&best);
-      if (pool) {
-        POOL_add(pool, &COVER_tryParameters, data);
-      } else {
-        COVER_tryParameters(data);
-      }
-      /* Print status */
-      LOCALDISPLAYUPDATE(displayLevel, 2, "\r%u%%       ",
-                         (unsigned)((iteration * 100) / kIterations));
-      ++iteration;
-    }
-    COVER_best_wait(&best);
-    COVER_ctx_destroy(&ctx);
-  }
-  LOCALDISPLAYLEVEL(displayLevel, 2, "\r%79s\r", "");
-  /* Fill the output buffer and parameters with output of the best parameters */
-  {
-    const size_t dictSize = best.dictSize;
-    if (ZSTD_isError(best.compressedSize)) {
-      const size_t compressedSize = best.compressedSize;
-      COVER_best_destroy(&best);
-      POOL_free(pool);
-      return compressedSize;
-    }
-    *parameters = best.parameters;
-    memcpy(dictBuffer, best.dict, dictSize);
-    COVER_best_destroy(&best);
-    POOL_free(pool);
-    return dictSize;
-  }
-}
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/dictBuilder/cover.h mysql-8.0-8.0.27/extra/zstd/lib/dictBuilder/cover.h
--- mysql-8.0-8.0.26/extra/zstd/lib/dictBuilder/cover.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/dictBuilder/cover.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,147 +0,0 @@
-#include <stdio.h>  /* fprintf */
-#include <stdlib.h> /* malloc, free, qsort */
-#include <string.h> /* memset */
-#include <time.h>   /* clock */
-#include "mem.h" /* read */
-#include "pool.h"
-#include "threading.h"
-#include "zstd_internal.h" /* includes zstd.h */
-#ifndef ZDICT_STATIC_LINKING_ONLY
-#define ZDICT_STATIC_LINKING_ONLY
-#endif
-#include "zdict.h"
-
-/**
- * COVER_best_t is used for two purposes:
- * 1. Synchronizing threads.
- * 2. Saving the best parameters and dictionary.
- *
- * All of the methods except COVER_best_init() are thread safe if zstd is
- * compiled with multithreaded support.
- */
-typedef struct COVER_best_s {
-  ZSTD_pthread_mutex_t mutex;
-  ZSTD_pthread_cond_t cond;
-  size_t liveJobs;
-  void *dict;
-  size_t dictSize;
-  ZDICT_cover_params_t parameters;
-  size_t compressedSize;
-} COVER_best_t;
-
-/**
- * A segment is a range in the source as well as the score of the segment.
- */
-typedef struct {
-  U32 begin;
-  U32 end;
-  U32 score;
-} COVER_segment_t;
-
-/**
- *Number of epochs and size of each epoch.
- */
-typedef struct {
-  U32 num;
-  U32 size;
-} COVER_epoch_info_t;
-
-/**
- * Struct used for the dictionary selection function.
- */
-typedef struct COVER_dictSelection {
-  BYTE* dictContent;
-  size_t dictSize;
-  size_t totalCompressedSize;
-} COVER_dictSelection_t;
-
-/**
- * Computes the number of epochs and the size of each epoch.
- * We will make sure that each epoch gets at least 10 * k bytes.
- *
- * The COVER algorithms divide the data up into epochs of equal size and
- * select one segment from each epoch.
- *
- * @param maxDictSize The maximum allowed dictionary size.
- * @param nbDmers     The number of dmers we are training on.
- * @param k           The parameter k (segment size).
- * @param passes      The target number of passes over the dmer corpus.
- *                    More passes means a better dictionary.
- */
-COVER_epoch_info_t COVER_computeEpochs(U32 maxDictSize, U32 nbDmers,
-                                       U32 k, U32 passes);
-
-/**
- * Warns the user when their corpus is too small.
- */
-void COVER_warnOnSmallCorpus(size_t maxDictSize, size_t nbDmers, int displayLevel);
-
-/**
- *  Checks total compressed size of a dictionary
- */
-size_t COVER_checkTotalCompressedSize(const ZDICT_cover_params_t parameters,
-                                      const size_t *samplesSizes, const BYTE *samples,
-                                      size_t *offsets,
-                                      size_t nbTrainSamples, size_t nbSamples,
-                                      BYTE *const dict, size_t dictBufferCapacity);
-
-/**
- * Returns the sum of the sample sizes.
- */
-size_t COVER_sum(const size_t *samplesSizes, unsigned nbSamples) ;
-
-/**
- * Initialize the `COVER_best_t`.
- */
-void COVER_best_init(COVER_best_t *best);
-
-/**
- * Wait until liveJobs == 0.
- */
-void COVER_best_wait(COVER_best_t *best);
-
-/**
- * Call COVER_best_wait() and then destroy the COVER_best_t.
- */
-void COVER_best_destroy(COVER_best_t *best);
-
-/**
- * Called when a thread is about to be launched.
- * Increments liveJobs.
- */
-void COVER_best_start(COVER_best_t *best);
-
-/**
- * Called when a thread finishes executing, both on error or success.
- * Decrements liveJobs and signals any waiting threads if liveJobs == 0.
- * If this dictionary is the best so far save it and its parameters.
- */
-void COVER_best_finish(COVER_best_t *best, ZDICT_cover_params_t parameters,
-                       COVER_dictSelection_t selection);
-/**
- * Error function for COVER_selectDict function. Checks if the return
- * value is an error.
- */
-unsigned COVER_dictSelectionIsError(COVER_dictSelection_t selection);
-
- /**
-  * Error function for COVER_selectDict function. Returns a struct where
-  * return.totalCompressedSize is a ZSTD error.
-  */
-COVER_dictSelection_t COVER_dictSelectionError(size_t error);
-
-/**
- * Always call after selectDict is called to free up used memory from
- * newly created dictionary.
- */
-void COVER_dictSelectionFree(COVER_dictSelection_t selection);
-
-/**
- * Called to finalize the dictionary and select one based on whether or not
- * the shrink-dict flag was enabled. If enabled the dictionary used is the
- * smallest dictionary within a specified regression of the compressed size
- * from the largest dictionary.
- */
- COVER_dictSelection_t COVER_selectDict(BYTE* customDictContent,
-                       size_t dictContentSize, const BYTE* samplesBuffer, const size_t* samplesSizes, unsigned nbFinalizeSamples,
-                       size_t nbCheckSamples, size_t nbSamples, ZDICT_cover_params_t params, size_t* offsets, size_t totalCompressedSize);
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/dictBuilder/divsufsort.c mysql-8.0-8.0.27/extra/zstd/lib/dictBuilder/divsufsort.c
--- mysql-8.0-8.0.26/extra/zstd/lib/dictBuilder/divsufsort.c	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/dictBuilder/divsufsort.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1913 +0,0 @@
-/*
- * divsufsort.c for libdivsufsort-lite
- * Copyright (c) 2003-2008 Yuta Mori All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*- Compiler specifics -*/
-#ifdef __clang__
-#pragma clang diagnostic ignored "-Wshorten-64-to-32"
-#endif
-
-#if defined(_MSC_VER)
-#  pragma warning(disable : 4244)
-#  pragma warning(disable : 4127)    /* C4127 : Condition expression is constant */
-#endif
-
-
-/*- Dependencies -*/
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "divsufsort.h"
-
-/*- Constants -*/
-#if defined(INLINE)
-# undef INLINE
-#endif
-#if !defined(INLINE)
-# define INLINE __inline
-#endif
-#if defined(ALPHABET_SIZE) && (ALPHABET_SIZE < 1)
-# undef ALPHABET_SIZE
-#endif
-#if !defined(ALPHABET_SIZE)
-# define ALPHABET_SIZE (256)
-#endif
-#define BUCKET_A_SIZE (ALPHABET_SIZE)
-#define BUCKET_B_SIZE (ALPHABET_SIZE * ALPHABET_SIZE)
-#if defined(SS_INSERTIONSORT_THRESHOLD)
-# if SS_INSERTIONSORT_THRESHOLD < 1
-#  undef SS_INSERTIONSORT_THRESHOLD
-#  define SS_INSERTIONSORT_THRESHOLD (1)
-# endif
-#else
-# define SS_INSERTIONSORT_THRESHOLD (8)
-#endif
-#if defined(SS_BLOCKSIZE)
-# if SS_BLOCKSIZE < 0
-#  undef SS_BLOCKSIZE
-#  define SS_BLOCKSIZE (0)
-# elif 32768 <= SS_BLOCKSIZE
-#  undef SS_BLOCKSIZE
-#  define SS_BLOCKSIZE (32767)
-# endif
-#else
-# define SS_BLOCKSIZE (1024)
-#endif
-/* minstacksize = log(SS_BLOCKSIZE) / log(3) * 2 */
-#if SS_BLOCKSIZE == 0
-# define SS_MISORT_STACKSIZE (96)
-#elif SS_BLOCKSIZE <= 4096
-# define SS_MISORT_STACKSIZE (16)
-#else
-# define SS_MISORT_STACKSIZE (24)
-#endif
-#define SS_SMERGE_STACKSIZE (32)
-#define TR_INSERTIONSORT_THRESHOLD (8)
-#define TR_STACKSIZE (64)
-
-
-/*- Macros -*/
-#ifndef SWAP
-# define SWAP(_a, _b) do { t = (_a); (_a) = (_b); (_b) = t; } while(0)
-#endif /* SWAP */
-#ifndef MIN
-# define MIN(_a, _b) (((_a) < (_b)) ? (_a) : (_b))
-#endif /* MIN */
-#ifndef MAX
-# define MAX(_a, _b) (((_a) > (_b)) ? (_a) : (_b))
-#endif /* MAX */
-#define STACK_PUSH(_a, _b, _c, _d)\
-  do {\
-    assert(ssize < STACK_SIZE);\
-    stack[ssize].a = (_a), stack[ssize].b = (_b),\
-    stack[ssize].c = (_c), stack[ssize++].d = (_d);\
-  } while(0)
-#define STACK_PUSH5(_a, _b, _c, _d, _e)\
-  do {\
-    assert(ssize < STACK_SIZE);\
-    stack[ssize].a = (_a), stack[ssize].b = (_b),\
-    stack[ssize].c = (_c), stack[ssize].d = (_d), stack[ssize++].e = (_e);\
-  } while(0)
-#define STACK_POP(_a, _b, _c, _d)\
-  do {\
-    assert(0 <= ssize);\
-    if(ssize == 0) { return; }\
-    (_a) = stack[--ssize].a, (_b) = stack[ssize].b,\
-    (_c) = stack[ssize].c, (_d) = stack[ssize].d;\
-  } while(0)
-#define STACK_POP5(_a, _b, _c, _d, _e)\
-  do {\
-    assert(0 <= ssize);\
-    if(ssize == 0) { return; }\
-    (_a) = stack[--ssize].a, (_b) = stack[ssize].b,\
-    (_c) = stack[ssize].c, (_d) = stack[ssize].d, (_e) = stack[ssize].e;\
-  } while(0)
-#define BUCKET_A(_c0) bucket_A[(_c0)]
-#if ALPHABET_SIZE == 256
-#define BUCKET_B(_c0, _c1) (bucket_B[((_c1) << 8) | (_c0)])
-#define BUCKET_BSTAR(_c0, _c1) (bucket_B[((_c0) << 8) | (_c1)])
-#else
-#define BUCKET_B(_c0, _c1) (bucket_B[(_c1) * ALPHABET_SIZE + (_c0)])
-#define BUCKET_BSTAR(_c0, _c1) (bucket_B[(_c0) * ALPHABET_SIZE + (_c1)])
-#endif
-
-
-/*- Private Functions -*/
-
-static const int lg_table[256]= {
- -1,0,1,1,2,2,2,2,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
-  5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
-  6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
-  6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
-  7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
-  7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
-  7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
-  7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7
-};
-
-#if (SS_BLOCKSIZE == 0) || (SS_INSERTIONSORT_THRESHOLD < SS_BLOCKSIZE)
-
-static INLINE
-int
-ss_ilg(int n) {
-#if SS_BLOCKSIZE == 0
-  return (n & 0xffff0000) ?
-          ((n & 0xff000000) ?
-            24 + lg_table[(n >> 24) & 0xff] :
-            16 + lg_table[(n >> 16) & 0xff]) :
-          ((n & 0x0000ff00) ?
-             8 + lg_table[(n >>  8) & 0xff] :
-             0 + lg_table[(n >>  0) & 0xff]);
-#elif SS_BLOCKSIZE < 256
-  return lg_table[n];
-#else
-  return (n & 0xff00) ?
-          8 + lg_table[(n >> 8) & 0xff] :
-          0 + lg_table[(n >> 0) & 0xff];
-#endif
-}
-
-#endif /* (SS_BLOCKSIZE == 0) || (SS_INSERTIONSORT_THRESHOLD < SS_BLOCKSIZE) */
-
-#if SS_BLOCKSIZE != 0
-
-static const int sqq_table[256] = {
-  0,  16,  22,  27,  32,  35,  39,  42,  45,  48,  50,  53,  55,  57,  59,  61,
- 64,  65,  67,  69,  71,  73,  75,  76,  78,  80,  81,  83,  84,  86,  87,  89,
- 90,  91,  93,  94,  96,  97,  98,  99, 101, 102, 103, 104, 106, 107, 108, 109,
-110, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
-128, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
-143, 144, 144, 145, 146, 147, 148, 149, 150, 150, 151, 152, 153, 154, 155, 155,
-156, 157, 158, 159, 160, 160, 161, 162, 163, 163, 164, 165, 166, 167, 167, 168,
-169, 170, 170, 171, 172, 173, 173, 174, 175, 176, 176, 177, 178, 178, 179, 180,
-181, 181, 182, 183, 183, 184, 185, 185, 186, 187, 187, 188, 189, 189, 190, 191,
-192, 192, 193, 193, 194, 195, 195, 196, 197, 197, 198, 199, 199, 200, 201, 201,
-202, 203, 203, 204, 204, 205, 206, 206, 207, 208, 208, 209, 209, 210, 211, 211,
-212, 212, 213, 214, 214, 215, 215, 216, 217, 217, 218, 218, 219, 219, 220, 221,
-221, 222, 222, 223, 224, 224, 225, 225, 226, 226, 227, 227, 228, 229, 229, 230,
-230, 231, 231, 232, 232, 233, 234, 234, 235, 235, 236, 236, 237, 237, 238, 238,
-239, 240, 240, 241, 241, 242, 242, 243, 243, 244, 244, 245, 245, 246, 246, 247,
-247, 248, 248, 249, 249, 250, 250, 251, 251, 252, 252, 253, 253, 254, 254, 255
-};
-
-static INLINE
-int
-ss_isqrt(int x) {
-  int y, e;
-
-  if(x >= (SS_BLOCKSIZE * SS_BLOCKSIZE)) { return SS_BLOCKSIZE; }
-  e = (x & 0xffff0000) ?
-        ((x & 0xff000000) ?
-          24 + lg_table[(x >> 24) & 0xff] :
-          16 + lg_table[(x >> 16) & 0xff]) :
-        ((x & 0x0000ff00) ?
-           8 + lg_table[(x >>  8) & 0xff] :
-           0 + lg_table[(x >>  0) & 0xff]);
-
-  if(e >= 16) {
-    y = sqq_table[x >> ((e - 6) - (e & 1))] << ((e >> 1) - 7);
-    if(e >= 24) { y = (y + 1 + x / y) >> 1; }
-    y = (y + 1 + x / y) >> 1;
-  } else if(e >= 8) {
-    y = (sqq_table[x >> ((e - 6) - (e & 1))] >> (7 - (e >> 1))) + 1;
-  } else {
-    return sqq_table[x] >> 4;
-  }
-
-  return (x < (y * y)) ? y - 1 : y;
-}
-
-#endif /* SS_BLOCKSIZE != 0 */
-
-
-/*---------------------------------------------------------------------------*/
-
-/* Compares two suffixes. */
-static INLINE
-int
-ss_compare(const unsigned char *T,
-           const int *p1, const int *p2,
-           int depth) {
-  const unsigned char *U1, *U2, *U1n, *U2n;
-
-  for(U1 = T + depth + *p1,
-      U2 = T + depth + *p2,
-      U1n = T + *(p1 + 1) + 2,
-      U2n = T + *(p2 + 1) + 2;
-      (U1 < U1n) && (U2 < U2n) && (*U1 == *U2);
-      ++U1, ++U2) {
-  }
-
-  return U1 < U1n ?
-        (U2 < U2n ? *U1 - *U2 : 1) :
-        (U2 < U2n ? -1 : 0);
-}
-
-
-/*---------------------------------------------------------------------------*/
-
-#if (SS_BLOCKSIZE != 1) && (SS_INSERTIONSORT_THRESHOLD != 1)
-
-/* Insertionsort for small size groups */
-static
-void
-ss_insertionsort(const unsigned char *T, const int *PA,
-                 int *first, int *last, int depth) {
-  int *i, *j;
-  int t;
-  int r;
-
-  for(i = last - 2; first <= i; --i) {
-    for(t = *i, j = i + 1; 0 < (r = ss_compare(T, PA + t, PA + *j, depth));) {
-      do { *(j - 1) = *j; } while((++j < last) && (*j < 0));
-      if(last <= j) { break; }
-    }
-    if(r == 0) { *j = ~*j; }
-    *(j - 1) = t;
-  }
-}
-
-#endif /* (SS_BLOCKSIZE != 1) && (SS_INSERTIONSORT_THRESHOLD != 1) */
-
-
-/*---------------------------------------------------------------------------*/
-
-#if (SS_BLOCKSIZE == 0) || (SS_INSERTIONSORT_THRESHOLD < SS_BLOCKSIZE)
-
-static INLINE
-void
-ss_fixdown(const unsigned char *Td, const int *PA,
-           int *SA, int i, int size) {
-  int j, k;
-  int v;
-  int c, d, e;
-
-  for(v = SA[i], c = Td[PA[v]]; (j = 2 * i + 1) < size; SA[i] = SA[k], i = k) {
-    d = Td[PA[SA[k = j++]]];
-    if(d < (e = Td[PA[SA[j]]])) { k = j; d = e; }
-    if(d <= c) { break; }
-  }
-  SA[i] = v;
-}
-
-/* Simple top-down heapsort. */
-static
-void
-ss_heapsort(const unsigned char *Td, const int *PA, int *SA, int size) {
-  int i, m;
-  int t;
-
-  m = size;
-  if((size % 2) == 0) {
-    m--;
-    if(Td[PA[SA[m / 2]]] < Td[PA[SA[m]]]) { SWAP(SA[m], SA[m / 2]); }
-  }
-
-  for(i = m / 2 - 1; 0 <= i; --i) { ss_fixdown(Td, PA, SA, i, m); }
-  if((size % 2) == 0) { SWAP(SA[0], SA[m]); ss_fixdown(Td, PA, SA, 0, m); }
-  for(i = m - 1; 0 < i; --i) {
-    t = SA[0], SA[0] = SA[i];
-    ss_fixdown(Td, PA, SA, 0, i);
-    SA[i] = t;
-  }
-}
-
-
-/*---------------------------------------------------------------------------*/
-
-/* Returns the median of three elements. */
-static INLINE
-int *
-ss_median3(const unsigned char *Td, const int *PA,
-           int *v1, int *v2, int *v3) {
-  int *t;
-  if(Td[PA[*v1]] > Td[PA[*v2]]) { SWAP(v1, v2); }
-  if(Td[PA[*v2]] > Td[PA[*v3]]) {
-    if(Td[PA[*v1]] > Td[PA[*v3]]) { return v1; }
-    else { return v3; }
-  }
-  return v2;
-}
-
-/* Returns the median of five elements. */
-static INLINE
-int *
-ss_median5(const unsigned char *Td, const int *PA,
-           int *v1, int *v2, int *v3, int *v4, int *v5) {
-  int *t;
-  if(Td[PA[*v2]] > Td[PA[*v3]]) { SWAP(v2, v3); }
-  if(Td[PA[*v4]] > Td[PA[*v5]]) { SWAP(v4, v5); }
-  if(Td[PA[*v2]] > Td[PA[*v4]]) { SWAP(v2, v4); SWAP(v3, v5); }
-  if(Td[PA[*v1]] > Td[PA[*v3]]) { SWAP(v1, v3); }
-  if(Td[PA[*v1]] > Td[PA[*v4]]) { SWAP(v1, v4); SWAP(v3, v5); }
-  if(Td[PA[*v3]] > Td[PA[*v4]]) { return v4; }
-  return v3;
-}
-
-/* Returns the pivot element. */
-static INLINE
-int *
-ss_pivot(const unsigned char *Td, const int *PA, int *first, int *last) {
-  int *middle;
-  int t;
-
-  t = last - first;
-  middle = first + t / 2;
-
-  if(t <= 512) {
-    if(t <= 32) {
-      return ss_median3(Td, PA, first, middle, last - 1);
-    } else {
-      t >>= 2;
-      return ss_median5(Td, PA, first, first + t, middle, last - 1 - t, last - 1);
-    }
-  }
-  t >>= 3;
-  first  = ss_median3(Td, PA, first, first + t, first + (t << 1));
-  middle = ss_median3(Td, PA, middle - t, middle, middle + t);
-  last   = ss_median3(Td, PA, last - 1 - (t << 1), last - 1 - t, last - 1);
-  return ss_median3(Td, PA, first, middle, last);
-}
-
-
-/*---------------------------------------------------------------------------*/
-
-/* Binary partition for substrings. */
-static INLINE
-int *
-ss_partition(const int *PA,
-                    int *first, int *last, int depth) {
-  int *a, *b;
-  int t;
-  for(a = first - 1, b = last;;) {
-    for(; (++a < b) && ((PA[*a] + depth) >= (PA[*a + 1] + 1));) { *a = ~*a; }
-    for(; (a < --b) && ((PA[*b] + depth) <  (PA[*b + 1] + 1));) { }
-    if(b <= a) { break; }
-    t = ~*b;
-    *b = *a;
-    *a = t;
-  }
-  if(first < a) { *first = ~*first; }
-  return a;
-}
-
-/* Multikey introsort for medium size groups. */
-static
-void
-ss_mintrosort(const unsigned char *T, const int *PA,
-              int *first, int *last,
-              int depth) {
-#define STACK_SIZE SS_MISORT_STACKSIZE
-  struct { int *a, *b, c; int d; } stack[STACK_SIZE];
-  const unsigned char *Td;
-  int *a, *b, *c, *d, *e, *f;
-  int s, t;
-  int ssize;
-  int limit;
-  int v, x = 0;
-
-  for(ssize = 0, limit = ss_ilg(last - first);;) {
-
-    if((last - first) <= SS_INSERTIONSORT_THRESHOLD) {
-#if 1 < SS_INSERTIONSORT_THRESHOLD
-      if(1 < (last - first)) { ss_insertionsort(T, PA, first, last, depth); }
-#endif
-      STACK_POP(first, last, depth, limit);
-      continue;
-    }
-
-    Td = T + depth;
-    if(limit-- == 0) { ss_heapsort(Td, PA, first, last - first); }
-    if(limit < 0) {
-      for(a = first + 1, v = Td[PA[*first]]; a < last; ++a) {
-        if((x = Td[PA[*a]]) != v) {
-          if(1 < (a - first)) { break; }
-          v = x;
-          first = a;
-        }
-      }
-      if(Td[PA[*first] - 1] < v) {
-        first = ss_partition(PA, first, a, depth);
-      }
-      if((a - first) <= (last - a)) {
-        if(1 < (a - first)) {
-          STACK_PUSH(a, last, depth, -1);
-          last = a, depth += 1, limit = ss_ilg(a - first);
-        } else {
-          first = a, limit = -1;
-        }
-      } else {
-        if(1 < (last - a)) {
-          STACK_PUSH(first, a, depth + 1, ss_ilg(a - first));
-          first = a, limit = -1;
-        } else {
-          last = a, depth += 1, limit = ss_ilg(a - first);
-        }
-      }
-      continue;
-    }
-
-    /* choose pivot */
-    a = ss_pivot(Td, PA, first, last);
-    v = Td[PA[*a]];
-    SWAP(*first, *a);
-
-    /* partition */
-    for(b = first; (++b < last) && ((x = Td[PA[*b]]) == v);) { }
-    if(((a = b) < last) && (x < v)) {
-      for(; (++b < last) && ((x = Td[PA[*b]]) <= v);) {
-        if(x == v) { SWAP(*b, *a); ++a; }
-      }
-    }
-    for(c = last; (b < --c) && ((x = Td[PA[*c]]) == v);) { }
-    if((b < (d = c)) && (x > v)) {
-      for(; (b < --c) && ((x = Td[PA[*c]]) >= v);) {
-        if(x == v) { SWAP(*c, *d); --d; }
-      }
-    }
-    for(; b < c;) {
-      SWAP(*b, *c);
-      for(; (++b < c) && ((x = Td[PA[*b]]) <= v);) {
-        if(x == v) { SWAP(*b, *a); ++a; }
-      }
-      for(; (b < --c) && ((x = Td[PA[*c]]) >= v);) {
-        if(x == v) { SWAP(*c, *d); --d; }
-      }
-    }
-
-    if(a <= d) {
-      c = b - 1;
-
-      if((s = a - first) > (t = b - a)) { s = t; }
-      for(e = first, f = b - s; 0 < s; --s, ++e, ++f) { SWAP(*e, *f); }
-      if((s = d - c) > (t = last - d - 1)) { s = t; }
-      for(e = b, f = last - s; 0 < s; --s, ++e, ++f) { SWAP(*e, *f); }
-
-      a = first + (b - a), c = last - (d - c);
-      b = (v <= Td[PA[*a] - 1]) ? a : ss_partition(PA, a, c, depth);
-
-      if((a - first) <= (last - c)) {
-        if((last - c) <= (c - b)) {
-          STACK_PUSH(b, c, depth + 1, ss_ilg(c - b));
-          STACK_PUSH(c, last, depth, limit);
-          last = a;
-        } else if((a - first) <= (c - b)) {
-          STACK_PUSH(c, last, depth, limit);
-          STACK_PUSH(b, c, depth + 1, ss_ilg(c - b));
-          last = a;
-        } else {
-          STACK_PUSH(c, last, depth, limit);
-          STACK_PUSH(first, a, depth, limit);
-          first = b, last = c, depth += 1, limit = ss_ilg(c - b);
-        }
-      } else {
-        if((a - first) <= (c - b)) {
-          STACK_PUSH(b, c, depth + 1, ss_ilg(c - b));
-          STACK_PUSH(first, a, depth, limit);
-          first = c;
-        } else if((last - c) <= (c - b)) {
-          STACK_PUSH(first, a, depth, limit);
-          STACK_PUSH(b, c, depth + 1, ss_ilg(c - b));
-          first = c;
-        } else {
-          STACK_PUSH(first, a, depth, limit);
-          STACK_PUSH(c, last, depth, limit);
-          first = b, last = c, depth += 1, limit = ss_ilg(c - b);
-        }
-      }
-    } else {
-      limit += 1;
-      if(Td[PA[*first] - 1] < v) {
-        first = ss_partition(PA, first, last, depth);
-        limit = ss_ilg(last - first);
-      }
-      depth += 1;
-    }
-  }
-#undef STACK_SIZE
-}
-
-#endif /* (SS_BLOCKSIZE == 0) || (SS_INSERTIONSORT_THRESHOLD < SS_BLOCKSIZE) */
-
-
-/*---------------------------------------------------------------------------*/
-
-#if SS_BLOCKSIZE != 0
-
-static INLINE
-void
-ss_blockswap(int *a, int *b, int n) {
-  int t;
-  for(; 0 < n; --n, ++a, ++b) {
-    t = *a, *a = *b, *b = t;
-  }
-}
-
-static INLINE
-void
-ss_rotate(int *first, int *middle, int *last) {
-  int *a, *b, t;
-  int l, r;
-  l = middle - first, r = last - middle;
-  for(; (0 < l) && (0 < r);) {
-    if(l == r) { ss_blockswap(first, middle, l); break; }
-    if(l < r) {
-      a = last - 1, b = middle - 1;
-      t = *a;
-      do {
-        *a-- = *b, *b-- = *a;
-        if(b < first) {
-          *a = t;
-          last = a;
-          if((r -= l + 1) <= l) { break; }
-          a -= 1, b = middle - 1;
-          t = *a;
-        }
-      } while(1);
-    } else {
-      a = first, b = middle;
-      t = *a;
-      do {
-        *a++ = *b, *b++ = *a;
-        if(last <= b) {
-          *a = t;
-          first = a + 1;
-          if((l -= r + 1) <= r) { break; }
-          a += 1, b = middle;
-          t = *a;
-        }
-      } while(1);
-    }
-  }
-}
-
-
-/*---------------------------------------------------------------------------*/
-
-static
-void
-ss_inplacemerge(const unsigned char *T, const int *PA,
-                int *first, int *middle, int *last,
-                int depth) {
-  const int *p;
-  int *a, *b;
-  int len, half;
-  int q, r;
-  int x;
-
-  for(;;) {
-    if(*(last - 1) < 0) { x = 1; p = PA + ~*(last - 1); }
-    else                { x = 0; p = PA +  *(last - 1); }
-    for(a = first, len = middle - first, half = len >> 1, r = -1;
-        0 < len;
-        len = half, half >>= 1) {
-      b = a + half;
-      q = ss_compare(T, PA + ((0 <= *b) ? *b : ~*b), p, depth);
-      if(q < 0) {
-        a = b + 1;
-        half -= (len & 1) ^ 1;
-      } else {
-        r = q;
-      }
-    }
-    if(a < middle) {
-      if(r == 0) { *a = ~*a; }
-      ss_rotate(a, middle, last);
-      last -= middle - a;
-      middle = a;
-      if(first == middle) { break; }
-    }
-    --last;
-    if(x != 0) { while(*--last < 0) { } }
-    if(middle == last) { break; }
-  }
-}
-
-
-/*---------------------------------------------------------------------------*/
-
-/* Merge-forward with internal buffer. */
-static
-void
-ss_mergeforward(const unsigned char *T, const int *PA,
-                int *first, int *middle, int *last,
-                int *buf, int depth) {
-  int *a, *b, *c, *bufend;
-  int t;
-  int r;
-
-  bufend = buf + (middle - first) - 1;
-  ss_blockswap(buf, first, middle - first);
-
-  for(t = *(a = first), b = buf, c = middle;;) {
-    r = ss_compare(T, PA + *b, PA + *c, depth);
-    if(r < 0) {
-      do {
-        *a++ = *b;
-        if(bufend <= b) { *bufend = t; return; }
-        *b++ = *a;
-      } while(*b < 0);
-    } else if(r > 0) {
-      do {
-        *a++ = *c, *c++ = *a;
-        if(last <= c) {
-          while(b < bufend) { *a++ = *b, *b++ = *a; }
-          *a = *b, *b = t;
-          return;
-        }
-      } while(*c < 0);
-    } else {
-      *c = ~*c;
-      do {
-        *a++ = *b;
-        if(bufend <= b) { *bufend = t; return; }
-        *b++ = *a;
-      } while(*b < 0);
-
-      do {
-        *a++ = *c, *c++ = *a;
-        if(last <= c) {
-          while(b < bufend) { *a++ = *b, *b++ = *a; }
-          *a = *b, *b = t;
-          return;
-        }
-      } while(*c < 0);
-    }
-  }
-}
-
-/* Merge-backward with internal buffer. */
-static
-void
-ss_mergebackward(const unsigned char *T, const int *PA,
-                 int *first, int *middle, int *last,
-                 int *buf, int depth) {
-  const int *p1, *p2;
-  int *a, *b, *c, *bufend;
-  int t;
-  int r;
-  int x;
-
-  bufend = buf + (last - middle) - 1;
-  ss_blockswap(buf, middle, last - middle);
-
-  x = 0;
-  if(*bufend < 0)       { p1 = PA + ~*bufend; x |= 1; }
-  else                  { p1 = PA +  *bufend; }
-  if(*(middle - 1) < 0) { p2 = PA + ~*(middle - 1); x |= 2; }
-  else                  { p2 = PA +  *(middle - 1); }
-  for(t = *(a = last - 1), b = bufend, c = middle - 1;;) {
-    r = ss_compare(T, p1, p2, depth);
-    if(0 < r) {
-      if(x & 1) { do { *a-- = *b, *b-- = *a; } while(*b < 0); x ^= 1; }
-      *a-- = *b;
-      if(b <= buf) { *buf = t; break; }
-      *b-- = *a;
-      if(*b < 0) { p1 = PA + ~*b; x |= 1; }
-      else       { p1 = PA +  *b; }
-    } else if(r < 0) {
-      if(x & 2) { do { *a-- = *c, *c-- = *a; } while(*c < 0); x ^= 2; }
-      *a-- = *c, *c-- = *a;
-      if(c < first) {
-        while(buf < b) { *a-- = *b, *b-- = *a; }
-        *a = *b, *b = t;
-        break;
-      }
-      if(*c < 0) { p2 = PA + ~*c; x |= 2; }
-      else       { p2 = PA +  *c; }
-    } else {
-      if(x & 1) { do { *a-- = *b, *b-- = *a; } while(*b < 0); x ^= 1; }
-      *a-- = ~*b;
-      if(b <= buf) { *buf = t; break; }
-      *b-- = *a;
-      if(x & 2) { do { *a-- = *c, *c-- = *a; } while(*c < 0); x ^= 2; }
-      *a-- = *c, *c-- = *a;
-      if(c < first) {
-        while(buf < b) { *a-- = *b, *b-- = *a; }
-        *a = *b, *b = t;
-        break;
-      }
-      if(*b < 0) { p1 = PA + ~*b; x |= 1; }
-      else       { p1 = PA +  *b; }
-      if(*c < 0) { p2 = PA + ~*c; x |= 2; }
-      else       { p2 = PA +  *c; }
-    }
-  }
-}
-
-/* D&C based merge. */
-static
-void
-ss_swapmerge(const unsigned char *T, const int *PA,
-             int *first, int *middle, int *last,
-             int *buf, int bufsize, int depth) {
-#define STACK_SIZE SS_SMERGE_STACKSIZE
-#define GETIDX(a) ((0 <= (a)) ? (a) : (~(a)))
-#define MERGE_CHECK(a, b, c)\
-  do {\
-    if(((c) & 1) ||\
-       (((c) & 2) && (ss_compare(T, PA + GETIDX(*((a) - 1)), PA + *(a), depth) == 0))) {\
-      *(a) = ~*(a);\
-    }\
-    if(((c) & 4) && ((ss_compare(T, PA + GETIDX(*((b) - 1)), PA + *(b), depth) == 0))) {\
-      *(b) = ~*(b);\
-    }\
-  } while(0)
-  struct { int *a, *b, *c; int d; } stack[STACK_SIZE];
-  int *l, *r, *lm, *rm;
-  int m, len, half;
-  int ssize;
-  int check, next;
-
-  for(check = 0, ssize = 0;;) {
-    if((last - middle) <= bufsize) {
-      if((first < middle) && (middle < last)) {
-        ss_mergebackward(T, PA, first, middle, last, buf, depth);
-      }
-      MERGE_CHECK(first, last, check);
-      STACK_POP(first, middle, last, check);
-      continue;
-    }
-
-    if((middle - first) <= bufsize) {
-      if(first < middle) {
-        ss_mergeforward(T, PA, first, middle, last, buf, depth);
-      }
-      MERGE_CHECK(first, last, check);
-      STACK_POP(first, middle, last, check);
-      continue;
-    }
-
-    for(m = 0, len = MIN(middle - first, last - middle), half = len >> 1;
-        0 < len;
-        len = half, half >>= 1) {
-      if(ss_compare(T, PA + GETIDX(*(middle + m + half)),
-                       PA + GETIDX(*(middle - m - half - 1)), depth) < 0) {
-        m += half + 1;
-        half -= (len & 1) ^ 1;
-      }
-    }
-
-    if(0 < m) {
-      lm = middle - m, rm = middle + m;
-      ss_blockswap(lm, middle, m);
-      l = r = middle, next = 0;
-      if(rm < last) {
-        if(*rm < 0) {
-          *rm = ~*rm;
-          if(first < lm) { for(; *--l < 0;) { } next |= 4; }
-          next |= 1;
-        } else if(first < lm) {
-          for(; *r < 0; ++r) { }
-          next |= 2;
-        }
-      }
-
-      if((l - first) <= (last - r)) {
-        STACK_PUSH(r, rm, last, (next & 3) | (check & 4));
-        middle = lm, last = l, check = (check & 3) | (next & 4);
-      } else {
-        if((next & 2) && (r == middle)) { next ^= 6; }
-        STACK_PUSH(first, lm, l, (check & 3) | (next & 4));
-        first = r, middle = rm, check = (next & 3) | (check & 4);
-      }
-    } else {
-      if(ss_compare(T, PA + GETIDX(*(middle - 1)), PA + *middle, depth) == 0) {
-        *middle = ~*middle;
-      }
-      MERGE_CHECK(first, last, check);
-      STACK_POP(first, middle, last, check);
-    }
-  }
-#undef STACK_SIZE
-}
-
-#endif /* SS_BLOCKSIZE != 0 */
-
-
-/*---------------------------------------------------------------------------*/
-
-/* Substring sort */
-static
-void
-sssort(const unsigned char *T, const int *PA,
-       int *first, int *last,
-       int *buf, int bufsize,
-       int depth, int n, int lastsuffix) {
-  int *a;
-#if SS_BLOCKSIZE != 0
-  int *b, *middle, *curbuf;
-  int j, k, curbufsize, limit;
-#endif
-  int i;
-
-  if(lastsuffix != 0) { ++first; }
-
-#if SS_BLOCKSIZE == 0
-  ss_mintrosort(T, PA, first, last, depth);
-#else
-  if((bufsize < SS_BLOCKSIZE) &&
-      (bufsize < (last - first)) &&
-      (bufsize < (limit = ss_isqrt(last - first)))) {
-    if(SS_BLOCKSIZE < limit) { limit = SS_BLOCKSIZE; }
-    buf = middle = last - limit, bufsize = limit;
-  } else {
-    middle = last, limit = 0;
-  }
-  for(a = first, i = 0; SS_BLOCKSIZE < (middle - a); a += SS_BLOCKSIZE, ++i) {
-#if SS_INSERTIONSORT_THRESHOLD < SS_BLOCKSIZE
-    ss_mintrosort(T, PA, a, a + SS_BLOCKSIZE, depth);
-#elif 1 < SS_BLOCKSIZE
-    ss_insertionsort(T, PA, a, a + SS_BLOCKSIZE, depth);
-#endif
-    curbufsize = last - (a + SS_BLOCKSIZE);
-    curbuf = a + SS_BLOCKSIZE;
-    if(curbufsize <= bufsize) { curbufsize = bufsize, curbuf = buf; }
-    for(b = a, k = SS_BLOCKSIZE, j = i; j & 1; b -= k, k <<= 1, j >>= 1) {
-      ss_swapmerge(T, PA, b - k, b, b + k, curbuf, curbufsize, depth);
-    }
-  }
-#if SS_INSERTIONSORT_THRESHOLD < SS_BLOCKSIZE
-  ss_mintrosort(T, PA, a, middle, depth);
-#elif 1 < SS_BLOCKSIZE
-  ss_insertionsort(T, PA, a, middle, depth);
-#endif
-  for(k = SS_BLOCKSIZE; i != 0; k <<= 1, i >>= 1) {
-    if(i & 1) {
-      ss_swapmerge(T, PA, a - k, a, middle, buf, bufsize, depth);
-      a -= k;
-    }
-  }
-  if(limit != 0) {
-#if SS_INSERTIONSORT_THRESHOLD < SS_BLOCKSIZE
-    ss_mintrosort(T, PA, middle, last, depth);
-#elif 1 < SS_BLOCKSIZE
-    ss_insertionsort(T, PA, middle, last, depth);
-#endif
-    ss_inplacemerge(T, PA, first, middle, last, depth);
-  }
-#endif
-
-  if(lastsuffix != 0) {
-    /* Insert last type B* suffix. */
-    int PAi[2]; PAi[0] = PA[*(first - 1)], PAi[1] = n - 2;
-    for(a = first, i = *(first - 1);
-        (a < last) && ((*a < 0) || (0 < ss_compare(T, &(PAi[0]), PA + *a, depth)));
-        ++a) {
-      *(a - 1) = *a;
-    }
-    *(a - 1) = i;
-  }
-}
-
-
-/*---------------------------------------------------------------------------*/
-
-static INLINE
-int
-tr_ilg(int n) {
-  return (n & 0xffff0000) ?
-          ((n & 0xff000000) ?
-            24 + lg_table[(n >> 24) & 0xff] :
-            16 + lg_table[(n >> 16) & 0xff]) :
-          ((n & 0x0000ff00) ?
-             8 + lg_table[(n >>  8) & 0xff] :
-             0 + lg_table[(n >>  0) & 0xff]);
-}
-
-
-/*---------------------------------------------------------------------------*/
-
-/* Simple insertionsort for small size groups. */
-static
-void
-tr_insertionsort(const int *ISAd, int *first, int *last) {
-  int *a, *b;
-  int t, r;
-
-  for(a = first + 1; a < last; ++a) {
-    for(t = *a, b = a - 1; 0 > (r = ISAd[t] - ISAd[*b]);) {
-      do { *(b + 1) = *b; } while((first <= --b) && (*b < 0));
-      if(b < first) { break; }
-    }
-    if(r == 0) { *b = ~*b; }
-    *(b + 1) = t;
-  }
-}
-
-
-/*---------------------------------------------------------------------------*/
-
-static INLINE
-void
-tr_fixdown(const int *ISAd, int *SA, int i, int size) {
-  int j, k;
-  int v;
-  int c, d, e;
-
-  for(v = SA[i], c = ISAd[v]; (j = 2 * i + 1) < size; SA[i] = SA[k], i = k) {
-    d = ISAd[SA[k = j++]];
-    if(d < (e = ISAd[SA[j]])) { k = j; d = e; }
-    if(d <= c) { break; }
-  }
-  SA[i] = v;
-}
-
-/* Simple top-down heapsort. */
-static
-void
-tr_heapsort(const int *ISAd, int *SA, int size) {
-  int i, m;
-  int t;
-
-  m = size;
-  if((size % 2) == 0) {
-    m--;
-    if(ISAd[SA[m / 2]] < ISAd[SA[m]]) { SWAP(SA[m], SA[m / 2]); }
-  }
-
-  for(i = m / 2 - 1; 0 <= i; --i) { tr_fixdown(ISAd, SA, i, m); }
-  if((size % 2) == 0) { SWAP(SA[0], SA[m]); tr_fixdown(ISAd, SA, 0, m); }
-  for(i = m - 1; 0 < i; --i) {
-    t = SA[0], SA[0] = SA[i];
-    tr_fixdown(ISAd, SA, 0, i);
-    SA[i] = t;
-  }
-}
-
-
-/*---------------------------------------------------------------------------*/
-
-/* Returns the median of three elements. */
-static INLINE
-int *
-tr_median3(const int *ISAd, int *v1, int *v2, int *v3) {
-  int *t;
-  if(ISAd[*v1] > ISAd[*v2]) { SWAP(v1, v2); }
-  if(ISAd[*v2] > ISAd[*v3]) {
-    if(ISAd[*v1] > ISAd[*v3]) { return v1; }
-    else { return v3; }
-  }
-  return v2;
-}
-
-/* Returns the median of five elements. */
-static INLINE
-int *
-tr_median5(const int *ISAd,
-           int *v1, int *v2, int *v3, int *v4, int *v5) {
-  int *t;
-  if(ISAd[*v2] > ISAd[*v3]) { SWAP(v2, v3); }
-  if(ISAd[*v4] > ISAd[*v5]) { SWAP(v4, v5); }
-  if(ISAd[*v2] > ISAd[*v4]) { SWAP(v2, v4); SWAP(v3, v5); }
-  if(ISAd[*v1] > ISAd[*v3]) { SWAP(v1, v3); }
-  if(ISAd[*v1] > ISAd[*v4]) { SWAP(v1, v4); SWAP(v3, v5); }
-  if(ISAd[*v3] > ISAd[*v4]) { return v4; }
-  return v3;
-}
-
-/* Returns the pivot element. */
-static INLINE
-int *
-tr_pivot(const int *ISAd, int *first, int *last) {
-  int *middle;
-  int t;
-
-  t = last - first;
-  middle = first + t / 2;
-
-  if(t <= 512) {
-    if(t <= 32) {
-      return tr_median3(ISAd, first, middle, last - 1);
-    } else {
-      t >>= 2;
-      return tr_median5(ISAd, first, first + t, middle, last - 1 - t, last - 1);
-    }
-  }
-  t >>= 3;
-  first  = tr_median3(ISAd, first, first + t, first + (t << 1));
-  middle = tr_median3(ISAd, middle - t, middle, middle + t);
-  last   = tr_median3(ISAd, last - 1 - (t << 1), last - 1 - t, last - 1);
-  return tr_median3(ISAd, first, middle, last);
-}
-
-
-/*---------------------------------------------------------------------------*/
-
-typedef struct _trbudget_t trbudget_t;
-struct _trbudget_t {
-  int chance;
-  int remain;
-  int incval;
-  int count;
-};
-
-static INLINE
-void
-trbudget_init(trbudget_t *budget, int chance, int incval) {
-  budget->chance = chance;
-  budget->remain = budget->incval = incval;
-}
-
-static INLINE
-int
-trbudget_check(trbudget_t *budget, int size) {
-  if(size <= budget->remain) { budget->remain -= size; return 1; }
-  if(budget->chance == 0) { budget->count += size; return 0; }
-  budget->remain += budget->incval - size;
-  budget->chance -= 1;
-  return 1;
-}
-
-
-/*---------------------------------------------------------------------------*/
-
-static INLINE
-void
-tr_partition(const int *ISAd,
-             int *first, int *middle, int *last,
-             int **pa, int **pb, int v) {
-  int *a, *b, *c, *d, *e, *f;
-  int t, s;
-  int x = 0;
-
-  for(b = middle - 1; (++b < last) && ((x = ISAd[*b]) == v);) { }
-  if(((a = b) < last) && (x < v)) {
-    for(; (++b < last) && ((x = ISAd[*b]) <= v);) {
-      if(x == v) { SWAP(*b, *a); ++a; }
-    }
-  }
-  for(c = last; (b < --c) && ((x = ISAd[*c]) == v);) { }
-  if((b < (d = c)) && (x > v)) {
-    for(; (b < --c) && ((x = ISAd[*c]) >= v);) {
-      if(x == v) { SWAP(*c, *d); --d; }
-    }
-  }
-  for(; b < c;) {
-    SWAP(*b, *c);
-    for(; (++b < c) && ((x = ISAd[*b]) <= v);) {
-      if(x == v) { SWAP(*b, *a); ++a; }
-    }
-    for(; (b < --c) && ((x = ISAd[*c]) >= v);) {
-      if(x == v) { SWAP(*c, *d); --d; }
-    }
-  }
-
-  if(a <= d) {
-    c = b - 1;
-    if((s = a - first) > (t = b - a)) { s = t; }
-    for(e = first, f = b - s; 0 < s; --s, ++e, ++f) { SWAP(*e, *f); }
-    if((s = d - c) > (t = last - d - 1)) { s = t; }
-    for(e = b, f = last - s; 0 < s; --s, ++e, ++f) { SWAP(*e, *f); }
-    first += (b - a), last -= (d - c);
-  }
-  *pa = first, *pb = last;
-}
-
-static
-void
-tr_copy(int *ISA, const int *SA,
-        int *first, int *a, int *b, int *last,
-        int depth) {
-  /* sort suffixes of middle partition
-     by using sorted order of suffixes of left and right partition. */
-  int *c, *d, *e;
-  int s, v;
-
-  v = b - SA - 1;
-  for(c = first, d = a - 1; c <= d; ++c) {
-    if((0 <= (s = *c - depth)) && (ISA[s] == v)) {
-      *++d = s;
-      ISA[s] = d - SA;
-    }
-  }
-  for(c = last - 1, e = d + 1, d = b; e < d; --c) {
-    if((0 <= (s = *c - depth)) && (ISA[s] == v)) {
-      *--d = s;
-      ISA[s] = d - SA;
-    }
-  }
-}
-
-static
-void
-tr_partialcopy(int *ISA, const int *SA,
-               int *first, int *a, int *b, int *last,
-               int depth) {
-  int *c, *d, *e;
-  int s, v;
-  int rank, lastrank, newrank = -1;
-
-  v = b - SA - 1;
-  lastrank = -1;
-  for(c = first, d = a - 1; c <= d; ++c) {
-    if((0 <= (s = *c - depth)) && (ISA[s] == v)) {
-      *++d = s;
-      rank = ISA[s + depth];
-      if(lastrank != rank) { lastrank = rank; newrank = d - SA; }
-      ISA[s] = newrank;
-    }
-  }
-
-  lastrank = -1;
-  for(e = d; first <= e; --e) {
-    rank = ISA[*e];
-    if(lastrank != rank) { lastrank = rank; newrank = e - SA; }
-    if(newrank != rank) { ISA[*e] = newrank; }
-  }
-
-  lastrank = -1;
-  for(c = last - 1, e = d + 1, d = b; e < d; --c) {
-    if((0 <= (s = *c - depth)) && (ISA[s] == v)) {
-      *--d = s;
-      rank = ISA[s + depth];
-      if(lastrank != rank) { lastrank = rank; newrank = d - SA; }
-      ISA[s] = newrank;
-    }
-  }
-}
-
-static
-void
-tr_introsort(int *ISA, const int *ISAd,
-             int *SA, int *first, int *last,
-             trbudget_t *budget) {
-#define STACK_SIZE TR_STACKSIZE
-  struct { const int *a; int *b, *c; int d, e; }stack[STACK_SIZE];
-  int *a, *b, *c;
-  int t;
-  int v, x = 0;
-  int incr = ISAd - ISA;
-  int limit, next;
-  int ssize, trlink = -1;
-
-  for(ssize = 0, limit = tr_ilg(last - first);;) {
-
-    if(limit < 0) {
-      if(limit == -1) {
-        /* tandem repeat partition */
-        tr_partition(ISAd - incr, first, first, last, &a, &b, last - SA - 1);
-
-        /* update ranks */
-        if(a < last) {
-          for(c = first, v = a - SA - 1; c < a; ++c) { ISA[*c] = v; }
-        }
-        if(b < last) {
-          for(c = a, v = b - SA - 1; c < b; ++c) { ISA[*c] = v; }
-        }
-
-        /* push */
-        if(1 < (b - a)) {
-          STACK_PUSH5(NULL, a, b, 0, 0);
-          STACK_PUSH5(ISAd - incr, first, last, -2, trlink);
-          trlink = ssize - 2;
-        }
-        if((a - first) <= (last - b)) {
-          if(1 < (a - first)) {
-            STACK_PUSH5(ISAd, b, last, tr_ilg(last - b), trlink);
-            last = a, limit = tr_ilg(a - first);
-          } else if(1 < (last - b)) {
-            first = b, limit = tr_ilg(last - b);
-          } else {
-            STACK_POP5(ISAd, first, last, limit, trlink);
-          }
-        } else {
-          if(1 < (last - b)) {
-            STACK_PUSH5(ISAd, first, a, tr_ilg(a - first), trlink);
-            first = b, limit = tr_ilg(last - b);
-          } else if(1 < (a - first)) {
-            last = a, limit = tr_ilg(a - first);
-          } else {
-            STACK_POP5(ISAd, first, last, limit, trlink);
-          }
-        }
-      } else if(limit == -2) {
-        /* tandem repeat copy */
-        a = stack[--ssize].b, b = stack[ssize].c;
-        if(stack[ssize].d == 0) {
-          tr_copy(ISA, SA, first, a, b, last, ISAd - ISA);
-        } else {
-          if(0 <= trlink) { stack[trlink].d = -1; }
-          tr_partialcopy(ISA, SA, first, a, b, last, ISAd - ISA);
-        }
-        STACK_POP5(ISAd, first, last, limit, trlink);
-      } else {
-        /* sorted partition */
-        if(0 <= *first) {
-          a = first;
-          do { ISA[*a] = a - SA; } while((++a < last) && (0 <= *a));
-          first = a;
-        }
-        if(first < last) {
-          a = first; do { *a = ~*a; } while(*++a < 0);
-          next = (ISA[*a] != ISAd[*a]) ? tr_ilg(a - first + 1) : -1;
-          if(++a < last) { for(b = first, v = a - SA - 1; b < a; ++b) { ISA[*b] = v; } }
-
-          /* push */
-          if(trbudget_check(budget, a - first)) {
-            if((a - first) <= (last - a)) {
-              STACK_PUSH5(ISAd, a, last, -3, trlink);
-              ISAd += incr, last = a, limit = next;
-            } else {
-              if(1 < (last - a)) {
-                STACK_PUSH5(ISAd + incr, first, a, next, trlink);
-                first = a, limit = -3;
-              } else {
-                ISAd += incr, last = a, limit = next;
-              }
-            }
-          } else {
-            if(0 <= trlink) { stack[trlink].d = -1; }
-            if(1 < (last - a)) {
-              first = a, limit = -3;
-            } else {
-              STACK_POP5(ISAd, first, last, limit, trlink);
-            }
-          }
-        } else {
-          STACK_POP5(ISAd, first, last, limit, trlink);
-        }
-      }
-      continue;
-    }
-
-    if((last - first) <= TR_INSERTIONSORT_THRESHOLD) {
-      tr_insertionsort(ISAd, first, last);
-      limit = -3;
-      continue;
-    }
-
-    if(limit-- == 0) {
-      tr_heapsort(ISAd, first, last - first);
-      for(a = last - 1; first < a; a = b) {
-        for(x = ISAd[*a], b = a - 1; (first <= b) && (ISAd[*b] == x); --b) { *b = ~*b; }
-      }
-      limit = -3;
-      continue;
-    }
-
-    /* choose pivot */
-    a = tr_pivot(ISAd, first, last);
-    SWAP(*first, *a);
-    v = ISAd[*first];
-
-    /* partition */
-    tr_partition(ISAd, first, first + 1, last, &a, &b, v);
-    if((last - first) != (b - a)) {
-      next = (ISA[*a] != v) ? tr_ilg(b - a) : -1;
-
-      /* update ranks */
-      for(c = first, v = a - SA - 1; c < a; ++c) { ISA[*c] = v; }
-      if(b < last) { for(c = a, v = b - SA - 1; c < b; ++c) { ISA[*c] = v; } }
-
-      /* push */
-      if((1 < (b - a)) && (trbudget_check(budget, b - a))) {
-        if((a - first) <= (last - b)) {
-          if((last - b) <= (b - a)) {
-            if(1 < (a - first)) {
-              STACK_PUSH5(ISAd + incr, a, b, next, trlink);
-              STACK_PUSH5(ISAd, b, last, limit, trlink);
-              last = a;
-            } else if(1 < (last - b)) {
-              STACK_PUSH5(ISAd + incr, a, b, next, trlink);
-              first = b;
-            } else {
-              ISAd += incr, first = a, last = b, limit = next;
-            }
-          } else if((a - first) <= (b - a)) {
-            if(1 < (a - first)) {
-              STACK_PUSH5(ISAd, b, last, limit, trlink);
-              STACK_PUSH5(ISAd + incr, a, b, next, trlink);
-              last = a;
-            } else {
-              STACK_PUSH5(ISAd, b, last, limit, trlink);
-              ISAd += incr, first = a, last = b, limit = next;
-            }
-          } else {
-            STACK_PUSH5(ISAd, b, last, limit, trlink);
-            STACK_PUSH5(ISAd, first, a, limit, trlink);
-            ISAd += incr, first = a, last = b, limit = next;
-          }
-        } else {
-          if((a - first) <= (b - a)) {
-            if(1 < (last - b)) {
-              STACK_PUSH5(ISAd + incr, a, b, next, trlink);
-              STACK_PUSH5(ISAd, first, a, limit, trlink);
-              first = b;
-            } else if(1 < (a - first)) {
-              STACK_PUSH5(ISAd + incr, a, b, next, trlink);
-              last = a;
-            } else {
-              ISAd += incr, first = a, last = b, limit = next;
-            }
-          } else if((last - b) <= (b - a)) {
-            if(1 < (last - b)) {
-              STACK_PUSH5(ISAd, first, a, limit, trlink);
-              STACK_PUSH5(ISAd + incr, a, b, next, trlink);
-              first = b;
-            } else {
-              STACK_PUSH5(ISAd, first, a, limit, trlink);
-              ISAd += incr, first = a, last = b, limit = next;
-            }
-          } else {
-            STACK_PUSH5(ISAd, first, a, limit, trlink);
-            STACK_PUSH5(ISAd, b, last, limit, trlink);
-            ISAd += incr, first = a, last = b, limit = next;
-          }
-        }
-      } else {
-        if((1 < (b - a)) && (0 <= trlink)) { stack[trlink].d = -1; }
-        if((a - first) <= (last - b)) {
-          if(1 < (a - first)) {
-            STACK_PUSH5(ISAd, b, last, limit, trlink);
-            last = a;
-          } else if(1 < (last - b)) {
-            first = b;
-          } else {
-            STACK_POP5(ISAd, first, last, limit, trlink);
-          }
-        } else {
-          if(1 < (last - b)) {
-            STACK_PUSH5(ISAd, first, a, limit, trlink);
-            first = b;
-          } else if(1 < (a - first)) {
-            last = a;
-          } else {
-            STACK_POP5(ISAd, first, last, limit, trlink);
-          }
-        }
-      }
-    } else {
-      if(trbudget_check(budget, last - first)) {
-        limit = tr_ilg(last - first), ISAd += incr;
-      } else {
-        if(0 <= trlink) { stack[trlink].d = -1; }
-        STACK_POP5(ISAd, first, last, limit, trlink);
-      }
-    }
-  }
-#undef STACK_SIZE
-}
-
-
-
-/*---------------------------------------------------------------------------*/
-
-/* Tandem repeat sort */
-static
-void
-trsort(int *ISA, int *SA, int n, int depth) {
-  int *ISAd;
-  int *first, *last;
-  trbudget_t budget;
-  int t, skip, unsorted;
-
-  trbudget_init(&budget, tr_ilg(n) * 2 / 3, n);
-/*  trbudget_init(&budget, tr_ilg(n) * 3 / 4, n); */
-  for(ISAd = ISA + depth; -n < *SA; ISAd += ISAd - ISA) {
-    first = SA;
-    skip = 0;
-    unsorted = 0;
-    do {
-      if((t = *first) < 0) { first -= t; skip += t; }
-      else {
-        if(skip != 0) { *(first + skip) = skip; skip = 0; }
-        last = SA + ISA[t] + 1;
-        if(1 < (last - first)) {
-          budget.count = 0;
-          tr_introsort(ISA, ISAd, SA, first, last, &budget);
-          if(budget.count != 0) { unsorted += budget.count; }
-          else { skip = first - last; }
-        } else if((last - first) == 1) {
-          skip = -1;
-        }
-        first = last;
-      }
-    } while(first < (SA + n));
-    if(skip != 0) { *(first + skip) = skip; }
-    if(unsorted == 0) { break; }
-  }
-}
-
-
-/*---------------------------------------------------------------------------*/
-
-/* Sorts suffixes of type B*. */
-static
-int
-sort_typeBstar(const unsigned char *T, int *SA,
-               int *bucket_A, int *bucket_B,
-               int n, int openMP) {
-  int *PAb, *ISAb, *buf;
-#ifdef LIBBSC_OPENMP
-  int *curbuf;
-  int l;
-#endif
-  int i, j, k, t, m, bufsize;
-  int c0, c1;
-#ifdef LIBBSC_OPENMP
-  int d0, d1;
-#endif
-  (void)openMP;
-
-  /* Initialize bucket arrays. */
-  for(i = 0; i < BUCKET_A_SIZE; ++i) { bucket_A[i] = 0; }
-  for(i = 0; i < BUCKET_B_SIZE; ++i) { bucket_B[i] = 0; }
-
-  /* Count the number of occurrences of the first one or two characters of each
-     type A, B and B* suffix. Moreover, store the beginning position of all
-     type B* suffixes into the array SA. */
-  for(i = n - 1, m = n, c0 = T[n - 1]; 0 <= i;) {
-    /* type A suffix. */
-    do { ++BUCKET_A(c1 = c0); } while((0 <= --i) && ((c0 = T[i]) >= c1));
-    if(0 <= i) {
-      /* type B* suffix. */
-      ++BUCKET_BSTAR(c0, c1);
-      SA[--m] = i;
-      /* type B suffix. */
-      for(--i, c1 = c0; (0 <= i) && ((c0 = T[i]) <= c1); --i, c1 = c0) {
-        ++BUCKET_B(c0, c1);
-      }
-    }
-  }
-  m = n - m;
-/*
-note:
-  A type B* suffix is lexicographically smaller than a type B suffix that
-  begins with the same first two characters.
-*/
-
-  /* Calculate the index of start/end point of each bucket. */
-  for(c0 = 0, i = 0, j = 0; c0 < ALPHABET_SIZE; ++c0) {
-    t = i + BUCKET_A(c0);
-    BUCKET_A(c0) = i + j; /* start point */
-    i = t + BUCKET_B(c0, c0);
-    for(c1 = c0 + 1; c1 < ALPHABET_SIZE; ++c1) {
-      j += BUCKET_BSTAR(c0, c1);
-      BUCKET_BSTAR(c0, c1) = j; /* end point */
-      i += BUCKET_B(c0, c1);
-    }
-  }
-
-  if(0 < m) {
-    /* Sort the type B* suffixes by their first two characters. */
-    PAb = SA + n - m; ISAb = SA + m;
-    for(i = m - 2; 0 <= i; --i) {
-      t = PAb[i], c0 = T[t], c1 = T[t + 1];
-      SA[--BUCKET_BSTAR(c0, c1)] = i;
-    }
-    t = PAb[m - 1], c0 = T[t], c1 = T[t + 1];
-    SA[--BUCKET_BSTAR(c0, c1)] = m - 1;
-
-    /* Sort the type B* substrings using sssort. */
-#ifdef LIBBSC_OPENMP
-    if (openMP)
-    {
-        buf = SA + m;
-        c0 = ALPHABET_SIZE - 2, c1 = ALPHABET_SIZE - 1, j = m;
-#pragma omp parallel default(shared) private(bufsize, curbuf, k, l, d0, d1)
-        {
-          bufsize = (n - (2 * m)) / omp_get_num_threads();
-          curbuf = buf + omp_get_thread_num() * bufsize;
-          k = 0;
-          for(;;) {
-            #pragma omp critical(sssort_lock)
-            {
-              if(0 < (l = j)) {
-                d0 = c0, d1 = c1;
-                do {
-                  k = BUCKET_BSTAR(d0, d1);
-                  if(--d1 <= d0) {
-                    d1 = ALPHABET_SIZE - 1;
-                    if(--d0 < 0) { break; }
-                  }
-                } while(((l - k) <= 1) && (0 < (l = k)));
-                c0 = d0, c1 = d1, j = k;
-              }
-            }
-            if(l == 0) { break; }
-            sssort(T, PAb, SA + k, SA + l,
-                   curbuf, bufsize, 2, n, *(SA + k) == (m - 1));
-          }
-        }
-    }
-    else
-    {
-        buf = SA + m, bufsize = n - (2 * m);
-        for(c0 = ALPHABET_SIZE - 2, j = m; 0 < j; --c0) {
-          for(c1 = ALPHABET_SIZE - 1; c0 < c1; j = i, --c1) {
-            i = BUCKET_BSTAR(c0, c1);
-            if(1 < (j - i)) {
-              sssort(T, PAb, SA + i, SA + j,
-                     buf, bufsize, 2, n, *(SA + i) == (m - 1));
-            }
-          }
-        }
-    }
-#else
-    buf = SA + m, bufsize = n - (2 * m);
-    for(c0 = ALPHABET_SIZE - 2, j = m; 0 < j; --c0) {
-      for(c1 = ALPHABET_SIZE - 1; c0 < c1; j = i, --c1) {
-        i = BUCKET_BSTAR(c0, c1);
-        if(1 < (j - i)) {
-          sssort(T, PAb, SA + i, SA + j,
-                 buf, bufsize, 2, n, *(SA + i) == (m - 1));
-        }
-      }
-    }
-#endif
-
-    /* Compute ranks of type B* substrings. */
-    for(i = m - 1; 0 <= i; --i) {
-      if(0 <= SA[i]) {
-        j = i;
-        do { ISAb[SA[i]] = i; } while((0 <= --i) && (0 <= SA[i]));
-        SA[i + 1] = i - j;
-        if(i <= 0) { break; }
-      }
-      j = i;
-      do { ISAb[SA[i] = ~SA[i]] = j; } while(SA[--i] < 0);
-      ISAb[SA[i]] = j;
-    }
-
-    /* Construct the inverse suffix array of type B* suffixes using trsort. */
-    trsort(ISAb, SA, m, 1);
-
-    /* Set the sorted order of tyoe B* suffixes. */
-    for(i = n - 1, j = m, c0 = T[n - 1]; 0 <= i;) {
-      for(--i, c1 = c0; (0 <= i) && ((c0 = T[i]) >= c1); --i, c1 = c0) { }
-      if(0 <= i) {
-        t = i;
-        for(--i, c1 = c0; (0 <= i) && ((c0 = T[i]) <= c1); --i, c1 = c0) { }
-        SA[ISAb[--j]] = ((t == 0) || (1 < (t - i))) ? t : ~t;
-      }
-    }
-
-    /* Calculate the index of start/end point of each bucket. */
-    BUCKET_B(ALPHABET_SIZE - 1, ALPHABET_SIZE - 1) = n; /* end point */
-    for(c0 = ALPHABET_SIZE - 2, k = m - 1; 0 <= c0; --c0) {
-      i = BUCKET_A(c0 + 1) - 1;
-      for(c1 = ALPHABET_SIZE - 1; c0 < c1; --c1) {
-        t = i - BUCKET_B(c0, c1);
-        BUCKET_B(c0, c1) = i; /* end point */
-
-        /* Move all type B* suffixes to the correct position. */
-        for(i = t, j = BUCKET_BSTAR(c0, c1);
-            j <= k;
-            --i, --k) { SA[i] = SA[k]; }
-      }
-      BUCKET_BSTAR(c0, c0 + 1) = i - BUCKET_B(c0, c0) + 1; /* start point */
-      BUCKET_B(c0, c0) = i; /* end point */
-    }
-  }
-
-  return m;
-}
-
-/* Constructs the suffix array by using the sorted order of type B* suffixes. */
-static
-void
-construct_SA(const unsigned char *T, int *SA,
-             int *bucket_A, int *bucket_B,
-             int n, int m) {
-  int *i, *j, *k;
-  int s;
-  int c0, c1, c2;
-
-  if(0 < m) {
-    /* Construct the sorted order of type B suffixes by using
-       the sorted order of type B* suffixes. */
-    for(c1 = ALPHABET_SIZE - 2; 0 <= c1; --c1) {
-      /* Scan the suffix array from right to left. */
-      for(i = SA + BUCKET_BSTAR(c1, c1 + 1),
-          j = SA + BUCKET_A(c1 + 1) - 1, k = NULL, c2 = -1;
-          i <= j;
-          --j) {
-        if(0 < (s = *j)) {
-          assert(T[s] == c1);
-          assert(((s + 1) < n) && (T[s] <= T[s + 1]));
-          assert(T[s - 1] <= T[s]);
-          *j = ~s;
-          c0 = T[--s];
-          if((0 < s) && (T[s - 1] > c0)) { s = ~s; }
-          if(c0 != c2) {
-            if(0 <= c2) { BUCKET_B(c2, c1) = k - SA; }
-            k = SA + BUCKET_B(c2 = c0, c1);
-          }
-          assert(k < j); assert(k != NULL);
-          *k-- = s;
-        } else {
-          assert(((s == 0) && (T[s] == c1)) || (s < 0));
-          *j = ~s;
-        }
-      }
-    }
-  }
-
-  /* Construct the suffix array by using
-     the sorted order of type B suffixes. */
-  k = SA + BUCKET_A(c2 = T[n - 1]);
-  *k++ = (T[n - 2] < c2) ? ~(n - 1) : (n - 1);
-  /* Scan the suffix array from left to right. */
-  for(i = SA, j = SA + n; i < j; ++i) {
-    if(0 < (s = *i)) {
-      assert(T[s - 1] >= T[s]);
-      c0 = T[--s];
-      if((s == 0) || (T[s - 1] < c0)) { s = ~s; }
-      if(c0 != c2) {
-        BUCKET_A(c2) = k - SA;
-        k = SA + BUCKET_A(c2 = c0);
-      }
-      assert(i < k);
-      *k++ = s;
-    } else {
-      assert(s < 0);
-      *i = ~s;
-    }
-  }
-}
-
-/* Constructs the burrows-wheeler transformed string directly
-   by using the sorted order of type B* suffixes. */
-static
-int
-construct_BWT(const unsigned char *T, int *SA,
-              int *bucket_A, int *bucket_B,
-              int n, int m) {
-  int *i, *j, *k, *orig;
-  int s;
-  int c0, c1, c2;
-
-  if(0 < m) {
-    /* Construct the sorted order of type B suffixes by using
-       the sorted order of type B* suffixes. */
-    for(c1 = ALPHABET_SIZE - 2; 0 <= c1; --c1) {
-      /* Scan the suffix array from right to left. */
-      for(i = SA + BUCKET_BSTAR(c1, c1 + 1),
-          j = SA + BUCKET_A(c1 + 1) - 1, k = NULL, c2 = -1;
-          i <= j;
-          --j) {
-        if(0 < (s = *j)) {
-          assert(T[s] == c1);
-          assert(((s + 1) < n) && (T[s] <= T[s + 1]));
-          assert(T[s - 1] <= T[s]);
-          c0 = T[--s];
-          *j = ~((int)c0);
-          if((0 < s) && (T[s - 1] > c0)) { s = ~s; }
-          if(c0 != c2) {
-            if(0 <= c2) { BUCKET_B(c2, c1) = k - SA; }
-            k = SA + BUCKET_B(c2 = c0, c1);
-          }
-          assert(k < j); assert(k != NULL);
-          *k-- = s;
-        } else if(s != 0) {
-          *j = ~s;
-#ifndef NDEBUG
-        } else {
-          assert(T[s] == c1);
-#endif
-        }
-      }
-    }
-  }
-
-  /* Construct the BWTed string by using
-     the sorted order of type B suffixes. */
-  k = SA + BUCKET_A(c2 = T[n - 1]);
-  *k++ = (T[n - 2] < c2) ? ~((int)T[n - 2]) : (n - 1);
-  /* Scan the suffix array from left to right. */
-  for(i = SA, j = SA + n, orig = SA; i < j; ++i) {
-    if(0 < (s = *i)) {
-      assert(T[s - 1] >= T[s]);
-      c0 = T[--s];
-      *i = c0;
-      if((0 < s) && (T[s - 1] < c0)) { s = ~((int)T[s - 1]); }
-      if(c0 != c2) {
-        BUCKET_A(c2) = k - SA;
-        k = SA + BUCKET_A(c2 = c0);
-      }
-      assert(i < k);
-      *k++ = s;
-    } else if(s != 0) {
-      *i = ~s;
-    } else {
-      orig = i;
-    }
-  }
-
-  return orig - SA;
-}
-
-/* Constructs the burrows-wheeler transformed string directly
-   by using the sorted order of type B* suffixes. */
-static
-int
-construct_BWT_indexes(const unsigned char *T, int *SA,
-                      int *bucket_A, int *bucket_B,
-                      int n, int m,
-                      unsigned char * num_indexes, int * indexes) {
-  int *i, *j, *k, *orig;
-  int s;
-  int c0, c1, c2;
-
-  int mod = n / 8;
-  {
-      mod |= mod >> 1;  mod |= mod >> 2;
-      mod |= mod >> 4;  mod |= mod >> 8;
-      mod |= mod >> 16; mod >>= 1;
-
-      *num_indexes = (unsigned char)((n - 1) / (mod + 1));
-  }
-
-  if(0 < m) {
-    /* Construct the sorted order of type B suffixes by using
-       the sorted order of type B* suffixes. */
-    for(c1 = ALPHABET_SIZE - 2; 0 <= c1; --c1) {
-      /* Scan the suffix array from right to left. */
-      for(i = SA + BUCKET_BSTAR(c1, c1 + 1),
-          j = SA + BUCKET_A(c1 + 1) - 1, k = NULL, c2 = -1;
-          i <= j;
-          --j) {
-        if(0 < (s = *j)) {
-          assert(T[s] == c1);
-          assert(((s + 1) < n) && (T[s] <= T[s + 1]));
-          assert(T[s - 1] <= T[s]);
-
-          if ((s & mod) == 0) indexes[s / (mod + 1) - 1] = j - SA;
-
-          c0 = T[--s];
-          *j = ~((int)c0);
-          if((0 < s) && (T[s - 1] > c0)) { s = ~s; }
-          if(c0 != c2) {
-            if(0 <= c2) { BUCKET_B(c2, c1) = k - SA; }
-            k = SA + BUCKET_B(c2 = c0, c1);
-          }
-          assert(k < j); assert(k != NULL);
-          *k-- = s;
-        } else if(s != 0) {
-          *j = ~s;
-#ifndef NDEBUG
-        } else {
-          assert(T[s] == c1);
-#endif
-        }
-      }
-    }
-  }
-
-  /* Construct the BWTed string by using
-     the sorted order of type B suffixes. */
-  k = SA + BUCKET_A(c2 = T[n - 1]);
-  if (T[n - 2] < c2) {
-    if (((n - 1) & mod) == 0) indexes[(n - 1) / (mod + 1) - 1] = k - SA;
-    *k++ = ~((int)T[n - 2]);
-  }
-  else {
-    *k++ = n - 1;
-  }
-
-  /* Scan the suffix array from left to right. */
-  for(i = SA, j = SA + n, orig = SA; i < j; ++i) {
-    if(0 < (s = *i)) {
-      assert(T[s - 1] >= T[s]);
-
-      if ((s & mod) == 0) indexes[s / (mod + 1) - 1] = i - SA;
-
-      c0 = T[--s];
-      *i = c0;
-      if(c0 != c2) {
-        BUCKET_A(c2) = k - SA;
-        k = SA + BUCKET_A(c2 = c0);
-      }
-      assert(i < k);
-      if((0 < s) && (T[s - 1] < c0)) {
-          if ((s & mod) == 0) indexes[s / (mod + 1) - 1] = k - SA;
-          *k++ = ~((int)T[s - 1]);
-      } else
-        *k++ = s;
-    } else if(s != 0) {
-      *i = ~s;
-    } else {
-      orig = i;
-    }
-  }
-
-  return orig - SA;
-}
-
-
-/*---------------------------------------------------------------------------*/
-
-/*- Function -*/
-
-int
-divsufsort(const unsigned char *T, int *SA, int n, int openMP) {
-  int *bucket_A, *bucket_B;
-  int m;
-  int err = 0;
-
-  /* Check arguments. */
-  if((T == NULL) || (SA == NULL) || (n < 0)) { return -1; }
-  else if(n == 0) { return 0; }
-  else if(n == 1) { SA[0] = 0; return 0; }
-  else if(n == 2) { m = (T[0] < T[1]); SA[m ^ 1] = 0, SA[m] = 1; return 0; }
-
-  bucket_A = (int *)malloc(BUCKET_A_SIZE * sizeof(int));
-  bucket_B = (int *)malloc(BUCKET_B_SIZE * sizeof(int));
-
-  /* Suffixsort. */
-  if((bucket_A != NULL) && (bucket_B != NULL)) {
-    m = sort_typeBstar(T, SA, bucket_A, bucket_B, n, openMP);
-    construct_SA(T, SA, bucket_A, bucket_B, n, m);
-  } else {
-    err = -2;
-  }
-
-  free(bucket_B);
-  free(bucket_A);
-
-  return err;
-}
-
-int
-divbwt(const unsigned char *T, unsigned char *U, int *A, int n, unsigned char * num_indexes, int * indexes, int openMP) {
-  int *B;
-  int *bucket_A, *bucket_B;
-  int m, pidx, i;
-
-  /* Check arguments. */
-  if((T == NULL) || (U == NULL) || (n < 0)) { return -1; }
-  else if(n <= 1) { if(n == 1) { U[0] = T[0]; } return n; }
-
-  if((B = A) == NULL) { B = (int *)malloc((size_t)(n + 1) * sizeof(int)); }
-  bucket_A = (int *)malloc(BUCKET_A_SIZE * sizeof(int));
-  bucket_B = (int *)malloc(BUCKET_B_SIZE * sizeof(int));
-
-  /* Burrows-Wheeler Transform. */
-  if((B != NULL) && (bucket_A != NULL) && (bucket_B != NULL)) {
-    m = sort_typeBstar(T, B, bucket_A, bucket_B, n, openMP);
-
-    if (num_indexes == NULL || indexes == NULL) {
-        pidx = construct_BWT(T, B, bucket_A, bucket_B, n, m);
-    } else {
-        pidx = construct_BWT_indexes(T, B, bucket_A, bucket_B, n, m, num_indexes, indexes);
-    }
-
-    /* Copy to output string. */
-    U[0] = T[n - 1];
-    for(i = 0; i < pidx; ++i) { U[i + 1] = (unsigned char)B[i]; }
-    for(i += 1; i < n; ++i) { U[i] = (unsigned char)B[i]; }
-    pidx += 1;
-  } else {
-    pidx = -2;
-  }
-
-  free(bucket_B);
-  free(bucket_A);
-  if(A == NULL) { free(B); }
-
-  return pidx;
-}
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/dictBuilder/divsufsort.h mysql-8.0-8.0.27/extra/zstd/lib/dictBuilder/divsufsort.h
--- mysql-8.0-8.0.26/extra/zstd/lib/dictBuilder/divsufsort.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/dictBuilder/divsufsort.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-/*
- * divsufsort.h for libdivsufsort-lite
- * Copyright (c) 2003-2008 Yuta Mori All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _DIVSUFSORT_H
-#define _DIVSUFSORT_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-/*- Prototypes -*/
-
-/**
- * Constructs the suffix array of a given string.
- * @param T [0..n-1] The input string.
- * @param SA [0..n-1] The output array of suffixes.
- * @param n The length of the given string.
- * @param openMP enables OpenMP optimization.
- * @return 0 if no error occurred, -1 or -2 otherwise.
- */
-int
-divsufsort(const unsigned char *T, int *SA, int n, int openMP);
-
-/**
- * Constructs the burrows-wheeler transformed string of a given string.
- * @param T [0..n-1] The input string.
- * @param U [0..n-1] The output string. (can be T)
- * @param A [0..n-1] The temporary array. (can be NULL)
- * @param n The length of the given string.
- * @param num_indexes The length of secondary indexes array. (can be NULL)
- * @param indexes The secondary indexes array. (can be NULL)
- * @param openMP enables OpenMP optimization.
- * @return The primary index if no error occurred, -1 or -2 otherwise.
- */
-int
-divbwt(const unsigned char *T, unsigned char *U, int *A, int n, unsigned char * num_indexes, int * indexes, int openMP);
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif /* __cplusplus */
-
-#endif /* _DIVSUFSORT_H */
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/dictBuilder/fastcover.c mysql-8.0-8.0.27/extra/zstd/lib/dictBuilder/fastcover.c
--- mysql-8.0-8.0.26/extra/zstd/lib/dictBuilder/fastcover.c	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/dictBuilder/fastcover.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,747 +0,0 @@
-/*-*************************************
-*  Dependencies
-***************************************/
-#include <stdio.h>  /* fprintf */
-#include <stdlib.h> /* malloc, free, qsort */
-#include <string.h> /* memset */
-#include <time.h>   /* clock */
-
-#include "mem.h" /* read */
-#include "pool.h"
-#include "threading.h"
-#include "cover.h"
-#include "zstd_internal.h" /* includes zstd.h */
-#ifndef ZDICT_STATIC_LINKING_ONLY
-#define ZDICT_STATIC_LINKING_ONLY
-#endif
-#include "zdict.h"
-
-
-/*-*************************************
-*  Constants
-***************************************/
-#define FASTCOVER_MAX_SAMPLES_SIZE (sizeof(size_t) == 8 ? ((unsigned)-1) : ((unsigned)1 GB))
-#define FASTCOVER_MAX_F 31
-#define FASTCOVER_MAX_ACCEL 10
-#define DEFAULT_SPLITPOINT 0.75
-#define DEFAULT_F 20
-#define DEFAULT_ACCEL 1
-
-
-/*-*************************************
-*  Console display
-***************************************/
-static int g_displayLevel = 2;
-#define DISPLAY(...)                                                           \
-  {                                                                            \
-    fprintf(stderr, __VA_ARGS__);                                              \
-    fflush(stderr);                                                            \
-  }
-#define LOCALDISPLAYLEVEL(displayLevel, l, ...)                                \
-  if (displayLevel >= l) {                                                     \
-    DISPLAY(__VA_ARGS__);                                                      \
-  } /* 0 : no display;   1: errors;   2: default;  3: details;  4: debug */
-#define DISPLAYLEVEL(l, ...) LOCALDISPLAYLEVEL(g_displayLevel, l, __VA_ARGS__)
-
-#define LOCALDISPLAYUPDATE(displayLevel, l, ...)                               \
-  if (displayLevel >= l) {                                                     \
-    if ((clock() - g_time > refreshRate) || (displayLevel >= 4)) {             \
-      g_time = clock();                                                        \
-      DISPLAY(__VA_ARGS__);                                                    \
-    }                                                                          \
-  }
-#define DISPLAYUPDATE(l, ...) LOCALDISPLAYUPDATE(g_displayLevel, l, __VA_ARGS__)
-static const clock_t refreshRate = CLOCKS_PER_SEC * 15 / 100;
-static clock_t g_time = 0;
-
-
-/*-*************************************
-* Hash Functions
-***************************************/
-static const U64 prime6bytes = 227718039650203ULL;
-static size_t ZSTD_hash6(U64 u, U32 h) { return (size_t)(((u  << (64-48)) * prime6bytes) >> (64-h)) ; }
-static size_t ZSTD_hash6Ptr(const void* p, U32 h) { return ZSTD_hash6(MEM_readLE64(p), h); }
-
-static const U64 prime8bytes = 0xCF1BBCDCB7A56463ULL;
-static size_t ZSTD_hash8(U64 u, U32 h) { return (size_t)(((u) * prime8bytes) >> (64-h)) ; }
-static size_t ZSTD_hash8Ptr(const void* p, U32 h) { return ZSTD_hash8(MEM_readLE64(p), h); }
-
-
-/**
- * Hash the d-byte value pointed to by p and mod 2^f
- */
-static size_t FASTCOVER_hashPtrToIndex(const void* p, U32 h, unsigned d) {
-  if (d == 6) {
-    return ZSTD_hash6Ptr(p, h) & ((1 << h) - 1);
-  }
-  return ZSTD_hash8Ptr(p, h) & ((1 << h) - 1);
-}
-
-
-/*-*************************************
-* Acceleration
-***************************************/
-typedef struct {
-  unsigned finalize;    /* Percentage of training samples used for ZDICT_finalizeDictionary */
-  unsigned skip;        /* Number of dmer skipped between each dmer counted in computeFrequency */
-} FASTCOVER_accel_t;
-
-
-static const FASTCOVER_accel_t FASTCOVER_defaultAccelParameters[FASTCOVER_MAX_ACCEL+1] = {
-  { 100, 0 },   /* accel = 0, should not happen because accel = 0 defaults to accel = 1 */
-  { 100, 0 },   /* accel = 1 */
-  { 50, 1 },   /* accel = 2 */
-  { 34, 2 },   /* accel = 3 */
-  { 25, 3 },   /* accel = 4 */
-  { 20, 4 },   /* accel = 5 */
-  { 17, 5 },   /* accel = 6 */
-  { 14, 6 },   /* accel = 7 */
-  { 13, 7 },   /* accel = 8 */
-  { 11, 8 },   /* accel = 9 */
-  { 10, 9 },   /* accel = 10 */
-};
-
-
-/*-*************************************
-* Context
-***************************************/
-typedef struct {
-  const BYTE *samples;
-  size_t *offsets;
-  const size_t *samplesSizes;
-  size_t nbSamples;
-  size_t nbTrainSamples;
-  size_t nbTestSamples;
-  size_t nbDmers;
-  U32 *freqs;
-  unsigned d;
-  unsigned f;
-  FASTCOVER_accel_t accelParams;
-} FASTCOVER_ctx_t;
-
-
-/*-*************************************
-*  Helper functions
-***************************************/
-/**
- * Selects the best segment in an epoch.
- * Segments of are scored according to the function:
- *
- * Let F(d) be the frequency of all dmers with hash value d.
- * Let S_i be hash value of the dmer at position i of segment S which has length k.
- *
- *     Score(S) = F(S_1) + F(S_2) + ... + F(S_{k-d+1})
- *
- * Once the dmer with hash value d is in the dictionary we set F(d) = 0.
- */
-static COVER_segment_t FASTCOVER_selectSegment(const FASTCOVER_ctx_t *ctx,
-                                              U32 *freqs, U32 begin, U32 end,
-                                              ZDICT_cover_params_t parameters,
-                                              U16* segmentFreqs) {
-  /* Constants */
-  const U32 k = parameters.k;
-  const U32 d = parameters.d;
-  const U32 f = ctx->f;
-  const U32 dmersInK = k - d + 1;
-
-  /* Try each segment (activeSegment) and save the best (bestSegment) */
-  COVER_segment_t bestSegment = {0, 0, 0};
-  COVER_segment_t activeSegment;
-
-  /* Reset the activeDmers in the segment */
-  /* The activeSegment starts at the beginning of the epoch. */
-  activeSegment.begin = begin;
-  activeSegment.end = begin;
-  activeSegment.score = 0;
-
-  /* Slide the activeSegment through the whole epoch.
-   * Save the best segment in bestSegment.
-   */
-  while (activeSegment.end < end) {
-    /* Get hash value of current dmer */
-    const size_t idx = FASTCOVER_hashPtrToIndex(ctx->samples + activeSegment.end, f, d);
-
-    /* Add frequency of this index to score if this is the first occurrence of index in active segment */
-    if (segmentFreqs[idx] == 0) {
-      activeSegment.score += freqs[idx];
-    }
-    /* Increment end of segment and segmentFreqs*/
-    activeSegment.end += 1;
-    segmentFreqs[idx] += 1;
-    /* If the window is now too large, drop the first position */
-    if (activeSegment.end - activeSegment.begin == dmersInK + 1) {
-      /* Get hash value of the dmer to be eliminated from active segment */
-      const size_t delIndex = FASTCOVER_hashPtrToIndex(ctx->samples + activeSegment.begin, f, d);
-      segmentFreqs[delIndex] -= 1;
-      /* Subtract frequency of this index from score if this is the last occurrence of this index in active segment */
-      if (segmentFreqs[delIndex] == 0) {
-        activeSegment.score -= freqs[delIndex];
-      }
-      /* Increment start of segment */
-      activeSegment.begin += 1;
-    }
-
-    /* If this segment is the best so far save it */
-    if (activeSegment.score > bestSegment.score) {
-      bestSegment = activeSegment;
-    }
-  }
-
-  /* Zero out rest of segmentFreqs array */
-  while (activeSegment.begin < end) {
-    const size_t delIndex = FASTCOVER_hashPtrToIndex(ctx->samples + activeSegment.begin, f, d);
-    segmentFreqs[delIndex] -= 1;
-    activeSegment.begin += 1;
-  }
-
-  {
-    /*  Zero the frequency of hash value of each dmer covered by the chosen segment. */
-    U32 pos;
-    for (pos = bestSegment.begin; pos != bestSegment.end; ++pos) {
-      const size_t i = FASTCOVER_hashPtrToIndex(ctx->samples + pos, f, d);
-      freqs[i] = 0;
-    }
-  }
-
-  return bestSegment;
-}
-
-
-static int FASTCOVER_checkParameters(ZDICT_cover_params_t parameters,
-                                     size_t maxDictSize, unsigned f,
-                                     unsigned accel) {
-  /* k, d, and f are required parameters */
-  if (parameters.d == 0 || parameters.k == 0) {
-    return 0;
-  }
-  /* d has to be 6 or 8 */
-  if (parameters.d != 6 && parameters.d != 8) {
-    return 0;
-  }
-  /* k <= maxDictSize */
-  if (parameters.k > maxDictSize) {
-    return 0;
-  }
-  /* d <= k */
-  if (parameters.d > parameters.k) {
-    return 0;
-  }
-  /* 0 < f <= FASTCOVER_MAX_F*/
-  if (f > FASTCOVER_MAX_F || f == 0) {
-    return 0;
-  }
-  /* 0 < splitPoint <= 1 */
-  if (parameters.splitPoint <= 0 || parameters.splitPoint > 1) {
-    return 0;
-  }
-  /* 0 < accel <= 10 */
-  if (accel > 10 || accel == 0) {
-    return 0;
-  }
-  return 1;
-}
-
-
-/**
- * Clean up a context initialized with `FASTCOVER_ctx_init()`.
- */
-static void
-FASTCOVER_ctx_destroy(FASTCOVER_ctx_t* ctx)
-{
-    if (!ctx) return;
-
-    free(ctx->freqs);
-    ctx->freqs = NULL;
-
-    free(ctx->offsets);
-    ctx->offsets = NULL;
-}
-
-
-/**
- * Calculate for frequency of hash value of each dmer in ctx->samples
- */
-static void
-FASTCOVER_computeFrequency(U32* freqs, const FASTCOVER_ctx_t* ctx)
-{
-    const unsigned f = ctx->f;
-    const unsigned d = ctx->d;
-    const unsigned skip = ctx->accelParams.skip;
-    const unsigned readLength = MAX(d, 8);
-    size_t i;
-    assert(ctx->nbTrainSamples >= 5);
-    assert(ctx->nbTrainSamples <= ctx->nbSamples);
-    for (i = 0; i < ctx->nbTrainSamples; i++) {
-        size_t start = ctx->offsets[i];  /* start of current dmer */
-        size_t const currSampleEnd = ctx->offsets[i+1];
-        while (start + readLength <= currSampleEnd) {
-            const size_t dmerIndex = FASTCOVER_hashPtrToIndex(ctx->samples + start, f, d);
-            freqs[dmerIndex]++;
-            start = start + skip + 1;
-        }
-    }
-}
-
-
-/**
- * Prepare a context for dictionary building.
- * The context is only dependent on the parameter `d` and can used multiple
- * times.
- * Returns 0 on success or error code on error.
- * The context must be destroyed with `FASTCOVER_ctx_destroy()`.
- */
-static size_t
-FASTCOVER_ctx_init(FASTCOVER_ctx_t* ctx,
-                   const void* samplesBuffer,
-                   const size_t* samplesSizes, unsigned nbSamples,
-                   unsigned d, double splitPoint, unsigned f,
-                   FASTCOVER_accel_t accelParams)
-{
-    const BYTE* const samples = (const BYTE*)samplesBuffer;
-    const size_t totalSamplesSize = COVER_sum(samplesSizes, nbSamples);
-    /* Split samples into testing and training sets */
-    const unsigned nbTrainSamples = splitPoint < 1.0 ? (unsigned)((double)nbSamples * splitPoint) : nbSamples;
-    const unsigned nbTestSamples = splitPoint < 1.0 ? nbSamples - nbTrainSamples : nbSamples;
-    const size_t trainingSamplesSize = splitPoint < 1.0 ? COVER_sum(samplesSizes, nbTrainSamples) : totalSamplesSize;
-    const size_t testSamplesSize = splitPoint < 1.0 ? COVER_sum(samplesSizes + nbTrainSamples, nbTestSamples) : totalSamplesSize;
-
-    /* Checks */
-    if (totalSamplesSize < MAX(d, sizeof(U64)) ||
-        totalSamplesSize >= (size_t)FASTCOVER_MAX_SAMPLES_SIZE) {
-        DISPLAYLEVEL(1, "Total samples size is too large (%u MB), maximum size is %u MB\n",
-                    (unsigned)(totalSamplesSize >> 20), (FASTCOVER_MAX_SAMPLES_SIZE >> 20));
-        return ERROR(srcSize_wrong);
-    }
-
-    /* Check if there are at least 5 training samples */
-    if (nbTrainSamples < 5) {
-        DISPLAYLEVEL(1, "Total number of training samples is %u and is invalid\n", nbTrainSamples);
-        return ERROR(srcSize_wrong);
-    }
-
-    /* Check if there's testing sample */
-    if (nbTestSamples < 1) {
-        DISPLAYLEVEL(1, "Total number of testing samples is %u and is invalid.\n", nbTestSamples);
-        return ERROR(srcSize_wrong);
-    }
-
-    /* Zero the context */
-    memset(ctx, 0, sizeof(*ctx));
-    DISPLAYLEVEL(2, "Training on %u samples of total size %u\n", nbTrainSamples,
-                    (unsigned)trainingSamplesSize);
-    DISPLAYLEVEL(2, "Testing on %u samples of total size %u\n", nbTestSamples,
-                    (unsigned)testSamplesSize);
-
-    ctx->samples = samples;
-    ctx->samplesSizes = samplesSizes;
-    ctx->nbSamples = nbSamples;
-    ctx->nbTrainSamples = nbTrainSamples;
-    ctx->nbTestSamples = nbTestSamples;
-    ctx->nbDmers = trainingSamplesSize - MAX(d, sizeof(U64)) + 1;
-    ctx->d = d;
-    ctx->f = f;
-    ctx->accelParams = accelParams;
-
-    /* The offsets of each file */
-    ctx->offsets = (size_t*)calloc((nbSamples + 1), sizeof(size_t));
-    if (ctx->offsets == NULL) {
-        DISPLAYLEVEL(1, "Failed to allocate scratch buffers \n");
-        FASTCOVER_ctx_destroy(ctx);
-        return ERROR(memory_allocation);
-    }
-
-    /* Fill offsets from the samplesSizes */
-    {   U32 i;
-        ctx->offsets[0] = 0;
-        assert(nbSamples >= 5);
-        for (i = 1; i <= nbSamples; ++i) {
-            ctx->offsets[i] = ctx->offsets[i - 1] + samplesSizes[i - 1];
-        }
-    }
-
-    /* Initialize frequency array of size 2^f */
-    ctx->freqs = (U32*)calloc(((U64)1 << f), sizeof(U32));
-    if (ctx->freqs == NULL) {
-        DISPLAYLEVEL(1, "Failed to allocate frequency table \n");
-        FASTCOVER_ctx_destroy(ctx);
-        return ERROR(memory_allocation);
-    }
-
-    DISPLAYLEVEL(2, "Computing frequencies\n");
-    FASTCOVER_computeFrequency(ctx->freqs, ctx);
-
-    return 0;
-}
-
-
-/**
- * Given the prepared context build the dictionary.
- */
-static size_t
-FASTCOVER_buildDictionary(const FASTCOVER_ctx_t* ctx,
-                          U32* freqs,
-                          void* dictBuffer, size_t dictBufferCapacity,
-                          ZDICT_cover_params_t parameters,
-                          U16* segmentFreqs)
-{
-  BYTE *const dict = (BYTE *)dictBuffer;
-  size_t tail = dictBufferCapacity;
-  /* Divide the data into epochs. We will select one segment from each epoch. */
-  const COVER_epoch_info_t epochs = COVER_computeEpochs(
-      (U32)dictBufferCapacity, (U32)ctx->nbDmers, parameters.k, 1);
-  const size_t maxZeroScoreRun = 10;
-  size_t zeroScoreRun = 0;
-  size_t epoch;
-  DISPLAYLEVEL(2, "Breaking content into %u epochs of size %u\n",
-                (U32)epochs.num, (U32)epochs.size);
-  /* Loop through the epochs until there are no more segments or the dictionary
-   * is full.
-   */
-  for (epoch = 0; tail > 0; epoch = (epoch + 1) % epochs.num) {
-    const U32 epochBegin = (U32)(epoch * epochs.size);
-    const U32 epochEnd = epochBegin + epochs.size;
-    size_t segmentSize;
-    /* Select a segment */
-    COVER_segment_t segment = FASTCOVER_selectSegment(
-        ctx, freqs, epochBegin, epochEnd, parameters, segmentFreqs);
-
-    /* If the segment covers no dmers, then we are out of content.
-     * There may be new content in other epochs, for continue for some time.
-     */
-    if (segment.score == 0) {
-      if (++zeroScoreRun >= maxZeroScoreRun) {
-          break;
-      }
-      continue;
-    }
-    zeroScoreRun = 0;
-
-    /* Trim the segment if necessary and if it is too small then we are done */
-    segmentSize = MIN(segment.end - segment.begin + parameters.d - 1, tail);
-    if (segmentSize < parameters.d) {
-      break;
-    }
-
-    /* We fill the dictionary from the back to allow the best segments to be
-     * referenced with the smallest offsets.
-     */
-    tail -= segmentSize;
-    memcpy(dict + tail, ctx->samples + segment.begin, segmentSize);
-    DISPLAYUPDATE(
-        2, "\r%u%%       ",
-        (unsigned)(((dictBufferCapacity - tail) * 100) / dictBufferCapacity));
-  }
-  DISPLAYLEVEL(2, "\r%79s\r", "");
-  return tail;
-}
-
-/**
- * Parameters for FASTCOVER_tryParameters().
- */
-typedef struct FASTCOVER_tryParameters_data_s {
-    const FASTCOVER_ctx_t* ctx;
-    COVER_best_t* best;
-    size_t dictBufferCapacity;
-    ZDICT_cover_params_t parameters;
-} FASTCOVER_tryParameters_data_t;
-
-
-/**
- * Tries a set of parameters and updates the COVER_best_t with the results.
- * This function is thread safe if zstd is compiled with multithreaded support.
- * It takes its parameters as an *OWNING* opaque pointer to support threading.
- */
-static void FASTCOVER_tryParameters(void *opaque)
-{
-  /* Save parameters as local variables */
-  FASTCOVER_tryParameters_data_t *const data = (FASTCOVER_tryParameters_data_t *)opaque;
-  const FASTCOVER_ctx_t *const ctx = data->ctx;
-  const ZDICT_cover_params_t parameters = data->parameters;
-  size_t dictBufferCapacity = data->dictBufferCapacity;
-  size_t totalCompressedSize = ERROR(GENERIC);
-  /* Initialize array to keep track of frequency of dmer within activeSegment */
-  U16* segmentFreqs = (U16 *)calloc(((U64)1 << ctx->f), sizeof(U16));
-  /* Allocate space for hash table, dict, and freqs */
-  BYTE *const dict = (BYTE * const)malloc(dictBufferCapacity);
-  COVER_dictSelection_t selection = COVER_dictSelectionError(ERROR(GENERIC));
-  U32 *freqs = (U32*) malloc(((U64)1 << ctx->f) * sizeof(U32));
-  if (!segmentFreqs || !dict || !freqs) {
-    DISPLAYLEVEL(1, "Failed to allocate buffers: out of memory\n");
-    goto _cleanup;
-  }
-  /* Copy the frequencies because we need to modify them */
-  memcpy(freqs, ctx->freqs, ((U64)1 << ctx->f) * sizeof(U32));
-  /* Build the dictionary */
-  { const size_t tail = FASTCOVER_buildDictionary(ctx, freqs, dict, dictBufferCapacity,
-                                                    parameters, segmentFreqs);
-
-    const unsigned nbFinalizeSamples = (unsigned)(ctx->nbTrainSamples * ctx->accelParams.finalize / 100);
-    selection = COVER_selectDict(dict + tail, dictBufferCapacity - tail,
-         ctx->samples, ctx->samplesSizes, nbFinalizeSamples, ctx->nbTrainSamples, ctx->nbSamples, parameters, ctx->offsets,
-         totalCompressedSize);
-
-    if (COVER_dictSelectionIsError(selection)) {
-      DISPLAYLEVEL(1, "Failed to select dictionary\n");
-      goto _cleanup;
-    }
-  }
-_cleanup:
-  free(dict);
-  COVER_best_finish(data->best, parameters, selection);
-  free(data);
-  free(segmentFreqs);
-  COVER_dictSelectionFree(selection);
-  free(freqs);
-}
-
-
-static void
-FASTCOVER_convertToCoverParams(ZDICT_fastCover_params_t fastCoverParams,
-                               ZDICT_cover_params_t* coverParams)
-{
-    coverParams->k = fastCoverParams.k;
-    coverParams->d = fastCoverParams.d;
-    coverParams->steps = fastCoverParams.steps;
-    coverParams->nbThreads = fastCoverParams.nbThreads;
-    coverParams->splitPoint = fastCoverParams.splitPoint;
-    coverParams->zParams = fastCoverParams.zParams;
-    coverParams->shrinkDict = fastCoverParams.shrinkDict;
-}
-
-
-static void
-FASTCOVER_convertToFastCoverParams(ZDICT_cover_params_t coverParams,
-                                   ZDICT_fastCover_params_t* fastCoverParams,
-                                   unsigned f, unsigned accel)
-{
-    fastCoverParams->k = coverParams.k;
-    fastCoverParams->d = coverParams.d;
-    fastCoverParams->steps = coverParams.steps;
-    fastCoverParams->nbThreads = coverParams.nbThreads;
-    fastCoverParams->splitPoint = coverParams.splitPoint;
-    fastCoverParams->f = f;
-    fastCoverParams->accel = accel;
-    fastCoverParams->zParams = coverParams.zParams;
-    fastCoverParams->shrinkDict = coverParams.shrinkDict;
-}
-
-
-ZDICTLIB_API size_t
-ZDICT_trainFromBuffer_fastCover(void* dictBuffer, size_t dictBufferCapacity,
-                                const void* samplesBuffer,
-                                const size_t* samplesSizes, unsigned nbSamples,
-                                ZDICT_fastCover_params_t parameters)
-{
-    BYTE* const dict = (BYTE*)dictBuffer;
-    FASTCOVER_ctx_t ctx;
-    ZDICT_cover_params_t coverParams;
-    FASTCOVER_accel_t accelParams;
-    /* Initialize global data */
-    g_displayLevel = parameters.zParams.notificationLevel;
-    /* Assign splitPoint and f if not provided */
-    parameters.splitPoint = 1.0;
-    parameters.f = parameters.f == 0 ? DEFAULT_F : parameters.f;
-    parameters.accel = parameters.accel == 0 ? DEFAULT_ACCEL : parameters.accel;
-    /* Convert to cover parameter */
-    memset(&coverParams, 0 , sizeof(coverParams));
-    FASTCOVER_convertToCoverParams(parameters, &coverParams);
-    /* Checks */
-    if (!FASTCOVER_checkParameters(coverParams, dictBufferCapacity, parameters.f,
-                                   parameters.accel)) {
-      DISPLAYLEVEL(1, "FASTCOVER parameters incorrect\n");
-      return ERROR(parameter_outOfBound);
-    }
-    if (nbSamples == 0) {
-      DISPLAYLEVEL(1, "FASTCOVER must have at least one input file\n");
-      return ERROR(srcSize_wrong);
-    }
-    if (dictBufferCapacity < ZDICT_DICTSIZE_MIN) {
-      DISPLAYLEVEL(1, "dictBufferCapacity must be at least %u\n",
-                   ZDICT_DICTSIZE_MIN);
-      return ERROR(dstSize_tooSmall);
-    }
-    /* Assign corresponding FASTCOVER_accel_t to accelParams*/
-    accelParams = FASTCOVER_defaultAccelParameters[parameters.accel];
-    /* Initialize context */
-    {
-      size_t const initVal = FASTCOVER_ctx_init(&ctx, samplesBuffer, samplesSizes, nbSamples,
-                            coverParams.d, parameters.splitPoint, parameters.f,
-                            accelParams);
-      if (ZSTD_isError(initVal)) {
-        DISPLAYLEVEL(1, "Failed to initialize context\n");
-        return initVal;
-      }
-    }
-    COVER_warnOnSmallCorpus(dictBufferCapacity, ctx.nbDmers, g_displayLevel);
-    /* Build the dictionary */
-    DISPLAYLEVEL(2, "Building dictionary\n");
-    {
-      /* Initialize array to keep track of frequency of dmer within activeSegment */
-      U16* segmentFreqs = (U16 *)calloc(((U64)1 << parameters.f), sizeof(U16));
-      const size_t tail = FASTCOVER_buildDictionary(&ctx, ctx.freqs, dictBuffer,
-                                                dictBufferCapacity, coverParams, segmentFreqs);
-      const unsigned nbFinalizeSamples = (unsigned)(ctx.nbTrainSamples * ctx.accelParams.finalize / 100);
-      const size_t dictionarySize = ZDICT_finalizeDictionary(
-          dict, dictBufferCapacity, dict + tail, dictBufferCapacity - tail,
-          samplesBuffer, samplesSizes, nbFinalizeSamples, coverParams.zParams);
-      if (!ZSTD_isError(dictionarySize)) {
-          DISPLAYLEVEL(2, "Constructed dictionary of size %u\n",
-                      (unsigned)dictionarySize);
-      }
-      FASTCOVER_ctx_destroy(&ctx);
-      free(segmentFreqs);
-      return dictionarySize;
-    }
-}
-
-
-ZDICTLIB_API size_t
-ZDICT_optimizeTrainFromBuffer_fastCover(
-                    void* dictBuffer, size_t dictBufferCapacity,
-                    const void* samplesBuffer,
-                    const size_t* samplesSizes, unsigned nbSamples,
-                    ZDICT_fastCover_params_t* parameters)
-{
-    ZDICT_cover_params_t coverParams;
-    FASTCOVER_accel_t accelParams;
-    /* constants */
-    const unsigned nbThreads = parameters->nbThreads;
-    const double splitPoint =
-        parameters->splitPoint <= 0.0 ? DEFAULT_SPLITPOINT : parameters->splitPoint;
-    const unsigned kMinD = parameters->d == 0 ? 6 : parameters->d;
-    const unsigned kMaxD = parameters->d == 0 ? 8 : parameters->d;
-    const unsigned kMinK = parameters->k == 0 ? 50 : parameters->k;
-    const unsigned kMaxK = parameters->k == 0 ? 2000 : parameters->k;
-    const unsigned kSteps = parameters->steps == 0 ? 40 : parameters->steps;
-    const unsigned kStepSize = MAX((kMaxK - kMinK) / kSteps, 1);
-    const unsigned kIterations =
-        (1 + (kMaxD - kMinD) / 2) * (1 + (kMaxK - kMinK) / kStepSize);
-    const unsigned f = parameters->f == 0 ? DEFAULT_F : parameters->f;
-    const unsigned accel = parameters->accel == 0 ? DEFAULT_ACCEL : parameters->accel;
-    const unsigned shrinkDict = 0;
-    /* Local variables */
-    const int displayLevel = parameters->zParams.notificationLevel;
-    unsigned iteration = 1;
-    unsigned d;
-    unsigned k;
-    COVER_best_t best;
-    POOL_ctx *pool = NULL;
-    int warned = 0;
-    /* Checks */
-    if (splitPoint <= 0 || splitPoint > 1) {
-      LOCALDISPLAYLEVEL(displayLevel, 1, "Incorrect splitPoint\n");
-      return ERROR(parameter_outOfBound);
-    }
-    if (accel == 0 || accel > FASTCOVER_MAX_ACCEL) {
-      LOCALDISPLAYLEVEL(displayLevel, 1, "Incorrect accel\n");
-      return ERROR(parameter_outOfBound);
-    }
-    if (kMinK < kMaxD || kMaxK < kMinK) {
-      LOCALDISPLAYLEVEL(displayLevel, 1, "Incorrect k\n");
-      return ERROR(parameter_outOfBound);
-    }
-    if (nbSamples == 0) {
-      LOCALDISPLAYLEVEL(displayLevel, 1, "FASTCOVER must have at least one input file\n");
-      return ERROR(srcSize_wrong);
-    }
-    if (dictBufferCapacity < ZDICT_DICTSIZE_MIN) {
-      LOCALDISPLAYLEVEL(displayLevel, 1, "dictBufferCapacity must be at least %u\n",
-                   ZDICT_DICTSIZE_MIN);
-      return ERROR(dstSize_tooSmall);
-    }
-    if (nbThreads > 1) {
-      pool = POOL_create(nbThreads, 1);
-      if (!pool) {
-        return ERROR(memory_allocation);
-      }
-    }
-    /* Initialization */
-    COVER_best_init(&best);
-    memset(&coverParams, 0 , sizeof(coverParams));
-    FASTCOVER_convertToCoverParams(*parameters, &coverParams);
-    accelParams = FASTCOVER_defaultAccelParameters[accel];
-    /* Turn down global display level to clean up display at level 2 and below */
-    g_displayLevel = displayLevel == 0 ? 0 : displayLevel - 1;
-    /* Loop through d first because each new value needs a new context */
-    LOCALDISPLAYLEVEL(displayLevel, 2, "Trying %u different sets of parameters\n",
-                      kIterations);
-    for (d = kMinD; d <= kMaxD; d += 2) {
-      /* Initialize the context for this value of d */
-      FASTCOVER_ctx_t ctx;
-      LOCALDISPLAYLEVEL(displayLevel, 3, "d=%u\n", d);
-      {
-        size_t const initVal = FASTCOVER_ctx_init(&ctx, samplesBuffer, samplesSizes, nbSamples, d, splitPoint, f, accelParams);
-        if (ZSTD_isError(initVal)) {
-          LOCALDISPLAYLEVEL(displayLevel, 1, "Failed to initialize context\n");
-          COVER_best_destroy(&best);
-          POOL_free(pool);
-          return initVal;
-        }
-      }
-      if (!warned) {
-        COVER_warnOnSmallCorpus(dictBufferCapacity, ctx.nbDmers, displayLevel);
-        warned = 1;
-      }
-      /* Loop through k reusing the same context */
-      for (k = kMinK; k <= kMaxK; k += kStepSize) {
-        /* Prepare the arguments */
-        FASTCOVER_tryParameters_data_t *data = (FASTCOVER_tryParameters_data_t *)malloc(
-            sizeof(FASTCOVER_tryParameters_data_t));
-        LOCALDISPLAYLEVEL(displayLevel, 3, "k=%u\n", k);
-        if (!data) {
-          LOCALDISPLAYLEVEL(displayLevel, 1, "Failed to allocate parameters\n");
-          COVER_best_destroy(&best);
-          FASTCOVER_ctx_destroy(&ctx);
-          POOL_free(pool);
-          return ERROR(memory_allocation);
-        }
-        data->ctx = &ctx;
-        data->best = &best;
-        data->dictBufferCapacity = dictBufferCapacity;
-        data->parameters = coverParams;
-        data->parameters.k = k;
-        data->parameters.d = d;
-        data->parameters.splitPoint = splitPoint;
-        data->parameters.steps = kSteps;
-        data->parameters.shrinkDict = shrinkDict;
-        data->parameters.zParams.notificationLevel = g_displayLevel;
-        /* Check the parameters */
-        if (!FASTCOVER_checkParameters(data->parameters, dictBufferCapacity,
-                                       data->ctx->f, accel)) {
-          DISPLAYLEVEL(1, "FASTCOVER parameters incorrect\n");
-          free(data);
-          continue;
-        }
-        /* Call the function and pass ownership of data to it */
-        COVER_best_start(&best);
-        if (pool) {
-          POOL_add(pool, &FASTCOVER_tryParameters, data);
-        } else {
-          FASTCOVER_tryParameters(data);
-        }
-        /* Print status */
-        LOCALDISPLAYUPDATE(displayLevel, 2, "\r%u%%       ",
-                           (unsigned)((iteration * 100) / kIterations));
-        ++iteration;
-      }
-      COVER_best_wait(&best);
-      FASTCOVER_ctx_destroy(&ctx);
-    }
-    LOCALDISPLAYLEVEL(displayLevel, 2, "\r%79s\r", "");
-    /* Fill the output buffer and parameters with output of the best parameters */
-    {
-      const size_t dictSize = best.dictSize;
-      if (ZSTD_isError(best.compressedSize)) {
-        const size_t compressedSize = best.compressedSize;
-        COVER_best_destroy(&best);
-        POOL_free(pool);
-        return compressedSize;
-      }
-      FASTCOVER_convertToFastCoverParams(best.parameters, parameters, f, accel);
-      memcpy(dictBuffer, best.dict, dictSize);
-      COVER_best_destroy(&best);
-      POOL_free(pool);
-      return dictSize;
-    }
-
-}
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/dictBuilder/zdict.c mysql-8.0-8.0.27/extra/zstd/lib/dictBuilder/zdict.c
--- mysql-8.0-8.0.26/extra/zstd/lib/dictBuilder/zdict.c	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/dictBuilder/zdict.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1111 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
-
-/*-**************************************
-*  Tuning parameters
-****************************************/
-#define MINRATIO 4   /* minimum nb of apparition to be selected in dictionary */
-#define ZDICT_MAX_SAMPLES_SIZE (2000U << 20)
-#define ZDICT_MIN_SAMPLES_SIZE (ZDICT_CONTENTSIZE_MIN * MINRATIO)
-
-
-/*-**************************************
-*  Compiler Options
-****************************************/
-/* Unix Large Files support (>4GB) */
-#define _FILE_OFFSET_BITS 64
-#if (defined(__sun__) && (!defined(__LP64__)))   /* Sun Solaris 32-bits requires specific definitions */
-#  define _LARGEFILE_SOURCE
-#elif ! defined(__LP64__)                        /* No point defining Large file for 64 bit */
-#  define _LARGEFILE64_SOURCE
-#endif
-
-
-/*-*************************************
-*  Dependencies
-***************************************/
-#include <stdlib.h>        /* malloc, free */
-#include <string.h>        /* memset */
-#include <stdio.h>         /* fprintf, fopen, ftello64 */
-#include <time.h>          /* clock */
-
-#include "mem.h"           /* read */
-#include "fse.h"           /* FSE_normalizeCount, FSE_writeNCount */
-#define HUF_STATIC_LINKING_ONLY
-#include "huf.h"           /* HUF_buildCTable, HUF_writeCTable */
-#include "zstd_internal.h" /* includes zstd.h */
-#include "my_zstd_xxhash.h"        /* XXH64 */
-#include "divsufsort.h"
-#ifndef ZDICT_STATIC_LINKING_ONLY
-#  define ZDICT_STATIC_LINKING_ONLY
-#endif
-#include "zdict.h"
-
-
-/*-*************************************
-*  Constants
-***************************************/
-#define KB *(1 <<10)
-#define MB *(1 <<20)
-#define GB *(1U<<30)
-
-#define DICTLISTSIZE_DEFAULT 10000
-
-#define NOISELENGTH 32
-
-static const int g_compressionLevel_default = 3;
-static const U32 g_selectivity_default = 9;
-
-
-/*-*************************************
-*  Console display
-***************************************/
-#define DISPLAY(...)         { fprintf(stderr, __VA_ARGS__); fflush( stderr ); }
-#define DISPLAYLEVEL(l, ...) if (notificationLevel>=l) { DISPLAY(__VA_ARGS__); }    /* 0 : no display;   1: errors;   2: default;  3: details;  4: debug */
-
-static clock_t ZDICT_clockSpan(clock_t nPrevious) { return clock() - nPrevious; }
-
-static void ZDICT_printHex(const void* ptr, size_t length)
-{
-    const BYTE* const b = (const BYTE*)ptr;
-    size_t u;
-    for (u=0; u<length; u++) {
-        BYTE c = b[u];
-        if (c<32 || c>126) c = '.';   /* non-printable char */
-        DISPLAY("%c", c);
-    }
-}
-
-
-/*-********************************************************
-*  Helper functions
-**********************************************************/
-unsigned ZDICT_isError(size_t errorCode) { return ERR_isError(errorCode); }
-
-const char* ZDICT_getErrorName(size_t errorCode) { return ERR_getErrorName(errorCode); }
-
-unsigned ZDICT_getDictID(const void* dictBuffer, size_t dictSize)
-{
-    if (dictSize < 8) return 0;
-    if (MEM_readLE32(dictBuffer) != ZSTD_MAGIC_DICTIONARY) return 0;
-    return MEM_readLE32((const char*)dictBuffer + 4);
-}
-
-
-/*-********************************************************
-*  Dictionary training functions
-**********************************************************/
-static unsigned ZDICT_NbCommonBytes (size_t val)
-{
-    if (MEM_isLittleEndian()) {
-        if (MEM_64bits()) {
-#       if defined(_MSC_VER) && defined(_WIN64)
-            unsigned long r = 0;
-            _BitScanForward64( &r, (U64)val );
-            return (unsigned)(r>>3);
-#       elif defined(__GNUC__) && (__GNUC__ >= 3)
-            return (__builtin_ctzll((U64)val) >> 3);
-#       else
-            static const int DeBruijnBytePos[64] = { 0, 0, 0, 0, 0, 1, 1, 2, 0, 3, 1, 3, 1, 4, 2, 7, 0, 2, 3, 6, 1, 5, 3, 5, 1, 3, 4, 4, 2, 5, 6, 7, 7, 0, 1, 2, 3, 3, 4, 6, 2, 6, 5, 5, 3, 4, 5, 6, 7, 1, 2, 4, 6, 4, 4, 5, 7, 2, 6, 5, 7, 6, 7, 7 };
-            return DeBruijnBytePos[((U64)((val & -(long long)val) * 0x0218A392CDABBD3FULL)) >> 58];
-#       endif
-        } else { /* 32 bits */
-#       if defined(_MSC_VER)
-            unsigned long r=0;
-            _BitScanForward( &r, (U32)val );
-            return (unsigned)(r>>3);
-#       elif defined(__GNUC__) && (__GNUC__ >= 3)
-            return (__builtin_ctz((U32)val) >> 3);
-#       else
-            static const int DeBruijnBytePos[32] = { 0, 0, 3, 0, 3, 1, 3, 0, 3, 2, 2, 1, 3, 2, 0, 1, 3, 3, 1, 2, 2, 2, 2, 0, 3, 1, 2, 0, 1, 0, 1, 1 };
-            return DeBruijnBytePos[((U32)((val & -(S32)val) * 0x077CB531U)) >> 27];
-#       endif
-        }
-    } else {  /* Big Endian CPU */
-        if (MEM_64bits()) {
-#       if defined(_MSC_VER) && defined(_WIN64)
-            unsigned long r = 0;
-            _BitScanReverse64( &r, val );
-            return (unsigned)(r>>3);
-#       elif defined(__GNUC__) && (__GNUC__ >= 3)
-            return (__builtin_clzll(val) >> 3);
-#       else
-            unsigned r;
-            const unsigned n32 = sizeof(size_t)*4;   /* calculate this way due to compiler complaining in 32-bits mode */
-            if (!(val>>n32)) { r=4; } else { r=0; val>>=n32; }
-            if (!(val>>16)) { r+=2; val>>=8; } else { val>>=24; }
-            r += (!val);
-            return r;
-#       endif
-        } else { /* 32 bits */
-#       if defined(_MSC_VER)
-            unsigned long r = 0;
-            _BitScanReverse( &r, (unsigned long)val );
-            return (unsigned)(r>>3);
-#       elif defined(__GNUC__) && (__GNUC__ >= 3)
-            return (__builtin_clz((U32)val) >> 3);
-#       else
-            unsigned r;
-            if (!(val>>16)) { r=2; val>>=8; } else { r=0; val>>=24; }
-            r += (!val);
-            return r;
-#       endif
-    }   }
-}
-
-
-/*! ZDICT_count() :
-    Count the nb of common bytes between 2 pointers.
-    Note : this function presumes end of buffer followed by noisy guard band.
-*/
-static size_t ZDICT_count(const void* pIn, const void* pMatch)
-{
-    const char* const pStart = (const char*)pIn;
-    for (;;) {
-        size_t const diff = MEM_readST(pMatch) ^ MEM_readST(pIn);
-        if (!diff) {
-            pIn = (const char*)pIn+sizeof(size_t);
-            pMatch = (const char*)pMatch+sizeof(size_t);
-            continue;
-        }
-        pIn = (const char*)pIn+ZDICT_NbCommonBytes(diff);
-        return (size_t)((const char*)pIn - pStart);
-    }
-}
-
-
-typedef struct {
-    U32 pos;
-    U32 length;
-    U32 savings;
-} dictItem;
-
-static void ZDICT_initDictItem(dictItem* d)
-{
-    d->pos = 1;
-    d->length = 0;
-    d->savings = (U32)(-1);
-}
-
-
-#define LLIMIT 64          /* heuristic determined experimentally */
-#define MINMATCHLENGTH 7   /* heuristic determined experimentally */
-static dictItem ZDICT_analyzePos(
-                       BYTE* doneMarks,
-                       const int* suffix, U32 start,
-                       const void* buffer, U32 minRatio, U32 notificationLevel)
-{
-    U32 lengthList[LLIMIT] = {0};
-    U32 cumulLength[LLIMIT] = {0};
-    U32 savings[LLIMIT] = {0};
-    const BYTE* b = (const BYTE*)buffer;
-    size_t maxLength = LLIMIT;
-    size_t pos = suffix[start];
-    U32 end = start;
-    dictItem solution;
-
-    /* init */
-    memset(&solution, 0, sizeof(solution));
-    doneMarks[pos] = 1;
-
-    /* trivial repetition cases */
-    if ( (MEM_read16(b+pos+0) == MEM_read16(b+pos+2))
-       ||(MEM_read16(b+pos+1) == MEM_read16(b+pos+3))
-       ||(MEM_read16(b+pos+2) == MEM_read16(b+pos+4)) ) {
-        /* skip and mark segment */
-        U16 const pattern16 = MEM_read16(b+pos+4);
-        U32 u, patternEnd = 6;
-        while (MEM_read16(b+pos+patternEnd) == pattern16) patternEnd+=2 ;
-        if (b[pos+patternEnd] == b[pos+patternEnd-1]) patternEnd++;
-        for (u=1; u<patternEnd; u++)
-            doneMarks[pos+u] = 1;
-        return solution;
-    }
-
-    /* look forward */
-    {   size_t length;
-        do {
-            end++;
-            length = ZDICT_count(b + pos, b + suffix[end]);
-        } while (length >= MINMATCHLENGTH);
-    }
-
-    /* look backward */
-    {   size_t length;
-        do {
-            length = ZDICT_count(b + pos, b + *(suffix+start-1));
-            if (length >=MINMATCHLENGTH) start--;
-        } while(length >= MINMATCHLENGTH);
-    }
-
-    /* exit if not found a minimum nb of repetitions */
-    if (end-start < minRatio) {
-        U32 idx;
-        for(idx=start; idx<end; idx++)
-            doneMarks[suffix[idx]] = 1;
-        return solution;
-    }
-
-    {   int i;
-        U32 mml;
-        U32 refinedStart = start;
-        U32 refinedEnd = end;
-
-        DISPLAYLEVEL(4, "\n");
-        DISPLAYLEVEL(4, "found %3u matches of length >= %i at pos %7u  ", (unsigned)(end-start), MINMATCHLENGTH, (unsigned)pos);
-        DISPLAYLEVEL(4, "\n");
-
-        for (mml = MINMATCHLENGTH ; ; mml++) {
-            BYTE currentChar = 0;
-            U32 currentCount = 0;
-            U32 currentID = refinedStart;
-            U32 id;
-            U32 selectedCount = 0;
-            U32 selectedID = currentID;
-            for (id =refinedStart; id < refinedEnd; id++) {
-                if (b[suffix[id] + mml] != currentChar) {
-                    if (currentCount > selectedCount) {
-                        selectedCount = currentCount;
-                        selectedID = currentID;
-                    }
-                    currentID = id;
-                    currentChar = b[ suffix[id] + mml];
-                    currentCount = 0;
-                }
-                currentCount ++;
-            }
-            if (currentCount > selectedCount) {  /* for last */
-                selectedCount = currentCount;
-                selectedID = currentID;
-            }
-
-            if (selectedCount < minRatio)
-                break;
-            refinedStart = selectedID;
-            refinedEnd = refinedStart + selectedCount;
-        }
-
-        /* evaluate gain based on new dict */
-        start = refinedStart;
-        pos = suffix[refinedStart];
-        end = start;
-        memset(lengthList, 0, sizeof(lengthList));
-
-        /* look forward */
-        {   size_t length;
-            do {
-                end++;
-                length = ZDICT_count(b + pos, b + suffix[end]);
-                if (length >= LLIMIT) length = LLIMIT-1;
-                lengthList[length]++;
-            } while (length >=MINMATCHLENGTH);
-        }
-
-        /* look backward */
-        {   size_t length = MINMATCHLENGTH;
-            while ((length >= MINMATCHLENGTH) & (start > 0)) {
-                length = ZDICT_count(b + pos, b + suffix[start - 1]);
-                if (length >= LLIMIT) length = LLIMIT - 1;
-                lengthList[length]++;
-                if (length >= MINMATCHLENGTH) start--;
-            }
-        }
-
-        /* largest useful length */
-        memset(cumulLength, 0, sizeof(cumulLength));
-        cumulLength[maxLength-1] = lengthList[maxLength-1];
-        for (i=(int)(maxLength-2); i>=0; i--)
-            cumulLength[i] = cumulLength[i+1] + lengthList[i];
-
-        for (i=LLIMIT-1; i>=MINMATCHLENGTH; i--) if (cumulLength[i]>=minRatio) break;
-        maxLength = i;
-
-        /* reduce maxLength in case of final into repetitive data */
-        {   U32 l = (U32)maxLength;
-            BYTE const c = b[pos + maxLength-1];
-            while (b[pos+l-2]==c) l--;
-            maxLength = l;
-        }
-        if (maxLength < MINMATCHLENGTH) return solution;   /* skip : no long-enough solution */
-
-        /* calculate savings */
-        savings[5] = 0;
-        for (i=MINMATCHLENGTH; i<=(int)maxLength; i++)
-            savings[i] = savings[i-1] + (lengthList[i] * (i-3));
-
-        DISPLAYLEVEL(4, "Selected dict at position %u, of length %u : saves %u (ratio: %.2f)  \n",
-                     (unsigned)pos, (unsigned)maxLength, (unsigned)savings[maxLength], (double)savings[maxLength] / maxLength);
-
-        solution.pos = (U32)pos;
-        solution.length = (U32)maxLength;
-        solution.savings = savings[maxLength];
-
-        /* mark positions done */
-        {   U32 id;
-            for (id=start; id<end; id++) {
-                U32 p, pEnd, length;
-                U32 const testedPos = suffix[id];
-                if (testedPos == pos)
-                    length = solution.length;
-                else {
-                    length = (U32)ZDICT_count(b+pos, b+testedPos);
-                    if (length > solution.length) length = solution.length;
-                }
-                pEnd = (U32)(testedPos + length);
-                for (p=testedPos; p<pEnd; p++)
-                    doneMarks[p] = 1;
-    }   }   }
-
-    return solution;
-}
-
-
-static int isIncluded(const void* in, const void* container, size_t length)
-{
-    const char* const ip = (const char*) in;
-    const char* const into = (const char*) container;
-    size_t u;
-
-    for (u=0; u<length; u++) {  /* works because end of buffer is a noisy guard band */
-        if (ip[u] != into[u]) break;
-    }
-
-    return u==length;
-}
-
-/*! ZDICT_tryMerge() :
-    check if dictItem can be merged, do it if possible
-    @return : id of destination elt, 0 if not merged
-*/
-static U32 ZDICT_tryMerge(dictItem* table, dictItem elt, U32 eltNbToSkip, const void* buffer)
-{
-    const U32 tableSize = table->pos;
-    const U32 eltEnd = elt.pos + elt.length;
-    const char* const buf = (const char*) buffer;
-
-    /* tail overlap */
-    U32 u; for (u=1; u<tableSize; u++) {
-        if (u==eltNbToSkip) continue;
-        if ((table[u].pos > elt.pos) && (table[u].pos <= eltEnd)) {  /* overlap, existing > new */
-            /* append */
-            U32 const addedLength = table[u].pos - elt.pos;
-            table[u].length += addedLength;
-            table[u].pos = elt.pos;
-            table[u].savings += elt.savings * addedLength / elt.length;   /* rough approx */
-            table[u].savings += elt.length / 8;    /* rough approx bonus */
-            elt = table[u];
-            /* sort : improve rank */
-            while ((u>1) && (table[u-1].savings < elt.savings))
-            table[u] = table[u-1], u--;
-            table[u] = elt;
-            return u;
-    }   }
-
-    /* front overlap */
-    for (u=1; u<tableSize; u++) {
-        if (u==eltNbToSkip) continue;
-
-        if ((table[u].pos + table[u].length >= elt.pos) && (table[u].pos < elt.pos)) {  /* overlap, existing < new */
-            /* append */
-            int const addedLength = (int)eltEnd - (table[u].pos + table[u].length);
-            table[u].savings += elt.length / 8;    /* rough approx bonus */
-            if (addedLength > 0) {   /* otherwise, elt fully included into existing */
-                table[u].length += addedLength;
-                table[u].savings += elt.savings * addedLength / elt.length;   /* rough approx */
-            }
-            /* sort : improve rank */
-            elt = table[u];
-            while ((u>1) && (table[u-1].savings < elt.savings))
-                table[u] = table[u-1], u--;
-            table[u] = elt;
-            return u;
-        }
-
-        if (MEM_read64(buf + table[u].pos) == MEM_read64(buf + elt.pos + 1)) {
-            if (isIncluded(buf + table[u].pos, buf + elt.pos + 1, table[u].length)) {
-                size_t const addedLength = MAX( (int)elt.length - (int)table[u].length , 1 );
-                table[u].pos = elt.pos;
-                table[u].savings += (U32)(elt.savings * addedLength / elt.length);
-                table[u].length = MIN(elt.length, table[u].length + 1);
-                return u;
-            }
-        }
-    }
-
-    return 0;
-}
-
-
-static void ZDICT_removeDictItem(dictItem* table, U32 id)
-{
-    /* convention : table[0].pos stores nb of elts */
-    U32 const max = table[0].pos;
-    U32 u;
-    if (!id) return;   /* protection, should never happen */
-    for (u=id; u<max-1; u++)
-        table[u] = table[u+1];
-    table->pos--;
-}
-
-
-static void ZDICT_insertDictItem(dictItem* table, U32 maxSize, dictItem elt, const void* buffer)
-{
-    /* merge if possible */
-    U32 mergeId = ZDICT_tryMerge(table, elt, 0, buffer);
-    if (mergeId) {
-        U32 newMerge = 1;
-        while (newMerge) {
-            newMerge = ZDICT_tryMerge(table, table[mergeId], mergeId, buffer);
-            if (newMerge) ZDICT_removeDictItem(table, mergeId);
-            mergeId = newMerge;
-        }
-        return;
-    }
-
-    /* insert */
-    {   U32 current;
-        U32 nextElt = table->pos;
-        if (nextElt >= maxSize) nextElt = maxSize-1;
-        current = nextElt-1;
-        while (table[current].savings < elt.savings) {
-            table[current+1] = table[current];
-            current--;
-        }
-        table[current+1] = elt;
-        table->pos = nextElt+1;
-    }
-}
-
-
-static U32 ZDICT_dictSize(const dictItem* dictList)
-{
-    U32 u, dictSize = 0;
-    for (u=1; u<dictList[0].pos; u++)
-        dictSize += dictList[u].length;
-    return dictSize;
-}
-
-
-static size_t ZDICT_trainBuffer_legacy(dictItem* dictList, U32 dictListSize,
-                            const void* const buffer, size_t bufferSize,   /* buffer must end with noisy guard band */
-                            const size_t* fileSizes, unsigned nbFiles,
-                            unsigned minRatio, U32 notificationLevel)
-{
-    int* const suffix0 = (int*)malloc((bufferSize+2)*sizeof(*suffix0));
-    int* const suffix = suffix0+1;
-    U32* reverseSuffix = (U32*)malloc((bufferSize)*sizeof(*reverseSuffix));
-    BYTE* doneMarks = (BYTE*)malloc((bufferSize+16)*sizeof(*doneMarks));   /* +16 for overflow security */
-    U32* filePos = (U32*)malloc(nbFiles * sizeof(*filePos));
-    size_t result = 0;
-    clock_t displayClock = 0;
-    clock_t const refreshRate = CLOCKS_PER_SEC * 3 / 10;
-
-#   define DISPLAYUPDATE(l, ...) if (notificationLevel>=l) { \
-            if (ZDICT_clockSpan(displayClock) > refreshRate)  \
-            { displayClock = clock(); DISPLAY(__VA_ARGS__); \
-            if (notificationLevel>=4) fflush(stderr); } }
-
-    /* init */
-    DISPLAYLEVEL(2, "\r%70s\r", "");   /* clean display line */
-    if (!suffix0 || !reverseSuffix || !doneMarks || !filePos) {
-        result = ERROR(memory_allocation);
-        goto _cleanup;
-    }
-    if (minRatio < MINRATIO) minRatio = MINRATIO;
-    memset(doneMarks, 0, bufferSize+16);
-
-    /* limit sample set size (divsufsort limitation)*/
-    if (bufferSize > ZDICT_MAX_SAMPLES_SIZE) DISPLAYLEVEL(3, "sample set too large : reduced to %u MB ...\n", (unsigned)(ZDICT_MAX_SAMPLES_SIZE>>20));
-    while (bufferSize > ZDICT_MAX_SAMPLES_SIZE) bufferSize -= fileSizes[--nbFiles];
-
-    /* sort */
-    DISPLAYLEVEL(2, "sorting %u files of total size %u MB ...\n", nbFiles, (unsigned)(bufferSize>>20));
-    {   int const divSuftSortResult = divsufsort((const unsigned char*)buffer, suffix, (int)bufferSize, 0);
-        if (divSuftSortResult != 0) { result = ERROR(GENERIC); goto _cleanup; }
-    }
-    suffix[bufferSize] = (int)bufferSize;   /* leads into noise */
-    suffix0[0] = (int)bufferSize;           /* leads into noise */
-    /* build reverse suffix sort */
-    {   size_t pos;
-        for (pos=0; pos < bufferSize; pos++)
-            reverseSuffix[suffix[pos]] = (U32)pos;
-        /* note filePos tracks borders between samples.
-           It's not used at this stage, but planned to become useful in a later update */
-        filePos[0] = 0;
-        for (pos=1; pos<nbFiles; pos++)
-            filePos[pos] = (U32)(filePos[pos-1] + fileSizes[pos-1]);
-    }
-
-    DISPLAYLEVEL(2, "finding patterns ... \n");
-    DISPLAYLEVEL(3, "minimum ratio : %u \n", minRatio);
-
-    {   U32 cursor; for (cursor=0; cursor < bufferSize; ) {
-            dictItem solution;
-            if (doneMarks[cursor]) { cursor++; continue; }
-            solution = ZDICT_analyzePos(doneMarks, suffix, reverseSuffix[cursor], buffer, minRatio, notificationLevel);
-            if (solution.length==0) { cursor++; continue; }
-            ZDICT_insertDictItem(dictList, dictListSize, solution, buffer);
-            cursor += solution.length;
-            DISPLAYUPDATE(2, "\r%4.2f %% \r", (double)cursor / bufferSize * 100);
-    }   }
-
-_cleanup:
-    free(suffix0);
-    free(reverseSuffix);
-    free(doneMarks);
-    free(filePos);
-    return result;
-}
-
-
-static void ZDICT_fillNoise(void* buffer, size_t length)
-{
-    unsigned const prime1 = 2654435761U;
-    unsigned const prime2 = 2246822519U;
-    unsigned acc = prime1;
-    size_t p=0;;
-    for (p=0; p<length; p++) {
-        acc *= prime2;
-        ((unsigned char*)buffer)[p] = (unsigned char)(acc >> 21);
-    }
-}
-
-
-typedef struct
-{
-    ZSTD_CDict* dict;    /* dictionary */
-    ZSTD_CCtx* zc;     /* working context */
-    void* workPlace;   /* must be ZSTD_BLOCKSIZE_MAX allocated */
-} EStats_ress_t;
-
-#define MAXREPOFFSET 1024
-
-static void ZDICT_countEStats(EStats_ress_t esr, ZSTD_parameters params,
-                              unsigned* countLit, unsigned* offsetcodeCount, unsigned* matchlengthCount, unsigned* litlengthCount, U32* repOffsets,
-                              const void* src, size_t srcSize,
-                              U32 notificationLevel)
-{
-    size_t const blockSizeMax = MIN (ZSTD_BLOCKSIZE_MAX, 1 << params.cParams.windowLog);
-    size_t cSize;
-
-    if (srcSize > blockSizeMax) srcSize = blockSizeMax;   /* protection vs large samples */
-    {   size_t const errorCode = ZSTD_compressBegin_usingCDict(esr.zc, esr.dict);
-        if (ZSTD_isError(errorCode)) { DISPLAYLEVEL(1, "warning : ZSTD_compressBegin_usingCDict failed \n"); return; }
-
-    }
-    cSize = ZSTD_compressBlock(esr.zc, esr.workPlace, ZSTD_BLOCKSIZE_MAX, src, srcSize);
-    if (ZSTD_isError(cSize)) { DISPLAYLEVEL(3, "warning : could not compress sample size %u \n", (unsigned)srcSize); return; }
-
-    if (cSize) {  /* if == 0; block is not compressible */
-        const seqStore_t* const seqStorePtr = ZSTD_getSeqStore(esr.zc);
-
-        /* literals stats */
-        {   const BYTE* bytePtr;
-            for(bytePtr = seqStorePtr->litStart; bytePtr < seqStorePtr->lit; bytePtr++)
-                countLit[*bytePtr]++;
-        }
-
-        /* seqStats */
-        {   U32 const nbSeq = (U32)(seqStorePtr->sequences - seqStorePtr->sequencesStart);
-            ZSTD_seqToCodes(seqStorePtr);
-
-            {   const BYTE* codePtr = seqStorePtr->ofCode;
-                U32 u;
-                for (u=0; u<nbSeq; u++) offsetcodeCount[codePtr[u]]++;
-            }
-
-            {   const BYTE* codePtr = seqStorePtr->mlCode;
-                U32 u;
-                for (u=0; u<nbSeq; u++) matchlengthCount[codePtr[u]]++;
-            }
-
-            {   const BYTE* codePtr = seqStorePtr->llCode;
-                U32 u;
-                for (u=0; u<nbSeq; u++) litlengthCount[codePtr[u]]++;
-            }
-
-            if (nbSeq >= 2) { /* rep offsets */
-                const seqDef* const seq = seqStorePtr->sequencesStart;
-                U32 offset1 = seq[0].offset - 3;
-                U32 offset2 = seq[1].offset - 3;
-                if (offset1 >= MAXREPOFFSET) offset1 = 0;
-                if (offset2 >= MAXREPOFFSET) offset2 = 0;
-                repOffsets[offset1] += 3;
-                repOffsets[offset2] += 1;
-    }   }   }
-}
-
-static size_t ZDICT_totalSampleSize(const size_t* fileSizes, unsigned nbFiles)
-{
-    size_t total=0;
-    unsigned u;
-    for (u=0; u<nbFiles; u++) total += fileSizes[u];
-    return total;
-}
-
-typedef struct { U32 offset; U32 count; } offsetCount_t;
-
-static void ZDICT_insertSortCount(offsetCount_t table[ZSTD_REP_NUM+1], U32 val, U32 count)
-{
-    U32 u;
-    table[ZSTD_REP_NUM].offset = val;
-    table[ZSTD_REP_NUM].count = count;
-    for (u=ZSTD_REP_NUM; u>0; u--) {
-        offsetCount_t tmp;
-        if (table[u-1].count >= table[u].count) break;
-        tmp = table[u-1];
-        table[u-1] = table[u];
-        table[u] = tmp;
-    }
-}
-
-/* ZDICT_flatLit() :
- * rewrite `countLit` to contain a mostly flat but still compressible distribution of literals.
- * necessary to avoid generating a non-compressible distribution that HUF_writeCTable() cannot encode.
- */
-static void ZDICT_flatLit(unsigned* countLit)
-{
-    int u;
-    for (u=1; u<256; u++) countLit[u] = 2;
-    countLit[0]   = 4;
-    countLit[253] = 1;
-    countLit[254] = 1;
-}
-
-#define OFFCODE_MAX 30  /* only applicable to first block */
-static size_t ZDICT_analyzeEntropy(void*  dstBuffer, size_t maxDstSize,
-                                   unsigned compressionLevel,
-                             const void*  srcBuffer, const size_t* fileSizes, unsigned nbFiles,
-                             const void* dictBuffer, size_t  dictBufferSize,
-                                   unsigned notificationLevel)
-{
-    unsigned countLit[256];
-    HUF_CREATE_STATIC_CTABLE(hufTable, 255);
-    unsigned offcodeCount[OFFCODE_MAX+1];
-    short offcodeNCount[OFFCODE_MAX+1];
-    U32 offcodeMax = ZSTD_highbit32((U32)(dictBufferSize + 128 KB));
-    unsigned matchLengthCount[MaxML+1];
-    short matchLengthNCount[MaxML+1];
-    unsigned litLengthCount[MaxLL+1];
-    short litLengthNCount[MaxLL+1];
-    U32 repOffset[MAXREPOFFSET];
-    offsetCount_t bestRepOffset[ZSTD_REP_NUM+1];
-    EStats_ress_t esr = { NULL, NULL, NULL };
-    ZSTD_parameters params;
-    U32 u, huffLog = 11, Offlog = OffFSELog, mlLog = MLFSELog, llLog = LLFSELog, total;
-    size_t pos = 0, errorCode;
-    size_t eSize = 0;
-    size_t const totalSrcSize = ZDICT_totalSampleSize(fileSizes, nbFiles);
-    size_t const averageSampleSize = totalSrcSize / (nbFiles + !nbFiles);
-    BYTE* dstPtr = (BYTE*)dstBuffer;
-
-    /* init */
-    DEBUGLOG(4, "ZDICT_analyzeEntropy");
-    if (offcodeMax>OFFCODE_MAX) { eSize = ERROR(dictionaryCreation_failed); goto _cleanup; }   /* too large dictionary */
-    for (u=0; u<256; u++) countLit[u] = 1;   /* any character must be described */
-    for (u=0; u<=offcodeMax; u++) offcodeCount[u] = 1;
-    for (u=0; u<=MaxML; u++) matchLengthCount[u] = 1;
-    for (u=0; u<=MaxLL; u++) litLengthCount[u] = 1;
-    memset(repOffset, 0, sizeof(repOffset));
-    repOffset[1] = repOffset[4] = repOffset[8] = 1;
-    memset(bestRepOffset, 0, sizeof(bestRepOffset));
-    if (compressionLevel==0) compressionLevel = g_compressionLevel_default;
-    params = ZSTD_getParams(compressionLevel, averageSampleSize, dictBufferSize);
-
-    esr.dict = ZSTD_createCDict_advanced(dictBuffer, dictBufferSize, ZSTD_dlm_byRef, ZSTD_dct_rawContent, params.cParams, ZSTD_defaultCMem);
-    esr.zc = ZSTD_createCCtx();
-    esr.workPlace = malloc(ZSTD_BLOCKSIZE_MAX);
-    if (!esr.dict || !esr.zc || !esr.workPlace) {
-        eSize = ERROR(memory_allocation);
-        DISPLAYLEVEL(1, "Not enough memory \n");
-        goto _cleanup;
-    }
-
-    /* collect stats on all samples */
-    for (u=0; u<nbFiles; u++) {
-        ZDICT_countEStats(esr, params,
-                          countLit, offcodeCount, matchLengthCount, litLengthCount, repOffset,
-                         (const char*)srcBuffer + pos, fileSizes[u],
-                          notificationLevel);
-        pos += fileSizes[u];
-    }
-
-    /* analyze, build stats, starting with literals */
-    {   size_t maxNbBits = HUF_buildCTable (hufTable, countLit, 255, huffLog);
-        if (HUF_isError(maxNbBits)) {
-            eSize = maxNbBits;
-            DISPLAYLEVEL(1, " HUF_buildCTable error \n");
-            goto _cleanup;
-        }
-        if (maxNbBits==8) {  /* not compressible : will fail on HUF_writeCTable() */
-            DISPLAYLEVEL(2, "warning : pathological dataset : literals are not compressible : samples are noisy or too regular \n");
-            ZDICT_flatLit(countLit);  /* replace distribution by a fake "mostly flat but still compressible" distribution, that HUF_writeCTable() can encode */
-            maxNbBits = HUF_buildCTable (hufTable, countLit, 255, huffLog);
-            assert(maxNbBits==9);
-        }
-        huffLog = (U32)maxNbBits;
-    }
-
-    /* looking for most common first offsets */
-    {   U32 offset;
-        for (offset=1; offset<MAXREPOFFSET; offset++)
-            ZDICT_insertSortCount(bestRepOffset, offset, repOffset[offset]);
-    }
-    /* note : the result of this phase should be used to better appreciate the impact on statistics */
-
-    total=0; for (u=0; u<=offcodeMax; u++) total+=offcodeCount[u];
-    errorCode = FSE_normalizeCount(offcodeNCount, Offlog, offcodeCount, total, offcodeMax);
-    if (FSE_isError(errorCode)) {
-        eSize = errorCode;
-        DISPLAYLEVEL(1, "FSE_normalizeCount error with offcodeCount \n");
-        goto _cleanup;
-    }
-    Offlog = (U32)errorCode;
-
-    total=0; for (u=0; u<=MaxML; u++) total+=matchLengthCount[u];
-    errorCode = FSE_normalizeCount(matchLengthNCount, mlLog, matchLengthCount, total, MaxML);
-    if (FSE_isError(errorCode)) {
-        eSize = errorCode;
-        DISPLAYLEVEL(1, "FSE_normalizeCount error with matchLengthCount \n");
-        goto _cleanup;
-    }
-    mlLog = (U32)errorCode;
-
-    total=0; for (u=0; u<=MaxLL; u++) total+=litLengthCount[u];
-    errorCode = FSE_normalizeCount(litLengthNCount, llLog, litLengthCount, total, MaxLL);
-    if (FSE_isError(errorCode)) {
-        eSize = errorCode;
-        DISPLAYLEVEL(1, "FSE_normalizeCount error with litLengthCount \n");
-        goto _cleanup;
-    }
-    llLog = (U32)errorCode;
-
-    /* write result to buffer */
-    {   size_t const hhSize = HUF_writeCTable(dstPtr, maxDstSize, hufTable, 255, huffLog);
-        if (HUF_isError(hhSize)) {
-            eSize = hhSize;
-            DISPLAYLEVEL(1, "HUF_writeCTable error \n");
-            goto _cleanup;
-        }
-        dstPtr += hhSize;
-        maxDstSize -= hhSize;
-        eSize += hhSize;
-    }
-
-    {   size_t const ohSize = FSE_writeNCount(dstPtr, maxDstSize, offcodeNCount, OFFCODE_MAX, Offlog);
-        if (FSE_isError(ohSize)) {
-            eSize = ohSize;
-            DISPLAYLEVEL(1, "FSE_writeNCount error with offcodeNCount \n");
-            goto _cleanup;
-        }
-        dstPtr += ohSize;
-        maxDstSize -= ohSize;
-        eSize += ohSize;
-    }
-
-    {   size_t const mhSize = FSE_writeNCount(dstPtr, maxDstSize, matchLengthNCount, MaxML, mlLog);
-        if (FSE_isError(mhSize)) {
-            eSize = mhSize;
-            DISPLAYLEVEL(1, "FSE_writeNCount error with matchLengthNCount \n");
-            goto _cleanup;
-        }
-        dstPtr += mhSize;
-        maxDstSize -= mhSize;
-        eSize += mhSize;
-    }
-
-    {   size_t const lhSize = FSE_writeNCount(dstPtr, maxDstSize, litLengthNCount, MaxLL, llLog);
-        if (FSE_isError(lhSize)) {
-            eSize = lhSize;
-            DISPLAYLEVEL(1, "FSE_writeNCount error with litlengthNCount \n");
-            goto _cleanup;
-        }
-        dstPtr += lhSize;
-        maxDstSize -= lhSize;
-        eSize += lhSize;
-    }
-
-    if (maxDstSize<12) {
-        eSize = ERROR(dstSize_tooSmall);
-        DISPLAYLEVEL(1, "not enough space to write RepOffsets \n");
-        goto _cleanup;
-    }
-# if 0
-    MEM_writeLE32(dstPtr+0, bestRepOffset[0].offset);
-    MEM_writeLE32(dstPtr+4, bestRepOffset[1].offset);
-    MEM_writeLE32(dstPtr+8, bestRepOffset[2].offset);
-#else
-    /* at this stage, we don't use the result of "most common first offset",
-       as the impact of statistics is not properly evaluated */
-    MEM_writeLE32(dstPtr+0, repStartValue[0]);
-    MEM_writeLE32(dstPtr+4, repStartValue[1]);
-    MEM_writeLE32(dstPtr+8, repStartValue[2]);
-#endif
-    eSize += 12;
-
-_cleanup:
-    ZSTD_freeCDict(esr.dict);
-    ZSTD_freeCCtx(esr.zc);
-    free(esr.workPlace);
-
-    return eSize;
-}
-
-
-
-size_t ZDICT_finalizeDictionary(void* dictBuffer, size_t dictBufferCapacity,
-                          const void* customDictContent, size_t dictContentSize,
-                          const void* samplesBuffer, const size_t* samplesSizes,
-                          unsigned nbSamples, ZDICT_params_t params)
-{
-    size_t hSize;
-#define HBUFFSIZE 256   /* should prove large enough for all entropy headers */
-    BYTE header[HBUFFSIZE];
-    int const compressionLevel = (params.compressionLevel == 0) ? g_compressionLevel_default : params.compressionLevel;
-    U32 const notificationLevel = params.notificationLevel;
-
-    /* check conditions */
-    DEBUGLOG(4, "ZDICT_finalizeDictionary");
-    if (dictBufferCapacity < dictContentSize) return ERROR(dstSize_tooSmall);
-    if (dictContentSize < ZDICT_CONTENTSIZE_MIN) return ERROR(srcSize_wrong);
-    if (dictBufferCapacity < ZDICT_DICTSIZE_MIN) return ERROR(dstSize_tooSmall);
-
-    /* dictionary header */
-    MEM_writeLE32(header, ZSTD_MAGIC_DICTIONARY);
-    {   U64 const randomID = XXH64(customDictContent, dictContentSize, 0);
-        U32 const compliantID = (randomID % ((1U<<31)-32768)) + 32768;
-        U32 const dictID = params.dictID ? params.dictID : compliantID;
-        MEM_writeLE32(header+4, dictID);
-    }
-    hSize = 8;
-
-    /* entropy tables */
-    DISPLAYLEVEL(2, "\r%70s\r", "");   /* clean display line */
-    DISPLAYLEVEL(2, "statistics ... \n");
-    {   size_t const eSize = ZDICT_analyzeEntropy(header+hSize, HBUFFSIZE-hSize,
-                                  compressionLevel,
-                                  samplesBuffer, samplesSizes, nbSamples,
-                                  customDictContent, dictContentSize,
-                                  notificationLevel);
-        if (ZDICT_isError(eSize)) return eSize;
-        hSize += eSize;
-    }
-
-    /* copy elements in final buffer ; note : src and dst buffer can overlap */
-    if (hSize + dictContentSize > dictBufferCapacity) dictContentSize = dictBufferCapacity - hSize;
-    {   size_t const dictSize = hSize + dictContentSize;
-        char* dictEnd = (char*)dictBuffer + dictSize;
-        memmove(dictEnd - dictContentSize, customDictContent, dictContentSize);
-        memcpy(dictBuffer, header, hSize);
-        return dictSize;
-    }
-}
-
-
-static size_t ZDICT_addEntropyTablesFromBuffer_advanced(
-        void* dictBuffer, size_t dictContentSize, size_t dictBufferCapacity,
-        const void* samplesBuffer, const size_t* samplesSizes, unsigned nbSamples,
-        ZDICT_params_t params)
-{
-    int const compressionLevel = (params.compressionLevel == 0) ? g_compressionLevel_default : params.compressionLevel;
-    U32 const notificationLevel = params.notificationLevel;
-    size_t hSize = 8;
-
-    /* calculate entropy tables */
-    DISPLAYLEVEL(2, "\r%70s\r", "");   /* clean display line */
-    DISPLAYLEVEL(2, "statistics ... \n");
-    {   size_t const eSize = ZDICT_analyzeEntropy((char*)dictBuffer+hSize, dictBufferCapacity-hSize,
-                                  compressionLevel,
-                                  samplesBuffer, samplesSizes, nbSamples,
-                                  (char*)dictBuffer + dictBufferCapacity - dictContentSize, dictContentSize,
-                                  notificationLevel);
-        if (ZDICT_isError(eSize)) return eSize;
-        hSize += eSize;
-    }
-
-    /* add dictionary header (after entropy tables) */
-    MEM_writeLE32(dictBuffer, ZSTD_MAGIC_DICTIONARY);
-    {   U64 const randomID = XXH64((char*)dictBuffer + dictBufferCapacity - dictContentSize, dictContentSize, 0);
-        U32 const compliantID = (randomID % ((1U<<31)-32768)) + 32768;
-        U32 const dictID = params.dictID ? params.dictID : compliantID;
-        MEM_writeLE32((char*)dictBuffer+4, dictID);
-    }
-
-    if (hSize + dictContentSize < dictBufferCapacity)
-        memmove((char*)dictBuffer + hSize, (char*)dictBuffer + dictBufferCapacity - dictContentSize, dictContentSize);
-    return MIN(dictBufferCapacity, hSize+dictContentSize);
-}
-
-/* Hidden declaration for dbio.c */
-size_t ZDICT_trainFromBuffer_unsafe_legacy(
-                            void* dictBuffer, size_t maxDictSize,
-                            const void* samplesBuffer, const size_t* samplesSizes, unsigned nbSamples,
-                            ZDICT_legacy_params_t params);
-/*! ZDICT_trainFromBuffer_unsafe_legacy() :
-*   Warning : `samplesBuffer` must be followed by noisy guard band.
-*   @return : size of dictionary, or an error code which can be tested with ZDICT_isError()
-*/
-size_t ZDICT_trainFromBuffer_unsafe_legacy(
-                            void* dictBuffer, size_t maxDictSize,
-                            const void* samplesBuffer, const size_t* samplesSizes, unsigned nbSamples,
-                            ZDICT_legacy_params_t params)
-{
-    U32 const dictListSize = MAX(MAX(DICTLISTSIZE_DEFAULT, nbSamples), (U32)(maxDictSize/16));
-    dictItem* const dictList = (dictItem*)malloc(dictListSize * sizeof(*dictList));
-    unsigned const selectivity = params.selectivityLevel == 0 ? g_selectivity_default : params.selectivityLevel;
-    unsigned const minRep = (selectivity > 30) ? MINRATIO : nbSamples >> selectivity;
-    size_t const targetDictSize = maxDictSize;
-    size_t const samplesBuffSize = ZDICT_totalSampleSize(samplesSizes, nbSamples);
-    size_t dictSize = 0;
-    U32 const notificationLevel = params.zParams.notificationLevel;
-
-    /* checks */
-    if (!dictList) return ERROR(memory_allocation);
-    if (maxDictSize < ZDICT_DICTSIZE_MIN) { free(dictList); return ERROR(dstSize_tooSmall); }   /* requested dictionary size is too small */
-    if (samplesBuffSize < ZDICT_MIN_SAMPLES_SIZE) { free(dictList); return ERROR(dictionaryCreation_failed); }   /* not enough source to create dictionary */
-
-    /* init */
-    ZDICT_initDictItem(dictList);
-
-    /* build dictionary */
-    ZDICT_trainBuffer_legacy(dictList, dictListSize,
-                       samplesBuffer, samplesBuffSize,
-                       samplesSizes, nbSamples,
-                       minRep, notificationLevel);
-
-    /* display best matches */
-    if (params.zParams.notificationLevel>= 3) {
-        unsigned const nb = MIN(25, dictList[0].pos);
-        unsigned const dictContentSize = ZDICT_dictSize(dictList);
-        unsigned u;
-        DISPLAYLEVEL(3, "\n %u segments found, of total size %u \n", (unsigned)dictList[0].pos-1, dictContentSize);
-        DISPLAYLEVEL(3, "list %u best segments \n", nb-1);
-        for (u=1; u<nb; u++) {
-            unsigned const pos = dictList[u].pos;
-            unsigned const length = dictList[u].length;
-            U32 const printedLength = MIN(40, length);
-            if ((pos > samplesBuffSize) || ((pos + length) > samplesBuffSize)) {
-                free(dictList);
-                return ERROR(GENERIC);   /* should never happen */
-            }
-            DISPLAYLEVEL(3, "%3u:%3u bytes at pos %8u, savings %7u bytes |",
-                         u, length, pos, (unsigned)dictList[u].savings);
-            ZDICT_printHex((const char*)samplesBuffer+pos, printedLength);
-            DISPLAYLEVEL(3, "| \n");
-    }   }
-
-
-    /* create dictionary */
-    {   unsigned dictContentSize = ZDICT_dictSize(dictList);
-        if (dictContentSize < ZDICT_CONTENTSIZE_MIN) { free(dictList); return ERROR(dictionaryCreation_failed); }   /* dictionary content too small */
-        if (dictContentSize < targetDictSize/4) {
-            DISPLAYLEVEL(2, "!  warning : selected content significantly smaller than requested (%u < %u) \n", dictContentSize, (unsigned)maxDictSize);
-            if (samplesBuffSize < 10 * targetDictSize)
-                DISPLAYLEVEL(2, "!  consider increasing the number of samples (total size : %u MB)\n", (unsigned)(samplesBuffSize>>20));
-            if (minRep > MINRATIO) {
-                DISPLAYLEVEL(2, "!  consider increasing selectivity to produce larger dictionary (-s%u) \n", selectivity+1);
-                DISPLAYLEVEL(2, "!  note : larger dictionaries are not necessarily better, test its efficiency on samples \n");
-            }
-        }
-
-        if ((dictContentSize > targetDictSize*3) && (nbSamples > 2*MINRATIO) && (selectivity>1)) {
-            unsigned proposedSelectivity = selectivity-1;
-            while ((nbSamples >> proposedSelectivity) <= MINRATIO) { proposedSelectivity--; }
-            DISPLAYLEVEL(2, "!  note : calculated dictionary significantly larger than requested (%u > %u) \n", dictContentSize, (unsigned)maxDictSize);
-            DISPLAYLEVEL(2, "!  consider increasing dictionary size, or produce denser dictionary (-s%u) \n", proposedSelectivity);
-            DISPLAYLEVEL(2, "!  always test dictionary efficiency on real samples \n");
-        }
-
-        /* limit dictionary size */
-        {   U32 const max = dictList->pos;   /* convention : nb of useful elts within dictList */
-            U32 currentSize = 0;
-            U32 n; for (n=1; n<max; n++) {
-                currentSize += dictList[n].length;
-                if (currentSize > targetDictSize) { currentSize -= dictList[n].length; break; }
-            }
-            dictList->pos = n;
-            dictContentSize = currentSize;
-        }
-
-        /* build dict content */
-        {   U32 u;
-            BYTE* ptr = (BYTE*)dictBuffer + maxDictSize;
-            for (u=1; u<dictList->pos; u++) {
-                U32 l = dictList[u].length;
-                ptr -= l;
-                if (ptr<(BYTE*)dictBuffer) { free(dictList); return ERROR(GENERIC); }   /* should not happen */
-                memcpy(ptr, (const char*)samplesBuffer+dictList[u].pos, l);
-        }   }
-
-        dictSize = ZDICT_addEntropyTablesFromBuffer_advanced(dictBuffer, dictContentSize, maxDictSize,
-                                                             samplesBuffer, samplesSizes, nbSamples,
-                                                             params.zParams);
-    }
-
-    /* clean up */
-    free(dictList);
-    return dictSize;
-}
-
-
-/* ZDICT_trainFromBuffer_legacy() :
- * issue : samplesBuffer need to be followed by a noisy guard band.
- * work around : duplicate the buffer, and add the noise */
-size_t ZDICT_trainFromBuffer_legacy(void* dictBuffer, size_t dictBufferCapacity,
-                              const void* samplesBuffer, const size_t* samplesSizes, unsigned nbSamples,
-                              ZDICT_legacy_params_t params)
-{
-    size_t result;
-    void* newBuff;
-    size_t const sBuffSize = ZDICT_totalSampleSize(samplesSizes, nbSamples);
-    if (sBuffSize < ZDICT_MIN_SAMPLES_SIZE) return 0;   /* not enough content => no dictionary */
-
-    newBuff = malloc(sBuffSize + NOISELENGTH);
-    if (!newBuff) return ERROR(memory_allocation);
-
-    memcpy(newBuff, samplesBuffer, sBuffSize);
-    ZDICT_fillNoise((char*)newBuff + sBuffSize, NOISELENGTH);   /* guard band, for end of buffer condition */
-
-    result =
-        ZDICT_trainFromBuffer_unsafe_legacy(dictBuffer, dictBufferCapacity, newBuff,
-                                            samplesSizes, nbSamples, params);
-    free(newBuff);
-    return result;
-}
-
-
-size_t ZDICT_trainFromBuffer(void* dictBuffer, size_t dictBufferCapacity,
-                             const void* samplesBuffer, const size_t* samplesSizes, unsigned nbSamples)
-{
-    ZDICT_fastCover_params_t params;
-    DEBUGLOG(3, "ZDICT_trainFromBuffer");
-    memset(&params, 0, sizeof(params));
-    params.d = 8;
-    params.steps = 4;
-    /* Default to level 6 since no compression level information is available */
-    params.zParams.compressionLevel = 3;
-#if defined(DEBUGLEVEL) && (DEBUGLEVEL>=1)
-    params.zParams.notificationLevel = DEBUGLEVEL;
-#endif
-    return ZDICT_optimizeTrainFromBuffer_fastCover(dictBuffer, dictBufferCapacity,
-                                               samplesBuffer, samplesSizes, nbSamples,
-                                               &params);
-}
-
-size_t ZDICT_addEntropyTablesFromBuffer(void* dictBuffer, size_t dictContentSize, size_t dictBufferCapacity,
-                                  const void* samplesBuffer, const size_t* samplesSizes, unsigned nbSamples)
-{
-    ZDICT_params_t params;
-    memset(&params, 0, sizeof(params));
-    return ZDICT_addEntropyTablesFromBuffer_advanced(dictBuffer, dictContentSize, dictBufferCapacity,
-                                                     samplesBuffer, samplesSizes, nbSamples,
-                                                     params);
-}
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/dictBuilder/zdict.h mysql-8.0-8.0.27/extra/zstd/lib/dictBuilder/zdict.h
--- mysql-8.0-8.0.26/extra/zstd/lib/dictBuilder/zdict.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/dictBuilder/zdict.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,282 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-
-#ifndef DICTBUILDER_H_001
-#define DICTBUILDER_H_001
-
-#if defined (__cplusplus)
-extern "C" {
-#endif
-
-
-/*======  Dependencies  ======*/
-#include <stddef.h>  /* size_t */
-
-
-/* =====   ZDICTLIB_API : control library symbols visibility   ===== */
-#ifndef ZDICTLIB_VISIBILITY
-#  if defined(__GNUC__) && (__GNUC__ >= 4)
-#    define ZDICTLIB_VISIBILITY __attribute__ ((visibility ("default")))
-#  else
-#    define ZDICTLIB_VISIBILITY
-#  endif
-#endif
-#if defined(ZSTD_DLL_EXPORT) && (ZSTD_DLL_EXPORT==1)
-#  define ZDICTLIB_API __declspec(dllexport) ZDICTLIB_VISIBILITY
-#elif defined(ZSTD_DLL_IMPORT) && (ZSTD_DLL_IMPORT==1)
-#  define ZDICTLIB_API __declspec(dllimport) ZDICTLIB_VISIBILITY /* It isn't required but allows to generate better code, saving a function pointer load from the IAT and an indirect jump.*/
-#else
-#  define ZDICTLIB_API ZDICTLIB_VISIBILITY
-#endif
-
-
-/*! ZDICT_trainFromBuffer():
- *  Train a dictionary from an array of samples.
- *  Redirect towards ZDICT_optimizeTrainFromBuffer_fastCover() single-threaded, with d=8, steps=4,
- *  f=20, and accel=1.
- *  Samples must be stored concatenated in a single flat buffer `samplesBuffer`,
- *  supplied with an array of sizes `samplesSizes`, providing the size of each sample, in order.
- *  The resulting dictionary will be saved into `dictBuffer`.
- * @return: size of dictionary stored into `dictBuffer` (<= `dictBufferCapacity`)
- *          or an error code, which can be tested with ZDICT_isError().
- *  Note:  Dictionary training will fail if there are not enough samples to construct a
- *         dictionary, or if most of the samples are too small (< 8 bytes being the lower limit).
- *         If dictionary training fails, you should use zstd without a dictionary, as the dictionary
- *         would've been ineffective anyways. If you believe your samples would benefit from a dictionary
- *         please open an issue with details, and we can look into it.
- *  Note: ZDICT_trainFromBuffer()'s memory usage is about 6 MB.
- *  Tips: In general, a reasonable dictionary has a size of ~ 100 KB.
- *        It's possible to select smaller or larger size, just by specifying `dictBufferCapacity`.
- *        In general, it's recommended to provide a few thousands samples, though this can vary a lot.
- *        It's recommended that total size of all samples be about ~x100 times the target size of dictionary.
- */
-ZDICTLIB_API size_t ZDICT_trainFromBuffer(void* dictBuffer, size_t dictBufferCapacity,
-                                    const void* samplesBuffer,
-                                    const size_t* samplesSizes, unsigned nbSamples);
-
-
-/*======   Helper functions   ======*/
-ZDICTLIB_API unsigned ZDICT_getDictID(const void* dictBuffer, size_t dictSize);  /**< extracts dictID; @return zero if error (not a valid dictionary) */
-ZDICTLIB_API unsigned ZDICT_isError(size_t errorCode);
-ZDICTLIB_API const char* ZDICT_getErrorName(size_t errorCode);
-
-
-
-#ifdef ZDICT_STATIC_LINKING_ONLY
-
-/* ====================================================================================
- * The definitions in this section are considered experimental.
- * They should never be used with a dynamic library, as they may change in the future.
- * They are provided for advanced usages.
- * Use them only in association with static linking.
- * ==================================================================================== */
-
-typedef struct {
-    int      compressionLevel;   /* optimize for a specific zstd compression level; 0 means default */
-    unsigned notificationLevel;  /* Write log to stderr; 0 = none (default); 1 = errors; 2 = progression; 3 = details; 4 = debug; */
-    unsigned dictID;             /* force dictID value; 0 means auto mode (32-bits random value) */
-} ZDICT_params_t;
-
-/*! ZDICT_cover_params_t:
- *  k and d are the only required parameters.
- *  For others, value 0 means default.
- */
-typedef struct {
-    unsigned k;                  /* Segment size : constraint: 0 < k : Reasonable range [16, 2048+] */
-    unsigned d;                  /* dmer size : constraint: 0 < d <= k : Reasonable range [6, 16] */
-    unsigned steps;              /* Number of steps : Only used for optimization : 0 means default (40) : Higher means more parameters checked */
-    unsigned nbThreads;          /* Number of threads : constraint: 0 < nbThreads : 1 means single-threaded : Only used for optimization : Ignored if ZSTD_MULTITHREAD is not defined */
-    double splitPoint;           /* Percentage of samples used for training: Only used for optimization : the first nbSamples * splitPoint samples will be used to training, the last nbSamples * (1 - splitPoint) samples will be used for testing, 0 means default (1.0), 1.0 when all samples are used for both training and testing */
-    unsigned shrinkDict;         /* Train dictionaries to shrink in size starting from the minimum size and selects the smallest dictionary that is shrinkDictMaxRegression% worse than the largest dictionary. 0 means no shrinking and 1 means shrinking  */
-    unsigned shrinkDictMaxRegression; /* Sets shrinkDictMaxRegression so that a smaller dictionary can be at worse shrinkDictMaxRegression% worse than the max dict size dictionary. */
-    ZDICT_params_t zParams;
-} ZDICT_cover_params_t;
-
-typedef struct {
-    unsigned k;                  /* Segment size : constraint: 0 < k : Reasonable range [16, 2048+] */
-    unsigned d;                  /* dmer size : constraint: 0 < d <= k : Reasonable range [6, 16] */
-    unsigned f;                  /* log of size of frequency array : constraint: 0 < f <= 31 : 1 means default(20)*/
-    unsigned steps;              /* Number of steps : Only used for optimization : 0 means default (40) : Higher means more parameters checked */
-    unsigned nbThreads;          /* Number of threads : constraint: 0 < nbThreads : 1 means single-threaded : Only used for optimization : Ignored if ZSTD_MULTITHREAD is not defined */
-    double splitPoint;           /* Percentage of samples used for training: Only used for optimization : the first nbSamples * splitPoint samples will be used to training, the last nbSamples * (1 - splitPoint) samples will be used for testing, 0 means default (0.75), 1.0 when all samples are used for both training and testing */
-    unsigned accel;              /* Acceleration level: constraint: 0 < accel <= 10, higher means faster and less accurate, 0 means default(1) */
-    unsigned shrinkDict;         /* Train dictionaries to shrink in size starting from the minimum size and selects the smallest dictionary that is shrinkDictMaxRegression% worse than the largest dictionary. 0 means no shrinking and 1 means shrinking  */
-    unsigned shrinkDictMaxRegression; /* Sets shrinkDictMaxRegression so that a smaller dictionary can be at worse shrinkDictMaxRegression% worse than the max dict size dictionary. */
-
-    ZDICT_params_t zParams;
-} ZDICT_fastCover_params_t;
-
-/*! ZDICT_trainFromBuffer_cover():
- *  Train a dictionary from an array of samples using the COVER algorithm.
- *  Samples must be stored concatenated in a single flat buffer `samplesBuffer`,
- *  supplied with an array of sizes `samplesSizes`, providing the size of each sample, in order.
- *  The resulting dictionary will be saved into `dictBuffer`.
- * @return: size of dictionary stored into `dictBuffer` (<= `dictBufferCapacity`)
- *          or an error code, which can be tested with ZDICT_isError().
- *          See ZDICT_trainFromBuffer() for details on failure modes.
- *  Note: ZDICT_trainFromBuffer_cover() requires about 9 bytes of memory for each input byte.
- *  Tips: In general, a reasonable dictionary has a size of ~ 100 KB.
- *        It's possible to select smaller or larger size, just by specifying `dictBufferCapacity`.
- *        In general, it's recommended to provide a few thousands samples, though this can vary a lot.
- *        It's recommended that total size of all samples be about ~x100 times the target size of dictionary.
- */
-ZDICTLIB_API size_t ZDICT_trainFromBuffer_cover(
-          void *dictBuffer, size_t dictBufferCapacity,
-    const void *samplesBuffer, const size_t *samplesSizes, unsigned nbSamples,
-          ZDICT_cover_params_t parameters);
-
-/*! ZDICT_optimizeTrainFromBuffer_cover():
- * The same requirements as above hold for all the parameters except `parameters`.
- * This function tries many parameter combinations and picks the best parameters.
- * `*parameters` is filled with the best parameters found,
- * dictionary constructed with those parameters is stored in `dictBuffer`.
- *
- * All of the parameters d, k, steps are optional.
- * If d is non-zero then we don't check multiple values of d, otherwise we check d = {6, 8}.
- * if steps is zero it defaults to its default value.
- * If k is non-zero then we don't check multiple values of k, otherwise we check steps values in [50, 2000].
- *
- * @return: size of dictionary stored into `dictBuffer` (<= `dictBufferCapacity`)
- *          or an error code, which can be tested with ZDICT_isError().
- *          On success `*parameters` contains the parameters selected.
- *          See ZDICT_trainFromBuffer() for details on failure modes.
- * Note: ZDICT_optimizeTrainFromBuffer_cover() requires about 8 bytes of memory for each input byte and additionally another 5 bytes of memory for each byte of memory for each thread.
- */
-ZDICTLIB_API size_t ZDICT_optimizeTrainFromBuffer_cover(
-          void* dictBuffer, size_t dictBufferCapacity,
-    const void* samplesBuffer, const size_t* samplesSizes, unsigned nbSamples,
-          ZDICT_cover_params_t* parameters);
-
-/*! ZDICT_trainFromBuffer_fastCover():
- *  Train a dictionary from an array of samples using a modified version of COVER algorithm.
- *  Samples must be stored concatenated in a single flat buffer `samplesBuffer`,
- *  supplied with an array of sizes `samplesSizes`, providing the size of each sample, in order.
- *  d and k are required.
- *  All other parameters are optional, will use default values if not provided
- *  The resulting dictionary will be saved into `dictBuffer`.
- * @return: size of dictionary stored into `dictBuffer` (<= `dictBufferCapacity`)
- *          or an error code, which can be tested with ZDICT_isError().
- *          See ZDICT_trainFromBuffer() for details on failure modes.
- *  Note: ZDICT_trainFromBuffer_fastCover() requires 6 * 2^f bytes of memory.
- *  Tips: In general, a reasonable dictionary has a size of ~ 100 KB.
- *        It's possible to select smaller or larger size, just by specifying `dictBufferCapacity`.
- *        In general, it's recommended to provide a few thousands samples, though this can vary a lot.
- *        It's recommended that total size of all samples be about ~x100 times the target size of dictionary.
- */
-ZDICTLIB_API size_t ZDICT_trainFromBuffer_fastCover(void *dictBuffer,
-                    size_t dictBufferCapacity, const void *samplesBuffer,
-                    const size_t *samplesSizes, unsigned nbSamples,
-                    ZDICT_fastCover_params_t parameters);
-
-/*! ZDICT_optimizeTrainFromBuffer_fastCover():
- * The same requirements as above hold for all the parameters except `parameters`.
- * This function tries many parameter combinations (specifically, k and d combinations)
- * and picks the best parameters. `*parameters` is filled with the best parameters found,
- * dictionary constructed with those parameters is stored in `dictBuffer`.
- * All of the parameters d, k, steps, f, and accel are optional.
- * If d is non-zero then we don't check multiple values of d, otherwise we check d = {6, 8}.
- * if steps is zero it defaults to its default value.
- * If k is non-zero then we don't check multiple values of k, otherwise we check steps values in [50, 2000].
- * If f is zero, default value of 20 is used.
- * If accel is zero, default value of 1 is used.
- *
- * @return: size of dictionary stored into `dictBuffer` (<= `dictBufferCapacity`)
- *          or an error code, which can be tested with ZDICT_isError().
- *          On success `*parameters` contains the parameters selected.
- *          See ZDICT_trainFromBuffer() for details on failure modes.
- * Note: ZDICT_optimizeTrainFromBuffer_fastCover() requires about 6 * 2^f bytes of memory for each thread.
- */
-ZDICTLIB_API size_t ZDICT_optimizeTrainFromBuffer_fastCover(void* dictBuffer,
-                    size_t dictBufferCapacity, const void* samplesBuffer,
-                    const size_t* samplesSizes, unsigned nbSamples,
-                    ZDICT_fastCover_params_t* parameters);
-
-/*! ZDICT_finalizeDictionary():
- * Given a custom content as a basis for dictionary, and a set of samples,
- * finalize dictionary by adding headers and statistics.
- *
- * Samples must be stored concatenated in a flat buffer `samplesBuffer`,
- * supplied with an array of sizes `samplesSizes`, providing the size of each sample in order.
- *
- * dictContentSize must be >= ZDICT_CONTENTSIZE_MIN bytes.
- * maxDictSize must be >= dictContentSize, and must be >= ZDICT_DICTSIZE_MIN bytes.
- *
- * @return: size of dictionary stored into `dictBuffer` (<= `dictBufferCapacity`),
- *          or an error code, which can be tested by ZDICT_isError().
- * Note: ZDICT_finalizeDictionary() will push notifications into stderr if instructed to, using notificationLevel>0.
- * Note 2: dictBuffer and dictContent can overlap
- */
-#define ZDICT_CONTENTSIZE_MIN 128
-#define ZDICT_DICTSIZE_MIN    256
-ZDICTLIB_API size_t ZDICT_finalizeDictionary(void* dictBuffer, size_t dictBufferCapacity,
-                                const void* dictContent, size_t dictContentSize,
-                                const void* samplesBuffer, const size_t* samplesSizes, unsigned nbSamples,
-                                ZDICT_params_t parameters);
-
-typedef struct {
-    unsigned selectivityLevel;   /* 0 means default; larger => select more => larger dictionary */
-    ZDICT_params_t zParams;
-} ZDICT_legacy_params_t;
-
-/*! ZDICT_trainFromBuffer_legacy():
- *  Train a dictionary from an array of samples.
- *  Samples must be stored concatenated in a single flat buffer `samplesBuffer`,
- *  supplied with an array of sizes `samplesSizes`, providing the size of each sample, in order.
- *  The resulting dictionary will be saved into `dictBuffer`.
- * `parameters` is optional and can be provided with values set to 0 to mean "default".
- * @return: size of dictionary stored into `dictBuffer` (<= `dictBufferCapacity`)
- *          or an error code, which can be tested with ZDICT_isError().
- *          See ZDICT_trainFromBuffer() for details on failure modes.
- *  Tips: In general, a reasonable dictionary has a size of ~ 100 KB.
- *        It's possible to select smaller or larger size, just by specifying `dictBufferCapacity`.
- *        In general, it's recommended to provide a few thousands samples, though this can vary a lot.
- *        It's recommended that total size of all samples be about ~x100 times the target size of dictionary.
- *  Note: ZDICT_trainFromBuffer_legacy() will send notifications into stderr if instructed to, using notificationLevel>0.
- */
-ZDICTLIB_API size_t ZDICT_trainFromBuffer_legacy(
-    void *dictBuffer, size_t dictBufferCapacity,
-    const void *samplesBuffer, const size_t *samplesSizes, unsigned nbSamples,
-    ZDICT_legacy_params_t parameters);
-
-/* Deprecation warnings */
-/* It is generally possible to disable deprecation warnings from compiler,
-   for example with -Wno-deprecated-declarations for gcc
-   or _CRT_SECURE_NO_WARNINGS in Visual.
-   Otherwise, it's also possible to manually define ZDICT_DISABLE_DEPRECATE_WARNINGS */
-#ifdef ZDICT_DISABLE_DEPRECATE_WARNINGS
-#  define ZDICT_DEPRECATED(message) ZDICTLIB_API   /* disable deprecation warnings */
-#else
-#  define ZDICT_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
-#  if defined (__cplusplus) && (__cplusplus >= 201402) /* C++14 or greater */
-#    define ZDICT_DEPRECATED(message) [[deprecated(message)]] ZDICTLIB_API
-#  elif (ZDICT_GCC_VERSION >= 405) || defined(__clang__)
-#    define ZDICT_DEPRECATED(message) ZDICTLIB_API __attribute__((deprecated(message)))
-#  elif (ZDICT_GCC_VERSION >= 301)
-#    define ZDICT_DEPRECATED(message) ZDICTLIB_API __attribute__((deprecated))
-#  elif defined(_MSC_VER)
-#    define ZDICT_DEPRECATED(message) ZDICTLIB_API __declspec(deprecated(message))
-#  else
-#    pragma message("WARNING: You need to implement ZDICT_DEPRECATED for this compiler")
-#    define ZDICT_DEPRECATED(message) ZDICTLIB_API
-#  endif
-#endif /* ZDICT_DISABLE_DEPRECATE_WARNINGS */
-
-ZDICT_DEPRECATED("use ZDICT_finalizeDictionary() instead")
-size_t ZDICT_addEntropyTablesFromBuffer(void* dictBuffer, size_t dictContentSize, size_t dictBufferCapacity,
-                                  const void* samplesBuffer, const size_t* samplesSizes, unsigned nbSamples);
-
-
-#endif   /* ZDICT_STATIC_LINKING_ONLY */
-
-#if defined (__cplusplus)
-}
-#endif
-
-#endif   /* DICTBUILDER_H_001 */
diff -Nru mysql-8.0-8.0.26/extra/zstd/lib/zstd.h mysql-8.0-8.0.27/extra/zstd/lib/zstd.h
--- mysql-8.0-8.0.26/extra/zstd/lib/zstd.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/lib/zstd.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,1947 +0,0 @@
-/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * in the COPYING file in the root directory of this source tree).
- * You may select, at your option, one of the above-listed licenses.
- */
-#if defined (__cplusplus)
-extern "C" {
-#endif
-
-#ifndef ZSTD_H_235446
-#define ZSTD_H_235446
-
-/* ======   Dependency   ======*/
-#include <stddef.h>   /* size_t */
-
-
-/* =====   ZSTDLIB_API : control library symbols visibility   ===== */
-#ifndef ZSTDLIB_VISIBILITY
-#  if defined(__GNUC__) && (__GNUC__ >= 4)
-#    define ZSTDLIB_VISIBILITY __attribute__ ((visibility ("default")))
-#  else
-#    define ZSTDLIB_VISIBILITY
-#  endif
-#endif
-#if defined(ZSTD_DLL_EXPORT) && (ZSTD_DLL_EXPORT==1)
-#  define ZSTDLIB_API __declspec(dllexport) ZSTDLIB_VISIBILITY
-#elif defined(ZSTD_DLL_IMPORT) && (ZSTD_DLL_IMPORT==1)
-#  define ZSTDLIB_API __declspec(dllimport) ZSTDLIB_VISIBILITY /* It isn't required but allows to generate better code, saving a function pointer load from the IAT and an indirect jump.*/
-#else
-#  define ZSTDLIB_API ZSTDLIB_VISIBILITY
-#endif
-
-
-/*******************************************************************************
-  Introduction
-
-  zstd, short for Zstandard, is a fast lossless compression algorithm, targeting
-  real-time compression scenarios at zlib-level and better compression ratios.
-  The zstd compression library provides in-memory compression and decompression
-  functions.
-
-  The library supports regular compression levels from 1 up to ZSTD_maxCLevel(),
-  which is currently 22. Levels >= 20, labeled `--ultra`, should be used with
-  caution, as they require more memory. The library also offers negative
-  compression levels, which extend the range of speed vs. ratio preferences.
-  The lower the level, the faster the speed (at the cost of compression).
-
-  Compression can be done in:
-    - a single step (described as Simple API)
-    - a single step, reusing a context (described as Explicit context)
-    - unbounded multiple steps (described as Streaming compression)
-
-  The compression ratio achievable on small data can be highly improved using
-  a dictionary. Dictionary compression can be performed in:
-    - a single step (described as Simple dictionary API)
-    - a single step, reusing a dictionary (described as Bulk-processing
-      dictionary API)
-
-  Advanced experimental functions can be accessed using
-  `#define ZSTD_STATIC_LINKING_ONLY` before including zstd.h.
-
-  Advanced experimental APIs should never be used with a dynamically-linked
-  library. They are not "stable"; their definitions or signatures may change in
-  the future. Only static linking is allowed.
-*******************************************************************************/
-
-/*------   Version   ------*/
-#define ZSTD_VERSION_MAJOR    1
-#define ZSTD_VERSION_MINOR    4
-#define ZSTD_VERSION_RELEASE  3
-
-#define ZSTD_VERSION_NUMBER  (ZSTD_VERSION_MAJOR *100*100 + ZSTD_VERSION_MINOR *100 + ZSTD_VERSION_RELEASE)
-ZSTDLIB_API unsigned ZSTD_versionNumber(void);   /**< to check runtime library version */
-
-#define ZSTD_LIB_VERSION ZSTD_VERSION_MAJOR.ZSTD_VERSION_MINOR.ZSTD_VERSION_RELEASE
-#define ZSTD_QUOTE(str) #str
-#define ZSTD_EXPAND_AND_QUOTE(str) ZSTD_QUOTE(str)
-#define ZSTD_VERSION_STRING ZSTD_EXPAND_AND_QUOTE(ZSTD_LIB_VERSION)
-ZSTDLIB_API const char* ZSTD_versionString(void);   /* requires v1.3.0+ */
-
-/* *************************************
- *  Default constant
- ***************************************/
-#ifndef ZSTD_CLEVEL_DEFAULT
-#  define ZSTD_CLEVEL_DEFAULT 3
-#endif
-
-/* *************************************
- *  Constants
- ***************************************/
-
-/* All magic numbers are supposed read/written to/from files/memory using little-endian convention */
-#define ZSTD_MAGICNUMBER            0xFD2FB528    /* valid since v0.8.0 */
-#define ZSTD_MAGIC_DICTIONARY       0xEC30A437    /* valid since v0.7.0 */
-#define ZSTD_MAGIC_SKIPPABLE_START  0x184D2A50    /* all 16 values, from 0x184D2A50 to 0x184D2A5F, signal the beginning of a skippable frame */
-#define ZSTD_MAGIC_SKIPPABLE_MASK   0xFFFFFFF0
-
-#define ZSTD_BLOCKSIZELOG_MAX  17
-#define ZSTD_BLOCKSIZE_MAX     (1<<ZSTD_BLOCKSIZELOG_MAX)
-
-
-
-/***************************************
-*  Simple API
-***************************************/
-/*! ZSTD_compress() :
- *  Compresses `src` content as a single zstd compressed frame into already allocated `dst`.
- *  Hint : compression runs faster if `dstCapacity` >=  `ZSTD_compressBound(srcSize)`.
- *  @return : compressed size written into `dst` (<= `dstCapacity),
- *            or an error code if it fails (which can be tested using ZSTD_isError()). */
-ZSTDLIB_API size_t ZSTD_compress( void* dst, size_t dstCapacity,
-                            const void* src, size_t srcSize,
-                                  int compressionLevel);
-
-/*! ZSTD_decompress() :
- *  `compressedSize` : must be the _exact_ size of some number of compressed and/or skippable frames.
- *  `dstCapacity` is an upper bound of originalSize to regenerate.
- *  If user cannot imply a maximum upper bound, it's better to use streaming mode to decompress data.
- *  @return : the number of bytes decompressed into `dst` (<= `dstCapacity`),
- *            or an errorCode if it fails (which can be tested using ZSTD_isError()). */
-ZSTDLIB_API size_t ZSTD_decompress( void* dst, size_t dstCapacity,
-                              const void* src, size_t compressedSize);
-
-/*! ZSTD_getFrameContentSize() : requires v1.3.0+
- *  `src` should point to the start of a ZSTD encoded frame.
- *  `srcSize` must be at least as large as the frame header.
- *            hint : any size >= `ZSTD_frameHeaderSize_max` is large enough.
- *  @return : - decompressed size of `src` frame content, if known
- *            - ZSTD_CONTENTSIZE_UNKNOWN if the size cannot be determined
- *            - ZSTD_CONTENTSIZE_ERROR if an error occurred (e.g. invalid magic number, srcSize too small)
- *   note 1 : a 0 return value means the frame is valid but "empty".
- *   note 2 : decompressed size is an optional field, it may not be present, typically in streaming mode.
- *            When `return==ZSTD_CONTENTSIZE_UNKNOWN`, data to decompress could be any size.
- *            In which case, it's necessary to use streaming mode to decompress data.
- *            Optionally, application can rely on some implicit limit,
- *            as ZSTD_decompress() only needs an upper bound of decompressed size.
- *            (For example, data could be necessarily cut into blocks <= 16 KB).
- *   note 3 : decompressed size is always present when compression is completed using single-pass functions,
- *            such as ZSTD_compress(), ZSTD_compressCCtx() ZSTD_compress_usingDict() or ZSTD_compress_usingCDict().
- *   note 4 : decompressed size can be very large (64-bits value),
- *            potentially larger than what local system can handle as a single memory segment.
- *            In which case, it's necessary to use streaming mode to decompress data.
- *   note 5 : If source is untrusted, decompressed size could be wrong or intentionally modified.
- *            Always ensure return value fits within application's authorized limits.
- *            Each application can set its own limits.
- *   note 6 : This function replaces ZSTD_getDecompressedSize() */
-#define ZSTD_CONTENTSIZE_UNKNOWN (0ULL - 1)
-#define ZSTD_CONTENTSIZE_ERROR   (0ULL - 2)
-ZSTDLIB_API unsigned long long ZSTD_getFrameContentSize(const void *src, size_t srcSize);
-
-/*! ZSTD_getDecompressedSize() :
- *  NOTE: This function is now obsolete, in favor of ZSTD_getFrameContentSize().
- *  Both functions work the same way, but ZSTD_getDecompressedSize() blends
- *  "empty", "unknown" and "error" results to the same return value (0),
- *  while ZSTD_getFrameContentSize() gives them separate return values.
- * @return : decompressed size of `src` frame content _if known and not empty_, 0 otherwise. */
-ZSTDLIB_API unsigned long long ZSTD_getDecompressedSize(const void* src, size_t srcSize);
-
-/*! ZSTD_findFrameCompressedSize() :
- * `src` should point to the start of a ZSTD frame or skippable frame.
- * `srcSize` must be >= first frame size
- * @return : the compressed size of the first frame starting at `src`,
- *           suitable to pass as `srcSize` to `ZSTD_decompress` or similar,
- *        or an error code if input is invalid */
-ZSTDLIB_API size_t ZSTD_findFrameCompressedSize(const void* src, size_t srcSize);
-
-
-/*======  Helper functions  ======*/
-#define ZSTD_COMPRESSBOUND(srcSize)   ((srcSize) + ((srcSize)>>8) + (((srcSize) < (128<<10)) ? (((128<<10) - (srcSize)) >> 11) /* margin, from 64 to 0 */ : 0))  /* this formula ensures that bound(A) + bound(B) <= bound(A+B) as long as A and B >= 128 KB */
-ZSTDLIB_API size_t      ZSTD_compressBound(size_t srcSize); /*!< maximum compressed size in worst case single-pass scenario */
-ZSTDLIB_API unsigned    ZSTD_isError(size_t code);          /*!< tells if a `size_t` function result is an error code */
-ZSTDLIB_API const char* ZSTD_getErrorName(size_t code);     /*!< provides readable string from an error code */
-ZSTDLIB_API int         ZSTD_minCLevel(void);               /*!< minimum negative compression level allowed */
-ZSTDLIB_API int         ZSTD_maxCLevel(void);               /*!< maximum compression level available */
-
-
-/***************************************
-*  Explicit context
-***************************************/
-/*= Compression context
- *  When compressing many times,
- *  it is recommended to allocate a context just once,
- *  and re-use it for each successive compression operation.
- *  This will make workload friendlier for system's memory.
- *  Note : re-using context is just a speed / resource optimization.
- *         It doesn't change the compression ratio, which remains identical.
- *  Note 2 : In multi-threaded environments,
- *         use one different context per thread for parallel execution.
- */
-typedef struct ZSTD_CCtx_s ZSTD_CCtx;
-ZSTDLIB_API ZSTD_CCtx* ZSTD_createCCtx(void);
-ZSTDLIB_API size_t     ZSTD_freeCCtx(ZSTD_CCtx* cctx);
-
-/*! ZSTD_compressCCtx() :
- *  Same as ZSTD_compress(), using an explicit ZSTD_CCtx
- *  The function will compress at requested compression level,
- *  ignoring any other parameter */
-ZSTDLIB_API size_t ZSTD_compressCCtx(ZSTD_CCtx* cctx,
-                                     void* dst, size_t dstCapacity,
-                               const void* src, size_t srcSize,
-                                     int compressionLevel);
-
-/*= Decompression context
- *  When decompressing many times,
- *  it is recommended to allocate a context only once,
- *  and re-use it for each successive compression operation.
- *  This will make workload friendlier for system's memory.
- *  Use one context per thread for parallel execution. */
-typedef struct ZSTD_DCtx_s ZSTD_DCtx;
-ZSTDLIB_API ZSTD_DCtx* ZSTD_createDCtx(void);
-ZSTDLIB_API size_t     ZSTD_freeDCtx(ZSTD_DCtx* dctx);
-
-/*! ZSTD_decompressDCtx() :
- *  Same as ZSTD_decompress(),
- *  requires an allocated ZSTD_DCtx.
- *  Compatible with sticky parameters.
- */
-ZSTDLIB_API size_t ZSTD_decompressDCtx(ZSTD_DCtx* dctx,
-                                       void* dst, size_t dstCapacity,
-                                 const void* src, size_t srcSize);
-
-
-/***************************************
-*  Advanced compression API
-***************************************/
-
-/* API design :
- *   Parameters are pushed one by one into an existing context,
- *   using ZSTD_CCtx_set*() functions.
- *   Pushed parameters are sticky : they are valid for next compressed frame, and any subsequent frame.
- *   "sticky" parameters are applicable to `ZSTD_compress2()` and `ZSTD_compressStream*()` !
- *   They do not apply to "simple" one-shot variants such as ZSTD_compressCCtx()
- *
- *   It's possible to reset all parameters to "default" using ZSTD_CCtx_reset().
- *
- *   This API supercedes all other "advanced" API entry points in the experimental section.
- *   In the future, we expect to remove from experimental API entry points which are redundant with this API.
- */
-
-
-/* Compression strategies, listed from fastest to strongest */
-typedef enum { ZSTD_fast=1,
-               ZSTD_dfast=2,
-               ZSTD_greedy=3,
-               ZSTD_lazy=4,
-               ZSTD_lazy2=5,
-               ZSTD_btlazy2=6,
-               ZSTD_btopt=7,
-               ZSTD_btultra=8,
-               ZSTD_btultra2=9
-               /* note : new strategies _might_ be added in the future.
-                         Only the order (from fast to strong) is guaranteed */
-} ZSTD_strategy;
-
-
-typedef enum {
-
-    /* compression parameters
-     * Note: When compressing with a ZSTD_CDict these parameters are superseded
-     * by the parameters used to construct the ZSTD_CDict. See ZSTD_CCtx_refCDict()
-     * for more info (superseded-by-cdict). */
-    ZSTD_c_compressionLevel=100, /* Update all compression parameters according to pre-defined cLevel table
-                              * Default level is ZSTD_CLEVEL_DEFAULT==3.
-                              * Special: value 0 means default, which is controlled by ZSTD_CLEVEL_DEFAULT.
-                              * Note 1 : it's possible to pass a negative compression level.
-                              * Note 2 : setting a level sets all default values of other compression parameters */
-    ZSTD_c_windowLog=101,    /* Maximum allowed back-reference distance, expressed as power of 2.
-                              * Must be clamped between ZSTD_WINDOWLOG_MIN and ZSTD_WINDOWLOG_MAX.
-                              * Special: value 0 means "use default windowLog".
-                              * Note: Using a windowLog greater than ZSTD_WINDOWLOG_LIMIT_DEFAULT
-                              *       requires explicitly allowing such window size at decompression stage if using streaming. */
-    ZSTD_c_hashLog=102,      /* Size of the initial probe table, as a power of 2.
-                              * Resulting memory usage is (1 << (hashLog+2)).
-                              * Must be clamped between ZSTD_HASHLOG_MIN and ZSTD_HASHLOG_MAX.
-                              * Larger tables improve compression ratio of strategies <= dFast,
-                              * and improve speed of strategies > dFast.
-                              * Special: value 0 means "use default hashLog". */
-    ZSTD_c_chainLog=103,     /* Size of the multi-probe search table, as a power of 2.
-                              * Resulting memory usage is (1 << (chainLog+2)).
-                              * Must be clamped between ZSTD_CHAINLOG_MIN and ZSTD_CHAINLOG_MAX.
-                              * Larger tables result in better and slower compression.
-                              * This parameter is useless when using "fast" strategy.
-                              * It's still useful when using "dfast" strategy,
-                              * in which case it defines a secondary probe table.
-                              * Special: value 0 means "use default chainLog". */
-    ZSTD_c_searchLog=104,    /* Number of search attempts, as a power of 2.
-                              * More attempts result in better and slower compression.
-                              * This parameter is useless when using "fast" and "dFast" strategies.
-                              * Special: value 0 means "use default searchLog". */
-    ZSTD_c_minMatch=105,     /* Minimum size of searched matches.
-                              * Note that Zstandard can still find matches of smaller size,
-                              * it just tweaks its search algorithm to look for this size and larger.
-                              * Larger values increase compression and decompression speed, but decrease ratio.
-                              * Must be clamped between ZSTD_MINMATCH_MIN and ZSTD_MINMATCH_MAX.
-                              * Note that currently, for all strategies < btopt, effective minimum is 4.
-                              *                    , for all strategies > fast, effective maximum is 6.
-                              * Special: value 0 means "use default minMatchLength". */
-    ZSTD_c_targetLength=106, /* Impact of this field depends on strategy.
-                              * For strategies btopt, btultra & btultra2:
-                              *     Length of Match considered "good enough" to stop search.
-                              *     Larger values make compression stronger, and slower.
-                              * For strategy fast:
-                              *     Distance between match sampling.
-                              *     Larger values make compression faster, and weaker.
-                              * Special: value 0 means "use default targetLength". */
-    ZSTD_c_strategy=107,     /* See ZSTD_strategy enum definition.
-                              * The higher the value of selected strategy, the more complex it is,
-                              * resulting in stronger and slower compression.
-                              * Special: value 0 means "use default strategy". */
-
-    /* LDM mode parameters */
-    ZSTD_c_enableLongDistanceMatching=160, /* Enable long distance matching.
-                                     * This parameter is designed to improve compression ratio
-                                     * for large inputs, by finding large matches at long distance.
-                                     * It increases memory usage and window size.
-                                     * Note: enabling this parameter increases default ZSTD_c_windowLog to 128 MB
-                                     * except when expressly set to a different value. */
-    ZSTD_c_ldmHashLog=161,   /* Size of the table for long distance matching, as a power of 2.
-                              * Larger values increase memory usage and compression ratio,
-                              * but decrease compression speed.
-                              * Must be clamped between ZSTD_HASHLOG_MIN and ZSTD_HASHLOG_MAX
-                              * default: windowlog - 7.
-                              * Special: value 0 means "automatically determine hashlog". */
-    ZSTD_c_ldmMinMatch=162,  /* Minimum match size for long distance matcher.
-                              * Larger/too small values usually decrease compression ratio.
-                              * Must be clamped between ZSTD_LDM_MINMATCH_MIN and ZSTD_LDM_MINMATCH_MAX.
-                              * Special: value 0 means "use default value" (default: 64). */
-    ZSTD_c_ldmBucketSizeLog=163, /* Log size of each bucket in the LDM hash table for collision resolution.
-                              * Larger values improve collision resolution but decrease compression speed.
-                              * The maximum value is ZSTD_LDM_BUCKETSIZELOG_MAX.
-                              * Special: value 0 means "use default value" (default: 3). */
-    ZSTD_c_ldmHashRateLog=164, /* Frequency of inserting/looking up entries into the LDM hash table.
-                              * Must be clamped between 0 and (ZSTD_WINDOWLOG_MAX - ZSTD_HASHLOG_MIN).
-                              * Default is MAX(0, (windowLog - ldmHashLog)), optimizing hash table usage.
-                              * Larger values improve compression speed.
-                              * Deviating far from default value will likely result in a compression ratio decrease.
-                              * Special: value 0 means "automatically determine hashRateLog". */
-
-    /* frame parameters */
-    ZSTD_c_contentSizeFlag=200, /* Content size will be written into frame header _whenever known_ (default:1)
-                              * Content size must be known at the beginning of compression.
-                              * This is automatically the case when using ZSTD_compress2(),
-                              * For streaming variants, content size must be provided with ZSTD_CCtx_setPledgedSrcSize() */
-    ZSTD_c_checksumFlag=201, /* A 32-bits checksum of content is written at end of frame (default:0) */
-    ZSTD_c_dictIDFlag=202,   /* When applicable, dictionary's ID is written into frame header (default:1) */
-
-    /* multi-threading parameters */
-    /* These parameters are only useful if multi-threading is enabled (compiled with build macro ZSTD_MULTITHREAD).
-     * They return an error otherwise. */
-    ZSTD_c_nbWorkers=400,    /* Select how many threads will be spawned to compress in parallel.
-                              * When nbWorkers >= 1, triggers asynchronous mode when used with ZSTD_compressStream*() :
-                              * ZSTD_compressStream*() consumes input and flush output if possible, but immediately gives back control to caller,
-                              * while compression work is performed in parallel, within worker threads.
-                              * (note : a strong exception to this rule is when first invocation of ZSTD_compressStream2() sets ZSTD_e_end :
-                              *  in which case, ZSTD_compressStream2() delegates to ZSTD_compress2(), which is always a blocking call).
-                              * More workers improve speed, but also increase memory usage.
-                              * Default value is `0`, aka "single-threaded mode" : no worker is spawned, compression is performed inside Caller's thread, all invocations are blocking */
-    ZSTD_c_jobSize=401,      /* Size of a compression job. This value is enforced only when nbWorkers >= 1.
-                              * Each compression job is completed in parallel, so this value can indirectly impact the nb of active threads.
-                              * 0 means default, which is dynamically determined based on compression parameters.
-                              * Job size must be a minimum of overlap size, or 1 MB, whichever is largest.
-                              * The minimum size is automatically and transparently enforced */
-    ZSTD_c_overlapLog=402,   /* Control the overlap size, as a fraction of window size.
-                              * The overlap size is an amount of data reloaded from previous job at the beginning of a new job.
-                              * It helps preserve compression ratio, while each job is compressed in parallel.
-                              * This value is enforced only when nbWorkers >= 1.
-                              * Larger values increase compression ratio, but decrease speed.
-                              * Possible values range from 0 to 9 :
-                              * - 0 means "default" : value will be determined by the library, depending on strategy
-                              * - 1 means "no overlap"
-                              * - 9 means "full overlap", using a full window size.
-                              * Each intermediate rank increases/decreases load size by a factor 2 :
-                              * 9: full window;  8: w/2;  7: w/4;  6: w/8;  5:w/16;  4: w/32;  3:w/64;  2:w/128;  1:no overlap;  0:default
-                              * default value varies between 6 and 9, depending on strategy */
-
-    /* note : additional experimental parameters are also available
-     * within the experimental section of the API.
-     * At the time of this writing, they include :
-     * ZSTD_c_rsyncable
-     * ZSTD_c_format
-     * ZSTD_c_forceMaxWindow
-     * ZSTD_c_forceAttachDict
-     * ZSTD_c_literalCompressionMode
-     * ZSTD_c_targetCBlockSize
-     * Because they are not stable, it's necessary to define ZSTD_STATIC_LINKING_ONLY to access them.
-     * note : never ever use experimentalParam? names directly;
-     *        also, the enums values themselves are unstable and can still change.
-     */
-     ZSTD_c_experimentalParam1=500,
-     ZSTD_c_experimentalParam2=10,
-     ZSTD_c_experimentalParam3=1000,
-     ZSTD_c_experimentalParam4=1001,
-     ZSTD_c_experimentalParam5=1002,
-     ZSTD_c_experimentalParam6=1003,
-} ZSTD_cParameter;
-
-typedef struct {
-    size_t error;
-    int lowerBound;
-    int upperBound;
-} ZSTD_bounds;
-
-/*! ZSTD_cParam_getBounds() :
- *  All parameters must belong to an interval with lower and upper bounds,
- *  otherwise they will either trigger an error or be automatically clamped.
- * @return : a structure, ZSTD_bounds, which contains
- *         - an error status field, which must be tested using ZSTD_isError()
- *         - lower and upper bounds, both inclusive
- */
-ZSTDLIB_API ZSTD_bounds ZSTD_cParam_getBounds(ZSTD_cParameter cParam);
-
-/*! ZSTD_CCtx_setParameter() :
- *  Set one compression parameter, selected by enum ZSTD_cParameter.
- *  All parameters have valid bounds. Bounds can be queried using ZSTD_cParam_getBounds().
- *  Providing a value beyond bound will either clamp it, or trigger an error (depending on parameter).
- *  Setting a parameter is generally only possible during frame initialization (before starting compression).
- *  Exception : when using multi-threading mode (nbWorkers >= 1),
- *              the following parameters can be updated _during_ compression (within same frame):
- *              => compressionLevel, hashLog, chainLog, searchLog, minMatch, targetLength and strategy.
- *              new parameters will be active for next job only (after a flush()).
- * @return : an error code (which can be tested using ZSTD_isError()).
- */
-ZSTDLIB_API size_t ZSTD_CCtx_setParameter(ZSTD_CCtx* cctx, ZSTD_cParameter param, int value);
-
-/*! ZSTD_CCtx_setPledgedSrcSize() :
- *  Total input data size to be compressed as a single frame.
- *  Value will be written in frame header, unless if explicitly forbidden using ZSTD_c_contentSizeFlag.
- *  This value will also be controlled at end of frame, and trigger an error if not respected.
- * @result : 0, or an error code (which can be tested with ZSTD_isError()).
- *  Note 1 : pledgedSrcSize==0 actually means zero, aka an empty frame.
- *           In order to mean "unknown content size", pass constant ZSTD_CONTENTSIZE_UNKNOWN.
- *           ZSTD_CONTENTSIZE_UNKNOWN is default value for any new frame.
- *  Note 2 : pledgedSrcSize is only valid once, for the next frame.
- *           It's discarded at the end of the frame, and replaced by ZSTD_CONTENTSIZE_UNKNOWN.
- *  Note 3 : Whenever all input data is provided and consumed in a single round,
- *           for example with ZSTD_compress2(),
- *           or invoking immediately ZSTD_compressStream2(,,,ZSTD_e_end),
- *           this value is automatically overridden by srcSize instead.
- */
-ZSTDLIB_API size_t ZSTD_CCtx_setPledgedSrcSize(ZSTD_CCtx* cctx, unsigned long long pledgedSrcSize);
-
-typedef enum {
-    ZSTD_reset_session_only = 1,
-    ZSTD_reset_parameters = 2,
-    ZSTD_reset_session_and_parameters = 3
-} ZSTD_ResetDirective;
-
-/*! ZSTD_CCtx_reset() :
- *  There are 2 different things that can be reset, independently or jointly :
- *  - The session : will stop compressing current frame, and make CCtx ready to start a new one.
- *                  Useful after an error, or to interrupt any ongoing compression.
- *                  Any internal data not yet flushed is cancelled.
- *                  Compression parameters and dictionary remain unchanged.
- *                  They will be used to compress next frame.
- *                  Resetting session never fails.
- *  - The parameters : changes all parameters back to "default".
- *                  This removes any reference to any dictionary too.
- *                  Parameters can only be changed between 2 sessions (i.e. no compression is currently ongoing)
- *                  otherwise the reset fails, and function returns an error value (which can be tested using ZSTD_isError())
- *  - Both : similar to resetting the session, followed by resetting parameters.
- */
-ZSTDLIB_API size_t ZSTD_CCtx_reset(ZSTD_CCtx* cctx, ZSTD_ResetDirective reset);
-
-/*! ZSTD_compress2() :
- *  Behave the same as ZSTD_compressCCtx(), but compression parameters are set using the advanced API.
- *  ZSTD_compress2() always starts a new frame.
- *  Should cctx hold data from a previously unfinished frame, everything about it is forgotten.
- *  - Compression parameters are pushed into CCtx before starting compression, using ZSTD_CCtx_set*()
- *  - The function is always blocking, returns when compression is completed.
- *  Hint : compression runs faster if `dstCapacity` >=  `ZSTD_compressBound(srcSize)`.
- * @return : compressed size written into `dst` (<= `dstCapacity),
- *           or an error code if it fails (which can be tested using ZSTD_isError()).
- */
-ZSTDLIB_API size_t ZSTD_compress2( ZSTD_CCtx* cctx,
-                                   void* dst, size_t dstCapacity,
-                             const void* src, size_t srcSize);
-
-
-/***************************************
-*  Advanced decompression API
-***************************************/
-
-/* The advanced API pushes parameters one by one into an existing DCtx context.
- * Parameters are sticky, and remain valid for all following frames
- * using the same DCtx context.
- * It's possible to reset parameters to default values using ZSTD_DCtx_reset().
- * Note : This API is compatible with existing ZSTD_decompressDCtx() and ZSTD_decompressStream().
- *        Therefore, no new decompression function is necessary.
- */
-
-typedef enum {
-
-    ZSTD_d_windowLogMax=100, /* Select a size limit (in power of 2) beyond which
-                              * the streaming API will refuse to allocate memory buffer
-                              * in order to protect the host from unreasonable memory requirements.
-                              * This parameter is only useful in streaming mode, since no internal buffer is allocated in single-pass mode.
-                              * By default, a decompression context accepts window sizes <= (1 << ZSTD_WINDOWLOG_LIMIT_DEFAULT).
-                              * Special: value 0 means "use default maximum windowLog". */
-
-    /* note : additional experimental parameters are also available
-     * within the experimental section of the API.
-     * At the time of this writing, they include :
-     * ZSTD_c_format
-     * Because they are not stable, it's necessary to define ZSTD_STATIC_LINKING_ONLY to access them.
-     * note : never ever use experimentalParam? names directly
-     */
-     ZSTD_d_experimentalParam1=1000
-
-} ZSTD_dParameter;
-
-/*! ZSTD_dParam_getBounds() :
- *  All parameters must belong to an interval with lower and upper bounds,
- *  otherwise they will either trigger an error or be automatically clamped.
- * @return : a structure, ZSTD_bounds, which contains
- *         - an error status field, which must be tested using ZSTD_isError()
- *         - both lower and upper bounds, inclusive
- */
-ZSTDLIB_API ZSTD_bounds ZSTD_dParam_getBounds(ZSTD_dParameter dParam);
-
-/*! ZSTD_DCtx_setParameter() :
- *  Set one compression parameter, selected by enum ZSTD_dParameter.
- *  All parameters have valid bounds. Bounds can be queried using ZSTD_dParam_getBounds().
- *  Providing a value beyond bound will either clamp it, or trigger an error (depending on parameter).
- *  Setting a parameter is only possible during frame initialization (before starting decompression).
- * @return : 0, or an error code (which can be tested using ZSTD_isError()).
- */
-ZSTDLIB_API size_t ZSTD_DCtx_setParameter(ZSTD_DCtx* dctx, ZSTD_dParameter param, int value);
-
-/*! ZSTD_DCtx_reset() :
- *  Return a DCtx to clean state.
- *  Session and parameters can be reset jointly or separately.
- *  Parameters can only be reset when no active frame is being decompressed.
- * @return : 0, or an error code, which can be tested with ZSTD_isError()
- */
-ZSTDLIB_API size_t ZSTD_DCtx_reset(ZSTD_DCtx* dctx, ZSTD_ResetDirective reset);
-
-
-/****************************
-*  Streaming
-****************************/
-
-typedef struct ZSTD_inBuffer_s {
-  const void* src;    /**< start of input buffer */
-  size_t size;        /**< size of input buffer */
-  size_t pos;         /**< position where reading stopped. Will be updated. Necessarily 0 <= pos <= size */
-} ZSTD_inBuffer;
-
-typedef struct ZSTD_outBuffer_s {
-  void*  dst;         /**< start of output buffer */
-  size_t size;        /**< size of output buffer */
-  size_t pos;         /**< position where writing stopped. Will be updated. Necessarily 0 <= pos <= size */
-} ZSTD_outBuffer;
-
-
-
-/*-***********************************************************************
-*  Streaming compression - HowTo
-*
-*  A ZSTD_CStream object is required to track streaming operation.
-*  Use ZSTD_createCStream() and ZSTD_freeCStream() to create/release resources.
-*  ZSTD_CStream objects can be reused multiple times on consecutive compression operations.
-*  It is recommended to re-use ZSTD_CStream since it will play nicer with system's memory, by re-using already allocated memory.
-*
-*  For parallel execution, use one separate ZSTD_CStream per thread.
-*
-*  note : since v1.3.0, ZSTD_CStream and ZSTD_CCtx are the same thing.
-*
-*  Parameters are sticky : when starting a new compression on the same context,
-*  it will re-use the same sticky parameters as previous compression session.
-*  When in doubt, it's recommended to fully initialize the context before usage.
-*  Use ZSTD_CCtx_reset() to reset the context and ZSTD_CCtx_setParameter(),
-*  ZSTD_CCtx_setPledgedSrcSize(), or ZSTD_CCtx_loadDictionary() and friends to
-*  set more specific parameters, the pledged source size, or load a dictionary.
-*
-*  Use ZSTD_compressStream2() with ZSTD_e_continue as many times as necessary to
-*  consume input stream. The function will automatically update both `pos`
-*  fields within `input` and `output`.
-*  Note that the function may not consume the entire input, for example, because
-*  the output buffer is already full, in which case `input.pos < input.size`.
-*  The caller must check if input has been entirely consumed.
-*  If not, the caller must make some room to receive more compressed data,
-*  and then present again remaining input data.
-*  note: ZSTD_e_continue is guaranteed to make some forward progress when called,
-*        but doesn't guarantee maximal forward progress. This is especially relevant
-*        when compressing with multiple threads. The call won't block if it can
-*        consume some input, but if it can't it will wait for some, but not all,
-*        output to be flushed.
-* @return : provides a minimum amount of data remaining to be flushed from internal buffers
-*           or an error code, which can be tested using ZSTD_isError().
-*
-*  At any moment, it's possible to flush whatever data might remain stuck within internal buffer,
-*  using ZSTD_compressStream2() with ZSTD_e_flush. `output->pos` will be updated.
-*  Note that, if `output->size` is too small, a single invocation with ZSTD_e_flush might not be enough (return code > 0).
-*  In which case, make some room to receive more compressed data, and call again ZSTD_compressStream2() with ZSTD_e_flush.
-*  You must continue calling ZSTD_compressStream2() with ZSTD_e_flush until it returns 0, at which point you can change the
-*  operation.
-*  note: ZSTD_e_flush will flush as much output as possible, meaning when compressing with multiple threads, it will
-*        block until the flush is complete or the output buffer is full.
-*  @return : 0 if internal buffers are entirely flushed,
-*            >0 if some data still present within internal buffer (the value is minimal estimation of remaining size),
-*            or an error code, which can be tested using ZSTD_isError().
-*
-*  Calling ZSTD_compressStream2() with ZSTD_e_end instructs to finish a frame.
-*  It will perform a flush and write frame epilogue.
-*  The epilogue is required for decoders to consider a frame completed.
-*  flush operation is the same, and follows same rules as calling ZSTD_compressStream2() with ZSTD_e_flush.
-*  You must continue calling ZSTD_compressStream2() with ZSTD_e_end until it returns 0, at which point you are free to
-*  start a new frame.
-*  note: ZSTD_e_end will flush as much output as possible, meaning when compressing with multiple threads, it will
-*        block until the flush is complete or the output buffer is full.
-*  @return : 0 if frame fully completed and fully flushed,
-*            >0 if some data still present within internal buffer (the value is minimal estimation of remaining size),
-*            or an error code, which can be tested using ZSTD_isError().
-*
-* *******************************************************************/
-
-typedef ZSTD_CCtx ZSTD_CStream;  /**< CCtx and CStream are now effectively same object (>= v1.3.0) */
-                                 /* Continue to distinguish them for compatibility with older versions <= v1.2.0 */
-/*===== ZSTD_CStream management functions =====*/
-ZSTDLIB_API ZSTD_CStream* ZSTD_createCStream(void);
-ZSTDLIB_API size_t ZSTD_freeCStream(ZSTD_CStream* zcs);
-
-/*===== Streaming compression functions =====*/
-typedef enum {
-    ZSTD_e_continue=0, /* collect more data, encoder decides when to output compressed result, for optimal compression ratio */
-    ZSTD_e_flush=1,    /* flush any data provided so far,
-                        * it creates (at least) one new block, that can be decoded immediately on reception;
-                        * frame will continue: any future data can still reference previously compressed data, improving compression.
-                        * note : multithreaded compression will block to flush as much output as possible. */
-    ZSTD_e_end=2       /* flush any remaining data _and_ close current frame.
-                        * note that frame is only closed after compressed data is fully flushed (return value == 0).
-                        * After that point, any additional data starts a new frame.
-                        * note : each frame is independent (does not reference any content from previous frame).
-                        : note : multithreaded compression will block to flush as much output as possible. */
-} ZSTD_EndDirective;
-
-/*! ZSTD_compressStream2() :
- *  Behaves about the same as ZSTD_compressStream, with additional control on end directive.
- *  - Compression parameters are pushed into CCtx before starting compression, using ZSTD_CCtx_set*()
- *  - Compression parameters cannot be changed once compression is started (save a list of exceptions in multi-threading mode)
- *  - output->pos must be <= dstCapacity, input->pos must be <= srcSize
- *  - output->pos and input->pos will be updated. They are guaranteed to remain below their respective limit.
- *  - When nbWorkers==0 (default), function is blocking : it completes its job before returning to caller.
- *  - When nbWorkers>=1, function is non-blocking : it just acquires a copy of input, and distributes jobs to internal worker threads, flush whatever is available,
- *                                                  and then immediately returns, just indicating that there is some data remaining to be flushed.
- *                                                  The function nonetheless guarantees forward progress : it will return only after it reads or write at least 1+ byte.
- *  - Exception : if the first call requests a ZSTD_e_end directive and provides enough dstCapacity, the function delegates to ZSTD_compress2() which is always blocking.
- *  - @return provides a minimum amount of data remaining to be flushed from internal buffers
- *            or an error code, which can be tested using ZSTD_isError().
- *            if @return != 0, flush is not fully completed, there is still some data left within internal buffers.
- *            This is useful for ZSTD_e_flush, since in this case more flushes are necessary to empty all buffers.
- *            For ZSTD_e_end, @return == 0 when internal buffers are fully flushed and frame is completed.
- *  - after a ZSTD_e_end directive, if internal buffer is not fully flushed (@return != 0),
- *            only ZSTD_e_end or ZSTD_e_flush operations are allowed.
- *            Before starting a new compression job, or changing compression parameters,
- *            it is required to fully flush internal buffers.
- */
-ZSTDLIB_API size_t ZSTD_compressStream2( ZSTD_CCtx* cctx,
-                                         ZSTD_outBuffer* output,
-                                         ZSTD_inBuffer* input,
-                                         ZSTD_EndDirective endOp);
-
-
-/* These buffer sizes are softly recommended.
- * They are not required : ZSTD_compressStream*() happily accepts any buffer size, for both input and output.
- * Respecting the recommended size just makes it a bit easier for ZSTD_compressStream*(),
- * reducing the amount of memory shuffling and buffering, resulting in minor performance savings.
- *
- * However, note that these recommendations are from the perspective of a C caller program.
- * If the streaming interface is invoked from some other language,
- * especially managed ones such as Java or Go, through a foreign function interface such as jni or cgo,
- * a major performance rule is to reduce crossing such interface to an absolute minimum.
- * It's not rare that performance ends being spent more into the interface, rather than compression itself.
- * In which cases, prefer using large buffers, as large as practical,
- * for both input and output, to reduce the nb of roundtrips.
- */
-ZSTDLIB_API size_t ZSTD_CStreamInSize(void);    /**< recommended size for input buffer */
-ZSTDLIB_API size_t ZSTD_CStreamOutSize(void);   /**< recommended size for output buffer. Guarantee to successfully flush at least one complete compressed block. */
-
-
-/* *****************************************************************************
- * This following is a legacy streaming API.
- * It can be replaced by ZSTD_CCtx_reset() and ZSTD_compressStream2().
- * It is redundant, but remains fully supported.
- * Advanced parameters and dictionary compression can only be used through the
- * new API.
- ******************************************************************************/
-
-/*!
- * Equivalent to:
- *
- *     ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only);
- *     ZSTD_CCtx_refCDict(zcs, NULL); // clear the dictionary (if any)
- *     ZSTD_CCtx_setParameter(zcs, ZSTD_c_compressionLevel, compressionLevel);
- */
-ZSTDLIB_API size_t ZSTD_initCStream(ZSTD_CStream* zcs, int compressionLevel);
-/*!
- * Alternative for ZSTD_compressStream2(zcs, output, input, ZSTD_e_continue).
- * NOTE: The return value is different. ZSTD_compressStream() returns a hint for
- * the next read size (if non-zero and not an error). ZSTD_compressStream2()
- * returns the minimum nb of bytes left to flush (if non-zero and not an error).
- */
-ZSTDLIB_API size_t ZSTD_compressStream(ZSTD_CStream* zcs, ZSTD_outBuffer* output, ZSTD_inBuffer* input);
-/*! Equivalent to ZSTD_compressStream2(zcs, output, &emptyInput, ZSTD_e_flush). */
-ZSTDLIB_API size_t ZSTD_flushStream(ZSTD_CStream* zcs, ZSTD_outBuffer* output);
-/*! Equivalent to ZSTD_compressStream2(zcs, output, &emptyInput, ZSTD_e_end). */
-ZSTDLIB_API size_t ZSTD_endStream(ZSTD_CStream* zcs, ZSTD_outBuffer* output);
-
-
-/*-***************************************************************************
-*  Streaming decompression - HowTo
-*
-*  A ZSTD_DStream object is required to track streaming operations.
-*  Use ZSTD_createDStream() and ZSTD_freeDStream() to create/release resources.
-*  ZSTD_DStream objects can be re-used multiple times.
-*
-*  Use ZSTD_initDStream() to start a new decompression operation.
-* @return : recommended first input size
-*  Alternatively, use advanced API to set specific properties.
-*
-*  Use ZSTD_decompressStream() repetitively to consume your input.
-*  The function will update both `pos` fields.
-*  If `input.pos < input.size`, some input has not been consumed.
-*  It's up to the caller to present again remaining data.
-*  The function tries to flush all data decoded immediately, respecting output buffer size.
-*  If `output.pos < output.size`, decoder has flushed everything it could.
-*  But if `output.pos == output.size`, there might be some data left within internal buffers.,
-*  In which case, call ZSTD_decompressStream() again to flush whatever remains in the buffer.
-*  Note : with no additional input provided, amount of data flushed is necessarily <= ZSTD_BLOCKSIZE_MAX.
-* @return : 0 when a frame is completely decoded and fully flushed,
-*        or an error code, which can be tested using ZSTD_isError(),
-*        or any other value > 0, which means there is still some decoding or flushing to do to complete current frame :
-*                                the return value is a suggested next input size (just a hint for better latency)
-*                                that will never request more than the remaining frame size.
-* *******************************************************************************/
-
-typedef ZSTD_DCtx ZSTD_DStream;  /**< DCtx and DStream are now effectively same object (>= v1.3.0) */
-                                 /* For compatibility with versions <= v1.2.0, prefer differentiating them. */
-/*===== ZSTD_DStream management functions =====*/
-ZSTDLIB_API ZSTD_DStream* ZSTD_createDStream(void);
-ZSTDLIB_API size_t ZSTD_freeDStream(ZSTD_DStream* zds);
-
-/*===== Streaming decompression functions =====*/
-
-/* This function is redundant with the advanced API and equivalent to:
- *
- *     ZSTD_DCtx_reset(zds);
- *     ZSTD_DCtx_refDDict(zds, NULL);
- */
-ZSTDLIB_API size_t ZSTD_initDStream(ZSTD_DStream* zds);
-
-ZSTDLIB_API size_t ZSTD_decompressStream(ZSTD_DStream* zds, ZSTD_outBuffer* output, ZSTD_inBuffer* input);
-
-ZSTDLIB_API size_t ZSTD_DStreamInSize(void);    /*!< recommended size for input buffer */
-ZSTDLIB_API size_t ZSTD_DStreamOutSize(void);   /*!< recommended size for output buffer. Guarantee to successfully flush at least one complete block in all circumstances. */
-
-
-/**************************
-*  Simple dictionary API
-***************************/
-/*! ZSTD_compress_usingDict() :
- *  Compression at an explicit compression level using a Dictionary.
- *  A dictionary can be any arbitrary data segment (also called a prefix),
- *  or a buffer with specified information (see dictBuilder/zdict.h).
- *  Note : This function loads the dictionary, resulting in significant startup delay.
- *         It's intended for a dictionary used only once.
- *  Note 2 : When `dict == NULL || dictSize < 8` no dictionary is used. */
-ZSTDLIB_API size_t ZSTD_compress_usingDict(ZSTD_CCtx* ctx,
-                                           void* dst, size_t dstCapacity,
-                                     const void* src, size_t srcSize,
-                                     const void* dict,size_t dictSize,
-                                           int compressionLevel);
-
-/*! ZSTD_decompress_usingDict() :
- *  Decompression using a known Dictionary.
- *  Dictionary must be identical to the one used during compression.
- *  Note : This function loads the dictionary, resulting in significant startup delay.
- *         It's intended for a dictionary used only once.
- *  Note : When `dict == NULL || dictSize < 8` no dictionary is used. */
-ZSTDLIB_API size_t ZSTD_decompress_usingDict(ZSTD_DCtx* dctx,
-                                             void* dst, size_t dstCapacity,
-                                       const void* src, size_t srcSize,
-                                       const void* dict,size_t dictSize);
-
-
-/***********************************
- *  Bulk processing dictionary API
- **********************************/
-typedef struct ZSTD_CDict_s ZSTD_CDict;
-
-/*! ZSTD_createCDict() :
- *  When compressing multiple messages / blocks using the same dictionary, it's recommended to load it only once.
- *  ZSTD_createCDict() will create a digested dictionary, ready to start future compression operations without startup cost.
- *  ZSTD_CDict can be created once and shared by multiple threads concurrently, since its usage is read-only.
- * `dictBuffer` can be released after ZSTD_CDict creation, because its content is copied within CDict.
- *  Consider experimental function `ZSTD_createCDict_byReference()` if you prefer to not duplicate `dictBuffer` content.
- *  Note : A ZSTD_CDict can be created from an empty dictBuffer, but it is inefficient when used to compress small data. */
-ZSTDLIB_API ZSTD_CDict* ZSTD_createCDict(const void* dictBuffer, size_t dictSize,
-                                         int compressionLevel);
-
-/*! ZSTD_freeCDict() :
- *  Function frees memory allocated by ZSTD_createCDict(). */
-ZSTDLIB_API size_t      ZSTD_freeCDict(ZSTD_CDict* CDict);
-
-/*! ZSTD_compress_usingCDict() :
- *  Compression using a digested Dictionary.
- *  Recommended when same dictionary is used multiple times.
- *  Note : compression level is _decided at dictionary creation time_,
- *     and frame parameters are hardcoded (dictID=yes, contentSize=yes, checksum=no) */
-ZSTDLIB_API size_t ZSTD_compress_usingCDict(ZSTD_CCtx* cctx,
-                                            void* dst, size_t dstCapacity,
-                                      const void* src, size_t srcSize,
-                                      const ZSTD_CDict* cdict);
-
-
-typedef struct ZSTD_DDict_s ZSTD_DDict;
-
-/*! ZSTD_createDDict() :
- *  Create a digested dictionary, ready to start decompression operation without startup delay.
- *  dictBuffer can be released after DDict creation, as its content is copied inside DDict. */
-ZSTDLIB_API ZSTD_DDict* ZSTD_createDDict(const void* dictBuffer, size_t dictSize);
-
-/*! ZSTD_freeDDict() :
- *  Function frees memory allocated with ZSTD_createDDict() */
-ZSTDLIB_API size_t      ZSTD_freeDDict(ZSTD_DDict* ddict);
-
-/*! ZSTD_decompress_usingDDict() :
- *  Decompression using a digested Dictionary.
- *  Recommended when same dictionary is used multiple times. */
-ZSTDLIB_API size_t ZSTD_decompress_usingDDict(ZSTD_DCtx* dctx,
-                                              void* dst, size_t dstCapacity,
-                                        const void* src, size_t srcSize,
-                                        const ZSTD_DDict* ddict);
-
-
-/********************************
- *  Dictionary helper functions
- *******************************/
-
-/*! ZSTD_getDictID_fromDict() :
- *  Provides the dictID stored within dictionary.
- *  if @return == 0, the dictionary is not conformant with Zstandard specification.
- *  It can still be loaded, but as a content-only dictionary. */
-ZSTDLIB_API unsigned ZSTD_getDictID_fromDict(const void* dict, size_t dictSize);
-
-/*! ZSTD_getDictID_fromDDict() :
- *  Provides the dictID of the dictionary loaded into `ddict`.
- *  If @return == 0, the dictionary is not conformant to Zstandard specification, or empty.
- *  Non-conformant dictionaries can still be loaded, but as content-only dictionaries. */
-ZSTDLIB_API unsigned ZSTD_getDictID_fromDDict(const ZSTD_DDict* ddict);
-
-/*! ZSTD_getDictID_fromFrame() :
- *  Provides the dictID required to decompressed the frame stored within `src`.
- *  If @return == 0, the dictID could not be decoded.
- *  This could for one of the following reasons :
- *  - The frame does not require a dictionary to be decoded (most common case).
- *  - The frame was built with dictID intentionally removed. Whatever dictionary is necessary is a hidden information.
- *    Note : this use case also happens when using a non-conformant dictionary.
- *  - `srcSize` is too small, and as a result, the frame header could not be decoded (only possible if `srcSize < ZSTD_FRAMEHEADERSIZE_MAX`).
- *  - This is not a Zstandard frame.
- *  When identifying the exact failure cause, it's possible to use ZSTD_getFrameHeader(), which will provide a more precise error code. */
-ZSTDLIB_API unsigned ZSTD_getDictID_fromFrame(const void* src, size_t srcSize);
-
-
-/*******************************************************************************
- * Advanced dictionary and prefix API
- *
- * This API allows dictionaries to be used with ZSTD_compress2(),
- * ZSTD_compressStream2(), and ZSTD_decompress(). Dictionaries are sticky, and
- * only reset with the context is reset with ZSTD_reset_parameters or
- * ZSTD_reset_session_and_parameters. Prefixes are single-use.
- ******************************************************************************/
-
-
-/*! ZSTD_CCtx_loadDictionary() :
- *  Create an internal CDict from `dict` buffer.
- *  Decompression will have to use same dictionary.
- * @result : 0, or an error code (which can be tested with ZSTD_isError()).
- *  Special: Loading a NULL (or 0-size) dictionary invalidates previous dictionary,
- *           meaning "return to no-dictionary mode".
- *  Note 1 : Dictionary is sticky, it will be used for all future compressed frames.
- *           To return to "no-dictionary" situation, load a NULL dictionary (or reset parameters).
- *  Note 2 : Loading a dictionary involves building tables.
- *           It's also a CPU consuming operation, with non-negligible impact on latency.
- *           Tables are dependent on compression parameters, and for this reason,
- *           compression parameters can no longer be changed after loading a dictionary.
- *  Note 3 :`dict` content will be copied internally.
- *           Use experimental ZSTD_CCtx_loadDictionary_byReference() to reference content instead.
- *           In such a case, dictionary buffer must outlive its users.
- *  Note 4 : Use ZSTD_CCtx_loadDictionary_advanced()
- *           to precisely select how dictionary content must be interpreted. */
-ZSTDLIB_API size_t ZSTD_CCtx_loadDictionary(ZSTD_CCtx* cctx, const void* dict, size_t dictSize);
-
-/*! ZSTD_CCtx_refCDict() :
- *  Reference a prepared dictionary, to be used for all next compressed frames.
- *  Note that compression parameters are enforced from within CDict,
- *  and supersede any compression parameter previously set within CCtx.
- *  The parameters ignored are labled as "superseded-by-cdict" in the ZSTD_cParameter enum docs.
- *  The ignored parameters will be used again if the CCtx is returned to no-dictionary mode.
- *  The dictionary will remain valid for future compressed frames using same CCtx.
- * @result : 0, or an error code (which can be tested with ZSTD_isError()).
- *  Special : Referencing a NULL CDict means "return to no-dictionary mode".
- *  Note 1 : Currently, only one dictionary can be managed.
- *           Referencing a new dictionary effectively "discards" any previous one.
- *  Note 2 : CDict is just referenced, its lifetime must outlive its usage within CCtx. */
-ZSTDLIB_API size_t ZSTD_CCtx_refCDict(ZSTD_CCtx* cctx, const ZSTD_CDict* cdict);
-
-/*! ZSTD_CCtx_refPrefix() :
- *  Reference a prefix (single-usage dictionary) for next compressed frame.
- *  A prefix is **only used once**. Tables are discarded at end of frame (ZSTD_e_end).
- *  Decompression will need same prefix to properly regenerate data.
- *  Compressing with a prefix is similar in outcome as performing a diff and compressing it,
- *  but performs much faster, especially during decompression (compression speed is tunable with compression level).
- * @result : 0, or an error code (which can be tested with ZSTD_isError()).
- *  Special: Adding any prefix (including NULL) invalidates any previous prefix or dictionary
- *  Note 1 : Prefix buffer is referenced. It **must** outlive compression.
- *           Its content must remain unmodified during compression.
- *  Note 2 : If the intention is to diff some large src data blob with some prior version of itself,
- *           ensure that the window size is large enough to contain the entire source.
- *           See ZSTD_c_windowLog.
- *  Note 3 : Referencing a prefix involves building tables, which are dependent on compression parameters.
- *           It's a CPU consuming operation, with non-negligible impact on latency.
- *           If there is a need to use the same prefix multiple times, consider loadDictionary instead.
- *  Note 4 : By default, the prefix is interpreted as raw content (ZSTD_dm_rawContent).
- *           Use experimental ZSTD_CCtx_refPrefix_advanced() to alter dictionary interpretation. */
-ZSTDLIB_API size_t ZSTD_CCtx_refPrefix(ZSTD_CCtx* cctx,
-                                 const void* prefix, size_t prefixSize);
-
-/*! ZSTD_DCtx_loadDictionary() :
- *  Create an internal DDict from dict buffer,
- *  to be used to decompress next frames.
- *  The dictionary remains valid for all future frames, until explicitly invalidated.
- * @result : 0, or an error code (which can be tested with ZSTD_isError()).
- *  Special : Adding a NULL (or 0-size) dictionary invalidates any previous dictionary,
- *            meaning "return to no-dictionary mode".
- *  Note 1 : Loading a dictionary involves building tables,
- *           which has a non-negligible impact on CPU usage and latency.
- *           It's recommended to "load once, use many times", to amortize the cost
- *  Note 2 :`dict` content will be copied internally, so `dict` can be released after loading.
- *           Use ZSTD_DCtx_loadDictionary_byReference() to reference dictionary content instead.
- *  Note 3 : Use ZSTD_DCtx_loadDictionary_advanced() to take control of
- *           how dictionary content is loaded and interpreted.
- */
-ZSTDLIB_API size_t ZSTD_DCtx_loadDictionary(ZSTD_DCtx* dctx, const void* dict, size_t dictSize);
-
-/*! ZSTD_DCtx_refDDict() :
- *  Reference a prepared dictionary, to be used to decompress next frames.
- *  The dictionary remains active for decompression of future frames using same DCtx.
- * @result : 0, or an error code (which can be tested with ZSTD_isError()).
- *  Note 1 : Currently, only one dictionary can be managed.
- *           Referencing a new dictionary effectively "discards" any previous one.
- *  Special: referencing a NULL DDict means "return to no-dictionary mode".
- *  Note 2 : DDict is just referenced, its lifetime must outlive its usage from DCtx.
- */
-ZSTDLIB_API size_t ZSTD_DCtx_refDDict(ZSTD_DCtx* dctx, const ZSTD_DDict* ddict);
-
-/*! ZSTD_DCtx_refPrefix() :
- *  Reference a prefix (single-usage dictionary) to decompress next frame.
- *  This is the reverse operation of ZSTD_CCtx_refPrefix(),
- *  and must use the same prefix as the one used during compression.
- *  Prefix is **only used once**. Reference is discarded at end of frame.
- *  End of frame is reached when ZSTD_decompressStream() returns 0.
- * @result : 0, or an error code (which can be tested with ZSTD_isError()).
- *  Note 1 : Adding any prefix (including NULL) invalidates any previously set prefix or dictionary
- *  Note 2 : Prefix buffer is referenced. It **must** outlive decompression.
- *           Prefix buffer must remain unmodified up to the end of frame,
- *           reached when ZSTD_decompressStream() returns 0.
- *  Note 3 : By default, the prefix is treated as raw content (ZSTD_dm_rawContent).
- *           Use ZSTD_CCtx_refPrefix_advanced() to alter dictMode (Experimental section)
- *  Note 4 : Referencing a raw content prefix has almost no cpu nor memory cost.
- *           A full dictionary is more costly, as it requires building tables.
- */
-ZSTDLIB_API size_t ZSTD_DCtx_refPrefix(ZSTD_DCtx* dctx,
-                                 const void* prefix, size_t prefixSize);
-
-/* ===   Memory management   === */
-
-/*! ZSTD_sizeof_*() :
- *  These functions give the _current_ memory usage of selected object.
- *  Note that object memory usage can evolve (increase or decrease) over time. */
-ZSTDLIB_API size_t ZSTD_sizeof_CCtx(const ZSTD_CCtx* cctx);
-ZSTDLIB_API size_t ZSTD_sizeof_DCtx(const ZSTD_DCtx* dctx);
-ZSTDLIB_API size_t ZSTD_sizeof_CStream(const ZSTD_CStream* zcs);
-ZSTDLIB_API size_t ZSTD_sizeof_DStream(const ZSTD_DStream* zds);
-ZSTDLIB_API size_t ZSTD_sizeof_CDict(const ZSTD_CDict* cdict);
-ZSTDLIB_API size_t ZSTD_sizeof_DDict(const ZSTD_DDict* ddict);
-
-#endif  /* ZSTD_H_235446 */
-
-
-/* **************************************************************************************
- *   ADVANCED AND EXPERIMENTAL FUNCTIONS
- ****************************************************************************************
- * The definitions in the following section are considered experimental.
- * They are provided for advanced scenarios.
- * They should never be used with a dynamic library, as prototypes may change in the future.
- * Use them only in association with static linking.
- * ***************************************************************************************/
-
-#if defined(ZSTD_STATIC_LINKING_ONLY) && !defined(ZSTD_H_ZSTD_STATIC_LINKING_ONLY)
-#define ZSTD_H_ZSTD_STATIC_LINKING_ONLY
-
-/****************************************************************************************
- *   experimental API (static linking only)
- ****************************************************************************************
- * The following symbols and constants
- * are not planned to join "stable API" status in the near future.
- * They can still change in future versions.
- * Some of them are planned to remain in the static_only section indefinitely.
- * Some of them might be removed in the future (especially when redundant with existing stable functions)
- * ***************************************************************************************/
-
-#define ZSTD_FRAMEHEADERSIZE_PREFIX 5   /* minimum input size required to query frame header size */
-#define ZSTD_FRAMEHEADERSIZE_MIN    6
-#define ZSTD_FRAMEHEADERSIZE_MAX   18   /* can be useful for static allocation */
-#define ZSTD_SKIPPABLEHEADERSIZE    8
-
-/* compression parameter bounds */
-#define ZSTD_WINDOWLOG_MAX_32    30
-#define ZSTD_WINDOWLOG_MAX_64    31
-#define ZSTD_WINDOWLOG_MAX     ((int)(sizeof(size_t) == 4 ? ZSTD_WINDOWLOG_MAX_32 : ZSTD_WINDOWLOG_MAX_64))
-#define ZSTD_WINDOWLOG_MIN       10
-#define ZSTD_HASHLOG_MAX       ((ZSTD_WINDOWLOG_MAX < 30) ? ZSTD_WINDOWLOG_MAX : 30)
-#define ZSTD_HASHLOG_MIN          6
-#define ZSTD_CHAINLOG_MAX_32     29
-#define ZSTD_CHAINLOG_MAX_64     30
-#define ZSTD_CHAINLOG_MAX      ((int)(sizeof(size_t) == 4 ? ZSTD_CHAINLOG_MAX_32 : ZSTD_CHAINLOG_MAX_64))
-#define ZSTD_CHAINLOG_MIN        ZSTD_HASHLOG_MIN
-#define ZSTD_SEARCHLOG_MAX      (ZSTD_WINDOWLOG_MAX-1)
-#define ZSTD_SEARCHLOG_MIN        1
-#define ZSTD_MINMATCH_MAX         7   /* only for ZSTD_fast, other strategies are limited to 6 */
-#define ZSTD_MINMATCH_MIN         3   /* only for ZSTD_btopt+, faster strategies are limited to 4 */
-#define ZSTD_TARGETLENGTH_MAX    ZSTD_BLOCKSIZE_MAX
-#define ZSTD_TARGETLENGTH_MIN     0   /* note : comparing this constant to an unsigned results in a tautological test */
-#define ZSTD_STRATEGY_MIN        ZSTD_fast
-#define ZSTD_STRATEGY_MAX        ZSTD_btultra2
-
-
-#define ZSTD_OVERLAPLOG_MIN       0
-#define ZSTD_OVERLAPLOG_MAX       9
-
-#define ZSTD_WINDOWLOG_LIMIT_DEFAULT 27   /* by default, the streaming decoder will refuse any frame
-                                           * requiring larger than (1<<ZSTD_WINDOWLOG_LIMIT_DEFAULT) window size,
-                                           * to preserve host's memory from unreasonable requirements.
-                                           * This limit can be overridden using ZSTD_DCtx_setParameter(,ZSTD_d_windowLogMax,).
-                                           * The limit does not apply for one-pass decoders (such as ZSTD_decompress()), since no additional memory is allocated */
-
-
-/* LDM parameter bounds */
-#define ZSTD_LDM_HASHLOG_MIN      ZSTD_HASHLOG_MIN
-#define ZSTD_LDM_HASHLOG_MAX      ZSTD_HASHLOG_MAX
-#define ZSTD_LDM_MINMATCH_MIN        4
-#define ZSTD_LDM_MINMATCH_MAX     4096
-#define ZSTD_LDM_BUCKETSIZELOG_MIN   1
-#define ZSTD_LDM_BUCKETSIZELOG_MAX   8
-#define ZSTD_LDM_HASHRATELOG_MIN     0
-#define ZSTD_LDM_HASHRATELOG_MAX (ZSTD_WINDOWLOG_MAX - ZSTD_HASHLOG_MIN)
-
-/* Advanced parameter bounds */
-#define ZSTD_TARGETCBLOCKSIZE_MIN   64
-#define ZSTD_TARGETCBLOCKSIZE_MAX   ZSTD_BLOCKSIZE_MAX
-
-/* internal */
-#define ZSTD_HASHLOG3_MAX           17
-
-
-/* ---  Advanced types  --- */
-
-typedef struct ZSTD_CCtx_params_s ZSTD_CCtx_params;
-
-typedef struct {
-    unsigned windowLog;       /**< largest match distance : larger == more compression, more memory needed during decompression */
-    unsigned chainLog;        /**< fully searched segment : larger == more compression, slower, more memory (useless for fast) */
-    unsigned hashLog;         /**< dispatch table : larger == faster, more memory */
-    unsigned searchLog;       /**< nb of searches : larger == more compression, slower */
-    unsigned minMatch;        /**< match length searched : larger == faster decompression, sometimes less compression */
-    unsigned targetLength;    /**< acceptable match size for optimal parser (only) : larger == more compression, slower */
-    ZSTD_strategy strategy;   /**< see ZSTD_strategy definition above */
-} ZSTD_compressionParameters;
-
-typedef struct {
-    int contentSizeFlag; /**< 1: content size will be in frame header (when known) */
-    int checksumFlag;    /**< 1: generate a 32-bits checksum using XXH64 algorithm at end of frame, for error detection */
-    int noDictIDFlag;    /**< 1: no dictID will be saved into frame header (dictID is only useful for dictionary compression) */
-} ZSTD_frameParameters;
-
-typedef struct {
-    ZSTD_compressionParameters cParams;
-    ZSTD_frameParameters fParams;
-} ZSTD_parameters;
-
-typedef enum {
-    ZSTD_dct_auto = 0,       /* dictionary is "full" when starting with ZSTD_MAGIC_DICTIONARY, otherwise it is "rawContent" */
-    ZSTD_dct_rawContent = 1, /* ensures dictionary is always loaded as rawContent, even if it starts with ZSTD_MAGIC_DICTIONARY */
-    ZSTD_dct_fullDict = 2    /* refuses to load a dictionary if it does not respect Zstandard's specification, starting with ZSTD_MAGIC_DICTIONARY */
-} ZSTD_dictContentType_e;
-
-typedef enum {
-    ZSTD_dlm_byCopy = 0,  /**< Copy dictionary content internally */
-    ZSTD_dlm_byRef = 1,   /**< Reference dictionary content -- the dictionary buffer must outlive its users. */
-} ZSTD_dictLoadMethod_e;
-
-typedef enum {
-    /* Opened question : should we have a format ZSTD_f_auto ?
-     * Today, it would mean exactly the same as ZSTD_f_zstd1.
-     * But, in the future, should several formats become supported,
-     * on the compression side, it would mean "default format".
-     * On the decompression side, it would mean "automatic format detection",
-     * so that ZSTD_f_zstd1 would mean "accept *only* zstd frames".
-     * Since meaning is a little different, another option could be to define different enums for compression and decompression.
-     * This question could be kept for later, when there are actually multiple formats to support,
-     * but there is also the question of pinning enum values, and pinning value `0` is especially important */
-    ZSTD_f_zstd1 = 0,           /* zstd frame format, specified in zstd_compression_format.md (default) */
-    ZSTD_f_zstd1_magicless = 1, /* Variant of zstd frame format, without initial 4-bytes magic number.
-                                 * Useful to save 4 bytes per generated frame.
-                                 * Decoder cannot recognise automatically this format, requiring this instruction. */
-} ZSTD_format_e;
-
-typedef enum {
-    /* Note: this enum and the behavior it controls are effectively internal
-     * implementation details of the compressor. They are expected to continue
-     * to evolve and should be considered only in the context of extremely
-     * advanced performance tuning.
-     *
-     * Zstd currently supports the use of a CDict in two ways:
-     *
-     * - The contents of the CDict can be copied into the working context. This
-     *   means that the compression can search both the dictionary and input
-     *   while operating on a single set of internal tables. This makes
-     *   the compression faster per-byte of input. However, the initial copy of
-     *   the CDict's tables incurs a fixed cost at the beginning of the
-     *   compression. For small compressions (< 8 KB), that copy can dominate
-     *   the cost of the compression.
-     *
-     * - The CDict's tables can be used in-place. In this model, compression is
-     *   slower per input byte, because the compressor has to search two sets of
-     *   tables. However, this model incurs no start-up cost (as long as the
-     *   working context's tables can be reused). For small inputs, this can be
-     *   faster than copying the CDict's tables.
-     *
-     * Zstd has a simple internal heuristic that selects which strategy to use
-     * at the beginning of a compression. However, if experimentation shows that
-     * Zstd is making poor choices, it is possible to override that choice with
-     * this enum.
-     */
-    ZSTD_dictDefaultAttach = 0, /* Use the default heuristic. */
-    ZSTD_dictForceAttach   = 1, /* Never copy the dictionary. */
-    ZSTD_dictForceCopy     = 2, /* Always copy the dictionary. */
-} ZSTD_dictAttachPref_e;
-
-typedef enum {
-  ZSTD_lcm_auto = 0,          /**< Automatically determine the compression mode based on the compression level.
-                               *   Negative compression levels will be uncompressed, and positive compression
-                               *   levels will be compressed. */
-  ZSTD_lcm_huffman = 1,       /**< Always attempt Huffman compression. Uncompressed literals will still be
-                               *   emitted if Huffman compression is not profitable. */
-  ZSTD_lcm_uncompressed = 2,  /**< Always emit uncompressed literals. */
-} ZSTD_literalCompressionMode_e;
-
-
-/***************************************
-*  Frame size functions
-***************************************/
-
-/*! ZSTD_findDecompressedSize() :
- *  `src` should point to the start of a series of ZSTD encoded and/or skippable frames
- *  `srcSize` must be the _exact_ size of this series
- *       (i.e. there should be a frame boundary at `src + srcSize`)
- *  @return : - decompressed size of all data in all successive frames
- *            - if the decompressed size cannot be determined: ZSTD_CONTENTSIZE_UNKNOWN
- *            - if an error occurred: ZSTD_CONTENTSIZE_ERROR
- *
- *   note 1 : decompressed size is an optional field, that may not be present, especially in streaming mode.
- *            When `return==ZSTD_CONTENTSIZE_UNKNOWN`, data to decompress could be any size.
- *            In which case, it's necessary to use streaming mode to decompress data.
- *   note 2 : decompressed size is always present when compression is done with ZSTD_compress()
- *   note 3 : decompressed size can be very large (64-bits value),
- *            potentially larger than what local system can handle as a single memory segment.
- *            In which case, it's necessary to use streaming mode to decompress data.
- *   note 4 : If source is untrusted, decompressed size could be wrong or intentionally modified.
- *            Always ensure result fits within application's authorized limits.
- *            Each application can set its own limits.
- *   note 5 : ZSTD_findDecompressedSize handles multiple frames, and so it must traverse the input to
- *            read each contained frame header.  This is fast as most of the data is skipped,
- *            however it does mean that all frame data must be present and valid. */
-ZSTDLIB_API unsigned long long ZSTD_findDecompressedSize(const void* src, size_t srcSize);
-
-/*! ZSTD_decompressBound() :
- *  `src` should point to the start of a series of ZSTD encoded and/or skippable frames
- *  `srcSize` must be the _exact_ size of this series
- *       (i.e. there should be a frame boundary at `src + srcSize`)
- *  @return : - upper-bound for the decompressed size of all data in all successive frames
- *            - if an error occured: ZSTD_CONTENTSIZE_ERROR
- *
- *  note 1  : an error can occur if `src` contains an invalid or incorrectly formatted frame.
- *  note 2  : the upper-bound is exact when the decompressed size field is available in every ZSTD encoded frame of `src`.
- *            in this case, `ZSTD_findDecompressedSize` and `ZSTD_decompressBound` return the same value.
- *  note 3  : when the decompressed size field isn't available, the upper-bound for that frame is calculated by:
- *              upper-bound = # blocks * min(128 KB, Window_Size)
- */
-ZSTDLIB_API unsigned long long ZSTD_decompressBound(const void* src, size_t srcSize);
-
-/*! ZSTD_frameHeaderSize() :
- *  srcSize must be >= ZSTD_FRAMEHEADERSIZE_PREFIX.
- * @return : size of the Frame Header,
- *           or an error code (if srcSize is too small) */
-ZSTDLIB_API size_t ZSTD_frameHeaderSize(const void* src, size_t srcSize);
-
-
-/***************************************
-*  Memory management
-***************************************/
-
-/*! ZSTD_estimate*() :
- *  These functions make it possible to estimate memory usage
- *  of a future {D,C}Ctx, before its creation.
- *  ZSTD_estimateCCtxSize() will provide a budget large enough for any compression level up to selected one.
- *  It will also consider src size to be arbitrarily "large", which is worst case.
- *  If srcSize is known to always be small, ZSTD_estimateCCtxSize_usingCParams() can provide a tighter estimation.
- *  ZSTD_estimateCCtxSize_usingCParams() can be used in tandem with ZSTD_getCParams() to create cParams from compressionLevel.
- *  ZSTD_estimateCCtxSize_usingCCtxParams() can be used in tandem with ZSTD_CCtxParams_setParameter(). Only single-threaded compression is supported. This function will return an error code if ZSTD_c_nbWorkers is >= 1.
- *  Note : CCtx size estimation is only correct for single-threaded compression. */
-ZSTDLIB_API size_t ZSTD_estimateCCtxSize(int compressionLevel);
-ZSTDLIB_API size_t ZSTD_estimateCCtxSize_usingCParams(ZSTD_compressionParameters cParams);
-ZSTDLIB_API size_t ZSTD_estimateCCtxSize_usingCCtxParams(const ZSTD_CCtx_params* params);
-ZSTDLIB_API size_t ZSTD_estimateDCtxSize(void);
-
-/*! ZSTD_estimateCStreamSize() :
- *  ZSTD_estimateCStreamSize() will provide a budget large enough for any compression level up to selected one.
- *  It will also consider src size to be arbitrarily "large", which is worst case.
- *  If srcSize is known to always be small, ZSTD_estimateCStreamSize_usingCParams() can provide a tighter estimation.
- *  ZSTD_estimateCStreamSize_usingCParams() can be used in tandem with ZSTD_getCParams() to create cParams from compressionLevel.
- *  ZSTD_estimateCStreamSize_usingCCtxParams() can be used in tandem with ZSTD_CCtxParams_setParameter(). Only single-threaded compression is supported. This function will return an error code if ZSTD_c_nbWorkers is >= 1.
- *  Note : CStream size estimation is only correct for single-threaded compression.
- *  ZSTD_DStream memory budget depends on window Size.
- *  This information can be passed manually, using ZSTD_estimateDStreamSize,
- *  or deducted from a valid frame Header, using ZSTD_estimateDStreamSize_fromFrame();
- *  Note : if streaming is init with function ZSTD_init?Stream_usingDict(),
- *         an internal ?Dict will be created, which additional size is not estimated here.
- *         In this case, get total size by adding ZSTD_estimate?DictSize */
-ZSTDLIB_API size_t ZSTD_estimateCStreamSize(int compressionLevel);
-ZSTDLIB_API size_t ZSTD_estimateCStreamSize_usingCParams(ZSTD_compressionParameters cParams);
-ZSTDLIB_API size_t ZSTD_estimateCStreamSize_usingCCtxParams(const ZSTD_CCtx_params* params);
-ZSTDLIB_API size_t ZSTD_estimateDStreamSize(size_t windowSize);
-ZSTDLIB_API size_t ZSTD_estimateDStreamSize_fromFrame(const void* src, size_t srcSize);
-
-/*! ZSTD_estimate?DictSize() :
- *  ZSTD_estimateCDictSize() will bet that src size is relatively "small", and content is copied, like ZSTD_createCDict().
- *  ZSTD_estimateCDictSize_advanced() makes it possible to control compression parameters precisely, like ZSTD_createCDict_advanced().
- *  Note : dictionaries created by reference (`ZSTD_dlm_byRef`) are logically smaller.
- */
-ZSTDLIB_API size_t ZSTD_estimateCDictSize(size_t dictSize, int compressionLevel);
-ZSTDLIB_API size_t ZSTD_estimateCDictSize_advanced(size_t dictSize, ZSTD_compressionParameters cParams, ZSTD_dictLoadMethod_e dictLoadMethod);
-ZSTDLIB_API size_t ZSTD_estimateDDictSize(size_t dictSize, ZSTD_dictLoadMethod_e dictLoadMethod);
-
-/*! ZSTD_initStatic*() :
- *  Initialize an object using a pre-allocated fixed-size buffer.
- *  workspace: The memory area to emplace the object into.
- *             Provided pointer *must be 8-bytes aligned*.
- *             Buffer must outlive object.
- *  workspaceSize: Use ZSTD_estimate*Size() to determine
- *                 how large workspace must be to support target scenario.
- * @return : pointer to object (same address as workspace, just different type),
- *           or NULL if error (size too small, incorrect alignment, etc.)
- *  Note : zstd will never resize nor malloc() when using a static buffer.
- *         If the object requires more memory than available,
- *         zstd will just error out (typically ZSTD_error_memory_allocation).
- *  Note 2 : there is no corresponding "free" function.
- *           Since workspace is allocated externally, it must be freed externally too.
- *  Note 3 : cParams : use ZSTD_getCParams() to convert a compression level
- *           into its associated cParams.
- *  Limitation 1 : currently not compatible with internal dictionary creation, triggered by
- *                 ZSTD_CCtx_loadDictionary(), ZSTD_initCStream_usingDict() or ZSTD_initDStream_usingDict().
- *  Limitation 2 : static cctx currently not compatible with multi-threading.
- *  Limitation 3 : static dctx is incompatible with legacy support.
- */
-ZSTDLIB_API ZSTD_CCtx*    ZSTD_initStaticCCtx(void* workspace, size_t workspaceSize);
-ZSTDLIB_API ZSTD_CStream* ZSTD_initStaticCStream(void* workspace, size_t workspaceSize);    /**< same as ZSTD_initStaticCCtx() */
-
-ZSTDLIB_API ZSTD_DCtx*    ZSTD_initStaticDCtx(void* workspace, size_t workspaceSize);
-ZSTDLIB_API ZSTD_DStream* ZSTD_initStaticDStream(void* workspace, size_t workspaceSize);    /**< same as ZSTD_initStaticDCtx() */
-
-ZSTDLIB_API const ZSTD_CDict* ZSTD_initStaticCDict(
-                                        void* workspace, size_t workspaceSize,
-                                        const void* dict, size_t dictSize,
-                                        ZSTD_dictLoadMethod_e dictLoadMethod,
-                                        ZSTD_dictContentType_e dictContentType,
-                                        ZSTD_compressionParameters cParams);
-
-ZSTDLIB_API const ZSTD_DDict* ZSTD_initStaticDDict(
-                                        void* workspace, size_t workspaceSize,
-                                        const void* dict, size_t dictSize,
-                                        ZSTD_dictLoadMethod_e dictLoadMethod,
-                                        ZSTD_dictContentType_e dictContentType);
-
-
-/*! Custom memory allocation :
- *  These prototypes make it possible to pass your own allocation/free functions.
- *  ZSTD_customMem is provided at creation time, using ZSTD_create*_advanced() variants listed below.
- *  All allocation/free operations will be completed using these custom variants instead of regular <stdlib.h> ones.
- */
-typedef void* (*ZSTD_allocFunction) (void* opaque, size_t size);
-typedef void  (*ZSTD_freeFunction) (void* opaque, void* address);
-typedef struct { ZSTD_allocFunction customAlloc; ZSTD_freeFunction customFree; void* opaque; } ZSTD_customMem;
-static ZSTD_customMem const ZSTD_defaultCMem = { NULL, NULL, NULL };  /**< this constant defers to stdlib's functions */
-
-ZSTDLIB_API ZSTD_CCtx*    ZSTD_createCCtx_advanced(ZSTD_customMem customMem);
-ZSTDLIB_API ZSTD_CStream* ZSTD_createCStream_advanced(ZSTD_customMem customMem);
-ZSTDLIB_API ZSTD_DCtx*    ZSTD_createDCtx_advanced(ZSTD_customMem customMem);
-ZSTDLIB_API ZSTD_DStream* ZSTD_createDStream_advanced(ZSTD_customMem customMem);
-
-ZSTDLIB_API ZSTD_CDict* ZSTD_createCDict_advanced(const void* dict, size_t dictSize,
-                                                  ZSTD_dictLoadMethod_e dictLoadMethod,
-                                                  ZSTD_dictContentType_e dictContentType,
-                                                  ZSTD_compressionParameters cParams,
-                                                  ZSTD_customMem customMem);
-
-ZSTDLIB_API ZSTD_DDict* ZSTD_createDDict_advanced(const void* dict, size_t dictSize,
-                                                  ZSTD_dictLoadMethod_e dictLoadMethod,
-                                                  ZSTD_dictContentType_e dictContentType,
-                                                  ZSTD_customMem customMem);
-
-
-
-/***************************************
-*  Advanced compression functions
-***************************************/
-
-/*! ZSTD_createCDict_byReference() :
- *  Create a digested dictionary for compression
- *  Dictionary content is just referenced, not duplicated.
- *  As a consequence, `dictBuffer` **must** outlive CDict,
- *  and its content must remain unmodified throughout the lifetime of CDict. */
-ZSTDLIB_API ZSTD_CDict* ZSTD_createCDict_byReference(const void* dictBuffer, size_t dictSize, int compressionLevel);
-
-/*! ZSTD_getCParams() :
- * @return ZSTD_compressionParameters structure for a selected compression level and estimated srcSize.
- * `estimatedSrcSize` value is optional, select 0 if not known */
-ZSTDLIB_API ZSTD_compressionParameters ZSTD_getCParams(int compressionLevel, unsigned long long estimatedSrcSize, size_t dictSize);
-
-/*! ZSTD_getParams() :
- *  same as ZSTD_getCParams(), but @return a full `ZSTD_parameters` object instead of sub-component `ZSTD_compressionParameters`.
- *  All fields of `ZSTD_frameParameters` are set to default : contentSize=1, checksum=0, noDictID=0 */
-ZSTDLIB_API ZSTD_parameters ZSTD_getParams(int compressionLevel, unsigned long long estimatedSrcSize, size_t dictSize);
-
-/*! ZSTD_checkCParams() :
- *  Ensure param values remain within authorized range.
- * @return 0 on success, or an error code (can be checked with ZSTD_isError()) */
-ZSTDLIB_API size_t ZSTD_checkCParams(ZSTD_compressionParameters params);
-
-/*! ZSTD_adjustCParams() :
- *  optimize params for a given `srcSize` and `dictSize`.
- * `srcSize` can be unknown, in which case use ZSTD_CONTENTSIZE_UNKNOWN.
- * `dictSize` must be `0` when there is no dictionary.
- *  cPar can be invalid : all parameters will be clamped within valid range in the @return struct.
- *  This function never fails (wide contract) */
-ZSTDLIB_API ZSTD_compressionParameters ZSTD_adjustCParams(ZSTD_compressionParameters cPar, unsigned long long srcSize, size_t dictSize);
-
-/*! ZSTD_compress_advanced() :
- *  Same as ZSTD_compress_usingDict(), with fine-tune control over compression parameters (by structure) */
-ZSTDLIB_API size_t ZSTD_compress_advanced(ZSTD_CCtx* cctx,
-                                          void* dst, size_t dstCapacity,
-                                    const void* src, size_t srcSize,
-                                    const void* dict,size_t dictSize,
-                                          ZSTD_parameters params);
-
-/*! ZSTD_compress_usingCDict_advanced() :
- *  Same as ZSTD_compress_usingCDict(), with fine-tune control over frame parameters */
-ZSTDLIB_API size_t ZSTD_compress_usingCDict_advanced(ZSTD_CCtx* cctx,
-                                              void* dst, size_t dstCapacity,
-                                        const void* src, size_t srcSize,
-                                        const ZSTD_CDict* cdict,
-                                              ZSTD_frameParameters fParams);
-
-
-/*! ZSTD_CCtx_loadDictionary_byReference() :
- *  Same as ZSTD_CCtx_loadDictionary(), but dictionary content is referenced, instead of being copied into CCtx.
- *  It saves some memory, but also requires that `dict` outlives its usage within `cctx` */
-ZSTDLIB_API size_t ZSTD_CCtx_loadDictionary_byReference(ZSTD_CCtx* cctx, const void* dict, size_t dictSize);
-
-/*! ZSTD_CCtx_loadDictionary_advanced() :
- *  Same as ZSTD_CCtx_loadDictionary(), but gives finer control over
- *  how to load the dictionary (by copy ? by reference ?)
- *  and how to interpret it (automatic ? force raw mode ? full mode only ?) */
-ZSTDLIB_API size_t ZSTD_CCtx_loadDictionary_advanced(ZSTD_CCtx* cctx, const void* dict, size_t dictSize, ZSTD_dictLoadMethod_e dictLoadMethod, ZSTD_dictContentType_e dictContentType);
-
-/*! ZSTD_CCtx_refPrefix_advanced() :
- *  Same as ZSTD_CCtx_refPrefix(), but gives finer control over
- *  how to interpret prefix content (automatic ? force raw mode (default) ? full mode only ?) */
-ZSTDLIB_API size_t ZSTD_CCtx_refPrefix_advanced(ZSTD_CCtx* cctx, const void* prefix, size_t prefixSize, ZSTD_dictContentType_e dictContentType);
-
-/* ===   experimental parameters   === */
-/* these parameters can be used with ZSTD_setParameter()
- * they are not guaranteed to remain supported in the future */
-
- /* Enables rsyncable mode,
-  * which makes compressed files more rsync friendly
-  * by adding periodic synchronization points to the compressed data.
-  * The target average block size is ZSTD_c_jobSize / 2.
-  * It's possible to modify the job size to increase or decrease
-  * the granularity of the synchronization point.
-  * Once the jobSize is smaller than the window size,
-  * it will result in compression ratio degradation.
-  * NOTE 1: rsyncable mode only works when multithreading is enabled.
-  * NOTE 2: rsyncable performs poorly in combination with long range mode,
-  * since it will decrease the effectiveness of synchronization points,
-  * though mileage may vary.
-  * NOTE 3: Rsyncable mode limits maximum compression speed to ~400 MB/s.
-  * If the selected compression level is already running significantly slower,
-  * the overall speed won't be significantly impacted.
-  */
- #define ZSTD_c_rsyncable ZSTD_c_experimentalParam1
-
-/* Select a compression format.
- * The value must be of type ZSTD_format_e.
- * See ZSTD_format_e enum definition for details */
-#define ZSTD_c_format ZSTD_c_experimentalParam2
-
-/* Force back-reference distances to remain < windowSize,
- * even when referencing into Dictionary content (default:0) */
-#define ZSTD_c_forceMaxWindow ZSTD_c_experimentalParam3
-
-/* Controls whether the contents of a CDict
- * are used in place, or copied into the working context.
- * Accepts values from the ZSTD_dictAttachPref_e enum.
- * See the comments on that enum for an explanation of the feature. */
-#define ZSTD_c_forceAttachDict ZSTD_c_experimentalParam4
-
-/* Controls how the literals are compressed (default is auto).
- * The value must be of type ZSTD_literalCompressionMode_e.
- * See ZSTD_literalCompressionMode_t enum definition for details.
- */
-#define ZSTD_c_literalCompressionMode ZSTD_c_experimentalParam5
-
-/* Tries to fit compressed block size to be around targetCBlockSize.
- * No target when targetCBlockSize == 0.
- * There is no guarantee on compressed block size (default:0) */
-#define ZSTD_c_targetCBlockSize ZSTD_c_experimentalParam6
-
-/*! ZSTD_CCtx_getParameter() :
- *  Get the requested compression parameter value, selected by enum ZSTD_cParameter,
- *  and store it into int* value.
- * @return : 0, or an error code (which can be tested with ZSTD_isError()).
- */
-ZSTDLIB_API size_t ZSTD_CCtx_getParameter(ZSTD_CCtx* cctx, ZSTD_cParameter param, int* value);
-
-
-/*! ZSTD_CCtx_params :
- *  Quick howto :
- *  - ZSTD_createCCtxParams() : Create a ZSTD_CCtx_params structure
- *  - ZSTD_CCtxParams_setParameter() : Push parameters one by one into
- *                                     an existing ZSTD_CCtx_params structure.
- *                                     This is similar to
- *                                     ZSTD_CCtx_setParameter().
- *  - ZSTD_CCtx_setParametersUsingCCtxParams() : Apply parameters to
- *                                    an existing CCtx.
- *                                    These parameters will be applied to
- *                                    all subsequent frames.
- *  - ZSTD_compressStream2() : Do compression using the CCtx.
- *  - ZSTD_freeCCtxParams() : Free the memory.
- *
- *  This can be used with ZSTD_estimateCCtxSize_advanced_usingCCtxParams()
- *  for static allocation of CCtx for single-threaded compression.
- */
-ZSTDLIB_API ZSTD_CCtx_params* ZSTD_createCCtxParams(void);
-ZSTDLIB_API size_t ZSTD_freeCCtxParams(ZSTD_CCtx_params* params);
-
-/*! ZSTD_CCtxParams_reset() :
- *  Reset params to default values.
- */
-ZSTDLIB_API size_t ZSTD_CCtxParams_reset(ZSTD_CCtx_params* params);
-
-/*! ZSTD_CCtxParams_init() :
- *  Initializes the compression parameters of cctxParams according to
- *  compression level. All other parameters are reset to their default values.
- */
-ZSTDLIB_API size_t ZSTD_CCtxParams_init(ZSTD_CCtx_params* cctxParams, int compressionLevel);
-
-/*! ZSTD_CCtxParams_init_advanced() :
- *  Initializes the compression and frame parameters of cctxParams according to
- *  params. All other parameters are reset to their default values.
- */
-ZSTDLIB_API size_t ZSTD_CCtxParams_init_advanced(ZSTD_CCtx_params* cctxParams, ZSTD_parameters params);
-
-/*! ZSTD_CCtxParams_setParameter() :
- *  Similar to ZSTD_CCtx_setParameter.
- *  Set one compression parameter, selected by enum ZSTD_cParameter.
- *  Parameters must be applied to a ZSTD_CCtx using ZSTD_CCtx_setParametersUsingCCtxParams().
- * @result : 0, or an error code (which can be tested with ZSTD_isError()).
- */
-ZSTDLIB_API size_t ZSTD_CCtxParams_setParameter(ZSTD_CCtx_params* params, ZSTD_cParameter param, int value);
-
-/*! ZSTD_CCtxParams_getParameter() :
- * Similar to ZSTD_CCtx_getParameter.
- * Get the requested value of one compression parameter, selected by enum ZSTD_cParameter.
- * @result : 0, or an error code (which can be tested with ZSTD_isError()).
- */
-ZSTDLIB_API size_t ZSTD_CCtxParams_getParameter(ZSTD_CCtx_params* params, ZSTD_cParameter param, int* value);
-
-/*! ZSTD_CCtx_setParametersUsingCCtxParams() :
- *  Apply a set of ZSTD_CCtx_params to the compression context.
- *  This can be done even after compression is started,
- *    if nbWorkers==0, this will have no impact until a new compression is started.
- *    if nbWorkers>=1, new parameters will be picked up at next job,
- *       with a few restrictions (windowLog, pledgedSrcSize, nbWorkers, jobSize, and overlapLog are not updated).
- */
-ZSTDLIB_API size_t ZSTD_CCtx_setParametersUsingCCtxParams(
-        ZSTD_CCtx* cctx, const ZSTD_CCtx_params* params);
-
-/*! ZSTD_compressStream2_simpleArgs() :
- *  Same as ZSTD_compressStream2(),
- *  but using only integral types as arguments.
- *  This variant might be helpful for binders from dynamic languages
- *  which have troubles handling structures containing memory pointers.
- */
-ZSTDLIB_API size_t ZSTD_compressStream2_simpleArgs (
-                            ZSTD_CCtx* cctx,
-                            void* dst, size_t dstCapacity, size_t* dstPos,
-                      const void* src, size_t srcSize, size_t* srcPos,
-                            ZSTD_EndDirective endOp);
-
-
-/***************************************
-*  Advanced decompression functions
-***************************************/
-
-/*! ZSTD_isFrame() :
- *  Tells if the content of `buffer` starts with a valid Frame Identifier.
- *  Note : Frame Identifier is 4 bytes. If `size < 4`, @return will always be 0.
- *  Note 2 : Legacy Frame Identifiers are considered valid only if Legacy Support is enabled.
- *  Note 3 : Skippable Frame Identifiers are considered valid. */
-ZSTDLIB_API unsigned ZSTD_isFrame(const void* buffer, size_t size);
-
-/*! ZSTD_createDDict_byReference() :
- *  Create a digested dictionary, ready to start decompression operation without startup delay.
- *  Dictionary content is referenced, and therefore stays in dictBuffer.
- *  It is important that dictBuffer outlives DDict,
- *  it must remain read accessible throughout the lifetime of DDict */
-ZSTDLIB_API ZSTD_DDict* ZSTD_createDDict_byReference(const void* dictBuffer, size_t dictSize);
-
-/*! ZSTD_DCtx_loadDictionary_byReference() :
- *  Same as ZSTD_DCtx_loadDictionary(),
- *  but references `dict` content instead of copying it into `dctx`.
- *  This saves memory if `dict` remains around.,
- *  However, it's imperative that `dict` remains accessible (and unmodified) while being used, so it must outlive decompression. */
-ZSTDLIB_API size_t ZSTD_DCtx_loadDictionary_byReference(ZSTD_DCtx* dctx, const void* dict, size_t dictSize);
-
-/*! ZSTD_DCtx_loadDictionary_advanced() :
- *  Same as ZSTD_DCtx_loadDictionary(),
- *  but gives direct control over
- *  how to load the dictionary (by copy ? by reference ?)
- *  and how to interpret it (automatic ? force raw mode ? full mode only ?). */
-ZSTDLIB_API size_t ZSTD_DCtx_loadDictionary_advanced(ZSTD_DCtx* dctx, const void* dict, size_t dictSize, ZSTD_dictLoadMethod_e dictLoadMethod, ZSTD_dictContentType_e dictContentType);
-
-/*! ZSTD_DCtx_refPrefix_advanced() :
- *  Same as ZSTD_DCtx_refPrefix(), but gives finer control over
- *  how to interpret prefix content (automatic ? force raw mode (default) ? full mode only ?) */
-ZSTDLIB_API size_t ZSTD_DCtx_refPrefix_advanced(ZSTD_DCtx* dctx, const void* prefix, size_t prefixSize, ZSTD_dictContentType_e dictContentType);
-
-/*! ZSTD_DCtx_setMaxWindowSize() :
- *  Refuses allocating internal buffers for frames requiring a window size larger than provided limit.
- *  This protects a decoder context from reserving too much memory for itself (potential attack scenario).
- *  This parameter is only useful in streaming mode, since no internal buffer is allocated in single-pass mode.
- *  By default, a decompression context accepts all window sizes <= (1 << ZSTD_WINDOWLOG_LIMIT_DEFAULT)
- * @return : 0, or an error code (which can be tested using ZSTD_isError()).
- */
-ZSTDLIB_API size_t ZSTD_DCtx_setMaxWindowSize(ZSTD_DCtx* dctx, size_t maxWindowSize);
-
-/* ZSTD_d_format
- * experimental parameter,
- * allowing selection between ZSTD_format_e input compression formats
- */
-#define ZSTD_d_format ZSTD_d_experimentalParam1
-
-/*! ZSTD_DCtx_setFormat() :
- *  Instruct the decoder context about what kind of data to decode next.
- *  This instruction is mandatory to decode data without a fully-formed header,
- *  such ZSTD_f_zstd1_magicless for example.
- * @return : 0, or an error code (which can be tested using ZSTD_isError()). */
-ZSTDLIB_API size_t ZSTD_DCtx_setFormat(ZSTD_DCtx* dctx, ZSTD_format_e format);
-
-/*! ZSTD_decompressStream_simpleArgs() :
- *  Same as ZSTD_decompressStream(),
- *  but using only integral types as arguments.
- *  This can be helpful for binders from dynamic languages
- *  which have troubles handling structures containing memory pointers.
- */
-ZSTDLIB_API size_t ZSTD_decompressStream_simpleArgs (
-                            ZSTD_DCtx* dctx,
-                            void* dst, size_t dstCapacity, size_t* dstPos,
-                      const void* src, size_t srcSize, size_t* srcPos);
-
-
-/********************************************************************
-*  Advanced streaming functions
-*  Warning : most of these functions are now redundant with the Advanced API.
-*  Once Advanced API reaches "stable" status,
-*  redundant functions will be deprecated, and then at some point removed.
-********************************************************************/
-
-/*=====   Advanced Streaming compression functions  =====*/
-/**! ZSTD_initCStream_srcSize() :
- * This function is deprecated, and equivalent to:
- *     ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only);
- *     ZSTD_CCtx_refCDict(zcs, NULL); // clear the dictionary (if any)
- *     ZSTD_CCtx_setParameter(zcs, ZSTD_c_compressionLevel, compressionLevel);
- *     ZSTD_CCtx_setPledgedSrcSize(zcs, pledgedSrcSize);
- *
- * pledgedSrcSize must be correct. If it is not known at init time, use
- * ZSTD_CONTENTSIZE_UNKNOWN. Note that, for compatibility with older programs,
- * "0" also disables frame content size field. It may be enabled in the future.
- */
-ZSTDLIB_API size_t ZSTD_initCStream_srcSize(ZSTD_CStream* zcs, int compressionLevel, unsigned long long pledgedSrcSize);
-/**! ZSTD_initCStream_usingDict() :
- * This function is deprecated, and is equivalent to:
- *     ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only);
- *     ZSTD_CCtx_setParameter(zcs, ZSTD_c_compressionLevel, compressionLevel);
- *     ZSTD_CCtx_loadDictionary(zcs, dict, dictSize);
- *
- * Creates of an internal CDict (incompatible with static CCtx), except if
- * dict == NULL or dictSize < 8, in which case no dict is used.
- * Note: dict is loaded with ZSTD_dm_auto (treated as a full zstd dictionary if
- * it begins with ZSTD_MAGIC_DICTIONARY, else as raw content) and ZSTD_dlm_byCopy.
- */
-ZSTDLIB_API size_t ZSTD_initCStream_usingDict(ZSTD_CStream* zcs, const void* dict, size_t dictSize, int compressionLevel);
-/**! ZSTD_initCStream_advanced() :
- * This function is deprecated, and is approximately equivalent to:
- *     ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only);
- *     ZSTD_CCtx_setZstdParams(zcs, params); // Set the zstd params and leave the rest as-is
- *     ZSTD_CCtx_setPledgedSrcSize(zcs, pledgedSrcSize);
- *     ZSTD_CCtx_loadDictionary(zcs, dict, dictSize);
- *
- * pledgedSrcSize must be correct. If srcSize is not known at init time, use
- * value ZSTD_CONTENTSIZE_UNKNOWN. dict is loaded with ZSTD_dm_auto and ZSTD_dlm_byCopy.
- */
-ZSTDLIB_API size_t ZSTD_initCStream_advanced(ZSTD_CStream* zcs, const void* dict, size_t dictSize,
-                                             ZSTD_parameters params, unsigned long long pledgedSrcSize);
-/**! ZSTD_initCStream_usingCDict() :
- * This function is deprecated, and equivalent to:
- *     ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only);
- *     ZSTD_CCtx_refCDict(zcs, cdict);
- *
- * note : cdict will just be referenced, and must outlive compression session
- */
-ZSTDLIB_API size_t ZSTD_initCStream_usingCDict(ZSTD_CStream* zcs, const ZSTD_CDict* cdict);
-/**! ZSTD_initCStream_usingCDict_advanced() :
- * This function is deprecated, and is approximately equivalent to:
- *     ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only);
- *     ZSTD_CCtx_setZstdFrameParams(zcs, fParams); // Set the zstd frame params and leave the rest as-is
- *     ZSTD_CCtx_setPledgedSrcSize(zcs, pledgedSrcSize);
- *     ZSTD_CCtx_refCDict(zcs, cdict);
- *
- * same as ZSTD_initCStream_usingCDict(), with control over frame parameters.
- * pledgedSrcSize must be correct. If srcSize is not known at init time, use
- * value ZSTD_CONTENTSIZE_UNKNOWN.
- */
-ZSTDLIB_API size_t ZSTD_initCStream_usingCDict_advanced(ZSTD_CStream* zcs, const ZSTD_CDict* cdict, ZSTD_frameParameters fParams, unsigned long long pledgedSrcSize);
-
-/*! ZSTD_resetCStream() :
- * This function is deprecated, and is equivalent to:
- *     ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only);
- *     ZSTD_CCtx_setPledgedSrcSize(zcs, pledgedSrcSize);
- *
- *  start a new frame, using same parameters from previous frame.
- *  This is typically useful to skip dictionary loading stage, since it will re-use it in-place.
- *  Note that zcs must be init at least once before using ZSTD_resetCStream().
- *  If pledgedSrcSize is not known at reset time, use macro ZSTD_CONTENTSIZE_UNKNOWN.
- *  If pledgedSrcSize > 0, its value must be correct, as it will be written in header, and controlled at the end.
- *  For the time being, pledgedSrcSize==0 is interpreted as "srcSize unknown" for compatibility with older programs,
- *  but it will change to mean "empty" in future version, so use macro ZSTD_CONTENTSIZE_UNKNOWN instead.
- * @return : 0, or an error code (which can be tested using ZSTD_isError())
- */
-ZSTDLIB_API size_t ZSTD_resetCStream(ZSTD_CStream* zcs, unsigned long long pledgedSrcSize);
-
-
-typedef struct {
-    unsigned long long ingested;   /* nb input bytes read and buffered */
-    unsigned long long consumed;   /* nb input bytes actually compressed */
-    unsigned long long produced;   /* nb of compressed bytes generated and buffered */
-    unsigned long long flushed;    /* nb of compressed bytes flushed : not provided; can be tracked from caller side */
-    unsigned currentJobID;         /* MT only : latest started job nb */
-    unsigned nbActiveWorkers;      /* MT only : nb of workers actively compressing at probe time */
-} ZSTD_frameProgression;
-
-/* ZSTD_getFrameProgression() :
- * tells how much data has been ingested (read from input)
- * consumed (input actually compressed) and produced (output) for current frame.
- * Note : (ingested - consumed) is amount of input data buffered internally, not yet compressed.
- * Aggregates progression inside active worker threads.
- */
-ZSTDLIB_API ZSTD_frameProgression ZSTD_getFrameProgression(const ZSTD_CCtx* cctx);
-
-/*! ZSTD_toFlushNow() :
- *  Tell how many bytes are ready to be flushed immediately.
- *  Useful for multithreading scenarios (nbWorkers >= 1).
- *  Probe the oldest active job, defined as oldest job not yet entirely flushed,
- *  and check its output buffer.
- * @return : amount of data stored in oldest job and ready to be flushed immediately.
- *  if @return == 0, it means either :
- *  + there is no active job (could be checked with ZSTD_frameProgression()), or
- *  + oldest job is still actively compressing data,
- *    but everything it has produced has also been flushed so far,
- *    therefore flush speed is limited by production speed of oldest job
- *    irrespective of the speed of concurrent (and newer) jobs.
- */
-ZSTDLIB_API size_t ZSTD_toFlushNow(ZSTD_CCtx* cctx);
-
-
-/*=====   Advanced Streaming decompression functions  =====*/
-/**
- * This function is deprecated, and is equivalent to:
- *
- *     ZSTD_DCtx_reset(zds, ZSTD_reset_session_only);
- *     ZSTD_DCtx_loadDictionary(zds, dict, dictSize);
- *
- * note: no dictionary will be used if dict == NULL or dictSize < 8
- */
-ZSTDLIB_API size_t ZSTD_initDStream_usingDict(ZSTD_DStream* zds, const void* dict, size_t dictSize);
-/**
- * This function is deprecated, and is equivalent to:
- *
- *     ZSTD_DCtx_reset(zds, ZSTD_reset_session_only);
- *     ZSTD_DCtx_refDDict(zds, ddict);
- *
- * note : ddict is referenced, it must outlive decompression session
- */
-ZSTDLIB_API size_t ZSTD_initDStream_usingDDict(ZSTD_DStream* zds, const ZSTD_DDict* ddict);
-/**
- * This function is deprecated, and is equivalent to:
- *
- *     ZSTD_DCtx_reset(zds, ZSTD_reset_session_only);
- *
- * re-use decompression parameters from previous init; saves dictionary loading
- */
-ZSTDLIB_API size_t ZSTD_resetDStream(ZSTD_DStream* zds);
-
-
-/*********************************************************************
-*  Buffer-less and synchronous inner streaming functions
-*
-*  This is an advanced API, giving full control over buffer management, for users which need direct control over memory.
-*  But it's also a complex one, with several restrictions, documented below.
-*  Prefer normal streaming API for an easier experience.
-********************************************************************* */
-
-/**
-  Buffer-less streaming compression (synchronous mode)
-
-  A ZSTD_CCtx object is required to track streaming operations.
-  Use ZSTD_createCCtx() / ZSTD_freeCCtx() to manage resource.
-  ZSTD_CCtx object can be re-used multiple times within successive compression operations.
-
-  Start by initializing a context.
-  Use ZSTD_compressBegin(), or ZSTD_compressBegin_usingDict() for dictionary compression,
-  or ZSTD_compressBegin_advanced(), for finer parameter control.
-  It's also possible to duplicate a reference context which has already been initialized, using ZSTD_copyCCtx()
-
-  Then, consume your input using ZSTD_compressContinue().
-  There are some important considerations to keep in mind when using this advanced function :
-  - ZSTD_compressContinue() has no internal buffer. It uses externally provided buffers only.
-  - Interface is synchronous : input is consumed entirely and produces 1+ compressed blocks.
-  - Caller must ensure there is enough space in `dst` to store compressed data under worst case scenario.
-    Worst case evaluation is provided by ZSTD_compressBound().
-    ZSTD_compressContinue() doesn't guarantee recover after a failed compression.
-  - ZSTD_compressContinue() presumes prior input ***is still accessible and unmodified*** (up to maximum distance size, see WindowLog).
-    It remembers all previous contiguous blocks, plus one separated memory segment (which can itself consists of multiple contiguous blocks)
-  - ZSTD_compressContinue() detects that prior input has been overwritten when `src` buffer overlaps.
-    In which case, it will "discard" the relevant memory section from its history.
-
-  Finish a frame with ZSTD_compressEnd(), which will write the last block(s) and optional checksum.
-  It's possible to use srcSize==0, in which case, it will write a final empty block to end the frame.
-  Without last block mark, frames are considered unfinished (hence corrupted) by compliant decoders.
-
-  `ZSTD_CCtx` object can be re-used (ZSTD_compressBegin()) to compress again.
-*/
-
-/*=====   Buffer-less streaming compression functions  =====*/
-ZSTDLIB_API size_t ZSTD_compressBegin(ZSTD_CCtx* cctx, int compressionLevel);
-ZSTDLIB_API size_t ZSTD_compressBegin_usingDict(ZSTD_CCtx* cctx, const void* dict, size_t dictSize, int compressionLevel);
-ZSTDLIB_API size_t ZSTD_compressBegin_advanced(ZSTD_CCtx* cctx, const void* dict, size_t dictSize, ZSTD_parameters params, unsigned long long pledgedSrcSize); /**< pledgedSrcSize : If srcSize is not known at init time, use ZSTD_CONTENTSIZE_UNKNOWN */
-ZSTDLIB_API size_t ZSTD_compressBegin_usingCDict(ZSTD_CCtx* cctx, const ZSTD_CDict* cdict); /**< note: fails if cdict==NULL */
-ZSTDLIB_API size_t ZSTD_compressBegin_usingCDict_advanced(ZSTD_CCtx* const cctx, const ZSTD_CDict* const cdict, ZSTD_frameParameters const fParams, unsigned long long const pledgedSrcSize);   /* compression parameters are already set within cdict. pledgedSrcSize must be correct. If srcSize is not known, use macro ZSTD_CONTENTSIZE_UNKNOWN */
-ZSTDLIB_API size_t ZSTD_copyCCtx(ZSTD_CCtx* cctx, const ZSTD_CCtx* preparedCCtx, unsigned long long pledgedSrcSize); /**<  note: if pledgedSrcSize is not known, use ZSTD_CONTENTSIZE_UNKNOWN */
-
-ZSTDLIB_API size_t ZSTD_compressContinue(ZSTD_CCtx* cctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize);
-ZSTDLIB_API size_t ZSTD_compressEnd(ZSTD_CCtx* cctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize);
-
-
-/*-
-  Buffer-less streaming decompression (synchronous mode)
-
-  A ZSTD_DCtx object is required to track streaming operations.
-  Use ZSTD_createDCtx() / ZSTD_freeDCtx() to manage it.
-  A ZSTD_DCtx object can be re-used multiple times.
-
-  First typical operation is to retrieve frame parameters, using ZSTD_getFrameHeader().
-  Frame header is extracted from the beginning of compressed frame, so providing only the frame's beginning is enough.
-  Data fragment must be large enough to ensure successful decoding.
- `ZSTD_frameHeaderSize_max` bytes is guaranteed to always be large enough.
-  @result : 0 : successful decoding, the `ZSTD_frameHeader` structure is correctly filled.
-           >0 : `srcSize` is too small, please provide at least @result bytes on next attempt.
-           errorCode, which can be tested using ZSTD_isError().
-
-  It fills a ZSTD_frameHeader structure with important information to correctly decode the frame,
-  such as the dictionary ID, content size, or maximum back-reference distance (`windowSize`).
-  Note that these values could be wrong, either because of data corruption, or because a 3rd party deliberately spoofs false information.
-  As a consequence, check that values remain within valid application range.
-  For example, do not allocate memory blindly, check that `windowSize` is within expectation.
-  Each application can set its own limits, depending on local restrictions.
-  For extended interoperability, it is recommended to support `windowSize` of at least 8 MB.
-
-  ZSTD_decompressContinue() needs previous data blocks during decompression, up to `windowSize` bytes.
-  ZSTD_decompressContinue() is very sensitive to contiguity,
-  if 2 blocks don't follow each other, make sure that either the compressor breaks contiguity at the same place,
-  or that previous contiguous segment is large enough to properly handle maximum back-reference distance.
-  There are multiple ways to guarantee this condition.
-
-  The most memory efficient way is to use a round buffer of sufficient size.
-  Sufficient size is determined by invoking ZSTD_decodingBufferSize_min(),
-  which can @return an error code if required value is too large for current system (in 32-bits mode).
-  In a round buffer methodology, ZSTD_decompressContinue() decompresses each block next to previous one,
-  up to the moment there is not enough room left in the buffer to guarantee decoding another full block,
-  which maximum size is provided in `ZSTD_frameHeader` structure, field `blockSizeMax`.
-  At which point, decoding can resume from the beginning of the buffer.
-  Note that already decoded data stored in the buffer should be flushed before being overwritten.
-
-  There are alternatives possible, for example using two or more buffers of size `windowSize` each, though they consume more memory.
-
-  Finally, if you control the compression process, you can also ignore all buffer size rules,
-  as long as the encoder and decoder progress in "lock-step",
-  aka use exactly the same buffer sizes, break contiguity at the same place, etc.
-
-  Once buffers are setup, start decompression, with ZSTD_decompressBegin().
-  If decompression requires a dictionary, use ZSTD_decompressBegin_usingDict() or ZSTD_decompressBegin_usingDDict().
-
-  Then use ZSTD_nextSrcSizeToDecompress() and ZSTD_decompressContinue() alternatively.
-  ZSTD_nextSrcSizeToDecompress() tells how many bytes to provide as 'srcSize' to ZSTD_decompressContinue().
-  ZSTD_decompressContinue() requires this _exact_ amount of bytes, or it will fail.
-
- @result of ZSTD_decompressContinue() is the number of bytes regenerated within 'dst' (necessarily <= dstCapacity).
-  It can be zero : it just means ZSTD_decompressContinue() has decoded some metadata item.
-  It can also be an error code, which can be tested with ZSTD_isError().
-
-  A frame is fully decoded when ZSTD_nextSrcSizeToDecompress() returns zero.
-  Context can then be reset to start a new decompression.
-
-  Note : it's possible to know if next input to present is a header or a block, using ZSTD_nextInputType().
-  This information is not required to properly decode a frame.
-
-  == Special case : skippable frames ==
-
-  Skippable frames allow integration of user-defined data into a flow of concatenated frames.
-  Skippable frames will be ignored (skipped) by decompressor.
-  The format of skippable frames is as follows :
-  a) Skippable frame ID - 4 Bytes, Little endian format, any value from 0x184D2A50 to 0x184D2A5F
-  b) Frame Size - 4 Bytes, Little endian format, unsigned 32-bits
-  c) Frame Content - any content (User Data) of length equal to Frame Size
-  For skippable frames ZSTD_getFrameHeader() returns zfhPtr->frameType==ZSTD_skippableFrame.
-  For skippable frames ZSTD_decompressContinue() always returns 0 : it only skips the content.
-*/
-
-/*=====   Buffer-less streaming decompression functions  =====*/
-typedef enum { ZSTD_frame, ZSTD_skippableFrame } ZSTD_frameType_e;
-typedef struct {
-    unsigned long long frameContentSize; /* if == ZSTD_CONTENTSIZE_UNKNOWN, it means this field is not available. 0 means "empty" */
-    unsigned long long windowSize;       /* can be very large, up to <= frameContentSize */
-    unsigned blockSizeMax;
-    ZSTD_frameType_e frameType;          /* if == ZSTD_skippableFrame, frameContentSize is the size of skippable content */
-    unsigned headerSize;
-    unsigned dictID;
-    unsigned checksumFlag;
-} ZSTD_frameHeader;
-
-/*! ZSTD_getFrameHeader() :
- *  decode Frame Header, or requires larger `srcSize`.
- * @return : 0, `zfhPtr` is correctly filled,
- *          >0, `srcSize` is too small, value is wanted `srcSize` amount,
- *           or an error code, which can be tested using ZSTD_isError() */
-ZSTDLIB_API size_t ZSTD_getFrameHeader(ZSTD_frameHeader* zfhPtr, const void* src, size_t srcSize);   /**< doesn't consume input */
-/*! ZSTD_getFrameHeader_advanced() :
- *  same as ZSTD_getFrameHeader(),
- *  with added capability to select a format (like ZSTD_f_zstd1_magicless) */
-ZSTDLIB_API size_t ZSTD_getFrameHeader_advanced(ZSTD_frameHeader* zfhPtr, const void* src, size_t srcSize, ZSTD_format_e format);
-ZSTDLIB_API size_t ZSTD_decodingBufferSize_min(unsigned long long windowSize, unsigned long long frameContentSize);  /**< when frame content size is not known, pass in frameContentSize == ZSTD_CONTENTSIZE_UNKNOWN */
-
-ZSTDLIB_API size_t ZSTD_decompressBegin(ZSTD_DCtx* dctx);
-ZSTDLIB_API size_t ZSTD_decompressBegin_usingDict(ZSTD_DCtx* dctx, const void* dict, size_t dictSize);
-ZSTDLIB_API size_t ZSTD_decompressBegin_usingDDict(ZSTD_DCtx* dctx, const ZSTD_DDict* ddict);
-
-ZSTDLIB_API size_t ZSTD_nextSrcSizeToDecompress(ZSTD_DCtx* dctx);
-ZSTDLIB_API size_t ZSTD_decompressContinue(ZSTD_DCtx* dctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize);
-
-/* misc */
-ZSTDLIB_API void   ZSTD_copyDCtx(ZSTD_DCtx* dctx, const ZSTD_DCtx* preparedDCtx);
-typedef enum { ZSTDnit_frameHeader, ZSTDnit_blockHeader, ZSTDnit_block, ZSTDnit_lastBlock, ZSTDnit_checksum, ZSTDnit_skippableFrame } ZSTD_nextInputType_e;
-ZSTDLIB_API ZSTD_nextInputType_e ZSTD_nextInputType(ZSTD_DCtx* dctx);
-
-
-
-
-/* ============================ */
-/**       Block level API       */
-/* ============================ */
-
-/*!
-    Block functions produce and decode raw zstd blocks, without frame metadata.
-    Frame metadata cost is typically ~18 bytes, which can be non-negligible for very small blocks (< 100 bytes).
-    But users will have to take in charge needed metadata to regenerate data, such as compressed and content sizes.
-
-    A few rules to respect :
-    - Compressing and decompressing require a context structure
-      + Use ZSTD_createCCtx() and ZSTD_createDCtx()
-    - It is necessary to init context before starting
-      + compression : any ZSTD_compressBegin*() variant, including with dictionary
-      + decompression : any ZSTD_decompressBegin*() variant, including with dictionary
-      + copyCCtx() and copyDCtx() can be used too
-    - Block size is limited, it must be <= ZSTD_getBlockSize() <= ZSTD_BLOCKSIZE_MAX == 128 KB
-      + If input is larger than a block size, it's necessary to split input data into multiple blocks
-      + For inputs larger than a single block, consider using regular ZSTD_compress() instead.
-        Frame metadata is not that costly, and quickly becomes negligible as source size grows larger than a block.
-    - When a block is considered not compressible enough, ZSTD_compressBlock() result will be 0 (zero) !
-      ===> In which case, nothing is produced into `dst` !
-      + User __must__ test for such outcome and deal directly with uncompressed data
-      + A block cannot be declared incompressible if ZSTD_compressBlock() return value was != 0.
-        Doing so would mess up with statistics history, leading to potential data corruption.
-      + ZSTD_decompressBlock() _doesn't accept uncompressed data as input_ !!
-      + In case of multiple successive blocks, should some of them be uncompressed,
-        decoder must be informed of their existence in order to follow proper history.
-        Use ZSTD_insertBlock() for such a case.
-*/
-
-/*=====   Raw zstd block functions  =====*/
-ZSTDLIB_API size_t ZSTD_getBlockSize   (const ZSTD_CCtx* cctx);
-ZSTDLIB_API size_t ZSTD_compressBlock  (ZSTD_CCtx* cctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize);
-ZSTDLIB_API size_t ZSTD_decompressBlock(ZSTD_DCtx* dctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize);
-ZSTDLIB_API size_t ZSTD_insertBlock    (ZSTD_DCtx* dctx, const void* blockStart, size_t blockSize);  /**< insert uncompressed block into `dctx` history. Useful for multi-blocks decompression. */
-
-
-#endif   /* ZSTD_H_ZSTD_STATIC_LINKING_ONLY */
-
-#if defined (__cplusplus)
-}
-#endif
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/CHANGELOG mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/CHANGELOG
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/CHANGELOG	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/CHANGELOG	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,698 @@
+v1.5.0  (May 11, 2021)
+api: Various functions promoted from experimental to stable API: (#2579-2581, @senhuang42)
+  `ZSTD_defaultCLevel()`
+  `ZSTD_getDictID_fromCDict()`
+api: Several experimental functions have been deprecated and will emit a compiler warning (#2582, @senhuang42)
+  `ZSTD_compress_advanced()`
+  `ZSTD_compress_usingCDict_advanced()`
+  `ZSTD_compressBegin_advanced()`
+  `ZSTD_compressBegin_usingCDict_advanced()`
+  `ZSTD_initCStream_srcSize()`
+  `ZSTD_initCStream_usingDict()`
+  `ZSTD_initCStream_usingCDict()`
+  `ZSTD_initCStream_advanced()`
+  `ZSTD_initCStream_usingCDict_advanced()`
+  `ZSTD_resetCStream()`
+api: ZSTDMT_NBWORKERS_MAX reduced to 64 for 32-bit environments (@Cyan4973)
+perf: Significant speed improvements for middle compression levels (#2494, @senhuang42 @terrelln)
+perf: Block splitter to improve compression ratio, enabled by default for high compression levels (#2447, @senhuang42)
+perf: Decompression loop refactor, speed improvements on `clang` and for `--long` modes (#2614 #2630, @Cyan4973)
+perf: Reduced stack usage during compression and decompression entropy stage (#2522 #2524, @terrelln)
+bug: Improve setting permissions of created files (#2525, @felixhandte)
+bug: Fix large dictionary non-determinism (#2607, @terrelln)
+bug: Fix non-determinism test failures on Linux i686 (#2606, @terrelln)
+bug: Fix various dedicated dictionary search bugs (#2540 #2586, @senhuang42 @felixhandte)
+bug: Ensure `ZSTD_estimateCCtxSize*() `monotonically increases with compression level (#2538, @senhuang42)
+bug: Fix --patch-from mode parameter bound bug with small files (#2637, @occivink)
+bug: Fix UBSAN error in decompression (#2625, @terrelln)
+bug: Fix superblock compression divide by zero bug (#2592, @senhuang42)
+bug: Make the number of physical CPU cores detection more robust (#2517, @PaulBone)
+doc: Improve `zdict.h` dictionary training API documentation (#2622, @terrelln)
+doc: Note that public `ZSTD_free*()` functions accept NULL pointers (#2521, @animalize)
+doc: Add style guide docs for open source contributors (#2626, @Cyan4973)
+tests: Better regression test coverage for different dictionary modes (#2559, @senhuang42)
+tests: Better test coverage of index reduction (#2603, @terrelln)
+tests: OSS-Fuzz coverage for seekable format (#2617, @senhuang42)
+tests: Test coverage for ZSTD threadpool API (#2604, @senhuang42)
+build: Dynamic library built multithreaded by default (#2584, @senhuang42)
+build: Move  `zstd_errors.h`  and  `zdict.h`  to  `lib/`  root (#2597, @terrelln)
+build: Allow `ZSTDMT_JOBSIZE_MIN` to be configured at compile-time, reduce default to 512KB (#2611, @Cyan4973)
+build: Single file library build script moved to `build/` directory (#2618, @felixhandte)
+build: `ZBUFF_*()` is no longer built by default (#2583, @senhuang42)
+build: Fixed Meson build (#2548, @SupervisedThinking @kloczek)
+build: Fix excessive compiler warnings with clang-cl and CMake (#2600, @nickhutchinson)
+build: Detect presence of `md5` on Darwin (#2609, @felixhandte)
+build: Avoid SIGBUS on armv6 (#2633, @bmwiedmann)
+cli: `--progress` flag added to always display progress bar (#2595, @senhuang42)
+cli: Allow reading from block devices with `--force` (#2613, @felixhandte)
+cli: Fix CLI filesize display bug (#2550, @Cyan4973)
+cli: Fix windows CLI `--filelist` end-of-line bug (#2620, @Cyan4973)
+contrib: Various fixes for linux kernel patch (#2539, @terrelln)
+contrib: Seekable format - Decompression hanging edge case fix (#2516, @senhuang42)
+contrib: Seekable format - New seek table-only API  (#2113 #2518, @mdittmer @Cyan4973)
+contrib: Seekable format - Fix seek table descriptor check when loading (#2534, @foxeng)
+contrib: Seekable format - Decompression fix for large offsets, (#2594, @azat)
+misc: Automatically published release tarballs available on Github (#2535, @felixhandte)
+
+v1.4.9  (Mar 1, 2021)
+bug: Use `umask()` to Constrain Created File Permissions (#2495, @felixhandte)
+bug: Make Simple Single-Pass Functions Ignore Advanced Parameters (#2498, @terrelln)
+api: Add (De)Compression Tracing Functionality (#2482, @terrelln)
+api: Support References to Multiple DDicts (#2446, @senhuang42)
+api: Add Function to Generate Skippable Frame (#2439, @senhuang42)
+perf: New Algorithms for the Long Distance Matcher (#2483, @mpu)
+perf: Performance Improvements for Long Distance Matcher (#2464, @mpu)
+perf: Don't Shrink Window Log when Streaming with a Dictionary (#2451, @terrelln)
+cli: Fix `--output-dir-mirror`'s Rejection of `..`-Containing Paths (#2512, @felixhandte)
+cli: Allow Input From Console When `-f`/`--force` is Passed (#2466, @felixhandte)
+cli: Improve Help Message (#2500, @senhuang42)
+tests: Remove Flaky Tests (#2455, #2486, #2445, @Cyan4973)
+tests: Correctly Invoke md5 Utility on NetBSD (#2492, @niacat)
+tests: Avoid Using `stat -c` on NetBSD (#2513, @felixhandte)
+build: Zstd CLI Can Now be Linked to Dynamic `libzstd` (#2457, #2454 @Cyan4973)
+build: Hide and Avoid Using Static-Only Symbols (#2501, #2504, @skitt)
+build: CMake: Enable Only C for lib/ and programs/ Projects (#2498, @concatime)
+build: CMake: Use `configure_file()` to Create the `.pc` File (#2462, @lazka)
+build: Fix Fuzzer Compiler Detection & Update UBSAN Flags (#2503, @terrelln)
+build: Add Guards for `_LARGEFILE_SOURCE` and `_LARGEFILE64_SOURCE` (#2444, @indygreg)
+build: Improve `zlibwrapper` Makefile (#2437, @Cyan4973)
+contrib: Add `recover_directory` Program (#2473, @terrelln)
+doc: Change License Year to 2021 (#2452 & #2465, @terrelln & @senhuang42)
+doc: Fix Typos (#2459, @ThomasWaldmann)
+
+v1.4.8  (Dec 18, 2020)
+hotfix: wrong alignment of an internal buffer
+
+v1.4.7  (Dec 16, 2020)
+perf: stronger --long mode at high compression levels, by @senhuang42
+perf: stronger --patch-from at high compression levels, thanks to --long improvements
+perf: faster dictionary compression at medium compression levels, by @felixhandte
+perf: small speed & memory usage improvements for ZSTD_compress2(), by @terrelln
+perf: improved fast compression speeds with Visual Studio, by @animalize
+cli : Set nb of threads with environment variable ZSTD_NBTHREADS, by @senhuang42
+cli : accept decompressing files with *.zstd suffix
+cli : provide a condensed summary by default when processing multiple files
+cli : fix : stdin input no longer confused as user prompt
+cli : improve accuracy of several error messages
+api : new sequence ingestion API, by @senhuang42
+api : shared thread pool: control total nb of threads used by multiple compression jobs, by @marxin
+api : new ZSTD_getDictID_fromCDict(), by @LuAPi
+api : zlibWrapper only uses public API, and is compatible with dynamic library, by @terrelln
+api : fix : multithreaded compression has predictable output even in special cases (see #2327) (issue not accessible from cli)
+api : fix : dictionary compression correctly respects dictionary compression level (see #2303) (issue not accessible from cli)
+build: fix cmake script when using path with spaces, by @terrelln
+build: improved compile-time detection of aarch64/neon platforms, by @bsdimp
+build: Fix building on AIX 5.1, by @likema
+build: compile paramgrill with cmake on Windows, requested by @mirh
+doc : clarify repcode updates in format specification, by @felixhandte
+
+v1.4.6
+fix : Always return dstSize_tooSmall when that is the case
+fix : Fix ZSTD_initCStream_advanced() with static allocation and no dictionary
+perf: Improve small block decompression speed by 20%+, by @terrelln
+perf: Reduce compression stack usage by 1 KB, by @terrelln
+perf: Improve decompression speed by improving ZSTD_wildcopy, by @helloguo (#2252, #2256)
+perf: Improve histogram construction, by @cyan4973 (#2253)
+cli : Add --output-dir-mirror option, by @xxie24 (#2219)
+cli : Warn when (de)compressing multiple files into a single output, by @senhuang42 (#2279)
+cli : Improved progress bar and status summary when (de)compressing multiple files, by @senhuang42 (#2283)
+cli : Call stat less often, by @felixhandte (#2262)
+cli : Allow --patch-from XXX and --filelist XXX in addition to --patch-from=XXX and --filelist=XXX, by @cyan4973 (#2250)
+cli : Allow --patch-from to compress stdin with --stream-size, by @bimbashrestha (#2206)
+api : Do not install zbuff.h, since it has long been deprecated, by @cyan4973 (#2166).
+api : Fix ZSTD_CCtx_setParameter() with ZSTD_c_compressionLevel to make 0 mean default level, by @i-do-cpp (#2291)
+api : Rename ZSTDMT_NBTHREADS_MAX to ZSTDMT_NBWORKERS_MAX, by @marxin (#2228).
+build: Install pkg-config file with CMake and MinGW, by @tonytheodore (#2183)
+build: Install DLL with CMake on Windows, by @BioDataAnalysis (#2221)
+build: Fix DLL install location with CMake, by @xantares and @bimbashrestha (#2186)
+build: Add ZSTD_NO_UNUSED_FUNCTIONS macro to hide unused functions
+build: Add ZSTD_NO_INTRINSICS macro to avoid explicit intrinsics
+build: Add STATIC_BMI2 macro for compile time detection of BMI2 on MSVC, by @Niadb (#2258)
+build: Fix -Wcomma warnings, by @cwoffenden
+build: Remove distutils requirement for meson build, by @neheb (#2197)
+build: Fix cli compilation with uclibc
+build: Fix cli compilation without st_mtime, by @ffontaine (#2246)
+build: Fix shadowing warnings in library
+build: Fix single file library compilation with Enscripten, by @yoshihitoh (#2227)
+misc: Improve single file library and include dictBuilder, by @cwoffenden
+misc: Allow compression dictionaries with missing symbols
+misc: Add freestanding translation script in contrib/freestanding_lib
+misc: Collect all of zstd's libc dependencies into zstd_deps.h
+doc : Add ZSTD_versionString() to manual, by @animalize
+doc : Fix documentation for ZSTD_CCtxParams_setParameter(), by @felixhandte (#2270)
+
+v1.4.5  (May 22, 2020)
+fix : Compression ratio regression on huge files (> 3 GB) using high levels (--ultra) and multithreading, by @terrelln
+perf: Improved decompression speed: x64 : +10% (clang) / +5% (gcc); ARM : from +15% to +50%, depending on SoC, by @terrelln
+perf: Automatically downsizes ZSTD_DCtx when too large for too long (#2069, by @bimbashreshta)
+perf: Improved fast compression speed on aarch64 (#2040, ~+3%, by @caoyzh)
+perf: Small level 1 compression speed gains (depending on compiler)
+cli : New --patch-from command, create and apply patches from files, by @bimbashreshta
+cli : New --filelist= : Provide a list of files to operate upon from a file
+cli : -b -d command can now benchmark decompression on multiple files
+cli : New --no-content-size command
+cli : New --show-default-cparams information command
+api : ZDICT_finalizeDictionary() is promoted to stable (#2111)
+api : new experimental parameter ZSTD_d_stableOutBuffer (#2094)
+build: Generate a single-file libzstd library (#2065, by @cwoffenden)
+build: Relative includes no longer require -I compiler flags for zstd lib subdirs (#2103, by @felixhandte)
+build: zstd now compiles cleanly under -pedantic (#2099)
+build: zstd now compiles with make-4.3
+build: Support mingw cross-compilation from Linux, by @Ericson2314
+build: Meson multi-thread build fix on windows
+build: Some misc icc fixes backed by new ci test on travis
+misc: bitflip analyzer tool, by @felixhandte
+misc: Extend largeNbDicts benchmark to compression
+misc: Edit-distance match finder in contrib/
+doc : Improved beginner CONTRIBUTING.md docs
+doc : New issue templates for zstd
+
+v1.4.4  (Nov 6, 2019)
+perf: Improved decompression speed, by > 10%, by @terrelln
+perf: Better compression speed when re-using a context, by @felixhandte
+perf: Fix compression ratio when compressing large files with small dictionary, by @senhuang42
+perf: zstd reference encoder can generate RLE blocks, by @bimbashrestha
+perf: minor generic speed optimization, by @davidbolvansky
+api: new ability to extract sequences from the parser for analysis, by @bimbashrestha
+api: fixed decoding of magic-less frames, by @terrelln
+api: fixed ZSTD_initCStream_advanced() performance with fast modes, reported by @QrczakMK
+cli: Named pipes support, by @bimbashrestha
+cli: short tar's extension support, by @stokito
+cli: command --output-dir-flat= , generates target files into requested directory, by @senhuang42
+cli: commands --stream-size=# and --size-hint=#, by @nmagerko
+cli: command --exclude-compressed, by @shashank0791
+cli: faster `-t` test mode
+cli: improved some error messages, by @vangyzen
+cli: fix command `-D dictionary` on Windows, reported by @artyompetrov
+cli: fix rare deadlock condition within dictionary builder, by @terrelln
+build: single-file decoder with emscripten compilation script, by @cwoffenden
+build: fixed zlibWrapper compilation on Visual Studio, reported by @bluenlive
+build: fixed deprecation warning for certain gcc version, reported by @jasonma163
+build: fix compilation on old gcc versions, by @cemeyer
+build: improved installation directories for cmake script, by Dmitri Shubin
+pack: modified pkgconfig, for better integration into openwrt, requested by @neheb
+misc: Improved documentation : ZSTD_CLEVEL, DYNAMIC_BMI2, ZSTD_CDict, function deprecation, zstd format
+misc: fixed educational decoder : accept larger literals section, and removed UNALIGNED() macro
+
+v1.4.3  (Aug 20, 2019)
+bug: Fix Dictionary Compression Ratio Regression by @cyan4973 (#1709)
+bug: Fix Buffer Overflow in legacy v0.3 decompression by @felixhandte (#1722)
+build: Add support for IAR C/C++ Compiler for Arm by @joseph0918 (#1705)
+
+v1.4.2  (Jul 26, 2019)
+bug: Fix bug in zstd-0.5 decoder by @terrelln (#1696)
+bug: Fix seekable decompression in-memory API by @iburinoc (#1695)
+misc: Validate blocks are smaller than size limit by @vivekmg (#1685)
+misc: Restructure source files by @ephiepark (#1679)
+
+v1.4.1  (Jul 20, 2019)
+bug: Fix data corruption in niche use cases by @terrelln (#1659)
+bug: Fuzz legacy modes, fix uncovered bugs by @terrelln (#1593, #1594, #1595)
+bug: Fix out of bounds read by @terrelln (#1590)
+perf: Improve decode speed by ~7% @mgrice (#1668)
+perf: Slightly improved compression ratio of level 3 and 4 (ZSTD_dfast) by @cyan4973 (#1681)
+perf: Slightly faster compression speed when re-using a context by @cyan4973 (#1658)
+perf: Improve compression ratio for small windowLog by @cyan4973 (#1624)
+perf: Faster compression speed in high compression mode for repetitive data by @terrelln (#1635)
+api: Add parameter to generate smaller dictionaries by @tyler-tran (#1656)
+cli: Recognize symlinks when built in C99 mode by @felixhandte (#1640)
+cli: Expose cpu load indicator for each file on -vv mode by @ephiepark (#1631)
+cli: Restrict read permissions on destination files by @chungy (#1644)
+cli: zstdgrep: handle -f flag by @felixhandte (#1618)
+cli: zstdcat: follow symlinks by @vejnar (#1604)
+doc: Remove extra size limit on compressed blocks by @felixhandte (#1689)
+doc: Fix typo by @yk-tanigawa (#1633)
+doc: Improve documentation on streaming buffer sizes by @cyan4973 (#1629)
+build: CMake: support building with LZ4 @leeyoung624 (#1626)
+build: CMake: install zstdless and zstdgrep by @leeyoung624 (#1647)
+build: CMake: respect existing uninstall target by @j301scott (#1619)
+build: Make: skip multithread tests when built without support by @michaelforney (#1620)
+build: Make: Fix examples/ test target by @sjnam (#1603)
+build: Meson: rename options out of deprecated namespace by @lzutao (#1665)
+build: Meson: fix build by @lzutao (#1602)
+build: Visual Studio: don't export symbols in static lib by @scharan (#1650)
+build: Visual Studio: fix linking by @absotively (#1639)
+build: Fix MinGW-W64 build by @myzhang1029 (#1600)
+misc: Expand decodecorpus coverage by @ephiepark (#1664)
+
+v1.4.0  (Apr 17, 2019)
+perf: Improve level 1 compression speed in most scenarios by 6% by @gbtucker and @terrelln
+api: Move the advanced API, including all functions in the staging section, to the stable section
+api: Make ZSTD_e_flush and ZSTD_e_end block for maximum forward progress
+api: Rename ZSTD_CCtxParam_getParameter to ZSTD_CCtxParams_getParameter
+api: Rename ZSTD_CCtxParam_setParameter to ZSTD_CCtxParams_setParameter
+api: Don't export ZSTDMT functions from the shared library by default
+api: Require ZSTD_MULTITHREAD to be defined to use ZSTDMT
+api: Add ZSTD_decompressBound() to provide an upper bound on decompressed size by @shakeelrao
+api: Fix ZSTD_decompressDCtx() corner cases with a dictionary
+api: Move ZSTD_getDictID_*() functions to the stable section
+api: Add ZSTD_c_literalCompressionMode flag to enable or disable literal compression by @terrelln
+api: Allow compression parameters to be set when a dictionary is used
+api: Allow setting parameters before or after ZSTD_CCtx_loadDictionary() is called
+api: Fix ZSTD_estimateCStreamSize_usingCCtxParams()
+api: Setting ZSTD_d_maxWindowLog to 0 means use the default
+cli: Ensure that a dictionary is not used to compress itself by @shakeelrao
+cli: Add --[no-]compress-literals flag to enable or disable literal compression
+doc: Update the examples to use the advanced API
+doc: Explain how to transition from old streaming functions to the advanced API in the header
+build: Improve the Windows release packages
+build: Improve CMake build by @hjmjohnson
+build: Build fixes for FreeBSD by @lwhsu
+build: Remove redundant warnings by @thatsafunnyname
+build: Fix tests on OpenBSD by @bket
+build: Extend fuzzer build system to work with the new clang engine
+build: CMake now creates the libzstd.so.1 symlink
+build: Improve Menson build by @lzutao
+misc: Fix symbolic link detection on FreeBSD
+misc: Use physical core count for -T0 on FreeBSD by @cemeyer
+misc: Fix zstd --list on truncated files by @kostmo
+misc: Improve logging in debug mode by @felixhandte
+misc: Add CirrusCI tests by @lwhsu
+misc: Optimize dictionary memory usage in corner cases
+misc: Improve the dictionary builder on small or homogeneous data
+misc: Fix spelling across the repo by @jsoref
+
+v1.3.8  (Dec 28, 2018)
+perf: better decompression speed on large files (+7%) and cold dictionaries (+15%)
+perf: slightly better compression ratio at high compression modes
+api : finalized advanced API, last stage before "stable" status
+api : new --rsyncable mode, by @terrelln
+api : support decompression of empty frames into NULL (used to be an error) (#1385)
+build: new set of macros to build a minimal size decoder, by @felixhandte
+build: fix compilation on MIPS32, reported by @clbr (#1441)
+build: fix compilation with multiple -arch flags, by @ryandesign
+build: highly upgraded meson build, by @lzutao
+build: improved buck support, by @obelisk
+build: fix cmake script : can create debug build, by @pitrou
+build: Makefile : grep works on both colored consoles and systems without color support
+build: fixed zstd-pgo, by @bmwiedemann
+cli : support ZSTD_CLEVEL environment variable, by @yijinfb (#1423)
+cli : --no-progress flag, preserving final summary (#1371), by @terrelln
+cli : ensure destination file is not source file (#1422)
+cli : clearer error messages, especially when input file not present
+doc : clarified zstd_compression_format.md, by @ulikunitz
+misc: fixed zstdgrep, returns 1 on failure, by @lzutao
+misc: NEWS renamed as CHANGELOG, in accordance with fboss
+
+v1.3.7  (Oct 20, 2018)
+perf: slightly better decompression speed on clang (depending on hardware target)
+fix : performance of dictionary compression for small input < 4 KB at levels 9 and 10
+build: no longer build backtrace by default in release mode; restrict further automatic mode
+build: control backtrace support through build macro BACKTRACE
+misc: added man pages for zstdless and zstdgrep, by @samrussell
+
+v1.3.6  (Oct 6, 2018)
+perf: much faster dictionary builder, by @jenniferliu
+perf: faster dictionary compression on small data when using multiple contexts, by @felixhandte
+perf: faster dictionary decompression when using a very large number of dictionaries simultaneously
+cli : fix : does no longer overwrite destination when source does not exist (#1082)
+cli : new command --adapt, for automatic compression level adaptation
+api : fix : block api can be streamed with > 4 GB, reported by @catid
+api : reduced ZSTD_DDict size by 2 KB
+api : minimum negative compression level is defined, and can be queried using ZSTD_minCLevel().
+build: support Haiku target, by @korli
+build: Read Legacy format is limited to v0.5+ by default. Can be changed at compile time with macro ZSTD_LEGACY_SUPPORT.
+doc : zstd_compression_format.md updated to match wording in IETF RFC 8478
+misc: tests/paramgrill, a parameter optimizer, by @GeorgeLu97
+
+v1.3.5  (Jun 29, 2018)
+perf: much faster dictionary compression, by @felixhandte
+perf: small quality improvement for dictionary generation, by @terrelln
+perf: slightly improved high compression levels (notably level 19)
+mem : automatic memory release for long duration contexts
+cli : fix : overlapLog can be manually set
+cli : fix : decoding invalid lz4 frames
+api : fix : performance degradation for dictionary compression when using advanced API, by @terrelln
+api : change : clarify ZSTD_CCtx_reset() vs ZSTD_CCtx_resetParameters(), by @terrelln
+build: select custom libzstd scope through control macros, by @GeorgeLu97
+build: OpenBSD patch, by @bket
+build: make and make all are compatible with -j
+doc : clarify zstd_compression_format.md, updated for IETF RFC process
+misc: pzstd compatible with reproducible compilation, by @lamby
+
+v1.3.4  (Mar 27, 2018)
+perf: faster speed (especially decoding speed) on recent cpus (haswell+)
+perf: much better performance associating --long with multi-threading, by @terrelln
+perf: better compression at levels 13-15
+cli : asynchronous compression by default, for faster experience (use --single-thread for former behavior)
+cli : smoother status report in multi-threading mode
+cli : added command --fast=#, for faster compression modes
+cli : fix crash when not overwriting existing files, by Pádraig Brady (@pixelb)
+api : `nbThreads` becomes `nbWorkers` : 1 triggers asynchronous mode
+api : compression levels can be negative, for even more speed
+api : ZSTD_getFrameProgression() : get precise progress status of ZSTDMT anytime
+api : ZSTDMT can accept new compression parameters during compression
+api : implemented all advanced dictionary decompression prototypes
+build: improved meson recipe, by Shawn Landden (@shawnl)
+build: VS2017 scripts, by @HaydnTrigg
+misc: all /contrib projects fixed
+misc: added /contrib/docker script by @gyscos
+
+v1.3.3  (Dec 21, 2017)
+perf: faster zstd_opt strategy (levels 16-19)
+fix : bug #944 : multithreading with shared ditionary and large data, reported by @gsliepen
+cli : fix : content size written in header by default
+cli : fix : improved LZ4 format support, by @felixhandte
+cli : new : hidden command `-S`, to benchmark multiple files while generating one result per file
+api : fix : support large skippable frames, by @terrelln
+api : fix : streaming interface was adding a useless 3-bytes null block to small frames
+api : change : when setting `pledgedSrcSize`, use `ZSTD_CONTENTSIZE_UNKNOWN` macro value to mean "unknown"
+build: fix : compilation under rhel6 and centos6, reported by @pixelb
+build: added `check` target
+
+v1.3.2  (Oct 10, 2017)
+new : long range mode, using --long command, by Stella Lau (@stellamplau)
+new : ability to generate and decode magicless frames (#591)
+changed : maximum nb of threads reduced to 200, to avoid address space exhaustion in 32-bits mode
+fix : multi-threading compression works with custom allocators
+fix : ZSTD_sizeof_CStream() was over-evaluating memory usage
+fix : a rare compression bug when compression generates very large distances and bunch of other conditions (only possible at --ultra -22)
+fix : 32-bits build can now decode large offsets (levels 21+)
+cli : added LZ4 frame support by default, by Felix Handte (@felixhandte)
+cli : improved --list output
+cli : new : can split input file for dictionary training, using command -B#
+cli : new : clean operation artefact on Ctrl-C interruption
+cli : fix : do not change /dev/null permissions when using command -t with root access, reported by @mike155 (#851)
+cli : fix : write file size in header in multiple-files mode
+api : added macro ZSTD_COMPRESSBOUND() for static allocation
+api : experimental : new advanced decompression API
+api : fix : sizeof_CCtx() used to over-estimate
+build: fix : no-multithread variant compiles without pool.c dependency, reported by Mitchell Blank Jr (@mitchblank) (#819)
+build: better compatibility with reproducible builds, by Bernhard M. Wiedemann (@bmwiedemann) (#818)
+example : added streaming_memory_usage
+license : changed /examples license to BSD + GPLv2
+license : fix a few header files to reflect new license (#825)
+
+v1.3.1  (Aug 21, 2017)
+New license : BSD + GPLv2
+perf: substantially decreased memory usage in Multi-threading mode, thanks to reports by Tino Reichardt (@mcmilk)
+perf: Multi-threading supports up to 256 threads. Cap at 256 when more are requested (#760)
+cli : improved and fixed --list command, by @ib (#772)
+cli : command -vV to list supported formats, by @ib (#771)
+build : fixed binary variants, reported by @svenha (#788)
+build : fix Visual compilation for non x86/x64 targets, reported by Greg Slazinski (@GregSlazinski) (#718)
+API exp : breaking change : ZSTD_getframeHeader() provides more information
+API exp : breaking change : pinned down values of error codes
+doc : fixed huffman example, by Ulrich Kunitz (@ulikunitz)
+new : contrib/adaptive-compression, I/O driven compression strength, by Paul Cruz (@paulcruz74)
+new : contrib/long_distance_matching, statistics by Stella Lau (@stellamplau)
+updated : contrib/linux-kernel, by Nick Terrell (@terrelln)
+
+v1.3.0  (Jul 6, 2017)
+cli : new : `--list` command, by Paul Cruz
+cli : changed : xz/lzma support enabled by default
+cli : changed : `-t *` continue processing list after a decompression error
+API : added : ZSTD_versionString()
+API : promoted to stable status : ZSTD_getFrameContentSize(), by Sean Purcell
+API exp : new advanced API : ZSTD_compress_generic(), ZSTD_CCtx_setParameter()
+API exp : new : API for static or external allocation : ZSTD_initStatic?Ctx()
+API exp : added : ZSTD_decompressBegin_usingDDict(), requested by Guy Riddle (#700)
+API exp : clarified memory estimation / measurement functions.
+API exp : changed : strongest strategy renamed ZSTD_btultra, fastest strategy ZSTD_fast set to 1
+tools : decodecorpus can generate random dictionary-compressed samples, by Paul Cruz
+new : contrib/seekable_format, demo and API, by Sean Purcell
+changed : contrib/linux-kernel, updated version and license, by Nick Terrell
+
+v1.2.0  (May 5, 2017)
+cli : changed : Multithreading enabled by default (use target zstd-nomt or HAVE_THREAD=0 to disable)
+cli : new : command -T0 means "detect and use nb of cores", by Sean Purcell
+cli : new : zstdmt symlink hardwired to `zstd -T0`
+cli : new : command --threads=# (#671)
+cli : changed : cover dictionary builder by default, for improved quality, by Nick Terrell
+cli : new : commands --train-cover and --train-legacy, to select dictionary algorithm and parameters
+cli : experimental targets `zstd4` and `xzstd4`, with support for lz4 format, by Sean Purcell
+cli : fix : does not output compressed data on console
+cli : fix : ignore symbolic links unless --force specified,
+API : breaking change : ZSTD_createCDict_advanced(), only use compressionParameters as argument
+API : added : prototypes ZSTD_*_usingCDict_advanced(), for direct control over frameParameters.
+API : improved: ZSTDMT_compressCCtx() reduced memory usage
+API : fix : ZSTDMT_compressCCtx() now provides srcSize in header (#634)
+API : fix : src size stored in frame header is controlled at end of frame
+API : fix : enforced consistent rules for pledgedSrcSize==0 (#641)
+API : fix : error code "GENERIC" replaced by "dstSizeTooSmall" when appropriate
+build: improved cmake script, by @Majlen
+build: enabled Multi-threading support for *BSD, by Baptiste Daroussin
+tools: updated Paramgrill. Command -O# provides best parameters for sample and speed target.
+new : contrib/linux-kernel version, by Nick Terrell
+
+v1.1.4  (Mar 18, 2017)
+cli : new : can compress in *.gz format, using --format=gzip command, by Przemyslaw Skibinski
+cli : new : advanced benchmark command --priority=rt
+cli : fix : write on sparse-enabled file systems in 32-bits mode, by @ds77
+cli : fix : --rm remains silent when input is stdin
+cli : experimental : xzstd, with support for xz/lzma decoding, by Przemyslaw Skibinski
+speed : improved decompression speed in streaming mode for single shot scenarios (+5%)
+memory: DDict (decompression dictionary) memory usage down from 150 KB to 20 KB
+arch: 32-bits variant able to generate and decode very long matches (>32 MB), by Sean Purcell
+API : new : ZSTD_findFrameCompressedSize(), ZSTD_getFrameContentSize(), ZSTD_findDecompressedSize()
+API : changed : dropped support of legacy versions <= v0.3 (can be changed by modifying ZSTD_LEGACY_SUPPORT value)
+build : new: meson build system in contrib/meson, by Dima Krasner
+build : improved cmake script, by @Majlen
+build : added -Wformat-security flag, as recommended by Padraig Brady
+doc : new : educational decoder, by Sean Purcell
+
+v1.1.3  (Feb 7, 2017)
+cli : zstd can decompress .gz files (can be disabled with `make zstd-nogz` or `make HAVE_ZLIB=0`)
+cli : new : experimental target `make zstdmt`, with multi-threading support
+cli : new : improved dictionary builder "cover" (experimental), by Nick Terrell, based on prior work by Giuseppe Ottaviano.
+cli : new : advanced commands for detailed parameters, by Przemyslaw Skibinski
+cli : fix zstdless on Mac OS-X, by Andrew Janke
+cli : fix #232 "compress non-files"
+dictBuilder : improved dictionary generation quality, thanks to Nick Terrell
+API : new : lib/compress/ZSTDMT_compress.h multithreading API (experimental)
+API : new : ZSTD_create?Dict_byReference(), requested by Bartosz Taudul
+API : new : ZDICT_finalizeDictionary()
+API : fix : ZSTD_initCStream_usingCDict() properly writes dictID into frame header, by Gregory Szorc (#511)
+API : fix : all symbols properly exposed in libzstd, by Nick Terrell
+build : support for Solaris target, by Przemyslaw Skibinski
+doc : clarified specification, by Sean Purcell
+
+v1.1.2  (Dec 15, 2016)
+API : streaming : decompression : changed : automatic implicit reset when chain-decoding new frames without init
+API : experimental : added : dictID retrieval functions, and ZSTD_initCStream_srcSize()
+API : zbuff : changed : prototypes now generate deprecation warnings
+lib : improved : faster decompression speed at ultra compression settings and 32-bits mode
+lib : changed : only public ZSTD_ symbols are now exposed
+lib : changed : reduced usage  of stack memory
+lib : fixed : several corner case bugs, by Nick Terrell
+cli : new : gzstd, experimental version able to decode .gz files, by Przemyslaw Skibinski
+cli : new : preserve file attributes
+cli : new : added zstdless and zstdgrep tools
+cli : fixed : status displays total amount decoded, even for file consisting of multiple frames (like pzstd)
+cli : fixed : zstdcat
+zlib_wrapper : added support for gz* functions, by Przemyslaw Skibinski
+install : better compatibility with FreeBSD, by Dimitry Andric
+source tree : changed : zbuff source files moved to lib/deprecated
+
+v1.1.1  (Nov 2, 2016)
+New : command -M#, --memory=, --memlimit=, --memlimit-decompress= to limit allowed memory consumption
+New : doc/zstd_manual.html, by Przemyslaw Skibinski
+Improved : slightly better compression ratio at --ultra levels (>= 20)
+Improved : better memory usage when using streaming compression API, thanks to @Rogier-5 report
+Added : API : ZSTD_initCStream_usingCDict(), ZSTD_initDStream_usingDDict() (experimental section)
+Added : example/multiple_streaming_compression.c
+Changed : zstd_errors.h is now installed within /include (and replaces errors_public.h)
+Updated man page
+Fixed : zstd-small, zstd-compress and zstd-decompress compilation targets
+
+v1.1.0  (Sep 28, 2016)
+New : contrib/pzstd, parallel version of zstd, by Nick Terrell
+added : NetBSD install target (#338)
+Improved : speed for batches of small files
+Improved : speed of zlib wrapper, by Przemyslaw Skibinski
+Changed : libzstd on Windows supports legacy formats, by Christophe Chevalier
+Fixed : CLI -d output to stdout by default when input is stdin (#322)
+Fixed : CLI correctly detects console on Mac OS-X
+Fixed : CLI supports recursive mode `-r` on Mac OS-X
+Fixed : Legacy decoders use unified error codes, reported by benrg (#341), fixed by Przemyslaw Skibinski
+Fixed : compatibility with OpenBSD, reported by Juan Francisco Cantero Hurtado (#319)
+Fixed : compatibility with Hurd, by Przemyslaw Skibinski (#365)
+Fixed : zstd-pgo, reported by octoploid (#329)
+
+v1.0.0  (Sep 1, 2016)
+Change Licensing, all project is now BSD, Copyright Facebook
+Small decompression speed improvement
+API : Streaming API supports legacy format
+API : ZDICT_getDictID(), ZSTD_sizeof_{CCtx, DCtx, CStream, DStream}(), ZSTD_setDStreamParameter()
+CLI supports legacy formats v0.4+
+Fixed : compression fails on certain huge files, reported by Jesse McGrew
+Enhanced documentation, by Przemyslaw Skibinski
+
+v0.8.1  (Aug 18, 2016)
+New streaming API
+Changed : --ultra now enables levels beyond 19
+Changed : -i# now selects benchmark time in second
+Fixed : ZSTD_compress* can now compress > 4 GB in a single pass, reported by Nick Terrell
+Fixed : speed regression on specific patterns (#272)
+Fixed : support for Z_SYNC_FLUSH, by Dmitry Krot (#291)
+Fixed : ICC compilation, by Przemyslaw Skibinski
+
+v0.8.0  (Aug 2, 2016)
+Improved : better speed on clang and gcc -O2, thanks to Eric Biggers
+New : Build on FreeBSD and DragonFly, thanks to JrMarino
+Changed : modified API : ZSTD_compressEnd()
+Fixed : legacy mode with ZSTD_HEAPMODE=0, by Christopher Bergqvist
+Fixed : premature end of frame when zero-sized raw block, reported by Eric Biggers
+Fixed : large dictionaries (> 384 KB), reported by Ilona Papava
+Fixed : checksum correctly checked in single-pass mode
+Fixed : combined --test amd --rm, reported by Andreas M. Nilsson
+Modified : minor compression level adaptations
+Updated : compression format specification to v0.2.0
+changed : zstd.h moved to /lib directory
+
+v0.7.5  (Aug 1, 2016)
+Transition version, supporting decoding of v0.8.x
+
+v0.7.4  (Jul 17, 2016)
+Added : homebrew for Mac, by Daniel Cade
+Added : more examples
+Fixed : segfault when using small dictionaries, reported by Felix Handte
+Modified : default compression level for CLI is now 3
+Updated : specification, to v0.1.1
+
+v0.7.3  (Jul 9, 2016)
+New : compression format specification
+New : `--` separator, stating that all following arguments are file names. Suggested by Chip Turner.
+New : `ZSTD_getDecompressedSize()`
+New : OpenBSD target, by Juan Francisco Cantero Hurtado
+New : `examples` directory
+fixed : dictBuilder using HC levels, reported by Bartosz Taudul
+fixed : legacy support from ZSTD_decompress_usingDDict(), reported by Felix Handte
+fixed : multi-blocks decoding with intermediate uncompressed blocks, reported by Greg Slazinski
+modified : removed "mem.h" and "error_public.h" dependencies from "zstd.h" (experimental section)
+modified : legacy functions no longer need magic number
+
+v0.7.2  (Jul 4, 2016)
+fixed : ZSTD_decompressBlock() using multiple consecutive blocks. Reported by Greg Slazinski.
+fixed : potential segfault on very large files (many gigabytes). Reported by Chip Turner.
+fixed : CLI displays system error message when destination file cannot be created (#231). Reported by Chip Turner.
+
+v0.7.1  (Jun 23, 2016)
+fixed : ZBUFF_compressEnd() called multiple times with too small `dst` buffer, reported by Christophe Chevalier
+fixed : dictBuilder fails if first sample is too small, reported by Ру�лан Ковалёв
+fixed : corruption issue, reported by cj
+modified : checksum enabled by default in command line mode
+
+v0.7.0  (Jun 17, 2016)
+New : Support for directory compression, using `-r`, thanks to Przemyslaw Skibinski
+New : Command `--rm`, to remove source file after successful de/compression
+New : Visual build scripts, by Christophe Chevalier
+New : Support for Sparse File-systems (do not use space for zero-filled sectors)
+New : Frame checksum support
+New : Support pass-through mode (when using `-df`)
+API : more efficient Dictionary API : `ZSTD_compress_usingCDict()`, `ZSTD_decompress_usingDDict()`
+API : create dictionary files from custom content, by Giuseppe Ottaviano
+API : support for custom malloc/free functions
+New : controllable Dictionary ID
+New : Support for skippable frames
+
+v0.6.1  (May 13, 2016)
+New : zlib wrapper API, thanks to Przemyslaw Skibinski
+New : Ability to compile compressor / decompressor separately
+Changed : new lib directory structure
+Fixed : Legacy codec v0.5 compatible with dictionary decompression
+Fixed : Decoder corruption error (#173)
+Fixed : null-string roundtrip (#176)
+New : benchmark mode can select directory as input
+Experimental : midipix support, VMS support
+
+v0.6.0  (Apr 13, 2016)
+Stronger high compression modes, thanks to Przemyslaw Skibinski
+API : ZSTD_getFrameParams() provides size of decompressed content
+New : highest compression modes require `--ultra` command to fully unleash their capacity
+Fixed : zstd cli return error code > 0 and removes dst file artifact when decompression fails, thanks to Chip Turner
+
+v0.5.1  (Feb 18, 2016)
+New : Optimal parsing => Very high compression modes, thanks to Przemyslaw Skibinski
+Changed : Dictionary builder integrated into libzstd and zstd cli
+Changed (!) : zstd cli now uses "multiple input files" as default mode. See `zstd -h`.
+Fix : high compression modes for big-endian platforms
+New : zstd cli : `-t` | `--test` command
+
+v0.5.0  (Feb 5, 2016)
+New : dictionary builder utility
+Changed : streaming & dictionary API
+Improved : better compression of small data
+
+v0.4.7  (Jan 22, 2016)
+Improved : small compression speed improvement in HC mode
+Changed : `zstd_decompress.c` has ZSTD_LEGACY_SUPPORT to 0 by default
+fix : bt search bug
+
+v0.4.6  (Jan 13, 2016)
+fix : fast compression mode on Windows
+New : cmake configuration file, thanks to Artyom Dymchenko
+Improved : high compression mode on repetitive data
+New : block-level API
+New : ZSTD_duplicateCCtx()
+
+v0.4.5  (Dec 18, 2015)
+new : -m/--multiple : compress/decompress multiple files
+
+v0.4.4  (Dec 14, 2015)
+Fixed : high compression modes for Windows 32 bits
+new : external dictionary API extended to buffered mode and accessible through command line
+new : windows DLL project, thanks to Christophe Chevalier
+
+v0.4.3  (Dec 7, 2015)
+new : external dictionary API
+new : zstd-frugal
+
+v0.4.2  (Dec 2, 2015)
+Generic minor improvements for small blocks
+Fixed : big-endian compatibility, by Peter Harris (#85)
+
+v0.4.1  (Dec 1, 2015)
+Fixed : ZSTD_LEGACY_SUPPORT=0 build mode (reported by Luben)
+removed `zstd.c`
+
+v0.4.0  (Nov 29, 2015)
+Command line utility compatible with high compression levels
+Removed zstdhc => merged into zstd
+Added : ZBUFF API (see zstd_buffered.h)
+Rolling buffer support
+
+v0.3.6  (Nov 10, 2015)
+small blocks params
+
+v0.3.5  (Nov 9, 2015)
+minor generic compression improvements
+
+v0.3.4  (Nov 6, 2015)
+Faster fast cLevels
+
+v0.3.3  (Nov 5, 2015)
+Small compression ratio improvement
+
+v0.3.2  (Nov 2, 2015)
+Fixed Visual Studio
+
+v0.3.1  (Nov 2, 2015)
+Small compression ratio improvement
+
+v0.3  (Oct 30, 2015)
+HC mode : compression levels 2-26
+
+v0.2.2  (Oct 28, 2015)
+Fix : Visual Studio 2013 & 2015 release compilation, by Christophe Chevalier
+
+v0.2.1  (Oct 24, 2015)
+Fix : Read errors, advanced fuzzer tests, by Hanno Böck
+
+v0.2.0  (Oct 22, 2015)
+**Breaking format change**
+Faster decompression speed
+Can still decode v0.1 format
+
+v0.1.3  (Oct 15, 2015)
+fix uninitialization warning, reported by Evan Nemerson
+
+v0.1.2  (Sep 11, 2015)
+frame concatenation support
+
+v0.1.1  (Aug 27, 2015)
+fix compression bug
+detects write-flush errors
+
+v0.1.0  (Aug 25, 2015)
+first release
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/CODE_OF_CONDUCT.md mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/CODE_OF_CONDUCT.md
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/CODE_OF_CONDUCT.md	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/CODE_OF_CONDUCT.md	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,5 @@
+# Code of Conduct
+
+Facebook has adopted a Code of Conduct that we expect project participants to adhere to.
+Please read the [full text](https://code.fb.com/codeofconduct/)
+so that you can understand what actions will and will not be tolerated.
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/COPYING mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/COPYING
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/COPYING	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/COPYING	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
\ No newline at end of file
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/BUCK mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/BUCK
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/BUCK	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/BUCK	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,232 @@
+cxx_library(
+    name='zstd',
+    header_namespace='',
+    exported_headers=['zstd.h'],
+    visibility=['PUBLIC'],
+    deps=[
+        ':common',
+        ':compress',
+        ':decompress',
+        ':deprecated',
+    ],
+)
+
+cxx_library(
+    name='compress',
+    header_namespace='',
+    visibility=['PUBLIC'],
+    exported_headers=subdir_glob([
+        ('compress', 'zstd*.h'),
+    ]),
+    srcs=glob(['compress/zstd*.c', 'compress/hist.c']),
+    deps=[':common'],
+)
+
+cxx_library(
+    name='decompress',
+    header_namespace='',
+    visibility=['PUBLIC'],
+    headers=subdir_glob([
+        ('decompress', '*_impl.h'),
+    ]),
+    srcs=glob(['decompress/zstd*.c']),
+    deps=[
+        ':common',
+        ':legacy',
+    ],
+)
+
+cxx_library(
+    name='deprecated',
+    header_namespace='',
+    visibility=['PUBLIC'],
+    exported_headers=subdir_glob([
+        ('deprecated', '*.h'),
+    ]),
+    srcs=glob(['deprecated/*.c']),
+    deps=[':common'],
+)
+
+cxx_library(
+    name='legacy',
+    header_namespace='',
+    visibility=['PUBLIC'],
+    exported_headers=subdir_glob([
+        ('legacy', '*.h'),
+    ]),
+    srcs=glob(['legacy/*.c']),
+    deps=[':common'],
+    exported_preprocessor_flags=[
+        '-DZSTD_LEGACY_SUPPORT=4',
+    ],
+)
+
+cxx_library(
+    name='zdict',
+    header_namespace='',
+    visibility=['PUBLIC'],
+    exported_headers=['zdict.h'],
+    headers=subdir_glob([
+        ('dictBuilder', 'divsufsort.h'),
+        ('dictBuilder', 'cover.h'),
+    ]),
+    srcs=glob(['dictBuilder/*.c']),
+    deps=[':common'],
+)
+
+cxx_library(
+    name='compiler',
+    header_namespace='',
+    visibility=['PUBLIC'],
+    exported_headers=subdir_glob([
+        ('common', 'compiler.h'),
+    ]),
+)
+
+cxx_library(
+    name='cpu',
+    header_namespace='',
+    visibility=['PUBLIC'],
+    exported_headers=subdir_glob([
+        ('common', 'cpu.h'),
+    ]),
+)
+
+cxx_library(
+    name='bitstream',
+    header_namespace='',
+    visibility=['PUBLIC'],
+    exported_headers=subdir_glob([
+        ('common', 'bitstream.h'),
+    ]),
+)
+
+cxx_library(
+    name='entropy',
+    header_namespace='',
+    visibility=['PUBLIC'],
+    exported_headers=subdir_glob([
+        ('common', 'fse.h'),
+        ('common', 'huf.h'),
+    ]),
+    srcs=[
+        'common/entropy_common.c',
+        'common/fse_decompress.c',
+        'compress/fse_compress.c',
+        'compress/huf_compress.c',
+        'decompress/huf_decompress.c',
+    ],
+    deps=[
+        ':debug',
+        ':bitstream',
+        ':compiler',
+        ':errors',
+        ':mem',
+    ],
+)
+
+cxx_library(
+    name='errors',
+    header_namespace='',
+    visibility=['PUBLIC'],
+    exported_headers=[
+        'zstd_errors.h',
+        'common/error_private.h',
+    ]
+    srcs=['common/error_private.c'],
+)
+
+cxx_library(
+    name='mem',
+    header_namespace='',
+    visibility=['PUBLIC'],
+    exported_headers=subdir_glob([
+        ('common', 'mem.h'),
+    ]),
+)
+
+cxx_library(
+    name='pool',
+    header_namespace='',
+    visibility=['PUBLIC'],
+    exported_headers=subdir_glob([
+        ('common', 'pool.h'),
+    ]),
+    srcs=['common/pool.c'],
+    deps=[
+        ':threading',
+        ':zstd_common',
+    ],
+)
+
+cxx_library(
+    name='threading',
+    header_namespace='',
+    visibility=['PUBLIC'],
+    exported_headers=subdir_glob([
+        ('common', 'threading.h'),
+    ]),
+    srcs=['common/threading.c'],
+    exported_preprocessor_flags=[
+        '-DZSTD_MULTITHREAD',
+    ],
+    exported_linker_flags=[
+        '-pthread',
+    ],
+)
+
+cxx_library(
+    name='xxhash',
+    header_namespace='',
+    visibility=['PUBLIC'],
+    exported_headers=subdir_glob([
+        ('common', 'xxhash.h'),
+    ]),
+    srcs=['common/xxhash.c'],
+    exported_preprocessor_flags=[
+        '-DXXH_NAMESPACE=ZSTD_',
+    ],
+)
+
+cxx_library(
+    name='zstd_common',
+    header_namespace='',
+    visibility=['PUBLIC'],
+    exported_headers=subdir_glob([
+        ('', 'zstd.h'),
+        ('common', 'zstd_internal.h'),
+    ]),
+    srcs=['common/zstd_common.c'],
+    deps=[
+        ':compiler',
+        ':errors',
+        ':mem',
+    ],
+)
+
+cxx_library(
+    name='debug',
+    header_namespace='',
+    visibility=['PUBLIC'],
+    exported_headers=subdir_glob([
+        ('common', 'debug.h'),
+    ]),
+    srcs=['common/debug.c'],
+)
+
+cxx_library(
+    name='common',
+    deps=[
+        ':debug',
+        ':bitstream',
+        ':compiler',
+        ':cpu',
+        ':entropy',
+        ':errors',
+        ':mem',
+        ':pool',
+        ':threading',
+        ':xxhash',
+        ':zstd_common',
+    ]
+)
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/bitstream.h mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/bitstream.h
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/bitstream.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/bitstream.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,463 @@
+/* ******************************************************************
+ * bitstream
+ * Part of FSE library
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ *
+ * You can contact the author at :
+ * - Source repository : https://github.com/Cyan4973/FiniteStateEntropy
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+****************************************************************** */
+#ifndef BITSTREAM_H_MODULE
+#define BITSTREAM_H_MODULE
+
+#if defined (__cplusplus)
+extern "C" {
+#endif
+/*
+*  This API consists of small unitary functions, which must be inlined for best performance.
+*  Since link-time-optimization is not available for all compilers,
+*  these functions are defined into a .h to be included.
+*/
+
+/*-****************************************
+*  Dependencies
+******************************************/
+#include "mem.h"            /* unaligned access routines */
+#include "compiler.h"       /* UNLIKELY() */
+#include "debug.h"          /* assert(), DEBUGLOG(), RAWLOG() */
+#include "error_private.h"  /* error codes and messages */
+
+
+/*=========================================
+*  Target specific
+=========================================*/
+#ifndef ZSTD_NO_INTRINSICS
+#  if defined(__BMI__) && defined(__GNUC__)
+#    include <immintrin.h>   /* support for bextr (experimental) */
+#  elif defined(__ICCARM__)
+#    include <intrinsics.h>
+#  endif
+#endif
+
+#define STREAM_ACCUMULATOR_MIN_32  25
+#define STREAM_ACCUMULATOR_MIN_64  57
+#define STREAM_ACCUMULATOR_MIN    ((U32)(MEM_32bits() ? STREAM_ACCUMULATOR_MIN_32 : STREAM_ACCUMULATOR_MIN_64))
+
+
+/*-******************************************
+*  bitStream encoding API (write forward)
+********************************************/
+/* bitStream can mix input from multiple sources.
+ * A critical property of these streams is that they encode and decode in **reverse** direction.
+ * So the first bit sequence you add will be the last to be read, like a LIFO stack.
+ */
+typedef struct {
+    size_t bitContainer;
+    unsigned bitPos;
+    char*  startPtr;
+    char*  ptr;
+    char*  endPtr;
+} BIT_CStream_t;
+
+MEM_STATIC size_t BIT_initCStream(BIT_CStream_t* bitC, void* dstBuffer, size_t dstCapacity);
+MEM_STATIC void   BIT_addBits(BIT_CStream_t* bitC, size_t value, unsigned nbBits);
+MEM_STATIC void   BIT_flushBits(BIT_CStream_t* bitC);
+MEM_STATIC size_t BIT_closeCStream(BIT_CStream_t* bitC);
+
+/* Start with initCStream, providing the size of buffer to write into.
+*  bitStream will never write outside of this buffer.
+*  `dstCapacity` must be >= sizeof(bitD->bitContainer), otherwise @return will be an error code.
+*
+*  bits are first added to a local register.
+*  Local register is size_t, hence 64-bits on 64-bits systems, or 32-bits on 32-bits systems.
+*  Writing data into memory is an explicit operation, performed by the flushBits function.
+*  Hence keep track how many bits are potentially stored into local register to avoid register overflow.
+*  After a flushBits, a maximum of 7 bits might still be stored into local register.
+*
+*  Avoid storing elements of more than 24 bits if you want compatibility with 32-bits bitstream readers.
+*
+*  Last operation is to close the bitStream.
+*  The function returns the final size of CStream in bytes.
+*  If data couldn't fit into `dstBuffer`, it will return a 0 ( == not storable)
+*/
+
+
+/*-********************************************
+*  bitStream decoding API (read backward)
+**********************************************/
+typedef struct {
+    size_t   bitContainer;
+    unsigned bitsConsumed;
+    const char* ptr;
+    const char* start;
+    const char* limitPtr;
+} BIT_DStream_t;
+
+typedef enum { BIT_DStream_unfinished = 0,
+               BIT_DStream_endOfBuffer = 1,
+               BIT_DStream_completed = 2,
+               BIT_DStream_overflow = 3 } BIT_DStream_status;  /* result of BIT_reloadDStream() */
+               /* 1,2,4,8 would be better for bitmap combinations, but slows down performance a bit ... :( */
+
+MEM_STATIC size_t   BIT_initDStream(BIT_DStream_t* bitD, const void* srcBuffer, size_t srcSize);
+MEM_STATIC size_t   BIT_readBits(BIT_DStream_t* bitD, unsigned nbBits);
+MEM_STATIC BIT_DStream_status BIT_reloadDStream(BIT_DStream_t* bitD);
+MEM_STATIC unsigned BIT_endOfDStream(const BIT_DStream_t* bitD);
+
+
+/* Start by invoking BIT_initDStream().
+*  A chunk of the bitStream is then stored into a local register.
+*  Local register size is 64-bits on 64-bits systems, 32-bits on 32-bits systems (size_t).
+*  You can then retrieve bitFields stored into the local register, **in reverse order**.
+*  Local register is explicitly reloaded from memory by the BIT_reloadDStream() method.
+*  A reload guarantee a minimum of ((8*sizeof(bitD->bitContainer))-7) bits when its result is BIT_DStream_unfinished.
+*  Otherwise, it can be less than that, so proceed accordingly.
+*  Checking if DStream has reached its end can be performed with BIT_endOfDStream().
+*/
+
+
+/*-****************************************
+*  unsafe API
+******************************************/
+MEM_STATIC void BIT_addBitsFast(BIT_CStream_t* bitC, size_t value, unsigned nbBits);
+/* faster, but works only if value is "clean", meaning all high bits above nbBits are 0 */
+
+MEM_STATIC void BIT_flushBitsFast(BIT_CStream_t* bitC);
+/* unsafe version; does not check buffer overflow */
+
+MEM_STATIC size_t BIT_readBitsFast(BIT_DStream_t* bitD, unsigned nbBits);
+/* faster, but works only if nbBits >= 1 */
+
+
+
+/*-**************************************************************
+*  Internal functions
+****************************************************************/
+MEM_STATIC unsigned BIT_highbit32 (U32 val)
+{
+    assert(val != 0);
+    {
+#   if defined(_MSC_VER)   /* Visual */
+#       if STATIC_BMI2 == 1
+		return _lzcnt_u32(val) ^ 31;
+#       else
+		unsigned long r = 0;
+		return _BitScanReverse(&r, val) ? (unsigned)r : 0;
+#       endif
+#   elif defined(__GNUC__) && (__GNUC__ >= 3)   /* Use GCC Intrinsic */
+        return __builtin_clz (val) ^ 31;
+#   elif defined(__ICCARM__)    /* IAR Intrinsic */
+        return 31 - __CLZ(val);
+#   else   /* Software version */
+        static const unsigned DeBruijnClz[32] = { 0,  9,  1, 10, 13, 21,  2, 29,
+                                                 11, 14, 16, 18, 22, 25,  3, 30,
+                                                  8, 12, 20, 28, 15, 17, 24,  7,
+                                                 19, 27, 23,  6, 26,  5,  4, 31 };
+        U32 v = val;
+        v |= v >> 1;
+        v |= v >> 2;
+        v |= v >> 4;
+        v |= v >> 8;
+        v |= v >> 16;
+        return DeBruijnClz[ (U32) (v * 0x07C4ACDDU) >> 27];
+#   endif
+    }
+}
+
+/*=====    Local Constants   =====*/
+static const unsigned BIT_mask[] = {
+    0,          1,         3,         7,         0xF,       0x1F,
+    0x3F,       0x7F,      0xFF,      0x1FF,     0x3FF,     0x7FF,
+    0xFFF,      0x1FFF,    0x3FFF,    0x7FFF,    0xFFFF,    0x1FFFF,
+    0x3FFFF,    0x7FFFF,   0xFFFFF,   0x1FFFFF,  0x3FFFFF,  0x7FFFFF,
+    0xFFFFFF,   0x1FFFFFF, 0x3FFFFFF, 0x7FFFFFF, 0xFFFFFFF, 0x1FFFFFFF,
+    0x3FFFFFFF, 0x7FFFFFFF}; /* up to 31 bits */
+#define BIT_MASK_SIZE (sizeof(BIT_mask) / sizeof(BIT_mask[0]))
+
+/*-**************************************************************
+*  bitStream encoding
+****************************************************************/
+/*! BIT_initCStream() :
+ *  `dstCapacity` must be > sizeof(size_t)
+ *  @return : 0 if success,
+ *            otherwise an error code (can be tested using ERR_isError()) */
+MEM_STATIC size_t BIT_initCStream(BIT_CStream_t* bitC,
+                                  void* startPtr, size_t dstCapacity)
+{
+    bitC->bitContainer = 0;
+    bitC->bitPos = 0;
+    bitC->startPtr = (char*)startPtr;
+    bitC->ptr = bitC->startPtr;
+    bitC->endPtr = bitC->startPtr + dstCapacity - sizeof(bitC->bitContainer);
+    if (dstCapacity <= sizeof(bitC->bitContainer)) return ERROR(dstSize_tooSmall);
+    return 0;
+}
+
+/*! BIT_addBits() :
+ *  can add up to 31 bits into `bitC`.
+ *  Note : does not check for register overflow ! */
+MEM_STATIC void BIT_addBits(BIT_CStream_t* bitC,
+                            size_t value, unsigned nbBits)
+{
+    DEBUG_STATIC_ASSERT(BIT_MASK_SIZE == 32);
+    assert(nbBits < BIT_MASK_SIZE);
+    assert(nbBits + bitC->bitPos < sizeof(bitC->bitContainer) * 8);
+    bitC->bitContainer |= (value & BIT_mask[nbBits]) << bitC->bitPos;
+    bitC->bitPos += nbBits;
+}
+
+/*! BIT_addBitsFast() :
+ *  works only if `value` is _clean_,
+ *  meaning all high bits above nbBits are 0 */
+MEM_STATIC void BIT_addBitsFast(BIT_CStream_t* bitC,
+                                size_t value, unsigned nbBits)
+{
+    assert((value>>nbBits) == 0);
+    assert(nbBits + bitC->bitPos < sizeof(bitC->bitContainer) * 8);
+    bitC->bitContainer |= value << bitC->bitPos;
+    bitC->bitPos += nbBits;
+}
+
+/*! BIT_flushBitsFast() :
+ *  assumption : bitContainer has not overflowed
+ *  unsafe version; does not check buffer overflow */
+MEM_STATIC void BIT_flushBitsFast(BIT_CStream_t* bitC)
+{
+    size_t const nbBytes = bitC->bitPos >> 3;
+    assert(bitC->bitPos < sizeof(bitC->bitContainer) * 8);
+    assert(bitC->ptr <= bitC->endPtr);
+    MEM_writeLEST(bitC->ptr, bitC->bitContainer);
+    bitC->ptr += nbBytes;
+    bitC->bitPos &= 7;
+    bitC->bitContainer >>= nbBytes*8;
+}
+
+/*! BIT_flushBits() :
+ *  assumption : bitContainer has not overflowed
+ *  safe version; check for buffer overflow, and prevents it.
+ *  note : does not signal buffer overflow.
+ *  overflow will be revealed later on using BIT_closeCStream() */
+MEM_STATIC void BIT_flushBits(BIT_CStream_t* bitC)
+{
+    size_t const nbBytes = bitC->bitPos >> 3;
+    assert(bitC->bitPos < sizeof(bitC->bitContainer) * 8);
+    assert(bitC->ptr <= bitC->endPtr);
+    MEM_writeLEST(bitC->ptr, bitC->bitContainer);
+    bitC->ptr += nbBytes;
+    if (bitC->ptr > bitC->endPtr) bitC->ptr = bitC->endPtr;
+    bitC->bitPos &= 7;
+    bitC->bitContainer >>= nbBytes*8;
+}
+
+/*! BIT_closeCStream() :
+ *  @return : size of CStream, in bytes,
+ *            or 0 if it could not fit into dstBuffer */
+MEM_STATIC size_t BIT_closeCStream(BIT_CStream_t* bitC)
+{
+    BIT_addBitsFast(bitC, 1, 1);   /* endMark */
+    BIT_flushBits(bitC);
+    if (bitC->ptr >= bitC->endPtr) return 0; /* overflow detected */
+    return (bitC->ptr - bitC->startPtr) + (bitC->bitPos > 0);
+}
+
+
+/*-********************************************************
+*  bitStream decoding
+**********************************************************/
+/*! BIT_initDStream() :
+ *  Initialize a BIT_DStream_t.
+ * `bitD` : a pointer to an already allocated BIT_DStream_t structure.
+ * `srcSize` must be the *exact* size of the bitStream, in bytes.
+ * @return : size of stream (== srcSize), or an errorCode if a problem is detected
+ */
+MEM_STATIC size_t BIT_initDStream(BIT_DStream_t* bitD, const void* srcBuffer, size_t srcSize)
+{
+    if (srcSize < 1) { ZSTD_memset(bitD, 0, sizeof(*bitD)); return ERROR(srcSize_wrong); }
+
+    bitD->start = (const char*)srcBuffer;
+    bitD->limitPtr = bitD->start + sizeof(bitD->bitContainer);
+
+    if (srcSize >=  sizeof(bitD->bitContainer)) {  /* normal case */
+        bitD->ptr   = (const char*)srcBuffer + srcSize - sizeof(bitD->bitContainer);
+        bitD->bitContainer = MEM_readLEST(bitD->ptr);
+        { BYTE const lastByte = ((const BYTE*)srcBuffer)[srcSize-1];
+          bitD->bitsConsumed = lastByte ? 8 - BIT_highbit32(lastByte) : 0;  /* ensures bitsConsumed is always set */
+          if (lastByte == 0) return ERROR(GENERIC); /* endMark not present */ }
+    } else {
+        bitD->ptr   = bitD->start;
+        bitD->bitContainer = *(const BYTE*)(bitD->start);
+        switch(srcSize)
+        {
+        case 7: bitD->bitContainer += (size_t)(((const BYTE*)(srcBuffer))[6]) << (sizeof(bitD->bitContainer)*8 - 16);
+                /* fall-through */
+
+        case 6: bitD->bitContainer += (size_t)(((const BYTE*)(srcBuffer))[5]) << (sizeof(bitD->bitContainer)*8 - 24);
+                /* fall-through */
+
+        case 5: bitD->bitContainer += (size_t)(((const BYTE*)(srcBuffer))[4]) << (sizeof(bitD->bitContainer)*8 - 32);
+                /* fall-through */
+
+        case 4: bitD->bitContainer += (size_t)(((const BYTE*)(srcBuffer))[3]) << 24;
+                /* fall-through */
+
+        case 3: bitD->bitContainer += (size_t)(((const BYTE*)(srcBuffer))[2]) << 16;
+                /* fall-through */
+
+        case 2: bitD->bitContainer += (size_t)(((const BYTE*)(srcBuffer))[1]) <<  8;
+                /* fall-through */
+
+        default: break;
+        }
+        {   BYTE const lastByte = ((const BYTE*)srcBuffer)[srcSize-1];
+            bitD->bitsConsumed = lastByte ? 8 - BIT_highbit32(lastByte) : 0;
+            if (lastByte == 0) return ERROR(corruption_detected);  /* endMark not present */
+        }
+        bitD->bitsConsumed += (U32)(sizeof(bitD->bitContainer) - srcSize)*8;
+    }
+
+    return srcSize;
+}
+
+MEM_STATIC FORCE_INLINE_ATTR size_t BIT_getUpperBits(size_t bitContainer, U32 const start)
+{
+    return bitContainer >> start;
+}
+
+MEM_STATIC FORCE_INLINE_ATTR size_t BIT_getMiddleBits(size_t bitContainer, U32 const start, U32 const nbBits)
+{
+    U32 const regMask = sizeof(bitContainer)*8 - 1;
+    /* if start > regMask, bitstream is corrupted, and result is undefined */
+    assert(nbBits < BIT_MASK_SIZE);
+    return (bitContainer >> (start & regMask)) & BIT_mask[nbBits];
+}
+
+MEM_STATIC FORCE_INLINE_ATTR size_t BIT_getLowerBits(size_t bitContainer, U32 const nbBits)
+{
+#if defined(STATIC_BMI2) && STATIC_BMI2 == 1
+	return  _bzhi_u64(bitContainer, nbBits);
+#else
+    assert(nbBits < BIT_MASK_SIZE);
+    return bitContainer & BIT_mask[nbBits];
+#endif
+}
+
+/*! BIT_lookBits() :
+ *  Provides next n bits from local register.
+ *  local register is not modified.
+ *  On 32-bits, maxNbBits==24.
+ *  On 64-bits, maxNbBits==56.
+ * @return : value extracted */
+MEM_STATIC  FORCE_INLINE_ATTR size_t BIT_lookBits(const BIT_DStream_t*  bitD, U32 nbBits)
+{
+    /* arbitrate between double-shift and shift+mask */
+#if 1
+    /* if bitD->bitsConsumed + nbBits > sizeof(bitD->bitContainer)*8,
+     * bitstream is likely corrupted, and result is undefined */
+    return BIT_getMiddleBits(bitD->bitContainer, (sizeof(bitD->bitContainer)*8) - bitD->bitsConsumed - nbBits, nbBits);
+#else
+    /* this code path is slower on my os-x laptop */
+    U32 const regMask = sizeof(bitD->bitContainer)*8 - 1;
+    return ((bitD->bitContainer << (bitD->bitsConsumed & regMask)) >> 1) >> ((regMask-nbBits) & regMask);
+#endif
+}
+
+/*! BIT_lookBitsFast() :
+ *  unsafe version; only works if nbBits >= 1 */
+MEM_STATIC size_t BIT_lookBitsFast(const BIT_DStream_t* bitD, U32 nbBits)
+{
+    U32 const regMask = sizeof(bitD->bitContainer)*8 - 1;
+    assert(nbBits >= 1);
+    return (bitD->bitContainer << (bitD->bitsConsumed & regMask)) >> (((regMask+1)-nbBits) & regMask);
+}
+
+MEM_STATIC FORCE_INLINE_ATTR void BIT_skipBits(BIT_DStream_t* bitD, U32 nbBits)
+{
+    bitD->bitsConsumed += nbBits;
+}
+
+/*! BIT_readBits() :
+ *  Read (consume) next n bits from local register and update.
+ *  Pay attention to not read more than nbBits contained into local register.
+ * @return : extracted value. */
+MEM_STATIC FORCE_INLINE_ATTR size_t BIT_readBits(BIT_DStream_t* bitD, unsigned nbBits)
+{
+    size_t const value = BIT_lookBits(bitD, nbBits);
+    BIT_skipBits(bitD, nbBits);
+    return value;
+}
+
+/*! BIT_readBitsFast() :
+ *  unsafe version; only works only if nbBits >= 1 */
+MEM_STATIC size_t BIT_readBitsFast(BIT_DStream_t* bitD, unsigned nbBits)
+{
+    size_t const value = BIT_lookBitsFast(bitD, nbBits);
+    assert(nbBits >= 1);
+    BIT_skipBits(bitD, nbBits);
+    return value;
+}
+
+/*! BIT_reloadDStreamFast() :
+ *  Similar to BIT_reloadDStream(), but with two differences:
+ *  1. bitsConsumed <= sizeof(bitD->bitContainer)*8 must hold!
+ *  2. Returns BIT_DStream_overflow when bitD->ptr < bitD->limitPtr, at this
+ *     point you must use BIT_reloadDStream() to reload.
+ */
+MEM_STATIC BIT_DStream_status BIT_reloadDStreamFast(BIT_DStream_t* bitD)
+{
+    if (UNLIKELY(bitD->ptr < bitD->limitPtr))
+        return BIT_DStream_overflow;
+    assert(bitD->bitsConsumed <= sizeof(bitD->bitContainer)*8);
+    bitD->ptr -= bitD->bitsConsumed >> 3;
+    bitD->bitsConsumed &= 7;
+    bitD->bitContainer = MEM_readLEST(bitD->ptr);
+    return BIT_DStream_unfinished;
+}
+
+/*! BIT_reloadDStream() :
+ *  Refill `bitD` from buffer previously set in BIT_initDStream() .
+ *  This function is safe, it guarantees it will not read beyond src buffer.
+ * @return : status of `BIT_DStream_t` internal register.
+ *           when status == BIT_DStream_unfinished, internal register is filled with at least 25 or 57 bits */
+MEM_STATIC BIT_DStream_status BIT_reloadDStream(BIT_DStream_t* bitD)
+{
+    if (bitD->bitsConsumed > (sizeof(bitD->bitContainer)*8))  /* overflow detected, like end of stream */
+        return BIT_DStream_overflow;
+
+    if (bitD->ptr >= bitD->limitPtr) {
+        return BIT_reloadDStreamFast(bitD);
+    }
+    if (bitD->ptr == bitD->start) {
+        if (bitD->bitsConsumed < sizeof(bitD->bitContainer)*8) return BIT_DStream_endOfBuffer;
+        return BIT_DStream_completed;
+    }
+    /* start < ptr < limitPtr */
+    {   U32 nbBytes = bitD->bitsConsumed >> 3;
+        BIT_DStream_status result = BIT_DStream_unfinished;
+        if (bitD->ptr - nbBytes < bitD->start) {
+            nbBytes = (U32)(bitD->ptr - bitD->start);  /* ptr > start */
+            result = BIT_DStream_endOfBuffer;
+        }
+        bitD->ptr -= nbBytes;
+        bitD->bitsConsumed -= nbBytes*8;
+        bitD->bitContainer = MEM_readLEST(bitD->ptr);   /* reminder : srcSize > sizeof(bitD->bitContainer), otherwise bitD->ptr == bitD->start */
+        return result;
+    }
+}
+
+/*! BIT_endOfDStream() :
+ * @return : 1 if DStream has _exactly_ reached its end (all bits consumed).
+ */
+MEM_STATIC unsigned BIT_endOfDStream(const BIT_DStream_t* DStream)
+{
+    return ((DStream->ptr == DStream->start) && (DStream->bitsConsumed == sizeof(DStream->bitContainer)*8));
+}
+
+#if defined (__cplusplus)
+}
+#endif
+
+#endif /* BITSTREAM_H_MODULE */
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/compiler.h mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/compiler.h
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/compiler.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/compiler.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,289 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+#ifndef ZSTD_COMPILER_H
+#define ZSTD_COMPILER_H
+
+/*-*******************************************************
+*  Compiler specifics
+*********************************************************/
+/* force inlining */
+
+#if !defined(ZSTD_NO_INLINE)
+#if (defined(__GNUC__) && !defined(__STRICT_ANSI__)) || defined(__cplusplus) || defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L   /* C99 */
+#  define INLINE_KEYWORD inline
+#else
+#  define INLINE_KEYWORD
+#endif
+
+#if defined(__GNUC__) || defined(__ICCARM__)
+#  define FORCE_INLINE_ATTR __attribute__((always_inline))
+#elif defined(_MSC_VER)
+#  define FORCE_INLINE_ATTR __forceinline
+#else
+#  define FORCE_INLINE_ATTR
+#endif
+
+#else
+
+#define INLINE_KEYWORD
+#define FORCE_INLINE_ATTR
+
+#endif
+
+/**
+  On MSVC qsort requires that functions passed into it use the __cdecl calling conversion(CC).
+  This explictly marks such functions as __cdecl so that the code will still compile
+  if a CC other than __cdecl has been made the default.
+*/
+#if  defined(_MSC_VER)
+#  define WIN_CDECL __cdecl
+#else
+#  define WIN_CDECL
+#endif
+
+/**
+ * FORCE_INLINE_TEMPLATE is used to define C "templates", which take constant
+ * parameters. They must be inlined for the compiler to eliminate the constant
+ * branches.
+ */
+#define FORCE_INLINE_TEMPLATE static INLINE_KEYWORD FORCE_INLINE_ATTR
+/**
+ * HINT_INLINE is used to help the compiler generate better code. It is *not*
+ * used for "templates", so it can be tweaked based on the compilers
+ * performance.
+ *
+ * gcc-4.8 and gcc-4.9 have been shown to benefit from leaving off the
+ * always_inline attribute.
+ *
+ * clang up to 5.0.0 (trunk) benefit tremendously from the always_inline
+ * attribute.
+ */
+#if !defined(__clang__) && defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 8 && __GNUC__ < 5
+#  define HINT_INLINE static INLINE_KEYWORD
+#else
+#  define HINT_INLINE static INLINE_KEYWORD FORCE_INLINE_ATTR
+#endif
+
+/* UNUSED_ATTR tells the compiler it is okay if the function is unused. */
+#if defined(__GNUC__)
+#  define UNUSED_ATTR __attribute__((unused))
+#else
+#  define UNUSED_ATTR
+#endif
+
+/* force no inlining */
+#ifdef _MSC_VER
+#  define FORCE_NOINLINE static __declspec(noinline)
+#else
+#  if defined(__GNUC__) || defined(__ICCARM__)
+#    define FORCE_NOINLINE static __attribute__((__noinline__))
+#  else
+#    define FORCE_NOINLINE static
+#  endif
+#endif
+
+
+/* target attribute */
+#ifndef __has_attribute
+  #define __has_attribute(x) 0  /* Compatibility with non-clang compilers. */
+#endif
+#if defined(__GNUC__) || defined(__ICCARM__)
+#  define TARGET_ATTRIBUTE(target) __attribute__((__target__(target)))
+#else
+#  define TARGET_ATTRIBUTE(target)
+#endif
+
+/* Enable runtime BMI2 dispatch based on the CPU.
+ * Enabled for clang & gcc >=4.8 on x86 when BMI2 isn't enabled by default.
+ */
+#ifndef DYNAMIC_BMI2
+  #if ((defined(__clang__) && __has_attribute(__target__)) \
+      || (defined(__GNUC__) \
+          && (__GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)))) \
+      && (defined(__x86_64__) || defined(_M_X86)) \
+      && !defined(__BMI2__)
+  #  define DYNAMIC_BMI2 1
+  #else
+  #  define DYNAMIC_BMI2 0
+  #endif
+#endif
+
+/* prefetch
+ * can be disabled, by declaring NO_PREFETCH build macro */
+#if defined(NO_PREFETCH)
+#  define PREFETCH_L1(ptr)  (void)(ptr)  /* disabled */
+#  define PREFETCH_L2(ptr)  (void)(ptr)  /* disabled */
+#else
+#  if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_I86))  /* _mm_prefetch() is not defined outside of x86/x64 */
+#    include <mmintrin.h>   /* https://msdn.microsoft.com/fr-fr/library/84szxsww(v=vs.90).aspx */
+#    define PREFETCH_L1(ptr)  _mm_prefetch((const char*)(ptr), _MM_HINT_T0)
+#    define PREFETCH_L2(ptr)  _mm_prefetch((const char*)(ptr), _MM_HINT_T1)
+#  elif defined(__GNUC__) && ( (__GNUC__ >= 4) || ( (__GNUC__ == 3) && (__GNUC_MINOR__ >= 1) ) )
+#    define PREFETCH_L1(ptr)  __builtin_prefetch((ptr), 0 /* rw==read */, 3 /* locality */)
+#    define PREFETCH_L2(ptr)  __builtin_prefetch((ptr), 0 /* rw==read */, 2 /* locality */)
+#  elif defined(__aarch64__)
+#    define PREFETCH_L1(ptr)  __asm__ __volatile__("prfm pldl1keep, %0" ::"Q"(*(ptr)))
+#    define PREFETCH_L2(ptr)  __asm__ __volatile__("prfm pldl2keep, %0" ::"Q"(*(ptr)))
+#  else
+#    define PREFETCH_L1(ptr) (void)(ptr)  /* disabled */
+#    define PREFETCH_L2(ptr) (void)(ptr)  /* disabled */
+#  endif
+#endif  /* NO_PREFETCH */
+
+#define CACHELINE_SIZE 64
+
+#define PREFETCH_AREA(p, s)  {            \
+    const char* const _ptr = (const char*)(p);  \
+    size_t const _size = (size_t)(s);     \
+    size_t _pos;                          \
+    for (_pos=0; _pos<_size; _pos+=CACHELINE_SIZE) {  \
+        PREFETCH_L2(_ptr + _pos);         \
+    }                                     \
+}
+
+/* vectorization
+ * older GCC (pre gcc-4.3 picked as the cutoff) uses a different syntax */
+#if !defined(__INTEL_COMPILER) && !defined(__clang__) && defined(__GNUC__)
+#  if (__GNUC__ == 4 && __GNUC_MINOR__ > 3) || (__GNUC__ >= 5)
+#    define DONT_VECTORIZE __attribute__((optimize("no-tree-vectorize")))
+#  else
+#    define DONT_VECTORIZE _Pragma("GCC optimize(\"no-tree-vectorize\")")
+#  endif
+#else
+#  define DONT_VECTORIZE
+#endif
+
+/* Tell the compiler that a branch is likely or unlikely.
+ * Only use these macros if it causes the compiler to generate better code.
+ * If you can remove a LIKELY/UNLIKELY annotation without speed changes in gcc
+ * and clang, please do.
+ */
+#if defined(__GNUC__)
+#define LIKELY(x) (__builtin_expect((x), 1))
+#define UNLIKELY(x) (__builtin_expect((x), 0))
+#else
+#define LIKELY(x) (x)
+#define UNLIKELY(x) (x)
+#endif
+
+/* disable warnings */
+#ifdef _MSC_VER    /* Visual Studio */
+#  include <intrin.h>                    /* For Visual 2005 */
+#  pragma warning(disable : 4100)        /* disable: C4100: unreferenced formal parameter */
+#  pragma warning(disable : 4127)        /* disable: C4127: conditional expression is constant */
+#  pragma warning(disable : 4204)        /* disable: C4204: non-constant aggregate initializer */
+#  pragma warning(disable : 4214)        /* disable: C4214: non-int bitfields */
+#  pragma warning(disable : 4324)        /* disable: C4324: padded structure */
+#endif
+
+/*Like DYNAMIC_BMI2 but for compile time determination of BMI2 support*/
+#ifndef STATIC_BMI2
+#  if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_I86))
+#    ifdef __AVX2__  //MSVC does not have a BMI2 specific flag, but every CPU that supports AVX2 also supports BMI2
+#       define STATIC_BMI2 1
+#    endif
+#  endif
+#endif
+
+#ifndef STATIC_BMI2
+    #define STATIC_BMI2 0
+#endif
+
+/* compat. with non-clang compilers */
+#ifndef __has_builtin
+#  define __has_builtin(x) 0
+#endif
+
+/* compat. with non-clang compilers */
+#ifndef __has_feature
+#  define __has_feature(x) 0
+#endif
+
+/* detects whether we are being compiled under msan */
+#ifndef ZSTD_MEMORY_SANITIZER
+#  if __has_feature(memory_sanitizer)
+#    define ZSTD_MEMORY_SANITIZER 1
+#  else
+#    define ZSTD_MEMORY_SANITIZER 0
+#  endif
+#endif
+
+#if ZSTD_MEMORY_SANITIZER
+/* Not all platforms that support msan provide sanitizers/msan_interface.h.
+ * We therefore declare the functions we need ourselves, rather than trying to
+ * include the header file... */
+#include <stddef.h>  /* size_t */
+#define ZSTD_DEPS_NEED_STDINT
+#include "zstd_deps.h"  /* intptr_t */
+
+/* Make memory region fully initialized (without changing its contents). */
+void __msan_unpoison(const volatile void *a, size_t size);
+
+/* Make memory region fully uninitialized (without changing its contents).
+   This is a legacy interface that does not update origin information. Use
+   __msan_allocated_memory() instead. */
+void __msan_poison(const volatile void *a, size_t size);
+
+/* Returns the offset of the first (at least partially) poisoned byte in the
+   memory range, or -1 if the whole range is good. */
+intptr_t __msan_test_shadow(const volatile void *x, size_t size);
+#endif
+
+/* detects whether we are being compiled under asan */
+#ifndef ZSTD_ADDRESS_SANITIZER
+#  if __has_feature(address_sanitizer)
+#    define ZSTD_ADDRESS_SANITIZER 1
+#  elif defined(__SANITIZE_ADDRESS__)
+#    define ZSTD_ADDRESS_SANITIZER 1
+#  else
+#    define ZSTD_ADDRESS_SANITIZER 0
+#  endif
+#endif
+
+#if ZSTD_ADDRESS_SANITIZER
+/* Not all platforms that support asan provide sanitizers/asan_interface.h.
+ * We therefore declare the functions we need ourselves, rather than trying to
+ * include the header file... */
+#include <stddef.h>  /* size_t */
+
+/**
+ * Marks a memory region (<c>[addr, addr+size)</c>) as unaddressable.
+ *
+ * This memory must be previously allocated by your program. Instrumented
+ * code is forbidden from accessing addresses in this region until it is
+ * unpoisoned. This function is not guaranteed to poison the entire region -
+ * it could poison only a subregion of <c>[addr, addr+size)</c> due to ASan
+ * alignment restrictions.
+ *
+ * \note This function is not thread-safe because no two threads can poison or
+ * unpoison memory in the same memory region simultaneously.
+ *
+ * \param addr Start of memory region.
+ * \param size Size of memory region. */
+void __asan_poison_memory_region(void const volatile *addr, size_t size);
+
+/**
+ * Marks a memory region (<c>[addr, addr+size)</c>) as addressable.
+ *
+ * This memory must be previously allocated by your program. Accessing
+ * addresses in this region is allowed until this region is poisoned again.
+ * This function could unpoison a super-region of <c>[addr, addr+size)</c> due
+ * to ASan alignment restrictions.
+ *
+ * \note This function is not thread-safe because no two threads can
+ * poison or unpoison memory in the same memory region simultaneously.
+ *
+ * \param addr Start of memory region.
+ * \param size Size of memory region. */
+void __asan_unpoison_memory_region(void const volatile *addr, size_t size);
+#endif
+
+#endif /* ZSTD_COMPILER_H */
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/cpu.h mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/cpu.h
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/cpu.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/cpu.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,213 @@
+/*
+ * Copyright (c) Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+#ifndef ZSTD_COMMON_CPU_H
+#define ZSTD_COMMON_CPU_H
+
+/**
+ * Implementation taken from folly/CpuId.h
+ * https://github.com/facebook/folly/blob/master/folly/CpuId.h
+ */
+
+#include "mem.h"
+
+#ifdef _MSC_VER
+#include <intrin.h>
+#endif
+
+typedef struct {
+    U32 f1c;
+    U32 f1d;
+    U32 f7b;
+    U32 f7c;
+} ZSTD_cpuid_t;
+
+MEM_STATIC ZSTD_cpuid_t ZSTD_cpuid(void) {
+    U32 f1c = 0;
+    U32 f1d = 0;
+    U32 f7b = 0;
+    U32 f7c = 0;
+#if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_IX86))
+    int reg[4];
+    __cpuid((int*)reg, 0);
+    {
+        int const n = reg[0];
+        if (n >= 1) {
+            __cpuid((int*)reg, 1);
+            f1c = (U32)reg[2];
+            f1d = (U32)reg[3];
+        }
+        if (n >= 7) {
+            __cpuidex((int*)reg, 7, 0);
+            f7b = (U32)reg[1];
+            f7c = (U32)reg[2];
+        }
+    }
+#elif defined(__i386__) && defined(__PIC__) && !defined(__clang__) && defined(__GNUC__)
+    /* The following block like the normal cpuid branch below, but gcc
+     * reserves ebx for use of its pic register so we must specially
+     * handle the save and restore to avoid clobbering the register
+     */
+    U32 n;
+    __asm__(
+        "pushl %%ebx\n\t"
+        "cpuid\n\t"
+        "popl %%ebx\n\t"
+        : "=a"(n)
+        : "a"(0)
+        : "ecx", "edx");
+    if (n >= 1) {
+      U32 f1a;
+      __asm__(
+          "pushl %%ebx\n\t"
+          "cpuid\n\t"
+          "popl %%ebx\n\t"
+          : "=a"(f1a), "=c"(f1c), "=d"(f1d)
+          : "a"(1));
+    }
+    if (n >= 7) {
+      __asm__(
+          "pushl %%ebx\n\t"
+          "cpuid\n\t"
+          "movl %%ebx, %%eax\n\t"
+          "popl %%ebx"
+          : "=a"(f7b), "=c"(f7c)
+          : "a"(7), "c"(0)
+          : "edx");
+    }
+#elif defined(__x86_64__) || defined(_M_X64) || defined(__i386__)
+    U32 n;
+    __asm__("cpuid" : "=a"(n) : "a"(0) : "ebx", "ecx", "edx");
+    if (n >= 1) {
+      U32 f1a;
+      __asm__("cpuid" : "=a"(f1a), "=c"(f1c), "=d"(f1d) : "a"(1) : "ebx");
+    }
+    if (n >= 7) {
+      U32 f7a;
+      __asm__("cpuid"
+              : "=a"(f7a), "=b"(f7b), "=c"(f7c)
+              : "a"(7), "c"(0)
+              : "edx");
+    }
+#endif
+    {
+        ZSTD_cpuid_t cpuid;
+        cpuid.f1c = f1c;
+        cpuid.f1d = f1d;
+        cpuid.f7b = f7b;
+        cpuid.f7c = f7c;
+        return cpuid;
+    }
+}
+
+#define X(name, r, bit)                                                        \
+  MEM_STATIC int ZSTD_cpuid_##name(ZSTD_cpuid_t const cpuid) {                 \
+    return ((cpuid.r) & (1U << bit)) != 0;                                     \
+  }
+
+/* cpuid(1): Processor Info and Feature Bits. */
+#define C(name, bit) X(name, f1c, bit)
+  C(sse3, 0)
+  C(pclmuldq, 1)
+  C(dtes64, 2)
+  C(monitor, 3)
+  C(dscpl, 4)
+  C(vmx, 5)
+  C(smx, 6)
+  C(eist, 7)
+  C(tm2, 8)
+  C(ssse3, 9)
+  C(cnxtid, 10)
+  C(fma, 12)
+  C(cx16, 13)
+  C(xtpr, 14)
+  C(pdcm, 15)
+  C(pcid, 17)
+  C(dca, 18)
+  C(sse41, 19)
+  C(sse42, 20)
+  C(x2apic, 21)
+  C(movbe, 22)
+  C(popcnt, 23)
+  C(tscdeadline, 24)
+  C(aes, 25)
+  C(xsave, 26)
+  C(osxsave, 27)
+  C(avx, 28)
+  C(f16c, 29)
+  C(rdrand, 30)
+#undef C
+#define D(name, bit) X(name, f1d, bit)
+  D(fpu, 0)
+  D(vme, 1)
+  D(de, 2)
+  D(pse, 3)
+  D(tsc, 4)
+  D(msr, 5)
+  D(pae, 6)
+  D(mce, 7)
+  D(cx8, 8)
+  D(apic, 9)
+  D(sep, 11)
+  D(mtrr, 12)
+  D(pge, 13)
+  D(mca, 14)
+  D(cmov, 15)
+  D(pat, 16)
+  D(pse36, 17)
+  D(psn, 18)
+  D(clfsh, 19)
+  D(ds, 21)
+  D(acpi, 22)
+  D(mmx, 23)
+  D(fxsr, 24)
+  D(sse, 25)
+  D(sse2, 26)
+  D(ss, 27)
+  D(htt, 28)
+  D(tm, 29)
+  D(pbe, 31)
+#undef D
+
+/* cpuid(7): Extended Features. */
+#define B(name, bit) X(name, f7b, bit)
+  B(bmi1, 3)
+  B(hle, 4)
+  B(avx2, 5)
+  B(smep, 7)
+  B(bmi2, 8)
+  B(erms, 9)
+  B(invpcid, 10)
+  B(rtm, 11)
+  B(mpx, 14)
+  B(avx512f, 16)
+  B(avx512dq, 17)
+  B(rdseed, 18)
+  B(adx, 19)
+  B(smap, 20)
+  B(avx512ifma, 21)
+  B(pcommit, 22)
+  B(clflushopt, 23)
+  B(clwb, 24)
+  B(avx512pf, 26)
+  B(avx512er, 27)
+  B(avx512cd, 28)
+  B(sha, 29)
+  B(avx512bw, 30)
+  B(avx512vl, 31)
+#undef B
+#define C(name, bit) X(name, f7c, bit)
+  C(prefetchwt1, 0)
+  C(avx512vbmi, 1)
+#undef C
+
+#undef X
+
+#endif /* ZSTD_COMMON_CPU_H */
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/debug.c mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/debug.c
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/debug.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/debug.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,24 @@
+/* ******************************************************************
+ * debug
+ * Part of FSE library
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ *
+ * You can contact the author at :
+ * - Source repository : https://github.com/Cyan4973/FiniteStateEntropy
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+****************************************************************** */
+
+
+/*
+ * This module only hosts one global variable
+ * which can be used to dynamically influence the verbosity of traces,
+ * such as DEBUGLOG and RAWLOG
+ */
+
+#include "debug.h"
+
+int g_debuglevel = DEBUGLEVEL;
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/debug.h mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/debug.h
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/debug.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/debug.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,107 @@
+/* ******************************************************************
+ * debug
+ * Part of FSE library
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ *
+ * You can contact the author at :
+ * - Source repository : https://github.com/Cyan4973/FiniteStateEntropy
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+****************************************************************** */
+
+
+/*
+ * The purpose of this header is to enable debug functions.
+ * They regroup assert(), DEBUGLOG() and RAWLOG() for run-time,
+ * and DEBUG_STATIC_ASSERT() for compile-time.
+ *
+ * By default, DEBUGLEVEL==0, which means run-time debug is disabled.
+ *
+ * Level 1 enables assert() only.
+ * Starting level 2, traces can be generated and pushed to stderr.
+ * The higher the level, the more verbose the traces.
+ *
+ * It's possible to dynamically adjust level using variable g_debug_level,
+ * which is only declared if DEBUGLEVEL>=2,
+ * and is a global variable, not multi-thread protected (use with care)
+ */
+
+#ifndef DEBUG_H_12987983217
+#define DEBUG_H_12987983217
+
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
+
+/* static assert is triggered at compile time, leaving no runtime artefact.
+ * static assert only works with compile-time constants.
+ * Also, this variant can only be used inside a function. */
+#define DEBUG_STATIC_ASSERT(c) (void)sizeof(char[(c) ? 1 : -1])
+
+
+/* DEBUGLEVEL is expected to be defined externally,
+ * typically through compiler command line.
+ * Value must be a number. */
+#ifndef DEBUGLEVEL
+#  define DEBUGLEVEL 0
+#endif
+
+
+/* recommended values for DEBUGLEVEL :
+ * 0 : release mode, no debug, all run-time checks disabled
+ * 1 : enables assert() only, no display
+ * 2 : reserved, for currently active debug path
+ * 3 : events once per object lifetime (CCtx, CDict, etc.)
+ * 4 : events once per frame
+ * 5 : events once per block
+ * 6 : events once per sequence (verbose)
+ * 7+: events at every position (*very* verbose)
+ *
+ * It's generally inconvenient to output traces > 5.
+ * In which case, it's possible to selectively trigger high verbosity levels
+ * by modifying g_debug_level.
+ */
+
+#if (DEBUGLEVEL>=1)
+#  define ZSTD_DEPS_NEED_ASSERT
+#  include "zstd_deps.h"
+#else
+#  ifndef assert   /* assert may be already defined, due to prior #include <assert.h> */
+#    define assert(condition) ((void)0)   /* disable assert (default) */
+#  endif
+#endif
+
+#if (DEBUGLEVEL>=2)
+#  define ZSTD_DEPS_NEED_IO
+#  include "zstd_deps.h"
+extern int g_debuglevel; /* the variable is only declared,
+                            it actually lives in debug.c,
+                            and is shared by the whole process.
+                            It's not thread-safe.
+                            It's useful when enabling very verbose levels
+                            on selective conditions (such as position in src) */
+
+#  define RAWLOG(l, ...) {                                       \
+                if (l<=g_debuglevel) {                           \
+                    ZSTD_DEBUG_PRINT(__VA_ARGS__);               \
+            }   }
+#  define DEBUGLOG(l, ...) {                                     \
+                if (l<=g_debuglevel) {                           \
+                    ZSTD_DEBUG_PRINT(__FILE__ ": " __VA_ARGS__); \
+                    ZSTD_DEBUG_PRINT(" \n");                     \
+            }   }
+#else
+#  define RAWLOG(l, ...)      {}    /* disabled */
+#  define DEBUGLOG(l, ...)    {}    /* disabled */
+#endif
+
+
+#if defined (__cplusplus)
+}
+#endif
+
+#endif /* DEBUG_H_12987983217 */
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/entropy_common.c mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/entropy_common.c
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/entropy_common.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/entropy_common.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,362 @@
+/* ******************************************************************
+ * Common functions of New Generation Entropy library
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ *
+ *  You can contact the author at :
+ *  - FSE+HUF source repository : https://github.com/Cyan4973/FiniteStateEntropy
+ *  - Public forum : https://groups.google.com/forum/#!forum/lz4c
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+****************************************************************** */
+
+/* *************************************
+*  Dependencies
+***************************************/
+#include "mem.h"
+#include "error_private.h"       /* ERR_*, ERROR */
+#define FSE_STATIC_LINKING_ONLY  /* FSE_MIN_TABLELOG */
+#include "fse.h"
+#define HUF_STATIC_LINKING_ONLY  /* HUF_TABLELOG_ABSOLUTEMAX */
+#include "huf.h"
+
+
+/*===   Version   ===*/
+unsigned FSE_versionNumber(void) { return FSE_VERSION_NUMBER; }
+
+
+/*===   Error Management   ===*/
+unsigned FSE_isError(size_t code) { return ERR_isError(code); }
+const char* FSE_getErrorName(size_t code) { return ERR_getErrorName(code); }
+
+unsigned HUF_isError(size_t code) { return ERR_isError(code); }
+const char* HUF_getErrorName(size_t code) { return ERR_getErrorName(code); }
+
+
+/*-**************************************************************
+*  FSE NCount encoding-decoding
+****************************************************************/
+static U32 FSE_ctz(U32 val)
+{
+    assert(val != 0);
+    {
+#   if defined(_MSC_VER)   /* Visual */
+        unsigned long r=0;
+        return _BitScanForward(&r, val) ? (unsigned)r : 0;
+#   elif defined(__GNUC__) && (__GNUC__ >= 3)   /* GCC Intrinsic */
+        return __builtin_ctz(val);
+#   elif defined(__ICCARM__)    /* IAR Intrinsic */
+        return __CTZ(val);
+#   else   /* Software version */
+        U32 count = 0;
+        while ((val & 1) == 0) {
+            val >>= 1;
+            ++count;
+        }
+        return count;
+#   endif
+    }
+}
+
+FORCE_INLINE_TEMPLATE
+size_t FSE_readNCount_body(short* normalizedCounter, unsigned* maxSVPtr, unsigned* tableLogPtr,
+                           const void* headerBuffer, size_t hbSize)
+{
+    const BYTE* const istart = (const BYTE*) headerBuffer;
+    const BYTE* const iend = istart + hbSize;
+    const BYTE* ip = istart;
+    int nbBits;
+    int remaining;
+    int threshold;
+    U32 bitStream;
+    int bitCount;
+    unsigned charnum = 0;
+    unsigned const maxSV1 = *maxSVPtr + 1;
+    int previous0 = 0;
+
+    if (hbSize < 8) {
+        /* This function only works when hbSize >= 8 */
+        char buffer[8] = {0};
+        ZSTD_memcpy(buffer, headerBuffer, hbSize);
+        {   size_t const countSize = FSE_readNCount(normalizedCounter, maxSVPtr, tableLogPtr,
+                                                    buffer, sizeof(buffer));
+            if (FSE_isError(countSize)) return countSize;
+            if (countSize > hbSize) return ERROR(corruption_detected);
+            return countSize;
+    }   }
+    assert(hbSize >= 8);
+
+    /* init */
+    ZSTD_memset(normalizedCounter, 0, (*maxSVPtr+1) * sizeof(normalizedCounter[0]));   /* all symbols not present in NCount have a frequency of 0 */
+    bitStream = MEM_readLE32(ip);
+    nbBits = (bitStream & 0xF) + FSE_MIN_TABLELOG;   /* extract tableLog */
+    if (nbBits > FSE_TABLELOG_ABSOLUTE_MAX) return ERROR(tableLog_tooLarge);
+    bitStream >>= 4;
+    bitCount = 4;
+    *tableLogPtr = nbBits;
+    remaining = (1<<nbBits)+1;
+    threshold = 1<<nbBits;
+    nbBits++;
+
+    for (;;) {
+        if (previous0) {
+            /* Count the number of repeats. Each time the
+             * 2-bit repeat code is 0b11 there is another
+             * repeat.
+             * Avoid UB by setting the high bit to 1.
+             */
+            int repeats = FSE_ctz(~bitStream | 0x80000000) >> 1;
+            while (repeats >= 12) {
+                charnum += 3 * 12;
+                if (LIKELY(ip <= iend-7)) {
+                    ip += 3;
+                } else {
+                    bitCount -= (int)(8 * (iend - 7 - ip));
+                    bitCount &= 31;
+                    ip = iend - 4;
+                }
+                bitStream = MEM_readLE32(ip) >> bitCount;
+                repeats = FSE_ctz(~bitStream | 0x80000000) >> 1;
+            }
+            charnum += 3 * repeats;
+            bitStream >>= 2 * repeats;
+            bitCount += 2 * repeats;
+
+            /* Add the final repeat which isn't 0b11. */
+            assert((bitStream & 3) < 3);
+            charnum += bitStream & 3;
+            bitCount += 2;
+
+            /* This is an error, but break and return an error
+             * at the end, because returning out of a loop makes
+             * it harder for the compiler to optimize.
+             */
+            if (charnum >= maxSV1) break;
+
+            /* We don't need to set the normalized count to 0
+             * because we already memset the whole buffer to 0.
+             */
+
+            if (LIKELY(ip <= iend-7) || (ip + (bitCount>>3) <= iend-4)) {
+                assert((bitCount >> 3) <= 3); /* For first condition to work */
+                ip += bitCount>>3;
+                bitCount &= 7;
+            } else {
+                bitCount -= (int)(8 * (iend - 4 - ip));
+                bitCount &= 31;
+                ip = iend - 4;
+            }
+            bitStream = MEM_readLE32(ip) >> bitCount;
+        }
+        {
+            int const max = (2*threshold-1) - remaining;
+            int count;
+
+            if ((bitStream & (threshold-1)) < (U32)max) {
+                count = bitStream & (threshold-1);
+                bitCount += nbBits-1;
+            } else {
+                count = bitStream & (2*threshold-1);
+                if (count >= threshold) count -= max;
+                bitCount += nbBits;
+            }
+
+            count--;   /* extra accuracy */
+            /* When it matters (small blocks), this is a
+             * predictable branch, because we don't use -1.
+             */
+            if (count >= 0) {
+                remaining -= count;
+            } else {
+                assert(count == -1);
+                remaining += count;
+            }
+            normalizedCounter[charnum++] = (short)count;
+            previous0 = !count;
+
+            assert(threshold > 1);
+            if (remaining < threshold) {
+                /* This branch can be folded into the
+                 * threshold update condition because we
+                 * know that threshold > 1.
+                 */
+                if (remaining <= 1) break;
+                nbBits = BIT_highbit32(remaining) + 1;
+                threshold = 1 << (nbBits - 1);
+            }
+            if (charnum >= maxSV1) break;
+
+            if (LIKELY(ip <= iend-7) || (ip + (bitCount>>3) <= iend-4)) {
+                ip += bitCount>>3;
+                bitCount &= 7;
+            } else {
+                bitCount -= (int)(8 * (iend - 4 - ip));
+                bitCount &= 31;
+                ip = iend - 4;
+            }
+            bitStream = MEM_readLE32(ip) >> bitCount;
+    }   }
+    if (remaining != 1) return ERROR(corruption_detected);
+    /* Only possible when there are too many zeros. */
+    if (charnum > maxSV1) return ERROR(maxSymbolValue_tooSmall);
+    if (bitCount > 32) return ERROR(corruption_detected);
+    *maxSVPtr = charnum-1;
+
+    ip += (bitCount+7)>>3;
+    return ip-istart;
+}
+
+/* Avoids the FORCE_INLINE of the _body() function. */
+static size_t FSE_readNCount_body_default(
+        short* normalizedCounter, unsigned* maxSVPtr, unsigned* tableLogPtr,
+        const void* headerBuffer, size_t hbSize)
+{
+    return FSE_readNCount_body(normalizedCounter, maxSVPtr, tableLogPtr, headerBuffer, hbSize);
+}
+
+#if DYNAMIC_BMI2
+TARGET_ATTRIBUTE("bmi2") static size_t FSE_readNCount_body_bmi2(
+        short* normalizedCounter, unsigned* maxSVPtr, unsigned* tableLogPtr,
+        const void* headerBuffer, size_t hbSize)
+{
+    return FSE_readNCount_body(normalizedCounter, maxSVPtr, tableLogPtr, headerBuffer, hbSize);
+}
+#endif
+
+size_t FSE_readNCount_bmi2(
+        short* normalizedCounter, unsigned* maxSVPtr, unsigned* tableLogPtr,
+        const void* headerBuffer, size_t hbSize, int bmi2)
+{
+#if DYNAMIC_BMI2
+    if (bmi2) {
+        return FSE_readNCount_body_bmi2(normalizedCounter, maxSVPtr, tableLogPtr, headerBuffer, hbSize);
+    }
+#endif
+    (void)bmi2;
+    return FSE_readNCount_body_default(normalizedCounter, maxSVPtr, tableLogPtr, headerBuffer, hbSize);
+}
+
+size_t FSE_readNCount(
+        short* normalizedCounter, unsigned* maxSVPtr, unsigned* tableLogPtr,
+        const void* headerBuffer, size_t hbSize)
+{
+    return FSE_readNCount_bmi2(normalizedCounter, maxSVPtr, tableLogPtr, headerBuffer, hbSize, /* bmi2 */ 0);
+}
+
+
+/*! HUF_readStats() :
+    Read compact Huffman tree, saved by HUF_writeCTable().
+    `huffWeight` is destination buffer.
+    `rankStats` is assumed to be a table of at least HUF_TABLELOG_MAX U32.
+    @return : size read from `src` , or an error Code .
+    Note : Needed by HUF_readCTable() and HUF_readDTableX?() .
+*/
+size_t HUF_readStats(BYTE* huffWeight, size_t hwSize, U32* rankStats,
+                     U32* nbSymbolsPtr, U32* tableLogPtr,
+                     const void* src, size_t srcSize)
+{
+    U32 wksp[HUF_READ_STATS_WORKSPACE_SIZE_U32];
+    return HUF_readStats_wksp(huffWeight, hwSize, rankStats, nbSymbolsPtr, tableLogPtr, src, srcSize, wksp, sizeof(wksp), /* bmi2 */ 0);
+}
+
+FORCE_INLINE_TEMPLATE size_t
+HUF_readStats_body(BYTE* huffWeight, size_t hwSize, U32* rankStats,
+                   U32* nbSymbolsPtr, U32* tableLogPtr,
+                   const void* src, size_t srcSize,
+                   void* workSpace, size_t wkspSize,
+                   int bmi2)
+{
+    U32 weightTotal;
+    const BYTE* ip = (const BYTE*) src;
+    size_t iSize;
+    size_t oSize;
+
+    if (!srcSize) return ERROR(srcSize_wrong);
+    iSize = ip[0];
+    /* ZSTD_memset(huffWeight, 0, hwSize);   *//* is not necessary, even though some analyzer complain ... */
+
+    if (iSize >= 128) {  /* special header */
+        oSize = iSize - 127;
+        iSize = ((oSize+1)/2);
+        if (iSize+1 > srcSize) return ERROR(srcSize_wrong);
+        if (oSize >= hwSize) return ERROR(corruption_detected);
+        ip += 1;
+        {   U32 n;
+            for (n=0; n<oSize; n+=2) {
+                huffWeight[n]   = ip[n/2] >> 4;
+                huffWeight[n+1] = ip[n/2] & 15;
+    }   }   }
+    else  {   /* header compressed with FSE (normal case) */
+        if (iSize+1 > srcSize) return ERROR(srcSize_wrong);
+        /* max (hwSize-1) values decoded, as last one is implied */
+        oSize = FSE_decompress_wksp_bmi2(huffWeight, hwSize-1, ip+1, iSize, 6, workSpace, wkspSize, bmi2);
+        if (FSE_isError(oSize)) return oSize;
+    }
+
+    /* collect weight stats */
+    ZSTD_memset(rankStats, 0, (HUF_TABLELOG_MAX + 1) * sizeof(U32));
+    weightTotal = 0;
+    {   U32 n; for (n=0; n<oSize; n++) {
+            if (huffWeight[n] >= HUF_TABLELOG_MAX) return ERROR(corruption_detected);
+            rankStats[huffWeight[n]]++;
+            weightTotal += (1 << huffWeight[n]) >> 1;
+    }   }
+    if (weightTotal == 0) return ERROR(corruption_detected);
+
+    /* get last non-null symbol weight (implied, total must be 2^n) */
+    {   U32 const tableLog = BIT_highbit32(weightTotal) + 1;
+        if (tableLog > HUF_TABLELOG_MAX) return ERROR(corruption_detected);
+        *tableLogPtr = tableLog;
+        /* determine last weight */
+        {   U32 const total = 1 << tableLog;
+            U32 const rest = total - weightTotal;
+            U32 const verif = 1 << BIT_highbit32(rest);
+            U32 const lastWeight = BIT_highbit32(rest) + 1;
+            if (verif != rest) return ERROR(corruption_detected);    /* last value must be a clean power of 2 */
+            huffWeight[oSize] = (BYTE)lastWeight;
+            rankStats[lastWeight]++;
+    }   }
+
+    /* check tree construction validity */
+    if ((rankStats[1] < 2) || (rankStats[1] & 1)) return ERROR(corruption_detected);   /* by construction : at least 2 elts of rank 1, must be even */
+
+    /* results */
+    *nbSymbolsPtr = (U32)(oSize+1);
+    return iSize+1;
+}
+
+/* Avoids the FORCE_INLINE of the _body() function. */
+static size_t HUF_readStats_body_default(BYTE* huffWeight, size_t hwSize, U32* rankStats,
+                     U32* nbSymbolsPtr, U32* tableLogPtr,
+                     const void* src, size_t srcSize,
+                     void* workSpace, size_t wkspSize)
+{
+    return HUF_readStats_body(huffWeight, hwSize, rankStats, nbSymbolsPtr, tableLogPtr, src, srcSize, workSpace, wkspSize, 0);
+}
+
+#if DYNAMIC_BMI2
+static TARGET_ATTRIBUTE("bmi2") size_t HUF_readStats_body_bmi2(BYTE* huffWeight, size_t hwSize, U32* rankStats,
+                     U32* nbSymbolsPtr, U32* tableLogPtr,
+                     const void* src, size_t srcSize,
+                     void* workSpace, size_t wkspSize)
+{
+    return HUF_readStats_body(huffWeight, hwSize, rankStats, nbSymbolsPtr, tableLogPtr, src, srcSize, workSpace, wkspSize, 1);
+}
+#endif
+
+size_t HUF_readStats_wksp(BYTE* huffWeight, size_t hwSize, U32* rankStats,
+                     U32* nbSymbolsPtr, U32* tableLogPtr,
+                     const void* src, size_t srcSize,
+                     void* workSpace, size_t wkspSize,
+                     int bmi2)
+{
+#if DYNAMIC_BMI2
+    if (bmi2) {
+        return HUF_readStats_body_bmi2(huffWeight, hwSize, rankStats, nbSymbolsPtr, tableLogPtr, src, srcSize, workSpace, wkspSize);
+    }
+#endif
+    (void)bmi2;
+    return HUF_readStats_body_default(huffWeight, hwSize, rankStats, nbSymbolsPtr, tableLogPtr, src, srcSize, workSpace, wkspSize);
+}
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/error_private.c mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/error_private.c
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/error_private.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/error_private.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+/* The purpose of this file is to have a single list of error strings embedded in binary */
+
+#include "error_private.h"
+
+const char* ERR_getErrorString(ERR_enum code)
+{
+#ifdef ZSTD_STRIP_ERROR_STRINGS
+    (void)code;
+    return "Error strings stripped";
+#else
+    static const char* const notErrorCode = "Unspecified error code";
+    switch( code )
+    {
+    case PREFIX(no_error): return "No error detected";
+    case PREFIX(GENERIC):  return "Error (generic)";
+    case PREFIX(prefix_unknown): return "Unknown frame descriptor";
+    case PREFIX(version_unsupported): return "Version not supported";
+    case PREFIX(frameParameter_unsupported): return "Unsupported frame parameter";
+    case PREFIX(frameParameter_windowTooLarge): return "Frame requires too much memory for decoding";
+    case PREFIX(corruption_detected): return "Corrupted block detected";
+    case PREFIX(checksum_wrong): return "Restored data doesn't match checksum";
+    case PREFIX(parameter_unsupported): return "Unsupported parameter";
+    case PREFIX(parameter_outOfBound): return "Parameter is out of bound";
+    case PREFIX(init_missing): return "Context should be init first";
+    case PREFIX(memory_allocation): return "Allocation error : not enough memory";
+    case PREFIX(workSpace_tooSmall): return "workSpace buffer is not large enough";
+    case PREFIX(stage_wrong): return "Operation not authorized at current processing stage";
+    case PREFIX(tableLog_tooLarge): return "tableLog requires too much memory : unsupported";
+    case PREFIX(maxSymbolValue_tooLarge): return "Unsupported max Symbol Value : too large";
+    case PREFIX(maxSymbolValue_tooSmall): return "Specified maxSymbolValue is too small";
+    case PREFIX(dictionary_corrupted): return "Dictionary is corrupted";
+    case PREFIX(dictionary_wrong): return "Dictionary mismatch";
+    case PREFIX(dictionaryCreation_failed): return "Cannot create Dictionary from provided samples";
+    case PREFIX(dstSize_tooSmall): return "Destination buffer is too small";
+    case PREFIX(srcSize_wrong): return "Src size is incorrect";
+    case PREFIX(dstBuffer_null): return "Operation on NULL destination buffer";
+        /* following error codes are not stable and may be removed or changed in a future version */
+    case PREFIX(frameIndex_tooLarge): return "Frame index is too large";
+    case PREFIX(seekableIO): return "An I/O error occurred when reading/seeking";
+    case PREFIX(dstBuffer_wrong): return "Destination buffer is wrong";
+    case PREFIX(srcBuffer_wrong): return "Source buffer is wrong";
+    case PREFIX(maxCode):
+    default: return notErrorCode;
+    }
+#endif
+}
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/error_private.h mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/error_private.h
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/error_private.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/error_private.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+/* Note : this module is expected to remain private, do not expose it */
+
+#ifndef ERROR_H_MODULE
+#define ERROR_H_MODULE
+
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
+
+/* ****************************************
+*  Dependencies
+******************************************/
+#include "../zstd_errors.h"  /* enum list */
+#include "zstd_deps.h"       /* size_t */
+
+
+/* ****************************************
+*  Compiler-specific
+******************************************/
+#if defined(__GNUC__)
+#  define ERR_STATIC static __attribute__((unused))
+#elif defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */)
+#  define ERR_STATIC static inline
+#elif defined(_MSC_VER)
+#  define ERR_STATIC static __inline
+#else
+#  define ERR_STATIC static  /* this version may generate warnings for unused static functions; disable the relevant warning */
+#endif
+
+
+/*-****************************************
+*  Customization (error_public.h)
+******************************************/
+typedef ZSTD_ErrorCode ERR_enum;
+#define PREFIX(name) ZSTD_error_##name
+
+
+/*-****************************************
+*  Error codes handling
+******************************************/
+#undef ERROR   /* already defined on Visual Studio */
+#define ERROR(name) ZSTD_ERROR(name)
+#define ZSTD_ERROR(name) ((size_t)-PREFIX(name))
+
+ERR_STATIC unsigned ERR_isError(size_t code) { return (code > ERROR(maxCode)); }
+
+ERR_STATIC ERR_enum ERR_getErrorCode(size_t code) { if (!ERR_isError(code)) return (ERR_enum)0; return (ERR_enum) (0-code); }
+
+/* check and forward error code */
+#define CHECK_V_F(e, f) size_t const e = f; if (ERR_isError(e)) return e
+#define CHECK_F(f)   { CHECK_V_F(_var_err__, f); }
+
+
+/*-****************************************
+*  Error Strings
+******************************************/
+
+const char* ERR_getErrorString(ERR_enum code);   /* error_private.c */
+
+ERR_STATIC const char* ERR_getErrorName(size_t code)
+{
+    return ERR_getErrorString(ERR_getErrorCode(code));
+}
+
+#if defined (__cplusplus)
+}
+#endif
+
+#endif /* ERROR_H_MODULE */
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/fse_decompress.c mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/fse_decompress.c
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/fse_decompress.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/fse_decompress.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,403 @@
+/* ******************************************************************
+ * FSE : Finite State Entropy decoder
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ *
+ *  You can contact the author at :
+ *  - FSE source repository : https://github.com/Cyan4973/FiniteStateEntropy
+ *  - Public forum : https://groups.google.com/forum/#!forum/lz4c
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+****************************************************************** */
+
+
+/* **************************************************************
+*  Includes
+****************************************************************/
+#include "debug.h"      /* assert */
+#include "bitstream.h"
+#include "compiler.h"
+#define FSE_STATIC_LINKING_ONLY
+#include "fse.h"
+#include "error_private.h"
+#define ZSTD_DEPS_NEED_MALLOC
+#include "zstd_deps.h"
+
+
+/* **************************************************************
+*  Error Management
+****************************************************************/
+#define FSE_isError ERR_isError
+#define FSE_STATIC_ASSERT(c) DEBUG_STATIC_ASSERT(c)   /* use only *after* variable declarations */
+
+
+/* **************************************************************
+*  Templates
+****************************************************************/
+/*
+  designed to be included
+  for type-specific functions (template emulation in C)
+  Objective is to write these functions only once, for improved maintenance
+*/
+
+/* safety checks */
+#ifndef FSE_FUNCTION_EXTENSION
+#  error "FSE_FUNCTION_EXTENSION must be defined"
+#endif
+#ifndef FSE_FUNCTION_TYPE
+#  error "FSE_FUNCTION_TYPE must be defined"
+#endif
+
+/* Function names */
+#define FSE_CAT(X,Y) X##Y
+#define FSE_FUNCTION_NAME(X,Y) FSE_CAT(X,Y)
+#define FSE_TYPE_NAME(X,Y) FSE_CAT(X,Y)
+
+
+/* Function templates */
+FSE_DTable* FSE_createDTable (unsigned tableLog)
+{
+    if (tableLog > FSE_TABLELOG_ABSOLUTE_MAX) tableLog = FSE_TABLELOG_ABSOLUTE_MAX;
+    return (FSE_DTable*)ZSTD_malloc( FSE_DTABLE_SIZE_U32(tableLog) * sizeof (U32) );
+}
+
+void FSE_freeDTable (FSE_DTable* dt)
+{
+    ZSTD_free(dt);
+}
+
+static size_t FSE_buildDTable_internal(FSE_DTable* dt, const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog, void* workSpace, size_t wkspSize)
+{
+    void* const tdPtr = dt+1;   /* because *dt is unsigned, 32-bits aligned on 32-bits */
+    FSE_DECODE_TYPE* const tableDecode = (FSE_DECODE_TYPE*) (tdPtr);
+    U16* symbolNext = (U16*)workSpace;
+    BYTE* spread = (BYTE*)(symbolNext + maxSymbolValue + 1);
+
+    U32 const maxSV1 = maxSymbolValue + 1;
+    U32 const tableSize = 1 << tableLog;
+    U32 highThreshold = tableSize-1;
+
+    /* Sanity Checks */
+    if (FSE_BUILD_DTABLE_WKSP_SIZE(tableLog, maxSymbolValue) > wkspSize) return ERROR(maxSymbolValue_tooLarge);
+    if (maxSymbolValue > FSE_MAX_SYMBOL_VALUE) return ERROR(maxSymbolValue_tooLarge);
+    if (tableLog > FSE_MAX_TABLELOG) return ERROR(tableLog_tooLarge);
+
+    /* Init, lay down lowprob symbols */
+    {   FSE_DTableHeader DTableH;
+        DTableH.tableLog = (U16)tableLog;
+        DTableH.fastMode = 1;
+        {   S16 const largeLimit= (S16)(1 << (tableLog-1));
+            U32 s;
+            for (s=0; s<maxSV1; s++) {
+                if (normalizedCounter[s]==-1) {
+                    tableDecode[highThreshold--].symbol = (FSE_FUNCTION_TYPE)s;
+                    symbolNext[s] = 1;
+                } else {
+                    if (normalizedCounter[s] >= largeLimit) DTableH.fastMode=0;
+                    symbolNext[s] = normalizedCounter[s];
+        }   }   }
+        ZSTD_memcpy(dt, &DTableH, sizeof(DTableH));
+    }
+
+    /* Spread symbols */
+    if (highThreshold == tableSize - 1) {
+        size_t const tableMask = tableSize-1;
+        size_t const step = FSE_TABLESTEP(tableSize);
+        /* First lay down the symbols in order.
+         * We use a uint64_t to lay down 8 bytes at a time. This reduces branch
+         * misses since small blocks generally have small table logs, so nearly
+         * all symbols have counts <= 8. We ensure we have 8 bytes at the end of
+         * our buffer to handle the over-write.
+         */
+        {
+            U64 const add = 0x0101010101010101ull;
+            size_t pos = 0;
+            U64 sv = 0;
+            U32 s;
+            for (s=0; s<maxSV1; ++s, sv += add) {
+                int i;
+                int const n = normalizedCounter[s];
+                MEM_write64(spread + pos, sv);
+                for (i = 8; i < n; i += 8) {
+                    MEM_write64(spread + pos + i, sv);
+                }
+                pos += n;
+            }
+        }
+        /* Now we spread those positions across the table.
+         * The benefit of doing it in two stages is that we avoid the the
+         * variable size inner loop, which caused lots of branch misses.
+         * Now we can run through all the positions without any branch misses.
+         * We unroll the loop twice, since that is what emperically worked best.
+         */
+        {
+            size_t position = 0;
+            size_t s;
+            size_t const unroll = 2;
+            assert(tableSize % unroll == 0); /* FSE_MIN_TABLELOG is 5 */
+            for (s = 0; s < (size_t)tableSize; s += unroll) {
+                size_t u;
+                for (u = 0; u < unroll; ++u) {
+                    size_t const uPosition = (position + (u * step)) & tableMask;
+                    tableDecode[uPosition].symbol = spread[s + u];
+                }
+                position = (position + (unroll * step)) & tableMask;
+            }
+            assert(position == 0);
+        }
+    } else {
+        U32 const tableMask = tableSize-1;
+        U32 const step = FSE_TABLESTEP(tableSize);
+        U32 s, position = 0;
+        for (s=0; s<maxSV1; s++) {
+            int i;
+            for (i=0; i<normalizedCounter[s]; i++) {
+                tableDecode[position].symbol = (FSE_FUNCTION_TYPE)s;
+                position = (position + step) & tableMask;
+                while (position > highThreshold) position = (position + step) & tableMask;   /* lowprob area */
+        }   }
+        if (position!=0) return ERROR(GENERIC);   /* position must reach all cells once, otherwise normalizedCounter is incorrect */
+    }
+
+    /* Build Decoding table */
+    {   U32 u;
+        for (u=0; u<tableSize; u++) {
+            FSE_FUNCTION_TYPE const symbol = (FSE_FUNCTION_TYPE)(tableDecode[u].symbol);
+            U32 const nextState = symbolNext[symbol]++;
+            tableDecode[u].nbBits = (BYTE) (tableLog - BIT_highbit32(nextState) );
+            tableDecode[u].newState = (U16) ( (nextState << tableDecode[u].nbBits) - tableSize);
+    }   }
+
+    return 0;
+}
+
+size_t FSE_buildDTable_wksp(FSE_DTable* dt, const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog, void* workSpace, size_t wkspSize)
+{
+    return FSE_buildDTable_internal(dt, normalizedCounter, maxSymbolValue, tableLog, workSpace, wkspSize);
+}
+
+
+#ifndef FSE_COMMONDEFS_ONLY
+
+/*-*******************************************************
+*  Decompression (Byte symbols)
+*********************************************************/
+size_t FSE_buildDTable_rle (FSE_DTable* dt, BYTE symbolValue)
+{
+    void* ptr = dt;
+    FSE_DTableHeader* const DTableH = (FSE_DTableHeader*)ptr;
+    void* dPtr = dt + 1;
+    FSE_decode_t* const cell = (FSE_decode_t*)dPtr;
+
+    DTableH->tableLog = 0;
+    DTableH->fastMode = 0;
+
+    cell->newState = 0;
+    cell->symbol = symbolValue;
+    cell->nbBits = 0;
+
+    return 0;
+}
+
+
+size_t FSE_buildDTable_raw (FSE_DTable* dt, unsigned nbBits)
+{
+    void* ptr = dt;
+    FSE_DTableHeader* const DTableH = (FSE_DTableHeader*)ptr;
+    void* dPtr = dt + 1;
+    FSE_decode_t* const dinfo = (FSE_decode_t*)dPtr;
+    const unsigned tableSize = 1 << nbBits;
+    const unsigned tableMask = tableSize - 1;
+    const unsigned maxSV1 = tableMask+1;
+    unsigned s;
+
+    /* Sanity checks */
+    if (nbBits < 1) return ERROR(GENERIC);         /* min size */
+
+    /* Build Decoding Table */
+    DTableH->tableLog = (U16)nbBits;
+    DTableH->fastMode = 1;
+    for (s=0; s<maxSV1; s++) {
+        dinfo[s].newState = 0;
+        dinfo[s].symbol = (BYTE)s;
+        dinfo[s].nbBits = (BYTE)nbBits;
+    }
+
+    return 0;
+}
+
+FORCE_INLINE_TEMPLATE size_t FSE_decompress_usingDTable_generic(
+          void* dst, size_t maxDstSize,
+    const void* cSrc, size_t cSrcSize,
+    const FSE_DTable* dt, const unsigned fast)
+{
+    BYTE* const ostart = (BYTE*) dst;
+    BYTE* op = ostart;
+    BYTE* const omax = op + maxDstSize;
+    BYTE* const olimit = omax-3;
+
+    BIT_DStream_t bitD;
+    FSE_DState_t state1;
+    FSE_DState_t state2;
+
+    /* Init */
+    CHECK_F(BIT_initDStream(&bitD, cSrc, cSrcSize));
+
+    FSE_initDState(&state1, &bitD, dt);
+    FSE_initDState(&state2, &bitD, dt);
+
+#define FSE_GETSYMBOL(statePtr) fast ? FSE_decodeSymbolFast(statePtr, &bitD) : FSE_decodeSymbol(statePtr, &bitD)
+
+    /* 4 symbols per loop */
+    for ( ; (BIT_reloadDStream(&bitD)==BIT_DStream_unfinished) & (op<olimit) ; op+=4) {
+        op[0] = FSE_GETSYMBOL(&state1);
+
+        if (FSE_MAX_TABLELOG*2+7 > sizeof(bitD.bitContainer)*8)    /* This test must be static */
+            BIT_reloadDStream(&bitD);
+
+        op[1] = FSE_GETSYMBOL(&state2);
+
+        if (FSE_MAX_TABLELOG*4+7 > sizeof(bitD.bitContainer)*8)    /* This test must be static */
+            { if (BIT_reloadDStream(&bitD) > BIT_DStream_unfinished) { op+=2; break; } }
+
+        op[2] = FSE_GETSYMBOL(&state1);
+
+        if (FSE_MAX_TABLELOG*2+7 > sizeof(bitD.bitContainer)*8)    /* This test must be static */
+            BIT_reloadDStream(&bitD);
+
+        op[3] = FSE_GETSYMBOL(&state2);
+    }
+
+    /* tail */
+    /* note : BIT_reloadDStream(&bitD) >= FSE_DStream_partiallyFilled; Ends at exactly BIT_DStream_completed */
+    while (1) {
+        if (op>(omax-2)) return ERROR(dstSize_tooSmall);
+        *op++ = FSE_GETSYMBOL(&state1);
+        if (BIT_reloadDStream(&bitD)==BIT_DStream_overflow) {
+            *op++ = FSE_GETSYMBOL(&state2);
+            break;
+        }
+
+        if (op>(omax-2)) return ERROR(dstSize_tooSmall);
+        *op++ = FSE_GETSYMBOL(&state2);
+        if (BIT_reloadDStream(&bitD)==BIT_DStream_overflow) {
+            *op++ = FSE_GETSYMBOL(&state1);
+            break;
+    }   }
+
+    return op-ostart;
+}
+
+
+size_t FSE_decompress_usingDTable(void* dst, size_t originalSize,
+                            const void* cSrc, size_t cSrcSize,
+                            const FSE_DTable* dt)
+{
+    const void* ptr = dt;
+    const FSE_DTableHeader* DTableH = (const FSE_DTableHeader*)ptr;
+    const U32 fastMode = DTableH->fastMode;
+
+    /* select fast mode (static) */
+    if (fastMode) return FSE_decompress_usingDTable_generic(dst, originalSize, cSrc, cSrcSize, dt, 1);
+    return FSE_decompress_usingDTable_generic(dst, originalSize, cSrc, cSrcSize, dt, 0);
+}
+
+
+size_t FSE_decompress_wksp(void* dst, size_t dstCapacity, const void* cSrc, size_t cSrcSize, unsigned maxLog, void* workSpace, size_t wkspSize)
+{
+    return FSE_decompress_wksp_bmi2(dst, dstCapacity, cSrc, cSrcSize, maxLog, workSpace, wkspSize, /* bmi2 */ 0);
+}
+
+typedef struct {
+    short ncount[FSE_MAX_SYMBOL_VALUE + 1];
+    FSE_DTable dtable[1]; /* Dynamically sized */
+} FSE_DecompressWksp;
+
+
+FORCE_INLINE_TEMPLATE size_t FSE_decompress_wksp_body(
+        void* dst, size_t dstCapacity,
+        const void* cSrc, size_t cSrcSize,
+        unsigned maxLog, void* workSpace, size_t wkspSize,
+        int bmi2)
+{
+    const BYTE* const istart = (const BYTE*)cSrc;
+    const BYTE* ip = istart;
+    unsigned tableLog;
+    unsigned maxSymbolValue = FSE_MAX_SYMBOL_VALUE;
+    FSE_DecompressWksp* const wksp = (FSE_DecompressWksp*)workSpace;
+
+    DEBUG_STATIC_ASSERT((FSE_MAX_SYMBOL_VALUE + 1) % 2 == 0);
+    if (wkspSize < sizeof(*wksp)) return ERROR(GENERIC);
+
+    /* normal FSE decoding mode */
+    {
+        size_t const NCountLength = FSE_readNCount_bmi2(wksp->ncount, &maxSymbolValue, &tableLog, istart, cSrcSize, bmi2);
+        if (FSE_isError(NCountLength)) return NCountLength;
+        if (tableLog > maxLog) return ERROR(tableLog_tooLarge);
+        assert(NCountLength <= cSrcSize);
+        ip += NCountLength;
+        cSrcSize -= NCountLength;
+    }
+
+    if (FSE_DECOMPRESS_WKSP_SIZE(tableLog, maxSymbolValue) > wkspSize) return ERROR(tableLog_tooLarge);
+    workSpace = wksp->dtable + FSE_DTABLE_SIZE_U32(tableLog);
+    wkspSize -= sizeof(*wksp) + FSE_DTABLE_SIZE(tableLog);
+
+    CHECK_F( FSE_buildDTable_internal(wksp->dtable, wksp->ncount, maxSymbolValue, tableLog, workSpace, wkspSize) );
+
+    {
+        const void* ptr = wksp->dtable;
+        const FSE_DTableHeader* DTableH = (const FSE_DTableHeader*)ptr;
+        const U32 fastMode = DTableH->fastMode;
+
+        /* select fast mode (static) */
+        if (fastMode) return FSE_decompress_usingDTable_generic(dst, dstCapacity, ip, cSrcSize, wksp->dtable, 1);
+        return FSE_decompress_usingDTable_generic(dst, dstCapacity, ip, cSrcSize, wksp->dtable, 0);
+    }
+}
+
+/* Avoids the FORCE_INLINE of the _body() function. */
+static size_t FSE_decompress_wksp_body_default(void* dst, size_t dstCapacity, const void* cSrc, size_t cSrcSize, unsigned maxLog, void* workSpace, size_t wkspSize)
+{
+    return FSE_decompress_wksp_body(dst, dstCapacity, cSrc, cSrcSize, maxLog, workSpace, wkspSize, 0);
+}
+
+#if DYNAMIC_BMI2
+TARGET_ATTRIBUTE("bmi2") static size_t FSE_decompress_wksp_body_bmi2(void* dst, size_t dstCapacity, const void* cSrc, size_t cSrcSize, unsigned maxLog, void* workSpace, size_t wkspSize)
+{
+    return FSE_decompress_wksp_body(dst, dstCapacity, cSrc, cSrcSize, maxLog, workSpace, wkspSize, 1);
+}
+#endif
+
+size_t FSE_decompress_wksp_bmi2(void* dst, size_t dstCapacity, const void* cSrc, size_t cSrcSize, unsigned maxLog, void* workSpace, size_t wkspSize, int bmi2)
+{
+#if DYNAMIC_BMI2
+    if (bmi2) {
+        return FSE_decompress_wksp_body_bmi2(dst, dstCapacity, cSrc, cSrcSize, maxLog, workSpace, wkspSize);
+    }
+#endif
+    (void)bmi2;
+    return FSE_decompress_wksp_body_default(dst, dstCapacity, cSrc, cSrcSize, maxLog, workSpace, wkspSize);
+}
+
+
+typedef FSE_DTable DTable_max_t[FSE_DTABLE_SIZE_U32(FSE_MAX_TABLELOG)];
+
+#ifndef ZSTD_NO_UNUSED_FUNCTIONS
+size_t FSE_buildDTable(FSE_DTable* dt, const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog) {
+    U32 wksp[FSE_BUILD_DTABLE_WKSP_SIZE_U32(FSE_TABLELOG_ABSOLUTE_MAX, FSE_MAX_SYMBOL_VALUE)];
+    return FSE_buildDTable_wksp(dt, normalizedCounter, maxSymbolValue, tableLog, wksp, sizeof(wksp));
+}
+
+size_t FSE_decompress(void* dst, size_t dstCapacity, const void* cSrc, size_t cSrcSize)
+{
+    /* Static analyzer seems unable to understand this table will be properly initialized later */
+    U32 wksp[FSE_DECOMPRESS_WKSP_SIZE_U32(FSE_MAX_TABLELOG, FSE_MAX_SYMBOL_VALUE)];
+    return FSE_decompress_wksp(dst, dstCapacity, cSrc, cSrcSize, FSE_MAX_TABLELOG, wksp, sizeof(wksp));
+}
+#endif
+
+
+#endif   /* FSE_COMMONDEFS_ONLY */
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/fse.h mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/fse.h
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/fse.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/fse.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,716 @@
+/* ******************************************************************
+ * FSE : Finite State Entropy codec
+ * Public Prototypes declaration
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ *
+ * You can contact the author at :
+ * - Source repository : https://github.com/Cyan4973/FiniteStateEntropy
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+****************************************************************** */
+
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
+#ifndef FSE_H
+#define FSE_H
+
+
+/*-*****************************************
+*  Dependencies
+******************************************/
+#include "zstd_deps.h"    /* size_t, ptrdiff_t */
+
+
+/*-*****************************************
+*  FSE_PUBLIC_API : control library symbols visibility
+******************************************/
+#if defined(FSE_DLL_EXPORT) && (FSE_DLL_EXPORT==1) && defined(__GNUC__) && (__GNUC__ >= 4)
+#  define FSE_PUBLIC_API __attribute__ ((visibility ("default")))
+#elif defined(FSE_DLL_EXPORT) && (FSE_DLL_EXPORT==1)   /* Visual expected */
+#  define FSE_PUBLIC_API __declspec(dllexport)
+#elif defined(FSE_DLL_IMPORT) && (FSE_DLL_IMPORT==1)
+#  define FSE_PUBLIC_API __declspec(dllimport) /* It isn't required but allows to generate better code, saving a function pointer load from the IAT and an indirect jump.*/
+#else
+#  define FSE_PUBLIC_API
+#endif
+
+/*------   Version   ------*/
+#define FSE_VERSION_MAJOR    0
+#define FSE_VERSION_MINOR    9
+#define FSE_VERSION_RELEASE  0
+
+#define FSE_LIB_VERSION FSE_VERSION_MAJOR.FSE_VERSION_MINOR.FSE_VERSION_RELEASE
+#define FSE_QUOTE(str) #str
+#define FSE_EXPAND_AND_QUOTE(str) FSE_QUOTE(str)
+#define FSE_VERSION_STRING FSE_EXPAND_AND_QUOTE(FSE_LIB_VERSION)
+
+#define FSE_VERSION_NUMBER  (FSE_VERSION_MAJOR *100*100 + FSE_VERSION_MINOR *100 + FSE_VERSION_RELEASE)
+FSE_PUBLIC_API unsigned FSE_versionNumber(void);   /**< library version number; to be used when checking dll version */
+
+
+/*-****************************************
+*  FSE simple functions
+******************************************/
+/*! FSE_compress() :
+    Compress content of buffer 'src', of size 'srcSize', into destination buffer 'dst'.
+    'dst' buffer must be already allocated. Compression runs faster is dstCapacity >= FSE_compressBound(srcSize).
+    @return : size of compressed data (<= dstCapacity).
+    Special values : if return == 0, srcData is not compressible => Nothing is stored within dst !!!
+                     if return == 1, srcData is a single byte symbol * srcSize times. Use RLE compression instead.
+                     if FSE_isError(return), compression failed (more details using FSE_getErrorName())
+*/
+FSE_PUBLIC_API size_t FSE_compress(void* dst, size_t dstCapacity,
+                             const void* src, size_t srcSize);
+
+/*! FSE_decompress():
+    Decompress FSE data from buffer 'cSrc', of size 'cSrcSize',
+    into already allocated destination buffer 'dst', of size 'dstCapacity'.
+    @return : size of regenerated data (<= maxDstSize),
+              or an error code, which can be tested using FSE_isError() .
+
+    ** Important ** : FSE_decompress() does not decompress non-compressible nor RLE data !!!
+    Why ? : making this distinction requires a header.
+    Header management is intentionally delegated to the user layer, which can better manage special cases.
+*/
+FSE_PUBLIC_API size_t FSE_decompress(void* dst,  size_t dstCapacity,
+                               const void* cSrc, size_t cSrcSize);
+
+
+/*-*****************************************
+*  Tool functions
+******************************************/
+FSE_PUBLIC_API size_t FSE_compressBound(size_t size);       /* maximum compressed size */
+
+/* Error Management */
+FSE_PUBLIC_API unsigned    FSE_isError(size_t code);        /* tells if a return value is an error code */
+FSE_PUBLIC_API const char* FSE_getErrorName(size_t code);   /* provides error code string (useful for debugging) */
+
+
+/*-*****************************************
+*  FSE advanced functions
+******************************************/
+/*! FSE_compress2() :
+    Same as FSE_compress(), but allows the selection of 'maxSymbolValue' and 'tableLog'
+    Both parameters can be defined as '0' to mean : use default value
+    @return : size of compressed data
+    Special values : if return == 0, srcData is not compressible => Nothing is stored within cSrc !!!
+                     if return == 1, srcData is a single byte symbol * srcSize times. Use RLE compression.
+                     if FSE_isError(return), it's an error code.
+*/
+FSE_PUBLIC_API size_t FSE_compress2 (void* dst, size_t dstSize, const void* src, size_t srcSize, unsigned maxSymbolValue, unsigned tableLog);
+
+
+/*-*****************************************
+*  FSE detailed API
+******************************************/
+/*!
+FSE_compress() does the following:
+1. count symbol occurrence from source[] into table count[] (see hist.h)
+2. normalize counters so that sum(count[]) == Power_of_2 (2^tableLog)
+3. save normalized counters to memory buffer using writeNCount()
+4. build encoding table 'CTable' from normalized counters
+5. encode the data stream using encoding table 'CTable'
+
+FSE_decompress() does the following:
+1. read normalized counters with readNCount()
+2. build decoding table 'DTable' from normalized counters
+3. decode the data stream using decoding table 'DTable'
+
+The following API allows targeting specific sub-functions for advanced tasks.
+For example, it's possible to compress several blocks using the same 'CTable',
+or to save and provide normalized distribution using external method.
+*/
+
+/* *** COMPRESSION *** */
+
+/*! FSE_optimalTableLog():
+    dynamically downsize 'tableLog' when conditions are met.
+    It saves CPU time, by using smaller tables, while preserving or even improving compression ratio.
+    @return : recommended tableLog (necessarily <= 'maxTableLog') */
+FSE_PUBLIC_API unsigned FSE_optimalTableLog(unsigned maxTableLog, size_t srcSize, unsigned maxSymbolValue);
+
+/*! FSE_normalizeCount():
+    normalize counts so that sum(count[]) == Power_of_2 (2^tableLog)
+    'normalizedCounter' is a table of short, of minimum size (maxSymbolValue+1).
+    useLowProbCount is a boolean parameter which trades off compressed size for
+    faster header decoding. When it is set to 1, the compressed data will be slightly
+    smaller. And when it is set to 0, FSE_readNCount() and FSE_buildDTable() will be
+    faster. If you are compressing a small amount of data (< 2 KB) then useLowProbCount=0
+    is a good default, since header deserialization makes a big speed difference.
+    Otherwise, useLowProbCount=1 is a good default, since the speed difference is small.
+    @return : tableLog,
+              or an errorCode, which can be tested using FSE_isError() */
+FSE_PUBLIC_API size_t FSE_normalizeCount(short* normalizedCounter, unsigned tableLog,
+                    const unsigned* count, size_t srcSize, unsigned maxSymbolValue, unsigned useLowProbCount);
+
+/*! FSE_NCountWriteBound():
+    Provides the maximum possible size of an FSE normalized table, given 'maxSymbolValue' and 'tableLog'.
+    Typically useful for allocation purpose. */
+FSE_PUBLIC_API size_t FSE_NCountWriteBound(unsigned maxSymbolValue, unsigned tableLog);
+
+/*! FSE_writeNCount():
+    Compactly save 'normalizedCounter' into 'buffer'.
+    @return : size of the compressed table,
+              or an errorCode, which can be tested using FSE_isError(). */
+FSE_PUBLIC_API size_t FSE_writeNCount (void* buffer, size_t bufferSize,
+                                 const short* normalizedCounter,
+                                 unsigned maxSymbolValue, unsigned tableLog);
+
+/*! Constructor and Destructor of FSE_CTable.
+    Note that FSE_CTable size depends on 'tableLog' and 'maxSymbolValue' */
+typedef unsigned FSE_CTable;   /* don't allocate that. It's only meant to be more restrictive than void* */
+FSE_PUBLIC_API FSE_CTable* FSE_createCTable (unsigned maxSymbolValue, unsigned tableLog);
+FSE_PUBLIC_API void        FSE_freeCTable (FSE_CTable* ct);
+
+/*! FSE_buildCTable():
+    Builds `ct`, which must be already allocated, using FSE_createCTable().
+    @return : 0, or an errorCode, which can be tested using FSE_isError() */
+FSE_PUBLIC_API size_t FSE_buildCTable(FSE_CTable* ct, const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog);
+
+/*! FSE_compress_usingCTable():
+    Compress `src` using `ct` into `dst` which must be already allocated.
+    @return : size of compressed data (<= `dstCapacity`),
+              or 0 if compressed data could not fit into `dst`,
+              or an errorCode, which can be tested using FSE_isError() */
+FSE_PUBLIC_API size_t FSE_compress_usingCTable (void* dst, size_t dstCapacity, const void* src, size_t srcSize, const FSE_CTable* ct);
+
+/*!
+Tutorial :
+----------
+The first step is to count all symbols. FSE_count() does this job very fast.
+Result will be saved into 'count', a table of unsigned int, which must be already allocated, and have 'maxSymbolValuePtr[0]+1' cells.
+'src' is a table of bytes of size 'srcSize'. All values within 'src' MUST be <= maxSymbolValuePtr[0]
+maxSymbolValuePtr[0] will be updated, with its real value (necessarily <= original value)
+FSE_count() will return the number of occurrence of the most frequent symbol.
+This can be used to know if there is a single symbol within 'src', and to quickly evaluate its compressibility.
+If there is an error, the function will return an ErrorCode (which can be tested using FSE_isError()).
+
+The next step is to normalize the frequencies.
+FSE_normalizeCount() will ensure that sum of frequencies is == 2 ^'tableLog'.
+It also guarantees a minimum of 1 to any Symbol with frequency >= 1.
+You can use 'tableLog'==0 to mean "use default tableLog value".
+If you are unsure of which tableLog value to use, you can ask FSE_optimalTableLog(),
+which will provide the optimal valid tableLog given sourceSize, maxSymbolValue, and a user-defined maximum (0 means "default").
+
+The result of FSE_normalizeCount() will be saved into a table,
+called 'normalizedCounter', which is a table of signed short.
+'normalizedCounter' must be already allocated, and have at least 'maxSymbolValue+1' cells.
+The return value is tableLog if everything proceeded as expected.
+It is 0 if there is a single symbol within distribution.
+If there is an error (ex: invalid tableLog value), the function will return an ErrorCode (which can be tested using FSE_isError()).
+
+'normalizedCounter' can be saved in a compact manner to a memory area using FSE_writeNCount().
+'buffer' must be already allocated.
+For guaranteed success, buffer size must be at least FSE_headerBound().
+The result of the function is the number of bytes written into 'buffer'.
+If there is an error, the function will return an ErrorCode (which can be tested using FSE_isError(); ex : buffer size too small).
+
+'normalizedCounter' can then be used to create the compression table 'CTable'.
+The space required by 'CTable' must be already allocated, using FSE_createCTable().
+You can then use FSE_buildCTable() to fill 'CTable'.
+If there is an error, both functions will return an ErrorCode (which can be tested using FSE_isError()).
+
+'CTable' can then be used to compress 'src', with FSE_compress_usingCTable().
+Similar to FSE_count(), the convention is that 'src' is assumed to be a table of char of size 'srcSize'
+The function returns the size of compressed data (without header), necessarily <= `dstCapacity`.
+If it returns '0', compressed data could not fit into 'dst'.
+If there is an error, the function will return an ErrorCode (which can be tested using FSE_isError()).
+*/
+
+
+/* *** DECOMPRESSION *** */
+
+/*! FSE_readNCount():
+    Read compactly saved 'normalizedCounter' from 'rBuffer'.
+    @return : size read from 'rBuffer',
+              or an errorCode, which can be tested using FSE_isError().
+              maxSymbolValuePtr[0] and tableLogPtr[0] will also be updated with their respective values */
+FSE_PUBLIC_API size_t FSE_readNCount (short* normalizedCounter,
+                           unsigned* maxSymbolValuePtr, unsigned* tableLogPtr,
+                           const void* rBuffer, size_t rBuffSize);
+
+/*! FSE_readNCount_bmi2():
+ * Same as FSE_readNCount() but pass bmi2=1 when your CPU supports BMI2 and 0 otherwise.
+ */
+FSE_PUBLIC_API size_t FSE_readNCount_bmi2(short* normalizedCounter,
+                           unsigned* maxSymbolValuePtr, unsigned* tableLogPtr,
+                           const void* rBuffer, size_t rBuffSize, int bmi2);
+
+/*! Constructor and Destructor of FSE_DTable.
+    Note that its size depends on 'tableLog' */
+typedef unsigned FSE_DTable;   /* don't allocate that. It's just a way to be more restrictive than void* */
+FSE_PUBLIC_API FSE_DTable* FSE_createDTable(unsigned tableLog);
+FSE_PUBLIC_API void        FSE_freeDTable(FSE_DTable* dt);
+
+/*! FSE_buildDTable():
+    Builds 'dt', which must be already allocated, using FSE_createDTable().
+    return : 0, or an errorCode, which can be tested using FSE_isError() */
+FSE_PUBLIC_API size_t FSE_buildDTable (FSE_DTable* dt, const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog);
+
+/*! FSE_decompress_usingDTable():
+    Decompress compressed source `cSrc` of size `cSrcSize` using `dt`
+    into `dst` which must be already allocated.
+    @return : size of regenerated data (necessarily <= `dstCapacity`),
+              or an errorCode, which can be tested using FSE_isError() */
+FSE_PUBLIC_API size_t FSE_decompress_usingDTable(void* dst, size_t dstCapacity, const void* cSrc, size_t cSrcSize, const FSE_DTable* dt);
+
+/*!
+Tutorial :
+----------
+(Note : these functions only decompress FSE-compressed blocks.
+ If block is uncompressed, use memcpy() instead
+ If block is a single repeated byte, use memset() instead )
+
+The first step is to obtain the normalized frequencies of symbols.
+This can be performed by FSE_readNCount() if it was saved using FSE_writeNCount().
+'normalizedCounter' must be already allocated, and have at least 'maxSymbolValuePtr[0]+1' cells of signed short.
+In practice, that means it's necessary to know 'maxSymbolValue' beforehand,
+or size the table to handle worst case situations (typically 256).
+FSE_readNCount() will provide 'tableLog' and 'maxSymbolValue'.
+The result of FSE_readNCount() is the number of bytes read from 'rBuffer'.
+Note that 'rBufferSize' must be at least 4 bytes, even if useful information is less than that.
+If there is an error, the function will return an error code, which can be tested using FSE_isError().
+
+The next step is to build the decompression tables 'FSE_DTable' from 'normalizedCounter'.
+This is performed by the function FSE_buildDTable().
+The space required by 'FSE_DTable' must be already allocated using FSE_createDTable().
+If there is an error, the function will return an error code, which can be tested using FSE_isError().
+
+`FSE_DTable` can then be used to decompress `cSrc`, with FSE_decompress_usingDTable().
+`cSrcSize` must be strictly correct, otherwise decompression will fail.
+FSE_decompress_usingDTable() result will tell how many bytes were regenerated (<=`dstCapacity`).
+If there is an error, the function will return an error code, which can be tested using FSE_isError(). (ex: dst buffer too small)
+*/
+
+#endif  /* FSE_H */
+
+#if defined(FSE_STATIC_LINKING_ONLY) && !defined(FSE_H_FSE_STATIC_LINKING_ONLY)
+#define FSE_H_FSE_STATIC_LINKING_ONLY
+
+/* *** Dependency *** */
+#include "bitstream.h"
+
+
+/* *****************************************
+*  Static allocation
+*******************************************/
+/* FSE buffer bounds */
+#define FSE_NCOUNTBOUND 512
+#define FSE_BLOCKBOUND(size) ((size) + ((size)>>7) + 4 /* fse states */ + sizeof(size_t) /* bitContainer */)
+#define FSE_COMPRESSBOUND(size) (FSE_NCOUNTBOUND + FSE_BLOCKBOUND(size))   /* Macro version, useful for static allocation */
+
+/* It is possible to statically allocate FSE CTable/DTable as a table of FSE_CTable/FSE_DTable using below macros */
+#define FSE_CTABLE_SIZE_U32(maxTableLog, maxSymbolValue)   (1 + (1<<((maxTableLog)-1)) + (((maxSymbolValue)+1)*2))
+#define FSE_DTABLE_SIZE_U32(maxTableLog)                   (1 + (1<<(maxTableLog)))
+
+/* or use the size to malloc() space directly. Pay attention to alignment restrictions though */
+#define FSE_CTABLE_SIZE(maxTableLog, maxSymbolValue)   (FSE_CTABLE_SIZE_U32(maxTableLog, maxSymbolValue) * sizeof(FSE_CTable))
+#define FSE_DTABLE_SIZE(maxTableLog)                   (FSE_DTABLE_SIZE_U32(maxTableLog) * sizeof(FSE_DTable))
+
+
+/* *****************************************
+ *  FSE advanced API
+ ***************************************** */
+
+unsigned FSE_optimalTableLog_internal(unsigned maxTableLog, size_t srcSize, unsigned maxSymbolValue, unsigned minus);
+/**< same as FSE_optimalTableLog(), which used `minus==2` */
+
+/* FSE_compress_wksp() :
+ * Same as FSE_compress2(), but using an externally allocated scratch buffer (`workSpace`).
+ * FSE_COMPRESS_WKSP_SIZE_U32() provides the minimum size required for `workSpace` as a table of FSE_CTable.
+ */
+#define FSE_COMPRESS_WKSP_SIZE_U32(maxTableLog, maxSymbolValue)   ( FSE_CTABLE_SIZE_U32(maxTableLog, maxSymbolValue) + ((maxTableLog > 12) ? (1 << (maxTableLog - 2)) : 1024) )
+size_t FSE_compress_wksp (void* dst, size_t dstSize, const void* src, size_t srcSize, unsigned maxSymbolValue, unsigned tableLog, void* workSpace, size_t wkspSize);
+
+size_t FSE_buildCTable_raw (FSE_CTable* ct, unsigned nbBits);
+/**< build a fake FSE_CTable, designed for a flat distribution, where each symbol uses nbBits */
+
+size_t FSE_buildCTable_rle (FSE_CTable* ct, unsigned char symbolValue);
+/**< build a fake FSE_CTable, designed to compress always the same symbolValue */
+
+/* FSE_buildCTable_wksp() :
+ * Same as FSE_buildCTable(), but using an externally allocated scratch buffer (`workSpace`).
+ * `wkspSize` must be >= `FSE_BUILD_CTABLE_WORKSPACE_SIZE_U32(maxSymbolValue, tableLog)` of `unsigned`.
+ */
+#define FSE_BUILD_CTABLE_WORKSPACE_SIZE_U32(maxSymbolValue, tableLog) (maxSymbolValue + 2 + (1ull << (tableLog - 2)))
+#define FSE_BUILD_CTABLE_WORKSPACE_SIZE(maxSymbolValue, tableLog) (sizeof(unsigned) * FSE_BUILD_CTABLE_WORKSPACE_SIZE_U32(maxSymbolValue, tableLog))
+size_t FSE_buildCTable_wksp(FSE_CTable* ct, const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog, void* workSpace, size_t wkspSize);
+
+#define FSE_BUILD_DTABLE_WKSP_SIZE(maxTableLog, maxSymbolValue) (sizeof(short) * (maxSymbolValue + 1) + (1ULL << maxTableLog) + 8)
+#define FSE_BUILD_DTABLE_WKSP_SIZE_U32(maxTableLog, maxSymbolValue) ((FSE_BUILD_DTABLE_WKSP_SIZE(maxTableLog, maxSymbolValue) + sizeof(unsigned) - 1) / sizeof(unsigned))
+FSE_PUBLIC_API size_t FSE_buildDTable_wksp(FSE_DTable* dt, const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog, void* workSpace, size_t wkspSize);
+/**< Same as FSE_buildDTable(), using an externally allocated `workspace` produced with `FSE_BUILD_DTABLE_WKSP_SIZE_U32(maxSymbolValue)` */
+
+size_t FSE_buildDTable_raw (FSE_DTable* dt, unsigned nbBits);
+/**< build a fake FSE_DTable, designed to read a flat distribution where each symbol uses nbBits */
+
+size_t FSE_buildDTable_rle (FSE_DTable* dt, unsigned char symbolValue);
+/**< build a fake FSE_DTable, designed to always generate the same symbolValue */
+
+#define FSE_DECOMPRESS_WKSP_SIZE_U32(maxTableLog, maxSymbolValue) (FSE_DTABLE_SIZE_U32(maxTableLog) + FSE_BUILD_DTABLE_WKSP_SIZE_U32(maxTableLog, maxSymbolValue) + (FSE_MAX_SYMBOL_VALUE + 1) / 2 + 1)
+#define FSE_DECOMPRESS_WKSP_SIZE(maxTableLog, maxSymbolValue) (FSE_DECOMPRESS_WKSP_SIZE_U32(maxTableLog, maxSymbolValue) * sizeof(unsigned))
+size_t FSE_decompress_wksp(void* dst, size_t dstCapacity, const void* cSrc, size_t cSrcSize, unsigned maxLog, void* workSpace, size_t wkspSize);
+/**< same as FSE_decompress(), using an externally allocated `workSpace` produced with `FSE_DECOMPRESS_WKSP_SIZE_U32(maxLog, maxSymbolValue)` */
+
+size_t FSE_decompress_wksp_bmi2(void* dst, size_t dstCapacity, const void* cSrc, size_t cSrcSize, unsigned maxLog, void* workSpace, size_t wkspSize, int bmi2);
+/**< Same as FSE_decompress_wksp() but with dynamic BMI2 support. Pass 1 if your CPU supports BMI2 or 0 if it doesn't. */
+
+typedef enum {
+   FSE_repeat_none,  /**< Cannot use the previous table */
+   FSE_repeat_check, /**< Can use the previous table but it must be checked */
+   FSE_repeat_valid  /**< Can use the previous table and it is assumed to be valid */
+ } FSE_repeat;
+
+/* *****************************************
+*  FSE symbol compression API
+*******************************************/
+/*!
+   This API consists of small unitary functions, which highly benefit from being inlined.
+   Hence their body are included in next section.
+*/
+typedef struct {
+    ptrdiff_t   value;
+    const void* stateTable;
+    const void* symbolTT;
+    unsigned    stateLog;
+} FSE_CState_t;
+
+static void FSE_initCState(FSE_CState_t* CStatePtr, const FSE_CTable* ct);
+
+static void FSE_encodeSymbol(BIT_CStream_t* bitC, FSE_CState_t* CStatePtr, unsigned symbol);
+
+static void FSE_flushCState(BIT_CStream_t* bitC, const FSE_CState_t* CStatePtr);
+
+/**<
+These functions are inner components of FSE_compress_usingCTable().
+They allow the creation of custom streams, mixing multiple tables and bit sources.
+
+A key property to keep in mind is that encoding and decoding are done **in reverse direction**.
+So the first symbol you will encode is the last you will decode, like a LIFO stack.
+
+You will need a few variables to track your CStream. They are :
+
+FSE_CTable    ct;         // Provided by FSE_buildCTable()
+BIT_CStream_t bitStream;  // bitStream tracking structure
+FSE_CState_t  state;      // State tracking structure (can have several)
+
+
+The first thing to do is to init bitStream and state.
+    size_t errorCode = BIT_initCStream(&bitStream, dstBuffer, maxDstSize);
+    FSE_initCState(&state, ct);
+
+Note that BIT_initCStream() can produce an error code, so its result should be tested, using FSE_isError();
+You can then encode your input data, byte after byte.
+FSE_encodeSymbol() outputs a maximum of 'tableLog' bits at a time.
+Remember decoding will be done in reverse direction.
+    FSE_encodeByte(&bitStream, &state, symbol);
+
+At any time, you can also add any bit sequence.
+Note : maximum allowed nbBits is 25, for compatibility with 32-bits decoders
+    BIT_addBits(&bitStream, bitField, nbBits);
+
+The above methods don't commit data to memory, they just store it into local register, for speed.
+Local register size is 64-bits on 64-bits systems, 32-bits on 32-bits systems (size_t).
+Writing data to memory is a manual operation, performed by the flushBits function.
+    BIT_flushBits(&bitStream);
+
+Your last FSE encoding operation shall be to flush your last state value(s).
+    FSE_flushState(&bitStream, &state);
+
+Finally, you must close the bitStream.
+The function returns the size of CStream in bytes.
+If data couldn't fit into dstBuffer, it will return a 0 ( == not compressible)
+If there is an error, it returns an errorCode (which can be tested using FSE_isError()).
+    size_t size = BIT_closeCStream(&bitStream);
+*/
+
+
+/* *****************************************
+*  FSE symbol decompression API
+*******************************************/
+typedef struct {
+    size_t      state;
+    const void* table;   /* precise table may vary, depending on U16 */
+} FSE_DState_t;
+
+
+static void     FSE_initDState(FSE_DState_t* DStatePtr, BIT_DStream_t* bitD, const FSE_DTable* dt);
+
+static unsigned char FSE_decodeSymbol(FSE_DState_t* DStatePtr, BIT_DStream_t* bitD);
+
+static unsigned FSE_endOfDState(const FSE_DState_t* DStatePtr);
+
+/**<
+Let's now decompose FSE_decompress_usingDTable() into its unitary components.
+You will decode FSE-encoded symbols from the bitStream,
+and also any other bitFields you put in, **in reverse order**.
+
+You will need a few variables to track your bitStream. They are :
+
+BIT_DStream_t DStream;    // Stream context
+FSE_DState_t  DState;     // State context. Multiple ones are possible
+FSE_DTable*   DTablePtr;  // Decoding table, provided by FSE_buildDTable()
+
+The first thing to do is to init the bitStream.
+    errorCode = BIT_initDStream(&DStream, srcBuffer, srcSize);
+
+You should then retrieve your initial state(s)
+(in reverse flushing order if you have several ones) :
+    errorCode = FSE_initDState(&DState, &DStream, DTablePtr);
+
+You can then decode your data, symbol after symbol.
+For information the maximum number of bits read by FSE_decodeSymbol() is 'tableLog'.
+Keep in mind that symbols are decoded in reverse order, like a LIFO stack (last in, first out).
+    unsigned char symbol = FSE_decodeSymbol(&DState, &DStream);
+
+You can retrieve any bitfield you eventually stored into the bitStream (in reverse order)
+Note : maximum allowed nbBits is 25, for 32-bits compatibility
+    size_t bitField = BIT_readBits(&DStream, nbBits);
+
+All above operations only read from local register (which size depends on size_t).
+Refueling the register from memory is manually performed by the reload method.
+    endSignal = FSE_reloadDStream(&DStream);
+
+BIT_reloadDStream() result tells if there is still some more data to read from DStream.
+BIT_DStream_unfinished : there is still some data left into the DStream.
+BIT_DStream_endOfBuffer : Dstream reached end of buffer. Its container may no longer be completely filled.
+BIT_DStream_completed : Dstream reached its exact end, corresponding in general to decompression completed.
+BIT_DStream_tooFar : Dstream went too far. Decompression result is corrupted.
+
+When reaching end of buffer (BIT_DStream_endOfBuffer), progress slowly, notably if you decode multiple symbols per loop,
+to properly detect the exact end of stream.
+After each decoded symbol, check if DStream is fully consumed using this simple test :
+    BIT_reloadDStream(&DStream) >= BIT_DStream_completed
+
+When it's done, verify decompression is fully completed, by checking both DStream and the relevant states.
+Checking if DStream has reached its end is performed by :
+    BIT_endOfDStream(&DStream);
+Check also the states. There might be some symbols left there, if some high probability ones (>50%) are possible.
+    FSE_endOfDState(&DState);
+*/
+
+
+/* *****************************************
+*  FSE unsafe API
+*******************************************/
+static unsigned char FSE_decodeSymbolFast(FSE_DState_t* DStatePtr, BIT_DStream_t* bitD);
+/* faster, but works only if nbBits is always >= 1 (otherwise, result will be corrupted) */
+
+
+/* *****************************************
+*  Implementation of inlined functions
+*******************************************/
+typedef struct {
+    int deltaFindState;
+    U32 deltaNbBits;
+} FSE_symbolCompressionTransform; /* total 8 bytes */
+
+MEM_STATIC void FSE_initCState(FSE_CState_t* statePtr, const FSE_CTable* ct)
+{
+    const void* ptr = ct;
+    const U16* u16ptr = (const U16*) ptr;
+    const U32 tableLog = MEM_read16(ptr);
+    statePtr->value = (ptrdiff_t)1<<tableLog;
+    statePtr->stateTable = u16ptr+2;
+    statePtr->symbolTT = ct + 1 + (tableLog ? (1<<(tableLog-1)) : 1);
+    statePtr->stateLog = tableLog;
+}
+
+
+/*! FSE_initCState2() :
+*   Same as FSE_initCState(), but the first symbol to include (which will be the last to be read)
+*   uses the smallest state value possible, saving the cost of this symbol */
+MEM_STATIC void FSE_initCState2(FSE_CState_t* statePtr, const FSE_CTable* ct, U32 symbol)
+{
+    FSE_initCState(statePtr, ct);
+    {   const FSE_symbolCompressionTransform symbolTT = ((const FSE_symbolCompressionTransform*)(statePtr->symbolTT))[symbol];
+        const U16* stateTable = (const U16*)(statePtr->stateTable);
+        U32 nbBitsOut  = (U32)((symbolTT.deltaNbBits + (1<<15)) >> 16);
+        statePtr->value = (nbBitsOut << 16) - symbolTT.deltaNbBits;
+        statePtr->value = stateTable[(statePtr->value >> nbBitsOut) + symbolTT.deltaFindState];
+    }
+}
+
+MEM_STATIC void FSE_encodeSymbol(BIT_CStream_t* bitC, FSE_CState_t* statePtr, unsigned symbol)
+{
+    FSE_symbolCompressionTransform const symbolTT = ((const FSE_symbolCompressionTransform*)(statePtr->symbolTT))[symbol];
+    const U16* const stateTable = (const U16*)(statePtr->stateTable);
+    U32 const nbBitsOut  = (U32)((statePtr->value + symbolTT.deltaNbBits) >> 16);
+    BIT_addBits(bitC, statePtr->value, nbBitsOut);
+    statePtr->value = stateTable[ (statePtr->value >> nbBitsOut) + symbolTT.deltaFindState];
+}
+
+MEM_STATIC void FSE_flushCState(BIT_CStream_t* bitC, const FSE_CState_t* statePtr)
+{
+    BIT_addBits(bitC, statePtr->value, statePtr->stateLog);
+    BIT_flushBits(bitC);
+}
+
+
+/* FSE_getMaxNbBits() :
+ * Approximate maximum cost of a symbol, in bits.
+ * Fractional get rounded up (i.e : a symbol with a normalized frequency of 3 gives the same result as a frequency of 2)
+ * note 1 : assume symbolValue is valid (<= maxSymbolValue)
+ * note 2 : if freq[symbolValue]==0, @return a fake cost of tableLog+1 bits */
+MEM_STATIC U32 FSE_getMaxNbBits(const void* symbolTTPtr, U32 symbolValue)
+{
+    const FSE_symbolCompressionTransform* symbolTT = (const FSE_symbolCompressionTransform*) symbolTTPtr;
+    return (symbolTT[symbolValue].deltaNbBits + ((1<<16)-1)) >> 16;
+}
+
+/* FSE_bitCost() :
+ * Approximate symbol cost, as fractional value, using fixed-point format (accuracyLog fractional bits)
+ * note 1 : assume symbolValue is valid (<= maxSymbolValue)
+ * note 2 : if freq[symbolValue]==0, @return a fake cost of tableLog+1 bits */
+MEM_STATIC U32 FSE_bitCost(const void* symbolTTPtr, U32 tableLog, U32 symbolValue, U32 accuracyLog)
+{
+    const FSE_symbolCompressionTransform* symbolTT = (const FSE_symbolCompressionTransform*) symbolTTPtr;
+    U32 const minNbBits = symbolTT[symbolValue].deltaNbBits >> 16;
+    U32 const threshold = (minNbBits+1) << 16;
+    assert(tableLog < 16);
+    assert(accuracyLog < 31-tableLog);  /* ensure enough room for renormalization double shift */
+    {   U32 const tableSize = 1 << tableLog;
+        U32 const deltaFromThreshold = threshold - (symbolTT[symbolValue].deltaNbBits + tableSize);
+        U32 const normalizedDeltaFromThreshold = (deltaFromThreshold << accuracyLog) >> tableLog;   /* linear interpolation (very approximate) */
+        U32 const bitMultiplier = 1 << accuracyLog;
+        assert(symbolTT[symbolValue].deltaNbBits + tableSize <= threshold);
+        assert(normalizedDeltaFromThreshold <= bitMultiplier);
+        return (minNbBits+1)*bitMultiplier - normalizedDeltaFromThreshold;
+    }
+}
+
+
+/* ======    Decompression    ====== */
+
+typedef struct {
+    U16 tableLog;
+    U16 fastMode;
+} FSE_DTableHeader;   /* sizeof U32 */
+
+typedef struct
+{
+    unsigned short newState;
+    unsigned char  symbol;
+    unsigned char  nbBits;
+} FSE_decode_t;   /* size == U32 */
+
+MEM_STATIC void FSE_initDState(FSE_DState_t* DStatePtr, BIT_DStream_t* bitD, const FSE_DTable* dt)
+{
+    const void* ptr = dt;
+    const FSE_DTableHeader* const DTableH = (const FSE_DTableHeader*)ptr;
+    DStatePtr->state = BIT_readBits(bitD, DTableH->tableLog);
+    BIT_reloadDStream(bitD);
+    DStatePtr->table = dt + 1;
+}
+
+MEM_STATIC BYTE FSE_peekSymbol(const FSE_DState_t* DStatePtr)
+{
+    FSE_decode_t const DInfo = ((const FSE_decode_t*)(DStatePtr->table))[DStatePtr->state];
+    return DInfo.symbol;
+}
+
+MEM_STATIC void FSE_updateState(FSE_DState_t* DStatePtr, BIT_DStream_t* bitD)
+{
+    FSE_decode_t const DInfo = ((const FSE_decode_t*)(DStatePtr->table))[DStatePtr->state];
+    U32 const nbBits = DInfo.nbBits;
+    size_t const lowBits = BIT_readBits(bitD, nbBits);
+    DStatePtr->state = DInfo.newState + lowBits;
+}
+
+MEM_STATIC BYTE FSE_decodeSymbol(FSE_DState_t* DStatePtr, BIT_DStream_t* bitD)
+{
+    FSE_decode_t const DInfo = ((const FSE_decode_t*)(DStatePtr->table))[DStatePtr->state];
+    U32 const nbBits = DInfo.nbBits;
+    BYTE const symbol = DInfo.symbol;
+    size_t const lowBits = BIT_readBits(bitD, nbBits);
+
+    DStatePtr->state = DInfo.newState + lowBits;
+    return symbol;
+}
+
+/*! FSE_decodeSymbolFast() :
+    unsafe, only works if no symbol has a probability > 50% */
+MEM_STATIC BYTE FSE_decodeSymbolFast(FSE_DState_t* DStatePtr, BIT_DStream_t* bitD)
+{
+    FSE_decode_t const DInfo = ((const FSE_decode_t*)(DStatePtr->table))[DStatePtr->state];
+    U32 const nbBits = DInfo.nbBits;
+    BYTE const symbol = DInfo.symbol;
+    size_t const lowBits = BIT_readBitsFast(bitD, nbBits);
+
+    DStatePtr->state = DInfo.newState + lowBits;
+    return symbol;
+}
+
+MEM_STATIC unsigned FSE_endOfDState(const FSE_DState_t* DStatePtr)
+{
+    return DStatePtr->state == 0;
+}
+
+
+
+#ifndef FSE_COMMONDEFS_ONLY
+
+/* **************************************************************
+*  Tuning parameters
+****************************************************************/
+/*!MEMORY_USAGE :
+*  Memory usage formula : N->2^N Bytes (examples : 10 -> 1KB; 12 -> 4KB ; 16 -> 64KB; 20 -> 1MB; etc.)
+*  Increasing memory usage improves compression ratio
+*  Reduced memory usage can improve speed, due to cache effect
+*  Recommended max value is 14, for 16KB, which nicely fits into Intel x86 L1 cache */
+#ifndef FSE_MAX_MEMORY_USAGE
+#  define FSE_MAX_MEMORY_USAGE 14
+#endif
+#ifndef FSE_DEFAULT_MEMORY_USAGE
+#  define FSE_DEFAULT_MEMORY_USAGE 13
+#endif
+#if (FSE_DEFAULT_MEMORY_USAGE > FSE_MAX_MEMORY_USAGE)
+#  error "FSE_DEFAULT_MEMORY_USAGE must be <= FSE_MAX_MEMORY_USAGE"
+#endif
+
+/*!FSE_MAX_SYMBOL_VALUE :
+*  Maximum symbol value authorized.
+*  Required for proper stack allocation */
+#ifndef FSE_MAX_SYMBOL_VALUE
+#  define FSE_MAX_SYMBOL_VALUE 255
+#endif
+
+/* **************************************************************
+*  template functions type & suffix
+****************************************************************/
+#define FSE_FUNCTION_TYPE BYTE
+#define FSE_FUNCTION_EXTENSION
+#define FSE_DECODE_TYPE FSE_decode_t
+
+
+#endif   /* !FSE_COMMONDEFS_ONLY */
+
+
+/* ***************************************************************
+*  Constants
+*****************************************************************/
+#define FSE_MAX_TABLELOG  (FSE_MAX_MEMORY_USAGE-2)
+#define FSE_MAX_TABLESIZE (1U<<FSE_MAX_TABLELOG)
+#define FSE_MAXTABLESIZE_MASK (FSE_MAX_TABLESIZE-1)
+#define FSE_DEFAULT_TABLELOG (FSE_DEFAULT_MEMORY_USAGE-2)
+#define FSE_MIN_TABLELOG 5
+
+#define FSE_TABLELOG_ABSOLUTE_MAX 15
+#if FSE_MAX_TABLELOG > FSE_TABLELOG_ABSOLUTE_MAX
+#  error "FSE_MAX_TABLELOG > FSE_TABLELOG_ABSOLUTE_MAX is not supported"
+#endif
+
+#define FSE_TABLESTEP(tableSize) (((tableSize)>>1) + ((tableSize)>>3) + 3)
+
+
+#endif /* FSE_STATIC_LINKING_ONLY */
+
+
+#if defined (__cplusplus)
+}
+#endif
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/huf.h mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/huf.h
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/huf.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/huf.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,362 @@
+/* ******************************************************************
+ * huff0 huffman codec,
+ * part of Finite State Entropy library
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ *
+ * You can contact the author at :
+ * - Source repository : https://github.com/Cyan4973/FiniteStateEntropy
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+****************************************************************** */
+
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
+#ifndef HUF_H_298734234
+#define HUF_H_298734234
+
+/* *** Dependencies *** */
+#include "zstd_deps.h"    /* size_t */
+
+
+/* *** library symbols visibility *** */
+/* Note : when linking with -fvisibility=hidden on gcc, or by default on Visual,
+ *        HUF symbols remain "private" (internal symbols for library only).
+ *        Set macro FSE_DLL_EXPORT to 1 if you want HUF symbols visible on DLL interface */
+#if defined(FSE_DLL_EXPORT) && (FSE_DLL_EXPORT==1) && defined(__GNUC__) && (__GNUC__ >= 4)
+#  define HUF_PUBLIC_API __attribute__ ((visibility ("default")))
+#elif defined(FSE_DLL_EXPORT) && (FSE_DLL_EXPORT==1)   /* Visual expected */
+#  define HUF_PUBLIC_API __declspec(dllexport)
+#elif defined(FSE_DLL_IMPORT) && (FSE_DLL_IMPORT==1)
+#  define HUF_PUBLIC_API __declspec(dllimport)  /* not required, just to generate faster code (saves a function pointer load from IAT and an indirect jump) */
+#else
+#  define HUF_PUBLIC_API
+#endif
+
+
+/* ========================== */
+/* ***  simple functions  *** */
+/* ========================== */
+
+/** HUF_compress() :
+ *  Compress content from buffer 'src', of size 'srcSize', into buffer 'dst'.
+ * 'dst' buffer must be already allocated.
+ *  Compression runs faster if `dstCapacity` >= HUF_compressBound(srcSize).
+ * `srcSize` must be <= `HUF_BLOCKSIZE_MAX` == 128 KB.
+ * @return : size of compressed data (<= `dstCapacity`).
+ *  Special values : if return == 0, srcData is not compressible => Nothing is stored within dst !!!
+ *                   if HUF_isError(return), compression failed (more details using HUF_getErrorName())
+ */
+HUF_PUBLIC_API size_t HUF_compress(void* dst, size_t dstCapacity,
+                             const void* src, size_t srcSize);
+
+/** HUF_decompress() :
+ *  Decompress HUF data from buffer 'cSrc', of size 'cSrcSize',
+ *  into already allocated buffer 'dst', of minimum size 'dstSize'.
+ * `originalSize` : **must** be the ***exact*** size of original (uncompressed) data.
+ *  Note : in contrast with FSE, HUF_decompress can regenerate
+ *         RLE (cSrcSize==1) and uncompressed (cSrcSize==dstSize) data,
+ *         because it knows size to regenerate (originalSize).
+ * @return : size of regenerated data (== originalSize),
+ *           or an error code, which can be tested using HUF_isError()
+ */
+HUF_PUBLIC_API size_t HUF_decompress(void* dst,  size_t originalSize,
+                               const void* cSrc, size_t cSrcSize);
+
+
+/* ***   Tool functions *** */
+#define HUF_BLOCKSIZE_MAX (128 * 1024)                  /**< maximum input size for a single block compressed with HUF_compress */
+HUF_PUBLIC_API size_t HUF_compressBound(size_t size);   /**< maximum compressed size (worst case) */
+
+/* Error Management */
+HUF_PUBLIC_API unsigned    HUF_isError(size_t code);       /**< tells if a return value is an error code */
+HUF_PUBLIC_API const char* HUF_getErrorName(size_t code);  /**< provides error code string (useful for debugging) */
+
+
+/* ***   Advanced function   *** */
+
+/** HUF_compress2() :
+ *  Same as HUF_compress(), but offers control over `maxSymbolValue` and `tableLog`.
+ * `maxSymbolValue` must be <= HUF_SYMBOLVALUE_MAX .
+ * `tableLog` must be `<= HUF_TABLELOG_MAX` . */
+HUF_PUBLIC_API size_t HUF_compress2 (void* dst, size_t dstCapacity,
+                               const void* src, size_t srcSize,
+                               unsigned maxSymbolValue, unsigned tableLog);
+
+/** HUF_compress4X_wksp() :
+ *  Same as HUF_compress2(), but uses externally allocated `workSpace`.
+ * `workspace` must have minimum alignment of 4, and be at least as large as HUF_WORKSPACE_SIZE */
+#define HUF_WORKSPACE_SIZE ((6 << 10) + 256)
+#define HUF_WORKSPACE_SIZE_U32 (HUF_WORKSPACE_SIZE / sizeof(U32))
+HUF_PUBLIC_API size_t HUF_compress4X_wksp (void* dst, size_t dstCapacity,
+                                     const void* src, size_t srcSize,
+                                     unsigned maxSymbolValue, unsigned tableLog,
+                                     void* workSpace, size_t wkspSize);
+
+#endif   /* HUF_H_298734234 */
+
+/* ******************************************************************
+ *  WARNING !!
+ *  The following section contains advanced and experimental definitions
+ *  which shall never be used in the context of a dynamic library,
+ *  because they are not guaranteed to remain stable in the future.
+ *  Only consider them in association with static linking.
+ * *****************************************************************/
+#if defined(HUF_STATIC_LINKING_ONLY) && !defined(HUF_H_HUF_STATIC_LINKING_ONLY)
+#define HUF_H_HUF_STATIC_LINKING_ONLY
+
+/* *** Dependencies *** */
+#include "mem.h"   /* U32 */
+#define FSE_STATIC_LINKING_ONLY
+#include "fse.h"
+
+
+/* *** Constants *** */
+#define HUF_TABLELOG_MAX      12      /* max runtime value of tableLog (due to static allocation); can be modified up to HUF_ABSOLUTEMAX_TABLELOG */
+#define HUF_TABLELOG_DEFAULT  11      /* default tableLog value when none specified */
+#define HUF_SYMBOLVALUE_MAX  255
+
+#define HUF_TABLELOG_ABSOLUTEMAX  15  /* absolute limit of HUF_MAX_TABLELOG. Beyond that value, code does not work */
+#if (HUF_TABLELOG_MAX > HUF_TABLELOG_ABSOLUTEMAX)
+#  error "HUF_TABLELOG_MAX is too large !"
+#endif
+
+
+/* ****************************************
+*  Static allocation
+******************************************/
+/* HUF buffer bounds */
+#define HUF_CTABLEBOUND 129
+#define HUF_BLOCKBOUND(size) (size + (size>>8) + 8)   /* only true when incompressible is pre-filtered with fast heuristic */
+#define HUF_COMPRESSBOUND(size) (HUF_CTABLEBOUND + HUF_BLOCKBOUND(size))   /* Macro version, useful for static allocation */
+
+/* static allocation of HUF's Compression Table */
+/* this is a private definition, just exposed for allocation and strict aliasing purpose. never EVER access its members directly */
+struct HUF_CElt_s {
+  U16  val;
+  BYTE nbBits;
+};   /* typedef'd to HUF_CElt */
+typedef struct HUF_CElt_s HUF_CElt;   /* consider it an incomplete type */
+#define HUF_CTABLE_SIZE_U32(maxSymbolValue)   ((maxSymbolValue)+1)   /* Use tables of U32, for proper alignment */
+#define HUF_CTABLE_SIZE(maxSymbolValue)       (HUF_CTABLE_SIZE_U32(maxSymbolValue) * sizeof(U32))
+#define HUF_CREATE_STATIC_CTABLE(name, maxSymbolValue) \
+    HUF_CElt name[HUF_CTABLE_SIZE_U32(maxSymbolValue)] /* no final ; */
+
+/* static allocation of HUF's DTable */
+typedef U32 HUF_DTable;
+#define HUF_DTABLE_SIZE(maxTableLog)   (1 + (1<<(maxTableLog)))
+#define HUF_CREATE_STATIC_DTABLEX1(DTable, maxTableLog) \
+        HUF_DTable DTable[HUF_DTABLE_SIZE((maxTableLog)-1)] = { ((U32)((maxTableLog)-1) * 0x01000001) }
+#define HUF_CREATE_STATIC_DTABLEX2(DTable, maxTableLog) \
+        HUF_DTable DTable[HUF_DTABLE_SIZE(maxTableLog)] = { ((U32)(maxTableLog) * 0x01000001) }
+
+
+/* ****************************************
+*  Advanced decompression functions
+******************************************/
+size_t HUF_decompress4X1 (void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize);   /**< single-symbol decoder */
+#ifndef HUF_FORCE_DECOMPRESS_X1
+size_t HUF_decompress4X2 (void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize);   /**< double-symbols decoder */
+#endif
+
+size_t HUF_decompress4X_DCtx (HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize);   /**< decodes RLE and uncompressed */
+size_t HUF_decompress4X_hufOnly(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize); /**< considers RLE and uncompressed as errors */
+size_t HUF_decompress4X_hufOnly_wksp(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize, void* workSpace, size_t wkspSize); /**< considers RLE and uncompressed as errors */
+size_t HUF_decompress4X1_DCtx(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize);   /**< single-symbol decoder */
+size_t HUF_decompress4X1_DCtx_wksp(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize, void* workSpace, size_t wkspSize);   /**< single-symbol decoder */
+#ifndef HUF_FORCE_DECOMPRESS_X1
+size_t HUF_decompress4X2_DCtx(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize);   /**< double-symbols decoder */
+size_t HUF_decompress4X2_DCtx_wksp(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize, void* workSpace, size_t wkspSize);   /**< double-symbols decoder */
+#endif
+
+
+/* ****************************************
+ *  HUF detailed API
+ * ****************************************/
+
+/*! HUF_compress() does the following:
+ *  1. count symbol occurrence from source[] into table count[] using FSE_count() (exposed within "fse.h")
+ *  2. (optional) refine tableLog using HUF_optimalTableLog()
+ *  3. build Huffman table from count using HUF_buildCTable()
+ *  4. save Huffman table to memory buffer using HUF_writeCTable()
+ *  5. encode the data stream using HUF_compress4X_usingCTable()
+ *
+ *  The following API allows targeting specific sub-functions for advanced tasks.
+ *  For example, it's possible to compress several blocks using the same 'CTable',
+ *  or to save and regenerate 'CTable' using external methods.
+ */
+unsigned HUF_optimalTableLog(unsigned maxTableLog, size_t srcSize, unsigned maxSymbolValue);
+size_t HUF_buildCTable (HUF_CElt* CTable, const unsigned* count, unsigned maxSymbolValue, unsigned maxNbBits);   /* @return : maxNbBits; CTable and count can overlap. In which case, CTable will overwrite count content */
+size_t HUF_writeCTable (void* dst, size_t maxDstSize, const HUF_CElt* CTable, unsigned maxSymbolValue, unsigned huffLog);
+size_t HUF_writeCTable_wksp(void* dst, size_t maxDstSize, const HUF_CElt* CTable, unsigned maxSymbolValue, unsigned huffLog, void* workspace, size_t workspaceSize);
+size_t HUF_compress4X_usingCTable(void* dst, size_t dstSize, const void* src, size_t srcSize, const HUF_CElt* CTable);
+size_t HUF_estimateCompressedSize(const HUF_CElt* CTable, const unsigned* count, unsigned maxSymbolValue);
+int HUF_validateCTable(const HUF_CElt* CTable, const unsigned* count, unsigned maxSymbolValue);
+
+typedef enum {
+   HUF_repeat_none,  /**< Cannot use the previous table */
+   HUF_repeat_check, /**< Can use the previous table but it must be checked. Note : The previous table must have been constructed by HUF_compress{1, 4}X_repeat */
+   HUF_repeat_valid  /**< Can use the previous table and it is assumed to be valid */
+ } HUF_repeat;
+/** HUF_compress4X_repeat() :
+ *  Same as HUF_compress4X_wksp(), but considers using hufTable if *repeat != HUF_repeat_none.
+ *  If it uses hufTable it does not modify hufTable or repeat.
+ *  If it doesn't, it sets *repeat = HUF_repeat_none, and it sets hufTable to the table used.
+ *  If preferRepeat then the old table will always be used if valid. */
+size_t HUF_compress4X_repeat(void* dst, size_t dstSize,
+                       const void* src, size_t srcSize,
+                       unsigned maxSymbolValue, unsigned tableLog,
+                       void* workSpace, size_t wkspSize,    /**< `workSpace` must be aligned on 4-bytes boundaries, `wkspSize` must be >= HUF_WORKSPACE_SIZE */
+                       HUF_CElt* hufTable, HUF_repeat* repeat, int preferRepeat, int bmi2);
+
+/** HUF_buildCTable_wksp() :
+ *  Same as HUF_buildCTable(), but using externally allocated scratch buffer.
+ * `workSpace` must be aligned on 4-bytes boundaries, and its size must be >= HUF_CTABLE_WORKSPACE_SIZE.
+ */
+#define HUF_CTABLE_WORKSPACE_SIZE_U32 (2*HUF_SYMBOLVALUE_MAX +1 +1)
+#define HUF_CTABLE_WORKSPACE_SIZE (HUF_CTABLE_WORKSPACE_SIZE_U32 * sizeof(unsigned))
+size_t HUF_buildCTable_wksp (HUF_CElt* tree,
+                       const unsigned* count, U32 maxSymbolValue, U32 maxNbBits,
+                             void* workSpace, size_t wkspSize);
+
+/*! HUF_readStats() :
+ *  Read compact Huffman tree, saved by HUF_writeCTable().
+ * `huffWeight` is destination buffer.
+ * @return : size read from `src` , or an error Code .
+ *  Note : Needed by HUF_readCTable() and HUF_readDTableXn() . */
+size_t HUF_readStats(BYTE* huffWeight, size_t hwSize,
+                     U32* rankStats, U32* nbSymbolsPtr, U32* tableLogPtr,
+                     const void* src, size_t srcSize);
+
+/*! HUF_readStats_wksp() :
+ * Same as HUF_readStats() but takes an external workspace which must be
+ * 4-byte aligned and its size must be >= HUF_READ_STATS_WORKSPACE_SIZE.
+ * If the CPU has BMI2 support, pass bmi2=1, otherwise pass bmi2=0.
+ */
+#define HUF_READ_STATS_WORKSPACE_SIZE_U32 FSE_DECOMPRESS_WKSP_SIZE_U32(6, HUF_TABLELOG_MAX-1)
+#define HUF_READ_STATS_WORKSPACE_SIZE (HUF_READ_STATS_WORKSPACE_SIZE_U32 * sizeof(unsigned))
+size_t HUF_readStats_wksp(BYTE* huffWeight, size_t hwSize,
+                          U32* rankStats, U32* nbSymbolsPtr, U32* tableLogPtr,
+                          const void* src, size_t srcSize,
+                          void* workspace, size_t wkspSize,
+                          int bmi2);
+
+/** HUF_readCTable() :
+ *  Loading a CTable saved with HUF_writeCTable() */
+size_t HUF_readCTable (HUF_CElt* CTable, unsigned* maxSymbolValuePtr, const void* src, size_t srcSize, unsigned *hasZeroWeights);
+
+/** HUF_getNbBits() :
+ *  Read nbBits from CTable symbolTable, for symbol `symbolValue` presumed <= HUF_SYMBOLVALUE_MAX
+ *  Note 1 : is not inlined, as HUF_CElt definition is private
+ *  Note 2 : const void* used, so that it can provide a statically allocated table as argument (which uses type U32) */
+U32 HUF_getNbBits(const void* symbolTable, U32 symbolValue);
+
+/*
+ * HUF_decompress() does the following:
+ * 1. select the decompression algorithm (X1, X2) based on pre-computed heuristics
+ * 2. build Huffman table from save, using HUF_readDTableX?()
+ * 3. decode 1 or 4 segments in parallel using HUF_decompress?X?_usingDTable()
+ */
+
+/** HUF_selectDecoder() :
+ *  Tells which decoder is likely to decode faster,
+ *  based on a set of pre-computed metrics.
+ * @return : 0==HUF_decompress4X1, 1==HUF_decompress4X2 .
+ *  Assumption : 0 < dstSize <= 128 KB */
+U32 HUF_selectDecoder (size_t dstSize, size_t cSrcSize);
+
+/**
+ *  The minimum workspace size for the `workSpace` used in
+ *  HUF_readDTableX1_wksp() and HUF_readDTableX2_wksp().
+ *
+ *  The space used depends on HUF_TABLELOG_MAX, ranging from ~1500 bytes when
+ *  HUF_TABLE_LOG_MAX=12 to ~1850 bytes when HUF_TABLE_LOG_MAX=15.
+ *  Buffer overflow errors may potentially occur if code modifications result in
+ *  a required workspace size greater than that specified in the following
+ *  macro.
+ */
+#define HUF_DECOMPRESS_WORKSPACE_SIZE ((2 << 10) + (1 << 9))
+#define HUF_DECOMPRESS_WORKSPACE_SIZE_U32 (HUF_DECOMPRESS_WORKSPACE_SIZE / sizeof(U32))
+
+#ifndef HUF_FORCE_DECOMPRESS_X2
+size_t HUF_readDTableX1 (HUF_DTable* DTable, const void* src, size_t srcSize);
+size_t HUF_readDTableX1_wksp (HUF_DTable* DTable, const void* src, size_t srcSize, void* workSpace, size_t wkspSize);
+#endif
+#ifndef HUF_FORCE_DECOMPRESS_X1
+size_t HUF_readDTableX2 (HUF_DTable* DTable, const void* src, size_t srcSize);
+size_t HUF_readDTableX2_wksp (HUF_DTable* DTable, const void* src, size_t srcSize, void* workSpace, size_t wkspSize);
+#endif
+
+size_t HUF_decompress4X_usingDTable(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const HUF_DTable* DTable);
+#ifndef HUF_FORCE_DECOMPRESS_X2
+size_t HUF_decompress4X1_usingDTable(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const HUF_DTable* DTable);
+#endif
+#ifndef HUF_FORCE_DECOMPRESS_X1
+size_t HUF_decompress4X2_usingDTable(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const HUF_DTable* DTable);
+#endif
+
+
+/* ====================== */
+/* single stream variants */
+/* ====================== */
+
+size_t HUF_compress1X (void* dst, size_t dstSize, const void* src, size_t srcSize, unsigned maxSymbolValue, unsigned tableLog);
+size_t HUF_compress1X_wksp (void* dst, size_t dstSize, const void* src, size_t srcSize, unsigned maxSymbolValue, unsigned tableLog, void* workSpace, size_t wkspSize);  /**< `workSpace` must be a table of at least HUF_WORKSPACE_SIZE_U32 unsigned */
+size_t HUF_compress1X_usingCTable(void* dst, size_t dstSize, const void* src, size_t srcSize, const HUF_CElt* CTable);
+/** HUF_compress1X_repeat() :
+ *  Same as HUF_compress1X_wksp(), but considers using hufTable if *repeat != HUF_repeat_none.
+ *  If it uses hufTable it does not modify hufTable or repeat.
+ *  If it doesn't, it sets *repeat = HUF_repeat_none, and it sets hufTable to the table used.
+ *  If preferRepeat then the old table will always be used if valid. */
+size_t HUF_compress1X_repeat(void* dst, size_t dstSize,
+                       const void* src, size_t srcSize,
+                       unsigned maxSymbolValue, unsigned tableLog,
+                       void* workSpace, size_t wkspSize,   /**< `workSpace` must be aligned on 4-bytes boundaries, `wkspSize` must be >= HUF_WORKSPACE_SIZE */
+                       HUF_CElt* hufTable, HUF_repeat* repeat, int preferRepeat, int bmi2);
+
+size_t HUF_decompress1X1 (void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize);   /* single-symbol decoder */
+#ifndef HUF_FORCE_DECOMPRESS_X1
+size_t HUF_decompress1X2 (void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize);   /* double-symbol decoder */
+#endif
+
+size_t HUF_decompress1X_DCtx (HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize);
+size_t HUF_decompress1X_DCtx_wksp (HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize, void* workSpace, size_t wkspSize);
+#ifndef HUF_FORCE_DECOMPRESS_X2
+size_t HUF_decompress1X1_DCtx(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize);   /**< single-symbol decoder */
+size_t HUF_decompress1X1_DCtx_wksp(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize, void* workSpace, size_t wkspSize);   /**< single-symbol decoder */
+#endif
+#ifndef HUF_FORCE_DECOMPRESS_X1
+size_t HUF_decompress1X2_DCtx(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize);   /**< double-symbols decoder */
+size_t HUF_decompress1X2_DCtx_wksp(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize, void* workSpace, size_t wkspSize);   /**< double-symbols decoder */
+#endif
+
+size_t HUF_decompress1X_usingDTable(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const HUF_DTable* DTable);   /**< automatic selection of sing or double symbol decoder, based on DTable */
+#ifndef HUF_FORCE_DECOMPRESS_X2
+size_t HUF_decompress1X1_usingDTable(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const HUF_DTable* DTable);
+#endif
+#ifndef HUF_FORCE_DECOMPRESS_X1
+size_t HUF_decompress1X2_usingDTable(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const HUF_DTable* DTable);
+#endif
+
+/* BMI2 variants.
+ * If the CPU has BMI2 support, pass bmi2=1, otherwise pass bmi2=0.
+ */
+size_t HUF_decompress1X_usingDTable_bmi2(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const HUF_DTable* DTable, int bmi2);
+#ifndef HUF_FORCE_DECOMPRESS_X2
+size_t HUF_decompress1X1_DCtx_wksp_bmi2(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize, void* workSpace, size_t wkspSize, int bmi2);
+#endif
+size_t HUF_decompress4X_usingDTable_bmi2(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const HUF_DTable* DTable, int bmi2);
+size_t HUF_decompress4X_hufOnly_wksp_bmi2(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize, void* workSpace, size_t wkspSize, int bmi2);
+#ifndef HUF_FORCE_DECOMPRESS_X2
+size_t HUF_readDTableX1_wksp_bmi2(HUF_DTable* DTable, const void* src, size_t srcSize, void* workSpace, size_t wkspSize, int bmi2);
+#endif
+
+#endif /* HUF_STATIC_LINKING_ONLY */
+
+#if defined (__cplusplus)
+}
+#endif
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/mem.h mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/mem.h
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/mem.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/mem.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,424 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+#ifndef MEM_H_MODULE
+#define MEM_H_MODULE
+
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
+/*-****************************************
+*  Dependencies
+******************************************/
+#include <stddef.h>  /* size_t, ptrdiff_t */
+#include "compiler.h"  /* __has_builtin */
+#include "debug.h"  /* DEBUG_STATIC_ASSERT */
+#include "zstd_deps.h"  /* ZSTD_memcpy */
+
+
+/*-****************************************
+*  Compiler specifics
+******************************************/
+#if defined(_MSC_VER)   /* Visual Studio */
+#   include <stdlib.h>  /* _byteswap_ulong */
+#   include <intrin.h>  /* _byteswap_* */
+#endif
+#if defined(__GNUC__)
+#  define MEM_STATIC static __inline __attribute__((unused))
+#elif defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */)
+#  define MEM_STATIC static inline
+#elif defined(_MSC_VER)
+#  define MEM_STATIC static __inline
+#else
+#  define MEM_STATIC static  /* this version may generate warnings for unused static functions; disable the relevant warning */
+#endif
+
+/*-**************************************************************
+*  Basic Types
+*****************************************************************/
+#if  !defined (__VMS) && (defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) )
+#  if defined(_AIX)
+#    include <inttypes.h>
+#  else
+#    include <stdint.h> /* intptr_t */
+#  endif
+  typedef   uint8_t BYTE;
+  typedef  uint16_t U16;
+  typedef   int16_t S16;
+  typedef  uint32_t U32;
+  typedef   int32_t S32;
+  typedef  uint64_t U64;
+  typedef   int64_t S64;
+#else
+# include <limits.h>
+#if CHAR_BIT != 8
+#  error "this implementation requires char to be exactly 8-bit type"
+#endif
+  typedef unsigned char      BYTE;
+#if USHRT_MAX != 65535
+#  error "this implementation requires short to be exactly 16-bit type"
+#endif
+  typedef unsigned short      U16;
+  typedef   signed short      S16;
+#if UINT_MAX != 4294967295
+#  error "this implementation requires int to be exactly 32-bit type"
+#endif
+  typedef unsigned int        U32;
+  typedef   signed int        S32;
+/* note : there are no limits defined for long long type in C90.
+ * limits exist in C99, however, in such case, <stdint.h> is preferred */
+  typedef unsigned long long  U64;
+  typedef   signed long long  S64;
+#endif
+
+
+/*-**************************************************************
+*  Memory I/O API
+*****************************************************************/
+/*=== Static platform detection ===*/
+MEM_STATIC unsigned MEM_32bits(void);
+MEM_STATIC unsigned MEM_64bits(void);
+MEM_STATIC unsigned MEM_isLittleEndian(void);
+
+/*=== Native unaligned read/write ===*/
+MEM_STATIC U16 MEM_read16(const void* memPtr);
+MEM_STATIC U32 MEM_read32(const void* memPtr);
+MEM_STATIC U64 MEM_read64(const void* memPtr);
+MEM_STATIC size_t MEM_readST(const void* memPtr);
+
+MEM_STATIC void MEM_write16(void* memPtr, U16 value);
+MEM_STATIC void MEM_write32(void* memPtr, U32 value);
+MEM_STATIC void MEM_write64(void* memPtr, U64 value);
+
+/*=== Little endian unaligned read/write ===*/
+MEM_STATIC U16 MEM_readLE16(const void* memPtr);
+MEM_STATIC U32 MEM_readLE24(const void* memPtr);
+MEM_STATIC U32 MEM_readLE32(const void* memPtr);
+MEM_STATIC U64 MEM_readLE64(const void* memPtr);
+MEM_STATIC size_t MEM_readLEST(const void* memPtr);
+
+MEM_STATIC void MEM_writeLE16(void* memPtr, U16 val);
+MEM_STATIC void MEM_writeLE24(void* memPtr, U32 val);
+MEM_STATIC void MEM_writeLE32(void* memPtr, U32 val32);
+MEM_STATIC void MEM_writeLE64(void* memPtr, U64 val64);
+MEM_STATIC void MEM_writeLEST(void* memPtr, size_t val);
+
+/*=== Big endian unaligned read/write ===*/
+MEM_STATIC U32 MEM_readBE32(const void* memPtr);
+MEM_STATIC U64 MEM_readBE64(const void* memPtr);
+MEM_STATIC size_t MEM_readBEST(const void* memPtr);
+
+MEM_STATIC void MEM_writeBE32(void* memPtr, U32 val32);
+MEM_STATIC void MEM_writeBE64(void* memPtr, U64 val64);
+MEM_STATIC void MEM_writeBEST(void* memPtr, size_t val);
+
+/*=== Byteswap ===*/
+MEM_STATIC U32 MEM_swap32(U32 in);
+MEM_STATIC U64 MEM_swap64(U64 in);
+MEM_STATIC size_t MEM_swapST(size_t in);
+
+
+/*-**************************************************************
+*  Memory I/O Implementation
+*****************************************************************/
+/* MEM_FORCE_MEMORY_ACCESS :
+ * By default, access to unaligned memory is controlled by `memcpy()`, which is safe and portable.
+ * Unfortunately, on some target/compiler combinations, the generated assembly is sub-optimal.
+ * The below switch allow to select different access method for improved performance.
+ * Method 0 (default) : use `memcpy()`. Safe and portable.
+ * Method 1 : `__packed` statement. It depends on compiler extension (i.e., not portable).
+ *            This method is safe if your compiler supports it, and *generally* as fast or faster than `memcpy`.
+ * Method 2 : direct access. This method is portable but violate C standard.
+ *            It can generate buggy code on targets depending on alignment.
+ *            In some circumstances, it's the only known way to get the most performance (i.e. GCC + ARMv6)
+ * See http://fastcompression.blogspot.fr/2015/08/accessing-unaligned-memory.html for details.
+ * Prefer these methods in priority order (0 > 1 > 2)
+ */
+#ifndef MEM_FORCE_MEMORY_ACCESS   /* can be defined externally, on command line for example */
+#  if defined(__INTEL_COMPILER) || defined(__GNUC__) || defined(__ICCARM__)
+#    define MEM_FORCE_MEMORY_ACCESS 1
+#  endif
+#endif
+
+MEM_STATIC unsigned MEM_32bits(void) { return sizeof(size_t)==4; }
+MEM_STATIC unsigned MEM_64bits(void) { return sizeof(size_t)==8; }
+
+MEM_STATIC unsigned MEM_isLittleEndian(void)
+{
+    const union { U32 u; BYTE c[4]; } one = { 1 };   /* don't use static : performance detrimental  */
+    return one.c[0];
+}
+
+#if defined(MEM_FORCE_MEMORY_ACCESS) && (MEM_FORCE_MEMORY_ACCESS==2)
+
+/* violates C standard, by lying on structure alignment.
+Only use if no other choice to achieve best performance on target platform */
+MEM_STATIC U16 MEM_read16(const void* memPtr) { return *(const U16*) memPtr; }
+MEM_STATIC U32 MEM_read32(const void* memPtr) { return *(const U32*) memPtr; }
+MEM_STATIC U64 MEM_read64(const void* memPtr) { return *(const U64*) memPtr; }
+MEM_STATIC size_t MEM_readST(const void* memPtr) { return *(const size_t*) memPtr; }
+
+MEM_STATIC void MEM_write16(void* memPtr, U16 value) { *(U16*)memPtr = value; }
+MEM_STATIC void MEM_write32(void* memPtr, U32 value) { *(U32*)memPtr = value; }
+MEM_STATIC void MEM_write64(void* memPtr, U64 value) { *(U64*)memPtr = value; }
+
+#elif defined(MEM_FORCE_MEMORY_ACCESS) && (MEM_FORCE_MEMORY_ACCESS==1)
+
+/* __pack instructions are safer, but compiler specific, hence potentially problematic for some compilers */
+/* currently only defined for gcc and icc */
+#if defined(_MSC_VER) || (defined(__INTEL_COMPILER) && defined(WIN32))
+    __pragma( pack(push, 1) )
+    typedef struct { U16 v; } unalign16;
+    typedef struct { U32 v; } unalign32;
+    typedef struct { U64 v; } unalign64;
+    typedef struct { size_t v; } unalignArch;
+    __pragma( pack(pop) )
+#else
+    typedef struct { U16 v; } __attribute__((packed)) unalign16;
+    typedef struct { U32 v; } __attribute__((packed)) unalign32;
+    typedef struct { U64 v; } __attribute__((packed)) unalign64;
+    typedef struct { size_t v; } __attribute__((packed)) unalignArch;
+#endif
+
+MEM_STATIC U16 MEM_read16(const void* ptr) { return ((const unalign16*)ptr)->v; }
+MEM_STATIC U32 MEM_read32(const void* ptr) { return ((const unalign32*)ptr)->v; }
+MEM_STATIC U64 MEM_read64(const void* ptr) { return ((const unalign64*)ptr)->v; }
+MEM_STATIC size_t MEM_readST(const void* ptr) { return ((const unalignArch*)ptr)->v; }
+
+MEM_STATIC void MEM_write16(void* memPtr, U16 value) { ((unalign16*)memPtr)->v = value; }
+MEM_STATIC void MEM_write32(void* memPtr, U32 value) { ((unalign32*)memPtr)->v = value; }
+MEM_STATIC void MEM_write64(void* memPtr, U64 value) { ((unalign64*)memPtr)->v = value; }
+
+#else
+
+/* default method, safe and standard.
+   can sometimes prove slower */
+
+MEM_STATIC U16 MEM_read16(const void* memPtr)
+{
+    U16 val; ZSTD_memcpy(&val, memPtr, sizeof(val)); return val;
+}
+
+MEM_STATIC U32 MEM_read32(const void* memPtr)
+{
+    U32 val; ZSTD_memcpy(&val, memPtr, sizeof(val)); return val;
+}
+
+MEM_STATIC U64 MEM_read64(const void* memPtr)
+{
+    U64 val; ZSTD_memcpy(&val, memPtr, sizeof(val)); return val;
+}
+
+MEM_STATIC size_t MEM_readST(const void* memPtr)
+{
+    size_t val; ZSTD_memcpy(&val, memPtr, sizeof(val)); return val;
+}
+
+MEM_STATIC void MEM_write16(void* memPtr, U16 value)
+{
+    ZSTD_memcpy(memPtr, &value, sizeof(value));
+}
+
+MEM_STATIC void MEM_write32(void* memPtr, U32 value)
+{
+    ZSTD_memcpy(memPtr, &value, sizeof(value));
+}
+
+MEM_STATIC void MEM_write64(void* memPtr, U64 value)
+{
+    ZSTD_memcpy(memPtr, &value, sizeof(value));
+}
+
+#endif /* MEM_FORCE_MEMORY_ACCESS */
+
+MEM_STATIC U32 MEM_swap32(U32 in)
+{
+#if defined(_MSC_VER)     /* Visual Studio */
+    return _byteswap_ulong(in);
+#elif (defined (__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 403)) \
+  || (defined(__clang__) && __has_builtin(__builtin_bswap32))
+    return __builtin_bswap32(in);
+#else
+    return  ((in << 24) & 0xff000000 ) |
+            ((in <<  8) & 0x00ff0000 ) |
+            ((in >>  8) & 0x0000ff00 ) |
+            ((in >> 24) & 0x000000ff );
+#endif
+}
+
+MEM_STATIC U64 MEM_swap64(U64 in)
+{
+#if defined(_MSC_VER)     /* Visual Studio */
+    return _byteswap_uint64(in);
+#elif (defined (__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 403)) \
+  || (defined(__clang__) && __has_builtin(__builtin_bswap64))
+    return __builtin_bswap64(in);
+#else
+    return  ((in << 56) & 0xff00000000000000ULL) |
+            ((in << 40) & 0x00ff000000000000ULL) |
+            ((in << 24) & 0x0000ff0000000000ULL) |
+            ((in << 8)  & 0x000000ff00000000ULL) |
+            ((in >> 8)  & 0x00000000ff000000ULL) |
+            ((in >> 24) & 0x0000000000ff0000ULL) |
+            ((in >> 40) & 0x000000000000ff00ULL) |
+            ((in >> 56) & 0x00000000000000ffULL);
+#endif
+}
+
+MEM_STATIC size_t MEM_swapST(size_t in)
+{
+    if (MEM_32bits())
+        return (size_t)MEM_swap32((U32)in);
+    else
+        return (size_t)MEM_swap64((U64)in);
+}
+
+/*=== Little endian r/w ===*/
+
+MEM_STATIC U16 MEM_readLE16(const void* memPtr)
+{
+    if (MEM_isLittleEndian())
+        return MEM_read16(memPtr);
+    else {
+        const BYTE* p = (const BYTE*)memPtr;
+        return (U16)(p[0] + (p[1]<<8));
+    }
+}
+
+MEM_STATIC void MEM_writeLE16(void* memPtr, U16 val)
+{
+    if (MEM_isLittleEndian()) {
+        MEM_write16(memPtr, val);
+    } else {
+        BYTE* p = (BYTE*)memPtr;
+        p[0] = (BYTE)val;
+        p[1] = (BYTE)(val>>8);
+    }
+}
+
+MEM_STATIC U32 MEM_readLE24(const void* memPtr)
+{
+    return (U32)MEM_readLE16(memPtr) + ((U32)(((const BYTE*)memPtr)[2]) << 16);
+}
+
+MEM_STATIC void MEM_writeLE24(void* memPtr, U32 val)
+{
+    MEM_writeLE16(memPtr, (U16)val);
+    ((BYTE*)memPtr)[2] = (BYTE)(val>>16);
+}
+
+MEM_STATIC U32 MEM_readLE32(const void* memPtr)
+{
+    if (MEM_isLittleEndian())
+        return MEM_read32(memPtr);
+    else
+        return MEM_swap32(MEM_read32(memPtr));
+}
+
+MEM_STATIC void MEM_writeLE32(void* memPtr, U32 val32)
+{
+    if (MEM_isLittleEndian())
+        MEM_write32(memPtr, val32);
+    else
+        MEM_write32(memPtr, MEM_swap32(val32));
+}
+
+MEM_STATIC U64 MEM_readLE64(const void* memPtr)
+{
+    if (MEM_isLittleEndian())
+        return MEM_read64(memPtr);
+    else
+        return MEM_swap64(MEM_read64(memPtr));
+}
+
+MEM_STATIC void MEM_writeLE64(void* memPtr, U64 val64)
+{
+    if (MEM_isLittleEndian())
+        MEM_write64(memPtr, val64);
+    else
+        MEM_write64(memPtr, MEM_swap64(val64));
+}
+
+MEM_STATIC size_t MEM_readLEST(const void* memPtr)
+{
+    if (MEM_32bits())
+        return (size_t)MEM_readLE32(memPtr);
+    else
+        return (size_t)MEM_readLE64(memPtr);
+}
+
+MEM_STATIC void MEM_writeLEST(void* memPtr, size_t val)
+{
+    if (MEM_32bits())
+        MEM_writeLE32(memPtr, (U32)val);
+    else
+        MEM_writeLE64(memPtr, (U64)val);
+}
+
+/*=== Big endian r/w ===*/
+
+MEM_STATIC U32 MEM_readBE32(const void* memPtr)
+{
+    if (MEM_isLittleEndian())
+        return MEM_swap32(MEM_read32(memPtr));
+    else
+        return MEM_read32(memPtr);
+}
+
+MEM_STATIC void MEM_writeBE32(void* memPtr, U32 val32)
+{
+    if (MEM_isLittleEndian())
+        MEM_write32(memPtr, MEM_swap32(val32));
+    else
+        MEM_write32(memPtr, val32);
+}
+
+MEM_STATIC U64 MEM_readBE64(const void* memPtr)
+{
+    if (MEM_isLittleEndian())
+        return MEM_swap64(MEM_read64(memPtr));
+    else
+        return MEM_read64(memPtr);
+}
+
+MEM_STATIC void MEM_writeBE64(void* memPtr, U64 val64)
+{
+    if (MEM_isLittleEndian())
+        MEM_write64(memPtr, MEM_swap64(val64));
+    else
+        MEM_write64(memPtr, val64);
+}
+
+MEM_STATIC size_t MEM_readBEST(const void* memPtr)
+{
+    if (MEM_32bits())
+        return (size_t)MEM_readBE32(memPtr);
+    else
+        return (size_t)MEM_readBE64(memPtr);
+}
+
+MEM_STATIC void MEM_writeBEST(void* memPtr, size_t val)
+{
+    if (MEM_32bits())
+        MEM_writeBE32(memPtr, (U32)val);
+    else
+        MEM_writeBE64(memPtr, (U64)val);
+}
+
+/* code only tested on 32 and 64 bits systems */
+MEM_STATIC void MEM_check(void) { DEBUG_STATIC_ASSERT((sizeof(size_t)==4) || (sizeof(size_t)==8)); }
+
+
+#if defined (__cplusplus)
+}
+#endif
+
+#endif /* MEM_H_MODULE */
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/pool.c mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/pool.c
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/pool.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/pool.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,350 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+
+/* ======   Dependencies   ======= */
+#include "zstd_deps.h" /* size_t */
+#include "debug.h"     /* assert */
+#include "zstd_internal.h"  /* ZSTD_customMalloc, ZSTD_customFree */
+#include "pool.h"
+
+/* ======   Compiler specifics   ====== */
+#if defined(_MSC_VER)
+#  pragma warning(disable : 4204)        /* disable: C4204: non-constant aggregate initializer */
+#endif
+
+
+#ifdef ZSTD_MULTITHREAD
+
+#include "threading.h"   /* pthread adaptation */
+
+/* A job is a function and an opaque argument */
+typedef struct POOL_job_s {
+    POOL_function function;
+    void *opaque;
+} POOL_job;
+
+struct POOL_ctx_s {
+    ZSTD_customMem customMem;
+    /* Keep track of the threads */
+    ZSTD_pthread_t* threads;
+    size_t threadCapacity;
+    size_t threadLimit;
+
+    /* The queue is a circular buffer */
+    POOL_job *queue;
+    size_t queueHead;
+    size_t queueTail;
+    size_t queueSize;
+
+    /* The number of threads working on jobs */
+    size_t numThreadsBusy;
+    /* Indicates if the queue is empty */
+    int queueEmpty;
+
+    /* The mutex protects the queue */
+    ZSTD_pthread_mutex_t queueMutex;
+    /* Condition variable for pushers to wait on when the queue is full */
+    ZSTD_pthread_cond_t queuePushCond;
+    /* Condition variables for poppers to wait on when the queue is empty */
+    ZSTD_pthread_cond_t queuePopCond;
+    /* Indicates if the queue is shutting down */
+    int shutdown;
+};
+
+/* POOL_thread() :
+ * Work thread for the thread pool.
+ * Waits for jobs and executes them.
+ * @returns : NULL on failure else non-null.
+ */
+static void* POOL_thread(void* opaque) {
+    POOL_ctx* const ctx = (POOL_ctx*)opaque;
+    if (!ctx) { return NULL; }
+    for (;;) {
+        /* Lock the mutex and wait for a non-empty queue or until shutdown */
+        ZSTD_pthread_mutex_lock(&ctx->queueMutex);
+
+        while ( ctx->queueEmpty
+            || (ctx->numThreadsBusy >= ctx->threadLimit) ) {
+            if (ctx->shutdown) {
+                /* even if !queueEmpty, (possible if numThreadsBusy >= threadLimit),
+                 * a few threads will be shutdown while !queueEmpty,
+                 * but enough threads will remain active to finish the queue */
+                ZSTD_pthread_mutex_unlock(&ctx->queueMutex);
+                return opaque;
+            }
+            ZSTD_pthread_cond_wait(&ctx->queuePopCond, &ctx->queueMutex);
+        }
+        /* Pop a job off the queue */
+        {   POOL_job const job = ctx->queue[ctx->queueHead];
+            ctx->queueHead = (ctx->queueHead + 1) % ctx->queueSize;
+            ctx->numThreadsBusy++;
+            ctx->queueEmpty = ctx->queueHead == ctx->queueTail;
+            /* Unlock the mutex, signal a pusher, and run the job */
+            ZSTD_pthread_cond_signal(&ctx->queuePushCond);
+            ZSTD_pthread_mutex_unlock(&ctx->queueMutex);
+
+            job.function(job.opaque);
+
+            /* If the intended queue size was 0, signal after finishing job */
+            ZSTD_pthread_mutex_lock(&ctx->queueMutex);
+            ctx->numThreadsBusy--;
+            if (ctx->queueSize == 1) {
+                ZSTD_pthread_cond_signal(&ctx->queuePushCond);
+            }
+            ZSTD_pthread_mutex_unlock(&ctx->queueMutex);
+        }
+    }  /* for (;;) */
+    assert(0);  /* Unreachable */
+}
+
+POOL_ctx* ZSTD_createThreadPool(size_t numThreads) {
+    return POOL_create (numThreads, 0);
+}
+
+POOL_ctx* POOL_create(size_t numThreads, size_t queueSize) {
+    return POOL_create_advanced(numThreads, queueSize, ZSTD_defaultCMem);
+}
+
+POOL_ctx* POOL_create_advanced(size_t numThreads, size_t queueSize,
+                               ZSTD_customMem customMem) {
+    POOL_ctx* ctx;
+    /* Check parameters */
+    if (!numThreads) { return NULL; }
+    /* Allocate the context and zero initialize */
+    ctx = (POOL_ctx*)ZSTD_customCalloc(sizeof(POOL_ctx), customMem);
+    if (!ctx) { return NULL; }
+    /* Initialize the job queue.
+     * It needs one extra space since one space is wasted to differentiate
+     * empty and full queues.
+     */
+    ctx->queueSize = queueSize + 1;
+    ctx->queue = (POOL_job*)ZSTD_customMalloc(ctx->queueSize * sizeof(POOL_job), customMem);
+    ctx->queueHead = 0;
+    ctx->queueTail = 0;
+    ctx->numThreadsBusy = 0;
+    ctx->queueEmpty = 1;
+    {
+        int error = 0;
+        error |= ZSTD_pthread_mutex_init(&ctx->queueMutex, NULL);
+        error |= ZSTD_pthread_cond_init(&ctx->queuePushCond, NULL);
+        error |= ZSTD_pthread_cond_init(&ctx->queuePopCond, NULL);
+        if (error) { POOL_free(ctx); return NULL; }
+    }
+    ctx->shutdown = 0;
+    /* Allocate space for the thread handles */
+    ctx->threads = (ZSTD_pthread_t*)ZSTD_customMalloc(numThreads * sizeof(ZSTD_pthread_t), customMem);
+    ctx->threadCapacity = 0;
+    ctx->customMem = customMem;
+    /* Check for errors */
+    if (!ctx->threads || !ctx->queue) { POOL_free(ctx); return NULL; }
+    /* Initialize the threads */
+    {   size_t i;
+        for (i = 0; i < numThreads; ++i) {
+            if (ZSTD_pthread_create(&ctx->threads[i], NULL, &POOL_thread, ctx)) {
+                ctx->threadCapacity = i;
+                POOL_free(ctx);
+                return NULL;
+        }   }
+        ctx->threadCapacity = numThreads;
+        ctx->threadLimit = numThreads;
+    }
+    return ctx;
+}
+
+/*! POOL_join() :
+    Shutdown the queue, wake any sleeping threads, and join all of the threads.
+*/
+static void POOL_join(POOL_ctx* ctx) {
+    /* Shut down the queue */
+    ZSTD_pthread_mutex_lock(&ctx->queueMutex);
+    ctx->shutdown = 1;
+    ZSTD_pthread_mutex_unlock(&ctx->queueMutex);
+    /* Wake up sleeping threads */
+    ZSTD_pthread_cond_broadcast(&ctx->queuePushCond);
+    ZSTD_pthread_cond_broadcast(&ctx->queuePopCond);
+    /* Join all of the threads */
+    {   size_t i;
+        for (i = 0; i < ctx->threadCapacity; ++i) {
+            ZSTD_pthread_join(ctx->threads[i], NULL);  /* note : could fail */
+    }   }
+}
+
+void POOL_free(POOL_ctx *ctx) {
+    if (!ctx) { return; }
+    POOL_join(ctx);
+    ZSTD_pthread_mutex_destroy(&ctx->queueMutex);
+    ZSTD_pthread_cond_destroy(&ctx->queuePushCond);
+    ZSTD_pthread_cond_destroy(&ctx->queuePopCond);
+    ZSTD_customFree(ctx->queue, ctx->customMem);
+    ZSTD_customFree(ctx->threads, ctx->customMem);
+    ZSTD_customFree(ctx, ctx->customMem);
+}
+
+void ZSTD_freeThreadPool (ZSTD_threadPool* pool) {
+  POOL_free (pool);
+}
+
+size_t POOL_sizeof(POOL_ctx *ctx) {
+    if (ctx==NULL) return 0;  /* supports sizeof NULL */
+    return sizeof(*ctx)
+        + ctx->queueSize * sizeof(POOL_job)
+        + ctx->threadCapacity * sizeof(ZSTD_pthread_t);
+}
+
+
+/* @return : 0 on success, 1 on error */
+static int POOL_resize_internal(POOL_ctx* ctx, size_t numThreads)
+{
+    if (numThreads <= ctx->threadCapacity) {
+        if (!numThreads) return 1;
+        ctx->threadLimit = numThreads;
+        return 0;
+    }
+    /* numThreads > threadCapacity */
+    {   ZSTD_pthread_t* const threadPool = (ZSTD_pthread_t*)ZSTD_customMalloc(numThreads * sizeof(ZSTD_pthread_t), ctx->customMem);
+        if (!threadPool) return 1;
+        /* replace existing thread pool */
+        ZSTD_memcpy(threadPool, ctx->threads, ctx->threadCapacity * sizeof(*threadPool));
+        ZSTD_customFree(ctx->threads, ctx->customMem);
+        ctx->threads = threadPool;
+        /* Initialize additional threads */
+        {   size_t threadId;
+            for (threadId = ctx->threadCapacity; threadId < numThreads; ++threadId) {
+                if (ZSTD_pthread_create(&threadPool[threadId], NULL, &POOL_thread, ctx)) {
+                    ctx->threadCapacity = threadId;
+                    return 1;
+            }   }
+    }   }
+    /* successfully expanded */
+    ctx->threadCapacity = numThreads;
+    ctx->threadLimit = numThreads;
+    return 0;
+}
+
+/* @return : 0 on success, 1 on error */
+int POOL_resize(POOL_ctx* ctx, size_t numThreads)
+{
+    int result;
+    if (ctx==NULL) return 1;
+    ZSTD_pthread_mutex_lock(&ctx->queueMutex);
+    result = POOL_resize_internal(ctx, numThreads);
+    ZSTD_pthread_cond_broadcast(&ctx->queuePopCond);
+    ZSTD_pthread_mutex_unlock(&ctx->queueMutex);
+    return result;
+}
+
+/**
+ * Returns 1 if the queue is full and 0 otherwise.
+ *
+ * When queueSize is 1 (pool was created with an intended queueSize of 0),
+ * then a queue is empty if there is a thread free _and_ no job is waiting.
+ */
+static int isQueueFull(POOL_ctx const* ctx) {
+    if (ctx->queueSize > 1) {
+        return ctx->queueHead == ((ctx->queueTail + 1) % ctx->queueSize);
+    } else {
+        return (ctx->numThreadsBusy == ctx->threadLimit) ||
+               !ctx->queueEmpty;
+    }
+}
+
+
+static void POOL_add_internal(POOL_ctx* ctx, POOL_function function, void *opaque)
+{
+    POOL_job const job = {function, opaque};
+    assert(ctx != NULL);
+    if (ctx->shutdown) return;
+
+    ctx->queueEmpty = 0;
+    ctx->queue[ctx->queueTail] = job;
+    ctx->queueTail = (ctx->queueTail + 1) % ctx->queueSize;
+    ZSTD_pthread_cond_signal(&ctx->queuePopCond);
+}
+
+void POOL_add(POOL_ctx* ctx, POOL_function function, void* opaque)
+{
+    assert(ctx != NULL);
+    ZSTD_pthread_mutex_lock(&ctx->queueMutex);
+    /* Wait until there is space in the queue for the new job */
+    while (isQueueFull(ctx) && (!ctx->shutdown)) {
+        ZSTD_pthread_cond_wait(&ctx->queuePushCond, &ctx->queueMutex);
+    }
+    POOL_add_internal(ctx, function, opaque);
+    ZSTD_pthread_mutex_unlock(&ctx->queueMutex);
+}
+
+
+int POOL_tryAdd(POOL_ctx* ctx, POOL_function function, void* opaque)
+{
+    assert(ctx != NULL);
+    ZSTD_pthread_mutex_lock(&ctx->queueMutex);
+    if (isQueueFull(ctx)) {
+        ZSTD_pthread_mutex_unlock(&ctx->queueMutex);
+        return 0;
+    }
+    POOL_add_internal(ctx, function, opaque);
+    ZSTD_pthread_mutex_unlock(&ctx->queueMutex);
+    return 1;
+}
+
+
+#else  /* ZSTD_MULTITHREAD  not defined */
+
+/* ========================== */
+/* No multi-threading support */
+/* ========================== */
+
+
+/* We don't need any data, but if it is empty, malloc() might return NULL. */
+struct POOL_ctx_s {
+    int dummy;
+};
+static POOL_ctx g_poolCtx;
+
+POOL_ctx* POOL_create(size_t numThreads, size_t queueSize) {
+    return POOL_create_advanced(numThreads, queueSize, ZSTD_defaultCMem);
+}
+
+POOL_ctx* POOL_create_advanced(size_t numThreads, size_t queueSize, ZSTD_customMem customMem) {
+    (void)numThreads;
+    (void)queueSize;
+    (void)customMem;
+    return &g_poolCtx;
+}
+
+void POOL_free(POOL_ctx* ctx) {
+    assert(!ctx || ctx == &g_poolCtx);
+    (void)ctx;
+}
+
+int POOL_resize(POOL_ctx* ctx, size_t numThreads) {
+    (void)ctx; (void)numThreads;
+    return 0;
+}
+
+void POOL_add(POOL_ctx* ctx, POOL_function function, void* opaque) {
+    (void)ctx;
+    function(opaque);
+}
+
+int POOL_tryAdd(POOL_ctx* ctx, POOL_function function, void* opaque) {
+    (void)ctx;
+    function(opaque);
+    return 1;
+}
+
+size_t POOL_sizeof(POOL_ctx* ctx) {
+    if (ctx==NULL) return 0;  /* supports sizeof NULL */
+    assert(ctx == &g_poolCtx);
+    return sizeof(*ctx);
+}
+
+#endif  /* ZSTD_MULTITHREAD */
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/pool.h mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/pool.h
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/pool.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/pool.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+#ifndef POOL_H
+#define POOL_H
+
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
+
+#include "zstd_deps.h"
+#define ZSTD_STATIC_LINKING_ONLY   /* ZSTD_customMem */
+#include "../zstd.h"
+
+typedef struct POOL_ctx_s POOL_ctx;
+
+/*! POOL_create() :
+ *  Create a thread pool with at most `numThreads` threads.
+ * `numThreads` must be at least 1.
+ *  The maximum number of queued jobs before blocking is `queueSize`.
+ * @return : POOL_ctx pointer on success, else NULL.
+*/
+POOL_ctx* POOL_create(size_t numThreads, size_t queueSize);
+
+POOL_ctx* POOL_create_advanced(size_t numThreads, size_t queueSize,
+                               ZSTD_customMem customMem);
+
+/*! POOL_free() :
+ *  Free a thread pool returned by POOL_create().
+ */
+void POOL_free(POOL_ctx* ctx);
+
+/*! POOL_resize() :
+ *  Expands or shrinks pool's number of threads.
+ *  This is more efficient than releasing + creating a new context,
+ *  since it tries to preserve and re-use existing threads.
+ * `numThreads` must be at least 1.
+ * @return : 0 when resize was successful,
+ *           !0 (typically 1) if there is an error.
+ *    note : only numThreads can be resized, queueSize remains unchanged.
+ */
+int POOL_resize(POOL_ctx* ctx, size_t numThreads);
+
+/*! POOL_sizeof() :
+ * @return threadpool memory usage
+ *  note : compatible with NULL (returns 0 in this case)
+ */
+size_t POOL_sizeof(POOL_ctx* ctx);
+
+/*! POOL_function :
+ *  The function type that can be added to a thread pool.
+ */
+typedef void (*POOL_function)(void*);
+
+/*! POOL_add() :
+ *  Add the job `function(opaque)` to the thread pool. `ctx` must be valid.
+ *  Possibly blocks until there is room in the queue.
+ *  Note : The function may be executed asynchronously,
+ *         therefore, `opaque` must live until function has been completed.
+ */
+void POOL_add(POOL_ctx* ctx, POOL_function function, void* opaque);
+
+
+/*! POOL_tryAdd() :
+ *  Add the job `function(opaque)` to thread pool _if_ a worker is available.
+ *  Returns immediately even if not (does not block).
+ * @return : 1 if successful, 0 if not.
+ */
+int POOL_tryAdd(POOL_ctx* ctx, POOL_function function, void* opaque);
+
+
+#if defined (__cplusplus)
+}
+#endif
+
+#endif
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/threading.c mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/threading.c
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/threading.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/threading.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,122 @@
+/**
+ * Copyright (c) 2016 Tino Reichardt
+ * All rights reserved.
+ *
+ * You can contact the author at:
+ * - zstdmt source repository: https://github.com/mcmilk/zstdmt
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+/**
+ * This file will hold wrapper for systems, which do not support pthreads
+ */
+
+#include "threading.h"
+
+/* create fake symbol to avoid empty translation unit warning */
+int g_ZSTD_threading_useless_symbol;
+
+#if defined(ZSTD_MULTITHREAD) && defined(_WIN32)
+
+/**
+ * Windows minimalist Pthread Wrapper, based on :
+ * http://www.cse.wustl.edu/~schmidt/win32-cv-1.html
+ */
+
+
+/* ===  Dependencies  === */
+#include <process.h>
+#include <errno.h>
+
+
+/* ===  Implementation  === */
+
+static unsigned __stdcall worker(void *arg)
+{
+    ZSTD_pthread_t* const thread = (ZSTD_pthread_t*) arg;
+    thread->arg = thread->start_routine(thread->arg);
+    return 0;
+}
+
+int ZSTD_pthread_create(ZSTD_pthread_t* thread, const void* unused,
+            void* (*start_routine) (void*), void* arg)
+{
+    (void)unused;
+    thread->arg = arg;
+    thread->start_routine = start_routine;
+    thread->handle = (HANDLE) _beginthreadex(NULL, 0, worker, thread, 0, NULL);
+
+    if (!thread->handle)
+        return errno;
+    else
+        return 0;
+}
+
+int ZSTD_pthread_join(ZSTD_pthread_t thread, void **value_ptr)
+{
+    DWORD result;
+
+    if (!thread.handle) return 0;
+
+    result = WaitForSingleObject(thread.handle, INFINITE);
+    switch (result) {
+    case WAIT_OBJECT_0:
+        if (value_ptr) *value_ptr = thread.arg;
+        return 0;
+    case WAIT_ABANDONED:
+        return EINVAL;
+    default:
+        return GetLastError();
+    }
+}
+
+#endif   /* ZSTD_MULTITHREAD */
+
+#if defined(ZSTD_MULTITHREAD) && DEBUGLEVEL >= 1 && !defined(_WIN32)
+
+#define ZSTD_DEPS_NEED_MALLOC
+#include "zstd_deps.h"
+
+int ZSTD_pthread_mutex_init(ZSTD_pthread_mutex_t* mutex, pthread_mutexattr_t const* attr)
+{
+    *mutex = (pthread_mutex_t*)ZSTD_malloc(sizeof(pthread_mutex_t));
+    if (!*mutex)
+        return 1;
+    return pthread_mutex_init(*mutex, attr);
+}
+
+int ZSTD_pthread_mutex_destroy(ZSTD_pthread_mutex_t* mutex)
+{
+    if (!*mutex)
+        return 0;
+    {
+        int const ret = pthread_mutex_destroy(*mutex);
+        ZSTD_free(*mutex);
+        return ret;
+    }
+}
+
+int ZSTD_pthread_cond_init(ZSTD_pthread_cond_t* cond, pthread_condattr_t const* attr)
+{
+    *cond = (pthread_cond_t*)ZSTD_malloc(sizeof(pthread_cond_t));
+    if (!*cond)
+        return 1;
+    return pthread_cond_init(*cond, attr);
+}
+
+int ZSTD_pthread_cond_destroy(ZSTD_pthread_cond_t* cond)
+{
+    if (!*cond)
+        return 0;
+    {
+        int const ret = pthread_cond_destroy(*cond);
+        ZSTD_free(*cond);
+        return ret;
+    }
+}
+
+#endif
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/threading.h mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/threading.h
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/threading.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/threading.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,155 @@
+/**
+ * Copyright (c) 2016 Tino Reichardt
+ * All rights reserved.
+ *
+ * You can contact the author at:
+ * - zstdmt source repository: https://github.com/mcmilk/zstdmt
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+#ifndef THREADING_H_938743
+#define THREADING_H_938743
+
+#include "debug.h"
+
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
+#if defined(ZSTD_MULTITHREAD) && defined(_WIN32)
+
+/**
+ * Windows minimalist Pthread Wrapper, based on :
+ * http://www.cse.wustl.edu/~schmidt/win32-cv-1.html
+ */
+#ifdef WINVER
+#  undef WINVER
+#endif
+#define WINVER       0x0600
+
+#ifdef _WIN32_WINNT
+#  undef _WIN32_WINNT
+#endif
+#define _WIN32_WINNT 0x0600
+
+#ifndef WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
+#endif
+
+#undef ERROR   /* reported already defined on VS 2015 (Rich Geldreich) */
+#include <windows.h>
+#undef ERROR
+#define ERROR(name) ZSTD_ERROR(name)
+
+
+/* mutex */
+#define ZSTD_pthread_mutex_t           CRITICAL_SECTION
+#define ZSTD_pthread_mutex_init(a, b)  ((void)(b), InitializeCriticalSection((a)), 0)
+#define ZSTD_pthread_mutex_destroy(a)  DeleteCriticalSection((a))
+#define ZSTD_pthread_mutex_lock(a)     EnterCriticalSection((a))
+#define ZSTD_pthread_mutex_unlock(a)   LeaveCriticalSection((a))
+
+/* condition variable */
+#define ZSTD_pthread_cond_t             CONDITION_VARIABLE
+#define ZSTD_pthread_cond_init(a, b)    ((void)(b), InitializeConditionVariable((a)), 0)
+#define ZSTD_pthread_cond_destroy(a)    ((void)(a))
+#define ZSTD_pthread_cond_wait(a, b)    SleepConditionVariableCS((a), (b), INFINITE)
+#define ZSTD_pthread_cond_signal(a)     WakeConditionVariable((a))
+#define ZSTD_pthread_cond_broadcast(a)  WakeAllConditionVariable((a))
+
+/* ZSTD_pthread_create() and ZSTD_pthread_join() */
+typedef struct {
+    HANDLE handle;
+    void* (*start_routine)(void*);
+    void* arg;
+} ZSTD_pthread_t;
+
+int ZSTD_pthread_create(ZSTD_pthread_t* thread, const void* unused,
+                   void* (*start_routine) (void*), void* arg);
+
+int ZSTD_pthread_join(ZSTD_pthread_t thread, void** value_ptr);
+
+/**
+ * add here more wrappers as required
+ */
+
+
+#elif defined(ZSTD_MULTITHREAD)    /* posix assumed ; need a better detection method */
+/* ===   POSIX Systems   === */
+#  include <pthread.h>
+
+#if DEBUGLEVEL < 1
+
+#define ZSTD_pthread_mutex_t            pthread_mutex_t
+#define ZSTD_pthread_mutex_init(a, b)   pthread_mutex_init((a), (b))
+#define ZSTD_pthread_mutex_destroy(a)   pthread_mutex_destroy((a))
+#define ZSTD_pthread_mutex_lock(a)      pthread_mutex_lock((a))
+#define ZSTD_pthread_mutex_unlock(a)    pthread_mutex_unlock((a))
+
+#define ZSTD_pthread_cond_t             pthread_cond_t
+#define ZSTD_pthread_cond_init(a, b)    pthread_cond_init((a), (b))
+#define ZSTD_pthread_cond_destroy(a)    pthread_cond_destroy((a))
+#define ZSTD_pthread_cond_wait(a, b)    pthread_cond_wait((a), (b))
+#define ZSTD_pthread_cond_signal(a)     pthread_cond_signal((a))
+#define ZSTD_pthread_cond_broadcast(a)  pthread_cond_broadcast((a))
+
+#define ZSTD_pthread_t                  pthread_t
+#define ZSTD_pthread_create(a, b, c, d) pthread_create((a), (b), (c), (d))
+#define ZSTD_pthread_join(a, b)         pthread_join((a),(b))
+
+#else /* DEBUGLEVEL >= 1 */
+
+/* Debug implementation of threading.
+ * In this implementation we use pointers for mutexes and condition variables.
+ * This way, if we forget to init/destroy them the program will crash or ASAN
+ * will report leaks.
+ */
+
+#define ZSTD_pthread_mutex_t            pthread_mutex_t*
+int ZSTD_pthread_mutex_init(ZSTD_pthread_mutex_t* mutex, pthread_mutexattr_t const* attr);
+int ZSTD_pthread_mutex_destroy(ZSTD_pthread_mutex_t* mutex);
+#define ZSTD_pthread_mutex_lock(a)      pthread_mutex_lock(*(a))
+#define ZSTD_pthread_mutex_unlock(a)    pthread_mutex_unlock(*(a))
+
+#define ZSTD_pthread_cond_t             pthread_cond_t*
+int ZSTD_pthread_cond_init(ZSTD_pthread_cond_t* cond, pthread_condattr_t const* attr);
+int ZSTD_pthread_cond_destroy(ZSTD_pthread_cond_t* cond);
+#define ZSTD_pthread_cond_wait(a, b)    pthread_cond_wait(*(a), *(b))
+#define ZSTD_pthread_cond_signal(a)     pthread_cond_signal(*(a))
+#define ZSTD_pthread_cond_broadcast(a)  pthread_cond_broadcast(*(a))
+
+#define ZSTD_pthread_t                  pthread_t
+#define ZSTD_pthread_create(a, b, c, d) pthread_create((a), (b), (c), (d))
+#define ZSTD_pthread_join(a, b)         pthread_join((a),(b))
+
+#endif
+
+#else  /* ZSTD_MULTITHREAD not defined */
+/* No multithreading support */
+
+typedef int ZSTD_pthread_mutex_t;
+#define ZSTD_pthread_mutex_init(a, b)   ((void)(a), (void)(b), 0)
+#define ZSTD_pthread_mutex_destroy(a)   ((void)(a))
+#define ZSTD_pthread_mutex_lock(a)      ((void)(a))
+#define ZSTD_pthread_mutex_unlock(a)    ((void)(a))
+
+typedef int ZSTD_pthread_cond_t;
+#define ZSTD_pthread_cond_init(a, b)    ((void)(a), (void)(b), 0)
+#define ZSTD_pthread_cond_destroy(a)    ((void)(a))
+#define ZSTD_pthread_cond_wait(a, b)    ((void)(a), (void)(b))
+#define ZSTD_pthread_cond_signal(a)     ((void)(a))
+#define ZSTD_pthread_cond_broadcast(a)  ((void)(a))
+
+/* do not use ZSTD_pthread_t */
+
+#endif /* ZSTD_MULTITHREAD */
+
+#if defined (__cplusplus)
+}
+#endif
+
+#endif /* THREADING_H_938743 */
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/xxhash.c mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/xxhash.c
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/xxhash.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/xxhash.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,824 @@
+/*
+ *  xxHash - Fast Hash algorithm
+ *  Copyright (c) Yann Collet, Facebook, Inc.
+ *
+ *  You can contact the author at :
+ *  - xxHash homepage: http://www.xxhash.com
+ *  - xxHash source repository : https://github.com/Cyan4973/xxHash
+ * 
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+*/
+
+
+/* *************************************
+*  Tuning parameters
+***************************************/
+/*!XXH_FORCE_MEMORY_ACCESS :
+ * By default, access to unaligned memory is controlled by `memcpy()`, which is safe and portable.
+ * Unfortunately, on some target/compiler combinations, the generated assembly is sub-optimal.
+ * The below switch allow to select different access method for improved performance.
+ * Method 0 (default) : use `memcpy()`. Safe and portable.
+ * Method 1 : `__packed` statement. It depends on compiler extension (ie, not portable).
+ *            This method is safe if your compiler supports it, and *generally* as fast or faster than `memcpy`.
+ * Method 2 : direct access. This method doesn't depend on compiler but violate C standard.
+ *            It can generate buggy code on targets which do not support unaligned memory accesses.
+ *            But in some circumstances, it's the only known way to get the most performance (ie GCC + ARMv6)
+ * See http://stackoverflow.com/a/32095106/646947 for details.
+ * Prefer these methods in priority order (0 > 1 > 2)
+ */
+#ifndef XXH_FORCE_MEMORY_ACCESS   /* can be defined externally, on command line for example */
+#  if (defined(__INTEL_COMPILER) && !defined(WIN32)) || \
+  (defined(__GNUC__) && ( defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7S__) )) || \
+  defined(__ICCARM__)
+#    define XXH_FORCE_MEMORY_ACCESS 1
+#  endif
+#endif
+
+/*!XXH_ACCEPT_NULL_INPUT_POINTER :
+ * If the input pointer is a null pointer, xxHash default behavior is to trigger a memory access error, since it is a bad pointer.
+ * When this option is enabled, xxHash output for null input pointers will be the same as a null-length input.
+ * By default, this option is disabled. To enable it, uncomment below define :
+ */
+/* #define XXH_ACCEPT_NULL_INPUT_POINTER 1 */
+
+/*!XXH_FORCE_NATIVE_FORMAT :
+ * By default, xxHash library provides endian-independent Hash values, based on little-endian convention.
+ * Results are therefore identical for little-endian and big-endian CPU.
+ * This comes at a performance cost for big-endian CPU, since some swapping is required to emulate little-endian format.
+ * Should endian-independence be of no importance for your application, you may set the #define below to 1,
+ * to improve speed for Big-endian CPU.
+ * This option has no impact on Little_Endian CPU.
+ */
+#ifndef XXH_FORCE_NATIVE_FORMAT   /* can be defined externally */
+#  define XXH_FORCE_NATIVE_FORMAT 0
+#endif
+
+/*!XXH_FORCE_ALIGN_CHECK :
+ * This is a minor performance trick, only useful with lots of very small keys.
+ * It means : check for aligned/unaligned input.
+ * The check costs one initial branch per hash; set to 0 when the input data
+ * is guaranteed to be aligned.
+ */
+#ifndef XXH_FORCE_ALIGN_CHECK /* can be defined externally */
+#  if defined(__i386) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_X64)
+#    define XXH_FORCE_ALIGN_CHECK 0
+#  else
+#    define XXH_FORCE_ALIGN_CHECK 1
+#  endif
+#endif
+
+
+/* *************************************
+*  Includes & Memory related functions
+***************************************/
+/* Modify the local functions below should you wish to use some other memory routines */
+/* for ZSTD_malloc(), ZSTD_free() */
+#define ZSTD_DEPS_NEED_MALLOC
+#include "zstd_deps.h"  /* size_t, ZSTD_malloc, ZSTD_free, ZSTD_memcpy */
+static void* XXH_malloc(size_t s) { return ZSTD_malloc(s); }
+static void  XXH_free  (void* p)  { ZSTD_free(p); }
+static void* XXH_memcpy(void* dest, const void* src, size_t size) { return ZSTD_memcpy(dest,src,size); }
+
+#ifndef XXH_STATIC_LINKING_ONLY
+#  define XXH_STATIC_LINKING_ONLY
+#endif
+#include "xxhash.h"
+
+
+/* *************************************
+*  Compiler Specific Options
+***************************************/
+#include "compiler.h"
+
+
+/* *************************************
+*  Basic Types
+***************************************/
+#include "mem.h"  /* BYTE, U32, U64, size_t */
+
+#if (defined(XXH_FORCE_MEMORY_ACCESS) && (XXH_FORCE_MEMORY_ACCESS==2))
+
+/* Force direct memory access. Only works on CPU which support unaligned memory access in hardware */
+static U32 XXH_read32(const void* memPtr) { return *(const U32*) memPtr; }
+static U64 XXH_read64(const void* memPtr) { return *(const U64*) memPtr; }
+
+#elif (defined(XXH_FORCE_MEMORY_ACCESS) && (XXH_FORCE_MEMORY_ACCESS==1))
+
+/* __pack instructions are safer, but compiler specific, hence potentially problematic for some compilers */
+/* currently only defined for gcc and icc */
+typedef union { U32 u32; U64 u64; } __attribute__((packed)) unalign;
+
+static U32 XXH_read32(const void* ptr) { return ((const unalign*)ptr)->u32; }
+static U64 XXH_read64(const void* ptr) { return ((const unalign*)ptr)->u64; }
+
+#else
+
+/* portable and safe solution. Generally efficient.
+ * see : http://stackoverflow.com/a/32095106/646947
+ */
+
+static U32 XXH_read32(const void* memPtr)
+{
+    U32 val;
+    ZSTD_memcpy(&val, memPtr, sizeof(val));
+    return val;
+}
+
+static U64 XXH_read64(const void* memPtr)
+{
+    U64 val;
+    ZSTD_memcpy(&val, memPtr, sizeof(val));
+    return val;
+}
+
+#endif   /* XXH_FORCE_DIRECT_MEMORY_ACCESS */
+
+
+/* ****************************************
+*  Compiler-specific Functions and Macros
+******************************************/
+#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
+
+/* Note : although _rotl exists for minGW (GCC under windows), performance seems poor */
+#if defined(_MSC_VER)
+#  define XXH_rotl32(x,r) _rotl(x,r)
+#  define XXH_rotl64(x,r) _rotl64(x,r)
+#else
+#if defined(__ICCARM__)
+#  include <intrinsics.h>
+#  define XXH_rotl32(x,r) __ROR(x,(32 - r))
+#else
+#  define XXH_rotl32(x,r) ((x << r) | (x >> (32 - r)))
+#endif
+#  define XXH_rotl64(x,r) ((x << r) | (x >> (64 - r)))
+#endif
+
+#if defined(_MSC_VER)     /* Visual Studio */
+#  define XXH_swap32 _byteswap_ulong
+#  define XXH_swap64 _byteswap_uint64
+#elif GCC_VERSION >= 403
+#  define XXH_swap32 __builtin_bswap32
+#  define XXH_swap64 __builtin_bswap64
+#else
+static U32 XXH_swap32 (U32 x)
+{
+    return  ((x << 24) & 0xff000000 ) |
+            ((x <<  8) & 0x00ff0000 ) |
+            ((x >>  8) & 0x0000ff00 ) |
+            ((x >> 24) & 0x000000ff );
+}
+static U64 XXH_swap64 (U64 x)
+{
+    return  ((x << 56) & 0xff00000000000000ULL) |
+            ((x << 40) & 0x00ff000000000000ULL) |
+            ((x << 24) & 0x0000ff0000000000ULL) |
+            ((x << 8)  & 0x000000ff00000000ULL) |
+            ((x >> 8)  & 0x00000000ff000000ULL) |
+            ((x >> 24) & 0x0000000000ff0000ULL) |
+            ((x >> 40) & 0x000000000000ff00ULL) |
+            ((x >> 56) & 0x00000000000000ffULL);
+}
+#endif
+
+
+/* *************************************
+*  Architecture Macros
+***************************************/
+typedef enum { XXH_bigEndian=0, XXH_littleEndian=1 } XXH_endianess;
+
+/* XXH_CPU_LITTLE_ENDIAN can be defined externally, for example on the compiler command line */
+#ifndef XXH_CPU_LITTLE_ENDIAN
+    static const int g_one = 1;
+#   define XXH_CPU_LITTLE_ENDIAN   (*(const char*)(&g_one))
+#endif
+
+
+/* ***************************
+*  Memory reads
+*****************************/
+typedef enum { XXH_aligned, XXH_unaligned } XXH_alignment;
+
+FORCE_INLINE_TEMPLATE U32 XXH_readLE32_align(const void* ptr, XXH_endianess endian, XXH_alignment align)
+{
+    if (align==XXH_unaligned)
+        return endian==XXH_littleEndian ? XXH_read32(ptr) : XXH_swap32(XXH_read32(ptr));
+    else
+        return endian==XXH_littleEndian ? *(const U32*)ptr : XXH_swap32(*(const U32*)ptr);
+}
+
+FORCE_INLINE_TEMPLATE U32 XXH_readLE32(const void* ptr, XXH_endianess endian)
+{
+    return XXH_readLE32_align(ptr, endian, XXH_unaligned);
+}
+
+static U32 XXH_readBE32(const void* ptr)
+{
+    return XXH_CPU_LITTLE_ENDIAN ? XXH_swap32(XXH_read32(ptr)) : XXH_read32(ptr);
+}
+
+FORCE_INLINE_TEMPLATE U64 XXH_readLE64_align(const void* ptr, XXH_endianess endian, XXH_alignment align)
+{
+    if (align==XXH_unaligned)
+        return endian==XXH_littleEndian ? XXH_read64(ptr) : XXH_swap64(XXH_read64(ptr));
+    else
+        return endian==XXH_littleEndian ? *(const U64*)ptr : XXH_swap64(*(const U64*)ptr);
+}
+
+FORCE_INLINE_TEMPLATE U64 XXH_readLE64(const void* ptr, XXH_endianess endian)
+{
+    return XXH_readLE64_align(ptr, endian, XXH_unaligned);
+}
+
+static U64 XXH_readBE64(const void* ptr)
+{
+    return XXH_CPU_LITTLE_ENDIAN ? XXH_swap64(XXH_read64(ptr)) : XXH_read64(ptr);
+}
+
+
+/* *************************************
+*  Macros
+***************************************/
+#define XXH_STATIC_ASSERT(c)   { enum { XXH_static_assert = 1/(int)(!!(c)) }; }    /* use only *after* variable declarations */
+
+
+/* *************************************
+*  Constants
+***************************************/
+static const U32 PRIME32_1 = 2654435761U;
+static const U32 PRIME32_2 = 2246822519U;
+static const U32 PRIME32_3 = 3266489917U;
+static const U32 PRIME32_4 =  668265263U;
+static const U32 PRIME32_5 =  374761393U;
+
+static const U64 PRIME64_1 = 11400714785074694791ULL;
+static const U64 PRIME64_2 = 14029467366897019727ULL;
+static const U64 PRIME64_3 =  1609587929392839161ULL;
+static const U64 PRIME64_4 =  9650029242287828579ULL;
+static const U64 PRIME64_5 =  2870177450012600261ULL;
+
+XXH_PUBLIC_API unsigned XXH_versionNumber (void) { return XXH_VERSION_NUMBER; }
+
+
+/* **************************
+*  Utils
+****************************/
+XXH_PUBLIC_API void XXH32_copyState(XXH32_state_t* restrict dstState, const XXH32_state_t* restrict srcState)
+{
+    ZSTD_memcpy(dstState, srcState, sizeof(*dstState));
+}
+
+XXH_PUBLIC_API void XXH64_copyState(XXH64_state_t* restrict dstState, const XXH64_state_t* restrict srcState)
+{
+    ZSTD_memcpy(dstState, srcState, sizeof(*dstState));
+}
+
+
+/* ***************************
+*  Simple Hash Functions
+*****************************/
+
+static U32 XXH32_round(U32 seed, U32 input)
+{
+    seed += input * PRIME32_2;
+    seed  = XXH_rotl32(seed, 13);
+    seed *= PRIME32_1;
+    return seed;
+}
+
+FORCE_INLINE_TEMPLATE U32 XXH32_endian_align(const void* input, size_t len, U32 seed, XXH_endianess endian, XXH_alignment align)
+{
+    const BYTE* p = (const BYTE*)input;
+    const BYTE* bEnd = p + len;
+    U32 h32;
+#define XXH_get32bits(p) XXH_readLE32_align(p, endian, align)
+
+#ifdef XXH_ACCEPT_NULL_INPUT_POINTER
+    if (p==NULL) {
+        len=0;
+        bEnd=p=(const BYTE*)(size_t)16;
+    }
+#endif
+
+    if (len>=16) {
+        const BYTE* const limit = bEnd - 16;
+        U32 v1 = seed + PRIME32_1 + PRIME32_2;
+        U32 v2 = seed + PRIME32_2;
+        U32 v3 = seed + 0;
+        U32 v4 = seed - PRIME32_1;
+
+        do {
+            v1 = XXH32_round(v1, XXH_get32bits(p)); p+=4;
+            v2 = XXH32_round(v2, XXH_get32bits(p)); p+=4;
+            v3 = XXH32_round(v3, XXH_get32bits(p)); p+=4;
+            v4 = XXH32_round(v4, XXH_get32bits(p)); p+=4;
+        } while (p<=limit);
+
+        h32 = XXH_rotl32(v1, 1) + XXH_rotl32(v2, 7) + XXH_rotl32(v3, 12) + XXH_rotl32(v4, 18);
+    } else {
+        h32  = seed + PRIME32_5;
+    }
+
+    h32 += (U32) len;
+
+    while (p+4<=bEnd) {
+        h32 += XXH_get32bits(p) * PRIME32_3;
+        h32  = XXH_rotl32(h32, 17) * PRIME32_4 ;
+        p+=4;
+    }
+
+    while (p<bEnd) {
+        h32 += (*p) * PRIME32_5;
+        h32 = XXH_rotl32(h32, 11) * PRIME32_1 ;
+        p++;
+    }
+
+    h32 ^= h32 >> 15;
+    h32 *= PRIME32_2;
+    h32 ^= h32 >> 13;
+    h32 *= PRIME32_3;
+    h32 ^= h32 >> 16;
+
+    return h32;
+}
+
+
+XXH_PUBLIC_API unsigned int XXH32 (const void* input, size_t len, unsigned int seed)
+{
+#if 0
+    /* Simple version, good for code maintenance, but unfortunately slow for small inputs */
+    XXH32_CREATESTATE_STATIC(state);
+    XXH32_reset(state, seed);
+    XXH32_update(state, input, len);
+    return XXH32_digest(state);
+#else
+    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
+
+    if (XXH_FORCE_ALIGN_CHECK) {
+        if ((((size_t)input) & 3) == 0) {   /* Input is 4-bytes aligned, leverage the speed benefit */
+            if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
+                return XXH32_endian_align(input, len, seed, XXH_littleEndian, XXH_aligned);
+            else
+                return XXH32_endian_align(input, len, seed, XXH_bigEndian, XXH_aligned);
+    }   }
+
+    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
+        return XXH32_endian_align(input, len, seed, XXH_littleEndian, XXH_unaligned);
+    else
+        return XXH32_endian_align(input, len, seed, XXH_bigEndian, XXH_unaligned);
+#endif
+}
+
+
+static U64 XXH64_round(U64 acc, U64 input)
+{
+    acc += input * PRIME64_2;
+    acc  = XXH_rotl64(acc, 31);
+    acc *= PRIME64_1;
+    return acc;
+}
+
+static U64 XXH64_mergeRound(U64 acc, U64 val)
+{
+    val  = XXH64_round(0, val);
+    acc ^= val;
+    acc  = acc * PRIME64_1 + PRIME64_4;
+    return acc;
+}
+
+FORCE_INLINE_TEMPLATE U64 XXH64_endian_align(const void* input, size_t len, U64 seed, XXH_endianess endian, XXH_alignment align)
+{
+    const BYTE* p = (const BYTE*)input;
+    const BYTE* const bEnd = p + len;
+    U64 h64;
+#define XXH_get64bits(p) XXH_readLE64_align(p, endian, align)
+
+#ifdef XXH_ACCEPT_NULL_INPUT_POINTER
+    if (p==NULL) {
+        len=0;
+        bEnd=p=(const BYTE*)(size_t)32;
+    }
+#endif
+
+    if (len>=32) {
+        const BYTE* const limit = bEnd - 32;
+        U64 v1 = seed + PRIME64_1 + PRIME64_2;
+        U64 v2 = seed + PRIME64_2;
+        U64 v3 = seed + 0;
+        U64 v4 = seed - PRIME64_1;
+
+        do {
+            v1 = XXH64_round(v1, XXH_get64bits(p)); p+=8;
+            v2 = XXH64_round(v2, XXH_get64bits(p)); p+=8;
+            v3 = XXH64_round(v3, XXH_get64bits(p)); p+=8;
+            v4 = XXH64_round(v4, XXH_get64bits(p)); p+=8;
+        } while (p<=limit);
+
+        h64 = XXH_rotl64(v1, 1) + XXH_rotl64(v2, 7) + XXH_rotl64(v3, 12) + XXH_rotl64(v4, 18);
+        h64 = XXH64_mergeRound(h64, v1);
+        h64 = XXH64_mergeRound(h64, v2);
+        h64 = XXH64_mergeRound(h64, v3);
+        h64 = XXH64_mergeRound(h64, v4);
+
+    } else {
+        h64  = seed + PRIME64_5;
+    }
+
+    h64 += (U64) len;
+
+    while (p+8<=bEnd) {
+        U64 const k1 = XXH64_round(0, XXH_get64bits(p));
+        h64 ^= k1;
+        h64  = XXH_rotl64(h64,27) * PRIME64_1 + PRIME64_4;
+        p+=8;
+    }
+
+    if (p+4<=bEnd) {
+        h64 ^= (U64)(XXH_get32bits(p)) * PRIME64_1;
+        h64 = XXH_rotl64(h64, 23) * PRIME64_2 + PRIME64_3;
+        p+=4;
+    }
+
+    while (p<bEnd) {
+        h64 ^= (*p) * PRIME64_5;
+        h64 = XXH_rotl64(h64, 11) * PRIME64_1;
+        p++;
+    }
+
+    h64 ^= h64 >> 33;
+    h64 *= PRIME64_2;
+    h64 ^= h64 >> 29;
+    h64 *= PRIME64_3;
+    h64 ^= h64 >> 32;
+
+    return h64;
+}
+
+
+XXH_PUBLIC_API unsigned long long XXH64 (const void* input, size_t len, unsigned long long seed)
+{
+#if 0
+    /* Simple version, good for code maintenance, but unfortunately slow for small inputs */
+    XXH64_CREATESTATE_STATIC(state);
+    XXH64_reset(state, seed);
+    XXH64_update(state, input, len);
+    return XXH64_digest(state);
+#else
+    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
+
+    if (XXH_FORCE_ALIGN_CHECK) {
+        if ((((size_t)input) & 7)==0) {  /* Input is aligned, let's leverage the speed advantage */
+            if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
+                return XXH64_endian_align(input, len, seed, XXH_littleEndian, XXH_aligned);
+            else
+                return XXH64_endian_align(input, len, seed, XXH_bigEndian, XXH_aligned);
+    }   }
+
+    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
+        return XXH64_endian_align(input, len, seed, XXH_littleEndian, XXH_unaligned);
+    else
+        return XXH64_endian_align(input, len, seed, XXH_bigEndian, XXH_unaligned);
+#endif
+}
+
+
+/* **************************************************
+*  Advanced Hash Functions
+****************************************************/
+
+XXH_PUBLIC_API XXH32_state_t* XXH32_createState(void)
+{
+    return (XXH32_state_t*)XXH_malloc(sizeof(XXH32_state_t));
+}
+XXH_PUBLIC_API XXH_errorcode XXH32_freeState(XXH32_state_t* statePtr)
+{
+    XXH_free(statePtr);
+    return XXH_OK;
+}
+
+XXH_PUBLIC_API XXH64_state_t* XXH64_createState(void)
+{
+    return (XXH64_state_t*)XXH_malloc(sizeof(XXH64_state_t));
+}
+XXH_PUBLIC_API XXH_errorcode XXH64_freeState(XXH64_state_t* statePtr)
+{
+    XXH_free(statePtr);
+    return XXH_OK;
+}
+
+
+/*** Hash feed ***/
+
+XXH_PUBLIC_API XXH_errorcode XXH32_reset(XXH32_state_t* statePtr, unsigned int seed)
+{
+    XXH32_state_t state;   /* using a local state to memcpy() in order to avoid strict-aliasing warnings */
+    ZSTD_memset(&state, 0, sizeof(state)-4);   /* do not write into reserved, for future removal */
+    state.v1 = seed + PRIME32_1 + PRIME32_2;
+    state.v2 = seed + PRIME32_2;
+    state.v3 = seed + 0;
+    state.v4 = seed - PRIME32_1;
+    ZSTD_memcpy(statePtr, &state, sizeof(state));
+    return XXH_OK;
+}
+
+
+XXH_PUBLIC_API XXH_errorcode XXH64_reset(XXH64_state_t* statePtr, unsigned long long seed)
+{
+    XXH64_state_t state;   /* using a local state to memcpy() in order to avoid strict-aliasing warnings */
+    ZSTD_memset(&state, 0, sizeof(state)-8);   /* do not write into reserved, for future removal */
+    state.v1 = seed + PRIME64_1 + PRIME64_2;
+    state.v2 = seed + PRIME64_2;
+    state.v3 = seed + 0;
+    state.v4 = seed - PRIME64_1;
+    ZSTD_memcpy(statePtr, &state, sizeof(state));
+    return XXH_OK;
+}
+
+
+FORCE_INLINE_TEMPLATE XXH_errorcode XXH32_update_endian (XXH32_state_t* state, const void* input, size_t len, XXH_endianess endian)
+{
+    const BYTE* p = (const BYTE*)input;
+    const BYTE* const bEnd = p + len;
+
+#ifdef XXH_ACCEPT_NULL_INPUT_POINTER
+    if (input==NULL) return XXH_ERROR;
+#endif
+
+    state->total_len_32 += (unsigned)len;
+    state->large_len |= (len>=16) | (state->total_len_32>=16);
+
+    if (state->memsize + len < 16)  {   /* fill in tmp buffer */
+        XXH_memcpy((BYTE*)(state->mem32) + state->memsize, input, len);
+        state->memsize += (unsigned)len;
+        return XXH_OK;
+    }
+
+    if (state->memsize) {   /* some data left from previous update */
+        XXH_memcpy((BYTE*)(state->mem32) + state->memsize, input, 16-state->memsize);
+        {   const U32* p32 = state->mem32;
+            state->v1 = XXH32_round(state->v1, XXH_readLE32(p32, endian)); p32++;
+            state->v2 = XXH32_round(state->v2, XXH_readLE32(p32, endian)); p32++;
+            state->v3 = XXH32_round(state->v3, XXH_readLE32(p32, endian)); p32++;
+            state->v4 = XXH32_round(state->v4, XXH_readLE32(p32, endian)); p32++;
+        }
+        p += 16-state->memsize;
+        state->memsize = 0;
+    }
+
+    if (p <= bEnd-16) {
+        const BYTE* const limit = bEnd - 16;
+        U32 v1 = state->v1;
+        U32 v2 = state->v2;
+        U32 v3 = state->v3;
+        U32 v4 = state->v4;
+
+        do {
+            v1 = XXH32_round(v1, XXH_readLE32(p, endian)); p+=4;
+            v2 = XXH32_round(v2, XXH_readLE32(p, endian)); p+=4;
+            v3 = XXH32_round(v3, XXH_readLE32(p, endian)); p+=4;
+            v4 = XXH32_round(v4, XXH_readLE32(p, endian)); p+=4;
+        } while (p<=limit);
+
+        state->v1 = v1;
+        state->v2 = v2;
+        state->v3 = v3;
+        state->v4 = v4;
+    }
+
+    if (p < bEnd) {
+        XXH_memcpy(state->mem32, p, (size_t)(bEnd-p));
+        state->memsize = (unsigned)(bEnd-p);
+    }
+
+    return XXH_OK;
+}
+
+XXH_PUBLIC_API XXH_errorcode XXH32_update (XXH32_state_t* state_in, const void* input, size_t len)
+{
+    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
+
+    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
+        return XXH32_update_endian(state_in, input, len, XXH_littleEndian);
+    else
+        return XXH32_update_endian(state_in, input, len, XXH_bigEndian);
+}
+
+
+
+FORCE_INLINE_TEMPLATE U32 XXH32_digest_endian (const XXH32_state_t* state, XXH_endianess endian)
+{
+    const BYTE * p = (const BYTE*)state->mem32;
+    const BYTE* const bEnd = (const BYTE*)(state->mem32) + state->memsize;
+    U32 h32;
+
+    if (state->large_len) {
+        h32 = XXH_rotl32(state->v1, 1) + XXH_rotl32(state->v2, 7) + XXH_rotl32(state->v3, 12) + XXH_rotl32(state->v4, 18);
+    } else {
+        h32 = state->v3 /* == seed */ + PRIME32_5;
+    }
+
+    h32 += state->total_len_32;
+
+    while (p+4<=bEnd) {
+        h32 += XXH_readLE32(p, endian) * PRIME32_3;
+        h32  = XXH_rotl32(h32, 17) * PRIME32_4;
+        p+=4;
+    }
+
+    while (p<bEnd) {
+        h32 += (*p) * PRIME32_5;
+        h32  = XXH_rotl32(h32, 11) * PRIME32_1;
+        p++;
+    }
+
+    h32 ^= h32 >> 15;
+    h32 *= PRIME32_2;
+    h32 ^= h32 >> 13;
+    h32 *= PRIME32_3;
+    h32 ^= h32 >> 16;
+
+    return h32;
+}
+
+
+XXH_PUBLIC_API unsigned int XXH32_digest (const XXH32_state_t* state_in)
+{
+    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
+
+    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
+        return XXH32_digest_endian(state_in, XXH_littleEndian);
+    else
+        return XXH32_digest_endian(state_in, XXH_bigEndian);
+}
+
+
+
+/* **** XXH64 **** */
+
+FORCE_INLINE_TEMPLATE XXH_errorcode XXH64_update_endian (XXH64_state_t* state, const void* input, size_t len, XXH_endianess endian)
+{
+    const BYTE* p = (const BYTE*)input;
+    const BYTE* const bEnd = p + len;
+
+#ifdef XXH_ACCEPT_NULL_INPUT_POINTER
+    if (input==NULL) return XXH_ERROR;
+#endif
+
+    state->total_len += len;
+
+    if (state->memsize + len < 32) {  /* fill in tmp buffer */
+        if (input != NULL) {
+            XXH_memcpy(((BYTE*)state->mem64) + state->memsize, input, len);
+        }
+        state->memsize += (U32)len;
+        return XXH_OK;
+    }
+
+    if (state->memsize) {   /* tmp buffer is full */
+        XXH_memcpy(((BYTE*)state->mem64) + state->memsize, input, 32-state->memsize);
+        state->v1 = XXH64_round(state->v1, XXH_readLE64(state->mem64+0, endian));
+        state->v2 = XXH64_round(state->v2, XXH_readLE64(state->mem64+1, endian));
+        state->v3 = XXH64_round(state->v3, XXH_readLE64(state->mem64+2, endian));
+        state->v4 = XXH64_round(state->v4, XXH_readLE64(state->mem64+3, endian));
+        p += 32-state->memsize;
+        state->memsize = 0;
+    }
+
+    if (p+32 <= bEnd) {
+        const BYTE* const limit = bEnd - 32;
+        U64 v1 = state->v1;
+        U64 v2 = state->v2;
+        U64 v3 = state->v3;
+        U64 v4 = state->v4;
+
+        do {
+            v1 = XXH64_round(v1, XXH_readLE64(p, endian)); p+=8;
+            v2 = XXH64_round(v2, XXH_readLE64(p, endian)); p+=8;
+            v3 = XXH64_round(v3, XXH_readLE64(p, endian)); p+=8;
+            v4 = XXH64_round(v4, XXH_readLE64(p, endian)); p+=8;
+        } while (p<=limit);
+
+        state->v1 = v1;
+        state->v2 = v2;
+        state->v3 = v3;
+        state->v4 = v4;
+    }
+
+    if (p < bEnd) {
+        XXH_memcpy(state->mem64, p, (size_t)(bEnd-p));
+        state->memsize = (unsigned)(bEnd-p);
+    }
+
+    return XXH_OK;
+}
+
+XXH_PUBLIC_API XXH_errorcode XXH64_update (XXH64_state_t* state_in, const void* input, size_t len)
+{
+    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
+
+    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
+        return XXH64_update_endian(state_in, input, len, XXH_littleEndian);
+    else
+        return XXH64_update_endian(state_in, input, len, XXH_bigEndian);
+}
+
+
+
+FORCE_INLINE_TEMPLATE U64 XXH64_digest_endian (const XXH64_state_t* state, XXH_endianess endian)
+{
+    const BYTE * p = (const BYTE*)state->mem64;
+    const BYTE* const bEnd = (const BYTE*)state->mem64 + state->memsize;
+    U64 h64;
+
+    if (state->total_len >= 32) {
+        U64 const v1 = state->v1;
+        U64 const v2 = state->v2;
+        U64 const v3 = state->v3;
+        U64 const v4 = state->v4;
+
+        h64 = XXH_rotl64(v1, 1) + XXH_rotl64(v2, 7) + XXH_rotl64(v3, 12) + XXH_rotl64(v4, 18);
+        h64 = XXH64_mergeRound(h64, v1);
+        h64 = XXH64_mergeRound(h64, v2);
+        h64 = XXH64_mergeRound(h64, v3);
+        h64 = XXH64_mergeRound(h64, v4);
+    } else {
+        h64  = state->v3 + PRIME64_5;
+    }
+
+    h64 += (U64) state->total_len;
+
+    while (p+8<=bEnd) {
+        U64 const k1 = XXH64_round(0, XXH_readLE64(p, endian));
+        h64 ^= k1;
+        h64  = XXH_rotl64(h64,27) * PRIME64_1 + PRIME64_4;
+        p+=8;
+    }
+
+    if (p+4<=bEnd) {
+        h64 ^= (U64)(XXH_readLE32(p, endian)) * PRIME64_1;
+        h64  = XXH_rotl64(h64, 23) * PRIME64_2 + PRIME64_3;
+        p+=4;
+    }
+
+    while (p<bEnd) {
+        h64 ^= (*p) * PRIME64_5;
+        h64  = XXH_rotl64(h64, 11) * PRIME64_1;
+        p++;
+    }
+
+    h64 ^= h64 >> 33;
+    h64 *= PRIME64_2;
+    h64 ^= h64 >> 29;
+    h64 *= PRIME64_3;
+    h64 ^= h64 >> 32;
+
+    return h64;
+}
+
+
+XXH_PUBLIC_API unsigned long long XXH64_digest (const XXH64_state_t* state_in)
+{
+    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
+
+    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
+        return XXH64_digest_endian(state_in, XXH_littleEndian);
+    else
+        return XXH64_digest_endian(state_in, XXH_bigEndian);
+}
+
+
+/* **************************
+*  Canonical representation
+****************************/
+
+/*! Default XXH result types are basic unsigned 32 and 64 bits.
+*   The canonical representation follows human-readable write convention, aka big-endian (large digits first).
+*   These functions allow transformation of hash result into and from its canonical format.
+*   This way, hash values can be written into a file or buffer, and remain comparable across different systems and programs.
+*/
+
+XXH_PUBLIC_API void XXH32_canonicalFromHash(XXH32_canonical_t* dst, XXH32_hash_t hash)
+{
+    XXH_STATIC_ASSERT(sizeof(XXH32_canonical_t) == sizeof(XXH32_hash_t));
+    if (XXH_CPU_LITTLE_ENDIAN) hash = XXH_swap32(hash);
+    ZSTD_memcpy(dst, &hash, sizeof(*dst));
+}
+
+XXH_PUBLIC_API void XXH64_canonicalFromHash(XXH64_canonical_t* dst, XXH64_hash_t hash)
+{
+    XXH_STATIC_ASSERT(sizeof(XXH64_canonical_t) == sizeof(XXH64_hash_t));
+    if (XXH_CPU_LITTLE_ENDIAN) hash = XXH_swap64(hash);
+    ZSTD_memcpy(dst, &hash, sizeof(*dst));
+}
+
+XXH_PUBLIC_API XXH32_hash_t XXH32_hashFromCanonical(const XXH32_canonical_t* src)
+{
+    return XXH_readBE32(src);
+}
+
+XXH_PUBLIC_API XXH64_hash_t XXH64_hashFromCanonical(const XXH64_canonical_t* src)
+{
+    return XXH_readBE64(src);
+}
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/xxhash.h mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/xxhash.h
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/xxhash.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/xxhash.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,285 @@
+/*
+ * xxHash - Extremely Fast Hash algorithm
+ * Header File
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ *
+ * You can contact the author at :
+ * - xxHash source repository : https://github.com/Cyan4973/xxHash
+ * 
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+*/
+
+/* Notice extracted from xxHash homepage :
+
+xxHash is an extremely fast Hash algorithm, running at RAM speed limits.
+It also successfully passes all tests from the SMHasher suite.
+
+Comparison (single thread, Windows Seven 32 bits, using SMHasher on a Core 2 Duo @3GHz)
+
+Name            Speed       Q.Score   Author
+xxHash          5.4 GB/s     10
+CrapWow         3.2 GB/s      2       Andrew
+MumurHash 3a    2.7 GB/s     10       Austin Appleby
+SpookyHash      2.0 GB/s     10       Bob Jenkins
+SBox            1.4 GB/s      9       Bret Mulvey
+Lookup3         1.2 GB/s      9       Bob Jenkins
+SuperFastHash   1.2 GB/s      1       Paul Hsieh
+CityHash64      1.05 GB/s    10       Pike & Alakuijala
+FNV             0.55 GB/s     5       Fowler, Noll, Vo
+CRC32           0.43 GB/s     9
+MD5-32          0.33 GB/s    10       Ronald L. Rivest
+SHA1-32         0.28 GB/s    10
+
+Q.Score is a measure of quality of the hash function.
+It depends on successfully passing SMHasher test set.
+10 is a perfect score.
+
+A 64-bits version, named XXH64, is available since r35.
+It offers much better speed, but for 64-bits applications only.
+Name     Speed on 64 bits    Speed on 32 bits
+XXH64       13.8 GB/s            1.9 GB/s
+XXH32        6.8 GB/s            6.0 GB/s
+*/
+
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
+#ifndef XXHASH_H_5627135585666179
+#define XXHASH_H_5627135585666179 1
+
+
+/* ****************************
+*  Definitions
+******************************/
+#include "zstd_deps.h"
+typedef enum { XXH_OK=0, XXH_ERROR } XXH_errorcode;
+
+
+/* ****************************
+*  API modifier
+******************************/
+/** XXH_PRIVATE_API
+*   This is useful if you want to include xxhash functions in `static` mode
+*   in order to inline them, and remove their symbol from the public list.
+*   Methodology :
+*     #define XXH_PRIVATE_API
+*     #include "xxhash.h"
+*   `xxhash.c` is automatically included.
+*   It's not useful to compile and link it as a separate module anymore.
+*/
+#ifdef XXH_PRIVATE_API
+#  ifndef XXH_STATIC_LINKING_ONLY
+#    define XXH_STATIC_LINKING_ONLY
+#  endif
+#  if defined(__GNUC__)
+#    define XXH_PUBLIC_API static __inline __attribute__((unused))
+#  elif defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */)
+#    define XXH_PUBLIC_API static inline
+#  elif defined(_MSC_VER)
+#    define XXH_PUBLIC_API static __inline
+#  else
+#    define XXH_PUBLIC_API static   /* this version may generate warnings for unused static functions; disable the relevant warning */
+#  endif
+#else
+#  define XXH_PUBLIC_API   /* do nothing */
+#endif /* XXH_PRIVATE_API */
+
+/*!XXH_NAMESPACE, aka Namespace Emulation :
+
+If you want to include _and expose_ xxHash functions from within your own library,
+but also want to avoid symbol collisions with another library which also includes xxHash,
+
+you can use XXH_NAMESPACE, to automatically prefix any public symbol from xxhash library
+with the value of XXH_NAMESPACE (so avoid to keep it NULL and avoid numeric values).
+
+Note that no change is required within the calling program as long as it includes `xxhash.h` :
+regular symbol name will be automatically translated by this header.
+*/
+#ifdef XXH_NAMESPACE
+#  define XXH_CAT(A,B) A##B
+#  define XXH_NAME2(A,B) XXH_CAT(A,B)
+#  define XXH32 XXH_NAME2(XXH_NAMESPACE, XXH32)
+#  define XXH64 XXH_NAME2(XXH_NAMESPACE, XXH64)
+#  define XXH_versionNumber XXH_NAME2(XXH_NAMESPACE, XXH_versionNumber)
+#  define XXH32_createState XXH_NAME2(XXH_NAMESPACE, XXH32_createState)
+#  define XXH64_createState XXH_NAME2(XXH_NAMESPACE, XXH64_createState)
+#  define XXH32_freeState XXH_NAME2(XXH_NAMESPACE, XXH32_freeState)
+#  define XXH64_freeState XXH_NAME2(XXH_NAMESPACE, XXH64_freeState)
+#  define XXH32_reset XXH_NAME2(XXH_NAMESPACE, XXH32_reset)
+#  define XXH64_reset XXH_NAME2(XXH_NAMESPACE, XXH64_reset)
+#  define XXH32_update XXH_NAME2(XXH_NAMESPACE, XXH32_update)
+#  define XXH64_update XXH_NAME2(XXH_NAMESPACE, XXH64_update)
+#  define XXH32_digest XXH_NAME2(XXH_NAMESPACE, XXH32_digest)
+#  define XXH64_digest XXH_NAME2(XXH_NAMESPACE, XXH64_digest)
+#  define XXH32_copyState XXH_NAME2(XXH_NAMESPACE, XXH32_copyState)
+#  define XXH64_copyState XXH_NAME2(XXH_NAMESPACE, XXH64_copyState)
+#  define XXH32_canonicalFromHash XXH_NAME2(XXH_NAMESPACE, XXH32_canonicalFromHash)
+#  define XXH64_canonicalFromHash XXH_NAME2(XXH_NAMESPACE, XXH64_canonicalFromHash)
+#  define XXH32_hashFromCanonical XXH_NAME2(XXH_NAMESPACE, XXH32_hashFromCanonical)
+#  define XXH64_hashFromCanonical XXH_NAME2(XXH_NAMESPACE, XXH64_hashFromCanonical)
+#endif
+
+
+/* *************************************
+*  Version
+***************************************/
+#define XXH_VERSION_MAJOR    0
+#define XXH_VERSION_MINOR    6
+#define XXH_VERSION_RELEASE  2
+#define XXH_VERSION_NUMBER  (XXH_VERSION_MAJOR *100*100 + XXH_VERSION_MINOR *100 + XXH_VERSION_RELEASE)
+XXH_PUBLIC_API unsigned XXH_versionNumber (void);
+
+
+/* ****************************
+*  Simple Hash Functions
+******************************/
+typedef unsigned int       XXH32_hash_t;
+typedef unsigned long long XXH64_hash_t;
+
+XXH_PUBLIC_API XXH32_hash_t XXH32 (const void* input, size_t length, unsigned int seed);
+XXH_PUBLIC_API XXH64_hash_t XXH64 (const void* input, size_t length, unsigned long long seed);
+
+/*!
+XXH32() :
+    Calculate the 32-bits hash of sequence "length" bytes stored at memory address "input".
+    The memory between input & input+length must be valid (allocated and read-accessible).
+    "seed" can be used to alter the result predictably.
+    Speed on Core 2 Duo @ 3 GHz (single thread, SMHasher benchmark) : 5.4 GB/s
+XXH64() :
+    Calculate the 64-bits hash of sequence of length "len" stored at memory address "input".
+    "seed" can be used to alter the result predictably.
+    This function runs 2x faster on 64-bits systems, but slower on 32-bits systems (see benchmark).
+*/
+
+
+/* ****************************
+*  Streaming Hash Functions
+******************************/
+typedef struct XXH32_state_s XXH32_state_t;   /* incomplete type */
+typedef struct XXH64_state_s XXH64_state_t;   /* incomplete type */
+
+/*! State allocation, compatible with dynamic libraries */
+
+XXH_PUBLIC_API XXH32_state_t* XXH32_createState(void);
+XXH_PUBLIC_API XXH_errorcode  XXH32_freeState(XXH32_state_t* statePtr);
+
+XXH_PUBLIC_API XXH64_state_t* XXH64_createState(void);
+XXH_PUBLIC_API XXH_errorcode  XXH64_freeState(XXH64_state_t* statePtr);
+
+
+/* hash streaming */
+
+XXH_PUBLIC_API XXH_errorcode XXH32_reset  (XXH32_state_t* statePtr, unsigned int seed);
+XXH_PUBLIC_API XXH_errorcode XXH32_update (XXH32_state_t* statePtr, const void* input, size_t length);
+XXH_PUBLIC_API XXH32_hash_t  XXH32_digest (const XXH32_state_t* statePtr);
+
+XXH_PUBLIC_API XXH_errorcode XXH64_reset  (XXH64_state_t* statePtr, unsigned long long seed);
+XXH_PUBLIC_API XXH_errorcode XXH64_update (XXH64_state_t* statePtr, const void* input, size_t length);
+XXH_PUBLIC_API XXH64_hash_t  XXH64_digest (const XXH64_state_t* statePtr);
+
+/*
+These functions generate the xxHash of an input provided in multiple segments.
+Note that, for small input, they are slower than single-call functions, due to state management.
+For small input, prefer `XXH32()` and `XXH64()` .
+
+XXH state must first be allocated, using XXH*_createState() .
+
+Start a new hash by initializing state with a seed, using XXH*_reset().
+
+Then, feed the hash state by calling XXH*_update() as many times as necessary.
+Obviously, input must be allocated and read accessible.
+The function returns an error code, with 0 meaning OK, and any other value meaning there is an error.
+
+Finally, a hash value can be produced anytime, by using XXH*_digest().
+This function returns the nn-bits hash as an int or long long.
+
+It's still possible to continue inserting input into the hash state after a digest,
+and generate some new hashes later on, by calling again XXH*_digest().
+
+When done, free XXH state space if it was allocated dynamically.
+*/
+
+
+/* **************************
+*  Utils
+****************************/
+#if !(defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L))   /* ! C99 */
+#  define restrict   /* disable restrict */
+#endif
+
+XXH_PUBLIC_API void XXH32_copyState(XXH32_state_t* restrict dst_state, const XXH32_state_t* restrict src_state);
+XXH_PUBLIC_API void XXH64_copyState(XXH64_state_t* restrict dst_state, const XXH64_state_t* restrict src_state);
+
+
+/* **************************
+*  Canonical representation
+****************************/
+/* Default result type for XXH functions are primitive unsigned 32 and 64 bits.
+*  The canonical representation uses human-readable write convention, aka big-endian (large digits first).
+*  These functions allow transformation of hash result into and from its canonical format.
+*  This way, hash values can be written into a file / memory, and remain comparable on different systems and programs.
+*/
+typedef struct { unsigned char digest[4]; } XXH32_canonical_t;
+typedef struct { unsigned char digest[8]; } XXH64_canonical_t;
+
+XXH_PUBLIC_API void XXH32_canonicalFromHash(XXH32_canonical_t* dst, XXH32_hash_t hash);
+XXH_PUBLIC_API void XXH64_canonicalFromHash(XXH64_canonical_t* dst, XXH64_hash_t hash);
+
+XXH_PUBLIC_API XXH32_hash_t XXH32_hashFromCanonical(const XXH32_canonical_t* src);
+XXH_PUBLIC_API XXH64_hash_t XXH64_hashFromCanonical(const XXH64_canonical_t* src);
+
+#endif /* XXHASH_H_5627135585666179 */
+
+
+
+/* ================================================================================================
+   This section contains definitions which are not guaranteed to remain stable.
+   They may change in future versions, becoming incompatible with a different version of the library.
+   They shall only be used with static linking.
+   Never use these definitions in association with dynamic linking !
+=================================================================================================== */
+#if defined(XXH_STATIC_LINKING_ONLY) && !defined(XXH_STATIC_H_3543687687345)
+#define XXH_STATIC_H_3543687687345
+
+/* These definitions are only meant to allow allocation of XXH state
+   statically, on stack, or in a struct for example.
+   Do not use members directly. */
+
+   struct XXH32_state_s {
+       unsigned total_len_32;
+       unsigned large_len;
+       unsigned v1;
+       unsigned v2;
+       unsigned v3;
+       unsigned v4;
+       unsigned mem32[4];   /* buffer defined as U32 for alignment */
+       unsigned memsize;
+       unsigned reserved;   /* never read nor write, will be removed in a future version */
+   };   /* typedef'd to XXH32_state_t */
+
+   struct XXH64_state_s {
+       unsigned long long total_len;
+       unsigned long long v1;
+       unsigned long long v2;
+       unsigned long long v3;
+       unsigned long long v4;
+       unsigned long long mem64[4];   /* buffer defined as U64 for alignment */
+       unsigned memsize;
+       unsigned reserved[2];          /* never read nor write, will be removed in a future version */
+   };   /* typedef'd to XXH64_state_t */
+
+
+#  ifdef XXH_PRIVATE_API
+#    include "xxhash.c"   /* include xxhash functions as `static`, for inlining */
+#  endif
+
+#endif /* XXH_STATIC_LINKING_ONLY && XXH_STATIC_H_3543687687345 */
+
+
+#if defined (__cplusplus)
+}
+#endif
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/zstd_common.c mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/zstd_common.c
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/zstd_common.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/zstd_common.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+
+
+/*-*************************************
+*  Dependencies
+***************************************/
+#define ZSTD_DEPS_NEED_MALLOC
+#include "zstd_deps.h"   /* ZSTD_malloc, ZSTD_calloc, ZSTD_free, ZSTD_memset */
+#include "error_private.h"
+#include "zstd_internal.h"
+
+
+/*-****************************************
+*  Version
+******************************************/
+unsigned ZSTD_versionNumber(void) { return ZSTD_VERSION_NUMBER; }
+
+const char* ZSTD_versionString(void) { return ZSTD_VERSION_STRING; }
+
+
+/*-****************************************
+*  ZSTD Error Management
+******************************************/
+#undef ZSTD_isError   /* defined within zstd_internal.h */
+/*! ZSTD_isError() :
+ *  tells if a return value is an error code
+ *  symbol is required for external callers */
+unsigned ZSTD_isError(size_t code) { return ERR_isError(code); }
+
+/*! ZSTD_getErrorName() :
+ *  provides error code string from function result (useful for debugging) */
+const char* ZSTD_getErrorName(size_t code) { return ERR_getErrorName(code); }
+
+/*! ZSTD_getError() :
+ *  convert a `size_t` function result into a proper ZSTD_errorCode enum */
+ZSTD_ErrorCode ZSTD_getErrorCode(size_t code) { return ERR_getErrorCode(code); }
+
+/*! ZSTD_getErrorString() :
+ *  provides error code string from enum */
+const char* ZSTD_getErrorString(ZSTD_ErrorCode code) { return ERR_getErrorString(code); }
+
+
+
+/*=**************************************************************
+*  Custom allocator
+****************************************************************/
+void* ZSTD_customMalloc(size_t size, ZSTD_customMem customMem)
+{
+    if (customMem.customAlloc)
+        return customMem.customAlloc(customMem.opaque, size);
+    return ZSTD_malloc(size);
+}
+
+void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem)
+{
+    if (customMem.customAlloc) {
+        /* calloc implemented as malloc+memset;
+         * not as efficient as calloc, but next best guess for custom malloc */
+        void* const ptr = customMem.customAlloc(customMem.opaque, size);
+        ZSTD_memset(ptr, 0, size);
+        return ptr;
+    }
+    return ZSTD_calloc(1, size);
+}
+
+void ZSTD_customFree(void* ptr, ZSTD_customMem customMem)
+{
+    if (ptr!=NULL) {
+        if (customMem.customFree)
+            customMem.customFree(customMem.opaque, ptr);
+        else
+            ZSTD_free(ptr);
+    }
+}
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/zstd_deps.h mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/zstd_deps.h
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/zstd_deps.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/zstd_deps.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+/* This file provides common libc dependencies that zstd requires.
+ * The purpose is to allow replacing this file with a custom implementation
+ * to compile zstd without libc support.
+ */
+
+/* Need:
+ * NULL
+ * INT_MAX
+ * UINT_MAX
+ * ZSTD_memcpy()
+ * ZSTD_memset()
+ * ZSTD_memmove()
+ */
+#ifndef ZSTD_DEPS_COMMON
+#define ZSTD_DEPS_COMMON
+
+#include <limits.h>
+#include <stddef.h>
+#include <string.h>
+
+#if defined(__GNUC__) && __GNUC__ >= 4
+# define ZSTD_memcpy(d,s,l) __builtin_memcpy((d),(s),(l))
+# define ZSTD_memmove(d,s,l) __builtin_memmove((d),(s),(l))
+# define ZSTD_memset(p,v,l) __builtin_memset((p),(v),(l))
+#else
+# define ZSTD_memcpy(d,s,l) memcpy((d),(s),(l))
+# define ZSTD_memmove(d,s,l) memmove((d),(s),(l))
+# define ZSTD_memset(p,v,l) memset((p),(v),(l))
+#endif
+
+#endif /* ZSTD_DEPS_COMMON */
+
+/* Need:
+ * ZSTD_malloc()
+ * ZSTD_free()
+ * ZSTD_calloc()
+ */
+#ifdef ZSTD_DEPS_NEED_MALLOC
+#ifndef ZSTD_DEPS_MALLOC
+#define ZSTD_DEPS_MALLOC
+
+#include <stdlib.h>
+
+#define ZSTD_malloc(s) malloc(s)
+#define ZSTD_calloc(n,s) calloc((n), (s))
+#define ZSTD_free(p) free((p))
+
+#endif /* ZSTD_DEPS_MALLOC */
+#endif /* ZSTD_DEPS_NEED_MALLOC */
+
+/*
+ * Provides 64-bit math support.
+ * Need:
+ * U64 ZSTD_div64(U64 dividend, U32 divisor)
+ */
+#ifdef ZSTD_DEPS_NEED_MATH64
+#ifndef ZSTD_DEPS_MATH64
+#define ZSTD_DEPS_MATH64
+
+#define ZSTD_div64(dividend, divisor) ((dividend) / (divisor))
+
+#endif /* ZSTD_DEPS_MATH64 */
+#endif /* ZSTD_DEPS_NEED_MATH64 */
+
+/* Need:
+ * assert()
+ */
+#ifdef ZSTD_DEPS_NEED_ASSERT
+#ifndef ZSTD_DEPS_ASSERT
+#define ZSTD_DEPS_ASSERT
+
+#include <assert.h>
+
+#endif /* ZSTD_DEPS_ASSERT */
+#endif /* ZSTD_DEPS_NEED_ASSERT */
+
+/* Need:
+ * ZSTD_DEBUG_PRINT()
+ */
+#ifdef ZSTD_DEPS_NEED_IO
+#ifndef ZSTD_DEPS_IO
+#define ZSTD_DEPS_IO
+
+#include <stdio.h>
+#define ZSTD_DEBUG_PRINT(...) fprintf(stderr, __VA_ARGS__)
+
+#endif /* ZSTD_DEPS_IO */
+#endif /* ZSTD_DEPS_NEED_IO */
+
+/* Only requested when <stdint.h> is known to be present.
+ * Need:
+ * intptr_t
+ */
+#ifdef ZSTD_DEPS_NEED_STDINT
+#ifndef ZSTD_DEPS_STDINT
+#define ZSTD_DEPS_STDINT
+
+#include <stdint.h>
+
+#endif /* ZSTD_DEPS_STDINT */
+#endif /* ZSTD_DEPS_NEED_STDINT */
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/zstd_internal.h mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/zstd_internal.h
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/zstd_internal.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/zstd_internal.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,490 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+#ifndef ZSTD_CCOMMON_H_MODULE
+#define ZSTD_CCOMMON_H_MODULE
+
+/* this module contains definitions which must be identical
+ * across compression, decompression and dictBuilder.
+ * It also contains a few functions useful to at least 2 of them
+ * and which benefit from being inlined */
+
+/*-*************************************
+*  Dependencies
+***************************************/
+#if !defined(ZSTD_NO_INTRINSICS) && defined(__ARM_NEON)
+#include <arm_neon.h>
+#endif
+#include "compiler.h"
+#include "mem.h"
+#include "debug.h"                 /* assert, DEBUGLOG, RAWLOG, g_debuglevel */
+#include "error_private.h"
+#define ZSTD_STATIC_LINKING_ONLY
+#include "../zstd.h"
+#define FSE_STATIC_LINKING_ONLY
+#include "fse.h"
+#define HUF_STATIC_LINKING_ONLY
+#include "huf.h"
+#ifndef XXH_STATIC_LINKING_ONLY
+#  define XXH_STATIC_LINKING_ONLY  /* XXH64_state_t */
+#endif
+#include "xxhash.h"                /* XXH_reset, update, digest */
+#ifndef ZSTD_NO_TRACE
+#  include "zstd_trace.h"
+#else
+#  define ZSTD_TRACE 0
+#endif
+
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
+/* ---- static assert (debug) --- */
+#define ZSTD_STATIC_ASSERT(c) DEBUG_STATIC_ASSERT(c)
+#define ZSTD_isError ERR_isError   /* for inlining */
+#define FSE_isError  ERR_isError
+#define HUF_isError  ERR_isError
+
+
+/*-*************************************
+*  shared macros
+***************************************/
+#undef MIN
+#undef MAX
+#define MIN(a,b) ((a)<(b) ? (a) : (b))
+#define MAX(a,b) ((a)>(b) ? (a) : (b))
+
+/**
+ * Ignore: this is an internal helper.
+ *
+ * This is a helper function to help force C99-correctness during compilation.
+ * Under strict compilation modes, variadic macro arguments can't be empty.
+ * However, variadic function arguments can be. Using a function therefore lets
+ * us statically check that at least one (string) argument was passed,
+ * independent of the compilation flags.
+ */
+static INLINE_KEYWORD UNUSED_ATTR
+void _force_has_format_string(const char *format, ...) {
+  (void)format;
+}
+
+/**
+ * Ignore: this is an internal helper.
+ *
+ * We want to force this function invocation to be syntactically correct, but
+ * we don't want to force runtime evaluation of its arguments.
+ */
+#define _FORCE_HAS_FORMAT_STRING(...) \
+  if (0) { \
+    _force_has_format_string(__VA_ARGS__); \
+  }
+
+/**
+ * Return the specified error if the condition evaluates to true.
+ *
+ * In debug modes, prints additional information.
+ * In order to do that (particularly, printing the conditional that failed),
+ * this can't just wrap RETURN_ERROR().
+ */
+#define RETURN_ERROR_IF(cond, err, ...) \
+  if (cond) { \
+    RAWLOG(3, "%s:%d: ERROR!: check %s failed, returning %s", \
+           __FILE__, __LINE__, ZSTD_QUOTE(cond), ZSTD_QUOTE(ERROR(err))); \
+    _FORCE_HAS_FORMAT_STRING(__VA_ARGS__); \
+    RAWLOG(3, ": " __VA_ARGS__); \
+    RAWLOG(3, "\n"); \
+    return ERROR(err); \
+  }
+
+/**
+ * Unconditionally return the specified error.
+ *
+ * In debug modes, prints additional information.
+ */
+#define RETURN_ERROR(err, ...) \
+  do { \
+    RAWLOG(3, "%s:%d: ERROR!: unconditional check failed, returning %s", \
+           __FILE__, __LINE__, ZSTD_QUOTE(ERROR(err))); \
+    _FORCE_HAS_FORMAT_STRING(__VA_ARGS__); \
+    RAWLOG(3, ": " __VA_ARGS__); \
+    RAWLOG(3, "\n"); \
+    return ERROR(err); \
+  } while(0);
+
+/**
+ * If the provided expression evaluates to an error code, returns that error code.
+ *
+ * In debug modes, prints additional information.
+ */
+#define FORWARD_IF_ERROR(err, ...) \
+  do { \
+    size_t const err_code = (err); \
+    if (ERR_isError(err_code)) { \
+      RAWLOG(3, "%s:%d: ERROR!: forwarding error in %s: %s", \
+             __FILE__, __LINE__, ZSTD_QUOTE(err), ERR_getErrorName(err_code)); \
+      _FORCE_HAS_FORMAT_STRING(__VA_ARGS__); \
+      RAWLOG(3, ": " __VA_ARGS__); \
+      RAWLOG(3, "\n"); \
+      return err_code; \
+    } \
+  } while(0);
+
+
+/*-*************************************
+*  Common constants
+***************************************/
+#define ZSTD_OPT_NUM    (1<<12)
+
+#define ZSTD_REP_NUM      3                 /* number of repcodes */
+#define ZSTD_REP_MOVE     (ZSTD_REP_NUM-1)
+static UNUSED_ATTR const U32 repStartValue[ZSTD_REP_NUM] = { 1, 4, 8 };
+
+#define KB *(1 <<10)
+#define MB *(1 <<20)
+#define GB *(1U<<30)
+
+#define BIT7 128
+#define BIT6  64
+#define BIT5  32
+#define BIT4  16
+#define BIT1   2
+#define BIT0   1
+
+#define ZSTD_WINDOWLOG_ABSOLUTEMIN 10
+static UNUSED_ATTR const size_t ZSTD_fcs_fieldSize[4] = { 0, 2, 4, 8 };
+static UNUSED_ATTR const size_t ZSTD_did_fieldSize[4] = { 0, 1, 2, 4 };
+
+#define ZSTD_FRAMEIDSIZE 4   /* magic number size */
+
+#define ZSTD_BLOCKHEADERSIZE 3   /* C standard doesn't allow `static const` variable to be init using another `static const` variable */
+static UNUSED_ATTR const size_t ZSTD_blockHeaderSize = ZSTD_BLOCKHEADERSIZE;
+typedef enum { bt_raw, bt_rle, bt_compressed, bt_reserved } blockType_e;
+
+#define ZSTD_FRAMECHECKSUMSIZE 4
+
+#define MIN_SEQUENCES_SIZE 1 /* nbSeq==0 */
+#define MIN_CBLOCK_SIZE (1 /*litCSize*/ + 1 /* RLE or RAW */ + MIN_SEQUENCES_SIZE /* nbSeq==0 */)   /* for a non-null block */
+
+#define HufLog 12
+typedef enum { set_basic, set_rle, set_compressed, set_repeat } symbolEncodingType_e;
+
+#define LONGNBSEQ 0x7F00
+
+#define MINMATCH 3
+
+#define Litbits  8
+#define MaxLit ((1<<Litbits) - 1)
+#define MaxML   52
+#define MaxLL   35
+#define DefaultMaxOff 28
+#define MaxOff  31
+#define MaxSeq MAX(MaxLL, MaxML)   /* Assumption : MaxOff < MaxLL,MaxML */
+#define MLFSELog    9
+#define LLFSELog    9
+#define OffFSELog   8
+#define MaxFSELog  MAX(MAX(MLFSELog, LLFSELog), OffFSELog)
+
+#define ZSTD_MAX_HUF_HEADER_SIZE 128 /* header + <= 127 byte tree description */
+/* Each table cannot take more than #symbols * FSELog bits */
+#define ZSTD_MAX_FSE_HEADERS_SIZE (((MaxML + 1) * MLFSELog + (MaxLL + 1) * LLFSELog + (MaxOff + 1) * OffFSELog + 7) / 8)
+
+static UNUSED_ATTR const U32 LL_bits[MaxLL+1] = {
+     0, 0, 0, 0, 0, 0, 0, 0,
+     0, 0, 0, 0, 0, 0, 0, 0,
+     1, 1, 1, 1, 2, 2, 3, 3,
+     4, 6, 7, 8, 9,10,11,12,
+    13,14,15,16
+};
+static UNUSED_ATTR const S16 LL_defaultNorm[MaxLL+1] = {
+     4, 3, 2, 2, 2, 2, 2, 2,
+     2, 2, 2, 2, 2, 1, 1, 1,
+     2, 2, 2, 2, 2, 2, 2, 2,
+     2, 3, 2, 1, 1, 1, 1, 1,
+    -1,-1,-1,-1
+};
+#define LL_DEFAULTNORMLOG 6  /* for static allocation */
+static UNUSED_ATTR const U32 LL_defaultNormLog = LL_DEFAULTNORMLOG;
+
+static UNUSED_ATTR const U32 ML_bits[MaxML+1] = {
+     0, 0, 0, 0, 0, 0, 0, 0,
+     0, 0, 0, 0, 0, 0, 0, 0,
+     0, 0, 0, 0, 0, 0, 0, 0,
+     0, 0, 0, 0, 0, 0, 0, 0,
+     1, 1, 1, 1, 2, 2, 3, 3,
+     4, 4, 5, 7, 8, 9,10,11,
+    12,13,14,15,16
+};
+static UNUSED_ATTR const S16 ML_defaultNorm[MaxML+1] = {
+     1, 4, 3, 2, 2, 2, 2, 2,
+     2, 1, 1, 1, 1, 1, 1, 1,
+     1, 1, 1, 1, 1, 1, 1, 1,
+     1, 1, 1, 1, 1, 1, 1, 1,
+     1, 1, 1, 1, 1, 1, 1, 1,
+     1, 1, 1, 1, 1, 1,-1,-1,
+    -1,-1,-1,-1,-1
+};
+#define ML_DEFAULTNORMLOG 6  /* for static allocation */
+static UNUSED_ATTR const U32 ML_defaultNormLog = ML_DEFAULTNORMLOG;
+
+static UNUSED_ATTR const S16 OF_defaultNorm[DefaultMaxOff+1] = {
+     1, 1, 1, 1, 1, 1, 2, 2,
+     2, 1, 1, 1, 1, 1, 1, 1,
+     1, 1, 1, 1, 1, 1, 1, 1,
+    -1,-1,-1,-1,-1
+};
+#define OF_DEFAULTNORMLOG 5  /* for static allocation */
+static UNUSED_ATTR const U32 OF_defaultNormLog = OF_DEFAULTNORMLOG;
+
+
+/*-*******************************************
+*  Shared functions to include for inlining
+*********************************************/
+static void ZSTD_copy8(void* dst, const void* src) {
+#if !defined(ZSTD_NO_INTRINSICS) && defined(__ARM_NEON)
+    vst1_u8((uint8_t*)dst, vld1_u8((const uint8_t*)src));
+#else
+    ZSTD_memcpy(dst, src, 8);
+#endif
+}
+
+#define COPY8(d,s) { ZSTD_copy8(d,s); d+=8; s+=8; }
+static void ZSTD_copy16(void* dst, const void* src) {
+#if !defined(ZSTD_NO_INTRINSICS) && defined(__ARM_NEON)
+    vst1q_u8((uint8_t*)dst, vld1q_u8((const uint8_t*)src));
+#else
+    ZSTD_memcpy(dst, src, 16);
+#endif
+}
+#define COPY16(d,s) { ZSTD_copy16(d,s); d+=16; s+=16; }
+
+#define WILDCOPY_OVERLENGTH 32
+#define WILDCOPY_VECLEN 16
+
+typedef enum {
+    ZSTD_no_overlap,
+    ZSTD_overlap_src_before_dst
+    /*  ZSTD_overlap_dst_before_src, */
+} ZSTD_overlap_e;
+
+/*! ZSTD_wildcopy() :
+ *  Custom version of ZSTD_memcpy(), can over read/write up to WILDCOPY_OVERLENGTH bytes (if length==0)
+ *  @param ovtype controls the overlap detection
+ *         - ZSTD_no_overlap: The source and destination are guaranteed to be at least WILDCOPY_VECLEN bytes apart.
+ *         - ZSTD_overlap_src_before_dst: The src and dst may overlap, but they MUST be at least 8 bytes apart.
+ *           The src buffer must be before the dst buffer.
+ */
+MEM_STATIC FORCE_INLINE_ATTR
+void ZSTD_wildcopy(void* dst, const void* src, ptrdiff_t length, ZSTD_overlap_e const ovtype)
+{
+    ptrdiff_t diff = (BYTE*)dst - (const BYTE*)src;
+    const BYTE* ip = (const BYTE*)src;
+    BYTE* op = (BYTE*)dst;
+    BYTE* const oend = op + length;
+
+    assert(diff >= 8 || (ovtype == ZSTD_no_overlap && diff <= -WILDCOPY_VECLEN));
+
+    if (ovtype == ZSTD_overlap_src_before_dst && diff < WILDCOPY_VECLEN) {
+        /* Handle short offset copies. */
+        do {
+            COPY8(op, ip)
+        } while (op < oend);
+    } else {
+        assert(diff >= WILDCOPY_VECLEN || diff <= -WILDCOPY_VECLEN);
+        /* Separate out the first COPY16() call because the copy length is
+         * almost certain to be short, so the branches have different
+         * probabilities. Since it is almost certain to be short, only do
+         * one COPY16() in the first call. Then, do two calls per loop since
+         * at that point it is more likely to have a high trip count.
+         */
+#ifdef __aarch64__
+        do {
+            COPY16(op, ip);
+        }
+        while (op < oend);
+#else
+        ZSTD_copy16(op, ip);
+        if (16 >= length) return;
+        op += 16;
+        ip += 16;
+        do {
+            COPY16(op, ip);
+            COPY16(op, ip);
+        }
+        while (op < oend);
+#endif
+    }
+}
+
+MEM_STATIC size_t ZSTD_limitCopy(void* dst, size_t dstCapacity, const void* src, size_t srcSize)
+{
+    size_t const length = MIN(dstCapacity, srcSize);
+    if (length > 0) {
+        ZSTD_memcpy(dst, src, length);
+    }
+    return length;
+}
+
+/* define "workspace is too large" as this number of times larger than needed */
+#define ZSTD_WORKSPACETOOLARGE_FACTOR 3
+
+/* when workspace is continuously too large
+ * during at least this number of times,
+ * context's memory usage is considered wasteful,
+ * because it's sized to handle a worst case scenario which rarely happens.
+ * In which case, resize it down to free some memory */
+#define ZSTD_WORKSPACETOOLARGE_MAXDURATION 128
+
+/* Controls whether the input/output buffer is buffered or stable. */
+typedef enum {
+    ZSTD_bm_buffered = 0,  /* Buffer the input/output */
+    ZSTD_bm_stable = 1     /* ZSTD_inBuffer/ZSTD_outBuffer is stable */
+} ZSTD_bufferMode_e;
+
+
+/*-*******************************************
+*  Private declarations
+*********************************************/
+typedef struct seqDef_s {
+    U32 offset;         /* offset == rawOffset + ZSTD_REP_NUM, or equivalently, offCode + 1 */
+    U16 litLength;
+    U16 matchLength;
+} seqDef;
+
+/* Controls whether seqStore has a single "long" litLength or matchLength. See seqStore_t. */
+typedef enum {
+    ZSTD_llt_none = 0,             /* no longLengthType */
+    ZSTD_llt_literalLength = 1,    /* represents a long literal */
+    ZSTD_llt_matchLength = 2       /* represents a long match */
+} ZSTD_longLengthType_e;
+
+typedef struct {
+    seqDef* sequencesStart;
+    seqDef* sequences;      /* ptr to end of sequences */
+    BYTE* litStart;
+    BYTE* lit;              /* ptr to end of literals */
+    BYTE* llCode;
+    BYTE* mlCode;
+    BYTE* ofCode;
+    size_t maxNbSeq;
+    size_t maxNbLit;
+
+    /* longLengthPos and longLengthType to allow us to represent either a single litLength or matchLength
+     * in the seqStore that has a value larger than U16 (if it exists). To do so, we increment
+     * the existing value of the litLength or matchLength by 0x10000.
+     */
+    ZSTD_longLengthType_e   longLengthType;
+    U32                     longLengthPos;  /* Index of the sequence to apply long length modification to */
+} seqStore_t;
+
+typedef struct {
+    U32 litLength;
+    U32 matchLength;
+} ZSTD_sequenceLength;
+
+/**
+ * Returns the ZSTD_sequenceLength for the given sequences. It handles the decoding of long sequences
+ * indicated by longLengthPos and longLengthType, and adds MINMATCH back to matchLength.
+ */
+MEM_STATIC ZSTD_sequenceLength ZSTD_getSequenceLength(seqStore_t const* seqStore, seqDef const* seq)
+{
+    ZSTD_sequenceLength seqLen;
+    seqLen.litLength = seq->litLength;
+    seqLen.matchLength = seq->matchLength + MINMATCH;
+    if (seqStore->longLengthPos == (U32)(seq - seqStore->sequencesStart)) {
+        if (seqStore->longLengthType == ZSTD_llt_literalLength) {
+            seqLen.litLength += 0xFFFF;
+        }
+        if (seqStore->longLengthType == ZSTD_llt_matchLength) {
+            seqLen.matchLength += 0xFFFF;
+        }
+    }
+    return seqLen;
+}
+
+/**
+ * Contains the compressed frame size and an upper-bound for the decompressed frame size.
+ * Note: before using `compressedSize`, check for errors using ZSTD_isError().
+ *       similarly, before using `decompressedBound`, check for errors using:
+ *          `decompressedBound != ZSTD_CONTENTSIZE_ERROR`
+ */
+typedef struct {
+    size_t compressedSize;
+    unsigned long long decompressedBound;
+} ZSTD_frameSizeInfo;   /* decompress & legacy */
+
+const seqStore_t* ZSTD_getSeqStore(const ZSTD_CCtx* ctx);   /* compress & dictBuilder */
+void ZSTD_seqToCodes(const seqStore_t* seqStorePtr);   /* compress, dictBuilder, decodeCorpus (shouldn't get its definition from here) */
+
+/* custom memory allocation functions */
+void* ZSTD_customMalloc(size_t size, ZSTD_customMem customMem);
+void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem);
+void ZSTD_customFree(void* ptr, ZSTD_customMem customMem);
+
+
+MEM_STATIC U32 ZSTD_highbit32(U32 val)   /* compress, dictBuilder, decodeCorpus */
+{
+    assert(val != 0);
+    {
+#   if defined(_MSC_VER)   /* Visual */
+#       if STATIC_BMI2 == 1
+            return _lzcnt_u32(val)^31;
+#       else
+            unsigned long r=0;
+            return _BitScanReverse(&r, val) ? (unsigned)r : 0;
+#       endif
+#   elif defined(__GNUC__) && (__GNUC__ >= 3)   /* GCC Intrinsic */
+        return __builtin_clz (val) ^ 31;
+#   elif defined(__ICCARM__)    /* IAR Intrinsic */
+        return 31 - __CLZ(val);
+#   else   /* Software version */
+        static const U32 DeBruijnClz[32] = { 0, 9, 1, 10, 13, 21, 2, 29, 11, 14, 16, 18, 22, 25, 3, 30, 8, 12, 20, 28, 15, 17, 24, 7, 19, 27, 23, 6, 26, 5, 4, 31 };
+        U32 v = val;
+        v |= v >> 1;
+        v |= v >> 2;
+        v |= v >> 4;
+        v |= v >> 8;
+        v |= v >> 16;
+        return DeBruijnClz[(v * 0x07C4ACDDU) >> 27];
+#   endif
+    }
+}
+
+
+/* ZSTD_invalidateRepCodes() :
+ * ensures next compression will not use repcodes from previous block.
+ * Note : only works with regular variant;
+ *        do not use with extDict variant ! */
+void ZSTD_invalidateRepCodes(ZSTD_CCtx* cctx);   /* zstdmt, adaptive_compression (shouldn't get this definition from here) */
+
+
+typedef struct {
+    blockType_e blockType;
+    U32 lastBlock;
+    U32 origSize;
+} blockProperties_t;   /* declared here for decompress and fullbench */
+
+/*! ZSTD_getcBlockSize() :
+ *  Provides the size of compressed block from block header `src` */
+/* Used by: decompress, fullbench (does not get its definition from here) */
+size_t ZSTD_getcBlockSize(const void* src, size_t srcSize,
+                          blockProperties_t* bpPtr);
+
+/*! ZSTD_decodeSeqHeaders() :
+ *  decode sequence header from src */
+/* Used by: decompress, fullbench (does not get its definition from here) */
+size_t ZSTD_decodeSeqHeaders(ZSTD_DCtx* dctx, int* nbSeqPtr,
+                       const void* src, size_t srcSize);
+
+
+#if defined (__cplusplus)
+}
+#endif
+
+#endif   /* ZSTD_CCOMMON_H_MODULE */
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/zstd_trace.h mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/zstd_trace.h
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/common/zstd_trace.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/common/zstd_trace.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,154 @@
+/*
+ * Copyright (c) Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+#ifndef ZSTD_TRACE_H
+#define ZSTD_TRACE_H
+
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
+#include <stddef.h>
+
+/* weak symbol support */
+#if !defined(ZSTD_HAVE_WEAK_SYMBOLS) && defined(__GNUC__) && \
+    !defined(__APPLE__) && !defined(_WIN32) && !defined(__MINGW32__) && \
+    !defined(__CYGWIN__)
+#  define ZSTD_HAVE_WEAK_SYMBOLS 1
+#else
+#  define ZSTD_HAVE_WEAK_SYMBOLS 0
+#endif
+#if ZSTD_HAVE_WEAK_SYMBOLS
+#  define ZSTD_WEAK_ATTR __attribute__((__weak__))
+#else
+#  define ZSTD_WEAK_ATTR
+#endif
+
+/* Only enable tracing when weak symbols are available. */
+#ifndef ZSTD_TRACE
+#  define ZSTD_TRACE ZSTD_HAVE_WEAK_SYMBOLS
+#endif
+
+#if ZSTD_TRACE
+
+struct ZSTD_CCtx_s;
+struct ZSTD_DCtx_s;
+struct ZSTD_CCtx_params_s;
+
+typedef struct {
+    /**
+     * ZSTD_VERSION_NUMBER
+     *
+     * This is guaranteed to be the first member of ZSTD_trace.
+     * Otherwise, this struct is not stable between versions. If
+     * the version number does not match your expectation, you
+     * should not interpret the rest of the struct.
+     */
+    unsigned version;
+    /**
+     * Non-zero if streaming (de)compression is used.
+     */
+    unsigned streaming;
+    /**
+     * The dictionary ID.
+     */
+    unsigned dictionaryID;
+    /**
+     * Is the dictionary cold?
+     * Only set on decompression.
+     */
+    unsigned dictionaryIsCold;
+    /**
+     * The dictionary size or zero if no dictionary.
+     */
+    size_t dictionarySize;
+    /**
+     * The uncompressed size of the data.
+     */
+    size_t uncompressedSize;
+    /**
+     * The compressed size of the data.
+     */
+    size_t compressedSize;
+    /**
+     * The fully resolved CCtx parameters (NULL on decompression).
+     */
+    struct ZSTD_CCtx_params_s const* params;
+    /**
+     * The ZSTD_CCtx pointer (NULL on decompression).
+     */
+    struct ZSTD_CCtx_s const* cctx;
+    /**
+     * The ZSTD_DCtx pointer (NULL on compression).
+     */
+    struct ZSTD_DCtx_s const* dctx;
+} ZSTD_Trace;
+
+/**
+ * A tracing context. It must be 0 when tracing is disabled.
+ * Otherwise, any non-zero value returned by a tracing begin()
+ * function is presented to any subsequent calls to end().
+ *
+ * Any non-zero value is treated as tracing is enabled and not
+ * interpreted by the library.
+ *
+ * Two possible uses are:
+ * * A timestamp for when the begin() function was called.
+ * * A unique key identifying the (de)compression, like the
+ *   address of the [dc]ctx pointer if you need to track
+ *   more information than just a timestamp.
+ */
+typedef unsigned long long ZSTD_TraceCtx;
+
+/**
+ * Trace the beginning of a compression call.
+ * @param cctx The dctx pointer for the compression.
+ *             It can be used as a key to map begin() to end().
+ * @returns Non-zero if tracing is enabled. The return value is
+ *          passed to ZSTD_trace_compress_end().
+ */
+ZSTD_WEAK_ATTR ZSTD_TraceCtx ZSTD_trace_compress_begin(
+    struct ZSTD_CCtx_s const* cctx);
+
+/**
+ * Trace the end of a compression call.
+ * @param ctx The return value of ZSTD_trace_compress_begin().
+ * @param trace The zstd tracing info.
+ */
+ZSTD_WEAK_ATTR void ZSTD_trace_compress_end(
+    ZSTD_TraceCtx ctx,
+    ZSTD_Trace const* trace);
+
+/**
+ * Trace the beginning of a decompression call.
+ * @param dctx The dctx pointer for the decompression.
+ *             It can be used as a key to map begin() to end().
+ * @returns Non-zero if tracing is enabled. The return value is
+ *          passed to ZSTD_trace_compress_end().
+ */
+ZSTD_WEAK_ATTR ZSTD_TraceCtx ZSTD_trace_decompress_begin(
+    struct ZSTD_DCtx_s const* dctx);
+
+/**
+ * Trace the end of a decompression call.
+ * @param ctx The return value of ZSTD_trace_decompress_begin().
+ * @param trace The zstd tracing info.
+ */
+ZSTD_WEAK_ATTR void ZSTD_trace_decompress_end(
+    ZSTD_TraceCtx ctx,
+    ZSTD_Trace const* trace);
+
+#endif /* ZSTD_TRACE */
+
+#if defined (__cplusplus)
+}
+#endif
+
+#endif /* ZSTD_TRACE_H */
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/fse_compress.c mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/fse_compress.c
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/fse_compress.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/fse_compress.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,705 @@
+/* ******************************************************************
+ * FSE : Finite State Entropy encoder
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ *
+ *  You can contact the author at :
+ *  - FSE source repository : https://github.com/Cyan4973/FiniteStateEntropy
+ *  - Public forum : https://groups.google.com/forum/#!forum/lz4c
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+****************************************************************** */
+
+/* **************************************************************
+*  Includes
+****************************************************************/
+#include "../common/compiler.h"
+#include "../common/mem.h"        /* U32, U16, etc. */
+#include "../common/debug.h"      /* assert, DEBUGLOG */
+#include "hist.h"       /* HIST_count_wksp */
+#include "../common/bitstream.h"
+#define FSE_STATIC_LINKING_ONLY
+#include "../common/fse.h"
+#include "../common/error_private.h"
+#define ZSTD_DEPS_NEED_MALLOC
+#define ZSTD_DEPS_NEED_MATH64
+#include "../common/zstd_deps.h"  /* ZSTD_malloc, ZSTD_free, ZSTD_memcpy, ZSTD_memset */
+
+
+/* **************************************************************
+*  Error Management
+****************************************************************/
+#define FSE_isError ERR_isError
+
+
+/* **************************************************************
+*  Templates
+****************************************************************/
+/*
+  designed to be included
+  for type-specific functions (template emulation in C)
+  Objective is to write these functions only once, for improved maintenance
+*/
+
+/* safety checks */
+#ifndef FSE_FUNCTION_EXTENSION
+#  error "FSE_FUNCTION_EXTENSION must be defined"
+#endif
+#ifndef FSE_FUNCTION_TYPE
+#  error "FSE_FUNCTION_TYPE must be defined"
+#endif
+
+/* Function names */
+#define FSE_CAT(X,Y) X##Y
+#define FSE_FUNCTION_NAME(X,Y) FSE_CAT(X,Y)
+#define FSE_TYPE_NAME(X,Y) FSE_CAT(X,Y)
+
+
+/* Function templates */
+
+/* FSE_buildCTable_wksp() :
+ * Same as FSE_buildCTable(), but using an externally allocated scratch buffer (`workSpace`).
+ * wkspSize should be sized to handle worst case situation, which is `1<<max_tableLog * sizeof(FSE_FUNCTION_TYPE)`
+ * workSpace must also be properly aligned with FSE_FUNCTION_TYPE requirements
+ */
+size_t FSE_buildCTable_wksp(FSE_CTable* ct,
+                      const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog,
+                            void* workSpace, size_t wkspSize)
+{
+    U32 const tableSize = 1 << tableLog;
+    U32 const tableMask = tableSize - 1;
+    void* const ptr = ct;
+    U16* const tableU16 = ( (U16*) ptr) + 2;
+    void* const FSCT = ((U32*)ptr) + 1 /* header */ + (tableLog ? tableSize>>1 : 1) ;
+    FSE_symbolCompressionTransform* const symbolTT = (FSE_symbolCompressionTransform*) (FSCT);
+    U32 const step = FSE_TABLESTEP(tableSize);
+
+    U32* cumul = (U32*)workSpace;
+    FSE_FUNCTION_TYPE* tableSymbol = (FSE_FUNCTION_TYPE*)(cumul + (maxSymbolValue + 2));
+
+    U32 highThreshold = tableSize-1;
+
+    if ((size_t)workSpace & 3) return ERROR(GENERIC); /* Must be 4 byte aligned */
+    if (FSE_BUILD_CTABLE_WORKSPACE_SIZE(maxSymbolValue, tableLog) > wkspSize) return ERROR(tableLog_tooLarge);
+    /* CTable header */
+    tableU16[-2] = (U16) tableLog;
+    tableU16[-1] = (U16) maxSymbolValue;
+    assert(tableLog < 16);   /* required for threshold strategy to work */
+
+    /* For explanations on how to distribute symbol values over the table :
+     * http://fastcompression.blogspot.fr/2014/02/fse-distributing-symbol-values.html */
+
+     #ifdef __clang_analyzer__
+     ZSTD_memset(tableSymbol, 0, sizeof(*tableSymbol) * tableSize);   /* useless initialization, just to keep scan-build happy */
+     #endif
+
+    /* symbol start positions */
+    {   U32 u;
+        cumul[0] = 0;
+        for (u=1; u <= maxSymbolValue+1; u++) {
+            if (normalizedCounter[u-1]==-1) {  /* Low proba symbol */
+                cumul[u] = cumul[u-1] + 1;
+                tableSymbol[highThreshold--] = (FSE_FUNCTION_TYPE)(u-1);
+            } else {
+                cumul[u] = cumul[u-1] + normalizedCounter[u-1];
+        }   }
+        cumul[maxSymbolValue+1] = tableSize+1;
+    }
+
+    /* Spread symbols */
+    {   U32 position = 0;
+        U32 symbol;
+        for (symbol=0; symbol<=maxSymbolValue; symbol++) {
+            int nbOccurrences;
+            int const freq = normalizedCounter[symbol];
+            for (nbOccurrences=0; nbOccurrences<freq; nbOccurrences++) {
+                tableSymbol[position] = (FSE_FUNCTION_TYPE)symbol;
+                position = (position + step) & tableMask;
+                while (position > highThreshold)
+                    position = (position + step) & tableMask;   /* Low proba area */
+        }   }
+
+        assert(position==0);  /* Must have initialized all positions */
+    }
+
+    /* Build table */
+    {   U32 u; for (u=0; u<tableSize; u++) {
+        FSE_FUNCTION_TYPE s = tableSymbol[u];   /* note : static analyzer may not understand tableSymbol is properly initialized */
+        tableU16[cumul[s]++] = (U16) (tableSize+u);   /* TableU16 : sorted by symbol order; gives next state value */
+    }   }
+
+    /* Build Symbol Transformation Table */
+    {   unsigned total = 0;
+        unsigned s;
+        for (s=0; s<=maxSymbolValue; s++) {
+            switch (normalizedCounter[s])
+            {
+            case  0:
+                /* filling nonetheless, for compatibility with FSE_getMaxNbBits() */
+                symbolTT[s].deltaNbBits = ((tableLog+1) << 16) - (1<<tableLog);
+                break;
+
+            case -1:
+            case  1:
+                symbolTT[s].deltaNbBits = (tableLog << 16) - (1<<tableLog);
+                symbolTT[s].deltaFindState = total - 1;
+                total ++;
+                break;
+            default :
+                {
+                    U32 const maxBitsOut = tableLog - BIT_highbit32 (normalizedCounter[s]-1);
+                    U32 const minStatePlus = normalizedCounter[s] << maxBitsOut;
+                    symbolTT[s].deltaNbBits = (maxBitsOut << 16) - minStatePlus;
+                    symbolTT[s].deltaFindState = total - normalizedCounter[s];
+                    total +=  normalizedCounter[s];
+    }   }   }   }
+
+#if 0  /* debug : symbol costs */
+    DEBUGLOG(5, "\n --- table statistics : ");
+    {   U32 symbol;
+        for (symbol=0; symbol<=maxSymbolValue; symbol++) {
+            DEBUGLOG(5, "%3u: w=%3i,   maxBits=%u, fracBits=%.2f",
+                symbol, normalizedCounter[symbol],
+                FSE_getMaxNbBits(symbolTT, symbol),
+                (double)FSE_bitCost(symbolTT, tableLog, symbol, 8) / 256);
+        }
+    }
+#endif
+
+    return 0;
+}
+
+#ifndef ZSTD_NO_UNUSED_FUNCTIONS
+size_t FSE_buildCTable(FSE_CTable* ct, const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog)
+{
+    FSE_FUNCTION_TYPE tableSymbol[FSE_MAX_TABLESIZE];   /* memset() is not necessary, even if static analyzer complain about it */
+    return FSE_buildCTable_wksp(ct, normalizedCounter, maxSymbolValue, tableLog, tableSymbol, sizeof(tableSymbol));
+}
+#endif
+
+
+
+#ifndef FSE_COMMONDEFS_ONLY
+
+
+/*-**************************************************************
+*  FSE NCount encoding
+****************************************************************/
+size_t FSE_NCountWriteBound(unsigned maxSymbolValue, unsigned tableLog)
+{
+    size_t const maxHeaderSize = (((maxSymbolValue+1) * tableLog) >> 3) + 3;
+    return maxSymbolValue ? maxHeaderSize : FSE_NCOUNTBOUND;  /* maxSymbolValue==0 ? use default */
+}
+
+static size_t
+FSE_writeNCount_generic (void* header, size_t headerBufferSize,
+                   const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog,
+                         unsigned writeIsSafe)
+{
+    BYTE* const ostart = (BYTE*) header;
+    BYTE* out = ostart;
+    BYTE* const oend = ostart + headerBufferSize;
+    int nbBits;
+    const int tableSize = 1 << tableLog;
+    int remaining;
+    int threshold;
+    U32 bitStream = 0;
+    int bitCount = 0;
+    unsigned symbol = 0;
+    unsigned const alphabetSize = maxSymbolValue + 1;
+    int previousIs0 = 0;
+
+    /* Table Size */
+    bitStream += (tableLog-FSE_MIN_TABLELOG) << bitCount;
+    bitCount  += 4;
+
+    /* Init */
+    remaining = tableSize+1;   /* +1 for extra accuracy */
+    threshold = tableSize;
+    nbBits = tableLog+1;
+
+    while ((symbol < alphabetSize) && (remaining>1)) {  /* stops at 1 */
+        if (previousIs0) {
+            unsigned start = symbol;
+            while ((symbol < alphabetSize) && !normalizedCounter[symbol]) symbol++;
+            if (symbol == alphabetSize) break;   /* incorrect distribution */
+            while (symbol >= start+24) {
+                start+=24;
+                bitStream += 0xFFFFU << bitCount;
+                if ((!writeIsSafe) && (out > oend-2))
+                    return ERROR(dstSize_tooSmall);   /* Buffer overflow */
+                out[0] = (BYTE) bitStream;
+                out[1] = (BYTE)(bitStream>>8);
+                out+=2;
+                bitStream>>=16;
+            }
+            while (symbol >= start+3) {
+                start+=3;
+                bitStream += 3 << bitCount;
+                bitCount += 2;
+            }
+            bitStream += (symbol-start) << bitCount;
+            bitCount += 2;
+            if (bitCount>16) {
+                if ((!writeIsSafe) && (out > oend - 2))
+                    return ERROR(dstSize_tooSmall);   /* Buffer overflow */
+                out[0] = (BYTE)bitStream;
+                out[1] = (BYTE)(bitStream>>8);
+                out += 2;
+                bitStream >>= 16;
+                bitCount -= 16;
+        }   }
+        {   int count = normalizedCounter[symbol++];
+            int const max = (2*threshold-1) - remaining;
+            remaining -= count < 0 ? -count : count;
+            count++;   /* +1 for extra accuracy */
+            if (count>=threshold)
+                count += max;   /* [0..max[ [max..threshold[ (...) [threshold+max 2*threshold[ */
+            bitStream += count << bitCount;
+            bitCount  += nbBits;
+            bitCount  -= (count<max);
+            previousIs0  = (count==1);
+            if (remaining<1) return ERROR(GENERIC);
+            while (remaining<threshold) { nbBits--; threshold>>=1; }
+        }
+        if (bitCount>16) {
+            if ((!writeIsSafe) && (out > oend - 2))
+                return ERROR(dstSize_tooSmall);   /* Buffer overflow */
+            out[0] = (BYTE)bitStream;
+            out[1] = (BYTE)(bitStream>>8);
+            out += 2;
+            bitStream >>= 16;
+            bitCount -= 16;
+    }   }
+
+    if (remaining != 1)
+        return ERROR(GENERIC);  /* incorrect normalized distribution */
+    assert(symbol <= alphabetSize);
+
+    /* flush remaining bitStream */
+    if ((!writeIsSafe) && (out > oend - 2))
+        return ERROR(dstSize_tooSmall);   /* Buffer overflow */
+    out[0] = (BYTE)bitStream;
+    out[1] = (BYTE)(bitStream>>8);
+    out+= (bitCount+7) /8;
+
+    return (out-ostart);
+}
+
+
+size_t FSE_writeNCount (void* buffer, size_t bufferSize,
+                  const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog)
+{
+    if (tableLog > FSE_MAX_TABLELOG) return ERROR(tableLog_tooLarge);   /* Unsupported */
+    if (tableLog < FSE_MIN_TABLELOG) return ERROR(GENERIC);   /* Unsupported */
+
+    if (bufferSize < FSE_NCountWriteBound(maxSymbolValue, tableLog))
+        return FSE_writeNCount_generic(buffer, bufferSize, normalizedCounter, maxSymbolValue, tableLog, 0);
+
+    return FSE_writeNCount_generic(buffer, bufferSize, normalizedCounter, maxSymbolValue, tableLog, 1 /* write in buffer is safe */);
+}
+
+
+/*-**************************************************************
+*  FSE Compression Code
+****************************************************************/
+
+FSE_CTable* FSE_createCTable (unsigned maxSymbolValue, unsigned tableLog)
+{
+    size_t size;
+    if (tableLog > FSE_TABLELOG_ABSOLUTE_MAX) tableLog = FSE_TABLELOG_ABSOLUTE_MAX;
+    size = FSE_CTABLE_SIZE_U32 (tableLog, maxSymbolValue) * sizeof(U32);
+    return (FSE_CTable*)ZSTD_malloc(size);
+}
+
+void FSE_freeCTable (FSE_CTable* ct) { ZSTD_free(ct); }
+
+/* provides the minimum logSize to safely represent a distribution */
+static unsigned FSE_minTableLog(size_t srcSize, unsigned maxSymbolValue)
+{
+    U32 minBitsSrc = BIT_highbit32((U32)(srcSize)) + 1;
+    U32 minBitsSymbols = BIT_highbit32(maxSymbolValue) + 2;
+    U32 minBits = minBitsSrc < minBitsSymbols ? minBitsSrc : minBitsSymbols;
+    assert(srcSize > 1); /* Not supported, RLE should be used instead */
+    return minBits;
+}
+
+unsigned FSE_optimalTableLog_internal(unsigned maxTableLog, size_t srcSize, unsigned maxSymbolValue, unsigned minus)
+{
+    U32 maxBitsSrc = BIT_highbit32((U32)(srcSize - 1)) - minus;
+    U32 tableLog = maxTableLog;
+    U32 minBits = FSE_minTableLog(srcSize, maxSymbolValue);
+    assert(srcSize > 1); /* Not supported, RLE should be used instead */
+    if (tableLog==0) tableLog = FSE_DEFAULT_TABLELOG;
+    if (maxBitsSrc < tableLog) tableLog = maxBitsSrc;   /* Accuracy can be reduced */
+    if (minBits > tableLog) tableLog = minBits;   /* Need a minimum to safely represent all symbol values */
+    if (tableLog < FSE_MIN_TABLELOG) tableLog = FSE_MIN_TABLELOG;
+    if (tableLog > FSE_MAX_TABLELOG) tableLog = FSE_MAX_TABLELOG;
+    return tableLog;
+}
+
+unsigned FSE_optimalTableLog(unsigned maxTableLog, size_t srcSize, unsigned maxSymbolValue)
+{
+    return FSE_optimalTableLog_internal(maxTableLog, srcSize, maxSymbolValue, 2);
+}
+
+/* Secondary normalization method.
+   To be used when primary method fails. */
+
+static size_t FSE_normalizeM2(short* norm, U32 tableLog, const unsigned* count, size_t total, U32 maxSymbolValue, short lowProbCount)
+{
+    short const NOT_YET_ASSIGNED = -2;
+    U32 s;
+    U32 distributed = 0;
+    U32 ToDistribute;
+
+    /* Init */
+    U32 const lowThreshold = (U32)(total >> tableLog);
+    U32 lowOne = (U32)((total * 3) >> (tableLog + 1));
+
+    for (s=0; s<=maxSymbolValue; s++) {
+        if (count[s] == 0) {
+            norm[s]=0;
+            continue;
+        }
+        if (count[s] <= lowThreshold) {
+            norm[s] = lowProbCount;
+            distributed++;
+            total -= count[s];
+            continue;
+        }
+        if (count[s] <= lowOne) {
+            norm[s] = 1;
+            distributed++;
+            total -= count[s];
+            continue;
+        }
+
+        norm[s]=NOT_YET_ASSIGNED;
+    }
+    ToDistribute = (1 << tableLog) - distributed;
+
+    if (ToDistribute == 0)
+        return 0;
+
+    if ((total / ToDistribute) > lowOne) {
+        /* risk of rounding to zero */
+        lowOne = (U32)((total * 3) / (ToDistribute * 2));
+        for (s=0; s<=maxSymbolValue; s++) {
+            if ((norm[s] == NOT_YET_ASSIGNED) && (count[s] <= lowOne)) {
+                norm[s] = 1;
+                distributed++;
+                total -= count[s];
+                continue;
+        }   }
+        ToDistribute = (1 << tableLog) - distributed;
+    }
+
+    if (distributed == maxSymbolValue+1) {
+        /* all values are pretty poor;
+           probably incompressible data (should have already been detected);
+           find max, then give all remaining points to max */
+        U32 maxV = 0, maxC = 0;
+        for (s=0; s<=maxSymbolValue; s++)
+            if (count[s] > maxC) { maxV=s; maxC=count[s]; }
+        norm[maxV] += (short)ToDistribute;
+        return 0;
+    }
+
+    if (total == 0) {
+        /* all of the symbols were low enough for the lowOne or lowThreshold */
+        for (s=0; ToDistribute > 0; s = (s+1)%(maxSymbolValue+1))
+            if (norm[s] > 0) { ToDistribute--; norm[s]++; }
+        return 0;
+    }
+
+    {   U64 const vStepLog = 62 - tableLog;
+        U64 const mid = (1ULL << (vStepLog-1)) - 1;
+        U64 const rStep = ZSTD_div64((((U64)1<<vStepLog) * ToDistribute) + mid, (U32)total);   /* scale on remaining */
+        U64 tmpTotal = mid;
+        for (s=0; s<=maxSymbolValue; s++) {
+            if (norm[s]==NOT_YET_ASSIGNED) {
+                U64 const end = tmpTotal + (count[s] * rStep);
+                U32 const sStart = (U32)(tmpTotal >> vStepLog);
+                U32 const sEnd = (U32)(end >> vStepLog);
+                U32 const weight = sEnd - sStart;
+                if (weight < 1)
+                    return ERROR(GENERIC);
+                norm[s] = (short)weight;
+                tmpTotal = end;
+    }   }   }
+
+    return 0;
+}
+
+size_t FSE_normalizeCount (short* normalizedCounter, unsigned tableLog,
+                           const unsigned* count, size_t total,
+                           unsigned maxSymbolValue, unsigned useLowProbCount)
+{
+    /* Sanity checks */
+    if (tableLog==0) tableLog = FSE_DEFAULT_TABLELOG;
+    if (tableLog < FSE_MIN_TABLELOG) return ERROR(GENERIC);   /* Unsupported size */
+    if (tableLog > FSE_MAX_TABLELOG) return ERROR(tableLog_tooLarge);   /* Unsupported size */
+    if (tableLog < FSE_minTableLog(total, maxSymbolValue)) return ERROR(GENERIC);   /* Too small tableLog, compression potentially impossible */
+
+    {   static U32 const rtbTable[] = {     0, 473195, 504333, 520860, 550000, 700000, 750000, 830000 };
+        short const lowProbCount = useLowProbCount ? -1 : 1;
+        U64 const scale = 62 - tableLog;
+        U64 const step = ZSTD_div64((U64)1<<62, (U32)total);   /* <== here, one division ! */
+        U64 const vStep = 1ULL<<(scale-20);
+        int stillToDistribute = 1<<tableLog;
+        unsigned s;
+        unsigned largest=0;
+        short largestP=0;
+        U32 lowThreshold = (U32)(total >> tableLog);
+
+        for (s=0; s<=maxSymbolValue; s++) {
+            if (count[s] == total) return 0;   /* rle special case */
+            if (count[s] == 0) { normalizedCounter[s]=0; continue; }
+            if (count[s] <= lowThreshold) {
+                normalizedCounter[s] = lowProbCount;
+                stillToDistribute--;
+            } else {
+                short proba = (short)((count[s]*step) >> scale);
+                if (proba<8) {
+                    U64 restToBeat = vStep * rtbTable[proba];
+                    proba += (count[s]*step) - ((U64)proba<<scale) > restToBeat;
+                }
+                if (proba > largestP) { largestP=proba; largest=s; }
+                normalizedCounter[s] = proba;
+                stillToDistribute -= proba;
+        }   }
+        if (-stillToDistribute >= (normalizedCounter[largest] >> 1)) {
+            /* corner case, need another normalization method */
+            size_t const errorCode = FSE_normalizeM2(normalizedCounter, tableLog, count, total, maxSymbolValue, lowProbCount);
+            if (FSE_isError(errorCode)) return errorCode;
+        }
+        else normalizedCounter[largest] += (short)stillToDistribute;
+    }
+
+#if 0
+    {   /* Print Table (debug) */
+        U32 s;
+        U32 nTotal = 0;
+        for (s=0; s<=maxSymbolValue; s++)
+            RAWLOG(2, "%3i: %4i \n", s, normalizedCounter[s]);
+        for (s=0; s<=maxSymbolValue; s++)
+            nTotal += abs(normalizedCounter[s]);
+        if (nTotal != (1U<<tableLog))
+            RAWLOG(2, "Warning !!! Total == %u != %u !!!", nTotal, 1U<<tableLog);
+        getchar();
+    }
+#endif
+
+    return tableLog;
+}
+
+
+/* fake FSE_CTable, for raw (uncompressed) input */
+size_t FSE_buildCTable_raw (FSE_CTable* ct, unsigned nbBits)
+{
+    const unsigned tableSize = 1 << nbBits;
+    const unsigned tableMask = tableSize - 1;
+    const unsigned maxSymbolValue = tableMask;
+    void* const ptr = ct;
+    U16* const tableU16 = ( (U16*) ptr) + 2;
+    void* const FSCT = ((U32*)ptr) + 1 /* header */ + (tableSize>>1);   /* assumption : tableLog >= 1 */
+    FSE_symbolCompressionTransform* const symbolTT = (FSE_symbolCompressionTransform*) (FSCT);
+    unsigned s;
+
+    /* Sanity checks */
+    if (nbBits < 1) return ERROR(GENERIC);             /* min size */
+
+    /* header */
+    tableU16[-2] = (U16) nbBits;
+    tableU16[-1] = (U16) maxSymbolValue;
+
+    /* Build table */
+    for (s=0; s<tableSize; s++)
+        tableU16[s] = (U16)(tableSize + s);
+
+    /* Build Symbol Transformation Table */
+    {   const U32 deltaNbBits = (nbBits << 16) - (1 << nbBits);
+        for (s=0; s<=maxSymbolValue; s++) {
+            symbolTT[s].deltaNbBits = deltaNbBits;
+            symbolTT[s].deltaFindState = s-1;
+    }   }
+
+    return 0;
+}
+
+/* fake FSE_CTable, for rle input (always same symbol) */
+size_t FSE_buildCTable_rle (FSE_CTable* ct, BYTE symbolValue)
+{
+    void* ptr = ct;
+    U16* tableU16 = ( (U16*) ptr) + 2;
+    void* FSCTptr = (U32*)ptr + 2;
+    FSE_symbolCompressionTransform* symbolTT = (FSE_symbolCompressionTransform*) FSCTptr;
+
+    /* header */
+    tableU16[-2] = (U16) 0;
+    tableU16[-1] = (U16) symbolValue;
+
+    /* Build table */
+    tableU16[0] = 0;
+    tableU16[1] = 0;   /* just in case */
+
+    /* Build Symbol Transformation Table */
+    symbolTT[symbolValue].deltaNbBits = 0;
+    symbolTT[symbolValue].deltaFindState = 0;
+
+    return 0;
+}
+
+
+static size_t FSE_compress_usingCTable_generic (void* dst, size_t dstSize,
+                           const void* src, size_t srcSize,
+                           const FSE_CTable* ct, const unsigned fast)
+{
+    const BYTE* const istart = (const BYTE*) src;
+    const BYTE* const iend = istart + srcSize;
+    const BYTE* ip=iend;
+
+    BIT_CStream_t bitC;
+    FSE_CState_t CState1, CState2;
+
+    /* init */
+    if (srcSize <= 2) return 0;
+    { size_t const initError = BIT_initCStream(&bitC, dst, dstSize);
+      if (FSE_isError(initError)) return 0; /* not enough space available to write a bitstream */ }
+
+#define FSE_FLUSHBITS(s)  (fast ? BIT_flushBitsFast(s) : BIT_flushBits(s))
+
+    if (srcSize & 1) {
+        FSE_initCState2(&CState1, ct, *--ip);
+        FSE_initCState2(&CState2, ct, *--ip);
+        FSE_encodeSymbol(&bitC, &CState1, *--ip);
+        FSE_FLUSHBITS(&bitC);
+    } else {
+        FSE_initCState2(&CState2, ct, *--ip);
+        FSE_initCState2(&CState1, ct, *--ip);
+    }
+
+    /* join to mod 4 */
+    srcSize -= 2;
+    if ((sizeof(bitC.bitContainer)*8 > FSE_MAX_TABLELOG*4+7 ) && (srcSize & 2)) {  /* test bit 2 */
+        FSE_encodeSymbol(&bitC, &CState2, *--ip);
+        FSE_encodeSymbol(&bitC, &CState1, *--ip);
+        FSE_FLUSHBITS(&bitC);
+    }
+
+    /* 2 or 4 encoding per loop */
+    while ( ip>istart ) {
+
+        FSE_encodeSymbol(&bitC, &CState2, *--ip);
+
+        if (sizeof(bitC.bitContainer)*8 < FSE_MAX_TABLELOG*2+7 )   /* this test must be static */
+            FSE_FLUSHBITS(&bitC);
+
+        FSE_encodeSymbol(&bitC, &CState1, *--ip);
+
+        if (sizeof(bitC.bitContainer)*8 > FSE_MAX_TABLELOG*4+7 ) {  /* this test must be static */
+            FSE_encodeSymbol(&bitC, &CState2, *--ip);
+            FSE_encodeSymbol(&bitC, &CState1, *--ip);
+        }
+
+        FSE_FLUSHBITS(&bitC);
+    }
+
+    FSE_flushCState(&bitC, &CState2);
+    FSE_flushCState(&bitC, &CState1);
+    return BIT_closeCStream(&bitC);
+}
+
+size_t FSE_compress_usingCTable (void* dst, size_t dstSize,
+                           const void* src, size_t srcSize,
+                           const FSE_CTable* ct)
+{
+    unsigned const fast = (dstSize >= FSE_BLOCKBOUND(srcSize));
+
+    if (fast)
+        return FSE_compress_usingCTable_generic(dst, dstSize, src, srcSize, ct, 1);
+    else
+        return FSE_compress_usingCTable_generic(dst, dstSize, src, srcSize, ct, 0);
+}
+
+
+size_t FSE_compressBound(size_t size) { return FSE_COMPRESSBOUND(size); }
+
+#ifndef ZSTD_NO_UNUSED_FUNCTIONS
+/* FSE_compress_wksp() :
+ * Same as FSE_compress2(), but using an externally allocated scratch buffer (`workSpace`).
+ * `wkspSize` size must be `(1<<tableLog)`.
+ */
+size_t FSE_compress_wksp (void* dst, size_t dstSize, const void* src, size_t srcSize, unsigned maxSymbolValue, unsigned tableLog, void* workSpace, size_t wkspSize)
+{
+    BYTE* const ostart = (BYTE*) dst;
+    BYTE* op = ostart;
+    BYTE* const oend = ostart + dstSize;
+
+    unsigned count[FSE_MAX_SYMBOL_VALUE+1];
+    S16   norm[FSE_MAX_SYMBOL_VALUE+1];
+    FSE_CTable* CTable = (FSE_CTable*)workSpace;
+    size_t const CTableSize = FSE_CTABLE_SIZE_U32(tableLog, maxSymbolValue);
+    void* scratchBuffer = (void*)(CTable + CTableSize);
+    size_t const scratchBufferSize = wkspSize - (CTableSize * sizeof(FSE_CTable));
+
+    /* init conditions */
+    if (wkspSize < FSE_COMPRESS_WKSP_SIZE_U32(tableLog, maxSymbolValue)) return ERROR(tableLog_tooLarge);
+    if (srcSize <= 1) return 0;  /* Not compressible */
+    if (!maxSymbolValue) maxSymbolValue = FSE_MAX_SYMBOL_VALUE;
+    if (!tableLog) tableLog = FSE_DEFAULT_TABLELOG;
+
+    /* Scan input and build symbol stats */
+    {   CHECK_V_F(maxCount, HIST_count_wksp(count, &maxSymbolValue, src, srcSize, scratchBuffer, scratchBufferSize) );
+        if (maxCount == srcSize) return 1;   /* only a single symbol in src : rle */
+        if (maxCount == 1) return 0;         /* each symbol present maximum once => not compressible */
+        if (maxCount < (srcSize >> 7)) return 0;   /* Heuristic : not compressible enough */
+    }
+
+    tableLog = FSE_optimalTableLog(tableLog, srcSize, maxSymbolValue);
+    CHECK_F( FSE_normalizeCount(norm, tableLog, count, srcSize, maxSymbolValue, /* useLowProbCount */ srcSize >= 2048) );
+
+    /* Write table description header */
+    {   CHECK_V_F(nc_err, FSE_writeNCount(op, oend-op, norm, maxSymbolValue, tableLog) );
+        op += nc_err;
+    }
+
+    /* Compress */
+    CHECK_F( FSE_buildCTable_wksp(CTable, norm, maxSymbolValue, tableLog, scratchBuffer, scratchBufferSize) );
+    {   CHECK_V_F(cSize, FSE_compress_usingCTable(op, oend - op, src, srcSize, CTable) );
+        if (cSize == 0) return 0;   /* not enough space for compressed data */
+        op += cSize;
+    }
+
+    /* check compressibility */
+    if ( (size_t)(op-ostart) >= srcSize-1 ) return 0;
+
+    return op-ostart;
+}
+
+typedef struct {
+    FSE_CTable CTable_max[FSE_CTABLE_SIZE_U32(FSE_MAX_TABLELOG, FSE_MAX_SYMBOL_VALUE)];
+    union {
+      U32 hist_wksp[HIST_WKSP_SIZE_U32];
+      BYTE scratchBuffer[1 << FSE_MAX_TABLELOG];
+    } workspace;
+} fseWkspMax_t;
+
+size_t FSE_compress2 (void* dst, size_t dstCapacity, const void* src, size_t srcSize, unsigned maxSymbolValue, unsigned tableLog)
+{
+    fseWkspMax_t scratchBuffer;
+    DEBUG_STATIC_ASSERT(sizeof(scratchBuffer) >= FSE_COMPRESS_WKSP_SIZE_U32(FSE_MAX_TABLELOG, FSE_MAX_SYMBOL_VALUE));   /* compilation failures here means scratchBuffer is not large enough */
+    if (tableLog > FSE_MAX_TABLELOG) return ERROR(tableLog_tooLarge);
+    return FSE_compress_wksp(dst, dstCapacity, src, srcSize, maxSymbolValue, tableLog, &scratchBuffer, sizeof(scratchBuffer));
+}
+
+size_t FSE_compress (void* dst, size_t dstCapacity, const void* src, size_t srcSize)
+{
+    return FSE_compress2(dst, dstCapacity, src, srcSize, FSE_MAX_SYMBOL_VALUE, FSE_DEFAULT_TABLELOG);
+}
+#endif
+
+#endif   /* FSE_COMMONDEFS_ONLY */
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/hist.c mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/hist.c
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/hist.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/hist.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,181 @@
+/* ******************************************************************
+ * hist : Histogram functions
+ * part of Finite State Entropy project
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ *
+ *  You can contact the author at :
+ *  - FSE source repository : https://github.com/Cyan4973/FiniteStateEntropy
+ *  - Public forum : https://groups.google.com/forum/#!forum/lz4c
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+****************************************************************** */
+
+/* --- dependencies --- */
+#include "../common/mem.h"             /* U32, BYTE, etc. */
+#include "../common/debug.h"           /* assert, DEBUGLOG */
+#include "../common/error_private.h"   /* ERROR */
+#include "hist.h"
+
+
+/* --- Error management --- */
+unsigned HIST_isError(size_t code) { return ERR_isError(code); }
+
+/*-**************************************************************
+ *  Histogram functions
+ ****************************************************************/
+unsigned HIST_count_simple(unsigned* count, unsigned* maxSymbolValuePtr,
+                           const void* src, size_t srcSize)
+{
+    const BYTE* ip = (const BYTE*)src;
+    const BYTE* const end = ip + srcSize;
+    unsigned maxSymbolValue = *maxSymbolValuePtr;
+    unsigned largestCount=0;
+
+    ZSTD_memset(count, 0, (maxSymbolValue+1) * sizeof(*count));
+    if (srcSize==0) { *maxSymbolValuePtr = 0; return 0; }
+
+    while (ip<end) {
+        assert(*ip <= maxSymbolValue);
+        count[*ip++]++;
+    }
+
+    while (!count[maxSymbolValue]) maxSymbolValue--;
+    *maxSymbolValuePtr = maxSymbolValue;
+
+    {   U32 s;
+        for (s=0; s<=maxSymbolValue; s++)
+            if (count[s] > largestCount) largestCount = count[s];
+    }
+
+    return largestCount;
+}
+
+typedef enum { trustInput, checkMaxSymbolValue } HIST_checkInput_e;
+
+/* HIST_count_parallel_wksp() :
+ * store histogram into 4 intermediate tables, recombined at the end.
+ * this design makes better use of OoO cpus,
+ * and is noticeably faster when some values are heavily repeated.
+ * But it needs some additional workspace for intermediate tables.
+ * `workSpace` must be a U32 table of size >= HIST_WKSP_SIZE_U32.
+ * @return : largest histogram frequency,
+ *           or an error code (notably when histogram's alphabet is larger than *maxSymbolValuePtr) */
+static size_t HIST_count_parallel_wksp(
+                                unsigned* count, unsigned* maxSymbolValuePtr,
+                                const void* source, size_t sourceSize,
+                                HIST_checkInput_e check,
+                                U32* const workSpace)
+{
+    const BYTE* ip = (const BYTE*)source;
+    const BYTE* const iend = ip+sourceSize;
+    size_t const countSize = (*maxSymbolValuePtr + 1) * sizeof(*count);
+    unsigned max=0;
+    U32* const Counting1 = workSpace;
+    U32* const Counting2 = Counting1 + 256;
+    U32* const Counting3 = Counting2 + 256;
+    U32* const Counting4 = Counting3 + 256;
+
+    /* safety checks */
+    assert(*maxSymbolValuePtr <= 255);
+    if (!sourceSize) {
+        ZSTD_memset(count, 0, countSize);
+        *maxSymbolValuePtr = 0;
+        return 0;
+    }
+    ZSTD_memset(workSpace, 0, 4*256*sizeof(unsigned));
+
+    /* by stripes of 16 bytes */
+    {   U32 cached = MEM_read32(ip); ip += 4;
+        while (ip < iend-15) {
+            U32 c = cached; cached = MEM_read32(ip); ip += 4;
+            Counting1[(BYTE) c     ]++;
+            Counting2[(BYTE)(c>>8) ]++;
+            Counting3[(BYTE)(c>>16)]++;
+            Counting4[       c>>24 ]++;
+            c = cached; cached = MEM_read32(ip); ip += 4;
+            Counting1[(BYTE) c     ]++;
+            Counting2[(BYTE)(c>>8) ]++;
+            Counting3[(BYTE)(c>>16)]++;
+            Counting4[       c>>24 ]++;
+            c = cached; cached = MEM_read32(ip); ip += 4;
+            Counting1[(BYTE) c     ]++;
+            Counting2[(BYTE)(c>>8) ]++;
+            Counting3[(BYTE)(c>>16)]++;
+            Counting4[       c>>24 ]++;
+            c = cached; cached = MEM_read32(ip); ip += 4;
+            Counting1[(BYTE) c     ]++;
+            Counting2[(BYTE)(c>>8) ]++;
+            Counting3[(BYTE)(c>>16)]++;
+            Counting4[       c>>24 ]++;
+        }
+        ip-=4;
+    }
+
+    /* finish last symbols */
+    while (ip<iend) Counting1[*ip++]++;
+
+    {   U32 s;
+        for (s=0; s<256; s++) {
+            Counting1[s] += Counting2[s] + Counting3[s] + Counting4[s];
+            if (Counting1[s] > max) max = Counting1[s];
+    }   }
+
+    {   unsigned maxSymbolValue = 255;
+        while (!Counting1[maxSymbolValue]) maxSymbolValue--;
+        if (check && maxSymbolValue > *maxSymbolValuePtr) return ERROR(maxSymbolValue_tooSmall);
+        *maxSymbolValuePtr = maxSymbolValue;
+        ZSTD_memmove(count, Counting1, countSize);   /* in case count & Counting1 are overlapping */
+    }
+    return (size_t)max;
+}
+
+/* HIST_countFast_wksp() :
+ * Same as HIST_countFast(), but using an externally provided scratch buffer.
+ * `workSpace` is a writable buffer which must be 4-bytes aligned,
+ * `workSpaceSize` must be >= HIST_WKSP_SIZE
+ */
+size_t HIST_countFast_wksp(unsigned* count, unsigned* maxSymbolValuePtr,
+                          const void* source, size_t sourceSize,
+                          void* workSpace, size_t workSpaceSize)
+{
+    if (sourceSize < 1500) /* heuristic threshold */
+        return HIST_count_simple(count, maxSymbolValuePtr, source, sourceSize);
+    if ((size_t)workSpace & 3) return ERROR(GENERIC);  /* must be aligned on 4-bytes boundaries */
+    if (workSpaceSize < HIST_WKSP_SIZE) return ERROR(workSpace_tooSmall);
+    return HIST_count_parallel_wksp(count, maxSymbolValuePtr, source, sourceSize, trustInput, (U32*)workSpace);
+}
+
+/* HIST_count_wksp() :
+ * Same as HIST_count(), but using an externally provided scratch buffer.
+ * `workSpace` size must be table of >= HIST_WKSP_SIZE_U32 unsigned */
+size_t HIST_count_wksp(unsigned* count, unsigned* maxSymbolValuePtr,
+                       const void* source, size_t sourceSize,
+                       void* workSpace, size_t workSpaceSize)
+{
+    if ((size_t)workSpace & 3) return ERROR(GENERIC);  /* must be aligned on 4-bytes boundaries */
+    if (workSpaceSize < HIST_WKSP_SIZE) return ERROR(workSpace_tooSmall);
+    if (*maxSymbolValuePtr < 255)
+        return HIST_count_parallel_wksp(count, maxSymbolValuePtr, source, sourceSize, checkMaxSymbolValue, (U32*)workSpace);
+    *maxSymbolValuePtr = 255;
+    return HIST_countFast_wksp(count, maxSymbolValuePtr, source, sourceSize, workSpace, workSpaceSize);
+}
+
+#ifndef ZSTD_NO_UNUSED_FUNCTIONS
+/* fast variant (unsafe : won't check if src contains values beyond count[] limit) */
+size_t HIST_countFast(unsigned* count, unsigned* maxSymbolValuePtr,
+                     const void* source, size_t sourceSize)
+{
+    unsigned tmpCounters[HIST_WKSP_SIZE_U32];
+    return HIST_countFast_wksp(count, maxSymbolValuePtr, source, sourceSize, tmpCounters, sizeof(tmpCounters));
+}
+
+size_t HIST_count(unsigned* count, unsigned* maxSymbolValuePtr,
+                 const void* src, size_t srcSize)
+{
+    unsigned tmpCounters[HIST_WKSP_SIZE_U32];
+    return HIST_count_wksp(count, maxSymbolValuePtr, src, srcSize, tmpCounters, sizeof(tmpCounters));
+}
+#endif
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/hist.h mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/hist.h
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/hist.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/hist.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,75 @@
+/* ******************************************************************
+ * hist : Histogram functions
+ * part of Finite State Entropy project
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ *
+ *  You can contact the author at :
+ *  - FSE source repository : https://github.com/Cyan4973/FiniteStateEntropy
+ *  - Public forum : https://groups.google.com/forum/#!forum/lz4c
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+****************************************************************** */
+
+/* --- dependencies --- */
+#include "../common/zstd_deps.h"   /* size_t */
+
+
+/* --- simple histogram functions --- */
+
+/*! HIST_count():
+ *  Provides the precise count of each byte within a table 'count'.
+ * 'count' is a table of unsigned int, of minimum size (*maxSymbolValuePtr+1).
+ *  Updates *maxSymbolValuePtr with actual largest symbol value detected.
+ * @return : count of the most frequent symbol (which isn't identified).
+ *           or an error code, which can be tested using HIST_isError().
+ *           note : if return == srcSize, there is only one symbol.
+ */
+size_t HIST_count(unsigned* count, unsigned* maxSymbolValuePtr,
+                  const void* src, size_t srcSize);
+
+unsigned HIST_isError(size_t code);  /**< tells if a return value is an error code */
+
+
+/* --- advanced histogram functions --- */
+
+#define HIST_WKSP_SIZE_U32 1024
+#define HIST_WKSP_SIZE    (HIST_WKSP_SIZE_U32 * sizeof(unsigned))
+/** HIST_count_wksp() :
+ *  Same as HIST_count(), but using an externally provided scratch buffer.
+ *  Benefit is this function will use very little stack space.
+ * `workSpace` is a writable buffer which must be 4-bytes aligned,
+ * `workSpaceSize` must be >= HIST_WKSP_SIZE
+ */
+size_t HIST_count_wksp(unsigned* count, unsigned* maxSymbolValuePtr,
+                       const void* src, size_t srcSize,
+                       void* workSpace, size_t workSpaceSize);
+
+/** HIST_countFast() :
+ *  same as HIST_count(), but blindly trusts that all byte values within src are <= *maxSymbolValuePtr.
+ *  This function is unsafe, and will segfault if any value within `src` is `> *maxSymbolValuePtr`
+ */
+size_t HIST_countFast(unsigned* count, unsigned* maxSymbolValuePtr,
+                      const void* src, size_t srcSize);
+
+/** HIST_countFast_wksp() :
+ *  Same as HIST_countFast(), but using an externally provided scratch buffer.
+ * `workSpace` is a writable buffer which must be 4-bytes aligned,
+ * `workSpaceSize` must be >= HIST_WKSP_SIZE
+ */
+size_t HIST_countFast_wksp(unsigned* count, unsigned* maxSymbolValuePtr,
+                           const void* src, size_t srcSize,
+                           void* workSpace, size_t workSpaceSize);
+
+/*! HIST_count_simple() :
+ *  Same as HIST_countFast(), this function is unsafe,
+ *  and will segfault if any value within `src` is `> *maxSymbolValuePtr`.
+ *  It is also a bit slower for large inputs.
+ *  However, it does not need any additional memory (not even on stack).
+ * @return : count of the most frequent symbol.
+ *  Note this function doesn't produce any error (i.e. it must succeed).
+ */
+unsigned HIST_count_simple(unsigned* count, unsigned* maxSymbolValuePtr,
+                           const void* src, size_t srcSize);
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/huf_compress.c mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/huf_compress.c
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/huf_compress.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/huf_compress.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,937 @@
+/* ******************************************************************
+ * Huffman encoder, part of New Generation Entropy library
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ *
+ *  You can contact the author at :
+ *  - FSE+HUF source repository : https://github.com/Cyan4973/FiniteStateEntropy
+ *  - Public forum : https://groups.google.com/forum/#!forum/lz4c
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+****************************************************************** */
+
+/* **************************************************************
+*  Compiler specifics
+****************************************************************/
+#ifdef _MSC_VER    /* Visual Studio */
+#  pragma warning(disable : 4127)        /* disable: C4127: conditional expression is constant */
+#endif
+
+
+/* **************************************************************
+*  Includes
+****************************************************************/
+#include "../common/zstd_deps.h"     /* ZSTD_memcpy, ZSTD_memset */
+#include "../common/compiler.h"
+#include "../common/bitstream.h"
+#include "hist.h"
+#define FSE_STATIC_LINKING_ONLY   /* FSE_optimalTableLog_internal */
+#include "../common/fse.h"        /* header compression */
+#define HUF_STATIC_LINKING_ONLY
+#include "../common/huf.h"
+#include "../common/error_private.h"
+
+
+/* **************************************************************
+*  Error Management
+****************************************************************/
+#define HUF_isError ERR_isError
+#define HUF_STATIC_ASSERT(c) DEBUG_STATIC_ASSERT(c)   /* use only *after* variable declarations */
+
+
+/* **************************************************************
+*  Utils
+****************************************************************/
+unsigned HUF_optimalTableLog(unsigned maxTableLog, size_t srcSize, unsigned maxSymbolValue)
+{
+    return FSE_optimalTableLog_internal(maxTableLog, srcSize, maxSymbolValue, 1);
+}
+
+
+/* *******************************************************
+*  HUF : Huffman block compression
+*********************************************************/
+/* HUF_compressWeights() :
+ * Same as FSE_compress(), but dedicated to huff0's weights compression.
+ * The use case needs much less stack memory.
+ * Note : all elements within weightTable are supposed to be <= HUF_TABLELOG_MAX.
+ */
+#define MAX_FSE_TABLELOG_FOR_HUFF_HEADER 6
+
+typedef struct {
+    FSE_CTable CTable[FSE_CTABLE_SIZE_U32(MAX_FSE_TABLELOG_FOR_HUFF_HEADER, HUF_TABLELOG_MAX)];
+    U32 scratchBuffer[FSE_BUILD_CTABLE_WORKSPACE_SIZE_U32(HUF_TABLELOG_MAX, MAX_FSE_TABLELOG_FOR_HUFF_HEADER)];
+    unsigned count[HUF_TABLELOG_MAX+1];
+    S16 norm[HUF_TABLELOG_MAX+1];
+} HUF_CompressWeightsWksp;
+
+static size_t HUF_compressWeights(void* dst, size_t dstSize, const void* weightTable, size_t wtSize, void* workspace, size_t workspaceSize)
+{
+    BYTE* const ostart = (BYTE*) dst;
+    BYTE* op = ostart;
+    BYTE* const oend = ostart + dstSize;
+
+    unsigned maxSymbolValue = HUF_TABLELOG_MAX;
+    U32 tableLog = MAX_FSE_TABLELOG_FOR_HUFF_HEADER;
+    HUF_CompressWeightsWksp* wksp = (HUF_CompressWeightsWksp*)workspace;
+
+    if (workspaceSize < sizeof(HUF_CompressWeightsWksp)) return ERROR(GENERIC);
+
+    /* init conditions */
+    if (wtSize <= 1) return 0;  /* Not compressible */
+
+    /* Scan input and build symbol stats */
+    {   unsigned const maxCount = HIST_count_simple(wksp->count, &maxSymbolValue, weightTable, wtSize);   /* never fails */
+        if (maxCount == wtSize) return 1;   /* only a single symbol in src : rle */
+        if (maxCount == 1) return 0;        /* each symbol present maximum once => not compressible */
+    }
+
+    tableLog = FSE_optimalTableLog(tableLog, wtSize, maxSymbolValue);
+    CHECK_F( FSE_normalizeCount(wksp->norm, tableLog, wksp->count, wtSize, maxSymbolValue, /* useLowProbCount */ 0) );
+
+    /* Write table description header */
+    {   CHECK_V_F(hSize, FSE_writeNCount(op, (size_t)(oend-op), wksp->norm, maxSymbolValue, tableLog) );
+        op += hSize;
+    }
+
+    /* Compress */
+    CHECK_F( FSE_buildCTable_wksp(wksp->CTable, wksp->norm, maxSymbolValue, tableLog, wksp->scratchBuffer, sizeof(wksp->scratchBuffer)) );
+    {   CHECK_V_F(cSize, FSE_compress_usingCTable(op, (size_t)(oend - op), weightTable, wtSize, wksp->CTable) );
+        if (cSize == 0) return 0;   /* not enough space for compressed data */
+        op += cSize;
+    }
+
+    return (size_t)(op-ostart);
+}
+
+
+typedef struct {
+    HUF_CompressWeightsWksp wksp;
+    BYTE bitsToWeight[HUF_TABLELOG_MAX + 1];   /* precomputed conversion table */
+    BYTE huffWeight[HUF_SYMBOLVALUE_MAX];
+} HUF_WriteCTableWksp;
+
+size_t HUF_writeCTable_wksp(void* dst, size_t maxDstSize,
+                            const HUF_CElt* CTable, unsigned maxSymbolValue, unsigned huffLog,
+                            void* workspace, size_t workspaceSize)
+{
+    BYTE* op = (BYTE*)dst;
+    U32 n;
+    HUF_WriteCTableWksp* wksp = (HUF_WriteCTableWksp*)workspace;
+
+    /* check conditions */
+    if (workspaceSize < sizeof(HUF_WriteCTableWksp)) return ERROR(GENERIC);
+    if (maxSymbolValue > HUF_SYMBOLVALUE_MAX) return ERROR(maxSymbolValue_tooLarge);
+
+    /* convert to weight */
+    wksp->bitsToWeight[0] = 0;
+    for (n=1; n<huffLog+1; n++)
+        wksp->bitsToWeight[n] = (BYTE)(huffLog + 1 - n);
+    for (n=0; n<maxSymbolValue; n++)
+        wksp->huffWeight[n] = wksp->bitsToWeight[CTable[n].nbBits];
+
+    /* attempt weights compression by FSE */
+    {   CHECK_V_F(hSize, HUF_compressWeights(op+1, maxDstSize-1, wksp->huffWeight, maxSymbolValue, &wksp->wksp, sizeof(wksp->wksp)) );
+        if ((hSize>1) & (hSize < maxSymbolValue/2)) {   /* FSE compressed */
+            op[0] = (BYTE)hSize;
+            return hSize+1;
+    }   }
+
+    /* write raw values as 4-bits (max : 15) */
+    if (maxSymbolValue > (256-128)) return ERROR(GENERIC);   /* should not happen : likely means source cannot be compressed */
+    if (((maxSymbolValue+1)/2) + 1 > maxDstSize) return ERROR(dstSize_tooSmall);   /* not enough space within dst buffer */
+    op[0] = (BYTE)(128 /*special case*/ + (maxSymbolValue-1));
+    wksp->huffWeight[maxSymbolValue] = 0;   /* to be sure it doesn't cause msan issue in final combination */
+    for (n=0; n<maxSymbolValue; n+=2)
+        op[(n/2)+1] = (BYTE)((wksp->huffWeight[n] << 4) + wksp->huffWeight[n+1]);
+    return ((maxSymbolValue+1)/2) + 1;
+}
+
+/*! HUF_writeCTable() :
+    `CTable` : Huffman tree to save, using huf representation.
+    @return : size of saved CTable */
+size_t HUF_writeCTable (void* dst, size_t maxDstSize,
+                        const HUF_CElt* CTable, unsigned maxSymbolValue, unsigned huffLog)
+{
+    HUF_WriteCTableWksp wksp;
+    return HUF_writeCTable_wksp(dst, maxDstSize, CTable, maxSymbolValue, huffLog, &wksp, sizeof(wksp));
+}
+
+
+size_t HUF_readCTable (HUF_CElt* CTable, unsigned* maxSymbolValuePtr, const void* src, size_t srcSize, unsigned* hasZeroWeights)
+{
+    BYTE huffWeight[HUF_SYMBOLVALUE_MAX + 1];   /* init not required, even though some static analyzer may complain */
+    U32 rankVal[HUF_TABLELOG_ABSOLUTEMAX + 1];   /* large enough for values from 0 to 16 */
+    U32 tableLog = 0;
+    U32 nbSymbols = 0;
+
+    /* get symbol weights */
+    CHECK_V_F(readSize, HUF_readStats(huffWeight, HUF_SYMBOLVALUE_MAX+1, rankVal, &nbSymbols, &tableLog, src, srcSize));
+    *hasZeroWeights = (rankVal[0] > 0);
+
+    /* check result */
+    if (tableLog > HUF_TABLELOG_MAX) return ERROR(tableLog_tooLarge);
+    if (nbSymbols > *maxSymbolValuePtr+1) return ERROR(maxSymbolValue_tooSmall);
+
+    /* Prepare base value per rank */
+    {   U32 n, nextRankStart = 0;
+        for (n=1; n<=tableLog; n++) {
+            U32 curr = nextRankStart;
+            nextRankStart += (rankVal[n] << (n-1));
+            rankVal[n] = curr;
+    }   }
+
+    /* fill nbBits */
+    {   U32 n; for (n=0; n<nbSymbols; n++) {
+            const U32 w = huffWeight[n];
+            CTable[n].nbBits = (BYTE)(tableLog + 1 - w) & -(w != 0);
+    }   }
+
+    /* fill val */
+    {   U16 nbPerRank[HUF_TABLELOG_MAX+2]  = {0};  /* support w=0=>n=tableLog+1 */
+        U16 valPerRank[HUF_TABLELOG_MAX+2] = {0};
+        { U32 n; for (n=0; n<nbSymbols; n++) nbPerRank[CTable[n].nbBits]++; }
+        /* determine stating value per rank */
+        valPerRank[tableLog+1] = 0;   /* for w==0 */
+        {   U16 min = 0;
+            U32 n; for (n=tableLog; n>0; n--) {  /* start at n=tablelog <-> w=1 */
+                valPerRank[n] = min;     /* get starting value within each rank */
+                min += nbPerRank[n];
+                min >>= 1;
+        }   }
+        /* assign value within rank, symbol order */
+        { U32 n; for (n=0; n<nbSymbols; n++) CTable[n].val = valPerRank[CTable[n].nbBits]++; }
+    }
+
+    *maxSymbolValuePtr = nbSymbols - 1;
+    return readSize;
+}
+
+U32 HUF_getNbBits(const void* symbolTable, U32 symbolValue)
+{
+    const HUF_CElt* table = (const HUF_CElt*)symbolTable;
+    assert(symbolValue <= HUF_SYMBOLVALUE_MAX);
+    return table[symbolValue].nbBits;
+}
+
+
+typedef struct nodeElt_s {
+    U32 count;
+    U16 parent;
+    BYTE byte;
+    BYTE nbBits;
+} nodeElt;
+
+/**
+ * HUF_setMaxHeight():
+ * Enforces maxNbBits on the Huffman tree described in huffNode.
+ *
+ * It sets all nodes with nbBits > maxNbBits to be maxNbBits. Then it adjusts
+ * the tree to so that it is a valid canonical Huffman tree.
+ *
+ * @pre               The sum of the ranks of each symbol == 2^largestBits,
+ *                    where largestBits == huffNode[lastNonNull].nbBits.
+ * @post              The sum of the ranks of each symbol == 2^largestBits,
+ *                    where largestBits is the return value <= maxNbBits.
+ *
+ * @param huffNode    The Huffman tree modified in place to enforce maxNbBits.
+ * @param lastNonNull The symbol with the lowest count in the Huffman tree.
+ * @param maxNbBits   The maximum allowed number of bits, which the Huffman tree
+ *                    may not respect. After this function the Huffman tree will
+ *                    respect maxNbBits.
+ * @return            The maximum number of bits of the Huffman tree after adjustment,
+ *                    necessarily no more than maxNbBits.
+ */
+static U32 HUF_setMaxHeight(nodeElt* huffNode, U32 lastNonNull, U32 maxNbBits)
+{
+    const U32 largestBits = huffNode[lastNonNull].nbBits;
+    /* early exit : no elt > maxNbBits, so the tree is already valid. */
+    if (largestBits <= maxNbBits) return largestBits;
+
+    /* there are several too large elements (at least >= 2) */
+    {   int totalCost = 0;
+        const U32 baseCost = 1 << (largestBits - maxNbBits);
+        int n = (int)lastNonNull;
+
+        /* Adjust any ranks > maxNbBits to maxNbBits.
+         * Compute totalCost, which is how far the sum of the ranks is
+         * we are over 2^largestBits after adjust the offending ranks.
+         */
+        while (huffNode[n].nbBits > maxNbBits) {
+            totalCost += baseCost - (1 << (largestBits - huffNode[n].nbBits));
+            huffNode[n].nbBits = (BYTE)maxNbBits;
+            n--;
+        }
+        /* n stops at huffNode[n].nbBits <= maxNbBits */
+        assert(huffNode[n].nbBits <= maxNbBits);
+        /* n end at index of smallest symbol using < maxNbBits */
+        while (huffNode[n].nbBits == maxNbBits) --n;
+
+        /* renorm totalCost from 2^largestBits to 2^maxNbBits
+         * note : totalCost is necessarily a multiple of baseCost */
+        assert((totalCost & (baseCost - 1)) == 0);
+        totalCost >>= (largestBits - maxNbBits);
+        assert(totalCost > 0);
+
+        /* repay normalized cost */
+        {   U32 const noSymbol = 0xF0F0F0F0;
+            U32 rankLast[HUF_TABLELOG_MAX+2];
+
+            /* Get pos of last (smallest = lowest cum. count) symbol per rank */
+            ZSTD_memset(rankLast, 0xF0, sizeof(rankLast));
+            {   U32 currentNbBits = maxNbBits;
+                int pos;
+                for (pos=n ; pos >= 0; pos--) {
+                    if (huffNode[pos].nbBits >= currentNbBits) continue;
+                    currentNbBits = huffNode[pos].nbBits;   /* < maxNbBits */
+                    rankLast[maxNbBits-currentNbBits] = (U32)pos;
+            }   }
+
+            while (totalCost > 0) {
+                /* Try to reduce the next power of 2 above totalCost because we
+                 * gain back half the rank.
+                 */
+                U32 nBitsToDecrease = BIT_highbit32((U32)totalCost) + 1;
+                for ( ; nBitsToDecrease > 1; nBitsToDecrease--) {
+                    U32 const highPos = rankLast[nBitsToDecrease];
+                    U32 const lowPos = rankLast[nBitsToDecrease-1];
+                    if (highPos == noSymbol) continue;
+                    /* Decrease highPos if no symbols of lowPos or if it is
+                     * not cheaper to remove 2 lowPos than highPos.
+                     */
+                    if (lowPos == noSymbol) break;
+                    {   U32 const highTotal = huffNode[highPos].count;
+                        U32 const lowTotal = 2 * huffNode[lowPos].count;
+                        if (highTotal <= lowTotal) break;
+                }   }
+                /* only triggered when no more rank 1 symbol left => find closest one (note : there is necessarily at least one !) */
+                assert(rankLast[nBitsToDecrease] != noSymbol || nBitsToDecrease == 1);
+                /* HUF_MAX_TABLELOG test just to please gcc 5+; but it should not be necessary */
+                while ((nBitsToDecrease<=HUF_TABLELOG_MAX) && (rankLast[nBitsToDecrease] == noSymbol))
+                    nBitsToDecrease++;
+                assert(rankLast[nBitsToDecrease] != noSymbol);
+                /* Increase the number of bits to gain back half the rank cost. */
+                totalCost -= 1 << (nBitsToDecrease-1);
+                huffNode[rankLast[nBitsToDecrease]].nbBits++;
+
+                /* Fix up the new rank.
+                 * If the new rank was empty, this symbol is now its smallest.
+                 * Otherwise, this symbol will be the largest in the new rank so no adjustment.
+                 */
+                if (rankLast[nBitsToDecrease-1] == noSymbol)
+                    rankLast[nBitsToDecrease-1] = rankLast[nBitsToDecrease];
+                /* Fix up the old rank.
+                 * If the symbol was at position 0, meaning it was the highest weight symbol in the tree,
+                 * it must be the only symbol in its rank, so the old rank now has no symbols.
+                 * Otherwise, since the Huffman nodes are sorted by count, the previous position is now
+                 * the smallest node in the rank. If the previous position belongs to a different rank,
+                 * then the rank is now empty.
+                 */
+                if (rankLast[nBitsToDecrease] == 0)    /* special case, reached largest symbol */
+                    rankLast[nBitsToDecrease] = noSymbol;
+                else {
+                    rankLast[nBitsToDecrease]--;
+                    if (huffNode[rankLast[nBitsToDecrease]].nbBits != maxNbBits-nBitsToDecrease)
+                        rankLast[nBitsToDecrease] = noSymbol;   /* this rank is now empty */
+                }
+            }   /* while (totalCost > 0) */
+
+            /* If we've removed too much weight, then we have to add it back.
+             * To avoid overshooting again, we only adjust the smallest rank.
+             * We take the largest nodes from the lowest rank 0 and move them
+             * to rank 1. There's guaranteed to be enough rank 0 symbols because
+             * TODO.
+             */
+            while (totalCost < 0) {  /* Sometimes, cost correction overshoot */
+                /* special case : no rank 1 symbol (using maxNbBits-1);
+                 * let's create one from largest rank 0 (using maxNbBits).
+                 */
+                if (rankLast[1] == noSymbol) {
+                    while (huffNode[n].nbBits == maxNbBits) n--;
+                    huffNode[n+1].nbBits--;
+                    assert(n >= 0);
+                    rankLast[1] = (U32)(n+1);
+                    totalCost++;
+                    continue;
+                }
+                huffNode[ rankLast[1] + 1 ].nbBits--;
+                rankLast[1]++;
+                totalCost ++;
+            }
+        }   /* repay normalized cost */
+    }   /* there are several too large elements (at least >= 2) */
+
+    return maxNbBits;
+}
+
+typedef struct {
+    U32 base;
+    U32 curr;
+} rankPos;
+
+typedef nodeElt huffNodeTable[HUF_CTABLE_WORKSPACE_SIZE_U32];
+
+#define RANK_POSITION_TABLE_SIZE 32
+
+typedef struct {
+  huffNodeTable huffNodeTbl;
+  rankPos rankPosition[RANK_POSITION_TABLE_SIZE];
+} HUF_buildCTable_wksp_tables;
+
+/**
+ * HUF_sort():
+ * Sorts the symbols [0, maxSymbolValue] by count[symbol] in decreasing order.
+ *
+ * @param[out] huffNode       Sorted symbols by decreasing count. Only members `.count` and `.byte` are filled.
+ *                            Must have (maxSymbolValue + 1) entries.
+ * @param[in]  count          Histogram of the symbols.
+ * @param[in]  maxSymbolValue Maximum symbol value.
+ * @param      rankPosition   This is a scratch workspace. Must have RANK_POSITION_TABLE_SIZE entries.
+ */
+static void HUF_sort(nodeElt* huffNode, const unsigned* count, U32 maxSymbolValue, rankPos* rankPosition)
+{
+    int n;
+    int const maxSymbolValue1 = (int)maxSymbolValue + 1;
+
+    /* Compute base and set curr to base.
+     * For symbol s let lowerRank = BIT_highbit32(count[n]+1) and rank = lowerRank + 1.
+     * Then 2^lowerRank <= count[n]+1 <= 2^rank.
+     * We attribute each symbol to lowerRank's base value, because we want to know where
+     * each rank begins in the output, so for rank R we want to count ranks R+1 and above.
+     */
+    ZSTD_memset(rankPosition, 0, sizeof(*rankPosition) * RANK_POSITION_TABLE_SIZE);
+    for (n = 0; n < maxSymbolValue1; ++n) {
+        U32 lowerRank = BIT_highbit32(count[n] + 1);
+        rankPosition[lowerRank].base++;
+    }
+    assert(rankPosition[RANK_POSITION_TABLE_SIZE - 1].base == 0);
+    for (n = RANK_POSITION_TABLE_SIZE - 1; n > 0; --n) {
+        rankPosition[n-1].base += rankPosition[n].base;
+        rankPosition[n-1].curr = rankPosition[n-1].base;
+    }
+    /* Sort */
+    for (n = 0; n < maxSymbolValue1; ++n) {
+        U32 const c = count[n];
+        U32 const r = BIT_highbit32(c+1) + 1;
+        U32 pos = rankPosition[r].curr++;
+        /* Insert into the correct position in the rank.
+         * We have at most 256 symbols, so this insertion should be fine.
+         */
+        while ((pos > rankPosition[r].base) && (c > huffNode[pos-1].count)) {
+            huffNode[pos] = huffNode[pos-1];
+            pos--;
+        }
+        huffNode[pos].count = c;
+        huffNode[pos].byte  = (BYTE)n;
+    }
+}
+
+
+/** HUF_buildCTable_wksp() :
+ *  Same as HUF_buildCTable(), but using externally allocated scratch buffer.
+ *  `workSpace` must be aligned on 4-bytes boundaries, and be at least as large as sizeof(HUF_buildCTable_wksp_tables).
+ */
+#define STARTNODE (HUF_SYMBOLVALUE_MAX+1)
+
+/* HUF_buildTree():
+ * Takes the huffNode array sorted by HUF_sort() and builds an unlimited-depth Huffman tree.
+ *
+ * @param huffNode        The array sorted by HUF_sort(). Builds the Huffman tree in this array.
+ * @param maxSymbolValue  The maximum symbol value.
+ * @return                The smallest node in the Huffman tree (by count).
+ */
+static int HUF_buildTree(nodeElt* huffNode, U32 maxSymbolValue)
+{
+    nodeElt* const huffNode0 = huffNode - 1;
+    int nonNullRank;
+    int lowS, lowN;
+    int nodeNb = STARTNODE;
+    int n, nodeRoot;
+    /* init for parents */
+    nonNullRank = (int)maxSymbolValue;
+    while(huffNode[nonNullRank].count == 0) nonNullRank--;
+    lowS = nonNullRank; nodeRoot = nodeNb + lowS - 1; lowN = nodeNb;
+    huffNode[nodeNb].count = huffNode[lowS].count + huffNode[lowS-1].count;
+    huffNode[lowS].parent = huffNode[lowS-1].parent = (U16)nodeNb;
+    nodeNb++; lowS-=2;
+    for (n=nodeNb; n<=nodeRoot; n++) huffNode[n].count = (U32)(1U<<30);
+    huffNode0[0].count = (U32)(1U<<31);  /* fake entry, strong barrier */
+
+    /* create parents */
+    while (nodeNb <= nodeRoot) {
+        int const n1 = (huffNode[lowS].count < huffNode[lowN].count) ? lowS-- : lowN++;
+        int const n2 = (huffNode[lowS].count < huffNode[lowN].count) ? lowS-- : lowN++;
+        huffNode[nodeNb].count = huffNode[n1].count + huffNode[n2].count;
+        huffNode[n1].parent = huffNode[n2].parent = (U16)nodeNb;
+        nodeNb++;
+    }
+
+    /* distribute weights (unlimited tree height) */
+    huffNode[nodeRoot].nbBits = 0;
+    for (n=nodeRoot-1; n>=STARTNODE; n--)
+        huffNode[n].nbBits = huffNode[ huffNode[n].parent ].nbBits + 1;
+    for (n=0; n<=nonNullRank; n++)
+        huffNode[n].nbBits = huffNode[ huffNode[n].parent ].nbBits + 1;
+
+    return nonNullRank;
+}
+
+/**
+ * HUF_buildCTableFromTree():
+ * Build the CTable given the Huffman tree in huffNode.
+ *
+ * @param[out] CTable         The output Huffman CTable.
+ * @param      huffNode       The Huffman tree.
+ * @param      nonNullRank    The last and smallest node in the Huffman tree.
+ * @param      maxSymbolValue The maximum symbol value.
+ * @param      maxNbBits      The exact maximum number of bits used in the Huffman tree.
+ */
+static void HUF_buildCTableFromTree(HUF_CElt* CTable, nodeElt const* huffNode, int nonNullRank, U32 maxSymbolValue, U32 maxNbBits)
+{
+    /* fill result into ctable (val, nbBits) */
+    int n;
+    U16 nbPerRank[HUF_TABLELOG_MAX+1] = {0};
+    U16 valPerRank[HUF_TABLELOG_MAX+1] = {0};
+    int const alphabetSize = (int)(maxSymbolValue + 1);
+    for (n=0; n<=nonNullRank; n++)
+        nbPerRank[huffNode[n].nbBits]++;
+    /* determine starting value per rank */
+    {   U16 min = 0;
+        for (n=(int)maxNbBits; n>0; n--) {
+            valPerRank[n] = min;      /* get starting value within each rank */
+            min += nbPerRank[n];
+            min >>= 1;
+    }   }
+    for (n=0; n<alphabetSize; n++)
+        CTable[huffNode[n].byte].nbBits = huffNode[n].nbBits;   /* push nbBits per symbol, symbol order */
+    for (n=0; n<alphabetSize; n++)
+        CTable[n].val = valPerRank[CTable[n].nbBits]++;   /* assign value within rank, symbol order */
+}
+
+size_t HUF_buildCTable_wksp (HUF_CElt* tree, const unsigned* count, U32 maxSymbolValue, U32 maxNbBits, void* workSpace, size_t wkspSize)
+{
+    HUF_buildCTable_wksp_tables* const wksp_tables = (HUF_buildCTable_wksp_tables*)workSpace;
+    nodeElt* const huffNode0 = wksp_tables->huffNodeTbl;
+    nodeElt* const huffNode = huffNode0+1;
+    int nonNullRank;
+
+    /* safety checks */
+    if (((size_t)workSpace & 3) != 0) return ERROR(GENERIC);  /* must be aligned on 4-bytes boundaries */
+    if (wkspSize < sizeof(HUF_buildCTable_wksp_tables))
+      return ERROR(workSpace_tooSmall);
+    if (maxNbBits == 0) maxNbBits = HUF_TABLELOG_DEFAULT;
+    if (maxSymbolValue > HUF_SYMBOLVALUE_MAX)
+      return ERROR(maxSymbolValue_tooLarge);
+    ZSTD_memset(huffNode0, 0, sizeof(huffNodeTable));
+
+    /* sort, decreasing order */
+    HUF_sort(huffNode, count, maxSymbolValue, wksp_tables->rankPosition);
+
+    /* build tree */
+    nonNullRank = HUF_buildTree(huffNode, maxSymbolValue);
+
+    /* enforce maxTableLog */
+    maxNbBits = HUF_setMaxHeight(huffNode, (U32)nonNullRank, maxNbBits);
+    if (maxNbBits > HUF_TABLELOG_MAX) return ERROR(GENERIC);   /* check fit into table */
+
+    HUF_buildCTableFromTree(tree, huffNode, nonNullRank, maxSymbolValue, maxNbBits);
+
+    return maxNbBits;
+}
+
+size_t HUF_estimateCompressedSize(const HUF_CElt* CTable, const unsigned* count, unsigned maxSymbolValue)
+{
+    size_t nbBits = 0;
+    int s;
+    for (s = 0; s <= (int)maxSymbolValue; ++s) {
+        nbBits += CTable[s].nbBits * count[s];
+    }
+    return nbBits >> 3;
+}
+
+int HUF_validateCTable(const HUF_CElt* CTable, const unsigned* count, unsigned maxSymbolValue) {
+  int bad = 0;
+  int s;
+  for (s = 0; s <= (int)maxSymbolValue; ++s) {
+    bad |= (count[s] != 0) & (CTable[s].nbBits == 0);
+  }
+  return !bad;
+}
+
+size_t HUF_compressBound(size_t size) { return HUF_COMPRESSBOUND(size); }
+
+FORCE_INLINE_TEMPLATE void
+HUF_encodeSymbol(BIT_CStream_t* bitCPtr, U32 symbol, const HUF_CElt* CTable)
+{
+    BIT_addBitsFast(bitCPtr, CTable[symbol].val, CTable[symbol].nbBits);
+}
+
+#define HUF_FLUSHBITS(s)  BIT_flushBits(s)
+
+#define HUF_FLUSHBITS_1(stream) \
+    if (sizeof((stream)->bitContainer)*8 < HUF_TABLELOG_MAX*2+7) HUF_FLUSHBITS(stream)
+
+#define HUF_FLUSHBITS_2(stream) \
+    if (sizeof((stream)->bitContainer)*8 < HUF_TABLELOG_MAX*4+7) HUF_FLUSHBITS(stream)
+
+FORCE_INLINE_TEMPLATE size_t
+HUF_compress1X_usingCTable_internal_body(void* dst, size_t dstSize,
+                                   const void* src, size_t srcSize,
+                                   const HUF_CElt* CTable)
+{
+    const BYTE* ip = (const BYTE*) src;
+    BYTE* const ostart = (BYTE*)dst;
+    BYTE* const oend = ostart + dstSize;
+    BYTE* op = ostart;
+    size_t n;
+    BIT_CStream_t bitC;
+
+    /* init */
+    if (dstSize < 8) return 0;   /* not enough space to compress */
+    { size_t const initErr = BIT_initCStream(&bitC, op, (size_t)(oend-op));
+      if (HUF_isError(initErr)) return 0; }
+
+    n = srcSize & ~3;  /* join to mod 4 */
+    switch (srcSize & 3)
+    {
+        case 3 : HUF_encodeSymbol(&bitC, ip[n+ 2], CTable);
+                 HUF_FLUSHBITS_2(&bitC);
+		 /* fall-through */
+        case 2 : HUF_encodeSymbol(&bitC, ip[n+ 1], CTable);
+                 HUF_FLUSHBITS_1(&bitC);
+		 /* fall-through */
+        case 1 : HUF_encodeSymbol(&bitC, ip[n+ 0], CTable);
+                 HUF_FLUSHBITS(&bitC);
+		 /* fall-through */
+        case 0 : /* fall-through */
+        default: break;
+    }
+
+    for (; n>0; n-=4) {  /* note : n&3==0 at this stage */
+        HUF_encodeSymbol(&bitC, ip[n- 1], CTable);
+        HUF_FLUSHBITS_1(&bitC);
+        HUF_encodeSymbol(&bitC, ip[n- 2], CTable);
+        HUF_FLUSHBITS_2(&bitC);
+        HUF_encodeSymbol(&bitC, ip[n- 3], CTable);
+        HUF_FLUSHBITS_1(&bitC);
+        HUF_encodeSymbol(&bitC, ip[n- 4], CTable);
+        HUF_FLUSHBITS(&bitC);
+    }
+
+    return BIT_closeCStream(&bitC);
+}
+
+#if DYNAMIC_BMI2
+
+static TARGET_ATTRIBUTE("bmi2") size_t
+HUF_compress1X_usingCTable_internal_bmi2(void* dst, size_t dstSize,
+                                   const void* src, size_t srcSize,
+                                   const HUF_CElt* CTable)
+{
+    return HUF_compress1X_usingCTable_internal_body(dst, dstSize, src, srcSize, CTable);
+}
+
+static size_t
+HUF_compress1X_usingCTable_internal_default(void* dst, size_t dstSize,
+                                      const void* src, size_t srcSize,
+                                      const HUF_CElt* CTable)
+{
+    return HUF_compress1X_usingCTable_internal_body(dst, dstSize, src, srcSize, CTable);
+}
+
+static size_t
+HUF_compress1X_usingCTable_internal(void* dst, size_t dstSize,
+                              const void* src, size_t srcSize,
+                              const HUF_CElt* CTable, const int bmi2)
+{
+    if (bmi2) {
+        return HUF_compress1X_usingCTable_internal_bmi2(dst, dstSize, src, srcSize, CTable);
+    }
+    return HUF_compress1X_usingCTable_internal_default(dst, dstSize, src, srcSize, CTable);
+}
+
+#else
+
+static size_t
+HUF_compress1X_usingCTable_internal(void* dst, size_t dstSize,
+                              const void* src, size_t srcSize,
+                              const HUF_CElt* CTable, const int bmi2)
+{
+    (void)bmi2;
+    return HUF_compress1X_usingCTable_internal_body(dst, dstSize, src, srcSize, CTable);
+}
+
+#endif
+
+size_t HUF_compress1X_usingCTable(void* dst, size_t dstSize, const void* src, size_t srcSize, const HUF_CElt* CTable)
+{
+    return HUF_compress1X_usingCTable_internal(dst, dstSize, src, srcSize, CTable, /* bmi2 */ 0);
+}
+
+
+static size_t
+HUF_compress4X_usingCTable_internal(void* dst, size_t dstSize,
+                              const void* src, size_t srcSize,
+                              const HUF_CElt* CTable, int bmi2)
+{
+    size_t const segmentSize = (srcSize+3)/4;   /* first 3 segments */
+    const BYTE* ip = (const BYTE*) src;
+    const BYTE* const iend = ip + srcSize;
+    BYTE* const ostart = (BYTE*) dst;
+    BYTE* const oend = ostart + dstSize;
+    BYTE* op = ostart;
+
+    if (dstSize < 6 + 1 + 1 + 1 + 8) return 0;   /* minimum space to compress successfully */
+    if (srcSize < 12) return 0;   /* no saving possible : too small input */
+    op += 6;   /* jumpTable */
+
+    assert(op <= oend);
+    {   CHECK_V_F(cSize, HUF_compress1X_usingCTable_internal(op, (size_t)(oend-op), ip, segmentSize, CTable, bmi2) );
+        if (cSize==0) return 0;
+        assert(cSize <= 65535);
+        MEM_writeLE16(ostart, (U16)cSize);
+        op += cSize;
+    }
+
+    ip += segmentSize;
+    assert(op <= oend);
+    {   CHECK_V_F(cSize, HUF_compress1X_usingCTable_internal(op, (size_t)(oend-op), ip, segmentSize, CTable, bmi2) );
+        if (cSize==0) return 0;
+        assert(cSize <= 65535);
+        MEM_writeLE16(ostart+2, (U16)cSize);
+        op += cSize;
+    }
+
+    ip += segmentSize;
+    assert(op <= oend);
+    {   CHECK_V_F(cSize, HUF_compress1X_usingCTable_internal(op, (size_t)(oend-op), ip, segmentSize, CTable, bmi2) );
+        if (cSize==0) return 0;
+        assert(cSize <= 65535);
+        MEM_writeLE16(ostart+4, (U16)cSize);
+        op += cSize;
+    }
+
+    ip += segmentSize;
+    assert(op <= oend);
+    assert(ip <= iend);
+    {   CHECK_V_F(cSize, HUF_compress1X_usingCTable_internal(op, (size_t)(oend-op), ip, (size_t)(iend-ip), CTable, bmi2) );
+        if (cSize==0) return 0;
+        op += cSize;
+    }
+
+    return (size_t)(op-ostart);
+}
+
+size_t HUF_compress4X_usingCTable(void* dst, size_t dstSize, const void* src, size_t srcSize, const HUF_CElt* CTable)
+{
+    return HUF_compress4X_usingCTable_internal(dst, dstSize, src, srcSize, CTable, /* bmi2 */ 0);
+}
+
+typedef enum { HUF_singleStream, HUF_fourStreams } HUF_nbStreams_e;
+
+static size_t HUF_compressCTable_internal(
+                BYTE* const ostart, BYTE* op, BYTE* const oend,
+                const void* src, size_t srcSize,
+                HUF_nbStreams_e nbStreams, const HUF_CElt* CTable, const int bmi2)
+{
+    size_t const cSize = (nbStreams==HUF_singleStream) ?
+                         HUF_compress1X_usingCTable_internal(op, (size_t)(oend - op), src, srcSize, CTable, bmi2) :
+                         HUF_compress4X_usingCTable_internal(op, (size_t)(oend - op), src, srcSize, CTable, bmi2);
+    if (HUF_isError(cSize)) { return cSize; }
+    if (cSize==0) { return 0; }   /* uncompressible */
+    op += cSize;
+    /* check compressibility */
+    assert(op >= ostart);
+    if ((size_t)(op-ostart) >= srcSize-1) { return 0; }
+    return (size_t)(op-ostart);
+}
+
+typedef struct {
+    unsigned count[HUF_SYMBOLVALUE_MAX + 1];
+    HUF_CElt CTable[HUF_SYMBOLVALUE_MAX + 1];
+    union {
+        HUF_buildCTable_wksp_tables buildCTable_wksp;
+        HUF_WriteCTableWksp writeCTable_wksp;
+    } wksps;
+} HUF_compress_tables_t;
+
+/* HUF_compress_internal() :
+ * `workSpace_align4` must be aligned on 4-bytes boundaries,
+ * and occupies the same space as a table of HUF_WORKSPACE_SIZE_U32 unsigned */
+static size_t
+HUF_compress_internal (void* dst, size_t dstSize,
+                 const void* src, size_t srcSize,
+                       unsigned maxSymbolValue, unsigned huffLog,
+                       HUF_nbStreams_e nbStreams,
+                       void* workSpace_align4, size_t wkspSize,
+                       HUF_CElt* oldHufTable, HUF_repeat* repeat, int preferRepeat,
+                 const int bmi2)
+{
+    HUF_compress_tables_t* const table = (HUF_compress_tables_t*)workSpace_align4;
+    BYTE* const ostart = (BYTE*)dst;
+    BYTE* const oend = ostart + dstSize;
+    BYTE* op = ostart;
+
+    HUF_STATIC_ASSERT(sizeof(*table) <= HUF_WORKSPACE_SIZE);
+    assert(((size_t)workSpace_align4 & 3) == 0);   /* must be aligned on 4-bytes boundaries */
+
+    /* checks & inits */
+    if (wkspSize < HUF_WORKSPACE_SIZE) return ERROR(workSpace_tooSmall);
+    if (!srcSize) return 0;  /* Uncompressed */
+    if (!dstSize) return 0;  /* cannot fit anything within dst budget */
+    if (srcSize > HUF_BLOCKSIZE_MAX) return ERROR(srcSize_wrong);   /* current block size limit */
+    if (huffLog > HUF_TABLELOG_MAX) return ERROR(tableLog_tooLarge);
+    if (maxSymbolValue > HUF_SYMBOLVALUE_MAX) return ERROR(maxSymbolValue_tooLarge);
+    if (!maxSymbolValue) maxSymbolValue = HUF_SYMBOLVALUE_MAX;
+    if (!huffLog) huffLog = HUF_TABLELOG_DEFAULT;
+
+    /* Heuristic : If old table is valid, use it for small inputs */
+    if (preferRepeat && repeat && *repeat == HUF_repeat_valid) {
+        return HUF_compressCTable_internal(ostart, op, oend,
+                                           src, srcSize,
+                                           nbStreams, oldHufTable, bmi2);
+    }
+
+    /* Scan input and build symbol stats */
+    {   CHECK_V_F(largest, HIST_count_wksp (table->count, &maxSymbolValue, (const BYTE*)src, srcSize, workSpace_align4, wkspSize) );
+        if (largest == srcSize) { *ostart = ((const BYTE*)src)[0]; return 1; }   /* single symbol, rle */
+        if (largest <= (srcSize >> 7)+4) return 0;   /* heuristic : probably not compressible enough */
+    }
+
+    /* Check validity of previous table */
+    if ( repeat
+      && *repeat == HUF_repeat_check
+      && !HUF_validateCTable(oldHufTable, table->count, maxSymbolValue)) {
+        *repeat = HUF_repeat_none;
+    }
+    /* Heuristic : use existing table for small inputs */
+    if (preferRepeat && repeat && *repeat != HUF_repeat_none) {
+        return HUF_compressCTable_internal(ostart, op, oend,
+                                           src, srcSize,
+                                           nbStreams, oldHufTable, bmi2);
+    }
+
+    /* Build Huffman Tree */
+    huffLog = HUF_optimalTableLog(huffLog, srcSize, maxSymbolValue);
+    {   size_t const maxBits = HUF_buildCTable_wksp(table->CTable, table->count,
+                                            maxSymbolValue, huffLog,
+                                            &table->wksps.buildCTable_wksp, sizeof(table->wksps.buildCTable_wksp));
+        CHECK_F(maxBits);
+        huffLog = (U32)maxBits;
+        /* Zero unused symbols in CTable, so we can check it for validity */
+        ZSTD_memset(table->CTable + (maxSymbolValue + 1), 0,
+               sizeof(table->CTable) - ((maxSymbolValue + 1) * sizeof(HUF_CElt)));
+    }
+
+    /* Write table description header */
+    {   CHECK_V_F(hSize, HUF_writeCTable_wksp(op, dstSize, table->CTable, maxSymbolValue, huffLog,
+                                              &table->wksps.writeCTable_wksp, sizeof(table->wksps.writeCTable_wksp)) );
+        /* Check if using previous huffman table is beneficial */
+        if (repeat && *repeat != HUF_repeat_none) {
+            size_t const oldSize = HUF_estimateCompressedSize(oldHufTable, table->count, maxSymbolValue);
+            size_t const newSize = HUF_estimateCompressedSize(table->CTable, table->count, maxSymbolValue);
+            if (oldSize <= hSize + newSize || hSize + 12 >= srcSize) {
+                return HUF_compressCTable_internal(ostart, op, oend,
+                                                   src, srcSize,
+                                                   nbStreams, oldHufTable, bmi2);
+        }   }
+
+        /* Use the new huffman table */
+        if (hSize + 12ul >= srcSize) { return 0; }
+        op += hSize;
+        if (repeat) { *repeat = HUF_repeat_none; }
+        if (oldHufTable)
+            ZSTD_memcpy(oldHufTable, table->CTable, sizeof(table->CTable));  /* Save new table */
+    }
+    return HUF_compressCTable_internal(ostart, op, oend,
+                                       src, srcSize,
+                                       nbStreams, table->CTable, bmi2);
+}
+
+
+size_t HUF_compress1X_wksp (void* dst, size_t dstSize,
+                      const void* src, size_t srcSize,
+                      unsigned maxSymbolValue, unsigned huffLog,
+                      void* workSpace, size_t wkspSize)
+{
+    return HUF_compress_internal(dst, dstSize, src, srcSize,
+                                 maxSymbolValue, huffLog, HUF_singleStream,
+                                 workSpace, wkspSize,
+                                 NULL, NULL, 0, 0 /*bmi2*/);
+}
+
+size_t HUF_compress1X_repeat (void* dst, size_t dstSize,
+                      const void* src, size_t srcSize,
+                      unsigned maxSymbolValue, unsigned huffLog,
+                      void* workSpace, size_t wkspSize,
+                      HUF_CElt* hufTable, HUF_repeat* repeat, int preferRepeat, int bmi2)
+{
+    return HUF_compress_internal(dst, dstSize, src, srcSize,
+                                 maxSymbolValue, huffLog, HUF_singleStream,
+                                 workSpace, wkspSize, hufTable,
+                                 repeat, preferRepeat, bmi2);
+}
+
+/* HUF_compress4X_repeat():
+ * compress input using 4 streams.
+ * provide workspace to generate compression tables */
+size_t HUF_compress4X_wksp (void* dst, size_t dstSize,
+                      const void* src, size_t srcSize,
+                      unsigned maxSymbolValue, unsigned huffLog,
+                      void* workSpace, size_t wkspSize)
+{
+    return HUF_compress_internal(dst, dstSize, src, srcSize,
+                                 maxSymbolValue, huffLog, HUF_fourStreams,
+                                 workSpace, wkspSize,
+                                 NULL, NULL, 0, 0 /*bmi2*/);
+}
+
+/* HUF_compress4X_repeat():
+ * compress input using 4 streams.
+ * re-use an existing huffman compression table */
+size_t HUF_compress4X_repeat (void* dst, size_t dstSize,
+                      const void* src, size_t srcSize,
+                      unsigned maxSymbolValue, unsigned huffLog,
+                      void* workSpace, size_t wkspSize,
+                      HUF_CElt* hufTable, HUF_repeat* repeat, int preferRepeat, int bmi2)
+{
+    return HUF_compress_internal(dst, dstSize, src, srcSize,
+                                 maxSymbolValue, huffLog, HUF_fourStreams,
+                                 workSpace, wkspSize,
+                                 hufTable, repeat, preferRepeat, bmi2);
+}
+
+#ifndef ZSTD_NO_UNUSED_FUNCTIONS
+/** HUF_buildCTable() :
+ * @return : maxNbBits
+ *  Note : count is used before tree is written, so they can safely overlap
+ */
+size_t HUF_buildCTable (HUF_CElt* tree, const unsigned* count, unsigned maxSymbolValue, unsigned maxNbBits)
+{
+    HUF_buildCTable_wksp_tables workspace;
+    return HUF_buildCTable_wksp(tree, count, maxSymbolValue, maxNbBits, &workspace, sizeof(workspace));
+}
+
+size_t HUF_compress1X (void* dst, size_t dstSize,
+                 const void* src, size_t srcSize,
+                 unsigned maxSymbolValue, unsigned huffLog)
+{
+    unsigned workSpace[HUF_WORKSPACE_SIZE_U32];
+    return HUF_compress1X_wksp(dst, dstSize, src, srcSize, maxSymbolValue, huffLog, workSpace, sizeof(workSpace));
+}
+
+size_t HUF_compress2 (void* dst, size_t dstSize,
+                const void* src, size_t srcSize,
+                unsigned maxSymbolValue, unsigned huffLog)
+{
+    unsigned workSpace[HUF_WORKSPACE_SIZE_U32];
+    return HUF_compress4X_wksp(dst, dstSize, src, srcSize, maxSymbolValue, huffLog, workSpace, sizeof(workSpace));
+}
+
+size_t HUF_compress (void* dst, size_t maxDstSize, const void* src, size_t srcSize)
+{
+    return HUF_compress2(dst, maxDstSize, src, srcSize, 255, HUF_TABLELOG_DEFAULT);
+}
+#endif
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_compress.c mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_compress.c
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_compress.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_compress.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,6393 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+/*-*************************************
+*  Dependencies
+***************************************/
+#include "../common/zstd_deps.h"  /* INT_MAX, ZSTD_memset, ZSTD_memcpy */
+#include "../common/cpu.h"
+#include "../common/mem.h"
+#include "hist.h"           /* HIST_countFast_wksp */
+#define FSE_STATIC_LINKING_ONLY   /* FSE_encodeSymbol */
+#include "../common/fse.h"
+#define HUF_STATIC_LINKING_ONLY
+#include "../common/huf.h"
+#include "zstd_compress_internal.h"
+#include "zstd_compress_sequences.h"
+#include "zstd_compress_literals.h"
+#include "zstd_fast.h"
+#include "zstd_double_fast.h"
+#include "zstd_lazy.h"
+#include "zstd_opt.h"
+#include "zstd_ldm.h"
+#include "zstd_compress_superblock.h"
+
+/* ***************************************************************
+*  Tuning parameters
+*****************************************************************/
+/*!
+ * COMPRESS_HEAPMODE :
+ * Select how default decompression function ZSTD_compress() allocates its context,
+ * on stack (0, default), or into heap (1).
+ * Note that functions with explicit context such as ZSTD_compressCCtx() are unaffected.
+ */
+#ifndef ZSTD_COMPRESS_HEAPMODE
+#  define ZSTD_COMPRESS_HEAPMODE 0
+#endif
+
+
+/*-*************************************
+*  Helper functions
+***************************************/
+/* ZSTD_compressBound()
+ * Note that the result from this function is only compatible with the "normal"
+ * full-block strategy.
+ * When there are a lot of small blocks due to frequent flush in streaming mode
+ * the overhead of headers can make the compressed data to be larger than the
+ * return value of ZSTD_compressBound().
+ */
+size_t ZSTD_compressBound(size_t srcSize) {
+    return ZSTD_COMPRESSBOUND(srcSize);
+}
+
+
+/*-*************************************
+*  Context memory management
+***************************************/
+struct ZSTD_CDict_s {
+    const void* dictContent;
+    size_t dictContentSize;
+    ZSTD_dictContentType_e dictContentType; /* The dictContentType the CDict was created with */
+    U32* entropyWorkspace; /* entropy workspace of HUF_WORKSPACE_SIZE bytes */
+    ZSTD_cwksp workspace;
+    ZSTD_matchState_t matchState;
+    ZSTD_compressedBlockState_t cBlockState;
+    ZSTD_customMem customMem;
+    U32 dictID;
+    int compressionLevel; /* 0 indicates that advanced API was used to select CDict params */
+    ZSTD_useRowMatchFinderMode_e useRowMatchFinder; /* Indicates whether the CDict was created with params that would use
+                                                     * row-based matchfinder. Unless the cdict is reloaded, we will use
+                                                     * the same greedy/lazy matchfinder at compression time.
+                                                     */
+};  /* typedef'd to ZSTD_CDict within "zstd.h" */
+
+ZSTD_CCtx* ZSTD_createCCtx(void)
+{
+    return ZSTD_createCCtx_advanced(ZSTD_defaultCMem);
+}
+
+static void ZSTD_initCCtx(ZSTD_CCtx* cctx, ZSTD_customMem memManager)
+{
+    assert(cctx != NULL);
+    ZSTD_memset(cctx, 0, sizeof(*cctx));
+    cctx->customMem = memManager;
+    cctx->bmi2 = ZSTD_cpuid_bmi2(ZSTD_cpuid());
+    {   size_t const err = ZSTD_CCtx_reset(cctx, ZSTD_reset_parameters);
+        assert(!ZSTD_isError(err));
+        (void)err;
+    }
+}
+
+ZSTD_CCtx* ZSTD_createCCtx_advanced(ZSTD_customMem customMem)
+{
+    ZSTD_STATIC_ASSERT(zcss_init==0);
+    ZSTD_STATIC_ASSERT(ZSTD_CONTENTSIZE_UNKNOWN==(0ULL - 1));
+    if ((!customMem.customAlloc) ^ (!customMem.customFree)) return NULL;
+    {   ZSTD_CCtx* const cctx = (ZSTD_CCtx*)ZSTD_customMalloc(sizeof(ZSTD_CCtx), customMem);
+        if (!cctx) return NULL;
+        ZSTD_initCCtx(cctx, customMem);
+        return cctx;
+    }
+}
+
+ZSTD_CCtx* ZSTD_initStaticCCtx(void* workspace, size_t workspaceSize)
+{
+    ZSTD_cwksp ws;
+    ZSTD_CCtx* cctx;
+    if (workspaceSize <= sizeof(ZSTD_CCtx)) return NULL;  /* minimum size */
+    if ((size_t)workspace & 7) return NULL;  /* must be 8-aligned */
+    ZSTD_cwksp_init(&ws, workspace, workspaceSize, ZSTD_cwksp_static_alloc);
+
+    cctx = (ZSTD_CCtx*)ZSTD_cwksp_reserve_object(&ws, sizeof(ZSTD_CCtx));
+    if (cctx == NULL) return NULL;
+
+    ZSTD_memset(cctx, 0, sizeof(ZSTD_CCtx));
+    ZSTD_cwksp_move(&cctx->workspace, &ws);
+    cctx->staticSize = workspaceSize;
+
+    /* statically sized space. entropyWorkspace never moves (but prev/next block swap places) */
+    if (!ZSTD_cwksp_check_available(&cctx->workspace, ENTROPY_WORKSPACE_SIZE + 2 * sizeof(ZSTD_compressedBlockState_t))) return NULL;
+    cctx->blockState.prevCBlock = (ZSTD_compressedBlockState_t*)ZSTD_cwksp_reserve_object(&cctx->workspace, sizeof(ZSTD_compressedBlockState_t));
+    cctx->blockState.nextCBlock = (ZSTD_compressedBlockState_t*)ZSTD_cwksp_reserve_object(&cctx->workspace, sizeof(ZSTD_compressedBlockState_t));
+    cctx->entropyWorkspace = (U32*)ZSTD_cwksp_reserve_object(&cctx->workspace, ENTROPY_WORKSPACE_SIZE);
+    cctx->bmi2 = ZSTD_cpuid_bmi2(ZSTD_cpuid());
+    return cctx;
+}
+
+/**
+ * Clears and frees all of the dictionaries in the CCtx.
+ */
+static void ZSTD_clearAllDicts(ZSTD_CCtx* cctx)
+{
+    ZSTD_customFree(cctx->localDict.dictBuffer, cctx->customMem);
+    ZSTD_freeCDict(cctx->localDict.cdict);
+    ZSTD_memset(&cctx->localDict, 0, sizeof(cctx->localDict));
+    ZSTD_memset(&cctx->prefixDict, 0, sizeof(cctx->prefixDict));
+    cctx->cdict = NULL;
+}
+
+static size_t ZSTD_sizeof_localDict(ZSTD_localDict dict)
+{
+    size_t const bufferSize = dict.dictBuffer != NULL ? dict.dictSize : 0;
+    size_t const cdictSize = ZSTD_sizeof_CDict(dict.cdict);
+    return bufferSize + cdictSize;
+}
+
+static void ZSTD_freeCCtxContent(ZSTD_CCtx* cctx)
+{
+    assert(cctx != NULL);
+    assert(cctx->staticSize == 0);
+    ZSTD_clearAllDicts(cctx);
+#ifdef ZSTD_MULTITHREAD
+    ZSTDMT_freeCCtx(cctx->mtctx); cctx->mtctx = NULL;
+#endif
+    ZSTD_cwksp_free(&cctx->workspace, cctx->customMem);
+}
+
+size_t ZSTD_freeCCtx(ZSTD_CCtx* cctx)
+{
+    if (cctx==NULL) return 0;   /* support free on NULL */
+    RETURN_ERROR_IF(cctx->staticSize, memory_allocation,
+                    "not compatible with static CCtx");
+    {
+        int cctxInWorkspace = ZSTD_cwksp_owns_buffer(&cctx->workspace, cctx);
+        ZSTD_freeCCtxContent(cctx);
+        if (!cctxInWorkspace) {
+            ZSTD_customFree(cctx, cctx->customMem);
+        }
+    }
+    return 0;
+}
+
+
+static size_t ZSTD_sizeof_mtctx(const ZSTD_CCtx* cctx)
+{
+#ifdef ZSTD_MULTITHREAD
+    return ZSTDMT_sizeof_CCtx(cctx->mtctx);
+#else
+    (void)cctx;
+    return 0;
+#endif
+}
+
+
+size_t ZSTD_sizeof_CCtx(const ZSTD_CCtx* cctx)
+{
+    if (cctx==NULL) return 0;   /* support sizeof on NULL */
+    /* cctx may be in the workspace */
+    return (cctx->workspace.workspace == cctx ? 0 : sizeof(*cctx))
+           + ZSTD_cwksp_sizeof(&cctx->workspace)
+           + ZSTD_sizeof_localDict(cctx->localDict)
+           + ZSTD_sizeof_mtctx(cctx);
+}
+
+size_t ZSTD_sizeof_CStream(const ZSTD_CStream* zcs)
+{
+    return ZSTD_sizeof_CCtx(zcs);  /* same object */
+}
+
+/* private API call, for dictBuilder only */
+const seqStore_t* ZSTD_getSeqStore(const ZSTD_CCtx* ctx) { return &(ctx->seqStore); }
+
+/* Returns true if the strategy supports using a row based matchfinder */
+static int ZSTD_rowMatchFinderSupported(const ZSTD_strategy strategy) {
+    return (strategy >= ZSTD_greedy && strategy <= ZSTD_lazy2);
+}
+
+/* Returns true if the strategy and useRowMatchFinder mode indicate that we will use the row based matchfinder
+ * for this compression.
+ */
+static int ZSTD_rowMatchFinderUsed(const ZSTD_strategy strategy, const ZSTD_useRowMatchFinderMode_e mode) {
+    assert(mode != ZSTD_urm_auto);
+    return ZSTD_rowMatchFinderSupported(strategy) && (mode == ZSTD_urm_enableRowMatchFinder);
+}
+
+/* Returns row matchfinder usage enum given an initial mode and cParams */
+static ZSTD_useRowMatchFinderMode_e ZSTD_resolveRowMatchFinderMode(ZSTD_useRowMatchFinderMode_e mode,
+                                                                   const ZSTD_compressionParameters* const cParams) {
+#if !defined(ZSTD_NO_INTRINSICS) && (defined(__SSE2__) || defined(__ARM_NEON))
+    int const kHasSIMD128 = 1;
+#else
+    int const kHasSIMD128 = 0;
+#endif
+    if (mode != ZSTD_urm_auto) return mode; /* if requested enabled, but no SIMD, we still will use row matchfinder */
+    mode = ZSTD_urm_disableRowMatchFinder;
+    if (!ZSTD_rowMatchFinderSupported(cParams->strategy)) return mode;
+    if (kHasSIMD128) {
+        if (cParams->windowLog > 14) mode = ZSTD_urm_enableRowMatchFinder;
+    } else {
+        if (cParams->windowLog > 17) mode = ZSTD_urm_enableRowMatchFinder;
+    }
+    return mode;
+}
+
+/* Returns 1 if the arguments indicate that we should allocate a chainTable, 0 otherwise */
+static int ZSTD_allocateChainTable(const ZSTD_strategy strategy,
+                                   const ZSTD_useRowMatchFinderMode_e useRowMatchFinder,
+                                   const U32 forDDSDict) {
+    assert(useRowMatchFinder != ZSTD_urm_auto);
+    /* We always should allocate a chaintable if we are allocating a matchstate for a DDS dictionary matchstate.
+     * We do not allocate a chaintable if we are using ZSTD_fast, or are using the row-based matchfinder.
+     */
+    return forDDSDict || ((strategy != ZSTD_fast) && !ZSTD_rowMatchFinderUsed(strategy, useRowMatchFinder));
+}
+
+/* Returns 1 if compression parameters are such that we should
+ * enable long distance matching (wlog >= 27, strategy >= btopt).
+ * Returns 0 otherwise.
+ */
+static U32 ZSTD_CParams_shouldEnableLdm(const ZSTD_compressionParameters* const cParams) {
+    return cParams->strategy >= ZSTD_btopt && cParams->windowLog >= 27;
+}
+
+/* Returns 1 if compression parameters are such that we should
+ * enable blockSplitter (wlog >= 17, strategy >= btopt).
+ * Returns 0 otherwise.
+ */
+static U32 ZSTD_CParams_useBlockSplitter(const ZSTD_compressionParameters* const cParams) {
+    return cParams->strategy >= ZSTD_btopt && cParams->windowLog >= 17;
+}
+
+static ZSTD_CCtx_params ZSTD_makeCCtxParamsFromCParams(
+        ZSTD_compressionParameters cParams)
+{
+    ZSTD_CCtx_params cctxParams;
+    /* should not matter, as all cParams are presumed properly defined */
+    ZSTD_CCtxParams_init(&cctxParams, ZSTD_CLEVEL_DEFAULT);
+    cctxParams.cParams = cParams;
+
+    /* Adjust advanced params according to cParams */
+    if (ZSTD_CParams_shouldEnableLdm(&cParams)) {
+        DEBUGLOG(4, "ZSTD_makeCCtxParamsFromCParams(): Including LDM into cctx params");
+        cctxParams.ldmParams.enableLdm = 1;
+        /* LDM is enabled by default for optimal parser and window size >= 128MB */
+        ZSTD_ldm_adjustParameters(&cctxParams.ldmParams, &cParams);
+        assert(cctxParams.ldmParams.hashLog >= cctxParams.ldmParams.bucketSizeLog);
+        assert(cctxParams.ldmParams.hashRateLog < 32);
+    }
+
+    if (ZSTD_CParams_useBlockSplitter(&cParams)) {
+        DEBUGLOG(4, "ZSTD_makeCCtxParamsFromCParams(): Including block splitting into cctx params");
+        cctxParams.splitBlocks = 1;
+    }
+
+    cctxParams.useRowMatchFinder = ZSTD_resolveRowMatchFinderMode(cctxParams.useRowMatchFinder, &cParams);
+    assert(!ZSTD_checkCParams(cParams));
+    return cctxParams;
+}
+
+static ZSTD_CCtx_params* ZSTD_createCCtxParams_advanced(
+        ZSTD_customMem customMem)
+{
+    ZSTD_CCtx_params* params;
+    if ((!customMem.customAlloc) ^ (!customMem.customFree)) return NULL;
+    params = (ZSTD_CCtx_params*)ZSTD_customCalloc(
+            sizeof(ZSTD_CCtx_params), customMem);
+    if (!params) { return NULL; }
+    ZSTD_CCtxParams_init(params, ZSTD_CLEVEL_DEFAULT);
+    params->customMem = customMem;
+    return params;
+}
+
+ZSTD_CCtx_params* ZSTD_createCCtxParams(void)
+{
+    return ZSTD_createCCtxParams_advanced(ZSTD_defaultCMem);
+}
+
+size_t ZSTD_freeCCtxParams(ZSTD_CCtx_params* params)
+{
+    if (params == NULL) { return 0; }
+    ZSTD_customFree(params, params->customMem);
+    return 0;
+}
+
+size_t ZSTD_CCtxParams_reset(ZSTD_CCtx_params* params)
+{
+    return ZSTD_CCtxParams_init(params, ZSTD_CLEVEL_DEFAULT);
+}
+
+size_t ZSTD_CCtxParams_init(ZSTD_CCtx_params* cctxParams, int compressionLevel) {
+    RETURN_ERROR_IF(!cctxParams, GENERIC, "NULL pointer!");
+    ZSTD_memset(cctxParams, 0, sizeof(*cctxParams));
+    cctxParams->compressionLevel = compressionLevel;
+    cctxParams->fParams.contentSizeFlag = 1;
+    return 0;
+}
+
+#define ZSTD_NO_CLEVEL 0
+
+/**
+ * Initializes the cctxParams from params and compressionLevel.
+ * @param compressionLevel If params are derived from a compression level then that compression level, otherwise ZSTD_NO_CLEVEL.
+ */
+static void ZSTD_CCtxParams_init_internal(ZSTD_CCtx_params* cctxParams, ZSTD_parameters const* params, int compressionLevel)
+{
+    assert(!ZSTD_checkCParams(params->cParams));
+    ZSTD_memset(cctxParams, 0, sizeof(*cctxParams));
+    cctxParams->cParams = params->cParams;
+    cctxParams->fParams = params->fParams;
+    /* Should not matter, as all cParams are presumed properly defined.
+     * But, set it for tracing anyway.
+     */
+    cctxParams->compressionLevel = compressionLevel;
+    cctxParams->useRowMatchFinder = ZSTD_resolveRowMatchFinderMode(cctxParams->useRowMatchFinder, &params->cParams);
+    DEBUGLOG(4, "ZSTD_CCtxParams_init_internal: useRowMatchFinder=%d", cctxParams->useRowMatchFinder);
+}
+
+size_t ZSTD_CCtxParams_init_advanced(ZSTD_CCtx_params* cctxParams, ZSTD_parameters params)
+{
+    RETURN_ERROR_IF(!cctxParams, GENERIC, "NULL pointer!");
+    FORWARD_IF_ERROR( ZSTD_checkCParams(params.cParams) , "");
+    ZSTD_CCtxParams_init_internal(cctxParams, &params, ZSTD_NO_CLEVEL);
+    return 0;
+}
+
+/**
+ * Sets cctxParams' cParams and fParams from params, but otherwise leaves them alone.
+ * @param param Validated zstd parameters.
+ */
+static void ZSTD_CCtxParams_setZstdParams(
+        ZSTD_CCtx_params* cctxParams, const ZSTD_parameters* params)
+{
+    assert(!ZSTD_checkCParams(params->cParams));
+    cctxParams->cParams = params->cParams;
+    cctxParams->fParams = params->fParams;
+    /* Should not matter, as all cParams are presumed properly defined.
+     * But, set it for tracing anyway.
+     */
+    cctxParams->compressionLevel = ZSTD_NO_CLEVEL;
+}
+
+ZSTD_bounds ZSTD_cParam_getBounds(ZSTD_cParameter param)
+{
+    ZSTD_bounds bounds = { 0, 0, 0 };
+
+    switch(param)
+    {
+    case ZSTD_c_compressionLevel:
+        bounds.lowerBound = ZSTD_minCLevel();
+        bounds.upperBound = ZSTD_maxCLevel();
+        return bounds;
+
+    case ZSTD_c_windowLog:
+        bounds.lowerBound = ZSTD_WINDOWLOG_MIN;
+        bounds.upperBound = ZSTD_WINDOWLOG_MAX;
+        return bounds;
+
+    case ZSTD_c_hashLog:
+        bounds.lowerBound = ZSTD_HASHLOG_MIN;
+        bounds.upperBound = ZSTD_HASHLOG_MAX;
+        return bounds;
+
+    case ZSTD_c_chainLog:
+        bounds.lowerBound = ZSTD_CHAINLOG_MIN;
+        bounds.upperBound = ZSTD_CHAINLOG_MAX;
+        return bounds;
+
+    case ZSTD_c_searchLog:
+        bounds.lowerBound = ZSTD_SEARCHLOG_MIN;
+        bounds.upperBound = ZSTD_SEARCHLOG_MAX;
+        return bounds;
+
+    case ZSTD_c_minMatch:
+        bounds.lowerBound = ZSTD_MINMATCH_MIN;
+        bounds.upperBound = ZSTD_MINMATCH_MAX;
+        return bounds;
+
+    case ZSTD_c_targetLength:
+        bounds.lowerBound = ZSTD_TARGETLENGTH_MIN;
+        bounds.upperBound = ZSTD_TARGETLENGTH_MAX;
+        return bounds;
+
+    case ZSTD_c_strategy:
+        bounds.lowerBound = ZSTD_STRATEGY_MIN;
+        bounds.upperBound = ZSTD_STRATEGY_MAX;
+        return bounds;
+
+    case ZSTD_c_contentSizeFlag:
+        bounds.lowerBound = 0;
+        bounds.upperBound = 1;
+        return bounds;
+
+    case ZSTD_c_checksumFlag:
+        bounds.lowerBound = 0;
+        bounds.upperBound = 1;
+        return bounds;
+
+    case ZSTD_c_dictIDFlag:
+        bounds.lowerBound = 0;
+        bounds.upperBound = 1;
+        return bounds;
+
+    case ZSTD_c_nbWorkers:
+        bounds.lowerBound = 0;
+#ifdef ZSTD_MULTITHREAD
+        bounds.upperBound = ZSTDMT_NBWORKERS_MAX;
+#else
+        bounds.upperBound = 0;
+#endif
+        return bounds;
+
+    case ZSTD_c_jobSize:
+        bounds.lowerBound = 0;
+#ifdef ZSTD_MULTITHREAD
+        bounds.upperBound = ZSTDMT_JOBSIZE_MAX;
+#else
+        bounds.upperBound = 0;
+#endif
+        return bounds;
+
+    case ZSTD_c_overlapLog:
+#ifdef ZSTD_MULTITHREAD
+        bounds.lowerBound = ZSTD_OVERLAPLOG_MIN;
+        bounds.upperBound = ZSTD_OVERLAPLOG_MAX;
+#else
+        bounds.lowerBound = 0;
+        bounds.upperBound = 0;
+#endif
+        return bounds;
+
+    case ZSTD_c_enableDedicatedDictSearch:
+        bounds.lowerBound = 0;
+        bounds.upperBound = 1;
+        return bounds;
+
+    case ZSTD_c_enableLongDistanceMatching:
+        bounds.lowerBound = 0;
+        bounds.upperBound = 1;
+        return bounds;
+
+    case ZSTD_c_ldmHashLog:
+        bounds.lowerBound = ZSTD_LDM_HASHLOG_MIN;
+        bounds.upperBound = ZSTD_LDM_HASHLOG_MAX;
+        return bounds;
+
+    case ZSTD_c_ldmMinMatch:
+        bounds.lowerBound = ZSTD_LDM_MINMATCH_MIN;
+        bounds.upperBound = ZSTD_LDM_MINMATCH_MAX;
+        return bounds;
+
+    case ZSTD_c_ldmBucketSizeLog:
+        bounds.lowerBound = ZSTD_LDM_BUCKETSIZELOG_MIN;
+        bounds.upperBound = ZSTD_LDM_BUCKETSIZELOG_MAX;
+        return bounds;
+
+    case ZSTD_c_ldmHashRateLog:
+        bounds.lowerBound = ZSTD_LDM_HASHRATELOG_MIN;
+        bounds.upperBound = ZSTD_LDM_HASHRATELOG_MAX;
+        return bounds;
+
+    /* experimental parameters */
+    case ZSTD_c_rsyncable:
+        bounds.lowerBound = 0;
+        bounds.upperBound = 1;
+        return bounds;
+
+    case ZSTD_c_forceMaxWindow :
+        bounds.lowerBound = 0;
+        bounds.upperBound = 1;
+        return bounds;
+
+    case ZSTD_c_format:
+        ZSTD_STATIC_ASSERT(ZSTD_f_zstd1 < ZSTD_f_zstd1_magicless);
+        bounds.lowerBound = ZSTD_f_zstd1;
+        bounds.upperBound = ZSTD_f_zstd1_magicless;   /* note : how to ensure at compile time that this is the highest value enum ? */
+        return bounds;
+
+    case ZSTD_c_forceAttachDict:
+        ZSTD_STATIC_ASSERT(ZSTD_dictDefaultAttach < ZSTD_dictForceLoad);
+        bounds.lowerBound = ZSTD_dictDefaultAttach;
+        bounds.upperBound = ZSTD_dictForceLoad;       /* note : how to ensure at compile time that this is the highest value enum ? */
+        return bounds;
+
+    case ZSTD_c_literalCompressionMode:
+        ZSTD_STATIC_ASSERT(ZSTD_lcm_auto < ZSTD_lcm_huffman && ZSTD_lcm_huffman < ZSTD_lcm_uncompressed);
+        bounds.lowerBound = ZSTD_lcm_auto;
+        bounds.upperBound = ZSTD_lcm_uncompressed;
+        return bounds;
+
+    case ZSTD_c_targetCBlockSize:
+        bounds.lowerBound = ZSTD_TARGETCBLOCKSIZE_MIN;
+        bounds.upperBound = ZSTD_TARGETCBLOCKSIZE_MAX;
+        return bounds;
+
+    case ZSTD_c_srcSizeHint:
+        bounds.lowerBound = ZSTD_SRCSIZEHINT_MIN;
+        bounds.upperBound = ZSTD_SRCSIZEHINT_MAX;
+        return bounds;
+
+    case ZSTD_c_stableInBuffer:
+    case ZSTD_c_stableOutBuffer:
+        bounds.lowerBound = (int)ZSTD_bm_buffered;
+        bounds.upperBound = (int)ZSTD_bm_stable;
+        return bounds;
+
+    case ZSTD_c_blockDelimiters:
+        bounds.lowerBound = (int)ZSTD_sf_noBlockDelimiters;
+        bounds.upperBound = (int)ZSTD_sf_explicitBlockDelimiters;
+        return bounds;
+
+    case ZSTD_c_validateSequences:
+        bounds.lowerBound = 0;
+        bounds.upperBound = 1;
+        return bounds;
+
+    case ZSTD_c_splitBlocks:
+        bounds.lowerBound = 0;
+        bounds.upperBound = 1;
+        return bounds;
+
+    case ZSTD_c_useRowMatchFinder:
+        bounds.lowerBound = (int)ZSTD_urm_auto;
+        bounds.upperBound = (int)ZSTD_urm_enableRowMatchFinder;
+        return bounds;
+
+    case ZSTD_c_deterministicRefPrefix:
+        bounds.lowerBound = 0;
+        bounds.upperBound = 1;
+        return bounds;
+
+    default:
+        bounds.error = ERROR(parameter_unsupported);
+        return bounds;
+    }
+}
+
+/* ZSTD_cParam_clampBounds:
+ * Clamps the value into the bounded range.
+ */
+static size_t ZSTD_cParam_clampBounds(ZSTD_cParameter cParam, int* value)
+{
+    ZSTD_bounds const bounds = ZSTD_cParam_getBounds(cParam);
+    if (ZSTD_isError(bounds.error)) return bounds.error;
+    if (*value < bounds.lowerBound) *value = bounds.lowerBound;
+    if (*value > bounds.upperBound) *value = bounds.upperBound;
+    return 0;
+}
+
+#define BOUNDCHECK(cParam, val) { \
+    RETURN_ERROR_IF(!ZSTD_cParam_withinBounds(cParam,val), \
+                    parameter_outOfBound, "Param out of bounds"); \
+}
+
+
+static int ZSTD_isUpdateAuthorized(ZSTD_cParameter param)
+{
+    switch(param)
+    {
+    case ZSTD_c_compressionLevel:
+    case ZSTD_c_hashLog:
+    case ZSTD_c_chainLog:
+    case ZSTD_c_searchLog:
+    case ZSTD_c_minMatch:
+    case ZSTD_c_targetLength:
+    case ZSTD_c_strategy:
+        return 1;
+
+    case ZSTD_c_format:
+    case ZSTD_c_windowLog:
+    case ZSTD_c_contentSizeFlag:
+    case ZSTD_c_checksumFlag:
+    case ZSTD_c_dictIDFlag:
+    case ZSTD_c_forceMaxWindow :
+    case ZSTD_c_nbWorkers:
+    case ZSTD_c_jobSize:
+    case ZSTD_c_overlapLog:
+    case ZSTD_c_rsyncable:
+    case ZSTD_c_enableDedicatedDictSearch:
+    case ZSTD_c_enableLongDistanceMatching:
+    case ZSTD_c_ldmHashLog:
+    case ZSTD_c_ldmMinMatch:
+    case ZSTD_c_ldmBucketSizeLog:
+    case ZSTD_c_ldmHashRateLog:
+    case ZSTD_c_forceAttachDict:
+    case ZSTD_c_literalCompressionMode:
+    case ZSTD_c_targetCBlockSize:
+    case ZSTD_c_srcSizeHint:
+    case ZSTD_c_stableInBuffer:
+    case ZSTD_c_stableOutBuffer:
+    case ZSTD_c_blockDelimiters:
+    case ZSTD_c_validateSequences:
+    case ZSTD_c_splitBlocks:
+    case ZSTD_c_useRowMatchFinder:
+    case ZSTD_c_deterministicRefPrefix:
+    default:
+        return 0;
+    }
+}
+
+size_t ZSTD_CCtx_setParameter(ZSTD_CCtx* cctx, ZSTD_cParameter param, int value)
+{
+    DEBUGLOG(4, "ZSTD_CCtx_setParameter (%i, %i)", (int)param, value);
+    if (cctx->streamStage != zcss_init) {
+        if (ZSTD_isUpdateAuthorized(param)) {
+            cctx->cParamsChanged = 1;
+        } else {
+            RETURN_ERROR(stage_wrong, "can only set params in ctx init stage");
+    }   }
+
+    switch(param)
+    {
+    case ZSTD_c_nbWorkers:
+        RETURN_ERROR_IF((value!=0) && cctx->staticSize, parameter_unsupported,
+                        "MT not compatible with static alloc");
+        break;
+
+    case ZSTD_c_compressionLevel:
+    case ZSTD_c_windowLog:
+    case ZSTD_c_hashLog:
+    case ZSTD_c_chainLog:
+    case ZSTD_c_searchLog:
+    case ZSTD_c_minMatch:
+    case ZSTD_c_targetLength:
+    case ZSTD_c_strategy:
+    case ZSTD_c_ldmHashRateLog:
+    case ZSTD_c_format:
+    case ZSTD_c_contentSizeFlag:
+    case ZSTD_c_checksumFlag:
+    case ZSTD_c_dictIDFlag:
+    case ZSTD_c_forceMaxWindow:
+    case ZSTD_c_forceAttachDict:
+    case ZSTD_c_literalCompressionMode:
+    case ZSTD_c_jobSize:
+    case ZSTD_c_overlapLog:
+    case ZSTD_c_rsyncable:
+    case ZSTD_c_enableDedicatedDictSearch:
+    case ZSTD_c_enableLongDistanceMatching:
+    case ZSTD_c_ldmHashLog:
+    case ZSTD_c_ldmMinMatch:
+    case ZSTD_c_ldmBucketSizeLog:
+    case ZSTD_c_targetCBlockSize:
+    case ZSTD_c_srcSizeHint:
+    case ZSTD_c_stableInBuffer:
+    case ZSTD_c_stableOutBuffer:
+    case ZSTD_c_blockDelimiters:
+    case ZSTD_c_validateSequences:
+    case ZSTD_c_splitBlocks:
+    case ZSTD_c_useRowMatchFinder:
+    case ZSTD_c_deterministicRefPrefix:
+        break;
+
+    default: RETURN_ERROR(parameter_unsupported, "unknown parameter");
+    }
+    return ZSTD_CCtxParams_setParameter(&cctx->requestedParams, param, value);
+}
+
+size_t ZSTD_CCtxParams_setParameter(ZSTD_CCtx_params* CCtxParams,
+                                    ZSTD_cParameter param, int value)
+{
+    DEBUGLOG(4, "ZSTD_CCtxParams_setParameter (%i, %i)", (int)param, value);
+    switch(param)
+    {
+    case ZSTD_c_format :
+        BOUNDCHECK(ZSTD_c_format, value);
+        CCtxParams->format = (ZSTD_format_e)value;
+        return (size_t)CCtxParams->format;
+
+    case ZSTD_c_compressionLevel : {
+        FORWARD_IF_ERROR(ZSTD_cParam_clampBounds(param, &value), "");
+        if (value == 0)
+            CCtxParams->compressionLevel = ZSTD_CLEVEL_DEFAULT; /* 0 == default */
+        else
+            CCtxParams->compressionLevel = value;
+        if (CCtxParams->compressionLevel >= 0) return (size_t)CCtxParams->compressionLevel;
+        return 0;  /* return type (size_t) cannot represent negative values */
+    }
+
+    case ZSTD_c_windowLog :
+        if (value!=0)   /* 0 => use default */
+            BOUNDCHECK(ZSTD_c_windowLog, value);
+        CCtxParams->cParams.windowLog = (U32)value;
+        return CCtxParams->cParams.windowLog;
+
+    case ZSTD_c_hashLog :
+        if (value!=0)   /* 0 => use default */
+            BOUNDCHECK(ZSTD_c_hashLog, value);
+        CCtxParams->cParams.hashLog = (U32)value;
+        return CCtxParams->cParams.hashLog;
+
+    case ZSTD_c_chainLog :
+        if (value!=0)   /* 0 => use default */
+            BOUNDCHECK(ZSTD_c_chainLog, value);
+        CCtxParams->cParams.chainLog = (U32)value;
+        return CCtxParams->cParams.chainLog;
+
+    case ZSTD_c_searchLog :
+        if (value!=0)   /* 0 => use default */
+            BOUNDCHECK(ZSTD_c_searchLog, value);
+        CCtxParams->cParams.searchLog = (U32)value;
+        return (size_t)value;
+
+    case ZSTD_c_minMatch :
+        if (value!=0)   /* 0 => use default */
+            BOUNDCHECK(ZSTD_c_minMatch, value);
+        CCtxParams->cParams.minMatch = value;
+        return CCtxParams->cParams.minMatch;
+
+    case ZSTD_c_targetLength :
+        BOUNDCHECK(ZSTD_c_targetLength, value);
+        CCtxParams->cParams.targetLength = value;
+        return CCtxParams->cParams.targetLength;
+
+    case ZSTD_c_strategy :
+        if (value!=0)   /* 0 => use default */
+            BOUNDCHECK(ZSTD_c_strategy, value);
+        CCtxParams->cParams.strategy = (ZSTD_strategy)value;
+        return (size_t)CCtxParams->cParams.strategy;
+
+    case ZSTD_c_contentSizeFlag :
+        /* Content size written in frame header _when known_ (default:1) */
+        DEBUGLOG(4, "set content size flag = %u", (value!=0));
+        CCtxParams->fParams.contentSizeFlag = value != 0;
+        return CCtxParams->fParams.contentSizeFlag;
+
+    case ZSTD_c_checksumFlag :
+        /* A 32-bits content checksum will be calculated and written at end of frame (default:0) */
+        CCtxParams->fParams.checksumFlag = value != 0;
+        return CCtxParams->fParams.checksumFlag;
+
+    case ZSTD_c_dictIDFlag : /* When applicable, dictionary's dictID is provided in frame header (default:1) */
+        DEBUGLOG(4, "set dictIDFlag = %u", (value!=0));
+        CCtxParams->fParams.noDictIDFlag = !value;
+        return !CCtxParams->fParams.noDictIDFlag;
+
+    case ZSTD_c_forceMaxWindow :
+        CCtxParams->forceWindow = (value != 0);
+        return CCtxParams->forceWindow;
+
+    case ZSTD_c_forceAttachDict : {
+        const ZSTD_dictAttachPref_e pref = (ZSTD_dictAttachPref_e)value;
+        BOUNDCHECK(ZSTD_c_forceAttachDict, pref);
+        CCtxParams->attachDictPref = pref;
+        return CCtxParams->attachDictPref;
+    }
+
+    case ZSTD_c_literalCompressionMode : {
+        const ZSTD_literalCompressionMode_e lcm = (ZSTD_literalCompressionMode_e)value;
+        BOUNDCHECK(ZSTD_c_literalCompressionMode, lcm);
+        CCtxParams->literalCompressionMode = lcm;
+        return CCtxParams->literalCompressionMode;
+    }
+
+    case ZSTD_c_nbWorkers :
+#ifndef ZSTD_MULTITHREAD
+        RETURN_ERROR_IF(value!=0, parameter_unsupported, "not compiled with multithreading");
+        return 0;
+#else
+        FORWARD_IF_ERROR(ZSTD_cParam_clampBounds(param, &value), "");
+        CCtxParams->nbWorkers = value;
+        return CCtxParams->nbWorkers;
+#endif
+
+    case ZSTD_c_jobSize :
+#ifndef ZSTD_MULTITHREAD
+        RETURN_ERROR_IF(value!=0, parameter_unsupported, "not compiled with multithreading");
+        return 0;
+#else
+        /* Adjust to the minimum non-default value. */
+        if (value != 0 && value < ZSTDMT_JOBSIZE_MIN)
+            value = ZSTDMT_JOBSIZE_MIN;
+        FORWARD_IF_ERROR(ZSTD_cParam_clampBounds(param, &value), "");
+        assert(value >= 0);
+        CCtxParams->jobSize = value;
+        return CCtxParams->jobSize;
+#endif
+
+    case ZSTD_c_overlapLog :
+#ifndef ZSTD_MULTITHREAD
+        RETURN_ERROR_IF(value!=0, parameter_unsupported, "not compiled with multithreading");
+        return 0;
+#else
+        FORWARD_IF_ERROR(ZSTD_cParam_clampBounds(ZSTD_c_overlapLog, &value), "");
+        CCtxParams->overlapLog = value;
+        return CCtxParams->overlapLog;
+#endif
+
+    case ZSTD_c_rsyncable :
+#ifndef ZSTD_MULTITHREAD
+        RETURN_ERROR_IF(value!=0, parameter_unsupported, "not compiled with multithreading");
+        return 0;
+#else
+        FORWARD_IF_ERROR(ZSTD_cParam_clampBounds(ZSTD_c_overlapLog, &value), "");
+        CCtxParams->rsyncable = value;
+        return CCtxParams->rsyncable;
+#endif
+
+    case ZSTD_c_enableDedicatedDictSearch :
+        CCtxParams->enableDedicatedDictSearch = (value!=0);
+        return CCtxParams->enableDedicatedDictSearch;
+
+    case ZSTD_c_enableLongDistanceMatching :
+        CCtxParams->ldmParams.enableLdm = (value!=0);
+        return CCtxParams->ldmParams.enableLdm;
+
+    case ZSTD_c_ldmHashLog :
+        if (value!=0)   /* 0 ==> auto */
+            BOUNDCHECK(ZSTD_c_ldmHashLog, value);
+        CCtxParams->ldmParams.hashLog = value;
+        return CCtxParams->ldmParams.hashLog;
+
+    case ZSTD_c_ldmMinMatch :
+        if (value!=0)   /* 0 ==> default */
+            BOUNDCHECK(ZSTD_c_ldmMinMatch, value);
+        CCtxParams->ldmParams.minMatchLength = value;
+        return CCtxParams->ldmParams.minMatchLength;
+
+    case ZSTD_c_ldmBucketSizeLog :
+        if (value!=0)   /* 0 ==> default */
+            BOUNDCHECK(ZSTD_c_ldmBucketSizeLog, value);
+        CCtxParams->ldmParams.bucketSizeLog = value;
+        return CCtxParams->ldmParams.bucketSizeLog;
+
+    case ZSTD_c_ldmHashRateLog :
+        RETURN_ERROR_IF(value > ZSTD_WINDOWLOG_MAX - ZSTD_HASHLOG_MIN,
+                        parameter_outOfBound, "Param out of bounds!");
+        CCtxParams->ldmParams.hashRateLog = value;
+        return CCtxParams->ldmParams.hashRateLog;
+
+    case ZSTD_c_targetCBlockSize :
+        if (value!=0)   /* 0 ==> default */
+            BOUNDCHECK(ZSTD_c_targetCBlockSize, value);
+        CCtxParams->targetCBlockSize = value;
+        return CCtxParams->targetCBlockSize;
+
+    case ZSTD_c_srcSizeHint :
+        if (value!=0)    /* 0 ==> default */
+            BOUNDCHECK(ZSTD_c_srcSizeHint, value);
+        CCtxParams->srcSizeHint = value;
+        return CCtxParams->srcSizeHint;
+
+    case ZSTD_c_stableInBuffer:
+        BOUNDCHECK(ZSTD_c_stableInBuffer, value);
+        CCtxParams->inBufferMode = (ZSTD_bufferMode_e)value;
+        return CCtxParams->inBufferMode;
+
+    case ZSTD_c_stableOutBuffer:
+        BOUNDCHECK(ZSTD_c_stableOutBuffer, value);
+        CCtxParams->outBufferMode = (ZSTD_bufferMode_e)value;
+        return CCtxParams->outBufferMode;
+
+    case ZSTD_c_blockDelimiters:
+        BOUNDCHECK(ZSTD_c_blockDelimiters, value);
+        CCtxParams->blockDelimiters = (ZSTD_sequenceFormat_e)value;
+        return CCtxParams->blockDelimiters;
+
+    case ZSTD_c_validateSequences:
+        BOUNDCHECK(ZSTD_c_validateSequences, value);
+        CCtxParams->validateSequences = value;
+        return CCtxParams->validateSequences;
+
+    case ZSTD_c_splitBlocks:
+        BOUNDCHECK(ZSTD_c_splitBlocks, value);
+        CCtxParams->splitBlocks = value;
+        return CCtxParams->splitBlocks;
+
+    case ZSTD_c_useRowMatchFinder:
+        BOUNDCHECK(ZSTD_c_useRowMatchFinder, value);
+        CCtxParams->useRowMatchFinder = (ZSTD_useRowMatchFinderMode_e)value;
+        return CCtxParams->useRowMatchFinder;
+
+    case ZSTD_c_deterministicRefPrefix:
+        BOUNDCHECK(ZSTD_c_deterministicRefPrefix, value);
+        CCtxParams->deterministicRefPrefix = !!value;
+        return CCtxParams->deterministicRefPrefix;
+
+    default: RETURN_ERROR(parameter_unsupported, "unknown parameter");
+    }
+}
+
+size_t ZSTD_CCtx_getParameter(ZSTD_CCtx const* cctx, ZSTD_cParameter param, int* value)
+{
+    return ZSTD_CCtxParams_getParameter(&cctx->requestedParams, param, value);
+}
+
+size_t ZSTD_CCtxParams_getParameter(
+        ZSTD_CCtx_params const* CCtxParams, ZSTD_cParameter param, int* value)
+{
+    switch(param)
+    {
+    case ZSTD_c_format :
+        *value = CCtxParams->format;
+        break;
+    case ZSTD_c_compressionLevel :
+        *value = CCtxParams->compressionLevel;
+        break;
+    case ZSTD_c_windowLog :
+        *value = (int)CCtxParams->cParams.windowLog;
+        break;
+    case ZSTD_c_hashLog :
+        *value = (int)CCtxParams->cParams.hashLog;
+        break;
+    case ZSTD_c_chainLog :
+        *value = (int)CCtxParams->cParams.chainLog;
+        break;
+    case ZSTD_c_searchLog :
+        *value = CCtxParams->cParams.searchLog;
+        break;
+    case ZSTD_c_minMatch :
+        *value = CCtxParams->cParams.minMatch;
+        break;
+    case ZSTD_c_targetLength :
+        *value = CCtxParams->cParams.targetLength;
+        break;
+    case ZSTD_c_strategy :
+        *value = (unsigned)CCtxParams->cParams.strategy;
+        break;
+    case ZSTD_c_contentSizeFlag :
+        *value = CCtxParams->fParams.contentSizeFlag;
+        break;
+    case ZSTD_c_checksumFlag :
+        *value = CCtxParams->fParams.checksumFlag;
+        break;
+    case ZSTD_c_dictIDFlag :
+        *value = !CCtxParams->fParams.noDictIDFlag;
+        break;
+    case ZSTD_c_forceMaxWindow :
+        *value = CCtxParams->forceWindow;
+        break;
+    case ZSTD_c_forceAttachDict :
+        *value = CCtxParams->attachDictPref;
+        break;
+    case ZSTD_c_literalCompressionMode :
+        *value = CCtxParams->literalCompressionMode;
+        break;
+    case ZSTD_c_nbWorkers :
+#ifndef ZSTD_MULTITHREAD
+        assert(CCtxParams->nbWorkers == 0);
+#endif
+        *value = CCtxParams->nbWorkers;
+        break;
+    case ZSTD_c_jobSize :
+#ifndef ZSTD_MULTITHREAD
+        RETURN_ERROR(parameter_unsupported, "not compiled with multithreading");
+#else
+        assert(CCtxParams->jobSize <= INT_MAX);
+        *value = (int)CCtxParams->jobSize;
+        break;
+#endif
+    case ZSTD_c_overlapLog :
+#ifndef ZSTD_MULTITHREAD
+        RETURN_ERROR(parameter_unsupported, "not compiled with multithreading");
+#else
+        *value = CCtxParams->overlapLog;
+        break;
+#endif
+    case ZSTD_c_rsyncable :
+#ifndef ZSTD_MULTITHREAD
+        RETURN_ERROR(parameter_unsupported, "not compiled with multithreading");
+#else
+        *value = CCtxParams->rsyncable;
+        break;
+#endif
+    case ZSTD_c_enableDedicatedDictSearch :
+        *value = CCtxParams->enableDedicatedDictSearch;
+        break;
+    case ZSTD_c_enableLongDistanceMatching :
+        *value = CCtxParams->ldmParams.enableLdm;
+        break;
+    case ZSTD_c_ldmHashLog :
+        *value = CCtxParams->ldmParams.hashLog;
+        break;
+    case ZSTD_c_ldmMinMatch :
+        *value = CCtxParams->ldmParams.minMatchLength;
+        break;
+    case ZSTD_c_ldmBucketSizeLog :
+        *value = CCtxParams->ldmParams.bucketSizeLog;
+        break;
+    case ZSTD_c_ldmHashRateLog :
+        *value = CCtxParams->ldmParams.hashRateLog;
+        break;
+    case ZSTD_c_targetCBlockSize :
+        *value = (int)CCtxParams->targetCBlockSize;
+        break;
+    case ZSTD_c_srcSizeHint :
+        *value = (int)CCtxParams->srcSizeHint;
+        break;
+    case ZSTD_c_stableInBuffer :
+        *value = (int)CCtxParams->inBufferMode;
+        break;
+    case ZSTD_c_stableOutBuffer :
+        *value = (int)CCtxParams->outBufferMode;
+        break;
+    case ZSTD_c_blockDelimiters :
+        *value = (int)CCtxParams->blockDelimiters;
+        break;
+    case ZSTD_c_validateSequences :
+        *value = (int)CCtxParams->validateSequences;
+        break;
+    case ZSTD_c_splitBlocks :
+        *value = (int)CCtxParams->splitBlocks;
+        break;
+    case ZSTD_c_useRowMatchFinder :
+        *value = (int)CCtxParams->useRowMatchFinder;
+        break;
+    case ZSTD_c_deterministicRefPrefix:
+        *value = (int)CCtxParams->deterministicRefPrefix;
+        break;
+    default: RETURN_ERROR(parameter_unsupported, "unknown parameter");
+    }
+    return 0;
+}
+
+/** ZSTD_CCtx_setParametersUsingCCtxParams() :
+ *  just applies `params` into `cctx`
+ *  no action is performed, parameters are merely stored.
+ *  If ZSTDMT is enabled, parameters are pushed to cctx->mtctx.
+ *    This is possible even if a compression is ongoing.
+ *    In which case, new parameters will be applied on the fly, starting with next compression job.
+ */
+size_t ZSTD_CCtx_setParametersUsingCCtxParams(
+        ZSTD_CCtx* cctx, const ZSTD_CCtx_params* params)
+{
+    DEBUGLOG(4, "ZSTD_CCtx_setParametersUsingCCtxParams");
+    RETURN_ERROR_IF(cctx->streamStage != zcss_init, stage_wrong,
+                    "The context is in the wrong stage!");
+    RETURN_ERROR_IF(cctx->cdict, stage_wrong,
+                    "Can't override parameters with cdict attached (some must "
+                    "be inherited from the cdict).");
+
+    cctx->requestedParams = *params;
+    return 0;
+}
+
+ZSTDLIB_API size_t ZSTD_CCtx_setPledgedSrcSize(ZSTD_CCtx* cctx, unsigned long long pledgedSrcSize)
+{
+    DEBUGLOG(4, "ZSTD_CCtx_setPledgedSrcSize to %u bytes", (U32)pledgedSrcSize);
+    RETURN_ERROR_IF(cctx->streamStage != zcss_init, stage_wrong,
+                    "Can't set pledgedSrcSize when not in init stage.");
+    cctx->pledgedSrcSizePlusOne = pledgedSrcSize+1;
+    return 0;
+}
+
+static ZSTD_compressionParameters ZSTD_dedicatedDictSearch_getCParams(
+        int const compressionLevel,
+        size_t const dictSize);
+static int ZSTD_dedicatedDictSearch_isSupported(
+        const ZSTD_compressionParameters* cParams);
+static void ZSTD_dedicatedDictSearch_revertCParams(
+        ZSTD_compressionParameters* cParams);
+
+/**
+ * Initializes the local dict using the requested parameters.
+ * NOTE: This does not use the pledged src size, because it may be used for more
+ * than one compression.
+ */
+static size_t ZSTD_initLocalDict(ZSTD_CCtx* cctx)
+{
+    ZSTD_localDict* const dl = &cctx->localDict;
+    if (dl->dict == NULL) {
+        /* No local dictionary. */
+        assert(dl->dictBuffer == NULL);
+        assert(dl->cdict == NULL);
+        assert(dl->dictSize == 0);
+        return 0;
+    }
+    if (dl->cdict != NULL) {
+        assert(cctx->cdict == dl->cdict);
+        /* Local dictionary already initialized. */
+        return 0;
+    }
+    assert(dl->dictSize > 0);
+    assert(cctx->cdict == NULL);
+    assert(cctx->prefixDict.dict == NULL);
+
+    dl->cdict = ZSTD_createCDict_advanced2(
+            dl->dict,
+            dl->dictSize,
+            ZSTD_dlm_byRef,
+            dl->dictContentType,
+            &cctx->requestedParams,
+            cctx->customMem);
+    RETURN_ERROR_IF(!dl->cdict, memory_allocation, "ZSTD_createCDict_advanced failed");
+    cctx->cdict = dl->cdict;
+    return 0;
+}
+
+size_t ZSTD_CCtx_loadDictionary_advanced(
+        ZSTD_CCtx* cctx, const void* dict, size_t dictSize,
+        ZSTD_dictLoadMethod_e dictLoadMethod, ZSTD_dictContentType_e dictContentType)
+{
+    RETURN_ERROR_IF(cctx->streamStage != zcss_init, stage_wrong,
+                    "Can't load a dictionary when ctx is not in init stage.");
+    DEBUGLOG(4, "ZSTD_CCtx_loadDictionary_advanced (size: %u)", (U32)dictSize);
+    ZSTD_clearAllDicts(cctx);  /* in case one already exists */
+    if (dict == NULL || dictSize == 0)  /* no dictionary mode */
+        return 0;
+    if (dictLoadMethod == ZSTD_dlm_byRef) {
+        cctx->localDict.dict = dict;
+    } else {
+        void* dictBuffer;
+        RETURN_ERROR_IF(cctx->staticSize, memory_allocation,
+                        "no malloc for static CCtx");
+        dictBuffer = ZSTD_customMalloc(dictSize, cctx->customMem);
+        RETURN_ERROR_IF(!dictBuffer, memory_allocation, "NULL pointer!");
+        ZSTD_memcpy(dictBuffer, dict, dictSize);
+        cctx->localDict.dictBuffer = dictBuffer;
+        cctx->localDict.dict = dictBuffer;
+    }
+    cctx->localDict.dictSize = dictSize;
+    cctx->localDict.dictContentType = dictContentType;
+    return 0;
+}
+
+ZSTDLIB_API size_t ZSTD_CCtx_loadDictionary_byReference(
+      ZSTD_CCtx* cctx, const void* dict, size_t dictSize)
+{
+    return ZSTD_CCtx_loadDictionary_advanced(
+            cctx, dict, dictSize, ZSTD_dlm_byRef, ZSTD_dct_auto);
+}
+
+ZSTDLIB_API size_t ZSTD_CCtx_loadDictionary(ZSTD_CCtx* cctx, const void* dict, size_t dictSize)
+{
+    return ZSTD_CCtx_loadDictionary_advanced(
+            cctx, dict, dictSize, ZSTD_dlm_byCopy, ZSTD_dct_auto);
+}
+
+
+size_t ZSTD_CCtx_refCDict(ZSTD_CCtx* cctx, const ZSTD_CDict* cdict)
+{
+    RETURN_ERROR_IF(cctx->streamStage != zcss_init, stage_wrong,
+                    "Can't ref a dict when ctx not in init stage.");
+    /* Free the existing local cdict (if any) to save memory. */
+    ZSTD_clearAllDicts(cctx);
+    cctx->cdict = cdict;
+    return 0;
+}
+
+size_t ZSTD_CCtx_refThreadPool(ZSTD_CCtx* cctx, ZSTD_threadPool* pool)
+{
+    RETURN_ERROR_IF(cctx->streamStage != zcss_init, stage_wrong,
+                    "Can't ref a pool when ctx not in init stage.");
+    cctx->pool = pool;
+    return 0;
+}
+
+size_t ZSTD_CCtx_refPrefix(ZSTD_CCtx* cctx, const void* prefix, size_t prefixSize)
+{
+    return ZSTD_CCtx_refPrefix_advanced(cctx, prefix, prefixSize, ZSTD_dct_rawContent);
+}
+
+size_t ZSTD_CCtx_refPrefix_advanced(
+        ZSTD_CCtx* cctx, const void* prefix, size_t prefixSize, ZSTD_dictContentType_e dictContentType)
+{
+    RETURN_ERROR_IF(cctx->streamStage != zcss_init, stage_wrong,
+                    "Can't ref a prefix when ctx not in init stage.");
+    ZSTD_clearAllDicts(cctx);
+    if (prefix != NULL && prefixSize > 0) {
+        cctx->prefixDict.dict = prefix;
+        cctx->prefixDict.dictSize = prefixSize;
+        cctx->prefixDict.dictContentType = dictContentType;
+    }
+    return 0;
+}
+
+/*! ZSTD_CCtx_reset() :
+ *  Also dumps dictionary */
+size_t ZSTD_CCtx_reset(ZSTD_CCtx* cctx, ZSTD_ResetDirective reset)
+{
+    if ( (reset == ZSTD_reset_session_only)
+      || (reset == ZSTD_reset_session_and_parameters) ) {
+        cctx->streamStage = zcss_init;
+        cctx->pledgedSrcSizePlusOne = 0;
+    }
+    if ( (reset == ZSTD_reset_parameters)
+      || (reset == ZSTD_reset_session_and_parameters) ) {
+        RETURN_ERROR_IF(cctx->streamStage != zcss_init, stage_wrong,
+                        "Can't reset parameters only when not in init stage.");
+        ZSTD_clearAllDicts(cctx);
+        return ZSTD_CCtxParams_reset(&cctx->requestedParams);
+    }
+    return 0;
+}
+
+
+/** ZSTD_checkCParams() :
+    control CParam values remain within authorized range.
+    @return : 0, or an error code if one value is beyond authorized range */
+size_t ZSTD_checkCParams(ZSTD_compressionParameters cParams)
+{
+    BOUNDCHECK(ZSTD_c_windowLog, (int)cParams.windowLog);
+    BOUNDCHECK(ZSTD_c_chainLog,  (int)cParams.chainLog);
+    BOUNDCHECK(ZSTD_c_hashLog,   (int)cParams.hashLog);
+    BOUNDCHECK(ZSTD_c_searchLog, (int)cParams.searchLog);
+    BOUNDCHECK(ZSTD_c_minMatch,  (int)cParams.minMatch);
+    BOUNDCHECK(ZSTD_c_targetLength,(int)cParams.targetLength);
+    BOUNDCHECK(ZSTD_c_strategy,  cParams.strategy);
+    return 0;
+}
+
+/** ZSTD_clampCParams() :
+ *  make CParam values within valid range.
+ *  @return : valid CParams */
+static ZSTD_compressionParameters
+ZSTD_clampCParams(ZSTD_compressionParameters cParams)
+{
+#   define CLAMP_TYPE(cParam, val, type) {                                \
+        ZSTD_bounds const bounds = ZSTD_cParam_getBounds(cParam);         \
+        if ((int)val<bounds.lowerBound) val=(type)bounds.lowerBound;      \
+        else if ((int)val>bounds.upperBound) val=(type)bounds.upperBound; \
+    }
+#   define CLAMP(cParam, val) CLAMP_TYPE(cParam, val, unsigned)
+    CLAMP(ZSTD_c_windowLog, cParams.windowLog);
+    CLAMP(ZSTD_c_chainLog,  cParams.chainLog);
+    CLAMP(ZSTD_c_hashLog,   cParams.hashLog);
+    CLAMP(ZSTD_c_searchLog, cParams.searchLog);
+    CLAMP(ZSTD_c_minMatch,  cParams.minMatch);
+    CLAMP(ZSTD_c_targetLength,cParams.targetLength);
+    CLAMP_TYPE(ZSTD_c_strategy,cParams.strategy, ZSTD_strategy);
+    return cParams;
+}
+
+/** ZSTD_cycleLog() :
+ *  condition for correct operation : hashLog > 1 */
+U32 ZSTD_cycleLog(U32 hashLog, ZSTD_strategy strat)
+{
+    U32 const btScale = ((U32)strat >= (U32)ZSTD_btlazy2);
+    return hashLog - btScale;
+}
+
+/** ZSTD_dictAndWindowLog() :
+ * Returns an adjusted window log that is large enough to fit the source and the dictionary.
+ * The zstd format says that the entire dictionary is valid if one byte of the dictionary
+ * is within the window. So the hashLog and chainLog should be large enough to reference both
+ * the dictionary and the window. So we must use this adjusted dictAndWindowLog when downsizing
+ * the hashLog and windowLog.
+ * NOTE: srcSize must not be ZSTD_CONTENTSIZE_UNKNOWN.
+ */
+static U32 ZSTD_dictAndWindowLog(U32 windowLog, U64 srcSize, U64 dictSize)
+{
+    const U64 maxWindowSize = 1ULL << ZSTD_WINDOWLOG_MAX;
+    /* No dictionary ==> No change */
+    if (dictSize == 0) {
+        return windowLog;
+    }
+    assert(windowLog <= ZSTD_WINDOWLOG_MAX);
+    assert(srcSize != ZSTD_CONTENTSIZE_UNKNOWN); /* Handled in ZSTD_adjustCParams_internal() */
+    {
+        U64 const windowSize = 1ULL << windowLog;
+        U64 const dictAndWindowSize = dictSize + windowSize;
+        /* If the window size is already large enough to fit both the source and the dictionary
+         * then just use the window size. Otherwise adjust so that it fits the dictionary and
+         * the window.
+         */
+        if (windowSize >= dictSize + srcSize) {
+            return windowLog; /* Window size large enough already */
+        } else if (dictAndWindowSize >= maxWindowSize) {
+            return ZSTD_WINDOWLOG_MAX; /* Larger than max window log */
+        } else  {
+            return ZSTD_highbit32((U32)dictAndWindowSize - 1) + 1;
+        }
+    }
+}
+
+/** ZSTD_adjustCParams_internal() :
+ *  optimize `cPar` for a specified input (`srcSize` and `dictSize`).
+ *  mostly downsize to reduce memory consumption and initialization latency.
+ * `srcSize` can be ZSTD_CONTENTSIZE_UNKNOWN when not known.
+ * `mode` is the mode for parameter adjustment. See docs for `ZSTD_cParamMode_e`.
+ *  note : `srcSize==0` means 0!
+ *  condition : cPar is presumed validated (can be checked using ZSTD_checkCParams()). */
+static ZSTD_compressionParameters
+ZSTD_adjustCParams_internal(ZSTD_compressionParameters cPar,
+                            unsigned long long srcSize,
+                            size_t dictSize,
+                            ZSTD_cParamMode_e mode)
+{
+    const U64 minSrcSize = 513; /* (1<<9) + 1 */
+    const U64 maxWindowResize = 1ULL << (ZSTD_WINDOWLOG_MAX-1);
+    assert(ZSTD_checkCParams(cPar)==0);
+
+    switch (mode) {
+    case ZSTD_cpm_unknown:
+    case ZSTD_cpm_noAttachDict:
+        /* If we don't know the source size, don't make any
+         * assumptions about it. We will already have selected
+         * smaller parameters if a dictionary is in use.
+         */
+        break;
+    case ZSTD_cpm_createCDict:
+        /* Assume a small source size when creating a dictionary
+         * with an unkown source size.
+         */
+        if (dictSize && srcSize == ZSTD_CONTENTSIZE_UNKNOWN)
+            srcSize = minSrcSize;
+        break;
+    case ZSTD_cpm_attachDict:
+        /* Dictionary has its own dedicated parameters which have
+         * already been selected. We are selecting parameters
+         * for only the source.
+         */
+        dictSize = 0;
+        break;
+    default:
+        assert(0);
+        break;
+    }
+
+    /* resize windowLog if input is small enough, to use less memory */
+    if ( (srcSize < maxWindowResize)
+      && (dictSize < maxWindowResize) )  {
+        U32 const tSize = (U32)(srcSize + dictSize);
+        static U32 const hashSizeMin = 1 << ZSTD_HASHLOG_MIN;
+        U32 const srcLog = (tSize < hashSizeMin) ? ZSTD_HASHLOG_MIN :
+                            ZSTD_highbit32(tSize-1) + 1;
+        if (cPar.windowLog > srcLog) cPar.windowLog = srcLog;
+    }
+    if (srcSize != ZSTD_CONTENTSIZE_UNKNOWN) {
+        U32 const dictAndWindowLog = ZSTD_dictAndWindowLog(cPar.windowLog, (U64)srcSize, (U64)dictSize);
+        U32 const cycleLog = ZSTD_cycleLog(cPar.chainLog, cPar.strategy);
+        if (cPar.hashLog > dictAndWindowLog+1) cPar.hashLog = dictAndWindowLog+1;
+        if (cycleLog > dictAndWindowLog)
+            cPar.chainLog -= (cycleLog - dictAndWindowLog);
+    }
+
+    if (cPar.windowLog < ZSTD_WINDOWLOG_ABSOLUTEMIN)
+        cPar.windowLog = ZSTD_WINDOWLOG_ABSOLUTEMIN;  /* minimum wlog required for valid frame header */
+
+    return cPar;
+}
+
+ZSTD_compressionParameters
+ZSTD_adjustCParams(ZSTD_compressionParameters cPar,
+                   unsigned long long srcSize,
+                   size_t dictSize)
+{
+    cPar = ZSTD_clampCParams(cPar);   /* resulting cPar is necessarily valid (all parameters within range) */
+    if (srcSize == 0) srcSize = ZSTD_CONTENTSIZE_UNKNOWN;
+    return ZSTD_adjustCParams_internal(cPar, srcSize, dictSize, ZSTD_cpm_unknown);
+}
+
+static ZSTD_compressionParameters ZSTD_getCParams_internal(int compressionLevel, unsigned long long srcSizeHint, size_t dictSize, ZSTD_cParamMode_e mode);
+static ZSTD_parameters ZSTD_getParams_internal(int compressionLevel, unsigned long long srcSizeHint, size_t dictSize, ZSTD_cParamMode_e mode);
+
+static void ZSTD_overrideCParams(
+              ZSTD_compressionParameters* cParams,
+        const ZSTD_compressionParameters* overrides)
+{
+    if (overrides->windowLog)    cParams->windowLog    = overrides->windowLog;
+    if (overrides->hashLog)      cParams->hashLog      = overrides->hashLog;
+    if (overrides->chainLog)     cParams->chainLog     = overrides->chainLog;
+    if (overrides->searchLog)    cParams->searchLog    = overrides->searchLog;
+    if (overrides->minMatch)     cParams->minMatch     = overrides->minMatch;
+    if (overrides->targetLength) cParams->targetLength = overrides->targetLength;
+    if (overrides->strategy)     cParams->strategy     = overrides->strategy;
+}
+
+ZSTD_compressionParameters ZSTD_getCParamsFromCCtxParams(
+        const ZSTD_CCtx_params* CCtxParams, U64 srcSizeHint, size_t dictSize, ZSTD_cParamMode_e mode)
+{
+    ZSTD_compressionParameters cParams;
+    if (srcSizeHint == ZSTD_CONTENTSIZE_UNKNOWN && CCtxParams->srcSizeHint > 0) {
+      srcSizeHint = CCtxParams->srcSizeHint;
+    }
+    cParams = ZSTD_getCParams_internal(CCtxParams->compressionLevel, srcSizeHint, dictSize, mode);
+    if (CCtxParams->ldmParams.enableLdm) cParams.windowLog = ZSTD_LDM_DEFAULT_WINDOW_LOG;
+    ZSTD_overrideCParams(&cParams, &CCtxParams->cParams);
+    assert(!ZSTD_checkCParams(cParams));
+    /* srcSizeHint == 0 means 0 */
+    return ZSTD_adjustCParams_internal(cParams, srcSizeHint, dictSize, mode);
+}
+
+static size_t
+ZSTD_sizeof_matchState(const ZSTD_compressionParameters* const cParams,
+                       const ZSTD_useRowMatchFinderMode_e useRowMatchFinder,
+                       const U32 enableDedicatedDictSearch,
+                       const U32 forCCtx)
+{
+    /* chain table size should be 0 for fast or row-hash strategies */
+    size_t const chainSize = ZSTD_allocateChainTable(cParams->strategy, useRowMatchFinder, enableDedicatedDictSearch && !forCCtx)
+                                ? ((size_t)1 << cParams->chainLog)
+                                : 0;
+    size_t const hSize = ((size_t)1) << cParams->hashLog;
+    U32    const hashLog3 = (forCCtx && cParams->minMatch==3) ? MIN(ZSTD_HASHLOG3_MAX, cParams->windowLog) : 0;
+    size_t const h3Size = hashLog3 ? ((size_t)1) << hashLog3 : 0;
+    /* We don't use ZSTD_cwksp_alloc_size() here because the tables aren't
+     * surrounded by redzones in ASAN. */
+    size_t const tableSpace = chainSize * sizeof(U32)
+                            + hSize * sizeof(U32)
+                            + h3Size * sizeof(U32);
+    size_t const optPotentialSpace =
+        ZSTD_cwksp_aligned_alloc_size((MaxML+1) * sizeof(U32))
+      + ZSTD_cwksp_aligned_alloc_size((MaxLL+1) * sizeof(U32))
+      + ZSTD_cwksp_aligned_alloc_size((MaxOff+1) * sizeof(U32))
+      + ZSTD_cwksp_aligned_alloc_size((1<<Litbits) * sizeof(U32))
+      + ZSTD_cwksp_aligned_alloc_size((ZSTD_OPT_NUM+1) * sizeof(ZSTD_match_t))
+      + ZSTD_cwksp_aligned_alloc_size((ZSTD_OPT_NUM+1) * sizeof(ZSTD_optimal_t));
+    size_t const lazyAdditionalSpace = ZSTD_rowMatchFinderUsed(cParams->strategy, useRowMatchFinder)
+                                            ? ZSTD_cwksp_aligned_alloc_size(hSize*sizeof(U16))
+                                            : 0;
+    size_t const optSpace = (forCCtx && (cParams->strategy >= ZSTD_btopt))
+                                ? optPotentialSpace
+                                : 0;
+    size_t const slackSpace = ZSTD_cwksp_slack_space_required();
+
+    /* tables are guaranteed to be sized in multiples of 64 bytes (or 16 uint32_t) */
+    ZSTD_STATIC_ASSERT(ZSTD_HASHLOG_MIN >= 4 && ZSTD_WINDOWLOG_MIN >= 4 && ZSTD_CHAINLOG_MIN >= 4);
+    assert(useRowMatchFinder != ZSTD_urm_auto);
+
+    DEBUGLOG(4, "chainSize: %u - hSize: %u - h3Size: %u",
+                (U32)chainSize, (U32)hSize, (U32)h3Size);
+    return tableSpace + optSpace + slackSpace + lazyAdditionalSpace;
+}
+
+static size_t ZSTD_estimateCCtxSize_usingCCtxParams_internal(
+        const ZSTD_compressionParameters* cParams,
+        const ldmParams_t* ldmParams,
+        const int isStatic,
+        const ZSTD_useRowMatchFinderMode_e useRowMatchFinder,
+        const size_t buffInSize,
+        const size_t buffOutSize,
+        const U64 pledgedSrcSize)
+{
+    size_t const windowSize = MAX(1, (size_t)MIN(((U64)1 << cParams->windowLog), pledgedSrcSize));
+    size_t const blockSize = MIN(ZSTD_BLOCKSIZE_MAX, windowSize);
+    U32    const divider = (cParams->minMatch==3) ? 3 : 4;
+    size_t const maxNbSeq = blockSize / divider;
+    size_t const tokenSpace = ZSTD_cwksp_alloc_size(WILDCOPY_OVERLENGTH + blockSize)
+                            + ZSTD_cwksp_aligned_alloc_size(maxNbSeq * sizeof(seqDef))
+                            + 3 * ZSTD_cwksp_alloc_size(maxNbSeq * sizeof(BYTE));
+    size_t const entropySpace = ZSTD_cwksp_alloc_size(ENTROPY_WORKSPACE_SIZE);
+    size_t const blockStateSpace = 2 * ZSTD_cwksp_alloc_size(sizeof(ZSTD_compressedBlockState_t));
+    size_t const matchStateSize = ZSTD_sizeof_matchState(cParams, useRowMatchFinder, /* enableDedicatedDictSearch */ 0, /* forCCtx */ 1);
+
+    size_t const ldmSpace = ZSTD_ldm_getTableSize(*ldmParams);
+    size_t const maxNbLdmSeq = ZSTD_ldm_getMaxNbSeq(*ldmParams, blockSize);
+    size_t const ldmSeqSpace = ldmParams->enableLdm ?
+        ZSTD_cwksp_aligned_alloc_size(maxNbLdmSeq * sizeof(rawSeq)) : 0;
+
+
+    size_t const bufferSpace = ZSTD_cwksp_alloc_size(buffInSize)
+                             + ZSTD_cwksp_alloc_size(buffOutSize);
+
+    size_t const cctxSpace = isStatic ? ZSTD_cwksp_alloc_size(sizeof(ZSTD_CCtx)) : 0;
+
+    size_t const neededSpace =
+        cctxSpace +
+        entropySpace +
+        blockStateSpace +
+        ldmSpace +
+        ldmSeqSpace +
+        matchStateSize +
+        tokenSpace +
+        bufferSpace;
+
+    DEBUGLOG(5, "estimate workspace : %u", (U32)neededSpace);
+    return neededSpace;
+}
+
+size_t ZSTD_estimateCCtxSize_usingCCtxParams(const ZSTD_CCtx_params* params)
+{
+    ZSTD_compressionParameters const cParams =
+                ZSTD_getCParamsFromCCtxParams(params, ZSTD_CONTENTSIZE_UNKNOWN, 0, ZSTD_cpm_noAttachDict);
+    ZSTD_useRowMatchFinderMode_e const useRowMatchFinder = ZSTD_resolveRowMatchFinderMode(params->useRowMatchFinder,
+                                                                                         &cParams);
+
+    RETURN_ERROR_IF(params->nbWorkers > 0, GENERIC, "Estimate CCtx size is supported for single-threaded compression only.");
+    /* estimateCCtxSize is for one-shot compression. So no buffers should
+     * be needed. However, we still allocate two 0-sized buffers, which can
+     * take space under ASAN. */
+    return ZSTD_estimateCCtxSize_usingCCtxParams_internal(
+        &cParams, &params->ldmParams, 1, useRowMatchFinder, 0, 0, ZSTD_CONTENTSIZE_UNKNOWN);
+}
+
+size_t ZSTD_estimateCCtxSize_usingCParams(ZSTD_compressionParameters cParams)
+{
+    ZSTD_CCtx_params initialParams = ZSTD_makeCCtxParamsFromCParams(cParams);
+    if (ZSTD_rowMatchFinderSupported(cParams.strategy)) {
+        /* Pick bigger of not using and using row-based matchfinder for greedy and lazy strategies */
+        size_t noRowCCtxSize;
+        size_t rowCCtxSize;
+        initialParams.useRowMatchFinder = ZSTD_urm_disableRowMatchFinder;
+        noRowCCtxSize = ZSTD_estimateCCtxSize_usingCCtxParams(&initialParams);
+        initialParams.useRowMatchFinder = ZSTD_urm_enableRowMatchFinder;
+        rowCCtxSize = ZSTD_estimateCCtxSize_usingCCtxParams(&initialParams);
+        return MAX(noRowCCtxSize, rowCCtxSize);
+    } else {
+        return ZSTD_estimateCCtxSize_usingCCtxParams(&initialParams);
+    }
+}
+
+static size_t ZSTD_estimateCCtxSize_internal(int compressionLevel)
+{
+    int tier = 0;
+    size_t largestSize = 0;
+    static const unsigned long long srcSizeTiers[4] = {16 KB, 128 KB, 256 KB, ZSTD_CONTENTSIZE_UNKNOWN};
+    for (; tier < 4; ++tier) {
+        /* Choose the set of cParams for a given level across all srcSizes that give the largest cctxSize */
+        ZSTD_compressionParameters const cParams = ZSTD_getCParams_internal(compressionLevel, srcSizeTiers[tier], 0, ZSTD_cpm_noAttachDict);
+        largestSize = MAX(ZSTD_estimateCCtxSize_usingCParams(cParams), largestSize);
+    }
+    return largestSize;
+}
+
+size_t ZSTD_estimateCCtxSize(int compressionLevel)
+{
+    int level;
+    size_t memBudget = 0;
+    for (level=MIN(compressionLevel, 1); level<=compressionLevel; level++) {
+        /* Ensure monotonically increasing memory usage as compression level increases */
+        size_t const newMB = ZSTD_estimateCCtxSize_internal(level);
+        if (newMB > memBudget) memBudget = newMB;
+    }
+    return memBudget;
+}
+
+size_t ZSTD_estimateCStreamSize_usingCCtxParams(const ZSTD_CCtx_params* params)
+{
+    RETURN_ERROR_IF(params->nbWorkers > 0, GENERIC, "Estimate CCtx size is supported for single-threaded compression only.");
+    {   ZSTD_compressionParameters const cParams =
+                ZSTD_getCParamsFromCCtxParams(params, ZSTD_CONTENTSIZE_UNKNOWN, 0, ZSTD_cpm_noAttachDict);
+        size_t const blockSize = MIN(ZSTD_BLOCKSIZE_MAX, (size_t)1 << cParams.windowLog);
+        size_t const inBuffSize = (params->inBufferMode == ZSTD_bm_buffered)
+                ? ((size_t)1 << cParams.windowLog) + blockSize
+                : 0;
+        size_t const outBuffSize = (params->outBufferMode == ZSTD_bm_buffered)
+                ? ZSTD_compressBound(blockSize) + 1
+                : 0;
+        ZSTD_useRowMatchFinderMode_e const useRowMatchFinder = ZSTD_resolveRowMatchFinderMode(params->useRowMatchFinder, &params->cParams);
+
+        return ZSTD_estimateCCtxSize_usingCCtxParams_internal(
+            &cParams, &params->ldmParams, 1, useRowMatchFinder, inBuffSize, outBuffSize,
+            ZSTD_CONTENTSIZE_UNKNOWN);
+    }
+}
+
+size_t ZSTD_estimateCStreamSize_usingCParams(ZSTD_compressionParameters cParams)
+{
+    ZSTD_CCtx_params initialParams = ZSTD_makeCCtxParamsFromCParams(cParams);
+    if (ZSTD_rowMatchFinderSupported(cParams.strategy)) {
+        /* Pick bigger of not using and using row-based matchfinder for greedy and lazy strategies */
+        size_t noRowCCtxSize;
+        size_t rowCCtxSize;
+        initialParams.useRowMatchFinder = ZSTD_urm_disableRowMatchFinder;
+        noRowCCtxSize = ZSTD_estimateCStreamSize_usingCCtxParams(&initialParams);
+        initialParams.useRowMatchFinder = ZSTD_urm_enableRowMatchFinder;
+        rowCCtxSize = ZSTD_estimateCStreamSize_usingCCtxParams(&initialParams);
+        return MAX(noRowCCtxSize, rowCCtxSize);
+    } else {
+        return ZSTD_estimateCStreamSize_usingCCtxParams(&initialParams);
+    }
+}
+
+static size_t ZSTD_estimateCStreamSize_internal(int compressionLevel)
+{
+    ZSTD_compressionParameters const cParams = ZSTD_getCParams_internal(compressionLevel, ZSTD_CONTENTSIZE_UNKNOWN, 0, ZSTD_cpm_noAttachDict);
+    return ZSTD_estimateCStreamSize_usingCParams(cParams);
+}
+
+size_t ZSTD_estimateCStreamSize(int compressionLevel)
+{
+    int level;
+    size_t memBudget = 0;
+    for (level=MIN(compressionLevel, 1); level<=compressionLevel; level++) {
+        size_t const newMB = ZSTD_estimateCStreamSize_internal(level);
+        if (newMB > memBudget) memBudget = newMB;
+    }
+    return memBudget;
+}
+
+/* ZSTD_getFrameProgression():
+ * tells how much data has been consumed (input) and produced (output) for current frame.
+ * able to count progression inside worker threads (non-blocking mode).
+ */
+ZSTD_frameProgression ZSTD_getFrameProgression(const ZSTD_CCtx* cctx)
+{
+#ifdef ZSTD_MULTITHREAD
+    if (cctx->appliedParams.nbWorkers > 0) {
+        return ZSTDMT_getFrameProgression(cctx->mtctx);
+    }
+#endif
+    {   ZSTD_frameProgression fp;
+        size_t const buffered = (cctx->inBuff == NULL) ? 0 :
+                                cctx->inBuffPos - cctx->inToCompress;
+        if (buffered) assert(cctx->inBuffPos >= cctx->inToCompress);
+        assert(buffered <= ZSTD_BLOCKSIZE_MAX);
+        fp.ingested = cctx->consumedSrcSize + buffered;
+        fp.consumed = cctx->consumedSrcSize;
+        fp.produced = cctx->producedCSize;
+        fp.flushed  = cctx->producedCSize;   /* simplified; some data might still be left within streaming output buffer */
+        fp.currentJobID = 0;
+        fp.nbActiveWorkers = 0;
+        return fp;
+}   }
+
+/*! ZSTD_toFlushNow()
+ *  Only useful for multithreading scenarios currently (nbWorkers >= 1).
+ */
+size_t ZSTD_toFlushNow(ZSTD_CCtx* cctx)
+{
+#ifdef ZSTD_MULTITHREAD
+    if (cctx->appliedParams.nbWorkers > 0) {
+        return ZSTDMT_toFlushNow(cctx->mtctx);
+    }
+#endif
+    (void)cctx;
+    return 0;   /* over-simplification; could also check if context is currently running in streaming mode, and in which case, report how many bytes are left to be flushed within output buffer */
+}
+
+static void ZSTD_assertEqualCParams(ZSTD_compressionParameters cParams1,
+                                    ZSTD_compressionParameters cParams2)
+{
+    (void)cParams1;
+    (void)cParams2;
+    assert(cParams1.windowLog    == cParams2.windowLog);
+    assert(cParams1.chainLog     == cParams2.chainLog);
+    assert(cParams1.hashLog      == cParams2.hashLog);
+    assert(cParams1.searchLog    == cParams2.searchLog);
+    assert(cParams1.minMatch     == cParams2.minMatch);
+    assert(cParams1.targetLength == cParams2.targetLength);
+    assert(cParams1.strategy     == cParams2.strategy);
+}
+
+void ZSTD_reset_compressedBlockState(ZSTD_compressedBlockState_t* bs)
+{
+    int i;
+    for (i = 0; i < ZSTD_REP_NUM; ++i)
+        bs->rep[i] = repStartValue[i];
+    bs->entropy.huf.repeatMode = HUF_repeat_none;
+    bs->entropy.fse.offcode_repeatMode = FSE_repeat_none;
+    bs->entropy.fse.matchlength_repeatMode = FSE_repeat_none;
+    bs->entropy.fse.litlength_repeatMode = FSE_repeat_none;
+}
+
+/*! ZSTD_invalidateMatchState()
+ *  Invalidate all the matches in the match finder tables.
+ *  Requires nextSrc and base to be set (can be NULL).
+ */
+static void ZSTD_invalidateMatchState(ZSTD_matchState_t* ms)
+{
+    ZSTD_window_clear(&ms->window);
+
+    ms->nextToUpdate = ms->window.dictLimit;
+    ms->loadedDictEnd = 0;
+    ms->opt.litLengthSum = 0;  /* force reset of btopt stats */
+    ms->dictMatchState = NULL;
+}
+
+/**
+ * Controls, for this matchState reset, whether the tables need to be cleared /
+ * prepared for the coming compression (ZSTDcrp_makeClean), or whether the
+ * tables can be left unclean (ZSTDcrp_leaveDirty), because we know that a
+ * subsequent operation will overwrite the table space anyways (e.g., copying
+ * the matchState contents in from a CDict).
+ */
+typedef enum {
+    ZSTDcrp_makeClean,
+    ZSTDcrp_leaveDirty
+} ZSTD_compResetPolicy_e;
+
+/**
+ * Controls, for this matchState reset, whether indexing can continue where it
+ * left off (ZSTDirp_continue), or whether it needs to be restarted from zero
+ * (ZSTDirp_reset).
+ */
+typedef enum {
+    ZSTDirp_continue,
+    ZSTDirp_reset
+} ZSTD_indexResetPolicy_e;
+
+typedef enum {
+    ZSTD_resetTarget_CDict,
+    ZSTD_resetTarget_CCtx
+} ZSTD_resetTarget_e;
+
+
+static size_t
+ZSTD_reset_matchState(ZSTD_matchState_t* ms,
+                      ZSTD_cwksp* ws,
+                const ZSTD_compressionParameters* cParams,
+                const ZSTD_useRowMatchFinderMode_e useRowMatchFinder,
+                const ZSTD_compResetPolicy_e crp,
+                const ZSTD_indexResetPolicy_e forceResetIndex,
+                const ZSTD_resetTarget_e forWho)
+{
+    /* disable chain table allocation for fast or row-based strategies */
+    size_t const chainSize = ZSTD_allocateChainTable(cParams->strategy, useRowMatchFinder,
+                                                     ms->dedicatedDictSearch && (forWho == ZSTD_resetTarget_CDict))
+                                ? ((size_t)1 << cParams->chainLog)
+                                : 0;
+    size_t const hSize = ((size_t)1) << cParams->hashLog;
+    U32    const hashLog3 = ((forWho == ZSTD_resetTarget_CCtx) && cParams->minMatch==3) ? MIN(ZSTD_HASHLOG3_MAX, cParams->windowLog) : 0;
+    size_t const h3Size = hashLog3 ? ((size_t)1) << hashLog3 : 0;
+
+    DEBUGLOG(4, "reset indices : %u", forceResetIndex == ZSTDirp_reset);
+    assert(useRowMatchFinder != ZSTD_urm_auto);
+    if (forceResetIndex == ZSTDirp_reset) {
+        ZSTD_window_init(&ms->window);
+        ZSTD_cwksp_mark_tables_dirty(ws);
+    }
+
+    ms->hashLog3 = hashLog3;
+
+    ZSTD_invalidateMatchState(ms);
+
+    assert(!ZSTD_cwksp_reserve_failed(ws)); /* check that allocation hasn't already failed */
+
+    ZSTD_cwksp_clear_tables(ws);
+
+    DEBUGLOG(5, "reserving table space");
+    /* table Space */
+    ms->hashTable = (U32*)ZSTD_cwksp_reserve_table(ws, hSize * sizeof(U32));
+    ms->chainTable = (U32*)ZSTD_cwksp_reserve_table(ws, chainSize * sizeof(U32));
+    ms->hashTable3 = (U32*)ZSTD_cwksp_reserve_table(ws, h3Size * sizeof(U32));
+    RETURN_ERROR_IF(ZSTD_cwksp_reserve_failed(ws), memory_allocation,
+                    "failed a workspace allocation in ZSTD_reset_matchState");
+
+    DEBUGLOG(4, "reset table : %u", crp!=ZSTDcrp_leaveDirty);
+    if (crp!=ZSTDcrp_leaveDirty) {
+        /* reset tables only */
+        ZSTD_cwksp_clean_tables(ws);
+    }
+
+    /* opt parser space */
+    if ((forWho == ZSTD_resetTarget_CCtx) && (cParams->strategy >= ZSTD_btopt)) {
+        DEBUGLOG(4, "reserving optimal parser space");
+        ms->opt.litFreq = (unsigned*)ZSTD_cwksp_reserve_aligned(ws, (1<<Litbits) * sizeof(unsigned));
+        ms->opt.litLengthFreq = (unsigned*)ZSTD_cwksp_reserve_aligned(ws, (MaxLL+1) * sizeof(unsigned));
+        ms->opt.matchLengthFreq = (unsigned*)ZSTD_cwksp_reserve_aligned(ws, (MaxML+1) * sizeof(unsigned));
+        ms->opt.offCodeFreq = (unsigned*)ZSTD_cwksp_reserve_aligned(ws, (MaxOff+1) * sizeof(unsigned));
+        ms->opt.matchTable = (ZSTD_match_t*)ZSTD_cwksp_reserve_aligned(ws, (ZSTD_OPT_NUM+1) * sizeof(ZSTD_match_t));
+        ms->opt.priceTable = (ZSTD_optimal_t*)ZSTD_cwksp_reserve_aligned(ws, (ZSTD_OPT_NUM+1) * sizeof(ZSTD_optimal_t));
+    }
+
+    if (ZSTD_rowMatchFinderUsed(cParams->strategy, useRowMatchFinder)) {
+        {   /* Row match finder needs an additional table of hashes ("tags") */
+            size_t const tagTableSize = hSize*sizeof(U16);
+            ms->tagTable = (U16*)ZSTD_cwksp_reserve_aligned(ws, tagTableSize);
+            if (ms->tagTable) ZSTD_memset(ms->tagTable, 0, tagTableSize);
+        }
+        {   /* Switch to 32-entry rows if searchLog is 5 (or more) */
+            U32 const rowLog = cParams->searchLog < 5 ? 4 : 5;
+            assert(cParams->hashLog > rowLog);
+            ms->rowHashLog = cParams->hashLog - rowLog;
+        }
+    }
+
+    ms->cParams = *cParams;
+
+    RETURN_ERROR_IF(ZSTD_cwksp_reserve_failed(ws), memory_allocation,
+                    "failed a workspace allocation in ZSTD_reset_matchState");
+    return 0;
+}
+
+/* ZSTD_indexTooCloseToMax() :
+ * minor optimization : prefer memset() rather than reduceIndex()
+ * which is measurably slow in some circumstances (reported for Visual Studio).
+ * Works when re-using a context for a lot of smallish inputs :
+ * if all inputs are smaller than ZSTD_INDEXOVERFLOW_MARGIN,
+ * memset() will be triggered before reduceIndex().
+ */
+#define ZSTD_INDEXOVERFLOW_MARGIN (16 MB)
+static int ZSTD_indexTooCloseToMax(ZSTD_window_t w)
+{
+    return (size_t)(w.nextSrc - w.base) > (ZSTD_CURRENT_MAX - ZSTD_INDEXOVERFLOW_MARGIN);
+}
+
+/** ZSTD_dictTooBig():
+ * When dictionaries are larger than ZSTD_CHUNKSIZE_MAX they can't be loaded in
+ * one go generically. So we ensure that in that case we reset the tables to zero,
+ * so that we can load as much of the dictionary as possible.
+ */
+static int ZSTD_dictTooBig(size_t const loadedDictSize)
+{
+    return loadedDictSize > ZSTD_CHUNKSIZE_MAX;
+}
+
+/*! ZSTD_resetCCtx_internal() :
+ * @param loadedDictSize The size of the dictionary to be loaded
+ * into the context, if any. If no dictionary is used, or the
+ * dictionary is being attached / copied, then pass 0.
+ * note : `params` are assumed fully validated at this stage.
+ */
+static size_t ZSTD_resetCCtx_internal(ZSTD_CCtx* zc,
+                                      ZSTD_CCtx_params const* params,
+                                      U64 const pledgedSrcSize,
+                                      size_t const loadedDictSize,
+                                      ZSTD_compResetPolicy_e const crp,
+                                      ZSTD_buffered_policy_e const zbuff)
+{
+    ZSTD_cwksp* const ws = &zc->workspace;
+    DEBUGLOG(4, "ZSTD_resetCCtx_internal: pledgedSrcSize=%u, wlog=%u, useRowMatchFinder=%d",
+                (U32)pledgedSrcSize, params->cParams.windowLog, (int)params->useRowMatchFinder);
+    assert(!ZSTD_isError(ZSTD_checkCParams(params->cParams)));
+
+    zc->isFirstBlock = 1;
+
+    /* Set applied params early so we can modify them for LDM,
+     * and point params at the applied params.
+     */
+    zc->appliedParams = *params;
+    params = &zc->appliedParams;
+
+    assert(params->useRowMatchFinder != ZSTD_urm_auto);
+    if (params->ldmParams.enableLdm) {
+        /* Adjust long distance matching parameters */
+        ZSTD_ldm_adjustParameters(&zc->appliedParams.ldmParams, &params->cParams);
+        assert(params->ldmParams.hashLog >= params->ldmParams.bucketSizeLog);
+        assert(params->ldmParams.hashRateLog < 32);
+    }
+
+    {   size_t const windowSize = MAX(1, (size_t)MIN(((U64)1 << params->cParams.windowLog), pledgedSrcSize));
+        size_t const blockSize = MIN(ZSTD_BLOCKSIZE_MAX, windowSize);
+        U32    const divider = (params->cParams.minMatch==3) ? 3 : 4;
+        size_t const maxNbSeq = blockSize / divider;
+        size_t const buffOutSize = (zbuff == ZSTDb_buffered && params->outBufferMode == ZSTD_bm_buffered)
+                ? ZSTD_compressBound(blockSize) + 1
+                : 0;
+        size_t const buffInSize = (zbuff == ZSTDb_buffered && params->inBufferMode == ZSTD_bm_buffered)
+                ? windowSize + blockSize
+                : 0;
+        size_t const maxNbLdmSeq = ZSTD_ldm_getMaxNbSeq(params->ldmParams, blockSize);
+
+        int const indexTooClose = ZSTD_indexTooCloseToMax(zc->blockState.matchState.window);
+        int const dictTooBig = ZSTD_dictTooBig(loadedDictSize);
+        ZSTD_indexResetPolicy_e needsIndexReset =
+            (indexTooClose || dictTooBig || !zc->initialized) ? ZSTDirp_reset : ZSTDirp_continue;
+
+        size_t const neededSpace =
+            ZSTD_estimateCCtxSize_usingCCtxParams_internal(
+                &params->cParams, &params->ldmParams, zc->staticSize != 0, params->useRowMatchFinder,
+                buffInSize, buffOutSize, pledgedSrcSize);
+        int resizeWorkspace;
+
+        FORWARD_IF_ERROR(neededSpace, "cctx size estimate failed!");
+
+        if (!zc->staticSize) ZSTD_cwksp_bump_oversized_duration(ws, 0);
+
+        {   /* Check if workspace is large enough, alloc a new one if needed */
+            int const workspaceTooSmall = ZSTD_cwksp_sizeof(ws) < neededSpace;
+            int const workspaceWasteful = ZSTD_cwksp_check_wasteful(ws, neededSpace);
+            resizeWorkspace = workspaceTooSmall || workspaceWasteful;
+            DEBUGLOG(4, "Need %zu B workspace", neededSpace);
+            DEBUGLOG(4, "windowSize: %zu - blockSize: %zu", windowSize, blockSize);
+
+            if (resizeWorkspace) {
+                DEBUGLOG(4, "Resize workspaceSize from %zuKB to %zuKB",
+                            ZSTD_cwksp_sizeof(ws) >> 10,
+                            neededSpace >> 10);
+
+                RETURN_ERROR_IF(zc->staticSize, memory_allocation, "static cctx : no resize");
+
+                needsIndexReset = ZSTDirp_reset;
+
+                ZSTD_cwksp_free(ws, zc->customMem);
+                FORWARD_IF_ERROR(ZSTD_cwksp_create(ws, neededSpace, zc->customMem), "");
+
+                DEBUGLOG(5, "reserving object space");
+                /* Statically sized space.
+                 * entropyWorkspace never moves,
+                 * though prev/next block swap places */
+                assert(ZSTD_cwksp_check_available(ws, 2 * sizeof(ZSTD_compressedBlockState_t)));
+                zc->blockState.prevCBlock = (ZSTD_compressedBlockState_t*) ZSTD_cwksp_reserve_object(ws, sizeof(ZSTD_compressedBlockState_t));
+                RETURN_ERROR_IF(zc->blockState.prevCBlock == NULL, memory_allocation, "couldn't allocate prevCBlock");
+                zc->blockState.nextCBlock = (ZSTD_compressedBlockState_t*) ZSTD_cwksp_reserve_object(ws, sizeof(ZSTD_compressedBlockState_t));
+                RETURN_ERROR_IF(zc->blockState.nextCBlock == NULL, memory_allocation, "couldn't allocate nextCBlock");
+                zc->entropyWorkspace = (U32*) ZSTD_cwksp_reserve_object(ws, ENTROPY_WORKSPACE_SIZE);
+                RETURN_ERROR_IF(zc->blockState.nextCBlock == NULL, memory_allocation, "couldn't allocate entropyWorkspace");
+        }   }
+
+        ZSTD_cwksp_clear(ws);
+
+        /* init params */
+        zc->blockState.matchState.cParams = params->cParams;
+        zc->pledgedSrcSizePlusOne = pledgedSrcSize+1;
+        zc->consumedSrcSize = 0;
+        zc->producedCSize = 0;
+        if (pledgedSrcSize == ZSTD_CONTENTSIZE_UNKNOWN)
+            zc->appliedParams.fParams.contentSizeFlag = 0;
+        DEBUGLOG(4, "pledged content size : %u ; flag : %u",
+            (unsigned)pledgedSrcSize, zc->appliedParams.fParams.contentSizeFlag);
+        zc->blockSize = blockSize;
+
+        XXH64_reset(&zc->xxhState, 0);
+        zc->stage = ZSTDcs_init;
+        zc->dictID = 0;
+        zc->dictContentSize = 0;
+
+        ZSTD_reset_compressedBlockState(zc->blockState.prevCBlock);
+
+        /* ZSTD_wildcopy() is used to copy into the literals buffer,
+         * so we have to oversize the buffer by WILDCOPY_OVERLENGTH bytes.
+         */
+        zc->seqStore.litStart = ZSTD_cwksp_reserve_buffer(ws, blockSize + WILDCOPY_OVERLENGTH);
+        zc->seqStore.maxNbLit = blockSize;
+
+        /* buffers */
+        zc->bufferedPolicy = zbuff;
+        zc->inBuffSize = buffInSize;
+        zc->inBuff = (char*)ZSTD_cwksp_reserve_buffer(ws, buffInSize);
+        zc->outBuffSize = buffOutSize;
+        zc->outBuff = (char*)ZSTD_cwksp_reserve_buffer(ws, buffOutSize);
+
+        /* ldm bucketOffsets table */
+        if (params->ldmParams.enableLdm) {
+            /* TODO: avoid memset? */
+            size_t const numBuckets =
+                  ((size_t)1) << (params->ldmParams.hashLog -
+                                  params->ldmParams.bucketSizeLog);
+            zc->ldmState.bucketOffsets = ZSTD_cwksp_reserve_buffer(ws, numBuckets);
+            ZSTD_memset(zc->ldmState.bucketOffsets, 0, numBuckets);
+        }
+
+        /* sequences storage */
+        ZSTD_referenceExternalSequences(zc, NULL, 0);
+        zc->seqStore.maxNbSeq = maxNbSeq;
+        zc->seqStore.llCode = ZSTD_cwksp_reserve_buffer(ws, maxNbSeq * sizeof(BYTE));
+        zc->seqStore.mlCode = ZSTD_cwksp_reserve_buffer(ws, maxNbSeq * sizeof(BYTE));
+        zc->seqStore.ofCode = ZSTD_cwksp_reserve_buffer(ws, maxNbSeq * sizeof(BYTE));
+        zc->seqStore.sequencesStart = (seqDef*)ZSTD_cwksp_reserve_aligned(ws, maxNbSeq * sizeof(seqDef));
+
+        FORWARD_IF_ERROR(ZSTD_reset_matchState(
+            &zc->blockState.matchState,
+            ws,
+            &params->cParams,
+            params->useRowMatchFinder,
+            crp,
+            needsIndexReset,
+            ZSTD_resetTarget_CCtx), "");
+
+        /* ldm hash table */
+        if (params->ldmParams.enableLdm) {
+            /* TODO: avoid memset? */
+            size_t const ldmHSize = ((size_t)1) << params->ldmParams.hashLog;
+            zc->ldmState.hashTable = (ldmEntry_t*)ZSTD_cwksp_reserve_aligned(ws, ldmHSize * sizeof(ldmEntry_t));
+            ZSTD_memset(zc->ldmState.hashTable, 0, ldmHSize * sizeof(ldmEntry_t));
+            zc->ldmSequences = (rawSeq*)ZSTD_cwksp_reserve_aligned(ws, maxNbLdmSeq * sizeof(rawSeq));
+            zc->maxNbLdmSequences = maxNbLdmSeq;
+
+            ZSTD_window_init(&zc->ldmState.window);
+            zc->ldmState.loadedDictEnd = 0;
+        }
+
+        assert(ZSTD_cwksp_estimated_space_within_bounds(ws, neededSpace, resizeWorkspace));
+        DEBUGLOG(3, "wksp: finished allocating, %zd bytes remain available", ZSTD_cwksp_available_space(ws));
+
+        zc->initialized = 1;
+
+        return 0;
+    }
+}
+
+/* ZSTD_invalidateRepCodes() :
+ * ensures next compression will not use repcodes from previous block.
+ * Note : only works with regular variant;
+ *        do not use with extDict variant ! */
+void ZSTD_invalidateRepCodes(ZSTD_CCtx* cctx) {
+    int i;
+    for (i=0; i<ZSTD_REP_NUM; i++) cctx->blockState.prevCBlock->rep[i] = 0;
+    assert(!ZSTD_window_hasExtDict(cctx->blockState.matchState.window));
+}
+
+/* These are the approximate sizes for each strategy past which copying the
+ * dictionary tables into the working context is faster than using them
+ * in-place.
+ */
+static const size_t attachDictSizeCutoffs[ZSTD_STRATEGY_MAX+1] = {
+    8 KB,  /* unused */
+    8 KB,  /* ZSTD_fast */
+    16 KB, /* ZSTD_dfast */
+    32 KB, /* ZSTD_greedy */
+    32 KB, /* ZSTD_lazy */
+    32 KB, /* ZSTD_lazy2 */
+    32 KB, /* ZSTD_btlazy2 */
+    32 KB, /* ZSTD_btopt */
+    8 KB,  /* ZSTD_btultra */
+    8 KB   /* ZSTD_btultra2 */
+};
+
+static int ZSTD_shouldAttachDict(const ZSTD_CDict* cdict,
+                                 const ZSTD_CCtx_params* params,
+                                 U64 pledgedSrcSize)
+{
+    size_t cutoff = attachDictSizeCutoffs[cdict->matchState.cParams.strategy];
+    int const dedicatedDictSearch = cdict->matchState.dedicatedDictSearch;
+    return dedicatedDictSearch
+        || ( ( pledgedSrcSize <= cutoff
+            || pledgedSrcSize == ZSTD_CONTENTSIZE_UNKNOWN
+            || params->attachDictPref == ZSTD_dictForceAttach )
+          && params->attachDictPref != ZSTD_dictForceCopy
+          && !params->forceWindow ); /* dictMatchState isn't correctly
+                                      * handled in _enforceMaxDist */
+}
+
+static size_t
+ZSTD_resetCCtx_byAttachingCDict(ZSTD_CCtx* cctx,
+                        const ZSTD_CDict* cdict,
+                        ZSTD_CCtx_params params,
+                        U64 pledgedSrcSize,
+                        ZSTD_buffered_policy_e zbuff)
+{
+    DEBUGLOG(4, "ZSTD_resetCCtx_byAttachingCDict() pledgedSrcSize=%llu",
+                (unsigned long long)pledgedSrcSize);
+    {
+        ZSTD_compressionParameters adjusted_cdict_cParams = cdict->matchState.cParams;
+        unsigned const windowLog = params.cParams.windowLog;
+        assert(windowLog != 0);
+        /* Resize working context table params for input only, since the dict
+         * has its own tables. */
+        /* pledgedSrcSize == 0 means 0! */
+
+        if (cdict->matchState.dedicatedDictSearch) {
+            ZSTD_dedicatedDictSearch_revertCParams(&adjusted_cdict_cParams);
+        }
+
+        params.cParams = ZSTD_adjustCParams_internal(adjusted_cdict_cParams, pledgedSrcSize,
+                                                     cdict->dictContentSize, ZSTD_cpm_attachDict);
+        params.cParams.windowLog = windowLog;
+        params.useRowMatchFinder = cdict->useRowMatchFinder;    /* cdict overrides */
+        FORWARD_IF_ERROR(ZSTD_resetCCtx_internal(cctx, &params, pledgedSrcSize,
+                                                 /* loadedDictSize */ 0,
+                                                 ZSTDcrp_makeClean, zbuff), "");
+        assert(cctx->appliedParams.cParams.strategy == adjusted_cdict_cParams.strategy);
+    }
+
+    {   const U32 cdictEnd = (U32)( cdict->matchState.window.nextSrc
+                                  - cdict->matchState.window.base);
+        const U32 cdictLen = cdictEnd - cdict->matchState.window.dictLimit;
+        if (cdictLen == 0) {
+            /* don't even attach dictionaries with no contents */
+            DEBUGLOG(4, "skipping attaching empty dictionary");
+        } else {
+            DEBUGLOG(4, "attaching dictionary into context");
+            cctx->blockState.matchState.dictMatchState = &cdict->matchState;
+
+            /* prep working match state so dict matches never have negative indices
+             * when they are translated to the working context's index space. */
+            if (cctx->blockState.matchState.window.dictLimit < cdictEnd) {
+                cctx->blockState.matchState.window.nextSrc =
+                    cctx->blockState.matchState.window.base + cdictEnd;
+                ZSTD_window_clear(&cctx->blockState.matchState.window);
+            }
+            /* loadedDictEnd is expressed within the referential of the active context */
+            cctx->blockState.matchState.loadedDictEnd = cctx->blockState.matchState.window.dictLimit;
+    }   }
+
+    cctx->dictID = cdict->dictID;
+    cctx->dictContentSize = cdict->dictContentSize;
+
+    /* copy block state */
+    ZSTD_memcpy(cctx->blockState.prevCBlock, &cdict->cBlockState, sizeof(cdict->cBlockState));
+
+    return 0;
+}
+
+static size_t ZSTD_resetCCtx_byCopyingCDict(ZSTD_CCtx* cctx,
+                            const ZSTD_CDict* cdict,
+                            ZSTD_CCtx_params params,
+                            U64 pledgedSrcSize,
+                            ZSTD_buffered_policy_e zbuff)
+{
+    const ZSTD_compressionParameters *cdict_cParams = &cdict->matchState.cParams;
+
+    assert(!cdict->matchState.dedicatedDictSearch);
+    DEBUGLOG(4, "ZSTD_resetCCtx_byCopyingCDict() pledgedSrcSize=%llu",
+                (unsigned long long)pledgedSrcSize);
+
+    {   unsigned const windowLog = params.cParams.windowLog;
+        assert(windowLog != 0);
+        /* Copy only compression parameters related to tables. */
+        params.cParams = *cdict_cParams;
+        params.cParams.windowLog = windowLog;
+        params.useRowMatchFinder = cdict->useRowMatchFinder;
+        FORWARD_IF_ERROR(ZSTD_resetCCtx_internal(cctx, &params, pledgedSrcSize,
+                                                 /* loadedDictSize */ 0,
+                                                 ZSTDcrp_leaveDirty, zbuff), "");
+        assert(cctx->appliedParams.cParams.strategy == cdict_cParams->strategy);
+        assert(cctx->appliedParams.cParams.hashLog == cdict_cParams->hashLog);
+        assert(cctx->appliedParams.cParams.chainLog == cdict_cParams->chainLog);
+    }
+
+    ZSTD_cwksp_mark_tables_dirty(&cctx->workspace);
+    assert(params.useRowMatchFinder != ZSTD_urm_auto);
+
+    /* copy tables */
+    {   size_t const chainSize = ZSTD_allocateChainTable(cdict_cParams->strategy, cdict->useRowMatchFinder, 0 /* DDS guaranteed disabled */)
+                                                            ? ((size_t)1 << cdict_cParams->chainLog)
+                                                            : 0;
+        size_t const hSize =  (size_t)1 << cdict_cParams->hashLog;
+
+        ZSTD_memcpy(cctx->blockState.matchState.hashTable,
+               cdict->matchState.hashTable,
+               hSize * sizeof(U32));
+        /* Do not copy cdict's chainTable if cctx has parameters such that it would not use chainTable */
+        if (ZSTD_allocateChainTable(cctx->appliedParams.cParams.strategy, cctx->appliedParams.useRowMatchFinder, 0 /* forDDSDict */)) {
+            ZSTD_memcpy(cctx->blockState.matchState.chainTable,
+               cdict->matchState.chainTable,
+               chainSize * sizeof(U32));
+        }
+        /* copy tag table */
+        if (ZSTD_rowMatchFinderUsed(cdict_cParams->strategy, cdict->useRowMatchFinder)) {
+            size_t const tagTableSize = hSize*sizeof(U16);
+            ZSTD_memcpy(cctx->blockState.matchState.tagTable,
+                cdict->matchState.tagTable,
+                tagTableSize);
+        }
+    }
+
+    /* Zero the hashTable3, since the cdict never fills it */
+    {   int const h3log = cctx->blockState.matchState.hashLog3;
+        size_t const h3Size = h3log ? ((size_t)1 << h3log) : 0;
+        assert(cdict->matchState.hashLog3 == 0);
+        ZSTD_memset(cctx->blockState.matchState.hashTable3, 0, h3Size * sizeof(U32));
+    }
+
+    ZSTD_cwksp_mark_tables_clean(&cctx->workspace);
+
+    /* copy dictionary offsets */
+    {   ZSTD_matchState_t const* srcMatchState = &cdict->matchState;
+        ZSTD_matchState_t* dstMatchState = &cctx->blockState.matchState;
+        dstMatchState->window       = srcMatchState->window;
+        dstMatchState->nextToUpdate = srcMatchState->nextToUpdate;
+        dstMatchState->loadedDictEnd= srcMatchState->loadedDictEnd;
+    }
+
+    cctx->dictID = cdict->dictID;
+    cctx->dictContentSize = cdict->dictContentSize;
+
+    /* copy block state */
+    ZSTD_memcpy(cctx->blockState.prevCBlock, &cdict->cBlockState, sizeof(cdict->cBlockState));
+
+    return 0;
+}
+
+/* We have a choice between copying the dictionary context into the working
+ * context, or referencing the dictionary context from the working context
+ * in-place. We decide here which strategy to use. */
+static size_t ZSTD_resetCCtx_usingCDict(ZSTD_CCtx* cctx,
+                            const ZSTD_CDict* cdict,
+                            const ZSTD_CCtx_params* params,
+                            U64 pledgedSrcSize,
+                            ZSTD_buffered_policy_e zbuff)
+{
+
+    DEBUGLOG(4, "ZSTD_resetCCtx_usingCDict (pledgedSrcSize=%u)",
+                (unsigned)pledgedSrcSize);
+
+    if (ZSTD_shouldAttachDict(cdict, params, pledgedSrcSize)) {
+        return ZSTD_resetCCtx_byAttachingCDict(
+            cctx, cdict, *params, pledgedSrcSize, zbuff);
+    } else {
+        return ZSTD_resetCCtx_byCopyingCDict(
+            cctx, cdict, *params, pledgedSrcSize, zbuff);
+    }
+}
+
+/*! ZSTD_copyCCtx_internal() :
+ *  Duplicate an existing context `srcCCtx` into another one `dstCCtx`.
+ *  Only works during stage ZSTDcs_init (i.e. after creation, but before first call to ZSTD_compressContinue()).
+ *  The "context", in this case, refers to the hash and chain tables,
+ *  entropy tables, and dictionary references.
+ * `windowLog` value is enforced if != 0, otherwise value is copied from srcCCtx.
+ * @return : 0, or an error code */
+static size_t ZSTD_copyCCtx_internal(ZSTD_CCtx* dstCCtx,
+                            const ZSTD_CCtx* srcCCtx,
+                            ZSTD_frameParameters fParams,
+                            U64 pledgedSrcSize,
+                            ZSTD_buffered_policy_e zbuff)
+{
+    RETURN_ERROR_IF(srcCCtx->stage!=ZSTDcs_init, stage_wrong,
+                    "Can't copy a ctx that's not in init stage.");
+    DEBUGLOG(5, "ZSTD_copyCCtx_internal");
+    ZSTD_memcpy(&dstCCtx->customMem, &srcCCtx->customMem, sizeof(ZSTD_customMem));
+    {   ZSTD_CCtx_params params = dstCCtx->requestedParams;
+        /* Copy only compression parameters related to tables. */
+        params.cParams = srcCCtx->appliedParams.cParams;
+        assert(srcCCtx->appliedParams.useRowMatchFinder != ZSTD_urm_auto);
+        params.useRowMatchFinder = srcCCtx->appliedParams.useRowMatchFinder;
+        params.fParams = fParams;
+        ZSTD_resetCCtx_internal(dstCCtx, &params, pledgedSrcSize,
+                                /* loadedDictSize */ 0,
+                                ZSTDcrp_leaveDirty, zbuff);
+        assert(dstCCtx->appliedParams.cParams.windowLog == srcCCtx->appliedParams.cParams.windowLog);
+        assert(dstCCtx->appliedParams.cParams.strategy == srcCCtx->appliedParams.cParams.strategy);
+        assert(dstCCtx->appliedParams.cParams.hashLog == srcCCtx->appliedParams.cParams.hashLog);
+        assert(dstCCtx->appliedParams.cParams.chainLog == srcCCtx->appliedParams.cParams.chainLog);
+        assert(dstCCtx->blockState.matchState.hashLog3 == srcCCtx->blockState.matchState.hashLog3);
+    }
+
+    ZSTD_cwksp_mark_tables_dirty(&dstCCtx->workspace);
+
+    /* copy tables */
+    {   size_t const chainSize = ZSTD_allocateChainTable(srcCCtx->appliedParams.cParams.strategy,
+                                                         srcCCtx->appliedParams.useRowMatchFinder,
+                                                         0 /* forDDSDict */)
+                                    ? ((size_t)1 << srcCCtx->appliedParams.cParams.chainLog)
+                                    : 0;
+        size_t const hSize =  (size_t)1 << srcCCtx->appliedParams.cParams.hashLog;
+        int const h3log = srcCCtx->blockState.matchState.hashLog3;
+        size_t const h3Size = h3log ? ((size_t)1 << h3log) : 0;
+
+        ZSTD_memcpy(dstCCtx->blockState.matchState.hashTable,
+               srcCCtx->blockState.matchState.hashTable,
+               hSize * sizeof(U32));
+        ZSTD_memcpy(dstCCtx->blockState.matchState.chainTable,
+               srcCCtx->blockState.matchState.chainTable,
+               chainSize * sizeof(U32));
+        ZSTD_memcpy(dstCCtx->blockState.matchState.hashTable3,
+               srcCCtx->blockState.matchState.hashTable3,
+               h3Size * sizeof(U32));
+    }
+
+    ZSTD_cwksp_mark_tables_clean(&dstCCtx->workspace);
+
+    /* copy dictionary offsets */
+    {
+        const ZSTD_matchState_t* srcMatchState = &srcCCtx->blockState.matchState;
+        ZSTD_matchState_t* dstMatchState = &dstCCtx->blockState.matchState;
+        dstMatchState->window       = srcMatchState->window;
+        dstMatchState->nextToUpdate = srcMatchState->nextToUpdate;
+        dstMatchState->loadedDictEnd= srcMatchState->loadedDictEnd;
+    }
+    dstCCtx->dictID = srcCCtx->dictID;
+    dstCCtx->dictContentSize = srcCCtx->dictContentSize;
+
+    /* copy block state */
+    ZSTD_memcpy(dstCCtx->blockState.prevCBlock, srcCCtx->blockState.prevCBlock, sizeof(*srcCCtx->blockState.prevCBlock));
+
+    return 0;
+}
+
+/*! ZSTD_copyCCtx() :
+ *  Duplicate an existing context `srcCCtx` into another one `dstCCtx`.
+ *  Only works during stage ZSTDcs_init (i.e. after creation, but before first call to ZSTD_compressContinue()).
+ *  pledgedSrcSize==0 means "unknown".
+*   @return : 0, or an error code */
+size_t ZSTD_copyCCtx(ZSTD_CCtx* dstCCtx, const ZSTD_CCtx* srcCCtx, unsigned long long pledgedSrcSize)
+{
+    ZSTD_frameParameters fParams = { 1 /*content*/, 0 /*checksum*/, 0 /*noDictID*/ };
+    ZSTD_buffered_policy_e const zbuff = srcCCtx->bufferedPolicy;
+    ZSTD_STATIC_ASSERT((U32)ZSTDb_buffered==1);
+    if (pledgedSrcSize==0) pledgedSrcSize = ZSTD_CONTENTSIZE_UNKNOWN;
+    fParams.contentSizeFlag = (pledgedSrcSize != ZSTD_CONTENTSIZE_UNKNOWN);
+
+    return ZSTD_copyCCtx_internal(dstCCtx, srcCCtx,
+                                fParams, pledgedSrcSize,
+                                zbuff);
+}
+
+
+#define ZSTD_ROWSIZE 16
+/*! ZSTD_reduceTable() :
+ *  reduce table indexes by `reducerValue`, or squash to zero.
+ *  PreserveMark preserves "unsorted mark" for btlazy2 strategy.
+ *  It must be set to a clear 0/1 value, to remove branch during inlining.
+ *  Presume table size is a multiple of ZSTD_ROWSIZE
+ *  to help auto-vectorization */
+FORCE_INLINE_TEMPLATE void
+ZSTD_reduceTable_internal (U32* const table, U32 const size, U32 const reducerValue, int const preserveMark)
+{
+    int const nbRows = (int)size / ZSTD_ROWSIZE;
+    int cellNb = 0;
+    int rowNb;
+    assert((size & (ZSTD_ROWSIZE-1)) == 0);  /* multiple of ZSTD_ROWSIZE */
+    assert(size < (1U<<31));   /* can be casted to int */
+
+#if ZSTD_MEMORY_SANITIZER && !defined (ZSTD_MSAN_DONT_POISON_WORKSPACE)
+    /* To validate that the table re-use logic is sound, and that we don't
+     * access table space that we haven't cleaned, we re-"poison" the table
+     * space every time we mark it dirty.
+     *
+     * This function however is intended to operate on those dirty tables and
+     * re-clean them. So when this function is used correctly, we can unpoison
+     * the memory it operated on. This introduces a blind spot though, since
+     * if we now try to operate on __actually__ poisoned memory, we will not
+     * detect that. */
+    __msan_unpoison(table, size * sizeof(U32));
+#endif
+
+    for (rowNb=0 ; rowNb < nbRows ; rowNb++) {
+        int column;
+        for (column=0; column<ZSTD_ROWSIZE; column++) {
+            if (preserveMark) {
+                U32 const adder = (table[cellNb] == ZSTD_DUBT_UNSORTED_MARK) ? reducerValue : 0;
+                table[cellNb] += adder;
+            }
+            if (table[cellNb] < reducerValue) table[cellNb] = 0;
+            else table[cellNb] -= reducerValue;
+            cellNb++;
+    }   }
+}
+
+static void ZSTD_reduceTable(U32* const table, U32 const size, U32 const reducerValue)
+{
+    ZSTD_reduceTable_internal(table, size, reducerValue, 0);
+}
+
+static void ZSTD_reduceTable_btlazy2(U32* const table, U32 const size, U32 const reducerValue)
+{
+    ZSTD_reduceTable_internal(table, size, reducerValue, 1);
+}
+
+/*! ZSTD_reduceIndex() :
+*   rescale all indexes to avoid future overflow (indexes are U32) */
+static void ZSTD_reduceIndex (ZSTD_matchState_t* ms, ZSTD_CCtx_params const* params, const U32 reducerValue)
+{
+    {   U32 const hSize = (U32)1 << params->cParams.hashLog;
+        ZSTD_reduceTable(ms->hashTable, hSize, reducerValue);
+    }
+
+    if (ZSTD_allocateChainTable(params->cParams.strategy, params->useRowMatchFinder, (U32)ms->dedicatedDictSearch)) {
+        U32 const chainSize = (U32)1 << params->cParams.chainLog;
+        if (params->cParams.strategy == ZSTD_btlazy2)
+            ZSTD_reduceTable_btlazy2(ms->chainTable, chainSize, reducerValue);
+        else
+            ZSTD_reduceTable(ms->chainTable, chainSize, reducerValue);
+    }
+
+    if (ms->hashLog3) {
+        U32 const h3Size = (U32)1 << ms->hashLog3;
+        ZSTD_reduceTable(ms->hashTable3, h3Size, reducerValue);
+    }
+}
+
+
+/*-*******************************************************
+*  Block entropic compression
+*********************************************************/
+
+/* See doc/zstd_compression_format.md for detailed format description */
+
+void ZSTD_seqToCodes(const seqStore_t* seqStorePtr)
+{
+    const seqDef* const sequences = seqStorePtr->sequencesStart;
+    BYTE* const llCodeTable = seqStorePtr->llCode;
+    BYTE* const ofCodeTable = seqStorePtr->ofCode;
+    BYTE* const mlCodeTable = seqStorePtr->mlCode;
+    U32 const nbSeq = (U32)(seqStorePtr->sequences - seqStorePtr->sequencesStart);
+    U32 u;
+    assert(nbSeq <= seqStorePtr->maxNbSeq);
+    for (u=0; u<nbSeq; u++) {
+        U32 const llv = sequences[u].litLength;
+        U32 const mlv = sequences[u].matchLength;
+        llCodeTable[u] = (BYTE)ZSTD_LLcode(llv);
+        ofCodeTable[u] = (BYTE)ZSTD_highbit32(sequences[u].offset);
+        mlCodeTable[u] = (BYTE)ZSTD_MLcode(mlv);
+    }
+    if (seqStorePtr->longLengthType==ZSTD_llt_literalLength)
+        llCodeTable[seqStorePtr->longLengthPos] = MaxLL;
+    if (seqStorePtr->longLengthType==ZSTD_llt_matchLength)
+        mlCodeTable[seqStorePtr->longLengthPos] = MaxML;
+}
+
+/* ZSTD_useTargetCBlockSize():
+ * Returns if target compressed block size param is being used.
+ * If used, compression will do best effort to make a compressed block size to be around targetCBlockSize.
+ * Returns 1 if true, 0 otherwise. */
+static int ZSTD_useTargetCBlockSize(const ZSTD_CCtx_params* cctxParams)
+{
+    DEBUGLOG(5, "ZSTD_useTargetCBlockSize (targetCBlockSize=%zu)", cctxParams->targetCBlockSize);
+    return (cctxParams->targetCBlockSize != 0);
+}
+
+/* ZSTD_blockSplitterEnabled():
+ * Returns if block splitting param is being used
+ * If used, compression will do best effort to split a block in order to improve compression ratio.
+ * Returns 1 if true, 0 otherwise. */
+static int ZSTD_blockSplitterEnabled(ZSTD_CCtx_params* cctxParams)
+{
+    DEBUGLOG(5, "ZSTD_blockSplitterEnabled(splitBlocks=%d)", cctxParams->splitBlocks);
+    return (cctxParams->splitBlocks != 0);
+}
+
+/* Type returned by ZSTD_buildSequencesStatistics containing finalized symbol encoding types
+ * and size of the sequences statistics
+ */
+typedef struct {
+    U32 LLtype;
+    U32 Offtype;
+    U32 MLtype;
+    size_t size;
+    size_t lastCountSize; /* Accounts for bug in 1.3.4. More detail in ZSTD_entropyCompressSeqStore_internal() */
+} ZSTD_symbolEncodingTypeStats_t;
+
+/* ZSTD_buildSequencesStatistics():
+ * Returns a ZSTD_symbolEncodingTypeStats_t, or a zstd error code in the `size` field.
+ * Modifies `nextEntropy` to have the appropriate values as a side effect.
+ * nbSeq must be greater than 0.
+ *
+ * entropyWkspSize must be of size at least ENTROPY_WORKSPACE_SIZE - (MaxSeq + 1)*sizeof(U32)
+ */
+static ZSTD_symbolEncodingTypeStats_t
+ZSTD_buildSequencesStatistics(seqStore_t* seqStorePtr, size_t nbSeq,
+                        const ZSTD_fseCTables_t* prevEntropy, ZSTD_fseCTables_t* nextEntropy,
+                              BYTE* dst, const BYTE* const dstEnd,
+                              ZSTD_strategy strategy, unsigned* countWorkspace,
+                              void* entropyWorkspace, size_t entropyWkspSize) {
+    BYTE* const ostart = dst;
+    const BYTE* const oend = dstEnd;
+    BYTE* op = ostart;
+    FSE_CTable* CTable_LitLength = nextEntropy->litlengthCTable;
+    FSE_CTable* CTable_OffsetBits = nextEntropy->offcodeCTable;
+    FSE_CTable* CTable_MatchLength = nextEntropy->matchlengthCTable;
+    const BYTE* const ofCodeTable = seqStorePtr->ofCode;
+    const BYTE* const llCodeTable = seqStorePtr->llCode;
+    const BYTE* const mlCodeTable = seqStorePtr->mlCode;
+    ZSTD_symbolEncodingTypeStats_t stats;
+
+    stats.lastCountSize = 0;
+    /* convert length/distances into codes */
+    ZSTD_seqToCodes(seqStorePtr);
+    assert(op <= oend);
+    assert(nbSeq != 0); /* ZSTD_selectEncodingType() divides by nbSeq */
+    /* build CTable for Literal Lengths */
+    {   unsigned max = MaxLL;
+        size_t const mostFrequent = HIST_countFast_wksp(countWorkspace, &max, llCodeTable, nbSeq, entropyWorkspace, entropyWkspSize);   /* can't fail */
+        DEBUGLOG(5, "Building LL table");
+        nextEntropy->litlength_repeatMode = prevEntropy->litlength_repeatMode;
+        stats.LLtype = ZSTD_selectEncodingType(&nextEntropy->litlength_repeatMode,
+                                        countWorkspace, max, mostFrequent, nbSeq,
+                                        LLFSELog, prevEntropy->litlengthCTable,
+                                        LL_defaultNorm, LL_defaultNormLog,
+                                        ZSTD_defaultAllowed, strategy);
+        assert(set_basic < set_compressed && set_rle < set_compressed);
+        assert(!(stats.LLtype < set_compressed && nextEntropy->litlength_repeatMode != FSE_repeat_none)); /* We don't copy tables */
+        {   size_t const countSize = ZSTD_buildCTable(
+                op, (size_t)(oend - op),
+                CTable_LitLength, LLFSELog, (symbolEncodingType_e)stats.LLtype,
+                countWorkspace, max, llCodeTable, nbSeq,
+                LL_defaultNorm, LL_defaultNormLog, MaxLL,
+                prevEntropy->litlengthCTable,
+                sizeof(prevEntropy->litlengthCTable),
+                entropyWorkspace, entropyWkspSize);
+            if (ZSTD_isError(countSize)) {
+                DEBUGLOG(3, "ZSTD_buildCTable for LitLens failed");
+                stats.size = countSize;
+                return stats;
+            }
+            if (stats.LLtype == set_compressed)
+                stats.lastCountSize = countSize;
+            op += countSize;
+            assert(op <= oend);
+    }   }
+    /* build CTable for Offsets */
+    {   unsigned max = MaxOff;
+        size_t const mostFrequent = HIST_countFast_wksp(
+            countWorkspace, &max, ofCodeTable, nbSeq, entropyWorkspace, entropyWkspSize);  /* can't fail */
+        /* We can only use the basic table if max <= DefaultMaxOff, otherwise the offsets are too large */
+        ZSTD_defaultPolicy_e const defaultPolicy = (max <= DefaultMaxOff) ? ZSTD_defaultAllowed : ZSTD_defaultDisallowed;
+        DEBUGLOG(5, "Building OF table");
+        nextEntropy->offcode_repeatMode = prevEntropy->offcode_repeatMode;
+        stats.Offtype = ZSTD_selectEncodingType(&nextEntropy->offcode_repeatMode,
+                                        countWorkspace, max, mostFrequent, nbSeq,
+                                        OffFSELog, prevEntropy->offcodeCTable,
+                                        OF_defaultNorm, OF_defaultNormLog,
+                                        defaultPolicy, strategy);
+        assert(!(stats.Offtype < set_compressed && nextEntropy->offcode_repeatMode != FSE_repeat_none)); /* We don't copy tables */
+        {   size_t const countSize = ZSTD_buildCTable(
+                op, (size_t)(oend - op),
+                CTable_OffsetBits, OffFSELog, (symbolEncodingType_e)stats.Offtype,
+                countWorkspace, max, ofCodeTable, nbSeq,
+                OF_defaultNorm, OF_defaultNormLog, DefaultMaxOff,
+                prevEntropy->offcodeCTable,
+                sizeof(prevEntropy->offcodeCTable),
+                entropyWorkspace, entropyWkspSize);
+            if (ZSTD_isError(countSize)) {
+                DEBUGLOG(3, "ZSTD_buildCTable for Offsets failed");
+                stats.size = countSize;
+                return stats;
+            }
+            if (stats.Offtype == set_compressed)
+                stats.lastCountSize = countSize;
+            op += countSize;
+            assert(op <= oend);
+    }   }
+    /* build CTable for MatchLengths */
+    {   unsigned max = MaxML;
+        size_t const mostFrequent = HIST_countFast_wksp(
+            countWorkspace, &max, mlCodeTable, nbSeq, entropyWorkspace, entropyWkspSize);   /* can't fail */
+        DEBUGLOG(5, "Building ML table (remaining space : %i)", (int)(oend-op));
+        nextEntropy->matchlength_repeatMode = prevEntropy->matchlength_repeatMode;
+        stats.MLtype = ZSTD_selectEncodingType(&nextEntropy->matchlength_repeatMode,
+                                        countWorkspace, max, mostFrequent, nbSeq,
+                                        MLFSELog, prevEntropy->matchlengthCTable,
+                                        ML_defaultNorm, ML_defaultNormLog,
+                                        ZSTD_defaultAllowed, strategy);
+        assert(!(stats.MLtype < set_compressed && nextEntropy->matchlength_repeatMode != FSE_repeat_none)); /* We don't copy tables */
+        {   size_t const countSize = ZSTD_buildCTable(
+                op, (size_t)(oend - op),
+                CTable_MatchLength, MLFSELog, (symbolEncodingType_e)stats.MLtype,
+                countWorkspace, max, mlCodeTable, nbSeq,
+                ML_defaultNorm, ML_defaultNormLog, MaxML,
+                prevEntropy->matchlengthCTable,
+                sizeof(prevEntropy->matchlengthCTable),
+                entropyWorkspace, entropyWkspSize);
+            if (ZSTD_isError(countSize)) {
+                DEBUGLOG(3, "ZSTD_buildCTable for MatchLengths failed");
+                stats.size = countSize;
+                return stats;
+            }
+            if (stats.MLtype == set_compressed)
+                stats.lastCountSize = countSize;
+            op += countSize;
+            assert(op <= oend);
+    }   }
+    stats.size = (size_t)(op-ostart);
+    return stats;
+}
+
+/* ZSTD_entropyCompressSeqStore_internal():
+ * compresses both literals and sequences
+ * Returns compressed size of block, or a zstd error.
+ */
+MEM_STATIC size_t
+ZSTD_entropyCompressSeqStore_internal(seqStore_t* seqStorePtr,
+                          const ZSTD_entropyCTables_t* prevEntropy,
+                                ZSTD_entropyCTables_t* nextEntropy,
+                          const ZSTD_CCtx_params* cctxParams,
+                                void* dst, size_t dstCapacity,
+                                void* entropyWorkspace, size_t entropyWkspSize,
+                          const int bmi2)
+{
+    const int longOffsets = cctxParams->cParams.windowLog > STREAM_ACCUMULATOR_MIN;
+    ZSTD_strategy const strategy = cctxParams->cParams.strategy;
+    unsigned* count = (unsigned*)entropyWorkspace;
+    FSE_CTable* CTable_LitLength = nextEntropy->fse.litlengthCTable;
+    FSE_CTable* CTable_OffsetBits = nextEntropy->fse.offcodeCTable;
+    FSE_CTable* CTable_MatchLength = nextEntropy->fse.matchlengthCTable;
+    const seqDef* const sequences = seqStorePtr->sequencesStart;
+    const size_t nbSeq = seqStorePtr->sequences - seqStorePtr->sequencesStart;
+    const BYTE* const ofCodeTable = seqStorePtr->ofCode;
+    const BYTE* const llCodeTable = seqStorePtr->llCode;
+    const BYTE* const mlCodeTable = seqStorePtr->mlCode;
+    BYTE* const ostart = (BYTE*)dst;
+    BYTE* const oend = ostart + dstCapacity;
+    BYTE* op = ostart;
+    size_t lastCountSize;
+
+    entropyWorkspace = count + (MaxSeq + 1);
+    entropyWkspSize -= (MaxSeq + 1) * sizeof(*count);
+
+    DEBUGLOG(4, "ZSTD_entropyCompressSeqStore_internal (nbSeq=%zu)", nbSeq);
+    ZSTD_STATIC_ASSERT(HUF_WORKSPACE_SIZE >= (1<<MAX(MLFSELog,LLFSELog)));
+    assert(entropyWkspSize >= HUF_WORKSPACE_SIZE);
+
+    /* Compress literals */
+    {   const BYTE* const literals = seqStorePtr->litStart;
+        size_t const litSize = (size_t)(seqStorePtr->lit - literals);
+        size_t const cSize = ZSTD_compressLiterals(
+                                    &prevEntropy->huf, &nextEntropy->huf,
+                                    cctxParams->cParams.strategy,
+                                    ZSTD_disableLiteralsCompression(cctxParams),
+                                    op, dstCapacity,
+                                    literals, litSize,
+                                    entropyWorkspace, entropyWkspSize,
+                                    bmi2);
+        FORWARD_IF_ERROR(cSize, "ZSTD_compressLiterals failed");
+        assert(cSize <= dstCapacity);
+        op += cSize;
+    }
+
+    /* Sequences Header */
+    RETURN_ERROR_IF((oend-op) < 3 /*max nbSeq Size*/ + 1 /*seqHead*/,
+                    dstSize_tooSmall, "Can't fit seq hdr in output buf!");
+    if (nbSeq < 128) {
+        *op++ = (BYTE)nbSeq;
+    } else if (nbSeq < LONGNBSEQ) {
+        op[0] = (BYTE)((nbSeq>>8) + 0x80);
+        op[1] = (BYTE)nbSeq;
+        op+=2;
+    } else {
+        op[0]=0xFF;
+        MEM_writeLE16(op+1, (U16)(nbSeq - LONGNBSEQ));
+        op+=3;
+    }
+    assert(op <= oend);
+    if (nbSeq==0) {
+        /* Copy the old tables over as if we repeated them */
+        ZSTD_memcpy(&nextEntropy->fse, &prevEntropy->fse, sizeof(prevEntropy->fse));
+        return (size_t)(op - ostart);
+    }
+    {
+        ZSTD_symbolEncodingTypeStats_t stats;
+        BYTE* seqHead = op++;
+        /* build stats for sequences */
+        stats = ZSTD_buildSequencesStatistics(seqStorePtr, nbSeq,
+                                             &prevEntropy->fse, &nextEntropy->fse,
+                                              op, oend,
+                                              strategy, count,
+                                              entropyWorkspace, entropyWkspSize);
+        FORWARD_IF_ERROR(stats.size, "ZSTD_buildSequencesStatistics failed!");
+        *seqHead = (BYTE)((stats.LLtype<<6) + (stats.Offtype<<4) + (stats.MLtype<<2));
+        lastCountSize = stats.lastCountSize;
+        op += stats.size;
+    }
+
+    {   size_t const bitstreamSize = ZSTD_encodeSequences(
+                                        op, (size_t)(oend - op),
+                                        CTable_MatchLength, mlCodeTable,
+                                        CTable_OffsetBits, ofCodeTable,
+                                        CTable_LitLength, llCodeTable,
+                                        sequences, nbSeq,
+                                        longOffsets, bmi2);
+        FORWARD_IF_ERROR(bitstreamSize, "ZSTD_encodeSequences failed");
+        op += bitstreamSize;
+        assert(op <= oend);
+        /* zstd versions <= 1.3.4 mistakenly report corruption when
+         * FSE_readNCount() receives a buffer < 4 bytes.
+         * Fixed by https://github.com/facebook/zstd/pull/1146.
+         * This can happen when the last set_compressed table present is 2
+         * bytes and the bitstream is only one byte.
+         * In this exceedingly rare case, we will simply emit an uncompressed
+         * block, since it isn't worth optimizing.
+         */
+        if (lastCountSize && (lastCountSize + bitstreamSize) < 4) {
+            /* lastCountSize >= 2 && bitstreamSize > 0 ==> lastCountSize == 3 */
+            assert(lastCountSize + bitstreamSize == 3);
+            DEBUGLOG(5, "Avoiding bug in zstd decoder in versions <= 1.3.4 by "
+                        "emitting an uncompressed block.");
+            return 0;
+        }
+    }
+
+    DEBUGLOG(5, "compressed block size : %u", (unsigned)(op - ostart));
+    return (size_t)(op - ostart);
+}
+
+MEM_STATIC size_t
+ZSTD_entropyCompressSeqStore(seqStore_t* seqStorePtr,
+                       const ZSTD_entropyCTables_t* prevEntropy,
+                             ZSTD_entropyCTables_t* nextEntropy,
+                       const ZSTD_CCtx_params* cctxParams,
+                             void* dst, size_t dstCapacity,
+                             size_t srcSize,
+                             void* entropyWorkspace, size_t entropyWkspSize,
+                             int bmi2)
+{
+    size_t const cSize = ZSTD_entropyCompressSeqStore_internal(
+                            seqStorePtr, prevEntropy, nextEntropy, cctxParams,
+                            dst, dstCapacity,
+                            entropyWorkspace, entropyWkspSize, bmi2);
+    if (cSize == 0) return 0;
+    /* When srcSize <= dstCapacity, there is enough space to write a raw uncompressed block.
+     * Since we ran out of space, block must be not compressible, so fall back to raw uncompressed block.
+     */
+    if ((cSize == ERROR(dstSize_tooSmall)) & (srcSize <= dstCapacity))
+        return 0;  /* block not compressed */
+    FORWARD_IF_ERROR(cSize, "ZSTD_entropyCompressSeqStore_internal failed");
+
+    /* Check compressibility */
+    {   size_t const maxCSize = srcSize - ZSTD_minGain(srcSize, cctxParams->cParams.strategy);
+        if (cSize >= maxCSize) return 0;  /* block not compressed */
+    }
+    DEBUGLOG(4, "ZSTD_entropyCompressSeqStore() cSize: %zu", cSize);
+    return cSize;
+}
+
+/* ZSTD_selectBlockCompressor() :
+ * Not static, but internal use only (used by long distance matcher)
+ * assumption : strat is a valid strategy */
+ZSTD_blockCompressor ZSTD_selectBlockCompressor(ZSTD_strategy strat, ZSTD_useRowMatchFinderMode_e useRowMatchFinder, ZSTD_dictMode_e dictMode)
+{
+    static const ZSTD_blockCompressor blockCompressor[4][ZSTD_STRATEGY_MAX+1] = {
+        { ZSTD_compressBlock_fast  /* default for 0 */,
+          ZSTD_compressBlock_fast,
+          ZSTD_compressBlock_doubleFast,
+          ZSTD_compressBlock_greedy,
+          ZSTD_compressBlock_lazy,
+          ZSTD_compressBlock_lazy2,
+          ZSTD_compressBlock_btlazy2,
+          ZSTD_compressBlock_btopt,
+          ZSTD_compressBlock_btultra,
+          ZSTD_compressBlock_btultra2 },
+        { ZSTD_compressBlock_fast_extDict  /* default for 0 */,
+          ZSTD_compressBlock_fast_extDict,
+          ZSTD_compressBlock_doubleFast_extDict,
+          ZSTD_compressBlock_greedy_extDict,
+          ZSTD_compressBlock_lazy_extDict,
+          ZSTD_compressBlock_lazy2_extDict,
+          ZSTD_compressBlock_btlazy2_extDict,
+          ZSTD_compressBlock_btopt_extDict,
+          ZSTD_compressBlock_btultra_extDict,
+          ZSTD_compressBlock_btultra_extDict },
+        { ZSTD_compressBlock_fast_dictMatchState  /* default for 0 */,
+          ZSTD_compressBlock_fast_dictMatchState,
+          ZSTD_compressBlock_doubleFast_dictMatchState,
+          ZSTD_compressBlock_greedy_dictMatchState,
+          ZSTD_compressBlock_lazy_dictMatchState,
+          ZSTD_compressBlock_lazy2_dictMatchState,
+          ZSTD_compressBlock_btlazy2_dictMatchState,
+          ZSTD_compressBlock_btopt_dictMatchState,
+          ZSTD_compressBlock_btultra_dictMatchState,
+          ZSTD_compressBlock_btultra_dictMatchState },
+        { NULL  /* default for 0 */,
+          NULL,
+          NULL,
+          ZSTD_compressBlock_greedy_dedicatedDictSearch,
+          ZSTD_compressBlock_lazy_dedicatedDictSearch,
+          ZSTD_compressBlock_lazy2_dedicatedDictSearch,
+          NULL,
+          NULL,
+          NULL,
+          NULL }
+    };
+    ZSTD_blockCompressor selectedCompressor;
+    ZSTD_STATIC_ASSERT((unsigned)ZSTD_fast == 1);
+
+    assert(ZSTD_cParam_withinBounds(ZSTD_c_strategy, strat));
+    DEBUGLOG(4, "Selected block compressor: dictMode=%d strat=%d rowMatchfinder=%d", (int)dictMode, (int)strat, (int)useRowMatchFinder);
+    if (ZSTD_rowMatchFinderUsed(strat, useRowMatchFinder)) {
+        static const ZSTD_blockCompressor rowBasedBlockCompressors[4][3] = {
+            { ZSTD_compressBlock_greedy_row,
+            ZSTD_compressBlock_lazy_row,
+            ZSTD_compressBlock_lazy2_row },
+            { ZSTD_compressBlock_greedy_extDict_row,
+            ZSTD_compressBlock_lazy_extDict_row,
+            ZSTD_compressBlock_lazy2_extDict_row },
+            { ZSTD_compressBlock_greedy_dictMatchState_row,
+            ZSTD_compressBlock_lazy_dictMatchState_row,
+            ZSTD_compressBlock_lazy2_dictMatchState_row },
+            { ZSTD_compressBlock_greedy_dedicatedDictSearch_row,
+            ZSTD_compressBlock_lazy_dedicatedDictSearch_row,
+            ZSTD_compressBlock_lazy2_dedicatedDictSearch_row }
+        };
+        DEBUGLOG(4, "Selecting a row-based matchfinder");
+        assert(useRowMatchFinder != ZSTD_urm_auto);
+        selectedCompressor = rowBasedBlockCompressors[(int)dictMode][(int)strat - (int)ZSTD_greedy];
+    } else {
+        selectedCompressor = blockCompressor[(int)dictMode][(int)strat];
+    }
+    assert(selectedCompressor != NULL);
+    return selectedCompressor;
+}
+
+static void ZSTD_storeLastLiterals(seqStore_t* seqStorePtr,
+                                   const BYTE* anchor, size_t lastLLSize)
+{
+    ZSTD_memcpy(seqStorePtr->lit, anchor, lastLLSize);
+    seqStorePtr->lit += lastLLSize;
+}
+
+void ZSTD_resetSeqStore(seqStore_t* ssPtr)
+{
+    ssPtr->lit = ssPtr->litStart;
+    ssPtr->sequences = ssPtr->sequencesStart;
+    ssPtr->longLengthType = ZSTD_llt_none;
+}
+
+typedef enum { ZSTDbss_compress, ZSTDbss_noCompress } ZSTD_buildSeqStore_e;
+
+static size_t ZSTD_buildSeqStore(ZSTD_CCtx* zc, const void* src, size_t srcSize)
+{
+    ZSTD_matchState_t* const ms = &zc->blockState.matchState;
+    DEBUGLOG(5, "ZSTD_buildSeqStore (srcSize=%zu)", srcSize);
+    assert(srcSize <= ZSTD_BLOCKSIZE_MAX);
+    /* Assert that we have correctly flushed the ctx params into the ms's copy */
+    ZSTD_assertEqualCParams(zc->appliedParams.cParams, ms->cParams);
+    if (srcSize < MIN_CBLOCK_SIZE+ZSTD_blockHeaderSize+1) {
+        if (zc->appliedParams.cParams.strategy >= ZSTD_btopt) {
+            ZSTD_ldm_skipRawSeqStoreBytes(&zc->externSeqStore, srcSize);
+        } else {
+            ZSTD_ldm_skipSequences(&zc->externSeqStore, srcSize, zc->appliedParams.cParams.minMatch);
+        }
+        return ZSTDbss_noCompress; /* don't even attempt compression below a certain srcSize */
+    }
+    ZSTD_resetSeqStore(&(zc->seqStore));
+    /* required for optimal parser to read stats from dictionary */
+    ms->opt.symbolCosts = &zc->blockState.prevCBlock->entropy;
+    /* tell the optimal parser how we expect to compress literals */
+    ms->opt.literalCompressionMode = zc->appliedParams.literalCompressionMode;
+    /* a gap between an attached dict and the current window is not safe,
+     * they must remain adjacent,
+     * and when that stops being the case, the dict must be unset */
+    assert(ms->dictMatchState == NULL || ms->loadedDictEnd == ms->window.dictLimit);
+
+    /* limited update after a very long match */
+    {   const BYTE* const base = ms->window.base;
+        const BYTE* const istart = (const BYTE*)src;
+        const U32 curr = (U32)(istart-base);
+        if (sizeof(ptrdiff_t)==8) assert(istart - base < (ptrdiff_t)(U32)(-1));   /* ensure no overflow */
+        if (curr > ms->nextToUpdate + 384)
+            ms->nextToUpdate = curr - MIN(192, (U32)(curr - ms->nextToUpdate - 384));
+    }
+
+    /* select and store sequences */
+    {   ZSTD_dictMode_e const dictMode = ZSTD_matchState_dictMode(ms);
+        size_t lastLLSize;
+        {   int i;
+            for (i = 0; i < ZSTD_REP_NUM; ++i)
+                zc->blockState.nextCBlock->rep[i] = zc->blockState.prevCBlock->rep[i];
+        }
+        if (zc->externSeqStore.pos < zc->externSeqStore.size) {
+            assert(!zc->appliedParams.ldmParams.enableLdm);
+            /* Updates ldmSeqStore.pos */
+            lastLLSize =
+                ZSTD_ldm_blockCompress(&zc->externSeqStore,
+                                       ms, &zc->seqStore,
+                                       zc->blockState.nextCBlock->rep,
+                                       zc->appliedParams.useRowMatchFinder,
+                                       src, srcSize);
+            assert(zc->externSeqStore.pos <= zc->externSeqStore.size);
+        } else if (zc->appliedParams.ldmParams.enableLdm) {
+            rawSeqStore_t ldmSeqStore = kNullRawSeqStore;
+
+            ldmSeqStore.seq = zc->ldmSequences;
+            ldmSeqStore.capacity = zc->maxNbLdmSequences;
+            /* Updates ldmSeqStore.size */
+            FORWARD_IF_ERROR(ZSTD_ldm_generateSequences(&zc->ldmState, &ldmSeqStore,
+                                               &zc->appliedParams.ldmParams,
+                                               src, srcSize), "");
+            /* Updates ldmSeqStore.pos */
+            lastLLSize =
+                ZSTD_ldm_blockCompress(&ldmSeqStore,
+                                       ms, &zc->seqStore,
+                                       zc->blockState.nextCBlock->rep,
+                                       zc->appliedParams.useRowMatchFinder,
+                                       src, srcSize);
+            assert(ldmSeqStore.pos == ldmSeqStore.size);
+        } else {   /* not long range mode */
+            ZSTD_blockCompressor const blockCompressor = ZSTD_selectBlockCompressor(zc->appliedParams.cParams.strategy,
+                                                                                    zc->appliedParams.useRowMatchFinder,
+                                                                                    dictMode);
+            ms->ldmSeqStore = NULL;
+            lastLLSize = blockCompressor(ms, &zc->seqStore, zc->blockState.nextCBlock->rep, src, srcSize);
+        }
+        {   const BYTE* const lastLiterals = (const BYTE*)src + srcSize - lastLLSize;
+            ZSTD_storeLastLiterals(&zc->seqStore, lastLiterals, lastLLSize);
+    }   }
+    return ZSTDbss_compress;
+}
+
+static void ZSTD_copyBlockSequences(ZSTD_CCtx* zc)
+{
+    const seqStore_t* seqStore = ZSTD_getSeqStore(zc);
+    const seqDef* seqStoreSeqs = seqStore->sequencesStart;
+    size_t seqStoreSeqSize = seqStore->sequences - seqStoreSeqs;
+    size_t seqStoreLiteralsSize = (size_t)(seqStore->lit - seqStore->litStart);
+    size_t literalsRead = 0;
+    size_t lastLLSize;
+
+    ZSTD_Sequence* outSeqs = &zc->seqCollector.seqStart[zc->seqCollector.seqIndex];
+    size_t i;
+    repcodes_t updatedRepcodes;
+
+    assert(zc->seqCollector.seqIndex + 1 < zc->seqCollector.maxSequences);
+    /* Ensure we have enough space for last literals "sequence" */
+    assert(zc->seqCollector.maxSequences >= seqStoreSeqSize + 1);
+    ZSTD_memcpy(updatedRepcodes.rep, zc->blockState.prevCBlock->rep, sizeof(repcodes_t));
+    for (i = 0; i < seqStoreSeqSize; ++i) {
+        U32 rawOffset = seqStoreSeqs[i].offset - ZSTD_REP_NUM;
+        outSeqs[i].litLength = seqStoreSeqs[i].litLength;
+        outSeqs[i].matchLength = seqStoreSeqs[i].matchLength + MINMATCH;
+        outSeqs[i].rep = 0;
+
+        if (i == seqStore->longLengthPos) {
+            if (seqStore->longLengthType == ZSTD_llt_literalLength) {
+                outSeqs[i].litLength += 0x10000;
+            } else if (seqStore->longLengthType == ZSTD_llt_matchLength) {
+                outSeqs[i].matchLength += 0x10000;
+            }
+        }
+
+        if (seqStoreSeqs[i].offset <= ZSTD_REP_NUM) {
+            /* Derive the correct offset corresponding to a repcode */
+            outSeqs[i].rep = seqStoreSeqs[i].offset;
+            if (outSeqs[i].litLength != 0) {
+                rawOffset = updatedRepcodes.rep[outSeqs[i].rep - 1];
+            } else {
+                if (outSeqs[i].rep == 3) {
+                    rawOffset = updatedRepcodes.rep[0] - 1;
+                } else {
+                    rawOffset = updatedRepcodes.rep[outSeqs[i].rep];
+                }
+            }
+        }
+        outSeqs[i].offset = rawOffset;
+        /* seqStoreSeqs[i].offset == offCode+1, and ZSTD_updateRep() expects offCode
+           so we provide seqStoreSeqs[i].offset - 1 */
+        updatedRepcodes = ZSTD_updateRep(updatedRepcodes.rep,
+                                         seqStoreSeqs[i].offset - 1,
+                                         seqStoreSeqs[i].litLength == 0);
+        literalsRead += outSeqs[i].litLength;
+    }
+    /* Insert last literals (if any exist) in the block as a sequence with ml == off == 0.
+     * If there are no last literals, then we'll emit (of: 0, ml: 0, ll: 0), which is a marker
+     * for the block boundary, according to the API.
+     */
+    assert(seqStoreLiteralsSize >= literalsRead);
+    lastLLSize = seqStoreLiteralsSize - literalsRead;
+    outSeqs[i].litLength = (U32)lastLLSize;
+    outSeqs[i].matchLength = outSeqs[i].offset = outSeqs[i].rep = 0;
+    seqStoreSeqSize++;
+    zc->seqCollector.seqIndex += seqStoreSeqSize;
+}
+
+size_t ZSTD_generateSequences(ZSTD_CCtx* zc, ZSTD_Sequence* outSeqs,
+                              size_t outSeqsSize, const void* src, size_t srcSize)
+{
+    const size_t dstCapacity = ZSTD_compressBound(srcSize);
+    void* dst = ZSTD_customMalloc(dstCapacity, ZSTD_defaultCMem);
+    SeqCollector seqCollector;
+
+    RETURN_ERROR_IF(dst == NULL, memory_allocation, "NULL pointer!");
+
+    seqCollector.collectSequences = 1;
+    seqCollector.seqStart = outSeqs;
+    seqCollector.seqIndex = 0;
+    seqCollector.maxSequences = outSeqsSize;
+    zc->seqCollector = seqCollector;
+
+    ZSTD_compress2(zc, dst, dstCapacity, src, srcSize);
+    ZSTD_customFree(dst, ZSTD_defaultCMem);
+    return zc->seqCollector.seqIndex;
+}
+
+size_t ZSTD_mergeBlockDelimiters(ZSTD_Sequence* sequences, size_t seqsSize) {
+    size_t in = 0;
+    size_t out = 0;
+    for (; in < seqsSize; ++in) {
+        if (sequences[in].offset == 0 && sequences[in].matchLength == 0) {
+            if (in != seqsSize - 1) {
+                sequences[in+1].litLength += sequences[in].litLength;
+            }
+        } else {
+            sequences[out] = sequences[in];
+            ++out;
+        }
+    }
+    return out;
+}
+
+/* Unrolled loop to read four size_ts of input at a time. Returns 1 if is RLE, 0 if not. */
+static int ZSTD_isRLE(const BYTE* src, size_t length) {
+    const BYTE* ip = src;
+    const BYTE value = ip[0];
+    const size_t valueST = (size_t)((U64)value * 0x0101010101010101ULL);
+    const size_t unrollSize = sizeof(size_t) * 4;
+    const size_t unrollMask = unrollSize - 1;
+    const size_t prefixLength = length & unrollMask;
+    size_t i;
+    size_t u;
+    if (length == 1) return 1;
+    /* Check if prefix is RLE first before using unrolled loop */
+    if (prefixLength && ZSTD_count(ip+1, ip, ip+prefixLength) != prefixLength-1) {
+        return 0;
+    }
+    for (i = prefixLength; i != length; i += unrollSize) {
+        for (u = 0; u < unrollSize; u += sizeof(size_t)) {
+            if (MEM_readST(ip + i + u) != valueST) {
+                return 0;
+            }
+        }
+    }
+    return 1;
+}
+
+/* Returns true if the given block may be RLE.
+ * This is just a heuristic based on the compressibility.
+ * It may return both false positives and false negatives.
+ */
+static int ZSTD_maybeRLE(seqStore_t const* seqStore)
+{
+    size_t const nbSeqs = (size_t)(seqStore->sequences - seqStore->sequencesStart);
+    size_t const nbLits = (size_t)(seqStore->lit - seqStore->litStart);
+
+    return nbSeqs < 4 && nbLits < 10;
+}
+
+static void ZSTD_blockState_confirmRepcodesAndEntropyTables(ZSTD_blockState_t* const bs)
+{
+    ZSTD_compressedBlockState_t* const tmp = bs->prevCBlock;
+    bs->prevCBlock = bs->nextCBlock;
+    bs->nextCBlock = tmp;
+}
+
+/* Writes the block header */
+static void writeBlockHeader(void* op, size_t cSize, size_t blockSize, U32 lastBlock) {
+    U32 const cBlockHeader = cSize == 1 ?
+                        lastBlock + (((U32)bt_rle)<<1) + (U32)(blockSize << 3) :
+                        lastBlock + (((U32)bt_compressed)<<1) + (U32)(cSize << 3);
+    MEM_writeLE24(op, cBlockHeader);
+    DEBUGLOG(3, "writeBlockHeader: cSize: %zu blockSize: %zu lastBlock: %u", cSize, blockSize, lastBlock);
+}
+
+/** ZSTD_buildBlockEntropyStats_literals() :
+ *  Builds entropy for the literals.
+ *  Stores literals block type (raw, rle, compressed, repeat) and
+ *  huffman description table to hufMetadata.
+ *  Requires ENTROPY_WORKSPACE_SIZE workspace
+ *  @return : size of huffman description table or error code */
+static size_t ZSTD_buildBlockEntropyStats_literals(void* const src, size_t srcSize,
+                                            const ZSTD_hufCTables_t* prevHuf,
+                                                  ZSTD_hufCTables_t* nextHuf,
+                                                  ZSTD_hufCTablesMetadata_t* hufMetadata,
+                                                  const int disableLiteralsCompression,
+                                                  void* workspace, size_t wkspSize)
+{
+    BYTE* const wkspStart = (BYTE*)workspace;
+    BYTE* const wkspEnd = wkspStart + wkspSize;
+    BYTE* const countWkspStart = wkspStart;
+    unsigned* const countWksp = (unsigned*)workspace;
+    const size_t countWkspSize = (HUF_SYMBOLVALUE_MAX + 1) * sizeof(unsigned);
+    BYTE* const nodeWksp = countWkspStart + countWkspSize;
+    const size_t nodeWkspSize = wkspEnd-nodeWksp;
+    unsigned maxSymbolValue = HUF_SYMBOLVALUE_MAX;
+    unsigned huffLog = HUF_TABLELOG_DEFAULT;
+    HUF_repeat repeat = prevHuf->repeatMode;
+    DEBUGLOG(5, "ZSTD_buildBlockEntropyStats_literals (srcSize=%zu)", srcSize);
+
+    /* Prepare nextEntropy assuming reusing the existing table */
+    ZSTD_memcpy(nextHuf, prevHuf, sizeof(*prevHuf));
+
+    if (disableLiteralsCompression) {
+        DEBUGLOG(5, "set_basic - disabled");
+        hufMetadata->hType = set_basic;
+        return 0;
+    }
+
+    /* small ? don't even attempt compression (speed opt) */
+#ifndef COMPRESS_LITERALS_SIZE_MIN
+#define COMPRESS_LITERALS_SIZE_MIN 63
+#endif
+    {   size_t const minLitSize = (prevHuf->repeatMode == HUF_repeat_valid) ? 6 : COMPRESS_LITERALS_SIZE_MIN;
+        if (srcSize <= minLitSize) {
+            DEBUGLOG(5, "set_basic - too small");
+            hufMetadata->hType = set_basic;
+            return 0;
+        }
+    }
+
+    /* Scan input and build symbol stats */
+    {   size_t const largest = HIST_count_wksp (countWksp, &maxSymbolValue, (const BYTE*)src, srcSize, workspace, wkspSize);
+        FORWARD_IF_ERROR(largest, "HIST_count_wksp failed");
+        if (largest == srcSize) {
+            DEBUGLOG(5, "set_rle");
+            hufMetadata->hType = set_rle;
+            return 0;
+        }
+        if (largest <= (srcSize >> 7)+4) {
+            DEBUGLOG(5, "set_basic - no gain");
+            hufMetadata->hType = set_basic;
+            return 0;
+        }
+    }
+
+    /* Validate the previous Huffman table */
+    if (repeat == HUF_repeat_check && !HUF_validateCTable((HUF_CElt const*)prevHuf->CTable, countWksp, maxSymbolValue)) {
+        repeat = HUF_repeat_none;
+    }
+
+    /* Build Huffman Tree */
+    ZSTD_memset(nextHuf->CTable, 0, sizeof(nextHuf->CTable));
+    huffLog = HUF_optimalTableLog(huffLog, srcSize, maxSymbolValue);
+    {   size_t const maxBits = HUF_buildCTable_wksp((HUF_CElt*)nextHuf->CTable, countWksp,
+                                                    maxSymbolValue, huffLog,
+                                                    nodeWksp, nodeWkspSize);
+        FORWARD_IF_ERROR(maxBits, "HUF_buildCTable_wksp");
+        huffLog = (U32)maxBits;
+        {   /* Build and write the CTable */
+            size_t const newCSize = HUF_estimateCompressedSize(
+                    (HUF_CElt*)nextHuf->CTable, countWksp, maxSymbolValue);
+            size_t const hSize = HUF_writeCTable_wksp(
+                    hufMetadata->hufDesBuffer, sizeof(hufMetadata->hufDesBuffer),
+                    (HUF_CElt*)nextHuf->CTable, maxSymbolValue, huffLog,
+                    nodeWksp, nodeWkspSize);
+            /* Check against repeating the previous CTable */
+            if (repeat != HUF_repeat_none) {
+                size_t const oldCSize = HUF_estimateCompressedSize(
+                        (HUF_CElt const*)prevHuf->CTable, countWksp, maxSymbolValue);
+                if (oldCSize < srcSize && (oldCSize <= hSize + newCSize || hSize + 12 >= srcSize)) {
+                    DEBUGLOG(5, "set_repeat - smaller");
+                    ZSTD_memcpy(nextHuf, prevHuf, sizeof(*prevHuf));
+                    hufMetadata->hType = set_repeat;
+                    return 0;
+                }
+            }
+            if (newCSize + hSize >= srcSize) {
+                DEBUGLOG(5, "set_basic - no gains");
+                ZSTD_memcpy(nextHuf, prevHuf, sizeof(*prevHuf));
+                hufMetadata->hType = set_basic;
+                return 0;
+            }
+            DEBUGLOG(5, "set_compressed (hSize=%u)", (U32)hSize);
+            hufMetadata->hType = set_compressed;
+            nextHuf->repeatMode = HUF_repeat_check;
+            return hSize;
+        }
+    }
+}
+
+
+/* ZSTD_buildDummySequencesStatistics():
+ * Returns a ZSTD_symbolEncodingTypeStats_t with all encoding types as set_basic,
+ * and updates nextEntropy to the appropriate repeatMode.
+ */
+static ZSTD_symbolEncodingTypeStats_t
+ZSTD_buildDummySequencesStatistics(ZSTD_fseCTables_t* nextEntropy) {
+    ZSTD_symbolEncodingTypeStats_t stats = {set_basic, set_basic, set_basic, 0, 0};
+    nextEntropy->litlength_repeatMode = FSE_repeat_none;
+    nextEntropy->offcode_repeatMode = FSE_repeat_none;
+    nextEntropy->matchlength_repeatMode = FSE_repeat_none;
+    return stats;
+}
+
+/** ZSTD_buildBlockEntropyStats_sequences() :
+ *  Builds entropy for the sequences.
+ *  Stores symbol compression modes and fse table to fseMetadata.
+ *  Requires ENTROPY_WORKSPACE_SIZE wksp.
+ *  @return : size of fse tables or error code */
+static size_t ZSTD_buildBlockEntropyStats_sequences(seqStore_t* seqStorePtr,
+                                              const ZSTD_fseCTables_t* prevEntropy,
+                                                    ZSTD_fseCTables_t* nextEntropy,
+                                              const ZSTD_CCtx_params* cctxParams,
+                                                    ZSTD_fseCTablesMetadata_t* fseMetadata,
+                                                    void* workspace, size_t wkspSize)
+{
+    ZSTD_strategy const strategy = cctxParams->cParams.strategy;
+    size_t const nbSeq = seqStorePtr->sequences - seqStorePtr->sequencesStart;
+    BYTE* const ostart = fseMetadata->fseTablesBuffer;
+    BYTE* const oend = ostart + sizeof(fseMetadata->fseTablesBuffer);
+    BYTE* op = ostart;
+    unsigned* countWorkspace = (unsigned*)workspace;
+    unsigned* entropyWorkspace = countWorkspace + (MaxSeq + 1);
+    size_t entropyWorkspaceSize = wkspSize - (MaxSeq + 1) * sizeof(*countWorkspace);
+    ZSTD_symbolEncodingTypeStats_t stats;
+
+    DEBUGLOG(5, "ZSTD_buildBlockEntropyStats_sequences (nbSeq=%zu)", nbSeq);
+    stats = nbSeq != 0 ? ZSTD_buildSequencesStatistics(seqStorePtr, nbSeq,
+                                          prevEntropy, nextEntropy, op, oend,
+                                          strategy, countWorkspace,
+                                          entropyWorkspace, entropyWorkspaceSize)
+                       : ZSTD_buildDummySequencesStatistics(nextEntropy);
+    FORWARD_IF_ERROR(stats.size, "ZSTD_buildSequencesStatistics failed!");
+    fseMetadata->llType = (symbolEncodingType_e) stats.LLtype;
+    fseMetadata->ofType = (symbolEncodingType_e) stats.Offtype;
+    fseMetadata->mlType = (symbolEncodingType_e) stats.MLtype;
+    fseMetadata->lastCountSize = stats.lastCountSize;
+    return stats.size;
+}
+
+
+/** ZSTD_buildBlockEntropyStats() :
+ *  Builds entropy for the block.
+ *  Requires workspace size ENTROPY_WORKSPACE_SIZE
+ *
+ *  @return : 0 on success or error code
+ */
+size_t ZSTD_buildBlockEntropyStats(seqStore_t* seqStorePtr,
+                             const ZSTD_entropyCTables_t* prevEntropy,
+                                   ZSTD_entropyCTables_t* nextEntropy,
+                             const ZSTD_CCtx_params* cctxParams,
+                                   ZSTD_entropyCTablesMetadata_t* entropyMetadata,
+                                   void* workspace, size_t wkspSize)
+{
+    size_t const litSize = seqStorePtr->lit - seqStorePtr->litStart;
+    entropyMetadata->hufMetadata.hufDesSize =
+        ZSTD_buildBlockEntropyStats_literals(seqStorePtr->litStart, litSize,
+                                            &prevEntropy->huf, &nextEntropy->huf,
+                                            &entropyMetadata->hufMetadata,
+                                            ZSTD_disableLiteralsCompression(cctxParams),
+                                            workspace, wkspSize);
+    FORWARD_IF_ERROR(entropyMetadata->hufMetadata.hufDesSize, "ZSTD_buildBlockEntropyStats_literals failed");
+    entropyMetadata->fseMetadata.fseTablesSize =
+        ZSTD_buildBlockEntropyStats_sequences(seqStorePtr,
+                                              &prevEntropy->fse, &nextEntropy->fse,
+                                              cctxParams,
+                                              &entropyMetadata->fseMetadata,
+                                              workspace, wkspSize);
+    FORWARD_IF_ERROR(entropyMetadata->fseMetadata.fseTablesSize, "ZSTD_buildBlockEntropyStats_sequences failed");
+    return 0;
+}
+
+/* Returns the size estimate for the literals section (header + content) of a block */
+static size_t ZSTD_estimateBlockSize_literal(const BYTE* literals, size_t litSize,
+                                                const ZSTD_hufCTables_t* huf,
+                                                const ZSTD_hufCTablesMetadata_t* hufMetadata,
+                                                void* workspace, size_t wkspSize,
+                                                int writeEntropy)
+{
+    unsigned* const countWksp = (unsigned*)workspace;
+    unsigned maxSymbolValue = HUF_SYMBOLVALUE_MAX;
+    size_t literalSectionHeaderSize = 3 + (litSize >= 1 KB) + (litSize >= 16 KB);
+    U32 singleStream = litSize < 256;
+
+    if (hufMetadata->hType == set_basic) return litSize;
+    else if (hufMetadata->hType == set_rle) return 1;
+    else if (hufMetadata->hType == set_compressed || hufMetadata->hType == set_repeat) {
+        size_t const largest = HIST_count_wksp (countWksp, &maxSymbolValue, (const BYTE*)literals, litSize, workspace, wkspSize);
+        if (ZSTD_isError(largest)) return litSize;
+        {   size_t cLitSizeEstimate = HUF_estimateCompressedSize((const HUF_CElt*)huf->CTable, countWksp, maxSymbolValue);
+            if (writeEntropy) cLitSizeEstimate += hufMetadata->hufDesSize;
+            if (!singleStream) cLitSizeEstimate += 6; /* multi-stream huffman uses 6-byte jump table */
+            return cLitSizeEstimate + literalSectionHeaderSize;
+    }   }
+    assert(0); /* impossible */
+    return 0;
+}
+
+/* Returns the size estimate for the FSE-compressed symbols (of, ml, ll) of a block */
+static size_t ZSTD_estimateBlockSize_symbolType(symbolEncodingType_e type,
+                        const BYTE* codeTable, size_t nbSeq, unsigned maxCode,
+                        const FSE_CTable* fseCTable,
+                        const U32* additionalBits,
+                        short const* defaultNorm, U32 defaultNormLog, U32 defaultMax,
+                        void* workspace, size_t wkspSize)
+{
+    unsigned* const countWksp = (unsigned*)workspace;
+    const BYTE* ctp = codeTable;
+    const BYTE* const ctStart = ctp;
+    const BYTE* const ctEnd = ctStart + nbSeq;
+    size_t cSymbolTypeSizeEstimateInBits = 0;
+    unsigned max = maxCode;
+
+    HIST_countFast_wksp(countWksp, &max, codeTable, nbSeq, workspace, wkspSize);  /* can't fail */
+    if (type == set_basic) {
+        /* We selected this encoding type, so it must be valid. */
+        assert(max <= defaultMax);
+        (void)defaultMax;
+        cSymbolTypeSizeEstimateInBits = ZSTD_crossEntropyCost(defaultNorm, defaultNormLog, countWksp, max);
+    } else if (type == set_rle) {
+        cSymbolTypeSizeEstimateInBits = 0;
+    } else if (type == set_compressed || type == set_repeat) {
+        cSymbolTypeSizeEstimateInBits = ZSTD_fseBitCost(fseCTable, countWksp, max);
+    }
+    if (ZSTD_isError(cSymbolTypeSizeEstimateInBits)) {
+        return nbSeq * 10;
+    }
+    while (ctp < ctEnd) {
+        if (additionalBits) cSymbolTypeSizeEstimateInBits += additionalBits[*ctp];
+        else cSymbolTypeSizeEstimateInBits += *ctp; /* for offset, offset code is also the number of additional bits */
+        ctp++;
+    }
+    return cSymbolTypeSizeEstimateInBits >> 3;
+}
+
+/* Returns the size estimate for the sequences section (header + content) of a block */
+static size_t ZSTD_estimateBlockSize_sequences(const BYTE* ofCodeTable,
+                                                  const BYTE* llCodeTable,
+                                                  const BYTE* mlCodeTable,
+                                                  size_t nbSeq,
+                                                  const ZSTD_fseCTables_t* fseTables,
+                                                  const ZSTD_fseCTablesMetadata_t* fseMetadata,
+                                                  void* workspace, size_t wkspSize,
+                                                  int writeEntropy)
+{
+    size_t sequencesSectionHeaderSize = 1 /* seqHead */ + 1 /* min seqSize size */ + (nbSeq >= 128) + (nbSeq >= LONGNBSEQ);
+    size_t cSeqSizeEstimate = 0;
+    cSeqSizeEstimate += ZSTD_estimateBlockSize_symbolType(fseMetadata->ofType, ofCodeTable, nbSeq, MaxOff,
+                                         fseTables->offcodeCTable, NULL,
+                                         OF_defaultNorm, OF_defaultNormLog, DefaultMaxOff,
+                                         workspace, wkspSize);
+    cSeqSizeEstimate += ZSTD_estimateBlockSize_symbolType(fseMetadata->llType, llCodeTable, nbSeq, MaxLL,
+                                         fseTables->litlengthCTable, LL_bits,
+                                         LL_defaultNorm, LL_defaultNormLog, MaxLL,
+                                         workspace, wkspSize);
+    cSeqSizeEstimate += ZSTD_estimateBlockSize_symbolType(fseMetadata->mlType, mlCodeTable, nbSeq, MaxML,
+                                         fseTables->matchlengthCTable, ML_bits,
+                                         ML_defaultNorm, ML_defaultNormLog, MaxML,
+                                         workspace, wkspSize);
+    if (writeEntropy) cSeqSizeEstimate += fseMetadata->fseTablesSize;
+    return cSeqSizeEstimate + sequencesSectionHeaderSize;
+}
+
+/* Returns the size estimate for a given stream of literals, of, ll, ml */
+static size_t ZSTD_estimateBlockSize(const BYTE* literals, size_t litSize,
+                                     const BYTE* ofCodeTable,
+                                     const BYTE* llCodeTable,
+                                     const BYTE* mlCodeTable,
+                                     size_t nbSeq,
+                                     const ZSTD_entropyCTables_t* entropy,
+                                     const ZSTD_entropyCTablesMetadata_t* entropyMetadata,
+                                     void* workspace, size_t wkspSize,
+                                     int writeLitEntropy, int writeSeqEntropy) {
+    size_t const literalsSize = ZSTD_estimateBlockSize_literal(literals, litSize,
+                                                         &entropy->huf, &entropyMetadata->hufMetadata,
+                                                         workspace, wkspSize, writeLitEntropy);
+    size_t const seqSize = ZSTD_estimateBlockSize_sequences(ofCodeTable, llCodeTable, mlCodeTable,
+                                                         nbSeq, &entropy->fse, &entropyMetadata->fseMetadata,
+                                                         workspace, wkspSize, writeSeqEntropy);
+    return seqSize + literalsSize + ZSTD_blockHeaderSize;
+}
+
+/* Builds entropy statistics and uses them for blocksize estimation.
+ *
+ * Returns the estimated compressed size of the seqStore, or a zstd error.
+ */
+static size_t ZSTD_buildEntropyStatisticsAndEstimateSubBlockSize(seqStore_t* seqStore, const ZSTD_CCtx* zc) {
+    ZSTD_entropyCTablesMetadata_t entropyMetadata;
+    FORWARD_IF_ERROR(ZSTD_buildBlockEntropyStats(seqStore,
+                    &zc->blockState.prevCBlock->entropy,
+                    &zc->blockState.nextCBlock->entropy,
+                    &zc->appliedParams,
+                    &entropyMetadata,
+                    zc->entropyWorkspace, ENTROPY_WORKSPACE_SIZE /* statically allocated in resetCCtx */), "");
+    return ZSTD_estimateBlockSize(seqStore->litStart, (size_t)(seqStore->lit - seqStore->litStart),
+                    seqStore->ofCode, seqStore->llCode, seqStore->mlCode,
+                    (size_t)(seqStore->sequences - seqStore->sequencesStart),
+                    &zc->blockState.nextCBlock->entropy, &entropyMetadata, zc->entropyWorkspace, ENTROPY_WORKSPACE_SIZE,
+                    (int)(entropyMetadata.hufMetadata.hType == set_compressed), 1);
+}
+
+/* Returns literals bytes represented in a seqStore */
+static size_t ZSTD_countSeqStoreLiteralsBytes(const seqStore_t* const seqStore) {
+    size_t literalsBytes = 0;
+    size_t const nbSeqs = seqStore->sequences - seqStore->sequencesStart;
+    size_t i;
+    for (i = 0; i < nbSeqs; ++i) {
+        seqDef seq = seqStore->sequencesStart[i];
+        literalsBytes += seq.litLength;
+        if (i == seqStore->longLengthPos && seqStore->longLengthType == ZSTD_llt_literalLength) {
+            literalsBytes += 0x10000;
+        }
+    }
+    return literalsBytes;
+}
+
+/* Returns match bytes represented in a seqStore */
+static size_t ZSTD_countSeqStoreMatchBytes(const seqStore_t* const seqStore) {
+    size_t matchBytes = 0;
+    size_t const nbSeqs = seqStore->sequences - seqStore->sequencesStart;
+    size_t i;
+    for (i = 0; i < nbSeqs; ++i) {
+        seqDef seq = seqStore->sequencesStart[i];
+        matchBytes += seq.matchLength + MINMATCH;
+        if (i == seqStore->longLengthPos && seqStore->longLengthType == ZSTD_llt_matchLength) {
+            matchBytes += 0x10000;
+        }
+    }
+    return matchBytes;
+}
+
+/* Derives the seqStore that is a chunk of the originalSeqStore from [startIdx, endIdx).
+ * Stores the result in resultSeqStore.
+ */
+static void ZSTD_deriveSeqStoreChunk(seqStore_t* resultSeqStore,
+                               const seqStore_t* originalSeqStore,
+                                     size_t startIdx, size_t endIdx) {
+    BYTE* const litEnd = originalSeqStore->lit;
+    size_t literalsBytes;
+    size_t literalsBytesPreceding = 0;
+
+    *resultSeqStore = *originalSeqStore;
+    if (startIdx > 0) {
+        resultSeqStore->sequences = originalSeqStore->sequencesStart + startIdx;
+        literalsBytesPreceding = ZSTD_countSeqStoreLiteralsBytes(resultSeqStore);
+    }
+
+    /* Move longLengthPos into the correct position if necessary */
+    if (originalSeqStore->longLengthType != ZSTD_llt_none) {
+        if (originalSeqStore->longLengthPos < startIdx || originalSeqStore->longLengthPos > endIdx) {
+            resultSeqStore->longLengthType = ZSTD_llt_none;
+        } else {
+            resultSeqStore->longLengthPos -= (U32)startIdx;
+        }
+    }
+    resultSeqStore->sequencesStart = originalSeqStore->sequencesStart + startIdx;
+    resultSeqStore->sequences = originalSeqStore->sequencesStart + endIdx;
+    literalsBytes = ZSTD_countSeqStoreLiteralsBytes(resultSeqStore);
+    resultSeqStore->litStart += literalsBytesPreceding;
+    if (endIdx == (size_t)(originalSeqStore->sequences - originalSeqStore->sequencesStart)) {
+        /* This accounts for possible last literals if the derived chunk reaches the end of the block */
+        resultSeqStore->lit = litEnd;
+    } else {
+        resultSeqStore->lit = resultSeqStore->litStart+literalsBytes;
+    }
+    resultSeqStore->llCode += startIdx;
+    resultSeqStore->mlCode += startIdx;
+    resultSeqStore->ofCode += startIdx;
+}
+
+/**
+ * Returns the raw offset represented by the combination of offCode, ll0, and repcode history.
+ * offCode must be an offCode representing a repcode, therefore in the range of [0, 2].
+ */
+static U32 ZSTD_resolveRepcodeToRawOffset(const U32 rep[ZSTD_REP_NUM], const U32 offCode, const U32 ll0) {
+    U32 const adjustedOffCode = offCode + ll0;
+    assert(offCode < ZSTD_REP_NUM);
+    if (adjustedOffCode == ZSTD_REP_NUM) {
+        /* litlength == 0 and offCode == 2 implies selection of first repcode - 1 */
+        assert(rep[0] > 0);
+        return rep[0] - 1;
+    }
+    return rep[adjustedOffCode];
+}
+
+/**
+ * ZSTD_seqStore_resolveOffCodes() reconciles any possible divergences in offset history that may arise
+ * due to emission of RLE/raw blocks that disturb the offset history, and replaces any repcodes within
+ * the seqStore that may be invalid.
+ *
+ * dRepcodes are updated as would be on the decompression side. cRepcodes are updated exactly in
+ * accordance with the seqStore.
+ */
+static void ZSTD_seqStore_resolveOffCodes(repcodes_t* const dRepcodes, repcodes_t* const cRepcodes,
+                                          seqStore_t* const seqStore, U32 const nbSeq) {
+    U32 idx = 0;
+    for (; idx < nbSeq; ++idx) {
+        seqDef* const seq = seqStore->sequencesStart + idx;
+        U32 const ll0 = (seq->litLength == 0);
+        U32 offCode = seq->offset - 1;
+        assert(seq->offset > 0);
+        if (offCode <= ZSTD_REP_MOVE) {
+            U32 const dRawOffset = ZSTD_resolveRepcodeToRawOffset(dRepcodes->rep, offCode, ll0);
+            U32 const cRawOffset = ZSTD_resolveRepcodeToRawOffset(cRepcodes->rep, offCode, ll0);
+            /* Adjust simulated decompression repcode history if we come across a mismatch. Replace
+             * the repcode with the offset it actually references, determined by the compression
+             * repcode history.
+             */
+            if (dRawOffset != cRawOffset) {
+                seq->offset = cRawOffset + ZSTD_REP_NUM;
+            }
+        }
+        /* Compression repcode history is always updated with values directly from the unmodified seqStore.
+         * Decompression repcode history may use modified seq->offset value taken from compression repcode history.
+         */
+        *dRepcodes = ZSTD_updateRep(dRepcodes->rep, seq->offset - 1, ll0);
+        *cRepcodes = ZSTD_updateRep(cRepcodes->rep, offCode, ll0);
+    }
+}
+
+/* ZSTD_compressSeqStore_singleBlock():
+ * Compresses a seqStore into a block with a block header, into the buffer dst.
+ *
+ * Returns the total size of that block (including header) or a ZSTD error code.
+ */
+static size_t ZSTD_compressSeqStore_singleBlock(ZSTD_CCtx* zc, seqStore_t* const seqStore,
+                                                repcodes_t* const dRep, repcodes_t* const cRep,
+                                                void* dst, size_t dstCapacity,
+                                                const void* src, size_t srcSize,
+                                                U32 lastBlock, U32 isPartition) {
+    const U32 rleMaxLength = 25;
+    BYTE* op = (BYTE*)dst;
+    const BYTE* ip = (const BYTE*)src;
+    size_t cSize;
+    size_t cSeqsSize;
+
+    /* In case of an RLE or raw block, the simulated decompression repcode history must be reset */
+    repcodes_t const dRepOriginal = *dRep;
+    if (isPartition)
+        ZSTD_seqStore_resolveOffCodes(dRep, cRep, seqStore, (U32)(seqStore->sequences - seqStore->sequencesStart));
+
+    cSeqsSize = ZSTD_entropyCompressSeqStore(seqStore,
+                &zc->blockState.prevCBlock->entropy, &zc->blockState.nextCBlock->entropy,
+                &zc->appliedParams,
+                op + ZSTD_blockHeaderSize, dstCapacity - ZSTD_blockHeaderSize,
+                srcSize,
+                zc->entropyWorkspace, ENTROPY_WORKSPACE_SIZE /* statically allocated in resetCCtx */,
+                zc->bmi2);
+    FORWARD_IF_ERROR(cSeqsSize, "ZSTD_entropyCompressSeqStore failed!");
+
+    if (!zc->isFirstBlock &&
+        cSeqsSize < rleMaxLength &&
+        ZSTD_isRLE((BYTE const*)src, srcSize)) {
+        /* We don't want to emit our first block as a RLE even if it qualifies because
+        * doing so will cause the decoder (cli only) to throw a "should consume all input error."
+        * This is only an issue for zstd <= v1.4.3
+        */
+        cSeqsSize = 1;
+    }
+
+    if (zc->seqCollector.collectSequences) {
+        ZSTD_copyBlockSequences(zc);
+        ZSTD_blockState_confirmRepcodesAndEntropyTables(&zc->blockState);
+        return 0;
+    }
+
+    if (zc->blockState.prevCBlock->entropy.fse.offcode_repeatMode == FSE_repeat_valid)
+        zc->blockState.prevCBlock->entropy.fse.offcode_repeatMode = FSE_repeat_check;
+
+    if (cSeqsSize == 0) {
+        cSize = ZSTD_noCompressBlock(op, dstCapacity, ip, srcSize, lastBlock);
+        FORWARD_IF_ERROR(cSize, "Nocompress block failed");
+        DEBUGLOG(4, "Writing out nocompress block, size: %zu", cSize);
+        *dRep = dRepOriginal; /* reset simulated decompression repcode history */
+    } else if (cSeqsSize == 1) {
+        cSize = ZSTD_rleCompressBlock(op, dstCapacity, *ip, srcSize, lastBlock);
+        FORWARD_IF_ERROR(cSize, "RLE compress block failed");
+        DEBUGLOG(4, "Writing out RLE block, size: %zu", cSize);
+        *dRep = dRepOriginal; /* reset simulated decompression repcode history */
+    } else {
+        ZSTD_blockState_confirmRepcodesAndEntropyTables(&zc->blockState);
+        writeBlockHeader(op, cSeqsSize, srcSize, lastBlock);
+        cSize = ZSTD_blockHeaderSize + cSeqsSize;
+        DEBUGLOG(4, "Writing out compressed block, size: %zu", cSize);
+    }
+    return cSize;
+}
+
+/* Struct to keep track of where we are in our recursive calls. */
+typedef struct {
+    U32* splitLocations;    /* Array of split indices */
+    size_t idx;             /* The current index within splitLocations being worked on */
+} seqStoreSplits;
+
+#define MIN_SEQUENCES_BLOCK_SPLITTING 300
+#define MAX_NB_SPLITS 196
+
+/* Helper function to perform the recursive search for block splits.
+ * Estimates the cost of seqStore prior to split, and estimates the cost of splitting the sequences in half.
+ * If advantageous to split, then we recurse down the two sub-blocks. If not, or if an error occurred in estimation, then
+ * we do not recurse.
+ *
+ * Note: The recursion depth is capped by a heuristic minimum number of sequences, defined by MIN_SEQUENCES_BLOCK_SPLITTING.
+ * In theory, this means the absolute largest recursion depth is 10 == log2(maxNbSeqInBlock/MIN_SEQUENCES_BLOCK_SPLITTING).
+ * In practice, recursion depth usually doesn't go beyond 4.
+ *
+ * Furthermore, the number of splits is capped by MAX_NB_SPLITS. At MAX_NB_SPLITS == 196 with the current existing blockSize
+ * maximum of 128 KB, this value is actually impossible to reach.
+ */
+static void ZSTD_deriveBlockSplitsHelper(seqStoreSplits* splits, size_t startIdx, size_t endIdx,
+                                         const ZSTD_CCtx* zc, const seqStore_t* origSeqStore) {
+    seqStore_t fullSeqStoreChunk;
+    seqStore_t firstHalfSeqStore;
+    seqStore_t secondHalfSeqStore;
+    size_t estimatedOriginalSize;
+    size_t estimatedFirstHalfSize;
+    size_t estimatedSecondHalfSize;
+    size_t midIdx = (startIdx + endIdx)/2;
+
+    if (endIdx - startIdx < MIN_SEQUENCES_BLOCK_SPLITTING || splits->idx >= MAX_NB_SPLITS) {
+        return;
+    }
+    ZSTD_deriveSeqStoreChunk(&fullSeqStoreChunk, origSeqStore, startIdx, endIdx);
+    ZSTD_deriveSeqStoreChunk(&firstHalfSeqStore, origSeqStore, startIdx, midIdx);
+    ZSTD_deriveSeqStoreChunk(&secondHalfSeqStore, origSeqStore, midIdx, endIdx);
+    estimatedOriginalSize = ZSTD_buildEntropyStatisticsAndEstimateSubBlockSize(&fullSeqStoreChunk, zc);
+    estimatedFirstHalfSize = ZSTD_buildEntropyStatisticsAndEstimateSubBlockSize(&firstHalfSeqStore, zc);
+    estimatedSecondHalfSize = ZSTD_buildEntropyStatisticsAndEstimateSubBlockSize(&secondHalfSeqStore, zc);
+    DEBUGLOG(5, "Estimated original block size: %zu -- First half split: %zu -- Second half split: %zu",
+             estimatedOriginalSize, estimatedFirstHalfSize, estimatedSecondHalfSize);
+    if (ZSTD_isError(estimatedOriginalSize) || ZSTD_isError(estimatedFirstHalfSize) || ZSTD_isError(estimatedSecondHalfSize)) {
+        return;
+    }
+    if (estimatedFirstHalfSize + estimatedSecondHalfSize < estimatedOriginalSize) {
+        ZSTD_deriveBlockSplitsHelper(splits, startIdx, midIdx, zc, origSeqStore);
+        splits->splitLocations[splits->idx] = (U32)midIdx;
+        splits->idx++;
+        ZSTD_deriveBlockSplitsHelper(splits, midIdx, endIdx, zc, origSeqStore);
+    }
+}
+
+/* Base recursive function. Populates a table with intra-block partition indices that can improve compression ratio.
+ *
+ * Returns the number of splits made (which equals the size of the partition table - 1).
+ */
+static size_t ZSTD_deriveBlockSplits(ZSTD_CCtx* zc, U32 partitions[], U32 nbSeq) {
+    seqStoreSplits splits = {partitions, 0};
+    if (nbSeq <= 4) {
+        DEBUGLOG(4, "ZSTD_deriveBlockSplits: Too few sequences to split");
+        /* Refuse to try and split anything with less than 4 sequences */
+        return 0;
+    }
+    ZSTD_deriveBlockSplitsHelper(&splits, 0, nbSeq, zc, &zc->seqStore);
+    splits.splitLocations[splits.idx] = nbSeq;
+    DEBUGLOG(5, "ZSTD_deriveBlockSplits: final nb partitions: %zu", splits.idx+1);
+    return splits.idx;
+}
+
+/* ZSTD_compressBlock_splitBlock():
+ * Attempts to split a given block into multiple blocks to improve compression ratio.
+ *
+ * Returns combined size of all blocks (which includes headers), or a ZSTD error code.
+ */
+static size_t ZSTD_compressBlock_splitBlock_internal(ZSTD_CCtx* zc, void* dst, size_t dstCapacity,
+                                                     const void* src, size_t blockSize, U32 lastBlock, U32 nbSeq) {
+    size_t cSize = 0;
+    const BYTE* ip = (const BYTE*)src;
+    BYTE* op = (BYTE*)dst;
+    U32 partitions[MAX_NB_SPLITS];
+    size_t i = 0;
+    size_t srcBytesTotal = 0;
+    size_t numSplits = ZSTD_deriveBlockSplits(zc, partitions, nbSeq);
+    seqStore_t nextSeqStore;
+    seqStore_t currSeqStore;
+
+    /* If a block is split and some partitions are emitted as RLE/uncompressed, then repcode history
+     * may become invalid. In order to reconcile potentially invalid repcodes, we keep track of two
+     * separate repcode histories that simulate repcode history on compression and decompression side,
+     * and use the histories to determine whether we must replace a particular repcode with its raw offset.
+     *
+     * 1) cRep gets updated for each partition, regardless of whether the block was emitted as uncompressed
+     *    or RLE. This allows us to retrieve the offset value that an invalid repcode references within
+     *    a nocompress/RLE block.
+     * 2) dRep gets updated only for compressed partitions, and when a repcode gets replaced, will use
+     *    the replacement offset value rather than the original repcode to update the repcode history.
+     *    dRep also will be the final repcode history sent to the next block.
+     *
+     * See ZSTD_seqStore_resolveOffCodes() for more details.
+     */
+    repcodes_t dRep;
+    repcodes_t cRep;
+    ZSTD_memcpy(dRep.rep, zc->blockState.prevCBlock->rep, sizeof(repcodes_t));
+    ZSTD_memcpy(cRep.rep, zc->blockState.prevCBlock->rep, sizeof(repcodes_t));
+
+    DEBUGLOG(4, "ZSTD_compressBlock_splitBlock_internal (dstCapacity=%u, dictLimit=%u, nextToUpdate=%u)",
+                (unsigned)dstCapacity, (unsigned)zc->blockState.matchState.window.dictLimit,
+                (unsigned)zc->blockState.matchState.nextToUpdate);
+
+    if (numSplits == 0) {
+        size_t cSizeSingleBlock = ZSTD_compressSeqStore_singleBlock(zc, &zc->seqStore,
+                                                                   &dRep, &cRep,
+                                                                    op, dstCapacity,
+                                                                    ip, blockSize,
+                                                                    lastBlock, 0 /* isPartition */);
+        FORWARD_IF_ERROR(cSizeSingleBlock, "Compressing single block from splitBlock_internal() failed!");
+        DEBUGLOG(5, "ZSTD_compressBlock_splitBlock_internal: No splits");
+        assert(cSizeSingleBlock <= ZSTD_BLOCKSIZE_MAX + ZSTD_blockHeaderSize);
+        return cSizeSingleBlock;
+    }
+
+    ZSTD_deriveSeqStoreChunk(&currSeqStore, &zc->seqStore, 0, partitions[0]);
+    for (i = 0; i <= numSplits; ++i) {
+        size_t srcBytes;
+        size_t cSizeChunk;
+        U32 const lastPartition = (i == numSplits);
+        U32 lastBlockEntireSrc = 0;
+
+        srcBytes = ZSTD_countSeqStoreLiteralsBytes(&currSeqStore) + ZSTD_countSeqStoreMatchBytes(&currSeqStore);
+        srcBytesTotal += srcBytes;
+        if (lastPartition) {
+            /* This is the final partition, need to account for possible last literals */
+            srcBytes += blockSize - srcBytesTotal;
+            lastBlockEntireSrc = lastBlock;
+        } else {
+            ZSTD_deriveSeqStoreChunk(&nextSeqStore, &zc->seqStore, partitions[i], partitions[i+1]);
+        }
+
+        cSizeChunk = ZSTD_compressSeqStore_singleBlock(zc, &currSeqStore,
+                                                      &dRep, &cRep,
+                                                       op, dstCapacity,
+                                                       ip, srcBytes,
+                                                       lastBlockEntireSrc, 1 /* isPartition */);
+        DEBUGLOG(5, "Estimated size: %zu actual size: %zu", ZSTD_buildEntropyStatisticsAndEstimateSubBlockSize(&currSeqStore, zc), cSizeChunk);
+        FORWARD_IF_ERROR(cSizeChunk, "Compressing chunk failed!");
+
+        ip += srcBytes;
+        op += cSizeChunk;
+        dstCapacity -= cSizeChunk;
+        cSize += cSizeChunk;
+        currSeqStore = nextSeqStore;
+        assert(cSizeChunk <= ZSTD_BLOCKSIZE_MAX + ZSTD_blockHeaderSize);
+    }
+    /* cRep and dRep may have diverged during the compression. If so, we use the dRep repcodes
+     * for the next block.
+     */
+    ZSTD_memcpy(zc->blockState.prevCBlock->rep, dRep.rep, sizeof(repcodes_t));
+    return cSize;
+}
+
+static size_t ZSTD_compressBlock_splitBlock(ZSTD_CCtx* zc,
+                                        void* dst, size_t dstCapacity,
+                                        const void* src, size_t srcSize, U32 lastBlock) {
+    const BYTE* ip = (const BYTE*)src;
+    BYTE* op = (BYTE*)dst;
+    U32 nbSeq;
+    size_t cSize;
+    DEBUGLOG(4, "ZSTD_compressBlock_splitBlock");
+
+    {   const size_t bss = ZSTD_buildSeqStore(zc, src, srcSize);
+        FORWARD_IF_ERROR(bss, "ZSTD_buildSeqStore failed");
+        if (bss == ZSTDbss_noCompress) {
+            if (zc->blockState.prevCBlock->entropy.fse.offcode_repeatMode == FSE_repeat_valid)
+                zc->blockState.prevCBlock->entropy.fse.offcode_repeatMode = FSE_repeat_check;
+            cSize = ZSTD_noCompressBlock(op, dstCapacity, ip, srcSize, lastBlock);
+            FORWARD_IF_ERROR(cSize, "ZSTD_noCompressBlock failed");
+            DEBUGLOG(4, "ZSTD_compressBlock_splitBlock: Nocompress block");
+            return cSize;
+        }
+        nbSeq = (U32)(zc->seqStore.sequences - zc->seqStore.sequencesStart);
+    }
+
+    assert(zc->appliedParams.splitBlocks == 1);
+    cSize = ZSTD_compressBlock_splitBlock_internal(zc, dst, dstCapacity, src, srcSize, lastBlock, nbSeq);
+    FORWARD_IF_ERROR(cSize, "Splitting blocks failed!");
+    return cSize;
+}
+
+static size_t ZSTD_compressBlock_internal(ZSTD_CCtx* zc,
+                                        void* dst, size_t dstCapacity,
+                                        const void* src, size_t srcSize, U32 frame)
+{
+    /* This the upper bound for the length of an rle block.
+     * This isn't the actual upper bound. Finding the real threshold
+     * needs further investigation.
+     */
+    const U32 rleMaxLength = 25;
+    size_t cSize;
+    const BYTE* ip = (const BYTE*)src;
+    BYTE* op = (BYTE*)dst;
+    DEBUGLOG(5, "ZSTD_compressBlock_internal (dstCapacity=%u, dictLimit=%u, nextToUpdate=%u)",
+                (unsigned)dstCapacity, (unsigned)zc->blockState.matchState.window.dictLimit,
+                (unsigned)zc->blockState.matchState.nextToUpdate);
+
+    {   const size_t bss = ZSTD_buildSeqStore(zc, src, srcSize);
+        FORWARD_IF_ERROR(bss, "ZSTD_buildSeqStore failed");
+        if (bss == ZSTDbss_noCompress) { cSize = 0; goto out; }
+    }
+
+    if (zc->seqCollector.collectSequences) {
+        ZSTD_copyBlockSequences(zc);
+        ZSTD_blockState_confirmRepcodesAndEntropyTables(&zc->blockState);
+        return 0;
+    }
+
+    /* encode sequences and literals */
+    cSize = ZSTD_entropyCompressSeqStore(&zc->seqStore,
+            &zc->blockState.prevCBlock->entropy, &zc->blockState.nextCBlock->entropy,
+            &zc->appliedParams,
+            dst, dstCapacity,
+            srcSize,
+            zc->entropyWorkspace, ENTROPY_WORKSPACE_SIZE /* statically allocated in resetCCtx */,
+            zc->bmi2);
+
+    if (zc->seqCollector.collectSequences) {
+        ZSTD_copyBlockSequences(zc);
+        return 0;
+    }
+
+
+    if (frame &&
+        /* We don't want to emit our first block as a RLE even if it qualifies because
+         * doing so will cause the decoder (cli only) to throw a "should consume all input error."
+         * This is only an issue for zstd <= v1.4.3
+         */
+        !zc->isFirstBlock &&
+        cSize < rleMaxLength &&
+        ZSTD_isRLE(ip, srcSize))
+    {
+        cSize = 1;
+        op[0] = ip[0];
+    }
+
+out:
+    if (!ZSTD_isError(cSize) && cSize > 1) {
+        ZSTD_blockState_confirmRepcodesAndEntropyTables(&zc->blockState);
+    }
+    /* We check that dictionaries have offset codes available for the first
+     * block. After the first block, the offcode table might not have large
+     * enough codes to represent the offsets in the data.
+     */
+    if (zc->blockState.prevCBlock->entropy.fse.offcode_repeatMode == FSE_repeat_valid)
+        zc->blockState.prevCBlock->entropy.fse.offcode_repeatMode = FSE_repeat_check;
+
+    return cSize;
+}
+
+static size_t ZSTD_compressBlock_targetCBlockSize_body(ZSTD_CCtx* zc,
+                               void* dst, size_t dstCapacity,
+                               const void* src, size_t srcSize,
+                               const size_t bss, U32 lastBlock)
+{
+    DEBUGLOG(6, "Attempting ZSTD_compressSuperBlock()");
+    if (bss == ZSTDbss_compress) {
+        if (/* We don't want to emit our first block as a RLE even if it qualifies because
+            * doing so will cause the decoder (cli only) to throw a "should consume all input error."
+            * This is only an issue for zstd <= v1.4.3
+            */
+            !zc->isFirstBlock &&
+            ZSTD_maybeRLE(&zc->seqStore) &&
+            ZSTD_isRLE((BYTE const*)src, srcSize))
+        {
+            return ZSTD_rleCompressBlock(dst, dstCapacity, *(BYTE const*)src, srcSize, lastBlock);
+        }
+        /* Attempt superblock compression.
+         *
+         * Note that compressed size of ZSTD_compressSuperBlock() is not bound by the
+         * standard ZSTD_compressBound(). This is a problem, because even if we have
+         * space now, taking an extra byte now could cause us to run out of space later
+         * and violate ZSTD_compressBound().
+         *
+         * Define blockBound(blockSize) = blockSize + ZSTD_blockHeaderSize.
+         *
+         * In order to respect ZSTD_compressBound() we must attempt to emit a raw
+         * uncompressed block in these cases:
+         *   * cSize == 0: Return code for an uncompressed block.
+         *   * cSize == dstSize_tooSmall: We may have expanded beyond blockBound(srcSize).
+         *     ZSTD_noCompressBlock() will return dstSize_tooSmall if we are really out of
+         *     output space.
+         *   * cSize >= blockBound(srcSize): We have expanded the block too much so
+         *     emit an uncompressed block.
+         */
+        {
+            size_t const cSize = ZSTD_compressSuperBlock(zc, dst, dstCapacity, src, srcSize, lastBlock);
+            if (cSize != ERROR(dstSize_tooSmall)) {
+                size_t const maxCSize = srcSize - ZSTD_minGain(srcSize, zc->appliedParams.cParams.strategy);
+                FORWARD_IF_ERROR(cSize, "ZSTD_compressSuperBlock failed");
+                if (cSize != 0 && cSize < maxCSize + ZSTD_blockHeaderSize) {
+                    ZSTD_blockState_confirmRepcodesAndEntropyTables(&zc->blockState);
+                    return cSize;
+                }
+            }
+        }
+    }
+
+    DEBUGLOG(6, "Resorting to ZSTD_noCompressBlock()");
+    /* Superblock compression failed, attempt to emit a single no compress block.
+     * The decoder will be able to stream this block since it is uncompressed.
+     */
+    return ZSTD_noCompressBlock(dst, dstCapacity, src, srcSize, lastBlock);
+}
+
+static size_t ZSTD_compressBlock_targetCBlockSize(ZSTD_CCtx* zc,
+                               void* dst, size_t dstCapacity,
+                               const void* src, size_t srcSize,
+                               U32 lastBlock)
+{
+    size_t cSize = 0;
+    const size_t bss = ZSTD_buildSeqStore(zc, src, srcSize);
+    DEBUGLOG(5, "ZSTD_compressBlock_targetCBlockSize (dstCapacity=%u, dictLimit=%u, nextToUpdate=%u, srcSize=%zu)",
+                (unsigned)dstCapacity, (unsigned)zc->blockState.matchState.window.dictLimit, (unsigned)zc->blockState.matchState.nextToUpdate, srcSize);
+    FORWARD_IF_ERROR(bss, "ZSTD_buildSeqStore failed");
+
+    cSize = ZSTD_compressBlock_targetCBlockSize_body(zc, dst, dstCapacity, src, srcSize, bss, lastBlock);
+    FORWARD_IF_ERROR(cSize, "ZSTD_compressBlock_targetCBlockSize_body failed");
+
+    if (zc->blockState.prevCBlock->entropy.fse.offcode_repeatMode == FSE_repeat_valid)
+        zc->blockState.prevCBlock->entropy.fse.offcode_repeatMode = FSE_repeat_check;
+
+    return cSize;
+}
+
+static void ZSTD_overflowCorrectIfNeeded(ZSTD_matchState_t* ms,
+                                         ZSTD_cwksp* ws,
+                                         ZSTD_CCtx_params const* params,
+                                         void const* ip,
+                                         void const* iend)
+{
+    U32 const cycleLog = ZSTD_cycleLog(params->cParams.chainLog, params->cParams.strategy);
+    U32 const maxDist = (U32)1 << params->cParams.windowLog;
+    if (ZSTD_window_needOverflowCorrection(ms->window, cycleLog, maxDist, ms->loadedDictEnd, ip, iend)) {
+        U32 const correction = ZSTD_window_correctOverflow(&ms->window, cycleLog, maxDist, ip);
+        ZSTD_STATIC_ASSERT(ZSTD_CHAINLOG_MAX <= 30);
+        ZSTD_STATIC_ASSERT(ZSTD_WINDOWLOG_MAX_32 <= 30);
+        ZSTD_STATIC_ASSERT(ZSTD_WINDOWLOG_MAX <= 31);
+        ZSTD_cwksp_mark_tables_dirty(ws);
+        ZSTD_reduceIndex(ms, params, correction);
+        ZSTD_cwksp_mark_tables_clean(ws);
+        if (ms->nextToUpdate < correction) ms->nextToUpdate = 0;
+        else ms->nextToUpdate -= correction;
+        /* invalidate dictionaries on overflow correction */
+        ms->loadedDictEnd = 0;
+        ms->dictMatchState = NULL;
+    }
+}
+
+/*! ZSTD_compress_frameChunk() :
+*   Compress a chunk of data into one or multiple blocks.
+*   All blocks will be terminated, all input will be consumed.
+*   Function will issue an error if there is not enough `dstCapacity` to hold the compressed content.
+*   Frame is supposed already started (header already produced)
+*   @return : compressed size, or an error code
+*/
+static size_t ZSTD_compress_frameChunk(ZSTD_CCtx* cctx,
+                                     void* dst, size_t dstCapacity,
+                               const void* src, size_t srcSize,
+                                     U32 lastFrameChunk)
+{
+    size_t blockSize = cctx->blockSize;
+    size_t remaining = srcSize;
+    const BYTE* ip = (const BYTE*)src;
+    BYTE* const ostart = (BYTE*)dst;
+    BYTE* op = ostart;
+    U32 const maxDist = (U32)1 << cctx->appliedParams.cParams.windowLog;
+
+    assert(cctx->appliedParams.cParams.windowLog <= ZSTD_WINDOWLOG_MAX);
+
+    DEBUGLOG(4, "ZSTD_compress_frameChunk (blockSize=%u)", (unsigned)blockSize);
+    if (cctx->appliedParams.fParams.checksumFlag && srcSize)
+        XXH64_update(&cctx->xxhState, src, srcSize);
+
+    while (remaining) {
+        ZSTD_matchState_t* const ms = &cctx->blockState.matchState;
+        U32 const lastBlock = lastFrameChunk & (blockSize >= remaining);
+
+        RETURN_ERROR_IF(dstCapacity < ZSTD_blockHeaderSize + MIN_CBLOCK_SIZE,
+                        dstSize_tooSmall,
+                        "not enough space to store compressed block");
+        if (remaining < blockSize) blockSize = remaining;
+
+        ZSTD_overflowCorrectIfNeeded(
+            ms, &cctx->workspace, &cctx->appliedParams, ip, ip + blockSize);
+        ZSTD_checkDictValidity(&ms->window, ip + blockSize, maxDist, &ms->loadedDictEnd, &ms->dictMatchState);
+
+        /* Ensure hash/chain table insertion resumes no sooner than lowlimit */
+        if (ms->nextToUpdate < ms->window.lowLimit) ms->nextToUpdate = ms->window.lowLimit;
+
+        {   size_t cSize;
+            if (ZSTD_useTargetCBlockSize(&cctx->appliedParams)) {
+                cSize = ZSTD_compressBlock_targetCBlockSize(cctx, op, dstCapacity, ip, blockSize, lastBlock);
+                FORWARD_IF_ERROR(cSize, "ZSTD_compressBlock_targetCBlockSize failed");
+                assert(cSize > 0);
+                assert(cSize <= blockSize + ZSTD_blockHeaderSize);
+            } else if (ZSTD_blockSplitterEnabled(&cctx->appliedParams)) {
+                cSize = ZSTD_compressBlock_splitBlock(cctx, op, dstCapacity, ip, blockSize, lastBlock);
+                FORWARD_IF_ERROR(cSize, "ZSTD_compressBlock_splitBlock failed");
+                assert(cSize > 0 || cctx->seqCollector.collectSequences == 1);
+            } else {
+                cSize = ZSTD_compressBlock_internal(cctx,
+                                        op+ZSTD_blockHeaderSize, dstCapacity-ZSTD_blockHeaderSize,
+                                        ip, blockSize, 1 /* frame */);
+                FORWARD_IF_ERROR(cSize, "ZSTD_compressBlock_internal failed");
+
+                if (cSize == 0) {  /* block is not compressible */
+                    cSize = ZSTD_noCompressBlock(op, dstCapacity, ip, blockSize, lastBlock);
+                    FORWARD_IF_ERROR(cSize, "ZSTD_noCompressBlock failed");
+                } else {
+                    U32 const cBlockHeader = cSize == 1 ?
+                        lastBlock + (((U32)bt_rle)<<1) + (U32)(blockSize << 3) :
+                        lastBlock + (((U32)bt_compressed)<<1) + (U32)(cSize << 3);
+                    MEM_writeLE24(op, cBlockHeader);
+                    cSize += ZSTD_blockHeaderSize;
+                }
+            }
+
+
+            ip += blockSize;
+            assert(remaining >= blockSize);
+            remaining -= blockSize;
+            op += cSize;
+            assert(dstCapacity >= cSize);
+            dstCapacity -= cSize;
+            cctx->isFirstBlock = 0;
+            DEBUGLOG(5, "ZSTD_compress_frameChunk: adding a block of size %u",
+                        (unsigned)cSize);
+    }   }
+
+    if (lastFrameChunk && (op>ostart)) cctx->stage = ZSTDcs_ending;
+    return (size_t)(op-ostart);
+}
+
+
+static size_t ZSTD_writeFrameHeader(void* dst, size_t dstCapacity,
+                                    const ZSTD_CCtx_params* params, U64 pledgedSrcSize, U32 dictID)
+{   BYTE* const op = (BYTE*)dst;
+    U32   const dictIDSizeCodeLength = (dictID>0) + (dictID>=256) + (dictID>=65536);   /* 0-3 */
+    U32   const dictIDSizeCode = params->fParams.noDictIDFlag ? 0 : dictIDSizeCodeLength;   /* 0-3 */
+    U32   const checksumFlag = params->fParams.checksumFlag>0;
+    U32   const windowSize = (U32)1 << params->cParams.windowLog;
+    U32   const singleSegment = params->fParams.contentSizeFlag && (windowSize >= pledgedSrcSize);
+    BYTE  const windowLogByte = (BYTE)((params->cParams.windowLog - ZSTD_WINDOWLOG_ABSOLUTEMIN) << 3);
+    U32   const fcsCode = params->fParams.contentSizeFlag ?
+                     (pledgedSrcSize>=256) + (pledgedSrcSize>=65536+256) + (pledgedSrcSize>=0xFFFFFFFFU) : 0;  /* 0-3 */
+    BYTE  const frameHeaderDescriptionByte = (BYTE)(dictIDSizeCode + (checksumFlag<<2) + (singleSegment<<5) + (fcsCode<<6) );
+    size_t pos=0;
+
+    assert(!(params->fParams.contentSizeFlag && pledgedSrcSize == ZSTD_CONTENTSIZE_UNKNOWN));
+    RETURN_ERROR_IF(dstCapacity < ZSTD_FRAMEHEADERSIZE_MAX, dstSize_tooSmall,
+                    "dst buf is too small to fit worst-case frame header size.");
+    DEBUGLOG(4, "ZSTD_writeFrameHeader : dictIDFlag : %u ; dictID : %u ; dictIDSizeCode : %u",
+                !params->fParams.noDictIDFlag, (unsigned)dictID, (unsigned)dictIDSizeCode);
+    if (params->format == ZSTD_f_zstd1) {
+        MEM_writeLE32(dst, ZSTD_MAGICNUMBER);
+        pos = 4;
+    }
+    op[pos++] = frameHeaderDescriptionByte;
+    if (!singleSegment) op[pos++] = windowLogByte;
+    switch(dictIDSizeCode)
+    {
+        default:  assert(0); /* impossible */
+        case 0 : break;
+        case 1 : op[pos] = (BYTE)(dictID); pos++; break;
+        case 2 : MEM_writeLE16(op+pos, (U16)dictID); pos+=2; break;
+        case 3 : MEM_writeLE32(op+pos, dictID); pos+=4; break;
+    }
+    switch(fcsCode)
+    {
+        default:  assert(0); /* impossible */
+        case 0 : if (singleSegment) op[pos++] = (BYTE)(pledgedSrcSize); break;
+        case 1 : MEM_writeLE16(op+pos, (U16)(pledgedSrcSize-256)); pos+=2; break;
+        case 2 : MEM_writeLE32(op+pos, (U32)(pledgedSrcSize)); pos+=4; break;
+        case 3 : MEM_writeLE64(op+pos, (U64)(pledgedSrcSize)); pos+=8; break;
+    }
+    return pos;
+}
+
+/* ZSTD_writeSkippableFrame_advanced() :
+ * Writes out a skippable frame with the specified magic number variant (16 are supported),
+ * from ZSTD_MAGIC_SKIPPABLE_START to ZSTD_MAGIC_SKIPPABLE_START+15, and the desired source data.
+ *
+ * Returns the total number of bytes written, or a ZSTD error code.
+ */
+size_t ZSTD_writeSkippableFrame(void* dst, size_t dstCapacity,
+                                const void* src, size_t srcSize, unsigned magicVariant) {
+    BYTE* op = (BYTE*)dst;
+    RETURN_ERROR_IF(dstCapacity < srcSize + ZSTD_SKIPPABLEHEADERSIZE /* Skippable frame overhead */,
+                    dstSize_tooSmall, "Not enough room for skippable frame");
+    RETURN_ERROR_IF(srcSize > (unsigned)0xFFFFFFFF, srcSize_wrong, "Src size too large for skippable frame");
+    RETURN_ERROR_IF(magicVariant > 15, parameter_outOfBound, "Skippable frame magic number variant not supported");
+
+    MEM_writeLE32(op, (U32)(ZSTD_MAGIC_SKIPPABLE_START + magicVariant));
+    MEM_writeLE32(op+4, (U32)srcSize);
+    ZSTD_memcpy(op+8, src, srcSize);
+    return srcSize + ZSTD_SKIPPABLEHEADERSIZE;
+}
+
+/* ZSTD_writeLastEmptyBlock() :
+ * output an empty Block with end-of-frame mark to complete a frame
+ * @return : size of data written into `dst` (== ZSTD_blockHeaderSize (defined in zstd_internal.h))
+ *           or an error code if `dstCapacity` is too small (<ZSTD_blockHeaderSize)
+ */
+size_t ZSTD_writeLastEmptyBlock(void* dst, size_t dstCapacity)
+{
+    RETURN_ERROR_IF(dstCapacity < ZSTD_blockHeaderSize, dstSize_tooSmall,
+                    "dst buf is too small to write frame trailer empty block.");
+    {   U32 const cBlockHeader24 = 1 /*lastBlock*/ + (((U32)bt_raw)<<1);  /* 0 size */
+        MEM_writeLE24(dst, cBlockHeader24);
+        return ZSTD_blockHeaderSize;
+    }
+}
+
+size_t ZSTD_referenceExternalSequences(ZSTD_CCtx* cctx, rawSeq* seq, size_t nbSeq)
+{
+    RETURN_ERROR_IF(cctx->stage != ZSTDcs_init, stage_wrong,
+                    "wrong cctx stage");
+    RETURN_ERROR_IF(cctx->appliedParams.ldmParams.enableLdm,
+                    parameter_unsupported,
+                    "incompatible with ldm");
+    cctx->externSeqStore.seq = seq;
+    cctx->externSeqStore.size = nbSeq;
+    cctx->externSeqStore.capacity = nbSeq;
+    cctx->externSeqStore.pos = 0;
+    cctx->externSeqStore.posInSequence = 0;
+    return 0;
+}
+
+
+static size_t ZSTD_compressContinue_internal (ZSTD_CCtx* cctx,
+                              void* dst, size_t dstCapacity,
+                        const void* src, size_t srcSize,
+                               U32 frame, U32 lastFrameChunk)
+{
+    ZSTD_matchState_t* const ms = &cctx->blockState.matchState;
+    size_t fhSize = 0;
+
+    DEBUGLOG(5, "ZSTD_compressContinue_internal, stage: %u, srcSize: %u",
+                cctx->stage, (unsigned)srcSize);
+    RETURN_ERROR_IF(cctx->stage==ZSTDcs_created, stage_wrong,
+                    "missing init (ZSTD_compressBegin)");
+
+    if (frame && (cctx->stage==ZSTDcs_init)) {
+        fhSize = ZSTD_writeFrameHeader(dst, dstCapacity, &cctx->appliedParams,
+                                       cctx->pledgedSrcSizePlusOne-1, cctx->dictID);
+        FORWARD_IF_ERROR(fhSize, "ZSTD_writeFrameHeader failed");
+        assert(fhSize <= dstCapacity);
+        dstCapacity -= fhSize;
+        dst = (char*)dst + fhSize;
+        cctx->stage = ZSTDcs_ongoing;
+    }
+
+    if (!srcSize) return fhSize;  /* do not generate an empty block if no input */
+
+    if (!ZSTD_window_update(&ms->window, src, srcSize, ms->forceNonContiguous)) {
+        ms->forceNonContiguous = 0;
+        ms->nextToUpdate = ms->window.dictLimit;
+    }
+    if (cctx->appliedParams.ldmParams.enableLdm) {
+        ZSTD_window_update(&cctx->ldmState.window, src, srcSize, /* forceNonContiguous */ 0);
+    }
+
+    if (!frame) {
+        /* overflow check and correction for block mode */
+        ZSTD_overflowCorrectIfNeeded(
+            ms, &cctx->workspace, &cctx->appliedParams,
+            src, (BYTE const*)src + srcSize);
+    }
+
+    DEBUGLOG(5, "ZSTD_compressContinue_internal (blockSize=%u)", (unsigned)cctx->blockSize);
+    {   size_t const cSize = frame ?
+                             ZSTD_compress_frameChunk (cctx, dst, dstCapacity, src, srcSize, lastFrameChunk) :
+                             ZSTD_compressBlock_internal (cctx, dst, dstCapacity, src, srcSize, 0 /* frame */);
+        FORWARD_IF_ERROR(cSize, "%s", frame ? "ZSTD_compress_frameChunk failed" : "ZSTD_compressBlock_internal failed");
+        cctx->consumedSrcSize += srcSize;
+        cctx->producedCSize += (cSize + fhSize);
+        assert(!(cctx->appliedParams.fParams.contentSizeFlag && cctx->pledgedSrcSizePlusOne == 0));
+        if (cctx->pledgedSrcSizePlusOne != 0) {  /* control src size */
+            ZSTD_STATIC_ASSERT(ZSTD_CONTENTSIZE_UNKNOWN == (unsigned long long)-1);
+            RETURN_ERROR_IF(
+                cctx->consumedSrcSize+1 > cctx->pledgedSrcSizePlusOne,
+                srcSize_wrong,
+                "error : pledgedSrcSize = %u, while realSrcSize >= %u",
+                (unsigned)cctx->pledgedSrcSizePlusOne-1,
+                (unsigned)cctx->consumedSrcSize);
+        }
+        return cSize + fhSize;
+    }
+}
+
+size_t ZSTD_compressContinue (ZSTD_CCtx* cctx,
+                              void* dst, size_t dstCapacity,
+                        const void* src, size_t srcSize)
+{
+    DEBUGLOG(5, "ZSTD_compressContinue (srcSize=%u)", (unsigned)srcSize);
+    return ZSTD_compressContinue_internal(cctx, dst, dstCapacity, src, srcSize, 1 /* frame mode */, 0 /* last chunk */);
+}
+
+
+size_t ZSTD_getBlockSize(const ZSTD_CCtx* cctx)
+{
+    ZSTD_compressionParameters const cParams = cctx->appliedParams.cParams;
+    assert(!ZSTD_checkCParams(cParams));
+    return MIN (ZSTD_BLOCKSIZE_MAX, (U32)1 << cParams.windowLog);
+}
+
+size_t ZSTD_compressBlock(ZSTD_CCtx* cctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize)
+{
+    DEBUGLOG(5, "ZSTD_compressBlock: srcSize = %u", (unsigned)srcSize);
+    { size_t const blockSizeMax = ZSTD_getBlockSize(cctx);
+      RETURN_ERROR_IF(srcSize > blockSizeMax, srcSize_wrong, "input is larger than a block"); }
+
+    return ZSTD_compressContinue_internal(cctx, dst, dstCapacity, src, srcSize, 0 /* frame mode */, 0 /* last chunk */);
+}
+
+/*! ZSTD_loadDictionaryContent() :
+ *  @return : 0, or an error code
+ */
+static size_t ZSTD_loadDictionaryContent(ZSTD_matchState_t* ms,
+                                         ldmState_t* ls,
+                                         ZSTD_cwksp* ws,
+                                         ZSTD_CCtx_params const* params,
+                                         const void* src, size_t srcSize,
+                                         ZSTD_dictTableLoadMethod_e dtlm)
+{
+    const BYTE* ip = (const BYTE*) src;
+    const BYTE* const iend = ip + srcSize;
+    int const loadLdmDict = params->ldmParams.enableLdm && ls != NULL;
+
+    /* Assert that we the ms params match the params we're being given */
+    ZSTD_assertEqualCParams(params->cParams, ms->cParams);
+
+    if (srcSize > ZSTD_CHUNKSIZE_MAX) {
+        /* Allow the dictionary to set indices up to exactly ZSTD_CURRENT_MAX.
+         * Dictionaries right at the edge will immediately trigger overflow
+         * correction, but I don't want to insert extra constraints here.
+         */
+        U32 const maxDictSize = ZSTD_CURRENT_MAX - 1;
+        /* We must have cleared our windows when our source is this large. */
+        assert(ZSTD_window_isEmpty(ms->window));
+        if (loadLdmDict)
+            assert(ZSTD_window_isEmpty(ls->window));
+        /* If the dictionary is too large, only load the suffix of the dictionary. */
+        if (srcSize > maxDictSize) {
+            ip = iend - maxDictSize;
+            src = ip;
+            srcSize = maxDictSize;
+        }
+    }
+
+    DEBUGLOG(4, "ZSTD_loadDictionaryContent(): useRowMatchFinder=%d", (int)params->useRowMatchFinder);
+    ZSTD_window_update(&ms->window, src, srcSize, /* forceNonContiguous */ 0);
+    ms->loadedDictEnd = params->forceWindow ? 0 : (U32)(iend - ms->window.base);
+    ms->forceNonContiguous = params->deterministicRefPrefix;
+
+    if (loadLdmDict) {
+        ZSTD_window_update(&ls->window, src, srcSize, /* forceNonContiguous */ 0);
+        ls->loadedDictEnd = params->forceWindow ? 0 : (U32)(iend - ls->window.base);
+    }
+
+    if (srcSize <= HASH_READ_SIZE) return 0;
+
+    ZSTD_overflowCorrectIfNeeded(ms, ws, params, ip, iend);
+
+    if (loadLdmDict)
+        ZSTD_ldm_fillHashTable(ls, ip, iend, &params->ldmParams);
+
+    switch(params->cParams.strategy)
+    {
+    case ZSTD_fast:
+        ZSTD_fillHashTable(ms, iend, dtlm);
+        break;
+    case ZSTD_dfast:
+        ZSTD_fillDoubleHashTable(ms, iend, dtlm);
+        break;
+
+    case ZSTD_greedy:
+    case ZSTD_lazy:
+    case ZSTD_lazy2:
+        assert(srcSize >= HASH_READ_SIZE);
+        if (ms->dedicatedDictSearch) {
+            assert(ms->chainTable != NULL);
+            ZSTD_dedicatedDictSearch_lazy_loadDictionary(ms, iend-HASH_READ_SIZE);
+        } else {
+            assert(params->useRowMatchFinder != ZSTD_urm_auto);
+            if (params->useRowMatchFinder == ZSTD_urm_enableRowMatchFinder) {
+                size_t const tagTableSize = ((size_t)1 << params->cParams.hashLog) * sizeof(U16);
+                ZSTD_memset(ms->tagTable, 0, tagTableSize);
+                ZSTD_row_update(ms, iend-HASH_READ_SIZE);
+                DEBUGLOG(4, "Using row-based hash table for lazy dict");
+            } else {
+                ZSTD_insertAndFindFirstIndex(ms, iend-HASH_READ_SIZE);
+                DEBUGLOG(4, "Using chain-based hash table for lazy dict");
+            }
+        }
+        break;
+
+    case ZSTD_btlazy2:   /* we want the dictionary table fully sorted */
+    case ZSTD_btopt:
+    case ZSTD_btultra:
+    case ZSTD_btultra2:
+        assert(srcSize >= HASH_READ_SIZE);
+        ZSTD_updateTree(ms, iend-HASH_READ_SIZE, iend);
+        break;
+
+    default:
+        assert(0);  /* not possible : not a valid strategy id */
+    }
+
+    ms->nextToUpdate = (U32)(iend - ms->window.base);
+    return 0;
+}
+
+
+/* Dictionaries that assign zero probability to symbols that show up causes problems
+ * when FSE encoding. Mark dictionaries with zero probability symbols as FSE_repeat_check
+ * and only dictionaries with 100% valid symbols can be assumed valid.
+ */
+static FSE_repeat ZSTD_dictNCountRepeat(short* normalizedCounter, unsigned dictMaxSymbolValue, unsigned maxSymbolValue)
+{
+    U32 s;
+    if (dictMaxSymbolValue < maxSymbolValue) {
+        return FSE_repeat_check;
+    }
+    for (s = 0; s <= maxSymbolValue; ++s) {
+        if (normalizedCounter[s] == 0) {
+            return FSE_repeat_check;
+        }
+    }
+    return FSE_repeat_valid;
+}
+
+size_t ZSTD_loadCEntropy(ZSTD_compressedBlockState_t* bs, void* workspace,
+                         const void* const dict, size_t dictSize)
+{
+    short offcodeNCount[MaxOff+1];
+    unsigned offcodeMaxValue = MaxOff;
+    const BYTE* dictPtr = (const BYTE*)dict;    /* skip magic num and dict ID */
+    const BYTE* const dictEnd = dictPtr + dictSize;
+    dictPtr += 8;
+    bs->entropy.huf.repeatMode = HUF_repeat_check;
+
+    {   unsigned maxSymbolValue = 255;
+        unsigned hasZeroWeights = 1;
+        size_t const hufHeaderSize = HUF_readCTable((HUF_CElt*)bs->entropy.huf.CTable, &maxSymbolValue, dictPtr,
+            dictEnd-dictPtr, &hasZeroWeights);
+
+        /* We only set the loaded table as valid if it contains all non-zero
+         * weights. Otherwise, we set it to check */
+        if (!hasZeroWeights)
+            bs->entropy.huf.repeatMode = HUF_repeat_valid;
+
+        RETURN_ERROR_IF(HUF_isError(hufHeaderSize), dictionary_corrupted, "");
+        RETURN_ERROR_IF(maxSymbolValue < 255, dictionary_corrupted, "");
+        dictPtr += hufHeaderSize;
+    }
+
+    {   unsigned offcodeLog;
+        size_t const offcodeHeaderSize = FSE_readNCount(offcodeNCount, &offcodeMaxValue, &offcodeLog, dictPtr, dictEnd-dictPtr);
+        RETURN_ERROR_IF(FSE_isError(offcodeHeaderSize), dictionary_corrupted, "");
+        RETURN_ERROR_IF(offcodeLog > OffFSELog, dictionary_corrupted, "");
+        /* fill all offset symbols to avoid garbage at end of table */
+        RETURN_ERROR_IF(FSE_isError(FSE_buildCTable_wksp(
+                bs->entropy.fse.offcodeCTable,
+                offcodeNCount, MaxOff, offcodeLog,
+                workspace, HUF_WORKSPACE_SIZE)),
+            dictionary_corrupted, "");
+        /* Defer checking offcodeMaxValue because we need to know the size of the dictionary content */
+        dictPtr += offcodeHeaderSize;
+    }
+
+    {   short matchlengthNCount[MaxML+1];
+        unsigned matchlengthMaxValue = MaxML, matchlengthLog;
+        size_t const matchlengthHeaderSize = FSE_readNCount(matchlengthNCount, &matchlengthMaxValue, &matchlengthLog, dictPtr, dictEnd-dictPtr);
+        RETURN_ERROR_IF(FSE_isError(matchlengthHeaderSize), dictionary_corrupted, "");
+        RETURN_ERROR_IF(matchlengthLog > MLFSELog, dictionary_corrupted, "");
+        RETURN_ERROR_IF(FSE_isError(FSE_buildCTable_wksp(
+                bs->entropy.fse.matchlengthCTable,
+                matchlengthNCount, matchlengthMaxValue, matchlengthLog,
+                workspace, HUF_WORKSPACE_SIZE)),
+            dictionary_corrupted, "");
+        bs->entropy.fse.matchlength_repeatMode = ZSTD_dictNCountRepeat(matchlengthNCount, matchlengthMaxValue, MaxML);
+        dictPtr += matchlengthHeaderSize;
+    }
+
+    {   short litlengthNCount[MaxLL+1];
+        unsigned litlengthMaxValue = MaxLL, litlengthLog;
+        size_t const litlengthHeaderSize = FSE_readNCount(litlengthNCount, &litlengthMaxValue, &litlengthLog, dictPtr, dictEnd-dictPtr);
+        RETURN_ERROR_IF(FSE_isError(litlengthHeaderSize), dictionary_corrupted, "");
+        RETURN_ERROR_IF(litlengthLog > LLFSELog, dictionary_corrupted, "");
+        RETURN_ERROR_IF(FSE_isError(FSE_buildCTable_wksp(
+                bs->entropy.fse.litlengthCTable,
+                litlengthNCount, litlengthMaxValue, litlengthLog,
+                workspace, HUF_WORKSPACE_SIZE)),
+            dictionary_corrupted, "");
+        bs->entropy.fse.litlength_repeatMode = ZSTD_dictNCountRepeat(litlengthNCount, litlengthMaxValue, MaxLL);
+        dictPtr += litlengthHeaderSize;
+    }
+
+    RETURN_ERROR_IF(dictPtr+12 > dictEnd, dictionary_corrupted, "");
+    bs->rep[0] = MEM_readLE32(dictPtr+0);
+    bs->rep[1] = MEM_readLE32(dictPtr+4);
+    bs->rep[2] = MEM_readLE32(dictPtr+8);
+    dictPtr += 12;
+
+    {   size_t const dictContentSize = (size_t)(dictEnd - dictPtr);
+        U32 offcodeMax = MaxOff;
+        if (dictContentSize <= ((U32)-1) - 128 KB) {
+            U32 const maxOffset = (U32)dictContentSize + 128 KB; /* The maximum offset that must be supported */
+            offcodeMax = ZSTD_highbit32(maxOffset); /* Calculate minimum offset code required to represent maxOffset */
+        }
+        /* All offset values <= dictContentSize + 128 KB must be representable for a valid table */
+        bs->entropy.fse.offcode_repeatMode = ZSTD_dictNCountRepeat(offcodeNCount, offcodeMaxValue, MIN(offcodeMax, MaxOff));
+
+        /* All repCodes must be <= dictContentSize and != 0 */
+        {   U32 u;
+            for (u=0; u<3; u++) {
+                RETURN_ERROR_IF(bs->rep[u] == 0, dictionary_corrupted, "");
+                RETURN_ERROR_IF(bs->rep[u] > dictContentSize, dictionary_corrupted, "");
+    }   }   }
+
+    return dictPtr - (const BYTE*)dict;
+}
+
+/* Dictionary format :
+ * See :
+ * https://github.com/facebook/zstd/blob/release/doc/zstd_compression_format.md#dictionary-format
+ */
+/*! ZSTD_loadZstdDictionary() :
+ * @return : dictID, or an error code
+ *  assumptions : magic number supposed already checked
+ *                dictSize supposed >= 8
+ */
+static size_t ZSTD_loadZstdDictionary(ZSTD_compressedBlockState_t* bs,
+                                      ZSTD_matchState_t* ms,
+                                      ZSTD_cwksp* ws,
+                                      ZSTD_CCtx_params const* params,
+                                      const void* dict, size_t dictSize,
+                                      ZSTD_dictTableLoadMethod_e dtlm,
+                                      void* workspace)
+{
+    const BYTE* dictPtr = (const BYTE*)dict;
+    const BYTE* const dictEnd = dictPtr + dictSize;
+    size_t dictID;
+    size_t eSize;
+    ZSTD_STATIC_ASSERT(HUF_WORKSPACE_SIZE >= (1<<MAX(MLFSELog,LLFSELog)));
+    assert(dictSize >= 8);
+    assert(MEM_readLE32(dictPtr) == ZSTD_MAGIC_DICTIONARY);
+
+    dictID = params->fParams.noDictIDFlag ? 0 :  MEM_readLE32(dictPtr + 4 /* skip magic number */ );
+    eSize = ZSTD_loadCEntropy(bs, workspace, dict, dictSize);
+    FORWARD_IF_ERROR(eSize, "ZSTD_loadCEntropy failed");
+    dictPtr += eSize;
+
+    {
+        size_t const dictContentSize = (size_t)(dictEnd - dictPtr);
+        FORWARD_IF_ERROR(ZSTD_loadDictionaryContent(
+            ms, NULL, ws, params, dictPtr, dictContentSize, dtlm), "");
+    }
+    return dictID;
+}
+
+/** ZSTD_compress_insertDictionary() :
+*   @return : dictID, or an error code */
+static size_t
+ZSTD_compress_insertDictionary(ZSTD_compressedBlockState_t* bs,
+                               ZSTD_matchState_t* ms,
+                               ldmState_t* ls,
+                               ZSTD_cwksp* ws,
+                         const ZSTD_CCtx_params* params,
+                         const void* dict, size_t dictSize,
+                               ZSTD_dictContentType_e dictContentType,
+                               ZSTD_dictTableLoadMethod_e dtlm,
+                               void* workspace)
+{
+    DEBUGLOG(4, "ZSTD_compress_insertDictionary (dictSize=%u)", (U32)dictSize);
+    if ((dict==NULL) || (dictSize<8)) {
+        RETURN_ERROR_IF(dictContentType == ZSTD_dct_fullDict, dictionary_wrong, "");
+        return 0;
+    }
+
+    ZSTD_reset_compressedBlockState(bs);
+
+    /* dict restricted modes */
+    if (dictContentType == ZSTD_dct_rawContent)
+        return ZSTD_loadDictionaryContent(ms, ls, ws, params, dict, dictSize, dtlm);
+
+    if (MEM_readLE32(dict) != ZSTD_MAGIC_DICTIONARY) {
+        if (dictContentType == ZSTD_dct_auto) {
+            DEBUGLOG(4, "raw content dictionary detected");
+            return ZSTD_loadDictionaryContent(
+                ms, ls, ws, params, dict, dictSize, dtlm);
+        }
+        RETURN_ERROR_IF(dictContentType == ZSTD_dct_fullDict, dictionary_wrong, "");
+        assert(0);   /* impossible */
+    }
+
+    /* dict as full zstd dictionary */
+    return ZSTD_loadZstdDictionary(
+        bs, ms, ws, params, dict, dictSize, dtlm, workspace);
+}
+
+#define ZSTD_USE_CDICT_PARAMS_SRCSIZE_CUTOFF (128 KB)
+#define ZSTD_USE_CDICT_PARAMS_DICTSIZE_MULTIPLIER (6ULL)
+
+/*! ZSTD_compressBegin_internal() :
+ * @return : 0, or an error code */
+static size_t ZSTD_compressBegin_internal(ZSTD_CCtx* cctx,
+                                    const void* dict, size_t dictSize,
+                                    ZSTD_dictContentType_e dictContentType,
+                                    ZSTD_dictTableLoadMethod_e dtlm,
+                                    const ZSTD_CDict* cdict,
+                                    const ZSTD_CCtx_params* params, U64 pledgedSrcSize,
+                                    ZSTD_buffered_policy_e zbuff)
+{
+    size_t const dictContentSize = cdict ? cdict->dictContentSize : dictSize;
+#if ZSTD_TRACE
+    cctx->traceCtx = (ZSTD_trace_compress_begin != NULL) ? ZSTD_trace_compress_begin(cctx) : 0;
+#endif
+    DEBUGLOG(4, "ZSTD_compressBegin_internal: wlog=%u", params->cParams.windowLog);
+    /* params are supposed to be fully validated at this point */
+    assert(!ZSTD_isError(ZSTD_checkCParams(params->cParams)));
+    assert(!((dict) && (cdict)));  /* either dict or cdict, not both */
+    if ( (cdict)
+      && (cdict->dictContentSize > 0)
+      && ( pledgedSrcSize < ZSTD_USE_CDICT_PARAMS_SRCSIZE_CUTOFF
+        || pledgedSrcSize < cdict->dictContentSize * ZSTD_USE_CDICT_PARAMS_DICTSIZE_MULTIPLIER
+        || pledgedSrcSize == ZSTD_CONTENTSIZE_UNKNOWN
+        || cdict->compressionLevel == 0)
+      && (params->attachDictPref != ZSTD_dictForceLoad) ) {
+        return ZSTD_resetCCtx_usingCDict(cctx, cdict, params, pledgedSrcSize, zbuff);
+    }
+
+    FORWARD_IF_ERROR( ZSTD_resetCCtx_internal(cctx, params, pledgedSrcSize,
+                                     dictContentSize,
+                                     ZSTDcrp_makeClean, zbuff) , "");
+    {   size_t const dictID = cdict ?
+                ZSTD_compress_insertDictionary(
+                        cctx->blockState.prevCBlock, &cctx->blockState.matchState,
+                        &cctx->ldmState, &cctx->workspace, &cctx->appliedParams, cdict->dictContent,
+                        cdict->dictContentSize, cdict->dictContentType, dtlm,
+                        cctx->entropyWorkspace)
+              : ZSTD_compress_insertDictionary(
+                        cctx->blockState.prevCBlock, &cctx->blockState.matchState,
+                        &cctx->ldmState, &cctx->workspace, &cctx->appliedParams, dict, dictSize,
+                        dictContentType, dtlm, cctx->entropyWorkspace);
+        FORWARD_IF_ERROR(dictID, "ZSTD_compress_insertDictionary failed");
+        assert(dictID <= UINT_MAX);
+        cctx->dictID = (U32)dictID;
+        cctx->dictContentSize = dictContentSize;
+    }
+    return 0;
+}
+
+size_t ZSTD_compressBegin_advanced_internal(ZSTD_CCtx* cctx,
+                                    const void* dict, size_t dictSize,
+                                    ZSTD_dictContentType_e dictContentType,
+                                    ZSTD_dictTableLoadMethod_e dtlm,
+                                    const ZSTD_CDict* cdict,
+                                    const ZSTD_CCtx_params* params,
+                                    unsigned long long pledgedSrcSize)
+{
+    DEBUGLOG(4, "ZSTD_compressBegin_advanced_internal: wlog=%u", params->cParams.windowLog);
+    /* compression parameters verification and optimization */
+    FORWARD_IF_ERROR( ZSTD_checkCParams(params->cParams) , "");
+    return ZSTD_compressBegin_internal(cctx,
+                                       dict, dictSize, dictContentType, dtlm,
+                                       cdict,
+                                       params, pledgedSrcSize,
+                                       ZSTDb_not_buffered);
+}
+
+/*! ZSTD_compressBegin_advanced() :
+*   @return : 0, or an error code */
+size_t ZSTD_compressBegin_advanced(ZSTD_CCtx* cctx,
+                             const void* dict, size_t dictSize,
+                                   ZSTD_parameters params, unsigned long long pledgedSrcSize)
+{
+    ZSTD_CCtx_params cctxParams;
+    ZSTD_CCtxParams_init_internal(&cctxParams, &params, ZSTD_NO_CLEVEL);
+    return ZSTD_compressBegin_advanced_internal(cctx,
+                                            dict, dictSize, ZSTD_dct_auto, ZSTD_dtlm_fast,
+                                            NULL /*cdict*/,
+                                            &cctxParams, pledgedSrcSize);
+}
+
+size_t ZSTD_compressBegin_usingDict(ZSTD_CCtx* cctx, const void* dict, size_t dictSize, int compressionLevel)
+{
+    ZSTD_CCtx_params cctxParams;
+    {
+        ZSTD_parameters const params = ZSTD_getParams_internal(compressionLevel, ZSTD_CONTENTSIZE_UNKNOWN, dictSize, ZSTD_cpm_noAttachDict);
+        ZSTD_CCtxParams_init_internal(&cctxParams, &params, (compressionLevel == 0) ? ZSTD_CLEVEL_DEFAULT : compressionLevel);
+    }
+    DEBUGLOG(4, "ZSTD_compressBegin_usingDict (dictSize=%u)", (unsigned)dictSize);
+    return ZSTD_compressBegin_internal(cctx, dict, dictSize, ZSTD_dct_auto, ZSTD_dtlm_fast, NULL,
+                                       &cctxParams, ZSTD_CONTENTSIZE_UNKNOWN, ZSTDb_not_buffered);
+}
+
+size_t ZSTD_compressBegin(ZSTD_CCtx* cctx, int compressionLevel)
+{
+    return ZSTD_compressBegin_usingDict(cctx, NULL, 0, compressionLevel);
+}
+
+
+/*! ZSTD_writeEpilogue() :
+*   Ends a frame.
+*   @return : nb of bytes written into dst (or an error code) */
+static size_t ZSTD_writeEpilogue(ZSTD_CCtx* cctx, void* dst, size_t dstCapacity)
+{
+    BYTE* const ostart = (BYTE*)dst;
+    BYTE* op = ostart;
+    size_t fhSize = 0;
+
+    DEBUGLOG(4, "ZSTD_writeEpilogue");
+    RETURN_ERROR_IF(cctx->stage == ZSTDcs_created, stage_wrong, "init missing");
+
+    /* special case : empty frame */
+    if (cctx->stage == ZSTDcs_init) {
+        fhSize = ZSTD_writeFrameHeader(dst, dstCapacity, &cctx->appliedParams, 0, 0);
+        FORWARD_IF_ERROR(fhSize, "ZSTD_writeFrameHeader failed");
+        dstCapacity -= fhSize;
+        op += fhSize;
+        cctx->stage = ZSTDcs_ongoing;
+    }
+
+    if (cctx->stage != ZSTDcs_ending) {
+        /* write one last empty block, make it the "last" block */
+        U32 const cBlockHeader24 = 1 /* last block */ + (((U32)bt_raw)<<1) + 0;
+        RETURN_ERROR_IF(dstCapacity<4, dstSize_tooSmall, "no room for epilogue");
+        MEM_writeLE32(op, cBlockHeader24);
+        op += ZSTD_blockHeaderSize;
+        dstCapacity -= ZSTD_blockHeaderSize;
+    }
+
+    if (cctx->appliedParams.fParams.checksumFlag) {
+        U32 const checksum = (U32) XXH64_digest(&cctx->xxhState);
+        RETURN_ERROR_IF(dstCapacity<4, dstSize_tooSmall, "no room for checksum");
+        DEBUGLOG(4, "ZSTD_writeEpilogue: write checksum : %08X", (unsigned)checksum);
+        MEM_writeLE32(op, checksum);
+        op += 4;
+    }
+
+    cctx->stage = ZSTDcs_created;  /* return to "created but no init" status */
+    return op-ostart;
+}
+
+void ZSTD_CCtx_trace(ZSTD_CCtx* cctx, size_t extraCSize)
+{
+#if ZSTD_TRACE
+    if (cctx->traceCtx && ZSTD_trace_compress_end != NULL) {
+        int const streaming = cctx->inBuffSize > 0 || cctx->outBuffSize > 0 || cctx->appliedParams.nbWorkers > 0;
+        ZSTD_Trace trace;
+        ZSTD_memset(&trace, 0, sizeof(trace));
+        trace.version = ZSTD_VERSION_NUMBER;
+        trace.streaming = streaming;
+        trace.dictionaryID = cctx->dictID;
+        trace.dictionarySize = cctx->dictContentSize;
+        trace.uncompressedSize = cctx->consumedSrcSize;
+        trace.compressedSize = cctx->producedCSize + extraCSize;
+        trace.params = &cctx->appliedParams;
+        trace.cctx = cctx;
+        ZSTD_trace_compress_end(cctx->traceCtx, &trace);
+    }
+    cctx->traceCtx = 0;
+#else
+    (void)cctx;
+    (void)extraCSize;
+#endif
+}
+
+size_t ZSTD_compressEnd (ZSTD_CCtx* cctx,
+                         void* dst, size_t dstCapacity,
+                   const void* src, size_t srcSize)
+{
+    size_t endResult;
+    size_t const cSize = ZSTD_compressContinue_internal(cctx,
+                                dst, dstCapacity, src, srcSize,
+                                1 /* frame mode */, 1 /* last chunk */);
+    FORWARD_IF_ERROR(cSize, "ZSTD_compressContinue_internal failed");
+    endResult = ZSTD_writeEpilogue(cctx, (char*)dst + cSize, dstCapacity-cSize);
+    FORWARD_IF_ERROR(endResult, "ZSTD_writeEpilogue failed");
+    assert(!(cctx->appliedParams.fParams.contentSizeFlag && cctx->pledgedSrcSizePlusOne == 0));
+    if (cctx->pledgedSrcSizePlusOne != 0) {  /* control src size */
+        ZSTD_STATIC_ASSERT(ZSTD_CONTENTSIZE_UNKNOWN == (unsigned long long)-1);
+        DEBUGLOG(4, "end of frame : controlling src size");
+        RETURN_ERROR_IF(
+            cctx->pledgedSrcSizePlusOne != cctx->consumedSrcSize+1,
+            srcSize_wrong,
+             "error : pledgedSrcSize = %u, while realSrcSize = %u",
+            (unsigned)cctx->pledgedSrcSizePlusOne-1,
+            (unsigned)cctx->consumedSrcSize);
+    }
+    ZSTD_CCtx_trace(cctx, endResult);
+    return cSize + endResult;
+}
+
+size_t ZSTD_compress_advanced (ZSTD_CCtx* cctx,
+                               void* dst, size_t dstCapacity,
+                         const void* src, size_t srcSize,
+                         const void* dict,size_t dictSize,
+                               ZSTD_parameters params)
+{
+    DEBUGLOG(4, "ZSTD_compress_advanced");
+    FORWARD_IF_ERROR(ZSTD_checkCParams(params.cParams), "");
+    ZSTD_CCtxParams_init_internal(&cctx->simpleApiParams, &params, ZSTD_NO_CLEVEL);
+    return ZSTD_compress_advanced_internal(cctx,
+                                           dst, dstCapacity,
+                                           src, srcSize,
+                                           dict, dictSize,
+                                           &cctx->simpleApiParams);
+}
+
+/* Internal */
+size_t ZSTD_compress_advanced_internal(
+        ZSTD_CCtx* cctx,
+        void* dst, size_t dstCapacity,
+        const void* src, size_t srcSize,
+        const void* dict,size_t dictSize,
+        const ZSTD_CCtx_params* params)
+{
+    DEBUGLOG(4, "ZSTD_compress_advanced_internal (srcSize:%u)", (unsigned)srcSize);
+    FORWARD_IF_ERROR( ZSTD_compressBegin_internal(cctx,
+                         dict, dictSize, ZSTD_dct_auto, ZSTD_dtlm_fast, NULL,
+                         params, srcSize, ZSTDb_not_buffered) , "");
+    return ZSTD_compressEnd(cctx, dst, dstCapacity, src, srcSize);
+}
+
+size_t ZSTD_compress_usingDict(ZSTD_CCtx* cctx,
+                               void* dst, size_t dstCapacity,
+                         const void* src, size_t srcSize,
+                         const void* dict, size_t dictSize,
+                               int compressionLevel)
+{
+    {
+        ZSTD_parameters const params = ZSTD_getParams_internal(compressionLevel, srcSize, dict ? dictSize : 0, ZSTD_cpm_noAttachDict);
+        assert(params.fParams.contentSizeFlag == 1);
+        ZSTD_CCtxParams_init_internal(&cctx->simpleApiParams, &params, (compressionLevel == 0) ? ZSTD_CLEVEL_DEFAULT: compressionLevel);
+    }
+    DEBUGLOG(4, "ZSTD_compress_usingDict (srcSize=%u)", (unsigned)srcSize);
+    return ZSTD_compress_advanced_internal(cctx, dst, dstCapacity, src, srcSize, dict, dictSize, &cctx->simpleApiParams);
+}
+
+size_t ZSTD_compressCCtx(ZSTD_CCtx* cctx,
+                         void* dst, size_t dstCapacity,
+                   const void* src, size_t srcSize,
+                         int compressionLevel)
+{
+    DEBUGLOG(4, "ZSTD_compressCCtx (srcSize=%u)", (unsigned)srcSize);
+    assert(cctx != NULL);
+    return ZSTD_compress_usingDict(cctx, dst, dstCapacity, src, srcSize, NULL, 0, compressionLevel);
+}
+
+size_t ZSTD_compress(void* dst, size_t dstCapacity,
+               const void* src, size_t srcSize,
+                     int compressionLevel)
+{
+    size_t result;
+#if ZSTD_COMPRESS_HEAPMODE
+    ZSTD_CCtx* cctx = ZSTD_createCCtx();
+    RETURN_ERROR_IF(!cctx, memory_allocation, "ZSTD_createCCtx failed");
+    result = ZSTD_compressCCtx(cctx, dst, dstCapacity, src, srcSize, compressionLevel);
+    ZSTD_freeCCtx(cctx);
+#else
+    ZSTD_CCtx ctxBody;
+    ZSTD_initCCtx(&ctxBody, ZSTD_defaultCMem);
+    result = ZSTD_compressCCtx(&ctxBody, dst, dstCapacity, src, srcSize, compressionLevel);
+    ZSTD_freeCCtxContent(&ctxBody);   /* can't free ctxBody itself, as it's on stack; free only heap content */
+#endif
+    return result;
+}
+
+
+/* =====  Dictionary API  ===== */
+
+/*! ZSTD_estimateCDictSize_advanced() :
+ *  Estimate amount of memory that will be needed to create a dictionary with following arguments */
+size_t ZSTD_estimateCDictSize_advanced(
+        size_t dictSize, ZSTD_compressionParameters cParams,
+        ZSTD_dictLoadMethod_e dictLoadMethod)
+{
+    DEBUGLOG(5, "sizeof(ZSTD_CDict) : %u", (unsigned)sizeof(ZSTD_CDict));
+    return ZSTD_cwksp_alloc_size(sizeof(ZSTD_CDict))
+         + ZSTD_cwksp_alloc_size(HUF_WORKSPACE_SIZE)
+         /* enableDedicatedDictSearch == 1 ensures that CDict estimation will not be too small
+          * in case we are using DDS with row-hash. */
+         + ZSTD_sizeof_matchState(&cParams, ZSTD_resolveRowMatchFinderMode(ZSTD_urm_auto, &cParams),
+                                  /* enableDedicatedDictSearch */ 1, /* forCCtx */ 0)
+         + (dictLoadMethod == ZSTD_dlm_byRef ? 0
+            : ZSTD_cwksp_alloc_size(ZSTD_cwksp_align(dictSize, sizeof(void *))));
+}
+
+size_t ZSTD_estimateCDictSize(size_t dictSize, int compressionLevel)
+{
+    ZSTD_compressionParameters const cParams = ZSTD_getCParams_internal(compressionLevel, ZSTD_CONTENTSIZE_UNKNOWN, dictSize, ZSTD_cpm_createCDict);
+    return ZSTD_estimateCDictSize_advanced(dictSize, cParams, ZSTD_dlm_byCopy);
+}
+
+size_t ZSTD_sizeof_CDict(const ZSTD_CDict* cdict)
+{
+    if (cdict==NULL) return 0;   /* support sizeof on NULL */
+    DEBUGLOG(5, "sizeof(*cdict) : %u", (unsigned)sizeof(*cdict));
+    /* cdict may be in the workspace */
+    return (cdict->workspace.workspace == cdict ? 0 : sizeof(*cdict))
+        + ZSTD_cwksp_sizeof(&cdict->workspace);
+}
+
+static size_t ZSTD_initCDict_internal(
+                    ZSTD_CDict* cdict,
+              const void* dictBuffer, size_t dictSize,
+                    ZSTD_dictLoadMethod_e dictLoadMethod,
+                    ZSTD_dictContentType_e dictContentType,
+                    ZSTD_CCtx_params params)
+{
+    DEBUGLOG(3, "ZSTD_initCDict_internal (dictContentType:%u)", (unsigned)dictContentType);
+    assert(!ZSTD_checkCParams(params.cParams));
+    cdict->matchState.cParams = params.cParams;
+    cdict->matchState.dedicatedDictSearch = params.enableDedicatedDictSearch;
+    if ((dictLoadMethod == ZSTD_dlm_byRef) || (!dictBuffer) || (!dictSize)) {
+        cdict->dictContent = dictBuffer;
+    } else {
+         void *internalBuffer = ZSTD_cwksp_reserve_object(&cdict->workspace, ZSTD_cwksp_align(dictSize, sizeof(void*)));
+        RETURN_ERROR_IF(!internalBuffer, memory_allocation, "NULL pointer!");
+        cdict->dictContent = internalBuffer;
+        ZSTD_memcpy(internalBuffer, dictBuffer, dictSize);
+    }
+    cdict->dictContentSize = dictSize;
+    cdict->dictContentType = dictContentType;
+
+    cdict->entropyWorkspace = (U32*)ZSTD_cwksp_reserve_object(&cdict->workspace, HUF_WORKSPACE_SIZE);
+
+
+    /* Reset the state to no dictionary */
+    ZSTD_reset_compressedBlockState(&cdict->cBlockState);
+    FORWARD_IF_ERROR(ZSTD_reset_matchState(
+        &cdict->matchState,
+        &cdict->workspace,
+        &params.cParams,
+        params.useRowMatchFinder,
+        ZSTDcrp_makeClean,
+        ZSTDirp_reset,
+        ZSTD_resetTarget_CDict), "");
+    /* (Maybe) load the dictionary
+     * Skips loading the dictionary if it is < 8 bytes.
+     */
+    {   params.compressionLevel = ZSTD_CLEVEL_DEFAULT;
+        params.fParams.contentSizeFlag = 1;
+        {   size_t const dictID = ZSTD_compress_insertDictionary(
+                    &cdict->cBlockState, &cdict->matchState, NULL, &cdict->workspace,
+                    &params, cdict->dictContent, cdict->dictContentSize,
+                    dictContentType, ZSTD_dtlm_full, cdict->entropyWorkspace);
+            FORWARD_IF_ERROR(dictID, "ZSTD_compress_insertDictionary failed");
+            assert(dictID <= (size_t)(U32)-1);
+            cdict->dictID = (U32)dictID;
+        }
+    }
+
+    return 0;
+}
+
+static ZSTD_CDict* ZSTD_createCDict_advanced_internal(size_t dictSize,
+                                      ZSTD_dictLoadMethod_e dictLoadMethod,
+                                      ZSTD_compressionParameters cParams,
+                                      ZSTD_useRowMatchFinderMode_e useRowMatchFinder,
+                                      U32 enableDedicatedDictSearch,
+                                      ZSTD_customMem customMem)
+{
+    if ((!customMem.customAlloc) ^ (!customMem.customFree)) return NULL;
+
+    {   size_t const workspaceSize =
+            ZSTD_cwksp_alloc_size(sizeof(ZSTD_CDict)) +
+            ZSTD_cwksp_alloc_size(HUF_WORKSPACE_SIZE) +
+            ZSTD_sizeof_matchState(&cParams, useRowMatchFinder, enableDedicatedDictSearch, /* forCCtx */ 0) +
+            (dictLoadMethod == ZSTD_dlm_byRef ? 0
+             : ZSTD_cwksp_alloc_size(ZSTD_cwksp_align(dictSize, sizeof(void*))));
+        void* const workspace = ZSTD_customMalloc(workspaceSize, customMem);
+        ZSTD_cwksp ws;
+        ZSTD_CDict* cdict;
+
+        if (!workspace) {
+            ZSTD_customFree(workspace, customMem);
+            return NULL;
+        }
+
+        ZSTD_cwksp_init(&ws, workspace, workspaceSize, ZSTD_cwksp_dynamic_alloc);
+
+        cdict = (ZSTD_CDict*)ZSTD_cwksp_reserve_object(&ws, sizeof(ZSTD_CDict));
+        assert(cdict != NULL);
+        ZSTD_cwksp_move(&cdict->workspace, &ws);
+        cdict->customMem = customMem;
+        cdict->compressionLevel = ZSTD_NO_CLEVEL; /* signals advanced API usage */
+        cdict->useRowMatchFinder = useRowMatchFinder;
+        return cdict;
+    }
+}
+
+ZSTD_CDict* ZSTD_createCDict_advanced(const void* dictBuffer, size_t dictSize,
+                                      ZSTD_dictLoadMethod_e dictLoadMethod,
+                                      ZSTD_dictContentType_e dictContentType,
+                                      ZSTD_compressionParameters cParams,
+                                      ZSTD_customMem customMem)
+{
+    ZSTD_CCtx_params cctxParams;
+    ZSTD_memset(&cctxParams, 0, sizeof(cctxParams));
+    ZSTD_CCtxParams_init(&cctxParams, 0);
+    cctxParams.cParams = cParams;
+    cctxParams.customMem = customMem;
+    return ZSTD_createCDict_advanced2(
+        dictBuffer, dictSize,
+        dictLoadMethod, dictContentType,
+        &cctxParams, customMem);
+}
+
+ZSTDLIB_API ZSTD_CDict* ZSTD_createCDict_advanced2(
+        const void* dict, size_t dictSize,
+        ZSTD_dictLoadMethod_e dictLoadMethod,
+        ZSTD_dictContentType_e dictContentType,
+        const ZSTD_CCtx_params* originalCctxParams,
+        ZSTD_customMem customMem)
+{
+    ZSTD_CCtx_params cctxParams = *originalCctxParams;
+    ZSTD_compressionParameters cParams;
+    ZSTD_CDict* cdict;
+
+    DEBUGLOG(3, "ZSTD_createCDict_advanced2, mode %u", (unsigned)dictContentType);
+    if (!customMem.customAlloc ^ !customMem.customFree) return NULL;
+
+    if (cctxParams.enableDedicatedDictSearch) {
+        cParams = ZSTD_dedicatedDictSearch_getCParams(
+            cctxParams.compressionLevel, dictSize);
+        ZSTD_overrideCParams(&cParams, &cctxParams.cParams);
+    } else {
+        cParams = ZSTD_getCParamsFromCCtxParams(
+            &cctxParams, ZSTD_CONTENTSIZE_UNKNOWN, dictSize, ZSTD_cpm_createCDict);
+    }
+
+    if (!ZSTD_dedicatedDictSearch_isSupported(&cParams)) {
+        /* Fall back to non-DDSS params */
+        cctxParams.enableDedicatedDictSearch = 0;
+        cParams = ZSTD_getCParamsFromCCtxParams(
+            &cctxParams, ZSTD_CONTENTSIZE_UNKNOWN, dictSize, ZSTD_cpm_createCDict);
+    }
+
+    DEBUGLOG(3, "ZSTD_createCDict_advanced2: DDS: %u", cctxParams.enableDedicatedDictSearch);
+    cctxParams.cParams = cParams;
+    cctxParams.useRowMatchFinder = ZSTD_resolveRowMatchFinderMode(cctxParams.useRowMatchFinder, &cParams);
+
+    cdict = ZSTD_createCDict_advanced_internal(dictSize,
+                        dictLoadMethod, cctxParams.cParams,
+                        cctxParams.useRowMatchFinder, cctxParams.enableDedicatedDictSearch,
+                        customMem);
+
+    if (ZSTD_isError( ZSTD_initCDict_internal(cdict,
+                                    dict, dictSize,
+                                    dictLoadMethod, dictContentType,
+                                    cctxParams) )) {
+        ZSTD_freeCDict(cdict);
+        return NULL;
+    }
+
+    return cdict;
+}
+
+ZSTD_CDict* ZSTD_createCDict(const void* dict, size_t dictSize, int compressionLevel)
+{
+    ZSTD_compressionParameters cParams = ZSTD_getCParams_internal(compressionLevel, ZSTD_CONTENTSIZE_UNKNOWN, dictSize, ZSTD_cpm_createCDict);
+    ZSTD_CDict* const cdict = ZSTD_createCDict_advanced(dict, dictSize,
+                                                  ZSTD_dlm_byCopy, ZSTD_dct_auto,
+                                                  cParams, ZSTD_defaultCMem);
+    if (cdict)
+        cdict->compressionLevel = (compressionLevel == 0) ? ZSTD_CLEVEL_DEFAULT : compressionLevel;
+    return cdict;
+}
+
+ZSTD_CDict* ZSTD_createCDict_byReference(const void* dict, size_t dictSize, int compressionLevel)
+{
+    ZSTD_compressionParameters cParams = ZSTD_getCParams_internal(compressionLevel, ZSTD_CONTENTSIZE_UNKNOWN, dictSize, ZSTD_cpm_createCDict);
+    ZSTD_CDict* const cdict = ZSTD_createCDict_advanced(dict, dictSize,
+                                     ZSTD_dlm_byRef, ZSTD_dct_auto,
+                                     cParams, ZSTD_defaultCMem);
+    if (cdict)
+        cdict->compressionLevel = (compressionLevel == 0) ? ZSTD_CLEVEL_DEFAULT : compressionLevel;
+    return cdict;
+}
+
+size_t ZSTD_freeCDict(ZSTD_CDict* cdict)
+{
+    if (cdict==NULL) return 0;   /* support free on NULL */
+    {   ZSTD_customMem const cMem = cdict->customMem;
+        int cdictInWorkspace = ZSTD_cwksp_owns_buffer(&cdict->workspace, cdict);
+        ZSTD_cwksp_free(&cdict->workspace, cMem);
+        if (!cdictInWorkspace) {
+            ZSTD_customFree(cdict, cMem);
+        }
+        return 0;
+    }
+}
+
+/*! ZSTD_initStaticCDict_advanced() :
+ *  Generate a digested dictionary in provided memory area.
+ *  workspace: The memory area to emplace the dictionary into.
+ *             Provided pointer must 8-bytes aligned.
+ *             It must outlive dictionary usage.
+ *  workspaceSize: Use ZSTD_estimateCDictSize()
+ *                 to determine how large workspace must be.
+ *  cParams : use ZSTD_getCParams() to transform a compression level
+ *            into its relevants cParams.
+ * @return : pointer to ZSTD_CDict*, or NULL if error (size too small)
+ *  Note : there is no corresponding "free" function.
+ *         Since workspace was allocated externally, it must be freed externally.
+ */
+const ZSTD_CDict* ZSTD_initStaticCDict(
+                                 void* workspace, size_t workspaceSize,
+                           const void* dict, size_t dictSize,
+                                 ZSTD_dictLoadMethod_e dictLoadMethod,
+                                 ZSTD_dictContentType_e dictContentType,
+                                 ZSTD_compressionParameters cParams)
+{
+    ZSTD_useRowMatchFinderMode_e const useRowMatchFinder = ZSTD_resolveRowMatchFinderMode(ZSTD_urm_auto, &cParams);
+    /* enableDedicatedDictSearch == 1 ensures matchstate is not too small in case this CDict will be used for DDS + row hash */
+    size_t const matchStateSize = ZSTD_sizeof_matchState(&cParams, useRowMatchFinder, /* enableDedicatedDictSearch */ 1, /* forCCtx */ 0);
+    size_t const neededSize = ZSTD_cwksp_alloc_size(sizeof(ZSTD_CDict))
+                            + (dictLoadMethod == ZSTD_dlm_byRef ? 0
+                               : ZSTD_cwksp_alloc_size(ZSTD_cwksp_align(dictSize, sizeof(void*))))
+                            + ZSTD_cwksp_alloc_size(HUF_WORKSPACE_SIZE)
+                            + matchStateSize;
+    ZSTD_CDict* cdict;
+    ZSTD_CCtx_params params;
+
+    if ((size_t)workspace & 7) return NULL;  /* 8-aligned */
+
+    {
+        ZSTD_cwksp ws;
+        ZSTD_cwksp_init(&ws, workspace, workspaceSize, ZSTD_cwksp_static_alloc);
+        cdict = (ZSTD_CDict*)ZSTD_cwksp_reserve_object(&ws, sizeof(ZSTD_CDict));
+        if (cdict == NULL) return NULL;
+        ZSTD_cwksp_move(&cdict->workspace, &ws);
+    }
+
+    DEBUGLOG(4, "(workspaceSize < neededSize) : (%u < %u) => %u",
+        (unsigned)workspaceSize, (unsigned)neededSize, (unsigned)(workspaceSize < neededSize));
+    if (workspaceSize < neededSize) return NULL;
+
+    ZSTD_CCtxParams_init(&params, 0);
+    params.cParams = cParams;
+    params.useRowMatchFinder = useRowMatchFinder;
+    cdict->useRowMatchFinder = useRowMatchFinder;
+
+    if (ZSTD_isError( ZSTD_initCDict_internal(cdict,
+                                              dict, dictSize,
+                                              dictLoadMethod, dictContentType,
+                                              params) ))
+        return NULL;
+
+    return cdict;
+}
+
+ZSTD_compressionParameters ZSTD_getCParamsFromCDict(const ZSTD_CDict* cdict)
+{
+    assert(cdict != NULL);
+    return cdict->matchState.cParams;
+}
+
+/*! ZSTD_getDictID_fromCDict() :
+ *  Provides the dictID of the dictionary loaded into `cdict`.
+ *  If @return == 0, the dictionary is not conformant to Zstandard specification, or empty.
+ *  Non-conformant dictionaries can still be loaded, but as content-only dictionaries. */
+unsigned ZSTD_getDictID_fromCDict(const ZSTD_CDict* cdict)
+{
+    if (cdict==NULL) return 0;
+    return cdict->dictID;
+}
+
+/* ZSTD_compressBegin_usingCDict_internal() :
+ * Implementation of various ZSTD_compressBegin_usingCDict* functions.
+ */
+static size_t ZSTD_compressBegin_usingCDict_internal(
+    ZSTD_CCtx* const cctx, const ZSTD_CDict* const cdict,
+    ZSTD_frameParameters const fParams, unsigned long long const pledgedSrcSize)
+{
+    ZSTD_CCtx_params cctxParams;
+    DEBUGLOG(4, "ZSTD_compressBegin_usingCDict_internal");
+    RETURN_ERROR_IF(cdict==NULL, dictionary_wrong, "NULL pointer!");
+    /* Initialize the cctxParams from the cdict */
+    {
+        ZSTD_parameters params;
+        params.fParams = fParams;
+        params.cParams = ( pledgedSrcSize < ZSTD_USE_CDICT_PARAMS_SRCSIZE_CUTOFF
+                        || pledgedSrcSize < cdict->dictContentSize * ZSTD_USE_CDICT_PARAMS_DICTSIZE_MULTIPLIER
+                        || pledgedSrcSize == ZSTD_CONTENTSIZE_UNKNOWN
+                        || cdict->compressionLevel == 0 ) ?
+                ZSTD_getCParamsFromCDict(cdict)
+              : ZSTD_getCParams(cdict->compressionLevel,
+                                pledgedSrcSize,
+                                cdict->dictContentSize);
+        ZSTD_CCtxParams_init_internal(&cctxParams, &params, cdict->compressionLevel);
+    }
+    /* Increase window log to fit the entire dictionary and source if the
+     * source size is known. Limit the increase to 19, which is the
+     * window log for compression level 1 with the largest source size.
+     */
+    if (pledgedSrcSize != ZSTD_CONTENTSIZE_UNKNOWN) {
+        U32 const limitedSrcSize = (U32)MIN(pledgedSrcSize, 1U << 19);
+        U32 const limitedSrcLog = limitedSrcSize > 1 ? ZSTD_highbit32(limitedSrcSize - 1) + 1 : 1;
+        cctxParams.cParams.windowLog = MAX(cctxParams.cParams.windowLog, limitedSrcLog);
+    }
+    return ZSTD_compressBegin_internal(cctx,
+                                        NULL, 0, ZSTD_dct_auto, ZSTD_dtlm_fast,
+                                        cdict,
+                                        &cctxParams, pledgedSrcSize,
+                                        ZSTDb_not_buffered);
+}
+
+
+/* ZSTD_compressBegin_usingCDict_advanced() :
+ * This function is DEPRECATED.
+ * cdict must be != NULL */
+size_t ZSTD_compressBegin_usingCDict_advanced(
+    ZSTD_CCtx* const cctx, const ZSTD_CDict* const cdict,
+    ZSTD_frameParameters const fParams, unsigned long long const pledgedSrcSize)
+{
+    return ZSTD_compressBegin_usingCDict_internal(cctx, cdict, fParams, pledgedSrcSize);
+}
+
+/* ZSTD_compressBegin_usingCDict() :
+ * cdict must be != NULL */
+size_t ZSTD_compressBegin_usingCDict(ZSTD_CCtx* cctx, const ZSTD_CDict* cdict)
+{
+    ZSTD_frameParameters const fParams = { 0 /*content*/, 0 /*checksum*/, 0 /*noDictID*/ };
+    return ZSTD_compressBegin_usingCDict_internal(cctx, cdict, fParams, ZSTD_CONTENTSIZE_UNKNOWN);
+}
+
+/*! ZSTD_compress_usingCDict_internal():
+ * Implementation of various ZSTD_compress_usingCDict* functions.
+ */
+static size_t ZSTD_compress_usingCDict_internal(ZSTD_CCtx* cctx,
+                                void* dst, size_t dstCapacity,
+                                const void* src, size_t srcSize,
+                                const ZSTD_CDict* cdict, ZSTD_frameParameters fParams)
+{
+    FORWARD_IF_ERROR(ZSTD_compressBegin_usingCDict_internal(cctx, cdict, fParams, srcSize), ""); /* will check if cdict != NULL */
+    return ZSTD_compressEnd(cctx, dst, dstCapacity, src, srcSize);
+}
+
+/*! ZSTD_compress_usingCDict_advanced():
+ * This function is DEPRECATED.
+ */
+size_t ZSTD_compress_usingCDict_advanced(ZSTD_CCtx* cctx,
+                                void* dst, size_t dstCapacity,
+                                const void* src, size_t srcSize,
+                                const ZSTD_CDict* cdict, ZSTD_frameParameters fParams)
+{
+    return ZSTD_compress_usingCDict_internal(cctx, dst, dstCapacity, src, srcSize, cdict, fParams);
+}
+
+/*! ZSTD_compress_usingCDict() :
+ *  Compression using a digested Dictionary.
+ *  Faster startup than ZSTD_compress_usingDict(), recommended when same dictionary is used multiple times.
+ *  Note that compression parameters are decided at CDict creation time
+ *  while frame parameters are hardcoded */
+size_t ZSTD_compress_usingCDict(ZSTD_CCtx* cctx,
+                                void* dst, size_t dstCapacity,
+                                const void* src, size_t srcSize,
+                                const ZSTD_CDict* cdict)
+{
+    ZSTD_frameParameters const fParams = { 1 /*content*/, 0 /*checksum*/, 0 /*noDictID*/ };
+    return ZSTD_compress_usingCDict_internal(cctx, dst, dstCapacity, src, srcSize, cdict, fParams);
+}
+
+
+
+/* ******************************************************************
+*  Streaming
+********************************************************************/
+
+ZSTD_CStream* ZSTD_createCStream(void)
+{
+    DEBUGLOG(3, "ZSTD_createCStream");
+    return ZSTD_createCStream_advanced(ZSTD_defaultCMem);
+}
+
+ZSTD_CStream* ZSTD_initStaticCStream(void *workspace, size_t workspaceSize)
+{
+    return ZSTD_initStaticCCtx(workspace, workspaceSize);
+}
+
+ZSTD_CStream* ZSTD_createCStream_advanced(ZSTD_customMem customMem)
+{   /* CStream and CCtx are now same object */
+    return ZSTD_createCCtx_advanced(customMem);
+}
+
+size_t ZSTD_freeCStream(ZSTD_CStream* zcs)
+{
+    return ZSTD_freeCCtx(zcs);   /* same object */
+}
+
+
+
+/*======   Initialization   ======*/
+
+size_t ZSTD_CStreamInSize(void)  { return ZSTD_BLOCKSIZE_MAX; }
+
+size_t ZSTD_CStreamOutSize(void)
+{
+    return ZSTD_compressBound(ZSTD_BLOCKSIZE_MAX) + ZSTD_blockHeaderSize + 4 /* 32-bits hash */ ;
+}
+
+static ZSTD_cParamMode_e ZSTD_getCParamMode(ZSTD_CDict const* cdict, ZSTD_CCtx_params const* params, U64 pledgedSrcSize)
+{
+    if (cdict != NULL && ZSTD_shouldAttachDict(cdict, params, pledgedSrcSize))
+        return ZSTD_cpm_attachDict;
+    else
+        return ZSTD_cpm_noAttachDict;
+}
+
+/* ZSTD_resetCStream():
+ * pledgedSrcSize == 0 means "unknown" */
+size_t ZSTD_resetCStream(ZSTD_CStream* zcs, unsigned long long pss)
+{
+    /* temporary : 0 interpreted as "unknown" during transition period.
+     * Users willing to specify "unknown" **must** use ZSTD_CONTENTSIZE_UNKNOWN.
+     * 0 will be interpreted as "empty" in the future.
+     */
+    U64 const pledgedSrcSize = (pss==0) ? ZSTD_CONTENTSIZE_UNKNOWN : pss;
+    DEBUGLOG(4, "ZSTD_resetCStream: pledgedSrcSize = %u", (unsigned)pledgedSrcSize);
+    FORWARD_IF_ERROR( ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only) , "");
+    FORWARD_IF_ERROR( ZSTD_CCtx_setPledgedSrcSize(zcs, pledgedSrcSize) , "");
+    return 0;
+}
+
+/*! ZSTD_initCStream_internal() :
+ *  Note : for lib/compress only. Used by zstdmt_compress.c.
+ *  Assumption 1 : params are valid
+ *  Assumption 2 : either dict, or cdict, is defined, not both */
+size_t ZSTD_initCStream_internal(ZSTD_CStream* zcs,
+                    const void* dict, size_t dictSize, const ZSTD_CDict* cdict,
+                    const ZSTD_CCtx_params* params,
+                    unsigned long long pledgedSrcSize)
+{
+    DEBUGLOG(4, "ZSTD_initCStream_internal");
+    FORWARD_IF_ERROR( ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only) , "");
+    FORWARD_IF_ERROR( ZSTD_CCtx_setPledgedSrcSize(zcs, pledgedSrcSize) , "");
+    assert(!ZSTD_isError(ZSTD_checkCParams(params->cParams)));
+    zcs->requestedParams = *params;
+    assert(!((dict) && (cdict)));  /* either dict or cdict, not both */
+    if (dict) {
+        FORWARD_IF_ERROR( ZSTD_CCtx_loadDictionary(zcs, dict, dictSize) , "");
+    } else {
+        /* Dictionary is cleared if !cdict */
+        FORWARD_IF_ERROR( ZSTD_CCtx_refCDict(zcs, cdict) , "");
+    }
+    return 0;
+}
+
+/* ZSTD_initCStream_usingCDict_advanced() :
+ * same as ZSTD_initCStream_usingCDict(), with control over frame parameters */
+size_t ZSTD_initCStream_usingCDict_advanced(ZSTD_CStream* zcs,
+                                            const ZSTD_CDict* cdict,
+                                            ZSTD_frameParameters fParams,
+                                            unsigned long long pledgedSrcSize)
+{
+    DEBUGLOG(4, "ZSTD_initCStream_usingCDict_advanced");
+    FORWARD_IF_ERROR( ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only) , "");
+    FORWARD_IF_ERROR( ZSTD_CCtx_setPledgedSrcSize(zcs, pledgedSrcSize) , "");
+    zcs->requestedParams.fParams = fParams;
+    FORWARD_IF_ERROR( ZSTD_CCtx_refCDict(zcs, cdict) , "");
+    return 0;
+}
+
+/* note : cdict must outlive compression session */
+size_t ZSTD_initCStream_usingCDict(ZSTD_CStream* zcs, const ZSTD_CDict* cdict)
+{
+    DEBUGLOG(4, "ZSTD_initCStream_usingCDict");
+    FORWARD_IF_ERROR( ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only) , "");
+    FORWARD_IF_ERROR( ZSTD_CCtx_refCDict(zcs, cdict) , "");
+    return 0;
+}
+
+
+/* ZSTD_initCStream_advanced() :
+ * pledgedSrcSize must be exact.
+ * if srcSize is not known at init time, use value ZSTD_CONTENTSIZE_UNKNOWN.
+ * dict is loaded with default parameters ZSTD_dct_auto and ZSTD_dlm_byCopy. */
+size_t ZSTD_initCStream_advanced(ZSTD_CStream* zcs,
+                                 const void* dict, size_t dictSize,
+                                 ZSTD_parameters params, unsigned long long pss)
+{
+    /* for compatibility with older programs relying on this behavior.
+     * Users should now specify ZSTD_CONTENTSIZE_UNKNOWN.
+     * This line will be removed in the future.
+     */
+    U64 const pledgedSrcSize = (pss==0 && params.fParams.contentSizeFlag==0) ? ZSTD_CONTENTSIZE_UNKNOWN : pss;
+    DEBUGLOG(4, "ZSTD_initCStream_advanced");
+    FORWARD_IF_ERROR( ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only) , "");
+    FORWARD_IF_ERROR( ZSTD_CCtx_setPledgedSrcSize(zcs, pledgedSrcSize) , "");
+    FORWARD_IF_ERROR( ZSTD_checkCParams(params.cParams) , "");
+    ZSTD_CCtxParams_setZstdParams(&zcs->requestedParams, &params);
+    FORWARD_IF_ERROR( ZSTD_CCtx_loadDictionary(zcs, dict, dictSize) , "");
+    return 0;
+}
+
+size_t ZSTD_initCStream_usingDict(ZSTD_CStream* zcs, const void* dict, size_t dictSize, int compressionLevel)
+{
+    DEBUGLOG(4, "ZSTD_initCStream_usingDict");
+    FORWARD_IF_ERROR( ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only) , "");
+    FORWARD_IF_ERROR( ZSTD_CCtx_setParameter(zcs, ZSTD_c_compressionLevel, compressionLevel) , "");
+    FORWARD_IF_ERROR( ZSTD_CCtx_loadDictionary(zcs, dict, dictSize) , "");
+    return 0;
+}
+
+size_t ZSTD_initCStream_srcSize(ZSTD_CStream* zcs, int compressionLevel, unsigned long long pss)
+{
+    /* temporary : 0 interpreted as "unknown" during transition period.
+     * Users willing to specify "unknown" **must** use ZSTD_CONTENTSIZE_UNKNOWN.
+     * 0 will be interpreted as "empty" in the future.
+     */
+    U64 const pledgedSrcSize = (pss==0) ? ZSTD_CONTENTSIZE_UNKNOWN : pss;
+    DEBUGLOG(4, "ZSTD_initCStream_srcSize");
+    FORWARD_IF_ERROR( ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only) , "");
+    FORWARD_IF_ERROR( ZSTD_CCtx_refCDict(zcs, NULL) , "");
+    FORWARD_IF_ERROR( ZSTD_CCtx_setParameter(zcs, ZSTD_c_compressionLevel, compressionLevel) , "");
+    FORWARD_IF_ERROR( ZSTD_CCtx_setPledgedSrcSize(zcs, pledgedSrcSize) , "");
+    return 0;
+}
+
+size_t ZSTD_initCStream(ZSTD_CStream* zcs, int compressionLevel)
+{
+    DEBUGLOG(4, "ZSTD_initCStream");
+    FORWARD_IF_ERROR( ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only) , "");
+    FORWARD_IF_ERROR( ZSTD_CCtx_refCDict(zcs, NULL) , "");
+    FORWARD_IF_ERROR( ZSTD_CCtx_setParameter(zcs, ZSTD_c_compressionLevel, compressionLevel) , "");
+    return 0;
+}
+
+/*======   Compression   ======*/
+
+static size_t ZSTD_nextInputSizeHint(const ZSTD_CCtx* cctx)
+{
+    size_t hintInSize = cctx->inBuffTarget - cctx->inBuffPos;
+    if (hintInSize==0) hintInSize = cctx->blockSize;
+    return hintInSize;
+}
+
+/** ZSTD_compressStream_generic():
+ *  internal function for all *compressStream*() variants
+ *  non-static, because can be called from zstdmt_compress.c
+ * @return : hint size for next input */
+static size_t ZSTD_compressStream_generic(ZSTD_CStream* zcs,
+                                          ZSTD_outBuffer* output,
+                                          ZSTD_inBuffer* input,
+                                          ZSTD_EndDirective const flushMode)
+{
+    const char* const istart = (const char*)input->src;
+    const char* const iend = input->size != 0 ? istart + input->size : istart;
+    const char* ip = input->pos != 0 ? istart + input->pos : istart;
+    char* const ostart = (char*)output->dst;
+    char* const oend = output->size != 0 ? ostart + output->size : ostart;
+    char* op = output->pos != 0 ? ostart + output->pos : ostart;
+    U32 someMoreWork = 1;
+
+    /* check expectations */
+    DEBUGLOG(5, "ZSTD_compressStream_generic, flush=%u", (unsigned)flushMode);
+    if (zcs->appliedParams.inBufferMode == ZSTD_bm_buffered) {
+        assert(zcs->inBuff != NULL);
+        assert(zcs->inBuffSize > 0);
+    }
+    if (zcs->appliedParams.outBufferMode == ZSTD_bm_buffered) {
+        assert(zcs->outBuff !=  NULL);
+        assert(zcs->outBuffSize > 0);
+    }
+    assert(output->pos <= output->size);
+    assert(input->pos <= input->size);
+    assert((U32)flushMode <= (U32)ZSTD_e_end);
+
+    while (someMoreWork) {
+        switch(zcs->streamStage)
+        {
+        case zcss_init:
+            RETURN_ERROR(init_missing, "call ZSTD_initCStream() first!");
+
+        case zcss_load:
+            if ( (flushMode == ZSTD_e_end)
+              && ( (size_t)(oend-op) >= ZSTD_compressBound(iend-ip)     /* Enough output space */
+                || zcs->appliedParams.outBufferMode == ZSTD_bm_stable)  /* OR we are allowed to return dstSizeTooSmall */
+              && (zcs->inBuffPos == 0) ) {
+                /* shortcut to compression pass directly into output buffer */
+                size_t const cSize = ZSTD_compressEnd(zcs,
+                                                op, oend-op, ip, iend-ip);
+                DEBUGLOG(4, "ZSTD_compressEnd : cSize=%u", (unsigned)cSize);
+                FORWARD_IF_ERROR(cSize, "ZSTD_compressEnd failed");
+                ip = iend;
+                op += cSize;
+                zcs->frameEnded = 1;
+                ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only);
+                someMoreWork = 0; break;
+            }
+            /* complete loading into inBuffer in buffered mode */
+            if (zcs->appliedParams.inBufferMode == ZSTD_bm_buffered) {
+                size_t const toLoad = zcs->inBuffTarget - zcs->inBuffPos;
+                size_t const loaded = ZSTD_limitCopy(
+                                        zcs->inBuff + zcs->inBuffPos, toLoad,
+                                        ip, iend-ip);
+                zcs->inBuffPos += loaded;
+                if (loaded != 0)
+                    ip += loaded;
+                if ( (flushMode == ZSTD_e_continue)
+                  && (zcs->inBuffPos < zcs->inBuffTarget) ) {
+                    /* not enough input to fill full block : stop here */
+                    someMoreWork = 0; break;
+                }
+                if ( (flushMode == ZSTD_e_flush)
+                  && (zcs->inBuffPos == zcs->inToCompress) ) {
+                    /* empty */
+                    someMoreWork = 0; break;
+                }
+            }
+            /* compress current block (note : this stage cannot be stopped in the middle) */
+            DEBUGLOG(5, "stream compression stage (flushMode==%u)", flushMode);
+            {   int const inputBuffered = (zcs->appliedParams.inBufferMode == ZSTD_bm_buffered);
+                void* cDst;
+                size_t cSize;
+                size_t oSize = oend-op;
+                size_t const iSize = inputBuffered
+                    ? zcs->inBuffPos - zcs->inToCompress
+                    : MIN((size_t)(iend - ip), zcs->blockSize);
+                if (oSize >= ZSTD_compressBound(iSize) || zcs->appliedParams.outBufferMode == ZSTD_bm_stable)
+                    cDst = op;   /* compress into output buffer, to skip flush stage */
+                else
+                    cDst = zcs->outBuff, oSize = zcs->outBuffSize;
+                if (inputBuffered) {
+                    unsigned const lastBlock = (flushMode == ZSTD_e_end) && (ip==iend);
+                    cSize = lastBlock ?
+                            ZSTD_compressEnd(zcs, cDst, oSize,
+                                        zcs->inBuff + zcs->inToCompress, iSize) :
+                            ZSTD_compressContinue(zcs, cDst, oSize,
+                                        zcs->inBuff + zcs->inToCompress, iSize);
+                    FORWARD_IF_ERROR(cSize, "%s", lastBlock ? "ZSTD_compressEnd failed" : "ZSTD_compressContinue failed");
+                    zcs->frameEnded = lastBlock;
+                    /* prepare next block */
+                    zcs->inBuffTarget = zcs->inBuffPos + zcs->blockSize;
+                    if (zcs->inBuffTarget > zcs->inBuffSize)
+                        zcs->inBuffPos = 0, zcs->inBuffTarget = zcs->blockSize;
+                    DEBUGLOG(5, "inBuffTarget:%u / inBuffSize:%u",
+                            (unsigned)zcs->inBuffTarget, (unsigned)zcs->inBuffSize);
+                    if (!lastBlock)
+                        assert(zcs->inBuffTarget <= zcs->inBuffSize);
+                    zcs->inToCompress = zcs->inBuffPos;
+                } else {
+                    unsigned const lastBlock = (ip + iSize == iend);
+                    assert(flushMode == ZSTD_e_end /* Already validated */);
+                    cSize = lastBlock ?
+                            ZSTD_compressEnd(zcs, cDst, oSize, ip, iSize) :
+                            ZSTD_compressContinue(zcs, cDst, oSize, ip, iSize);
+                    /* Consume the input prior to error checking to mirror buffered mode. */
+                    if (iSize > 0)
+                        ip += iSize;
+                    FORWARD_IF_ERROR(cSize, "%s", lastBlock ? "ZSTD_compressEnd failed" : "ZSTD_compressContinue failed");
+                    zcs->frameEnded = lastBlock;
+                    if (lastBlock)
+                        assert(ip == iend);
+                }
+                if (cDst == op) {  /* no need to flush */
+                    op += cSize;
+                    if (zcs->frameEnded) {
+                        DEBUGLOG(5, "Frame completed directly in outBuffer");
+                        someMoreWork = 0;
+                        ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only);
+                    }
+                    break;
+                }
+                zcs->outBuffContentSize = cSize;
+                zcs->outBuffFlushedSize = 0;
+                zcs->streamStage = zcss_flush; /* pass-through to flush stage */
+            }
+	    /* fall-through */
+        case zcss_flush:
+            DEBUGLOG(5, "flush stage");
+            assert(zcs->appliedParams.outBufferMode == ZSTD_bm_buffered);
+            {   size_t const toFlush = zcs->outBuffContentSize - zcs->outBuffFlushedSize;
+                size_t const flushed = ZSTD_limitCopy(op, (size_t)(oend-op),
+                            zcs->outBuff + zcs->outBuffFlushedSize, toFlush);
+                DEBUGLOG(5, "toFlush: %u into %u ==> flushed: %u",
+                            (unsigned)toFlush, (unsigned)(oend-op), (unsigned)flushed);
+                if (flushed)
+                    op += flushed;
+                zcs->outBuffFlushedSize += flushed;
+                if (toFlush!=flushed) {
+                    /* flush not fully completed, presumably because dst is too small */
+                    assert(op==oend);
+                    someMoreWork = 0;
+                    break;
+                }
+                zcs->outBuffContentSize = zcs->outBuffFlushedSize = 0;
+                if (zcs->frameEnded) {
+                    DEBUGLOG(5, "Frame completed on flush");
+                    someMoreWork = 0;
+                    ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only);
+                    break;
+                }
+                zcs->streamStage = zcss_load;
+                break;
+            }
+
+        default: /* impossible */
+            assert(0);
+        }
+    }
+
+    input->pos = ip - istart;
+    output->pos = op - ostart;
+    if (zcs->frameEnded) return 0;
+    return ZSTD_nextInputSizeHint(zcs);
+}
+
+static size_t ZSTD_nextInputSizeHint_MTorST(const ZSTD_CCtx* cctx)
+{
+#ifdef ZSTD_MULTITHREAD
+    if (cctx->appliedParams.nbWorkers >= 1) {
+        assert(cctx->mtctx != NULL);
+        return ZSTDMT_nextInputSizeHint(cctx->mtctx);
+    }
+#endif
+    return ZSTD_nextInputSizeHint(cctx);
+
+}
+
+size_t ZSTD_compressStream(ZSTD_CStream* zcs, ZSTD_outBuffer* output, ZSTD_inBuffer* input)
+{
+    FORWARD_IF_ERROR( ZSTD_compressStream2(zcs, output, input, ZSTD_e_continue) , "");
+    return ZSTD_nextInputSizeHint_MTorST(zcs);
+}
+
+/* After a compression call set the expected input/output buffer.
+ * This is validated at the start of the next compression call.
+ */
+static void ZSTD_setBufferExpectations(ZSTD_CCtx* cctx, ZSTD_outBuffer const* output, ZSTD_inBuffer const* input)
+{
+    if (cctx->appliedParams.inBufferMode == ZSTD_bm_stable) {
+        cctx->expectedInBuffer = *input;
+    }
+    if (cctx->appliedParams.outBufferMode == ZSTD_bm_stable) {
+        cctx->expectedOutBufferSize = output->size - output->pos;
+    }
+}
+
+/* Validate that the input/output buffers match the expectations set by
+ * ZSTD_setBufferExpectations.
+ */
+static size_t ZSTD_checkBufferStability(ZSTD_CCtx const* cctx,
+                                        ZSTD_outBuffer const* output,
+                                        ZSTD_inBuffer const* input,
+                                        ZSTD_EndDirective endOp)
+{
+    if (cctx->appliedParams.inBufferMode == ZSTD_bm_stable) {
+        ZSTD_inBuffer const expect = cctx->expectedInBuffer;
+        if (expect.src != input->src || expect.pos != input->pos || expect.size != input->size)
+            RETURN_ERROR(srcBuffer_wrong, "ZSTD_c_stableInBuffer enabled but input differs!");
+        if (endOp != ZSTD_e_end)
+            RETURN_ERROR(srcBuffer_wrong, "ZSTD_c_stableInBuffer can only be used with ZSTD_e_end!");
+    }
+    if (cctx->appliedParams.outBufferMode == ZSTD_bm_stable) {
+        size_t const outBufferSize = output->size - output->pos;
+        if (cctx->expectedOutBufferSize != outBufferSize)
+            RETURN_ERROR(dstBuffer_wrong, "ZSTD_c_stableOutBuffer enabled but output size differs!");
+    }
+    return 0;
+}
+
+static size_t ZSTD_CCtx_init_compressStream2(ZSTD_CCtx* cctx,
+                                             ZSTD_EndDirective endOp,
+                                             size_t inSize) {
+    ZSTD_CCtx_params params = cctx->requestedParams;
+    ZSTD_prefixDict const prefixDict = cctx->prefixDict;
+    FORWARD_IF_ERROR( ZSTD_initLocalDict(cctx) , ""); /* Init the local dict if present. */
+    ZSTD_memset(&cctx->prefixDict, 0, sizeof(cctx->prefixDict));   /* single usage */
+    assert(prefixDict.dict==NULL || cctx->cdict==NULL);    /* only one can be set */
+    if (cctx->cdict && !cctx->localDict.cdict) {
+        /* Let the cdict's compression level take priority over the requested params.
+         * But do not take the cdict's compression level if the "cdict" is actually a localDict
+         * generated from ZSTD_initLocalDict().
+         */
+        params.compressionLevel = cctx->cdict->compressionLevel;
+    }
+    DEBUGLOG(4, "ZSTD_compressStream2 : transparent init stage");
+    if (endOp == ZSTD_e_end) cctx->pledgedSrcSizePlusOne = inSize + 1;  /* auto-fix pledgedSrcSize */
+    {
+        size_t const dictSize = prefixDict.dict
+                ? prefixDict.dictSize
+                : (cctx->cdict ? cctx->cdict->dictContentSize : 0);
+        ZSTD_cParamMode_e const mode = ZSTD_getCParamMode(cctx->cdict, &params, cctx->pledgedSrcSizePlusOne - 1);
+        params.cParams = ZSTD_getCParamsFromCCtxParams(
+                &params, cctx->pledgedSrcSizePlusOne-1,
+                dictSize, mode);
+    }
+
+    if (ZSTD_CParams_shouldEnableLdm(&params.cParams)) {
+        /* Enable LDM by default for optimal parser and window size >= 128MB */
+        DEBUGLOG(4, "LDM enabled by default (window size >= 128MB, strategy >= btopt)");
+        params.ldmParams.enableLdm = 1;
+    }
+
+    if (ZSTD_CParams_useBlockSplitter(&params.cParams)) {
+        DEBUGLOG(4, "Block splitter enabled by default (window size >= 128K, strategy >= btopt)");
+        params.splitBlocks = 1;
+    }
+
+    params.useRowMatchFinder = ZSTD_resolveRowMatchFinderMode(params.useRowMatchFinder, &params.cParams);
+
+#ifdef ZSTD_MULTITHREAD
+    if ((cctx->pledgedSrcSizePlusOne-1) <= ZSTDMT_JOBSIZE_MIN) {
+        params.nbWorkers = 0; /* do not invoke multi-threading when src size is too small */
+    }
+    if (params.nbWorkers > 0) {
+#if ZSTD_TRACE
+        cctx->traceCtx = (ZSTD_trace_compress_begin != NULL) ? ZSTD_trace_compress_begin(cctx) : 0;
+#endif
+        /* mt context creation */
+        if (cctx->mtctx == NULL) {
+            DEBUGLOG(4, "ZSTD_compressStream2: creating new mtctx for nbWorkers=%u",
+                        params.nbWorkers);
+            cctx->mtctx = ZSTDMT_createCCtx_advanced((U32)params.nbWorkers, cctx->customMem, cctx->pool);
+            RETURN_ERROR_IF(cctx->mtctx == NULL, memory_allocation, "NULL pointer!");
+        }
+        /* mt compression */
+        DEBUGLOG(4, "call ZSTDMT_initCStream_internal as nbWorkers=%u", params.nbWorkers);
+        FORWARD_IF_ERROR( ZSTDMT_initCStream_internal(
+                    cctx->mtctx,
+                    prefixDict.dict, prefixDict.dictSize, prefixDict.dictContentType,
+                    cctx->cdict, params, cctx->pledgedSrcSizePlusOne-1) , "");
+        cctx->dictID = cctx->cdict ? cctx->cdict->dictID : 0;
+        cctx->dictContentSize = cctx->cdict ? cctx->cdict->dictContentSize : prefixDict.dictSize;
+        cctx->consumedSrcSize = 0;
+        cctx->producedCSize = 0;
+        cctx->streamStage = zcss_load;
+        cctx->appliedParams = params;
+    } else
+#endif
+    {   U64 const pledgedSrcSize = cctx->pledgedSrcSizePlusOne - 1;
+        assert(!ZSTD_isError(ZSTD_checkCParams(params.cParams)));
+        FORWARD_IF_ERROR( ZSTD_compressBegin_internal(cctx,
+                prefixDict.dict, prefixDict.dictSize, prefixDict.dictContentType, ZSTD_dtlm_fast,
+                cctx->cdict,
+                &params, pledgedSrcSize,
+                ZSTDb_buffered) , "");
+        assert(cctx->appliedParams.nbWorkers == 0);
+        cctx->inToCompress = 0;
+        cctx->inBuffPos = 0;
+        if (cctx->appliedParams.inBufferMode == ZSTD_bm_buffered) {
+            /* for small input: avoid automatic flush on reaching end of block, since
+            * it would require to add a 3-bytes null block to end frame
+            */
+            cctx->inBuffTarget = cctx->blockSize + (cctx->blockSize == pledgedSrcSize);
+        } else {
+            cctx->inBuffTarget = 0;
+        }
+        cctx->outBuffContentSize = cctx->outBuffFlushedSize = 0;
+        cctx->streamStage = zcss_load;
+        cctx->frameEnded = 0;
+    }
+    return 0;
+}
+
+size_t ZSTD_compressStream2( ZSTD_CCtx* cctx,
+                             ZSTD_outBuffer* output,
+                             ZSTD_inBuffer* input,
+                             ZSTD_EndDirective endOp)
+{
+    DEBUGLOG(5, "ZSTD_compressStream2, endOp=%u ", (unsigned)endOp);
+    /* check conditions */
+    RETURN_ERROR_IF(output->pos > output->size, dstSize_tooSmall, "invalid output buffer");
+    RETURN_ERROR_IF(input->pos  > input->size, srcSize_wrong, "invalid input buffer");
+    RETURN_ERROR_IF((U32)endOp > (U32)ZSTD_e_end, parameter_outOfBound, "invalid endDirective");
+    assert(cctx != NULL);
+
+    /* transparent initialization stage */
+    if (cctx->streamStage == zcss_init) {
+        FORWARD_IF_ERROR(ZSTD_CCtx_init_compressStream2(cctx, endOp, input->size), "CompressStream2 initialization failed");
+        ZSTD_setBufferExpectations(cctx, output, input);    /* Set initial buffer expectations now that we've initialized */
+    }
+    /* end of transparent initialization stage */
+
+    FORWARD_IF_ERROR(ZSTD_checkBufferStability(cctx, output, input, endOp), "invalid buffers");
+    /* compression stage */
+#ifdef ZSTD_MULTITHREAD
+    if (cctx->appliedParams.nbWorkers > 0) {
+        size_t flushMin;
+        if (cctx->cParamsChanged) {
+            ZSTDMT_updateCParams_whileCompressing(cctx->mtctx, &cctx->requestedParams);
+            cctx->cParamsChanged = 0;
+        }
+        for (;;) {
+            size_t const ipos = input->pos;
+            size_t const opos = output->pos;
+            flushMin = ZSTDMT_compressStream_generic(cctx->mtctx, output, input, endOp);
+            cctx->consumedSrcSize += (U64)(input->pos - ipos);
+            cctx->producedCSize += (U64)(output->pos - opos);
+            if ( ZSTD_isError(flushMin)
+              || (endOp == ZSTD_e_end && flushMin == 0) ) { /* compression completed */
+                if (flushMin == 0)
+                    ZSTD_CCtx_trace(cctx, 0);
+                ZSTD_CCtx_reset(cctx, ZSTD_reset_session_only);
+            }
+            FORWARD_IF_ERROR(flushMin, "ZSTDMT_compressStream_generic failed");
+
+            if (endOp == ZSTD_e_continue) {
+                /* We only require some progress with ZSTD_e_continue, not maximal progress.
+                 * We're done if we've consumed or produced any bytes, or either buffer is
+                 * full.
+                 */
+                if (input->pos != ipos || output->pos != opos || input->pos == input->size || output->pos == output->size)
+                    break;
+            } else {
+                assert(endOp == ZSTD_e_flush || endOp == ZSTD_e_end);
+                /* We require maximal progress. We're done when the flush is complete or the
+                 * output buffer is full.
+                 */
+                if (flushMin == 0 || output->pos == output->size)
+                    break;
+            }
+        }
+        DEBUGLOG(5, "completed ZSTD_compressStream2 delegating to ZSTDMT_compressStream_generic");
+        /* Either we don't require maximum forward progress, we've finished the
+         * flush, or we are out of output space.
+         */
+        assert(endOp == ZSTD_e_continue || flushMin == 0 || output->pos == output->size);
+        ZSTD_setBufferExpectations(cctx, output, input);
+        return flushMin;
+    }
+#endif
+    FORWARD_IF_ERROR( ZSTD_compressStream_generic(cctx, output, input, endOp) , "");
+    DEBUGLOG(5, "completed ZSTD_compressStream2");
+    ZSTD_setBufferExpectations(cctx, output, input);
+    return cctx->outBuffContentSize - cctx->outBuffFlushedSize; /* remaining to flush */
+}
+
+size_t ZSTD_compressStream2_simpleArgs (
+                            ZSTD_CCtx* cctx,
+                            void* dst, size_t dstCapacity, size_t* dstPos,
+                      const void* src, size_t srcSize, size_t* srcPos,
+                            ZSTD_EndDirective endOp)
+{
+    ZSTD_outBuffer output = { dst, dstCapacity, *dstPos };
+    ZSTD_inBuffer  input  = { src, srcSize, *srcPos };
+    /* ZSTD_compressStream2() will check validity of dstPos and srcPos */
+    size_t const cErr = ZSTD_compressStream2(cctx, &output, &input, endOp);
+    *dstPos = output.pos;
+    *srcPos = input.pos;
+    return cErr;
+}
+
+size_t ZSTD_compress2(ZSTD_CCtx* cctx,
+                      void* dst, size_t dstCapacity,
+                      const void* src, size_t srcSize)
+{
+    ZSTD_bufferMode_e const originalInBufferMode = cctx->requestedParams.inBufferMode;
+    ZSTD_bufferMode_e const originalOutBufferMode = cctx->requestedParams.outBufferMode;
+    DEBUGLOG(4, "ZSTD_compress2 (srcSize=%u)", (unsigned)srcSize);
+    ZSTD_CCtx_reset(cctx, ZSTD_reset_session_only);
+    /* Enable stable input/output buffers. */
+    cctx->requestedParams.inBufferMode = ZSTD_bm_stable;
+    cctx->requestedParams.outBufferMode = ZSTD_bm_stable;
+    {   size_t oPos = 0;
+        size_t iPos = 0;
+        size_t const result = ZSTD_compressStream2_simpleArgs(cctx,
+                                        dst, dstCapacity, &oPos,
+                                        src, srcSize, &iPos,
+                                        ZSTD_e_end);
+        /* Reset to the original values. */
+        cctx->requestedParams.inBufferMode = originalInBufferMode;
+        cctx->requestedParams.outBufferMode = originalOutBufferMode;
+        FORWARD_IF_ERROR(result, "ZSTD_compressStream2_simpleArgs failed");
+        if (result != 0) {  /* compression not completed, due to lack of output space */
+            assert(oPos == dstCapacity);
+            RETURN_ERROR(dstSize_tooSmall, "");
+        }
+        assert(iPos == srcSize);   /* all input is expected consumed */
+        return oPos;
+    }
+}
+
+typedef struct {
+    U32 idx;             /* Index in array of ZSTD_Sequence */
+    U32 posInSequence;   /* Position within sequence at idx */
+    size_t posInSrc;        /* Number of bytes given by sequences provided so far */
+} ZSTD_sequencePosition;
+
+/* Returns a ZSTD error code if sequence is not valid */
+static size_t ZSTD_validateSequence(U32 offCode, U32 matchLength,
+                                    size_t posInSrc, U32 windowLog, size_t dictSize, U32 minMatch) {
+    size_t offsetBound;
+    U32 windowSize = 1 << windowLog;
+    /* posInSrc represents the amount of data the the decoder would decode up to this point.
+     * As long as the amount of data decoded is less than or equal to window size, offsets may be
+     * larger than the total length of output decoded in order to reference the dict, even larger than
+     * window size. After output surpasses windowSize, we're limited to windowSize offsets again.
+     */
+    offsetBound = posInSrc > windowSize ? (size_t)windowSize : posInSrc + (size_t)dictSize;
+    RETURN_ERROR_IF(offCode > offsetBound + ZSTD_REP_MOVE, corruption_detected, "Offset too large!");
+    RETURN_ERROR_IF(matchLength < minMatch, corruption_detected, "Matchlength too small");
+    return 0;
+}
+
+/* Returns an offset code, given a sequence's raw offset, the ongoing repcode array, and whether litLength == 0 */
+static U32 ZSTD_finalizeOffCode(U32 rawOffset, const U32 rep[ZSTD_REP_NUM], U32 ll0) {
+    U32 offCode = rawOffset + ZSTD_REP_MOVE;
+    U32 repCode = 0;
+
+    if (!ll0 && rawOffset == rep[0]) {
+        repCode = 1;
+    } else if (rawOffset == rep[1]) {
+        repCode = 2 - ll0;
+    } else if (rawOffset == rep[2]) {
+        repCode = 3 - ll0;
+    } else if (ll0 && rawOffset == rep[0] - 1) {
+        repCode = 3;
+    }
+    if (repCode) {
+        /* ZSTD_storeSeq expects a number in the range [0, 2] to represent a repcode */
+        offCode = repCode - 1;
+    }
+    return offCode;
+}
+
+/* Returns 0 on success, and a ZSTD_error otherwise. This function scans through an array of
+ * ZSTD_Sequence, storing the sequences it finds, until it reaches a block delimiter.
+ */
+static size_t ZSTD_copySequencesToSeqStoreExplicitBlockDelim(ZSTD_CCtx* cctx, ZSTD_sequencePosition* seqPos,
+                                                             const ZSTD_Sequence* const inSeqs, size_t inSeqsSize,
+                                                             const void* src, size_t blockSize) {
+    U32 idx = seqPos->idx;
+    BYTE const* ip = (BYTE const*)(src);
+    const BYTE* const iend = ip + blockSize;
+    repcodes_t updatedRepcodes;
+    U32 dictSize;
+    U32 litLength;
+    U32 matchLength;
+    U32 ll0;
+    U32 offCode;
+
+    if (cctx->cdict) {
+        dictSize = (U32)cctx->cdict->dictContentSize;
+    } else if (cctx->prefixDict.dict) {
+        dictSize = (U32)cctx->prefixDict.dictSize;
+    } else {
+        dictSize = 0;
+    }
+    ZSTD_memcpy(updatedRepcodes.rep, cctx->blockState.prevCBlock->rep, sizeof(repcodes_t));
+    for (; (inSeqs[idx].matchLength != 0 || inSeqs[idx].offset != 0) && idx < inSeqsSize; ++idx) {
+        litLength = inSeqs[idx].litLength;
+        matchLength = inSeqs[idx].matchLength;
+        ll0 = litLength == 0;
+        offCode = ZSTD_finalizeOffCode(inSeqs[idx].offset, updatedRepcodes.rep, ll0);
+        updatedRepcodes = ZSTD_updateRep(updatedRepcodes.rep, offCode, ll0);
+
+        DEBUGLOG(6, "Storing sequence: (of: %u, ml: %u, ll: %u)", offCode, matchLength, litLength);
+        if (cctx->appliedParams.validateSequences) {
+            seqPos->posInSrc += litLength + matchLength;
+            FORWARD_IF_ERROR(ZSTD_validateSequence(offCode, matchLength, seqPos->posInSrc,
+                                                cctx->appliedParams.cParams.windowLog, dictSize,
+                                                cctx->appliedParams.cParams.minMatch),
+                                                "Sequence validation failed");
+        }
+        RETURN_ERROR_IF(idx - seqPos->idx > cctx->seqStore.maxNbSeq, memory_allocation,
+                        "Not enough memory allocated. Try adjusting ZSTD_c_minMatch.");
+        ZSTD_storeSeq(&cctx->seqStore, litLength, ip, iend, offCode, matchLength - MINMATCH);
+        ip += matchLength + litLength;
+    }
+    ZSTD_memcpy(cctx->blockState.nextCBlock->rep, updatedRepcodes.rep, sizeof(repcodes_t));
+
+    if (inSeqs[idx].litLength) {
+        DEBUGLOG(6, "Storing last literals of size: %u", inSeqs[idx].litLength);
+        ZSTD_storeLastLiterals(&cctx->seqStore, ip, inSeqs[idx].litLength);
+        ip += inSeqs[idx].litLength;
+        seqPos->posInSrc += inSeqs[idx].litLength;
+    }
+    RETURN_ERROR_IF(ip != iend, corruption_detected, "Blocksize doesn't agree with block delimiter!");
+    seqPos->idx = idx+1;
+    return 0;
+}
+
+/* Returns the number of bytes to move the current read position back by. Only non-zero
+ * if we ended up splitting a sequence. Otherwise, it may return a ZSTD error if something
+ * went wrong.
+ *
+ * This function will attempt to scan through blockSize bytes represented by the sequences
+ * in inSeqs, storing any (partial) sequences.
+ *
+ * Occasionally, we may want to change the actual number of bytes we consumed from inSeqs to
+ * avoid splitting a match, or to avoid splitting a match such that it would produce a match
+ * smaller than MINMATCH. In this case, we return the number of bytes that we didn't read from this block.
+ */
+static size_t ZSTD_copySequencesToSeqStoreNoBlockDelim(ZSTD_CCtx* cctx, ZSTD_sequencePosition* seqPos,
+                                                       const ZSTD_Sequence* const inSeqs, size_t inSeqsSize,
+                                                       const void* src, size_t blockSize) {
+    U32 idx = seqPos->idx;
+    U32 startPosInSequence = seqPos->posInSequence;
+    U32 endPosInSequence = seqPos->posInSequence + (U32)blockSize;
+    size_t dictSize;
+    BYTE const* ip = (BYTE const*)(src);
+    BYTE const* iend = ip + blockSize;  /* May be adjusted if we decide to process fewer than blockSize bytes */
+    repcodes_t updatedRepcodes;
+    U32 bytesAdjustment = 0;
+    U32 finalMatchSplit = 0;
+    U32 litLength;
+    U32 matchLength;
+    U32 rawOffset;
+    U32 offCode;
+
+    if (cctx->cdict) {
+        dictSize = cctx->cdict->dictContentSize;
+    } else if (cctx->prefixDict.dict) {
+        dictSize = cctx->prefixDict.dictSize;
+    } else {
+        dictSize = 0;
+    }
+    DEBUGLOG(5, "ZSTD_copySequencesToSeqStore: idx: %u PIS: %u blockSize: %zu", idx, startPosInSequence, blockSize);
+    DEBUGLOG(5, "Start seq: idx: %u (of: %u ml: %u ll: %u)", idx, inSeqs[idx].offset, inSeqs[idx].matchLength, inSeqs[idx].litLength);
+    ZSTD_memcpy(updatedRepcodes.rep, cctx->blockState.prevCBlock->rep, sizeof(repcodes_t));
+    while (endPosInSequence && idx < inSeqsSize && !finalMatchSplit) {
+        const ZSTD_Sequence currSeq = inSeqs[idx];
+        litLength = currSeq.litLength;
+        matchLength = currSeq.matchLength;
+        rawOffset = currSeq.offset;
+
+        /* Modify the sequence depending on where endPosInSequence lies */
+        if (endPosInSequence >= currSeq.litLength + currSeq.matchLength) {
+            if (startPosInSequence >= litLength) {
+                startPosInSequence -= litLength;
+                litLength = 0;
+                matchLength -= startPosInSequence;
+            } else {
+                litLength -= startPosInSequence;
+            }
+            /* Move to the next sequence */
+            endPosInSequence -= currSeq.litLength + currSeq.matchLength;
+            startPosInSequence = 0;
+            idx++;
+        } else {
+            /* This is the final (partial) sequence we're adding from inSeqs, and endPosInSequence
+               does not reach the end of the match. So, we have to split the sequence */
+            DEBUGLOG(6, "Require a split: diff: %u, idx: %u PIS: %u",
+                     currSeq.litLength + currSeq.matchLength - endPosInSequence, idx, endPosInSequence);
+            if (endPosInSequence > litLength) {
+                U32 firstHalfMatchLength;
+                litLength = startPosInSequence >= litLength ? 0 : litLength - startPosInSequence;
+                firstHalfMatchLength = endPosInSequence - startPosInSequence - litLength;
+                if (matchLength > blockSize && firstHalfMatchLength >= cctx->appliedParams.cParams.minMatch) {
+                    /* Only ever split the match if it is larger than the block size */
+                    U32 secondHalfMatchLength = currSeq.matchLength + currSeq.litLength - endPosInSequence;
+                    if (secondHalfMatchLength < cctx->appliedParams.cParams.minMatch) {
+                        /* Move the endPosInSequence backward so that it creates match of minMatch length */
+                        endPosInSequence -= cctx->appliedParams.cParams.minMatch - secondHalfMatchLength;
+                        bytesAdjustment = cctx->appliedParams.cParams.minMatch - secondHalfMatchLength;
+                        firstHalfMatchLength -= bytesAdjustment;
+                    }
+                    matchLength = firstHalfMatchLength;
+                    /* Flag that we split the last match - after storing the sequence, exit the loop,
+                       but keep the value of endPosInSequence */
+                    finalMatchSplit = 1;
+                } else {
+                    /* Move the position in sequence backwards so that we don't split match, and break to store
+                     * the last literals. We use the original currSeq.litLength as a marker for where endPosInSequence
+                     * should go. We prefer to do this whenever it is not necessary to split the match, or if doing so
+                     * would cause the first half of the match to be too small
+                     */
+                    bytesAdjustment = endPosInSequence - currSeq.litLength;
+                    endPosInSequence = currSeq.litLength;
+                    break;
+                }
+            } else {
+                /* This sequence ends inside the literals, break to store the last literals */
+                break;
+            }
+        }
+        /* Check if this offset can be represented with a repcode */
+        {   U32 ll0 = (litLength == 0);
+            offCode = ZSTD_finalizeOffCode(rawOffset, updatedRepcodes.rep, ll0);
+            updatedRepcodes = ZSTD_updateRep(updatedRepcodes.rep, offCode, ll0);
+        }
+
+        if (cctx->appliedParams.validateSequences) {
+            seqPos->posInSrc += litLength + matchLength;
+            FORWARD_IF_ERROR(ZSTD_validateSequence(offCode, matchLength, seqPos->posInSrc,
+                                                   cctx->appliedParams.cParams.windowLog, dictSize,
+                                                   cctx->appliedParams.cParams.minMatch),
+                                                   "Sequence validation failed");
+        }
+        DEBUGLOG(6, "Storing sequence: (of: %u, ml: %u, ll: %u)", offCode, matchLength, litLength);
+        RETURN_ERROR_IF(idx - seqPos->idx > cctx->seqStore.maxNbSeq, memory_allocation,
+                        "Not enough memory allocated. Try adjusting ZSTD_c_minMatch.");
+        ZSTD_storeSeq(&cctx->seqStore, litLength, ip, iend, offCode, matchLength - MINMATCH);
+        ip += matchLength + litLength;
+    }
+    DEBUGLOG(5, "Ending seq: idx: %u (of: %u ml: %u ll: %u)", idx, inSeqs[idx].offset, inSeqs[idx].matchLength, inSeqs[idx].litLength);
+    assert(idx == inSeqsSize || endPosInSequence <= inSeqs[idx].litLength + inSeqs[idx].matchLength);
+    seqPos->idx = idx;
+    seqPos->posInSequence = endPosInSequence;
+    ZSTD_memcpy(cctx->blockState.nextCBlock->rep, updatedRepcodes.rep, sizeof(repcodes_t));
+
+    iend -= bytesAdjustment;
+    if (ip != iend) {
+        /* Store any last literals */
+        U32 lastLLSize = (U32)(iend - ip);
+        assert(ip <= iend);
+        DEBUGLOG(6, "Storing last literals of size: %u", lastLLSize);
+        ZSTD_storeLastLiterals(&cctx->seqStore, ip, lastLLSize);
+        seqPos->posInSrc += lastLLSize;
+    }
+
+    return bytesAdjustment;
+}
+
+typedef size_t (*ZSTD_sequenceCopier) (ZSTD_CCtx* cctx, ZSTD_sequencePosition* seqPos,
+                                       const ZSTD_Sequence* const inSeqs, size_t inSeqsSize,
+                                       const void* src, size_t blockSize);
+static ZSTD_sequenceCopier ZSTD_selectSequenceCopier(ZSTD_sequenceFormat_e mode) {
+    ZSTD_sequenceCopier sequenceCopier = NULL;
+    assert(ZSTD_cParam_withinBounds(ZSTD_c_blockDelimiters, mode));
+    if (mode == ZSTD_sf_explicitBlockDelimiters) {
+        return ZSTD_copySequencesToSeqStoreExplicitBlockDelim;
+    } else if (mode == ZSTD_sf_noBlockDelimiters) {
+        return ZSTD_copySequencesToSeqStoreNoBlockDelim;
+    }
+    assert(sequenceCopier != NULL);
+    return sequenceCopier;
+}
+
+/* Compress, block-by-block, all of the sequences given.
+ *
+ * Returns the cumulative size of all compressed blocks (including their headers), otherwise a ZSTD error.
+ */
+static size_t ZSTD_compressSequences_internal(ZSTD_CCtx* cctx,
+                                              void* dst, size_t dstCapacity,
+                                              const ZSTD_Sequence* inSeqs, size_t inSeqsSize,
+                                              const void* src, size_t srcSize) {
+    size_t cSize = 0;
+    U32 lastBlock;
+    size_t blockSize;
+    size_t compressedSeqsSize;
+    size_t remaining = srcSize;
+    ZSTD_sequencePosition seqPos = {0, 0, 0};
+
+    BYTE const* ip = (BYTE const*)src;
+    BYTE* op = (BYTE*)dst;
+    ZSTD_sequenceCopier sequenceCopier = ZSTD_selectSequenceCopier(cctx->appliedParams.blockDelimiters);
+
+    DEBUGLOG(4, "ZSTD_compressSequences_internal srcSize: %zu, inSeqsSize: %zu", srcSize, inSeqsSize);
+    /* Special case: empty frame */
+    if (remaining == 0) {
+        U32 const cBlockHeader24 = 1 /* last block */ + (((U32)bt_raw)<<1);
+        RETURN_ERROR_IF(dstCapacity<4, dstSize_tooSmall, "No room for empty frame block header");
+        MEM_writeLE32(op, cBlockHeader24);
+        op += ZSTD_blockHeaderSize;
+        dstCapacity -= ZSTD_blockHeaderSize;
+        cSize += ZSTD_blockHeaderSize;
+    }
+
+    while (remaining) {
+        size_t cBlockSize;
+        size_t additionalByteAdjustment;
+        lastBlock = remaining <= cctx->blockSize;
+        blockSize = lastBlock ? (U32)remaining : (U32)cctx->blockSize;
+        ZSTD_resetSeqStore(&cctx->seqStore);
+        DEBUGLOG(4, "Working on new block. Blocksize: %zu", blockSize);
+
+        additionalByteAdjustment = sequenceCopier(cctx, &seqPos, inSeqs, inSeqsSize, ip, blockSize);
+        FORWARD_IF_ERROR(additionalByteAdjustment, "Bad sequence copy");
+        blockSize -= additionalByteAdjustment;
+
+        /* If blocks are too small, emit as a nocompress block */
+        if (blockSize < MIN_CBLOCK_SIZE+ZSTD_blockHeaderSize+1) {
+            cBlockSize = ZSTD_noCompressBlock(op, dstCapacity, ip, blockSize, lastBlock);
+            FORWARD_IF_ERROR(cBlockSize, "Nocompress block failed");
+            DEBUGLOG(4, "Block too small, writing out nocompress block: cSize: %zu", cBlockSize);
+            cSize += cBlockSize;
+            ip += blockSize;
+            op += cBlockSize;
+            remaining -= blockSize;
+            dstCapacity -= cBlockSize;
+            continue;
+        }
+
+        compressedSeqsSize = ZSTD_entropyCompressSeqStore(&cctx->seqStore,
+                                &cctx->blockState.prevCBlock->entropy, &cctx->blockState.nextCBlock->entropy,
+                                &cctx->appliedParams,
+                                op + ZSTD_blockHeaderSize /* Leave space for block header */, dstCapacity - ZSTD_blockHeaderSize,
+                                blockSize,
+                                cctx->entropyWorkspace, ENTROPY_WORKSPACE_SIZE /* statically allocated in resetCCtx */,
+                                cctx->bmi2);
+        FORWARD_IF_ERROR(compressedSeqsSize, "Compressing sequences of block failed");
+        DEBUGLOG(4, "Compressed sequences size: %zu", compressedSeqsSize);
+
+        if (!cctx->isFirstBlock &&
+            ZSTD_maybeRLE(&cctx->seqStore) &&
+            ZSTD_isRLE((BYTE const*)src, srcSize)) {
+            /* We don't want to emit our first block as a RLE even if it qualifies because
+            * doing so will cause the decoder (cli only) to throw a "should consume all input error."
+            * This is only an issue for zstd <= v1.4.3
+            */
+            compressedSeqsSize = 1;
+        }
+
+        if (compressedSeqsSize == 0) {
+            /* ZSTD_noCompressBlock writes the block header as well */
+            cBlockSize = ZSTD_noCompressBlock(op, dstCapacity, ip, blockSize, lastBlock);
+            FORWARD_IF_ERROR(cBlockSize, "Nocompress block failed");
+            DEBUGLOG(4, "Writing out nocompress block, size: %zu", cBlockSize);
+        } else if (compressedSeqsSize == 1) {
+            cBlockSize = ZSTD_rleCompressBlock(op, dstCapacity, *ip, blockSize, lastBlock);
+            FORWARD_IF_ERROR(cBlockSize, "RLE compress block failed");
+            DEBUGLOG(4, "Writing out RLE block, size: %zu", cBlockSize);
+        } else {
+            U32 cBlockHeader;
+            /* Error checking and repcodes update */
+            ZSTD_blockState_confirmRepcodesAndEntropyTables(&cctx->blockState);
+            if (cctx->blockState.prevCBlock->entropy.fse.offcode_repeatMode == FSE_repeat_valid)
+                cctx->blockState.prevCBlock->entropy.fse.offcode_repeatMode = FSE_repeat_check;
+
+            /* Write block header into beginning of block*/
+            cBlockHeader = lastBlock + (((U32)bt_compressed)<<1) + (U32)(compressedSeqsSize << 3);
+            MEM_writeLE24(op, cBlockHeader);
+            cBlockSize = ZSTD_blockHeaderSize + compressedSeqsSize;
+            DEBUGLOG(4, "Writing out compressed block, size: %zu", cBlockSize);
+        }
+
+        cSize += cBlockSize;
+        DEBUGLOG(4, "cSize running total: %zu", cSize);
+
+        if (lastBlock) {
+            break;
+        } else {
+            ip += blockSize;
+            op += cBlockSize;
+            remaining -= blockSize;
+            dstCapacity -= cBlockSize;
+            cctx->isFirstBlock = 0;
+        }
+    }
+
+    return cSize;
+}
+
+size_t ZSTD_compressSequences(ZSTD_CCtx* const cctx, void* dst, size_t dstCapacity,
+                              const ZSTD_Sequence* inSeqs, size_t inSeqsSize,
+                              const void* src, size_t srcSize) {
+    BYTE* op = (BYTE*)dst;
+    size_t cSize = 0;
+    size_t compressedBlocksSize = 0;
+    size_t frameHeaderSize = 0;
+
+    /* Transparent initialization stage, same as compressStream2() */
+    DEBUGLOG(3, "ZSTD_compressSequences()");
+    assert(cctx != NULL);
+    FORWARD_IF_ERROR(ZSTD_CCtx_init_compressStream2(cctx, ZSTD_e_end, srcSize), "CCtx initialization failed");
+    /* Begin writing output, starting with frame header */
+    frameHeaderSize = ZSTD_writeFrameHeader(op, dstCapacity, &cctx->appliedParams, srcSize, cctx->dictID);
+    op += frameHeaderSize;
+    dstCapacity -= frameHeaderSize;
+    cSize += frameHeaderSize;
+    if (cctx->appliedParams.fParams.checksumFlag && srcSize) {
+        XXH64_update(&cctx->xxhState, src, srcSize);
+    }
+    /* cSize includes block header size and compressed sequences size */
+    compressedBlocksSize = ZSTD_compressSequences_internal(cctx,
+                                                           op, dstCapacity,
+                                                           inSeqs, inSeqsSize,
+                                                           src, srcSize);
+    FORWARD_IF_ERROR(compressedBlocksSize, "Compressing blocks failed!");
+    cSize += compressedBlocksSize;
+    dstCapacity -= compressedBlocksSize;
+
+    if (cctx->appliedParams.fParams.checksumFlag) {
+        U32 const checksum = (U32) XXH64_digest(&cctx->xxhState);
+        RETURN_ERROR_IF(dstCapacity<4, dstSize_tooSmall, "no room for checksum");
+        DEBUGLOG(4, "Write checksum : %08X", (unsigned)checksum);
+        MEM_writeLE32((char*)dst + cSize, checksum);
+        cSize += 4;
+    }
+
+    DEBUGLOG(3, "Final compressed size: %zu", cSize);
+    return cSize;
+}
+
+/*======   Finalize   ======*/
+
+/*! ZSTD_flushStream() :
+ * @return : amount of data remaining to flush */
+size_t ZSTD_flushStream(ZSTD_CStream* zcs, ZSTD_outBuffer* output)
+{
+    ZSTD_inBuffer input = { NULL, 0, 0 };
+    return ZSTD_compressStream2(zcs, output, &input, ZSTD_e_flush);
+}
+
+
+size_t ZSTD_endStream(ZSTD_CStream* zcs, ZSTD_outBuffer* output)
+{
+    ZSTD_inBuffer input = { NULL, 0, 0 };
+    size_t const remainingToFlush = ZSTD_compressStream2(zcs, output, &input, ZSTD_e_end);
+    FORWARD_IF_ERROR( remainingToFlush , "ZSTD_compressStream2 failed");
+    if (zcs->appliedParams.nbWorkers > 0) return remainingToFlush;   /* minimal estimation */
+    /* single thread mode : attempt to calculate remaining to flush more precisely */
+    {   size_t const lastBlockSize = zcs->frameEnded ? 0 : ZSTD_BLOCKHEADERSIZE;
+        size_t const checksumSize = (size_t)(zcs->frameEnded ? 0 : zcs->appliedParams.fParams.checksumFlag * 4);
+        size_t const toFlush = remainingToFlush + lastBlockSize + checksumSize;
+        DEBUGLOG(4, "ZSTD_endStream : remaining to flush : %u", (unsigned)toFlush);
+        return toFlush;
+    }
+}
+
+
+/*-=====  Pre-defined compression levels  =====-*/
+
+#define ZSTD_MAX_CLEVEL     22
+int ZSTD_maxCLevel(void) { return ZSTD_MAX_CLEVEL; }
+int ZSTD_minCLevel(void) { return (int)-ZSTD_TARGETLENGTH_MAX; }
+int ZSTD_defaultCLevel(void) { return ZSTD_CLEVEL_DEFAULT; }
+
+static const ZSTD_compressionParameters ZSTD_defaultCParameters[4][ZSTD_MAX_CLEVEL+1] = {
+{   /* "default" - for any srcSize > 256 KB */
+    /* W,  C,  H,  S,  L, TL, strat */
+    { 19, 12, 13,  1,  6,  1, ZSTD_fast    },  /* base for negative levels */
+    { 19, 13, 14,  1,  7,  0, ZSTD_fast    },  /* level  1 */
+    { 20, 15, 16,  1,  6,  0, ZSTD_fast    },  /* level  2 */
+    { 21, 16, 17,  1,  5,  0, ZSTD_dfast   },  /* level  3 */
+    { 21, 18, 18,  1,  5,  0, ZSTD_dfast   },  /* level  4 */
+    { 21, 18, 19,  2,  5,  2, ZSTD_greedy  },  /* level  5 */
+    { 21, 19, 19,  3,  5,  4, ZSTD_greedy  },  /* level  6 */
+    { 21, 19, 19,  3,  5,  8, ZSTD_lazy    },  /* level  7 */
+    { 21, 19, 19,  3,  5, 16, ZSTD_lazy2   },  /* level  8 */
+    { 21, 19, 20,  4,  5, 16, ZSTD_lazy2   },  /* level  9 */
+    { 22, 20, 21,  4,  5, 16, ZSTD_lazy2   },  /* level 10 */
+    { 22, 21, 22,  4,  5, 16, ZSTD_lazy2   },  /* level 11 */
+    { 22, 21, 22,  5,  5, 16, ZSTD_lazy2   },  /* level 12 */
+    { 22, 21, 22,  5,  5, 32, ZSTD_btlazy2 },  /* level 13 */
+    { 22, 22, 23,  5,  5, 32, ZSTD_btlazy2 },  /* level 14 */
+    { 22, 23, 23,  6,  5, 32, ZSTD_btlazy2 },  /* level 15 */
+    { 22, 22, 22,  5,  5, 48, ZSTD_btopt   },  /* level 16 */
+    { 23, 23, 22,  5,  4, 64, ZSTD_btopt   },  /* level 17 */
+    { 23, 23, 22,  6,  3, 64, ZSTD_btultra },  /* level 18 */
+    { 23, 24, 22,  7,  3,256, ZSTD_btultra2},  /* level 19 */
+    { 25, 25, 23,  7,  3,256, ZSTD_btultra2},  /* level 20 */
+    { 26, 26, 24,  7,  3,512, ZSTD_btultra2},  /* level 21 */
+    { 27, 27, 25,  9,  3,999, ZSTD_btultra2},  /* level 22 */
+},
+{   /* for srcSize <= 256 KB */
+    /* W,  C,  H,  S,  L,  T, strat */
+    { 18, 12, 13,  1,  5,  1, ZSTD_fast    },  /* base for negative levels */
+    { 18, 13, 14,  1,  6,  0, ZSTD_fast    },  /* level  1 */
+    { 18, 14, 14,  1,  5,  0, ZSTD_dfast   },  /* level  2 */
+    { 18, 16, 16,  1,  4,  0, ZSTD_dfast   },  /* level  3 */
+    { 18, 16, 17,  2,  5,  2, ZSTD_greedy  },  /* level  4.*/
+    { 18, 18, 18,  3,  5,  2, ZSTD_greedy  },  /* level  5.*/
+    { 18, 18, 19,  3,  5,  4, ZSTD_lazy    },  /* level  6.*/
+    { 18, 18, 19,  4,  4,  4, ZSTD_lazy    },  /* level  7 */
+    { 18, 18, 19,  4,  4,  8, ZSTD_lazy2   },  /* level  8 */
+    { 18, 18, 19,  5,  4,  8, ZSTD_lazy2   },  /* level  9 */
+    { 18, 18, 19,  6,  4,  8, ZSTD_lazy2   },  /* level 10 */
+    { 18, 18, 19,  5,  4, 12, ZSTD_btlazy2 },  /* level 11.*/
+    { 18, 19, 19,  7,  4, 12, ZSTD_btlazy2 },  /* level 12.*/
+    { 18, 18, 19,  4,  4, 16, ZSTD_btopt   },  /* level 13 */
+    { 18, 18, 19,  4,  3, 32, ZSTD_btopt   },  /* level 14.*/
+    { 18, 18, 19,  6,  3,128, ZSTD_btopt   },  /* level 15.*/
+    { 18, 19, 19,  6,  3,128, ZSTD_btultra },  /* level 16.*/
+    { 18, 19, 19,  8,  3,256, ZSTD_btultra },  /* level 17.*/
+    { 18, 19, 19,  6,  3,128, ZSTD_btultra2},  /* level 18.*/
+    { 18, 19, 19,  8,  3,256, ZSTD_btultra2},  /* level 19.*/
+    { 18, 19, 19, 10,  3,512, ZSTD_btultra2},  /* level 20.*/
+    { 18, 19, 19, 12,  3,512, ZSTD_btultra2},  /* level 21.*/
+    { 18, 19, 19, 13,  3,999, ZSTD_btultra2},  /* level 22.*/
+},
+{   /* for srcSize <= 128 KB */
+    /* W,  C,  H,  S,  L,  T, strat */
+    { 17, 12, 12,  1,  5,  1, ZSTD_fast    },  /* base for negative levels */
+    { 17, 12, 13,  1,  6,  0, ZSTD_fast    },  /* level  1 */
+    { 17, 13, 15,  1,  5,  0, ZSTD_fast    },  /* level  2 */
+    { 17, 15, 16,  2,  5,  0, ZSTD_dfast   },  /* level  3 */
+    { 17, 17, 17,  2,  4,  0, ZSTD_dfast   },  /* level  4 */
+    { 17, 16, 17,  3,  4,  2, ZSTD_greedy  },  /* level  5 */
+    { 17, 17, 17,  3,  4,  4, ZSTD_lazy    },  /* level  6 */
+    { 17, 17, 17,  3,  4,  8, ZSTD_lazy2   },  /* level  7 */
+    { 17, 17, 17,  4,  4,  8, ZSTD_lazy2   },  /* level  8 */
+    { 17, 17, 17,  5,  4,  8, ZSTD_lazy2   },  /* level  9 */
+    { 17, 17, 17,  6,  4,  8, ZSTD_lazy2   },  /* level 10 */
+    { 17, 17, 17,  5,  4,  8, ZSTD_btlazy2 },  /* level 11 */
+    { 17, 18, 17,  7,  4, 12, ZSTD_btlazy2 },  /* level 12 */
+    { 17, 18, 17,  3,  4, 12, ZSTD_btopt   },  /* level 13.*/
+    { 17, 18, 17,  4,  3, 32, ZSTD_btopt   },  /* level 14.*/
+    { 17, 18, 17,  6,  3,256, ZSTD_btopt   },  /* level 15.*/
+    { 17, 18, 17,  6,  3,128, ZSTD_btultra },  /* level 16.*/
+    { 17, 18, 17,  8,  3,256, ZSTD_btultra },  /* level 17.*/
+    { 17, 18, 17, 10,  3,512, ZSTD_btultra },  /* level 18.*/
+    { 17, 18, 17,  5,  3,256, ZSTD_btultra2},  /* level 19.*/
+    { 17, 18, 17,  7,  3,512, ZSTD_btultra2},  /* level 20.*/
+    { 17, 18, 17,  9,  3,512, ZSTD_btultra2},  /* level 21.*/
+    { 17, 18, 17, 11,  3,999, ZSTD_btultra2},  /* level 22.*/
+},
+{   /* for srcSize <= 16 KB */
+    /* W,  C,  H,  S,  L,  T, strat */
+    { 14, 12, 13,  1,  5,  1, ZSTD_fast    },  /* base for negative levels */
+    { 14, 14, 15,  1,  5,  0, ZSTD_fast    },  /* level  1 */
+    { 14, 14, 15,  1,  4,  0, ZSTD_fast    },  /* level  2 */
+    { 14, 14, 15,  2,  4,  0, ZSTD_dfast   },  /* level  3 */
+    { 14, 14, 14,  4,  4,  2, ZSTD_greedy  },  /* level  4 */
+    { 14, 14, 14,  3,  4,  4, ZSTD_lazy    },  /* level  5.*/
+    { 14, 14, 14,  4,  4,  8, ZSTD_lazy2   },  /* level  6 */
+    { 14, 14, 14,  6,  4,  8, ZSTD_lazy2   },  /* level  7 */
+    { 14, 14, 14,  8,  4,  8, ZSTD_lazy2   },  /* level  8.*/
+    { 14, 15, 14,  5,  4,  8, ZSTD_btlazy2 },  /* level  9.*/
+    { 14, 15, 14,  9,  4,  8, ZSTD_btlazy2 },  /* level 10.*/
+    { 14, 15, 14,  3,  4, 12, ZSTD_btopt   },  /* level 11.*/
+    { 14, 15, 14,  4,  3, 24, ZSTD_btopt   },  /* level 12.*/
+    { 14, 15, 14,  5,  3, 32, ZSTD_btultra },  /* level 13.*/
+    { 14, 15, 15,  6,  3, 64, ZSTD_btultra },  /* level 14.*/
+    { 14, 15, 15,  7,  3,256, ZSTD_btultra },  /* level 15.*/
+    { 14, 15, 15,  5,  3, 48, ZSTD_btultra2},  /* level 16.*/
+    { 14, 15, 15,  6,  3,128, ZSTD_btultra2},  /* level 17.*/
+    { 14, 15, 15,  7,  3,256, ZSTD_btultra2},  /* level 18.*/
+    { 14, 15, 15,  8,  3,256, ZSTD_btultra2},  /* level 19.*/
+    { 14, 15, 15,  8,  3,512, ZSTD_btultra2},  /* level 20.*/
+    { 14, 15, 15,  9,  3,512, ZSTD_btultra2},  /* level 21.*/
+    { 14, 15, 15, 10,  3,999, ZSTD_btultra2},  /* level 22.*/
+},
+};
+
+static ZSTD_compressionParameters ZSTD_dedicatedDictSearch_getCParams(int const compressionLevel, size_t const dictSize)
+{
+    ZSTD_compressionParameters cParams = ZSTD_getCParams_internal(compressionLevel, 0, dictSize, ZSTD_cpm_createCDict);
+    switch (cParams.strategy) {
+        case ZSTD_fast:
+        case ZSTD_dfast:
+            break;
+        case ZSTD_greedy:
+        case ZSTD_lazy:
+        case ZSTD_lazy2:
+            cParams.hashLog += ZSTD_LAZY_DDSS_BUCKET_LOG;
+            break;
+        case ZSTD_btlazy2:
+        case ZSTD_btopt:
+        case ZSTD_btultra:
+        case ZSTD_btultra2:
+            break;
+    }
+    return cParams;
+}
+
+static int ZSTD_dedicatedDictSearch_isSupported(
+        ZSTD_compressionParameters const* cParams)
+{
+    return (cParams->strategy >= ZSTD_greedy)
+        && (cParams->strategy <= ZSTD_lazy2)
+        && (cParams->hashLog > cParams->chainLog)
+        && (cParams->chainLog <= 24);
+}
+
+/**
+ * Reverses the adjustment applied to cparams when enabling dedicated dict
+ * search. This is used to recover the params set to be used in the working
+ * context. (Otherwise, those tables would also grow.)
+ */
+static void ZSTD_dedicatedDictSearch_revertCParams(
+        ZSTD_compressionParameters* cParams) {
+    switch (cParams->strategy) {
+        case ZSTD_fast:
+        case ZSTD_dfast:
+            break;
+        case ZSTD_greedy:
+        case ZSTD_lazy:
+        case ZSTD_lazy2:
+            cParams->hashLog -= ZSTD_LAZY_DDSS_BUCKET_LOG;
+            if (cParams->hashLog < ZSTD_HASHLOG_MIN) {
+                cParams->hashLog = ZSTD_HASHLOG_MIN;
+            }
+            break;
+        case ZSTD_btlazy2:
+        case ZSTD_btopt:
+        case ZSTD_btultra:
+        case ZSTD_btultra2:
+            break;
+    }
+}
+
+static U64 ZSTD_getCParamRowSize(U64 srcSizeHint, size_t dictSize, ZSTD_cParamMode_e mode)
+{
+    switch (mode) {
+    case ZSTD_cpm_unknown:
+    case ZSTD_cpm_noAttachDict:
+    case ZSTD_cpm_createCDict:
+        break;
+    case ZSTD_cpm_attachDict:
+        dictSize = 0;
+        break;
+    default:
+        assert(0);
+        break;
+    }
+    {   int const unknown = srcSizeHint == ZSTD_CONTENTSIZE_UNKNOWN;
+        size_t const addedSize = unknown && dictSize > 0 ? 500 : 0;
+        return unknown && dictSize == 0 ? ZSTD_CONTENTSIZE_UNKNOWN : srcSizeHint+dictSize+addedSize;
+    }
+}
+
+/*! ZSTD_getCParams_internal() :
+ * @return ZSTD_compressionParameters structure for a selected compression level, srcSize and dictSize.
+ *  Note: srcSizeHint 0 means 0, use ZSTD_CONTENTSIZE_UNKNOWN for unknown.
+ *        Use dictSize == 0 for unknown or unused.
+ *  Note: `mode` controls how we treat the `dictSize`. See docs for `ZSTD_cParamMode_e`. */
+static ZSTD_compressionParameters ZSTD_getCParams_internal(int compressionLevel, unsigned long long srcSizeHint, size_t dictSize, ZSTD_cParamMode_e mode)
+{
+    U64 const rSize = ZSTD_getCParamRowSize(srcSizeHint, dictSize, mode);
+    U32 const tableID = (rSize <= 256 KB) + (rSize <= 128 KB) + (rSize <= 16 KB);
+    int row;
+    DEBUGLOG(5, "ZSTD_getCParams_internal (cLevel=%i)", compressionLevel);
+
+    /* row */
+    if (compressionLevel == 0) row = ZSTD_CLEVEL_DEFAULT;   /* 0 == default */
+    else if (compressionLevel < 0) row = 0;   /* entry 0 is baseline for fast mode */
+    else if (compressionLevel > ZSTD_MAX_CLEVEL) row = ZSTD_MAX_CLEVEL;
+    else row = compressionLevel;
+
+    {   ZSTD_compressionParameters cp = ZSTD_defaultCParameters[tableID][row];
+        DEBUGLOG(5, "ZSTD_getCParams_internal selected tableID: %u row: %u strat: %u", tableID, row, (U32)cp.strategy);
+        /* acceleration factor */
+        if (compressionLevel < 0) {
+            int const clampedCompressionLevel = MAX(ZSTD_minCLevel(), compressionLevel);
+            cp.targetLength = (unsigned)(-clampedCompressionLevel);
+        }
+        /* refine parameters based on srcSize & dictSize */
+        return ZSTD_adjustCParams_internal(cp, srcSizeHint, dictSize, mode);
+    }
+}
+
+/*! ZSTD_getCParams() :
+ * @return ZSTD_compressionParameters structure for a selected compression level, srcSize and dictSize.
+ *  Size values are optional, provide 0 if not known or unused */
+ZSTD_compressionParameters ZSTD_getCParams(int compressionLevel, unsigned long long srcSizeHint, size_t dictSize)
+{
+    if (srcSizeHint == 0) srcSizeHint = ZSTD_CONTENTSIZE_UNKNOWN;
+    return ZSTD_getCParams_internal(compressionLevel, srcSizeHint, dictSize, ZSTD_cpm_unknown);
+}
+
+/*! ZSTD_getParams() :
+ *  same idea as ZSTD_getCParams()
+ * @return a `ZSTD_parameters` structure (instead of `ZSTD_compressionParameters`).
+ *  Fields of `ZSTD_frameParameters` are set to default values */
+static ZSTD_parameters ZSTD_getParams_internal(int compressionLevel, unsigned long long srcSizeHint, size_t dictSize, ZSTD_cParamMode_e mode) {
+    ZSTD_parameters params;
+    ZSTD_compressionParameters const cParams = ZSTD_getCParams_internal(compressionLevel, srcSizeHint, dictSize, mode);
+    DEBUGLOG(5, "ZSTD_getParams (cLevel=%i)", compressionLevel);
+    ZSTD_memset(&params, 0, sizeof(params));
+    params.cParams = cParams;
+    params.fParams.contentSizeFlag = 1;
+    return params;
+}
+
+/*! ZSTD_getParams() :
+ *  same idea as ZSTD_getCParams()
+ * @return a `ZSTD_parameters` structure (instead of `ZSTD_compressionParameters`).
+ *  Fields of `ZSTD_frameParameters` are set to default values */
+ZSTD_parameters ZSTD_getParams(int compressionLevel, unsigned long long srcSizeHint, size_t dictSize) {
+    if (srcSizeHint == 0) srcSizeHint = ZSTD_CONTENTSIZE_UNKNOWN;
+    return ZSTD_getParams_internal(compressionLevel, srcSizeHint, dictSize, ZSTD_cpm_unknown);
+}
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_compress_internal.h mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_compress_internal.h
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_compress_internal.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_compress_internal.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,1367 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+/* This header contains definitions
+ * that shall **only** be used by modules within lib/compress.
+ */
+
+#ifndef ZSTD_COMPRESS_H
+#define ZSTD_COMPRESS_H
+
+/*-*************************************
+*  Dependencies
+***************************************/
+#include "../common/zstd_internal.h"
+#include "zstd_cwksp.h"
+#ifdef ZSTD_MULTITHREAD
+#  include "zstdmt_compress.h"
+#endif
+
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
+/*-*************************************
+*  Constants
+***************************************/
+#define kSearchStrength      8
+#define HASH_READ_SIZE       8
+#define ZSTD_DUBT_UNSORTED_MARK 1   /* For btlazy2 strategy, index ZSTD_DUBT_UNSORTED_MARK==1 means "unsorted".
+                                       It could be confused for a real successor at index "1", if sorted as larger than its predecessor.
+                                       It's not a big deal though : candidate will just be sorted again.
+                                       Additionally, candidate position 1 will be lost.
+                                       But candidate 1 cannot hide a large tree of candidates, so it's a minimal loss.
+                                       The benefit is that ZSTD_DUBT_UNSORTED_MARK cannot be mishandled after table re-use with a different strategy.
+                                       This constant is required by ZSTD_compressBlock_btlazy2() and ZSTD_reduceTable_internal() */
+
+
+/*-*************************************
+*  Context memory management
+***************************************/
+typedef enum { ZSTDcs_created=0, ZSTDcs_init, ZSTDcs_ongoing, ZSTDcs_ending } ZSTD_compressionStage_e;
+typedef enum { zcss_init=0, zcss_load, zcss_flush } ZSTD_cStreamStage;
+
+typedef struct ZSTD_prefixDict_s {
+    const void* dict;
+    size_t dictSize;
+    ZSTD_dictContentType_e dictContentType;
+} ZSTD_prefixDict;
+
+typedef struct {
+    void* dictBuffer;
+    void const* dict;
+    size_t dictSize;
+    ZSTD_dictContentType_e dictContentType;
+    ZSTD_CDict* cdict;
+} ZSTD_localDict;
+
+typedef struct {
+    HUF_CElt CTable[HUF_CTABLE_SIZE_U32(255)];
+    HUF_repeat repeatMode;
+} ZSTD_hufCTables_t;
+
+typedef struct {
+    FSE_CTable offcodeCTable[FSE_CTABLE_SIZE_U32(OffFSELog, MaxOff)];
+    FSE_CTable matchlengthCTable[FSE_CTABLE_SIZE_U32(MLFSELog, MaxML)];
+    FSE_CTable litlengthCTable[FSE_CTABLE_SIZE_U32(LLFSELog, MaxLL)];
+    FSE_repeat offcode_repeatMode;
+    FSE_repeat matchlength_repeatMode;
+    FSE_repeat litlength_repeatMode;
+} ZSTD_fseCTables_t;
+
+typedef struct {
+    ZSTD_hufCTables_t huf;
+    ZSTD_fseCTables_t fse;
+} ZSTD_entropyCTables_t;
+
+/***********************************************
+*  Entropy buffer statistics structs and funcs *
+***********************************************/
+/** ZSTD_hufCTablesMetadata_t :
+ *  Stores Literals Block Type for a super-block in hType, and
+ *  huffman tree description in hufDesBuffer.
+ *  hufDesSize refers to the size of huffman tree description in bytes.
+ *  This metadata is populated in ZSTD_buildBlockEntropyStats_literals() */
+typedef struct {
+    symbolEncodingType_e hType;
+    BYTE hufDesBuffer[ZSTD_MAX_HUF_HEADER_SIZE];
+    size_t hufDesSize;
+} ZSTD_hufCTablesMetadata_t;
+
+/** ZSTD_fseCTablesMetadata_t :
+ *  Stores symbol compression modes for a super-block in {ll, ol, ml}Type, and
+ *  fse tables in fseTablesBuffer.
+ *  fseTablesSize refers to the size of fse tables in bytes.
+ *  This metadata is populated in ZSTD_buildBlockEntropyStats_sequences() */
+typedef struct {
+    symbolEncodingType_e llType;
+    symbolEncodingType_e ofType;
+    symbolEncodingType_e mlType;
+    BYTE fseTablesBuffer[ZSTD_MAX_FSE_HEADERS_SIZE];
+    size_t fseTablesSize;
+    size_t lastCountSize; /* This is to account for bug in 1.3.4. More detail in ZSTD_entropyCompressSeqStore_internal() */
+} ZSTD_fseCTablesMetadata_t;
+
+typedef struct {
+    ZSTD_hufCTablesMetadata_t hufMetadata;
+    ZSTD_fseCTablesMetadata_t fseMetadata;
+} ZSTD_entropyCTablesMetadata_t;
+
+/** ZSTD_buildBlockEntropyStats() :
+ *  Builds entropy for the block.
+ *  @return : 0 on success or error code */
+size_t ZSTD_buildBlockEntropyStats(seqStore_t* seqStorePtr,
+                             const ZSTD_entropyCTables_t* prevEntropy,
+                                   ZSTD_entropyCTables_t* nextEntropy,
+                             const ZSTD_CCtx_params* cctxParams,
+                                   ZSTD_entropyCTablesMetadata_t* entropyMetadata,
+                                   void* workspace, size_t wkspSize);
+
+/*********************************
+*  Compression internals structs *
+*********************************/
+
+typedef struct {
+    U32 off;            /* Offset code (offset + ZSTD_REP_MOVE) for the match */
+    U32 len;            /* Raw length of match */
+} ZSTD_match_t;
+
+typedef struct {
+    U32 offset;         /* Offset of sequence */
+    U32 litLength;      /* Length of literals prior to match */
+    U32 matchLength;    /* Raw length of match */
+} rawSeq;
+
+typedef struct {
+  rawSeq* seq;          /* The start of the sequences */
+  size_t pos;           /* The index in seq where reading stopped. pos <= size. */
+  size_t posInSequence; /* The position within the sequence at seq[pos] where reading
+                           stopped. posInSequence <= seq[pos].litLength + seq[pos].matchLength */
+  size_t size;          /* The number of sequences. <= capacity. */
+  size_t capacity;      /* The capacity starting from `seq` pointer */
+} rawSeqStore_t;
+
+UNUSED_ATTR static const rawSeqStore_t kNullRawSeqStore = {NULL, 0, 0, 0, 0};
+
+typedef struct {
+    int price;
+    U32 off;
+    U32 mlen;
+    U32 litlen;
+    U32 rep[ZSTD_REP_NUM];
+} ZSTD_optimal_t;
+
+typedef enum { zop_dynamic=0, zop_predef } ZSTD_OptPrice_e;
+
+typedef struct {
+    /* All tables are allocated inside cctx->workspace by ZSTD_resetCCtx_internal() */
+    unsigned* litFreq;           /* table of literals statistics, of size 256 */
+    unsigned* litLengthFreq;     /* table of litLength statistics, of size (MaxLL+1) */
+    unsigned* matchLengthFreq;   /* table of matchLength statistics, of size (MaxML+1) */
+    unsigned* offCodeFreq;       /* table of offCode statistics, of size (MaxOff+1) */
+    ZSTD_match_t* matchTable;    /* list of found matches, of size ZSTD_OPT_NUM+1 */
+    ZSTD_optimal_t* priceTable;  /* All positions tracked by optimal parser, of size ZSTD_OPT_NUM+1 */
+
+    U32  litSum;                 /* nb of literals */
+    U32  litLengthSum;           /* nb of litLength codes */
+    U32  matchLengthSum;         /* nb of matchLength codes */
+    U32  offCodeSum;             /* nb of offset codes */
+    U32  litSumBasePrice;        /* to compare to log2(litfreq) */
+    U32  litLengthSumBasePrice;  /* to compare to log2(llfreq)  */
+    U32  matchLengthSumBasePrice;/* to compare to log2(mlfreq)  */
+    U32  offCodeSumBasePrice;    /* to compare to log2(offreq)  */
+    ZSTD_OptPrice_e priceType;   /* prices can be determined dynamically, or follow a pre-defined cost structure */
+    const ZSTD_entropyCTables_t* symbolCosts;  /* pre-calculated dictionary statistics */
+    ZSTD_literalCompressionMode_e literalCompressionMode;
+} optState_t;
+
+typedef struct {
+  ZSTD_entropyCTables_t entropy;
+  U32 rep[ZSTD_REP_NUM];
+} ZSTD_compressedBlockState_t;
+
+typedef struct {
+    BYTE const* nextSrc;       /* next block here to continue on current prefix */
+    BYTE const* base;          /* All regular indexes relative to this position */
+    BYTE const* dictBase;      /* extDict indexes relative to this position */
+    U32 dictLimit;             /* below that point, need extDict */
+    U32 lowLimit;              /* below that point, no more valid data */
+    U32 nbOverflowCorrections; /* Number of times overflow correction has run since
+                                * ZSTD_window_init(). Useful for debugging coredumps
+                                * and for ZSTD_WINDOW_OVERFLOW_CORRECT_FREQUENTLY.
+                                */
+} ZSTD_window_t;
+
+typedef struct ZSTD_matchState_t ZSTD_matchState_t;
+
+#define ZSTD_ROW_HASH_CACHE_SIZE 8       /* Size of prefetching hash cache for row-based matchfinder */
+
+struct ZSTD_matchState_t {
+    ZSTD_window_t window;   /* State for window round buffer management */
+    U32 loadedDictEnd;      /* index of end of dictionary, within context's referential.
+                             * When loadedDictEnd != 0, a dictionary is in use, and still valid.
+                             * This relies on a mechanism to set loadedDictEnd=0 when dictionary is no longer within distance.
+                             * Such mechanism is provided within ZSTD_window_enforceMaxDist() and ZSTD_checkDictValidity().
+                             * When dict referential is copied into active context (i.e. not attached),
+                             * loadedDictEnd == dictSize, since referential starts from zero.
+                             */
+    U32 nextToUpdate;       /* index from which to continue table update */
+    U32 hashLog3;           /* dispatch table for matches of len==3 : larger == faster, more memory */
+
+    U32 rowHashLog;                          /* For row-based matchfinder: Hashlog based on nb of rows in the hashTable.*/
+    U16* tagTable;                           /* For row-based matchFinder: A row-based table containing the hashes and head index. */
+    U32 hashCache[ZSTD_ROW_HASH_CACHE_SIZE]; /* For row-based matchFinder: a cache of hashes to improve speed */
+
+    U32* hashTable;
+    U32* hashTable3;
+    U32* chainTable;
+
+    U32 forceNonContiguous; /* Non-zero if we should force non-contiguous load for the next window update. */
+
+    int dedicatedDictSearch;  /* Indicates whether this matchState is using the
+                               * dedicated dictionary search structure.
+                               */
+    optState_t opt;         /* optimal parser state */
+    const ZSTD_matchState_t* dictMatchState;
+    ZSTD_compressionParameters cParams;
+    const rawSeqStore_t* ldmSeqStore;
+};
+
+typedef struct {
+    ZSTD_compressedBlockState_t* prevCBlock;
+    ZSTD_compressedBlockState_t* nextCBlock;
+    ZSTD_matchState_t matchState;
+} ZSTD_blockState_t;
+
+typedef struct {
+    U32 offset;
+    U32 checksum;
+} ldmEntry_t;
+
+typedef struct {
+    BYTE const* split;
+    U32 hash;
+    U32 checksum;
+    ldmEntry_t* bucket;
+} ldmMatchCandidate_t;
+
+#define LDM_BATCH_SIZE 64
+
+typedef struct {
+    ZSTD_window_t window;   /* State for the window round buffer management */
+    ldmEntry_t* hashTable;
+    U32 loadedDictEnd;
+    BYTE* bucketOffsets;    /* Next position in bucket to insert entry */
+    size_t splitIndices[LDM_BATCH_SIZE];
+    ldmMatchCandidate_t matchCandidates[LDM_BATCH_SIZE];
+} ldmState_t;
+
+typedef struct {
+    U32 enableLdm;          /* 1 if enable long distance matching */
+    U32 hashLog;            /* Log size of hashTable */
+    U32 bucketSizeLog;      /* Log bucket size for collision resolution, at most 8 */
+    U32 minMatchLength;     /* Minimum match length */
+    U32 hashRateLog;       /* Log number of entries to skip */
+    U32 windowLog;          /* Window log for the LDM */
+} ldmParams_t;
+
+typedef struct {
+    int collectSequences;
+    ZSTD_Sequence* seqStart;
+    size_t seqIndex;
+    size_t maxSequences;
+} SeqCollector;
+
+struct ZSTD_CCtx_params_s {
+    ZSTD_format_e format;
+    ZSTD_compressionParameters cParams;
+    ZSTD_frameParameters fParams;
+
+    int compressionLevel;
+    int forceWindow;           /* force back-references to respect limit of
+                                * 1<<wLog, even for dictionary */
+    size_t targetCBlockSize;   /* Tries to fit compressed block size to be around targetCBlockSize.
+                                * No target when targetCBlockSize == 0.
+                                * There is no guarantee on compressed block size */
+    int srcSizeHint;           /* User's best guess of source size.
+                                * Hint is not valid when srcSizeHint == 0.
+                                * There is no guarantee that hint is close to actual source size */
+
+    ZSTD_dictAttachPref_e attachDictPref;
+    ZSTD_literalCompressionMode_e literalCompressionMode;
+
+    /* Multithreading: used to pass parameters to mtctx */
+    int nbWorkers;
+    size_t jobSize;
+    int overlapLog;
+    int rsyncable;
+
+    /* Long distance matching parameters */
+    ldmParams_t ldmParams;
+
+    /* Dedicated dict search algorithm trigger */
+    int enableDedicatedDictSearch;
+
+    /* Input/output buffer modes */
+    ZSTD_bufferMode_e inBufferMode;
+    ZSTD_bufferMode_e outBufferMode;
+
+    /* Sequence compression API */
+    ZSTD_sequenceFormat_e blockDelimiters;
+    int validateSequences;
+
+    /* Block splitting */
+    int splitBlocks;
+
+    /* Param for deciding whether to use row-based matchfinder */
+    ZSTD_useRowMatchFinderMode_e useRowMatchFinder;
+
+    /* Always load a dictionary in ext-dict mode (not prefix mode)? */
+    int deterministicRefPrefix;
+
+    /* Internal use, for createCCtxParams() and freeCCtxParams() only */
+    ZSTD_customMem customMem;
+};  /* typedef'd to ZSTD_CCtx_params within "zstd.h" */
+
+#define COMPRESS_SEQUENCES_WORKSPACE_SIZE (sizeof(unsigned) * (MaxSeq + 2))
+#define ENTROPY_WORKSPACE_SIZE (HUF_WORKSPACE_SIZE + COMPRESS_SEQUENCES_WORKSPACE_SIZE)
+
+/**
+ * Indicates whether this compression proceeds directly from user-provided
+ * source buffer to user-provided destination buffer (ZSTDb_not_buffered), or
+ * whether the context needs to buffer the input/output (ZSTDb_buffered).
+ */
+typedef enum {
+    ZSTDb_not_buffered,
+    ZSTDb_buffered
+} ZSTD_buffered_policy_e;
+
+struct ZSTD_CCtx_s {
+    ZSTD_compressionStage_e stage;
+    int cParamsChanged;                  /* == 1 if cParams(except wlog) or compression level are changed in requestedParams. Triggers transmission of new params to ZSTDMT (if available) then reset to 0. */
+    int bmi2;                            /* == 1 if the CPU supports BMI2 and 0 otherwise. CPU support is determined dynamically once per context lifetime. */
+    ZSTD_CCtx_params requestedParams;
+    ZSTD_CCtx_params appliedParams;
+    ZSTD_CCtx_params simpleApiParams;    /* Param storage used by the simple API - not sticky. Must only be used in top-level simple API functions for storage. */
+    U32   dictID;
+    size_t dictContentSize;
+
+    ZSTD_cwksp workspace; /* manages buffer for dynamic allocations */
+    size_t blockSize;
+    unsigned long long pledgedSrcSizePlusOne;  /* this way, 0 (default) == unknown */
+    unsigned long long consumedSrcSize;
+    unsigned long long producedCSize;
+    XXH64_state_t xxhState;
+    ZSTD_customMem customMem;
+    ZSTD_threadPool* pool;
+    size_t staticSize;
+    SeqCollector seqCollector;
+    int isFirstBlock;
+    int initialized;
+
+    seqStore_t seqStore;      /* sequences storage ptrs */
+    ldmState_t ldmState;      /* long distance matching state */
+    rawSeq* ldmSequences;     /* Storage for the ldm output sequences */
+    size_t maxNbLdmSequences;
+    rawSeqStore_t externSeqStore; /* Mutable reference to external sequences */
+    ZSTD_blockState_t blockState;
+    U32* entropyWorkspace;  /* entropy workspace of ENTROPY_WORKSPACE_SIZE bytes */
+
+    /* Wether we are streaming or not */
+    ZSTD_buffered_policy_e bufferedPolicy;
+
+    /* streaming */
+    char*  inBuff;
+    size_t inBuffSize;
+    size_t inToCompress;
+    size_t inBuffPos;
+    size_t inBuffTarget;
+    char*  outBuff;
+    size_t outBuffSize;
+    size_t outBuffContentSize;
+    size_t outBuffFlushedSize;
+    ZSTD_cStreamStage streamStage;
+    U32    frameEnded;
+
+    /* Stable in/out buffer verification */
+    ZSTD_inBuffer expectedInBuffer;
+    size_t expectedOutBufferSize;
+
+    /* Dictionary */
+    ZSTD_localDict localDict;
+    const ZSTD_CDict* cdict;
+    ZSTD_prefixDict prefixDict;   /* single-usage dictionary */
+
+    /* Multi-threading */
+#ifdef ZSTD_MULTITHREAD
+    ZSTDMT_CCtx* mtctx;
+#endif
+
+    /* Tracing */
+#if ZSTD_TRACE
+    ZSTD_TraceCtx traceCtx;
+#endif
+};
+
+typedef enum { ZSTD_dtlm_fast, ZSTD_dtlm_full } ZSTD_dictTableLoadMethod_e;
+
+typedef enum {
+    ZSTD_noDict = 0,
+    ZSTD_extDict = 1,
+    ZSTD_dictMatchState = 2,
+    ZSTD_dedicatedDictSearch = 3
+} ZSTD_dictMode_e;
+
+typedef enum {
+    ZSTD_cpm_noAttachDict = 0,  /* Compression with ZSTD_noDict or ZSTD_extDict.
+                                 * In this mode we use both the srcSize and the dictSize
+                                 * when selecting and adjusting parameters.
+                                 */
+    ZSTD_cpm_attachDict = 1,    /* Compression with ZSTD_dictMatchState or ZSTD_dedicatedDictSearch.
+                                 * In this mode we only take the srcSize into account when selecting
+                                 * and adjusting parameters.
+                                 */
+    ZSTD_cpm_createCDict = 2,   /* Creating a CDict.
+                                 * In this mode we take both the source size and the dictionary size
+                                 * into account when selecting and adjusting the parameters.
+                                 */
+    ZSTD_cpm_unknown = 3,       /* ZSTD_getCParams, ZSTD_getParams, ZSTD_adjustParams.
+                                 * We don't know what these parameters are for. We default to the legacy
+                                 * behavior of taking both the source size and the dict size into account
+                                 * when selecting and adjusting parameters.
+                                 */
+} ZSTD_cParamMode_e;
+
+typedef size_t (*ZSTD_blockCompressor) (
+        ZSTD_matchState_t* bs, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+ZSTD_blockCompressor ZSTD_selectBlockCompressor(ZSTD_strategy strat, ZSTD_useRowMatchFinderMode_e rowMatchfinderMode, ZSTD_dictMode_e dictMode);
+
+
+MEM_STATIC U32 ZSTD_LLcode(U32 litLength)
+{
+    static const BYTE LL_Code[64] = {  0,  1,  2,  3,  4,  5,  6,  7,
+                                       8,  9, 10, 11, 12, 13, 14, 15,
+                                      16, 16, 17, 17, 18, 18, 19, 19,
+                                      20, 20, 20, 20, 21, 21, 21, 21,
+                                      22, 22, 22, 22, 22, 22, 22, 22,
+                                      23, 23, 23, 23, 23, 23, 23, 23,
+                                      24, 24, 24, 24, 24, 24, 24, 24,
+                                      24, 24, 24, 24, 24, 24, 24, 24 };
+    static const U32 LL_deltaCode = 19;
+    return (litLength > 63) ? ZSTD_highbit32(litLength) + LL_deltaCode : LL_Code[litLength];
+}
+
+/* ZSTD_MLcode() :
+ * note : mlBase = matchLength - MINMATCH;
+ *        because it's the format it's stored in seqStore->sequences */
+MEM_STATIC U32 ZSTD_MLcode(U32 mlBase)
+{
+    static const BYTE ML_Code[128] = { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+                                      16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+                                      32, 32, 33, 33, 34, 34, 35, 35, 36, 36, 36, 36, 37, 37, 37, 37,
+                                      38, 38, 38, 38, 38, 38, 38, 38, 39, 39, 39, 39, 39, 39, 39, 39,
+                                      40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
+                                      41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
+                                      42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42,
+                                      42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42 };
+    static const U32 ML_deltaCode = 36;
+    return (mlBase > 127) ? ZSTD_highbit32(mlBase) + ML_deltaCode : ML_Code[mlBase];
+}
+
+typedef struct repcodes_s {
+    U32 rep[3];
+} repcodes_t;
+
+MEM_STATIC repcodes_t ZSTD_updateRep(U32 const rep[3], U32 const offset, U32 const ll0)
+{
+    repcodes_t newReps;
+    if (offset >= ZSTD_REP_NUM) {  /* full offset */
+        newReps.rep[2] = rep[1];
+        newReps.rep[1] = rep[0];
+        newReps.rep[0] = offset - ZSTD_REP_MOVE;
+    } else {   /* repcode */
+        U32 const repCode = offset + ll0;
+        if (repCode > 0) {  /* note : if repCode==0, no change */
+            U32 const currentOffset = (repCode==ZSTD_REP_NUM) ? (rep[0] - 1) : rep[repCode];
+            newReps.rep[2] = (repCode >= 2) ? rep[1] : rep[2];
+            newReps.rep[1] = rep[0];
+            newReps.rep[0] = currentOffset;
+        } else {   /* repCode == 0 */
+            ZSTD_memcpy(&newReps, rep, sizeof(newReps));
+        }
+    }
+    return newReps;
+}
+
+/* ZSTD_cParam_withinBounds:
+ * @return 1 if value is within cParam bounds,
+ * 0 otherwise */
+MEM_STATIC int ZSTD_cParam_withinBounds(ZSTD_cParameter cParam, int value)
+{
+    ZSTD_bounds const bounds = ZSTD_cParam_getBounds(cParam);
+    if (ZSTD_isError(bounds.error)) return 0;
+    if (value < bounds.lowerBound) return 0;
+    if (value > bounds.upperBound) return 0;
+    return 1;
+}
+
+/* ZSTD_noCompressBlock() :
+ * Writes uncompressed block to dst buffer from given src.
+ * Returns the size of the block */
+MEM_STATIC size_t ZSTD_noCompressBlock (void* dst, size_t dstCapacity, const void* src, size_t srcSize, U32 lastBlock)
+{
+    U32 const cBlockHeader24 = lastBlock + (((U32)bt_raw)<<1) + (U32)(srcSize << 3);
+    RETURN_ERROR_IF(srcSize + ZSTD_blockHeaderSize > dstCapacity,
+                    dstSize_tooSmall, "dst buf too small for uncompressed block");
+    MEM_writeLE24(dst, cBlockHeader24);
+    ZSTD_memcpy((BYTE*)dst + ZSTD_blockHeaderSize, src, srcSize);
+    return ZSTD_blockHeaderSize + srcSize;
+}
+
+MEM_STATIC size_t ZSTD_rleCompressBlock (void* dst, size_t dstCapacity, BYTE src, size_t srcSize, U32 lastBlock)
+{
+    BYTE* const op = (BYTE*)dst;
+    U32 const cBlockHeader = lastBlock + (((U32)bt_rle)<<1) + (U32)(srcSize << 3);
+    RETURN_ERROR_IF(dstCapacity < 4, dstSize_tooSmall, "");
+    MEM_writeLE24(op, cBlockHeader);
+    op[3] = src;
+    return 4;
+}
+
+
+/* ZSTD_minGain() :
+ * minimum compression required
+ * to generate a compress block or a compressed literals section.
+ * note : use same formula for both situations */
+MEM_STATIC size_t ZSTD_minGain(size_t srcSize, ZSTD_strategy strat)
+{
+    U32 const minlog = (strat>=ZSTD_btultra) ? (U32)(strat) - 1 : 6;
+    ZSTD_STATIC_ASSERT(ZSTD_btultra == 8);
+    assert(ZSTD_cParam_withinBounds(ZSTD_c_strategy, strat));
+    return (srcSize >> minlog) + 2;
+}
+
+MEM_STATIC int ZSTD_disableLiteralsCompression(const ZSTD_CCtx_params* cctxParams)
+{
+    switch (cctxParams->literalCompressionMode) {
+    case ZSTD_lcm_huffman:
+        return 0;
+    case ZSTD_lcm_uncompressed:
+        return 1;
+    default:
+        assert(0 /* impossible: pre-validated */);
+        /* fall-through */
+    case ZSTD_lcm_auto:
+        return (cctxParams->cParams.strategy == ZSTD_fast) && (cctxParams->cParams.targetLength > 0);
+    }
+}
+
+/*! ZSTD_safecopyLiterals() :
+ *  memcpy() function that won't read beyond more than WILDCOPY_OVERLENGTH bytes past ilimit_w.
+ *  Only called when the sequence ends past ilimit_w, so it only needs to be optimized for single
+ *  large copies.
+ */
+static void ZSTD_safecopyLiterals(BYTE* op, BYTE const* ip, BYTE const* const iend, BYTE const* ilimit_w) {
+    assert(iend > ilimit_w);
+    if (ip <= ilimit_w) {
+        ZSTD_wildcopy(op, ip, ilimit_w - ip, ZSTD_no_overlap);
+        op += ilimit_w - ip;
+        ip = ilimit_w;
+    }
+    while (ip < iend) *op++ = *ip++;
+}
+
+/*! ZSTD_storeSeq() :
+ *  Store a sequence (litlen, litPtr, offCode and mlBase) into seqStore_t.
+ *  `offCode` : distance to match + ZSTD_REP_MOVE (values <= ZSTD_REP_MOVE are repCodes).
+ *  `mlBase` : matchLength - MINMATCH
+ *  Allowed to overread literals up to litLimit.
+*/
+HINT_INLINE UNUSED_ATTR
+void ZSTD_storeSeq(seqStore_t* seqStorePtr, size_t litLength, const BYTE* literals, const BYTE* litLimit, U32 offCode, size_t mlBase)
+{
+    BYTE const* const litLimit_w = litLimit - WILDCOPY_OVERLENGTH;
+    BYTE const* const litEnd = literals + litLength;
+#if defined(DEBUGLEVEL) && (DEBUGLEVEL >= 6)
+    static const BYTE* g_start = NULL;
+    if (g_start==NULL) g_start = (const BYTE*)literals;  /* note : index only works for compression within a single segment */
+    {   U32 const pos = (U32)((const BYTE*)literals - g_start);
+        DEBUGLOG(6, "Cpos%7u :%3u literals, match%4u bytes at offCode%7u",
+               pos, (U32)litLength, (U32)mlBase+MINMATCH, (U32)offCode);
+    }
+#endif
+    assert((size_t)(seqStorePtr->sequences - seqStorePtr->sequencesStart) < seqStorePtr->maxNbSeq);
+    /* copy Literals */
+    assert(seqStorePtr->maxNbLit <= 128 KB);
+    assert(seqStorePtr->lit + litLength <= seqStorePtr->litStart + seqStorePtr->maxNbLit);
+    assert(literals + litLength <= litLimit);
+    if (litEnd <= litLimit_w) {
+        /* Common case we can use wildcopy.
+	 * First copy 16 bytes, because literals are likely short.
+	 */
+        assert(WILDCOPY_OVERLENGTH >= 16);
+        ZSTD_copy16(seqStorePtr->lit, literals);
+        if (litLength > 16) {
+            ZSTD_wildcopy(seqStorePtr->lit+16, literals+16, (ptrdiff_t)litLength-16, ZSTD_no_overlap);
+        }
+    } else {
+        ZSTD_safecopyLiterals(seqStorePtr->lit, literals, litEnd, litLimit_w);
+    }
+    seqStorePtr->lit += litLength;
+
+    /* literal Length */
+    if (litLength>0xFFFF) {
+        assert(seqStorePtr->longLengthType == ZSTD_llt_none); /* there can only be a single long length */
+        seqStorePtr->longLengthType = ZSTD_llt_literalLength;
+        seqStorePtr->longLengthPos = (U32)(seqStorePtr->sequences - seqStorePtr->sequencesStart);
+    }
+    seqStorePtr->sequences[0].litLength = (U16)litLength;
+
+    /* match offset */
+    seqStorePtr->sequences[0].offset = offCode + 1;
+
+    /* match Length */
+    if (mlBase>0xFFFF) {
+        assert(seqStorePtr->longLengthType == ZSTD_llt_none); /* there can only be a single long length */
+        seqStorePtr->longLengthType = ZSTD_llt_matchLength;
+        seqStorePtr->longLengthPos = (U32)(seqStorePtr->sequences - seqStorePtr->sequencesStart);
+    }
+    seqStorePtr->sequences[0].matchLength = (U16)mlBase;
+
+    seqStorePtr->sequences++;
+}
+
+
+/*-*************************************
+*  Match length counter
+***************************************/
+static unsigned ZSTD_NbCommonBytes (size_t val)
+{
+    if (MEM_isLittleEndian()) {
+        if (MEM_64bits()) {
+#       if defined(_MSC_VER) && defined(_WIN64)
+#           if STATIC_BMI2
+                return _tzcnt_u64(val) >> 3;
+#           else
+                unsigned long r = 0;
+                return _BitScanForward64( &r, (U64)val ) ? (unsigned)(r >> 3) : 0;
+#           endif
+#       elif defined(__GNUC__) && (__GNUC__ >= 4)
+            return (__builtin_ctzll((U64)val) >> 3);
+#       else
+            static const int DeBruijnBytePos[64] = { 0, 0, 0, 0, 0, 1, 1, 2,
+                                                     0, 3, 1, 3, 1, 4, 2, 7,
+                                                     0, 2, 3, 6, 1, 5, 3, 5,
+                                                     1, 3, 4, 4, 2, 5, 6, 7,
+                                                     7, 0, 1, 2, 3, 3, 4, 6,
+                                                     2, 6, 5, 5, 3, 4, 5, 6,
+                                                     7, 1, 2, 4, 6, 4, 4, 5,
+                                                     7, 2, 6, 5, 7, 6, 7, 7 };
+            return DeBruijnBytePos[((U64)((val & -(long long)val) * 0x0218A392CDABBD3FULL)) >> 58];
+#       endif
+        } else { /* 32 bits */
+#       if defined(_MSC_VER)
+            unsigned long r=0;
+            return _BitScanForward( &r, (U32)val ) ? (unsigned)(r >> 3) : 0;
+#       elif defined(__GNUC__) && (__GNUC__ >= 3)
+            return (__builtin_ctz((U32)val) >> 3);
+#       else
+            static const int DeBruijnBytePos[32] = { 0, 0, 3, 0, 3, 1, 3, 0,
+                                                     3, 2, 2, 1, 3, 2, 0, 1,
+                                                     3, 3, 1, 2, 2, 2, 2, 0,
+                                                     3, 1, 2, 0, 1, 0, 1, 1 };
+            return DeBruijnBytePos[((U32)((val & -(S32)val) * 0x077CB531U)) >> 27];
+#       endif
+        }
+    } else {  /* Big Endian CPU */
+        if (MEM_64bits()) {
+#       if defined(_MSC_VER) && defined(_WIN64)
+#           if STATIC_BMI2
+			    return _lzcnt_u64(val) >> 3;
+#           else
+			    unsigned long r = 0;
+			    return _BitScanReverse64(&r, (U64)val) ? (unsigned)(r >> 3) : 0;
+#           endif
+#       elif defined(__GNUC__) && (__GNUC__ >= 4)
+            return (__builtin_clzll(val) >> 3);
+#       else
+            unsigned r;
+            const unsigned n32 = sizeof(size_t)*4;   /* calculate this way due to compiler complaining in 32-bits mode */
+            if (!(val>>n32)) { r=4; } else { r=0; val>>=n32; }
+            if (!(val>>16)) { r+=2; val>>=8; } else { val>>=24; }
+            r += (!val);
+            return r;
+#       endif
+        } else { /* 32 bits */
+#       if defined(_MSC_VER)
+            unsigned long r = 0;
+            return _BitScanReverse( &r, (unsigned long)val ) ? (unsigned)(r >> 3) : 0;
+#       elif defined(__GNUC__) && (__GNUC__ >= 3)
+            return (__builtin_clz((U32)val) >> 3);
+#       else
+            unsigned r;
+            if (!(val>>16)) { r=2; val>>=8; } else { r=0; val>>=24; }
+            r += (!val);
+            return r;
+#       endif
+    }   }
+}
+
+
+MEM_STATIC size_t ZSTD_count(const BYTE* pIn, const BYTE* pMatch, const BYTE* const pInLimit)
+{
+    const BYTE* const pStart = pIn;
+    const BYTE* const pInLoopLimit = pInLimit - (sizeof(size_t)-1);
+
+    if (pIn < pInLoopLimit) {
+        { size_t const diff = MEM_readST(pMatch) ^ MEM_readST(pIn);
+          if (diff) return ZSTD_NbCommonBytes(diff); }
+        pIn+=sizeof(size_t); pMatch+=sizeof(size_t);
+        while (pIn < pInLoopLimit) {
+            size_t const diff = MEM_readST(pMatch) ^ MEM_readST(pIn);
+            if (!diff) { pIn+=sizeof(size_t); pMatch+=sizeof(size_t); continue; }
+            pIn += ZSTD_NbCommonBytes(diff);
+            return (size_t)(pIn - pStart);
+    }   }
+    if (MEM_64bits() && (pIn<(pInLimit-3)) && (MEM_read32(pMatch) == MEM_read32(pIn))) { pIn+=4; pMatch+=4; }
+    if ((pIn<(pInLimit-1)) && (MEM_read16(pMatch) == MEM_read16(pIn))) { pIn+=2; pMatch+=2; }
+    if ((pIn<pInLimit) && (*pMatch == *pIn)) pIn++;
+    return (size_t)(pIn - pStart);
+}
+
+/** ZSTD_count_2segments() :
+ *  can count match length with `ip` & `match` in 2 different segments.
+ *  convention : on reaching mEnd, match count continue starting from iStart
+ */
+MEM_STATIC size_t
+ZSTD_count_2segments(const BYTE* ip, const BYTE* match,
+                     const BYTE* iEnd, const BYTE* mEnd, const BYTE* iStart)
+{
+    const BYTE* const vEnd = MIN( ip + (mEnd - match), iEnd);
+    size_t const matchLength = ZSTD_count(ip, match, vEnd);
+    if (match + matchLength != mEnd) return matchLength;
+    DEBUGLOG(7, "ZSTD_count_2segments: found a 2-parts match (current length==%zu)", matchLength);
+    DEBUGLOG(7, "distance from match beginning to end dictionary = %zi", mEnd - match);
+    DEBUGLOG(7, "distance from current pos to end buffer = %zi", iEnd - ip);
+    DEBUGLOG(7, "next byte : ip==%02X, istart==%02X", ip[matchLength], *iStart);
+    DEBUGLOG(7, "final match length = %zu", matchLength + ZSTD_count(ip+matchLength, iStart, iEnd));
+    return matchLength + ZSTD_count(ip+matchLength, iStart, iEnd);
+}
+
+
+/*-*************************************
+ *  Hashes
+ ***************************************/
+static const U32 prime3bytes = 506832829U;
+static U32    ZSTD_hash3(U32 u, U32 h) { return ((u << (32-24)) * prime3bytes)  >> (32-h) ; }
+MEM_STATIC size_t ZSTD_hash3Ptr(const void* ptr, U32 h) { return ZSTD_hash3(MEM_readLE32(ptr), h); } /* only in zstd_opt.h */
+
+static const U32 prime4bytes = 2654435761U;
+static U32    ZSTD_hash4(U32 u, U32 h) { return (u * prime4bytes) >> (32-h) ; }
+static size_t ZSTD_hash4Ptr(const void* ptr, U32 h) { return ZSTD_hash4(MEM_read32(ptr), h); }
+
+static const U64 prime5bytes = 889523592379ULL;
+static size_t ZSTD_hash5(U64 u, U32 h) { return (size_t)(((u  << (64-40)) * prime5bytes) >> (64-h)) ; }
+static size_t ZSTD_hash5Ptr(const void* p, U32 h) { return ZSTD_hash5(MEM_readLE64(p), h); }
+
+static const U64 prime6bytes = 227718039650203ULL;
+static size_t ZSTD_hash6(U64 u, U32 h) { return (size_t)(((u  << (64-48)) * prime6bytes) >> (64-h)) ; }
+static size_t ZSTD_hash6Ptr(const void* p, U32 h) { return ZSTD_hash6(MEM_readLE64(p), h); }
+
+static const U64 prime7bytes = 58295818150454627ULL;
+static size_t ZSTD_hash7(U64 u, U32 h) { return (size_t)(((u  << (64-56)) * prime7bytes) >> (64-h)) ; }
+static size_t ZSTD_hash7Ptr(const void* p, U32 h) { return ZSTD_hash7(MEM_readLE64(p), h); }
+
+static const U64 prime8bytes = 0xCF1BBCDCB7A56463ULL;
+static size_t ZSTD_hash8(U64 u, U32 h) { return (size_t)(((u) * prime8bytes) >> (64-h)) ; }
+static size_t ZSTD_hash8Ptr(const void* p, U32 h) { return ZSTD_hash8(MEM_readLE64(p), h); }
+
+MEM_STATIC FORCE_INLINE_ATTR
+size_t ZSTD_hashPtr(const void* p, U32 hBits, U32 mls)
+{
+    switch(mls)
+    {
+    default:
+    case 4: return ZSTD_hash4Ptr(p, hBits);
+    case 5: return ZSTD_hash5Ptr(p, hBits);
+    case 6: return ZSTD_hash6Ptr(p, hBits);
+    case 7: return ZSTD_hash7Ptr(p, hBits);
+    case 8: return ZSTD_hash8Ptr(p, hBits);
+    }
+}
+
+/** ZSTD_ipow() :
+ * Return base^exponent.
+ */
+static U64 ZSTD_ipow(U64 base, U64 exponent)
+{
+    U64 power = 1;
+    while (exponent) {
+      if (exponent & 1) power *= base;
+      exponent >>= 1;
+      base *= base;
+    }
+    return power;
+}
+
+#define ZSTD_ROLL_HASH_CHAR_OFFSET 10
+
+/** ZSTD_rollingHash_append() :
+ * Add the buffer to the hash value.
+ */
+static U64 ZSTD_rollingHash_append(U64 hash, void const* buf, size_t size)
+{
+    BYTE const* istart = (BYTE const*)buf;
+    size_t pos;
+    for (pos = 0; pos < size; ++pos) {
+        hash *= prime8bytes;
+        hash += istart[pos] + ZSTD_ROLL_HASH_CHAR_OFFSET;
+    }
+    return hash;
+}
+
+/** ZSTD_rollingHash_compute() :
+ * Compute the rolling hash value of the buffer.
+ */
+MEM_STATIC U64 ZSTD_rollingHash_compute(void const* buf, size_t size)
+{
+    return ZSTD_rollingHash_append(0, buf, size);
+}
+
+/** ZSTD_rollingHash_primePower() :
+ * Compute the primePower to be passed to ZSTD_rollingHash_rotate() for a hash
+ * over a window of length bytes.
+ */
+MEM_STATIC U64 ZSTD_rollingHash_primePower(U32 length)
+{
+    return ZSTD_ipow(prime8bytes, length - 1);
+}
+
+/** ZSTD_rollingHash_rotate() :
+ * Rotate the rolling hash by one byte.
+ */
+MEM_STATIC U64 ZSTD_rollingHash_rotate(U64 hash, BYTE toRemove, BYTE toAdd, U64 primePower)
+{
+    hash -= (toRemove + ZSTD_ROLL_HASH_CHAR_OFFSET) * primePower;
+    hash *= prime8bytes;
+    hash += toAdd + ZSTD_ROLL_HASH_CHAR_OFFSET;
+    return hash;
+}
+
+/*-*************************************
+*  Round buffer management
+***************************************/
+#if (ZSTD_WINDOWLOG_MAX_64 > 31)
+# error "ZSTD_WINDOWLOG_MAX is too large : would overflow ZSTD_CURRENT_MAX"
+#endif
+/* Max current allowed */
+#define ZSTD_CURRENT_MAX ((3U << 29) + (1U << ZSTD_WINDOWLOG_MAX))
+/* Maximum chunk size before overflow correction needs to be called again */
+#define ZSTD_CHUNKSIZE_MAX                                                     \
+    ( ((U32)-1)                  /* Maximum ending current index */            \
+    - ZSTD_CURRENT_MAX)          /* Maximum beginning lowLimit */
+
+/**
+ * ZSTD_window_clear():
+ * Clears the window containing the history by simply setting it to empty.
+ */
+MEM_STATIC void ZSTD_window_clear(ZSTD_window_t* window)
+{
+    size_t const endT = (size_t)(window->nextSrc - window->base);
+    U32 const end = (U32)endT;
+
+    window->lowLimit = end;
+    window->dictLimit = end;
+}
+
+MEM_STATIC U32 ZSTD_window_isEmpty(ZSTD_window_t const window)
+{
+    return window.dictLimit == 1 &&
+           window.lowLimit == 1 &&
+           (window.nextSrc - window.base) == 1;
+}
+
+/**
+ * ZSTD_window_hasExtDict():
+ * Returns non-zero if the window has a non-empty extDict.
+ */
+MEM_STATIC U32 ZSTD_window_hasExtDict(ZSTD_window_t const window)
+{
+    return window.lowLimit < window.dictLimit;
+}
+
+/**
+ * ZSTD_matchState_dictMode():
+ * Inspects the provided matchState and figures out what dictMode should be
+ * passed to the compressor.
+ */
+MEM_STATIC ZSTD_dictMode_e ZSTD_matchState_dictMode(const ZSTD_matchState_t *ms)
+{
+    return ZSTD_window_hasExtDict(ms->window) ?
+        ZSTD_extDict :
+        ms->dictMatchState != NULL ?
+            (ms->dictMatchState->dedicatedDictSearch ? ZSTD_dedicatedDictSearch : ZSTD_dictMatchState) :
+            ZSTD_noDict;
+}
+
+/* Defining this macro to non-zero tells zstd to run the overflow correction
+ * code much more frequently. This is very inefficient, and should only be
+ * used for tests and fuzzers.
+ */
+#ifndef ZSTD_WINDOW_OVERFLOW_CORRECT_FREQUENTLY
+#  ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+#    define ZSTD_WINDOW_OVERFLOW_CORRECT_FREQUENTLY 1
+#  else
+#    define ZSTD_WINDOW_OVERFLOW_CORRECT_FREQUENTLY 0
+#  endif
+#endif
+
+/**
+ * ZSTD_window_canOverflowCorrect():
+ * Returns non-zero if the indices are large enough for overflow correction
+ * to work correctly without impacting compression ratio.
+ */
+MEM_STATIC U32 ZSTD_window_canOverflowCorrect(ZSTD_window_t const window,
+                                              U32 cycleLog,
+                                              U32 maxDist,
+                                              U32 loadedDictEnd,
+                                              void const* src)
+{
+    U32 const cycleSize = 1u << cycleLog;
+    U32 const curr = (U32)((BYTE const*)src - window.base);
+    U32 const minIndexToOverflowCorrect = cycleSize + MAX(maxDist, cycleSize);
+
+    /* Adjust the min index to backoff the overflow correction frequency,
+     * so we don't waste too much CPU in overflow correction. If this
+     * computation overflows we don't really care, we just need to make
+     * sure it is at least minIndexToOverflowCorrect.
+     */
+    U32 const adjustment = window.nbOverflowCorrections + 1;
+    U32 const adjustedIndex = MAX(minIndexToOverflowCorrect * adjustment,
+                                  minIndexToOverflowCorrect);
+    U32 const indexLargeEnough = curr > adjustedIndex;
+
+    /* Only overflow correct early if the dictionary is invalidated already,
+     * so we don't hurt compression ratio.
+     */
+    U32 const dictionaryInvalidated = curr > maxDist + loadedDictEnd;
+
+    return indexLargeEnough && dictionaryInvalidated;
+}
+
+/**
+ * ZSTD_window_needOverflowCorrection():
+ * Returns non-zero if the indices are getting too large and need overflow
+ * protection.
+ */
+MEM_STATIC U32 ZSTD_window_needOverflowCorrection(ZSTD_window_t const window,
+                                                  U32 cycleLog,
+                                                  U32 maxDist,
+                                                  U32 loadedDictEnd,
+                                                  void const* src,
+                                                  void const* srcEnd)
+{
+    U32 const curr = (U32)((BYTE const*)srcEnd - window.base);
+    if (ZSTD_WINDOW_OVERFLOW_CORRECT_FREQUENTLY) {
+        if (ZSTD_window_canOverflowCorrect(window, cycleLog, maxDist, loadedDictEnd, src)) {
+            return 1;
+        }
+    }
+    return curr > ZSTD_CURRENT_MAX;
+}
+
+/**
+ * ZSTD_window_correctOverflow():
+ * Reduces the indices to protect from index overflow.
+ * Returns the correction made to the indices, which must be applied to every
+ * stored index.
+ *
+ * The least significant cycleLog bits of the indices must remain the same,
+ * which may be 0. Every index up to maxDist in the past must be valid.
+ */
+MEM_STATIC U32 ZSTD_window_correctOverflow(ZSTD_window_t* window, U32 cycleLog,
+                                           U32 maxDist, void const* src)
+{
+    /* preemptive overflow correction:
+     * 1. correction is large enough:
+     *    lowLimit > (3<<29) ==> current > 3<<29 + 1<<windowLog
+     *    1<<windowLog <= newCurrent < 1<<chainLog + 1<<windowLog
+     *
+     *    current - newCurrent
+     *    > (3<<29 + 1<<windowLog) - (1<<windowLog + 1<<chainLog)
+     *    > (3<<29) - (1<<chainLog)
+     *    > (3<<29) - (1<<30)             (NOTE: chainLog <= 30)
+     *    > 1<<29
+     *
+     * 2. (ip+ZSTD_CHUNKSIZE_MAX - cctx->base) doesn't overflow:
+     *    After correction, current is less than (1<<chainLog + 1<<windowLog).
+     *    In 64-bit mode we are safe, because we have 64-bit ptrdiff_t.
+     *    In 32-bit mode we are safe, because (chainLog <= 29), so
+     *    ip+ZSTD_CHUNKSIZE_MAX - cctx->base < 1<<32.
+     * 3. (cctx->lowLimit + 1<<windowLog) < 1<<32:
+     *    windowLog <= 31 ==> 3<<29 + 1<<windowLog < 7<<29 < 1<<32.
+     */
+    U32 const cycleSize = 1u << cycleLog;
+    U32 const cycleMask = cycleSize - 1;
+    U32 const curr = (U32)((BYTE const*)src - window->base);
+    U32 const currentCycle0 = curr & cycleMask;
+    /* Exclude zero so that newCurrent - maxDist >= 1. */
+    U32 const currentCycle1 = currentCycle0 == 0 ? cycleSize : currentCycle0;
+    U32 const newCurrent = currentCycle1 + MAX(maxDist, cycleSize);
+    U32 const correction = curr - newCurrent;
+    /* maxDist must be a power of two so that:
+     *   (newCurrent & cycleMask) == (curr & cycleMask)
+     * This is required to not corrupt the chains / binary tree.
+     */
+    assert((maxDist & (maxDist - 1)) == 0);
+    assert((curr & cycleMask) == (newCurrent & cycleMask));
+    assert(curr > newCurrent);
+    if (!ZSTD_WINDOW_OVERFLOW_CORRECT_FREQUENTLY) {
+        /* Loose bound, should be around 1<<29 (see above) */
+        assert(correction > 1<<28);
+    }
+
+    window->base += correction;
+    window->dictBase += correction;
+    if (window->lowLimit <= correction) window->lowLimit = 1;
+    else window->lowLimit -= correction;
+    if (window->dictLimit <= correction) window->dictLimit = 1;
+    else window->dictLimit -= correction;
+
+    /* Ensure we can still reference the full window. */
+    assert(newCurrent >= maxDist);
+    assert(newCurrent - maxDist >= 1);
+    /* Ensure that lowLimit and dictLimit didn't underflow. */
+    assert(window->lowLimit <= newCurrent);
+    assert(window->dictLimit <= newCurrent);
+
+    ++window->nbOverflowCorrections;
+
+    DEBUGLOG(4, "Correction of 0x%x bytes to lowLimit=0x%x", correction,
+             window->lowLimit);
+    return correction;
+}
+
+/**
+ * ZSTD_window_enforceMaxDist():
+ * Updates lowLimit so that:
+ *    (srcEnd - base) - lowLimit == maxDist + loadedDictEnd
+ *
+ * It ensures index is valid as long as index >= lowLimit.
+ * This must be called before a block compression call.
+ *
+ * loadedDictEnd is only defined if a dictionary is in use for current compression.
+ * As the name implies, loadedDictEnd represents the index at end of dictionary.
+ * The value lies within context's referential, it can be directly compared to blockEndIdx.
+ *
+ * If loadedDictEndPtr is NULL, no dictionary is in use, and we use loadedDictEnd == 0.
+ * If loadedDictEndPtr is not NULL, we set it to zero after updating lowLimit.
+ * This is because dictionaries are allowed to be referenced fully
+ * as long as the last byte of the dictionary is in the window.
+ * Once input has progressed beyond window size, dictionary cannot be referenced anymore.
+ *
+ * In normal dict mode, the dictionary lies between lowLimit and dictLimit.
+ * In dictMatchState mode, lowLimit and dictLimit are the same,
+ * and the dictionary is below them.
+ * forceWindow and dictMatchState are therefore incompatible.
+ */
+MEM_STATIC void
+ZSTD_window_enforceMaxDist(ZSTD_window_t* window,
+                     const void* blockEnd,
+                           U32   maxDist,
+                           U32*  loadedDictEndPtr,
+                     const ZSTD_matchState_t** dictMatchStatePtr)
+{
+    U32 const blockEndIdx = (U32)((BYTE const*)blockEnd - window->base);
+    U32 const loadedDictEnd = (loadedDictEndPtr != NULL) ? *loadedDictEndPtr : 0;
+    DEBUGLOG(5, "ZSTD_window_enforceMaxDist: blockEndIdx=%u, maxDist=%u, loadedDictEnd=%u",
+                (unsigned)blockEndIdx, (unsigned)maxDist, (unsigned)loadedDictEnd);
+
+    /* - When there is no dictionary : loadedDictEnd == 0.
+         In which case, the test (blockEndIdx > maxDist) is merely to avoid
+         overflowing next operation `newLowLimit = blockEndIdx - maxDist`.
+       - When there is a standard dictionary :
+         Index referential is copied from the dictionary,
+         which means it starts from 0.
+         In which case, loadedDictEnd == dictSize,
+         and it makes sense to compare `blockEndIdx > maxDist + dictSize`
+         since `blockEndIdx` also starts from zero.
+       - When there is an attached dictionary :
+         loadedDictEnd is expressed within the referential of the context,
+         so it can be directly compared against blockEndIdx.
+    */
+    if (blockEndIdx > maxDist + loadedDictEnd) {
+        U32 const newLowLimit = blockEndIdx - maxDist;
+        if (window->lowLimit < newLowLimit) window->lowLimit = newLowLimit;
+        if (window->dictLimit < window->lowLimit) {
+            DEBUGLOG(5, "Update dictLimit to match lowLimit, from %u to %u",
+                        (unsigned)window->dictLimit, (unsigned)window->lowLimit);
+            window->dictLimit = window->lowLimit;
+        }
+        /* On reaching window size, dictionaries are invalidated */
+        if (loadedDictEndPtr) *loadedDictEndPtr = 0;
+        if (dictMatchStatePtr) *dictMatchStatePtr = NULL;
+    }
+}
+
+/* Similar to ZSTD_window_enforceMaxDist(),
+ * but only invalidates dictionary
+ * when input progresses beyond window size.
+ * assumption : loadedDictEndPtr and dictMatchStatePtr are valid (non NULL)
+ *              loadedDictEnd uses same referential as window->base
+ *              maxDist is the window size */
+MEM_STATIC void
+ZSTD_checkDictValidity(const ZSTD_window_t* window,
+                       const void* blockEnd,
+                             U32   maxDist,
+                             U32*  loadedDictEndPtr,
+                       const ZSTD_matchState_t** dictMatchStatePtr)
+{
+    assert(loadedDictEndPtr != NULL);
+    assert(dictMatchStatePtr != NULL);
+    {   U32 const blockEndIdx = (U32)((BYTE const*)blockEnd - window->base);
+        U32 const loadedDictEnd = *loadedDictEndPtr;
+        DEBUGLOG(5, "ZSTD_checkDictValidity: blockEndIdx=%u, maxDist=%u, loadedDictEnd=%u",
+                    (unsigned)blockEndIdx, (unsigned)maxDist, (unsigned)loadedDictEnd);
+        assert(blockEndIdx >= loadedDictEnd);
+
+        if (blockEndIdx > loadedDictEnd + maxDist) {
+            /* On reaching window size, dictionaries are invalidated.
+             * For simplification, if window size is reached anywhere within next block,
+             * the dictionary is invalidated for the full block.
+             */
+            DEBUGLOG(6, "invalidating dictionary for current block (distance > windowSize)");
+            *loadedDictEndPtr = 0;
+            *dictMatchStatePtr = NULL;
+        } else {
+            if (*loadedDictEndPtr != 0) {
+                DEBUGLOG(6, "dictionary considered valid for current block");
+    }   }   }
+}
+
+MEM_STATIC void ZSTD_window_init(ZSTD_window_t* window) {
+    ZSTD_memset(window, 0, sizeof(*window));
+    window->base = (BYTE const*)"";
+    window->dictBase = (BYTE const*)"";
+    window->dictLimit = 1;    /* start from 1, so that 1st position is valid */
+    window->lowLimit = 1;     /* it ensures first and later CCtx usages compress the same */
+    window->nextSrc = window->base + 1;   /* see issue #1241 */
+    window->nbOverflowCorrections = 0;
+}
+
+/**
+ * ZSTD_window_update():
+ * Updates the window by appending [src, src + srcSize) to the window.
+ * If it is not contiguous, the current prefix becomes the extDict, and we
+ * forget about the extDict. Handles overlap of the prefix and extDict.
+ * Returns non-zero if the segment is contiguous.
+ */
+MEM_STATIC U32 ZSTD_window_update(ZSTD_window_t* window,
+                                  void const* src, size_t srcSize,
+                                  int forceNonContiguous)
+{
+    BYTE const* const ip = (BYTE const*)src;
+    U32 contiguous = 1;
+    DEBUGLOG(5, "ZSTD_window_update");
+    if (srcSize == 0)
+        return contiguous;
+    assert(window->base != NULL);
+    assert(window->dictBase != NULL);
+    /* Check if blocks follow each other */
+    if (src != window->nextSrc || forceNonContiguous) {
+        /* not contiguous */
+        size_t const distanceFromBase = (size_t)(window->nextSrc - window->base);
+        DEBUGLOG(5, "Non contiguous blocks, new segment starts at %u", window->dictLimit);
+        window->lowLimit = window->dictLimit;
+        assert(distanceFromBase == (size_t)(U32)distanceFromBase);  /* should never overflow */
+        window->dictLimit = (U32)distanceFromBase;
+        window->dictBase = window->base;
+        window->base = ip - distanceFromBase;
+        /* ms->nextToUpdate = window->dictLimit; */
+        if (window->dictLimit - window->lowLimit < HASH_READ_SIZE) window->lowLimit = window->dictLimit;   /* too small extDict */
+        contiguous = 0;
+    }
+    window->nextSrc = ip + srcSize;
+    /* if input and dictionary overlap : reduce dictionary (area presumed modified by input) */
+    if ( (ip+srcSize > window->dictBase + window->lowLimit)
+       & (ip < window->dictBase + window->dictLimit)) {
+        ptrdiff_t const highInputIdx = (ip + srcSize) - window->dictBase;
+        U32 const lowLimitMax = (highInputIdx > (ptrdiff_t)window->dictLimit) ? window->dictLimit : (U32)highInputIdx;
+        window->lowLimit = lowLimitMax;
+        DEBUGLOG(5, "Overlapping extDict and input : new lowLimit = %u", window->lowLimit);
+    }
+    return contiguous;
+}
+
+/**
+ * Returns the lowest allowed match index. It may either be in the ext-dict or the prefix.
+ */
+MEM_STATIC U32 ZSTD_getLowestMatchIndex(const ZSTD_matchState_t* ms, U32 curr, unsigned windowLog)
+{
+    U32    const maxDistance = 1U << windowLog;
+    U32    const lowestValid = ms->window.lowLimit;
+    U32    const withinWindow = (curr - lowestValid > maxDistance) ? curr - maxDistance : lowestValid;
+    U32    const isDictionary = (ms->loadedDictEnd != 0);
+    /* When using a dictionary the entire dictionary is valid if a single byte of the dictionary
+     * is within the window. We invalidate the dictionary (and set loadedDictEnd to 0) when it isn't
+     * valid for the entire block. So this check is sufficient to find the lowest valid match index.
+     */
+    U32    const matchLowest = isDictionary ? lowestValid : withinWindow;
+    return matchLowest;
+}
+
+/**
+ * Returns the lowest allowed match index in the prefix.
+ */
+MEM_STATIC U32 ZSTD_getLowestPrefixIndex(const ZSTD_matchState_t* ms, U32 curr, unsigned windowLog)
+{
+    U32    const maxDistance = 1U << windowLog;
+    U32    const lowestValid = ms->window.dictLimit;
+    U32    const withinWindow = (curr - lowestValid > maxDistance) ? curr - maxDistance : lowestValid;
+    U32    const isDictionary = (ms->loadedDictEnd != 0);
+    /* When computing the lowest prefix index we need to take the dictionary into account to handle
+     * the edge case where the dictionary and the source are contiguous in memory.
+     */
+    U32    const matchLowest = isDictionary ? lowestValid : withinWindow;
+    return matchLowest;
+}
+
+
+
+/* debug functions */
+#if (DEBUGLEVEL>=2)
+
+MEM_STATIC double ZSTD_fWeight(U32 rawStat)
+{
+    U32 const fp_accuracy = 8;
+    U32 const fp_multiplier = (1 << fp_accuracy);
+    U32 const newStat = rawStat + 1;
+    U32 const hb = ZSTD_highbit32(newStat);
+    U32 const BWeight = hb * fp_multiplier;
+    U32 const FWeight = (newStat << fp_accuracy) >> hb;
+    U32 const weight = BWeight + FWeight;
+    assert(hb + fp_accuracy < 31);
+    return (double)weight / fp_multiplier;
+}
+
+/* display a table content,
+ * listing each element, its frequency, and its predicted bit cost */
+MEM_STATIC void ZSTD_debugTable(const U32* table, U32 max)
+{
+    unsigned u, sum;
+    for (u=0, sum=0; u<=max; u++) sum += table[u];
+    DEBUGLOG(2, "total nb elts: %u", sum);
+    for (u=0; u<=max; u++) {
+        DEBUGLOG(2, "%2u: %5u  (%.2f)",
+                u, table[u], ZSTD_fWeight(sum) - ZSTD_fWeight(table[u]) );
+    }
+}
+
+#endif
+
+
+#if defined (__cplusplus)
+}
+#endif
+
+/* ===============================================================
+ * Shared internal declarations
+ * These prototypes may be called from sources not in lib/compress
+ * =============================================================== */
+
+/* ZSTD_loadCEntropy() :
+ * dict : must point at beginning of a valid zstd dictionary.
+ * return : size of dictionary header (size of magic number + dict ID + entropy tables)
+ * assumptions : magic number supposed already checked
+ *               and dictSize >= 8 */
+size_t ZSTD_loadCEntropy(ZSTD_compressedBlockState_t* bs, void* workspace,
+                         const void* const dict, size_t dictSize);
+
+void ZSTD_reset_compressedBlockState(ZSTD_compressedBlockState_t* bs);
+
+/* ==============================================================
+ * Private declarations
+ * These prototypes shall only be called from within lib/compress
+ * ============================================================== */
+
+/* ZSTD_getCParamsFromCCtxParams() :
+ * cParams are built depending on compressionLevel, src size hints,
+ * LDM and manually set compression parameters.
+ * Note: srcSizeHint == 0 means 0!
+ */
+ZSTD_compressionParameters ZSTD_getCParamsFromCCtxParams(
+        const ZSTD_CCtx_params* CCtxParams, U64 srcSizeHint, size_t dictSize, ZSTD_cParamMode_e mode);
+
+/*! ZSTD_initCStream_internal() :
+ *  Private use only. Init streaming operation.
+ *  expects params to be valid.
+ *  must receive dict, or cdict, or none, but not both.
+ *  @return : 0, or an error code */
+size_t ZSTD_initCStream_internal(ZSTD_CStream* zcs,
+                     const void* dict, size_t dictSize,
+                     const ZSTD_CDict* cdict,
+                     const ZSTD_CCtx_params* params, unsigned long long pledgedSrcSize);
+
+void ZSTD_resetSeqStore(seqStore_t* ssPtr);
+
+/*! ZSTD_getCParamsFromCDict() :
+ *  as the name implies */
+ZSTD_compressionParameters ZSTD_getCParamsFromCDict(const ZSTD_CDict* cdict);
+
+/* ZSTD_compressBegin_advanced_internal() :
+ * Private use only. To be called from zstdmt_compress.c. */
+size_t ZSTD_compressBegin_advanced_internal(ZSTD_CCtx* cctx,
+                                    const void* dict, size_t dictSize,
+                                    ZSTD_dictContentType_e dictContentType,
+                                    ZSTD_dictTableLoadMethod_e dtlm,
+                                    const ZSTD_CDict* cdict,
+                                    const ZSTD_CCtx_params* params,
+                                    unsigned long long pledgedSrcSize);
+
+/* ZSTD_compress_advanced_internal() :
+ * Private use only. To be called from zstdmt_compress.c. */
+size_t ZSTD_compress_advanced_internal(ZSTD_CCtx* cctx,
+                                       void* dst, size_t dstCapacity,
+                                 const void* src, size_t srcSize,
+                                 const void* dict,size_t dictSize,
+                                 const ZSTD_CCtx_params* params);
+
+
+/* ZSTD_writeLastEmptyBlock() :
+ * output an empty Block with end-of-frame mark to complete a frame
+ * @return : size of data written into `dst` (== ZSTD_blockHeaderSize (defined in zstd_internal.h))
+ *           or an error code if `dstCapacity` is too small (<ZSTD_blockHeaderSize)
+ */
+size_t ZSTD_writeLastEmptyBlock(void* dst, size_t dstCapacity);
+
+
+/* ZSTD_referenceExternalSequences() :
+ * Must be called before starting a compression operation.
+ * seqs must parse a prefix of the source.
+ * This cannot be used when long range matching is enabled.
+ * Zstd will use these sequences, and pass the literals to a secondary block
+ * compressor.
+ * @return : An error code on failure.
+ * NOTE: seqs are not verified! Invalid sequences can cause out-of-bounds memory
+ * access and data corruption.
+ */
+size_t ZSTD_referenceExternalSequences(ZSTD_CCtx* cctx, rawSeq* seq, size_t nbSeq);
+
+/** ZSTD_cycleLog() :
+ *  condition for correct operation : hashLog > 1 */
+U32 ZSTD_cycleLog(U32 hashLog, ZSTD_strategy strat);
+
+/** ZSTD_CCtx_trace() :
+ *  Trace the end of a compression call.
+ */
+void ZSTD_CCtx_trace(ZSTD_CCtx* cctx, size_t extraCSize);
+
+#endif /* ZSTD_COMPRESS_H */
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_compress_literals.c mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_compress_literals.c
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_compress_literals.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_compress_literals.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,158 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+ /*-*************************************
+ *  Dependencies
+ ***************************************/
+#include "zstd_compress_literals.h"
+
+size_t ZSTD_noCompressLiterals (void* dst, size_t dstCapacity, const void* src, size_t srcSize)
+{
+    BYTE* const ostart = (BYTE*)dst;
+    U32   const flSize = 1 + (srcSize>31) + (srcSize>4095);
+
+    RETURN_ERROR_IF(srcSize + flSize > dstCapacity, dstSize_tooSmall, "");
+
+    switch(flSize)
+    {
+        case 1: /* 2 - 1 - 5 */
+            ostart[0] = (BYTE)((U32)set_basic + (srcSize<<3));
+            break;
+        case 2: /* 2 - 2 - 12 */
+            MEM_writeLE16(ostart, (U16)((U32)set_basic + (1<<2) + (srcSize<<4)));
+            break;
+        case 3: /* 2 - 2 - 20 */
+            MEM_writeLE32(ostart, (U32)((U32)set_basic + (3<<2) + (srcSize<<4)));
+            break;
+        default:   /* not necessary : flSize is {1,2,3} */
+            assert(0);
+    }
+
+    ZSTD_memcpy(ostart + flSize, src, srcSize);
+    DEBUGLOG(5, "Raw literals: %u -> %u", (U32)srcSize, (U32)(srcSize + flSize));
+    return srcSize + flSize;
+}
+
+size_t ZSTD_compressRleLiteralsBlock (void* dst, size_t dstCapacity, const void* src, size_t srcSize)
+{
+    BYTE* const ostart = (BYTE*)dst;
+    U32   const flSize = 1 + (srcSize>31) + (srcSize>4095);
+
+    (void)dstCapacity;  /* dstCapacity already guaranteed to be >=4, hence large enough */
+
+    switch(flSize)
+    {
+        case 1: /* 2 - 1 - 5 */
+            ostart[0] = (BYTE)((U32)set_rle + (srcSize<<3));
+            break;
+        case 2: /* 2 - 2 - 12 */
+            MEM_writeLE16(ostart, (U16)((U32)set_rle + (1<<2) + (srcSize<<4)));
+            break;
+        case 3: /* 2 - 2 - 20 */
+            MEM_writeLE32(ostart, (U32)((U32)set_rle + (3<<2) + (srcSize<<4)));
+            break;
+        default:   /* not necessary : flSize is {1,2,3} */
+            assert(0);
+    }
+
+    ostart[flSize] = *(const BYTE*)src;
+    DEBUGLOG(5, "RLE literals: %u -> %u", (U32)srcSize, (U32)flSize + 1);
+    return flSize+1;
+}
+
+size_t ZSTD_compressLiterals (ZSTD_hufCTables_t const* prevHuf,
+                              ZSTD_hufCTables_t* nextHuf,
+                              ZSTD_strategy strategy, int disableLiteralCompression,
+                              void* dst, size_t dstCapacity,
+                        const void* src, size_t srcSize,
+                              void* entropyWorkspace, size_t entropyWorkspaceSize,
+                        const int bmi2)
+{
+    size_t const minGain = ZSTD_minGain(srcSize, strategy);
+    size_t const lhSize = 3 + (srcSize >= 1 KB) + (srcSize >= 16 KB);
+    BYTE*  const ostart = (BYTE*)dst;
+    U32 singleStream = srcSize < 256;
+    symbolEncodingType_e hType = set_compressed;
+    size_t cLitSize;
+
+    DEBUGLOG(5,"ZSTD_compressLiterals (disableLiteralCompression=%i srcSize=%u)",
+                disableLiteralCompression, (U32)srcSize);
+
+    /* Prepare nextEntropy assuming reusing the existing table */
+    ZSTD_memcpy(nextHuf, prevHuf, sizeof(*prevHuf));
+
+    if (disableLiteralCompression)
+        return ZSTD_noCompressLiterals(dst, dstCapacity, src, srcSize);
+
+    /* small ? don't even attempt compression (speed opt) */
+#   define COMPRESS_LITERALS_SIZE_MIN 63
+    {   size_t const minLitSize = (prevHuf->repeatMode == HUF_repeat_valid) ? 6 : COMPRESS_LITERALS_SIZE_MIN;
+        if (srcSize <= minLitSize) return ZSTD_noCompressLiterals(dst, dstCapacity, src, srcSize);
+    }
+
+    RETURN_ERROR_IF(dstCapacity < lhSize+1, dstSize_tooSmall, "not enough space for compression");
+    {   HUF_repeat repeat = prevHuf->repeatMode;
+        int const preferRepeat = strategy < ZSTD_lazy ? srcSize <= 1024 : 0;
+        if (repeat == HUF_repeat_valid && lhSize == 3) singleStream = 1;
+        cLitSize = singleStream ?
+            HUF_compress1X_repeat(
+                ostart+lhSize, dstCapacity-lhSize, src, srcSize,
+                HUF_SYMBOLVALUE_MAX, HUF_TABLELOG_DEFAULT, entropyWorkspace, entropyWorkspaceSize,
+                (HUF_CElt*)nextHuf->CTable, &repeat, preferRepeat, bmi2) :
+            HUF_compress4X_repeat(
+                ostart+lhSize, dstCapacity-lhSize, src, srcSize,
+                HUF_SYMBOLVALUE_MAX, HUF_TABLELOG_DEFAULT, entropyWorkspace, entropyWorkspaceSize,
+                (HUF_CElt*)nextHuf->CTable, &repeat, preferRepeat, bmi2);
+        if (repeat != HUF_repeat_none) {
+            /* reused the existing table */
+            DEBUGLOG(5, "Reusing previous huffman table");
+            hType = set_repeat;
+        }
+    }
+
+    if ((cLitSize==0) || (cLitSize >= srcSize - minGain) || ERR_isError(cLitSize)) {
+        ZSTD_memcpy(nextHuf, prevHuf, sizeof(*prevHuf));
+        return ZSTD_noCompressLiterals(dst, dstCapacity, src, srcSize);
+    }
+    if (cLitSize==1) {
+        ZSTD_memcpy(nextHuf, prevHuf, sizeof(*prevHuf));
+        return ZSTD_compressRleLiteralsBlock(dst, dstCapacity, src, srcSize);
+    }
+
+    if (hType == set_compressed) {
+        /* using a newly constructed table */
+        nextHuf->repeatMode = HUF_repeat_check;
+    }
+
+    /* Build header */
+    switch(lhSize)
+    {
+    case 3: /* 2 - 2 - 10 - 10 */
+        {   U32 const lhc = hType + ((!singleStream) << 2) + ((U32)srcSize<<4) + ((U32)cLitSize<<14);
+            MEM_writeLE24(ostart, lhc);
+            break;
+        }
+    case 4: /* 2 - 2 - 14 - 14 */
+        {   U32 const lhc = hType + (2 << 2) + ((U32)srcSize<<4) + ((U32)cLitSize<<18);
+            MEM_writeLE32(ostart, lhc);
+            break;
+        }
+    case 5: /* 2 - 2 - 18 - 18 */
+        {   U32 const lhc = hType + (3 << 2) + ((U32)srcSize<<4) + ((U32)cLitSize<<22);
+            MEM_writeLE32(ostart, lhc);
+            ostart[4] = (BYTE)(cLitSize >> 10);
+            break;
+        }
+    default:  /* not possible : lhSize is {3,4,5} */
+        assert(0);
+    }
+    DEBUGLOG(5, "Compressed literals: %u -> %u", (U32)srcSize, (U32)(lhSize+cLitSize));
+    return lhSize+cLitSize;
+}
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_compress_literals.h mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_compress_literals.h
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_compress_literals.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_compress_literals.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+#ifndef ZSTD_COMPRESS_LITERALS_H
+#define ZSTD_COMPRESS_LITERALS_H
+
+#include "zstd_compress_internal.h" /* ZSTD_hufCTables_t, ZSTD_minGain() */
+
+
+size_t ZSTD_noCompressLiterals (void* dst, size_t dstCapacity, const void* src, size_t srcSize);
+
+size_t ZSTD_compressRleLiteralsBlock (void* dst, size_t dstCapacity, const void* src, size_t srcSize);
+
+size_t ZSTD_compressLiterals (ZSTD_hufCTables_t const* prevHuf,
+                              ZSTD_hufCTables_t* nextHuf,
+                              ZSTD_strategy strategy, int disableLiteralCompression,
+                              void* dst, size_t dstCapacity,
+                        const void* src, size_t srcSize,
+                              void* entropyWorkspace, size_t entropyWorkspaceSize,
+                        const int bmi2);
+
+#endif /* ZSTD_COMPRESS_LITERALS_H */
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_compress_sequences.c mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_compress_sequences.c
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_compress_sequences.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_compress_sequences.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,441 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+ /*-*************************************
+ *  Dependencies
+ ***************************************/
+#include "zstd_compress_sequences.h"
+
+/**
+ * -log2(x / 256) lookup table for x in [0, 256).
+ * If x == 0: Return 0
+ * Else: Return floor(-log2(x / 256) * 256)
+ */
+static unsigned const kInverseProbabilityLog256[256] = {
+    0,    2048, 1792, 1642, 1536, 1453, 1386, 1329, 1280, 1236, 1197, 1162,
+    1130, 1100, 1073, 1047, 1024, 1001, 980,  960,  941,  923,  906,  889,
+    874,  859,  844,  830,  817,  804,  791,  779,  768,  756,  745,  734,
+    724,  714,  704,  694,  685,  676,  667,  658,  650,  642,  633,  626,
+    618,  610,  603,  595,  588,  581,  574,  567,  561,  554,  548,  542,
+    535,  529,  523,  517,  512,  506,  500,  495,  489,  484,  478,  473,
+    468,  463,  458,  453,  448,  443,  438,  434,  429,  424,  420,  415,
+    411,  407,  402,  398,  394,  390,  386,  382,  377,  373,  370,  366,
+    362,  358,  354,  350,  347,  343,  339,  336,  332,  329,  325,  322,
+    318,  315,  311,  308,  305,  302,  298,  295,  292,  289,  286,  282,
+    279,  276,  273,  270,  267,  264,  261,  258,  256,  253,  250,  247,
+    244,  241,  239,  236,  233,  230,  228,  225,  222,  220,  217,  215,
+    212,  209,  207,  204,  202,  199,  197,  194,  192,  190,  187,  185,
+    182,  180,  178,  175,  173,  171,  168,  166,  164,  162,  159,  157,
+    155,  153,  151,  149,  146,  144,  142,  140,  138,  136,  134,  132,
+    130,  128,  126,  123,  121,  119,  117,  115,  114,  112,  110,  108,
+    106,  104,  102,  100,  98,   96,   94,   93,   91,   89,   87,   85,
+    83,   82,   80,   78,   76,   74,   73,   71,   69,   67,   66,   64,
+    62,   61,   59,   57,   55,   54,   52,   50,   49,   47,   46,   44,
+    42,   41,   39,   37,   36,   34,   33,   31,   30,   28,   26,   25,
+    23,   22,   20,   19,   17,   16,   14,   13,   11,   10,   8,    7,
+    5,    4,    2,    1,
+};
+
+static unsigned ZSTD_getFSEMaxSymbolValue(FSE_CTable const* ctable) {
+  void const* ptr = ctable;
+  U16 const* u16ptr = (U16 const*)ptr;
+  U32 const maxSymbolValue = MEM_read16(u16ptr + 1);
+  return maxSymbolValue;
+}
+
+/**
+ * Returns true if we should use ncount=-1 else we should
+ * use ncount=1 for low probability symbols instead.
+ */
+static unsigned ZSTD_useLowProbCount(size_t const nbSeq)
+{
+    /* Heuristic: This should cover most blocks <= 16K and
+     * start to fade out after 16K to about 32K depending on
+     * comprssibility.
+     */
+    return nbSeq >= 2048;
+}
+
+/**
+ * Returns the cost in bytes of encoding the normalized count header.
+ * Returns an error if any of the helper functions return an error.
+ */
+static size_t ZSTD_NCountCost(unsigned const* count, unsigned const max,
+                              size_t const nbSeq, unsigned const FSELog)
+{
+    BYTE wksp[FSE_NCOUNTBOUND];
+    S16 norm[MaxSeq + 1];
+    const U32 tableLog = FSE_optimalTableLog(FSELog, nbSeq, max);
+    FORWARD_IF_ERROR(FSE_normalizeCount(norm, tableLog, count, nbSeq, max, ZSTD_useLowProbCount(nbSeq)), "");
+    return FSE_writeNCount(wksp, sizeof(wksp), norm, max, tableLog);
+}
+
+/**
+ * Returns the cost in bits of encoding the distribution described by count
+ * using the entropy bound.
+ */
+static size_t ZSTD_entropyCost(unsigned const* count, unsigned const max, size_t const total)
+{
+    unsigned cost = 0;
+    unsigned s;
+
+    assert(total > 0);
+    for (s = 0; s <= max; ++s) {
+        unsigned norm = (unsigned)((256 * count[s]) / total);
+        if (count[s] != 0 && norm == 0)
+            norm = 1;
+        assert(count[s] < total);
+        cost += count[s] * kInverseProbabilityLog256[norm];
+    }
+    return cost >> 8;
+}
+
+/**
+ * Returns the cost in bits of encoding the distribution in count using ctable.
+ * Returns an error if ctable cannot represent all the symbols in count.
+ */
+size_t ZSTD_fseBitCost(
+    FSE_CTable const* ctable,
+    unsigned const* count,
+    unsigned const max)
+{
+    unsigned const kAccuracyLog = 8;
+    size_t cost = 0;
+    unsigned s;
+    FSE_CState_t cstate;
+    FSE_initCState(&cstate, ctable);
+    if (ZSTD_getFSEMaxSymbolValue(ctable) < max) {
+        DEBUGLOG(5, "Repeat FSE_CTable has maxSymbolValue %u < %u",
+                    ZSTD_getFSEMaxSymbolValue(ctable), max);
+        return ERROR(GENERIC);
+    }
+    for (s = 0; s <= max; ++s) {
+        unsigned const tableLog = cstate.stateLog;
+        unsigned const badCost = (tableLog + 1) << kAccuracyLog;
+        unsigned const bitCost = FSE_bitCost(cstate.symbolTT, tableLog, s, kAccuracyLog);
+        if (count[s] == 0)
+            continue;
+        if (bitCost >= badCost) {
+            DEBUGLOG(5, "Repeat FSE_CTable has Prob[%u] == 0", s);
+            return ERROR(GENERIC);
+        }
+        cost += (size_t)count[s] * bitCost;
+    }
+    return cost >> kAccuracyLog;
+}
+
+/**
+ * Returns the cost in bits of encoding the distribution in count using the
+ * table described by norm. The max symbol support by norm is assumed >= max.
+ * norm must be valid for every symbol with non-zero probability in count.
+ */
+size_t ZSTD_crossEntropyCost(short const* norm, unsigned accuracyLog,
+                             unsigned const* count, unsigned const max)
+{
+    unsigned const shift = 8 - accuracyLog;
+    size_t cost = 0;
+    unsigned s;
+    assert(accuracyLog <= 8);
+    for (s = 0; s <= max; ++s) {
+        unsigned const normAcc = (norm[s] != -1) ? (unsigned)norm[s] : 1;
+        unsigned const norm256 = normAcc << shift;
+        assert(norm256 > 0);
+        assert(norm256 < 256);
+        cost += count[s] * kInverseProbabilityLog256[norm256];
+    }
+    return cost >> 8;
+}
+
+symbolEncodingType_e
+ZSTD_selectEncodingType(
+        FSE_repeat* repeatMode, unsigned const* count, unsigned const max,
+        size_t const mostFrequent, size_t nbSeq, unsigned const FSELog,
+        FSE_CTable const* prevCTable,
+        short const* defaultNorm, U32 defaultNormLog,
+        ZSTD_defaultPolicy_e const isDefaultAllowed,
+        ZSTD_strategy const strategy)
+{
+    ZSTD_STATIC_ASSERT(ZSTD_defaultDisallowed == 0 && ZSTD_defaultAllowed != 0);
+    if (mostFrequent == nbSeq) {
+        *repeatMode = FSE_repeat_none;
+        if (isDefaultAllowed && nbSeq <= 2) {
+            /* Prefer set_basic over set_rle when there are 2 or less symbols,
+             * since RLE uses 1 byte, but set_basic uses 5-6 bits per symbol.
+             * If basic encoding isn't possible, always choose RLE.
+             */
+            DEBUGLOG(5, "Selected set_basic");
+            return set_basic;
+        }
+        DEBUGLOG(5, "Selected set_rle");
+        return set_rle;
+    }
+    if (strategy < ZSTD_lazy) {
+        if (isDefaultAllowed) {
+            size_t const staticFse_nbSeq_max = 1000;
+            size_t const mult = 10 - strategy;
+            size_t const baseLog = 3;
+            size_t const dynamicFse_nbSeq_min = (((size_t)1 << defaultNormLog) * mult) >> baseLog;  /* 28-36 for offset, 56-72 for lengths */
+            assert(defaultNormLog >= 5 && defaultNormLog <= 6);  /* xx_DEFAULTNORMLOG */
+            assert(mult <= 9 && mult >= 7);
+            if ( (*repeatMode == FSE_repeat_valid)
+              && (nbSeq < staticFse_nbSeq_max) ) {
+                DEBUGLOG(5, "Selected set_repeat");
+                return set_repeat;
+            }
+            if ( (nbSeq < dynamicFse_nbSeq_min)
+              || (mostFrequent < (nbSeq >> (defaultNormLog-1))) ) {
+                DEBUGLOG(5, "Selected set_basic");
+                /* The format allows default tables to be repeated, but it isn't useful.
+                 * When using simple heuristics to select encoding type, we don't want
+                 * to confuse these tables with dictionaries. When running more careful
+                 * analysis, we don't need to waste time checking both repeating tables
+                 * and default tables.
+                 */
+                *repeatMode = FSE_repeat_none;
+                return set_basic;
+            }
+        }
+    } else {
+        size_t const basicCost = isDefaultAllowed ? ZSTD_crossEntropyCost(defaultNorm, defaultNormLog, count, max) : ERROR(GENERIC);
+        size_t const repeatCost = *repeatMode != FSE_repeat_none ? ZSTD_fseBitCost(prevCTable, count, max) : ERROR(GENERIC);
+        size_t const NCountCost = ZSTD_NCountCost(count, max, nbSeq, FSELog);
+        size_t const compressedCost = (NCountCost << 3) + ZSTD_entropyCost(count, max, nbSeq);
+
+        if (isDefaultAllowed) {
+            assert(!ZSTD_isError(basicCost));
+            assert(!(*repeatMode == FSE_repeat_valid && ZSTD_isError(repeatCost)));
+        }
+        assert(!ZSTD_isError(NCountCost));
+        assert(compressedCost < ERROR(maxCode));
+        DEBUGLOG(5, "Estimated bit costs: basic=%u\trepeat=%u\tcompressed=%u",
+                    (unsigned)basicCost, (unsigned)repeatCost, (unsigned)compressedCost);
+        if (basicCost <= repeatCost && basicCost <= compressedCost) {
+            DEBUGLOG(5, "Selected set_basic");
+            assert(isDefaultAllowed);
+            *repeatMode = FSE_repeat_none;
+            return set_basic;
+        }
+        if (repeatCost <= compressedCost) {
+            DEBUGLOG(5, "Selected set_repeat");
+            assert(!ZSTD_isError(repeatCost));
+            return set_repeat;
+        }
+        assert(compressedCost < basicCost && compressedCost < repeatCost);
+    }
+    DEBUGLOG(5, "Selected set_compressed");
+    *repeatMode = FSE_repeat_check;
+    return set_compressed;
+}
+
+typedef struct {
+    S16 norm[MaxSeq + 1];
+    U32 wksp[FSE_BUILD_CTABLE_WORKSPACE_SIZE_U32(MaxSeq, MaxFSELog)];
+} ZSTD_BuildCTableWksp;
+
+size_t
+ZSTD_buildCTable(void* dst, size_t dstCapacity,
+                FSE_CTable* nextCTable, U32 FSELog, symbolEncodingType_e type,
+                unsigned* count, U32 max,
+                const BYTE* codeTable, size_t nbSeq,
+                const S16* defaultNorm, U32 defaultNormLog, U32 defaultMax,
+                const FSE_CTable* prevCTable, size_t prevCTableSize,
+                void* entropyWorkspace, size_t entropyWorkspaceSize)
+{
+    BYTE* op = (BYTE*)dst;
+    const BYTE* const oend = op + dstCapacity;
+    DEBUGLOG(6, "ZSTD_buildCTable (dstCapacity=%u)", (unsigned)dstCapacity);
+
+    switch (type) {
+    case set_rle:
+        FORWARD_IF_ERROR(FSE_buildCTable_rle(nextCTable, (BYTE)max), "");
+        RETURN_ERROR_IF(dstCapacity==0, dstSize_tooSmall, "not enough space");
+        *op = codeTable[0];
+        return 1;
+    case set_repeat:
+        ZSTD_memcpy(nextCTable, prevCTable, prevCTableSize);
+        return 0;
+    case set_basic:
+        FORWARD_IF_ERROR(FSE_buildCTable_wksp(nextCTable, defaultNorm, defaultMax, defaultNormLog, entropyWorkspace, entropyWorkspaceSize), "");  /* note : could be pre-calculated */
+        return 0;
+    case set_compressed: {
+        ZSTD_BuildCTableWksp* wksp = (ZSTD_BuildCTableWksp*)entropyWorkspace;
+        size_t nbSeq_1 = nbSeq;
+        const U32 tableLog = FSE_optimalTableLog(FSELog, nbSeq, max);
+        if (count[codeTable[nbSeq-1]] > 1) {
+            count[codeTable[nbSeq-1]]--;
+            nbSeq_1--;
+        }
+        assert(nbSeq_1 > 1);
+        assert(entropyWorkspaceSize >= sizeof(ZSTD_BuildCTableWksp));
+        (void)entropyWorkspaceSize;
+        FORWARD_IF_ERROR(FSE_normalizeCount(wksp->norm, tableLog, count, nbSeq_1, max, ZSTD_useLowProbCount(nbSeq_1)), "");
+        {   size_t const NCountSize = FSE_writeNCount(op, oend - op, wksp->norm, max, tableLog);   /* overflow protected */
+            FORWARD_IF_ERROR(NCountSize, "FSE_writeNCount failed");
+            FORWARD_IF_ERROR(FSE_buildCTable_wksp(nextCTable, wksp->norm, max, tableLog, wksp->wksp, sizeof(wksp->wksp)), "");
+            return NCountSize;
+        }
+    }
+    default: assert(0); RETURN_ERROR(GENERIC, "impossible to reach");
+    }
+}
+
+FORCE_INLINE_TEMPLATE size_t
+ZSTD_encodeSequences_body(
+            void* dst, size_t dstCapacity,
+            FSE_CTable const* CTable_MatchLength, BYTE const* mlCodeTable,
+            FSE_CTable const* CTable_OffsetBits, BYTE const* ofCodeTable,
+            FSE_CTable const* CTable_LitLength, BYTE const* llCodeTable,
+            seqDef const* sequences, size_t nbSeq, int longOffsets)
+{
+    BIT_CStream_t blockStream;
+    FSE_CState_t  stateMatchLength;
+    FSE_CState_t  stateOffsetBits;
+    FSE_CState_t  stateLitLength;
+
+    RETURN_ERROR_IF(
+        ERR_isError(BIT_initCStream(&blockStream, dst, dstCapacity)),
+        dstSize_tooSmall, "not enough space remaining");
+    DEBUGLOG(6, "available space for bitstream : %i  (dstCapacity=%u)",
+                (int)(blockStream.endPtr - blockStream.startPtr),
+                (unsigned)dstCapacity);
+
+    /* first symbols */
+    FSE_initCState2(&stateMatchLength, CTable_MatchLength, mlCodeTable[nbSeq-1]);
+    FSE_initCState2(&stateOffsetBits,  CTable_OffsetBits,  ofCodeTable[nbSeq-1]);
+    FSE_initCState2(&stateLitLength,   CTable_LitLength,   llCodeTable[nbSeq-1]);
+    BIT_addBits(&blockStream, sequences[nbSeq-1].litLength, LL_bits[llCodeTable[nbSeq-1]]);
+    if (MEM_32bits()) BIT_flushBits(&blockStream);
+    BIT_addBits(&blockStream, sequences[nbSeq-1].matchLength, ML_bits[mlCodeTable[nbSeq-1]]);
+    if (MEM_32bits()) BIT_flushBits(&blockStream);
+    if (longOffsets) {
+        U32 const ofBits = ofCodeTable[nbSeq-1];
+        unsigned const extraBits = ofBits - MIN(ofBits, STREAM_ACCUMULATOR_MIN-1);
+        if (extraBits) {
+            BIT_addBits(&blockStream, sequences[nbSeq-1].offset, extraBits);
+            BIT_flushBits(&blockStream);
+        }
+        BIT_addBits(&blockStream, sequences[nbSeq-1].offset >> extraBits,
+                    ofBits - extraBits);
+    } else {
+        BIT_addBits(&blockStream, sequences[nbSeq-1].offset, ofCodeTable[nbSeq-1]);
+    }
+    BIT_flushBits(&blockStream);
+
+    {   size_t n;
+        for (n=nbSeq-2 ; n<nbSeq ; n--) {      /* intentional underflow */
+            BYTE const llCode = llCodeTable[n];
+            BYTE const ofCode = ofCodeTable[n];
+            BYTE const mlCode = mlCodeTable[n];
+            U32  const llBits = LL_bits[llCode];
+            U32  const ofBits = ofCode;
+            U32  const mlBits = ML_bits[mlCode];
+            DEBUGLOG(6, "encoding: litlen:%2u - matchlen:%2u - offCode:%7u",
+                        (unsigned)sequences[n].litLength,
+                        (unsigned)sequences[n].matchLength + MINMATCH,
+                        (unsigned)sequences[n].offset);
+                                                                            /* 32b*/  /* 64b*/
+                                                                            /* (7)*/  /* (7)*/
+            FSE_encodeSymbol(&blockStream, &stateOffsetBits, ofCode);       /* 15 */  /* 15 */
+            FSE_encodeSymbol(&blockStream, &stateMatchLength, mlCode);      /* 24 */  /* 24 */
+            if (MEM_32bits()) BIT_flushBits(&blockStream);                  /* (7)*/
+            FSE_encodeSymbol(&blockStream, &stateLitLength, llCode);        /* 16 */  /* 33 */
+            if (MEM_32bits() || (ofBits+mlBits+llBits >= 64-7-(LLFSELog+MLFSELog+OffFSELog)))
+                BIT_flushBits(&blockStream);                                /* (7)*/
+            BIT_addBits(&blockStream, sequences[n].litLength, llBits);
+            if (MEM_32bits() && ((llBits+mlBits)>24)) BIT_flushBits(&blockStream);
+            BIT_addBits(&blockStream, sequences[n].matchLength, mlBits);
+            if (MEM_32bits() || (ofBits+mlBits+llBits > 56)) BIT_flushBits(&blockStream);
+            if (longOffsets) {
+                unsigned const extraBits = ofBits - MIN(ofBits, STREAM_ACCUMULATOR_MIN-1);
+                if (extraBits) {
+                    BIT_addBits(&blockStream, sequences[n].offset, extraBits);
+                    BIT_flushBits(&blockStream);                            /* (7)*/
+                }
+                BIT_addBits(&blockStream, sequences[n].offset >> extraBits,
+                            ofBits - extraBits);                            /* 31 */
+            } else {
+                BIT_addBits(&blockStream, sequences[n].offset, ofBits);     /* 31 */
+            }
+            BIT_flushBits(&blockStream);                                    /* (7)*/
+            DEBUGLOG(7, "remaining space : %i", (int)(blockStream.endPtr - blockStream.ptr));
+    }   }
+
+    DEBUGLOG(6, "ZSTD_encodeSequences: flushing ML state with %u bits", stateMatchLength.stateLog);
+    FSE_flushCState(&blockStream, &stateMatchLength);
+    DEBUGLOG(6, "ZSTD_encodeSequences: flushing Off state with %u bits", stateOffsetBits.stateLog);
+    FSE_flushCState(&blockStream, &stateOffsetBits);
+    DEBUGLOG(6, "ZSTD_encodeSequences: flushing LL state with %u bits", stateLitLength.stateLog);
+    FSE_flushCState(&blockStream, &stateLitLength);
+
+    {   size_t const streamSize = BIT_closeCStream(&blockStream);
+        RETURN_ERROR_IF(streamSize==0, dstSize_tooSmall, "not enough space");
+        return streamSize;
+    }
+}
+
+static size_t
+ZSTD_encodeSequences_default(
+            void* dst, size_t dstCapacity,
+            FSE_CTable const* CTable_MatchLength, BYTE const* mlCodeTable,
+            FSE_CTable const* CTable_OffsetBits, BYTE const* ofCodeTable,
+            FSE_CTable const* CTable_LitLength, BYTE const* llCodeTable,
+            seqDef const* sequences, size_t nbSeq, int longOffsets)
+{
+    return ZSTD_encodeSequences_body(dst, dstCapacity,
+                                    CTable_MatchLength, mlCodeTable,
+                                    CTable_OffsetBits, ofCodeTable,
+                                    CTable_LitLength, llCodeTable,
+                                    sequences, nbSeq, longOffsets);
+}
+
+
+#if DYNAMIC_BMI2
+
+static TARGET_ATTRIBUTE("bmi2") size_t
+ZSTD_encodeSequences_bmi2(
+            void* dst, size_t dstCapacity,
+            FSE_CTable const* CTable_MatchLength, BYTE const* mlCodeTable,
+            FSE_CTable const* CTable_OffsetBits, BYTE const* ofCodeTable,
+            FSE_CTable const* CTable_LitLength, BYTE const* llCodeTable,
+            seqDef const* sequences, size_t nbSeq, int longOffsets)
+{
+    return ZSTD_encodeSequences_body(dst, dstCapacity,
+                                    CTable_MatchLength, mlCodeTable,
+                                    CTable_OffsetBits, ofCodeTable,
+                                    CTable_LitLength, llCodeTable,
+                                    sequences, nbSeq, longOffsets);
+}
+
+#endif
+
+size_t ZSTD_encodeSequences(
+            void* dst, size_t dstCapacity,
+            FSE_CTable const* CTable_MatchLength, BYTE const* mlCodeTable,
+            FSE_CTable const* CTable_OffsetBits, BYTE const* ofCodeTable,
+            FSE_CTable const* CTable_LitLength, BYTE const* llCodeTable,
+            seqDef const* sequences, size_t nbSeq, int longOffsets, int bmi2)
+{
+    DEBUGLOG(5, "ZSTD_encodeSequences: dstCapacity = %u", (unsigned)dstCapacity);
+#if DYNAMIC_BMI2
+    if (bmi2) {
+        return ZSTD_encodeSequences_bmi2(dst, dstCapacity,
+                                         CTable_MatchLength, mlCodeTable,
+                                         CTable_OffsetBits, ofCodeTable,
+                                         CTable_LitLength, llCodeTable,
+                                         sequences, nbSeq, longOffsets);
+    }
+#endif
+    (void)bmi2;
+    return ZSTD_encodeSequences_default(dst, dstCapacity,
+                                        CTable_MatchLength, mlCodeTable,
+                                        CTable_OffsetBits, ofCodeTable,
+                                        CTable_LitLength, llCodeTable,
+                                        sequences, nbSeq, longOffsets);
+}
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_compress_sequences.h mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_compress_sequences.h
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_compress_sequences.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_compress_sequences.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+#ifndef ZSTD_COMPRESS_SEQUENCES_H
+#define ZSTD_COMPRESS_SEQUENCES_H
+
+#include "../common/fse.h" /* FSE_repeat, FSE_CTable */
+#include "../common/zstd_internal.h" /* symbolEncodingType_e, ZSTD_strategy */
+
+typedef enum {
+    ZSTD_defaultDisallowed = 0,
+    ZSTD_defaultAllowed = 1
+} ZSTD_defaultPolicy_e;
+
+symbolEncodingType_e
+ZSTD_selectEncodingType(
+        FSE_repeat* repeatMode, unsigned const* count, unsigned const max,
+        size_t const mostFrequent, size_t nbSeq, unsigned const FSELog,
+        FSE_CTable const* prevCTable,
+        short const* defaultNorm, U32 defaultNormLog,
+        ZSTD_defaultPolicy_e const isDefaultAllowed,
+        ZSTD_strategy const strategy);
+
+size_t
+ZSTD_buildCTable(void* dst, size_t dstCapacity,
+                FSE_CTable* nextCTable, U32 FSELog, symbolEncodingType_e type,
+                unsigned* count, U32 max,
+                const BYTE* codeTable, size_t nbSeq,
+                const S16* defaultNorm, U32 defaultNormLog, U32 defaultMax,
+                const FSE_CTable* prevCTable, size_t prevCTableSize,
+                void* entropyWorkspace, size_t entropyWorkspaceSize);
+
+size_t ZSTD_encodeSequences(
+            void* dst, size_t dstCapacity,
+            FSE_CTable const* CTable_MatchLength, BYTE const* mlCodeTable,
+            FSE_CTable const* CTable_OffsetBits, BYTE const* ofCodeTable,
+            FSE_CTable const* CTable_LitLength, BYTE const* llCodeTable,
+            seqDef const* sequences, size_t nbSeq, int longOffsets, int bmi2);
+
+size_t ZSTD_fseBitCost(
+    FSE_CTable const* ctable,
+    unsigned const* count,
+    unsigned const max);
+
+size_t ZSTD_crossEntropyCost(short const* norm, unsigned accuracyLog,
+                             unsigned const* count, unsigned const max);
+#endif /* ZSTD_COMPRESS_SEQUENCES_H */
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_compress_superblock.c mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_compress_superblock.c
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_compress_superblock.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_compress_superblock.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,572 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+ /*-*************************************
+ *  Dependencies
+ ***************************************/
+#include "zstd_compress_superblock.h"
+
+#include "../common/zstd_internal.h"  /* ZSTD_getSequenceLength */
+#include "hist.h"                     /* HIST_countFast_wksp */
+#include "zstd_compress_internal.h"   /* ZSTD_[huf|fse|entropy]CTablesMetadata_t */
+#include "zstd_compress_sequences.h"
+#include "zstd_compress_literals.h"
+
+/** ZSTD_compressSubBlock_literal() :
+ *  Compresses literals section for a sub-block.
+ *  When we have to write the Huffman table we will sometimes choose a header
+ *  size larger than necessary. This is because we have to pick the header size
+ *  before we know the table size + compressed size, so we have a bound on the
+ *  table size. If we guessed incorrectly, we fall back to uncompressed literals.
+ *
+ *  We write the header when writeEntropy=1 and set entropyWritten=1 when we succeeded
+ *  in writing the header, otherwise it is set to 0.
+ *
+ *  hufMetadata->hType has literals block type info.
+ *      If it is set_basic, all sub-blocks literals section will be Raw_Literals_Block.
+ *      If it is set_rle, all sub-blocks literals section will be RLE_Literals_Block.
+ *      If it is set_compressed, first sub-block's literals section will be Compressed_Literals_Block
+ *      If it is set_compressed, first sub-block's literals section will be Treeless_Literals_Block
+ *      and the following sub-blocks' literals sections will be Treeless_Literals_Block.
+ *  @return : compressed size of literals section of a sub-block
+ *            Or 0 if it unable to compress.
+ *            Or error code */
+static size_t ZSTD_compressSubBlock_literal(const HUF_CElt* hufTable,
+                                    const ZSTD_hufCTablesMetadata_t* hufMetadata,
+                                    const BYTE* literals, size_t litSize,
+                                    void* dst, size_t dstSize,
+                                    const int bmi2, int writeEntropy, int* entropyWritten)
+{
+    size_t const header = writeEntropy ? 200 : 0;
+    size_t const lhSize = 3 + (litSize >= (1 KB - header)) + (litSize >= (16 KB - header));
+    BYTE* const ostart = (BYTE*)dst;
+    BYTE* const oend = ostart + dstSize;
+    BYTE* op = ostart + lhSize;
+    U32 const singleStream = lhSize == 3;
+    symbolEncodingType_e hType = writeEntropy ? hufMetadata->hType : set_repeat;
+    size_t cLitSize = 0;
+
+    (void)bmi2; /* TODO bmi2... */
+
+    DEBUGLOG(5, "ZSTD_compressSubBlock_literal (litSize=%zu, lhSize=%zu, writeEntropy=%d)", litSize, lhSize, writeEntropy);
+
+    *entropyWritten = 0;
+    if (litSize == 0 || hufMetadata->hType == set_basic) {
+      DEBUGLOG(5, "ZSTD_compressSubBlock_literal using raw literal");
+      return ZSTD_noCompressLiterals(dst, dstSize, literals, litSize);
+    } else if (hufMetadata->hType == set_rle) {
+      DEBUGLOG(5, "ZSTD_compressSubBlock_literal using rle literal");
+      return ZSTD_compressRleLiteralsBlock(dst, dstSize, literals, litSize);
+    }
+
+    assert(litSize > 0);
+    assert(hufMetadata->hType == set_compressed || hufMetadata->hType == set_repeat);
+
+    if (writeEntropy && hufMetadata->hType == set_compressed) {
+        ZSTD_memcpy(op, hufMetadata->hufDesBuffer, hufMetadata->hufDesSize);
+        op += hufMetadata->hufDesSize;
+        cLitSize += hufMetadata->hufDesSize;
+        DEBUGLOG(5, "ZSTD_compressSubBlock_literal (hSize=%zu)", hufMetadata->hufDesSize);
+    }
+
+    /* TODO bmi2 */
+    {   const size_t cSize = singleStream ? HUF_compress1X_usingCTable(op, oend-op, literals, litSize, hufTable)
+                                          : HUF_compress4X_usingCTable(op, oend-op, literals, litSize, hufTable);
+        op += cSize;
+        cLitSize += cSize;
+        if (cSize == 0 || ERR_isError(cSize)) {
+            DEBUGLOG(5, "Failed to write entropy tables %s", ZSTD_getErrorName(cSize));
+            return 0;
+        }
+        /* If we expand and we aren't writing a header then emit uncompressed */
+        if (!writeEntropy && cLitSize >= litSize) {
+            DEBUGLOG(5, "ZSTD_compressSubBlock_literal using raw literal because uncompressible");
+            return ZSTD_noCompressLiterals(dst, dstSize, literals, litSize);
+        }
+        /* If we are writing headers then allow expansion that doesn't change our header size. */
+        if (lhSize < (size_t)(3 + (cLitSize >= 1 KB) + (cLitSize >= 16 KB))) {
+            assert(cLitSize > litSize);
+            DEBUGLOG(5, "Literals expanded beyond allowed header size");
+            return ZSTD_noCompressLiterals(dst, dstSize, literals, litSize);
+        }
+        DEBUGLOG(5, "ZSTD_compressSubBlock_literal (cSize=%zu)", cSize);
+    }
+
+    /* Build header */
+    switch(lhSize)
+    {
+    case 3: /* 2 - 2 - 10 - 10 */
+        {   U32 const lhc = hType + ((!singleStream) << 2) + ((U32)litSize<<4) + ((U32)cLitSize<<14);
+            MEM_writeLE24(ostart, lhc);
+            break;
+        }
+    case 4: /* 2 - 2 - 14 - 14 */
+        {   U32 const lhc = hType + (2 << 2) + ((U32)litSize<<4) + ((U32)cLitSize<<18);
+            MEM_writeLE32(ostart, lhc);
+            break;
+        }
+    case 5: /* 2 - 2 - 18 - 18 */
+        {   U32 const lhc = hType + (3 << 2) + ((U32)litSize<<4) + ((U32)cLitSize<<22);
+            MEM_writeLE32(ostart, lhc);
+            ostart[4] = (BYTE)(cLitSize >> 10);
+            break;
+        }
+    default:  /* not possible : lhSize is {3,4,5} */
+        assert(0);
+    }
+    *entropyWritten = 1;
+    DEBUGLOG(5, "Compressed literals: %u -> %u", (U32)litSize, (U32)(op-ostart));
+    return op-ostart;
+}
+
+static size_t ZSTD_seqDecompressedSize(seqStore_t const* seqStore, const seqDef* sequences, size_t nbSeq, size_t litSize, int lastSequence) {
+    const seqDef* const sstart = sequences;
+    const seqDef* const send = sequences + nbSeq;
+    const seqDef* sp = sstart;
+    size_t matchLengthSum = 0;
+    size_t litLengthSum = 0;
+    while (send-sp > 0) {
+        ZSTD_sequenceLength const seqLen = ZSTD_getSequenceLength(seqStore, sp);
+        litLengthSum += seqLen.litLength;
+        matchLengthSum += seqLen.matchLength;
+        sp++;
+    }
+    assert(litLengthSum <= litSize);
+    if (!lastSequence) {
+        assert(litLengthSum == litSize);
+    }
+    return matchLengthSum + litSize;
+}
+
+/** ZSTD_compressSubBlock_sequences() :
+ *  Compresses sequences section for a sub-block.
+ *  fseMetadata->llType, fseMetadata->ofType, and fseMetadata->mlType have
+ *  symbol compression modes for the super-block.
+ *  The first successfully compressed block will have these in its header.
+ *  We set entropyWritten=1 when we succeed in compressing the sequences.
+ *  The following sub-blocks will always have repeat mode.
+ *  @return : compressed size of sequences section of a sub-block
+ *            Or 0 if it is unable to compress
+ *            Or error code. */
+static size_t ZSTD_compressSubBlock_sequences(const ZSTD_fseCTables_t* fseTables,
+                                              const ZSTD_fseCTablesMetadata_t* fseMetadata,
+                                              const seqDef* sequences, size_t nbSeq,
+                                              const BYTE* llCode, const BYTE* mlCode, const BYTE* ofCode,
+                                              const ZSTD_CCtx_params* cctxParams,
+                                              void* dst, size_t dstCapacity,
+                                              const int bmi2, int writeEntropy, int* entropyWritten)
+{
+    const int longOffsets = cctxParams->cParams.windowLog > STREAM_ACCUMULATOR_MIN;
+    BYTE* const ostart = (BYTE*)dst;
+    BYTE* const oend = ostart + dstCapacity;
+    BYTE* op = ostart;
+    BYTE* seqHead;
+
+    DEBUGLOG(5, "ZSTD_compressSubBlock_sequences (nbSeq=%zu, writeEntropy=%d, longOffsets=%d)", nbSeq, writeEntropy, longOffsets);
+
+    *entropyWritten = 0;
+    /* Sequences Header */
+    RETURN_ERROR_IF((oend-op) < 3 /*max nbSeq Size*/ + 1 /*seqHead*/,
+                    dstSize_tooSmall, "");
+    if (nbSeq < 0x7F)
+        *op++ = (BYTE)nbSeq;
+    else if (nbSeq < LONGNBSEQ)
+        op[0] = (BYTE)((nbSeq>>8) + 0x80), op[1] = (BYTE)nbSeq, op+=2;
+    else
+        op[0]=0xFF, MEM_writeLE16(op+1, (U16)(nbSeq - LONGNBSEQ)), op+=3;
+    if (nbSeq==0) {
+        return op - ostart;
+    }
+
+    /* seqHead : flags for FSE encoding type */
+    seqHead = op++;
+
+    DEBUGLOG(5, "ZSTD_compressSubBlock_sequences (seqHeadSize=%u)", (unsigned)(op-ostart));
+
+    if (writeEntropy) {
+        const U32 LLtype = fseMetadata->llType;
+        const U32 Offtype = fseMetadata->ofType;
+        const U32 MLtype = fseMetadata->mlType;
+        DEBUGLOG(5, "ZSTD_compressSubBlock_sequences (fseTablesSize=%zu)", fseMetadata->fseTablesSize);
+        *seqHead = (BYTE)((LLtype<<6) + (Offtype<<4) + (MLtype<<2));
+        ZSTD_memcpy(op, fseMetadata->fseTablesBuffer, fseMetadata->fseTablesSize);
+        op += fseMetadata->fseTablesSize;
+    } else {
+        const U32 repeat = set_repeat;
+        *seqHead = (BYTE)((repeat<<6) + (repeat<<4) + (repeat<<2));
+    }
+
+    {   size_t const bitstreamSize = ZSTD_encodeSequences(
+                                        op, oend - op,
+                                        fseTables->matchlengthCTable, mlCode,
+                                        fseTables->offcodeCTable, ofCode,
+                                        fseTables->litlengthCTable, llCode,
+                                        sequences, nbSeq,
+                                        longOffsets, bmi2);
+        FORWARD_IF_ERROR(bitstreamSize, "ZSTD_encodeSequences failed");
+        op += bitstreamSize;
+        /* zstd versions <= 1.3.4 mistakenly report corruption when
+         * FSE_readNCount() receives a buffer < 4 bytes.
+         * Fixed by https://github.com/facebook/zstd/pull/1146.
+         * This can happen when the last set_compressed table present is 2
+         * bytes and the bitstream is only one byte.
+         * In this exceedingly rare case, we will simply emit an uncompressed
+         * block, since it isn't worth optimizing.
+         */
+#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+        if (writeEntropy && fseMetadata->lastCountSize && fseMetadata->lastCountSize + bitstreamSize < 4) {
+            /* NCountSize >= 2 && bitstreamSize > 0 ==> lastCountSize == 3 */
+            assert(fseMetadata->lastCountSize + bitstreamSize == 3);
+            DEBUGLOG(5, "Avoiding bug in zstd decoder in versions <= 1.3.4 by "
+                        "emitting an uncompressed block.");
+            return 0;
+        }
+#endif
+        DEBUGLOG(5, "ZSTD_compressSubBlock_sequences (bitstreamSize=%zu)", bitstreamSize);
+    }
+
+    /* zstd versions <= 1.4.0 mistakenly report error when
+     * sequences section body size is less than 3 bytes.
+     * Fixed by https://github.com/facebook/zstd/pull/1664.
+     * This can happen when the previous sequences section block is compressed
+     * with rle mode and the current block's sequences section is compressed
+     * with repeat mode where sequences section body size can be 1 byte.
+     */
+#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+    if (op-seqHead < 4) {
+        DEBUGLOG(5, "Avoiding bug in zstd decoder in versions <= 1.4.0 by emitting "
+                    "an uncompressed block when sequences are < 4 bytes");
+        return 0;
+    }
+#endif
+
+    *entropyWritten = 1;
+    return op - ostart;
+}
+
+/** ZSTD_compressSubBlock() :
+ *  Compresses a single sub-block.
+ *  @return : compressed size of the sub-block
+ *            Or 0 if it failed to compress. */
+static size_t ZSTD_compressSubBlock(const ZSTD_entropyCTables_t* entropy,
+                                    const ZSTD_entropyCTablesMetadata_t* entropyMetadata,
+                                    const seqDef* sequences, size_t nbSeq,
+                                    const BYTE* literals, size_t litSize,
+                                    const BYTE* llCode, const BYTE* mlCode, const BYTE* ofCode,
+                                    const ZSTD_CCtx_params* cctxParams,
+                                    void* dst, size_t dstCapacity,
+                                    const int bmi2,
+                                    int writeLitEntropy, int writeSeqEntropy,
+                                    int* litEntropyWritten, int* seqEntropyWritten,
+                                    U32 lastBlock)
+{
+    BYTE* const ostart = (BYTE*)dst;
+    BYTE* const oend = ostart + dstCapacity;
+    BYTE* op = ostart + ZSTD_blockHeaderSize;
+    DEBUGLOG(5, "ZSTD_compressSubBlock (litSize=%zu, nbSeq=%zu, writeLitEntropy=%d, writeSeqEntropy=%d, lastBlock=%d)",
+                litSize, nbSeq, writeLitEntropy, writeSeqEntropy, lastBlock);
+    {   size_t cLitSize = ZSTD_compressSubBlock_literal((const HUF_CElt*)entropy->huf.CTable,
+                                                        &entropyMetadata->hufMetadata, literals, litSize,
+                                                        op, oend-op, bmi2, writeLitEntropy, litEntropyWritten);
+        FORWARD_IF_ERROR(cLitSize, "ZSTD_compressSubBlock_literal failed");
+        if (cLitSize == 0) return 0;
+        op += cLitSize;
+    }
+    {   size_t cSeqSize = ZSTD_compressSubBlock_sequences(&entropy->fse,
+                                                  &entropyMetadata->fseMetadata,
+                                                  sequences, nbSeq,
+                                                  llCode, mlCode, ofCode,
+                                                  cctxParams,
+                                                  op, oend-op,
+                                                  bmi2, writeSeqEntropy, seqEntropyWritten);
+        FORWARD_IF_ERROR(cSeqSize, "ZSTD_compressSubBlock_sequences failed");
+        if (cSeqSize == 0) return 0;
+        op += cSeqSize;
+    }
+    /* Write block header */
+    {   size_t cSize = (op-ostart)-ZSTD_blockHeaderSize;
+        U32 const cBlockHeader24 = lastBlock + (((U32)bt_compressed)<<1) + (U32)(cSize << 3);
+        MEM_writeLE24(ostart, cBlockHeader24);
+    }
+    return op-ostart;
+}
+
+static size_t ZSTD_estimateSubBlockSize_literal(const BYTE* literals, size_t litSize,
+                                                const ZSTD_hufCTables_t* huf,
+                                                const ZSTD_hufCTablesMetadata_t* hufMetadata,
+                                                void* workspace, size_t wkspSize,
+                                                int writeEntropy)
+{
+    unsigned* const countWksp = (unsigned*)workspace;
+    unsigned maxSymbolValue = 255;
+    size_t literalSectionHeaderSize = 3; /* Use hard coded size of 3 bytes */
+
+    if (hufMetadata->hType == set_basic) return litSize;
+    else if (hufMetadata->hType == set_rle) return 1;
+    else if (hufMetadata->hType == set_compressed || hufMetadata->hType == set_repeat) {
+        size_t const largest = HIST_count_wksp (countWksp, &maxSymbolValue, (const BYTE*)literals, litSize, workspace, wkspSize);
+        if (ZSTD_isError(largest)) return litSize;
+        {   size_t cLitSizeEstimate = HUF_estimateCompressedSize((const HUF_CElt*)huf->CTable, countWksp, maxSymbolValue);
+            if (writeEntropy) cLitSizeEstimate += hufMetadata->hufDesSize;
+            return cLitSizeEstimate + literalSectionHeaderSize;
+    }   }
+    assert(0); /* impossible */
+    return 0;
+}
+
+static size_t ZSTD_estimateSubBlockSize_symbolType(symbolEncodingType_e type,
+                        const BYTE* codeTable, unsigned maxCode,
+                        size_t nbSeq, const FSE_CTable* fseCTable,
+                        const U32* additionalBits,
+                        short const* defaultNorm, U32 defaultNormLog, U32 defaultMax,
+                        void* workspace, size_t wkspSize)
+{
+    unsigned* const countWksp = (unsigned*)workspace;
+    const BYTE* ctp = codeTable;
+    const BYTE* const ctStart = ctp;
+    const BYTE* const ctEnd = ctStart + nbSeq;
+    size_t cSymbolTypeSizeEstimateInBits = 0;
+    unsigned max = maxCode;
+
+    HIST_countFast_wksp(countWksp, &max, codeTable, nbSeq, workspace, wkspSize);  /* can't fail */
+    if (type == set_basic) {
+        /* We selected this encoding type, so it must be valid. */
+        assert(max <= defaultMax);
+        cSymbolTypeSizeEstimateInBits = max <= defaultMax
+                ? ZSTD_crossEntropyCost(defaultNorm, defaultNormLog, countWksp, max)
+                : ERROR(GENERIC);
+    } else if (type == set_rle) {
+        cSymbolTypeSizeEstimateInBits = 0;
+    } else if (type == set_compressed || type == set_repeat) {
+        cSymbolTypeSizeEstimateInBits = ZSTD_fseBitCost(fseCTable, countWksp, max);
+    }
+    if (ZSTD_isError(cSymbolTypeSizeEstimateInBits)) return nbSeq * 10;
+    while (ctp < ctEnd) {
+        if (additionalBits) cSymbolTypeSizeEstimateInBits += additionalBits[*ctp];
+        else cSymbolTypeSizeEstimateInBits += *ctp; /* for offset, offset code is also the number of additional bits */
+        ctp++;
+    }
+    return cSymbolTypeSizeEstimateInBits / 8;
+}
+
+static size_t ZSTD_estimateSubBlockSize_sequences(const BYTE* ofCodeTable,
+                                                  const BYTE* llCodeTable,
+                                                  const BYTE* mlCodeTable,
+                                                  size_t nbSeq,
+                                                  const ZSTD_fseCTables_t* fseTables,
+                                                  const ZSTD_fseCTablesMetadata_t* fseMetadata,
+                                                  void* workspace, size_t wkspSize,
+                                                  int writeEntropy)
+{
+    size_t const sequencesSectionHeaderSize = 3; /* Use hard coded size of 3 bytes */
+    size_t cSeqSizeEstimate = 0;
+    if (nbSeq == 0) return sequencesSectionHeaderSize;
+    cSeqSizeEstimate += ZSTD_estimateSubBlockSize_symbolType(fseMetadata->ofType, ofCodeTable, MaxOff,
+                                         nbSeq, fseTables->offcodeCTable, NULL,
+                                         OF_defaultNorm, OF_defaultNormLog, DefaultMaxOff,
+                                         workspace, wkspSize);
+    cSeqSizeEstimate += ZSTD_estimateSubBlockSize_symbolType(fseMetadata->llType, llCodeTable, MaxLL,
+                                         nbSeq, fseTables->litlengthCTable, LL_bits,
+                                         LL_defaultNorm, LL_defaultNormLog, MaxLL,
+                                         workspace, wkspSize);
+    cSeqSizeEstimate += ZSTD_estimateSubBlockSize_symbolType(fseMetadata->mlType, mlCodeTable, MaxML,
+                                         nbSeq, fseTables->matchlengthCTable, ML_bits,
+                                         ML_defaultNorm, ML_defaultNormLog, MaxML,
+                                         workspace, wkspSize);
+    if (writeEntropy) cSeqSizeEstimate += fseMetadata->fseTablesSize;
+    return cSeqSizeEstimate + sequencesSectionHeaderSize;
+}
+
+static size_t ZSTD_estimateSubBlockSize(const BYTE* literals, size_t litSize,
+                                        const BYTE* ofCodeTable,
+                                        const BYTE* llCodeTable,
+                                        const BYTE* mlCodeTable,
+                                        size_t nbSeq,
+                                        const ZSTD_entropyCTables_t* entropy,
+                                        const ZSTD_entropyCTablesMetadata_t* entropyMetadata,
+                                        void* workspace, size_t wkspSize,
+                                        int writeLitEntropy, int writeSeqEntropy) {
+    size_t cSizeEstimate = 0;
+    cSizeEstimate += ZSTD_estimateSubBlockSize_literal(literals, litSize,
+                                                         &entropy->huf, &entropyMetadata->hufMetadata,
+                                                         workspace, wkspSize, writeLitEntropy);
+    cSizeEstimate += ZSTD_estimateSubBlockSize_sequences(ofCodeTable, llCodeTable, mlCodeTable,
+                                                         nbSeq, &entropy->fse, &entropyMetadata->fseMetadata,
+                                                         workspace, wkspSize, writeSeqEntropy);
+    return cSizeEstimate + ZSTD_blockHeaderSize;
+}
+
+static int ZSTD_needSequenceEntropyTables(ZSTD_fseCTablesMetadata_t const* fseMetadata)
+{
+    if (fseMetadata->llType == set_compressed || fseMetadata->llType == set_rle)
+        return 1;
+    if (fseMetadata->mlType == set_compressed || fseMetadata->mlType == set_rle)
+        return 1;
+    if (fseMetadata->ofType == set_compressed || fseMetadata->ofType == set_rle)
+        return 1;
+    return 0;
+}
+
+/** ZSTD_compressSubBlock_multi() :
+ *  Breaks super-block into multiple sub-blocks and compresses them.
+ *  Entropy will be written to the first block.
+ *  The following blocks will use repeat mode to compress.
+ *  All sub-blocks are compressed blocks (no raw or rle blocks).
+ *  @return : compressed size of the super block (which is multiple ZSTD blocks)
+ *            Or 0 if it failed to compress. */
+static size_t ZSTD_compressSubBlock_multi(const seqStore_t* seqStorePtr,
+                            const ZSTD_compressedBlockState_t* prevCBlock,
+                            ZSTD_compressedBlockState_t* nextCBlock,
+                            const ZSTD_entropyCTablesMetadata_t* entropyMetadata,
+                            const ZSTD_CCtx_params* cctxParams,
+                                  void* dst, size_t dstCapacity,
+                            const void* src, size_t srcSize,
+                            const int bmi2, U32 lastBlock,
+                            void* workspace, size_t wkspSize)
+{
+    const seqDef* const sstart = seqStorePtr->sequencesStart;
+    const seqDef* const send = seqStorePtr->sequences;
+    const seqDef* sp = sstart;
+    const BYTE* const lstart = seqStorePtr->litStart;
+    const BYTE* const lend = seqStorePtr->lit;
+    const BYTE* lp = lstart;
+    BYTE const* ip = (BYTE const*)src;
+    BYTE const* const iend = ip + srcSize;
+    BYTE* const ostart = (BYTE*)dst;
+    BYTE* const oend = ostart + dstCapacity;
+    BYTE* op = ostart;
+    const BYTE* llCodePtr = seqStorePtr->llCode;
+    const BYTE* mlCodePtr = seqStorePtr->mlCode;
+    const BYTE* ofCodePtr = seqStorePtr->ofCode;
+    size_t targetCBlockSize = cctxParams->targetCBlockSize;
+    size_t litSize, seqCount;
+    int writeLitEntropy = entropyMetadata->hufMetadata.hType == set_compressed;
+    int writeSeqEntropy = 1;
+    int lastSequence = 0;
+
+    DEBUGLOG(5, "ZSTD_compressSubBlock_multi (litSize=%u, nbSeq=%u)",
+                (unsigned)(lend-lp), (unsigned)(send-sstart));
+
+    litSize = 0;
+    seqCount = 0;
+    do {
+        size_t cBlockSizeEstimate = 0;
+        if (sstart == send) {
+            lastSequence = 1;
+        } else {
+            const seqDef* const sequence = sp + seqCount;
+            lastSequence = sequence == send - 1;
+            litSize += ZSTD_getSequenceLength(seqStorePtr, sequence).litLength;
+            seqCount++;
+        }
+        if (lastSequence) {
+            assert(lp <= lend);
+            assert(litSize <= (size_t)(lend - lp));
+            litSize = (size_t)(lend - lp);
+        }
+        /* I think there is an optimization opportunity here.
+         * Calling ZSTD_estimateSubBlockSize for every sequence can be wasteful
+         * since it recalculates estimate from scratch.
+         * For example, it would recount literal distribution and symbol codes everytime.
+         */
+        cBlockSizeEstimate = ZSTD_estimateSubBlockSize(lp, litSize, ofCodePtr, llCodePtr, mlCodePtr, seqCount,
+                                                       &nextCBlock->entropy, entropyMetadata,
+                                                       workspace, wkspSize, writeLitEntropy, writeSeqEntropy);
+        if (cBlockSizeEstimate > targetCBlockSize || lastSequence) {
+            int litEntropyWritten = 0;
+            int seqEntropyWritten = 0;
+            const size_t decompressedSize = ZSTD_seqDecompressedSize(seqStorePtr, sp, seqCount, litSize, lastSequence);
+            const size_t cSize = ZSTD_compressSubBlock(&nextCBlock->entropy, entropyMetadata,
+                                                       sp, seqCount,
+                                                       lp, litSize,
+                                                       llCodePtr, mlCodePtr, ofCodePtr,
+                                                       cctxParams,
+                                                       op, oend-op,
+                                                       bmi2, writeLitEntropy, writeSeqEntropy,
+                                                       &litEntropyWritten, &seqEntropyWritten,
+                                                       lastBlock && lastSequence);
+            FORWARD_IF_ERROR(cSize, "ZSTD_compressSubBlock failed");
+            if (cSize > 0 && cSize < decompressedSize) {
+                DEBUGLOG(5, "Committed the sub-block");
+                assert(ip + decompressedSize <= iend);
+                ip += decompressedSize;
+                sp += seqCount;
+                lp += litSize;
+                op += cSize;
+                llCodePtr += seqCount;
+                mlCodePtr += seqCount;
+                ofCodePtr += seqCount;
+                litSize = 0;
+                seqCount = 0;
+                /* Entropy only needs to be written once */
+                if (litEntropyWritten) {
+                    writeLitEntropy = 0;
+                }
+                if (seqEntropyWritten) {
+                    writeSeqEntropy = 0;
+                }
+            }
+        }
+    } while (!lastSequence);
+    if (writeLitEntropy) {
+        DEBUGLOG(5, "ZSTD_compressSubBlock_multi has literal entropy tables unwritten");
+        ZSTD_memcpy(&nextCBlock->entropy.huf, &prevCBlock->entropy.huf, sizeof(prevCBlock->entropy.huf));
+    }
+    if (writeSeqEntropy && ZSTD_needSequenceEntropyTables(&entropyMetadata->fseMetadata)) {
+        /* If we haven't written our entropy tables, then we've violated our contract and
+         * must emit an uncompressed block.
+         */
+        DEBUGLOG(5, "ZSTD_compressSubBlock_multi has sequence entropy tables unwritten");
+        return 0;
+    }
+    if (ip < iend) {
+        size_t const cSize = ZSTD_noCompressBlock(op, oend - op, ip, iend - ip, lastBlock);
+        DEBUGLOG(5, "ZSTD_compressSubBlock_multi last sub-block uncompressed, %zu bytes", (size_t)(iend - ip));
+        FORWARD_IF_ERROR(cSize, "ZSTD_noCompressBlock failed");
+        assert(cSize != 0);
+        op += cSize;
+        /* We have to regenerate the repcodes because we've skipped some sequences */
+        if (sp < send) {
+            seqDef const* seq;
+            repcodes_t rep;
+            ZSTD_memcpy(&rep, prevCBlock->rep, sizeof(rep));
+            for (seq = sstart; seq < sp; ++seq) {
+                rep = ZSTD_updateRep(rep.rep, seq->offset - 1, ZSTD_getSequenceLength(seqStorePtr, seq).litLength == 0);
+            }
+            ZSTD_memcpy(nextCBlock->rep, &rep, sizeof(rep));
+        }
+    }
+    DEBUGLOG(5, "ZSTD_compressSubBlock_multi compressed");
+    return op-ostart;
+}
+
+size_t ZSTD_compressSuperBlock(ZSTD_CCtx* zc,
+                               void* dst, size_t dstCapacity,
+                               void const* src, size_t srcSize,
+                               unsigned lastBlock) {
+    ZSTD_entropyCTablesMetadata_t entropyMetadata;
+
+    FORWARD_IF_ERROR(ZSTD_buildBlockEntropyStats(&zc->seqStore,
+          &zc->blockState.prevCBlock->entropy,
+          &zc->blockState.nextCBlock->entropy,
+          &zc->appliedParams,
+          &entropyMetadata,
+          zc->entropyWorkspace, ENTROPY_WORKSPACE_SIZE /* statically allocated in resetCCtx */), "");
+
+    return ZSTD_compressSubBlock_multi(&zc->seqStore,
+            zc->blockState.prevCBlock,
+            zc->blockState.nextCBlock,
+            &entropyMetadata,
+            &zc->appliedParams,
+            dst, dstCapacity,
+            src, srcSize,
+            zc->bmi2, lastBlock,
+            zc->entropyWorkspace, ENTROPY_WORKSPACE_SIZE /* statically allocated in resetCCtx */);
+}
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_compress_superblock.h mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_compress_superblock.h
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_compress_superblock.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_compress_superblock.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+#ifndef ZSTD_COMPRESS_ADVANCED_H
+#define ZSTD_COMPRESS_ADVANCED_H
+
+/*-*************************************
+*  Dependencies
+***************************************/
+
+#include "../zstd.h" /* ZSTD_CCtx */
+
+/*-*************************************
+*  Target Compressed Block Size
+***************************************/
+
+/* ZSTD_compressSuperBlock() :
+ * Used to compress a super block when targetCBlockSize is being used.
+ * The given block will be compressed into multiple sub blocks that are around targetCBlockSize. */
+size_t ZSTD_compressSuperBlock(ZSTD_CCtx* zc,
+                               void* dst, size_t dstCapacity,
+                               void const* src, size_t srcSize,
+                               unsigned lastBlock);
+
+#endif /* ZSTD_COMPRESS_ADVANCED_H */
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_cwksp.h mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_cwksp.h
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_cwksp.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_cwksp.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,662 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+#ifndef ZSTD_CWKSP_H
+#define ZSTD_CWKSP_H
+
+/*-*************************************
+*  Dependencies
+***************************************/
+#include "../common/zstd_internal.h"
+
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
+/*-*************************************
+*  Constants
+***************************************/
+
+/* Since the workspace is effectively its own little malloc implementation /
+ * arena, when we run under ASAN, we should similarly insert redzones between
+ * each internal element of the workspace, so ASAN will catch overruns that
+ * reach outside an object but that stay inside the workspace.
+ *
+ * This defines the size of that redzone.
+ */
+#ifndef ZSTD_CWKSP_ASAN_REDZONE_SIZE
+#define ZSTD_CWKSP_ASAN_REDZONE_SIZE 128
+#endif
+
+
+/* Set our tables and aligneds to align by 64 bytes */
+#define ZSTD_CWKSP_ALIGNMENT_BYTES 64
+
+/*-*************************************
+*  Structures
+***************************************/
+typedef enum {
+    ZSTD_cwksp_alloc_objects,
+    ZSTD_cwksp_alloc_buffers,
+    ZSTD_cwksp_alloc_aligned
+} ZSTD_cwksp_alloc_phase_e;
+
+/**
+ * Used to describe whether the workspace is statically allocated (and will not
+ * necessarily ever be freed), or if it's dynamically allocated and we can
+ * expect a well-formed caller to free this.
+ */
+typedef enum {
+    ZSTD_cwksp_dynamic_alloc,
+    ZSTD_cwksp_static_alloc
+} ZSTD_cwksp_static_alloc_e;
+
+/**
+ * Zstd fits all its internal datastructures into a single continuous buffer,
+ * so that it only needs to perform a single OS allocation (or so that a buffer
+ * can be provided to it and it can perform no allocations at all). This buffer
+ * is called the workspace.
+ *
+ * Several optimizations complicate that process of allocating memory ranges
+ * from this workspace for each internal datastructure:
+ *
+ * - These different internal datastructures have different setup requirements:
+ *
+ *   - The static objects need to be cleared once and can then be trivially
+ *     reused for each compression.
+ *
+ *   - Various buffers don't need to be initialized at all--they are always
+ *     written into before they're read.
+ *
+ *   - The matchstate tables have a unique requirement that they don't need
+ *     their memory to be totally cleared, but they do need the memory to have
+ *     some bound, i.e., a guarantee that all values in the memory they've been
+ *     allocated is less than some maximum value (which is the starting value
+ *     for the indices that they will then use for compression). When this
+ *     guarantee is provided to them, they can use the memory without any setup
+ *     work. When it can't, they have to clear the area.
+ *
+ * - These buffers also have different alignment requirements.
+ *
+ * - We would like to reuse the objects in the workspace for multiple
+ *   compressions without having to perform any expensive reallocation or
+ *   reinitialization work.
+ *
+ * - We would like to be able to efficiently reuse the workspace across
+ *   multiple compressions **even when the compression parameters change** and
+ *   we need to resize some of the objects (where possible).
+ *
+ * To attempt to manage this buffer, given these constraints, the ZSTD_cwksp
+ * abstraction was created. It works as follows:
+ *
+ * Workspace Layout:
+ *
+ * [                        ... workspace ...                         ]
+ * [objects][tables ... ->] free space [<- ... aligned][<- ... buffers]
+ *
+ * The various objects that live in the workspace are divided into the
+ * following categories, and are allocated separately:
+ *
+ * - Static objects: this is optionally the enclosing ZSTD_CCtx or ZSTD_CDict,
+ *   so that literally everything fits in a single buffer. Note: if present,
+ *   this must be the first object in the workspace, since ZSTD_customFree{CCtx,
+ *   CDict}() rely on a pointer comparison to see whether one or two frees are
+ *   required.
+ *
+ * - Fixed size objects: these are fixed-size, fixed-count objects that are
+ *   nonetheless "dynamically" allocated in the workspace so that we can
+ *   control how they're initialized separately from the broader ZSTD_CCtx.
+ *   Examples:
+ *   - Entropy Workspace
+ *   - 2 x ZSTD_compressedBlockState_t
+ *   - CDict dictionary contents
+ *
+ * - Tables: these are any of several different datastructures (hash tables,
+ *   chain tables, binary trees) that all respect a common format: they are
+ *   uint32_t arrays, all of whose values are between 0 and (nextSrc - base).
+ *   Their sizes depend on the cparams. These tables are 64-byte aligned.
+ *
+ * - Aligned: these buffers are used for various purposes that require 4 byte
+ *   alignment, but don't require any initialization before they're used. These
+ *   buffers are each aligned to 64 bytes.
+ *
+ * - Buffers: these buffers are used for various purposes that don't require
+ *   any alignment or initialization before they're used. This means they can
+ *   be moved around at no cost for a new compression.
+ *
+ * Allocating Memory:
+ *
+ * The various types of objects must be allocated in order, so they can be
+ * correctly packed into the workspace buffer. That order is:
+ *
+ * 1. Objects
+ * 2. Buffers
+ * 3. Aligned/Tables
+ *
+ * Attempts to reserve objects of different types out of order will fail.
+ */
+typedef struct {
+    void* workspace;
+    void* workspaceEnd;
+
+    void* objectEnd;
+    void* tableEnd;
+    void* tableValidEnd;
+    void* allocStart;
+
+    BYTE allocFailed;
+    int workspaceOversizedDuration;
+    ZSTD_cwksp_alloc_phase_e phase;
+    ZSTD_cwksp_static_alloc_e isStatic;
+} ZSTD_cwksp;
+
+/*-*************************************
+*  Functions
+***************************************/
+
+MEM_STATIC size_t ZSTD_cwksp_available_space(ZSTD_cwksp* ws);
+
+MEM_STATIC void ZSTD_cwksp_assert_internal_consistency(ZSTD_cwksp* ws) {
+    (void)ws;
+    assert(ws->workspace <= ws->objectEnd);
+    assert(ws->objectEnd <= ws->tableEnd);
+    assert(ws->objectEnd <= ws->tableValidEnd);
+    assert(ws->tableEnd <= ws->allocStart);
+    assert(ws->tableValidEnd <= ws->allocStart);
+    assert(ws->allocStart <= ws->workspaceEnd);
+}
+
+/**
+ * Align must be a power of 2.
+ */
+MEM_STATIC size_t ZSTD_cwksp_align(size_t size, size_t const align) {
+    size_t const mask = align - 1;
+    assert((align & mask) == 0);
+    return (size + mask) & ~mask;
+}
+
+/**
+ * Use this to determine how much space in the workspace we will consume to
+ * allocate this object. (Normally it should be exactly the size of the object,
+ * but under special conditions, like ASAN, where we pad each object, it might
+ * be larger.)
+ *
+ * Since tables aren't currently redzoned, you don't need to call through this
+ * to figure out how much space you need for the matchState tables. Everything
+ * else is though.
+ *
+ * Do not use for sizing aligned buffers. Instead, use ZSTD_cwksp_aligned_alloc_size().
+ */
+MEM_STATIC size_t ZSTD_cwksp_alloc_size(size_t size) {
+    if (size == 0)
+        return 0;
+#if ZSTD_ADDRESS_SANITIZER && !defined (ZSTD_ASAN_DONT_POISON_WORKSPACE)
+    return size + 2 * ZSTD_CWKSP_ASAN_REDZONE_SIZE;
+#else
+    return size;
+#endif
+}
+
+/**
+ * Returns an adjusted alloc size that is the nearest larger multiple of 64 bytes.
+ * Used to determine the number of bytes required for a given "aligned".
+ */
+MEM_STATIC size_t ZSTD_cwksp_aligned_alloc_size(size_t size) {
+    return ZSTD_cwksp_alloc_size(ZSTD_cwksp_align(size, ZSTD_CWKSP_ALIGNMENT_BYTES));
+}
+
+/**
+ * Returns the amount of additional space the cwksp must allocate
+ * for internal purposes (currently only alignment).
+ */
+MEM_STATIC size_t ZSTD_cwksp_slack_space_required(void) {
+    /* For alignment, the wksp will always allocate an additional n_1=[1, 64] bytes
+     * to align the beginning of tables section, as well as another n_2=[0, 63] bytes
+     * to align the beginning of the aligned secion.
+     *
+     * n_1 + n_2 == 64 bytes if the cwksp is freshly allocated, due to tables and
+     * aligneds being sized in multiples of 64 bytes.
+     */
+    size_t const slackSpace = ZSTD_CWKSP_ALIGNMENT_BYTES;
+    return slackSpace;
+}
+
+
+/**
+ * Return the number of additional bytes required to align a pointer to the given number of bytes.
+ * alignBytes must be a power of two.
+ */
+MEM_STATIC size_t ZSTD_cwksp_bytes_to_align_ptr(void* ptr, const size_t alignBytes) {
+    size_t const alignBytesMask = alignBytes - 1;
+    size_t const bytes = (alignBytes - ((size_t)ptr & (alignBytesMask))) & alignBytesMask;
+    assert((alignBytes & alignBytesMask) == 0);
+    assert(bytes != ZSTD_CWKSP_ALIGNMENT_BYTES);
+    return bytes;
+}
+
+/**
+ * Internal function. Do not use directly.
+ * Reserves the given number of bytes within the aligned/buffer segment of the wksp, which
+ * counts from the end of the wksp. (as opposed to the object/table segment)
+ *
+ * Returns a pointer to the beginning of that space.
+ */
+MEM_STATIC void* ZSTD_cwksp_reserve_internal_buffer_space(ZSTD_cwksp* ws, size_t const bytes) {
+    void* const alloc = (BYTE*)ws->allocStart - bytes;
+    void* const bottom = ws->tableEnd;
+    DEBUGLOG(5, "cwksp: reserving %p %zd bytes, %zd bytes remaining",
+        alloc, bytes, ZSTD_cwksp_available_space(ws) - bytes);
+    ZSTD_cwksp_assert_internal_consistency(ws);
+    assert(alloc >= bottom);
+    if (alloc < bottom) {
+        DEBUGLOG(4, "cwksp: alloc failed!");
+        ws->allocFailed = 1;
+        return NULL;
+    }
+    if (alloc < ws->tableValidEnd) {
+        ws->tableValidEnd = alloc;
+    }
+    ws->allocStart = alloc;
+    return alloc;
+}
+
+/**
+ * Moves the cwksp to the next phase, and does any necessary allocations.
+ * Returns a 0 on success, or zstd error
+ */
+MEM_STATIC size_t ZSTD_cwksp_internal_advance_phase(
+        ZSTD_cwksp* ws, ZSTD_cwksp_alloc_phase_e phase) {
+    assert(phase >= ws->phase);
+    if (phase > ws->phase) {
+        /* Going from allocating objects to allocating buffers */
+        if (ws->phase < ZSTD_cwksp_alloc_buffers &&
+                phase >= ZSTD_cwksp_alloc_buffers) {
+            ws->tableValidEnd = ws->objectEnd;
+        }
+
+        /* Going from allocating buffers to allocating aligneds/tables */
+        if (ws->phase < ZSTD_cwksp_alloc_aligned &&
+                phase >= ZSTD_cwksp_alloc_aligned) {
+            {   /* Align the start of the "aligned" to 64 bytes. Use [1, 64] bytes. */
+                size_t const bytesToAlign =
+                    ZSTD_CWKSP_ALIGNMENT_BYTES - ZSTD_cwksp_bytes_to_align_ptr(ws->allocStart, ZSTD_CWKSP_ALIGNMENT_BYTES);
+                DEBUGLOG(5, "reserving aligned alignment addtl space: %zu", bytesToAlign);
+                ZSTD_STATIC_ASSERT((ZSTD_CWKSP_ALIGNMENT_BYTES & (ZSTD_CWKSP_ALIGNMENT_BYTES - 1)) == 0); /* power of 2 */
+                RETURN_ERROR_IF(!ZSTD_cwksp_reserve_internal_buffer_space(ws, bytesToAlign),
+                                memory_allocation, "aligned phase - alignment initial allocation failed!");
+            }
+            {   /* Align the start of the tables to 64 bytes. Use [0, 63] bytes */
+                void* const alloc = ws->objectEnd;
+                size_t const bytesToAlign = ZSTD_cwksp_bytes_to_align_ptr(alloc, ZSTD_CWKSP_ALIGNMENT_BYTES);
+                void* const end = (BYTE*)alloc + bytesToAlign;
+                DEBUGLOG(5, "reserving table alignment addtl space: %zu", bytesToAlign);
+                RETURN_ERROR_IF(end > ws->workspaceEnd, memory_allocation,
+                                "table phase - alignment initial allocation failed!");
+                ws->objectEnd = end;
+                ws->tableEnd = end;
+                ws->tableValidEnd = end;
+            }
+        }
+        ws->phase = phase;
+        ZSTD_cwksp_assert_internal_consistency(ws);
+    }
+    return 0;
+}
+
+/**
+ * Returns whether this object/buffer/etc was allocated in this workspace.
+ */
+MEM_STATIC int ZSTD_cwksp_owns_buffer(const ZSTD_cwksp* ws, const void* ptr) {
+    return (ptr != NULL) && (ws->workspace <= ptr) && (ptr <= ws->workspaceEnd);
+}
+
+/**
+ * Internal function. Do not use directly.
+ */
+MEM_STATIC void* ZSTD_cwksp_reserve_internal(
+        ZSTD_cwksp* ws, size_t bytes, ZSTD_cwksp_alloc_phase_e phase) {
+    void* alloc;
+    if (ZSTD_isError(ZSTD_cwksp_internal_advance_phase(ws, phase)) || bytes == 0) {
+        return NULL;
+    }
+
+#if ZSTD_ADDRESS_SANITIZER && !defined (ZSTD_ASAN_DONT_POISON_WORKSPACE)
+    /* over-reserve space */
+    bytes += 2 * ZSTD_CWKSP_ASAN_REDZONE_SIZE;
+#endif
+
+    alloc = ZSTD_cwksp_reserve_internal_buffer_space(ws, bytes);
+
+#if ZSTD_ADDRESS_SANITIZER && !defined (ZSTD_ASAN_DONT_POISON_WORKSPACE)
+    /* Move alloc so there's ZSTD_CWKSP_ASAN_REDZONE_SIZE unused space on
+     * either size. */
+    if (alloc) {
+        alloc = (BYTE *)alloc + ZSTD_CWKSP_ASAN_REDZONE_SIZE;
+        if (ws->isStatic == ZSTD_cwksp_dynamic_alloc) {
+            __asan_unpoison_memory_region(alloc, bytes);
+        }
+    }
+#endif
+
+    return alloc;
+}
+
+/**
+ * Reserves and returns unaligned memory.
+ */
+MEM_STATIC BYTE* ZSTD_cwksp_reserve_buffer(ZSTD_cwksp* ws, size_t bytes) {
+    return (BYTE*)ZSTD_cwksp_reserve_internal(ws, bytes, ZSTD_cwksp_alloc_buffers);
+}
+
+/**
+ * Reserves and returns memory sized on and aligned on ZSTD_CWKSP_ALIGNMENT_BYTES (64 bytes).
+ */
+MEM_STATIC void* ZSTD_cwksp_reserve_aligned(ZSTD_cwksp* ws, size_t bytes) {
+    void* ptr = ZSTD_cwksp_reserve_internal(ws, ZSTD_cwksp_align(bytes, ZSTD_CWKSP_ALIGNMENT_BYTES),
+                                            ZSTD_cwksp_alloc_aligned);
+    assert(((size_t)ptr & (ZSTD_CWKSP_ALIGNMENT_BYTES-1))== 0);
+    return ptr;
+}
+
+/**
+ * Aligned on 64 bytes. These buffers have the special property that
+ * their values remain constrained, allowing us to re-use them without
+ * memset()-ing them.
+ */
+MEM_STATIC void* ZSTD_cwksp_reserve_table(ZSTD_cwksp* ws, size_t bytes) {
+    const ZSTD_cwksp_alloc_phase_e phase = ZSTD_cwksp_alloc_aligned;
+    void* alloc;
+    void* end;
+    void* top;
+
+    if (ZSTD_isError(ZSTD_cwksp_internal_advance_phase(ws, phase))) {
+        return NULL;
+    }
+    alloc = ws->tableEnd;
+    end = (BYTE *)alloc + bytes;
+    top = ws->allocStart;
+
+    DEBUGLOG(5, "cwksp: reserving %p table %zd bytes, %zd bytes remaining",
+        alloc, bytes, ZSTD_cwksp_available_space(ws) - bytes);
+    assert((bytes & (sizeof(U32)-1)) == 0);
+    ZSTD_cwksp_assert_internal_consistency(ws);
+    assert(end <= top);
+    if (end > top) {
+        DEBUGLOG(4, "cwksp: table alloc failed!");
+        ws->allocFailed = 1;
+        return NULL;
+    }
+    ws->tableEnd = end;
+
+#if ZSTD_ADDRESS_SANITIZER && !defined (ZSTD_ASAN_DONT_POISON_WORKSPACE)
+    if (ws->isStatic == ZSTD_cwksp_dynamic_alloc) {
+        __asan_unpoison_memory_region(alloc, bytes);
+    }
+#endif
+
+    assert((bytes & (ZSTD_CWKSP_ALIGNMENT_BYTES-1)) == 0);
+    assert(((size_t)alloc & (ZSTD_CWKSP_ALIGNMENT_BYTES-1))== 0);
+    return alloc;
+}
+
+/**
+ * Aligned on sizeof(void*).
+ */
+MEM_STATIC void* ZSTD_cwksp_reserve_object(ZSTD_cwksp* ws, size_t bytes) {
+    size_t roundedBytes = ZSTD_cwksp_align(bytes, sizeof(void*));
+    void* alloc = ws->objectEnd;
+    void* end = (BYTE*)alloc + roundedBytes;
+
+#if ZSTD_ADDRESS_SANITIZER && !defined (ZSTD_ASAN_DONT_POISON_WORKSPACE)
+    /* over-reserve space */
+    end = (BYTE *)end + 2 * ZSTD_CWKSP_ASAN_REDZONE_SIZE;
+#endif
+
+    DEBUGLOG(5,
+        "cwksp: reserving %p object %zd bytes (rounded to %zd), %zd bytes remaining",
+        alloc, bytes, roundedBytes, ZSTD_cwksp_available_space(ws) - roundedBytes);
+    assert(((size_t)alloc & (sizeof(void*)-1)) == 0);
+    assert((bytes & (sizeof(void*)-1)) == 0);
+    ZSTD_cwksp_assert_internal_consistency(ws);
+    /* we must be in the first phase, no advance is possible */
+    if (ws->phase != ZSTD_cwksp_alloc_objects || end > ws->workspaceEnd) {
+        DEBUGLOG(4, "cwksp: object alloc failed!");
+        ws->allocFailed = 1;
+        return NULL;
+    }
+    ws->objectEnd = end;
+    ws->tableEnd = end;
+    ws->tableValidEnd = end;
+
+#if ZSTD_ADDRESS_SANITIZER && !defined (ZSTD_ASAN_DONT_POISON_WORKSPACE)
+    /* Move alloc so there's ZSTD_CWKSP_ASAN_REDZONE_SIZE unused space on
+     * either size. */
+    alloc = (BYTE *)alloc + ZSTD_CWKSP_ASAN_REDZONE_SIZE;
+    if (ws->isStatic == ZSTD_cwksp_dynamic_alloc) {
+        __asan_unpoison_memory_region(alloc, bytes);
+    }
+#endif
+
+    return alloc;
+}
+
+MEM_STATIC void ZSTD_cwksp_mark_tables_dirty(ZSTD_cwksp* ws) {
+    DEBUGLOG(4, "cwksp: ZSTD_cwksp_mark_tables_dirty");
+
+#if ZSTD_MEMORY_SANITIZER && !defined (ZSTD_MSAN_DONT_POISON_WORKSPACE)
+    /* To validate that the table re-use logic is sound, and that we don't
+     * access table space that we haven't cleaned, we re-"poison" the table
+     * space every time we mark it dirty. */
+    {
+        size_t size = (BYTE*)ws->tableValidEnd - (BYTE*)ws->objectEnd;
+        assert(__msan_test_shadow(ws->objectEnd, size) == -1);
+        __msan_poison(ws->objectEnd, size);
+    }
+#endif
+
+    assert(ws->tableValidEnd >= ws->objectEnd);
+    assert(ws->tableValidEnd <= ws->allocStart);
+    ws->tableValidEnd = ws->objectEnd;
+    ZSTD_cwksp_assert_internal_consistency(ws);
+}
+
+MEM_STATIC void ZSTD_cwksp_mark_tables_clean(ZSTD_cwksp* ws) {
+    DEBUGLOG(4, "cwksp: ZSTD_cwksp_mark_tables_clean");
+    assert(ws->tableValidEnd >= ws->objectEnd);
+    assert(ws->tableValidEnd <= ws->allocStart);
+    if (ws->tableValidEnd < ws->tableEnd) {
+        ws->tableValidEnd = ws->tableEnd;
+    }
+    ZSTD_cwksp_assert_internal_consistency(ws);
+}
+
+/**
+ * Zero the part of the allocated tables not already marked clean.
+ */
+MEM_STATIC void ZSTD_cwksp_clean_tables(ZSTD_cwksp* ws) {
+    DEBUGLOG(4, "cwksp: ZSTD_cwksp_clean_tables");
+    assert(ws->tableValidEnd >= ws->objectEnd);
+    assert(ws->tableValidEnd <= ws->allocStart);
+    if (ws->tableValidEnd < ws->tableEnd) {
+        ZSTD_memset(ws->tableValidEnd, 0, (BYTE*)ws->tableEnd - (BYTE*)ws->tableValidEnd);
+    }
+    ZSTD_cwksp_mark_tables_clean(ws);
+}
+
+/**
+ * Invalidates table allocations.
+ * All other allocations remain valid.
+ */
+MEM_STATIC void ZSTD_cwksp_clear_tables(ZSTD_cwksp* ws) {
+    DEBUGLOG(4, "cwksp: clearing tables!");
+
+#if ZSTD_ADDRESS_SANITIZER && !defined (ZSTD_ASAN_DONT_POISON_WORKSPACE)
+    /* We don't do this when the workspace is statically allocated, because
+     * when that is the case, we have no capability to hook into the end of the
+     * workspace's lifecycle to unpoison the memory.
+     */
+    if (ws->isStatic == ZSTD_cwksp_dynamic_alloc) {
+        size_t size = (BYTE*)ws->tableValidEnd - (BYTE*)ws->objectEnd;
+        __asan_poison_memory_region(ws->objectEnd, size);
+    }
+#endif
+
+    ws->tableEnd = ws->objectEnd;
+    ZSTD_cwksp_assert_internal_consistency(ws);
+}
+
+/**
+ * Invalidates all buffer, aligned, and table allocations.
+ * Object allocations remain valid.
+ */
+MEM_STATIC void ZSTD_cwksp_clear(ZSTD_cwksp* ws) {
+    DEBUGLOG(4, "cwksp: clearing!");
+
+#if ZSTD_MEMORY_SANITIZER && !defined (ZSTD_MSAN_DONT_POISON_WORKSPACE)
+    /* To validate that the context re-use logic is sound, and that we don't
+     * access stuff that this compression hasn't initialized, we re-"poison"
+     * the workspace (or at least the non-static, non-table parts of it)
+     * every time we start a new compression. */
+    {
+        size_t size = (BYTE*)ws->workspaceEnd - (BYTE*)ws->tableValidEnd;
+        __msan_poison(ws->tableValidEnd, size);
+    }
+#endif
+
+#if ZSTD_ADDRESS_SANITIZER && !defined (ZSTD_ASAN_DONT_POISON_WORKSPACE)
+    /* We don't do this when the workspace is statically allocated, because
+     * when that is the case, we have no capability to hook into the end of the
+     * workspace's lifecycle to unpoison the memory.
+     */
+    if (ws->isStatic == ZSTD_cwksp_dynamic_alloc) {
+        size_t size = (BYTE*)ws->workspaceEnd - (BYTE*)ws->objectEnd;
+        __asan_poison_memory_region(ws->objectEnd, size);
+    }
+#endif
+
+    ws->tableEnd = ws->objectEnd;
+    ws->allocStart = ws->workspaceEnd;
+    ws->allocFailed = 0;
+    if (ws->phase > ZSTD_cwksp_alloc_buffers) {
+        ws->phase = ZSTD_cwksp_alloc_buffers;
+    }
+    ZSTD_cwksp_assert_internal_consistency(ws);
+}
+
+/**
+ * The provided workspace takes ownership of the buffer [start, start+size).
+ * Any existing values in the workspace are ignored (the previously managed
+ * buffer, if present, must be separately freed).
+ */
+MEM_STATIC void ZSTD_cwksp_init(ZSTD_cwksp* ws, void* start, size_t size, ZSTD_cwksp_static_alloc_e isStatic) {
+    DEBUGLOG(4, "cwksp: init'ing workspace with %zd bytes", size);
+    assert(((size_t)start & (sizeof(void*)-1)) == 0); /* ensure correct alignment */
+    ws->workspace = start;
+    ws->workspaceEnd = (BYTE*)start + size;
+    ws->objectEnd = ws->workspace;
+    ws->tableValidEnd = ws->objectEnd;
+    ws->phase = ZSTD_cwksp_alloc_objects;
+    ws->isStatic = isStatic;
+    ZSTD_cwksp_clear(ws);
+    ws->workspaceOversizedDuration = 0;
+    ZSTD_cwksp_assert_internal_consistency(ws);
+}
+
+MEM_STATIC size_t ZSTD_cwksp_create(ZSTD_cwksp* ws, size_t size, ZSTD_customMem customMem) {
+    void* workspace = ZSTD_customMalloc(size, customMem);
+    DEBUGLOG(4, "cwksp: creating new workspace with %zd bytes", size);
+    RETURN_ERROR_IF(workspace == NULL, memory_allocation, "NULL pointer!");
+    ZSTD_cwksp_init(ws, workspace, size, ZSTD_cwksp_dynamic_alloc);
+    return 0;
+}
+
+MEM_STATIC void ZSTD_cwksp_free(ZSTD_cwksp* ws, ZSTD_customMem customMem) {
+    void *ptr = ws->workspace;
+    DEBUGLOG(4, "cwksp: freeing workspace");
+    ZSTD_memset(ws, 0, sizeof(ZSTD_cwksp));
+    ZSTD_customFree(ptr, customMem);
+}
+
+/**
+ * Moves the management of a workspace from one cwksp to another. The src cwksp
+ * is left in an invalid state (src must be re-init()'ed before it's used again).
+ */
+MEM_STATIC void ZSTD_cwksp_move(ZSTD_cwksp* dst, ZSTD_cwksp* src) {
+    *dst = *src;
+    ZSTD_memset(src, 0, sizeof(ZSTD_cwksp));
+}
+
+MEM_STATIC size_t ZSTD_cwksp_sizeof(const ZSTD_cwksp* ws) {
+    return (size_t)((BYTE*)ws->workspaceEnd - (BYTE*)ws->workspace);
+}
+
+MEM_STATIC size_t ZSTD_cwksp_used(const ZSTD_cwksp* ws) {
+    return (size_t)((BYTE*)ws->tableEnd - (BYTE*)ws->workspace)
+         + (size_t)((BYTE*)ws->workspaceEnd - (BYTE*)ws->allocStart);
+}
+
+MEM_STATIC int ZSTD_cwksp_reserve_failed(const ZSTD_cwksp* ws) {
+    return ws->allocFailed;
+}
+
+/*-*************************************
+*  Functions Checking Free Space
+***************************************/
+
+/* ZSTD_alignmentSpaceWithinBounds() :
+ * Returns if the estimated space needed for a wksp is within an acceptable limit of the
+ * actual amount of space used.
+ */
+MEM_STATIC int ZSTD_cwksp_estimated_space_within_bounds(const ZSTD_cwksp* const ws,
+                                                        size_t const estimatedSpace, int resizedWorkspace) {
+    if (resizedWorkspace) {
+        /* Resized/newly allocated wksp should have exact bounds */
+        return ZSTD_cwksp_used(ws) == estimatedSpace;
+    } else {
+        /* Due to alignment, when reusing a workspace, we can actually consume 63 fewer or more bytes
+         * than estimatedSpace. See the comments in zstd_cwksp.h for details.
+         */
+        return (ZSTD_cwksp_used(ws) >= estimatedSpace - 63) && (ZSTD_cwksp_used(ws) <= estimatedSpace + 63);
+    }
+}
+
+
+MEM_STATIC size_t ZSTD_cwksp_available_space(ZSTD_cwksp* ws) {
+    return (size_t)((BYTE*)ws->allocStart - (BYTE*)ws->tableEnd);
+}
+
+MEM_STATIC int ZSTD_cwksp_check_available(ZSTD_cwksp* ws, size_t additionalNeededSpace) {
+    return ZSTD_cwksp_available_space(ws) >= additionalNeededSpace;
+}
+
+MEM_STATIC int ZSTD_cwksp_check_too_large(ZSTD_cwksp* ws, size_t additionalNeededSpace) {
+    return ZSTD_cwksp_check_available(
+        ws, additionalNeededSpace * ZSTD_WORKSPACETOOLARGE_FACTOR);
+}
+
+MEM_STATIC int ZSTD_cwksp_check_wasteful(ZSTD_cwksp* ws, size_t additionalNeededSpace) {
+    return ZSTD_cwksp_check_too_large(ws, additionalNeededSpace)
+        && ws->workspaceOversizedDuration > ZSTD_WORKSPACETOOLARGE_MAXDURATION;
+}
+
+MEM_STATIC void ZSTD_cwksp_bump_oversized_duration(
+        ZSTD_cwksp* ws, size_t additionalNeededSpace) {
+    if (ZSTD_cwksp_check_too_large(ws, additionalNeededSpace)) {
+        ws->workspaceOversizedDuration++;
+    } else {
+        ws->workspaceOversizedDuration = 0;
+    }
+}
+
+#if defined (__cplusplus)
+}
+#endif
+
+#endif /* ZSTD_CWKSP_H */
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_double_fast.c mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_double_fast.c
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_double_fast.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_double_fast.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,521 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+#include "zstd_compress_internal.h"
+#include "zstd_double_fast.h"
+
+
+void ZSTD_fillDoubleHashTable(ZSTD_matchState_t* ms,
+                              void const* end, ZSTD_dictTableLoadMethod_e dtlm)
+{
+    const ZSTD_compressionParameters* const cParams = &ms->cParams;
+    U32* const hashLarge = ms->hashTable;
+    U32  const hBitsL = cParams->hashLog;
+    U32  const mls = cParams->minMatch;
+    U32* const hashSmall = ms->chainTable;
+    U32  const hBitsS = cParams->chainLog;
+    const BYTE* const base = ms->window.base;
+    const BYTE* ip = base + ms->nextToUpdate;
+    const BYTE* const iend = ((const BYTE*)end) - HASH_READ_SIZE;
+    const U32 fastHashFillStep = 3;
+
+    /* Always insert every fastHashFillStep position into the hash tables.
+     * Insert the other positions into the large hash table if their entry
+     * is empty.
+     */
+    for (; ip + fastHashFillStep - 1 <= iend; ip += fastHashFillStep) {
+        U32 const curr = (U32)(ip - base);
+        U32 i;
+        for (i = 0; i < fastHashFillStep; ++i) {
+            size_t const smHash = ZSTD_hashPtr(ip + i, hBitsS, mls);
+            size_t const lgHash = ZSTD_hashPtr(ip + i, hBitsL, 8);
+            if (i == 0)
+                hashSmall[smHash] = curr + i;
+            if (i == 0 || hashLarge[lgHash] == 0)
+                hashLarge[lgHash] = curr + i;
+            /* Only load extra positions for ZSTD_dtlm_full */
+            if (dtlm == ZSTD_dtlm_fast)
+                break;
+    }   }
+}
+
+
+FORCE_INLINE_TEMPLATE
+size_t ZSTD_compressBlock_doubleFast_generic(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize,
+        U32 const mls /* template */, ZSTD_dictMode_e const dictMode)
+{
+    ZSTD_compressionParameters const* cParams = &ms->cParams;
+    U32* const hashLong = ms->hashTable;
+    const U32 hBitsL = cParams->hashLog;
+    U32* const hashSmall = ms->chainTable;
+    const U32 hBitsS = cParams->chainLog;
+    const BYTE* const base = ms->window.base;
+    const BYTE* const istart = (const BYTE*)src;
+    const BYTE* ip = istart;
+    const BYTE* anchor = istart;
+    const U32 endIndex = (U32)((size_t)(istart - base) + srcSize);
+    /* presumes that, if there is a dictionary, it must be using Attach mode */
+    const U32 prefixLowestIndex = ZSTD_getLowestPrefixIndex(ms, endIndex, cParams->windowLog);
+    const BYTE* const prefixLowest = base + prefixLowestIndex;
+    const BYTE* const iend = istart + srcSize;
+    const BYTE* const ilimit = iend - HASH_READ_SIZE;
+    U32 offset_1=rep[0], offset_2=rep[1];
+    U32 offsetSaved = 0;
+
+    const ZSTD_matchState_t* const dms = ms->dictMatchState;
+    const ZSTD_compressionParameters* const dictCParams =
+                                     dictMode == ZSTD_dictMatchState ?
+                                     &dms->cParams : NULL;
+    const U32* const dictHashLong  = dictMode == ZSTD_dictMatchState ?
+                                     dms->hashTable : NULL;
+    const U32* const dictHashSmall = dictMode == ZSTD_dictMatchState ?
+                                     dms->chainTable : NULL;
+    const U32 dictStartIndex       = dictMode == ZSTD_dictMatchState ?
+                                     dms->window.dictLimit : 0;
+    const BYTE* const dictBase     = dictMode == ZSTD_dictMatchState ?
+                                     dms->window.base : NULL;
+    const BYTE* const dictStart    = dictMode == ZSTD_dictMatchState ?
+                                     dictBase + dictStartIndex : NULL;
+    const BYTE* const dictEnd      = dictMode == ZSTD_dictMatchState ?
+                                     dms->window.nextSrc : NULL;
+    const U32 dictIndexDelta       = dictMode == ZSTD_dictMatchState ?
+                                     prefixLowestIndex - (U32)(dictEnd - dictBase) :
+                                     0;
+    const U32 dictHBitsL           = dictMode == ZSTD_dictMatchState ?
+                                     dictCParams->hashLog : hBitsL;
+    const U32 dictHBitsS           = dictMode == ZSTD_dictMatchState ?
+                                     dictCParams->chainLog : hBitsS;
+    const U32 dictAndPrefixLength  = (U32)((ip - prefixLowest) + (dictEnd - dictStart));
+
+    DEBUGLOG(5, "ZSTD_compressBlock_doubleFast_generic");
+
+    assert(dictMode == ZSTD_noDict || dictMode == ZSTD_dictMatchState);
+
+    /* if a dictionary is attached, it must be within window range */
+    if (dictMode == ZSTD_dictMatchState) {
+        assert(ms->window.dictLimit + (1U << cParams->windowLog) >= endIndex);
+    }
+
+    /* init */
+    ip += (dictAndPrefixLength == 0);
+    if (dictMode == ZSTD_noDict) {
+        U32 const curr = (U32)(ip - base);
+        U32 const windowLow = ZSTD_getLowestPrefixIndex(ms, curr, cParams->windowLog);
+        U32 const maxRep = curr - windowLow;
+        if (offset_2 > maxRep) offsetSaved = offset_2, offset_2 = 0;
+        if (offset_1 > maxRep) offsetSaved = offset_1, offset_1 = 0;
+    }
+    if (dictMode == ZSTD_dictMatchState) {
+        /* dictMatchState repCode checks don't currently handle repCode == 0
+         * disabling. */
+        assert(offset_1 <= dictAndPrefixLength);
+        assert(offset_2 <= dictAndPrefixLength);
+    }
+
+    /* Main Search Loop */
+    while (ip < ilimit) {   /* < instead of <=, because repcode check at (ip+1) */
+        size_t mLength;
+        U32 offset;
+        size_t const h2 = ZSTD_hashPtr(ip, hBitsL, 8);
+        size_t const h = ZSTD_hashPtr(ip, hBitsS, mls);
+        size_t const dictHL = ZSTD_hashPtr(ip, dictHBitsL, 8);
+        size_t const dictHS = ZSTD_hashPtr(ip, dictHBitsS, mls);
+        U32 const curr = (U32)(ip-base);
+        U32 const matchIndexL = hashLong[h2];
+        U32 matchIndexS = hashSmall[h];
+        const BYTE* matchLong = base + matchIndexL;
+        const BYTE* match = base + matchIndexS;
+        const U32 repIndex = curr + 1 - offset_1;
+        const BYTE* repMatch = (dictMode == ZSTD_dictMatchState
+                            && repIndex < prefixLowestIndex) ?
+                               dictBase + (repIndex - dictIndexDelta) :
+                               base + repIndex;
+        hashLong[h2] = hashSmall[h] = curr;   /* update hash tables */
+
+        /* check dictMatchState repcode */
+        if (dictMode == ZSTD_dictMatchState
+            && ((U32)((prefixLowestIndex-1) - repIndex) >= 3 /* intentional underflow */)
+            && (MEM_read32(repMatch) == MEM_read32(ip+1)) ) {
+            const BYTE* repMatchEnd = repIndex < prefixLowestIndex ? dictEnd : iend;
+            mLength = ZSTD_count_2segments(ip+1+4, repMatch+4, iend, repMatchEnd, prefixLowest) + 4;
+            ip++;
+            ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, iend, 0, mLength-MINMATCH);
+            goto _match_stored;
+        }
+
+        /* check noDict repcode */
+        if ( dictMode == ZSTD_noDict
+          && ((offset_1 > 0) & (MEM_read32(ip+1-offset_1) == MEM_read32(ip+1)))) {
+            mLength = ZSTD_count(ip+1+4, ip+1+4-offset_1, iend) + 4;
+            ip++;
+            ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, iend, 0, mLength-MINMATCH);
+            goto _match_stored;
+        }
+
+        if (matchIndexL > prefixLowestIndex) {
+            /* check prefix long match */
+            if (MEM_read64(matchLong) == MEM_read64(ip)) {
+                mLength = ZSTD_count(ip+8, matchLong+8, iend) + 8;
+                offset = (U32)(ip-matchLong);
+                while (((ip>anchor) & (matchLong>prefixLowest)) && (ip[-1] == matchLong[-1])) { ip--; matchLong--; mLength++; } /* catch up */
+                goto _match_found;
+            }
+        } else if (dictMode == ZSTD_dictMatchState) {
+            /* check dictMatchState long match */
+            U32 const dictMatchIndexL = dictHashLong[dictHL];
+            const BYTE* dictMatchL = dictBase + dictMatchIndexL;
+            assert(dictMatchL < dictEnd);
+
+            if (dictMatchL > dictStart && MEM_read64(dictMatchL) == MEM_read64(ip)) {
+                mLength = ZSTD_count_2segments(ip+8, dictMatchL+8, iend, dictEnd, prefixLowest) + 8;
+                offset = (U32)(curr - dictMatchIndexL - dictIndexDelta);
+                while (((ip>anchor) & (dictMatchL>dictStart)) && (ip[-1] == dictMatchL[-1])) { ip--; dictMatchL--; mLength++; } /* catch up */
+                goto _match_found;
+        }   }
+
+        if (matchIndexS > prefixLowestIndex) {
+            /* check prefix short match */
+            if (MEM_read32(match) == MEM_read32(ip)) {
+                goto _search_next_long;
+            }
+        } else if (dictMode == ZSTD_dictMatchState) {
+            /* check dictMatchState short match */
+            U32 const dictMatchIndexS = dictHashSmall[dictHS];
+            match = dictBase + dictMatchIndexS;
+            matchIndexS = dictMatchIndexS + dictIndexDelta;
+
+            if (match > dictStart && MEM_read32(match) == MEM_read32(ip)) {
+                goto _search_next_long;
+        }   }
+
+        ip += ((ip-anchor) >> kSearchStrength) + 1;
+#if defined(__aarch64__)
+        PREFETCH_L1(ip+256);
+#endif
+        continue;
+
+_search_next_long:
+
+        {   size_t const hl3 = ZSTD_hashPtr(ip+1, hBitsL, 8);
+            size_t const dictHLNext = ZSTD_hashPtr(ip+1, dictHBitsL, 8);
+            U32 const matchIndexL3 = hashLong[hl3];
+            const BYTE* matchL3 = base + matchIndexL3;
+            hashLong[hl3] = curr + 1;
+
+            /* check prefix long +1 match */
+            if (matchIndexL3 > prefixLowestIndex) {
+                if (MEM_read64(matchL3) == MEM_read64(ip+1)) {
+                    mLength = ZSTD_count(ip+9, matchL3+8, iend) + 8;
+                    ip++;
+                    offset = (U32)(ip-matchL3);
+                    while (((ip>anchor) & (matchL3>prefixLowest)) && (ip[-1] == matchL3[-1])) { ip--; matchL3--; mLength++; } /* catch up */
+                    goto _match_found;
+                }
+            } else if (dictMode == ZSTD_dictMatchState) {
+                /* check dict long +1 match */
+                U32 const dictMatchIndexL3 = dictHashLong[dictHLNext];
+                const BYTE* dictMatchL3 = dictBase + dictMatchIndexL3;
+                assert(dictMatchL3 < dictEnd);
+                if (dictMatchL3 > dictStart && MEM_read64(dictMatchL3) == MEM_read64(ip+1)) {
+                    mLength = ZSTD_count_2segments(ip+1+8, dictMatchL3+8, iend, dictEnd, prefixLowest) + 8;
+                    ip++;
+                    offset = (U32)(curr + 1 - dictMatchIndexL3 - dictIndexDelta);
+                    while (((ip>anchor) & (dictMatchL3>dictStart)) && (ip[-1] == dictMatchL3[-1])) { ip--; dictMatchL3--; mLength++; } /* catch up */
+                    goto _match_found;
+        }   }   }
+
+        /* if no long +1 match, explore the short match we found */
+        if (dictMode == ZSTD_dictMatchState && matchIndexS < prefixLowestIndex) {
+            mLength = ZSTD_count_2segments(ip+4, match+4, iend, dictEnd, prefixLowest) + 4;
+            offset = (U32)(curr - matchIndexS);
+            while (((ip>anchor) & (match>dictStart)) && (ip[-1] == match[-1])) { ip--; match--; mLength++; } /* catch up */
+        } else {
+            mLength = ZSTD_count(ip+4, match+4, iend) + 4;
+            offset = (U32)(ip - match);
+            while (((ip>anchor) & (match>prefixLowest)) && (ip[-1] == match[-1])) { ip--; match--; mLength++; } /* catch up */
+        }
+
+        /* fall-through */
+
+_match_found:
+        offset_2 = offset_1;
+        offset_1 = offset;
+
+        ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, iend, offset + ZSTD_REP_MOVE, mLength-MINMATCH);
+
+_match_stored:
+        /* match found */
+        ip += mLength;
+        anchor = ip;
+
+        if (ip <= ilimit) {
+            /* Complementary insertion */
+            /* done after iLimit test, as candidates could be > iend-8 */
+            {   U32 const indexToInsert = curr+2;
+                hashLong[ZSTD_hashPtr(base+indexToInsert, hBitsL, 8)] = indexToInsert;
+                hashLong[ZSTD_hashPtr(ip-2, hBitsL, 8)] = (U32)(ip-2-base);
+                hashSmall[ZSTD_hashPtr(base+indexToInsert, hBitsS, mls)] = indexToInsert;
+                hashSmall[ZSTD_hashPtr(ip-1, hBitsS, mls)] = (U32)(ip-1-base);
+            }
+
+            /* check immediate repcode */
+            if (dictMode == ZSTD_dictMatchState) {
+                while (ip <= ilimit) {
+                    U32 const current2 = (U32)(ip-base);
+                    U32 const repIndex2 = current2 - offset_2;
+                    const BYTE* repMatch2 = dictMode == ZSTD_dictMatchState
+                        && repIndex2 < prefixLowestIndex ?
+                            dictBase + repIndex2 - dictIndexDelta :
+                            base + repIndex2;
+                    if ( ((U32)((prefixLowestIndex-1) - (U32)repIndex2) >= 3 /* intentional overflow */)
+                       && (MEM_read32(repMatch2) == MEM_read32(ip)) ) {
+                        const BYTE* const repEnd2 = repIndex2 < prefixLowestIndex ? dictEnd : iend;
+                        size_t const repLength2 = ZSTD_count_2segments(ip+4, repMatch2+4, iend, repEnd2, prefixLowest) + 4;
+                        U32 tmpOffset = offset_2; offset_2 = offset_1; offset_1 = tmpOffset;   /* swap offset_2 <=> offset_1 */
+                        ZSTD_storeSeq(seqStore, 0, anchor, iend, 0, repLength2-MINMATCH);
+                        hashSmall[ZSTD_hashPtr(ip, hBitsS, mls)] = current2;
+                        hashLong[ZSTD_hashPtr(ip, hBitsL, 8)] = current2;
+                        ip += repLength2;
+                        anchor = ip;
+                        continue;
+                    }
+                    break;
+            }   }
+
+            if (dictMode == ZSTD_noDict) {
+                while ( (ip <= ilimit)
+                     && ( (offset_2>0)
+                        & (MEM_read32(ip) == MEM_read32(ip - offset_2)) )) {
+                    /* store sequence */
+                    size_t const rLength = ZSTD_count(ip+4, ip+4-offset_2, iend) + 4;
+                    U32 const tmpOff = offset_2; offset_2 = offset_1; offset_1 = tmpOff;  /* swap offset_2 <=> offset_1 */
+                    hashSmall[ZSTD_hashPtr(ip, hBitsS, mls)] = (U32)(ip-base);
+                    hashLong[ZSTD_hashPtr(ip, hBitsL, 8)] = (U32)(ip-base);
+                    ZSTD_storeSeq(seqStore, 0, anchor, iend, 0, rLength-MINMATCH);
+                    ip += rLength;
+                    anchor = ip;
+                    continue;   /* faster when present ... (?) */
+        }   }   }
+    }   /* while (ip < ilimit) */
+
+    /* save reps for next block */
+    rep[0] = offset_1 ? offset_1 : offsetSaved;
+    rep[1] = offset_2 ? offset_2 : offsetSaved;
+
+    /* Return the last literals size */
+    return (size_t)(iend - anchor);
+}
+
+
+size_t ZSTD_compressBlock_doubleFast(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize)
+{
+    const U32 mls = ms->cParams.minMatch;
+    switch(mls)
+    {
+    default: /* includes case 3 */
+    case 4 :
+        return ZSTD_compressBlock_doubleFast_generic(ms, seqStore, rep, src, srcSize, 4, ZSTD_noDict);
+    case 5 :
+        return ZSTD_compressBlock_doubleFast_generic(ms, seqStore, rep, src, srcSize, 5, ZSTD_noDict);
+    case 6 :
+        return ZSTD_compressBlock_doubleFast_generic(ms, seqStore, rep, src, srcSize, 6, ZSTD_noDict);
+    case 7 :
+        return ZSTD_compressBlock_doubleFast_generic(ms, seqStore, rep, src, srcSize, 7, ZSTD_noDict);
+    }
+}
+
+
+size_t ZSTD_compressBlock_doubleFast_dictMatchState(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize)
+{
+    const U32 mls = ms->cParams.minMatch;
+    switch(mls)
+    {
+    default: /* includes case 3 */
+    case 4 :
+        return ZSTD_compressBlock_doubleFast_generic(ms, seqStore, rep, src, srcSize, 4, ZSTD_dictMatchState);
+    case 5 :
+        return ZSTD_compressBlock_doubleFast_generic(ms, seqStore, rep, src, srcSize, 5, ZSTD_dictMatchState);
+    case 6 :
+        return ZSTD_compressBlock_doubleFast_generic(ms, seqStore, rep, src, srcSize, 6, ZSTD_dictMatchState);
+    case 7 :
+        return ZSTD_compressBlock_doubleFast_generic(ms, seqStore, rep, src, srcSize, 7, ZSTD_dictMatchState);
+    }
+}
+
+
+static size_t ZSTD_compressBlock_doubleFast_extDict_generic(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize,
+        U32 const mls /* template */)
+{
+    ZSTD_compressionParameters const* cParams = &ms->cParams;
+    U32* const hashLong = ms->hashTable;
+    U32  const hBitsL = cParams->hashLog;
+    U32* const hashSmall = ms->chainTable;
+    U32  const hBitsS = cParams->chainLog;
+    const BYTE* const istart = (const BYTE*)src;
+    const BYTE* ip = istart;
+    const BYTE* anchor = istart;
+    const BYTE* const iend = istart + srcSize;
+    const BYTE* const ilimit = iend - 8;
+    const BYTE* const base = ms->window.base;
+    const U32   endIndex = (U32)((size_t)(istart - base) + srcSize);
+    const U32   lowLimit = ZSTD_getLowestMatchIndex(ms, endIndex, cParams->windowLog);
+    const U32   dictStartIndex = lowLimit;
+    const U32   dictLimit = ms->window.dictLimit;
+    const U32   prefixStartIndex = (dictLimit > lowLimit) ? dictLimit : lowLimit;
+    const BYTE* const prefixStart = base + prefixStartIndex;
+    const BYTE* const dictBase = ms->window.dictBase;
+    const BYTE* const dictStart = dictBase + dictStartIndex;
+    const BYTE* const dictEnd = dictBase + prefixStartIndex;
+    U32 offset_1=rep[0], offset_2=rep[1];
+
+    DEBUGLOG(5, "ZSTD_compressBlock_doubleFast_extDict_generic (srcSize=%zu)", srcSize);
+
+    /* if extDict is invalidated due to maxDistance, switch to "regular" variant */
+    if (prefixStartIndex == dictStartIndex)
+        return ZSTD_compressBlock_doubleFast_generic(ms, seqStore, rep, src, srcSize, mls, ZSTD_noDict);
+
+    /* Search Loop */
+    while (ip < ilimit) {  /* < instead of <=, because (ip+1) */
+        const size_t hSmall = ZSTD_hashPtr(ip, hBitsS, mls);
+        const U32 matchIndex = hashSmall[hSmall];
+        const BYTE* const matchBase = matchIndex < prefixStartIndex ? dictBase : base;
+        const BYTE* match = matchBase + matchIndex;
+
+        const size_t hLong = ZSTD_hashPtr(ip, hBitsL, 8);
+        const U32 matchLongIndex = hashLong[hLong];
+        const BYTE* const matchLongBase = matchLongIndex < prefixStartIndex ? dictBase : base;
+        const BYTE* matchLong = matchLongBase + matchLongIndex;
+
+        const U32 curr = (U32)(ip-base);
+        const U32 repIndex = curr + 1 - offset_1;   /* offset_1 expected <= curr +1 */
+        const BYTE* const repBase = repIndex < prefixStartIndex ? dictBase : base;
+        const BYTE* const repMatch = repBase + repIndex;
+        size_t mLength;
+        hashSmall[hSmall] = hashLong[hLong] = curr;   /* update hash table */
+
+        if ((((U32)((prefixStartIndex-1) - repIndex) >= 3) /* intentional underflow : ensure repIndex doesn't overlap dict + prefix */
+            & (offset_1 < curr+1 - dictStartIndex)) /* note: we are searching at curr+1 */
+          && (MEM_read32(repMatch) == MEM_read32(ip+1)) ) {
+            const BYTE* repMatchEnd = repIndex < prefixStartIndex ? dictEnd : iend;
+            mLength = ZSTD_count_2segments(ip+1+4, repMatch+4, iend, repMatchEnd, prefixStart) + 4;
+            ip++;
+            ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, iend, 0, mLength-MINMATCH);
+        } else {
+            if ((matchLongIndex > dictStartIndex) && (MEM_read64(matchLong) == MEM_read64(ip))) {
+                const BYTE* const matchEnd = matchLongIndex < prefixStartIndex ? dictEnd : iend;
+                const BYTE* const lowMatchPtr = matchLongIndex < prefixStartIndex ? dictStart : prefixStart;
+                U32 offset;
+                mLength = ZSTD_count_2segments(ip+8, matchLong+8, iend, matchEnd, prefixStart) + 8;
+                offset = curr - matchLongIndex;
+                while (((ip>anchor) & (matchLong>lowMatchPtr)) && (ip[-1] == matchLong[-1])) { ip--; matchLong--; mLength++; }   /* catch up */
+                offset_2 = offset_1;
+                offset_1 = offset;
+                ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, iend, offset + ZSTD_REP_MOVE, mLength-MINMATCH);
+
+            } else if ((matchIndex > dictStartIndex) && (MEM_read32(match) == MEM_read32(ip))) {
+                size_t const h3 = ZSTD_hashPtr(ip+1, hBitsL, 8);
+                U32 const matchIndex3 = hashLong[h3];
+                const BYTE* const match3Base = matchIndex3 < prefixStartIndex ? dictBase : base;
+                const BYTE* match3 = match3Base + matchIndex3;
+                U32 offset;
+                hashLong[h3] = curr + 1;
+                if ( (matchIndex3 > dictStartIndex) && (MEM_read64(match3) == MEM_read64(ip+1)) ) {
+                    const BYTE* const matchEnd = matchIndex3 < prefixStartIndex ? dictEnd : iend;
+                    const BYTE* const lowMatchPtr = matchIndex3 < prefixStartIndex ? dictStart : prefixStart;
+                    mLength = ZSTD_count_2segments(ip+9, match3+8, iend, matchEnd, prefixStart) + 8;
+                    ip++;
+                    offset = curr+1 - matchIndex3;
+                    while (((ip>anchor) & (match3>lowMatchPtr)) && (ip[-1] == match3[-1])) { ip--; match3--; mLength++; } /* catch up */
+                } else {
+                    const BYTE* const matchEnd = matchIndex < prefixStartIndex ? dictEnd : iend;
+                    const BYTE* const lowMatchPtr = matchIndex < prefixStartIndex ? dictStart : prefixStart;
+                    mLength = ZSTD_count_2segments(ip+4, match+4, iend, matchEnd, prefixStart) + 4;
+                    offset = curr - matchIndex;
+                    while (((ip>anchor) & (match>lowMatchPtr)) && (ip[-1] == match[-1])) { ip--; match--; mLength++; }   /* catch up */
+                }
+                offset_2 = offset_1;
+                offset_1 = offset;
+                ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, iend, offset + ZSTD_REP_MOVE, mLength-MINMATCH);
+
+            } else {
+                ip += ((ip-anchor) >> kSearchStrength) + 1;
+                continue;
+        }   }
+
+        /* move to next sequence start */
+        ip += mLength;
+        anchor = ip;
+
+        if (ip <= ilimit) {
+            /* Complementary insertion */
+            /* done after iLimit test, as candidates could be > iend-8 */
+            {   U32 const indexToInsert = curr+2;
+                hashLong[ZSTD_hashPtr(base+indexToInsert, hBitsL, 8)] = indexToInsert;
+                hashLong[ZSTD_hashPtr(ip-2, hBitsL, 8)] = (U32)(ip-2-base);
+                hashSmall[ZSTD_hashPtr(base+indexToInsert, hBitsS, mls)] = indexToInsert;
+                hashSmall[ZSTD_hashPtr(ip-1, hBitsS, mls)] = (U32)(ip-1-base);
+            }
+
+            /* check immediate repcode */
+            while (ip <= ilimit) {
+                U32 const current2 = (U32)(ip-base);
+                U32 const repIndex2 = current2 - offset_2;
+                const BYTE* repMatch2 = repIndex2 < prefixStartIndex ? dictBase + repIndex2 : base + repIndex2;
+                if ( (((U32)((prefixStartIndex-1) - repIndex2) >= 3)   /* intentional overflow : ensure repIndex2 doesn't overlap dict + prefix */
+                    & (offset_2 < current2 - dictStartIndex))
+                  && (MEM_read32(repMatch2) == MEM_read32(ip)) ) {
+                    const BYTE* const repEnd2 = repIndex2 < prefixStartIndex ? dictEnd : iend;
+                    size_t const repLength2 = ZSTD_count_2segments(ip+4, repMatch2+4, iend, repEnd2, prefixStart) + 4;
+                    U32 const tmpOffset = offset_2; offset_2 = offset_1; offset_1 = tmpOffset;   /* swap offset_2 <=> offset_1 */
+                    ZSTD_storeSeq(seqStore, 0, anchor, iend, 0, repLength2-MINMATCH);
+                    hashSmall[ZSTD_hashPtr(ip, hBitsS, mls)] = current2;
+                    hashLong[ZSTD_hashPtr(ip, hBitsL, 8)] = current2;
+                    ip += repLength2;
+                    anchor = ip;
+                    continue;
+                }
+                break;
+    }   }   }
+
+    /* save reps for next block */
+    rep[0] = offset_1;
+    rep[1] = offset_2;
+
+    /* Return the last literals size */
+    return (size_t)(iend - anchor);
+}
+
+
+size_t ZSTD_compressBlock_doubleFast_extDict(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize)
+{
+    U32 const mls = ms->cParams.minMatch;
+    switch(mls)
+    {
+    default: /* includes case 3 */
+    case 4 :
+        return ZSTD_compressBlock_doubleFast_extDict_generic(ms, seqStore, rep, src, srcSize, 4);
+    case 5 :
+        return ZSTD_compressBlock_doubleFast_extDict_generic(ms, seqStore, rep, src, srcSize, 5);
+    case 6 :
+        return ZSTD_compressBlock_doubleFast_extDict_generic(ms, seqStore, rep, src, srcSize, 6);
+    case 7 :
+        return ZSTD_compressBlock_doubleFast_extDict_generic(ms, seqStore, rep, src, srcSize, 7);
+    }
+}
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_double_fast.h mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_double_fast.h
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_double_fast.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_double_fast.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+#ifndef ZSTD_DOUBLE_FAST_H
+#define ZSTD_DOUBLE_FAST_H
+
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
+#include "../common/mem.h"      /* U32 */
+#include "zstd_compress_internal.h"     /* ZSTD_CCtx, size_t */
+
+void ZSTD_fillDoubleHashTable(ZSTD_matchState_t* ms,
+                              void const* end, ZSTD_dictTableLoadMethod_e dtlm);
+size_t ZSTD_compressBlock_doubleFast(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+size_t ZSTD_compressBlock_doubleFast_dictMatchState(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+size_t ZSTD_compressBlock_doubleFast_extDict(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+
+
+#if defined (__cplusplus)
+}
+#endif
+
+#endif /* ZSTD_DOUBLE_FAST_H */
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_fast.c mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_fast.c
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_fast.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_fast.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,496 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+#include "zstd_compress_internal.h"  /* ZSTD_hashPtr, ZSTD_count, ZSTD_storeSeq */
+#include "zstd_fast.h"
+
+
+void ZSTD_fillHashTable(ZSTD_matchState_t* ms,
+                        const void* const end,
+                        ZSTD_dictTableLoadMethod_e dtlm)
+{
+    const ZSTD_compressionParameters* const cParams = &ms->cParams;
+    U32* const hashTable = ms->hashTable;
+    U32  const hBits = cParams->hashLog;
+    U32  const mls = cParams->minMatch;
+    const BYTE* const base = ms->window.base;
+    const BYTE* ip = base + ms->nextToUpdate;
+    const BYTE* const iend = ((const BYTE*)end) - HASH_READ_SIZE;
+    const U32 fastHashFillStep = 3;
+
+    /* Always insert every fastHashFillStep position into the hash table.
+     * Insert the other positions if their hash entry is empty.
+     */
+    for ( ; ip + fastHashFillStep < iend + 2; ip += fastHashFillStep) {
+        U32 const curr = (U32)(ip - base);
+        size_t const hash0 = ZSTD_hashPtr(ip, hBits, mls);
+        hashTable[hash0] = curr;
+        if (dtlm == ZSTD_dtlm_fast) continue;
+        /* Only load extra positions for ZSTD_dtlm_full */
+        {   U32 p;
+            for (p = 1; p < fastHashFillStep; ++p) {
+                size_t const hash = ZSTD_hashPtr(ip + p, hBits, mls);
+                if (hashTable[hash] == 0) {  /* not yet filled */
+                    hashTable[hash] = curr + p;
+    }   }   }   }
+}
+
+
+FORCE_INLINE_TEMPLATE size_t
+ZSTD_compressBlock_fast_generic(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize,
+        U32 const mls)
+{
+    const ZSTD_compressionParameters* const cParams = &ms->cParams;
+    U32* const hashTable = ms->hashTable;
+    U32 const hlog = cParams->hashLog;
+    /* support stepSize of 0 */
+    size_t const stepSize = cParams->targetLength + !(cParams->targetLength) + 1;
+    const BYTE* const base = ms->window.base;
+    const BYTE* const istart = (const BYTE*)src;
+    /* We check ip0 (ip + 0) and ip1 (ip + 1) each loop */
+    const BYTE* ip0 = istart;
+    const BYTE* ip1;
+    const BYTE* anchor = istart;
+    const U32   endIndex = (U32)((size_t)(istart - base) + srcSize);
+    const U32   prefixStartIndex = ZSTD_getLowestPrefixIndex(ms, endIndex, cParams->windowLog);
+    const BYTE* const prefixStart = base + prefixStartIndex;
+    const BYTE* const iend = istart + srcSize;
+    const BYTE* const ilimit = iend - HASH_READ_SIZE;
+    U32 offset_1=rep[0], offset_2=rep[1];
+    U32 offsetSaved = 0;
+
+    /* init */
+    DEBUGLOG(5, "ZSTD_compressBlock_fast_generic");
+    ip0 += (ip0 == prefixStart);
+    ip1 = ip0 + 1;
+    {   U32 const curr = (U32)(ip0 - base);
+        U32 const windowLow = ZSTD_getLowestPrefixIndex(ms, curr, cParams->windowLog);
+        U32 const maxRep = curr - windowLow;
+        if (offset_2 > maxRep) offsetSaved = offset_2, offset_2 = 0;
+        if (offset_1 > maxRep) offsetSaved = offset_1, offset_1 = 0;
+    }
+
+    /* Main Search Loop */
+#ifdef __INTEL_COMPILER
+    /* From intel 'The vector pragma indicates that the loop should be
+     * vectorized if it is legal to do so'. Can be used together with
+     * #pragma ivdep (but have opted to exclude that because intel
+     * warns against using it).*/
+    #pragma vector always
+#endif
+    while (ip1 < ilimit) {   /* < instead of <=, because check at ip0+2 */
+        size_t mLength;
+        BYTE const* ip2 = ip0 + 2;
+        size_t const h0 = ZSTD_hashPtr(ip0, hlog, mls);
+        U32 const val0 = MEM_read32(ip0);
+        size_t const h1 = ZSTD_hashPtr(ip1, hlog, mls);
+        U32 const val1 = MEM_read32(ip1);
+        U32 const current0 = (U32)(ip0-base);
+        U32 const current1 = (U32)(ip1-base);
+        U32 const matchIndex0 = hashTable[h0];
+        U32 const matchIndex1 = hashTable[h1];
+        BYTE const* repMatch = ip2 - offset_1;
+        const BYTE* match0 = base + matchIndex0;
+        const BYTE* match1 = base + matchIndex1;
+        U32 offcode;
+
+#if defined(__aarch64__)
+        PREFETCH_L1(ip0+256);
+#endif
+
+        hashTable[h0] = current0;   /* update hash table */
+        hashTable[h1] = current1;   /* update hash table */
+
+        assert(ip0 + 1 == ip1);
+
+        if ((offset_1 > 0) & (MEM_read32(repMatch) == MEM_read32(ip2))) {
+            mLength = (ip2[-1] == repMatch[-1]) ? 1 : 0;
+            ip0 = ip2 - mLength;
+            match0 = repMatch - mLength;
+            mLength += 4;
+            offcode = 0;
+            goto _match;
+        }
+        if ((matchIndex0 > prefixStartIndex) && MEM_read32(match0) == val0) {
+            /* found a regular match */
+            goto _offset;
+        }
+        if ((matchIndex1 > prefixStartIndex) && MEM_read32(match1) == val1) {
+            /* found a regular match after one literal */
+            ip0 = ip1;
+            match0 = match1;
+            goto _offset;
+        }
+        {   size_t const step = ((size_t)(ip0-anchor) >> (kSearchStrength - 1)) + stepSize;
+            assert(step >= 2);
+            ip0 += step;
+            ip1 += step;
+            continue;
+        }
+_offset: /* Requires: ip0, match0 */
+        /* Compute the offset code */
+        offset_2 = offset_1;
+        offset_1 = (U32)(ip0-match0);
+        offcode = offset_1 + ZSTD_REP_MOVE;
+        mLength = 4;
+        /* Count the backwards match length */
+        while (((ip0>anchor) & (match0>prefixStart))
+             && (ip0[-1] == match0[-1])) { ip0--; match0--; mLength++; } /* catch up */
+
+_match: /* Requires: ip0, match0, offcode */
+        /* Count the forward length */
+        mLength += ZSTD_count(ip0+mLength, match0+mLength, iend);
+        ZSTD_storeSeq(seqStore, (size_t)(ip0-anchor), anchor, iend, offcode, mLength-MINMATCH);
+        /* match found */
+        ip0 += mLength;
+        anchor = ip0;
+
+        if (ip0 <= ilimit) {
+            /* Fill Table */
+            assert(base+current0+2 > istart);  /* check base overflow */
+            hashTable[ZSTD_hashPtr(base+current0+2, hlog, mls)] = current0+2;  /* here because current+2 could be > iend-8 */
+            hashTable[ZSTD_hashPtr(ip0-2, hlog, mls)] = (U32)(ip0-2-base);
+
+            if (offset_2 > 0) { /* offset_2==0 means offset_2 is invalidated */
+                while ( (ip0 <= ilimit) && (MEM_read32(ip0) == MEM_read32(ip0 - offset_2)) ) {
+                    /* store sequence */
+                    size_t const rLength = ZSTD_count(ip0+4, ip0+4-offset_2, iend) + 4;
+                    { U32 const tmpOff = offset_2; offset_2 = offset_1; offset_1 = tmpOff; } /* swap offset_2 <=> offset_1 */
+                    hashTable[ZSTD_hashPtr(ip0, hlog, mls)] = (U32)(ip0-base);
+                    ip0 += rLength;
+                    ZSTD_storeSeq(seqStore, 0 /*litLen*/, anchor, iend, 0 /*offCode*/, rLength-MINMATCH);
+                    anchor = ip0;
+                    continue;   /* faster when present (confirmed on gcc-8) ... (?) */
+        }   }   }
+        ip1 = ip0 + 1;
+    }
+
+    /* save reps for next block */
+    rep[0] = offset_1 ? offset_1 : offsetSaved;
+    rep[1] = offset_2 ? offset_2 : offsetSaved;
+
+    /* Return the last literals size */
+    return (size_t)(iend - anchor);
+}
+
+
+size_t ZSTD_compressBlock_fast(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize)
+{
+    U32 const mls = ms->cParams.minMatch;
+    assert(ms->dictMatchState == NULL);
+    switch(mls)
+    {
+    default: /* includes case 3 */
+    case 4 :
+        return ZSTD_compressBlock_fast_generic(ms, seqStore, rep, src, srcSize, 4);
+    case 5 :
+        return ZSTD_compressBlock_fast_generic(ms, seqStore, rep, src, srcSize, 5);
+    case 6 :
+        return ZSTD_compressBlock_fast_generic(ms, seqStore, rep, src, srcSize, 6);
+    case 7 :
+        return ZSTD_compressBlock_fast_generic(ms, seqStore, rep, src, srcSize, 7);
+    }
+}
+
+FORCE_INLINE_TEMPLATE
+size_t ZSTD_compressBlock_fast_dictMatchState_generic(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize, U32 const mls)
+{
+    const ZSTD_compressionParameters* const cParams = &ms->cParams;
+    U32* const hashTable = ms->hashTable;
+    U32 const hlog = cParams->hashLog;
+    /* support stepSize of 0 */
+    U32 const stepSize = cParams->targetLength + !(cParams->targetLength);
+    const BYTE* const base = ms->window.base;
+    const BYTE* const istart = (const BYTE*)src;
+    const BYTE* ip = istart;
+    const BYTE* anchor = istart;
+    const U32   prefixStartIndex = ms->window.dictLimit;
+    const BYTE* const prefixStart = base + prefixStartIndex;
+    const BYTE* const iend = istart + srcSize;
+    const BYTE* const ilimit = iend - HASH_READ_SIZE;
+    U32 offset_1=rep[0], offset_2=rep[1];
+    U32 offsetSaved = 0;
+
+    const ZSTD_matchState_t* const dms = ms->dictMatchState;
+    const ZSTD_compressionParameters* const dictCParams = &dms->cParams ;
+    const U32* const dictHashTable = dms->hashTable;
+    const U32 dictStartIndex       = dms->window.dictLimit;
+    const BYTE* const dictBase     = dms->window.base;
+    const BYTE* const dictStart    = dictBase + dictStartIndex;
+    const BYTE* const dictEnd      = dms->window.nextSrc;
+    const U32 dictIndexDelta       = prefixStartIndex - (U32)(dictEnd - dictBase);
+    const U32 dictAndPrefixLength  = (U32)(ip - prefixStart + dictEnd - dictStart);
+    const U32 dictHLog             = dictCParams->hashLog;
+
+    /* if a dictionary is still attached, it necessarily means that
+     * it is within window size. So we just check it. */
+    const U32 maxDistance = 1U << cParams->windowLog;
+    const U32 endIndex = (U32)((size_t)(ip - base) + srcSize);
+    assert(endIndex - prefixStartIndex <= maxDistance);
+    (void)maxDistance; (void)endIndex;   /* these variables are not used when assert() is disabled */
+
+    /* ensure there will be no underflow
+     * when translating a dict index into a local index */
+    assert(prefixStartIndex >= (U32)(dictEnd - dictBase));
+
+    /* init */
+    DEBUGLOG(5, "ZSTD_compressBlock_fast_dictMatchState_generic");
+    ip += (dictAndPrefixLength == 0);
+    /* dictMatchState repCode checks don't currently handle repCode == 0
+     * disabling. */
+    assert(offset_1 <= dictAndPrefixLength);
+    assert(offset_2 <= dictAndPrefixLength);
+
+    /* Main Search Loop */
+    while (ip < ilimit) {   /* < instead of <=, because repcode check at (ip+1) */
+        size_t mLength;
+        size_t const h = ZSTD_hashPtr(ip, hlog, mls);
+        U32 const curr = (U32)(ip-base);
+        U32 const matchIndex = hashTable[h];
+        const BYTE* match = base + matchIndex;
+        const U32 repIndex = curr + 1 - offset_1;
+        const BYTE* repMatch = (repIndex < prefixStartIndex) ?
+                               dictBase + (repIndex - dictIndexDelta) :
+                               base + repIndex;
+        hashTable[h] = curr;   /* update hash table */
+
+        if ( ((U32)((prefixStartIndex-1) - repIndex) >= 3) /* intentional underflow : ensure repIndex isn't overlapping dict + prefix */
+          && (MEM_read32(repMatch) == MEM_read32(ip+1)) ) {
+            const BYTE* const repMatchEnd = repIndex < prefixStartIndex ? dictEnd : iend;
+            mLength = ZSTD_count_2segments(ip+1+4, repMatch+4, iend, repMatchEnd, prefixStart) + 4;
+            ip++;
+            ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, iend, 0, mLength-MINMATCH);
+        } else if ( (matchIndex <= prefixStartIndex) ) {
+            size_t const dictHash = ZSTD_hashPtr(ip, dictHLog, mls);
+            U32 const dictMatchIndex = dictHashTable[dictHash];
+            const BYTE* dictMatch = dictBase + dictMatchIndex;
+            if (dictMatchIndex <= dictStartIndex ||
+                MEM_read32(dictMatch) != MEM_read32(ip)) {
+                assert(stepSize >= 1);
+                ip += ((ip-anchor) >> kSearchStrength) + stepSize;
+                continue;
+            } else {
+                /* found a dict match */
+                U32 const offset = (U32)(curr-dictMatchIndex-dictIndexDelta);
+                mLength = ZSTD_count_2segments(ip+4, dictMatch+4, iend, dictEnd, prefixStart) + 4;
+                while (((ip>anchor) & (dictMatch>dictStart))
+                     && (ip[-1] == dictMatch[-1])) {
+                    ip--; dictMatch--; mLength++;
+                } /* catch up */
+                offset_2 = offset_1;
+                offset_1 = offset;
+                ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, iend, offset + ZSTD_REP_MOVE, mLength-MINMATCH);
+            }
+        } else if (MEM_read32(match) != MEM_read32(ip)) {
+            /* it's not a match, and we're not going to check the dictionary */
+            assert(stepSize >= 1);
+            ip += ((ip-anchor) >> kSearchStrength) + stepSize;
+            continue;
+        } else {
+            /* found a regular match */
+            U32 const offset = (U32)(ip-match);
+            mLength = ZSTD_count(ip+4, match+4, iend) + 4;
+            while (((ip>anchor) & (match>prefixStart))
+                 && (ip[-1] == match[-1])) { ip--; match--; mLength++; } /* catch up */
+            offset_2 = offset_1;
+            offset_1 = offset;
+            ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, iend, offset + ZSTD_REP_MOVE, mLength-MINMATCH);
+        }
+
+        /* match found */
+        ip += mLength;
+        anchor = ip;
+
+        if (ip <= ilimit) {
+            /* Fill Table */
+            assert(base+curr+2 > istart);  /* check base overflow */
+            hashTable[ZSTD_hashPtr(base+curr+2, hlog, mls)] = curr+2;  /* here because curr+2 could be > iend-8 */
+            hashTable[ZSTD_hashPtr(ip-2, hlog, mls)] = (U32)(ip-2-base);
+
+            /* check immediate repcode */
+            while (ip <= ilimit) {
+                U32 const current2 = (U32)(ip-base);
+                U32 const repIndex2 = current2 - offset_2;
+                const BYTE* repMatch2 = repIndex2 < prefixStartIndex ?
+                        dictBase - dictIndexDelta + repIndex2 :
+                        base + repIndex2;
+                if ( ((U32)((prefixStartIndex-1) - (U32)repIndex2) >= 3 /* intentional overflow */)
+                   && (MEM_read32(repMatch2) == MEM_read32(ip)) ) {
+                    const BYTE* const repEnd2 = repIndex2 < prefixStartIndex ? dictEnd : iend;
+                    size_t const repLength2 = ZSTD_count_2segments(ip+4, repMatch2+4, iend, repEnd2, prefixStart) + 4;
+                    U32 tmpOffset = offset_2; offset_2 = offset_1; offset_1 = tmpOffset;   /* swap offset_2 <=> offset_1 */
+                    ZSTD_storeSeq(seqStore, 0, anchor, iend, 0, repLength2-MINMATCH);
+                    hashTable[ZSTD_hashPtr(ip, hlog, mls)] = current2;
+                    ip += repLength2;
+                    anchor = ip;
+                    continue;
+                }
+                break;
+            }
+        }
+    }
+
+    /* save reps for next block */
+    rep[0] = offset_1 ? offset_1 : offsetSaved;
+    rep[1] = offset_2 ? offset_2 : offsetSaved;
+
+    /* Return the last literals size */
+    return (size_t)(iend - anchor);
+}
+
+size_t ZSTD_compressBlock_fast_dictMatchState(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize)
+{
+    U32 const mls = ms->cParams.minMatch;
+    assert(ms->dictMatchState != NULL);
+    switch(mls)
+    {
+    default: /* includes case 3 */
+    case 4 :
+        return ZSTD_compressBlock_fast_dictMatchState_generic(ms, seqStore, rep, src, srcSize, 4);
+    case 5 :
+        return ZSTD_compressBlock_fast_dictMatchState_generic(ms, seqStore, rep, src, srcSize, 5);
+    case 6 :
+        return ZSTD_compressBlock_fast_dictMatchState_generic(ms, seqStore, rep, src, srcSize, 6);
+    case 7 :
+        return ZSTD_compressBlock_fast_dictMatchState_generic(ms, seqStore, rep, src, srcSize, 7);
+    }
+}
+
+
+static size_t ZSTD_compressBlock_fast_extDict_generic(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize, U32 const mls)
+{
+    const ZSTD_compressionParameters* const cParams = &ms->cParams;
+    U32* const hashTable = ms->hashTable;
+    U32 const hlog = cParams->hashLog;
+    /* support stepSize of 0 */
+    U32 const stepSize = cParams->targetLength + !(cParams->targetLength);
+    const BYTE* const base = ms->window.base;
+    const BYTE* const dictBase = ms->window.dictBase;
+    const BYTE* const istart = (const BYTE*)src;
+    const BYTE* ip = istart;
+    const BYTE* anchor = istart;
+    const U32   endIndex = (U32)((size_t)(istart - base) + srcSize);
+    const U32   lowLimit = ZSTD_getLowestMatchIndex(ms, endIndex, cParams->windowLog);
+    const U32   dictStartIndex = lowLimit;
+    const BYTE* const dictStart = dictBase + dictStartIndex;
+    const U32   dictLimit = ms->window.dictLimit;
+    const U32   prefixStartIndex = dictLimit < lowLimit ? lowLimit : dictLimit;
+    const BYTE* const prefixStart = base + prefixStartIndex;
+    const BYTE* const dictEnd = dictBase + prefixStartIndex;
+    const BYTE* const iend = istart + srcSize;
+    const BYTE* const ilimit = iend - 8;
+    U32 offset_1=rep[0], offset_2=rep[1];
+
+    DEBUGLOG(5, "ZSTD_compressBlock_fast_extDict_generic (offset_1=%u)", offset_1);
+
+    /* switch to "regular" variant if extDict is invalidated due to maxDistance */
+    if (prefixStartIndex == dictStartIndex)
+        return ZSTD_compressBlock_fast_generic(ms, seqStore, rep, src, srcSize, mls);
+
+    /* Search Loop */
+    while (ip < ilimit) {  /* < instead of <=, because (ip+1) */
+        const size_t h = ZSTD_hashPtr(ip, hlog, mls);
+        const U32    matchIndex = hashTable[h];
+        const BYTE* const matchBase = matchIndex < prefixStartIndex ? dictBase : base;
+        const BYTE*  match = matchBase + matchIndex;
+        const U32    curr = (U32)(ip-base);
+        const U32    repIndex = curr + 1 - offset_1;
+        const BYTE* const repBase = repIndex < prefixStartIndex ? dictBase : base;
+        const BYTE* const repMatch = repBase + repIndex;
+        hashTable[h] = curr;   /* update hash table */
+        DEBUGLOG(7, "offset_1 = %u , curr = %u", offset_1, curr);
+
+        if ( ( ((U32)((prefixStartIndex-1) - repIndex) >= 3) /* intentional underflow */
+             & (offset_1 < curr+1 - dictStartIndex) ) /* note: we are searching at curr+1 */
+           && (MEM_read32(repMatch) == MEM_read32(ip+1)) ) {
+            const BYTE* const repMatchEnd = repIndex < prefixStartIndex ? dictEnd : iend;
+            size_t const rLength = ZSTD_count_2segments(ip+1 +4, repMatch +4, iend, repMatchEnd, prefixStart) + 4;
+            ip++;
+            ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, iend, 0, rLength-MINMATCH);
+            ip += rLength;
+            anchor = ip;
+        } else {
+            if ( (matchIndex < dictStartIndex) ||
+                 (MEM_read32(match) != MEM_read32(ip)) ) {
+                assert(stepSize >= 1);
+                ip += ((ip-anchor) >> kSearchStrength) + stepSize;
+                continue;
+            }
+            {   const BYTE* const matchEnd = matchIndex < prefixStartIndex ? dictEnd : iend;
+                const BYTE* const lowMatchPtr = matchIndex < prefixStartIndex ? dictStart : prefixStart;
+                U32 const offset = curr - matchIndex;
+                size_t mLength = ZSTD_count_2segments(ip+4, match+4, iend, matchEnd, prefixStart) + 4;
+                while (((ip>anchor) & (match>lowMatchPtr)) && (ip[-1] == match[-1])) { ip--; match--; mLength++; }   /* catch up */
+                offset_2 = offset_1; offset_1 = offset;  /* update offset history */
+                ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, iend, offset + ZSTD_REP_MOVE, mLength-MINMATCH);
+                ip += mLength;
+                anchor = ip;
+        }   }
+
+        if (ip <= ilimit) {
+            /* Fill Table */
+            hashTable[ZSTD_hashPtr(base+curr+2, hlog, mls)] = curr+2;
+            hashTable[ZSTD_hashPtr(ip-2, hlog, mls)] = (U32)(ip-2-base);
+            /* check immediate repcode */
+            while (ip <= ilimit) {
+                U32 const current2 = (U32)(ip-base);
+                U32 const repIndex2 = current2 - offset_2;
+                const BYTE* const repMatch2 = repIndex2 < prefixStartIndex ? dictBase + repIndex2 : base + repIndex2;
+                if ( (((U32)((prefixStartIndex-1) - repIndex2) >= 3) & (offset_2 < curr - dictStartIndex))  /* intentional overflow */
+                   && (MEM_read32(repMatch2) == MEM_read32(ip)) ) {
+                    const BYTE* const repEnd2 = repIndex2 < prefixStartIndex ? dictEnd : iend;
+                    size_t const repLength2 = ZSTD_count_2segments(ip+4, repMatch2+4, iend, repEnd2, prefixStart) + 4;
+                    { U32 const tmpOffset = offset_2; offset_2 = offset_1; offset_1 = tmpOffset; }  /* swap offset_2 <=> offset_1 */
+                    ZSTD_storeSeq(seqStore, 0 /*litlen*/, anchor, iend, 0 /*offcode*/, repLength2-MINMATCH);
+                    hashTable[ZSTD_hashPtr(ip, hlog, mls)] = current2;
+                    ip += repLength2;
+                    anchor = ip;
+                    continue;
+                }
+                break;
+    }   }   }
+
+    /* save reps for next block */
+    rep[0] = offset_1;
+    rep[1] = offset_2;
+
+    /* Return the last literals size */
+    return (size_t)(iend - anchor);
+}
+
+
+size_t ZSTD_compressBlock_fast_extDict(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize)
+{
+    U32 const mls = ms->cParams.minMatch;
+    switch(mls)
+    {
+    default: /* includes case 3 */
+    case 4 :
+        return ZSTD_compressBlock_fast_extDict_generic(ms, seqStore, rep, src, srcSize, 4);
+    case 5 :
+        return ZSTD_compressBlock_fast_extDict_generic(ms, seqStore, rep, src, srcSize, 5);
+    case 6 :
+        return ZSTD_compressBlock_fast_extDict_generic(ms, seqStore, rep, src, srcSize, 6);
+    case 7 :
+        return ZSTD_compressBlock_fast_extDict_generic(ms, seqStore, rep, src, srcSize, 7);
+    }
+}
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_fast.h mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_fast.h
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_fast.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_fast.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+#ifndef ZSTD_FAST_H
+#define ZSTD_FAST_H
+
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
+#include "../common/mem.h"      /* U32 */
+#include "zstd_compress_internal.h"
+
+void ZSTD_fillHashTable(ZSTD_matchState_t* ms,
+                        void const* end, ZSTD_dictTableLoadMethod_e dtlm);
+size_t ZSTD_compressBlock_fast(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+size_t ZSTD_compressBlock_fast_dictMatchState(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+size_t ZSTD_compressBlock_fast_extDict(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+
+#if defined (__cplusplus)
+}
+#endif
+
+#endif /* ZSTD_FAST_H */
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_lazy.c mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_lazy.c
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_lazy.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_lazy.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,2184 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+#include "zstd_compress_internal.h"
+#include "zstd_lazy.h"
+
+
+/*-*************************************
+*  Binary Tree search
+***************************************/
+
+static void
+ZSTD_updateDUBT(ZSTD_matchState_t* ms,
+                const BYTE* ip, const BYTE* iend,
+                U32 mls)
+{
+    const ZSTD_compressionParameters* const cParams = &ms->cParams;
+    U32* const hashTable = ms->hashTable;
+    U32  const hashLog = cParams->hashLog;
+
+    U32* const bt = ms->chainTable;
+    U32  const btLog  = cParams->chainLog - 1;
+    U32  const btMask = (1 << btLog) - 1;
+
+    const BYTE* const base = ms->window.base;
+    U32 const target = (U32)(ip - base);
+    U32 idx = ms->nextToUpdate;
+
+    if (idx != target)
+        DEBUGLOG(7, "ZSTD_updateDUBT, from %u to %u (dictLimit:%u)",
+                    idx, target, ms->window.dictLimit);
+    assert(ip + 8 <= iend);   /* condition for ZSTD_hashPtr */
+    (void)iend;
+
+    assert(idx >= ms->window.dictLimit);   /* condition for valid base+idx */
+    for ( ; idx < target ; idx++) {
+        size_t const h  = ZSTD_hashPtr(base + idx, hashLog, mls);   /* assumption : ip + 8 <= iend */
+        U32    const matchIndex = hashTable[h];
+
+        U32*   const nextCandidatePtr = bt + 2*(idx&btMask);
+        U32*   const sortMarkPtr  = nextCandidatePtr + 1;
+
+        DEBUGLOG(8, "ZSTD_updateDUBT: insert %u", idx);
+        hashTable[h] = idx;   /* Update Hash Table */
+        *nextCandidatePtr = matchIndex;   /* update BT like a chain */
+        *sortMarkPtr = ZSTD_DUBT_UNSORTED_MARK;
+    }
+    ms->nextToUpdate = target;
+}
+
+
+/** ZSTD_insertDUBT1() :
+ *  sort one already inserted but unsorted position
+ *  assumption : curr >= btlow == (curr - btmask)
+ *  doesn't fail */
+static void
+ZSTD_insertDUBT1(ZSTD_matchState_t* ms,
+                 U32 curr, const BYTE* inputEnd,
+                 U32 nbCompares, U32 btLow,
+                 const ZSTD_dictMode_e dictMode)
+{
+    const ZSTD_compressionParameters* const cParams = &ms->cParams;
+    U32* const bt = ms->chainTable;
+    U32  const btLog  = cParams->chainLog - 1;
+    U32  const btMask = (1 << btLog) - 1;
+    size_t commonLengthSmaller=0, commonLengthLarger=0;
+    const BYTE* const base = ms->window.base;
+    const BYTE* const dictBase = ms->window.dictBase;
+    const U32 dictLimit = ms->window.dictLimit;
+    const BYTE* const ip = (curr>=dictLimit) ? base + curr : dictBase + curr;
+    const BYTE* const iend = (curr>=dictLimit) ? inputEnd : dictBase + dictLimit;
+    const BYTE* const dictEnd = dictBase + dictLimit;
+    const BYTE* const prefixStart = base + dictLimit;
+    const BYTE* match;
+    U32* smallerPtr = bt + 2*(curr&btMask);
+    U32* largerPtr  = smallerPtr + 1;
+    U32 matchIndex = *smallerPtr;   /* this candidate is unsorted : next sorted candidate is reached through *smallerPtr, while *largerPtr contains previous unsorted candidate (which is already saved and can be overwritten) */
+    U32 dummy32;   /* to be nullified at the end */
+    U32 const windowValid = ms->window.lowLimit;
+    U32 const maxDistance = 1U << cParams->windowLog;
+    U32 const windowLow = (curr - windowValid > maxDistance) ? curr - maxDistance : windowValid;
+
+
+    DEBUGLOG(8, "ZSTD_insertDUBT1(%u) (dictLimit=%u, lowLimit=%u)",
+                curr, dictLimit, windowLow);
+    assert(curr >= btLow);
+    assert(ip < iend);   /* condition for ZSTD_count */
+
+    while (nbCompares-- && (matchIndex > windowLow)) {
+        U32* const nextPtr = bt + 2*(matchIndex & btMask);
+        size_t matchLength = MIN(commonLengthSmaller, commonLengthLarger);   /* guaranteed minimum nb of common bytes */
+        assert(matchIndex < curr);
+        /* note : all candidates are now supposed sorted,
+         * but it's still possible to have nextPtr[1] == ZSTD_DUBT_UNSORTED_MARK
+         * when a real index has the same value as ZSTD_DUBT_UNSORTED_MARK */
+
+        if ( (dictMode != ZSTD_extDict)
+          || (matchIndex+matchLength >= dictLimit)  /* both in current segment*/
+          || (curr < dictLimit) /* both in extDict */) {
+            const BYTE* const mBase = ( (dictMode != ZSTD_extDict)
+                                     || (matchIndex+matchLength >= dictLimit)) ?
+                                        base : dictBase;
+            assert( (matchIndex+matchLength >= dictLimit)   /* might be wrong if extDict is incorrectly set to 0 */
+                 || (curr < dictLimit) );
+            match = mBase + matchIndex;
+            matchLength += ZSTD_count(ip+matchLength, match+matchLength, iend);
+        } else {
+            match = dictBase + matchIndex;
+            matchLength += ZSTD_count_2segments(ip+matchLength, match+matchLength, iend, dictEnd, prefixStart);
+            if (matchIndex+matchLength >= dictLimit)
+                match = base + matchIndex;   /* preparation for next read of match[matchLength] */
+        }
+
+        DEBUGLOG(8, "ZSTD_insertDUBT1: comparing %u with %u : found %u common bytes ",
+                    curr, matchIndex, (U32)matchLength);
+
+        if (ip+matchLength == iend) {   /* equal : no way to know if inf or sup */
+            break;   /* drop , to guarantee consistency ; miss a bit of compression, but other solutions can corrupt tree */
+        }
+
+        if (match[matchLength] < ip[matchLength]) {  /* necessarily within buffer */
+            /* match is smaller than current */
+            *smallerPtr = matchIndex;             /* update smaller idx */
+            commonLengthSmaller = matchLength;    /* all smaller will now have at least this guaranteed common length */
+            if (matchIndex <= btLow) { smallerPtr=&dummy32; break; }   /* beyond tree size, stop searching */
+            DEBUGLOG(8, "ZSTD_insertDUBT1: %u (>btLow=%u) is smaller : next => %u",
+                        matchIndex, btLow, nextPtr[1]);
+            smallerPtr = nextPtr+1;               /* new "candidate" => larger than match, which was smaller than target */
+            matchIndex = nextPtr[1];              /* new matchIndex, larger than previous and closer to current */
+        } else {
+            /* match is larger than current */
+            *largerPtr = matchIndex;
+            commonLengthLarger = matchLength;
+            if (matchIndex <= btLow) { largerPtr=&dummy32; break; }   /* beyond tree size, stop searching */
+            DEBUGLOG(8, "ZSTD_insertDUBT1: %u (>btLow=%u) is larger => %u",
+                        matchIndex, btLow, nextPtr[0]);
+            largerPtr = nextPtr;
+            matchIndex = nextPtr[0];
+    }   }
+
+    *smallerPtr = *largerPtr = 0;
+}
+
+
+static size_t
+ZSTD_DUBT_findBetterDictMatch (
+        ZSTD_matchState_t* ms,
+        const BYTE* const ip, const BYTE* const iend,
+        size_t* offsetPtr,
+        size_t bestLength,
+        U32 nbCompares,
+        U32 const mls,
+        const ZSTD_dictMode_e dictMode)
+{
+    const ZSTD_matchState_t * const dms = ms->dictMatchState;
+    const ZSTD_compressionParameters* const dmsCParams = &dms->cParams;
+    const U32 * const dictHashTable = dms->hashTable;
+    U32         const hashLog = dmsCParams->hashLog;
+    size_t      const h  = ZSTD_hashPtr(ip, hashLog, mls);
+    U32               dictMatchIndex = dictHashTable[h];
+
+    const BYTE* const base = ms->window.base;
+    const BYTE* const prefixStart = base + ms->window.dictLimit;
+    U32         const curr = (U32)(ip-base);
+    const BYTE* const dictBase = dms->window.base;
+    const BYTE* const dictEnd = dms->window.nextSrc;
+    U32         const dictHighLimit = (U32)(dms->window.nextSrc - dms->window.base);
+    U32         const dictLowLimit = dms->window.lowLimit;
+    U32         const dictIndexDelta = ms->window.lowLimit - dictHighLimit;
+
+    U32*        const dictBt = dms->chainTable;
+    U32         const btLog  = dmsCParams->chainLog - 1;
+    U32         const btMask = (1 << btLog) - 1;
+    U32         const btLow = (btMask >= dictHighLimit - dictLowLimit) ? dictLowLimit : dictHighLimit - btMask;
+
+    size_t commonLengthSmaller=0, commonLengthLarger=0;
+
+    (void)dictMode;
+    assert(dictMode == ZSTD_dictMatchState);
+
+    while (nbCompares-- && (dictMatchIndex > dictLowLimit)) {
+        U32* const nextPtr = dictBt + 2*(dictMatchIndex & btMask);
+        size_t matchLength = MIN(commonLengthSmaller, commonLengthLarger);   /* guaranteed minimum nb of common bytes */
+        const BYTE* match = dictBase + dictMatchIndex;
+        matchLength += ZSTD_count_2segments(ip+matchLength, match+matchLength, iend, dictEnd, prefixStart);
+        if (dictMatchIndex+matchLength >= dictHighLimit)
+            match = base + dictMatchIndex + dictIndexDelta;   /* to prepare for next usage of match[matchLength] */
+
+        if (matchLength > bestLength) {
+            U32 matchIndex = dictMatchIndex + dictIndexDelta;
+            if ( (4*(int)(matchLength-bestLength)) > (int)(ZSTD_highbit32(curr-matchIndex+1) - ZSTD_highbit32((U32)offsetPtr[0]+1)) ) {
+                DEBUGLOG(9, "ZSTD_DUBT_findBetterDictMatch(%u) : found better match length %u -> %u and offsetCode %u -> %u (dictMatchIndex %u, matchIndex %u)",
+                    curr, (U32)bestLength, (U32)matchLength, (U32)*offsetPtr, ZSTD_REP_MOVE + curr - matchIndex, dictMatchIndex, matchIndex);
+                bestLength = matchLength, *offsetPtr = ZSTD_REP_MOVE + curr - matchIndex;
+            }
+            if (ip+matchLength == iend) {   /* reached end of input : ip[matchLength] is not valid, no way to know if it's larger or smaller than match */
+                break;   /* drop, to guarantee consistency (miss a little bit of compression) */
+            }
+        }
+
+        if (match[matchLength] < ip[matchLength]) {
+            if (dictMatchIndex <= btLow) { break; }   /* beyond tree size, stop the search */
+            commonLengthSmaller = matchLength;    /* all smaller will now have at least this guaranteed common length */
+            dictMatchIndex = nextPtr[1];              /* new matchIndex larger than previous (closer to current) */
+        } else {
+            /* match is larger than current */
+            if (dictMatchIndex <= btLow) { break; }   /* beyond tree size, stop the search */
+            commonLengthLarger = matchLength;
+            dictMatchIndex = nextPtr[0];
+        }
+    }
+
+    if (bestLength >= MINMATCH) {
+        U32 const mIndex = curr - ((U32)*offsetPtr - ZSTD_REP_MOVE); (void)mIndex;
+        DEBUGLOG(8, "ZSTD_DUBT_findBetterDictMatch(%u) : found match of length %u and offsetCode %u (pos %u)",
+                    curr, (U32)bestLength, (U32)*offsetPtr, mIndex);
+    }
+    return bestLength;
+
+}
+
+
+static size_t
+ZSTD_DUBT_findBestMatch(ZSTD_matchState_t* ms,
+                        const BYTE* const ip, const BYTE* const iend,
+                        size_t* offsetPtr,
+                        U32 const mls,
+                        const ZSTD_dictMode_e dictMode)
+{
+    const ZSTD_compressionParameters* const cParams = &ms->cParams;
+    U32*   const hashTable = ms->hashTable;
+    U32    const hashLog = cParams->hashLog;
+    size_t const h  = ZSTD_hashPtr(ip, hashLog, mls);
+    U32          matchIndex  = hashTable[h];
+
+    const BYTE* const base = ms->window.base;
+    U32    const curr = (U32)(ip-base);
+    U32    const windowLow = ZSTD_getLowestMatchIndex(ms, curr, cParams->windowLog);
+
+    U32*   const bt = ms->chainTable;
+    U32    const btLog  = cParams->chainLog - 1;
+    U32    const btMask = (1 << btLog) - 1;
+    U32    const btLow = (btMask >= curr) ? 0 : curr - btMask;
+    U32    const unsortLimit = MAX(btLow, windowLow);
+
+    U32*         nextCandidate = bt + 2*(matchIndex&btMask);
+    U32*         unsortedMark = bt + 2*(matchIndex&btMask) + 1;
+    U32          nbCompares = 1U << cParams->searchLog;
+    U32          nbCandidates = nbCompares;
+    U32          previousCandidate = 0;
+
+    DEBUGLOG(7, "ZSTD_DUBT_findBestMatch (%u) ", curr);
+    assert(ip <= iend-8);   /* required for h calculation */
+    assert(dictMode != ZSTD_dedicatedDictSearch);
+
+    /* reach end of unsorted candidates list */
+    while ( (matchIndex > unsortLimit)
+         && (*unsortedMark == ZSTD_DUBT_UNSORTED_MARK)
+         && (nbCandidates > 1) ) {
+        DEBUGLOG(8, "ZSTD_DUBT_findBestMatch: candidate %u is unsorted",
+                    matchIndex);
+        *unsortedMark = previousCandidate;  /* the unsortedMark becomes a reversed chain, to move up back to original position */
+        previousCandidate = matchIndex;
+        matchIndex = *nextCandidate;
+        nextCandidate = bt + 2*(matchIndex&btMask);
+        unsortedMark = bt + 2*(matchIndex&btMask) + 1;
+        nbCandidates --;
+    }
+
+    /* nullify last candidate if it's still unsorted
+     * simplification, detrimental to compression ratio, beneficial for speed */
+    if ( (matchIndex > unsortLimit)
+      && (*unsortedMark==ZSTD_DUBT_UNSORTED_MARK) ) {
+        DEBUGLOG(7, "ZSTD_DUBT_findBestMatch: nullify last unsorted candidate %u",
+                    matchIndex);
+        *nextCandidate = *unsortedMark = 0;
+    }
+
+    /* batch sort stacked candidates */
+    matchIndex = previousCandidate;
+    while (matchIndex) {  /* will end on matchIndex == 0 */
+        U32* const nextCandidateIdxPtr = bt + 2*(matchIndex&btMask) + 1;
+        U32 const nextCandidateIdx = *nextCandidateIdxPtr;
+        ZSTD_insertDUBT1(ms, matchIndex, iend,
+                         nbCandidates, unsortLimit, dictMode);
+        matchIndex = nextCandidateIdx;
+        nbCandidates++;
+    }
+
+    /* find longest match */
+    {   size_t commonLengthSmaller = 0, commonLengthLarger = 0;
+        const BYTE* const dictBase = ms->window.dictBase;
+        const U32 dictLimit = ms->window.dictLimit;
+        const BYTE* const dictEnd = dictBase + dictLimit;
+        const BYTE* const prefixStart = base + dictLimit;
+        U32* smallerPtr = bt + 2*(curr&btMask);
+        U32* largerPtr  = bt + 2*(curr&btMask) + 1;
+        U32 matchEndIdx = curr + 8 + 1;
+        U32 dummy32;   /* to be nullified at the end */
+        size_t bestLength = 0;
+
+        matchIndex  = hashTable[h];
+        hashTable[h] = curr;   /* Update Hash Table */
+
+        while (nbCompares-- && (matchIndex > windowLow)) {
+            U32* const nextPtr = bt + 2*(matchIndex & btMask);
+            size_t matchLength = MIN(commonLengthSmaller, commonLengthLarger);   /* guaranteed minimum nb of common bytes */
+            const BYTE* match;
+
+            if ((dictMode != ZSTD_extDict) || (matchIndex+matchLength >= dictLimit)) {
+                match = base + matchIndex;
+                matchLength += ZSTD_count(ip+matchLength, match+matchLength, iend);
+            } else {
+                match = dictBase + matchIndex;
+                matchLength += ZSTD_count_2segments(ip+matchLength, match+matchLength, iend, dictEnd, prefixStart);
+                if (matchIndex+matchLength >= dictLimit)
+                    match = base + matchIndex;   /* to prepare for next usage of match[matchLength] */
+            }
+
+            if (matchLength > bestLength) {
+                if (matchLength > matchEndIdx - matchIndex)
+                    matchEndIdx = matchIndex + (U32)matchLength;
+                if ( (4*(int)(matchLength-bestLength)) > (int)(ZSTD_highbit32(curr-matchIndex+1) - ZSTD_highbit32((U32)offsetPtr[0]+1)) )
+                    bestLength = matchLength, *offsetPtr = ZSTD_REP_MOVE + curr - matchIndex;
+                if (ip+matchLength == iend) {   /* equal : no way to know if inf or sup */
+                    if (dictMode == ZSTD_dictMatchState) {
+                        nbCompares = 0; /* in addition to avoiding checking any
+                                         * further in this loop, make sure we
+                                         * skip checking in the dictionary. */
+                    }
+                    break;   /* drop, to guarantee consistency (miss a little bit of compression) */
+                }
+            }
+
+            if (match[matchLength] < ip[matchLength]) {
+                /* match is smaller than current */
+                *smallerPtr = matchIndex;             /* update smaller idx */
+                commonLengthSmaller = matchLength;    /* all smaller will now have at least this guaranteed common length */
+                if (matchIndex <= btLow) { smallerPtr=&dummy32; break; }   /* beyond tree size, stop the search */
+                smallerPtr = nextPtr+1;               /* new "smaller" => larger of match */
+                matchIndex = nextPtr[1];              /* new matchIndex larger than previous (closer to current) */
+            } else {
+                /* match is larger than current */
+                *largerPtr = matchIndex;
+                commonLengthLarger = matchLength;
+                if (matchIndex <= btLow) { largerPtr=&dummy32; break; }   /* beyond tree size, stop the search */
+                largerPtr = nextPtr;
+                matchIndex = nextPtr[0];
+        }   }
+
+        *smallerPtr = *largerPtr = 0;
+
+        if (dictMode == ZSTD_dictMatchState && nbCompares) {
+            bestLength = ZSTD_DUBT_findBetterDictMatch(
+                    ms, ip, iend,
+                    offsetPtr, bestLength, nbCompares,
+                    mls, dictMode);
+        }
+
+        assert(matchEndIdx > curr+8); /* ensure nextToUpdate is increased */
+        ms->nextToUpdate = matchEndIdx - 8;   /* skip repetitive patterns */
+        if (bestLength >= MINMATCH) {
+            U32 const mIndex = curr - ((U32)*offsetPtr - ZSTD_REP_MOVE); (void)mIndex;
+            DEBUGLOG(8, "ZSTD_DUBT_findBestMatch(%u) : found match of length %u and offsetCode %u (pos %u)",
+                        curr, (U32)bestLength, (U32)*offsetPtr, mIndex);
+        }
+        return bestLength;
+    }
+}
+
+
+/** ZSTD_BtFindBestMatch() : Tree updater, providing best match */
+FORCE_INLINE_TEMPLATE size_t
+ZSTD_BtFindBestMatch( ZSTD_matchState_t* ms,
+                const BYTE* const ip, const BYTE* const iLimit,
+                      size_t* offsetPtr,
+                const U32 mls /* template */,
+                const ZSTD_dictMode_e dictMode)
+{
+    DEBUGLOG(7, "ZSTD_BtFindBestMatch");
+    if (ip < ms->window.base + ms->nextToUpdate) return 0;   /* skipped area */
+    ZSTD_updateDUBT(ms, ip, iLimit, mls);
+    return ZSTD_DUBT_findBestMatch(ms, ip, iLimit, offsetPtr, mls, dictMode);
+}
+
+
+static size_t
+ZSTD_BtFindBestMatch_selectMLS (  ZSTD_matchState_t* ms,
+                            const BYTE* ip, const BYTE* const iLimit,
+                                  size_t* offsetPtr)
+{
+    switch(ms->cParams.minMatch)
+    {
+    default : /* includes case 3 */
+    case 4 : return ZSTD_BtFindBestMatch(ms, ip, iLimit, offsetPtr, 4, ZSTD_noDict);
+    case 5 : return ZSTD_BtFindBestMatch(ms, ip, iLimit, offsetPtr, 5, ZSTD_noDict);
+    case 7 :
+    case 6 : return ZSTD_BtFindBestMatch(ms, ip, iLimit, offsetPtr, 6, ZSTD_noDict);
+    }
+}
+
+
+static size_t ZSTD_BtFindBestMatch_dictMatchState_selectMLS (
+                        ZSTD_matchState_t* ms,
+                        const BYTE* ip, const BYTE* const iLimit,
+                        size_t* offsetPtr)
+{
+    switch(ms->cParams.minMatch)
+    {
+    default : /* includes case 3 */
+    case 4 : return ZSTD_BtFindBestMatch(ms, ip, iLimit, offsetPtr, 4, ZSTD_dictMatchState);
+    case 5 : return ZSTD_BtFindBestMatch(ms, ip, iLimit, offsetPtr, 5, ZSTD_dictMatchState);
+    case 7 :
+    case 6 : return ZSTD_BtFindBestMatch(ms, ip, iLimit, offsetPtr, 6, ZSTD_dictMatchState);
+    }
+}
+
+
+static size_t ZSTD_BtFindBestMatch_extDict_selectMLS (
+                        ZSTD_matchState_t* ms,
+                        const BYTE* ip, const BYTE* const iLimit,
+                        size_t* offsetPtr)
+{
+    switch(ms->cParams.minMatch)
+    {
+    default : /* includes case 3 */
+    case 4 : return ZSTD_BtFindBestMatch(ms, ip, iLimit, offsetPtr, 4, ZSTD_extDict);
+    case 5 : return ZSTD_BtFindBestMatch(ms, ip, iLimit, offsetPtr, 5, ZSTD_extDict);
+    case 7 :
+    case 6 : return ZSTD_BtFindBestMatch(ms, ip, iLimit, offsetPtr, 6, ZSTD_extDict);
+    }
+}
+
+/***********************************
+* Dedicated dict search
+***********************************/
+
+void ZSTD_dedicatedDictSearch_lazy_loadDictionary(ZSTD_matchState_t* ms, const BYTE* const ip)
+{
+    const BYTE* const base = ms->window.base;
+    U32 const target = (U32)(ip - base);
+    U32* const hashTable = ms->hashTable;
+    U32* const chainTable = ms->chainTable;
+    U32 const chainSize = 1 << ms->cParams.chainLog;
+    U32 idx = ms->nextToUpdate;
+    U32 const minChain = chainSize < target ? target - chainSize : idx;
+    U32 const bucketSize = 1 << ZSTD_LAZY_DDSS_BUCKET_LOG;
+    U32 const cacheSize = bucketSize - 1;
+    U32 const chainAttempts = (1 << ms->cParams.searchLog) - cacheSize;
+    U32 const chainLimit = chainAttempts > 255 ? 255 : chainAttempts;
+
+    /* We know the hashtable is oversized by a factor of `bucketSize`.
+     * We are going to temporarily pretend `bucketSize == 1`, keeping only a
+     * single entry. We will use the rest of the space to construct a temporary
+     * chaintable.
+     */
+    U32 const hashLog = ms->cParams.hashLog - ZSTD_LAZY_DDSS_BUCKET_LOG;
+    U32* const tmpHashTable = hashTable;
+    U32* const tmpChainTable = hashTable + ((size_t)1 << hashLog);
+    U32 const tmpChainSize = ((1 << ZSTD_LAZY_DDSS_BUCKET_LOG) - 1) << hashLog;
+    U32 const tmpMinChain = tmpChainSize < target ? target - tmpChainSize : idx;
+    U32 hashIdx;
+
+    assert(ms->cParams.chainLog <= 24);
+    assert(ms->cParams.hashLog > ms->cParams.chainLog);
+    assert(idx != 0);
+    assert(tmpMinChain <= minChain);
+
+    /* fill conventional hash table and conventional chain table */
+    for ( ; idx < target; idx++) {
+        U32 const h = (U32)ZSTD_hashPtr(base + idx, hashLog, ms->cParams.minMatch);
+        if (idx >= tmpMinChain) {
+            tmpChainTable[idx - tmpMinChain] = hashTable[h];
+        }
+        tmpHashTable[h] = idx;
+    }
+
+    /* sort chains into ddss chain table */
+    {
+        U32 chainPos = 0;
+        for (hashIdx = 0; hashIdx < (1U << hashLog); hashIdx++) {
+            U32 count;
+            U32 countBeyondMinChain = 0;
+            U32 i = tmpHashTable[hashIdx];
+            for (count = 0; i >= tmpMinChain && count < cacheSize; count++) {
+                /* skip through the chain to the first position that won't be
+                 * in the hash cache bucket */
+                if (i < minChain) {
+                    countBeyondMinChain++;
+                }
+                i = tmpChainTable[i - tmpMinChain];
+            }
+            if (count == cacheSize) {
+                for (count = 0; count < chainLimit;) {
+                    if (i < minChain) {
+                        if (!i || ++countBeyondMinChain > cacheSize) {
+                            /* only allow pulling `cacheSize` number of entries
+                             * into the cache or chainTable beyond `minChain`,
+                             * to replace the entries pulled out of the
+                             * chainTable into the cache. This lets us reach
+                             * back further without increasing the total number
+                             * of entries in the chainTable, guaranteeing the
+                             * DDSS chain table will fit into the space
+                             * allocated for the regular one. */
+                            break;
+                        }
+                    }
+                    chainTable[chainPos++] = i;
+                    count++;
+                    if (i < tmpMinChain) {
+                        break;
+                    }
+                    i = tmpChainTable[i - tmpMinChain];
+                }
+            } else {
+                count = 0;
+            }
+            if (count) {
+                tmpHashTable[hashIdx] = ((chainPos - count) << 8) + count;
+            } else {
+                tmpHashTable[hashIdx] = 0;
+            }
+        }
+        assert(chainPos <= chainSize); /* I believe this is guaranteed... */
+    }
+
+    /* move chain pointers into the last entry of each hash bucket */
+    for (hashIdx = (1 << hashLog); hashIdx; ) {
+        U32 const bucketIdx = --hashIdx << ZSTD_LAZY_DDSS_BUCKET_LOG;
+        U32 const chainPackedPointer = tmpHashTable[hashIdx];
+        U32 i;
+        for (i = 0; i < cacheSize; i++) {
+            hashTable[bucketIdx + i] = 0;
+        }
+        hashTable[bucketIdx + bucketSize - 1] = chainPackedPointer;
+    }
+
+    /* fill the buckets of the hash table */
+    for (idx = ms->nextToUpdate; idx < target; idx++) {
+        U32 const h = (U32)ZSTD_hashPtr(base + idx, hashLog, ms->cParams.minMatch)
+                   << ZSTD_LAZY_DDSS_BUCKET_LOG;
+        U32 i;
+        /* Shift hash cache down 1. */
+        for (i = cacheSize - 1; i; i--)
+            hashTable[h + i] = hashTable[h + i - 1];
+        hashTable[h] = idx;
+    }
+
+    ms->nextToUpdate = target;
+}
+
+/* Returns the longest match length found in the dedicated dict search structure.
+ * If none are longer than the argument ml, then ml will be returned.
+ */
+FORCE_INLINE_TEMPLATE
+size_t ZSTD_dedicatedDictSearch_lazy_search(size_t* offsetPtr, size_t ml, U32 nbAttempts,
+                                            const ZSTD_matchState_t* const dms,
+                                            const BYTE* const ip, const BYTE* const iLimit,
+                                            const BYTE* const prefixStart, const U32 curr,
+                                            const U32 dictLimit, const size_t ddsIdx) {
+    const U32 ddsLowestIndex  = dms->window.dictLimit;
+    const BYTE* const ddsBase = dms->window.base;
+    const BYTE* const ddsEnd  = dms->window.nextSrc;
+    const U32 ddsSize         = (U32)(ddsEnd - ddsBase);
+    const U32 ddsIndexDelta   = dictLimit - ddsSize;
+    const U32 bucketSize      = (1 << ZSTD_LAZY_DDSS_BUCKET_LOG);
+    const U32 bucketLimit     = nbAttempts < bucketSize - 1 ? nbAttempts : bucketSize - 1;
+    U32 ddsAttempt;
+    U32 matchIndex;
+
+    for (ddsAttempt = 0; ddsAttempt < bucketSize - 1; ddsAttempt++) {
+        PREFETCH_L1(ddsBase + dms->hashTable[ddsIdx + ddsAttempt]);
+    }
+
+    {
+        U32 const chainPackedPointer = dms->hashTable[ddsIdx + bucketSize - 1];
+        U32 const chainIndex = chainPackedPointer >> 8;
+
+        PREFETCH_L1(&dms->chainTable[chainIndex]);
+    }
+
+    for (ddsAttempt = 0; ddsAttempt < bucketLimit; ddsAttempt++) {
+        size_t currentMl=0;
+        const BYTE* match;
+        matchIndex = dms->hashTable[ddsIdx + ddsAttempt];
+        match = ddsBase + matchIndex;
+
+        if (!matchIndex) {
+            return ml;
+        }
+
+        /* guaranteed by table construction */
+        (void)ddsLowestIndex;
+        assert(matchIndex >= ddsLowestIndex);
+        assert(match+4 <= ddsEnd);
+        if (MEM_read32(match) == MEM_read32(ip)) {
+            /* assumption : matchIndex <= dictLimit-4 (by table construction) */
+            currentMl = ZSTD_count_2segments(ip+4, match+4, iLimit, ddsEnd, prefixStart) + 4;
+        }
+
+        /* save best solution */
+        if (currentMl > ml) {
+            ml = currentMl;
+            *offsetPtr = curr - (matchIndex + ddsIndexDelta) + ZSTD_REP_MOVE;
+            if (ip+currentMl == iLimit) {
+                /* best possible, avoids read overflow on next attempt */
+                return ml;
+            }
+        }
+    }
+
+    {
+        U32 const chainPackedPointer = dms->hashTable[ddsIdx + bucketSize - 1];
+        U32 chainIndex = chainPackedPointer >> 8;
+        U32 const chainLength = chainPackedPointer & 0xFF;
+        U32 const chainAttempts = nbAttempts - ddsAttempt;
+        U32 const chainLimit = chainAttempts > chainLength ? chainLength : chainAttempts;
+        U32 chainAttempt;
+
+        for (chainAttempt = 0 ; chainAttempt < chainLimit; chainAttempt++) {
+            PREFETCH_L1(ddsBase + dms->chainTable[chainIndex + chainAttempt]);
+        }
+
+        for (chainAttempt = 0 ; chainAttempt < chainLimit; chainAttempt++, chainIndex++) {
+            size_t currentMl=0;
+            const BYTE* match;
+            matchIndex = dms->chainTable[chainIndex];
+            match = ddsBase + matchIndex;
+
+            /* guaranteed by table construction */
+            assert(matchIndex >= ddsLowestIndex);
+            assert(match+4 <= ddsEnd);
+            if (MEM_read32(match) == MEM_read32(ip)) {
+                /* assumption : matchIndex <= dictLimit-4 (by table construction) */
+                currentMl = ZSTD_count_2segments(ip+4, match+4, iLimit, ddsEnd, prefixStart) + 4;
+            }
+
+            /* save best solution */
+            if (currentMl > ml) {
+                ml = currentMl;
+                *offsetPtr = curr - (matchIndex + ddsIndexDelta) + ZSTD_REP_MOVE;
+                if (ip+currentMl == iLimit) break; /* best possible, avoids read overflow on next attempt */
+            }
+        }
+    }
+    return ml;
+}
+
+
+/* *********************************
+*  Hash Chain
+***********************************/
+#define NEXT_IN_CHAIN(d, mask)   chainTable[(d) & (mask)]
+
+/* Update chains up to ip (excluded)
+   Assumption : always within prefix (i.e. not within extDict) */
+FORCE_INLINE_TEMPLATE U32 ZSTD_insertAndFindFirstIndex_internal(
+                        ZSTD_matchState_t* ms,
+                        const ZSTD_compressionParameters* const cParams,
+                        const BYTE* ip, U32 const mls)
+{
+    U32* const hashTable  = ms->hashTable;
+    const U32 hashLog = cParams->hashLog;
+    U32* const chainTable = ms->chainTable;
+    const U32 chainMask = (1 << cParams->chainLog) - 1;
+    const BYTE* const base = ms->window.base;
+    const U32 target = (U32)(ip - base);
+    U32 idx = ms->nextToUpdate;
+
+    while(idx < target) { /* catch up */
+        size_t const h = ZSTD_hashPtr(base+idx, hashLog, mls);
+        NEXT_IN_CHAIN(idx, chainMask) = hashTable[h];
+        hashTable[h] = idx;
+        idx++;
+    }
+
+    ms->nextToUpdate = target;
+    return hashTable[ZSTD_hashPtr(ip, hashLog, mls)];
+}
+
+U32 ZSTD_insertAndFindFirstIndex(ZSTD_matchState_t* ms, const BYTE* ip) {
+    const ZSTD_compressionParameters* const cParams = &ms->cParams;
+    return ZSTD_insertAndFindFirstIndex_internal(ms, cParams, ip, ms->cParams.minMatch);
+}
+
+/* inlining is important to hardwire a hot branch (template emulation) */
+FORCE_INLINE_TEMPLATE
+size_t ZSTD_HcFindBestMatch_generic (
+                        ZSTD_matchState_t* ms,
+                        const BYTE* const ip, const BYTE* const iLimit,
+                        size_t* offsetPtr,
+                        const U32 mls, const ZSTD_dictMode_e dictMode)
+{
+    const ZSTD_compressionParameters* const cParams = &ms->cParams;
+    U32* const chainTable = ms->chainTable;
+    const U32 chainSize = (1 << cParams->chainLog);
+    const U32 chainMask = chainSize-1;
+    const BYTE* const base = ms->window.base;
+    const BYTE* const dictBase = ms->window.dictBase;
+    const U32 dictLimit = ms->window.dictLimit;
+    const BYTE* const prefixStart = base + dictLimit;
+    const BYTE* const dictEnd = dictBase + dictLimit;
+    const U32 curr = (U32)(ip-base);
+    const U32 maxDistance = 1U << cParams->windowLog;
+    const U32 lowestValid = ms->window.lowLimit;
+    const U32 withinMaxDistance = (curr - lowestValid > maxDistance) ? curr - maxDistance : lowestValid;
+    const U32 isDictionary = (ms->loadedDictEnd != 0);
+    const U32 lowLimit = isDictionary ? lowestValid : withinMaxDistance;
+    const U32 minChain = curr > chainSize ? curr - chainSize : 0;
+    U32 nbAttempts = 1U << cParams->searchLog;
+    size_t ml=4-1;
+
+    const ZSTD_matchState_t* const dms = ms->dictMatchState;
+    const U32 ddsHashLog = dictMode == ZSTD_dedicatedDictSearch
+                         ? dms->cParams.hashLog - ZSTD_LAZY_DDSS_BUCKET_LOG : 0;
+    const size_t ddsIdx = dictMode == ZSTD_dedicatedDictSearch
+                        ? ZSTD_hashPtr(ip, ddsHashLog, mls) << ZSTD_LAZY_DDSS_BUCKET_LOG : 0;
+
+    U32 matchIndex;
+
+    if (dictMode == ZSTD_dedicatedDictSearch) {
+        const U32* entry = &dms->hashTable[ddsIdx];
+        PREFETCH_L1(entry);
+    }
+
+    /* HC4 match finder */
+    matchIndex = ZSTD_insertAndFindFirstIndex_internal(ms, cParams, ip, mls);
+
+    for ( ; (matchIndex>=lowLimit) & (nbAttempts>0) ; nbAttempts--) {
+        size_t currentMl=0;
+        if ((dictMode != ZSTD_extDict) || matchIndex >= dictLimit) {
+            const BYTE* const match = base + matchIndex;
+            assert(matchIndex >= dictLimit);   /* ensures this is true if dictMode != ZSTD_extDict */
+            if (match[ml] == ip[ml])   /* potentially better */
+                currentMl = ZSTD_count(ip, match, iLimit);
+        } else {
+            const BYTE* const match = dictBase + matchIndex;
+            assert(match+4 <= dictEnd);
+            if (MEM_read32(match) == MEM_read32(ip))   /* assumption : matchIndex <= dictLimit-4 (by table construction) */
+                currentMl = ZSTD_count_2segments(ip+4, match+4, iLimit, dictEnd, prefixStart) + 4;
+        }
+
+        /* save best solution */
+        if (currentMl > ml) {
+            ml = currentMl;
+            *offsetPtr = curr - matchIndex + ZSTD_REP_MOVE;
+            if (ip+currentMl == iLimit) break; /* best possible, avoids read overflow on next attempt */
+        }
+
+        if (matchIndex <= minChain) break;
+        matchIndex = NEXT_IN_CHAIN(matchIndex, chainMask);
+    }
+
+    if (dictMode == ZSTD_dedicatedDictSearch) {
+        ml = ZSTD_dedicatedDictSearch_lazy_search(offsetPtr, ml, nbAttempts, dms,
+                                                  ip, iLimit, prefixStart, curr, dictLimit, ddsIdx);
+    } else if (dictMode == ZSTD_dictMatchState) {
+        const U32* const dmsChainTable = dms->chainTable;
+        const U32 dmsChainSize         = (1 << dms->cParams.chainLog);
+        const U32 dmsChainMask         = dmsChainSize - 1;
+        const U32 dmsLowestIndex       = dms->window.dictLimit;
+        const BYTE* const dmsBase      = dms->window.base;
+        const BYTE* const dmsEnd       = dms->window.nextSrc;
+        const U32 dmsSize              = (U32)(dmsEnd - dmsBase);
+        const U32 dmsIndexDelta        = dictLimit - dmsSize;
+        const U32 dmsMinChain = dmsSize > dmsChainSize ? dmsSize - dmsChainSize : 0;
+
+        matchIndex = dms->hashTable[ZSTD_hashPtr(ip, dms->cParams.hashLog, mls)];
+
+        for ( ; (matchIndex>=dmsLowestIndex) & (nbAttempts>0) ; nbAttempts--) {
+            size_t currentMl=0;
+            const BYTE* const match = dmsBase + matchIndex;
+            assert(match+4 <= dmsEnd);
+            if (MEM_read32(match) == MEM_read32(ip))   /* assumption : matchIndex <= dictLimit-4 (by table construction) */
+                currentMl = ZSTD_count_2segments(ip+4, match+4, iLimit, dmsEnd, prefixStart) + 4;
+
+            /* save best solution */
+            if (currentMl > ml) {
+                ml = currentMl;
+                *offsetPtr = curr - (matchIndex + dmsIndexDelta) + ZSTD_REP_MOVE;
+                if (ip+currentMl == iLimit) break; /* best possible, avoids read overflow on next attempt */
+            }
+
+            if (matchIndex <= dmsMinChain) break;
+
+            matchIndex = dmsChainTable[matchIndex & dmsChainMask];
+        }
+    }
+
+    return ml;
+}
+
+
+FORCE_INLINE_TEMPLATE size_t ZSTD_HcFindBestMatch_selectMLS (
+                        ZSTD_matchState_t* ms,
+                        const BYTE* ip, const BYTE* const iLimit,
+                        size_t* offsetPtr)
+{
+    switch(ms->cParams.minMatch)
+    {
+    default : /* includes case 3 */
+    case 4 : return ZSTD_HcFindBestMatch_generic(ms, ip, iLimit, offsetPtr, 4, ZSTD_noDict);
+    case 5 : return ZSTD_HcFindBestMatch_generic(ms, ip, iLimit, offsetPtr, 5, ZSTD_noDict);
+    case 7 :
+    case 6 : return ZSTD_HcFindBestMatch_generic(ms, ip, iLimit, offsetPtr, 6, ZSTD_noDict);
+    }
+}
+
+
+static size_t ZSTD_HcFindBestMatch_dictMatchState_selectMLS (
+                        ZSTD_matchState_t* ms,
+                        const BYTE* ip, const BYTE* const iLimit,
+                        size_t* offsetPtr)
+{
+    switch(ms->cParams.minMatch)
+    {
+    default : /* includes case 3 */
+    case 4 : return ZSTD_HcFindBestMatch_generic(ms, ip, iLimit, offsetPtr, 4, ZSTD_dictMatchState);
+    case 5 : return ZSTD_HcFindBestMatch_generic(ms, ip, iLimit, offsetPtr, 5, ZSTD_dictMatchState);
+    case 7 :
+    case 6 : return ZSTD_HcFindBestMatch_generic(ms, ip, iLimit, offsetPtr, 6, ZSTD_dictMatchState);
+    }
+}
+
+
+static size_t ZSTD_HcFindBestMatch_dedicatedDictSearch_selectMLS (
+                        ZSTD_matchState_t* ms,
+                        const BYTE* ip, const BYTE* const iLimit,
+                        size_t* offsetPtr)
+{
+    switch(ms->cParams.minMatch)
+    {
+    default : /* includes case 3 */
+    case 4 : return ZSTD_HcFindBestMatch_generic(ms, ip, iLimit, offsetPtr, 4, ZSTD_dedicatedDictSearch);
+    case 5 : return ZSTD_HcFindBestMatch_generic(ms, ip, iLimit, offsetPtr, 5, ZSTD_dedicatedDictSearch);
+    case 7 :
+    case 6 : return ZSTD_HcFindBestMatch_generic(ms, ip, iLimit, offsetPtr, 6, ZSTD_dedicatedDictSearch);
+    }
+}
+
+
+FORCE_INLINE_TEMPLATE size_t ZSTD_HcFindBestMatch_extDict_selectMLS (
+                        ZSTD_matchState_t* ms,
+                        const BYTE* ip, const BYTE* const iLimit,
+                        size_t* offsetPtr)
+{
+    switch(ms->cParams.minMatch)
+    {
+    default : /* includes case 3 */
+    case 4 : return ZSTD_HcFindBestMatch_generic(ms, ip, iLimit, offsetPtr, 4, ZSTD_extDict);
+    case 5 : return ZSTD_HcFindBestMatch_generic(ms, ip, iLimit, offsetPtr, 5, ZSTD_extDict);
+    case 7 :
+    case 6 : return ZSTD_HcFindBestMatch_generic(ms, ip, iLimit, offsetPtr, 6, ZSTD_extDict);
+    }
+}
+
+/* *********************************
+* (SIMD) Row-based matchfinder
+***********************************/
+/* Constants for row-based hash */
+#define ZSTD_ROW_HASH_TAG_OFFSET 1                               /* byte offset of hashes in the match state's tagTable from the beginning of a row */
+#define ZSTD_ROW_HASH_TAG_BITS 8                                 /* nb bits to use for the tag */
+#define ZSTD_ROW_HASH_TAG_MASK ((1u << ZSTD_ROW_HASH_TAG_BITS) - 1)
+
+#define ZSTD_ROW_HASH_CACHE_MASK (ZSTD_ROW_HASH_CACHE_SIZE - 1)
+
+typedef U32 ZSTD_VecMask;   /* Clarifies when we are interacting with a U32 representing a mask of matches */
+
+#if !defined(ZSTD_NO_INTRINSICS) && defined(__SSE2__) /* SIMD SSE version */
+
+#include <emmintrin.h>
+typedef __m128i ZSTD_Vec128;
+
+/* Returns a 128-bit container with 128-bits from src */
+static ZSTD_Vec128 ZSTD_Vec128_read(const void* const src) {
+  return _mm_loadu_si128((ZSTD_Vec128 const*)src);
+}
+
+/* Returns a ZSTD_Vec128 with the byte "val" packed 16 times */
+static ZSTD_Vec128 ZSTD_Vec128_set8(BYTE val) {
+  return _mm_set1_epi8((char)val);
+}
+
+/* Do byte-by-byte comparison result of x and y. Then collapse 128-bit resultant mask
+ * into a 32-bit mask that is the MSB of each byte.
+ * */
+static ZSTD_VecMask ZSTD_Vec128_cmpMask8(ZSTD_Vec128 x, ZSTD_Vec128 y) {
+  return (ZSTD_VecMask)_mm_movemask_epi8(_mm_cmpeq_epi8(x, y));
+}
+
+typedef struct {
+  __m128i fst;
+  __m128i snd;
+} ZSTD_Vec256;
+
+static ZSTD_Vec256 ZSTD_Vec256_read(const void* const ptr) {
+  ZSTD_Vec256 v;
+  v.fst = ZSTD_Vec128_read(ptr);
+  v.snd = ZSTD_Vec128_read((ZSTD_Vec128 const*)ptr + 1);
+  return v;
+}
+
+static ZSTD_Vec256 ZSTD_Vec256_set8(BYTE val) {
+  ZSTD_Vec256 v;
+  v.fst = ZSTD_Vec128_set8(val);
+  v.snd = ZSTD_Vec128_set8(val);
+  return v;
+}
+
+static ZSTD_VecMask ZSTD_Vec256_cmpMask8(ZSTD_Vec256 x, ZSTD_Vec256 y) {
+  ZSTD_VecMask fstMask;
+  ZSTD_VecMask sndMask;
+  fstMask = ZSTD_Vec128_cmpMask8(x.fst, y.fst);
+  sndMask = ZSTD_Vec128_cmpMask8(x.snd, y.snd);
+  return fstMask | (sndMask << 16);
+}
+
+#elif !defined(ZSTD_NO_INTRINSICS) && defined(__ARM_NEON) /* SIMD ARM NEON Version */
+
+#include <arm_neon.h>
+typedef uint8x16_t ZSTD_Vec128;
+
+static ZSTD_Vec128 ZSTD_Vec128_read(const void* const src) {
+  return vld1q_u8((const BYTE* const)src);
+}
+
+static ZSTD_Vec128 ZSTD_Vec128_set8(BYTE val) {
+  return vdupq_n_u8(val);
+}
+
+/* Mimics '_mm_movemask_epi8()' from SSE */
+static U32 ZSTD_vmovmaskq_u8(ZSTD_Vec128 val) {
+    /* Shift out everything but the MSB bits in each byte */
+    uint16x8_t highBits = vreinterpretq_u16_u8(vshrq_n_u8(val, 7));
+    /* Merge the even lanes together with vsra (right shift and add) */
+    uint32x4_t paired16 = vreinterpretq_u32_u16(vsraq_n_u16(highBits, highBits, 7));
+    uint64x2_t paired32 = vreinterpretq_u64_u32(vsraq_n_u32(paired16, paired16, 14));
+    uint8x16_t paired64 = vreinterpretq_u8_u64(vsraq_n_u64(paired32, paired32, 28));
+    /* Extract the low 8 bits from each lane, merge */
+    return vgetq_lane_u8(paired64, 0) | ((U32)vgetq_lane_u8(paired64, 8) << 8);
+}
+
+static ZSTD_VecMask ZSTD_Vec128_cmpMask8(ZSTD_Vec128 x, ZSTD_Vec128 y) {
+  return (ZSTD_VecMask)ZSTD_vmovmaskq_u8(vceqq_u8(x, y));
+}
+
+typedef struct {
+    uint8x16_t fst;
+    uint8x16_t snd;
+} ZSTD_Vec256;
+
+static ZSTD_Vec256 ZSTD_Vec256_read(const void* const ptr) {
+  ZSTD_Vec256 v;
+  v.fst = ZSTD_Vec128_read(ptr);
+  v.snd = ZSTD_Vec128_read((ZSTD_Vec128 const*)ptr + 1);
+  return v;
+}
+
+static ZSTD_Vec256 ZSTD_Vec256_set8(BYTE val) {
+  ZSTD_Vec256 v;
+  v.fst = ZSTD_Vec128_set8(val);
+  v.snd = ZSTD_Vec128_set8(val);
+  return v;
+}
+
+static ZSTD_VecMask ZSTD_Vec256_cmpMask8(ZSTD_Vec256 x, ZSTD_Vec256 y) {
+  ZSTD_VecMask fstMask;
+  ZSTD_VecMask sndMask;
+  fstMask = ZSTD_Vec128_cmpMask8(x.fst, y.fst);
+  sndMask = ZSTD_Vec128_cmpMask8(x.snd, y.snd);
+  return fstMask | (sndMask << 16);
+}
+
+#else /* Scalar fallback version */
+
+#define VEC128_NB_SIZE_T (16 / sizeof(size_t))
+typedef struct {
+    size_t vec[VEC128_NB_SIZE_T];
+} ZSTD_Vec128;
+
+static ZSTD_Vec128 ZSTD_Vec128_read(const void* const src) {
+    ZSTD_Vec128 ret;
+    ZSTD_memcpy(ret.vec, src, VEC128_NB_SIZE_T*sizeof(size_t));
+    return ret;
+}
+
+static ZSTD_Vec128 ZSTD_Vec128_set8(BYTE val) {
+    ZSTD_Vec128 ret = { {0} };
+    int startBit = sizeof(size_t) * 8 - 8;
+    for (;startBit >= 0; startBit -= 8) {
+        unsigned j = 0;
+        for (;j < VEC128_NB_SIZE_T; ++j) {
+            ret.vec[j] |= ((size_t)val << startBit);
+        }
+    }
+    return ret;
+}
+
+/* Compare x to y, byte by byte, generating a "matches" bitfield */
+static ZSTD_VecMask ZSTD_Vec128_cmpMask8(ZSTD_Vec128 x, ZSTD_Vec128 y) {
+    ZSTD_VecMask res = 0;
+    unsigned i = 0;
+    unsigned l = 0;
+    for (; i < VEC128_NB_SIZE_T; ++i) {
+        const size_t cmp1 = x.vec[i];
+        const size_t cmp2 = y.vec[i];
+        unsigned j = 0;
+        for (; j < sizeof(size_t); ++j, ++l) {
+            if (((cmp1 >> j*8) & 0xFF) == ((cmp2 >> j*8) & 0xFF)) {
+                res |= ((U32)1 << (j+i*sizeof(size_t)));
+            }
+        }
+    }
+    return res;
+}
+
+#define VEC256_NB_SIZE_T 2*VEC128_NB_SIZE_T
+typedef struct {
+    size_t vec[VEC256_NB_SIZE_T];
+} ZSTD_Vec256;
+
+static ZSTD_Vec256 ZSTD_Vec256_read(const void* const src) {
+    ZSTD_Vec256 ret;
+    ZSTD_memcpy(ret.vec, src, VEC256_NB_SIZE_T*sizeof(size_t));
+    return ret;
+}
+
+static ZSTD_Vec256 ZSTD_Vec256_set8(BYTE val) {
+    ZSTD_Vec256 ret = { {0} };
+    int startBit = sizeof(size_t) * 8 - 8;
+    for (;startBit >= 0; startBit -= 8) {
+        unsigned j = 0;
+        for (;j < VEC256_NB_SIZE_T; ++j) {
+            ret.vec[j] |= ((size_t)val << startBit);
+        }
+    }
+    return ret;
+}
+
+/* Compare x to y, byte by byte, generating a "matches" bitfield */
+static ZSTD_VecMask ZSTD_Vec256_cmpMask8(ZSTD_Vec256 x, ZSTD_Vec256 y) {
+    ZSTD_VecMask res = 0;
+    unsigned i = 0;
+    unsigned l = 0;
+    for (; i < VEC256_NB_SIZE_T; ++i) {
+        const size_t cmp1 = x.vec[i];
+        const size_t cmp2 = y.vec[i];
+        unsigned j = 0;
+        for (; j < sizeof(size_t); ++j, ++l) {
+            if (((cmp1 >> j*8) & 0xFF) == ((cmp2 >> j*8) & 0xFF)) {
+                res |= ((U32)1 << (j+i*sizeof(size_t)));
+            }
+        }
+    }
+    return res;
+}
+
+#endif /* !defined(ZSTD_NO_INTRINSICS) && defined(__SSE2__) */
+
+/* ZSTD_VecMask_next():
+ * Starting from the LSB, returns the idx of the next non-zero bit.
+ * Basically counting the nb of trailing zeroes.
+ */
+static U32 ZSTD_VecMask_next(ZSTD_VecMask val) {
+#   if defined(_MSC_VER)   /* Visual */
+    unsigned long r=0;
+    return _BitScanForward(&r, val) ? (U32)r : 0;
+#   elif defined(__GNUC__) && (__GNUC__ >= 3)
+    return (U32)__builtin_ctz(val);
+#   else
+    /* Software ctz version: http://graphics.stanford.edu/~seander/bithacks.html#ZerosOnRightMultLookup */
+    static const U32 multiplyDeBruijnBitPosition[32] =
+    {
+        0, 1, 28, 2, 29, 14, 24, 3, 30, 22, 20, 15, 25, 17, 4, 8,
+		31, 27, 13, 23, 21, 19, 16, 7, 26, 12, 18, 6, 11, 5, 10, 9
+    };
+	return multiplyDeBruijnBitPosition[((U32)((v & -(int)v) * 0x077CB531U)) >> 27];
+#   endif
+}
+
+/* ZSTD_VecMask_rotateRight():
+ * Rotates a bitfield to the right by "rotation" bits.
+ * If the rotation is greater than totalBits, the returned mask is 0.
+ */
+FORCE_INLINE_TEMPLATE ZSTD_VecMask
+ZSTD_VecMask_rotateRight(ZSTD_VecMask mask, U32 const rotation, U32 const totalBits) {
+  if (rotation == 0)
+    return mask;
+  switch (totalBits) {
+    default:
+      assert(0);
+    case 16:
+      return (mask >> rotation) | (U16)(mask << (16 - rotation));
+    case 32:
+      return (mask >> rotation) | (U32)(mask << (32 - rotation));
+  }
+}
+
+/* ZSTD_row_nextIndex():
+ * Returns the next index to insert at within a tagTable row, and updates the "head"
+ * value to reflect the update. Essentially cycles backwards from [0, {entries per row})
+ */
+FORCE_INLINE_TEMPLATE U32 ZSTD_row_nextIndex(BYTE* const tagRow, U32 const rowMask) {
+  U32 const next = (*tagRow - 1) & rowMask;
+  *tagRow = (BYTE)next;
+  return next;
+}
+
+/* ZSTD_isAligned():
+ * Checks that a pointer is aligned to "align" bytes which must be a power of 2.
+ */
+MEM_STATIC int ZSTD_isAligned(void const* ptr, size_t align) {
+    assert((align & (align - 1)) == 0);
+    return (((size_t)ptr) & (align - 1)) == 0;
+}
+
+/* ZSTD_row_prefetch():
+ * Performs prefetching for the hashTable and tagTable at a given row.
+ */
+FORCE_INLINE_TEMPLATE void ZSTD_row_prefetch(U32 const* hashTable, U16 const* tagTable, U32 const relRow, U32 const rowLog) {
+    PREFETCH_L1(hashTable + relRow);
+    if (rowLog == 5) {
+        PREFETCH_L1(hashTable + relRow + 16);
+    }
+    PREFETCH_L1(tagTable + relRow);
+    assert(rowLog == 4 || rowLog == 5);
+    assert(ZSTD_isAligned(hashTable + relRow, 64));                 /* prefetched hash row always 64-byte aligned */
+    assert(ZSTD_isAligned(tagTable + relRow, (size_t)1 << rowLog)); /* prefetched tagRow sits on a multiple of 32 or 64 bytes */
+}
+
+/* ZSTD_row_fillHashCache():
+ * Fill up the hash cache starting at idx, prefetching up to ZSTD_ROW_HASH_CACHE_SIZE entries,
+ * but not beyond iLimit.
+ */
+static void ZSTD_row_fillHashCache(ZSTD_matchState_t* ms, const BYTE* base,
+                                   U32 const rowLog, U32 const mls,
+                                   U32 idx, const BYTE* const iLimit)
+{
+    U32 const* const hashTable = ms->hashTable;
+    U16 const* const tagTable = ms->tagTable;
+    U32 const hashLog = ms->rowHashLog;
+    U32 const maxElemsToPrefetch = (base + idx) > iLimit ? 0 : (U32)(iLimit - (base + idx) + 1);
+    U32 const lim = idx + MIN(ZSTD_ROW_HASH_CACHE_SIZE, maxElemsToPrefetch);
+
+    for (; idx < lim; ++idx) {
+        U32 const hash = (U32)ZSTD_hashPtr(base + idx, hashLog + ZSTD_ROW_HASH_TAG_BITS, mls);
+        U32 const row = (hash >> ZSTD_ROW_HASH_TAG_BITS) << rowLog;
+        ZSTD_row_prefetch(hashTable, tagTable, row, rowLog);
+        ms->hashCache[idx & ZSTD_ROW_HASH_CACHE_MASK] = hash;
+    }
+
+    DEBUGLOG(6, "ZSTD_row_fillHashCache(): [%u %u %u %u %u %u %u %u]", ms->hashCache[0], ms->hashCache[1],
+                                                     ms->hashCache[2], ms->hashCache[3], ms->hashCache[4],
+                                                     ms->hashCache[5], ms->hashCache[6], ms->hashCache[7]);
+}
+
+/* ZSTD_row_nextCachedHash():
+ * Returns the hash of base + idx, and replaces the hash in the hash cache with the byte at
+ * base + idx + ZSTD_ROW_HASH_CACHE_SIZE. Also prefetches the appropriate rows from hashTable and tagTable.
+ */
+FORCE_INLINE_TEMPLATE U32 ZSTD_row_nextCachedHash(U32* cache, U32 const* hashTable,
+                                                  U16 const* tagTable, BYTE const* base,
+                                                  U32 idx, U32 const hashLog,
+                                                  U32 const rowLog, U32 const mls)
+{
+    U32 const newHash = (U32)ZSTD_hashPtr(base+idx+ZSTD_ROW_HASH_CACHE_SIZE, hashLog + ZSTD_ROW_HASH_TAG_BITS, mls);
+    U32 const row = (newHash >> ZSTD_ROW_HASH_TAG_BITS) << rowLog;
+    ZSTD_row_prefetch(hashTable, tagTable, row, rowLog);
+    {   U32 const hash = cache[idx & ZSTD_ROW_HASH_CACHE_MASK];
+        cache[idx & ZSTD_ROW_HASH_CACHE_MASK] = newHash;
+        return hash;
+    }
+}
+
+/* ZSTD_row_update_internal():
+ * Inserts the byte at ip into the appropriate position in the hash table.
+ * Determines the relative row, and the position within the {16, 32} entry row to insert at.
+ */
+FORCE_INLINE_TEMPLATE void ZSTD_row_update_internal(ZSTD_matchState_t* ms, const BYTE* ip,
+                                                    U32 const mls, U32 const rowLog,
+                                                    U32 const rowMask, U32 const useCache)
+{
+    U32* const hashTable = ms->hashTable;
+    U16* const tagTable = ms->tagTable;
+    U32 const hashLog = ms->rowHashLog;
+    const BYTE* const base = ms->window.base;
+    const U32 target = (U32)(ip - base);
+    U32 idx = ms->nextToUpdate;
+
+    DEBUGLOG(6, "ZSTD_row_update_internal(): nextToUpdate=%u, current=%u", idx, target);
+    for (; idx < target; ++idx) {
+        U32 const hash = useCache ? ZSTD_row_nextCachedHash(ms->hashCache, hashTable, tagTable, base, idx, hashLog, rowLog, mls)
+                                  : (U32)ZSTD_hashPtr(base + idx, hashLog + ZSTD_ROW_HASH_TAG_BITS, mls);
+        U32 const relRow = (hash >> ZSTD_ROW_HASH_TAG_BITS) << rowLog;
+        U32* const row = hashTable + relRow;
+        BYTE* tagRow = (BYTE*)(tagTable + relRow);  /* Though tagTable is laid out as a table of U16, each tag is only 1 byte.
+                                                       Explicit cast allows us to get exact desired position within each row */
+        U32 const pos = ZSTD_row_nextIndex(tagRow, rowMask);
+
+        assert(hash == ZSTD_hashPtr(base + idx, hashLog + ZSTD_ROW_HASH_TAG_BITS, mls));
+        ((BYTE*)tagRow)[pos + ZSTD_ROW_HASH_TAG_OFFSET] = hash & ZSTD_ROW_HASH_TAG_MASK;
+        row[pos] = idx;
+    }
+    ms->nextToUpdate = target;
+}
+
+/* ZSTD_row_update():
+ * External wrapper for ZSTD_row_update_internal(). Used for filling the hashtable during dictionary
+ * processing.
+ */
+void ZSTD_row_update(ZSTD_matchState_t* const ms, const BYTE* ip) {
+    const U32 rowLog = ms->cParams.searchLog < 5 ? 4 : 5;
+    const U32 rowMask = (1u << rowLog) - 1;
+    const U32 mls = MIN(ms->cParams.minMatch, 6 /* mls caps out at 6 */);
+
+    DEBUGLOG(5, "ZSTD_row_update(), rowLog=%u", rowLog);
+    ZSTD_row_update_internal(ms, ip, mls, rowLog, rowMask, 0 /* dont use cache */);
+}
+
+/* Returns a ZSTD_VecMask (U32) that has the nth bit set to 1 if the newly-computed "tag" matches
+ * the hash at the nth position in a row of the tagTable.
+ */
+FORCE_INLINE_TEMPLATE
+ZSTD_VecMask ZSTD_row_getMatchMask(const BYTE* const tagRow, const BYTE tag, const U32 head, const U32 rowEntries) {
+    ZSTD_VecMask matches = 0;
+    if (rowEntries == 16) {
+        ZSTD_Vec128 hashes        = ZSTD_Vec128_read(tagRow + ZSTD_ROW_HASH_TAG_OFFSET);
+        ZSTD_Vec128 expandedTags  = ZSTD_Vec128_set8(tag);
+        matches                   = ZSTD_Vec128_cmpMask8(hashes, expandedTags);
+    } else if (rowEntries == 32) {
+        ZSTD_Vec256 hashes        = ZSTD_Vec256_read(tagRow + ZSTD_ROW_HASH_TAG_OFFSET);
+        ZSTD_Vec256 expandedTags  = ZSTD_Vec256_set8(tag);
+        matches                   = ZSTD_Vec256_cmpMask8(hashes, expandedTags);
+    } else {
+        assert(0);
+    }
+    /* Each row is a circular buffer beginning at the value of "head". So we must rotate the "matches" bitfield
+        to match up with the actual layout of the entries within the hashTable */
+    return ZSTD_VecMask_rotateRight(matches, head, rowEntries);
+}
+
+/* The high-level approach of the SIMD row based match finder is as follows:
+ * - Figure out where to insert the new entry:
+ *      - Generate a hash from a byte along with an additional 1-byte "short hash". The additional byte is our "tag"
+ *      - The hashTable is effectively split into groups or "rows" of 16 or 32 entries of U32, and the hash determines
+ *        which row to insert into.
+ *      - Determine the correct position within the row to insert the entry into. Each row of 16 or 32 can
+ *        be considered as a circular buffer with a "head" index that resides in the tagTable.
+ *      - Also insert the "tag" into the equivalent row and position in the tagTable.
+ *          - Note: The tagTable has 17 or 33 1-byte entries per row, due to 16 or 32 tags, and 1 "head" entry.
+ *                  The 17 or 33 entry rows are spaced out to occur every 32 or 64 bytes, respectively,
+ *                  for alignment/performance reasons, leaving some bytes unused.
+ * - Use SIMD to efficiently compare the tags in the tagTable to the 1-byte "short hash" and
+ *   generate a bitfield that we can cycle through to check the collisions in the hash table.
+ * - Pick the longest match.
+ */
+FORCE_INLINE_TEMPLATE
+size_t ZSTD_RowFindBestMatch_generic (
+                        ZSTD_matchState_t* ms,
+                        const BYTE* const ip, const BYTE* const iLimit,
+                        size_t* offsetPtr,
+                        const U32 mls, const ZSTD_dictMode_e dictMode,
+                        const U32 rowLog)
+{
+    U32* const hashTable = ms->hashTable;
+    U16* const tagTable = ms->tagTable;
+    U32* const hashCache = ms->hashCache;
+    const U32 hashLog = ms->rowHashLog;
+    const ZSTD_compressionParameters* const cParams = &ms->cParams;
+    const BYTE* const base = ms->window.base;
+    const BYTE* const dictBase = ms->window.dictBase;
+    const U32 dictLimit = ms->window.dictLimit;
+    const BYTE* const prefixStart = base + dictLimit;
+    const BYTE* const dictEnd = dictBase + dictLimit;
+    const U32 curr = (U32)(ip-base);
+    const U32 maxDistance = 1U << cParams->windowLog;
+    const U32 lowestValid = ms->window.lowLimit;
+    const U32 withinMaxDistance = (curr - lowestValid > maxDistance) ? curr - maxDistance : lowestValid;
+    const U32 isDictionary = (ms->loadedDictEnd != 0);
+    const U32 lowLimit = isDictionary ? lowestValid : withinMaxDistance;
+    const U32 rowEntries = (1U << rowLog);
+    const U32 rowMask = rowEntries - 1;
+    const U32 cappedSearchLog = MIN(cParams->searchLog, rowLog); /* nb of searches is capped at nb entries per row */
+    U32 nbAttempts = 1U << cappedSearchLog;
+    size_t ml=4-1;
+
+    /* DMS/DDS variables that may be referenced laster */
+    const ZSTD_matchState_t* const dms = ms->dictMatchState;
+    size_t ddsIdx;
+    U32 ddsExtraAttempts; /* cctx hash tables are limited in searches, but allow extra searches into DDS */
+    U32 dmsTag;
+    U32* dmsRow;
+    BYTE* dmsTagRow;
+
+    if (dictMode == ZSTD_dedicatedDictSearch) {
+        const U32 ddsHashLog = dms->cParams.hashLog - ZSTD_LAZY_DDSS_BUCKET_LOG;
+        {   /* Prefetch DDS hashtable entry */
+            ddsIdx = ZSTD_hashPtr(ip, ddsHashLog, mls) << ZSTD_LAZY_DDSS_BUCKET_LOG;
+            PREFETCH_L1(&dms->hashTable[ddsIdx]);
+        }
+        ddsExtraAttempts = cParams->searchLog > rowLog ? 1U << (cParams->searchLog - rowLog) : 0;
+    }
+
+    if (dictMode == ZSTD_dictMatchState) {
+        /* Prefetch DMS rows */
+        U32* const dmsHashTable = dms->hashTable;
+        U16* const dmsTagTable = dms->tagTable;
+        U32 const dmsHash = (U32)ZSTD_hashPtr(ip, dms->rowHashLog + ZSTD_ROW_HASH_TAG_BITS, mls);
+        U32 const dmsRelRow = (dmsHash >> ZSTD_ROW_HASH_TAG_BITS) << rowLog;
+        dmsTag = dmsHash & ZSTD_ROW_HASH_TAG_MASK;
+        dmsTagRow = (BYTE*)(dmsTagTable + dmsRelRow);
+        dmsRow = dmsHashTable + dmsRelRow;
+        ZSTD_row_prefetch(dmsHashTable, dmsTagTable, dmsRelRow, rowLog);
+    }
+
+    /* Update the hashTable and tagTable up to (but not including) ip */
+    ZSTD_row_update_internal(ms, ip, mls, rowLog, rowMask, 1 /* useCache */);
+    {   /* Get the hash for ip, compute the appropriate row */
+        U32 const hash = ZSTD_row_nextCachedHash(hashCache, hashTable, tagTable, base, curr, hashLog, rowLog, mls);
+        U32 const relRow = (hash >> ZSTD_ROW_HASH_TAG_BITS) << rowLog;
+        U32 const tag = hash & ZSTD_ROW_HASH_TAG_MASK;
+        U32* const row = hashTable + relRow;
+        BYTE* tagRow = (BYTE*)(tagTable + relRow);
+        U32 const head = *tagRow & rowMask;
+        U32 matchBuffer[32 /* maximum nb entries per row */];
+        size_t numMatches = 0;
+        size_t currMatch = 0;
+        ZSTD_VecMask matches = ZSTD_row_getMatchMask(tagRow, (BYTE)tag, head, rowEntries);
+
+        /* Cycle through the matches and prefetch */
+        for (; (matches > 0) && (nbAttempts > 0); --nbAttempts, matches &= (matches - 1)) {
+            U32 const matchPos = (head + ZSTD_VecMask_next(matches)) & rowMask;
+            U32 const matchIndex = row[matchPos];
+            assert(numMatches < rowEntries);
+            if (matchIndex < lowLimit)
+                break;
+            if ((dictMode != ZSTD_extDict) || matchIndex >= dictLimit) {
+                PREFETCH_L1(base + matchIndex);
+            } else {
+                PREFETCH_L1(dictBase + matchIndex);
+            }
+            matchBuffer[numMatches++] = matchIndex;
+        }
+
+        /* Speed opt: insert current byte into hashtable too. This allows us to avoid one iteration of the loop
+           in ZSTD_row_update_internal() at the next search. */
+        {
+            U32 const pos = ZSTD_row_nextIndex(tagRow, rowMask);
+            tagRow[pos + ZSTD_ROW_HASH_TAG_OFFSET] = (BYTE)tag;
+            row[pos] = ms->nextToUpdate++;
+        }
+
+        /* Return the longest match */
+        for (; currMatch < numMatches; ++currMatch) {
+            U32 const matchIndex = matchBuffer[currMatch];
+            size_t currentMl=0;
+            assert(matchIndex < curr);
+            assert(matchIndex >= lowLimit);
+
+            if ((dictMode != ZSTD_extDict) || matchIndex >= dictLimit) {
+                const BYTE* const match = base + matchIndex;
+                assert(matchIndex >= dictLimit);   /* ensures this is true if dictMode != ZSTD_extDict */
+                if (match[ml] == ip[ml])   /* potentially better */
+                    currentMl = ZSTD_count(ip, match, iLimit);
+            } else {
+                const BYTE* const match = dictBase + matchIndex;
+                assert(match+4 <= dictEnd);
+                if (MEM_read32(match) == MEM_read32(ip))   /* assumption : matchIndex <= dictLimit-4 (by table construction) */
+                    currentMl = ZSTD_count_2segments(ip+4, match+4, iLimit, dictEnd, prefixStart) + 4;
+            }
+
+            /* Save best solution */
+            if (currentMl > ml) {
+                ml = currentMl;
+                *offsetPtr = curr - matchIndex + ZSTD_REP_MOVE;
+                if (ip+currentMl == iLimit) break; /* best possible, avoids read overflow on next attempt */
+            }
+        }
+    }
+
+    if (dictMode == ZSTD_dedicatedDictSearch) {
+        ml = ZSTD_dedicatedDictSearch_lazy_search(offsetPtr, ml, nbAttempts + ddsExtraAttempts, dms,
+                                                  ip, iLimit, prefixStart, curr, dictLimit, ddsIdx);
+    } else if (dictMode == ZSTD_dictMatchState) {
+        /* TODO: Measure and potentially add prefetching to DMS */
+        const U32 dmsLowestIndex       = dms->window.dictLimit;
+        const BYTE* const dmsBase      = dms->window.base;
+        const BYTE* const dmsEnd       = dms->window.nextSrc;
+        const U32 dmsSize              = (U32)(dmsEnd - dmsBase);
+        const U32 dmsIndexDelta        = dictLimit - dmsSize;
+
+        {   U32 const head = *dmsTagRow & rowMask;
+            U32 matchBuffer[32 /* maximum nb row entries */];
+            size_t numMatches = 0;
+            size_t currMatch = 0;
+            ZSTD_VecMask matches = ZSTD_row_getMatchMask(dmsTagRow, (BYTE)dmsTag, head, rowEntries);
+
+            for (; (matches > 0) && (nbAttempts > 0); --nbAttempts, matches &= (matches - 1)) {
+                U32 const matchPos = (head + ZSTD_VecMask_next(matches)) & rowMask;
+                U32 const matchIndex = dmsRow[matchPos];
+                if (matchIndex < dmsLowestIndex)
+                    break;
+                PREFETCH_L1(dmsBase + matchIndex);
+                matchBuffer[numMatches++] = matchIndex;
+            }
+
+            /* Return the longest match */
+            for (; currMatch < numMatches; ++currMatch) {
+                U32 const matchIndex = matchBuffer[currMatch];
+                size_t currentMl=0;
+                assert(matchIndex >= dmsLowestIndex);
+                assert(matchIndex < curr);
+
+                {   const BYTE* const match = dmsBase + matchIndex;
+                    assert(match+4 <= dmsEnd);
+                    if (MEM_read32(match) == MEM_read32(ip))
+                        currentMl = ZSTD_count_2segments(ip+4, match+4, iLimit, dmsEnd, prefixStart) + 4;
+                }
+
+                if (currentMl > ml) {
+                    ml = currentMl;
+                    *offsetPtr = curr - (matchIndex + dmsIndexDelta) + ZSTD_REP_MOVE;
+                    if (ip+currentMl == iLimit) break;
+                }
+            }
+        }
+    }
+    return ml;
+}
+
+/* Inlining is important to hardwire a hot branch (template emulation) */
+FORCE_INLINE_TEMPLATE size_t ZSTD_RowFindBestMatch_selectMLS (
+                        ZSTD_matchState_t* ms,
+                        const BYTE* ip, const BYTE* const iLimit,
+                        const ZSTD_dictMode_e dictMode, size_t* offsetPtr, const U32 rowLog)
+{
+    switch(ms->cParams.minMatch)
+    {
+    default : /* includes case 3 */
+    case 4 : return ZSTD_RowFindBestMatch_generic(ms, ip, iLimit, offsetPtr, 4, dictMode, rowLog);
+    case 5 : return ZSTD_RowFindBestMatch_generic(ms, ip, iLimit, offsetPtr, 5, dictMode, rowLog);
+    case 7 :
+    case 6 : return ZSTD_RowFindBestMatch_generic(ms, ip, iLimit, offsetPtr, 6, dictMode, rowLog);
+    }
+}
+
+FORCE_INLINE_TEMPLATE size_t ZSTD_RowFindBestMatch_selectRowLog (
+                        ZSTD_matchState_t* ms,
+                        const BYTE* ip, const BYTE* const iLimit,
+                        size_t* offsetPtr)
+{
+    const U32 cappedSearchLog = MIN(ms->cParams.searchLog, 5);
+    switch(cappedSearchLog)
+    {
+    default :
+    case 4 : return ZSTD_RowFindBestMatch_selectMLS(ms, ip, iLimit, ZSTD_noDict, offsetPtr, 4);
+    case 5 : return ZSTD_RowFindBestMatch_selectMLS(ms, ip, iLimit, ZSTD_noDict, offsetPtr, 5);
+    }
+}
+
+FORCE_INLINE_TEMPLATE size_t ZSTD_RowFindBestMatch_dictMatchState_selectRowLog(
+                        ZSTD_matchState_t* ms,
+                        const BYTE* ip, const BYTE* const iLimit,
+                        size_t* offsetPtr)
+{
+    const U32 cappedSearchLog = MIN(ms->cParams.searchLog, 5);
+    switch(cappedSearchLog)
+    {
+    default :
+    case 4 : return ZSTD_RowFindBestMatch_selectMLS(ms, ip, iLimit, ZSTD_dictMatchState, offsetPtr, 4);
+    case 5 : return ZSTD_RowFindBestMatch_selectMLS(ms, ip, iLimit, ZSTD_dictMatchState, offsetPtr, 5);
+    }
+}
+
+FORCE_INLINE_TEMPLATE size_t ZSTD_RowFindBestMatch_dedicatedDictSearch_selectRowLog(
+                        ZSTD_matchState_t* ms,
+                        const BYTE* ip, const BYTE* const iLimit,
+                        size_t* offsetPtr)
+{
+    const U32 cappedSearchLog = MIN(ms->cParams.searchLog, 5);
+    switch(cappedSearchLog)
+    {
+    default :
+    case 4 : return ZSTD_RowFindBestMatch_selectMLS(ms, ip, iLimit, ZSTD_dedicatedDictSearch, offsetPtr, 4);
+    case 5 : return ZSTD_RowFindBestMatch_selectMLS(ms, ip, iLimit, ZSTD_dedicatedDictSearch, offsetPtr, 5);
+    }
+}
+
+FORCE_INLINE_TEMPLATE size_t ZSTD_RowFindBestMatch_extDict_selectRowLog (
+                        ZSTD_matchState_t* ms,
+                        const BYTE* ip, const BYTE* const iLimit,
+                        size_t* offsetPtr)
+{
+    const U32 cappedSearchLog = MIN(ms->cParams.searchLog, 5);
+    switch(cappedSearchLog)
+    {
+    default :
+    case 4 : return ZSTD_RowFindBestMatch_selectMLS(ms, ip, iLimit, ZSTD_extDict, offsetPtr, 4);
+    case 5 : return ZSTD_RowFindBestMatch_selectMLS(ms, ip, iLimit, ZSTD_extDict, offsetPtr, 5);
+    }
+}
+
+
+/* *******************************
+*  Common parser - lazy strategy
+*********************************/
+typedef enum { search_hashChain=0, search_binaryTree=1, search_rowHash=2 } searchMethod_e;
+
+FORCE_INLINE_TEMPLATE size_t
+ZSTD_compressBlock_lazy_generic(
+                        ZSTD_matchState_t* ms, seqStore_t* seqStore,
+                        U32 rep[ZSTD_REP_NUM],
+                        const void* src, size_t srcSize,
+                        const searchMethod_e searchMethod, const U32 depth,
+                        ZSTD_dictMode_e const dictMode)
+{
+    const BYTE* const istart = (const BYTE*)src;
+    const BYTE* ip = istart;
+    const BYTE* anchor = istart;
+    const BYTE* const iend = istart + srcSize;
+    const BYTE* const ilimit = searchMethod == search_rowHash ? iend - 8 - ZSTD_ROW_HASH_CACHE_SIZE : iend - 8;
+    const BYTE* const base = ms->window.base;
+    const U32 prefixLowestIndex = ms->window.dictLimit;
+    const BYTE* const prefixLowest = base + prefixLowestIndex;
+    const U32 rowLog = ms->cParams.searchLog < 5 ? 4 : 5;
+
+    typedef size_t (*searchMax_f)(
+                        ZSTD_matchState_t* ms,
+                        const BYTE* ip, const BYTE* iLimit, size_t* offsetPtr);
+
+    /**
+     * This table is indexed first by the four ZSTD_dictMode_e values, and then
+     * by the two searchMethod_e values. NULLs are placed for configurations
+     * that should never occur (extDict modes go to the other implementation
+     * below and there is no DDSS for binary tree search yet).
+     */
+    const searchMax_f searchFuncs[4][3] = {
+        {
+            ZSTD_HcFindBestMatch_selectMLS,
+            ZSTD_BtFindBestMatch_selectMLS,
+            ZSTD_RowFindBestMatch_selectRowLog
+        },
+        {
+            NULL,
+            NULL,
+            NULL
+        },
+        {
+            ZSTD_HcFindBestMatch_dictMatchState_selectMLS,
+            ZSTD_BtFindBestMatch_dictMatchState_selectMLS,
+            ZSTD_RowFindBestMatch_dictMatchState_selectRowLog
+        },
+        {
+            ZSTD_HcFindBestMatch_dedicatedDictSearch_selectMLS,
+            NULL,
+            ZSTD_RowFindBestMatch_dedicatedDictSearch_selectRowLog
+        }
+    };
+
+    searchMax_f const searchMax = searchFuncs[dictMode][(int)searchMethod];
+    U32 offset_1 = rep[0], offset_2 = rep[1], savedOffset=0;
+
+    const int isDMS = dictMode == ZSTD_dictMatchState;
+    const int isDDS = dictMode == ZSTD_dedicatedDictSearch;
+    const int isDxS = isDMS || isDDS;
+    const ZSTD_matchState_t* const dms = ms->dictMatchState;
+    const U32 dictLowestIndex      = isDxS ? dms->window.dictLimit : 0;
+    const BYTE* const dictBase     = isDxS ? dms->window.base : NULL;
+    const BYTE* const dictLowest   = isDxS ? dictBase + dictLowestIndex : NULL;
+    const BYTE* const dictEnd      = isDxS ? dms->window.nextSrc : NULL;
+    const U32 dictIndexDelta       = isDxS ?
+                                     prefixLowestIndex - (U32)(dictEnd - dictBase) :
+                                     0;
+    const U32 dictAndPrefixLength = (U32)((ip - prefixLowest) + (dictEnd - dictLowest));
+
+    assert(searchMax != NULL);
+
+    DEBUGLOG(5, "ZSTD_compressBlock_lazy_generic (dictMode=%u) (searchFunc=%u)", (U32)dictMode, (U32)searchMethod);
+    ip += (dictAndPrefixLength == 0);
+    if (dictMode == ZSTD_noDict) {
+        U32 const curr = (U32)(ip - base);
+        U32 const windowLow = ZSTD_getLowestPrefixIndex(ms, curr, ms->cParams.windowLog);
+        U32 const maxRep = curr - windowLow;
+        if (offset_2 > maxRep) savedOffset = offset_2, offset_2 = 0;
+        if (offset_1 > maxRep) savedOffset = offset_1, offset_1 = 0;
+    }
+    if (isDxS) {
+        /* dictMatchState repCode checks don't currently handle repCode == 0
+         * disabling. */
+        assert(offset_1 <= dictAndPrefixLength);
+        assert(offset_2 <= dictAndPrefixLength);
+    }
+
+    if (searchMethod == search_rowHash) {
+        ZSTD_row_fillHashCache(ms, base, rowLog,
+                            MIN(ms->cParams.minMatch, 6 /* mls caps out at 6 */),
+                            ms->nextToUpdate, ilimit);
+    }
+
+    /* Match Loop */
+#if defined(__GNUC__) && defined(__x86_64__)
+    /* I've measured random a 5% speed loss on levels 5 & 6 (greedy) when the
+     * code alignment is perturbed. To fix the instability align the loop on 32-bytes.
+     */
+    __asm__(".p2align 5");
+#endif
+    while (ip < ilimit) {
+        size_t matchLength=0;
+        size_t offset=0;
+        const BYTE* start=ip+1;
+
+        /* check repCode */
+        if (isDxS) {
+            const U32 repIndex = (U32)(ip - base) + 1 - offset_1;
+            const BYTE* repMatch = ((dictMode == ZSTD_dictMatchState || dictMode == ZSTD_dedicatedDictSearch)
+                                && repIndex < prefixLowestIndex) ?
+                                   dictBase + (repIndex - dictIndexDelta) :
+                                   base + repIndex;
+            if (((U32)((prefixLowestIndex-1) - repIndex) >= 3 /* intentional underflow */)
+                && (MEM_read32(repMatch) == MEM_read32(ip+1)) ) {
+                const BYTE* repMatchEnd = repIndex < prefixLowestIndex ? dictEnd : iend;
+                matchLength = ZSTD_count_2segments(ip+1+4, repMatch+4, iend, repMatchEnd, prefixLowest) + 4;
+                if (depth==0) goto _storeSequence;
+            }
+        }
+        if ( dictMode == ZSTD_noDict
+          && ((offset_1 > 0) & (MEM_read32(ip+1-offset_1) == MEM_read32(ip+1)))) {
+            matchLength = ZSTD_count(ip+1+4, ip+1+4-offset_1, iend) + 4;
+            if (depth==0) goto _storeSequence;
+        }
+
+        /* first search (depth 0) */
+        {   size_t offsetFound = 999999999;
+            size_t const ml2 = searchMax(ms, ip, iend, &offsetFound);
+            if (ml2 > matchLength)
+                matchLength = ml2, start = ip, offset=offsetFound;
+        }
+
+        if (matchLength < 4) {
+            ip += ((ip-anchor) >> kSearchStrength) + 1;   /* jump faster over incompressible sections */
+            continue;
+        }
+
+        /* let's try to find a better solution */
+        if (depth>=1)
+        while (ip<ilimit) {
+            ip ++;
+            if ( (dictMode == ZSTD_noDict)
+              && (offset) && ((offset_1>0) & (MEM_read32(ip) == MEM_read32(ip - offset_1)))) {
+                size_t const mlRep = ZSTD_count(ip+4, ip+4-offset_1, iend) + 4;
+                int const gain2 = (int)(mlRep * 3);
+                int const gain1 = (int)(matchLength*3 - ZSTD_highbit32((U32)offset+1) + 1);
+                if ((mlRep >= 4) && (gain2 > gain1))
+                    matchLength = mlRep, offset = 0, start = ip;
+            }
+            if (isDxS) {
+                const U32 repIndex = (U32)(ip - base) - offset_1;
+                const BYTE* repMatch = repIndex < prefixLowestIndex ?
+                               dictBase + (repIndex - dictIndexDelta) :
+                               base + repIndex;
+                if (((U32)((prefixLowestIndex-1) - repIndex) >= 3 /* intentional underflow */)
+                    && (MEM_read32(repMatch) == MEM_read32(ip)) ) {
+                    const BYTE* repMatchEnd = repIndex < prefixLowestIndex ? dictEnd : iend;
+                    size_t const mlRep = ZSTD_count_2segments(ip+4, repMatch+4, iend, repMatchEnd, prefixLowest) + 4;
+                    int const gain2 = (int)(mlRep * 3);
+                    int const gain1 = (int)(matchLength*3 - ZSTD_highbit32((U32)offset+1) + 1);
+                    if ((mlRep >= 4) && (gain2 > gain1))
+                        matchLength = mlRep, offset = 0, start = ip;
+                }
+            }
+            {   size_t offset2=999999999;
+                size_t const ml2 = searchMax(ms, ip, iend, &offset2);
+                int const gain2 = (int)(ml2*4 - ZSTD_highbit32((U32)offset2+1));   /* raw approx */
+                int const gain1 = (int)(matchLength*4 - ZSTD_highbit32((U32)offset+1) + 4);
+                if ((ml2 >= 4) && (gain2 > gain1)) {
+                    matchLength = ml2, offset = offset2, start = ip;
+                    continue;   /* search a better one */
+            }   }
+
+            /* let's find an even better one */
+            if ((depth==2) && (ip<ilimit)) {
+                ip ++;
+                if ( (dictMode == ZSTD_noDict)
+                  && (offset) && ((offset_1>0) & (MEM_read32(ip) == MEM_read32(ip - offset_1)))) {
+                    size_t const mlRep = ZSTD_count(ip+4, ip+4-offset_1, iend) + 4;
+                    int const gain2 = (int)(mlRep * 4);
+                    int const gain1 = (int)(matchLength*4 - ZSTD_highbit32((U32)offset+1) + 1);
+                    if ((mlRep >= 4) && (gain2 > gain1))
+                        matchLength = mlRep, offset = 0, start = ip;
+                }
+                if (isDxS) {
+                    const U32 repIndex = (U32)(ip - base) - offset_1;
+                    const BYTE* repMatch = repIndex < prefixLowestIndex ?
+                                   dictBase + (repIndex - dictIndexDelta) :
+                                   base + repIndex;
+                    if (((U32)((prefixLowestIndex-1) - repIndex) >= 3 /* intentional underflow */)
+                        && (MEM_read32(repMatch) == MEM_read32(ip)) ) {
+                        const BYTE* repMatchEnd = repIndex < prefixLowestIndex ? dictEnd : iend;
+                        size_t const mlRep = ZSTD_count_2segments(ip+4, repMatch+4, iend, repMatchEnd, prefixLowest) + 4;
+                        int const gain2 = (int)(mlRep * 4);
+                        int const gain1 = (int)(matchLength*4 - ZSTD_highbit32((U32)offset+1) + 1);
+                        if ((mlRep >= 4) && (gain2 > gain1))
+                            matchLength = mlRep, offset = 0, start = ip;
+                    }
+                }
+                {   size_t offset2=999999999;
+                    size_t const ml2 = searchMax(ms, ip, iend, &offset2);
+                    int const gain2 = (int)(ml2*4 - ZSTD_highbit32((U32)offset2+1));   /* raw approx */
+                    int const gain1 = (int)(matchLength*4 - ZSTD_highbit32((U32)offset+1) + 7);
+                    if ((ml2 >= 4) && (gain2 > gain1)) {
+                        matchLength = ml2, offset = offset2, start = ip;
+                        continue;
+            }   }   }
+            break;  /* nothing found : store previous solution */
+        }
+
+        /* NOTE:
+         * start[-offset+ZSTD_REP_MOVE-1] is undefined behavior.
+         * (-offset+ZSTD_REP_MOVE-1) is unsigned, and is added to start, which
+         * overflows the pointer, which is undefined behavior.
+         */
+        /* catch up */
+        if (offset) {
+            if (dictMode == ZSTD_noDict) {
+                while ( ((start > anchor) & (start - (offset-ZSTD_REP_MOVE) > prefixLowest))
+                     && (start[-1] == (start-(offset-ZSTD_REP_MOVE))[-1]) )  /* only search for offset within prefix */
+                    { start--; matchLength++; }
+            }
+            if (isDxS) {
+                U32 const matchIndex = (U32)((start-base) - (offset - ZSTD_REP_MOVE));
+                const BYTE* match = (matchIndex < prefixLowestIndex) ? dictBase + matchIndex - dictIndexDelta : base + matchIndex;
+                const BYTE* const mStart = (matchIndex < prefixLowestIndex) ? dictLowest : prefixLowest;
+                while ((start>anchor) && (match>mStart) && (start[-1] == match[-1])) { start--; match--; matchLength++; }  /* catch up */
+            }
+            offset_2 = offset_1; offset_1 = (U32)(offset - ZSTD_REP_MOVE);
+        }
+        /* store sequence */
+_storeSequence:
+        {   size_t const litLength = start - anchor;
+            ZSTD_storeSeq(seqStore, litLength, anchor, iend, (U32)offset, matchLength-MINMATCH);
+            anchor = ip = start + matchLength;
+        }
+
+        /* check immediate repcode */
+        if (isDxS) {
+            while (ip <= ilimit) {
+                U32 const current2 = (U32)(ip-base);
+                U32 const repIndex = current2 - offset_2;
+                const BYTE* repMatch = repIndex < prefixLowestIndex ?
+                        dictBase - dictIndexDelta + repIndex :
+                        base + repIndex;
+                if ( ((U32)((prefixLowestIndex-1) - (U32)repIndex) >= 3 /* intentional overflow */)
+                   && (MEM_read32(repMatch) == MEM_read32(ip)) ) {
+                    const BYTE* const repEnd2 = repIndex < prefixLowestIndex ? dictEnd : iend;
+                    matchLength = ZSTD_count_2segments(ip+4, repMatch+4, iend, repEnd2, prefixLowest) + 4;
+                    offset = offset_2; offset_2 = offset_1; offset_1 = (U32)offset;   /* swap offset_2 <=> offset_1 */
+                    ZSTD_storeSeq(seqStore, 0, anchor, iend, 0, matchLength-MINMATCH);
+                    ip += matchLength;
+                    anchor = ip;
+                    continue;
+                }
+                break;
+            }
+        }
+
+        if (dictMode == ZSTD_noDict) {
+            while ( ((ip <= ilimit) & (offset_2>0))
+                 && (MEM_read32(ip) == MEM_read32(ip - offset_2)) ) {
+                /* store sequence */
+                matchLength = ZSTD_count(ip+4, ip+4-offset_2, iend) + 4;
+                offset = offset_2; offset_2 = offset_1; offset_1 = (U32)offset; /* swap repcodes */
+                ZSTD_storeSeq(seqStore, 0, anchor, iend, 0, matchLength-MINMATCH);
+                ip += matchLength;
+                anchor = ip;
+                continue;   /* faster when present ... (?) */
+    }   }   }
+
+    /* Save reps for next block */
+    rep[0] = offset_1 ? offset_1 : savedOffset;
+    rep[1] = offset_2 ? offset_2 : savedOffset;
+
+    /* Return the last literals size */
+    return (size_t)(iend - anchor);
+}
+
+
+size_t ZSTD_compressBlock_btlazy2(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize)
+{
+    return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_binaryTree, 2, ZSTD_noDict);
+}
+
+size_t ZSTD_compressBlock_lazy2(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize)
+{
+    return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_hashChain, 2, ZSTD_noDict);
+}
+
+size_t ZSTD_compressBlock_lazy(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize)
+{
+    return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_hashChain, 1, ZSTD_noDict);
+}
+
+size_t ZSTD_compressBlock_greedy(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize)
+{
+    return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_hashChain, 0, ZSTD_noDict);
+}
+
+size_t ZSTD_compressBlock_btlazy2_dictMatchState(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize)
+{
+    return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_binaryTree, 2, ZSTD_dictMatchState);
+}
+
+size_t ZSTD_compressBlock_lazy2_dictMatchState(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize)
+{
+    return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_hashChain, 2, ZSTD_dictMatchState);
+}
+
+size_t ZSTD_compressBlock_lazy_dictMatchState(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize)
+{
+    return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_hashChain, 1, ZSTD_dictMatchState);
+}
+
+size_t ZSTD_compressBlock_greedy_dictMatchState(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize)
+{
+    return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_hashChain, 0, ZSTD_dictMatchState);
+}
+
+
+size_t ZSTD_compressBlock_lazy2_dedicatedDictSearch(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize)
+{
+    return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_hashChain, 2, ZSTD_dedicatedDictSearch);
+}
+
+size_t ZSTD_compressBlock_lazy_dedicatedDictSearch(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize)
+{
+    return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_hashChain, 1, ZSTD_dedicatedDictSearch);
+}
+
+size_t ZSTD_compressBlock_greedy_dedicatedDictSearch(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize)
+{
+    return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_hashChain, 0, ZSTD_dedicatedDictSearch);
+}
+
+/* Row-based matchfinder */
+size_t ZSTD_compressBlock_lazy2_row(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize)
+{
+    return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_rowHash, 2, ZSTD_noDict);
+}
+
+size_t ZSTD_compressBlock_lazy_row(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize)
+{
+    return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_rowHash, 1, ZSTD_noDict);
+}
+
+size_t ZSTD_compressBlock_greedy_row(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize)
+{
+    return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_rowHash, 0, ZSTD_noDict);
+}
+
+size_t ZSTD_compressBlock_lazy2_dictMatchState_row(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize)
+{
+    return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_rowHash, 2, ZSTD_dictMatchState);
+}
+
+size_t ZSTD_compressBlock_lazy_dictMatchState_row(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize)
+{
+    return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_rowHash, 1, ZSTD_dictMatchState);
+}
+
+size_t ZSTD_compressBlock_greedy_dictMatchState_row(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize)
+{
+    return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_rowHash, 0, ZSTD_dictMatchState);
+}
+
+
+size_t ZSTD_compressBlock_lazy2_dedicatedDictSearch_row(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize)
+{
+    return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_rowHash, 2, ZSTD_dedicatedDictSearch);
+}
+
+size_t ZSTD_compressBlock_lazy_dedicatedDictSearch_row(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize)
+{
+    return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_rowHash, 1, ZSTD_dedicatedDictSearch);
+}
+
+size_t ZSTD_compressBlock_greedy_dedicatedDictSearch_row(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize)
+{
+    return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_rowHash, 0, ZSTD_dedicatedDictSearch);
+}
+
+FORCE_INLINE_TEMPLATE
+size_t ZSTD_compressBlock_lazy_extDict_generic(
+                        ZSTD_matchState_t* ms, seqStore_t* seqStore,
+                        U32 rep[ZSTD_REP_NUM],
+                        const void* src, size_t srcSize,
+                        const searchMethod_e searchMethod, const U32 depth)
+{
+    const BYTE* const istart = (const BYTE*)src;
+    const BYTE* ip = istart;
+    const BYTE* anchor = istart;
+    const BYTE* const iend = istart + srcSize;
+    const BYTE* const ilimit = searchMethod == search_rowHash ? iend - 8 - ZSTD_ROW_HASH_CACHE_SIZE : iend - 8;
+    const BYTE* const base = ms->window.base;
+    const U32 dictLimit = ms->window.dictLimit;
+    const BYTE* const prefixStart = base + dictLimit;
+    const BYTE* const dictBase = ms->window.dictBase;
+    const BYTE* const dictEnd  = dictBase + dictLimit;
+    const BYTE* const dictStart  = dictBase + ms->window.lowLimit;
+    const U32 windowLog = ms->cParams.windowLog;
+    const U32 rowLog = ms->cParams.searchLog < 5 ? 4 : 5;
+
+    typedef size_t (*searchMax_f)(
+                        ZSTD_matchState_t* ms,
+                        const BYTE* ip, const BYTE* iLimit, size_t* offsetPtr);
+    const searchMax_f searchFuncs[3] = {
+        ZSTD_HcFindBestMatch_extDict_selectMLS,
+        ZSTD_BtFindBestMatch_extDict_selectMLS,
+        ZSTD_RowFindBestMatch_extDict_selectRowLog
+    };
+    searchMax_f searchMax = searchFuncs[(int)searchMethod];
+    U32 offset_1 = rep[0], offset_2 = rep[1];
+
+    DEBUGLOG(5, "ZSTD_compressBlock_lazy_extDict_generic (searchFunc=%u)", (U32)searchMethod);
+
+    /* init */
+    ip += (ip == prefixStart);
+    if (searchMethod == search_rowHash) {
+        ZSTD_row_fillHashCache(ms, base, rowLog,
+                               MIN(ms->cParams.minMatch, 6 /* mls caps out at 6 */),
+                               ms->nextToUpdate, ilimit);
+    }
+
+    /* Match Loop */
+#if defined(__GNUC__) && defined(__x86_64__)
+    /* I've measured random a 5% speed loss on levels 5 & 6 (greedy) when the
+     * code alignment is perturbed. To fix the instability align the loop on 32-bytes.
+     */
+    __asm__(".p2align 5");
+#endif
+    while (ip < ilimit) {
+        size_t matchLength=0;
+        size_t offset=0;
+        const BYTE* start=ip+1;
+        U32 curr = (U32)(ip-base);
+
+        /* check repCode */
+        {   const U32 windowLow = ZSTD_getLowestMatchIndex(ms, curr+1, windowLog);
+            const U32 repIndex = (U32)(curr+1 - offset_1);
+            const BYTE* const repBase = repIndex < dictLimit ? dictBase : base;
+            const BYTE* const repMatch = repBase + repIndex;
+            if ( ((U32)((dictLimit-1) - repIndex) >= 3) /* intentional overflow */
+               & (offset_1 < curr+1 - windowLow) ) /* note: we are searching at curr+1 */
+            if (MEM_read32(ip+1) == MEM_read32(repMatch)) {
+                /* repcode detected we should take it */
+                const BYTE* const repEnd = repIndex < dictLimit ? dictEnd : iend;
+                matchLength = ZSTD_count_2segments(ip+1+4, repMatch+4, iend, repEnd, prefixStart) + 4;
+                if (depth==0) goto _storeSequence;
+        }   }
+
+        /* first search (depth 0) */
+        {   size_t offsetFound = 999999999;
+            size_t const ml2 = searchMax(ms, ip, iend, &offsetFound);
+            if (ml2 > matchLength)
+                matchLength = ml2, start = ip, offset=offsetFound;
+        }
+
+         if (matchLength < 4) {
+            ip += ((ip-anchor) >> kSearchStrength) + 1;   /* jump faster over incompressible sections */
+            continue;
+        }
+
+        /* let's try to find a better solution */
+        if (depth>=1)
+        while (ip<ilimit) {
+            ip ++;
+            curr++;
+            /* check repCode */
+            if (offset) {
+                const U32 windowLow = ZSTD_getLowestMatchIndex(ms, curr, windowLog);
+                const U32 repIndex = (U32)(curr - offset_1);
+                const BYTE* const repBase = repIndex < dictLimit ? dictBase : base;
+                const BYTE* const repMatch = repBase + repIndex;
+                if ( ((U32)((dictLimit-1) - repIndex) >= 3) /* intentional overflow : do not test positions overlapping 2 memory segments  */
+                   & (offset_1 < curr - windowLow) ) /* equivalent to `curr > repIndex >= windowLow` */
+                if (MEM_read32(ip) == MEM_read32(repMatch)) {
+                    /* repcode detected */
+                    const BYTE* const repEnd = repIndex < dictLimit ? dictEnd : iend;
+                    size_t const repLength = ZSTD_count_2segments(ip+4, repMatch+4, iend, repEnd, prefixStart) + 4;
+                    int const gain2 = (int)(repLength * 3);
+                    int const gain1 = (int)(matchLength*3 - ZSTD_highbit32((U32)offset+1) + 1);
+                    if ((repLength >= 4) && (gain2 > gain1))
+                        matchLength = repLength, offset = 0, start = ip;
+            }   }
+
+            /* search match, depth 1 */
+            {   size_t offset2=999999999;
+                size_t const ml2 = searchMax(ms, ip, iend, &offset2);
+                int const gain2 = (int)(ml2*4 - ZSTD_highbit32((U32)offset2+1));   /* raw approx */
+                int const gain1 = (int)(matchLength*4 - ZSTD_highbit32((U32)offset+1) + 4);
+                if ((ml2 >= 4) && (gain2 > gain1)) {
+                    matchLength = ml2, offset = offset2, start = ip;
+                    continue;   /* search a better one */
+            }   }
+
+            /* let's find an even better one */
+            if ((depth==2) && (ip<ilimit)) {
+                ip ++;
+                curr++;
+                /* check repCode */
+                if (offset) {
+                    const U32 windowLow = ZSTD_getLowestMatchIndex(ms, curr, windowLog);
+                    const U32 repIndex = (U32)(curr - offset_1);
+                    const BYTE* const repBase = repIndex < dictLimit ? dictBase : base;
+                    const BYTE* const repMatch = repBase + repIndex;
+                    if ( ((U32)((dictLimit-1) - repIndex) >= 3) /* intentional overflow : do not test positions overlapping 2 memory segments  */
+                       & (offset_1 < curr - windowLow) ) /* equivalent to `curr > repIndex >= windowLow` */
+                    if (MEM_read32(ip) == MEM_read32(repMatch)) {
+                        /* repcode detected */
+                        const BYTE* const repEnd = repIndex < dictLimit ? dictEnd : iend;
+                        size_t const repLength = ZSTD_count_2segments(ip+4, repMatch+4, iend, repEnd, prefixStart) + 4;
+                        int const gain2 = (int)(repLength * 4);
+                        int const gain1 = (int)(matchLength*4 - ZSTD_highbit32((U32)offset+1) + 1);
+                        if ((repLength >= 4) && (gain2 > gain1))
+                            matchLength = repLength, offset = 0, start = ip;
+                }   }
+
+                /* search match, depth 2 */
+                {   size_t offset2=999999999;
+                    size_t const ml2 = searchMax(ms, ip, iend, &offset2);
+                    int const gain2 = (int)(ml2*4 - ZSTD_highbit32((U32)offset2+1));   /* raw approx */
+                    int const gain1 = (int)(matchLength*4 - ZSTD_highbit32((U32)offset+1) + 7);
+                    if ((ml2 >= 4) && (gain2 > gain1)) {
+                        matchLength = ml2, offset = offset2, start = ip;
+                        continue;
+            }   }   }
+            break;  /* nothing found : store previous solution */
+        }
+
+        /* catch up */
+        if (offset) {
+            U32 const matchIndex = (U32)((start-base) - (offset - ZSTD_REP_MOVE));
+            const BYTE* match = (matchIndex < dictLimit) ? dictBase + matchIndex : base + matchIndex;
+            const BYTE* const mStart = (matchIndex < dictLimit) ? dictStart : prefixStart;
+            while ((start>anchor) && (match>mStart) && (start[-1] == match[-1])) { start--; match--; matchLength++; }  /* catch up */
+            offset_2 = offset_1; offset_1 = (U32)(offset - ZSTD_REP_MOVE);
+        }
+
+        /* store sequence */
+_storeSequence:
+        {   size_t const litLength = start - anchor;
+            ZSTD_storeSeq(seqStore, litLength, anchor, iend, (U32)offset, matchLength-MINMATCH);
+            anchor = ip = start + matchLength;
+        }
+
+        /* check immediate repcode */
+        while (ip <= ilimit) {
+            const U32 repCurrent = (U32)(ip-base);
+            const U32 windowLow = ZSTD_getLowestMatchIndex(ms, repCurrent, windowLog);
+            const U32 repIndex = repCurrent - offset_2;
+            const BYTE* const repBase = repIndex < dictLimit ? dictBase : base;
+            const BYTE* const repMatch = repBase + repIndex;
+            if ( ((U32)((dictLimit-1) - repIndex) >= 3) /* intentional overflow : do not test positions overlapping 2 memory segments  */
+               & (offset_2 < repCurrent - windowLow) ) /* equivalent to `curr > repIndex >= windowLow` */
+            if (MEM_read32(ip) == MEM_read32(repMatch)) {
+                /* repcode detected we should take it */
+                const BYTE* const repEnd = repIndex < dictLimit ? dictEnd : iend;
+                matchLength = ZSTD_count_2segments(ip+4, repMatch+4, iend, repEnd, prefixStart) + 4;
+                offset = offset_2; offset_2 = offset_1; offset_1 = (U32)offset;   /* swap offset history */
+                ZSTD_storeSeq(seqStore, 0, anchor, iend, 0, matchLength-MINMATCH);
+                ip += matchLength;
+                anchor = ip;
+                continue;   /* faster when present ... (?) */
+            }
+            break;
+    }   }
+
+    /* Save reps for next block */
+    rep[0] = offset_1;
+    rep[1] = offset_2;
+
+    /* Return the last literals size */
+    return (size_t)(iend - anchor);
+}
+
+
+size_t ZSTD_compressBlock_greedy_extDict(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize)
+{
+    return ZSTD_compressBlock_lazy_extDict_generic(ms, seqStore, rep, src, srcSize, search_hashChain, 0);
+}
+
+size_t ZSTD_compressBlock_lazy_extDict(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize)
+
+{
+    return ZSTD_compressBlock_lazy_extDict_generic(ms, seqStore, rep, src, srcSize, search_hashChain, 1);
+}
+
+size_t ZSTD_compressBlock_lazy2_extDict(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize)
+
+{
+    return ZSTD_compressBlock_lazy_extDict_generic(ms, seqStore, rep, src, srcSize, search_hashChain, 2);
+}
+
+size_t ZSTD_compressBlock_btlazy2_extDict(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize)
+
+{
+    return ZSTD_compressBlock_lazy_extDict_generic(ms, seqStore, rep, src, srcSize, search_binaryTree, 2);
+}
+
+size_t ZSTD_compressBlock_greedy_extDict_row(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize)
+{
+    return ZSTD_compressBlock_lazy_extDict_generic(ms, seqStore, rep, src, srcSize, search_rowHash, 0);
+}
+
+size_t ZSTD_compressBlock_lazy_extDict_row(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize)
+
+{
+    return ZSTD_compressBlock_lazy_extDict_generic(ms, seqStore, rep, src, srcSize, search_rowHash, 1);
+}
+
+size_t ZSTD_compressBlock_lazy2_extDict_row(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize)
+
+{
+    return ZSTD_compressBlock_lazy_extDict_generic(ms, seqStore, rep, src, srcSize, search_rowHash, 2);
+}
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_lazy.h mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_lazy.h
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_lazy.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_lazy.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+#ifndef ZSTD_LAZY_H
+#define ZSTD_LAZY_H
+
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
+#include "zstd_compress_internal.h"
+
+/**
+ * Dedicated Dictionary Search Structure bucket log. In the
+ * ZSTD_dedicatedDictSearch mode, the hashTable has
+ * 2 ** ZSTD_LAZY_DDSS_BUCKET_LOG entries in each bucket, rather than just
+ * one.
+ */
+#define ZSTD_LAZY_DDSS_BUCKET_LOG 2
+
+U32 ZSTD_insertAndFindFirstIndex(ZSTD_matchState_t* ms, const BYTE* ip);
+void ZSTD_row_update(ZSTD_matchState_t* const ms, const BYTE* ip);
+
+void ZSTD_dedicatedDictSearch_lazy_loadDictionary(ZSTD_matchState_t* ms, const BYTE* const ip);
+
+void ZSTD_preserveUnsortedMark (U32* const table, U32 const size, U32 const reducerValue);  /*! used in ZSTD_reduceIndex(). preemptively increase value of ZSTD_DUBT_UNSORTED_MARK */
+
+size_t ZSTD_compressBlock_btlazy2(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+size_t ZSTD_compressBlock_lazy2(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+size_t ZSTD_compressBlock_lazy(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+size_t ZSTD_compressBlock_greedy(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+size_t ZSTD_compressBlock_lazy2_row(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+size_t ZSTD_compressBlock_lazy_row(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+size_t ZSTD_compressBlock_greedy_row(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+
+size_t ZSTD_compressBlock_btlazy2_dictMatchState(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+size_t ZSTD_compressBlock_lazy2_dictMatchState(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+size_t ZSTD_compressBlock_lazy_dictMatchState(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+size_t ZSTD_compressBlock_greedy_dictMatchState(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+size_t ZSTD_compressBlock_lazy2_dictMatchState_row(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+size_t ZSTD_compressBlock_lazy_dictMatchState_row(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+size_t ZSTD_compressBlock_greedy_dictMatchState_row(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+
+size_t ZSTD_compressBlock_lazy2_dedicatedDictSearch(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+size_t ZSTD_compressBlock_lazy_dedicatedDictSearch(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+size_t ZSTD_compressBlock_greedy_dedicatedDictSearch(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+size_t ZSTD_compressBlock_lazy2_dedicatedDictSearch_row(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+size_t ZSTD_compressBlock_lazy_dedicatedDictSearch_row(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+size_t ZSTD_compressBlock_greedy_dedicatedDictSearch_row(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+
+size_t ZSTD_compressBlock_greedy_extDict(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+size_t ZSTD_compressBlock_lazy_extDict(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+size_t ZSTD_compressBlock_lazy2_extDict(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+size_t ZSTD_compressBlock_greedy_extDict_row(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+size_t ZSTD_compressBlock_lazy_extDict_row(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+size_t ZSTD_compressBlock_lazy2_extDict_row(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+size_t ZSTD_compressBlock_btlazy2_extDict(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+        
+
+#if defined (__cplusplus)
+}
+#endif
+
+#endif /* ZSTD_LAZY_H */
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_ldm.c mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_ldm.c
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_ldm.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_ldm.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,722 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+#include "zstd_ldm.h"
+
+#include "../common/debug.h"
+#include "../common/xxhash.h"
+#include "zstd_fast.h"          /* ZSTD_fillHashTable() */
+#include "zstd_double_fast.h"   /* ZSTD_fillDoubleHashTable() */
+#include "zstd_ldm_geartab.h"
+
+#define LDM_BUCKET_SIZE_LOG 3
+#define LDM_MIN_MATCH_LENGTH 64
+#define LDM_HASH_RLOG 7
+
+typedef struct {
+    U64 rolling;
+    U64 stopMask;
+} ldmRollingHashState_t;
+
+/** ZSTD_ldm_gear_init():
+ *
+ * Initializes the rolling hash state such that it will honor the
+ * settings in params. */
+static void ZSTD_ldm_gear_init(ldmRollingHashState_t* state, ldmParams_t const* params)
+{
+    unsigned maxBitsInMask = MIN(params->minMatchLength, 64);
+    unsigned hashRateLog = params->hashRateLog;
+
+    state->rolling = ~(U32)0;
+
+    /* The choice of the splitting criterion is subject to two conditions:
+     *   1. it has to trigger on average every 2^(hashRateLog) bytes;
+     *   2. ideally, it has to depend on a window of minMatchLength bytes.
+     *
+     * In the gear hash algorithm, bit n depends on the last n bytes;
+     * so in order to obtain a good quality splitting criterion it is
+     * preferable to use bits with high weight.
+     *
+     * To match condition 1 we use a mask with hashRateLog bits set
+     * and, because of the previous remark, we make sure these bits
+     * have the highest possible weight while still respecting
+     * condition 2.
+     */
+    if (hashRateLog > 0 && hashRateLog <= maxBitsInMask) {
+        state->stopMask = (((U64)1 << hashRateLog) - 1) << (maxBitsInMask - hashRateLog);
+    } else {
+        /* In this degenerate case we simply honor the hash rate. */
+        state->stopMask = ((U64)1 << hashRateLog) - 1;
+    }
+}
+
+/** ZSTD_ldm_gear_reset()
+ * Feeds [data, data + minMatchLength) into the hash without registering any
+ * splits. This effectively resets the hash state. This is used when skipping
+ * over data, either at the beginning of a block, or skipping sections.
+ */
+static void ZSTD_ldm_gear_reset(ldmRollingHashState_t* state,
+                                BYTE const* data, size_t minMatchLength)
+{
+    U64 hash = state->rolling;
+    size_t n = 0;
+
+#define GEAR_ITER_ONCE() do {                                  \
+        hash = (hash << 1) + ZSTD_ldm_gearTab[data[n] & 0xff]; \
+        n += 1;                                                \
+    } while (0)
+    while (n + 3 < minMatchLength) {
+        GEAR_ITER_ONCE();
+        GEAR_ITER_ONCE();
+        GEAR_ITER_ONCE();
+        GEAR_ITER_ONCE();
+    }
+    while (n < minMatchLength) {
+        GEAR_ITER_ONCE();
+    }
+#undef GEAR_ITER_ONCE
+}
+
+/** ZSTD_ldm_gear_feed():
+ *
+ * Registers in the splits array all the split points found in the first
+ * size bytes following the data pointer. This function terminates when
+ * either all the data has been processed or LDM_BATCH_SIZE splits are
+ * present in the splits array.
+ *
+ * Precondition: The splits array must not be full.
+ * Returns: The number of bytes processed. */
+static size_t ZSTD_ldm_gear_feed(ldmRollingHashState_t* state,
+                                 BYTE const* data, size_t size,
+                                 size_t* splits, unsigned* numSplits)
+{
+    size_t n;
+    U64 hash, mask;
+
+    hash = state->rolling;
+    mask = state->stopMask;
+    n = 0;
+
+#define GEAR_ITER_ONCE() do { \
+        hash = (hash << 1) + ZSTD_ldm_gearTab[data[n] & 0xff]; \
+        n += 1; \
+        if (UNLIKELY((hash & mask) == 0)) { \
+            splits[*numSplits] = n; \
+            *numSplits += 1; \
+            if (*numSplits == LDM_BATCH_SIZE) \
+                goto done; \
+        } \
+    } while (0)
+
+    while (n + 3 < size) {
+        GEAR_ITER_ONCE();
+        GEAR_ITER_ONCE();
+        GEAR_ITER_ONCE();
+        GEAR_ITER_ONCE();
+    }
+    while (n < size) {
+        GEAR_ITER_ONCE();
+    }
+
+#undef GEAR_ITER_ONCE
+
+done:
+    state->rolling = hash;
+    return n;
+}
+
+void ZSTD_ldm_adjustParameters(ldmParams_t* params,
+                               ZSTD_compressionParameters const* cParams)
+{
+    params->windowLog = cParams->windowLog;
+    ZSTD_STATIC_ASSERT(LDM_BUCKET_SIZE_LOG <= ZSTD_LDM_BUCKETSIZELOG_MAX);
+    DEBUGLOG(4, "ZSTD_ldm_adjustParameters");
+    if (!params->bucketSizeLog) params->bucketSizeLog = LDM_BUCKET_SIZE_LOG;
+    if (!params->minMatchLength) params->minMatchLength = LDM_MIN_MATCH_LENGTH;
+    if (params->hashLog == 0) {
+        params->hashLog = MAX(ZSTD_HASHLOG_MIN, params->windowLog - LDM_HASH_RLOG);
+        assert(params->hashLog <= ZSTD_HASHLOG_MAX);
+    }
+    if (params->hashRateLog == 0) {
+        params->hashRateLog = params->windowLog < params->hashLog
+                                   ? 0
+                                   : params->windowLog - params->hashLog;
+    }
+    params->bucketSizeLog = MIN(params->bucketSizeLog, params->hashLog);
+}
+
+size_t ZSTD_ldm_getTableSize(ldmParams_t params)
+{
+    size_t const ldmHSize = ((size_t)1) << params.hashLog;
+    size_t const ldmBucketSizeLog = MIN(params.bucketSizeLog, params.hashLog);
+    size_t const ldmBucketSize = ((size_t)1) << (params.hashLog - ldmBucketSizeLog);
+    size_t const totalSize = ZSTD_cwksp_alloc_size(ldmBucketSize)
+                           + ZSTD_cwksp_alloc_size(ldmHSize * sizeof(ldmEntry_t));
+    return params.enableLdm ? totalSize : 0;
+}
+
+size_t ZSTD_ldm_getMaxNbSeq(ldmParams_t params, size_t maxChunkSize)
+{
+    return params.enableLdm ? (maxChunkSize / params.minMatchLength) : 0;
+}
+
+/** ZSTD_ldm_getBucket() :
+ *  Returns a pointer to the start of the bucket associated with hash. */
+static ldmEntry_t* ZSTD_ldm_getBucket(
+        ldmState_t* ldmState, size_t hash, ldmParams_t const ldmParams)
+{
+    return ldmState->hashTable + (hash << ldmParams.bucketSizeLog);
+}
+
+/** ZSTD_ldm_insertEntry() :
+ *  Insert the entry with corresponding hash into the hash table */
+static void ZSTD_ldm_insertEntry(ldmState_t* ldmState,
+                                 size_t const hash, const ldmEntry_t entry,
+                                 ldmParams_t const ldmParams)
+{
+    BYTE* const pOffset = ldmState->bucketOffsets + hash;
+    unsigned const offset = *pOffset;
+
+    *(ZSTD_ldm_getBucket(ldmState, hash, ldmParams) + offset) = entry;
+    *pOffset = (BYTE)((offset + 1) & ((1u << ldmParams.bucketSizeLog) - 1));
+
+}
+
+/** ZSTD_ldm_countBackwardsMatch() :
+ *  Returns the number of bytes that match backwards before pIn and pMatch.
+ *
+ *  We count only bytes where pMatch >= pBase and pIn >= pAnchor. */
+static size_t ZSTD_ldm_countBackwardsMatch(
+            const BYTE* pIn, const BYTE* pAnchor,
+            const BYTE* pMatch, const BYTE* pMatchBase)
+{
+    size_t matchLength = 0;
+    while (pIn > pAnchor && pMatch > pMatchBase && pIn[-1] == pMatch[-1]) {
+        pIn--;
+        pMatch--;
+        matchLength++;
+    }
+    return matchLength;
+}
+
+/** ZSTD_ldm_countBackwardsMatch_2segments() :
+ *  Returns the number of bytes that match backwards from pMatch,
+ *  even with the backwards match spanning 2 different segments.
+ *
+ *  On reaching `pMatchBase`, start counting from mEnd */
+static size_t ZSTD_ldm_countBackwardsMatch_2segments(
+                    const BYTE* pIn, const BYTE* pAnchor,
+                    const BYTE* pMatch, const BYTE* pMatchBase,
+                    const BYTE* pExtDictStart, const BYTE* pExtDictEnd)
+{
+    size_t matchLength = ZSTD_ldm_countBackwardsMatch(pIn, pAnchor, pMatch, pMatchBase);
+    if (pMatch - matchLength != pMatchBase || pMatchBase == pExtDictStart) {
+        /* If backwards match is entirely in the extDict or prefix, immediately return */
+        return matchLength;
+    }
+    DEBUGLOG(7, "ZSTD_ldm_countBackwardsMatch_2segments: found 2-parts backwards match (length in prefix==%zu)", matchLength);
+    matchLength += ZSTD_ldm_countBackwardsMatch(pIn - matchLength, pAnchor, pExtDictEnd, pExtDictStart);
+    DEBUGLOG(7, "final backwards match length = %zu", matchLength);
+    return matchLength;
+}
+
+/** ZSTD_ldm_fillFastTables() :
+ *
+ *  Fills the relevant tables for the ZSTD_fast and ZSTD_dfast strategies.
+ *  This is similar to ZSTD_loadDictionaryContent.
+ *
+ *  The tables for the other strategies are filled within their
+ *  block compressors. */
+static size_t ZSTD_ldm_fillFastTables(ZSTD_matchState_t* ms,
+                                      void const* end)
+{
+    const BYTE* const iend = (const BYTE*)end;
+
+    switch(ms->cParams.strategy)
+    {
+    case ZSTD_fast:
+        ZSTD_fillHashTable(ms, iend, ZSTD_dtlm_fast);
+        break;
+
+    case ZSTD_dfast:
+        ZSTD_fillDoubleHashTable(ms, iend, ZSTD_dtlm_fast);
+        break;
+
+    case ZSTD_greedy:
+    case ZSTD_lazy:
+    case ZSTD_lazy2:
+    case ZSTD_btlazy2:
+    case ZSTD_btopt:
+    case ZSTD_btultra:
+    case ZSTD_btultra2:
+        break;
+    default:
+        assert(0);  /* not possible : not a valid strategy id */
+    }
+
+    return 0;
+}
+
+void ZSTD_ldm_fillHashTable(
+            ldmState_t* ldmState, const BYTE* ip,
+            const BYTE* iend, ldmParams_t const* params)
+{
+    U32 const minMatchLength = params->minMatchLength;
+    U32 const hBits = params->hashLog - params->bucketSizeLog;
+    BYTE const* const base = ldmState->window.base;
+    BYTE const* const istart = ip;
+    ldmRollingHashState_t hashState;
+    size_t* const splits = ldmState->splitIndices;
+    unsigned numSplits;
+
+    DEBUGLOG(5, "ZSTD_ldm_fillHashTable");
+
+    ZSTD_ldm_gear_init(&hashState, params);
+    while (ip < iend) {
+        size_t hashed;
+        unsigned n;
+
+        numSplits = 0;
+        hashed = ZSTD_ldm_gear_feed(&hashState, ip, iend - ip, splits, &numSplits);
+
+        for (n = 0; n < numSplits; n++) {
+            if (ip + splits[n] >= istart + minMatchLength) {
+                BYTE const* const split = ip + splits[n] - minMatchLength;
+                U64 const xxhash = XXH64(split, minMatchLength, 0);
+                U32 const hash = (U32)(xxhash & (((U32)1 << hBits) - 1));
+                ldmEntry_t entry;
+
+                entry.offset = (U32)(split - base);
+                entry.checksum = (U32)(xxhash >> 32);
+                ZSTD_ldm_insertEntry(ldmState, hash, entry, *params);
+            }
+        }
+
+        ip += hashed;
+    }
+}
+
+
+/** ZSTD_ldm_limitTableUpdate() :
+ *
+ *  Sets cctx->nextToUpdate to a position corresponding closer to anchor
+ *  if it is far way
+ *  (after a long match, only update tables a limited amount). */
+static void ZSTD_ldm_limitTableUpdate(ZSTD_matchState_t* ms, const BYTE* anchor)
+{
+    U32 const curr = (U32)(anchor - ms->window.base);
+    if (curr > ms->nextToUpdate + 1024) {
+        ms->nextToUpdate =
+            curr - MIN(512, curr - ms->nextToUpdate - 1024);
+    }
+}
+
+static size_t ZSTD_ldm_generateSequences_internal(
+        ldmState_t* ldmState, rawSeqStore_t* rawSeqStore,
+        ldmParams_t const* params, void const* src, size_t srcSize)
+{
+    /* LDM parameters */
+    int const extDict = ZSTD_window_hasExtDict(ldmState->window);
+    U32 const minMatchLength = params->minMatchLength;
+    U32 const entsPerBucket = 1U << params->bucketSizeLog;
+    U32 const hBits = params->hashLog - params->bucketSizeLog;
+    /* Prefix and extDict parameters */
+    U32 const dictLimit = ldmState->window.dictLimit;
+    U32 const lowestIndex = extDict ? ldmState->window.lowLimit : dictLimit;
+    BYTE const* const base = ldmState->window.base;
+    BYTE const* const dictBase = extDict ? ldmState->window.dictBase : NULL;
+    BYTE const* const dictStart = extDict ? dictBase + lowestIndex : NULL;
+    BYTE const* const dictEnd = extDict ? dictBase + dictLimit : NULL;
+    BYTE const* const lowPrefixPtr = base + dictLimit;
+    /* Input bounds */
+    BYTE const* const istart = (BYTE const*)src;
+    BYTE const* const iend = istart + srcSize;
+    BYTE const* const ilimit = iend - HASH_READ_SIZE;
+    /* Input positions */
+    BYTE const* anchor = istart;
+    BYTE const* ip = istart;
+    /* Rolling hash state */
+    ldmRollingHashState_t hashState;
+    /* Arrays for staged-processing */
+    size_t* const splits = ldmState->splitIndices;
+    ldmMatchCandidate_t* const candidates = ldmState->matchCandidates;
+    unsigned numSplits;
+
+    if (srcSize < minMatchLength)
+        return iend - anchor;
+
+    /* Initialize the rolling hash state with the first minMatchLength bytes */
+    ZSTD_ldm_gear_init(&hashState, params);
+    ZSTD_ldm_gear_reset(&hashState, ip, minMatchLength);
+    ip += minMatchLength;
+
+    while (ip < ilimit) {
+        size_t hashed;
+        unsigned n;
+
+        numSplits = 0;
+        hashed = ZSTD_ldm_gear_feed(&hashState, ip, ilimit - ip,
+                                    splits, &numSplits);
+
+        for (n = 0; n < numSplits; n++) {
+            BYTE const* const split = ip + splits[n] - minMatchLength;
+            U64 const xxhash = XXH64(split, minMatchLength, 0);
+            U32 const hash = (U32)(xxhash & (((U32)1 << hBits) - 1));
+
+            candidates[n].split = split;
+            candidates[n].hash = hash;
+            candidates[n].checksum = (U32)(xxhash >> 32);
+            candidates[n].bucket = ZSTD_ldm_getBucket(ldmState, hash, *params);
+            PREFETCH_L1(candidates[n].bucket);
+        }
+
+        for (n = 0; n < numSplits; n++) {
+            size_t forwardMatchLength = 0, backwardMatchLength = 0,
+                   bestMatchLength = 0, mLength;
+            U32 offset;
+            BYTE const* const split = candidates[n].split;
+            U32 const checksum = candidates[n].checksum;
+            U32 const hash = candidates[n].hash;
+            ldmEntry_t* const bucket = candidates[n].bucket;
+            ldmEntry_t const* cur;
+            ldmEntry_t const* bestEntry = NULL;
+            ldmEntry_t newEntry;
+
+            newEntry.offset = (U32)(split - base);
+            newEntry.checksum = checksum;
+
+            /* If a split point would generate a sequence overlapping with
+             * the previous one, we merely register it in the hash table and
+             * move on */
+            if (split < anchor) {
+                ZSTD_ldm_insertEntry(ldmState, hash, newEntry, *params);
+                continue;
+            }
+
+            for (cur = bucket; cur < bucket + entsPerBucket; cur++) {
+                size_t curForwardMatchLength, curBackwardMatchLength,
+                       curTotalMatchLength;
+                if (cur->checksum != checksum || cur->offset <= lowestIndex) {
+                    continue;
+                }
+                if (extDict) {
+                    BYTE const* const curMatchBase =
+                        cur->offset < dictLimit ? dictBase : base;
+                    BYTE const* const pMatch = curMatchBase + cur->offset;
+                    BYTE const* const matchEnd =
+                        cur->offset < dictLimit ? dictEnd : iend;
+                    BYTE const* const lowMatchPtr =
+                        cur->offset < dictLimit ? dictStart : lowPrefixPtr;
+                    curForwardMatchLength =
+                        ZSTD_count_2segments(split, pMatch, iend, matchEnd, lowPrefixPtr);
+                    if (curForwardMatchLength < minMatchLength) {
+                        continue;
+                    }
+                    curBackwardMatchLength = ZSTD_ldm_countBackwardsMatch_2segments(
+                            split, anchor, pMatch, lowMatchPtr, dictStart, dictEnd);
+                } else { /* !extDict */
+                    BYTE const* const pMatch = base + cur->offset;
+                    curForwardMatchLength = ZSTD_count(split, pMatch, iend);
+                    if (curForwardMatchLength < minMatchLength) {
+                        continue;
+                    }
+                    curBackwardMatchLength =
+                        ZSTD_ldm_countBackwardsMatch(split, anchor, pMatch, lowPrefixPtr);
+                }
+                curTotalMatchLength = curForwardMatchLength + curBackwardMatchLength;
+
+                if (curTotalMatchLength > bestMatchLength) {
+                    bestMatchLength = curTotalMatchLength;
+                    forwardMatchLength = curForwardMatchLength;
+                    backwardMatchLength = curBackwardMatchLength;
+                    bestEntry = cur;
+                }
+            }
+
+            /* No match found -- insert an entry into the hash table
+             * and process the next candidate match */
+            if (bestEntry == NULL) {
+                ZSTD_ldm_insertEntry(ldmState, hash, newEntry, *params);
+                continue;
+            }
+
+            /* Match found */
+            offset = (U32)(split - base) - bestEntry->offset;
+            mLength = forwardMatchLength + backwardMatchLength;
+            {
+                rawSeq* const seq = rawSeqStore->seq + rawSeqStore->size;
+
+                /* Out of sequence storage */
+                if (rawSeqStore->size == rawSeqStore->capacity)
+                    return ERROR(dstSize_tooSmall);
+                seq->litLength = (U32)(split - backwardMatchLength - anchor);
+                seq->matchLength = (U32)mLength;
+                seq->offset = offset;
+                rawSeqStore->size++;
+            }
+
+            /* Insert the current entry into the hash table --- it must be
+             * done after the previous block to avoid clobbering bestEntry */
+            ZSTD_ldm_insertEntry(ldmState, hash, newEntry, *params);
+
+            anchor = split + forwardMatchLength;
+
+            /* If we find a match that ends after the data that we've hashed
+             * then we have a repeating, overlapping, pattern. E.g. all zeros.
+             * If one repetition of the pattern matches our `stopMask` then all
+             * repetitions will. We don't need to insert them all into out table,
+             * only the first one. So skip over overlapping matches.
+             * This is a major speed boost (20x) for compressing a single byte
+             * repeated, when that byte ends up in the table.
+             */
+            if (anchor > ip + hashed) {
+                ZSTD_ldm_gear_reset(&hashState, anchor - minMatchLength, minMatchLength);
+                /* Continue the outter loop at anchor (ip + hashed == anchor). */
+                ip = anchor - hashed;
+                break;
+            }
+        }
+
+        ip += hashed;
+    }
+
+    return iend - anchor;
+}
+
+/*! ZSTD_ldm_reduceTable() :
+ *  reduce table indexes by `reducerValue` */
+static void ZSTD_ldm_reduceTable(ldmEntry_t* const table, U32 const size,
+                                 U32 const reducerValue)
+{
+    U32 u;
+    for (u = 0; u < size; u++) {
+        if (table[u].offset < reducerValue) table[u].offset = 0;
+        else table[u].offset -= reducerValue;
+    }
+}
+
+size_t ZSTD_ldm_generateSequences(
+        ldmState_t* ldmState, rawSeqStore_t* sequences,
+        ldmParams_t const* params, void const* src, size_t srcSize)
+{
+    U32 const maxDist = 1U << params->windowLog;
+    BYTE const* const istart = (BYTE const*)src;
+    BYTE const* const iend = istart + srcSize;
+    size_t const kMaxChunkSize = 1 << 20;
+    size_t const nbChunks = (srcSize / kMaxChunkSize) + ((srcSize % kMaxChunkSize) != 0);
+    size_t chunk;
+    size_t leftoverSize = 0;
+
+    assert(ZSTD_CHUNKSIZE_MAX >= kMaxChunkSize);
+    /* Check that ZSTD_window_update() has been called for this chunk prior
+     * to passing it to this function.
+     */
+    assert(ldmState->window.nextSrc >= (BYTE const*)src + srcSize);
+    /* The input could be very large (in zstdmt), so it must be broken up into
+     * chunks to enforce the maximum distance and handle overflow correction.
+     */
+    assert(sequences->pos <= sequences->size);
+    assert(sequences->size <= sequences->capacity);
+    for (chunk = 0; chunk < nbChunks && sequences->size < sequences->capacity; ++chunk) {
+        BYTE const* const chunkStart = istart + chunk * kMaxChunkSize;
+        size_t const remaining = (size_t)(iend - chunkStart);
+        BYTE const *const chunkEnd =
+            (remaining < kMaxChunkSize) ? iend : chunkStart + kMaxChunkSize;
+        size_t const chunkSize = chunkEnd - chunkStart;
+        size_t newLeftoverSize;
+        size_t const prevSize = sequences->size;
+
+        assert(chunkStart < iend);
+        /* 1. Perform overflow correction if necessary. */
+        if (ZSTD_window_needOverflowCorrection(ldmState->window, 0, maxDist, ldmState->loadedDictEnd, chunkStart, chunkEnd)) {
+            U32 const ldmHSize = 1U << params->hashLog;
+            U32 const correction = ZSTD_window_correctOverflow(
+                &ldmState->window, /* cycleLog */ 0, maxDist, chunkStart);
+            ZSTD_ldm_reduceTable(ldmState->hashTable, ldmHSize, correction);
+            /* invalidate dictionaries on overflow correction */
+            ldmState->loadedDictEnd = 0;
+        }
+        /* 2. We enforce the maximum offset allowed.
+         *
+         * kMaxChunkSize should be small enough that we don't lose too much of
+         * the window through early invalidation.
+         * TODO: * Test the chunk size.
+         *       * Try invalidation after the sequence generation and test the
+         *         the offset against maxDist directly.
+         *
+         * NOTE: Because of dictionaries + sequence splitting we MUST make sure
+         * that any offset used is valid at the END of the sequence, since it may
+         * be split into two sequences. This condition holds when using
+         * ZSTD_window_enforceMaxDist(), but if we move to checking offsets
+         * against maxDist directly, we'll have to carefully handle that case.
+         */
+        ZSTD_window_enforceMaxDist(&ldmState->window, chunkEnd, maxDist, &ldmState->loadedDictEnd, NULL);
+        /* 3. Generate the sequences for the chunk, and get newLeftoverSize. */
+        newLeftoverSize = ZSTD_ldm_generateSequences_internal(
+            ldmState, sequences, params, chunkStart, chunkSize);
+        if (ZSTD_isError(newLeftoverSize))
+            return newLeftoverSize;
+        /* 4. We add the leftover literals from previous iterations to the first
+         *    newly generated sequence, or add the `newLeftoverSize` if none are
+         *    generated.
+         */
+        /* Prepend the leftover literals from the last call */
+        if (prevSize < sequences->size) {
+            sequences->seq[prevSize].litLength += (U32)leftoverSize;
+            leftoverSize = newLeftoverSize;
+        } else {
+            assert(newLeftoverSize == chunkSize);
+            leftoverSize += chunkSize;
+        }
+    }
+    return 0;
+}
+
+void ZSTD_ldm_skipSequences(rawSeqStore_t* rawSeqStore, size_t srcSize, U32 const minMatch) {
+    while (srcSize > 0 && rawSeqStore->pos < rawSeqStore->size) {
+        rawSeq* seq = rawSeqStore->seq + rawSeqStore->pos;
+        if (srcSize <= seq->litLength) {
+            /* Skip past srcSize literals */
+            seq->litLength -= (U32)srcSize;
+            return;
+        }
+        srcSize -= seq->litLength;
+        seq->litLength = 0;
+        if (srcSize < seq->matchLength) {
+            /* Skip past the first srcSize of the match */
+            seq->matchLength -= (U32)srcSize;
+            if (seq->matchLength < minMatch) {
+                /* The match is too short, omit it */
+                if (rawSeqStore->pos + 1 < rawSeqStore->size) {
+                    seq[1].litLength += seq[0].matchLength;
+                }
+                rawSeqStore->pos++;
+            }
+            return;
+        }
+        srcSize -= seq->matchLength;
+        seq->matchLength = 0;
+        rawSeqStore->pos++;
+    }
+}
+
+/**
+ * If the sequence length is longer than remaining then the sequence is split
+ * between this block and the next.
+ *
+ * Returns the current sequence to handle, or if the rest of the block should
+ * be literals, it returns a sequence with offset == 0.
+ */
+static rawSeq maybeSplitSequence(rawSeqStore_t* rawSeqStore,
+                                 U32 const remaining, U32 const minMatch)
+{
+    rawSeq sequence = rawSeqStore->seq[rawSeqStore->pos];
+    assert(sequence.offset > 0);
+    /* Likely: No partial sequence */
+    if (remaining >= sequence.litLength + sequence.matchLength) {
+        rawSeqStore->pos++;
+        return sequence;
+    }
+    /* Cut the sequence short (offset == 0 ==> rest is literals). */
+    if (remaining <= sequence.litLength) {
+        sequence.offset = 0;
+    } else if (remaining < sequence.litLength + sequence.matchLength) {
+        sequence.matchLength = remaining - sequence.litLength;
+        if (sequence.matchLength < minMatch) {
+            sequence.offset = 0;
+        }
+    }
+    /* Skip past `remaining` bytes for the future sequences. */
+    ZSTD_ldm_skipSequences(rawSeqStore, remaining, minMatch);
+    return sequence;
+}
+
+void ZSTD_ldm_skipRawSeqStoreBytes(rawSeqStore_t* rawSeqStore, size_t nbBytes) {
+    U32 currPos = (U32)(rawSeqStore->posInSequence + nbBytes);
+    while (currPos && rawSeqStore->pos < rawSeqStore->size) {
+        rawSeq currSeq = rawSeqStore->seq[rawSeqStore->pos];
+        if (currPos >= currSeq.litLength + currSeq.matchLength) {
+            currPos -= currSeq.litLength + currSeq.matchLength;
+            rawSeqStore->pos++;
+        } else {
+            rawSeqStore->posInSequence = currPos;
+            break;
+        }
+    }
+    if (currPos == 0 || rawSeqStore->pos == rawSeqStore->size) {
+        rawSeqStore->posInSequence = 0;
+    }
+}
+
+size_t ZSTD_ldm_blockCompress(rawSeqStore_t* rawSeqStore,
+    ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+    ZSTD_useRowMatchFinderMode_e useRowMatchFinder,
+    void const* src, size_t srcSize)
+{
+    const ZSTD_compressionParameters* const cParams = &ms->cParams;
+    unsigned const minMatch = cParams->minMatch;
+    ZSTD_blockCompressor const blockCompressor =
+        ZSTD_selectBlockCompressor(cParams->strategy, useRowMatchFinder, ZSTD_matchState_dictMode(ms));
+    /* Input bounds */
+    BYTE const* const istart = (BYTE const*)src;
+    BYTE const* const iend = istart + srcSize;
+    /* Input positions */
+    BYTE const* ip = istart;
+
+    DEBUGLOG(5, "ZSTD_ldm_blockCompress: srcSize=%zu", srcSize);
+    /* If using opt parser, use LDMs only as candidates rather than always accepting them */
+    if (cParams->strategy >= ZSTD_btopt) {
+        size_t lastLLSize;
+        ms->ldmSeqStore = rawSeqStore;
+        lastLLSize = blockCompressor(ms, seqStore, rep, src, srcSize);
+        ZSTD_ldm_skipRawSeqStoreBytes(rawSeqStore, srcSize);
+        return lastLLSize;
+    }
+
+    assert(rawSeqStore->pos <= rawSeqStore->size);
+    assert(rawSeqStore->size <= rawSeqStore->capacity);
+    /* Loop through each sequence and apply the block compressor to the literals */
+    while (rawSeqStore->pos < rawSeqStore->size && ip < iend) {
+        /* maybeSplitSequence updates rawSeqStore->pos */
+        rawSeq const sequence = maybeSplitSequence(rawSeqStore,
+                                                   (U32)(iend - ip), minMatch);
+        int i;
+        /* End signal */
+        if (sequence.offset == 0)
+            break;
+
+        assert(ip + sequence.litLength + sequence.matchLength <= iend);
+
+        /* Fill tables for block compressor */
+        ZSTD_ldm_limitTableUpdate(ms, ip);
+        ZSTD_ldm_fillFastTables(ms, ip);
+        /* Run the block compressor */
+        DEBUGLOG(5, "pos %u : calling block compressor on segment of size %u", (unsigned)(ip-istart), sequence.litLength);
+        {
+            size_t const newLitLength =
+                blockCompressor(ms, seqStore, rep, ip, sequence.litLength);
+            ip += sequence.litLength;
+            /* Update the repcodes */
+            for (i = ZSTD_REP_NUM - 1; i > 0; i--)
+                rep[i] = rep[i-1];
+            rep[0] = sequence.offset;
+            /* Store the sequence */
+            ZSTD_storeSeq(seqStore, newLitLength, ip - newLitLength, iend,
+                          sequence.offset + ZSTD_REP_MOVE,
+                          sequence.matchLength - MINMATCH);
+            ip += sequence.matchLength;
+        }
+    }
+    /* Fill the tables for the block compressor */
+    ZSTD_ldm_limitTableUpdate(ms, ip);
+    ZSTD_ldm_fillFastTables(ms, ip);
+    /* Compress the last literals */
+    return blockCompressor(ms, seqStore, rep, ip, iend - ip);
+}
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_ldm_geartab.h mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_ldm_geartab.h
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_ldm_geartab.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_ldm_geartab.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+#ifndef ZSTD_LDM_GEARTAB_H
+#define ZSTD_LDM_GEARTAB_H
+
+static U64 ZSTD_ldm_gearTab[256] = {
+    0xf5b8f72c5f77775c, 0x84935f266b7ac412, 0xb647ada9ca730ccc,
+    0xb065bb4b114fb1de, 0x34584e7e8c3a9fd0, 0x4e97e17c6ae26b05,
+    0x3a03d743bc99a604, 0xcecd042422c4044f, 0x76de76c58524259e,
+    0x9c8528f65badeaca, 0x86563706e2097529, 0x2902475fa375d889,
+    0xafb32a9739a5ebe6, 0xce2714da3883e639, 0x21eaf821722e69e,
+    0x37b628620b628,    0x49a8d455d88caf5,  0x8556d711e6958140,
+    0x4f7ae74fc605c1f,  0x829f0c3468bd3a20, 0x4ffdc885c625179e,
+    0x8473de048a3daf1b, 0x51008822b05646b2, 0x69d75d12b2d1cc5f,
+    0x8c9d4a19159154bc, 0xc3cc10f4abbd4003, 0xd06ddc1cecb97391,
+    0xbe48e6e7ed80302e, 0x3481db31cee03547, 0xacc3f67cdaa1d210,
+    0x65cb771d8c7f96cc, 0x8eb27177055723dd, 0xc789950d44cd94be,
+    0x934feadc3700b12b, 0x5e485f11edbdf182, 0x1e2e2a46fd64767a,
+    0x2969ca71d82efa7c, 0x9d46e9935ebbba2e, 0xe056b67e05e6822b,
+    0x94d73f55739d03a0, 0xcd7010bdb69b5a03, 0x455ef9fcd79b82f4,
+    0x869cb54a8749c161, 0x38d1a4fa6185d225, 0xb475166f94bbe9bb,
+    0xa4143548720959f1, 0x7aed4780ba6b26ba, 0xd0ce264439e02312,
+    0x84366d746078d508, 0xa8ce973c72ed17be, 0x21c323a29a430b01,
+    0x9962d617e3af80ee, 0xab0ce91d9c8cf75b, 0x530e8ee6d19a4dbc,
+    0x2ef68c0cf53f5d72, 0xc03a681640a85506, 0x496e4e9f9c310967,
+    0x78580472b59b14a0, 0x273824c23b388577, 0x66bf923ad45cb553,
+    0x47ae1a5a2492ba86, 0x35e304569e229659, 0x4765182a46870b6f,
+    0x6cbab625e9099412, 0xddac9a2e598522c1, 0x7172086e666624f2,
+    0xdf5003ca503b7837, 0x88c0c1db78563d09, 0x58d51865acfc289d,
+    0x177671aec65224f1, 0xfb79d8a241e967d7, 0x2be1e101cad9a49a,
+    0x6625682f6e29186b, 0x399553457ac06e50, 0x35dffb4c23abb74,
+    0x429db2591f54aade, 0xc52802a8037d1009, 0x6acb27381f0b25f3,
+    0xf45e2551ee4f823b, 0x8b0ea2d99580c2f7, 0x3bed519cbcb4e1e1,
+    0xff452823dbb010a,  0x9d42ed614f3dd267, 0x5b9313c06257c57b,
+    0xa114b8008b5e1442, 0xc1fe311c11c13d4b, 0x66e8763ea34c5568,
+    0x8b982af1c262f05d, 0xee8876faaa75fbb7, 0x8a62a4d0d172bb2a,
+    0xc13d94a3b7449a97, 0x6dbbba9dc15d037c, 0xc786101f1d92e0f1,
+    0xd78681a907a0b79b, 0xf61aaf2962c9abb9, 0x2cfd16fcd3cb7ad9,
+    0x868c5b6744624d21, 0x25e650899c74ddd7, 0xba042af4a7c37463,
+    0x4eb1a539465a3eca, 0xbe09dbf03b05d5ca, 0x774e5a362b5472ba,
+    0x47a1221229d183cd, 0x504b0ca18ef5a2df, 0xdffbdfbde2456eb9,
+    0x46cd2b2fbee34634, 0xf2aef8fe819d98c3, 0x357f5276d4599d61,
+    0x24a5483879c453e3, 0x88026889192b4b9,  0x28da96671782dbec,
+    0x4ef37c40588e9aaa, 0x8837b90651bc9fb3, 0xc164f741d3f0e5d6,
+    0xbc135a0a704b70ba, 0x69cd868f7622ada,  0xbc37ba89e0b9c0ab,
+    0x47c14a01323552f6, 0x4f00794bacee98bb, 0x7107de7d637a69d5,
+    0x88af793bb6f2255e, 0xf3c6466b8799b598, 0xc288c616aa7f3b59,
+    0x81ca63cf42fca3fd, 0x88d85ace36a2674b, 0xd056bd3792389e7,
+    0xe55c396c4e9dd32d, 0xbefb504571e6c0a6, 0x96ab32115e91e8cc,
+    0xbf8acb18de8f38d1, 0x66dae58801672606, 0x833b6017872317fb,
+    0xb87c16f2d1c92864, 0xdb766a74e58b669c, 0x89659f85c61417be,
+    0xc8daad856011ea0c, 0x76a4b565b6fe7eae, 0xa469d085f6237312,
+    0xaaf0365683a3e96c, 0x4dbb746f8424f7b8, 0x638755af4e4acc1,
+    0x3d7807f5bde64486, 0x17be6d8f5bbb7639, 0x903f0cd44dc35dc,
+    0x67b672eafdf1196c, 0xa676ff93ed4c82f1, 0x521d1004c5053d9d,
+    0x37ba9ad09ccc9202, 0x84e54d297aacfb51, 0xa0b4b776a143445,
+    0x820d471e20b348e,  0x1874383cb83d46dc, 0x97edeec7a1efe11c,
+    0xb330e50b1bdc42aa, 0x1dd91955ce70e032, 0xa514cdb88f2939d5,
+    0x2791233fd90db9d3, 0x7b670a4cc50f7a9b, 0x77c07d2a05c6dfa5,
+    0xe3778b6646d0a6fa, 0xb39c8eda47b56749, 0x933ed448addbef28,
+    0xaf846af6ab7d0bf4, 0xe5af208eb666e49,  0x5e6622f73534cd6a,
+    0x297daeca42ef5b6e, 0x862daef3d35539a6, 0xe68722498f8e1ea9,
+    0x981c53093dc0d572, 0xfa09b0bfbf86fbf5, 0x30b1e96166219f15,
+    0x70e7d466bdc4fb83, 0x5a66736e35f2a8e9, 0xcddb59d2b7c1baef,
+    0xd6c7d247d26d8996, 0xea4e39eac8de1ba3, 0x539c8bb19fa3aff2,
+    0x9f90e4c5fd508d8,  0xa34e5956fbaf3385, 0x2e2f8e151d3ef375,
+    0x173691e9b83faec1, 0xb85a8d56bf016379, 0x8382381267408ae3,
+    0xb90f901bbdc0096d, 0x7c6ad32933bcec65, 0x76bb5e2f2c8ad595,
+    0x390f851a6cf46d28, 0xc3e6064da1c2da72, 0xc52a0c101cfa5389,
+    0xd78eaf84a3fbc530, 0x3781b9e2288b997e, 0x73c2f6dea83d05c4,
+    0x4228e364c5b5ed7,  0x9d7a3edf0da43911, 0x8edcfeda24686756,
+    0x5e7667a7b7a9b3a1, 0x4c4f389fa143791d, 0xb08bc1023da7cddc,
+    0x7ab4be3ae529b1cc, 0x754e6132dbe74ff9, 0x71635442a839df45,
+    0x2f6fb1643fbe52de, 0x961e0a42cf7a8177, 0xf3b45d83d89ef2ea,
+    0xee3de4cf4a6e3e9b, 0xcd6848542c3295e7, 0xe4cee1664c78662f,
+    0x9947548b474c68c4, 0x25d73777a5ed8b0b, 0xc915b1d636b7fc,
+    0x21c2ba75d9b0d2da, 0x5f6b5dcf608a64a1, 0xdcf333255ff9570c,
+    0x633b922418ced4ee, 0xc136dde0b004b34a, 0x58cc83b05d4b2f5a,
+    0x5eb424dda28e42d2, 0x62df47369739cd98, 0xb4e0b42485e4ce17,
+    0x16e1f0c1f9a8d1e7, 0x8ec3916707560ebf, 0x62ba6e2df2cc9db3,
+    0xcbf9f4ff77d83a16, 0x78d9d7d07d2bbcc4, 0xef554ce1e02c41f4,
+    0x8d7581127eccf94d, 0xa9b53336cb3c8a05, 0x38c42c0bf45c4f91,
+    0x640893cdf4488863, 0x80ec34bc575ea568, 0x39f324f5b48eaa40,
+    0xe9d9ed1f8eff527f, 0x9224fc058cc5a214, 0xbaba00b04cfe7741,
+    0x309a9f120fcf52af, 0xa558f3ec65626212, 0x424bec8b7adabe2f,
+    0x41622513a6aea433, 0xb88da2d5324ca798, 0xd287733b245528a4,
+    0x9a44697e6d68aec3, 0x7b1093be2f49bb28, 0x50bbec632e3d8aad,
+    0x6cd90723e1ea8283, 0x897b9e7431b02bf3, 0x219efdcb338a7047,
+    0x3b0311f0a27c0656, 0xdb17bf91c0db96e7, 0x8cd4fd6b4e85a5b2,
+    0xfab071054ba6409d, 0x40d6fe831fa9dfd9, 0xaf358debad7d791e,
+    0xeb8d0e25a65e3e58, 0xbbcbd3df14e08580, 0xcf751f27ecdab2b,
+    0x2b4da14f2613d8f4
+};
+
+#endif /* ZSTD_LDM_GEARTAB_H */
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_ldm.h mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_ldm.h
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_ldm.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_ldm.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+#ifndef ZSTD_LDM_H
+#define ZSTD_LDM_H
+
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
+#include "zstd_compress_internal.h"   /* ldmParams_t, U32 */
+#include "../zstd.h"   /* ZSTD_CCtx, size_t */
+
+/*-*************************************
+*  Long distance matching
+***************************************/
+
+#define ZSTD_LDM_DEFAULT_WINDOW_LOG ZSTD_WINDOWLOG_LIMIT_DEFAULT
+
+void ZSTD_ldm_fillHashTable(
+            ldmState_t* state, const BYTE* ip,
+            const BYTE* iend, ldmParams_t const* params);
+
+/**
+ * ZSTD_ldm_generateSequences():
+ *
+ * Generates the sequences using the long distance match finder.
+ * Generates long range matching sequences in `sequences`, which parse a prefix
+ * of the source. `sequences` must be large enough to store every sequence,
+ * which can be checked with `ZSTD_ldm_getMaxNbSeq()`.
+ * @returns 0 or an error code.
+ *
+ * NOTE: The user must have called ZSTD_window_update() for all of the input
+ * they have, even if they pass it to ZSTD_ldm_generateSequences() in chunks.
+ * NOTE: This function returns an error if it runs out of space to store
+ *       sequences.
+ */
+size_t ZSTD_ldm_generateSequences(
+            ldmState_t* ldms, rawSeqStore_t* sequences,
+            ldmParams_t const* params, void const* src, size_t srcSize);
+
+/**
+ * ZSTD_ldm_blockCompress():
+ *
+ * Compresses a block using the predefined sequences, along with a secondary
+ * block compressor. The literals section of every sequence is passed to the
+ * secondary block compressor, and those sequences are interspersed with the
+ * predefined sequences. Returns the length of the last literals.
+ * Updates `rawSeqStore.pos` to indicate how many sequences have been consumed.
+ * `rawSeqStore.seq` may also be updated to split the last sequence between two
+ * blocks.
+ * @return The length of the last literals.
+ *
+ * NOTE: The source must be at most the maximum block size, but the predefined
+ * sequences can be any size, and may be longer than the block. In the case that
+ * they are longer than the block, the last sequences may need to be split into
+ * two. We handle that case correctly, and update `rawSeqStore` appropriately.
+ * NOTE: This function does not return any errors.
+ */
+size_t ZSTD_ldm_blockCompress(rawSeqStore_t* rawSeqStore,
+            ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+            ZSTD_useRowMatchFinderMode_e useRowMatchFinder,
+            void const* src, size_t srcSize);
+
+/**
+ * ZSTD_ldm_skipSequences():
+ *
+ * Skip past `srcSize` bytes worth of sequences in `rawSeqStore`.
+ * Avoids emitting matches less than `minMatch` bytes.
+ * Must be called for data that is not passed to ZSTD_ldm_blockCompress().
+ */
+void ZSTD_ldm_skipSequences(rawSeqStore_t* rawSeqStore, size_t srcSize,
+    U32 const minMatch);
+
+/* ZSTD_ldm_skipRawSeqStoreBytes():
+ * Moves forward in rawSeqStore by nbBytes, updating fields 'pos' and 'posInSequence'.
+ * Not to be used in conjunction with ZSTD_ldm_skipSequences().
+ * Must be called for data with is not passed to ZSTD_ldm_blockCompress().
+ */
+void ZSTD_ldm_skipRawSeqStoreBytes(rawSeqStore_t* rawSeqStore, size_t nbBytes);
+
+/** ZSTD_ldm_getTableSize() :
+ *  Estimate the space needed for long distance matching tables or 0 if LDM is
+ *  disabled.
+ */
+size_t ZSTD_ldm_getTableSize(ldmParams_t params);
+
+/** ZSTD_ldm_getSeqSpace() :
+ *  Return an upper bound on the number of sequences that can be produced by
+ *  the long distance matcher, or 0 if LDM is disabled.
+ */
+size_t ZSTD_ldm_getMaxNbSeq(ldmParams_t params, size_t maxChunkSize);
+
+/** ZSTD_ldm_adjustParameters() :
+ *  If the params->hashRateLog is not set, set it to its default value based on
+ *  windowLog and params->hashLog.
+ *
+ *  Ensures that params->bucketSizeLog is <= params->hashLog (setting it to
+ *  params->hashLog if it is not).
+ *
+ *  Ensures that the minMatchLength >= targetLength during optimal parsing.
+ */
+void ZSTD_ldm_adjustParameters(ldmParams_t* params,
+                               ZSTD_compressionParameters const* cParams);
+
+#if defined (__cplusplus)
+}
+#endif
+
+#endif /* ZSTD_FAST_H */
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstdmt_compress.c mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstdmt_compress.c
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstdmt_compress.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstdmt_compress.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,1821 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+
+/* ======   Compiler specifics   ====== */
+#if defined(_MSC_VER)
+#  pragma warning(disable : 4204)   /* disable: C4204: non-constant aggregate initializer */
+#endif
+
+
+/* ======   Constants   ====== */
+#define ZSTDMT_OVERLAPLOG_DEFAULT 0
+
+
+/* ======   Dependencies   ====== */
+#include "../common/zstd_deps.h"   /* ZSTD_memcpy, ZSTD_memset, INT_MAX, UINT_MAX */
+#include "../common/mem.h"         /* MEM_STATIC */
+#include "../common/pool.h"        /* threadpool */
+#include "../common/threading.h"   /* mutex */
+#include "zstd_compress_internal.h"  /* MIN, ERROR, ZSTD_*, ZSTD_highbit32 */
+#include "zstd_ldm.h"
+#include "zstdmt_compress.h"
+
+/* Guards code to support resizing the SeqPool.
+ * We will want to resize the SeqPool to save memory in the future.
+ * Until then, comment the code out since it is unused.
+ */
+#define ZSTD_RESIZE_SEQPOOL 0
+
+/* ======   Debug   ====== */
+#if defined(DEBUGLEVEL) && (DEBUGLEVEL>=2) \
+    && !defined(_MSC_VER) \
+    && !defined(__MINGW32__)
+
+#  include <stdio.h>
+#  include <unistd.h>
+#  include <sys/times.h>
+
+#  define DEBUG_PRINTHEX(l,p,n) {            \
+    unsigned debug_u;                        \
+    for (debug_u=0; debug_u<(n); debug_u++)  \
+        RAWLOG(l, "%02X ", ((const unsigned char*)(p))[debug_u]); \
+    RAWLOG(l, " \n");                        \
+}
+
+static unsigned long long GetCurrentClockTimeMicroseconds(void)
+{
+   static clock_t _ticksPerSecond = 0;
+   if (_ticksPerSecond <= 0) _ticksPerSecond = sysconf(_SC_CLK_TCK);
+
+   {   struct tms junk; clock_t newTicks = (clock_t) times(&junk);
+       return ((((unsigned long long)newTicks)*(1000000))/_ticksPerSecond);
+}  }
+
+#define MUTEX_WAIT_TIME_DLEVEL 6
+#define ZSTD_PTHREAD_MUTEX_LOCK(mutex) {          \
+    if (DEBUGLEVEL >= MUTEX_WAIT_TIME_DLEVEL) {   \
+        unsigned long long const beforeTime = GetCurrentClockTimeMicroseconds(); \
+        ZSTD_pthread_mutex_lock(mutex);           \
+        {   unsigned long long const afterTime = GetCurrentClockTimeMicroseconds(); \
+            unsigned long long const elapsedTime = (afterTime-beforeTime); \
+            if (elapsedTime > 1000) {  /* or whatever threshold you like; I'm using 1 millisecond here */ \
+                DEBUGLOG(MUTEX_WAIT_TIME_DLEVEL, "Thread took %llu microseconds to acquire mutex %s \n", \
+                   elapsedTime, #mutex);          \
+        }   }                                     \
+    } else {                                      \
+        ZSTD_pthread_mutex_lock(mutex);           \
+    }                                             \
+}
+
+#else
+
+#  define ZSTD_PTHREAD_MUTEX_LOCK(m) ZSTD_pthread_mutex_lock(m)
+#  define DEBUG_PRINTHEX(l,p,n) {}
+
+#endif
+
+
+/* =====   Buffer Pool   ===== */
+/* a single Buffer Pool can be invoked from multiple threads in parallel */
+
+typedef struct buffer_s {
+    void* start;
+    size_t capacity;
+} buffer_t;
+
+static const buffer_t g_nullBuffer = { NULL, 0 };
+
+typedef struct ZSTDMT_bufferPool_s {
+    ZSTD_pthread_mutex_t poolMutex;
+    size_t bufferSize;
+    unsigned totalBuffers;
+    unsigned nbBuffers;
+    ZSTD_customMem cMem;
+    buffer_t bTable[1];   /* variable size */
+} ZSTDMT_bufferPool;
+
+static ZSTDMT_bufferPool* ZSTDMT_createBufferPool(unsigned nbWorkers, ZSTD_customMem cMem)
+{
+    unsigned const maxNbBuffers = 2*nbWorkers + 3;
+    ZSTDMT_bufferPool* const bufPool = (ZSTDMT_bufferPool*)ZSTD_customCalloc(
+        sizeof(ZSTDMT_bufferPool) + (maxNbBuffers-1) * sizeof(buffer_t), cMem);
+    if (bufPool==NULL) return NULL;
+    if (ZSTD_pthread_mutex_init(&bufPool->poolMutex, NULL)) {
+        ZSTD_customFree(bufPool, cMem);
+        return NULL;
+    }
+    bufPool->bufferSize = 64 KB;
+    bufPool->totalBuffers = maxNbBuffers;
+    bufPool->nbBuffers = 0;
+    bufPool->cMem = cMem;
+    return bufPool;
+}
+
+static void ZSTDMT_freeBufferPool(ZSTDMT_bufferPool* bufPool)
+{
+    unsigned u;
+    DEBUGLOG(3, "ZSTDMT_freeBufferPool (address:%08X)", (U32)(size_t)bufPool);
+    if (!bufPool) return;   /* compatibility with free on NULL */
+    for (u=0; u<bufPool->totalBuffers; u++) {
+        DEBUGLOG(4, "free buffer %2u (address:%08X)", u, (U32)(size_t)bufPool->bTable[u].start);
+        ZSTD_customFree(bufPool->bTable[u].start, bufPool->cMem);
+    }
+    ZSTD_pthread_mutex_destroy(&bufPool->poolMutex);
+    ZSTD_customFree(bufPool, bufPool->cMem);
+}
+
+/* only works at initialization, not during compression */
+static size_t ZSTDMT_sizeof_bufferPool(ZSTDMT_bufferPool* bufPool)
+{
+    size_t const poolSize = sizeof(*bufPool)
+                          + (bufPool->totalBuffers - 1) * sizeof(buffer_t);
+    unsigned u;
+    size_t totalBufferSize = 0;
+    ZSTD_pthread_mutex_lock(&bufPool->poolMutex);
+    for (u=0; u<bufPool->totalBuffers; u++)
+        totalBufferSize += bufPool->bTable[u].capacity;
+    ZSTD_pthread_mutex_unlock(&bufPool->poolMutex);
+
+    return poolSize + totalBufferSize;
+}
+
+/* ZSTDMT_setBufferSize() :
+ * all future buffers provided by this buffer pool will have _at least_ this size
+ * note : it's better for all buffers to have same size,
+ * as they become freely interchangeable, reducing malloc/free usages and memory fragmentation */
+static void ZSTDMT_setBufferSize(ZSTDMT_bufferPool* const bufPool, size_t const bSize)
+{
+    ZSTD_pthread_mutex_lock(&bufPool->poolMutex);
+    DEBUGLOG(4, "ZSTDMT_setBufferSize: bSize = %u", (U32)bSize);
+    bufPool->bufferSize = bSize;
+    ZSTD_pthread_mutex_unlock(&bufPool->poolMutex);
+}
+
+
+static ZSTDMT_bufferPool* ZSTDMT_expandBufferPool(ZSTDMT_bufferPool* srcBufPool, U32 nbWorkers)
+{
+    unsigned const maxNbBuffers = 2*nbWorkers + 3;
+    if (srcBufPool==NULL) return NULL;
+    if (srcBufPool->totalBuffers >= maxNbBuffers) /* good enough */
+        return srcBufPool;
+    /* need a larger buffer pool */
+    {   ZSTD_customMem const cMem = srcBufPool->cMem;
+        size_t const bSize = srcBufPool->bufferSize;   /* forward parameters */
+        ZSTDMT_bufferPool* newBufPool;
+        ZSTDMT_freeBufferPool(srcBufPool);
+        newBufPool = ZSTDMT_createBufferPool(nbWorkers, cMem);
+        if (newBufPool==NULL) return newBufPool;
+        ZSTDMT_setBufferSize(newBufPool, bSize);
+        return newBufPool;
+    }
+}
+
+/** ZSTDMT_getBuffer() :
+ *  assumption : bufPool must be valid
+ * @return : a buffer, with start pointer and size
+ *  note: allocation may fail, in this case, start==NULL and size==0 */
+static buffer_t ZSTDMT_getBuffer(ZSTDMT_bufferPool* bufPool)
+{
+    size_t const bSize = bufPool->bufferSize;
+    DEBUGLOG(5, "ZSTDMT_getBuffer: bSize = %u", (U32)bufPool->bufferSize);
+    ZSTD_pthread_mutex_lock(&bufPool->poolMutex);
+    if (bufPool->nbBuffers) {   /* try to use an existing buffer */
+        buffer_t const buf = bufPool->bTable[--(bufPool->nbBuffers)];
+        size_t const availBufferSize = buf.capacity;
+        bufPool->bTable[bufPool->nbBuffers] = g_nullBuffer;
+        if ((availBufferSize >= bSize) & ((availBufferSize>>3) <= bSize)) {
+            /* large enough, but not too much */
+            DEBUGLOG(5, "ZSTDMT_getBuffer: provide buffer %u of size %u",
+                        bufPool->nbBuffers, (U32)buf.capacity);
+            ZSTD_pthread_mutex_unlock(&bufPool->poolMutex);
+            return buf;
+        }
+        /* size conditions not respected : scratch this buffer, create new one */
+        DEBUGLOG(5, "ZSTDMT_getBuffer: existing buffer does not meet size conditions => freeing");
+        ZSTD_customFree(buf.start, bufPool->cMem);
+    }
+    ZSTD_pthread_mutex_unlock(&bufPool->poolMutex);
+    /* create new buffer */
+    DEBUGLOG(5, "ZSTDMT_getBuffer: create a new buffer");
+    {   buffer_t buffer;
+        void* const start = ZSTD_customMalloc(bSize, bufPool->cMem);
+        buffer.start = start;   /* note : start can be NULL if malloc fails ! */
+        buffer.capacity = (start==NULL) ? 0 : bSize;
+        if (start==NULL) {
+            DEBUGLOG(5, "ZSTDMT_getBuffer: buffer allocation failure !!");
+        } else {
+            DEBUGLOG(5, "ZSTDMT_getBuffer: created buffer of size %u", (U32)bSize);
+        }
+        return buffer;
+    }
+}
+
+#if ZSTD_RESIZE_SEQPOOL
+/** ZSTDMT_resizeBuffer() :
+ * assumption : bufPool must be valid
+ * @return : a buffer that is at least the buffer pool buffer size.
+ *           If a reallocation happens, the data in the input buffer is copied.
+ */
+static buffer_t ZSTDMT_resizeBuffer(ZSTDMT_bufferPool* bufPool, buffer_t buffer)
+{
+    size_t const bSize = bufPool->bufferSize;
+    if (buffer.capacity < bSize) {
+        void* const start = ZSTD_customMalloc(bSize, bufPool->cMem);
+        buffer_t newBuffer;
+        newBuffer.start = start;
+        newBuffer.capacity = start == NULL ? 0 : bSize;
+        if (start != NULL) {
+            assert(newBuffer.capacity >= buffer.capacity);
+            ZSTD_memcpy(newBuffer.start, buffer.start, buffer.capacity);
+            DEBUGLOG(5, "ZSTDMT_resizeBuffer: created buffer of size %u", (U32)bSize);
+            return newBuffer;
+        }
+        DEBUGLOG(5, "ZSTDMT_resizeBuffer: buffer allocation failure !!");
+    }
+    return buffer;
+}
+#endif
+
+/* store buffer for later re-use, up to pool capacity */
+static void ZSTDMT_releaseBuffer(ZSTDMT_bufferPool* bufPool, buffer_t buf)
+{
+    DEBUGLOG(5, "ZSTDMT_releaseBuffer");
+    if (buf.start == NULL) return;   /* compatible with release on NULL */
+    ZSTD_pthread_mutex_lock(&bufPool->poolMutex);
+    if (bufPool->nbBuffers < bufPool->totalBuffers) {
+        bufPool->bTable[bufPool->nbBuffers++] = buf;  /* stored for later use */
+        DEBUGLOG(5, "ZSTDMT_releaseBuffer: stored buffer of size %u in slot %u",
+                    (U32)buf.capacity, (U32)(bufPool->nbBuffers-1));
+        ZSTD_pthread_mutex_unlock(&bufPool->poolMutex);
+        return;
+    }
+    ZSTD_pthread_mutex_unlock(&bufPool->poolMutex);
+    /* Reached bufferPool capacity (should not happen) */
+    DEBUGLOG(5, "ZSTDMT_releaseBuffer: pool capacity reached => freeing ");
+    ZSTD_customFree(buf.start, bufPool->cMem);
+}
+
+
+/* =====   Seq Pool Wrapper   ====== */
+
+typedef ZSTDMT_bufferPool ZSTDMT_seqPool;
+
+static size_t ZSTDMT_sizeof_seqPool(ZSTDMT_seqPool* seqPool)
+{
+    return ZSTDMT_sizeof_bufferPool(seqPool);
+}
+
+static rawSeqStore_t bufferToSeq(buffer_t buffer)
+{
+    rawSeqStore_t seq = kNullRawSeqStore;
+    seq.seq = (rawSeq*)buffer.start;
+    seq.capacity = buffer.capacity / sizeof(rawSeq);
+    return seq;
+}
+
+static buffer_t seqToBuffer(rawSeqStore_t seq)
+{
+    buffer_t buffer;
+    buffer.start = seq.seq;
+    buffer.capacity = seq.capacity * sizeof(rawSeq);
+    return buffer;
+}
+
+static rawSeqStore_t ZSTDMT_getSeq(ZSTDMT_seqPool* seqPool)
+{
+    if (seqPool->bufferSize == 0) {
+        return kNullRawSeqStore;
+    }
+    return bufferToSeq(ZSTDMT_getBuffer(seqPool));
+}
+
+#if ZSTD_RESIZE_SEQPOOL
+static rawSeqStore_t ZSTDMT_resizeSeq(ZSTDMT_seqPool* seqPool, rawSeqStore_t seq)
+{
+  return bufferToSeq(ZSTDMT_resizeBuffer(seqPool, seqToBuffer(seq)));
+}
+#endif
+
+static void ZSTDMT_releaseSeq(ZSTDMT_seqPool* seqPool, rawSeqStore_t seq)
+{
+  ZSTDMT_releaseBuffer(seqPool, seqToBuffer(seq));
+}
+
+static void ZSTDMT_setNbSeq(ZSTDMT_seqPool* const seqPool, size_t const nbSeq)
+{
+  ZSTDMT_setBufferSize(seqPool, nbSeq * sizeof(rawSeq));
+}
+
+static ZSTDMT_seqPool* ZSTDMT_createSeqPool(unsigned nbWorkers, ZSTD_customMem cMem)
+{
+    ZSTDMT_seqPool* const seqPool = ZSTDMT_createBufferPool(nbWorkers, cMem);
+    if (seqPool == NULL) return NULL;
+    ZSTDMT_setNbSeq(seqPool, 0);
+    return seqPool;
+}
+
+static void ZSTDMT_freeSeqPool(ZSTDMT_seqPool* seqPool)
+{
+    ZSTDMT_freeBufferPool(seqPool);
+}
+
+static ZSTDMT_seqPool* ZSTDMT_expandSeqPool(ZSTDMT_seqPool* pool, U32 nbWorkers)
+{
+    return ZSTDMT_expandBufferPool(pool, nbWorkers);
+}
+
+
+/* =====   CCtx Pool   ===== */
+/* a single CCtx Pool can be invoked from multiple threads in parallel */
+
+typedef struct {
+    ZSTD_pthread_mutex_t poolMutex;
+    int totalCCtx;
+    int availCCtx;
+    ZSTD_customMem cMem;
+    ZSTD_CCtx* cctx[1];   /* variable size */
+} ZSTDMT_CCtxPool;
+
+/* note : all CCtx borrowed from the pool should be released back to the pool _before_ freeing the pool */
+static void ZSTDMT_freeCCtxPool(ZSTDMT_CCtxPool* pool)
+{
+    int cid;
+    for (cid=0; cid<pool->totalCCtx; cid++)
+        ZSTD_freeCCtx(pool->cctx[cid]);  /* note : compatible with free on NULL */
+    ZSTD_pthread_mutex_destroy(&pool->poolMutex);
+    ZSTD_customFree(pool, pool->cMem);
+}
+
+/* ZSTDMT_createCCtxPool() :
+ * implies nbWorkers >= 1 , checked by caller ZSTDMT_createCCtx() */
+static ZSTDMT_CCtxPool* ZSTDMT_createCCtxPool(int nbWorkers,
+                                              ZSTD_customMem cMem)
+{
+    ZSTDMT_CCtxPool* const cctxPool = (ZSTDMT_CCtxPool*) ZSTD_customCalloc(
+        sizeof(ZSTDMT_CCtxPool) + (nbWorkers-1)*sizeof(ZSTD_CCtx*), cMem);
+    assert(nbWorkers > 0);
+    if (!cctxPool) return NULL;
+    if (ZSTD_pthread_mutex_init(&cctxPool->poolMutex, NULL)) {
+        ZSTD_customFree(cctxPool, cMem);
+        return NULL;
+    }
+    cctxPool->cMem = cMem;
+    cctxPool->totalCCtx = nbWorkers;
+    cctxPool->availCCtx = 1;   /* at least one cctx for single-thread mode */
+    cctxPool->cctx[0] = ZSTD_createCCtx_advanced(cMem);
+    if (!cctxPool->cctx[0]) { ZSTDMT_freeCCtxPool(cctxPool); return NULL; }
+    DEBUGLOG(3, "cctxPool created, with %u workers", nbWorkers);
+    return cctxPool;
+}
+
+static ZSTDMT_CCtxPool* ZSTDMT_expandCCtxPool(ZSTDMT_CCtxPool* srcPool,
+                                              int nbWorkers)
+{
+    if (srcPool==NULL) return NULL;
+    if (nbWorkers <= srcPool->totalCCtx) return srcPool;   /* good enough */
+    /* need a larger cctx pool */
+    {   ZSTD_customMem const cMem = srcPool->cMem;
+        ZSTDMT_freeCCtxPool(srcPool);
+        return ZSTDMT_createCCtxPool(nbWorkers, cMem);
+    }
+}
+
+/* only works during initialization phase, not during compression */
+static size_t ZSTDMT_sizeof_CCtxPool(ZSTDMT_CCtxPool* cctxPool)
+{
+    ZSTD_pthread_mutex_lock(&cctxPool->poolMutex);
+    {   unsigned const nbWorkers = cctxPool->totalCCtx;
+        size_t const poolSize = sizeof(*cctxPool)
+                                + (nbWorkers-1) * sizeof(ZSTD_CCtx*);
+        unsigned u;
+        size_t totalCCtxSize = 0;
+        for (u=0; u<nbWorkers; u++) {
+            totalCCtxSize += ZSTD_sizeof_CCtx(cctxPool->cctx[u]);
+        }
+        ZSTD_pthread_mutex_unlock(&cctxPool->poolMutex);
+        assert(nbWorkers > 0);
+        return poolSize + totalCCtxSize;
+    }
+}
+
+static ZSTD_CCtx* ZSTDMT_getCCtx(ZSTDMT_CCtxPool* cctxPool)
+{
+    DEBUGLOG(5, "ZSTDMT_getCCtx");
+    ZSTD_pthread_mutex_lock(&cctxPool->poolMutex);
+    if (cctxPool->availCCtx) {
+        cctxPool->availCCtx--;
+        {   ZSTD_CCtx* const cctx = cctxPool->cctx[cctxPool->availCCtx];
+            ZSTD_pthread_mutex_unlock(&cctxPool->poolMutex);
+            return cctx;
+    }   }
+    ZSTD_pthread_mutex_unlock(&cctxPool->poolMutex);
+    DEBUGLOG(5, "create one more CCtx");
+    return ZSTD_createCCtx_advanced(cctxPool->cMem);   /* note : can be NULL, when creation fails ! */
+}
+
+static void ZSTDMT_releaseCCtx(ZSTDMT_CCtxPool* pool, ZSTD_CCtx* cctx)
+{
+    if (cctx==NULL) return;   /* compatibility with release on NULL */
+    ZSTD_pthread_mutex_lock(&pool->poolMutex);
+    if (pool->availCCtx < pool->totalCCtx)
+        pool->cctx[pool->availCCtx++] = cctx;
+    else {
+        /* pool overflow : should not happen, since totalCCtx==nbWorkers */
+        DEBUGLOG(4, "CCtx pool overflow : free cctx");
+        ZSTD_freeCCtx(cctx);
+    }
+    ZSTD_pthread_mutex_unlock(&pool->poolMutex);
+}
+
+/* ====   Serial State   ==== */
+
+typedef struct {
+    void const* start;
+    size_t size;
+} range_t;
+
+typedef struct {
+    /* All variables in the struct are protected by mutex. */
+    ZSTD_pthread_mutex_t mutex;
+    ZSTD_pthread_cond_t cond;
+    ZSTD_CCtx_params params;
+    ldmState_t ldmState;
+    XXH64_state_t xxhState;
+    unsigned nextJobID;
+    /* Protects ldmWindow.
+     * Must be acquired after the main mutex when acquiring both.
+     */
+    ZSTD_pthread_mutex_t ldmWindowMutex;
+    ZSTD_pthread_cond_t ldmWindowCond;  /* Signaled when ldmWindow is updated */
+    ZSTD_window_t ldmWindow;  /* A thread-safe copy of ldmState.window */
+} serialState_t;
+
+static int
+ZSTDMT_serialState_reset(serialState_t* serialState,
+                         ZSTDMT_seqPool* seqPool,
+                         ZSTD_CCtx_params params,
+                         size_t jobSize,
+                         const void* dict, size_t const dictSize,
+                         ZSTD_dictContentType_e dictContentType)
+{
+    /* Adjust parameters */
+    if (params.ldmParams.enableLdm) {
+        DEBUGLOG(4, "LDM window size = %u KB", (1U << params.cParams.windowLog) >> 10);
+        ZSTD_ldm_adjustParameters(&params.ldmParams, &params.cParams);
+        assert(params.ldmParams.hashLog >= params.ldmParams.bucketSizeLog);
+        assert(params.ldmParams.hashRateLog < 32);
+    } else {
+        ZSTD_memset(&params.ldmParams, 0, sizeof(params.ldmParams));
+    }
+    serialState->nextJobID = 0;
+    if (params.fParams.checksumFlag)
+        XXH64_reset(&serialState->xxhState, 0);
+    if (params.ldmParams.enableLdm) {
+        ZSTD_customMem cMem = params.customMem;
+        unsigned const hashLog = params.ldmParams.hashLog;
+        size_t const hashSize = ((size_t)1 << hashLog) * sizeof(ldmEntry_t);
+        unsigned const bucketLog =
+            params.ldmParams.hashLog - params.ldmParams.bucketSizeLog;
+        unsigned const prevBucketLog =
+            serialState->params.ldmParams.hashLog -
+            serialState->params.ldmParams.bucketSizeLog;
+        size_t const numBuckets = (size_t)1 << bucketLog;
+        /* Size the seq pool tables */
+        ZSTDMT_setNbSeq(seqPool, ZSTD_ldm_getMaxNbSeq(params.ldmParams, jobSize));
+        /* Reset the window */
+        ZSTD_window_init(&serialState->ldmState.window);
+        /* Resize tables and output space if necessary. */
+        if (serialState->ldmState.hashTable == NULL || serialState->params.ldmParams.hashLog < hashLog) {
+            ZSTD_customFree(serialState->ldmState.hashTable, cMem);
+            serialState->ldmState.hashTable = (ldmEntry_t*)ZSTD_customMalloc(hashSize, cMem);
+        }
+        if (serialState->ldmState.bucketOffsets == NULL || prevBucketLog < bucketLog) {
+            ZSTD_customFree(serialState->ldmState.bucketOffsets, cMem);
+            serialState->ldmState.bucketOffsets = (BYTE*)ZSTD_customMalloc(numBuckets, cMem);
+        }
+        if (!serialState->ldmState.hashTable || !serialState->ldmState.bucketOffsets)
+            return 1;
+        /* Zero the tables */
+        ZSTD_memset(serialState->ldmState.hashTable, 0, hashSize);
+        ZSTD_memset(serialState->ldmState.bucketOffsets, 0, numBuckets);
+
+        /* Update window state and fill hash table with dict */
+        serialState->ldmState.loadedDictEnd = 0;
+        if (dictSize > 0) {
+            if (dictContentType == ZSTD_dct_rawContent) {
+                BYTE const* const dictEnd = (const BYTE*)dict + dictSize;
+                ZSTD_window_update(&serialState->ldmState.window, dict, dictSize, /* forceNonContiguous */ 0);
+                ZSTD_ldm_fillHashTable(&serialState->ldmState, (const BYTE*)dict, dictEnd, &params.ldmParams);
+                serialState->ldmState.loadedDictEnd = params.forceWindow ? 0 : (U32)(dictEnd - serialState->ldmState.window.base);
+            } else {
+                /* don't even load anything */
+            }
+        }
+
+        /* Initialize serialState's copy of ldmWindow. */
+        serialState->ldmWindow = serialState->ldmState.window;
+    }
+
+    serialState->params = params;
+    serialState->params.jobSize = (U32)jobSize;
+    return 0;
+}
+
+static int ZSTDMT_serialState_init(serialState_t* serialState)
+{
+    int initError = 0;
+    ZSTD_memset(serialState, 0, sizeof(*serialState));
+    initError |= ZSTD_pthread_mutex_init(&serialState->mutex, NULL);
+    initError |= ZSTD_pthread_cond_init(&serialState->cond, NULL);
+    initError |= ZSTD_pthread_mutex_init(&serialState->ldmWindowMutex, NULL);
+    initError |= ZSTD_pthread_cond_init(&serialState->ldmWindowCond, NULL);
+    return initError;
+}
+
+static void ZSTDMT_serialState_free(serialState_t* serialState)
+{
+    ZSTD_customMem cMem = serialState->params.customMem;
+    ZSTD_pthread_mutex_destroy(&serialState->mutex);
+    ZSTD_pthread_cond_destroy(&serialState->cond);
+    ZSTD_pthread_mutex_destroy(&serialState->ldmWindowMutex);
+    ZSTD_pthread_cond_destroy(&serialState->ldmWindowCond);
+    ZSTD_customFree(serialState->ldmState.hashTable, cMem);
+    ZSTD_customFree(serialState->ldmState.bucketOffsets, cMem);
+}
+
+static void ZSTDMT_serialState_update(serialState_t* serialState,
+                                      ZSTD_CCtx* jobCCtx, rawSeqStore_t seqStore,
+                                      range_t src, unsigned jobID)
+{
+    /* Wait for our turn */
+    ZSTD_PTHREAD_MUTEX_LOCK(&serialState->mutex);
+    while (serialState->nextJobID < jobID) {
+        DEBUGLOG(5, "wait for serialState->cond");
+        ZSTD_pthread_cond_wait(&serialState->cond, &serialState->mutex);
+    }
+    /* A future job may error and skip our job */
+    if (serialState->nextJobID == jobID) {
+        /* It is now our turn, do any processing necessary */
+        if (serialState->params.ldmParams.enableLdm) {
+            size_t error;
+            assert(seqStore.seq != NULL && seqStore.pos == 0 &&
+                   seqStore.size == 0 && seqStore.capacity > 0);
+            assert(src.size <= serialState->params.jobSize);
+            ZSTD_window_update(&serialState->ldmState.window, src.start, src.size, /* forceNonContiguous */ 0);
+            error = ZSTD_ldm_generateSequences(
+                &serialState->ldmState, &seqStore,
+                &serialState->params.ldmParams, src.start, src.size);
+            /* We provide a large enough buffer to never fail. */
+            assert(!ZSTD_isError(error)); (void)error;
+            /* Update ldmWindow to match the ldmState.window and signal the main
+             * thread if it is waiting for a buffer.
+             */
+            ZSTD_PTHREAD_MUTEX_LOCK(&serialState->ldmWindowMutex);
+            serialState->ldmWindow = serialState->ldmState.window;
+            ZSTD_pthread_cond_signal(&serialState->ldmWindowCond);
+            ZSTD_pthread_mutex_unlock(&serialState->ldmWindowMutex);
+        }
+        if (serialState->params.fParams.checksumFlag && src.size > 0)
+            XXH64_update(&serialState->xxhState, src.start, src.size);
+    }
+    /* Now it is the next jobs turn */
+    serialState->nextJobID++;
+    ZSTD_pthread_cond_broadcast(&serialState->cond);
+    ZSTD_pthread_mutex_unlock(&serialState->mutex);
+
+    if (seqStore.size > 0) {
+        size_t const err = ZSTD_referenceExternalSequences(
+            jobCCtx, seqStore.seq, seqStore.size);
+        assert(serialState->params.ldmParams.enableLdm);
+        assert(!ZSTD_isError(err));
+        (void)err;
+    }
+}
+
+static void ZSTDMT_serialState_ensureFinished(serialState_t* serialState,
+                                              unsigned jobID, size_t cSize)
+{
+    ZSTD_PTHREAD_MUTEX_LOCK(&serialState->mutex);
+    if (serialState->nextJobID <= jobID) {
+        assert(ZSTD_isError(cSize)); (void)cSize;
+        DEBUGLOG(5, "Skipping past job %u because of error", jobID);
+        serialState->nextJobID = jobID + 1;
+        ZSTD_pthread_cond_broadcast(&serialState->cond);
+
+        ZSTD_PTHREAD_MUTEX_LOCK(&serialState->ldmWindowMutex);
+        ZSTD_window_clear(&serialState->ldmWindow);
+        ZSTD_pthread_cond_signal(&serialState->ldmWindowCond);
+        ZSTD_pthread_mutex_unlock(&serialState->ldmWindowMutex);
+    }
+    ZSTD_pthread_mutex_unlock(&serialState->mutex);
+
+}
+
+
+/* ------------------------------------------ */
+/* =====          Worker thread         ===== */
+/* ------------------------------------------ */
+
+static const range_t kNullRange = { NULL, 0 };
+
+typedef struct {
+    size_t   consumed;                   /* SHARED - set0 by mtctx, then modified by worker AND read by mtctx */
+    size_t   cSize;                      /* SHARED - set0 by mtctx, then modified by worker AND read by mtctx, then set0 by mtctx */
+    ZSTD_pthread_mutex_t job_mutex;      /* Thread-safe - used by mtctx and worker */
+    ZSTD_pthread_cond_t job_cond;        /* Thread-safe - used by mtctx and worker */
+    ZSTDMT_CCtxPool* cctxPool;           /* Thread-safe - used by mtctx and (all) workers */
+    ZSTDMT_bufferPool* bufPool;          /* Thread-safe - used by mtctx and (all) workers */
+    ZSTDMT_seqPool* seqPool;             /* Thread-safe - used by mtctx and (all) workers */
+    serialState_t* serial;               /* Thread-safe - used by mtctx and (all) workers */
+    buffer_t dstBuff;                    /* set by worker (or mtctx), then read by worker & mtctx, then modified by mtctx => no barrier */
+    range_t prefix;                      /* set by mtctx, then read by worker & mtctx => no barrier */
+    range_t src;                         /* set by mtctx, then read by worker & mtctx => no barrier */
+    unsigned jobID;                      /* set by mtctx, then read by worker => no barrier */
+    unsigned firstJob;                   /* set by mtctx, then read by worker => no barrier */
+    unsigned lastJob;                    /* set by mtctx, then read by worker => no barrier */
+    ZSTD_CCtx_params params;             /* set by mtctx, then read by worker => no barrier */
+    const ZSTD_CDict* cdict;             /* set by mtctx, then read by worker => no barrier */
+    unsigned long long fullFrameSize;    /* set by mtctx, then read by worker => no barrier */
+    size_t   dstFlushed;                 /* used only by mtctx */
+    unsigned frameChecksumNeeded;        /* used only by mtctx */
+} ZSTDMT_jobDescription;
+
+#define JOB_ERROR(e) {                          \
+    ZSTD_PTHREAD_MUTEX_LOCK(&job->job_mutex);   \
+    job->cSize = e;                             \
+    ZSTD_pthread_mutex_unlock(&job->job_mutex); \
+    goto _endJob;                               \
+}
+
+/* ZSTDMT_compressionJob() is a POOL_function type */
+static void ZSTDMT_compressionJob(void* jobDescription)
+{
+    ZSTDMT_jobDescription* const job = (ZSTDMT_jobDescription*)jobDescription;
+    ZSTD_CCtx_params jobParams = job->params;   /* do not modify job->params ! copy it, modify the copy */
+    ZSTD_CCtx* const cctx = ZSTDMT_getCCtx(job->cctxPool);
+    rawSeqStore_t rawSeqStore = ZSTDMT_getSeq(job->seqPool);
+    buffer_t dstBuff = job->dstBuff;
+    size_t lastCBlockSize = 0;
+
+    /* resources */
+    if (cctx==NULL) JOB_ERROR(ERROR(memory_allocation));
+    if (dstBuff.start == NULL) {   /* streaming job : doesn't provide a dstBuffer */
+        dstBuff = ZSTDMT_getBuffer(job->bufPool);
+        if (dstBuff.start==NULL) JOB_ERROR(ERROR(memory_allocation));
+        job->dstBuff = dstBuff;   /* this value can be read in ZSTDMT_flush, when it copies the whole job */
+    }
+    if (jobParams.ldmParams.enableLdm && rawSeqStore.seq == NULL)
+        JOB_ERROR(ERROR(memory_allocation));
+
+    /* Don't compute the checksum for chunks, since we compute it externally,
+     * but write it in the header.
+     */
+    if (job->jobID != 0) jobParams.fParams.checksumFlag = 0;
+    /* Don't run LDM for the chunks, since we handle it externally */
+    jobParams.ldmParams.enableLdm = 0;
+    /* Correct nbWorkers to 0. */
+    jobParams.nbWorkers = 0;
+
+
+    /* init */
+    if (job->cdict) {
+        size_t const initError = ZSTD_compressBegin_advanced_internal(cctx, NULL, 0, ZSTD_dct_auto, ZSTD_dtlm_fast, job->cdict, &jobParams, job->fullFrameSize);
+        assert(job->firstJob);  /* only allowed for first job */
+        if (ZSTD_isError(initError)) JOB_ERROR(initError);
+    } else {  /* srcStart points at reloaded section */
+        U64 const pledgedSrcSize = job->firstJob ? job->fullFrameSize : job->src.size;
+        {   size_t const forceWindowError = ZSTD_CCtxParams_setParameter(&jobParams, ZSTD_c_forceMaxWindow, !job->firstJob);
+            if (ZSTD_isError(forceWindowError)) JOB_ERROR(forceWindowError);
+        }
+        if (!job->firstJob) {
+            size_t const err = ZSTD_CCtxParams_setParameter(&jobParams, ZSTD_c_deterministicRefPrefix, 0);
+            if (ZSTD_isError(err)) JOB_ERROR(err);
+        }
+        {   size_t const initError = ZSTD_compressBegin_advanced_internal(cctx,
+                                        job->prefix.start, job->prefix.size, ZSTD_dct_rawContent, /* load dictionary in "content-only" mode (no header analysis) */
+                                        ZSTD_dtlm_fast,
+                                        NULL, /*cdict*/
+                                        &jobParams, pledgedSrcSize);
+            if (ZSTD_isError(initError)) JOB_ERROR(initError);
+    }   }
+
+    /* Perform serial step as early as possible, but after CCtx initialization */
+    ZSTDMT_serialState_update(job->serial, cctx, rawSeqStore, job->src, job->jobID);
+
+    if (!job->firstJob) {  /* flush and overwrite frame header when it's not first job */
+        size_t const hSize = ZSTD_compressContinue(cctx, dstBuff.start, dstBuff.capacity, job->src.start, 0);
+        if (ZSTD_isError(hSize)) JOB_ERROR(hSize);
+        DEBUGLOG(5, "ZSTDMT_compressionJob: flush and overwrite %u bytes of frame header (not first job)", (U32)hSize);
+        ZSTD_invalidateRepCodes(cctx);
+    }
+
+    /* compress */
+    {   size_t const chunkSize = 4*ZSTD_BLOCKSIZE_MAX;
+        int const nbChunks = (int)((job->src.size + (chunkSize-1)) / chunkSize);
+        const BYTE* ip = (const BYTE*) job->src.start;
+        BYTE* const ostart = (BYTE*)dstBuff.start;
+        BYTE* op = ostart;
+        BYTE* oend = op + dstBuff.capacity;
+        int chunkNb;
+        if (sizeof(size_t) > sizeof(int)) assert(job->src.size < ((size_t)INT_MAX) * chunkSize);   /* check overflow */
+        DEBUGLOG(5, "ZSTDMT_compressionJob: compress %u bytes in %i blocks", (U32)job->src.size, nbChunks);
+        assert(job->cSize == 0);
+        for (chunkNb = 1; chunkNb < nbChunks; chunkNb++) {
+            size_t const cSize = ZSTD_compressContinue(cctx, op, oend-op, ip, chunkSize);
+            if (ZSTD_isError(cSize)) JOB_ERROR(cSize);
+            ip += chunkSize;
+            op += cSize; assert(op < oend);
+            /* stats */
+            ZSTD_PTHREAD_MUTEX_LOCK(&job->job_mutex);
+            job->cSize += cSize;
+            job->consumed = chunkSize * chunkNb;
+            DEBUGLOG(5, "ZSTDMT_compressionJob: compress new block : cSize==%u bytes (total: %u)",
+                        (U32)cSize, (U32)job->cSize);
+            ZSTD_pthread_cond_signal(&job->job_cond);   /* warns some more data is ready to be flushed */
+            ZSTD_pthread_mutex_unlock(&job->job_mutex);
+        }
+        /* last block */
+        assert(chunkSize > 0);
+        assert((chunkSize & (chunkSize - 1)) == 0);  /* chunkSize must be power of 2 for mask==(chunkSize-1) to work */
+        if ((nbChunks > 0) | job->lastJob /*must output a "last block" flag*/ ) {
+            size_t const lastBlockSize1 = job->src.size & (chunkSize-1);
+            size_t const lastBlockSize = ((lastBlockSize1==0) & (job->src.size>=chunkSize)) ? chunkSize : lastBlockSize1;
+            size_t const cSize = (job->lastJob) ?
+                 ZSTD_compressEnd     (cctx, op, oend-op, ip, lastBlockSize) :
+                 ZSTD_compressContinue(cctx, op, oend-op, ip, lastBlockSize);
+            if (ZSTD_isError(cSize)) JOB_ERROR(cSize);
+            lastCBlockSize = cSize;
+    }   }
+    if (!job->firstJob) {
+        /* Double check that we don't have an ext-dict, because then our
+         * repcode invalidation doesn't work.
+         */
+        assert(!ZSTD_window_hasExtDict(cctx->blockState.matchState.window));
+    }
+    ZSTD_CCtx_trace(cctx, 0);
+
+_endJob:
+    ZSTDMT_serialState_ensureFinished(job->serial, job->jobID, job->cSize);
+    if (job->prefix.size > 0)
+        DEBUGLOG(5, "Finished with prefix: %zx", (size_t)job->prefix.start);
+    DEBUGLOG(5, "Finished with source: %zx", (size_t)job->src.start);
+    /* release resources */
+    ZSTDMT_releaseSeq(job->seqPool, rawSeqStore);
+    ZSTDMT_releaseCCtx(job->cctxPool, cctx);
+    /* report */
+    ZSTD_PTHREAD_MUTEX_LOCK(&job->job_mutex);
+    if (ZSTD_isError(job->cSize)) assert(lastCBlockSize == 0);
+    job->cSize += lastCBlockSize;
+    job->consumed = job->src.size;  /* when job->consumed == job->src.size , compression job is presumed completed */
+    ZSTD_pthread_cond_signal(&job->job_cond);
+    ZSTD_pthread_mutex_unlock(&job->job_mutex);
+}
+
+
+/* ------------------------------------------ */
+/* =====   Multi-threaded compression   ===== */
+/* ------------------------------------------ */
+
+typedef struct {
+    range_t prefix;         /* read-only non-owned prefix buffer */
+    buffer_t buffer;
+    size_t filled;
+} inBuff_t;
+
+typedef struct {
+  BYTE* buffer;     /* The round input buffer. All jobs get references
+                     * to pieces of the buffer. ZSTDMT_tryGetInputRange()
+                     * handles handing out job input buffers, and makes
+                     * sure it doesn't overlap with any pieces still in use.
+                     */
+  size_t capacity;  /* The capacity of buffer. */
+  size_t pos;       /* The position of the current inBuff in the round
+                     * buffer. Updated past the end if the inBuff once
+                     * the inBuff is sent to the worker thread.
+                     * pos <= capacity.
+                     */
+} roundBuff_t;
+
+static const roundBuff_t kNullRoundBuff = {NULL, 0, 0};
+
+#define RSYNC_LENGTH 32
+
+typedef struct {
+  U64 hash;
+  U64 hitMask;
+  U64 primePower;
+} rsyncState_t;
+
+struct ZSTDMT_CCtx_s {
+    POOL_ctx* factory;
+    ZSTDMT_jobDescription* jobs;
+    ZSTDMT_bufferPool* bufPool;
+    ZSTDMT_CCtxPool* cctxPool;
+    ZSTDMT_seqPool* seqPool;
+    ZSTD_CCtx_params params;
+    size_t targetSectionSize;
+    size_t targetPrefixSize;
+    int jobReady;        /* 1 => one job is already prepared, but pool has shortage of workers. Don't create a new job. */
+    inBuff_t inBuff;
+    roundBuff_t roundBuff;
+    serialState_t serial;
+    rsyncState_t rsync;
+    unsigned jobIDMask;
+    unsigned doneJobID;
+    unsigned nextJobID;
+    unsigned frameEnded;
+    unsigned allJobsCompleted;
+    unsigned long long frameContentSize;
+    unsigned long long consumed;
+    unsigned long long produced;
+    ZSTD_customMem cMem;
+    ZSTD_CDict* cdictLocal;
+    const ZSTD_CDict* cdict;
+    unsigned providedFactory: 1;
+};
+
+static void ZSTDMT_freeJobsTable(ZSTDMT_jobDescription* jobTable, U32 nbJobs, ZSTD_customMem cMem)
+{
+    U32 jobNb;
+    if (jobTable == NULL) return;
+    for (jobNb=0; jobNb<nbJobs; jobNb++) {
+        ZSTD_pthread_mutex_destroy(&jobTable[jobNb].job_mutex);
+        ZSTD_pthread_cond_destroy(&jobTable[jobNb].job_cond);
+    }
+    ZSTD_customFree(jobTable, cMem);
+}
+
+/* ZSTDMT_allocJobsTable()
+ * allocate and init a job table.
+ * update *nbJobsPtr to next power of 2 value, as size of table */
+static ZSTDMT_jobDescription* ZSTDMT_createJobsTable(U32* nbJobsPtr, ZSTD_customMem cMem)
+{
+    U32 const nbJobsLog2 = ZSTD_highbit32(*nbJobsPtr) + 1;
+    U32 const nbJobs = 1 << nbJobsLog2;
+    U32 jobNb;
+    ZSTDMT_jobDescription* const jobTable = (ZSTDMT_jobDescription*)
+                ZSTD_customCalloc(nbJobs * sizeof(ZSTDMT_jobDescription), cMem);
+    int initError = 0;
+    if (jobTable==NULL) return NULL;
+    *nbJobsPtr = nbJobs;
+    for (jobNb=0; jobNb<nbJobs; jobNb++) {
+        initError |= ZSTD_pthread_mutex_init(&jobTable[jobNb].job_mutex, NULL);
+        initError |= ZSTD_pthread_cond_init(&jobTable[jobNb].job_cond, NULL);
+    }
+    if (initError != 0) {
+        ZSTDMT_freeJobsTable(jobTable, nbJobs, cMem);
+        return NULL;
+    }
+    return jobTable;
+}
+
+static size_t ZSTDMT_expandJobsTable (ZSTDMT_CCtx* mtctx, U32 nbWorkers) {
+    U32 nbJobs = nbWorkers + 2;
+    if (nbJobs > mtctx->jobIDMask+1) {  /* need more job capacity */
+        ZSTDMT_freeJobsTable(mtctx->jobs, mtctx->jobIDMask+1, mtctx->cMem);
+        mtctx->jobIDMask = 0;
+        mtctx->jobs = ZSTDMT_createJobsTable(&nbJobs, mtctx->cMem);
+        if (mtctx->jobs==NULL) return ERROR(memory_allocation);
+        assert((nbJobs != 0) && ((nbJobs & (nbJobs - 1)) == 0));  /* ensure nbJobs is a power of 2 */
+        mtctx->jobIDMask = nbJobs - 1;
+    }
+    return 0;
+}
+
+
+/* ZSTDMT_CCtxParam_setNbWorkers():
+ * Internal use only */
+static size_t ZSTDMT_CCtxParam_setNbWorkers(ZSTD_CCtx_params* params, unsigned nbWorkers)
+{
+    return ZSTD_CCtxParams_setParameter(params, ZSTD_c_nbWorkers, (int)nbWorkers);
+}
+
+MEM_STATIC ZSTDMT_CCtx* ZSTDMT_createCCtx_advanced_internal(unsigned nbWorkers, ZSTD_customMem cMem, ZSTD_threadPool* pool)
+{
+    ZSTDMT_CCtx* mtctx;
+    U32 nbJobs = nbWorkers + 2;
+    int initError;
+    DEBUGLOG(3, "ZSTDMT_createCCtx_advanced (nbWorkers = %u)", nbWorkers);
+
+    if (nbWorkers < 1) return NULL;
+    nbWorkers = MIN(nbWorkers , ZSTDMT_NBWORKERS_MAX);
+    if ((cMem.customAlloc!=NULL) ^ (cMem.customFree!=NULL))
+        /* invalid custom allocator */
+        return NULL;
+
+    mtctx = (ZSTDMT_CCtx*) ZSTD_customCalloc(sizeof(ZSTDMT_CCtx), cMem);
+    if (!mtctx) return NULL;
+    ZSTDMT_CCtxParam_setNbWorkers(&mtctx->params, nbWorkers);
+    mtctx->cMem = cMem;
+    mtctx->allJobsCompleted = 1;
+    if (pool != NULL) {
+      mtctx->factory = pool;
+      mtctx->providedFactory = 1;
+    }
+    else {
+      mtctx->factory = POOL_create_advanced(nbWorkers, 0, cMem);
+      mtctx->providedFactory = 0;
+    }
+    mtctx->jobs = ZSTDMT_createJobsTable(&nbJobs, cMem);
+    assert(nbJobs > 0); assert((nbJobs & (nbJobs - 1)) == 0);  /* ensure nbJobs is a power of 2 */
+    mtctx->jobIDMask = nbJobs - 1;
+    mtctx->bufPool = ZSTDMT_createBufferPool(nbWorkers, cMem);
+    mtctx->cctxPool = ZSTDMT_createCCtxPool(nbWorkers, cMem);
+    mtctx->seqPool = ZSTDMT_createSeqPool(nbWorkers, cMem);
+    initError = ZSTDMT_serialState_init(&mtctx->serial);
+    mtctx->roundBuff = kNullRoundBuff;
+    if (!mtctx->factory | !mtctx->jobs | !mtctx->bufPool | !mtctx->cctxPool | !mtctx->seqPool | initError) {
+        ZSTDMT_freeCCtx(mtctx);
+        return NULL;
+    }
+    DEBUGLOG(3, "mt_cctx created, for %u threads", nbWorkers);
+    return mtctx;
+}
+
+ZSTDMT_CCtx* ZSTDMT_createCCtx_advanced(unsigned nbWorkers, ZSTD_customMem cMem, ZSTD_threadPool* pool)
+{
+#ifdef ZSTD_MULTITHREAD
+    return ZSTDMT_createCCtx_advanced_internal(nbWorkers, cMem, pool);
+#else
+    (void)nbWorkers;
+    (void)cMem;
+    (void)pool;
+    return NULL;
+#endif
+}
+
+
+/* ZSTDMT_releaseAllJobResources() :
+ * note : ensure all workers are killed first ! */
+static void ZSTDMT_releaseAllJobResources(ZSTDMT_CCtx* mtctx)
+{
+    unsigned jobID;
+    DEBUGLOG(3, "ZSTDMT_releaseAllJobResources");
+    for (jobID=0; jobID <= mtctx->jobIDMask; jobID++) {
+        /* Copy the mutex/cond out */
+        ZSTD_pthread_mutex_t const mutex = mtctx->jobs[jobID].job_mutex;
+        ZSTD_pthread_cond_t const cond = mtctx->jobs[jobID].job_cond;
+
+        DEBUGLOG(4, "job%02u: release dst address %08X", jobID, (U32)(size_t)mtctx->jobs[jobID].dstBuff.start);
+        ZSTDMT_releaseBuffer(mtctx->bufPool, mtctx->jobs[jobID].dstBuff);
+
+        /* Clear the job description, but keep the mutex/cond */
+        ZSTD_memset(&mtctx->jobs[jobID], 0, sizeof(mtctx->jobs[jobID]));
+        mtctx->jobs[jobID].job_mutex = mutex;
+        mtctx->jobs[jobID].job_cond = cond;
+    }
+    mtctx->inBuff.buffer = g_nullBuffer;
+    mtctx->inBuff.filled = 0;
+    mtctx->allJobsCompleted = 1;
+}
+
+static void ZSTDMT_waitForAllJobsCompleted(ZSTDMT_CCtx* mtctx)
+{
+    DEBUGLOG(4, "ZSTDMT_waitForAllJobsCompleted");
+    while (mtctx->doneJobID < mtctx->nextJobID) {
+        unsigned const jobID = mtctx->doneJobID & mtctx->jobIDMask;
+        ZSTD_PTHREAD_MUTEX_LOCK(&mtctx->jobs[jobID].job_mutex);
+        while (mtctx->jobs[jobID].consumed < mtctx->jobs[jobID].src.size) {
+            DEBUGLOG(4, "waiting for jobCompleted signal from job %u", mtctx->doneJobID);   /* we want to block when waiting for data to flush */
+            ZSTD_pthread_cond_wait(&mtctx->jobs[jobID].job_cond, &mtctx->jobs[jobID].job_mutex);
+        }
+        ZSTD_pthread_mutex_unlock(&mtctx->jobs[jobID].job_mutex);
+        mtctx->doneJobID++;
+    }
+}
+
+size_t ZSTDMT_freeCCtx(ZSTDMT_CCtx* mtctx)
+{
+    if (mtctx==NULL) return 0;   /* compatible with free on NULL */
+    if (!mtctx->providedFactory)
+        POOL_free(mtctx->factory);   /* stop and free worker threads */
+    ZSTDMT_releaseAllJobResources(mtctx);  /* release job resources into pools first */
+    ZSTDMT_freeJobsTable(mtctx->jobs, mtctx->jobIDMask+1, mtctx->cMem);
+    ZSTDMT_freeBufferPool(mtctx->bufPool);
+    ZSTDMT_freeCCtxPool(mtctx->cctxPool);
+    ZSTDMT_freeSeqPool(mtctx->seqPool);
+    ZSTDMT_serialState_free(&mtctx->serial);
+    ZSTD_freeCDict(mtctx->cdictLocal);
+    if (mtctx->roundBuff.buffer)
+        ZSTD_customFree(mtctx->roundBuff.buffer, mtctx->cMem);
+    ZSTD_customFree(mtctx, mtctx->cMem);
+    return 0;
+}
+
+size_t ZSTDMT_sizeof_CCtx(ZSTDMT_CCtx* mtctx)
+{
+    if (mtctx == NULL) return 0;   /* supports sizeof NULL */
+    return sizeof(*mtctx)
+            + POOL_sizeof(mtctx->factory)
+            + ZSTDMT_sizeof_bufferPool(mtctx->bufPool)
+            + (mtctx->jobIDMask+1) * sizeof(ZSTDMT_jobDescription)
+            + ZSTDMT_sizeof_CCtxPool(mtctx->cctxPool)
+            + ZSTDMT_sizeof_seqPool(mtctx->seqPool)
+            + ZSTD_sizeof_CDict(mtctx->cdictLocal)
+            + mtctx->roundBuff.capacity;
+}
+
+
+/* ZSTDMT_resize() :
+ * @return : error code if fails, 0 on success */
+static size_t ZSTDMT_resize(ZSTDMT_CCtx* mtctx, unsigned nbWorkers)
+{
+    if (POOL_resize(mtctx->factory, nbWorkers)) return ERROR(memory_allocation);
+    FORWARD_IF_ERROR( ZSTDMT_expandJobsTable(mtctx, nbWorkers) , "");
+    mtctx->bufPool = ZSTDMT_expandBufferPool(mtctx->bufPool, nbWorkers);
+    if (mtctx->bufPool == NULL) return ERROR(memory_allocation);
+    mtctx->cctxPool = ZSTDMT_expandCCtxPool(mtctx->cctxPool, nbWorkers);
+    if (mtctx->cctxPool == NULL) return ERROR(memory_allocation);
+    mtctx->seqPool = ZSTDMT_expandSeqPool(mtctx->seqPool, nbWorkers);
+    if (mtctx->seqPool == NULL) return ERROR(memory_allocation);
+    ZSTDMT_CCtxParam_setNbWorkers(&mtctx->params, nbWorkers);
+    return 0;
+}
+
+
+/*! ZSTDMT_updateCParams_whileCompressing() :
+ *  Updates a selected set of compression parameters, remaining compatible with currently active frame.
+ *  New parameters will be applied to next compression job. */
+void ZSTDMT_updateCParams_whileCompressing(ZSTDMT_CCtx* mtctx, const ZSTD_CCtx_params* cctxParams)
+{
+    U32 const saved_wlog = mtctx->params.cParams.windowLog;   /* Do not modify windowLog while compressing */
+    int const compressionLevel = cctxParams->compressionLevel;
+    DEBUGLOG(5, "ZSTDMT_updateCParams_whileCompressing (level:%i)",
+                compressionLevel);
+    mtctx->params.compressionLevel = compressionLevel;
+    {   ZSTD_compressionParameters cParams = ZSTD_getCParamsFromCCtxParams(cctxParams, ZSTD_CONTENTSIZE_UNKNOWN, 0, ZSTD_cpm_noAttachDict);
+        cParams.windowLog = saved_wlog;
+        mtctx->params.cParams = cParams;
+    }
+}
+
+/* ZSTDMT_getFrameProgression():
+ * tells how much data has been consumed (input) and produced (output) for current frame.
+ * able to count progression inside worker threads.
+ * Note : mutex will be acquired during statistics collection inside workers. */
+ZSTD_frameProgression ZSTDMT_getFrameProgression(ZSTDMT_CCtx* mtctx)
+{
+    ZSTD_frameProgression fps;
+    DEBUGLOG(5, "ZSTDMT_getFrameProgression");
+    fps.ingested = mtctx->consumed + mtctx->inBuff.filled;
+    fps.consumed = mtctx->consumed;
+    fps.produced = fps.flushed = mtctx->produced;
+    fps.currentJobID = mtctx->nextJobID;
+    fps.nbActiveWorkers = 0;
+    {   unsigned jobNb;
+        unsigned lastJobNb = mtctx->nextJobID + mtctx->jobReady; assert(mtctx->jobReady <= 1);
+        DEBUGLOG(6, "ZSTDMT_getFrameProgression: jobs: from %u to <%u (jobReady:%u)",
+                    mtctx->doneJobID, lastJobNb, mtctx->jobReady)
+        for (jobNb = mtctx->doneJobID ; jobNb < lastJobNb ; jobNb++) {
+            unsigned const wJobID = jobNb & mtctx->jobIDMask;
+            ZSTDMT_jobDescription* jobPtr = &mtctx->jobs[wJobID];
+            ZSTD_pthread_mutex_lock(&jobPtr->job_mutex);
+            {   size_t const cResult = jobPtr->cSize;
+                size_t const produced = ZSTD_isError(cResult) ? 0 : cResult;
+                size_t const flushed = ZSTD_isError(cResult) ? 0 : jobPtr->dstFlushed;
+                assert(flushed <= produced);
+                fps.ingested += jobPtr->src.size;
+                fps.consumed += jobPtr->consumed;
+                fps.produced += produced;
+                fps.flushed  += flushed;
+                fps.nbActiveWorkers += (jobPtr->consumed < jobPtr->src.size);
+            }
+            ZSTD_pthread_mutex_unlock(&mtctx->jobs[wJobID].job_mutex);
+        }
+    }
+    return fps;
+}
+
+
+size_t ZSTDMT_toFlushNow(ZSTDMT_CCtx* mtctx)
+{
+    size_t toFlush;
+    unsigned const jobID = mtctx->doneJobID;
+    assert(jobID <= mtctx->nextJobID);
+    if (jobID == mtctx->nextJobID) return 0;   /* no active job => nothing to flush */
+
+    /* look into oldest non-fully-flushed job */
+    {   unsigned const wJobID = jobID & mtctx->jobIDMask;
+        ZSTDMT_jobDescription* const jobPtr = &mtctx->jobs[wJobID];
+        ZSTD_pthread_mutex_lock(&jobPtr->job_mutex);
+        {   size_t const cResult = jobPtr->cSize;
+            size_t const produced = ZSTD_isError(cResult) ? 0 : cResult;
+            size_t const flushed = ZSTD_isError(cResult) ? 0 : jobPtr->dstFlushed;
+            assert(flushed <= produced);
+            assert(jobPtr->consumed <= jobPtr->src.size);
+            toFlush = produced - flushed;
+            /* if toFlush==0, nothing is available to flush.
+             * However, jobID is expected to still be active:
+             * if jobID was already completed and fully flushed,
+             * ZSTDMT_flushProduced() should have already moved onto next job.
+             * Therefore, some input has not yet been consumed. */
+            if (toFlush==0) {
+                assert(jobPtr->consumed < jobPtr->src.size);
+            }
+        }
+        ZSTD_pthread_mutex_unlock(&mtctx->jobs[wJobID].job_mutex);
+    }
+
+    return toFlush;
+}
+
+
+/* ------------------------------------------ */
+/* =====   Multi-threaded compression   ===== */
+/* ------------------------------------------ */
+
+static unsigned ZSTDMT_computeTargetJobLog(const ZSTD_CCtx_params* params)
+{
+    unsigned jobLog;
+    if (params->ldmParams.enableLdm) {
+        /* In Long Range Mode, the windowLog is typically oversized.
+         * In which case, it's preferable to determine the jobSize
+         * based on cycleLog instead. */
+        jobLog = MAX(21, ZSTD_cycleLog(params->cParams.chainLog, params->cParams.strategy) + 3);
+    } else {
+        jobLog = MAX(20, params->cParams.windowLog + 2);
+    }
+    return MIN(jobLog, (unsigned)ZSTDMT_JOBLOG_MAX);
+}
+
+static int ZSTDMT_overlapLog_default(ZSTD_strategy strat)
+{
+    switch(strat)
+    {
+        case ZSTD_btultra2:
+            return 9;
+        case ZSTD_btultra:
+        case ZSTD_btopt:
+            return 8;
+        case ZSTD_btlazy2:
+        case ZSTD_lazy2:
+            return 7;
+        case ZSTD_lazy:
+        case ZSTD_greedy:
+        case ZSTD_dfast:
+        case ZSTD_fast:
+        default:;
+    }
+    return 6;
+}
+
+static int ZSTDMT_overlapLog(int ovlog, ZSTD_strategy strat)
+{
+    assert(0 <= ovlog && ovlog <= 9);
+    if (ovlog == 0) return ZSTDMT_overlapLog_default(strat);
+    return ovlog;
+}
+
+static size_t ZSTDMT_computeOverlapSize(const ZSTD_CCtx_params* params)
+{
+    int const overlapRLog = 9 - ZSTDMT_overlapLog(params->overlapLog, params->cParams.strategy);
+    int ovLog = (overlapRLog >= 8) ? 0 : (params->cParams.windowLog - overlapRLog);
+    assert(0 <= overlapRLog && overlapRLog <= 8);
+    if (params->ldmParams.enableLdm) {
+        /* In Long Range Mode, the windowLog is typically oversized.
+         * In which case, it's preferable to determine the jobSize
+         * based on chainLog instead.
+         * Then, ovLog becomes a fraction of the jobSize, rather than windowSize */
+        ovLog = MIN(params->cParams.windowLog, ZSTDMT_computeTargetJobLog(params) - 2)
+                - overlapRLog;
+    }
+    assert(0 <= ovLog && ovLog <= ZSTD_WINDOWLOG_MAX);
+    DEBUGLOG(4, "overlapLog : %i", params->overlapLog);
+    DEBUGLOG(4, "overlap size : %i", 1 << ovLog);
+    return (ovLog==0) ? 0 : (size_t)1 << ovLog;
+}
+
+/* ====================================== */
+/* =======      Streaming API     ======= */
+/* ====================================== */
+
+size_t ZSTDMT_initCStream_internal(
+        ZSTDMT_CCtx* mtctx,
+        const void* dict, size_t dictSize, ZSTD_dictContentType_e dictContentType,
+        const ZSTD_CDict* cdict, ZSTD_CCtx_params params,
+        unsigned long long pledgedSrcSize)
+{
+    DEBUGLOG(4, "ZSTDMT_initCStream_internal (pledgedSrcSize=%u, nbWorkers=%u, cctxPool=%u)",
+                (U32)pledgedSrcSize, params.nbWorkers, mtctx->cctxPool->totalCCtx);
+
+    /* params supposed partially fully validated at this point */
+    assert(!ZSTD_isError(ZSTD_checkCParams(params.cParams)));
+    assert(!((dict) && (cdict)));  /* either dict or cdict, not both */
+
+    /* init */
+    if (params.nbWorkers != mtctx->params.nbWorkers)
+        FORWARD_IF_ERROR( ZSTDMT_resize(mtctx, params.nbWorkers) , "");
+
+    if (params.jobSize != 0 && params.jobSize < ZSTDMT_JOBSIZE_MIN) params.jobSize = ZSTDMT_JOBSIZE_MIN;
+    if (params.jobSize > (size_t)ZSTDMT_JOBSIZE_MAX) params.jobSize = (size_t)ZSTDMT_JOBSIZE_MAX;
+
+    DEBUGLOG(4, "ZSTDMT_initCStream_internal: %u workers", params.nbWorkers);
+
+    if (mtctx->allJobsCompleted == 0) {   /* previous compression not correctly finished */
+        ZSTDMT_waitForAllJobsCompleted(mtctx);
+        ZSTDMT_releaseAllJobResources(mtctx);
+        mtctx->allJobsCompleted = 1;
+    }
+
+    mtctx->params = params;
+    mtctx->frameContentSize = pledgedSrcSize;
+    if (dict) {
+        ZSTD_freeCDict(mtctx->cdictLocal);
+        mtctx->cdictLocal = ZSTD_createCDict_advanced(dict, dictSize,
+                                                    ZSTD_dlm_byCopy, dictContentType, /* note : a loadPrefix becomes an internal CDict */
+                                                    params.cParams, mtctx->cMem);
+        mtctx->cdict = mtctx->cdictLocal;
+        if (mtctx->cdictLocal == NULL) return ERROR(memory_allocation);
+    } else {
+        ZSTD_freeCDict(mtctx->cdictLocal);
+        mtctx->cdictLocal = NULL;
+        mtctx->cdict = cdict;
+    }
+
+    mtctx->targetPrefixSize = ZSTDMT_computeOverlapSize(&params);
+    DEBUGLOG(4, "overlapLog=%i => %u KB", params.overlapLog, (U32)(mtctx->targetPrefixSize>>10));
+    mtctx->targetSectionSize = params.jobSize;
+    if (mtctx->targetSectionSize == 0) {
+        mtctx->targetSectionSize = 1ULL << ZSTDMT_computeTargetJobLog(&params);
+    }
+    assert(mtctx->targetSectionSize <= (size_t)ZSTDMT_JOBSIZE_MAX);
+
+    if (params.rsyncable) {
+        /* Aim for the targetsectionSize as the average job size. */
+        U32 const jobSizeKB = (U32)(mtctx->targetSectionSize >> 10);
+        U32 const rsyncBits = (assert(jobSizeKB >= 1), ZSTD_highbit32(jobSizeKB) + 10);
+        DEBUGLOG(4, "rsyncLog = %u", rsyncBits);
+        mtctx->rsync.hash = 0;
+        mtctx->rsync.hitMask = (1ULL << rsyncBits) - 1;
+        mtctx->rsync.primePower = ZSTD_rollingHash_primePower(RSYNC_LENGTH);
+    }
+    if (mtctx->targetSectionSize < mtctx->targetPrefixSize) mtctx->targetSectionSize = mtctx->targetPrefixSize;  /* job size must be >= overlap size */
+    DEBUGLOG(4, "Job Size : %u KB (note : set to %u)", (U32)(mtctx->targetSectionSize>>10), (U32)params.jobSize);
+    DEBUGLOG(4, "inBuff Size : %u KB", (U32)(mtctx->targetSectionSize>>10));
+    ZSTDMT_setBufferSize(mtctx->bufPool, ZSTD_compressBound(mtctx->targetSectionSize));
+    {
+        /* If ldm is enabled we need windowSize space. */
+        size_t const windowSize = mtctx->params.ldmParams.enableLdm ? (1U << mtctx->params.cParams.windowLog) : 0;
+        /* Two buffers of slack, plus extra space for the overlap
+         * This is the minimum slack that LDM works with. One extra because
+         * flush might waste up to targetSectionSize-1 bytes. Another extra
+         * for the overlap (if > 0), then one to fill which doesn't overlap
+         * with the LDM window.
+         */
+        size_t const nbSlackBuffers = 2 + (mtctx->targetPrefixSize > 0);
+        size_t const slackSize = mtctx->targetSectionSize * nbSlackBuffers;
+        /* Compute the total size, and always have enough slack */
+        size_t const nbWorkers = MAX(mtctx->params.nbWorkers, 1);
+        size_t const sectionsSize = mtctx->targetSectionSize * nbWorkers;
+        size_t const capacity = MAX(windowSize, sectionsSize) + slackSize;
+        if (mtctx->roundBuff.capacity < capacity) {
+            if (mtctx->roundBuff.buffer)
+                ZSTD_customFree(mtctx->roundBuff.buffer, mtctx->cMem);
+            mtctx->roundBuff.buffer = (BYTE*)ZSTD_customMalloc(capacity, mtctx->cMem);
+            if (mtctx->roundBuff.buffer == NULL) {
+                mtctx->roundBuff.capacity = 0;
+                return ERROR(memory_allocation);
+            }
+            mtctx->roundBuff.capacity = capacity;
+        }
+    }
+    DEBUGLOG(4, "roundBuff capacity : %u KB", (U32)(mtctx->roundBuff.capacity>>10));
+    mtctx->roundBuff.pos = 0;
+    mtctx->inBuff.buffer = g_nullBuffer;
+    mtctx->inBuff.filled = 0;
+    mtctx->inBuff.prefix = kNullRange;
+    mtctx->doneJobID = 0;
+    mtctx->nextJobID = 0;
+    mtctx->frameEnded = 0;
+    mtctx->allJobsCompleted = 0;
+    mtctx->consumed = 0;
+    mtctx->produced = 0;
+    if (ZSTDMT_serialState_reset(&mtctx->serial, mtctx->seqPool, params, mtctx->targetSectionSize,
+                                 dict, dictSize, dictContentType))
+        return ERROR(memory_allocation);
+    return 0;
+}
+
+
+/* ZSTDMT_writeLastEmptyBlock()
+ * Write a single empty block with an end-of-frame to finish a frame.
+ * Job must be created from streaming variant.
+ * This function is always successful if expected conditions are fulfilled.
+ */
+static void ZSTDMT_writeLastEmptyBlock(ZSTDMT_jobDescription* job)
+{
+    assert(job->lastJob == 1);
+    assert(job->src.size == 0);   /* last job is empty -> will be simplified into a last empty block */
+    assert(job->firstJob == 0);   /* cannot be first job, as it also needs to create frame header */
+    assert(job->dstBuff.start == NULL);   /* invoked from streaming variant only (otherwise, dstBuff might be user's output) */
+    job->dstBuff = ZSTDMT_getBuffer(job->bufPool);
+    if (job->dstBuff.start == NULL) {
+      job->cSize = ERROR(memory_allocation);
+      return;
+    }
+    assert(job->dstBuff.capacity >= ZSTD_blockHeaderSize);   /* no buffer should ever be that small */
+    job->src = kNullRange;
+    job->cSize = ZSTD_writeLastEmptyBlock(job->dstBuff.start, job->dstBuff.capacity);
+    assert(!ZSTD_isError(job->cSize));
+    assert(job->consumed == 0);
+}
+
+static size_t ZSTDMT_createCompressionJob(ZSTDMT_CCtx* mtctx, size_t srcSize, ZSTD_EndDirective endOp)
+{
+    unsigned const jobID = mtctx->nextJobID & mtctx->jobIDMask;
+    int const endFrame = (endOp == ZSTD_e_end);
+
+    if (mtctx->nextJobID > mtctx->doneJobID + mtctx->jobIDMask) {
+        DEBUGLOG(5, "ZSTDMT_createCompressionJob: will not create new job : table is full");
+        assert((mtctx->nextJobID & mtctx->jobIDMask) == (mtctx->doneJobID & mtctx->jobIDMask));
+        return 0;
+    }
+
+    if (!mtctx->jobReady) {
+        BYTE const* src = (BYTE const*)mtctx->inBuff.buffer.start;
+        DEBUGLOG(5, "ZSTDMT_createCompressionJob: preparing job %u to compress %u bytes with %u preload ",
+                    mtctx->nextJobID, (U32)srcSize, (U32)mtctx->inBuff.prefix.size);
+        mtctx->jobs[jobID].src.start = src;
+        mtctx->jobs[jobID].src.size = srcSize;
+        assert(mtctx->inBuff.filled >= srcSize);
+        mtctx->jobs[jobID].prefix = mtctx->inBuff.prefix;
+        mtctx->jobs[jobID].consumed = 0;
+        mtctx->jobs[jobID].cSize = 0;
+        mtctx->jobs[jobID].params = mtctx->params;
+        mtctx->jobs[jobID].cdict = mtctx->nextJobID==0 ? mtctx->cdict : NULL;
+        mtctx->jobs[jobID].fullFrameSize = mtctx->frameContentSize;
+        mtctx->jobs[jobID].dstBuff = g_nullBuffer;
+        mtctx->jobs[jobID].cctxPool = mtctx->cctxPool;
+        mtctx->jobs[jobID].bufPool = mtctx->bufPool;
+        mtctx->jobs[jobID].seqPool = mtctx->seqPool;
+        mtctx->jobs[jobID].serial = &mtctx->serial;
+        mtctx->jobs[jobID].jobID = mtctx->nextJobID;
+        mtctx->jobs[jobID].firstJob = (mtctx->nextJobID==0);
+        mtctx->jobs[jobID].lastJob = endFrame;
+        mtctx->jobs[jobID].frameChecksumNeeded = mtctx->params.fParams.checksumFlag && endFrame && (mtctx->nextJobID>0);
+        mtctx->jobs[jobID].dstFlushed = 0;
+
+        /* Update the round buffer pos and clear the input buffer to be reset */
+        mtctx->roundBuff.pos += srcSize;
+        mtctx->inBuff.buffer = g_nullBuffer;
+        mtctx->inBuff.filled = 0;
+        /* Set the prefix */
+        if (!endFrame) {
+            size_t const newPrefixSize = MIN(srcSize, mtctx->targetPrefixSize);
+            mtctx->inBuff.prefix.start = src + srcSize - newPrefixSize;
+            mtctx->inBuff.prefix.size = newPrefixSize;
+        } else {   /* endFrame==1 => no need for another input buffer */
+            mtctx->inBuff.prefix = kNullRange;
+            mtctx->frameEnded = endFrame;
+            if (mtctx->nextJobID == 0) {
+                /* single job exception : checksum is already calculated directly within worker thread */
+                mtctx->params.fParams.checksumFlag = 0;
+        }   }
+
+        if ( (srcSize == 0)
+          && (mtctx->nextJobID>0)/*single job must also write frame header*/ ) {
+            DEBUGLOG(5, "ZSTDMT_createCompressionJob: creating a last empty block to end frame");
+            assert(endOp == ZSTD_e_end);  /* only possible case : need to end the frame with an empty last block */
+            ZSTDMT_writeLastEmptyBlock(mtctx->jobs + jobID);
+            mtctx->nextJobID++;
+            return 0;
+        }
+    }
+
+    DEBUGLOG(5, "ZSTDMT_createCompressionJob: posting job %u : %u bytes  (end:%u, jobNb == %u (mod:%u))",
+                mtctx->nextJobID,
+                (U32)mtctx->jobs[jobID].src.size,
+                mtctx->jobs[jobID].lastJob,
+                mtctx->nextJobID,
+                jobID);
+    if (POOL_tryAdd(mtctx->factory, ZSTDMT_compressionJob, &mtctx->jobs[jobID])) {
+        mtctx->nextJobID++;
+        mtctx->jobReady = 0;
+    } else {
+        DEBUGLOG(5, "ZSTDMT_createCompressionJob: no worker available for job %u", mtctx->nextJobID);
+        mtctx->jobReady = 1;
+    }
+    return 0;
+}
+
+
+/*! ZSTDMT_flushProduced() :
+ *  flush whatever data has been produced but not yet flushed in current job.
+ *  move to next job if current one is fully flushed.
+ * `output` : `pos` will be updated with amount of data flushed .
+ * `blockToFlush` : if >0, the function will block and wait if there is no data available to flush .
+ * @return : amount of data remaining within internal buffer, 0 if no more, 1 if unknown but > 0, or an error code */
+static size_t ZSTDMT_flushProduced(ZSTDMT_CCtx* mtctx, ZSTD_outBuffer* output, unsigned blockToFlush, ZSTD_EndDirective end)
+{
+    unsigned const wJobID = mtctx->doneJobID & mtctx->jobIDMask;
+    DEBUGLOG(5, "ZSTDMT_flushProduced (blocking:%u , job %u <= %u)",
+                blockToFlush, mtctx->doneJobID, mtctx->nextJobID);
+    assert(output->size >= output->pos);
+
+    ZSTD_PTHREAD_MUTEX_LOCK(&mtctx->jobs[wJobID].job_mutex);
+    if (  blockToFlush
+      && (mtctx->doneJobID < mtctx->nextJobID) ) {
+        assert(mtctx->jobs[wJobID].dstFlushed <= mtctx->jobs[wJobID].cSize);
+        while (mtctx->jobs[wJobID].dstFlushed == mtctx->jobs[wJobID].cSize) {  /* nothing to flush */
+            if (mtctx->jobs[wJobID].consumed == mtctx->jobs[wJobID].src.size) {
+                DEBUGLOG(5, "job %u is completely consumed (%u == %u) => don't wait for cond, there will be none",
+                            mtctx->doneJobID, (U32)mtctx->jobs[wJobID].consumed, (U32)mtctx->jobs[wJobID].src.size);
+                break;
+            }
+            DEBUGLOG(5, "waiting for something to flush from job %u (currently flushed: %u bytes)",
+                        mtctx->doneJobID, (U32)mtctx->jobs[wJobID].dstFlushed);
+            ZSTD_pthread_cond_wait(&mtctx->jobs[wJobID].job_cond, &mtctx->jobs[wJobID].job_mutex);  /* block when nothing to flush but some to come */
+    }   }
+
+    /* try to flush something */
+    {   size_t cSize = mtctx->jobs[wJobID].cSize;                  /* shared */
+        size_t const srcConsumed = mtctx->jobs[wJobID].consumed;   /* shared */
+        size_t const srcSize = mtctx->jobs[wJobID].src.size;       /* read-only, could be done after mutex lock, but no-declaration-after-statement */
+        ZSTD_pthread_mutex_unlock(&mtctx->jobs[wJobID].job_mutex);
+        if (ZSTD_isError(cSize)) {
+            DEBUGLOG(5, "ZSTDMT_flushProduced: job %u : compression error detected : %s",
+                        mtctx->doneJobID, ZSTD_getErrorName(cSize));
+            ZSTDMT_waitForAllJobsCompleted(mtctx);
+            ZSTDMT_releaseAllJobResources(mtctx);
+            return cSize;
+        }
+        /* add frame checksum if necessary (can only happen once) */
+        assert(srcConsumed <= srcSize);
+        if ( (srcConsumed == srcSize)   /* job completed -> worker no longer active */
+          && mtctx->jobs[wJobID].frameChecksumNeeded ) {
+            U32 const checksum = (U32)XXH64_digest(&mtctx->serial.xxhState);
+            DEBUGLOG(4, "ZSTDMT_flushProduced: writing checksum : %08X \n", checksum);
+            MEM_writeLE32((char*)mtctx->jobs[wJobID].dstBuff.start + mtctx->jobs[wJobID].cSize, checksum);
+            cSize += 4;
+            mtctx->jobs[wJobID].cSize += 4;  /* can write this shared value, as worker is no longer active */
+            mtctx->jobs[wJobID].frameChecksumNeeded = 0;
+        }
+
+        if (cSize > 0) {   /* compression is ongoing or completed */
+            size_t const toFlush = MIN(cSize - mtctx->jobs[wJobID].dstFlushed, output->size - output->pos);
+            DEBUGLOG(5, "ZSTDMT_flushProduced: Flushing %u bytes from job %u (completion:%u/%u, generated:%u)",
+                        (U32)toFlush, mtctx->doneJobID, (U32)srcConsumed, (U32)srcSize, (U32)cSize);
+            assert(mtctx->doneJobID < mtctx->nextJobID);
+            assert(cSize >= mtctx->jobs[wJobID].dstFlushed);
+            assert(mtctx->jobs[wJobID].dstBuff.start != NULL);
+            if (toFlush > 0) {
+                ZSTD_memcpy((char*)output->dst + output->pos,
+                    (const char*)mtctx->jobs[wJobID].dstBuff.start + mtctx->jobs[wJobID].dstFlushed,
+                    toFlush);
+            }
+            output->pos += toFlush;
+            mtctx->jobs[wJobID].dstFlushed += toFlush;  /* can write : this value is only used by mtctx */
+
+            if ( (srcConsumed == srcSize)    /* job is completed */
+              && (mtctx->jobs[wJobID].dstFlushed == cSize) ) {   /* output buffer fully flushed => free this job position */
+                DEBUGLOG(5, "Job %u completed (%u bytes), moving to next one",
+                        mtctx->doneJobID, (U32)mtctx->jobs[wJobID].dstFlushed);
+                ZSTDMT_releaseBuffer(mtctx->bufPool, mtctx->jobs[wJobID].dstBuff);
+                DEBUGLOG(5, "dstBuffer released");
+                mtctx->jobs[wJobID].dstBuff = g_nullBuffer;
+                mtctx->jobs[wJobID].cSize = 0;   /* ensure this job slot is considered "not started" in future check */
+                mtctx->consumed += srcSize;
+                mtctx->produced += cSize;
+                mtctx->doneJobID++;
+        }   }
+
+        /* return value : how many bytes left in buffer ; fake it to 1 when unknown but >0 */
+        if (cSize > mtctx->jobs[wJobID].dstFlushed) return (cSize - mtctx->jobs[wJobID].dstFlushed);
+        if (srcSize > srcConsumed) return 1;   /* current job not completely compressed */
+    }
+    if (mtctx->doneJobID < mtctx->nextJobID) return 1;   /* some more jobs ongoing */
+    if (mtctx->jobReady) return 1;      /* one job is ready to push, just not yet in the list */
+    if (mtctx->inBuff.filled > 0) return 1;   /* input is not empty, and still needs to be converted into a job */
+    mtctx->allJobsCompleted = mtctx->frameEnded;   /* all jobs are entirely flushed => if this one is last one, frame is completed */
+    if (end == ZSTD_e_end) return !mtctx->frameEnded;  /* for ZSTD_e_end, question becomes : is frame completed ? instead of : are internal buffers fully flushed ? */
+    return 0;   /* internal buffers fully flushed */
+}
+
+/**
+ * Returns the range of data used by the earliest job that is not yet complete.
+ * If the data of the first job is broken up into two segments, we cover both
+ * sections.
+ */
+static range_t ZSTDMT_getInputDataInUse(ZSTDMT_CCtx* mtctx)
+{
+    unsigned const firstJobID = mtctx->doneJobID;
+    unsigned const lastJobID = mtctx->nextJobID;
+    unsigned jobID;
+
+    for (jobID = firstJobID; jobID < lastJobID; ++jobID) {
+        unsigned const wJobID = jobID & mtctx->jobIDMask;
+        size_t consumed;
+
+        ZSTD_PTHREAD_MUTEX_LOCK(&mtctx->jobs[wJobID].job_mutex);
+        consumed = mtctx->jobs[wJobID].consumed;
+        ZSTD_pthread_mutex_unlock(&mtctx->jobs[wJobID].job_mutex);
+
+        if (consumed < mtctx->jobs[wJobID].src.size) {
+            range_t range = mtctx->jobs[wJobID].prefix;
+            if (range.size == 0) {
+                /* Empty prefix */
+                range = mtctx->jobs[wJobID].src;
+            }
+            /* Job source in multiple segments not supported yet */
+            assert(range.start <= mtctx->jobs[wJobID].src.start);
+            return range;
+        }
+    }
+    return kNullRange;
+}
+
+/**
+ * Returns non-zero iff buffer and range overlap.
+ */
+static int ZSTDMT_isOverlapped(buffer_t buffer, range_t range)
+{
+    BYTE const* const bufferStart = (BYTE const*)buffer.start;
+    BYTE const* const bufferEnd = bufferStart + buffer.capacity;
+    BYTE const* const rangeStart = (BYTE const*)range.start;
+    BYTE const* const rangeEnd = range.size != 0 ? rangeStart + range.size : rangeStart;
+
+    if (rangeStart == NULL || bufferStart == NULL)
+        return 0;
+    /* Empty ranges cannot overlap */
+    if (bufferStart == bufferEnd || rangeStart == rangeEnd)
+        return 0;
+
+    return bufferStart < rangeEnd && rangeStart < bufferEnd;
+}
+
+static int ZSTDMT_doesOverlapWindow(buffer_t buffer, ZSTD_window_t window)
+{
+    range_t extDict;
+    range_t prefix;
+
+    DEBUGLOG(5, "ZSTDMT_doesOverlapWindow");
+    extDict.start = window.dictBase + window.lowLimit;
+    extDict.size = window.dictLimit - window.lowLimit;
+
+    prefix.start = window.base + window.dictLimit;
+    prefix.size = window.nextSrc - (window.base + window.dictLimit);
+    DEBUGLOG(5, "extDict [0x%zx, 0x%zx)",
+                (size_t)extDict.start,
+                (size_t)extDict.start + extDict.size);
+    DEBUGLOG(5, "prefix  [0x%zx, 0x%zx)",
+                (size_t)prefix.start,
+                (size_t)prefix.start + prefix.size);
+
+    return ZSTDMT_isOverlapped(buffer, extDict)
+        || ZSTDMT_isOverlapped(buffer, prefix);
+}
+
+static void ZSTDMT_waitForLdmComplete(ZSTDMT_CCtx* mtctx, buffer_t buffer)
+{
+    if (mtctx->params.ldmParams.enableLdm) {
+        ZSTD_pthread_mutex_t* mutex = &mtctx->serial.ldmWindowMutex;
+        DEBUGLOG(5, "ZSTDMT_waitForLdmComplete");
+        DEBUGLOG(5, "source  [0x%zx, 0x%zx)",
+                    (size_t)buffer.start,
+                    (size_t)buffer.start + buffer.capacity);
+        ZSTD_PTHREAD_MUTEX_LOCK(mutex);
+        while (ZSTDMT_doesOverlapWindow(buffer, mtctx->serial.ldmWindow)) {
+            DEBUGLOG(5, "Waiting for LDM to finish...");
+            ZSTD_pthread_cond_wait(&mtctx->serial.ldmWindowCond, mutex);
+        }
+        DEBUGLOG(6, "Done waiting for LDM to finish");
+        ZSTD_pthread_mutex_unlock(mutex);
+    }
+}
+
+/**
+ * Attempts to set the inBuff to the next section to fill.
+ * If any part of the new section is still in use we give up.
+ * Returns non-zero if the buffer is filled.
+ */
+static int ZSTDMT_tryGetInputRange(ZSTDMT_CCtx* mtctx)
+{
+    range_t const inUse = ZSTDMT_getInputDataInUse(mtctx);
+    size_t const spaceLeft = mtctx->roundBuff.capacity - mtctx->roundBuff.pos;
+    size_t const target = mtctx->targetSectionSize;
+    buffer_t buffer;
+
+    DEBUGLOG(5, "ZSTDMT_tryGetInputRange");
+    assert(mtctx->inBuff.buffer.start == NULL);
+    assert(mtctx->roundBuff.capacity >= target);
+
+    if (spaceLeft < target) {
+        /* ZSTD_invalidateRepCodes() doesn't work for extDict variants.
+         * Simply copy the prefix to the beginning in that case.
+         */
+        BYTE* const start = (BYTE*)mtctx->roundBuff.buffer;
+        size_t const prefixSize = mtctx->inBuff.prefix.size;
+
+        buffer.start = start;
+        buffer.capacity = prefixSize;
+        if (ZSTDMT_isOverlapped(buffer, inUse)) {
+            DEBUGLOG(5, "Waiting for buffer...");
+            return 0;
+        }
+        ZSTDMT_waitForLdmComplete(mtctx, buffer);
+        ZSTD_memmove(start, mtctx->inBuff.prefix.start, prefixSize);
+        mtctx->inBuff.prefix.start = start;
+        mtctx->roundBuff.pos = prefixSize;
+    }
+    buffer.start = mtctx->roundBuff.buffer + mtctx->roundBuff.pos;
+    buffer.capacity = target;
+
+    if (ZSTDMT_isOverlapped(buffer, inUse)) {
+        DEBUGLOG(5, "Waiting for buffer...");
+        return 0;
+    }
+    assert(!ZSTDMT_isOverlapped(buffer, mtctx->inBuff.prefix));
+
+    ZSTDMT_waitForLdmComplete(mtctx, buffer);
+
+    DEBUGLOG(5, "Using prefix range [%zx, %zx)",
+                (size_t)mtctx->inBuff.prefix.start,
+                (size_t)mtctx->inBuff.prefix.start + mtctx->inBuff.prefix.size);
+    DEBUGLOG(5, "Using source range [%zx, %zx)",
+                (size_t)buffer.start,
+                (size_t)buffer.start + buffer.capacity);
+
+
+    mtctx->inBuff.buffer = buffer;
+    mtctx->inBuff.filled = 0;
+    assert(mtctx->roundBuff.pos + buffer.capacity <= mtctx->roundBuff.capacity);
+    return 1;
+}
+
+typedef struct {
+  size_t toLoad;  /* The number of bytes to load from the input. */
+  int flush;      /* Boolean declaring if we must flush because we found a synchronization point. */
+} syncPoint_t;
+
+/**
+ * Searches through the input for a synchronization point. If one is found, we
+ * will instruct the caller to flush, and return the number of bytes to load.
+ * Otherwise, we will load as many bytes as possible and instruct the caller
+ * to continue as normal.
+ */
+static syncPoint_t
+findSynchronizationPoint(ZSTDMT_CCtx const* mtctx, ZSTD_inBuffer const input)
+{
+    BYTE const* const istart = (BYTE const*)input.src + input.pos;
+    U64 const primePower = mtctx->rsync.primePower;
+    U64 const hitMask = mtctx->rsync.hitMask;
+
+    syncPoint_t syncPoint;
+    U64 hash;
+    BYTE const* prev;
+    size_t pos;
+
+    syncPoint.toLoad = MIN(input.size - input.pos, mtctx->targetSectionSize - mtctx->inBuff.filled);
+    syncPoint.flush = 0;
+    if (!mtctx->params.rsyncable)
+        /* Rsync is disabled. */
+        return syncPoint;
+    if (mtctx->inBuff.filled + syncPoint.toLoad < RSYNC_LENGTH)
+        /* Not enough to compute the hash.
+         * We will miss any synchronization points in this RSYNC_LENGTH byte
+         * window. However, since it depends only in the internal buffers, if the
+         * state is already synchronized, we will remain synchronized.
+         * Additionally, the probability that we miss a synchronization point is
+         * low: RSYNC_LENGTH / targetSectionSize.
+         */
+        return syncPoint;
+    /* Initialize the loop variables. */
+    if (mtctx->inBuff.filled >= RSYNC_LENGTH) {
+        /* We have enough bytes buffered to initialize the hash.
+         * Start scanning at the beginning of the input.
+         */
+        pos = 0;
+        prev = (BYTE const*)mtctx->inBuff.buffer.start + mtctx->inBuff.filled - RSYNC_LENGTH;
+        hash = ZSTD_rollingHash_compute(prev, RSYNC_LENGTH);
+        if ((hash & hitMask) == hitMask) {
+            /* We're already at a sync point so don't load any more until
+             * we're able to flush this sync point.
+             * This likely happened because the job table was full so we
+             * couldn't add our job.
+             */
+            syncPoint.toLoad = 0;
+            syncPoint.flush = 1;
+            return syncPoint;
+        }
+    } else {
+        /* We don't have enough bytes buffered to initialize the hash, but
+         * we know we have at least RSYNC_LENGTH bytes total.
+         * Start scanning after the first RSYNC_LENGTH bytes less the bytes
+         * already buffered.
+         */
+        pos = RSYNC_LENGTH - mtctx->inBuff.filled;
+        prev = (BYTE const*)mtctx->inBuff.buffer.start - pos;
+        hash = ZSTD_rollingHash_compute(mtctx->inBuff.buffer.start, mtctx->inBuff.filled);
+        hash = ZSTD_rollingHash_append(hash, istart, pos);
+    }
+    /* Starting with the hash of the previous RSYNC_LENGTH bytes, roll
+     * through the input. If we hit a synchronization point, then cut the
+     * job off, and tell the compressor to flush the job. Otherwise, load
+     * all the bytes and continue as normal.
+     * If we go too long without a synchronization point (targetSectionSize)
+     * then a block will be emitted anyways, but this is okay, since if we
+     * are already synchronized we will remain synchronized.
+     */
+    for (; pos < syncPoint.toLoad; ++pos) {
+        BYTE const toRemove = pos < RSYNC_LENGTH ? prev[pos] : istart[pos - RSYNC_LENGTH];
+        /* if (pos >= RSYNC_LENGTH) assert(ZSTD_rollingHash_compute(istart + pos - RSYNC_LENGTH, RSYNC_LENGTH) == hash); */
+        hash = ZSTD_rollingHash_rotate(hash, toRemove, istart[pos], primePower);
+        if ((hash & hitMask) == hitMask) {
+            syncPoint.toLoad = pos + 1;
+            syncPoint.flush = 1;
+            break;
+        }
+    }
+    return syncPoint;
+}
+
+size_t ZSTDMT_nextInputSizeHint(const ZSTDMT_CCtx* mtctx)
+{
+    size_t hintInSize = mtctx->targetSectionSize - mtctx->inBuff.filled;
+    if (hintInSize==0) hintInSize = mtctx->targetSectionSize;
+    return hintInSize;
+}
+
+/** ZSTDMT_compressStream_generic() :
+ *  internal use only - exposed to be invoked from zstd_compress.c
+ *  assumption : output and input are valid (pos <= size)
+ * @return : minimum amount of data remaining to flush, 0 if none */
+size_t ZSTDMT_compressStream_generic(ZSTDMT_CCtx* mtctx,
+                                     ZSTD_outBuffer* output,
+                                     ZSTD_inBuffer* input,
+                                     ZSTD_EndDirective endOp)
+{
+    unsigned forwardInputProgress = 0;
+    DEBUGLOG(5, "ZSTDMT_compressStream_generic (endOp=%u, srcSize=%u)",
+                (U32)endOp, (U32)(input->size - input->pos));
+    assert(output->pos <= output->size);
+    assert(input->pos  <= input->size);
+
+    if ((mtctx->frameEnded) && (endOp==ZSTD_e_continue)) {
+        /* current frame being ended. Only flush/end are allowed */
+        return ERROR(stage_wrong);
+    }
+
+    /* fill input buffer */
+    if ( (!mtctx->jobReady)
+      && (input->size > input->pos) ) {   /* support NULL input */
+        if (mtctx->inBuff.buffer.start == NULL) {
+            assert(mtctx->inBuff.filled == 0); /* Can't fill an empty buffer */
+            if (!ZSTDMT_tryGetInputRange(mtctx)) {
+                /* It is only possible for this operation to fail if there are
+                 * still compression jobs ongoing.
+                 */
+                DEBUGLOG(5, "ZSTDMT_tryGetInputRange failed");
+                assert(mtctx->doneJobID != mtctx->nextJobID);
+            } else
+                DEBUGLOG(5, "ZSTDMT_tryGetInputRange completed successfully : mtctx->inBuff.buffer.start = %p", mtctx->inBuff.buffer.start);
+        }
+        if (mtctx->inBuff.buffer.start != NULL) {
+            syncPoint_t const syncPoint = findSynchronizationPoint(mtctx, *input);
+            if (syncPoint.flush && endOp == ZSTD_e_continue) {
+                endOp = ZSTD_e_flush;
+            }
+            assert(mtctx->inBuff.buffer.capacity >= mtctx->targetSectionSize);
+            DEBUGLOG(5, "ZSTDMT_compressStream_generic: adding %u bytes on top of %u to buffer of size %u",
+                        (U32)syncPoint.toLoad, (U32)mtctx->inBuff.filled, (U32)mtctx->targetSectionSize);
+            ZSTD_memcpy((char*)mtctx->inBuff.buffer.start + mtctx->inBuff.filled, (const char*)input->src + input->pos, syncPoint.toLoad);
+            input->pos += syncPoint.toLoad;
+            mtctx->inBuff.filled += syncPoint.toLoad;
+            forwardInputProgress = syncPoint.toLoad>0;
+        }
+    }
+    if ((input->pos < input->size) && (endOp == ZSTD_e_end)) {
+        /* Can't end yet because the input is not fully consumed.
+            * We are in one of these cases:
+            * - mtctx->inBuff is NULL & empty: we couldn't get an input buffer so don't create a new job.
+            * - We filled the input buffer: flush this job but don't end the frame.
+            * - We hit a synchronization point: flush this job but don't end the frame.
+            */
+        assert(mtctx->inBuff.filled == 0 || mtctx->inBuff.filled == mtctx->targetSectionSize || mtctx->params.rsyncable);
+        endOp = ZSTD_e_flush;
+    }
+
+    if ( (mtctx->jobReady)
+      || (mtctx->inBuff.filled >= mtctx->targetSectionSize)  /* filled enough : let's compress */
+      || ((endOp != ZSTD_e_continue) && (mtctx->inBuff.filled > 0))  /* something to flush : let's go */
+      || ((endOp == ZSTD_e_end) && (!mtctx->frameEnded)) ) {   /* must finish the frame with a zero-size block */
+        size_t const jobSize = mtctx->inBuff.filled;
+        assert(mtctx->inBuff.filled <= mtctx->targetSectionSize);
+        FORWARD_IF_ERROR( ZSTDMT_createCompressionJob(mtctx, jobSize, endOp) , "");
+    }
+
+    /* check for potential compressed data ready to be flushed */
+    {   size_t const remainingToFlush = ZSTDMT_flushProduced(mtctx, output, !forwardInputProgress, endOp); /* block if there was no forward input progress */
+        if (input->pos < input->size) return MAX(remainingToFlush, 1);  /* input not consumed : do not end flush yet */
+        DEBUGLOG(5, "end of ZSTDMT_compressStream_generic: remainingToFlush = %u", (U32)remainingToFlush);
+        return remainingToFlush;
+    }
+}
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstdmt_compress.h mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstdmt_compress.h
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstdmt_compress.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstdmt_compress.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+ #ifndef ZSTDMT_COMPRESS_H
+ #define ZSTDMT_COMPRESS_H
+
+ #if defined (__cplusplus)
+ extern "C" {
+ #endif
+
+
+/* Note : This is an internal API.
+ *        These APIs used to be exposed with ZSTDLIB_API,
+ *        because it used to be the only way to invoke MT compression.
+ *        Now, you must use ZSTD_compress2 and ZSTD_compressStream2() instead.
+ *
+ *        This API requires ZSTD_MULTITHREAD to be defined during compilation,
+ *        otherwise ZSTDMT_createCCtx*() will fail.
+ */
+
+/* ===   Dependencies   === */
+#include "../common/zstd_deps.h"   /* size_t */
+#define ZSTD_STATIC_LINKING_ONLY   /* ZSTD_parameters */
+#include "../zstd.h"            /* ZSTD_inBuffer, ZSTD_outBuffer, ZSTDLIB_API */
+
+
+/* ===   Constants   === */
+#ifndef ZSTDMT_NBWORKERS_MAX /* a different value can be selected at compile time */
+#  define ZSTDMT_NBWORKERS_MAX ((sizeof(void*)==4) /*32-bit*/ ? 64 : 256)
+#endif
+#ifndef ZSTDMT_JOBSIZE_MIN   /* a different value can be selected at compile time */
+#  define ZSTDMT_JOBSIZE_MIN (512 KB)
+#endif
+#define ZSTDMT_JOBLOG_MAX   (MEM_32bits() ? 29 : 30)
+#define ZSTDMT_JOBSIZE_MAX  (MEM_32bits() ? (512 MB) : (1024 MB))
+
+
+/* ========================================================
+ * ===  Private interface, for use by ZSTD_compress.c   ===
+ * ===  Not exposed in libzstd. Never invoke directly   ===
+ * ======================================================== */
+
+/* ===   Memory management   === */
+typedef struct ZSTDMT_CCtx_s ZSTDMT_CCtx;
+/* Requires ZSTD_MULTITHREAD to be defined during compilation, otherwise it will return NULL. */
+ZSTDMT_CCtx* ZSTDMT_createCCtx_advanced(unsigned nbWorkers,
+                                        ZSTD_customMem cMem,
+					ZSTD_threadPool *pool);
+size_t ZSTDMT_freeCCtx(ZSTDMT_CCtx* mtctx);
+
+size_t ZSTDMT_sizeof_CCtx(ZSTDMT_CCtx* mtctx);
+
+/* ===   Streaming functions   === */
+
+size_t ZSTDMT_nextInputSizeHint(const ZSTDMT_CCtx* mtctx);
+
+/*! ZSTDMT_initCStream_internal() :
+ *  Private use only. Init streaming operation.
+ *  expects params to be valid.
+ *  must receive dict, or cdict, or none, but not both.
+ *  @return : 0, or an error code */
+size_t ZSTDMT_initCStream_internal(ZSTDMT_CCtx* zcs,
+                    const void* dict, size_t dictSize, ZSTD_dictContentType_e dictContentType,
+                    const ZSTD_CDict* cdict,
+                    ZSTD_CCtx_params params, unsigned long long pledgedSrcSize);
+
+/*! ZSTDMT_compressStream_generic() :
+ *  Combines ZSTDMT_compressStream() with optional ZSTDMT_flushStream() or ZSTDMT_endStream()
+ *  depending on flush directive.
+ * @return : minimum amount of data still to be flushed
+ *           0 if fully flushed
+ *           or an error code
+ *  note : needs to be init using any ZSTD_initCStream*() variant */
+size_t ZSTDMT_compressStream_generic(ZSTDMT_CCtx* mtctx,
+                                     ZSTD_outBuffer* output,
+                                     ZSTD_inBuffer* input,
+                                     ZSTD_EndDirective endOp);
+
+ /*! ZSTDMT_toFlushNow()
+  *  Tell how many bytes are ready to be flushed immediately.
+  *  Probe the oldest active job (not yet entirely flushed) and check its output buffer.
+  *  If return 0, it means there is no active job,
+  *  or, it means oldest job is still active, but everything produced has been flushed so far,
+  *  therefore flushing is limited by speed of oldest job. */
+size_t ZSTDMT_toFlushNow(ZSTDMT_CCtx* mtctx);
+
+/*! ZSTDMT_updateCParams_whileCompressing() :
+ *  Updates only a selected set of compression parameters, to remain compatible with current frame.
+ *  New parameters will be applied to next compression job. */
+void ZSTDMT_updateCParams_whileCompressing(ZSTDMT_CCtx* mtctx, const ZSTD_CCtx_params* cctxParams);
+
+/*! ZSTDMT_getFrameProgression():
+ *  tells how much data has been consumed (input) and produced (output) for current frame.
+ *  able to count progression inside worker threads.
+ */
+ZSTD_frameProgression ZSTDMT_getFrameProgression(ZSTDMT_CCtx* mtctx);
+
+
+#if defined (__cplusplus)
+}
+#endif
+
+#endif   /* ZSTDMT_COMPRESS_H */
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_opt.c mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_opt.c
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_opt.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_opt.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,1345 @@
+/*
+ * Copyright (c) Przemyslaw Skibinski, Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+#include "zstd_compress_internal.h"
+#include "hist.h"
+#include "zstd_opt.h"
+
+
+#define ZSTD_LITFREQ_ADD    2   /* scaling factor for litFreq, so that frequencies adapt faster to new stats */
+#define ZSTD_FREQ_DIV       4   /* log factor when using previous stats to init next stats */
+#define ZSTD_MAX_PRICE     (1<<30)
+
+#define ZSTD_PREDEF_THRESHOLD 1024   /* if srcSize < ZSTD_PREDEF_THRESHOLD, symbols' cost is assumed static, directly determined by pre-defined distributions */
+
+
+/*-*************************************
+*  Price functions for optimal parser
+***************************************/
+
+#if 0    /* approximation at bit level */
+#  define BITCOST_ACCURACY 0
+#  define BITCOST_MULTIPLIER (1 << BITCOST_ACCURACY)
+#  define WEIGHT(stat)  ((void)opt, ZSTD_bitWeight(stat))
+#elif 0  /* fractional bit accuracy */
+#  define BITCOST_ACCURACY 8
+#  define BITCOST_MULTIPLIER (1 << BITCOST_ACCURACY)
+#  define WEIGHT(stat,opt) ((void)opt, ZSTD_fracWeight(stat))
+#else    /* opt==approx, ultra==accurate */
+#  define BITCOST_ACCURACY 8
+#  define BITCOST_MULTIPLIER (1 << BITCOST_ACCURACY)
+#  define WEIGHT(stat,opt) (opt ? ZSTD_fracWeight(stat) : ZSTD_bitWeight(stat))
+#endif
+
+MEM_STATIC U32 ZSTD_bitWeight(U32 stat)
+{
+    return (ZSTD_highbit32(stat+1) * BITCOST_MULTIPLIER);
+}
+
+MEM_STATIC U32 ZSTD_fracWeight(U32 rawStat)
+{
+    U32 const stat = rawStat + 1;
+    U32 const hb = ZSTD_highbit32(stat);
+    U32 const BWeight = hb * BITCOST_MULTIPLIER;
+    U32 const FWeight = (stat << BITCOST_ACCURACY) >> hb;
+    U32 const weight = BWeight + FWeight;
+    assert(hb + BITCOST_ACCURACY < 31);
+    return weight;
+}
+
+#if (DEBUGLEVEL>=2)
+/* debugging function,
+ * @return price in bytes as fractional value
+ * for debug messages only */
+MEM_STATIC double ZSTD_fCost(U32 price)
+{
+    return (double)price / (BITCOST_MULTIPLIER*8);
+}
+#endif
+
+static int ZSTD_compressedLiterals(optState_t const* const optPtr)
+{
+    return optPtr->literalCompressionMode != ZSTD_lcm_uncompressed;
+}
+
+static void ZSTD_setBasePrices(optState_t* optPtr, int optLevel)
+{
+    if (ZSTD_compressedLiterals(optPtr))
+        optPtr->litSumBasePrice = WEIGHT(optPtr->litSum, optLevel);
+    optPtr->litLengthSumBasePrice = WEIGHT(optPtr->litLengthSum, optLevel);
+    optPtr->matchLengthSumBasePrice = WEIGHT(optPtr->matchLengthSum, optLevel);
+    optPtr->offCodeSumBasePrice = WEIGHT(optPtr->offCodeSum, optLevel);
+}
+
+
+/* ZSTD_downscaleStat() :
+ * reduce all elements in table by a factor 2^(ZSTD_FREQ_DIV+malus)
+ * return the resulting sum of elements */
+static U32 ZSTD_downscaleStat(unsigned* table, U32 lastEltIndex, int malus)
+{
+    U32 s, sum=0;
+    DEBUGLOG(5, "ZSTD_downscaleStat (nbElts=%u)", (unsigned)lastEltIndex+1);
+    assert(ZSTD_FREQ_DIV+malus > 0 && ZSTD_FREQ_DIV+malus < 31);
+    for (s=0; s<lastEltIndex+1; s++) {
+        table[s] = 1 + (table[s] >> (ZSTD_FREQ_DIV+malus));
+        sum += table[s];
+    }
+    return sum;
+}
+
+/* ZSTD_rescaleFreqs() :
+ * if first block (detected by optPtr->litLengthSum == 0) : init statistics
+ *    take hints from dictionary if there is one
+ *    or init from zero, using src for literals stats, or flat 1 for match symbols
+ * otherwise downscale existing stats, to be used as seed for next block.
+ */
+static void
+ZSTD_rescaleFreqs(optState_t* const optPtr,
+            const BYTE* const src, size_t const srcSize,
+                  int const optLevel)
+{
+    int const compressedLiterals = ZSTD_compressedLiterals(optPtr);
+    DEBUGLOG(5, "ZSTD_rescaleFreqs (srcSize=%u)", (unsigned)srcSize);
+    optPtr->priceType = zop_dynamic;
+
+    if (optPtr->litLengthSum == 0) {  /* first block : init */
+        if (srcSize <= ZSTD_PREDEF_THRESHOLD) {  /* heuristic */
+            DEBUGLOG(5, "(srcSize <= ZSTD_PREDEF_THRESHOLD) => zop_predef");
+            optPtr->priceType = zop_predef;
+        }
+
+        assert(optPtr->symbolCosts != NULL);
+        if (optPtr->symbolCosts->huf.repeatMode == HUF_repeat_valid) {
+            /* huffman table presumed generated by dictionary */
+            optPtr->priceType = zop_dynamic;
+
+            if (compressedLiterals) {
+                unsigned lit;
+                assert(optPtr->litFreq != NULL);
+                optPtr->litSum = 0;
+                for (lit=0; lit<=MaxLit; lit++) {
+                    U32 const scaleLog = 11;   /* scale to 2K */
+                    U32 const bitCost = HUF_getNbBits(optPtr->symbolCosts->huf.CTable, lit);
+                    assert(bitCost <= scaleLog);
+                    optPtr->litFreq[lit] = bitCost ? 1 << (scaleLog-bitCost) : 1 /*minimum to calculate cost*/;
+                    optPtr->litSum += optPtr->litFreq[lit];
+            }   }
+
+            {   unsigned ll;
+                FSE_CState_t llstate;
+                FSE_initCState(&llstate, optPtr->symbolCosts->fse.litlengthCTable);
+                optPtr->litLengthSum = 0;
+                for (ll=0; ll<=MaxLL; ll++) {
+                    U32 const scaleLog = 10;   /* scale to 1K */
+                    U32 const bitCost = FSE_getMaxNbBits(llstate.symbolTT, ll);
+                    assert(bitCost < scaleLog);
+                    optPtr->litLengthFreq[ll] = bitCost ? 1 << (scaleLog-bitCost) : 1 /*minimum to calculate cost*/;
+                    optPtr->litLengthSum += optPtr->litLengthFreq[ll];
+            }   }
+
+            {   unsigned ml;
+                FSE_CState_t mlstate;
+                FSE_initCState(&mlstate, optPtr->symbolCosts->fse.matchlengthCTable);
+                optPtr->matchLengthSum = 0;
+                for (ml=0; ml<=MaxML; ml++) {
+                    U32 const scaleLog = 10;
+                    U32 const bitCost = FSE_getMaxNbBits(mlstate.symbolTT, ml);
+                    assert(bitCost < scaleLog);
+                    optPtr->matchLengthFreq[ml] = bitCost ? 1 << (scaleLog-bitCost) : 1 /*minimum to calculate cost*/;
+                    optPtr->matchLengthSum += optPtr->matchLengthFreq[ml];
+            }   }
+
+            {   unsigned of;
+                FSE_CState_t ofstate;
+                FSE_initCState(&ofstate, optPtr->symbolCosts->fse.offcodeCTable);
+                optPtr->offCodeSum = 0;
+                for (of=0; of<=MaxOff; of++) {
+                    U32 const scaleLog = 10;
+                    U32 const bitCost = FSE_getMaxNbBits(ofstate.symbolTT, of);
+                    assert(bitCost < scaleLog);
+                    optPtr->offCodeFreq[of] = bitCost ? 1 << (scaleLog-bitCost) : 1 /*minimum to calculate cost*/;
+                    optPtr->offCodeSum += optPtr->offCodeFreq[of];
+            }   }
+
+        } else {  /* not a dictionary */
+
+            assert(optPtr->litFreq != NULL);
+            if (compressedLiterals) {
+                unsigned lit = MaxLit;
+                HIST_count_simple(optPtr->litFreq, &lit, src, srcSize);   /* use raw first block to init statistics */
+                optPtr->litSum = ZSTD_downscaleStat(optPtr->litFreq, MaxLit, 1);
+            }
+
+            {   unsigned ll;
+                for (ll=0; ll<=MaxLL; ll++)
+                    optPtr->litLengthFreq[ll] = 1;
+            }
+            optPtr->litLengthSum = MaxLL+1;
+
+            {   unsigned ml;
+                for (ml=0; ml<=MaxML; ml++)
+                    optPtr->matchLengthFreq[ml] = 1;
+            }
+            optPtr->matchLengthSum = MaxML+1;
+
+            {   unsigned of;
+                for (of=0; of<=MaxOff; of++)
+                    optPtr->offCodeFreq[of] = 1;
+            }
+            optPtr->offCodeSum = MaxOff+1;
+
+        }
+
+    } else {   /* new block : re-use previous statistics, scaled down */
+
+        if (compressedLiterals)
+            optPtr->litSum = ZSTD_downscaleStat(optPtr->litFreq, MaxLit, 1);
+        optPtr->litLengthSum = ZSTD_downscaleStat(optPtr->litLengthFreq, MaxLL, 0);
+        optPtr->matchLengthSum = ZSTD_downscaleStat(optPtr->matchLengthFreq, MaxML, 0);
+        optPtr->offCodeSum = ZSTD_downscaleStat(optPtr->offCodeFreq, MaxOff, 0);
+    }
+
+    ZSTD_setBasePrices(optPtr, optLevel);
+}
+
+/* ZSTD_rawLiteralsCost() :
+ * price of literals (only) in specified segment (which length can be 0).
+ * does not include price of literalLength symbol */
+static U32 ZSTD_rawLiteralsCost(const BYTE* const literals, U32 const litLength,
+                                const optState_t* const optPtr,
+                                int optLevel)
+{
+    if (litLength == 0) return 0;
+
+    if (!ZSTD_compressedLiterals(optPtr))
+        return (litLength << 3) * BITCOST_MULTIPLIER;  /* Uncompressed - 8 bytes per literal. */
+
+    if (optPtr->priceType == zop_predef)
+        return (litLength*6) * BITCOST_MULTIPLIER;  /* 6 bit per literal - no statistic used */
+
+    /* dynamic statistics */
+    {   U32 price = litLength * optPtr->litSumBasePrice;
+        U32 u;
+        for (u=0; u < litLength; u++) {
+            assert(WEIGHT(optPtr->litFreq[literals[u]], optLevel) <= optPtr->litSumBasePrice);   /* literal cost should never be negative */
+            price -= WEIGHT(optPtr->litFreq[literals[u]], optLevel);
+        }
+        return price;
+    }
+}
+
+/* ZSTD_litLengthPrice() :
+ * cost of literalLength symbol */
+static U32 ZSTD_litLengthPrice(U32 const litLength, const optState_t* const optPtr, int optLevel)
+{
+    if (optPtr->priceType == zop_predef) return WEIGHT(litLength, optLevel);
+
+    /* dynamic statistics */
+    {   U32 const llCode = ZSTD_LLcode(litLength);
+        return (LL_bits[llCode] * BITCOST_MULTIPLIER)
+             + optPtr->litLengthSumBasePrice
+             - WEIGHT(optPtr->litLengthFreq[llCode], optLevel);
+    }
+}
+
+/* ZSTD_getMatchPrice() :
+ * Provides the cost of the match part (offset + matchLength) of a sequence
+ * Must be combined with ZSTD_fullLiteralsCost() to get the full cost of a sequence.
+ * optLevel: when <2, favors small offset for decompression speed (improved cache efficiency) */
+FORCE_INLINE_TEMPLATE U32
+ZSTD_getMatchPrice(U32 const offset,
+                   U32 const matchLength,
+             const optState_t* const optPtr,
+                   int const optLevel)
+{
+    U32 price;
+    U32 const offCode = ZSTD_highbit32(offset+1);
+    U32 const mlBase = matchLength - MINMATCH;
+    assert(matchLength >= MINMATCH);
+
+    if (optPtr->priceType == zop_predef)  /* fixed scheme, do not use statistics */
+        return WEIGHT(mlBase, optLevel) + ((16 + offCode) * BITCOST_MULTIPLIER);
+
+    /* dynamic statistics */
+    price = (offCode * BITCOST_MULTIPLIER) + (optPtr->offCodeSumBasePrice - WEIGHT(optPtr->offCodeFreq[offCode], optLevel));
+    if ((optLevel<2) /*static*/ && offCode >= 20)
+        price += (offCode-19)*2 * BITCOST_MULTIPLIER; /* handicap for long distance offsets, favor decompression speed */
+
+    /* match Length */
+    {   U32 const mlCode = ZSTD_MLcode(mlBase);
+        price += (ML_bits[mlCode] * BITCOST_MULTIPLIER) + (optPtr->matchLengthSumBasePrice - WEIGHT(optPtr->matchLengthFreq[mlCode], optLevel));
+    }
+
+    price += BITCOST_MULTIPLIER / 5;   /* heuristic : make matches a bit more costly to favor less sequences -> faster decompression speed */
+
+    DEBUGLOG(8, "ZSTD_getMatchPrice(ml:%u) = %u", matchLength, price);
+    return price;
+}
+
+/* ZSTD_updateStats() :
+ * assumption : literals + litLengtn <= iend */
+static void ZSTD_updateStats(optState_t* const optPtr,
+                             U32 litLength, const BYTE* literals,
+                             U32 offsetCode, U32 matchLength)
+{
+    /* literals */
+    if (ZSTD_compressedLiterals(optPtr)) {
+        U32 u;
+        for (u=0; u < litLength; u++)
+            optPtr->litFreq[literals[u]] += ZSTD_LITFREQ_ADD;
+        optPtr->litSum += litLength*ZSTD_LITFREQ_ADD;
+    }
+
+    /* literal Length */
+    {   U32 const llCode = ZSTD_LLcode(litLength);
+        optPtr->litLengthFreq[llCode]++;
+        optPtr->litLengthSum++;
+    }
+
+    /* match offset code (0-2=>repCode; 3+=>offset+2) */
+    {   U32 const offCode = ZSTD_highbit32(offsetCode+1);
+        assert(offCode <= MaxOff);
+        optPtr->offCodeFreq[offCode]++;
+        optPtr->offCodeSum++;
+    }
+
+    /* match Length */
+    {   U32 const mlBase = matchLength - MINMATCH;
+        U32 const mlCode = ZSTD_MLcode(mlBase);
+        optPtr->matchLengthFreq[mlCode]++;
+        optPtr->matchLengthSum++;
+    }
+}
+
+
+/* ZSTD_readMINMATCH() :
+ * function safe only for comparisons
+ * assumption : memPtr must be at least 4 bytes before end of buffer */
+MEM_STATIC U32 ZSTD_readMINMATCH(const void* memPtr, U32 length)
+{
+    switch (length)
+    {
+    default :
+    case 4 : return MEM_read32(memPtr);
+    case 3 : if (MEM_isLittleEndian())
+                return MEM_read32(memPtr)<<8;
+             else
+                return MEM_read32(memPtr)>>8;
+    }
+}
+
+
+/* Update hashTable3 up to ip (excluded)
+   Assumption : always within prefix (i.e. not within extDict) */
+static U32 ZSTD_insertAndFindFirstIndexHash3 (ZSTD_matchState_t* ms,
+                                              U32* nextToUpdate3,
+                                              const BYTE* const ip)
+{
+    U32* const hashTable3 = ms->hashTable3;
+    U32 const hashLog3 = ms->hashLog3;
+    const BYTE* const base = ms->window.base;
+    U32 idx = *nextToUpdate3;
+    U32 const target = (U32)(ip - base);
+    size_t const hash3 = ZSTD_hash3Ptr(ip, hashLog3);
+    assert(hashLog3 > 0);
+
+    while(idx < target) {
+        hashTable3[ZSTD_hash3Ptr(base+idx, hashLog3)] = idx;
+        idx++;
+    }
+
+    *nextToUpdate3 = target;
+    return hashTable3[hash3];
+}
+
+
+/*-*************************************
+*  Binary Tree search
+***************************************/
+/** ZSTD_insertBt1() : add one or multiple positions to tree.
+ *  ip : assumed <= iend-8 .
+ * @return : nb of positions added */
+static U32 ZSTD_insertBt1(
+                ZSTD_matchState_t* ms,
+                const BYTE* const ip, const BYTE* const iend,
+                U32 const mls, const int extDict)
+{
+    const ZSTD_compressionParameters* const cParams = &ms->cParams;
+    U32*   const hashTable = ms->hashTable;
+    U32    const hashLog = cParams->hashLog;
+    size_t const h  = ZSTD_hashPtr(ip, hashLog, mls);
+    U32*   const bt = ms->chainTable;
+    U32    const btLog  = cParams->chainLog - 1;
+    U32    const btMask = (1 << btLog) - 1;
+    U32 matchIndex = hashTable[h];
+    size_t commonLengthSmaller=0, commonLengthLarger=0;
+    const BYTE* const base = ms->window.base;
+    const BYTE* const dictBase = ms->window.dictBase;
+    const U32 dictLimit = ms->window.dictLimit;
+    const BYTE* const dictEnd = dictBase + dictLimit;
+    const BYTE* const prefixStart = base + dictLimit;
+    const BYTE* match;
+    const U32 curr = (U32)(ip-base);
+    const U32 btLow = btMask >= curr ? 0 : curr - btMask;
+    U32* smallerPtr = bt + 2*(curr&btMask);
+    U32* largerPtr  = smallerPtr + 1;
+    U32 dummy32;   /* to be nullified at the end */
+    U32 const windowLow = ms->window.lowLimit;
+    U32 matchEndIdx = curr+8+1;
+    size_t bestLength = 8;
+    U32 nbCompares = 1U << cParams->searchLog;
+#ifdef ZSTD_C_PREDICT
+    U32 predictedSmall = *(bt + 2*((curr-1)&btMask) + 0);
+    U32 predictedLarge = *(bt + 2*((curr-1)&btMask) + 1);
+    predictedSmall += (predictedSmall>0);
+    predictedLarge += (predictedLarge>0);
+#endif /* ZSTD_C_PREDICT */
+
+    DEBUGLOG(8, "ZSTD_insertBt1 (%u)", curr);
+
+    assert(ip <= iend-8);   /* required for h calculation */
+    hashTable[h] = curr;   /* Update Hash Table */
+
+    assert(windowLow > 0);
+    while (nbCompares-- && (matchIndex >= windowLow)) {
+        U32* const nextPtr = bt + 2*(matchIndex & btMask);
+        size_t matchLength = MIN(commonLengthSmaller, commonLengthLarger);   /* guaranteed minimum nb of common bytes */
+        assert(matchIndex < curr);
+
+#ifdef ZSTD_C_PREDICT   /* note : can create issues when hlog small <= 11 */
+        const U32* predictPtr = bt + 2*((matchIndex-1) & btMask);   /* written this way, as bt is a roll buffer */
+        if (matchIndex == predictedSmall) {
+            /* no need to check length, result known */
+            *smallerPtr = matchIndex;
+            if (matchIndex <= btLow) { smallerPtr=&dummy32; break; }   /* beyond tree size, stop the search */
+            smallerPtr = nextPtr+1;               /* new "smaller" => larger of match */
+            matchIndex = nextPtr[1];              /* new matchIndex larger than previous (closer to current) */
+            predictedSmall = predictPtr[1] + (predictPtr[1]>0);
+            continue;
+        }
+        if (matchIndex == predictedLarge) {
+            *largerPtr = matchIndex;
+            if (matchIndex <= btLow) { largerPtr=&dummy32; break; }   /* beyond tree size, stop the search */
+            largerPtr = nextPtr;
+            matchIndex = nextPtr[0];
+            predictedLarge = predictPtr[0] + (predictPtr[0]>0);
+            continue;
+        }
+#endif
+
+        if (!extDict || (matchIndex+matchLength >= dictLimit)) {
+            assert(matchIndex+matchLength >= dictLimit);   /* might be wrong if actually extDict */
+            match = base + matchIndex;
+            matchLength += ZSTD_count(ip+matchLength, match+matchLength, iend);
+        } else {
+            match = dictBase + matchIndex;
+            matchLength += ZSTD_count_2segments(ip+matchLength, match+matchLength, iend, dictEnd, prefixStart);
+            if (matchIndex+matchLength >= dictLimit)
+                match = base + matchIndex;   /* to prepare for next usage of match[matchLength] */
+        }
+
+        if (matchLength > bestLength) {
+            bestLength = matchLength;
+            if (matchLength > matchEndIdx - matchIndex)
+                matchEndIdx = matchIndex + (U32)matchLength;
+        }
+
+        if (ip+matchLength == iend) {   /* equal : no way to know if inf or sup */
+            break;   /* drop , to guarantee consistency ; miss a bit of compression, but other solutions can corrupt tree */
+        }
+
+        if (match[matchLength] < ip[matchLength]) {  /* necessarily within buffer */
+            /* match is smaller than current */
+            *smallerPtr = matchIndex;             /* update smaller idx */
+            commonLengthSmaller = matchLength;    /* all smaller will now have at least this guaranteed common length */
+            if (matchIndex <= btLow) { smallerPtr=&dummy32; break; }   /* beyond tree size, stop searching */
+            smallerPtr = nextPtr+1;               /* new "candidate" => larger than match, which was smaller than target */
+            matchIndex = nextPtr[1];              /* new matchIndex, larger than previous and closer to current */
+        } else {
+            /* match is larger than current */
+            *largerPtr = matchIndex;
+            commonLengthLarger = matchLength;
+            if (matchIndex <= btLow) { largerPtr=&dummy32; break; }   /* beyond tree size, stop searching */
+            largerPtr = nextPtr;
+            matchIndex = nextPtr[0];
+    }   }
+
+    *smallerPtr = *largerPtr = 0;
+    {   U32 positions = 0;
+        if (bestLength > 384) positions = MIN(192, (U32)(bestLength - 384));   /* speed optimization */
+        assert(matchEndIdx > curr + 8);
+        return MAX(positions, matchEndIdx - (curr + 8));
+    }
+}
+
+FORCE_INLINE_TEMPLATE
+void ZSTD_updateTree_internal(
+                ZSTD_matchState_t* ms,
+                const BYTE* const ip, const BYTE* const iend,
+                const U32 mls, const ZSTD_dictMode_e dictMode)
+{
+    const BYTE* const base = ms->window.base;
+    U32 const target = (U32)(ip - base);
+    U32 idx = ms->nextToUpdate;
+    DEBUGLOG(6, "ZSTD_updateTree_internal, from %u to %u  (dictMode:%u)",
+                idx, target, dictMode);
+
+    while(idx < target) {
+        U32 const forward = ZSTD_insertBt1(ms, base+idx, iend, mls, dictMode == ZSTD_extDict);
+        assert(idx < (U32)(idx + forward));
+        idx += forward;
+    }
+    assert((size_t)(ip - base) <= (size_t)(U32)(-1));
+    assert((size_t)(iend - base) <= (size_t)(U32)(-1));
+    ms->nextToUpdate = target;
+}
+
+void ZSTD_updateTree(ZSTD_matchState_t* ms, const BYTE* ip, const BYTE* iend) {
+    ZSTD_updateTree_internal(ms, ip, iend, ms->cParams.minMatch, ZSTD_noDict);
+}
+
+FORCE_INLINE_TEMPLATE
+U32 ZSTD_insertBtAndGetAllMatches (
+                    ZSTD_match_t* matches,   /* store result (found matches) in this table (presumed large enough) */
+                    ZSTD_matchState_t* ms,
+                    U32* nextToUpdate3,
+                    const BYTE* const ip, const BYTE* const iLimit, const ZSTD_dictMode_e dictMode,
+                    const U32 rep[ZSTD_REP_NUM],
+                    U32 const ll0,   /* tells if associated literal length is 0 or not. This value must be 0 or 1 */
+                    const U32 lengthToBeat,
+                    U32 const mls /* template */)
+{
+    const ZSTD_compressionParameters* const cParams = &ms->cParams;
+    U32 const sufficient_len = MIN(cParams->targetLength, ZSTD_OPT_NUM -1);
+    const BYTE* const base = ms->window.base;
+    U32 const curr = (U32)(ip-base);
+    U32 const hashLog = cParams->hashLog;
+    U32 const minMatch = (mls==3) ? 3 : 4;
+    U32* const hashTable = ms->hashTable;
+    size_t const h  = ZSTD_hashPtr(ip, hashLog, mls);
+    U32 matchIndex  = hashTable[h];
+    U32* const bt   = ms->chainTable;
+    U32 const btLog = cParams->chainLog - 1;
+    U32 const btMask= (1U << btLog) - 1;
+    size_t commonLengthSmaller=0, commonLengthLarger=0;
+    const BYTE* const dictBase = ms->window.dictBase;
+    U32 const dictLimit = ms->window.dictLimit;
+    const BYTE* const dictEnd = dictBase + dictLimit;
+    const BYTE* const prefixStart = base + dictLimit;
+    U32 const btLow = (btMask >= curr) ? 0 : curr - btMask;
+    U32 const windowLow = ZSTD_getLowestMatchIndex(ms, curr, cParams->windowLog);
+    U32 const matchLow = windowLow ? windowLow : 1;
+    U32* smallerPtr = bt + 2*(curr&btMask);
+    U32* largerPtr  = bt + 2*(curr&btMask) + 1;
+    U32 matchEndIdx = curr+8+1;   /* farthest referenced position of any match => detects repetitive patterns */
+    U32 dummy32;   /* to be nullified at the end */
+    U32 mnum = 0;
+    U32 nbCompares = 1U << cParams->searchLog;
+
+    const ZSTD_matchState_t* dms    = dictMode == ZSTD_dictMatchState ? ms->dictMatchState : NULL;
+    const ZSTD_compressionParameters* const dmsCParams =
+                                      dictMode == ZSTD_dictMatchState ? &dms->cParams : NULL;
+    const BYTE* const dmsBase       = dictMode == ZSTD_dictMatchState ? dms->window.base : NULL;
+    const BYTE* const dmsEnd        = dictMode == ZSTD_dictMatchState ? dms->window.nextSrc : NULL;
+    U32         const dmsHighLimit  = dictMode == ZSTD_dictMatchState ? (U32)(dmsEnd - dmsBase) : 0;
+    U32         const dmsLowLimit   = dictMode == ZSTD_dictMatchState ? dms->window.lowLimit : 0;
+    U32         const dmsIndexDelta = dictMode == ZSTD_dictMatchState ? windowLow - dmsHighLimit : 0;
+    U32         const dmsHashLog    = dictMode == ZSTD_dictMatchState ? dmsCParams->hashLog : hashLog;
+    U32         const dmsBtLog      = dictMode == ZSTD_dictMatchState ? dmsCParams->chainLog - 1 : btLog;
+    U32         const dmsBtMask     = dictMode == ZSTD_dictMatchState ? (1U << dmsBtLog) - 1 : 0;
+    U32         const dmsBtLow      = dictMode == ZSTD_dictMatchState && dmsBtMask < dmsHighLimit - dmsLowLimit ? dmsHighLimit - dmsBtMask : dmsLowLimit;
+
+    size_t bestLength = lengthToBeat-1;
+    DEBUGLOG(8, "ZSTD_insertBtAndGetAllMatches: current=%u", curr);
+
+    /* check repCode */
+    assert(ll0 <= 1);   /* necessarily 1 or 0 */
+    {   U32 const lastR = ZSTD_REP_NUM + ll0;
+        U32 repCode;
+        for (repCode = ll0; repCode < lastR; repCode++) {
+            U32 const repOffset = (repCode==ZSTD_REP_NUM) ? (rep[0] - 1) : rep[repCode];
+            U32 const repIndex = curr - repOffset;
+            U32 repLen = 0;
+            assert(curr >= dictLimit);
+            if (repOffset-1 /* intentional overflow, discards 0 and -1 */ < curr-dictLimit) {  /* equivalent to `curr > repIndex >= dictLimit` */
+                /* We must validate the repcode offset because when we're using a dictionary the
+                 * valid offset range shrinks when the dictionary goes out of bounds.
+                 */
+                if ((repIndex >= windowLow) & (ZSTD_readMINMATCH(ip, minMatch) == ZSTD_readMINMATCH(ip - repOffset, minMatch))) {
+                    repLen = (U32)ZSTD_count(ip+minMatch, ip+minMatch-repOffset, iLimit) + minMatch;
+                }
+            } else {  /* repIndex < dictLimit || repIndex >= curr */
+                const BYTE* const repMatch = dictMode == ZSTD_dictMatchState ?
+                                             dmsBase + repIndex - dmsIndexDelta :
+                                             dictBase + repIndex;
+                assert(curr >= windowLow);
+                if ( dictMode == ZSTD_extDict
+                  && ( ((repOffset-1) /*intentional overflow*/ < curr - windowLow)  /* equivalent to `curr > repIndex >= windowLow` */
+                     & (((U32)((dictLimit-1) - repIndex) >= 3) ) /* intentional overflow : do not test positions overlapping 2 memory segments */)
+                  && (ZSTD_readMINMATCH(ip, minMatch) == ZSTD_readMINMATCH(repMatch, minMatch)) ) {
+                    repLen = (U32)ZSTD_count_2segments(ip+minMatch, repMatch+minMatch, iLimit, dictEnd, prefixStart) + minMatch;
+                }
+                if (dictMode == ZSTD_dictMatchState
+                  && ( ((repOffset-1) /*intentional overflow*/ < curr - (dmsLowLimit + dmsIndexDelta))  /* equivalent to `curr > repIndex >= dmsLowLimit` */
+                     & ((U32)((dictLimit-1) - repIndex) >= 3) ) /* intentional overflow : do not test positions overlapping 2 memory segments */
+                  && (ZSTD_readMINMATCH(ip, minMatch) == ZSTD_readMINMATCH(repMatch, minMatch)) ) {
+                    repLen = (U32)ZSTD_count_2segments(ip+minMatch, repMatch+minMatch, iLimit, dmsEnd, prefixStart) + minMatch;
+            }   }
+            /* save longer solution */
+            if (repLen > bestLength) {
+                DEBUGLOG(8, "found repCode %u (ll0:%u, offset:%u) of length %u",
+                            repCode, ll0, repOffset, repLen);
+                bestLength = repLen;
+                matches[mnum].off = repCode - ll0;
+                matches[mnum].len = (U32)repLen;
+                mnum++;
+                if ( (repLen > sufficient_len)
+                   | (ip+repLen == iLimit) ) {  /* best possible */
+                    return mnum;
+    }   }   }   }
+
+    /* HC3 match finder */
+    if ((mls == 3) /*static*/ && (bestLength < mls)) {
+        U32 const matchIndex3 = ZSTD_insertAndFindFirstIndexHash3(ms, nextToUpdate3, ip);
+        if ((matchIndex3 >= matchLow)
+          & (curr - matchIndex3 < (1<<18)) /*heuristic : longer distance likely too expensive*/ ) {
+            size_t mlen;
+            if ((dictMode == ZSTD_noDict) /*static*/ || (dictMode == ZSTD_dictMatchState) /*static*/ || (matchIndex3 >= dictLimit)) {
+                const BYTE* const match = base + matchIndex3;
+                mlen = ZSTD_count(ip, match, iLimit);
+            } else {
+                const BYTE* const match = dictBase + matchIndex3;
+                mlen = ZSTD_count_2segments(ip, match, iLimit, dictEnd, prefixStart);
+            }
+
+            /* save best solution */
+            if (mlen >= mls /* == 3 > bestLength */) {
+                DEBUGLOG(8, "found small match with hlog3, of length %u",
+                            (U32)mlen);
+                bestLength = mlen;
+                assert(curr > matchIndex3);
+                assert(mnum==0);  /* no prior solution */
+                matches[0].off = (curr - matchIndex3) + ZSTD_REP_MOVE;
+                matches[0].len = (U32)mlen;
+                mnum = 1;
+                if ( (mlen > sufficient_len) |
+                     (ip+mlen == iLimit) ) {  /* best possible length */
+                    ms->nextToUpdate = curr+1;  /* skip insertion */
+                    return 1;
+        }   }   }
+        /* no dictMatchState lookup: dicts don't have a populated HC3 table */
+    }
+
+    hashTable[h] = curr;   /* Update Hash Table */
+
+    while (nbCompares-- && (matchIndex >= matchLow)) {
+        U32* const nextPtr = bt + 2*(matchIndex & btMask);
+        const BYTE* match;
+        size_t matchLength = MIN(commonLengthSmaller, commonLengthLarger);   /* guaranteed minimum nb of common bytes */
+        assert(curr > matchIndex);
+
+        if ((dictMode == ZSTD_noDict) || (dictMode == ZSTD_dictMatchState) || (matchIndex+matchLength >= dictLimit)) {
+            assert(matchIndex+matchLength >= dictLimit);  /* ensure the condition is correct when !extDict */
+            match = base + matchIndex;
+            if (matchIndex >= dictLimit) assert(memcmp(match, ip, matchLength) == 0);  /* ensure early section of match is equal as expected */
+            matchLength += ZSTD_count(ip+matchLength, match+matchLength, iLimit);
+        } else {
+            match = dictBase + matchIndex;
+            assert(memcmp(match, ip, matchLength) == 0);  /* ensure early section of match is equal as expected */
+            matchLength += ZSTD_count_2segments(ip+matchLength, match+matchLength, iLimit, dictEnd, prefixStart);
+            if (matchIndex+matchLength >= dictLimit)
+                match = base + matchIndex;   /* prepare for match[matchLength] read */
+        }
+
+        if (matchLength > bestLength) {
+            DEBUGLOG(8, "found match of length %u at distance %u (offCode=%u)",
+                    (U32)matchLength, curr - matchIndex, curr - matchIndex + ZSTD_REP_MOVE);
+            assert(matchEndIdx > matchIndex);
+            if (matchLength > matchEndIdx - matchIndex)
+                matchEndIdx = matchIndex + (U32)matchLength;
+            bestLength = matchLength;
+            matches[mnum].off = (curr - matchIndex) + ZSTD_REP_MOVE;
+            matches[mnum].len = (U32)matchLength;
+            mnum++;
+            if ( (matchLength > ZSTD_OPT_NUM)
+               | (ip+matchLength == iLimit) /* equal : no way to know if inf or sup */) {
+                if (dictMode == ZSTD_dictMatchState) nbCompares = 0; /* break should also skip searching dms */
+                break; /* drop, to preserve bt consistency (miss a little bit of compression) */
+            }
+        }
+
+        if (match[matchLength] < ip[matchLength]) {
+            /* match smaller than current */
+            *smallerPtr = matchIndex;             /* update smaller idx */
+            commonLengthSmaller = matchLength;    /* all smaller will now have at least this guaranteed common length */
+            if (matchIndex <= btLow) { smallerPtr=&dummy32; break; }   /* beyond tree size, stop the search */
+            smallerPtr = nextPtr+1;               /* new candidate => larger than match, which was smaller than current */
+            matchIndex = nextPtr[1];              /* new matchIndex, larger than previous, closer to current */
+        } else {
+            *largerPtr = matchIndex;
+            commonLengthLarger = matchLength;
+            if (matchIndex <= btLow) { largerPtr=&dummy32; break; }   /* beyond tree size, stop the search */
+            largerPtr = nextPtr;
+            matchIndex = nextPtr[0];
+    }   }
+
+    *smallerPtr = *largerPtr = 0;
+
+    if (dictMode == ZSTD_dictMatchState && nbCompares) {
+        size_t const dmsH = ZSTD_hashPtr(ip, dmsHashLog, mls);
+        U32 dictMatchIndex = dms->hashTable[dmsH];
+        const U32* const dmsBt = dms->chainTable;
+        commonLengthSmaller = commonLengthLarger = 0;
+        while (nbCompares-- && (dictMatchIndex > dmsLowLimit)) {
+            const U32* const nextPtr = dmsBt + 2*(dictMatchIndex & dmsBtMask);
+            size_t matchLength = MIN(commonLengthSmaller, commonLengthLarger);   /* guaranteed minimum nb of common bytes */
+            const BYTE* match = dmsBase + dictMatchIndex;
+            matchLength += ZSTD_count_2segments(ip+matchLength, match+matchLength, iLimit, dmsEnd, prefixStart);
+            if (dictMatchIndex+matchLength >= dmsHighLimit)
+                match = base + dictMatchIndex + dmsIndexDelta;   /* to prepare for next usage of match[matchLength] */
+
+            if (matchLength > bestLength) {
+                matchIndex = dictMatchIndex + dmsIndexDelta;
+                DEBUGLOG(8, "found dms match of length %u at distance %u (offCode=%u)",
+                        (U32)matchLength, curr - matchIndex, curr - matchIndex + ZSTD_REP_MOVE);
+                if (matchLength > matchEndIdx - matchIndex)
+                    matchEndIdx = matchIndex + (U32)matchLength;
+                bestLength = matchLength;
+                matches[mnum].off = (curr - matchIndex) + ZSTD_REP_MOVE;
+                matches[mnum].len = (U32)matchLength;
+                mnum++;
+                if ( (matchLength > ZSTD_OPT_NUM)
+                   | (ip+matchLength == iLimit) /* equal : no way to know if inf or sup */) {
+                    break;   /* drop, to guarantee consistency (miss a little bit of compression) */
+                }
+            }
+
+            if (dictMatchIndex <= dmsBtLow) { break; }   /* beyond tree size, stop the search */
+            if (match[matchLength] < ip[matchLength]) {
+                commonLengthSmaller = matchLength;    /* all smaller will now have at least this guaranteed common length */
+                dictMatchIndex = nextPtr[1];              /* new matchIndex larger than previous (closer to current) */
+            } else {
+                /* match is larger than current */
+                commonLengthLarger = matchLength;
+                dictMatchIndex = nextPtr[0];
+            }
+        }
+    }
+
+    assert(matchEndIdx > curr+8);
+    ms->nextToUpdate = matchEndIdx - 8;  /* skip repetitive patterns */
+    return mnum;
+}
+
+
+FORCE_INLINE_TEMPLATE U32 ZSTD_BtGetAllMatches (
+                        ZSTD_match_t* matches,   /* store result (match found, increasing size) in this table */
+                        ZSTD_matchState_t* ms,
+                        U32* nextToUpdate3,
+                        const BYTE* ip, const BYTE* const iHighLimit, const ZSTD_dictMode_e dictMode,
+                        const U32 rep[ZSTD_REP_NUM],
+                        U32 const ll0,
+                        U32 const lengthToBeat)
+{
+    const ZSTD_compressionParameters* const cParams = &ms->cParams;
+    U32 const matchLengthSearch = cParams->minMatch;
+    DEBUGLOG(8, "ZSTD_BtGetAllMatches");
+    if (ip < ms->window.base + ms->nextToUpdate) return 0;   /* skipped area */
+    ZSTD_updateTree_internal(ms, ip, iHighLimit, matchLengthSearch, dictMode);
+    switch(matchLengthSearch)
+    {
+    case 3 : return ZSTD_insertBtAndGetAllMatches(matches, ms, nextToUpdate3, ip, iHighLimit, dictMode, rep, ll0, lengthToBeat, 3);
+    default :
+    case 4 : return ZSTD_insertBtAndGetAllMatches(matches, ms, nextToUpdate3, ip, iHighLimit, dictMode, rep, ll0, lengthToBeat, 4);
+    case 5 : return ZSTD_insertBtAndGetAllMatches(matches, ms, nextToUpdate3, ip, iHighLimit, dictMode, rep, ll0, lengthToBeat, 5);
+    case 7 :
+    case 6 : return ZSTD_insertBtAndGetAllMatches(matches, ms, nextToUpdate3, ip, iHighLimit, dictMode, rep, ll0, lengthToBeat, 6);
+    }
+}
+
+/*************************
+*  LDM helper functions  *
+*************************/
+
+/* Struct containing info needed to make decision about ldm inclusion */
+typedef struct {
+    rawSeqStore_t seqStore;         /* External match candidates store for this block */
+    U32 startPosInBlock;            /* Start position of the current match candidate */
+    U32 endPosInBlock;              /* End position of the current match candidate */
+    U32 offset;                     /* Offset of the match candidate */
+} ZSTD_optLdm_t;
+
+/* ZSTD_optLdm_skipRawSeqStoreBytes():
+ * Moves forward in rawSeqStore by nbBytes, which will update the fields 'pos' and 'posInSequence'.
+ */
+static void ZSTD_optLdm_skipRawSeqStoreBytes(rawSeqStore_t* rawSeqStore, size_t nbBytes) {
+    U32 currPos = (U32)(rawSeqStore->posInSequence + nbBytes);
+    while (currPos && rawSeqStore->pos < rawSeqStore->size) {
+        rawSeq currSeq = rawSeqStore->seq[rawSeqStore->pos];
+        if (currPos >= currSeq.litLength + currSeq.matchLength) {
+            currPos -= currSeq.litLength + currSeq.matchLength;
+            rawSeqStore->pos++;
+        } else {
+            rawSeqStore->posInSequence = currPos;
+            break;
+        }
+    }
+    if (currPos == 0 || rawSeqStore->pos == rawSeqStore->size) {
+        rawSeqStore->posInSequence = 0;
+    }
+}
+
+/* ZSTD_opt_getNextMatchAndUpdateSeqStore():
+ * Calculates the beginning and end of the next match in the current block.
+ * Updates 'pos' and 'posInSequence' of the ldmSeqStore.
+ */
+static void ZSTD_opt_getNextMatchAndUpdateSeqStore(ZSTD_optLdm_t* optLdm, U32 currPosInBlock,
+                                                   U32 blockBytesRemaining) {
+    rawSeq currSeq;
+    U32 currBlockEndPos;
+    U32 literalsBytesRemaining;
+    U32 matchBytesRemaining;
+
+    /* Setting match end position to MAX to ensure we never use an LDM during this block */
+    if (optLdm->seqStore.size == 0 || optLdm->seqStore.pos >= optLdm->seqStore.size) {
+        optLdm->startPosInBlock = UINT_MAX;
+        optLdm->endPosInBlock = UINT_MAX;
+        return;
+    }
+    /* Calculate appropriate bytes left in matchLength and litLength after adjusting
+       based on ldmSeqStore->posInSequence */
+    currSeq = optLdm->seqStore.seq[optLdm->seqStore.pos];
+    assert(optLdm->seqStore.posInSequence <= currSeq.litLength + currSeq.matchLength);
+    currBlockEndPos = currPosInBlock + blockBytesRemaining;
+    literalsBytesRemaining = (optLdm->seqStore.posInSequence < currSeq.litLength) ?
+            currSeq.litLength - (U32)optLdm->seqStore.posInSequence :
+            0;
+    matchBytesRemaining = (literalsBytesRemaining == 0) ?
+            currSeq.matchLength - ((U32)optLdm->seqStore.posInSequence - currSeq.litLength) :
+            currSeq.matchLength;
+
+    /* If there are more literal bytes than bytes remaining in block, no ldm is possible */
+    if (literalsBytesRemaining >= blockBytesRemaining) {
+        optLdm->startPosInBlock = UINT_MAX;
+        optLdm->endPosInBlock = UINT_MAX;
+        ZSTD_optLdm_skipRawSeqStoreBytes(&optLdm->seqStore, blockBytesRemaining);
+        return;
+    }
+
+    /* Matches may be < MINMATCH by this process. In that case, we will reject them
+       when we are deciding whether or not to add the ldm */
+    optLdm->startPosInBlock = currPosInBlock + literalsBytesRemaining;
+    optLdm->endPosInBlock = optLdm->startPosInBlock + matchBytesRemaining;
+    optLdm->offset = currSeq.offset;
+
+    if (optLdm->endPosInBlock > currBlockEndPos) {
+        /* Match ends after the block ends, we can't use the whole match */
+        optLdm->endPosInBlock = currBlockEndPos;
+        ZSTD_optLdm_skipRawSeqStoreBytes(&optLdm->seqStore, currBlockEndPos - currPosInBlock);
+    } else {
+        /* Consume nb of bytes equal to size of sequence left */
+        ZSTD_optLdm_skipRawSeqStoreBytes(&optLdm->seqStore, literalsBytesRemaining + matchBytesRemaining);
+    }
+}
+
+/* ZSTD_optLdm_maybeAddMatch():
+ * Adds a match if it's long enough, based on it's 'matchStartPosInBlock'
+ * and 'matchEndPosInBlock', into 'matches'. Maintains the correct ordering of 'matches'
+ */
+static void ZSTD_optLdm_maybeAddMatch(ZSTD_match_t* matches, U32* nbMatches,
+                                      ZSTD_optLdm_t* optLdm, U32 currPosInBlock) {
+    U32 posDiff = currPosInBlock - optLdm->startPosInBlock;
+    /* Note: ZSTD_match_t actually contains offCode and matchLength (before subtracting MINMATCH) */
+    U32 candidateMatchLength = optLdm->endPosInBlock - optLdm->startPosInBlock - posDiff;
+    U32 candidateOffCode = optLdm->offset + ZSTD_REP_MOVE;
+
+    /* Ensure that current block position is not outside of the match */
+    if (currPosInBlock < optLdm->startPosInBlock
+      || currPosInBlock >= optLdm->endPosInBlock
+      || candidateMatchLength < MINMATCH) {
+        return;
+    }
+
+    if (*nbMatches == 0 || ((candidateMatchLength > matches[*nbMatches-1].len) && *nbMatches < ZSTD_OPT_NUM)) {
+        DEBUGLOG(6, "ZSTD_optLdm_maybeAddMatch(): Adding ldm candidate match (offCode: %u matchLength %u) at block position=%u",
+                 candidateOffCode, candidateMatchLength, currPosInBlock);
+        matches[*nbMatches].len = candidateMatchLength;
+        matches[*nbMatches].off = candidateOffCode;
+        (*nbMatches)++;
+    }
+}
+
+/* ZSTD_optLdm_processMatchCandidate():
+ * Wrapper function to update ldm seq store and call ldm functions as necessary.
+ */
+static void ZSTD_optLdm_processMatchCandidate(ZSTD_optLdm_t* optLdm, ZSTD_match_t* matches, U32* nbMatches,
+                                              U32 currPosInBlock, U32 remainingBytes) {
+    if (optLdm->seqStore.size == 0 || optLdm->seqStore.pos >= optLdm->seqStore.size) {
+        return;
+    }
+
+    if (currPosInBlock >= optLdm->endPosInBlock) {
+        if (currPosInBlock > optLdm->endPosInBlock) {
+            /* The position at which ZSTD_optLdm_processMatchCandidate() is called is not necessarily
+             * at the end of a match from the ldm seq store, and will often be some bytes
+             * over beyond matchEndPosInBlock. As such, we need to correct for these "overshoots"
+             */
+            U32 posOvershoot = currPosInBlock - optLdm->endPosInBlock;
+            ZSTD_optLdm_skipRawSeqStoreBytes(&optLdm->seqStore, posOvershoot);
+        } 
+        ZSTD_opt_getNextMatchAndUpdateSeqStore(optLdm, currPosInBlock, remainingBytes);
+    }
+    ZSTD_optLdm_maybeAddMatch(matches, nbMatches, optLdm, currPosInBlock);
+}
+
+/*-*******************************
+*  Optimal parser
+*********************************/
+
+
+static U32 ZSTD_totalLen(ZSTD_optimal_t sol)
+{
+    return sol.litlen + sol.mlen;
+}
+
+#if 0 /* debug */
+
+static void
+listStats(const U32* table, int lastEltID)
+{
+    int const nbElts = lastEltID + 1;
+    int enb;
+    for (enb=0; enb < nbElts; enb++) {
+        (void)table;
+        /* RAWLOG(2, "%3i:%3i,  ", enb, table[enb]); */
+        RAWLOG(2, "%4i,", table[enb]);
+    }
+    RAWLOG(2, " \n");
+}
+
+#endif
+
+FORCE_INLINE_TEMPLATE size_t
+ZSTD_compressBlock_opt_generic(ZSTD_matchState_t* ms,
+                               seqStore_t* seqStore,
+                               U32 rep[ZSTD_REP_NUM],
+                         const void* src, size_t srcSize,
+                         const int optLevel,
+                         const ZSTD_dictMode_e dictMode)
+{
+    optState_t* const optStatePtr = &ms->opt;
+    const BYTE* const istart = (const BYTE*)src;
+    const BYTE* ip = istart;
+    const BYTE* anchor = istart;
+    const BYTE* const iend = istart + srcSize;
+    const BYTE* const ilimit = iend - 8;
+    const BYTE* const base = ms->window.base;
+    const BYTE* const prefixStart = base + ms->window.dictLimit;
+    const ZSTD_compressionParameters* const cParams = &ms->cParams;
+
+    U32 const sufficient_len = MIN(cParams->targetLength, ZSTD_OPT_NUM -1);
+    U32 const minMatch = (cParams->minMatch == 3) ? 3 : 4;
+    U32 nextToUpdate3 = ms->nextToUpdate;
+
+    ZSTD_optimal_t* const opt = optStatePtr->priceTable;
+    ZSTD_match_t* const matches = optStatePtr->matchTable;
+    ZSTD_optimal_t lastSequence;
+    ZSTD_optLdm_t optLdm;
+
+    optLdm.seqStore = ms->ldmSeqStore ? *ms->ldmSeqStore : kNullRawSeqStore;
+    optLdm.endPosInBlock = optLdm.startPosInBlock = optLdm.offset = 0;
+    ZSTD_opt_getNextMatchAndUpdateSeqStore(&optLdm, (U32)(ip-istart), (U32)(iend-ip));
+
+    /* init */
+    DEBUGLOG(5, "ZSTD_compressBlock_opt_generic: current=%u, prefix=%u, nextToUpdate=%u",
+                (U32)(ip - base), ms->window.dictLimit, ms->nextToUpdate);
+    assert(optLevel <= 2);
+    ZSTD_rescaleFreqs(optStatePtr, (const BYTE*)src, srcSize, optLevel);
+    ip += (ip==prefixStart);
+
+    /* Match Loop */
+    while (ip < ilimit) {
+        U32 cur, last_pos = 0;
+
+        /* find first match */
+        {   U32 const litlen = (U32)(ip - anchor);
+            U32 const ll0 = !litlen;
+            U32 nbMatches = ZSTD_BtGetAllMatches(matches, ms, &nextToUpdate3, ip, iend, dictMode, rep, ll0, minMatch);
+            ZSTD_optLdm_processMatchCandidate(&optLdm, matches, &nbMatches,
+                                              (U32)(ip-istart), (U32)(iend - ip));
+            if (!nbMatches) { ip++; continue; }
+
+            /* initialize opt[0] */
+            { U32 i ; for (i=0; i<ZSTD_REP_NUM; i++) opt[0].rep[i] = rep[i]; }
+            opt[0].mlen = 0;  /* means is_a_literal */
+            opt[0].litlen = litlen;
+            /* We don't need to include the actual price of the literals because
+             * it is static for the duration of the forward pass, and is included
+             * in every price. We include the literal length to avoid negative
+             * prices when we subtract the previous literal length.
+             */
+            opt[0].price = ZSTD_litLengthPrice(litlen, optStatePtr, optLevel);
+
+            /* large match -> immediate encoding */
+            {   U32 const maxML = matches[nbMatches-1].len;
+                U32 const maxOffset = matches[nbMatches-1].off;
+                DEBUGLOG(6, "found %u matches of maxLength=%u and maxOffCode=%u at cPos=%u => start new series",
+                            nbMatches, maxML, maxOffset, (U32)(ip-prefixStart));
+
+                if (maxML > sufficient_len) {
+                    lastSequence.litlen = litlen;
+                    lastSequence.mlen = maxML;
+                    lastSequence.off = maxOffset;
+                    DEBUGLOG(6, "large match (%u>%u), immediate encoding",
+                                maxML, sufficient_len);
+                    cur = 0;
+                    last_pos = ZSTD_totalLen(lastSequence);
+                    goto _shortestPath;
+            }   }
+
+            /* set prices for first matches starting position == 0 */
+            {   U32 const literalsPrice = opt[0].price + ZSTD_litLengthPrice(0, optStatePtr, optLevel);
+                U32 pos;
+                U32 matchNb;
+                for (pos = 1; pos < minMatch; pos++) {
+                    opt[pos].price = ZSTD_MAX_PRICE;   /* mlen, litlen and price will be fixed during forward scanning */
+                }
+                for (matchNb = 0; matchNb < nbMatches; matchNb++) {
+                    U32 const offset = matches[matchNb].off;
+                    U32 const end = matches[matchNb].len;
+                    for ( ; pos <= end ; pos++ ) {
+                        U32 const matchPrice = ZSTD_getMatchPrice(offset, pos, optStatePtr, optLevel);
+                        U32 const sequencePrice = literalsPrice + matchPrice;
+                        DEBUGLOG(7, "rPos:%u => set initial price : %.2f",
+                                    pos, ZSTD_fCost(sequencePrice));
+                        opt[pos].mlen = pos;
+                        opt[pos].off = offset;
+                        opt[pos].litlen = litlen;
+                        opt[pos].price = sequencePrice;
+                }   }
+                last_pos = pos-1;
+            }
+        }
+
+        /* check further positions */
+        for (cur = 1; cur <= last_pos; cur++) {
+            const BYTE* const inr = ip + cur;
+            assert(cur < ZSTD_OPT_NUM);
+            DEBUGLOG(7, "cPos:%zi==rPos:%u", inr-istart, cur)
+
+            /* Fix current position with one literal if cheaper */
+            {   U32 const litlen = (opt[cur-1].mlen == 0) ? opt[cur-1].litlen + 1 : 1;
+                int const price = opt[cur-1].price
+                                + ZSTD_rawLiteralsCost(ip+cur-1, 1, optStatePtr, optLevel)
+                                + ZSTD_litLengthPrice(litlen, optStatePtr, optLevel)
+                                - ZSTD_litLengthPrice(litlen-1, optStatePtr, optLevel);
+                assert(price < 1000000000); /* overflow check */
+                if (price <= opt[cur].price) {
+                    DEBUGLOG(7, "cPos:%zi==rPos:%u : better price (%.2f<=%.2f) using literal (ll==%u) (hist:%u,%u,%u)",
+                                inr-istart, cur, ZSTD_fCost(price), ZSTD_fCost(opt[cur].price), litlen,
+                                opt[cur-1].rep[0], opt[cur-1].rep[1], opt[cur-1].rep[2]);
+                    opt[cur].mlen = 0;
+                    opt[cur].off = 0;
+                    opt[cur].litlen = litlen;
+                    opt[cur].price = price;
+                } else {
+                    DEBUGLOG(7, "cPos:%zi==rPos:%u : literal would cost more (%.2f>%.2f) (hist:%u,%u,%u)",
+                                inr-istart, cur, ZSTD_fCost(price), ZSTD_fCost(opt[cur].price),
+                                opt[cur].rep[0], opt[cur].rep[1], opt[cur].rep[2]);
+                }
+            }
+
+            /* Set the repcodes of the current position. We must do it here
+             * because we rely on the repcodes of the 2nd to last sequence being
+             * correct to set the next chunks repcodes during the backward
+             * traversal.
+             */
+            ZSTD_STATIC_ASSERT(sizeof(opt[cur].rep) == sizeof(repcodes_t));
+            assert(cur >= opt[cur].mlen);
+            if (opt[cur].mlen != 0) {
+                U32 const prev = cur - opt[cur].mlen;
+                repcodes_t newReps = ZSTD_updateRep(opt[prev].rep, opt[cur].off, opt[cur].litlen==0);
+                ZSTD_memcpy(opt[cur].rep, &newReps, sizeof(repcodes_t));
+            } else {
+                ZSTD_memcpy(opt[cur].rep, opt[cur - 1].rep, sizeof(repcodes_t));
+            }
+
+            /* last match must start at a minimum distance of 8 from oend */
+            if (inr > ilimit) continue;
+
+            if (cur == last_pos) break;
+
+            if ( (optLevel==0) /*static_test*/
+              && (opt[cur+1].price <= opt[cur].price + (BITCOST_MULTIPLIER/2)) ) {
+                DEBUGLOG(7, "move to next rPos:%u : price is <=", cur+1);
+                continue;  /* skip unpromising positions; about ~+6% speed, -0.01 ratio */
+            }
+
+            {   U32 const ll0 = (opt[cur].mlen != 0);
+                U32 const litlen = (opt[cur].mlen == 0) ? opt[cur].litlen : 0;
+                U32 const previousPrice = opt[cur].price;
+                U32 const basePrice = previousPrice + ZSTD_litLengthPrice(0, optStatePtr, optLevel);
+                U32 nbMatches = ZSTD_BtGetAllMatches(matches, ms, &nextToUpdate3, inr, iend, dictMode, opt[cur].rep, ll0, minMatch);
+                U32 matchNb;
+
+                ZSTD_optLdm_processMatchCandidate(&optLdm, matches, &nbMatches,
+                                                  (U32)(inr-istart), (U32)(iend-inr));
+
+                if (!nbMatches) {
+                    DEBUGLOG(7, "rPos:%u : no match found", cur);
+                    continue;
+                }
+
+                {   U32 const maxML = matches[nbMatches-1].len;
+                    DEBUGLOG(7, "cPos:%zi==rPos:%u, found %u matches, of maxLength=%u",
+                                inr-istart, cur, nbMatches, maxML);
+
+                    if ( (maxML > sufficient_len)
+                      || (cur + maxML >= ZSTD_OPT_NUM) ) {
+                        lastSequence.mlen = maxML;
+                        lastSequence.off = matches[nbMatches-1].off;
+                        lastSequence.litlen = litlen;
+                        cur -= (opt[cur].mlen==0) ? opt[cur].litlen : 0;  /* last sequence is actually only literals, fix cur to last match - note : may underflow, in which case, it's first sequence, and it's okay */
+                        last_pos = cur + ZSTD_totalLen(lastSequence);
+                        if (cur > ZSTD_OPT_NUM) cur = 0;   /* underflow => first match */
+                        goto _shortestPath;
+                }   }
+
+                /* set prices using matches found at position == cur */
+                for (matchNb = 0; matchNb < nbMatches; matchNb++) {
+                    U32 const offset = matches[matchNb].off;
+                    U32 const lastML = matches[matchNb].len;
+                    U32 const startML = (matchNb>0) ? matches[matchNb-1].len+1 : minMatch;
+                    U32 mlen;
+
+                    DEBUGLOG(7, "testing match %u => offCode=%4u, mlen=%2u, llen=%2u",
+                                matchNb, matches[matchNb].off, lastML, litlen);
+
+                    for (mlen = lastML; mlen >= startML; mlen--) {  /* scan downward */
+                        U32 const pos = cur + mlen;
+                        int const price = basePrice + ZSTD_getMatchPrice(offset, mlen, optStatePtr, optLevel);
+
+                        if ((pos > last_pos) || (price < opt[pos].price)) {
+                            DEBUGLOG(7, "rPos:%u (ml=%2u) => new better price (%.2f<%.2f)",
+                                        pos, mlen, ZSTD_fCost(price), ZSTD_fCost(opt[pos].price));
+                            while (last_pos < pos) { opt[last_pos+1].price = ZSTD_MAX_PRICE; last_pos++; }   /* fill empty positions */
+                            opt[pos].mlen = mlen;
+                            opt[pos].off = offset;
+                            opt[pos].litlen = litlen;
+                            opt[pos].price = price;
+                        } else {
+                            DEBUGLOG(7, "rPos:%u (ml=%2u) => new price is worse (%.2f>=%.2f)",
+                                        pos, mlen, ZSTD_fCost(price), ZSTD_fCost(opt[pos].price));
+                            if (optLevel==0) break;  /* early update abort; gets ~+10% speed for about -0.01 ratio loss */
+                        }
+            }   }   }
+        }  /* for (cur = 1; cur <= last_pos; cur++) */
+
+        lastSequence = opt[last_pos];
+        cur = last_pos > ZSTD_totalLen(lastSequence) ? last_pos - ZSTD_totalLen(lastSequence) : 0;  /* single sequence, and it starts before `ip` */
+        assert(cur < ZSTD_OPT_NUM);  /* control overflow*/
+
+_shortestPath:   /* cur, last_pos, best_mlen, best_off have to be set */
+        assert(opt[0].mlen == 0);
+
+        /* Set the next chunk's repcodes based on the repcodes of the beginning
+         * of the last match, and the last sequence. This avoids us having to
+         * update them while traversing the sequences.
+         */
+        if (lastSequence.mlen != 0) {
+            repcodes_t reps = ZSTD_updateRep(opt[cur].rep, lastSequence.off, lastSequence.litlen==0);
+            ZSTD_memcpy(rep, &reps, sizeof(reps));
+        } else {
+            ZSTD_memcpy(rep, opt[cur].rep, sizeof(repcodes_t));
+        }
+
+        {   U32 const storeEnd = cur + 1;
+            U32 storeStart = storeEnd;
+            U32 seqPos = cur;
+
+            DEBUGLOG(6, "start reverse traversal (last_pos:%u, cur:%u)",
+                        last_pos, cur); (void)last_pos;
+            assert(storeEnd < ZSTD_OPT_NUM);
+            DEBUGLOG(6, "last sequence copied into pos=%u (llen=%u,mlen=%u,ofc=%u)",
+                        storeEnd, lastSequence.litlen, lastSequence.mlen, lastSequence.off);
+            opt[storeEnd] = lastSequence;
+            while (seqPos > 0) {
+                U32 const backDist = ZSTD_totalLen(opt[seqPos]);
+                storeStart--;
+                DEBUGLOG(6, "sequence from rPos=%u copied into pos=%u (llen=%u,mlen=%u,ofc=%u)",
+                            seqPos, storeStart, opt[seqPos].litlen, opt[seqPos].mlen, opt[seqPos].off);
+                opt[storeStart] = opt[seqPos];
+                seqPos = (seqPos > backDist) ? seqPos - backDist : 0;
+            }
+
+            /* save sequences */
+            DEBUGLOG(6, "sending selected sequences into seqStore")
+            {   U32 storePos;
+                for (storePos=storeStart; storePos <= storeEnd; storePos++) {
+                    U32 const llen = opt[storePos].litlen;
+                    U32 const mlen = opt[storePos].mlen;
+                    U32 const offCode = opt[storePos].off;
+                    U32 const advance = llen + mlen;
+                    DEBUGLOG(6, "considering seq starting at %zi, llen=%u, mlen=%u",
+                                anchor - istart, (unsigned)llen, (unsigned)mlen);
+
+                    if (mlen==0) {  /* only literals => must be last "sequence", actually starting a new stream of sequences */
+                        assert(storePos == storeEnd);   /* must be last sequence */
+                        ip = anchor + llen;     /* last "sequence" is a bunch of literals => don't progress anchor */
+                        continue;   /* will finish */
+                    }
+
+                    assert(anchor + llen <= iend);
+                    ZSTD_updateStats(optStatePtr, llen, anchor, offCode, mlen);
+                    ZSTD_storeSeq(seqStore, llen, anchor, iend, offCode, mlen-MINMATCH);
+                    anchor += advance;
+                    ip = anchor;
+            }   }
+            ZSTD_setBasePrices(optStatePtr, optLevel);
+        }
+    }   /* while (ip < ilimit) */
+
+    /* Return the last literals size */
+    return (size_t)(iend - anchor);
+}
+
+
+size_t ZSTD_compressBlock_btopt(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        const void* src, size_t srcSize)
+{
+    DEBUGLOG(5, "ZSTD_compressBlock_btopt");
+    return ZSTD_compressBlock_opt_generic(ms, seqStore, rep, src, srcSize, 0 /*optLevel*/, ZSTD_noDict);
+}
+
+
+/* used in 2-pass strategy */
+static U32 ZSTD_upscaleStat(unsigned* table, U32 lastEltIndex, int bonus)
+{
+    U32 s, sum=0;
+    assert(ZSTD_FREQ_DIV+bonus >= 0);
+    for (s=0; s<lastEltIndex+1; s++) {
+        table[s] <<= ZSTD_FREQ_DIV+bonus;
+        table[s]--;
+        sum += table[s];
+    }
+    return sum;
+}
+
+/* used in 2-pass strategy */
+MEM_STATIC void ZSTD_upscaleStats(optState_t* optPtr)
+{
+    if (ZSTD_compressedLiterals(optPtr))
+        optPtr->litSum = ZSTD_upscaleStat(optPtr->litFreq, MaxLit, 0);
+    optPtr->litLengthSum = ZSTD_upscaleStat(optPtr->litLengthFreq, MaxLL, 0);
+    optPtr->matchLengthSum = ZSTD_upscaleStat(optPtr->matchLengthFreq, MaxML, 0);
+    optPtr->offCodeSum = ZSTD_upscaleStat(optPtr->offCodeFreq, MaxOff, 0);
+}
+
+/* ZSTD_initStats_ultra():
+ * make a first compression pass, just to seed stats with more accurate starting values.
+ * only works on first block, with no dictionary and no ldm.
+ * this function cannot error, hence its contract must be respected.
+ */
+static void
+ZSTD_initStats_ultra(ZSTD_matchState_t* ms,
+                     seqStore_t* seqStore,
+                     U32 rep[ZSTD_REP_NUM],
+               const void* src, size_t srcSize)
+{
+    U32 tmpRep[ZSTD_REP_NUM];  /* updated rep codes will sink here */
+    ZSTD_memcpy(tmpRep, rep, sizeof(tmpRep));
+
+    DEBUGLOG(4, "ZSTD_initStats_ultra (srcSize=%zu)", srcSize);
+    assert(ms->opt.litLengthSum == 0);    /* first block */
+    assert(seqStore->sequences == seqStore->sequencesStart);   /* no ldm */
+    assert(ms->window.dictLimit == ms->window.lowLimit);   /* no dictionary */
+    assert(ms->window.dictLimit - ms->nextToUpdate <= 1);  /* no prefix (note: intentional overflow, defined as 2-complement) */
+
+    ZSTD_compressBlock_opt_generic(ms, seqStore, tmpRep, src, srcSize, 2 /*optLevel*/, ZSTD_noDict);   /* generate stats into ms->opt*/
+
+    /* invalidate first scan from history */
+    ZSTD_resetSeqStore(seqStore);
+    ms->window.base -= srcSize;
+    ms->window.dictLimit += (U32)srcSize;
+    ms->window.lowLimit = ms->window.dictLimit;
+    ms->nextToUpdate = ms->window.dictLimit;
+
+    /* re-inforce weight of collected statistics */
+    ZSTD_upscaleStats(&ms->opt);
+}
+
+size_t ZSTD_compressBlock_btultra(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        const void* src, size_t srcSize)
+{
+    DEBUGLOG(5, "ZSTD_compressBlock_btultra (srcSize=%zu)", srcSize);
+    return ZSTD_compressBlock_opt_generic(ms, seqStore, rep, src, srcSize, 2 /*optLevel*/, ZSTD_noDict);
+}
+
+size_t ZSTD_compressBlock_btultra2(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        const void* src, size_t srcSize)
+{
+    U32 const curr = (U32)((const BYTE*)src - ms->window.base);
+    DEBUGLOG(5, "ZSTD_compressBlock_btultra2 (srcSize=%zu)", srcSize);
+
+    /* 2-pass strategy:
+     * this strategy makes a first pass over first block to collect statistics
+     * and seed next round's statistics with it.
+     * After 1st pass, function forgets everything, and starts a new block.
+     * Consequently, this can only work if no data has been previously loaded in tables,
+     * aka, no dictionary, no prefix, no ldm preprocessing.
+     * The compression ratio gain is generally small (~0.5% on first block),
+     * the cost is 2x cpu time on first block. */
+    assert(srcSize <= ZSTD_BLOCKSIZE_MAX);
+    if ( (ms->opt.litLengthSum==0)   /* first block */
+      && (seqStore->sequences == seqStore->sequencesStart)  /* no ldm */
+      && (ms->window.dictLimit == ms->window.lowLimit)   /* no dictionary */
+      && (curr == ms->window.dictLimit)   /* start of frame, nothing already loaded nor skipped */
+      && (srcSize > ZSTD_PREDEF_THRESHOLD)
+      ) {
+        ZSTD_initStats_ultra(ms, seqStore, rep, src, srcSize);
+    }
+
+    return ZSTD_compressBlock_opt_generic(ms, seqStore, rep, src, srcSize, 2 /*optLevel*/, ZSTD_noDict);
+}
+
+size_t ZSTD_compressBlock_btopt_dictMatchState(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        const void* src, size_t srcSize)
+{
+    return ZSTD_compressBlock_opt_generic(ms, seqStore, rep, src, srcSize, 0 /*optLevel*/, ZSTD_dictMatchState);
+}
+
+size_t ZSTD_compressBlock_btultra_dictMatchState(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        const void* src, size_t srcSize)
+{
+    return ZSTD_compressBlock_opt_generic(ms, seqStore, rep, src, srcSize, 2 /*optLevel*/, ZSTD_dictMatchState);
+}
+
+size_t ZSTD_compressBlock_btopt_extDict(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        const void* src, size_t srcSize)
+{
+    return ZSTD_compressBlock_opt_generic(ms, seqStore, rep, src, srcSize, 0 /*optLevel*/, ZSTD_extDict);
+}
+
+size_t ZSTD_compressBlock_btultra_extDict(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        const void* src, size_t srcSize)
+{
+    return ZSTD_compressBlock_opt_generic(ms, seqStore, rep, src, srcSize, 2 /*optLevel*/, ZSTD_extDict);
+}
+
+/* note : no btultra2 variant for extDict nor dictMatchState,
+ * because btultra2 is not meant to work with dictionaries
+ * and is only specific for the first block (no prefix) */
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_opt.h mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_opt.h
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/compress/zstd_opt.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/compress/zstd_opt.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+#ifndef ZSTD_OPT_H
+#define ZSTD_OPT_H
+
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
+#include "zstd_compress_internal.h"
+
+/* used in ZSTD_loadDictionaryContent() */
+void ZSTD_updateTree(ZSTD_matchState_t* ms, const BYTE* ip, const BYTE* iend);
+
+size_t ZSTD_compressBlock_btopt(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+size_t ZSTD_compressBlock_btultra(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+size_t ZSTD_compressBlock_btultra2(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+
+
+size_t ZSTD_compressBlock_btopt_dictMatchState(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+size_t ZSTD_compressBlock_btultra_dictMatchState(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+
+size_t ZSTD_compressBlock_btopt_extDict(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+size_t ZSTD_compressBlock_btultra_extDict(
+        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+        void const* src, size_t srcSize);
+
+        /* note : no btultra2 variant for extDict nor dictMatchState,
+         * because btultra2 is not meant to work with dictionaries
+         * and is only specific for the first block (no prefix) */
+
+#if defined (__cplusplus)
+}
+#endif
+
+#endif /* ZSTD_OPT_H */
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/decompress/huf_decompress.c mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/decompress/huf_decompress.c
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/decompress/huf_decompress.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/decompress/huf_decompress.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,1351 @@
+/* ******************************************************************
+ * huff0 huffman decoder,
+ * part of Finite State Entropy library
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ *
+ *  You can contact the author at :
+ *  - FSE+HUF source repository : https://github.com/Cyan4973/FiniteStateEntropy
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+****************************************************************** */
+
+/* **************************************************************
+*  Dependencies
+****************************************************************/
+#include "../common/zstd_deps.h"  /* ZSTD_memcpy, ZSTD_memset */
+#include "../common/compiler.h"
+#include "../common/bitstream.h"  /* BIT_* */
+#include "../common/fse.h"        /* to compress headers */
+#define HUF_STATIC_LINKING_ONLY
+#include "../common/huf.h"
+#include "../common/error_private.h"
+
+/* **************************************************************
+*  Macros
+****************************************************************/
+
+/* These two optional macros force the use one way or another of the two
+ * Huffman decompression implementations. You can't force in both directions
+ * at the same time.
+ */
+#if defined(HUF_FORCE_DECOMPRESS_X1) && \
+    defined(HUF_FORCE_DECOMPRESS_X2)
+#error "Cannot force the use of the X1 and X2 decoders at the same time!"
+#endif
+
+
+/* **************************************************************
+*  Error Management
+****************************************************************/
+#define HUF_isError ERR_isError
+
+
+/* **************************************************************
+*  Byte alignment for workSpace management
+****************************************************************/
+#define HUF_ALIGN(x, a)         HUF_ALIGN_MASK((x), (a) - 1)
+#define HUF_ALIGN_MASK(x, mask) (((x) + (mask)) & ~(mask))
+
+
+/* **************************************************************
+*  BMI2 Variant Wrappers
+****************************************************************/
+#if DYNAMIC_BMI2
+
+#define HUF_DGEN(fn)                                                        \
+                                                                            \
+    static size_t fn##_default(                                             \
+                  void* dst,  size_t dstSize,                               \
+            const void* cSrc, size_t cSrcSize,                              \
+            const HUF_DTable* DTable)                                       \
+    {                                                                       \
+        return fn##_body(dst, dstSize, cSrc, cSrcSize, DTable);             \
+    }                                                                       \
+                                                                            \
+    static TARGET_ATTRIBUTE("bmi2") size_t fn##_bmi2(                       \
+                  void* dst,  size_t dstSize,                               \
+            const void* cSrc, size_t cSrcSize,                              \
+            const HUF_DTable* DTable)                                       \
+    {                                                                       \
+        return fn##_body(dst, dstSize, cSrc, cSrcSize, DTable);             \
+    }                                                                       \
+                                                                            \
+    static size_t fn(void* dst, size_t dstSize, void const* cSrc,           \
+                     size_t cSrcSize, HUF_DTable const* DTable, int bmi2)   \
+    {                                                                       \
+        if (bmi2) {                                                         \
+            return fn##_bmi2(dst, dstSize, cSrc, cSrcSize, DTable);         \
+        }                                                                   \
+        return fn##_default(dst, dstSize, cSrc, cSrcSize, DTable);          \
+    }
+
+#else
+
+#define HUF_DGEN(fn)                                                        \
+    static size_t fn(void* dst, size_t dstSize, void const* cSrc,           \
+                     size_t cSrcSize, HUF_DTable const* DTable, int bmi2)   \
+    {                                                                       \
+        (void)bmi2;                                                         \
+        return fn##_body(dst, dstSize, cSrc, cSrcSize, DTable);             \
+    }
+
+#endif
+
+
+/*-***************************/
+/*  generic DTableDesc       */
+/*-***************************/
+typedef struct { BYTE maxTableLog; BYTE tableType; BYTE tableLog; BYTE reserved; } DTableDesc;
+
+static DTableDesc HUF_getDTableDesc(const HUF_DTable* table)
+{
+    DTableDesc dtd;
+    ZSTD_memcpy(&dtd, table, sizeof(dtd));
+    return dtd;
+}
+
+
+#ifndef HUF_FORCE_DECOMPRESS_X2
+
+/*-***************************/
+/*  single-symbol decoding   */
+/*-***************************/
+typedef struct { BYTE byte; BYTE nbBits; } HUF_DEltX1;   /* single-symbol decoding */
+
+/**
+ * Packs 4 HUF_DEltX1 structs into a U64. This is used to lay down 4 entries at
+ * a time.
+ */
+static U64 HUF_DEltX1_set4(BYTE symbol, BYTE nbBits) {
+    U64 D4;
+    if (MEM_isLittleEndian()) {
+        D4 = symbol + (nbBits << 8);
+    } else {
+        D4 = (symbol << 8) + nbBits;
+    }
+    D4 *= 0x0001000100010001ULL;
+    return D4;
+}
+
+typedef struct {
+        U32 rankVal[HUF_TABLELOG_ABSOLUTEMAX + 1];
+        U32 rankStart[HUF_TABLELOG_ABSOLUTEMAX + 1];
+        U32 statsWksp[HUF_READ_STATS_WORKSPACE_SIZE_U32];
+        BYTE symbols[HUF_SYMBOLVALUE_MAX + 1];
+        BYTE huffWeight[HUF_SYMBOLVALUE_MAX + 1];
+} HUF_ReadDTableX1_Workspace;
+
+
+size_t HUF_readDTableX1_wksp(HUF_DTable* DTable, const void* src, size_t srcSize, void* workSpace, size_t wkspSize)
+{
+    return HUF_readDTableX1_wksp_bmi2(DTable, src, srcSize, workSpace, wkspSize, /* bmi2 */ 0);
+}
+
+size_t HUF_readDTableX1_wksp_bmi2(HUF_DTable* DTable, const void* src, size_t srcSize, void* workSpace, size_t wkspSize, int bmi2)
+{
+    U32 tableLog = 0;
+    U32 nbSymbols = 0;
+    size_t iSize;
+    void* const dtPtr = DTable + 1;
+    HUF_DEltX1* const dt = (HUF_DEltX1*)dtPtr;
+    HUF_ReadDTableX1_Workspace* wksp = (HUF_ReadDTableX1_Workspace*)workSpace;
+
+    DEBUG_STATIC_ASSERT(HUF_DECOMPRESS_WORKSPACE_SIZE >= sizeof(*wksp));
+    if (sizeof(*wksp) > wkspSize) return ERROR(tableLog_tooLarge);
+
+    DEBUG_STATIC_ASSERT(sizeof(DTableDesc) == sizeof(HUF_DTable));
+    /* ZSTD_memset(huffWeight, 0, sizeof(huffWeight)); */   /* is not necessary, even though some analyzer complain ... */
+
+    iSize = HUF_readStats_wksp(wksp->huffWeight, HUF_SYMBOLVALUE_MAX + 1, wksp->rankVal, &nbSymbols, &tableLog, src, srcSize, wksp->statsWksp, sizeof(wksp->statsWksp), bmi2);
+    if (HUF_isError(iSize)) return iSize;
+
+    /* Table header */
+    {   DTableDesc dtd = HUF_getDTableDesc(DTable);
+        if (tableLog > (U32)(dtd.maxTableLog+1)) return ERROR(tableLog_tooLarge);   /* DTable too small, Huffman tree cannot fit in */
+        dtd.tableType = 0;
+        dtd.tableLog = (BYTE)tableLog;
+        ZSTD_memcpy(DTable, &dtd, sizeof(dtd));
+    }
+
+    /* Compute symbols and rankStart given rankVal:
+     *
+     * rankVal already contains the number of values of each weight.
+     *
+     * symbols contains the symbols ordered by weight. First are the rankVal[0]
+     * weight 0 symbols, followed by the rankVal[1] weight 1 symbols, and so on.
+     * symbols[0] is filled (but unused) to avoid a branch.
+     *
+     * rankStart contains the offset where each rank belongs in the DTable.
+     * rankStart[0] is not filled because there are no entries in the table for
+     * weight 0.
+     */
+    {
+        int n;
+        int nextRankStart = 0;
+        int const unroll = 4;
+        int const nLimit = (int)nbSymbols - unroll + 1;
+        for (n=0; n<(int)tableLog+1; n++) {
+            U32 const curr = nextRankStart;
+            nextRankStart += wksp->rankVal[n];
+            wksp->rankStart[n] = curr;
+        }
+        for (n=0; n < nLimit; n += unroll) {
+            int u;
+            for (u=0; u < unroll; ++u) {
+                size_t const w = wksp->huffWeight[n+u];
+                wksp->symbols[wksp->rankStart[w]++] = (BYTE)(n+u);
+            }
+        }
+        for (; n < (int)nbSymbols; ++n) {
+            size_t const w = wksp->huffWeight[n];
+            wksp->symbols[wksp->rankStart[w]++] = (BYTE)n;
+        }
+    }
+
+    /* fill DTable
+     * We fill all entries of each weight in order.
+     * That way length is a constant for each iteration of the outter loop.
+     * We can switch based on the length to a different inner loop which is
+     * optimized for that particular case.
+     */
+    {
+        U32 w;
+        int symbol=wksp->rankVal[0];
+        int rankStart=0;
+        for (w=1; w<tableLog+1; ++w) {
+            int const symbolCount = wksp->rankVal[w];
+            int const length = (1 << w) >> 1;
+            int uStart = rankStart;
+            BYTE const nbBits = (BYTE)(tableLog + 1 - w);
+            int s;
+            int u;
+            switch (length) {
+            case 1:
+                for (s=0; s<symbolCount; ++s) {
+                    HUF_DEltX1 D;
+                    D.byte = wksp->symbols[symbol + s];
+                    D.nbBits = nbBits;
+                    dt[uStart] = D;
+                    uStart += 1;
+                }
+                break;
+            case 2:
+                for (s=0; s<symbolCount; ++s) {
+                    HUF_DEltX1 D;
+                    D.byte = wksp->symbols[symbol + s];
+                    D.nbBits = nbBits;
+                    dt[uStart+0] = D;
+                    dt[uStart+1] = D;
+                    uStart += 2;
+                }
+                break;
+            case 4:
+                for (s=0; s<symbolCount; ++s) {
+                    U64 const D4 = HUF_DEltX1_set4(wksp->symbols[symbol + s], nbBits);
+                    MEM_write64(dt + uStart, D4);
+                    uStart += 4;
+                }
+                break;
+            case 8:
+                for (s=0; s<symbolCount; ++s) {
+                    U64 const D4 = HUF_DEltX1_set4(wksp->symbols[symbol + s], nbBits);
+                    MEM_write64(dt + uStart, D4);
+                    MEM_write64(dt + uStart + 4, D4);
+                    uStart += 8;
+                }
+                break;
+            default:
+                for (s=0; s<symbolCount; ++s) {
+                    U64 const D4 = HUF_DEltX1_set4(wksp->symbols[symbol + s], nbBits);
+                    for (u=0; u < length; u += 16) {
+                        MEM_write64(dt + uStart + u + 0, D4);
+                        MEM_write64(dt + uStart + u + 4, D4);
+                        MEM_write64(dt + uStart + u + 8, D4);
+                        MEM_write64(dt + uStart + u + 12, D4);
+                    }
+                    assert(u == length);
+                    uStart += length;
+                }
+                break;
+            }
+            symbol += symbolCount;
+            rankStart += symbolCount * length;
+        }
+    }
+    return iSize;
+}
+
+FORCE_INLINE_TEMPLATE BYTE
+HUF_decodeSymbolX1(BIT_DStream_t* Dstream, const HUF_DEltX1* dt, const U32 dtLog)
+{
+    size_t const val = BIT_lookBitsFast(Dstream, dtLog); /* note : dtLog >= 1 */
+    BYTE const c = dt[val].byte;
+    BIT_skipBits(Dstream, dt[val].nbBits);
+    return c;
+}
+
+#define HUF_DECODE_SYMBOLX1_0(ptr, DStreamPtr) \
+    *ptr++ = HUF_decodeSymbolX1(DStreamPtr, dt, dtLog)
+
+#define HUF_DECODE_SYMBOLX1_1(ptr, DStreamPtr)  \
+    if (MEM_64bits() || (HUF_TABLELOG_MAX<=12)) \
+        HUF_DECODE_SYMBOLX1_0(ptr, DStreamPtr)
+
+#define HUF_DECODE_SYMBOLX1_2(ptr, DStreamPtr) \
+    if (MEM_64bits()) \
+        HUF_DECODE_SYMBOLX1_0(ptr, DStreamPtr)
+
+HINT_INLINE size_t
+HUF_decodeStreamX1(BYTE* p, BIT_DStream_t* const bitDPtr, BYTE* const pEnd, const HUF_DEltX1* const dt, const U32 dtLog)
+{
+    BYTE* const pStart = p;
+
+    /* up to 4 symbols at a time */
+    while ((BIT_reloadDStream(bitDPtr) == BIT_DStream_unfinished) & (p < pEnd-3)) {
+        HUF_DECODE_SYMBOLX1_2(p, bitDPtr);
+        HUF_DECODE_SYMBOLX1_1(p, bitDPtr);
+        HUF_DECODE_SYMBOLX1_2(p, bitDPtr);
+        HUF_DECODE_SYMBOLX1_0(p, bitDPtr);
+    }
+
+    /* [0-3] symbols remaining */
+    if (MEM_32bits())
+        while ((BIT_reloadDStream(bitDPtr) == BIT_DStream_unfinished) & (p < pEnd))
+            HUF_DECODE_SYMBOLX1_0(p, bitDPtr);
+
+    /* no more data to retrieve from bitstream, no need to reload */
+    while (p < pEnd)
+        HUF_DECODE_SYMBOLX1_0(p, bitDPtr);
+
+    return pEnd-pStart;
+}
+
+FORCE_INLINE_TEMPLATE size_t
+HUF_decompress1X1_usingDTable_internal_body(
+          void* dst,  size_t dstSize,
+    const void* cSrc, size_t cSrcSize,
+    const HUF_DTable* DTable)
+{
+    BYTE* op = (BYTE*)dst;
+    BYTE* const oend = op + dstSize;
+    const void* dtPtr = DTable + 1;
+    const HUF_DEltX1* const dt = (const HUF_DEltX1*)dtPtr;
+    BIT_DStream_t bitD;
+    DTableDesc const dtd = HUF_getDTableDesc(DTable);
+    U32 const dtLog = dtd.tableLog;
+
+    CHECK_F( BIT_initDStream(&bitD, cSrc, cSrcSize) );
+
+    HUF_decodeStreamX1(op, &bitD, oend, dt, dtLog);
+
+    if (!BIT_endOfDStream(&bitD)) return ERROR(corruption_detected);
+
+    return dstSize;
+}
+
+FORCE_INLINE_TEMPLATE size_t
+HUF_decompress4X1_usingDTable_internal_body(
+          void* dst,  size_t dstSize,
+    const void* cSrc, size_t cSrcSize,
+    const HUF_DTable* DTable)
+{
+    /* Check */
+    if (cSrcSize < 10) return ERROR(corruption_detected);  /* strict minimum : jump table + 1 byte per stream */
+
+    {   const BYTE* const istart = (const BYTE*) cSrc;
+        BYTE* const ostart = (BYTE*) dst;
+        BYTE* const oend = ostart + dstSize;
+        BYTE* const olimit = oend - 3;
+        const void* const dtPtr = DTable + 1;
+        const HUF_DEltX1* const dt = (const HUF_DEltX1*)dtPtr;
+
+        /* Init */
+        BIT_DStream_t bitD1;
+        BIT_DStream_t bitD2;
+        BIT_DStream_t bitD3;
+        BIT_DStream_t bitD4;
+        size_t const length1 = MEM_readLE16(istart);
+        size_t const length2 = MEM_readLE16(istart+2);
+        size_t const length3 = MEM_readLE16(istart+4);
+        size_t const length4 = cSrcSize - (length1 + length2 + length3 + 6);
+        const BYTE* const istart1 = istart + 6;  /* jumpTable */
+        const BYTE* const istart2 = istart1 + length1;
+        const BYTE* const istart3 = istart2 + length2;
+        const BYTE* const istart4 = istart3 + length3;
+        const size_t segmentSize = (dstSize+3) / 4;
+        BYTE* const opStart2 = ostart + segmentSize;
+        BYTE* const opStart3 = opStart2 + segmentSize;
+        BYTE* const opStart4 = opStart3 + segmentSize;
+        BYTE* op1 = ostart;
+        BYTE* op2 = opStart2;
+        BYTE* op3 = opStart3;
+        BYTE* op4 = opStart4;
+        DTableDesc const dtd = HUF_getDTableDesc(DTable);
+        U32 const dtLog = dtd.tableLog;
+        U32 endSignal = 1;
+
+        if (length4 > cSrcSize) return ERROR(corruption_detected);   /* overflow */
+        CHECK_F( BIT_initDStream(&bitD1, istart1, length1) );
+        CHECK_F( BIT_initDStream(&bitD2, istart2, length2) );
+        CHECK_F( BIT_initDStream(&bitD3, istart3, length3) );
+        CHECK_F( BIT_initDStream(&bitD4, istart4, length4) );
+
+        /* up to 16 symbols per loop (4 symbols per stream) in 64-bit mode */
+        for ( ; (endSignal) & (op4 < olimit) ; ) {
+            HUF_DECODE_SYMBOLX1_2(op1, &bitD1);
+            HUF_DECODE_SYMBOLX1_2(op2, &bitD2);
+            HUF_DECODE_SYMBOLX1_2(op3, &bitD3);
+            HUF_DECODE_SYMBOLX1_2(op4, &bitD4);
+            HUF_DECODE_SYMBOLX1_1(op1, &bitD1);
+            HUF_DECODE_SYMBOLX1_1(op2, &bitD2);
+            HUF_DECODE_SYMBOLX1_1(op3, &bitD3);
+            HUF_DECODE_SYMBOLX1_1(op4, &bitD4);
+            HUF_DECODE_SYMBOLX1_2(op1, &bitD1);
+            HUF_DECODE_SYMBOLX1_2(op2, &bitD2);
+            HUF_DECODE_SYMBOLX1_2(op3, &bitD3);
+            HUF_DECODE_SYMBOLX1_2(op4, &bitD4);
+            HUF_DECODE_SYMBOLX1_0(op1, &bitD1);
+            HUF_DECODE_SYMBOLX1_0(op2, &bitD2);
+            HUF_DECODE_SYMBOLX1_0(op3, &bitD3);
+            HUF_DECODE_SYMBOLX1_0(op4, &bitD4);
+            endSignal &= BIT_reloadDStreamFast(&bitD1) == BIT_DStream_unfinished;
+            endSignal &= BIT_reloadDStreamFast(&bitD2) == BIT_DStream_unfinished;
+            endSignal &= BIT_reloadDStreamFast(&bitD3) == BIT_DStream_unfinished;
+            endSignal &= BIT_reloadDStreamFast(&bitD4) == BIT_DStream_unfinished;
+        }
+
+        /* check corruption */
+        /* note : should not be necessary : op# advance in lock step, and we control op4.
+         *        but curiously, binary generated by gcc 7.2 & 7.3 with -mbmi2 runs faster when >=1 test is present */
+        if (op1 > opStart2) return ERROR(corruption_detected);
+        if (op2 > opStart3) return ERROR(corruption_detected);
+        if (op3 > opStart4) return ERROR(corruption_detected);
+        /* note : op4 supposed already verified within main loop */
+
+        /* finish bitStreams one by one */
+        HUF_decodeStreamX1(op1, &bitD1, opStart2, dt, dtLog);
+        HUF_decodeStreamX1(op2, &bitD2, opStart3, dt, dtLog);
+        HUF_decodeStreamX1(op3, &bitD3, opStart4, dt, dtLog);
+        HUF_decodeStreamX1(op4, &bitD4, oend,     dt, dtLog);
+
+        /* check */
+        { U32 const endCheck = BIT_endOfDStream(&bitD1) & BIT_endOfDStream(&bitD2) & BIT_endOfDStream(&bitD3) & BIT_endOfDStream(&bitD4);
+          if (!endCheck) return ERROR(corruption_detected); }
+
+        /* decoded size */
+        return dstSize;
+    }
+}
+
+
+typedef size_t (*HUF_decompress_usingDTable_t)(void *dst, size_t dstSize,
+                                               const void *cSrc,
+                                               size_t cSrcSize,
+                                               const HUF_DTable *DTable);
+
+HUF_DGEN(HUF_decompress1X1_usingDTable_internal)
+HUF_DGEN(HUF_decompress4X1_usingDTable_internal)
+
+
+
+size_t HUF_decompress1X1_usingDTable(
+          void* dst,  size_t dstSize,
+    const void* cSrc, size_t cSrcSize,
+    const HUF_DTable* DTable)
+{
+    DTableDesc dtd = HUF_getDTableDesc(DTable);
+    if (dtd.tableType != 0) return ERROR(GENERIC);
+    return HUF_decompress1X1_usingDTable_internal(dst, dstSize, cSrc, cSrcSize, DTable, /* bmi2 */ 0);
+}
+
+size_t HUF_decompress1X1_DCtx_wksp(HUF_DTable* DCtx, void* dst, size_t dstSize,
+                                   const void* cSrc, size_t cSrcSize,
+                                   void* workSpace, size_t wkspSize)
+{
+    const BYTE* ip = (const BYTE*) cSrc;
+
+    size_t const hSize = HUF_readDTableX1_wksp(DCtx, cSrc, cSrcSize, workSpace, wkspSize);
+    if (HUF_isError(hSize)) return hSize;
+    if (hSize >= cSrcSize) return ERROR(srcSize_wrong);
+    ip += hSize; cSrcSize -= hSize;
+
+    return HUF_decompress1X1_usingDTable_internal(dst, dstSize, ip, cSrcSize, DCtx, /* bmi2 */ 0);
+}
+
+
+size_t HUF_decompress4X1_usingDTable(
+          void* dst,  size_t dstSize,
+    const void* cSrc, size_t cSrcSize,
+    const HUF_DTable* DTable)
+{
+    DTableDesc dtd = HUF_getDTableDesc(DTable);
+    if (dtd.tableType != 0) return ERROR(GENERIC);
+    return HUF_decompress4X1_usingDTable_internal(dst, dstSize, cSrc, cSrcSize, DTable, /* bmi2 */ 0);
+}
+
+static size_t HUF_decompress4X1_DCtx_wksp_bmi2(HUF_DTable* dctx, void* dst, size_t dstSize,
+                                   const void* cSrc, size_t cSrcSize,
+                                   void* workSpace, size_t wkspSize, int bmi2)
+{
+    const BYTE* ip = (const BYTE*) cSrc;
+
+    size_t const hSize = HUF_readDTableX1_wksp_bmi2(dctx, cSrc, cSrcSize, workSpace, wkspSize, bmi2);
+    if (HUF_isError(hSize)) return hSize;
+    if (hSize >= cSrcSize) return ERROR(srcSize_wrong);
+    ip += hSize; cSrcSize -= hSize;
+
+    return HUF_decompress4X1_usingDTable_internal(dst, dstSize, ip, cSrcSize, dctx, bmi2);
+}
+
+size_t HUF_decompress4X1_DCtx_wksp(HUF_DTable* dctx, void* dst, size_t dstSize,
+                                   const void* cSrc, size_t cSrcSize,
+                                   void* workSpace, size_t wkspSize)
+{
+    return HUF_decompress4X1_DCtx_wksp_bmi2(dctx, dst, dstSize, cSrc, cSrcSize, workSpace, wkspSize, 0);
+}
+
+
+#endif /* HUF_FORCE_DECOMPRESS_X2 */
+
+
+#ifndef HUF_FORCE_DECOMPRESS_X1
+
+/* *************************/
+/* double-symbols decoding */
+/* *************************/
+
+typedef struct { U16 sequence; BYTE nbBits; BYTE length; } HUF_DEltX2;  /* double-symbols decoding */
+typedef struct { BYTE symbol; BYTE weight; } sortedSymbol_t;
+typedef U32 rankValCol_t[HUF_TABLELOG_MAX + 1];
+typedef rankValCol_t rankVal_t[HUF_TABLELOG_MAX];
+
+
+/* HUF_fillDTableX2Level2() :
+ * `rankValOrigin` must be a table of at least (HUF_TABLELOG_MAX + 1) U32 */
+static void HUF_fillDTableX2Level2(HUF_DEltX2* DTable, U32 sizeLog, const U32 consumed,
+                           const U32* rankValOrigin, const int minWeight,
+                           const sortedSymbol_t* sortedSymbols, const U32 sortedListSize,
+                           U32 nbBitsBaseline, U16 baseSeq, U32* wksp, size_t wkspSize)
+{
+    HUF_DEltX2 DElt;
+    U32* rankVal = wksp;
+
+    assert(wkspSize >= HUF_TABLELOG_MAX + 1);
+    (void)wkspSize;
+    /* get pre-calculated rankVal */
+    ZSTD_memcpy(rankVal, rankValOrigin, sizeof(U32) * (HUF_TABLELOG_MAX + 1));
+
+    /* fill skipped values */
+    if (minWeight>1) {
+        U32 i, skipSize = rankVal[minWeight];
+        MEM_writeLE16(&(DElt.sequence), baseSeq);
+        DElt.nbBits   = (BYTE)(consumed);
+        DElt.length   = 1;
+        for (i = 0; i < skipSize; i++)
+            DTable[i] = DElt;
+    }
+
+    /* fill DTable */
+    {   U32 s; for (s=0; s<sortedListSize; s++) {   /* note : sortedSymbols already skipped */
+            const U32 symbol = sortedSymbols[s].symbol;
+            const U32 weight = sortedSymbols[s].weight;
+            const U32 nbBits = nbBitsBaseline - weight;
+            const U32 length = 1 << (sizeLog-nbBits);
+            const U32 start = rankVal[weight];
+            U32 i = start;
+            const U32 end = start + length;
+
+            MEM_writeLE16(&(DElt.sequence), (U16)(baseSeq + (symbol << 8)));
+            DElt.nbBits = (BYTE)(nbBits + consumed);
+            DElt.length = 2;
+            do { DTable[i++] = DElt; } while (i<end);   /* since length >= 1 */
+
+            rankVal[weight] += length;
+    }   }
+}
+
+
+static void HUF_fillDTableX2(HUF_DEltX2* DTable, const U32 targetLog,
+                           const sortedSymbol_t* sortedList, const U32 sortedListSize,
+                           const U32* rankStart, rankVal_t rankValOrigin, const U32 maxWeight,
+                           const U32 nbBitsBaseline, U32* wksp, size_t wkspSize)
+{
+    U32* rankVal = wksp;
+    const int scaleLog = nbBitsBaseline - targetLog;   /* note : targetLog >= srcLog, hence scaleLog <= 1 */
+    const U32 minBits  = nbBitsBaseline - maxWeight;
+    U32 s;
+
+    assert(wkspSize >= HUF_TABLELOG_MAX + 1);
+    wksp += HUF_TABLELOG_MAX + 1;
+    wkspSize -= HUF_TABLELOG_MAX + 1;
+
+    ZSTD_memcpy(rankVal, rankValOrigin, sizeof(U32) * (HUF_TABLELOG_MAX + 1));
+
+    /* fill DTable */
+    for (s=0; s<sortedListSize; s++) {
+        const U16 symbol = sortedList[s].symbol;
+        const U32 weight = sortedList[s].weight;
+        const U32 nbBits = nbBitsBaseline - weight;
+        const U32 start = rankVal[weight];
+        const U32 length = 1 << (targetLog-nbBits);
+
+        if (targetLog-nbBits >= minBits) {   /* enough room for a second symbol */
+            U32 sortedRank;
+            int minWeight = nbBits + scaleLog;
+            if (minWeight < 1) minWeight = 1;
+            sortedRank = rankStart[minWeight];
+            HUF_fillDTableX2Level2(DTable+start, targetLog-nbBits, nbBits,
+                           rankValOrigin[nbBits], minWeight,
+                           sortedList+sortedRank, sortedListSize-sortedRank,
+                           nbBitsBaseline, symbol, wksp, wkspSize);
+        } else {
+            HUF_DEltX2 DElt;
+            MEM_writeLE16(&(DElt.sequence), symbol);
+            DElt.nbBits = (BYTE)(nbBits);
+            DElt.length = 1;
+            {   U32 const end = start + length;
+                U32 u;
+                for (u = start; u < end; u++) DTable[u] = DElt;
+        }   }
+        rankVal[weight] += length;
+    }
+}
+
+typedef struct {
+    rankValCol_t rankVal[HUF_TABLELOG_MAX];
+    U32 rankStats[HUF_TABLELOG_MAX + 1];
+    U32 rankStart0[HUF_TABLELOG_MAX + 2];
+    sortedSymbol_t sortedSymbol[HUF_SYMBOLVALUE_MAX + 1];
+    BYTE weightList[HUF_SYMBOLVALUE_MAX + 1];
+    U32 calleeWksp[HUF_READ_STATS_WORKSPACE_SIZE_U32];
+} HUF_ReadDTableX2_Workspace;
+
+size_t HUF_readDTableX2_wksp(HUF_DTable* DTable,
+                       const void* src, size_t srcSize,
+                             void* workSpace, size_t wkspSize)
+{
+    U32 tableLog, maxW, sizeOfSort, nbSymbols;
+    DTableDesc dtd = HUF_getDTableDesc(DTable);
+    U32 const maxTableLog = dtd.maxTableLog;
+    size_t iSize;
+    void* dtPtr = DTable+1;   /* force compiler to avoid strict-aliasing */
+    HUF_DEltX2* const dt = (HUF_DEltX2*)dtPtr;
+    U32 *rankStart;
+
+    HUF_ReadDTableX2_Workspace* const wksp = (HUF_ReadDTableX2_Workspace*)workSpace;
+
+    if (sizeof(*wksp) > wkspSize) return ERROR(GENERIC);
+
+    rankStart = wksp->rankStart0 + 1;
+    ZSTD_memset(wksp->rankStats, 0, sizeof(wksp->rankStats));
+    ZSTD_memset(wksp->rankStart0, 0, sizeof(wksp->rankStart0));
+
+    DEBUG_STATIC_ASSERT(sizeof(HUF_DEltX2) == sizeof(HUF_DTable));   /* if compiler fails here, assertion is wrong */
+    if (maxTableLog > HUF_TABLELOG_MAX) return ERROR(tableLog_tooLarge);
+    /* ZSTD_memset(weightList, 0, sizeof(weightList)); */  /* is not necessary, even though some analyzer complain ... */
+
+    iSize = HUF_readStats_wksp(wksp->weightList, HUF_SYMBOLVALUE_MAX + 1, wksp->rankStats, &nbSymbols, &tableLog, src, srcSize, wksp->calleeWksp, sizeof(wksp->calleeWksp), /* bmi2 */ 0);
+    if (HUF_isError(iSize)) return iSize;
+
+    /* check result */
+    if (tableLog > maxTableLog) return ERROR(tableLog_tooLarge);   /* DTable can't fit code depth */
+
+    /* find maxWeight */
+    for (maxW = tableLog; wksp->rankStats[maxW]==0; maxW--) {}  /* necessarily finds a solution before 0 */
+
+    /* Get start index of each weight */
+    {   U32 w, nextRankStart = 0;
+        for (w=1; w<maxW+1; w++) {
+            U32 curr = nextRankStart;
+            nextRankStart += wksp->rankStats[w];
+            rankStart[w] = curr;
+        }
+        rankStart[0] = nextRankStart;   /* put all 0w symbols at the end of sorted list*/
+        sizeOfSort = nextRankStart;
+    }
+
+    /* sort symbols by weight */
+    {   U32 s;
+        for (s=0; s<nbSymbols; s++) {
+            U32 const w = wksp->weightList[s];
+            U32 const r = rankStart[w]++;
+            wksp->sortedSymbol[r].symbol = (BYTE)s;
+            wksp->sortedSymbol[r].weight = (BYTE)w;
+        }
+        rankStart[0] = 0;   /* forget 0w symbols; this is beginning of weight(1) */
+    }
+
+    /* Build rankVal */
+    {   U32* const rankVal0 = wksp->rankVal[0];
+        {   int const rescale = (maxTableLog-tableLog) - 1;   /* tableLog <= maxTableLog */
+            U32 nextRankVal = 0;
+            U32 w;
+            for (w=1; w<maxW+1; w++) {
+                U32 curr = nextRankVal;
+                nextRankVal += wksp->rankStats[w] << (w+rescale);
+                rankVal0[w] = curr;
+        }   }
+        {   U32 const minBits = tableLog+1 - maxW;
+            U32 consumed;
+            for (consumed = minBits; consumed < maxTableLog - minBits + 1; consumed++) {
+                U32* const rankValPtr = wksp->rankVal[consumed];
+                U32 w;
+                for (w = 1; w < maxW+1; w++) {
+                    rankValPtr[w] = rankVal0[w] >> consumed;
+    }   }   }   }
+
+    HUF_fillDTableX2(dt, maxTableLog,
+                   wksp->sortedSymbol, sizeOfSort,
+                   wksp->rankStart0, wksp->rankVal, maxW,
+                   tableLog+1,
+                   wksp->calleeWksp, sizeof(wksp->calleeWksp) / sizeof(U32));
+
+    dtd.tableLog = (BYTE)maxTableLog;
+    dtd.tableType = 1;
+    ZSTD_memcpy(DTable, &dtd, sizeof(dtd));
+    return iSize;
+}
+
+
+FORCE_INLINE_TEMPLATE U32
+HUF_decodeSymbolX2(void* op, BIT_DStream_t* DStream, const HUF_DEltX2* dt, const U32 dtLog)
+{
+    size_t const val = BIT_lookBitsFast(DStream, dtLog);   /* note : dtLog >= 1 */
+    ZSTD_memcpy(op, dt+val, 2);
+    BIT_skipBits(DStream, dt[val].nbBits);
+    return dt[val].length;
+}
+
+FORCE_INLINE_TEMPLATE U32
+HUF_decodeLastSymbolX2(void* op, BIT_DStream_t* DStream, const HUF_DEltX2* dt, const U32 dtLog)
+{
+    size_t const val = BIT_lookBitsFast(DStream, dtLog);   /* note : dtLog >= 1 */
+    ZSTD_memcpy(op, dt+val, 1);
+    if (dt[val].length==1) BIT_skipBits(DStream, dt[val].nbBits);
+    else {
+        if (DStream->bitsConsumed < (sizeof(DStream->bitContainer)*8)) {
+            BIT_skipBits(DStream, dt[val].nbBits);
+            if (DStream->bitsConsumed > (sizeof(DStream->bitContainer)*8))
+                /* ugly hack; works only because it's the last symbol. Note : can't easily extract nbBits from just this symbol */
+                DStream->bitsConsumed = (sizeof(DStream->bitContainer)*8);
+    }   }
+    return 1;
+}
+
+#define HUF_DECODE_SYMBOLX2_0(ptr, DStreamPtr) \
+    ptr += HUF_decodeSymbolX2(ptr, DStreamPtr, dt, dtLog)
+
+#define HUF_DECODE_SYMBOLX2_1(ptr, DStreamPtr) \
+    if (MEM_64bits() || (HUF_TABLELOG_MAX<=12)) \
+        ptr += HUF_decodeSymbolX2(ptr, DStreamPtr, dt, dtLog)
+
+#define HUF_DECODE_SYMBOLX2_2(ptr, DStreamPtr) \
+    if (MEM_64bits()) \
+        ptr += HUF_decodeSymbolX2(ptr, DStreamPtr, dt, dtLog)
+
+HINT_INLINE size_t
+HUF_decodeStreamX2(BYTE* p, BIT_DStream_t* bitDPtr, BYTE* const pEnd,
+                const HUF_DEltX2* const dt, const U32 dtLog)
+{
+    BYTE* const pStart = p;
+
+    /* up to 8 symbols at a time */
+    while ((BIT_reloadDStream(bitDPtr) == BIT_DStream_unfinished) & (p < pEnd-(sizeof(bitDPtr->bitContainer)-1))) {
+        HUF_DECODE_SYMBOLX2_2(p, bitDPtr);
+        HUF_DECODE_SYMBOLX2_1(p, bitDPtr);
+        HUF_DECODE_SYMBOLX2_2(p, bitDPtr);
+        HUF_DECODE_SYMBOLX2_0(p, bitDPtr);
+    }
+
+    /* closer to end : up to 2 symbols at a time */
+    while ((BIT_reloadDStream(bitDPtr) == BIT_DStream_unfinished) & (p <= pEnd-2))
+        HUF_DECODE_SYMBOLX2_0(p, bitDPtr);
+
+    while (p <= pEnd-2)
+        HUF_DECODE_SYMBOLX2_0(p, bitDPtr);   /* no need to reload : reached the end of DStream */
+
+    if (p < pEnd)
+        p += HUF_decodeLastSymbolX2(p, bitDPtr, dt, dtLog);
+
+    return p-pStart;
+}
+
+FORCE_INLINE_TEMPLATE size_t
+HUF_decompress1X2_usingDTable_internal_body(
+          void* dst,  size_t dstSize,
+    const void* cSrc, size_t cSrcSize,
+    const HUF_DTable* DTable)
+{
+    BIT_DStream_t bitD;
+
+    /* Init */
+    CHECK_F( BIT_initDStream(&bitD, cSrc, cSrcSize) );
+
+    /* decode */
+    {   BYTE* const ostart = (BYTE*) dst;
+        BYTE* const oend = ostart + dstSize;
+        const void* const dtPtr = DTable+1;   /* force compiler to not use strict-aliasing */
+        const HUF_DEltX2* const dt = (const HUF_DEltX2*)dtPtr;
+        DTableDesc const dtd = HUF_getDTableDesc(DTable);
+        HUF_decodeStreamX2(ostart, &bitD, oend, dt, dtd.tableLog);
+    }
+
+    /* check */
+    if (!BIT_endOfDStream(&bitD)) return ERROR(corruption_detected);
+
+    /* decoded size */
+    return dstSize;
+}
+
+FORCE_INLINE_TEMPLATE size_t
+HUF_decompress4X2_usingDTable_internal_body(
+          void* dst,  size_t dstSize,
+    const void* cSrc, size_t cSrcSize,
+    const HUF_DTable* DTable)
+{
+    if (cSrcSize < 10) return ERROR(corruption_detected);   /* strict minimum : jump table + 1 byte per stream */
+
+    {   const BYTE* const istart = (const BYTE*) cSrc;
+        BYTE* const ostart = (BYTE*) dst;
+        BYTE* const oend = ostart + dstSize;
+        BYTE* const olimit = oend - (sizeof(size_t)-1);
+        const void* const dtPtr = DTable+1;
+        const HUF_DEltX2* const dt = (const HUF_DEltX2*)dtPtr;
+
+        /* Init */
+        BIT_DStream_t bitD1;
+        BIT_DStream_t bitD2;
+        BIT_DStream_t bitD3;
+        BIT_DStream_t bitD4;
+        size_t const length1 = MEM_readLE16(istart);
+        size_t const length2 = MEM_readLE16(istart+2);
+        size_t const length3 = MEM_readLE16(istart+4);
+        size_t const length4 = cSrcSize - (length1 + length2 + length3 + 6);
+        const BYTE* const istart1 = istart + 6;  /* jumpTable */
+        const BYTE* const istart2 = istart1 + length1;
+        const BYTE* const istart3 = istart2 + length2;
+        const BYTE* const istart4 = istart3 + length3;
+        size_t const segmentSize = (dstSize+3) / 4;
+        BYTE* const opStart2 = ostart + segmentSize;
+        BYTE* const opStart3 = opStart2 + segmentSize;
+        BYTE* const opStart4 = opStart3 + segmentSize;
+        BYTE* op1 = ostart;
+        BYTE* op2 = opStart2;
+        BYTE* op3 = opStart3;
+        BYTE* op4 = opStart4;
+        U32 endSignal = 1;
+        DTableDesc const dtd = HUF_getDTableDesc(DTable);
+        U32 const dtLog = dtd.tableLog;
+
+        if (length4 > cSrcSize) return ERROR(corruption_detected);   /* overflow */
+        CHECK_F( BIT_initDStream(&bitD1, istart1, length1) );
+        CHECK_F( BIT_initDStream(&bitD2, istart2, length2) );
+        CHECK_F( BIT_initDStream(&bitD3, istart3, length3) );
+        CHECK_F( BIT_initDStream(&bitD4, istart4, length4) );
+
+        /* 16-32 symbols per loop (4-8 symbols per stream) */
+        for ( ; (endSignal) & (op4 < olimit); ) {
+#if defined(__clang__) && (defined(__x86_64__) || defined(__i386__))
+            HUF_DECODE_SYMBOLX2_2(op1, &bitD1);
+            HUF_DECODE_SYMBOLX2_1(op1, &bitD1);
+            HUF_DECODE_SYMBOLX2_2(op1, &bitD1);
+            HUF_DECODE_SYMBOLX2_0(op1, &bitD1);
+            HUF_DECODE_SYMBOLX2_2(op2, &bitD2);
+            HUF_DECODE_SYMBOLX2_1(op2, &bitD2);
+            HUF_DECODE_SYMBOLX2_2(op2, &bitD2);
+            HUF_DECODE_SYMBOLX2_0(op2, &bitD2);
+            endSignal &= BIT_reloadDStreamFast(&bitD1) == BIT_DStream_unfinished;
+            endSignal &= BIT_reloadDStreamFast(&bitD2) == BIT_DStream_unfinished;
+            HUF_DECODE_SYMBOLX2_2(op3, &bitD3);
+            HUF_DECODE_SYMBOLX2_1(op3, &bitD3);
+            HUF_DECODE_SYMBOLX2_2(op3, &bitD3);
+            HUF_DECODE_SYMBOLX2_0(op3, &bitD3);
+            HUF_DECODE_SYMBOLX2_2(op4, &bitD4);
+            HUF_DECODE_SYMBOLX2_1(op4, &bitD4);
+            HUF_DECODE_SYMBOLX2_2(op4, &bitD4);
+            HUF_DECODE_SYMBOLX2_0(op4, &bitD4);
+            endSignal &= BIT_reloadDStreamFast(&bitD3) == BIT_DStream_unfinished;
+            endSignal &= BIT_reloadDStreamFast(&bitD4) == BIT_DStream_unfinished;
+#else
+            HUF_DECODE_SYMBOLX2_2(op1, &bitD1);
+            HUF_DECODE_SYMBOLX2_2(op2, &bitD2);
+            HUF_DECODE_SYMBOLX2_2(op3, &bitD3);
+            HUF_DECODE_SYMBOLX2_2(op4, &bitD4);
+            HUF_DECODE_SYMBOLX2_1(op1, &bitD1);
+            HUF_DECODE_SYMBOLX2_1(op2, &bitD2);
+            HUF_DECODE_SYMBOLX2_1(op3, &bitD3);
+            HUF_DECODE_SYMBOLX2_1(op4, &bitD4);
+            HUF_DECODE_SYMBOLX2_2(op1, &bitD1);
+            HUF_DECODE_SYMBOLX2_2(op2, &bitD2);
+            HUF_DECODE_SYMBOLX2_2(op3, &bitD3);
+            HUF_DECODE_SYMBOLX2_2(op4, &bitD4);
+            HUF_DECODE_SYMBOLX2_0(op1, &bitD1);
+            HUF_DECODE_SYMBOLX2_0(op2, &bitD2);
+            HUF_DECODE_SYMBOLX2_0(op3, &bitD3);
+            HUF_DECODE_SYMBOLX2_0(op4, &bitD4);
+            endSignal = (U32)LIKELY(
+                        (BIT_reloadDStreamFast(&bitD1) == BIT_DStream_unfinished)
+                      & (BIT_reloadDStreamFast(&bitD2) == BIT_DStream_unfinished)
+                      & (BIT_reloadDStreamFast(&bitD3) == BIT_DStream_unfinished)
+                      & (BIT_reloadDStreamFast(&bitD4) == BIT_DStream_unfinished));
+#endif
+        }
+
+        /* check corruption */
+        if (op1 > opStart2) return ERROR(corruption_detected);
+        if (op2 > opStart3) return ERROR(corruption_detected);
+        if (op3 > opStart4) return ERROR(corruption_detected);
+        /* note : op4 already verified within main loop */
+
+        /* finish bitStreams one by one */
+        HUF_decodeStreamX2(op1, &bitD1, opStart2, dt, dtLog);
+        HUF_decodeStreamX2(op2, &bitD2, opStart3, dt, dtLog);
+        HUF_decodeStreamX2(op3, &bitD3, opStart4, dt, dtLog);
+        HUF_decodeStreamX2(op4, &bitD4, oend,     dt, dtLog);
+
+        /* check */
+        { U32 const endCheck = BIT_endOfDStream(&bitD1) & BIT_endOfDStream(&bitD2) & BIT_endOfDStream(&bitD3) & BIT_endOfDStream(&bitD4);
+          if (!endCheck) return ERROR(corruption_detected); }
+
+        /* decoded size */
+        return dstSize;
+    }
+}
+
+HUF_DGEN(HUF_decompress1X2_usingDTable_internal)
+HUF_DGEN(HUF_decompress4X2_usingDTable_internal)
+
+size_t HUF_decompress1X2_usingDTable(
+          void* dst,  size_t dstSize,
+    const void* cSrc, size_t cSrcSize,
+    const HUF_DTable* DTable)
+{
+    DTableDesc dtd = HUF_getDTableDesc(DTable);
+    if (dtd.tableType != 1) return ERROR(GENERIC);
+    return HUF_decompress1X2_usingDTable_internal(dst, dstSize, cSrc, cSrcSize, DTable, /* bmi2 */ 0);
+}
+
+size_t HUF_decompress1X2_DCtx_wksp(HUF_DTable* DCtx, void* dst, size_t dstSize,
+                                   const void* cSrc, size_t cSrcSize,
+                                   void* workSpace, size_t wkspSize)
+{
+    const BYTE* ip = (const BYTE*) cSrc;
+
+    size_t const hSize = HUF_readDTableX2_wksp(DCtx, cSrc, cSrcSize,
+                                               workSpace, wkspSize);
+    if (HUF_isError(hSize)) return hSize;
+    if (hSize >= cSrcSize) return ERROR(srcSize_wrong);
+    ip += hSize; cSrcSize -= hSize;
+
+    return HUF_decompress1X2_usingDTable_internal(dst, dstSize, ip, cSrcSize, DCtx, /* bmi2 */ 0);
+}
+
+
+size_t HUF_decompress4X2_usingDTable(
+          void* dst,  size_t dstSize,
+    const void* cSrc, size_t cSrcSize,
+    const HUF_DTable* DTable)
+{
+    DTableDesc dtd = HUF_getDTableDesc(DTable);
+    if (dtd.tableType != 1) return ERROR(GENERIC);
+    return HUF_decompress4X2_usingDTable_internal(dst, dstSize, cSrc, cSrcSize, DTable, /* bmi2 */ 0);
+}
+
+static size_t HUF_decompress4X2_DCtx_wksp_bmi2(HUF_DTable* dctx, void* dst, size_t dstSize,
+                                   const void* cSrc, size_t cSrcSize,
+                                   void* workSpace, size_t wkspSize, int bmi2)
+{
+    const BYTE* ip = (const BYTE*) cSrc;
+
+    size_t hSize = HUF_readDTableX2_wksp(dctx, cSrc, cSrcSize,
+                                         workSpace, wkspSize);
+    if (HUF_isError(hSize)) return hSize;
+    if (hSize >= cSrcSize) return ERROR(srcSize_wrong);
+    ip += hSize; cSrcSize -= hSize;
+
+    return HUF_decompress4X2_usingDTable_internal(dst, dstSize, ip, cSrcSize, dctx, bmi2);
+}
+
+size_t HUF_decompress4X2_DCtx_wksp(HUF_DTable* dctx, void* dst, size_t dstSize,
+                                   const void* cSrc, size_t cSrcSize,
+                                   void* workSpace, size_t wkspSize)
+{
+    return HUF_decompress4X2_DCtx_wksp_bmi2(dctx, dst, dstSize, cSrc, cSrcSize, workSpace, wkspSize, /* bmi2 */ 0);
+}
+
+
+#endif /* HUF_FORCE_DECOMPRESS_X1 */
+
+
+/* ***********************************/
+/* Universal decompression selectors */
+/* ***********************************/
+
+size_t HUF_decompress1X_usingDTable(void* dst, size_t maxDstSize,
+                                    const void* cSrc, size_t cSrcSize,
+                                    const HUF_DTable* DTable)
+{
+    DTableDesc const dtd = HUF_getDTableDesc(DTable);
+#if defined(HUF_FORCE_DECOMPRESS_X1)
+    (void)dtd;
+    assert(dtd.tableType == 0);
+    return HUF_decompress1X1_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, /* bmi2 */ 0);
+#elif defined(HUF_FORCE_DECOMPRESS_X2)
+    (void)dtd;
+    assert(dtd.tableType == 1);
+    return HUF_decompress1X2_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, /* bmi2 */ 0);
+#else
+    return dtd.tableType ? HUF_decompress1X2_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, /* bmi2 */ 0) :
+                           HUF_decompress1X1_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, /* bmi2 */ 0);
+#endif
+}
+
+size_t HUF_decompress4X_usingDTable(void* dst, size_t maxDstSize,
+                                    const void* cSrc, size_t cSrcSize,
+                                    const HUF_DTable* DTable)
+{
+    DTableDesc const dtd = HUF_getDTableDesc(DTable);
+#if defined(HUF_FORCE_DECOMPRESS_X1)
+    (void)dtd;
+    assert(dtd.tableType == 0);
+    return HUF_decompress4X1_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, /* bmi2 */ 0);
+#elif defined(HUF_FORCE_DECOMPRESS_X2)
+    (void)dtd;
+    assert(dtd.tableType == 1);
+    return HUF_decompress4X2_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, /* bmi2 */ 0);
+#else
+    return dtd.tableType ? HUF_decompress4X2_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, /* bmi2 */ 0) :
+                           HUF_decompress4X1_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, /* bmi2 */ 0);
+#endif
+}
+
+
+#if !defined(HUF_FORCE_DECOMPRESS_X1) && !defined(HUF_FORCE_DECOMPRESS_X2)
+typedef struct { U32 tableTime; U32 decode256Time; } algo_time_t;
+static const algo_time_t algoTime[16 /* Quantization */][3 /* single, double, quad */] =
+{
+    /* single, double, quad */
+    {{0,0}, {1,1}, {2,2}},  /* Q==0 : impossible */
+    {{0,0}, {1,1}, {2,2}},  /* Q==1 : impossible */
+    {{  38,130}, {1313, 74}, {2151, 38}},   /* Q == 2 : 12-18% */
+    {{ 448,128}, {1353, 74}, {2238, 41}},   /* Q == 3 : 18-25% */
+    {{ 556,128}, {1353, 74}, {2238, 47}},   /* Q == 4 : 25-32% */
+    {{ 714,128}, {1418, 74}, {2436, 53}},   /* Q == 5 : 32-38% */
+    {{ 883,128}, {1437, 74}, {2464, 61}},   /* Q == 6 : 38-44% */
+    {{ 897,128}, {1515, 75}, {2622, 68}},   /* Q == 7 : 44-50% */
+    {{ 926,128}, {1613, 75}, {2730, 75}},   /* Q == 8 : 50-56% */
+    {{ 947,128}, {1729, 77}, {3359, 77}},   /* Q == 9 : 56-62% */
+    {{1107,128}, {2083, 81}, {4006, 84}},   /* Q ==10 : 62-69% */
+    {{1177,128}, {2379, 87}, {4785, 88}},   /* Q ==11 : 69-75% */
+    {{1242,128}, {2415, 93}, {5155, 84}},   /* Q ==12 : 75-81% */
+    {{1349,128}, {2644,106}, {5260,106}},   /* Q ==13 : 81-87% */
+    {{1455,128}, {2422,124}, {4174,124}},   /* Q ==14 : 87-93% */
+    {{ 722,128}, {1891,145}, {1936,146}},   /* Q ==15 : 93-99% */
+};
+#endif
+
+/** HUF_selectDecoder() :
+ *  Tells which decoder is likely to decode faster,
+ *  based on a set of pre-computed metrics.
+ * @return : 0==HUF_decompress4X1, 1==HUF_decompress4X2 .
+ *  Assumption : 0 < dstSize <= 128 KB */
+U32 HUF_selectDecoder (size_t dstSize, size_t cSrcSize)
+{
+    assert(dstSize > 0);
+    assert(dstSize <= 128*1024);
+#if defined(HUF_FORCE_DECOMPRESS_X1)
+    (void)dstSize;
+    (void)cSrcSize;
+    return 0;
+#elif defined(HUF_FORCE_DECOMPRESS_X2)
+    (void)dstSize;
+    (void)cSrcSize;
+    return 1;
+#else
+    /* decoder timing evaluation */
+    {   U32 const Q = (cSrcSize >= dstSize) ? 15 : (U32)(cSrcSize * 16 / dstSize);   /* Q < 16 */
+        U32 const D256 = (U32)(dstSize >> 8);
+        U32 const DTime0 = algoTime[Q][0].tableTime + (algoTime[Q][0].decode256Time * D256);
+        U32 DTime1 = algoTime[Q][1].tableTime + (algoTime[Q][1].decode256Time * D256);
+        DTime1 += DTime1 >> 3;  /* advantage to algorithm using less memory, to reduce cache eviction */
+        return DTime1 < DTime0;
+    }
+#endif
+}
+
+
+size_t HUF_decompress4X_hufOnly_wksp(HUF_DTable* dctx, void* dst,
+                                     size_t dstSize, const void* cSrc,
+                                     size_t cSrcSize, void* workSpace,
+                                     size_t wkspSize)
+{
+    /* validation checks */
+    if (dstSize == 0) return ERROR(dstSize_tooSmall);
+    if (cSrcSize == 0) return ERROR(corruption_detected);
+
+    {   U32 const algoNb = HUF_selectDecoder(dstSize, cSrcSize);
+#if defined(HUF_FORCE_DECOMPRESS_X1)
+        (void)algoNb;
+        assert(algoNb == 0);
+        return HUF_decompress4X1_DCtx_wksp(dctx, dst, dstSize, cSrc, cSrcSize, workSpace, wkspSize);
+#elif defined(HUF_FORCE_DECOMPRESS_X2)
+        (void)algoNb;
+        assert(algoNb == 1);
+        return HUF_decompress4X2_DCtx_wksp(dctx, dst, dstSize, cSrc, cSrcSize, workSpace, wkspSize);
+#else
+        return algoNb ? HUF_decompress4X2_DCtx_wksp(dctx, dst, dstSize, cSrc,
+                            cSrcSize, workSpace, wkspSize):
+                        HUF_decompress4X1_DCtx_wksp(dctx, dst, dstSize, cSrc, cSrcSize, workSpace, wkspSize);
+#endif
+    }
+}
+
+size_t HUF_decompress1X_DCtx_wksp(HUF_DTable* dctx, void* dst, size_t dstSize,
+                                  const void* cSrc, size_t cSrcSize,
+                                  void* workSpace, size_t wkspSize)
+{
+    /* validation checks */
+    if (dstSize == 0) return ERROR(dstSize_tooSmall);
+    if (cSrcSize > dstSize) return ERROR(corruption_detected);   /* invalid */
+    if (cSrcSize == dstSize) { ZSTD_memcpy(dst, cSrc, dstSize); return dstSize; }   /* not compressed */
+    if (cSrcSize == 1) { ZSTD_memset(dst, *(const BYTE*)cSrc, dstSize); return dstSize; }   /* RLE */
+
+    {   U32 const algoNb = HUF_selectDecoder(dstSize, cSrcSize);
+#if defined(HUF_FORCE_DECOMPRESS_X1)
+        (void)algoNb;
+        assert(algoNb == 0);
+        return HUF_decompress1X1_DCtx_wksp(dctx, dst, dstSize, cSrc,
+                                cSrcSize, workSpace, wkspSize);
+#elif defined(HUF_FORCE_DECOMPRESS_X2)
+        (void)algoNb;
+        assert(algoNb == 1);
+        return HUF_decompress1X2_DCtx_wksp(dctx, dst, dstSize, cSrc,
+                                cSrcSize, workSpace, wkspSize);
+#else
+        return algoNb ? HUF_decompress1X2_DCtx_wksp(dctx, dst, dstSize, cSrc,
+                                cSrcSize, workSpace, wkspSize):
+                        HUF_decompress1X1_DCtx_wksp(dctx, dst, dstSize, cSrc,
+                                cSrcSize, workSpace, wkspSize);
+#endif
+    }
+}
+
+
+size_t HUF_decompress1X_usingDTable_bmi2(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const HUF_DTable* DTable, int bmi2)
+{
+    DTableDesc const dtd = HUF_getDTableDesc(DTable);
+#if defined(HUF_FORCE_DECOMPRESS_X1)
+    (void)dtd;
+    assert(dtd.tableType == 0);
+    return HUF_decompress1X1_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, bmi2);
+#elif defined(HUF_FORCE_DECOMPRESS_X2)
+    (void)dtd;
+    assert(dtd.tableType == 1);
+    return HUF_decompress1X2_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, bmi2);
+#else
+    return dtd.tableType ? HUF_decompress1X2_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, bmi2) :
+                           HUF_decompress1X1_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, bmi2);
+#endif
+}
+
+#ifndef HUF_FORCE_DECOMPRESS_X2
+size_t HUF_decompress1X1_DCtx_wksp_bmi2(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize, void* workSpace, size_t wkspSize, int bmi2)
+{
+    const BYTE* ip = (const BYTE*) cSrc;
+
+    size_t const hSize = HUF_readDTableX1_wksp_bmi2(dctx, cSrc, cSrcSize, workSpace, wkspSize, bmi2);
+    if (HUF_isError(hSize)) return hSize;
+    if (hSize >= cSrcSize) return ERROR(srcSize_wrong);
+    ip += hSize; cSrcSize -= hSize;
+
+    return HUF_decompress1X1_usingDTable_internal(dst, dstSize, ip, cSrcSize, dctx, bmi2);
+}
+#endif
+
+size_t HUF_decompress4X_usingDTable_bmi2(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const HUF_DTable* DTable, int bmi2)
+{
+    DTableDesc const dtd = HUF_getDTableDesc(DTable);
+#if defined(HUF_FORCE_DECOMPRESS_X1)
+    (void)dtd;
+    assert(dtd.tableType == 0);
+    return HUF_decompress4X1_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, bmi2);
+#elif defined(HUF_FORCE_DECOMPRESS_X2)
+    (void)dtd;
+    assert(dtd.tableType == 1);
+    return HUF_decompress4X2_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, bmi2);
+#else
+    return dtd.tableType ? HUF_decompress4X2_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, bmi2) :
+                           HUF_decompress4X1_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, bmi2);
+#endif
+}
+
+size_t HUF_decompress4X_hufOnly_wksp_bmi2(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize, void* workSpace, size_t wkspSize, int bmi2)
+{
+    /* validation checks */
+    if (dstSize == 0) return ERROR(dstSize_tooSmall);
+    if (cSrcSize == 0) return ERROR(corruption_detected);
+
+    {   U32 const algoNb = HUF_selectDecoder(dstSize, cSrcSize);
+#if defined(HUF_FORCE_DECOMPRESS_X1)
+        (void)algoNb;
+        assert(algoNb == 0);
+        return HUF_decompress4X1_DCtx_wksp_bmi2(dctx, dst, dstSize, cSrc, cSrcSize, workSpace, wkspSize, bmi2);
+#elif defined(HUF_FORCE_DECOMPRESS_X2)
+        (void)algoNb;
+        assert(algoNb == 1);
+        return HUF_decompress4X2_DCtx_wksp_bmi2(dctx, dst, dstSize, cSrc, cSrcSize, workSpace, wkspSize, bmi2);
+#else
+        return algoNb ? HUF_decompress4X2_DCtx_wksp_bmi2(dctx, dst, dstSize, cSrc, cSrcSize, workSpace, wkspSize, bmi2) :
+                        HUF_decompress4X1_DCtx_wksp_bmi2(dctx, dst, dstSize, cSrc, cSrcSize, workSpace, wkspSize, bmi2);
+#endif
+    }
+}
+
+#ifndef ZSTD_NO_UNUSED_FUNCTIONS
+#ifndef HUF_FORCE_DECOMPRESS_X2
+size_t HUF_readDTableX1(HUF_DTable* DTable, const void* src, size_t srcSize)
+{
+    U32 workSpace[HUF_DECOMPRESS_WORKSPACE_SIZE_U32];
+    return HUF_readDTableX1_wksp(DTable, src, srcSize,
+                                 workSpace, sizeof(workSpace));
+}
+
+size_t HUF_decompress1X1_DCtx(HUF_DTable* DCtx, void* dst, size_t dstSize,
+                              const void* cSrc, size_t cSrcSize)
+{
+    U32 workSpace[HUF_DECOMPRESS_WORKSPACE_SIZE_U32];
+    return HUF_decompress1X1_DCtx_wksp(DCtx, dst, dstSize, cSrc, cSrcSize,
+                                       workSpace, sizeof(workSpace));
+}
+
+size_t HUF_decompress1X1 (void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize)
+{
+    HUF_CREATE_STATIC_DTABLEX1(DTable, HUF_TABLELOG_MAX);
+    return HUF_decompress1X1_DCtx (DTable, dst, dstSize, cSrc, cSrcSize);
+}
+#endif
+
+#ifndef HUF_FORCE_DECOMPRESS_X1
+size_t HUF_readDTableX2(HUF_DTable* DTable, const void* src, size_t srcSize)
+{
+  U32 workSpace[HUF_DECOMPRESS_WORKSPACE_SIZE_U32];
+  return HUF_readDTableX2_wksp(DTable, src, srcSize,
+                               workSpace, sizeof(workSpace));
+}
+
+size_t HUF_decompress1X2_DCtx(HUF_DTable* DCtx, void* dst, size_t dstSize,
+                              const void* cSrc, size_t cSrcSize)
+{
+    U32 workSpace[HUF_DECOMPRESS_WORKSPACE_SIZE_U32];
+    return HUF_decompress1X2_DCtx_wksp(DCtx, dst, dstSize, cSrc, cSrcSize,
+                                       workSpace, sizeof(workSpace));
+}
+
+size_t HUF_decompress1X2 (void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize)
+{
+    HUF_CREATE_STATIC_DTABLEX2(DTable, HUF_TABLELOG_MAX);
+    return HUF_decompress1X2_DCtx(DTable, dst, dstSize, cSrc, cSrcSize);
+}
+#endif
+
+#ifndef HUF_FORCE_DECOMPRESS_X2
+size_t HUF_decompress4X1_DCtx (HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize)
+{
+    U32 workSpace[HUF_DECOMPRESS_WORKSPACE_SIZE_U32];
+    return HUF_decompress4X1_DCtx_wksp(dctx, dst, dstSize, cSrc, cSrcSize,
+                                       workSpace, sizeof(workSpace));
+}
+size_t HUF_decompress4X1 (void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize)
+{
+    HUF_CREATE_STATIC_DTABLEX1(DTable, HUF_TABLELOG_MAX);
+    return HUF_decompress4X1_DCtx(DTable, dst, dstSize, cSrc, cSrcSize);
+}
+#endif
+
+#ifndef HUF_FORCE_DECOMPRESS_X1
+size_t HUF_decompress4X2_DCtx(HUF_DTable* dctx, void* dst, size_t dstSize,
+                              const void* cSrc, size_t cSrcSize)
+{
+    U32 workSpace[HUF_DECOMPRESS_WORKSPACE_SIZE_U32];
+    return HUF_decompress4X2_DCtx_wksp(dctx, dst, dstSize, cSrc, cSrcSize,
+                                       workSpace, sizeof(workSpace));
+}
+
+size_t HUF_decompress4X2 (void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize)
+{
+    HUF_CREATE_STATIC_DTABLEX2(DTable, HUF_TABLELOG_MAX);
+    return HUF_decompress4X2_DCtx(DTable, dst, dstSize, cSrc, cSrcSize);
+}
+#endif
+
+typedef size_t (*decompressionAlgo)(void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize);
+
+size_t HUF_decompress (void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize)
+{
+#if !defined(HUF_FORCE_DECOMPRESS_X1) && !defined(HUF_FORCE_DECOMPRESS_X2)
+    static const decompressionAlgo decompress[2] = { HUF_decompress4X1, HUF_decompress4X2 };
+#endif
+
+    /* validation checks */
+    if (dstSize == 0) return ERROR(dstSize_tooSmall);
+    if (cSrcSize > dstSize) return ERROR(corruption_detected);   /* invalid */
+    if (cSrcSize == dstSize) { ZSTD_memcpy(dst, cSrc, dstSize); return dstSize; }   /* not compressed */
+    if (cSrcSize == 1) { ZSTD_memset(dst, *(const BYTE*)cSrc, dstSize); return dstSize; }   /* RLE */
+
+    {   U32 const algoNb = HUF_selectDecoder(dstSize, cSrcSize);
+#if defined(HUF_FORCE_DECOMPRESS_X1)
+        (void)algoNb;
+        assert(algoNb == 0);
+        return HUF_decompress4X1(dst, dstSize, cSrc, cSrcSize);
+#elif defined(HUF_FORCE_DECOMPRESS_X2)
+        (void)algoNb;
+        assert(algoNb == 1);
+        return HUF_decompress4X2(dst, dstSize, cSrc, cSrcSize);
+#else
+        return decompress[algoNb](dst, dstSize, cSrc, cSrcSize);
+#endif
+    }
+}
+
+size_t HUF_decompress4X_DCtx (HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize)
+{
+    /* validation checks */
+    if (dstSize == 0) return ERROR(dstSize_tooSmall);
+    if (cSrcSize > dstSize) return ERROR(corruption_detected);   /* invalid */
+    if (cSrcSize == dstSize) { ZSTD_memcpy(dst, cSrc, dstSize); return dstSize; }   /* not compressed */
+    if (cSrcSize == 1) { ZSTD_memset(dst, *(const BYTE*)cSrc, dstSize); return dstSize; }   /* RLE */
+
+    {   U32 const algoNb = HUF_selectDecoder(dstSize, cSrcSize);
+#if defined(HUF_FORCE_DECOMPRESS_X1)
+        (void)algoNb;
+        assert(algoNb == 0);
+        return HUF_decompress4X1_DCtx(dctx, dst, dstSize, cSrc, cSrcSize);
+#elif defined(HUF_FORCE_DECOMPRESS_X2)
+        (void)algoNb;
+        assert(algoNb == 1);
+        return HUF_decompress4X2_DCtx(dctx, dst, dstSize, cSrc, cSrcSize);
+#else
+        return algoNb ? HUF_decompress4X2_DCtx(dctx, dst, dstSize, cSrc, cSrcSize) :
+                        HUF_decompress4X1_DCtx(dctx, dst, dstSize, cSrc, cSrcSize) ;
+#endif
+    }
+}
+
+size_t HUF_decompress4X_hufOnly(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize)
+{
+    U32 workSpace[HUF_DECOMPRESS_WORKSPACE_SIZE_U32];
+    return HUF_decompress4X_hufOnly_wksp(dctx, dst, dstSize, cSrc, cSrcSize,
+                                         workSpace, sizeof(workSpace));
+}
+
+size_t HUF_decompress1X_DCtx(HUF_DTable* dctx, void* dst, size_t dstSize,
+                             const void* cSrc, size_t cSrcSize)
+{
+    U32 workSpace[HUF_DECOMPRESS_WORKSPACE_SIZE_U32];
+    return HUF_decompress1X_DCtx_wksp(dctx, dst, dstSize, cSrc, cSrcSize,
+                                      workSpace, sizeof(workSpace));
+}
+#endif
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/decompress/zstd_ddict.c mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/decompress/zstd_ddict.c
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/decompress/zstd_ddict.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/decompress/zstd_ddict.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,244 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+/* zstd_ddict.c :
+ * concentrates all logic that needs to know the internals of ZSTD_DDict object */
+
+/*-*******************************************************
+*  Dependencies
+*********************************************************/
+#include "../common/zstd_deps.h"   /* ZSTD_memcpy, ZSTD_memmove, ZSTD_memset */
+#include "../common/cpu.h"         /* bmi2 */
+#include "../common/mem.h"         /* low level memory routines */
+#define FSE_STATIC_LINKING_ONLY
+#include "../common/fse.h"
+#define HUF_STATIC_LINKING_ONLY
+#include "../common/huf.h"
+#include "zstd_decompress_internal.h"
+#include "zstd_ddict.h"
+
+#if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT>=1)
+#  include "../legacy/zstd_legacy.h"
+#endif
+
+
+
+/*-*******************************************************
+*  Types
+*********************************************************/
+struct ZSTD_DDict_s {
+    void* dictBuffer;
+    const void* dictContent;
+    size_t dictSize;
+    ZSTD_entropyDTables_t entropy;
+    U32 dictID;
+    U32 entropyPresent;
+    ZSTD_customMem cMem;
+};  /* typedef'd to ZSTD_DDict within "zstd.h" */
+
+const void* ZSTD_DDict_dictContent(const ZSTD_DDict* ddict)
+{
+    assert(ddict != NULL);
+    return ddict->dictContent;
+}
+
+size_t ZSTD_DDict_dictSize(const ZSTD_DDict* ddict)
+{
+    assert(ddict != NULL);
+    return ddict->dictSize;
+}
+
+void ZSTD_copyDDictParameters(ZSTD_DCtx* dctx, const ZSTD_DDict* ddict)
+{
+    DEBUGLOG(4, "ZSTD_copyDDictParameters");
+    assert(dctx != NULL);
+    assert(ddict != NULL);
+    dctx->dictID = ddict->dictID;
+    dctx->prefixStart = ddict->dictContent;
+    dctx->virtualStart = ddict->dictContent;
+    dctx->dictEnd = (const BYTE*)ddict->dictContent + ddict->dictSize;
+    dctx->previousDstEnd = dctx->dictEnd;
+#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+    dctx->dictContentBeginForFuzzing = dctx->prefixStart;
+    dctx->dictContentEndForFuzzing = dctx->previousDstEnd;
+#endif
+    if (ddict->entropyPresent) {
+        dctx->litEntropy = 1;
+        dctx->fseEntropy = 1;
+        dctx->LLTptr = ddict->entropy.LLTable;
+        dctx->MLTptr = ddict->entropy.MLTable;
+        dctx->OFTptr = ddict->entropy.OFTable;
+        dctx->HUFptr = ddict->entropy.hufTable;
+        dctx->entropy.rep[0] = ddict->entropy.rep[0];
+        dctx->entropy.rep[1] = ddict->entropy.rep[1];
+        dctx->entropy.rep[2] = ddict->entropy.rep[2];
+    } else {
+        dctx->litEntropy = 0;
+        dctx->fseEntropy = 0;
+    }
+}
+
+
+static size_t
+ZSTD_loadEntropy_intoDDict(ZSTD_DDict* ddict,
+                           ZSTD_dictContentType_e dictContentType)
+{
+    ddict->dictID = 0;
+    ddict->entropyPresent = 0;
+    if (dictContentType == ZSTD_dct_rawContent) return 0;
+
+    if (ddict->dictSize < 8) {
+        if (dictContentType == ZSTD_dct_fullDict)
+            return ERROR(dictionary_corrupted);   /* only accept specified dictionaries */
+        return 0;   /* pure content mode */
+    }
+    {   U32 const magic = MEM_readLE32(ddict->dictContent);
+        if (magic != ZSTD_MAGIC_DICTIONARY) {
+            if (dictContentType == ZSTD_dct_fullDict)
+                return ERROR(dictionary_corrupted);   /* only accept specified dictionaries */
+            return 0;   /* pure content mode */
+        }
+    }
+    ddict->dictID = MEM_readLE32((const char*)ddict->dictContent + ZSTD_FRAMEIDSIZE);
+
+    /* load entropy tables */
+    RETURN_ERROR_IF(ZSTD_isError(ZSTD_loadDEntropy(
+            &ddict->entropy, ddict->dictContent, ddict->dictSize)),
+        dictionary_corrupted, "");
+    ddict->entropyPresent = 1;
+    return 0;
+}
+
+
+static size_t ZSTD_initDDict_internal(ZSTD_DDict* ddict,
+                                      const void* dict, size_t dictSize,
+                                      ZSTD_dictLoadMethod_e dictLoadMethod,
+                                      ZSTD_dictContentType_e dictContentType)
+{
+    if ((dictLoadMethod == ZSTD_dlm_byRef) || (!dict) || (!dictSize)) {
+        ddict->dictBuffer = NULL;
+        ddict->dictContent = dict;
+        if (!dict) dictSize = 0;
+    } else {
+        void* const internalBuffer = ZSTD_customMalloc(dictSize, ddict->cMem);
+        ddict->dictBuffer = internalBuffer;
+        ddict->dictContent = internalBuffer;
+        if (!internalBuffer) return ERROR(memory_allocation);
+        ZSTD_memcpy(internalBuffer, dict, dictSize);
+    }
+    ddict->dictSize = dictSize;
+    ddict->entropy.hufTable[0] = (HUF_DTable)((HufLog)*0x1000001);  /* cover both little and big endian */
+
+    /* parse dictionary content */
+    FORWARD_IF_ERROR( ZSTD_loadEntropy_intoDDict(ddict, dictContentType) , "");
+
+    return 0;
+}
+
+ZSTD_DDict* ZSTD_createDDict_advanced(const void* dict, size_t dictSize,
+                                      ZSTD_dictLoadMethod_e dictLoadMethod,
+                                      ZSTD_dictContentType_e dictContentType,
+                                      ZSTD_customMem customMem)
+{
+    if ((!customMem.customAlloc) ^ (!customMem.customFree)) return NULL;
+
+    {   ZSTD_DDict* const ddict = (ZSTD_DDict*) ZSTD_customMalloc(sizeof(ZSTD_DDict), customMem);
+        if (ddict == NULL) return NULL;
+        ddict->cMem = customMem;
+        {   size_t const initResult = ZSTD_initDDict_internal(ddict,
+                                            dict, dictSize,
+                                            dictLoadMethod, dictContentType);
+            if (ZSTD_isError(initResult)) {
+                ZSTD_freeDDict(ddict);
+                return NULL;
+        }   }
+        return ddict;
+    }
+}
+
+/*! ZSTD_createDDict() :
+*   Create a digested dictionary, to start decompression without startup delay.
+*   `dict` content is copied inside DDict.
+*   Consequently, `dict` can be released after `ZSTD_DDict` creation */
+ZSTD_DDict* ZSTD_createDDict(const void* dict, size_t dictSize)
+{
+    ZSTD_customMem const allocator = { NULL, NULL, NULL };
+    return ZSTD_createDDict_advanced(dict, dictSize, ZSTD_dlm_byCopy, ZSTD_dct_auto, allocator);
+}
+
+/*! ZSTD_createDDict_byReference() :
+ *  Create a digested dictionary, to start decompression without startup delay.
+ *  Dictionary content is simply referenced, it will be accessed during decompression.
+ *  Warning : dictBuffer must outlive DDict (DDict must be freed before dictBuffer) */
+ZSTD_DDict* ZSTD_createDDict_byReference(const void* dictBuffer, size_t dictSize)
+{
+    ZSTD_customMem const allocator = { NULL, NULL, NULL };
+    return ZSTD_createDDict_advanced(dictBuffer, dictSize, ZSTD_dlm_byRef, ZSTD_dct_auto, allocator);
+}
+
+
+const ZSTD_DDict* ZSTD_initStaticDDict(
+                                void* sBuffer, size_t sBufferSize,
+                                const void* dict, size_t dictSize,
+                                ZSTD_dictLoadMethod_e dictLoadMethod,
+                                ZSTD_dictContentType_e dictContentType)
+{
+    size_t const neededSpace = sizeof(ZSTD_DDict)
+                             + (dictLoadMethod == ZSTD_dlm_byRef ? 0 : dictSize);
+    ZSTD_DDict* const ddict = (ZSTD_DDict*)sBuffer;
+    assert(sBuffer != NULL);
+    assert(dict != NULL);
+    if ((size_t)sBuffer & 7) return NULL;   /* 8-aligned */
+    if (sBufferSize < neededSpace) return NULL;
+    if (dictLoadMethod == ZSTD_dlm_byCopy) {
+        ZSTD_memcpy(ddict+1, dict, dictSize);  /* local copy */
+        dict = ddict+1;
+    }
+    if (ZSTD_isError( ZSTD_initDDict_internal(ddict,
+                                              dict, dictSize,
+                                              ZSTD_dlm_byRef, dictContentType) ))
+        return NULL;
+    return ddict;
+}
+
+
+size_t ZSTD_freeDDict(ZSTD_DDict* ddict)
+{
+    if (ddict==NULL) return 0;   /* support free on NULL */
+    {   ZSTD_customMem const cMem = ddict->cMem;
+        ZSTD_customFree(ddict->dictBuffer, cMem);
+        ZSTD_customFree(ddict, cMem);
+        return 0;
+    }
+}
+
+/*! ZSTD_estimateDDictSize() :
+ *  Estimate amount of memory that will be needed to create a dictionary for decompression.
+ *  Note : dictionary created by reference using ZSTD_dlm_byRef are smaller */
+size_t ZSTD_estimateDDictSize(size_t dictSize, ZSTD_dictLoadMethod_e dictLoadMethod)
+{
+    return sizeof(ZSTD_DDict) + (dictLoadMethod == ZSTD_dlm_byRef ? 0 : dictSize);
+}
+
+size_t ZSTD_sizeof_DDict(const ZSTD_DDict* ddict)
+{
+    if (ddict==NULL) return 0;   /* support sizeof on NULL */
+    return sizeof(*ddict) + (ddict->dictBuffer ? ddict->dictSize : 0) ;
+}
+
+/*! ZSTD_getDictID_fromDDict() :
+ *  Provides the dictID of the dictionary loaded into `ddict`.
+ *  If @return == 0, the dictionary is not conformant to Zstandard specification, or empty.
+ *  Non-conformant dictionaries can still be loaded, but as content-only dictionaries. */
+unsigned ZSTD_getDictID_fromDDict(const ZSTD_DDict* ddict)
+{
+    if (ddict==NULL) return 0;
+    return ZSTD_getDictID_fromDict(ddict->dictContent, ddict->dictSize);
+}
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/decompress/zstd_ddict.h mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/decompress/zstd_ddict.h
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/decompress/zstd_ddict.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/decompress/zstd_ddict.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+
+#ifndef ZSTD_DDICT_H
+#define ZSTD_DDICT_H
+
+/*-*******************************************************
+ *  Dependencies
+ *********************************************************/
+#include "../common/zstd_deps.h"   /* size_t */
+#include "../zstd.h"     /* ZSTD_DDict, and several public functions */
+
+
+/*-*******************************************************
+ *  Interface
+ *********************************************************/
+
+/* note: several prototypes are already published in `zstd.h` :
+ * ZSTD_createDDict()
+ * ZSTD_createDDict_byReference()
+ * ZSTD_createDDict_advanced()
+ * ZSTD_freeDDict()
+ * ZSTD_initStaticDDict()
+ * ZSTD_sizeof_DDict()
+ * ZSTD_estimateDDictSize()
+ * ZSTD_getDictID_fromDict()
+ */
+
+const void* ZSTD_DDict_dictContent(const ZSTD_DDict* ddict);
+size_t ZSTD_DDict_dictSize(const ZSTD_DDict* ddict);
+
+void ZSTD_copyDDictParameters(ZSTD_DCtx* dctx, const ZSTD_DDict* ddict);
+
+
+
+#endif /* ZSTD_DDICT_H */
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/decompress/zstd_decompress_block.c mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/decompress/zstd_decompress_block.c
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/decompress/zstd_decompress_block.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/decompress/zstd_decompress_block.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,1548 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+/* zstd_decompress_block :
+ * this module takes care of decompressing _compressed_ block */
+
+/*-*******************************************************
+*  Dependencies
+*********************************************************/
+#include "../common/zstd_deps.h"   /* ZSTD_memcpy, ZSTD_memmove, ZSTD_memset */
+#include "../common/compiler.h"    /* prefetch */
+#include "../common/cpu.h"         /* bmi2 */
+#include "../common/mem.h"         /* low level memory routines */
+#define FSE_STATIC_LINKING_ONLY
+#include "../common/fse.h"
+#define HUF_STATIC_LINKING_ONLY
+#include "../common/huf.h"
+#include "../common/zstd_internal.h"
+#include "zstd_decompress_internal.h"   /* ZSTD_DCtx */
+#include "zstd_ddict.h"  /* ZSTD_DDictDictContent */
+#include "zstd_decompress_block.h"
+
+/*_*******************************************************
+*  Macros
+**********************************************************/
+
+/* These two optional macros force the use one way or another of the two
+ * ZSTD_decompressSequences implementations. You can't force in both directions
+ * at the same time.
+ */
+#if defined(ZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT) && \
+    defined(ZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG)
+#error "Cannot force the use of the short and the long ZSTD_decompressSequences variants!"
+#endif
+
+
+/*_*******************************************************
+*  Memory operations
+**********************************************************/
+static void ZSTD_copy4(void* dst, const void* src) { ZSTD_memcpy(dst, src, 4); }
+
+
+/*-*************************************************************
+ *   Block decoding
+ ***************************************************************/
+
+/*! ZSTD_getcBlockSize() :
+ *  Provides the size of compressed block from block header `src` */
+size_t ZSTD_getcBlockSize(const void* src, size_t srcSize,
+                          blockProperties_t* bpPtr)
+{
+    RETURN_ERROR_IF(srcSize < ZSTD_blockHeaderSize, srcSize_wrong, "");
+
+    {   U32 const cBlockHeader = MEM_readLE24(src);
+        U32 const cSize = cBlockHeader >> 3;
+        bpPtr->lastBlock = cBlockHeader & 1;
+        bpPtr->blockType = (blockType_e)((cBlockHeader >> 1) & 3);
+        bpPtr->origSize = cSize;   /* only useful for RLE */
+        if (bpPtr->blockType == bt_rle) return 1;
+        RETURN_ERROR_IF(bpPtr->blockType == bt_reserved, corruption_detected, "");
+        return cSize;
+    }
+}
+
+
+/* Hidden declaration for fullbench */
+size_t ZSTD_decodeLiteralsBlock(ZSTD_DCtx* dctx,
+                          const void* src, size_t srcSize);
+/*! ZSTD_decodeLiteralsBlock() :
+ * @return : nb of bytes read from src (< srcSize )
+ *  note : symbol not declared but exposed for fullbench */
+size_t ZSTD_decodeLiteralsBlock(ZSTD_DCtx* dctx,
+                          const void* src, size_t srcSize)   /* note : srcSize < BLOCKSIZE */
+{
+    DEBUGLOG(5, "ZSTD_decodeLiteralsBlock");
+    RETURN_ERROR_IF(srcSize < MIN_CBLOCK_SIZE, corruption_detected, "");
+
+    {   const BYTE* const istart = (const BYTE*) src;
+        symbolEncodingType_e const litEncType = (symbolEncodingType_e)(istart[0] & 3);
+
+        switch(litEncType)
+        {
+        case set_repeat:
+            DEBUGLOG(5, "set_repeat flag : re-using stats from previous compressed literals block");
+            RETURN_ERROR_IF(dctx->litEntropy==0, dictionary_corrupted, "");
+            /* fall-through */
+
+        case set_compressed:
+            RETURN_ERROR_IF(srcSize < 5, corruption_detected, "srcSize >= MIN_CBLOCK_SIZE == 3; here we need up to 5 for case 3");
+            {   size_t lhSize, litSize, litCSize;
+                U32 singleStream=0;
+                U32 const lhlCode = (istart[0] >> 2) & 3;
+                U32 const lhc = MEM_readLE32(istart);
+                size_t hufSuccess;
+                switch(lhlCode)
+                {
+                case 0: case 1: default:   /* note : default is impossible, since lhlCode into [0..3] */
+                    /* 2 - 2 - 10 - 10 */
+                    singleStream = !lhlCode;
+                    lhSize = 3;
+                    litSize  = (lhc >> 4) & 0x3FF;
+                    litCSize = (lhc >> 14) & 0x3FF;
+                    break;
+                case 2:
+                    /* 2 - 2 - 14 - 14 */
+                    lhSize = 4;
+                    litSize  = (lhc >> 4) & 0x3FFF;
+                    litCSize = lhc >> 18;
+                    break;
+                case 3:
+                    /* 2 - 2 - 18 - 18 */
+                    lhSize = 5;
+                    litSize  = (lhc >> 4) & 0x3FFFF;
+                    litCSize = (lhc >> 22) + ((size_t)istart[4] << 10);
+                    break;
+                }
+                RETURN_ERROR_IF(litSize > ZSTD_BLOCKSIZE_MAX, corruption_detected, "");
+                RETURN_ERROR_IF(litCSize + lhSize > srcSize, corruption_detected, "");
+
+                /* prefetch huffman table if cold */
+                if (dctx->ddictIsCold && (litSize > 768 /* heuristic */)) {
+                    PREFETCH_AREA(dctx->HUFptr, sizeof(dctx->entropy.hufTable));
+                }
+
+                if (litEncType==set_repeat) {
+                    if (singleStream) {
+                        hufSuccess = HUF_decompress1X_usingDTable_bmi2(
+                            dctx->litBuffer, litSize, istart+lhSize, litCSize,
+                            dctx->HUFptr, dctx->bmi2);
+                    } else {
+                        hufSuccess = HUF_decompress4X_usingDTable_bmi2(
+                            dctx->litBuffer, litSize, istart+lhSize, litCSize,
+                            dctx->HUFptr, dctx->bmi2);
+                    }
+                } else {
+                    if (singleStream) {
+#if defined(HUF_FORCE_DECOMPRESS_X2)
+                        hufSuccess = HUF_decompress1X_DCtx_wksp(
+                            dctx->entropy.hufTable, dctx->litBuffer, litSize,
+                            istart+lhSize, litCSize, dctx->workspace,
+                            sizeof(dctx->workspace));
+#else
+                        hufSuccess = HUF_decompress1X1_DCtx_wksp_bmi2(
+                            dctx->entropy.hufTable, dctx->litBuffer, litSize,
+                            istart+lhSize, litCSize, dctx->workspace,
+                            sizeof(dctx->workspace), dctx->bmi2);
+#endif
+                    } else {
+                        hufSuccess = HUF_decompress4X_hufOnly_wksp_bmi2(
+                            dctx->entropy.hufTable, dctx->litBuffer, litSize,
+                            istart+lhSize, litCSize, dctx->workspace,
+                            sizeof(dctx->workspace), dctx->bmi2);
+                    }
+                }
+
+                RETURN_ERROR_IF(HUF_isError(hufSuccess), corruption_detected, "");
+
+                dctx->litPtr = dctx->litBuffer;
+                dctx->litSize = litSize;
+                dctx->litEntropy = 1;
+                if (litEncType==set_compressed) dctx->HUFptr = dctx->entropy.hufTable;
+                ZSTD_memset(dctx->litBuffer + dctx->litSize, 0, WILDCOPY_OVERLENGTH);
+                return litCSize + lhSize;
+            }
+
+        case set_basic:
+            {   size_t litSize, lhSize;
+                U32 const lhlCode = ((istart[0]) >> 2) & 3;
+                switch(lhlCode)
+                {
+                case 0: case 2: default:   /* note : default is impossible, since lhlCode into [0..3] */
+                    lhSize = 1;
+                    litSize = istart[0] >> 3;
+                    break;
+                case 1:
+                    lhSize = 2;
+                    litSize = MEM_readLE16(istart) >> 4;
+                    break;
+                case 3:
+                    lhSize = 3;
+                    litSize = MEM_readLE24(istart) >> 4;
+                    break;
+                }
+
+                if (lhSize+litSize+WILDCOPY_OVERLENGTH > srcSize) {  /* risk reading beyond src buffer with wildcopy */
+                    RETURN_ERROR_IF(litSize+lhSize > srcSize, corruption_detected, "");
+                    ZSTD_memcpy(dctx->litBuffer, istart+lhSize, litSize);
+                    dctx->litPtr = dctx->litBuffer;
+                    dctx->litSize = litSize;
+                    ZSTD_memset(dctx->litBuffer + dctx->litSize, 0, WILDCOPY_OVERLENGTH);
+                    return lhSize+litSize;
+                }
+                /* direct reference into compressed stream */
+                dctx->litPtr = istart+lhSize;
+                dctx->litSize = litSize;
+                return lhSize+litSize;
+            }
+
+        case set_rle:
+            {   U32 const lhlCode = ((istart[0]) >> 2) & 3;
+                size_t litSize, lhSize;
+                switch(lhlCode)
+                {
+                case 0: case 2: default:   /* note : default is impossible, since lhlCode into [0..3] */
+                    lhSize = 1;
+                    litSize = istart[0] >> 3;
+                    break;
+                case 1:
+                    lhSize = 2;
+                    litSize = MEM_readLE16(istart) >> 4;
+                    break;
+                case 3:
+                    lhSize = 3;
+                    litSize = MEM_readLE24(istart) >> 4;
+                    RETURN_ERROR_IF(srcSize<4, corruption_detected, "srcSize >= MIN_CBLOCK_SIZE == 3; here we need lhSize+1 = 4");
+                    break;
+                }
+                RETURN_ERROR_IF(litSize > ZSTD_BLOCKSIZE_MAX, corruption_detected, "");
+                ZSTD_memset(dctx->litBuffer, istart[lhSize], litSize + WILDCOPY_OVERLENGTH);
+                dctx->litPtr = dctx->litBuffer;
+                dctx->litSize = litSize;
+                return lhSize+1;
+            }
+        default:
+            RETURN_ERROR(corruption_detected, "impossible");
+        }
+    }
+}
+
+/* Default FSE distribution tables.
+ * These are pre-calculated FSE decoding tables using default distributions as defined in specification :
+ * https://github.com/facebook/zstd/blob/release/doc/zstd_compression_format.md#default-distributions
+ * They were generated programmatically with following method :
+ * - start from default distributions, present in /lib/common/zstd_internal.h
+ * - generate tables normally, using ZSTD_buildFSETable()
+ * - printout the content of tables
+ * - pretify output, report below, test with fuzzer to ensure it's correct */
+
+/* Default FSE distribution table for Literal Lengths */
+static const ZSTD_seqSymbol LL_defaultDTable[(1<<LL_DEFAULTNORMLOG)+1] = {
+     {  1,  1,  1, LL_DEFAULTNORMLOG},  /* header : fastMode, tableLog */
+     /* nextState, nbAddBits, nbBits, baseVal */
+     {  0,  0,  4,    0},  { 16,  0,  4,    0},
+     { 32,  0,  5,    1},  {  0,  0,  5,    3},
+     {  0,  0,  5,    4},  {  0,  0,  5,    6},
+     {  0,  0,  5,    7},  {  0,  0,  5,    9},
+     {  0,  0,  5,   10},  {  0,  0,  5,   12},
+     {  0,  0,  6,   14},  {  0,  1,  5,   16},
+     {  0,  1,  5,   20},  {  0,  1,  5,   22},
+     {  0,  2,  5,   28},  {  0,  3,  5,   32},
+     {  0,  4,  5,   48},  { 32,  6,  5,   64},
+     {  0,  7,  5,  128},  {  0,  8,  6,  256},
+     {  0, 10,  6, 1024},  {  0, 12,  6, 4096},
+     { 32,  0,  4,    0},  {  0,  0,  4,    1},
+     {  0,  0,  5,    2},  { 32,  0,  5,    4},
+     {  0,  0,  5,    5},  { 32,  0,  5,    7},
+     {  0,  0,  5,    8},  { 32,  0,  5,   10},
+     {  0,  0,  5,   11},  {  0,  0,  6,   13},
+     { 32,  1,  5,   16},  {  0,  1,  5,   18},
+     { 32,  1,  5,   22},  {  0,  2,  5,   24},
+     { 32,  3,  5,   32},  {  0,  3,  5,   40},
+     {  0,  6,  4,   64},  { 16,  6,  4,   64},
+     { 32,  7,  5,  128},  {  0,  9,  6,  512},
+     {  0, 11,  6, 2048},  { 48,  0,  4,    0},
+     { 16,  0,  4,    1},  { 32,  0,  5,    2},
+     { 32,  0,  5,    3},  { 32,  0,  5,    5},
+     { 32,  0,  5,    6},  { 32,  0,  5,    8},
+     { 32,  0,  5,    9},  { 32,  0,  5,   11},
+     { 32,  0,  5,   12},  {  0,  0,  6,   15},
+     { 32,  1,  5,   18},  { 32,  1,  5,   20},
+     { 32,  2,  5,   24},  { 32,  2,  5,   28},
+     { 32,  3,  5,   40},  { 32,  4,  5,   48},
+     {  0, 16,  6,65536},  {  0, 15,  6,32768},
+     {  0, 14,  6,16384},  {  0, 13,  6, 8192},
+};   /* LL_defaultDTable */
+
+/* Default FSE distribution table for Offset Codes */
+static const ZSTD_seqSymbol OF_defaultDTable[(1<<OF_DEFAULTNORMLOG)+1] = {
+    {  1,  1,  1, OF_DEFAULTNORMLOG},  /* header : fastMode, tableLog */
+    /* nextState, nbAddBits, nbBits, baseVal */
+    {  0,  0,  5,    0},     {  0,  6,  4,   61},
+    {  0,  9,  5,  509},     {  0, 15,  5,32765},
+    {  0, 21,  5,2097149},   {  0,  3,  5,    5},
+    {  0,  7,  4,  125},     {  0, 12,  5, 4093},
+    {  0, 18,  5,262141},    {  0, 23,  5,8388605},
+    {  0,  5,  5,   29},     {  0,  8,  4,  253},
+    {  0, 14,  5,16381},     {  0, 20,  5,1048573},
+    {  0,  2,  5,    1},     { 16,  7,  4,  125},
+    {  0, 11,  5, 2045},     {  0, 17,  5,131069},
+    {  0, 22,  5,4194301},   {  0,  4,  5,   13},
+    { 16,  8,  4,  253},     {  0, 13,  5, 8189},
+    {  0, 19,  5,524285},    {  0,  1,  5,    1},
+    { 16,  6,  4,   61},     {  0, 10,  5, 1021},
+    {  0, 16,  5,65533},     {  0, 28,  5,268435453},
+    {  0, 27,  5,134217725}, {  0, 26,  5,67108861},
+    {  0, 25,  5,33554429},  {  0, 24,  5,16777213},
+};   /* OF_defaultDTable */
+
+
+/* Default FSE distribution table for Match Lengths */
+static const ZSTD_seqSymbol ML_defaultDTable[(1<<ML_DEFAULTNORMLOG)+1] = {
+    {  1,  1,  1, ML_DEFAULTNORMLOG},  /* header : fastMode, tableLog */
+    /* nextState, nbAddBits, nbBits, baseVal */
+    {  0,  0,  6,    3},  {  0,  0,  4,    4},
+    { 32,  0,  5,    5},  {  0,  0,  5,    6},
+    {  0,  0,  5,    8},  {  0,  0,  5,    9},
+    {  0,  0,  5,   11},  {  0,  0,  6,   13},
+    {  0,  0,  6,   16},  {  0,  0,  6,   19},
+    {  0,  0,  6,   22},  {  0,  0,  6,   25},
+    {  0,  0,  6,   28},  {  0,  0,  6,   31},
+    {  0,  0,  6,   34},  {  0,  1,  6,   37},
+    {  0,  1,  6,   41},  {  0,  2,  6,   47},
+    {  0,  3,  6,   59},  {  0,  4,  6,   83},
+    {  0,  7,  6,  131},  {  0,  9,  6,  515},
+    { 16,  0,  4,    4},  {  0,  0,  4,    5},
+    { 32,  0,  5,    6},  {  0,  0,  5,    7},
+    { 32,  0,  5,    9},  {  0,  0,  5,   10},
+    {  0,  0,  6,   12},  {  0,  0,  6,   15},
+    {  0,  0,  6,   18},  {  0,  0,  6,   21},
+    {  0,  0,  6,   24},  {  0,  0,  6,   27},
+    {  0,  0,  6,   30},  {  0,  0,  6,   33},
+    {  0,  1,  6,   35},  {  0,  1,  6,   39},
+    {  0,  2,  6,   43},  {  0,  3,  6,   51},
+    {  0,  4,  6,   67},  {  0,  5,  6,   99},
+    {  0,  8,  6,  259},  { 32,  0,  4,    4},
+    { 48,  0,  4,    4},  { 16,  0,  4,    5},
+    { 32,  0,  5,    7},  { 32,  0,  5,    8},
+    { 32,  0,  5,   10},  { 32,  0,  5,   11},
+    {  0,  0,  6,   14},  {  0,  0,  6,   17},
+    {  0,  0,  6,   20},  {  0,  0,  6,   23},
+    {  0,  0,  6,   26},  {  0,  0,  6,   29},
+    {  0,  0,  6,   32},  {  0, 16,  6,65539},
+    {  0, 15,  6,32771},  {  0, 14,  6,16387},
+    {  0, 13,  6, 8195},  {  0, 12,  6, 4099},
+    {  0, 11,  6, 2051},  {  0, 10,  6, 1027},
+};   /* ML_defaultDTable */
+
+
+static void ZSTD_buildSeqTable_rle(ZSTD_seqSymbol* dt, U32 baseValue, U32 nbAddBits)
+{
+    void* ptr = dt;
+    ZSTD_seqSymbol_header* const DTableH = (ZSTD_seqSymbol_header*)ptr;
+    ZSTD_seqSymbol* const cell = dt + 1;
+
+    DTableH->tableLog = 0;
+    DTableH->fastMode = 0;
+
+    cell->nbBits = 0;
+    cell->nextState = 0;
+    assert(nbAddBits < 255);
+    cell->nbAdditionalBits = (BYTE)nbAddBits;
+    cell->baseValue = baseValue;
+}
+
+
+/* ZSTD_buildFSETable() :
+ * generate FSE decoding table for one symbol (ll, ml or off)
+ * cannot fail if input is valid =>
+ * all inputs are presumed validated at this stage */
+FORCE_INLINE_TEMPLATE
+void ZSTD_buildFSETable_body(ZSTD_seqSymbol* dt,
+            const short* normalizedCounter, unsigned maxSymbolValue,
+            const U32* baseValue, const U32* nbAdditionalBits,
+            unsigned tableLog, void* wksp, size_t wkspSize)
+{
+    ZSTD_seqSymbol* const tableDecode = dt+1;
+    U32 const maxSV1 = maxSymbolValue + 1;
+    U32 const tableSize = 1 << tableLog;
+
+    U16* symbolNext = (U16*)wksp;
+    BYTE* spread = (BYTE*)(symbolNext + MaxSeq + 1);
+    U32 highThreshold = tableSize - 1;
+
+
+    /* Sanity Checks */
+    assert(maxSymbolValue <= MaxSeq);
+    assert(tableLog <= MaxFSELog);
+    assert(wkspSize >= ZSTD_BUILD_FSE_TABLE_WKSP_SIZE);
+    (void)wkspSize;
+    /* Init, lay down lowprob symbols */
+    {   ZSTD_seqSymbol_header DTableH;
+        DTableH.tableLog = tableLog;
+        DTableH.fastMode = 1;
+        {   S16 const largeLimit= (S16)(1 << (tableLog-1));
+            U32 s;
+            for (s=0; s<maxSV1; s++) {
+                if (normalizedCounter[s]==-1) {
+                    tableDecode[highThreshold--].baseValue = s;
+                    symbolNext[s] = 1;
+                } else {
+                    if (normalizedCounter[s] >= largeLimit) DTableH.fastMode=0;
+                    assert(normalizedCounter[s]>=0);
+                    symbolNext[s] = (U16)normalizedCounter[s];
+        }   }   }
+        ZSTD_memcpy(dt, &DTableH, sizeof(DTableH));
+    }
+
+    /* Spread symbols */
+    assert(tableSize <= 512);
+    /* Specialized symbol spreading for the case when there are
+     * no low probability (-1 count) symbols. When compressing
+     * small blocks we avoid low probability symbols to hit this
+     * case, since header decoding speed matters more.
+     */
+    if (highThreshold == tableSize - 1) {
+        size_t const tableMask = tableSize-1;
+        size_t const step = FSE_TABLESTEP(tableSize);
+        /* First lay down the symbols in order.
+         * We use a uint64_t to lay down 8 bytes at a time. This reduces branch
+         * misses since small blocks generally have small table logs, so nearly
+         * all symbols have counts <= 8. We ensure we have 8 bytes at the end of
+         * our buffer to handle the over-write.
+         */
+        {
+            U64 const add = 0x0101010101010101ull;
+            size_t pos = 0;
+            U64 sv = 0;
+            U32 s;
+            for (s=0; s<maxSV1; ++s, sv += add) {
+                int i;
+                int const n = normalizedCounter[s];
+                MEM_write64(spread + pos, sv);
+                for (i = 8; i < n; i += 8) {
+                    MEM_write64(spread + pos + i, sv);
+                }
+                pos += n;
+            }
+        }
+        /* Now we spread those positions across the table.
+         * The benefit of doing it in two stages is that we avoid the the
+         * variable size inner loop, which caused lots of branch misses.
+         * Now we can run through all the positions without any branch misses.
+         * We unroll the loop twice, since that is what emperically worked best.
+         */
+        {
+            size_t position = 0;
+            size_t s;
+            size_t const unroll = 2;
+            assert(tableSize % unroll == 0); /* FSE_MIN_TABLELOG is 5 */
+            for (s = 0; s < (size_t)tableSize; s += unroll) {
+                size_t u;
+                for (u = 0; u < unroll; ++u) {
+                    size_t const uPosition = (position + (u * step)) & tableMask;
+                    tableDecode[uPosition].baseValue = spread[s + u];
+                }
+                position = (position + (unroll * step)) & tableMask;
+            }
+            assert(position == 0);
+        }
+    } else {
+        U32 const tableMask = tableSize-1;
+        U32 const step = FSE_TABLESTEP(tableSize);
+        U32 s, position = 0;
+        for (s=0; s<maxSV1; s++) {
+            int i;
+            int const n = normalizedCounter[s];
+            for (i=0; i<n; i++) {
+                tableDecode[position].baseValue = s;
+                position = (position + step) & tableMask;
+                while (position > highThreshold) position = (position + step) & tableMask;   /* lowprob area */
+        }   }
+        assert(position == 0); /* position must reach all cells once, otherwise normalizedCounter is incorrect */
+    }
+
+    /* Build Decoding table */
+    {
+        U32 u;
+        for (u=0; u<tableSize; u++) {
+            U32 const symbol = tableDecode[u].baseValue;
+            U32 const nextState = symbolNext[symbol]++;
+            tableDecode[u].nbBits = (BYTE) (tableLog - BIT_highbit32(nextState) );
+            tableDecode[u].nextState = (U16) ( (nextState << tableDecode[u].nbBits) - tableSize);
+            assert(nbAdditionalBits[symbol] < 255);
+            tableDecode[u].nbAdditionalBits = (BYTE)nbAdditionalBits[symbol];
+            tableDecode[u].baseValue = baseValue[symbol];
+        }
+    }
+}
+
+/* Avoids the FORCE_INLINE of the _body() function. */
+static void ZSTD_buildFSETable_body_default(ZSTD_seqSymbol* dt,
+            const short* normalizedCounter, unsigned maxSymbolValue,
+            const U32* baseValue, const U32* nbAdditionalBits,
+            unsigned tableLog, void* wksp, size_t wkspSize)
+{
+    ZSTD_buildFSETable_body(dt, normalizedCounter, maxSymbolValue,
+            baseValue, nbAdditionalBits, tableLog, wksp, wkspSize);
+}
+
+#if DYNAMIC_BMI2
+TARGET_ATTRIBUTE("bmi2") static void ZSTD_buildFSETable_body_bmi2(ZSTD_seqSymbol* dt,
+            const short* normalizedCounter, unsigned maxSymbolValue,
+            const U32* baseValue, const U32* nbAdditionalBits,
+            unsigned tableLog, void* wksp, size_t wkspSize)
+{
+    ZSTD_buildFSETable_body(dt, normalizedCounter, maxSymbolValue,
+            baseValue, nbAdditionalBits, tableLog, wksp, wkspSize);
+}
+#endif
+
+void ZSTD_buildFSETable(ZSTD_seqSymbol* dt,
+            const short* normalizedCounter, unsigned maxSymbolValue,
+            const U32* baseValue, const U32* nbAdditionalBits,
+            unsigned tableLog, void* wksp, size_t wkspSize, int bmi2)
+{
+#if DYNAMIC_BMI2
+    if (bmi2) {
+        ZSTD_buildFSETable_body_bmi2(dt, normalizedCounter, maxSymbolValue,
+                baseValue, nbAdditionalBits, tableLog, wksp, wkspSize);
+        return;
+    }
+#endif
+    (void)bmi2;
+    ZSTD_buildFSETable_body_default(dt, normalizedCounter, maxSymbolValue,
+            baseValue, nbAdditionalBits, tableLog, wksp, wkspSize);
+}
+
+
+/*! ZSTD_buildSeqTable() :
+ * @return : nb bytes read from src,
+ *           or an error code if it fails */
+static size_t ZSTD_buildSeqTable(ZSTD_seqSymbol* DTableSpace, const ZSTD_seqSymbol** DTablePtr,
+                                 symbolEncodingType_e type, unsigned max, U32 maxLog,
+                                 const void* src, size_t srcSize,
+                                 const U32* baseValue, const U32* nbAdditionalBits,
+                                 const ZSTD_seqSymbol* defaultTable, U32 flagRepeatTable,
+                                 int ddictIsCold, int nbSeq, U32* wksp, size_t wkspSize,
+                                 int bmi2)
+{
+    switch(type)
+    {
+    case set_rle :
+        RETURN_ERROR_IF(!srcSize, srcSize_wrong, "");
+        RETURN_ERROR_IF((*(const BYTE*)src) > max, corruption_detected, "");
+        {   U32 const symbol = *(const BYTE*)src;
+            U32 const baseline = baseValue[symbol];
+            U32 const nbBits = nbAdditionalBits[symbol];
+            ZSTD_buildSeqTable_rle(DTableSpace, baseline, nbBits);
+        }
+        *DTablePtr = DTableSpace;
+        return 1;
+    case set_basic :
+        *DTablePtr = defaultTable;
+        return 0;
+    case set_repeat:
+        RETURN_ERROR_IF(!flagRepeatTable, corruption_detected, "");
+        /* prefetch FSE table if used */
+        if (ddictIsCold && (nbSeq > 24 /* heuristic */)) {
+            const void* const pStart = *DTablePtr;
+            size_t const pSize = sizeof(ZSTD_seqSymbol) * (SEQSYMBOL_TABLE_SIZE(maxLog));
+            PREFETCH_AREA(pStart, pSize);
+        }
+        return 0;
+    case set_compressed :
+        {   unsigned tableLog;
+            S16 norm[MaxSeq+1];
+            size_t const headerSize = FSE_readNCount(norm, &max, &tableLog, src, srcSize);
+            RETURN_ERROR_IF(FSE_isError(headerSize), corruption_detected, "");
+            RETURN_ERROR_IF(tableLog > maxLog, corruption_detected, "");
+            ZSTD_buildFSETable(DTableSpace, norm, max, baseValue, nbAdditionalBits, tableLog, wksp, wkspSize, bmi2);
+            *DTablePtr = DTableSpace;
+            return headerSize;
+        }
+    default :
+        assert(0);
+        RETURN_ERROR(GENERIC, "impossible");
+    }
+}
+
+size_t ZSTD_decodeSeqHeaders(ZSTD_DCtx* dctx, int* nbSeqPtr,
+                             const void* src, size_t srcSize)
+{
+    const BYTE* const istart = (const BYTE*)src;
+    const BYTE* const iend = istart + srcSize;
+    const BYTE* ip = istart;
+    int nbSeq;
+    DEBUGLOG(5, "ZSTD_decodeSeqHeaders");
+
+    /* check */
+    RETURN_ERROR_IF(srcSize < MIN_SEQUENCES_SIZE, srcSize_wrong, "");
+
+    /* SeqHead */
+    nbSeq = *ip++;
+    if (!nbSeq) {
+        *nbSeqPtr=0;
+        RETURN_ERROR_IF(srcSize != 1, srcSize_wrong, "");
+        return 1;
+    }
+    if (nbSeq > 0x7F) {
+        if (nbSeq == 0xFF) {
+            RETURN_ERROR_IF(ip+2 > iend, srcSize_wrong, "");
+            nbSeq = MEM_readLE16(ip) + LONGNBSEQ;
+            ip+=2;
+        } else {
+            RETURN_ERROR_IF(ip >= iend, srcSize_wrong, "");
+            nbSeq = ((nbSeq-0x80)<<8) + *ip++;
+        }
+    }
+    *nbSeqPtr = nbSeq;
+
+    /* FSE table descriptors */
+    RETURN_ERROR_IF(ip+1 > iend, srcSize_wrong, ""); /* minimum possible size: 1 byte for symbol encoding types */
+    {   symbolEncodingType_e const LLtype = (symbolEncodingType_e)(*ip >> 6);
+        symbolEncodingType_e const OFtype = (symbolEncodingType_e)((*ip >> 4) & 3);
+        symbolEncodingType_e const MLtype = (symbolEncodingType_e)((*ip >> 2) & 3);
+        ip++;
+
+        /* Build DTables */
+        {   size_t const llhSize = ZSTD_buildSeqTable(dctx->entropy.LLTable, &dctx->LLTptr,
+                                                      LLtype, MaxLL, LLFSELog,
+                                                      ip, iend-ip,
+                                                      LL_base, LL_bits,
+                                                      LL_defaultDTable, dctx->fseEntropy,
+                                                      dctx->ddictIsCold, nbSeq,
+                                                      dctx->workspace, sizeof(dctx->workspace),
+                                                      dctx->bmi2);
+            RETURN_ERROR_IF(ZSTD_isError(llhSize), corruption_detected, "ZSTD_buildSeqTable failed");
+            ip += llhSize;
+        }
+
+        {   size_t const ofhSize = ZSTD_buildSeqTable(dctx->entropy.OFTable, &dctx->OFTptr,
+                                                      OFtype, MaxOff, OffFSELog,
+                                                      ip, iend-ip,
+                                                      OF_base, OF_bits,
+                                                      OF_defaultDTable, dctx->fseEntropy,
+                                                      dctx->ddictIsCold, nbSeq,
+                                                      dctx->workspace, sizeof(dctx->workspace),
+                                                      dctx->bmi2);
+            RETURN_ERROR_IF(ZSTD_isError(ofhSize), corruption_detected, "ZSTD_buildSeqTable failed");
+            ip += ofhSize;
+        }
+
+        {   size_t const mlhSize = ZSTD_buildSeqTable(dctx->entropy.MLTable, &dctx->MLTptr,
+                                                      MLtype, MaxML, MLFSELog,
+                                                      ip, iend-ip,
+                                                      ML_base, ML_bits,
+                                                      ML_defaultDTable, dctx->fseEntropy,
+                                                      dctx->ddictIsCold, nbSeq,
+                                                      dctx->workspace, sizeof(dctx->workspace),
+                                                      dctx->bmi2);
+            RETURN_ERROR_IF(ZSTD_isError(mlhSize), corruption_detected, "ZSTD_buildSeqTable failed");
+            ip += mlhSize;
+        }
+    }
+
+    return ip-istart;
+}
+
+
+typedef struct {
+    size_t litLength;
+    size_t matchLength;
+    size_t offset;
+} seq_t;
+
+typedef struct {
+    size_t state;
+    const ZSTD_seqSymbol* table;
+} ZSTD_fseState;
+
+typedef struct {
+    BIT_DStream_t DStream;
+    ZSTD_fseState stateLL;
+    ZSTD_fseState stateOffb;
+    ZSTD_fseState stateML;
+    size_t prevOffset[ZSTD_REP_NUM];
+} seqState_t;
+
+/*! ZSTD_overlapCopy8() :
+ *  Copies 8 bytes from ip to op and updates op and ip where ip <= op.
+ *  If the offset is < 8 then the offset is spread to at least 8 bytes.
+ *
+ *  Precondition: *ip <= *op
+ *  Postcondition: *op - *op >= 8
+ */
+HINT_INLINE void ZSTD_overlapCopy8(BYTE** op, BYTE const** ip, size_t offset) {
+    assert(*ip <= *op);
+    if (offset < 8) {
+        /* close range match, overlap */
+        static const U32 dec32table[] = { 0, 1, 2, 1, 4, 4, 4, 4 };   /* added */
+        static const int dec64table[] = { 8, 8, 8, 7, 8, 9,10,11 };   /* subtracted */
+        int const sub2 = dec64table[offset];
+        (*op)[0] = (*ip)[0];
+        (*op)[1] = (*ip)[1];
+        (*op)[2] = (*ip)[2];
+        (*op)[3] = (*ip)[3];
+        *ip += dec32table[offset];
+        ZSTD_copy4(*op+4, *ip);
+        *ip -= sub2;
+    } else {
+        ZSTD_copy8(*op, *ip);
+    }
+    *ip += 8;
+    *op += 8;
+    assert(*op - *ip >= 8);
+}
+
+/*! ZSTD_safecopy() :
+ *  Specialized version of memcpy() that is allowed to READ up to WILDCOPY_OVERLENGTH past the input buffer
+ *  and write up to 16 bytes past oend_w (op >= oend_w is allowed).
+ *  This function is only called in the uncommon case where the sequence is near the end of the block. It
+ *  should be fast for a single long sequence, but can be slow for several short sequences.
+ *
+ *  @param ovtype controls the overlap detection
+ *         - ZSTD_no_overlap: The source and destination are guaranteed to be at least WILDCOPY_VECLEN bytes apart.
+ *         - ZSTD_overlap_src_before_dst: The src and dst may overlap and may be any distance apart.
+ *           The src buffer must be before the dst buffer.
+ */
+static void ZSTD_safecopy(BYTE* op, BYTE* const oend_w, BYTE const* ip, ptrdiff_t length, ZSTD_overlap_e ovtype) {
+    ptrdiff_t const diff = op - ip;
+    BYTE* const oend = op + length;
+
+    assert((ovtype == ZSTD_no_overlap && (diff <= -8 || diff >= 8 || op >= oend_w)) ||
+           (ovtype == ZSTD_overlap_src_before_dst && diff >= 0));
+
+    if (length < 8) {
+        /* Handle short lengths. */
+        while (op < oend) *op++ = *ip++;
+        return;
+    }
+    if (ovtype == ZSTD_overlap_src_before_dst) {
+        /* Copy 8 bytes and ensure the offset >= 8 when there can be overlap. */
+        assert(length >= 8);
+        ZSTD_overlapCopy8(&op, &ip, diff);
+        assert(op - ip >= 8);
+        assert(op <= oend);
+    }
+
+    if (oend <= oend_w) {
+        /* No risk of overwrite. */
+        ZSTD_wildcopy(op, ip, length, ovtype);
+        return;
+    }
+    if (op <= oend_w) {
+        /* Wildcopy until we get close to the end. */
+        assert(oend > oend_w);
+        ZSTD_wildcopy(op, ip, oend_w - op, ovtype);
+        ip += oend_w - op;
+        op = oend_w;
+    }
+    /* Handle the leftovers. */
+    while (op < oend) *op++ = *ip++;
+}
+
+/* ZSTD_execSequenceEnd():
+ * This version handles cases that are near the end of the output buffer. It requires
+ * more careful checks to make sure there is no overflow. By separating out these hard
+ * and unlikely cases, we can speed up the common cases.
+ *
+ * NOTE: This function needs to be fast for a single long sequence, but doesn't need
+ * to be optimized for many small sequences, since those fall into ZSTD_execSequence().
+ */
+FORCE_NOINLINE
+size_t ZSTD_execSequenceEnd(BYTE* op,
+                            BYTE* const oend, seq_t sequence,
+                            const BYTE** litPtr, const BYTE* const litLimit,
+                            const BYTE* const prefixStart, const BYTE* const virtualStart, const BYTE* const dictEnd)
+{
+    BYTE* const oLitEnd = op + sequence.litLength;
+    size_t const sequenceLength = sequence.litLength + sequence.matchLength;
+    const BYTE* const iLitEnd = *litPtr + sequence.litLength;
+    const BYTE* match = oLitEnd - sequence.offset;
+    BYTE* const oend_w = oend - WILDCOPY_OVERLENGTH;
+
+    /* bounds checks : careful of address space overflow in 32-bit mode */
+    RETURN_ERROR_IF(sequenceLength > (size_t)(oend - op), dstSize_tooSmall, "last match must fit within dstBuffer");
+    RETURN_ERROR_IF(sequence.litLength > (size_t)(litLimit - *litPtr), corruption_detected, "try to read beyond literal buffer");
+    assert(op < op + sequenceLength);
+    assert(oLitEnd < op + sequenceLength);
+
+    /* copy literals */
+    ZSTD_safecopy(op, oend_w, *litPtr, sequence.litLength, ZSTD_no_overlap);
+    op = oLitEnd;
+    *litPtr = iLitEnd;
+
+    /* copy Match */
+    if (sequence.offset > (size_t)(oLitEnd - prefixStart)) {
+        /* offset beyond prefix */
+        RETURN_ERROR_IF(sequence.offset > (size_t)(oLitEnd - virtualStart), corruption_detected, "");
+        match = dictEnd - (prefixStart-match);
+        if (match + sequence.matchLength <= dictEnd) {
+            ZSTD_memmove(oLitEnd, match, sequence.matchLength);
+            return sequenceLength;
+        }
+        /* span extDict & currentPrefixSegment */
+        {   size_t const length1 = dictEnd - match;
+            ZSTD_memmove(oLitEnd, match, length1);
+            op = oLitEnd + length1;
+            sequence.matchLength -= length1;
+            match = prefixStart;
+    }   }
+    ZSTD_safecopy(op, oend_w, match, sequence.matchLength, ZSTD_overlap_src_before_dst);
+    return sequenceLength;
+}
+
+HINT_INLINE
+size_t ZSTD_execSequence(BYTE* op,
+                         BYTE* const oend, seq_t sequence,
+                         const BYTE** litPtr, const BYTE* const litLimit,
+                         const BYTE* const prefixStart, const BYTE* const virtualStart, const BYTE* const dictEnd)
+{
+    BYTE* const oLitEnd = op + sequence.litLength;
+    size_t const sequenceLength = sequence.litLength + sequence.matchLength;
+    BYTE* const oMatchEnd = op + sequenceLength;   /* risk : address space overflow (32-bits) */
+    BYTE* const oend_w = oend - WILDCOPY_OVERLENGTH;   /* risk : address space underflow on oend=NULL */
+    const BYTE* const iLitEnd = *litPtr + sequence.litLength;
+    const BYTE* match = oLitEnd - sequence.offset;
+
+    assert(op != NULL /* Precondition */);
+    assert(oend_w < oend /* No underflow */);
+    /* Handle edge cases in a slow path:
+     *   - Read beyond end of literals
+     *   - Match end is within WILDCOPY_OVERLIMIT of oend
+     *   - 32-bit mode and the match length overflows
+     */
+    if (UNLIKELY(
+            iLitEnd > litLimit ||
+            oMatchEnd > oend_w ||
+            (MEM_32bits() && (size_t)(oend - op) < sequenceLength + WILDCOPY_OVERLENGTH)))
+        return ZSTD_execSequenceEnd(op, oend, sequence, litPtr, litLimit, prefixStart, virtualStart, dictEnd);
+
+    /* Assumptions (everything else goes into ZSTD_execSequenceEnd()) */
+    assert(op <= oLitEnd /* No overflow */);
+    assert(oLitEnd < oMatchEnd /* Non-zero match & no overflow */);
+    assert(oMatchEnd <= oend /* No underflow */);
+    assert(iLitEnd <= litLimit /* Literal length is in bounds */);
+    assert(oLitEnd <= oend_w /* Can wildcopy literals */);
+    assert(oMatchEnd <= oend_w /* Can wildcopy matches */);
+
+    /* Copy Literals:
+     * Split out litLength <= 16 since it is nearly always true. +1.6% on gcc-9.
+     * We likely don't need the full 32-byte wildcopy.
+     */
+    assert(WILDCOPY_OVERLENGTH >= 16);
+    ZSTD_copy16(op, (*litPtr));
+    if (UNLIKELY(sequence.litLength > 16)) {
+        ZSTD_wildcopy(op+16, (*litPtr)+16, sequence.litLength-16, ZSTD_no_overlap);
+    }
+    op = oLitEnd;
+    *litPtr = iLitEnd;   /* update for next sequence */
+
+    /* Copy Match */
+    if (sequence.offset > (size_t)(oLitEnd - prefixStart)) {
+        /* offset beyond prefix -> go into extDict */
+        RETURN_ERROR_IF(UNLIKELY(sequence.offset > (size_t)(oLitEnd - virtualStart)), corruption_detected, "");
+        match = dictEnd + (match - prefixStart);
+        if (match + sequence.matchLength <= dictEnd) {
+            ZSTD_memmove(oLitEnd, match, sequence.matchLength);
+            return sequenceLength;
+        }
+        /* span extDict & currentPrefixSegment */
+        {   size_t const length1 = dictEnd - match;
+            ZSTD_memmove(oLitEnd, match, length1);
+            op = oLitEnd + length1;
+            sequence.matchLength -= length1;
+            match = prefixStart;
+    }   }
+    /* Match within prefix of 1 or more bytes */
+    assert(op <= oMatchEnd);
+    assert(oMatchEnd <= oend_w);
+    assert(match >= prefixStart);
+    assert(sequence.matchLength >= 1);
+
+    /* Nearly all offsets are >= WILDCOPY_VECLEN bytes, which means we can use wildcopy
+     * without overlap checking.
+     */
+    if (LIKELY(sequence.offset >= WILDCOPY_VECLEN)) {
+        /* We bet on a full wildcopy for matches, since we expect matches to be
+         * longer than literals (in general). In silesia, ~10% of matches are longer
+         * than 16 bytes.
+         */
+        ZSTD_wildcopy(op, match, (ptrdiff_t)sequence.matchLength, ZSTD_no_overlap);
+        return sequenceLength;
+    }
+    assert(sequence.offset < WILDCOPY_VECLEN);
+
+    /* Copy 8 bytes and spread the offset to be >= 8. */
+    ZSTD_overlapCopy8(&op, &match, sequence.offset);
+
+    /* If the match length is > 8 bytes, then continue with the wildcopy. */
+    if (sequence.matchLength > 8) {
+        assert(op < oMatchEnd);
+        ZSTD_wildcopy(op, match, (ptrdiff_t)sequence.matchLength-8, ZSTD_overlap_src_before_dst);
+    }
+    return sequenceLength;
+}
+
+static void
+ZSTD_initFseState(ZSTD_fseState* DStatePtr, BIT_DStream_t* bitD, const ZSTD_seqSymbol* dt)
+{
+    const void* ptr = dt;
+    const ZSTD_seqSymbol_header* const DTableH = (const ZSTD_seqSymbol_header*)ptr;
+    DStatePtr->state = BIT_readBits(bitD, DTableH->tableLog);
+    DEBUGLOG(6, "ZSTD_initFseState : val=%u using %u bits",
+                (U32)DStatePtr->state, DTableH->tableLog);
+    BIT_reloadDStream(bitD);
+    DStatePtr->table = dt + 1;
+}
+
+FORCE_INLINE_TEMPLATE void
+ZSTD_updateFseState(ZSTD_fseState* DStatePtr, BIT_DStream_t* bitD)
+{
+    ZSTD_seqSymbol const DInfo = DStatePtr->table[DStatePtr->state];
+    U32 const nbBits = DInfo.nbBits;
+    size_t const lowBits = BIT_readBits(bitD, nbBits);
+    DStatePtr->state = DInfo.nextState + lowBits;
+}
+
+FORCE_INLINE_TEMPLATE void
+ZSTD_updateFseStateWithDInfo(ZSTD_fseState* DStatePtr, BIT_DStream_t* bitD, ZSTD_seqSymbol const DInfo)
+{
+    U32 const nbBits = DInfo.nbBits;
+    size_t const lowBits = BIT_readBits(bitD, nbBits);
+    DStatePtr->state = DInfo.nextState + lowBits;
+}
+
+/* We need to add at most (ZSTD_WINDOWLOG_MAX_32 - 1) bits to read the maximum
+ * offset bits. But we can only read at most (STREAM_ACCUMULATOR_MIN_32 - 1)
+ * bits before reloading. This value is the maximum number of bytes we read
+ * after reloading when we are decoding long offsets.
+ */
+#define LONG_OFFSETS_MAX_EXTRA_BITS_32                       \
+    (ZSTD_WINDOWLOG_MAX_32 > STREAM_ACCUMULATOR_MIN_32       \
+        ? ZSTD_WINDOWLOG_MAX_32 - STREAM_ACCUMULATOR_MIN_32  \
+        : 0)
+
+typedef enum { ZSTD_lo_isRegularOffset, ZSTD_lo_isLongOffset=1 } ZSTD_longOffset_e;
+
+FORCE_INLINE_TEMPLATE seq_t
+ZSTD_decodeSequence(seqState_t* seqState, const ZSTD_longOffset_e longOffsets)
+{
+    seq_t seq;
+    ZSTD_seqSymbol const llDInfo = seqState->stateLL.table[seqState->stateLL.state];
+    ZSTD_seqSymbol const mlDInfo = seqState->stateML.table[seqState->stateML.state];
+    ZSTD_seqSymbol const ofDInfo = seqState->stateOffb.table[seqState->stateOffb.state];
+    U32 const llBase = llDInfo.baseValue;
+    U32 const mlBase = mlDInfo.baseValue;
+    U32 const ofBase = ofDInfo.baseValue;
+    BYTE const llBits = llDInfo.nbAdditionalBits;
+    BYTE const mlBits = mlDInfo.nbAdditionalBits;
+    BYTE const ofBits = ofDInfo.nbAdditionalBits;
+    BYTE const totalBits = llBits+mlBits+ofBits;
+
+    /* sequence */
+    {   size_t offset;
+        if (ofBits > 1) {
+            ZSTD_STATIC_ASSERT(ZSTD_lo_isLongOffset == 1);
+            ZSTD_STATIC_ASSERT(LONG_OFFSETS_MAX_EXTRA_BITS_32 == 5);
+            assert(ofBits <= MaxOff);
+            if (MEM_32bits() && longOffsets && (ofBits >= STREAM_ACCUMULATOR_MIN_32)) {
+                U32 const extraBits = ofBits - MIN(ofBits, 32 - seqState->DStream.bitsConsumed);
+                offset = ofBase + (BIT_readBitsFast(&seqState->DStream, ofBits - extraBits) << extraBits);
+                BIT_reloadDStream(&seqState->DStream);
+                if (extraBits) offset += BIT_readBitsFast(&seqState->DStream, extraBits);
+                assert(extraBits <= LONG_OFFSETS_MAX_EXTRA_BITS_32);   /* to avoid another reload */
+            } else {
+                offset = ofBase + BIT_readBitsFast(&seqState->DStream, ofBits/*>0*/);   /* <=  (ZSTD_WINDOWLOG_MAX-1) bits */
+                if (MEM_32bits()) BIT_reloadDStream(&seqState->DStream);
+            }
+            seqState->prevOffset[2] = seqState->prevOffset[1];
+            seqState->prevOffset[1] = seqState->prevOffset[0];
+            seqState->prevOffset[0] = offset;
+        } else {
+            U32 const ll0 = (llBase == 0);
+            if (LIKELY((ofBits == 0))) {
+                if (LIKELY(!ll0))
+                    offset = seqState->prevOffset[0];
+                else {
+                    offset = seqState->prevOffset[1];
+                    seqState->prevOffset[1] = seqState->prevOffset[0];
+                    seqState->prevOffset[0] = offset;
+                }
+            } else {
+                offset = ofBase + ll0 + BIT_readBitsFast(&seqState->DStream, 1);
+                {   size_t temp = (offset==3) ? seqState->prevOffset[0] - 1 : seqState->prevOffset[offset];
+                    temp += !temp;   /* 0 is not valid; input is corrupted; force offset to 1 */
+                    if (offset != 1) seqState->prevOffset[2] = seqState->prevOffset[1];
+                    seqState->prevOffset[1] = seqState->prevOffset[0];
+                    seqState->prevOffset[0] = offset = temp;
+        }   }   }
+        seq.offset = offset;
+    }
+
+    seq.matchLength = mlBase;
+    if (mlBits > 0)
+        seq.matchLength += BIT_readBitsFast(&seqState->DStream, mlBits/*>0*/);
+
+    if (MEM_32bits() && (mlBits+llBits >= STREAM_ACCUMULATOR_MIN_32-LONG_OFFSETS_MAX_EXTRA_BITS_32))
+        BIT_reloadDStream(&seqState->DStream);
+    if (MEM_64bits() && UNLIKELY(totalBits >= STREAM_ACCUMULATOR_MIN_64-(LLFSELog+MLFSELog+OffFSELog)))
+        BIT_reloadDStream(&seqState->DStream);
+    /* Ensure there are enough bits to read the rest of data in 64-bit mode. */
+    ZSTD_STATIC_ASSERT(16+LLFSELog+MLFSELog+OffFSELog < STREAM_ACCUMULATOR_MIN_64);
+
+    seq.litLength = llBase;
+    if (llBits > 0)
+        seq.litLength += BIT_readBitsFast(&seqState->DStream, llBits/*>0*/);
+
+    if (MEM_32bits())
+        BIT_reloadDStream(&seqState->DStream);
+
+    DEBUGLOG(6, "seq: litL=%u, matchL=%u, offset=%u",
+                (U32)seq.litLength, (U32)seq.matchLength, (U32)seq.offset);
+
+    /* ANS state update
+     * gcc-9.0.0 does 2.5% worse with ZSTD_updateFseStateWithDInfo().
+     * clang-9.2.0 does 7% worse with ZSTD_updateFseState().
+     * Naturally it seems like ZSTD_updateFseStateWithDInfo() should be the
+     * better option, so it is the default for other compilers. But, if you
+     * measure that it is worse, please put up a pull request.
+     */
+    {
+#if defined(__GNUC__) && !defined(__clang__)
+        const int kUseUpdateFseState = 1;
+#else
+        const int kUseUpdateFseState = 0;
+#endif
+        if (kUseUpdateFseState) {
+            ZSTD_updateFseState(&seqState->stateLL, &seqState->DStream);    /* <=  9 bits */
+            ZSTD_updateFseState(&seqState->stateML, &seqState->DStream);    /* <=  9 bits */
+            if (MEM_32bits()) BIT_reloadDStream(&seqState->DStream);    /* <= 18 bits */
+            ZSTD_updateFseState(&seqState->stateOffb, &seqState->DStream);  /* <=  8 bits */
+        } else {
+            ZSTD_updateFseStateWithDInfo(&seqState->stateLL, &seqState->DStream, llDInfo);    /* <=  9 bits */
+            ZSTD_updateFseStateWithDInfo(&seqState->stateML, &seqState->DStream, mlDInfo);    /* <=  9 bits */
+            if (MEM_32bits()) BIT_reloadDStream(&seqState->DStream);    /* <= 18 bits */
+            ZSTD_updateFseStateWithDInfo(&seqState->stateOffb, &seqState->DStream, ofDInfo);  /* <=  8 bits */
+        }
+    }
+
+    return seq;
+}
+
+#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+MEM_STATIC int ZSTD_dictionaryIsActive(ZSTD_DCtx const* dctx, BYTE const* prefixStart, BYTE const* oLitEnd)
+{
+    size_t const windowSize = dctx->fParams.windowSize;
+    /* No dictionary used. */
+    if (dctx->dictContentEndForFuzzing == NULL) return 0;
+    /* Dictionary is our prefix. */
+    if (prefixStart == dctx->dictContentBeginForFuzzing) return 1;
+    /* Dictionary is not our ext-dict. */
+    if (dctx->dictEnd != dctx->dictContentEndForFuzzing) return 0;
+    /* Dictionary is not within our window size. */
+    if ((size_t)(oLitEnd - prefixStart) >= windowSize) return 0;
+    /* Dictionary is active. */
+    return 1;
+}
+
+MEM_STATIC void ZSTD_assertValidSequence(
+        ZSTD_DCtx const* dctx,
+        BYTE const* op, BYTE const* oend,
+        seq_t const seq,
+        BYTE const* prefixStart, BYTE const* virtualStart)
+{
+#if DEBUGLEVEL >= 1
+    size_t const windowSize = dctx->fParams.windowSize;
+    size_t const sequenceSize = seq.litLength + seq.matchLength;
+    BYTE const* const oLitEnd = op + seq.litLength;
+    DEBUGLOG(6, "Checking sequence: litL=%u matchL=%u offset=%u",
+            (U32)seq.litLength, (U32)seq.matchLength, (U32)seq.offset);
+    assert(op <= oend);
+    assert((size_t)(oend - op) >= sequenceSize);
+    assert(sequenceSize <= ZSTD_BLOCKSIZE_MAX);
+    if (ZSTD_dictionaryIsActive(dctx, prefixStart, oLitEnd)) {
+        size_t const dictSize = (size_t)((char const*)dctx->dictContentEndForFuzzing - (char const*)dctx->dictContentBeginForFuzzing);
+        /* Offset must be within the dictionary. */
+        assert(seq.offset <= (size_t)(oLitEnd - virtualStart));
+        assert(seq.offset <= windowSize + dictSize);
+    } else {
+        /* Offset must be within our window. */
+        assert(seq.offset <= windowSize);
+    }
+#else
+    (void)dctx, (void)op, (void)oend, (void)seq, (void)prefixStart, (void)virtualStart;
+#endif
+}
+#endif
+
+#ifndef ZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG
+FORCE_INLINE_TEMPLATE size_t
+DONT_VECTORIZE
+ZSTD_decompressSequences_body( ZSTD_DCtx* dctx,
+                               void* dst, size_t maxDstSize,
+                         const void* seqStart, size_t seqSize, int nbSeq,
+                         const ZSTD_longOffset_e isLongOffset,
+                         const int frame)
+{
+    const BYTE* ip = (const BYTE*)seqStart;
+    const BYTE* const iend = ip + seqSize;
+    BYTE* const ostart = (BYTE*)dst;
+    BYTE* const oend = ostart + maxDstSize;
+    BYTE* op = ostart;
+    const BYTE* litPtr = dctx->litPtr;
+    const BYTE* const litEnd = litPtr + dctx->litSize;
+    const BYTE* const prefixStart = (const BYTE*) (dctx->prefixStart);
+    const BYTE* const vBase = (const BYTE*) (dctx->virtualStart);
+    const BYTE* const dictEnd = (const BYTE*) (dctx->dictEnd);
+    DEBUGLOG(5, "ZSTD_decompressSequences_body");
+    (void)frame;
+
+    /* Regen sequences */
+    if (nbSeq) {
+        seqState_t seqState;
+        dctx->fseEntropy = 1;
+        { U32 i; for (i=0; i<ZSTD_REP_NUM; i++) seqState.prevOffset[i] = dctx->entropy.rep[i]; }
+        RETURN_ERROR_IF(
+            ERR_isError(BIT_initDStream(&seqState.DStream, ip, iend-ip)),
+            corruption_detected, "");
+        ZSTD_initFseState(&seqState.stateLL, &seqState.DStream, dctx->LLTptr);
+        ZSTD_initFseState(&seqState.stateOffb, &seqState.DStream, dctx->OFTptr);
+        ZSTD_initFseState(&seqState.stateML, &seqState.DStream, dctx->MLTptr);
+        assert(dst != NULL);
+
+        ZSTD_STATIC_ASSERT(
+                BIT_DStream_unfinished < BIT_DStream_completed &&
+                BIT_DStream_endOfBuffer < BIT_DStream_completed &&
+                BIT_DStream_completed < BIT_DStream_overflow);
+
+#if defined(__GNUC__) && defined(__x86_64__)
+        /* Align the decompression loop to 32 + 16 bytes.
+         *
+         * zstd compiled with gcc-9 on an Intel i9-9900k shows 10% decompression
+         * speed swings based on the alignment of the decompression loop. This
+         * performance swing is caused by parts of the decompression loop falling
+         * out of the DSB. The entire decompression loop should fit in the DSB,
+         * when it can't we get much worse performance. You can measure if you've
+         * hit the good case or the bad case with this perf command for some
+         * compressed file test.zst:
+         *
+         *   perf stat -e cycles -e instructions -e idq.all_dsb_cycles_any_uops \
+         *             -e idq.all_mite_cycles_any_uops -- ./zstd -tq test.zst
+         *
+         * If you see most cycles served out of the MITE you've hit the bad case.
+         * If you see most cycles served out of the DSB you've hit the good case.
+         * If it is pretty even then you may be in an okay case.
+         *
+         * This issue has been reproduced on the following CPUs:
+         *   - Kabylake: Macbook Pro (15-inch, 2019) 2.4 GHz Intel Core i9
+         *               Use Instruments->Counters to get DSB/MITE cycles.
+         *               I never got performance swings, but I was able to
+         *               go from the good case of mostly DSB to half of the
+         *               cycles served from MITE.
+         *   - Coffeelake: Intel i9-9900k
+         *   - Coffeelake: Intel i7-9700k
+         *
+         * I haven't been able to reproduce the instability or DSB misses on any
+         * of the following CPUS:
+         *   - Haswell
+         *   - Broadwell: Intel(R) Xeon(R) CPU E5-2680 v4 @ 2.40GH
+         *   - Skylake
+         *
+         * If you are seeing performance stability this script can help test.
+         * It tests on 4 commits in zstd where I saw performance change.
+         *
+         *   https://gist.github.com/terrelln/9889fc06a423fd5ca6e99351564473f4
+         */
+        __asm__(".p2align 6");
+        __asm__("nop");
+        __asm__(".p2align 5");
+        __asm__("nop");
+#  if __GNUC__ >= 9
+        /* better for gcc-9 and gcc-10, worse for clang and gcc-8 */
+        __asm__(".p2align 3");
+#  else
+        __asm__(".p2align 4");
+#  endif
+#endif
+        for ( ; ; ) {
+            seq_t const sequence = ZSTD_decodeSequence(&seqState, isLongOffset);
+            size_t const oneSeqSize = ZSTD_execSequence(op, oend, sequence, &litPtr, litEnd, prefixStart, vBase, dictEnd);
+#if defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) && defined(FUZZING_ASSERT_VALID_SEQUENCE)
+            assert(!ZSTD_isError(oneSeqSize));
+            if (frame) ZSTD_assertValidSequence(dctx, op, oend, sequence, prefixStart, vBase);
+#endif
+            if (UNLIKELY(ZSTD_isError(oneSeqSize)))
+                return oneSeqSize;
+            DEBUGLOG(6, "regenerated sequence size : %u", (U32)oneSeqSize);
+            op += oneSeqSize;
+            if (UNLIKELY(!--nbSeq))
+                break;
+            BIT_reloadDStream(&(seqState.DStream));
+        }
+
+        /* check if reached exact end */
+        DEBUGLOG(5, "ZSTD_decompressSequences_body: after decode loop, remaining nbSeq : %i", nbSeq);
+        RETURN_ERROR_IF(nbSeq, corruption_detected, "");
+        RETURN_ERROR_IF(BIT_reloadDStream(&seqState.DStream) < BIT_DStream_completed, corruption_detected, "");
+        /* save reps for next block */
+        { U32 i; for (i=0; i<ZSTD_REP_NUM; i++) dctx->entropy.rep[i] = (U32)(seqState.prevOffset[i]); }
+    }
+
+    /* last literal segment */
+    {   size_t const lastLLSize = litEnd - litPtr;
+        RETURN_ERROR_IF(lastLLSize > (size_t)(oend-op), dstSize_tooSmall, "");
+        if (op != NULL) {
+            ZSTD_memcpy(op, litPtr, lastLLSize);
+            op += lastLLSize;
+        }
+    }
+
+    return op-ostart;
+}
+
+static size_t
+ZSTD_decompressSequences_default(ZSTD_DCtx* dctx,
+                                 void* dst, size_t maxDstSize,
+                           const void* seqStart, size_t seqSize, int nbSeq,
+                           const ZSTD_longOffset_e isLongOffset,
+                           const int frame)
+{
+    return ZSTD_decompressSequences_body(dctx, dst, maxDstSize, seqStart, seqSize, nbSeq, isLongOffset, frame);
+}
+#endif /* ZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG */
+
+#ifndef ZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT
+
+FORCE_INLINE_TEMPLATE size_t
+ZSTD_prefetchMatch(size_t prefetchPos, seq_t const sequence,
+                   const BYTE* const prefixStart, const BYTE* const dictEnd)
+{
+    prefetchPos += sequence.litLength;
+    {   const BYTE* const matchBase = (sequence.offset > prefetchPos) ? dictEnd : prefixStart;
+        const BYTE* const match = matchBase + prefetchPos - sequence.offset; /* note : this operation can overflow when seq.offset is really too large, which can only happen when input is corrupted.
+                                                                              * No consequence though : memory address is only used for prefetching, not for dereferencing */
+        PREFETCH_L1(match); PREFETCH_L1(match+CACHELINE_SIZE);   /* note : it's safe to invoke PREFETCH() on any memory address, including invalid ones */
+    }
+    return prefetchPos + sequence.matchLength;
+}
+
+/* This decoding function employs prefetching
+ * to reduce latency impact of cache misses.
+ * It's generally employed when block contains a significant portion of long-distance matches
+ * or when coupled with a "cold" dictionary */
+FORCE_INLINE_TEMPLATE size_t
+ZSTD_decompressSequencesLong_body(
+                               ZSTD_DCtx* dctx,
+                               void* dst, size_t maxDstSize,
+                         const void* seqStart, size_t seqSize, int nbSeq,
+                         const ZSTD_longOffset_e isLongOffset,
+                         const int frame)
+{
+    const BYTE* ip = (const BYTE*)seqStart;
+    const BYTE* const iend = ip + seqSize;
+    BYTE* const ostart = (BYTE*)dst;
+    BYTE* const oend = ostart + maxDstSize;
+    BYTE* op = ostart;
+    const BYTE* litPtr = dctx->litPtr;
+    const BYTE* const litEnd = litPtr + dctx->litSize;
+    const BYTE* const prefixStart = (const BYTE*) (dctx->prefixStart);
+    const BYTE* const dictStart = (const BYTE*) (dctx->virtualStart);
+    const BYTE* const dictEnd = (const BYTE*) (dctx->dictEnd);
+    (void)frame;
+
+    /* Regen sequences */
+    if (nbSeq) {
+#define STORED_SEQS 8
+#define STORED_SEQS_MASK (STORED_SEQS-1)
+#define ADVANCED_SEQS STORED_SEQS
+        seq_t sequences[STORED_SEQS];
+        int const seqAdvance = MIN(nbSeq, ADVANCED_SEQS);
+        seqState_t seqState;
+        int seqNb;
+        size_t prefetchPos = (size_t)(op-prefixStart); /* track position relative to prefixStart */
+
+        dctx->fseEntropy = 1;
+        { int i; for (i=0; i<ZSTD_REP_NUM; i++) seqState.prevOffset[i] = dctx->entropy.rep[i]; }
+        assert(dst != NULL);
+        assert(iend >= ip);
+        RETURN_ERROR_IF(
+            ERR_isError(BIT_initDStream(&seqState.DStream, ip, iend-ip)),
+            corruption_detected, "");
+        ZSTD_initFseState(&seqState.stateLL, &seqState.DStream, dctx->LLTptr);
+        ZSTD_initFseState(&seqState.stateOffb, &seqState.DStream, dctx->OFTptr);
+        ZSTD_initFseState(&seqState.stateML, &seqState.DStream, dctx->MLTptr);
+
+        /* prepare in advance */
+        for (seqNb=0; (BIT_reloadDStream(&seqState.DStream) <= BIT_DStream_completed) && (seqNb<seqAdvance); seqNb++) {
+            seq_t const sequence = ZSTD_decodeSequence(&seqState, isLongOffset);
+            prefetchPos = ZSTD_prefetchMatch(prefetchPos, sequence, prefixStart, dictEnd);
+            sequences[seqNb] = sequence;
+        }
+        RETURN_ERROR_IF(seqNb<seqAdvance, corruption_detected, "");
+
+        /* decode and decompress */
+        for ( ; (BIT_reloadDStream(&(seqState.DStream)) <= BIT_DStream_completed) && (seqNb<nbSeq) ; seqNb++) {
+            seq_t const sequence = ZSTD_decodeSequence(&seqState, isLongOffset);
+            size_t const oneSeqSize = ZSTD_execSequence(op, oend, sequences[(seqNb-ADVANCED_SEQS) & STORED_SEQS_MASK], &litPtr, litEnd, prefixStart, dictStart, dictEnd);
+#if defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) && defined(FUZZING_ASSERT_VALID_SEQUENCE)
+            assert(!ZSTD_isError(oneSeqSize));
+            if (frame) ZSTD_assertValidSequence(dctx, op, oend, sequences[(seqNb-ADVANCED_SEQS) & STORED_SEQS_MASK], prefixStart, dictStart);
+#endif
+            if (ZSTD_isError(oneSeqSize)) return oneSeqSize;
+
+            prefetchPos = ZSTD_prefetchMatch(prefetchPos, sequence, prefixStart, dictEnd);
+            sequences[seqNb & STORED_SEQS_MASK] = sequence;
+            op += oneSeqSize;
+        }
+        RETURN_ERROR_IF(seqNb<nbSeq, corruption_detected, "");
+
+        /* finish queue */
+        seqNb -= seqAdvance;
+        for ( ; seqNb<nbSeq ; seqNb++) {
+            size_t const oneSeqSize = ZSTD_execSequence(op, oend, sequences[seqNb&STORED_SEQS_MASK], &litPtr, litEnd, prefixStart, dictStart, dictEnd);
+#if defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) && defined(FUZZING_ASSERT_VALID_SEQUENCE)
+            assert(!ZSTD_isError(oneSeqSize));
+            if (frame) ZSTD_assertValidSequence(dctx, op, oend, sequences[seqNb&STORED_SEQS_MASK], prefixStart, dictStart);
+#endif
+            if (ZSTD_isError(oneSeqSize)) return oneSeqSize;
+            op += oneSeqSize;
+        }
+
+        /* save reps for next block */
+        { U32 i; for (i=0; i<ZSTD_REP_NUM; i++) dctx->entropy.rep[i] = (U32)(seqState.prevOffset[i]); }
+    }
+
+    /* last literal segment */
+    {   size_t const lastLLSize = litEnd - litPtr;
+        RETURN_ERROR_IF(lastLLSize > (size_t)(oend-op), dstSize_tooSmall, "");
+        if (op != NULL) {
+            ZSTD_memcpy(op, litPtr, lastLLSize);
+            op += lastLLSize;
+        }
+    }
+
+    return op-ostart;
+}
+
+static size_t
+ZSTD_decompressSequencesLong_default(ZSTD_DCtx* dctx,
+                                 void* dst, size_t maxDstSize,
+                           const void* seqStart, size_t seqSize, int nbSeq,
+                           const ZSTD_longOffset_e isLongOffset,
+                           const int frame)
+{
+    return ZSTD_decompressSequencesLong_body(dctx, dst, maxDstSize, seqStart, seqSize, nbSeq, isLongOffset, frame);
+}
+#endif /* ZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT */
+
+
+
+#if DYNAMIC_BMI2
+
+#ifndef ZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG
+static TARGET_ATTRIBUTE("bmi2") size_t
+DONT_VECTORIZE
+ZSTD_decompressSequences_bmi2(ZSTD_DCtx* dctx,
+                                 void* dst, size_t maxDstSize,
+                           const void* seqStart, size_t seqSize, int nbSeq,
+                           const ZSTD_longOffset_e isLongOffset,
+                           const int frame)
+{
+    return ZSTD_decompressSequences_body(dctx, dst, maxDstSize, seqStart, seqSize, nbSeq, isLongOffset, frame);
+}
+#endif /* ZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG */
+
+#ifndef ZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT
+static TARGET_ATTRIBUTE("bmi2") size_t
+ZSTD_decompressSequencesLong_bmi2(ZSTD_DCtx* dctx,
+                                 void* dst, size_t maxDstSize,
+                           const void* seqStart, size_t seqSize, int nbSeq,
+                           const ZSTD_longOffset_e isLongOffset,
+                           const int frame)
+{
+    return ZSTD_decompressSequencesLong_body(dctx, dst, maxDstSize, seqStart, seqSize, nbSeq, isLongOffset, frame);
+}
+#endif /* ZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT */
+
+#endif /* DYNAMIC_BMI2 */
+
+typedef size_t (*ZSTD_decompressSequences_t)(
+                            ZSTD_DCtx* dctx,
+                            void* dst, size_t maxDstSize,
+                            const void* seqStart, size_t seqSize, int nbSeq,
+                            const ZSTD_longOffset_e isLongOffset,
+                            const int frame);
+
+#ifndef ZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG
+static size_t
+ZSTD_decompressSequences(ZSTD_DCtx* dctx, void* dst, size_t maxDstSize,
+                   const void* seqStart, size_t seqSize, int nbSeq,
+                   const ZSTD_longOffset_e isLongOffset,
+                   const int frame)
+{
+    DEBUGLOG(5, "ZSTD_decompressSequences");
+#if DYNAMIC_BMI2
+    if (dctx->bmi2) {
+        return ZSTD_decompressSequences_bmi2(dctx, dst, maxDstSize, seqStart, seqSize, nbSeq, isLongOffset, frame);
+    }
+#endif
+  return ZSTD_decompressSequences_default(dctx, dst, maxDstSize, seqStart, seqSize, nbSeq, isLongOffset, frame);
+}
+#endif /* ZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG */
+
+
+#ifndef ZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT
+/* ZSTD_decompressSequencesLong() :
+ * decompression function triggered when a minimum share of offsets is considered "long",
+ * aka out of cache.
+ * note : "long" definition seems overloaded here, sometimes meaning "wider than bitstream register", and sometimes meaning "farther than memory cache distance".
+ * This function will try to mitigate main memory latency through the use of prefetching */
+static size_t
+ZSTD_decompressSequencesLong(ZSTD_DCtx* dctx,
+                             void* dst, size_t maxDstSize,
+                             const void* seqStart, size_t seqSize, int nbSeq,
+                             const ZSTD_longOffset_e isLongOffset,
+                             const int frame)
+{
+    DEBUGLOG(5, "ZSTD_decompressSequencesLong");
+#if DYNAMIC_BMI2
+    if (dctx->bmi2) {
+        return ZSTD_decompressSequencesLong_bmi2(dctx, dst, maxDstSize, seqStart, seqSize, nbSeq, isLongOffset, frame);
+    }
+#endif
+  return ZSTD_decompressSequencesLong_default(dctx, dst, maxDstSize, seqStart, seqSize, nbSeq, isLongOffset, frame);
+}
+#endif /* ZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT */
+
+
+
+#if !defined(ZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT) && \
+    !defined(ZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG)
+/* ZSTD_getLongOffsetsShare() :
+ * condition : offTable must be valid
+ * @return : "share" of long offsets (arbitrarily defined as > (1<<23))
+ *           compared to maximum possible of (1<<OffFSELog) */
+static unsigned
+ZSTD_getLongOffsetsShare(const ZSTD_seqSymbol* offTable)
+{
+    const void* ptr = offTable;
+    U32 const tableLog = ((const ZSTD_seqSymbol_header*)ptr)[0].tableLog;
+    const ZSTD_seqSymbol* table = offTable + 1;
+    U32 const max = 1 << tableLog;
+    U32 u, total = 0;
+    DEBUGLOG(5, "ZSTD_getLongOffsetsShare: (tableLog=%u)", tableLog);
+
+    assert(max <= (1 << OffFSELog));  /* max not too large */
+    for (u=0; u<max; u++) {
+        if (table[u].nbAdditionalBits > 22) total += 1;
+    }
+
+    assert(tableLog <= OffFSELog);
+    total <<= (OffFSELog - tableLog);  /* scale to OffFSELog */
+
+    return total;
+}
+#endif
+
+size_t
+ZSTD_decompressBlock_internal(ZSTD_DCtx* dctx,
+                              void* dst, size_t dstCapacity,
+                        const void* src, size_t srcSize, const int frame)
+{   /* blockType == blockCompressed */
+    const BYTE* ip = (const BYTE*)src;
+    /* isLongOffset must be true if there are long offsets.
+     * Offsets are long if they are larger than 2^STREAM_ACCUMULATOR_MIN.
+     * We don't expect that to be the case in 64-bit mode.
+     * In block mode, window size is not known, so we have to be conservative.
+     * (note: but it could be evaluated from current-lowLimit)
+     */
+    ZSTD_longOffset_e const isLongOffset = (ZSTD_longOffset_e)(MEM_32bits() && (!frame || (dctx->fParams.windowSize > (1ULL << STREAM_ACCUMULATOR_MIN))));
+    DEBUGLOG(5, "ZSTD_decompressBlock_internal (size : %u)", (U32)srcSize);
+
+    RETURN_ERROR_IF(srcSize >= ZSTD_BLOCKSIZE_MAX, srcSize_wrong, "");
+
+    /* Decode literals section */
+    {   size_t const litCSize = ZSTD_decodeLiteralsBlock(dctx, src, srcSize);
+        DEBUGLOG(5, "ZSTD_decodeLiteralsBlock : %u", (U32)litCSize);
+        if (ZSTD_isError(litCSize)) return litCSize;
+        ip += litCSize;
+        srcSize -= litCSize;
+    }
+
+    /* Build Decoding Tables */
+    {
+        /* These macros control at build-time which decompressor implementation
+         * we use. If neither is defined, we do some inspection and dispatch at
+         * runtime.
+         */
+#if !defined(ZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT) && \
+    !defined(ZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG)
+        int usePrefetchDecoder = dctx->ddictIsCold;
+#endif
+        int nbSeq;
+        size_t const seqHSize = ZSTD_decodeSeqHeaders(dctx, &nbSeq, ip, srcSize);
+        if (ZSTD_isError(seqHSize)) return seqHSize;
+        ip += seqHSize;
+        srcSize -= seqHSize;
+
+        RETURN_ERROR_IF(dst == NULL && nbSeq > 0, dstSize_tooSmall, "NULL not handled");
+
+#if !defined(ZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT) && \
+    !defined(ZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG)
+        if ( !usePrefetchDecoder
+          && (!frame || (dctx->fParams.windowSize > (1<<24)))
+          && (nbSeq>ADVANCED_SEQS) ) {  /* could probably use a larger nbSeq limit */
+            U32 const shareLongOffsets = ZSTD_getLongOffsetsShare(dctx->OFTptr);
+            U32 const minShare = MEM_64bits() ? 7 : 20; /* heuristic values, correspond to 2.73% and 7.81% */
+            usePrefetchDecoder = (shareLongOffsets >= minShare);
+        }
+#endif
+
+        dctx->ddictIsCold = 0;
+
+#if !defined(ZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT) && \
+    !defined(ZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG)
+        if (usePrefetchDecoder)
+#endif
+#ifndef ZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT
+            return ZSTD_decompressSequencesLong(dctx, dst, dstCapacity, ip, srcSize, nbSeq, isLongOffset, frame);
+#endif
+
+#ifndef ZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG
+        /* else */
+        return ZSTD_decompressSequences(dctx, dst, dstCapacity, ip, srcSize, nbSeq, isLongOffset, frame);
+#endif
+    }
+}
+
+
+void ZSTD_checkContinuity(ZSTD_DCtx* dctx, const void* dst, size_t dstSize)
+{
+    if (dst != dctx->previousDstEnd && dstSize > 0) {   /* not contiguous */
+        dctx->dictEnd = dctx->previousDstEnd;
+        dctx->virtualStart = (const char*)dst - ((const char*)(dctx->previousDstEnd) - (const char*)(dctx->prefixStart));
+        dctx->prefixStart = dst;
+        dctx->previousDstEnd = dst;
+    }
+}
+
+
+size_t ZSTD_decompressBlock(ZSTD_DCtx* dctx,
+                            void* dst, size_t dstCapacity,
+                      const void* src, size_t srcSize)
+{
+    size_t dSize;
+    ZSTD_checkContinuity(dctx, dst, dstCapacity);
+    dSize = ZSTD_decompressBlock_internal(dctx, dst, dstCapacity, src, srcSize, /* frame */ 0);
+    dctx->previousDstEnd = (char*)dst + dSize;
+    return dSize;
+}
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/decompress/zstd_decompress_block.h mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/decompress/zstd_decompress_block.h
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/decompress/zstd_decompress_block.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/decompress/zstd_decompress_block.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+
+#ifndef ZSTD_DEC_BLOCK_H
+#define ZSTD_DEC_BLOCK_H
+
+/*-*******************************************************
+ *  Dependencies
+ *********************************************************/
+#include "../common/zstd_deps.h"   /* size_t */
+#include "../zstd.h"    /* DCtx, and some public functions */
+#include "../common/zstd_internal.h"  /* blockProperties_t, and some public functions */
+#include "zstd_decompress_internal.h"  /* ZSTD_seqSymbol */
+
+
+/* ===   Prototypes   === */
+
+/* note: prototypes already published within `zstd.h` :
+ * ZSTD_decompressBlock()
+ */
+
+/* note: prototypes already published within `zstd_internal.h` :
+ * ZSTD_getcBlockSize()
+ * ZSTD_decodeSeqHeaders()
+ */
+
+
+/* ZSTD_decompressBlock_internal() :
+ * decompress block, starting at `src`,
+ * into destination buffer `dst`.
+ * @return : decompressed block size,
+ *           or an error code (which can be tested using ZSTD_isError())
+ */
+size_t ZSTD_decompressBlock_internal(ZSTD_DCtx* dctx,
+                               void* dst, size_t dstCapacity,
+                         const void* src, size_t srcSize, const int frame);
+
+/* ZSTD_buildFSETable() :
+ * generate FSE decoding table for one symbol (ll, ml or off)
+ * this function must be called with valid parameters only
+ * (dt is large enough, normalizedCounter distribution total is a power of 2, max is within range, etc.)
+ * in which case it cannot fail.
+ * The workspace must be 4-byte aligned and at least ZSTD_BUILD_FSE_TABLE_WKSP_SIZE bytes, which is
+ * defined in zstd_decompress_internal.h.
+ * Internal use only.
+ */
+void ZSTD_buildFSETable(ZSTD_seqSymbol* dt,
+             const short* normalizedCounter, unsigned maxSymbolValue,
+             const U32* baseValue, const U32* nbAdditionalBits,
+                   unsigned tableLog, void* wksp, size_t wkspSize,
+                   int bmi2);
+
+
+#endif /* ZSTD_DEC_BLOCK_H */
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/decompress/zstd_decompress.c mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/decompress/zstd_decompress.c
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/decompress/zstd_decompress.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/decompress/zstd_decompress.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,2167 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+
+/* ***************************************************************
+*  Tuning parameters
+*****************************************************************/
+/*!
+ * HEAPMODE :
+ * Select how default decompression function ZSTD_decompress() allocates its context,
+ * on stack (0), or into heap (1, default; requires malloc()).
+ * Note that functions with explicit context such as ZSTD_decompressDCtx() are unaffected.
+ */
+#ifndef ZSTD_HEAPMODE
+#  define ZSTD_HEAPMODE 1
+#endif
+
+/*!
+*  LEGACY_SUPPORT :
+*  if set to 1+, ZSTD_decompress() can decode older formats (v0.1+)
+*/
+#ifndef ZSTD_LEGACY_SUPPORT
+#  define ZSTD_LEGACY_SUPPORT 0
+#endif
+
+/*!
+ *  MAXWINDOWSIZE_DEFAULT :
+ *  maximum window size accepted by DStream __by default__.
+ *  Frames requiring more memory will be rejected.
+ *  It's possible to set a different limit using ZSTD_DCtx_setMaxWindowSize().
+ */
+#ifndef ZSTD_MAXWINDOWSIZE_DEFAULT
+#  define ZSTD_MAXWINDOWSIZE_DEFAULT (((U32)1 << ZSTD_WINDOWLOG_LIMIT_DEFAULT) + 1)
+#endif
+
+/*!
+ *  NO_FORWARD_PROGRESS_MAX :
+ *  maximum allowed nb of calls to ZSTD_decompressStream()
+ *  without any forward progress
+ *  (defined as: no byte read from input, and no byte flushed to output)
+ *  before triggering an error.
+ */
+#ifndef ZSTD_NO_FORWARD_PROGRESS_MAX
+#  define ZSTD_NO_FORWARD_PROGRESS_MAX 16
+#endif
+
+
+/*-*******************************************************
+*  Dependencies
+*********************************************************/
+#include "../common/zstd_deps.h"   /* ZSTD_memcpy, ZSTD_memmove, ZSTD_memset */
+#include "../common/cpu.h"         /* bmi2 */
+#include "../common/mem.h"         /* low level memory routines */
+#define FSE_STATIC_LINKING_ONLY
+#include "../common/fse.h"
+#define HUF_STATIC_LINKING_ONLY
+#include "../common/huf.h"
+#include "../common/xxhash.h" /* XXH64_reset, XXH64_update, XXH64_digest, XXH64 */
+#include "../common/zstd_internal.h"  /* blockProperties_t */
+#include "zstd_decompress_internal.h"   /* ZSTD_DCtx */
+#include "zstd_ddict.h"  /* ZSTD_DDictDictContent */
+#include "zstd_decompress_block.h"   /* ZSTD_decompressBlock_internal */
+
+#if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT>=1)
+#  include "../legacy/zstd_legacy.h"
+#endif
+
+
+
+/*************************************
+ * Multiple DDicts Hashset internals *
+ *************************************/
+
+#define DDICT_HASHSET_MAX_LOAD_FACTOR_COUNT_MULT 4
+#define DDICT_HASHSET_MAX_LOAD_FACTOR_SIZE_MULT 3   /* These two constants represent SIZE_MULT/COUNT_MULT load factor without using a float.
+                                                     * Currently, that means a 0.75 load factor.
+                                                     * So, if count * COUNT_MULT / size * SIZE_MULT != 0, then we've exceeded
+                                                     * the load factor of the ddict hash set.
+                                                     */
+
+#define DDICT_HASHSET_TABLE_BASE_SIZE 64
+#define DDICT_HASHSET_RESIZE_FACTOR 2
+
+/* Hash function to determine starting position of dict insertion within the table
+ * Returns an index between [0, hashSet->ddictPtrTableSize]
+ */
+static size_t ZSTD_DDictHashSet_getIndex(const ZSTD_DDictHashSet* hashSet, U32 dictID) {
+    const U64 hash = XXH64(&dictID, sizeof(U32), 0);
+    /* DDict ptr table size is a multiple of 2, use size - 1 as mask to get index within [0, hashSet->ddictPtrTableSize) */
+    return hash & (hashSet->ddictPtrTableSize - 1);
+}
+
+/* Adds DDict to a hashset without resizing it.
+ * If inserting a DDict with a dictID that already exists in the set, replaces the one in the set.
+ * Returns 0 if successful, or a zstd error code if something went wrong.
+ */
+static size_t ZSTD_DDictHashSet_emplaceDDict(ZSTD_DDictHashSet* hashSet, const ZSTD_DDict* ddict) {
+    const U32 dictID = ZSTD_getDictID_fromDDict(ddict);
+    size_t idx = ZSTD_DDictHashSet_getIndex(hashSet, dictID);
+    const size_t idxRangeMask = hashSet->ddictPtrTableSize - 1;
+    RETURN_ERROR_IF(hashSet->ddictPtrCount == hashSet->ddictPtrTableSize, GENERIC, "Hash set is full!");
+    DEBUGLOG(4, "Hashed index: for dictID: %u is %zu", dictID, idx);
+    while (hashSet->ddictPtrTable[idx] != NULL) {
+        /* Replace existing ddict if inserting ddict with same dictID */
+        if (ZSTD_getDictID_fromDDict(hashSet->ddictPtrTable[idx]) == dictID) {
+            DEBUGLOG(4, "DictID already exists, replacing rather than adding");
+            hashSet->ddictPtrTable[idx] = ddict;
+            return 0;
+        }
+        idx &= idxRangeMask;
+        idx++;
+    }
+    DEBUGLOG(4, "Final idx after probing for dictID %u is: %zu", dictID, idx);
+    hashSet->ddictPtrTable[idx] = ddict;
+    hashSet->ddictPtrCount++;
+    return 0;
+}
+
+/* Expands hash table by factor of DDICT_HASHSET_RESIZE_FACTOR and
+ * rehashes all values, allocates new table, frees old table.
+ * Returns 0 on success, otherwise a zstd error code.
+ */
+static size_t ZSTD_DDictHashSet_expand(ZSTD_DDictHashSet* hashSet, ZSTD_customMem customMem) {
+    size_t newTableSize = hashSet->ddictPtrTableSize * DDICT_HASHSET_RESIZE_FACTOR;
+    const ZSTD_DDict** newTable = (const ZSTD_DDict**)ZSTD_customCalloc(sizeof(ZSTD_DDict*) * newTableSize, customMem);
+    const ZSTD_DDict** oldTable = hashSet->ddictPtrTable;
+    size_t oldTableSize = hashSet->ddictPtrTableSize;
+    size_t i;
+
+    DEBUGLOG(4, "Expanding DDict hash table! Old size: %zu new size: %zu", oldTableSize, newTableSize);
+    RETURN_ERROR_IF(!newTable, memory_allocation, "Expanded hashset allocation failed!");
+    hashSet->ddictPtrTable = newTable;
+    hashSet->ddictPtrTableSize = newTableSize;
+    hashSet->ddictPtrCount = 0;
+    for (i = 0; i < oldTableSize; ++i) {
+        if (oldTable[i] != NULL) {
+            FORWARD_IF_ERROR(ZSTD_DDictHashSet_emplaceDDict(hashSet, oldTable[i]), "");
+        }
+    }
+    ZSTD_customFree((void*)oldTable, customMem);
+    DEBUGLOG(4, "Finished re-hash");
+    return 0;
+}
+
+/* Fetches a DDict with the given dictID
+ * Returns the ZSTD_DDict* with the requested dictID. If it doesn't exist, then returns NULL.
+ */
+static const ZSTD_DDict* ZSTD_DDictHashSet_getDDict(ZSTD_DDictHashSet* hashSet, U32 dictID) {
+    size_t idx = ZSTD_DDictHashSet_getIndex(hashSet, dictID);
+    const size_t idxRangeMask = hashSet->ddictPtrTableSize - 1;
+    DEBUGLOG(4, "Hashed index: for dictID: %u is %zu", dictID, idx);
+    for (;;) {
+        size_t currDictID = ZSTD_getDictID_fromDDict(hashSet->ddictPtrTable[idx]);
+        if (currDictID == dictID || currDictID == 0) {
+            /* currDictID == 0 implies a NULL ddict entry */
+            break;
+        } else {
+            idx &= idxRangeMask;    /* Goes to start of table when we reach the end */
+            idx++;
+        }
+    }
+    DEBUGLOG(4, "Final idx after probing for dictID %u is: %zu", dictID, idx);
+    return hashSet->ddictPtrTable[idx];
+}
+
+/* Allocates space for and returns a ddict hash set
+ * The hash set's ZSTD_DDict* table has all values automatically set to NULL to begin with.
+ * Returns NULL if allocation failed.
+ */
+static ZSTD_DDictHashSet* ZSTD_createDDictHashSet(ZSTD_customMem customMem) {
+    ZSTD_DDictHashSet* ret = (ZSTD_DDictHashSet*)ZSTD_customMalloc(sizeof(ZSTD_DDictHashSet), customMem);
+    DEBUGLOG(4, "Allocating new hash set");
+    ret->ddictPtrTable = (const ZSTD_DDict**)ZSTD_customCalloc(DDICT_HASHSET_TABLE_BASE_SIZE * sizeof(ZSTD_DDict*), customMem);
+    ret->ddictPtrTableSize = DDICT_HASHSET_TABLE_BASE_SIZE;
+    ret->ddictPtrCount = 0;
+    if (!ret || !ret->ddictPtrTable) {
+        return NULL;
+    }
+    return ret;
+}
+
+/* Frees the table of ZSTD_DDict* within a hashset, then frees the hashset itself.
+ * Note: The ZSTD_DDict* within the table are NOT freed.
+ */
+static void ZSTD_freeDDictHashSet(ZSTD_DDictHashSet* hashSet, ZSTD_customMem customMem) {
+    DEBUGLOG(4, "Freeing ddict hash set");
+    if (hashSet && hashSet->ddictPtrTable) {
+        ZSTD_customFree((void*)hashSet->ddictPtrTable, customMem);
+    }
+    if (hashSet) {
+        ZSTD_customFree(hashSet, customMem);
+    }
+}
+
+/* Public function: Adds a DDict into the ZSTD_DDictHashSet, possibly triggering a resize of the hash set.
+ * Returns 0 on success, or a ZSTD error.
+ */
+static size_t ZSTD_DDictHashSet_addDDict(ZSTD_DDictHashSet* hashSet, const ZSTD_DDict* ddict, ZSTD_customMem customMem) {
+    DEBUGLOG(4, "Adding dict ID: %u to hashset with - Count: %zu Tablesize: %zu", ZSTD_getDictID_fromDDict(ddict), hashSet->ddictPtrCount, hashSet->ddictPtrTableSize);
+    if (hashSet->ddictPtrCount * DDICT_HASHSET_MAX_LOAD_FACTOR_COUNT_MULT / hashSet->ddictPtrTableSize * DDICT_HASHSET_MAX_LOAD_FACTOR_SIZE_MULT != 0) {
+        FORWARD_IF_ERROR(ZSTD_DDictHashSet_expand(hashSet, customMem), "");
+    }
+    FORWARD_IF_ERROR(ZSTD_DDictHashSet_emplaceDDict(hashSet, ddict), "");
+    return 0;
+}
+
+/*-*************************************************************
+*   Context management
+***************************************************************/
+size_t ZSTD_sizeof_DCtx (const ZSTD_DCtx* dctx)
+{
+    if (dctx==NULL) return 0;   /* support sizeof NULL */
+    return sizeof(*dctx)
+           + ZSTD_sizeof_DDict(dctx->ddictLocal)
+           + dctx->inBuffSize + dctx->outBuffSize;
+}
+
+size_t ZSTD_estimateDCtxSize(void) { return sizeof(ZSTD_DCtx); }
+
+
+static size_t ZSTD_startingInputLength(ZSTD_format_e format)
+{
+    size_t const startingInputLength = ZSTD_FRAMEHEADERSIZE_PREFIX(format);
+    /* only supports formats ZSTD_f_zstd1 and ZSTD_f_zstd1_magicless */
+    assert( (format == ZSTD_f_zstd1) || (format == ZSTD_f_zstd1_magicless) );
+    return startingInputLength;
+}
+
+static void ZSTD_DCtx_resetParameters(ZSTD_DCtx* dctx)
+{
+    assert(dctx->streamStage == zdss_init);
+    dctx->format = ZSTD_f_zstd1;
+    dctx->maxWindowSize = ZSTD_MAXWINDOWSIZE_DEFAULT;
+    dctx->outBufferMode = ZSTD_bm_buffered;
+    dctx->forceIgnoreChecksum = ZSTD_d_validateChecksum;
+    dctx->refMultipleDDicts = ZSTD_rmd_refSingleDDict;
+}
+
+static void ZSTD_initDCtx_internal(ZSTD_DCtx* dctx)
+{
+    dctx->staticSize  = 0;
+    dctx->ddict       = NULL;
+    dctx->ddictLocal  = NULL;
+    dctx->dictEnd     = NULL;
+    dctx->ddictIsCold = 0;
+    dctx->dictUses = ZSTD_dont_use;
+    dctx->inBuff      = NULL;
+    dctx->inBuffSize  = 0;
+    dctx->outBuffSize = 0;
+    dctx->streamStage = zdss_init;
+    dctx->legacyContext = NULL;
+    dctx->previousLegacyVersion = 0;
+    dctx->noForwardProgress = 0;
+    dctx->oversizedDuration = 0;
+    dctx->bmi2 = ZSTD_cpuid_bmi2(ZSTD_cpuid());
+    dctx->ddictSet = NULL;
+    ZSTD_DCtx_resetParameters(dctx);
+#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+    dctx->dictContentEndForFuzzing = NULL;
+#endif
+}
+
+ZSTD_DCtx* ZSTD_initStaticDCtx(void *workspace, size_t workspaceSize)
+{
+    ZSTD_DCtx* const dctx = (ZSTD_DCtx*) workspace;
+
+    if ((size_t)workspace & 7) return NULL;  /* 8-aligned */
+    if (workspaceSize < sizeof(ZSTD_DCtx)) return NULL;  /* minimum size */
+
+    ZSTD_initDCtx_internal(dctx);
+    dctx->staticSize = workspaceSize;
+    dctx->inBuff = (char*)(dctx+1);
+    return dctx;
+}
+
+ZSTD_DCtx* ZSTD_createDCtx_advanced(ZSTD_customMem customMem)
+{
+    if ((!customMem.customAlloc) ^ (!customMem.customFree)) return NULL;
+
+    {   ZSTD_DCtx* const dctx = (ZSTD_DCtx*)ZSTD_customMalloc(sizeof(*dctx), customMem);
+        if (!dctx) return NULL;
+        dctx->customMem = customMem;
+        ZSTD_initDCtx_internal(dctx);
+        return dctx;
+    }
+}
+
+ZSTD_DCtx* ZSTD_createDCtx(void)
+{
+    DEBUGLOG(3, "ZSTD_createDCtx");
+    return ZSTD_createDCtx_advanced(ZSTD_defaultCMem);
+}
+
+static void ZSTD_clearDict(ZSTD_DCtx* dctx)
+{
+    ZSTD_freeDDict(dctx->ddictLocal);
+    dctx->ddictLocal = NULL;
+    dctx->ddict = NULL;
+    dctx->dictUses = ZSTD_dont_use;
+}
+
+size_t ZSTD_freeDCtx(ZSTD_DCtx* dctx)
+{
+    if (dctx==NULL) return 0;   /* support free on NULL */
+    RETURN_ERROR_IF(dctx->staticSize, memory_allocation, "not compatible with static DCtx");
+    {   ZSTD_customMem const cMem = dctx->customMem;
+        ZSTD_clearDict(dctx);
+        ZSTD_customFree(dctx->inBuff, cMem);
+        dctx->inBuff = NULL;
+#if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT >= 1)
+        if (dctx->legacyContext)
+            ZSTD_freeLegacyStreamContext(dctx->legacyContext, dctx->previousLegacyVersion);
+#endif
+        if (dctx->ddictSet) {
+            ZSTD_freeDDictHashSet(dctx->ddictSet, cMem);
+            dctx->ddictSet = NULL;
+        }
+        ZSTD_customFree(dctx, cMem);
+        return 0;
+    }
+}
+
+/* no longer useful */
+void ZSTD_copyDCtx(ZSTD_DCtx* dstDCtx, const ZSTD_DCtx* srcDCtx)
+{
+    size_t const toCopy = (size_t)((char*)(&dstDCtx->inBuff) - (char*)dstDCtx);
+    ZSTD_memcpy(dstDCtx, srcDCtx, toCopy);  /* no need to copy workspace */
+}
+
+/* Given a dctx with a digested frame params, re-selects the correct ZSTD_DDict based on
+ * the requested dict ID from the frame. If there exists a reference to the correct ZSTD_DDict, then
+ * accordingly sets the ddict to be used to decompress the frame.
+ *
+ * If no DDict is found, then no action is taken, and the ZSTD_DCtx::ddict remains as-is.
+ *
+ * ZSTD_d_refMultipleDDicts must be enabled for this function to be called.
+ */
+static void ZSTD_DCtx_selectFrameDDict(ZSTD_DCtx* dctx) {
+    assert(dctx->refMultipleDDicts && dctx->ddictSet);
+    DEBUGLOG(4, "Adjusting DDict based on requested dict ID from frame");
+    if (dctx->ddict) {
+        const ZSTD_DDict* frameDDict = ZSTD_DDictHashSet_getDDict(dctx->ddictSet, dctx->fParams.dictID);
+        if (frameDDict) {
+            DEBUGLOG(4, "DDict found!");
+            ZSTD_clearDict(dctx);
+            dctx->dictID = dctx->fParams.dictID;
+            dctx->ddict = frameDDict;
+            dctx->dictUses = ZSTD_use_indefinitely;
+        }
+    }
+}
+
+
+/*-*************************************************************
+ *   Frame header decoding
+ ***************************************************************/
+
+/*! ZSTD_isFrame() :
+ *  Tells if the content of `buffer` starts with a valid Frame Identifier.
+ *  Note : Frame Identifier is 4 bytes. If `size < 4`, @return will always be 0.
+ *  Note 2 : Legacy Frame Identifiers are considered valid only if Legacy Support is enabled.
+ *  Note 3 : Skippable Frame Identifiers are considered valid. */
+unsigned ZSTD_isFrame(const void* buffer, size_t size)
+{
+    if (size < ZSTD_FRAMEIDSIZE) return 0;
+    {   U32 const magic = MEM_readLE32(buffer);
+        if (magic == ZSTD_MAGICNUMBER) return 1;
+        if ((magic & ZSTD_MAGIC_SKIPPABLE_MASK) == ZSTD_MAGIC_SKIPPABLE_START) return 1;
+    }
+#if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT >= 1)
+    if (ZSTD_isLegacy(buffer, size)) return 1;
+#endif
+    return 0;
+}
+
+/** ZSTD_frameHeaderSize_internal() :
+ *  srcSize must be large enough to reach header size fields.
+ *  note : only works for formats ZSTD_f_zstd1 and ZSTD_f_zstd1_magicless.
+ * @return : size of the Frame Header
+ *           or an error code, which can be tested with ZSTD_isError() */
+static size_t ZSTD_frameHeaderSize_internal(const void* src, size_t srcSize, ZSTD_format_e format)
+{
+    size_t const minInputSize = ZSTD_startingInputLength(format);
+    RETURN_ERROR_IF(srcSize < minInputSize, srcSize_wrong, "");
+
+    {   BYTE const fhd = ((const BYTE*)src)[minInputSize-1];
+        U32 const dictID= fhd & 3;
+        U32 const singleSegment = (fhd >> 5) & 1;
+        U32 const fcsId = fhd >> 6;
+        return minInputSize + !singleSegment
+             + ZSTD_did_fieldSize[dictID] + ZSTD_fcs_fieldSize[fcsId]
+             + (singleSegment && !fcsId);
+    }
+}
+
+/** ZSTD_frameHeaderSize() :
+ *  srcSize must be >= ZSTD_frameHeaderSize_prefix.
+ * @return : size of the Frame Header,
+ *           or an error code (if srcSize is too small) */
+size_t ZSTD_frameHeaderSize(const void* src, size_t srcSize)
+{
+    return ZSTD_frameHeaderSize_internal(src, srcSize, ZSTD_f_zstd1);
+}
+
+
+/** ZSTD_getFrameHeader_advanced() :
+ *  decode Frame Header, or require larger `srcSize`.
+ *  note : only works for formats ZSTD_f_zstd1 and ZSTD_f_zstd1_magicless
+ * @return : 0, `zfhPtr` is correctly filled,
+ *          >0, `srcSize` is too small, value is wanted `srcSize` amount,
+ *           or an error code, which can be tested using ZSTD_isError() */
+size_t ZSTD_getFrameHeader_advanced(ZSTD_frameHeader* zfhPtr, const void* src, size_t srcSize, ZSTD_format_e format)
+{
+    const BYTE* ip = (const BYTE*)src;
+    size_t const minInputSize = ZSTD_startingInputLength(format);
+
+    ZSTD_memset(zfhPtr, 0, sizeof(*zfhPtr));   /* not strictly necessary, but static analyzer do not understand that zfhPtr is only going to be read only if return value is zero, since they are 2 different signals */
+    if (srcSize < minInputSize) return minInputSize;
+    RETURN_ERROR_IF(src==NULL, GENERIC, "invalid parameter");
+
+    if ( (format != ZSTD_f_zstd1_magicless)
+      && (MEM_readLE32(src) != ZSTD_MAGICNUMBER) ) {
+        if ((MEM_readLE32(src) & ZSTD_MAGIC_SKIPPABLE_MASK) == ZSTD_MAGIC_SKIPPABLE_START) {
+            /* skippable frame */
+            if (srcSize < ZSTD_SKIPPABLEHEADERSIZE)
+                return ZSTD_SKIPPABLEHEADERSIZE; /* magic number + frame length */
+            ZSTD_memset(zfhPtr, 0, sizeof(*zfhPtr));
+            zfhPtr->frameContentSize = MEM_readLE32((const char *)src + ZSTD_FRAMEIDSIZE);
+            zfhPtr->frameType = ZSTD_skippableFrame;
+            return 0;
+        }
+        RETURN_ERROR(prefix_unknown, "");
+    }
+
+    /* ensure there is enough `srcSize` to fully read/decode frame header */
+    {   size_t const fhsize = ZSTD_frameHeaderSize_internal(src, srcSize, format);
+        if (srcSize < fhsize) return fhsize;
+        zfhPtr->headerSize = (U32)fhsize;
+    }
+
+    {   BYTE const fhdByte = ip[minInputSize-1];
+        size_t pos = minInputSize;
+        U32 const dictIDSizeCode = fhdByte&3;
+        U32 const checksumFlag = (fhdByte>>2)&1;
+        U32 const singleSegment = (fhdByte>>5)&1;
+        U32 const fcsID = fhdByte>>6;
+        U64 windowSize = 0;
+        U32 dictID = 0;
+        U64 frameContentSize = ZSTD_CONTENTSIZE_UNKNOWN;
+        RETURN_ERROR_IF((fhdByte & 0x08) != 0, frameParameter_unsupported,
+                        "reserved bits, must be zero");
+
+        if (!singleSegment) {
+            BYTE const wlByte = ip[pos++];
+            U32 const windowLog = (wlByte >> 3) + ZSTD_WINDOWLOG_ABSOLUTEMIN;
+            RETURN_ERROR_IF(windowLog > ZSTD_WINDOWLOG_MAX, frameParameter_windowTooLarge, "");
+            windowSize = (1ULL << windowLog);
+            windowSize += (windowSize >> 3) * (wlByte&7);
+        }
+        switch(dictIDSizeCode)
+        {
+            default: assert(0);  /* impossible */
+            case 0 : break;
+            case 1 : dictID = ip[pos]; pos++; break;
+            case 2 : dictID = MEM_readLE16(ip+pos); pos+=2; break;
+            case 3 : dictID = MEM_readLE32(ip+pos); pos+=4; break;
+        }
+        switch(fcsID)
+        {
+            default: assert(0);  /* impossible */
+            case 0 : if (singleSegment) frameContentSize = ip[pos]; break;
+            case 1 : frameContentSize = MEM_readLE16(ip+pos)+256; break;
+            case 2 : frameContentSize = MEM_readLE32(ip+pos); break;
+            case 3 : frameContentSize = MEM_readLE64(ip+pos); break;
+        }
+        if (singleSegment) windowSize = frameContentSize;
+
+        zfhPtr->frameType = ZSTD_frame;
+        zfhPtr->frameContentSize = frameContentSize;
+        zfhPtr->windowSize = windowSize;
+        zfhPtr->blockSizeMax = (unsigned) MIN(windowSize, ZSTD_BLOCKSIZE_MAX);
+        zfhPtr->dictID = dictID;
+        zfhPtr->checksumFlag = checksumFlag;
+    }
+    return 0;
+}
+
+/** ZSTD_getFrameHeader() :
+ *  decode Frame Header, or require larger `srcSize`.
+ *  note : this function does not consume input, it only reads it.
+ * @return : 0, `zfhPtr` is correctly filled,
+ *          >0, `srcSize` is too small, value is wanted `srcSize` amount,
+ *           or an error code, which can be tested using ZSTD_isError() */
+size_t ZSTD_getFrameHeader(ZSTD_frameHeader* zfhPtr, const void* src, size_t srcSize)
+{
+    return ZSTD_getFrameHeader_advanced(zfhPtr, src, srcSize, ZSTD_f_zstd1);
+}
+
+
+/** ZSTD_getFrameContentSize() :
+ *  compatible with legacy mode
+ * @return : decompressed size of the single frame pointed to be `src` if known, otherwise
+ *         - ZSTD_CONTENTSIZE_UNKNOWN if the size cannot be determined
+ *         - ZSTD_CONTENTSIZE_ERROR if an error occurred (e.g. invalid magic number, srcSize too small) */
+unsigned long long ZSTD_getFrameContentSize(const void *src, size_t srcSize)
+{
+#if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT >= 1)
+    if (ZSTD_isLegacy(src, srcSize)) {
+        unsigned long long const ret = ZSTD_getDecompressedSize_legacy(src, srcSize);
+        return ret == 0 ? ZSTD_CONTENTSIZE_UNKNOWN : ret;
+    }
+#endif
+    {   ZSTD_frameHeader zfh;
+        if (ZSTD_getFrameHeader(&zfh, src, srcSize) != 0)
+            return ZSTD_CONTENTSIZE_ERROR;
+        if (zfh.frameType == ZSTD_skippableFrame) {
+            return 0;
+        } else {
+            return zfh.frameContentSize;
+    }   }
+}
+
+static size_t readSkippableFrameSize(void const* src, size_t srcSize)
+{
+    size_t const skippableHeaderSize = ZSTD_SKIPPABLEHEADERSIZE;
+    U32 sizeU32;
+
+    RETURN_ERROR_IF(srcSize < ZSTD_SKIPPABLEHEADERSIZE, srcSize_wrong, "");
+
+    sizeU32 = MEM_readLE32((BYTE const*)src + ZSTD_FRAMEIDSIZE);
+    RETURN_ERROR_IF((U32)(sizeU32 + ZSTD_SKIPPABLEHEADERSIZE) < sizeU32,
+                    frameParameter_unsupported, "");
+    {
+        size_t const skippableSize = skippableHeaderSize + sizeU32;
+        RETURN_ERROR_IF(skippableSize > srcSize, srcSize_wrong, "");
+        return skippableSize;
+    }
+}
+
+/** ZSTD_findDecompressedSize() :
+ *  compatible with legacy mode
+ *  `srcSize` must be the exact length of some number of ZSTD compressed and/or
+ *      skippable frames
+ *  @return : decompressed size of the frames contained */
+unsigned long long ZSTD_findDecompressedSize(const void* src, size_t srcSize)
+{
+    unsigned long long totalDstSize = 0;
+
+    while (srcSize >= ZSTD_startingInputLength(ZSTD_f_zstd1)) {
+        U32 const magicNumber = MEM_readLE32(src);
+
+        if ((magicNumber & ZSTD_MAGIC_SKIPPABLE_MASK) == ZSTD_MAGIC_SKIPPABLE_START) {
+            size_t const skippableSize = readSkippableFrameSize(src, srcSize);
+            if (ZSTD_isError(skippableSize)) {
+                return ZSTD_CONTENTSIZE_ERROR;
+            }
+            assert(skippableSize <= srcSize);
+
+            src = (const BYTE *)src + skippableSize;
+            srcSize -= skippableSize;
+            continue;
+        }
+
+        {   unsigned long long const ret = ZSTD_getFrameContentSize(src, srcSize);
+            if (ret >= ZSTD_CONTENTSIZE_ERROR) return ret;
+
+            /* check for overflow */
+            if (totalDstSize + ret < totalDstSize) return ZSTD_CONTENTSIZE_ERROR;
+            totalDstSize += ret;
+        }
+        {   size_t const frameSrcSize = ZSTD_findFrameCompressedSize(src, srcSize);
+            if (ZSTD_isError(frameSrcSize)) {
+                return ZSTD_CONTENTSIZE_ERROR;
+            }
+
+            src = (const BYTE *)src + frameSrcSize;
+            srcSize -= frameSrcSize;
+        }
+    }  /* while (srcSize >= ZSTD_frameHeaderSize_prefix) */
+
+    if (srcSize) return ZSTD_CONTENTSIZE_ERROR;
+
+    return totalDstSize;
+}
+
+/** ZSTD_getDecompressedSize() :
+ *  compatible with legacy mode
+ * @return : decompressed size if known, 0 otherwise
+             note : 0 can mean any of the following :
+                   - frame content is empty
+                   - decompressed size field is not present in frame header
+                   - frame header unknown / not supported
+                   - frame header not complete (`srcSize` too small) */
+unsigned long long ZSTD_getDecompressedSize(const void* src, size_t srcSize)
+{
+    unsigned long long const ret = ZSTD_getFrameContentSize(src, srcSize);
+    ZSTD_STATIC_ASSERT(ZSTD_CONTENTSIZE_ERROR < ZSTD_CONTENTSIZE_UNKNOWN);
+    return (ret >= ZSTD_CONTENTSIZE_ERROR) ? 0 : ret;
+}
+
+
+/** ZSTD_decodeFrameHeader() :
+ * `headerSize` must be the size provided by ZSTD_frameHeaderSize().
+ * If multiple DDict references are enabled, also will choose the correct DDict to use.
+ * @return : 0 if success, or an error code, which can be tested using ZSTD_isError() */
+static size_t ZSTD_decodeFrameHeader(ZSTD_DCtx* dctx, const void* src, size_t headerSize)
+{
+    size_t const result = ZSTD_getFrameHeader_advanced(&(dctx->fParams), src, headerSize, dctx->format);
+    if (ZSTD_isError(result)) return result;    /* invalid header */
+    RETURN_ERROR_IF(result>0, srcSize_wrong, "headerSize too small");
+
+    /* Reference DDict requested by frame if dctx references multiple ddicts */
+    if (dctx->refMultipleDDicts == ZSTD_rmd_refMultipleDDicts && dctx->ddictSet) {
+        ZSTD_DCtx_selectFrameDDict(dctx);
+    }
+
+#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+    /* Skip the dictID check in fuzzing mode, because it makes the search
+     * harder.
+     */
+    RETURN_ERROR_IF(dctx->fParams.dictID && (dctx->dictID != dctx->fParams.dictID),
+                    dictionary_wrong, "");
+#endif
+    dctx->validateChecksum = (dctx->fParams.checksumFlag && !dctx->forceIgnoreChecksum) ? 1 : 0;
+    if (dctx->validateChecksum) XXH64_reset(&dctx->xxhState, 0);
+    dctx->processedCSize += headerSize;
+    return 0;
+}
+
+static ZSTD_frameSizeInfo ZSTD_errorFrameSizeInfo(size_t ret)
+{
+    ZSTD_frameSizeInfo frameSizeInfo;
+    frameSizeInfo.compressedSize = ret;
+    frameSizeInfo.decompressedBound = ZSTD_CONTENTSIZE_ERROR;
+    return frameSizeInfo;
+}
+
+static ZSTD_frameSizeInfo ZSTD_findFrameSizeInfo(const void* src, size_t srcSize)
+{
+    ZSTD_frameSizeInfo frameSizeInfo;
+    ZSTD_memset(&frameSizeInfo, 0, sizeof(ZSTD_frameSizeInfo));
+
+#if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT >= 1)
+    if (ZSTD_isLegacy(src, srcSize))
+        return ZSTD_findFrameSizeInfoLegacy(src, srcSize);
+#endif
+
+    if ((srcSize >= ZSTD_SKIPPABLEHEADERSIZE)
+        && (MEM_readLE32(src) & ZSTD_MAGIC_SKIPPABLE_MASK) == ZSTD_MAGIC_SKIPPABLE_START) {
+        frameSizeInfo.compressedSize = readSkippableFrameSize(src, srcSize);
+        assert(ZSTD_isError(frameSizeInfo.compressedSize) ||
+               frameSizeInfo.compressedSize <= srcSize);
+        return frameSizeInfo;
+    } else {
+        const BYTE* ip = (const BYTE*)src;
+        const BYTE* const ipstart = ip;
+        size_t remainingSize = srcSize;
+        size_t nbBlocks = 0;
+        ZSTD_frameHeader zfh;
+
+        /* Extract Frame Header */
+        {   size_t const ret = ZSTD_getFrameHeader(&zfh, src, srcSize);
+            if (ZSTD_isError(ret))
+                return ZSTD_errorFrameSizeInfo(ret);
+            if (ret > 0)
+                return ZSTD_errorFrameSizeInfo(ERROR(srcSize_wrong));
+        }
+
+        ip += zfh.headerSize;
+        remainingSize -= zfh.headerSize;
+
+        /* Iterate over each block */
+        while (1) {
+            blockProperties_t blockProperties;
+            size_t const cBlockSize = ZSTD_getcBlockSize(ip, remainingSize, &blockProperties);
+            if (ZSTD_isError(cBlockSize))
+                return ZSTD_errorFrameSizeInfo(cBlockSize);
+
+            if (ZSTD_blockHeaderSize + cBlockSize > remainingSize)
+                return ZSTD_errorFrameSizeInfo(ERROR(srcSize_wrong));
+
+            ip += ZSTD_blockHeaderSize + cBlockSize;
+            remainingSize -= ZSTD_blockHeaderSize + cBlockSize;
+            nbBlocks++;
+
+            if (blockProperties.lastBlock) break;
+        }
+
+        /* Final frame content checksum */
+        if (zfh.checksumFlag) {
+            if (remainingSize < 4)
+                return ZSTD_errorFrameSizeInfo(ERROR(srcSize_wrong));
+            ip += 4;
+        }
+
+        frameSizeInfo.compressedSize = (size_t)(ip - ipstart);
+        frameSizeInfo.decompressedBound = (zfh.frameContentSize != ZSTD_CONTENTSIZE_UNKNOWN)
+                                        ? zfh.frameContentSize
+                                        : nbBlocks * zfh.blockSizeMax;
+        return frameSizeInfo;
+    }
+}
+
+/** ZSTD_findFrameCompressedSize() :
+ *  compatible with legacy mode
+ *  `src` must point to the start of a ZSTD frame, ZSTD legacy frame, or skippable frame
+ *  `srcSize` must be at least as large as the frame contained
+ *  @return : the compressed size of the frame starting at `src` */
+size_t ZSTD_findFrameCompressedSize(const void *src, size_t srcSize)
+{
+    ZSTD_frameSizeInfo const frameSizeInfo = ZSTD_findFrameSizeInfo(src, srcSize);
+    return frameSizeInfo.compressedSize;
+}
+
+/** ZSTD_decompressBound() :
+ *  compatible with legacy mode
+ *  `src` must point to the start of a ZSTD frame or a skippeable frame
+ *  `srcSize` must be at least as large as the frame contained
+ *  @return : the maximum decompressed size of the compressed source
+ */
+unsigned long long ZSTD_decompressBound(const void* src, size_t srcSize)
+{
+    unsigned long long bound = 0;
+    /* Iterate over each frame */
+    while (srcSize > 0) {
+        ZSTD_frameSizeInfo const frameSizeInfo = ZSTD_findFrameSizeInfo(src, srcSize);
+        size_t const compressedSize = frameSizeInfo.compressedSize;
+        unsigned long long const decompressedBound = frameSizeInfo.decompressedBound;
+        if (ZSTD_isError(compressedSize) || decompressedBound == ZSTD_CONTENTSIZE_ERROR)
+            return ZSTD_CONTENTSIZE_ERROR;
+        assert(srcSize >= compressedSize);
+        src = (const BYTE*)src + compressedSize;
+        srcSize -= compressedSize;
+        bound += decompressedBound;
+    }
+    return bound;
+}
+
+
+/*-*************************************************************
+ *   Frame decoding
+ ***************************************************************/
+
+/** ZSTD_insertBlock() :
+ *  insert `src` block into `dctx` history. Useful to track uncompressed blocks. */
+size_t ZSTD_insertBlock(ZSTD_DCtx* dctx, const void* blockStart, size_t blockSize)
+{
+    DEBUGLOG(5, "ZSTD_insertBlock: %u bytes", (unsigned)blockSize);
+    ZSTD_checkContinuity(dctx, blockStart, blockSize);
+    dctx->previousDstEnd = (const char*)blockStart + blockSize;
+    return blockSize;
+}
+
+
+static size_t ZSTD_copyRawBlock(void* dst, size_t dstCapacity,
+                          const void* src, size_t srcSize)
+{
+    DEBUGLOG(5, "ZSTD_copyRawBlock");
+    RETURN_ERROR_IF(srcSize > dstCapacity, dstSize_tooSmall, "");
+    if (dst == NULL) {
+        if (srcSize == 0) return 0;
+        RETURN_ERROR(dstBuffer_null, "");
+    }
+    ZSTD_memcpy(dst, src, srcSize);
+    return srcSize;
+}
+
+static size_t ZSTD_setRleBlock(void* dst, size_t dstCapacity,
+                               BYTE b,
+                               size_t regenSize)
+{
+    RETURN_ERROR_IF(regenSize > dstCapacity, dstSize_tooSmall, "");
+    if (dst == NULL) {
+        if (regenSize == 0) return 0;
+        RETURN_ERROR(dstBuffer_null, "");
+    }
+    ZSTD_memset(dst, b, regenSize);
+    return regenSize;
+}
+
+static void ZSTD_DCtx_trace_end(ZSTD_DCtx const* dctx, U64 uncompressedSize, U64 compressedSize, unsigned streaming)
+{
+#if ZSTD_TRACE
+    if (dctx->traceCtx && ZSTD_trace_decompress_end != NULL) {
+        ZSTD_Trace trace;
+        ZSTD_memset(&trace, 0, sizeof(trace));
+        trace.version = ZSTD_VERSION_NUMBER;
+        trace.streaming = streaming;
+        if (dctx->ddict) {
+            trace.dictionaryID = ZSTD_getDictID_fromDDict(dctx->ddict);
+            trace.dictionarySize = ZSTD_DDict_dictSize(dctx->ddict);
+            trace.dictionaryIsCold = dctx->ddictIsCold;
+        }
+        trace.uncompressedSize = (size_t)uncompressedSize;
+        trace.compressedSize = (size_t)compressedSize;
+        trace.dctx = dctx;
+        ZSTD_trace_decompress_end(dctx->traceCtx, &trace);
+    }
+#else
+    (void)dctx;
+    (void)uncompressedSize;
+    (void)compressedSize;
+    (void)streaming;
+#endif
+}
+
+
+/*! ZSTD_decompressFrame() :
+ * @dctx must be properly initialized
+ *  will update *srcPtr and *srcSizePtr,
+ *  to make *srcPtr progress by one frame. */
+static size_t ZSTD_decompressFrame(ZSTD_DCtx* dctx,
+                                   void* dst, size_t dstCapacity,
+                             const void** srcPtr, size_t *srcSizePtr)
+{
+    const BYTE* const istart = (const BYTE*)(*srcPtr);
+    const BYTE* ip = istart;
+    BYTE* const ostart = (BYTE*)dst;
+    BYTE* const oend = dstCapacity != 0 ? ostart + dstCapacity : ostart;
+    BYTE* op = ostart;
+    size_t remainingSrcSize = *srcSizePtr;
+
+    DEBUGLOG(4, "ZSTD_decompressFrame (srcSize:%i)", (int)*srcSizePtr);
+
+    /* check */
+    RETURN_ERROR_IF(
+        remainingSrcSize < ZSTD_FRAMEHEADERSIZE_MIN(dctx->format)+ZSTD_blockHeaderSize,
+        srcSize_wrong, "");
+
+    /* Frame Header */
+    {   size_t const frameHeaderSize = ZSTD_frameHeaderSize_internal(
+                ip, ZSTD_FRAMEHEADERSIZE_PREFIX(dctx->format), dctx->format);
+        if (ZSTD_isError(frameHeaderSize)) return frameHeaderSize;
+        RETURN_ERROR_IF(remainingSrcSize < frameHeaderSize+ZSTD_blockHeaderSize,
+                        srcSize_wrong, "");
+        FORWARD_IF_ERROR( ZSTD_decodeFrameHeader(dctx, ip, frameHeaderSize) , "");
+        ip += frameHeaderSize; remainingSrcSize -= frameHeaderSize;
+    }
+
+    /* Loop on each block */
+    while (1) {
+        size_t decodedSize;
+        blockProperties_t blockProperties;
+        size_t const cBlockSize = ZSTD_getcBlockSize(ip, remainingSrcSize, &blockProperties);
+        if (ZSTD_isError(cBlockSize)) return cBlockSize;
+
+        ip += ZSTD_blockHeaderSize;
+        remainingSrcSize -= ZSTD_blockHeaderSize;
+        RETURN_ERROR_IF(cBlockSize > remainingSrcSize, srcSize_wrong, "");
+
+        switch(blockProperties.blockType)
+        {
+        case bt_compressed:
+            decodedSize = ZSTD_decompressBlock_internal(dctx, op, (size_t)(oend-op), ip, cBlockSize, /* frame */ 1);
+            break;
+        case bt_raw :
+            decodedSize = ZSTD_copyRawBlock(op, (size_t)(oend-op), ip, cBlockSize);
+            break;
+        case bt_rle :
+            decodedSize = ZSTD_setRleBlock(op, (size_t)(oend-op), *ip, blockProperties.origSize);
+            break;
+        case bt_reserved :
+        default:
+            RETURN_ERROR(corruption_detected, "invalid block type");
+        }
+
+        if (ZSTD_isError(decodedSize)) return decodedSize;
+        if (dctx->validateChecksum)
+            XXH64_update(&dctx->xxhState, op, decodedSize);
+        if (decodedSize != 0)
+            op += decodedSize;
+        assert(ip != NULL);
+        ip += cBlockSize;
+        remainingSrcSize -= cBlockSize;
+        if (blockProperties.lastBlock) break;
+    }
+
+    if (dctx->fParams.frameContentSize != ZSTD_CONTENTSIZE_UNKNOWN) {
+        RETURN_ERROR_IF((U64)(op-ostart) != dctx->fParams.frameContentSize,
+                        corruption_detected, "");
+    }
+    if (dctx->fParams.checksumFlag) { /* Frame content checksum verification */
+        RETURN_ERROR_IF(remainingSrcSize<4, checksum_wrong, "");
+        if (!dctx->forceIgnoreChecksum) {
+            U32 const checkCalc = (U32)XXH64_digest(&dctx->xxhState);
+            U32 checkRead;
+            checkRead = MEM_readLE32(ip);
+            RETURN_ERROR_IF(checkRead != checkCalc, checksum_wrong, "");
+        }
+        ip += 4;
+        remainingSrcSize -= 4;
+    }
+    ZSTD_DCtx_trace_end(dctx, (U64)(op-ostart), (U64)(ip-istart), /* streaming */ 0);
+    /* Allow caller to get size read */
+    *srcPtr = ip;
+    *srcSizePtr = remainingSrcSize;
+    return (size_t)(op-ostart);
+}
+
+static size_t ZSTD_decompressMultiFrame(ZSTD_DCtx* dctx,
+                                        void* dst, size_t dstCapacity,
+                                  const void* src, size_t srcSize,
+                                  const void* dict, size_t dictSize,
+                                  const ZSTD_DDict* ddict)
+{
+    void* const dststart = dst;
+    int moreThan1Frame = 0;
+
+    DEBUGLOG(5, "ZSTD_decompressMultiFrame");
+    assert(dict==NULL || ddict==NULL);  /* either dict or ddict set, not both */
+
+    if (ddict) {
+        dict = ZSTD_DDict_dictContent(ddict);
+        dictSize = ZSTD_DDict_dictSize(ddict);
+    }
+
+    while (srcSize >= ZSTD_startingInputLength(dctx->format)) {
+
+#if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT >= 1)
+        if (ZSTD_isLegacy(src, srcSize)) {
+            size_t decodedSize;
+            size_t const frameSize = ZSTD_findFrameCompressedSizeLegacy(src, srcSize);
+            if (ZSTD_isError(frameSize)) return frameSize;
+            RETURN_ERROR_IF(dctx->staticSize, memory_allocation,
+                "legacy support is not compatible with static dctx");
+
+            decodedSize = ZSTD_decompressLegacy(dst, dstCapacity, src, frameSize, dict, dictSize);
+            if (ZSTD_isError(decodedSize)) return decodedSize;
+
+            assert(decodedSize <= dstCapacity);
+            dst = (BYTE*)dst + decodedSize;
+            dstCapacity -= decodedSize;
+
+            src = (const BYTE*)src + frameSize;
+            srcSize -= frameSize;
+
+            continue;
+        }
+#endif
+
+        {   U32 const magicNumber = MEM_readLE32(src);
+            DEBUGLOG(4, "reading magic number %08X (expecting %08X)",
+                        (unsigned)magicNumber, ZSTD_MAGICNUMBER);
+            if ((magicNumber & ZSTD_MAGIC_SKIPPABLE_MASK) == ZSTD_MAGIC_SKIPPABLE_START) {
+                size_t const skippableSize = readSkippableFrameSize(src, srcSize);
+                FORWARD_IF_ERROR(skippableSize, "readSkippableFrameSize failed");
+                assert(skippableSize <= srcSize);
+
+                src = (const BYTE *)src + skippableSize;
+                srcSize -= skippableSize;
+                continue;
+        }   }
+
+        if (ddict) {
+            /* we were called from ZSTD_decompress_usingDDict */
+            FORWARD_IF_ERROR(ZSTD_decompressBegin_usingDDict(dctx, ddict), "");
+        } else {
+            /* this will initialize correctly with no dict if dict == NULL, so
+             * use this in all cases but ddict */
+            FORWARD_IF_ERROR(ZSTD_decompressBegin_usingDict(dctx, dict, dictSize), "");
+        }
+        ZSTD_checkContinuity(dctx, dst, dstCapacity);
+
+        {   const size_t res = ZSTD_decompressFrame(dctx, dst, dstCapacity,
+                                                    &src, &srcSize);
+            RETURN_ERROR_IF(
+                (ZSTD_getErrorCode(res) == ZSTD_error_prefix_unknown)
+             && (moreThan1Frame==1),
+                srcSize_wrong,
+                "At least one frame successfully completed, "
+                "but following bytes are garbage: "
+                "it's more likely to be a srcSize error, "
+                "specifying more input bytes than size of frame(s). "
+                "Note: one could be unlucky, it might be a corruption error instead, "
+                "happening right at the place where we expect zstd magic bytes. "
+                "But this is _much_ less likely than a srcSize field error.");
+            if (ZSTD_isError(res)) return res;
+            assert(res <= dstCapacity);
+            if (res != 0)
+                dst = (BYTE*)dst + res;
+            dstCapacity -= res;
+        }
+        moreThan1Frame = 1;
+    }  /* while (srcSize >= ZSTD_frameHeaderSize_prefix) */
+
+    RETURN_ERROR_IF(srcSize, srcSize_wrong, "input not entirely consumed");
+
+    return (size_t)((BYTE*)dst - (BYTE*)dststart);
+}
+
+size_t ZSTD_decompress_usingDict(ZSTD_DCtx* dctx,
+                                 void* dst, size_t dstCapacity,
+                           const void* src, size_t srcSize,
+                           const void* dict, size_t dictSize)
+{
+    return ZSTD_decompressMultiFrame(dctx, dst, dstCapacity, src, srcSize, dict, dictSize, NULL);
+}
+
+
+static ZSTD_DDict const* ZSTD_getDDict(ZSTD_DCtx* dctx)
+{
+    switch (dctx->dictUses) {
+    default:
+        assert(0 /* Impossible */);
+        /* fall-through */
+    case ZSTD_dont_use:
+        ZSTD_clearDict(dctx);
+        return NULL;
+    case ZSTD_use_indefinitely:
+        return dctx->ddict;
+    case ZSTD_use_once:
+        dctx->dictUses = ZSTD_dont_use;
+        return dctx->ddict;
+    }
+}
+
+size_t ZSTD_decompressDCtx(ZSTD_DCtx* dctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize)
+{
+    return ZSTD_decompress_usingDDict(dctx, dst, dstCapacity, src, srcSize, ZSTD_getDDict(dctx));
+}
+
+
+size_t ZSTD_decompress(void* dst, size_t dstCapacity, const void* src, size_t srcSize)
+{
+#if defined(ZSTD_HEAPMODE) && (ZSTD_HEAPMODE>=1)
+    size_t regenSize;
+    ZSTD_DCtx* const dctx = ZSTD_createDCtx();
+    RETURN_ERROR_IF(dctx==NULL, memory_allocation, "NULL pointer!");
+    regenSize = ZSTD_decompressDCtx(dctx, dst, dstCapacity, src, srcSize);
+    ZSTD_freeDCtx(dctx);
+    return regenSize;
+#else   /* stack mode */
+    ZSTD_DCtx dctx;
+    ZSTD_initDCtx_internal(&dctx);
+    return ZSTD_decompressDCtx(&dctx, dst, dstCapacity, src, srcSize);
+#endif
+}
+
+
+/*-**************************************
+*   Advanced Streaming Decompression API
+*   Bufferless and synchronous
+****************************************/
+size_t ZSTD_nextSrcSizeToDecompress(ZSTD_DCtx* dctx) { return dctx->expected; }
+
+/**
+ * Similar to ZSTD_nextSrcSizeToDecompress(), but when when a block input can be streamed,
+ * we allow taking a partial block as the input. Currently only raw uncompressed blocks can
+ * be streamed.
+ *
+ * For blocks that can be streamed, this allows us to reduce the latency until we produce
+ * output, and avoid copying the input.
+ *
+ * @param inputSize - The total amount of input that the caller currently has.
+ */
+static size_t ZSTD_nextSrcSizeToDecompressWithInputSize(ZSTD_DCtx* dctx, size_t inputSize) {
+    if (!(dctx->stage == ZSTDds_decompressBlock || dctx->stage == ZSTDds_decompressLastBlock))
+        return dctx->expected;
+    if (dctx->bType != bt_raw)
+        return dctx->expected;
+    return MIN(MAX(inputSize, 1), dctx->expected);
+}
+
+ZSTD_nextInputType_e ZSTD_nextInputType(ZSTD_DCtx* dctx) {
+    switch(dctx->stage)
+    {
+    default:   /* should not happen */
+        assert(0);
+    case ZSTDds_getFrameHeaderSize:
+    case ZSTDds_decodeFrameHeader:
+        return ZSTDnit_frameHeader;
+    case ZSTDds_decodeBlockHeader:
+        return ZSTDnit_blockHeader;
+    case ZSTDds_decompressBlock:
+        return ZSTDnit_block;
+    case ZSTDds_decompressLastBlock:
+        return ZSTDnit_lastBlock;
+    case ZSTDds_checkChecksum:
+        return ZSTDnit_checksum;
+    case ZSTDds_decodeSkippableHeader:
+    case ZSTDds_skipFrame:
+        return ZSTDnit_skippableFrame;
+    }
+}
+
+static int ZSTD_isSkipFrame(ZSTD_DCtx* dctx) { return dctx->stage == ZSTDds_skipFrame; }
+
+/** ZSTD_decompressContinue() :
+ *  srcSize : must be the exact nb of bytes expected (see ZSTD_nextSrcSizeToDecompress())
+ *  @return : nb of bytes generated into `dst` (necessarily <= `dstCapacity)
+ *            or an error code, which can be tested using ZSTD_isError() */
+size_t ZSTD_decompressContinue(ZSTD_DCtx* dctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize)
+{
+    DEBUGLOG(5, "ZSTD_decompressContinue (srcSize:%u)", (unsigned)srcSize);
+    /* Sanity check */
+    RETURN_ERROR_IF(srcSize != ZSTD_nextSrcSizeToDecompressWithInputSize(dctx, srcSize), srcSize_wrong, "not allowed");
+    ZSTD_checkContinuity(dctx, dst, dstCapacity);
+
+    dctx->processedCSize += srcSize;
+
+    switch (dctx->stage)
+    {
+    case ZSTDds_getFrameHeaderSize :
+        assert(src != NULL);
+        if (dctx->format == ZSTD_f_zstd1) {  /* allows header */
+            assert(srcSize >= ZSTD_FRAMEIDSIZE);  /* to read skippable magic number */
+            if ((MEM_readLE32(src) & ZSTD_MAGIC_SKIPPABLE_MASK) == ZSTD_MAGIC_SKIPPABLE_START) {        /* skippable frame */
+                ZSTD_memcpy(dctx->headerBuffer, src, srcSize);
+                dctx->expected = ZSTD_SKIPPABLEHEADERSIZE - srcSize;  /* remaining to load to get full skippable frame header */
+                dctx->stage = ZSTDds_decodeSkippableHeader;
+                return 0;
+        }   }
+        dctx->headerSize = ZSTD_frameHeaderSize_internal(src, srcSize, dctx->format);
+        if (ZSTD_isError(dctx->headerSize)) return dctx->headerSize;
+        ZSTD_memcpy(dctx->headerBuffer, src, srcSize);
+        dctx->expected = dctx->headerSize - srcSize;
+        dctx->stage = ZSTDds_decodeFrameHeader;
+        return 0;
+
+    case ZSTDds_decodeFrameHeader:
+        assert(src != NULL);
+        ZSTD_memcpy(dctx->headerBuffer + (dctx->headerSize - srcSize), src, srcSize);
+        FORWARD_IF_ERROR(ZSTD_decodeFrameHeader(dctx, dctx->headerBuffer, dctx->headerSize), "");
+        dctx->expected = ZSTD_blockHeaderSize;
+        dctx->stage = ZSTDds_decodeBlockHeader;
+        return 0;
+
+    case ZSTDds_decodeBlockHeader:
+        {   blockProperties_t bp;
+            size_t const cBlockSize = ZSTD_getcBlockSize(src, ZSTD_blockHeaderSize, &bp);
+            if (ZSTD_isError(cBlockSize)) return cBlockSize;
+            RETURN_ERROR_IF(cBlockSize > dctx->fParams.blockSizeMax, corruption_detected, "Block Size Exceeds Maximum");
+            dctx->expected = cBlockSize;
+            dctx->bType = bp.blockType;
+            dctx->rleSize = bp.origSize;
+            if (cBlockSize) {
+                dctx->stage = bp.lastBlock ? ZSTDds_decompressLastBlock : ZSTDds_decompressBlock;
+                return 0;
+            }
+            /* empty block */
+            if (bp.lastBlock) {
+                if (dctx->fParams.checksumFlag) {
+                    dctx->expected = 4;
+                    dctx->stage = ZSTDds_checkChecksum;
+                } else {
+                    dctx->expected = 0; /* end of frame */
+                    dctx->stage = ZSTDds_getFrameHeaderSize;
+                }
+            } else {
+                dctx->expected = ZSTD_blockHeaderSize;  /* jump to next header */
+                dctx->stage = ZSTDds_decodeBlockHeader;
+            }
+            return 0;
+        }
+
+    case ZSTDds_decompressLastBlock:
+    case ZSTDds_decompressBlock:
+        DEBUGLOG(5, "ZSTD_decompressContinue: case ZSTDds_decompressBlock");
+        {   size_t rSize;
+            switch(dctx->bType)
+            {
+            case bt_compressed:
+                DEBUGLOG(5, "ZSTD_decompressContinue: case bt_compressed");
+                rSize = ZSTD_decompressBlock_internal(dctx, dst, dstCapacity, src, srcSize, /* frame */ 1);
+                dctx->expected = 0;  /* Streaming not supported */
+                break;
+            case bt_raw :
+                assert(srcSize <= dctx->expected);
+                rSize = ZSTD_copyRawBlock(dst, dstCapacity, src, srcSize);
+                FORWARD_IF_ERROR(rSize, "ZSTD_copyRawBlock failed");
+                assert(rSize == srcSize);
+                dctx->expected -= rSize;
+                break;
+            case bt_rle :
+                rSize = ZSTD_setRleBlock(dst, dstCapacity, *(const BYTE*)src, dctx->rleSize);
+                dctx->expected = 0;  /* Streaming not supported */
+                break;
+            case bt_reserved :   /* should never happen */
+            default:
+                RETURN_ERROR(corruption_detected, "invalid block type");
+            }
+            FORWARD_IF_ERROR(rSize, "");
+            RETURN_ERROR_IF(rSize > dctx->fParams.blockSizeMax, corruption_detected, "Decompressed Block Size Exceeds Maximum");
+            DEBUGLOG(5, "ZSTD_decompressContinue: decoded size from block : %u", (unsigned)rSize);
+            dctx->decodedSize += rSize;
+            if (dctx->validateChecksum) XXH64_update(&dctx->xxhState, dst, rSize);
+            dctx->previousDstEnd = (char*)dst + rSize;
+
+            /* Stay on the same stage until we are finished streaming the block. */
+            if (dctx->expected > 0) {
+                return rSize;
+            }
+
+            if (dctx->stage == ZSTDds_decompressLastBlock) {   /* end of frame */
+                DEBUGLOG(4, "ZSTD_decompressContinue: decoded size from frame : %u", (unsigned)dctx->decodedSize);
+                RETURN_ERROR_IF(
+                    dctx->fParams.frameContentSize != ZSTD_CONTENTSIZE_UNKNOWN
+                 && dctx->decodedSize != dctx->fParams.frameContentSize,
+                    corruption_detected, "");
+                if (dctx->fParams.checksumFlag) {  /* another round for frame checksum */
+                    dctx->expected = 4;
+                    dctx->stage = ZSTDds_checkChecksum;
+                } else {
+                    ZSTD_DCtx_trace_end(dctx, dctx->decodedSize, dctx->processedCSize, /* streaming */ 1);
+                    dctx->expected = 0;   /* ends here */
+                    dctx->stage = ZSTDds_getFrameHeaderSize;
+                }
+            } else {
+                dctx->stage = ZSTDds_decodeBlockHeader;
+                dctx->expected = ZSTD_blockHeaderSize;
+            }
+            return rSize;
+        }
+
+    case ZSTDds_checkChecksum:
+        assert(srcSize == 4);  /* guaranteed by dctx->expected */
+        {
+            if (dctx->validateChecksum) {
+                U32 const h32 = (U32)XXH64_digest(&dctx->xxhState);
+                U32 const check32 = MEM_readLE32(src);
+                DEBUGLOG(4, "ZSTD_decompressContinue: checksum : calculated %08X :: %08X read", (unsigned)h32, (unsigned)check32);
+                RETURN_ERROR_IF(check32 != h32, checksum_wrong, "");
+            }
+            ZSTD_DCtx_trace_end(dctx, dctx->decodedSize, dctx->processedCSize, /* streaming */ 1);
+            dctx->expected = 0;
+            dctx->stage = ZSTDds_getFrameHeaderSize;
+            return 0;
+        }
+
+    case ZSTDds_decodeSkippableHeader:
+        assert(src != NULL);
+        assert(srcSize <= ZSTD_SKIPPABLEHEADERSIZE);
+        ZSTD_memcpy(dctx->headerBuffer + (ZSTD_SKIPPABLEHEADERSIZE - srcSize), src, srcSize);   /* complete skippable header */
+        dctx->expected = MEM_readLE32(dctx->headerBuffer + ZSTD_FRAMEIDSIZE);   /* note : dctx->expected can grow seriously large, beyond local buffer size */
+        dctx->stage = ZSTDds_skipFrame;
+        return 0;
+
+    case ZSTDds_skipFrame:
+        dctx->expected = 0;
+        dctx->stage = ZSTDds_getFrameHeaderSize;
+        return 0;
+
+    default:
+        assert(0);   /* impossible */
+        RETURN_ERROR(GENERIC, "impossible to reach");   /* some compiler require default to do something */
+    }
+}
+
+
+static size_t ZSTD_refDictContent(ZSTD_DCtx* dctx, const void* dict, size_t dictSize)
+{
+    dctx->dictEnd = dctx->previousDstEnd;
+    dctx->virtualStart = (const char*)dict - ((const char*)(dctx->previousDstEnd) - (const char*)(dctx->prefixStart));
+    dctx->prefixStart = dict;
+    dctx->previousDstEnd = (const char*)dict + dictSize;
+#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+    dctx->dictContentBeginForFuzzing = dctx->prefixStart;
+    dctx->dictContentEndForFuzzing = dctx->previousDstEnd;
+#endif
+    return 0;
+}
+
+/*! ZSTD_loadDEntropy() :
+ *  dict : must point at beginning of a valid zstd dictionary.
+ * @return : size of entropy tables read */
+size_t
+ZSTD_loadDEntropy(ZSTD_entropyDTables_t* entropy,
+                  const void* const dict, size_t const dictSize)
+{
+    const BYTE* dictPtr = (const BYTE*)dict;
+    const BYTE* const dictEnd = dictPtr + dictSize;
+
+    RETURN_ERROR_IF(dictSize <= 8, dictionary_corrupted, "dict is too small");
+    assert(MEM_readLE32(dict) == ZSTD_MAGIC_DICTIONARY);   /* dict must be valid */
+    dictPtr += 8;   /* skip header = magic + dictID */
+
+    ZSTD_STATIC_ASSERT(offsetof(ZSTD_entropyDTables_t, OFTable) == offsetof(ZSTD_entropyDTables_t, LLTable) + sizeof(entropy->LLTable));
+    ZSTD_STATIC_ASSERT(offsetof(ZSTD_entropyDTables_t, MLTable) == offsetof(ZSTD_entropyDTables_t, OFTable) + sizeof(entropy->OFTable));
+    ZSTD_STATIC_ASSERT(sizeof(entropy->LLTable) + sizeof(entropy->OFTable) + sizeof(entropy->MLTable) >= HUF_DECOMPRESS_WORKSPACE_SIZE);
+    {   void* const workspace = &entropy->LLTable;   /* use fse tables as temporary workspace; implies fse tables are grouped together */
+        size_t const workspaceSize = sizeof(entropy->LLTable) + sizeof(entropy->OFTable) + sizeof(entropy->MLTable);
+#ifdef HUF_FORCE_DECOMPRESS_X1
+        /* in minimal huffman, we always use X1 variants */
+        size_t const hSize = HUF_readDTableX1_wksp(entropy->hufTable,
+                                                dictPtr, dictEnd - dictPtr,
+                                                workspace, workspaceSize);
+#else
+        size_t const hSize = HUF_readDTableX2_wksp(entropy->hufTable,
+                                                dictPtr, (size_t)(dictEnd - dictPtr),
+                                                workspace, workspaceSize);
+#endif
+        RETURN_ERROR_IF(HUF_isError(hSize), dictionary_corrupted, "");
+        dictPtr += hSize;
+    }
+
+    {   short offcodeNCount[MaxOff+1];
+        unsigned offcodeMaxValue = MaxOff, offcodeLog;
+        size_t const offcodeHeaderSize = FSE_readNCount(offcodeNCount, &offcodeMaxValue, &offcodeLog, dictPtr, (size_t)(dictEnd-dictPtr));
+        RETURN_ERROR_IF(FSE_isError(offcodeHeaderSize), dictionary_corrupted, "");
+        RETURN_ERROR_IF(offcodeMaxValue > MaxOff, dictionary_corrupted, "");
+        RETURN_ERROR_IF(offcodeLog > OffFSELog, dictionary_corrupted, "");
+        ZSTD_buildFSETable( entropy->OFTable,
+                            offcodeNCount, offcodeMaxValue,
+                            OF_base, OF_bits,
+                            offcodeLog,
+                            entropy->workspace, sizeof(entropy->workspace),
+                            /* bmi2 */0);
+        dictPtr += offcodeHeaderSize;
+    }
+
+    {   short matchlengthNCount[MaxML+1];
+        unsigned matchlengthMaxValue = MaxML, matchlengthLog;
+        size_t const matchlengthHeaderSize = FSE_readNCount(matchlengthNCount, &matchlengthMaxValue, &matchlengthLog, dictPtr, (size_t)(dictEnd-dictPtr));
+        RETURN_ERROR_IF(FSE_isError(matchlengthHeaderSize), dictionary_corrupted, "");
+        RETURN_ERROR_IF(matchlengthMaxValue > MaxML, dictionary_corrupted, "");
+        RETURN_ERROR_IF(matchlengthLog > MLFSELog, dictionary_corrupted, "");
+        ZSTD_buildFSETable( entropy->MLTable,
+                            matchlengthNCount, matchlengthMaxValue,
+                            ML_base, ML_bits,
+                            matchlengthLog,
+                            entropy->workspace, sizeof(entropy->workspace),
+                            /* bmi2 */ 0);
+        dictPtr += matchlengthHeaderSize;
+    }
+
+    {   short litlengthNCount[MaxLL+1];
+        unsigned litlengthMaxValue = MaxLL, litlengthLog;
+        size_t const litlengthHeaderSize = FSE_readNCount(litlengthNCount, &litlengthMaxValue, &litlengthLog, dictPtr, (size_t)(dictEnd-dictPtr));
+        RETURN_ERROR_IF(FSE_isError(litlengthHeaderSize), dictionary_corrupted, "");
+        RETURN_ERROR_IF(litlengthMaxValue > MaxLL, dictionary_corrupted, "");
+        RETURN_ERROR_IF(litlengthLog > LLFSELog, dictionary_corrupted, "");
+        ZSTD_buildFSETable( entropy->LLTable,
+                            litlengthNCount, litlengthMaxValue,
+                            LL_base, LL_bits,
+                            litlengthLog,
+                            entropy->workspace, sizeof(entropy->workspace),
+                            /* bmi2 */ 0);
+        dictPtr += litlengthHeaderSize;
+    }
+
+    RETURN_ERROR_IF(dictPtr+12 > dictEnd, dictionary_corrupted, "");
+    {   int i;
+        size_t const dictContentSize = (size_t)(dictEnd - (dictPtr+12));
+        for (i=0; i<3; i++) {
+            U32 const rep = MEM_readLE32(dictPtr); dictPtr += 4;
+            RETURN_ERROR_IF(rep==0 || rep > dictContentSize,
+                            dictionary_corrupted, "");
+            entropy->rep[i] = rep;
+    }   }
+
+    return (size_t)(dictPtr - (const BYTE*)dict);
+}
+
+static size_t ZSTD_decompress_insertDictionary(ZSTD_DCtx* dctx, const void* dict, size_t dictSize)
+{
+    if (dictSize < 8) return ZSTD_refDictContent(dctx, dict, dictSize);
+    {   U32 const magic = MEM_readLE32(dict);
+        if (magic != ZSTD_MAGIC_DICTIONARY) {
+            return ZSTD_refDictContent(dctx, dict, dictSize);   /* pure content mode */
+    }   }
+    dctx->dictID = MEM_readLE32((const char*)dict + ZSTD_FRAMEIDSIZE);
+
+    /* load entropy tables */
+    {   size_t const eSize = ZSTD_loadDEntropy(&dctx->entropy, dict, dictSize);
+        RETURN_ERROR_IF(ZSTD_isError(eSize), dictionary_corrupted, "");
+        dict = (const char*)dict + eSize;
+        dictSize -= eSize;
+    }
+    dctx->litEntropy = dctx->fseEntropy = 1;
+
+    /* reference dictionary content */
+    return ZSTD_refDictContent(dctx, dict, dictSize);
+}
+
+size_t ZSTD_decompressBegin(ZSTD_DCtx* dctx)
+{
+    assert(dctx != NULL);
+#if ZSTD_TRACE
+    dctx->traceCtx = (ZSTD_trace_decompress_begin != NULL) ? ZSTD_trace_decompress_begin(dctx) : 0;
+#endif
+    dctx->expected = ZSTD_startingInputLength(dctx->format);  /* dctx->format must be properly set */
+    dctx->stage = ZSTDds_getFrameHeaderSize;
+    dctx->processedCSize = 0;
+    dctx->decodedSize = 0;
+    dctx->previousDstEnd = NULL;
+    dctx->prefixStart = NULL;
+    dctx->virtualStart = NULL;
+    dctx->dictEnd = NULL;
+    dctx->entropy.hufTable[0] = (HUF_DTable)((HufLog)*0x1000001);  /* cover both little and big endian */
+    dctx->litEntropy = dctx->fseEntropy = 0;
+    dctx->dictID = 0;
+    dctx->bType = bt_reserved;
+    ZSTD_STATIC_ASSERT(sizeof(dctx->entropy.rep) == sizeof(repStartValue));
+    ZSTD_memcpy(dctx->entropy.rep, repStartValue, sizeof(repStartValue));  /* initial repcodes */
+    dctx->LLTptr = dctx->entropy.LLTable;
+    dctx->MLTptr = dctx->entropy.MLTable;
+    dctx->OFTptr = dctx->entropy.OFTable;
+    dctx->HUFptr = dctx->entropy.hufTable;
+    return 0;
+}
+
+size_t ZSTD_decompressBegin_usingDict(ZSTD_DCtx* dctx, const void* dict, size_t dictSize)
+{
+    FORWARD_IF_ERROR( ZSTD_decompressBegin(dctx) , "");
+    if (dict && dictSize)
+        RETURN_ERROR_IF(
+            ZSTD_isError(ZSTD_decompress_insertDictionary(dctx, dict, dictSize)),
+            dictionary_corrupted, "");
+    return 0;
+}
+
+
+/* ======   ZSTD_DDict   ====== */
+
+size_t ZSTD_decompressBegin_usingDDict(ZSTD_DCtx* dctx, const ZSTD_DDict* ddict)
+{
+    DEBUGLOG(4, "ZSTD_decompressBegin_usingDDict");
+    assert(dctx != NULL);
+    if (ddict) {
+        const char* const dictStart = (const char*)ZSTD_DDict_dictContent(ddict);
+        size_t const dictSize = ZSTD_DDict_dictSize(ddict);
+        const void* const dictEnd = dictStart + dictSize;
+        dctx->ddictIsCold = (dctx->dictEnd != dictEnd);
+        DEBUGLOG(4, "DDict is %s",
+                    dctx->ddictIsCold ? "~cold~" : "hot!");
+    }
+    FORWARD_IF_ERROR( ZSTD_decompressBegin(dctx) , "");
+    if (ddict) {   /* NULL ddict is equivalent to no dictionary */
+        ZSTD_copyDDictParameters(dctx, ddict);
+    }
+    return 0;
+}
+
+/*! ZSTD_getDictID_fromDict() :
+ *  Provides the dictID stored within dictionary.
+ *  if @return == 0, the dictionary is not conformant with Zstandard specification.
+ *  It can still be loaded, but as a content-only dictionary. */
+unsigned ZSTD_getDictID_fromDict(const void* dict, size_t dictSize)
+{
+    if (dictSize < 8) return 0;
+    if (MEM_readLE32(dict) != ZSTD_MAGIC_DICTIONARY) return 0;
+    return MEM_readLE32((const char*)dict + ZSTD_FRAMEIDSIZE);
+}
+
+/*! ZSTD_getDictID_fromFrame() :
+ *  Provides the dictID required to decompress frame stored within `src`.
+ *  If @return == 0, the dictID could not be decoded.
+ *  This could for one of the following reasons :
+ *  - The frame does not require a dictionary (most common case).
+ *  - The frame was built with dictID intentionally removed.
+ *    Needed dictionary is a hidden information.
+ *    Note : this use case also happens when using a non-conformant dictionary.
+ *  - `srcSize` is too small, and as a result, frame header could not be decoded.
+ *    Note : possible if `srcSize < ZSTD_FRAMEHEADERSIZE_MAX`.
+ *  - This is not a Zstandard frame.
+ *  When identifying the exact failure cause, it's possible to use
+ *  ZSTD_getFrameHeader(), which will provide a more precise error code. */
+unsigned ZSTD_getDictID_fromFrame(const void* src, size_t srcSize)
+{
+    ZSTD_frameHeader zfp = { 0, 0, 0, ZSTD_frame, 0, 0, 0 };
+    size_t const hError = ZSTD_getFrameHeader(&zfp, src, srcSize);
+    if (ZSTD_isError(hError)) return 0;
+    return zfp.dictID;
+}
+
+
+/*! ZSTD_decompress_usingDDict() :
+*   Decompression using a pre-digested Dictionary
+*   Use dictionary without significant overhead. */
+size_t ZSTD_decompress_usingDDict(ZSTD_DCtx* dctx,
+                                  void* dst, size_t dstCapacity,
+                            const void* src, size_t srcSize,
+                            const ZSTD_DDict* ddict)
+{
+    /* pass content and size in case legacy frames are encountered */
+    return ZSTD_decompressMultiFrame(dctx, dst, dstCapacity, src, srcSize,
+                                     NULL, 0,
+                                     ddict);
+}
+
+
+/*=====================================
+*   Streaming decompression
+*====================================*/
+
+ZSTD_DStream* ZSTD_createDStream(void)
+{
+    DEBUGLOG(3, "ZSTD_createDStream");
+    return ZSTD_createDStream_advanced(ZSTD_defaultCMem);
+}
+
+ZSTD_DStream* ZSTD_initStaticDStream(void *workspace, size_t workspaceSize)
+{
+    return ZSTD_initStaticDCtx(workspace, workspaceSize);
+}
+
+ZSTD_DStream* ZSTD_createDStream_advanced(ZSTD_customMem customMem)
+{
+    return ZSTD_createDCtx_advanced(customMem);
+}
+
+size_t ZSTD_freeDStream(ZSTD_DStream* zds)
+{
+    return ZSTD_freeDCtx(zds);
+}
+
+
+/* ***  Initialization  *** */
+
+size_t ZSTD_DStreamInSize(void)  { return ZSTD_BLOCKSIZE_MAX + ZSTD_blockHeaderSize; }
+size_t ZSTD_DStreamOutSize(void) { return ZSTD_BLOCKSIZE_MAX; }
+
+size_t ZSTD_DCtx_loadDictionary_advanced(ZSTD_DCtx* dctx,
+                                   const void* dict, size_t dictSize,
+                                         ZSTD_dictLoadMethod_e dictLoadMethod,
+                                         ZSTD_dictContentType_e dictContentType)
+{
+    RETURN_ERROR_IF(dctx->streamStage != zdss_init, stage_wrong, "");
+    ZSTD_clearDict(dctx);
+    if (dict && dictSize != 0) {
+        dctx->ddictLocal = ZSTD_createDDict_advanced(dict, dictSize, dictLoadMethod, dictContentType, dctx->customMem);
+        RETURN_ERROR_IF(dctx->ddictLocal == NULL, memory_allocation, "NULL pointer!");
+        dctx->ddict = dctx->ddictLocal;
+        dctx->dictUses = ZSTD_use_indefinitely;
+    }
+    return 0;
+}
+
+size_t ZSTD_DCtx_loadDictionary_byReference(ZSTD_DCtx* dctx, const void* dict, size_t dictSize)
+{
+    return ZSTD_DCtx_loadDictionary_advanced(dctx, dict, dictSize, ZSTD_dlm_byRef, ZSTD_dct_auto);
+}
+
+size_t ZSTD_DCtx_loadDictionary(ZSTD_DCtx* dctx, const void* dict, size_t dictSize)
+{
+    return ZSTD_DCtx_loadDictionary_advanced(dctx, dict, dictSize, ZSTD_dlm_byCopy, ZSTD_dct_auto);
+}
+
+size_t ZSTD_DCtx_refPrefix_advanced(ZSTD_DCtx* dctx, const void* prefix, size_t prefixSize, ZSTD_dictContentType_e dictContentType)
+{
+    FORWARD_IF_ERROR(ZSTD_DCtx_loadDictionary_advanced(dctx, prefix, prefixSize, ZSTD_dlm_byRef, dictContentType), "");
+    dctx->dictUses = ZSTD_use_once;
+    return 0;
+}
+
+size_t ZSTD_DCtx_refPrefix(ZSTD_DCtx* dctx, const void* prefix, size_t prefixSize)
+{
+    return ZSTD_DCtx_refPrefix_advanced(dctx, prefix, prefixSize, ZSTD_dct_rawContent);
+}
+
+
+/* ZSTD_initDStream_usingDict() :
+ * return : expected size, aka ZSTD_startingInputLength().
+ * this function cannot fail */
+size_t ZSTD_initDStream_usingDict(ZSTD_DStream* zds, const void* dict, size_t dictSize)
+{
+    DEBUGLOG(4, "ZSTD_initDStream_usingDict");
+    FORWARD_IF_ERROR( ZSTD_DCtx_reset(zds, ZSTD_reset_session_only) , "");
+    FORWARD_IF_ERROR( ZSTD_DCtx_loadDictionary(zds, dict, dictSize) , "");
+    return ZSTD_startingInputLength(zds->format);
+}
+
+/* note : this variant can't fail */
+size_t ZSTD_initDStream(ZSTD_DStream* zds)
+{
+    DEBUGLOG(4, "ZSTD_initDStream");
+    return ZSTD_initDStream_usingDDict(zds, NULL);
+}
+
+/* ZSTD_initDStream_usingDDict() :
+ * ddict will just be referenced, and must outlive decompression session
+ * this function cannot fail */
+size_t ZSTD_initDStream_usingDDict(ZSTD_DStream* dctx, const ZSTD_DDict* ddict)
+{
+    FORWARD_IF_ERROR( ZSTD_DCtx_reset(dctx, ZSTD_reset_session_only) , "");
+    FORWARD_IF_ERROR( ZSTD_DCtx_refDDict(dctx, ddict) , "");
+    return ZSTD_startingInputLength(dctx->format);
+}
+
+/* ZSTD_resetDStream() :
+ * return : expected size, aka ZSTD_startingInputLength().
+ * this function cannot fail */
+size_t ZSTD_resetDStream(ZSTD_DStream* dctx)
+{
+    FORWARD_IF_ERROR(ZSTD_DCtx_reset(dctx, ZSTD_reset_session_only), "");
+    return ZSTD_startingInputLength(dctx->format);
+}
+
+
+size_t ZSTD_DCtx_refDDict(ZSTD_DCtx* dctx, const ZSTD_DDict* ddict)
+{
+    RETURN_ERROR_IF(dctx->streamStage != zdss_init, stage_wrong, "");
+    ZSTD_clearDict(dctx);
+    if (ddict) {
+        dctx->ddict = ddict;
+        dctx->dictUses = ZSTD_use_indefinitely;
+        if (dctx->refMultipleDDicts == ZSTD_rmd_refMultipleDDicts) {
+            if (dctx->ddictSet == NULL) {
+                dctx->ddictSet = ZSTD_createDDictHashSet(dctx->customMem);
+                if (!dctx->ddictSet) {
+                    RETURN_ERROR(memory_allocation, "Failed to allocate memory for hash set!");
+                }
+            }
+            assert(!dctx->staticSize);  /* Impossible: ddictSet cannot have been allocated if static dctx */
+            FORWARD_IF_ERROR(ZSTD_DDictHashSet_addDDict(dctx->ddictSet, ddict, dctx->customMem), "");
+        }
+    }
+    return 0;
+}
+
+/* ZSTD_DCtx_setMaxWindowSize() :
+ * note : no direct equivalence in ZSTD_DCtx_setParameter,
+ * since this version sets windowSize, and the other sets windowLog */
+size_t ZSTD_DCtx_setMaxWindowSize(ZSTD_DCtx* dctx, size_t maxWindowSize)
+{
+    ZSTD_bounds const bounds = ZSTD_dParam_getBounds(ZSTD_d_windowLogMax);
+    size_t const min = (size_t)1 << bounds.lowerBound;
+    size_t const max = (size_t)1 << bounds.upperBound;
+    RETURN_ERROR_IF(dctx->streamStage != zdss_init, stage_wrong, "");
+    RETURN_ERROR_IF(maxWindowSize < min, parameter_outOfBound, "");
+    RETURN_ERROR_IF(maxWindowSize > max, parameter_outOfBound, "");
+    dctx->maxWindowSize = maxWindowSize;
+    return 0;
+}
+
+size_t ZSTD_DCtx_setFormat(ZSTD_DCtx* dctx, ZSTD_format_e format)
+{
+    return ZSTD_DCtx_setParameter(dctx, ZSTD_d_format, (int)format);
+}
+
+ZSTD_bounds ZSTD_dParam_getBounds(ZSTD_dParameter dParam)
+{
+    ZSTD_bounds bounds = { 0, 0, 0 };
+    switch(dParam) {
+        case ZSTD_d_windowLogMax:
+            bounds.lowerBound = ZSTD_WINDOWLOG_ABSOLUTEMIN;
+            bounds.upperBound = ZSTD_WINDOWLOG_MAX;
+            return bounds;
+        case ZSTD_d_format:
+            bounds.lowerBound = (int)ZSTD_f_zstd1;
+            bounds.upperBound = (int)ZSTD_f_zstd1_magicless;
+            ZSTD_STATIC_ASSERT(ZSTD_f_zstd1 < ZSTD_f_zstd1_magicless);
+            return bounds;
+        case ZSTD_d_stableOutBuffer:
+            bounds.lowerBound = (int)ZSTD_bm_buffered;
+            bounds.upperBound = (int)ZSTD_bm_stable;
+            return bounds;
+        case ZSTD_d_forceIgnoreChecksum:
+            bounds.lowerBound = (int)ZSTD_d_validateChecksum;
+            bounds.upperBound = (int)ZSTD_d_ignoreChecksum;
+            return bounds;
+        case ZSTD_d_refMultipleDDicts:
+            bounds.lowerBound = (int)ZSTD_rmd_refSingleDDict;
+            bounds.upperBound = (int)ZSTD_rmd_refMultipleDDicts;
+            return bounds;
+        default:;
+    }
+    bounds.error = ERROR(parameter_unsupported);
+    return bounds;
+}
+
+/* ZSTD_dParam_withinBounds:
+ * @return 1 if value is within dParam bounds,
+ * 0 otherwise */
+static int ZSTD_dParam_withinBounds(ZSTD_dParameter dParam, int value)
+{
+    ZSTD_bounds const bounds = ZSTD_dParam_getBounds(dParam);
+    if (ZSTD_isError(bounds.error)) return 0;
+    if (value < bounds.lowerBound) return 0;
+    if (value > bounds.upperBound) return 0;
+    return 1;
+}
+
+#define CHECK_DBOUNDS(p,v) {                \
+    RETURN_ERROR_IF(!ZSTD_dParam_withinBounds(p, v), parameter_outOfBound, ""); \
+}
+
+size_t ZSTD_DCtx_getParameter(ZSTD_DCtx* dctx, ZSTD_dParameter param, int* value)
+{
+    switch (param) {
+        case ZSTD_d_windowLogMax:
+            *value = (int)ZSTD_highbit32((U32)dctx->maxWindowSize);
+            return 0;
+        case ZSTD_d_format:
+            *value = (int)dctx->format;
+            return 0;
+        case ZSTD_d_stableOutBuffer:
+            *value = (int)dctx->outBufferMode;
+            return 0;
+        case ZSTD_d_forceIgnoreChecksum:
+            *value = (int)dctx->forceIgnoreChecksum;
+            return 0;
+        case ZSTD_d_refMultipleDDicts:
+            *value = (int)dctx->refMultipleDDicts;
+            return 0;
+        default:;
+    }
+    RETURN_ERROR(parameter_unsupported, "");
+}
+
+size_t ZSTD_DCtx_setParameter(ZSTD_DCtx* dctx, ZSTD_dParameter dParam, int value)
+{
+    RETURN_ERROR_IF(dctx->streamStage != zdss_init, stage_wrong, "");
+    switch(dParam) {
+        case ZSTD_d_windowLogMax:
+            if (value == 0) value = ZSTD_WINDOWLOG_LIMIT_DEFAULT;
+            CHECK_DBOUNDS(ZSTD_d_windowLogMax, value);
+            dctx->maxWindowSize = ((size_t)1) << value;
+            return 0;
+        case ZSTD_d_format:
+            CHECK_DBOUNDS(ZSTD_d_format, value);
+            dctx->format = (ZSTD_format_e)value;
+            return 0;
+        case ZSTD_d_stableOutBuffer:
+            CHECK_DBOUNDS(ZSTD_d_stableOutBuffer, value);
+            dctx->outBufferMode = (ZSTD_bufferMode_e)value;
+            return 0;
+        case ZSTD_d_forceIgnoreChecksum:
+            CHECK_DBOUNDS(ZSTD_d_forceIgnoreChecksum, value);
+            dctx->forceIgnoreChecksum = (ZSTD_forceIgnoreChecksum_e)value;
+            return 0;
+        case ZSTD_d_refMultipleDDicts:
+            CHECK_DBOUNDS(ZSTD_d_refMultipleDDicts, value);
+            if (dctx->staticSize != 0) {
+                RETURN_ERROR(parameter_unsupported, "Static dctx does not support multiple DDicts!");
+            }
+            dctx->refMultipleDDicts = (ZSTD_refMultipleDDicts_e)value;
+            return 0;
+        default:;
+    }
+    RETURN_ERROR(parameter_unsupported, "");
+}
+
+size_t ZSTD_DCtx_reset(ZSTD_DCtx* dctx, ZSTD_ResetDirective reset)
+{
+    if ( (reset == ZSTD_reset_session_only)
+      || (reset == ZSTD_reset_session_and_parameters) ) {
+        dctx->streamStage = zdss_init;
+        dctx->noForwardProgress = 0;
+    }
+    if ( (reset == ZSTD_reset_parameters)
+      || (reset == ZSTD_reset_session_and_parameters) ) {
+        RETURN_ERROR_IF(dctx->streamStage != zdss_init, stage_wrong, "");
+        ZSTD_clearDict(dctx);
+        ZSTD_DCtx_resetParameters(dctx);
+    }
+    return 0;
+}
+
+
+size_t ZSTD_sizeof_DStream(const ZSTD_DStream* dctx)
+{
+    return ZSTD_sizeof_DCtx(dctx);
+}
+
+size_t ZSTD_decodingBufferSize_min(unsigned long long windowSize, unsigned long long frameContentSize)
+{
+    size_t const blockSize = (size_t) MIN(windowSize, ZSTD_BLOCKSIZE_MAX);
+    unsigned long long const neededRBSize = windowSize + blockSize + (WILDCOPY_OVERLENGTH * 2);
+    unsigned long long const neededSize = MIN(frameContentSize, neededRBSize);
+    size_t const minRBSize = (size_t) neededSize;
+    RETURN_ERROR_IF((unsigned long long)minRBSize != neededSize,
+                    frameParameter_windowTooLarge, "");
+    return minRBSize;
+}
+
+size_t ZSTD_estimateDStreamSize(size_t windowSize)
+{
+    size_t const blockSize = MIN(windowSize, ZSTD_BLOCKSIZE_MAX);
+    size_t const inBuffSize = blockSize;  /* no block can be larger */
+    size_t const outBuffSize = ZSTD_decodingBufferSize_min(windowSize, ZSTD_CONTENTSIZE_UNKNOWN);
+    return ZSTD_estimateDCtxSize() + inBuffSize + outBuffSize;
+}
+
+size_t ZSTD_estimateDStreamSize_fromFrame(const void* src, size_t srcSize)
+{
+    U32 const windowSizeMax = 1U << ZSTD_WINDOWLOG_MAX;   /* note : should be user-selectable, but requires an additional parameter (or a dctx) */
+    ZSTD_frameHeader zfh;
+    size_t const err = ZSTD_getFrameHeader(&zfh, src, srcSize);
+    if (ZSTD_isError(err)) return err;
+    RETURN_ERROR_IF(err>0, srcSize_wrong, "");
+    RETURN_ERROR_IF(zfh.windowSize > windowSizeMax,
+                    frameParameter_windowTooLarge, "");
+    return ZSTD_estimateDStreamSize((size_t)zfh.windowSize);
+}
+
+
+/* *****   Decompression   ***** */
+
+static int ZSTD_DCtx_isOverflow(ZSTD_DStream* zds, size_t const neededInBuffSize, size_t const neededOutBuffSize)
+{
+    return (zds->inBuffSize + zds->outBuffSize) >= (neededInBuffSize + neededOutBuffSize) * ZSTD_WORKSPACETOOLARGE_FACTOR;
+}
+
+static void ZSTD_DCtx_updateOversizedDuration(ZSTD_DStream* zds, size_t const neededInBuffSize, size_t const neededOutBuffSize)
+{
+    if (ZSTD_DCtx_isOverflow(zds, neededInBuffSize, neededOutBuffSize))
+        zds->oversizedDuration++;
+    else
+        zds->oversizedDuration = 0;
+}
+
+static int ZSTD_DCtx_isOversizedTooLong(ZSTD_DStream* zds)
+{
+    return zds->oversizedDuration >= ZSTD_WORKSPACETOOLARGE_MAXDURATION;
+}
+
+/* Checks that the output buffer hasn't changed if ZSTD_obm_stable is used. */
+static size_t ZSTD_checkOutBuffer(ZSTD_DStream const* zds, ZSTD_outBuffer const* output)
+{
+    ZSTD_outBuffer const expect = zds->expectedOutBuffer;
+    /* No requirement when ZSTD_obm_stable is not enabled. */
+    if (zds->outBufferMode != ZSTD_bm_stable)
+        return 0;
+    /* Any buffer is allowed in zdss_init, this must be the same for every other call until
+     * the context is reset.
+     */
+    if (zds->streamStage == zdss_init)
+        return 0;
+    /* The buffer must match our expectation exactly. */
+    if (expect.dst == output->dst && expect.pos == output->pos && expect.size == output->size)
+        return 0;
+    RETURN_ERROR(dstBuffer_wrong, "ZSTD_d_stableOutBuffer enabled but output differs!");
+}
+
+/* Calls ZSTD_decompressContinue() with the right parameters for ZSTD_decompressStream()
+ * and updates the stage and the output buffer state. This call is extracted so it can be
+ * used both when reading directly from the ZSTD_inBuffer, and in buffered input mode.
+ * NOTE: You must break after calling this function since the streamStage is modified.
+ */
+static size_t ZSTD_decompressContinueStream(
+            ZSTD_DStream* zds, char** op, char* oend,
+            void const* src, size_t srcSize) {
+    int const isSkipFrame = ZSTD_isSkipFrame(zds);
+    if (zds->outBufferMode == ZSTD_bm_buffered) {
+        size_t const dstSize = isSkipFrame ? 0 : zds->outBuffSize - zds->outStart;
+        size_t const decodedSize = ZSTD_decompressContinue(zds,
+                zds->outBuff + zds->outStart, dstSize, src, srcSize);
+        FORWARD_IF_ERROR(decodedSize, "");
+        if (!decodedSize && !isSkipFrame) {
+            zds->streamStage = zdss_read;
+        } else {
+            zds->outEnd = zds->outStart + decodedSize;
+            zds->streamStage = zdss_flush;
+        }
+    } else {
+        /* Write directly into the output buffer */
+        size_t const dstSize = isSkipFrame ? 0 : (size_t)(oend - *op);
+        size_t const decodedSize = ZSTD_decompressContinue(zds, *op, dstSize, src, srcSize);
+        FORWARD_IF_ERROR(decodedSize, "");
+        *op += decodedSize;
+        /* Flushing is not needed. */
+        zds->streamStage = zdss_read;
+        assert(*op <= oend);
+        assert(zds->outBufferMode == ZSTD_bm_stable);
+    }
+    return 0;
+}
+
+size_t ZSTD_decompressStream(ZSTD_DStream* zds, ZSTD_outBuffer* output, ZSTD_inBuffer* input)
+{
+    const char* const src = (const char*)input->src;
+    const char* const istart = input->pos != 0 ? src + input->pos : src;
+    const char* const iend = input->size != 0 ? src + input->size : src;
+    const char* ip = istart;
+    char* const dst = (char*)output->dst;
+    char* const ostart = output->pos != 0 ? dst + output->pos : dst;
+    char* const oend = output->size != 0 ? dst + output->size : dst;
+    char* op = ostart;
+    U32 someMoreWork = 1;
+
+    DEBUGLOG(5, "ZSTD_decompressStream");
+    RETURN_ERROR_IF(
+        input->pos > input->size,
+        srcSize_wrong,
+        "forbidden. in: pos: %u   vs size: %u",
+        (U32)input->pos, (U32)input->size);
+    RETURN_ERROR_IF(
+        output->pos > output->size,
+        dstSize_tooSmall,
+        "forbidden. out: pos: %u   vs size: %u",
+        (U32)output->pos, (U32)output->size);
+    DEBUGLOG(5, "input size : %u", (U32)(input->size - input->pos));
+    FORWARD_IF_ERROR(ZSTD_checkOutBuffer(zds, output), "");
+
+    while (someMoreWork) {
+        switch(zds->streamStage)
+        {
+        case zdss_init :
+            DEBUGLOG(5, "stage zdss_init => transparent reset ");
+            zds->streamStage = zdss_loadHeader;
+            zds->lhSize = zds->inPos = zds->outStart = zds->outEnd = 0;
+            zds->legacyVersion = 0;
+            zds->hostageByte = 0;
+            zds->expectedOutBuffer = *output;
+            /* fall-through */
+
+        case zdss_loadHeader :
+            DEBUGLOG(5, "stage zdss_loadHeader (srcSize : %u)", (U32)(iend - ip));
+#if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT>=1)
+            if (zds->legacyVersion) {
+                RETURN_ERROR_IF(zds->staticSize, memory_allocation,
+                    "legacy support is incompatible with static dctx");
+                {   size_t const hint = ZSTD_decompressLegacyStream(zds->legacyContext, zds->legacyVersion, output, input);
+                    if (hint==0) zds->streamStage = zdss_init;
+                    return hint;
+            }   }
+#endif
+            {   size_t const hSize = ZSTD_getFrameHeader_advanced(&zds->fParams, zds->headerBuffer, zds->lhSize, zds->format);
+                if (zds->refMultipleDDicts && zds->ddictSet) {
+                    ZSTD_DCtx_selectFrameDDict(zds);
+                }
+                DEBUGLOG(5, "header size : %u", (U32)hSize);
+                if (ZSTD_isError(hSize)) {
+#if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT>=1)
+                    U32 const legacyVersion = ZSTD_isLegacy(istart, iend-istart);
+                    if (legacyVersion) {
+                        ZSTD_DDict const* const ddict = ZSTD_getDDict(zds);
+                        const void* const dict = ddict ? ZSTD_DDict_dictContent(ddict) : NULL;
+                        size_t const dictSize = ddict ? ZSTD_DDict_dictSize(ddict) : 0;
+                        DEBUGLOG(5, "ZSTD_decompressStream: detected legacy version v0.%u", legacyVersion);
+                        RETURN_ERROR_IF(zds->staticSize, memory_allocation,
+                            "legacy support is incompatible with static dctx");
+                        FORWARD_IF_ERROR(ZSTD_initLegacyStream(&zds->legacyContext,
+                                    zds->previousLegacyVersion, legacyVersion,
+                                    dict, dictSize), "");
+                        zds->legacyVersion = zds->previousLegacyVersion = legacyVersion;
+                        {   size_t const hint = ZSTD_decompressLegacyStream(zds->legacyContext, legacyVersion, output, input);
+                            if (hint==0) zds->streamStage = zdss_init;   /* or stay in stage zdss_loadHeader */
+                            return hint;
+                    }   }
+#endif
+                    return hSize;   /* error */
+                }
+                if (hSize != 0) {   /* need more input */
+                    size_t const toLoad = hSize - zds->lhSize;   /* if hSize!=0, hSize > zds->lhSize */
+                    size_t const remainingInput = (size_t)(iend-ip);
+                    assert(iend >= ip);
+                    if (toLoad > remainingInput) {   /* not enough input to load full header */
+                        if (remainingInput > 0) {
+                            ZSTD_memcpy(zds->headerBuffer + zds->lhSize, ip, remainingInput);
+                            zds->lhSize += remainingInput;
+                        }
+                        input->pos = input->size;
+                        return (MAX((size_t)ZSTD_FRAMEHEADERSIZE_MIN(zds->format), hSize) - zds->lhSize) + ZSTD_blockHeaderSize;   /* remaining header bytes + next block header */
+                    }
+                    assert(ip != NULL);
+                    ZSTD_memcpy(zds->headerBuffer + zds->lhSize, ip, toLoad); zds->lhSize = hSize; ip += toLoad;
+                    break;
+            }   }
+
+            /* check for single-pass mode opportunity */
+            if (zds->fParams.frameContentSize != ZSTD_CONTENTSIZE_UNKNOWN
+                && zds->fParams.frameType != ZSTD_skippableFrame
+                && (U64)(size_t)(oend-op) >= zds->fParams.frameContentSize) {
+                size_t const cSize = ZSTD_findFrameCompressedSize(istart, (size_t)(iend-istart));
+                if (cSize <= (size_t)(iend-istart)) {
+                    /* shortcut : using single-pass mode */
+                    size_t const decompressedSize = ZSTD_decompress_usingDDict(zds, op, (size_t)(oend-op), istart, cSize, ZSTD_getDDict(zds));
+                    if (ZSTD_isError(decompressedSize)) return decompressedSize;
+                    DEBUGLOG(4, "shortcut to single-pass ZSTD_decompress_usingDDict()")
+                    ip = istart + cSize;
+                    op += decompressedSize;
+                    zds->expected = 0;
+                    zds->streamStage = zdss_init;
+                    someMoreWork = 0;
+                    break;
+            }   }
+
+            /* Check output buffer is large enough for ZSTD_odm_stable. */
+            if (zds->outBufferMode == ZSTD_bm_stable
+                && zds->fParams.frameType != ZSTD_skippableFrame
+                && zds->fParams.frameContentSize != ZSTD_CONTENTSIZE_UNKNOWN
+                && (U64)(size_t)(oend-op) < zds->fParams.frameContentSize) {
+                RETURN_ERROR(dstSize_tooSmall, "ZSTD_obm_stable passed but ZSTD_outBuffer is too small");
+            }
+
+            /* Consume header (see ZSTDds_decodeFrameHeader) */
+            DEBUGLOG(4, "Consume header");
+            FORWARD_IF_ERROR(ZSTD_decompressBegin_usingDDict(zds, ZSTD_getDDict(zds)), "");
+
+            if ((MEM_readLE32(zds->headerBuffer) & ZSTD_MAGIC_SKIPPABLE_MASK) == ZSTD_MAGIC_SKIPPABLE_START) {  /* skippable frame */
+                zds->expected = MEM_readLE32(zds->headerBuffer + ZSTD_FRAMEIDSIZE);
+                zds->stage = ZSTDds_skipFrame;
+            } else {
+                FORWARD_IF_ERROR(ZSTD_decodeFrameHeader(zds, zds->headerBuffer, zds->lhSize), "");
+                zds->expected = ZSTD_blockHeaderSize;
+                zds->stage = ZSTDds_decodeBlockHeader;
+            }
+
+            /* control buffer memory usage */
+            DEBUGLOG(4, "Control max memory usage (%u KB <= max %u KB)",
+                        (U32)(zds->fParams.windowSize >>10),
+                        (U32)(zds->maxWindowSize >> 10) );
+            zds->fParams.windowSize = MAX(zds->fParams.windowSize, 1U << ZSTD_WINDOWLOG_ABSOLUTEMIN);
+            RETURN_ERROR_IF(zds->fParams.windowSize > zds->maxWindowSize,
+                            frameParameter_windowTooLarge, "");
+
+            /* Adapt buffer sizes to frame header instructions */
+            {   size_t const neededInBuffSize = MAX(zds->fParams.blockSizeMax, 4 /* frame checksum */);
+                size_t const neededOutBuffSize = zds->outBufferMode == ZSTD_bm_buffered
+                        ? ZSTD_decodingBufferSize_min(zds->fParams.windowSize, zds->fParams.frameContentSize)
+                        : 0;
+
+                ZSTD_DCtx_updateOversizedDuration(zds, neededInBuffSize, neededOutBuffSize);
+
+                {   int const tooSmall = (zds->inBuffSize < neededInBuffSize) || (zds->outBuffSize < neededOutBuffSize);
+                    int const tooLarge = ZSTD_DCtx_isOversizedTooLong(zds);
+
+                    if (tooSmall || tooLarge) {
+                        size_t const bufferSize = neededInBuffSize + neededOutBuffSize;
+                        DEBUGLOG(4, "inBuff  : from %u to %u",
+                                    (U32)zds->inBuffSize, (U32)neededInBuffSize);
+                        DEBUGLOG(4, "outBuff : from %u to %u",
+                                    (U32)zds->outBuffSize, (U32)neededOutBuffSize);
+                        if (zds->staticSize) {  /* static DCtx */
+                            DEBUGLOG(4, "staticSize : %u", (U32)zds->staticSize);
+                            assert(zds->staticSize >= sizeof(ZSTD_DCtx));  /* controlled at init */
+                            RETURN_ERROR_IF(
+                                bufferSize > zds->staticSize - sizeof(ZSTD_DCtx),
+                                memory_allocation, "");
+                        } else {
+                            ZSTD_customFree(zds->inBuff, zds->customMem);
+                            zds->inBuffSize = 0;
+                            zds->outBuffSize = 0;
+                            zds->inBuff = (char*)ZSTD_customMalloc(bufferSize, zds->customMem);
+                            RETURN_ERROR_IF(zds->inBuff == NULL, memory_allocation, "");
+                        }
+                        zds->inBuffSize = neededInBuffSize;
+                        zds->outBuff = zds->inBuff + zds->inBuffSize;
+                        zds->outBuffSize = neededOutBuffSize;
+            }   }   }
+            zds->streamStage = zdss_read;
+            /* fall-through */
+
+        case zdss_read:
+            DEBUGLOG(5, "stage zdss_read");
+            {   size_t const neededInSize = ZSTD_nextSrcSizeToDecompressWithInputSize(zds, (size_t)(iend - ip));
+                DEBUGLOG(5, "neededInSize = %u", (U32)neededInSize);
+                if (neededInSize==0) {  /* end of frame */
+                    zds->streamStage = zdss_init;
+                    someMoreWork = 0;
+                    break;
+                }
+                if ((size_t)(iend-ip) >= neededInSize) {  /* decode directly from src */
+                    FORWARD_IF_ERROR(ZSTD_decompressContinueStream(zds, &op, oend, ip, neededInSize), "");
+                    ip += neededInSize;
+                    /* Function modifies the stage so we must break */
+                    break;
+            }   }
+            if (ip==iend) { someMoreWork = 0; break; }   /* no more input */
+            zds->streamStage = zdss_load;
+            /* fall-through */
+
+        case zdss_load:
+            {   size_t const neededInSize = ZSTD_nextSrcSizeToDecompress(zds);
+                size_t const toLoad = neededInSize - zds->inPos;
+                int const isSkipFrame = ZSTD_isSkipFrame(zds);
+                size_t loadedSize;
+                /* At this point we shouldn't be decompressing a block that we can stream. */
+                assert(neededInSize == ZSTD_nextSrcSizeToDecompressWithInputSize(zds, iend - ip));
+                if (isSkipFrame) {
+                    loadedSize = MIN(toLoad, (size_t)(iend-ip));
+                } else {
+                    RETURN_ERROR_IF(toLoad > zds->inBuffSize - zds->inPos,
+                                    corruption_detected,
+                                    "should never happen");
+                    loadedSize = ZSTD_limitCopy(zds->inBuff + zds->inPos, toLoad, ip, (size_t)(iend-ip));
+                }
+                ip += loadedSize;
+                zds->inPos += loadedSize;
+                if (loadedSize < toLoad) { someMoreWork = 0; break; }   /* not enough input, wait for more */
+
+                /* decode loaded input */
+                zds->inPos = 0;   /* input is consumed */
+                FORWARD_IF_ERROR(ZSTD_decompressContinueStream(zds, &op, oend, zds->inBuff, neededInSize), "");
+                /* Function modifies the stage so we must break */
+                break;
+            }
+        case zdss_flush:
+            {   size_t const toFlushSize = zds->outEnd - zds->outStart;
+                size_t const flushedSize = ZSTD_limitCopy(op, (size_t)(oend-op), zds->outBuff + zds->outStart, toFlushSize);
+                op += flushedSize;
+                zds->outStart += flushedSize;
+                if (flushedSize == toFlushSize) {  /* flush completed */
+                    zds->streamStage = zdss_read;
+                    if ( (zds->outBuffSize < zds->fParams.frameContentSize)
+                      && (zds->outStart + zds->fParams.blockSizeMax > zds->outBuffSize) ) {
+                        DEBUGLOG(5, "restart filling outBuff from beginning (left:%i, needed:%u)",
+                                (int)(zds->outBuffSize - zds->outStart),
+                                (U32)zds->fParams.blockSizeMax);
+                        zds->outStart = zds->outEnd = 0;
+                    }
+                    break;
+            }   }
+            /* cannot complete flush */
+            someMoreWork = 0;
+            break;
+
+        default:
+            assert(0);    /* impossible */
+            RETURN_ERROR(GENERIC, "impossible to reach");   /* some compiler require default to do something */
+    }   }
+
+    /* result */
+    input->pos = (size_t)(ip - (const char*)(input->src));
+    output->pos = (size_t)(op - (char*)(output->dst));
+
+    /* Update the expected output buffer for ZSTD_obm_stable. */
+    zds->expectedOutBuffer = *output;
+
+    if ((ip==istart) && (op==ostart)) {  /* no forward progress */
+        zds->noForwardProgress ++;
+        if (zds->noForwardProgress >= ZSTD_NO_FORWARD_PROGRESS_MAX) {
+            RETURN_ERROR_IF(op==oend, dstSize_tooSmall, "");
+            RETURN_ERROR_IF(ip==iend, srcSize_wrong, "");
+            assert(0);
+        }
+    } else {
+        zds->noForwardProgress = 0;
+    }
+    {   size_t nextSrcSizeHint = ZSTD_nextSrcSizeToDecompress(zds);
+        if (!nextSrcSizeHint) {   /* frame fully decoded */
+            if (zds->outEnd == zds->outStart) {  /* output fully flushed */
+                if (zds->hostageByte) {
+                    if (input->pos >= input->size) {
+                        /* can't release hostage (not present) */
+                        zds->streamStage = zdss_read;
+                        return 1;
+                    }
+                    input->pos++;  /* release hostage */
+                }   /* zds->hostageByte */
+                return 0;
+            }  /* zds->outEnd == zds->outStart */
+            if (!zds->hostageByte) { /* output not fully flushed; keep last byte as hostage; will be released when all output is flushed */
+                input->pos--;   /* note : pos > 0, otherwise, impossible to finish reading last block */
+                zds->hostageByte=1;
+            }
+            return 1;
+        }  /* nextSrcSizeHint==0 */
+        nextSrcSizeHint += ZSTD_blockHeaderSize * (ZSTD_nextInputType(zds) == ZSTDnit_block);   /* preload header of next block */
+        assert(zds->inPos <= nextSrcSizeHint);
+        nextSrcSizeHint -= zds->inPos;   /* part already loaded*/
+        return nextSrcSizeHint;
+    }
+}
+
+size_t ZSTD_decompressStream_simpleArgs (
+                            ZSTD_DCtx* dctx,
+                            void* dst, size_t dstCapacity, size_t* dstPos,
+                      const void* src, size_t srcSize, size_t* srcPos)
+{
+    ZSTD_outBuffer output = { dst, dstCapacity, *dstPos };
+    ZSTD_inBuffer  input  = { src, srcSize, *srcPos };
+    /* ZSTD_compress_generic() will check validity of dstPos and srcPos */
+    size_t const cErr = ZSTD_decompressStream(dctx, &output, &input);
+    *dstPos = output.pos;
+    *srcPos = input.pos;
+    return cErr;
+}
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/decompress/zstd_decompress_internal.h mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/decompress/zstd_decompress_internal.h
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/decompress/zstd_decompress_internal.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/decompress/zstd_decompress_internal.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,205 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+
+/* zstd_decompress_internal:
+ * objects and definitions shared within lib/decompress modules */
+
+ #ifndef ZSTD_DECOMPRESS_INTERNAL_H
+ #define ZSTD_DECOMPRESS_INTERNAL_H
+
+
+/*-*******************************************************
+ *  Dependencies
+ *********************************************************/
+#include "../common/mem.h"             /* BYTE, U16, U32 */
+#include "../common/zstd_internal.h"   /* ZSTD_seqSymbol */
+
+
+
+/*-*******************************************************
+ *  Constants
+ *********************************************************/
+static UNUSED_ATTR const U32 LL_base[MaxLL+1] = {
+                 0,    1,    2,     3,     4,     5,     6,      7,
+                 8,    9,   10,    11,    12,    13,    14,     15,
+                16,   18,   20,    22,    24,    28,    32,     40,
+                48,   64, 0x80, 0x100, 0x200, 0x400, 0x800, 0x1000,
+                0x2000, 0x4000, 0x8000, 0x10000 };
+
+static UNUSED_ATTR const U32 OF_base[MaxOff+1] = {
+                 0,        1,       1,       5,     0xD,     0x1D,     0x3D,     0x7D,
+                 0xFD,   0x1FD,   0x3FD,   0x7FD,   0xFFD,   0x1FFD,   0x3FFD,   0x7FFD,
+                 0xFFFD, 0x1FFFD, 0x3FFFD, 0x7FFFD, 0xFFFFD, 0x1FFFFD, 0x3FFFFD, 0x7FFFFD,
+                 0xFFFFFD, 0x1FFFFFD, 0x3FFFFFD, 0x7FFFFFD, 0xFFFFFFD, 0x1FFFFFFD, 0x3FFFFFFD, 0x7FFFFFFD };
+
+static UNUSED_ATTR const U32 OF_bits[MaxOff+1] = {
+                     0,  1,  2,  3,  4,  5,  6,  7,
+                     8,  9, 10, 11, 12, 13, 14, 15,
+                    16, 17, 18, 19, 20, 21, 22, 23,
+                    24, 25, 26, 27, 28, 29, 30, 31 };
+
+static UNUSED_ATTR const U32 ML_base[MaxML+1] = {
+                     3,  4,  5,    6,     7,     8,     9,    10,
+                    11, 12, 13,   14,    15,    16,    17,    18,
+                    19, 20, 21,   22,    23,    24,    25,    26,
+                    27, 28, 29,   30,    31,    32,    33,    34,
+                    35, 37, 39,   41,    43,    47,    51,    59,
+                    67, 83, 99, 0x83, 0x103, 0x203, 0x403, 0x803,
+                    0x1003, 0x2003, 0x4003, 0x8003, 0x10003 };
+
+
+/*-*******************************************************
+ *  Decompression types
+ *********************************************************/
+ typedef struct {
+     U32 fastMode;
+     U32 tableLog;
+ } ZSTD_seqSymbol_header;
+
+ typedef struct {
+     U16  nextState;
+     BYTE nbAdditionalBits;
+     BYTE nbBits;
+     U32  baseValue;
+ } ZSTD_seqSymbol;
+
+ #define SEQSYMBOL_TABLE_SIZE(log)   (1 + (1 << (log)))
+
+#define ZSTD_BUILD_FSE_TABLE_WKSP_SIZE (sizeof(S16) * (MaxSeq + 1) + (1u << MaxFSELog) + sizeof(U64))
+#define ZSTD_BUILD_FSE_TABLE_WKSP_SIZE_U32 ((ZSTD_BUILD_FSE_TABLE_WKSP_SIZE + sizeof(U32) - 1) / sizeof(U32))
+
+typedef struct {
+    ZSTD_seqSymbol LLTable[SEQSYMBOL_TABLE_SIZE(LLFSELog)];    /* Note : Space reserved for FSE Tables */
+    ZSTD_seqSymbol OFTable[SEQSYMBOL_TABLE_SIZE(OffFSELog)];   /* is also used as temporary workspace while building hufTable during DDict creation */
+    ZSTD_seqSymbol MLTable[SEQSYMBOL_TABLE_SIZE(MLFSELog)];    /* and therefore must be at least HUF_DECOMPRESS_WORKSPACE_SIZE large */
+    HUF_DTable hufTable[HUF_DTABLE_SIZE(HufLog)];  /* can accommodate HUF_decompress4X */
+    U32 rep[ZSTD_REP_NUM];
+    U32 workspace[ZSTD_BUILD_FSE_TABLE_WKSP_SIZE_U32];
+} ZSTD_entropyDTables_t;
+
+typedef enum { ZSTDds_getFrameHeaderSize, ZSTDds_decodeFrameHeader,
+               ZSTDds_decodeBlockHeader, ZSTDds_decompressBlock,
+               ZSTDds_decompressLastBlock, ZSTDds_checkChecksum,
+               ZSTDds_decodeSkippableHeader, ZSTDds_skipFrame } ZSTD_dStage;
+
+typedef enum { zdss_init=0, zdss_loadHeader,
+               zdss_read, zdss_load, zdss_flush } ZSTD_dStreamStage;
+
+typedef enum {
+    ZSTD_use_indefinitely = -1,  /* Use the dictionary indefinitely */
+    ZSTD_dont_use = 0,           /* Do not use the dictionary (if one exists free it) */
+    ZSTD_use_once = 1            /* Use the dictionary once and set to ZSTD_dont_use */
+} ZSTD_dictUses_e;
+
+/* Hashset for storing references to multiple ZSTD_DDict within ZSTD_DCtx */
+typedef struct {
+    const ZSTD_DDict** ddictPtrTable;
+    size_t ddictPtrTableSize;
+    size_t ddictPtrCount;
+} ZSTD_DDictHashSet;
+
+struct ZSTD_DCtx_s
+{
+    const ZSTD_seqSymbol* LLTptr;
+    const ZSTD_seqSymbol* MLTptr;
+    const ZSTD_seqSymbol* OFTptr;
+    const HUF_DTable* HUFptr;
+    ZSTD_entropyDTables_t entropy;
+    U32 workspace[HUF_DECOMPRESS_WORKSPACE_SIZE_U32];   /* space needed when building huffman tables */
+    const void* previousDstEnd;   /* detect continuity */
+    const void* prefixStart;      /* start of current segment */
+    const void* virtualStart;     /* virtual start of previous segment if it was just before current one */
+    const void* dictEnd;          /* end of previous segment */
+    size_t expected;
+    ZSTD_frameHeader fParams;
+    U64 processedCSize;
+    U64 decodedSize;
+    blockType_e bType;            /* used in ZSTD_decompressContinue(), store blockType between block header decoding and block decompression stages */
+    ZSTD_dStage stage;
+    U32 litEntropy;
+    U32 fseEntropy;
+    XXH64_state_t xxhState;
+    size_t headerSize;
+    ZSTD_format_e format;
+    ZSTD_forceIgnoreChecksum_e forceIgnoreChecksum;   /* User specified: if == 1, will ignore checksums in compressed frame. Default == 0 */
+    U32 validateChecksum;         /* if == 1, will validate checksum. Is == 1 if (fParams.checksumFlag == 1) and (forceIgnoreChecksum == 0). */
+    const BYTE* litPtr;
+    ZSTD_customMem customMem;
+    size_t litSize;
+    size_t rleSize;
+    size_t staticSize;
+    int bmi2;                     /* == 1 if the CPU supports BMI2 and 0 otherwise. CPU support is determined dynamically once per context lifetime. */
+
+    /* dictionary */
+    ZSTD_DDict* ddictLocal;
+    const ZSTD_DDict* ddict;     /* set by ZSTD_initDStream_usingDDict(), or ZSTD_DCtx_refDDict() */
+    U32 dictID;
+    int ddictIsCold;             /* if == 1 : dictionary is "new" for working context, and presumed "cold" (not in cpu cache) */
+    ZSTD_dictUses_e dictUses;
+    ZSTD_DDictHashSet* ddictSet;                    /* Hash set for multiple ddicts */
+    ZSTD_refMultipleDDicts_e refMultipleDDicts;     /* User specified: if == 1, will allow references to multiple DDicts. Default == 0 (disabled) */
+
+    /* streaming */
+    ZSTD_dStreamStage streamStage;
+    char*  inBuff;
+    size_t inBuffSize;
+    size_t inPos;
+    size_t maxWindowSize;
+    char*  outBuff;
+    size_t outBuffSize;
+    size_t outStart;
+    size_t outEnd;
+    size_t lhSize;
+    void* legacyContext;
+    U32 previousLegacyVersion;
+    U32 legacyVersion;
+    U32 hostageByte;
+    int noForwardProgress;
+    ZSTD_bufferMode_e outBufferMode;
+    ZSTD_outBuffer expectedOutBuffer;
+
+    /* workspace */
+    BYTE litBuffer[ZSTD_BLOCKSIZE_MAX + WILDCOPY_OVERLENGTH];
+    BYTE headerBuffer[ZSTD_FRAMEHEADERSIZE_MAX];
+
+    size_t oversizedDuration;
+
+#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+    void const* dictContentBeginForFuzzing;
+    void const* dictContentEndForFuzzing;
+#endif
+
+    /* Tracing */
+#if ZSTD_TRACE
+    ZSTD_TraceCtx traceCtx;
+#endif
+};  /* typedef'd to ZSTD_DCtx within "zstd.h" */
+
+
+/*-*******************************************************
+ *  Shared internal functions
+ *********************************************************/
+
+/*! ZSTD_loadDEntropy() :
+ *  dict : must point at beginning of a valid zstd dictionary.
+ * @return : size of dictionary header (size of magic number + dict ID + entropy tables) */
+size_t ZSTD_loadDEntropy(ZSTD_entropyDTables_t* entropy,
+                   const void* const dict, size_t const dictSize);
+
+/*! ZSTD_checkContinuity() :
+ *  check if next `dst` follows previous position, where decompression ended.
+ *  If yes, do nothing (continue on current segment).
+ *  If not, classify previous segment as "external dictionary", and start a new segment.
+ *  This function cannot fail. */
+void ZSTD_checkContinuity(ZSTD_DCtx* dctx, const void* dst, size_t dstSize);
+
+
+#endif /* ZSTD_DECOMPRESS_INTERNAL_H */
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/deprecated/zbuff_common.c mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/deprecated/zbuff_common.c
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/deprecated/zbuff_common.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/deprecated/zbuff_common.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+/*-*************************************
+*  Dependencies
+***************************************/
+#include "../common/error_private.h"
+#include "zbuff.h"
+
+/*-****************************************
+*  ZBUFF Error Management  (deprecated)
+******************************************/
+
+/*! ZBUFF_isError() :
+*   tells if a return value is an error code */
+unsigned ZBUFF_isError(size_t errorCode) { return ERR_isError(errorCode); }
+/*! ZBUFF_getErrorName() :
+*   provides error code string from function result (useful for debugging) */
+const char* ZBUFF_getErrorName(size_t errorCode) { return ERR_getErrorName(errorCode); }
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/deprecated/zbuff_compress.c mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/deprecated/zbuff_compress.c
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/deprecated/zbuff_compress.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/deprecated/zbuff_compress.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+
+
+/* *************************************
+*  Dependencies
+***************************************/
+#define ZBUFF_STATIC_LINKING_ONLY
+#include "zbuff.h"
+
+
+/*-***********************************************************
+*  Streaming compression
+*
+*  A ZBUFF_CCtx object is required to track streaming operation.
+*  Use ZBUFF_createCCtx() and ZBUFF_freeCCtx() to create/release resources.
+*  Use ZBUFF_compressInit() to start a new compression operation.
+*  ZBUFF_CCtx objects can be reused multiple times.
+*
+*  Use ZBUFF_compressContinue() repetitively to consume your input.
+*  *srcSizePtr and *dstCapacityPtr can be any size.
+*  The function will report how many bytes were read or written by modifying *srcSizePtr and *dstCapacityPtr.
+*  Note that it may not consume the entire input, in which case it's up to the caller to call again the function with remaining input.
+*  The content of dst will be overwritten (up to *dstCapacityPtr) at each function call, so save its content if it matters or change dst .
+*  @return : a hint to preferred nb of bytes to use as input for next function call (it's only a hint, to improve latency)
+*            or an error code, which can be tested using ZBUFF_isError().
+*
+*  ZBUFF_compressFlush() can be used to instruct ZBUFF to compress and output whatever remains within its buffer.
+*  Note that it will not output more than *dstCapacityPtr.
+*  Therefore, some content might still be left into its internal buffer if dst buffer is too small.
+*  @return : nb of bytes still present into internal buffer (0 if it's empty)
+*            or an error code, which can be tested using ZBUFF_isError().
+*
+*  ZBUFF_compressEnd() instructs to finish a frame.
+*  It will perform a flush and write frame epilogue.
+*  Similar to ZBUFF_compressFlush(), it may not be able to output the entire internal buffer content if *dstCapacityPtr is too small.
+*  @return : nb of bytes still present into internal buffer (0 if it's empty)
+*            or an error code, which can be tested using ZBUFF_isError().
+*
+*  Hint : recommended buffer sizes (not compulsory)
+*  input : ZSTD_BLOCKSIZE_MAX (128 KB), internal unit size, it improves latency to use this value.
+*  output : ZSTD_compressBound(ZSTD_BLOCKSIZE_MAX) + ZSTD_blockHeaderSize + ZBUFF_endFrameSize : ensures it's always possible to write/flush/end a full block at best speed.
+* ***********************************************************/
+
+ZBUFF_CCtx* ZBUFF_createCCtx(void)
+{
+    return ZSTD_createCStream();
+}
+
+ZBUFF_CCtx* ZBUFF_createCCtx_advanced(ZSTD_customMem customMem)
+{
+    return ZSTD_createCStream_advanced(customMem);
+}
+
+size_t ZBUFF_freeCCtx(ZBUFF_CCtx* zbc)
+{
+    return ZSTD_freeCStream(zbc);
+}
+
+
+/* ======   Initialization   ====== */
+
+size_t ZBUFF_compressInit_advanced(ZBUFF_CCtx* zbc,
+                                   const void* dict, size_t dictSize,
+                                   ZSTD_parameters params, unsigned long long pledgedSrcSize)
+{
+    if (pledgedSrcSize==0) pledgedSrcSize = ZSTD_CONTENTSIZE_UNKNOWN;  /* preserve "0 == unknown" behavior */
+    return ZSTD_initCStream_advanced(zbc, dict, dictSize, params, pledgedSrcSize);
+}
+
+
+size_t ZBUFF_compressInitDictionary(ZBUFF_CCtx* zbc, const void* dict, size_t dictSize, int compressionLevel)
+{
+    return ZSTD_initCStream_usingDict(zbc, dict, dictSize, compressionLevel);
+}
+
+size_t ZBUFF_compressInit(ZBUFF_CCtx* zbc, int compressionLevel)
+{
+    return ZSTD_initCStream(zbc, compressionLevel);
+}
+
+/* ======   Compression   ====== */
+
+
+size_t ZBUFF_compressContinue(ZBUFF_CCtx* zbc,
+                              void* dst, size_t* dstCapacityPtr,
+                        const void* src, size_t* srcSizePtr)
+{
+    size_t result;
+    ZSTD_outBuffer outBuff;
+    ZSTD_inBuffer inBuff;
+    outBuff.dst = dst;
+    outBuff.pos = 0;
+    outBuff.size = *dstCapacityPtr;
+    inBuff.src = src;
+    inBuff.pos = 0;
+    inBuff.size = *srcSizePtr;
+    result = ZSTD_compressStream(zbc, &outBuff, &inBuff);
+    *dstCapacityPtr = outBuff.pos;
+    *srcSizePtr = inBuff.pos;
+    return result;
+}
+
+
+
+/* ======   Finalize   ====== */
+
+size_t ZBUFF_compressFlush(ZBUFF_CCtx* zbc, void* dst, size_t* dstCapacityPtr)
+{
+    size_t result;
+    ZSTD_outBuffer outBuff;
+    outBuff.dst = dst;
+    outBuff.pos = 0;
+    outBuff.size = *dstCapacityPtr;
+    result = ZSTD_flushStream(zbc, &outBuff);
+    *dstCapacityPtr = outBuff.pos;
+    return result;
+}
+
+
+size_t ZBUFF_compressEnd(ZBUFF_CCtx* zbc, void* dst, size_t* dstCapacityPtr)
+{
+    size_t result;
+    ZSTD_outBuffer outBuff;
+    outBuff.dst = dst;
+    outBuff.pos = 0;
+    outBuff.size = *dstCapacityPtr;
+    result = ZSTD_endStream(zbc, &outBuff);
+    *dstCapacityPtr = outBuff.pos;
+    return result;
+}
+
+
+
+/* *************************************
+*  Tool functions
+***************************************/
+size_t ZBUFF_recommendedCInSize(void)  { return ZSTD_CStreamInSize(); }
+size_t ZBUFF_recommendedCOutSize(void) { return ZSTD_CStreamOutSize(); }
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/deprecated/zbuff_decompress.c mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/deprecated/zbuff_decompress.c
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/deprecated/zbuff_decompress.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/deprecated/zbuff_decompress.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+
+
+/* *************************************
+*  Dependencies
+***************************************/
+#define ZBUFF_STATIC_LINKING_ONLY
+#include "zbuff.h"
+
+
+ZBUFF_DCtx* ZBUFF_createDCtx(void)
+{
+    return ZSTD_createDStream();
+}
+
+ZBUFF_DCtx* ZBUFF_createDCtx_advanced(ZSTD_customMem customMem)
+{
+    return ZSTD_createDStream_advanced(customMem);
+}
+
+size_t ZBUFF_freeDCtx(ZBUFF_DCtx* zbd)
+{
+    return ZSTD_freeDStream(zbd);
+}
+
+
+/* *** Initialization *** */
+
+size_t ZBUFF_decompressInitDictionary(ZBUFF_DCtx* zbd, const void* dict, size_t dictSize)
+{
+    return ZSTD_initDStream_usingDict(zbd, dict, dictSize);
+}
+
+size_t ZBUFF_decompressInit(ZBUFF_DCtx* zbd)
+{
+    return ZSTD_initDStream(zbd);
+}
+
+
+/* *** Decompression *** */
+
+size_t ZBUFF_decompressContinue(ZBUFF_DCtx* zbd,
+                                void* dst, size_t* dstCapacityPtr,
+                          const void* src, size_t* srcSizePtr)
+{
+    ZSTD_outBuffer outBuff;
+    ZSTD_inBuffer inBuff;
+    size_t result;
+    outBuff.dst  = dst;
+    outBuff.pos  = 0;
+    outBuff.size = *dstCapacityPtr;
+    inBuff.src  = src;
+    inBuff.pos  = 0;
+    inBuff.size = *srcSizePtr;
+    result = ZSTD_decompressStream(zbd, &outBuff, &inBuff);
+    *dstCapacityPtr = outBuff.pos;
+    *srcSizePtr = inBuff.pos;
+    return result;
+}
+
+
+/* *************************************
+*  Tool functions
+***************************************/
+size_t ZBUFF_recommendedDInSize(void)  { return ZSTD_DStreamInSize(); }
+size_t ZBUFF_recommendedDOutSize(void) { return ZSTD_DStreamOutSize(); }
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/deprecated/zbuff.h mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/deprecated/zbuff.h
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/deprecated/zbuff.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/deprecated/zbuff.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,214 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+/* ***************************************************************
+*  NOTES/WARNINGS
+******************************************************************/
+/* The streaming API defined here is deprecated.
+ * Consider migrating towards ZSTD_compressStream() API in `zstd.h`
+ * See 'lib/README.md'.
+ *****************************************************************/
+
+
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
+#ifndef ZSTD_BUFFERED_H_23987
+#define ZSTD_BUFFERED_H_23987
+
+/* *************************************
+*  Dependencies
+***************************************/
+#include <stddef.h>      /* size_t */
+#include "../zstd.h"        /* ZSTD_CStream, ZSTD_DStream, ZSTDLIB_API */
+
+
+/* ***************************************************************
+*  Compiler specifics
+*****************************************************************/
+/* Deprecation warnings */
+/* Should these warnings be a problem,
+ * it is generally possible to disable them,
+ * typically with -Wno-deprecated-declarations for gcc
+ * or _CRT_SECURE_NO_WARNINGS in Visual.
+ * Otherwise, it's also possible to define ZBUFF_DISABLE_DEPRECATE_WARNINGS
+ */
+#ifdef ZBUFF_DISABLE_DEPRECATE_WARNINGS
+#  define ZBUFF_DEPRECATED(message) ZSTDLIB_API  /* disable deprecation warnings */
+#else
+#  if defined (__cplusplus) && (__cplusplus >= 201402) /* C++14 or greater */
+#    define ZBUFF_DEPRECATED(message) [[deprecated(message)]] ZSTDLIB_API
+#  elif (defined(GNUC) && (GNUC > 4 || (GNUC == 4 && GNUC_MINOR >= 5))) || defined(__clang__)
+#    define ZBUFF_DEPRECATED(message) ZSTDLIB_API __attribute__((deprecated(message)))
+#  elif defined(__GNUC__) && (__GNUC__ >= 3)
+#    define ZBUFF_DEPRECATED(message) ZSTDLIB_API __attribute__((deprecated))
+#  elif defined(_MSC_VER)
+#    define ZBUFF_DEPRECATED(message) ZSTDLIB_API __declspec(deprecated(message))
+#  else
+#    pragma message("WARNING: You need to implement ZBUFF_DEPRECATED for this compiler")
+#    define ZBUFF_DEPRECATED(message) ZSTDLIB_API
+#  endif
+#endif /* ZBUFF_DISABLE_DEPRECATE_WARNINGS */
+
+
+/* *************************************
+*  Streaming functions
+***************************************/
+/* This is the easier "buffered" streaming API,
+*  using an internal buffer to lift all restrictions on user-provided buffers
+*  which can be any size, any place, for both input and output.
+*  ZBUFF and ZSTD are 100% interoperable,
+*  frames created by one can be decoded by the other one */
+
+typedef ZSTD_CStream ZBUFF_CCtx;
+ZBUFF_DEPRECATED("use ZSTD_createCStream") ZBUFF_CCtx* ZBUFF_createCCtx(void);
+ZBUFF_DEPRECATED("use ZSTD_freeCStream")   size_t      ZBUFF_freeCCtx(ZBUFF_CCtx* cctx);
+
+ZBUFF_DEPRECATED("use ZSTD_initCStream")           size_t ZBUFF_compressInit(ZBUFF_CCtx* cctx, int compressionLevel);
+ZBUFF_DEPRECATED("use ZSTD_initCStream_usingDict") size_t ZBUFF_compressInitDictionary(ZBUFF_CCtx* cctx, const void* dict, size_t dictSize, int compressionLevel);
+
+ZBUFF_DEPRECATED("use ZSTD_compressStream") size_t ZBUFF_compressContinue(ZBUFF_CCtx* cctx, void* dst, size_t* dstCapacityPtr, const void* src, size_t* srcSizePtr);
+ZBUFF_DEPRECATED("use ZSTD_flushStream")    size_t ZBUFF_compressFlush(ZBUFF_CCtx* cctx, void* dst, size_t* dstCapacityPtr);
+ZBUFF_DEPRECATED("use ZSTD_endStream")      size_t ZBUFF_compressEnd(ZBUFF_CCtx* cctx, void* dst, size_t* dstCapacityPtr);
+
+/*-*************************************************
+*  Streaming compression - howto
+*
+*  A ZBUFF_CCtx object is required to track streaming operation.
+*  Use ZBUFF_createCCtx() and ZBUFF_freeCCtx() to create/release resources.
+*  ZBUFF_CCtx objects can be reused multiple times.
+*
+*  Start by initializing ZBUF_CCtx.
+*  Use ZBUFF_compressInit() to start a new compression operation.
+*  Use ZBUFF_compressInitDictionary() for a compression which requires a dictionary.
+*
+*  Use ZBUFF_compressContinue() repetitively to consume input stream.
+*  *srcSizePtr and *dstCapacityPtr can be any size.
+*  The function will report how many bytes were read or written within *srcSizePtr and *dstCapacityPtr.
+*  Note that it may not consume the entire input, in which case it's up to the caller to present again remaining data.
+*  The content of `dst` will be overwritten (up to *dstCapacityPtr) at each call, so save its content if it matters or change @dst .
+*  @return : a hint to preferred nb of bytes to use as input for next function call (it's just a hint, to improve latency)
+*            or an error code, which can be tested using ZBUFF_isError().
+*
+*  At any moment, it's possible to flush whatever data remains within buffer, using ZBUFF_compressFlush().
+*  The nb of bytes written into `dst` will be reported into *dstCapacityPtr.
+*  Note that the function cannot output more than *dstCapacityPtr,
+*  therefore, some content might still be left into internal buffer if *dstCapacityPtr is too small.
+*  @return : nb of bytes still present into internal buffer (0 if it's empty)
+*            or an error code, which can be tested using ZBUFF_isError().
+*
+*  ZBUFF_compressEnd() instructs to finish a frame.
+*  It will perform a flush and write frame epilogue.
+*  The epilogue is required for decoders to consider a frame completed.
+*  Similar to ZBUFF_compressFlush(), it may not be able to output the entire internal buffer content if *dstCapacityPtr is too small.
+*  In which case, call again ZBUFF_compressFlush() to complete the flush.
+*  @return : nb of bytes still present into internal buffer (0 if it's empty)
+*            or an error code, which can be tested using ZBUFF_isError().
+*
+*  Hint : _recommended buffer_ sizes (not compulsory) : ZBUFF_recommendedCInSize() / ZBUFF_recommendedCOutSize()
+*  input : ZBUFF_recommendedCInSize==128 KB block size is the internal unit, use this value to reduce intermediate stages (better latency)
+*  output : ZBUFF_recommendedCOutSize==ZSTD_compressBound(128 KB) + 3 + 3 : ensures it's always possible to write/flush/end a full block. Skip some buffering.
+*  By using both, it ensures that input will be entirely consumed, and output will always contain the result, reducing intermediate buffering.
+* **************************************************/
+
+
+typedef ZSTD_DStream ZBUFF_DCtx;
+ZBUFF_DEPRECATED("use ZSTD_createDStream") ZBUFF_DCtx* ZBUFF_createDCtx(void);
+ZBUFF_DEPRECATED("use ZSTD_freeDStream")   size_t      ZBUFF_freeDCtx(ZBUFF_DCtx* dctx);
+
+ZBUFF_DEPRECATED("use ZSTD_initDStream")           size_t ZBUFF_decompressInit(ZBUFF_DCtx* dctx);
+ZBUFF_DEPRECATED("use ZSTD_initDStream_usingDict") size_t ZBUFF_decompressInitDictionary(ZBUFF_DCtx* dctx, const void* dict, size_t dictSize);
+
+ZBUFF_DEPRECATED("use ZSTD_decompressStream") size_t ZBUFF_decompressContinue(ZBUFF_DCtx* dctx,
+                                            void* dst, size_t* dstCapacityPtr,
+                                      const void* src, size_t* srcSizePtr);
+
+/*-***************************************************************************
+*  Streaming decompression howto
+*
+*  A ZBUFF_DCtx object is required to track streaming operations.
+*  Use ZBUFF_createDCtx() and ZBUFF_freeDCtx() to create/release resources.
+*  Use ZBUFF_decompressInit() to start a new decompression operation,
+*   or ZBUFF_decompressInitDictionary() if decompression requires a dictionary.
+*  Note that ZBUFF_DCtx objects can be re-init multiple times.
+*
+*  Use ZBUFF_decompressContinue() repetitively to consume your input.
+*  *srcSizePtr and *dstCapacityPtr can be any size.
+*  The function will report how many bytes were read or written by modifying *srcSizePtr and *dstCapacityPtr.
+*  Note that it may not consume the entire input, in which case it's up to the caller to present remaining input again.
+*  The content of `dst` will be overwritten (up to *dstCapacityPtr) at each function call, so save its content if it matters, or change `dst`.
+*  @return : 0 when a frame is completely decoded and fully flushed,
+*            1 when there is still some data left within internal buffer to flush,
+*            >1 when more data is expected, with value being a suggested next input size (it's just a hint, which helps latency),
+*            or an error code, which can be tested using ZBUFF_isError().
+*
+*  Hint : recommended buffer sizes (not compulsory) : ZBUFF_recommendedDInSize() and ZBUFF_recommendedDOutSize()
+*  output : ZBUFF_recommendedDOutSize== 128 KB block size is the internal unit, it ensures it's always possible to write a full block when decoded.
+*  input  : ZBUFF_recommendedDInSize == 128KB + 3;
+*           just follow indications from ZBUFF_decompressContinue() to minimize latency. It should always be <= 128 KB + 3 .
+* *******************************************************************************/
+
+
+/* *************************************
+*  Tool functions
+***************************************/
+ZBUFF_DEPRECATED("use ZSTD_isError")      unsigned ZBUFF_isError(size_t errorCode);
+ZBUFF_DEPRECATED("use ZSTD_getErrorName") const char* ZBUFF_getErrorName(size_t errorCode);
+
+/** Functions below provide recommended buffer sizes for Compression or Decompression operations.
+*   These sizes are just hints, they tend to offer better latency */
+ZBUFF_DEPRECATED("use ZSTD_CStreamInSize")  size_t ZBUFF_recommendedCInSize(void);
+ZBUFF_DEPRECATED("use ZSTD_CStreamOutSize") size_t ZBUFF_recommendedCOutSize(void);
+ZBUFF_DEPRECATED("use ZSTD_DStreamInSize")  size_t ZBUFF_recommendedDInSize(void);
+ZBUFF_DEPRECATED("use ZSTD_DStreamOutSize") size_t ZBUFF_recommendedDOutSize(void);
+
+#endif  /* ZSTD_BUFFERED_H_23987 */
+
+
+#ifdef ZBUFF_STATIC_LINKING_ONLY
+#ifndef ZBUFF_STATIC_H_30298098432
+#define ZBUFF_STATIC_H_30298098432
+
+/* ====================================================================================
+ * The definitions in this section are considered experimental.
+ * They should never be used in association with a dynamic library, as they may change in the future.
+ * They are provided for advanced usages.
+ * Use them only in association with static linking.
+ * ==================================================================================== */
+
+/*--- Dependency ---*/
+#define ZSTD_STATIC_LINKING_ONLY   /* ZSTD_parameters, ZSTD_customMem */
+#include "../zstd.h"
+
+
+/*--- Custom memory allocator ---*/
+/*! ZBUFF_createCCtx_advanced() :
+ *  Create a ZBUFF compression context using external alloc and free functions */
+ZBUFF_DEPRECATED("use ZSTD_createCStream_advanced") ZBUFF_CCtx* ZBUFF_createCCtx_advanced(ZSTD_customMem customMem);
+
+/*! ZBUFF_createDCtx_advanced() :
+ *  Create a ZBUFF decompression context using external alloc and free functions */
+ZBUFF_DEPRECATED("use ZSTD_createDStream_advanced") ZBUFF_DCtx* ZBUFF_createDCtx_advanced(ZSTD_customMem customMem);
+
+
+/*--- Advanced Streaming Initialization ---*/
+ZBUFF_DEPRECATED("use ZSTD_initDStream_usingDict") size_t ZBUFF_compressInit_advanced(ZBUFF_CCtx* zbc,
+                                               const void* dict, size_t dictSize,
+                                               ZSTD_parameters params, unsigned long long pledgedSrcSize);
+
+
+#endif    /* ZBUFF_STATIC_H_30298098432 */
+#endif    /* ZBUFF_STATIC_LINKING_ONLY */
+
+
+#if defined (__cplusplus)
+}
+#endif
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/dictBuilder/cover.c mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/dictBuilder/cover.c
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/dictBuilder/cover.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/dictBuilder/cover.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,1246 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+/* *****************************************************************************
+ * Constructs a dictionary using a heuristic based on the following paper:
+ *
+ * Liao, Petri, Moffat, Wirth
+ * Effective Construction of Relative Lempel-Ziv Dictionaries
+ * Published in WWW 2016.
+ *
+ * Adapted from code originally written by @ot (Giuseppe Ottaviano).
+ ******************************************************************************/
+
+/*-*************************************
+*  Dependencies
+***************************************/
+#include <stdio.h>  /* fprintf */
+#include <stdlib.h> /* malloc, free, qsort */
+#include <string.h> /* memset */
+#include <time.h>   /* clock */
+
+#ifndef ZDICT_STATIC_LINKING_ONLY
+#  define ZDICT_STATIC_LINKING_ONLY
+#endif
+
+#include "../common/mem.h" /* read */
+#include "../common/pool.h"
+#include "../common/threading.h"
+#include "../common/zstd_internal.h" /* includes zstd.h */
+#include "../zdict.h"
+#include "cover.h"
+
+/*-*************************************
+*  Constants
+***************************************/
+#define COVER_MAX_SAMPLES_SIZE (sizeof(size_t) == 8 ? ((unsigned)-1) : ((unsigned)1 GB))
+#define COVER_DEFAULT_SPLITPOINT 1.0
+
+/*-*************************************
+*  Console display
+***************************************/
+#ifndef LOCALDISPLAYLEVEL
+static int g_displayLevel = 2;
+#endif
+#undef  DISPLAY
+#define DISPLAY(...)                                                           \
+  {                                                                            \
+    fprintf(stderr, __VA_ARGS__);                                              \
+    fflush(stderr);                                                            \
+  }
+#undef  LOCALDISPLAYLEVEL
+#define LOCALDISPLAYLEVEL(displayLevel, l, ...)                                \
+  if (displayLevel >= l) {                                                     \
+    DISPLAY(__VA_ARGS__);                                                      \
+  } /* 0 : no display;   1: errors;   2: default;  3: details;  4: debug */
+#undef  DISPLAYLEVEL
+#define DISPLAYLEVEL(l, ...) LOCALDISPLAYLEVEL(g_displayLevel, l, __VA_ARGS__)
+
+#ifndef LOCALDISPLAYUPDATE
+static const clock_t g_refreshRate = CLOCKS_PER_SEC * 15 / 100;
+static clock_t g_time = 0;
+#endif
+#undef  LOCALDISPLAYUPDATE
+#define LOCALDISPLAYUPDATE(displayLevel, l, ...)                               \
+  if (displayLevel >= l) {                                                     \
+    if ((clock() - g_time > g_refreshRate) || (displayLevel >= 4)) {             \
+      g_time = clock();                                                        \
+      DISPLAY(__VA_ARGS__);                                                    \
+    }                                                                          \
+  }
+#undef  DISPLAYUPDATE
+#define DISPLAYUPDATE(l, ...) LOCALDISPLAYUPDATE(g_displayLevel, l, __VA_ARGS__)
+
+/*-*************************************
+* Hash table
+***************************************
+* A small specialized hash map for storing activeDmers.
+* The map does not resize, so if it becomes full it will loop forever.
+* Thus, the map must be large enough to store every value.
+* The map implements linear probing and keeps its load less than 0.5.
+*/
+
+#define MAP_EMPTY_VALUE ((U32)-1)
+typedef struct COVER_map_pair_t_s {
+  U32 key;
+  U32 value;
+} COVER_map_pair_t;
+
+typedef struct COVER_map_s {
+  COVER_map_pair_t *data;
+  U32 sizeLog;
+  U32 size;
+  U32 sizeMask;
+} COVER_map_t;
+
+/**
+ * Clear the map.
+ */
+static void COVER_map_clear(COVER_map_t *map) {
+  memset(map->data, MAP_EMPTY_VALUE, map->size * sizeof(COVER_map_pair_t));
+}
+
+/**
+ * Initializes a map of the given size.
+ * Returns 1 on success and 0 on failure.
+ * The map must be destroyed with COVER_map_destroy().
+ * The map is only guaranteed to be large enough to hold size elements.
+ */
+static int COVER_map_init(COVER_map_t *map, U32 size) {
+  map->sizeLog = ZSTD_highbit32(size) + 2;
+  map->size = (U32)1 << map->sizeLog;
+  map->sizeMask = map->size - 1;
+  map->data = (COVER_map_pair_t *)malloc(map->size * sizeof(COVER_map_pair_t));
+  if (!map->data) {
+    map->sizeLog = 0;
+    map->size = 0;
+    return 0;
+  }
+  COVER_map_clear(map);
+  return 1;
+}
+
+/**
+ * Internal hash function
+ */
+static const U32 COVER_prime4bytes = 2654435761U;
+static U32 COVER_map_hash(COVER_map_t *map, U32 key) {
+  return (key * COVER_prime4bytes) >> (32 - map->sizeLog);
+}
+
+/**
+ * Helper function that returns the index that a key should be placed into.
+ */
+static U32 COVER_map_index(COVER_map_t *map, U32 key) {
+  const U32 hash = COVER_map_hash(map, key);
+  U32 i;
+  for (i = hash;; i = (i + 1) & map->sizeMask) {
+    COVER_map_pair_t *pos = &map->data[i];
+    if (pos->value == MAP_EMPTY_VALUE) {
+      return i;
+    }
+    if (pos->key == key) {
+      return i;
+    }
+  }
+}
+
+/**
+ * Returns the pointer to the value for key.
+ * If key is not in the map, it is inserted and the value is set to 0.
+ * The map must not be full.
+ */
+static U32 *COVER_map_at(COVER_map_t *map, U32 key) {
+  COVER_map_pair_t *pos = &map->data[COVER_map_index(map, key)];
+  if (pos->value == MAP_EMPTY_VALUE) {
+    pos->key = key;
+    pos->value = 0;
+  }
+  return &pos->value;
+}
+
+/**
+ * Deletes key from the map if present.
+ */
+static void COVER_map_remove(COVER_map_t *map, U32 key) {
+  U32 i = COVER_map_index(map, key);
+  COVER_map_pair_t *del = &map->data[i];
+  U32 shift = 1;
+  if (del->value == MAP_EMPTY_VALUE) {
+    return;
+  }
+  for (i = (i + 1) & map->sizeMask;; i = (i + 1) & map->sizeMask) {
+    COVER_map_pair_t *const pos = &map->data[i];
+    /* If the position is empty we are done */
+    if (pos->value == MAP_EMPTY_VALUE) {
+      del->value = MAP_EMPTY_VALUE;
+      return;
+    }
+    /* If pos can be moved to del do so */
+    if (((i - COVER_map_hash(map, pos->key)) & map->sizeMask) >= shift) {
+      del->key = pos->key;
+      del->value = pos->value;
+      del = pos;
+      shift = 1;
+    } else {
+      ++shift;
+    }
+  }
+}
+
+/**
+ * Destroys a map that is inited with COVER_map_init().
+ */
+static void COVER_map_destroy(COVER_map_t *map) {
+  if (map->data) {
+    free(map->data);
+  }
+  map->data = NULL;
+  map->size = 0;
+}
+
+/*-*************************************
+* Context
+***************************************/
+
+typedef struct {
+  const BYTE *samples;
+  size_t *offsets;
+  const size_t *samplesSizes;
+  size_t nbSamples;
+  size_t nbTrainSamples;
+  size_t nbTestSamples;
+  U32 *suffix;
+  size_t suffixSize;
+  U32 *freqs;
+  U32 *dmerAt;
+  unsigned d;
+} COVER_ctx_t;
+
+/* We need a global context for qsort... */
+static COVER_ctx_t *g_coverCtx = NULL;
+
+/*-*************************************
+*  Helper functions
+***************************************/
+
+/**
+ * Returns the sum of the sample sizes.
+ */
+size_t COVER_sum(const size_t *samplesSizes, unsigned nbSamples) {
+  size_t sum = 0;
+  unsigned i;
+  for (i = 0; i < nbSamples; ++i) {
+    sum += samplesSizes[i];
+  }
+  return sum;
+}
+
+/**
+ * Returns -1 if the dmer at lp is less than the dmer at rp.
+ * Return 0 if the dmers at lp and rp are equal.
+ * Returns 1 if the dmer at lp is greater than the dmer at rp.
+ */
+static int COVER_cmp(COVER_ctx_t *ctx, const void *lp, const void *rp) {
+  U32 const lhs = *(U32 const *)lp;
+  U32 const rhs = *(U32 const *)rp;
+  return memcmp(ctx->samples + lhs, ctx->samples + rhs, ctx->d);
+}
+/**
+ * Faster version for d <= 8.
+ */
+static int COVER_cmp8(COVER_ctx_t *ctx, const void *lp, const void *rp) {
+  U64 const mask = (ctx->d == 8) ? (U64)-1 : (((U64)1 << (8 * ctx->d)) - 1);
+  U64 const lhs = MEM_readLE64(ctx->samples + *(U32 const *)lp) & mask;
+  U64 const rhs = MEM_readLE64(ctx->samples + *(U32 const *)rp) & mask;
+  if (lhs < rhs) {
+    return -1;
+  }
+  return (lhs > rhs);
+}
+
+/**
+ * Same as COVER_cmp() except ties are broken by pointer value
+ * NOTE: g_coverCtx must be set to call this function.  A global is required because
+ * qsort doesn't take an opaque pointer.
+ */
+static int WIN_CDECL COVER_strict_cmp(const void *lp, const void *rp) {
+  int result = COVER_cmp(g_coverCtx, lp, rp);
+  if (result == 0) {
+    result = lp < rp ? -1 : 1;
+  }
+  return result;
+}
+/**
+ * Faster version for d <= 8.
+ */
+static int WIN_CDECL COVER_strict_cmp8(const void *lp, const void *rp) {
+  int result = COVER_cmp8(g_coverCtx, lp, rp);
+  if (result == 0) {
+    result = lp < rp ? -1 : 1;
+  }
+  return result;
+}
+
+/**
+ * Returns the first pointer in [first, last) whose element does not compare
+ * less than value.  If no such element exists it returns last.
+ */
+static const size_t *COVER_lower_bound(const size_t *first, const size_t *last,
+                                       size_t value) {
+  size_t count = last - first;
+  while (count != 0) {
+    size_t step = count / 2;
+    const size_t *ptr = first;
+    ptr += step;
+    if (*ptr < value) {
+      first = ++ptr;
+      count -= step + 1;
+    } else {
+      count = step;
+    }
+  }
+  return first;
+}
+
+/**
+ * Generic groupBy function.
+ * Groups an array sorted by cmp into groups with equivalent values.
+ * Calls grp for each group.
+ */
+static void
+COVER_groupBy(const void *data, size_t count, size_t size, COVER_ctx_t *ctx,
+              int (*cmp)(COVER_ctx_t *, const void *, const void *),
+              void (*grp)(COVER_ctx_t *, const void *, const void *)) {
+  const BYTE *ptr = (const BYTE *)data;
+  size_t num = 0;
+  while (num < count) {
+    const BYTE *grpEnd = ptr + size;
+    ++num;
+    while (num < count && cmp(ctx, ptr, grpEnd) == 0) {
+      grpEnd += size;
+      ++num;
+    }
+    grp(ctx, ptr, grpEnd);
+    ptr = grpEnd;
+  }
+}
+
+/*-*************************************
+*  Cover functions
+***************************************/
+
+/**
+ * Called on each group of positions with the same dmer.
+ * Counts the frequency of each dmer and saves it in the suffix array.
+ * Fills `ctx->dmerAt`.
+ */
+static void COVER_group(COVER_ctx_t *ctx, const void *group,
+                        const void *groupEnd) {
+  /* The group consists of all the positions with the same first d bytes. */
+  const U32 *grpPtr = (const U32 *)group;
+  const U32 *grpEnd = (const U32 *)groupEnd;
+  /* The dmerId is how we will reference this dmer.
+   * This allows us to map the whole dmer space to a much smaller space, the
+   * size of the suffix array.
+   */
+  const U32 dmerId = (U32)(grpPtr - ctx->suffix);
+  /* Count the number of samples this dmer shows up in */
+  U32 freq = 0;
+  /* Details */
+  const size_t *curOffsetPtr = ctx->offsets;
+  const size_t *offsetsEnd = ctx->offsets + ctx->nbSamples;
+  /* Once *grpPtr >= curSampleEnd this occurrence of the dmer is in a
+   * different sample than the last.
+   */
+  size_t curSampleEnd = ctx->offsets[0];
+  for (; grpPtr != grpEnd; ++grpPtr) {
+    /* Save the dmerId for this position so we can get back to it. */
+    ctx->dmerAt[*grpPtr] = dmerId;
+    /* Dictionaries only help for the first reference to the dmer.
+     * After that zstd can reference the match from the previous reference.
+     * So only count each dmer once for each sample it is in.
+     */
+    if (*grpPtr < curSampleEnd) {
+      continue;
+    }
+    freq += 1;
+    /* Binary search to find the end of the sample *grpPtr is in.
+     * In the common case that grpPtr + 1 == grpEnd we can skip the binary
+     * search because the loop is over.
+     */
+    if (grpPtr + 1 != grpEnd) {
+      const size_t *sampleEndPtr =
+          COVER_lower_bound(curOffsetPtr, offsetsEnd, *grpPtr);
+      curSampleEnd = *sampleEndPtr;
+      curOffsetPtr = sampleEndPtr + 1;
+    }
+  }
+  /* At this point we are never going to look at this segment of the suffix
+   * array again.  We take advantage of this fact to save memory.
+   * We store the frequency of the dmer in the first position of the group,
+   * which is dmerId.
+   */
+  ctx->suffix[dmerId] = freq;
+}
+
+
+/**
+ * Selects the best segment in an epoch.
+ * Segments of are scored according to the function:
+ *
+ * Let F(d) be the frequency of dmer d.
+ * Let S_i be the dmer at position i of segment S which has length k.
+ *
+ *     Score(S) = F(S_1) + F(S_2) + ... + F(S_{k-d+1})
+ *
+ * Once the dmer d is in the dictionary we set F(d) = 0.
+ */
+static COVER_segment_t COVER_selectSegment(const COVER_ctx_t *ctx, U32 *freqs,
+                                           COVER_map_t *activeDmers, U32 begin,
+                                           U32 end,
+                                           ZDICT_cover_params_t parameters) {
+  /* Constants */
+  const U32 k = parameters.k;
+  const U32 d = parameters.d;
+  const U32 dmersInK = k - d + 1;
+  /* Try each segment (activeSegment) and save the best (bestSegment) */
+  COVER_segment_t bestSegment = {0, 0, 0};
+  COVER_segment_t activeSegment;
+  /* Reset the activeDmers in the segment */
+  COVER_map_clear(activeDmers);
+  /* The activeSegment starts at the beginning of the epoch. */
+  activeSegment.begin = begin;
+  activeSegment.end = begin;
+  activeSegment.score = 0;
+  /* Slide the activeSegment through the whole epoch.
+   * Save the best segment in bestSegment.
+   */
+  while (activeSegment.end < end) {
+    /* The dmerId for the dmer at the next position */
+    U32 newDmer = ctx->dmerAt[activeSegment.end];
+    /* The entry in activeDmers for this dmerId */
+    U32 *newDmerOcc = COVER_map_at(activeDmers, newDmer);
+    /* If the dmer isn't already present in the segment add its score. */
+    if (*newDmerOcc == 0) {
+      /* The paper suggest using the L-0.5 norm, but experiments show that it
+       * doesn't help.
+       */
+      activeSegment.score += freqs[newDmer];
+    }
+    /* Add the dmer to the segment */
+    activeSegment.end += 1;
+    *newDmerOcc += 1;
+
+    /* If the window is now too large, drop the first position */
+    if (activeSegment.end - activeSegment.begin == dmersInK + 1) {
+      U32 delDmer = ctx->dmerAt[activeSegment.begin];
+      U32 *delDmerOcc = COVER_map_at(activeDmers, delDmer);
+      activeSegment.begin += 1;
+      *delDmerOcc -= 1;
+      /* If this is the last occurrence of the dmer, subtract its score */
+      if (*delDmerOcc == 0) {
+        COVER_map_remove(activeDmers, delDmer);
+        activeSegment.score -= freqs[delDmer];
+      }
+    }
+
+    /* If this segment is the best so far save it */
+    if (activeSegment.score > bestSegment.score) {
+      bestSegment = activeSegment;
+    }
+  }
+  {
+    /* Trim off the zero frequency head and tail from the segment. */
+    U32 newBegin = bestSegment.end;
+    U32 newEnd = bestSegment.begin;
+    U32 pos;
+    for (pos = bestSegment.begin; pos != bestSegment.end; ++pos) {
+      U32 freq = freqs[ctx->dmerAt[pos]];
+      if (freq != 0) {
+        newBegin = MIN(newBegin, pos);
+        newEnd = pos + 1;
+      }
+    }
+    bestSegment.begin = newBegin;
+    bestSegment.end = newEnd;
+  }
+  {
+    /* Zero out the frequency of each dmer covered by the chosen segment. */
+    U32 pos;
+    for (pos = bestSegment.begin; pos != bestSegment.end; ++pos) {
+      freqs[ctx->dmerAt[pos]] = 0;
+    }
+  }
+  return bestSegment;
+}
+
+/**
+ * Check the validity of the parameters.
+ * Returns non-zero if the parameters are valid and 0 otherwise.
+ */
+static int COVER_checkParameters(ZDICT_cover_params_t parameters,
+                                 size_t maxDictSize) {
+  /* k and d are required parameters */
+  if (parameters.d == 0 || parameters.k == 0) {
+    return 0;
+  }
+  /* k <= maxDictSize */
+  if (parameters.k > maxDictSize) {
+    return 0;
+  }
+  /* d <= k */
+  if (parameters.d > parameters.k) {
+    return 0;
+  }
+  /* 0 < splitPoint <= 1 */
+  if (parameters.splitPoint <= 0 || parameters.splitPoint > 1){
+    return 0;
+  }
+  return 1;
+}
+
+/**
+ * Clean up a context initialized with `COVER_ctx_init()`.
+ */
+static void COVER_ctx_destroy(COVER_ctx_t *ctx) {
+  if (!ctx) {
+    return;
+  }
+  if (ctx->suffix) {
+    free(ctx->suffix);
+    ctx->suffix = NULL;
+  }
+  if (ctx->freqs) {
+    free(ctx->freqs);
+    ctx->freqs = NULL;
+  }
+  if (ctx->dmerAt) {
+    free(ctx->dmerAt);
+    ctx->dmerAt = NULL;
+  }
+  if (ctx->offsets) {
+    free(ctx->offsets);
+    ctx->offsets = NULL;
+  }
+}
+
+/**
+ * Prepare a context for dictionary building.
+ * The context is only dependent on the parameter `d` and can used multiple
+ * times.
+ * Returns 0 on success or error code on error.
+ * The context must be destroyed with `COVER_ctx_destroy()`.
+ */
+static size_t COVER_ctx_init(COVER_ctx_t *ctx, const void *samplesBuffer,
+                          const size_t *samplesSizes, unsigned nbSamples,
+                          unsigned d, double splitPoint) {
+  const BYTE *const samples = (const BYTE *)samplesBuffer;
+  const size_t totalSamplesSize = COVER_sum(samplesSizes, nbSamples);
+  /* Split samples into testing and training sets */
+  const unsigned nbTrainSamples = splitPoint < 1.0 ? (unsigned)((double)nbSamples * splitPoint) : nbSamples;
+  const unsigned nbTestSamples = splitPoint < 1.0 ? nbSamples - nbTrainSamples : nbSamples;
+  const size_t trainingSamplesSize = splitPoint < 1.0 ? COVER_sum(samplesSizes, nbTrainSamples) : totalSamplesSize;
+  const size_t testSamplesSize = splitPoint < 1.0 ? COVER_sum(samplesSizes + nbTrainSamples, nbTestSamples) : totalSamplesSize;
+  /* Checks */
+  if (totalSamplesSize < MAX(d, sizeof(U64)) ||
+      totalSamplesSize >= (size_t)COVER_MAX_SAMPLES_SIZE) {
+    DISPLAYLEVEL(1, "Total samples size is too large (%u MB), maximum size is %u MB\n",
+                 (unsigned)(totalSamplesSize>>20), (COVER_MAX_SAMPLES_SIZE >> 20));
+    return ERROR(srcSize_wrong);
+  }
+  /* Check if there are at least 5 training samples */
+  if (nbTrainSamples < 5) {
+    DISPLAYLEVEL(1, "Total number of training samples is %u and is invalid.", nbTrainSamples);
+    return ERROR(srcSize_wrong);
+  }
+  /* Check if there's testing sample */
+  if (nbTestSamples < 1) {
+    DISPLAYLEVEL(1, "Total number of testing samples is %u and is invalid.", nbTestSamples);
+    return ERROR(srcSize_wrong);
+  }
+  /* Zero the context */
+  memset(ctx, 0, sizeof(*ctx));
+  DISPLAYLEVEL(2, "Training on %u samples of total size %u\n", nbTrainSamples,
+               (unsigned)trainingSamplesSize);
+  DISPLAYLEVEL(2, "Testing on %u samples of total size %u\n", nbTestSamples,
+               (unsigned)testSamplesSize);
+  ctx->samples = samples;
+  ctx->samplesSizes = samplesSizes;
+  ctx->nbSamples = nbSamples;
+  ctx->nbTrainSamples = nbTrainSamples;
+  ctx->nbTestSamples = nbTestSamples;
+  /* Partial suffix array */
+  ctx->suffixSize = trainingSamplesSize - MAX(d, sizeof(U64)) + 1;
+  ctx->suffix = (U32 *)malloc(ctx->suffixSize * sizeof(U32));
+  /* Maps index to the dmerID */
+  ctx->dmerAt = (U32 *)malloc(ctx->suffixSize * sizeof(U32));
+  /* The offsets of each file */
+  ctx->offsets = (size_t *)malloc((nbSamples + 1) * sizeof(size_t));
+  if (!ctx->suffix || !ctx->dmerAt || !ctx->offsets) {
+    DISPLAYLEVEL(1, "Failed to allocate scratch buffers\n");
+    COVER_ctx_destroy(ctx);
+    return ERROR(memory_allocation);
+  }
+  ctx->freqs = NULL;
+  ctx->d = d;
+
+  /* Fill offsets from the samplesSizes */
+  {
+    U32 i;
+    ctx->offsets[0] = 0;
+    for (i = 1; i <= nbSamples; ++i) {
+      ctx->offsets[i] = ctx->offsets[i - 1] + samplesSizes[i - 1];
+    }
+  }
+  DISPLAYLEVEL(2, "Constructing partial suffix array\n");
+  {
+    /* suffix is a partial suffix array.
+     * It only sorts suffixes by their first parameters.d bytes.
+     * The sort is stable, so each dmer group is sorted by position in input.
+     */
+    U32 i;
+    for (i = 0; i < ctx->suffixSize; ++i) {
+      ctx->suffix[i] = i;
+    }
+    /* qsort doesn't take an opaque pointer, so pass as a global.
+     * On OpenBSD qsort() is not guaranteed to be stable, their mergesort() is.
+     */
+    g_coverCtx = ctx;
+#if defined(__OpenBSD__)
+    mergesort(ctx->suffix, ctx->suffixSize, sizeof(U32),
+          (ctx->d <= 8 ? &COVER_strict_cmp8 : &COVER_strict_cmp));
+#else
+    qsort(ctx->suffix, ctx->suffixSize, sizeof(U32),
+          (ctx->d <= 8 ? &COVER_strict_cmp8 : &COVER_strict_cmp));
+#endif
+  }
+  DISPLAYLEVEL(2, "Computing frequencies\n");
+  /* For each dmer group (group of positions with the same first d bytes):
+   * 1. For each position we set dmerAt[position] = dmerID.  The dmerID is
+   *    (groupBeginPtr - suffix).  This allows us to go from position to
+   *    dmerID so we can look up values in freq.
+   * 2. We calculate how many samples the dmer occurs in and save it in
+   *    freqs[dmerId].
+   */
+  COVER_groupBy(ctx->suffix, ctx->suffixSize, sizeof(U32), ctx,
+                (ctx->d <= 8 ? &COVER_cmp8 : &COVER_cmp), &COVER_group);
+  ctx->freqs = ctx->suffix;
+  ctx->suffix = NULL;
+  return 0;
+}
+
+void COVER_warnOnSmallCorpus(size_t maxDictSize, size_t nbDmers, int displayLevel)
+{
+  const double ratio = (double)nbDmers / maxDictSize;
+  if (ratio >= 10) {
+      return;
+  }
+  LOCALDISPLAYLEVEL(displayLevel, 1,
+                    "WARNING: The maximum dictionary size %u is too large "
+                    "compared to the source size %u! "
+                    "size(source)/size(dictionary) = %f, but it should be >= "
+                    "10! This may lead to a subpar dictionary! We recommend "
+                    "training on sources at least 10x, and preferably 100x "
+                    "the size of the dictionary! \n", (U32)maxDictSize,
+                    (U32)nbDmers, ratio);
+}
+
+COVER_epoch_info_t COVER_computeEpochs(U32 maxDictSize,
+                                       U32 nbDmers, U32 k, U32 passes)
+{
+  const U32 minEpochSize = k * 10;
+  COVER_epoch_info_t epochs;
+  epochs.num = MAX(1, maxDictSize / k / passes);
+  epochs.size = nbDmers / epochs.num;
+  if (epochs.size >= minEpochSize) {
+      assert(epochs.size * epochs.num <= nbDmers);
+      return epochs;
+  }
+  epochs.size = MIN(minEpochSize, nbDmers);
+  epochs.num = nbDmers / epochs.size;
+  assert(epochs.size * epochs.num <= nbDmers);
+  return epochs;
+}
+
+/**
+ * Given the prepared context build the dictionary.
+ */
+static size_t COVER_buildDictionary(const COVER_ctx_t *ctx, U32 *freqs,
+                                    COVER_map_t *activeDmers, void *dictBuffer,
+                                    size_t dictBufferCapacity,
+                                    ZDICT_cover_params_t parameters) {
+  BYTE *const dict = (BYTE *)dictBuffer;
+  size_t tail = dictBufferCapacity;
+  /* Divide the data into epochs. We will select one segment from each epoch. */
+  const COVER_epoch_info_t epochs = COVER_computeEpochs(
+      (U32)dictBufferCapacity, (U32)ctx->suffixSize, parameters.k, 4);
+  const size_t maxZeroScoreRun = MAX(10, MIN(100, epochs.num >> 3));
+  size_t zeroScoreRun = 0;
+  size_t epoch;
+  DISPLAYLEVEL(2, "Breaking content into %u epochs of size %u\n",
+                (U32)epochs.num, (U32)epochs.size);
+  /* Loop through the epochs until there are no more segments or the dictionary
+   * is full.
+   */
+  for (epoch = 0; tail > 0; epoch = (epoch + 1) % epochs.num) {
+    const U32 epochBegin = (U32)(epoch * epochs.size);
+    const U32 epochEnd = epochBegin + epochs.size;
+    size_t segmentSize;
+    /* Select a segment */
+    COVER_segment_t segment = COVER_selectSegment(
+        ctx, freqs, activeDmers, epochBegin, epochEnd, parameters);
+    /* If the segment covers no dmers, then we are out of content.
+     * There may be new content in other epochs, for continue for some time.
+     */
+    if (segment.score == 0) {
+      if (++zeroScoreRun >= maxZeroScoreRun) {
+          break;
+      }
+      continue;
+    }
+    zeroScoreRun = 0;
+    /* Trim the segment if necessary and if it is too small then we are done */
+    segmentSize = MIN(segment.end - segment.begin + parameters.d - 1, tail);
+    if (segmentSize < parameters.d) {
+      break;
+    }
+    /* We fill the dictionary from the back to allow the best segments to be
+     * referenced with the smallest offsets.
+     */
+    tail -= segmentSize;
+    memcpy(dict + tail, ctx->samples + segment.begin, segmentSize);
+    DISPLAYUPDATE(
+        2, "\r%u%%       ",
+        (unsigned)(((dictBufferCapacity - tail) * 100) / dictBufferCapacity));
+  }
+  DISPLAYLEVEL(2, "\r%79s\r", "");
+  return tail;
+}
+
+ZDICTLIB_API size_t ZDICT_trainFromBuffer_cover(
+    void *dictBuffer, size_t dictBufferCapacity,
+    const void *samplesBuffer, const size_t *samplesSizes, unsigned nbSamples,
+    ZDICT_cover_params_t parameters)
+{
+  BYTE* const dict = (BYTE*)dictBuffer;
+  COVER_ctx_t ctx;
+  COVER_map_t activeDmers;
+  parameters.splitPoint = 1.0;
+  /* Initialize global data */
+  g_displayLevel = parameters.zParams.notificationLevel;
+  /* Checks */
+  if (!COVER_checkParameters(parameters, dictBufferCapacity)) {
+    DISPLAYLEVEL(1, "Cover parameters incorrect\n");
+    return ERROR(parameter_outOfBound);
+  }
+  if (nbSamples == 0) {
+    DISPLAYLEVEL(1, "Cover must have at least one input file\n");
+    return ERROR(srcSize_wrong);
+  }
+  if (dictBufferCapacity < ZDICT_DICTSIZE_MIN) {
+    DISPLAYLEVEL(1, "dictBufferCapacity must be at least %u\n",
+                 ZDICT_DICTSIZE_MIN);
+    return ERROR(dstSize_tooSmall);
+  }
+  /* Initialize context and activeDmers */
+  {
+    size_t const initVal = COVER_ctx_init(&ctx, samplesBuffer, samplesSizes, nbSamples,
+                      parameters.d, parameters.splitPoint);
+    if (ZSTD_isError(initVal)) {
+      return initVal;
+    }
+  }
+  COVER_warnOnSmallCorpus(dictBufferCapacity, ctx.suffixSize, g_displayLevel);
+  if (!COVER_map_init(&activeDmers, parameters.k - parameters.d + 1)) {
+    DISPLAYLEVEL(1, "Failed to allocate dmer map: out of memory\n");
+    COVER_ctx_destroy(&ctx);
+    return ERROR(memory_allocation);
+  }
+
+  DISPLAYLEVEL(2, "Building dictionary\n");
+  {
+    const size_t tail =
+        COVER_buildDictionary(&ctx, ctx.freqs, &activeDmers, dictBuffer,
+                              dictBufferCapacity, parameters);
+    const size_t dictionarySize = ZDICT_finalizeDictionary(
+        dict, dictBufferCapacity, dict + tail, dictBufferCapacity - tail,
+        samplesBuffer, samplesSizes, nbSamples, parameters.zParams);
+    if (!ZSTD_isError(dictionarySize)) {
+      DISPLAYLEVEL(2, "Constructed dictionary of size %u\n",
+                   (unsigned)dictionarySize);
+    }
+    COVER_ctx_destroy(&ctx);
+    COVER_map_destroy(&activeDmers);
+    return dictionarySize;
+  }
+}
+
+
+
+size_t COVER_checkTotalCompressedSize(const ZDICT_cover_params_t parameters,
+                                    const size_t *samplesSizes, const BYTE *samples,
+                                    size_t *offsets,
+                                    size_t nbTrainSamples, size_t nbSamples,
+                                    BYTE *const dict, size_t dictBufferCapacity) {
+  size_t totalCompressedSize = ERROR(GENERIC);
+  /* Pointers */
+  ZSTD_CCtx *cctx;
+  ZSTD_CDict *cdict;
+  void *dst;
+  /* Local variables */
+  size_t dstCapacity;
+  size_t i;
+  /* Allocate dst with enough space to compress the maximum sized sample */
+  {
+    size_t maxSampleSize = 0;
+    i = parameters.splitPoint < 1.0 ? nbTrainSamples : 0;
+    for (; i < nbSamples; ++i) {
+      maxSampleSize = MAX(samplesSizes[i], maxSampleSize);
+    }
+    dstCapacity = ZSTD_compressBound(maxSampleSize);
+    dst = malloc(dstCapacity);
+  }
+  /* Create the cctx and cdict */
+  cctx = ZSTD_createCCtx();
+  cdict = ZSTD_createCDict(dict, dictBufferCapacity,
+                           parameters.zParams.compressionLevel);
+  if (!dst || !cctx || !cdict) {
+    goto _compressCleanup;
+  }
+  /* Compress each sample and sum their sizes (or error) */
+  totalCompressedSize = dictBufferCapacity;
+  i = parameters.splitPoint < 1.0 ? nbTrainSamples : 0;
+  for (; i < nbSamples; ++i) {
+    const size_t size = ZSTD_compress_usingCDict(
+        cctx, dst, dstCapacity, samples + offsets[i],
+        samplesSizes[i], cdict);
+    if (ZSTD_isError(size)) {
+      totalCompressedSize = size;
+      goto _compressCleanup;
+    }
+    totalCompressedSize += size;
+  }
+_compressCleanup:
+  ZSTD_freeCCtx(cctx);
+  ZSTD_freeCDict(cdict);
+  if (dst) {
+    free(dst);
+  }
+  return totalCompressedSize;
+}
+
+
+/**
+ * Initialize the `COVER_best_t`.
+ */
+void COVER_best_init(COVER_best_t *best) {
+  if (best==NULL) return; /* compatible with init on NULL */
+  (void)ZSTD_pthread_mutex_init(&best->mutex, NULL);
+  (void)ZSTD_pthread_cond_init(&best->cond, NULL);
+  best->liveJobs = 0;
+  best->dict = NULL;
+  best->dictSize = 0;
+  best->compressedSize = (size_t)-1;
+  memset(&best->parameters, 0, sizeof(best->parameters));
+}
+
+/**
+ * Wait until liveJobs == 0.
+ */
+void COVER_best_wait(COVER_best_t *best) {
+  if (!best) {
+    return;
+  }
+  ZSTD_pthread_mutex_lock(&best->mutex);
+  while (best->liveJobs != 0) {
+    ZSTD_pthread_cond_wait(&best->cond, &best->mutex);
+  }
+  ZSTD_pthread_mutex_unlock(&best->mutex);
+}
+
+/**
+ * Call COVER_best_wait() and then destroy the COVER_best_t.
+ */
+void COVER_best_destroy(COVER_best_t *best) {
+  if (!best) {
+    return;
+  }
+  COVER_best_wait(best);
+  if (best->dict) {
+    free(best->dict);
+  }
+  ZSTD_pthread_mutex_destroy(&best->mutex);
+  ZSTD_pthread_cond_destroy(&best->cond);
+}
+
+/**
+ * Called when a thread is about to be launched.
+ * Increments liveJobs.
+ */
+void COVER_best_start(COVER_best_t *best) {
+  if (!best) {
+    return;
+  }
+  ZSTD_pthread_mutex_lock(&best->mutex);
+  ++best->liveJobs;
+  ZSTD_pthread_mutex_unlock(&best->mutex);
+}
+
+/**
+ * Called when a thread finishes executing, both on error or success.
+ * Decrements liveJobs and signals any waiting threads if liveJobs == 0.
+ * If this dictionary is the best so far save it and its parameters.
+ */
+void COVER_best_finish(COVER_best_t *best, ZDICT_cover_params_t parameters,
+                              COVER_dictSelection_t selection) {
+  void* dict = selection.dictContent;
+  size_t compressedSize = selection.totalCompressedSize;
+  size_t dictSize = selection.dictSize;
+  if (!best) {
+    return;
+  }
+  {
+    size_t liveJobs;
+    ZSTD_pthread_mutex_lock(&best->mutex);
+    --best->liveJobs;
+    liveJobs = best->liveJobs;
+    /* If the new dictionary is better */
+    if (compressedSize < best->compressedSize) {
+      /* Allocate space if necessary */
+      if (!best->dict || best->dictSize < dictSize) {
+        if (best->dict) {
+          free(best->dict);
+        }
+        best->dict = malloc(dictSize);
+        if (!best->dict) {
+          best->compressedSize = ERROR(GENERIC);
+          best->dictSize = 0;
+          ZSTD_pthread_cond_signal(&best->cond);
+          ZSTD_pthread_mutex_unlock(&best->mutex);
+          return;
+        }
+      }
+      /* Save the dictionary, parameters, and size */
+      if (dict) {
+        memcpy(best->dict, dict, dictSize);
+        best->dictSize = dictSize;
+        best->parameters = parameters;
+        best->compressedSize = compressedSize;
+      }
+    }
+    if (liveJobs == 0) {
+      ZSTD_pthread_cond_broadcast(&best->cond);
+    }
+    ZSTD_pthread_mutex_unlock(&best->mutex);
+  }
+}
+
+COVER_dictSelection_t COVER_dictSelectionError(size_t error) {
+    COVER_dictSelection_t selection = { NULL, 0, error };
+    return selection;
+}
+
+unsigned COVER_dictSelectionIsError(COVER_dictSelection_t selection) {
+  return (ZSTD_isError(selection.totalCompressedSize) || !selection.dictContent);
+}
+
+void COVER_dictSelectionFree(COVER_dictSelection_t selection){
+  free(selection.dictContent);
+}
+
+COVER_dictSelection_t COVER_selectDict(BYTE* customDictContent, size_t dictBufferCapacity,
+        size_t dictContentSize, const BYTE* samplesBuffer, const size_t* samplesSizes, unsigned nbFinalizeSamples,
+        size_t nbCheckSamples, size_t nbSamples, ZDICT_cover_params_t params, size_t* offsets, size_t totalCompressedSize) {
+
+  size_t largestDict = 0;
+  size_t largestCompressed = 0;
+  BYTE* customDictContentEnd = customDictContent + dictContentSize;
+
+  BYTE * largestDictbuffer = (BYTE *)malloc(dictBufferCapacity);
+  BYTE * candidateDictBuffer = (BYTE *)malloc(dictBufferCapacity);
+  double regressionTolerance = ((double)params.shrinkDictMaxRegression / 100.0) + 1.00;
+
+  if (!largestDictbuffer || !candidateDictBuffer) {
+    free(largestDictbuffer);
+    free(candidateDictBuffer);
+    return COVER_dictSelectionError(dictContentSize);
+  }
+
+  /* Initial dictionary size and compressed size */
+  memcpy(largestDictbuffer, customDictContent, dictContentSize);
+  dictContentSize = ZDICT_finalizeDictionary(
+    largestDictbuffer, dictBufferCapacity, customDictContent, dictContentSize,
+    samplesBuffer, samplesSizes, nbFinalizeSamples, params.zParams);
+
+  if (ZDICT_isError(dictContentSize)) {
+    free(largestDictbuffer);
+    free(candidateDictBuffer);
+    return COVER_dictSelectionError(dictContentSize);
+  }
+
+  totalCompressedSize = COVER_checkTotalCompressedSize(params, samplesSizes,
+                                                       samplesBuffer, offsets,
+                                                       nbCheckSamples, nbSamples,
+                                                       largestDictbuffer, dictContentSize);
+
+  if (ZSTD_isError(totalCompressedSize)) {
+    free(largestDictbuffer);
+    free(candidateDictBuffer);
+    return COVER_dictSelectionError(totalCompressedSize);
+  }
+
+  if (params.shrinkDict == 0) {
+    COVER_dictSelection_t selection = { largestDictbuffer, dictContentSize, totalCompressedSize };
+    free(candidateDictBuffer);
+    return selection;
+  }
+
+  largestDict = dictContentSize;
+  largestCompressed = totalCompressedSize;
+  dictContentSize = ZDICT_DICTSIZE_MIN;
+
+  /* Largest dict is initially at least ZDICT_DICTSIZE_MIN */
+  while (dictContentSize < largestDict) {
+    memcpy(candidateDictBuffer, largestDictbuffer, largestDict);
+    dictContentSize = ZDICT_finalizeDictionary(
+      candidateDictBuffer, dictBufferCapacity, customDictContentEnd - dictContentSize, dictContentSize,
+      samplesBuffer, samplesSizes, nbFinalizeSamples, params.zParams);
+
+    if (ZDICT_isError(dictContentSize)) {
+      free(largestDictbuffer);
+      free(candidateDictBuffer);
+      return COVER_dictSelectionError(dictContentSize);
+
+    }
+
+    totalCompressedSize = COVER_checkTotalCompressedSize(params, samplesSizes,
+                                                         samplesBuffer, offsets,
+                                                         nbCheckSamples, nbSamples,
+                                                         candidateDictBuffer, dictContentSize);
+
+    if (ZSTD_isError(totalCompressedSize)) {
+      free(largestDictbuffer);
+      free(candidateDictBuffer);
+      return COVER_dictSelectionError(totalCompressedSize);
+    }
+
+    if (totalCompressedSize <= largestCompressed * regressionTolerance) {
+      COVER_dictSelection_t selection = { candidateDictBuffer, dictContentSize, totalCompressedSize };
+      free(largestDictbuffer);
+      return selection;
+    }
+    dictContentSize *= 2;
+  }
+  dictContentSize = largestDict;
+  totalCompressedSize = largestCompressed;
+  {
+    COVER_dictSelection_t selection = { largestDictbuffer, dictContentSize, totalCompressedSize };
+    free(candidateDictBuffer);
+    return selection;
+  }
+}
+
+/**
+ * Parameters for COVER_tryParameters().
+ */
+typedef struct COVER_tryParameters_data_s {
+  const COVER_ctx_t *ctx;
+  COVER_best_t *best;
+  size_t dictBufferCapacity;
+  ZDICT_cover_params_t parameters;
+} COVER_tryParameters_data_t;
+
+/**
+ * Tries a set of parameters and updates the COVER_best_t with the results.
+ * This function is thread safe if zstd is compiled with multithreaded support.
+ * It takes its parameters as an *OWNING* opaque pointer to support threading.
+ */
+static void COVER_tryParameters(void *opaque)
+{
+  /* Save parameters as local variables */
+  COVER_tryParameters_data_t *const data = (COVER_tryParameters_data_t*)opaque;
+  const COVER_ctx_t *const ctx = data->ctx;
+  const ZDICT_cover_params_t parameters = data->parameters;
+  size_t dictBufferCapacity = data->dictBufferCapacity;
+  size_t totalCompressedSize = ERROR(GENERIC);
+  /* Allocate space for hash table, dict, and freqs */
+  COVER_map_t activeDmers;
+  BYTE* const dict = (BYTE*)malloc(dictBufferCapacity);
+  COVER_dictSelection_t selection = COVER_dictSelectionError(ERROR(GENERIC));
+  U32* const freqs = (U32*)malloc(ctx->suffixSize * sizeof(U32));
+  if (!COVER_map_init(&activeDmers, parameters.k - parameters.d + 1)) {
+    DISPLAYLEVEL(1, "Failed to allocate dmer map: out of memory\n");
+    goto _cleanup;
+  }
+  if (!dict || !freqs) {
+    DISPLAYLEVEL(1, "Failed to allocate buffers: out of memory\n");
+    goto _cleanup;
+  }
+  /* Copy the frequencies because we need to modify them */
+  memcpy(freqs, ctx->freqs, ctx->suffixSize * sizeof(U32));
+  /* Build the dictionary */
+  {
+    const size_t tail = COVER_buildDictionary(ctx, freqs, &activeDmers, dict,
+                                              dictBufferCapacity, parameters);
+    selection = COVER_selectDict(dict + tail, dictBufferCapacity, dictBufferCapacity - tail,
+        ctx->samples, ctx->samplesSizes, (unsigned)ctx->nbTrainSamples, ctx->nbTrainSamples, ctx->nbSamples, parameters, ctx->offsets,
+        totalCompressedSize);
+
+    if (COVER_dictSelectionIsError(selection)) {
+      DISPLAYLEVEL(1, "Failed to select dictionary\n");
+      goto _cleanup;
+    }
+  }
+_cleanup:
+  free(dict);
+  COVER_best_finish(data->best, parameters, selection);
+  free(data);
+  COVER_map_destroy(&activeDmers);
+  COVER_dictSelectionFree(selection);
+  free(freqs);
+}
+
+ZDICTLIB_API size_t ZDICT_optimizeTrainFromBuffer_cover(
+    void* dictBuffer, size_t dictBufferCapacity, const void* samplesBuffer,
+    const size_t* samplesSizes, unsigned nbSamples,
+    ZDICT_cover_params_t* parameters)
+{
+  /* constants */
+  const unsigned nbThreads = parameters->nbThreads;
+  const double splitPoint =
+      parameters->splitPoint <= 0.0 ? COVER_DEFAULT_SPLITPOINT : parameters->splitPoint;
+  const unsigned kMinD = parameters->d == 0 ? 6 : parameters->d;
+  const unsigned kMaxD = parameters->d == 0 ? 8 : parameters->d;
+  const unsigned kMinK = parameters->k == 0 ? 50 : parameters->k;
+  const unsigned kMaxK = parameters->k == 0 ? 2000 : parameters->k;
+  const unsigned kSteps = parameters->steps == 0 ? 40 : parameters->steps;
+  const unsigned kStepSize = MAX((kMaxK - kMinK) / kSteps, 1);
+  const unsigned kIterations =
+      (1 + (kMaxD - kMinD) / 2) * (1 + (kMaxK - kMinK) / kStepSize);
+  const unsigned shrinkDict = 0;
+  /* Local variables */
+  const int displayLevel = parameters->zParams.notificationLevel;
+  unsigned iteration = 1;
+  unsigned d;
+  unsigned k;
+  COVER_best_t best;
+  POOL_ctx *pool = NULL;
+  int warned = 0;
+
+  /* Checks */
+  if (splitPoint <= 0 || splitPoint > 1) {
+    LOCALDISPLAYLEVEL(displayLevel, 1, "Incorrect parameters\n");
+    return ERROR(parameter_outOfBound);
+  }
+  if (kMinK < kMaxD || kMaxK < kMinK) {
+    LOCALDISPLAYLEVEL(displayLevel, 1, "Incorrect parameters\n");
+    return ERROR(parameter_outOfBound);
+  }
+  if (nbSamples == 0) {
+    DISPLAYLEVEL(1, "Cover must have at least one input file\n");
+    return ERROR(srcSize_wrong);
+  }
+  if (dictBufferCapacity < ZDICT_DICTSIZE_MIN) {
+    DISPLAYLEVEL(1, "dictBufferCapacity must be at least %u\n",
+                 ZDICT_DICTSIZE_MIN);
+    return ERROR(dstSize_tooSmall);
+  }
+  if (nbThreads > 1) {
+    pool = POOL_create(nbThreads, 1);
+    if (!pool) {
+      return ERROR(memory_allocation);
+    }
+  }
+  /* Initialization */
+  COVER_best_init(&best);
+  /* Turn down global display level to clean up display at level 2 and below */
+  g_displayLevel = displayLevel == 0 ? 0 : displayLevel - 1;
+  /* Loop through d first because each new value needs a new context */
+  LOCALDISPLAYLEVEL(displayLevel, 2, "Trying %u different sets of parameters\n",
+                    kIterations);
+  for (d = kMinD; d <= kMaxD; d += 2) {
+    /* Initialize the context for this value of d */
+    COVER_ctx_t ctx;
+    LOCALDISPLAYLEVEL(displayLevel, 3, "d=%u\n", d);
+    {
+      const size_t initVal = COVER_ctx_init(&ctx, samplesBuffer, samplesSizes, nbSamples, d, splitPoint);
+      if (ZSTD_isError(initVal)) {
+        LOCALDISPLAYLEVEL(displayLevel, 1, "Failed to initialize context\n");
+        COVER_best_destroy(&best);
+        POOL_free(pool);
+        return initVal;
+      }
+    }
+    if (!warned) {
+      COVER_warnOnSmallCorpus(dictBufferCapacity, ctx.suffixSize, displayLevel);
+      warned = 1;
+    }
+    /* Loop through k reusing the same context */
+    for (k = kMinK; k <= kMaxK; k += kStepSize) {
+      /* Prepare the arguments */
+      COVER_tryParameters_data_t *data = (COVER_tryParameters_data_t *)malloc(
+          sizeof(COVER_tryParameters_data_t));
+      LOCALDISPLAYLEVEL(displayLevel, 3, "k=%u\n", k);
+      if (!data) {
+        LOCALDISPLAYLEVEL(displayLevel, 1, "Failed to allocate parameters\n");
+        COVER_best_destroy(&best);
+        COVER_ctx_destroy(&ctx);
+        POOL_free(pool);
+        return ERROR(memory_allocation);
+      }
+      data->ctx = &ctx;
+      data->best = &best;
+      data->dictBufferCapacity = dictBufferCapacity;
+      data->parameters = *parameters;
+      data->parameters.k = k;
+      data->parameters.d = d;
+      data->parameters.splitPoint = splitPoint;
+      data->parameters.steps = kSteps;
+      data->parameters.shrinkDict = shrinkDict;
+      data->parameters.zParams.notificationLevel = g_displayLevel;
+      /* Check the parameters */
+      if (!COVER_checkParameters(data->parameters, dictBufferCapacity)) {
+        DISPLAYLEVEL(1, "Cover parameters incorrect\n");
+        free(data);
+        continue;
+      }
+      /* Call the function and pass ownership of data to it */
+      COVER_best_start(&best);
+      if (pool) {
+        POOL_add(pool, &COVER_tryParameters, data);
+      } else {
+        COVER_tryParameters(data);
+      }
+      /* Print status */
+      LOCALDISPLAYUPDATE(displayLevel, 2, "\r%u%%       ",
+                         (unsigned)((iteration * 100) / kIterations));
+      ++iteration;
+    }
+    COVER_best_wait(&best);
+    COVER_ctx_destroy(&ctx);
+  }
+  LOCALDISPLAYLEVEL(displayLevel, 2, "\r%79s\r", "");
+  /* Fill the output buffer and parameters with output of the best parameters */
+  {
+    const size_t dictSize = best.dictSize;
+    if (ZSTD_isError(best.compressedSize)) {
+      const size_t compressedSize = best.compressedSize;
+      COVER_best_destroy(&best);
+      POOL_free(pool);
+      return compressedSize;
+    }
+    *parameters = best.parameters;
+    memcpy(dictBuffer, best.dict, dictSize);
+    COVER_best_destroy(&best);
+    POOL_free(pool);
+    return dictSize;
+  }
+}
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/dictBuilder/cover.h mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/dictBuilder/cover.h
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/dictBuilder/cover.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/dictBuilder/cover.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,158 @@
+/*
+ * Copyright (c) Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+#ifndef ZDICT_STATIC_LINKING_ONLY
+#  define ZDICT_STATIC_LINKING_ONLY
+#endif
+
+#include <stdio.h>  /* fprintf */
+#include <stdlib.h> /* malloc, free, qsort */
+#include <string.h> /* memset */
+#include <time.h>   /* clock */
+#include "../common/mem.h" /* read */
+#include "../common/pool.h"
+#include "../common/threading.h"
+#include "../common/zstd_internal.h" /* includes zstd.h */
+#include "../zdict.h"
+
+/**
+ * COVER_best_t is used for two purposes:
+ * 1. Synchronizing threads.
+ * 2. Saving the best parameters and dictionary.
+ *
+ * All of the methods except COVER_best_init() are thread safe if zstd is
+ * compiled with multithreaded support.
+ */
+typedef struct COVER_best_s {
+  ZSTD_pthread_mutex_t mutex;
+  ZSTD_pthread_cond_t cond;
+  size_t liveJobs;
+  void *dict;
+  size_t dictSize;
+  ZDICT_cover_params_t parameters;
+  size_t compressedSize;
+} COVER_best_t;
+
+/**
+ * A segment is a range in the source as well as the score of the segment.
+ */
+typedef struct {
+  U32 begin;
+  U32 end;
+  U32 score;
+} COVER_segment_t;
+
+/**
+ *Number of epochs and size of each epoch.
+ */
+typedef struct {
+  U32 num;
+  U32 size;
+} COVER_epoch_info_t;
+
+/**
+ * Struct used for the dictionary selection function.
+ */
+typedef struct COVER_dictSelection {
+  BYTE* dictContent;
+  size_t dictSize;
+  size_t totalCompressedSize;
+} COVER_dictSelection_t;
+
+/**
+ * Computes the number of epochs and the size of each epoch.
+ * We will make sure that each epoch gets at least 10 * k bytes.
+ *
+ * The COVER algorithms divide the data up into epochs of equal size and
+ * select one segment from each epoch.
+ *
+ * @param maxDictSize The maximum allowed dictionary size.
+ * @param nbDmers     The number of dmers we are training on.
+ * @param k           The parameter k (segment size).
+ * @param passes      The target number of passes over the dmer corpus.
+ *                    More passes means a better dictionary.
+ */
+COVER_epoch_info_t COVER_computeEpochs(U32 maxDictSize, U32 nbDmers,
+                                       U32 k, U32 passes);
+
+/**
+ * Warns the user when their corpus is too small.
+ */
+void COVER_warnOnSmallCorpus(size_t maxDictSize, size_t nbDmers, int displayLevel);
+
+/**
+ *  Checks total compressed size of a dictionary
+ */
+size_t COVER_checkTotalCompressedSize(const ZDICT_cover_params_t parameters,
+                                      const size_t *samplesSizes, const BYTE *samples,
+                                      size_t *offsets,
+                                      size_t nbTrainSamples, size_t nbSamples,
+                                      BYTE *const dict, size_t dictBufferCapacity);
+
+/**
+ * Returns the sum of the sample sizes.
+ */
+size_t COVER_sum(const size_t *samplesSizes, unsigned nbSamples) ;
+
+/**
+ * Initialize the `COVER_best_t`.
+ */
+void COVER_best_init(COVER_best_t *best);
+
+/**
+ * Wait until liveJobs == 0.
+ */
+void COVER_best_wait(COVER_best_t *best);
+
+/**
+ * Call COVER_best_wait() and then destroy the COVER_best_t.
+ */
+void COVER_best_destroy(COVER_best_t *best);
+
+/**
+ * Called when a thread is about to be launched.
+ * Increments liveJobs.
+ */
+void COVER_best_start(COVER_best_t *best);
+
+/**
+ * Called when a thread finishes executing, both on error or success.
+ * Decrements liveJobs and signals any waiting threads if liveJobs == 0.
+ * If this dictionary is the best so far save it and its parameters.
+ */
+void COVER_best_finish(COVER_best_t *best, ZDICT_cover_params_t parameters,
+                       COVER_dictSelection_t selection);
+/**
+ * Error function for COVER_selectDict function. Checks if the return
+ * value is an error.
+ */
+unsigned COVER_dictSelectionIsError(COVER_dictSelection_t selection);
+
+ /**
+  * Error function for COVER_selectDict function. Returns a struct where
+  * return.totalCompressedSize is a ZSTD error.
+  */
+COVER_dictSelection_t COVER_dictSelectionError(size_t error);
+
+/**
+ * Always call after selectDict is called to free up used memory from
+ * newly created dictionary.
+ */
+void COVER_dictSelectionFree(COVER_dictSelection_t selection);
+
+/**
+ * Called to finalize the dictionary and select one based on whether or not
+ * the shrink-dict flag was enabled. If enabled the dictionary used is the
+ * smallest dictionary within a specified regression of the compressed size
+ * from the largest dictionary.
+ */
+ COVER_dictSelection_t COVER_selectDict(BYTE* customDictContent, size_t dictBufferCapacity,
+                       size_t dictContentSize, const BYTE* samplesBuffer, const size_t* samplesSizes, unsigned nbFinalizeSamples,
+                       size_t nbCheckSamples, size_t nbSamples, ZDICT_cover_params_t params, size_t* offsets, size_t totalCompressedSize);
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/dictBuilder/divsufsort.c mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/dictBuilder/divsufsort.c
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/dictBuilder/divsufsort.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/dictBuilder/divsufsort.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,1913 @@
+/*
+ * divsufsort.c for libdivsufsort-lite
+ * Copyright (c) 2003-2008 Yuta Mori All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*- Compiler specifics -*/
+#ifdef __clang__
+#pragma clang diagnostic ignored "-Wshorten-64-to-32"
+#endif
+
+#if defined(_MSC_VER)
+#  pragma warning(disable : 4244)
+#  pragma warning(disable : 4127)    /* C4127 : Condition expression is constant */
+#endif
+
+
+/*- Dependencies -*/
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "divsufsort.h"
+
+/*- Constants -*/
+#if defined(INLINE)
+# undef INLINE
+#endif
+#if !defined(INLINE)
+# define INLINE __inline
+#endif
+#if defined(ALPHABET_SIZE) && (ALPHABET_SIZE < 1)
+# undef ALPHABET_SIZE
+#endif
+#if !defined(ALPHABET_SIZE)
+# define ALPHABET_SIZE (256)
+#endif
+#define BUCKET_A_SIZE (ALPHABET_SIZE)
+#define BUCKET_B_SIZE (ALPHABET_SIZE * ALPHABET_SIZE)
+#if defined(SS_INSERTIONSORT_THRESHOLD)
+# if SS_INSERTIONSORT_THRESHOLD < 1
+#  undef SS_INSERTIONSORT_THRESHOLD
+#  define SS_INSERTIONSORT_THRESHOLD (1)
+# endif
+#else
+# define SS_INSERTIONSORT_THRESHOLD (8)
+#endif
+#if defined(SS_BLOCKSIZE)
+# if SS_BLOCKSIZE < 0
+#  undef SS_BLOCKSIZE
+#  define SS_BLOCKSIZE (0)
+# elif 32768 <= SS_BLOCKSIZE
+#  undef SS_BLOCKSIZE
+#  define SS_BLOCKSIZE (32767)
+# endif
+#else
+# define SS_BLOCKSIZE (1024)
+#endif
+/* minstacksize = log(SS_BLOCKSIZE) / log(3) * 2 */
+#if SS_BLOCKSIZE == 0
+# define SS_MISORT_STACKSIZE (96)
+#elif SS_BLOCKSIZE <= 4096
+# define SS_MISORT_STACKSIZE (16)
+#else
+# define SS_MISORT_STACKSIZE (24)
+#endif
+#define SS_SMERGE_STACKSIZE (32)
+#define TR_INSERTIONSORT_THRESHOLD (8)
+#define TR_STACKSIZE (64)
+
+
+/*- Macros -*/
+#ifndef SWAP
+# define SWAP(_a, _b) do { t = (_a); (_a) = (_b); (_b) = t; } while(0)
+#endif /* SWAP */
+#ifndef MIN
+# define MIN(_a, _b) (((_a) < (_b)) ? (_a) : (_b))
+#endif /* MIN */
+#ifndef MAX
+# define MAX(_a, _b) (((_a) > (_b)) ? (_a) : (_b))
+#endif /* MAX */
+#define STACK_PUSH(_a, _b, _c, _d)\
+  do {\
+    assert(ssize < STACK_SIZE);\
+    stack[ssize].a = (_a), stack[ssize].b = (_b),\
+    stack[ssize].c = (_c), stack[ssize++].d = (_d);\
+  } while(0)
+#define STACK_PUSH5(_a, _b, _c, _d, _e)\
+  do {\
+    assert(ssize < STACK_SIZE);\
+    stack[ssize].a = (_a), stack[ssize].b = (_b),\
+    stack[ssize].c = (_c), stack[ssize].d = (_d), stack[ssize++].e = (_e);\
+  } while(0)
+#define STACK_POP(_a, _b, _c, _d)\
+  do {\
+    assert(0 <= ssize);\
+    if(ssize == 0) { return; }\
+    (_a) = stack[--ssize].a, (_b) = stack[ssize].b,\
+    (_c) = stack[ssize].c, (_d) = stack[ssize].d;\
+  } while(0)
+#define STACK_POP5(_a, _b, _c, _d, _e)\
+  do {\
+    assert(0 <= ssize);\
+    if(ssize == 0) { return; }\
+    (_a) = stack[--ssize].a, (_b) = stack[ssize].b,\
+    (_c) = stack[ssize].c, (_d) = stack[ssize].d, (_e) = stack[ssize].e;\
+  } while(0)
+#define BUCKET_A(_c0) bucket_A[(_c0)]
+#if ALPHABET_SIZE == 256
+#define BUCKET_B(_c0, _c1) (bucket_B[((_c1) << 8) | (_c0)])
+#define BUCKET_BSTAR(_c0, _c1) (bucket_B[((_c0) << 8) | (_c1)])
+#else
+#define BUCKET_B(_c0, _c1) (bucket_B[(_c1) * ALPHABET_SIZE + (_c0)])
+#define BUCKET_BSTAR(_c0, _c1) (bucket_B[(_c0) * ALPHABET_SIZE + (_c1)])
+#endif
+
+
+/*- Private Functions -*/
+
+static const int lg_table[256]= {
+ -1,0,1,1,2,2,2,2,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
+  5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+  6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
+  6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
+  7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+  7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+  7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+  7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7
+};
+
+#if (SS_BLOCKSIZE == 0) || (SS_INSERTIONSORT_THRESHOLD < SS_BLOCKSIZE)
+
+static INLINE
+int
+ss_ilg(int n) {
+#if SS_BLOCKSIZE == 0
+  return (n & 0xffff0000) ?
+          ((n & 0xff000000) ?
+            24 + lg_table[(n >> 24) & 0xff] :
+            16 + lg_table[(n >> 16) & 0xff]) :
+          ((n & 0x0000ff00) ?
+             8 + lg_table[(n >>  8) & 0xff] :
+             0 + lg_table[(n >>  0) & 0xff]);
+#elif SS_BLOCKSIZE < 256
+  return lg_table[n];
+#else
+  return (n & 0xff00) ?
+          8 + lg_table[(n >> 8) & 0xff] :
+          0 + lg_table[(n >> 0) & 0xff];
+#endif
+}
+
+#endif /* (SS_BLOCKSIZE == 0) || (SS_INSERTIONSORT_THRESHOLD < SS_BLOCKSIZE) */
+
+#if SS_BLOCKSIZE != 0
+
+static const int sqq_table[256] = {
+  0,  16,  22,  27,  32,  35,  39,  42,  45,  48,  50,  53,  55,  57,  59,  61,
+ 64,  65,  67,  69,  71,  73,  75,  76,  78,  80,  81,  83,  84,  86,  87,  89,
+ 90,  91,  93,  94,  96,  97,  98,  99, 101, 102, 103, 104, 106, 107, 108, 109,
+110, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
+128, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
+143, 144, 144, 145, 146, 147, 148, 149, 150, 150, 151, 152, 153, 154, 155, 155,
+156, 157, 158, 159, 160, 160, 161, 162, 163, 163, 164, 165, 166, 167, 167, 168,
+169, 170, 170, 171, 172, 173, 173, 174, 175, 176, 176, 177, 178, 178, 179, 180,
+181, 181, 182, 183, 183, 184, 185, 185, 186, 187, 187, 188, 189, 189, 190, 191,
+192, 192, 193, 193, 194, 195, 195, 196, 197, 197, 198, 199, 199, 200, 201, 201,
+202, 203, 203, 204, 204, 205, 206, 206, 207, 208, 208, 209, 209, 210, 211, 211,
+212, 212, 213, 214, 214, 215, 215, 216, 217, 217, 218, 218, 219, 219, 220, 221,
+221, 222, 222, 223, 224, 224, 225, 225, 226, 226, 227, 227, 228, 229, 229, 230,
+230, 231, 231, 232, 232, 233, 234, 234, 235, 235, 236, 236, 237, 237, 238, 238,
+239, 240, 240, 241, 241, 242, 242, 243, 243, 244, 244, 245, 245, 246, 246, 247,
+247, 248, 248, 249, 249, 250, 250, 251, 251, 252, 252, 253, 253, 254, 254, 255
+};
+
+static INLINE
+int
+ss_isqrt(int x) {
+  int y, e;
+
+  if(x >= (SS_BLOCKSIZE * SS_BLOCKSIZE)) { return SS_BLOCKSIZE; }
+  e = (x & 0xffff0000) ?
+        ((x & 0xff000000) ?
+          24 + lg_table[(x >> 24) & 0xff] :
+          16 + lg_table[(x >> 16) & 0xff]) :
+        ((x & 0x0000ff00) ?
+           8 + lg_table[(x >>  8) & 0xff] :
+           0 + lg_table[(x >>  0) & 0xff]);
+
+  if(e >= 16) {
+    y = sqq_table[x >> ((e - 6) - (e & 1))] << ((e >> 1) - 7);
+    if(e >= 24) { y = (y + 1 + x / y) >> 1; }
+    y = (y + 1 + x / y) >> 1;
+  } else if(e >= 8) {
+    y = (sqq_table[x >> ((e - 6) - (e & 1))] >> (7 - (e >> 1))) + 1;
+  } else {
+    return sqq_table[x] >> 4;
+  }
+
+  return (x < (y * y)) ? y - 1 : y;
+}
+
+#endif /* SS_BLOCKSIZE != 0 */
+
+
+/*---------------------------------------------------------------------------*/
+
+/* Compares two suffixes. */
+static INLINE
+int
+ss_compare(const unsigned char *T,
+           const int *p1, const int *p2,
+           int depth) {
+  const unsigned char *U1, *U2, *U1n, *U2n;
+
+  for(U1 = T + depth + *p1,
+      U2 = T + depth + *p2,
+      U1n = T + *(p1 + 1) + 2,
+      U2n = T + *(p2 + 1) + 2;
+      (U1 < U1n) && (U2 < U2n) && (*U1 == *U2);
+      ++U1, ++U2) {
+  }
+
+  return U1 < U1n ?
+        (U2 < U2n ? *U1 - *U2 : 1) :
+        (U2 < U2n ? -1 : 0);
+}
+
+
+/*---------------------------------------------------------------------------*/
+
+#if (SS_BLOCKSIZE != 1) && (SS_INSERTIONSORT_THRESHOLD != 1)
+
+/* Insertionsort for small size groups */
+static
+void
+ss_insertionsort(const unsigned char *T, const int *PA,
+                 int *first, int *last, int depth) {
+  int *i, *j;
+  int t;
+  int r;
+
+  for(i = last - 2; first <= i; --i) {
+    for(t = *i, j = i + 1; 0 < (r = ss_compare(T, PA + t, PA + *j, depth));) {
+      do { *(j - 1) = *j; } while((++j < last) && (*j < 0));
+      if(last <= j) { break; }
+    }
+    if(r == 0) { *j = ~*j; }
+    *(j - 1) = t;
+  }
+}
+
+#endif /* (SS_BLOCKSIZE != 1) && (SS_INSERTIONSORT_THRESHOLD != 1) */
+
+
+/*---------------------------------------------------------------------------*/
+
+#if (SS_BLOCKSIZE == 0) || (SS_INSERTIONSORT_THRESHOLD < SS_BLOCKSIZE)
+
+static INLINE
+void
+ss_fixdown(const unsigned char *Td, const int *PA,
+           int *SA, int i, int size) {
+  int j, k;
+  int v;
+  int c, d, e;
+
+  for(v = SA[i], c = Td[PA[v]]; (j = 2 * i + 1) < size; SA[i] = SA[k], i = k) {
+    d = Td[PA[SA[k = j++]]];
+    if(d < (e = Td[PA[SA[j]]])) { k = j; d = e; }
+    if(d <= c) { break; }
+  }
+  SA[i] = v;
+}
+
+/* Simple top-down heapsort. */
+static
+void
+ss_heapsort(const unsigned char *Td, const int *PA, int *SA, int size) {
+  int i, m;
+  int t;
+
+  m = size;
+  if((size % 2) == 0) {
+    m--;
+    if(Td[PA[SA[m / 2]]] < Td[PA[SA[m]]]) { SWAP(SA[m], SA[m / 2]); }
+  }
+
+  for(i = m / 2 - 1; 0 <= i; --i) { ss_fixdown(Td, PA, SA, i, m); }
+  if((size % 2) == 0) { SWAP(SA[0], SA[m]); ss_fixdown(Td, PA, SA, 0, m); }
+  for(i = m - 1; 0 < i; --i) {
+    t = SA[0], SA[0] = SA[i];
+    ss_fixdown(Td, PA, SA, 0, i);
+    SA[i] = t;
+  }
+}
+
+
+/*---------------------------------------------------------------------------*/
+
+/* Returns the median of three elements. */
+static INLINE
+int *
+ss_median3(const unsigned char *Td, const int *PA,
+           int *v1, int *v2, int *v3) {
+  int *t;
+  if(Td[PA[*v1]] > Td[PA[*v2]]) { SWAP(v1, v2); }
+  if(Td[PA[*v2]] > Td[PA[*v3]]) {
+    if(Td[PA[*v1]] > Td[PA[*v3]]) { return v1; }
+    else { return v3; }
+  }
+  return v2;
+}
+
+/* Returns the median of five elements. */
+static INLINE
+int *
+ss_median5(const unsigned char *Td, const int *PA,
+           int *v1, int *v2, int *v3, int *v4, int *v5) {
+  int *t;
+  if(Td[PA[*v2]] > Td[PA[*v3]]) { SWAP(v2, v3); }
+  if(Td[PA[*v4]] > Td[PA[*v5]]) { SWAP(v4, v5); }
+  if(Td[PA[*v2]] > Td[PA[*v4]]) { SWAP(v2, v4); SWAP(v3, v5); }
+  if(Td[PA[*v1]] > Td[PA[*v3]]) { SWAP(v1, v3); }
+  if(Td[PA[*v1]] > Td[PA[*v4]]) { SWAP(v1, v4); SWAP(v3, v5); }
+  if(Td[PA[*v3]] > Td[PA[*v4]]) { return v4; }
+  return v3;
+}
+
+/* Returns the pivot element. */
+static INLINE
+int *
+ss_pivot(const unsigned char *Td, const int *PA, int *first, int *last) {
+  int *middle;
+  int t;
+
+  t = last - first;
+  middle = first + t / 2;
+
+  if(t <= 512) {
+    if(t <= 32) {
+      return ss_median3(Td, PA, first, middle, last - 1);
+    } else {
+      t >>= 2;
+      return ss_median5(Td, PA, first, first + t, middle, last - 1 - t, last - 1);
+    }
+  }
+  t >>= 3;
+  first  = ss_median3(Td, PA, first, first + t, first + (t << 1));
+  middle = ss_median3(Td, PA, middle - t, middle, middle + t);
+  last   = ss_median3(Td, PA, last - 1 - (t << 1), last - 1 - t, last - 1);
+  return ss_median3(Td, PA, first, middle, last);
+}
+
+
+/*---------------------------------------------------------------------------*/
+
+/* Binary partition for substrings. */
+static INLINE
+int *
+ss_partition(const int *PA,
+                    int *first, int *last, int depth) {
+  int *a, *b;
+  int t;
+  for(a = first - 1, b = last;;) {
+    for(; (++a < b) && ((PA[*a] + depth) >= (PA[*a + 1] + 1));) { *a = ~*a; }
+    for(; (a < --b) && ((PA[*b] + depth) <  (PA[*b + 1] + 1));) { }
+    if(b <= a) { break; }
+    t = ~*b;
+    *b = *a;
+    *a = t;
+  }
+  if(first < a) { *first = ~*first; }
+  return a;
+}
+
+/* Multikey introsort for medium size groups. */
+static
+void
+ss_mintrosort(const unsigned char *T, const int *PA,
+              int *first, int *last,
+              int depth) {
+#define STACK_SIZE SS_MISORT_STACKSIZE
+  struct { int *a, *b, c; int d; } stack[STACK_SIZE];
+  const unsigned char *Td;
+  int *a, *b, *c, *d, *e, *f;
+  int s, t;
+  int ssize;
+  int limit;
+  int v, x = 0;
+
+  for(ssize = 0, limit = ss_ilg(last - first);;) {
+
+    if((last - first) <= SS_INSERTIONSORT_THRESHOLD) {
+#if 1 < SS_INSERTIONSORT_THRESHOLD
+      if(1 < (last - first)) { ss_insertionsort(T, PA, first, last, depth); }
+#endif
+      STACK_POP(first, last, depth, limit);
+      continue;
+    }
+
+    Td = T + depth;
+    if(limit-- == 0) { ss_heapsort(Td, PA, first, last - first); }
+    if(limit < 0) {
+      for(a = first + 1, v = Td[PA[*first]]; a < last; ++a) {
+        if((x = Td[PA[*a]]) != v) {
+          if(1 < (a - first)) { break; }
+          v = x;
+          first = a;
+        }
+      }
+      if(Td[PA[*first] - 1] < v) {
+        first = ss_partition(PA, first, a, depth);
+      }
+      if((a - first) <= (last - a)) {
+        if(1 < (a - first)) {
+          STACK_PUSH(a, last, depth, -1);
+          last = a, depth += 1, limit = ss_ilg(a - first);
+        } else {
+          first = a, limit = -1;
+        }
+      } else {
+        if(1 < (last - a)) {
+          STACK_PUSH(first, a, depth + 1, ss_ilg(a - first));
+          first = a, limit = -1;
+        } else {
+          last = a, depth += 1, limit = ss_ilg(a - first);
+        }
+      }
+      continue;
+    }
+
+    /* choose pivot */
+    a = ss_pivot(Td, PA, first, last);
+    v = Td[PA[*a]];
+    SWAP(*first, *a);
+
+    /* partition */
+    for(b = first; (++b < last) && ((x = Td[PA[*b]]) == v);) { }
+    if(((a = b) < last) && (x < v)) {
+      for(; (++b < last) && ((x = Td[PA[*b]]) <= v);) {
+        if(x == v) { SWAP(*b, *a); ++a; }
+      }
+    }
+    for(c = last; (b < --c) && ((x = Td[PA[*c]]) == v);) { }
+    if((b < (d = c)) && (x > v)) {
+      for(; (b < --c) && ((x = Td[PA[*c]]) >= v);) {
+        if(x == v) { SWAP(*c, *d); --d; }
+      }
+    }
+    for(; b < c;) {
+      SWAP(*b, *c);
+      for(; (++b < c) && ((x = Td[PA[*b]]) <= v);) {
+        if(x == v) { SWAP(*b, *a); ++a; }
+      }
+      for(; (b < --c) && ((x = Td[PA[*c]]) >= v);) {
+        if(x == v) { SWAP(*c, *d); --d; }
+      }
+    }
+
+    if(a <= d) {
+      c = b - 1;
+
+      if((s = a - first) > (t = b - a)) { s = t; }
+      for(e = first, f = b - s; 0 < s; --s, ++e, ++f) { SWAP(*e, *f); }
+      if((s = d - c) > (t = last - d - 1)) { s = t; }
+      for(e = b, f = last - s; 0 < s; --s, ++e, ++f) { SWAP(*e, *f); }
+
+      a = first + (b - a), c = last - (d - c);
+      b = (v <= Td[PA[*a] - 1]) ? a : ss_partition(PA, a, c, depth);
+
+      if((a - first) <= (last - c)) {
+        if((last - c) <= (c - b)) {
+          STACK_PUSH(b, c, depth + 1, ss_ilg(c - b));
+          STACK_PUSH(c, last, depth, limit);
+          last = a;
+        } else if((a - first) <= (c - b)) {
+          STACK_PUSH(c, last, depth, limit);
+          STACK_PUSH(b, c, depth + 1, ss_ilg(c - b));
+          last = a;
+        } else {
+          STACK_PUSH(c, last, depth, limit);
+          STACK_PUSH(first, a, depth, limit);
+          first = b, last = c, depth += 1, limit = ss_ilg(c - b);
+        }
+      } else {
+        if((a - first) <= (c - b)) {
+          STACK_PUSH(b, c, depth + 1, ss_ilg(c - b));
+          STACK_PUSH(first, a, depth, limit);
+          first = c;
+        } else if((last - c) <= (c - b)) {
+          STACK_PUSH(first, a, depth, limit);
+          STACK_PUSH(b, c, depth + 1, ss_ilg(c - b));
+          first = c;
+        } else {
+          STACK_PUSH(first, a, depth, limit);
+          STACK_PUSH(c, last, depth, limit);
+          first = b, last = c, depth += 1, limit = ss_ilg(c - b);
+        }
+      }
+    } else {
+      limit += 1;
+      if(Td[PA[*first] - 1] < v) {
+        first = ss_partition(PA, first, last, depth);
+        limit = ss_ilg(last - first);
+      }
+      depth += 1;
+    }
+  }
+#undef STACK_SIZE
+}
+
+#endif /* (SS_BLOCKSIZE == 0) || (SS_INSERTIONSORT_THRESHOLD < SS_BLOCKSIZE) */
+
+
+/*---------------------------------------------------------------------------*/
+
+#if SS_BLOCKSIZE != 0
+
+static INLINE
+void
+ss_blockswap(int *a, int *b, int n) {
+  int t;
+  for(; 0 < n; --n, ++a, ++b) {
+    t = *a, *a = *b, *b = t;
+  }
+}
+
+static INLINE
+void
+ss_rotate(int *first, int *middle, int *last) {
+  int *a, *b, t;
+  int l, r;
+  l = middle - first, r = last - middle;
+  for(; (0 < l) && (0 < r);) {
+    if(l == r) { ss_blockswap(first, middle, l); break; }
+    if(l < r) {
+      a = last - 1, b = middle - 1;
+      t = *a;
+      do {
+        *a-- = *b, *b-- = *a;
+        if(b < first) {
+          *a = t;
+          last = a;
+          if((r -= l + 1) <= l) { break; }
+          a -= 1, b = middle - 1;
+          t = *a;
+        }
+      } while(1);
+    } else {
+      a = first, b = middle;
+      t = *a;
+      do {
+        *a++ = *b, *b++ = *a;
+        if(last <= b) {
+          *a = t;
+          first = a + 1;
+          if((l -= r + 1) <= r) { break; }
+          a += 1, b = middle;
+          t = *a;
+        }
+      } while(1);
+    }
+  }
+}
+
+
+/*---------------------------------------------------------------------------*/
+
+static
+void
+ss_inplacemerge(const unsigned char *T, const int *PA,
+                int *first, int *middle, int *last,
+                int depth) {
+  const int *p;
+  int *a, *b;
+  int len, half;
+  int q, r;
+  int x;
+
+  for(;;) {
+    if(*(last - 1) < 0) { x = 1; p = PA + ~*(last - 1); }
+    else                { x = 0; p = PA +  *(last - 1); }
+    for(a = first, len = middle - first, half = len >> 1, r = -1;
+        0 < len;
+        len = half, half >>= 1) {
+      b = a + half;
+      q = ss_compare(T, PA + ((0 <= *b) ? *b : ~*b), p, depth);
+      if(q < 0) {
+        a = b + 1;
+        half -= (len & 1) ^ 1;
+      } else {
+        r = q;
+      }
+    }
+    if(a < middle) {
+      if(r == 0) { *a = ~*a; }
+      ss_rotate(a, middle, last);
+      last -= middle - a;
+      middle = a;
+      if(first == middle) { break; }
+    }
+    --last;
+    if(x != 0) { while(*--last < 0) { } }
+    if(middle == last) { break; }
+  }
+}
+
+
+/*---------------------------------------------------------------------------*/
+
+/* Merge-forward with internal buffer. */
+static
+void
+ss_mergeforward(const unsigned char *T, const int *PA,
+                int *first, int *middle, int *last,
+                int *buf, int depth) {
+  int *a, *b, *c, *bufend;
+  int t;
+  int r;
+
+  bufend = buf + (middle - first) - 1;
+  ss_blockswap(buf, first, middle - first);
+
+  for(t = *(a = first), b = buf, c = middle;;) {
+    r = ss_compare(T, PA + *b, PA + *c, depth);
+    if(r < 0) {
+      do {
+        *a++ = *b;
+        if(bufend <= b) { *bufend = t; return; }
+        *b++ = *a;
+      } while(*b < 0);
+    } else if(r > 0) {
+      do {
+        *a++ = *c, *c++ = *a;
+        if(last <= c) {
+          while(b < bufend) { *a++ = *b, *b++ = *a; }
+          *a = *b, *b = t;
+          return;
+        }
+      } while(*c < 0);
+    } else {
+      *c = ~*c;
+      do {
+        *a++ = *b;
+        if(bufend <= b) { *bufend = t; return; }
+        *b++ = *a;
+      } while(*b < 0);
+
+      do {
+        *a++ = *c, *c++ = *a;
+        if(last <= c) {
+          while(b < bufend) { *a++ = *b, *b++ = *a; }
+          *a = *b, *b = t;
+          return;
+        }
+      } while(*c < 0);
+    }
+  }
+}
+
+/* Merge-backward with internal buffer. */
+static
+void
+ss_mergebackward(const unsigned char *T, const int *PA,
+                 int *first, int *middle, int *last,
+                 int *buf, int depth) {
+  const int *p1, *p2;
+  int *a, *b, *c, *bufend;
+  int t;
+  int r;
+  int x;
+
+  bufend = buf + (last - middle) - 1;
+  ss_blockswap(buf, middle, last - middle);
+
+  x = 0;
+  if(*bufend < 0)       { p1 = PA + ~*bufend; x |= 1; }
+  else                  { p1 = PA +  *bufend; }
+  if(*(middle - 1) < 0) { p2 = PA + ~*(middle - 1); x |= 2; }
+  else                  { p2 = PA +  *(middle - 1); }
+  for(t = *(a = last - 1), b = bufend, c = middle - 1;;) {
+    r = ss_compare(T, p1, p2, depth);
+    if(0 < r) {
+      if(x & 1) { do { *a-- = *b, *b-- = *a; } while(*b < 0); x ^= 1; }
+      *a-- = *b;
+      if(b <= buf) { *buf = t; break; }
+      *b-- = *a;
+      if(*b < 0) { p1 = PA + ~*b; x |= 1; }
+      else       { p1 = PA +  *b; }
+    } else if(r < 0) {
+      if(x & 2) { do { *a-- = *c, *c-- = *a; } while(*c < 0); x ^= 2; }
+      *a-- = *c, *c-- = *a;
+      if(c < first) {
+        while(buf < b) { *a-- = *b, *b-- = *a; }
+        *a = *b, *b = t;
+        break;
+      }
+      if(*c < 0) { p2 = PA + ~*c; x |= 2; }
+      else       { p2 = PA +  *c; }
+    } else {
+      if(x & 1) { do { *a-- = *b, *b-- = *a; } while(*b < 0); x ^= 1; }
+      *a-- = ~*b;
+      if(b <= buf) { *buf = t; break; }
+      *b-- = *a;
+      if(x & 2) { do { *a-- = *c, *c-- = *a; } while(*c < 0); x ^= 2; }
+      *a-- = *c, *c-- = *a;
+      if(c < first) {
+        while(buf < b) { *a-- = *b, *b-- = *a; }
+        *a = *b, *b = t;
+        break;
+      }
+      if(*b < 0) { p1 = PA + ~*b; x |= 1; }
+      else       { p1 = PA +  *b; }
+      if(*c < 0) { p2 = PA + ~*c; x |= 2; }
+      else       { p2 = PA +  *c; }
+    }
+  }
+}
+
+/* D&C based merge. */
+static
+void
+ss_swapmerge(const unsigned char *T, const int *PA,
+             int *first, int *middle, int *last,
+             int *buf, int bufsize, int depth) {
+#define STACK_SIZE SS_SMERGE_STACKSIZE
+#define GETIDX(a) ((0 <= (a)) ? (a) : (~(a)))
+#define MERGE_CHECK(a, b, c)\
+  do {\
+    if(((c) & 1) ||\
+       (((c) & 2) && (ss_compare(T, PA + GETIDX(*((a) - 1)), PA + *(a), depth) == 0))) {\
+      *(a) = ~*(a);\
+    }\
+    if(((c) & 4) && ((ss_compare(T, PA + GETIDX(*((b) - 1)), PA + *(b), depth) == 0))) {\
+      *(b) = ~*(b);\
+    }\
+  } while(0)
+  struct { int *a, *b, *c; int d; } stack[STACK_SIZE];
+  int *l, *r, *lm, *rm;
+  int m, len, half;
+  int ssize;
+  int check, next;
+
+  for(check = 0, ssize = 0;;) {
+    if((last - middle) <= bufsize) {
+      if((first < middle) && (middle < last)) {
+        ss_mergebackward(T, PA, first, middle, last, buf, depth);
+      }
+      MERGE_CHECK(first, last, check);
+      STACK_POP(first, middle, last, check);
+      continue;
+    }
+
+    if((middle - first) <= bufsize) {
+      if(first < middle) {
+        ss_mergeforward(T, PA, first, middle, last, buf, depth);
+      }
+      MERGE_CHECK(first, last, check);
+      STACK_POP(first, middle, last, check);
+      continue;
+    }
+
+    for(m = 0, len = MIN(middle - first, last - middle), half = len >> 1;
+        0 < len;
+        len = half, half >>= 1) {
+      if(ss_compare(T, PA + GETIDX(*(middle + m + half)),
+                       PA + GETIDX(*(middle - m - half - 1)), depth) < 0) {
+        m += half + 1;
+        half -= (len & 1) ^ 1;
+      }
+    }
+
+    if(0 < m) {
+      lm = middle - m, rm = middle + m;
+      ss_blockswap(lm, middle, m);
+      l = r = middle, next = 0;
+      if(rm < last) {
+        if(*rm < 0) {
+          *rm = ~*rm;
+          if(first < lm) { for(; *--l < 0;) { } next |= 4; }
+          next |= 1;
+        } else if(first < lm) {
+          for(; *r < 0; ++r) { }
+          next |= 2;
+        }
+      }
+
+      if((l - first) <= (last - r)) {
+        STACK_PUSH(r, rm, last, (next & 3) | (check & 4));
+        middle = lm, last = l, check = (check & 3) | (next & 4);
+      } else {
+        if((next & 2) && (r == middle)) { next ^= 6; }
+        STACK_PUSH(first, lm, l, (check & 3) | (next & 4));
+        first = r, middle = rm, check = (next & 3) | (check & 4);
+      }
+    } else {
+      if(ss_compare(T, PA + GETIDX(*(middle - 1)), PA + *middle, depth) == 0) {
+        *middle = ~*middle;
+      }
+      MERGE_CHECK(first, last, check);
+      STACK_POP(first, middle, last, check);
+    }
+  }
+#undef STACK_SIZE
+}
+
+#endif /* SS_BLOCKSIZE != 0 */
+
+
+/*---------------------------------------------------------------------------*/
+
+/* Substring sort */
+static
+void
+sssort(const unsigned char *T, const int *PA,
+       int *first, int *last,
+       int *buf, int bufsize,
+       int depth, int n, int lastsuffix) {
+  int *a;
+#if SS_BLOCKSIZE != 0
+  int *b, *middle, *curbuf;
+  int j, k, curbufsize, limit;
+#endif
+  int i;
+
+  if(lastsuffix != 0) { ++first; }
+
+#if SS_BLOCKSIZE == 0
+  ss_mintrosort(T, PA, first, last, depth);
+#else
+  if((bufsize < SS_BLOCKSIZE) &&
+      (bufsize < (last - first)) &&
+      (bufsize < (limit = ss_isqrt(last - first)))) {
+    if(SS_BLOCKSIZE < limit) { limit = SS_BLOCKSIZE; }
+    buf = middle = last - limit, bufsize = limit;
+  } else {
+    middle = last, limit = 0;
+  }
+  for(a = first, i = 0; SS_BLOCKSIZE < (middle - a); a += SS_BLOCKSIZE, ++i) {
+#if SS_INSERTIONSORT_THRESHOLD < SS_BLOCKSIZE
+    ss_mintrosort(T, PA, a, a + SS_BLOCKSIZE, depth);
+#elif 1 < SS_BLOCKSIZE
+    ss_insertionsort(T, PA, a, a + SS_BLOCKSIZE, depth);
+#endif
+    curbufsize = last - (a + SS_BLOCKSIZE);
+    curbuf = a + SS_BLOCKSIZE;
+    if(curbufsize <= bufsize) { curbufsize = bufsize, curbuf = buf; }
+    for(b = a, k = SS_BLOCKSIZE, j = i; j & 1; b -= k, k <<= 1, j >>= 1) {
+      ss_swapmerge(T, PA, b - k, b, b + k, curbuf, curbufsize, depth);
+    }
+  }
+#if SS_INSERTIONSORT_THRESHOLD < SS_BLOCKSIZE
+  ss_mintrosort(T, PA, a, middle, depth);
+#elif 1 < SS_BLOCKSIZE
+  ss_insertionsort(T, PA, a, middle, depth);
+#endif
+  for(k = SS_BLOCKSIZE; i != 0; k <<= 1, i >>= 1) {
+    if(i & 1) {
+      ss_swapmerge(T, PA, a - k, a, middle, buf, bufsize, depth);
+      a -= k;
+    }
+  }
+  if(limit != 0) {
+#if SS_INSERTIONSORT_THRESHOLD < SS_BLOCKSIZE
+    ss_mintrosort(T, PA, middle, last, depth);
+#elif 1 < SS_BLOCKSIZE
+    ss_insertionsort(T, PA, middle, last, depth);
+#endif
+    ss_inplacemerge(T, PA, first, middle, last, depth);
+  }
+#endif
+
+  if(lastsuffix != 0) {
+    /* Insert last type B* suffix. */
+    int PAi[2]; PAi[0] = PA[*(first - 1)], PAi[1] = n - 2;
+    for(a = first, i = *(first - 1);
+        (a < last) && ((*a < 0) || (0 < ss_compare(T, &(PAi[0]), PA + *a, depth)));
+        ++a) {
+      *(a - 1) = *a;
+    }
+    *(a - 1) = i;
+  }
+}
+
+
+/*---------------------------------------------------------------------------*/
+
+static INLINE
+int
+tr_ilg(int n) {
+  return (n & 0xffff0000) ?
+          ((n & 0xff000000) ?
+            24 + lg_table[(n >> 24) & 0xff] :
+            16 + lg_table[(n >> 16) & 0xff]) :
+          ((n & 0x0000ff00) ?
+             8 + lg_table[(n >>  8) & 0xff] :
+             0 + lg_table[(n >>  0) & 0xff]);
+}
+
+
+/*---------------------------------------------------------------------------*/
+
+/* Simple insertionsort for small size groups. */
+static
+void
+tr_insertionsort(const int *ISAd, int *first, int *last) {
+  int *a, *b;
+  int t, r;
+
+  for(a = first + 1; a < last; ++a) {
+    for(t = *a, b = a - 1; 0 > (r = ISAd[t] - ISAd[*b]);) {
+      do { *(b + 1) = *b; } while((first <= --b) && (*b < 0));
+      if(b < first) { break; }
+    }
+    if(r == 0) { *b = ~*b; }
+    *(b + 1) = t;
+  }
+}
+
+
+/*---------------------------------------------------------------------------*/
+
+static INLINE
+void
+tr_fixdown(const int *ISAd, int *SA, int i, int size) {
+  int j, k;
+  int v;
+  int c, d, e;
+
+  for(v = SA[i], c = ISAd[v]; (j = 2 * i + 1) < size; SA[i] = SA[k], i = k) {
+    d = ISAd[SA[k = j++]];
+    if(d < (e = ISAd[SA[j]])) { k = j; d = e; }
+    if(d <= c) { break; }
+  }
+  SA[i] = v;
+}
+
+/* Simple top-down heapsort. */
+static
+void
+tr_heapsort(const int *ISAd, int *SA, int size) {
+  int i, m;
+  int t;
+
+  m = size;
+  if((size % 2) == 0) {
+    m--;
+    if(ISAd[SA[m / 2]] < ISAd[SA[m]]) { SWAP(SA[m], SA[m / 2]); }
+  }
+
+  for(i = m / 2 - 1; 0 <= i; --i) { tr_fixdown(ISAd, SA, i, m); }
+  if((size % 2) == 0) { SWAP(SA[0], SA[m]); tr_fixdown(ISAd, SA, 0, m); }
+  for(i = m - 1; 0 < i; --i) {
+    t = SA[0], SA[0] = SA[i];
+    tr_fixdown(ISAd, SA, 0, i);
+    SA[i] = t;
+  }
+}
+
+
+/*---------------------------------------------------------------------------*/
+
+/* Returns the median of three elements. */
+static INLINE
+int *
+tr_median3(const int *ISAd, int *v1, int *v2, int *v3) {
+  int *t;
+  if(ISAd[*v1] > ISAd[*v2]) { SWAP(v1, v2); }
+  if(ISAd[*v2] > ISAd[*v3]) {
+    if(ISAd[*v1] > ISAd[*v3]) { return v1; }
+    else { return v3; }
+  }
+  return v2;
+}
+
+/* Returns the median of five elements. */
+static INLINE
+int *
+tr_median5(const int *ISAd,
+           int *v1, int *v2, int *v3, int *v4, int *v5) {
+  int *t;
+  if(ISAd[*v2] > ISAd[*v3]) { SWAP(v2, v3); }
+  if(ISAd[*v4] > ISAd[*v5]) { SWAP(v4, v5); }
+  if(ISAd[*v2] > ISAd[*v4]) { SWAP(v2, v4); SWAP(v3, v5); }
+  if(ISAd[*v1] > ISAd[*v3]) { SWAP(v1, v3); }
+  if(ISAd[*v1] > ISAd[*v4]) { SWAP(v1, v4); SWAP(v3, v5); }
+  if(ISAd[*v3] > ISAd[*v4]) { return v4; }
+  return v3;
+}
+
+/* Returns the pivot element. */
+static INLINE
+int *
+tr_pivot(const int *ISAd, int *first, int *last) {
+  int *middle;
+  int t;
+
+  t = last - first;
+  middle = first + t / 2;
+
+  if(t <= 512) {
+    if(t <= 32) {
+      return tr_median3(ISAd, first, middle, last - 1);
+    } else {
+      t >>= 2;
+      return tr_median5(ISAd, first, first + t, middle, last - 1 - t, last - 1);
+    }
+  }
+  t >>= 3;
+  first  = tr_median3(ISAd, first, first + t, first + (t << 1));
+  middle = tr_median3(ISAd, middle - t, middle, middle + t);
+  last   = tr_median3(ISAd, last - 1 - (t << 1), last - 1 - t, last - 1);
+  return tr_median3(ISAd, first, middle, last);
+}
+
+
+/*---------------------------------------------------------------------------*/
+
+typedef struct _trbudget_t trbudget_t;
+struct _trbudget_t {
+  int chance;
+  int remain;
+  int incval;
+  int count;
+};
+
+static INLINE
+void
+trbudget_init(trbudget_t *budget, int chance, int incval) {
+  budget->chance = chance;
+  budget->remain = budget->incval = incval;
+}
+
+static INLINE
+int
+trbudget_check(trbudget_t *budget, int size) {
+  if(size <= budget->remain) { budget->remain -= size; return 1; }
+  if(budget->chance == 0) { budget->count += size; return 0; }
+  budget->remain += budget->incval - size;
+  budget->chance -= 1;
+  return 1;
+}
+
+
+/*---------------------------------------------------------------------------*/
+
+static INLINE
+void
+tr_partition(const int *ISAd,
+             int *first, int *middle, int *last,
+             int **pa, int **pb, int v) {
+  int *a, *b, *c, *d, *e, *f;
+  int t, s;
+  int x = 0;
+
+  for(b = middle - 1; (++b < last) && ((x = ISAd[*b]) == v);) { }
+  if(((a = b) < last) && (x < v)) {
+    for(; (++b < last) && ((x = ISAd[*b]) <= v);) {
+      if(x == v) { SWAP(*b, *a); ++a; }
+    }
+  }
+  for(c = last; (b < --c) && ((x = ISAd[*c]) == v);) { }
+  if((b < (d = c)) && (x > v)) {
+    for(; (b < --c) && ((x = ISAd[*c]) >= v);) {
+      if(x == v) { SWAP(*c, *d); --d; }
+    }
+  }
+  for(; b < c;) {
+    SWAP(*b, *c);
+    for(; (++b < c) && ((x = ISAd[*b]) <= v);) {
+      if(x == v) { SWAP(*b, *a); ++a; }
+    }
+    for(; (b < --c) && ((x = ISAd[*c]) >= v);) {
+      if(x == v) { SWAP(*c, *d); --d; }
+    }
+  }
+
+  if(a <= d) {
+    c = b - 1;
+    if((s = a - first) > (t = b - a)) { s = t; }
+    for(e = first, f = b - s; 0 < s; --s, ++e, ++f) { SWAP(*e, *f); }
+    if((s = d - c) > (t = last - d - 1)) { s = t; }
+    for(e = b, f = last - s; 0 < s; --s, ++e, ++f) { SWAP(*e, *f); }
+    first += (b - a), last -= (d - c);
+  }
+  *pa = first, *pb = last;
+}
+
+static
+void
+tr_copy(int *ISA, const int *SA,
+        int *first, int *a, int *b, int *last,
+        int depth) {
+  /* sort suffixes of middle partition
+     by using sorted order of suffixes of left and right partition. */
+  int *c, *d, *e;
+  int s, v;
+
+  v = b - SA - 1;
+  for(c = first, d = a - 1; c <= d; ++c) {
+    if((0 <= (s = *c - depth)) && (ISA[s] == v)) {
+      *++d = s;
+      ISA[s] = d - SA;
+    }
+  }
+  for(c = last - 1, e = d + 1, d = b; e < d; --c) {
+    if((0 <= (s = *c - depth)) && (ISA[s] == v)) {
+      *--d = s;
+      ISA[s] = d - SA;
+    }
+  }
+}
+
+static
+void
+tr_partialcopy(int *ISA, const int *SA,
+               int *first, int *a, int *b, int *last,
+               int depth) {
+  int *c, *d, *e;
+  int s, v;
+  int rank, lastrank, newrank = -1;
+
+  v = b - SA - 1;
+  lastrank = -1;
+  for(c = first, d = a - 1; c <= d; ++c) {
+    if((0 <= (s = *c - depth)) && (ISA[s] == v)) {
+      *++d = s;
+      rank = ISA[s + depth];
+      if(lastrank != rank) { lastrank = rank; newrank = d - SA; }
+      ISA[s] = newrank;
+    }
+  }
+
+  lastrank = -1;
+  for(e = d; first <= e; --e) {
+    rank = ISA[*e];
+    if(lastrank != rank) { lastrank = rank; newrank = e - SA; }
+    if(newrank != rank) { ISA[*e] = newrank; }
+  }
+
+  lastrank = -1;
+  for(c = last - 1, e = d + 1, d = b; e < d; --c) {
+    if((0 <= (s = *c - depth)) && (ISA[s] == v)) {
+      *--d = s;
+      rank = ISA[s + depth];
+      if(lastrank != rank) { lastrank = rank; newrank = d - SA; }
+      ISA[s] = newrank;
+    }
+  }
+}
+
+static
+void
+tr_introsort(int *ISA, const int *ISAd,
+             int *SA, int *first, int *last,
+             trbudget_t *budget) {
+#define STACK_SIZE TR_STACKSIZE
+  struct { const int *a; int *b, *c; int d, e; }stack[STACK_SIZE];
+  int *a, *b, *c;
+  int t;
+  int v, x = 0;
+  int incr = ISAd - ISA;
+  int limit, next;
+  int ssize, trlink = -1;
+
+  for(ssize = 0, limit = tr_ilg(last - first);;) {
+
+    if(limit < 0) {
+      if(limit == -1) {
+        /* tandem repeat partition */
+        tr_partition(ISAd - incr, first, first, last, &a, &b, last - SA - 1);
+
+        /* update ranks */
+        if(a < last) {
+          for(c = first, v = a - SA - 1; c < a; ++c) { ISA[*c] = v; }
+        }
+        if(b < last) {
+          for(c = a, v = b - SA - 1; c < b; ++c) { ISA[*c] = v; }
+        }
+
+        /* push */
+        if(1 < (b - a)) {
+          STACK_PUSH5(NULL, a, b, 0, 0);
+          STACK_PUSH5(ISAd - incr, first, last, -2, trlink);
+          trlink = ssize - 2;
+        }
+        if((a - first) <= (last - b)) {
+          if(1 < (a - first)) {
+            STACK_PUSH5(ISAd, b, last, tr_ilg(last - b), trlink);
+            last = a, limit = tr_ilg(a - first);
+          } else if(1 < (last - b)) {
+            first = b, limit = tr_ilg(last - b);
+          } else {
+            STACK_POP5(ISAd, first, last, limit, trlink);
+          }
+        } else {
+          if(1 < (last - b)) {
+            STACK_PUSH5(ISAd, first, a, tr_ilg(a - first), trlink);
+            first = b, limit = tr_ilg(last - b);
+          } else if(1 < (a - first)) {
+            last = a, limit = tr_ilg(a - first);
+          } else {
+            STACK_POP5(ISAd, first, last, limit, trlink);
+          }
+        }
+      } else if(limit == -2) {
+        /* tandem repeat copy */
+        a = stack[--ssize].b, b = stack[ssize].c;
+        if(stack[ssize].d == 0) {
+          tr_copy(ISA, SA, first, a, b, last, ISAd - ISA);
+        } else {
+          if(0 <= trlink) { stack[trlink].d = -1; }
+          tr_partialcopy(ISA, SA, first, a, b, last, ISAd - ISA);
+        }
+        STACK_POP5(ISAd, first, last, limit, trlink);
+      } else {
+        /* sorted partition */
+        if(0 <= *first) {
+          a = first;
+          do { ISA[*a] = a - SA; } while((++a < last) && (0 <= *a));
+          first = a;
+        }
+        if(first < last) {
+          a = first; do { *a = ~*a; } while(*++a < 0);
+          next = (ISA[*a] != ISAd[*a]) ? tr_ilg(a - first + 1) : -1;
+          if(++a < last) { for(b = first, v = a - SA - 1; b < a; ++b) { ISA[*b] = v; } }
+
+          /* push */
+          if(trbudget_check(budget, a - first)) {
+            if((a - first) <= (last - a)) {
+              STACK_PUSH5(ISAd, a, last, -3, trlink);
+              ISAd += incr, last = a, limit = next;
+            } else {
+              if(1 < (last - a)) {
+                STACK_PUSH5(ISAd + incr, first, a, next, trlink);
+                first = a, limit = -3;
+              } else {
+                ISAd += incr, last = a, limit = next;
+              }
+            }
+          } else {
+            if(0 <= trlink) { stack[trlink].d = -1; }
+            if(1 < (last - a)) {
+              first = a, limit = -3;
+            } else {
+              STACK_POP5(ISAd, first, last, limit, trlink);
+            }
+          }
+        } else {
+          STACK_POP5(ISAd, first, last, limit, trlink);
+        }
+      }
+      continue;
+    }
+
+    if((last - first) <= TR_INSERTIONSORT_THRESHOLD) {
+      tr_insertionsort(ISAd, first, last);
+      limit = -3;
+      continue;
+    }
+
+    if(limit-- == 0) {
+      tr_heapsort(ISAd, first, last - first);
+      for(a = last - 1; first < a; a = b) {
+        for(x = ISAd[*a], b = a - 1; (first <= b) && (ISAd[*b] == x); --b) { *b = ~*b; }
+      }
+      limit = -3;
+      continue;
+    }
+
+    /* choose pivot */
+    a = tr_pivot(ISAd, first, last);
+    SWAP(*first, *a);
+    v = ISAd[*first];
+
+    /* partition */
+    tr_partition(ISAd, first, first + 1, last, &a, &b, v);
+    if((last - first) != (b - a)) {
+      next = (ISA[*a] != v) ? tr_ilg(b - a) : -1;
+
+      /* update ranks */
+      for(c = first, v = a - SA - 1; c < a; ++c) { ISA[*c] = v; }
+      if(b < last) { for(c = a, v = b - SA - 1; c < b; ++c) { ISA[*c] = v; } }
+
+      /* push */
+      if((1 < (b - a)) && (trbudget_check(budget, b - a))) {
+        if((a - first) <= (last - b)) {
+          if((last - b) <= (b - a)) {
+            if(1 < (a - first)) {
+              STACK_PUSH5(ISAd + incr, a, b, next, trlink);
+              STACK_PUSH5(ISAd, b, last, limit, trlink);
+              last = a;
+            } else if(1 < (last - b)) {
+              STACK_PUSH5(ISAd + incr, a, b, next, trlink);
+              first = b;
+            } else {
+              ISAd += incr, first = a, last = b, limit = next;
+            }
+          } else if((a - first) <= (b - a)) {
+            if(1 < (a - first)) {
+              STACK_PUSH5(ISAd, b, last, limit, trlink);
+              STACK_PUSH5(ISAd + incr, a, b, next, trlink);
+              last = a;
+            } else {
+              STACK_PUSH5(ISAd, b, last, limit, trlink);
+              ISAd += incr, first = a, last = b, limit = next;
+            }
+          } else {
+            STACK_PUSH5(ISAd, b, last, limit, trlink);
+            STACK_PUSH5(ISAd, first, a, limit, trlink);
+            ISAd += incr, first = a, last = b, limit = next;
+          }
+        } else {
+          if((a - first) <= (b - a)) {
+            if(1 < (last - b)) {
+              STACK_PUSH5(ISAd + incr, a, b, next, trlink);
+              STACK_PUSH5(ISAd, first, a, limit, trlink);
+              first = b;
+            } else if(1 < (a - first)) {
+              STACK_PUSH5(ISAd + incr, a, b, next, trlink);
+              last = a;
+            } else {
+              ISAd += incr, first = a, last = b, limit = next;
+            }
+          } else if((last - b) <= (b - a)) {
+            if(1 < (last - b)) {
+              STACK_PUSH5(ISAd, first, a, limit, trlink);
+              STACK_PUSH5(ISAd + incr, a, b, next, trlink);
+              first = b;
+            } else {
+              STACK_PUSH5(ISAd, first, a, limit, trlink);
+              ISAd += incr, first = a, last = b, limit = next;
+            }
+          } else {
+            STACK_PUSH5(ISAd, first, a, limit, trlink);
+            STACK_PUSH5(ISAd, b, last, limit, trlink);
+            ISAd += incr, first = a, last = b, limit = next;
+          }
+        }
+      } else {
+        if((1 < (b - a)) && (0 <= trlink)) { stack[trlink].d = -1; }
+        if((a - first) <= (last - b)) {
+          if(1 < (a - first)) {
+            STACK_PUSH5(ISAd, b, last, limit, trlink);
+            last = a;
+          } else if(1 < (last - b)) {
+            first = b;
+          } else {
+            STACK_POP5(ISAd, first, last, limit, trlink);
+          }
+        } else {
+          if(1 < (last - b)) {
+            STACK_PUSH5(ISAd, first, a, limit, trlink);
+            first = b;
+          } else if(1 < (a - first)) {
+            last = a;
+          } else {
+            STACK_POP5(ISAd, first, last, limit, trlink);
+          }
+        }
+      }
+    } else {
+      if(trbudget_check(budget, last - first)) {
+        limit = tr_ilg(last - first), ISAd += incr;
+      } else {
+        if(0 <= trlink) { stack[trlink].d = -1; }
+        STACK_POP5(ISAd, first, last, limit, trlink);
+      }
+    }
+  }
+#undef STACK_SIZE
+}
+
+
+
+/*---------------------------------------------------------------------------*/
+
+/* Tandem repeat sort */
+static
+void
+trsort(int *ISA, int *SA, int n, int depth) {
+  int *ISAd;
+  int *first, *last;
+  trbudget_t budget;
+  int t, skip, unsorted;
+
+  trbudget_init(&budget, tr_ilg(n) * 2 / 3, n);
+/*  trbudget_init(&budget, tr_ilg(n) * 3 / 4, n); */
+  for(ISAd = ISA + depth; -n < *SA; ISAd += ISAd - ISA) {
+    first = SA;
+    skip = 0;
+    unsorted = 0;
+    do {
+      if((t = *first) < 0) { first -= t; skip += t; }
+      else {
+        if(skip != 0) { *(first + skip) = skip; skip = 0; }
+        last = SA + ISA[t] + 1;
+        if(1 < (last - first)) {
+          budget.count = 0;
+          tr_introsort(ISA, ISAd, SA, first, last, &budget);
+          if(budget.count != 0) { unsorted += budget.count; }
+          else { skip = first - last; }
+        } else if((last - first) == 1) {
+          skip = -1;
+        }
+        first = last;
+      }
+    } while(first < (SA + n));
+    if(skip != 0) { *(first + skip) = skip; }
+    if(unsorted == 0) { break; }
+  }
+}
+
+
+/*---------------------------------------------------------------------------*/
+
+/* Sorts suffixes of type B*. */
+static
+int
+sort_typeBstar(const unsigned char *T, int *SA,
+               int *bucket_A, int *bucket_B,
+               int n, int openMP) {
+  int *PAb, *ISAb, *buf;
+#ifdef LIBBSC_OPENMP
+  int *curbuf;
+  int l;
+#endif
+  int i, j, k, t, m, bufsize;
+  int c0, c1;
+#ifdef LIBBSC_OPENMP
+  int d0, d1;
+#endif
+  (void)openMP;
+
+  /* Initialize bucket arrays. */
+  for(i = 0; i < BUCKET_A_SIZE; ++i) { bucket_A[i] = 0; }
+  for(i = 0; i < BUCKET_B_SIZE; ++i) { bucket_B[i] = 0; }
+
+  /* Count the number of occurrences of the first one or two characters of each
+     type A, B and B* suffix. Moreover, store the beginning position of all
+     type B* suffixes into the array SA. */
+  for(i = n - 1, m = n, c0 = T[n - 1]; 0 <= i;) {
+    /* type A suffix. */
+    do { ++BUCKET_A(c1 = c0); } while((0 <= --i) && ((c0 = T[i]) >= c1));
+    if(0 <= i) {
+      /* type B* suffix. */
+      ++BUCKET_BSTAR(c0, c1);
+      SA[--m] = i;
+      /* type B suffix. */
+      for(--i, c1 = c0; (0 <= i) && ((c0 = T[i]) <= c1); --i, c1 = c0) {
+        ++BUCKET_B(c0, c1);
+      }
+    }
+  }
+  m = n - m;
+/*
+note:
+  A type B* suffix is lexicographically smaller than a type B suffix that
+  begins with the same first two characters.
+*/
+
+  /* Calculate the index of start/end point of each bucket. */
+  for(c0 = 0, i = 0, j = 0; c0 < ALPHABET_SIZE; ++c0) {
+    t = i + BUCKET_A(c0);
+    BUCKET_A(c0) = i + j; /* start point */
+    i = t + BUCKET_B(c0, c0);
+    for(c1 = c0 + 1; c1 < ALPHABET_SIZE; ++c1) {
+      j += BUCKET_BSTAR(c0, c1);
+      BUCKET_BSTAR(c0, c1) = j; /* end point */
+      i += BUCKET_B(c0, c1);
+    }
+  }
+
+  if(0 < m) {
+    /* Sort the type B* suffixes by their first two characters. */
+    PAb = SA + n - m; ISAb = SA + m;
+    for(i = m - 2; 0 <= i; --i) {
+      t = PAb[i], c0 = T[t], c1 = T[t + 1];
+      SA[--BUCKET_BSTAR(c0, c1)] = i;
+    }
+    t = PAb[m - 1], c0 = T[t], c1 = T[t + 1];
+    SA[--BUCKET_BSTAR(c0, c1)] = m - 1;
+
+    /* Sort the type B* substrings using sssort. */
+#ifdef LIBBSC_OPENMP
+    if (openMP)
+    {
+        buf = SA + m;
+        c0 = ALPHABET_SIZE - 2, c1 = ALPHABET_SIZE - 1, j = m;
+#pragma omp parallel default(shared) private(bufsize, curbuf, k, l, d0, d1)
+        {
+          bufsize = (n - (2 * m)) / omp_get_num_threads();
+          curbuf = buf + omp_get_thread_num() * bufsize;
+          k = 0;
+          for(;;) {
+            #pragma omp critical(sssort_lock)
+            {
+              if(0 < (l = j)) {
+                d0 = c0, d1 = c1;
+                do {
+                  k = BUCKET_BSTAR(d0, d1);
+                  if(--d1 <= d0) {
+                    d1 = ALPHABET_SIZE - 1;
+                    if(--d0 < 0) { break; }
+                  }
+                } while(((l - k) <= 1) && (0 < (l = k)));
+                c0 = d0, c1 = d1, j = k;
+              }
+            }
+            if(l == 0) { break; }
+            sssort(T, PAb, SA + k, SA + l,
+                   curbuf, bufsize, 2, n, *(SA + k) == (m - 1));
+          }
+        }
+    }
+    else
+    {
+        buf = SA + m, bufsize = n - (2 * m);
+        for(c0 = ALPHABET_SIZE - 2, j = m; 0 < j; --c0) {
+          for(c1 = ALPHABET_SIZE - 1; c0 < c1; j = i, --c1) {
+            i = BUCKET_BSTAR(c0, c1);
+            if(1 < (j - i)) {
+              sssort(T, PAb, SA + i, SA + j,
+                     buf, bufsize, 2, n, *(SA + i) == (m - 1));
+            }
+          }
+        }
+    }
+#else
+    buf = SA + m, bufsize = n - (2 * m);
+    for(c0 = ALPHABET_SIZE - 2, j = m; 0 < j; --c0) {
+      for(c1 = ALPHABET_SIZE - 1; c0 < c1; j = i, --c1) {
+        i = BUCKET_BSTAR(c0, c1);
+        if(1 < (j - i)) {
+          sssort(T, PAb, SA + i, SA + j,
+                 buf, bufsize, 2, n, *(SA + i) == (m - 1));
+        }
+      }
+    }
+#endif
+
+    /* Compute ranks of type B* substrings. */
+    for(i = m - 1; 0 <= i; --i) {
+      if(0 <= SA[i]) {
+        j = i;
+        do { ISAb[SA[i]] = i; } while((0 <= --i) && (0 <= SA[i]));
+        SA[i + 1] = i - j;
+        if(i <= 0) { break; }
+      }
+      j = i;
+      do { ISAb[SA[i] = ~SA[i]] = j; } while(SA[--i] < 0);
+      ISAb[SA[i]] = j;
+    }
+
+    /* Construct the inverse suffix array of type B* suffixes using trsort. */
+    trsort(ISAb, SA, m, 1);
+
+    /* Set the sorted order of type B* suffixes. */
+    for(i = n - 1, j = m, c0 = T[n - 1]; 0 <= i;) {
+      for(--i, c1 = c0; (0 <= i) && ((c0 = T[i]) >= c1); --i, c1 = c0) { }
+      if(0 <= i) {
+        t = i;
+        for(--i, c1 = c0; (0 <= i) && ((c0 = T[i]) <= c1); --i, c1 = c0) { }
+        SA[ISAb[--j]] = ((t == 0) || (1 < (t - i))) ? t : ~t;
+      }
+    }
+
+    /* Calculate the index of start/end point of each bucket. */
+    BUCKET_B(ALPHABET_SIZE - 1, ALPHABET_SIZE - 1) = n; /* end point */
+    for(c0 = ALPHABET_SIZE - 2, k = m - 1; 0 <= c0; --c0) {
+      i = BUCKET_A(c0 + 1) - 1;
+      for(c1 = ALPHABET_SIZE - 1; c0 < c1; --c1) {
+        t = i - BUCKET_B(c0, c1);
+        BUCKET_B(c0, c1) = i; /* end point */
+
+        /* Move all type B* suffixes to the correct position. */
+        for(i = t, j = BUCKET_BSTAR(c0, c1);
+            j <= k;
+            --i, --k) { SA[i] = SA[k]; }
+      }
+      BUCKET_BSTAR(c0, c0 + 1) = i - BUCKET_B(c0, c0) + 1; /* start point */
+      BUCKET_B(c0, c0) = i; /* end point */
+    }
+  }
+
+  return m;
+}
+
+/* Constructs the suffix array by using the sorted order of type B* suffixes. */
+static
+void
+construct_SA(const unsigned char *T, int *SA,
+             int *bucket_A, int *bucket_B,
+             int n, int m) {
+  int *i, *j, *k;
+  int s;
+  int c0, c1, c2;
+
+  if(0 < m) {
+    /* Construct the sorted order of type B suffixes by using
+       the sorted order of type B* suffixes. */
+    for(c1 = ALPHABET_SIZE - 2; 0 <= c1; --c1) {
+      /* Scan the suffix array from right to left. */
+      for(i = SA + BUCKET_BSTAR(c1, c1 + 1),
+          j = SA + BUCKET_A(c1 + 1) - 1, k = NULL, c2 = -1;
+          i <= j;
+          --j) {
+        if(0 < (s = *j)) {
+          assert(T[s] == c1);
+          assert(((s + 1) < n) && (T[s] <= T[s + 1]));
+          assert(T[s - 1] <= T[s]);
+          *j = ~s;
+          c0 = T[--s];
+          if((0 < s) && (T[s - 1] > c0)) { s = ~s; }
+          if(c0 != c2) {
+            if(0 <= c2) { BUCKET_B(c2, c1) = k - SA; }
+            k = SA + BUCKET_B(c2 = c0, c1);
+          }
+          assert(k < j); assert(k != NULL);
+          *k-- = s;
+        } else {
+          assert(((s == 0) && (T[s] == c1)) || (s < 0));
+          *j = ~s;
+        }
+      }
+    }
+  }
+
+  /* Construct the suffix array by using
+     the sorted order of type B suffixes. */
+  k = SA + BUCKET_A(c2 = T[n - 1]);
+  *k++ = (T[n - 2] < c2) ? ~(n - 1) : (n - 1);
+  /* Scan the suffix array from left to right. */
+  for(i = SA, j = SA + n; i < j; ++i) {
+    if(0 < (s = *i)) {
+      assert(T[s - 1] >= T[s]);
+      c0 = T[--s];
+      if((s == 0) || (T[s - 1] < c0)) { s = ~s; }
+      if(c0 != c2) {
+        BUCKET_A(c2) = k - SA;
+        k = SA + BUCKET_A(c2 = c0);
+      }
+      assert(i < k);
+      *k++ = s;
+    } else {
+      assert(s < 0);
+      *i = ~s;
+    }
+  }
+}
+
+/* Constructs the burrows-wheeler transformed string directly
+   by using the sorted order of type B* suffixes. */
+static
+int
+construct_BWT(const unsigned char *T, int *SA,
+              int *bucket_A, int *bucket_B,
+              int n, int m) {
+  int *i, *j, *k, *orig;
+  int s;
+  int c0, c1, c2;
+
+  if(0 < m) {
+    /* Construct the sorted order of type B suffixes by using
+       the sorted order of type B* suffixes. */
+    for(c1 = ALPHABET_SIZE - 2; 0 <= c1; --c1) {
+      /* Scan the suffix array from right to left. */
+      for(i = SA + BUCKET_BSTAR(c1, c1 + 1),
+          j = SA + BUCKET_A(c1 + 1) - 1, k = NULL, c2 = -1;
+          i <= j;
+          --j) {
+        if(0 < (s = *j)) {
+          assert(T[s] == c1);
+          assert(((s + 1) < n) && (T[s] <= T[s + 1]));
+          assert(T[s - 1] <= T[s]);
+          c0 = T[--s];
+          *j = ~((int)c0);
+          if((0 < s) && (T[s - 1] > c0)) { s = ~s; }
+          if(c0 != c2) {
+            if(0 <= c2) { BUCKET_B(c2, c1) = k - SA; }
+            k = SA + BUCKET_B(c2 = c0, c1);
+          }
+          assert(k < j); assert(k != NULL);
+          *k-- = s;
+        } else if(s != 0) {
+          *j = ~s;
+#ifndef NDEBUG
+        } else {
+          assert(T[s] == c1);
+#endif
+        }
+      }
+    }
+  }
+
+  /* Construct the BWTed string by using
+     the sorted order of type B suffixes. */
+  k = SA + BUCKET_A(c2 = T[n - 1]);
+  *k++ = (T[n - 2] < c2) ? ~((int)T[n - 2]) : (n - 1);
+  /* Scan the suffix array from left to right. */
+  for(i = SA, j = SA + n, orig = SA; i < j; ++i) {
+    if(0 < (s = *i)) {
+      assert(T[s - 1] >= T[s]);
+      c0 = T[--s];
+      *i = c0;
+      if((0 < s) && (T[s - 1] < c0)) { s = ~((int)T[s - 1]); }
+      if(c0 != c2) {
+        BUCKET_A(c2) = k - SA;
+        k = SA + BUCKET_A(c2 = c0);
+      }
+      assert(i < k);
+      *k++ = s;
+    } else if(s != 0) {
+      *i = ~s;
+    } else {
+      orig = i;
+    }
+  }
+
+  return orig - SA;
+}
+
+/* Constructs the burrows-wheeler transformed string directly
+   by using the sorted order of type B* suffixes. */
+static
+int
+construct_BWT_indexes(const unsigned char *T, int *SA,
+                      int *bucket_A, int *bucket_B,
+                      int n, int m,
+                      unsigned char * num_indexes, int * indexes) {
+  int *i, *j, *k, *orig;
+  int s;
+  int c0, c1, c2;
+
+  int mod = n / 8;
+  {
+      mod |= mod >> 1;  mod |= mod >> 2;
+      mod |= mod >> 4;  mod |= mod >> 8;
+      mod |= mod >> 16; mod >>= 1;
+
+      *num_indexes = (unsigned char)((n - 1) / (mod + 1));
+  }
+
+  if(0 < m) {
+    /* Construct the sorted order of type B suffixes by using
+       the sorted order of type B* suffixes. */
+    for(c1 = ALPHABET_SIZE - 2; 0 <= c1; --c1) {
+      /* Scan the suffix array from right to left. */
+      for(i = SA + BUCKET_BSTAR(c1, c1 + 1),
+          j = SA + BUCKET_A(c1 + 1) - 1, k = NULL, c2 = -1;
+          i <= j;
+          --j) {
+        if(0 < (s = *j)) {
+          assert(T[s] == c1);
+          assert(((s + 1) < n) && (T[s] <= T[s + 1]));
+          assert(T[s - 1] <= T[s]);
+
+          if ((s & mod) == 0) indexes[s / (mod + 1) - 1] = j - SA;
+
+          c0 = T[--s];
+          *j = ~((int)c0);
+          if((0 < s) && (T[s - 1] > c0)) { s = ~s; }
+          if(c0 != c2) {
+            if(0 <= c2) { BUCKET_B(c2, c1) = k - SA; }
+            k = SA + BUCKET_B(c2 = c0, c1);
+          }
+          assert(k < j); assert(k != NULL);
+          *k-- = s;
+        } else if(s != 0) {
+          *j = ~s;
+#ifndef NDEBUG
+        } else {
+          assert(T[s] == c1);
+#endif
+        }
+      }
+    }
+  }
+
+  /* Construct the BWTed string by using
+     the sorted order of type B suffixes. */
+  k = SA + BUCKET_A(c2 = T[n - 1]);
+  if (T[n - 2] < c2) {
+    if (((n - 1) & mod) == 0) indexes[(n - 1) / (mod + 1) - 1] = k - SA;
+    *k++ = ~((int)T[n - 2]);
+  }
+  else {
+    *k++ = n - 1;
+  }
+
+  /* Scan the suffix array from left to right. */
+  for(i = SA, j = SA + n, orig = SA; i < j; ++i) {
+    if(0 < (s = *i)) {
+      assert(T[s - 1] >= T[s]);
+
+      if ((s & mod) == 0) indexes[s / (mod + 1) - 1] = i - SA;
+
+      c0 = T[--s];
+      *i = c0;
+      if(c0 != c2) {
+        BUCKET_A(c2) = k - SA;
+        k = SA + BUCKET_A(c2 = c0);
+      }
+      assert(i < k);
+      if((0 < s) && (T[s - 1] < c0)) {
+          if ((s & mod) == 0) indexes[s / (mod + 1) - 1] = k - SA;
+          *k++ = ~((int)T[s - 1]);
+      } else
+        *k++ = s;
+    } else if(s != 0) {
+      *i = ~s;
+    } else {
+      orig = i;
+    }
+  }
+
+  return orig - SA;
+}
+
+
+/*---------------------------------------------------------------------------*/
+
+/*- Function -*/
+
+int
+divsufsort(const unsigned char *T, int *SA, int n, int openMP) {
+  int *bucket_A, *bucket_B;
+  int m;
+  int err = 0;
+
+  /* Check arguments. */
+  if((T == NULL) || (SA == NULL) || (n < 0)) { return -1; }
+  else if(n == 0) { return 0; }
+  else if(n == 1) { SA[0] = 0; return 0; }
+  else if(n == 2) { m = (T[0] < T[1]); SA[m ^ 1] = 0, SA[m] = 1; return 0; }
+
+  bucket_A = (int *)malloc(BUCKET_A_SIZE * sizeof(int));
+  bucket_B = (int *)malloc(BUCKET_B_SIZE * sizeof(int));
+
+  /* Suffixsort. */
+  if((bucket_A != NULL) && (bucket_B != NULL)) {
+    m = sort_typeBstar(T, SA, bucket_A, bucket_B, n, openMP);
+    construct_SA(T, SA, bucket_A, bucket_B, n, m);
+  } else {
+    err = -2;
+  }
+
+  free(bucket_B);
+  free(bucket_A);
+
+  return err;
+}
+
+int
+divbwt(const unsigned char *T, unsigned char *U, int *A, int n, unsigned char * num_indexes, int * indexes, int openMP) {
+  int *B;
+  int *bucket_A, *bucket_B;
+  int m, pidx, i;
+
+  /* Check arguments. */
+  if((T == NULL) || (U == NULL) || (n < 0)) { return -1; }
+  else if(n <= 1) { if(n == 1) { U[0] = T[0]; } return n; }
+
+  if((B = A) == NULL) { B = (int *)malloc((size_t)(n + 1) * sizeof(int)); }
+  bucket_A = (int *)malloc(BUCKET_A_SIZE * sizeof(int));
+  bucket_B = (int *)malloc(BUCKET_B_SIZE * sizeof(int));
+
+  /* Burrows-Wheeler Transform. */
+  if((B != NULL) && (bucket_A != NULL) && (bucket_B != NULL)) {
+    m = sort_typeBstar(T, B, bucket_A, bucket_B, n, openMP);
+
+    if (num_indexes == NULL || indexes == NULL) {
+        pidx = construct_BWT(T, B, bucket_A, bucket_B, n, m);
+    } else {
+        pidx = construct_BWT_indexes(T, B, bucket_A, bucket_B, n, m, num_indexes, indexes);
+    }
+
+    /* Copy to output string. */
+    U[0] = T[n - 1];
+    for(i = 0; i < pidx; ++i) { U[i + 1] = (unsigned char)B[i]; }
+    for(i += 1; i < n; ++i) { U[i] = (unsigned char)B[i]; }
+    pidx += 1;
+  } else {
+    pidx = -2;
+  }
+
+  free(bucket_B);
+  free(bucket_A);
+  if(A == NULL) { free(B); }
+
+  return pidx;
+}
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/dictBuilder/divsufsort.h mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/dictBuilder/divsufsort.h
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/dictBuilder/divsufsort.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/dictBuilder/divsufsort.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,67 @@
+/*
+ * divsufsort.h for libdivsufsort-lite
+ * Copyright (c) 2003-2008 Yuta Mori All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef _DIVSUFSORT_H
+#define _DIVSUFSORT_H 1
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
+/*- Prototypes -*/
+
+/**
+ * Constructs the suffix array of a given string.
+ * @param T [0..n-1] The input string.
+ * @param SA [0..n-1] The output array of suffixes.
+ * @param n The length of the given string.
+ * @param openMP enables OpenMP optimization.
+ * @return 0 if no error occurred, -1 or -2 otherwise.
+ */
+int
+divsufsort(const unsigned char *T, int *SA, int n, int openMP);
+
+/**
+ * Constructs the burrows-wheeler transformed string of a given string.
+ * @param T [0..n-1] The input string.
+ * @param U [0..n-1] The output string. (can be T)
+ * @param A [0..n-1] The temporary array. (can be NULL)
+ * @param n The length of the given string.
+ * @param num_indexes The length of secondary indexes array. (can be NULL)
+ * @param indexes The secondary indexes array. (can be NULL)
+ * @param openMP enables OpenMP optimization.
+ * @return The primary index if no error occurred, -1 or -2 otherwise.
+ */
+int
+divbwt(const unsigned char *T, unsigned char *U, int *A, int n, unsigned char * num_indexes, int * indexes, int openMP);
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* _DIVSUFSORT_H */
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/dictBuilder/fastcover.c mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/dictBuilder/fastcover.c
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/dictBuilder/fastcover.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/dictBuilder/fastcover.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,759 @@
+/*
+ * Copyright (c) Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+/*-*************************************
+*  Dependencies
+***************************************/
+#include <stdio.h>  /* fprintf */
+#include <stdlib.h> /* malloc, free, qsort */
+#include <string.h> /* memset */
+#include <time.h>   /* clock */
+
+#ifndef ZDICT_STATIC_LINKING_ONLY
+#  define ZDICT_STATIC_LINKING_ONLY
+#endif
+
+#include "../common/mem.h" /* read */
+#include "../common/pool.h"
+#include "../common/threading.h"
+#include "../common/zstd_internal.h" /* includes zstd.h */
+#include "../compress/zstd_compress_internal.h" /* ZSTD_hash*() */
+#include "../zdict.h"
+#include "cover.h"
+
+
+/*-*************************************
+*  Constants
+***************************************/
+#define FASTCOVER_MAX_SAMPLES_SIZE (sizeof(size_t) == 8 ? ((unsigned)-1) : ((unsigned)1 GB))
+#define FASTCOVER_MAX_F 31
+#define FASTCOVER_MAX_ACCEL 10
+#define FASTCOVER_DEFAULT_SPLITPOINT 0.75
+#define DEFAULT_F 20
+#define DEFAULT_ACCEL 1
+
+
+/*-*************************************
+*  Console display
+***************************************/
+#ifndef LOCALDISPLAYLEVEL
+static int g_displayLevel = 2;
+#endif
+#undef  DISPLAY
+#define DISPLAY(...)                                                           \
+  {                                                                            \
+    fprintf(stderr, __VA_ARGS__);                                              \
+    fflush(stderr);                                                            \
+  }
+#undef  LOCALDISPLAYLEVEL
+#define LOCALDISPLAYLEVEL(displayLevel, l, ...)                                \
+  if (displayLevel >= l) {                                                     \
+    DISPLAY(__VA_ARGS__);                                                      \
+  } /* 0 : no display;   1: errors;   2: default;  3: details;  4: debug */
+#undef  DISPLAYLEVEL
+#define DISPLAYLEVEL(l, ...) LOCALDISPLAYLEVEL(g_displayLevel, l, __VA_ARGS__)
+
+#ifndef LOCALDISPLAYUPDATE
+static const clock_t g_refreshRate = CLOCKS_PER_SEC * 15 / 100;
+static clock_t g_time = 0;
+#endif
+#undef  LOCALDISPLAYUPDATE
+#define LOCALDISPLAYUPDATE(displayLevel, l, ...)                               \
+  if (displayLevel >= l) {                                                     \
+    if ((clock() - g_time > g_refreshRate) || (displayLevel >= 4)) {             \
+      g_time = clock();                                                        \
+      DISPLAY(__VA_ARGS__);                                                    \
+    }                                                                          \
+  }
+#undef  DISPLAYUPDATE
+#define DISPLAYUPDATE(l, ...) LOCALDISPLAYUPDATE(g_displayLevel, l, __VA_ARGS__)
+
+
+/*-*************************************
+* Hash Functions
+***************************************/
+/**
+ * Hash the d-byte value pointed to by p and mod 2^f into the frequency vector
+ */
+static size_t FASTCOVER_hashPtrToIndex(const void* p, U32 f, unsigned d) {
+  if (d == 6) {
+    return ZSTD_hash6Ptr(p, f);
+  }
+  return ZSTD_hash8Ptr(p, f);
+}
+
+
+/*-*************************************
+* Acceleration
+***************************************/
+typedef struct {
+  unsigned finalize;    /* Percentage of training samples used for ZDICT_finalizeDictionary */
+  unsigned skip;        /* Number of dmer skipped between each dmer counted in computeFrequency */
+} FASTCOVER_accel_t;
+
+
+static const FASTCOVER_accel_t FASTCOVER_defaultAccelParameters[FASTCOVER_MAX_ACCEL+1] = {
+  { 100, 0 },   /* accel = 0, should not happen because accel = 0 defaults to accel = 1 */
+  { 100, 0 },   /* accel = 1 */
+  { 50, 1 },   /* accel = 2 */
+  { 34, 2 },   /* accel = 3 */
+  { 25, 3 },   /* accel = 4 */
+  { 20, 4 },   /* accel = 5 */
+  { 17, 5 },   /* accel = 6 */
+  { 14, 6 },   /* accel = 7 */
+  { 13, 7 },   /* accel = 8 */
+  { 11, 8 },   /* accel = 9 */
+  { 10, 9 },   /* accel = 10 */
+};
+
+
+/*-*************************************
+* Context
+***************************************/
+typedef struct {
+  const BYTE *samples;
+  size_t *offsets;
+  const size_t *samplesSizes;
+  size_t nbSamples;
+  size_t nbTrainSamples;
+  size_t nbTestSamples;
+  size_t nbDmers;
+  U32 *freqs;
+  unsigned d;
+  unsigned f;
+  FASTCOVER_accel_t accelParams;
+} FASTCOVER_ctx_t;
+
+
+/*-*************************************
+*  Helper functions
+***************************************/
+/**
+ * Selects the best segment in an epoch.
+ * Segments of are scored according to the function:
+ *
+ * Let F(d) be the frequency of all dmers with hash value d.
+ * Let S_i be hash value of the dmer at position i of segment S which has length k.
+ *
+ *     Score(S) = F(S_1) + F(S_2) + ... + F(S_{k-d+1})
+ *
+ * Once the dmer with hash value d is in the dictionary we set F(d) = 0.
+ */
+static COVER_segment_t FASTCOVER_selectSegment(const FASTCOVER_ctx_t *ctx,
+                                              U32 *freqs, U32 begin, U32 end,
+                                              ZDICT_cover_params_t parameters,
+                                              U16* segmentFreqs) {
+  /* Constants */
+  const U32 k = parameters.k;
+  const U32 d = parameters.d;
+  const U32 f = ctx->f;
+  const U32 dmersInK = k - d + 1;
+
+  /* Try each segment (activeSegment) and save the best (bestSegment) */
+  COVER_segment_t bestSegment = {0, 0, 0};
+  COVER_segment_t activeSegment;
+
+  /* Reset the activeDmers in the segment */
+  /* The activeSegment starts at the beginning of the epoch. */
+  activeSegment.begin = begin;
+  activeSegment.end = begin;
+  activeSegment.score = 0;
+
+  /* Slide the activeSegment through the whole epoch.
+   * Save the best segment in bestSegment.
+   */
+  while (activeSegment.end < end) {
+    /* Get hash value of current dmer */
+    const size_t idx = FASTCOVER_hashPtrToIndex(ctx->samples + activeSegment.end, f, d);
+
+    /* Add frequency of this index to score if this is the first occurrence of index in active segment */
+    if (segmentFreqs[idx] == 0) {
+      activeSegment.score += freqs[idx];
+    }
+    /* Increment end of segment and segmentFreqs*/
+    activeSegment.end += 1;
+    segmentFreqs[idx] += 1;
+    /* If the window is now too large, drop the first position */
+    if (activeSegment.end - activeSegment.begin == dmersInK + 1) {
+      /* Get hash value of the dmer to be eliminated from active segment */
+      const size_t delIndex = FASTCOVER_hashPtrToIndex(ctx->samples + activeSegment.begin, f, d);
+      segmentFreqs[delIndex] -= 1;
+      /* Subtract frequency of this index from score if this is the last occurrence of this index in active segment */
+      if (segmentFreqs[delIndex] == 0) {
+        activeSegment.score -= freqs[delIndex];
+      }
+      /* Increment start of segment */
+      activeSegment.begin += 1;
+    }
+
+    /* If this segment is the best so far save it */
+    if (activeSegment.score > bestSegment.score) {
+      bestSegment = activeSegment;
+    }
+  }
+
+  /* Zero out rest of segmentFreqs array */
+  while (activeSegment.begin < end) {
+    const size_t delIndex = FASTCOVER_hashPtrToIndex(ctx->samples + activeSegment.begin, f, d);
+    segmentFreqs[delIndex] -= 1;
+    activeSegment.begin += 1;
+  }
+
+  {
+    /*  Zero the frequency of hash value of each dmer covered by the chosen segment. */
+    U32 pos;
+    for (pos = bestSegment.begin; pos != bestSegment.end; ++pos) {
+      const size_t i = FASTCOVER_hashPtrToIndex(ctx->samples + pos, f, d);
+      freqs[i] = 0;
+    }
+  }
+
+  return bestSegment;
+}
+
+
+static int FASTCOVER_checkParameters(ZDICT_cover_params_t parameters,
+                                     size_t maxDictSize, unsigned f,
+                                     unsigned accel) {
+  /* k, d, and f are required parameters */
+  if (parameters.d == 0 || parameters.k == 0) {
+    return 0;
+  }
+  /* d has to be 6 or 8 */
+  if (parameters.d != 6 && parameters.d != 8) {
+    return 0;
+  }
+  /* k <= maxDictSize */
+  if (parameters.k > maxDictSize) {
+    return 0;
+  }
+  /* d <= k */
+  if (parameters.d > parameters.k) {
+    return 0;
+  }
+  /* 0 < f <= FASTCOVER_MAX_F*/
+  if (f > FASTCOVER_MAX_F || f == 0) {
+    return 0;
+  }
+  /* 0 < splitPoint <= 1 */
+  if (parameters.splitPoint <= 0 || parameters.splitPoint > 1) {
+    return 0;
+  }
+  /* 0 < accel <= 10 */
+  if (accel > 10 || accel == 0) {
+    return 0;
+  }
+  return 1;
+}
+
+
+/**
+ * Clean up a context initialized with `FASTCOVER_ctx_init()`.
+ */
+static void
+FASTCOVER_ctx_destroy(FASTCOVER_ctx_t* ctx)
+{
+    if (!ctx) return;
+
+    free(ctx->freqs);
+    ctx->freqs = NULL;
+
+    free(ctx->offsets);
+    ctx->offsets = NULL;
+}
+
+
+/**
+ * Calculate for frequency of hash value of each dmer in ctx->samples
+ */
+static void
+FASTCOVER_computeFrequency(U32* freqs, const FASTCOVER_ctx_t* ctx)
+{
+    const unsigned f = ctx->f;
+    const unsigned d = ctx->d;
+    const unsigned skip = ctx->accelParams.skip;
+    const unsigned readLength = MAX(d, 8);
+    size_t i;
+    assert(ctx->nbTrainSamples >= 5);
+    assert(ctx->nbTrainSamples <= ctx->nbSamples);
+    for (i = 0; i < ctx->nbTrainSamples; i++) {
+        size_t start = ctx->offsets[i];  /* start of current dmer */
+        size_t const currSampleEnd = ctx->offsets[i+1];
+        while (start + readLength <= currSampleEnd) {
+            const size_t dmerIndex = FASTCOVER_hashPtrToIndex(ctx->samples + start, f, d);
+            freqs[dmerIndex]++;
+            start = start + skip + 1;
+        }
+    }
+}
+
+
+/**
+ * Prepare a context for dictionary building.
+ * The context is only dependent on the parameter `d` and can used multiple
+ * times.
+ * Returns 0 on success or error code on error.
+ * The context must be destroyed with `FASTCOVER_ctx_destroy()`.
+ */
+static size_t
+FASTCOVER_ctx_init(FASTCOVER_ctx_t* ctx,
+                   const void* samplesBuffer,
+                   const size_t* samplesSizes, unsigned nbSamples,
+                   unsigned d, double splitPoint, unsigned f,
+                   FASTCOVER_accel_t accelParams)
+{
+    const BYTE* const samples = (const BYTE*)samplesBuffer;
+    const size_t totalSamplesSize = COVER_sum(samplesSizes, nbSamples);
+    /* Split samples into testing and training sets */
+    const unsigned nbTrainSamples = splitPoint < 1.0 ? (unsigned)((double)nbSamples * splitPoint) : nbSamples;
+    const unsigned nbTestSamples = splitPoint < 1.0 ? nbSamples - nbTrainSamples : nbSamples;
+    const size_t trainingSamplesSize = splitPoint < 1.0 ? COVER_sum(samplesSizes, nbTrainSamples) : totalSamplesSize;
+    const size_t testSamplesSize = splitPoint < 1.0 ? COVER_sum(samplesSizes + nbTrainSamples, nbTestSamples) : totalSamplesSize;
+
+    /* Checks */
+    if (totalSamplesSize < MAX(d, sizeof(U64)) ||
+        totalSamplesSize >= (size_t)FASTCOVER_MAX_SAMPLES_SIZE) {
+        DISPLAYLEVEL(1, "Total samples size is too large (%u MB), maximum size is %u MB\n",
+                    (unsigned)(totalSamplesSize >> 20), (FASTCOVER_MAX_SAMPLES_SIZE >> 20));
+        return ERROR(srcSize_wrong);
+    }
+
+    /* Check if there are at least 5 training samples */
+    if (nbTrainSamples < 5) {
+        DISPLAYLEVEL(1, "Total number of training samples is %u and is invalid\n", nbTrainSamples);
+        return ERROR(srcSize_wrong);
+    }
+
+    /* Check if there's testing sample */
+    if (nbTestSamples < 1) {
+        DISPLAYLEVEL(1, "Total number of testing samples is %u and is invalid.\n", nbTestSamples);
+        return ERROR(srcSize_wrong);
+    }
+
+    /* Zero the context */
+    memset(ctx, 0, sizeof(*ctx));
+    DISPLAYLEVEL(2, "Training on %u samples of total size %u\n", nbTrainSamples,
+                    (unsigned)trainingSamplesSize);
+    DISPLAYLEVEL(2, "Testing on %u samples of total size %u\n", nbTestSamples,
+                    (unsigned)testSamplesSize);
+
+    ctx->samples = samples;
+    ctx->samplesSizes = samplesSizes;
+    ctx->nbSamples = nbSamples;
+    ctx->nbTrainSamples = nbTrainSamples;
+    ctx->nbTestSamples = nbTestSamples;
+    ctx->nbDmers = trainingSamplesSize - MAX(d, sizeof(U64)) + 1;
+    ctx->d = d;
+    ctx->f = f;
+    ctx->accelParams = accelParams;
+
+    /* The offsets of each file */
+    ctx->offsets = (size_t*)calloc((nbSamples + 1), sizeof(size_t));
+    if (ctx->offsets == NULL) {
+        DISPLAYLEVEL(1, "Failed to allocate scratch buffers \n");
+        FASTCOVER_ctx_destroy(ctx);
+        return ERROR(memory_allocation);
+    }
+
+    /* Fill offsets from the samplesSizes */
+    {   U32 i;
+        ctx->offsets[0] = 0;
+        assert(nbSamples >= 5);
+        for (i = 1; i <= nbSamples; ++i) {
+            ctx->offsets[i] = ctx->offsets[i - 1] + samplesSizes[i - 1];
+        }
+    }
+
+    /* Initialize frequency array of size 2^f */
+    ctx->freqs = (U32*)calloc(((U64)1 << f), sizeof(U32));
+    if (ctx->freqs == NULL) {
+        DISPLAYLEVEL(1, "Failed to allocate frequency table \n");
+        FASTCOVER_ctx_destroy(ctx);
+        return ERROR(memory_allocation);
+    }
+
+    DISPLAYLEVEL(2, "Computing frequencies\n");
+    FASTCOVER_computeFrequency(ctx->freqs, ctx);
+
+    return 0;
+}
+
+
+/**
+ * Given the prepared context build the dictionary.
+ */
+static size_t
+FASTCOVER_buildDictionary(const FASTCOVER_ctx_t* ctx,
+                          U32* freqs,
+                          void* dictBuffer, size_t dictBufferCapacity,
+                          ZDICT_cover_params_t parameters,
+                          U16* segmentFreqs)
+{
+  BYTE *const dict = (BYTE *)dictBuffer;
+  size_t tail = dictBufferCapacity;
+  /* Divide the data into epochs. We will select one segment from each epoch. */
+  const COVER_epoch_info_t epochs = COVER_computeEpochs(
+      (U32)dictBufferCapacity, (U32)ctx->nbDmers, parameters.k, 1);
+  const size_t maxZeroScoreRun = 10;
+  size_t zeroScoreRun = 0;
+  size_t epoch;
+  DISPLAYLEVEL(2, "Breaking content into %u epochs of size %u\n",
+                (U32)epochs.num, (U32)epochs.size);
+  /* Loop through the epochs until there are no more segments or the dictionary
+   * is full.
+   */
+  for (epoch = 0; tail > 0; epoch = (epoch + 1) % epochs.num) {
+    const U32 epochBegin = (U32)(epoch * epochs.size);
+    const U32 epochEnd = epochBegin + epochs.size;
+    size_t segmentSize;
+    /* Select a segment */
+    COVER_segment_t segment = FASTCOVER_selectSegment(
+        ctx, freqs, epochBegin, epochEnd, parameters, segmentFreqs);
+
+    /* If the segment covers no dmers, then we are out of content.
+     * There may be new content in other epochs, for continue for some time.
+     */
+    if (segment.score == 0) {
+      if (++zeroScoreRun >= maxZeroScoreRun) {
+          break;
+      }
+      continue;
+    }
+    zeroScoreRun = 0;
+
+    /* Trim the segment if necessary and if it is too small then we are done */
+    segmentSize = MIN(segment.end - segment.begin + parameters.d - 1, tail);
+    if (segmentSize < parameters.d) {
+      break;
+    }
+
+    /* We fill the dictionary from the back to allow the best segments to be
+     * referenced with the smallest offsets.
+     */
+    tail -= segmentSize;
+    memcpy(dict + tail, ctx->samples + segment.begin, segmentSize);
+    DISPLAYUPDATE(
+        2, "\r%u%%       ",
+        (unsigned)(((dictBufferCapacity - tail) * 100) / dictBufferCapacity));
+  }
+  DISPLAYLEVEL(2, "\r%79s\r", "");
+  return tail;
+}
+
+/**
+ * Parameters for FASTCOVER_tryParameters().
+ */
+typedef struct FASTCOVER_tryParameters_data_s {
+    const FASTCOVER_ctx_t* ctx;
+    COVER_best_t* best;
+    size_t dictBufferCapacity;
+    ZDICT_cover_params_t parameters;
+} FASTCOVER_tryParameters_data_t;
+
+
+/**
+ * Tries a set of parameters and updates the COVER_best_t with the results.
+ * This function is thread safe if zstd is compiled with multithreaded support.
+ * It takes its parameters as an *OWNING* opaque pointer to support threading.
+ */
+static void FASTCOVER_tryParameters(void* opaque)
+{
+  /* Save parameters as local variables */
+  FASTCOVER_tryParameters_data_t *const data = (FASTCOVER_tryParameters_data_t*)opaque;
+  const FASTCOVER_ctx_t *const ctx = data->ctx;
+  const ZDICT_cover_params_t parameters = data->parameters;
+  size_t dictBufferCapacity = data->dictBufferCapacity;
+  size_t totalCompressedSize = ERROR(GENERIC);
+  /* Initialize array to keep track of frequency of dmer within activeSegment */
+  U16* segmentFreqs = (U16*)calloc(((U64)1 << ctx->f), sizeof(U16));
+  /* Allocate space for hash table, dict, and freqs */
+  BYTE *const dict = (BYTE*)malloc(dictBufferCapacity);
+  COVER_dictSelection_t selection = COVER_dictSelectionError(ERROR(GENERIC));
+  U32* freqs = (U32*) malloc(((U64)1 << ctx->f) * sizeof(U32));
+  if (!segmentFreqs || !dict || !freqs) {
+    DISPLAYLEVEL(1, "Failed to allocate buffers: out of memory\n");
+    goto _cleanup;
+  }
+  /* Copy the frequencies because we need to modify them */
+  memcpy(freqs, ctx->freqs, ((U64)1 << ctx->f) * sizeof(U32));
+  /* Build the dictionary */
+  { const size_t tail = FASTCOVER_buildDictionary(ctx, freqs, dict, dictBufferCapacity,
+                                                    parameters, segmentFreqs);
+
+    const unsigned nbFinalizeSamples = (unsigned)(ctx->nbTrainSamples * ctx->accelParams.finalize / 100);
+    selection = COVER_selectDict(dict + tail, dictBufferCapacity, dictBufferCapacity - tail,
+         ctx->samples, ctx->samplesSizes, nbFinalizeSamples, ctx->nbTrainSamples, ctx->nbSamples, parameters, ctx->offsets,
+         totalCompressedSize);
+
+    if (COVER_dictSelectionIsError(selection)) {
+      DISPLAYLEVEL(1, "Failed to select dictionary\n");
+      goto _cleanup;
+    }
+  }
+_cleanup:
+  free(dict);
+  COVER_best_finish(data->best, parameters, selection);
+  free(data);
+  free(segmentFreqs);
+  COVER_dictSelectionFree(selection);
+  free(freqs);
+}
+
+
+static void
+FASTCOVER_convertToCoverParams(ZDICT_fastCover_params_t fastCoverParams,
+                               ZDICT_cover_params_t* coverParams)
+{
+    coverParams->k = fastCoverParams.k;
+    coverParams->d = fastCoverParams.d;
+    coverParams->steps = fastCoverParams.steps;
+    coverParams->nbThreads = fastCoverParams.nbThreads;
+    coverParams->splitPoint = fastCoverParams.splitPoint;
+    coverParams->zParams = fastCoverParams.zParams;
+    coverParams->shrinkDict = fastCoverParams.shrinkDict;
+}
+
+
+static void
+FASTCOVER_convertToFastCoverParams(ZDICT_cover_params_t coverParams,
+                                   ZDICT_fastCover_params_t* fastCoverParams,
+                                   unsigned f, unsigned accel)
+{
+    fastCoverParams->k = coverParams.k;
+    fastCoverParams->d = coverParams.d;
+    fastCoverParams->steps = coverParams.steps;
+    fastCoverParams->nbThreads = coverParams.nbThreads;
+    fastCoverParams->splitPoint = coverParams.splitPoint;
+    fastCoverParams->f = f;
+    fastCoverParams->accel = accel;
+    fastCoverParams->zParams = coverParams.zParams;
+    fastCoverParams->shrinkDict = coverParams.shrinkDict;
+}
+
+
+ZDICTLIB_API size_t
+ZDICT_trainFromBuffer_fastCover(void* dictBuffer, size_t dictBufferCapacity,
+                                const void* samplesBuffer,
+                                const size_t* samplesSizes, unsigned nbSamples,
+                                ZDICT_fastCover_params_t parameters)
+{
+    BYTE* const dict = (BYTE*)dictBuffer;
+    FASTCOVER_ctx_t ctx;
+    ZDICT_cover_params_t coverParams;
+    FASTCOVER_accel_t accelParams;
+    /* Initialize global data */
+    g_displayLevel = parameters.zParams.notificationLevel;
+    /* Assign splitPoint and f if not provided */
+    parameters.splitPoint = 1.0;
+    parameters.f = parameters.f == 0 ? DEFAULT_F : parameters.f;
+    parameters.accel = parameters.accel == 0 ? DEFAULT_ACCEL : parameters.accel;
+    /* Convert to cover parameter */
+    memset(&coverParams, 0 , sizeof(coverParams));
+    FASTCOVER_convertToCoverParams(parameters, &coverParams);
+    /* Checks */
+    if (!FASTCOVER_checkParameters(coverParams, dictBufferCapacity, parameters.f,
+                                   parameters.accel)) {
+      DISPLAYLEVEL(1, "FASTCOVER parameters incorrect\n");
+      return ERROR(parameter_outOfBound);
+    }
+    if (nbSamples == 0) {
+      DISPLAYLEVEL(1, "FASTCOVER must have at least one input file\n");
+      return ERROR(srcSize_wrong);
+    }
+    if (dictBufferCapacity < ZDICT_DICTSIZE_MIN) {
+      DISPLAYLEVEL(1, "dictBufferCapacity must be at least %u\n",
+                   ZDICT_DICTSIZE_MIN);
+      return ERROR(dstSize_tooSmall);
+    }
+    /* Assign corresponding FASTCOVER_accel_t to accelParams*/
+    accelParams = FASTCOVER_defaultAccelParameters[parameters.accel];
+    /* Initialize context */
+    {
+      size_t const initVal = FASTCOVER_ctx_init(&ctx, samplesBuffer, samplesSizes, nbSamples,
+                            coverParams.d, parameters.splitPoint, parameters.f,
+                            accelParams);
+      if (ZSTD_isError(initVal)) {
+        DISPLAYLEVEL(1, "Failed to initialize context\n");
+        return initVal;
+      }
+    }
+    COVER_warnOnSmallCorpus(dictBufferCapacity, ctx.nbDmers, g_displayLevel);
+    /* Build the dictionary */
+    DISPLAYLEVEL(2, "Building dictionary\n");
+    {
+      /* Initialize array to keep track of frequency of dmer within activeSegment */
+      U16* segmentFreqs = (U16 *)calloc(((U64)1 << parameters.f), sizeof(U16));
+      const size_t tail = FASTCOVER_buildDictionary(&ctx, ctx.freqs, dictBuffer,
+                                                dictBufferCapacity, coverParams, segmentFreqs);
+      const unsigned nbFinalizeSamples = (unsigned)(ctx.nbTrainSamples * ctx.accelParams.finalize / 100);
+      const size_t dictionarySize = ZDICT_finalizeDictionary(
+          dict, dictBufferCapacity, dict + tail, dictBufferCapacity - tail,
+          samplesBuffer, samplesSizes, nbFinalizeSamples, coverParams.zParams);
+      if (!ZSTD_isError(dictionarySize)) {
+          DISPLAYLEVEL(2, "Constructed dictionary of size %u\n",
+                      (unsigned)dictionarySize);
+      }
+      FASTCOVER_ctx_destroy(&ctx);
+      free(segmentFreqs);
+      return dictionarySize;
+    }
+}
+
+
+ZDICTLIB_API size_t
+ZDICT_optimizeTrainFromBuffer_fastCover(
+                    void* dictBuffer, size_t dictBufferCapacity,
+                    const void* samplesBuffer,
+                    const size_t* samplesSizes, unsigned nbSamples,
+                    ZDICT_fastCover_params_t* parameters)
+{
+    ZDICT_cover_params_t coverParams;
+    FASTCOVER_accel_t accelParams;
+    /* constants */
+    const unsigned nbThreads = parameters->nbThreads;
+    const double splitPoint =
+        parameters->splitPoint <= 0.0 ? FASTCOVER_DEFAULT_SPLITPOINT : parameters->splitPoint;
+    const unsigned kMinD = parameters->d == 0 ? 6 : parameters->d;
+    const unsigned kMaxD = parameters->d == 0 ? 8 : parameters->d;
+    const unsigned kMinK = parameters->k == 0 ? 50 : parameters->k;
+    const unsigned kMaxK = parameters->k == 0 ? 2000 : parameters->k;
+    const unsigned kSteps = parameters->steps == 0 ? 40 : parameters->steps;
+    const unsigned kStepSize = MAX((kMaxK - kMinK) / kSteps, 1);
+    const unsigned kIterations =
+        (1 + (kMaxD - kMinD) / 2) * (1 + (kMaxK - kMinK) / kStepSize);
+    const unsigned f = parameters->f == 0 ? DEFAULT_F : parameters->f;
+    const unsigned accel = parameters->accel == 0 ? DEFAULT_ACCEL : parameters->accel;
+    const unsigned shrinkDict = 0;
+    /* Local variables */
+    const int displayLevel = parameters->zParams.notificationLevel;
+    unsigned iteration = 1;
+    unsigned d;
+    unsigned k;
+    COVER_best_t best;
+    POOL_ctx *pool = NULL;
+    int warned = 0;
+    /* Checks */
+    if (splitPoint <= 0 || splitPoint > 1) {
+      LOCALDISPLAYLEVEL(displayLevel, 1, "Incorrect splitPoint\n");
+      return ERROR(parameter_outOfBound);
+    }
+    if (accel == 0 || accel > FASTCOVER_MAX_ACCEL) {
+      LOCALDISPLAYLEVEL(displayLevel, 1, "Incorrect accel\n");
+      return ERROR(parameter_outOfBound);
+    }
+    if (kMinK < kMaxD || kMaxK < kMinK) {
+      LOCALDISPLAYLEVEL(displayLevel, 1, "Incorrect k\n");
+      return ERROR(parameter_outOfBound);
+    }
+    if (nbSamples == 0) {
+      LOCALDISPLAYLEVEL(displayLevel, 1, "FASTCOVER must have at least one input file\n");
+      return ERROR(srcSize_wrong);
+    }
+    if (dictBufferCapacity < ZDICT_DICTSIZE_MIN) {
+      LOCALDISPLAYLEVEL(displayLevel, 1, "dictBufferCapacity must be at least %u\n",
+                   ZDICT_DICTSIZE_MIN);
+      return ERROR(dstSize_tooSmall);
+    }
+    if (nbThreads > 1) {
+      pool = POOL_create(nbThreads, 1);
+      if (!pool) {
+        return ERROR(memory_allocation);
+      }
+    }
+    /* Initialization */
+    COVER_best_init(&best);
+    memset(&coverParams, 0 , sizeof(coverParams));
+    FASTCOVER_convertToCoverParams(*parameters, &coverParams);
+    accelParams = FASTCOVER_defaultAccelParameters[accel];
+    /* Turn down global display level to clean up display at level 2 and below */
+    g_displayLevel = displayLevel == 0 ? 0 : displayLevel - 1;
+    /* Loop through d first because each new value needs a new context */
+    LOCALDISPLAYLEVEL(displayLevel, 2, "Trying %u different sets of parameters\n",
+                      kIterations);
+    for (d = kMinD; d <= kMaxD; d += 2) {
+      /* Initialize the context for this value of d */
+      FASTCOVER_ctx_t ctx;
+      LOCALDISPLAYLEVEL(displayLevel, 3, "d=%u\n", d);
+      {
+        size_t const initVal = FASTCOVER_ctx_init(&ctx, samplesBuffer, samplesSizes, nbSamples, d, splitPoint, f, accelParams);
+        if (ZSTD_isError(initVal)) {
+          LOCALDISPLAYLEVEL(displayLevel, 1, "Failed to initialize context\n");
+          COVER_best_destroy(&best);
+          POOL_free(pool);
+          return initVal;
+        }
+      }
+      if (!warned) {
+        COVER_warnOnSmallCorpus(dictBufferCapacity, ctx.nbDmers, displayLevel);
+        warned = 1;
+      }
+      /* Loop through k reusing the same context */
+      for (k = kMinK; k <= kMaxK; k += kStepSize) {
+        /* Prepare the arguments */
+        FASTCOVER_tryParameters_data_t *data = (FASTCOVER_tryParameters_data_t *)malloc(
+            sizeof(FASTCOVER_tryParameters_data_t));
+        LOCALDISPLAYLEVEL(displayLevel, 3, "k=%u\n", k);
+        if (!data) {
+          LOCALDISPLAYLEVEL(displayLevel, 1, "Failed to allocate parameters\n");
+          COVER_best_destroy(&best);
+          FASTCOVER_ctx_destroy(&ctx);
+          POOL_free(pool);
+          return ERROR(memory_allocation);
+        }
+        data->ctx = &ctx;
+        data->best = &best;
+        data->dictBufferCapacity = dictBufferCapacity;
+        data->parameters = coverParams;
+        data->parameters.k = k;
+        data->parameters.d = d;
+        data->parameters.splitPoint = splitPoint;
+        data->parameters.steps = kSteps;
+        data->parameters.shrinkDict = shrinkDict;
+        data->parameters.zParams.notificationLevel = g_displayLevel;
+        /* Check the parameters */
+        if (!FASTCOVER_checkParameters(data->parameters, dictBufferCapacity,
+                                       data->ctx->f, accel)) {
+          DISPLAYLEVEL(1, "FASTCOVER parameters incorrect\n");
+          free(data);
+          continue;
+        }
+        /* Call the function and pass ownership of data to it */
+        COVER_best_start(&best);
+        if (pool) {
+          POOL_add(pool, &FASTCOVER_tryParameters, data);
+        } else {
+          FASTCOVER_tryParameters(data);
+        }
+        /* Print status */
+        LOCALDISPLAYUPDATE(displayLevel, 2, "\r%u%%       ",
+                           (unsigned)((iteration * 100) / kIterations));
+        ++iteration;
+      }
+      COVER_best_wait(&best);
+      FASTCOVER_ctx_destroy(&ctx);
+    }
+    LOCALDISPLAYLEVEL(displayLevel, 2, "\r%79s\r", "");
+    /* Fill the output buffer and parameters with output of the best parameters */
+    {
+      const size_t dictSize = best.dictSize;
+      if (ZSTD_isError(best.compressedSize)) {
+        const size_t compressedSize = best.compressedSize;
+        COVER_best_destroy(&best);
+        POOL_free(pool);
+        return compressedSize;
+      }
+      FASTCOVER_convertToFastCoverParams(best.parameters, parameters, f, accel);
+      memcpy(dictBuffer, best.dict, dictSize);
+      COVER_best_destroy(&best);
+      POOL_free(pool);
+      return dictSize;
+    }
+
+}
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/dictBuilder/zdict.c mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/dictBuilder/zdict.c
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/dictBuilder/zdict.c	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/dictBuilder/zdict.c	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,1134 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+
+/*-**************************************
+*  Tuning parameters
+****************************************/
+#define MINRATIO 4   /* minimum nb of apparition to be selected in dictionary */
+#define ZDICT_MAX_SAMPLES_SIZE (2000U << 20)
+#define ZDICT_MIN_SAMPLES_SIZE (ZDICT_CONTENTSIZE_MIN * MINRATIO)
+
+
+/*-**************************************
+*  Compiler Options
+****************************************/
+/* Unix Large Files support (>4GB) */
+#define _FILE_OFFSET_BITS 64
+#if (defined(__sun__) && (!defined(__LP64__)))   /* Sun Solaris 32-bits requires specific definitions */
+#  ifndef _LARGEFILE_SOURCE
+#  define _LARGEFILE_SOURCE
+#  endif
+#elif ! defined(__LP64__)                        /* No point defining Large file for 64 bit */
+#  ifndef _LARGEFILE64_SOURCE
+#  define _LARGEFILE64_SOURCE
+#  endif
+#endif
+
+
+/*-*************************************
+*  Dependencies
+***************************************/
+#include <stdlib.h>        /* malloc, free */
+#include <string.h>        /* memset */
+#include <stdio.h>         /* fprintf, fopen, ftello64 */
+#include <time.h>          /* clock */
+
+#ifndef ZDICT_STATIC_LINKING_ONLY
+#  define ZDICT_STATIC_LINKING_ONLY
+#endif
+#define HUF_STATIC_LINKING_ONLY
+
+#include "../common/mem.h"           /* read */
+#include "../common/fse.h"           /* FSE_normalizeCount, FSE_writeNCount */
+#include "../common/huf.h"           /* HUF_buildCTable, HUF_writeCTable */
+#include "../common/zstd_internal.h" /* includes zstd.h */
+#include "../common/xxhash.h"        /* XXH64 */
+#include "../compress/zstd_compress_internal.h" /* ZSTD_loadCEntropy() */
+#include "../zdict.h"
+#include "divsufsort.h"
+
+
+/*-*************************************
+*  Constants
+***************************************/
+#define KB *(1 <<10)
+#define MB *(1 <<20)
+#define GB *(1U<<30)
+
+#define DICTLISTSIZE_DEFAULT 10000
+
+#define NOISELENGTH 32
+
+static const U32 g_selectivity_default = 9;
+
+
+/*-*************************************
+*  Console display
+***************************************/
+#undef  DISPLAY
+#define DISPLAY(...)         { fprintf(stderr, __VA_ARGS__); fflush( stderr ); }
+#undef  DISPLAYLEVEL
+#define DISPLAYLEVEL(l, ...) if (notificationLevel>=l) { DISPLAY(__VA_ARGS__); }    /* 0 : no display;   1: errors;   2: default;  3: details;  4: debug */
+
+static clock_t ZDICT_clockSpan(clock_t nPrevious) { return clock() - nPrevious; }
+
+static void ZDICT_printHex(const void* ptr, size_t length)
+{
+    const BYTE* const b = (const BYTE*)ptr;
+    size_t u;
+    for (u=0; u<length; u++) {
+        BYTE c = b[u];
+        if (c<32 || c>126) c = '.';   /* non-printable char */
+        DISPLAY("%c", c);
+    }
+}
+
+
+/*-********************************************************
+*  Helper functions
+**********************************************************/
+unsigned ZDICT_isError(size_t errorCode) { return ERR_isError(errorCode); }
+
+const char* ZDICT_getErrorName(size_t errorCode) { return ERR_getErrorName(errorCode); }
+
+unsigned ZDICT_getDictID(const void* dictBuffer, size_t dictSize)
+{
+    if (dictSize < 8) return 0;
+    if (MEM_readLE32(dictBuffer) != ZSTD_MAGIC_DICTIONARY) return 0;
+    return MEM_readLE32((const char*)dictBuffer + 4);
+}
+
+size_t ZDICT_getDictHeaderSize(const void* dictBuffer, size_t dictSize)
+{
+    size_t headerSize;
+    if (dictSize <= 8 || MEM_readLE32(dictBuffer) != ZSTD_MAGIC_DICTIONARY) return ERROR(dictionary_corrupted);
+
+    {   ZSTD_compressedBlockState_t* bs = (ZSTD_compressedBlockState_t*)malloc(sizeof(ZSTD_compressedBlockState_t));
+        U32* wksp = (U32*)malloc(HUF_WORKSPACE_SIZE);
+        if (!bs || !wksp) {
+            headerSize = ERROR(memory_allocation);
+        } else {
+            ZSTD_reset_compressedBlockState(bs);
+            headerSize = ZSTD_loadCEntropy(bs, wksp, dictBuffer, dictSize);
+        }
+
+        free(bs);
+        free(wksp);
+    }
+
+    return headerSize;
+}
+
+/*-********************************************************
+*  Dictionary training functions
+**********************************************************/
+static unsigned ZDICT_NbCommonBytes (size_t val)
+{
+    if (MEM_isLittleEndian()) {
+        if (MEM_64bits()) {
+#       if defined(_MSC_VER) && defined(_WIN64)
+            unsigned long r = 0;
+            _BitScanForward64( &r, (U64)val );
+            return (unsigned)(r>>3);
+#       elif defined(__GNUC__) && (__GNUC__ >= 3)
+            return (__builtin_ctzll((U64)val) >> 3);
+#       else
+            static const int DeBruijnBytePos[64] = { 0, 0, 0, 0, 0, 1, 1, 2, 0, 3, 1, 3, 1, 4, 2, 7, 0, 2, 3, 6, 1, 5, 3, 5, 1, 3, 4, 4, 2, 5, 6, 7, 7, 0, 1, 2, 3, 3, 4, 6, 2, 6, 5, 5, 3, 4, 5, 6, 7, 1, 2, 4, 6, 4, 4, 5, 7, 2, 6, 5, 7, 6, 7, 7 };
+            return DeBruijnBytePos[((U64)((val & -(long long)val) * 0x0218A392CDABBD3FULL)) >> 58];
+#       endif
+        } else { /* 32 bits */
+#       if defined(_MSC_VER)
+            unsigned long r=0;
+            _BitScanForward( &r, (U32)val );
+            return (unsigned)(r>>3);
+#       elif defined(__GNUC__) && (__GNUC__ >= 3)
+            return (__builtin_ctz((U32)val) >> 3);
+#       else
+            static const int DeBruijnBytePos[32] = { 0, 0, 3, 0, 3, 1, 3, 0, 3, 2, 2, 1, 3, 2, 0, 1, 3, 3, 1, 2, 2, 2, 2, 0, 3, 1, 2, 0, 1, 0, 1, 1 };
+            return DeBruijnBytePos[((U32)((val & -(S32)val) * 0x077CB531U)) >> 27];
+#       endif
+        }
+    } else {  /* Big Endian CPU */
+        if (MEM_64bits()) {
+#       if defined(_MSC_VER) && defined(_WIN64)
+            unsigned long r = 0;
+            _BitScanReverse64( &r, val );
+            return (unsigned)(r>>3);
+#       elif defined(__GNUC__) && (__GNUC__ >= 3)
+            return (__builtin_clzll(val) >> 3);
+#       else
+            unsigned r;
+            const unsigned n32 = sizeof(size_t)*4;   /* calculate this way due to compiler complaining in 32-bits mode */
+            if (!(val>>n32)) { r=4; } else { r=0; val>>=n32; }
+            if (!(val>>16)) { r+=2; val>>=8; } else { val>>=24; }
+            r += (!val);
+            return r;
+#       endif
+        } else { /* 32 bits */
+#       if defined(_MSC_VER)
+            unsigned long r = 0;
+            _BitScanReverse( &r, (unsigned long)val );
+            return (unsigned)(r>>3);
+#       elif defined(__GNUC__) && (__GNUC__ >= 3)
+            return (__builtin_clz((U32)val) >> 3);
+#       else
+            unsigned r;
+            if (!(val>>16)) { r=2; val>>=8; } else { r=0; val>>=24; }
+            r += (!val);
+            return r;
+#       endif
+    }   }
+}
+
+
+/*! ZDICT_count() :
+    Count the nb of common bytes between 2 pointers.
+    Note : this function presumes end of buffer followed by noisy guard band.
+*/
+static size_t ZDICT_count(const void* pIn, const void* pMatch)
+{
+    const char* const pStart = (const char*)pIn;
+    for (;;) {
+        size_t const diff = MEM_readST(pMatch) ^ MEM_readST(pIn);
+        if (!diff) {
+            pIn = (const char*)pIn+sizeof(size_t);
+            pMatch = (const char*)pMatch+sizeof(size_t);
+            continue;
+        }
+        pIn = (const char*)pIn+ZDICT_NbCommonBytes(diff);
+        return (size_t)((const char*)pIn - pStart);
+    }
+}
+
+
+typedef struct {
+    U32 pos;
+    U32 length;
+    U32 savings;
+} dictItem;
+
+static void ZDICT_initDictItem(dictItem* d)
+{
+    d->pos = 1;
+    d->length = 0;
+    d->savings = (U32)(-1);
+}
+
+
+#define LLIMIT 64          /* heuristic determined experimentally */
+#define MINMATCHLENGTH 7   /* heuristic determined experimentally */
+static dictItem ZDICT_analyzePos(
+                       BYTE* doneMarks,
+                       const int* suffix, U32 start,
+                       const void* buffer, U32 minRatio, U32 notificationLevel)
+{
+    U32 lengthList[LLIMIT] = {0};
+    U32 cumulLength[LLIMIT] = {0};
+    U32 savings[LLIMIT] = {0};
+    const BYTE* b = (const BYTE*)buffer;
+    size_t maxLength = LLIMIT;
+    size_t pos = suffix[start];
+    U32 end = start;
+    dictItem solution;
+
+    /* init */
+    memset(&solution, 0, sizeof(solution));
+    doneMarks[pos] = 1;
+
+    /* trivial repetition cases */
+    if ( (MEM_read16(b+pos+0) == MEM_read16(b+pos+2))
+       ||(MEM_read16(b+pos+1) == MEM_read16(b+pos+3))
+       ||(MEM_read16(b+pos+2) == MEM_read16(b+pos+4)) ) {
+        /* skip and mark segment */
+        U16 const pattern16 = MEM_read16(b+pos+4);
+        U32 u, patternEnd = 6;
+        while (MEM_read16(b+pos+patternEnd) == pattern16) patternEnd+=2 ;
+        if (b[pos+patternEnd] == b[pos+patternEnd-1]) patternEnd++;
+        for (u=1; u<patternEnd; u++)
+            doneMarks[pos+u] = 1;
+        return solution;
+    }
+
+    /* look forward */
+    {   size_t length;
+        do {
+            end++;
+            length = ZDICT_count(b + pos, b + suffix[end]);
+        } while (length >= MINMATCHLENGTH);
+    }
+
+    /* look backward */
+    {   size_t length;
+        do {
+            length = ZDICT_count(b + pos, b + *(suffix+start-1));
+            if (length >=MINMATCHLENGTH) start--;
+        } while(length >= MINMATCHLENGTH);
+    }
+
+    /* exit if not found a minimum nb of repetitions */
+    if (end-start < minRatio) {
+        U32 idx;
+        for(idx=start; idx<end; idx++)
+            doneMarks[suffix[idx]] = 1;
+        return solution;
+    }
+
+    {   int i;
+        U32 mml;
+        U32 refinedStart = start;
+        U32 refinedEnd = end;
+
+        DISPLAYLEVEL(4, "\n");
+        DISPLAYLEVEL(4, "found %3u matches of length >= %i at pos %7u  ", (unsigned)(end-start), MINMATCHLENGTH, (unsigned)pos);
+        DISPLAYLEVEL(4, "\n");
+
+        for (mml = MINMATCHLENGTH ; ; mml++) {
+            BYTE currentChar = 0;
+            U32 currentCount = 0;
+            U32 currentID = refinedStart;
+            U32 id;
+            U32 selectedCount = 0;
+            U32 selectedID = currentID;
+            for (id =refinedStart; id < refinedEnd; id++) {
+                if (b[suffix[id] + mml] != currentChar) {
+                    if (currentCount > selectedCount) {
+                        selectedCount = currentCount;
+                        selectedID = currentID;
+                    }
+                    currentID = id;
+                    currentChar = b[ suffix[id] + mml];
+                    currentCount = 0;
+                }
+                currentCount ++;
+            }
+            if (currentCount > selectedCount) {  /* for last */
+                selectedCount = currentCount;
+                selectedID = currentID;
+            }
+
+            if (selectedCount < minRatio)
+                break;
+            refinedStart = selectedID;
+            refinedEnd = refinedStart + selectedCount;
+        }
+
+        /* evaluate gain based on new dict */
+        start = refinedStart;
+        pos = suffix[refinedStart];
+        end = start;
+        memset(lengthList, 0, sizeof(lengthList));
+
+        /* look forward */
+        {   size_t length;
+            do {
+                end++;
+                length = ZDICT_count(b + pos, b + suffix[end]);
+                if (length >= LLIMIT) length = LLIMIT-1;
+                lengthList[length]++;
+            } while (length >=MINMATCHLENGTH);
+        }
+
+        /* look backward */
+        {   size_t length = MINMATCHLENGTH;
+            while ((length >= MINMATCHLENGTH) & (start > 0)) {
+                length = ZDICT_count(b + pos, b + suffix[start - 1]);
+                if (length >= LLIMIT) length = LLIMIT - 1;
+                lengthList[length]++;
+                if (length >= MINMATCHLENGTH) start--;
+            }
+        }
+
+        /* largest useful length */
+        memset(cumulLength, 0, sizeof(cumulLength));
+        cumulLength[maxLength-1] = lengthList[maxLength-1];
+        for (i=(int)(maxLength-2); i>=0; i--)
+            cumulLength[i] = cumulLength[i+1] + lengthList[i];
+
+        for (i=LLIMIT-1; i>=MINMATCHLENGTH; i--) if (cumulLength[i]>=minRatio) break;
+        maxLength = i;
+
+        /* reduce maxLength in case of final into repetitive data */
+        {   U32 l = (U32)maxLength;
+            BYTE const c = b[pos + maxLength-1];
+            while (b[pos+l-2]==c) l--;
+            maxLength = l;
+        }
+        if (maxLength < MINMATCHLENGTH) return solution;   /* skip : no long-enough solution */
+
+        /* calculate savings */
+        savings[5] = 0;
+        for (i=MINMATCHLENGTH; i<=(int)maxLength; i++)
+            savings[i] = savings[i-1] + (lengthList[i] * (i-3));
+
+        DISPLAYLEVEL(4, "Selected dict at position %u, of length %u : saves %u (ratio: %.2f)  \n",
+                     (unsigned)pos, (unsigned)maxLength, (unsigned)savings[maxLength], (double)savings[maxLength] / maxLength);
+
+        solution.pos = (U32)pos;
+        solution.length = (U32)maxLength;
+        solution.savings = savings[maxLength];
+
+        /* mark positions done */
+        {   U32 id;
+            for (id=start; id<end; id++) {
+                U32 p, pEnd, length;
+                U32 const testedPos = suffix[id];
+                if (testedPos == pos)
+                    length = solution.length;
+                else {
+                    length = (U32)ZDICT_count(b+pos, b+testedPos);
+                    if (length > solution.length) length = solution.length;
+                }
+                pEnd = (U32)(testedPos + length);
+                for (p=testedPos; p<pEnd; p++)
+                    doneMarks[p] = 1;
+    }   }   }
+
+    return solution;
+}
+
+
+static int isIncluded(const void* in, const void* container, size_t length)
+{
+    const char* const ip = (const char*) in;
+    const char* const into = (const char*) container;
+    size_t u;
+
+    for (u=0; u<length; u++) {  /* works because end of buffer is a noisy guard band */
+        if (ip[u] != into[u]) break;
+    }
+
+    return u==length;
+}
+
+/*! ZDICT_tryMerge() :
+    check if dictItem can be merged, do it if possible
+    @return : id of destination elt, 0 if not merged
+*/
+static U32 ZDICT_tryMerge(dictItem* table, dictItem elt, U32 eltNbToSkip, const void* buffer)
+{
+    const U32 tableSize = table->pos;
+    const U32 eltEnd = elt.pos + elt.length;
+    const char* const buf = (const char*) buffer;
+
+    /* tail overlap */
+    U32 u; for (u=1; u<tableSize; u++) {
+        if (u==eltNbToSkip) continue;
+        if ((table[u].pos > elt.pos) && (table[u].pos <= eltEnd)) {  /* overlap, existing > new */
+            /* append */
+            U32 const addedLength = table[u].pos - elt.pos;
+            table[u].length += addedLength;
+            table[u].pos = elt.pos;
+            table[u].savings += elt.savings * addedLength / elt.length;   /* rough approx */
+            table[u].savings += elt.length / 8;    /* rough approx bonus */
+            elt = table[u];
+            /* sort : improve rank */
+            while ((u>1) && (table[u-1].savings < elt.savings))
+            table[u] = table[u-1], u--;
+            table[u] = elt;
+            return u;
+    }   }
+
+    /* front overlap */
+    for (u=1; u<tableSize; u++) {
+        if (u==eltNbToSkip) continue;
+
+        if ((table[u].pos + table[u].length >= elt.pos) && (table[u].pos < elt.pos)) {  /* overlap, existing < new */
+            /* append */
+            int const addedLength = (int)eltEnd - (table[u].pos + table[u].length);
+            table[u].savings += elt.length / 8;    /* rough approx bonus */
+            if (addedLength > 0) {   /* otherwise, elt fully included into existing */
+                table[u].length += addedLength;
+                table[u].savings += elt.savings * addedLength / elt.length;   /* rough approx */
+            }
+            /* sort : improve rank */
+            elt = table[u];
+            while ((u>1) && (table[u-1].savings < elt.savings))
+                table[u] = table[u-1], u--;
+            table[u] = elt;
+            return u;
+        }
+
+        if (MEM_read64(buf + table[u].pos) == MEM_read64(buf + elt.pos + 1)) {
+            if (isIncluded(buf + table[u].pos, buf + elt.pos + 1, table[u].length)) {
+                size_t const addedLength = MAX( (int)elt.length - (int)table[u].length , 1 );
+                table[u].pos = elt.pos;
+                table[u].savings += (U32)(elt.savings * addedLength / elt.length);
+                table[u].length = MIN(elt.length, table[u].length + 1);
+                return u;
+            }
+        }
+    }
+
+    return 0;
+}
+
+
+static void ZDICT_removeDictItem(dictItem* table, U32 id)
+{
+    /* convention : table[0].pos stores nb of elts */
+    U32 const max = table[0].pos;
+    U32 u;
+    if (!id) return;   /* protection, should never happen */
+    for (u=id; u<max-1; u++)
+        table[u] = table[u+1];
+    table->pos--;
+}
+
+
+static void ZDICT_insertDictItem(dictItem* table, U32 maxSize, dictItem elt, const void* buffer)
+{
+    /* merge if possible */
+    U32 mergeId = ZDICT_tryMerge(table, elt, 0, buffer);
+    if (mergeId) {
+        U32 newMerge = 1;
+        while (newMerge) {
+            newMerge = ZDICT_tryMerge(table, table[mergeId], mergeId, buffer);
+            if (newMerge) ZDICT_removeDictItem(table, mergeId);
+            mergeId = newMerge;
+        }
+        return;
+    }
+
+    /* insert */
+    {   U32 current;
+        U32 nextElt = table->pos;
+        if (nextElt >= maxSize) nextElt = maxSize-1;
+        current = nextElt-1;
+        while (table[current].savings < elt.savings) {
+            table[current+1] = table[current];
+            current--;
+        }
+        table[current+1] = elt;
+        table->pos = nextElt+1;
+    }
+}
+
+
+static U32 ZDICT_dictSize(const dictItem* dictList)
+{
+    U32 u, dictSize = 0;
+    for (u=1; u<dictList[0].pos; u++)
+        dictSize += dictList[u].length;
+    return dictSize;
+}
+
+
+static size_t ZDICT_trainBuffer_legacy(dictItem* dictList, U32 dictListSize,
+                            const void* const buffer, size_t bufferSize,   /* buffer must end with noisy guard band */
+                            const size_t* fileSizes, unsigned nbFiles,
+                            unsigned minRatio, U32 notificationLevel)
+{
+    int* const suffix0 = (int*)malloc((bufferSize+2)*sizeof(*suffix0));
+    int* const suffix = suffix0+1;
+    U32* reverseSuffix = (U32*)malloc((bufferSize)*sizeof(*reverseSuffix));
+    BYTE* doneMarks = (BYTE*)malloc((bufferSize+16)*sizeof(*doneMarks));   /* +16 for overflow security */
+    U32* filePos = (U32*)malloc(nbFiles * sizeof(*filePos));
+    size_t result = 0;
+    clock_t displayClock = 0;
+    clock_t const refreshRate = CLOCKS_PER_SEC * 3 / 10;
+
+#   undef  DISPLAYUPDATE
+#   define DISPLAYUPDATE(l, ...) if (notificationLevel>=l) { \
+            if (ZDICT_clockSpan(displayClock) > refreshRate)  \
+            { displayClock = clock(); DISPLAY(__VA_ARGS__); \
+            if (notificationLevel>=4) fflush(stderr); } }
+
+    /* init */
+    DISPLAYLEVEL(2, "\r%70s\r", "");   /* clean display line */
+    if (!suffix0 || !reverseSuffix || !doneMarks || !filePos) {
+        result = ERROR(memory_allocation);
+        goto _cleanup;
+    }
+    if (minRatio < MINRATIO) minRatio = MINRATIO;
+    memset(doneMarks, 0, bufferSize+16);
+
+    /* limit sample set size (divsufsort limitation)*/
+    if (bufferSize > ZDICT_MAX_SAMPLES_SIZE) DISPLAYLEVEL(3, "sample set too large : reduced to %u MB ...\n", (unsigned)(ZDICT_MAX_SAMPLES_SIZE>>20));
+    while (bufferSize > ZDICT_MAX_SAMPLES_SIZE) bufferSize -= fileSizes[--nbFiles];
+
+    /* sort */
+    DISPLAYLEVEL(2, "sorting %u files of total size %u MB ...\n", nbFiles, (unsigned)(bufferSize>>20));
+    {   int const divSuftSortResult = divsufsort((const unsigned char*)buffer, suffix, (int)bufferSize, 0);
+        if (divSuftSortResult != 0) { result = ERROR(GENERIC); goto _cleanup; }
+    }
+    suffix[bufferSize] = (int)bufferSize;   /* leads into noise */
+    suffix0[0] = (int)bufferSize;           /* leads into noise */
+    /* build reverse suffix sort */
+    {   size_t pos;
+        for (pos=0; pos < bufferSize; pos++)
+            reverseSuffix[suffix[pos]] = (U32)pos;
+        /* note filePos tracks borders between samples.
+           It's not used at this stage, but planned to become useful in a later update */
+        filePos[0] = 0;
+        for (pos=1; pos<nbFiles; pos++)
+            filePos[pos] = (U32)(filePos[pos-1] + fileSizes[pos-1]);
+    }
+
+    DISPLAYLEVEL(2, "finding patterns ... \n");
+    DISPLAYLEVEL(3, "minimum ratio : %u \n", minRatio);
+
+    {   U32 cursor; for (cursor=0; cursor < bufferSize; ) {
+            dictItem solution;
+            if (doneMarks[cursor]) { cursor++; continue; }
+            solution = ZDICT_analyzePos(doneMarks, suffix, reverseSuffix[cursor], buffer, minRatio, notificationLevel);
+            if (solution.length==0) { cursor++; continue; }
+            ZDICT_insertDictItem(dictList, dictListSize, solution, buffer);
+            cursor += solution.length;
+            DISPLAYUPDATE(2, "\r%4.2f %% \r", (double)cursor / bufferSize * 100);
+    }   }
+
+_cleanup:
+    free(suffix0);
+    free(reverseSuffix);
+    free(doneMarks);
+    free(filePos);
+    return result;
+}
+
+
+static void ZDICT_fillNoise(void* buffer, size_t length)
+{
+    unsigned const prime1 = 2654435761U;
+    unsigned const prime2 = 2246822519U;
+    unsigned acc = prime1;
+    size_t p=0;
+    for (p=0; p<length; p++) {
+        acc *= prime2;
+        ((unsigned char*)buffer)[p] = (unsigned char)(acc >> 21);
+    }
+}
+
+
+typedef struct
+{
+    ZSTD_CDict* dict;    /* dictionary */
+    ZSTD_CCtx* zc;     /* working context */
+    void* workPlace;   /* must be ZSTD_BLOCKSIZE_MAX allocated */
+} EStats_ress_t;
+
+#define MAXREPOFFSET 1024
+
+static void ZDICT_countEStats(EStats_ress_t esr, const ZSTD_parameters* params,
+                              unsigned* countLit, unsigned* offsetcodeCount, unsigned* matchlengthCount, unsigned* litlengthCount, U32* repOffsets,
+                              const void* src, size_t srcSize,
+                              U32 notificationLevel)
+{
+    size_t const blockSizeMax = MIN (ZSTD_BLOCKSIZE_MAX, 1 << params->cParams.windowLog);
+    size_t cSize;
+
+    if (srcSize > blockSizeMax) srcSize = blockSizeMax;   /* protection vs large samples */
+    {   size_t const errorCode = ZSTD_compressBegin_usingCDict(esr.zc, esr.dict);
+        if (ZSTD_isError(errorCode)) { DISPLAYLEVEL(1, "warning : ZSTD_compressBegin_usingCDict failed \n"); return; }
+
+    }
+    cSize = ZSTD_compressBlock(esr.zc, esr.workPlace, ZSTD_BLOCKSIZE_MAX, src, srcSize);
+    if (ZSTD_isError(cSize)) { DISPLAYLEVEL(3, "warning : could not compress sample size %u \n", (unsigned)srcSize); return; }
+
+    if (cSize) {  /* if == 0; block is not compressible */
+        const seqStore_t* const seqStorePtr = ZSTD_getSeqStore(esr.zc);
+
+        /* literals stats */
+        {   const BYTE* bytePtr;
+            for(bytePtr = seqStorePtr->litStart; bytePtr < seqStorePtr->lit; bytePtr++)
+                countLit[*bytePtr]++;
+        }
+
+        /* seqStats */
+        {   U32 const nbSeq = (U32)(seqStorePtr->sequences - seqStorePtr->sequencesStart);
+            ZSTD_seqToCodes(seqStorePtr);
+
+            {   const BYTE* codePtr = seqStorePtr->ofCode;
+                U32 u;
+                for (u=0; u<nbSeq; u++) offsetcodeCount[codePtr[u]]++;
+            }
+
+            {   const BYTE* codePtr = seqStorePtr->mlCode;
+                U32 u;
+                for (u=0; u<nbSeq; u++) matchlengthCount[codePtr[u]]++;
+            }
+
+            {   const BYTE* codePtr = seqStorePtr->llCode;
+                U32 u;
+                for (u=0; u<nbSeq; u++) litlengthCount[codePtr[u]]++;
+            }
+
+            if (nbSeq >= 2) { /* rep offsets */
+                const seqDef* const seq = seqStorePtr->sequencesStart;
+                U32 offset1 = seq[0].offset - 3;
+                U32 offset2 = seq[1].offset - 3;
+                if (offset1 >= MAXREPOFFSET) offset1 = 0;
+                if (offset2 >= MAXREPOFFSET) offset2 = 0;
+                repOffsets[offset1] += 3;
+                repOffsets[offset2] += 1;
+    }   }   }
+}
+
+static size_t ZDICT_totalSampleSize(const size_t* fileSizes, unsigned nbFiles)
+{
+    size_t total=0;
+    unsigned u;
+    for (u=0; u<nbFiles; u++) total += fileSizes[u];
+    return total;
+}
+
+typedef struct { U32 offset; U32 count; } offsetCount_t;
+
+static void ZDICT_insertSortCount(offsetCount_t table[ZSTD_REP_NUM+1], U32 val, U32 count)
+{
+    U32 u;
+    table[ZSTD_REP_NUM].offset = val;
+    table[ZSTD_REP_NUM].count = count;
+    for (u=ZSTD_REP_NUM; u>0; u--) {
+        offsetCount_t tmp;
+        if (table[u-1].count >= table[u].count) break;
+        tmp = table[u-1];
+        table[u-1] = table[u];
+        table[u] = tmp;
+    }
+}
+
+/* ZDICT_flatLit() :
+ * rewrite `countLit` to contain a mostly flat but still compressible distribution of literals.
+ * necessary to avoid generating a non-compressible distribution that HUF_writeCTable() cannot encode.
+ */
+static void ZDICT_flatLit(unsigned* countLit)
+{
+    int u;
+    for (u=1; u<256; u++) countLit[u] = 2;
+    countLit[0]   = 4;
+    countLit[253] = 1;
+    countLit[254] = 1;
+}
+
+#define OFFCODE_MAX 30  /* only applicable to first block */
+static size_t ZDICT_analyzeEntropy(void*  dstBuffer, size_t maxDstSize,
+                                   int compressionLevel,
+                             const void*  srcBuffer, const size_t* fileSizes, unsigned nbFiles,
+                             const void* dictBuffer, size_t  dictBufferSize,
+                                   unsigned notificationLevel)
+{
+    unsigned countLit[256];
+    HUF_CREATE_STATIC_CTABLE(hufTable, 255);
+    unsigned offcodeCount[OFFCODE_MAX+1];
+    short offcodeNCount[OFFCODE_MAX+1];
+    U32 offcodeMax = ZSTD_highbit32((U32)(dictBufferSize + 128 KB));
+    unsigned matchLengthCount[MaxML+1];
+    short matchLengthNCount[MaxML+1];
+    unsigned litLengthCount[MaxLL+1];
+    short litLengthNCount[MaxLL+1];
+    U32 repOffset[MAXREPOFFSET];
+    offsetCount_t bestRepOffset[ZSTD_REP_NUM+1];
+    EStats_ress_t esr = { NULL, NULL, NULL };
+    ZSTD_parameters params;
+    U32 u, huffLog = 11, Offlog = OffFSELog, mlLog = MLFSELog, llLog = LLFSELog, total;
+    size_t pos = 0, errorCode;
+    size_t eSize = 0;
+    size_t const totalSrcSize = ZDICT_totalSampleSize(fileSizes, nbFiles);
+    size_t const averageSampleSize = totalSrcSize / (nbFiles + !nbFiles);
+    BYTE* dstPtr = (BYTE*)dstBuffer;
+
+    /* init */
+    DEBUGLOG(4, "ZDICT_analyzeEntropy");
+    if (offcodeMax>OFFCODE_MAX) { eSize = ERROR(dictionaryCreation_failed); goto _cleanup; }   /* too large dictionary */
+    for (u=0; u<256; u++) countLit[u] = 1;   /* any character must be described */
+    for (u=0; u<=offcodeMax; u++) offcodeCount[u] = 1;
+    for (u=0; u<=MaxML; u++) matchLengthCount[u] = 1;
+    for (u=0; u<=MaxLL; u++) litLengthCount[u] = 1;
+    memset(repOffset, 0, sizeof(repOffset));
+    repOffset[1] = repOffset[4] = repOffset[8] = 1;
+    memset(bestRepOffset, 0, sizeof(bestRepOffset));
+    if (compressionLevel==0) compressionLevel = ZSTD_CLEVEL_DEFAULT;
+    params = ZSTD_getParams(compressionLevel, averageSampleSize, dictBufferSize);
+
+    esr.dict = ZSTD_createCDict_advanced(dictBuffer, dictBufferSize, ZSTD_dlm_byRef, ZSTD_dct_rawContent, params.cParams, ZSTD_defaultCMem);
+    esr.zc = ZSTD_createCCtx();
+    esr.workPlace = malloc(ZSTD_BLOCKSIZE_MAX);
+    if (!esr.dict || !esr.zc || !esr.workPlace) {
+        eSize = ERROR(memory_allocation);
+        DISPLAYLEVEL(1, "Not enough memory \n");
+        goto _cleanup;
+    }
+
+    /* collect stats on all samples */
+    for (u=0; u<nbFiles; u++) {
+        ZDICT_countEStats(esr, &params,
+                          countLit, offcodeCount, matchLengthCount, litLengthCount, repOffset,
+                         (const char*)srcBuffer + pos, fileSizes[u],
+                          notificationLevel);
+        pos += fileSizes[u];
+    }
+
+    /* analyze, build stats, starting with literals */
+    {   size_t maxNbBits = HUF_buildCTable (hufTable, countLit, 255, huffLog);
+        if (HUF_isError(maxNbBits)) {
+            eSize = maxNbBits;
+            DISPLAYLEVEL(1, " HUF_buildCTable error \n");
+            goto _cleanup;
+        }
+        if (maxNbBits==8) {  /* not compressible : will fail on HUF_writeCTable() */
+            DISPLAYLEVEL(2, "warning : pathological dataset : literals are not compressible : samples are noisy or too regular \n");
+            ZDICT_flatLit(countLit);  /* replace distribution by a fake "mostly flat but still compressible" distribution, that HUF_writeCTable() can encode */
+            maxNbBits = HUF_buildCTable (hufTable, countLit, 255, huffLog);
+            assert(maxNbBits==9);
+        }
+        huffLog = (U32)maxNbBits;
+    }
+
+    /* looking for most common first offsets */
+    {   U32 offset;
+        for (offset=1; offset<MAXREPOFFSET; offset++)
+            ZDICT_insertSortCount(bestRepOffset, offset, repOffset[offset]);
+    }
+    /* note : the result of this phase should be used to better appreciate the impact on statistics */
+
+    total=0; for (u=0; u<=offcodeMax; u++) total+=offcodeCount[u];
+    errorCode = FSE_normalizeCount(offcodeNCount, Offlog, offcodeCount, total, offcodeMax, /* useLowProbCount */ 1);
+    if (FSE_isError(errorCode)) {
+        eSize = errorCode;
+        DISPLAYLEVEL(1, "FSE_normalizeCount error with offcodeCount \n");
+        goto _cleanup;
+    }
+    Offlog = (U32)errorCode;
+
+    total=0; for (u=0; u<=MaxML; u++) total+=matchLengthCount[u];
+    errorCode = FSE_normalizeCount(matchLengthNCount, mlLog, matchLengthCount, total, MaxML, /* useLowProbCount */ 1);
+    if (FSE_isError(errorCode)) {
+        eSize = errorCode;
+        DISPLAYLEVEL(1, "FSE_normalizeCount error with matchLengthCount \n");
+        goto _cleanup;
+    }
+    mlLog = (U32)errorCode;
+
+    total=0; for (u=0; u<=MaxLL; u++) total+=litLengthCount[u];
+    errorCode = FSE_normalizeCount(litLengthNCount, llLog, litLengthCount, total, MaxLL, /* useLowProbCount */ 1);
+    if (FSE_isError(errorCode)) {
+        eSize = errorCode;
+        DISPLAYLEVEL(1, "FSE_normalizeCount error with litLengthCount \n");
+        goto _cleanup;
+    }
+    llLog = (U32)errorCode;
+
+    /* write result to buffer */
+    {   size_t const hhSize = HUF_writeCTable(dstPtr, maxDstSize, hufTable, 255, huffLog);
+        if (HUF_isError(hhSize)) {
+            eSize = hhSize;
+            DISPLAYLEVEL(1, "HUF_writeCTable error \n");
+            goto _cleanup;
+        }
+        dstPtr += hhSize;
+        maxDstSize -= hhSize;
+        eSize += hhSize;
+    }
+
+    {   size_t const ohSize = FSE_writeNCount(dstPtr, maxDstSize, offcodeNCount, OFFCODE_MAX, Offlog);
+        if (FSE_isError(ohSize)) {
+            eSize = ohSize;
+            DISPLAYLEVEL(1, "FSE_writeNCount error with offcodeNCount \n");
+            goto _cleanup;
+        }
+        dstPtr += ohSize;
+        maxDstSize -= ohSize;
+        eSize += ohSize;
+    }
+
+    {   size_t const mhSize = FSE_writeNCount(dstPtr, maxDstSize, matchLengthNCount, MaxML, mlLog);
+        if (FSE_isError(mhSize)) {
+            eSize = mhSize;
+            DISPLAYLEVEL(1, "FSE_writeNCount error with matchLengthNCount \n");
+            goto _cleanup;
+        }
+        dstPtr += mhSize;
+        maxDstSize -= mhSize;
+        eSize += mhSize;
+    }
+
+    {   size_t const lhSize = FSE_writeNCount(dstPtr, maxDstSize, litLengthNCount, MaxLL, llLog);
+        if (FSE_isError(lhSize)) {
+            eSize = lhSize;
+            DISPLAYLEVEL(1, "FSE_writeNCount error with litlengthNCount \n");
+            goto _cleanup;
+        }
+        dstPtr += lhSize;
+        maxDstSize -= lhSize;
+        eSize += lhSize;
+    }
+
+    if (maxDstSize<12) {
+        eSize = ERROR(dstSize_tooSmall);
+        DISPLAYLEVEL(1, "not enough space to write RepOffsets \n");
+        goto _cleanup;
+    }
+# if 0
+    MEM_writeLE32(dstPtr+0, bestRepOffset[0].offset);
+    MEM_writeLE32(dstPtr+4, bestRepOffset[1].offset);
+    MEM_writeLE32(dstPtr+8, bestRepOffset[2].offset);
+#else
+    /* at this stage, we don't use the result of "most common first offset",
+       as the impact of statistics is not properly evaluated */
+    MEM_writeLE32(dstPtr+0, repStartValue[0]);
+    MEM_writeLE32(dstPtr+4, repStartValue[1]);
+    MEM_writeLE32(dstPtr+8, repStartValue[2]);
+#endif
+    eSize += 12;
+
+_cleanup:
+    ZSTD_freeCDict(esr.dict);
+    ZSTD_freeCCtx(esr.zc);
+    free(esr.workPlace);
+
+    return eSize;
+}
+
+
+
+size_t ZDICT_finalizeDictionary(void* dictBuffer, size_t dictBufferCapacity,
+                          const void* customDictContent, size_t dictContentSize,
+                          const void* samplesBuffer, const size_t* samplesSizes,
+                          unsigned nbSamples, ZDICT_params_t params)
+{
+    size_t hSize;
+#define HBUFFSIZE 256   /* should prove large enough for all entropy headers */
+    BYTE header[HBUFFSIZE];
+    int const compressionLevel = (params.compressionLevel == 0) ? ZSTD_CLEVEL_DEFAULT : params.compressionLevel;
+    U32 const notificationLevel = params.notificationLevel;
+
+    /* check conditions */
+    DEBUGLOG(4, "ZDICT_finalizeDictionary");
+    if (dictBufferCapacity < dictContentSize) return ERROR(dstSize_tooSmall);
+    if (dictContentSize < ZDICT_CONTENTSIZE_MIN) return ERROR(srcSize_wrong);
+    if (dictBufferCapacity < ZDICT_DICTSIZE_MIN) return ERROR(dstSize_tooSmall);
+
+    /* dictionary header */
+    MEM_writeLE32(header, ZSTD_MAGIC_DICTIONARY);
+    {   U64 const randomID = XXH64(customDictContent, dictContentSize, 0);
+        U32 const compliantID = (randomID % ((1U<<31)-32768)) + 32768;
+        U32 const dictID = params.dictID ? params.dictID : compliantID;
+        MEM_writeLE32(header+4, dictID);
+    }
+    hSize = 8;
+
+    /* entropy tables */
+    DISPLAYLEVEL(2, "\r%70s\r", "");   /* clean display line */
+    DISPLAYLEVEL(2, "statistics ... \n");
+    {   size_t const eSize = ZDICT_analyzeEntropy(header+hSize, HBUFFSIZE-hSize,
+                                  compressionLevel,
+                                  samplesBuffer, samplesSizes, nbSamples,
+                                  customDictContent, dictContentSize,
+                                  notificationLevel);
+        if (ZDICT_isError(eSize)) return eSize;
+        hSize += eSize;
+    }
+
+    /* copy elements in final buffer ; note : src and dst buffer can overlap */
+    if (hSize + dictContentSize > dictBufferCapacity) dictContentSize = dictBufferCapacity - hSize;
+    {   size_t const dictSize = hSize + dictContentSize;
+        char* dictEnd = (char*)dictBuffer + dictSize;
+        memmove(dictEnd - dictContentSize, customDictContent, dictContentSize);
+        memcpy(dictBuffer, header, hSize);
+        return dictSize;
+    }
+}
+
+
+static size_t ZDICT_addEntropyTablesFromBuffer_advanced(
+        void* dictBuffer, size_t dictContentSize, size_t dictBufferCapacity,
+        const void* samplesBuffer, const size_t* samplesSizes, unsigned nbSamples,
+        ZDICT_params_t params)
+{
+    int const compressionLevel = (params.compressionLevel == 0) ? ZSTD_CLEVEL_DEFAULT : params.compressionLevel;
+    U32 const notificationLevel = params.notificationLevel;
+    size_t hSize = 8;
+
+    /* calculate entropy tables */
+    DISPLAYLEVEL(2, "\r%70s\r", "");   /* clean display line */
+    DISPLAYLEVEL(2, "statistics ... \n");
+    {   size_t const eSize = ZDICT_analyzeEntropy((char*)dictBuffer+hSize, dictBufferCapacity-hSize,
+                                  compressionLevel,
+                                  samplesBuffer, samplesSizes, nbSamples,
+                                  (char*)dictBuffer + dictBufferCapacity - dictContentSize, dictContentSize,
+                                  notificationLevel);
+        if (ZDICT_isError(eSize)) return eSize;
+        hSize += eSize;
+    }
+
+    /* add dictionary header (after entropy tables) */
+    MEM_writeLE32(dictBuffer, ZSTD_MAGIC_DICTIONARY);
+    {   U64 const randomID = XXH64((char*)dictBuffer + dictBufferCapacity - dictContentSize, dictContentSize, 0);
+        U32 const compliantID = (randomID % ((1U<<31)-32768)) + 32768;
+        U32 const dictID = params.dictID ? params.dictID : compliantID;
+        MEM_writeLE32((char*)dictBuffer+4, dictID);
+    }
+
+    if (hSize + dictContentSize < dictBufferCapacity)
+        memmove((char*)dictBuffer + hSize, (char*)dictBuffer + dictBufferCapacity - dictContentSize, dictContentSize);
+    return MIN(dictBufferCapacity, hSize+dictContentSize);
+}
+
+/*! ZDICT_trainFromBuffer_unsafe_legacy() :
+*   Warning : `samplesBuffer` must be followed by noisy guard band !!!
+*   @return : size of dictionary, or an error code which can be tested with ZDICT_isError()
+*/
+static size_t ZDICT_trainFromBuffer_unsafe_legacy(
+                            void* dictBuffer, size_t maxDictSize,
+                            const void* samplesBuffer, const size_t* samplesSizes, unsigned nbSamples,
+                            ZDICT_legacy_params_t params)
+{
+    U32 const dictListSize = MAX(MAX(DICTLISTSIZE_DEFAULT, nbSamples), (U32)(maxDictSize/16));
+    dictItem* const dictList = (dictItem*)malloc(dictListSize * sizeof(*dictList));
+    unsigned const selectivity = params.selectivityLevel == 0 ? g_selectivity_default : params.selectivityLevel;
+    unsigned const minRep = (selectivity > 30) ? MINRATIO : nbSamples >> selectivity;
+    size_t const targetDictSize = maxDictSize;
+    size_t const samplesBuffSize = ZDICT_totalSampleSize(samplesSizes, nbSamples);
+    size_t dictSize = 0;
+    U32 const notificationLevel = params.zParams.notificationLevel;
+
+    /* checks */
+    if (!dictList) return ERROR(memory_allocation);
+    if (maxDictSize < ZDICT_DICTSIZE_MIN) { free(dictList); return ERROR(dstSize_tooSmall); }   /* requested dictionary size is too small */
+    if (samplesBuffSize < ZDICT_MIN_SAMPLES_SIZE) { free(dictList); return ERROR(dictionaryCreation_failed); }   /* not enough source to create dictionary */
+
+    /* init */
+    ZDICT_initDictItem(dictList);
+
+    /* build dictionary */
+    ZDICT_trainBuffer_legacy(dictList, dictListSize,
+                       samplesBuffer, samplesBuffSize,
+                       samplesSizes, nbSamples,
+                       minRep, notificationLevel);
+
+    /* display best matches */
+    if (params.zParams.notificationLevel>= 3) {
+        unsigned const nb = MIN(25, dictList[0].pos);
+        unsigned const dictContentSize = ZDICT_dictSize(dictList);
+        unsigned u;
+        DISPLAYLEVEL(3, "\n %u segments found, of total size %u \n", (unsigned)dictList[0].pos-1, dictContentSize);
+        DISPLAYLEVEL(3, "list %u best segments \n", nb-1);
+        for (u=1; u<nb; u++) {
+            unsigned const pos = dictList[u].pos;
+            unsigned const length = dictList[u].length;
+            U32 const printedLength = MIN(40, length);
+            if ((pos > samplesBuffSize) || ((pos + length) > samplesBuffSize)) {
+                free(dictList);
+                return ERROR(GENERIC);   /* should never happen */
+            }
+            DISPLAYLEVEL(3, "%3u:%3u bytes at pos %8u, savings %7u bytes |",
+                         u, length, pos, (unsigned)dictList[u].savings);
+            ZDICT_printHex((const char*)samplesBuffer+pos, printedLength);
+            DISPLAYLEVEL(3, "| \n");
+    }   }
+
+
+    /* create dictionary */
+    {   unsigned dictContentSize = ZDICT_dictSize(dictList);
+        if (dictContentSize < ZDICT_CONTENTSIZE_MIN) { free(dictList); return ERROR(dictionaryCreation_failed); }   /* dictionary content too small */
+        if (dictContentSize < targetDictSize/4) {
+            DISPLAYLEVEL(2, "!  warning : selected content significantly smaller than requested (%u < %u) \n", dictContentSize, (unsigned)maxDictSize);
+            if (samplesBuffSize < 10 * targetDictSize)
+                DISPLAYLEVEL(2, "!  consider increasing the number of samples (total size : %u MB)\n", (unsigned)(samplesBuffSize>>20));
+            if (minRep > MINRATIO) {
+                DISPLAYLEVEL(2, "!  consider increasing selectivity to produce larger dictionary (-s%u) \n", selectivity+1);
+                DISPLAYLEVEL(2, "!  note : larger dictionaries are not necessarily better, test its efficiency on samples \n");
+            }
+        }
+
+        if ((dictContentSize > targetDictSize*3) && (nbSamples > 2*MINRATIO) && (selectivity>1)) {
+            unsigned proposedSelectivity = selectivity-1;
+            while ((nbSamples >> proposedSelectivity) <= MINRATIO) { proposedSelectivity--; }
+            DISPLAYLEVEL(2, "!  note : calculated dictionary significantly larger than requested (%u > %u) \n", dictContentSize, (unsigned)maxDictSize);
+            DISPLAYLEVEL(2, "!  consider increasing dictionary size, or produce denser dictionary (-s%u) \n", proposedSelectivity);
+            DISPLAYLEVEL(2, "!  always test dictionary efficiency on real samples \n");
+        }
+
+        /* limit dictionary size */
+        {   U32 const max = dictList->pos;   /* convention : nb of useful elts within dictList */
+            U32 currentSize = 0;
+            U32 n; for (n=1; n<max; n++) {
+                currentSize += dictList[n].length;
+                if (currentSize > targetDictSize) { currentSize -= dictList[n].length; break; }
+            }
+            dictList->pos = n;
+            dictContentSize = currentSize;
+        }
+
+        /* build dict content */
+        {   U32 u;
+            BYTE* ptr = (BYTE*)dictBuffer + maxDictSize;
+            for (u=1; u<dictList->pos; u++) {
+                U32 l = dictList[u].length;
+                ptr -= l;
+                if (ptr<(BYTE*)dictBuffer) { free(dictList); return ERROR(GENERIC); }   /* should not happen */
+                memcpy(ptr, (const char*)samplesBuffer+dictList[u].pos, l);
+        }   }
+
+        dictSize = ZDICT_addEntropyTablesFromBuffer_advanced(dictBuffer, dictContentSize, maxDictSize,
+                                                             samplesBuffer, samplesSizes, nbSamples,
+                                                             params.zParams);
+    }
+
+    /* clean up */
+    free(dictList);
+    return dictSize;
+}
+
+
+/* ZDICT_trainFromBuffer_legacy() :
+ * issue : samplesBuffer need to be followed by a noisy guard band.
+ * work around : duplicate the buffer, and add the noise */
+size_t ZDICT_trainFromBuffer_legacy(void* dictBuffer, size_t dictBufferCapacity,
+                              const void* samplesBuffer, const size_t* samplesSizes, unsigned nbSamples,
+                              ZDICT_legacy_params_t params)
+{
+    size_t result;
+    void* newBuff;
+    size_t const sBuffSize = ZDICT_totalSampleSize(samplesSizes, nbSamples);
+    if (sBuffSize < ZDICT_MIN_SAMPLES_SIZE) return 0;   /* not enough content => no dictionary */
+
+    newBuff = malloc(sBuffSize + NOISELENGTH);
+    if (!newBuff) return ERROR(memory_allocation);
+
+    memcpy(newBuff, samplesBuffer, sBuffSize);
+    ZDICT_fillNoise((char*)newBuff + sBuffSize, NOISELENGTH);   /* guard band, for end of buffer condition */
+
+    result =
+        ZDICT_trainFromBuffer_unsafe_legacy(dictBuffer, dictBufferCapacity, newBuff,
+                                            samplesSizes, nbSamples, params);
+    free(newBuff);
+    return result;
+}
+
+
+size_t ZDICT_trainFromBuffer(void* dictBuffer, size_t dictBufferCapacity,
+                             const void* samplesBuffer, const size_t* samplesSizes, unsigned nbSamples)
+{
+    ZDICT_fastCover_params_t params;
+    DEBUGLOG(3, "ZDICT_trainFromBuffer");
+    memset(&params, 0, sizeof(params));
+    params.d = 8;
+    params.steps = 4;
+    /* Use default level since no compression level information is available */
+    params.zParams.compressionLevel = ZSTD_CLEVEL_DEFAULT;
+#if defined(DEBUGLEVEL) && (DEBUGLEVEL>=1)
+    params.zParams.notificationLevel = DEBUGLEVEL;
+#endif
+    return ZDICT_optimizeTrainFromBuffer_fastCover(dictBuffer, dictBufferCapacity,
+                                               samplesBuffer, samplesSizes, nbSamples,
+                                               &params);
+}
+
+size_t ZDICT_addEntropyTablesFromBuffer(void* dictBuffer, size_t dictContentSize, size_t dictBufferCapacity,
+                                  const void* samplesBuffer, const size_t* samplesSizes, unsigned nbSamples)
+{
+    ZDICT_params_t params;
+    memset(&params, 0, sizeof(params));
+    return ZDICT_addEntropyTablesFromBuffer_advanced(dictBuffer, dictContentSize, dictBufferCapacity,
+                                                     samplesBuffer, samplesSizes, nbSamples,
+                                                     params);
+}
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/zdict.h mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/zdict.h
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/zdict.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/zdict.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,452 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+#ifndef DICTBUILDER_H_001
+#define DICTBUILDER_H_001
+
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
+
+/*======  Dependencies  ======*/
+#include <stddef.h>  /* size_t */
+
+
+/* =====   ZDICTLIB_API : control library symbols visibility   ===== */
+#ifndef ZDICTLIB_VISIBILITY
+#  if defined(__GNUC__) && (__GNUC__ >= 4)
+#    define ZDICTLIB_VISIBILITY __attribute__ ((visibility ("default")))
+#  else
+#    define ZDICTLIB_VISIBILITY
+#  endif
+#endif
+#if defined(ZSTD_DLL_EXPORT) && (ZSTD_DLL_EXPORT==1)
+#  define ZDICTLIB_API __declspec(dllexport) ZDICTLIB_VISIBILITY
+#elif defined(ZSTD_DLL_IMPORT) && (ZSTD_DLL_IMPORT==1)
+#  define ZDICTLIB_API __declspec(dllimport) ZDICTLIB_VISIBILITY /* It isn't required but allows to generate better code, saving a function pointer load from the IAT and an indirect jump.*/
+#else
+#  define ZDICTLIB_API ZDICTLIB_VISIBILITY
+#endif
+
+/*******************************************************************************
+ * Zstd dictionary builder
+ *
+ * FAQ
+ * ===
+ * Why should I use a dictionary?
+ * ------------------------------
+ *
+ * Zstd can use dictionaries to improve compression ratio of small data.
+ * Traditionally small files don't compress well because there is very little
+ * repetion in a single sample, since it is small. But, if you are compressing
+ * many similar files, like a bunch of JSON records that share the same
+ * structure, you can train a dictionary on ahead of time on some samples of
+ * these files. Then, zstd can use the dictionary to find repetitions that are
+ * present across samples. This can vastly improve compression ratio.
+ *
+ * When is a dictionary useful?
+ * ----------------------------
+ *
+ * Dictionaries are useful when compressing many small files that are similar.
+ * The larger a file is, the less benefit a dictionary will have. Generally,
+ * we don't expect dictionary compression to be effective past 100KB. And the
+ * smaller a file is, the more we would expect the dictionary to help.
+ *
+ * How do I use a dictionary?
+ * --------------------------
+ *
+ * Simply pass the dictionary to the zstd compressor with
+ * `ZSTD_CCtx_loadDictionary()`. The same dictionary must then be passed to
+ * the decompressor, using `ZSTD_DCtx_loadDictionary()`. There are other
+ * more advanced functions that allow selecting some options, see zstd.h for
+ * complete documentation.
+ *
+ * What is a zstd dictionary?
+ * --------------------------
+ *
+ * A zstd dictionary has two pieces: Its header, and its content. The header
+ * contains a magic number, the dictionary ID, and entropy tables. These
+ * entropy tables allow zstd to save on header costs in the compressed file,
+ * which really matters for small data. The content is just bytes, which are
+ * repeated content that is common across many samples.
+ *
+ * What is a raw content dictionary?
+ * ---------------------------------
+ *
+ * A raw content dictionary is just bytes. It doesn't have a zstd dictionary
+ * header, a dictionary ID, or entropy tables. Any buffer is a valid raw
+ * content dictionary.
+ *
+ * How do I train a dictionary?
+ * ----------------------------
+ *
+ * Gather samples from your use case. These samples should be similar to each
+ * other. If you have several use cases, you could try to train one dictionary
+ * per use case.
+ *
+ * Pass those samples to `ZDICT_trainFromBuffer()` and that will train your
+ * dictionary. There are a few advanced versions of this function, but this
+ * is a great starting point. If you want to further tune your dictionary
+ * you could try `ZDICT_optimizeTrainFromBuffer_cover()`. If that is too slow
+ * you can try `ZDICT_optimizeTrainFromBuffer_fastCover()`.
+ *
+ * If the dictionary training function fails, that is likely because you
+ * either passed too few samples, or a dictionary would not be effective
+ * for your data. Look at the messages that the dictionary trainer printed,
+ * if it doesn't say too few samples, then a dictionary would not be effective.
+ *
+ * How large should my dictionary be?
+ * ----------------------------------
+ *
+ * A reasonable dictionary size, the `dictBufferCapacity`, is about 100KB.
+ * The zstd CLI defaults to a 110KB dictionary. You likely don't need a
+ * dictionary larger than that. But, most use cases can get away with a
+ * smaller dictionary. The advanced dictionary builders can automatically
+ * shrink the dictionary for you, and select a the smallest size that
+ * doesn't hurt compression ratio too much. See the `shrinkDict` parameter.
+ * A smaller dictionary can save memory, and potentially speed up
+ * compression.
+ *
+ * How many samples should I provide to the dictionary builder?
+ * ------------------------------------------------------------
+ *
+ * We generally recommend passing ~100x the size of the dictionary
+ * in samples. A few thousand should suffice. Having too few samples
+ * can hurt the dictionaries effectiveness. Having more samples will
+ * only improve the dictionaries effectiveness. But having too many
+ * samples can slow down the dictionary builder.
+ *
+ * How do I determine if a dictionary will be effective?
+ * -----------------------------------------------------
+ *
+ * Simply train a dictionary and try it out. You can use zstd's built in
+ * benchmarking tool to test the dictionary effectiveness.
+ *
+ *   # Benchmark levels 1-3 without a dictionary
+ *   zstd -b1e3 -r /path/to/my/files
+ *   # Benchmark levels 1-3 with a dictioanry
+ *   zstd -b1e3 -r /path/to/my/files -D /path/to/my/dictionary
+ *
+ * When should I retrain a dictionary?
+ * -----------------------------------
+ *
+ * You should retrain a dictionary when its effectiveness drops. Dictionary
+ * effectiveness drops as the data you are compressing changes. Generally, we do
+ * expect dictionaries to "decay" over time, as your data changes, but the rate
+ * at which they decay depends on your use case. Internally, we regularly
+ * retrain dictionaries, and if the new dictionary performs significantly
+ * better than the old dictionary, we will ship the new dictionary.
+ *
+ * I have a raw content dictionary, how do I turn it into a zstd dictionary?
+ * -------------------------------------------------------------------------
+ *
+ * If you have a raw content dictionary, e.g. by manually constructing it, or
+ * using a third-party dictionary builder, you can turn it into a zstd
+ * dictionary by using `ZDICT_finalizeDictionary()`. You'll also have to
+ * provide some samples of the data. It will add the zstd header to the
+ * raw content, which contains a dictionary ID and entropy tables, which
+ * will improve compression ratio, and allow zstd to write the dictionary ID
+ * into the frame, if you so choose.
+ *
+ * Do I have to use zstd's dictionary builder?
+ * -------------------------------------------
+ *
+ * No! You can construct dictionary content however you please, it is just
+ * bytes. It will always be valid as a raw content dictionary. If you want
+ * a zstd dictionary, which can improve compression ratio, use
+ * `ZDICT_finalizeDictionary()`.
+ *
+ * What is the attack surface of a zstd dictionary?
+ * ------------------------------------------------
+ *
+ * Zstd is heavily fuzz tested, including loading fuzzed dictionaries, so
+ * zstd should never crash, or access out-of-bounds memory no matter what
+ * the dictionary is. However, if an attacker can control the dictionary
+ * during decompression, they can cause zstd to generate arbitrary bytes,
+ * just like if they controlled the compressed data.
+ *
+ ******************************************************************************/
+
+
+/*! ZDICT_trainFromBuffer():
+ *  Train a dictionary from an array of samples.
+ *  Redirect towards ZDICT_optimizeTrainFromBuffer_fastCover() single-threaded, with d=8, steps=4,
+ *  f=20, and accel=1.
+ *  Samples must be stored concatenated in a single flat buffer `samplesBuffer`,
+ *  supplied with an array of sizes `samplesSizes`, providing the size of each sample, in order.
+ *  The resulting dictionary will be saved into `dictBuffer`.
+ * @return: size of dictionary stored into `dictBuffer` (<= `dictBufferCapacity`)
+ *          or an error code, which can be tested with ZDICT_isError().
+ *  Note:  Dictionary training will fail if there are not enough samples to construct a
+ *         dictionary, or if most of the samples are too small (< 8 bytes being the lower limit).
+ *         If dictionary training fails, you should use zstd without a dictionary, as the dictionary
+ *         would've been ineffective anyways. If you believe your samples would benefit from a dictionary
+ *         please open an issue with details, and we can look into it.
+ *  Note: ZDICT_trainFromBuffer()'s memory usage is about 6 MB.
+ *  Tips: In general, a reasonable dictionary has a size of ~ 100 KB.
+ *        It's possible to select smaller or larger size, just by specifying `dictBufferCapacity`.
+ *        In general, it's recommended to provide a few thousands samples, though this can vary a lot.
+ *        It's recommended that total size of all samples be about ~x100 times the target size of dictionary.
+ */
+ZDICTLIB_API size_t ZDICT_trainFromBuffer(void* dictBuffer, size_t dictBufferCapacity,
+                                    const void* samplesBuffer,
+                                    const size_t* samplesSizes, unsigned nbSamples);
+
+typedef struct {
+    int      compressionLevel;   /*< optimize for a specific zstd compression level; 0 means default */
+    unsigned notificationLevel;  /*< Write log to stderr; 0 = none (default); 1 = errors; 2 = progression; 3 = details; 4 = debug; */
+    unsigned dictID;             /*< force dictID value; 0 means auto mode (32-bits random value)
+                                  *   NOTE: The zstd format reserves some dictionary IDs for future use.
+                                  *         You may use them in private settings, but be warned that they
+                                  *         may be used by zstd in a public dictionary registry in the future.
+                                  *         These dictionary IDs are:
+                                  *           - low range  : <= 32767
+                                  *           - high range : >= (2^31)
+                                  */
+} ZDICT_params_t;
+
+/*! ZDICT_finalizeDictionary():
+ * Given a custom content as a basis for dictionary, and a set of samples,
+ * finalize dictionary by adding headers and statistics according to the zstd
+ * dictionary format.
+ *
+ * Samples must be stored concatenated in a flat buffer `samplesBuffer`,
+ * supplied with an array of sizes `samplesSizes`, providing the size of each
+ * sample in order. The samples are used to construct the statistics, so they
+ * should be representative of what you will compress with this dictionary.
+ *
+ * The compression level can be set in `parameters`. You should pass the
+ * compression level you expect to use in production. The statistics for each
+ * compression level differ, so tuning the dictionary for the compression level
+ * can help quite a bit.
+ *
+ * You can set an explicit dictionary ID in `parameters`, or allow us to pick
+ * a random dictionary ID for you, but we can't guarantee no collisions.
+ *
+ * The dstDictBuffer and the dictContent may overlap, and the content will be
+ * appended to the end of the header. If the header + the content doesn't fit in
+ * maxDictSize the beginning of the content is truncated to make room, since it
+ * is presumed that the most profitable content is at the end of the dictionary,
+ * since that is the cheapest to reference.
+ *
+ * `dictContentSize` must be >= ZDICT_CONTENTSIZE_MIN bytes.
+ * `maxDictSize` must be >= max(dictContentSize, ZSTD_DICTSIZE_MIN).
+ *
+ * @return: size of dictionary stored into `dstDictBuffer` (<= `maxDictSize`),
+ *          or an error code, which can be tested by ZDICT_isError().
+ * Note: ZDICT_finalizeDictionary() will push notifications into stderr if
+ *       instructed to, using notificationLevel>0.
+ * NOTE: This function currently may fail in several edge cases including:
+ *         * Not enough samples
+ *         * Samples are uncompressible
+ *         * Samples are all exactly the same
+ */
+ZDICTLIB_API size_t ZDICT_finalizeDictionary(void* dstDictBuffer, size_t maxDictSize,
+                                const void* dictContent, size_t dictContentSize,
+                                const void* samplesBuffer, const size_t* samplesSizes, unsigned nbSamples,
+                                ZDICT_params_t parameters);
+
+
+/*======   Helper functions   ======*/
+ZDICTLIB_API unsigned ZDICT_getDictID(const void* dictBuffer, size_t dictSize);  /**< extracts dictID; @return zero if error (not a valid dictionary) */
+ZDICTLIB_API size_t ZDICT_getDictHeaderSize(const void* dictBuffer, size_t dictSize);  /* returns dict header size; returns a ZSTD error code on failure */
+ZDICTLIB_API unsigned ZDICT_isError(size_t errorCode);
+ZDICTLIB_API const char* ZDICT_getErrorName(size_t errorCode);
+
+
+
+#ifdef ZDICT_STATIC_LINKING_ONLY
+
+/* ====================================================================================
+ * The definitions in this section are considered experimental.
+ * They should never be used with a dynamic library, as they may change in the future.
+ * They are provided for advanced usages.
+ * Use them only in association with static linking.
+ * ==================================================================================== */
+
+#define ZDICT_CONTENTSIZE_MIN 128
+#define ZDICT_DICTSIZE_MIN    256
+
+/*! ZDICT_cover_params_t:
+ *  k and d are the only required parameters.
+ *  For others, value 0 means default.
+ */
+typedef struct {
+    unsigned k;                  /* Segment size : constraint: 0 < k : Reasonable range [16, 2048+] */
+    unsigned d;                  /* dmer size : constraint: 0 < d <= k : Reasonable range [6, 16] */
+    unsigned steps;              /* Number of steps : Only used for optimization : 0 means default (40) : Higher means more parameters checked */
+    unsigned nbThreads;          /* Number of threads : constraint: 0 < nbThreads : 1 means single-threaded : Only used for optimization : Ignored if ZSTD_MULTITHREAD is not defined */
+    double splitPoint;           /* Percentage of samples used for training: Only used for optimization : the first nbSamples * splitPoint samples will be used to training, the last nbSamples * (1 - splitPoint) samples will be used for testing, 0 means default (1.0), 1.0 when all samples are used for both training and testing */
+    unsigned shrinkDict;         /* Train dictionaries to shrink in size starting from the minimum size and selects the smallest dictionary that is shrinkDictMaxRegression% worse than the largest dictionary. 0 means no shrinking and 1 means shrinking  */
+    unsigned shrinkDictMaxRegression; /* Sets shrinkDictMaxRegression so that a smaller dictionary can be at worse shrinkDictMaxRegression% worse than the max dict size dictionary. */
+    ZDICT_params_t zParams;
+} ZDICT_cover_params_t;
+
+typedef struct {
+    unsigned k;                  /* Segment size : constraint: 0 < k : Reasonable range [16, 2048+] */
+    unsigned d;                  /* dmer size : constraint: 0 < d <= k : Reasonable range [6, 16] */
+    unsigned f;                  /* log of size of frequency array : constraint: 0 < f <= 31 : 1 means default(20)*/
+    unsigned steps;              /* Number of steps : Only used for optimization : 0 means default (40) : Higher means more parameters checked */
+    unsigned nbThreads;          /* Number of threads : constraint: 0 < nbThreads : 1 means single-threaded : Only used for optimization : Ignored if ZSTD_MULTITHREAD is not defined */
+    double splitPoint;           /* Percentage of samples used for training: Only used for optimization : the first nbSamples * splitPoint samples will be used to training, the last nbSamples * (1 - splitPoint) samples will be used for testing, 0 means default (0.75), 1.0 when all samples are used for both training and testing */
+    unsigned accel;              /* Acceleration level: constraint: 0 < accel <= 10, higher means faster and less accurate, 0 means default(1) */
+    unsigned shrinkDict;         /* Train dictionaries to shrink in size starting from the minimum size and selects the smallest dictionary that is shrinkDictMaxRegression% worse than the largest dictionary. 0 means no shrinking and 1 means shrinking  */
+    unsigned shrinkDictMaxRegression; /* Sets shrinkDictMaxRegression so that a smaller dictionary can be at worse shrinkDictMaxRegression% worse than the max dict size dictionary. */
+
+    ZDICT_params_t zParams;
+} ZDICT_fastCover_params_t;
+
+/*! ZDICT_trainFromBuffer_cover():
+ *  Train a dictionary from an array of samples using the COVER algorithm.
+ *  Samples must be stored concatenated in a single flat buffer `samplesBuffer`,
+ *  supplied with an array of sizes `samplesSizes`, providing the size of each sample, in order.
+ *  The resulting dictionary will be saved into `dictBuffer`.
+ * @return: size of dictionary stored into `dictBuffer` (<= `dictBufferCapacity`)
+ *          or an error code, which can be tested with ZDICT_isError().
+ *          See ZDICT_trainFromBuffer() for details on failure modes.
+ *  Note: ZDICT_trainFromBuffer_cover() requires about 9 bytes of memory for each input byte.
+ *  Tips: In general, a reasonable dictionary has a size of ~ 100 KB.
+ *        It's possible to select smaller or larger size, just by specifying `dictBufferCapacity`.
+ *        In general, it's recommended to provide a few thousands samples, though this can vary a lot.
+ *        It's recommended that total size of all samples be about ~x100 times the target size of dictionary.
+ */
+ZDICTLIB_API size_t ZDICT_trainFromBuffer_cover(
+          void *dictBuffer, size_t dictBufferCapacity,
+    const void *samplesBuffer, const size_t *samplesSizes, unsigned nbSamples,
+          ZDICT_cover_params_t parameters);
+
+/*! ZDICT_optimizeTrainFromBuffer_cover():
+ * The same requirements as above hold for all the parameters except `parameters`.
+ * This function tries many parameter combinations and picks the best parameters.
+ * `*parameters` is filled with the best parameters found,
+ * dictionary constructed with those parameters is stored in `dictBuffer`.
+ *
+ * All of the parameters d, k, steps are optional.
+ * If d is non-zero then we don't check multiple values of d, otherwise we check d = {6, 8}.
+ * if steps is zero it defaults to its default value.
+ * If k is non-zero then we don't check multiple values of k, otherwise we check steps values in [50, 2000].
+ *
+ * @return: size of dictionary stored into `dictBuffer` (<= `dictBufferCapacity`)
+ *          or an error code, which can be tested with ZDICT_isError().
+ *          On success `*parameters` contains the parameters selected.
+ *          See ZDICT_trainFromBuffer() for details on failure modes.
+ * Note: ZDICT_optimizeTrainFromBuffer_cover() requires about 8 bytes of memory for each input byte and additionally another 5 bytes of memory for each byte of memory for each thread.
+ */
+ZDICTLIB_API size_t ZDICT_optimizeTrainFromBuffer_cover(
+          void* dictBuffer, size_t dictBufferCapacity,
+    const void* samplesBuffer, const size_t* samplesSizes, unsigned nbSamples,
+          ZDICT_cover_params_t* parameters);
+
+/*! ZDICT_trainFromBuffer_fastCover():
+ *  Train a dictionary from an array of samples using a modified version of COVER algorithm.
+ *  Samples must be stored concatenated in a single flat buffer `samplesBuffer`,
+ *  supplied with an array of sizes `samplesSizes`, providing the size of each sample, in order.
+ *  d and k are required.
+ *  All other parameters are optional, will use default values if not provided
+ *  The resulting dictionary will be saved into `dictBuffer`.
+ * @return: size of dictionary stored into `dictBuffer` (<= `dictBufferCapacity`)
+ *          or an error code, which can be tested with ZDICT_isError().
+ *          See ZDICT_trainFromBuffer() for details on failure modes.
+ *  Note: ZDICT_trainFromBuffer_fastCover() requires 6 * 2^f bytes of memory.
+ *  Tips: In general, a reasonable dictionary has a size of ~ 100 KB.
+ *        It's possible to select smaller or larger size, just by specifying `dictBufferCapacity`.
+ *        In general, it's recommended to provide a few thousands samples, though this can vary a lot.
+ *        It's recommended that total size of all samples be about ~x100 times the target size of dictionary.
+ */
+ZDICTLIB_API size_t ZDICT_trainFromBuffer_fastCover(void *dictBuffer,
+                    size_t dictBufferCapacity, const void *samplesBuffer,
+                    const size_t *samplesSizes, unsigned nbSamples,
+                    ZDICT_fastCover_params_t parameters);
+
+/*! ZDICT_optimizeTrainFromBuffer_fastCover():
+ * The same requirements as above hold for all the parameters except `parameters`.
+ * This function tries many parameter combinations (specifically, k and d combinations)
+ * and picks the best parameters. `*parameters` is filled with the best parameters found,
+ * dictionary constructed with those parameters is stored in `dictBuffer`.
+ * All of the parameters d, k, steps, f, and accel are optional.
+ * If d is non-zero then we don't check multiple values of d, otherwise we check d = {6, 8}.
+ * if steps is zero it defaults to its default value.
+ * If k is non-zero then we don't check multiple values of k, otherwise we check steps values in [50, 2000].
+ * If f is zero, default value of 20 is used.
+ * If accel is zero, default value of 1 is used.
+ *
+ * @return: size of dictionary stored into `dictBuffer` (<= `dictBufferCapacity`)
+ *          or an error code, which can be tested with ZDICT_isError().
+ *          On success `*parameters` contains the parameters selected.
+ *          See ZDICT_trainFromBuffer() for details on failure modes.
+ * Note: ZDICT_optimizeTrainFromBuffer_fastCover() requires about 6 * 2^f bytes of memory for each thread.
+ */
+ZDICTLIB_API size_t ZDICT_optimizeTrainFromBuffer_fastCover(void* dictBuffer,
+                    size_t dictBufferCapacity, const void* samplesBuffer,
+                    const size_t* samplesSizes, unsigned nbSamples,
+                    ZDICT_fastCover_params_t* parameters);
+
+typedef struct {
+    unsigned selectivityLevel;   /* 0 means default; larger => select more => larger dictionary */
+    ZDICT_params_t zParams;
+} ZDICT_legacy_params_t;
+
+/*! ZDICT_trainFromBuffer_legacy():
+ *  Train a dictionary from an array of samples.
+ *  Samples must be stored concatenated in a single flat buffer `samplesBuffer`,
+ *  supplied with an array of sizes `samplesSizes`, providing the size of each sample, in order.
+ *  The resulting dictionary will be saved into `dictBuffer`.
+ * `parameters` is optional and can be provided with values set to 0 to mean "default".
+ * @return: size of dictionary stored into `dictBuffer` (<= `dictBufferCapacity`)
+ *          or an error code, which can be tested with ZDICT_isError().
+ *          See ZDICT_trainFromBuffer() for details on failure modes.
+ *  Tips: In general, a reasonable dictionary has a size of ~ 100 KB.
+ *        It's possible to select smaller or larger size, just by specifying `dictBufferCapacity`.
+ *        In general, it's recommended to provide a few thousands samples, though this can vary a lot.
+ *        It's recommended that total size of all samples be about ~x100 times the target size of dictionary.
+ *  Note: ZDICT_trainFromBuffer_legacy() will send notifications into stderr if instructed to, using notificationLevel>0.
+ */
+ZDICTLIB_API size_t ZDICT_trainFromBuffer_legacy(
+    void* dictBuffer, size_t dictBufferCapacity,
+    const void* samplesBuffer, const size_t* samplesSizes, unsigned nbSamples,
+    ZDICT_legacy_params_t parameters);
+
+
+/* Deprecation warnings */
+/* It is generally possible to disable deprecation warnings from compiler,
+   for example with -Wno-deprecated-declarations for gcc
+   or _CRT_SECURE_NO_WARNINGS in Visual.
+   Otherwise, it's also possible to manually define ZDICT_DISABLE_DEPRECATE_WARNINGS */
+#ifdef ZDICT_DISABLE_DEPRECATE_WARNINGS
+#  define ZDICT_DEPRECATED(message) ZDICTLIB_API   /* disable deprecation warnings */
+#else
+#  define ZDICT_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
+#  if defined (__cplusplus) && (__cplusplus >= 201402) /* C++14 or greater */
+#    define ZDICT_DEPRECATED(message) [[deprecated(message)]] ZDICTLIB_API
+#  elif defined(__clang__) || (ZDICT_GCC_VERSION >= 405)
+#    define ZDICT_DEPRECATED(message) ZDICTLIB_API __attribute__((deprecated(message)))
+#  elif (ZDICT_GCC_VERSION >= 301)
+#    define ZDICT_DEPRECATED(message) ZDICTLIB_API __attribute__((deprecated))
+#  elif defined(_MSC_VER)
+#    define ZDICT_DEPRECATED(message) ZDICTLIB_API __declspec(deprecated(message))
+#  else
+#    pragma message("WARNING: You need to implement ZDICT_DEPRECATED for this compiler")
+#    define ZDICT_DEPRECATED(message) ZDICTLIB_API
+#  endif
+#endif /* ZDICT_DISABLE_DEPRECATE_WARNINGS */
+
+ZDICT_DEPRECATED("use ZDICT_finalizeDictionary() instead")
+size_t ZDICT_addEntropyTablesFromBuffer(void* dictBuffer, size_t dictContentSize, size_t dictBufferCapacity,
+                                  const void* samplesBuffer, const size_t* samplesSizes, unsigned nbSamples);
+
+
+#endif   /* ZDICT_STATIC_LINKING_ONLY */
+
+#if defined (__cplusplus)
+}
+#endif
+
+#endif   /* DICTBUILDER_H_001 */
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/zstd_errors.h mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/zstd_errors.h
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/zstd_errors.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/zstd_errors.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+#ifndef ZSTD_ERRORS_H_398273423
+#define ZSTD_ERRORS_H_398273423
+
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
+/*===== dependency =====*/
+#include <stddef.h>   /* size_t */
+
+
+/* =====   ZSTDERRORLIB_API : control library symbols visibility   ===== */
+#ifndef ZSTDERRORLIB_VISIBILITY
+#  if defined(__GNUC__) && (__GNUC__ >= 4)
+#    define ZSTDERRORLIB_VISIBILITY __attribute__ ((visibility ("default")))
+#  else
+#    define ZSTDERRORLIB_VISIBILITY
+#  endif
+#endif
+#if defined(ZSTD_DLL_EXPORT) && (ZSTD_DLL_EXPORT==1)
+#  define ZSTDERRORLIB_API __declspec(dllexport) ZSTDERRORLIB_VISIBILITY
+#elif defined(ZSTD_DLL_IMPORT) && (ZSTD_DLL_IMPORT==1)
+#  define ZSTDERRORLIB_API __declspec(dllimport) ZSTDERRORLIB_VISIBILITY /* It isn't required but allows to generate better code, saving a function pointer load from the IAT and an indirect jump.*/
+#else
+#  define ZSTDERRORLIB_API ZSTDERRORLIB_VISIBILITY
+#endif
+
+/*-*********************************************
+ *  Error codes list
+ *-*********************************************
+ *  Error codes _values_ are pinned down since v1.3.1 only.
+ *  Therefore, don't rely on values if you may link to any version < v1.3.1.
+ *
+ *  Only values < 100 are considered stable.
+ *
+ *  note 1 : this API shall be used with static linking only.
+ *           dynamic linking is not yet officially supported.
+ *  note 2 : Prefer relying on the enum than on its value whenever possible
+ *           This is the only supported way to use the error list < v1.3.1
+ *  note 3 : ZSTD_isError() is always correct, whatever the library version.
+ **********************************************/
+typedef enum {
+  ZSTD_error_no_error = 0,
+  ZSTD_error_GENERIC  = 1,
+  ZSTD_error_prefix_unknown                = 10,
+  ZSTD_error_version_unsupported           = 12,
+  ZSTD_error_frameParameter_unsupported    = 14,
+  ZSTD_error_frameParameter_windowTooLarge = 16,
+  ZSTD_error_corruption_detected = 20,
+  ZSTD_error_checksum_wrong      = 22,
+  ZSTD_error_dictionary_corrupted      = 30,
+  ZSTD_error_dictionary_wrong          = 32,
+  ZSTD_error_dictionaryCreation_failed = 34,
+  ZSTD_error_parameter_unsupported   = 40,
+  ZSTD_error_parameter_outOfBound    = 42,
+  ZSTD_error_tableLog_tooLarge       = 44,
+  ZSTD_error_maxSymbolValue_tooLarge = 46,
+  ZSTD_error_maxSymbolValue_tooSmall = 48,
+  ZSTD_error_stage_wrong       = 60,
+  ZSTD_error_init_missing      = 62,
+  ZSTD_error_memory_allocation = 64,
+  ZSTD_error_workSpace_tooSmall= 66,
+  ZSTD_error_dstSize_tooSmall = 70,
+  ZSTD_error_srcSize_wrong    = 72,
+  ZSTD_error_dstBuffer_null   = 74,
+  /* following error codes are __NOT STABLE__, they can be removed or changed in future versions */
+  ZSTD_error_frameIndex_tooLarge = 100,
+  ZSTD_error_seekableIO          = 102,
+  ZSTD_error_dstBuffer_wrong     = 104,
+  ZSTD_error_srcBuffer_wrong     = 105,
+  ZSTD_error_maxCode = 120  /* never EVER use this value directly, it can change in future versions! Use ZSTD_isError() instead */
+} ZSTD_ErrorCode;
+
+/*! ZSTD_getErrorCode() :
+    convert a `size_t` function result into a `ZSTD_ErrorCode` enum type,
+    which can be used to compare with enum list published above */
+ZSTDERRORLIB_API ZSTD_ErrorCode ZSTD_getErrorCode(size_t functionResult);
+ZSTDERRORLIB_API const char* ZSTD_getErrorString(ZSTD_ErrorCode code);   /**< Same as ZSTD_getErrorName, but using a `ZSTD_ErrorCode` enum argument */
+
+
+#if defined (__cplusplus)
+}
+#endif
+
+#endif /* ZSTD_ERRORS_H_398273423 */
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/zstd.h mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/zstd.h
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/lib/zstd.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/lib/zstd.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,2532 @@
+/*
+ * Copyright (c) Yann Collet, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
+#ifndef ZSTD_H_235446
+#define ZSTD_H_235446
+
+/* ======   Dependency   ======*/
+#include <limits.h>   /* INT_MAX */
+#include <stddef.h>   /* size_t */
+
+
+/* =====   ZSTDLIB_API : control library symbols visibility   ===== */
+#ifndef ZSTDLIB_VISIBILITY
+#  if defined(__GNUC__) && (__GNUC__ >= 4)
+#    define ZSTDLIB_VISIBILITY __attribute__ ((visibility ("default")))
+#  else
+#    define ZSTDLIB_VISIBILITY
+#  endif
+#endif
+#if defined(ZSTD_DLL_EXPORT) && (ZSTD_DLL_EXPORT==1)
+#  define ZSTDLIB_API __declspec(dllexport) ZSTDLIB_VISIBILITY
+#elif defined(ZSTD_DLL_IMPORT) && (ZSTD_DLL_IMPORT==1)
+#  define ZSTDLIB_API __declspec(dllimport) ZSTDLIB_VISIBILITY /* It isn't required but allows to generate better code, saving a function pointer load from the IAT and an indirect jump.*/
+#else
+#  define ZSTDLIB_API ZSTDLIB_VISIBILITY
+#endif
+
+
+/*******************************************************************************
+  Introduction
+
+  zstd, short for Zstandard, is a fast lossless compression algorithm, targeting
+  real-time compression scenarios at zlib-level and better compression ratios.
+  The zstd compression library provides in-memory compression and decompression
+  functions.
+
+  The library supports regular compression levels from 1 up to ZSTD_maxCLevel(),
+  which is currently 22. Levels >= 20, labeled `--ultra`, should be used with
+  caution, as they require more memory. The library also offers negative
+  compression levels, which extend the range of speed vs. ratio preferences.
+  The lower the level, the faster the speed (at the cost of compression).
+
+  Compression can be done in:
+    - a single step (described as Simple API)
+    - a single step, reusing a context (described as Explicit context)
+    - unbounded multiple steps (described as Streaming compression)
+
+  The compression ratio achievable on small data can be highly improved using
+  a dictionary. Dictionary compression can be performed in:
+    - a single step (described as Simple dictionary API)
+    - a single step, reusing a dictionary (described as Bulk-processing
+      dictionary API)
+
+  Advanced experimental functions can be accessed using
+  `#define ZSTD_STATIC_LINKING_ONLY` before including zstd.h.
+
+  Advanced experimental APIs should never be used with a dynamically-linked
+  library. They are not "stable"; their definitions or signatures may change in
+  the future. Only static linking is allowed.
+*******************************************************************************/
+
+/*------   Version   ------*/
+#define ZSTD_VERSION_MAJOR    1
+#define ZSTD_VERSION_MINOR    5
+#define ZSTD_VERSION_RELEASE  0
+#define ZSTD_VERSION_NUMBER  (ZSTD_VERSION_MAJOR *100*100 + ZSTD_VERSION_MINOR *100 + ZSTD_VERSION_RELEASE)
+
+/*! ZSTD_versionNumber() :
+ *  Return runtime library version, the value is (MAJOR*100*100 + MINOR*100 + RELEASE). */
+ZSTDLIB_API unsigned ZSTD_versionNumber(void);
+
+#define ZSTD_LIB_VERSION ZSTD_VERSION_MAJOR.ZSTD_VERSION_MINOR.ZSTD_VERSION_RELEASE
+#define ZSTD_QUOTE(str) #str
+#define ZSTD_EXPAND_AND_QUOTE(str) ZSTD_QUOTE(str)
+#define ZSTD_VERSION_STRING ZSTD_EXPAND_AND_QUOTE(ZSTD_LIB_VERSION)
+
+/*! ZSTD_versionString() :
+ *  Return runtime library version, like "1.4.5". Requires v1.3.0+. */
+ZSTDLIB_API const char* ZSTD_versionString(void);
+
+/* *************************************
+ *  Default constant
+ ***************************************/
+#ifndef ZSTD_CLEVEL_DEFAULT
+#  define ZSTD_CLEVEL_DEFAULT 3
+#endif
+
+/* *************************************
+ *  Constants
+ ***************************************/
+
+/* All magic numbers are supposed read/written to/from files/memory using little-endian convention */
+#define ZSTD_MAGICNUMBER            0xFD2FB528    /* valid since v0.8.0 */
+#define ZSTD_MAGIC_DICTIONARY       0xEC30A437    /* valid since v0.7.0 */
+#define ZSTD_MAGIC_SKIPPABLE_START  0x184D2A50    /* all 16 values, from 0x184D2A50 to 0x184D2A5F, signal the beginning of a skippable frame */
+#define ZSTD_MAGIC_SKIPPABLE_MASK   0xFFFFFFF0
+
+#define ZSTD_BLOCKSIZELOG_MAX  17
+#define ZSTD_BLOCKSIZE_MAX     (1<<ZSTD_BLOCKSIZELOG_MAX)
+
+
+/***************************************
+*  Simple API
+***************************************/
+/*! ZSTD_compress() :
+ *  Compresses `src` content as a single zstd compressed frame into already allocated `dst`.
+ *  Hint : compression runs faster if `dstCapacity` >=  `ZSTD_compressBound(srcSize)`.
+ *  @return : compressed size written into `dst` (<= `dstCapacity),
+ *            or an error code if it fails (which can be tested using ZSTD_isError()). */
+ZSTDLIB_API size_t ZSTD_compress( void* dst, size_t dstCapacity,
+                            const void* src, size_t srcSize,
+                                  int compressionLevel);
+
+/*! ZSTD_decompress() :
+ *  `compressedSize` : must be the _exact_ size of some number of compressed and/or skippable frames.
+ *  `dstCapacity` is an upper bound of originalSize to regenerate.
+ *  If user cannot imply a maximum upper bound, it's better to use streaming mode to decompress data.
+ *  @return : the number of bytes decompressed into `dst` (<= `dstCapacity`),
+ *            or an errorCode if it fails (which can be tested using ZSTD_isError()). */
+ZSTDLIB_API size_t ZSTD_decompress( void* dst, size_t dstCapacity,
+                              const void* src, size_t compressedSize);
+
+/*! ZSTD_getFrameContentSize() : requires v1.3.0+
+ *  `src` should point to the start of a ZSTD encoded frame.
+ *  `srcSize` must be at least as large as the frame header.
+ *            hint : any size >= `ZSTD_frameHeaderSize_max` is large enough.
+ *  @return : - decompressed size of `src` frame content, if known
+ *            - ZSTD_CONTENTSIZE_UNKNOWN if the size cannot be determined
+ *            - ZSTD_CONTENTSIZE_ERROR if an error occurred (e.g. invalid magic number, srcSize too small)
+ *   note 1 : a 0 return value means the frame is valid but "empty".
+ *   note 2 : decompressed size is an optional field, it may not be present, typically in streaming mode.
+ *            When `return==ZSTD_CONTENTSIZE_UNKNOWN`, data to decompress could be any size.
+ *            In which case, it's necessary to use streaming mode to decompress data.
+ *            Optionally, application can rely on some implicit limit,
+ *            as ZSTD_decompress() only needs an upper bound of decompressed size.
+ *            (For example, data could be necessarily cut into blocks <= 16 KB).
+ *   note 3 : decompressed size is always present when compression is completed using single-pass functions,
+ *            such as ZSTD_compress(), ZSTD_compressCCtx() ZSTD_compress_usingDict() or ZSTD_compress_usingCDict().
+ *   note 4 : decompressed size can be very large (64-bits value),
+ *            potentially larger than what local system can handle as a single memory segment.
+ *            In which case, it's necessary to use streaming mode to decompress data.
+ *   note 5 : If source is untrusted, decompressed size could be wrong or intentionally modified.
+ *            Always ensure return value fits within application's authorized limits.
+ *            Each application can set its own limits.
+ *   note 6 : This function replaces ZSTD_getDecompressedSize() */
+#define ZSTD_CONTENTSIZE_UNKNOWN (0ULL - 1)
+#define ZSTD_CONTENTSIZE_ERROR   (0ULL - 2)
+ZSTDLIB_API unsigned long long ZSTD_getFrameContentSize(const void *src, size_t srcSize);
+
+/*! ZSTD_getDecompressedSize() :
+ *  NOTE: This function is now obsolete, in favor of ZSTD_getFrameContentSize().
+ *  Both functions work the same way, but ZSTD_getDecompressedSize() blends
+ *  "empty", "unknown" and "error" results to the same return value (0),
+ *  while ZSTD_getFrameContentSize() gives them separate return values.
+ * @return : decompressed size of `src` frame content _if known and not empty_, 0 otherwise. */
+ZSTDLIB_API unsigned long long ZSTD_getDecompressedSize(const void* src, size_t srcSize);
+
+/*! ZSTD_findFrameCompressedSize() : Requires v1.4.0+
+ * `src` should point to the start of a ZSTD frame or skippable frame.
+ * `srcSize` must be >= first frame size
+ * @return : the compressed size of the first frame starting at `src`,
+ *           suitable to pass as `srcSize` to `ZSTD_decompress` or similar,
+ *        or an error code if input is invalid */
+ZSTDLIB_API size_t ZSTD_findFrameCompressedSize(const void* src, size_t srcSize);
+
+
+/*======  Helper functions  ======*/
+#define ZSTD_COMPRESSBOUND(srcSize)   ((srcSize) + ((srcSize)>>8) + (((srcSize) < (128<<10)) ? (((128<<10) - (srcSize)) >> 11) /* margin, from 64 to 0 */ : 0))  /* this formula ensures that bound(A) + bound(B) <= bound(A+B) as long as A and B >= 128 KB */
+ZSTDLIB_API size_t      ZSTD_compressBound(size_t srcSize); /*!< maximum compressed size in worst case single-pass scenario */
+ZSTDLIB_API unsigned    ZSTD_isError(size_t code);          /*!< tells if a `size_t` function result is an error code */
+ZSTDLIB_API const char* ZSTD_getErrorName(size_t code);     /*!< provides readable string from an error code */
+ZSTDLIB_API int         ZSTD_minCLevel(void);               /*!< minimum negative compression level allowed, requires v1.4.0+ */
+ZSTDLIB_API int         ZSTD_maxCLevel(void);               /*!< maximum compression level available */
+ZSTDLIB_API int         ZSTD_defaultCLevel(void);           /*!< default compression level, specified by ZSTD_CLEVEL_DEFAULT, requires v1.5.0+ */
+
+
+/***************************************
+*  Explicit context
+***************************************/
+/*= Compression context
+ *  When compressing many times,
+ *  it is recommended to allocate a context just once,
+ *  and re-use it for each successive compression operation.
+ *  This will make workload friendlier for system's memory.
+ *  Note : re-using context is just a speed / resource optimization.
+ *         It doesn't change the compression ratio, which remains identical.
+ *  Note 2 : In multi-threaded environments,
+ *         use one different context per thread for parallel execution.
+ */
+typedef struct ZSTD_CCtx_s ZSTD_CCtx;
+ZSTDLIB_API ZSTD_CCtx* ZSTD_createCCtx(void);
+ZSTDLIB_API size_t     ZSTD_freeCCtx(ZSTD_CCtx* cctx);  /* accept NULL pointer */
+
+/*! ZSTD_compressCCtx() :
+ *  Same as ZSTD_compress(), using an explicit ZSTD_CCtx.
+ *  Important : in order to behave similarly to `ZSTD_compress()`,
+ *  this function compresses at requested compression level,
+ *  __ignoring any other parameter__ .
+ *  If any advanced parameter was set using the advanced API,
+ *  they will all be reset. Only `compressionLevel` remains.
+ */
+ZSTDLIB_API size_t ZSTD_compressCCtx(ZSTD_CCtx* cctx,
+                                     void* dst, size_t dstCapacity,
+                               const void* src, size_t srcSize,
+                                     int compressionLevel);
+
+/*= Decompression context
+ *  When decompressing many times,
+ *  it is recommended to allocate a context only once,
+ *  and re-use it for each successive compression operation.
+ *  This will make workload friendlier for system's memory.
+ *  Use one context per thread for parallel execution. */
+typedef struct ZSTD_DCtx_s ZSTD_DCtx;
+ZSTDLIB_API ZSTD_DCtx* ZSTD_createDCtx(void);
+ZSTDLIB_API size_t     ZSTD_freeDCtx(ZSTD_DCtx* dctx);  /* accept NULL pointer */
+
+/*! ZSTD_decompressDCtx() :
+ *  Same as ZSTD_decompress(),
+ *  requires an allocated ZSTD_DCtx.
+ *  Compatible with sticky parameters.
+ */
+ZSTDLIB_API size_t ZSTD_decompressDCtx(ZSTD_DCtx* dctx,
+                                       void* dst, size_t dstCapacity,
+                                 const void* src, size_t srcSize);
+
+
+/*********************************************
+*  Advanced compression API (Requires v1.4.0+)
+**********************************************/
+
+/* API design :
+ *   Parameters are pushed one by one into an existing context,
+ *   using ZSTD_CCtx_set*() functions.
+ *   Pushed parameters are sticky : they are valid for next compressed frame, and any subsequent frame.
+ *   "sticky" parameters are applicable to `ZSTD_compress2()` and `ZSTD_compressStream*()` !
+ *   __They do not apply to "simple" one-shot variants such as ZSTD_compressCCtx()__ .
+ *
+ *   It's possible to reset all parameters to "default" using ZSTD_CCtx_reset().
+ *
+ *   This API supercedes all other "advanced" API entry points in the experimental section.
+ *   In the future, we expect to remove from experimental API entry points which are redundant with this API.
+ */
+
+
+/* Compression strategies, listed from fastest to strongest */
+typedef enum { ZSTD_fast=1,
+               ZSTD_dfast=2,
+               ZSTD_greedy=3,
+               ZSTD_lazy=4,
+               ZSTD_lazy2=5,
+               ZSTD_btlazy2=6,
+               ZSTD_btopt=7,
+               ZSTD_btultra=8,
+               ZSTD_btultra2=9
+               /* note : new strategies _might_ be added in the future.
+                         Only the order (from fast to strong) is guaranteed */
+} ZSTD_strategy;
+
+typedef enum {
+
+    /* compression parameters
+     * Note: When compressing with a ZSTD_CDict these parameters are superseded
+     * by the parameters used to construct the ZSTD_CDict.
+     * See ZSTD_CCtx_refCDict() for more info (superseded-by-cdict). */
+    ZSTD_c_compressionLevel=100, /* Set compression parameters according to pre-defined cLevel table.
+                              * Note that exact compression parameters are dynamically determined,
+                              * depending on both compression level and srcSize (when known).
+                              * Default level is ZSTD_CLEVEL_DEFAULT==3.
+                              * Special: value 0 means default, which is controlled by ZSTD_CLEVEL_DEFAULT.
+                              * Note 1 : it's possible to pass a negative compression level.
+                              * Note 2 : setting a level does not automatically set all other compression parameters
+                              *   to default. Setting this will however eventually dynamically impact the compression
+                              *   parameters which have not been manually set. The manually set
+                              *   ones will 'stick'. */
+    /* Advanced compression parameters :
+     * It's possible to pin down compression parameters to some specific values.
+     * In which case, these values are no longer dynamically selected by the compressor */
+    ZSTD_c_windowLog=101,    /* Maximum allowed back-reference distance, expressed as power of 2.
+                              * This will set a memory budget for streaming decompression,
+                              * with larger values requiring more memory
+                              * and typically compressing more.
+                              * Must be clamped between ZSTD_WINDOWLOG_MIN and ZSTD_WINDOWLOG_MAX.
+                              * Special: value 0 means "use default windowLog".
+                              * Note: Using a windowLog greater than ZSTD_WINDOWLOG_LIMIT_DEFAULT
+                              *       requires explicitly allowing such size at streaming decompression stage. */
+    ZSTD_c_hashLog=102,      /* Size of the initial probe table, as a power of 2.
+                              * Resulting memory usage is (1 << (hashLog+2)).
+                              * Must be clamped between ZSTD_HASHLOG_MIN and ZSTD_HASHLOG_MAX.
+                              * Larger tables improve compression ratio of strategies <= dFast,
+                              * and improve speed of strategies > dFast.
+                              * Special: value 0 means "use default hashLog". */
+    ZSTD_c_chainLog=103,     /* Size of the multi-probe search table, as a power of 2.
+                              * Resulting memory usage is (1 << (chainLog+2)).
+                              * Must be clamped between ZSTD_CHAINLOG_MIN and ZSTD_CHAINLOG_MAX.
+                              * Larger tables result in better and slower compression.
+                              * This parameter is useless for "fast" strategy.
+                              * It's still useful when using "dfast" strategy,
+                              * in which case it defines a secondary probe table.
+                              * Special: value 0 means "use default chainLog". */
+    ZSTD_c_searchLog=104,    /* Number of search attempts, as a power of 2.
+                              * More attempts result in better and slower compression.
+                              * This parameter is useless for "fast" and "dFast" strategies.
+                              * Special: value 0 means "use default searchLog". */
+    ZSTD_c_minMatch=105,     /* Minimum size of searched matches.
+                              * Note that Zstandard can still find matches of smaller size,
+                              * it just tweaks its search algorithm to look for this size and larger.
+                              * Larger values increase compression and decompression speed, but decrease ratio.
+                              * Must be clamped between ZSTD_MINMATCH_MIN and ZSTD_MINMATCH_MAX.
+                              * Note that currently, for all strategies < btopt, effective minimum is 4.
+                              *                    , for all strategies > fast, effective maximum is 6.
+                              * Special: value 0 means "use default minMatchLength". */
+    ZSTD_c_targetLength=106, /* Impact of this field depends on strategy.
+                              * For strategies btopt, btultra & btultra2:
+                              *     Length of Match considered "good enough" to stop search.
+                              *     Larger values make compression stronger, and slower.
+                              * For strategy fast:
+                              *     Distance between match sampling.
+                              *     Larger values make compression faster, and weaker.
+                              * Special: value 0 means "use default targetLength". */
+    ZSTD_c_strategy=107,     /* See ZSTD_strategy enum definition.
+                              * The higher the value of selected strategy, the more complex it is,
+                              * resulting in stronger and slower compression.
+                              * Special: value 0 means "use default strategy". */
+    /* LDM mode parameters */
+    ZSTD_c_enableLongDistanceMatching=160, /* Enable long distance matching.
+                                     * This parameter is designed to improve compression ratio
+                                     * for large inputs, by finding large matches at long distance.
+                                     * It increases memory usage and window size.
+                                     * Note: enabling this parameter increases default ZSTD_c_windowLog to 128 MB
+                                     * except when expressly set to a different value.
+                                     * Note: will be enabled by default if ZSTD_c_windowLog >= 128 MB and
+                                     * compression strategy >= ZSTD_btopt (== compression level 16+) */
+    ZSTD_c_ldmHashLog=161,   /* Size of the table for long distance matching, as a power of 2.
+                              * Larger values increase memory usage and compression ratio,
+                              * but decrease compression speed.
+                              * Must be clamped between ZSTD_HASHLOG_MIN and ZSTD_HASHLOG_MAX
+                              * default: windowlog - 7.
+                              * Special: value 0 means "automatically determine hashlog". */
+    ZSTD_c_ldmMinMatch=162,  /* Minimum match size for long distance matcher.
+                              * Larger/too small values usually decrease compression ratio.
+                              * Must be clamped between ZSTD_LDM_MINMATCH_MIN and ZSTD_LDM_MINMATCH_MAX.
+                              * Special: value 0 means "use default value" (default: 64). */
+    ZSTD_c_ldmBucketSizeLog=163, /* Log size of each bucket in the LDM hash table for collision resolution.
+                              * Larger values improve collision resolution but decrease compression speed.
+                              * The maximum value is ZSTD_LDM_BUCKETSIZELOG_MAX.
+                              * Special: value 0 means "use default value" (default: 3). */
+    ZSTD_c_ldmHashRateLog=164, /* Frequency of inserting/looking up entries into the LDM hash table.
+                              * Must be clamped between 0 and (ZSTD_WINDOWLOG_MAX - ZSTD_HASHLOG_MIN).
+                              * Default is MAX(0, (windowLog - ldmHashLog)), optimizing hash table usage.
+                              * Larger values improve compression speed.
+                              * Deviating far from default value will likely result in a compression ratio decrease.
+                              * Special: value 0 means "automatically determine hashRateLog". */
+
+    /* frame parameters */
+    ZSTD_c_contentSizeFlag=200, /* Content size will be written into frame header _whenever known_ (default:1)
+                              * Content size must be known at the beginning of compression.
+                              * This is automatically the case when using ZSTD_compress2(),
+                              * For streaming scenarios, content size must be provided with ZSTD_CCtx_setPledgedSrcSize() */
+    ZSTD_c_checksumFlag=201, /* A 32-bits checksum of content is written at end of frame (default:0) */
+    ZSTD_c_dictIDFlag=202,   /* When applicable, dictionary's ID is written into frame header (default:1) */
+
+    /* multi-threading parameters */
+    /* These parameters are only active if multi-threading is enabled (compiled with build macro ZSTD_MULTITHREAD).
+     * Otherwise, trying to set any other value than default (0) will be a no-op and return an error.
+     * In a situation where it's unknown if the linked library supports multi-threading or not,
+     * setting ZSTD_c_nbWorkers to any value >= 1 and consulting the return value provides a quick way to check this property.
+     */
+    ZSTD_c_nbWorkers=400,    /* Select how many threads will be spawned to compress in parallel.
+                              * When nbWorkers >= 1, triggers asynchronous mode when invoking ZSTD_compressStream*() :
+                              * ZSTD_compressStream*() consumes input and flush output if possible, but immediately gives back control to caller,
+                              * while compression is performed in parallel, within worker thread(s).
+                              * (note : a strong exception to this rule is when first invocation of ZSTD_compressStream2() sets ZSTD_e_end :
+                              *  in which case, ZSTD_compressStream2() delegates to ZSTD_compress2(), which is always a blocking call).
+                              * More workers improve speed, but also increase memory usage.
+                              * Default value is `0`, aka "single-threaded mode" : no worker is spawned,
+                              * compression is performed inside Caller's thread, and all invocations are blocking */
+    ZSTD_c_jobSize=401,      /* Size of a compression job. This value is enforced only when nbWorkers >= 1.
+                              * Each compression job is completed in parallel, so this value can indirectly impact the nb of active threads.
+                              * 0 means default, which is dynamically determined based on compression parameters.
+                              * Job size must be a minimum of overlap size, or ZSTDMT_JOBSIZE_MIN (= 512 KB), whichever is largest.
+                              * The minimum size is automatically and transparently enforced. */
+    ZSTD_c_overlapLog=402,   /* Control the overlap size, as a fraction of window size.
+                              * The overlap size is an amount of data reloaded from previous job at the beginning of a new job.
+                              * It helps preserve compression ratio, while each job is compressed in parallel.
+                              * This value is enforced only when nbWorkers >= 1.
+                              * Larger values increase compression ratio, but decrease speed.
+                              * Possible values range from 0 to 9 :
+                              * - 0 means "default" : value will be determined by the library, depending on strategy
+                              * - 1 means "no overlap"
+                              * - 9 means "full overlap", using a full window size.
+                              * Each intermediate rank increases/decreases load size by a factor 2 :
+                              * 9: full window;  8: w/2;  7: w/4;  6: w/8;  5:w/16;  4: w/32;  3:w/64;  2:w/128;  1:no overlap;  0:default
+                              * default value varies between 6 and 9, depending on strategy */
+
+    /* note : additional experimental parameters are also available
+     * within the experimental section of the API.
+     * At the time of this writing, they include :
+     * ZSTD_c_rsyncable
+     * ZSTD_c_format
+     * ZSTD_c_forceMaxWindow
+     * ZSTD_c_forceAttachDict
+     * ZSTD_c_literalCompressionMode
+     * ZSTD_c_targetCBlockSize
+     * ZSTD_c_srcSizeHint
+     * ZSTD_c_enableDedicatedDictSearch
+     * ZSTD_c_stableInBuffer
+     * ZSTD_c_stableOutBuffer
+     * ZSTD_c_blockDelimiters
+     * ZSTD_c_validateSequences
+     * ZSTD_c_splitBlocks
+     * ZSTD_c_useRowMatchFinder
+     * Because they are not stable, it's necessary to define ZSTD_STATIC_LINKING_ONLY to access them.
+     * note : never ever use experimentalParam? names directly;
+     *        also, the enums values themselves are unstable and can still change.
+     */
+     ZSTD_c_experimentalParam1=500,
+     ZSTD_c_experimentalParam2=10,
+     ZSTD_c_experimentalParam3=1000,
+     ZSTD_c_experimentalParam4=1001,
+     ZSTD_c_experimentalParam5=1002,
+     ZSTD_c_experimentalParam6=1003,
+     ZSTD_c_experimentalParam7=1004,
+     ZSTD_c_experimentalParam8=1005,
+     ZSTD_c_experimentalParam9=1006,
+     ZSTD_c_experimentalParam10=1007,
+     ZSTD_c_experimentalParam11=1008,
+     ZSTD_c_experimentalParam12=1009,
+     ZSTD_c_experimentalParam13=1010,
+     ZSTD_c_experimentalParam14=1011,
+     ZSTD_c_experimentalParam15=1012
+} ZSTD_cParameter;
+
+typedef struct {
+    size_t error;
+    int lowerBound;
+    int upperBound;
+} ZSTD_bounds;
+
+/*! ZSTD_cParam_getBounds() :
+ *  All parameters must belong to an interval with lower and upper bounds,
+ *  otherwise they will either trigger an error or be automatically clamped.
+ * @return : a structure, ZSTD_bounds, which contains
+ *         - an error status field, which must be tested using ZSTD_isError()
+ *         - lower and upper bounds, both inclusive
+ */
+ZSTDLIB_API ZSTD_bounds ZSTD_cParam_getBounds(ZSTD_cParameter cParam);
+
+/*! ZSTD_CCtx_setParameter() :
+ *  Set one compression parameter, selected by enum ZSTD_cParameter.
+ *  All parameters have valid bounds. Bounds can be queried using ZSTD_cParam_getBounds().
+ *  Providing a value beyond bound will either clamp it, or trigger an error (depending on parameter).
+ *  Setting a parameter is generally only possible during frame initialization (before starting compression).
+ *  Exception : when using multi-threading mode (nbWorkers >= 1),
+ *              the following parameters can be updated _during_ compression (within same frame):
+ *              => compressionLevel, hashLog, chainLog, searchLog, minMatch, targetLength and strategy.
+ *              new parameters will be active for next job only (after a flush()).
+ * @return : an error code (which can be tested using ZSTD_isError()).
+ */
+ZSTDLIB_API size_t ZSTD_CCtx_setParameter(ZSTD_CCtx* cctx, ZSTD_cParameter param, int value);
+
+/*! ZSTD_CCtx_setPledgedSrcSize() :
+ *  Total input data size to be compressed as a single frame.
+ *  Value will be written in frame header, unless if explicitly forbidden using ZSTD_c_contentSizeFlag.
+ *  This value will also be controlled at end of frame, and trigger an error if not respected.
+ * @result : 0, or an error code (which can be tested with ZSTD_isError()).
+ *  Note 1 : pledgedSrcSize==0 actually means zero, aka an empty frame.
+ *           In order to mean "unknown content size", pass constant ZSTD_CONTENTSIZE_UNKNOWN.
+ *           ZSTD_CONTENTSIZE_UNKNOWN is default value for any new frame.
+ *  Note 2 : pledgedSrcSize is only valid once, for the next frame.
+ *           It's discarded at the end of the frame, and replaced by ZSTD_CONTENTSIZE_UNKNOWN.
+ *  Note 3 : Whenever all input data is provided and consumed in a single round,
+ *           for example with ZSTD_compress2(),
+ *           or invoking immediately ZSTD_compressStream2(,,,ZSTD_e_end),
+ *           this value is automatically overridden by srcSize instead.
+ */
+ZSTDLIB_API size_t ZSTD_CCtx_setPledgedSrcSize(ZSTD_CCtx* cctx, unsigned long long pledgedSrcSize);
+
+typedef enum {
+    ZSTD_reset_session_only = 1,
+    ZSTD_reset_parameters = 2,
+    ZSTD_reset_session_and_parameters = 3
+} ZSTD_ResetDirective;
+
+/*! ZSTD_CCtx_reset() :
+ *  There are 2 different things that can be reset, independently or jointly :
+ *  - The session : will stop compressing current frame, and make CCtx ready to start a new one.
+ *                  Useful after an error, or to interrupt any ongoing compression.
+ *                  Any internal data not yet flushed is cancelled.
+ *                  Compression parameters and dictionary remain unchanged.
+ *                  They will be used to compress next frame.
+ *                  Resetting session never fails.
+ *  - The parameters : changes all parameters back to "default".
+ *                  This removes any reference to any dictionary too.
+ *                  Parameters can only be changed between 2 sessions (i.e. no compression is currently ongoing)
+ *                  otherwise the reset fails, and function returns an error value (which can be tested using ZSTD_isError())
+ *  - Both : similar to resetting the session, followed by resetting parameters.
+ */
+ZSTDLIB_API size_t ZSTD_CCtx_reset(ZSTD_CCtx* cctx, ZSTD_ResetDirective reset);
+
+/*! ZSTD_compress2() :
+ *  Behave the same as ZSTD_compressCCtx(), but compression parameters are set using the advanced API.
+ *  ZSTD_compress2() always starts a new frame.
+ *  Should cctx hold data from a previously unfinished frame, everything about it is forgotten.
+ *  - Compression parameters are pushed into CCtx before starting compression, using ZSTD_CCtx_set*()
+ *  - The function is always blocking, returns when compression is completed.
+ *  Hint : compression runs faster if `dstCapacity` >=  `ZSTD_compressBound(srcSize)`.
+ * @return : compressed size written into `dst` (<= `dstCapacity),
+ *           or an error code if it fails (which can be tested using ZSTD_isError()).
+ */
+ZSTDLIB_API size_t ZSTD_compress2( ZSTD_CCtx* cctx,
+                                   void* dst, size_t dstCapacity,
+                             const void* src, size_t srcSize);
+
+
+/***********************************************
+*  Advanced decompression API (Requires v1.4.0+)
+************************************************/
+
+/* The advanced API pushes parameters one by one into an existing DCtx context.
+ * Parameters are sticky, and remain valid for all following frames
+ * using the same DCtx context.
+ * It's possible to reset parameters to default values using ZSTD_DCtx_reset().
+ * Note : This API is compatible with existing ZSTD_decompressDCtx() and ZSTD_decompressStream().
+ *        Therefore, no new decompression function is necessary.
+ */
+
+typedef enum {
+
+    ZSTD_d_windowLogMax=100, /* Select a size limit (in power of 2) beyond which
+                              * the streaming API will refuse to allocate memory buffer
+                              * in order to protect the host from unreasonable memory requirements.
+                              * This parameter is only useful in streaming mode, since no internal buffer is allocated in single-pass mode.
+                              * By default, a decompression context accepts window sizes <= (1 << ZSTD_WINDOWLOG_LIMIT_DEFAULT).
+                              * Special: value 0 means "use default maximum windowLog". */
+
+    /* note : additional experimental parameters are also available
+     * within the experimental section of the API.
+     * At the time of this writing, they include :
+     * ZSTD_d_format
+     * ZSTD_d_stableOutBuffer
+     * ZSTD_d_forceIgnoreChecksum
+     * ZSTD_d_refMultipleDDicts
+     * Because they are not stable, it's necessary to define ZSTD_STATIC_LINKING_ONLY to access them.
+     * note : never ever use experimentalParam? names directly
+     */
+     ZSTD_d_experimentalParam1=1000,
+     ZSTD_d_experimentalParam2=1001,
+     ZSTD_d_experimentalParam3=1002,
+     ZSTD_d_experimentalParam4=1003
+
+} ZSTD_dParameter;
+
+/*! ZSTD_dParam_getBounds() :
+ *  All parameters must belong to an interval with lower and upper bounds,
+ *  otherwise they will either trigger an error or be automatically clamped.
+ * @return : a structure, ZSTD_bounds, which contains
+ *         - an error status field, which must be tested using ZSTD_isError()
+ *         - both lower and upper bounds, inclusive
+ */
+ZSTDLIB_API ZSTD_bounds ZSTD_dParam_getBounds(ZSTD_dParameter dParam);
+
+/*! ZSTD_DCtx_setParameter() :
+ *  Set one compression parameter, selected by enum ZSTD_dParameter.
+ *  All parameters have valid bounds. Bounds can be queried using ZSTD_dParam_getBounds().
+ *  Providing a value beyond bound will either clamp it, or trigger an error (depending on parameter).
+ *  Setting a parameter is only possible during frame initialization (before starting decompression).
+ * @return : 0, or an error code (which can be tested using ZSTD_isError()).
+ */
+ZSTDLIB_API size_t ZSTD_DCtx_setParameter(ZSTD_DCtx* dctx, ZSTD_dParameter param, int value);
+
+/*! ZSTD_DCtx_reset() :
+ *  Return a DCtx to clean state.
+ *  Session and parameters can be reset jointly or separately.
+ *  Parameters can only be reset when no active frame is being decompressed.
+ * @return : 0, or an error code, which can be tested with ZSTD_isError()
+ */
+ZSTDLIB_API size_t ZSTD_DCtx_reset(ZSTD_DCtx* dctx, ZSTD_ResetDirective reset);
+
+
+/****************************
+*  Streaming
+****************************/
+
+typedef struct ZSTD_inBuffer_s {
+  const void* src;    /**< start of input buffer */
+  size_t size;        /**< size of input buffer */
+  size_t pos;         /**< position where reading stopped. Will be updated. Necessarily 0 <= pos <= size */
+} ZSTD_inBuffer;
+
+typedef struct ZSTD_outBuffer_s {
+  void*  dst;         /**< start of output buffer */
+  size_t size;        /**< size of output buffer */
+  size_t pos;         /**< position where writing stopped. Will be updated. Necessarily 0 <= pos <= size */
+} ZSTD_outBuffer;
+
+
+
+/*-***********************************************************************
+*  Streaming compression - HowTo
+*
+*  A ZSTD_CStream object is required to track streaming operation.
+*  Use ZSTD_createCStream() and ZSTD_freeCStream() to create/release resources.
+*  ZSTD_CStream objects can be reused multiple times on consecutive compression operations.
+*  It is recommended to re-use ZSTD_CStream since it will play nicer with system's memory, by re-using already allocated memory.
+*
+*  For parallel execution, use one separate ZSTD_CStream per thread.
+*
+*  note : since v1.3.0, ZSTD_CStream and ZSTD_CCtx are the same thing.
+*
+*  Parameters are sticky : when starting a new compression on the same context,
+*  it will re-use the same sticky parameters as previous compression session.
+*  When in doubt, it's recommended to fully initialize the context before usage.
+*  Use ZSTD_CCtx_reset() to reset the context and ZSTD_CCtx_setParameter(),
+*  ZSTD_CCtx_setPledgedSrcSize(), or ZSTD_CCtx_loadDictionary() and friends to
+*  set more specific parameters, the pledged source size, or load a dictionary.
+*
+*  Use ZSTD_compressStream2() with ZSTD_e_continue as many times as necessary to
+*  consume input stream. The function will automatically update both `pos`
+*  fields within `input` and `output`.
+*  Note that the function may not consume the entire input, for example, because
+*  the output buffer is already full, in which case `input.pos < input.size`.
+*  The caller must check if input has been entirely consumed.
+*  If not, the caller must make some room to receive more compressed data,
+*  and then present again remaining input data.
+*  note: ZSTD_e_continue is guaranteed to make some forward progress when called,
+*        but doesn't guarantee maximal forward progress. This is especially relevant
+*        when compressing with multiple threads. The call won't block if it can
+*        consume some input, but if it can't it will wait for some, but not all,
+*        output to be flushed.
+* @return : provides a minimum amount of data remaining to be flushed from internal buffers
+*           or an error code, which can be tested using ZSTD_isError().
+*
+*  At any moment, it's possible to flush whatever data might remain stuck within internal buffer,
+*  using ZSTD_compressStream2() with ZSTD_e_flush. `output->pos` will be updated.
+*  Note that, if `output->size` is too small, a single invocation with ZSTD_e_flush might not be enough (return code > 0).
+*  In which case, make some room to receive more compressed data, and call again ZSTD_compressStream2() with ZSTD_e_flush.
+*  You must continue calling ZSTD_compressStream2() with ZSTD_e_flush until it returns 0, at which point you can change the
+*  operation.
+*  note: ZSTD_e_flush will flush as much output as possible, meaning when compressing with multiple threads, it will
+*        block until the flush is complete or the output buffer is full.
+*  @return : 0 if internal buffers are entirely flushed,
+*            >0 if some data still present within internal buffer (the value is minimal estimation of remaining size),
+*            or an error code, which can be tested using ZSTD_isError().
+*
+*  Calling ZSTD_compressStream2() with ZSTD_e_end instructs to finish a frame.
+*  It will perform a flush and write frame epilogue.
+*  The epilogue is required for decoders to consider a frame completed.
+*  flush operation is the same, and follows same rules as calling ZSTD_compressStream2() with ZSTD_e_flush.
+*  You must continue calling ZSTD_compressStream2() with ZSTD_e_end until it returns 0, at which point you are free to
+*  start a new frame.
+*  note: ZSTD_e_end will flush as much output as possible, meaning when compressing with multiple threads, it will
+*        block until the flush is complete or the output buffer is full.
+*  @return : 0 if frame fully completed and fully flushed,
+*            >0 if some data still present within internal buffer (the value is minimal estimation of remaining size),
+*            or an error code, which can be tested using ZSTD_isError().
+*
+* *******************************************************************/
+
+typedef ZSTD_CCtx ZSTD_CStream;  /**< CCtx and CStream are now effectively same object (>= v1.3.0) */
+                                 /* Continue to distinguish them for compatibility with older versions <= v1.2.0 */
+/*===== ZSTD_CStream management functions =====*/
+ZSTDLIB_API ZSTD_CStream* ZSTD_createCStream(void);
+ZSTDLIB_API size_t ZSTD_freeCStream(ZSTD_CStream* zcs);  /* accept NULL pointer */
+
+/*===== Streaming compression functions =====*/
+typedef enum {
+    ZSTD_e_continue=0, /* collect more data, encoder decides when to output compressed result, for optimal compression ratio */
+    ZSTD_e_flush=1,    /* flush any data provided so far,
+                        * it creates (at least) one new block, that can be decoded immediately on reception;
+                        * frame will continue: any future data can still reference previously compressed data, improving compression.
+                        * note : multithreaded compression will block to flush as much output as possible. */
+    ZSTD_e_end=2       /* flush any remaining data _and_ close current frame.
+                        * note that frame is only closed after compressed data is fully flushed (return value == 0).
+                        * After that point, any additional data starts a new frame.
+                        * note : each frame is independent (does not reference any content from previous frame).
+                        : note : multithreaded compression will block to flush as much output as possible. */
+} ZSTD_EndDirective;
+
+/*! ZSTD_compressStream2() : Requires v1.4.0+
+ *  Behaves about the same as ZSTD_compressStream, with additional control on end directive.
+ *  - Compression parameters are pushed into CCtx before starting compression, using ZSTD_CCtx_set*()
+ *  - Compression parameters cannot be changed once compression is started (save a list of exceptions in multi-threading mode)
+ *  - output->pos must be <= dstCapacity, input->pos must be <= srcSize
+ *  - output->pos and input->pos will be updated. They are guaranteed to remain below their respective limit.
+ *  - endOp must be a valid directive
+ *  - When nbWorkers==0 (default), function is blocking : it completes its job before returning to caller.
+ *  - When nbWorkers>=1, function is non-blocking : it copies a portion of input, distributes jobs to internal worker threads, flush to output whatever is available,
+ *                                                  and then immediately returns, just indicating that there is some data remaining to be flushed.
+ *                                                  The function nonetheless guarantees forward progress : it will return only after it reads or write at least 1+ byte.
+ *  - Exception : if the first call requests a ZSTD_e_end directive and provides enough dstCapacity, the function delegates to ZSTD_compress2() which is always blocking.
+ *  - @return provides a minimum amount of data remaining to be flushed from internal buffers
+ *            or an error code, which can be tested using ZSTD_isError().
+ *            if @return != 0, flush is not fully completed, there is still some data left within internal buffers.
+ *            This is useful for ZSTD_e_flush, since in this case more flushes are necessary to empty all buffers.
+ *            For ZSTD_e_end, @return == 0 when internal buffers are fully flushed and frame is completed.
+ *  - after a ZSTD_e_end directive, if internal buffer is not fully flushed (@return != 0),
+ *            only ZSTD_e_end or ZSTD_e_flush operations are allowed.
+ *            Before starting a new compression job, or changing compression parameters,
+ *            it is required to fully flush internal buffers.
+ */
+ZSTDLIB_API size_t ZSTD_compressStream2( ZSTD_CCtx* cctx,
+                                         ZSTD_outBuffer* output,
+                                         ZSTD_inBuffer* input,
+                                         ZSTD_EndDirective endOp);
+
+
+/* These buffer sizes are softly recommended.
+ * They are not required : ZSTD_compressStream*() happily accepts any buffer size, for both input and output.
+ * Respecting the recommended size just makes it a bit easier for ZSTD_compressStream*(),
+ * reducing the amount of memory shuffling and buffering, resulting in minor performance savings.
+ *
+ * However, note that these recommendations are from the perspective of a C caller program.
+ * If the streaming interface is invoked from some other language,
+ * especially managed ones such as Java or Go, through a foreign function interface such as jni or cgo,
+ * a major performance rule is to reduce crossing such interface to an absolute minimum.
+ * It's not rare that performance ends being spent more into the interface, rather than compression itself.
+ * In which cases, prefer using large buffers, as large as practical,
+ * for both input and output, to reduce the nb of roundtrips.
+ */
+ZSTDLIB_API size_t ZSTD_CStreamInSize(void);    /**< recommended size for input buffer */
+ZSTDLIB_API size_t ZSTD_CStreamOutSize(void);   /**< recommended size for output buffer. Guarantee to successfully flush at least one complete compressed block. */
+
+
+/* *****************************************************************************
+ * This following is a legacy streaming API, available since v1.0+ .
+ * It can be replaced by ZSTD_CCtx_reset() and ZSTD_compressStream2().
+ * It is redundant, but remains fully supported.
+ * Streaming in combination with advanced parameters and dictionary compression
+ * can only be used through the new API.
+ ******************************************************************************/
+
+/*!
+ * Equivalent to:
+ *
+ *     ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only);
+ *     ZSTD_CCtx_refCDict(zcs, NULL); // clear the dictionary (if any)
+ *     ZSTD_CCtx_setParameter(zcs, ZSTD_c_compressionLevel, compressionLevel);
+ */
+ZSTDLIB_API size_t ZSTD_initCStream(ZSTD_CStream* zcs, int compressionLevel);
+/*!
+ * Alternative for ZSTD_compressStream2(zcs, output, input, ZSTD_e_continue).
+ * NOTE: The return value is different. ZSTD_compressStream() returns a hint for
+ * the next read size (if non-zero and not an error). ZSTD_compressStream2()
+ * returns the minimum nb of bytes left to flush (if non-zero and not an error).
+ */
+ZSTDLIB_API size_t ZSTD_compressStream(ZSTD_CStream* zcs, ZSTD_outBuffer* output, ZSTD_inBuffer* input);
+/*! Equivalent to ZSTD_compressStream2(zcs, output, &emptyInput, ZSTD_e_flush). */
+ZSTDLIB_API size_t ZSTD_flushStream(ZSTD_CStream* zcs, ZSTD_outBuffer* output);
+/*! Equivalent to ZSTD_compressStream2(zcs, output, &emptyInput, ZSTD_e_end). */
+ZSTDLIB_API size_t ZSTD_endStream(ZSTD_CStream* zcs, ZSTD_outBuffer* output);
+
+
+/*-***************************************************************************
+*  Streaming decompression - HowTo
+*
+*  A ZSTD_DStream object is required to track streaming operations.
+*  Use ZSTD_createDStream() and ZSTD_freeDStream() to create/release resources.
+*  ZSTD_DStream objects can be re-used multiple times.
+*
+*  Use ZSTD_initDStream() to start a new decompression operation.
+* @return : recommended first input size
+*  Alternatively, use advanced API to set specific properties.
+*
+*  Use ZSTD_decompressStream() repetitively to consume your input.
+*  The function will update both `pos` fields.
+*  If `input.pos < input.size`, some input has not been consumed.
+*  It's up to the caller to present again remaining data.
+*  The function tries to flush all data decoded immediately, respecting output buffer size.
+*  If `output.pos < output.size`, decoder has flushed everything it could.
+*  But if `output.pos == output.size`, there might be some data left within internal buffers.,
+*  In which case, call ZSTD_decompressStream() again to flush whatever remains in the buffer.
+*  Note : with no additional input provided, amount of data flushed is necessarily <= ZSTD_BLOCKSIZE_MAX.
+* @return : 0 when a frame is completely decoded and fully flushed,
+*        or an error code, which can be tested using ZSTD_isError(),
+*        or any other value > 0, which means there is still some decoding or flushing to do to complete current frame :
+*                                the return value is a suggested next input size (just a hint for better latency)
+*                                that will never request more than the remaining frame size.
+* *******************************************************************************/
+
+typedef ZSTD_DCtx ZSTD_DStream;  /**< DCtx and DStream are now effectively same object (>= v1.3.0) */
+                                 /* For compatibility with versions <= v1.2.0, prefer differentiating them. */
+/*===== ZSTD_DStream management functions =====*/
+ZSTDLIB_API ZSTD_DStream* ZSTD_createDStream(void);
+ZSTDLIB_API size_t ZSTD_freeDStream(ZSTD_DStream* zds);  /* accept NULL pointer */
+
+/*===== Streaming decompression functions =====*/
+
+/* This function is redundant with the advanced API and equivalent to:
+ *
+ *     ZSTD_DCtx_reset(zds, ZSTD_reset_session_only);
+ *     ZSTD_DCtx_refDDict(zds, NULL);
+ */
+ZSTDLIB_API size_t ZSTD_initDStream(ZSTD_DStream* zds);
+
+ZSTDLIB_API size_t ZSTD_decompressStream(ZSTD_DStream* zds, ZSTD_outBuffer* output, ZSTD_inBuffer* input);
+
+ZSTDLIB_API size_t ZSTD_DStreamInSize(void);    /*!< recommended size for input buffer */
+ZSTDLIB_API size_t ZSTD_DStreamOutSize(void);   /*!< recommended size for output buffer. Guarantee to successfully flush at least one complete block in all circumstances. */
+
+
+/**************************
+*  Simple dictionary API
+***************************/
+/*! ZSTD_compress_usingDict() :
+ *  Compression at an explicit compression level using a Dictionary.
+ *  A dictionary can be any arbitrary data segment (also called a prefix),
+ *  or a buffer with specified information (see zdict.h).
+ *  Note : This function loads the dictionary, resulting in significant startup delay.
+ *         It's intended for a dictionary used only once.
+ *  Note 2 : When `dict == NULL || dictSize < 8` no dictionary is used. */
+ZSTDLIB_API size_t ZSTD_compress_usingDict(ZSTD_CCtx* ctx,
+                                           void* dst, size_t dstCapacity,
+                                     const void* src, size_t srcSize,
+                                     const void* dict,size_t dictSize,
+                                           int compressionLevel);
+
+/*! ZSTD_decompress_usingDict() :
+ *  Decompression using a known Dictionary.
+ *  Dictionary must be identical to the one used during compression.
+ *  Note : This function loads the dictionary, resulting in significant startup delay.
+ *         It's intended for a dictionary used only once.
+ *  Note : When `dict == NULL || dictSize < 8` no dictionary is used. */
+ZSTDLIB_API size_t ZSTD_decompress_usingDict(ZSTD_DCtx* dctx,
+                                             void* dst, size_t dstCapacity,
+                                       const void* src, size_t srcSize,
+                                       const void* dict,size_t dictSize);
+
+
+/***********************************
+ *  Bulk processing dictionary API
+ **********************************/
+typedef struct ZSTD_CDict_s ZSTD_CDict;
+
+/*! ZSTD_createCDict() :
+ *  When compressing multiple messages or blocks using the same dictionary,
+ *  it's recommended to digest the dictionary only once, since it's a costly operation.
+ *  ZSTD_createCDict() will create a state from digesting a dictionary.
+ *  The resulting state can be used for future compression operations with very limited startup cost.
+ *  ZSTD_CDict can be created once and shared by multiple threads concurrently, since its usage is read-only.
+ * @dictBuffer can be released after ZSTD_CDict creation, because its content is copied within CDict.
+ *  Note 1 : Consider experimental function `ZSTD_createCDict_byReference()` if you prefer to not duplicate @dictBuffer content.
+ *  Note 2 : A ZSTD_CDict can be created from an empty @dictBuffer,
+ *      in which case the only thing that it transports is the @compressionLevel.
+ *      This can be useful in a pipeline featuring ZSTD_compress_usingCDict() exclusively,
+ *      expecting a ZSTD_CDict parameter with any data, including those without a known dictionary. */
+ZSTDLIB_API ZSTD_CDict* ZSTD_createCDict(const void* dictBuffer, size_t dictSize,
+                                         int compressionLevel);
+
+/*! ZSTD_freeCDict() :
+ *  Function frees memory allocated by ZSTD_createCDict().
+ *  If a NULL pointer is passed, no operation is performed. */
+ZSTDLIB_API size_t      ZSTD_freeCDict(ZSTD_CDict* CDict);
+
+/*! ZSTD_compress_usingCDict() :
+ *  Compression using a digested Dictionary.
+ *  Recommended when same dictionary is used multiple times.
+ *  Note : compression level is _decided at dictionary creation time_,
+ *     and frame parameters are hardcoded (dictID=yes, contentSize=yes, checksum=no) */
+ZSTDLIB_API size_t ZSTD_compress_usingCDict(ZSTD_CCtx* cctx,
+                                            void* dst, size_t dstCapacity,
+                                      const void* src, size_t srcSize,
+                                      const ZSTD_CDict* cdict);
+
+
+typedef struct ZSTD_DDict_s ZSTD_DDict;
+
+/*! ZSTD_createDDict() :
+ *  Create a digested dictionary, ready to start decompression operation without startup delay.
+ *  dictBuffer can be released after DDict creation, as its content is copied inside DDict. */
+ZSTDLIB_API ZSTD_DDict* ZSTD_createDDict(const void* dictBuffer, size_t dictSize);
+
+/*! ZSTD_freeDDict() :
+ *  Function frees memory allocated with ZSTD_createDDict()
+ *  If a NULL pointer is passed, no operation is performed. */
+ZSTDLIB_API size_t      ZSTD_freeDDict(ZSTD_DDict* ddict);
+
+/*! ZSTD_decompress_usingDDict() :
+ *  Decompression using a digested Dictionary.
+ *  Recommended when same dictionary is used multiple times. */
+ZSTDLIB_API size_t ZSTD_decompress_usingDDict(ZSTD_DCtx* dctx,
+                                              void* dst, size_t dstCapacity,
+                                        const void* src, size_t srcSize,
+                                        const ZSTD_DDict* ddict);
+
+
+/********************************
+ *  Dictionary helper functions
+ *******************************/
+
+/*! ZSTD_getDictID_fromDict() : Requires v1.4.0+
+ *  Provides the dictID stored within dictionary.
+ *  if @return == 0, the dictionary is not conformant with Zstandard specification.
+ *  It can still be loaded, but as a content-only dictionary. */
+ZSTDLIB_API unsigned ZSTD_getDictID_fromDict(const void* dict, size_t dictSize);
+
+/*! ZSTD_getDictID_fromCDict() : Requires v1.5.0+
+ *  Provides the dictID of the dictionary loaded into `cdict`.
+ *  If @return == 0, the dictionary is not conformant to Zstandard specification, or empty.
+ *  Non-conformant dictionaries can still be loaded, but as content-only dictionaries. */
+ZSTDLIB_API unsigned ZSTD_getDictID_fromCDict(const ZSTD_CDict* cdict);
+
+/*! ZSTD_getDictID_fromDDict() : Requires v1.4.0+
+ *  Provides the dictID of the dictionary loaded into `ddict`.
+ *  If @return == 0, the dictionary is not conformant to Zstandard specification, or empty.
+ *  Non-conformant dictionaries can still be loaded, but as content-only dictionaries. */
+ZSTDLIB_API unsigned ZSTD_getDictID_fromDDict(const ZSTD_DDict* ddict);
+
+/*! ZSTD_getDictID_fromFrame() : Requires v1.4.0+
+ *  Provides the dictID required to decompressed the frame stored within `src`.
+ *  If @return == 0, the dictID could not be decoded.
+ *  This could for one of the following reasons :
+ *  - The frame does not require a dictionary to be decoded (most common case).
+ *  - The frame was built with dictID intentionally removed. Whatever dictionary is necessary is a hidden information.
+ *    Note : this use case also happens when using a non-conformant dictionary.
+ *  - `srcSize` is too small, and as a result, the frame header could not be decoded (only possible if `srcSize < ZSTD_FRAMEHEADERSIZE_MAX`).
+ *  - This is not a Zstandard frame.
+ *  When identifying the exact failure cause, it's possible to use ZSTD_getFrameHeader(), which will provide a more precise error code. */
+ZSTDLIB_API unsigned ZSTD_getDictID_fromFrame(const void* src, size_t srcSize);
+
+
+/*******************************************************************************
+ * Advanced dictionary and prefix API (Requires v1.4.0+)
+ *
+ * This API allows dictionaries to be used with ZSTD_compress2(),
+ * ZSTD_compressStream2(), and ZSTD_decompress(). Dictionaries are sticky, and
+ * only reset with the context is reset with ZSTD_reset_parameters or
+ * ZSTD_reset_session_and_parameters. Prefixes are single-use.
+ ******************************************************************************/
+
+
+/*! ZSTD_CCtx_loadDictionary() : Requires v1.4.0+
+ *  Create an internal CDict from `dict` buffer.
+ *  Decompression will have to use same dictionary.
+ * @result : 0, or an error code (which can be tested with ZSTD_isError()).
+ *  Special: Loading a NULL (or 0-size) dictionary invalidates previous dictionary,
+ *           meaning "return to no-dictionary mode".
+ *  Note 1 : Dictionary is sticky, it will be used for all future compressed frames.
+ *           To return to "no-dictionary" situation, load a NULL dictionary (or reset parameters).
+ *  Note 2 : Loading a dictionary involves building tables.
+ *           It's also a CPU consuming operation, with non-negligible impact on latency.
+ *           Tables are dependent on compression parameters, and for this reason,
+ *           compression parameters can no longer be changed after loading a dictionary.
+ *  Note 3 :`dict` content will be copied internally.
+ *           Use experimental ZSTD_CCtx_loadDictionary_byReference() to reference content instead.
+ *           In such a case, dictionary buffer must outlive its users.
+ *  Note 4 : Use ZSTD_CCtx_loadDictionary_advanced()
+ *           to precisely select how dictionary content must be interpreted. */
+ZSTDLIB_API size_t ZSTD_CCtx_loadDictionary(ZSTD_CCtx* cctx, const void* dict, size_t dictSize);
+
+/*! ZSTD_CCtx_refCDict() : Requires v1.4.0+
+ *  Reference a prepared dictionary, to be used for all next compressed frames.
+ *  Note that compression parameters are enforced from within CDict,
+ *  and supersede any compression parameter previously set within CCtx.
+ *  The parameters ignored are labelled as "superseded-by-cdict" in the ZSTD_cParameter enum docs.
+ *  The ignored parameters will be used again if the CCtx is returned to no-dictionary mode.
+ *  The dictionary will remain valid for future compressed frames using same CCtx.
+ * @result : 0, or an error code (which can be tested with ZSTD_isError()).
+ *  Special : Referencing a NULL CDict means "return to no-dictionary mode".
+ *  Note 1 : Currently, only one dictionary can be managed.
+ *           Referencing a new dictionary effectively "discards" any previous one.
+ *  Note 2 : CDict is just referenced, its lifetime must outlive its usage within CCtx. */
+ZSTDLIB_API size_t ZSTD_CCtx_refCDict(ZSTD_CCtx* cctx, const ZSTD_CDict* cdict);
+
+/*! ZSTD_CCtx_refPrefix() : Requires v1.4.0+
+ *  Reference a prefix (single-usage dictionary) for next compressed frame.
+ *  A prefix is **only used once**. Tables are discarded at end of frame (ZSTD_e_end).
+ *  Decompression will need same prefix to properly regenerate data.
+ *  Compressing with a prefix is similar in outcome as performing a diff and compressing it,
+ *  but performs much faster, especially during decompression (compression speed is tunable with compression level).
+ * @result : 0, or an error code (which can be tested with ZSTD_isError()).
+ *  Special: Adding any prefix (including NULL) invalidates any previous prefix or dictionary
+ *  Note 1 : Prefix buffer is referenced. It **must** outlive compression.
+ *           Its content must remain unmodified during compression.
+ *  Note 2 : If the intention is to diff some large src data blob with some prior version of itself,
+ *           ensure that the window size is large enough to contain the entire source.
+ *           See ZSTD_c_windowLog.
+ *  Note 3 : Referencing a prefix involves building tables, which are dependent on compression parameters.
+ *           It's a CPU consuming operation, with non-negligible impact on latency.
+ *           If there is a need to use the same prefix multiple times, consider loadDictionary instead.
+ *  Note 4 : By default, the prefix is interpreted as raw content (ZSTD_dct_rawContent).
+ *           Use experimental ZSTD_CCtx_refPrefix_advanced() to alter dictionary interpretation. */
+ZSTDLIB_API size_t ZSTD_CCtx_refPrefix(ZSTD_CCtx* cctx,
+                                 const void* prefix, size_t prefixSize);
+
+/*! ZSTD_DCtx_loadDictionary() : Requires v1.4.0+
+ *  Create an internal DDict from dict buffer,
+ *  to be used to decompress next frames.
+ *  The dictionary remains valid for all future frames, until explicitly invalidated.
+ * @result : 0, or an error code (which can be tested with ZSTD_isError()).
+ *  Special : Adding a NULL (or 0-size) dictionary invalidates any previous dictionary,
+ *            meaning "return to no-dictionary mode".
+ *  Note 1 : Loading a dictionary involves building tables,
+ *           which has a non-negligible impact on CPU usage and latency.
+ *           It's recommended to "load once, use many times", to amortize the cost
+ *  Note 2 :`dict` content will be copied internally, so `dict` can be released after loading.
+ *           Use ZSTD_DCtx_loadDictionary_byReference() to reference dictionary content instead.
+ *  Note 3 : Use ZSTD_DCtx_loadDictionary_advanced() to take control of
+ *           how dictionary content is loaded and interpreted.
+ */
+ZSTDLIB_API size_t ZSTD_DCtx_loadDictionary(ZSTD_DCtx* dctx, const void* dict, size_t dictSize);
+
+/*! ZSTD_DCtx_refDDict() : Requires v1.4.0+
+ *  Reference a prepared dictionary, to be used to decompress next frames.
+ *  The dictionary remains active for decompression of future frames using same DCtx.
+ *
+ *  If called with ZSTD_d_refMultipleDDicts enabled, repeated calls of this function
+ *  will store the DDict references in a table, and the DDict used for decompression
+ *  will be determined at decompression time, as per the dict ID in the frame.
+ *  The memory for the table is allocated on the first call to refDDict, and can be
+ *  freed with ZSTD_freeDCtx().
+ *
+ * @result : 0, or an error code (which can be tested with ZSTD_isError()).
+ *  Note 1 : Currently, only one dictionary can be managed.
+ *           Referencing a new dictionary effectively "discards" any previous one.
+ *  Special: referencing a NULL DDict means "return to no-dictionary mode".
+ *  Note 2 : DDict is just referenced, its lifetime must outlive its usage from DCtx.
+ */
+ZSTDLIB_API size_t ZSTD_DCtx_refDDict(ZSTD_DCtx* dctx, const ZSTD_DDict* ddict);
+
+/*! ZSTD_DCtx_refPrefix() : Requires v1.4.0+
+ *  Reference a prefix (single-usage dictionary) to decompress next frame.
+ *  This is the reverse operation of ZSTD_CCtx_refPrefix(),
+ *  and must use the same prefix as the one used during compression.
+ *  Prefix is **only used once**. Reference is discarded at end of frame.
+ *  End of frame is reached when ZSTD_decompressStream() returns 0.
+ * @result : 0, or an error code (which can be tested with ZSTD_isError()).
+ *  Note 1 : Adding any prefix (including NULL) invalidates any previously set prefix or dictionary
+ *  Note 2 : Prefix buffer is referenced. It **must** outlive decompression.
+ *           Prefix buffer must remain unmodified up to the end of frame,
+ *           reached when ZSTD_decompressStream() returns 0.
+ *  Note 3 : By default, the prefix is treated as raw content (ZSTD_dct_rawContent).
+ *           Use ZSTD_CCtx_refPrefix_advanced() to alter dictMode (Experimental section)
+ *  Note 4 : Referencing a raw content prefix has almost no cpu nor memory cost.
+ *           A full dictionary is more costly, as it requires building tables.
+ */
+ZSTDLIB_API size_t ZSTD_DCtx_refPrefix(ZSTD_DCtx* dctx,
+                                 const void* prefix, size_t prefixSize);
+
+/* ===   Memory management   === */
+
+/*! ZSTD_sizeof_*() : Requires v1.4.0+
+ *  These functions give the _current_ memory usage of selected object.
+ *  Note that object memory usage can evolve (increase or decrease) over time. */
+ZSTDLIB_API size_t ZSTD_sizeof_CCtx(const ZSTD_CCtx* cctx);
+ZSTDLIB_API size_t ZSTD_sizeof_DCtx(const ZSTD_DCtx* dctx);
+ZSTDLIB_API size_t ZSTD_sizeof_CStream(const ZSTD_CStream* zcs);
+ZSTDLIB_API size_t ZSTD_sizeof_DStream(const ZSTD_DStream* zds);
+ZSTDLIB_API size_t ZSTD_sizeof_CDict(const ZSTD_CDict* cdict);
+ZSTDLIB_API size_t ZSTD_sizeof_DDict(const ZSTD_DDict* ddict);
+
+#endif  /* ZSTD_H_235446 */
+
+
+/* **************************************************************************************
+ *   ADVANCED AND EXPERIMENTAL FUNCTIONS
+ ****************************************************************************************
+ * The definitions in the following section are considered experimental.
+ * They are provided for advanced scenarios.
+ * They should never be used with a dynamic library, as prototypes may change in the future.
+ * Use them only in association with static linking.
+ * ***************************************************************************************/
+
+#if defined(ZSTD_STATIC_LINKING_ONLY) && !defined(ZSTD_H_ZSTD_STATIC_LINKING_ONLY)
+#define ZSTD_H_ZSTD_STATIC_LINKING_ONLY
+
+/* Deprecation warnings :
+ * Should these warnings be a problem, it is generally possible to disable them,
+ * typically with -Wno-deprecated-declarations for gcc or _CRT_SECURE_NO_WARNINGS in Visual.
+ * Otherwise, it's also possible to define ZSTD_DISABLE_DEPRECATE_WARNINGS.
+ */
+#ifdef ZSTD_DISABLE_DEPRECATE_WARNINGS
+#  define ZSTD_DEPRECATED(message) ZSTDLIB_API  /* disable deprecation warnings */
+#else
+#  if defined (__cplusplus) && (__cplusplus >= 201402) /* C++14 or greater */
+#    define ZSTD_DEPRECATED(message) [[deprecated(message)]] ZSTDLIB_API
+#  elif (defined(GNUC) && (GNUC > 4 || (GNUC == 4 && GNUC_MINOR >= 5))) || defined(__clang__)
+#    define ZSTD_DEPRECATED(message) ZSTDLIB_API __attribute__((deprecated(message)))
+#  elif defined(__GNUC__) && (__GNUC__ >= 3)
+#    define ZSTD_DEPRECATED(message) ZSTDLIB_API __attribute__((deprecated))
+#  elif defined(_MSC_VER)
+#    define ZSTD_DEPRECATED(message) ZSTDLIB_API __declspec(deprecated(message))
+#  else
+#    pragma message("WARNING: You need to implement ZSTD_DEPRECATED for this compiler")
+#    define ZSTD_DEPRECATED(message) ZSTDLIB_API
+#  endif
+#endif /* ZSTD_DISABLE_DEPRECATE_WARNINGS */
+
+/****************************************************************************************
+ *   experimental API (static linking only)
+ ****************************************************************************************
+ * The following symbols and constants
+ * are not planned to join "stable API" status in the near future.
+ * They can still change in future versions.
+ * Some of them are planned to remain in the static_only section indefinitely.
+ * Some of them might be removed in the future (especially when redundant with existing stable functions)
+ * ***************************************************************************************/
+
+#define ZSTD_FRAMEHEADERSIZE_PREFIX(format) ((format) == ZSTD_f_zstd1 ? 5 : 1)   /* minimum input size required to query frame header size */
+#define ZSTD_FRAMEHEADERSIZE_MIN(format)    ((format) == ZSTD_f_zstd1 ? 6 : 2)
+#define ZSTD_FRAMEHEADERSIZE_MAX   18   /* can be useful for static allocation */
+#define ZSTD_SKIPPABLEHEADERSIZE    8
+
+/* compression parameter bounds */
+#define ZSTD_WINDOWLOG_MAX_32    30
+#define ZSTD_WINDOWLOG_MAX_64    31
+#define ZSTD_WINDOWLOG_MAX     ((int)(sizeof(size_t) == 4 ? ZSTD_WINDOWLOG_MAX_32 : ZSTD_WINDOWLOG_MAX_64))
+#define ZSTD_WINDOWLOG_MIN       10
+#define ZSTD_HASHLOG_MAX       ((ZSTD_WINDOWLOG_MAX < 30) ? ZSTD_WINDOWLOG_MAX : 30)
+#define ZSTD_HASHLOG_MIN          6
+#define ZSTD_CHAINLOG_MAX_32     29
+#define ZSTD_CHAINLOG_MAX_64     30
+#define ZSTD_CHAINLOG_MAX      ((int)(sizeof(size_t) == 4 ? ZSTD_CHAINLOG_MAX_32 : ZSTD_CHAINLOG_MAX_64))
+#define ZSTD_CHAINLOG_MIN        ZSTD_HASHLOG_MIN
+#define ZSTD_SEARCHLOG_MAX      (ZSTD_WINDOWLOG_MAX-1)
+#define ZSTD_SEARCHLOG_MIN        1
+#define ZSTD_MINMATCH_MAX         7   /* only for ZSTD_fast, other strategies are limited to 6 */
+#define ZSTD_MINMATCH_MIN         3   /* only for ZSTD_btopt+, faster strategies are limited to 4 */
+#define ZSTD_TARGETLENGTH_MAX    ZSTD_BLOCKSIZE_MAX
+#define ZSTD_TARGETLENGTH_MIN     0   /* note : comparing this constant to an unsigned results in a tautological test */
+#define ZSTD_STRATEGY_MIN        ZSTD_fast
+#define ZSTD_STRATEGY_MAX        ZSTD_btultra2
+
+
+#define ZSTD_OVERLAPLOG_MIN       0
+#define ZSTD_OVERLAPLOG_MAX       9
+
+#define ZSTD_WINDOWLOG_LIMIT_DEFAULT 27   /* by default, the streaming decoder will refuse any frame
+                                           * requiring larger than (1<<ZSTD_WINDOWLOG_LIMIT_DEFAULT) window size,
+                                           * to preserve host's memory from unreasonable requirements.
+                                           * This limit can be overridden using ZSTD_DCtx_setParameter(,ZSTD_d_windowLogMax,).
+                                           * The limit does not apply for one-pass decoders (such as ZSTD_decompress()), since no additional memory is allocated */
+
+
+/* LDM parameter bounds */
+#define ZSTD_LDM_HASHLOG_MIN      ZSTD_HASHLOG_MIN
+#define ZSTD_LDM_HASHLOG_MAX      ZSTD_HASHLOG_MAX
+#define ZSTD_LDM_MINMATCH_MIN        4
+#define ZSTD_LDM_MINMATCH_MAX     4096
+#define ZSTD_LDM_BUCKETSIZELOG_MIN   1
+#define ZSTD_LDM_BUCKETSIZELOG_MAX   8
+#define ZSTD_LDM_HASHRATELOG_MIN     0
+#define ZSTD_LDM_HASHRATELOG_MAX (ZSTD_WINDOWLOG_MAX - ZSTD_HASHLOG_MIN)
+
+/* Advanced parameter bounds */
+#define ZSTD_TARGETCBLOCKSIZE_MIN   64
+#define ZSTD_TARGETCBLOCKSIZE_MAX   ZSTD_BLOCKSIZE_MAX
+#define ZSTD_SRCSIZEHINT_MIN        0
+#define ZSTD_SRCSIZEHINT_MAX        INT_MAX
+
+/* internal */
+#define ZSTD_HASHLOG3_MAX           17
+
+
+/* ---  Advanced types  --- */
+
+typedef struct ZSTD_CCtx_params_s ZSTD_CCtx_params;
+
+typedef struct {
+    unsigned int offset;      /* The offset of the match. (NOT the same as the offset code)
+                               * If offset == 0 and matchLength == 0, this sequence represents the last
+                               * literals in the block of litLength size.
+                               */
+
+    unsigned int litLength;   /* Literal length of the sequence. */
+    unsigned int matchLength; /* Match length of the sequence. */
+
+                              /* Note: Users of this API may provide a sequence with matchLength == litLength == offset == 0.
+                               * In this case, we will treat the sequence as a marker for a block boundary.
+                               */
+
+    unsigned int rep;         /* Represents which repeat offset is represented by the field 'offset'.
+                               * Ranges from [0, 3].
+                               *
+                               * Repeat offsets are essentially previous offsets from previous sequences sorted in
+                               * recency order. For more detail, see doc/zstd_compression_format.md
+                               *
+                               * If rep == 0, then 'offset' does not contain a repeat offset.
+                               * If rep > 0:
+                               *  If litLength != 0:
+                               *      rep == 1 --> offset == repeat_offset_1
+                               *      rep == 2 --> offset == repeat_offset_2
+                               *      rep == 3 --> offset == repeat_offset_3
+                               *  If litLength == 0:
+                               *      rep == 1 --> offset == repeat_offset_2
+                               *      rep == 2 --> offset == repeat_offset_3
+                               *      rep == 3 --> offset == repeat_offset_1 - 1
+                               *
+                               * Note: This field is optional. ZSTD_generateSequences() will calculate the value of
+                               * 'rep', but repeat offsets do not necessarily need to be calculated from an external
+                               * sequence provider's perspective. For example, ZSTD_compressSequences() does not
+                               * use this 'rep' field at all (as of now).
+                               */
+} ZSTD_Sequence;
+
+typedef struct {
+    unsigned windowLog;       /**< largest match distance : larger == more compression, more memory needed during decompression */
+    unsigned chainLog;        /**< fully searched segment : larger == more compression, slower, more memory (useless for fast) */
+    unsigned hashLog;         /**< dispatch table : larger == faster, more memory */
+    unsigned searchLog;       /**< nb of searches : larger == more compression, slower */
+    unsigned minMatch;        /**< match length searched : larger == faster decompression, sometimes less compression */
+    unsigned targetLength;    /**< acceptable match size for optimal parser (only) : larger == more compression, slower */
+    ZSTD_strategy strategy;   /**< see ZSTD_strategy definition above */
+} ZSTD_compressionParameters;
+
+typedef struct {
+    int contentSizeFlag; /**< 1: content size will be in frame header (when known) */
+    int checksumFlag;    /**< 1: generate a 32-bits checksum using XXH64 algorithm at end of frame, for error detection */
+    int noDictIDFlag;    /**< 1: no dictID will be saved into frame header (dictID is only useful for dictionary compression) */
+} ZSTD_frameParameters;
+
+typedef struct {
+    ZSTD_compressionParameters cParams;
+    ZSTD_frameParameters fParams;
+} ZSTD_parameters;
+
+typedef enum {
+    ZSTD_dct_auto = 0,       /* dictionary is "full" when starting with ZSTD_MAGIC_DICTIONARY, otherwise it is "rawContent" */
+    ZSTD_dct_rawContent = 1, /* ensures dictionary is always loaded as rawContent, even if it starts with ZSTD_MAGIC_DICTIONARY */
+    ZSTD_dct_fullDict = 2    /* refuses to load a dictionary if it does not respect Zstandard's specification, starting with ZSTD_MAGIC_DICTIONARY */
+} ZSTD_dictContentType_e;
+
+typedef enum {
+    ZSTD_dlm_byCopy = 0,  /**< Copy dictionary content internally */
+    ZSTD_dlm_byRef = 1    /**< Reference dictionary content -- the dictionary buffer must outlive its users. */
+} ZSTD_dictLoadMethod_e;
+
+typedef enum {
+    ZSTD_f_zstd1 = 0,           /* zstd frame format, specified in zstd_compression_format.md (default) */
+    ZSTD_f_zstd1_magicless = 1  /* Variant of zstd frame format, without initial 4-bytes magic number.
+                                 * Useful to save 4 bytes per generated frame.
+                                 * Decoder cannot recognise automatically this format, requiring this instruction. */
+} ZSTD_format_e;
+
+typedef enum {
+    /* Note: this enum controls ZSTD_d_forceIgnoreChecksum */
+    ZSTD_d_validateChecksum = 0,
+    ZSTD_d_ignoreChecksum = 1
+} ZSTD_forceIgnoreChecksum_e;
+
+typedef enum {
+    /* Note: this enum controls ZSTD_d_refMultipleDDicts */
+    ZSTD_rmd_refSingleDDict = 0,
+    ZSTD_rmd_refMultipleDDicts = 1
+} ZSTD_refMultipleDDicts_e;
+
+typedef enum {
+    /* Note: this enum and the behavior it controls are effectively internal
+     * implementation details of the compressor. They are expected to continue
+     * to evolve and should be considered only in the context of extremely
+     * advanced performance tuning.
+     *
+     * Zstd currently supports the use of a CDict in three ways:
+     *
+     * - The contents of the CDict can be copied into the working context. This
+     *   means that the compression can search both the dictionary and input
+     *   while operating on a single set of internal tables. This makes
+     *   the compression faster per-byte of input. However, the initial copy of
+     *   the CDict's tables incurs a fixed cost at the beginning of the
+     *   compression. For small compressions (< 8 KB), that copy can dominate
+     *   the cost of the compression.
+     *
+     * - The CDict's tables can be used in-place. In this model, compression is
+     *   slower per input byte, because the compressor has to search two sets of
+     *   tables. However, this model incurs no start-up cost (as long as the
+     *   working context's tables can be reused). For small inputs, this can be
+     *   faster than copying the CDict's tables.
+     *
+     * - The CDict's tables are not used at all, and instead we use the working
+     *   context alone to reload the dictionary and use params based on the source
+     *   size. See ZSTD_compress_insertDictionary() and ZSTD_compress_usingDict().
+     *   This method is effective when the dictionary sizes are very small relative
+     *   to the input size, and the input size is fairly large to begin with.
+     *
+     * Zstd has a simple internal heuristic that selects which strategy to use
+     * at the beginning of a compression. However, if experimentation shows that
+     * Zstd is making poor choices, it is possible to override that choice with
+     * this enum.
+     */
+    ZSTD_dictDefaultAttach = 0, /* Use the default heuristic. */
+    ZSTD_dictForceAttach   = 1, /* Never copy the dictionary. */
+    ZSTD_dictForceCopy     = 2, /* Always copy the dictionary. */
+    ZSTD_dictForceLoad     = 3  /* Always reload the dictionary */
+} ZSTD_dictAttachPref_e;
+
+typedef enum {
+  ZSTD_lcm_auto = 0,          /**< Automatically determine the compression mode based on the compression level.
+                               *   Negative compression levels will be uncompressed, and positive compression
+                               *   levels will be compressed. */
+  ZSTD_lcm_huffman = 1,       /**< Always attempt Huffman compression. Uncompressed literals will still be
+                               *   emitted if Huffman compression is not profitable. */
+  ZSTD_lcm_uncompressed = 2   /**< Always emit uncompressed literals. */
+} ZSTD_literalCompressionMode_e;
+
+typedef enum {
+  ZSTD_urm_auto = 0,                   /* Automatically determine whether or not we use row matchfinder */
+  ZSTD_urm_disableRowMatchFinder = 1,  /* Never use row matchfinder */
+  ZSTD_urm_enableRowMatchFinder = 2    /* Always use row matchfinder when applicable */
+} ZSTD_useRowMatchFinderMode_e;
+
+/***************************************
+*  Frame size functions
+***************************************/
+
+/*! ZSTD_findDecompressedSize() :
+ *  `src` should point to the start of a series of ZSTD encoded and/or skippable frames
+ *  `srcSize` must be the _exact_ size of this series
+ *       (i.e. there should be a frame boundary at `src + srcSize`)
+ *  @return : - decompressed size of all data in all successive frames
+ *            - if the decompressed size cannot be determined: ZSTD_CONTENTSIZE_UNKNOWN
+ *            - if an error occurred: ZSTD_CONTENTSIZE_ERROR
+ *
+ *   note 1 : decompressed size is an optional field, that may not be present, especially in streaming mode.
+ *            When `return==ZSTD_CONTENTSIZE_UNKNOWN`, data to decompress could be any size.
+ *            In which case, it's necessary to use streaming mode to decompress data.
+ *   note 2 : decompressed size is always present when compression is done with ZSTD_compress()
+ *   note 3 : decompressed size can be very large (64-bits value),
+ *            potentially larger than what local system can handle as a single memory segment.
+ *            In which case, it's necessary to use streaming mode to decompress data.
+ *   note 4 : If source is untrusted, decompressed size could be wrong or intentionally modified.
+ *            Always ensure result fits within application's authorized limits.
+ *            Each application can set its own limits.
+ *   note 5 : ZSTD_findDecompressedSize handles multiple frames, and so it must traverse the input to
+ *            read each contained frame header.  This is fast as most of the data is skipped,
+ *            however it does mean that all frame data must be present and valid. */
+ZSTDLIB_API unsigned long long ZSTD_findDecompressedSize(const void* src, size_t srcSize);
+
+/*! ZSTD_decompressBound() :
+ *  `src` should point to the start of a series of ZSTD encoded and/or skippable frames
+ *  `srcSize` must be the _exact_ size of this series
+ *       (i.e. there should be a frame boundary at `src + srcSize`)
+ *  @return : - upper-bound for the decompressed size of all data in all successive frames
+ *            - if an error occurred: ZSTD_CONTENTSIZE_ERROR
+ *
+ *  note 1  : an error can occur if `src` contains an invalid or incorrectly formatted frame.
+ *  note 2  : the upper-bound is exact when the decompressed size field is available in every ZSTD encoded frame of `src`.
+ *            in this case, `ZSTD_findDecompressedSize` and `ZSTD_decompressBound` return the same value.
+ *  note 3  : when the decompressed size field isn't available, the upper-bound for that frame is calculated by:
+ *              upper-bound = # blocks * min(128 KB, Window_Size)
+ */
+ZSTDLIB_API unsigned long long ZSTD_decompressBound(const void* src, size_t srcSize);
+
+/*! ZSTD_frameHeaderSize() :
+ *  srcSize must be >= ZSTD_FRAMEHEADERSIZE_PREFIX.
+ * @return : size of the Frame Header,
+ *           or an error code (if srcSize is too small) */
+ZSTDLIB_API size_t ZSTD_frameHeaderSize(const void* src, size_t srcSize);
+
+typedef enum {
+  ZSTD_sf_noBlockDelimiters = 0,         /* Representation of ZSTD_Sequence has no block delimiters, sequences only */
+  ZSTD_sf_explicitBlockDelimiters = 1    /* Representation of ZSTD_Sequence contains explicit block delimiters */
+} ZSTD_sequenceFormat_e;
+
+/*! ZSTD_generateSequences() :
+ * Generate sequences using ZSTD_compress2, given a source buffer.
+ *
+ * Each block will end with a dummy sequence
+ * with offset == 0, matchLength == 0, and litLength == length of last literals.
+ * litLength may be == 0, and if so, then the sequence of (of: 0 ml: 0 ll: 0)
+ * simply acts as a block delimiter.
+ *
+ * zc can be used to insert custom compression params.
+ * This function invokes ZSTD_compress2
+ *
+ * The output of this function can be fed into ZSTD_compressSequences() with CCtx
+ * setting of ZSTD_c_blockDelimiters as ZSTD_sf_explicitBlockDelimiters
+ * @return : number of sequences generated
+ */
+
+ZSTDLIB_API size_t ZSTD_generateSequences(ZSTD_CCtx* zc, ZSTD_Sequence* outSeqs,
+                                          size_t outSeqsSize, const void* src, size_t srcSize);
+
+/*! ZSTD_mergeBlockDelimiters() :
+ * Given an array of ZSTD_Sequence, remove all sequences that represent block delimiters/last literals
+ * by merging them into into the literals of the next sequence.
+ *
+ * As such, the final generated result has no explicit representation of block boundaries,
+ * and the final last literals segment is not represented in the sequences.
+ *
+ * The output of this function can be fed into ZSTD_compressSequences() with CCtx
+ * setting of ZSTD_c_blockDelimiters as ZSTD_sf_noBlockDelimiters
+ * @return : number of sequences left after merging
+ */
+ZSTDLIB_API size_t ZSTD_mergeBlockDelimiters(ZSTD_Sequence* sequences, size_t seqsSize);
+
+/*! ZSTD_compressSequences() :
+ * Compress an array of ZSTD_Sequence, generated from the original source buffer, into dst.
+ * If a dictionary is included, then the cctx should reference the dict. (see: ZSTD_CCtx_refCDict(), ZSTD_CCtx_loadDictionary(), etc.)
+ * The entire source is compressed into a single frame.
+ *
+ * The compression behavior changes based on cctx params. In particular:
+ *    If ZSTD_c_blockDelimiters == ZSTD_sf_noBlockDelimiters, the array of ZSTD_Sequence is expected to contain
+ *    no block delimiters (defined in ZSTD_Sequence). Block boundaries are roughly determined based on
+ *    the block size derived from the cctx, and sequences may be split. This is the default setting.
+ *
+ *    If ZSTD_c_blockDelimiters == ZSTD_sf_explicitBlockDelimiters, the array of ZSTD_Sequence is expected to contain
+ *    block delimiters (defined in ZSTD_Sequence). Behavior is undefined if no block delimiters are provided.
+ *
+ *    If ZSTD_c_validateSequences == 0, this function will blindly accept the sequences provided. Invalid sequences cause undefined
+ *    behavior. If ZSTD_c_validateSequences == 1, then if sequence is invalid (see doc/zstd_compression_format.md for
+ *    specifics regarding offset/matchlength requirements) then the function will bail out and return an error.
+ *
+ *    In addition to the two adjustable experimental params, there are other important cctx params.
+ *    - ZSTD_c_minMatch MUST be set as less than or equal to the smallest match generated by the match finder. It has a minimum value of ZSTD_MINMATCH_MIN.
+ *    - ZSTD_c_compressionLevel accordingly adjusts the strength of the entropy coder, as it would in typical compression.
+ *    - ZSTD_c_windowLog affects offset validation: this function will return an error at higher debug levels if a provided offset
+ *      is larger than what the spec allows for a given window log and dictionary (if present). See: doc/zstd_compression_format.md
+ *
+ * Note: Repcodes are, as of now, always re-calculated within this function, so ZSTD_Sequence::rep is unused.
+ * Note 2: Once we integrate ability to ingest repcodes, the explicit block delims mode must respect those repcodes exactly,
+ *         and cannot emit an RLE block that disagrees with the repcode history
+ * @return : final compressed size or a ZSTD error.
+ */
+ZSTDLIB_API size_t ZSTD_compressSequences(ZSTD_CCtx* const cctx, void* dst, size_t dstSize,
+                                  const ZSTD_Sequence* inSeqs, size_t inSeqsSize,
+                                  const void* src, size_t srcSize);
+
+
+/*! ZSTD_writeSkippableFrame() :
+ * Generates a zstd skippable frame containing data given by src, and writes it to dst buffer.
+ *
+ * Skippable frames begin with a a 4-byte magic number. There are 16 possible choices of magic number,
+ * ranging from ZSTD_MAGIC_SKIPPABLE_START to ZSTD_MAGIC_SKIPPABLE_START+15.
+ * As such, the parameter magicVariant controls the exact skippable frame magic number variant used, so
+ * the magic number used will be ZSTD_MAGIC_SKIPPABLE_START + magicVariant.
+ *
+ * Returns an error if destination buffer is not large enough, if the source size is not representable
+ * with a 4-byte unsigned int, or if the parameter magicVariant is greater than 15 (and therefore invalid).
+ *
+ * @return : number of bytes written or a ZSTD error.
+ */
+ZSTDLIB_API size_t ZSTD_writeSkippableFrame(void* dst, size_t dstCapacity,
+                                            const void* src, size_t srcSize, unsigned magicVariant);
+
+
+/***************************************
+*  Memory management
+***************************************/
+
+/*! ZSTD_estimate*() :
+ *  These functions make it possible to estimate memory usage
+ *  of a future {D,C}Ctx, before its creation.
+ *
+ *  ZSTD_estimateCCtxSize() will provide a memory budget large enough
+ *  for any compression level up to selected one.
+ *  Note : Unlike ZSTD_estimateCStreamSize*(), this estimate
+ *         does not include space for a window buffer.
+ *         Therefore, the estimation is only guaranteed for single-shot compressions, not streaming.
+ *  The estimate will assume the input may be arbitrarily large,
+ *  which is the worst case.
+ *
+ *  When srcSize can be bound by a known and rather "small" value,
+ *  this fact can be used to provide a tighter estimation
+ *  because the CCtx compression context will need less memory.
+ *  This tighter estimation can be provided by more advanced functions
+ *  ZSTD_estimateCCtxSize_usingCParams(), which can be used in tandem with ZSTD_getCParams(),
+ *  and ZSTD_estimateCCtxSize_usingCCtxParams(), which can be used in tandem with ZSTD_CCtxParams_setParameter().
+ *  Both can be used to estimate memory using custom compression parameters and arbitrary srcSize limits.
+ *
+ *  Note 2 : only single-threaded compression is supported.
+ *  ZSTD_estimateCCtxSize_usingCCtxParams() will return an error code if ZSTD_c_nbWorkers is >= 1.
+ */
+ZSTDLIB_API size_t ZSTD_estimateCCtxSize(int compressionLevel);
+ZSTDLIB_API size_t ZSTD_estimateCCtxSize_usingCParams(ZSTD_compressionParameters cParams);
+ZSTDLIB_API size_t ZSTD_estimateCCtxSize_usingCCtxParams(const ZSTD_CCtx_params* params);
+ZSTDLIB_API size_t ZSTD_estimateDCtxSize(void);
+
+/*! ZSTD_estimateCStreamSize() :
+ *  ZSTD_estimateCStreamSize() will provide a budget large enough for any compression level up to selected one.
+ *  It will also consider src size to be arbitrarily "large", which is worst case.
+ *  If srcSize is known to always be small, ZSTD_estimateCStreamSize_usingCParams() can provide a tighter estimation.
+ *  ZSTD_estimateCStreamSize_usingCParams() can be used in tandem with ZSTD_getCParams() to create cParams from compressionLevel.
+ *  ZSTD_estimateCStreamSize_usingCCtxParams() can be used in tandem with ZSTD_CCtxParams_setParameter(). Only single-threaded compression is supported. This function will return an error code if ZSTD_c_nbWorkers is >= 1.
+ *  Note : CStream size estimation is only correct for single-threaded compression.
+ *  ZSTD_DStream memory budget depends on window Size.
+ *  This information can be passed manually, using ZSTD_estimateDStreamSize,
+ *  or deducted from a valid frame Header, using ZSTD_estimateDStreamSize_fromFrame();
+ *  Note : if streaming is init with function ZSTD_init?Stream_usingDict(),
+ *         an internal ?Dict will be created, which additional size is not estimated here.
+ *         In this case, get total size by adding ZSTD_estimate?DictSize */
+ZSTDLIB_API size_t ZSTD_estimateCStreamSize(int compressionLevel);
+ZSTDLIB_API size_t ZSTD_estimateCStreamSize_usingCParams(ZSTD_compressionParameters cParams);
+ZSTDLIB_API size_t ZSTD_estimateCStreamSize_usingCCtxParams(const ZSTD_CCtx_params* params);
+ZSTDLIB_API size_t ZSTD_estimateDStreamSize(size_t windowSize);
+ZSTDLIB_API size_t ZSTD_estimateDStreamSize_fromFrame(const void* src, size_t srcSize);
+
+/*! ZSTD_estimate?DictSize() :
+ *  ZSTD_estimateCDictSize() will bet that src size is relatively "small", and content is copied, like ZSTD_createCDict().
+ *  ZSTD_estimateCDictSize_advanced() makes it possible to control compression parameters precisely, like ZSTD_createCDict_advanced().
+ *  Note : dictionaries created by reference (`ZSTD_dlm_byRef`) are logically smaller.
+ */
+ZSTDLIB_API size_t ZSTD_estimateCDictSize(size_t dictSize, int compressionLevel);
+ZSTDLIB_API size_t ZSTD_estimateCDictSize_advanced(size_t dictSize, ZSTD_compressionParameters cParams, ZSTD_dictLoadMethod_e dictLoadMethod);
+ZSTDLIB_API size_t ZSTD_estimateDDictSize(size_t dictSize, ZSTD_dictLoadMethod_e dictLoadMethod);
+
+/*! ZSTD_initStatic*() :
+ *  Initialize an object using a pre-allocated fixed-size buffer.
+ *  workspace: The memory area to emplace the object into.
+ *             Provided pointer *must be 8-bytes aligned*.
+ *             Buffer must outlive object.
+ *  workspaceSize: Use ZSTD_estimate*Size() to determine
+ *                 how large workspace must be to support target scenario.
+ * @return : pointer to object (same address as workspace, just different type),
+ *           or NULL if error (size too small, incorrect alignment, etc.)
+ *  Note : zstd will never resize nor malloc() when using a static buffer.
+ *         If the object requires more memory than available,
+ *         zstd will just error out (typically ZSTD_error_memory_allocation).
+ *  Note 2 : there is no corresponding "free" function.
+ *           Since workspace is allocated externally, it must be freed externally too.
+ *  Note 3 : cParams : use ZSTD_getCParams() to convert a compression level
+ *           into its associated cParams.
+ *  Limitation 1 : currently not compatible with internal dictionary creation, triggered by
+ *                 ZSTD_CCtx_loadDictionary(), ZSTD_initCStream_usingDict() or ZSTD_initDStream_usingDict().
+ *  Limitation 2 : static cctx currently not compatible with multi-threading.
+ *  Limitation 3 : static dctx is incompatible with legacy support.
+ */
+ZSTDLIB_API ZSTD_CCtx*    ZSTD_initStaticCCtx(void* workspace, size_t workspaceSize);
+ZSTDLIB_API ZSTD_CStream* ZSTD_initStaticCStream(void* workspace, size_t workspaceSize);    /**< same as ZSTD_initStaticCCtx() */
+
+ZSTDLIB_API ZSTD_DCtx*    ZSTD_initStaticDCtx(void* workspace, size_t workspaceSize);
+ZSTDLIB_API ZSTD_DStream* ZSTD_initStaticDStream(void* workspace, size_t workspaceSize);    /**< same as ZSTD_initStaticDCtx() */
+
+ZSTDLIB_API const ZSTD_CDict* ZSTD_initStaticCDict(
+                                        void* workspace, size_t workspaceSize,
+                                        const void* dict, size_t dictSize,
+                                        ZSTD_dictLoadMethod_e dictLoadMethod,
+                                        ZSTD_dictContentType_e dictContentType,
+                                        ZSTD_compressionParameters cParams);
+
+ZSTDLIB_API const ZSTD_DDict* ZSTD_initStaticDDict(
+                                        void* workspace, size_t workspaceSize,
+                                        const void* dict, size_t dictSize,
+                                        ZSTD_dictLoadMethod_e dictLoadMethod,
+                                        ZSTD_dictContentType_e dictContentType);
+
+
+/*! Custom memory allocation :
+ *  These prototypes make it possible to pass your own allocation/free functions.
+ *  ZSTD_customMem is provided at creation time, using ZSTD_create*_advanced() variants listed below.
+ *  All allocation/free operations will be completed using these custom variants instead of regular <stdlib.h> ones.
+ */
+typedef void* (*ZSTD_allocFunction) (void* opaque, size_t size);
+typedef void  (*ZSTD_freeFunction) (void* opaque, void* address);
+typedef struct { ZSTD_allocFunction customAlloc; ZSTD_freeFunction customFree; void* opaque; } ZSTD_customMem;
+static
+#ifdef __GNUC__
+__attribute__((__unused__))
+#endif
+ZSTD_customMem const ZSTD_defaultCMem = { NULL, NULL, NULL };  /**< this constant defers to stdlib's functions */
+
+ZSTDLIB_API ZSTD_CCtx*    ZSTD_createCCtx_advanced(ZSTD_customMem customMem);
+ZSTDLIB_API ZSTD_CStream* ZSTD_createCStream_advanced(ZSTD_customMem customMem);
+ZSTDLIB_API ZSTD_DCtx*    ZSTD_createDCtx_advanced(ZSTD_customMem customMem);
+ZSTDLIB_API ZSTD_DStream* ZSTD_createDStream_advanced(ZSTD_customMem customMem);
+
+ZSTDLIB_API ZSTD_CDict* ZSTD_createCDict_advanced(const void* dict, size_t dictSize,
+                                                  ZSTD_dictLoadMethod_e dictLoadMethod,
+                                                  ZSTD_dictContentType_e dictContentType,
+                                                  ZSTD_compressionParameters cParams,
+                                                  ZSTD_customMem customMem);
+
+/* ! Thread pool :
+ * These prototypes make it possible to share a thread pool among multiple compression contexts.
+ * This can limit resources for applications with multiple threads where each one uses
+ * a threaded compression mode (via ZSTD_c_nbWorkers parameter).
+ * ZSTD_createThreadPool creates a new thread pool with a given number of threads.
+ * Note that the lifetime of such pool must exist while being used.
+ * ZSTD_CCtx_refThreadPool assigns a thread pool to a context (use NULL argument value
+ * to use an internal thread pool).
+ * ZSTD_freeThreadPool frees a thread pool, accepts NULL pointer.
+ */
+typedef struct POOL_ctx_s ZSTD_threadPool;
+ZSTDLIB_API ZSTD_threadPool* ZSTD_createThreadPool(size_t numThreads);
+ZSTDLIB_API void ZSTD_freeThreadPool (ZSTD_threadPool* pool);  /* accept NULL pointer */
+ZSTDLIB_API size_t ZSTD_CCtx_refThreadPool(ZSTD_CCtx* cctx, ZSTD_threadPool* pool);
+
+
+/*
+ * This API is temporary and is expected to change or disappear in the future!
+ */
+ZSTDLIB_API ZSTD_CDict* ZSTD_createCDict_advanced2(
+    const void* dict, size_t dictSize,
+    ZSTD_dictLoadMethod_e dictLoadMethod,
+    ZSTD_dictContentType_e dictContentType,
+    const ZSTD_CCtx_params* cctxParams,
+    ZSTD_customMem customMem);
+
+ZSTDLIB_API ZSTD_DDict* ZSTD_createDDict_advanced(
+    const void* dict, size_t dictSize,
+    ZSTD_dictLoadMethod_e dictLoadMethod,
+    ZSTD_dictContentType_e dictContentType,
+    ZSTD_customMem customMem);
+
+
+/***************************************
+*  Advanced compression functions
+***************************************/
+
+/*! ZSTD_createCDict_byReference() :
+ *  Create a digested dictionary for compression
+ *  Dictionary content is just referenced, not duplicated.
+ *  As a consequence, `dictBuffer` **must** outlive CDict,
+ *  and its content must remain unmodified throughout the lifetime of CDict.
+ *  note: equivalent to ZSTD_createCDict_advanced(), with dictLoadMethod==ZSTD_dlm_byRef */
+ZSTDLIB_API ZSTD_CDict* ZSTD_createCDict_byReference(const void* dictBuffer, size_t dictSize, int compressionLevel);
+
+/*! ZSTD_getCParams() :
+ * @return ZSTD_compressionParameters structure for a selected compression level and estimated srcSize.
+ * `estimatedSrcSize` value is optional, select 0 if not known */
+ZSTDLIB_API ZSTD_compressionParameters ZSTD_getCParams(int compressionLevel, unsigned long long estimatedSrcSize, size_t dictSize);
+
+/*! ZSTD_getParams() :
+ *  same as ZSTD_getCParams(), but @return a full `ZSTD_parameters` object instead of sub-component `ZSTD_compressionParameters`.
+ *  All fields of `ZSTD_frameParameters` are set to default : contentSize=1, checksum=0, noDictID=0 */
+ZSTDLIB_API ZSTD_parameters ZSTD_getParams(int compressionLevel, unsigned long long estimatedSrcSize, size_t dictSize);
+
+/*! ZSTD_checkCParams() :
+ *  Ensure param values remain within authorized range.
+ * @return 0 on success, or an error code (can be checked with ZSTD_isError()) */
+ZSTDLIB_API size_t ZSTD_checkCParams(ZSTD_compressionParameters params);
+
+/*! ZSTD_adjustCParams() :
+ *  optimize params for a given `srcSize` and `dictSize`.
+ * `srcSize` can be unknown, in which case use ZSTD_CONTENTSIZE_UNKNOWN.
+ * `dictSize` must be `0` when there is no dictionary.
+ *  cPar can be invalid : all parameters will be clamped within valid range in the @return struct.
+ *  This function never fails (wide contract) */
+ZSTDLIB_API ZSTD_compressionParameters ZSTD_adjustCParams(ZSTD_compressionParameters cPar, unsigned long long srcSize, size_t dictSize);
+
+/*! ZSTD_compress_advanced() :
+ *  Note : this function is now DEPRECATED.
+ *         It can be replaced by ZSTD_compress2(), in combination with ZSTD_CCtx_setParameter() and other parameter setters.
+ *  This prototype will generate compilation warnings. */
+ZSTD_DEPRECATED("use ZSTD_compress2")
+size_t ZSTD_compress_advanced(ZSTD_CCtx* cctx,
+                                          void* dst, size_t dstCapacity,
+                                    const void* src, size_t srcSize,
+                                    const void* dict,size_t dictSize,
+                                          ZSTD_parameters params);
+
+/*! ZSTD_compress_usingCDict_advanced() :
+ *  Note : this function is now DEPRECATED.
+ *         It can be replaced by ZSTD_compress2(), in combination with ZSTD_CCtx_loadDictionary() and other parameter setters.
+ *  This prototype will generate compilation warnings. */
+ZSTD_DEPRECATED("use ZSTD_compress2 with ZSTD_CCtx_loadDictionary")
+size_t ZSTD_compress_usingCDict_advanced(ZSTD_CCtx* cctx,
+                                              void* dst, size_t dstCapacity,
+                                        const void* src, size_t srcSize,
+                                        const ZSTD_CDict* cdict,
+                                              ZSTD_frameParameters fParams);
+
+
+/*! ZSTD_CCtx_loadDictionary_byReference() :
+ *  Same as ZSTD_CCtx_loadDictionary(), but dictionary content is referenced, instead of being copied into CCtx.
+ *  It saves some memory, but also requires that `dict` outlives its usage within `cctx` */
+ZSTDLIB_API size_t ZSTD_CCtx_loadDictionary_byReference(ZSTD_CCtx* cctx, const void* dict, size_t dictSize);
+
+/*! ZSTD_CCtx_loadDictionary_advanced() :
+ *  Same as ZSTD_CCtx_loadDictionary(), but gives finer control over
+ *  how to load the dictionary (by copy ? by reference ?)
+ *  and how to interpret it (automatic ? force raw mode ? full mode only ?) */
+ZSTDLIB_API size_t ZSTD_CCtx_loadDictionary_advanced(ZSTD_CCtx* cctx, const void* dict, size_t dictSize, ZSTD_dictLoadMethod_e dictLoadMethod, ZSTD_dictContentType_e dictContentType);
+
+/*! ZSTD_CCtx_refPrefix_advanced() :
+ *  Same as ZSTD_CCtx_refPrefix(), but gives finer control over
+ *  how to interpret prefix content (automatic ? force raw mode (default) ? full mode only ?) */
+ZSTDLIB_API size_t ZSTD_CCtx_refPrefix_advanced(ZSTD_CCtx* cctx, const void* prefix, size_t prefixSize, ZSTD_dictContentType_e dictContentType);
+
+/* ===   experimental parameters   === */
+/* these parameters can be used with ZSTD_setParameter()
+ * they are not guaranteed to remain supported in the future */
+
+ /* Enables rsyncable mode,
+  * which makes compressed files more rsync friendly
+  * by adding periodic synchronization points to the compressed data.
+  * The target average block size is ZSTD_c_jobSize / 2.
+  * It's possible to modify the job size to increase or decrease
+  * the granularity of the synchronization point.
+  * Once the jobSize is smaller than the window size,
+  * it will result in compression ratio degradation.
+  * NOTE 1: rsyncable mode only works when multithreading is enabled.
+  * NOTE 2: rsyncable performs poorly in combination with long range mode,
+  * since it will decrease the effectiveness of synchronization points,
+  * though mileage may vary.
+  * NOTE 3: Rsyncable mode limits maximum compression speed to ~400 MB/s.
+  * If the selected compression level is already running significantly slower,
+  * the overall speed won't be significantly impacted.
+  */
+ #define ZSTD_c_rsyncable ZSTD_c_experimentalParam1
+
+/* Select a compression format.
+ * The value must be of type ZSTD_format_e.
+ * See ZSTD_format_e enum definition for details */
+#define ZSTD_c_format ZSTD_c_experimentalParam2
+
+/* Force back-reference distances to remain < windowSize,
+ * even when referencing into Dictionary content (default:0) */
+#define ZSTD_c_forceMaxWindow ZSTD_c_experimentalParam3
+
+/* Controls whether the contents of a CDict
+ * are used in place, or copied into the working context.
+ * Accepts values from the ZSTD_dictAttachPref_e enum.
+ * See the comments on that enum for an explanation of the feature. */
+#define ZSTD_c_forceAttachDict ZSTD_c_experimentalParam4
+
+/* Controls how the literals are compressed (default is auto).
+ * The value must be of type ZSTD_literalCompressionMode_e.
+ * See ZSTD_literalCompressionMode_e enum definition for details.
+ */
+#define ZSTD_c_literalCompressionMode ZSTD_c_experimentalParam5
+
+/* Tries to fit compressed block size to be around targetCBlockSize.
+ * No target when targetCBlockSize == 0.
+ * There is no guarantee on compressed block size (default:0) */
+#define ZSTD_c_targetCBlockSize ZSTD_c_experimentalParam6
+
+/* User's best guess of source size.
+ * Hint is not valid when srcSizeHint == 0.
+ * There is no guarantee that hint is close to actual source size,
+ * but compression ratio may regress significantly if guess considerably underestimates */
+#define ZSTD_c_srcSizeHint ZSTD_c_experimentalParam7
+
+/* Controls whether the new and experimental "dedicated dictionary search
+ * structure" can be used. This feature is still rough around the edges, be
+ * prepared for surprising behavior!
+ *
+ * How to use it:
+ *
+ * When using a CDict, whether to use this feature or not is controlled at
+ * CDict creation, and it must be set in a CCtxParams set passed into that
+ * construction (via ZSTD_createCDict_advanced2()). A compression will then
+ * use the feature or not based on how the CDict was constructed; the value of
+ * this param, set in the CCtx, will have no effect.
+ *
+ * However, when a dictionary buffer is passed into a CCtx, such as via
+ * ZSTD_CCtx_loadDictionary(), this param can be set on the CCtx to control
+ * whether the CDict that is created internally can use the feature or not.
+ *
+ * What it does:
+ *
+ * Normally, the internal data structures of the CDict are analogous to what
+ * would be stored in a CCtx after compressing the contents of a dictionary.
+ * To an approximation, a compression using a dictionary can then use those
+ * data structures to simply continue what is effectively a streaming
+ * compression where the simulated compression of the dictionary left off.
+ * Which is to say, the search structures in the CDict are normally the same
+ * format as in the CCtx.
+ *
+ * It is possible to do better, since the CDict is not like a CCtx: the search
+ * structures are written once during CDict creation, and then are only read
+ * after that, while the search structures in the CCtx are both read and
+ * written as the compression goes along. This means we can choose a search
+ * structure for the dictionary that is read-optimized.
+ *
+ * This feature enables the use of that different structure.
+ *
+ * Note that some of the members of the ZSTD_compressionParameters struct have
+ * different semantics and constraints in the dedicated search structure. It is
+ * highly recommended that you simply set a compression level in the CCtxParams
+ * you pass into the CDict creation call, and avoid messing with the cParams
+ * directly.
+ *
+ * Effects:
+ *
+ * This will only have any effect when the selected ZSTD_strategy
+ * implementation supports this feature. Currently, that's limited to
+ * ZSTD_greedy, ZSTD_lazy, and ZSTD_lazy2.
+ *
+ * Note that this means that the CDict tables can no longer be copied into the
+ * CCtx, so the dict attachment mode ZSTD_dictForceCopy will no longer be
+ * useable. The dictionary can only be attached or reloaded.
+ *
+ * In general, you should expect compression to be faster--sometimes very much
+ * so--and CDict creation to be slightly slower. Eventually, we will probably
+ * make this mode the default.
+ */
+#define ZSTD_c_enableDedicatedDictSearch ZSTD_c_experimentalParam8
+
+/* ZSTD_c_stableInBuffer
+ * Experimental parameter.
+ * Default is 0 == disabled. Set to 1 to enable.
+ *
+ * Tells the compressor that the ZSTD_inBuffer will ALWAYS be the same
+ * between calls, except for the modifications that zstd makes to pos (the
+ * caller must not modify pos). This is checked by the compressor, and
+ * compression will fail if it ever changes. This means the only flush
+ * mode that makes sense is ZSTD_e_end, so zstd will error if ZSTD_e_end
+ * is not used. The data in the ZSTD_inBuffer in the range [src, src + pos)
+ * MUST not be modified during compression or you will get data corruption.
+ *
+ * When this flag is enabled zstd won't allocate an input window buffer,
+ * because the user guarantees it can reference the ZSTD_inBuffer until
+ * the frame is complete. But, it will still allocate an output buffer
+ * large enough to fit a block (see ZSTD_c_stableOutBuffer). This will also
+ * avoid the memcpy() from the input buffer to the input window buffer.
+ *
+ * NOTE: ZSTD_compressStream2() will error if ZSTD_e_end is not used.
+ * That means this flag cannot be used with ZSTD_compressStream().
+ *
+ * NOTE: So long as the ZSTD_inBuffer always points to valid memory, using
+ * this flag is ALWAYS memory safe, and will never access out-of-bounds
+ * memory. However, compression WILL fail if you violate the preconditions.
+ *
+ * WARNING: The data in the ZSTD_inBuffer in the range [dst, dst + pos) MUST
+ * not be modified during compression or you will get data corruption. This
+ * is because zstd needs to reference data in the ZSTD_inBuffer to find
+ * matches. Normally zstd maintains its own window buffer for this purpose,
+ * but passing this flag tells zstd to use the user provided buffer.
+ */
+#define ZSTD_c_stableInBuffer ZSTD_c_experimentalParam9
+
+/* ZSTD_c_stableOutBuffer
+ * Experimental parameter.
+ * Default is 0 == disabled. Set to 1 to enable.
+ *
+ * Tells he compressor that the ZSTD_outBuffer will not be resized between
+ * calls. Specifically: (out.size - out.pos) will never grow. This gives the
+ * compressor the freedom to say: If the compressed data doesn't fit in the
+ * output buffer then return ZSTD_error_dstSizeTooSmall. This allows us to
+ * always decompress directly into the output buffer, instead of decompressing
+ * into an internal buffer and copying to the output buffer.
+ *
+ * When this flag is enabled zstd won't allocate an output buffer, because
+ * it can write directly to the ZSTD_outBuffer. It will still allocate the
+ * input window buffer (see ZSTD_c_stableInBuffer).
+ *
+ * Zstd will check that (out.size - out.pos) never grows and return an error
+ * if it does. While not strictly necessary, this should prevent surprises.
+ */
+#define ZSTD_c_stableOutBuffer ZSTD_c_experimentalParam10
+
+/* ZSTD_c_blockDelimiters
+ * Default is 0 == ZSTD_sf_noBlockDelimiters.
+ *
+ * For use with sequence compression API: ZSTD_compressSequences().
+ *
+ * Designates whether or not the given array of ZSTD_Sequence contains block delimiters
+ * and last literals, which are defined as sequences with offset == 0 and matchLength == 0.
+ * See the definition of ZSTD_Sequence for more specifics.
+ */
+#define ZSTD_c_blockDelimiters ZSTD_c_experimentalParam11
+
+/* ZSTD_c_validateSequences
+ * Default is 0 == disabled. Set to 1 to enable sequence validation.
+ *
+ * For use with sequence compression API: ZSTD_compressSequences().
+ * Designates whether or not we validate sequences provided to ZSTD_compressSequences()
+ * during function execution.
+ *
+ * Without validation, providing a sequence that does not conform to the zstd spec will cause
+ * undefined behavior, and may produce a corrupted block.
+ *
+ * With validation enabled, a if sequence is invalid (see doc/zstd_compression_format.md for
+ * specifics regarding offset/matchlength requirements) then the function will bail out and
+ * return an error.
+ *
+ */
+#define ZSTD_c_validateSequences ZSTD_c_experimentalParam12
+
+/* ZSTD_c_splitBlocks
+ * Default is 0 == disabled. Set to 1 to enable block splitting.
+ *
+ * Will attempt to split blocks in order to improve compression ratio at the cost of speed.
+ */
+#define ZSTD_c_splitBlocks ZSTD_c_experimentalParam13
+
+/* ZSTD_c_useRowMatchFinder
+ * Default is ZSTD_urm_auto.
+ * Controlled with ZSTD_useRowMatchFinderMode_e enum.
+ *
+ * By default, in ZSTD_urm_auto, when finalizing the compression parameters, the library
+ * will decide at runtime whether to use the row-based matchfinder based on support for SIMD
+ * instructions as well as the windowLog.
+ *
+ * Set to ZSTD_urm_disableRowMatchFinder to never use row-based matchfinder.
+ * Set to ZSTD_urm_enableRowMatchFinder to force usage of row-based matchfinder.
+ */
+#define ZSTD_c_useRowMatchFinder ZSTD_c_experimentalParam14
+
+/* ZSTD_c_deterministicRefPrefix
+ * Default is 0 == disabled. Set to 1 to enable.
+ *
+ * Zstd produces different results for prefix compression when the prefix is
+ * directly adjacent to the data about to be compressed vs. when it isn't.
+ * This is because zstd detects that the two buffers are contiguous and it can
+ * use a more efficient match finding algorithm. However, this produces different
+ * results than when the two buffers are non-contiguous. This flag forces zstd
+ * to always load the prefix in non-contiguous mode, even if it happens to be
+ * adjacent to the data, to guarantee determinism.
+ *
+ * If you really care about determinism when using a dictionary or prefix,
+ * like when doing delta compression, you should select this option. It comes
+ * at a speed penalty of about ~2.5% if the dictionary and data happened to be
+ * contiguous, and is free if they weren't contiguous. We don't expect that
+ * intentionally making the dictionary and data contiguous will be worth the
+ * cost to memcpy() the data.
+ */
+#define ZSTD_c_deterministicRefPrefix ZSTD_c_experimentalParam15
+
+/*! ZSTD_CCtx_getParameter() :
+ *  Get the requested compression parameter value, selected by enum ZSTD_cParameter,
+ *  and store it into int* value.
+ * @return : 0, or an error code (which can be tested with ZSTD_isError()).
+ */
+ZSTDLIB_API size_t ZSTD_CCtx_getParameter(const ZSTD_CCtx* cctx, ZSTD_cParameter param, int* value);
+
+
+/*! ZSTD_CCtx_params :
+ *  Quick howto :
+ *  - ZSTD_createCCtxParams() : Create a ZSTD_CCtx_params structure
+ *  - ZSTD_CCtxParams_setParameter() : Push parameters one by one into
+ *                                     an existing ZSTD_CCtx_params structure.
+ *                                     This is similar to
+ *                                     ZSTD_CCtx_setParameter().
+ *  - ZSTD_CCtx_setParametersUsingCCtxParams() : Apply parameters to
+ *                                    an existing CCtx.
+ *                                    These parameters will be applied to
+ *                                    all subsequent frames.
+ *  - ZSTD_compressStream2() : Do compression using the CCtx.
+ *  - ZSTD_freeCCtxParams() : Free the memory, accept NULL pointer.
+ *
+ *  This can be used with ZSTD_estimateCCtxSize_advanced_usingCCtxParams()
+ *  for static allocation of CCtx for single-threaded compression.
+ */
+ZSTDLIB_API ZSTD_CCtx_params* ZSTD_createCCtxParams(void);
+ZSTDLIB_API size_t ZSTD_freeCCtxParams(ZSTD_CCtx_params* params);  /* accept NULL pointer */
+
+/*! ZSTD_CCtxParams_reset() :
+ *  Reset params to default values.
+ */
+ZSTDLIB_API size_t ZSTD_CCtxParams_reset(ZSTD_CCtx_params* params);
+
+/*! ZSTD_CCtxParams_init() :
+ *  Initializes the compression parameters of cctxParams according to
+ *  compression level. All other parameters are reset to their default values.
+ */
+ZSTDLIB_API size_t ZSTD_CCtxParams_init(ZSTD_CCtx_params* cctxParams, int compressionLevel);
+
+/*! ZSTD_CCtxParams_init_advanced() :
+ *  Initializes the compression and frame parameters of cctxParams according to
+ *  params. All other parameters are reset to their default values.
+ */
+ZSTDLIB_API size_t ZSTD_CCtxParams_init_advanced(ZSTD_CCtx_params* cctxParams, ZSTD_parameters params);
+
+/*! ZSTD_CCtxParams_setParameter() : Requires v1.4.0+
+ *  Similar to ZSTD_CCtx_setParameter.
+ *  Set one compression parameter, selected by enum ZSTD_cParameter.
+ *  Parameters must be applied to a ZSTD_CCtx using
+ *  ZSTD_CCtx_setParametersUsingCCtxParams().
+ * @result : a code representing success or failure (which can be tested with
+ *           ZSTD_isError()).
+ */
+ZSTDLIB_API size_t ZSTD_CCtxParams_setParameter(ZSTD_CCtx_params* params, ZSTD_cParameter param, int value);
+
+/*! ZSTD_CCtxParams_getParameter() :
+ * Similar to ZSTD_CCtx_getParameter.
+ * Get the requested value of one compression parameter, selected by enum ZSTD_cParameter.
+ * @result : 0, or an error code (which can be tested with ZSTD_isError()).
+ */
+ZSTDLIB_API size_t ZSTD_CCtxParams_getParameter(const ZSTD_CCtx_params* params, ZSTD_cParameter param, int* value);
+
+/*! ZSTD_CCtx_setParametersUsingCCtxParams() :
+ *  Apply a set of ZSTD_CCtx_params to the compression context.
+ *  This can be done even after compression is started,
+ *    if nbWorkers==0, this will have no impact until a new compression is started.
+ *    if nbWorkers>=1, new parameters will be picked up at next job,
+ *       with a few restrictions (windowLog, pledgedSrcSize, nbWorkers, jobSize, and overlapLog are not updated).
+ */
+ZSTDLIB_API size_t ZSTD_CCtx_setParametersUsingCCtxParams(
+        ZSTD_CCtx* cctx, const ZSTD_CCtx_params* params);
+
+/*! ZSTD_compressStream2_simpleArgs() :
+ *  Same as ZSTD_compressStream2(),
+ *  but using only integral types as arguments.
+ *  This variant might be helpful for binders from dynamic languages
+ *  which have troubles handling structures containing memory pointers.
+ */
+ZSTDLIB_API size_t ZSTD_compressStream2_simpleArgs (
+                            ZSTD_CCtx* cctx,
+                            void* dst, size_t dstCapacity, size_t* dstPos,
+                      const void* src, size_t srcSize, size_t* srcPos,
+                            ZSTD_EndDirective endOp);
+
+
+/***************************************
+*  Advanced decompression functions
+***************************************/
+
+/*! ZSTD_isFrame() :
+ *  Tells if the content of `buffer` starts with a valid Frame Identifier.
+ *  Note : Frame Identifier is 4 bytes. If `size < 4`, @return will always be 0.
+ *  Note 2 : Legacy Frame Identifiers are considered valid only if Legacy Support is enabled.
+ *  Note 3 : Skippable Frame Identifiers are considered valid. */
+ZSTDLIB_API unsigned ZSTD_isFrame(const void* buffer, size_t size);
+
+/*! ZSTD_createDDict_byReference() :
+ *  Create a digested dictionary, ready to start decompression operation without startup delay.
+ *  Dictionary content is referenced, and therefore stays in dictBuffer.
+ *  It is important that dictBuffer outlives DDict,
+ *  it must remain read accessible throughout the lifetime of DDict */
+ZSTDLIB_API ZSTD_DDict* ZSTD_createDDict_byReference(const void* dictBuffer, size_t dictSize);
+
+/*! ZSTD_DCtx_loadDictionary_byReference() :
+ *  Same as ZSTD_DCtx_loadDictionary(),
+ *  but references `dict` content instead of copying it into `dctx`.
+ *  This saves memory if `dict` remains around.,
+ *  However, it's imperative that `dict` remains accessible (and unmodified) while being used, so it must outlive decompression. */
+ZSTDLIB_API size_t ZSTD_DCtx_loadDictionary_byReference(ZSTD_DCtx* dctx, const void* dict, size_t dictSize);
+
+/*! ZSTD_DCtx_loadDictionary_advanced() :
+ *  Same as ZSTD_DCtx_loadDictionary(),
+ *  but gives direct control over
+ *  how to load the dictionary (by copy ? by reference ?)
+ *  and how to interpret it (automatic ? force raw mode ? full mode only ?). */
+ZSTDLIB_API size_t ZSTD_DCtx_loadDictionary_advanced(ZSTD_DCtx* dctx, const void* dict, size_t dictSize, ZSTD_dictLoadMethod_e dictLoadMethod, ZSTD_dictContentType_e dictContentType);
+
+/*! ZSTD_DCtx_refPrefix_advanced() :
+ *  Same as ZSTD_DCtx_refPrefix(), but gives finer control over
+ *  how to interpret prefix content (automatic ? force raw mode (default) ? full mode only ?) */
+ZSTDLIB_API size_t ZSTD_DCtx_refPrefix_advanced(ZSTD_DCtx* dctx, const void* prefix, size_t prefixSize, ZSTD_dictContentType_e dictContentType);
+
+/*! ZSTD_DCtx_setMaxWindowSize() :
+ *  Refuses allocating internal buffers for frames requiring a window size larger than provided limit.
+ *  This protects a decoder context from reserving too much memory for itself (potential attack scenario).
+ *  This parameter is only useful in streaming mode, since no internal buffer is allocated in single-pass mode.
+ *  By default, a decompression context accepts all window sizes <= (1 << ZSTD_WINDOWLOG_LIMIT_DEFAULT)
+ * @return : 0, or an error code (which can be tested using ZSTD_isError()).
+ */
+ZSTDLIB_API size_t ZSTD_DCtx_setMaxWindowSize(ZSTD_DCtx* dctx, size_t maxWindowSize);
+
+/*! ZSTD_DCtx_getParameter() :
+ *  Get the requested decompression parameter value, selected by enum ZSTD_dParameter,
+ *  and store it into int* value.
+ * @return : 0, or an error code (which can be tested with ZSTD_isError()).
+ */
+ZSTDLIB_API size_t ZSTD_DCtx_getParameter(ZSTD_DCtx* dctx, ZSTD_dParameter param, int* value);
+
+/* ZSTD_d_format
+ * experimental parameter,
+ * allowing selection between ZSTD_format_e input compression formats
+ */
+#define ZSTD_d_format ZSTD_d_experimentalParam1
+/* ZSTD_d_stableOutBuffer
+ * Experimental parameter.
+ * Default is 0 == disabled. Set to 1 to enable.
+ *
+ * Tells the decompressor that the ZSTD_outBuffer will ALWAYS be the same
+ * between calls, except for the modifications that zstd makes to pos (the
+ * caller must not modify pos). This is checked by the decompressor, and
+ * decompression will fail if it ever changes. Therefore the ZSTD_outBuffer
+ * MUST be large enough to fit the entire decompressed frame. This will be
+ * checked when the frame content size is known. The data in the ZSTD_outBuffer
+ * in the range [dst, dst + pos) MUST not be modified during decompression
+ * or you will get data corruption.
+ *
+ * When this flags is enabled zstd won't allocate an output buffer, because
+ * it can write directly to the ZSTD_outBuffer, but it will still allocate
+ * an input buffer large enough to fit any compressed block. This will also
+ * avoid the memcpy() from the internal output buffer to the ZSTD_outBuffer.
+ * If you need to avoid the input buffer allocation use the buffer-less
+ * streaming API.
+ *
+ * NOTE: So long as the ZSTD_outBuffer always points to valid memory, using
+ * this flag is ALWAYS memory safe, and will never access out-of-bounds
+ * memory. However, decompression WILL fail if you violate the preconditions.
+ *
+ * WARNING: The data in the ZSTD_outBuffer in the range [dst, dst + pos) MUST
+ * not be modified during decompression or you will get data corruption. This
+ * is because zstd needs to reference data in the ZSTD_outBuffer to regenerate
+ * matches. Normally zstd maintains its own buffer for this purpose, but passing
+ * this flag tells zstd to use the user provided buffer.
+ */
+#define ZSTD_d_stableOutBuffer ZSTD_d_experimentalParam2
+
+/* ZSTD_d_forceIgnoreChecksum
+ * Experimental parameter.
+ * Default is 0 == disabled. Set to 1 to enable
+ *
+ * Tells the decompressor to skip checksum validation during decompression, regardless
+ * of whether checksumming was specified during compression. This offers some
+ * slight performance benefits, and may be useful for debugging.
+ * Param has values of type ZSTD_forceIgnoreChecksum_e
+ */
+#define ZSTD_d_forceIgnoreChecksum ZSTD_d_experimentalParam3
+
+/* ZSTD_d_refMultipleDDicts
+ * Experimental parameter.
+ * Default is 0 == disabled. Set to 1 to enable
+ *
+ * If enabled and dctx is allocated on the heap, then additional memory will be allocated
+ * to store references to multiple ZSTD_DDict. That is, multiple calls of ZSTD_refDDict()
+ * using a given ZSTD_DCtx, rather than overwriting the previous DDict reference, will instead
+ * store all references. At decompression time, the appropriate dictID is selected
+ * from the set of DDicts based on the dictID in the frame.
+ *
+ * Usage is simply calling ZSTD_refDDict() on multiple dict buffers.
+ *
+ * Param has values of byte ZSTD_refMultipleDDicts_e
+ *
+ * WARNING: Enabling this parameter and calling ZSTD_DCtx_refDDict(), will trigger memory
+ * allocation for the hash table. ZSTD_freeDCtx() also frees this memory.
+ * Memory is allocated as per ZSTD_DCtx::customMem.
+ *
+ * Although this function allocates memory for the table, the user is still responsible for
+ * memory management of the underlying ZSTD_DDict* themselves.
+ */
+#define ZSTD_d_refMultipleDDicts ZSTD_d_experimentalParam4
+
+
+/*! ZSTD_DCtx_setFormat() :
+ *  This function is REDUNDANT. Prefer ZSTD_DCtx_setParameter().
+ *  Instruct the decoder context about what kind of data to decode next.
+ *  This instruction is mandatory to decode data without a fully-formed header,
+ *  such ZSTD_f_zstd1_magicless for example.
+ * @return : 0, or an error code (which can be tested using ZSTD_isError()). */
+ZSTD_DEPRECATED("use ZSTD_DCtx_setParameter() instead")
+size_t ZSTD_DCtx_setFormat(ZSTD_DCtx* dctx, ZSTD_format_e format);
+
+/*! ZSTD_decompressStream_simpleArgs() :
+ *  Same as ZSTD_decompressStream(),
+ *  but using only integral types as arguments.
+ *  This can be helpful for binders from dynamic languages
+ *  which have troubles handling structures containing memory pointers.
+ */
+ZSTDLIB_API size_t ZSTD_decompressStream_simpleArgs (
+                            ZSTD_DCtx* dctx,
+                            void* dst, size_t dstCapacity, size_t* dstPos,
+                      const void* src, size_t srcSize, size_t* srcPos);
+
+
+/********************************************************************
+*  Advanced streaming functions
+*  Warning : most of these functions are now redundant with the Advanced API.
+*  Once Advanced API reaches "stable" status,
+*  redundant functions will be deprecated, and then at some point removed.
+********************************************************************/
+
+/*=====   Advanced Streaming compression functions  =====*/
+
+/*! ZSTD_initCStream_srcSize() :
+ * This function is DEPRECATED, and equivalent to:
+ *     ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only);
+ *     ZSTD_CCtx_refCDict(zcs, NULL); // clear the dictionary (if any)
+ *     ZSTD_CCtx_setParameter(zcs, ZSTD_c_compressionLevel, compressionLevel);
+ *     ZSTD_CCtx_setPledgedSrcSize(zcs, pledgedSrcSize);
+ *
+ * pledgedSrcSize must be correct. If it is not known at init time, use
+ * ZSTD_CONTENTSIZE_UNKNOWN. Note that, for compatibility with older programs,
+ * "0" also disables frame content size field. It may be enabled in the future.
+ * This prototype will generate compilation warnings.
+ */
+ZSTD_DEPRECATED("use ZSTD_CCtx_reset, see zstd.h for detailed instructions")
+size_t ZSTD_initCStream_srcSize(ZSTD_CStream* zcs,
+                         int compressionLevel,
+                         unsigned long long pledgedSrcSize);
+
+/*! ZSTD_initCStream_usingDict() :
+ * This function is DEPRECATED, and is equivalent to:
+ *     ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only);
+ *     ZSTD_CCtx_setParameter(zcs, ZSTD_c_compressionLevel, compressionLevel);
+ *     ZSTD_CCtx_loadDictionary(zcs, dict, dictSize);
+ *
+ * Creates of an internal CDict (incompatible with static CCtx), except if
+ * dict == NULL or dictSize < 8, in which case no dict is used.
+ * Note: dict is loaded with ZSTD_dct_auto (treated as a full zstd dictionary if
+ * it begins with ZSTD_MAGIC_DICTIONARY, else as raw content) and ZSTD_dlm_byCopy.
+ * This prototype will generate compilation warnings.
+ */
+ZSTD_DEPRECATED("use ZSTD_CCtx_reset, see zstd.h for detailed instructions")
+size_t ZSTD_initCStream_usingDict(ZSTD_CStream* zcs,
+                     const void* dict, size_t dictSize,
+                           int compressionLevel);
+
+/*! ZSTD_initCStream_advanced() :
+ * This function is DEPRECATED, and is approximately equivalent to:
+ *     ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only);
+ *     // Pseudocode: Set each zstd parameter and leave the rest as-is.
+ *     for ((param, value) : params) {
+ *         ZSTD_CCtx_setParameter(zcs, param, value);
+ *     }
+ *     ZSTD_CCtx_setPledgedSrcSize(zcs, pledgedSrcSize);
+ *     ZSTD_CCtx_loadDictionary(zcs, dict, dictSize);
+ *
+ * dict is loaded with ZSTD_dct_auto and ZSTD_dlm_byCopy.
+ * pledgedSrcSize must be correct.
+ * If srcSize is not known at init time, use value ZSTD_CONTENTSIZE_UNKNOWN.
+ * This prototype will generate compilation warnings.
+ */
+ZSTD_DEPRECATED("use ZSTD_CCtx_reset, see zstd.h for detailed instructions")
+size_t ZSTD_initCStream_advanced(ZSTD_CStream* zcs,
+                    const void* dict, size_t dictSize,
+                          ZSTD_parameters params,
+                          unsigned long long pledgedSrcSize);
+
+/*! ZSTD_initCStream_usingCDict() :
+ * This function is DEPRECATED, and equivalent to:
+ *     ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only);
+ *     ZSTD_CCtx_refCDict(zcs, cdict);
+ * 
+ * note : cdict will just be referenced, and must outlive compression session
+ * This prototype will generate compilation warnings.
+ */
+ZSTD_DEPRECATED("use ZSTD_CCtx_reset and ZSTD_CCtx_refCDict, see zstd.h for detailed instructions")
+size_t ZSTD_initCStream_usingCDict(ZSTD_CStream* zcs, const ZSTD_CDict* cdict);
+
+/*! ZSTD_initCStream_usingCDict_advanced() :
+ *   This function is DEPRECATED, and is approximately equivalent to:
+ *     ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only);
+ *     // Pseudocode: Set each zstd frame parameter and leave the rest as-is.
+ *     for ((fParam, value) : fParams) {
+ *         ZSTD_CCtx_setParameter(zcs, fParam, value);
+ *     }
+ *     ZSTD_CCtx_setPledgedSrcSize(zcs, pledgedSrcSize);
+ *     ZSTD_CCtx_refCDict(zcs, cdict);
+ *
+ * same as ZSTD_initCStream_usingCDict(), with control over frame parameters.
+ * pledgedSrcSize must be correct. If srcSize is not known at init time, use
+ * value ZSTD_CONTENTSIZE_UNKNOWN.
+ * This prototype will generate compilation warnings.
+ */
+ZSTD_DEPRECATED("use ZSTD_CCtx_reset and ZSTD_CCtx_refCDict, see zstd.h for detailed instructions")
+size_t ZSTD_initCStream_usingCDict_advanced(ZSTD_CStream* zcs,
+                               const ZSTD_CDict* cdict,
+                                     ZSTD_frameParameters fParams,
+                                     unsigned long long pledgedSrcSize);
+
+/*! ZSTD_resetCStream() :
+ * This function is DEPRECATED, and is equivalent to:
+ *     ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only);
+ *     ZSTD_CCtx_setPledgedSrcSize(zcs, pledgedSrcSize);
+ * Note: ZSTD_resetCStream() interprets pledgedSrcSize == 0 as ZSTD_CONTENTSIZE_UNKNOWN, but
+ *       ZSTD_CCtx_setPledgedSrcSize() does not do the same, so ZSTD_CONTENTSIZE_UNKNOWN must be
+ *       explicitly specified.
+ *
+ *  start a new frame, using same parameters from previous frame.
+ *  This is typically useful to skip dictionary loading stage, since it will re-use it in-place.
+ *  Note that zcs must be init at least once before using ZSTD_resetCStream().
+ *  If pledgedSrcSize is not known at reset time, use macro ZSTD_CONTENTSIZE_UNKNOWN.
+ *  If pledgedSrcSize > 0, its value must be correct, as it will be written in header, and controlled at the end.
+ *  For the time being, pledgedSrcSize==0 is interpreted as "srcSize unknown" for compatibility with older programs,
+ *  but it will change to mean "empty" in future version, so use macro ZSTD_CONTENTSIZE_UNKNOWN instead.
+ * @return : 0, or an error code (which can be tested using ZSTD_isError())
+ *  This prototype will generate compilation warnings.
+ */
+ZSTD_DEPRECATED("use ZSTD_CCtx_reset, see zstd.h for detailed instructions")
+size_t ZSTD_resetCStream(ZSTD_CStream* zcs, unsigned long long pledgedSrcSize);
+
+
+typedef struct {
+    unsigned long long ingested;   /* nb input bytes read and buffered */
+    unsigned long long consumed;   /* nb input bytes actually compressed */
+    unsigned long long produced;   /* nb of compressed bytes generated and buffered */
+    unsigned long long flushed;    /* nb of compressed bytes flushed : not provided; can be tracked from caller side */
+    unsigned currentJobID;         /* MT only : latest started job nb */
+    unsigned nbActiveWorkers;      /* MT only : nb of workers actively compressing at probe time */
+} ZSTD_frameProgression;
+
+/* ZSTD_getFrameProgression() :
+ * tells how much data has been ingested (read from input)
+ * consumed (input actually compressed) and produced (output) for current frame.
+ * Note : (ingested - consumed) is amount of input data buffered internally, not yet compressed.
+ * Aggregates progression inside active worker threads.
+ */
+ZSTDLIB_API ZSTD_frameProgression ZSTD_getFrameProgression(const ZSTD_CCtx* cctx);
+
+/*! ZSTD_toFlushNow() :
+ *  Tell how many bytes are ready to be flushed immediately.
+ *  Useful for multithreading scenarios (nbWorkers >= 1).
+ *  Probe the oldest active job, defined as oldest job not yet entirely flushed,
+ *  and check its output buffer.
+ * @return : amount of data stored in oldest job and ready to be flushed immediately.
+ *  if @return == 0, it means either :
+ *  + there is no active job (could be checked with ZSTD_frameProgression()), or
+ *  + oldest job is still actively compressing data,
+ *    but everything it has produced has also been flushed so far,
+ *    therefore flush speed is limited by production speed of oldest job
+ *    irrespective of the speed of concurrent (and newer) jobs.
+ */
+ZSTDLIB_API size_t ZSTD_toFlushNow(ZSTD_CCtx* cctx);
+
+
+/*=====   Advanced Streaming decompression functions  =====*/
+
+/*!
+ * This function is deprecated, and is equivalent to:
+ *
+ *     ZSTD_DCtx_reset(zds, ZSTD_reset_session_only);
+ *     ZSTD_DCtx_loadDictionary(zds, dict, dictSize);
+ *
+ * note: no dictionary will be used if dict == NULL or dictSize < 8
+ * Note : this prototype will be marked as deprecated and generate compilation warnings on reaching v1.5.x
+ */
+ZSTDLIB_API size_t ZSTD_initDStream_usingDict(ZSTD_DStream* zds, const void* dict, size_t dictSize);
+
+/*!
+ * This function is deprecated, and is equivalent to:
+ *
+ *     ZSTD_DCtx_reset(zds, ZSTD_reset_session_only);
+ *     ZSTD_DCtx_refDDict(zds, ddict);
+ *
+ * note : ddict is referenced, it must outlive decompression session
+ * Note : this prototype will be marked as deprecated and generate compilation warnings on reaching v1.5.x
+ */
+ZSTDLIB_API size_t ZSTD_initDStream_usingDDict(ZSTD_DStream* zds, const ZSTD_DDict* ddict);
+
+/*!
+ * This function is deprecated, and is equivalent to:
+ *
+ *     ZSTD_DCtx_reset(zds, ZSTD_reset_session_only);
+ *
+ * re-use decompression parameters from previous init; saves dictionary loading
+ * Note : this prototype will be marked as deprecated and generate compilation warnings on reaching v1.5.x
+ */
+ZSTDLIB_API size_t ZSTD_resetDStream(ZSTD_DStream* zds);
+
+
+/*********************************************************************
+*  Buffer-less and synchronous inner streaming functions
+*
+*  This is an advanced API, giving full control over buffer management, for users which need direct control over memory.
+*  But it's also a complex one, with several restrictions, documented below.
+*  Prefer normal streaming API for an easier experience.
+********************************************************************* */
+
+/**
+  Buffer-less streaming compression (synchronous mode)
+
+  A ZSTD_CCtx object is required to track streaming operations.
+  Use ZSTD_createCCtx() / ZSTD_freeCCtx() to manage resource.
+  ZSTD_CCtx object can be re-used multiple times within successive compression operations.
+
+  Start by initializing a context.
+  Use ZSTD_compressBegin(), or ZSTD_compressBegin_usingDict() for dictionary compression.
+  It's also possible to duplicate a reference context which has already been initialized, using ZSTD_copyCCtx()
+
+  Then, consume your input using ZSTD_compressContinue().
+  There are some important considerations to keep in mind when using this advanced function :
+  - ZSTD_compressContinue() has no internal buffer. It uses externally provided buffers only.
+  - Interface is synchronous : input is consumed entirely and produces 1+ compressed blocks.
+  - Caller must ensure there is enough space in `dst` to store compressed data under worst case scenario.
+    Worst case evaluation is provided by ZSTD_compressBound().
+    ZSTD_compressContinue() doesn't guarantee recover after a failed compression.
+  - ZSTD_compressContinue() presumes prior input ***is still accessible and unmodified*** (up to maximum distance size, see WindowLog).
+    It remembers all previous contiguous blocks, plus one separated memory segment (which can itself consists of multiple contiguous blocks)
+  - ZSTD_compressContinue() detects that prior input has been overwritten when `src` buffer overlaps.
+    In which case, it will "discard" the relevant memory section from its history.
+
+  Finish a frame with ZSTD_compressEnd(), which will write the last block(s) and optional checksum.
+  It's possible to use srcSize==0, in which case, it will write a final empty block to end the frame.
+  Without last block mark, frames are considered unfinished (hence corrupted) by compliant decoders.
+
+  `ZSTD_CCtx` object can be re-used (ZSTD_compressBegin()) to compress again.
+*/
+
+/*=====   Buffer-less streaming compression functions  =====*/
+ZSTDLIB_API size_t ZSTD_compressBegin(ZSTD_CCtx* cctx, int compressionLevel);
+ZSTDLIB_API size_t ZSTD_compressBegin_usingDict(ZSTD_CCtx* cctx, const void* dict, size_t dictSize, int compressionLevel);
+ZSTDLIB_API size_t ZSTD_compressBegin_usingCDict(ZSTD_CCtx* cctx, const ZSTD_CDict* cdict); /**< note: fails if cdict==NULL */
+ZSTDLIB_API size_t ZSTD_copyCCtx(ZSTD_CCtx* cctx, const ZSTD_CCtx* preparedCCtx, unsigned long long pledgedSrcSize); /**<  note: if pledgedSrcSize is not known, use ZSTD_CONTENTSIZE_UNKNOWN */
+
+ZSTDLIB_API size_t ZSTD_compressContinue(ZSTD_CCtx* cctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize);
+ZSTDLIB_API size_t ZSTD_compressEnd(ZSTD_CCtx* cctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize);
+
+/* The ZSTD_compressBegin_advanced() and ZSTD_compressBegin_usingCDict_advanced() are now DEPRECATED and will generate a compiler warning */
+ZSTD_DEPRECATED("use advanced API to access custom parameters")
+size_t ZSTD_compressBegin_advanced(ZSTD_CCtx* cctx, const void* dict, size_t dictSize, ZSTD_parameters params, unsigned long long pledgedSrcSize); /**< pledgedSrcSize : If srcSize is not known at init time, use ZSTD_CONTENTSIZE_UNKNOWN */
+ZSTD_DEPRECATED("use advanced API to access custom parameters")
+size_t ZSTD_compressBegin_usingCDict_advanced(ZSTD_CCtx* const cctx, const ZSTD_CDict* const cdict, ZSTD_frameParameters const fParams, unsigned long long const pledgedSrcSize);   /* compression parameters are already set within cdict. pledgedSrcSize must be correct. If srcSize is not known, use macro ZSTD_CONTENTSIZE_UNKNOWN */
+/**
+  Buffer-less streaming decompression (synchronous mode)
+
+  A ZSTD_DCtx object is required to track streaming operations.
+  Use ZSTD_createDCtx() / ZSTD_freeDCtx() to manage it.
+  A ZSTD_DCtx object can be re-used multiple times.
+
+  First typical operation is to retrieve frame parameters, using ZSTD_getFrameHeader().
+  Frame header is extracted from the beginning of compressed frame, so providing only the frame's beginning is enough.
+  Data fragment must be large enough to ensure successful decoding.
+ `ZSTD_frameHeaderSize_max` bytes is guaranteed to always be large enough.
+  @result : 0 : successful decoding, the `ZSTD_frameHeader` structure is correctly filled.
+           >0 : `srcSize` is too small, please provide at least @result bytes on next attempt.
+           errorCode, which can be tested using ZSTD_isError().
+
+  It fills a ZSTD_frameHeader structure with important information to correctly decode the frame,
+  such as the dictionary ID, content size, or maximum back-reference distance (`windowSize`).
+  Note that these values could be wrong, either because of data corruption, or because a 3rd party deliberately spoofs false information.
+  As a consequence, check that values remain within valid application range.
+  For example, do not allocate memory blindly, check that `windowSize` is within expectation.
+  Each application can set its own limits, depending on local restrictions.
+  For extended interoperability, it is recommended to support `windowSize` of at least 8 MB.
+
+  ZSTD_decompressContinue() needs previous data blocks during decompression, up to `windowSize` bytes.
+  ZSTD_decompressContinue() is very sensitive to contiguity,
+  if 2 blocks don't follow each other, make sure that either the compressor breaks contiguity at the same place,
+  or that previous contiguous segment is large enough to properly handle maximum back-reference distance.
+  There are multiple ways to guarantee this condition.
+
+  The most memory efficient way is to use a round buffer of sufficient size.
+  Sufficient size is determined by invoking ZSTD_decodingBufferSize_min(),
+  which can @return an error code if required value is too large for current system (in 32-bits mode).
+  In a round buffer methodology, ZSTD_decompressContinue() decompresses each block next to previous one,
+  up to the moment there is not enough room left in the buffer to guarantee decoding another full block,
+  which maximum size is provided in `ZSTD_frameHeader` structure, field `blockSizeMax`.
+  At which point, decoding can resume from the beginning of the buffer.
+  Note that already decoded data stored in the buffer should be flushed before being overwritten.
+
+  There are alternatives possible, for example using two or more buffers of size `windowSize` each, though they consume more memory.
+
+  Finally, if you control the compression process, you can also ignore all buffer size rules,
+  as long as the encoder and decoder progress in "lock-step",
+  aka use exactly the same buffer sizes, break contiguity at the same place, etc.
+
+  Once buffers are setup, start decompression, with ZSTD_decompressBegin().
+  If decompression requires a dictionary, use ZSTD_decompressBegin_usingDict() or ZSTD_decompressBegin_usingDDict().
+
+  Then use ZSTD_nextSrcSizeToDecompress() and ZSTD_decompressContinue() alternatively.
+  ZSTD_nextSrcSizeToDecompress() tells how many bytes to provide as 'srcSize' to ZSTD_decompressContinue().
+  ZSTD_decompressContinue() requires this _exact_ amount of bytes, or it will fail.
+
+ @result of ZSTD_decompressContinue() is the number of bytes regenerated within 'dst' (necessarily <= dstCapacity).
+  It can be zero : it just means ZSTD_decompressContinue() has decoded some metadata item.
+  It can also be an error code, which can be tested with ZSTD_isError().
+
+  A frame is fully decoded when ZSTD_nextSrcSizeToDecompress() returns zero.
+  Context can then be reset to start a new decompression.
+
+  Note : it's possible to know if next input to present is a header or a block, using ZSTD_nextInputType().
+  This information is not required to properly decode a frame.
+
+  == Special case : skippable frames ==
+
+  Skippable frames allow integration of user-defined data into a flow of concatenated frames.
+  Skippable frames will be ignored (skipped) by decompressor.
+  The format of skippable frames is as follows :
+  a) Skippable frame ID - 4 Bytes, Little endian format, any value from 0x184D2A50 to 0x184D2A5F
+  b) Frame Size - 4 Bytes, Little endian format, unsigned 32-bits
+  c) Frame Content - any content (User Data) of length equal to Frame Size
+  For skippable frames ZSTD_getFrameHeader() returns zfhPtr->frameType==ZSTD_skippableFrame.
+  For skippable frames ZSTD_decompressContinue() always returns 0 : it only skips the content.
+*/
+
+/*=====   Buffer-less streaming decompression functions  =====*/
+typedef enum { ZSTD_frame, ZSTD_skippableFrame } ZSTD_frameType_e;
+typedef struct {
+    unsigned long long frameContentSize; /* if == ZSTD_CONTENTSIZE_UNKNOWN, it means this field is not available. 0 means "empty" */
+    unsigned long long windowSize;       /* can be very large, up to <= frameContentSize */
+    unsigned blockSizeMax;
+    ZSTD_frameType_e frameType;          /* if == ZSTD_skippableFrame, frameContentSize is the size of skippable content */
+    unsigned headerSize;
+    unsigned dictID;
+    unsigned checksumFlag;
+} ZSTD_frameHeader;
+
+/*! ZSTD_getFrameHeader() :
+ *  decode Frame Header, or requires larger `srcSize`.
+ * @return : 0, `zfhPtr` is correctly filled,
+ *          >0, `srcSize` is too small, value is wanted `srcSize` amount,
+ *           or an error code, which can be tested using ZSTD_isError() */
+ZSTDLIB_API size_t ZSTD_getFrameHeader(ZSTD_frameHeader* zfhPtr, const void* src, size_t srcSize);   /**< doesn't consume input */
+/*! ZSTD_getFrameHeader_advanced() :
+ *  same as ZSTD_getFrameHeader(),
+ *  with added capability to select a format (like ZSTD_f_zstd1_magicless) */
+ZSTDLIB_API size_t ZSTD_getFrameHeader_advanced(ZSTD_frameHeader* zfhPtr, const void* src, size_t srcSize, ZSTD_format_e format);
+ZSTDLIB_API size_t ZSTD_decodingBufferSize_min(unsigned long long windowSize, unsigned long long frameContentSize);  /**< when frame content size is not known, pass in frameContentSize == ZSTD_CONTENTSIZE_UNKNOWN */
+
+ZSTDLIB_API size_t ZSTD_decompressBegin(ZSTD_DCtx* dctx);
+ZSTDLIB_API size_t ZSTD_decompressBegin_usingDict(ZSTD_DCtx* dctx, const void* dict, size_t dictSize);
+ZSTDLIB_API size_t ZSTD_decompressBegin_usingDDict(ZSTD_DCtx* dctx, const ZSTD_DDict* ddict);
+
+ZSTDLIB_API size_t ZSTD_nextSrcSizeToDecompress(ZSTD_DCtx* dctx);
+ZSTDLIB_API size_t ZSTD_decompressContinue(ZSTD_DCtx* dctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize);
+
+/* misc */
+ZSTDLIB_API void   ZSTD_copyDCtx(ZSTD_DCtx* dctx, const ZSTD_DCtx* preparedDCtx);
+typedef enum { ZSTDnit_frameHeader, ZSTDnit_blockHeader, ZSTDnit_block, ZSTDnit_lastBlock, ZSTDnit_checksum, ZSTDnit_skippableFrame } ZSTD_nextInputType_e;
+ZSTDLIB_API ZSTD_nextInputType_e ZSTD_nextInputType(ZSTD_DCtx* dctx);
+
+
+
+
+/* ============================ */
+/**       Block level API       */
+/* ============================ */
+
+/*!
+    Block functions produce and decode raw zstd blocks, without frame metadata.
+    Frame metadata cost is typically ~12 bytes, which can be non-negligible for very small blocks (< 100 bytes).
+    But users will have to take in charge needed metadata to regenerate data, such as compressed and content sizes.
+
+    A few rules to respect :
+    - Compressing and decompressing require a context structure
+      + Use ZSTD_createCCtx() and ZSTD_createDCtx()
+    - It is necessary to init context before starting
+      + compression : any ZSTD_compressBegin*() variant, including with dictionary
+      + decompression : any ZSTD_decompressBegin*() variant, including with dictionary
+      + copyCCtx() and copyDCtx() can be used too
+    - Block size is limited, it must be <= ZSTD_getBlockSize() <= ZSTD_BLOCKSIZE_MAX == 128 KB
+      + If input is larger than a block size, it's necessary to split input data into multiple blocks
+      + For inputs larger than a single block, consider using regular ZSTD_compress() instead.
+        Frame metadata is not that costly, and quickly becomes negligible as source size grows larger than a block.
+    - When a block is considered not compressible enough, ZSTD_compressBlock() result will be 0 (zero) !
+      ===> In which case, nothing is produced into `dst` !
+      + User __must__ test for such outcome and deal directly with uncompressed data
+      + A block cannot be declared incompressible if ZSTD_compressBlock() return value was != 0.
+        Doing so would mess up with statistics history, leading to potential data corruption.
+      + ZSTD_decompressBlock() _doesn't accept uncompressed data as input_ !!
+      + In case of multiple successive blocks, should some of them be uncompressed,
+        decoder must be informed of their existence in order to follow proper history.
+        Use ZSTD_insertBlock() for such a case.
+*/
+
+/*=====   Raw zstd block functions  =====*/
+ZSTDLIB_API size_t ZSTD_getBlockSize   (const ZSTD_CCtx* cctx);
+ZSTDLIB_API size_t ZSTD_compressBlock  (ZSTD_CCtx* cctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize);
+ZSTDLIB_API size_t ZSTD_decompressBlock(ZSTD_DCtx* dctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize);
+ZSTDLIB_API size_t ZSTD_insertBlock    (ZSTD_DCtx* dctx, const void* blockStart, size_t blockSize);  /**< insert uncompressed block into `dctx` history. Useful for multi-blocks decompression. */
+
+
+#endif   /* ZSTD_H_ZSTD_STATIC_LINKING_ONLY */
+
+#if defined (__cplusplus)
+}
+#endif
diff -Nru mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/LICENSE mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/LICENSE
--- mysql-8.0-8.0.26/extra/zstd/zstd-1.5.0/LICENSE	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/extra/zstd/zstd-1.5.0/LICENSE	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,30 @@
+BSD License
+
+For Zstandard software
+
+Copyright (c) 2016-present, Facebook, Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+ * Neither the name Facebook nor the names of its contributors may be used to
+   endorse or promote products derived from this software without specific
+   prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff -Nru mysql-8.0-8.0.26/include/base64.h mysql-8.0-8.0.27/include/base64.h
--- mysql-8.0-8.0.26/include/base64.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/base64.h	2021-09-28 11:46:34.000000000 +0000
@@ -29,40 +29,326 @@
 
 #include <stddef.h>
 
+#include <assert.h>
+#include <math.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+
+#include "my_config.h"
 #include "my_inttypes.h"
 
+/* Allow multuple chunks 'AAA= AA== AA==', binlog uses this */
+#define MY_BASE64_DECODE_ALLOW_MULTIPLE_CHUNKS 1
+
+static char base64_table[] =
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+    "abcdefghijklmnopqrstuvwxyz"
+    "0123456789+/";
+
+/*
+  Base64 decoder stream
+*/
+typedef struct my_base64_decoder_t {
+  const char *src; /* Pointer to the current input position        */
+  const char *end; /* Pointer to the end of input buffer           */
+  uint c;          /* Collect bits into this number                */
+  int error;       /* Error code                                   */
+  uchar state;     /* Character number in the current group of 4   */
+  uchar mark;      /* Number of padding marks in the current group */
+} MY_BASE64_DECODER;
+
+/*
+  Helper table for decoder.
+  -2 means "space character"
+  -1 means "bad character"
+  Non-negative values mean valid base64 encoding character.
+*/
+static int8 from_base64_table[] = {
+    /*00*/ -1, -1, -1, -1, -1, -1, -1, -1,
+    -1,        -2, -2, -2, -2, -2, -1, -1,
+    /*10*/ -1, -1, -1, -1, -1, -1, -1, -1,
+    -1,        -1, -1, -1, -1, -1, -1, -1,
+    /*20*/ -2, -1, -1, -1, -1, -1, -1, -1,
+    -1,        -1, -1, 62, -1, -1, -1, 63, /*  !"#$%&'()*+,-./ */
+    /*30*/ 52, 53, 54, 55, 56, 57, 58, 59,
+    60,        61, -1, -1, -1, -1, -1, -1, /* 0123456789:;<=>? */
+    /*40*/ -1, 0,  1,  2,  3,  4,  5,  6,
+    7,         8,  9,  10, 11, 12, 13, 14, /* @ABCDEFGHIJKLMNO */
+    /*50*/ 15, 16, 17, 18, 19, 20, 21, 22,
+    23,        24, 25, -1, -1, -1, -1, -1, /* PQRSTUVWXYZ[\]^_ */
+    /*60*/ -1, 26, 27, 28, 29, 30, 31, 32,
+    33,        34, 35, 36, 37, 38, 39, 40, /* `abcdefghijklmno */
+    /*70*/ 41, 42, 43, 44, 45, 46, 47, 48,
+    49,        50, 51, -1, -1, -1, -1, -1, /* pqrstuvwxyz{|}~  */
+    /*80*/ -1, -1, -1, -1, -1, -1, -1, -1,
+    -1,        -1, -1, -1, -1, -1, -1, -1,
+    /*90*/ -1, -1, -1, -1, -1, -1, -1, -1,
+    -1,        -1, -1, -1, -1, -1, -1, -1,
+    /*A0*/ -2, -1, -1, -1, -1, -1, -1, -1,
+    -1,        -1, -1, -1, -1, -1, -1, -1,
+    /*B0*/ -1, -1, -1, -1, -1, -1, -1, -1,
+    -1,        -1, -1, -1, -1, -1, -1, -1,
+    /*C0*/ -1, -1, -1, -1, -1, -1, -1, -1,
+    -1,        -1, -1, -1, -1, -1, -1, -1,
+    /*D0*/ -1, -1, -1, -1, -1, -1, -1, -1,
+    -1,        -1, -1, -1, -1, -1, -1, -1,
+    /*E0*/ -1, -1, -1, -1, -1, -1, -1, -1,
+    -1,        -1, -1, -1, -1, -1, -1, -1,
+    /*F0*/ -1, -1, -1, -1, -1, -1, -1, -1,
+    -1,        -1, -1, -1, -1, -1, -1, -1};
+
+/**
+ * Skip leading spaces in a base64 encoded stream
+ * and stop on the first non-space character.
+ * decoder->src will point to the first non-space character,
+ * or to the end of the input string.
+ * In case when end-of-input met on unexpected position,
+ * decoder->error is also set to 1.
+ *
+ * @param  decoder  Pointer to MY_BASE64_DECODER
+ *
+ * @return
+ *   false on success (there are some more non-space input characters)
+ *   true  on error (end-of-input found)
+ */
+static inline bool my_base64_decoder_skip_spaces(MY_BASE64_DECODER *decoder) {
+  for (; decoder->src < decoder->end; decoder->src++) {
+    if (from_base64_table[(uchar)*decoder->src] != -2) return false;
+  }
+  if (decoder->state > 0)
+    decoder->error = 1; /* Unexpected end-of-input found */
+  return true;
+}
+
+/**
+ * Convert the next character in a base64 encoded stream
+ * to a number in the range [0..63]
+ * and mix it with the previously collected value in decoder->c.
+ *
+ * @param decoder base64 decoding stream
+ *
+ * @return
+ *   false on success
+ *   true  on error (invalid base64 character found)
+ */
+static inline bool my_base64_add(MY_BASE64_DECODER *decoder) {
+  int res;
+  decoder->c <<= 6;
+  if ((res = from_base64_table[(uchar)*decoder->src++]) < 0)
+    return (decoder->error = true);
+  decoder->c += (uint)res;
+  return false;
+}
+
+/**
+ * Get the next character from a base64 encoded stream.
+ * Skip spaces, then scan the next base64 character or a pad character
+ * and collect bits into decoder->c.
+ *
+ * @param  decoder  Pointer to MY_BASE64_DECODER
+ * @return
+ *  false on success (a valid base64 encoding character found)
+ *  true  on error (unexpected character or unexpected end-of-input found)
+ */
+static inline bool my_base64_decoder_getch(MY_BASE64_DECODER *decoder) {
+  if (my_base64_decoder_skip_spaces(decoder)) return true; /* End-of-input */
+
+  if (!my_base64_add(decoder)) /* Valid base64 character found */
+  {
+    if (decoder->mark) {
+      /* If we have scanned '=' already, then only '=' is valid */
+      assert(decoder->state == 3);
+      decoder->error = 1;
+      decoder->src--;
+      return true; /* expected '=', but encoding character found */
+    }
+    decoder->state++;
+    return false;
+  }
+
+  /* Process error */
+  switch (decoder->state) {
+    case 0:
+    case 1:
+      decoder->src--;
+      return true; /* base64 character expected */
+
+    case 2:
+    case 3:
+      if (decoder->src[-1] == '=') {
+        decoder->error = 0; /* Not an error - it's a pad character */
+        decoder->mark++;
+      } else {
+        decoder->src--;
+        return true; /* base64 character or '=' expected */
+      }
+      break;
+
+    default:
+      assert(0);
+      return true; /* Wrong state, should not happen */
+  }
+
+  decoder->state++;
+  return false;
+}
+
 /*
   Calculate how much memory needed for dst of base64_encode()
 */
-uint64 base64_needed_encoded_length(uint64 length_of_data);
+static inline uint64 base64_needed_encoded_length(uint64 length_of_data) {
+  uint64 nb_base64_chars;
+  if (length_of_data == 0) return 1;
+  nb_base64_chars = (length_of_data + 2) / 3 * 4;
+
+  return nb_base64_chars +            /* base64 char incl padding */
+         (nb_base64_chars - 1) / 76 + /* newlines */
+         1;                           /* NUL termination of string */
+}
 
 /*
   Maximum length base64_encode_needed_length() can accept with no overflow.
 */
-uint64 base64_encode_max_arg_length(void);
+static inline uint64 base64_encode_max_arg_length() {
+#if (SIZEOF_VOIDP == 8)
+  /*
+    6827690988321067803 ->   9223372036854775805
+    6827690988321067804 ->  -9223372036854775807
+  */
+  return 0x5EC0D4C77B03531BLL;
+#else
+  /*
+    1589695686 ->  2147483646
+    1589695687 -> -2147483645
+  */
+  return 0x5EC0D4C6;
+#endif
+}
 
 /*
   Calculate how much memory needed for dst of base64_decode()
 */
-uint64 base64_needed_decoded_length(uint64 length_of_encoded_data);
+static inline uint64 base64_needed_decoded_length(
+    uint64 length_of_encoded_data) {
+  return static_cast<uint64>(
+      ceil(static_cast<double>(length_of_encoded_data * 3 / 4)));
+}
 
 /*
   Maximum length base64_decode_needed_length() can accept with no overflow.
 */
-uint64 base64_decode_max_arg_length();
+static inline uint64 base64_decode_max_arg_length() {
+#if (SIZEOF_VOIDP == 8)
+  return 0x2AAAAAAAAAAAAAAALL;
+#else
+  return 0x2AAAAAAA;
+#endif
+}
 
 /*
   Encode data as a base64 string
 */
-int base64_encode(const void *src, size_t src_len, char *dst);
+static inline int base64_encode(const void *src, size_t src_len, char *dst) {
+  const unsigned char *s = (const unsigned char *)src;
+  size_t i = 0;
+  size_t len = 0;
 
-/*
-  Decode a base64 string into data
-*/
-int64 base64_decode(const char *src, size_t src_len, void *dst,
-                    const char **end_ptr, int flags);
+  for (; i < src_len; len += 4) {
+    unsigned c;
 
-/* Allow multuple chunks 'AAA= AA== AA==', binlog uses this */
-#define MY_BASE64_DECODE_ALLOW_MULTIPLE_CHUNKS 1
+    if (len == 76) {
+      len = 0;
+      *dst++ = '\n';
+    }
+
+    c = s[i++];
+    c <<= 8;
+
+    if (i < src_len) c += s[i];
+    c <<= 8;
+    i++;
+
+    if (i < src_len) c += s[i];
+    i++;
+
+    *dst++ = base64_table[(c >> 18) & 0x3f];
+    *dst++ = base64_table[(c >> 12) & 0x3f];
+
+    if (i > (src_len + 1))
+      *dst++ = '=';
+    else
+      *dst++ = base64_table[(c >> 6) & 0x3f];
+
+    if (i > src_len)
+      *dst++ = '=';
+    else
+      *dst++ = base64_table[(c >> 0) & 0x3f];
+  }
+  *dst = '\0';
+
+  return 0;
+}
+
+/**
+ * Decode a base64 string
+ * The base64-encoded data in the range ['src','*end_ptr') will be
+ * decoded and stored starting at 'dst'.  The decoding will stop
+ * after 'len' characters have been read from 'src', or when padding
+ * occurs in the base64-encoded data. In either case: if 'end_ptr' is
+ * non-null, '*end_ptr' will be set to point to the character after
+ * the last read character, even in the presence of error.
+ *
+ * Note: We require that 'dst' is pre-allocated to correct size.
+ *
+ * @param src_base Pointer to base64-encoded string
+ * @param len     Length of string at 'src'
+ * @param dst     Pointer to location where decoded data will be stored
+ * @param end_ptr Pointer to variable that will refer to the character
+ *                after the end of the encoded data that were decoded.
+ *                Can be NULL.
+ * @param flags   flags e.g. allow multiple chunks
+ * @return Number of bytes written at 'dst', or -1 in case of failure
+ */
+static inline int64 base64_decode(const char *src_base, size_t len, void *dst,
+                                  const char **end_ptr, int flags) {
+  char *d = (char *)dst;
+  MY_BASE64_DECODER decoder;
+
+  decoder.src = src_base;
+  decoder.end = src_base + len;
+  decoder.error = 0;
+  decoder.mark = 0;
+
+  for (;;) {
+    decoder.c = 0;
+    decoder.state = 0;
+
+    if (my_base64_decoder_getch(&decoder) ||
+        my_base64_decoder_getch(&decoder) ||
+        my_base64_decoder_getch(&decoder) || my_base64_decoder_getch(&decoder))
+      break;
+
+    *d++ = (decoder.c >> 16) & 0xff;
+    *d++ = (decoder.c >> 8) & 0xff;
+    *d++ = (decoder.c >> 0) & 0xff;
+
+    if (decoder.mark) {
+      d -= decoder.mark;
+      if (!(flags & MY_BASE64_DECODE_ALLOW_MULTIPLE_CHUNKS)) break;
+      decoder.mark = 0;
+    }
+  }
+
+  /* Return error if there are more non-space characters */
+  decoder.state = 0;
+  if (!my_base64_decoder_skip_spaces(&decoder)) decoder.error = 1;
+
+  if (end_ptr != nullptr) *end_ptr = decoder.src;
+
+  return decoder.error ? -1 : (int)(d - (char *)dst);
+}
 
 #endif /* !__BASE64_H_INCLUDED__ */
diff -Nru mysql-8.0-8.0.26/include/decimal.h mysql-8.0-8.0.27/include/decimal.h
--- mysql-8.0-8.0.26/include/decimal.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/decimal.h	2021-09-28 11:46:34.000000000 +0000
@@ -145,8 +145,9 @@
 #define E_DEC_BAD_NUM 8
 #define E_DEC_OOM 16
 
-#define E_DEC_ERROR 31
-#define E_DEC_FATAL_ERROR 30
+#define E_DEC_FATAL_ERROR \
+  (E_DEC_OVERFLOW | E_DEC_DIV_ZERO | E_DEC_BAD_NUM | E_DEC_OOM)
+#define E_DEC_ERROR (E_DEC_FATAL_ERROR | E_DEC_TRUNCATED)
 
 static constexpr int DECIMAL_MAX_SCALE{30};
 static constexpr int DECIMAL_NOT_SPECIFIED{DECIMAL_MAX_SCALE + 1};
diff -Nru mysql-8.0-8.0.26/include/errmsg.h mysql-8.0-8.0.27/include/errmsg.h
--- mysql-8.0-8.0.26/include/errmsg.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/errmsg.h	2021-09-28 11:46:34.000000000 +0000
@@ -129,7 +129,9 @@
 #define CR_LOAD_DATA_LOCAL_INFILE_REJECTED 2068
 #define CR_LOAD_DATA_LOCAL_INFILE_REALPATH_FAIL 2069
 #define CR_DNS_SRV_LOOKUP_FAILED 2070
-#define CR_ERROR_LAST /*Copy last error nr:*/ 2070
+#define CR_MANDATORY_TRACKER_NOT_FOUND 2071
+#define CR_INVALID_FACTOR_NO 2072
+#define CR_ERROR_LAST /*Copy last error nr:*/ 2072
 /* Add error numbers before CR_ERROR_LAST and change it accordingly. */
 
 /* Visual Studio requires '__inline' for C code */
diff -Nru mysql-8.0-8.0.26/include/guard.h mysql-8.0-8.0.27/include/guard.h
--- mysql-8.0-8.0.26/include/guard.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/guard.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-#ifndef INCLUDE_GUARD_H_
-#define INCLUDE_GUARD_H_
-/* Copyright (c) 2019, 2021, Oracle 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,
-   as published by the Free Software Foundation.
-
-   This program is also distributed with certain software (including
-   but not limited to OpenSSL) that is licensed under separate terms,
-   as designated in a particular file or component or in included license
-   documentation.  The authors of MySQL hereby grant you an additional
-   permission to link the program and your derivative works with the
-   separately licensed software that they have included with MySQL.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License, version 2.0, for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
-
-/**
-  @file guard.h RAII classes for locking/unlocking, inspired by the guard
-  class of Boost fame.
-*/
-
-#include <mysql/psi/mysql_mutex.h>
-#include <mysql/psi/mysql_rwlock.h>
-#include <mysql/psi/mysql_thread.h>
-
-/// Guards a mutex.
-class Mutex_guard {
- public:
-  Mutex_guard(const Mutex_guard &lock) = delete;
-
-  /**
-    Object construction that locks specified mutex.
-
-    @param mutex Mutex pointer to be locked.
-  */
-  explicit Mutex_guard(mysql_mutex_t *mutex) : m_mutex(mutex) {
-    mysql_mutex_lock(m_mutex);
-  }
-
-  /// Destroys object and unlocks the mutex.
-  ~Mutex_guard() { mysql_mutex_unlock(m_mutex); }
-
- private:
-  mysql_mutex_t *m_mutex;
-};
-
-#endif  // INCLUDE_GUARD_H_
diff -Nru mysql-8.0-8.0.26/include/lf.h mysql-8.0-8.0.27/include/lf.h
--- mysql-8.0-8.0.26/include/lf.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/lf.h	2021-09-28 11:46:34.000000000 +0000
@@ -98,8 +98,8 @@
   we'll enable it on GCC only, which supports zero-length arrays.
 */
 #if defined(__GNUC__) && defined(MY_LF_EXTRA_DEBUG)
-#define LF_REQUIRE_PINS(N)                                                   \
-  static const char require_pins[LF_PINBOX_PINS - N] MY_ATTRIBUTE((unused)); \
+#define LF_REQUIRE_PINS(N)                                             \
+  static const char require_pins[LF_PINBOX_PINS - N] [[maybe_unused]]; \
   static const int LF_NUM_PINS_IN_THIS_FILE = N;
 #else
 #define LF_REQUIRE_PINS(N)
diff -Nru mysql-8.0-8.0.26/include/manifest.h mysql-8.0-8.0.27/include/manifest.h
--- mysql-8.0-8.0.26/include/manifest.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/manifest.h	2021-09-28 11:46:34.000000000 +0000
@@ -89,7 +89,8 @@
       config_file_path_ = path + executable;
     else
       config_file_path_ = executable;
-    std::ifstream file_stream(config_file_path_, std::ios::in | std::ios::ate);
+    std::ifstream file_stream(config_file_path_,
+                              std::ios::in | std::ios::ate | std::ios::binary);
     if (!file_stream.is_open()) return;
     file_present_ = true;
     {
diff -Nru mysql-8.0-8.0.26/include/map_helpers.h mysql-8.0-8.0.27/include/map_helpers.h
--- mysql-8.0-8.0.26/include/map_helpers.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/map_helpers.h	2021-09-28 11:46:34.000000000 +0000
@@ -50,64 +50,34 @@
   against container.end() yourself.
 */
 template <class Container, class Key>
-static inline auto find_or_nullptr(const Container &container, const Key &key)
-    -> typename std::enable_if<
-        std::is_pointer<typename Container::value_type::second_type>::value,
-        typename Container::value_type::second_type>::type {
+static inline auto find_or_nullptr(const Container &container, const Key &key) {
   const auto it = container.find(key);
-  if (it == container.end())
-    return nullptr;
-  else
-    return it->second;
-}
-
-template <class Container, class Key>
-static inline auto find_or_nullptr(const Container &container, const Key &key)
-    -> typename std::enable_if<
-        std::is_pointer<
-            typename Container::value_type::second_type::pointer>::value,
-        typename Container::value_type::second_type::pointer>::type {
-  const auto it = container.find(key);
-  if (it == container.end())
-    return nullptr;
-  else
-    return it->second.get();
+  if constexpr (std::is_pointer_v<typename Container::mapped_type>) {
+    return it == container.end() ? nullptr : it->second;
+  } else {
+    return it == container.end() ? nullptr : it->second.get();
+  }
 }
 
 /**
   For unordered_multimap<Key, Value>, erase the first specific element that
   matches _both_ the given key and value.
 */
-template <class Container>
+template <class Container, class Value>
 typename Container::iterator erase_specific_element(
     Container *container, const typename Container::key_type &key,
-    const typename Container::value_type::second_type &value) {
+    const Value &value) {
   auto it_range = container->equal_range(key);
   for (auto it = it_range.first; it != it_range.second; ++it) {
-    if (it->second == value) return container->erase(it);
+    if constexpr (std::is_pointer_v<typename Container::mapped_type>) {
+      if (it->second == value) return container->erase(it);
+    } else {
+      // For when the container holds unique_ptr elements.
+      if (it->second.get() == value) return container->erase(it);
+    }
   }
   return container->end();
 }
-
-/**
-  Same as regular erase_specific_element(), but for the case where the
-  container holds unique_ptr elements.
-*/
-template <class Container>
-static inline auto erase_specific_element(
-    Container *container, const typename Container::key_type &key,
-    typename Container::value_type::second_type::pointer value) ->
-    typename std::enable_if<
-        std::is_pointer<
-            typename Container::value_type::second_type::pointer>::value,
-        typename Container::iterator>::type {
-  auto it_range = container->equal_range(key);
-  for (auto it = it_range.first; it != it_range.second; ++it) {
-    if (it->second.get() == value) return container->erase(it);
-  }
-  return container->end();
-}
-
 /**
   std::unique_ptr, but with a custom delete function.
   Normally, it is more efficient to have a deleter class instead,
diff -Nru mysql-8.0-8.0.26/include/m_ctype.h mysql-8.0-8.0.27/include/m_ctype.h
--- mysql-8.0-8.0.26/include/m_ctype.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/m_ctype.h	2021-09-28 11:46:34.000000000 +0000
@@ -577,10 +577,10 @@
                       const char *str_end, const char *wildstr,
                       const char *wildend, int escape, int w_one, int w_many);
 
-int my_strcasecmp_mb_bin(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                         const char *s, const char *t);
+int my_strcasecmp_mb_bin(const CHARSET_INFO *cs [[maybe_unused]], const char *s,
+                         const char *t);
 
-void my_hash_sort_mb_bin(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+void my_hash_sort_mb_bin(const CHARSET_INFO *cs [[maybe_unused]],
                          const uchar *key, size_t len, uint64 *nr1,
                          uint64 *nr2);
 
diff -Nru mysql-8.0-8.0.26/include/my_aes.h mysql-8.0-8.0.27/include/my_aes.h
--- mysql-8.0-8.0.26/include/my_aes.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/my_aes.h	2021-09-28 11:46:34.000000000 +0000
@@ -117,7 +117,7 @@
   @return               size of buffer required to store encrypted data
 */
 
-int my_aes_get_size(uint32 source_length, enum my_aes_opmode opmode);
+longlong my_aes_get_size(uint32 source_length, enum my_aes_opmode opmode);
 
 /**
   Return true if the AES cipher and block mode requires an IV.
diff -Nru mysql-8.0-8.0.26/include/my_alloc.h mysql-8.0-8.0.27/include/my_alloc.h
--- mysql-8.0-8.0.26/include/my_alloc.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/my_alloc.h	2021-09-28 11:46:34.000000000 +0000
@@ -156,13 +156,18 @@
   }
 
   /**
-    Allocate “num� objects of type T, and default-construct them.
+    Allocate “num� objects of type T, and initialize them to a default value
+    that is created by passing the supplied args to T's constructor. If args
+    is empty, value-initialization is used. For primitive types, like int and
+    pointers, this means the elements will be set to the equivalent of 0
+    (or false or nullptr).
+
     If the constructor throws an exception, behavior is undefined.
 
     We don't use new[], as it can put extra data in front of the array.
    */
   template <class T, class... Args>
-  T *ArrayAlloc(size_t num, Args &&... args) {
+  T *ArrayAlloc(size_t num, Args... args) {
     static_assert(alignof(T) <= 8, "MEM_ROOT only returns 8-aligned memory.");
     if (num * sizeof(T) < num) {
       // Overflow.
@@ -174,11 +179,9 @@
       return nullptr;
     }
 
-    // Construct all elements. For primitive types like int
-    // and no arguments (ie., default construction),
-    // the entire loop will be optimized away.
+    // Initialize all elements.
     for (size_t i = 0; i < num; ++i) {
-      new (&ret[i]) T(std::forward<Args>(args)...);
+      new (&ret[i]) T(args...);
     }
 
     return ret;
@@ -391,14 +394,6 @@
   PSI_memory_key m_psi_key = 0;
 };
 
-// Legacy C thunks. Do not use in new code.
-static inline void init_alloc_root(PSI_memory_key key, MEM_ROOT *root,
-                                   size_t block_size, size_t) {
-  ::new (root) MEM_ROOT(key, block_size);
-}
-
-void free_root(MEM_ROOT *root, myf flags);
-
 /**
  * Allocate an object of the given type. Use like this:
  *
@@ -413,15 +408,15 @@
  * a MEM_ROOT using regular placement new. We should make a less ambiguous
  * syntax, e.g. new (On(mem_root)) Foo().
  */
-inline void *operator new(
-    size_t size, MEM_ROOT *mem_root,
-    const std::nothrow_t &arg MY_ATTRIBUTE((unused)) = std::nothrow) noexcept {
+inline void *operator new(size_t size, MEM_ROOT *mem_root,
+                          const std::nothrow_t &arg
+                          [[maybe_unused]] = std::nothrow) noexcept {
   return mem_root->Alloc(size);
 }
 
-inline void *operator new[](
-    size_t size, MEM_ROOT *mem_root,
-    const std::nothrow_t &arg MY_ATTRIBUTE((unused)) = std::nothrow) noexcept {
+inline void *operator new[](size_t size, MEM_ROOT *mem_root,
+                            const std::nothrow_t &arg
+                            [[maybe_unused]] = std::nothrow) noexcept {
   return mem_root->Alloc(size);
 }
 
diff -Nru mysql-8.0-8.0.26/include/my_command.h mysql-8.0-8.0.27/include/my_command.h
--- mysql-8.0-8.0.26/include/my_command.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/my_command.h	2021-09-28 11:46:34.000000000 +0000
@@ -93,6 +93,7 @@
   COM_BINLOG_DUMP_GTID,
   COM_RESET_CONNECTION, /**< See @ref page_protocol_com_reset_connection */
   COM_CLONE,
+  COM_SUBSCRIBE_GROUP_REPLICATION_STREAM,
   /* don't forget to update const char *command_name[] in sql_parse.cc */
 
   /* Must be last */
diff -Nru mysql-8.0-8.0.26/include/my_dbug.h mysql-8.0-8.0.27/include/my_dbug.h
--- mysql-8.0-8.0.26/include/my_dbug.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/my_dbug.h	2021-09-28 11:46:34.000000000 +0000
@@ -130,22 +130,9 @@
   _db_stack_frame_ m_stack_frame;
 };
 
-#ifdef __SUNPRO_CC
-// Disable debug tracing for Developer Studio, because we may get
-// a fatal error from ld when linking large executables.
-//   section .eh_frame%__gthread_trigger():
-//   unexpected negative integer encountered: offset 0x630
-#define DBUG_TRACE \
-  do {             \
-  } while (false)
-
-#else
-
 #define DBUG_TRACE \
   AutoDebugTrace _db_trace(DBUG_PRETTY_FUNCTION, __FILE__, __LINE__)
 
-#endif  // __SUNPRO_CC
-
 #endif
 
 #define DBUG_ENTER(a)                       \
@@ -340,8 +327,8 @@
                   called in debug mode if the keyword is enabled.
  */
 template <class DBGCLOS>
-inline void dbug(const char *keyword MY_ATTRIBUTE((unused)),
-                 DBGCLOS &&clos MY_ATTRIBUTE((unused))) {
+inline void dbug(const char *keyword [[maybe_unused]],
+                 DBGCLOS &&clos [[maybe_unused]]) {
   DBUG_EXECUTE_IF(keyword, clos(););
 }
 
diff -Nru mysql-8.0-8.0.26/include/my_default.h mysql-8.0-8.0.27/include/my_default.h
--- mysql-8.0-8.0.26/include/my_default.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/my_default.h	2021-09-28 11:46:34.000000000 +0000
@@ -56,7 +56,8 @@
 extern "C" int my_load_defaults(const char *conf_file, const char **groups,
                                 int *argc, char ***argv, MEM_ROOT *alloc,
                                 const char ***);
-int check_file_permissions(const char *file_name, bool is_login_file);
+int check_file_permissions(const char *file_name, bool is_login_file,
+                           myf MyFlags = 0);
 int load_defaults(const char *conf_file, const char **groups, int *argc,
                   char ***argv, MEM_ROOT *alloc);
 int my_search_option_files(const char *conf_file, int *argc, char ***argv,
diff -Nru mysql-8.0-8.0.26/include/my_rdtsc.h mysql-8.0-8.0.27/include/my_rdtsc.h
--- mysql-8.0-8.0.26/include/my_rdtsc.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/my_rdtsc.h	2021-09-28 11:46:34.000000000 +0000
@@ -119,14 +119,14 @@
 #define MY_TIMER_ROUTINE_TIMES 17
 /* #define MY_TIMER_ROUTINE_FTIME                   18  - No longer used */
 #define MY_TIMER_ROUTINE_ASM_PPC64 19
-#define MY_TIMER_ROUTINE_ASM_SUNPRO_SPARC64 20
-#define MY_TIMER_ROUTINE_ASM_SUNPRO_SPARC32 21
-#define MY_TIMER_ROUTINE_ASM_SUNPRO_I386 22
+/* #define MY_TIMER_ROUTINE_ASM_SUNPRO_SPARC64      20  - No longer used */
+/* #define MY_TIMER_ROUTINE_ASM_SUNPRO_SPARC32      21  - No longer used */
+/* #define MY_TIMER_ROUTINE_ASM_SUNPRO_I386         22  - No longer used */
 #define MY_TIMER_ROUTINE_ASM_GCC_SPARC64 23
-#define MY_TIMER_ROUTINE_ASM_GCC_SPARC32 24
+/* #define MY_TIMER_ROUTINE_ASM_GCC_SPARC32         24  - No longer used */
 #define MY_TIMER_ROUTINE_MACH_ABSOLUTE_TIME 25
 #define MY_TIMER_ROUTINE_GETSYSTEMTIMEASFILETIME 26
-#define MY_TIMER_ROUTINE_ASM_SUNPRO_X86_64 27
+/* #define MY_TIMER_ROUTINE_ASM_SUNPRO_X86_64       27  - No longer used */
 #define MY_TIMER_ROUTINE_ASM_AARCH64 28
 
 #endif
diff -Nru mysql-8.0-8.0.26/include/mysql/client_plugin.h mysql-8.0-8.0.27/include/mysql/client_plugin.h
--- mysql-8.0-8.0.26/include/mysql/client_plugin.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/mysql/client_plugin.h	2021-09-28 11:46:34.000000000 +0000
@@ -62,9 +62,15 @@
 #endif
 #endif /*MYSQL_DYNAMIC_PLUGIN */
 #else  /*_MSC_VER */
+
+#if defined(MYSQL_DYNAMIC_PLUGIN)
+#define MYSQL_PLUGIN_EXPORT MY_ATTRIBUTE((visibility("default")))
+#else
 #define MYSQL_PLUGIN_EXPORT
 #endif
 
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -75,8 +81,8 @@
 #define MYSQL_CLIENT_AUTHENTICATION_PLUGIN 2
 #define MYSQL_CLIENT_TRACE_PLUGIN 3
 
-#define MYSQL_CLIENT_AUTHENTICATION_PLUGIN_INTERFACE_VERSION 0x0101
-#define MYSQL_CLIENT_TRACE_PLUGIN_INTERFACE_VERSION 0x0100
+#define MYSQL_CLIENT_AUTHENTICATION_PLUGIN_INTERFACE_VERSION 0x0200
+#define MYSQL_CLIENT_TRACE_PLUGIN_INTERFACE_VERSION 0x0200
 
 #define MYSQL_CLIENT_MAX_PLUGINS 4
 
@@ -90,18 +96,19 @@
 #define mysql_end_client_plugin }
 
 /* generic plugin header structure */
-#define MYSQL_CLIENT_PLUGIN_HEADER           \
-  int type;                                  \
-  unsigned int interface_version;            \
-  const char *name;                          \
-  const char *author;                        \
-  const char *desc;                          \
-  unsigned int version[3];                   \
-  const char *license;                       \
-  void *mysql_api;                           \
-  int (*init)(char *, size_t, int, va_list); \
-  int (*deinit)(void);                       \
-  int (*options)(const char *option, const void *);
+#define MYSQL_CLIENT_PLUGIN_HEADER                  \
+  int type;                                         \
+  unsigned int interface_version;                   \
+  const char *name;                                 \
+  const char *author;                               \
+  const char *desc;                                 \
+  unsigned int version[3];                          \
+  const char *license;                              \
+  void *mysql_api;                                  \
+  int (*init)(char *, size_t, int, va_list);        \
+  int (*deinit)(void);                              \
+  int (*options)(const char *option, const void *); \
+  int (*get_options)(const char *option, void *);
 
 struct st_mysql_client_plugin {
   MYSQL_CLIENT_PLUGIN_HEADER
@@ -208,6 +215,21 @@
 int mysql_plugin_options(struct st_mysql_client_plugin *plugin,
                          const char *option, const void *value);
 
+/**
+  get plugin options
+
+  Can be used to get options from a plugin.
+  This function may be called multiple times to get several options
+
+  @param plugin an st_mysql_client_plugin structure
+  @param option a string which specifies the option to get
+  @param[out] value  value for the option.
+
+  @retval 0 on success, 1 in case of failure
+**/
+int mysql_plugin_get_option(struct st_mysql_client_plugin *plugin,
+                            const char *option, void *value);
+
 #ifdef __cplusplus
 }
 #endif
diff -Nru mysql-8.0-8.0.26/include/mysql/client_plugin.h.pp mysql-8.0-8.0.27/include/mysql/client_plugin.h.pp
--- mysql-8.0-8.0.26/include/mysql/client_plugin.h.pp	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/mysql/client_plugin.h.pp	2021-09-28 11:46:34.000000000 +0000
@@ -1,5 +1,5 @@
 struct st_mysql_client_plugin {
-  int type; unsigned int interface_version; const char *name; const char *author; const char *desc; unsigned int version[3]; const char *license; void *mysql_api; int (*init)(char *, size_t, int, va_list); int (*deinit)(void); int (*options)(const char *option, const void *);
+  int type; unsigned int interface_version; const char *name; const char *author; const char *desc; unsigned int version[3]; const char *license; void *mysql_api; int (*init)(char *, size_t, int, va_list); int (*deinit)(void); int (*options)(const char *option, const void *); int (*get_options)(const char *option, void *);
 };
 struct MYSQL;
 #include "plugin_auth_common.h"
@@ -33,7 +33,7 @@
       int *result);
 } MYSQL_PLUGIN_VIO;
 struct auth_plugin_t {
-  int type; unsigned int interface_version; const char *name; const char *author; const char *desc; unsigned int version[3]; const char *license; void *mysql_api; int (*init)(char *, size_t, int, va_list); int (*deinit)(void); int (*options)(const char *option, const void *);
+  int type; unsigned int interface_version; const char *name; const char *author; const char *desc; unsigned int version[3]; const char *license; void *mysql_api; int (*init)(char *, size_t, int, va_list); int (*deinit)(void); int (*options)(const char *option, const void *);int (*get_options)(const char *option, void *);
   int (*authenticate_user)(MYSQL_PLUGIN_VIO *vio, struct MYSQL *mysql);
   enum net_async_status (*authenticate_user_nonblocking)(MYSQL_PLUGIN_VIO *vio,
                                                          struct MYSQL *mysql,
@@ -53,3 +53,5 @@
     struct MYSQL *mysql, struct st_mysql_client_plugin *plugin);
 int mysql_plugin_options(struct st_mysql_client_plugin *plugin,
                          const char *option, const void *value);
+int mysql_plugin_get_option(struct st_mysql_client_plugin *plugin,
+                         const char *option, void *value);
diff -Nru mysql-8.0-8.0.26/include/mysql/components/library_mysys/component_malloc_allocator.h mysql-8.0-8.0.27/include/mysql/components/library_mysys/component_malloc_allocator.h
--- mysql-8.0-8.0.26/include/mysql/components/library_mysys/component_malloc_allocator.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/mysql/components/library_mysys/component_malloc_allocator.h	2021-09-28 11:46:34.000000000 +0000
@@ -87,7 +87,7 @@
   // on release builds assert is not evaluated. So compilation error is seen,
   // hence used 'unused' attribute.
   Component_malloc_allocator &operator=(
-      const Component_malloc_allocator<U> &other MY_ATTRIBUTE((unused))) {
+      const Component_malloc_allocator<U> &other [[maybe_unused]]) {
     assert(m_key == other.psi_key());  // Don't swap key.
   }
 
diff -Nru mysql-8.0-8.0.26/include/mysql/components/services/bits/psi_bits.h mysql-8.0-8.0.27/include/mysql/components/services/bits/psi_bits.h
--- mysql-8.0-8.0.26/include/mysql/components/services/bits/psi_bits.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/mysql/components/services/bits/psi_bits.h	2021-09-28 11:46:34.000000000 +0000
@@ -43,7 +43,15 @@
 
 #define PSI_DOCUMENT_ME ""
 
+// Remove 'constexpr' in order to pick the right overload for
+//    Prealloced_array CTOR.
+// See https://bugs.llvm.org/show_bug.cgi?id=51582
+// and TEST_F(PreallocedArrayTest, CorrectOverloadIsChosen)
+#if defined(__clang__) && defined(_WIN32)
+static unsigned PSI_NOT_INSTRUMENTED = 0;
+#else
 static constexpr unsigned PSI_NOT_INSTRUMENTED = 0;
+#endif
 
 /**
   Singleton flag.
@@ -114,6 +122,18 @@
 */
 #define PSI_FLAG_THREAD_SYSTEM (1 << 9)
 
+/**
+  Automatic sequence number flag.
+  Generate thread instances names automatically.
+*/
+#define PSI_FLAG_AUTO_SEQNUM (1 << 10)
+
+/**
+  No sequence number flag.
+  Use thread instances names without sequence numbers.
+*/
+#define PSI_FLAG_NO_SEQNUM (1 << 11)
+
 #define PSI_VOLATILITY_UNKNOWN 0
 #define PSI_VOLATILITY_PERMANENT 1
 #define PSI_VOLATILITY_PROVISIONING 2
diff -Nru mysql-8.0-8.0.26/include/mysql/components/services/group_replication_status_service.h mysql-8.0-8.0.27/include/mysql/components/services/group_replication_status_service.h
--- mysql-8.0-8.0.26/include/mysql/components/services/group_replication_status_service.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/include/mysql/components/services/group_replication_status_service.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,92 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef GROUP_REPLICATION_STATUS_SERVICE_H
+#define GROUP_REPLICATION_STATUS_SERVICE_H
+
+#include <mysql/components/service.h>
+#include <stddef.h>
+
+/**
+  @ingroup group_components_services_inventory
+
+  A service to get the status of a member of Group Replication.
+
+  This is only available if the component is on a server with Group
+  Replication plugin installed.
+
+  @code
+  SERVICE_TYPE(registry) *plugin_registry = mysql_plugin_registry_acquire();
+  my_service<SERVICE_TYPE(group_replication_status_service_v1)> svc(
+      "group_replication_status_service_v1", plugin_registry);
+
+  if (svc.is_valid()) {
+    bool error = svc->...
+  }
+  @endcode
+*/
+BEGIN_SERVICE_DEFINITION(group_replication_status_service_v1)
+
+/**
+  Checks if this member is part of a group in single-primary mode.
+
+  @return status
+    @retval true  this member is part of a group in single-primary mode
+    @retval false otherwise (including case where member is even not running
+                  Group Replication)
+*/
+DECLARE_BOOL_METHOD(is_group_in_single_primary_mode, ());
+
+/**
+  Checks if this member is part of a group in single-primary mode and if
+  this member is the primary.
+
+  @return status
+    @retval true  this member is part of a group in single-primary mode
+                  and is the primary
+    @retval false otherwise
+*/
+DECLARE_BOOL_METHOD(is_group_in_single_primary_mode_and_im_the_primary, ());
+
+/**
+  Checks if this member is part of a group in single-primary mode and if
+  this member is a secondary.
+
+  @return status
+    @retval true  this member is part of a group in single-primary mode
+                  and is a secondary
+    @retval false otherwise
+*/
+DECLARE_BOOL_METHOD(is_group_in_single_primary_mode_and_im_a_secondary, ());
+
+/**
+  Checks if this member is ONLINE and part of the group majority.
+
+  @return status
+    @retval true  this member is ONLINE and part of the group majority
+    @retval false otherwise
+*/
+DECLARE_BOOL_METHOD(is_member_online_with_group_majority, ());
+
+END_SERVICE_DEFINITION(group_replication_status_service_v1)
+
+#endif /* GROUP_REPLICATION_STATUS_SERVICE_H */
diff -Nru mysql-8.0-8.0.26/include/mysql/components/services/log_builtins.h mysql-8.0-8.0.27/include/mysql/components/services/log_builtins.h
--- mysql-8.0-8.0.26/include/mysql/components/services/log_builtins.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/mysql/components/services/log_builtins.h	2021-09-28 11:46:34.000000000 +0000
@@ -838,8 +838,8 @@
 
 #else
 
-inline void dummy_log_message(longlong severity MY_ATTRIBUTE((unused)),
-                              longlong ecode MY_ATTRIBUTE((unused)), ...) {
+inline void dummy_log_message(longlong severity [[maybe_unused]],
+                              longlong ecode [[maybe_unused]], ...) {
   return;
 }
 
@@ -1502,9 +1502,9 @@
   @retval     true   Failed.
 */
 inline bool init_logging_service_for_plugin(
-    SERVICE_TYPE(registry) * *reg_srv MY_ATTRIBUTE((unused)),
-    SERVICE_TYPE(log_builtins) * *log_bi MY_ATTRIBUTE((unused)),
-    SERVICE_TYPE(log_builtins_string) * *log_bs MY_ATTRIBUTE((unused)))
+    SERVICE_TYPE(registry) * *reg_srv [[maybe_unused]],
+    SERVICE_TYPE(log_builtins) * *log_bi [[maybe_unused]],
+    SERVICE_TYPE(log_builtins_string) * *log_bs [[maybe_unused]])
 
 {
   return false;
@@ -1518,9 +1518,9 @@
   param[in,out]  log_bs     String service for error logging.
 */
 inline void deinit_logging_service_for_plugin(
-    SERVICE_TYPE(registry) * *reg_srv MY_ATTRIBUTE((unused)),
-    SERVICE_TYPE(log_builtins) * *log_bi MY_ATTRIBUTE((unused)),
-    SERVICE_TYPE(log_builtins_string) * *log_bs MY_ATTRIBUTE((unused))) {}
+    SERVICE_TYPE(registry) * *reg_srv [[maybe_unused]],
+    SERVICE_TYPE(log_builtins) * *log_bi [[maybe_unused]],
+    SERVICE_TYPE(log_builtins_string) * *log_bs [[maybe_unused]]) {}
 
 #endif  // MYSQL_DYNAMIC_PLUGIN
 
diff -Nru mysql-8.0-8.0.26/include/mysql/components/services/log_shared.h mysql-8.0-8.0.27/include/mysql/components/services/log_shared.h
--- mysql-8.0-8.0.26/include/mysql/components/services/log_shared.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/mysql/components/services/log_shared.h	2021-09-28 11:46:34.000000000 +0000
@@ -223,7 +223,13 @@
 /** advisory. components must not rely on others using the same value. */
 #define LOG_BUFF_MAX 8192
 
-/** 26 for regular timestamp, plus 7 (".123456") when using micro-seconds */
+/**
+   size of a full ISO 8601 timestamp:
+   - 19 for date/time        2022-02-22T12:34:56
+   -  7 for microsecond part .123456
+   -  6 for tzinfo tail      +14:30
+   -  1 for terminator       \0
+*/
 static const int iso8601_size = 33;
 
 /**
diff -Nru mysql-8.0-8.0.26/include/mysql/components/services/mysql_authentication_registration.h mysql-8.0-8.0.27/include/mysql/components/services/mysql_authentication_registration.h
--- mysql-8.0-8.0.26/include/mysql/components/services/mysql_authentication_registration.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/include/mysql/components/services/mysql_authentication_registration.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,77 @@
+/* Copyright (c) 2021, Oracle 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,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef MYSQL_AUTHENTICATION_REGISTRATION_H
+#define MYSQL_AUTHENTICATION_REGISTRATION_H
+
+#include <mysql/components/service.h>
+
+/**
+  @ingroup group_components_services_inventory
+
+  A service to do registration of fido device.
+*/
+BEGIN_SERVICE_DEFINITION(mysql_authentication_registration)
+
+/**
+  This method performs initiate registration step.
+
+  @param[out] outbuf       Buffer to hold challenge
+  @param[in] outbuflen    Length of buffer
+
+  @return
+    @retval FALSE Succeeded.
+    @retval TRUE  Failed.
+*/
+DECLARE_BOOL_METHOD(init, (unsigned char **outbuf, unsigned int outbuflen));
+
+/**
+  This method performs finish registration step.
+
+  @param [in] buf         Buffer holding signed challenge
+  @param [in] buflen      Length of signed challenge
+  @param [in] challenge       Buffer to hold random challenge
+  @param [in] challenge_length   Length of random challenge
+  @param [out] challenge_response       Buffer to hold challenge response
+  @param [out] challenge_response_length    Length of challenge response
+
+  @return
+    @retval FALSE Succeeded.
+    @retval TRUE  Failed.
+*/
+DECLARE_BOOL_METHOD(finish, (unsigned char *buf, unsigned int buflen,
+                             const unsigned char *challenge,
+                             unsigned int challenge_length,
+                             unsigned char *challenge_response,
+                             unsigned int *challenge_response_length));
+
+/**
+  This method calculates length of challenge required for server to allocate
+  buffer which needs to be passed to init() to extract challenge.
+
+  @param [out] outbuflen       Buffer to hold length of challenge
+*/
+DECLARE_METHOD(void, get_challenge_length, (unsigned int *outbuflen));
+
+END_SERVICE_DEFINITION(mysql_authentication_registration)
+
+#endif /* MYSQL_AUTHENTICATION_REGISTRATION_H */
\ No newline at end of file
diff -Nru mysql-8.0-8.0.26/include/mysql/components/services/psi_thread_bits.h mysql-8.0-8.0.27/include/mysql/components/services/psi_thread_bits.h
--- mysql-8.0-8.0.26/include/mysql/components/services/psi_thread_bits.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/mysql/components/services/psi_thread_bits.h	2021-09-28 11:46:34.000000000 +0000
@@ -48,6 +48,15 @@
 */
 typedef unsigned int PSI_thread_key;
 
+/**
+  Instrumented thread sequence number.
+  This sequence number is used in conjunction
+  with @ref PSI_thread_info_v5::m_os_name "foo",
+  to print names like "foo-NN" in ps/top/debuggers ...
+  @see my_thread_self_setname().
+*/
+typedef unsigned int PSI_thread_seqnum;
+
 #ifdef __cplusplus
 class THD;
 #else
@@ -100,6 +109,91 @@
 typedef struct PSI_thread_info_v1 PSI_thread_info_v1;
 
 /**
+  Thread instrument information.
+  @since PSI_THREAD_VERSION_5
+  This structure is used to register an instrumented thread.
+*/
+struct PSI_thread_info_v5 {
+  /**
+    Pointer to the key assigned to the registered thread.
+  */
+  PSI_thread_key *m_key;
+  /**
+    The name of the thread instrument to register.
+  */
+  const char *m_name;
+
+  /**
+    The thread name to advertise to the operating system.
+
+    The performance schema thread instrumentation
+    exports instrumented names to the operating system,
+    so they can be visible in:
+    - the output of ps
+    - the output of top
+    - a debugger
+    etc.
+
+    This feature is optional, and improves
+    observability for platforms that support
+    a flavor of pthread_setname_np().
+    On other platforms, there are no effects.
+
+    Performance schema thread names can be instrumented
+    in different ways.
+
+    First, the thread can be unique (@c PSI_FLAG_SINGLETON).
+    In this case, the @c m_os_name attribute is printed as is.
+
+    Second, for threads that exist in multiple instances
+    (flag @c PSI_FLAG_SINGLETON not set),
+    the caller code should pass a sequence number when creating
+    a thread instance with @c new_thread_v5_t or @c spawn_thread_v5_t.
+
+    This sequence number is concatenated (with a dash) to
+    the @c m_os_name so that a thread name "foo" with a sequence
+    of "12" is displayed as "foo-12".
+    When the actual value of the sequence number has a special meaning
+    to the instrumented code (for example, a worker number is also
+    exposed in different places), this is the preferred instrumentation.
+
+    Third, for threads that exist in multiple instances,
+    but do not rely on a specific numbering, setting the flag
+    @c PSI_FLAG_AUTO_SEQNUM causes the performance schema to number
+    threads automatically, so the calling code does not have to do it.
+
+    Fourth and last, for threads that exist in multiple instances,
+    and are executed so often that the total number of threads
+    grows to a very large number (for example, user sessions),
+    numbering threads is not practical because of size limitations,
+    and would introduce just noise in the ps output.
+
+    For this case, the flag @c PSI_FLAG_NO_SEQNUM can be used
+    to avoid numbering.
+
+    @sa my_thread_self_setname().
+    @sa new_thread_v5_t
+    @sa spawn_thread_v5_t
+
+  */
+  const char *m_os_name;
+  /**
+    The flags of the thread to register.
+    @sa PSI_FLAG_SINGLETON
+    @sa PSI_FLAG_USER
+    @sa PSI_FLAG_THREAD_SYSTEM
+    @sa PSI_FLAG_AUTO_SEQNUM
+    @sa PSI_FLAG_NO_SEQNUM
+  */
+  unsigned int m_flags;
+  /** Volatility index. */
+  int m_volatility;
+  /** Documentation. */
+  const char *m_documentation;
+};
+typedef struct PSI_thread_info_v5 PSI_thread_info_v5;
+
+/**
   Thread registration API.
   @param category a category name (typically a plugin name)
   @param info an array of thread info to register
@@ -110,6 +204,16 @@
                                      int count);
 
 /**
+  Thread registration API.
+  @param category a category name (typically a plugin name)
+  @param info an array of thread info to register
+  @param count the size of the info array
+*/
+typedef void (*register_thread_v5_t)(const char *category,
+                                     struct PSI_thread_info_v5 *info,
+                                     int count);
+
+/**
   Spawn a thread.
   This method creates a new thread, with instrumentation.
   @param key the instrumentation key for this thread
@@ -122,6 +226,11 @@
                                  const my_thread_attr_t *attr,
                                  void *(*start_routine)(void *), void *arg);
 
+typedef int (*spawn_thread_v5_t)(PSI_thread_key key, PSI_thread_seqnum seqnum,
+                                 my_thread_handle *thread,
+                                 const my_thread_attr_t *attr,
+                                 void *(*start_routine)(void *), void *arg);
+
 /**
   Create instrumentation for a thread.
   @param key the registered key
@@ -133,6 +242,11 @@
                                               const void *identity,
                                               unsigned long long thread_id);
 
+typedef struct PSI_thread *(*new_thread_v5_t)(PSI_thread_key key,
+                                              PSI_thread_seqnum seqnum,
+                                              const void *identity,
+                                              unsigned long long thread_id);
+
 /**
   Assign a THD to an instrumented thread.
   @param thread the instrumented thread
@@ -472,7 +586,7 @@
 */
 typedef void (*notify_session_change_user_v1_t)(PSI_thread *thread);
 
-typedef struct PSI_thread_info_v1 PSI_thread_info;
+typedef struct PSI_thread_info_v5 PSI_thread_info;
 
 /** @} (end of group psi_abi_thread) */
 
diff -Nru mysql-8.0-8.0.26/include/mysql/components/services/psi_thread.h mysql-8.0-8.0.27/include/mysql/components/services/psi_thread.h
--- mysql-8.0-8.0.26/include/mysql/components/services/psi_thread.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/mysql/components/services/psi_thread.h	2021-09-28 11:46:34.000000000 +0000
@@ -26,12 +26,12 @@
 #include <mysql/components/component_implementation.h>
 #include <mysql/components/services/psi_thread_service.h>
 
-#define REQUIRES_PSI_THREAD_SERVICE REQUIRES_SERVICE(psi_thread_v4)
+#define REQUIRES_PSI_THREAD_SERVICE REQUIRES_SERVICE(psi_thread_v5)
 #define REQUIRES_PSI_THREAD_SERVICE_PLACEHOLDER \
-  REQUIRES_SERVICE_PLACEHOLDER(psi_thread_v4)
+  REQUIRES_SERVICE_PLACEHOLDER(psi_thread_v5)
 
 extern REQUIRES_PSI_THREAD_SERVICE_PLACEHOLDER;
 
-#define PSI_THREAD_CALL(M) mysql_service_psi_thread_v4->M
+#define PSI_THREAD_CALL(M) mysql_service_psi_thread_v5->M
 
 #endif /* COMPONENTS_SERVICES_PSI_THREAD_H */
diff -Nru mysql-8.0-8.0.26/include/mysql/components/services/psi_thread_service.h mysql-8.0-8.0.27/include/mysql/components/services/psi_thread_service.h
--- mysql-8.0-8.0.26/include/mysql/components/services/psi_thread_service.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/mysql/components/services/psi_thread_service.h	2021-09-28 11:46:34.000000000 +0000
@@ -32,27 +32,28 @@
   Introduced in MySQL 8.0.3
   Deprecated in MySQL 8.0.15
   Abandoned in MySQL 8.0.17
-  Status: Removed, use version 4 instead.
+  Status: Removed.
 */
 
 /*
   Version 2.
   Introduced in MySQL 8.0.15
   Abandoned in MySQL 8.0.17
-  Status: Removed, use version 4 instead.
+  Status: Removed.
 */
 
 /*
   Version 3.
   Introduced in MySQL 8.0.17
   Abandoned in MySQL 8.0.22
-  Status: Removed, use version 4 instead.
+  Status: Removed.
 */
 
 /*
   Version 4.
   Introduced in MySQL 8.0.22
-  Status: active
+  Deprecated in MySQL 8.0.25
+  Status: deprecated, use version 5 instead.
 */
 
 BEGIN_SERVICE_DEFINITION(psi_thread_v4)
@@ -122,4 +123,82 @@
 notify_session_change_user_v1_t notify_session_change_user;
 END_SERVICE_DEFINITION(psi_thread_v4)
 
+/*
+  Version 5.
+  Introduced in MySQL 8.0.25
+  Status: active
+  Changes compared to version 4:
+  - register_thread takes an expanded PSI_thread_info_v5 instrumentation,
+    which includes a new m_os_name attribute.
+  - spawn_thread takes an extra sequence number parameter
+  - new_thread takes an extra sequence number parameter
+*/
+
+BEGIN_SERVICE_DEFINITION(psi_thread_v5)
+/** @sa register_thread_v5_t. */
+register_thread_v5_t register_thread;
+/** @sa spawn_thread_v5_t. */
+spawn_thread_v5_t spawn_thread;
+/** @sa new_thread_v5_t. */
+new_thread_v5_t new_thread;
+/** @sa set_thread_id_v1_t. */
+set_thread_id_v1_t set_thread_id;
+/** @sa get_current_thread_internal_id_v2_t. */
+get_current_thread_internal_id_v2_t get_current_thread_internal_id;
+/** @sa get_thread_internal_id_v2_t. */
+get_thread_internal_id_v2_t get_thread_internal_id;
+/** @sa get_thread_by_id_v2_t. */
+get_thread_by_id_v2_t get_thread_by_id;
+/** @sa set_thread_THD_v1_t. */
+set_thread_THD_v1_t set_thread_THD;
+/** @sa set_thread_os_id_v1_t. */
+set_thread_os_id_v1_t set_thread_os_id;
+/** @sa get_thread_v1_t. */
+get_thread_v1_t get_thread;
+/** @sa set_thread_user_v1_t. */
+set_thread_user_v1_t set_thread_user;
+/** @sa set_thread_account_v1_t. */
+set_thread_account_v1_t set_thread_account;
+/** @sa set_thread_db_v1_t. */
+set_thread_db_v1_t set_thread_db;
+/** @sa set_thread_command_v1_t. */
+set_thread_command_v1_t set_thread_command;
+/** @sa set_connection_type_v1_t. */
+set_connection_type_v1_t set_connection_type;
+/** @sa set_thread_start_time_v1_t. */
+set_thread_start_time_v1_t set_thread_start_time;
+/** @sa set_thread_info_v1_t. */
+set_thread_info_v1_t set_thread_info;
+/** @sa set_thread_v1_t. */
+set_thread_v1_t set_thread;
+/** @sa set_thread_peer_port_v4_t. */
+set_thread_peer_port_v4_t set_thread_peer_port;
+/** @sa aggregate_thread_status_v1_t. */
+aggregate_thread_status_v2_t aggregate_thread_status;
+/** @sa delete_current_thread_v1_t. */
+delete_current_thread_v1_t delete_current_thread;
+/** @sa delete_thread_v1_t. */
+delete_thread_v1_t delete_thread;
+/** @sa set_thread_connect_attrs_v1_t. */
+set_thread_connect_attrs_v1_t set_thread_connect_attrs;
+/** @sa get_current_thread_event_id_v2_t. */
+get_current_thread_event_id_v2_t get_current_thread_event_id;
+/** @sa get_thread_event_id_v2_t. */
+get_thread_event_id_v2_t get_thread_event_id;
+/** @sa get_thread_system_attrs_v3_t. */
+get_thread_system_attrs_v3_t get_thread_system_attrs;
+/** @sa get_thread_system_attrs_by_id_v3_t. */
+get_thread_system_attrs_by_id_v3_t get_thread_system_attrs_by_id;
+/** @sa register_notification_v3_t. */
+register_notification_v3_t register_notification;
+/** @sa unregister_notification_v1_t. */
+unregister_notification_v1_t unregister_notification;
+/** @sa notify_session_connect_v1_t. */
+notify_session_connect_v1_t notify_session_connect;
+/** @sa notify_session_disconnect_v1_t. */
+notify_session_disconnect_v1_t notify_session_disconnect;
+/** @sa notify_session_change_user_v1_t. */
+notify_session_change_user_v1_t notify_session_change_user;
+END_SERVICE_DEFINITION(psi_thread_v5)
+
 #endif /* COMPONENTS_SERVICES_PSI_THREAD_SERVICE_H */
diff -Nru mysql-8.0-8.0.26/include/mysql/plugin_audit.h.pp mysql-8.0-8.0.27/include/mysql/plugin_audit.h.pp
--- mysql-8.0-8.0.26/include/mysql/plugin_audit.h.pp	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/mysql/plugin_audit.h.pp	2021-09-28 11:46:34.000000000 +0000
@@ -171,6 +171,7 @@
   COM_BINLOG_DUMP_GTID,
   COM_RESET_CONNECTION,
   COM_CLONE,
+  COM_SUBSCRIBE_GROUP_REPLICATION_STREAM,
   COM_END
 };
 #include "my_sqlcommand.h"
diff -Nru mysql-8.0-8.0.26/include/mysql/plugin_auth_common.h mysql-8.0-8.0.27/include/mysql/plugin_auth_common.h
--- mysql-8.0-8.0.26/include/mysql/plugin_auth_common.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/mysql/plugin_auth_common.h	2021-09-28 11:46:34.000000000 +0000
@@ -94,7 +94,12 @@
   or not.
 */
 #define CR_OK_HANDSHAKE_COMPLETE -2
-
+/**
+  Authentication was successful with limited operations.
+  It means that the both client and server side plugins decided to allow
+  authentication with very limited operations ALTER USER to do registration.
+*/
+#define CR_OK_AUTH_IN_SANDBOX_MODE -3
 /**
 Flag to be passed back to server from authentication plugins via
 authenticated_as when proxy mapping should be done by the server.
diff -Nru mysql-8.0-8.0.26/include/mysql/plugin_auth.h mysql-8.0-8.0.27/include/mysql/plugin_auth.h
--- mysql-8.0-8.0.26/include/mysql/plugin_auth.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/mysql/plugin_auth.h	2021-09-28 11:46:34.000000000 +0000
@@ -33,7 +33,7 @@
 
 #include <mysql/plugin.h>
 
-#define MYSQL_AUTHENTICATION_INTERFACE_VERSION 0x0200
+#define MYSQL_AUTHENTICATION_INTERFACE_VERSION 0x0201
 
 #include "plugin_auth_common.h"
 
@@ -47,6 +47,22 @@
 
 #define AUTH_FLAG_PRIVILEGED_USER_FOR_PASSWORD_CHANGE (1L << 0)
 #define AUTH_FLAG_USES_INTERNAL_STORAGE (1L << 1)
+#define AUTH_FLAG_REQUIRES_REGISTRATION (1L << 2)
+
+struct auth_factor_desc {
+  /**
+    authentication string for 1st, 2nd and 3rd factor auth plugins
+  */
+  const char *auth_string;
+  /**
+    Length of authentication string for 1st, 2nd and 3rd factor auth plugins
+  */
+  unsigned long auth_string_length;
+  /**
+    Flag which tells if connecting user has performed registration or not.
+  */
+  unsigned int is_registration_required;
+};
 
 /**
   Provides server plugin access to authentication information
@@ -64,8 +80,8 @@
   unsigned int user_name_length;
 
   /**
-    A corresponding column value from the mysql.user table for the
-    matching account name
+    Refers to multi_factor_auth_info based on which factor is being
+    authenticated.
   */
   const char *auth_string;
 
@@ -118,6 +134,16 @@
     Length of additional password
   */
   unsigned long additional_auth_string_length;
+
+  /**
+    Refers to which factor auth_string to consider during authentication.
+  */
+  unsigned int current_auth_factor;
+  /**
+    Refers to authentication details of 1st, 2nd or 3rd factor authentiction
+    method
+  */
+  auth_factor_desc *multi_factor_auth_info;
 };
 
 /**
diff -Nru mysql-8.0-8.0.26/include/mysql/plugin_auth.h.pp mysql-8.0-8.0.27/include/mysql/plugin_auth.h.pp
--- mysql-8.0-8.0.26/include/mysql/plugin_auth.h.pp	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/mysql/plugin_auth.h.pp	2021-09-28 11:46:34.000000000 +0000
@@ -150,6 +150,11 @@
       struct MYSQL_PLUGIN_VIO *vio, const unsigned char *pkt, int pkt_len,
       int *result);
 } MYSQL_PLUGIN_VIO;
+struct auth_factor_desc {
+  const char *auth_string;
+  unsigned long auth_string_length;
+  unsigned int is_registration_required;
+};
 struct MYSQL_SERVER_AUTH_INFO {
   char *user_name;
   unsigned int user_name_length;
@@ -162,6 +167,8 @@
   unsigned int host_or_ip_length;
   const char *additional_auth_string;
   unsigned long additional_auth_string_length;
+  unsigned int current_auth_factor;
+  auth_factor_desc *multi_factor_auth_info;
 };
 typedef int (*authenticate_user_t)(MYSQL_PLUGIN_VIO *vio,
                                    MYSQL_SERVER_AUTH_INFO *info);
diff -Nru mysql-8.0-8.0.26/include/mysql/plugin_clone.h mysql-8.0-8.0.27/include/mysql/plugin_clone.h
--- mysql-8.0-8.0.26/include/mysql/plugin_clone.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/mysql/plugin_clone.h	2021-09-28 11:46:34.000000000 +0000
@@ -79,4 +79,9 @@
 @return error code */
 int clone_handle_drop();
 
+/** Check if it is safe to uninstall clone plugin.
+@param[in,out]	plugin_info	plugin
+@return error code */
+int clone_handle_check_drop(MYSQL_PLUGIN plugin_info);
+
 #endif
diff -Nru mysql-8.0-8.0.26/include/mysql/plugin_group_replication.h mysql-8.0-8.0.27/include/mysql/plugin_group_replication.h
--- mysql-8.0-8.0.26/include/mysql/plugin_group_replication.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/mysql/plugin_group_replication.h	2021-09-28 11:46:34.000000000 +0000
@@ -83,6 +83,9 @@
                           size_t length);
   void (*set_member_version)(void *const context, const char &value,
                              size_t length);
+  void (*set_member_incoming_communication_protocol)(void *const context,
+                                                     const char &value,
+                                                     size_t length);
 };
 
 /*
diff -Nru mysql-8.0-8.0.26/include/mysql/plugin.h mysql-8.0-8.0.27/include/mysql/plugin.h
--- mysql-8.0-8.0.26/include/mysql/plugin.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/mysql/plugin.h	2021-09-28 11:46:34.000000000 +0000
@@ -45,6 +45,7 @@
   for functions.
 */
 #if defined(_MSC_VER)
+
 #if defined(MYSQL_DYNAMIC_PLUGIN)
 #ifdef __cplusplus
 #define MYSQL_PLUGIN_EXPORT extern "C" __declspec(dllexport)
@@ -58,10 +59,17 @@
 #define MYSQL_PLUGIN_EXPORT
 #endif
 #endif /*MYSQL_DYNAMIC_PLUGIN */
-#else  /*_MSC_VER */
+
+#else /*_MSC_VER */
+
+#if defined(MYSQL_DYNAMIC_PLUGIN)
+#define MYSQL_PLUGIN_EXPORT MY_ATTRIBUTE((visibility("default")))
+#else
 #define MYSQL_PLUGIN_EXPORT
 #endif
 
+#endif /*_MSC_VER */
+
 #ifdef __cplusplus
 class THD;
 class Item;
diff -Nru mysql-8.0-8.0.26/include/mysql/psi/mysql_cond.h mysql-8.0-8.0.27/include/mysql/psi/mysql_cond.h
--- mysql-8.0-8.0.26/include/mysql/psi/mysql_cond.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/mysql/psi/mysql_cond.h	2021-09-28 11:46:34.000000000 +0000
@@ -126,19 +126,20 @@
 #define mysql_cond_broadcast_with_src(C, F, L) \
   inline_mysql_cond_broadcast(C, F, L)
 
-static inline void inline_mysql_cond_register(
-    const char *category MY_ATTRIBUTE((unused)),
-    PSI_cond_info *info MY_ATTRIBUTE((unused)),
-    int count MY_ATTRIBUTE((unused))) {
+static inline void inline_mysql_cond_register(const char *category
+                                              [[maybe_unused]],
+                                              PSI_cond_info *info
+                                              [[maybe_unused]],
+                                              int count [[maybe_unused]]) {
 #ifdef HAVE_PSI_COND_INTERFACE
   PSI_COND_CALL(register_cond)(category, info, count);
 #endif
 }
 
-static inline int inline_mysql_cond_init(
-    PSI_cond_key key MY_ATTRIBUTE((unused)), mysql_cond_t *that,
-    const char *src_file MY_ATTRIBUTE((unused)),
-    int src_line MY_ATTRIBUTE((unused))) {
+static inline int inline_mysql_cond_init(PSI_cond_key key [[maybe_unused]],
+                                         mysql_cond_t *that,
+                                         const char *src_file [[maybe_unused]],
+                                         int src_line [[maybe_unused]]) {
 #ifdef HAVE_PSI_COND_INTERFACE
   that->m_psi = PSI_COND_CALL(init_cond)(key, &that->m_cond);
 #else
@@ -147,9 +148,10 @@
   return native_cond_init(&that->m_cond);
 }
 
-static inline int inline_mysql_cond_destroy(
-    mysql_cond_t *that, const char *src_file MY_ATTRIBUTE((unused)),
-    int src_line MY_ATTRIBUTE((unused))) {
+static inline int inline_mysql_cond_destroy(mysql_cond_t *that,
+                                            const char *src_file
+                                            [[maybe_unused]],
+                                            int src_line [[maybe_unused]]) {
 #ifdef HAVE_PSI_COND_INTERFACE
   if (that->m_psi != nullptr) {
     PSI_COND_CALL(destroy_cond)(that->m_psi);
@@ -159,10 +161,10 @@
   return native_cond_destroy(&that->m_cond);
 }
 
-static inline int inline_mysql_cond_wait(
-    mysql_cond_t *that, mysql_mutex_t *mutex,
-    const char *src_file MY_ATTRIBUTE((unused)),
-    int src_line MY_ATTRIBUTE((unused))) {
+static inline int inline_mysql_cond_wait(mysql_cond_t *that,
+                                         mysql_mutex_t *mutex,
+                                         const char *src_file [[maybe_unused]],
+                                         int src_line [[maybe_unused]]) {
   int result;
 
 #ifdef HAVE_PSI_COND_INTERFACE
@@ -205,8 +207,7 @@
 
 static inline int inline_mysql_cond_timedwait(
     mysql_cond_t *that, mysql_mutex_t *mutex, const struct timespec *abstime,
-    const char *src_file MY_ATTRIBUTE((unused)),
-    int src_line MY_ATTRIBUTE((unused))) {
+    const char *src_file [[maybe_unused]], int src_line [[maybe_unused]]) {
   int result;
 
 #ifdef HAVE_PSI_COND_INTERFACE
@@ -248,9 +249,10 @@
   return result;
 }
 
-static inline int inline_mysql_cond_signal(
-    mysql_cond_t *that, const char *src_file MY_ATTRIBUTE((unused)),
-    int src_line MY_ATTRIBUTE((unused))) {
+static inline int inline_mysql_cond_signal(mysql_cond_t *that,
+                                           const char *src_file
+                                           [[maybe_unused]],
+                                           int src_line [[maybe_unused]]) {
   int result;
 #ifdef HAVE_PSI_COND_INTERFACE
   if (that->m_psi != nullptr) {
@@ -263,9 +265,10 @@
   return result;
 }
 
-static inline int inline_mysql_cond_broadcast(
-    mysql_cond_t *that, const char *src_file MY_ATTRIBUTE((unused)),
-    int src_line MY_ATTRIBUTE((unused))) {
+static inline int inline_mysql_cond_broadcast(mysql_cond_t *that,
+                                              const char *src_file
+                                              [[maybe_unused]],
+                                              int src_line [[maybe_unused]]) {
   int result;
 #ifdef HAVE_PSI_COND_INTERFACE
   if (that->m_psi != nullptr) {
diff -Nru mysql-8.0-8.0.26/include/mysql/psi/mysql_data_lock.h mysql-8.0-8.0.27/include/mysql/psi/mysql_data_lock.h
--- mysql-8.0-8.0.26/include/mysql/psi/mysql_data_lock.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/mysql/psi/mysql_data_lock.h	2021-09-28 11:46:34.000000000 +0000
@@ -54,7 +54,7 @@
 #ifdef HAVE_PSI_DATA_LOCK_INTERFACE
     PSI_engine_data_lock_inspector *i
 #else
-    PSI_engine_data_lock_inspector *i MY_ATTRIBUTE((unused))
+    PSI_engine_data_lock_inspector *i [[maybe_unused]]
 #endif /* HAVE_PSI_DATA_LOCK_INTERFACE */
 ) {
 #ifdef HAVE_PSI_DATA_LOCK_INTERFACE
@@ -68,7 +68,7 @@
 #ifdef HAVE_PSI_DATA_LOCK_INTERFACE
     PSI_engine_data_lock_inspector *i
 #else
-    PSI_engine_data_lock_inspector *i MY_ATTRIBUTE((unused))
+    PSI_engine_data_lock_inspector *i [[maybe_unused]]
 #endif /* HAVE_PSI_DATA_LOCK_INTERFACE */
 ) {
 #ifdef HAVE_PSI_DATA_LOCK_INTERFACE
diff -Nru mysql-8.0-8.0.26/include/mysql/psi/mysql_file.h mysql-8.0-8.0.27/include/mysql/psi/mysql_file.h
--- mysql-8.0-8.0.26/include/mysql/psi/mysql_file.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/mysql/psi/mysql_file.h	2021-09-28 11:46:34.000000000 +0000
@@ -494,8 +494,8 @@
 #ifdef HAVE_PSI_FILE_INTERFACE
     const char *category, PSI_file_info *info, int count
 #else
-    const char *category MY_ATTRIBUTE((unused)),
-    void *info MY_ATTRIBUTE((unused)), int count MY_ATTRIBUTE((unused))
+    const char *category [[maybe_unused]], void *info [[maybe_unused]],
+    int count [[maybe_unused]]
 #endif
 ) {
 #ifdef HAVE_PSI_FILE_INTERFACE
diff -Nru mysql-8.0-8.0.26/include/mysql/psi/mysql_memory.h mysql-8.0-8.0.27/include/mysql/psi/mysql_memory.h
--- mysql-8.0-8.0.26/include/mysql/psi/mysql_memory.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/mysql/psi/mysql_memory.h	2021-09-28 11:46:34.000000000 +0000
@@ -61,8 +61,8 @@
 #ifdef HAVE_PSI_MEMORY_INTERFACE
     const char *category, PSI_memory_info *info, int count)
 #else
-    const char *category MY_ATTRIBUTE((unused)),
-    void *info MY_ATTRIBUTE((unused)), int count MY_ATTRIBUTE((unused)))
+    const char *category [[maybe_unused]], void *info [[maybe_unused]],
+    int count [[maybe_unused]])
 #endif
 {
 #ifdef HAVE_PSI_MEMORY_INTERFACE
diff -Nru mysql-8.0-8.0.26/include/mysql/psi/mysql_mutex.h mysql-8.0-8.0.27/include/mysql/psi/mysql_mutex.h
--- mysql-8.0-8.0.26/include/mysql/psi/mysql_mutex.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/mysql/psi/mysql_mutex.h	2021-09-28 11:46:34.000000000 +0000
@@ -192,19 +192,21 @@
 
 #define mysql_mutex_unlock_with_src(M, F, L) inline_mysql_mutex_unlock(M, F, L)
 
-static inline void inline_mysql_mutex_register(
-    const char *category MY_ATTRIBUTE((unused)),
-    PSI_mutex_info *info MY_ATTRIBUTE((unused)),
-    int count MY_ATTRIBUTE((unused))) {
+static inline void inline_mysql_mutex_register(const char *category
+                                               [[maybe_unused]],
+                                               PSI_mutex_info *info
+                                               [[maybe_unused]],
+                                               int count [[maybe_unused]]) {
 #ifdef HAVE_PSI_MUTEX_INTERFACE
   PSI_MUTEX_CALL(register_mutex)(category, info, count);
 #endif
 }
 
-static inline int inline_mysql_mutex_init(
-    PSI_mutex_key key MY_ATTRIBUTE((unused)), mysql_mutex_t *that,
-    const native_mutexattr_t *attr, const char *src_file MY_ATTRIBUTE((unused)),
-    uint src_line MY_ATTRIBUTE((unused))) {
+static inline int inline_mysql_mutex_init(PSI_mutex_key key [[maybe_unused]],
+                                          mysql_mutex_t *that,
+                                          const native_mutexattr_t *attr,
+                                          const char *src_file [[maybe_unused]],
+                                          uint src_line [[maybe_unused]]) {
 #ifdef HAVE_PSI_MUTEX_INTERFACE
   that->m_psi = PSI_MUTEX_CALL(init_mutex)(key, &that->m_mutex);
 #else
@@ -218,9 +220,10 @@
   );
 }
 
-static inline int inline_mysql_mutex_destroy(
-    mysql_mutex_t *that, const char *src_file MY_ATTRIBUTE((unused)),
-    uint src_line MY_ATTRIBUTE((unused))) {
+static inline int inline_mysql_mutex_destroy(mysql_mutex_t *that,
+                                             const char *src_file
+                                             [[maybe_unused]],
+                                             uint src_line [[maybe_unused]]) {
 #ifdef HAVE_PSI_MUTEX_INTERFACE
   if (that->m_psi != nullptr) {
     PSI_MUTEX_CALL(destroy_mutex)(that->m_psi);
@@ -235,9 +238,9 @@
   );
 }
 
-static inline int inline_mysql_mutex_lock(
-    mysql_mutex_t *that, const char *src_file MY_ATTRIBUTE((unused)),
-    uint src_line MY_ATTRIBUTE((unused))) {
+static inline int inline_mysql_mutex_lock(mysql_mutex_t *that,
+                                          const char *src_file [[maybe_unused]],
+                                          uint src_line [[maybe_unused]]) {
   int result;
 
 #ifdef HAVE_PSI_MUTEX_INTERFACE
@@ -278,9 +281,10 @@
   return result;
 }
 
-static inline int inline_mysql_mutex_trylock(
-    mysql_mutex_t *that, const char *src_file MY_ATTRIBUTE((unused)),
-    uint src_line MY_ATTRIBUTE((unused))) {
+static inline int inline_mysql_mutex_trylock(mysql_mutex_t *that,
+                                             const char *src_file
+                                             [[maybe_unused]],
+                                             uint src_line [[maybe_unused]]) {
   int result;
 
 #ifdef HAVE_PSI_MUTEX_INTERFACE
@@ -321,9 +325,10 @@
   return result;
 }
 
-static inline int inline_mysql_mutex_unlock(
-    mysql_mutex_t *that, const char *src_file MY_ATTRIBUTE((unused)),
-    uint src_line MY_ATTRIBUTE((unused))) {
+static inline int inline_mysql_mutex_unlock(mysql_mutex_t *that,
+                                            const char *src_file
+                                            [[maybe_unused]],
+                                            uint src_line [[maybe_unused]]) {
   int result;
 
 #ifdef HAVE_PSI_MUTEX_INTERFACE
diff -Nru mysql-8.0-8.0.26/include/mysql/psi/mysql_rwlock.h mysql-8.0-8.0.27/include/mysql/psi/mysql_rwlock.h
--- mysql-8.0-8.0.26/include/mysql/psi/mysql_rwlock.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/mysql/psi/mysql_rwlock.h	2021-09-28 11:46:34.000000000 +0000
@@ -242,19 +242,21 @@
 #define mysql_prlock_unlock_with_src(T, F, L) \
   inline_mysql_prlock_unlock(T, F, L)
 
-static inline void inline_mysql_rwlock_register(
-    const char *category MY_ATTRIBUTE((unused)),
-    PSI_rwlock_info *info MY_ATTRIBUTE((unused)),
-    int count MY_ATTRIBUTE((unused))) {
+static inline void inline_mysql_rwlock_register(const char *category
+                                                [[maybe_unused]],
+                                                PSI_rwlock_info *info
+                                                [[maybe_unused]],
+                                                int count [[maybe_unused]]) {
 #ifdef HAVE_PSI_RWLOCK_INTERFACE
   PSI_RWLOCK_CALL(register_rwlock)(category, info, count);
 #endif
 }
 
-static inline int inline_mysql_rwlock_init(
-    PSI_rwlock_key key MY_ATTRIBUTE((unused)), mysql_rwlock_t *that,
-    const char *src_file MY_ATTRIBUTE((unused)),
-    int src_line MY_ATTRIBUTE((unused))) {
+static inline int inline_mysql_rwlock_init(PSI_rwlock_key key [[maybe_unused]],
+                                           mysql_rwlock_t *that,
+                                           const char *src_file
+                                           [[maybe_unused]],
+                                           int src_line [[maybe_unused]]) {
 #ifdef HAVE_PSI_RWLOCK_INTERFACE
   that->m_psi = PSI_RWLOCK_CALL(init_rwlock)(key, &that->m_rwlock);
 #else
@@ -264,10 +266,11 @@
 }
 
 #ifndef DISABLE_MYSQL_PRLOCK_H
-static inline int inline_mysql_prlock_init(
-    PSI_rwlock_key key MY_ATTRIBUTE((unused)), mysql_prlock_t *that,
-    const char *src_file MY_ATTRIBUTE((unused)),
-    int src_line MY_ATTRIBUTE((unused))) {
+static inline int inline_mysql_prlock_init(PSI_rwlock_key key [[maybe_unused]],
+                                           mysql_prlock_t *that,
+                                           const char *src_file
+                                           [[maybe_unused]],
+                                           int src_line [[maybe_unused]]) {
 #ifdef HAVE_PSI_RWLOCK_INTERFACE
   that->m_psi = PSI_RWLOCK_CALL(init_rwlock)(key, &that->m_prlock);
 #else
@@ -277,9 +280,10 @@
 }
 #endif
 
-static inline int inline_mysql_rwlock_destroy(
-    mysql_rwlock_t *that, const char *src_file MY_ATTRIBUTE((unused)),
-    int src_line MY_ATTRIBUTE((unused))) {
+static inline int inline_mysql_rwlock_destroy(mysql_rwlock_t *that,
+                                              const char *src_file
+                                              [[maybe_unused]],
+                                              int src_line [[maybe_unused]]) {
 #ifdef HAVE_PSI_RWLOCK_INTERFACE
   if (that->m_psi != nullptr) {
     PSI_RWLOCK_CALL(destroy_rwlock)(that->m_psi);
@@ -290,9 +294,10 @@
 }
 
 #ifndef DISABLE_MYSQL_PRLOCK_H
-static inline int inline_mysql_prlock_destroy(
-    mysql_prlock_t *that, const char *src_file MY_ATTRIBUTE((unused)),
-    int src_line MY_ATTRIBUTE((unused))) {
+static inline int inline_mysql_prlock_destroy(mysql_prlock_t *that,
+                                              const char *src_file
+                                              [[maybe_unused]],
+                                              int src_line [[maybe_unused]]) {
 #ifdef HAVE_PSI_RWLOCK_INTERFACE
   if (that->m_psi != nullptr) {
     PSI_RWLOCK_CALL(destroy_rwlock)(that->m_psi);
@@ -303,9 +308,10 @@
 }
 #endif
 
-static inline int inline_mysql_rwlock_rdlock(
-    mysql_rwlock_t *that, const char *src_file MY_ATTRIBUTE((unused)),
-    int src_line MY_ATTRIBUTE((unused))) {
+static inline int inline_mysql_rwlock_rdlock(mysql_rwlock_t *that,
+                                             const char *src_file
+                                             [[maybe_unused]],
+                                             int src_line [[maybe_unused]]) {
   int result;
 
 #ifdef HAVE_PSI_RWLOCK_INTERFACE
@@ -337,9 +343,10 @@
 }
 
 #ifndef DISABLE_MYSQL_PRLOCK_H
-static inline int inline_mysql_prlock_rdlock(
-    mysql_prlock_t *that, const char *src_file MY_ATTRIBUTE((unused)),
-    int src_line MY_ATTRIBUTE((unused))) {
+static inline int inline_mysql_prlock_rdlock(mysql_prlock_t *that,
+                                             const char *src_file
+                                             [[maybe_unused]],
+                                             int src_line [[maybe_unused]]) {
   int result;
 
 #ifdef HAVE_PSI_RWLOCK_INTERFACE
@@ -371,9 +378,10 @@
 }
 #endif
 
-static inline int inline_mysql_rwlock_wrlock(
-    mysql_rwlock_t *that, const char *src_file MY_ATTRIBUTE((unused)),
-    int src_line MY_ATTRIBUTE((unused))) {
+static inline int inline_mysql_rwlock_wrlock(mysql_rwlock_t *that,
+                                             const char *src_file
+                                             [[maybe_unused]],
+                                             int src_line [[maybe_unused]]) {
   int result;
 
 #ifdef HAVE_PSI_RWLOCK_INTERFACE
@@ -405,9 +413,10 @@
 }
 
 #ifndef DISABLE_MYSQL_PRLOCK_H
-static inline int inline_mysql_prlock_wrlock(
-    mysql_prlock_t *that, const char *src_file MY_ATTRIBUTE((unused)),
-    int src_line MY_ATTRIBUTE((unused))) {
+static inline int inline_mysql_prlock_wrlock(mysql_prlock_t *that,
+                                             const char *src_file
+                                             [[maybe_unused]],
+                                             int src_line [[maybe_unused]]) {
   int result;
 
 #ifdef HAVE_PSI_RWLOCK_INTERFACE
@@ -439,9 +448,10 @@
 }
 #endif
 
-static inline int inline_mysql_rwlock_tryrdlock(
-    mysql_rwlock_t *that, const char *src_file MY_ATTRIBUTE((unused)),
-    int src_line MY_ATTRIBUTE((unused))) {
+static inline int inline_mysql_rwlock_tryrdlock(mysql_rwlock_t *that,
+                                                const char *src_file
+                                                [[maybe_unused]],
+                                                int src_line [[maybe_unused]]) {
   int result;
 
 #ifdef HAVE_PSI_RWLOCK_INTERFACE
@@ -472,9 +482,10 @@
   return result;
 }
 
-static inline int inline_mysql_rwlock_trywrlock(
-    mysql_rwlock_t *that, const char *src_file MY_ATTRIBUTE((unused)),
-    int src_line MY_ATTRIBUTE((unused))) {
+static inline int inline_mysql_rwlock_trywrlock(mysql_rwlock_t *that,
+                                                const char *src_file
+                                                [[maybe_unused]],
+                                                int src_line [[maybe_unused]]) {
   int result;
 
 #ifdef HAVE_PSI_RWLOCK_INTERFACE
@@ -505,9 +516,10 @@
   return result;
 }
 
-static inline int inline_mysql_rwlock_unlock(
-    mysql_rwlock_t *that, const char *src_file MY_ATTRIBUTE((unused)),
-    int src_line MY_ATTRIBUTE((unused))) {
+static inline int inline_mysql_rwlock_unlock(mysql_rwlock_t *that,
+                                             const char *src_file
+                                             [[maybe_unused]],
+                                             int src_line [[maybe_unused]]) {
   int result;
 #ifdef HAVE_PSI_RWLOCK_INTERFACE
   if (that->m_psi != nullptr) {
@@ -521,9 +533,10 @@
 }
 
 #ifndef DISABLE_MYSQL_PRLOCK_H
-static inline int inline_mysql_prlock_unlock(
-    mysql_prlock_t *that, const char *src_file MY_ATTRIBUTE((unused)),
-    int src_line MY_ATTRIBUTE((unused))) {
+static inline int inline_mysql_prlock_unlock(mysql_prlock_t *that,
+                                             const char *src_file
+                                             [[maybe_unused]],
+                                             int src_line [[maybe_unused]]) {
   int result;
 #ifdef HAVE_PSI_RWLOCK_INTERFACE
   if (that->m_psi != nullptr) {
diff -Nru mysql-8.0-8.0.26/include/mysql/psi/mysql_socket.h mysql-8.0-8.0.27/include/mysql/psi/mysql_socket.h
--- mysql-8.0-8.0.26/include/mysql/psi/mysql_socket.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/mysql/psi/mysql_socket.h	2021-09-28 11:46:34.000000000 +0000
@@ -96,9 +96,9 @@
 #ifdef HAVE_PSI_SOCKET_INTERFACE
     MYSQL_SOCKET socket, const struct sockaddr *addr, socklen_t addr_len
 #else
-    MYSQL_SOCKET socket MY_ATTRIBUTE((unused)),
-    const struct sockaddr *addr MY_ATTRIBUTE((unused)),
-    socklen_t addr_len MY_ATTRIBUTE((unused))
+    MYSQL_SOCKET socket [[maybe_unused]],
+    const struct sockaddr *addr [[maybe_unused]],
+    socklen_t addr_len [[maybe_unused]]
 #endif
 ) {
 #ifdef HAVE_PSI_SOCKET_INTERFACE
@@ -117,7 +117,7 @@
 #ifdef HAVE_PSI_SOCKET_INTERFACE
     MYSQL_SOCKET socket
 #else
-    MYSQL_SOCKET socket MY_ATTRIBUTE((unused))
+    MYSQL_SOCKET socket [[maybe_unused]]
 #endif
 ) {
 #ifdef HAVE_PSI_SOCKET_INTERFACE
diff -Nru mysql-8.0-8.0.26/include/mysql/psi/mysql_stage.h mysql-8.0-8.0.27/include/mysql/psi/mysql_stage.h
--- mysql-8.0-8.0.26/include/mysql/psi/mysql_stage.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/mysql/psi/mysql_stage.h	2021-09-28 11:46:34.000000000 +0000
@@ -84,19 +84,19 @@
 */
 #define mysql_end_stage inline_mysql_end_stage
 
-static inline void inline_mysql_stage_register(
-    const char *category MY_ATTRIBUTE((unused)),
-    PSI_stage_info **info MY_ATTRIBUTE((unused)),
-    int count MY_ATTRIBUTE((unused))) {
+static inline void inline_mysql_stage_register(const char *category
+                                               [[maybe_unused]],
+                                               PSI_stage_info **info
+                                               [[maybe_unused]],
+                                               int count [[maybe_unused]]) {
 #ifdef HAVE_PSI_STAGE_INTERFACE
   PSI_STAGE_CALL(register_stage)(category, info, count);
 #endif
 }
 
 static inline PSI_stage_progress *inline_mysql_set_stage(
-    PSI_stage_key key MY_ATTRIBUTE((unused)),
-    const char *src_file MY_ATTRIBUTE((unused)),
-    int src_line MY_ATTRIBUTE((unused))) {
+    PSI_stage_key key [[maybe_unused]], const char *src_file [[maybe_unused]],
+    int src_line [[maybe_unused]]) {
 #ifdef HAVE_PSI_STAGE_INTERFACE
   return PSI_STAGE_CALL(start_stage)(key, src_file, src_line);
 #else
diff -Nru mysql-8.0-8.0.26/include/mysql/psi/mysql_statement.h mysql-8.0-8.0.27/include/mysql/psi/mysql_statement.h
--- mysql-8.0-8.0.26/include/mysql/psi/mysql_statement.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/mysql/psi/mysql_statement.h	2021-09-28 11:46:34.000000000 +0000
@@ -159,8 +159,8 @@
 #ifdef HAVE_PSI_STATEMENT_INTERFACE
     const char *category, PSI_statement_info *info, int count
 #else
-    const char *category MY_ATTRIBUTE((unused)),
-    void *info MY_ATTRIBUTE((unused)), int count MY_ATTRIBUTE((unused))
+    const char *category [[maybe_unused]], void *info [[maybe_unused]],
+    int count [[maybe_unused]]
 #endif
 ) {
 #ifdef HAVE_PSI_STATEMENT_INTERFACE
diff -Nru mysql-8.0-8.0.26/include/mysql/psi/mysql_system.h mysql-8.0-8.0.27/include/mysql/psi/mysql_system.h
--- mysql-8.0-8.0.26/include/mysql/psi/mysql_system.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/mysql/psi/mysql_system.h	2021-09-28 11:46:34.000000000 +0000
@@ -56,8 +56,8 @@
 */
 #define mysql_unload_plugin(P1) inline_mysql_unload_plugin(P1)
 
-static inline void inline_mysql_unload_plugin(
-    const char *plugin_name MY_ATTRIBUTE((unused))) {
+static inline void inline_mysql_unload_plugin(const char *plugin_name
+                                              [[maybe_unused]]) {
 #ifdef HAVE_PSI_SYSTEM_INTERFACE
   PSI_SYSTEM_CALL(unload_plugin)(plugin_name);
 #endif
diff -Nru mysql-8.0-8.0.26/include/mysql/psi/mysql_thread.h mysql-8.0-8.0.27/include/mysql/psi/mysql_thread.h
--- mysql-8.0-8.0.26/include/mysql/psi/mysql_thread.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/mysql/psi/mysql_thread.h	2021-09-28 11:46:34.000000000 +0000
@@ -75,7 +75,7 @@
   This function creates both the thread instrumentation and a thread.
   @c mysql_thread_create is a replacement for @c my_thread_create.
   The parameter P4 (or, if it is NULL, P1) will be used as the
-  instrumented thread "indentity".
+  instrumented thread "identity".
   Providing a P1 / P4 parameter with a different value for each call
   will on average improve performances, since this thread identity value
   is used internally to randomize access to data and prevent contention.
@@ -87,7 +87,24 @@
   @param P4 my_thread_create parameter 4
 */
 #define mysql_thread_create(K, P1, P2, P3, P4) \
-  inline_mysql_thread_create(K, P1, P2, P3, P4)
+  inline_mysql_thread_create(K, 0, P1, P2, P3, P4)
+
+/**
+  @def mysql_thread_create_seq(K, S, P1, P2, P3, P4)
+  Instrumented my_thread_create.
+  @see mysql_thread_create.
+  This forms takes an additional sequence number parameter,
+  used to name threads "name-N" in the operating system.
+
+  @param K The PSI_thread_key for this instrumented thread
+  @param S The sequence number for this instrumented thread
+  @param P1 my_thread_create parameter 1
+  @param P2 my_thread_create parameter 2
+  @param P3 my_thread_create parameter 3
+  @param P4 my_thread_create parameter 4
+*/
+#define mysql_thread_create_seq(K, S, P1, P2, P3, P4) \
+  inline_mysql_thread_create(K, S, P1, P2, P3, P4)
 
 /**
   @def mysql_thread_set_psi_id(I)
@@ -103,29 +120,32 @@
 */
 #define mysql_thread_set_psi_THD(T) inline_mysql_thread_set_psi_THD(T)
 
-static inline void inline_mysql_thread_register(
-    const char *category MY_ATTRIBUTE((unused)),
-    PSI_thread_info *info MY_ATTRIBUTE((unused)),
-    int count MY_ATTRIBUTE((unused))) {
+static inline void inline_mysql_thread_register(const char *category
+                                                [[maybe_unused]],
+                                                PSI_thread_info *info
+                                                [[maybe_unused]],
+                                                int count [[maybe_unused]]) {
 #ifdef HAVE_PSI_THREAD_INTERFACE
   PSI_THREAD_CALL(register_thread)(category, info, count);
 #endif
 }
 
 static inline int inline_mysql_thread_create(
-    PSI_thread_key key MY_ATTRIBUTE((unused)), my_thread_handle *thread,
+    PSI_thread_key key [[maybe_unused]],
+    unsigned int sequence_number [[maybe_unused]], my_thread_handle *thread,
     const my_thread_attr_t *attr, my_start_routine start_routine, void *arg) {
   int result;
 #ifdef HAVE_PSI_THREAD_INTERFACE
-  result = PSI_THREAD_CALL(spawn_thread)(key, thread, attr, start_routine, arg);
+  result = PSI_THREAD_CALL(spawn_thread)(key, sequence_number, thread, attr,
+                                         start_routine, arg);
 #else
   result = my_thread_create(thread, attr, start_routine, arg);
 #endif
   return result;
 }
 
-static inline void inline_mysql_thread_set_psi_id(
-    my_thread_id id MY_ATTRIBUTE((unused))) {
+static inline void inline_mysql_thread_set_psi_id(my_thread_id id
+                                                  [[maybe_unused]]) {
 #ifdef HAVE_PSI_THREAD_INTERFACE
   struct PSI_thread *psi = PSI_THREAD_CALL(get_thread)();
   PSI_THREAD_CALL(set_thread_id)(psi, id);
@@ -134,8 +154,7 @@
 
 #ifdef __cplusplus
 class THD;
-static inline void inline_mysql_thread_set_psi_THD(
-    THD *thd MY_ATTRIBUTE((unused))) {
+static inline void inline_mysql_thread_set_psi_THD(THD *thd [[maybe_unused]]) {
 #ifdef HAVE_PSI_THREAD_INTERFACE
   struct PSI_thread *psi = PSI_THREAD_CALL(get_thread)();
   PSI_THREAD_CALL(set_thread_THD)(psi, thd);
@@ -148,8 +167,7 @@
   Set the remote (peer) port for the thread instrumentation.
   @param port peer port number
 */
-static inline void mysql_thread_set_peer_port(
-    uint port MY_ATTRIBUTE((unused))) {
+static inline void mysql_thread_set_peer_port(uint port [[maybe_unused]]) {
 #ifdef HAVE_PSI_THREAD_INTERFACE
   struct PSI_thread *psi = PSI_THREAD_CALL(get_thread)();
   PSI_THREAD_CALL(set_thread_peer_port)(psi, port);
diff -Nru mysql-8.0-8.0.26/include/mysql/psi/mysql_tls_channel.h mysql-8.0-8.0.27/include/mysql/psi/mysql_tls_channel.h
--- mysql-8.0-8.0.26/include/mysql/psi/mysql_tls_channel.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/mysql/psi/mysql_tls_channel.h	2021-09-28 11:46:34.000000000 +0000
@@ -54,7 +54,7 @@
 #ifdef HAVE_PSI_TLS_CHANNEL_INTERFACE
     TLS_channel_property_iterator *i
 #else
-    TLS_channel_property_iterator *i MY_ATTRIBUTE((unused))
+    TLS_channel_property_iterator *i [[maybe_unused]]
 #endif /* HAVE_PSI_TLS_CHANNEL_INTERFACE */
 ) {
 #ifdef HAVE_PSI_TLS_CHANNEL_INTERFACE
@@ -68,7 +68,7 @@
 #ifdef HAVE_PSI_TLS_CHANNEL_INTERFACE
     TLS_channel_property_iterator *i
 #else
-    TLS_channel_property_iterator *i MY_ATTRIBUTE((unused))
+    TLS_channel_property_iterator *i [[maybe_unused]]
 #endif /* HAVE_PSI_TLS_CHANNEL_INTERFACE */
 ) {
 #ifdef HAVE_PSI_TLS_CHANNEL_INTERFACE
diff -Nru mysql-8.0-8.0.26/include/mysql/psi/psi_abi_thread_v1.h.pp mysql-8.0-8.0.27/include/mysql/psi/psi_abi_thread_v1.h.pp
--- mysql-8.0-8.0.26/include/mysql/psi/psi_abi_thread_v1.h.pp	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/mysql/psi/psi_abi_thread_v1.h.pp	2021-09-28 11:46:34.000000000 +0000
@@ -40,6 +40,7 @@
   my_thread_t thread{0};
 };
 typedef unsigned int PSI_thread_key;
+typedef unsigned int PSI_thread_seqnum;
 struct opaque_THD {
   int dummy;
 };
@@ -55,15 +56,35 @@
   const char *m_documentation;
 };
 typedef struct PSI_thread_info_v1 PSI_thread_info_v1;
+struct PSI_thread_info_v5 {
+  PSI_thread_key *m_key;
+  const char *m_name;
+  const char *m_os_name;
+  unsigned int m_flags;
+  int m_volatility;
+  const char *m_documentation;
+};
+typedef struct PSI_thread_info_v5 PSI_thread_info_v5;
 typedef void (*register_thread_v1_t)(const char *category,
                                      struct PSI_thread_info_v1 *info,
                                      int count);
+typedef void (*register_thread_v5_t)(const char *category,
+                                     struct PSI_thread_info_v5 *info,
+                                     int count);
 typedef int (*spawn_thread_v1_t)(PSI_thread_key key, my_thread_handle *thread,
                                  const my_thread_attr_t *attr,
                                  void *(*start_routine)(void *), void *arg);
+typedef int (*spawn_thread_v5_t)(PSI_thread_key key, PSI_thread_seqnum seqnum,
+                                 my_thread_handle *thread,
+                                 const my_thread_attr_t *attr,
+                                 void *(*start_routine)(void *), void *arg);
 typedef struct PSI_thread *(*new_thread_v1_t)(PSI_thread_key key,
                                               const void *identity,
                                               unsigned long long thread_id);
+typedef struct PSI_thread *(*new_thread_v5_t)(PSI_thread_key key,
+                                              PSI_thread_seqnum seqnum,
+                                              const void *identity,
+                                              unsigned long long thread_id);
 typedef void (*set_thread_THD_v1_t)(struct PSI_thread *thread, THD *thd);
 typedef void (*set_thread_id_v1_t)(struct PSI_thread *thread,
                                    unsigned long long id);
@@ -140,7 +161,7 @@
 typedef void (*notify_session_connect_v1_t)(PSI_thread *thread);
 typedef void (*notify_session_disconnect_v1_t)(PSI_thread *thread);
 typedef void (*notify_session_change_user_v1_t)(PSI_thread *thread);
-typedef struct PSI_thread_info_v1 PSI_thread_info;
+typedef struct PSI_thread_info_v5 PSI_thread_info;
 struct PSI_thread_bootstrap {
   void *(*get_interface)(int version);
 };
@@ -181,5 +202,41 @@
   notify_session_disconnect_v1_t notify_session_disconnect;
   notify_session_change_user_v1_t notify_session_change_user;
 };
-typedef struct PSI_thread_service_v4 PSI_thread_service_t;
+struct PSI_thread_service_v5 {
+  register_thread_v5_t register_thread;
+  spawn_thread_v5_t spawn_thread;
+  new_thread_v5_t new_thread;
+  set_thread_id_v1_t set_thread_id;
+  get_current_thread_internal_id_v2_t get_current_thread_internal_id;
+  get_thread_internal_id_v2_t get_thread_internal_id;
+  get_thread_by_id_v2_t get_thread_by_id;
+  set_thread_THD_v1_t set_thread_THD;
+  set_thread_os_id_v1_t set_thread_os_id;
+  get_thread_v1_t get_thread;
+  set_thread_user_v1_t set_thread_user;
+  set_thread_account_v1_t set_thread_account;
+  set_thread_db_v1_t set_thread_db;
+  set_thread_command_v1_t set_thread_command;
+  set_connection_type_v1_t set_connection_type;
+  set_thread_start_time_v1_t set_thread_start_time;
+  set_thread_info_v1_t set_thread_info;
+  set_thread_resource_group_v1_t set_thread_resource_group;
+  set_thread_resource_group_by_id_v1_t set_thread_resource_group_by_id;
+  set_thread_v1_t set_thread;
+  set_thread_peer_port_v4_t set_thread_peer_port;
+  aggregate_thread_status_v2_t aggregate_thread_status;
+  delete_current_thread_v1_t delete_current_thread;
+  delete_thread_v1_t delete_thread;
+  set_thread_connect_attrs_v1_t set_thread_connect_attrs;
+  get_current_thread_event_id_v2_t get_current_thread_event_id;
+  get_thread_event_id_v2_t get_thread_event_id;
+  get_thread_system_attrs_v3_t get_thread_system_attrs;
+  get_thread_system_attrs_by_id_v3_t get_thread_system_attrs_by_id;
+  register_notification_v3_t register_notification;
+  unregister_notification_v1_t unregister_notification;
+  notify_session_connect_v1_t notify_session_connect;
+  notify_session_disconnect_v1_t notify_session_disconnect;
+  notify_session_change_user_v1_t notify_session_change_user;
+};
+typedef struct PSI_thread_service_v5 PSI_thread_service_t;
 extern PSI_thread_service_t *psi_thread_service;
diff -Nru mysql-8.0-8.0.26/include/mysql/psi/psi_thread.h mysql-8.0-8.0.27/include/mysql/psi/psi_thread.h
--- mysql-8.0-8.0.26/include/mysql/psi/psi_thread.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/mysql/psi/psi_thread.h	2021-09-28 11:46:34.000000000 +0000
@@ -70,11 +70,18 @@
 #define PSI_THREAD_VERSION_4 4
 
 /**
+  @def PSI_THREAD_VERSION_5
+  Performance Schema Thread Interface number for version 5.
+  This version is supported.
+*/
+#define PSI_THREAD_VERSION_5 5
+
+/**
   @def PSI_CURRENT_THREAD_VERSION
   Performance Schema Thread Interface number for the most recent version.
-  The most current version is @c PSI_THREAD_VERSION_4
+  The most current version is @c PSI_THREAD_VERSION_5
 */
-#define PSI_CURRENT_THREAD_VERSION 4
+#define PSI_CURRENT_THREAD_VERSION 5
 
 /** Entry point for the performance schema interface. */
 struct PSI_thread_bootstrap {
@@ -86,6 +93,7 @@
     @sa PSI_THREAD_VERSION_2
     @sa PSI_THREAD_VERSION_3
     @sa PSI_THREAD_VERSION_4
+    @sa PSI_THREAD_VERSION_5
     @sa PSI_CURRENT_THREAD_VERSION
   */
   void *(*get_interface)(int version);
@@ -169,7 +177,87 @@
   notify_session_change_user_v1_t notify_session_change_user;
 };
 
-typedef struct PSI_thread_service_v4 PSI_thread_service_t;
+/**
+  Performance Schema Thread Interface, version 5.
+  @since PSI_THREAD_VERSION_5
+  Changes from version 4:
+  - register_thread takes an expanded PSI_thread_info_v5 instrumentation,
+     which includes a new m_os_name attribute.
+  - spawn_thread takes an extra sequence number parameter
+  - new_thread takes an extra sequence number parameter
+*/
+struct PSI_thread_service_v5 {
+  /** @sa register_thread_v5_t. */
+  register_thread_v5_t register_thread;
+  /** @sa spawn_thread_v5_t. */
+  spawn_thread_v5_t spawn_thread;
+  /** @sa new_thread_v5_t. */
+  new_thread_v5_t new_thread;
+  /** @sa set_thread_id_v1_t. */
+  set_thread_id_v1_t set_thread_id;
+  /** @sa get_current_thread_internal_id_v2_t. */
+  get_current_thread_internal_id_v2_t get_current_thread_internal_id;
+  /** @sa get_thread_internal_id_v2_t. */
+  get_thread_internal_id_v2_t get_thread_internal_id;
+  /** @sa get_thread_by_id_v2_t. */
+  get_thread_by_id_v2_t get_thread_by_id;
+  /** @sa set_thread_THD_v1_t. */
+  set_thread_THD_v1_t set_thread_THD;
+  /** @sa set_thread_os_id_v1_t. */
+  set_thread_os_id_v1_t set_thread_os_id;
+  /** @sa get_thread_v1_t. */
+  get_thread_v1_t get_thread;
+  /** @sa set_thread_user_v1_t. */
+  set_thread_user_v1_t set_thread_user;
+  /** @sa set_thread_account_v1_t. */
+  set_thread_account_v1_t set_thread_account;
+  /** @sa set_thread_db_v1_t. */
+  set_thread_db_v1_t set_thread_db;
+  /** @sa set_thread_command_v1_t. */
+  set_thread_command_v1_t set_thread_command;
+  /** @sa set_connection_type_v1_t. */
+  set_connection_type_v1_t set_connection_type;
+  /** @sa set_thread_start_time_v1_t. */
+  set_thread_start_time_v1_t set_thread_start_time;
+  /** @sa set_thread_info_v1_t. */
+  set_thread_info_v1_t set_thread_info;
+  /** @sa set_thread_resource_group_v1_t. */
+  set_thread_resource_group_v1_t set_thread_resource_group;
+  /** @sa set_thread_resource_group_by_id_v1_t. */
+  set_thread_resource_group_by_id_v1_t set_thread_resource_group_by_id;
+  /** @sa set_thread_v1_t. */
+  set_thread_v1_t set_thread;
+  /** @sa set_thread_peer_port_vc_t. */
+  set_thread_peer_port_v4_t set_thread_peer_port;
+  /** @sa aggregate_thread_status_v1_t. */
+  aggregate_thread_status_v2_t aggregate_thread_status;
+  /** @sa delete_current_thread_v1_t. */
+  delete_current_thread_v1_t delete_current_thread;
+  /** @sa delete_thread_v1_t. */
+  delete_thread_v1_t delete_thread;
+  /** @sa set_thread_connect_attrs_v1_t. */
+  set_thread_connect_attrs_v1_t set_thread_connect_attrs;
+  /** @sa get_current_thread_event_id_v2_t. */
+  get_current_thread_event_id_v2_t get_current_thread_event_id;
+  /** @sa get_thread_event_id_v2_t. */
+  get_thread_event_id_v2_t get_thread_event_id;
+  /** @sa get_thread_system_attrs_v1_t. */
+  get_thread_system_attrs_v3_t get_thread_system_attrs;
+  /** @sa get_thread_system_attrs_by_id_v1_t. */
+  get_thread_system_attrs_by_id_v3_t get_thread_system_attrs_by_id;
+  /** @sa register_notification_v1_t. */
+  register_notification_v3_t register_notification;
+  /** @sa unregister_notification_v1_t. */
+  unregister_notification_v1_t unregister_notification;
+  /** @sa notify_session_connect_v1_t. */
+  notify_session_connect_v1_t notify_session_connect;
+  /** @sa notify_session_disconnect_v1_t. */
+  notify_session_disconnect_v1_t notify_session_disconnect;
+  /** @sa notify_session_change_user_v1_t. */
+  notify_session_change_user_v1_t notify_session_change_user;
+};
+
+typedef struct PSI_thread_service_v5 PSI_thread_service_t;
 
 extern MYSQL_PLUGIN_IMPORT PSI_thread_service_t *psi_thread_service;
 
diff -Nru mysql-8.0-8.0.26/include/mysql/service_my_plugin_log.h mysql-8.0-8.0.27/include/mysql/service_my_plugin_log.h
--- mysql-8.0-8.0.26/include/mysql/service_my_plugin_log.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/mysql/service_my_plugin_log.h	2021-09-28 11:46:34.000000000 +0000
@@ -33,11 +33,6 @@
 #include <stdarg.h>
 #endif
 
-#if defined __SUNPRO_C || defined __SUNPRO_CC || \
-    (defined _MSC_VER && !defined __clang__)
-#define MY_ATTRIBUTE(A)
-#endif
-
 /* keep in sync with the loglevel enum in my_sys.h */
 enum plugin_log_level {
   MY_ERROR_LEVEL,
diff -Nru mysql-8.0-8.0.26/include/mysql/thread_type.h mysql-8.0-8.0.27/include/mysql/thread_type.h
--- mysql-8.0-8.0.26/include/mysql/thread_type.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/mysql/thread_type.h	2021-09-28 11:46:34.000000000 +0000
@@ -45,7 +45,8 @@
   SYSTEM_THREAD_DD_RESTART = 1024,
   SYSTEM_THREAD_SERVER_INITIALIZE = 2048,
   SYSTEM_THREAD_INIT_FILE = 4096,
-  SYSTEM_THREAD_SERVER_UPGRADE = 8192
+  SYSTEM_THREAD_SERVER_UPGRADE = 8192,
+  SYSTEM_THREAD_GROUP_REPLICATION_CONNECTION = 16384
 };
 
 #endif /* THREAD_TYPE_INCLUDED */
diff -Nru mysql-8.0-8.0.26/include/mysql_com.h mysql-8.0-8.0.27/include/mysql_com.h
--- mysql-8.0-8.0.26/include/mysql_com.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/mysql_com.h	2021-09-28 11:46:34.000000000 +0000
@@ -73,6 +73,17 @@
 #define SERVER_VERSION_LENGTH 60
 #define SQLSTATE_LENGTH 5
 
+/*
+  In FIDO terminology, relying party is the server where required services are
+  running. Relying party ID is unique name given to server.
+*/
+#define RELYING_PARTY_ID_LENGTH 255
+
+/* Length of random salt sent during fido registration */
+#define CHALLENGE_LENGTH 32
+
+/* Maximum authentication factors server supports */
+#define MAX_AUTH_FACTORS 3
 /**
   Maximum length of comments
 
@@ -718,6 +729,21 @@
 #define CLIENT_QUERY_ATTRIBUTES (1UL << 27)
 
 /**
+  Support Multi factor authentication.
+
+  Server
+  ------
+  Server sends AuthNextFactor packet after every nth factor authentication
+  method succeeds, except the last factor authentication.
+
+  Client
+  ------
+  Client reads AuthNextFactor packet sent by server and initiates next factor
+  authentication method.
+*/
+#define MULTI_FACTOR_AUTHENTICATION (1UL << 28)
+
+/**
   This flag will be reserved to extend the 32bit capabilities structure to
   64bits.
 */
@@ -760,7 +786,8 @@
    CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA |                                     \
    CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS | CLIENT_SESSION_TRACK |                \
    CLIENT_DEPRECATE_EOF | CLIENT_OPTIONAL_RESULTSET_METADATA |                 \
-   CLIENT_ZSTD_COMPRESSION_ALGORITHM | CLIENT_QUERY_ATTRIBUTES)
+   CLIENT_ZSTD_COMPRESSION_ALGORITHM | CLIENT_QUERY_ATTRIBUTES |               \
+   MULTI_FACTOR_AUTHENTICATION)
 
 /**
   Switch off from ::CLIENT_ALL_FLAGS the flags that are optional and
@@ -997,10 +1024,19 @@
   RESULTSET_METADATA_FULL = 1
 };
 
+#if defined(__clang__)
+// disable -Wdocumentation to workaround
+// https://bugs.llvm.org/show_bug.cgi?id=38905
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdocumentation"
+#endif
 /**
   The flags used in COM_STMT_EXECUTE.
   @sa @ref Protocol_classic::parse_packet, @ref mysql_int_serialize_param_data
 */
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
 enum enum_cursor_type {
   CURSOR_TYPE_NO_CURSOR = 0,
   CURSOR_TYPE_READ_ONLY = 1,
diff -Nru mysql-8.0-8.0.26/include/mysql.h mysql-8.0-8.0.27/include/mysql.h
--- mysql-8.0-8.0.26/include/mysql.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/mysql.h	2021-09-28 11:46:34.000000000 +0000
@@ -210,7 +210,8 @@
   MYSQL_OPT_TLS_CIPHERSUITES,
   MYSQL_OPT_COMPRESSION_ALGORITHMS,
   MYSQL_OPT_ZSTD_COMPRESSION_LEVEL,
-  MYSQL_OPT_LOAD_DATA_LOCAL_DIR
+  MYSQL_OPT_LOAD_DATA_LOCAL_DIR,
+  MYSQL_OPT_USER_PASSWORD,
 };
 
 /**
diff -Nru mysql-8.0-8.0.26/include/mysql.h.pp mysql-8.0-8.0.27/include/mysql.h.pp
--- mysql-8.0-8.0.26/include/mysql.h.pp	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/mysql.h.pp	2021-09-28 11:46:34.000000000 +0000
@@ -86,6 +86,7 @@
   COM_BINLOG_DUMP_GTID,
   COM_RESET_CONNECTION,
   COM_CLONE,
+  COM_SUBSCRIBE_GROUP_REPLICATION_STREAM,
   COM_END
 };
 #include "my_compress.h"
@@ -284,7 +285,7 @@
 unsigned int net_field_length_size(const unsigned char *pos);
 #include "mysql/client_plugin.h"
 struct st_mysql_client_plugin {
-  int type; unsigned int interface_version; const char *name; const char *author; const char *desc; unsigned int version[3]; const char *license; void *mysql_api; int (*init)(char *, size_t, int, va_list); int (*deinit)(void); int (*options)(const char *option, const void *);
+   int type; unsigned int interface_version; const char *name; const char *author; const char *desc; unsigned int version[3]; const char *license; void *mysql_api; int (*init)(char *, size_t, int, va_list); int (*deinit)(void); int (*options)(const char *option, const void *); int (*get_options)(const char *option, void *);
 };
 struct MYSQL;
 #include "plugin_auth_common.h"
@@ -318,7 +319,7 @@
       int *result);
 } MYSQL_PLUGIN_VIO;
 struct auth_plugin_t {
-  int type; unsigned int interface_version; const char *name; const char *author; const char *desc; unsigned int version[3]; const char *license; void *mysql_api; int (*init)(char *, size_t, int, va_list); int (*deinit)(void); int (*options)(const char *option, const void *);
+  int type; unsigned int interface_version; const char *name; const char *author; const char *desc; unsigned int version[3]; const char *license; void *mysql_api; int (*init)(char *, size_t, int, va_list); int (*deinit)(void); int (*options)(const char *option, const void *); int (*get_options)(const char *option, void *);
   int (*authenticate_user)(MYSQL_PLUGIN_VIO *vio, struct MYSQL *mysql);
   enum net_async_status (*authenticate_user_nonblocking)(MYSQL_PLUGIN_VIO *vio,
                                                          struct MYSQL *mysql,
@@ -338,6 +339,8 @@
     struct MYSQL *mysql, struct st_mysql_client_plugin *plugin);
 int mysql_plugin_options(struct st_mysql_client_plugin *plugin,
                          const char *option, const void *value);
+int mysql_plugin_get_option(struct st_mysql_client_plugin *plugin,
+                         const char *option, void *value);
 #include "mysql_version.h"
 #include "mysql_time.h"
 enum enum_mysql_timestamp_type {
@@ -360,7 +363,7 @@
 void finish_client_errs(void);
 extern const char *client_errors[];
 static inline const char *ER_CLIENT(int client_errno) {
-  if (client_errno >= 2000 && client_errno <= 2070)
+  if (client_errno >= 2000 && client_errno <= 2072)
     return client_errors[client_errno - 2000];
   return client_errors[2000 - 2000];
 }
@@ -448,7 +451,8 @@
   MYSQL_OPT_TLS_CIPHERSUITES,
   MYSQL_OPT_COMPRESSION_ALGORITHMS,
   MYSQL_OPT_ZSTD_COMPRESSION_LEVEL,
-  MYSQL_OPT_LOAD_DATA_LOCAL_DIR
+  MYSQL_OPT_LOAD_DATA_LOCAL_DIR,
+  MYSQL_OPT_USER_PASSWORD,
 };
 struct st_mysql_options_extention;
 struct st_mysql_options {
diff -Nru mysql-8.0-8.0.26/include/mysys_err.h mysql-8.0-8.0.27/include/mysys_err.h
--- mysql-8.0-8.0.26/include/mysys_err.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/mysys_err.h	2021-09-28 11:46:34.000000000 +0000
@@ -133,7 +133,8 @@
 #define EE_RESET_CHAR_OUT_OF_RANGE 89
 #define EE_UNKNOWN_LDML_TAG 90
 #define EE_FAILED_TO_RESET_BEFORE_SECONDARY_IGNORABLE_CHAR 91
-#define EE_ERROR_LAST 91 /* Copy last error nr */
+#define EE_FAILED_PROCESSING_DIRECTIVE 92
+#define EE_ERROR_LAST 92 /* Copy last error nr */
 /* Add error numbers before EE_ERROR_LAST and change it accordingly. */
 
 /* Exit codes for option processing. When exiting from server use the
diff -Nru mysql-8.0-8.0.26/include/my_sys.h mysql-8.0-8.0.27/include/my_sys.h
--- mysql-8.0-8.0.26/include/my_sys.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/my_sys.h	2021-09-28 11:46:34.000000000 +0000
@@ -172,10 +172,6 @@
 #define MIN_COMPRESS_LENGTH 50           /* Don't compress small bl. */
 #define DFLT_INIT_HITS 3
 
-/* root_alloc flags */
-#define MY_KEEP_PREALLOC 1
-#define MY_MARK_BLOCKS_FREE 2 /* move used to free list and reuse them */
-
 /* Internal error numbers (for assembler functions) */
 #define MY_ERRNO_EDOM 33
 #define MY_ERRNO_ERANGE 34
diff -Nru mysql-8.0-8.0.26/include/my_thread.h mysql-8.0-8.0.27/include/my_thread.h
--- mysql-8.0-8.0.26/include/my_thread.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/my_thread.h	2021-09-28 11:46:34.000000000 +0000
@@ -47,21 +47,11 @@
 #define ETIMEDOUT 145 /* Win32 doesn't have this */
 #endif
 
-#if defined(__sparc) && (defined(__SUNPRO_CC) || defined(__SUNPRO_C))
-#define STACK_MULTIPLIER 2UL
-#elif defined HAVE_UBSAN
-#define STACK_MULTIPLIER 3UL
-#elif defined(HAVE_LSAN) || defined(HAVE_ASAN)
-#define STACK_MULTIPLIER 4UL
-#else
-#define STACK_MULTIPLIER 1UL
-#endif
-
-#if SIZEOF_CHARP > 4
-#define DEFAULT_THREAD_STACK (STACK_MULTIPLIER * 280UL * 1024UL)
-#else
-#define DEFAULT_THREAD_STACK (STACK_MULTIPLIER * 216UL * 1024UL)
-#endif
+// Pick a value which is enough for all mtr tests,
+// on all known/supported platforms.
+// Currently the largest stack requirement is with
+// clang with DEBUG and UBSAN -O0 -fno-inline
+#define DEFAULT_THREAD_STACK (1024UL * 1024UL)
 
 static inline int is_timeout(int e) {
 #if ETIMEDOUT == ETIME
@@ -163,6 +153,11 @@
 int my_thread_cancel(my_thread_handle *thread);
 void my_thread_exit(void *value_ptr) MY_ATTRIBUTE((noreturn));
 
+/** Sets the name of the thread for system and debugger, if possible.
+@param name Name to set, must be shorter than SETNAME_MAX_LENGTH, including NULL
+character. */
+void my_thread_self_setname(const char *name);
+
 extern bool my_thread_global_init();
 extern void my_thread_global_reinit();
 extern void my_thread_global_end();
diff -Nru mysql-8.0-8.0.26/include/nullable.h mysql-8.0-8.0.27/include/nullable.h
--- mysql-8.0-8.0.26/include/nullable.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/nullable.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,107 +0,0 @@
-#ifndef NULLABLE_INCLUDED
-#define NULLABLE_INCLUDED
-
-/*
-   Copyright (c) 2014, 2021, Oracle 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,
-   as published by the Free Software Foundation.
-
-   This program is also distributed with certain software (including
-   but not limited to OpenSSL) that is licensed under separate terms,
-   as designated in a particular file or component or in included license
-   documentation.  The authors of MySQL hereby grant you an additional
-   permission to link the program and your derivative works with the
-   separately licensed software that they have included with MySQL.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License, version 2.0, for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-*/
-
-/**
-  @file include/nullable.h
-*/
-
-#include <assert.h>
-
-namespace Mysql {
-
-/**
-  Class for storing value or NULL value.
-*/
-template <typename T_value>
-class Nullable {
- public:
-  Nullable() : m_has_value(false) {}
-
-  Nullable(T_value value) : m_has_value(true), m_value(value) {}
-
-  Nullable(const Nullable<T_value> &other)
-      : m_has_value(other.m_has_value), m_value(other.m_value) {}
-
-  /**
-    Assigns value from another Nullable<> object.
-  */
-  Nullable<T_value> &operator=(const Nullable<T_value> &other) {
-    this->m_has_value = other.m_has_value;
-    if (this->m_has_value) {
-      this->m_value = other.m_value;
-    }
-    return *this;
-  }
-
-  /**
-    Compares two Nullable<> objects for equality.
-  */
-  bool operator==(const Nullable<T_value> &other) const {
-    if (this->has_value() != other.has_value())
-      return false;
-    else if (this->has_value() && this->value() != other.value())
-      return false;
-    return true;
-  }
-
-  /**
-    Compares two Nullable<> objects for in-equality.
-  */
-  bool operator!=(const Nullable<T_value> &other) const {
-    return !(*this == other);
-  }
-
-  /**
-    Returns true if object has not-NULL value assigned. If this is false, one
-    should not try to get value by value().
-  */
-  bool has_value() const { return this->m_has_value; }
-
-  /**
-    Returns actual value of object. Do not call this method if has_value()
-    returns false.
-  */
-  const T_value &value() const {
-    assert(this->m_has_value);
-    return this->m_value;
-  }
-
- private:
-  /**
-    Specifies if this object represents NULL value. If this is false, one
-    should not try to get value by value().
-  */
-  bool m_has_value;
-  /**
-    Actual value, if m_has_value is true. Undefined if m_has_value is false.
-  */
-  T_value m_value{};
-};
-
-}  // namespace Mysql
-
-#endif  // NULLABLE_INCLUDED
diff -Nru mysql-8.0-8.0.26/include/pfs_thread_provider.h mysql-8.0-8.0.27/include/pfs_thread_provider.h
--- mysql-8.0-8.0.26/include/pfs_thread_provider.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/pfs_thread_provider.h	2021-09-28 11:46:34.000000000 +0000
@@ -58,12 +58,12 @@
 void pfs_register_thread_vc(const char *category, PSI_thread_info *info,
                             int count);
 
-int pfs_spawn_thread_vc(PSI_thread_key key, my_thread_handle *thread,
-                        const my_thread_attr_t *attr,
+int pfs_spawn_thread_vc(PSI_thread_key key, unsigned int sequence_number,
+                        my_thread_handle *thread, const my_thread_attr_t *attr,
                         void *(*start_routine)(void *), void *arg);
 
-PSI_thread *pfs_new_thread_vc(PSI_thread_key key, const void *identity,
-                              ulonglong processlist_id);
+PSI_thread *pfs_new_thread_vc(PSI_thread_key key, unsigned int sequence_number,
+                              const void *identity, ulonglong processlist_id);
 
 void pfs_set_thread_id_vc(PSI_thread *thread, ulonglong processlist_id);
 
diff -Nru mysql-8.0-8.0.26/include/prealloced_array.h mysql-8.0-8.0.27/include/prealloced_array.h
--- mysql-8.0-8.0.26/include/prealloced_array.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/prealloced_array.h	2021-09-28 11:46:34.000000000 +0000
@@ -613,7 +613,9 @@
   // and m_alloced_size contains the real size.
   int m_inline_size = 0;
 
-  // Defined outside the union solely to avoid a crash with __SUNPRO_CC
+  // Defined outside the union because we need an initializer to avoid
+  // "may be used uninitialized" for -flto builds, and
+  // MSVC rejects initializers for individual members of an anonymous union.
   // (otherwise, we'd make it an anonymous struct, to avoid m_ext everywhere).
   struct External {
     Element_type *m_array_ptr;
diff -Nru mysql-8.0-8.0.26/include/priority_queue.h mysql-8.0-8.0.27/include/priority_queue.h
--- mysql-8.0-8.0.26/include/priority_queue.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/priority_queue.h	2021-09-28 11:46:34.000000000 +0000
@@ -33,8 +33,6 @@
 #include <utility>
 #include <vector>
 
-#include "my_compiler.h"
-
 #include "template_utils.h"
 
 #if defined(EXTRA_CODE_FOR_UNIT_TESTING)
@@ -392,8 +390,7 @@
     @param  n number of elements.
     @retval true if out-of-memory, false otherwise.
   */
-  MY_ATTRIBUTE((warn_unused_result))
-  bool reserve(size_type n) {
+  [[nodiscard]] bool reserve(size_type n) {
     assert(n <= m_container.max_size());
     try {
       m_container.reserve(n);
diff -Nru mysql-8.0-8.0.26/include/sql_common.h mysql-8.0-8.0.27/include/sql_common.h
--- mysql-8.0-8.0.26/include/sql_common.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/sql_common.h	2021-09-28 11:46:34.000000000 +0000
@@ -48,7 +48,10 @@
 extern "C" {
 #endif
 
-extern const char *unknown_sqlstate;
+#ifdef IMPORT_UNKNOWN_SQLSTATE
+__declspec(dllimport)
+#endif
+    extern const char *unknown_sqlstate;
 extern const char *cant_connect_sqlstate;
 extern const char *not_error_sqlstate;
 
@@ -125,12 +128,41 @@
 
 #define ASYNC_DATA(M) \
   (NULL != (M) ? (MYSQL_EXTENSION_PTR(M)->mysql_async_context) : NULL)
+/**
+  Sets the MYSQL_EXTENSION::server_extn attribute by the use of NET_SERVER which
+  contains information about compression context and compression attributes.
+  This attribute needs to be set each time mysql_real_connect() is called to
+  make a connection. When a connection attempt fails or when a connection is
+  closed, as part of the MYSQL handle cleanup, mysql_close_free() is called and
+  that will free MYSQL_EXTENSION::server_extn.
+
+  mysql_close_free() will free all the memory allocated in the MYSQL handle but
+  preserves MYSQL::options. These options are later free'd by
+  mysql_close_free_options() unless the client flag CLIENT_REMEMBER_OPTIONS is
+  set.
+
+  @param mysql  The MYSQL handle
+  @param extn   The NET_SERVER handle that contains compression context info.
+*/
 #ifdef MYSQL_SERVER
 inline void mysql_extension_set_server_extn(MYSQL *mysql, NET_SERVER *extn) {
   MYSQL_EXTENSION_PTR(mysql)->server_extn = extn;
 }
 #endif
 
+/*
+  Maximum allowed authentication plugins for a given user account.
+*/
+#define MAX_AUTHENTICATION_FACTOR 3
+/*
+  Placeholder to save plugin name and password of 1st, 2nd and 3rd
+  factor authentication methods.
+*/
+struct client_authentication_info {
+  char *plugin_name;
+  char *password;
+};
+
 struct st_mysql_options_extention {
   char *plugin_dir;
   char *default_auth;
@@ -152,6 +184,7 @@
   unsigned int zstd_compression_level;
   bool connection_compressed;
   char *load_data_dir;
+  struct client_authentication_info client_auth_info[MAX_AUTHENTICATION_FACTOR];
 };
 
 struct MYSQL_METHODS {
@@ -277,4 +310,8 @@
 
 #define protocol_41(A) ((A)->server_capabilities & CLIENT_PROTOCOL_41)
 
+/*
+  AuthNextFactor packet is defined to have value 2 in 1st byte.
+*/
+#define AUTH_NEXT_FACTOR_PACKETTYPE 2
 #endif /* SQL_COMMON_INCLUDED */
diff -Nru mysql-8.0-8.0.26/include/sql_string.h mysql-8.0-8.0.27/include/sql_string.h
--- mysql-8.0-8.0.26/include/sql_string.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/sql_string.h	2021-09-28 11:46:34.000000000 +0000
@@ -218,8 +218,8 @@
     str.m_is_alloced = false;
   }
   static void *operator new(size_t size, MEM_ROOT *mem_root,
-                            const std::nothrow_t &arg MY_ATTRIBUTE((unused)) =
-                                std::nothrow) noexcept {
+                            const std::nothrow_t &arg
+                            [[maybe_unused]] = std::nothrow) noexcept {
     return mem_root->Alloc(size);
   }
   static void operator delete(void *ptr_arg, size_t size) {
diff -Nru mysql-8.0-8.0.26/include/template_utils.h mysql-8.0-8.0.27/include/template_utils.h
--- mysql-8.0-8.0.26/include/template_utils.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/template_utils.h	2021-09-28 11:46:34.000000000 +0000
@@ -28,6 +28,7 @@
 #include <stddef.h>
 #include <algorithm>
 #include <iterator>
+#include <optional>
 #include <type_traits>
 
 /**
diff -Nru mysql-8.0-8.0.26/include/thr_cond.h mysql-8.0-8.0.27/include/thr_cond.h
--- mysql-8.0-8.0.26/include/thr_cond.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/thr_cond.h	2021-09-28 11:46:34.000000000 +0000
@@ -80,8 +80,7 @@
 #endif
 }
 
-static inline int native_cond_destroy(
-    native_cond_t *cond MY_ATTRIBUTE((unused))) {
+static inline int native_cond_destroy(native_cond_t *cond [[maybe_unused]]) {
 #ifdef _WIN32
   return 0; /* no destroy function */
 #else
diff -Nru mysql-8.0-8.0.26/include/thr_mutex.h mysql-8.0-8.0.27/include/thr_mutex.h
--- mysql-8.0-8.0.26/include/thr_mutex.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/thr_mutex.h	2021-09-28 11:46:34.000000000 +0000
@@ -77,7 +77,7 @@
 
 static inline int native_mutex_init(native_mutex_t *mutex,
                                     const native_mutexattr_t *attr
-                                        MY_ATTRIBUTE((unused))) {
+                                    [[maybe_unused]]) {
 #ifdef _WIN32
   InitializeCriticalSection(mutex);
   return 0;
diff -Nru mysql-8.0-8.0.26/include/thr_rwlock.h mysql-8.0-8.0.27/include/thr_rwlock.h
--- mysql-8.0-8.0.26/include/thr_rwlock.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/thr_rwlock.h	2021-09-28 11:46:34.000000000 +0000
@@ -66,8 +66,7 @@
 #endif
 }
 
-static inline int native_rw_destroy(
-    native_rw_lock_t *rwp MY_ATTRIBUTE((unused))) {
+static inline int native_rw_destroy(native_rw_lock_t *rwp [[maybe_unused]]) {
 #ifdef _WIN32
   return 0; /* no destroy function */
 #else
diff -Nru mysql-8.0-8.0.26/include/violite.h mysql-8.0-8.0.27/include/violite.h
--- mysql-8.0-8.0.26/include/violite.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/include/violite.h	2021-09-28 11:46:34.000000000 +0000
@@ -51,7 +51,7 @@
 
 /* Simple vio interface in C;  The functions are implemented in violite.c */
 
-#if !defined(_WIN32) && !defined(HAVE_KQUEUE) && !defined(__SUNPRO_CC)
+#if !defined(_WIN32) && !defined(HAVE_KQUEUE)
 #define USE_PPOLL_IN_VIO
 #endif
 
@@ -272,6 +272,8 @@
 
 uint get_fips_mode();
 
+int test_ssl_fips_mode(char *err_string);
+
 struct st_VioSSLFd *new_VioSSLAcceptorFd(
     const char *key_file, const char *cert_file, const char *ca_file,
     const char *ca_path, const char *cipher, const char *ciphersuites,
diff -Nru mysql-8.0-8.0.26/libbinlogevents/include/wrapper_functions.h mysql-8.0-8.0.27/libbinlogevents/include/wrapper_functions.h
--- mysql-8.0-8.0.26/libbinlogevents/include/wrapper_functions.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/libbinlogevents/include/wrapper_functions.h	2021-09-28 11:46:34.000000000 +0000
@@ -166,7 +166,7 @@
   @param flags        flags to pass to MySQL server my_malloc functions
   @return Void pointer to the allocated chunk of memory
 */
-inline void *bapi_malloc(size_t size, int flags MY_ATTRIBUTE((unused))) {
+inline void *bapi_malloc(size_t size, int flags [[maybe_unused]]) {
   void *dest = nullptr;
 #ifdef HAVE_MYSYS
   dest = my_malloc(key_memory_log_event, size, MYF(flags));
diff -Nru mysql-8.0-8.0.26/libbinlogevents/src/codecs/binary.cpp mysql-8.0-8.0.27/libbinlogevents/src/codecs/binary.cpp
--- mysql-8.0-8.0.26/libbinlogevents/src/codecs/binary.cpp	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/libbinlogevents/src/codecs/binary.cpp	2021-09-28 11:46:34.000000000 +0000
@@ -143,7 +143,7 @@
  */
 std::pair<std::size_t, bool> Transaction_payload::encode(
     const Binary_log_event &from, unsigned char *to,
-    size_t size MY_ATTRIBUTE((unused))) const {
+    size_t size [[maybe_unused]]) const {
   bool result =
       from.header()->type_code != binary_log::TRANSACTION_PAYLOAD_EVENT;
   uchar *ptr = to;
@@ -195,4 +195,4 @@
 
 }  // namespace binary
 }  // namespace codecs
-}  // namespace binary_log
\ No newline at end of file
+}  // namespace binary_log
diff -Nru mysql-8.0-8.0.26/libbinlogevents/src/uuid.cpp mysql-8.0-8.0.27/libbinlogevents/src/uuid.cpp
--- mysql-8.0-8.0.26/libbinlogevents/src/uuid.cpp	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/libbinlogevents/src/uuid.cpp	2021-09-28 11:46:34.000000000 +0000
@@ -66,7 +66,7 @@
     case TEXT_LENGTH + 2:
       if (*in_string != '{' || in_string[TEXT_LENGTH + 1] != '}') return 1;
       in_string++;
-      // intentionally fall through
+      [[fallthrough]];
     // standard UUID ex 12345678-1234-5678-1234-567812345678
     case TEXT_LENGTH:
       for (int i = 0; i < NUMBER_OF_SECTIONS - 1; i++) {
diff -Nru mysql-8.0-8.0.26/libmysql/authentication_fido/CMakeLists.txt mysql-8.0-8.0.27/libmysql/authentication_fido/CMakeLists.txt
--- mysql-8.0-8.0.26/libmysql/authentication_fido/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/libmysql/authentication_fido/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,62 @@
+# Copyright (c) 2021, Oracle 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,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+#
+# Configuration for building FIDO Authentication Plugin (client-side)
+#
+
+# Skip it if disabled.
+IF(NOT WITH_AUTHENTICATION_CLIENT_PLUGINS)
+  MESSAGE(STATUS "Skipping FIDO client authentication plugin.")
+  RETURN()
+ENDIF()
+
+# The client authentication plugin is part of the community build.
+# Build it if we have found the necessary libraries.
+IF(NOT FIDO_FOUND)
+  MESSAGE(WARNING "Skipping the FIDO client authentication plugin")
+  RETURN()
+ENDIF()
+
+INCLUDE(CheckIncludeFiles)
+
+MY_INCLUDE_SYSTEM_DIRECTORIES(FIDO)
+
+DISABLE_MISSING_PROFILE_WARNING()
+
+MYSQL_ADD_PLUGIN(authentication_fido_client
+  fido_registration.cc
+  fido_assertion.cc
+  fido_client_plugin.cc
+  LINK_LIBRARIES
+  ${FIDO_LIBRARY}
+  CLIENT_ONLY
+  MODULE_ONLY
+  MODULE_OUTPUT_NAME "authentication_fido_client")
+
+IF (INSTALL_RPATH_FOR_FIDO2)
+  ADD_INSTALL_RPATH_FOR_FIDO2(authentication_fido_client)
+ENDIF()
+
+IF(TARGET symlink_fido2_dlls)
+  ADD_DEPENDENCIES(authentication_fido_client symlink_fido2_dlls)
+ENDIF()
diff -Nru mysql-8.0-8.0.26/libmysql/authentication_fido/fido_assertion.cc mysql-8.0-8.0.27/libmysql/authentication_fido/fido_assertion.cc
--- mysql-8.0-8.0.26/libmysql/authentication_fido/fido_assertion.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/libmysql/authentication_fido/fido_assertion.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,254 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include "fido_assertion.h"
+#include "fido_common.h"
+
+#include "mysql_com.h" /* CHALLENGE_LENGTH */
+
+using namespace std;
+
+/**
+  Construcutor to allocate memory for performing assertion (authentication)
+*/
+fido_prepare_assert::fido_prepare_assert() { m_assert = fido_assert_new(); }
+
+/**
+  Standard destructor
+*/
+fido_prepare_assert::~fido_prepare_assert() { fido_assert_free(&m_assert); }
+
+/**
+  Helper method to parse the challenge received from server during
+  authentication process. This method extracts salt, relying party
+  name and set it in fido_assert_t.
+
+  @param [in] challenge       buffer holding the server challenge
+
+  @retval false received challenge was valid
+  @retval true  received challenge was corrupt
+*/
+bool fido_prepare_assert::parse_challenge(const unsigned char *challenge) {
+  char *str = nullptr;
+  unsigned char *to = const_cast<unsigned char *>(challenge);
+  /* length of challenge should be 32 bytes */
+  unsigned long len = net_field_length_ll(&to);
+  if (len != CHALLENGE_LENGTH) goto err;
+  /* extract challenge */
+  set_scramble(to, len);
+
+  to += len;
+  /* length of relying party ID */
+  len = net_field_length_ll(&to);
+  /* Length of relying party ID should not be > 255 */
+  if (len > 255) goto err;
+  /* extract relying party ID */
+  str = new (std::nothrow) char[len + 1];
+  memcpy(str, to, len);
+  str[len] = 0;
+  set_rp_id(str);
+  delete[] str;
+
+  to += len;
+  /* length of cred ID */
+  len = net_field_length_ll(&to);
+  /* extract cred ID */
+  set_cred_id(to, len);
+  to += len;
+
+  return false;
+
+err:
+  get_plugin_messages("Challange recevied is corrupt.", message_type::ERROR);
+  return true;
+}
+
+/**
+  Method to obtains an assertion from a FIDO device.
+
+  @retval false assertion successful.
+  @retval true  assertion failed.
+*/
+bool fido_prepare_assert::sign_challenge() {
+  bool ret_code = false;
+  fido_init(0);
+  size_t dev_infos_len = 0;
+  fido_dev_info_t *dev_infos = fido_dev_info_new(1);
+  if (fido_dev_info_manifest(dev_infos, 1, &dev_infos_len) != FIDO_OK) {
+    fido_dev_info_free(&dev_infos, 1);
+    get_plugin_messages("No FIDO device available on client host.",
+                        message_type::ERROR);
+    return true;
+  }
+  const fido_dev_info_t *curr = fido_dev_info_ptr(dev_infos, 0);
+  const char *path = fido_dev_info_path(curr);
+  /* open the device */
+  fido_dev_t *dev = fido_dev_new();
+  if (fido_dev_open(dev, path) != FIDO_OK) {
+    get_plugin_messages("Failed to open FIDO device.", message_type::ERROR);
+    ret_code = true;
+    goto end;
+  } else {
+    std::string s(
+        "Please insert FIDO device and perform gesture action for"
+        " authentication to complete.");
+    get_plugin_messages(s, message_type::INFO);
+    if (fido_dev_get_assert(dev, m_assert, NULL) != FIDO_OK) {
+      get_plugin_messages(
+          "Assertion failed.Please check relying party ID "
+          "(@@global.authentication_fido_rp_id) of server.",
+          message_type::ERROR);
+      ret_code = true;
+      goto end;
+    }
+  }
+end:
+  fido_dev_close(dev);
+  fido_dev_free(&dev);
+  fido_dev_info_free(&dev_infos, 1);
+  return ret_code;
+}
+
+/**
+  This method will extract authenticator data, signature from fido_assert_t
+  struct.
+
+  @param [out] challenge_res     buffer to signed challenge
+  @param [out] challenge_res_len length of signed challenge
+
+  @retval void
+*/
+void fido_prepare_assert::get_signed_challenge(unsigned char **challenge_res,
+                                               size_t &challenge_res_len) {
+  unsigned long authdata_len = get_authdata_len();
+  unsigned long sig_len = get_signature_len();
+  challenge_res_len = net_length_size(authdata_len) + net_length_size(sig_len) +
+                      authdata_len + sig_len;
+  *challenge_res = new (std::nothrow) unsigned char[challenge_res_len];
+  unsigned char *pos = *challenge_res;
+  pos = net_store_length(pos, authdata_len);
+  memcpy(pos, get_authdata_ptr(), authdata_len);
+  pos += authdata_len;
+  pos = net_store_length(pos, sig_len);
+  memcpy(pos, get_signature_ptr(), sig_len);
+}
+
+/**
+  Set method to set 32 bit random salt.
+
+  @param [in] scramble   buffer holding random salt
+  @param [in] len        length of salt
+
+  @retval void
+*/
+void fido_prepare_assert::set_scramble(unsigned char *scramble, size_t len) {
+  fido_assert_set_clientdata_hash(m_assert, scramble, len);
+}
+
+/**
+  Set method to set credential ID.
+
+  @param [in] cred   buffer holding credential ID
+  @param [in] len    length of credential ID
+
+  @retval void
+*/
+void fido_prepare_assert::set_cred_id(unsigned char *cred, size_t len) {
+  fido_assert_allow_cred(m_assert, cred, len);
+}
+
+/**
+  Method to set the relying party name or id.
+
+  @param [in] rp_id   buffer holding relying party name
+
+  @retval void
+*/
+void fido_prepare_assert::set_rp_id(const char *rp_id) {
+  fido_assert_set_rp(m_assert, rp_id);
+}
+
+/**
+  Method to get authenticator data
+
+  @retval buffer holding authenticator data
+*/
+const unsigned char *fido_prepare_assert::get_authdata_ptr() {
+  return fido_assert_authdata_ptr(m_assert, 0);
+}
+
+/**
+  Method to get length of authenticator data
+
+  @retval length of authenticator data
+*/
+size_t fido_prepare_assert::get_authdata_len() {
+  return fido_assert_authdata_len(m_assert, 0);
+}
+
+/**
+  Method to get signature
+
+  @retval buffer holding signature data
+*/
+const unsigned char *fido_prepare_assert::get_signature_ptr() {
+  return fido_assert_sig_ptr(m_assert, 0);
+}
+
+/**
+  Method to get length of signature
+
+  @retval length of signature
+*/
+size_t fido_prepare_assert::get_signature_len() {
+  return fido_assert_sig_len(m_assert, 0);
+}
+
+/**
+  Helper method to prepare all context required to perform assertion.
+*/
+bool fido_assertion::prepare_assert(const unsigned char *challenge) {
+  return m_fido_prepare_assert.parse_challenge(challenge);
+}
+
+/**
+  Helper method to sign the challenge received from server side FIDO
+  plugin during authentication, and send signed challenge back to server
+  side plugin, only if FIDO device successfully verifies the challenge,
+  else report an error.
+*/
+bool fido_assertion::sign_challenge() {
+  return m_fido_prepare_assert.sign_challenge();
+}
+
+/**
+  Helper method to prepare challenge response to be passed to server
+*/
+void fido_assertion::get_signed_challenge(unsigned char **challenge_res,
+                                          size_t &challenge_res_len) {
+  m_fido_prepare_assert.get_signed_challenge(challenge_res, challenge_res_len);
+}
diff -Nru mysql-8.0-8.0.26/libmysql/authentication_fido/fido_assertion.h mysql-8.0-8.0.27/libmysql/authentication_fido/fido_assertion.h
--- mysql-8.0-8.0.26/libmysql/authentication_fido/fido_assertion.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/libmysql/authentication_fido/fido_assertion.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,84 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef FIDO_ASSERTION_H_
+#define FIDO_ASSERTION_H_
+
+#include <fido.h>
+
+/**
+   A wrapper class to access fido2 libary APIs to interact with the device.
+   This class abstracts all access to FIDO device.
+*/
+class fido_prepare_assert {
+ public:
+  fido_prepare_assert();
+  ~fido_prepare_assert();
+  bool parse_challenge(const unsigned char *challenge);
+  bool sign_challenge();
+  void get_signed_challenge(unsigned char **challenge_res,
+                            size_t &challenge_res_len);
+
+ private:
+  /* set client data has */
+  void set_scramble(unsigned char *scramble, size_t len);
+  /* set credential ID */
+  void set_cred_id(unsigned char *cred, size_t len);
+  /* set relying party ID */
+  void set_rp_id(const char *rp_id);
+
+  /* get method to retrieve authenticator data */
+  const unsigned char *get_authdata_ptr();
+  /* get method to retrieve length of authenticator data */
+  size_t get_authdata_len();
+  /* get method to retrieve signature */
+  const unsigned char *get_signature_ptr();
+  /* get method to retrieve length of signature */
+  size_t get_signature_len();
+
+ private:
+  /* Abstract type to hold information during authentication */
+  fido_assert_t *m_assert;
+};
+
+/**
+   Class to initiate authentication(aka assertion in FIDO terminology) on
+   client side by generating a signed signature by FIDO device which needs
+   to be sent to server to be verified.
+*/
+class fido_assertion {
+ public:
+  bool prepare_assert(const unsigned char *challenge);
+  bool sign_challenge();
+  void get_signed_challenge(unsigned char **challenge_res,
+                            size_t &challenge_res_len);
+
+ private:
+  fido_prepare_assert m_fido_prepare_assert;
+};
+
+#endif  // FIDO_ASSERTION_H_
\ No newline at end of file
diff -Nru mysql-8.0-8.0.26/libmysql/authentication_fido/fido_client_plugin.cc mysql-8.0-8.0.27/libmysql/authentication_fido/fido_client_plugin.cc
--- mysql-8.0-8.0.26/libmysql/authentication_fido/fido_client_plugin.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/libmysql/authentication_fido/fido_client_plugin.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,219 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include <mysql.h>
+#include <mysql/client_plugin.h>
+#include "my_dbug.h"
+
+#include "fido_assertion.h"
+#include "fido_common.h"
+#include "fido_registration.h"
+
+#ifndef NDEBUG
+static bool is_fido_testing = false;
+#endif
+static unsigned char registration_challenge[128] = {0};
+static unsigned char registration_challenge_response[1024] = {0};
+
+static bool do_registration();
+
+/*
+  Handler to callback function which will pass informative messages generated by
+  this plugin caller. This callback function is registered via
+  mysql_plugin_option("fido_messages_callback")
+
+  If callback is not registered, all messaged are redirected to stderr/stdout.
+*/
+plugin_messages_callback mc = nullptr;
+
+/*
+  Helper method which redirect the messages based on what value is set in
+  redirect_message
+*/
+void get_plugin_messages(const std::string &msg, message_type type) {
+  /* if callback is registered, pass msg to callback function */
+  if (mc) {
+    mc(msg.c_str());
+  } else {
+    if (type == message_type::ERROR) {
+      std::cerr << msg.c_str() << std::endl;
+      std::cerr.flush();
+    } else if (type == message_type::INFO) {
+      std::cout << msg.c_str() << std::endl;
+    }
+  }
+}
+
+/**
+  authentication_fido_client plugin API to initialize
+*/
+static int fido_auth_client_plugin_init(char *, size_t, int, va_list) {
+  return 0;
+}
+
+/**
+  Deinitialize authentication_fido_client plugin
+*/
+static int fido_auth_client_plugin_deinit() { return 0; }
+
+/**
+  authentication_fido_client plugin API to allow server to pass optional data
+  for plugin to process
+*/
+static int fido_auth_client_plugin_option(const char *option, const void *val) {
+#ifndef NDEBUG
+  if (strcmp(option, "is_fido_testing") == 0) {
+    is_fido_testing = *static_cast<const bool *>(val);
+    return false;
+  }
+#endif
+  if (strcmp(option, "fido_messages_callback") == 0) {
+    mc = (plugin_messages_callback)(const_cast<void *>(val));
+    return false;
+  }
+  if (strcmp(option, "registration_challenge") == 0) {
+    unsigned char *p =
+        reinterpret_cast<unsigned char *>(const_cast<void *>(val));
+    memcpy(registration_challenge, p, strlen(reinterpret_cast<char *>(p)));
+    /* finish registration */
+    if (do_registration()) return true;
+    return false;
+  }
+  return true;
+}
+
+/**
+  authentication_fido_client plugin API to allow server to get optional data
+  from plugin
+*/
+static int fido_auth_client_get_plugin_option(const char *option, void *val) {
+  if (strcmp(option, "registration_response") == 0) {
+    *(static_cast<unsigned char **>(val)) = registration_challenge_response;
+  }
+  return 0;
+}
+
+/**
+   FIDO client side authentication method. This method does following:
+
+   1. Receive challenge from server side FIDO plugin. This challenge
+      comprises of salt, relying party name.
+   2. Send this challenge to FIDO device and get the signed challenge.
+      Signed challenge includes signature and authenticator data, which
+      is to be verified by server side plugin with public key.
+
+  @param [in] vio  Virtual I/O interface
+
+  @return authentication status
+  @retval CR_OK    Successful authentication
+  @retval true     Authentication failure
+*/
+static int fido_auth_client(MYSQL_PLUGIN_VIO *vio, MYSQL *) {
+  unsigned char *server_challenge = nullptr;
+  int server_challenge_len = 0;
+
+  /** Get the challenge from the MySQL server. */
+  server_challenge_len = vio->read_packet(vio, &server_challenge);
+  if (server_challenge_len == 0) {
+    /*
+      an empty packet means registration step is pending, thus for now allow
+      connection with limited operations for user so that user can perform
+      registration step.
+    */
+    return CR_OK_AUTH_IN_SANDBOX_MODE;
+  }
+  unsigned char *buff = nullptr;
+  size_t length = 0;
+#ifndef NDEBUG
+  if (is_fido_testing) {
+    length = 33;
+    buff = new (std::nothrow) unsigned char[length];
+    memcpy(buff, "\nsakila    \nsakila    \nsakila    ", length);
+    vio->write_packet(vio, buff, length);
+    delete[] buff;
+    return CR_OK;
+  } else
+#endif
+  {
+    fido_assertion *fa = new fido_assertion();
+    if (fa->prepare_assert(server_challenge) || fa->sign_challenge()) {
+      delete fa;
+      return true;
+    }
+    /* copy signed challenge into buff */
+    fa->get_signed_challenge(&buff, length);
+    /* send signed challenge to fido server plugin */
+    vio->write_packet(vio, buff, length);
+    delete fa;
+    delete[] buff;
+  }
+  return CR_OK;
+}
+
+/**
+   FIDO client side registration method. This method does following:
+
+   1. Receive challenge from server side FIDO plugin. This challenge
+      comprises of username, salt and relying party name.
+   2. Send this challenge to FIDO device and get the signature, authenticator
+      data and x509 certificate generated by device. This is sent to server
+      as challenge reponse.
+
+  @return registration status
+  @retval false    Successful registration
+  @retval true     Registration failure
+*/
+static bool do_registration() {
+#ifndef NDEBUG
+  if (is_fido_testing) {
+    const char *dummy = "\nSIGNATURE \nAUHENDATA \nCERT      ";
+    memcpy(registration_challenge, dummy, strlen(dummy));
+    return false;
+  } else
+#endif
+  {
+    fido_registration *fr = new fido_registration();
+    if (fr->make_credentials(const_cast<const char *>(
+            reinterpret_cast<char *>(registration_challenge)))) {
+      delete fr;
+      return true;
+    }
+    if (fr->make_challenge_response(registration_challenge_response)) {
+      delete fr;
+      return true;
+    }
+    delete fr;
+  }
+  return false;
+}
+
+mysql_declare_client_plugin(AUTHENTICATION) "authentication_fido_client",
+    MYSQL_CLIENT_PLUGIN_AUTHOR_ORACLE, "Fido Client Authentication Plugin",
+    {0, 1, 0}, "GPL", nullptr, fido_auth_client_plugin_init,
+    fido_auth_client_plugin_deinit, fido_auth_client_plugin_option,
+    fido_auth_client_get_plugin_option, fido_auth_client,
+    nullptr, mysql_end_client_plugin;
diff -Nru mysql-8.0-8.0.26/libmysql/authentication_fido/fido_common.h mysql-8.0-8.0.27/libmysql/authentication_fido/fido_common.h
--- mysql-8.0-8.0.26/libmysql/authentication_fido/fido_common.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/libmysql/authentication_fido/fido_common.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,104 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef FIDO_COMMON_H_
+#define FIDO_COMMON_H_
+
+#include <cstring>
+#include <iostream>
+#include <sstream>
+
+#include "my_byteorder.h"
+#include "my_inttypes.h"
+
+typedef void (*plugin_messages_callback)(const char *msg);
+extern plugin_messages_callback mc;
+
+/* Define type of message */
+enum class message_type {
+  INFO,  /* directed to stdout */
+  ERROR, /* directed to stderr */
+};
+
+/*
+  Helper method to redirect plugin specific messages to a registered callback
+  method or to stdout/stderr.
+*/
+void get_plugin_messages(const std::string &msg, message_type type);
+
+inline uchar *net_store_length(uchar *packet, ulonglong length) {
+  if (length < (ulonglong)251LL) {
+    *packet = (uchar)length;
+    return packet + 1;
+  }
+  /* 251 is reserved for NULL */
+  if (length < (ulonglong)65536LL) {
+    *packet++ = 252;
+    int2store(packet, (uint)length);
+    return packet + 2;
+  }
+  if (length < (ulonglong)16777216LL) {
+    *packet++ = 253;
+    int3store(packet, (ulong)length);
+    return packet + 3;
+  }
+  *packet++ = 254;
+  int8store(packet, length);
+  return packet + 8;
+}
+
+inline uint net_length_size(ulonglong num) {
+  if (num < 251ULL) return 1;
+  if (num < 65536LL) return 3;
+  if (num < 16777216ULL) return 4;
+  return 9;
+}
+
+/* The same as above but returns longlong */
+inline uint64_t net_field_length_ll(uchar **packet) {
+  const uchar *pos = *packet;
+  if (*pos < 251) {
+    (*packet)++;
+    return (uint64_t)*pos;
+  }
+  if (*pos == 251) {
+    (*packet)++;
+    return (uint64_t)((unsigned long)~0);
+  }
+  if (*pos == 252) {
+    (*packet) += 3;
+    return (uint64_t)uint2korr(pos + 1);
+  }
+  if (*pos == 253) {
+    (*packet) += 4;
+    return (uint64_t)uint3korr(pos + 1);
+  }
+  (*packet) += 9; /* Must be 254 when here */
+  return (uint64_t)uint8korr(pos + 1);
+}
+
+#endif  // FIDO_COMMON_H_
\ No newline at end of file
diff -Nru mysql-8.0-8.0.26/libmysql/authentication_fido/fido_registration.cc mysql-8.0-8.0.27/libmysql/authentication_fido/fido_registration.cc
--- mysql-8.0-8.0.26/libmysql/authentication_fido/fido_registration.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/libmysql/authentication_fido/fido_registration.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,336 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include <assert.h>
+#include <string>
+
+#include "fido_common.h"
+#include "fido_registration.h"
+
+#include "base64.h"    /* base64_decode */
+#include "mysql_com.h" /* CHALLENGE_LENGTH */
+
+using namespace std;
+
+/**
+  Construcutor to allocate memory for performing attestation (registration)
+*/
+fido_make_cred::fido_make_cred() {
+  m_cred = fido_cred_new();
+  // always set defaut type algorithm to COSE_ES256
+  set_type();
+}
+
+/**
+  Standard destructor
+*/
+fido_make_cred::~fido_make_cred() { fido_cred_free(&m_cred); }
+
+/**
+   This method fills in all information required to initiate registration
+   process. This method parses server challenge and generates challenge
+   response.
+
+  @param [in] challenge       buffer holding the server challenge
+
+  @retval false   successfull generation of credentials.
+  @retval true    error occurred.
+*/
+bool fido_make_cred::make_credentials(const char *challenge) {
+  parse_challenge(challenge);
+  return generate_signature();
+}
+
+/**
+  Helper method to parse the challenge received from server during registration
+  process. This method extracts salt, user name, relying party name and set it
+  in fido_cred_t.
+
+  @param [in] challenge   buffer holding the server challenge
+
+  @retval void
+*/
+bool fido_make_cred::parse_challenge(const char *challenge) {
+  /* decode received challenge from base64 */
+  char *tmp_value;
+  const char *end_ptr;
+  int64 length = base64_needed_decoded_length((uint64)strlen(challenge));
+  tmp_value = new char[length];
+  length = base64_decode(challenge, (uint64)strlen(challenge), tmp_value,
+                         &end_ptr, 0);
+
+  unsigned char *to = (unsigned char *)tmp_value;
+  /* length of challenge should be 32 bytes */
+  unsigned long len = net_field_length_ll(&to);
+  if (len != CHALLENGE_LENGTH) return true;
+  /* extract challenge */
+  set_scramble(to, len);
+
+  to += len;
+  /* length of relying party ID  */
+  len = net_field_length_ll(&to);
+  /* max length of relying party ID is 255 */
+  if (len > 255) return true;
+  /* extract relying party ID  */
+  char *rp = new (std::nothrow) char[len + 1];
+  memcpy(rp, to, len);
+  rp[len] = 0;
+  set_rp_id(rp);
+  delete[] rp;
+
+  to += len;
+  /* length of user name */
+  len = net_field_length_ll(&to);
+  /* user name includes 32 byte user name + 255 bytes hostname */
+  if (len > 280) return true;
+  /* extract user name */
+  char *user = new (std::nothrow) char[len + 1];
+  memcpy(user, to, len);
+  user[len] = 0;
+  set_user(user);
+  delete[] user;
+  delete[] tmp_value;
+  return false;
+}
+
+/**
+  This method checks if a token device is available on client host.
+  If device is present, device expects user to perform gesture action,
+  upon which device generates credential details, which consists of
+  authenticator data, signature and optinal x509 certificate which is
+  passed to server.
+
+  @retval FIDO_OK(false) successfull generation of credentials.
+  @retval true           error occurred.
+*/
+bool fido_make_cred::generate_signature() {
+  bool ret_code = false;
+  fido_init(0);
+  size_t dev_infos_len = 0;
+  fido_dev_info_t *dev_infos = fido_dev_info_new(1);
+  if (fido_dev_info_manifest(dev_infos, 1, &dev_infos_len) != FIDO_OK) {
+    fido_dev_info_free(&dev_infos, 1);
+    get_plugin_messages("No FIDO device available on client host.",
+                        message_type::ERROR);
+    return true;
+  }
+  const fido_dev_info_t *curr = fido_dev_info_ptr(dev_infos, 0);
+  const char *path = fido_dev_info_path(curr);
+  /* open the device */
+  fido_dev_t *dev = fido_dev_new();
+  if (fido_dev_open(dev, path) != FIDO_OK) {
+    get_plugin_messages("Failed to open FIDO device.", message_type::ERROR);
+    ret_code = true;
+    goto end;
+  } else {
+    std::string s(
+        "Please insert FIDO device and perform gesture action for"
+        " registration to complete.");
+    get_plugin_messages(s, message_type::INFO);
+    if (fido_dev_make_cred(dev, m_cred, nullptr) != FIDO_OK) {
+      get_plugin_messages(
+          "Registration failed. Challenge received might be corrupt.",
+          message_type::ERROR);
+      ret_code = true;
+      goto end;
+    }
+  }
+end:
+  fido_dev_close(dev);
+  fido_dev_free(&dev);
+  return ret_code;
+}
+
+/**
+  This method will extract authenticator data, signature, certificate and
+  rp id from fido_cred_t struct, construct a buffer holding this data which
+  will be converted to base64 format before passing to server.
+
+  @param [out] challenge_response     buffer to hold challenge response
+
+  @retval false success
+  @retval true failure
+*/
+bool fido_make_cred::make_challenge_response(
+    unsigned char *&challenge_response) {
+  /* copy client response into buf */
+  unsigned long authdata_len = get_authdata_len();
+  unsigned long sig_len = get_sig_len();
+  unsigned long cert_len = get_x5c_len();
+  unsigned long rp_id_len = strlen(get_rp_id());
+
+  /* calculate total required buffer length */
+  size_t len = net_length_size(authdata_len) + net_length_size(sig_len) +
+               (cert_len ? net_length_size(cert_len) + cert_len : 0) +
+               net_length_size(rp_id_len) + authdata_len + sig_len + rp_id_len;
+  unsigned char *str = new unsigned char[len];
+  unsigned char *pos = str;
+  pos = net_store_length(pos, authdata_len);
+  /* copy authenticator data */
+  memcpy(pos, get_authdata_ptr(), authdata_len);
+  pos += authdata_len;
+  pos = net_store_length(pos, sig_len);
+  /* append signature */
+  memcpy(pos, get_sig_ptr(), sig_len);
+  pos += sig_len;
+  /* append x509 certificate if present */
+  if (cert_len) {
+    pos = net_store_length(pos, cert_len);
+    memcpy(pos, get_x5c_ptr(), cert_len);
+    pos += cert_len;
+  } else {
+    get_plugin_messages("Registration failed. Certificate missing.",
+                        message_type::ERROR);
+    delete[] str;
+    return true;
+  }
+  pos = net_store_length(pos, rp_id_len);
+  memcpy(pos, get_rp_id(), rp_id_len);
+  pos += rp_id_len;
+  assert(len == (size_t)(pos - str));
+
+  base64_encode(str, len, reinterpret_cast<char *>(challenge_response));
+  delete[] str;
+  return false;
+}
+
+/**
+  Set method to set 32 bit random salt.
+
+  @param [in] scramble   buffer holding random salt
+  @param [in] len        length of salt
+
+  @retval void
+*/
+void fido_make_cred::set_scramble(unsigned char *scramble, size_t len) {
+  fido_cred_set_clientdata_hash(m_cred, scramble, len);
+}
+
+/**
+  Set method to set user name.
+
+  @param [in] user   buffer holding user name
+
+  @retval void
+*/
+void fido_make_cred::set_user(string user) {
+  fido_cred_set_user(m_cred,
+                     reinterpret_cast<const unsigned char *>(user.c_str()),
+                     user.length(), user.c_str(), nullptr, nullptr);
+}
+
+/**
+  Method to set the algorithm type
+
+  @param [in] type   algorithm type
+
+  @retval void
+*/
+void fido_make_cred::set_type(int type) { fido_cred_set_type(m_cred, type); }
+
+/**
+  Method to set the relying party name or id
+
+  @param [in] rp_id   buffer holding relying party name
+
+  @retval void
+*/
+void fido_make_cred::set_rp_id(string rp_id) {
+  fido_cred_set_rp(m_cred, rp_id.c_str(), nullptr);
+}
+
+/**
+  Method to get length of authenticator data
+
+  @retval length of authenticator data.
+*/
+size_t fido_make_cred::get_authdata_len() {
+  return fido_cred_authdata_len(m_cred);
+}
+
+/**
+  Method to get authenticator data
+
+  @retval buffer holding authenticator data
+*/
+const unsigned char *fido_make_cred::get_authdata_ptr() {
+  return fido_cred_authdata_ptr(m_cred);
+}
+
+/**
+  Method to get length of signature
+
+  @retval length of signature
+*/
+size_t fido_make_cred::get_sig_len() { return fido_cred_sig_len(m_cred); }
+
+/**
+  Method to get signature data
+
+  @retval buffer holding signature data
+*/
+const unsigned char *fido_make_cred::get_sig_ptr() {
+  return fido_cred_sig_ptr(m_cred);
+}
+
+/**
+  Method to get length of x509 certificate
+
+  @retval length of x509 certificate
+*/
+size_t fido_make_cred::get_x5c_len() { return fido_cred_x5c_len(m_cred); }
+
+/**
+  Method to get x509 certificate
+
+  @retval buffer holding x509 certificate
+*/
+const unsigned char *fido_make_cred::get_x5c_ptr() {
+  return fido_cred_x5c_ptr(m_cred);
+}
+
+/**
+  Method to get rp id
+
+  @retval buffer holding rp id
+*/
+const char *fido_make_cred::get_rp_id() { return fido_cred_rp_id(m_cred); }
+
+/**
+  Helper method to initiate registration process
+*/
+bool fido_registration::make_credentials(const char *challenge) {
+  return m_fido_make_cred.make_credentials(challenge);
+}
+
+/**
+  Helper method to get challenge response
+*/
+bool fido_registration::make_challenge_response(
+    unsigned char *challenge_response) {
+  return m_fido_make_cred.make_challenge_response(challenge_response);
+}
\ No newline at end of file
diff -Nru mysql-8.0-8.0.26/libmysql/authentication_fido/fido_registration.h mysql-8.0-8.0.27/libmysql/authentication_fido/fido_registration.h
--- mysql-8.0-8.0.26/libmysql/authentication_fido/fido_registration.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/libmysql/authentication_fido/fido_registration.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,87 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef FIDO_REGISTRATION_H_
+#define FIDO_REGISTRATION_H_
+
+#include <fido.h>
+
+/**
+   A wrapper class which abstracts all access to FIDO device.
+*/
+class fido_make_cred {
+ public:
+  fido_make_cred();
+  ~fido_make_cred();
+  /* prepare credential */
+  bool make_credentials(const char *challenge);
+  bool make_challenge_response(unsigned char *&challenge_response);
+
+ private:
+  void set_rp_id(std::string rp_id);
+  void set_type(int type = COSE_ES256);
+  void set_user(std::string user);
+  void set_scramble(unsigned char *, size_t);
+
+  /* get authenticator data details */
+  size_t get_authdata_len();
+  const unsigned char *get_authdata_ptr();
+  /* get signature details */
+  size_t get_sig_len();
+  const unsigned char *get_sig_ptr();
+  /* get x509 certificate details */
+  size_t get_x5c_len();
+  const unsigned char *get_x5c_ptr();
+  /* get rp id */
+  const char *get_rp_id();
+
+  /* Helper method to parse challenge receviced from server */
+  bool parse_challenge(const char *challenge);
+  /*
+    Helper method to open the device and request the device to
+    generate a signature, authenticator data and x509 certificate.
+  */
+  bool generate_signature();
+
+ private:
+  /* An abstraction to hold FIDO credentials. */
+  fido_cred_t *m_cred;
+};
+
+/**
+  This class is used to perform registration step on client side.
+*/
+class fido_registration {
+ public:
+  bool make_credentials(const char *challenge);
+  bool make_challenge_response(unsigned char *buf);
+
+ private:
+  fido_make_cred m_fido_make_cred;
+};
+
+#endif  // FIDO_REGISTRATION_H_
\ No newline at end of file
diff -Nru mysql-8.0-8.0.26/libmysql/authentication_kerberos/auth_kerberos_client_plugin.cc mysql-8.0-8.0.27/libmysql/authentication_kerberos/auth_kerberos_client_plugin.cc
--- mysql-8.0-8.0.26/libmysql/authentication_kerberos/auth_kerberos_client_plugin.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/libmysql/authentication_kerberos/auth_kerberos_client_plugin.cc	2021-09-28 11:46:34.000000000 +0000
@@ -53,7 +53,6 @@
 #include <mysql/client_plugin.h>
 #include <sql_common.h>
 #include "auth_kerberos_client_io.h"
-#include "gssapi_utility.h"
 #include "log_client.h"
 
 Logger_client *g_logger_client{nullptr};
@@ -69,14 +68,16 @@
   authentication process will start.
 */
 bool Kerberos_plugin_client::obtain_store_credentials() {
+  log_client_dbg("Obtaining TGT TGS tickets from kerberos server.");
   if (!m_kerberos_client) {
-    m_kerberos_client = std::unique_ptr<Kerberos_client>(
-        new Kerberos_client(m_user_principal_name.c_str(), m_password.c_str()));
+    m_kerberos_client =
+        std::unique_ptr<I_Kerberos_client>(I_Kerberos_client::create(
+            m_service_principal, m_vio, m_user_principal_name, m_password,
+            m_as_user_relam));
   }
-  log_client_dbg("Obtaining TGT TGS tickets from kerberos.");
   if (!m_kerberos_client->obtain_store_credentials()) {
     log_client_error(
-        "Plug-in has failed to obtained kerberos TGT, authentication process "
+        "Plug-in has failed to obtain kerberos TGT, authentication process "
         "will be aborted. Please provide valid configuration, user name and "
         "password.");
     return false;
@@ -85,26 +86,44 @@
   }
 }
 
-Kerberos_plugin_client::~Kerberos_plugin_client() {}
-
 void Kerberos_plugin_client::set_mysql_account_name(
     std::string mysql_account_name) {
   std::string cc_user_name;
   std::stringstream log_client_stream;
 
   if (mysql_account_name.empty()) {
-    Kerberos_client kerberos_client{m_user_principal_name.c_str(),
-                                    m_password.c_str()};
-    log_client_dbg("Getting user name from Kerberos credential cache.");
-    kerberos_client.get_upn(cc_user_name);
+    /*
+      Kerberos authentication client plug-in called twice if default plug-in is
+      set as authentication_kerberos_client in the client.
+
+      First time, If MySQL account name is empty, we get account name from
+      credential cache (Linux) or windows session (windows) and set as MySQL
+      account name.
+
+      Second time, It gets called for actual authentication with MySQL account
+      name and password.
+    */
+    if (!m_kerberos_client) {
+      m_kerberos_client =
+          std::unique_ptr<I_Kerberos_client>(I_Kerberos_client::create(
+              m_service_principal, m_vio, m_user_principal_name, m_password,
+              m_as_user_relam));
+    }
+    cc_user_name = m_kerberos_client->get_user_name();
+    log_client_stream << "Cached/ OS session user name is: ";
+    log_client_stream << cc_user_name;
+    log_client_dbg(log_client_stream.str());
+    log_client_stream.str("");
   } else {
-    log_client_dbg("MySQL user account name is not empty.");
+    log_client_stream << "Provided MySQL user account name in client is: ";
+    log_client_stream << mysql_account_name;
+    log_client_dbg(log_client_stream.str());
     return;
   }
   if (!cc_user_name.empty()) {
     log_client_dbg(
         "Setting MySQL account name using Kerberos credential cache default "
-        "UPN.");
+        "(Linux )or logged-in account (Windows).");
     /*
       MySQL clients/lib uses my_free, my_strdup my_* string function for string
       management. We also need to use same methods as these are used/free inside
@@ -114,12 +133,7 @@
       my_free(m_mysql->user);
       m_mysql->user = nullptr;
     }
-    size_t pos = std::string::npos;
-    /* Remove realm */
-    if ((pos = cc_user_name.find("@")) != std::string::npos) {
-      log_client_dbg("Trimming realm from upn.");
-      cc_user_name.erase(pos, cc_user_name.length() - pos + 1);
-    }
+
     m_mysql->user =
         my_strdup(PSI_NOT_INSTRUMENTED, cc_user_name.c_str(), MYF(MY_WME));
     log_client_stream.str("");
@@ -135,9 +149,7 @@
 
 void Kerberos_plugin_client::set_upn_info(std::string name, std::string pwd) {
   /*
-    For some cases MySQL user name will be empty as user name is supposed to
-    come from kerberos TGT. Get kerberos user name from TGT and assign this as
-    MySQL user name.
+    Setting UPN using MySQL account name + user realm.
   */
   m_password = pwd;
   if (!name.empty()) {
@@ -152,11 +164,10 @@
 }
 
 bool Kerberos_plugin_client::authenticate() {
-  Gssapi_client gssapi_client{m_service_principal, m_vio};
-  if (gssapi_client.authenticate()) {
-    return CR_OK;
+  if (m_kerberos_client->authenticate()) {
+    return true;
   } else {
-    return CR_ERROR;
+    return false;
   }
 }
 
@@ -177,6 +188,8 @@
 static int kerberos_authenticate(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql) {
   std::stringstream log_client_stream;
   Kerberos_plugin_client client{vio, mysql};
+
+  log_client_info("*** Kerberos authentication starting. ***");
   client.set_mysql_account_name(mysql->user);
   if (!client.read_spn_realm_from_server()) {
     log_client_info(
@@ -225,4 +238,4 @@
 mysql_declare_client_plugin(AUTHENTICATION) "authentication_kerberos_client",
     MYSQL_CLIENT_PLUGIN_AUTHOR_ORACLE, "Kerberos Client Authentication Plugin",
     {0, 1, 0}, "PROPRIETARY", nullptr, initialize_plugin, deinitialize_plugin,
-    nullptr, kerberos_authenticate, nullptr mysql_end_client_plugin;
+    nullptr, nullptr, kerberos_authenticate, nullptr mysql_end_client_plugin;
diff -Nru mysql-8.0-8.0.26/libmysql/authentication_kerberos/auth_kerberos_client_plugin.h mysql-8.0-8.0.27/libmysql/authentication_kerberos/auth_kerberos_client_plugin.h
--- mysql-8.0-8.0.26/libmysql/authentication_kerberos/auth_kerberos_client_plugin.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/libmysql/authentication_kerberos/auth_kerberos_client_plugin.h	2021-09-28 11:46:34.000000000 +0000
@@ -34,13 +34,12 @@
 #include <mysql/plugin_auth_common.h>
 #include "my_config.h"
 
-#include "gssapi_authentication_client.h"
-#include "kerberos_client.h"
+#include "kerberos_client_interface.h"
 
 class Kerberos_plugin_client {
  public:
   Kerberos_plugin_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql);
-  ~Kerberos_plugin_client();
+  ~Kerberos_plugin_client() = default;
   bool authenticate();
   void set_upn_info(std::string name, std::string pwd);
   void set_mysql_account_name(std::string name);
@@ -55,6 +54,6 @@
   std::string m_as_user_relam;
   MYSQL_PLUGIN_VIO *m_vio{nullptr};
   MYSQL *m_mysql{nullptr};
-  std::unique_ptr<Kerberos_client> m_kerberos_client;
+  std::unique_ptr<I_Kerberos_client> m_kerberos_client;
 };
 #endif  // AUTH_KERBEROS_CLIENT_PLUGIN_H_
diff -Nru mysql-8.0-8.0.26/libmysql/authentication_kerberos/CMakeLists.txt mysql-8.0-8.0.27/libmysql/authentication_kerberos/CMakeLists.txt
--- mysql-8.0-8.0.26/libmysql/authentication_kerberos/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/libmysql/authentication_kerberos/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -33,40 +33,57 @@
   RETURN()
 ENDIF()
 
-MESSAGE(STATUS "GSSAPI_LIBRARIES  ${GSSAPI_LIBRARIES}")
-MESSAGE(STATUS "KERBEROS_LIBRARIES  ${KERBEROS_LIBRARIES}")
-MESSAGE(STATUS "GSSAPI_INCLUDE_DIR  ${GSSAPI_INCLUDE_DIR}")
-MESSAGE(STATUS "KERBEROS_INCLUDE_DIR  ${KERBEROS_INCLUDE_DIR}")
+IF(KERBEROS_LIB_SSPI)
+  MESSAGE(STATUS "Building KERBEROS SSPI client authentication plug-in for windows.")
+ELSE()
+  MESSAGE(STATUS "Building KERBEROS GSSAPI client authentication plug-in for linux.")
+  MESSAGE(STATUS "GSSAPI_LIBRARIES  ${GSSAPI_LIBRARIES}")
+  MESSAGE(STATUS "KERBEROS_LIBRARIES  ${KERBEROS_LIBRARIES}")
+  MESSAGE(STATUS "GSSAPI_INCLUDE_DIR  ${GSSAPI_INCLUDE_DIR}")
+  MESSAGE(STATUS "KERBEROS_INCLUDE_DIR  ${KERBEROS_INCLUDE_DIR}")
+ENDIF()
 
-IF(KERBEROS_INCLUDE_DIR AND GSSAPI_INCLUDE_DIR)
-  IF(NOT WITH_KERBEROS STREQUAL "system")
-    IF(KERBEROS_INCLUDE_DIR)
-      INCLUDE_DIRECTORIES(BEFORE SYSTEM ${KERBEROS_INCLUDE_DIR})
-    ENDIF()
-    IF(GSSAPI_INCLUDE_DIR)
-      INCLUDE_DIRECTORIES(BEFORE SYSTEM ${GSSAPI_INCLUDE_DIR})
+IF(NOT KERBEROS_LIB_SSPI)
+  IF((KERBEROS_INCLUDE_DIR AND GSSAPI_INCLUDE_DIR))
+    IF(NOT WITH_KERBEROS STREQUAL "system")
+      IF(KERBEROS_INCLUDE_DIR)
+        INCLUDE_DIRECTORIES(BEFORE SYSTEM ${KERBEROS_INCLUDE_DIR})
+      ENDIF()
+      IF(GSSAPI_INCLUDE_DIR)
+        INCLUDE_DIRECTORIES(BEFORE SYSTEM ${GSSAPI_INCLUDE_DIR})
+      ENDIF()
     ENDIF()
+    SET(AUTH_CLIENT "gssapi_authentication_client.cc")
+    SET(UTILITY "gssapi_utility.cc")
+    SET(CORE "kerberos_core.cc")
+    SET(KERBEROS_LIB  "${GSSAPI_LIBRARIES};${KERBEROS_LIBRARIES}")
+  ELSE()
+    MESSAGE(WARNING
+      "Skipping the KERBEROS client authentication plugin.")
+    RETURN()
   ENDIF()
-  SET(MY_SQL "mysqlclient")
 ELSE()
-  MESSAGE(WARNING
-    "Skipping the KERBEROS client authentication plugin.")
-  RETURN()
+  SET(AUTH_CLIENT "sspi_authentication_client.cc")
+  SET(UTILITY "sspi_utility.cc")
+  SET(CORE "")
+  SET(KERBEROS_LIB  "")
 ENDIF()
 
+SET(MY_SQL "mysqlclient")
+
+DISABLE_MISSING_PROFILE_WARNING()
+
 MYSQL_ADD_PLUGIN(authentication_kerberos_client
   auth_kerberos_client_plugin.cc
-  gssapi_authentication_client.cc
-  gssapi_utility.cc
   auth_kerberos_client_io.cc
-  kerberos_client.cc
-  kerberos_core.cc
   log_client.cc
+  ${AUTH_CLIENT}
+  ${CORE}
+  ${UTILITY}
   LINK_LIBRARIES
   # Uncomment to verify that all symbols are found.
   # ${LINK_FLAG_NO_UNDEFINED}
-  ${GSSAPI_LIBRARIES}
-  ${KERBEROS_LIBRARIES}
+  ${KERBEROS_LIB}
   ${SSL_LIBRARIES}
   ${LIBDL}
   ${MY_SQL}
diff -Nru mysql-8.0-8.0.26/libmysql/authentication_kerberos/gssapi_authentication_client.cc mysql-8.0-8.0.27/libmysql/authentication_kerberos/gssapi_authentication_client.cc
--- mysql-8.0-8.0.26/libmysql/authentication_kerberos/gssapi_authentication_client.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/libmysql/authentication_kerberos/gssapi_authentication_client.cc	2021-09-28 11:46:34.000000000 +0000
@@ -32,8 +32,17 @@
 
 extern Logger_client *g_logger_client;
 
-Gssapi_client::Gssapi_client(const std::string &spn, MYSQL_PLUGIN_VIO *vio)
-    : m_service_principal{spn}, m_vio{vio} {}
+Gssapi_client::Gssapi_client(const std::string &spn, MYSQL_PLUGIN_VIO *vio,
+                             const std::string &upn,
+                             const std::string &password)
+    : m_service_principal{spn},
+      m_vio{vio},
+      m_user_principal_name{upn},
+      m_password{password} {
+  m_kerberos = std::unique_ptr<auth_kerberos_context::Kerberos>(
+      new auth_kerberos_context::Kerberos(m_user_principal_name.c_str(),
+                                          m_password.c_str()));
+}
 
 Gssapi_client::~Gssapi_client() {}
 
@@ -106,3 +115,44 @@
   }
   return rc_auth;
 }
+
+void Gssapi_client::set_upn_info(const std::string &upn,
+                                 const std::string &pwd) {
+  log_client_dbg("Set UPN.");
+  m_user_principal_name = {upn};
+  m_password = {pwd};
+  /* Kerberos core uses UPN for all other operations. UPN has changed, relases
+   * current object and create */
+  if (m_kerberos.get()) {
+    m_kerberos.release();
+  }
+  m_kerberos = std::unique_ptr<auth_kerberos_context::Kerberos>(
+      new auth_kerberos_context::Kerberos(m_user_principal_name.c_str(),
+                                          m_password.c_str()));
+}
+
+bool Gssapi_client::obtain_store_credentials() {
+  log_client_dbg("Obtaining TGT TGS tickets from kerberos.");
+  return m_kerberos->obtain_store_credentials();
+}
+
+std::string Gssapi_client::get_user_name() {
+  log_client_dbg("Getting user name from Kerberos credential cache.");
+  std::string cached_user_name{""};
+  if (m_kerberos->get_upn(&cached_user_name)) {
+    size_t pos = std::string::npos;
+    /* Remove realm */
+    if ((pos = cached_user_name.find("@")) != std::string::npos) {
+      log_client_dbg("Trimming realm from upn.");
+      cached_user_name.erase(pos, cached_user_name.length() - pos + 1);
+    }
+  }
+  return cached_user_name;
+}
+
+I_Kerberos_client *I_Kerberos_client::create(
+    const std::string &spn, MYSQL_PLUGIN_VIO *vio, const std::string &upn,
+    const std::string &password, const std::string &kdc_host [[maybe_unused]]) {
+  Gssapi_client *client = new Gssapi_client(spn, vio, upn, password);
+  return static_cast<I_Kerberos_client *>(client);
+}
\ No newline at end of file
diff -Nru mysql-8.0-8.0.26/libmysql/authentication_kerberos/gssapi_authentication_client.h mysql-8.0-8.0.27/libmysql/authentication_kerberos/gssapi_authentication_client.h
--- mysql-8.0-8.0.26/libmysql/authentication_kerberos/gssapi_authentication_client.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/libmysql/authentication_kerberos/gssapi_authentication_client.h	2021-09-28 11:46:34.000000000 +0000
@@ -24,22 +24,29 @@
 #define AUTH_GSSAPI_CLIENT_H_
 
 #include <gssapi/gssapi.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <string>
+#include <memory>
 
-#include <mysql/plugin_auth.h>
+#include "kerberos_core.h"
+#include "log_client.h"
 
-class Gssapi_client {
+#include "kerberos_client_interface.h"
+
+class Gssapi_client : public I_Kerberos_client {
  public:
-  Gssapi_client(const std::string &spn, MYSQL_PLUGIN_VIO *vio);
-  ~Gssapi_client();
-  bool authenticate();
+  Gssapi_client(const std::string &spn, MYSQL_PLUGIN_VIO *vio,
+                const std::string &upn, const std::string &password);
+  ~Gssapi_client() override;
+  bool authenticate() override;
+  std::string get_user_name() override;
+  void set_upn_info(const std::string &name, const std::string &pwd);
+  bool obtain_store_credentials() override;
 
  protected:
   std::string m_service_principal;
   /* Plug-in VIO. */
   MYSQL_PLUGIN_VIO *m_vio{nullptr};
+  std::string m_user_principal_name;
+  std::string m_password;
+  std::unique_ptr<auth_kerberos_context::Kerberos> m_kerberos{nullptr};
 };
 #endif  // AUTH_GSSAPI_CLIENT_H_
diff -Nru mysql-8.0-8.0.26/libmysql/authentication_kerberos/kerberos_client.cc mysql-8.0-8.0.27/libmysql/authentication_kerberos/kerberos_client.cc
--- mysql-8.0-8.0.26/libmysql/authentication_kerberos/kerberos_client.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/libmysql/authentication_kerberos/kerberos_client.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
-/* Copyright (c) 2021, Oracle 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,
-   as published by the Free Software Foundation.
-
-   This program is also distributed with certain software (including
-   but not limited to OpenSSL) that is licensed under separate terms,
-   as designated in a particular file or component or in included license
-   documentation.  The authors of MySQL hereby grant you an additional
-   permission to link the program and your derivative works with the
-   separately licensed software that they have included with MySQL.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License, version 2.0, for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "kerberos_client.h"
-
-extern Logger_client *g_logger_client;
-
-Kerberos_client::Kerberos_client(const std::string &upn,
-                                 const std::string &password)
-    : m_user_principal_name{upn}, m_password{password} {
-  m_kerberos = std::unique_ptr<auth_kerberos_context::Kerberos>(
-      new auth_kerberos_context::Kerberos(m_user_principal_name.c_str(),
-                                          m_password.c_str()));
-}
-
-Kerberos_client::~Kerberos_client() {}
-
-void Kerberos_client::set_upn_info(const std::string &upn,
-                                   const std::string &pwd) {
-  log_client_dbg("Set UPN.");
-  m_user_principal_name = {upn};
-  m_password = {pwd};
-  /* Kerberos core uses UPN for all other operations. UPN has changed, relases
-   * current object and create */
-  if (m_kerberos.get()) {
-    m_kerberos.release();
-  }
-  m_kerberos = std::unique_ptr<auth_kerberos_context::Kerberos>(
-      new auth_kerberos_context::Kerberos(m_user_principal_name.c_str(),
-                                          m_password.c_str()));
-}
-
-bool Kerberos_client::obtain_store_credentials() {
-  log_client_dbg("Obtaining TGT TGS tickets from kerberos.");
-  return m_kerberos->obtain_store_credentials();
-}
-
-bool Kerberos_client::get_upn(std::string &cc_upn) {
-  log_client_dbg("Getting user name from Kerberos credential cache.");
-  return m_kerberos->get_upn(&cc_upn);
-}
\ No newline at end of file
diff -Nru mysql-8.0-8.0.26/libmysql/authentication_kerberos/kerberos_client.h mysql-8.0-8.0.27/libmysql/authentication_kerberos/kerberos_client.h
--- mysql-8.0-8.0.26/libmysql/authentication_kerberos/kerberos_client.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/libmysql/authentication_kerberos/kerberos_client.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-/* Copyright (c) 2021, Oracle 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,
-   as published by the Free Software Foundation.
-
-   This program is also distributed with certain software (including
-   but not limited to OpenSSL) that is licensed under separate terms,
-   as designated in a particular file or component or in included license
-   documentation.  The authors of MySQL hereby grant you an additional
-   permission to link the program and your derivative works with the
-   separately licensed software that they have included with MySQL.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License, version 2.0, for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
-
-#ifndef AUTH_KERBEROS_CLIENT_H_
-#define AUTH_KERBEROS_CLIENT_H_
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <memory>
-
-#include "kerberos_core.h"
-#include "log_client.h"
-
-class Kerberos_client {
- public:
-  Kerberos_client(const std::string &upn, const std::string &password);
-  ~Kerberos_client();
-  bool get_upn(std::string &cc_upn);
-  void set_upn_info(const std::string &name, const std::string &pwd);
-  bool obtain_store_credentials();
-
- protected:
-  std::string m_user_principal_name;
-  std::string m_password;
-  std::unique_ptr<auth_kerberos_context::Kerberos> m_kerberos{nullptr};
-};
-
-#endif  // AUTH_KERBEROS_CLIENT_H_
diff -Nru mysql-8.0-8.0.26/libmysql/authentication_kerberos/kerberos_client_interface.h mysql-8.0-8.0.27/libmysql/authentication_kerberos/kerberos_client_interface.h
--- mysql-8.0-8.0.26/libmysql/authentication_kerberos/kerberos_client_interface.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/libmysql/authentication_kerberos/kerberos_client_interface.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,43 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef KERBEROS_CLIENT_INTERFACE
+#define KERBEROS_CLIENT_INTERFACE
+
+#include <mysql/plugin_auth.h>
+#include <string.h>
+#include <string>
+
+class I_Kerberos_client {
+ public:
+  virtual bool authenticate() = 0;
+  virtual bool obtain_store_credentials() = 0;
+  virtual std::string get_user_name() = 0;
+  virtual ~I_Kerberos_client() {}
+
+  static I_Kerberos_client *create(const std::string &spn,
+                                   MYSQL_PLUGIN_VIO *vio,
+                                   const std::string &upn,
+                                   const std::string &password,
+                                   const std::string &kdc_host);
+};
+#endif  // KERBEROS_CLIENT_INTERFACE
diff -Nru mysql-8.0-8.0.26/libmysql/authentication_kerberos/sspi_authentication_client.cc mysql-8.0-8.0.27/libmysql/authentication_kerberos/sspi_authentication_client.cc
--- mysql-8.0-8.0.26/libmysql/authentication_kerberos/sspi_authentication_client.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/libmysql/authentication_kerberos/sspi_authentication_client.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,243 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+/*
+  This symbol should be used when accessing the security API from a user-mode
+  application
+*/
+#define SECURITY_WIN32
+
+#include "sspi_authentication_client.h"
+
+#include <Lmcons.h>
+
+#include "auth_kerberos_client_io.h"
+#include "log_client.h"
+#include "sspi_utility.h"
+
+extern Logger_client *g_logger_client;
+
+Sspi_client::Sspi_client(const std::string &spn, MYSQL_PLUGIN_VIO *vio,
+                         const std::string &upn, const std::string &password,
+                         const std::string &kdc_host)
+    : m_service_principal{spn},
+      m_vio{vio},
+      m_upn{upn},
+      m_password{password},
+      m_kdc_host{kdc_host} {}
+
+bool Sspi_client::obtain_store_credentials() {
+  bool ret_val{false};
+  TimeStamp ticket_validy_time{0, 0};
+  SECURITY_STATUS sspi_status{0};
+  /*
+    Package name as described in:
+    https://docs.microsoft.com/en-us/windows/win32/secauthn/acquirecredentialshandle--kerberos
+    https://docs.microsoft.com/en-us/windows/win32/secgloss/k-gly
+  */
+  char mechanism[]{"Kerberos"};
+  SEC_WINNT_AUTH_IDENTITY identity{
+      nullptr, 0, nullptr, 0, nullptr, 0, SEC_WINNT_AUTH_IDENTITY_ANSI};
+
+  if (m_upn.empty()) {
+    log_client_info("Sspi obtain and store TGT: empty user name.");
+    return false;
+  }
+  if (m_password.empty()) {
+    log_client_info(
+        "Sspi obtain and store TGT: plug-in is using preexisting credentials "
+        "using system logon");
+    SecInvalidateHandle(&m_cred);
+  } else {
+    log_client_info(
+        "Sspi obtain and store TGT: Plug-in is trying to obtain tickets using "
+        "user name and password.");
+    if (!m_kdc_host.empty()) {
+      identity.Domain = (unsigned char *)(m_kdc_host.c_str());
+      identity.DomainLength = m_kdc_host.length();
+    }
+    if (!m_upn.empty()) {
+      identity.User = (unsigned char *)(m_upn.c_str());
+      identity.UserLength = m_upn.length();
+    }
+    if (!m_password.empty()) {
+      identity.Password = (unsigned char *)(m_password.c_str());
+      identity.PasswordLength = m_password.length();
+    }
+    identity.Flags = SEC_WINNT_AUTH_IDENTITY_ANSI;
+  }
+
+  sspi_status = AcquireCredentialsHandle(
+      m_password.empty() ? nullptr : (LPSTR)m_upn.c_str(), mechanism,
+      SECPKG_CRED_BOTH, nullptr, m_password.empty() ? nullptr : &identity,
+      nullptr, nullptr, &m_cred, &ticket_validy_time);
+
+  /*
+    If the AcquireCredentialsHandle succeeds, the AcquireCredentialsHandle
+    returns SEC_E_OK.
+    https://docs.microsoft.com/en-us/windows/win32/secauthn/acquirecredentialshandle--kerberos
+  */
+  if (sspi_status != SEC_E_OK) {
+    log_client_sspi_error(sspi_status, "Failed to acquire credentials handle");
+    return false;
+  }
+  return true;
+}
+
+std::string Sspi_client::get_user_name() {
+  log_client_dbg("Getting user name from windows logged-in.");
+
+  char user_name[UNLEN + 1]{'\0'};
+  std::string logged_in_name;
+  DWORD size{UNLEN + 1};
+
+  if (GetUserNameA(user_name, &size)) {
+    logged_in_name = user_name;
+  }
+  return logged_in_name;
+}
+
+bool Sspi_client::authenticate() {
+  if (m_vio == nullptr) {
+    log_client_info(
+        "Sspi authentication failed: MySQL client IO is not valid.");
+    return false;
+  }
+  if (m_service_principal.empty()) {
+    log_client_info(
+        "Sspi authentication failed: SPN is empty, please configure it in the "
+        "server.");
+    return false;
+  }
+
+  bool rc_auth{false};
+  bool rc_io{false};
+  Kerberos_client_io client_io{m_vio};
+  CtxtHandle context;
+  ULONG attribs{0};
+  TimeStamp ticket_validy_time{0, 0};
+  SECURITY_STATUS sspi_status{SEC_E_LOGON_DENIED};
+  SecBufferDesc input_buf_desc;
+  SecBuffer input_buf;
+  SecBufferDesc output_buf_desc;
+  SecBuffer output_buf;
+
+  SecInvalidateHandle(&context);
+
+  /* Prepare input buffers */
+  input_buf.BufferType = SECBUFFER_TOKEN;
+  input_buf.cbBuffer = 0;
+  input_buf.pvBuffer = nullptr;
+  input_buf_desc.ulVersion = SECBUFFER_VERSION;
+  // Message Seq No
+  input_buf_desc.cBuffers = 1;
+  input_buf_desc.pBuffers = &input_buf;
+
+  /* Prepare output buffers */
+  output_buf.BufferType = SECBUFFER_TOKEN;
+  output_buf.pvBuffer = nullptr;
+  output_buf_desc.ulVersion = SECBUFFER_VERSION;
+  // Message Seq No
+  output_buf_desc.cBuffers = 1;
+  output_buf_desc.pBuffers = &output_buf;
+
+  do {
+    /*
+      On the first call of InitializeSecurityContext, context is null and filled
+      in via phNewContext parameter. On the next calls, context is partially
+      filled.
+
+      Details:
+      https://docs.microsoft.com/en-us/windows/win32/api/sspi/nf-sspi-initializesecuritycontexta
+    */
+    sspi_status = InitializeSecurityContext(
+        &m_cred, SecIsValidHandle(&context) ? &context : nullptr,
+        (SEC_CHAR *)m_service_principal.c_str(), ISC_REQ_ALLOCATE_MEMORY, 0,
+        SECURITY_NATIVE_DREP, input_buf.cbBuffer ? &input_buf_desc : nullptr, 0,
+        &context, &output_buf_desc, &attribs, &ticket_validy_time);
+
+    if (!succeeded(sspi_status)) {
+      log_client_sspi_error(sspi_status,
+                            "Initialize Security Context failed, discontinuing "
+                            "authentication process.");
+      break;
+    }
+
+    if (sspi_status != SEC_E_OK && sspi_status != SEC_I_CONTINUE_NEEDED) {
+      log_client_sspi_error(
+          sspi_status, "Unexpected response from Initialize Security Context");
+      break;
+    }
+
+    if (output_buf.cbBuffer) {
+      rc_io = client_io.write_gssapi_buffer(
+          (unsigned char *)output_buf.pvBuffer, output_buf.cbBuffer);
+
+      FreeContextBuffer(output_buf.pvBuffer);
+      output_buf.pvBuffer = nullptr;
+      output_buf.cbBuffer = 0;
+
+      if (!rc_io) {
+        break;
+      }
+
+      if (sspi_status == SEC_I_CONTINUE_NEEDED) {
+        log_client_dbg("SSPI client authentication, next step.");
+        rc_io =
+            client_io.read_gssapi_buffer((unsigned char **)&input_buf.pvBuffer,
+                                         (size_t *)&input_buf.cbBuffer);
+
+        if (!rc_io) {
+          break;
+        }
+      }
+    }
+  } while (sspi_status == SEC_I_CONTINUE_NEEDED);
+
+  if (sspi_status == SEC_E_OK) {
+    log_client_dbg("SSPI client authentication, concluded with success.");
+    rc_auth = true;
+  }
+
+  if (output_buf.pvBuffer) {
+    FreeContextBuffer(output_buf.pvBuffer);
+    output_buf.pvBuffer = nullptr;
+    output_buf.cbBuffer = 0;
+  }
+  if (SecIsValidHandle(&context)) DeleteSecurityContext(&context);
+
+  if (rc_auth) {
+    log_client_dbg("SSPI client authentication successful");
+  } else {
+    log_client_error("SSPI client authenticate failed");
+  }
+  return rc_auth;
+}
+
+I_Kerberos_client *I_Kerberos_client::create(const std::string &spn,
+                                             MYSQL_PLUGIN_VIO *vio,
+                                             const std::string &upn,
+                                             const std::string &password,
+                                             const std::string &kdc_host) {
+  Sspi_client *client = new Sspi_client(spn, vio, upn, password, kdc_host);
+  return static_cast<I_Kerberos_client *>(client);
+}
\ No newline at end of file
diff -Nru mysql-8.0-8.0.26/libmysql/authentication_kerberos/sspi_authentication_client.h mysql-8.0-8.0.27/libmysql/authentication_kerberos/sspi_authentication_client.h
--- mysql-8.0-8.0.26/libmysql/authentication_kerberos/sspi_authentication_client.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/libmysql/authentication_kerberos/sspi_authentication_client.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,70 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef AUTH_GSSAPI_CLIENT_H_
+#define AUTH_GSSAPI_CLIENT_H_
+
+#include <stdio.h>
+#include <stdlib.h>
+
+/*
+  This symbol should be used when accessing the security API from a user-mode
+  application
+*/
+#define SECURITY_WIN32
+
+/*
+  Note: Added below header files with one extra lines.
+  Automatically code formatting changes the order of header file.
+  We need to maintain the order of header file, otherwise build will fail.
+*/
+
+#include <windows.h>
+
+#include <sspi.h>
+
+#include <SecExt.h>
+
+#include <stdarg.h>
+
+#include "kerberos_client_interface.h"
+
+class Sspi_client : public I_Kerberos_client {
+ public:
+  Sspi_client(const std::string &spn, MYSQL_PLUGIN_VIO *vio,
+              const std::string &upn, const std::string &password,
+              const std::string &kdc_host);
+  ~Sspi_client() override = default;
+  bool authenticate() override;
+  bool obtain_store_credentials() override;
+  std::string get_user_name() override;
+
+ protected:
+  std::string m_service_principal;
+  /* Plug-in VIO. */
+  MYSQL_PLUGIN_VIO *m_vio{nullptr};
+  std::string m_upn;
+  std::string m_password;
+  std::string m_kdc_host;
+  CredHandle m_cred;
+};
+#endif  // AUTH_GSSAPI_CLIENT_H_
diff -Nru mysql-8.0-8.0.26/libmysql/authentication_kerberos/sspi_utility.cc mysql-8.0-8.0.27/libmysql/authentication_kerberos/sspi_utility.cc
--- mysql-8.0-8.0.26/libmysql/authentication_kerberos/sspi_utility.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/libmysql/authentication_kerberos/sspi_utility.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,73 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#define SECURITY_WIN32
+
+#include "sspi_utility.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sstream>
+
+extern Logger_client *g_logger_client;
+
+/* Log MySQL client SSPI error into error stream.  */
+void log_client_sspi_error(SECURITY_STATUS err, const char *msg) {
+  if (!succeeded(err)) {
+    std::stringstream log_stream;
+    char sspi_err_smsg[1024]{'\0'};
+    std::string symbol{"#"};
+    symbol += err;
+    strcpy(sspi_err_smsg, symbol.c_str());
+    size_t length{0};
+    log_stream << "Client SSPI error: ";
+    length = FormatMessageA(
+        FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, nullptr,
+        err, MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US),
+        static_cast<LPSTR>(sspi_err_smsg), sizeof(sspi_err_smsg), nullptr);
+    if (length) {
+      log_stream << msg << " , Error number " << err << ":  " << sspi_err_smsg;
+    } else {
+      log_stream << msg << " , Error number " << err << ":  "
+                 << "Failed to get detailed error message.";
+    }
+    log_client_info(log_stream.str());
+  }
+}
+
+/*
+  This function checks if InitializeSecurityContext succeeded or not.
+  If succeeded, perform next step like continue or authentication completed.
+  If failed, exit the SSPI authentication loop.
+
+  https://docs.microsoft.com/en-us/windows/win32/secauthn/initializesecuritycontext--kerberos
+*/
+bool succeeded(SECURITY_STATUS status) {
+  if ((status == SEC_E_OK) || (status == SEC_I_COMPLETE_AND_CONTINUE) ||
+      (status == SEC_I_COMPLETE_NEEDED) || (status == SEC_I_CONTINUE_NEEDED) ||
+      (status == SEC_I_INCOMPLETE_CREDENTIALS)) {
+    return true;
+  } else {
+    return false;
+  }
+}
\ No newline at end of file
diff -Nru mysql-8.0-8.0.26/libmysql/authentication_kerberos/sspi_utility.h mysql-8.0-8.0.27/libmysql/authentication_kerberos/sspi_utility.h
--- mysql-8.0-8.0.26/libmysql/authentication_kerberos/sspi_utility.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/libmysql/authentication_kerberos/sspi_utility.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,52 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef AUTH_GSSAPI_UTILITY_H_
+#define AUTH_GSSAPI_UTILITY_H_
+
+#include <stdlib.h>
+#include <string.h>
+
+/*
+  Note: Added below header files with one extra lines.
+  Automatically code formatting changes the order of header file.
+  We need to maintain the order of header file, otherwise build will fail.
+*/
+
+#include <windows.h>
+
+#include <sspi.h>
+
+#include <SecExt.h>
+
+#include <stdarg.h>
+
+#include <stdio.h>
+#include "log_client.h"
+
+/* Maximum length of principal name. */
+constexpr int PRINCIPAL_NAME_MAX{256};
+
+void log_client_sspi_error(SECURITY_STATUS err, const char *msg);
+
+bool succeeded(SECURITY_STATUS err);
+#endif  // AUTH_GSSAPI_UTILITY_H_
diff -Nru mysql-8.0-8.0.26/libmysql/authentication_ldap/auth_ldap_sasl_client.cc mysql-8.0-8.0.27/libmysql/authentication_ldap/auth_ldap_sasl_client.cc
--- mysql-8.0-8.0.26/libmysql/authentication_ldap/auth_ldap_sasl_client.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/libmysql/authentication_ldap/auth_ldap_sasl_client.cc	2021-09-28 11:46:34.000000000 +0000
@@ -600,4 +600,4 @@
 mysql_declare_client_plugin(AUTHENTICATION) "authentication_ldap_sasl_client",
     MYSQL_CLIENT_PLUGIN_AUTHOR_ORACLE, "LDAP SASL Client Authentication Plugin",
     {0, 1, 0}, "PROPRIETARY", nullptr, initialize_plugin, deinitialize_plugin,
-    nullptr, sasl_authenticate, nullptr mysql_end_client_plugin;
+    nullptr, nullptr, sasl_authenticate, nullptr mysql_end_client_plugin;
diff -Nru mysql-8.0-8.0.26/libmysql/authentication_oci_client/authentication_oci_client_plugin.cc mysql-8.0-8.0.27/libmysql/authentication_oci_client/authentication_oci_client_plugin.cc
--- mysql-8.0-8.0.26/libmysql/authentication_oci_client/authentication_oci_client_plugin.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/libmysql/authentication_oci_client/authentication_oci_client_plugin.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,147 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include "my_config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <iostream>
+#include <ostream>
+
+#include <my_compiler.h>
+#include <mysql.h>
+#include <mysql/client_plugin.h>
+
+#include "sql-common/oci/signing_key.h"
+#include "sql-common/oci/ssl.h"
+#include "sql-common/oci/utilities.h"
+
+static const char *s_oci_config_location = nullptr;
+static oci::OCI_config_file *s_oci_config_file = nullptr;
+
+// Helper functions.
+/**
+ * Parse the system variables for the location of the ~/.oci/config file.
+ * Extract the key_file= value from the ~/.oci/config file.
+ */
+oci::OCI_config_file parse_oci_config_file() {
+  return oci::parse_oci_config_file(
+      oci::get_oci_config_file_location(s_oci_config_location));
+}
+
+/**
+  client auth function
+
+  * read stuff via the VIO. try to *read first*
+  * get (login) data from the MYSQL handle: mysql->user, mysql->passwd
+  * return CR_OK on success, CR_ERROR on failure
+*/
+static int oci_authenticate_client_plugin(MYSQL_PLUGIN_VIO *vio,
+                                          MYSQL * /*mysql*/) {
+  /**
+   * Step 1: Receive the nonce from the server.
+   */
+  unsigned char *server_nonce = nullptr;
+  int server_nonce_length = vio->read_packet(vio, &server_nonce);
+  if (server_nonce_length <= 0) {
+    return CR_AUTH_HANDSHAKE;
+  }
+
+  /**
+   * Step 2: Sign the nonce with the private key.
+   */
+  oci::Signing_Key signer{s_oci_config_file->key_file};
+  if (!signer) {
+    return CR_AUTH_PLUGIN_ERROR;
+  }
+  auto encoded = signer.sign(server_nonce, server_nonce_length);
+  if (encoded.size() == 0) {
+    return CR_AUTH_PLUGIN_ERROR;
+  }
+
+  /**
+   * Step 3: Prepare the response.
+   */
+
+  auto response = oci::prepare_response(s_oci_config_file->fingerprint,
+                                        oci::ssl::base64_encode(encoded));
+
+  /**
+   * Step 4: Send the encrypted nonce back to the server for verification.
+   */
+
+  if (vio->write_packet(
+          vio, reinterpret_cast<const unsigned char *>(response.c_str()),
+          response.length())) {
+    return CR_AUTH_HANDSHAKE;
+  }
+  return CR_OK;
+}
+
+/**
+ Try to parse and assess the currently effective config file.
+
+ @retval 0 : success
+ @retval 1 : parsing failed or not initialized
+
+*/
+static int try_parse_and_set_config_file() {
+  auto config = parse_oci_config_file();
+  if (!config.key_file.empty() && !config.fingerprint.empty() &&
+      s_oci_config_file != nullptr) {
+    s_oci_config_file->key_file.assign(config.key_file);
+    s_oci_config_file->fingerprint.assign(config.fingerprint);
+    return 0;
+  }
+  return 1;
+}
+
+static int initialize_plugin(char *, size_t, int, va_list) {
+  s_oci_config_file = new (std::nothrow) oci::OCI_config_file{};
+  if (s_oci_config_file == nullptr) return 1;
+  try_parse_and_set_config_file();
+  return 0;
+}
+
+static int deinitialize_plugin() {
+  if (s_oci_config_file != nullptr) delete s_oci_config_file;
+  return 0;
+}
+
+/**
+  oci_authenticate_client_option plugin API to allow server to pass optional
+  data for plugin to process
+*/
+static int oci_authenticate_client_option(const char *option, const void *val) {
+  if (strcmp(option, "oci-config-file") == 0 && val != nullptr) {
+    s_oci_config_location = static_cast<const char *>(val);
+    return try_parse_and_set_config_file();
+  }
+  return 1;
+}
+
+mysql_declare_client_plugin(AUTHENTICATION) "authentication_oci_client",
+    MYSQL_CLIENT_PLUGIN_AUTHOR_ORACLE, "OCI Client Authentication Plugin",
+    {0, 1, 0}, "COMMUNITY", nullptr, initialize_plugin, deinitialize_plugin,
+    oci_authenticate_client_option, nullptr, oci_authenticate_client_plugin,
+    nullptr mysql_end_client_plugin;
diff -Nru mysql-8.0-8.0.26/libmysql/authentication_oci_client/CMakeLists.txt mysql-8.0-8.0.27/libmysql/authentication_oci_client/CMakeLists.txt
--- mysql-8.0-8.0.26/libmysql/authentication_oci_client/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/libmysql/authentication_oci_client/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,52 @@
+# Copyright (c) 2021, Oracle 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,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+#
+# Configuration for building OCI authentication client Plug-in (client-side)
+#
+
+# The client authentication plug-in is part of the community build.
+
+# Skip it if disabled.
+IF(NOT WITH_AUTHENTICATION_CLIENT_PLUGINS)
+  MESSAGE(STATUS "Skipping the OCI authentication client plugin.")
+  RETURN()
+ENDIF()
+
+MYSQL_ADD_PLUGIN(
+  authentication_oci_client
+
+  # Authentication plugin main
+  authentication_oci_client_plugin.cc
+
+  # Request signing
+  ${CMAKE_SOURCE_DIR}/sql-common/oci/ssl.cc
+  ${CMAKE_SOURCE_DIR}/sql-common/oci/signing_key.cc
+
+  # Utilities
+  ${CMAKE_SOURCE_DIR}/sql-common/oci/utilities.cc
+
+  LINK_LIBRARIES ${SSL_LIBRARIES}
+
+  CLIENT_ONLY
+  MODULE_ONLY MODULE_OUTPUT_NAME "authentication_oci_client"
+)
diff -Nru mysql-8.0-8.0.26/libmysql/authentication_win/plugin_client.cc mysql-8.0-8.0.27/libmysql/authentication_win/plugin_client.cc
--- mysql-8.0-8.0.26/libmysql/authentication_win/plugin_client.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/libmysql/authentication_win/plugin_client.cc	2021-09-28 11:46:34.000000000 +0000
@@ -60,4 +60,5 @@
     win_auth_client_plugin_init,
     win_auth_client_plugin_deinit,
     NULL,  // option handling
+    NULL,
     win_auth_handshake_client};
diff -Nru mysql-8.0-8.0.26/libmysql/client_settings.h mysql-8.0-8.0.27/libmysql/client_settings.h
--- mysql-8.0-8.0.26/libmysql/client_settings.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/libmysql/client_settings.h	2021-09-28 11:46:34.000000000 +0000
@@ -37,12 +37,13 @@
  When adding capabilities here, consider if they should be also added to
  the server's version.
 */
-#define CLIENT_CAPABILITIES                                        \
-  (CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | CLIENT_TRANSACTIONS | \
-   CLIENT_PROTOCOL_41 | CLIENT_RESERVED2 | CLIENT_MULTI_RESULTS |  \
-   CLIENT_PS_MULTI_RESULTS | CLIENT_PLUGIN_AUTH |                  \
-   CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA | CLIENT_CONNECT_ATTRS |  \
-   CLIENT_SESSION_TRACK | CLIENT_DEPRECATE_EOF | CLIENT_QUERY_ATTRIBUTES)
+#define CLIENT_CAPABILITIES                                                \
+  (CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | CLIENT_TRANSACTIONS |         \
+   CLIENT_PROTOCOL_41 | CLIENT_RESERVED2 | CLIENT_MULTI_RESULTS |          \
+   CLIENT_PS_MULTI_RESULTS | CLIENT_PLUGIN_AUTH |                          \
+   CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA | CLIENT_CONNECT_ATTRS |          \
+   CLIENT_SESSION_TRACK | CLIENT_DEPRECATE_EOF | CLIENT_QUERY_ATTRIBUTES | \
+   MULTI_FACTOR_AUTHENTICATION)
 
 void read_user_name(char *name);
 bool handle_local_infile(MYSQL *mysql, const char *net_filename);
diff -Nru mysql-8.0-8.0.26/libmysql/CMakeLists.txt mysql-8.0-8.0.27/libmysql/CMakeLists.txt
--- mysql-8.0-8.0.26/libmysql/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/libmysql/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -1,5 +1,5 @@
 # Copyright (c) 2006, 2021, Oracle 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,
 # as published by the Free Software Foundation.
@@ -141,6 +141,7 @@
   mysql_warning_count
   mysql_real_connect_dns_srv
   mysql_bind_param
+  mysql_plugin_get_option
   CACHE INTERNAL "Functions exported by client API"
 )
 
@@ -191,7 +192,7 @@
 )
 
 IF (WIN32 AND OPENSSL_APPLINK_C)
-  ADD_COMPILE_DEFINITIONS(
+  MY_ADD_COMPILE_DEFINITIONS(
     ../sql-common/client_authentication.cc
     COMPILE_DEFINITIONS HAVE_OPENSSL_APPLINK_C
   )
@@ -261,7 +262,7 @@
   MESSAGE(FATAL_ERROR "Can't find neither Win32 nor Unix DNS SRV APIs")
 ENDIF()
 #
-# On Windows platform client library includes the client-side 
+# On Windows platform client library includes the client-side
 # Windows Native Authentication plugin.
 #
 IF(WIN32)
@@ -273,9 +274,15 @@
 # LDAP authentication SASL client plug-in
 ADD_SUBDIRECTORY(authentication_ldap)
 
+# FIDO authentication client plugin
+ADD_SUBDIRECTORY(authentication_fido)
+
 # authentication kerberos client plug-in
 ADD_SUBDIRECTORY(authentication_kerberos)
 
+# authentication IAM client plug-in
+ADD_SUBDIRECTORY(authentication_oci_client)
+
 # Merge several convenience libraries into one big mysqlclient
 MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE}
   COMPONENT Development
@@ -302,14 +309,14 @@
 IF(UNIX)
   MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)
     SET(DOT_VERSION ".${VERSION}")
-    IF(DOT_VERSION STREQUAL ".") 
+    IF(DOT_VERSION STREQUAL ".")
       SET(DOT_VERSION "")
     ENDIF()
     IF(APPLE)
       SET(${OUTNAME} ${LIBNAME}${DOT_VERSION}${EXTENSION})
     ELSE()
       SET(${OUTNAME} ${LIBNAME}${EXTENSION}${DOT_VERSION})
-    ENDIF() 
+    ENDIF()
   ENDMACRO()
 ENDIF()
 
@@ -339,6 +346,11 @@
   ${UNIX_VERSION}
   )
 
+# Downgrade warning for strncat in my_crypt_genhash.
+IF((WITH_LTO OR CMAKE_COMPILER_FLAG_WITH_LTO) AND MY_COMPILER_IS_GNU)
+  MY_TARGET_LINK_OPTIONS(libmysql "-Wno-error=stringop-truncation")
+ENDIF()
+
 IF(LINUX_STANDALONE AND KERBEROS_CUSTOM_LIBRARY)
   ADD_DEPENDENCIES(libmysql ${kerberos_target})
   ADD_DEPENDENCIES(mysqlclient ${kerberos_target})
@@ -353,7 +365,7 @@
     CONFIGURE_FILE(libmysql.ver.in ${CMAKE_CURRENT_BINARY_DIR}/libmysql.ver)
     MY_TARGET_LINK_OPTIONS(libmysql
       "LINKER:--version-script=${CMAKE_CURRENT_BINARY_DIR}/libmysql.ver")
-  ENDIF() 
+  ENDIF()
 
   # clean direct output needs to be set several targets have the same name
   #(mysqlclient in this case)
diff -Nru mysql-8.0-8.0.26/libmysql/errmsg.cc mysql-8.0-8.0.27/libmysql/errmsg.cc
--- mysql-8.0-8.0.26/libmysql/errmsg.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/libmysql/errmsg.cc	2021-09-28 11:46:34.000000000 +0000
@@ -115,6 +115,9 @@
     "access.",
     "Determining the real path for '%s' failed with error (%d): %s",
     "DNS SRV lookup failed with error : %d",
+    "Client does not recognise tracker type %d marked as mandatory by server.",
+    "Invalid first argument for MYSQL_OPT_USER_PASSWORD option. Valid value "
+    "should be between 1 and 3 inclusive.",
     ""};
 
 static const char *get_client_errmsg(int nr) {
diff -Nru mysql-8.0-8.0.26/libmysql/libmysql.cc mysql-8.0-8.0.27/libmysql/libmysql.cc
--- mysql-8.0-8.0.26/libmysql/libmysql.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/libmysql/libmysql.cc	2021-09-28 11:46:34.000000000 +0000
@@ -125,9 +125,9 @@
     1  could not initialize environment (out of memory or thread keys)
 */
 
-int STDCALL mysql_server_init(int argc MY_ATTRIBUTE((unused)),
-                              char **argv MY_ATTRIBUTE((unused)),
-                              char **groups MY_ATTRIBUTE((unused))) {
+int STDCALL mysql_server_init(int argc [[maybe_unused]],
+                              char **argv [[maybe_unused]],
+                              char **groups [[maybe_unused]]) {
   int result = 0;
   if (!mysql_client_init) {
     mysql_client_init = true;
@@ -140,7 +140,7 @@
 
     if (!mysql_port) {
       char *env;
-      struct servent *serv_ptr MY_ATTRIBUTE((unused));
+      struct servent *serv_ptr [[maybe_unused]];
 
       mysql_port = MYSQL_PORT;
 
@@ -235,7 +235,7 @@
   Init debugging if MYSQL_DEBUG environment variable is found
 **************************************************************************/
 
-void STDCALL mysql_debug(const char *debug MY_ATTRIBUTE((unused))) {
+void STDCALL mysql_debug(const char *debug [[maybe_unused]]) {
 #ifndef NDEBUG
   char *env;
   if (debug) {
@@ -306,7 +306,9 @@
     my_free(saved_db);
 
     /* alloc new connect information */
-    mysql->db = db ? my_strdup(PSI_NOT_INSTRUMENTED, db, MYF(MY_WME)) : nullptr;
+    if (!mysql->db)
+      mysql->db =
+          db ? my_strdup(PSI_NOT_INSTRUMENTED, db, MYF(MY_WME)) : nullptr;
   } else {
     /* Free temporary connect information */
     my_free(mysql->user);
@@ -525,7 +527,7 @@
 */
 
 static int default_local_infile_init(void **ptr, const char *filename,
-                                     void *userdata MY_ATTRIBUTE((unused))) {
+                                     void *userdata [[maybe_unused]]) {
   default_local_infile_data *data;
   char tmp_name[FN_REFLEN];
 
@@ -625,12 +627,7 @@
   return CR_OUT_OF_MEMORY;
 }
 
-/*
-  Explicit extern "C" because otherwise solaris studio thinks
-  that the function pointer arguments have C++ linkage,
-  and then it overloads the declaration in include/mysql.h
- */
-extern "C" void mysql_set_local_infile_handler(
+void mysql_set_local_infile_handler(
     MYSQL *mysql, int (*local_infile_init)(void **, const char *, void *),
     int (*local_infile_read)(void *, char *, uint),
     void (*local_infile_end)(void *),
@@ -811,7 +808,7 @@
 
 int STDCALL mysql_shutdown(MYSQL *mysql,
                            enum mysql_enum_shutdown_level shutdown_level
-                               MY_ATTRIBUTE((unused))) {
+                           [[maybe_unused]]) {
   if (mysql_get_server_version(mysql) < 50709)
     return simple_command(mysql, COM_DEPRECATED_1, nullptr, 0, 0);
   else
@@ -1309,7 +1306,7 @@
     /* skip parameters data: we don't support it yet */
     if (!(cli_read_metadata(mysql, param_count, 7))) return true;
     /* free memory allocated by cli_read_metadata() for parameters data */
-    free_root(mysql->field_alloc, MYF(0));
+    mysql->field_alloc->Clear();
   }
 
   if (field_count != 0) {
@@ -1385,8 +1382,8 @@
     return nullptr;
   }
 
-  init_alloc_root(PSI_NOT_INSTRUMENTED, stmt->mem_root, 2048, 2048);
-  init_alloc_root(PSI_NOT_INSTRUMENTED, stmt->result.alloc, 4096, 4096);
+  ::new ((void *)stmt->mem_root) MEM_ROOT(PSI_NOT_INSTRUMENTED, 2048);
+  ::new ((void *)stmt->result.alloc) MEM_ROOT(PSI_NOT_INSTRUMENTED, 4096);
   mysql->stmts = list_add(mysql->stmts, &stmt->list);
   stmt->list.data = stmt;
   stmt->state = MYSQL_STMT_INIT_DONE;
@@ -1396,8 +1393,8 @@
   my_stpcpy(stmt->sqlstate, not_error_sqlstate);
   /* The rest of statement members was zeroed inside malloc */
 
-  init_alloc_root(PSI_NOT_INSTRUMENTED, &stmt->extension->fields_mem_root, 2048,
-                  0);
+  ::new ((void *)&stmt->extension->fields_mem_root)
+      MEM_ROOT(PSI_NOT_INSTRUMENTED, 2048);
 
   return stmt;
 }
@@ -1466,8 +1463,8 @@
     stmt->bind_param_done = false;
     stmt->bind_result_done = false;
     stmt->param_count = stmt->field_count = 0;
-    free_root(stmt->mem_root, MYF(MY_KEEP_PREALLOC));
-    free_root(&stmt->extension->fields_mem_root, MYF(0));
+    stmt->mem_root->ClearForReuse();
+    stmt->extension->fields_mem_root.Clear();
 
     int4store(buff, stmt->stmt_id);
 
@@ -1527,7 +1524,7 @@
 
   assert(stmt->field_count);
 
-  free_root(fields_mem_root, MYF(0));
+  fields_mem_root->Clear();
 
   /*
     mysql->fields is NULL when the client set CLIENT_OPTIONAL_RESULTSET_METADATA
@@ -2002,7 +1999,7 @@
     MYSQL_DATA *result = &stmt->result;
     uchar buff[4 /* statement id */ + 4 /* number of rows to fetch */];
 
-    free_root(result->alloc, MYF(MY_KEEP_PREALLOC));
+    result->alloc->ClearForReuse();
     result->data = nullptr;
     result->rows = 0;
     /* Send row request to the server */
@@ -2033,14 +2030,13 @@
   case of wrong sequence of API calls.
 */
 
-static int stmt_read_row_no_data(MYSQL_STMT *stmt MY_ATTRIBUTE((unused)),
-                                 unsigned char **row MY_ATTRIBUTE((unused))) {
+static int stmt_read_row_no_data(MYSQL_STMT *stmt [[maybe_unused]],
+                                 unsigned char **row [[maybe_unused]]) {
   return MYSQL_NO_DATA;
 }
 
-static int stmt_read_row_no_result_set(MYSQL_STMT *stmt MY_ATTRIBUTE((unused)),
-                                       unsigned char **row
-                                           MY_ATTRIBUTE((unused))) {
+static int stmt_read_row_no_result_set(MYSQL_STMT *stmt [[maybe_unused]],
+                                       unsigned char **row [[maybe_unused]]) {
   set_stmt_error(stmt, CR_NO_RESULT_SET, unknown_sqlstate, nullptr);
   return 1;
 }
@@ -3291,7 +3287,7 @@
 }
 
 static void fetch_result_int32(MYSQL_BIND *param,
-                               MYSQL_FIELD *field MY_ATTRIBUTE((unused)),
+                               MYSQL_FIELD *field [[maybe_unused]],
                                uchar **row) {
   bool field_is_unsigned = (field->flags & UNSIGNED_FLAG);
   uint32 data = (uint32)sint4korr(*row);
@@ -3301,7 +3297,7 @@
 }
 
 static void fetch_result_int64(MYSQL_BIND *param,
-                               MYSQL_FIELD *field MY_ATTRIBUTE((unused)),
+                               MYSQL_FIELD *field [[maybe_unused]],
                                uchar **row) {
   bool field_is_unsigned = (field->flags & UNSIGNED_FLAG);
   ulonglong data = (ulonglong)sint8korr(*row);
@@ -3311,7 +3307,7 @@
 }
 
 static void fetch_result_float(MYSQL_BIND *param,
-                               MYSQL_FIELD *field MY_ATTRIBUTE((unused)),
+                               MYSQL_FIELD *field [[maybe_unused]],
                                uchar **row) {
   float value = float4get(*row);
   floatstore(pointer_cast<uchar *>(param->buffer), value);
@@ -3319,7 +3315,7 @@
 }
 
 static void fetch_result_double(MYSQL_BIND *param,
-                                MYSQL_FIELD *field MY_ATTRIBUTE((unused)),
+                                MYSQL_FIELD *field [[maybe_unused]],
                                 uchar **row) {
   double value = float8get(*row);
   doublestore(pointer_cast<uchar *>(param->buffer), value);
@@ -3327,29 +3323,28 @@
 }
 
 static void fetch_result_time(MYSQL_BIND *param,
-                              MYSQL_FIELD *field MY_ATTRIBUTE((unused)),
+                              MYSQL_FIELD *field [[maybe_unused]],
                               uchar **row) {
   MYSQL_TIME *tm = (MYSQL_TIME *)param->buffer;
   read_binary_time(tm, row);
 }
 
 static void fetch_result_date(MYSQL_BIND *param,
-                              MYSQL_FIELD *field MY_ATTRIBUTE((unused)),
+                              MYSQL_FIELD *field [[maybe_unused]],
                               uchar **row) {
   MYSQL_TIME *tm = (MYSQL_TIME *)param->buffer;
   read_binary_date(tm, row);
 }
 
 static void fetch_result_datetime(MYSQL_BIND *param,
-                                  MYSQL_FIELD *field MY_ATTRIBUTE((unused)),
+                                  MYSQL_FIELD *field [[maybe_unused]],
                                   uchar **row) {
   MYSQL_TIME *tm = (MYSQL_TIME *)param->buffer;
   read_binary_datetime(tm, row);
 }
 
 static void fetch_result_bin(MYSQL_BIND *param,
-                             MYSQL_FIELD *field MY_ATTRIBUTE((unused)),
-                             uchar **row) {
+                             MYSQL_FIELD *field [[maybe_unused]], uchar **row) {
   ulong length = net_field_length(row);
   ulong copy_length = std::min(length, param->buffer_length);
   memcpy(param->buffer, (char *)*row, copy_length);
@@ -3359,8 +3354,7 @@
 }
 
 static void fetch_result_str(MYSQL_BIND *param,
-                             MYSQL_FIELD *field MY_ATTRIBUTE((unused)),
-                             uchar **row) {
+                             MYSQL_FIELD *field [[maybe_unused]], uchar **row) {
   ulong length = net_field_length(row);
   ulong copy_length = std::min(length, param->buffer_length);
   memcpy(param->buffer, (char *)*row, copy_length);
@@ -3378,15 +3372,14 @@
 */
 
 static void skip_result_fixed(MYSQL_BIND *param,
-                              MYSQL_FIELD *field MY_ATTRIBUTE((unused)),
-                              uchar **row)
+                              MYSQL_FIELD *field [[maybe_unused]], uchar **row)
 
 {
   (*row) += param->pack_length;
 }
 
-static void skip_result_with_length(MYSQL_BIND *param MY_ATTRIBUTE((unused)),
-                                    MYSQL_FIELD *field MY_ATTRIBUTE((unused)),
+static void skip_result_with_length(MYSQL_BIND *param [[maybe_unused]],
+                                    MYSQL_FIELD *field [[maybe_unused]],
                                     uchar **row)
 
 {
@@ -3394,7 +3387,7 @@
   (*row) += length;
 }
 
-static void skip_result_string(MYSQL_BIND *param MY_ATTRIBUTE((unused)),
+static void skip_result_string(MYSQL_BIND *param [[maybe_unused]],
                                MYSQL_FIELD *field, uchar **row)
 
 {
@@ -3861,6 +3854,10 @@
 
   while ((pkt_len = cli_safe_read(mysql, &is_data_packet)) != packet_error) {
     cp = net->read_pos;
+    if (pkt_len < 1) {
+      set_stmt_error(stmt, CR_MALFORMED_PACKET, unknown_sqlstate, nullptr);
+      return 1;
+    }
     if (*cp == 0 || is_data_packet) {
       if (add_binary_row(net, stmt, pkt_len, &prev_ptr)) goto err;
     } else {
@@ -3869,8 +3866,13 @@
       /* read warning count from OK packet or EOF packet if it is old client */
       if (mysql->server_capabilities & CLIENT_DEPRECATE_EOF && !is_data_packet)
         read_ok_ex(mysql, pkt_len);
-      else
+      else {
+        if (pkt_len < 3) {
+          set_stmt_error(stmt, CR_MALFORMED_PACKET, unknown_sqlstate, nullptr);
+          return 1;
+        }
         mysql->warning_count = uint2korr(cp + 1);
+      }
       /*
         OUT parameters result sets has SERVER_PS_OUT_PARAMS and
         SERVER_MORE_RESULTS_EXISTS flags in first EOF_Packet only.
@@ -3884,6 +3886,10 @@
         So we need to preserve SERVER_MORE_RESULTS_EXISTS flag for OUT
         parameters result set.
       */
+      if (pkt_len < 5) {
+        set_stmt_error(stmt, CR_MALFORMED_PACKET, unknown_sqlstate, nullptr);
+        return 1;
+      }
       if (mysql->server_status & SERVER_PS_OUT_PARAMS) {
         mysql->server_status =
             uint2korr(cp + 3) | SERVER_PS_OUT_PARAMS |
@@ -4018,7 +4024,7 @@
   }
 
   if ((*mysql->methods->read_binary_rows)(stmt)) {
-    free_root(result->alloc, MYF(MY_KEEP_PREALLOC));
+    result->alloc->ClearForReuse();
     result->data = nullptr;
     result->rows = 0;
     mysql->status = MYSQL_STATUS_READY;
@@ -4112,7 +4118,7 @@
     */
     if (flags & RESET_STORE_RESULT) {
       /* Result buffered */
-      free_root(result->alloc, MYF(MY_KEEP_PREALLOC));
+      result->alloc->ClearForReuse();
       result->data = nullptr;
       result->rows = 0;
       stmt->data_cursor = nullptr;
@@ -4186,9 +4192,9 @@
   int rc = 0;
   DBUG_TRACE;
 
-  free_root(stmt->result.alloc, MYF(0));
-  free_root(stmt->mem_root, MYF(0));
-  free_root(&stmt->extension->fields_mem_root, MYF(0));
+  stmt->result.alloc->Clear();
+  stmt->mem_root->Clear();
+  stmt->extension->fields_mem_root.Clear();
 
   if (mysql) {
     mysql->stmts = list_delete(mysql->stmts, &stmt->list);
diff -Nru mysql-8.0-8.0.26/libmysql/test_trace_plugin.cc mysql-8.0-8.0.27/libmysql/test_trace_plugin.cc
--- mysql-8.0-8.0.26/libmysql/test_trace_plugin.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/libmysql/test_trace_plugin.cc	2021-09-28 11:46:34.000000000 +0000
@@ -100,6 +100,7 @@
     test_trace::plugin_init,
     test_trace::plugin_deinit,
     NULL,  // option handling
+    NULL,
     test_trace::trace_start,
     test_trace::trace_stop,
     test_trace::trace_event};
diff -Nru mysql-8.0-8.0.26/LICENSE mysql-8.0-8.0.27/LICENSE
--- mysql-8.0-8.0.26/LICENSE	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/LICENSE	2021-09-28 11:46:34.000000000 +0000
@@ -10,7 +10,7 @@
    third-party software which may be included in this distribution of
    MySQL 8.0.
 
-   Last updated: April 2021
+   Last updated: July 2021
 
 Licensing Information
 
diff -Nru mysql-8.0-8.0.26/man/comp_err.1 mysql-8.0-8.0.27/man/comp_err.1
--- mysql-8.0-8.0.26/man/comp_err.1	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/man/comp_err.1	2021-09-28 11:46:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: comp_err
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 06/04/2021
+.\"      Date: 09/04/2021
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-.TH "COMP_ERR" "1" "06/04/2021" "MySQL 8\&.0" "MySQL Database System"
+.TH "COMP_ERR" "1" "09/04/2021" "MySQL 8\&.0" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru mysql-8.0-8.0.26/man/ibd2sdi.1 mysql-8.0-8.0.27/man/ibd2sdi.1
--- mysql-8.0-8.0.26/man/ibd2sdi.1	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/man/ibd2sdi.1	2021-09-28 11:46:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ibd2sdi
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 06/04/2021
+.\"      Date: 09/04/2021
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-.TH "IBD2SDI" "1" "06/04/2021" "MySQL 8\&.0" "MySQL Database System"
+.TH "IBD2SDI" "1" "09/04/2021" "MySQL 8\&.0" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru mysql-8.0-8.0.26/man/innochecksum.1 mysql-8.0-8.0.27/man/innochecksum.1
--- mysql-8.0-8.0.26/man/innochecksum.1	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/man/innochecksum.1	2021-09-28 11:46:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: innochecksum
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 06/04/2021
+.\"      Date: 09/04/2021
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-.TH "INNOCHECKSUM" "1" "06/04/2021" "MySQL 8\&.0" "MySQL Database System"
+.TH "INNOCHECKSUM" "1" "09/04/2021" "MySQL 8\&.0" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru mysql-8.0-8.0.26/man/lz4_decompress.1 mysql-8.0-8.0.27/man/lz4_decompress.1
--- mysql-8.0-8.0.26/man/lz4_decompress.1	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/man/lz4_decompress.1	2021-09-28 11:46:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: lz4_decompress
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 06/04/2021
+.\"      Date: 09/04/2021
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-.TH "LZ4_DECOMPRESS" "1" "06/04/2021" "MySQL 8\&.0" "MySQL Database System"
+.TH "LZ4_DECOMPRESS" "1" "09/04/2021" "MySQL 8\&.0" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru mysql-8.0-8.0.26/man/myisamchk.1 mysql-8.0-8.0.27/man/myisamchk.1
--- mysql-8.0-8.0.26/man/myisamchk.1	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/man/myisamchk.1	2021-09-28 11:46:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: myisamchk
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 06/04/2021
+.\"      Date: 09/04/2021
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-.TH "MYISAMCHK" "1" "06/04/2021" "MySQL 8\&.0" "MySQL Database System"
+.TH "MYISAMCHK" "1" "09/04/2021" "MySQL 8\&.0" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru mysql-8.0-8.0.26/man/myisam_ftdump.1 mysql-8.0-8.0.27/man/myisam_ftdump.1
--- mysql-8.0-8.0.26/man/myisam_ftdump.1	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/man/myisam_ftdump.1	2021-09-28 11:46:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: myisam_ftdump
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 06/04/2021
+.\"      Date: 09/04/2021
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-.TH "MYISAM_FTDUMP" "1" "06/04/2021" "MySQL 8\&.0" "MySQL Database System"
+.TH "MYISAM_FTDUMP" "1" "09/04/2021" "MySQL 8\&.0" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru mysql-8.0-8.0.26/man/myisamlog.1 mysql-8.0-8.0.27/man/myisamlog.1
--- mysql-8.0-8.0.26/man/myisamlog.1	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/man/myisamlog.1	2021-09-28 11:46:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: myisamlog
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 06/04/2021
+.\"      Date: 09/04/2021
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-.TH "MYISAMLOG" "1" "06/04/2021" "MySQL 8\&.0" "MySQL Database System"
+.TH "MYISAMLOG" "1" "09/04/2021" "MySQL 8\&.0" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru mysql-8.0-8.0.26/man/myisampack.1 mysql-8.0-8.0.27/man/myisampack.1
--- mysql-8.0-8.0.26/man/myisampack.1	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/man/myisampack.1	2021-09-28 11:46:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: myisampack
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 06/04/2021
+.\"      Date: 09/04/2021
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-.TH "MYISAMPACK" "1" "06/04/2021" "MySQL 8\&.0" "MySQL Database System"
+.TH "MYISAMPACK" "1" "09/04/2021" "MySQL 8\&.0" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru mysql-8.0-8.0.26/man/my_print_defaults.1 mysql-8.0-8.0.27/man/my_print_defaults.1
--- mysql-8.0-8.0.26/man/my_print_defaults.1	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/man/my_print_defaults.1	2021-09-28 11:46:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: my_print_defaults
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 06/04/2021
+.\"      Date: 09/04/2021
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-.TH "MY_PRINT_DEFAULTS" "1" "06/04/2021" "MySQL 8\&.0" "MySQL Database System"
+.TH "MY_PRINT_DEFAULTS" "1" "09/04/2021" "MySQL 8\&.0" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru mysql-8.0-8.0.26/man/mysql.1 mysql-8.0-8.0.27/man/mysql.1
--- mysql-8.0-8.0.26/man/mysql.1	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/man/mysql.1	2021-09-28 11:46:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: mysql
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 06/04/2021
+.\"      Date: 09/04/2021
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-.TH "MYSQL" "1" "06/04/2021" "MySQL 8\&.0" "MySQL Database System"
+.TH "MYSQL" "1" "09/04/2021" "MySQL 8\&.0" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru mysql-8.0-8.0.26/man/mysqladmin.1 mysql-8.0-8.0.27/man/mysqladmin.1
--- mysql-8.0-8.0.26/man/mysqladmin.1	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/man/mysqladmin.1	2021-09-28 11:46:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: mysqladmin
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 06/04/2021
+.\"      Date: 09/04/2021
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-.TH "MYSQLADMIN" "1" "06/04/2021" "MySQL 8\&.0" "MySQL Database System"
+.TH "MYSQLADMIN" "1" "09/04/2021" "MySQL 8\&.0" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -397,9 +397,22 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+start\-replica
+.sp
+Start replication on a replica server\&. Use this command from MySQL 8\&.0\&.26\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 start\-slave
 .sp
-Start replication on a replica server\&.
+Start replication on a replica server\&. Use this command before MySQL 8\&.0\&.26\&.
 .RE
 .sp
 .RS 4
@@ -423,9 +436,22 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+stop\-replica
+.sp
+Stop replication on a replica server\&. Use this command from MySQL 8\&.0\&.26\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 stop\-slave
 .sp
-Stop replication on a replica server\&.
+Stop replication on a replica server\&. Use this command before MySQL 8\&.0\&.26\&.
 .RE
 .sp
 .RS 4
diff -Nru mysql-8.0-8.0.26/man/mysqlbinlog.1 mysql-8.0-8.0.27/man/mysqlbinlog.1
--- mysql-8.0-8.0.26/man/mysqlbinlog.1	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/man/mysqlbinlog.1	2021-09-28 11:46:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: mysqlbinlog
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 06/04/2021
+.\"      Date: 09/04/2021
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-.TH "MYSQLBINLOG" "1" "06/04/2021" "MySQL 8\&.0" "MySQL Database System"
+.TH "MYSQLBINLOG" "1" "09/04/2021" "MySQL 8\&.0" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -213,6 +213,8 @@
 .PP
 \fBmysqlbinlog\fR
 sets the value of
+pseudo_replica_mode
+or
 pseudo_slave_mode
 to true before executing any SQL statements\&. This system variable affects the handling of XA transactions, the
 original_commit_timestamp
@@ -1194,8 +1196,10 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fB\-\-read\-from\-remote\-master=\fR\fB\fItype\fR\fR
-Read binary logs from a MySQL server with the
+\fB\-\-read\-from\-remote\-source=\fR\fB\fItype\fR\fR
+From MySQL 8\&.0\&.26, use
+\fB\-\-read\-from\-remote\-source\fR, and before MySQL 8\&.0\&.26, use
+\fB\-\-read\-from\-remote\-master\fR\&. Both options have the same effect\&. The options read binary logs from a MySQL server with the
 COM_BINLOG_DUMP
 or
 COM_BINLOG_DUMP_GTID
@@ -1203,11 +1207,13 @@
 BINLOG\-DUMP\-NON\-GTIDS
 or
 BINLOG\-DUMP\-GTIDS, respectively\&. If
+\fB\-\-read\-from\-remote\-source=BINLOG\-DUMP\-GTIDS\fR
+or
 \fB\-\-read\-from\-remote\-master=BINLOG\-DUMP\-GTIDS\fR
 is combined with
 \fB\-\-exclude\-gtids\fR, transactions can be filtered out on the source, avoiding unnecessary network traffic\&.
 .sp
-The connection parameter options are used with this option or the
+The connection parameter options are used with these options or the
 \fB\-\-read\-from\-remote\-server\fR
 option\&. These options are
 \fB\-\-host\fR,
@@ -1215,11 +1221,24 @@
 \fB\-\-port\fR,
 \fB\-\-protocol\fR,
 \fB\-\-socket\fR, and
-\fB\-\-user\fR\&. If neither of the remote options is specified, the connection parameter options are ignored\&.
+\fB\-\-user\fR\&. If none of the remote options is specified, the connection parameter options are ignored\&.
 .sp
 The
 REPLICATION SLAVE
-privilege is required to use this option\&.
+privilege is required to use these options\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fB\-\-read\-from\-remote\-master=\fR\fB\fItype\fR\fR
+Use this option before MySQL 8\&.0\&.26 rather than
+\fB\-\-read\-from\-remote\-source\fR\&. Both options have the same effect\&.
 .RE
 .sp
 .RS 4
diff -Nru mysql-8.0-8.0.26/man/mysqlcheck.1 mysql-8.0-8.0.27/man/mysqlcheck.1
--- mysql-8.0-8.0.26/man/mysqlcheck.1	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/man/mysqlcheck.1	2021-09-28 11:46:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: mysqlcheck
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 06/04/2021
+.\"      Date: 09/04/2021
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-.TH "MYSQLCHECK" "1" "06/04/2021" "MySQL 8\&.0" "MySQL Database System"
+.TH "MYSQLCHECK" "1" "09/04/2021" "MySQL 8\&.0" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru mysql-8.0-8.0.26/man/mysql_config.1 mysql-8.0-8.0.27/man/mysql_config.1
--- mysql-8.0-8.0.26/man/mysql_config.1	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/man/mysql_config.1	2021-09-28 11:46:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: mysql_config
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 06/04/2021
+.\"      Date: 09/04/2021
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-.TH "MYSQL_CONFIG" "1" "06/04/2021" "MySQL 8\&.0" "MySQL Database System"
+.TH "MYSQL_CONFIG" "1" "09/04/2021" "MySQL 8\&.0" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru mysql-8.0-8.0.26/man/mysql_config_editor.1 mysql-8.0-8.0.27/man/mysql_config_editor.1
--- mysql-8.0-8.0.26/man/mysql_config_editor.1	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/man/mysql_config_editor.1	2021-09-28 11:46:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: mysql_config_editor
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 06/04/2021
+.\"      Date: 09/04/2021
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-.TH "MYSQL_CONFIG_EDITOR" "1" "06/04/2021" "MySQL 8\&.0" "MySQL Database System"
+.TH "MYSQL_CONFIG_EDITOR" "1" "09/04/2021" "MySQL 8\&.0" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru mysql-8.0-8.0.26/man/mysqld.8 mysql-8.0-8.0.27/man/mysqld.8
--- mysql-8.0-8.0.26/man/mysqld.8	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/man/mysqld.8	2021-09-28 11:46:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: mysqld
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 06/04/2021
+.\"      Date: 09/04/2021
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-.TH "MYSQLD" "8" "06/04/2021" "MySQL 8\&.0" "MySQL Database System"
+.TH "MYSQLD" "8" "09/04/2021" "MySQL 8\&.0" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru mysql-8.0-8.0.26/man/mysqld_multi.1 mysql-8.0-8.0.27/man/mysqld_multi.1
--- mysql-8.0-8.0.26/man/mysqld_multi.1	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/man/mysqld_multi.1	2021-09-28 11:46:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: mysqld_multi
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 06/04/2021
+.\"      Date: 09/04/2021
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-.TH "MYSQLD_MULTI" "1" "06/04/2021" "MySQL 8\&.0" "MySQL Database System"
+.TH "MYSQLD_MULTI" "1" "09/04/2021" "MySQL 8\&.0" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru mysql-8.0-8.0.26/man/mysqld_safe.1 mysql-8.0-8.0.27/man/mysqld_safe.1
--- mysql-8.0-8.0.26/man/mysqld_safe.1	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/man/mysqld_safe.1	2021-09-28 11:46:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: mysqld_safe
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 06/04/2021
+.\"      Date: 09/04/2021
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-.TH "MYSQLD_SAFE" "1" "06/04/2021" "MySQL 8\&.0" "MySQL Database System"
+.TH "MYSQLD_SAFE" "1" "09/04/2021" "MySQL 8\&.0" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -57,6 +57,14 @@
 \fBmysqld_safe\fR
 is not installed because it is unnecessary\&. For more information, see
 Section\ \&2.5.9, \(lqManaging MySQL Server with systemd\(rq\&.
+.PP
+One implication of the non\-use of
+\fBmysqld_safe\fR
+on platforms that use systemd for server management is that use of
+[mysqld_safe]
+or
+[safe_mysqld]
+sections in option files is not supported and might lead to unexpected behavior\&.
 .sp .5v
 .RE
 .PP
diff -Nru mysql-8.0-8.0.26/man/mysqldump.1 mysql-8.0-8.0.27/man/mysqldump.1
--- mysql-8.0-8.0.26/man/mysqldump.1	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/man/mysqldump.1	2021-09-28 11:46:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: mysqldump
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 06/04/2021
+.\"      Date: 09/04/2021
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-.TH "MYSQLDUMP" "1" "06/04/2021" "MySQL 8\&.0" "MySQL Database System"
+.TH "MYSQLDUMP" "1" "09/04/2021" "MySQL 8\&.0" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -1464,13 +1464,18 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fB\-\-apply\-slave\-statements\fR
-For a replica dump produced with the
+\fB\-\-apply\-replica\-statements\fR
+From MySQL 8\&.0\&.26, use
+\fB\-\-apply\-replica\-statements\fR, and before MySQL 8\&.0\&.26, use
+\fB\-\-apply\-slave\-statements\fR\&. Both options have the same effect\&. For a replica dump produced with the
+\fB\-\-dump\-replica\fR
+or
 \fB\-\-dump\-slave\fR
-option, add a
-STOP REPLICA | SLAVE
-statement before the statement with the binary log coordinates, and a
-START REPLICA | SLAVE
+option, the options add a
+STOP REPLICA
+(or before MySQL 8\&.0\&.22,
+STOP SLAVE) statement before the statement with the binary log coordinates, and a
+START REPLICA
 statement at the end of the output\&.
 .RE
 .sp
@@ -1482,12 +1487,29 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fB\-\-delete\-master\-logs\fR
-On a replication source server, delete the binary logs by sending a
+\fB\-\-apply\-slave\-statements\fR
+Use this option before MySQL 8\&.0\&.26 rather than
+\fB\-\-apply\-replica\-statements\fR\&. Both options have the same effect\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fB\-\-delete\-source\-logs\fR
+From MySQL 8\&.0\&.26, use
+\fB\-\-delete\-source\-logs\fR, and before MySQL 8\&.0\&.26, use
+\fB\-\-delete\-master\-logs\fR\&. Both options have the same effect\&. On a replication source server, the options delete the binary logs by sending a
 PURGE BINARY LOGS
-statement to the server after performing the dump operation\&. This option requires the
+statement to the server after performing the dump operation\&. The options require the
 RELOAD
-privilege as well as privileges sufficient to execute that statement\&. This option automatically enables
+privilege as well as privileges sufficient to execute that statement\&. The options automatically enable
+\fB\-\-source\-data\fR
+or
 \fB\-\-master\-data\fR\&.
 .RE
 .sp
@@ -1499,10 +1521,24 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fB\-\-dump\-slave[=\fR\fB\fIvalue\fR\fR\fB]\fR
-This option is similar to
-\fB\-\-master\-data\fR
-except that it is used to dump a replica server to produce a dump file that can be used to set up another server as a replica that has the same source as the dumped server\&. It causes the dump output to include a
+\fB\-\-delete\-master\-logs\fR
+Use this option before MySQL 8\&.0\&.26 rather than
+\fB\-\-delete\-source\-logs\fR\&. Both options have the same effect\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fB\-\-dump\-replica[=\fR\fB\fIvalue\fR\fR\fB]\fR
+From MySQL 8\&.0\&.26, use
+\fB\-\-dump\-replica\fR, and before MySQL 8\&.0\&.26, use
+\fB\-\-dump\-slave\fR\&. Both options have the same effect\&. The options are similar to
+\fB\-\-source\-data\fR, except that they are used to dump a replica server to produce a dump file that can be used to set up another server as a replica that has the same source as the dumped server\&. The options cause the dump output to include a
 CHANGE REPLICATION SOURCE TO
 statement (from MySQL 8\&.0\&.23) or
 CHANGE MASTER TO
@@ -1513,7 +1549,7 @@
 and
 Exec_Master_Log_Pos
 from the
-SHOW REPLICA | SLAVE STATUS
+SHOW REPLICA STATUS
 output and uses them for
 SOURCE_LOG_FILE
 and
@@ -1536,10 +1572,16 @@
 for more information\&.
 .sp .5v
 .RE
+\fB\-\-dump\-replica\fR
+or
 \fB\-\-dump\-slave\fR
-causes the coordinates from the source to be used rather than those of the dumped server, as is done by the
+cause the coordinates from the source to be used rather than those of the dumped server, as is done by the
+\fB\-\-source\-data\fR
+or
 \fB\-\-master\-data\fR
-option\&. In addition, specifiying this option causes the
+option\&. In addition, specifying this option causes the
+\fB\-\-source\-data\fR
+or
 \fB\-\-master\-data\fR
 option to be overridden, if used, and effectively ignored\&.
 .if n \{\
@@ -1554,36 +1596,47 @@
 \fBWarning\fR
 .ps -1
 .br
-This option should not be used if the server where the dump is going to be applied uses
+\fB\-\-dump\-replica\fR
+and
+\fB\-\-dump\-slave\fR
+should not be used if the server where the dump is going to be applied uses
 gtid_mode=ON
 and
-MASTER_AUTOPOSITION=1\&.
+SOURCE_AUTO_POSITION=1
+or
+MASTER_AUTO_POSITION=1\&.
 .sp .5v
 .RE
 The option value is handled the same way as for
-\fB\-\-master\-data\fR\&. Setting no value or 1 causes a
+\fB\-\-source\-data\fR\&. Setting no value or 1 causes a
 CHANGE REPLICATION SOURCE TO
 statement (from MySQL 8\&.0\&.23) or
 CHANGE MASTER TO
 statement (before MySQL 8\&.0\&.23) to be written to the dump\&. Setting 2 causes the statement to be written but encased in SQL comments\&. It has the same effect as
-\fB\-\-master\-data\fR
+\fB\-\-source\-data\fR
 in terms of enabling or disabling other options and in how locking is handled\&.
 .sp
-This option causes
+\fB\-\-dump\-replica\fR
+and
+\fB\-\-dump\-slave\fR
+cause
 \fBmysqldump\fR
 to stop the replication SQL thread before the dump and restart it again after\&.
 .sp
+\fB\-\-dump\-replica\fR
+and
 \fB\-\-dump\-slave\fR
-sends a
-SHOW REPLICA | SLAVE STATUS
-statement to the server to obtain information, so it requires privileges sufficient to execute that statement\&.
+send a
+SHOW REPLICA STATUS
+statement to the server to obtain information, so they require privileges sufficient to execute that statement\&.
 .sp
-In conjunction with
-\fB\-\-dump\-slave\fR, the
-\fB\-\-apply\-slave\-statements\fR
+\fB\-\-apply\-replica\-statements\fR
 and
-\fB\-\-include\-master\-host\-port\fR
-options can also be used\&.
+\fB\-\-include\-source\-host\-port\fR
+options can be used in conjunction with
+\fB\-\-dump\-replica\fR
+and
+\fB\-\-dump\-slave\fR\&.
 .RE
 .sp
 .RS 4
@@ -1594,14 +1647,23 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fB\-\-include\-master\-host\-port\fR
-For the
-CHANGE REPLICATION SOURCE TO
-statement (from MySQL 8\&.0\&.23) or
-CHANGE MASTER TO
-statement (before MySQL 8\&.0\&.23) in a replica dump produced with the
-\fB\-\-dump\-slave\fR
-option, add
+\fB\-\-dump\-slave[=\fR\fB\fIvalue\fR\fR\fB]\fR
+Use this option before MySQL 8\&.0\&.26 rather than
+\fB\-\-dump\-replica\fR\&. Both options have the same effect\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fB\-\-include\-source\-host\-port\fR
+From MySQL 8\&.0\&.26, use
+\fB\-\-include\-source\-host\-port\fR, and before MySQL 8\&.0\&.26, use
+\fB\-\-include\-master\-host\-port\fR\&. Both options have the same effect\&. The options add the
 SOURCE_HOST
 |
 MASTER_HOST
@@ -1609,7 +1671,15 @@
 SOURCE_PORT
 |
 MASTER_PORT
-options for the host name and TCP/IP port number of the replica\*(Aqs source\&.
+options for the host name and TCP/IP port number of the replica\*(Aqs source, to the
+CHANGE REPLICATION SOURCE TO
+statement (from MySQL 8\&.0\&.23) or
+CHANGE MASTER TO
+statement (before MySQL 8\&.0\&.23) in a replica dump produced with the
+\fB\-\-dump\-replica\fR
+or
+\fB\-\-dump\-slave\fR
+option\&.
 .RE
 .sp
 .RS 4
@@ -1620,8 +1690,23 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fB\-\-master\-data[=\fR\fB\fIvalue\fR\fR\fB]\fR
-Use this option to dump a replication source server to produce a dump file that can be used to set up another server as a replica of the source\&. It causes the dump output to include a
+\fB\-\-include\-master\-host\-port\fR
+Use this option before MySQL 8\&.0\&.26 rather than
+\fB\-\-include\-source\-host\-port\fR\&. Both options have the same effect\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fB\-\-source\-data[=\fR\fB\fIvalue\fR\fR\fB]\fR
+From MySQL 8\&.0\&.26, use
+\fB\-\-source\-data\fR, and before MySQL 8\&.0\&.26, use
+\fB\-\-master\-data\fR\&. Both options have the same effect\&. The options are used to dump a replication source server to produce a dump file that can be used to set up another server as a replica of the source\&. The options cause the dump output to include a
 CHANGE REPLICATION SOURCE TO
 statement (from MySQL 8\&.0\&.23) or
 CHANGE MASTER TO
@@ -1633,27 +1718,47 @@
 CHANGE MASTER TO
 statement is written as an SQL comment, and thus is informative only; it has no effect when the dump file is reloaded\&. If the option value is 1, the statement is not written as a comment and takes effect when the dump file is reloaded\&. If no option value is specified, the default value is 1\&.
 .sp
+\fB\-\-source\-data\fR
+and
 \fB\-\-master\-data\fR
-sends a
+send a
 SHOW MASTER STATUS
-statement to the server to obtain information, so it requires privileges sufficient to execute that statement\&. This option also requires the
+statement to the server to obtain information, so they require privileges sufficient to execute that statement\&. This option also requires the
 RELOAD
 privilege and the binary log must be enabled\&.
 .sp
-The
+\fB\-\-source\-data\fR
+and
 \fB\-\-master\-data\fR
-option automatically turns off
-\fB\-\-lock\-tables\fR\&. It also turns on
+automatically turn off
+\fB\-\-lock\-tables\fR\&. They also turn on
 \fB\-\-lock\-all\-tables\fR, unless
 \fB\-\-single\-transaction\fR
 also is specified, in which case, a global read lock is acquired only for a short time at the beginning of the dump (see the description for
 \fB\-\-single\-transaction\fR)\&. In all cases, any action on logs happens at the exact moment of the dump\&.
 .sp
 It is also possible to set up a replica by dumping an existing replica of the source, using the
+\fB\-\-dump\-replica\fR
+or
 \fB\-\-dump\-slave\fR
 option, which overrides
+\fB\-\-source\-data\fR
+and
 \fB\-\-master\-data\fR
-and causes it to be ignored if both options are used\&.
+and causes them to be ignored\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fB\-\-master\-data[=\fR\fB\fIvalue\fR\fR\fB]\fR
+Use this option before MySQL 8\&.0\&.26 rather than
+\fB\-\-source\-data\fR\&. Both options have the same effect\&.
 .RE
 .sp
 .RS 4
@@ -2687,12 +2792,16 @@
 option, the logs are flushed
 \fIfor each database dumped\fR\&. The exception is when using
 \fB\-\-lock\-all\-tables\fR,
+\fB\-\-source\-data\fR
+or
 \fB\-\-master\-data\fR, or
-\fB\-\-single\-transaction\fR: In this case, the logs are flushed only once, corresponding to the moment that all tables are locked by
+\fB\-\-single\-transaction\fR\&. In these cases, the logs are flushed only once, corresponding to the moment that all tables are locked by
 FLUSH TABLES WITH READ LOCK\&. If you want your dump and the log flush to happen at exactly the same moment, you should use
 \fB\-\-flush\-logs\fR
 together with
 \fB\-\-lock\-all\-tables\fR,
+\fB\-\-source\-data\fR
+or
 \fB\-\-master\-data\fR, or
 \fB\-\-single\-transaction\fR\&.
 .RE
@@ -3020,6 +3129,8 @@
 .\}
 .nf
 mysqldump \-\-all\-databases \-\-master\-data \-\-single\-transaction > all_databases\&.sql
+or from MySQL 8\&.0\&.26:
+mysqldump \-\-all\-databases \-\-source\-data \-\-single\-transaction > all_databases\&.sql
 .fi
 .if n \{\
 .RE
@@ -3040,6 +3151,8 @@
 .\}
 .nf
 mysqldump \-\-all\-databases \-\-master\-data=2 > all_databases\&.sql
+or from MySQL 8\&.0\&.26:
+mysqldump \-\-all\-databases \-\-source\-data=2 > all_databases\&.sql
 .fi
 .if n \{\
 .RE
@@ -3052,16 +3165,20 @@
 .\}
 .nf
 mysqldump \-\-all\-databases \-\-flush\-logs \-\-master\-data=2 > all_databases\&.sql
+or from MySQL 8\&.0\&.26:
+mysqldump \-\-all\-databases \-\-flush\-logs \-\-source\-data=2 > all_databases\&.sql
 .fi
 .if n \{\
 .RE
 .\}
 .PP
 The
+\fB\-\-source\-data\fR
+or
 \fB\-\-master\-data\fR
-and
+option can be used simultaneously with the
 \fB\-\-single\-transaction\fR
-options can be used simultaneously, which provides a convenient way to make an online backup suitable for use prior to point\-in\-time recovery if tables are stored using the
+option, which provides a convenient way to make an online backup suitable for use prior to point\-in\-time recovery if tables are stored using the
 InnoDB
 storage engine\&.
 .PP
diff -Nru mysql-8.0-8.0.26/man/mysqldumpslow.1 mysql-8.0-8.0.27/man/mysqldumpslow.1
--- mysql-8.0-8.0.26/man/mysqldumpslow.1	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/man/mysqldumpslow.1	2021-09-28 11:46:34.000000000 +0000
@@ -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: 06/04/2021
+.\"      Date: 09/04/2021
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-.TH "MYSQLDUMPSLOW" "1" "06/04/2021" "MySQL 8\&.0" "MySQL Database System"
+.TH "MYSQLDUMPSLOW" "1" "09/04/2021" "MySQL 8\&.0" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru mysql-8.0-8.0.26/man/mysqlimport.1 mysql-8.0-8.0.27/man/mysqlimport.1
--- mysql-8.0-8.0.26/man/mysqlimport.1	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/man/mysqlimport.1	2021-09-28 11:46:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: mysqlimport
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 06/04/2021
+.\"      Date: 09/04/2021
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-.TH "MYSQLIMPORT" "1" "06/04/2021" "MySQL 8\&.0" "MySQL Database System"
+.TH "MYSQLIMPORT" "1" "09/04/2021" "MySQL 8\&.0" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru mysql-8.0-8.0.26/man/mysql_migrate_keyring.1 mysql-8.0-8.0.27/man/mysql_migrate_keyring.1
--- mysql-8.0-8.0.26/man/mysql_migrate_keyring.1	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/man/mysql_migrate_keyring.1	2021-09-28 11:46:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: mysql_migrate_keyring
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 06/04/2021
+.\"      Date: 09/04/2021
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-.TH "MYSQL_MIGRATE_KEYRING" "1" "06/04/2021" "MySQL 8\&.0" "MySQL Database System"
+.TH "MYSQL_MIGRATE_KEYRING" "1" "09/04/2021" "MySQL 8\&.0" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru mysql-8.0-8.0.26/man/mysqlpump.1 mysql-8.0-8.0.27/man/mysqlpump.1
--- mysql-8.0-8.0.26/man/mysqlpump.1	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/man/mysqlpump.1	2021-09-28 11:46:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: mysqlpump
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 06/04/2021
+.\"      Date: 09/04/2021
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-.TH "MYSQLPUMP" "1" "06/04/2021" "MySQL 8\&.0" "MySQL Database System"
+.TH "MYSQLPUMP" "1" "09/04/2021" "MySQL 8\&.0" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru mysql-8.0-8.0.26/man/mysqlrouter.1 mysql-8.0-8.0.27/man/mysqlrouter.1
--- mysql-8.0-8.0.26/man/mysqlrouter.1	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/man/mysqlrouter.1	2021-09-28 11:46:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: mysqlrouter
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 06/04/2021
+.\"      Date: 09/03/2021
 .\"    Manual: MySQL Router
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-.TH "MYSQLROUTER" "1" "06/04/2021" "MySQL 8\&.0" "MySQL Router"
+.TH "MYSQLROUTER" "1" "09/03/2021" "MySQL 8\&.0" "MySQL Router"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -96,7 +96,7 @@
 .\}
 .nf
 shell> \fBmysqlrouter \-\-version\fR
-MySQL Router v8\&.0\&.25 on Linux (64\-bit) (GPL community edition)
+MySQL Router v8\&.0\&.26 on Linux (64\-bit) (GPL community edition)
 .fi
 .if n \{\
 .RE
@@ -2065,7 +2065,7 @@
 T}
 .TE
 .sp 1
-Start Router as a Windows service\&.
+Start Router as a Windows service\&. This is a private option, meaning it is only meant to be used by the Windows Service when launching Router as a service\&.
 .sp
 This option is only available on Windows\&.
 .RE
diff -Nru mysql-8.0-8.0.26/man/mysqlrouter_keyring.1 mysql-8.0-8.0.27/man/mysqlrouter_keyring.1
--- mysql-8.0-8.0.26/man/mysqlrouter_keyring.1	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/man/mysqlrouter_keyring.1	2021-09-28 11:46:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: mysqlrouter_keyring
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 06/04/2021
+.\"      Date: 09/03/2021
 .\"    Manual: MySQL Router
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-.TH "MYSQLROUTER_KEYRING" "1" "06/04/2021" "MySQL 8\&.0" "MySQL Router"
+.TH "MYSQLROUTER_KEYRING" "1" "09/03/2021" "MySQL 8\&.0" "MySQL Router"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru mysql-8.0-8.0.26/man/mysqlrouter_passwd.1 mysql-8.0-8.0.27/man/mysqlrouter_passwd.1
--- mysql-8.0-8.0.26/man/mysqlrouter_passwd.1	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/man/mysqlrouter_passwd.1	2021-09-28 11:46:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: mysqlrouter_passwd
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 06/04/2021
+.\"      Date: 09/03/2021
 .\"    Manual: MySQL Router
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-.TH "MYSQLROUTER_PASSWD" "1" "06/04/2021" "MySQL 8\&.0" "MySQL Router"
+.TH "MYSQLROUTER_PASSWD" "1" "09/03/2021" "MySQL 8\&.0" "MySQL Router"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru mysql-8.0-8.0.26/man/mysqlrouter_plugin_info.1 mysql-8.0-8.0.27/man/mysqlrouter_plugin_info.1
--- mysql-8.0-8.0.26/man/mysqlrouter_plugin_info.1	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/man/mysqlrouter_plugin_info.1	2021-09-28 11:46:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: mysqlrouter_plugin_info
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 06/04/2021
+.\"      Date: 09/03/2021
 .\"    Manual: MySQL Router
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-.TH "MYSQLROUTER_PLUGIN_INFO" "1" "06/04/2021" "MySQL 8\&.0" "MySQL Router"
+.TH "MYSQLROUTER_PLUGIN_INFO" "1" "09/03/2021" "MySQL 8\&.0" "MySQL Router"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru mysql-8.0-8.0.26/man/mysql_secure_installation.1 mysql-8.0-8.0.27/man/mysql_secure_installation.1
--- mysql-8.0-8.0.26/man/mysql_secure_installation.1	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/man/mysql_secure_installation.1	2021-09-28 11:46:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: mysql_secure_installation
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 06/04/2021
+.\"      Date: 09/04/2021
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-.TH "MYSQL_SECURE_INSTALLATION" "1" "06/04/2021" "MySQL 8\&.0" "MySQL Database System"
+.TH "MYSQL_SECURE_INSTALLATION" "1" "09/04/2021" "MySQL 8\&.0" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru mysql-8.0-8.0.26/man/mysql.server.1 mysql-8.0-8.0.27/man/mysql.server.1
--- mysql-8.0-8.0.26/man/mysql.server.1	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/man/mysql.server.1	2021-09-28 11:46:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: mysql.server
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 06/04/2021
+.\"      Date: 09/04/2021
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-.TH "MYSQL\&.SERVER" "1" "06/04/2021" "MySQL 8\&.0" "MySQL Database System"
+.TH "MYSQL\&.SERVER" "1" "09/04/2021" "MySQL 8\&.0" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru mysql-8.0-8.0.26/man/mysqlshow.1 mysql-8.0-8.0.27/man/mysqlshow.1
--- mysql-8.0-8.0.26/man/mysqlshow.1	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/man/mysqlshow.1	2021-09-28 11:46:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: mysqlshow
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 06/04/2021
+.\"      Date: 09/04/2021
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-.TH "MYSQLSHOW" "1" "06/04/2021" "MySQL 8\&.0" "MySQL Database System"
+.TH "MYSQLSHOW" "1" "09/04/2021" "MySQL 8\&.0" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru mysql-8.0-8.0.26/man/mysqlslap.1 mysql-8.0-8.0.27/man/mysqlslap.1
--- mysql-8.0-8.0.26/man/mysqlslap.1	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/man/mysqlslap.1	2021-09-28 11:46:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: mysqlslap
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 06/04/2021
+.\"      Date: 09/04/2021
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-.TH "MYSQLSLAP" "1" "06/04/2021" "MySQL 8\&.0" "MySQL Database System"
+.TH "MYSQLSLAP" "1" "09/04/2021" "MySQL 8\&.0" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru mysql-8.0-8.0.26/man/mysql_ssl_rsa_setup.1 mysql-8.0-8.0.27/man/mysql_ssl_rsa_setup.1
--- mysql-8.0-8.0.26/man/mysql_ssl_rsa_setup.1	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/man/mysql_ssl_rsa_setup.1	2021-09-28 11:46:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: mysql_ssl_rsa_setup
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 06/04/2021
+.\"      Date: 09/04/2021
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-.TH "MYSQL_SSL_RSA_SETUP" "1" "06/04/2021" "MySQL 8\&.0" "MySQL Database System"
+.TH "MYSQL_SSL_RSA_SETUP" "1" "09/04/2021" "MySQL 8\&.0" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru mysql-8.0-8.0.26/man/mysql_tzinfo_to_sql.1 mysql-8.0-8.0.27/man/mysql_tzinfo_to_sql.1
--- mysql-8.0-8.0.26/man/mysql_tzinfo_to_sql.1	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/man/mysql_tzinfo_to_sql.1	2021-09-28 11:46:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: mysql_tzinfo_to_sql
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 06/04/2021
+.\"      Date: 09/04/2021
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-.TH "MYSQL_TZINFO_TO_SQL" "1" "06/04/2021" "MySQL 8\&.0" "MySQL Database System"
+.TH "MYSQL_TZINFO_TO_SQL" "1" "09/04/2021" "MySQL 8\&.0" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru mysql-8.0-8.0.26/man/mysql_upgrade.1 mysql-8.0-8.0.27/man/mysql_upgrade.1
--- mysql-8.0-8.0.26/man/mysql_upgrade.1	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/man/mysql_upgrade.1	2021-09-28 11:46:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: mysql_upgrade
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 06/04/2021
+.\"      Date: 09/04/2021
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-.TH "MYSQL_UPGRADE" "1" "06/04/2021" "MySQL 8\&.0" "MySQL Database System"
+.TH "MYSQL_UPGRADE" "1" "09/04/2021" "MySQL 8\&.0" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru mysql-8.0-8.0.26/man/perror.1 mysql-8.0-8.0.27/man/perror.1
--- mysql-8.0-8.0.26/man/perror.1	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/man/perror.1	2021-09-28 11:46:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: perror
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 06/04/2021
+.\"      Date: 09/04/2021
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-.TH "PERROR" "1" "06/04/2021" "MySQL 8\&.0" "MySQL Database System"
+.TH "PERROR" "1" "09/04/2021" "MySQL 8\&.0" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru mysql-8.0-8.0.26/man/zlib_decompress.1 mysql-8.0-8.0.27/man/zlib_decompress.1
--- mysql-8.0-8.0.26/man/zlib_decompress.1	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/man/zlib_decompress.1	2021-09-28 11:46:34.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: zlib_decompress
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 06/04/2021
+.\"      Date: 09/04/2021
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 8.0
 .\"  Language: English
 .\"
-.TH "ZLIB_DECOMPRESS" "1" "06/04/2021" "MySQL 8\&.0" "MySQL Database System"
+.TH "ZLIB_DECOMPRESS" "1" "09/04/2021" "MySQL 8\&.0" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru mysql-8.0-8.0.26/mysql-test/collections/coverage.ignore mysql-8.0-8.0.27/mysql-test/collections/coverage.ignore
--- mysql-8.0-8.0.26/mysql-test/collections/coverage.ignore	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/collections/coverage.ignore	2021-09-28 11:46:34.000000000 +0000
@@ -5,6 +5,7 @@
 
 plugin/x/tests/driver/
 unittest/gunit/xplugin
+unittest/gunit/libmysqlgcs
 extra/protobuf
 extra/icu
 extra/zstd
diff -Nru mysql-8.0-8.0.26/mysql-test/collections/default.daily mysql-8.0-8.0.27/mysql-test/collections/default.daily
--- mysql-8.0-8.0.26/mysql-test/collections/default.daily	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/collections/default.daily	2021-09-28 11:46:34.000000000 +0000
@@ -69,11 +69,11 @@
 # Add runs of rpl and binlog test suites with additional
 # MTR or mysqld options in this section
 
-# Additional modes for rpl. Multi-Threaded Slave
-perl mysql-test-run.pl --timer  --force  --comment=rpl_MTS_db_part --vardir=var-mts-rpl_db --mysqld=--replica-parallel-workers=4 --mysqld=--replica-parallel-type=database --do-suite=rpl --no-skip --exclude-platform=windows
-perl mysql-test-run.pl --timer  --force  --parallel=8 --comment=rpl_MTS_db_part --vardir=var-mts-rpl_db --mysqld=--replica-parallel-workers=4 --mysqld=--replica-parallel-type=database --do-suite=rpl --no-skip --platform=windows
-perl mysql-test-run.pl --timer  --force  --comment=rpl_MTS_LC --vardir=var-rpl_mts_LC --mysqld=--replica-parallel-workers=4 --mysqld=--replica-parallel-type=logical_clock --do-suite=rpl --no-skip --exclude-platform=windows
-perl mysql-test-run.pl --timer  --parallel=8 --force  --comment=rpl_MTS_LC --vardir=var-rpl_mts_LC --mysqld=--replica-parallel-workers=4 --mysqld=--replica-parallel-type=logical_clock --do-suite=rpl --no-skip --platform=windows
+# Additional modes for rpl. DATABASE Multi-Threaded Applier and Single-Threaded Applier
+perl mysql-test-run.pl --timer  --force  --comment=rpl_MTA_db_part --vardir=var-mta-rpl_db --mysqld=--replica-parallel-workers=4 --mysqld=--replica-parallel-type=database --mysqld=--replica-preserve-commit-order=0  --do-suite=rpl --no-skip --exclude-platform=windows
+perl mysql-test-run.pl --timer  --force  --parallel=8 --comment=rpl_MTA_db_part --vardir=var-mta-rpl_db --mysqld=--replica-parallel-workers=4 --mysqld=--replica-parallel-type=database --mysqld=--replica-preserve-commit-order=0 --do-suite=rpl --no-skip --platform=windows
+perl mysql-test-run.pl --timer  --force  --comment=rpl_STA --vardir=var-rpl_sta --mysqld=--replica-parallel-workers=0 --do-suite=rpl --no-skip --exclude-platform=windows
+perl mysql-test-run.pl --timer  --parallel=8 --force  --comment=rpl_STA --vardir=var-rpl_sta --mysqld=--replica-parallel-workers=0 --do-suite=rpl --no-skip --platform=windows
 
 # Additional GTID coverage (rpl suite with gtid_mode=ON)
 perl mysql-test-run.pl --force --timer   --comment=rpl_with_gtid --vardir=var-rpl_gtid --suite=rpl --mysqld=--enforce-gtid-consistency --mysqld=--gtid-mode=on --no-skip --exclude-platform=windows
diff -Nru mysql-8.0-8.0.26/mysql-test/collections/default.push mysql-8.0-8.0.27/mysql-test/collections/default.push
--- mysql-8.0-8.0.26/mysql-test/collections/default.push	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/collections/default.push	2021-09-28 11:46:34.000000000 +0000
@@ -8,7 +8,6 @@
 # Non-Windows platforms
 #
 perl mysql-test-run.pl --timer --testcase-timeout=30 --suite-timeout=300 --debug-server --force  --comment=all-default-debug --vardir=var-all-default --skip-combinations --unit-tests-report --no-skip --exclude-platform=windows --skip-ndb
-
 #
 # Windows - run RPL separately with 8 threads
 #
diff -Nru mysql-8.0-8.0.26/mysql-test/collections/default.release.done mysql-8.0-8.0.27/mysql-test/collections/default.release.done
--- mysql-8.0-8.0.26/mysql-test/collections/default.release.done	2021-07-01 08:14:33.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/collections/default.release.done	2021-09-28 13:20:22.000000000 +0000
@@ -1 +1 @@
-/var/lib/pb2/sb_1-3692345-1625126119.25/mysql-8.0.26-release-export-981954_gpl/mysql-test/collections/default.release.in
+/var/lib/pb2/sb_1-4617039-1632834178.1/mysql-8.0.27-release-export-1236936_gpl/mysql-test/collections/default.release.in
diff -Nru mysql-8.0-8.0.26/mysql-test/collections/default.weekly mysql-8.0-8.0.27/mysql-test/collections/default.weekly
--- mysql-8.0-8.0.26/mysql-test/collections/default.weekly	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/collections/default.weekly	2021-09-28 11:46:34.000000000 +0000
@@ -32,8 +32,8 @@
 # If no Ndb support, no tests will be attempted.
 perl mysql-test-run.pl --debug-server --force --timer    --big-test --testcase-timeout=90   --comment=ndb-ps-debug-big  --vardir=var-ndb-ps-debug-big  --ps-protocol --with-ndb-only
 
-# Run default suites with hypergraph optimizer only on el7
-perl mysql-test-run.pl --debug-server --force --timer --big-test --testcase-timeout=90 --comment=hypergraph-debug-big --vardir=var-hyp-default-big --hypergraph --platform=el7-x86-64bit --no-skip --skip-ndb
+# Run default suites with hypergraph optimizer
+perl mysql-test-run.pl --debug-server --force --timer --big-test --testcase-timeout=90 --comment=hypergraph-debug-big --vardir=var-hyp-default-big --hypergraph --no-skip --skip-ndb
 # Run all ndb tests with hypergraph optimizer only on el7 separately.
 # If no Ndb support, no tests will be attempted.
 perl mysql-test-run.pl --debug-server --force --timer --big-test --testcase-timeout=90 --comment=ndb-hypergraph-debug-big --vardir=var-ndb-hyp-default-big --hypergraph --platform=el7-x86-64bit --no-skip --with-ndb-only
@@ -67,9 +67,9 @@
 # Add runs of rpl and binlog test suites with additional
 # MTR or mysqld options in this section
 
-# Additional mode for rpl. Multi-Threaded Slave
-perl mysql-test-run.pl --debug-server --timer --force --big-test --testcase-timeout=60  --comment=rpl-mts-db --vardir=var-rpl-mts-db  --mysqld=--replica-parallel-workers=4 --mysqld=--replica-parallel-type=database --do-suite=rpl --no-skip
-perl mysql-test-run.pl --debug-server --timer --force --big-test --testcase-timeout=60  --comment=rpl-mts-lc --vardir=var-rpl-mts-lc  --mysqld=--replica-parallel-workers=4 --mysqld=--replica-parallel-type=logical_clock --do-suite=rpl --no-skip
+# Additional mode for rpl. Database Multi-Threaded Applier and Single-Threaded Applier
+perl mysql-test-run.pl --debug-server --timer --force --big-test --testcase-timeout=60  --comment=rpl-mta-db --vardir=var-rpl-mta-db  --mysqld=--replica-parallel-workers=4 --mysqld=--replica-parallel-type=database --mysqld=--replica-preserve-commit-order=0 --do-suite=rpl --no-skip
+perl mysql-test-run.pl --debug-server --timer --force --big-test --testcase-timeout=60  --comment=rpl-sta --vardir=var-rpl-sta --mysqld=--replica-parallel-workers=0 --do-suite=rpl --no-skip
 
 # Additional GTID coverage (rpl suite with gtid_mode=ON)
 perl mysql-test-run.pl --debug-server --force --timer --big-test --testcase-timeout=60   --comment=rpl-gtid --vardir=var-rpl-gtid --suite=rpl --mysqld=--enforce-gtid-consistency --mysqld=--gtid-mode=on --no-skip
@@ -101,7 +101,7 @@
 perl mysql-test-run.pl --comment=all-binlogformat-mix --vardir=var-binlogformat-mix --force --timer --debug-server  --suite=auth_sec,clone,collations,connection_control,encryption,federated,funcs_1,funcs_2,gcol,sysschema,gis,innodb,innodb_fts,innodb_gis,innodb_undo,innodb_zip,json,main,opt_trace,parts,perfschema,query_rewrite_plugins,secondary_engine,service_status_var_registration,service_sys_var_registration,service_udf_registration,sys_vars,test_service_sql_api,test_services,x --mysqld=--binlog_format=mixed
 
 ## Running default suites other than rpl and binlog with skip-log-bin and skip-log-replica-updates
-perl mysql-test-run.pl --comment=all-skiplogbin --vardir=var-skiplogbin --force --timer --debug-server  --suite=auth_sec,clone,collations,connection_control,encryption,federated,funcs_1,funcs_2,gcol,sysschema,gis,innodb,innodb_fts,innodb_gis,innodb_undo,innodb_zip,json,main,opt_trace,parts,perfschema,query_rewrite_plugins,secondary_engine,service_status_var_registration,service_sys_var_registration,service_udf_registration,sys_vars,test_service_sql_api,test_services,x --mysqld=--skip-log-bin --mysqld=--skip-log-replica-updates
+perl mysql-test-run.pl --comment=all-skiplogbin --vardir=var-skiplogbin --force --timer --debug-server  --suite=auth_sec,clone,collations,connection_control,encryption,federated,funcs_1,funcs_2,gcol,sysschema,gis,innodb,innodb_fts,innodb_gis,innodb_undo,innodb_zip,json,main,opt_trace,parts,perfschema,query_rewrite_plugins,secondary_engine,service_status_var_registration,service_sys_var_registration,service_udf_registration,sys_vars,test_service_sql_api,test_services,x --mysqld=--skip-log-bin --mysqld=--skip-log-replica-updates --mysqld=--replica-preserve-commit-order=0
 ######END OF SECTION (DEFAULT SUITES (EXTENDED-WEEKLY))######################
 
 
@@ -156,10 +156,13 @@
 #
 perl mysql-test-run.pl --force --debug-server --timer   --comment=rpl_row_table_scan --vardir=var-rpl_row_table_scan --mysqld=--binlog-format=row --do-suite=rpl --mysqld=--slave-rows-search-algorithms=TABLE_SCAN,INDEX_SCAN --big-test --testcase-timeout=60  --no-skip
 
-perl mysql-test-run.pl --debug-server --timer --force  --comment=rpl_row_table_MTS --vardir=var-mts-rpl-table-n_mix --mysqld=--binlog-format=row  --mysqld=--replica-parallel-workers=4 --do-suite=rpl --mysqld=--slave-rows-search-algorithms=TABLE_SCAN,INDEX_SCAN --no-skip
+perl mysql-test-run.pl --debug-server --timer --force  --comment=rpl_row_table_STA --vardir=var-sta-rpl-table-n_mix --mysqld=--binlog-format=row  --mysqld=--replica-parallel-workers=0 --do-suite=rpl --mysqld=--slave-rows-search-algorithms=TABLE_SCAN,INDEX_SCAN --no-skip
 
-# binlog-transaction-dependency-tracking=WRITESET with MTS slave-parellel-type=logical-clock
-perl mysql-test-run.pl --timer --force --big-test --testcase-timeout=60 --debug-server  --comment=rpl_MTS-lc-binlog-txn-dependency-tracking --vardir=var-rpl-MTS-lc-binlog-txn-dependency-tracking --do-suite=rpl   --mysqld=--binlog-format=row --mysqld=--replica-parallel-workers=4 --mysqld=--replica-parallel-type=logical_clock  --no-skip --mysqld=--binlog-transaction-dependency-tracking=WRITESET
+# binlog-transaction-dependency-tracking=WRITESET with MTA replica-parellel-type=logical_clock
+perl mysql-test-run.pl --timer --force --big-test --testcase-timeout=60 --debug-server  --comment=rpl_MTA-lc-binlog-txn-dependency-tracking --vardir=var-rpl-MTA-lc-binlog-txn-dependency-tracking --do-suite=rpl --mysqld=--binlog-format=row --no-skip --mysqld=--binlog-transaction-dependency-tracking=WRITESET
+
+# Rpl suite with MTA replica-parallel-type=logical_clock and replica-preserve-commit-order=0
+perl mysql-test-run.pl --debug-server --timer --force --big-test --testcase-timeout=60  --comment=rpl-mta-lc-norpco --vardir=var-rpl-mta-lc-norpco  --mysqld=--replica-parallel-workers=4 --mysqld=--replica-parallel-type=logical_clock --mysqld=--replica-preserve-commit-order=0 --do-suite=rpl --no-skip
 
 # Rpl suite with Transaction-writeset-extraction disabled
 perl mysql-test-run.pl --debug-server --force --timer --big-test --testcase-timeout=60   --comment=rpl_without_txn_write_set_extraction --vardir=var-rpl_txn_write_set_extraction_disabled --suite=rpl,rpl_gtid,rpl_nogtid  --mysqld=--transaction-write-set-extraction=OFF --no-skip
@@ -176,6 +179,10 @@
 
 # Replication with privilege checking for replication applier
 perl mysql-test-run.pl --debug-server --force --timer --big-test --testcase-timeout=60 --comment=rpl_priv_checks_user --vardir=var-rpl_priv_checks_user  --do-suite=rpl  --defaults-extra-file=include/rpl_priv_checks_user_no_dynamic_grants.cnf --no-skip
+
+# rpl and rpl_gtid suites with GTID_ONLY=1 and MTA
+perl mysql-test-run.pl --debug-server --force --timer --big-test --testcase-timeout=60 --comment=rpl_gtid_only_mta --vardir=var-rpl_gtid_only_mta  --suite=rpl,rpl_gtid  --defaults-extra-file=include/rpl_gtid_only_on.cnf --mysqld=--binlog-format=ROW  --mysqld=--replica-parallel-workers=4 --mysqld=--enforce-gtid-consistency --mysqld=--gtid-mode=on --no-skip
+
 ###########END OF SECTION 7 RPL/BINLOG EXTENDED-WEEKLY#############
 
 ####SECTION 8 GR EXTENDED-WEEKLY#############
@@ -185,12 +192,16 @@
 #GR with loose-group_replication_gtid_assignment_block_size=1
 perl mysql-test-run.pl --timer --force --parallel=6 --comment=group_replication_gtid_assignment_block_size_1 --vardir=var-gr_gtid_assignment_block_size_1 --suite=group_replication  --big-test --testcase-timeout=60 --suite-timeout=360 --mysqld=--loose-group_replication_gtid_assignment_block_size=1
 
-#GR with MTS
-perl mysql-test-run.pl --timer --force --parallel=6 --comment=group_replication_parallel_applier --vardir=var-gr_parallel_applier --suite=group_replication  --big-test --testcase-timeout=60 --suite-timeout=360 --mysqld=--replica-parallel-workers=4 --mysqld=--replica-parallel-type=logical_clock --mysqld=--replica_preserve_commit_order=ON
-perl mysql-test-run.pl --timer --force --parallel=6 --comment=group_replication_parallel_applier_binlog-txn-dependency-tracking --vardir=var-gr_parallel_applier_binlog-txn-dependency-tracking --suite=group_replication  --big-test --testcase-timeout=60 --suite-timeout=360 --mysqld=--replica-parallel-workers=4 --mysqld=--replica-parallel-type=logical_clock --mysqld=--replica_preserve_commit_order=ON --mysqld=--binlog-transaction-dependency-tracking=WRITESET
+#GR with STA
+perl mysql-test-run.pl --timer --force --parallel=6 --comment=group_replication_sta --vardir=var-gr_sta --suite=group_replication  --big-test --testcase-timeout=60 --suite-timeout=360 --mysqld=--replica-parallel-workers=0
+perl mysql-test-run.pl --timer --force --parallel=6 --comment=group_replication_parallel_applier_binlog-txn-dependency-tracking --vardir=var-gr_parallel_applier_binlog-txn-dependency-tracking --suite=group_replication  --big-test --testcase-timeout=60 --suite-timeout=360 --mysqld=--binlog-transaction-dependency-tracking=WRITESET
 
 #GR with group_replication_ssl_mode = REQUIRED
 perl mysql-test-run.pl --timer --force --parallel=6 --comment=group_replication_ssl_mode_required --vardir=var-gr_ssl_mode_required --suite=group_replication  --big-test --testcase-timeout=60 --suite-timeout=360 --mysqld=--loose-group_replication_ssl_mode=REQUIRED
+
+#GR with group_replication_ssl_mode = REQUIRED and MySQL Stack
+perl mysql-test-run.pl --timer --force --parallel=6 --comment=group_replication_ssl_mode_required_mysql --vardir=var-gr_ssl_mode_required_mysql --suite=group_replication  --big-test --testcase-timeout=60 --suite-timeout=360 --mysqld=--loose-group_replication_ssl_mode=REQUIRED --mysqld=--loose-group_replication_communication_stack=MySQL
+
 #
 # b) DEBUG
 #
@@ -198,8 +209,11 @@
 #GR with loose-group_replication_gtid_assignment_block_size=1 on debug build
 perl mysql-test-run.pl --timer --debug-server --force --parallel=6 --comment=group_replication_gtid_assignment_block_size_1-debug --vardir=var-gr_gtid_assignment_block_size_1-debug --suite=group_replication  --big-test --testcase-timeout=60 --suite-timeout=360 --mysqld=--loose-group_replication_gtid_assignment_block_size=1
 
-#GR with MTS on debug build
-perl mysql-test-run.pl --timer --debug-server --force --parallel=6 --comment=group_replication_parallel_applier-debug --vardir=var-gr_parallel_applier-debug --suite=group_replication  --big-test --testcase-timeout=60 --suite-timeout=360 --mysqld=--replica-parallel-workers=4 --mysqld=--replica-parallel-type=logical_clock --mysqld=--replica_preserve_commit_order=ON
+#GR with MySQL Stack on debug build
+perl mysql-test-run.pl --timer --debug-server --force --parallel=6 --comment=group_replication_mysql-debug --vardir=var-group_replication_mysql-debug --suite=group_replication  --big-test --testcase-timeout=60 --suite-timeout=360 --mysqld=--loose-group_replication_communication_stack=MySQL
+
+#GR with STA on debug build
+perl mysql-test-run.pl --timer --debug-server --force --parallel=6 --comment=group_replication-debug --vardir=var-gr-debug --suite=group_replication  --big-test --testcase-timeout=60 --suite-timeout=360 --mysqld=--replica-parallel-workers=0
 perl mysql-test-run.pl --timer --debug-server --force --parallel=6 --comment=group_replication_ssl_mode_required-debug --vardir=var-gr_ssl_mode_required-debug --suite=group_replication  --big-test --testcase-timeout=60 --suite-timeout=360 --mysqld=--loose-group_replication_ssl_mode=REQUIRED
 
 #GR with group_replication_ssl_mode = REQUIRED on debug build
diff -Nru mysql-8.0-8.0.26/mysql-test/collections/default.weekly.basic mysql-8.0-8.0.27/mysql-test/collections/default.weekly.basic
--- mysql-8.0-8.0.26/mysql-test/collections/default.weekly.basic	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/collections/default.weekly.basic	2021-09-28 11:46:34.000000000 +0000
@@ -38,5 +38,7 @@
 perl mysql-test-run.pl --timer --debug-server --force --parallel=6 --comment=group_replication-debug --vardir=var-group_replication-debug --suite=group_replication
 # Run the big tests only on 32-bit EL6 RPM
 perl mysql-test-run.pl --timer --debug-server --force --parallel=6 --only-big-test --testcase-timeout=60 --suite-timeout=360 --comment=group_replication-debug-big --vardir=var-group_replication-debug-big --suite=group_replication --platform=el6-x86-32bit
+# Run the default suites with the hypergraph optimizer
+perl mysql-test-run.pl --debug-server --force --timer --testcase-timeout=60 --comment=hypergraph-debug --vardir=var-hyp-default --hypergraph --no-skip --skip-ndb
 ######END OF SECTION 2 (NON-DEFAULT SUITES)######################
 
diff -Nru mysql-8.0-8.0.26/mysql-test/collections/disabled.def mysql-8.0-8.0.27/mysql-test/collections/disabled.def
--- mysql-8.0-8.0.26/mysql-test/collections/disabled.def	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/collections/disabled.def	2021-09-28 11:46:34.000000000 +0000
@@ -18,7 +18,6 @@
 audit_null.audit_plugin_bugs : BUG#28080637 Test fails consistently
 
 # auth_sec
-auth_sec.openssl_without_fips : BUG#28812609 Test fails all over
 
 # binlog suite tests
 binlog.binlog_mysqlbinlog_rewrite_db @windows     : BUG#26717205 Requires a debug client binary and fails consistently.
@@ -41,6 +40,7 @@
 innodb.log_first_rec_group                        : Bug#29692047 Disable for now until we can find a better way to test this.
 innodb.fts_exec_interrupt                         : Bug#28534199 The test is unstable and should be rewritten
 innodb.slow_shutdown                              : Bug#31763837 mtr hits this debug assert post test run cleanup
+innodb.upgrade_fts_aux                            : Bug#33034679 Test needs an upgrade of its 5.7 data files
 
 # keyring tests
 keyring_encrypted_file.keyring_migration_bugs @darwin : Bug#31041633
@@ -75,9 +75,10 @@
 perfschema.idx_compare_rwlock_instances : BUG#31791537
 
 # rpl_gtid suite tests
-rpl_gtid.rpl_gtid_delete_memory_table_after_start_server : BUG#24351040
+rpl_gtid.rpl_gtid_truncate_memory_table_after_start_server : BUG#24351040
 rpl_gtid.rpl_gtid_perfschema_applier_xa_status           : BUG#27914287 Disabled until the WL#9075 (Performance Schema, XA Transactions) be implemented
 rpl_gtid.rpl_gtid_mts_spco_deadlock_other_locks          : Bug#32499883 RPL_GTID.RPL_GTID_MTS_SPCO_DEADLOCK_OTHER_LOCKS FAILS ON PB2
+rpl_gtid.rpl_start_replica_until_pos_with_gtid_only      : Bug#33119241 START REPLICA UNTIL SOURCE_LOG_POS SHOULD NOT STOP ON REPLICA EVENTS
 
 # rpl_nogtid suite tests
 rpl_nogtid.rpl_perfschema_applier_xa_status_check : BUG#27914287 Disabled until the WL#9075 (Performance Schema, XA Transactions) be implemented
@@ -94,3 +95,12 @@
 sysschema.v_wait_classes_global_by_avg_latency : BUG#21550054 Test fails too often.
 
 # x plugin suite tests
+
+# Group Replication tests.
+
+# These will only run in XCom because of the following issue:
+group_replication.gr_join_with_suspect_member : BUG#31704262 XCOM CREATES NODES WITH PAST GHOST VIEWS
+group_replication.gr_leave_with_suspect_member : BUG#31704262 XCOM CREATES NODES WITH PAST GHOST VIEWS
+group_replication.gr_majority_loss_restored_after_timeout : BUG#31704262 XCOM CREATES NODES WITH PAST GHOST VIEWS
+group_replication.gr_suspect_member_resumes_after_crash_join_retries : BUG#32458239 GR_SUSPECT_MEMBER_RESUMES_AFTER_CRASH_JOIN_RETRIES IS NOT STABLE
+
diff -Nru mysql-8.0-8.0.26/mysql-test/collections/disabled_ndb.def mysql-8.0-8.0.27/mysql-test/collections/disabled_ndb.def
--- mysql-8.0-8.0.26/mysql-test/collections/disabled_ndb.def	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/collections/disabled_ndb.def	2021-09-28 11:46:34.000000000 +0000
@@ -48,6 +48,3 @@
 
 # Problem with upper case database names with lower_case_table_names = 2
 ndb.ndb_database_lctn @darwin: Bug#30455400 INCORRECT SCHEMA NAME PASSED TO HA_BINLOG_LOG_QUERY DURING ALTER DATABASE
-
-# Test can run when binlog thread supports error handling
-ndb_binlog.handle_data_event_fail : Bug#27150740 HANDLE_DATA_EVENT ERROR HANDLING
diff -Nru mysql-8.0-8.0.26/mysql-test/collections/mysql-8.0-stage.push mysql-8.0-8.0.27/mysql-test/collections/mysql-8.0-stage.push
--- mysql-8.0-8.0.26/mysql-test/collections/mysql-8.0-stage.push	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/collections/mysql-8.0-stage.push	2021-09-28 11:46:34.000000000 +0000
@@ -20,8 +20,8 @@
 perl mysql-test-run.pl --timer  --force  --comment=innodb_4k --vardir=var-innodb-4k  --suite=innodb_undo,innodb_zip,innodb --initialize=--innodb-page-size=4k --no-skip --max-test-fail=30
 perl mysql-test-run.pl --timer  --force  --comment=innodb_64k --vardir=var-innodb-64k  --suite=innodb_undo,innodb_zip,innodb --initialize=--innodb-page-size=64k --no-skip --max-test-fail=30
 
-# Additional modes for rpl. Multi-Threaded Slave
-perl mysql-test-run.pl --timer  --force  --comment=rpl_binlog_n_mix_MTS --vardir=var-mts-rpl-binlog-n_mix --mysqld=--binlog-format=mixed  --mysqld=--replica-parallel-workers=4 --suite=rpl,rpl_gtid,rpl_nogtid --no-skip --max-test-fail=30
+# Additional modes for rpl. Single-Threaded Applier
+perl mysql-test-run.pl --timer  --force  --comment=rpl_binlog_n_mix_STA --vardir=var-sta-rpl-binlog-n_mix --mysqld=--binlog-format=mixed  --mysqld=--replica-parallel-workers=0 --suite=rpl,rpl_gtid,rpl_nogtid --no-skip --max-test-fail=30
 
 # Run the suites that are not part of the default - funcs_1, funcs_2, stress, jp, nist
 perl mysql-test-run.pl --force --timer --testcase-timeout=60     --comment=funcs1  --vardir=var-funcs1 --suite=funcs_1 --no-skip --max-test-fail=30
diff -Nru mysql-8.0-8.0.26/mysql-test/collections/mysql-trunk-stage.push mysql-8.0-8.0.27/mysql-test/collections/mysql-trunk-stage.push
--- mysql-8.0-8.0.26/mysql-test/collections/mysql-trunk-stage.push	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/collections/mysql-trunk-stage.push	2021-09-28 11:46:34.000000000 +0000
@@ -20,8 +20,8 @@
 perl mysql-test-run.pl --timer  --force  --comment=innodb_4k --vardir=var-innodb-4k  --suite=innodb_undo,innodb_zip,innodb --initialize=--innodb-page-size=4k --no-skip --max-test-fail=30
 perl mysql-test-run.pl --timer  --force  --comment=innodb_64k --vardir=var-innodb-64k  --suite=innodb_undo,innodb_zip,innodb --initialize=--innodb-page-size=64k --no-skip --max-test-fail=30
 
-# Additional modes for rpl. Multi-Threaded Slave
-perl mysql-test-run.pl --timer  --force  --comment=rpl_binlog_n_mix_MTS --vardir=var-mts-rpl-binlog-n_mix --mysqld=--binlog-format=mixed  --mysqld=--replica-parallel-workers=4 --suite=rpl,rpl_gtid,rpl_nogtid --no-skip --max-test-fail=30
+# Additional modes for rpl. Single-Threaded Applier
+perl mysql-test-run.pl --timer  --force  --comment=rpl_binlog_n_mix_STA --vardir=var-sta-rpl-binlog-n_mix --mysqld=--binlog-format=mixed  --mysqld=--replica-parallel-workers=0 --suite=rpl,rpl_gtid,rpl_nogtid --no-skip --max-test-fail=30
 
 # Run the suites that are not part of the default - funcs_1, funcs_2, stress, jp, nist
 perl mysql-test-run.pl --force --timer --testcase-timeout=60     --comment=funcs1  --vardir=var-funcs1 --suite=funcs_1 --no-skip --max-test-fail=30
diff -Nru mysql-8.0-8.0.26/mysql-test/extra/binlog_tests/blackhole.test mysql-8.0-8.0.27/mysql-test/extra/binlog_tests/blackhole.test
--- mysql-8.0-8.0.26/mysql-test/extra/binlog_tests/blackhole.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/extra/binlog_tests/blackhole.test	2021-09-28 11:46:34.000000000 +0000
@@ -98,6 +98,7 @@
 
 # nl search
 
+--sorted_result
 select * from t1 where MATCH(a,b) AGAINST ("collections");
 explain select * from t1 where MATCH(a,b) AGAINST ("collections");
 select * from t1 where MATCH(a,b) AGAINST ("indexes");
diff -Nru mysql-8.0-8.0.26/mysql-test/extra/rpl_tests/restart_slave_with_custom_connection_info_repo_file.inc mysql-8.0-8.0.27/mysql-test/extra/rpl_tests/restart_slave_with_custom_connection_info_repo_file.inc
--- mysql-8.0-8.0.26/mysql-test/extra/rpl_tests/restart_slave_with_custom_connection_info_repo_file.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/extra/rpl_tests/restart_slave_with_custom_connection_info_repo_file.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,71 @@
+# ==== Purpose ====
+#
+# This file restarts a server after replacing its connection info repository file
+#
+# ==== Usage ====
+#
+# --let $sub_testcase= <sub testcase name>
+#
+# Parameters:
+#  $replica_server_num
+#    The number of the replica server for which operations in this script
+#    are to be performed.
+#  $repo_info_file_path
+#    The repository file with path included
+#  $rpl_server_restart_parameters
+#    The parameters passed to the server on start
+#  $sub_testcase
+#    The test case name for which file repo is to be prepared.
+
+--write_file $MYSQL_TMP_DIR/create_file_repo_with_no_gitd_only.inc END_OF_PROCEDURE
+  --write_file $repo_info_file_path
+32
+master-bin.000001
+156
+127.0.0.1
+root
+
+13000
+1
+0
+
+
+
+
+
+0
+30.000
+
+0
+6b3ce8fe-81b7-11eb-b24e-001cbfe2e6a4
+10
+
+
+0
+
+
+
+0
+
+uncompressed
+3
+
+0
+EOF
+END_OF_PROCEDURE
+
+--let $rpl_server_number = $slave_server_num
+--let $rpl_force_stop=1
+--source include/rpl_stop_server.inc
+--remove_file $repo_info_file_path
+
+if ($sub_testcase == no_gtid_only) {
+  --source $MYSQL_TMP_DIR/create_file_repo_with_no_gitd_only.inc
+}
+
+--let $rpl_server_parameters= $rpl_server_restart_parameters
+
+--let $explicit_default_wait_counter = 15000
+--source include/rpl_start_server.inc
+
+--remove_file $MYSQL_TMP_DIR/create_file_repo_with_no_gitd_only.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/extra/rpl_tests/restart_slave_with_custom_relaylog_repo_file.inc mysql-8.0-8.0.27/mysql-test/extra/rpl_tests/restart_slave_with_custom_relaylog_repo_file.inc
--- mysql-8.0-8.0.26/mysql-test/extra/rpl_tests/restart_slave_with_custom_relaylog_repo_file.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/extra/rpl_tests/restart_slave_with_custom_relaylog_repo_file.inc	2021-09-28 11:46:34.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # ==== Usage ====
 #
-# --sub_testcase= <sub testcase name>
+# --let $sub_testcase= <sub testcase name>
 #
 # Parameters:
 #  $slave_server_num
diff -Nru mysql-8.0-8.0.26/mysql-test/extra/rpl_tests/rpl_create_select.inc mysql-8.0-8.0.27/mysql-test/extra/rpl_tests/rpl_create_select.inc
--- mysql-8.0-8.0.26/mysql-test/extra/rpl_tests/rpl_create_select.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/extra/rpl_tests/rpl_create_select.inc	2021-09-28 11:46:34.000000000 +0000
@@ -15,6 +15,9 @@
 #    to apply the binlog from last recovery point and then we should be
 #    able to see the table.
 #
+# R3 Verify that executing CREATE TABLE ... SELECT with sql mode set
+#    to ANSI gets replicated to slave. This test is added for Bug#33064062.
+#
 # ==== Implementation ====
 #
 # 1) Create table t0 on the master and insert a record.
@@ -81,7 +84,7 @@
 --let $rpl_server_number= 2
 --source include/rpl_start_server.inc
 --disable_reconnect
-SET global DEBUG='-d, crash_on_transactional_ddl_insert';
+# Debug point disappeared on restart
 
 --let $assert_text= Make sure there is only table 't0' in schema 'test'.
 let $assert_cond= [SELECT count(table_name) COUNT FROM
@@ -110,4 +113,25 @@
 --echo # Cleanup
 --source include/rpl_connection_master.inc
 DROP TABLE t0,t1;
+--source include/sync_slave_sql_with_master.inc
+
+--echo #
+--echo # R3 Verify that executing CREATE TABLE ... SELECT with sql mode set
+--echo #    to ANSI gets replicated to slave. This test is added for Bug#33064062.
+--echo #
+
+--source include/rpl_connection_master.inc
+SET @orig_sql_mode_session= @@SESSION.sql_mode;
+SET SESSION sql_mode='ANSI';
+CREATE TABLE t1 AS SELECT 1;
+
+--source include/sync_slave_sql_with_master.inc
+--let $diff_tables=master:t1, slave:t1
+--source include/diff_tables.inc
+
+--source include/rpl_connection_master.inc
+SET SESSION sql_mode= @orig_sql_mode_session;
+DROP TABLE t1;
+--source include/sync_slave_sql_with_master.inc
+
 --source include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/extra/rpl_tests/rpl_extra_col_master.test mysql-8.0-8.0.27/mysql-test/extra/rpl_tests/rpl_extra_col_master.test
--- mysql-8.0-8.0.26/mysql-test/extra/rpl_tests/rpl_extra_col_master.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/extra/rpl_tests/rpl_extra_col_master.test	2021-09-28 11:46:34.000000000 +0000
@@ -695,6 +695,9 @@
 
 connection slave;
 
+# Execute RESET REPLICA before calling rpl_reset.inc
+# To avoid failure in MTS and rpl-priv_checks_user runs
+RESET REPLICA;
 # reset master and slave and start slave
 --let $rpl_only_running_threads= 1
 --source include/rpl_reset.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/extra/rpl_tests/rpl_loaddata.test mysql-8.0-8.0.27/mysql-test/extra/rpl_tests/rpl_loaddata.test
--- mysql-8.0-8.0.26/mysql-test/extra/rpl_tests/rpl_loaddata.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/extra/rpl_tests/rpl_loaddata.test	2021-09-28 11:46:34.000000000 +0000
@@ -170,6 +170,11 @@
 connection master;
 drop table t1, t2;
 
+connection slave;
+# Execute RESET REPLICA before calling rpl_reset.inc
+# To avoid failure in MTS and rpl-priv_checks_user runs
+--source include/stop_slave_io.inc
+RESET REPLICA;
 # BUG#48297: Schema name is ignored when LOAD DATA is written into binlog,
 # replication aborts
 -- let $rpl_only_running_threads= 1
diff -Nru mysql-8.0-8.0.26/mysql-test/extra/rpl_tests/rpl_parallel_recovery_core.test mysql-8.0-8.0.27/mysql-test/extra/rpl_tests/rpl_parallel_recovery_core.test
--- mysql-8.0-8.0.26/mysql-test/extra/rpl_tests/rpl_parallel_recovery_core.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/extra/rpl_tests/rpl_parallel_recovery_core.test	2021-09-28 11:46:34.000000000 +0000
@@ -49,10 +49,12 @@
 eval SET @@global.innodb_lock_wait_timeout=$innodb_wait_timeout;
 SET @save.replica_transaction_retries= @@global.replica_transaction_retries;
 SET @@global.replica_transaction_retries= 0;
+SET @save_replica_preserve_commit_order= @@global.replica_preserve_commit_order;
 SET @save.max_relay_log_size= @@global.max_relay_log_size;
 --eval SET @@global.max_relay_log_size=$relay_log_size
 
 --source include/stop_slave_sql.inc
+SET GLOBAL replica_preserve_commit_order= OFF;
 --source include/start_slave_sql.inc
 
 --let $assert_text= the max size of relay log must be $relay_log_size
@@ -177,6 +179,8 @@
     eval SET @@global.innodb_lock_wait_timeout=$innodb_wait_timeout;
     SET @save.replica_transaction_retries= @@global.replica_transaction_retries;
     SET @@global.replica_transaction_retries= 0;
+    SET @save_replica_preserve_commit_order= @@global.replica_preserve_commit_order;
+    SET @@global.replica_preserve_commit_order=OFF;
     SET @save.max_relay_log_size= @@global.max_relay_log_size;
     SET @@global.max_relay_log_size=4096;
     if ($rpl_multi_source)
@@ -229,3 +233,7 @@
 SET @@global.innodb_lock_wait_timeout=@save.innodb_lock_wait_timeout;
 SET @@global.replica_transaction_retries= @save.replica_transaction_retries;
 SET @@global.max_relay_log_size= @save.max_relay_log_size;
+
+--source include/stop_slave_sql.inc
+SET @@global.replica_preserve_commit_order= @save_replica_preserve_commit_order;
+--source include/start_slave_sql.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/extra/rpl_tests/rpl_replica_start_after_clone_cleanup.inc mysql-8.0-8.0.27/mysql-test/extra/rpl_tests/rpl_replica_start_after_clone_cleanup.inc
--- mysql-8.0-8.0.26/mysql-test/extra/rpl_tests/rpl_replica_start_after_clone_cleanup.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/extra/rpl_tests/rpl_replica_start_after_clone_cleanup.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,56 @@
+# ==== Purpose ====
+#
+# The purpose of this script is to clean the setup from test file:
+#   rpl_replica_start_after_clone.inc
+#
+# ==== Usage ====
+#
+# This script uses no parameters. After you included
+#
+#--source extra/rpl_tests/rpl_replica_start_after_clone.inc
+#
+# You can this point do extra validations.
+# To clean the test setup you should invoke
+#
+#--source extra/rpl_tests/rpl_replica_start_after_clone_cleanup.inc
+#
+# ==== References ====
+#
+# Bug#29995256: PRIVILEGE_CHECKS_USER NOT CLONED FOR RECOVERY CHANNEL
+# WL#7491: GTID-based replication applier recovery and positioning
+#
+
+--echo #
+--echo # 5. Cleanup
+
+--let $rpl_connection_name= server_1
+--source include/rpl_connection.inc
+
+DROP TABLE test.t1;
+
+--source include/rpl_sync.inc
+
+--let $rpl_connection_name= server_2
+--source include/rpl_connection.inc
+
+UNINSTALL PLUGIN clone;
+
+--let $rpl_connection_name= server_3
+--source include/rpl_connection.inc
+
+STOP SLAVE;
+
+RESET SLAVE ALL;
+
+UNINSTALL PLUGIN clone;
+
+--source include/rpl_clear_priv_checks_user_configuration.inc
+
+--source include/clean_monitoring_process.inc
+
+SET SESSION sql_log_bin=0;
+call mtr.add_suppression("Clone removing all user data for provisioning: Started");
+call mtr.add_suppression("Clone removing all user data for provisioning: Finished");
+call mtr.add_suppression("Recovery from master pos [0-9]+ and file [a-zA-Z-]*\.*[0-9]* for channel ''*");
+call mtr.add_suppression("Relay log information for channel '' was found after a clone operation. Relay log recovery");
+SET SESSION sql_log_bin=1;
diff -Nru mysql-8.0-8.0.26/mysql-test/extra/rpl_tests/rpl_replica_start_after_clone.inc mysql-8.0-8.0.27/mysql-test/extra/rpl_tests/rpl_replica_start_after_clone.inc
--- mysql-8.0-8.0.26/mysql-test/extra/rpl_tests/rpl_replica_start_after_clone.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/extra/rpl_tests/rpl_replica_start_after_clone.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,103 @@
+# ==== Purpose ====
+#
+# The purpose of this script is to test if when correctly configured we
+# can clone a replica and it will start replicating on server start.
+#
+# ==== Usage ====
+#
+# This script uses no parameters, for its uses you can just include it.
+#
+#--source extra/rpl_tests/rpl_replica_start_after_clone.inc
+#
+# You can this point do extra validations.
+# To clean the test setup you should invoke
+#
+#--source extra/rpl_tests/rpl_replica_start_after_clone_cleanup.inc
+#
+# ==== Setup ====
+#
+# The scrip will configure server 3 to clone server 2 that is a replica
+# of server 1.
+# It then validates server 3 is replicating from server 1
+#
+# ==== Implementation ====
+#
+# 1. Create connections to server3
+# 2. Create a table for testing
+# 3. Install clone on server 2
+#    Configure server 3 to invoke clone
+# 4. Execute a transaction on server 1, check 3 received it
+#
+# ==== References ====
+#
+# Bug#29995256: PRIVILEGE_CHECKS_USER NOT CLONED FOR RECOVERY CHANNEL
+# WL#7491: GTID-based replication applier recovery and positioning
+#
+
+
+--echo #
+--echo # 1. Create connections to server3
+
+--connect(server_3,127.0.0.1,root,,test,$SERVER_MYPORT_3,)
+--connect(server_3_1,127.0.0.1,root,,test,$SERVER_MYPORT_3,)
+
+--echo #
+--echo # 2. Create a table for testing
+
+--let $rpl_connection_name= server_1
+--source include/rpl_connection.inc
+
+CREATE TABLE test.t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
+
+--source include/sync_slave_sql_with_master.inc
+
+--echo #
+--echo # 3. Install clone on server 2
+--echo #    Configure server 3 to invoke clone
+
+--let $rpl_connection_name= server_2
+--source include/rpl_connection.inc
+
+--replace_result $CLONE_PLUGIN CLONE_PLUGIN
+--eval INSTALL PLUGIN clone SONAME '$CLONE_PLUGIN'
+
+--let $rpl_connection_name= server_3
+--source include/rpl_connection.inc
+
+# Make server 3 run with mysqld_safe
+--source include/spawn_monitoring_process.inc
+
+# Install clone
+--replace_result $CLONE_PLUGIN CLONE_PLUGIN
+--eval INSTALL PLUGIN clone SONAME '$CLONE_PLUGIN'
+
+# Set the clone valid donor list to include server 2
+--replace_result $SERVER_MYPORT_2 SERVER2_PORT
+--eval SET GLOBAL clone_valid_donor_list = 'localhost:$SERVER_MYPORT_2'
+
+# Clone server 3 from server 2
+--replace_result $SERVER_MYPORT_2 SERVER2_PORT
+--eval CLONE INSTANCE FROM root@localhost:$SERVER_MYPORT_2 IDENTIFIED BY ''
+--source include/wait_until_disconnected.inc
+
+--let $rpl_server_number= 3
+--source include/rpl_reconnect.inc
+
+--echo #
+--echo # 4. Execute a transaction on server 1, check 3 received it
+
+--let $rpl_connection_name= server_1
+--source include/rpl_connection.inc
+
+INSERT INTO t1 VALUES (1);
+
+--let $sync_slave_connection= server_3
+--source include/sync_slave_sql_with_master.inc
+
+--let $rpl_connection_name= server_3
+--source include/rpl_connection.inc
+
+--let $server_1_data = `SELECT COUNT(*) FROM test.t1`
+--let $assert_text= All info from server 1 is present
+--let $assert_cond= $server_1_data = 1
+--source include/assert.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/extra/rpl_tests/rpl_row_jsondiff_error_scenario.inc mysql-8.0-8.0.27/mysql-test/extra/rpl_tests/rpl_row_jsondiff_error_scenario.inc
--- mysql-8.0-8.0.26/mysql-test/extra/rpl_tests/rpl_row_jsondiff_error_scenario.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/extra/rpl_tests/rpl_row_jsondiff_error_scenario.inc	2021-09-28 11:46:34.000000000 +0000
@@ -161,7 +161,6 @@
     --let $debug_point= $master_debug_symbol
     --let $debug_type= SESSION
     --source include/add_debug_point.inc
-    SELECT @@SESSION.DEBUG;
   }
   if ($use_mysqlbinlog) {
     --source include/save_binlog_position.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/extra/rpl_tests/rpl_stop_middle_group.test mysql-8.0-8.0.27/mysql-test/extra/rpl_tests/rpl_stop_middle_group.test
--- mysql-8.0-8.0.26/mysql-test/extra/rpl_tests/rpl_stop_middle_group.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/extra/rpl_tests/rpl_stop_middle_group.test	2021-09-28 11:46:34.000000000 +0000
@@ -5,9 +5,8 @@
 # The matter of testing correlates to some of `rpl_start_stop_slave' that does
 # not require `have_debug'.
 
-# Test group sematics and thereby failing in such group is bound to 
-# the Single-Threaded Slave. 
--- source include/not_mts_replica_parallel_workers.inc
+# Test group sematics and thereby failing in such group is bound to
+# the Single-Threaded Slave.
 -- source include/have_myisam.inc
 
 connection master;
@@ -24,12 +23,13 @@
 
 begin;
 insert into ti set a=null;
-insert into tm set a=null; # to simulate killed status on the slave 
+insert into tm set a=null; # to simulate killed status on the slave
 commit;
 
 connection slave;
 call mtr.add_suppression("Slave SQL.*Request to stop slave SQL Thread received while applying a group that has non-transactional changes; waiting for completion of the group");
 call mtr.add_suppression("Slave SQL.*Slave SQL Thread stopped with incomplete event group having non-transactional changes");
+call mtr.add_suppression("Slave SQL.*The slave coordinator and worker threads are stopped.*");
 
 # slave will catch the killed status but won't shut down immediately
 # only after the whole group has done (commit)
@@ -53,7 +53,7 @@
 --source include/assert.inc
 
 --source include/stop_slave.inc
-set @@global.debug="-d";
+set @@global.debug="-d,stop_replica_middle_group";
 
 #
 # bug#45940 issues around rli->last_event_start_time
@@ -92,8 +92,8 @@
 # slave will catch the killed status, won't shut down immediately
 # but does it eventually having the whole group unfinished (not committed)
 
-let $slave_sql_errno= 13117; # ER_SLAVE_FATAL_ERROR
---let $show_slave_sql_error= 1
+let $slave_sql_errno= 13117,1756; # ER_SLAVE_FATAL_ERROR, ER_MTS_INCONSISTENT_DATA
+--let $show_slave_sql_error= 0
 --source include/wait_for_slave_sql_error.inc
 
 # checking: the error and group unfinished
@@ -111,7 +111,8 @@
 --source include/assert.inc
 
 --source include/stop_slave.inc
-set @@global.debug="-d";
+set @@global.debug="-d,stop_replica_middle_group";
+set @@global.debug="-d,incomplete_group_in_relay_log";
 
 #
 # The mixed multi-table update
@@ -136,11 +137,11 @@
 
 # slave will catch the killed status, won't shut down immediately
 # but does it eventually having the whole group unfinished (not committed)
-# 
+#
 
-# checking: the error and group unfinished 
-let $slave_sql_errno= 13117; # ER_SLAVE_FATAL_ERROR
---let $show_slave_sql_error= 1
+# checking: the error and group unfinished
+let $slave_sql_errno= 13117,1756; # ER_SLAVE_FATAL_ERROR, ER_MTS_INCONSISTENT_DATA
+--let $show_slave_sql_error= 0
 --source include/wait_for_slave_sql_error.inc
 
 --let $assert_text= Not everything that was read, was executed
@@ -156,7 +157,8 @@
 --source include/assert.inc
 
 --source include/stop_slave.inc
-set @@global.debug="-d";
+set @@global.debug="-d,stop_replica_middle_group";
+set @@global.debug="-d,incomplete_group_in_relay_log";
 
 #
 # clean-up
diff -Nru mysql-8.0-8.0.26/mysql-test/include/add_debug_point.inc mysql-8.0-8.0.27/mysql-test/include/add_debug_point.inc
--- mysql-8.0-8.0.26/mysql-test/include/add_debug_point.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/add_debug_point.inc	2021-09-28 11:46:34.000000000 +0000
@@ -105,6 +105,20 @@
   --echo @@$_debug_type.debug was '$_to_display'
 }
 
+# If the current debug setting is already too big it might compromise the above checks
+# as the shown debug info will be cut and end with '...'
+# In this case we simply revert to the +d strategy
+if(`SELECT LENGTH(@@$_debug_type.debug) >= 512`)
+{
+  SET @before_debug_point="+d,";
+  --let $_debug_point= $debug_point
+  SET @after_debug_point='';
+  if ($rpl_debug)
+  {
+    --echo Warning: the current value for @@$_debug_type.debug is too big to be displayed.
+  }
+}
+
 --eval SET @@$_debug_type.debug=CONCAT(@before_debug_point, '$_debug_point', @after_debug_point)
 
 if ($rpl_debug)
diff -Nru mysql-8.0-8.0.26/mysql-test/include/common-tests.inc mysql-8.0-8.0.27/mysql-test/include/common-tests.inc
--- mysql-8.0-8.0.26/mysql-test/include/common-tests.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/common-tests.inc	2021-09-28 11:46:34.000000000 +0000
@@ -1413,6 +1413,10 @@
 #insert into tmp select * from t3;
 #insert into t3 select * from tmp;
 
+# Note: Use a single scan thread here to preserve the autoincrement value
+# to existing row order assignment. In practice there is no guarantee of
+# any such order during the alter table.
+set session innodb_parallel_read_threads=1;
 alter table t3 add t2nr int not null auto_increment primary key first;
 
 drop table tmp;
diff -Nru mysql-8.0-8.0.26/mysql-test/include/const_folding_dec_int.inc mysql-8.0-8.0.27/mysql-test/include/const_folding_dec_int.inc
--- mysql-8.0-8.0.26/mysql-test/include/const_folding_dec_int.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/const_folding_dec_int.inc	2021-09-28 11:46:34.000000000 +0000
@@ -182,8 +182,7 @@
 INSERT INTO t VALUES (18446744073709551.3);
 ANALYZE TABLE t;
 
---echo 0x constant too large; gets truncated to 0xFFFFFFFFFFFFFFFF
---echo i.e. 18446744073709551615.
+--echo 0x constant too large; gets truncated to zero
 let $query=SELECT * FROM t WHERE d <= 0x1FFFFFFFFFFFFFFFF;
 eval $query;
 eval EXPLAIN $query;
diff -Nru mysql-8.0-8.0.26/mysql-test/include/excludenoskip.list mysql-8.0-8.0.27/mysql-test/include/excludenoskip.list
--- mysql-8.0-8.0.26/mysql-test/include/excludenoskip.list	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/excludenoskip.list	2021-09-28 11:46:34.000000000 +0000
@@ -205,12 +205,20 @@
 only_mts_replica_parallel_type_logical_clock.inc
 only_mts_replica_parallel_type_database.inc
 not_mts_replica_parallel_workers.inc
+only_replica_preserve_commit_order.inc
 # 14.2 rpl misc files
 have_slave_repository_type_table.inc
 not_relay_log_info_file.inc
 not_master_info_file.inc
 have_transaction_write_set_extraction.inc
 
+#14.3 Some replication tests cannot run with GTID_ONLY == 1
+not_rpl_gtid_only.inc
+
+# 14.4 Generic RPL include file to skip a test if a variable is not
+# set to a specific value
+only_with_option.inc
+
 # 16.0 Thread stack overrun on debug/sparc when built with Developer Studio
 not_sparc_debug.inc
 # 16.1 Some MEB tests can't run on MacOS debug
@@ -286,8 +294,9 @@
 # disables wildcard grants at database level.
 not_partial_revokes.inc
 
-# 29. This file is used for skipping tests which cannot be run successfully
-# with the hypergraph optimizer yet.
+# 29. These files are used for skipping tests which cannot be run successfully
+# with the hypergraph optimizer yet, or need the hypergraph optimizer to run.
+have_hypergraph.inc
 not_hypergraph.inc
 
 # 30. Keyring_file component - can be skipped based on cmake configuration
diff -Nru mysql-8.0-8.0.26/mysql-test/include/gr_clear_configuration.inc mysql-8.0-8.0.27/mysql-test/include/gr_clear_configuration.inc
--- mysql-8.0-8.0.26/mysql-test/include/gr_clear_configuration.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/gr_clear_configuration.inc	2021-09-28 11:46:34.000000000 +0000
@@ -69,6 +69,9 @@
       }
     }
 
+    # Clear replication asynchronous failover configuration tables
+    --source include/rpl_clear_asynchronous_failover_configuration.inc
+
     # Clear GR member actions configuration
     --disable_result_log ONCE
     SELECT group_replication_reset_member_actions();
diff -Nru mysql-8.0-8.0.26/mysql-test/include/gr_configuration.inc mysql-8.0-8.0.27/mysql-test/include/gr_configuration.inc
--- mysql-8.0-8.0.26/mysql-test/include/gr_configuration.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/gr_configuration.inc	2021-09-28 11:46:34.000000000 +0000
@@ -16,6 +16,8 @@
 # Save current connection.
 --let $_old_connection= $CURRENT_CONNECTION
 
+#check which stack are we using
+--let $have_xcom_stack= `SELECT @@group_replication_communication_stack LIKE 'XCOM'`
 
 # Default values
 --let $_group_replication_group_seeds=
@@ -50,7 +52,15 @@
 --let $_rpl_server= $_rpl_gcs_server_number
 while ($_rpl_server)
 {
-  --let $_rpl_gcs_server_port= \$SERVER_GR_PORT_$_rpl_server
+  --let $_rpl_gcs_server_port=
+  if ($have_xcom_stack)
+  {
+    --let $_rpl_gcs_server_port= \$SERVER_GR_PORT_$_rpl_server
+  }
+  if (!$have_xcom_stack)
+  {
+    --let $_rpl_gcs_server_port= \$SERVER_MYPORT_$_rpl_server
+  }
 
   # Append comma to list of addresses.
   if ($_group_replication_group_seeds != "")
@@ -86,7 +96,15 @@
   }
 
   # Local address.
-  --let $_rpl_gcs_server_port= \$SERVER_GR_PORT_$_rpl_server
+  --let $_rpl_gcs_server_port=
+  if ($have_xcom_stack)
+  {
+    --let $_rpl_gcs_server_port= \$SERVER_GR_PORT_$_rpl_server
+  }
+  if (!$have_xcom_stack)
+  {
+    --let $_rpl_gcs_server_port= \$SERVER_MYPORT_$_rpl_server
+  }
   --let $_group_replication_local_address= $_rpl_gcs_server_address:$_rpl_gcs_server_port
 
   # Set configuration on server.
diff -Nru mysql-8.0-8.0.26/mysql-test/include/have_fips.inc mysql-8.0-8.0.27/mysql-test/include/have_fips.inc
--- mysql-8.0-8.0.26/mysql-test/include/have_fips.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/have_fips.inc	2021-09-28 11:46:34.000000000 +0000
@@ -1,4 +1,4 @@
-# Only run this test if fips enabled openssl library is installed.
+# Only run this test if OpenSSL FIPS is enabled.
 if (!$OPENSSL_FIPS_INSTALLED) {
-  --skip openssl is not build with fips modue, fips functionality is not supported. or env OPENSSL_FIPS_INSTALLED not set.
+  --skip The OpenSSL library in use is not built with FIPS module support.
 }
diff -Nru mysql-8.0-8.0.26/mysql-test/include/have_group_replication_mysql_communication_stack.inc mysql-8.0-8.0.27/mysql-test/include/have_group_replication_mysql_communication_stack.inc
--- mysql-8.0-8.0.26/mysql-test/include/have_group_replication_mysql_communication_stack.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/have_group_replication_mysql_communication_stack.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,10 @@
+# ==== Purpose ====
+#
+# Ensure that group replication is running using MySQL protocol stack
+#
+
+--let $_have_mysql_stack= `SELECT @@group_replication_communication_stack LIKE 'MYSQL'`
+if (!$_have_mysql_stack)
+{
+  --skip Test requires MySQL Protocol Stack configured in Group Replication
+}
\ No newline at end of file
diff -Nru mysql-8.0-8.0.26/mysql-test/include/have_group_replication_xcom_communication_stack.inc mysql-8.0-8.0.27/mysql-test/include/have_group_replication_xcom_communication_stack.inc
--- mysql-8.0-8.0.26/mysql-test/include/have_group_replication_xcom_communication_stack.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/have_group_replication_xcom_communication_stack.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,10 @@
+# ==== Purpose ====
+#
+# Ensure that group replication is running using MySQL protocol stack
+#
+
+--let $_have_xcom_stack= `SELECT @@group_replication_communication_stack LIKE 'XCOM'`
+if (!$_have_xcom_stack)
+{
+  --skip Test requires XCom Protocol Stack configured in Group Replication
+}
\ No newline at end of file
diff -Nru mysql-8.0-8.0.26/mysql-test/include/have_hypergraph.inc mysql-8.0-8.0.27/mysql-test/include/have_hypergraph.inc
--- mysql-8.0-8.0.26/mysql-test/include/have_hypergraph.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/have_hypergraph.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,16 @@
+# include/have_hypergraph.inc
+#
+# Enable use of the hypergraph optimizer in the current connection if
+# it is available. Skip the test if mysqld was built without support
+# for the hypergraph optimizer.
+
+--disable_query_log
+--disable_warnings
+
+--error 0, ER_HYPERGRAPH_NOT_SUPPORTED_YET
+SET optimizer_switch = 'hypergraph_optimizer=on';
+if (`SELECT NOT FIND_IN_SET('hypergraph_optimizer=on', @@optimizer_switch)`) {
+   --skip Test requires binaries built with WITH_HYPERGRAPH_OPTIMIZER=ON
+}
+--enable_warnings
+--enable_query_log
diff -Nru mysql-8.0-8.0.26/mysql-test/include/keyring_tests/innodb/tablespace_encrypt_8.inc mysql-8.0-8.0.27/mysql-test/include/keyring_tests/innodb/tablespace_encrypt_8.inc
--- mysql-8.0-8.0.26/mysql-test/include/keyring_tests/innodb/tablespace_encrypt_8.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/keyring_tests/innodb/tablespace_encrypt_8.inc	2021-09-28 11:46:34.000000000 +0000
@@ -12,7 +12,7 @@
 let $restart_parameters = restart: $PLUGIN_DIR_OPT --performance-schema-consumer-events-stages-current=ON --performance-schema-events-stages-history-size=1000;
 --source include/restart_mysqld_no_echo.inc
 
-SET SESSION debug= '+d,BtrBulk_insert_inject_error';
+SET SESSION debug= '+d,ddl_btree_build_insert_return_interrupt';
 
 --echo
 --echo #########
diff -Nru mysql-8.0-8.0.26/mysql-test/include/keyring_tests/mats/clone_local_encrypt.inc mysql-8.0-8.0.27/mysql-test/include/keyring_tests/mats/clone_local_encrypt.inc
--- mysql-8.0-8.0.26/mysql-test/include/keyring_tests/mats/clone_local_encrypt.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/keyring_tests/mats/clone_local_encrypt.inc	2021-09-28 11:46:34.000000000 +0000
@@ -34,21 +34,19 @@
 
 if(!$page_compression) {
 --echo # In connection default - starting clone
-# Validate that redo and undo encryption cannot be set when clone in progress. */
+# Validate that redo and undo encryption can be set when clone in progress. */
 SET DEBUG_SYNC = 'clone_file_copy SIGNAL set_encryption WAIT_FOR resume_clone';
 --source clone_command_send.inc
 
 connect (con1,localhost,root,,);
---echo # In connection con1 - Trying to set redo and undo encryption
+--echo # In connection con1 - Set redo and undo encryption
 SET DEBUG_SYNC = 'now WAIT_FOR set_encryption';
 
 SHOW VARIABLES LIKE 'innodb_redo_log_encrypt';
---error ER_CLONE_IN_PROGRESS
 SET GLOBAL innodb_redo_log_encrypt = ON;
 SHOW VARIABLES LIKE 'innodb_redo_log_encrypt';
 
 SHOW VARIABLES LIKE 'innodb_undo_log_encrypt';
---error ER_CLONE_IN_PROGRESS
 SET GLOBAL innodb_undo_log_encrypt = ON;
 SHOW VARIABLES LIKE 'innodb_undo_log_encrypt';
 
@@ -59,6 +57,8 @@
 --reap
 disconnect con1;
 --force-rmdir $CLONE_DATADIR
+SET GLOBAL innodb_redo_log_encrypt = OFF;
+SET GLOBAL innodb_undo_log_encrypt = OFF;
 }
 
 # Modify the schema and add compressed table
diff -Nru mysql-8.0-8.0.26/mysql-test/include/master-slave.inc mysql-8.0-8.0.27/mysql-test/include/master-slave.inc
--- mysql-8.0-8.0.26/mysql-test/include/master-slave.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/master-slave.inc	2021-09-28 11:46:34.000000000 +0000
@@ -20,6 +20,7 @@
 #   [--let $rpl_privilege_checks_user_additional_grants= CREATE,INSERT,SELECT]
 #   [--let $rpl_require_row_format= *:0,1:0,2:1]
 #   [--let $rpl_require_table_primary_key_check= *:STREAM,1:ON,2:OFF]
+#   [--let $rpl_gtid_only= *:0,1:0,2:1]
 #   [--let $rpl_shallow_reset_slave= 1]
 #   --source include/master-slave.inc
 #
diff -Nru mysql-8.0-8.0.26/mysql-test/include/mtr_check.sql mysql-8.0-8.0.27/mysql-test/include/mtr_check.sql
--- mysql-8.0-8.0.26/mysql-test/include/mtr_check.sql	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/mtr_check.sql	2021-09-28 11:46:34.000000000 +0000
@@ -209,6 +209,7 @@
     mysql.default_roles,
     mysql.db,
     mysql.func,
+    mysql.general_log,
     mysql.global_grants,
     mysql.help_category,
     mysql.help_keyword,
@@ -221,6 +222,7 @@
     mysql.replication_group_configuration_version,
     mysql.replication_group_member_actions,
     mysql.role_edges,
+    mysql.slow_log,
     mysql.tables_priv,
     mysql.time_zone,
     mysql.time_zone_leap_second,
diff -Nru mysql-8.0-8.0.26/mysql-test/include/mtr_warnings.sql mysql-8.0-8.0.27/mysql-test/include/mtr_warnings.sql
--- mysql-8.0-8.0.26/mysql-test/include/mtr_warnings.sql	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/mtr_warnings.sql	2021-09-28 11:46:34.000000000 +0000
@@ -197,7 +197,7 @@
  ("slave SQL thread aborted"),
  ("Slave: .*Duplicate entry"),
 
- /* 
+ /*
     innodb_dedicated_server warning which raised if innodb_buffer_pool_size,
     innodb_log_file_size or innodb_flush_method is specified.
  */
@@ -312,6 +312,12 @@
  ("Members removed from the group.*"),
  ("Error while sending message for group replication recovery"),
  ("Slave SQL for channel 'group_replication_recovery': ... The slave coordinator and worker threads are .*"),
+ ("A message intended for a client cannot be sent there as no client-session is attached. Therefore, we're sending the information to the error-log instead: MY-001160 - Got an error writing communication packets.*"),
+ ("A message intended for a client cannot be sent there as no client-session is attached. Therefore, we're sending the information to the error-log instead: MY-001158 - Got an error reading communication packets.*"),
+ ("Failed to establish MySQL client connection in Group Replication.*."),
+ ("\\[GCS\\] client closed the signalling connection .*"),
+ ("\\[GCS\\] local_server: client closed the signalling connection.*"),
+ ("\\[GCS\\] local_server: error reading from the signalling connection.*"),
 
  /*
    Warnings/errors related to SSL connection by mysqlx
diff -Nru mysql-8.0-8.0.26/mysql-test/include/not_have_fips.inc mysql-8.0-8.0.27/mysql-test/include/not_have_fips.inc
--- mysql-8.0-8.0.26/mysql-test/include/not_have_fips.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/not_have_fips.inc	2021-09-28 11:46:34.000000000 +0000
@@ -1,4 +1,4 @@
-# Only run this test if fips enabled openssl library is not installed.
+# Only run this test if OpenSSL FIPS is *not* enabled.
 if ($OPENSSL_FIPS_INSTALLED) {
-  --skip system is installed with fips openssl library.
+  --skip The OpenSSL library in use is built with FIPS module support.
 }
diff -Nru mysql-8.0-8.0.26/mysql-test/include/not_rpl_gtid_only.inc mysql-8.0-8.0.27/mysql-test/include/not_rpl_gtid_only.inc
--- mysql-8.0-8.0.26/mysql-test/include/not_rpl_gtid_only.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/not_rpl_gtid_only.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,9 @@
+if ( $rpl_gtid_only != '' )
+{
+  --skip Test cannot run with replication option GTID_ONLY == 1;
+}
+
+if ( $GTID_ONLY != '' )
+{
+  --skip Test cannot run with replication option GTID_ONLY == 1;
+}
diff -Nru mysql-8.0-8.0.26/mysql-test/include/only_replica_preserve_commit_order.inc mysql-8.0-8.0.27/mysql-test/include/only_replica_preserve_commit_order.inc
--- mysql-8.0-8.0.26/mysql-test/include/only_replica_preserve_commit_order.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/only_replica_preserve_commit_order.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,5 @@
+--let $option = query_get_value(SHOW VARIABLES LIKE "%replica_preserve_commit_order%", Value, 1)
+if ($option == 'OFF')
+{
+  --skip The test is compatible only with replica_preserve_commit_order=ON
+}
diff -Nru mysql-8.0-8.0.26/mysql-test/include/order_by.inc mysql-8.0-8.0.27/mysql-test/include/order_by.inc
--- mysql-8.0-8.0.26/mysql-test/include/order_by.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/order_by.inc	2021-09-28 11:46:34.000000000 +0000
@@ -810,7 +810,8 @@
 EXPLAIN SELECT id,c3 FROM t2 WHERE c2 BETWEEN 10 AND 12 ORDER BY c3 LIMIT 20;
 EXPLAIN SELECT id,c3 FROM t2 WHERE c2 BETWEEN 20 AND 30 ORDER BY c3 LIMIT 4000;
 
-SELECT id,c3 FROM t2 WHERE c2=11 ORDER BY c3 LIMIT 20;
+--partially_sorted_result 1
+SELECT c3,id FROM t2 WHERE c2=11 ORDER BY c3 LIMIT 20;
 
 DROP TABLE t1,t2;
 
@@ -1375,7 +1376,7 @@
 --enable_query_log
 
 INSERT INTO t3 SELECT * FROM t1;
-
+ANALYZE TABLE t1, t2, t3;
 EXPLAIN
 SELECT d FROM t1, t2
 WHERE t2.b=14 AND t2.a=t1.a AND 5.1<t2.c AND t1.b='DE'
diff -Nru mysql-8.0-8.0.26/mysql-test/include/persist_only_variables.sql mysql-8.0-8.0.27/mysql-test/include/persist_only_variables.sql
--- mysql-8.0-8.0.26/mysql-test/include/persist_only_variables.sql	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/persist_only_variables.sql	2021-09-28 11:46:34.000000000 +0000
@@ -52,7 +52,7 @@
 set @@persist_only.innodb_sync_array_size=1;
 set @@persist_only.innodb_use_native_aio=1;
 set @@persist_only.innodb_write_io_threads=4;
-set @@persist_only.log_replica_updates=0;
+set @@persist_only.log_replica_updates=1;
 set @@persist_only.max_digest_length=1024;
 set @@persist_only.myisam_recover_options='OFF';
 set @@persist_only.ngram_token_size=2;
diff -Nru mysql-8.0-8.0.26/mysql-test/include/ps_query.inc mysql-8.0-8.0.27/mysql-test/include/ps_query.inc
--- mysql-8.0-8.0.26/mysql-test/include/ps_query.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/ps_query.inc	2021-09-28 11:46:34.000000000 +0000
@@ -437,9 +437,13 @@
 execute stmt1 using @arg00, @arg01, @arg02, @arg03 ;
 
 # Bug#8807
+# Will give different warnings depending on the order the join conditions
+# are evaluated in.
+--disable_warnings
 prepare stmt1 from 'select c4 FROM t9 where
     c13 = (select MAX(b) from t1 where a = ?) and c22 = ? ' ;
 execute stmt1 using @arg01, @arg02;
+--enable_warnings
 
 ######## correlated subquery
 # no parameter
diff -Nru mysql-8.0-8.0.26/mysql-test/include/range.inc mysql-8.0-8.0.27/mysql-test/include/range.inc
--- mysql-8.0-8.0.26/mysql-test/include/range.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/range.inc	2021-09-28 11:46:34.000000000 +0000
@@ -1865,6 +1865,7 @@
         ) 
       )
 ;
+--disable_warnings
 SET UNIQUE_CHECKS = 0;
 SET FOREIGN_KEY_CHECKS = 0;
 sorted_result;
@@ -1877,7 +1878,7 @@
 sorted_result;
 eval SELECT * FROM t2
      WHERE (field1, field2) IN ($query);
-
+--enable_warnings
 DROP TABLE t1, t2;
 
 --echo #
@@ -2565,11 +2566,15 @@
 --echo # Bug #21318711: WRONG RESULTS FOR TRUNCATED COLUMN AND AGGREGATION
 --echo #
 
+# Use a PAD SPACE collation (utf8mb4_bin) to preserve test coverage
+# for the original bug. The test case for Bug#33282123 provides
+# coverage for NO PAD collations.
+
 CREATE TABLE t1 (
-  col1 VARCHAR(5),
+  col1 VARCHAR(5) CHARSET utf8mb4 COLLATE utf8mb4_bin,
   col2 INT NOT NULL,
   PRIMARY KEY (col1, col2)
-) ENGINE=InnoDB, CHARSET utf8mb4;
+);
 
 INSERT INTO t1 VALUES ('abcde', 10);
 
@@ -2584,7 +2589,9 @@
 eval EXPLAIN $query1;
 eval EXPLAIN $query2;
 
+# No row with col1='abcdeaa'. Expect NULL.
 eval $query1;
+# col1='abcde  ' matches 'abcde' because of PAD SPACE. Expect non-NULL.
 eval $query2;
 
 DROP TABLE t1;
@@ -3060,8 +3067,109 @@
 
 # Test if adjacent ranges when rounded off to the same value by range
 # optimizer return correct results. Note that range scan is not chosen as the
-# final range would be 0 < id <= 0 which is "where true". So range optimizer
+# final range would be 0 < f1 <= 0 which is "where true". So range optimizer
 # will not have any range to work on.
 SELECT f1,f2 FROM t WHERE f1 NOT IN(-0.1,0.1);
 
 DROP TABLE t;
+
+--echo #
+--echo # Bug#32523520: OPTIMIZER LOSES PART OF RANGE WHEN OR MULTIPLE
+--echo #	       IDENTICAL RANGES IN RANGE PLAN
+--echo #
+
+CREATE TABLE t1( a INTEGER, b INTEGER, c INTEGER,
+ d VARCHAR(10), PRIMARY KEY (a, b, c));
+INSERT INTO t1 VALUES (1, 1, 1, 'a'), (2, 2, 2,'b'), (3, 3, 3, 'c');
+
+#Should pick range index scan
+EXPLAIN SELECT * FROM t1 FORCE INDEX (PRIMARY) WHERE (a=1 AND b=1 AND c=1)
+ OR (a=1 AND b=1 AND c=1) OR (a=1 AND b=2 AND c=2);
+
+SELECT * FROM t1 FORCE INDEX (PRIMARY) WHERE (a=1 AND b=1 AND c=1)
+ OR (a=1 AND b=1 AND c=1) OR (a=1 AND b=2 AND c=2);
+
+DROP TABLE t1;
+
+--echo #
+--echo # Bug #31870920: WRONG RESULT WHEN SELECT INT COLUMN WITH RANGE
+--echo #
+
+CREATE TABLE t1(f1 INTEGER, KEY(f1));
+INSERT INTO t1 VALUES(0),(0),(0);
+ANALYZE TABLE t1;
+
+# Test if adjacent ranges for a nullable column when rounded off to the
+# same value by range optimizer return correct results. Note that range
+# scan is not chosen as the final range would be 0 < f1 <= 0 which is
+# "where true". So range optimizer will not have any range to work on.
+
+EXPLAIN SELECT f1 FROM t1 WHERE f1 NOT IN (0.1, -0.1);
+SELECT f1 FROM t1 WHERE f1 NOT IN (0.1, -0.1);
+
+DROP TABLE t1;
+
+--echo #
+--echo # Bug#33067554: INDEX_MERGE: ASSERTION FAILURE:
+--echo #               ROW0SEL.CC:5584:PREBUILT->CAN_PREFETCH_RECORDS() ||
+--echo #               RECORD_BUFFER == NULLPTR
+--echo #
+
+CREATE TABLE t (
+  a INTEGER,
+  b INTEGER,
+  pk TEXT NOT NULL,
+  PRIMARY KEY (pk(110)),
+  KEY (a),
+  KEY (b)
+);
+
+INSERT INTO t VALUES
+  (51,16777216,''), (-128,0,' nsj  mizb'),
+  (0,5900842,' qdblp vgc'), (0,-128,'c  z'),
+  (-1,-125,'d'), (95,3345,'dtphyrp'),
+  (97,14396343,'du'), (127,0,'fnwyz'),
+  (-128,0,'fszpsqd'), (-128,32767,'g uevfc'),
+  (-128,0,'hh  lhozu '), (0,0,'m tkr'),
+  (0,246,'mgmtel'), (-1,2147483647,'n  hjh'),
+  (127,0,'ssw'), (127,0,'t zl'), (0,-1,'uns');
+
+ANALYZE TABLE t;
+
+SELECT b FROM t WHERE a = 0 AND b = 0;
+
+DROP TABLE t;
+
+--echo # Bug#17769777 EXCESSIVE MEMORY CONSUMPTION WITH MANY AND / BETWEEN
+--echo #              ITEMS
+--echo # Bug#17413040 USING MANY WHERE CONDITIONS MAKES RANGE SCAN DISABLED
+
+CREATE TABLE t1 (
+a INT,
+b INT,
+KEY (a)
+)ENGINE=INNODB;
+
+INSERT INTO t1 VALUES (0, 0), (1, 1), (2, 2), (3, 3), (4, 4), (5, 5), (6, 6),
+(7, 7), (8, 8), (9, 9);
+
+ANALYZE TABLE t1;
+SET RANGE_OPTIMIZER_MAX_MEM_SIZE= 100;
+EXPLAIN SELECT DISTINCT a FROM t1 WHERE (a, b) IN ((0, 0), (1, 1));
+SET RANGE_OPTIMIZER_MAX_MEM_SIZE= DEFAULT;
+EXPLAIN SELECT DISTINCT a FROM t1 WHERE (a, b) IN ((0, 0), (1, 1));
+
+DROP TABLE t1;
+
+--echo # End of test for Bug#17769777 and Bug#17413040
+
+--echo #
+--echo # Bug#33282123: Const table optimization for aggregates goes wrong with
+--echo #               NO PAD collations
+--echo #
+
+CREATE TABLE t1 (col1 VARCHAR(5), col2 INTEGER, PRIMARY KEY (col1, col2));
+INSERT INTO t1 VALUES ('abcde', 10);
+--echo # Used to return 10. The expected result is NULL.
+SELECT MAX(col2) FROM t1 WHERE col1 = 'abcde  ';
+DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/include/remove_debug_point.inc mysql-8.0-8.0.27/mysql-test/include/remove_debug_point.inc
--- mysql-8.0-8.0.26/mysql-test/include/remove_debug_point.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/remove_debug_point.inc	2021-09-28 11:46:34.000000000 +0000
@@ -13,7 +13,7 @@
 #
 # Parameters:
 #   $debug_point
-#     The debug point to be activated.
+#     The debug point to be removed.
 #
 #   $debug_point_silent
 #     By default, this script prints the name of the debug point. If
@@ -43,7 +43,7 @@
 }
 if ( `SELECT UPPER('$_debug_type') <> 'GLOBAL' AND UPPER('$_debug_type') <> 'SESSION'` )
 {
-  --die ERROR IN TEST: invalid value for mysqltest variable 'debug_type': $debug_type
+  --die ERROR IN TEST: invalid value for mysqltest variable 'debug_type'. It must be either GLOBAL or SESSION
 }
 if (!$debug_point)
 {
@@ -70,7 +70,11 @@
 {
   if (`SELECT @new_debug = @previous_debug`)
   {
-    --die ERROR IN TEST: the debug point '$debug_point' was not found
+    # Long debug entries don't allow this check
+    if(`SELECT LENGTH(@@$_debug_type.debug) < 512`)
+    {
+      --die ERROR IN TEST: the debug point to be removed was not found
+    }
   }
 }
 
@@ -86,6 +90,18 @@
   --echo @@$_debug_type.debug was '$_to_display'
 }
 
+# If the current debug setting is already too big it might compromise the above checks
+# as the shown debug info will be cut and end with '...'
+# In this case we revert to the -d strategy
+if(`SELECT LENGTH(@@$_debug_type.debug) >= 512`)
+{
+  --eval SET @new_debug="-d,$debug_point";
+  if ($rpl_debug)
+  {
+    --echo Warning: the current value for @@$_debug_type.debug is too big to be displayed so some checks were ommited
+  }
+}
+
 --eval SET @@$_debug_type.debug=@new_debug
 
 if ($rpl_debug)
diff -Nru mysql-8.0-8.0.26/mysql-test/include/rpl_change_topology_helper.inc mysql-8.0-8.0.27/mysql-test/include/rpl_change_topology_helper.inc
--- mysql-8.0-8.0.26/mysql-test/include/rpl_change_topology_helper.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/rpl_change_topology_helper.inc	2021-09-28 11:46:34.000000000 +0000
@@ -16,6 +16,7 @@
 # [--let $rpl_privilege_checks_user_dont_create_user= 0]
 # [--let $rpl_privilege_checks_user_additional_grants= CREATE,INSERT,SELECT]
 # [--let $rpl_require_row_format= *:0,1:0,2:1]
+# [--let $rpl_gtid_only= *:0,1:0,2:1]
 # --let $rpl_source_file= rpl_change_topology_helper.inc
 # --source include/rpl_for_each_connection.inc
 #
@@ -78,6 +79,36 @@
   # Get port number
   --let $_rpl_change_topology_helper_port= \$SERVER_MYPORT_$rpl_master
 
+  # Get GTID_ONLY for current `$rpl_slave`
+  --let $_rpl_change_topology_helper_gtid_only_index= `SELECT LOCATE('$rpl_slave:', "$rpl_gtid_only")`
+  --let $_rpl_change_topology_helper_gtid_only = 0
+
+  if ($_rpl_change_topology_helper_gtid_only_index)
+  {
+
+    --let $_rpl_change_topology_helper_gtid_only= `SELECT SUBSTRING_INDEX(SUBSTRING_INDEX(SUBSTRING("$rpl_gtid_only", $_rpl_change_topology_helper_gtid_only_index), ',', 1), ':', -1)`
+  }
+
+
+
+  # Get GTID_ONLY for all replicas
+  if (`SELECT $_rpl_change_topology_helper_gtid_only_index = 0 AND "$_rpl_change_topology_gtid_only_all" != ""`)
+  {
+    --let $_rpl_change_topology_helper_gtid_only= $_rpl_change_topology_gtid_only_all
+  }
+
+  # GTID_ONLY can only be enabled if GTID_MODE==1, SOURCE_AUTO_POSITION==1, REQUIRE_ROW_FORMAT==1
+  # When GTID_ONLY is enabled and source-parallel-workers == 0 then source-parallel-workers is set to 1
+  if ($_rpl_change_topology_helper_gtid_only == 1)
+  {
+    --source include/assert_gtid_mode_on.inc
+    --let $use_gtids= 1
+    --source include/have_binlog_format_row.inc
+    --source include/only_mts_replica_parallel_workers.inc
+  }
+
+
+
   # Configure whether we use AUTO_POSITION.
   if ($use_gtids)
   {
@@ -133,8 +164,12 @@
   {
     --let $_rpl_change_topology_helper_require_row= $_rpl_change_topology_require_row_all
   }
+
+
   --let $_rpl_change_topology_helper_position= $_rpl_change_topology_helper_position REQUIRE_ROW_FORMAT = $_rpl_change_topology_helper_require_row,
 
+  --let $_rpl_change_topology_helper_position= $_rpl_change_topology_helper_position GTID_ONLY = $_rpl_change_topology_helper_gtid_only,
+
   # Get REQUIRE_TABLE_PRIMARY_KEY_CHECK for current `$rpl_slave`
   --let $_rpl_change_topology_helper_require_table_primary_key_check_index= `SELECT LOCATE('$rpl_slave:', "$rpl_require_table_primary_key_check")`
   --let $_rpl_change_topology_helper_require_table_primary_key_check = -1
diff -Nru mysql-8.0-8.0.26/mysql-test/include/rpl_change_topology.inc mysql-8.0-8.0.27/mysql-test/include/rpl_change_topology.inc
--- mysql-8.0-8.0.26/mysql-test/include/rpl_change_topology.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/rpl_change_topology.inc	2021-09-28 11:46:34.000000000 +0000
@@ -38,6 +38,7 @@
 # [--let $rpl_privilege_checks_user_dont_create_user= 0]
 # [--let $rpl_privilege_checks_user_additional_grants= CREATE,INSERT,SELECT]
 # [--let $rpl_require_row_format= *:0,1:0,2:1]
+# [--let $rpl_gtid_only= *:0,1:0,2:1]
 # --source include/rpl_change_topology.inc
 #
 # Parameters:
@@ -140,6 +141,18 @@
 #
 #       --let $rpl_require_table_primary_key_check= *:ON
 #
+#   $rpl_gtid_only
+#     Include `GTID_ONLY` option in the `CHANGE REPLICATION SOURCE TO ...`
+#     statement to be executed. For example, to specify that server_1 should
+#     have the flag enabled and server_5 shouldn't, do:
+#
+#       --let $rpl_gtid_only= 1:1,5:0
+#
+#     To specify that all nodes have the flag enabled, do:
+#
+#       --let $rpl_gtid_only= *:1
+
+#
 # ==== Internal variables configured by this file ====
 #
 # This file sets up the following variables, which are used by other
@@ -269,6 +282,25 @@
   --let $_rpl_change_topology_privilege_checks_all= `SELECT SUBSTRING_INDEX(SUBSTRING_INDEX(SUBSTRING("$rpl_privilege_checks_user", $_rpl_change_topology_privilege_checks_all_index), ',', 1), ':', -1)`
 }
 
+--source include/rpl_gtid_only_configuration.inc
+
+--let $_rpl_change_topology_gtid_only_all_index= `SELECT LOCATE('*:', "$rpl_gtid_only")`
+if ($_rpl_change_topology_gtid_only_all_index)
+{
+  --let $_rpl_change_topology_gtid_only_all= `SELECT SUBSTRING_INDEX(SUBSTRING_INDEX(SUBSTRING("$rpl_gtid_only", $_rpl_change_topology_gtid_only_all_index), ',', 1), ':', -1)`
+}
+
+# In order to enable GTID_ONLY, REQUIRE_ROW must be enabled
+
+if ($rpl_gtid_only)
+{
+  --let $rpl_topology_override_variable = $rpl_require_row_format
+  --let $rpl_topology_with_variable = $rpl_gtid_only
+  --let $rpl_topology_when_override_value = 1
+  --source include/rpl_change_topology_merge_variables.inc
+  --let $rpl_require_row_format = $rpl_topology_overriden_result
+}
+
 --let $_rpl_change_topology_require_row_all_index= `SELECT LOCATE('*:', "$rpl_require_row_format")`
 if ($_rpl_change_topology_require_row_all_index)
 {
diff -Nru mysql-8.0-8.0.26/mysql-test/include/rpl_change_topology_merge_variables.inc mysql-8.0-8.0.27/mysql-test/include/rpl_change_topology_merge_variables.inc
--- mysql-8.0-8.0.26/mysql-test/include/rpl_change_topology_merge_variables.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/rpl_change_topology_merge_variables.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,89 @@
+# ==== Purpose ====
+#
+# The purpose of this utility script is to override the values of a
+# topology include typical parameter of the form `1:2, 3:a, 4:off, *:on,
+# ...` with the values of another topology script parameter, when the
+# values for the latter match a specific value.
+#
+# ==== Usage ====
+#
+# --let $rpl_topology_override_variable =
+# --let $rpl_topology_with_variable =
+# --let $rpl_topology_when_override_value =
+# --let $rpl_server_count =
+# --source include/save_sysvars.inc
+#
+# Parameters:
+#
+#  $rpl_topology_override_variable
+#    The variable to be overriden, on the form `1:2, 3:a, 4:off, *:on, ...`
+#
+#  $rpl_topology_with_variable
+#    The variable to get the override values from, on the form `1:2, 3:a,
+#    4:off, *:on, ...`
+#
+#  $rpl_topology_when_override_value
+#    The value to look for in `$rpl_topology_with_variable` to trigger an
+#    override in `$rpl_topology_override_variable`
+#
+#  $rpl_server_count
+#    Number of servers in the topology
+#
+# Output:
+#
+#  $rpl_topology_overriden_result
+#    The result from overriden the `$rpl_topology_override_variable` with
+#    the values in `$rpl_topology_with_variable` that match
+#    `$rpl_topology_override_value`
+#
+#
+
+if ($rpl_topology_with_variable == '') {
+  --die ERROR IN TEST: The $rpl_topology_with_variable parameter must be set
+}
+
+if ($rpl_topology_when_override_value == '') {
+  --die ERROR IN TEST: The $rpl_topology_when_override_value parameter must be set
+}
+
+if ($rpl_server_count == '') {
+  --die ERROR IN TEST: The $rpl_server_count parameter must be set
+}
+
+--let $_overriden_variable =
+
+--let $_override_index = `SELECT LOCATE('*:$rpl_topology_when_override_value', '$rpl_topology_with_variable')`
+--let $_overriden_index = `SELECT LOCATE('*:', '$rpl_topology_override_variable')`
+if ($_override_index) {
+  --let $_override_value = `SELECT SUBSTRING_INDEX(SUBSTRING_INDEX(SUBSTRING('$rpl_topology_with_variable', $_override_index), ',', 1), ':', -1)`
+  --let $_overriden_variable = *:$_override_value
+}
+if (`SELECT NOT($_override_index) AND $_overriden_index`) {
+  --let $_override_value = `SELECT SUBSTRING_INDEX(SUBSTRING_INDEX(SUBSTRING('$rpl_topology_override_variable', $_overriden_index), ',', 1), ':', -1)`
+  --let $_overriden_variable = *:$_override_value
+}
+
+--let $_conn_count = $rpl_server_count
+while($_conn_count != 0) {
+  --let $_override_index = `SELECT LOCATE('$_conn_count:$rpl_topology_when_override_value', '$rpl_topology_with_variable')`
+  --let $_overriden_index = `SELECT LOCATE('$_conn_count:', '$rpl_topology_override_variable')`
+
+  if ($_override_index) {
+    if ($_overriden_variable != '') {
+      --let $_overriden_variable = $_overriden_variable,
+    }
+    --let $_override_value = `SELECT SUBSTRING_INDEX(SUBSTRING_INDEX(SUBSTRING('$rpl_topology_with_variable', $_override_index), ',', 1), ':', -1)`
+    --let $_overriden_variable = $_overriden_variable $_conn_count:$_override_value
+  }
+  if (`SELECT NOT($_override_index) AND $_overriden_index`) {
+    if ($_overriden_variable != '') {
+      --let $_overriden_variable = $_overriden_variable,
+    }
+    --let $_override_value = `SELECT SUBSTRING_INDEX(SUBSTRING_INDEX(SUBSTRING('$rpl_topology_override_variable', $_overriden_index), ',', 1), ':', -1)`
+    --let $_overriden_variable = $_overriden_variable $_conn_count:$_override_value
+  }
+
+  --dec $_conn_count
+}
+
+--let $rpl_topology_overriden_result = $_overriden_variable
diff -Nru mysql-8.0-8.0.26/mysql-test/include/rpl_clear_asynchronous_failover_configuration.inc mysql-8.0-8.0.27/mysql-test/include/rpl_clear_asynchronous_failover_configuration.inc
--- mysql-8.0-8.0.26/mysql-test/include/rpl_clear_asynchronous_failover_configuration.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/rpl_clear_asynchronous_failover_configuration.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,18 @@
+# ==== Purpose ====
+#
+# Clear replication asynchronous failover configuration tables
+# on the current connection.
+#
+# ==== Usage ====
+#
+# --source include/rpl_clear_asynchronous_failover_configuration.inc
+#
+
+--let $include_filename= rpl_clear_asynchronous_failover_configuration.inc
+--source include/begin_include_file.inc
+
+--disable_query_log ONCE
+--disable_result_log ONCE
+SELECT asynchronous_connection_failover_reset();
+
+--source include/end_include_file.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/include/rpl_diff.inc mysql-8.0-8.0.27/mysql-test/include/rpl_diff.inc
--- mysql-8.0-8.0.26/mysql-test/include/rpl_diff.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/rpl_diff.inc	2021-09-28 11:46:34.000000000 +0000
@@ -113,7 +113,7 @@
 
   # Execute statement
   --let $_rpl_diff_file= $MYSQLTEST_VARDIR/tmp/_rpl_diff_server-$_rpl_diff_server_i.tmp
-  --exec $MYSQL --defaults-group-suffix=.$_rpl_diff_server_i $_rpl_diff_database < $_rpl_diff_statement_file > $_rpl_diff_file
+  --exec $EXE_MYSQL --defaults-group-suffix=.$_rpl_diff_server_i $MYSQL_OPTIONS $_rpl_diff_database < $_rpl_diff_statement_file > $_rpl_diff_file
 
   # Compare
   if (!$_rpl_diff_first)
diff -Nru mysql-8.0-8.0.26/mysql-test/include/rpl_end.inc mysql-8.0-8.0.27/mysql-test/include/rpl_end.inc
--- mysql-8.0-8.0.26/mysql-test/include/rpl_end.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/rpl_end.inc	2021-09-28 11:46:34.000000000 +0000
@@ -132,25 +132,6 @@
   }
 }
 
-# Assert that replication asynchronous connection failover tables are properly
-# clean on the tests that do use them.
---let $_rpl_server= $rpl_server_count
-while ($_rpl_server)
-{
-  --let $rpl_connection_name= server_$_rpl_server
-  --source include/rpl_connection.inc
-
-  --let $assert_text= 'There are 0 rows in mysql.replication_asynchronous_connection_failover on server$_rpl_server'
-  --let $assert_cond= [SELECT COUNT(*) count FROM mysql.replication_asynchronous_connection_failover, count, 1] = 0
-  --source include/assert.inc
-
-  --let $assert_text= 'There are 0 rows in mysql.replication_asynchronous_connection_failover_managed on server$_rpl_server'
-  --let $assert_cond= [SELECT COUNT(*) count FROM mysql.replication_asynchronous_connection_failover_managed, count, 1] = 0
-  --source include/assert.inc
-
-  --dec $_rpl_server
-}
-
 if ($rpl_group_replication)
 {
   --let $_rpl_server= $rpl_server_count
@@ -218,6 +199,21 @@
   --let $rpl_change_topology_user_created=
 }
 
+# Clear replication asynchronous failover configuration tables
+if (!$rpl_group_replication)
+{
+  --let $_rpl_server= $rpl_server_count
+  while ($_rpl_server)
+  {
+    --let $rpl_connection_name= server_$_rpl_server
+    --source include/rpl_connection.inc
+
+    --source include/rpl_clear_asynchronous_failover_configuration.inc
+
+    --dec $_rpl_server
+  }
+}
+
 # Restore the server state by deleting all channels
 if ($rpl_multi_source)
 {
@@ -235,6 +231,38 @@
 
 # rpl_change_topology executes CHANGE REPLICATION SOURCE for each connection.
 # we restore the gtid state by sourcing rpl_change_topology below
+
+# Restore state for GTID_ONLY
+
+if ($rpl_gtid_only)
+{
+  --let $_rpl_server= $rpl_server_count
+  while ($_rpl_server)
+  {
+    --let $rpl_connection_name= server_$_rpl_server
+    --source include/rpl_connection.inc
+
+    --disable_query_log
+    if (!$rpl_multi_source)
+    {
+      CHANGE REPLICATION SOURCE TO GTID_ONLY = 0;
+    }
+    if ($rpl_multi_source)
+    {
+      if($rpl_channel_name)
+      {
+        eval CHANGE REPLICATION SOURCE TO GTID_ONLY = 0 FOR CHANNEL $rpl_channel_name;
+      }
+      if(!$rpl_channel_name)
+      {
+        CHANGE REPLICATION SOURCE TO GTID_ONLY = 0 FOR CHANNEL '';
+      }
+    }
+    --enable_query_log
+    --dec $_rpl_server
+  }
+}
+
 --let $use_gtids= 0
 --let $rpl_group_replication= 0
 
@@ -266,7 +294,21 @@
   if ($rpl_require_row_format)
   {
     --disable_query_log
-    CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT=0;
+    if (!$rpl_multi_source)
+    {
+      CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT=0;
+    }
+    if ($rpl_multi_source)
+    {
+      if($rpl_channel_name)
+      {
+        eval CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 0 FOR CHANNEL $rpl_channel_name;
+      }
+      if(!$rpl_channel_name)
+      {
+        CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 0 FOR CHANNEL '';
+      }
+    }
     --enable_query_log
   }
 
diff -Nru mysql-8.0-8.0.26/mysql-test/include/rpl_gtid_only_configuration.inc mysql-8.0-8.0.27/mysql-test/include/rpl_gtid_only_configuration.inc
--- mysql-8.0-8.0.26/mysql-test/include/rpl_gtid_only_configuration.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/rpl_gtid_only_configuration.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,40 @@
+# ==== Purpose ====
+# Configures replication option $rpl_gtid_only from ENV variable $GTID_ONLY.
+# This file is normally sourced by rpl_change_topology_helper.inc
+#
+# ==== Usage ====
+#  --source include/rpl_gtid_only_configuration.inc
+#
+# Parameters:
+#
+#  $skip_configuration_rpl_gtid_only.inc
+#     If set, do not use environment variables to configure value of GTID_ONLY
+#
+#
+#  $rpl_gtid_only
+#     Include `GTID_ONLY` option in the `CHANGE REPLICATION SOURCE TO ...`
+#     statement to be executed. For example, to specify that server_1 should
+#     have the flag enabled and server_5 shouldn't, do:
+#
+#       --let $rpl_gtid_only= 1:1,5:0
+#
+#     To specify that all nodes have the flag enabled, do:
+#
+#       --let $rpl_gtid_only= *:1
+#
+
+--let $include_filename= rpl_gtid_only_configuration.inc
+--source include/begin_include_file.inc
+
+if ($skip_configuration_rpl_gtid_only == '')
+{
+  # If parameter $rpl_gtid_only is not instantiated by the calling test script
+  # try to get their values from environment variables
+  if ($rpl_gtid_only == '')
+  {
+    --let $rpl_gtid_only= $GTID_ONLY
+  }
+}
+
+--let $include_filename= rpl_gtid_only_configuration.inc
+--source include/end_include_file.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/include/rpl_gtid_only_on.cnf mysql-8.0-8.0.27/mysql-test/include/rpl_gtid_only_on.cnf
--- mysql-8.0-8.0.26/mysql-test/include/rpl_gtid_only_on.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/rpl_gtid_only_on.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,5 @@
+# ==== Purpose ====
+# Enable the replication option GTID_ONLY
+
+[ENV]
+GTID_ONLY= *:1
diff -Nru mysql-8.0-8.0.26/mysql-test/include/rpl_init.inc mysql-8.0-8.0.27/mysql-test/include/rpl_init.inc
--- mysql-8.0-8.0.26/mysql-test/include/rpl_init.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/rpl_init.inc	2021-09-28 11:46:34.000000000 +0000
@@ -66,6 +66,7 @@
 #    [--let $rpl_privilege_checks_user_additional_grants= CREATE,INSERT,SELECT]
 #    [--let $rpl_require_row_format= *:0,1:0,2:1]
 #    [--let $rpl_require_table_primary_key_check= *:STREAM,1:ON,2:OFF]
+#    [--let $rpl_gtid_only= *:0,1:0,2:1]
 #    [--let $rpl_shallow_reset_slave= 1]
 #    --source include/rpl_init.inc
 #
@@ -162,6 +163,9 @@
 #   $rpl_require_table_primary_key_check
 #      See `include/rpl_change_topology.inc`.
 #
+#   $rpl_gtid_only
+#      See `include/rpl_change_topology.inc`.
+#
 #   $rpl_shallow_reset_slave
 #      If in the setup we shall only use RESET REPLICA and not RESET REPLICA ALL
 #
diff -Nru mysql-8.0-8.0.26/mysql-test/include/rpl_reset_slave_helper.inc mysql-8.0-8.0.27/mysql-test/include/rpl_reset_slave_helper.inc
--- mysql-8.0-8.0.26/mysql-test/include/rpl_reset_slave_helper.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/rpl_reset_slave_helper.inc	2021-09-28 11:46:34.000000000 +0000
@@ -9,6 +9,10 @@
     {
       CHANGE REPLICATION SOURCE TO PRIVILEGE_CHECKS_USER=NULL;
     }
+    if ($rpl_gtid_only)
+    {
+      CHANGE REPLICATION SOURCE TO GTID_ONLY=0;
+    }
     if ($rpl_require_row_format)
     {
       CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT=0;
@@ -21,6 +25,10 @@
     {
       eval CHANGE REPLICATION SOURCE TO PRIVILEGE_CHECKS_USER=NULL FOR CHANNEL $rpl_channel_name;
     }
+    if ($rpl_gtid_only)
+    {
+      eval CHANGE REPLICATION SOURCE TO GTID_ONLY=0 FOR CHANNEL $rpl_channel_name;
+    }
     if ($rpl_require_row_format)
     {
       eval CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT=0 FOR CHANNEL $rpl_channel_name;
diff -Nru mysql-8.0-8.0.26/mysql-test/include/select.inc mysql-8.0-8.0.27/mysql-test/include/select.inc
--- mysql-8.0-8.0.26/mysql-test/include/select.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/select.inc	2021-09-28 11:46:34.000000000 +0000
@@ -1412,6 +1412,8 @@
 #insert into tmp select * from t3;
 #insert into t3 select * from tmp;
 
+# The test assumes a 1-1 correspondence of autoinc values to  fields tested.
+set session innodb_parallel_read_threads = 1;
 alter table t3 add t2nr int not null auto_increment primary key first;
 
 drop table tmp;
diff -Nru mysql-8.0-8.0.26/mysql-test/include/show_json_object.inc mysql-8.0-8.0.27/mysql-test/include/show_json_object.inc
--- mysql-8.0-8.0.26/mysql-test/include/show_json_object.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/show_json_object.inc	2021-09-28 11:46:34.000000000 +0000
@@ -6,7 +6,7 @@
 
 --disable_query_log
 DELIMITER |;
-CREATE FUNCTION show_json_object(extract TEXT, trace TEXT)
+CREATE FUNCTION show_json_object(extract TEXT, trace LONGTEXT)
 RETURNS TEXT
 BEGIN
  DECLARE pos INT;
diff -Nru mysql-8.0-8.0.26/mysql-test/include/show_rpl_debug_info.inc mysql-8.0-8.0.27/mysql-test/include/show_rpl_debug_info.inc
--- mysql-8.0-8.0.26/mysql-test/include/show_rpl_debug_info.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/show_rpl_debug_info.inc	2021-09-28 11:46:34.000000000 +0000
@@ -138,6 +138,10 @@
     query_vertical
     SELECT * FROM performance_schema.replication_group_member_actions;
     --echo
+    --echo **** replication_group_communication_information on $CURRENT_CONNECTION ****
+    query_vertical
+    SELECT * FROM performance_schema.replication_group_communication_information;
+    --echo
     --echo **** group replication stages on $CURRENT_CONNECTION ****
     query_vertical
     SELECT * FROM performance_schema.events_stages_current WHERE event_name LIKE "%stage/group_rpl%";
diff -Nru mysql-8.0-8.0.26/mysql-test/include/skip_config_rpl_gtid_only.inc mysql-8.0-8.0.27/mysql-test/include/skip_config_rpl_gtid_only.inc
--- mysql-8.0-8.0.26/mysql-test/include/skip_config_rpl_gtid_only.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/skip_config_rpl_gtid_only.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1 @@
+--let $skip_configuration_rpl_gtid_only = 'skip'
diff -Nru mysql-8.0-8.0.26/mysql-test/include/spawn_monitoring_process.inc mysql-8.0-8.0.27/mysql-test/include/spawn_monitoring_process.inc
--- mysql-8.0-8.0.26/mysql-test/include/spawn_monitoring_process.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/spawn_monitoring_process.inc	2021-09-28 11:46:34.000000000 +0000
@@ -20,7 +20,6 @@
 let $have_windows = `SELECT CONVERT(@@version_compile_os using latin1) IN ("Win32", "Win64", "Windows")`;
 
 if (!$have_windows) {
-
   --disable_query_log
   SET SESSION sql_log_bin= 0;
   SET @auto_increment_increment_save= @@SESSION.auto_increment_increment;
@@ -40,10 +39,24 @@
    ORDER BY VARIABLE_NAME;
   if($rpl_group_replication)
   {
+    --let $gr_ssl_disabled= `SELECT @@group_replication_ssl_mode LIKE 'DISABLED'`
+    if(!$gr_ssl_disabled) {
+       INSERT INTO test.r_vars (var_name, var_value)
+         SELECT * FROM performance_schema.global_variables
+         WHERE VARIABLE_NAME LIKE 'ssl_ca'
+         OR VARIABLE_NAME LIKE 'ssl_cert'
+         OR VARIABLE_NAME LIKE 'ssl_key'
+         ORDER BY VARIABLE_NAME;
+    }
+
     INSERT INTO test.r_vars (var_name, var_value)
      SELECT * FROM performance_schema.global_variables
      WHERE VARIABLE_NAME LIKE 'group_replication_ssl_mode'
      OR VARIABLE_NAME LIKE 'group_replication_gtid_assignment_block_size'
+     OR VARIABLE_NAME LIKE 'group_replication_ssl_mode'
+     OR VARIABLE_NAME LIKE 'group_replication_recovery_ssl_ca'
+     OR VARIABLE_NAME LIKE 'group_replication_recovery_ssl_cert'
+     OR VARIABLE_NAME LIKE 'group_replication_recovery_ssl_key'
      ORDER BY VARIABLE_NAME;
   }
   --let $suite_mysqld_settings=
diff -Nru mysql-8.0-8.0.26/mysql-test/include/stop_slave_sql.inc mysql-8.0-8.0.27/mysql-test/include/stop_slave_sql.inc
--- mysql-8.0-8.0.26/mysql-test/include/stop_slave_sql.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/stop_slave_sql.inc	2021-09-28 11:46:34.000000000 +0000
@@ -12,6 +12,7 @@
 # ==== Usage ====
 #
 # [--let $rpl_channel_name= 'NAME']
+# [--let $slave_sql_errno= NUMBER[, NUMBER...]]
 # [--let $slave_timeout= NUMBER]
 # [--let $rpl_debug= 1]
 # --source include/stop_slave_sql.inc
@@ -20,6 +21,11 @@
 #   $rpl_channel_name
 #     If set, a FOR CHANNEL $rpl_channel_name is added.
 #
+#   $slave_sql_errno
+#     By default, this script fails the test if there is an error in the
+#     applier thread. Set this to a comma-separated list of numeric error
+#     codes, to allow the given values.
+#
 #   $slave_timeout
 #     See include/wait_for_slave_param.inc
 #
diff -Nru mysql-8.0-8.0.26/mysql-test/include/subquery_mat.inc mysql-8.0-8.0.27/mysql-test/include/subquery_mat.inc
--- mysql-8.0-8.0.26/mysql-test/include/subquery_mat.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/subquery_mat.inc	2021-09-28 11:46:34.000000000 +0000
@@ -420,15 +420,17 @@
 
 # cacheing for IN predicates inside a having clause - here the cached
 # items are changed to point to temporary tables.
+--replace_column 10 7
 explain
-select a from t1 group by a having a in (select c from t2 where d >= 20);
+select/*+ NO_RANGE_OPTIMIZATION(t1) */ a from t1 group by a having a in (select c from t2 where d >= 20);
 select a from t1 group by a having a in (select c from t2 where d >= 20);
 
 # create an index that can be used for the outer query GROUP BY 
 create index iab on t1(a, b);
 ANALYZE TABLE t1;
+--replace_column 10 7
 explain
-select a from t1 group by a having a in (select c from t2 where d >= 20);
+select /*+ NO_RANGE_OPTIMIZATION(t1) */ a from t1 group by a having a in (select c from t2 where d >= 20);
 select a from t1 group by a having a in (select c from t2 where d >= 20);
 
 explain
diff -Nru mysql-8.0-8.0.26/mysql-test/include/subquery_sj.inc mysql-8.0-8.0.27/mysql-test/include/subquery_sj.inc
--- mysql-8.0-8.0.26/mysql-test/include/subquery_sj.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/subquery_sj.inc	2021-09-28 11:46:34.000000000 +0000
@@ -808,6 +808,7 @@
  (concat('1 - 04', repeat('x', @suffix_len)), concat('2 - 04', repeat('x', @suffix_len)));
 
 # single value transformer
+ANALYZE TABLE t1_16, t2_16, t3_16;
 explain select left(a1,7), left(a2,7)
 from t1_16
 where a1 in (select b1 from t2_16 where b1 > '0');
@@ -875,7 +876,7 @@
 insert into t3 values ('1 - 06', '2 - 06');
 insert into t3 values ('1 - 07', '2 - 07');
 insert into t3 values ('1 - 08', '2 - 08');
-
+ANALYZE TABLE t1, t2, t3;
 explain
 select * from t1
 where concat(a1,'x') IN
@@ -2506,7 +2507,7 @@
 INSERT INTO works VALUES  ('E4','P2',20);
 INSERT INTO works VALUES  ('E4','P4',40);
 INSERT INTO works VALUES  ('E4','P5',80);
-
+ANALYZE TABLE staff, proj, works;
 explain SELECT EMPNUM, EMPNAME
 FROM staff
 WHERE EMPNUM IN
@@ -2757,7 +2758,7 @@
 INSERT INTO t3 VALUES  ('E4','P5',80);
 
 CREATE UNIQUE INDEX t1_IDX ON t1(EMPNUM);
-
+ANALYZE TABLE t1, t2, t3;
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -2786,7 +2787,7 @@
 
 DROP INDEX t1_IDX ON t1;
 CREATE INDEX t1_IDX ON t1(EMPNUM);
-
+ANALYZE TABLE t1;
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -2814,7 +2815,7 @@
 DEALLOCATE PREPARE stmt;
 
 DROP INDEX t1_IDX ON t1;
-
+ANALYZE TABLE t1;
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -3571,7 +3572,7 @@
 
 create table t3 (pk int, a int, primary key(pk));
 insert into t3 select a,a from t0;
-
+ANALYZE TABLE t0, t1, t2, t3;
 explain 
 select * from t1 left join t2 on (t2.a= t1.a and t2.a in (select pk from t3));
 
diff -Nru mysql-8.0-8.0.26/mysql-test/include/system_tables_storage_engine_tests.inc mysql-8.0-8.0.27/mysql-test/include/system_tables_storage_engine_tests.inc
--- mysql-8.0-8.0.26/mysql-test/include/system_tables_storage_engine_tests.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/system_tables_storage_engine_tests.inc	2021-09-28 11:46:34.000000000 +0000
@@ -21,7 +21,8 @@
          SELECT concat(table_schema, ".", table_name)
          FROM INFORMATION_SCHEMA.tables WHERE table_schema =
               'mysql' AND table_name NOT IN('general_log', 'slow_log',
-                                            'ndb_binlog_index');
+                                            'ndb_binlog_index')
+         ORDER BY table_name;
 }
 
 # Use system table names in uppercase. Tests with l_c_t_n = 1 or 2 sets this
@@ -31,7 +32,8 @@
          SELECT UPPER(concat(table_schema, ".", table_name))
          FROM INFORMATION_SCHEMA.tables WHERE table_schema =
               'mysql' AND table_name NOT IN('general_log', 'slow_log',
-                                            'ndb_binlog_index');
+                                            'ndb_binlog_index')
+         ORDER BY table_name;
 }
 
 --echo #-----------------------------------------------------------------------
diff -Nru mysql-8.0-8.0.26/mysql-test/include/wait_condition.inc mysql-8.0-8.0.27/mysql-test/include/wait_condition.inc
--- mysql-8.0-8.0.26/mysql-test/include/wait_condition.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/wait_condition.inc	2021-09-28 11:46:34.000000000 +0000
@@ -14,6 +14,7 @@
 #
 #   OR
 #
+#    let $silent_failure=1 # Ignore the echo when the wait times out
 #    let $wait_timeout= 60; # Override default 30 seconds with 60.
 #    let $wait_condition=
 #      SELECT c = 3 FROM t;
@@ -60,7 +61,10 @@
 }
 if (!$success)
 {
-  echo Timeout in wait_condition.inc for $wait_condition;
+  if (!$silent_failure)
+  {
+    echo Timeout in wait_condition.inc for $wait_condition;
+  }
   if ($show_rpl_debug_info)
   {
     --source include/show_rpl_debug_info.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/include/wait_for_slave_sql_to_stop.inc mysql-8.0-8.0.27/mysql-test/include/wait_for_slave_sql_to_stop.inc
--- mysql-8.0-8.0.26/mysql-test/include/wait_for_slave_sql_to_stop.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/wait_for_slave_sql_to_stop.inc	2021-09-28 11:46:34.000000000 +0000
@@ -14,6 +14,7 @@
 # ==== Usage ====
 #
 # [--let $rpl_channel_name= 'NAME']
+# [--let $slave_sql_errno= NUMBER[, NUMBER...]]
 # [--let $slave_timeout= NUMBER]
 # [--let $rpl_debug= 1]
 # --source include/wait_for_slave_sql_to_stop.inc
@@ -22,6 +23,11 @@
 #   $rpl_channel_name
 #     See include/wait_for_slave_param.inc
 #
+#   $slave_sql_errno
+#     By default, this script fails the test if there is an error in the
+#     applier thread. Set this to a comma-separated list of numeric error
+#     codes, to allow the given values.
+#
 #   $slave_timeout
 #     See include/wait_for_slave_param.inc
 #
diff -Nru mysql-8.0-8.0.26/mysql-test/include/window_functions_in2exists.inc mysql-8.0-8.0.27/mysql-test/include/window_functions_in2exists.inc
--- mysql-8.0-8.0.26/mysql-test/include/window_functions_in2exists.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/window_functions_in2exists.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,51 @@
+# Some cases where there's a window function in the SELECT list
+# and we cannot materialize (e.g. due to correlation), so we are
+# forced to use in2exists. The old optimizer cannot handle these
+# and must give ER_NOT_SUPPORTED_YET. The hypergraph optimizer,
+# on the other hand, can split these out of HAVING and execute them
+# correctly. Thus, we include this file from separate .test files
+# that run only under the old and hypergraph optimizer, respectively.
+
+CREATE TABLE t(a INT);
+INSERT INTO t VALUES (1),(2),(3);
+ANALYZE TABLE t;
+
+--echo =ALL => NOT EXISTS (select non-equal rows)
+--error 0, ER_NOT_SUPPORTED_YET
+SELECT * FROM t WHERE a = ALL(SELECT ROW_NUMBER() OVER () + 1 FROM t);
+--echo <>SOME => EXISTS (select non-equal rows)
+--error 0, ER_NOT_SUPPORTED_YET
+SELECT * FROM t WHERE a <> SOME(SELECT ROW_NUMBER() OVER () + 1 FROM t);
+--error 0, ER_NOT_SUPPORTED_YET
+SELECT * FROM t WHERE a <> ANY(SELECT ROW_NUMBER() OVER () + 1 FROM t);
+
+--echo # Correlated => no subquery materialization.
+--echo # IN => EXISTS, error
+--error 0, ER_NOT_SUPPORTED_YET
+SELECT * FROM t upper
+    WHERE upper.a IN (SELECT ROW_NUMBER() OVER () FROM t
+                      WHERE t.a > upper.a);
+
+--echo # Correlated => no subquery materialization.
+--echo # >ANY => EXISTS(select smaller rows), error
+--error 0, ER_NOT_SUPPORTED_YET
+SELECT * FROM t upper
+    WHERE upper.a > ANY (SELECT ROW_NUMBER() OVER () FROM t
+                         WHERE t.a > upper.a);
+--error 0, ER_NOT_SUPPORTED_YET
+SELECT * FROM t upper
+    WHERE upper.a > ALL (SELECT ROW_NUMBER() OVER () FROM t
+                         WHERE t.a > upper.a);
+
+DROP TABLE t;
+
+--echo #
+--echo # Bug#25601138 WINDOW FUNCTION IN CORRELATED SUBQUERY GIVES WRONG RESULT
+--echo #
+
+CREATE TABLE t1(i INT, j INT, k INT);
+INSERT INTO t1 VALUES (1,1,1),(2,2,2);
+--error 0, ER_NOT_SUPPORTED_YET
+select * from t1 AS upper where i+1
+ IN (select row_number() over () + upper.i from t1 );
+DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/include/window_std_var.inc mysql-8.0-8.0.27/mysql-test/include/window_std_var.inc
--- mysql-8.0-8.0.26/mysql-test/include/window_std_var.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/include/window_std_var.inc	2021-09-28 11:46:34.000000000 +0000
@@ -74,6 +74,7 @@
       VARIANCE(k) OVER (ROWS UNBOUNDED PRECEDING) variance FROM t; # simple
 --sorted_result
 SELECT k, STD(i), SUM(j), STD(k) OVER (ROWS UNBOUNDED PRECEDING) std_wf FROM t GROUP BY (k);
+--sorted_result
 SELECT k, STD(i), SUM(j), VAR_POP(k) OVER (ROWS UNBOUNDED PRECEDING) variance_wf FROM t GROUP BY (k);
 --sorted_result
 SELECT k, STD(i), SUM(j), STD(k) OVER (ROWS UNBOUNDED PRECEDING) std_wf FROM t GROUP BY (k) ORDER BY std_wf DESC;
@@ -84,13 +85,19 @@
 SELECT k, STD(i), SUM(j), VAR_POP(k) OVER (ROWS UNBOUNDED PRECEDING) variance_wf FROM t GROUP BY (k) ORDER BY variance_wf DESC;
 SELECT k, STD(i), SUM(j), VAR_SAMP(k) OVER (ROWS UNBOUNDED PRECEDING) variance_wf FROM t GROUP BY (k) ORDER BY variance_wf DESC;
 
+--sorted_result
 SELECT k, GROUP_CONCAT(j ORDER BY j), STD(k) OVER (ROWS UNBOUNDED PRECEDING) std,
       VAR_SAMP(k) OVER (ROWS UNBOUNDED PRECEDING) variance FROM t GROUP BY (k); # combined with two tmp files GROUP BY
+--sorted_result
 SELECT k, AVG(DISTINCT j), STD(k) OVER (ROWS UNBOUNDED PRECEDING) std,
       VARIANCE(k) OVER (ROWS UNBOUNDED PRECEDING) variance FROM t GROUP BY (k);
+--sorted_result
 SELECT k, GROUP_CONCAT(j ORDER BY j), STD(k+1) OVER (ROWS UNBOUNDED PRECEDING) std FROM t GROUP BY (k); # expression argument to std
+--sorted_result
 SELECT k, GROUP_CONCAT(j ORDER BY j), VARIANCE(k+1) OVER (ROWS UNBOUNDED PRECEDING) variance FROM t GROUP BY (k); # expression argument to VARIANCE
+--sorted_result
 SELECT k, GROUP_CONCAT(j ORDER BY j), STD(k+1) OVER (ORDER BY k DESC ROWS UNBOUNDED PRECEDING) std FROM t GROUP BY (k);
+--sorted_result
 SELECT k, GROUP_CONCAT(j ORDER BY j), VAR_POP(k+1) OVER (ORDER BY k DESC ROWS UNBOUNDED PRECEDING) variance FROM t GROUP BY (k);
 
 CREATE TABLE t1 (id INTEGER, sex CHAR(1));
@@ -150,7 +157,7 @@
 GROUP BY (k) WITH ROLLUP;
 SELECT k, STD(i), SUM(j), VAR_SAMP(k) OVER (ROWS UNBOUNDED PRECEDING) variance_wf FROM t
 GROUP BY (k) WITH ROLLUP;
-SELECT k, STD(i), SUM(j), STD(k) OVER (ROWS UNBOUNDED PRECEDING) std_wf FROM t
+SELECT k, STD(i), SUM(j), STD(k) OVER (ORDER BY k DESC ROWS UNBOUNDED PRECEDING) std_wf FROM t
 GROUP BY (k) WITH ROLLUP ORDER BY k DESC;
 SELECT k, STD(i), SUM(j), STDDEV(k) OVER (ROWS UNBOUNDED PRECEDING) std_wf FROM t
 GROUP BY k,j WITH ROLLUP;
@@ -484,8 +491,11 @@
 INSERT INTO tj(j) VALUES ('[1,2,3]');
 INSERT INTO tj(j) VALUES (NULL);
 SELECT STD(j) OVER () AS JSON FROM tj;
+# Different line numbers in warnings in hypergraph optimizer.
+--disable_warnings
 SELECT j, JSON_TYPE(j), STD(j) OVER (ORDER BY j ROWS 3 PRECEDING) FROM tj;
 SELECT j, JSON_TYPE(j), VARIANCE(j) OVER (ORDER BY j ROWS 3 PRECEDING) FROM tj;
+--enable_warnings
 --error ER_WINDOW_RANGE_FRAME_ORDER_TYPE
 SELECT j, JSON_TYPE(j), JSON_TYPE(STD(j) OVER (ORDER BY j RANGE 3 PRECEDING)) FROM tj;
 INSERT INTO tj(j) VALUES ('3.14');
@@ -505,17 +515,26 @@
 UPDATE tj2 SET i=MOD(i,3);
 SELECT * FROM tj2;
 --echo With GROUP BY
+--sorted_result
 SELECT          COUNT(*) OVER (), MOD(STD(i),2) FROM tj2 GROUP BY i ;
+--sorted_result
 SELECT DISTINCT COUNT(*) OVER (), MOD(VARIANCE(i),2) FROM tj2 GROUP BY i ;
 SELECT DISTINCT COUNT(*) OVER (), MOD(STD(i),2) as a FROM tj2 GROUP BY i ORDER BY MOD(STD(i),2);
 SELECT DISTINCT COUNT(*) OVER (), MOD(STD(i),2) as a FROM tj2 GROUP BY i ORDER BY MOD(STD(i),2) DESC;
 
 --echo Bug fix GROUP BY with window function referring column used in grouping expression
+--sorted_result
 SELECT i, STD(i) OVER (), MOD(STD(i),2) FROM tj2 GROUP BY i ;
+--sorted_result
 SELECT i, VARIANCE(VARIANCE(i)) OVER (), VARIANCE(i) OVER (ORDER BY i), MOD(VARIANCE(i),2), VARIANCE(i) FROM tj2 GROUP BY i ;
+--sorted_result
 SELECT i, STD(i) OVER (ORDER BY i) FROM tj UNION ALL SELECT i, STD(i) OVER (ORDER BY i) FROM tj;
+# Different line numbers in warnings, and roundoff (due to different window ordering), in hypergraph optimizer.
+--disable_warnings
+--replace_numeric_round 14
 SELECT j,CAST(STD(j) OVER (PARTITION BY i) AS JSON), CAST(VARIANCE(j) OVER () AS JSON) FROM tj;
 SELECT j,CAST(STD(j) OVER (PARTITION BY i ROWS UNBOUNDED PRECEDING) AS JSON), CAST(VARIANCE(j) OVER (PARTITION BY i ROWS UNBOUNDED PRECEDING) AS JSON) FROM tj;
+--enable_warnings
 
 DROP TABLE tj,tj2;
 
diff -Nru mysql-8.0-8.0.26/mysql-test/lock_order_dependencies.txt mysql-8.0-8.0.27/mysql-test/lock_order_dependencies.txt
--- mysql-8.0-8.0.26/mysql-test/lock_order_dependencies.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/lock_order_dependencies.txt	2021-09-28 11:46:34.000000000 +0000
@@ -1,27 +1,50 @@
+
 ARC FROM "mutex/archive/Archive_share::mutex" TO "mutex/mysys/THR_LOCK_open"
 ARC FROM "mutex/csv/tina" TO "mutex/mysys/THR_LOCK_open"
 ARC FROM "mutex/federated/federated" TO "rwlock/sql/THR_LOCK_servers" OP "R"
 ARC FROM "mutex/group_rpl/GCS_Gcs_suspicions_manager::m_suspicions_mutex" TO "mutex/group_rpl/GCS_Gcs_suspicions_manager::m_suspicions_parameters_mutex"
+ARC FROM "mutex/group_rpl/GCS_Gcs_xcom_interface::m_wait_for_ssl_init_mutex" TO "mutex/group_rpl/GCS_Gcs_xcom_engine::m_wait_for_notification_mutex"
+ARC FROM "mutex/group_rpl/key_GR_LOCK_group_action_coordinator_process" TO "cond/group_rpl/COND_group_action_coordinator_thread"
+ARC FROM "mutex/group_rpl/key_GR_LOCK_group_action_coordinator_process" TO "mutex/group_rpl/key_GR_LOCK_group_action_coordinator_thread"
+ARC FROM "mutex/group_rpl/key_GR_LOCK_group_action_coordinator_process" TO "mutex/group_rpl/key_GR_LOCK_group_action_coordinator_thread_end"
+ARC FROM "mutex/group_rpl/key_GR_LOCK_group_action_coordinator_process" TO "mutex/group_rpl/LOCK_primary_election_action_notification"
+ARC FROM "mutex/group_rpl/key_GR_LOCK_group_action_coordinator_process" TO "mutex/group_rpl/LOCK_primary_election_running_flag"
+ARC FROM "mutex/group_rpl/key_GR_LOCK_group_action_coordinator_process" TO "rwlock/group_rpl/RWLOCK_gcs_operations" OP "R"
+ARC FROM "mutex/group_rpl/key_GR_LOCK_group_action_coordinator_thread" TO "mutex/group_rpl/key_GR_LOCK_group_action_coordinator_thread_end"
 ARC FROM "mutex/group_rpl/LOCK_applier_module_run" TO "mutex/group_rpl/LOCK_applier_module_suspend"
+ARC FROM "mutex/group_rpl/LOCK_applier_module_run" TO "mutex/group_rpl/LOCK_certification_info"
 ARC FROM "mutex/group_rpl/LOCK_applier_module_run" TO "mutex/group_rpl/LOCK_certification_members"
+ARC FROM "mutex/group_rpl/LOCK_applier_module_run" TO "mutex/group_rpl/LOCK_group_member_info_update_lock"
 ARC FROM "mutex/group_rpl/LOCK_applier_module_run" TO "mutex/group_rpl/LOCK_stage_monitor_handler"
 ARC FROM "mutex/group_rpl/LOCK_applier_module_run" TO "mutex/group_rpl/LOCK_synchronized_queue"
+ARC FROM "mutex/group_rpl/LOCK_applier_module_run" TO "mutex/innodb/rw_lock_debug_mutex"
+ARC FROM "mutex/group_rpl/LOCK_applier_module_run" TO "mutex/innodb/trx_mutex"
+ARC FROM "mutex/group_rpl/LOCK_applier_module_run" TO "mutex/sql/DEBUG_SYNC::mutex"
+ARC FROM "mutex/group_rpl/LOCK_applier_module_run" TO "mutex/sql/LOCK_plugin"
 ARC FROM "mutex/group_rpl/LOCK_applier_module_run" TO "mutex/sql/LOCK_replica_list"
 ARC FROM "mutex/group_rpl/LOCK_applier_module_run" TO "mutex/sql/THD::LOCK_current_cond"
 ARC FROM "mutex/group_rpl/LOCK_applier_module_run" TO "mutex/sql/THD::LOCK_thd_data"
 ARC FROM "mutex/group_rpl/LOCK_applier_module_run" TO "mutex/sql/THD::LOCK_thd_query"
+ARC FROM "mutex/group_rpl/LOCK_applier_module_run" TO "rwlock/group_rpl/RWLOCK_certifier_stable_gtid_set" OP "W"
+ARC FROM "mutex/group_rpl/LOCK_applier_module_run" TO "sxlock/innodb/lock_sys_global_rw_lock" OP "X"
 ARC FROM "mutex/group_rpl/LOCK_applier_module_suspend" TO "mutex/group_rpl/LOCK_stage_monitor_handler"
 ARC FROM "mutex/group_rpl/LOCK_certification_info" TO "cond/group_rpl/COND_certifier_broadcast_run"
+ARC FROM "mutex/group_rpl/LOCK_certification_info" TO "mutex/csv/tina"
+ARC FROM "mutex/group_rpl/LOCK_certification_info" TO "mutex/csv/TINA_SHARE::mutex"
 ARC FROM "mutex/group_rpl/LOCK_certification_info" TO "mutex/group_rpl/LOCK_certifier_broadcast_run"
 ARC FROM "mutex/group_rpl/LOCK_certification_info" TO "mutex/group_rpl/LOCK_group_member_info_update_lock"
+ARC FROM "mutex/group_rpl/LOCK_certification_info" TO "mutex/mysys/THR_LOCK::mutex"
+ARC FROM "mutex/group_rpl/LOCK_certification_info" TO "mutex/mysys/THR_LOCK_open"
 ARC FROM "mutex/group_rpl/LOCK_certification_info" TO "mutex/sql/Cost_constant_cache::LOCK_cost_const"
 ARC FROM "mutex/group_rpl/LOCK_certification_info" TO "mutex/sql/DEBUG_SYNC::mutex"
 ARC FROM "mutex/group_rpl/LOCK_certification_info" TO "mutex/sql/LOCK_connection_count"
 ARC FROM "mutex/group_rpl/LOCK_certification_info" TO "mutex/sql/LOCK_global_system_variables"
+ARC FROM "mutex/group_rpl/LOCK_certification_info" TO "mutex/sql/LOCK_open"
 ARC FROM "mutex/group_rpl/LOCK_certification_info" TO "mutex/sql/LOCK_plugin"
 ARC FROM "mutex/group_rpl/LOCK_certification_info" TO "mutex/sql/LOCK_replica_list"
 ARC FROM "mutex/group_rpl/LOCK_certification_info" TO "mutex/sql/LOCK_sql_rand"
 ARC FROM "mutex/group_rpl/LOCK_certification_info" TO "mutex/sql/LOCK_status"
+ARC FROM "mutex/group_rpl/LOCK_certification_info" TO "mutex/sql/LOCK_table_cache"
 ARC FROM "mutex/group_rpl/LOCK_certification_info" TO "mutex/sql/LOCK_thd_list"
 ARC FROM "mutex/group_rpl/LOCK_certification_info" TO "mutex/sql/LOCK_thd_remove"
 ARC FROM "mutex/group_rpl/LOCK_certification_info" TO "mutex/sql/LOCK_thread_ids"
@@ -44,7 +67,81 @@
 ARC FROM "mutex/group_rpl/LOCK_certifier_broadcast_run" TO "mutex/group_rpl/LOCK_certifier_broadcast_dispatcher_run"
 ARC FROM "mutex/group_rpl/LOCK_certifier_broadcast_run" TO "mutex/sql/THD::LOCK_current_cond"
 ARC FROM "mutex/group_rpl/LOCK_certifier_broadcast_run" TO "mutex/sql/THD::LOCK_thd_data"
+ARC FROM "mutex/group_rpl/LOCK_clone_donor_list" TO "mutex/group_rpl/LOCK_group_member_info_update_lock"
 ARC FROM "mutex/group_rpl/LOCK_clone_handler_run" TO "mutex/group_rpl/LOCK_clone_query"
+ARC FROM "mutex/group_rpl/LOCK_clone_handler_run" TO "mutex/group_rpl/LOCK_group_member_info_manager_update_lock"
+ARC FROM "mutex/group_rpl/LOCK_clone_handler_run" TO "mutex/group_rpl/LOCK_group_member_info_update_lock"
+ARC FROM "mutex/group_rpl/LOCK_clone_handler_run" TO "mutex/innodb/rw_lock_debug_mutex"
+ARC FROM "mutex/group_rpl/LOCK_clone_handler_run" TO "mutex/innodb/trx_mutex"
+ARC FROM "mutex/group_rpl/LOCK_clone_handler_run" TO "mutex/innodb/trx_pool_mutex"
+ARC FROM "mutex/group_rpl/LOCK_clone_handler_run" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "mutex/group_rpl/LOCK_clone_handler_run" TO "mutex/sql/DEBUG_SYNC::mutex"
+ARC FROM "mutex/group_rpl/LOCK_clone_handler_run" TO "mutex/sql/LOCK_plugin"
+ARC FROM "mutex/group_rpl/LOCK_clone_handler_run" TO "mutex/sql/LOCK_replica_list"
+ARC FROM "mutex/group_rpl/LOCK_clone_handler_run" TO "mutex/sql/LOCK_status"
+ARC FROM "mutex/group_rpl/LOCK_clone_handler_run" TO "mutex/sql/LOCK_thd_list"
+ARC FROM "mutex/group_rpl/LOCK_clone_handler_run" TO "mutex/sql/LOCK_thd_remove"
+ARC FROM "mutex/group_rpl/LOCK_clone_handler_run" TO "mutex/sql/LOCK_thread_ids"
+ARC FROM "mutex/group_rpl/LOCK_clone_handler_run" TO "mutex/sql/LOCK_transaction_cache"
+ARC FROM "mutex/group_rpl/LOCK_clone_handler_run" TO "mutex/sql/THD::LOCK_current_cond"
+ARC FROM "mutex/group_rpl/LOCK_clone_handler_run" TO "mutex/sql/THD::LOCK_query_plan"
+ARC FROM "mutex/group_rpl/LOCK_clone_handler_run" TO "mutex/sql/THD::LOCK_thd_data"
+ARC FROM "mutex/group_rpl/LOCK_clone_handler_run" TO "mutex/sql/THD::LOCK_thd_query"
+ARC FROM "mutex/group_rpl/LOCK_clone_handler_run" TO "rwlock/group_rpl/RWLOCK_group_event_observation_list" OP "W"
+ARC FROM "mutex/group_rpl/LOCK_clone_handler_run" TO "rwlock/group_rpl/RWLOCK_transaction_observation_list" OP "R"
+ARC FROM "mutex/group_rpl/LOCK_clone_handler_run" TO "rwlock/sql/Trans_delegate::lock" OP "R"
+ARC FROM "mutex/group_rpl/LOCK_clone_query" TO "rwlock/session/LOCK_srv_session_collection" OP "R"
+ARC FROM "mutex/group_rpl/LOCK_clone_read_mode" TO "cond/group_rpl/COND_session_thread_method_exec"
+ARC FROM "mutex/group_rpl/LOCK_clone_read_mode" TO "cond/sql/MDL_context::COND_wait_status"
+ARC FROM "mutex/group_rpl/LOCK_clone_read_mode" TO "mutex/group_rpl/LOCK_primary_election_secondary_process_run"
+ARC FROM "mutex/group_rpl/LOCK_clone_read_mode" TO "mutex/group_rpl/LOCK_session_thread_method_exec"
+ARC FROM "mutex/group_rpl/LOCK_clone_read_mode" TO "mutex/group_rpl/LOCK_synchronized_queue"
+ARC FROM "mutex/group_rpl/LOCK_clone_read_mode" TO "mutex/sql/Cost_constant_cache::LOCK_cost_const"
+ARC FROM "mutex/group_rpl/LOCK_clone_read_mode" TO "mutex/sql/DEBUG_SYNC::mutex"
+ARC FROM "mutex/group_rpl/LOCK_clone_read_mode" TO "mutex/sql/LOCK_connection_count"
+ARC FROM "mutex/group_rpl/LOCK_clone_read_mode" TO "mutex/sql/LOCK_global_system_variables"
+ARC FROM "mutex/group_rpl/LOCK_clone_read_mode" TO "mutex/sql/LOCK_plugin"
+ARC FROM "mutex/group_rpl/LOCK_clone_read_mode" TO "mutex/sql/LOCK_replica_list"
+ARC FROM "mutex/group_rpl/LOCK_clone_read_mode" TO "mutex/sql/LOCK_sql_rand"
+ARC FROM "mutex/group_rpl/LOCK_clone_read_mode" TO "mutex/sql/LOCK_status"
+ARC FROM "mutex/group_rpl/LOCK_clone_read_mode" TO "mutex/sql/LOCK_thd_list"
+ARC FROM "mutex/group_rpl/LOCK_clone_read_mode" TO "mutex/sql/LOCK_thd_remove"
+ARC FROM "mutex/group_rpl/LOCK_clone_read_mode" TO "mutex/sql/LOCK_thread_ids"
+ARC FROM "mutex/group_rpl/LOCK_clone_read_mode" TO "mutex/sql/LOCK_transaction_cache"
+ARC FROM "mutex/group_rpl/LOCK_clone_read_mode" TO "mutex/sql/LOG::LOCK_log"
+ARC FROM "mutex/group_rpl/LOCK_clone_read_mode" TO "mutex/sql/MDL_wait::LOCK_wait_status"
+ARC FROM "mutex/group_rpl/LOCK_clone_read_mode" TO "mutex/sql/THD::LOCK_current_cond"
+ARC FROM "mutex/group_rpl/LOCK_clone_read_mode" TO "mutex/sql/THD::LOCK_query_plan"
+ARC FROM "mutex/group_rpl/LOCK_clone_read_mode" TO "mutex/sql/THD::LOCK_thd_data"
+ARC FROM "mutex/group_rpl/LOCK_clone_read_mode" TO "mutex/sql/THD::LOCK_thd_protocol"
+ARC FROM "mutex/group_rpl/LOCK_clone_read_mode" TO "mutex/sql/THD::LOCK_thd_query"
+ARC FROM "mutex/group_rpl/LOCK_clone_read_mode" TO "mutex/sql/THD::LOCK_thd_sysvar"
+ARC FROM "mutex/group_rpl/LOCK_clone_read_mode" TO "prlock/sql/MDL_context::LOCK_waiting_for" OP "R"
+ARC FROM "mutex/group_rpl/LOCK_clone_read_mode" TO "prlock/sql/MDL_context::LOCK_waiting_for" OP "W"
+ARC FROM "mutex/group_rpl/LOCK_clone_read_mode" TO "prlock/sql/MDL_lock::rwlock" OP "R"
+ARC FROM "mutex/group_rpl/LOCK_clone_read_mode" TO "prlock/sql/MDL_lock::rwlock" OP "W"
+ARC FROM "mutex/group_rpl/LOCK_clone_read_mode" TO "rwlock/group_rpl/RWLOCK_transaction_observation_list" OP "R"
+ARC FROM "mutex/group_rpl/LOCK_clone_read_mode" TO "rwlock/session/LOCK_srv_session_collection" OP "R"
+ARC FROM "mutex/group_rpl/LOCK_clone_read_mode" TO "rwlock/session/LOCK_srv_session_collection" OP "W"
+ARC FROM "mutex/group_rpl/LOCK_clone_read_mode" TO "rwlock/sql/LOCK_system_variables_hash" OP "R"
+ARC FROM "mutex/group_rpl/LOCK_clone_read_mode" TO "rwlock/sql/LOGGER::LOCK_logger" OP "R"
+ARC FROM "mutex/group_rpl/LOCK_clone_read_mode" TO "rwlock/sql/Trans_delegate::lock" OP "R"
+ARC FROM "mutex/group_rpl/LOCK_connection_map" TO "mutex/sql/LOCK_group_replication_connection_mutex"
+ARC FROM "mutex/group_rpl/LOCK_connection_map" TO "mutex/sql/LOCK_plugin"
+ARC FROM "mutex/group_rpl/LOCK_connection_map" TO "mutex/sql/THD::LOCK_current_cond"
+ARC FROM "mutex/group_rpl/LOCK_connection_map" TO "mutex/sql/THD::LOCK_thd_data"
+ARC FROM "mutex/group_rpl/LOCK_delayed_init_run" TO "mutex/sql/DEBUG_SYNC::mutex"
+ARC FROM "mutex/group_rpl/LOCK_delayed_init_run" TO "mutex/sql/LOCK_plugin"
+ARC FROM "mutex/group_rpl/LOCK_delayed_init_run" TO "mutex/sql/LOCK_replica_list"
+ARC FROM "mutex/group_rpl/LOCK_delayed_init_run" TO "mutex/sql/LOCK_status"
+ARC FROM "mutex/group_rpl/LOCK_delayed_init_run" TO "mutex/sql/LOCK_thd_list"
+ARC FROM "mutex/group_rpl/LOCK_delayed_init_run" TO "mutex/sql/LOCK_thd_remove"
+ARC FROM "mutex/group_rpl/LOCK_delayed_init_run" TO "mutex/sql/LOCK_thread_ids"
+ARC FROM "mutex/group_rpl/LOCK_delayed_init_run" TO "mutex/sql/LOCK_transaction_cache"
+ARC FROM "mutex/group_rpl/LOCK_delayed_init_run" TO "mutex/sql/THD::LOCK_query_plan"
+ARC FROM "mutex/group_rpl/LOCK_delayed_init_run" TO "mutex/sql/THD::LOCK_thd_data"
+ARC FROM "mutex/group_rpl/LOCK_delayed_init_run" TO "mutex/sql/THD::LOCK_thd_query"
+ARC FROM "mutex/group_rpl/LOCK_delayed_init_run" TO "rwlock/sql/Trans_delegate::lock" OP "R"
 ARC FROM "mutex/group_rpl/LOCK_group_member_info_manager_update_lock" TO "cond/group_rpl/COND_session_thread_method_exec"
 ARC FROM "mutex/group_rpl/LOCK_group_member_info_manager_update_lock" TO "cond/group_rpl/COND_session_thread_run"
 ARC FROM "mutex/group_rpl/LOCK_group_member_info_manager_update_lock" TO "mutex/group_rpl/LOCK_group_member_info_update_lock"
@@ -53,9 +150,19 @@
 ARC FROM "mutex/group_rpl/LOCK_group_member_info_manager_update_lock" TO "mutex/group_rpl/LOCK_synchronized_queue"
 ARC FROM "mutex/group_rpl/LOCK_group_member_info_update_lock" TO "mutex/group_rpl/LOCK_group_member_info_update_lock"
 ARC FROM "mutex/group_rpl/LOCK_message_service_run" TO "mutex/group_rpl/LOCK_synchronized_queue"
+ARC FROM "mutex/group_rpl/LOCK_mysql_thread_dispatcher_run" TO "mutex/group_rpl/LOCK_synchronized_queue"
+ARC FROM "mutex/group_rpl/LOCK_mysql_thread_run" TO "mutex/group_rpl/LOCK_synchronized_queue"
 ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "cond/group_rpl/COND_applier_module_run"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "cond/group_rpl/COND_clone_handler_run"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "cond/group_rpl/COND_group_action_coordinator_thread"
 ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "cond/group_rpl/COND_message_service_run"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "cond/group_rpl/COND_mysql_thread_run"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "cond/group_rpl/COND_primary_election_primary_process_run"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "cond/group_rpl/COND_recovery_module_run"
 ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "cond/group_rpl/COND_view_modification_wait"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "cond/sql/Relay_log_info::stop_cond"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "cond/sql/Source_info::stop_cond"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "cond/sql/Source_IO_monitor::run_cond"
 ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/group_rpl/GCS_Gcs_async_buffer::m_free_buffer_mutex"
 ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/group_rpl/GCS_Gcs_xcom_engine::m_wait_for_notification_mutex"
 ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/group_rpl/GCS_Gcs_xcom_view_change_control::m_joining_leaving_mutex"
@@ -69,34 +176,87 @@
 ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/group_rpl/LOCK_certification_members"
 ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/group_rpl/LOCK_clone_handler_run"
 ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/group_rpl/LOCK_clone_query"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/group_rpl/LOCK_connection_map"
 ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/group_rpl/LOCK_group_member_info_manager_update_lock"
 ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/group_rpl/LOCK_group_member_info_update_lock"
 ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/group_rpl/LOCK_message_service_run"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/group_rpl/LOCK_mysql_thread_dispatcher_run"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/group_rpl/LOCK_mysql_thread_run"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/group_rpl/LOCK_pipeline_continuation"
 ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/group_rpl/LOCK_plugin_online"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/group_rpl/LOCK_primary_election_action_notification"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/group_rpl/LOCK_primary_election_primary_process_run"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/group_rpl/LOCK_recovery"
 ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/group_rpl/LOCK_recovery_module_run"
 ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/group_rpl/LOCK_synchronized_queue"
 ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/group_rpl/LOCK_view_modification_wait"
 ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/group_rpl/LOCK_wait_ticket"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/innodb/buf_pool_free_list_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/innodb/buf_pool_LRU_list_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/innodb/fil_system_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/innodb/flush_list_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/innodb/lock_sys_page_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/innodb/lock_sys_table_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/innodb/purge_sys_pq_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/innodb/rw_lock_debug_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/innodb/trx_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/innodb/trx_sys_serialisation_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/innodb/trx_sys_shard_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/innodb/trx_undo_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/innodb/undo_space_rseg_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/mysqlx/broker_context_sync"
 ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/mysys/THR_LOCK_open"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/sql/DEBUG_SYNC::mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/sql/key_mta_temp_table_LOCK"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/sql/LOCK_open"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/sql/LOCK_plugin"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/sql/LOCK_table_cache"
 ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/sql/LOCK_thd_list"
-ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/sql/Source_info::run_lock"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_binlog_end_pos"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/sql/MYSQL_RELAY_LOG::LOCK_log"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/sql/MYSQL_RELAY_LOG::LOCK_log_end_pos"
 ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/sql/Relay_log_info::run_lock"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/sql/Replica_reporting_capability::err_lock"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/sql/Source_info::data_lock"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/sql/Source_info::run_lock"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/sql/Source_IO_monitor::run_lock"
 ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/sql/THD::LOCK_current_cond"
 ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "mutex/sql/THD::LOCK_thd_data"
-ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "rwlock/group_rpl/RWLOCK_gcs_operations_finalize_ongoing" OP "W"
 ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "rwlock/group_rpl/RWLOCK_gcs_operations" OP "R"
 ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "rwlock/group_rpl/RWLOCK_gcs_operations" OP "W"
 ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "rwlock/group_rpl/RWLOCK_gcs_operations_view_change_observers" OP "W"
 ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "rwlock/sql/channel_lock" OP "W"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "sxlock/innodb/fil_space_latch" OP "X"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "sxlock/innodb/hash_table_locks" OP "S"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "sxlock/innodb/hash_table_locks" OP "X"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "sxlock/innodb/index_tree_rw_lock" OP "S"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "sxlock/innodb/lock_sys_global_rw_lock" OP "S"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "sxlock/innodb/lock_sys_global_rw_lock" OP "X"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "sxlock/innodb/log_sn_lock" OP "S"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "sxlock/innodb/rsegs_lock" OP "S"
+ARC FROM "mutex/group_rpl/LOCK_plugin_modules_termination" TO "sxlock/innodb/undo_spaces_lock" OP "S"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "cond/group_rpl/COND_applier_module_run"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "cond/group_rpl/COND_clone_handler_run"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "cond/group_rpl/COND_group_action_coordinator_thread"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "cond/group_rpl/COND_message_service_run"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "cond/group_rpl/COND_mysql_thread_run"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "cond/group_rpl/COND_primary_election_primary_process_run"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "cond/group_rpl/COND_recovery_module_run"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "cond/group_rpl/COND_session_thread_method_exec"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "cond/group_rpl/COND_session_thread_run"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "cond/group_rpl/COND_view_modification_wait"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "cond/group_rpl/COND_write_lock_protection"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "cond/group_rpl/GCS_Gcs_xcom_interface::m_wait_for_ssl_init_cond"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "cond/sql/DEBUG_SYNC::cond"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "cond/sql/Relay_log_info::stop_cond"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "cond/sql/Source_info::stop_cond"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "cond/sql/Source_IO_monitor::run_cond"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/group_rpl/GCS_Gcs_async_buffer::m_free_buffer_mutex"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/group_rpl/GCS_Gcs_suspicions_manager::m_suspicions_mutex"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/group_rpl/GCS_Gcs_suspicions_manager::m_suspicions_parameters_mutex"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/group_rpl/GCS_Gcs_xcom_engine::m_wait_for_notification_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/group_rpl/GCS_Gcs_xcom_interface::m_wait_for_ssl_init_mutex"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/group_rpl/GCS_Gcs_xcom_view_change_control::m_joining_leaving_mutex"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/group_rpl/key_GR_LOCK_group_action_coordinator_process"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/group_rpl/key_GR_LOCK_group_action_coordinator_thread"
@@ -105,15 +265,25 @@
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/group_rpl/LOCK_applier_module_run"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/group_rpl/LOCK_applier_module_suspend"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/group_rpl/LOCK_autorejoin_module"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/group_rpl/LOCK_certification_info"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/group_rpl/LOCK_certification_members"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/group_rpl/LOCK_clone_handler_run"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/group_rpl/LOCK_clone_query"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/group_rpl/LOCK_connection_map"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/group_rpl/LOCK_delayed_init_run"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/group_rpl/LOCK_delayed_init_server_ready"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/group_rpl/LOCK_group_member_info_manager_update_lock"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/group_rpl/LOCK_group_member_info_update_lock"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/group_rpl/LOCK_message_service_run"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/group_rpl/LOCK_mysql_thread_dispatcher_run"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/group_rpl/LOCK_mysql_thread_run"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/group_rpl/LOCK_pipeline_continuation"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/group_rpl/LOCK_plugin_modules_termination"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/group_rpl/LOCK_plugin_online"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/group_rpl/LOCK_primary_election_action_notification"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/group_rpl/LOCK_primary_election_primary_process_run"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/group_rpl/LOCK_primary_promotion_policy"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/group_rpl/LOCK_recovery"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/group_rpl/LOCK_recovery_module_run"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/group_rpl/LOCK_session_thread_method_exec"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/group_rpl/LOCK_session_thread_run"
@@ -121,30 +291,156 @@
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/group_rpl/LOCK_view_modification_wait"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/group_rpl/LOCK_wait_ticket"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/group_rpl/LOCK_write_lock_protection"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/innodb/autoinc_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/innodb/autoinc_persisted_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/innodb/buf_pool_chunks_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/innodb/buf_pool_flush_state_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/innodb/buf_pool_free_list_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/innodb/buf_pool_LRU_list_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/innodb/buf_pool_zip_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/innodb/dict_persist_dirty_tables_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/innodb/dict_sys_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/innodb/dict_table_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/innodb/fil_system_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/innodb/flush_list_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/innodb/innobase_share_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/innodb/lock_sys_page_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/innodb/lock_sys_table_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/innodb/purge_sys_pq_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/innodb/rw_lock_debug_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/innodb/rw_lock_list_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/innodb/sync_array_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/innodb/trx_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/innodb/trx_pool_manager_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/innodb/trx_pool_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/innodb/trx_sys_serialisation_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/innodb/trx_sys_shard_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/innodb/trx_undo_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/innodb/undo_space_rseg_mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/mysqlx/broker_context_sync"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/mysys/THR_LOCK_open"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/session/LOCK_srv_session_threads"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/sql/Cost_constant_cache::LOCK_cost_const"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/sql/DEBUG_SYNC::mutex"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/sql/key_mta_temp_table_LOCK"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/sql/LOCK_connection_count"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/sql/LOCK_global_system_variables"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/sql/LOCK_open"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/sql/LOCK_plugin"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/sql/LOCK_replica_list"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/sql/LOCK_sql_rand"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/sql/LOCK_status"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/sql/LOCK_table_cache"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/sql/LOCK_thd_list"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/sql/LOCK_thd_remove"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/sql/LOCK_thread_ids"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/sql/LOCK_tls_ctx_options"
-ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/sql/Source_info::run_lock"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/sql/LOCK_transaction_cache"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/sql/LOG::LOCK_log"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_binlog_end_pos"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/sql/MYSQL_RELAY_LOG::LOCK_log"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/sql/MYSQL_RELAY_LOG::LOCK_log_end_pos"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/sql/Relay_log_info::run_lock"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/sql/Replica_reporting_capability::err_lock"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/sql/Source_info::data_lock"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/sql/Source_info::run_lock"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/sql/Source_IO_monitor::run_lock"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/sql/THD::LOCK_current_cond"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/sql/THD::LOCK_query_plan"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/sql/THD::LOCK_thd_data"
-ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "rwlock/group_rpl/RWLOCK_gcs_operations_finalize_ongoing" OP "W"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/sql/THD::LOCK_thd_protocol"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/sql/THD::LOCK_thd_query"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "mutex/sql/THD::LOCK_thd_sysvar"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "prlock/sql/MDL_lock::rwlock" OP "W"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "rwlock/group_rpl/RWLOCK_certifier_stable_gtid_set" OP "W"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "rwlock/group_rpl/RWLOCK_flow_control_module_info" OP "R"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "rwlock/group_rpl/RWLOCK_gcs_operations" OP "R"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "rwlock/group_rpl/RWLOCK_gcs_operations" OP "W"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "rwlock/group_rpl/RWLOCK_gcs_operations_view_change_observers" OP "W"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "rwlock/group_rpl/RWLOCK_plugin_stop" OP "W"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "rwlock/group_rpl/RWLOCK_transaction_consistency_manager_map" OP "W"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "rwlock/group_rpl/RWLOCK_transaction_consistency_manager_prepared_transactions_on_my_applier" OP "W"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "rwlock/group_rpl/RWLOCK_transaction_observation_list" OP "R"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "rwlock/group_rpl/RWLOCK_transaction_observation_list" OP "W"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "rwlock/session/LOCK_srv_session_collection" OP "R"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "rwlock/session/LOCK_srv_session_collection" OP "W"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "rwlock/sql/channel_lock" OP "W"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "rwlock/sql/gtid_commit_rollback" OP "R"
 ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "rwlock/sql/gtid_commit_rollback" OP "W"
-ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "cond/sql/Source_info::start_cond"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "rwlock/sql/LOCK_system_variables_hash" OP "R"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "rwlock/sql/LOGGER::LOCK_logger" OP "R"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "rwlock/sql/Trans_delegate::lock" OP "R"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "sxlock/innodb/btr_search_latch" OP "S"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "sxlock/innodb/btr_search_latch" OP "X"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "sxlock/innodb/dict_table_stats" OP "X"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "sxlock/innodb/fil_space_latch" OP "X"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "sxlock/innodb/hash_table_locks" OP "S"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "sxlock/innodb/hash_table_locks" OP "X"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "sxlock/innodb/index_tree_rw_lock" OP "S"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "sxlock/innodb/lock_sys_global_rw_lock" OP "S"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "sxlock/innodb/lock_sys_global_rw_lock" OP "X"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "sxlock/innodb/log_sn_lock" OP "S"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "sxlock/innodb/rsegs_lock" OP "S"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "sxlock/innodb/trx_purge_latch" OP "S"
+ARC FROM "mutex/group_rpl/LOCK_plugin_running" TO "sxlock/innodb/undo_spaces_lock" OP "S"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_action_notification" TO "mutex/group_rpl/LOCK_primary_election_action_phase"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_action_phase" TO "mutex/group_rpl/LOCK_group_member_info_update_lock"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_primary_process_run" TO "mutex/group_rpl/LOCK_group_member_info_update_lock"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_primary_process_run" TO "mutex/group_rpl/LOCK_pipeline_continuation"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_primary_process_run" TO "mutex/group_rpl/LOCK_primary_election_action_notification"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_primary_process_run" TO "mutex/group_rpl/LOCK_primary_election_action_phase"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_primary_process_run" TO "mutex/group_rpl/LOCK_stage_monitor_handler"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_primary_process_run" TO "mutex/group_rpl/LOCK_synchronized_queue"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_primary_process_run" TO "rwlock/group_rpl/RWLOCK_group_event_observation_list" OP "R"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_primary_process_run" TO "rwlock/group_rpl/RWLOCK_group_event_observation_list" OP "W"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_secondary_process_run" TO "mutex/group_rpl/LOCK_group_member_info_update_lock"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_secondary_process_run" TO "mutex/group_rpl/LOCK_primary_election_action_notification"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_secondary_process_run" TO "mutex/group_rpl/LOCK_primary_election_action_phase"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_secondary_process_run" TO "mutex/group_rpl/LOCK_stage_monitor_handler"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_secondary_process_run" TO "mutex/group_rpl/LOCK_synchronized_queue"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_secondary_process_run" TO "mutex/sql/Cost_constant_cache::LOCK_cost_const"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_secondary_process_run" TO "mutex/sql/DEBUG_SYNC::mutex"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_secondary_process_run" TO "mutex/sql/LOCK_connection_count"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_secondary_process_run" TO "mutex/sql/LOCK_global_system_variables"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_secondary_process_run" TO "mutex/sql/LOCK_plugin"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_secondary_process_run" TO "mutex/sql/LOCK_replica_list"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_secondary_process_run" TO "mutex/sql/LOCK_sql_rand"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_secondary_process_run" TO "mutex/sql/LOCK_status"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_secondary_process_run" TO "mutex/sql/LOCK_thd_list"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_secondary_process_run" TO "mutex/sql/LOCK_thd_remove"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_secondary_process_run" TO "mutex/sql/LOCK_thread_ids"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_secondary_process_run" TO "mutex/sql/LOCK_transaction_cache"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_secondary_process_run" TO "mutex/sql/LOG::LOCK_log"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_secondary_process_run" TO "mutex/sql/THD::LOCK_query_plan"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_secondary_process_run" TO "mutex/sql/THD::LOCK_thd_data"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_secondary_process_run" TO "mutex/sql/THD::LOCK_thd_protocol"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_secondary_process_run" TO "mutex/sql/THD::LOCK_thd_query"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_secondary_process_run" TO "mutex/sql/THD::LOCK_thd_sysvar"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_secondary_process_run" TO "rwlock/group_rpl/RWLOCK_group_event_observation_list" OP "R"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_secondary_process_run" TO "rwlock/group_rpl/RWLOCK_group_event_observation_list" OP "W"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_secondary_process_run" TO "rwlock/group_rpl/RWLOCK_transaction_observation_list" OP "R"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_secondary_process_run" TO "rwlock/session/LOCK_srv_session_collection" OP "R"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_secondary_process_run" TO "rwlock/session/LOCK_srv_session_collection" OP "W"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_secondary_process_run" TO "rwlock/sql/LOCK_system_variables_hash" OP "R"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_secondary_process_run" TO "rwlock/sql/LOGGER::LOCK_logger" OP "R"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_secondary_process_run" TO "rwlock/sql/Trans_delegate::lock" OP "R"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_validation_notification" TO "mutex/group_rpl/LOCK_group_member_info_update_lock"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_validation_notification" TO "mutex/sql/Relay_log_info::run_lock"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_validation_notification" TO "mutex/sql/Source_info::run_lock"
+ARC FROM "mutex/group_rpl/LOCK_primary_election_validation_notification" TO "rwlock/group_rpl/RWLOCK_gcs_operations" OP "R"
+ARC FROM "mutex/group_rpl/LOCK_primary_promotion_policy" TO "mutex/group_rpl/LOCK_group_member_info_update_lock"
+ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "cond/sql/DEBUG_SYNC::cond"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "cond/sql/Relay_log_info::start_cond"
+ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "cond/sql/Relay_log_info::stop_cond"
+ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "cond/sql/Source_info::start_cond"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/group_rpl/LOCK_group_member_info_manager_update_lock"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/group_rpl/LOCK_group_member_info_update_lock"
+ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/innodb/buf_pool_chunks_mutex"
+ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/innodb/buf_pool_flush_state_mutex"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/innodb/buf_pool_free_list_mutex"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/innodb/buf_pool_LRU_list_mutex"
+ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/innodb/buf_pool_zip_mutex"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/innodb/dict_sys_mutex"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/innodb/dict_table_mutex"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/innodb/fil_system_mutex"
@@ -154,20 +450,22 @@
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/innodb/lock_sys_table_mutex"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/innodb/purge_sys_pq_mutex"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/innodb/rw_lock_debug_mutex"
+ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/innodb/sync_array_mutex"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/innodb/trx_mutex"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/innodb/trx_pool_manager_mutex"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/innodb/trx_pool_mutex"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/innodb/trx_sys_serialisation_mutex"
+ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/innodb/trx_sys_shard_mutex"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/innodb/trx_undo_mutex"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/innodb/undo_space_rseg_mutex"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/mysys/THR_LOCK_open"
+ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/sql/DEBUG_SYNC::mutex"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/sql/key_mta_temp_table_LOCK"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/sql/LOCK_open"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/sql/LOCK_plugin"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/sql/LOCK_sql_replica_skip_counter"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/sql/LOCK_table_cache"
-ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/sql/Source_info::data_lock"
-ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/sql/Source_info::run_lock"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/sql/MYSQL_RELAY_LOG::LOCK_index"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/sql/MYSQL_RELAY_LOG::LOCK_log"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/sql/MYSQL_RELAY_LOG::LOCK_log_end_pos"
@@ -176,13 +474,19 @@
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/sql/Relay_log_info::log_space_lock"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/sql/Relay_log_info::run_lock"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/sql/Replica_reporting_capability::err_lock"
+ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/sql/Source_info::data_lock"
+ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/sql/Source_info::run_lock"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/sql/THD::LOCK_current_cond"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "mutex/sql/THD::LOCK_thd_data"
+ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "prlock/sql/MDL_lock::rwlock" OP "W"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "rwlock/group_rpl/RWLOCK_channel_observation_list" OP "R"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "rwlock/group_rpl/RWLOCK_channel_observation_list" OP "W"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "rwlock/sql/Binlog_relay_IO_delegate::lock" OP "R"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "rwlock/sql/channel_lock" OP "W"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "rwlock/sql/gtid_retrieved" OP "W"
+ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "rwlock/sql/rpl_filter_lock" OP "R"
+ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "sxlock/innodb/btr_search_latch" OP "X"
+ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "sxlock/innodb/dict_table_stats" OP "X"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "sxlock/innodb/fil_space_latch" OP "X"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "sxlock/innodb/hash_table_locks" OP "S"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "sxlock/innodb/hash_table_locks" OP "X"
@@ -193,12 +497,17 @@
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "sxlock/innodb/rsegs_lock" OP "S"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "sxlock/innodb/trx_purge_latch" OP "S"
 ARC FROM "mutex/group_rpl/LOCK_recovery_donor_selection" TO "sxlock/innodb/undo_spaces_lock" OP "S"
+ARC FROM "mutex/group_rpl/LOCK_recovery_module_run" TO "mutex/group_rpl/LOCK_applier_module_suspend"
+ARC FROM "mutex/group_rpl/LOCK_recovery_module_run" TO "mutex/group_rpl/LOCK_recovery"
 ARC FROM "mutex/group_rpl/LOCK_recovery_module_run" TO "mutex/group_rpl/LOCK_stage_monitor_handler"
 ARC FROM "mutex/group_rpl/LOCK_recovery_module_run" TO "mutex/sql/LOCK_replica_list"
+ARC FROM "mutex/group_rpl/LOCK_recovery_module_run" TO "mutex/sql/THD::LOCK_current_cond"
 ARC FROM "mutex/group_rpl/LOCK_recovery_module_run" TO "mutex/sql/THD::LOCK_thd_data"
 ARC FROM "mutex/group_rpl/LOCK_recovery_module_run" TO "mutex/sql/THD::LOCK_thd_query"
 ARC FROM "mutex/group_rpl/LOCK_session_thread_run" TO "mutex/group_rpl/LOCK_synchronized_queue"
+ARC FROM "mutex/group_rpl/LOCK_transaction_unblocking" TO "mutex/group_rpl/LOCK_wait_ticket"
 ARC FROM "mutex/group_rpl/LOCK_wait_ticket" TO "mutex/group_rpl/LOCK_count_down_latch"
+ARC FROM "mutex/group_rpl/LOCK_write_lock_protection" TO "mutex/sql/DEBUG_SYNC::mutex"
 ARC FROM "mutex/group_rpl/LOCK_write_lock_protection" TO "rwlock/group_rpl/RWLOCK_plugin_stop" OP "R"
 ARC FROM "mutex/group_rpl/LOCK_write_lock_protection" TO "rwlock/group_rpl/RWLOCK_plugin_stop" OP "W"
 ARC FROM "mutex/innodb/autoinc_mutex" TO "mutex/innodb/autoinc_persisted_mutex"
@@ -206,8 +515,6 @@
 ARC FROM "mutex/innodb/autoinc_mutex" TO "mutex/innodb/buf_pool_flush_state_mutex"
 ARC FROM "mutex/innodb/autoinc_mutex" TO "mutex/innodb/buf_pool_free_list_mutex"
 ARC FROM "mutex/innodb/autoinc_mutex" TO "mutex/innodb/buf_pool_LRU_list_mutex"
-ARC FROM "mutex/innodb/autoinc_mutex" TO "mutex/innodb/buf_pool_zip_free_mutex"
-ARC FROM "mutex/innodb/autoinc_mutex" TO "mutex/innodb/buf_pool_zip_hash_mutex"
 ARC FROM "mutex/innodb/autoinc_mutex" TO "mutex/innodb/buf_pool_zip_mutex"
 ARC FROM "mutex/innodb/autoinc_mutex" TO "mutex/innodb/fil_system_mutex"
 ARC FROM "mutex/innodb/autoinc_mutex" TO "mutex/innodb/flush_list_mutex"
@@ -299,6 +606,7 @@
 ARC FROM "mutex/innodb/clone_snapshot_mutex" TO "mutex/innodb/page_sys_arch_oper_mutex"
 ARC FROM "mutex/innodb/clone_snapshot_mutex" TO "mutex/innodb/rw_lock_debug_mutex"
 ARC FROM "mutex/innodb/clone_snapshot_mutex" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "mutex/innodb/clone_snapshot_mutex" TO "mutex/innodb/trx_sys_serialisation_mutex"
 ARC FROM "mutex/innodb/clone_snapshot_mutex" TO "mutex/sql/DEBUG_SYNC::mutex"
 ARC FROM "mutex/innodb/clone_snapshot_mutex" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_log"
 ARC FROM "mutex/innodb/clone_snapshot_mutex" TO "mutex/sql/THD::LOCK_current_cond"
@@ -336,6 +644,7 @@
 ARC FROM "mutex/innodb/dict_persist_dirty_tables_mutex" TO "mutex/innodb/buf_pool_flush_state_mutex"
 ARC FROM "mutex/innodb/dict_persist_dirty_tables_mutex" TO "mutex/innodb/buf_pool_free_list_mutex"
 ARC FROM "mutex/innodb/dict_persist_dirty_tables_mutex" TO "mutex/innodb/buf_pool_LRU_list_mutex"
+ARC FROM "mutex/innodb/dict_persist_dirty_tables_mutex" TO "mutex/innodb/buf_pool_zip_free_mutex"
 ARC FROM "mutex/innodb/dict_persist_dirty_tables_mutex" TO "mutex/innodb/buf_pool_zip_mutex"
 ARC FROM "mutex/innodb/dict_persist_dirty_tables_mutex" TO "mutex/innodb/fil_system_mutex"
 ARC FROM "mutex/innodb/dict_persist_dirty_tables_mutex" TO "mutex/innodb/flush_list_mutex"
@@ -380,17 +689,17 @@
 ARC FROM "mutex/innodb/dict_sys_mutex" TO "mutex/innodb/trx_pool_manager_mutex"
 ARC FROM "mutex/innodb/dict_sys_mutex" TO "mutex/innodb/trx_pool_mutex"
 ARC FROM "mutex/innodb/dict_sys_mutex" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "mutex/innodb/dict_sys_mutex" TO "mutex/innodb/trx_sys_serialisation_mutex"
+ARC FROM "mutex/innodb/dict_sys_mutex" TO "mutex/innodb/trx_sys_shard_mutex"
 ARC FROM "mutex/innodb/dict_sys_mutex" TO "mutex/innodb/undo_space_rseg_mutex"
 ARC FROM "mutex/innodb/dict_sys_mutex" TO "mutex/innodb/zip_pad_mutex"
 ARC FROM "mutex/innodb/dict_sys_mutex" TO "mutex/mysys/THR_LOCK_open"
 ARC FROM "mutex/innodb/dict_sys_mutex" TO "mutex/sql/DEBUG_SYNC::mutex"
 ARC FROM "mutex/innodb/dict_sys_mutex" TO "mutex/sql/LOCK_keyring_operations"
 ARC FROM "mutex/innodb/dict_sys_mutex" TO "mutex/sql/LOCK_plugin"
-ARC FROM "mutex/innodb/dict_sys_mutex" TO "mutex/sql/THD::LOCK_current_cond"
 ARC FROM "mutex/innodb/dict_sys_mutex" TO "prlock/sql/MDL_lock::rwlock" OP "W"
 ARC FROM "mutex/innodb/dict_sys_mutex" TO "rwlock/keyring/LOCK_keyring" OP "R"
 ARC FROM "mutex/innodb/dict_sys_mutex" TO "rwlock/keyring/LOCK_keyring" OP "W"
-ARC FROM "mutex/innodb/dict_sys_mutex" TO "rwlock/sql/THR_LOCK_udf" OP "R"
 ARC FROM "mutex/innodb/dict_sys_mutex" TO "sxlock/innodb/btr_search_latch" OP "S"
 ARC FROM "mutex/innodb/dict_sys_mutex" TO "sxlock/innodb/btr_search_latch" OP "X"
 ARC FROM "mutex/innodb/dict_sys_mutex" TO "sxlock/innodb/dict_table_stats" OP "S"
@@ -418,7 +727,6 @@
 ARC FROM "mutex/innodb/fil_system_mutex" TO "mutex/innodb/rw_lock_debug_mutex"
 ARC FROM "mutex/innodb/fil_system_mutex" TO "mutex/innodb/rw_lock_list_mutex"
 ARC FROM "mutex/innodb/fil_system_mutex" TO "mutex/innodb/sync_array_mutex"
-ARC FROM "mutex/innodb/flush_list_mutex" TO "mutex/innodb/page_sys_arch_oper_mutex"
 ARC FROM "mutex/innodb/flush_list_mutex" TO "mutex/innodb/rw_lock_debug_mutex"
 ARC FROM "mutex/innodb/ibuf_bitmap_mutex" TO "mutex/innodb/buf_pool_chunks_mutex"
 ARC FROM "mutex/innodb/ibuf_bitmap_mutex" TO "mutex/innodb/buf_pool_flush_state_mutex"
@@ -448,9 +756,13 @@
 ARC FROM "mutex/innodb/ibuf_mutex" TO "sxlock/innodb/hash_table_locks" OP "X"
 ARC FROM "mutex/innodb/ibuf_mutex" TO "sxlock/innodb/index_tree_rw_lock" OP "SX"
 ARC FROM "mutex/innodb/ibuf_mutex" TO "sxlock/innodb/lock_sys_global_rw_lock" OP "S"
+ARC FROM "mutex/innodb/ibuf_pessimistic_insert_mutex" TO "mutex/innodb/buf_pool_chunks_mutex"
+ARC FROM "mutex/innodb/ibuf_pessimistic_insert_mutex" TO "mutex/innodb/buf_pool_flush_state_mutex"
 ARC FROM "mutex/innodb/ibuf_pessimistic_insert_mutex" TO "mutex/innodb/buf_pool_free_list_mutex"
 ARC FROM "mutex/innodb/ibuf_pessimistic_insert_mutex" TO "mutex/innodb/buf_pool_LRU_list_mutex"
+ARC FROM "mutex/innodb/ibuf_pessimistic_insert_mutex" TO "mutex/innodb/buf_pool_zip_mutex"
 ARC FROM "mutex/innodb/ibuf_pessimistic_insert_mutex" TO "mutex/innodb/fil_system_mutex"
+ARC FROM "mutex/innodb/ibuf_pessimistic_insert_mutex" TO "mutex/innodb/flush_list_mutex"
 ARC FROM "mutex/innodb/ibuf_pessimistic_insert_mutex" TO "mutex/innodb/ibuf_mutex"
 ARC FROM "mutex/innodb/ibuf_pessimistic_insert_mutex" TO "mutex/innodb/lock_sys_page_mutex"
 ARC FROM "mutex/innodb/ibuf_pessimistic_insert_mutex" TO "mutex/innodb/rw_lock_debug_mutex"
@@ -472,15 +784,19 @@
 ARC FROM "mutex/innodb/lock_sys_page_mutex" TO "mutex/innodb/sync_array_mutex"
 ARC FROM "mutex/innodb/lock_sys_page_mutex" TO "mutex/innodb/trx_mutex"
 ARC FROM "mutex/innodb/lock_sys_page_mutex" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "mutex/innodb/lock_sys_page_mutex" TO "mutex/innodb/trx_sys_shard_mutex"
 ARC FROM "mutex/innodb/lock_sys_page_mutex" TO "mutex/sql/DEBUG_SYNC::mutex"
 ARC FROM "mutex/innodb/lock_sys_page_mutex" TO "mutex/sql/MDL_wait::LOCK_wait_status"
+ARC FROM "mutex/innodb/lock_sys_page_mutex" TO "mutex/sql/THD::LOCK_current_cond"
 ARC FROM "mutex/innodb/lock_sys_page_mutex" TO "sxlock/innodb/btr_search_latch" OP "S"
 ARC FROM "mutex/innodb/lock_sys_page_mutex" TO "sxlock/innodb/btr_search_latch" OP "X"
 ARC FROM "mutex/innodb/lock_sys_page_mutex" TO "sxlock/innodb/hash_table_locks" OP "X"
 ARC FROM "mutex/innodb/lock_sys_table_mutex" TO "mutex/innodb/buf_pool_free_list_mutex"
+ARC FROM "mutex/innodb/lock_sys_table_mutex" TO "mutex/innodb/buf_pool_LRU_list_mutex"
 ARC FROM "mutex/innodb/lock_sys_table_mutex" TO "mutex/innodb/rw_lock_debug_mutex"
 ARC FROM "mutex/innodb/lock_sys_table_mutex" TO "mutex/innodb/sync_array_mutex"
 ARC FROM "mutex/innodb/lock_sys_table_mutex" TO "mutex/innodb/trx_mutex"
+ARC FROM "mutex/innodb/lock_sys_table_mutex" TO "sxlock/innodb/hash_table_locks" OP "X"
 ARC FROM "mutex/innodb/lock_wait_mutex" TO "mutex/innodb/rw_lock_debug_mutex"
 ARC FROM "mutex/innodb/lock_wait_mutex" TO "mutex/innodb/sync_array_mutex"
 ARC FROM "mutex/innodb/lock_wait_mutex" TO "mutex/innodb/trx_mutex"
@@ -503,6 +819,7 @@
 ARC FROM "mutex/innodb/log_sn_mutex" TO "mutex/innodb/log_writer_mutex"
 ARC FROM "mutex/innodb/log_sn_mutex" TO "mutex/innodb/page_sys_arch_oper_mutex"
 ARC FROM "mutex/innodb/log_sn_mutex" TO "mutex/innodb/rw_lock_debug_mutex"
+ARC FROM "mutex/innodb/log_sn_mutex" TO "mutex/innodb/sync_array_mutex"
 ARC FROM "mutex/innodb/log_sn_mutex" TO "mutex/sql/DEBUG_SYNC::mutex"
 ARC FROM "mutex/innodb/log_sn_mutex" TO "sxlock/innodb/log_sn_lock" OP "X"
 ARC FROM "mutex/innodb/log_sys_arch_mutex" TO "mutex/innodb/log_writer_mutex"
@@ -548,10 +865,21 @@
 ARC FROM "mutex/innodb/parser_mutex" TO "mutex/innodb/dict_sys_mutex"
 ARC FROM "mutex/innodb/parser_mutex" TO "mutex/innodb/rw_lock_debug_mutex"
 ARC FROM "mutex/innodb/parser_mutex" TO "mutex/innodb/sync_array_mutex"
+ARC FROM "mutex/innodb/purge_sys_pq_mutex" TO "cond/sql/DEBUG_SYNC::cond"
+ARC FROM "mutex/innodb/purge_sys_pq_mutex" TO "mutex/innodb/buf_pool_free_list_mutex"
+ARC FROM "mutex/innodb/purge_sys_pq_mutex" TO "mutex/innodb/buf_pool_LRU_list_mutex"
+ARC FROM "mutex/innodb/purge_sys_pq_mutex" TO "mutex/innodb/fil_system_mutex"
+ARC FROM "mutex/innodb/purge_sys_pq_mutex" TO "mutex/innodb/flush_list_mutex"
+ARC FROM "mutex/innodb/purge_sys_pq_mutex" TO "mutex/innodb/rw_lock_debug_mutex"
+ARC FROM "mutex/innodb/purge_sys_pq_mutex" TO "mutex/innodb/sync_array_mutex"
+ARC FROM "mutex/innodb/purge_sys_pq_mutex" TO "mutex/innodb/trx_sys_serialisation_mutex"
+ARC FROM "mutex/innodb/purge_sys_pq_mutex" TO "mutex/sql/DEBUG_SYNC::mutex"
+ARC FROM "mutex/innodb/purge_sys_pq_mutex" TO "sxlock/innodb/hash_table_locks" OP "S"
+ARC FROM "mutex/innodb/purge_sys_pq_mutex" TO "sxlock/innodb/hash_table_locks" OP "X"
+ARC FROM "mutex/innodb/purge_sys_pq_mutex" TO "sxlock/innodb/log_sn_lock" OP "S"
 ARC FROM "mutex/innodb/rtr_active_mutex" TO "mutex/innodb/rtr_match_mutex"
 ARC FROM "mutex/innodb/rtr_active_mutex" TO "mutex/innodb/rtr_path_mutex"
 ARC FROM "mutex/innodb/rw_lock_list_mutex" TO "mutex/innodb/rw_lock_debug_mutex"
-ARC FROM "mutex/innodb/srv_innodb_monitor_mutex" TO "cond/sql/DEBUG_SYNC::cond"
 ARC FROM "mutex/innodb/srv_innodb_monitor_mutex" TO "mutex/innodb/buf_pool_LRU_list_mutex"
 ARC FROM "mutex/innodb/srv_innodb_monitor_mutex" TO "mutex/innodb/buf_pool_zip_mutex"
 ARC FROM "mutex/innodb/srv_innodb_monitor_mutex" TO "mutex/innodb/dict_foreign_err_mutex"
@@ -565,17 +893,16 @@
 ARC FROM "mutex/innodb/srv_innodb_monitor_mutex" TO "mutex/innodb/sync_array_mutex"
 ARC FROM "mutex/innodb/srv_innodb_monitor_mutex" TO "mutex/innodb/trx_mutex"
 ARC FROM "mutex/innodb/srv_innodb_monitor_mutex" TO "mutex/innodb/trx_sys_mutex"
-ARC FROM "mutex/innodb/srv_innodb_monitor_mutex" TO "mutex/sql/DEBUG_SYNC::mutex"
+ARC FROM "mutex/innodb/srv_innodb_monitor_mutex" TO "mutex/innodb/trx_sys_serialisation_mutex"
+ARC FROM "mutex/innodb/srv_innodb_monitor_mutex" TO "mutex/innodb/trx_sys_shard_mutex"
 ARC FROM "mutex/innodb/srv_innodb_monitor_mutex" TO "mutex/sql/THD::LOCK_thd_query"
 ARC FROM "mutex/innodb/srv_innodb_monitor_mutex" TO "sxlock/innodb/btr_search_latch" OP "S"
 ARC FROM "mutex/innodb/srv_innodb_monitor_mutex" TO "sxlock/innodb/hash_table_locks" OP "S"
 ARC FROM "mutex/innodb/srv_innodb_monitor_mutex" TO "sxlock/innodb/lock_sys_global_rw_lock" OP "S"
-ARC FROM "mutex/innodb/srv_innodb_monitor_mutex" TO "sxlock/innodb/lock_sys_global_rw_lock" OP "TRY X"
 ARC FROM "mutex/innodb/srv_innodb_monitor_mutex" TO "sxlock/innodb/lock_sys_global_rw_lock" OP "X"
 ARC FROM "mutex/innodb/srv_innodb_monitor_mutex" TO "sxlock/innodb/rsegs_lock" OP "S"
 ARC FROM "mutex/innodb/srv_innodb_monitor_mutex" TO "sxlock/innodb/trx_purge_latch" OP "S"
 ARC FROM "mutex/innodb/srv_innodb_monitor_mutex" TO "sxlock/innodb/undo_spaces_lock" OP "S"
-ARC FROM "mutex/innodb/srv_monitor_file_mutex" TO "cond/sql/DEBUG_SYNC::cond"
 ARC FROM "mutex/innodb/srv_monitor_file_mutex" TO "mutex/innodb/dict_foreign_err_mutex"
 ARC FROM "mutex/innodb/srv_monitor_file_mutex" TO "mutex/innodb/fil_system_mutex"
 ARC FROM "mutex/innodb/srv_monitor_file_mutex" TO "mutex/innodb/ibuf_mutex"
@@ -587,12 +914,11 @@
 ARC FROM "mutex/innodb/srv_monitor_file_mutex" TO "mutex/innodb/sync_array_mutex"
 ARC FROM "mutex/innodb/srv_monitor_file_mutex" TO "mutex/innodb/trx_mutex"
 ARC FROM "mutex/innodb/srv_monitor_file_mutex" TO "mutex/innodb/trx_sys_mutex"
-ARC FROM "mutex/innodb/srv_monitor_file_mutex" TO "mutex/sql/DEBUG_SYNC::mutex"
+ARC FROM "mutex/innodb/srv_monitor_file_mutex" TO "mutex/innodb/trx_sys_shard_mutex"
 ARC FROM "mutex/innodb/srv_monitor_file_mutex" TO "mutex/sql/THD::LOCK_thd_query"
 ARC FROM "mutex/innodb/srv_monitor_file_mutex" TO "sxlock/innodb/btr_search_latch" OP "S"
 ARC FROM "mutex/innodb/srv_monitor_file_mutex" TO "sxlock/innodb/hash_table_locks" OP "S"
 ARC FROM "mutex/innodb/srv_monitor_file_mutex" TO "sxlock/innodb/lock_sys_global_rw_lock" OP "S"
-ARC FROM "mutex/innodb/srv_monitor_file_mutex" TO "sxlock/innodb/lock_sys_global_rw_lock" OP "TRY X"
 ARC FROM "mutex/innodb/srv_monitor_file_mutex" TO "sxlock/innodb/lock_sys_global_rw_lock" OP "X"
 ARC FROM "mutex/innodb/sync_array_mutex" TO "mutex/innodb/rw_lock_debug_mutex"
 ARC FROM "mutex/innodb/temp_pool_manager_mutex" TO "mutex/innodb/buf_pool_free_list_mutex"
@@ -601,6 +927,7 @@
 ARC FROM "mutex/innodb/temp_pool_manager_mutex" TO "mutex/innodb/flush_list_mutex"
 ARC FROM "mutex/innodb/temp_pool_manager_mutex" TO "mutex/innodb/rw_lock_debug_mutex"
 ARC FROM "mutex/innodb/temp_pool_manager_mutex" TO "mutex/innodb/rw_lock_list_mutex"
+ARC FROM "mutex/innodb/temp_pool_manager_mutex" TO "mutex/innodb/sync_array_mutex"
 ARC FROM "mutex/innodb/temp_pool_manager_mutex" TO "sxlock/innodb/fil_space_latch" OP "X"
 ARC FROM "mutex/innodb/temp_pool_manager_mutex" TO "sxlock/innodb/hash_table_locks" OP "S"
 ARC FROM "mutex/innodb/temp_pool_manager_mutex" TO "sxlock/innodb/hash_table_locks" OP "X"
@@ -616,7 +943,7 @@
 ARC FROM "mutex/innodb/temp_space_rseg_mutex" TO "mutex/innodb/purge_sys_pq_mutex"
 ARC FROM "mutex/innodb/temp_space_rseg_mutex" TO "mutex/innodb/rw_lock_debug_mutex"
 ARC FROM "mutex/innodb/temp_space_rseg_mutex" TO "mutex/innodb/sync_array_mutex"
-ARC FROM "mutex/innodb/temp_space_rseg_mutex" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "mutex/innodb/temp_space_rseg_mutex" TO "mutex/innodb/trx_sys_serialisation_mutex"
 ARC FROM "mutex/innodb/temp_space_rseg_mutex" TO "sxlock/innodb/btr_search_latch" OP "S"
 ARC FROM "mutex/innodb/temp_space_rseg_mutex" TO "sxlock/innodb/btr_search_latch" OP "X"
 ARC FROM "mutex/innodb/temp_space_rseg_mutex" TO "sxlock/innodb/fil_space_latch" OP "X"
@@ -634,6 +961,7 @@
 ARC FROM "mutex/innodb/trx_mutex" TO "mutex/innodb/trx_mutex"
 ARC FROM "mutex/innodb/trx_mutex" TO "mutex/sql/DEBUG_SYNC::mutex"
 ARC FROM "mutex/innodb/trx_mutex" TO "mutex/sql/MDL_wait::LOCK_wait_status"
+ARC FROM "mutex/innodb/trx_mutex" TO "mutex/sql/THD::LOCK_current_cond"
 ARC FROM "mutex/innodb/trx_mutex" TO "mutex/sql/THD::LOCK_thd_query"
 ARC FROM "mutex/innodb/trx_mutex" TO "sxlock/innodb/btr_search_latch" OP "S"
 ARC FROM "mutex/innodb/trx_mutex" TO "sxlock/innodb/btr_search_latch" OP "X"
@@ -647,14 +975,31 @@
 ARC FROM "mutex/innodb/trx_sys_mutex" TO "mutex/innodb/dict_foreign_err_mutex"
 ARC FROM "mutex/innodb/trx_sys_mutex" TO "mutex/innodb/fil_system_mutex"
 ARC FROM "mutex/innodb/trx_sys_mutex" TO "mutex/innodb/flush_list_mutex"
-ARC FROM "mutex/innodb/trx_sys_mutex" TO "mutex/innodb/purge_sys_pq_mutex"
 ARC FROM "mutex/innodb/trx_sys_mutex" TO "mutex/innodb/rw_lock_debug_mutex"
 ARC FROM "mutex/innodb/trx_sys_mutex" TO "mutex/innodb/sync_array_mutex"
 ARC FROM "mutex/innodb/trx_sys_mutex" TO "mutex/innodb/trx_mutex"
+ARC FROM "mutex/innodb/trx_sys_mutex" TO "mutex/innodb/trx_sys_shard_mutex"
 ARC FROM "mutex/innodb/trx_sys_mutex" TO "mutex/sql/THD::LOCK_thd_query"
 ARC FROM "mutex/innodb/trx_sys_mutex" TO "sxlock/innodb/hash_table_locks" OP "S"
 ARC FROM "mutex/innodb/trx_sys_mutex" TO "sxlock/innodb/hash_table_locks" OP "X"
 ARC FROM "mutex/innodb/trx_sys_mutex" TO "sxlock/innodb/log_sn_lock" OP "S"
+ARC FROM "mutex/innodb/trx_sys_serialisation_mutex" TO "cond/sql/DEBUG_SYNC::cond"
+ARC FROM "mutex/innodb/trx_sys_serialisation_mutex" TO "mutex/innodb/buf_pool_chunks_mutex"
+ARC FROM "mutex/innodb/trx_sys_serialisation_mutex" TO "mutex/innodb/buf_pool_flush_state_mutex"
+ARC FROM "mutex/innodb/trx_sys_serialisation_mutex" TO "mutex/innodb/buf_pool_free_list_mutex"
+ARC FROM "mutex/innodb/trx_sys_serialisation_mutex" TO "mutex/innodb/buf_pool_LRU_list_mutex"
+ARC FROM "mutex/innodb/trx_sys_serialisation_mutex" TO "mutex/innodb/buf_pool_zip_mutex"
+ARC FROM "mutex/innodb/trx_sys_serialisation_mutex" TO "mutex/innodb/fil_system_mutex"
+ARC FROM "mutex/innodb/trx_sys_serialisation_mutex" TO "mutex/innodb/flush_list_mutex"
+ARC FROM "mutex/innodb/trx_sys_serialisation_mutex" TO "mutex/innodb/rw_lock_debug_mutex"
+ARC FROM "mutex/innodb/trx_sys_serialisation_mutex" TO "mutex/innodb/sync_array_mutex"
+ARC FROM "mutex/innodb/trx_sys_serialisation_mutex" TO "mutex/sql/DEBUG_SYNC::mutex"
+ARC FROM "mutex/innodb/trx_sys_serialisation_mutex" TO "sxlock/innodb/hash_table_locks" OP "S"
+ARC FROM "mutex/innodb/trx_sys_serialisation_mutex" TO "sxlock/innodb/hash_table_locks" OP "X"
+ARC FROM "mutex/innodb/trx_sys_serialisation_mutex" TO "sxlock/innodb/log_sn_lock" OP "S"
+ARC FROM "mutex/innodb/trx_sys_shard_mutex" TO "mutex/innodb/rw_lock_debug_mutex"
+ARC FROM "mutex/innodb/trx_sys_shard_mutex" TO "mutex/innodb/sync_array_mutex"
+ARC FROM "mutex/innodb/trx_sys_shard_mutex" TO "mutex/innodb/trx_mutex"
 ARC FROM "mutex/innodb/trx_undo_mutex" TO "mutex/innodb/buf_pool_chunks_mutex"
 ARC FROM "mutex/innodb/trx_undo_mutex" TO "mutex/innodb/buf_pool_flush_state_mutex"
 ARC FROM "mutex/innodb/trx_undo_mutex" TO "mutex/innodb/buf_pool_free_list_mutex"
@@ -674,6 +1019,7 @@
 ARC FROM "mutex/innodb/trx_undo_mutex" TO "sxlock/innodb/hash_table_locks" OP "S"
 ARC FROM "mutex/innodb/trx_undo_mutex" TO "sxlock/innodb/hash_table_locks" OP "X"
 ARC FROM "mutex/innodb/trx_undo_mutex" TO "sxlock/innodb/log_sn_lock" OP "S"
+ARC FROM "mutex/innodb/undo_space_rseg_mutex" TO "cond/sql/DEBUG_SYNC::cond"
 ARC FROM "mutex/innodb/undo_space_rseg_mutex" TO "mutex/innodb/buf_pool_chunks_mutex"
 ARC FROM "mutex/innodb/undo_space_rseg_mutex" TO "mutex/innodb/buf_pool_flush_state_mutex"
 ARC FROM "mutex/innodb/undo_space_rseg_mutex" TO "mutex/innodb/buf_pool_free_list_mutex"
@@ -688,16 +1034,15 @@
 ARC FROM "mutex/innodb/undo_space_rseg_mutex" TO "mutex/innodb/srv_sys_mutex"
 ARC FROM "mutex/innodb/undo_space_rseg_mutex" TO "mutex/innodb/sync_array_mutex"
 ARC FROM "mutex/innodb/undo_space_rseg_mutex" TO "mutex/innodb/temp_space_rseg_mutex"
-ARC FROM "mutex/innodb/undo_space_rseg_mutex" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "mutex/innodb/undo_space_rseg_mutex" TO "mutex/innodb/trx_sys_serialisation_mutex"
+ARC FROM "mutex/innodb/undo_space_rseg_mutex" TO "mutex/sql/DEBUG_SYNC::mutex"
 ARC FROM "mutex/innodb/undo_space_rseg_mutex" TO "sxlock/innodb/btr_search_latch" OP "S"
 ARC FROM "mutex/innodb/undo_space_rseg_mutex" TO "sxlock/innodb/btr_search_latch" OP "X"
 ARC FROM "mutex/innodb/undo_space_rseg_mutex" TO "sxlock/innodb/fil_space_latch" OP "X"
 ARC FROM "mutex/innodb/undo_space_rseg_mutex" TO "sxlock/innodb/hash_table_locks" OP "S"
 ARC FROM "mutex/innodb/undo_space_rseg_mutex" TO "sxlock/innodb/hash_table_locks" OP "X"
 ARC FROM "mutex/innodb/undo_space_rseg_mutex" TO "sxlock/innodb/log_sn_lock" OP "S"
-ARC FROM "mutex/myisam/MYISAM_SHARE::intern_lock" TO "cond/sql/DEBUG_SYNC::cond"
 ARC FROM "mutex/myisam/MYISAM_SHARE::intern_lock" TO "mutex/mysys/KEY_CACHE::cache_lock"
-ARC FROM "mutex/myisam/MYISAM_SHARE::intern_lock" TO "mutex/sql/DEBUG_SYNC::mutex"
 ARC FROM "mutex/myisam/MYISAM_SHARE::intern_lock" TO "mutex/sql/LOCK_plugin"
 ARC FROM "mutex/myisam/MYISAM_SHARE::intern_lock" TO "mutex/sql/THD::LOCK_thd_query"
 ARC FROM "mutex/myisam/MYISAM_SHARE::intern_lock" TO "rwlock/mysys/SAFE_HASH::lock" OP "W"
@@ -729,11 +1074,9 @@
 ARC FROM "mutex/mysys/THR_LOCK_charset" TO "mutex/mysys/THR_LOCK_open"
 ARC FROM "mutex/mysys/THR_LOCK::mutex" TO "mutex/csv/TINA_SHARE::mutex"
 ARC FROM "mutex/mysys/THR_LOCK::mutex" TO "mutex/sql/DEBUG_SYNC::mutex"
-ARC FROM "mutex/mysys/THR_LOCK_myisam" TO "cond/sql/DEBUG_SYNC::cond"
 ARC FROM "mutex/mysys/THR_LOCK_myisam" TO "mutex/myisam/MYISAM_SHARE::intern_lock"
 ARC FROM "mutex/mysys/THR_LOCK_myisam" TO "mutex/mysys/KEY_CACHE::cache_lock"
 ARC FROM "mutex/mysys/THR_LOCK_myisam" TO "mutex/mysys/THR_LOCK_open"
-ARC FROM "mutex/mysys/THR_LOCK_myisam" TO "mutex/sql/DEBUG_SYNC::mutex"
 ARC FROM "mutex/mysys/THR_LOCK_myisam" TO "mutex/sql/LOCK_plugin"
 ARC FROM "mutex/mysys/THR_LOCK_myisam" TO "rwlock/mysys/SAFE_HASH::lock" OP "R"
 ARC FROM "mutex/mysys/THR_LOCK_myisam" TO "rwlock/mysys/SAFE_HASH::lock" OP "W"
@@ -750,7 +1093,6 @@
 ARC FROM "mutex/p_dyn_loader/key_component_id_by_urn_mutex" TO "mutex/innodb/dict_table_mutex"
 ARC FROM "mutex/p_dyn_loader/key_component_id_by_urn_mutex" TO "mutex/innodb/fil_system_mutex"
 ARC FROM "mutex/p_dyn_loader/key_component_id_by_urn_mutex" TO "mutex/innodb/flush_list_mutex"
-ARC FROM "mutex/p_dyn_loader/key_component_id_by_urn_mutex" TO "mutex/innodb/ibuf_bitmap_mutex"
 ARC FROM "mutex/p_dyn_loader/key_component_id_by_urn_mutex" TO "mutex/innodb/innobase_share_mutex"
 ARC FROM "mutex/p_dyn_loader/key_component_id_by_urn_mutex" TO "mutex/innodb/lock_sys_page_mutex"
 ARC FROM "mutex/p_dyn_loader/key_component_id_by_urn_mutex" TO "mutex/innodb/lock_sys_table_mutex"
@@ -764,6 +1106,7 @@
 ARC FROM "mutex/p_dyn_loader/key_component_id_by_urn_mutex" TO "mutex/innodb/trx_pool_manager_mutex"
 ARC FROM "mutex/p_dyn_loader/key_component_id_by_urn_mutex" TO "mutex/innodb/trx_pool_mutex"
 ARC FROM "mutex/p_dyn_loader/key_component_id_by_urn_mutex" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "mutex/p_dyn_loader/key_component_id_by_urn_mutex" TO "mutex/innodb/trx_sys_shard_mutex"
 ARC FROM "mutex/p_dyn_loader/key_component_id_by_urn_mutex" TO "mutex/innodb/trx_undo_mutex"
 ARC FROM "mutex/p_dyn_loader/key_component_id_by_urn_mutex" TO "mutex/innodb/undo_space_rseg_mutex"
 ARC FROM "mutex/p_dyn_loader/key_component_id_by_urn_mutex" TO "mutex/myisam/MYISAM_SHARE::intern_lock"
@@ -777,8 +1120,14 @@
 ARC FROM "mutex/p_dyn_loader/key_component_id_by_urn_mutex" TO "mutex/sql/LOCK_global_system_variables"
 ARC FROM "mutex/p_dyn_loader/key_component_id_by_urn_mutex" TO "mutex/sql/LOCK_open"
 ARC FROM "mutex/p_dyn_loader/key_component_id_by_urn_mutex" TO "mutex/sql/LOCK_plugin"
+ARC FROM "mutex/p_dyn_loader/key_component_id_by_urn_mutex" TO "mutex/sql/LOCK_replica_list"
+ARC FROM "mutex/p_dyn_loader/key_component_id_by_urn_mutex" TO "mutex/sql/LOCK_sql_rand"
 ARC FROM "mutex/p_dyn_loader/key_component_id_by_urn_mutex" TO "mutex/sql/LOCK_status"
 ARC FROM "mutex/p_dyn_loader/key_component_id_by_urn_mutex" TO "mutex/sql/LOCK_table_cache"
+ARC FROM "mutex/p_dyn_loader/key_component_id_by_urn_mutex" TO "mutex/sql/LOCK_thd_list"
+ARC FROM "mutex/p_dyn_loader/key_component_id_by_urn_mutex" TO "mutex/sql/LOCK_thd_remove"
+ARC FROM "mutex/p_dyn_loader/key_component_id_by_urn_mutex" TO "mutex/sql/LOCK_thread_ids"
+ARC FROM "mutex/p_dyn_loader/key_component_id_by_urn_mutex" TO "mutex/sql/LOCK_transaction_cache"
 ARC FROM "mutex/p_dyn_loader/key_component_id_by_urn_mutex" TO "mutex/sql/LOG::LOCK_log"
 ARC FROM "mutex/p_dyn_loader/key_component_id_by_urn_mutex" TO "mutex/sql/THD::LOCK_query_plan"
 ARC FROM "mutex/p_dyn_loader/key_component_id_by_urn_mutex" TO "mutex/sql/THD::LOCK_thd_data"
@@ -800,7 +1149,6 @@
 ARC FROM "mutex/p_dyn_loader/key_component_id_by_urn_mutex" TO "sxlock/innodb/hash_table_locks" OP "S"
 ARC FROM "mutex/p_dyn_loader/key_component_id_by_urn_mutex" TO "sxlock/innodb/hash_table_locks" OP "X"
 ARC FROM "mutex/p_dyn_loader/key_component_id_by_urn_mutex" TO "sxlock/innodb/index_tree_rw_lock" OP "S"
-ARC FROM "mutex/p_dyn_loader/key_component_id_by_urn_mutex" TO "sxlock/innodb/index_tree_rw_lock" OP "SX"
 ARC FROM "mutex/p_dyn_loader/key_component_id_by_urn_mutex" TO "sxlock/innodb/lock_sys_global_rw_lock" OP "S"
 ARC FROM "mutex/p_dyn_loader/key_component_id_by_urn_mutex" TO "sxlock/innodb/log_sn_lock" OP "S"
 ARC FROM "mutex/p_dyn_loader/key_component_id_by_urn_mutex" TO "sxlock/innodb/rsegs_lock" OP "S"
@@ -812,7 +1160,6 @@
 ARC FROM "mutex/sql/Event_scheduler::LOCK_scheduler_state" TO "mutex/innodb/trx_mutex"
 ARC FROM "mutex/sql/Event_scheduler::LOCK_scheduler_state" TO "mutex/innodb/trx_pool_mutex"
 ARC FROM "mutex/sql/Event_scheduler::LOCK_scheduler_state" TO "mutex/innodb/trx_sys_mutex"
-ARC FROM "mutex/sql/Event_scheduler::LOCK_scheduler_state" TO "mutex/sql/Cost_constant_cache::LOCK_cost_const"
 ARC FROM "mutex/sql/Event_scheduler::LOCK_scheduler_state" TO "mutex/sql/DEBUG_SYNC::mutex"
 ARC FROM "mutex/sql/Event_scheduler::LOCK_scheduler_state" TO "mutex/sql/LOCK_event_queue"
 ARC FROM "mutex/sql/Event_scheduler::LOCK_scheduler_state" TO "mutex/sql/LOCK_global_system_variables"
@@ -829,6 +1176,7 @@
 ARC FROM "mutex/sql/Event_scheduler::LOCK_scheduler_state" TO "mutex/sql/THD::LOCK_thd_data"
 ARC FROM "mutex/sql/Event_scheduler::LOCK_scheduler_state" TO "mutex/sql/THD::LOCK_thd_query"
 ARC FROM "mutex/sql/Event_scheduler::LOCK_scheduler_state" TO "prlock/sql/MDL_lock::rwlock" OP "W"
+ARC FROM "mutex/sql/Event_scheduler::LOCK_scheduler_state" TO "rwlock/group_rpl/RWLOCK_transaction_observation_list" OP "R"
 ARC FROM "mutex/sql/Event_scheduler::LOCK_scheduler_state" TO "rwlock/sql/Trans_delegate::lock" OP "R"
 ARC FROM "mutex/sql/Event_scheduler::LOCK_scheduler_state" TO "sxlock/innodb/lock_sys_global_rw_lock" OP "X"
 ARC FROM "mutex/sql/Gtid_state" TO "mutex/sql/Gtid_set::gtid_executed::free_intervals_mutex"
@@ -857,6 +1205,8 @@
 ARC FROM "mutex/sql/key_mta_temp_table_LOCK" TO "mutex/innodb/trx_pool_manager_mutex"
 ARC FROM "mutex/sql/key_mta_temp_table_LOCK" TO "mutex/innodb/trx_pool_mutex"
 ARC FROM "mutex/sql/key_mta_temp_table_LOCK" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "mutex/sql/key_mta_temp_table_LOCK" TO "mutex/innodb/trx_sys_serialisation_mutex"
+ARC FROM "mutex/sql/key_mta_temp_table_LOCK" TO "mutex/innodb/trx_sys_shard_mutex"
 ARC FROM "mutex/sql/key_mta_temp_table_LOCK" TO "mutex/innodb/trx_undo_mutex"
 ARC FROM "mutex/sql/key_mta_temp_table_LOCK" TO "mutex/innodb/undo_space_rseg_mutex"
 ARC FROM "mutex/sql/key_mta_temp_table_LOCK" TO "mutex/myisam/MYISAM_SHARE::intern_lock"
@@ -872,6 +1222,7 @@
 ARC FROM "mutex/sql/key_mta_temp_table_LOCK" TO "mutex/sql/TABLE_SHARE::LOCK_ha_data"
 ARC FROM "mutex/sql/key_mta_temp_table_LOCK" TO "mutex/sql/THD::LOCK_thd_data"
 ARC FROM "mutex/sql/key_mta_temp_table_LOCK" TO "prlock/sql/MDL_lock::rwlock" OP "W"
+ARC FROM "mutex/sql/key_mta_temp_table_LOCK" TO "rwlock/sql/Trans_delegate::lock" OP "R"
 ARC FROM "mutex/sql/key_mta_temp_table_LOCK" TO "sxlock/innodb/btr_search_latch" OP "S"
 ARC FROM "mutex/sql/key_mta_temp_table_LOCK" TO "sxlock/innodb/btr_search_latch" OP "X"
 ARC FROM "mutex/sql/key_mta_temp_table_LOCK" TO "sxlock/innodb/dict_table_stats" OP "X"
@@ -892,14 +1243,19 @@
 ARC FROM "mutex/sql/LOCK_collect_instance_log" TO "mutex/innodb/rw_lock_debug_mutex"
 ARC FROM "mutex/sql/LOCK_collect_instance_log" TO "mutex/sql/DEBUG_SYNC::mutex"
 ARC FROM "mutex/sql/LOCK_collect_instance_log" TO "mutex/sql/LOCK_plugin"
-ARC FROM "mutex/sql/LOCK_collect_instance_log" TO "mutex/sql/Source_info::data_lock"
 ARC FROM "mutex/sql/LOCK_collect_instance_log" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_log"
+ARC FROM "mutex/sql/LOCK_collect_instance_log" TO "mutex/sql/Source_info::data_lock"
 ARC FROM "mutex/sql/LOCK_collect_instance_log" TO "rwlock/sql/gtid_commit_rollback" OP "W"
 ARC FROM "mutex/sql/LOCK_collect_instance_log" TO "sxlock/innodb/log_sn_lock" OP "X"
 ARC FROM "mutex/sql/LOCK_error_messages" TO "mutex/mysys/THR_LOCK_open"
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "cond/semisync/Ack_receiver::m_cond"
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "cond/sql/COND_flush_thread_cache"
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "cond/sql/DEBUG_SYNC::cond"
+ARC FROM "mutex/sql/LOCK_global_system_variables" TO "mutex/group_rpl/GCS_Gcs_suspicions_manager::m_suspicions_mutex"
+ARC FROM "mutex/sql/LOCK_global_system_variables" TO "mutex/group_rpl/GCS_Gcs_suspicions_manager::m_suspicions_parameters_mutex"
+ARC FROM "mutex/sql/LOCK_global_system_variables" TO "mutex/group_rpl/LOCK_autorejoin_module"
+ARC FROM "mutex/sql/LOCK_global_system_variables" TO "mutex/group_rpl/LOCK_group_member_info_update_lock"
+ARC FROM "mutex/sql/LOCK_global_system_variables" TO "mutex/group_rpl/LOCK_plugin_running"
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "mutex/innodb/buf_pool_chunks_mutex"
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "mutex/innodb/buf_pool_flush_state_mutex"
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "mutex/innodb/buf_pool_free_list_mutex"
@@ -922,10 +1278,7 @@
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "mutex/innodb/page_cleaner_mutex"
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "mutex/innodb/page_sys_arch_oper_mutex"
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "mutex/innodb/page_zip_stat_per_index_mutex"
-ARC FROM "mutex/sql/LOCK_global_system_variables" TO "mutex/innodb/parser_mutex"
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "mutex/innodb/purge_sys_pq_mutex"
-ARC FROM "mutex/sql/LOCK_global_system_variables" TO "mutex/innodb/recalc_pool_mutex"
-ARC FROM "mutex/sql/LOCK_global_system_variables" TO "mutex/innodb/row_drop_list_mutex"
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "mutex/innodb/rw_lock_debug_mutex"
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "mutex/innodb/rw_lock_list_mutex"
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "mutex/innodb/srv_sys_mutex"
@@ -934,6 +1287,8 @@
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "mutex/innodb/trx_pool_manager_mutex"
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "mutex/innodb/trx_pool_mutex"
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "mutex/sql/LOCK_global_system_variables" TO "mutex/innodb/trx_sys_serialisation_mutex"
+ARC FROM "mutex/sql/LOCK_global_system_variables" TO "mutex/innodb/trx_sys_shard_mutex"
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "mutex/innodb/trx_undo_mutex"
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "mutex/innodb/undo_space_rseg_mutex"
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "mutex/mysqlx/lock_list_access"
@@ -972,12 +1327,13 @@
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_sync"
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_xids"
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "mutex/sql/MYSQL_RELAY_LOG::LOCK_log"
-ARC FROM "mutex/sql/LOCK_global_system_variables" TO "mutex/sql/THD::LOCK_current_cond"
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "mutex/sql/THD::LOCK_thd_data"
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "prlock/sql/MDL_lock::rwlock" OP "R"
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "rwlock/conn_delay/connection_event_delay_lock" OP "W"
+ARC FROM "mutex/sql/LOCK_global_system_variables" TO "rwlock/group_rpl/RWLOCK_gcs_operations" OP "W"
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "rwlock/keyring/LOCK_keyring" OP "W"
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "rwlock/mysqlx/client_list_clients" OP "R"
+ARC FROM "mutex/sql/LOCK_global_system_variables" TO "rwlock/sql/Binlog_relay_IO_delegate::lock" OP "W"
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "rwlock/sql/Binlog_storage_delegate::lock" OP "W"
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "rwlock/sql/Binlog_transmit_delegate::lock" OP "W"
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "rwlock/sql/gtid_commit_rollback" OP "R"
@@ -993,7 +1349,6 @@
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "rwlock/sql/Trans_delegate::lock" OP "W"
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "rwlock/validate/LOCK_dict_file" OP "W"
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "rwlock/validate_pwd/LOCK_dict_file" OP "W"
-ARC FROM "mutex/sql/LOCK_global_system_variables" TO "sxlock/innodb/btr_search_latch" OP "S"
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "sxlock/innodb/btr_search_latch" OP "X"
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "sxlock/innodb/dict_table_stats" OP "X"
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "sxlock/innodb/fil_space_latch" OP "X"
@@ -1009,6 +1364,7 @@
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "sxlock/innodb/trx_purge_latch" OP "S"
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "sxlock/innodb/trx_purge_latch" OP "X"
 ARC FROM "mutex/sql/LOCK_global_system_variables" TO "sxlock/innodb/undo_spaces_lock" OP "S"
+ARC FROM "mutex/sql/LOCK_item_func_sleep" TO "rwlock/session/LOCK_srv_session_collection" OP "R"
 ARC FROM "mutex/sql/LOCK_mandatory_roles" TO "mutex/sql/LOCK_acl_cache_flush"
 ARC FROM "mutex/sql/LOCK_mdl_context_backup_manager" TO "prlock/sql/MDL_lock::rwlock" OP "W"
 ARC FROM "mutex/sql/LOCK_open" TO "cond/sql/DEBUG_SYNC::cond"
@@ -1066,12 +1422,43 @@
 ARC FROM "mutex/sql/LOCK_plugin_delete" TO "rwlock/sql/LOCK_sys_init_replica" OP "R"
 ARC FROM "mutex/sql/LOCK_plugin_delete" TO "rwlock/sql/LOCK_system_variables_hash" OP "R"
 ARC FROM "mutex/sql/LOCK_plugin_delete" TO "rwlock/sql/LOCK_system_variables_hash" OP "W"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "cond/group_rpl/COND_applier_module_run"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "cond/group_rpl/COND_message_service_run"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "cond/group_rpl/COND_mysql_thread_run"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "cond/group_rpl/COND_view_modification_wait"
 ARC FROM "mutex/sql/LOCK_plugin_install" TO "cond/semisync/Ack_receiver::m_cond"
 ARC FROM "mutex/sql/LOCK_plugin_install" TO "cond/sql/DEBUG_SYNC::cond"
 ARC FROM "mutex/sql/LOCK_plugin_install" TO "cond/sql/Item_func_sleep::cond"
 ARC FROM "mutex/sql/LOCK_plugin_install" TO "cond/sql/MDL_context::COND_wait_status"
 ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/csv/tina"
 ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/csv/TINA_SHARE::mutex"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/group_rpl/GCS_Gcs_async_buffer::m_free_buffer_mutex"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/group_rpl/GCS_Gcs_xcom_engine::m_wait_for_notification_mutex"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/group_rpl/GCS_Gcs_xcom_view_change_control::m_joining_leaving_mutex"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/group_rpl/key_GR_LOCK_group_action_coordinator_process"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/group_rpl/key_GR_LOCK_group_action_coordinator_thread"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/group_rpl/key_GR_LOCK_group_action_coordinator_thread_end"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/group_rpl/key_GR_LOCK_group_part_handler_run"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/group_rpl/LOCK_applier_module_run"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/group_rpl/LOCK_applier_module_suspend"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/group_rpl/LOCK_autorejoin_module"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/group_rpl/LOCK_certification_members"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/group_rpl/LOCK_clone_handler_run"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/group_rpl/LOCK_clone_query"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/group_rpl/LOCK_group_member_info_manager_update_lock"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/group_rpl/LOCK_group_member_info_update_lock"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/group_rpl/LOCK_message_service_run"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/group_rpl/LOCK_mysql_thread_dispatcher_run"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/group_rpl/LOCK_mysql_thread_run"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/group_rpl/LOCK_plugin_modules_termination"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/group_rpl/LOCK_plugin_online"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/group_rpl/LOCK_plugin_running"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/group_rpl/LOCK_primary_promotion_policy"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/group_rpl/LOCK_recovery_module_run"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/group_rpl/LOCK_synchronized_queue"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/group_rpl/LOCK_view_modification_wait"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/group_rpl/LOCK_wait_ticket"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/group_rpl/LOCK_write_lock_protection"
 ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/innodb/autoinc_mutex"
 ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/innodb/autoinc_persisted_mutex"
 ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/innodb/buf_pool_chunks_mutex"
@@ -1102,6 +1489,8 @@
 ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/innodb/trx_pool_manager_mutex"
 ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/innodb/trx_pool_mutex"
 ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/innodb/trx_sys_serialisation_mutex"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/innodb/trx_sys_shard_mutex"
 ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/innodb/trx_undo_mutex"
 ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/innodb/undo_space_rseg_mutex"
 ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/mysys/THR_LOCK::mutex"
@@ -1154,6 +1543,8 @@
 ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_sync"
 ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_sync_queue"
 ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_xids"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/sql/Relay_log_info::run_lock"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/sql/Source_info::run_lock"
 ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/sql/THD::LOCK_current_cond"
 ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/sql/THD::LOCK_query_plan"
 ARC FROM "mutex/sql/LOCK_plugin_install" TO "mutex/sql/THD::LOCK_thd_data"
@@ -1165,11 +1556,21 @@
 ARC FROM "mutex/sql/LOCK_plugin_install" TO "prlock/sql/MDL_lock::rwlock" OP "R"
 ARC FROM "mutex/sql/LOCK_plugin_install" TO "prlock/sql/MDL_lock::rwlock" OP "W"
 ARC FROM "mutex/sql/LOCK_plugin_install" TO "rwlock/conn_delay/connection_event_delay_lock" OP "W"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "rwlock/group_rpl/RWLOCK_channel_observation_list" OP "W"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "rwlock/group_rpl/RWLOCK_gcs_operations" OP "R"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "rwlock/group_rpl/RWLOCK_gcs_operations" OP "W"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "rwlock/group_rpl/RWLOCK_gcs_operations_view_change_observers" OP "W"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "rwlock/group_rpl/RWLOCK_group_event_observation_list" OP "W"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "rwlock/group_rpl/RWLOCK_plugin_stop" OP "W"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "rwlock/group_rpl/RWLOCK_transaction_consistency_manager_map" OP "W"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "rwlock/group_rpl/RWLOCK_transaction_consistency_manager_prepared_transactions_on_my_applier" OP "W"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "rwlock/group_rpl/RWLOCK_transaction_observation_list" OP "W"
 ARC FROM "mutex/sql/LOCK_plugin_install" TO "rwlock/session/LOCK_srv_session_collection" OP "R"
 ARC FROM "mutex/sql/LOCK_plugin_install" TO "rwlock/session/LOCK_srv_session_collection" OP "W"
 ARC FROM "mutex/sql/LOCK_plugin_install" TO "rwlock/sql/Binlog_relay_IO_delegate::lock" OP "W"
 ARC FROM "mutex/sql/LOCK_plugin_install" TO "rwlock/sql/Binlog_storage_delegate::lock" OP "W"
 ARC FROM "mutex/sql/LOCK_plugin_install" TO "rwlock/sql/Binlog_transmit_delegate::lock" OP "W"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "rwlock/sql/channel_lock" OP "W"
 ARC FROM "mutex/sql/LOCK_plugin_install" TO "rwlock/sql/gtid_commit_rollback" OP "R"
 ARC FROM "mutex/sql/LOCK_plugin_install" TO "rwlock/sql/gtid_commit_rollback" OP "W"
 ARC FROM "mutex/sql/LOCK_plugin_install" TO "rwlock/sql/LOCK_sys_init_connect" OP "R"
@@ -1180,6 +1581,7 @@
 ARC FROM "mutex/sql/LOCK_plugin_install" TO "rwlock/sql/Server_state_delegate::lock" OP "W"
 ARC FROM "mutex/sql/LOCK_plugin_install" TO "rwlock/sql/THR_LOCK_udf" OP "R"
 ARC FROM "mutex/sql/LOCK_plugin_install" TO "rwlock/sql/THR_LOCK_udf" OP "W"
+ARC FROM "mutex/sql/LOCK_plugin_install" TO "rwlock/sql/Trans_delegate::lock" OP "R"
 ARC FROM "mutex/sql/LOCK_plugin_install" TO "rwlock/sql/Trans_delegate::lock" OP "W"
 ARC FROM "mutex/sql/LOCK_plugin_install" TO "rwlock/validate/LOCK_dict_file" OP "W"
 ARC FROM "mutex/sql/LOCK_plugin_install" TO "sxlock/innodb/btr_search_latch" OP "S"
@@ -1202,17 +1604,12 @@
 ARC FROM "mutex/sql/LOCK_plugin" TO "cond/sql/DEBUG_SYNC::cond"
 ARC FROM "mutex/sql/LOCK_plugin" TO "mutex/innodb/autoinc_mutex"
 ARC FROM "mutex/sql/LOCK_plugin" TO "mutex/innodb/autoinc_persisted_mutex"
-ARC FROM "mutex/sql/LOCK_plugin" TO "mutex/innodb/buf_pool_chunks_mutex"
-ARC FROM "mutex/sql/LOCK_plugin" TO "mutex/innodb/buf_pool_flush_state_mutex"
-ARC FROM "mutex/sql/LOCK_plugin" TO "mutex/innodb/buf_pool_free_list_mutex"
 ARC FROM "mutex/sql/LOCK_plugin" TO "mutex/innodb/buf_pool_LRU_list_mutex"
-ARC FROM "mutex/sql/LOCK_plugin" TO "mutex/innodb/buf_pool_zip_mutex"
 ARC FROM "mutex/sql/LOCK_plugin" TO "mutex/innodb/dict_persist_dirty_tables_mutex"
 ARC FROM "mutex/sql/LOCK_plugin" TO "mutex/innodb/dict_sys_mutex"
 ARC FROM "mutex/sql/LOCK_plugin" TO "mutex/innodb/dict_table_mutex"
 ARC FROM "mutex/sql/LOCK_plugin" TO "mutex/innodb/fil_system_mutex"
 ARC FROM "mutex/sql/LOCK_plugin" TO "mutex/innodb/flush_list_mutex"
-ARC FROM "mutex/sql/LOCK_plugin" TO "mutex/innodb/ibuf_bitmap_mutex"
 ARC FROM "mutex/sql/LOCK_plugin" TO "mutex/innodb/innobase_share_mutex"
 ARC FROM "mutex/sql/LOCK_plugin" TO "mutex/innodb/lock_sys_page_mutex"
 ARC FROM "mutex/sql/LOCK_plugin" TO "mutex/innodb/lock_sys_table_mutex"
@@ -1233,13 +1630,11 @@
 ARC FROM "mutex/sql/LOCK_plugin" TO "rwlock/sql/LOCK_system_variables_hash" OP "W"
 ARC FROM "mutex/sql/LOCK_plugin" TO "sxlock/innodb/btr_search_latch" OP "S"
 ARC FROM "mutex/sql/LOCK_plugin" TO "sxlock/innodb/btr_search_latch" OP "X"
-ARC FROM "mutex/sql/LOCK_plugin" TO "sxlock/innodb/fil_space_latch" OP "X"
 ARC FROM "mutex/sql/LOCK_plugin" TO "sxlock/innodb/hash_table_locks" OP "S"
-ARC FROM "mutex/sql/LOCK_plugin" TO "sxlock/innodb/hash_table_locks" OP "X"
 ARC FROM "mutex/sql/LOCK_plugin" TO "sxlock/innodb/index_tree_rw_lock" OP "S"
-ARC FROM "mutex/sql/LOCK_plugin" TO "sxlock/innodb/index_tree_rw_lock" OP "SX"
 ARC FROM "mutex/sql/LOCK_plugin" TO "sxlock/innodb/lock_sys_global_rw_lock" OP "S"
 ARC FROM "mutex/sql/LOCK_plugin" TO "sxlock/innodb/log_sn_lock" OP "S"
+ARC FROM "mutex/sql/LOCK_replica_list" TO "mutex/sql/THD::LOCK_thd_data"
 ARC FROM "mutex/sql/LOCK_reset_gtid_table" TO "cond/sql/DEBUG_SYNC::cond"
 ARC FROM "mutex/sql/LOCK_reset_gtid_table" TO "cond/sql/MDL_context::COND_wait_status"
 ARC FROM "mutex/sql/LOCK_reset_gtid_table" TO "mutex/innodb/autoinc_mutex"
@@ -1260,13 +1655,14 @@
 ARC FROM "mutex/sql/LOCK_reset_gtid_table" TO "mutex/innodb/lock_wait_mutex"
 ARC FROM "mutex/sql/LOCK_reset_gtid_table" TO "mutex/innodb/parser_mutex"
 ARC FROM "mutex/sql/LOCK_reset_gtid_table" TO "mutex/innodb/purge_sys_pq_mutex"
-ARC FROM "mutex/sql/LOCK_reset_gtid_table" TO "mutex/innodb/recalc_pool_mutex"
 ARC FROM "mutex/sql/LOCK_reset_gtid_table" TO "mutex/innodb/rw_lock_debug_mutex"
 ARC FROM "mutex/sql/LOCK_reset_gtid_table" TO "mutex/innodb/sync_array_mutex"
 ARC FROM "mutex/sql/LOCK_reset_gtid_table" TO "mutex/innodb/trx_mutex"
 ARC FROM "mutex/sql/LOCK_reset_gtid_table" TO "mutex/innodb/trx_pool_manager_mutex"
 ARC FROM "mutex/sql/LOCK_reset_gtid_table" TO "mutex/innodb/trx_pool_mutex"
 ARC FROM "mutex/sql/LOCK_reset_gtid_table" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "mutex/sql/LOCK_reset_gtid_table" TO "mutex/innodb/trx_sys_serialisation_mutex"
+ARC FROM "mutex/sql/LOCK_reset_gtid_table" TO "mutex/innodb/trx_sys_shard_mutex"
 ARC FROM "mutex/sql/LOCK_reset_gtid_table" TO "mutex/innodb/trx_undo_mutex"
 ARC FROM "mutex/sql/LOCK_reset_gtid_table" TO "mutex/innodb/undo_space_rseg_mutex"
 ARC FROM "mutex/sql/LOCK_reset_gtid_table" TO "mutex/sql/DEBUG_SYNC::mutex"
@@ -1294,7 +1690,7 @@
 ARC FROM "mutex/sql/LOCK_reset_gtid_table" TO "sxlock/innodb/rsegs_lock" OP "S"
 ARC FROM "mutex/sql/LOCK_reset_gtid_table" TO "sxlock/innodb/trx_purge_latch" OP "S"
 ARC FROM "mutex/sql/LOCK_reset_gtid_table" TO "sxlock/innodb/undo_spaces_lock" OP "S"
-ARC FROM "mutex/sql/LOCK_rotate_binlog_master_key" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "mutex/sql/LOCK_rotate_binlog_master_key" TO "mutex/innodb/trx_sys_serialisation_mutex"
 ARC FROM "mutex/sql/LOCK_rotate_binlog_master_key" TO "mutex/mysys/THR_LOCK_open"
 ARC FROM "mutex/sql/LOCK_rotate_binlog_master_key" TO "mutex/sql/LOCK_keyring_operations"
 ARC FROM "mutex/sql/LOCK_rotate_binlog_master_key" TO "mutex/sql/LOCK_plugin"
@@ -1315,10 +1711,9 @@
 ARC FROM "mutex/sql/LOCK_rotate_binlog_master_key" TO "rwlock/keyring/LOCK_keyring" OP "W"
 ARC FROM "mutex/sql/LOCK_rotate_binlog_master_key" TO "rwlock/sql/gtid_commit_rollback" OP "W"
 ARC FROM "mutex/sql/LOCK_rotate_binlog_master_key" TO "rwlock/sql/gtid_retrieved" OP "W"
-ARC FROM "mutex/sql/LOCK_replica_list" TO "mutex/sql/THD::LOCK_thd_data"
-ARC FROM "mutex/sql/LOCK_replica_net_timeout" TO "cond/sql/DEBUG_SYNC::cond"
-ARC FROM "mutex/sql/LOCK_replica_net_timeout" TO "mutex/sql/DEBUG_SYNC::mutex"
 ARC FROM "mutex/sql/LOCK_status" TO "cond/sql/DEBUG_SYNC::cond"
+ARC FROM "mutex/sql/LOCK_status" TO "mutex/group_rpl/LOCK_group_member_info_manager_update_lock"
+ARC FROM "mutex/sql/LOCK_status" TO "mutex/group_rpl/LOCK_group_member_info_update_lock"
 ARC FROM "mutex/sql/LOCK_status" TO "mutex/innodb/buf_pool_LRU_list_mutex"
 ARC FROM "mutex/sql/LOCK_status" TO "mutex/innodb/buf_pool_zip_mutex"
 ARC FROM "mutex/sql/LOCK_status" TO "mutex/innodb/flush_list_mutex"
@@ -1326,6 +1721,8 @@
 ARC FROM "mutex/sql/LOCK_status" TO "mutex/innodb/srv_innodb_monitor_mutex"
 ARC FROM "mutex/sql/LOCK_status" TO "mutex/innodb/sync_array_mutex"
 ARC FROM "mutex/sql/LOCK_status" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "mutex/sql/LOCK_status" TO "mutex/innodb/trx_sys_serialisation_mutex"
+ARC FROM "mutex/sql/LOCK_status" TO "mutex/innodb/trx_sys_shard_mutex"
 ARC FROM "mutex/sql/LOCK_status" TO "mutex/mysqlx/client_session_exit"
 ARC FROM "mutex/sql/LOCK_status" TO "mutex/mysqlx/server_client_exit"
 ARC FROM "mutex/sql/LOCK_status" TO "mutex/semisync/LOCK_binlog_"
@@ -1378,6 +1775,7 @@
 ARC FROM "mutex/sql/LOCK_thd_list" TO "mutex/innodb/trx_mutex"
 ARC FROM "mutex/sql/LOCK_thd_list" TO "mutex/sql/LOCK_plugin"
 ARC FROM "mutex/sql/LOCK_thd_list" TO "mutex/sql/MDL_wait::LOCK_wait_status"
+ARC FROM "mutex/sql/LOCK_thd_list" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_binlog_end_pos"
 ARC FROM "mutex/sql/LOCK_thd_list" TO "mutex/sql/THD::LOCK_current_cond"
 ARC FROM "mutex/sql/LOCK_thd_list" TO "mutex/sql/THD::LOCK_query_plan"
 ARC FROM "mutex/sql/LOCK_thd_list" TO "mutex/sql/THD::LOCK_thd_data"
@@ -1397,197 +1795,31 @@
 ARC FROM "mutex/sql/LOCK_thd_remove" TO "sxlock/innodb/hash_table_locks" OP "S"
 ARC FROM "mutex/sql/LOCK_transaction_cache" TO "cond/sql/DEBUG_SYNC::cond"
 ARC FROM "mutex/sql/LOCK_transaction_cache" TO "mutex/sql/DEBUG_SYNC::mutex"
-ARC FROM "mutex/sql/LOCK_user_conn" TO "cond/sql/DEBUG_SYNC::cond"
-ARC FROM "mutex/sql/LOCK_user_conn" TO "mutex/innodb/fil_system_mutex"
-ARC FROM "mutex/sql/LOCK_user_conn" TO "mutex/innodb/rw_lock_debug_mutex"
 ARC FROM "mutex/sql/LOCK_user_conn" TO "mutex/mysys/THR_LOCK_open"
-ARC FROM "mutex/sql/LOCK_user_conn" TO "mutex/sql/DEBUG_SYNC::mutex"
-ARC FROM "mutex/sql/LOCK_user_conn" TO "mutex/sql/THD::LOCK_current_cond"
-ARC FROM "mutex/sql/LOCK_user_conn" TO "sxlock/innodb/hash_table_locks" OP "S"
 ARC FROM "mutex/sql/LOCK_uuid_generator" TO "mutex/sql/LOCK_sql_rand"
 ARC FROM "mutex/sql/LOG::LOCK_log" TO "mutex/mysys/THR_LOCK_open"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "cond/sql/DEBUG_SYNC::cond"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/buf_pool_chunks_mutex"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/buf_pool_flush_state_mutex"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/buf_pool_free_list_mutex"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/buf_pool_LRU_list_mutex"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/buf_pool_zip_mutex"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/dict_sys_mutex"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/dict_table_mutex"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/fil_system_mutex"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/flush_list_mutex"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/innobase_share_mutex"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/lock_sys_page_mutex"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/lock_sys_table_mutex"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/lock_wait_mutex"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/log_checkpointer_mutex"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/log_sn_mutex"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/purge_sys_pq_mutex"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/rw_lock_debug_mutex"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/sync_array_mutex"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/trx_mutex"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/trx_pool_manager_mutex"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/trx_pool_mutex"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/trx_sys_mutex"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/trx_undo_mutex"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/undo_space_rseg_mutex"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/myisam/MYISAM_SHARE::intern_lock"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/mysys/KEY_CACHE::cache_lock"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/mysys/THR_LOCK_myisam"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/mysys/THR_LOCK_open"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/Cost_constant_cache::LOCK_cost_const"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/DEBUG_SYNC::mutex"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/Gtid_set::gtid_executed::free_intervals_mutex"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/key_mta_temp_table_LOCK"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/LOCK_open"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/LOCK_plugin"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/LOCK_table_cache"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/Source_info::data_lock"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/MDL_wait::LOCK_wait_status"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_log"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/MYSQL_RELAY_LOG::LOCK_index"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/MYSQL_RELAY_LOG::LOCK_log"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/MYSQL_RELAY_LOG::LOCK_log_end_pos"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/Relay_log_info::data_lock"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/Relay_log_info::info_thd_lock"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/Relay_log_info::log_space_lock"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/Replica_reporting_capability::err_lock"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/TABLE_SHARE::LOCK_ha_data"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/THD::LOCK_thd_data"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "prlock/sql/MDL_lock::rwlock" OP "W"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "rwlock/sql/gtid_commit_rollback" OP "W"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "rwlock/sql/gtid_retrieved" OP "R"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "rwlock/sql/gtid_retrieved" OP "W"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "rwlock/sql/rpl_filter_lock" OP "R"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "sxlock/innodb/btr_search_latch" OP "S"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "sxlock/innodb/btr_search_latch" OP "X"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "sxlock/innodb/dict_table_stats" OP "X"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "sxlock/innodb/fil_space_latch" OP "X"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "sxlock/innodb/hash_table_locks" OP "S"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "sxlock/innodb/hash_table_locks" OP "X"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "sxlock/innodb/index_tree_rw_lock" OP "S"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "sxlock/innodb/index_tree_rw_lock" OP "SX"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "sxlock/innodb/lock_sys_global_rw_lock" OP "S"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "sxlock/innodb/log_sn_lock" OP "S"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "sxlock/innodb/log_sn_lock" OP "X"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "sxlock/innodb/rsegs_lock" OP "S"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "sxlock/innodb/trx_purge_latch" OP "S"
-ARC FROM "mutex/sql/Source_info::data_lock" TO "sxlock/innodb/undo_spaces_lock" OP "S"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "cond/sql/Relay_log_info::start_cond"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "cond/sql/Relay_log_info::stop_cond"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "cond/sql/Source_IO_monitor::run_cond"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/autoinc_mutex"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/autoinc_persisted_mutex"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/buf_pool_chunks_mutex"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/buf_pool_flush_state_mutex"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/buf_pool_free_list_mutex"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/buf_pool_LRU_list_mutex"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/buf_pool_zip_mutex"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/dict_sys_mutex"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/dict_table_mutex"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/fil_system_mutex"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/flush_list_mutex"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/innobase_share_mutex"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/lock_sys_page_mutex"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/lock_sys_table_mutex"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/lock_wait_mutex"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/purge_sys_pq_mutex"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/rw_lock_debug_mutex"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/sync_array_mutex"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/trx_mutex"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/trx_pool_manager_mutex"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/trx_pool_mutex"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/trx_sys_mutex"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/trx_undo_mutex"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/undo_space_rseg_mutex"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/myisam/MYISAM_SHARE::intern_lock"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/mysys/KEY_CACHE::cache_lock"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/mysys/THR_LOCK_myisam"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/mysys/THR_LOCK_open"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/semisync/LOCK_binlog_"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/Cost_constant_cache::LOCK_cost_const"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/DEBUG_SYNC::mutex"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/key_mta_gaq_LOCK"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/key_mta_temp_table_LOCK"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/LOCK_global_system_variables"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/LOCK_item_func_sleep"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/LOCK_open"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/LOCK_plugin"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/LOCK_replica_list"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/LOCK_sql_rand"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/LOCK_sql_replica_skip_counter"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/LOCK_status"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/LOCK_table_cache"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/LOCK_thd_list"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/LOCK_thd_remove"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/LOCK_thread_ids"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/LOCK_transaction_cache"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/Source_info::data_lock"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/Source_info::info_thd_lock"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/Source_info::sleep_lock"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/MDL_wait::LOCK_wait_status"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/MYSQL_RELAY_LOG::LOCK_index"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/MYSQL_RELAY_LOG::LOCK_log"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/MYSQL_RELAY_LOG::LOCK_log_end_pos"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/Relay_log_info::data_lock"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/Relay_log_info::info_thd_lock"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/Relay_log_info::log_space_lock"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/Relay_log_info::run_lock"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/Relay_log_info::sleep_lock"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/Replica_reporting_capability::err_lock"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/Source_IO_monitor::run_lock"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/TABLE_SHARE::LOCK_ha_data"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/THD::LOCK_current_cond"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/THD::LOCK_query_plan"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/THD::LOCK_thd_data"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/THD::LOCK_thd_query"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "prlock/sql/MDL_lock::rwlock" OP "W"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "rwlock/group_rpl/RWLOCK_transaction_observation_list" OP "R"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "rwlock/sql/gtid_commit_rollback" OP "R"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "rwlock/sql/gtid_commit_rollback" OP "W"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "rwlock/sql/gtid_retrieved" OP "W"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "rwlock/sql/Trans_delegate::lock" OP "R"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "sxlock/innodb/btr_search_latch" OP "S"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "sxlock/innodb/btr_search_latch" OP "X"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "sxlock/innodb/dict_table_stats" OP "X"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "sxlock/innodb/fil_space_latch" OP "X"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "sxlock/innodb/hash_table_locks" OP "S"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "sxlock/innodb/hash_table_locks" OP "X"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "sxlock/innodb/index_tree_rw_lock" OP "S"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "sxlock/innodb/index_tree_rw_lock" OP "SX"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "sxlock/innodb/lock_sys_global_rw_lock" OP "S"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "sxlock/innodb/lock_sys_global_rw_lock" OP "X"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "sxlock/innodb/log_sn_lock" OP "S"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "sxlock/innodb/rsegs_lock" OP "S"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "sxlock/innodb/trx_purge_latch" OP "S"
-ARC FROM "mutex/sql/Source_info::run_lock" TO "sxlock/innodb/undo_spaces_lock" OP "S"
+ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_binlog_end_pos" TO "mutex/sql/LOCK_plugin"
+ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_binlog_end_pos" TO "rwlock/sql/Binlog_transmit_delegate::lock" OP "R"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "cond/semisync/COND_binlog_send_"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "cond/sql/DEBUG_SYNC::cond"
-ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "cond/sql/MYSQL_BIN_LOG::COND_done"
-ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/innodb/autoinc_mutex"
-ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/innodb/autoinc_persisted_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/innodb/buf_pool_chunks_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/innodb/buf_pool_flush_state_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/innodb/buf_pool_free_list_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/innodb/buf_pool_LRU_list_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/innodb/buf_pool_zip_mutex"
-ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/innodb/dict_persist_dirty_tables_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/innodb/dict_sys_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/innodb/dict_table_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/innodb/fil_system_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/innodb/flush_list_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/innodb/fts_delete_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/innodb/fts_doc_id_mutex"
-ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/innodb/innobase_share_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/innodb/lock_sys_page_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/innodb/lock_sys_table_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/innodb/log_flusher_mutex"
-ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/innodb/log_limits_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/innodb/log_writer_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/innodb/parser_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/innodb/purge_sys_pq_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/innodb/rw_lock_debug_mutex"
-ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/innodb/rw_lock_list_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/innodb/srv_sys_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/innodb/sync_array_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/innodb/temp_space_rseg_mutex"
@@ -1595,21 +1827,20 @@
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/innodb/trx_pool_manager_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/innodb/trx_pool_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/innodb/trx_sys_serialisation_mutex"
+ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/innodb/trx_sys_shard_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/innodb/trx_undo_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/innodb/undo_space_rseg_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/semisync/LOCK_binlog_"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/sql/DEBUG_SYNC::mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/sql/Gtid_set::gtid_executed::free_intervals_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/sql/Gtid_state"
-ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/sql/LOCK_open"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/sql/LOCK_plugin"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/sql/LOCK_replica_trans_dep_tracker"
-ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/sql/LOCK_table_cache"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_commit_queue"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_done"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_xids"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/sql/THD::LOCK_current_cond"
-ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/sql/THD::LOCK_thd_data"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "mutex/sql/THD::LOCK_thd_query"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "rwlock/sql/Binlog_storage_delegate::lock" OP "R"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "rwlock/sql/gtid_commit_rollback" OP "R"
@@ -1627,7 +1858,6 @@
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "sxlock/innodb/lock_sys_global_rw_lock" OP "S"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "sxlock/innodb/log_sn_lock" OP "S"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "sxlock/innodb/rsegs_lock" OP "S"
-ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "sxlock/innodb/trx_purge_latch" OP "S"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_commit" TO "sxlock/innodb/undo_spaces_lock" OP "S"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_done" TO "cond/sql/DEBUG_SYNC::cond"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_done" TO "mutex/sql/DEBUG_SYNC::mutex"
@@ -1648,13 +1878,14 @@
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_index" TO "mutex/innodb/lock_sys_page_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_index" TO "mutex/innodb/lock_sys_table_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_index" TO "mutex/innodb/purge_sys_pq_mutex"
-ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_index" TO "mutex/innodb/recalc_pool_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_index" TO "mutex/innodb/rw_lock_debug_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_index" TO "mutex/innodb/sync_array_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_index" TO "mutex/innodb/trx_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_index" TO "mutex/innodb/trx_pool_manager_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_index" TO "mutex/innodb/trx_pool_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_index" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_index" TO "mutex/innodb/trx_sys_serialisation_mutex"
+ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_index" TO "mutex/innodb/trx_sys_shard_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_index" TO "mutex/innodb/trx_undo_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_index" TO "mutex/innodb/undo_space_rseg_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_index" TO "mutex/mysys/THR_LOCK_open"
@@ -1664,8 +1895,8 @@
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_index" TO "mutex/sql/LOCK_compress_gtid_table"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_index" TO "mutex/sql/LOCK_open"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_index" TO "mutex/sql/LOCK_plugin"
-ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_index" TO "mutex/sql/LOCK_reset_gtid_table"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_index" TO "mutex/sql/LOCK_replica_trans_dep_tracker"
+ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_index" TO "mutex/sql/LOCK_reset_gtid_table"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_index" TO "mutex/sql/LOCK_table_cache"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_index" TO "mutex/sql/LOCK_thd_list"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_index" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_binlog_end_pos"
@@ -1681,6 +1912,7 @@
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_index" TO "rwlock/keyring/LOCK_keyring" OP "R"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_index" TO "rwlock/sql/gtid_commit_rollback" OP "R"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_index" TO "rwlock/sql/gtid_commit_rollback" OP "W"
+ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_index" TO "sxlock/innodb/dict_table_stats" OP "X"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_index" TO "sxlock/innodb/fil_space_latch" OP "X"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_index" TO "sxlock/innodb/hash_table_locks" OP "S"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_index" TO "sxlock/innodb/hash_table_locks" OP "X"
@@ -1709,13 +1941,14 @@
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_log" TO "mutex/innodb/log_sn_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_log" TO "mutex/innodb/log_writer_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_log" TO "mutex/innodb/purge_sys_pq_mutex"
-ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_log" TO "mutex/innodb/recalc_pool_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_log" TO "mutex/innodb/rw_lock_debug_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_log" TO "mutex/innodb/sync_array_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_log" TO "mutex/innodb/trx_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_log" TO "mutex/innodb/trx_pool_manager_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_log" TO "mutex/innodb/trx_pool_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_log" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_log" TO "mutex/innodb/trx_sys_serialisation_mutex"
+ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_log" TO "mutex/innodb/trx_sys_shard_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_log" TO "mutex/innodb/trx_undo_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_log" TO "mutex/innodb/undo_space_rseg_mutex"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_log" TO "mutex/mysys/THR_LOCK_open"
@@ -1726,8 +1959,8 @@
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_log" TO "mutex/sql/LOCK_compress_gtid_table"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_log" TO "mutex/sql/LOCK_open"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_log" TO "mutex/sql/LOCK_plugin"
-ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_log" TO "mutex/sql/LOCK_reset_gtid_table"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_log" TO "mutex/sql/LOCK_replica_trans_dep_tracker"
+ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_log" TO "mutex/sql/LOCK_reset_gtid_table"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_log" TO "mutex/sql/LOCK_table_cache"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_log" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_binlog_end_pos"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_log" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_commit"
@@ -1746,6 +1979,7 @@
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_log" TO "rwlock/sql/Binlog_storage_delegate::lock" OP "R"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_log" TO "rwlock/sql/gtid_commit_rollback" OP "R"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_log" TO "rwlock/sql/gtid_commit_rollback" OP "W"
+ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_log" TO "sxlock/innodb/dict_table_stats" OP "X"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_log" TO "sxlock/innodb/fil_space_latch" OP "X"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_log" TO "sxlock/innodb/hash_table_locks" OP "S"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_log" TO "sxlock/innodb/hash_table_locks" OP "X"
@@ -1764,9 +1998,7 @@
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_sync" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_sync_queue"
 ARC FROM "mutex/sql/MYSQL_BIN_LOG::LOCK_sync" TO "mutex/sql/THD::LOCK_current_cond"
 ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_index" TO "cond/sql/DEBUG_SYNC::cond"
-ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_index" TO "mutex/innodb/rw_lock_debug_mutex"
-ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_index" TO "mutex/innodb/sync_array_mutex"
-ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_index" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_index" TO "mutex/innodb/trx_sys_serialisation_mutex"
 ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_index" TO "mutex/mysys/THR_LOCK_open"
 ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_index" TO "mutex/sql/DEBUG_SYNC::mutex"
 ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_index" TO "mutex/sql/LOCK_plugin"
@@ -1779,6 +2011,8 @@
 ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log_end_pos" TO "mutex/sql/Relay_log_info::data_lock"
 ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log_end_pos" TO "mutex/sql/Relay_log_info::log_space_lock"
 ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "cond/sql/DEBUG_SYNC::cond"
+ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "mutex/innodb/autoinc_mutex"
+ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "mutex/innodb/autoinc_persisted_mutex"
 ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "mutex/innodb/buf_pool_chunks_mutex"
 ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "mutex/innodb/buf_pool_flush_state_mutex"
 ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "mutex/innodb/buf_pool_free_list_mutex"
@@ -1798,17 +2032,22 @@
 ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "mutex/innodb/trx_pool_manager_mutex"
 ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "mutex/innodb/trx_pool_mutex"
 ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "mutex/innodb/trx_sys_serialisation_mutex"
+ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "mutex/innodb/trx_sys_shard_mutex"
 ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "mutex/innodb/trx_undo_mutex"
 ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "mutex/innodb/undo_space_rseg_mutex"
 ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "mutex/mysys/THR_LOCK_open"
 ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "mutex/sql/Cost_constant_cache::LOCK_cost_const"
 ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "mutex/sql/DEBUG_SYNC::mutex"
 ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "mutex/sql/Gtid_set::gtid_executed::free_intervals_mutex"
+ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "mutex/sql/LOCK_global_system_variables"
 ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "mutex/sql/LOCK_open"
 ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "mutex/sql/LOCK_plugin"
+ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "mutex/sql/LOCK_replica_list"
+ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "mutex/sql/LOCK_sql_rand"
+ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "mutex/sql/LOCK_status"
 ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "mutex/sql/LOCK_table_cache"
-ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "mutex/sql/Source_info::data_lock"
-ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "mutex/sql/Source_info::rotate_lock"
+ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "mutex/sql/LOCK_transaction_cache"
 ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "mutex/sql/MDL_wait::LOCK_wait_status"
 ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "mutex/sql/MYSQL_RELAY_LOG::LOCK_index"
 ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "mutex/sql/MYSQL_RELAY_LOG::LOCK_log_end_pos"
@@ -1816,10 +2055,15 @@
 ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "mutex/sql/Relay_log_info::data_lock"
 ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "mutex/sql/Relay_log_info::log_space_lock"
 ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "mutex/sql/Replica_reporting_capability::err_lock"
+ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "mutex/sql/Source_info::data_lock"
+ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "mutex/sql/Source_info::rotate_lock"
+ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "mutex/sql/THD::LOCK_query_plan"
 ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "mutex/sql/THD::LOCK_thd_data"
+ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "mutex/sql/THD::LOCK_thd_query"
 ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "prlock/sql/MDL_lock::rwlock" OP "W"
 ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "rwlock/sql/gtid_retrieved" OP "R"
 ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "rwlock/sql/gtid_retrieved" OP "W"
+ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "rwlock/sql/Trans_delegate::lock" OP "R"
 ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "sxlock/innodb/btr_search_latch" OP "S"
 ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "sxlock/innodb/btr_search_latch" OP "X"
 ARC FROM "mutex/sql/MYSQL_RELAY_LOG::LOCK_log" TO "sxlock/innodb/dict_table_stats" OP "X"
@@ -1836,8 +2080,11 @@
 ARC FROM "mutex/sql/Partition_share::auto_inc_mutex" TO "cond/sql/DEBUG_SYNC::cond"
 ARC FROM "mutex/sql/Partition_share::auto_inc_mutex" TO "mutex/innodb/autoinc_mutex"
 ARC FROM "mutex/sql/Partition_share::auto_inc_mutex" TO "mutex/innodb/autoinc_persisted_mutex"
+ARC FROM "mutex/sql/Partition_share::auto_inc_mutex" TO "mutex/innodb/buf_pool_chunks_mutex"
+ARC FROM "mutex/sql/Partition_share::auto_inc_mutex" TO "mutex/innodb/buf_pool_flush_state_mutex"
 ARC FROM "mutex/sql/Partition_share::auto_inc_mutex" TO "mutex/innodb/buf_pool_free_list_mutex"
 ARC FROM "mutex/sql/Partition_share::auto_inc_mutex" TO "mutex/innodb/buf_pool_LRU_list_mutex"
+ARC FROM "mutex/sql/Partition_share::auto_inc_mutex" TO "mutex/innodb/buf_pool_zip_mutex"
 ARC FROM "mutex/sql/Partition_share::auto_inc_mutex" TO "mutex/innodb/dict_persist_dirty_tables_mutex"
 ARC FROM "mutex/sql/Partition_share::auto_inc_mutex" TO "mutex/innodb/fil_system_mutex"
 ARC FROM "mutex/sql/Partition_share::auto_inc_mutex" TO "mutex/innodb/flush_list_mutex"
@@ -1851,6 +2098,7 @@
 ARC FROM "mutex/sql/Partition_share::auto_inc_mutex" TO "mutex/innodb/trx_pool_manager_mutex"
 ARC FROM "mutex/sql/Partition_share::auto_inc_mutex" TO "mutex/innodb/trx_pool_mutex"
 ARC FROM "mutex/sql/Partition_share::auto_inc_mutex" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "mutex/sql/Partition_share::auto_inc_mutex" TO "mutex/innodb/trx_sys_shard_mutex"
 ARC FROM "mutex/sql/Partition_share::auto_inc_mutex" TO "mutex/innodb/trx_undo_mutex"
 ARC FROM "mutex/sql/Partition_share::auto_inc_mutex" TO "mutex/innodb/undo_space_rseg_mutex"
 ARC FROM "mutex/sql/Partition_share::auto_inc_mutex" TO "mutex/sql/DEBUG_SYNC::mutex"
@@ -1881,7 +2129,6 @@
 ARC FROM "mutex/sql/Relay_log_info::data_lock" TO "mutex/innodb/innobase_share_mutex"
 ARC FROM "mutex/sql/Relay_log_info::data_lock" TO "mutex/innodb/lock_sys_page_mutex"
 ARC FROM "mutex/sql/Relay_log_info::data_lock" TO "mutex/innodb/lock_sys_table_mutex"
-ARC FROM "mutex/sql/Relay_log_info::data_lock" TO "mutex/innodb/lock_wait_mutex"
 ARC FROM "mutex/sql/Relay_log_info::data_lock" TO "mutex/innodb/log_limits_mutex"
 ARC FROM "mutex/sql/Relay_log_info::data_lock" TO "mutex/innodb/purge_sys_pq_mutex"
 ARC FROM "mutex/sql/Relay_log_info::data_lock" TO "mutex/innodb/rw_lock_debug_mutex"
@@ -1891,6 +2138,8 @@
 ARC FROM "mutex/sql/Relay_log_info::data_lock" TO "mutex/innodb/trx_pool_manager_mutex"
 ARC FROM "mutex/sql/Relay_log_info::data_lock" TO "mutex/innodb/trx_pool_mutex"
 ARC FROM "mutex/sql/Relay_log_info::data_lock" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "mutex/sql/Relay_log_info::data_lock" TO "mutex/innodb/trx_sys_serialisation_mutex"
+ARC FROM "mutex/sql/Relay_log_info::data_lock" TO "mutex/innodb/trx_sys_shard_mutex"
 ARC FROM "mutex/sql/Relay_log_info::data_lock" TO "mutex/innodb/trx_undo_mutex"
 ARC FROM "mutex/sql/Relay_log_info::data_lock" TO "mutex/innodb/undo_space_rseg_mutex"
 ARC FROM "mutex/sql/Relay_log_info::data_lock" TO "mutex/myisam/MYISAM_SHARE::intern_lock"
@@ -1955,7 +2204,7 @@
 ARC FROM "mutex/sql/Relay_log_info::data_lock" TO "sxlock/innodb/trx_purge_latch" OP "S"
 ARC FROM "mutex/sql/Relay_log_info::data_lock" TO "sxlock/innodb/undo_spaces_lock" OP "S"
 ARC FROM "mutex/sql/Relay_log_info::log_space_lock" TO "cond/sql/DEBUG_SYNC::cond"
-ARC FROM "mutex/sql/Relay_log_info::log_space_lock" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "mutex/sql/Relay_log_info::log_space_lock" TO "mutex/innodb/trx_sys_serialisation_mutex"
 ARC FROM "mutex/sql/Relay_log_info::log_space_lock" TO "mutex/mysys/THR_LOCK_open"
 ARC FROM "mutex/sql/Relay_log_info::log_space_lock" TO "mutex/sql/DEBUG_SYNC::mutex"
 ARC FROM "mutex/sql/Relay_log_info::log_space_lock" TO "mutex/sql/LOCK_plugin"
@@ -1970,6 +2219,9 @@
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "cond/sql/Source_info::stop_cond"
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "cond/sql/Source_IO_monitor::run_cond"
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "cond/sql/Worker_info::jobs_cond"
+ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/group_rpl/LOCK_group_member_info_manager_update_lock"
+ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/group_rpl/LOCK_group_member_info_update_lock"
+ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/group_rpl/LOCK_primary_election_running_flag"
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/innodb/autoinc_mutex"
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/innodb/autoinc_persisted_mutex"
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/innodb/buf_pool_chunks_mutex"
@@ -1984,7 +2236,6 @@
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/innodb/innobase_share_mutex"
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/innodb/lock_sys_page_mutex"
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/innodb/lock_sys_table_mutex"
-ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/innodb/lock_wait_mutex"
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/innodb/purge_sys_pq_mutex"
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/innodb/rw_lock_debug_mutex"
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/innodb/sync_array_mutex"
@@ -1992,6 +2243,8 @@
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/innodb/trx_pool_manager_mutex"
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/innodb/trx_pool_mutex"
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/innodb/trx_sys_serialisation_mutex"
+ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/innodb/trx_sys_shard_mutex"
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/innodb/trx_undo_mutex"
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/innodb/undo_space_rseg_mutex"
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/myisam/MYISAM_SHARE::intern_lock"
@@ -2016,9 +2269,6 @@
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/sql/LOCK_thd_remove"
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/sql/LOCK_thread_ids"
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/sql/LOCK_transaction_cache"
-ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/sql/Source_info::data_lock"
-ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/sql/Source_info::run_lock"
-ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/sql/Source_info::sleep_lock"
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/sql/MDL_wait::LOCK_wait_status"
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/sql/MYSQL_RELAY_LOG::LOCK_index"
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/sql/MYSQL_RELAY_LOG::LOCK_log"
@@ -2029,6 +2279,9 @@
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/sql/Relay_log_info::run_lock"
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/sql/Relay_log_info::sleep_lock"
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/sql/Replica_reporting_capability::err_lock"
+ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/sql/Source_info::data_lock"
+ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/sql/Source_info::run_lock"
+ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/sql/Source_info::sleep_lock"
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/sql/Source_IO_monitor::run_lock"
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/sql/TABLE_SHARE::LOCK_ha_data"
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "mutex/sql/THD::LOCK_current_cond"
@@ -2043,6 +2296,7 @@
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "rwlock/sql/gtid_commit_rollback" OP "R"
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "rwlock/sql/gtid_commit_rollback" OP "W"
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "rwlock/sql/gtid_retrieved" OP "W"
+ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "rwlock/sql/LOCK_system_variables_hash" OP "R"
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "rwlock/sql/rpl_filter_lock" OP "W"
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "rwlock/sql/Trans_delegate::lock" OP "R"
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "sxlock/innodb/btr_search_latch" OP "S"
@@ -2059,17 +2313,185 @@
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "sxlock/innodb/rsegs_lock" OP "S"
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "sxlock/innodb/trx_purge_latch" OP "S"
 ARC FROM "mutex/sql/Relay_log_info::run_lock" TO "sxlock/innodb/undo_spaces_lock" OP "S"
-ARC FROM "mutex/sql/Replica_reporting_capability::err_lock" TO "cond/sql/DEBUG_SYNC::cond"
-ARC FROM "mutex/sql/Replica_reporting_capability::err_lock" TO "mutex/sql/DEBUG_SYNC::mutex"
 ARC FROM "mutex/sql/Replica_reporting_capability::err_lock" TO "mutex/sql/Replica_reporting_capability::err_lock"
 ARC FROM "mutex/sql/Replica_reporting_capability::err_lock" TO "rwlock/sql/rpl_filter_lock" OP "R"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "cond/sql/DEBUG_SYNC::cond"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/autoinc_mutex"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/autoinc_persisted_mutex"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/buf_pool_chunks_mutex"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/buf_pool_flush_state_mutex"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/buf_pool_free_list_mutex"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/buf_pool_LRU_list_mutex"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/buf_pool_zip_mutex"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/dict_sys_mutex"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/dict_table_mutex"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/fil_system_mutex"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/flush_list_mutex"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/innobase_share_mutex"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/lock_sys_page_mutex"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/lock_sys_table_mutex"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/log_checkpointer_mutex"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/log_sn_mutex"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/purge_sys_pq_mutex"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/rw_lock_debug_mutex"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/sync_array_mutex"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/trx_mutex"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/trx_pool_manager_mutex"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/trx_pool_mutex"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/trx_sys_serialisation_mutex"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/trx_sys_shard_mutex"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/trx_undo_mutex"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/innodb/undo_space_rseg_mutex"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/myisam/MYISAM_SHARE::intern_lock"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/mysys/KEY_CACHE::cache_lock"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/mysys/THR_LOCK_myisam"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/mysys/THR_LOCK_open"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/Cost_constant_cache::LOCK_cost_const"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/DEBUG_SYNC::mutex"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/Gtid_set::gtid_executed::free_intervals_mutex"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/key_mta_temp_table_LOCK"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/LOCK_global_system_variables"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/LOCK_open"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/LOCK_plugin"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/LOCK_replica_list"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/LOCK_sql_rand"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/LOCK_status"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/LOCK_table_cache"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/LOCK_transaction_cache"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/MDL_wait::LOCK_wait_status"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_log"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/MYSQL_RELAY_LOG::LOCK_index"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/MYSQL_RELAY_LOG::LOCK_log"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/MYSQL_RELAY_LOG::LOCK_log_end_pos"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/Relay_log_info::data_lock"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/Relay_log_info::info_thd_lock"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/Relay_log_info::log_space_lock"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/Replica_reporting_capability::err_lock"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/Source_info::data_lock"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/TABLE_SHARE::LOCK_ha_data"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/THD::LOCK_query_plan"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/THD::LOCK_thd_data"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "mutex/sql/THD::LOCK_thd_query"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "prlock/sql/MDL_lock::rwlock" OP "W"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "rwlock/sql/gtid_commit_rollback" OP "W"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "rwlock/sql/gtid_retrieved" OP "R"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "rwlock/sql/gtid_retrieved" OP "W"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "rwlock/sql/rpl_filter_lock" OP "R"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "rwlock/sql/Trans_delegate::lock" OP "R"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "sxlock/innodb/btr_search_latch" OP "S"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "sxlock/innodb/btr_search_latch" OP "X"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "sxlock/innodb/dict_table_stats" OP "X"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "sxlock/innodb/fil_space_latch" OP "X"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "sxlock/innodb/hash_table_locks" OP "S"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "sxlock/innodb/hash_table_locks" OP "X"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "sxlock/innodb/index_tree_rw_lock" OP "S"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "sxlock/innodb/index_tree_rw_lock" OP "SX"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "sxlock/innodb/lock_sys_global_rw_lock" OP "S"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "sxlock/innodb/log_sn_lock" OP "S"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "sxlock/innodb/log_sn_lock" OP "X"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "sxlock/innodb/rsegs_lock" OP "S"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "sxlock/innodb/trx_purge_latch" OP "S"
+ARC FROM "mutex/sql/Source_info::data_lock" TO "sxlock/innodb/undo_spaces_lock" OP "S"
+ARC FROM "mutex/sql/Source_info::rotate_lock" TO "mutex/sql/DEBUG_SYNC::mutex"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "cond/sql/Relay_log_info::start_cond"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "cond/sql/Relay_log_info::stop_cond"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "cond/sql/Source_IO_monitor::run_cond"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/group_rpl/LOCK_group_member_info_update_lock"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/autoinc_mutex"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/autoinc_persisted_mutex"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/buf_pool_chunks_mutex"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/buf_pool_flush_state_mutex"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/buf_pool_free_list_mutex"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/buf_pool_LRU_list_mutex"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/buf_pool_zip_mutex"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/dict_sys_mutex"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/dict_table_mutex"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/fil_system_mutex"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/flush_list_mutex"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/innobase_share_mutex"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/lock_sys_page_mutex"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/lock_sys_table_mutex"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/purge_sys_pq_mutex"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/rw_lock_debug_mutex"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/sync_array_mutex"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/trx_mutex"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/trx_pool_manager_mutex"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/trx_pool_mutex"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/trx_sys_serialisation_mutex"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/trx_sys_shard_mutex"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/trx_undo_mutex"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/innodb/undo_space_rseg_mutex"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/myisam/MYISAM_SHARE::intern_lock"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/mysys/KEY_CACHE::cache_lock"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/mysys/THR_LOCK_myisam"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/mysys/THR_LOCK_open"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/semisync/LOCK_binlog_"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/Cost_constant_cache::LOCK_cost_const"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/DEBUG_SYNC::mutex"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/key_mta_gaq_LOCK"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/key_mta_temp_table_LOCK"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/LOCK_global_system_variables"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/LOCK_item_func_sleep"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/LOCK_open"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/LOCK_plugin"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/LOCK_replica_list"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/LOCK_sql_rand"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/LOCK_sql_replica_skip_counter"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/LOCK_status"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/LOCK_table_cache"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/LOCK_thd_list"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/LOCK_thd_remove"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/LOCK_thread_ids"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/LOCK_transaction_cache"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/MDL_wait::LOCK_wait_status"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/MYSQL_RELAY_LOG::LOCK_index"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/MYSQL_RELAY_LOG::LOCK_log"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/MYSQL_RELAY_LOG::LOCK_log_end_pos"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/Relay_log_info::data_lock"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/Relay_log_info::info_thd_lock"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/Relay_log_info::log_space_lock"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/Relay_log_info::run_lock"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/Relay_log_info::sleep_lock"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/Replica_reporting_capability::err_lock"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/Source_info::data_lock"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/Source_info::info_thd_lock"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/Source_info::sleep_lock"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/Source_IO_monitor::run_lock"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/TABLE_SHARE::LOCK_ha_data"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/THD::LOCK_current_cond"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/THD::LOCK_query_plan"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/THD::LOCK_thd_data"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "mutex/sql/THD::LOCK_thd_query"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "prlock/sql/MDL_lock::rwlock" OP "W"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "rwlock/group_rpl/RWLOCK_transaction_observation_list" OP "R"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "rwlock/sql/gtid_commit_rollback" OP "R"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "rwlock/sql/gtid_commit_rollback" OP "W"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "rwlock/sql/gtid_retrieved" OP "W"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "rwlock/sql/LOCK_system_variables_hash" OP "R"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "rwlock/sql/Trans_delegate::lock" OP "R"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "sxlock/innodb/btr_search_latch" OP "S"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "sxlock/innodb/btr_search_latch" OP "X"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "sxlock/innodb/dict_table_stats" OP "X"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "sxlock/innodb/fil_space_latch" OP "X"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "sxlock/innodb/hash_table_locks" OP "S"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "sxlock/innodb/hash_table_locks" OP "X"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "sxlock/innodb/index_tree_rw_lock" OP "S"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "sxlock/innodb/index_tree_rw_lock" OP "SX"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "sxlock/innodb/lock_sys_global_rw_lock" OP "S"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "sxlock/innodb/lock_sys_global_rw_lock" OP "X"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "sxlock/innodb/log_sn_lock" OP "S"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "sxlock/innodb/rsegs_lock" OP "S"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "sxlock/innodb/trx_purge_latch" OP "S"
+ARC FROM "mutex/sql/Source_info::run_lock" TO "sxlock/innodb/undo_spaces_lock" OP "S"
 ARC FROM "mutex/sql/Source_IO_monitor::run_lock" TO "mutex/innodb/rw_lock_debug_mutex"
+ARC FROM "mutex/sql/Source_IO_monitor::run_lock" TO "mutex/innodb/sync_array_mutex"
 ARC FROM "mutex/sql/Source_IO_monitor::run_lock" TO "mutex/innodb/trx_mutex"
 ARC FROM "mutex/sql/Source_IO_monitor::run_lock" TO "mutex/sql/LOCK_plugin"
 ARC FROM "mutex/sql/Source_IO_monitor::run_lock" TO "mutex/sql/THD::LOCK_current_cond"
 ARC FROM "mutex/sql/Source_IO_monitor::run_lock" TO "mutex/sql/THD::LOCK_thd_data"
 ARC FROM "mutex/sql/Source_IO_monitor::run_lock" TO "sxlock/innodb/lock_sys_global_rw_lock" OP "X"
-ARC FROM "mutex/sql/TABLE_SHARE::LOCK_ha_data" TO "cond/sql/DEBUG_SYNC::cond"
 ARC FROM "mutex/sql/TABLE_SHARE::LOCK_ha_data" TO "mutex/innodb/dict_sys_mutex"
 ARC FROM "mutex/sql/TABLE_SHARE::LOCK_ha_data" TO "mutex/innodb/dict_table_mutex"
 ARC FROM "mutex/sql/TABLE_SHARE::LOCK_ha_data" TO "mutex/innodb/rw_lock_debug_mutex"
@@ -2078,7 +2500,6 @@
 ARC FROM "mutex/sql/TABLE_SHARE::LOCK_ha_data" TO "mutex/mysys/KEY_CACHE::cache_lock"
 ARC FROM "mutex/sql/TABLE_SHARE::LOCK_ha_data" TO "mutex/mysys/THR_LOCK_myisam"
 ARC FROM "mutex/sql/TABLE_SHARE::LOCK_ha_data" TO "mutex/mysys/THR_LOCK_open"
-ARC FROM "mutex/sql/TABLE_SHARE::LOCK_ha_data" TO "mutex/sql/DEBUG_SYNC::mutex"
 ARC FROM "mutex/sql/TABLE_SHARE::LOCK_ha_data" TO "mutex/sql/LOCK_plugin"
 ARC FROM "mutex/sql/TABLE_SHARE::LOCK_ha_data" TO "rwlock/mysys/SAFE_HASH::lock" OP "R"
 ARC FROM "mutex/sql/TABLE_SHARE::LOCK_ha_data" TO "sxlock/innodb/dict_table_stats" OP "X"
@@ -2089,17 +2510,20 @@
 ARC FROM "mutex/sql/THD::LOCK_current_cond" TO "mutex/sql/Gtid_state"
 ARC FROM "mutex/sql/THD::LOCK_current_cond" TO "mutex/sql/key_mta_gaq_LOCK"
 ARC FROM "mutex/sql/THD::LOCK_current_cond" TO "mutex/sql/LOCK_event_queue"
+ARC FROM "mutex/sql/THD::LOCK_current_cond" TO "mutex/sql/LOCK_group_replication_connection_mutex"
 ARC FROM "mutex/sql/THD::LOCK_current_cond" TO "mutex/sql/LOCK_item_func_sleep"
-ARC FROM "mutex/sql/THD::LOCK_current_cond" TO "mutex/sql/Source_info::sleep_lock"
 ARC FROM "mutex/sql/THD::LOCK_current_cond" TO "mutex/sql/MDL_wait::LOCK_wait_status"
 ARC FROM "mutex/sql/THD::LOCK_current_cond" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_binlog_end_pos"
 ARC FROM "mutex/sql/THD::LOCK_current_cond" TO "mutex/sql/MYSQL_RELAY_LOG::LOCK_log_end_pos"
 ARC FROM "mutex/sql/THD::LOCK_current_cond" TO "mutex/sql/Relay_log_info::log_space_lock"
 ARC FROM "mutex/sql/THD::LOCK_current_cond" TO "mutex/sql/Relay_log_info::sleep_lock"
+ARC FROM "mutex/sql/THD::LOCK_current_cond" TO "mutex/sql/Source_info::sleep_lock"
 ARC FROM "mutex/sql/THD::LOCK_current_cond" TO "mutex/sql/Worker_info::jobs_lock"
 ARC FROM "mutex/sql/THD::LOCK_query_plan" TO "mutex/sql/DEBUG_SYNC::mutex"
 ARC FROM "mutex/sql/THD::LOCK_thd_data" TO "cond/sql/DEBUG_SYNC::cond"
 ARC FROM "mutex/sql/THD::LOCK_thd_data" TO "mutex/group_rpl/LOCK_certifier_broadcast_dispatcher_run"
+ARC FROM "mutex/sql/THD::LOCK_thd_data" TO "mutex/group_rpl/LOCK_group_member_info_manager_update_lock"
+ARC FROM "mutex/sql/THD::LOCK_thd_data" TO "mutex/group_rpl/LOCK_group_member_info_update_lock"
 ARC FROM "mutex/sql/THD::LOCK_thd_data" TO "mutex/innodb/buf_pool_LRU_list_mutex"
 ARC FROM "mutex/sql/THD::LOCK_thd_data" TO "mutex/innodb/buf_pool_zip_mutex"
 ARC FROM "mutex/sql/THD::LOCK_thd_data" TO "mutex/innodb/flush_list_mutex"
@@ -2108,6 +2532,8 @@
 ARC FROM "mutex/sql/THD::LOCK_thd_data" TO "mutex/innodb/sync_array_mutex"
 ARC FROM "mutex/sql/THD::LOCK_thd_data" TO "mutex/innodb/trx_mutex"
 ARC FROM "mutex/sql/THD::LOCK_thd_data" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "mutex/sql/THD::LOCK_thd_data" TO "mutex/innodb/trx_sys_serialisation_mutex"
+ARC FROM "mutex/sql/THD::LOCK_thd_data" TO "mutex/innodb/trx_sys_shard_mutex"
 ARC FROM "mutex/sql/THD::LOCK_thd_data" TO "mutex/mysqlx/client_session_exit"
 ARC FROM "mutex/sql/THD::LOCK_thd_data" TO "mutex/mysqlx/server_client_exit"
 ARC FROM "mutex/sql/THD::LOCK_thd_data" TO "mutex/mysys/THR_LOCK::mutex"
@@ -2119,6 +2545,7 @@
 ARC FROM "mutex/sql/THD::LOCK_thd_data" TO "mutex/sql/LOCK_default_password_lifetime"
 ARC FROM "mutex/sql/THD::LOCK_thd_data" TO "mutex/sql/LOCK_event_queue"
 ARC FROM "mutex/sql/THD::LOCK_thd_data" TO "mutex/sql/LOCK_global_system_variables"
+ARC FROM "mutex/sql/THD::LOCK_thd_data" TO "mutex/sql/LOCK_group_replication_connection_mutex"
 ARC FROM "mutex/sql/THD::LOCK_thd_data" TO "mutex/sql/LOCK_item_func_sleep"
 ARC FROM "mutex/sql/THD::LOCK_thd_data" TO "mutex/sql/LOCK_keyring_operations"
 ARC FROM "mutex/sql/THD::LOCK_thd_data" TO "mutex/sql/LOCK_mandatory_roles"
@@ -2130,12 +2557,12 @@
 ARC FROM "mutex/sql/THD::LOCK_thd_data" TO "mutex/sql/LOCK_replica_trans_dep_tracker"
 ARC FROM "mutex/sql/THD::LOCK_thd_data" TO "mutex/sql/LOCK_sql_replica_skip_counter"
 ARC FROM "mutex/sql/THD::LOCK_thd_data" TO "mutex/sql/LOCK_tls_ctx_options"
-ARC FROM "mutex/sql/THD::LOCK_thd_data" TO "mutex/sql/Source_info::sleep_lock"
 ARC FROM "mutex/sql/THD::LOCK_thd_data" TO "mutex/sql/MDL_wait::LOCK_wait_status"
 ARC FROM "mutex/sql/THD::LOCK_thd_data" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_binlog_end_pos"
 ARC FROM "mutex/sql/THD::LOCK_thd_data" TO "mutex/sql/MYSQL_RELAY_LOG::LOCK_log_end_pos"
 ARC FROM "mutex/sql/THD::LOCK_thd_data" TO "mutex/sql/Relay_log_info::log_space_lock"
 ARC FROM "mutex/sql/THD::LOCK_thd_data" TO "mutex/sql/Relay_log_info::sleep_lock"
+ARC FROM "mutex/sql/THD::LOCK_thd_data" TO "mutex/sql/Source_info::sleep_lock"
 ARC FROM "mutex/sql/THD::LOCK_thd_data" TO "mutex/sql/THD::LOCK_current_cond"
 ARC FROM "mutex/sql/THD::LOCK_thd_data" TO "mutex/sql/THD::LOCK_query_plan"
 ARC FROM "mutex/sql/THD::LOCK_thd_data" TO "mutex/sql/THD::LOCK_thd_sysvar"
@@ -2167,7 +2594,6 @@
 ARC FROM "mutex/sql/THD::LOCK_thd_sysvar" TO "rwlock/sql/gtid_commit_rollback" OP "R"
 ARC FROM "mutex/sql/THD::LOCK_thd_sysvar" TO "rwlock/sql/gtid_commit_rollback" OP "W"
 ARC FROM "mutex/sql/THD::LOCK_thd_sysvar" TO "rwlock/sql/LOCK_system_variables_hash" OP "R"
-ARC FROM "mutex/sql/tz_LOCK" TO "cond/sql/DEBUG_SYNC::cond"
 ARC FROM "mutex/sql/tz_LOCK" TO "mutex/innodb/autoinc_mutex"
 ARC FROM "mutex/sql/tz_LOCK" TO "mutex/innodb/autoinc_persisted_mutex"
 ARC FROM "mutex/sql/tz_LOCK" TO "mutex/innodb/buf_pool_free_list_mutex"
@@ -2186,7 +2612,6 @@
 ARC FROM "mutex/sql/tz_LOCK" TO "mutex/mysys/KEY_CACHE::cache_lock"
 ARC FROM "mutex/sql/tz_LOCK" TO "mutex/mysys/THR_LOCK_myisam"
 ARC FROM "mutex/sql/tz_LOCK" TO "mutex/mysys/THR_LOCK_open"
-ARC FROM "mutex/sql/tz_LOCK" TO "mutex/sql/DEBUG_SYNC::mutex"
 ARC FROM "mutex/sql/tz_LOCK" TO "mutex/sql/LOCK_open"
 ARC FROM "mutex/sql/tz_LOCK" TO "mutex/sql/LOCK_plugin"
 ARC FROM "mutex/sql/tz_LOCK" TO "mutex/sql/LOCK_table_cache"
@@ -2217,30 +2642,158 @@
 ARC FROM "prlock/sql/MDL_lock::rwlock" STATE "W" TO "mutex/sql/MDL_wait::LOCK_wait_status"
 ARC FROM "prlock/sql/MDL_lock::rwlock" STATE "W" TO "mutex/sql/THD::LOCK_thd_data"
 ARC FROM "rwlock/group_rpl/RWLOCK_certifier_stable_gtid_set" STATE "W" TO "mutex/sql/Gtid_set::gtid_executed::free_intervals_mutex"
-ARC FROM "rwlock/group_rpl/RWLOCK_gcs_operations_finalize_ongoing" STATE "R" TO "rwlock/group_rpl/RWLOCK_gcs_operations" OP "W"
-ARC FROM "rwlock/group_rpl/RWLOCK_gcs_operations_finalize_ongoing" STATE "W" TO "rwlock/group_rpl/RWLOCK_gcs_operations" OP "W"
-ARC FROM "rwlock/group_rpl/RWLOCK_gcs_operations" STATE "R" TO "mutex/group_rpl/GCS_Gcs_suspicions_manager::m_suspicions_mutex"
-ARC FROM "rwlock/group_rpl/RWLOCK_gcs_operations" STATE "R" TO "mutex/group_rpl/GCS_Gcs_suspicions_manager::m_suspicions_parameters_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_channel_observation_list" STATE "R" TO "mutex/group_rpl/LOCK_applier_module_suspend"
+ARC FROM "rwlock/group_rpl/RWLOCK_channel_observation_list" STATE "R" TO "mutex/group_rpl/LOCK_group_member_info_manager_update_lock"
+ARC FROM "rwlock/group_rpl/RWLOCK_channel_observation_list" STATE "R" TO "mutex/group_rpl/LOCK_group_member_info_update_lock"
+ARC FROM "rwlock/group_rpl/RWLOCK_channel_observation_list" STATE "R" TO "mutex/group_rpl/LOCK_primary_election_running_flag"
+ARC FROM "rwlock/group_rpl/RWLOCK_channel_observation_list" STATE "R" TO "mutex/group_rpl/LOCK_recovery"
+ARC FROM "rwlock/group_rpl/RWLOCK_channel_observation_list" STATE "R" TO "mutex/group_rpl/LOCK_synchronized_queue"
+ARC FROM "rwlock/group_rpl/RWLOCK_channel_observation_list" STATE "R" TO "mutex/sql/Relay_log_info::info_thd_lock"
+ARC FROM "rwlock/group_rpl/RWLOCK_channel_observation_list" STATE "R" TO "mutex/sql/Relay_log_info::run_lock"
+ARC FROM "rwlock/group_rpl/RWLOCK_channel_observation_list" STATE "R" TO "mutex/sql/Source_info::info_thd_lock"
 ARC FROM "rwlock/group_rpl/RWLOCK_gcs_operations" STATE "R" TO "mutex/group_rpl/GCS_Gcs_xcom_view_change_control::m_current_view_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_gcs_operations" STATE "R" TO "mutex/group_rpl/GCS_Gcs_xcom_view_change_control::m_joining_leaving_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_gcs_operations" STATE "W" TO "cond/group_rpl/COND_view_modification_wait"
+ARC FROM "rwlock/group_rpl/RWLOCK_gcs_operations" STATE "W" TO "cond/group_rpl/GCS_Gcs_xcom_interface::m_wait_for_ssl_init_cond"
 ARC FROM "rwlock/group_rpl/RWLOCK_gcs_operations" STATE "W" TO "mutex/group_rpl/GCS_Gcs_async_buffer::m_free_buffer_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_gcs_operations" STATE "W" TO "mutex/group_rpl/GCS_Gcs_suspicions_manager::m_suspicions_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_gcs_operations" STATE "W" TO "mutex/group_rpl/GCS_Gcs_suspicions_manager::m_suspicions_parameters_mutex"
 ARC FROM "rwlock/group_rpl/RWLOCK_gcs_operations" STATE "W" TO "mutex/group_rpl/GCS_Gcs_xcom_engine::m_wait_for_notification_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_gcs_operations" STATE "W" TO "mutex/group_rpl/GCS_Gcs_xcom_group_management::m_nodes_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_gcs_operations" STATE "W" TO "mutex/group_rpl/GCS_Gcs_xcom_interface::m_wait_for_ssl_init_mutex"
 ARC FROM "rwlock/group_rpl/RWLOCK_gcs_operations" STATE "W" TO "mutex/group_rpl/GCS_Gcs_xcom_view_change_control::m_joining_leaving_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_gcs_operations" STATE "W" TO "mutex/group_rpl/LOCK_connection_map"
+ARC FROM "rwlock/group_rpl/RWLOCK_gcs_operations" STATE "W" TO "mutex/group_rpl/LOCK_group_member_info_update_lock"
+ARC FROM "rwlock/group_rpl/RWLOCK_gcs_operations" STATE "W" TO "mutex/group_rpl/LOCK_view_modification_wait"
 ARC FROM "rwlock/group_rpl/RWLOCK_gcs_operations" STATE "W" TO "mutex/mysys/THR_LOCK_open"
-ARC FROM "rwlock/group_rpl/RWLOCK_gcs_operations" STATE "W" TO "rwlock/group_rpl/RWLOCK_gcs_operations_finalize_ongoing" OP "W"
 ARC FROM "rwlock/group_rpl/RWLOCK_gcs_operations" STATE "W" TO "rwlock/group_rpl/RWLOCK_gcs_operations_view_change_observers" OP "W"
 ARC FROM "rwlock/group_rpl/RWLOCK_gcs_operations_view_change_observers" STATE "R" TO "mutex/group_rpl/LOCK_view_modification_wait"
 ARC FROM "rwlock/group_rpl/RWLOCK_group_event_observation_list" STATE "R" TO "mutex/group_rpl/key_GR_LOCK_group_action_coordinator_process"
 ARC FROM "rwlock/group_rpl/RWLOCK_group_event_observation_list" STATE "R" TO "mutex/group_rpl/key_GR_LOCK_group_action_coordinator_thread_end"
+ARC FROM "rwlock/group_rpl/RWLOCK_group_event_observation_list" STATE "R" TO "mutex/group_rpl/LOCK_clone_donor_list"
+ARC FROM "rwlock/group_rpl/RWLOCK_group_event_observation_list" STATE "R" TO "mutex/group_rpl/LOCK_group_member_info_manager_update_lock"
+ARC FROM "rwlock/group_rpl/RWLOCK_group_event_observation_list" STATE "R" TO "mutex/group_rpl/LOCK_group_member_info_update_lock"
+ARC FROM "rwlock/group_rpl/RWLOCK_group_event_observation_list" STATE "R" TO "mutex/group_rpl/LOCK_multi_primary_action_notification"
+ARC FROM "rwlock/group_rpl/RWLOCK_group_event_observation_list" STATE "R" TO "mutex/group_rpl/LOCK_pipeline_continuation"
+ARC FROM "rwlock/group_rpl/RWLOCK_group_event_observation_list" STATE "R" TO "mutex/group_rpl/LOCK_primary_election_action_notification"
+ARC FROM "rwlock/group_rpl/RWLOCK_group_event_observation_list" STATE "R" TO "mutex/group_rpl/LOCK_primary_election_action_phase"
+ARC FROM "rwlock/group_rpl/RWLOCK_group_event_observation_list" STATE "R" TO "mutex/group_rpl/LOCK_primary_election_primary_process_run"
+ARC FROM "rwlock/group_rpl/RWLOCK_group_event_observation_list" STATE "R" TO "mutex/group_rpl/LOCK_primary_election_secondary_process_run"
+ARC FROM "rwlock/group_rpl/RWLOCK_group_event_observation_list" STATE "R" TO "mutex/group_rpl/LOCK_primary_election_validation_notification"
+ARC FROM "rwlock/group_rpl/RWLOCK_group_event_observation_list" STATE "R" TO "mutex/group_rpl/LOCK_stage_monitor_handler"
+ARC FROM "rwlock/group_rpl/RWLOCK_group_event_observation_list" STATE "R" TO "mutex/group_rpl/LOCK_synchronized_queue"
+ARC FROM "rwlock/group_rpl/RWLOCK_group_event_observation_list" STATE "R" TO "rwlock/group_rpl/RWLOCK_group_event_observation_list" RECURSIVE OP "R"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "cond/group_rpl/COND_count_down_latch"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "cond/sql/DEBUG_SYNC::cond"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/group_rpl/LOCK_count_down_latch"
 ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/group_rpl/LOCK_group_member_info_update_lock"
 ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/group_rpl/LOCK_pipeline_stats_transactions_waiting_apply"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/group_rpl/LOCK_plugin_running"
 ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/group_rpl/LOCK_wait_ticket"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/group_rpl/LOCK_write_lock_protection"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/innodb/autoinc_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/innodb/autoinc_persisted_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/innodb/buf_pool_chunks_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/innodb/buf_pool_flush_state_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/innodb/buf_pool_free_list_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/innodb/buf_pool_LRU_list_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/innodb/buf_pool_zip_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/innodb/clone_sys_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/innodb/dict_persist_dirty_tables_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/innodb/dict_sys_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/innodb/dict_table_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/innodb/fil_system_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/innodb/flush_list_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/innodb/innobase_share_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/innodb/lock_sys_page_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/innodb/lock_sys_table_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/innodb/parser_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/innodb/purge_sys_pq_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/innodb/recalc_pool_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/innodb/rw_lock_debug_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/innodb/rw_lock_list_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/innodb/trx_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/innodb/trx_pool_manager_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/innodb/trx_pool_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/innodb/trx_sys_serialisation_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/innodb/trx_sys_shard_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/innodb/trx_undo_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/innodb/undo_space_rseg_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/mysys/THR_LOCK_open"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/sql/Cost_constant_cache::LOCK_cost_const"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/sql/DEBUG_SYNC::mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/sql/Gtid_state"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/sql/LOCK_connection_count"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/sql/LOCK_global_system_variables"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/sql/LOCK_open"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/sql/LOCK_plugin"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/sql/LOCK_replica_list"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/sql/LOCK_replica_trans_dep_tracker"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/sql/LOCK_sql_rand"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/sql/LOCK_status"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/sql/LOCK_table_cache"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/sql/LOCK_thd_list"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/sql/LOCK_thd_remove"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/sql/LOCK_thread_ids"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/sql/LOCK_transaction_cache"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/sql/LOG::LOCK_log"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_binlog_end_pos"
 ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_commit"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_commit_queue"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_done"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_flush_queue"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_log"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_sync"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_sync_queue"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_xids"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/sql/THD::LOCK_current_cond"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/sql/THD::LOCK_query_plan"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/sql/THD::LOCK_thd_data"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/sql/THD::LOCK_thd_protocol"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/sql/THD::LOCK_thd_query"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "mutex/sql/THD::LOCK_thd_sysvar"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "prlock/sql/MDL_lock::rwlock" OP "W"
 ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "rwlock/group_rpl/RWLOCK_gcs_operations" OP "R"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "rwlock/group_rpl/RWLOCK_plugin_stop" RECURSIVE OP "R"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "rwlock/group_rpl/RWLOCK_transaction_consistency_manager_prepared_transactions_on_my_applier" OP "R"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "rwlock/group_rpl/RWLOCK_transaction_observation_list" OP "R"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "rwlock/session/LOCK_srv_session_collection" OP "R"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "rwlock/session/LOCK_srv_session_collection" OP "W"
 ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "rwlock/sql/gtid_commit_rollback" OP "R"
 ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "rwlock/sql/gtid_commit_rollback" OP "W"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "rwlock/sql/LOCK_system_variables_hash" OP "R"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "rwlock/sql/LOGGER::LOCK_logger" OP "R"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "rwlock/sql/THR_LOCK_udf" OP "R"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "rwlock/sql/Trans_delegate::lock" OP "R"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "sxlock/innodb/btr_search_latch" OP "S"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "sxlock/innodb/dict_operation_lock" OP "X"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "sxlock/innodb/dict_table_stats" OP "S"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "sxlock/innodb/dict_table_stats" OP "X"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "sxlock/innodb/fil_space_latch" OP "X"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "sxlock/innodb/hash_table_locks" OP "S"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "sxlock/innodb/hash_table_locks" OP "X"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "sxlock/innodb/index_tree_rw_lock" OP "S"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "sxlock/innodb/index_tree_rw_lock" OP "SX"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "sxlock/innodb/index_tree_rw_lock" OP "X"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "sxlock/innodb/lock_sys_global_rw_lock" OP "S"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "sxlock/innodb/lock_sys_global_rw_lock" OP "X"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "sxlock/innodb/log_sn_lock" OP "S"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "sxlock/innodb/rsegs_lock" OP "S"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "sxlock/innodb/trx_purge_latch" OP "S"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "R" TO "sxlock/innodb/undo_spaces_lock" OP "S"
 ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "cond/group_rpl/COND_applier_module_run"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "cond/group_rpl/COND_clone_handler_run"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "cond/group_rpl/COND_group_action_coordinator_thread"
 ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "cond/group_rpl/COND_message_service_run"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "cond/group_rpl/COND_mysql_thread_run"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "cond/group_rpl/COND_primary_election_primary_process_run"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "cond/group_rpl/COND_recovery_module_run"
 ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "cond/group_rpl/COND_view_modification_wait"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "cond/sql/DEBUG_SYNC::cond"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "cond/sql/Relay_log_info::stop_cond"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "cond/sql/Source_info::stop_cond"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "cond/sql/Source_IO_monitor::run_cond"
 ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/group_rpl/GCS_Gcs_async_buffer::m_free_buffer_mutex"
 ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/group_rpl/GCS_Gcs_xcom_engine::m_wait_for_notification_mutex"
 ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/group_rpl/GCS_Gcs_xcom_view_change_control::m_joining_leaving_mutex"
@@ -2257,25 +2810,92 @@
 ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/group_rpl/LOCK_group_member_info_manager_update_lock"
 ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/group_rpl/LOCK_group_member_info_update_lock"
 ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/group_rpl/LOCK_message_service_run"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/group_rpl/LOCK_mysql_thread_dispatcher_run"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/group_rpl/LOCK_mysql_thread_run"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/group_rpl/LOCK_pipeline_continuation"
 ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/group_rpl/LOCK_plugin_modules_termination"
 ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/group_rpl/LOCK_plugin_online"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/group_rpl/LOCK_primary_election_action_notification"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/group_rpl/LOCK_primary_election_primary_process_run"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/group_rpl/LOCK_recovery"
 ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/group_rpl/LOCK_recovery_module_run"
 ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/group_rpl/LOCK_synchronized_queue"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/group_rpl/LOCK_transaction_unblocking"
 ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/group_rpl/LOCK_view_modification_wait"
 ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/group_rpl/LOCK_wait_ticket"
 ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/group_rpl/LOCK_write_lock_protection"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/innodb/buf_pool_free_list_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/innodb/buf_pool_LRU_list_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/innodb/fil_system_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/innodb/flush_list_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/innodb/lock_sys_page_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/innodb/lock_sys_table_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/innodb/purge_sys_pq_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/innodb/rw_lock_debug_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/innodb/trx_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/innodb/trx_sys_serialisation_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/innodb/trx_sys_shard_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/innodb/trx_undo_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/innodb/undo_space_rseg_mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/mysqlx/broker_context_sync"
 ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/mysys/THR_LOCK_open"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/sql/DEBUG_SYNC::mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/sql/key_mta_temp_table_LOCK"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/sql/LOCK_open"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/sql/LOCK_plugin"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/sql/LOCK_table_cache"
 ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/sql/LOCK_thd_list"
-ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/sql/Source_info::run_lock"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_binlog_end_pos"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/sql/MYSQL_RELAY_LOG::LOCK_log"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/sql/MYSQL_RELAY_LOG::LOCK_log_end_pos"
 ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/sql/Relay_log_info::run_lock"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/sql/Replica_reporting_capability::err_lock"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/sql/Source_info::data_lock"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/sql/Source_info::run_lock"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/sql/Source_IO_monitor::run_lock"
 ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/sql/THD::LOCK_current_cond"
 ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "mutex/sql/THD::LOCK_thd_data"
-ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "rwlock/group_rpl/RWLOCK_gcs_operations_finalize_ongoing" OP "W"
 ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "rwlock/group_rpl/RWLOCK_gcs_operations" OP "R"
 ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "rwlock/group_rpl/RWLOCK_gcs_operations" OP "W"
 ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "rwlock/group_rpl/RWLOCK_gcs_operations_view_change_observers" OP "W"
 ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "rwlock/sql/channel_lock" OP "W"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "sxlock/innodb/fil_space_latch" OP "X"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "sxlock/innodb/hash_table_locks" OP "S"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "sxlock/innodb/hash_table_locks" OP "X"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "sxlock/innodb/index_tree_rw_lock" OP "S"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "sxlock/innodb/lock_sys_global_rw_lock" OP "S"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "sxlock/innodb/lock_sys_global_rw_lock" OP "X"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "sxlock/innodb/log_sn_lock" OP "S"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "sxlock/innodb/rsegs_lock" OP "S"
+ARC FROM "rwlock/group_rpl/RWLOCK_plugin_stop" STATE "W" TO "sxlock/innodb/undo_spaces_lock" OP "S"
+ARC FROM "rwlock/group_rpl/RWLOCK_transaction_consistency_manager_map" STATE "R" TO "cond/sql/DEBUG_SYNC::cond"
+ARC FROM "rwlock/group_rpl/RWLOCK_transaction_consistency_manager_map" STATE "R" TO "mutex/group_rpl/LOCK_count_down_latch"
+ARC FROM "rwlock/group_rpl/RWLOCK_transaction_consistency_manager_map" STATE "R" TO "mutex/group_rpl/LOCK_wait_ticket"
+ARC FROM "rwlock/group_rpl/RWLOCK_transaction_consistency_manager_map" STATE "R" TO "mutex/sql/DEBUG_SYNC::mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_transaction_consistency_manager_map" STATE "R" TO "rwlock/group_rpl/RWLOCK_gcs_operations" OP "R"
+ARC FROM "rwlock/group_rpl/RWLOCK_transaction_consistency_manager_map" STATE "R" TO "rwlock/group_rpl/RWLOCK_transaction_consistency_manager_prepared_transactions_on_my_applier" OP "W"
+ARC FROM "rwlock/group_rpl/RWLOCK_transaction_consistency_manager_map" STATE "W" TO "mutex/group_rpl/LOCK_count_down_latch"
+ARC FROM "rwlock/group_rpl/RWLOCK_transaction_consistency_manager_map" STATE "W" TO "mutex/group_rpl/LOCK_wait_ticket"
+ARC FROM "rwlock/group_rpl/RWLOCK_transaction_consistency_manager_prepared_transactions_on_my_applier" STATE "W" TO "mutex/group_rpl/LOCK_count_down_latch"
+ARC FROM "rwlock/group_rpl/RWLOCK_transaction_consistency_manager_prepared_transactions_on_my_applier" STATE "W" TO "mutex/group_rpl/LOCK_wait_ticket"
+ARC FROM "rwlock/group_rpl/RWLOCK_transaction_observation_list" STATE "R" TO "cond/group_rpl/COND_count_down_latch"
+ARC FROM "rwlock/group_rpl/RWLOCK_transaction_observation_list" STATE "R" TO "cond/group_rpl/COND_primary_promotion_policy"
+ARC FROM "rwlock/group_rpl/RWLOCK_transaction_observation_list" STATE "R" TO "cond/sql/DEBUG_SYNC::cond"
+ARC FROM "rwlock/group_rpl/RWLOCK_transaction_observation_list" STATE "R" TO "cond/sql/Relay_log_info::data_cond"
+ARC FROM "rwlock/group_rpl/RWLOCK_transaction_observation_list" STATE "R" TO "mutex/group_rpl/LOCK_count_down_latch"
+ARC FROM "rwlock/group_rpl/RWLOCK_transaction_observation_list" STATE "R" TO "mutex/group_rpl/LOCK_group_member_info_update_lock"
+ARC FROM "rwlock/group_rpl/RWLOCK_transaction_observation_list" STATE "R" TO "mutex/group_rpl/LOCK_primary_promotion_policy"
+ARC FROM "rwlock/group_rpl/RWLOCK_transaction_observation_list" STATE "R" TO "mutex/group_rpl/LOCK_server_ongoing_transaction_handler"
+ARC FROM "rwlock/group_rpl/RWLOCK_transaction_observation_list" STATE "R" TO "mutex/group_rpl/LOCK_wait_ticket"
+ARC FROM "rwlock/group_rpl/RWLOCK_transaction_observation_list" STATE "R" TO "mutex/sql/DEBUG_SYNC::mutex"
+ARC FROM "rwlock/group_rpl/RWLOCK_transaction_observation_list" STATE "R" TO "mutex/sql/Relay_log_info::data_lock"
+ARC FROM "rwlock/group_rpl/RWLOCK_transaction_observation_list" STATE "R" TO "rwlock/group_rpl/RWLOCK_gcs_operations" OP "R"
 ARC FROM "rwlock/group_rpl/RWLOCK_transaction_observation_list" STATE "R" TO "rwlock/group_rpl/RWLOCK_transaction_consistency_manager_prepared_transactions_on_my_applier" OP "R"
+ARC FROM "rwlock/group_rpl/RWLOCK_transaction_observation_list" STATE "R" TO "rwlock/group_rpl/RWLOCK_transaction_consistency_manager_prepared_transactions_on_my_applier" OP "W"
+ARC FROM "rwlock/group_rpl/RWLOCK_transaction_observation_list" STATE "R" TO "rwlock/sql/gtid_commit_rollback" OP "R"
+ARC FROM "rwlock/group_rpl/RWLOCK_transaction_observation_list" STATE "R" TO "rwlock/sql/gtid_commit_rollback" OP "W"
+ARC FROM "rwlock/group_rpl/RWLOCK_transaction_observation_list" STATE "R" TO "rwlock/sql/gtid_retrieved" OP "W"
 ARC FROM "rwlock/keyring/LOCK_keyring" STATE "W" TO "mutex/mysys/THR_LOCK_open"
 ARC FROM "rwlock/myisam/MYISAM_SHARE::key_root_lock" STATE "R" TO "mutex/mysys/KEY_CACHE::cache_lock"
 ARC FROM "rwlock/myisam/MYISAM_SHARE::key_root_lock" STATE "R" TO "mutex/sql/LOCK_plugin"
@@ -2295,28 +2915,41 @@
 ARC FROM "rwlock/rewriter/LOCK_plugin_rewriter_table_" STATE "W" TO "mutex/sql/LOCK_sql_rand"
 ARC FROM "rwlock/rewriter/LOCK_plugin_rewriter_table_" STATE "W" TO "mutex/sql/THD::LOCK_thd_data"
 ARC FROM "rwlock/sql/Binlog_relay_IO_delegate::lock" STATE "R" TO "cond/sql/DEBUG_SYNC::cond"
+ARC FROM "rwlock/sql/Binlog_relay_IO_delegate::lock" STATE "R" TO "mutex/group_rpl/LOCK_applier_module_suspend"
+ARC FROM "rwlock/sql/Binlog_relay_IO_delegate::lock" STATE "R" TO "mutex/group_rpl/LOCK_group_member_info_manager_update_lock"
+ARC FROM "rwlock/sql/Binlog_relay_IO_delegate::lock" STATE "R" TO "mutex/group_rpl/LOCK_group_member_info_update_lock"
+ARC FROM "rwlock/sql/Binlog_relay_IO_delegate::lock" STATE "R" TO "mutex/group_rpl/LOCK_primary_election_running_flag"
+ARC FROM "rwlock/sql/Binlog_relay_IO_delegate::lock" STATE "R" TO "mutex/group_rpl/LOCK_recovery"
+ARC FROM "rwlock/sql/Binlog_relay_IO_delegate::lock" STATE "R" TO "mutex/group_rpl/LOCK_synchronized_queue"
 ARC FROM "rwlock/sql/Binlog_relay_IO_delegate::lock" STATE "R" TO "mutex/sql/DEBUG_SYNC::mutex"
 ARC FROM "rwlock/sql/Binlog_relay_IO_delegate::lock" STATE "R" TO "mutex/sql/LOCK_plugin"
+ARC FROM "rwlock/sql/Binlog_relay_IO_delegate::lock" STATE "R" TO "mutex/sql/Relay_log_info::info_thd_lock"
+ARC FROM "rwlock/sql/Binlog_relay_IO_delegate::lock" STATE "R" TO "mutex/sql/Relay_log_info::run_lock"
+ARC FROM "rwlock/sql/Binlog_relay_IO_delegate::lock" STATE "R" TO "mutex/sql/Source_info::info_thd_lock"
 ARC FROM "rwlock/sql/Binlog_relay_IO_delegate::lock" STATE "R" TO "mutex/sql/THD::LOCK_current_cond"
 ARC FROM "rwlock/sql/Binlog_relay_IO_delegate::lock" STATE "R" TO "rwlock/group_rpl/RWLOCK_channel_observation_list" OP "R"
+ARC FROM "rwlock/sql/Binlog_relay_IO_delegate::lock" STATE "W" TO "mutex/sql/LOCK_plugin"
 ARC FROM "rwlock/sql/Binlog_storage_delegate::lock" STATE "R" TO "cond/semisync/COND_binlog_send_"
-ARC FROM "rwlock/sql/Binlog_storage_delegate::lock" STATE "R" TO "cond/sql/DEBUG_SYNC::cond"
 ARC FROM "rwlock/sql/Binlog_storage_delegate::lock" STATE "R" TO "mutex/semisync/LOCK_binlog_"
-ARC FROM "rwlock/sql/Binlog_storage_delegate::lock" STATE "R" TO "mutex/sql/DEBUG_SYNC::mutex"
 ARC FROM "rwlock/sql/Binlog_storage_delegate::lock" STATE "R" TO "mutex/sql/LOCK_plugin"
 ARC FROM "rwlock/sql/Binlog_storage_delegate::lock" STATE "R" TO "mutex/sql/THD::LOCK_current_cond"
 ARC FROM "rwlock/sql/Binlog_storage_delegate::lock" STATE "W" TO "mutex/sql/LOCK_plugin"
+ARC FROM "rwlock/sql/Binlog_storage_delegate::lock" STATE "W" TO "rwlock/sql/Binlog_relay_IO_delegate::lock" OP "W"
+ARC FROM "rwlock/sql/Binlog_storage_delegate::lock" STATE "W" TO "rwlock/sql/Binlog_transmit_delegate::lock" OP "W"
 ARC FROM "rwlock/sql/Binlog_storage_delegate::lock" STATE "W" TO "rwlock/sql/Server_state_delegate::lock" OP "W"
 ARC FROM "rwlock/sql/Binlog_transmit_delegate::lock" STATE "R" TO "cond/semisync/Ack_receiver::m_cond"
 ARC FROM "rwlock/sql/Binlog_transmit_delegate::lock" STATE "R" TO "mutex/semisync/Ack_receiver::m_mutex"
 ARC FROM "rwlock/sql/Binlog_transmit_delegate::lock" STATE "R" TO "mutex/semisync/LOCK_binlog_"
 ARC FROM "rwlock/sql/Binlog_transmit_delegate::lock" STATE "R" TO "mutex/sql/LOCK_plugin"
 ARC FROM "rwlock/sql/Binlog_transmit_delegate::lock" STATE "R" TO "mutex/sql/THD::LOCK_thd_data"
-ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "cond/sql/Source_info::start_cond"
-ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "cond/sql/Source_info::stop_cond"
+ARC FROM "rwlock/sql/Binlog_transmit_delegate::lock" STATE "W" TO "mutex/sql/LOCK_plugin"
+ARC FROM "rwlock/sql/Binlog_transmit_delegate::lock" STATE "W" TO "rwlock/sql/Binlog_relay_IO_delegate::lock" OP "W"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "cond/sql/Relay_log_info::start_cond"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "cond/sql/Relay_log_info::stop_cond"
+ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "cond/sql/Source_info::start_cond"
+ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "cond/sql/Source_info::stop_cond"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "cond/sql/Source_IO_monitor::run_cond"
+ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/group_rpl/LOCK_group_member_info_update_lock"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/innodb/autoinc_mutex"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/innodb/autoinc_persisted_mutex"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/innodb/buf_pool_chunks_mutex"
@@ -2331,7 +2964,6 @@
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/innodb/innobase_share_mutex"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/innodb/lock_sys_page_mutex"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/innodb/lock_sys_table_mutex"
-ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/innodb/lock_wait_mutex"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/innodb/purge_sys_pq_mutex"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/innodb/rw_lock_debug_mutex"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/innodb/sync_array_mutex"
@@ -2339,6 +2971,8 @@
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/innodb/trx_pool_manager_mutex"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/innodb/trx_pool_mutex"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/innodb/trx_sys_serialisation_mutex"
+ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/innodb/trx_sys_shard_mutex"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/innodb/trx_undo_mutex"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/innodb/undo_space_rseg_mutex"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/myisam/MYISAM_SHARE::intern_lock"
@@ -2350,14 +2984,16 @@
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/sql/DEBUG_SYNC::mutex"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/sql/key_mta_gaq_LOCK"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/sql/key_mta_temp_table_LOCK"
+ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/sql/LOCK_global_system_variables"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/sql/LOCK_item_func_sleep"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/sql/LOCK_open"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/sql/LOCK_plugin"
+ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/sql/LOCK_replica_list"
+ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/sql/LOCK_sql_rand"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/sql/LOCK_sql_replica_skip_counter"
+ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/sql/LOCK_status"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/sql/LOCK_table_cache"
-ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/sql/Source_info::data_lock"
-ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/sql/Source_info::run_lock"
-ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/sql/Source_info::sleep_lock"
+ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/sql/LOCK_transaction_cache"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/sql/MDL_wait::LOCK_wait_status"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/sql/MYSQL_RELAY_LOG::LOCK_index"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/sql/MYSQL_RELAY_LOG::LOCK_log"
@@ -2368,17 +3004,24 @@
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/sql/Relay_log_info::run_lock"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/sql/Relay_log_info::sleep_lock"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/sql/Replica_reporting_capability::err_lock"
+ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/sql/Source_info::data_lock"
+ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/sql/Source_info::run_lock"
+ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/sql/Source_info::sleep_lock"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/sql/Source_IO_monitor::run_lock"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/sql/TABLE_SHARE::LOCK_ha_data"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/sql/THD::LOCK_current_cond"
+ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/sql/THD::LOCK_query_plan"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/sql/THD::LOCK_thd_data"
+ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "mutex/sql/THD::LOCK_thd_query"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "prlock/sql/MDL_lock::rwlock" OP "W"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "rwlock/group_rpl/RWLOCK_channel_observation_list" OP "R"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "rwlock/sql/Binlog_relay_IO_delegate::lock" OP "R"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "rwlock/sql/gtid_commit_rollback" OP "R"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "rwlock/sql/gtid_commit_rollback" OP "W"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "rwlock/sql/gtid_retrieved" OP "W"
+ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "rwlock/sql/LOCK_system_variables_hash" OP "R"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "rwlock/sql/rpl_filter_lock" OP "R"
+ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "rwlock/sql/Trans_delegate::lock" OP "R"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "sxlock/innodb/btr_search_latch" OP "S"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "sxlock/innodb/btr_search_latch" OP "X"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "sxlock/innodb/dict_table_stats" OP "X"
@@ -2393,7 +3036,6 @@
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "sxlock/innodb/rsegs_lock" OP "S"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "sxlock/innodb/trx_purge_latch" OP "S"
 ARC FROM "rwlock/sql/channel_lock" STATE "W" TO "sxlock/innodb/undo_spaces_lock" OP "S"
-ARC FROM "rwlock/sql/gtid_commit_rollback" STATE "R" TO "cond/sql/DEBUG_SYNC::cond"
 ARC FROM "rwlock/sql/gtid_commit_rollback" STATE "R" TO "mutex/sql/DEBUG_SYNC::mutex"
 ARC FROM "rwlock/sql/gtid_commit_rollback" STATE "R" TO "mutex/sql/Gtid_set::gtid_executed::free_intervals_mutex"
 ARC FROM "rwlock/sql/gtid_commit_rollback" STATE "R" TO "mutex/sql/Gtid_state"
@@ -2416,15 +3058,15 @@
 ARC FROM "rwlock/sql/gtid_commit_rollback" STATE "W" TO "mutex/innodb/lock_wait_mutex"
 ARC FROM "rwlock/sql/gtid_commit_rollback" STATE "W" TO "mutex/innodb/log_checkpointer_mutex"
 ARC FROM "rwlock/sql/gtid_commit_rollback" STATE "W" TO "mutex/innodb/log_sn_mutex"
-ARC FROM "rwlock/sql/gtid_commit_rollback" STATE "W" TO "mutex/innodb/parser_mutex"
 ARC FROM "rwlock/sql/gtid_commit_rollback" STATE "W" TO "mutex/innodb/purge_sys_pq_mutex"
-ARC FROM "rwlock/sql/gtid_commit_rollback" STATE "W" TO "mutex/innodb/recalc_pool_mutex"
 ARC FROM "rwlock/sql/gtid_commit_rollback" STATE "W" TO "mutex/innodb/rw_lock_debug_mutex"
 ARC FROM "rwlock/sql/gtid_commit_rollback" STATE "W" TO "mutex/innodb/sync_array_mutex"
 ARC FROM "rwlock/sql/gtid_commit_rollback" STATE "W" TO "mutex/innodb/trx_mutex"
 ARC FROM "rwlock/sql/gtid_commit_rollback" STATE "W" TO "mutex/innodb/trx_pool_manager_mutex"
 ARC FROM "rwlock/sql/gtid_commit_rollback" STATE "W" TO "mutex/innodb/trx_pool_mutex"
 ARC FROM "rwlock/sql/gtid_commit_rollback" STATE "W" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "rwlock/sql/gtid_commit_rollback" STATE "W" TO "mutex/innodb/trx_sys_serialisation_mutex"
+ARC FROM "rwlock/sql/gtid_commit_rollback" STATE "W" TO "mutex/innodb/trx_sys_shard_mutex"
 ARC FROM "rwlock/sql/gtid_commit_rollback" STATE "W" TO "mutex/innodb/trx_undo_mutex"
 ARC FROM "rwlock/sql/gtid_commit_rollback" STATE "W" TO "mutex/innodb/undo_space_rseg_mutex"
 ARC FROM "rwlock/sql/gtid_commit_rollback" STATE "W" TO "mutex/mysys/THR_LOCK_open"
@@ -2442,7 +3084,6 @@
 ARC FROM "rwlock/sql/gtid_commit_rollback" STATE "W" TO "prlock/sql/MDL_lock::rwlock" OP "W"
 ARC FROM "rwlock/sql/gtid_commit_rollback" STATE "W" TO "rwlock/keyring/LOCK_keyring" OP "R"
 ARC FROM "rwlock/sql/gtid_commit_rollback" STATE "W" TO "rwlock/sql/gtid_retrieved" OP "W"
-ARC FROM "rwlock/sql/gtid_commit_rollback" STATE "W" TO "sxlock/innodb/btr_search_latch" OP "S"
 ARC FROM "rwlock/sql/gtid_commit_rollback" STATE "W" TO "sxlock/innodb/dict_table_stats" OP "X"
 ARC FROM "rwlock/sql/gtid_commit_rollback" STATE "W" TO "sxlock/innodb/fil_space_latch" OP "X"
 ARC FROM "rwlock/sql/gtid_commit_rollback" STATE "W" TO "sxlock/innodb/hash_table_locks" OP "S"
@@ -2458,6 +3099,7 @@
 ARC FROM "rwlock/sql/gtid_retrieved" STATE "R" TO "mutex/sql/DEBUG_SYNC::mutex"
 ARC FROM "rwlock/sql/gtid_retrieved" STATE "R" TO "mutex/sql/Gtid_set::gtid_executed::free_intervals_mutex"
 ARC FROM "rwlock/sql/gtid_retrieved" STATE "W" TO "mutex/mysys/THR_LOCK_open"
+ARC FROM "rwlock/sql/gtid_retrieved" STATE "W" TO "mutex/sql/Gtid_set::gtid_executed::free_intervals_mutex"
 ARC FROM "rwlock/sql/gtid_retrieved" STATE "W" TO "mutex/sql/MYSQL_RELAY_LOG::LOCK_log_end_pos"
 ARC FROM "rwlock/sql/LOCK_system_variables_hash" STATE "R" TO "cond/sql/DEBUG_SYNC::cond"
 ARC FROM "rwlock/sql/LOCK_system_variables_hash" STATE "R" TO "mutex/sql/DEBUG_SYNC::mutex"
@@ -2465,6 +3107,7 @@
 ARC FROM "rwlock/sql/LOCK_system_variables_hash" STATE "R" TO "mutex/sql/THD::LOCK_current_cond"
 ARC FROM "rwlock/sql/LOCK_system_variables_hash" STATE "W" TO "mutex/mysys/THR_LOCK_open"
 ARC FROM "rwlock/sql/LOCK_system_variables_hash" STATE "W" TO "mutex/sql/LOCK_global_system_variables"
+ARC FROM "rwlock/sql/LOCK_system_variables_hash" STATE "W" TO "prlock/sql/MDL_lock::rwlock" OP "W"
 ARC FROM "rwlock/sql/LOGGER::LOCK_logger" STATE "R" TO "cond/sql/COND_thr_lock"
 ARC FROM "rwlock/sql/LOGGER::LOCK_logger" STATE "R" TO "cond/sql/DEBUG_SYNC::cond"
 ARC FROM "rwlock/sql/LOGGER::LOCK_logger" STATE "R" TO "mutex/csv/tina"
@@ -2492,16 +3135,17 @@
 ARC FROM "rwlock/sql/LOGGER::LOCK_logger" STATE "R" TO "mutex/sql/LOCK_plugin"
 ARC FROM "rwlock/sql/LOGGER::LOCK_logger" STATE "R" TO "mutex/sql/LOCK_table_cache"
 ARC FROM "rwlock/sql/LOGGER::LOCK_logger" STATE "R" TO "mutex/sql/LOG::LOCK_log"
+ARC FROM "rwlock/sql/LOGGER::LOCK_logger" STATE "R" TO "mutex/sql/MDL_wait::LOCK_wait_status"
 ARC FROM "rwlock/sql/LOGGER::LOCK_logger" STATE "R" TO "mutex/sql/THD::LOCK_current_cond"
 ARC FROM "rwlock/sql/LOGGER::LOCK_logger" STATE "R" TO "mutex/sql/THD::LOCK_thd_data"
 ARC FROM "rwlock/sql/LOGGER::LOCK_logger" STATE "R" TO "prlock/sql/MDL_lock::rwlock" OP "W"
 ARC FROM "rwlock/sql/LOGGER::LOCK_logger" STATE "R" TO "sxlock/innodb/btr_search_latch" OP "S"
 ARC FROM "rwlock/sql/LOGGER::LOCK_logger" STATE "R" TO "sxlock/innodb/btr_search_latch" OP "X"
+ARC FROM "rwlock/sql/LOGGER::LOCK_logger" STATE "R" TO "sxlock/innodb/dict_table_stats" OP "X"
 ARC FROM "rwlock/sql/LOGGER::LOCK_logger" STATE "R" TO "sxlock/innodb/hash_table_locks" OP "S"
 ARC FROM "rwlock/sql/LOGGER::LOCK_logger" STATE "R" TO "sxlock/innodb/hash_table_locks" OP "X"
 ARC FROM "rwlock/sql/LOGGER::LOCK_logger" STATE "R" TO "sxlock/innodb/index_tree_rw_lock" OP "S"
 ARC FROM "rwlock/sql/LOGGER::LOCK_logger" STATE "R" TO "sxlock/innodb/trx_purge_latch" OP "S"
-ARC FROM "rwlock/sql/LOGGER::LOCK_logger" STATE "W" TO "cond/sql/DEBUG_SYNC::cond"
 ARC FROM "rwlock/sql/LOGGER::LOCK_logger" STATE "W" TO "mutex/csv/tina"
 ARC FROM "rwlock/sql/LOGGER::LOCK_logger" STATE "W" TO "mutex/csv/TINA_SHARE::mutex"
 ARC FROM "rwlock/sql/LOGGER::LOCK_logger" STATE "W" TO "mutex/innodb/autoinc_mutex"
@@ -2522,11 +3166,9 @@
 ARC FROM "rwlock/sql/LOGGER::LOCK_logger" STATE "W" TO "mutex/mysys/KEY_CACHE::cache_lock"
 ARC FROM "rwlock/sql/LOGGER::LOCK_logger" STATE "W" TO "mutex/mysys/THR_LOCK::mutex"
 ARC FROM "rwlock/sql/LOGGER::LOCK_logger" STATE "W" TO "mutex/mysys/THR_LOCK_open"
-ARC FROM "rwlock/sql/LOGGER::LOCK_logger" STATE "W" TO "mutex/sql/DEBUG_SYNC::mutex"
 ARC FROM "rwlock/sql/LOGGER::LOCK_logger" STATE "W" TO "mutex/sql/LOCK_open"
 ARC FROM "rwlock/sql/LOGGER::LOCK_logger" STATE "W" TO "mutex/sql/LOCK_plugin"
 ARC FROM "rwlock/sql/LOGGER::LOCK_logger" STATE "W" TO "mutex/sql/LOCK_table_cache"
-ARC FROM "rwlock/sql/LOGGER::LOCK_logger" STATE "W" TO "mutex/sql/THD::LOCK_current_cond"
 ARC FROM "rwlock/sql/LOGGER::LOCK_logger" STATE "W" TO "mutex/sql/THD::LOCK_thd_data"
 ARC FROM "rwlock/sql/LOGGER::LOCK_logger" STATE "W" TO "prlock/sql/MDL_lock::rwlock" OP "W"
 ARC FROM "rwlock/sql/LOGGER::LOCK_logger" STATE "W" TO "sxlock/innodb/btr_search_latch" OP "S"
@@ -2535,8 +3177,13 @@
 ARC FROM "rwlock/sql/LOGGER::LOCK_logger" STATE "W" TO "sxlock/innodb/hash_table_locks" OP "X"
 ARC FROM "rwlock/sql/LOGGER::LOCK_logger" STATE "W" TO "sxlock/innodb/index_tree_rw_lock" OP "S"
 ARC FROM "rwlock/sql/LOGGER::LOCK_logger" STATE "W" TO "sxlock/innodb/trx_purge_latch" OP "S"
+ARC FROM "rwlock/sql/Server_state_delegate::lock" STATE "R" TO "cond/group_rpl/COND_delayed_init_run"
+ARC FROM "rwlock/sql/Server_state_delegate::lock" STATE "R" TO "mutex/group_rpl/LOCK_delayed_init_run"
+ARC FROM "rwlock/sql/Server_state_delegate::lock" STATE "R" TO "mutex/group_rpl/LOCK_delayed_init_server_ready"
 ARC FROM "rwlock/sql/Server_state_delegate::lock" STATE "R" TO "mutex/sql/LOCK_plugin"
 ARC FROM "rwlock/sql/Server_state_delegate::lock" STATE "W" TO "mutex/sql/LOCK_plugin"
+ARC FROM "rwlock/sql/Server_state_delegate::lock" STATE "W" TO "rwlock/sql/Binlog_relay_IO_delegate::lock" OP "W"
+ARC FROM "rwlock/sql/Server_state_delegate::lock" STATE "W" TO "rwlock/sql/Binlog_transmit_delegate::lock" OP "W"
 ARC FROM "rwlock/sql/THR_LOCK_servers" STATE "W" TO "mutex/innodb/autoinc_mutex"
 ARC FROM "rwlock/sql/THR_LOCK_servers" STATE "W" TO "mutex/innodb/autoinc_persisted_mutex"
 ARC FROM "rwlock/sql/THR_LOCK_servers" STATE "W" TO "mutex/innodb/buf_pool_chunks_mutex"
@@ -2558,6 +3205,7 @@
 ARC FROM "rwlock/sql/THR_LOCK_servers" STATE "W" TO "mutex/innodb/trx_pool_manager_mutex"
 ARC FROM "rwlock/sql/THR_LOCK_servers" STATE "W" TO "mutex/innodb/trx_pool_mutex"
 ARC FROM "rwlock/sql/THR_LOCK_servers" STATE "W" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "rwlock/sql/THR_LOCK_servers" STATE "W" TO "mutex/innodb/trx_sys_shard_mutex"
 ARC FROM "rwlock/sql/THR_LOCK_servers" STATE "W" TO "mutex/innodb/trx_undo_mutex"
 ARC FROM "rwlock/sql/THR_LOCK_servers" STATE "W" TO "mutex/innodb/undo_space_rseg_mutex"
 ARC FROM "rwlock/sql/THR_LOCK_servers" STATE "W" TO "mutex/sql/LOCK_open"
@@ -2578,22 +3226,31 @@
 ARC FROM "rwlock/sql/THR_LOCK_servers" STATE "W" TO "sxlock/innodb/trx_purge_latch" OP "S"
 ARC FROM "rwlock/sql/THR_LOCK_servers" STATE "W" TO "sxlock/innodb/undo_spaces_lock" OP "S"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "cond/group_rpl/COND_count_down_latch"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "cond/group_rpl/COND_primary_promotion_policy"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "cond/semisync/COND_binlog_send_"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "cond/sql/DEBUG_SYNC::cond"
-ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "cond/sql/Source_info::start_cond"
-ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "cond/sql/Source_info::stop_cond"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "cond/sql/Relay_log_info::data_cond"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "cond/sql/Relay_log_info::start_cond"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "cond/sql/Relay_log_info::stop_cond"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "cond/sql/Source_info::start_cond"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "cond/sql/Source_info::stop_cond"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/group_rpl/LOCK_count_down_latch"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/group_rpl/LOCK_group_member_info_update_lock"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/group_rpl/LOCK_pipeline_stats_transactions_waiting_apply"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/group_rpl/LOCK_plugin_running"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/group_rpl/LOCK_primary_promotion_policy"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/group_rpl/LOCK_server_ongoing_transaction_handler"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/group_rpl/LOCK_wait_ticket"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/group_rpl/LOCK_write_lock_protection"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/innodb/autoinc_mutex"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/innodb/autoinc_persisted_mutex"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/innodb/buf_pool_chunks_mutex"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/innodb/buf_pool_flush_state_mutex"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/innodb/buf_pool_free_list_mutex"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/innodb/buf_pool_LRU_list_mutex"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/innodb/buf_pool_zip_mutex"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/innodb/clone_sys_mutex"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/innodb/dict_persist_dirty_tables_mutex"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/innodb/dict_sys_mutex"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/innodb/dict_table_mutex"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/innodb/fil_system_mutex"
@@ -2601,28 +3258,49 @@
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/innodb/innobase_share_mutex"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/innodb/lock_sys_page_mutex"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/innodb/lock_sys_table_mutex"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/innodb/parser_mutex"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/innodb/purge_sys_pq_mutex"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/innodb/recalc_pool_mutex"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/innodb/rw_lock_debug_mutex"
-ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/innodb/sync_array_mutex"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/innodb/rw_lock_list_mutex"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/innodb/trx_mutex"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/innodb/trx_pool_manager_mutex"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/innodb/trx_pool_mutex"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/innodb/trx_sys_serialisation_mutex"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/innodb/trx_sys_shard_mutex"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/innodb/trx_undo_mutex"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/innodb/undo_space_rseg_mutex"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/mysys/THR_LOCK_open"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/semisync/LOCK_binlog_"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/Cost_constant_cache::LOCK_cost_const"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/DEBUG_SYNC::mutex"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/Gtid_state"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/key_mta_temp_table_LOCK"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/LOCK_connection_count"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/LOCK_global_system_variables"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/LOCK_open"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/LOCK_plugin"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/LOCK_replica_list"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/LOCK_replica_trans_dep_tracker"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/LOCK_sql_rand"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/LOCK_sql_replica_skip_counter"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/LOCK_status"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/LOCK_table_cache"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/LOCK_thd_list"
-ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/Source_info::data_lock"
-ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/Source_info::info_thd_lock"
-ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/Source_info::rotate_lock"
-ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/Source_info::run_lock"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/LOCK_thd_remove"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/LOCK_thread_ids"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/LOCK_transaction_cache"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/LOG::LOCK_log"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_binlog_end_pos"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_commit"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_commit_queue"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_done"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_flush_queue"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_log"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_sync"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_sync_queue"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_xids"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/MYSQL_RELAY_LOG::LOCK_index"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/MYSQL_RELAY_LOG::LOCK_log"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/MYSQL_RELAY_LOG::LOCK_log_end_pos"
@@ -2631,14 +3309,27 @@
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/Relay_log_info::log_space_lock"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/Relay_log_info::run_lock"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/Replica_reporting_capability::err_lock"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/Source_info::data_lock"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/Source_info::info_thd_lock"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/Source_info::rotate_lock"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/Source_info::run_lock"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/THD::LOCK_current_cond"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/THD::LOCK_query_plan"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/THD::LOCK_thd_data"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/THD::LOCK_thd_protocol"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/THD::LOCK_thd_query"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/THD::LOCK_thd_sysvar"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "mutex/sql/Worker_info::jobs_lock"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "prlock/sql/MDL_lock::rwlock" OP "W"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "rwlock/group_rpl/RWLOCK_gcs_operations" OP "R"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "rwlock/group_rpl/RWLOCK_plugin_stop" OP "R"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "rwlock/group_rpl/RWLOCK_transaction_consistency_manager_map" OP "R"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "rwlock/group_rpl/RWLOCK_transaction_consistency_manager_map" OP "W"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "rwlock/group_rpl/RWLOCK_transaction_consistency_manager_prepared_transactions_on_my_applier" OP "R"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "rwlock/group_rpl/RWLOCK_transaction_consistency_manager_prepared_transactions_on_my_applier" OP "W"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "rwlock/group_rpl/RWLOCK_transaction_observation_list" OP "R"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "rwlock/session/LOCK_srv_session_collection" OP "R"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "rwlock/session/LOCK_srv_session_collection" OP "W"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "rwlock/sql/Binlog_relay_IO_delegate::lock" OP "R"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "rwlock/sql/Binlog_relay_IO_delegate::lock" OP "W"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "rwlock/sql/channel_lock" OP "W"
@@ -2646,18 +3337,31 @@
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "rwlock/sql/gtid_commit_rollback" OP "W"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "rwlock/sql/gtid_retrieved" OP "R"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "rwlock/sql/gtid_retrieved" OP "W"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "rwlock/sql/LOCK_system_variables_hash" OP "R"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "rwlock/sql/LOGGER::LOCK_logger" OP "R"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "rwlock/sql/rpl_filter_lock" OP "R"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "rwlock/sql/THR_LOCK_udf" OP "R"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "rwlock/sql/Trans_delegate::lock" RECURSIVE OP "R"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "sxlock/innodb/btr_search_latch" OP "S"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "sxlock/innodb/dict_operation_lock" OP "X"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "sxlock/innodb/dict_table_stats" OP "S"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "sxlock/innodb/dict_table_stats" OP "X"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "sxlock/innodb/fil_space_latch" OP "X"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "sxlock/innodb/hash_table_locks" OP "S"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "sxlock/innodb/hash_table_locks" OP "X"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "sxlock/innodb/index_tree_rw_lock" OP "S"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "sxlock/innodb/index_tree_rw_lock" OP "SX"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "sxlock/innodb/index_tree_rw_lock" OP "X"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "sxlock/innodb/lock_sys_global_rw_lock" OP "S"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "sxlock/innodb/lock_sys_global_rw_lock" OP "X"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "sxlock/innodb/log_sn_lock" OP "S"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "sxlock/innodb/rsegs_lock" OP "S"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "sxlock/innodb/trx_purge_latch" OP "S"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "R" TO "sxlock/innodb/undo_spaces_lock" OP "S"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "W" TO "mutex/sql/LOCK_plugin"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "W" TO "rwlock/sql/Binlog_relay_IO_delegate::lock" OP "W"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "W" TO "rwlock/sql/Binlog_storage_delegate::lock" OP "W"
+ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "W" TO "rwlock/sql/Binlog_transmit_delegate::lock" OP "W"
 ARC FROM "rwlock/sql/Trans_delegate::lock" STATE "W" TO "rwlock/sql/Server_state_delegate::lock" OP "W"
 ARC FROM "rwlock/vtoken/LOCK_vtoken_hash" STATE "R" TO "cond/sql/MDL_context::COND_wait_status"
 ARC FROM "rwlock/vtoken/LOCK_vtoken_hash" STATE "R" TO "mutex/sql/MDL_wait::LOCK_wait_status"
@@ -2682,15 +3386,11 @@
 ARC FROM "sxlock/innodb/btr_search_latch" STATE "X" TO "mutex/innodb/sync_array_mutex"
 ARC FROM "sxlock/innodb/btr_search_latch" STATE "X" TO "sxlock/innodb/btr_search_latch" OP "X"
 ARC FROM "sxlock/innodb/btr_search_latch" STATE "X" TO "sxlock/innodb/hash_table_locks" OP "S"
-ARC FROM "sxlock/innodb/dict_operation_lock" STATE "S" TO "mutex/innodb/buf_pool_chunks_mutex"
-ARC FROM "sxlock/innodb/dict_operation_lock" STATE "S" TO "mutex/innodb/buf_pool_flush_state_mutex"
 ARC FROM "sxlock/innodb/dict_operation_lock" STATE "S" TO "mutex/innodb/buf_pool_free_list_mutex"
 ARC FROM "sxlock/innodb/dict_operation_lock" STATE "S" TO "mutex/innodb/buf_pool_LRU_list_mutex"
-ARC FROM "sxlock/innodb/dict_operation_lock" STATE "S" TO "mutex/innodb/buf_pool_zip_mutex"
 ARC FROM "sxlock/innodb/dict_operation_lock" STATE "S" TO "mutex/innodb/dict_sys_mutex"
 ARC FROM "sxlock/innodb/dict_operation_lock" STATE "S" TO "mutex/innodb/dict_table_mutex"
 ARC FROM "sxlock/innodb/dict_operation_lock" STATE "S" TO "mutex/innodb/fil_system_mutex"
-ARC FROM "sxlock/innodb/dict_operation_lock" STATE "S" TO "mutex/innodb/flush_list_mutex"
 ARC FROM "sxlock/innodb/dict_operation_lock" STATE "S" TO "mutex/innodb/parser_mutex"
 ARC FROM "sxlock/innodb/dict_operation_lock" STATE "S" TO "mutex/innodb/rw_lock_debug_mutex"
 ARC FROM "sxlock/innodb/dict_operation_lock" STATE "S" TO "mutex/innodb/sync_array_mutex"
@@ -2698,7 +3398,7 @@
 ARC FROM "sxlock/innodb/dict_operation_lock" STATE "S" TO "mutex/innodb/trx_pool_manager_mutex"
 ARC FROM "sxlock/innodb/dict_operation_lock" STATE "S" TO "mutex/innodb/trx_pool_mutex"
 ARC FROM "sxlock/innodb/dict_operation_lock" STATE "S" TO "mutex/innodb/trx_sys_mutex"
-ARC FROM "sxlock/innodb/dict_operation_lock" STATE "S" TO "sxlock/innodb/btr_search_latch" OP "S"
+ARC FROM "sxlock/innodb/dict_operation_lock" STATE "S" TO "mutex/innodb/trx_sys_shard_mutex"
 ARC FROM "sxlock/innodb/dict_operation_lock" STATE "S" TO "sxlock/innodb/dict_table_stats" OP "X"
 ARC FROM "sxlock/innodb/dict_operation_lock" STATE "S" TO "sxlock/innodb/hash_table_locks" OP "S"
 ARC FROM "sxlock/innodb/dict_operation_lock" STATE "S" TO "sxlock/innodb/hash_table_locks" OP "X"
@@ -2748,6 +3448,8 @@
 ARC FROM "sxlock/innodb/dict_operation_lock" STATE "X" TO "mutex/innodb/trx_pool_manager_mutex"
 ARC FROM "sxlock/innodb/dict_operation_lock" STATE "X" TO "mutex/innodb/trx_pool_mutex"
 ARC FROM "sxlock/innodb/dict_operation_lock" STATE "X" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "sxlock/innodb/dict_operation_lock" STATE "X" TO "mutex/innodb/trx_sys_serialisation_mutex"
+ARC FROM "sxlock/innodb/dict_operation_lock" STATE "X" TO "mutex/innodb/trx_sys_shard_mutex"
 ARC FROM "sxlock/innodb/dict_operation_lock" STATE "X" TO "mutex/innodb/trx_undo_mutex"
 ARC FROM "sxlock/innodb/dict_operation_lock" STATE "X" TO "mutex/innodb/undo_space_rseg_mutex"
 ARC FROM "sxlock/innodb/dict_operation_lock" STATE "X" TO "mutex/innodb/zip_pad_mutex"
@@ -2839,7 +3541,6 @@
 ARC FROM "sxlock/innodb/fil_space_latch" STATE "X" TO "mutex/sql/LOCK_keyring_operations"
 ARC FROM "sxlock/innodb/fil_space_latch" STATE "X" TO "mutex/sql/LOCK_plugin"
 ARC FROM "sxlock/innodb/fil_space_latch" STATE "X" TO "mutex/sql/LOCK_user_conn"
-ARC FROM "sxlock/innodb/fil_space_latch" STATE "X" TO "mutex/sql/THD::LOCK_current_cond"
 ARC FROM "sxlock/innodb/fil_space_latch" STATE "X" TO "rwlock/keyring/LOCK_keyring" OP "R"
 ARC FROM "sxlock/innodb/fil_space_latch" STATE "X" TO "rwlock/keyring/LOCK_keyring" OP "W"
 ARC FROM "sxlock/innodb/fil_space_latch" STATE "X" TO "sxlock/innodb/btr_search_latch" OP "S"
@@ -2877,11 +3578,14 @@
 ARC FROM "sxlock/innodb/fts_cache_rw_lock" STATE "X" TO "mutex/innodb/purge_sys_pq_mutex"
 ARC FROM "sxlock/innodb/fts_cache_rw_lock" STATE "X" TO "mutex/innodb/rw_lock_debug_mutex"
 ARC FROM "sxlock/innodb/fts_cache_rw_lock" STATE "X" TO "mutex/innodb/rw_lock_list_mutex"
+ARC FROM "sxlock/innodb/fts_cache_rw_lock" STATE "X" TO "mutex/innodb/srv_sys_mutex"
 ARC FROM "sxlock/innodb/fts_cache_rw_lock" STATE "X" TO "mutex/innodb/sync_array_mutex"
 ARC FROM "sxlock/innodb/fts_cache_rw_lock" STATE "X" TO "mutex/innodb/trx_mutex"
 ARC FROM "sxlock/innodb/fts_cache_rw_lock" STATE "X" TO "mutex/innodb/trx_pool_manager_mutex"
 ARC FROM "sxlock/innodb/fts_cache_rw_lock" STATE "X" TO "mutex/innodb/trx_pool_mutex"
 ARC FROM "sxlock/innodb/fts_cache_rw_lock" STATE "X" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "sxlock/innodb/fts_cache_rw_lock" STATE "X" TO "mutex/innodb/trx_sys_serialisation_mutex"
+ARC FROM "sxlock/innodb/fts_cache_rw_lock" STATE "X" TO "mutex/innodb/trx_sys_shard_mutex"
 ARC FROM "sxlock/innodb/fts_cache_rw_lock" STATE "X" TO "mutex/innodb/trx_undo_mutex"
 ARC FROM "sxlock/innodb/fts_cache_rw_lock" STATE "X" TO "mutex/innodb/undo_space_rseg_mutex"
 ARC FROM "sxlock/innodb/fts_cache_rw_lock" STATE "X" TO "mutex/sql/DEBUG_SYNC::mutex"
@@ -2917,7 +3621,6 @@
 ARC FROM "sxlock/innodb/hash_table_locks" STATE "X" TO "mutex/innodb/rw_lock_list_mutex"
 ARC FROM "sxlock/innodb/hash_table_locks" STATE "X" TO "mutex/innodb/sync_array_mutex"
 ARC FROM "sxlock/innodb/hash_table_locks" STATE "X" TO "sxlock/innodb/hash_table_locks" OP "X"
-ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "S" TO "cond/sql/DEBUG_SYNC::cond"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "S" TO "mutex/innodb/autoinc_persisted_mutex"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "S" TO "mutex/innodb/buf_pool_chunks_mutex"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "S" TO "mutex/innodb/buf_pool_flush_state_mutex"
@@ -2941,13 +3644,13 @@
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "S" TO "mutex/innodb/sync_array_mutex"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "S" TO "mutex/innodb/trx_mutex"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "S" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "S" TO "mutex/innodb/trx_sys_shard_mutex"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "S" TO "mutex/innodb/trx_undo_mutex"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "S" TO "mutex/innodb/undo_space_rseg_mutex"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "S" TO "mutex/innodb/zip_pad_mutex"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "S" TO "mutex/mysys/THR_LOCK_open"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "S" TO "mutex/sql/DEBUG_SYNC::mutex"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "S" TO "mutex/sql/LOCK_user_conn"
-ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "S" TO "mutex/sql/THD::LOCK_current_cond"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "S" TO "sxlock/innodb/btr_search_latch" OP "S"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "S" TO "sxlock/innodb/btr_search_latch" OP "X"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "S" TO "sxlock/innodb/fil_space_latch" OP "X"
@@ -2955,9 +3658,9 @@
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "S" TO "sxlock/innodb/hash_table_locks" OP "X"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "S" TO "sxlock/innodb/index_tree_rw_lock" OP "S"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "S" TO "sxlock/innodb/index_tree_rw_lock" OP "SX"
+ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "S" TO "sxlock/innodb/index_tree_rw_lock" OP "X"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "S" TO "sxlock/innodb/index_tree_rw_lock" RECURSIVE OP "S"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "S" TO "sxlock/innodb/lock_sys_global_rw_lock" OP "S"
-ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "S" TO "sxlock/innodb/lock_sys_global_rw_lock" OP "X"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "S" TO "sxlock/innodb/log_sn_lock" OP "S"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "S" TO "sxlock/innodb/trx_purge_latch" OP "S"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "SX" TO "cond/sql/DEBUG_SYNC::cond"
@@ -2983,10 +3686,10 @@
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "SX" TO "mutex/innodb/temp_space_rseg_mutex"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "SX" TO "mutex/innodb/trx_mutex"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "SX" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "SX" TO "mutex/innodb/trx_sys_shard_mutex"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "SX" TO "mutex/innodb/trx_undo_mutex"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "SX" TO "mutex/innodb/undo_space_rseg_mutex"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "SX" TO "mutex/innodb/zip_pad_mutex"
-ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "SX" TO "mutex/mysys/THR_LOCK_open"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "SX" TO "mutex/sql/DEBUG_SYNC::mutex"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "SX" TO "mutex/sql/LOCK_user_conn"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "SX" TO "mutex/sql/THD::LOCK_current_cond"
@@ -3002,7 +3705,6 @@
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "SX" TO "sxlock/innodb/lock_sys_global_rw_lock" OP "S"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "SX" TO "sxlock/innodb/log_sn_lock" OP "S"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "SX" TO "sxlock/innodb/trx_purge_latch" OP "S"
-ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "X" TO "cond/sql/DEBUG_SYNC::cond"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "X" TO "mutex/innodb/buf_pool_chunks_mutex"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "X" TO "mutex/innodb/buf_pool_flush_state_mutex"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "X" TO "mutex/innodb/buf_pool_free_list_mutex"
@@ -3022,9 +3724,8 @@
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "X" TO "mutex/innodb/sync_array_mutex"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "X" TO "mutex/innodb/trx_mutex"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "X" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "X" TO "mutex/innodb/trx_sys_shard_mutex"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "X" TO "mutex/innodb/zip_pad_mutex"
-ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "X" TO "mutex/sql/DEBUG_SYNC::mutex"
-ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "X" TO "mutex/sql/THD::LOCK_current_cond"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "X" TO "sxlock/innodb/btr_search_latch" OP "S"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "X" TO "sxlock/innodb/btr_search_latch" OP "X"
 ARC FROM "sxlock/innodb/index_tree_rw_lock" STATE "X" TO "sxlock/innodb/fil_space_latch" OP "X"
@@ -3050,6 +3751,7 @@
 ARC FROM "sxlock/innodb/lock_sys_global_rw_lock" STATE "S" TO "mutex/innodb/sync_array_mutex"
 ARC FROM "sxlock/innodb/lock_sys_global_rw_lock" STATE "S" TO "mutex/innodb/trx_mutex"
 ARC FROM "sxlock/innodb/lock_sys_global_rw_lock" STATE "S" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "sxlock/innodb/lock_sys_global_rw_lock" STATE "S" TO "mutex/innodb/trx_sys_shard_mutex"
 ARC FROM "sxlock/innodb/lock_sys_global_rw_lock" STATE "S" TO "mutex/sql/DEBUG_SYNC::mutex"
 ARC FROM "sxlock/innodb/lock_sys_global_rw_lock" STATE "S" TO "mutex/sql/MDL_wait::LOCK_wait_status"
 ARC FROM "sxlock/innodb/lock_sys_global_rw_lock" STATE "S" TO "mutex/sql/THD::LOCK_current_cond"
@@ -3057,17 +3759,12 @@
 ARC FROM "sxlock/innodb/lock_sys_global_rw_lock" STATE "S" TO "sxlock/innodb/btr_search_latch" OP "X"
 ARC FROM "sxlock/innodb/lock_sys_global_rw_lock" STATE "S" TO "sxlock/innodb/hash_table_locks" OP "X"
 ARC FROM "sxlock/innodb/lock_sys_global_rw_lock" STATE "X" TO "cond/sql/DEBUG_SYNC::cond"
-ARC FROM "sxlock/innodb/lock_sys_global_rw_lock" STATE "X" TO "mutex/innodb/buf_pool_chunks_mutex"
-ARC FROM "sxlock/innodb/lock_sys_global_rw_lock" STATE "X" TO "mutex/innodb/buf_pool_flush_state_mutex"
-ARC FROM "sxlock/innodb/lock_sys_global_rw_lock" STATE "X" TO "mutex/innodb/buf_pool_free_list_mutex"
 ARC FROM "sxlock/innodb/lock_sys_global_rw_lock" STATE "X" TO "mutex/innodb/buf_pool_LRU_list_mutex"
-ARC FROM "sxlock/innodb/lock_sys_global_rw_lock" STATE "X" TO "mutex/innodb/buf_pool_zip_mutex"
-ARC FROM "sxlock/innodb/lock_sys_global_rw_lock" STATE "X" TO "mutex/innodb/fil_system_mutex"
-ARC FROM "sxlock/innodb/lock_sys_global_rw_lock" STATE "X" TO "mutex/innodb/flush_list_mutex"
 ARC FROM "sxlock/innodb/lock_sys_global_rw_lock" STATE "X" TO "mutex/innodb/rw_lock_debug_mutex"
 ARC FROM "sxlock/innodb/lock_sys_global_rw_lock" STATE "X" TO "mutex/innodb/sync_array_mutex"
 ARC FROM "sxlock/innodb/lock_sys_global_rw_lock" STATE "X" TO "mutex/innodb/trx_mutex"
 ARC FROM "sxlock/innodb/lock_sys_global_rw_lock" STATE "X" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "sxlock/innodb/lock_sys_global_rw_lock" STATE "X" TO "mutex/innodb/trx_sys_shard_mutex"
 ARC FROM "sxlock/innodb/lock_sys_global_rw_lock" STATE "X" TO "mutex/sql/DEBUG_SYNC::mutex"
 ARC FROM "sxlock/innodb/lock_sys_global_rw_lock" STATE "X" TO "mutex/sql/LOCK_global_system_variables"
 ARC FROM "sxlock/innodb/lock_sys_global_rw_lock" STATE "X" TO "mutex/sql/LOCK_plugin"
@@ -3079,7 +3776,6 @@
 ARC FROM "sxlock/innodb/lock_sys_global_rw_lock" STATE "X" TO "mutex/sql/THD::LOCK_thd_data"
 ARC FROM "sxlock/innodb/lock_sys_global_rw_lock" STATE "X" TO "mutex/sql/THD::LOCK_thd_query"
 ARC FROM "sxlock/innodb/lock_sys_global_rw_lock" STATE "X" TO "sxlock/innodb/hash_table_locks" OP "S"
-ARC FROM "sxlock/innodb/lock_sys_global_rw_lock" STATE "X" TO "sxlock/innodb/hash_table_locks" OP "X"
 ARC FROM "sxlock/innodb/lock_sys_global_rw_lock" STATE "X" TO "sxlock/innodb/lock_sys_global_rw_lock" OP "X"
 ARC FROM "sxlock/innodb/log_sn_lock" STATE "S" TO "cond/sql/DEBUG_SYNC::cond"
 ARC FROM "sxlock/innodb/log_sn_lock" STATE "S" TO "mutex/innodb/flush_list_mutex"
@@ -3092,6 +3788,7 @@
 ARC FROM "sxlock/innodb/log_sn_lock" STATE "X" TO "mutex/innodb/log_writer_mutex"
 ARC FROM "sxlock/innodb/log_sn_lock" STATE "X" TO "mutex/innodb/page_sys_arch_oper_mutex"
 ARC FROM "sxlock/innodb/log_sn_lock" STATE "X" TO "mutex/innodb/rw_lock_debug_mutex"
+ARC FROM "sxlock/innodb/log_sn_lock" STATE "X" TO "mutex/innodb/sync_array_mutex"
 ARC FROM "sxlock/innodb/log_sn_lock" STATE "X" TO "mutex/sql/DEBUG_SYNC::mutex"
 ARC FROM "sxlock/innodb/rsegs_lock" STATE "S" TO "mutex/innodb/buf_pool_chunks_mutex"
 ARC FROM "sxlock/innodb/rsegs_lock" STATE "S" TO "mutex/innodb/buf_pool_flush_state_mutex"
@@ -3122,21 +3819,15 @@
 ARC FROM "sxlock/innodb/rsegs_lock" STATE "X" TO "mutex/innodb/buf_pool_flush_state_mutex"
 ARC FROM "sxlock/innodb/rsegs_lock" STATE "X" TO "mutex/innodb/buf_pool_free_list_mutex"
 ARC FROM "sxlock/innodb/rsegs_lock" STATE "X" TO "mutex/innodb/buf_pool_LRU_list_mutex"
-ARC FROM "sxlock/innodb/rsegs_lock" STATE "X" TO "mutex/innodb/buf_pool_zip_free_mutex"
-ARC FROM "sxlock/innodb/rsegs_lock" STATE "X" TO "mutex/innodb/buf_pool_zip_hash_mutex"
 ARC FROM "sxlock/innodb/rsegs_lock" STATE "X" TO "mutex/innodb/buf_pool_zip_mutex"
 ARC FROM "sxlock/innodb/rsegs_lock" STATE "X" TO "mutex/innodb/fil_system_mutex"
 ARC FROM "sxlock/innodb/rsegs_lock" STATE "X" TO "mutex/innodb/flush_list_mutex"
 ARC FROM "sxlock/innodb/rsegs_lock" STATE "X" TO "mutex/innodb/log_limits_mutex"
-ARC FROM "sxlock/innodb/rsegs_lock" STATE "X" TO "mutex/innodb/master_key_id_mutex"
 ARC FROM "sxlock/innodb/rsegs_lock" STATE "X" TO "mutex/innodb/rw_lock_debug_mutex"
 ARC FROM "sxlock/innodb/rsegs_lock" STATE "X" TO "mutex/innodb/sync_array_mutex"
 ARC FROM "sxlock/innodb/rsegs_lock" STATE "X" TO "mutex/innodb/undo_space_rseg_mutex"
-ARC FROM "sxlock/innodb/rsegs_lock" STATE "X" TO "mutex/mysys/THR_LOCK_open"
-ARC FROM "sxlock/innodb/rsegs_lock" STATE "X" TO "mutex/sql/LOCK_keyring_operations"
 ARC FROM "sxlock/innodb/rsegs_lock" STATE "X" TO "mutex/sql/LOCK_plugin"
 ARC FROM "sxlock/innodb/rsegs_lock" STATE "X" TO "rwlock/keyring/LOCK_keyring" OP "R"
-ARC FROM "sxlock/innodb/rsegs_lock" STATE "X" TO "rwlock/keyring/LOCK_keyring" OP "W"
 ARC FROM "sxlock/innodb/rsegs_lock" STATE "X" TO "sxlock/innodb/btr_search_latch" OP "S"
 ARC FROM "sxlock/innodb/rsegs_lock" STATE "X" TO "sxlock/innodb/btr_search_latch" OP "X"
 ARC FROM "sxlock/innodb/rsegs_lock" STATE "X" TO "sxlock/innodb/fil_space_latch" OP "X"
@@ -3163,6 +3854,7 @@
 ARC FROM "sxlock/innodb/trx_purge_latch" STATE "S" TO "mutex/innodb/sync_array_mutex"
 ARC FROM "sxlock/innodb/trx_purge_latch" STATE "S" TO "mutex/innodb/trx_mutex"
 ARC FROM "sxlock/innodb/trx_purge_latch" STATE "S" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "sxlock/innodb/trx_purge_latch" STATE "S" TO "mutex/innodb/trx_sys_shard_mutex"
 ARC FROM "sxlock/innodb/trx_purge_latch" STATE "S" TO "sxlock/innodb/btr_search_latch" OP "S"
 ARC FROM "sxlock/innodb/trx_purge_latch" STATE "S" TO "sxlock/innodb/fil_space_latch" OP "X"
 ARC FROM "sxlock/innodb/trx_purge_latch" STATE "S" TO "sxlock/innodb/hash_table_locks" OP "S"
@@ -3173,12 +3865,12 @@
 ARC FROM "sxlock/innodb/trx_purge_latch" STATE "X" TO "mutex/innodb/srv_sys_mutex"
 ARC FROM "sxlock/innodb/trx_purge_latch" STATE "X" TO "mutex/innodb/sync_array_mutex"
 ARC FROM "sxlock/innodb/trx_purge_latch" STATE "X" TO "mutex/innodb/trx_sys_mutex"
+ARC FROM "sxlock/innodb/trx_purge_latch" STATE "X" TO "mutex/innodb/trx_sys_shard_mutex"
 ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "S" TO "mutex/innodb/buf_pool_chunks_mutex"
 ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "S" TO "mutex/innodb/buf_pool_flush_state_mutex"
 ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "S" TO "mutex/innodb/buf_pool_free_list_mutex"
 ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "S" TO "mutex/innodb/buf_pool_LRU_list_mutex"
 ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "S" TO "mutex/innodb/buf_pool_zip_free_mutex"
-ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "S" TO "mutex/innodb/buf_pool_zip_hash_mutex"
 ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "S" TO "mutex/innodb/buf_pool_zip_mutex"
 ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "S" TO "mutex/innodb/fil_system_mutex"
 ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "S" TO "mutex/innodb/flush_list_mutex"
@@ -3200,40 +3892,18 @@
 ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "S" TO "sxlock/innodb/log_sn_lock" OP "S"
 ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "S" TO "sxlock/innodb/rsegs_lock" OP "S"
 ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "S" TO "sxlock/innodb/rsegs_lock" OP "X"
-ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "X" TO "mutex/innodb/buf_pool_chunks_mutex"
-ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "X" TO "mutex/innodb/buf_pool_flush_state_mutex"
-ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "X" TO "mutex/innodb/buf_pool_free_list_mutex"
-ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "X" TO "mutex/innodb/buf_pool_LRU_list_mutex"
-ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "X" TO "mutex/innodb/buf_pool_zip_free_mutex"
-ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "X" TO "mutex/innodb/buf_pool_zip_hash_mutex"
-ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "X" TO "mutex/innodb/buf_pool_zip_mutex"
 ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "X" TO "mutex/innodb/clone_sys_mutex"
 ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "X" TO "mutex/innodb/fil_system_mutex"
-ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "X" TO "mutex/innodb/flush_list_mutex"
-ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "X" TO "mutex/innodb/log_limits_mutex"
-ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "X" TO "mutex/innodb/master_key_id_mutex"
 ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "X" TO "mutex/innodb/rw_lock_debug_mutex"
 ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "X" TO "mutex/innodb/rw_lock_list_mutex"
-ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "X" TO "mutex/innodb/sync_array_mutex"
-ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "X" TO "mutex/mysys/THR_LOCK_open"
-ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "X" TO "mutex/sql/LOCK_keyring_operations"
-ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "X" TO "mutex/sql/LOCK_plugin"
-ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "X" TO "rwlock/keyring/LOCK_keyring" OP "R"
-ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "X" TO "rwlock/keyring/LOCK_keyring" OP "W"
-ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "X" TO "sxlock/innodb/btr_search_latch" OP "S"
-ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "X" TO "sxlock/innodb/btr_search_latch" OP "X"
-ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "X" TO "sxlock/innodb/fil_space_latch" OP "X"
-ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "X" TO "sxlock/innodb/hash_table_locks" OP "S"
-ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "X" TO "sxlock/innodb/hash_table_locks" OP "X"
-ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "X" TO "sxlock/innodb/log_sn_lock" OP "S"
 ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "X" TO "sxlock/innodb/rsegs_lock" OP "S"
-ARC FROM "sxlock/innodb/undo_spaces_lock" STATE "X" TO "sxlock/innodb/rsegs_lock" OP "X"
 BIND "cond/conn_delay/connection_delay_wait_condition" TO "mutex/conn_delay/connection_delay_mutex"
 BIND "cond/group_rpl/COND_applier_module_run" TO "mutex/group_rpl/LOCK_applier_module_run"
 BIND "cond/group_rpl/COND_applier_module_suspend" TO "mutex/group_rpl/LOCK_applier_module_suspend" FLAGS UNFAIR
 BIND "cond/group_rpl/COND_applier_module_wait" TO "mutex/group_rpl/LOCK_applier_module_suspend"
 BIND "cond/group_rpl/COND_certifier_broadcast_dispatcher_run" TO "mutex/group_rpl/LOCK_certifier_broadcast_dispatcher_run"
 BIND "cond/group_rpl/COND_certifier_broadcast_run" TO "mutex/group_rpl/LOCK_certifier_broadcast_run"
+BIND "cond/group_rpl/COND_clone_handler_run" TO "mutex/group_rpl/LOCK_clone_handler_run"
 BIND "cond/group_rpl/COND_count_down_latch" TO "mutex/group_rpl/LOCK_count_down_latch"
 BIND "cond/group_rpl/COND_delayed_init_run" TO "mutex/group_rpl/LOCK_delayed_init_run"
 BIND "cond/group_rpl/COND_delayed_init_server_ready" TO "mutex/group_rpl/LOCK_delayed_init_server_ready"
@@ -3242,8 +3912,9 @@
 BIND "cond/group_rpl/COND_group_action_coordinator_thread" TO "mutex/group_rpl/key_GR_LOCK_group_action_coordinator_thread"
 BIND "cond/group_rpl/COND_message_service_run" TO "mutex/group_rpl/LOCK_message_service_run"
 BIND "cond/group_rpl/COND_multi_primary_action_notification" TO "mutex/group_rpl/LOCK_multi_primary_action_notification"
+BIND "cond/group_rpl/COND_mysql_thread_dispatcher_run" TO "mutex/group_rpl/LOCK_mysql_thread_dispatcher_run"
+BIND "cond/group_rpl/COND_mysql_thread_run" TO "mutex/group_rpl/LOCK_mysql_thread_run"
 BIND "cond/group_rpl/COND_pipeline_continuation" TO "mutex/group_rpl/LOCK_pipeline_continuation" FLAGS UNFAIR
-BIND "cond/group_rpl/COND_plugin_online" TO "mutex/group_rpl/LOCK_plugin_online"
 BIND "cond/group_rpl/COND_primary_election_action_notification" TO "mutex/group_rpl/LOCK_primary_election_action_notification"
 BIND "cond/group_rpl/COND_primary_election_primary_process_run" TO "mutex/group_rpl/LOCK_primary_election_primary_process_run"
 BIND "cond/group_rpl/COND_primary_election_secondary_process_run" TO "mutex/group_rpl/LOCK_primary_election_secondary_process_run"
@@ -3253,17 +3924,16 @@
 BIND "cond/group_rpl/COND_recovery" TO "mutex/group_rpl/LOCK_recovery"
 BIND "cond/group_rpl/COND_session_thread_method_exec" TO "mutex/group_rpl/LOCK_session_thread_method_exec"
 BIND "cond/group_rpl/COND_session_thread_run" TO "mutex/group_rpl/LOCK_session_thread_run"
-BIND "cond/group_rpl/COND_synchronized_queue" TO "mutex/group_rpl/LOCK_synchronized_queue" FLAGS UNFAIR
+BIND "cond/group_rpl/COND_synchronized_queue" TO "mutex/group_rpl/LOCK_synchronized_queue"
 BIND "cond/group_rpl/COND_view_modification_wait" TO "mutex/group_rpl/LOCK_view_modification_wait"
 BIND "cond/group_rpl/COND_write_lock_protection" TO "mutex/group_rpl/LOCK_write_lock_protection"
-BIND "cond/group_rpl/GCS_Gcs_async_buffer::m_free_buffer_cond" TO "mutex/group_rpl/GCS_Gcs_async_buffer::m_free_buffer_mutex"
 BIND "cond/group_rpl/GCS_Gcs_async_buffer::m_wait_for_events_cond" TO "mutex/group_rpl/GCS_Gcs_async_buffer::m_free_buffer_mutex" FLAGS UNFAIR
 BIND "cond/group_rpl/GCS_Gcs_suspicions_manager::m_suspicions_cond" TO "mutex/group_rpl/GCS_Gcs_suspicions_manager::m_suspicions_mutex"
 BIND "cond/group_rpl/GCS_Gcs_xcom_engine::m_wait_for_notification_cond" TO "mutex/group_rpl/GCS_Gcs_xcom_engine::m_wait_for_notification_mutex"
+BIND "cond/group_rpl/GCS_Gcs_xcom_interface::m_wait_for_ssl_init_cond" TO "mutex/group_rpl/GCS_Gcs_xcom_interface::m_wait_for_ssl_init_mutex"
 BIND "cond/group_rpl/GCS_Gcs_xcom_proxy_impl::m_cond_xcom_comms_status" TO "mutex/group_rpl/GCS_Gcs_xcom_proxy_impl::m_lock_xcom_comms_status"
 BIND "cond/group_rpl/GCS_Gcs_xcom_proxy_impl::m_cond_xcom_exit" TO "mutex/group_rpl/GCS_Gcs_xcom_proxy_impl::m_lock_xcom_exit"
 BIND "cond/group_rpl/GCS_Gcs_xcom_proxy_impl::m_cond_xcom_ready" TO "mutex/group_rpl/GCS_Gcs_xcom_proxy_impl::m_lock_xcom_ready"
-BIND "cond/group_rpl/GCS_Gcs_xcom_view_change_control::m_wait_for_view_cond" TO "mutex/group_rpl/GCS_Gcs_xcom_view_change_control::m_wait_for_view_mutex"
 BIND "cond/innodb/commit_cond" TO "mutex/innodb/commit_cond_mutex"
 BIND "cond/innodb/resume_encryption_cond" TO "mutex/innodb/resume_encryption_cond_mutex"
 BIND "cond/myisam/keycache_thread_var::suspend" TO "mutex/mysys/KEY_CACHE::cache_lock"
@@ -3280,7 +3950,6 @@
 BIND "cond/mysys/THR_COND_threads" TO "mutex/mysys/THR_LOCK_threads"
 BIND "cond/semisync/Ack_receiver::m_cond" TO "mutex/semisync/Ack_receiver::m_mutex"
 BIND "cond/semisync/COND_binlog_send_" TO "mutex/semisync/LOCK_binlog_"
-BIND "cond/sql/Commit_order_manager::m_workers.cond" TO "mutex/sql/Commit_order_manager::m_mutex"
 BIND "cond/sql/COND_compress_gtid_table" TO "mutex/sql/LOCK_compress_gtid_table"
 BIND "cond/sql/COND_connection_count" TO "mutex/sql/LOCK_connection_count"
 BIND "cond/sql/COND_flush_thread_cache" TO "mutex/sql/LOCK_thread_cache"
@@ -3298,23 +3967,24 @@
 BIND "cond/sql/Event_scheduler::COND_state" TO "mutex/sql/Event_scheduler::LOCK_scheduler_state"
 BIND "cond/sql/Gtid_state" TO "mutex/sql/Gtid_state"
 BIND "cond/sql/Item_func_sleep::cond" TO "mutex/sql/LOCK_item_func_sleep"
-BIND "cond/sql/Source_info::rotate_cond" TO "mutex/sql/Source_info::rotate_lock"
-BIND "cond/sql/Source_info::sleep_cond" TO "mutex/sql/Source_info::sleep_lock"
-BIND "cond/sql/Source_info::start_cond" TO "mutex/sql/Source_info::run_lock" FLAGS UNFAIR
-BIND "cond/sql/Source_info::stop_cond" TO "mutex/sql/Source_info::run_lock"
 BIND "cond/sql/MDL_context::COND_wait_status" TO "mutex/sql/MDL_wait::LOCK_wait_status"
-BIND "cond/sql/MYSQL_BIN_LOG::COND_done" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_done" FLAGS UNFAIR
+BIND "cond/sql/MYSQL_BIN_LOG::COND_done" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_done"
 BIND "cond/sql/MYSQL_BIN_LOG::COND_flush_queue" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_flush_queue"
 BIND "cond/sql/MYSQL_BIN_LOG::prep_xids_cond" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_xids"
 BIND "cond/sql/MYSQL_BIN_LOG::update_cond" TO "mutex/sql/MYSQL_BIN_LOG::LOCK_binlog_end_pos"
 BIND "cond/sql/MYSQL_RELAY_LOG::update_cond" TO "mutex/sql/MYSQL_RELAY_LOG::LOCK_log_end_pos"
-BIND "cond/sql/Relay_log_info::data_cond" TO "mutex/sql/Relay_log_info::data_lock" FLAGS UNFAIR
+BIND "cond/sql/Relay_log_info::data_cond" TO "mutex/sql/Relay_log_info::data_lock"
 BIND "cond/sql/Relay_log_info::log_space_cond" TO "mutex/sql/Relay_log_info::log_space_lock"
 BIND "cond/sql/Relay_log_info::mta_gaq_cond" TO "mutex/sql/key_mta_gaq_LOCK"
 BIND "cond/sql/Relay_log_info::pending_jobs_cond" TO "mutex/sql/Relay_log_info::pending_jobs_lock"
 BIND "cond/sql/Relay_log_info::replica_worker_hash_cond" TO "mutex/sql/Relay_log_info::replica_worker_hash_lock"
 BIND "cond/sql/Relay_log_info::sleep_cond" TO "mutex/sql/Relay_log_info::sleep_lock"
-BIND "cond/sql/Relay_log_info::start_cond" TO "mutex/sql/Relay_log_info::run_lock" FLAGS UNFAIR
+BIND "cond/sql/Relay_log_info::start_cond" TO "mutex/sql/Relay_log_info::run_lock"
 BIND "cond/sql/Relay_log_info::stop_cond" TO "mutex/sql/Relay_log_info::run_lock"
+BIND "cond/sql/Source_info::rotate_cond" TO "mutex/sql/Source_info::rotate_lock"
+BIND "cond/sql/Source_info::sleep_cond" TO "mutex/sql/Source_info::sleep_lock"
+BIND "cond/sql/Source_info::start_cond" TO "mutex/sql/Source_info::run_lock" FLAGS UNFAIR
+BIND "cond/sql/Source_info::stop_cond" TO "mutex/sql/Source_info::run_lock"
 BIND "cond/sql/Source_IO_monitor::run_cond" TO "mutex/sql/Source_IO_monitor::run_lock"
+BIND "cond/sql/THD::COND_group_replication_connection_cond_var" TO "mutex/sql/LOCK_group_replication_connection_mutex"
 BIND "cond/sql/Worker_info::jobs_cond" TO "mutex/sql/Worker_info::jobs_lock"
diff -Nru mysql-8.0-8.0.26/mysql-test/mysql-test-run.dox mysql-8.0-8.0.27/mysql-test/mysql-test-run.dox
--- mysql-8.0-8.0.26/mysql-test/mysql-test-run.dox	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/mysql-test-run.dox	2021-09-28 11:46:34.000000000 +0000
@@ -3743,6 +3743,12 @@
       <th>Description</th>
     </tr>
     <tr>
+      <td><tt>EXE_MYSQL</tt></td>
+      <td>
+        Path to the mysql client executable
+      </td>
+    </tr>
+    <tr>
       <td><tt>MTR_BUILD_THREAD</tt></td>
       <td>
         If set, defines which port number range is used for the server
@@ -3810,7 +3816,15 @@
         Users have to make sure this variable is set to the same path
         on all environments, and that this common path is mounted on
         all the environments.
-     <tr>
+      </td>
+    </tr>
+    <tr>
+      <td><tt>MYSQL</tt></td>
+      <td>
+        Full path to <b>mysql</b> client executable ,along with options passed to server.
+      </td>
+    </tr>
+    <tr>
       <td><tt>MYSQL_BIN_PATH</tt></td>
       <td>
         Path to the directory having mysql binaries.
@@ -3829,6 +3843,12 @@
       </td>
     </tr>
     <tr>
+      <td><tt>MYSQL_OPTIONS</tt></td>
+      <td>
+        Options passed to server when connecting from mysql client.
+      </td>
+    </tr>
+    <tr>
       <td><tt>MYSQL_TEST</tt></td>
       <td>
         Path name to @ref PAGE_MYSQLTEST "mysqltest" binary
@@ -3908,6 +3928,10 @@
   10). If you use <b>MTR_BUILD_THREAD</b>, the port number is found
   by multiplying this by 10 and adding 10000.
 
+  The variable <b>$MYSQL_OPTIONS</b> contains only the options used while
+  connecting to server from mysql client . whereas variable <b>$MYSQL</b>
+  contains path to mysql client executable along with options .
+
   Tests sometimes rely on certain environment variables being defined.
   For example, certain tests assume that <b>MYSQL_TEST</b> is
   defined so that @ref PAGE_MYSQLTEST "mysqltest" can invoke itself
diff -Nru mysql-8.0-8.0.26/mysql-test/mysql-test-run.pl mysql-8.0-8.0.27/mysql-test/mysql-test-run.pl
--- mysql-8.0-8.0.26/mysql-test/mysql-test-run.pl	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/mysql-test-run.pl	2021-09-28 11:46:34.000000000 +0000
@@ -160,6 +160,7 @@
 
 my $auth_plugin;            # The path to the authentication test plugin
 my $baseport;
+my $ctest_parallel;         # Number of parallel jobs to run unit tests
 my $ctest_report;           # Unit test report stored here for delayed printing
 my $current_config_name;    # The currently running config file template
 my $exe_ndb_mgm;
@@ -622,6 +623,9 @@
   my $tests = collect_test_cases($opt_reorder, $opt_suites,
                                  \@opt_cases,  $opt_skip_test_list);
   mark_time_used('collect');
+  # A copy of the tests list, that will not be modified even after the tests
+  # are executed.
+  my @tests_list = @{$tests};
 
   check_secondary_engine_option($tests) if $secondary_engine_support;
 
@@ -645,7 +649,12 @@
 
   initialize_servers();
 
-  # Limit parallel workers to number of tests to avoid idle workers
+  # Run unit tests in parallel with the same number of workers as
+  # specified to MTR.
+  $ctest_parallel = $opt_parallel;
+
+  # Limit parallel workers to the number of regular tests to avoid
+  # idle workers.
   $opt_parallel = $num_tests if $opt_parallel > $num_tests;
   $ENV{MTR_PARALLEL} = $opt_parallel;
   mtr_report("Using parallel: $opt_parallel");
@@ -735,6 +744,7 @@
 
   # Create child processes
   my %children;
+
   $parent_pid = $$;
   for my $child_num (1 .. $opt_parallel) {
     my $child_pid = My::SafeProcess::Base::_safe_fork();
@@ -795,7 +805,21 @@
     # Not all tests completed, failure
     mtr_report();
     mtr_report("Only ", int(@$completed), " of $num_tests completed.");
-    mtr_error("Not all tests completed");
+    foreach (@tests_list) {
+      $_->{key} = "$_" unless defined $_->{key};
+    }
+    my %is_completed_map = map { $_->{key} => 1 } @$completed;
+    my @not_completed;
+    foreach (@tests_list) {
+      if (!exists $is_completed_map{$_->{key}}) {
+        push (@not_completed, $_->{name});
+      }
+    }
+    if (int(@not_completed) <= 100) {
+      mtr_error("Not all tests completed:", join(" ", @not_completed));
+    } else {
+      mtr_error("Not all tests completed:", join(" ", @not_completed[0...49]), "... and", int(@not_completed)-50, "more");
+    }
   }
 
   mark_time_used('init');
@@ -1294,8 +1318,8 @@
       # A sanity check. Should this happen often we need to look at it.
       if (defined $test->{reserved} && $test->{reserved} != $thread_num) {
         my $tres = $test->{reserved};
-	my $name = $test->{name};
-	mtr_warning("Test $name reserved for w$tres picked up by w$thread_num");
+        my $name = $test->{name};
+        mtr_warning("Test $name reserved for w$tres picked up by w$thread_num");
       }
       $test->{worker} = $thread_num if $opt_parallel > 1;
 
@@ -2258,6 +2282,23 @@
   check_ndbcluster_support(\%mysqld_variables);
 
   executable_setup();
+
+  check_fips_support();
+}
+
+sub check_fips_support() {
+  # Run $exe_mysqltest to see if FIPS mode is supported.
+  my $args;
+  mtr_init_args(\$args);
+  mtr_add_arg($args, "--test-ssl-fips-mode");
+  my $cmd = join(" ", $exe_mysqltest, @$args);
+  my $result= `$cmd`;
+  mtr_verbose("Testing FIPS: $result");
+  if($result =~ /Success$/) {
+    $ENV{'OPENSSL_FIPS_INSTALLED'} = 1;
+  } else {
+    $ENV{'OPENSSL_FIPS_INSTALLED'} = 0;
+  }
 }
 
 # Create global manifest file
@@ -3121,7 +3162,8 @@
 
   # mysql clients
   $ENV{'EXE_MYSQL'}           = $exe_mysql;
-  $ENV{'MYSQL'}               = client_arguments("mysql");
+  $ENV{'MYSQL'}               = my $mysql_cmd = client_arguments("mysql");
+  $ENV{'MYSQL_OPTIONS'}       = substr($mysql_cmd, index($mysql_cmd, " "));
   $ENV{'MYSQL_BINLOG'}        = client_arguments("mysqlbinlog");
   $ENV{'MYSQL_CHECK'}         = client_arguments("mysqlcheck");
   $ENV{'MYSQL_CLIENT_TEST'}   = mysql_client_test_arguments();
@@ -7441,10 +7483,10 @@
   # Special override: also ignore in Pushbuild, some platforms may
   # not have it. Now, run ctest and collect output.
   $ENV{CTEST_OUTPUT_ON_FAILURE} = 1;
-  # Run unit tests in parallel with the same number of threads as
-  # the MTR tests.
-  mtr_report("Running ctest parallel=$opt_parallel");
-  $ENV{CTEST_PARALLEL_LEVEL} = $opt_parallel;
+
+  $ENV{CTEST_PARALLEL_LEVEL} = $ctest_parallel;
+  mtr_report("Running ctest parallel=$ctest_parallel");
+
   my $ctest_opts = "";
   if ($ndbcluster_only) {
     # Run only tests with label NDB
diff -Nru mysql-8.0-8.0.26/mysql-test/r/all_persisted_variables.result mysql-8.0-8.0.27/mysql-test/r/all_persisted_variables.result
--- mysql-8.0-8.0.26/mysql-test/r/all_persisted_variables.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/all_persisted_variables.result	2021-09-28 11:46:34.000000000 +0000
@@ -39,7 +39,7 @@
 
 # Test SET PERSIST
 
-include/assert.inc [Expect 435 persisted variables in the table.]
+include/assert.inc [Expect 438 persisted variables in the table.]
 
 ************************************************************
 * 3. Restart server, it must preserve the persisted variable
@@ -47,9 +47,9 @@
 ************************************************************
 # restart
 
-include/assert.inc [Expect 435 persisted variables in persisted_variables table.]
-include/assert.inc [Expect 435 persisted variables shown as PERSISTED in variables_info table.]
-include/assert.inc [Expect 435 persisted variables with matching peristed and global values.]
+include/assert.inc [Expect 438 persisted variables in persisted_variables table.]
+include/assert.inc [Expect 438 persisted variables shown as PERSISTED in variables_info table.]
+include/assert.inc [Expect 438 persisted variables with matching peristed and global values.]
 
 ************************************************************
 * 4. Test RESET PERSIST IF EXISTS. Verify persisted variable
diff -Nru mysql-8.0-8.0.26/mysql-test/r/analyze.result mysql-8.0-8.0.27/mysql-test/r/analyze.result
--- mysql-8.0-8.0.26/mysql-test/r/analyze.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/analyze.result	2021-09-28 11:46:34.000000000 +0000
@@ -59,3 +59,16 @@
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'extended' at line 1
 drop table t1;
 End of 5.0 tests
+#
+# Bug#33079073 - sql_cmd_call::execute_inner(thd*): assertion
+#                `thd->is_error() || thd->killed' failed.
+# Assertion to check if error state is set in the diagnostics area
+# on ANALYZE TABLE to UPDATE HISTOGRAM non-success in SP is failed.
+#
+CREATE PROCEDURE p() ANALYZE TABLE v UPDATE HISTOGRAM ON w;
+# Without fix, assert condition fails for following statement in the debug
+# build. Statement executes successfully in the non-debug build.
+CALL p();
+Table	Op	Msg_type	Msg_text
+test.v	histogram	Error	Table 'test.v' doesn't exist
+DROP PROCEDURE p;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/binary.result mysql-8.0-8.0.27/mysql-test/r/binary.result
--- mysql-8.0-8.0.26/mysql-test/r/binary.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/binary.result	2021-09-28 11:46:34.000000000 +0000
@@ -84,11 +84,17 @@
 insert into t1 values(NULL);
 select b from t1 where binary b like '';
 b
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select b from t1 group by binary b like '';
 b
 NULL
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select b from t1 having binary b like '';
 b
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 drop table t1;
 create table t1 (a char(3) binary, b binary(3)) charset latin1;
 Warnings:
@@ -119,27 +125,41 @@
 select charset(a), charset(b), charset(binary 'ccc') from t1 limit 1;
 charset(a)	charset(b)	charset(binary 'ccc')
 latin1	binary	binary
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select collation(a), collation(b), collation(binary 'ccc') from t1 limit 1;
 collation(a)	collation(b)	collation(binary 'ccc')
 latin1_bin	binary	binary
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 drop table t1;
 create table t1( firstname char(20), lastname char(20));
 insert into t1 values ("john","doe"),("John","Doe");
 select * from t1 where firstname='john' and firstname like binary 'john';
 firstname	lastname
 john	doe
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select * from t1 where firstname='john' and binary 'john' = firstname;
 firstname	lastname
 john	doe
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select * from t1 where firstname='john' and firstname = binary 'john';
 firstname	lastname
 john	doe
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select * from t1 where firstname='John' and firstname like binary 'john';
 firstname	lastname
 john	doe
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select * from t1 where firstname='john' and firstname like binary 'John';
 firstname	lastname
 John	Doe
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 drop table t1;
 create table t1 (a binary) charset utf8mb4;
 show create table t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/binary_to_hex.result mysql-8.0-8.0.27/mysql-test/r/binary_to_hex.result
--- mysql-8.0-8.0.26/mysql-test/r/binary_to_hex.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/binary_to_hex.result	2021-09-28 11:46:34.000000000 +0000
@@ -115,3 +115,26 @@
 #Print the table contents in html format
 
 <TABLE BORDER=1><TR><TH>c1</TH><TH>c2</TH><TH>c3</TH><TH>c4</TH><TH>c5</TH><TH>c6</TH><TH>c7</TH><TH>c8</TH><TH>c9</TH></TR><TR><TD>0x74696E79626C6F622D74657874207265616461626C65</TD><TD>0x626C6F622D74657874207265616461626C65</TD><TD>0x6D656469756D626C6F622D74657874207265616461626C65</TD><TD>0x6C6F6E67626C6F622D74657874207265616461626C65</TD><TD>0x74657874207265616461626C65</TD><TD>0x01</TD><TD>0x63</TD><TD>0x7661726961626C65</TD><TD>0x000000000101000000000000000000F03F000000000000F03F</TD></TR></TABLE><TABLE BORDER=1><TR><TH>id</TH><TH>col1</TH><TH>col2</TH></TR><TR><TD>1</TD><TD>0xAB123400000000000000</TD><TD>0x123ABC</TD></TR><TR><TD>2</TD><TD>0xDE123400000000000000</TD><TD>0x123DEF</TD></TR></TABLE>DROP TABLE t1, t2;
+#
+# Bug #32961656: MYSQL CLIENT RETURNS NULL FOR EMPTY STRING WHEN --BINARY-AS-HEX=1
+#
+
+# "SELECT _binary''"
+
+0x
+
+# "SELECT _binary''" XML
+<?xml version="1.0"?>
+
+<resultset statement="SELECT _binary''" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <row>
+	<field name="">0x</field>
+  </row>
+</resultset>
+
+# "SELECT _binary''" HTML
+<TABLE BORDER=1><TR><TH> &nbsp; </TH></TR><TR><TD>0x</TD></TR></TABLE>
+
+# "SELECT _binary''" VERTICAL
+*************************** 1. row ***************************
+: 0x
diff -Nru mysql-8.0-8.0.26/mysql-test/r/bug29175494.result mysql-8.0-8.0.27/mysql-test/r/bug29175494.result
--- mysql-8.0-8.0.26/mysql-test/r/bug29175494.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/bug29175494.result	2021-09-28 11:46:34.000000000 +0000
@@ -42,7 +42,7 @@
                     -> Remove duplicate (alias2, alias1) rows using temporary table (weedout)  (cost=0.93 rows=0)
                         -> Nested loop inner join  (cost=0.93 rows=0)
                             -> Nested loop inner join  (cost=0.70 rows=0)
-                                -> Index lookup on a using k5 (f1=t2.col_varchar_key)  (cost=0.35 rows=1)
+                                -> Covering index lookup on a using k5 (f1=t2.col_varchar_key)  (cost=0.35 rows=1)
                                 -> Filter: (alias2.col_varchar_key = t2.col_varchar_key)  (cost=0.28 rows=0)
                                     -> Index lookup on alias2 using k1 (col_int_key=t2.col_int_key)  (cost=0.28 rows=1)
                             -> Filter: ((alias1.col_varchar >= 'Z') and <if>(outer_field_is_not_null, ((<cache>(t1.col_varchar_key) = alias1.col_varchar_key) or (alias1.col_varchar_key is null)), true) and <if>(outer_field_is_not_null, ((<cache>(t1.col_varchar_key) = alias1.col_varchar_key) or (alias1.col_varchar_key is null)), true))  (cost=0.70 rows=1)
diff -Nru mysql-8.0-8.0.26/mysql-test/r/case.result mysql-8.0-8.0.27/mysql-test/r/case.result
--- mysql-8.0-8.0.26/mysql-test/r/case.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/case.result	2021-09-28 11:46:34.000000000 +0000
@@ -12,9 +12,13 @@
 select CASE BINARY "b" when "a" then 1 when "B" then 2 WHEN "b" then "ok" END;
 CASE BINARY "b" when "a" then 1 when "B" then 2 WHEN "b" then "ok" END
 ok
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select CASE "b" when "a" then 1 when binary "B" then 2 WHEN "b" then "ok" END;
 CASE "b" when "a" then 1 when binary "B" then 2 WHEN "b" then "ok" END
 ok
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select CASE concat("a","b") when concat("ab","") then "a" when "b" then "b" end;
 CASE concat("a","b") when concat("ab","") then "a" when "b" then "b" end
 a
diff -Nru mysql-8.0-8.0.26/mysql-test/r/cast.result mysql-8.0-8.0.27/mysql-test/r/cast.result
--- mysql-8.0-8.0.26/mysql-test/r/cast.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/cast.result	2021-09-28 11:46:34.000000000 +0000
@@ -42,6 +42,8 @@
 select cast("A" as binary) = "a", cast(BINARY "a" as CHAR) = "A";
 cast("A" as binary) = "a"	cast(BINARY "a" as CHAR) = "A"
 0	1
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select cast("2001-1-1" as DATE), cast("2001-1-1" as DATETIME);
 cast("2001-1-1" as DATE)	cast("2001-1-1" as DATETIME)
 2001-01-01	2001-01-01 00:00:00
@@ -870,7 +872,7 @@
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	4	100.00	Using filesort
 Warnings:
 Note	3598	To get information about window functions use EXPLAIN FORMAT=JSON
-Note	1003	/* select#1 */ select `test`.`t1`.`date` AS `date`,(cast(`test`.`t1`.`spID` as double) = cast(first_value(`test`.`t1`.`date`) OVER (ORDER BY `test`.`t1`.`date` )  as double)) AS `spid = FIRST_VALUE(date) OVER (ORDER BY date )` from `test`.`t1`
+Note	1003	/* select#1 */ select `test`.`t1`.`date` AS `date`,(cast(`test`.`t1`.`spid` as double) = cast(first_value(`test`.`t1`.`date`) OVER (ORDER BY `test`.`t1`.`date` )  as double)) AS `spid = FIRST_VALUE(date) OVER (ORDER BY date )` from `test`.`t1`
 #
 # No casts when constants or constant functions are involved
 #
@@ -2177,3 +2179,14 @@
 col1	col2	col3
 18446744073709551615	18446744073709551616.0	-9223372036854775808
 DROP TABLE t;
+#
+# Bug#32942327: CAST: ITEM_TYPECAST_UNSIGNED:
+#               ASSERTION `!NULL_VALUE || IS_NULLABLE()' FAILED
+#
+CREATE TABLE t (x VARCHAR(10) NOT NULL);
+INSERT INTO t VALUES ('');
+SELECT CAST(x <= 0x4891f642 AS UNSIGNED) FROM t;
+ERROR HY000: Cannot convert string 'H\x91\xF6B' from binary to utf8mb4
+SELECT CAST(STRCMP(x, 0x4891f642) AS UNSIGNED) FROM t;
+ERROR HY000: Cannot convert string 'H\x91\xF6B' from binary to utf8mb4
+DROP TABLE t;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/charset.result mysql-8.0-8.0.27/mysql-test/r/charset.result
--- mysql-8.0-8.0.26/mysql-test/r/charset.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/charset.result	2021-09-28 11:46:34.000000000 +0000
@@ -64,25 +64,25 @@
 USE test;
 SET NAMES utf8mb4;
 SELECT 'x' AS '�';
-ERROR HY000: Cannot convert string '\xF0\x9F\x90\xAC' from utf8mb4 to utf8
+ERROR HY000: Cannot convert string '\xF0\x9F\x90\xAC' from utf8mb4 to utf8mb3
 SELECT '�';
 ?
 �
 CREATE TABLE �(a INT);
 Warnings:
-Warning	1300	Cannot convert string '\xF0\x9F\x90\xAC' from utf8mb4 to utf8
+Warning	1300	Cannot convert string '\xF0\x9F\x90\xAC' from utf8mb4 to utf8mb3
 CREATE TABLE t1(� INT);
 Warnings:
-Warning	1300	Cannot convert string '\xF0\x9F\x90\xAC' from utf8mb4 to utf8
+Warning	1300	Cannot convert string '\xF0\x9F\x90\xAC' from utf8mb4 to utf8mb3
 CREATE TABLE t2(a INT COMMENT "�");
 Warnings:
-Warning	1300	Cannot convert string '\xF0\x9F\x90\xAC' from utf8mb4 to utf8
+Warning	1300	Cannot convert string '\xF0\x9F\x90\xAC' from utf8mb4 to utf8mb3
 CREATE TABLE t3(a INT);
 CREATE VIEW v1 AS SELECT 'x' AS'�';
-ERROR HY000: Cannot convert string '\xF0\x9F\x90\xAC' from utf8mb4 to utf8
+ERROR HY000: Cannot convert string '\xF0\x9F\x90\xAC' from utf8mb4 to utf8mb3
 DROP TABLE �;
 Warnings:
-Warning	1300	Cannot convert string '\xF0\x9F\x90\xAC' from utf8mb4 to utf8
+Warning	1300	Cannot convert string '\xF0\x9F\x90\xAC' from utf8mb4 to utf8mb3
 DROP TABLE t1, t2, t3;
 PREPARE stmt FROM "SELECT 'x' AS '�'";
 EXECUTE stmt;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/comment_column.result mysql-8.0-8.0.27/mysql-test/r/comment_column.result
--- mysql-8.0-8.0.26/mysql-test/r/comment_column.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/comment_column.result	2021-09-28 11:46:34.000000000 +0000
@@ -16,8 +16,8 @@
 aBcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd	1024
 SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1';
 COMMENT	INDEX_COMMENT	char_length(index_comment)
-	i1 comment	10
 		0
+	i1 comment	10
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -47,8 +47,8 @@
 aBcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd	1024
 SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1';
 COMMENT	INDEX_COMMENT	char_length(index_comment)
-	i1 comment	10
 		0
+	i1 comment	10
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -80,8 +80,8 @@
 aBcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd	1024
 SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1';
 COMMENT	INDEX_COMMENT	char_length(index_comment)
-	i1 comment	10
 		0
+	i1 comment	10
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -115,8 +115,8 @@
 aBcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd	1024
 SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1';
 COMMENT	INDEX_COMMENT	char_length(index_comment)
-	i1 comment	10
 		0
+	i1 comment	10
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -151,8 +151,8 @@
 aBcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd	1024
 SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1';
 COMMENT	INDEX_COMMENT	char_length(index_comment)
-	i1 comment	10
 		0
+	i1 comment	10
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -187,8 +187,8 @@
 aBcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd	1024
 SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1';
 COMMENT	INDEX_COMMENT	char_length(index_comment)
-	i1 comment	10
 		0
+	i1 comment	10
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -365,8 +365,8 @@
 aBcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd	1024
 SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1';
 COMMENT	INDEX_COMMENT	char_length(index_comment)
-	i1 comment	10
 		0
+	i1 comment	10
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
diff -Nru mysql-8.0-8.0.26/mysql-test/r/component_backup_lock_service.result mysql-8.0-8.0.27/mysql-test/r/component_backup_lock_service.result
--- mysql-8.0-8.0.26/mysql-test/r/component_backup_lock_service.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/component_backup_lock_service.result	2021-09-28 11:46:34.000000000 +0000
@@ -12,3 +12,22 @@
 SELECT object_schema, object_name, lock_type, lock_duration, lock_status
 FROM performance_schema.metadata_locks WHERE object_type = 'BACKUP LOCK';
 object_schema	object_name	lock_type	lock_duration	lock_status
+#
+# Bug#33087212: COMPONENT COMPONENT_TEST_BACKUP_LOCK_SERVICE CAUSES
+# CRASH AT SHUTDOWN.
+#
+# Verify that it is possible to shut down the server while the
+# component is installed.
+INSTALL COMPONENT 'file://component_test_backup_lock_service';
+# shutdown the server from mtr.
+# restart the server.
+INSTALL COMPONENT 'file://component_test_backup_lock_service';
+ERROR HY000: Cannot load component from specified URN: 'file://component_test_backup_lock_service'.
+# Check for the presence of BACKUP LOCK. There should not be one
+# since the lock is not re-acquired when the component is reloaded
+# as part of boot.
+SELECT object_schema, object_name, lock_type, lock_duration, lock_status
+FROM performance_schema.metadata_locks WHERE object_type = 'BACKUP LOCK';
+object_schema	object_name	lock_type	lock_duration	lock_status
+# But the component is registered and can be unloaded.
+UNINSTALL COMPONENT 'file://component_test_backup_lock_service';
diff -Nru mysql-8.0-8.0.26/mysql-test/r/compress.result mysql-8.0-8.0.27/mysql-test/r/compress.result
--- mysql-8.0-8.0.26/mysql-test/r/compress.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/compress.result	2021-09-28 11:46:34.000000000 +0000
@@ -542,6 +542,7 @@
 insert into t3 select * from tmp;
 insert into tmp select * from t3;
 insert into t3 select * from tmp;
+set session innodb_parallel_read_threads=1;
 alter table t3 add t2nr int not null auto_increment primary key first;
 drop table tmp;
 SET BIG_TABLES=1;
@@ -2805,6 +2806,7 @@
 insert into t3 select * from tmp;
 insert into tmp select * from t3;
 insert into t3 select * from tmp;
+set session innodb_parallel_read_threads=1;
 alter table t3 add t2nr int not null auto_increment primary key first;
 drop table tmp;
 SET BIG_TABLES=1;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/const_folding.result mysql-8.0-8.0.27/mysql-test/r/const_folding.result
--- mysql-8.0-8.0.26/mysql-test/r/const_folding.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/const_folding.result	2021-09-28 11:46:34.000000000 +0000
@@ -28787,11 +28787,9 @@
 ANALYZE TABLE t;
 Table	Op	Msg_type	Msg_text
 test.t	analyze	status	OK
-0x constant too large; gets truncated to 0xFFFFFFFFFFFFFFFF
-i.e. 18446744073709551615.
+0x constant too large; gets truncated to zero
 SELECT * FROM t WHERE d <= 0x1FFFFFFFFFFFFFFFF;
 d
-18446744073709551.300000000000000000000000000000
 Warnings:
 Warning	1292	Truncated incorrect BINARY value: 'x'01ffffffffffffffff''
 EXPLAIN SELECT * FROM t WHERE d <= 0x1FFFFFFFFFFFFFFFF;
@@ -28799,7 +28797,7 @@
 1	SIMPLE	t	NULL	ALL	NULL	NULL	NULL	NULL	2	50.00	Using where
 Warnings:
 Warning	1292	Truncated incorrect BINARY value: 'x'01ffffffffffffffff''
-Note	1003	/* select#1 */ select `test`.`t`.`d` AS `d` from `test`.`t` where (`test`.`t`.`d` <= 18446744073709551615.000000000000000000000000000000)
+Note	1003	/* select#1 */ select `test`.`t`.`d` AS `d` from `test`.`t` where (`test`.`t`.`d` <= 0.000000000000000000000000000000)
 0x constant within bounds, expect to warnings
 SELECT * FROM t WHERE d > 0x7FFFFFFFFFFFFFFF;
 d
@@ -29270,11 +29268,9 @@
 ANALYZE TABLE t;
 Table	Op	Msg_type	Msg_text
 test.t	analyze	status	OK
-0x constant too large; gets truncated to 0xFFFFFFFFFFFFFFFF
-i.e. 18446744073709551615.
+0x constant too large; gets truncated to zero
 SELECT * FROM t WHERE d <= 0x1FFFFFFFFFFFFFFFF;
 d
-18446744073709551.300000000000000000000000000000
 Warnings:
 Warning	1292	Truncated incorrect BINARY value: 'x'01ffffffffffffffff''
 EXPLAIN SELECT * FROM t WHERE d <= 0x1FFFFFFFFFFFFFFFF;
@@ -29282,7 +29278,7 @@
 1	SIMPLE	t	NULL	ALL	NULL	NULL	NULL	NULL	2	50.00	Using where
 Warnings:
 Warning	1292	Truncated incorrect BINARY value: 'x'01ffffffffffffffff''
-Note	1003	/* select#1 */ select `test`.`t`.`d` AS `d` from `test`.`t` where (`test`.`t`.`d` <= 18446744073709551615.000000000000000000000000000000)
+Note	1003	/* select#1 */ select `test`.`t`.`d` AS `d` from `test`.`t` where (`test`.`t`.`d` <= 0.000000000000000000000000000000)
 0x constant within bounds, expect to warnings
 SELECT * FROM t WHERE d > 0x7FFFFFFFFFFFFFFF;
 d
diff -Nru mysql-8.0-8.0.26/mysql-test/r/create_myisam.result mysql-8.0-8.0.27/mysql-test/r/create_myisam.result
--- mysql-8.0-8.0.26/mysql-test/r/create_myisam.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/create_myisam.result	2021-09-28 11:46:34.000000000 +0000
@@ -1,5 +1,7 @@
 SET sql_mode = 'NO_ENGINE_SUBSTITUTION';
 create table t1 (i int) engine=myisam max_rows=100000000000;
+Warnings:
+Warning	4074	max_rows=100000000000 is outside the valid range [0,4294967295]. 4294967295 will be used.
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -12,6 +14,8 @@
   `i` int DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci MAX_ROWS=100
 alter table t1 max_rows=100000000000;
+Warnings:
+Warning	4074	max_rows=100000000000 is outside the valid range [0,4294967295]. 4294967295 will be used.
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
diff -Nru mysql-8.0-8.0.26/mysql-test/r/create.result mysql-8.0-8.0.27/mysql-test/r/create.result
--- mysql-8.0-8.0.26/mysql-test/r/create.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/create.result	2021-09-28 11:46:34.000000000 +0000
@@ -3036,24 +3036,42 @@
 #
 # Bug#32227101: CREATE TABLE PRODUCES CORE
 #
-# key_block_size = 2^31-1 - rejected by Innodb
+# Bug#33114368: 'SHOW TABLE STATUS' WITH HUGE AVG_ROW_LENGTH:
+# DD::PROPERTIES::GET: ASSERTION `FALSE' FAILED.
+#
+# These issues are related and arise from insufficient input checking
+# of numeric table options.
+# From bug#33114368 we see that even if no overflow occurs on CREATE,
+# there can be a risk of overflow when the option value is used
+# elsewhere.
+# The safest thing to do is to constrain values to the largest
+# value permitted by the frm-file format (unless the range of the option
+# value has been explicitly changed in 8.0).
+#
+# key_block_size, parser type: signed_num (int)
+# std::uint32_t HA_CREATE_INFO::key_block_size
+# 2 bytes in frm
+# Only settable for myisam, but also used in Innodb
+# key_block_size = 2^31-1 - rejected by explicit check 
 CREATE TABLE t1(i INT PRIMARY KEY) KEY_BLOCK_SIZE = 2147483647;
-ERROR HY000: Table storage engine for 't1' doesn't have this option
-# key_block_size = -(2^31)+1 - rejected by Innodb
+ERROR 42000: The valid range for key_block_size is [0,65535]. Error near '2147483647' at line 1
+# key_block_size = -(2^31)+1 - rejected by parser (parser switched
+# back to using ulong_num now that there is an explicit check).
 CREATE TABLE t1(i INT PRIMARY KEY) KEY_BLOCK_SIZE = -2147483647;
-ERROR HY000: Table storage engine for 't1' doesn't have this option
-# key_block_size = 2^31 - now rejected by parser
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-2147483647' at line 1
+# key_block_size = 2^31 - rejected by explicit check
 CREATE TABLE t1(i INT PRIMARY KEY) KEY_BLOCK_SIZE = 2147483648;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '2147483648' at line 1
-# key_block_size = -2^31 - now rejected by parser
+ERROR 42000: The valid range for key_block_size is [0,65535]. Error near '2147483648' at line 1
+# key_block_size = -2^31 - rejected by parser (parser switched
+# back to using ulong_num now that there is an explicit check).
 CREATE TABLE t1(i INT PRIMARY KEY) KEY_BLOCK_SIZE = -2147483648;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '2147483648' at line 1
-# key_block_size = 2^32-1 - now rejected by parser
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-2147483648' at line 1
+# key_block_size = 2^32-1 - rejected by explicit check
 CREATE TABLE t2(i INT PRIMARY KEY) KEY_BLOCK_SIZE = 4294967295;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '4294967295' at line 1
-# key_block_size = 2^32 - now rejected by parser
+ERROR 42000: The valid range for key_block_size is [0,65535]. Error near '4294967295' at line 1
+# key_block_size = 2^32 - rejected by explicit check
 CREATE TABLE t3(i INT PRIMARY KEY) KEY_BLOCK_SIZE = 4294967296;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '4294967296' at line 1
+ERROR 42000: The valid range for key_block_size is [0,65535]. Error near '4294967296' at line 1
 # key_block_size = 3927749503218772669 - now rejected by parser
 CREATE TABLE t4(
 c0 DECIMAL ZEROFILL  UNIQUE KEY STORAGE MEMORY,
@@ -3061,4 +3079,51 @@
 c2 FLOAT ZEROFILL  COMMENT 'asdf'  COLUMN_FORMAT FIXED NULL STORAGE MEMORY,
 c3 TINYINT(120) ZEROFILL   STORAGE DISK UNIQUE KEY NULL COMMENT 'asdf'
 ) CHECKSUM = 1, AUTO_INCREMENT = 1093400439, KEY_BLOCK_SIZE = 3927749503218772669, COMPRESSION = 'NONE';
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '3927749503218772669, COMPRESSION = 'NONE'' at line 6
+ERROR 42000: The valid range for key_block_size is [0,65535]. Error near '3927749503218772669, COMPRESSION = 'NONE'' at line 6
+# Only values which will fit in the two bytes allocated in the frm file
+# format are accepted.
+CREATE TABLE t1(a INT) ENGINE=myisam key_block_size=65535;
+SHOW TABLE STATUS LIKE 't1';
+Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
+t1	MyISAM	10	Fixed	0	0	0	1970324836974591	1024	0	1	@ts@	@ts@	NULL	utf8mb4_0900_ai_ci	NULL	KEY_BLOCK_SIZE=65535	
+DROP TABLE t1;
+#
+# Bug #33114368	'SHOW TABLE STATUS' WITH HUGE AVG_ROW_LENGTH:
+# DD::PROPERTIES::GET: ASSERTION `FALSE' FAILED.
+#
+# avg_row_length, parser type: ulong_num (ulong) 
+# ulong HA_CREATE_INFO::avg_row_length
+# 4 bytes in frm
+CREATE TABLE t1(a INT) avg_row_length=18446744073709551615;
+ERROR 42000: The valid range for avg_row_length is [0,4294967295]. Error near '18446744073709551615' at line 1
+CREATE TABLE t1(a INT) avg_row_length=4294967296;
+ERROR 42000: The valid range for avg_row_length is [0,4294967295]. Error near '4294967296' at line 1
+# Only values which will fit in the four bytes allocated in the frm file
+# format are accepted.
+CREATE TABLE t1(a INT) avg_row_length=4294967295;
+SHOW TABLE STATUS LIKE 't1';
+Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
+t1	InnoDB	10	Dynamic	0	0	16384	0	0	0	NULL	@ts@	@ts@	NULL	utf8mb4_0900_ai_ci	NULL	avg_row_length=4294967295	
+DROP TABLE t1;
+# max_rows, parser type: ulonglong_num (ulonglong)
+# ulonglong HA_CREATE_INFO::max_rows
+# 4 bytes in frm
+# max_rows is capped and a warning produced
+CREATE TABLE t1(a INT) max_rows=18446744073709551615;
+Warnings:
+Warning	4074	max_rows=18446744073709551615 is outside the valid range [0,4294967295]. 4294967295 will be used.
+SHOW TABLE STATUS LIKE 't1';
+Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
+t1	InnoDB	10	Dynamic	0	0	16384	0	0	0	NULL	@ts@	@ts@	NULL	utf8mb4_0900_ai_ci	NULL	max_rows=4294967295	
+DROP TABLE t1;
+# min_rows, parser type: ulonglong_num (ulonglong)
+# ulonglong HA_CREATE_INFO::min_rows
+# 4 bytes in frm
+# min_rows is capped and a warning produced
+CREATE TABLE t1(a INT) min_rows=18446744073709551615;
+Warnings:
+Warning	4074	min_rows=18446744073709551615 is outside the valid range [0,4294967295]. 4294967295 will be used.
+SHOW TABLE STATUS LIKE 't1';
+Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
+t1	InnoDB	10	Dynamic	0	0	16384	0	0	0	NULL	@ts@	@ts@	NULL	utf8mb4_0900_ai_ci	NULL	min_rows=4294967295	
+DROP TABLE t1;
Binary files /tmp/tmp_anrjq6c/DFLFYhjqjW/mysql-8.0-8.0.26/mysql-test/r/ctype_ascii.result and /tmp/tmp_anrjq6c/GL6wkknr8w/mysql-8.0-8.0.27/mysql-test/r/ctype_ascii.result differ
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ctype_big5.result mysql-8.0-8.0.27/mysql-test/r/ctype_big5.result
--- mysql-8.0-8.0.26/mysql-test/r/ctype_big5.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ctype_big5.result	2021-09-28 11:46:34.000000000 +0000
@@ -241,6 +241,9 @@
 |	7C
 }	7D
 	7F
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 drop table t1;
 SET collation_connection='big5_bin';
 create table t1 select repeat('a',4000) a;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ctype_binary.result mysql-8.0-8.0.27/mysql-test/r/ctype_binary.result
--- mysql-8.0-8.0.26/mysql-test/r/ctype_binary.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ctype_binary.result	2021-09-28 11:46:34.000000000 +0000
@@ -1180,7 +1180,7 @@
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varbinary(21) DEFAULT NULL
+  `c1` varbinary(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 drop table t1;
 select hex(concat(ST_IsSimple(ST_GeomFromText('POINT(1 1)'))));
@@ -1200,7 +1200,7 @@
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varbinary(21) DEFAULT NULL
+  `c1` varbinary(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 drop table t1;
 select hex(concat(MBREquals(ST_GeomFromText('Point(1 1)'),ST_GeomFromText('Point(1 1)'))));
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ctype_cp1251.result mysql-8.0-8.0.27/mysql-test/r/ctype_cp1251.result
--- mysql-8.0-8.0.26/mysql-test/r/ctype_cp1251.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ctype_cp1251.result	2021-09-28 11:46:34.000000000 +0000
@@ -52,9 +52,13 @@
 select charset(a), charset(b), charset(binary 'ccc') from t1 limit 1;
 charset(a)	charset(b)	charset(binary 'ccc')
 cp1251	binary	binary
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select collation(a), collation(b), collation(binary 'ccc') from t1 limit 1;
 collation(a)	collation(b)	collation(binary 'ccc')
 cp1251_bin	binary	binary
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 drop table t1;
 create table t1 (
 a varchar(16) character set cp1251 collate cp1251_bin not null,
@@ -382,6 +386,7 @@
 Warning	3719	'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous.
 Warning	1287	Setting user variables within expressions is deprecated and will be removed in a future release. Consider alternatives: 'SET variable=expression, ...', or 'SELECT expression(s) INTO variables(s)'.
 Warning	1287	Setting user variables within expressions is deprecated and will be removed in a future release. Consider alternatives: 'SET variable=expression, ...', or 'SELECT expression(s) INTO variables(s)'.
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1;
 set global LC_TIME_NAMES=convert((-8388608) using cp1251);
 ERROR HY000: Unknown locale: '-8388608'
@@ -1569,7 +1574,7 @@
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(21) CHARACTER SET cp1251 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET cp1251 DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 drop table t1;
 select hex(concat(ST_IsSimple(ST_GeomFromText('POINT(1 1)'))));
@@ -1589,7 +1594,7 @@
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(21) CHARACTER SET cp1251 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET cp1251 DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 drop table t1;
 select hex(concat(MBREquals(ST_GeomFromText('Point(1 1)'),ST_GeomFromText('Point(1 1)'))));
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ctype_cp932_binlog_stm.result mysql-8.0-8.0.27/mysql-test/r/ctype_cp932_binlog_stm.result
--- mysql-8.0-8.0.26/mysql-test/r/ctype_cp932_binlog_stm.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ctype_cp932_binlog_stm.result	2021-09-28 11:46:34.000000000 +0000
@@ -57,6 +57,8 @@
 hex(a)	hex(lower(a))	hex(upper(a))
 8352835E	8352835E	8352835E
 8372835E	8372835E	8372835E
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1;
 End of 5.1 tests
 #
@@ -19502,6 +19504,8 @@
 EFBFA3	8150
 EFBFA4	FA55
 EFBFA5	818F
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1;
 #
 # End of 5.5 tests
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ctype_eucjpms.result mysql-8.0-8.0.27/mysql-test/r/ctype_eucjpms.result
--- mysql-8.0-8.0.26/mysql-test/r/ctype_eucjpms.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ctype_eucjpms.result	2021-09-28 11:46:34.000000000 +0000
@@ -32624,6 +32624,8 @@
 EFBE9F	DF
 EFBFA3	8150
 EFBFA5	818F
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1;
 #
 # End of 5.5 tests
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ctype_euckr.result mysql-8.0-8.0.27/mysql-test/r/ctype_euckr.result
--- mysql-8.0-8.0.26/mysql-test/r/ctype_euckr.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ctype_euckr.result	2021-09-28 11:46:34.000000000 +0000
@@ -279,6 +279,7 @@
 A1FE	EFBFA2
 Warnings:
 Warning	3719	'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous.
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 drop table t1;
 SET sql_mode = default;
 End of 5.0 tests
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ctype_gb18030.result mysql-8.0-8.0.27/mysql-test/r/ctype_gb18030.result
--- mysql-8.0-8.0.26/mysql-test/r/ctype_gb18030.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ctype_gb18030.result	2021-09-28 11:46:34.000000000 +0000
@@ -244,6 +244,9 @@
 }	7D
 ~	7E
 	7F
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 drop table t1;
 SET collation_connection='gb18030_bin';
 create table t1 select repeat('a',4000) a;
@@ -1350,6 +1353,8 @@
 9030EC30	A7F0	A7C0	30D8	�
 9030E831	8130D335	8130D230	30D9	�
 9030EC31	A7F1	A7C1	30D9	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 INSERT INTO t1 VALUES ('a');
 INSERT INTO t1 VALUES (concat(_utf32 0x61, _utf32 0xFFFF));
 INSERT INTO t1 VALUES (concat(_utf32 0x61, _utf32 0x10FFFF));
@@ -1364,10 +1369,14 @@
 hex(c)	hex(weight_string(c))	c
 9030E734	30D2	�
 9030EB34	30D2	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT hex(c), hex(weight_string(c)), c FROM t1 WHERE c LIKE _utf32 0x10428 ORDER BY c, BINARY c;
 hex(c)	hex(weight_string(c))	c
 9030E734	30D2	�
 9030EB34	30D2	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 ALTER TABLE t1 ADD KEY(c);
 EXPLAIN SELECT hex(c) FROM t1 WHERE c LIKE 'a%' ORDER BY c;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -1384,10 +1393,14 @@
 hex(c)	hex(weight_string(c))	c
 9030E734	30D2	�
 9030EB34	30D2	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT hex(c), hex(weight_string(c)), c FROM t1 WHERE c LIKE _utf32 0x10428 ORDER BY c, BINARY c;
 hex(c)	hex(weight_string(c))	c
 9030E734	30D2	�
 9030EB34	30D2	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1;
 SET NAMES gb18030 COLLATE gb18030_unicode_520_ci;
 SELECT 1 gb18030_unicode_520_ci;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ctype_gb2312.result mysql-8.0-8.0.27/mysql-test/r/ctype_gb2312.result
--- mysql-8.0-8.0.26/mysql-test/r/ctype_gb2312.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ctype_gb2312.result	2021-09-28 11:46:34.000000000 +0000
@@ -242,6 +242,9 @@
 |	7C
 }	7D
 	7F
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 drop table t1;
 SET collation_connection='gb2312_bin';
 create table t1 select repeat('a',4000) a;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ctype_gbk.result mysql-8.0-8.0.27/mysql-test/r/ctype_gbk.result
--- mysql-8.0-8.0.26/mysql-test/r/ctype_gbk.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ctype_gbk.result	2021-09-28 11:46:34.000000000 +0000
@@ -242,6 +242,9 @@
 |	7C
 }	7D
 	7F
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 drop table t1;
 SET collation_connection='gbk_bin';
 create table t1 select repeat('a',4000) a;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ctype_latin1_de_myisam.result mysql-8.0-8.0.27/mysql-test/r/ctype_latin1_de_myisam.result
--- mysql-8.0-8.0.26/mysql-test/r/ctype_latin1_de_myisam.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ctype_latin1_de_myisam.result	2021-09-28 11:46:34.000000000 +0000
@@ -30,5 +30,7 @@
 SELECT * FROM t1 WHERE col1='ß' ORDER BY col1, BINARY col1;
 col1
 ß
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1;
 ALTER SCHEMA test COLLATE utf8mb4_0900_ai_ci;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ctype_latin1_de.result mysql-8.0-8.0.27/mysql-test/r/ctype_latin1_de.result
--- mysql-8.0-8.0.26/mysql-test/r/ctype_latin1_de.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ctype_latin1_de.result	2021-09-28 11:46:34.000000000 +0000
@@ -149,6 +149,8 @@
 öo	30
 select * from t1 where a like binary "%É%";
 a	b
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warnings:
 É	39
 select * from t1 where a like "%Á%";
 a	b
@@ -218,6 +220,8 @@
 select word, word=binary 0xdf as t from t1 having t > 0;
 word	t
 ß	1
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select word, word=cast(0xdf AS CHAR) as t from t1 having t > 0;
 word	t
 ss	1
@@ -225,6 +229,8 @@
 select * from t1 where word=binary 0xDF;
 word	word2
 ß	ß
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select * from t1 where word=CAST(0xDF as CHAR);
 word	word2
 ss	ss
@@ -232,6 +238,8 @@
 select * from t1 where word2=binary 0xDF;
 word	word2
 ß	ß
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select * from t1 where word2=CAST(0xDF as CHAR);
 word	word2
 ss	ss
@@ -247,6 +255,9 @@
 select * from t1 where word between binary 0xDF and binary 0xDF;
 word	word2
 ß	ß
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select * from t1 where word between CAST(0xDF AS CHAR) and CAST(0xDF AS CHAR);
 word	word2
 ss	ss
@@ -260,6 +271,8 @@
 select * from t1 where word like binary 0xDF;
 word	word2
 ß	ß
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select * from t1 where word like CAST(0xDF as CHAR);
 word	word2
 ß	ß
@@ -353,6 +366,8 @@
 æ	E6
 Œ	8C
 œ	9C
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(s1 order by binary s1) from t1 group by s1;
 group_concat(s1 order by binary s1)
 a
@@ -373,6 +388,8 @@
 Æ,æ
 Œ
 œ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT s1, hex(s1), hex(weight_string(s1)) FROM t1 ORDER BY s1, BINARY(s1);
 s1	hex(s1)	hex(weight_string(s1))
 a	61	41
@@ -398,10 +415,14 @@
 æ	E6	5C
 Œ	8C	8C
 œ	9C	9C
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT s1, hex(s1) FROM t1 WHERE s1='ae' ORDER BY s1, BINARY(s1);
 s1	hex(s1)
 ae	6165
 ä	E4
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 drop table t1;
 "END ctype_german.inc"
 create table t1 (s1 char(5) character set latin1 collate latin1_german2_ci);
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ctype_latin1_myisam.result mysql-8.0-8.0.27/mysql-test/r/ctype_latin1_myisam.result
--- mysql-8.0-8.0.26/mysql-test/r/ctype_latin1_myisam.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ctype_latin1_myisam.result	2021-09-28 11:46:34.000000000 +0000
@@ -1179,7 +1179,7 @@
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(21) DEFAULT NULL
+  `c1` varchar(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 drop table t1;
 select hex(concat(ST_IsSimple(ST_GeomFromText('POINT(1 1)'))));
@@ -1199,7 +1199,7 @@
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(21) DEFAULT NULL
+  `c1` varchar(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 drop table t1;
 select hex(concat(MBREquals(ST_GeomFromText('Point(1 1)'),ST_GeomFromText('Point(1 1)'))));
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ctype_latin2.result mysql-8.0-8.0.27/mysql-test/r/ctype_latin2.result
--- mysql-8.0-8.0.26/mysql-test/r/ctype_latin2.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ctype_latin2.result	2021-09-28 11:46:34.000000000 +0000
@@ -380,6 +380,8 @@
 ×
 ÷
 ÿ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 drop table t1;
 End of 5.1 tests
 #
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ctype_ldml.result mysql-8.0-8.0.27/mysql-test/r/ctype_ldml.result
--- mysql-8.0-8.0.26/mysql-test/r/ctype_ldml.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ctype_ldml.result	2021-09-28 11:46:34.000000000 +0000
@@ -579,6 +579,8 @@
 s1
 a
 b
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1;
 SET NAMES utf8 COLLATE utf8_phone_ci;
 Warnings:
@@ -779,6 +781,8 @@
 飵	753D
 ç³³	753E
 å’—	753F
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 #
 # WL#5624, the same test with UCS2
 #
@@ -907,6 +911,8 @@
 飵	753D
 ç³³	753E
 å’—	753F
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1;
 #
 # WL#5624, unsupported features
@@ -943,6 +949,8 @@
 x	02CE101F
 u	101F
 X	105A
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1;
 #
 # WL#5624, testing Bengali collations
@@ -969,6 +977,8 @@
 0376	09A209BC	E0A6A2E0A6BC
 0376	09DD	E0A79D
 0377	09A3	E0A6A3
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1;
 SET NAMES utf8, collation_connection=utf8_bengali_traditional_ci;
 Warnings:
@@ -1091,6 +1101,8 @@
 15D2	09B709CD	E0A6B7E0A78D
 15D3	09B809CD	E0A6B8E0A78D
 15D4	09B909CD	E0A6B9E0A78D
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT HEX(WEIGHT_STRING(a)) as wa,
 GROUP_CONCAT(HEX(CONVERT(a USING ucs2)) ORDER BY LENGTH(a), BINARY a)
 FROM t1 GROUP BY a ORDER BY a;
@@ -1160,6 +1172,8 @@
 15D2	09B709CD
 15D3	09B809CD
 15D4	09B909CD
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1;
 #
 # WL#5624, shift after, using expansion
@@ -1240,6 +1254,8 @@
 AA	0E293358
 AAA	0E293359
 1	0E2A
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1;
 #
 # End of WL#5624
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ctype_many.result mysql-8.0-8.0.27/mysql-test/r/ctype_many.result
--- mysql-8.0-8.0.26/mysql-test/r/ctype_many.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ctype_many.result	2021-09-28 11:46:34.000000000 +0000
@@ -1810,7 +1810,7 @@
 Warning	3719	'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous.
 INSERT INTO t1 VALUES ('a'), ('b');
 CREATE TABLE t2 (a BINARY(1));
-INSERT INTO t2 VALUES ('z');
+INSERT INTO t2 VALUES ('x'),('z');
 SELECT * FROM t2 WHERE a=(SELECT a FROM t1) AND a=_LATIN1'x';
 ERROR 21000: Subquery returns more than 1 row
 DROP TABLE t2;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ctype_sjis.result mysql-8.0-8.0.27/mysql-test/r/ctype_sjis.result
--- mysql-8.0-8.0.26/mysql-test/r/ctype_sjis.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ctype_sjis.result	2021-09-28 11:46:34.000000000 +0000
@@ -224,6 +224,8 @@
 hex(a)	hex(lower(a))	hex(upper(a))
 8352835E	8352835E	8352835E
 8372835E	8372835E	8372835E
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1;
 #
 # Bug#11766519 - Bug#59648: MY_STRTOLL10_MB2: ASSERTION `(*ENDPTR - S) % 2 == 0' FAILED.
@@ -14580,6 +14582,8 @@
 EFBE9F	DF
 EFBFA3	8150
 EFBFA5	818F
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1;
 #
 # End of 5.5 tests
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ctype_tis620.result mysql-8.0-8.0.27/mysql-test/r/ctype_tis620.result
--- mysql-8.0-8.0.26/mysql-test/r/ctype_tis620.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ctype_tis620.result	2021-09-28 11:46:34.000000000 +0000
@@ -340,6 +340,9 @@
 }	7D
 ~	7E
 	7F
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 drop table t1;
 SET collation_connection='tis620_bin';
 create table t1 select repeat('a',4000) a;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ctype_uca.result mysql-8.0-8.0.27/mysql-test/r/ctype_uca.result
--- mysql-8.0-8.0.26/mysql-test/r/ctype_uca.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ctype_uca.result	2021-09-28 11:46:34.000000000 +0000
@@ -5934,6 +5934,8 @@
 FEFA	25	13D5	ﻺ
 FEFB	26	13D6	ï»»
 FEFC	27	13D7	ﻼ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1;
 SET @test_character_set= 'utf8';
 SET @test_collation= 'utf8_swedish_ci';
@@ -6051,6 +6053,8 @@
 a	1
 b	0
 c	0
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 drop table t1;
 SET collation_connection='utf8_unicode_ci';
 Warnings:
@@ -6124,6 +6128,8 @@
 ud	7564
 ue	7565
 uf	7566
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(s1 order by binary s1) from t1 group by s1;
 group_concat(s1 order by binary s1)
 a,ä
@@ -6142,6 +6148,8 @@
 ud
 ue
 uf
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT s1, hex(s1), hex(weight_string(s1)) FROM t1 ORDER BY s1, BINARY(s1);
 s1	hex(s1)	hex(weight_string(s1))
 a	61	0E33
@@ -6167,9 +6175,13 @@
 ud	7564	101F0E6D
 ue	7565	101F0E8B
 uf	7566	101F0EB9
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT s1, hex(s1) FROM t1 WHERE s1='ae' ORDER BY s1, BINARY(s1);
 s1	hex(s1)
 ae	6165
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 drop table t1;
 "END ctype_german.inc"
 CREATE TABLE t1 (id int, a varchar(30) character set utf8);
@@ -7144,6 +7156,8 @@
 ue	7565
 ü	C3BC
 uf	7566
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(s1 order by binary s1) from t1 group by s1;
 group_concat(s1 order by binary s1)
 a
@@ -7161,6 +7175,8 @@
 ud
 ue,ü
 uf
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT s1, hex(s1), hex(weight_string(s1)) FROM t1 ORDER BY s1, BINARY(s1);
 s1	hex(s1)	hex(weight_string(s1))
 a	61	0E33
@@ -7186,12 +7202,16 @@
 ue	7565	101F0E8B
 ü	C3BC	101F0E8B
 uf	7566	101F0EB9
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT s1, hex(s1) FROM t1 WHERE s1='ae' ORDER BY s1, BINARY(s1);
 s1	hex(s1)
 ae	6165
 Æ	C386
 ä	C3A4
 æ	C3A6
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 drop table t1;
 "END ctype_german.inc"
 #
@@ -7454,6 +7474,8 @@
 F09090AE	F09090AE	F0909086	30D8	�
 F0909087	F09090AF	F0909087	30D9	�
 F09090AF	F09090AF	F0909087	30D9	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 INSERT INTO t1 VALUES ('a');
 INSERT INTO t1 VALUES (concat(_utf32 0x61, _utf32 0xFFFF));
 INSERT INTO t1 VALUES (concat(_utf32 0x61, _utf32 0x10FFFF));
@@ -7468,10 +7490,14 @@
 hex(c)	hex(weight_string(c))	c
 F0909080	30D2	�
 F09090A8	30D2	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT hex(c), hex(weight_string(c)), c FROM t1 WHERE c LIKE _utf32 0x10428 ORDER BY c, BINARY c;
 hex(c)	hex(weight_string(c))	c
 F0909080	30D2	�
 F09090A8	30D2	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 ALTER TABLE t1 ADD KEY(c);
 EXPLAIN SELECT hex(c) FROM t1 WHERE c LIKE 'a%' ORDER BY c;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -7488,10 +7514,14 @@
 hex(c)	hex(weight_string(c))	c
 F0909080	30D2	�
 F09090A8	30D2	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT hex(c), hex(weight_string(c)), c FROM t1 WHERE c LIKE _utf32 0x10428 ORDER BY c, BINARY c;
 hex(c)	hex(weight_string(c))	c
 F0909080	30D2	�
 F09090A8	30D2	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1;
 #
 # Bug #16204175 : COLLATION NAME MISSING FROM LOG MESSAGES
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ctype_ucs.result mysql-8.0-8.0.27/mysql-test/r/ctype_ucs.result
--- mysql-8.0-8.0.26/mysql-test/r/ctype_ucs.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ctype_ucs.result	2021-09-28 11:46:34.000000000 +0000
@@ -118,6 +118,10 @@
 select binary 'a  a' > 'a', binary 'a  \0' > 'a', binary 'a\0' > 'a';
 binary 'a  a' > 'a'	binary 'a  \0' > 'a'	binary 'a\0' > 'a'
 1	1	1
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 create table t1 (a varchar(2) character set ucs2 collate ucs2_bin, key(a));
 insert into t1 values ('A'),('A'),('B'),('C'),('D'),('A\t');
 insert into t1 values ('A\0'),('A\0'),('A\0'),('A\0'),('AZ');
@@ -695,6 +699,8 @@
 æ	00E6
 Œ	0152
 œ	0153
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(s1 order by binary s1) from t1 group by s1;
 group_concat(s1 order by binary s1)
 a,ä
@@ -714,6 +720,8 @@
 uf
 Æ,æ
 Œ,œ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT s1, hex(s1), hex(weight_string(s1)) FROM t1 ORDER BY s1, BINARY(s1);
 s1	hex(s1)	hex(weight_string(s1))
 a	0061	0041
@@ -739,9 +747,13 @@
 æ	00E6	00C6
 Œ	0152	0152
 œ	0153	0152
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT s1, hex(s1) FROM t1 WHERE s1='ae' ORDER BY s1, BINARY(s1);
 s1	hex(s1)
 ae	00610065
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 drop table t1;
 "END ctype_german.inc"
 CREATE TABLE t1 AS
@@ -2379,7 +2391,7 @@
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(21) CHARACTER SET ucs2 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET ucs2 DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 drop table t1;
 select hex(concat(ST_IsSimple(ST_GeomFromText('POINT(1 1)'))));
@@ -2399,7 +2411,7 @@
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(21) CHARACTER SET ucs2 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET ucs2 DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 drop table t1;
 select hex(concat(MBREquals(ST_GeomFromText('Point(1 1)'),ST_GeomFromText('Point(1 1)'))));
@@ -4352,6 +4364,8 @@
 ue	00750065
 ü	00FC
 uf	00750066
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(s1 order by binary s1) from t1 group by s1;
 group_concat(s1 order by binary s1)
 a
@@ -4369,6 +4383,8 @@
 ud
 ue,ü
 uf
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT s1, hex(s1), hex(weight_string(s1)) FROM t1 ORDER BY s1, BINARY(s1);
 s1	hex(s1)	hex(weight_string(s1))
 a	0061	0E33
@@ -4394,12 +4410,16 @@
 ue	00750065	101F0E8B
 ü	00FC	101F0E8B
 uf	00750066	101F0EB9
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT s1, hex(s1) FROM t1 WHERE s1='ae' ORDER BY s1, BINARY(s1);
 s1	hex(s1)
 ae	00610065
 Æ	00C6
 ä	00E4
 æ	00E6
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 drop table t1;
 "END ctype_german.inc"
 #
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ctype_ujis.result mysql-8.0-8.0.27/mysql-test/r/ctype_ujis.result
--- mysql-8.0-8.0.26/mysql-test/r/ctype_ujis.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ctype_ujis.result	2021-09-28 11:46:34.000000000 +0000
@@ -2195,6 +2195,8 @@
 F4FC
 F4FD
 F4FE
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1;
 SET collation_connection='ujis_japanese_ci';
 create table t1 select repeat('a',4000) a;
@@ -24923,6 +24925,8 @@
 EFBE9F	DF
 EFBFA3	8150
 EFBFA5	818F
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1;
 #
 # End of 5.5 tests
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ctype_unicode900_as_ci.result mysql-8.0-8.0.27/mysql-test/r/ctype_unicode900_as_ci.result
--- mysql-8.0-8.0.26/mysql-test/r/ctype_unicode900_as_ci.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ctype_unicode900_as_ci.result	2021-09-28 11:46:34.000000000 +0000
@@ -226,6 +226,9 @@
 Xx	58,78
 Yy	59,79
 Zz	5A,7A
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 drop table t1;
 SELECT HEX(WEIGHT_STRING('aA'));
 HEX(WEIGHT_STRING('aA'))
@@ -715,6 +718,8 @@
 F09FAC81	F09FAC81	F09FAC81	FBC3FB0100000020	�
 F09FB081	F09FB081	F09FB081	FBC3FC0100000020	�
 F09FB481	F09FB481	F09FB481	FBC3FD0100000020	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 INSERT INTO t1 VALUES ('a');
 INSERT INTO t1 VALUES (concat(_utf32 0x61, _utf32 0xFFFF));
 INSERT INTO t1 VALUES (concat(_utf32 0x61, _utf32 0x10FFFF));
@@ -729,10 +734,14 @@
 hex(c)	hex(weight_string(c))	c
 F0909080	445200000020	�
 F09090A8	445200000020	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT hex(c), hex(weight_string(c)), c FROM t1 WHERE c LIKE _utf32 0x10428 ORDER BY c, BINARY c;
 hex(c)	hex(weight_string(c))	c
 F0909080	445200000020	�
 F09090A8	445200000020	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 ALTER TABLE t1 ADD KEY(c);
 EXPLAIN SELECT hex(c) FROM t1 WHERE c LIKE 'a%' ORDER BY c;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -749,10 +758,14 @@
 hex(c)	hex(weight_string(c))	c
 F0909080	445200000020	�
 F09090A8	445200000020	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT hex(c), hex(weight_string(c)), c FROM t1 WHERE c LIKE _utf32 0x10428 ORDER BY c, BINARY c;
 hex(c)	hex(weight_string(c))	c
 F0909080	445200000020	�
 F09090A8	445200000020	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1;
 SELECT is_ipv4(inet_ntoa('1'));
 is_ipv4(inet_ntoa('1'))
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ctype_unicode900_as_cs.result mysql-8.0-8.0.27/mysql-test/r/ctype_unicode900_as_cs.result
--- mysql-8.0-8.0.26/mysql-test/r/ctype_unicode900_as_cs.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ctype_unicode900_as_cs.result	2021-09-28 11:46:34.000000000 +0000
@@ -255,6 +255,9 @@
 Y	59
 z	7A
 Z	5A
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 drop table t1;
 SET NAMES utf8mb4 COLLATE utf8mb4_0900_as_cs;
 SELECT HEX(CONVERT(_utf8mb4 0xF091AB9B41 USING ucs2));
@@ -825,6 +828,8 @@
 F09FAC81	F09FAC81	F09FAC81	FBC3FB010000002000000002	�
 F09FB081	F09FB081	F09FB081	FBC3FC010000002000000002	�
 F09FB481	F09FB481	F09FB481	FBC3FD010000002000000002	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 INSERT INTO t1 VALUES ('a');
 INSERT INTO t1 VALUES (concat(_utf32 0x61, _utf32 0xFFFF));
 INSERT INTO t1 VALUES (concat(_utf32 0x61, _utf32 0x10FFFF));
@@ -838,9 +843,13 @@
 SELECT hex(c), hex(weight_string(c)), c FROM t1 WHERE c LIKE _utf32 0x10400 ORDER BY c, BINARY c;
 hex(c)	hex(weight_string(c))	c
 F0909080	44520000002000000008	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT hex(c), hex(weight_string(c)), c FROM t1 WHERE c LIKE _utf32 0x10428 ORDER BY c, BINARY c;
 hex(c)	hex(weight_string(c))	c
 F09090A8	44520000002000000002	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 ALTER TABLE t1 ADD KEY(c);
 EXPLAIN SELECT hex(c) FROM t1 WHERE c LIKE 'a%' ORDER BY c;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -856,9 +865,13 @@
 SELECT hex(c), hex(weight_string(c)), c FROM t1 WHERE c LIKE _utf32 0x10400 ORDER BY c, BINARY c;
 hex(c)	hex(weight_string(c))	c
 F0909080	44520000002000000008	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT hex(c), hex(weight_string(c)), c FROM t1 WHERE c LIKE _utf32 0x10428 ORDER BY c, BINARY c;
 hex(c)	hex(weight_string(c))	c
 F09090A8	44520000002000000002	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1;
 SELECT 'a' = 'a ';
 'a' = 'a '
@@ -1728,6 +1741,8 @@
 00E50073	1F9854A71E71000000200020000003020302
 006100610053	1F9854A71E710000002000200000030203220108
 006100610073	1F9854A71E710000002000200000030203220302
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1;
 CREATE TABLE t1 (a VARCHAR(10), b VARCHAR(10)) COLLATE utf8mb4_da_0900_as_cs;
 INSERT INTO t1 VALUES (_utf16 0x00DE, _utf16 0x0074), (_utf16 0x0162, _utf16 0x00DE), (_utf16 0x0162, _utf16 0x00FE),
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ctype_unicode900.result mysql-8.0-8.0.27/mysql-test/r/ctype_unicode900.result
--- mysql-8.0-8.0.26/mysql-test/r/ctype_unicode900.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ctype_unicode900.result	2021-09-28 11:46:34.000000000 +0000
@@ -232,6 +232,9 @@
 Xx	58,78
 Yy	59,79
 Zz	5A,7A
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 drop table t1;
 SET NAMES utf8mb4 COLLATE utf8mb4_0900_ai_ci;
 SELECT HEX(CONVERT(_utf8mb4 0xF091AB9B41 USING ucs2));
@@ -802,6 +805,8 @@
 F09FAC81	F09FAC81	F09FAC81	FBC3FB01	�
 F09FB081	F09FB081	F09FB081	FBC3FC01	�
 F09FB481	F09FB481	F09FB481	FBC3FD01	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 INSERT INTO t1 VALUES ('a');
 INSERT INTO t1 VALUES (concat(_utf32 0x61, _utf32 0xFFFF));
 INSERT INTO t1 VALUES (concat(_utf32 0x61, _utf32 0x10FFFF));
@@ -816,10 +821,14 @@
 hex(c)	hex(weight_string(c))	c
 F0909080	4452	�
 F09090A8	4452	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT hex(c), hex(weight_string(c)), c FROM t1 WHERE c LIKE _utf32 0x10428 ORDER BY c, BINARY c;
 hex(c)	hex(weight_string(c))	c
 F0909080	4452	�
 F09090A8	4452	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 ALTER TABLE t1 ADD KEY(c);
 EXPLAIN SELECT hex(c) FROM t1 WHERE c LIKE 'a%' ORDER BY c;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -836,10 +845,14 @@
 hex(c)	hex(weight_string(c))	c
 F0909080	4452	�
 F09090A8	4452	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT hex(c), hex(weight_string(c)), c FROM t1 WHERE c LIKE _utf32 0x10428 ORDER BY c, BINARY c;
 hex(c)	hex(weight_string(c))	c
 F0909080	4452	�
 F09090A8	4452	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1;
 SELECT 'a' = 'a ';
 'a' = 'a '
@@ -3728,6 +3741,8 @@
 C396	1F9854A6
 C398	1F9854A6
 C385	1F9854A7
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1;
 CREATE TABLE t1 (a VARCHAR(10), b VARCHAR(10)) COLLATE utf8mb4_da_0900_ai_ci;
 INSERT INTO t1 VALUES(_utf16 0x015A, _utf16 0x00DF), (_utf16 0x0162, _utf16 0x00DE), (_utf16 0x01CF, _utf16 0x0132), (_utf16 0x01F8, _utf16 0x01CA), (_utf16 0x42, _utf16 0x1d2d);
@@ -3755,6 +3770,8 @@
 C6A0	1DDD
 C395	1EFE54A5
 E1BBA0	1EFE54A5
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1;
 CREATE TABLE t1(a VARCHAR(10), b VARCHAR(10)) COLLATE utf8mb4_et_0900_ai_ci;
 INSERT INTO t1 VALUES(_utf16 0x4F, _utf16 0x1EE0), (_utf16 0x1EE0, _utf16 0x1EE7), (_utf16 0x55, _utf16 0x1E7A), (_utf16 0x1E7A, _utf16 0x1E7C), (_utf16 0x1E7A, _utf16 0x1E80), (_utf16 0x4F, _utf16 0x1ED6), (_utf16 0x1ED6, _utf16 0x1EE4);
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ctype_utf16le.result mysql-8.0-8.0.27/mysql-test/r/ctype_utf16le.result
--- mysql-8.0-8.0.26/mysql-test/r/ctype_utf16le.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ctype_utf16le.result	2021-09-28 11:46:34.000000000 +0000
@@ -28,6 +28,10 @@
 select binary 'a  a' > 'a', binary 'a  \0' > 'a', binary 'a\0' > 'a';
 binary 'a  a' > 'a'	binary 'a  \0' > 'a'	binary 'a\0' > 'a'
 1	1	1
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 #
 # Check that incomplete utf16le characters in HEX notation
 # are left-padded with zeros
@@ -273,6 +277,8 @@
 фывапролДж
 фывапролдЖ
 фывапролдж
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT * FROM t1 WHERE a LIKE '%фЫв%' ORDER BY BINARY a;
 a
 ФЫВ�
@@ -293,6 +299,8 @@
 фывапролДж
 фывапролдЖ
 фывапролдж
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT * FROM t1 WHERE a LIKE 'фЫва%' ORDER BY BINARY a;
 a
 ФЫВ�
@@ -313,10 +321,14 @@
 фывапролДж
 фывапролдЖ
 фывапролдж
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT * FROM t1 WHERE a LIKE 'фЫва%' COLLATE utf16le_bin ORDER BY BINARY a;
 a
 фЫва
 фЫвапролдж
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1;
 CREATE TABLE t1 (word VARCHAR(64) NOT NULL, PRIMARY KEY (word))
 CHARACTER SET utf16le;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ctype_utf16.result mysql-8.0-8.0.27/mysql-test/r/ctype_utf16.result
--- mysql-8.0-8.0.26/mysql-test/r/ctype_utf16.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ctype_utf16.result	2021-09-28 11:46:34.000000000 +0000
@@ -27,6 +27,10 @@
 select binary 'a  a' > 'a', binary 'a  \0' > 'a', binary 'a\0' > 'a';
 binary 'a  a' > 'a'	binary 'a  \0' > 'a'	binary 'a\0' > 'a'
 1	1	1
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select hex(_utf16 0x44);
 hex(_utf16 0x44)
 0044
@@ -270,6 +274,8 @@
 фывапролДж
 фывапролдЖ
 фывапролдж
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT * FROM t1 WHERE a LIKE '%фЫв%' ORDER BY BINARY a;
 a
 ФЫВ�
@@ -290,6 +296,8 @@
 фывапролДж
 фывапролдЖ
 фывапролдж
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT * FROM t1 WHERE a LIKE 'фЫва%' ORDER BY BINARY a;
 a
 ФЫВ�
@@ -310,10 +318,14 @@
 фывапролДж
 фывапролдЖ
 фывапролдж
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT * FROM t1 WHERE a LIKE 'фЫва%' COLLATE utf16_bin ORDER BY BINARY a;
 a
 фЫва
 фЫвапролдж
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1;
 CREATE TABLE t1 (word varchar(64) NOT NULL, PRIMARY KEY (word))
 CHARACTER SET utf16;
@@ -724,10 +736,14 @@
 a
 A
 a
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select hex(min(binary a)),count(*) from t1 group by a;
 hex(min(binary a))	count(*)
 0041	2
 0042	2
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 drop table t1;
 select char_length('abcd'), octet_length('abcd');
 char_length('abcd')	octet_length('abcd')
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ctype_utf16_uca.result mysql-8.0-8.0.27/mysql-test/r/ctype_utf16_uca.result
--- mysql-8.0-8.0.26/mysql-test/r/ctype_utf16_uca.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ctype_utf16_uca.result	2021-09-28 11:46:34.000000000 +0000
@@ -30,6 +30,10 @@
 select binary 'a  a' > 'a', binary 'a  \0' > 'a', binary 'a\0' > 'a';
 binary 'a  a' > 'a'	binary 'a  \0' > 'a'	binary 'a\0' > 'a'
 1	1	1
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select 'c' like '\_' as want0;
 want0
 0
@@ -294,6 +298,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf16_icelandic_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -408,6 +414,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf16_latvian_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -523,6 +531,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf16_romanian_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -633,6 +643,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf16_slovenian_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -742,6 +754,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf16_polish_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -855,6 +869,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf16_estonian_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -969,6 +985,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf16_spanish_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -1075,6 +1093,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf16_swedish_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -1183,6 +1203,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf16_turkish_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -1294,6 +1316,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf16_czech_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -1405,6 +1429,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf16_danish_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -1513,6 +1539,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf16_lithuanian_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -1622,6 +1650,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf16_slovak_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -1734,6 +1764,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf16_spanish2_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -1842,6 +1874,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf16_roman_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -1950,6 +1984,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf16_esperanto_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -2061,6 +2097,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf16_hungarian_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -2168,6 +2206,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf16_croatian_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -2278,6 +2318,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf16_german2_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -2384,6 +2426,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf16_unicode_520_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -2482,6 +2526,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf16_vietnamese_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -2593,6 +2639,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 drop table t1;
 SET NAMES utf8;
 Warnings:
@@ -3241,6 +3289,8 @@
 ue	00750065
 ü	00FC
 uf	00750066
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(s1 order by binary s1) from t1 group by s1;
 group_concat(s1 order by binary s1)
 a
@@ -3258,6 +3308,8 @@
 ud
 ue,ü
 uf
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT s1, hex(s1), hex(weight_string(s1)) FROM t1 ORDER BY s1, BINARY(s1);
 s1	hex(s1)	hex(weight_string(s1))
 a	0061	0E33
@@ -3283,12 +3335,16 @@
 ue	00750065	101F0E8B
 ü	00FC	101F0E8B
 uf	00750066	101F0EB9
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT s1, hex(s1) FROM t1 WHERE s1='ae' ORDER BY s1, BINARY(s1);
 s1	hex(s1)
 ae	00610065
 Æ	00C6
 ä	00E4
 æ	00E6
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 drop table t1;
 "END ctype_german.inc"
 #
@@ -3552,6 +3608,8 @@
 D801DC2E	D801DC2E	D801DC06	30D8	�
 D801DC07	D801DC2F	D801DC07	30D9	�
 D801DC2F	D801DC2F	D801DC07	30D9	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 INSERT INTO t1 VALUES ('a');
 INSERT INTO t1 VALUES (concat(_utf32 0x61, _utf32 0xFFFF));
 INSERT INTO t1 VALUES (concat(_utf32 0x61, _utf32 0x10FFFF));
@@ -3566,10 +3624,14 @@
 hex(c)	hex(weight_string(c))	c
 D801DC00	30D2	�
 D801DC28	30D2	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT hex(c), hex(weight_string(c)), c FROM t1 WHERE c LIKE _utf32 0x10428 ORDER BY c, BINARY c;
 hex(c)	hex(weight_string(c))	c
 D801DC00	30D2	�
 D801DC28	30D2	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 ALTER TABLE t1 ADD KEY(c);
 EXPLAIN SELECT hex(c) FROM t1 WHERE c LIKE 'a%' ORDER BY c;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -3586,10 +3648,14 @@
 hex(c)	hex(weight_string(c))	c
 D801DC00	30D2	�
 D801DC28	30D2	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT hex(c), hex(weight_string(c)), c FROM t1 WHERE c LIKE _utf32 0x10428 ORDER BY c, BINARY c;
 hex(c)	hex(weight_string(c))	c
 D801DC00	30D2	�
 D801DC28	30D2	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1;
 #
 # End of 5.6 tests
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ctype_utf32.result mysql-8.0-8.0.27/mysql-test/r/ctype_utf32.result
--- mysql-8.0-8.0.26/mysql-test/r/ctype_utf32.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ctype_utf32.result	2021-09-28 11:46:34.000000000 +0000
@@ -27,6 +27,10 @@
 select binary 'a  a' > 'a', binary 'a  \0' > 'a', binary 'a\0' > 'a';
 binary 'a  a' > 'a'	binary 'a  \0' > 'a'	binary 'a\0' > 'a'
 1	1	1
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select hex(_utf32 0x44);
 hex(_utf32 0x44)
 00000044
@@ -269,6 +273,8 @@
 фывапролДж
 фывапролдЖ
 фывапролдж
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT * FROM t1 WHERE a LIKE '%фЫв%' ORDER BY BINARY a;
 a
 ФЫВ�
@@ -289,6 +295,8 @@
 фывапролДж
 фывапролдЖ
 фывапролдж
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT * FROM t1 WHERE a LIKE 'фЫва%' ORDER BY BINARY a;
 a
 ФЫВ�
@@ -309,10 +317,14 @@
 фывапролДж
 фывапролдЖ
 фывапролдж
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT * FROM t1 WHERE a LIKE 'фЫва%' COLLATE utf32_bin ORDER BY BINARY a;
 a
 фЫва
 фЫвапролдж
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1;
 CREATE TABLE t1 (word varchar(64) NOT NULL, PRIMARY KEY (word))
 CHARACTER SET utf32;
@@ -704,10 +716,14 @@
 a
 A
 a
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select hex(min(binary a)),count(*) from t1 group by a;
 hex(min(binary a))	count(*)
 00000041	2
 00000042	2
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 drop table t1;
 select char_length('abcd'), octet_length('abcd');
 char_length('abcd')	octet_length('abcd')
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ctype_utf32_uca.result mysql-8.0-8.0.27/mysql-test/r/ctype_utf32_uca.result
--- mysql-8.0-8.0.26/mysql-test/r/ctype_utf32_uca.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ctype_utf32_uca.result	2021-09-28 11:46:34.000000000 +0000
@@ -30,6 +30,10 @@
 select binary 'a  a' > 'a', binary 'a  \0' > 'a', binary 'a\0' > 'a';
 binary 'a  a' > 'a'	binary 'a  \0' > 'a'	binary 'a\0' > 'a'
 1	1	1
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select 'c' like '\_' as want0;
 want0
 0
@@ -294,6 +298,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf32_icelandic_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -408,6 +414,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf32_latvian_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -523,6 +531,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf32_romanian_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -633,6 +643,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf32_slovenian_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -742,6 +754,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf32_polish_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -855,6 +869,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf32_estonian_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -969,6 +985,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf32_spanish_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -1075,6 +1093,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf32_swedish_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -1183,6 +1203,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf32_turkish_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -1294,6 +1316,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf32_czech_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -1405,6 +1429,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf32_danish_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -1513,6 +1539,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf32_lithuanian_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -1622,6 +1650,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf32_slovak_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -1734,6 +1764,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf32_spanish2_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -1842,6 +1874,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf32_roman_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -1950,6 +1984,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf32_esperanto_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -2061,6 +2097,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf32_hungarian_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -2168,6 +2206,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf32_croatian_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -2278,6 +2318,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf32_german2_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -2384,6 +2426,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf32_unicode_520_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -2482,6 +2526,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(c1 order by binary c1 separator '') from t1 group by c1 collate utf32_vietnamese_ci;
 group_concat(c1 order by binary c1 separator '')
 ÷
@@ -2593,6 +2639,8 @@
 �
 Ç‚
 ǃ
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 drop table t1;
 SET NAMES utf8;
 Warnings:
@@ -3265,6 +3313,8 @@
 ue	0000007500000065
 ü	000000FC
 uf	0000007500000066
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(s1 order by binary s1) from t1 group by s1;
 group_concat(s1 order by binary s1)
 a
@@ -3282,6 +3332,8 @@
 ud
 ue,ü
 uf
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT s1, hex(s1), hex(weight_string(s1)) FROM t1 ORDER BY s1, BINARY(s1);
 s1	hex(s1)	hex(weight_string(s1))
 a	00000061	0E33
@@ -3307,12 +3359,16 @@
 ue	0000007500000065	101F0E8B
 ü	000000FC	101F0E8B
 uf	0000007500000066	101F0EB9
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT s1, hex(s1) FROM t1 WHERE s1='ae' ORDER BY s1, BINARY(s1);
 s1	hex(s1)
 ae	0000006100000065
 Æ	000000C6
 ä	000000E4
 æ	000000E6
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 drop table t1;
 "END ctype_german.inc"
 #
@@ -3576,6 +3632,8 @@
 0001042E	0001042E	00010406	30D8	�
 00010407	0001042F	00010407	30D9	�
 0001042F	0001042F	00010407	30D9	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 INSERT INTO t1 VALUES ('a');
 INSERT INTO t1 VALUES (concat(_utf32 0x61, _utf32 0xFFFF));
 INSERT INTO t1 VALUES (concat(_utf32 0x61, _utf32 0x10FFFF));
@@ -3590,10 +3648,14 @@
 hex(c)	hex(weight_string(c))	c
 00010400	30D2	�
 00010428	30D2	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT hex(c), hex(weight_string(c)), c FROM t1 WHERE c LIKE _utf32 0x10428 ORDER BY c, BINARY c;
 hex(c)	hex(weight_string(c))	c
 00010400	30D2	�
 00010428	30D2	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 ALTER TABLE t1 ADD KEY(c);
 EXPLAIN SELECT hex(c) FROM t1 WHERE c LIKE 'a%' ORDER BY c;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -3610,10 +3672,14 @@
 hex(c)	hex(weight_string(c))	c
 00010400	30D2	�
 00010428	30D2	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT hex(c), hex(weight_string(c)), c FROM t1 WHERE c LIKE _utf32 0x10428 ORDER BY c, BINARY c;
 hex(c)	hex(weight_string(c))	c
 00010400	30D2	�
 00010428	30D2	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1;
 #
 # End of 5.6 tests
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ctype_utf8mb4_heap.result mysql-8.0-8.0.27/mysql-test/r/ctype_utf8mb4_heap.result
--- mysql-8.0-8.0.26/mysql-test/r/ctype_utf8mb4_heap.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ctype_utf8mb4_heap.result	2021-09-28 11:46:34.000000000 +0000
@@ -929,6 +929,8 @@
 æ	C3A6
 Å’	C592
 Å“	C593
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(s1 order by binary s1) from t1 group by s1;
 group_concat(s1 order by binary s1)
 a,ä
@@ -948,6 +950,8 @@
 uf
 Æ,æ
 Å’,Å“
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT s1, hex(s1), hex(weight_string(s1)) FROM t1 ORDER BY s1, BINARY(s1);
 s1	hex(s1)	hex(weight_string(s1))
 a	61	0041
@@ -973,9 +977,13 @@
 æ	C3A6	00C6
 Å’	C592	0152
 Å“	C593	0152
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT s1, hex(s1) FROM t1 WHERE s1='ae' ORDER BY s1, BINARY(s1);
 s1	hex(s1)
 ae	6165
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 drop table t1;
 "END ctype_german.inc"
 SET collation_connection='utf8mb4_bin';
@@ -2098,6 +2106,8 @@
 120735	F09D9E9F
 65131	EFB9ABF09D849EF09D859EF09D859EF09D8480F09D859FEFB9ABEFB9ABF09D85A0EFB9AB
 917999	F3A087AF
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warnings:
 INSERT IGNORE INTO t1 VALUES (1114111, x'f5808080');
 Warnings:
 Warning	1366	Incorrect string value: '\xF5\x80\x80\x80' for column 'utf8mb4_encoding' at row 1
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ctype_utf8mb4_innodb.result mysql-8.0-8.0.27/mysql-test/r/ctype_utf8mb4_innodb.result
--- mysql-8.0-8.0.26/mysql-test/r/ctype_utf8mb4_innodb.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ctype_utf8mb4_innodb.result	2021-09-28 11:46:34.000000000 +0000
@@ -996,6 +996,8 @@
 æ	C3A6
 Å’	C592
 Å“	C593
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(s1 order by binary s1) from t1 group by s1;
 group_concat(s1 order by binary s1)
 a,ä
@@ -1015,6 +1017,8 @@
 uf
 Æ,æ
 Å’,Å“
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT s1, hex(s1), hex(weight_string(s1)) FROM t1 ORDER BY s1, BINARY(s1);
 s1	hex(s1)	hex(weight_string(s1))
 a	61	0041
@@ -1040,9 +1044,13 @@
 æ	C3A6	00C6
 Å’	C592	0152
 Å“	C593	0152
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT s1, hex(s1) FROM t1 WHERE s1='ae' ORDER BY s1, BINARY(s1);
 s1	hex(s1)
 ae	6165
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 drop table t1;
 "END ctype_german.inc"
 SET collation_connection='utf8mb4_bin';
@@ -2250,6 +2258,8 @@
 120735	F09D9E9F
 65131	EFB9ABF09D849EF09D859EF09D859EF09D8480F09D859FEFB9ABEFB9ABF09D85A0EFB9AB
 917999	F3A087AF
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warnings:
 INSERT IGNORE INTO t1 VALUES (1114111, x'f5808080');
 Warnings:
 Warning	1366	Incorrect string value: '\xF5\x80\x80\x80' for column 'utf8mb4_encoding' at row 1
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ctype_utf8mb4_myisam.result mysql-8.0-8.0.27/mysql-test/r/ctype_utf8mb4_myisam.result
--- mysql-8.0-8.0.26/mysql-test/r/ctype_utf8mb4_myisam.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ctype_utf8mb4_myisam.result	2021-09-28 11:46:34.000000000 +0000
@@ -996,6 +996,8 @@
 æ	C3A6
 Å’	C592
 Å“	C593
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(s1 order by binary s1) from t1 group by s1;
 group_concat(s1 order by binary s1)
 a,ä
@@ -1015,6 +1017,8 @@
 uf
 Æ,æ
 Å’,Å“
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT s1, hex(s1), hex(weight_string(s1)) FROM t1 ORDER BY s1, BINARY(s1);
 s1	hex(s1)	hex(weight_string(s1))
 a	61	0041
@@ -1040,9 +1044,13 @@
 æ	C3A6	00C6
 Å’	C592	0152
 Å“	C593	0152
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT s1, hex(s1) FROM t1 WHERE s1='ae' ORDER BY s1, BINARY(s1);
 s1	hex(s1)
 ae	6165
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 drop table t1;
 "END ctype_german.inc"
 SET collation_connection='utf8mb4_bin';
@@ -2254,6 +2262,8 @@
 120735	F09D9E9F
 65131	EFB9ABF09D849EF09D859EF09D859EF09D8480F09D859FEFB9ABEFB9ABF09D85A0EFB9AB
 917999	F3A087AF
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warnings:
 INSERT IGNORE INTO t1 VALUES (1114111, x'f5808080');
 Warnings:
 Warning	1366	Incorrect string value: '\xF5\x80\x80\x80' for column 'utf8mb4_encoding' at row 1
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ctype_utf8mb4.result mysql-8.0-8.0.27/mysql-test/r/ctype_utf8mb4.result
--- mysql-8.0-8.0.26/mysql-test/r/ctype_utf8mb4.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ctype_utf8mb4.result	2021-09-28 11:46:34.000000000 +0000
@@ -802,6 +802,8 @@
 æ	C3A6
 Å’	C592
 Å“	C593
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(s1 order by binary s1) from t1 group by s1;
 group_concat(s1 order by binary s1)
 a,ä
@@ -821,6 +823,8 @@
 uf
 Æ,æ
 Å’,Å“
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT s1, hex(s1), hex(weight_string(s1)) FROM t1 ORDER BY s1, BINARY(s1);
 s1	hex(s1)	hex(weight_string(s1))
 a	61	0041
@@ -846,9 +850,13 @@
 æ	C3A6	00C6
 Å’	C592	0152
 Å“	C593	0152
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT s1, hex(s1) FROM t1 WHERE s1='ae' ORDER BY s1, BINARY(s1);
 s1	hex(s1)
 ae	6165
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 drop table t1;
 "END ctype_german.inc"
 SET collation_connection='utf8mb4_bin';
@@ -2053,6 +2061,8 @@
 1114111	F48FBFBF
 119070	F09D849EF09D859EF09D859EF09D8480F09D859FF09D859FF09D859FF09D85A0F09D85A0F09D8480
 119070	F09D849EF09D859EF09D859EF09D8480F09D859FF09D859FF09D859FF09D85A0F09D85A0F09D8480
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 INSERT IGNORE INTO t1 VALUES (1114111, x'f5808080');
 Warnings:
 Warning	1366	Incorrect string value: '\xF5\x80\x80\x80' for column 'utf8mb4_encoding' at row 1
@@ -2747,6 +2757,9 @@
 }	7D
 ~	7E
 	7F
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 drop table t1;
 select @@collation_connection;
 @@collation_connection
@@ -3227,6 +3240,8 @@
 F0ABA0B7	F0ABA0B7	F0ABA0B7	F0ABA0B7	ð« ·
 F0ABA0B8	F0ABA0B8	F0ABA0B8	F0ABA0B8	ð« ¸
 F0ABA0B9	F0ABA0B9	F0ABA0B9	F0ABA0B9	ð« ¹
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 INSERT INTO t1 VALUES ('a');
 INSERT INTO t1 VALUES (concat(_utf32 0x61, _utf32 0xFFFF));
 INSERT INTO t1 VALUES (concat(_utf32 0x61, _utf32 0x10FFFF));
@@ -3240,9 +3255,13 @@
 SELECT hex(c), hex(weight_string(c)), c FROM t1 WHERE c LIKE _utf32 0x10400 ORDER BY c, BINARY c;
 hex(c)	hex(weight_string(c))	c
 F0909080	F0909080	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT hex(c), hex(weight_string(c)), c FROM t1 WHERE c LIKE _utf32 0x10428 ORDER BY c, BINARY c;
 hex(c)	hex(weight_string(c))	c
 F09090A8	F09090A8	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 ALTER TABLE t1 ADD KEY(c);
 EXPLAIN SELECT hex(c) FROM t1 WHERE c LIKE 'a%' ORDER BY c;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -3258,9 +3277,13 @@
 SELECT hex(c), hex(weight_string(c)), c FROM t1 WHERE c LIKE _utf32 0x10400 ORDER BY c, BINARY c;
 hex(c)	hex(weight_string(c))	c
 F0909080	F0909080	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT hex(c), hex(weight_string(c)), c FROM t1 WHERE c LIKE _utf32 0x10428 ORDER BY c, BINARY c;
 hex(c)	hex(weight_string(c))	c
 F09090A8	F09090A8	�
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1;
 CREATE TABLE t1(a CHAR(10)) COLLATE utf8mb4_0900_bin;
 INSERT INTO t1 VALUES('aaa'), ('aaaa'), ('aaaaa');
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ctype_utf8.result mysql-8.0-8.0.27/mysql-test/r/ctype_utf8.result
--- mysql-8.0-8.0.26/mysql-test/r/ctype_utf8.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ctype_utf8.result	2021-09-28 11:46:34.000000000 +0000
@@ -1131,6 +1131,8 @@
 æ	C3A6
 Å’	C592
 Å“	C593
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select group_concat(s1 order by binary s1) from t1 group by s1;
 group_concat(s1 order by binary s1)
 a,ä
@@ -1150,6 +1152,8 @@
 uf
 Æ,æ
 Å’,Å“
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT s1, hex(s1), hex(weight_string(s1)) FROM t1 ORDER BY s1, BINARY(s1);
 s1	hex(s1)	hex(weight_string(s1))
 a	61	0041
@@ -1175,9 +1179,13 @@
 æ	C3A6	00C6
 Å’	C592	0152
 Å“	C593	0152
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT s1, hex(s1) FROM t1 WHERE s1='ae' ORDER BY s1, BINARY(s1);
 s1	hex(s1)
 ae	6165
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 drop table t1;
 "END ctype_german.inc"
 SET collation_connection='utf8_bin';
@@ -2328,6 +2336,8 @@
 8	一二三21
 9	一二三81
 7	一二三91
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1;
 CREATE TABLE t1 (a INT NOT NULL, b INT NOT NULL);
 INSERT INTO t1 VALUES (70000, 1092), (70001, 1085), (70002, 1065);
@@ -3998,7 +4008,7 @@
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(21) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 drop table t1;
 select hex(concat(ST_IsSimple(ST_GeomFromText('POINT(1 1)'))));
@@ -4018,7 +4028,7 @@
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(21) CHARACTER SET utf8 DEFAULT NULL
+  `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 drop table t1;
 select hex(concat(MBREquals(ST_GeomFromText('Point(1 1)'),ST_GeomFromText('Point(1 1)'))));
diff -Nru mysql-8.0-8.0.26/mysql-test/r/dd_view_columns.result mysql-8.0-8.0.27/mysql-test/r/dd_view_columns.result
--- mysql-8.0-8.0.26/mysql-test/r/dd_view_columns.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/dd_view_columns.result	2021-09-28 11:46:34.000000000 +0000
@@ -4,7 +4,7 @@
 CREATE TABLE t3 (f3 INT);
 PREPARE check_view_columns FROM
 'SELECT table_name, column_name, column_type FROM information_schema.columns
-   WHERE table_name= ?';
+   WHERE table_name= ? ORDER BY table_name, column_name';
 PREPARE check_view_status FROM
 'SELECT table_name, table_comment FROM information_schema.tables WHERE
    table_name= ?';
diff -Nru mysql-8.0-8.0.26/mysql-test/r/derived_condition_pushdown.result mysql-8.0-8.0.27/mysql-test/r/derived_condition_pushdown.result
--- mysql-8.0-8.0.26/mysql-test/r/derived_condition_pushdown.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/derived_condition_pushdown.result	2021-09-28 11:46:34.000000000 +0000
@@ -20,7 +20,7 @@
 -> Table scan on dt  (cost=*** rows=***)
     -> Materialize  (cost=*** rows=***)
         -> Filter: (t1.f1 > 2)  (cost=*** rows=***)
-            -> Index range scan on t1 using f1_2  (cost=*** rows=***)
+            -> Covering index range scan on t1 using f1_2  (cost=*** rows=***)
 
 SELECT * FROM (SELECT f1, f2 FROM t1) as dt WHERE f1 > 2;
 f1	f2
@@ -34,7 +34,7 @@
 -> Table scan on dt  (cost=*** rows=***)
     -> Materialize  (cost=*** rows=***)
         -> Filter: ((t1.f1 < 3) and (t1.f2 > 11))  (cost=*** rows=***)
-            -> Index range scan on t1 using f1_2  (cost=*** rows=***)
+            -> Covering index range scan on t1 using f1_2  (cost=*** rows=***)
 
 SELECT * FROM (SELECT f1, f2 FROM t1) as dt
 WHERE f1 < 3 and f2 > 11;
@@ -162,12 +162,12 @@
         -> Table scan on dt2  (cost=*** rows=***)
             -> Materialize  (cost=*** rows=***)
                 -> Filter: (t1.f3 < 400)  (cost=*** rows=***)
-                    -> Index range scan on t1 using f3  (cost=*** rows=***)
+                    -> Covering index range scan on t1 using f3  (cost=*** rows=***)
         -> Hash
             -> Table scan on dt1  (cost=*** rows=***)
                 -> Materialize  (cost=*** rows=***)
                     -> Filter: ((t1.f1 > 2) and (t1.f2 < 35))  (cost=*** rows=***)
-                        -> Index range scan on t1 using f1_2  (cost=*** rows=***)
+                        -> Covering index range scan on t1 using f1_2  (cost=*** rows=***)
 
 SELECT * FROM (SELECT f1, f2 FROM t1) as dt1,
 (SELECT f3 FROM t1) as dt2
@@ -189,12 +189,12 @@
                 -> Table scan on dt2  (cost=*** rows=***)
                     -> Materialize  (cost=*** rows=***)
                         -> Filter: (t1.f3 < 300)  (cost=*** rows=***)
-                            -> Index range scan on t1 using f3  (cost=*** rows=***)
+                            -> Covering index range scan on t1 using f3  (cost=*** rows=***)
                 -> Hash
                     -> Table scan on dt1  (cost=*** rows=***)
                         -> Materialize  (cost=*** rows=***)
                             -> Filter: ((t1.f1 > 2) and (t1.f2 < 35))  (cost=*** rows=***)
-                                -> Index range scan on t1 using f1_2  (cost=*** rows=***)
+                                -> Covering index range scan on t1 using f1_2  (cost=*** rows=***)
 
 SELECT * FROM (SELECT * FROM (SELECT f1, f2 FROM t1) as dt1,
 (SELECT f3 FROM t1) as dt2) as dt3
@@ -210,7 +210,7 @@
 -> Table scan on dt  (cost=*** rows=***)
     -> Materialize  (cost=*** rows=***)
         -> Filter: ((t1.f1 > 1) and ((t1.f1 + t1.f2) > 40))  (cost=*** rows=***)
-            -> Index range scan on t1 using f1_2  (cost=*** rows=***)
+            -> Covering index range scan on t1 using f1_2  (cost=*** rows=***)
 
 SELECT i, j, k FROM (SELECT f1 as i, f2 as j, f2 as k FROM t1) as dt
 WHERE i > 1 and i+j > 40;
@@ -248,7 +248,7 @@
         -> Table scan on dt1  (cost=*** rows=***)
             -> Materialize  (cost=*** rows=***)
                 -> Filter: ((t1.f1 > 1) and ((t1.f1 + t1.f2) > 40))  (cost=*** rows=***)
-                    -> Index range scan on t1 using f1_2  (cost=*** rows=***)
+                    -> Covering index range scan on t1 using f1_2  (cost=*** rows=***)
         -> Hash
             -> Table scan on dt2  (cost=*** rows=***)
                 -> Materialize  (cost=*** rows=***)
@@ -319,7 +319,7 @@
 -> Table scan on dt  (cost=*** rows=***)
     -> Materialize  (cost=*** rows=***)
         -> Filter: (t1.f1 > 10)  (cost=*** rows=***)
-            -> Index range scan on t1 using f1  (cost=*** rows=***)
+            -> Covering index range scan on t1 using f1  (cost=*** rows=***)
 
 SELECT i FROM (SELECT f1 FROM t1) as dt(i) WHERE i > 10;
 i
@@ -351,7 +351,7 @@
     -> Materialize  (cost=*** rows=***)
         -> Group aggregate: sum(t1.f2)  (cost=*** rows=***)
             -> Filter: (t1.f1 > 3)  (cost=*** rows=***)
-                -> Index range scan on t1 using f1_2  (cost=*** rows=***)
+                -> Covering index range scan on t1 using f1_2  (cost=*** rows=***)
 
 SELECT f1 FROM (SELECT f1, SUM(f2) FROM t1 GROUP BY f1) as dt
 WHERE f1 > 3;
@@ -435,7 +435,7 @@
     -> Materialize  (cost=*** rows=***)
         -> Sort: t1.f2  (cost=*** rows=***)
             -> Filter: (t1.f1 > 3)  (cost=*** rows=***)
-                -> Index range scan on t1 using f1_2  (cost=*** rows=***)
+                -> Covering index range scan on t1 using f1_2  (cost=*** rows=***)
 
 SELECT f1 FROM (SELECT f1, f2 FROM t1 ORDER BY f2) as dt
 WHERE f1 > 3;
@@ -475,7 +475,7 @@
             -> Window aggregate with buffering: sum(t1.f2) OVER () 
                 -> Table scan on <temporary>  (cost=*** rows=***)
                     -> Temporary table with deduplication  (cost=*** rows=***)
-                        -> Index range scan on t1 using index_for_group_by(f1_2)  (cost=*** rows=***)
+                        -> Covering index range scan on t1 using index_for_group_by(f1_2)  (cost=*** rows=***)
 
 SELECT * FROM (SELECT f1, SUM(f2) OVER() FROM t1 GROUP BY f1) as dt
 WHERE f1 > 2;
@@ -493,7 +493,7 @@
                 -> Table scan on <temporary>  (cost=*** rows=***)
                     -> Temporary table with deduplication  (cost=*** rows=***)
                         -> Filter: (t1.f1 > 2)  (cost=*** rows=***)
-                            -> Index range scan on t1 using f1_2  (cost=*** rows=***)
+                            -> Covering index range scan on t1 using f1_2  (cost=*** rows=***)
 
 SELECT *
 FROM (SELECT f1, SUM(f2) OVER(PARTITION BY f1)
@@ -681,8 +681,8 @@
 EXPLAIN
 -> Table scan on dt  (cost=*** rows=***)
     -> Materialize  (cost=*** rows=***)
-        -> Filter: (t1.f1 > <cache>(3))  (cost=*** rows=***)
-            -> Index range scan on t1 using f1  (cost=*** rows=***)
+        -> Filter: (t1.f1 > 3)  (cost=*** rows=***)
+            -> Covering index range scan on t1 using f1  (cost=*** rows=***)
 
 DROP PREPARE p;
 SET @p1 = 10;
@@ -726,7 +726,7 @@
         -> Filter: (t1.f1 > (3 * rand()))  (cost=*** rows=***)
             -> Group aggregate: sum(t1.f2)  (cost=*** rows=***)
                 -> Filter: (t1.f1 < 10)  (cost=*** rows=***)
-                    -> Index range scan on t1 using f1_2  (cost=*** rows=***)
+                    -> Covering index range scan on t1 using f1_2  (cost=*** rows=***)
 
 EXPLAIN FORMAT=tree SELECT * FROM
 (SELECT f1, SUM(f2) OVER(PARTITION BY f1) FROM t1) as dt
@@ -738,7 +738,7 @@
             -> Window aggregate with buffering: sum(t1.f2) OVER (PARTITION BY t1.f1 ) 
                 -> Sort: t1.f1  (cost=*** rows=***)
                     -> Filter: (t1.f1 < 10)  (cost=*** rows=***)
-                        -> Index range scan on t1 using f1_2  (cost=*** rows=***)
+                        -> Covering index range scan on t1 using f1_2  (cost=*** rows=***)
 
 EXPLAIN FORMAT=tree SELECT * FROM
 (SELECT f1 FROM t1) as dt
@@ -747,7 +747,7 @@
 -> Table scan on dt  (cost=*** rows=***)
     -> Materialize  (cost=*** rows=***)
         -> Filter: ((t1.f1 > (3 * rand())) and (t1.f1 < 10))  (cost=*** rows=***)
-            -> Index range scan on t1 using f1  (cost=*** rows=***)
+            -> Covering index range scan on t1 using f1  (cost=*** rows=***)
 
 EXPLAIN FORMAT=tree SELECT f1
 FROM (SELECT f1 FROM t1 UNION SELECT f2 FROM t1) as dt
@@ -772,7 +772,7 @@
 EXPLAIN FORMAT=tree SELECT f1 FROM
 (SELECT (SELECT 1 FROM t1 LIMIT 1) as f1 FROM t1) as dt WHERE f1 = 1;
 EXPLAIN
--> Index lookup on dt using <auto_key0> (f1=1)
+-> Covering index lookup on dt using <auto_key0> (f1=1)
     -> Materialize  (cost=*** rows=***)
         -> Index scan on t1 using f1  (cost=*** rows=***)
         -> Select #3 (subquery in projection; run only once)
@@ -923,7 +923,7 @@
     -> Index lookup on dt using <auto_key0> (f2=t1.f2)
         -> Materialize  (cost=*** rows=***)
             -> Filter: (t1.f1 > 31)  (cost=*** rows=***)
-                -> Index range scan on t1 using f1_2  (cost=*** rows=***)
+                -> Covering index range scan on t1 using f1_2  (cost=*** rows=***)
 
 SELECT * FROM t1 JOIN (SELECT f1, f2 FROM t1) as dt USING (f2)
 WHERE dt.f1 > 31 and t1.f2  > 40;
@@ -955,7 +955,7 @@
         -> Table scan on dt  (cost=*** rows=***)
             -> Materialize  (cost=*** rows=***)
                 -> Filter: (t1.f1 > 3)  (cost=*** rows=***)
-                    -> Index range scan on t1 using f1_2  (cost=*** rows=***)
+                    -> Covering index range scan on t1 using f1_2  (cost=*** rows=***)
 
 SELECT * FROM t1 LEFT JOIN (SELECT f1, f2 FROM t1) as dt USING (f2)
 WHERE dt.f1 > 3;
@@ -972,7 +972,7 @@
         -> Table scan on dt  (cost=*** rows=***)
             -> Materialize  (cost=*** rows=***)
                 -> Filter: (t1.f1 > 3)  (cost=*** rows=***)
-                    -> Index range scan on t1 using f1_2  (cost=*** rows=***)
+                    -> Covering index range scan on t1 using f1_2  (cost=*** rows=***)
 
 SELECT * FROM t1 INNER JOIN (SELECT f1, f2 FROM t1) as dt ON dt.f1 > 3;
 f1	f2	f3	f1	f2
@@ -1024,7 +1024,7 @@
         -> Filter: (sum(t1.f2) > 10)  (cost=*** rows=***)
             -> Group aggregate: sum(t1.f2)  (cost=*** rows=***)
                 -> Filter: (t1.f1 > 10)  (cost=*** rows=***)
-                    -> Index range scan on t1 using f1_2  (cost=*** rows=***)
+                    -> Covering index range scan on t1 using f1_2  (cost=*** rows=***)
 
 SELECT * FROM (SELECT * FROM (SELECT f1, SUM(f2) AS sum
 FROM t1 GROUP BY f1) as dt1
@@ -1039,7 +1039,7 @@
         -> Filter: (sum(t1.f2) > 10)  (cost=*** rows=***)
             -> Group aggregate: sum(t1.f2)  (cost=*** rows=***)
                 -> Filter: (t1.f1 > 10)  (cost=*** rows=***)
-                    -> Index range scan on t1 using f1_2  (cost=*** rows=***)
+                    -> Covering index range scan on t1 using f1_2  (cost=*** rows=***)
 
 SELECT * FROM (SELECT f1, SUM(f2) AS sum
 FROM (SELECT f1, f2 FROM t1 WHERE f1 > 10) as dt1
@@ -1197,7 +1197,7 @@
 -> Insert into t2
     -> Table scan on v
         -> Materialize
-            -> Index lookup on t1 using f1 (f1=2)
+            -> Covering index lookup on t1 using f1 (f1=2)
 
 INSERT INTO t2 SELECT * FROM v WHERE f1=2;
 EXPLAIN format=tree UPDATE t2 SET f1=3 WHERE f1 IN (SELECT f1 FROM v WHERE f1=2);
@@ -1206,9 +1206,9 @@
     -> Nested loop semijoin
         -> Filter: (t2.f1 is not null)
             -> Table scan on t2
-        -> Index lookup on v using <auto_key0> (f1=t2.f1)
+        -> Covering index lookup on v using <auto_key0> (f1=t2.f1)
             -> Materialize
-                -> Index lookup on t1 using f1 (f1=2)
+                -> Covering index lookup on t1 using f1 (f1=2)
 
 UPDATE t2 SET f1=3 WHERE f1 IN (SELECT f1 FROM v WHERE f1=2);
 EXPLAIN format=tree DELETE FROM t2 WHERE f1 IN (SELECT f1 FROM v WHERE f1=3);
@@ -1217,9 +1217,9 @@
     -> Nested loop semijoin
         -> Filter: (t2.f1 is not null)
             -> Table scan on t2
-        -> Index lookup on v using <auto_key0> (f1=t2.f1)
+        -> Covering index lookup on v using <auto_key0> (f1=t2.f1)
             -> Materialize
-                -> Index lookup on t1 using f1 (f1=3)
+                -> Covering index lookup on t1 using f1 (f1=3)
 
 DELETE FROM t2 WHERE f1 IN (SELECT f1 FROM v WHERE f1=3);
 DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/derived_correlated.result mysql-8.0-8.0.27/mysql-test/r/derived_correlated.result
--- mysql-8.0-8.0.26/mysql-test/r/derived_correlated.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/derived_correlated.result	2021-09-28 11:46:34.000000000 +0000
@@ -267,7 +267,7 @@
 -> Table scan on t1  (cost=0.45 rows=2)
 -> Select #2 (subquery in projection; dependent)
     -> Filter: (dt1.a = (select #4))  (cost=0.62..0.70 rows=2)
-        -> Index lookup on dt1 using <auto_key0> (a=(select #4))
+        -> Covering index lookup on dt1 using <auto_key0> (a=(select #4))
             -> Materialize CTE dt if needed  (cost=0.55..0.55 rows=1)
                 -> Limit: 1 row(s)  (cost=0.45 rows=1)
                     -> Table scan on t2  (cost=0.45 rows=2)
@@ -1774,7 +1774,7 @@
 -> Table scan on t1  (cost=0.45 rows=2)
 -> Select #2 (subquery in projection; dependent)
     -> Filter: (dt1.a = (select #4))  (cost=0.62..0.70 rows=2)
-        -> Index lookup on dt1 using <auto_key0> (a=(select #4))
+        -> Covering index lookup on dt1 using <auto_key0> (a=(select #4))
             -> Materialize CTE dt if needed  (cost=0.55..0.55 rows=1)
                 -> Limit: 1 row(s)  (cost=0.45 rows=1)
                     -> Table scan on t2  (cost=0.45 rows=2)
@@ -3324,7 +3324,7 @@
 CREATE ALGORITHM=TEMPTABLE VIEW v2 AS SELECT ( SELECT f2 FROM v1 WHERE v1.f1 = t2.f1 ) AS f3 FROM t2;
 EXPLAIN FORMAT=TREE SELECT * FROM v2 WHERE f3 = 3;
 EXPLAIN
--> Index lookup on v2 using <auto_key0> (f3=3)
+-> Covering index lookup on v2 using <auto_key0> (f3=3)
     -> Materialize  (cost=0.45..0.45 rows=1)
         -> Table scan on t2  (cost=0.35 rows=1)
         -> Select #3 (subquery in projection; dependent)
@@ -3424,3 +3424,40 @@
 1	363	363
 set optimizer_switch=DEFAULT;
 DROP TABLE t1, t2, t3;
+#
+# Bug #32729739: ASSERTION `PATH != NULLPTR' FAILED|SQL/SQL_EXECUTOR.CC
+#
+CREATE TABLE t1 ( a INTEGER );
+SELECT *
+FROM
+t1
+LEFT JOIN (
+t1 AS t2
+LEFT JOIN t1 AS t3 ON TRUE
+) ON TRUE,
+LATERAL (
+SELECT SUM(t1.a), t2.a FROM t1
+) AS d1;
+a	a	a	SUM(t1.a)	a
+DROP TABLE t1;
+#
+# Bug 32407774 - MANY INFORMATION_SCHEMA.TABLE_CONSTRAINTS
+#                RELATED QUERIES ARE BROKEN
+#
+CREATE TABLE t1(id int NOT NULL);
+INSERT into t1 VALUES (364), (365);
+CREATE TABLE t2 (id int NOT NULL);
+INSERT into t2 VALUES (365);
+SELECT * FROM t1 AS tbl1
+LEFT JOIN t1 AS tbl3 ON FALSE WHERE tbl1.id NOT IN
+(SELECT id FROM t1 AS tbl2 JOIN LATERAL
+(SELECT 1 FROM t2 WHERE id = tbl2.id LIMIT 10) AS d1);
+id	id
+364	NULL
+SELECT /*+ JOIN_PREFIX(tbl1, tbl2) */ * FROM t1 AS tbl1
+LEFT JOIN t1 AS tbl3 ON FALSE WHERE tbl1.id NOT IN
+(SELECT id FROM t1 AS tbl2 JOIN LATERAL
+(SELECT 1 FROM t2 WHERE id = tbl2.id LIMIT 10) AS d1);
+id	id
+364	NULL
+DROP TABLE t1, t2;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/derived.result mysql-8.0-8.0.27/mysql-test/r/derived.result
--- mysql-8.0-8.0.26/mysql-test/r/derived.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/derived.result	2021-09-28 11:46:34.000000000 +0000
@@ -584,7 +584,7 @@
 ) ON table3 .`i2`  = table2 .o1
 ;
 EXPLAIN
--> Index lookup on table3 using <auto_key0> (i1='m', i2='m')
+-> Covering index lookup on table3 using <auto_key0> (i1='m', i2='m')
     -> Materialize  (cost=0.90..0.90 rows=2)
         -> Table scan on cc  (cost=0.70 rows=2)
 
@@ -1227,7 +1227,7 @@
 5	DERIVED	t1	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Using temporary
 3	DERIVED	t1	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Using temporary
 Warnings:
-Note	1003	/* select#1 */ select `tt`.`f1` AS `f1`,`tt`.`f11` AS `f11`,`tt`.`f1` AS `f1`,`tt`.`f11` AS `f11` from (/* select#3 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f11` AS `f11` from `test`.`t1` where ((`test`.`t1`.`f1` < 7) and (`test`.`t1`.`f1` > 2)) group by `test`.`t1`.`f1`) `tt` join (/* select#5 */ select `t1`.`f1` AS `f1`,`t1`.`f11` AS `f11` from `test`.`t1` where ((`t1`.`f1` < 7) and (`t1`.`f1` > 2)) group by `t1`.`f1`) `tt` where (`tt`.`f1` = `tt`.`f1`)
+Note	1003	/* select#1 */ select `tt`.`f1` AS `f1`,`tt`.`f11` AS `f11`,`tt`.`f1` AS `f1`,`tt`.`f11` AS `f11` from (/* select#3 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f11` AS `f11` from `test`.`t1` where ((`test`.`t1`.`f1` < 7) and (`test`.`t1`.`f1` > 2)) group by `test`.`t1`.`f1`) `tt` join (/* select#5 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f11` AS `f11` from `test`.`t1` where ((`test`.`t1`.`f1` < 7) and (`test`.`t1`.`f1` > 2)) group by `test`.`t1`.`f1`) `tt` where (`tt`.`f1` = `tt`.`f1`)
 FLUSH STATUS;
 SELECT * FROM 
 (SELECT * FROM (SELECT * FROM t1 WHERE f1 < 7 GROUP BY f1) tt WHERE f1 > 2) x
@@ -1259,7 +1259,7 @@
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f11` AS `f11`,`t1`.`f1` AS `f1`,`t1`.`f11` AS `f11` from `test`.`t1` join `test`.`t1` where ((`t1`.`f1` = `test`.`t1`.`f1`) and (`t1`.`f1` > 2) and (`test`.`t1`.`f1` < 7) and (`test`.`t1`.`f1` > 2) and (`test`.`t1`.`f1` < 7))
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f11` AS `f11`,`test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f11` AS `f11` from `test`.`t1` join `test`.`t1` where ((`test`.`t1`.`f1` = `test`.`t1`.`f1`) and (`test`.`t1`.`f1` > 2) and (`test`.`t1`.`f1` < 7) and (`test`.`t1`.`f1` > 2) and (`test`.`t1`.`f1` < 7))
 SELECT * FROM 
 (SELECT * FROM 
 (SELECT * FROM t1 WHERE f1 < 7 ) tt WHERE f1 > 2 ) x
@@ -1287,7 +1287,7 @@
 2	DERIVED	<derived3>	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Using temporary
 3	DERIVED	t1	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Using temporary
 Warnings:
-Note	1003	/* select#1 */ select `x`.`f1` AS `f1`,`x`.`f11` AS `f11`,`z`.`f1` AS `f1`,`z`.`f11` AS `f11` from (/* select#2 */ select `tt`.`f1` AS `f1`,`tt`.`f11` AS `f11` from (/* select#3 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f11` AS `f11` from `test`.`t1` where ((`test`.`t1`.`f1` < 7) and (`test`.`t1`.`f1` > 2)) group by `test`.`t1`.`f1`) `tt` group by `tt`.`f1`) `x` join (/* select#4 */ select `tt`.`f1` AS `f1`,`tt`.`f11` AS `f11` from (/* select#5 */ select `t1`.`f1` AS `f1`,`t1`.`f11` AS `f11` from `test`.`t1` where ((`t1`.`f1` < 7) and (`t1`.`f1` > 2)) group by `t1`.`f1`) `tt` group by `tt`.`f1`) `z` where (`z`.`f1` = `x`.`f1`)
+Note	1003	/* select#1 */ select `x`.`f1` AS `f1`,`x`.`f11` AS `f11`,`z`.`f1` AS `f1`,`z`.`f11` AS `f11` from (/* select#2 */ select `tt`.`f1` AS `f1`,`tt`.`f11` AS `f11` from (/* select#3 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f11` AS `f11` from `test`.`t1` where ((`test`.`t1`.`f1` < 7) and (`test`.`t1`.`f1` > 2)) group by `test`.`t1`.`f1`) `tt` group by `tt`.`f1`) `x` join (/* select#4 */ select `tt`.`f1` AS `f1`,`tt`.`f11` AS `f11` from (/* select#5 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f11` AS `f11` from `test`.`t1` where ((`test`.`t1`.`f1` < 7) and (`test`.`t1`.`f1` > 2)) group by `test`.`t1`.`f1`) `tt` group by `tt`.`f1`) `z` where (`z`.`f1` = `x`.`f1`)
 SELECT * FROM 
 (SELECT * FROM 
 (SELECT * FROM t1 WHERE f1 < 7 GROUP BY f1) tt WHERE f1 > 2 GROUP BY f1) x
diff -Nru mysql-8.0-8.0.26/mysql-test/r/endspace.result mysql-8.0-8.0.27/mysql-test/r/endspace.result
--- mysql-8.0-8.0.26/mysql-test/r/endspace.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/endspace.result	2021-09-28 11:46:34.000000000 +0000
@@ -21,6 +21,10 @@
 select binary 'a  a' > 'a', binary 'a  \0' > 'a', binary 'a\0' > 'a';
 binary 'a  a' > 'a'	binary 'a  \0' > 'a'	binary 'a\0' > 'a'
 1	1	1
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 set names default;
 create table t1 (text1 varchar(32) not NULL, KEY key1 (text1)) charset latin1;
 insert into t1 values ('teststring'), ('nothing'), ('teststring\t');
@@ -78,6 +82,8 @@
 nothing	7
 teststring	10
 teststring		11
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 alter table t1 modify text1 blob not null, drop key key1, add key key1 (text1(20));
 insert into t1 values ('teststring ');
 select concat('|', text1, '|') from t1 order by text1;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/events_bugs.result mysql-8.0-8.0.27/mysql-test/r/events_bugs.result
--- mysql-8.0-8.0.26/mysql-test/r/events_bugs.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/events_bugs.result	2021-09-28 11:46:34.000000000 +0000
@@ -570,8 +570,8 @@
 SHOW GRANTS FOR CURRENT_USER;
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 SET GLOBAL event_scheduler = ON;
 CREATE TABLE events_test.event_log
 (id int KEY AUTO_INCREMENT, ev_nm char(40), ev_cnt int, ev_tm timestamp);
diff -Nru mysql-8.0-8.0.26/mysql-test/r/events_logs_tests.result mysql-8.0-8.0.27/mysql-test/r/events_logs_tests.result
--- mysql-8.0-8.0.26/mysql-test/r/events_logs_tests.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/events_logs_tests.result	2021-09-28 11:46:34.000000000 +0000
@@ -1,3 +1,5 @@
+SET @old_log_output = @@global.log_output;
+SET GLOBAL log_output="FILE,TABLE";
 drop database if exists events_test;
 create database if not exists events_test;
 use events_test;
@@ -72,3 +74,6 @@
 drop database events_test;
 set @@global.long_query_time=default;
 set @@session.long_query_time=default;
+SET GLOBAL log_output = @old_log_output;
+truncate table mysql.general_log;
+truncate table mysql.slow_log;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/examined_rows.result mysql-8.0-8.0.27/mysql-test/r/examined_rows.result
--- mysql-8.0-8.0.26/mysql-test/r/examined_rows.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/examined_rows.result	2021-09-28 11:46:34.000000000 +0000
@@ -174,3 +174,5 @@
 SET @@global.slow_query_log=@old_slow_query_log;
 SET @@global.log_output=@old_log_output;
 SET @@session.long_query_time=@old_long_query_time;
+truncate table mysql.general_log;
+truncate table mysql.slow_log;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/explain_for_connection_small_json.result mysql-8.0-8.0.27/mysql-test/r/explain_for_connection_small_json.result
--- mysql-8.0-8.0.26/mysql-test/r/explain_for_connection_small_json.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/explain_for_connection_small_json.result	2021-09-28 11:46:34.000000000 +0000
@@ -613,7 +613,7 @@
 @@ -53,4 +54,3 @@
                "col_varchar_nokey"
 -            ],
--            "attached_condition": "(`alias2`.`col_varchar_key` = `test`.`t1`.`col_varchar_nokey`)"
+-            "attached_condition": "(`test`.`alias2`.`col_varchar_key` = `test`.`t1`.`col_varchar_nokey`)"
 +            ]
            }
 @@ -66,3 +66,3 @@
@@ -628,7 +628,7 @@
 @@ -107,4 +108,3 @@
                "col_int_key"
 -            ],
--            "attached_condition": "<if>(is_not_null_compl(sq2_alias2), (`sq2_alias2`.`col_int_key` = `test`.`t1`.`pk`), true)"
+-            "attached_condition": "<if>(is_not_null_compl(sq2_alias2), (`test`.`sq2_alias2`.`col_int_key` = `test`.`t1`.`pk`), true)"
 +            ]
            }
 QUERY: SELECT d FROM (SELECT * FROM t2) AS a2 RIGHT JOIN (SELECT * FROM t1) AS a1 ON c = a WHERE d LIKE '_' ORDER BY d 
diff -Nru mysql-8.0-8.0.26/mysql-test/r/explain_other.result mysql-8.0-8.0.27/mysql-test/r/explain_other.result
--- mysql-8.0-8.0.26/mysql-test/r/explain_other.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/explain_other.result	2021-09-28 11:46:34.000000000 +0000
@@ -901,7 +901,7 @@
   }
 }
 Warnings:
-Note	1003	/* select#1 */ select `t2`.`f1` AS `f1` from `mysqltest1`.`t1` straight_join `mysqltest1`.`t1` `t2` where (`mysqltest1`.`t1`.`f1` > (/* select#2 */ select `mysqltest1`.`t3`.`f1` from `mysqltest1`.`t1` `t3` limit 1))
+Note	1003	/* select#1 */ select `mysqltest1`.`t2`.`f1` AS `f1` from `mysqltest1`.`t1` straight_join `mysqltest1`.`t1` `t2` where (`mysqltest1`.`t1`.`f1` > (/* select#2 */ select `mysqltest1`.`t3`.`f1` from `mysqltest1`.`t1` `t3` limit 1))
 EXPLAIN FORMAT=JSON FOR QUERY 'SELECT 1 FROM t1 WHERE
 ROW(f1,f1) >= ROW('1', (SELECT 1 FROM t1 WHERE f1 > 1234))'
 EXPLAIN
@@ -983,7 +983,7 @@
       "used_columns": [
         "f1"
       ],
-      "attached_condition": "((`mysqltest1`.`t1`.`f1`,`mysqltest1`.`t1`.`f1`) >= ('1',(/* select#2 */ select 1 from `mysqltest1`.`t1` where (`t1`.`f1` > 1234))))"
+      "attached_condition": "((`mysqltest1`.`t1`.`f1`,`mysqltest1`.`t1`.`f1`) >= ('1',(/* select#2 */ select 1 from `mysqltest1`.`t1` where (`mysqltest1`.`t1`.`f1` > 1234))))"
     },
     "optimized_away_subqueries": [
       {
@@ -1009,7 +1009,7 @@
             "used_columns": [
               "f1"
             ],
-            "attached_condition": "(`t1`.`f1` > 1234)"
+            "attached_condition": "(`mysqltest1`.`t1`.`f1` > 1234)"
           }
         }
       }
@@ -1017,7 +1017,7 @@
   }
 }
 Warnings:
-Note	1003	/* select#1 */ select 1 AS `1` from `mysqltest1`.`t1` where ((`mysqltest1`.`t1`.`f1`,`mysqltest1`.`t1`.`f1`) >= ('1',(/* select#2 */ select 1 from `mysqltest1`.`t1` where (`t1`.`f1` > 1234))))
+Note	1003	/* select#1 */ select 1 AS `1` from `mysqltest1`.`t1` where ((`mysqltest1`.`t1`.`f1`,`mysqltest1`.`t1`.`f1`) >= ('1',(/* select#2 */ select 1 from `mysqltest1`.`t1` where (`mysqltest1`.`t1`.`f1` > 1234))))
 CREATE TABLE t3 (pk INT PRIMARY KEY);
 INSERT INTO t3 SELECT DISTINCT * FROM t1;
 EXPLAIN FORMAT=JSON FOR QUERY 'SELECT * FROM t3 WHERE pk=(SELECT f1 FROM t1 limit 1)'
diff -Nru mysql-8.0-8.0.26/mysql-test/r/explain_tree.result mysql-8.0-8.0.27/mysql-test/r/explain_tree.result
--- mysql-8.0-8.0.26/mysql-test/r/explain_tree.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/explain_tree.result	2021-09-28 11:46:34.000000000 +0000
@@ -327,7 +327,7 @@
     -> Index scan on t1 using PRIMARY  (cost=0.55 rows=3)
     -> Select #2 (subquery in condition; run only once)
         -> Limit: 1 row(s)  (cost=0.55 rows=1)
-            -> Index scan on t1 using PRIMARY  (cost=0.55 rows=3)
+            -> Covering index scan on t1 using PRIMARY  (cost=0.55 rows=3)
 
 DROP TABLE t1;
 CREATE TABLE t1 ( f1 INT PRIMARY KEY );
@@ -477,7 +477,7 @@
                 -> Table scan on t2  (cost=0.35 rows=1)
                 -> Filter: (t3.a = t2.a)  (cost=0.35 rows=1)
                     -> Table scan on t3  (cost=0.35 rows=1)
-        -> Index lookup on t4d using <auto_key0> (a=t1.a)
+        -> Covering index lookup on t4d using <auto_key0> (a=t1.a)
             -> Materialize (invalidate on row from t3)  (cost=0.45..0.45 rows=1)
                 -> Limit: 1 row(s)  (cost=0.35 rows=1)
                     -> Filter: (t4.a = t3.a)  (cost=0.35 rows=1)
@@ -490,12 +490,15 @@
 EXPLAIN FORMAT=TREE SELECT * FROM ( SELECT * FROM t1 LIMIT 2 OFFSET 1 ) AS alias1
 WHERE f1 <= ANY ( SELECT f1 FROM t1 ) ORDER BY f1;
 EXPLAIN
--> Sort: alias1.f1
-    -> Filter: <nop>((alias1.f1 <= (select #3)))  (cost=2.62 rows=2) [other sub-iterators not shown]
+-> Sort: alias1.f1  (cost=0.35..0.35 rows=0)
+    -> Filter: <nop>((alias1.f1 <= (select #3)))  (cost=2.62 rows=2)
         -> Table scan on alias1  (cost=2.62 rows=2)
             -> Materialize  (cost=0.35..0.35 rows=0)
                 -> Limit/Offset: 2/1 row(s)  (cost=0.35 rows=0)
                     -> Table scan on t1  (cost=0.35 rows=1)
+        -> Select #3 (subquery in condition; run only once)
+            -> Aggregate: max(t1.f1)  (cost=0.45 rows=1)
+                -> Table scan on t1  (cost=0.35 rows=1)
 
 DROP TABLE t1;
 CREATE TABLE t1 ( f1 INT );
@@ -672,7 +675,7 @@
     -> Remove duplicates from input sorted on i1  (cost=0.65 rows=4)
         -> Filter: (t2.i is not null)  (cost=0.65 rows=4)
             -> Index scan on t2 using i1  (cost=0.65 rows=4)
-    -> Single-row index lookup on t1 using PRIMARY (i=t2.i)  (cost=1.10 rows=1)
+    -> Single-row covering index lookup on t1 using PRIMARY (i=t2.i)  (cost=1.10 rows=1)
 
 DROP TABLE t1;
 DROP TABLE t2;
@@ -841,6 +844,9 @@
 #
 CREATE TABLE t1 (a INTEGER);
 INSERT INTO t1 VALUES (1), (2), (3), (4), (5);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN ANALYZE SELECT * FROM t1 LEFT JOIN ( SELECT * FROM t1 ORDER BY t1.a LIMIT 3 ) d1 ON TRUE;
 EXPLAIN
 -> Nested loop left join  (cost=14.94 rows=15) (actual time=N.NNN..N.NNN rows=15 loops=1)
@@ -852,3 +858,40 @@
                     -> Table scan on t1  (cost=0.75 rows=5) (actual time=N.NNN..N.NNN rows=5 loops=1)
 
 DROP TABLE t1;
+#
+# Bug #32915233: RECENT REGRESSION:ASSERTION `EXPLAIN.CHILDREN.SIZE() <= 1' FAILED.
+#
+CREATE TABLE t1 (a int);
+SET sql_mode='';
+EXPLAIN FORMAT=tree SELECT a IN (SELECT a FROM (table t1) AS d) FROM t1 GROUP BY (@b:=5);
+EXPLAIN
+-> Group (no aggregates)  (cost=0.45 rows=1)
+    -> Table scan on t1  (cost=0.35 rows=1)
+-> Select #2 (subquery in projection; dependent)
+    -> Limit: 1 row(s)  (cost=0.45..0.45 rows=1)
+        -> Filter: <if>(outer_field_is_not_null, <is_not_null_test>(d.a), true)  (cost=0.45..0.45 rows=1)
+            -> Alternative plans for IN subquery: Index lookup unless a IS NULL [other sub-iterators not shown]
+                -> Covering index lookup on d using <auto_key0> (a=<cache>(t1.a) or NULL)
+                    -> Materialize  (cost=0.45..0.45 rows=1)
+                        -> Table scan on t1  (cost=0.35 rows=1)
+
+Warnings:
+Warning	1287	Setting user variables within expressions is deprecated and will be removed in a future release. Consider alternatives: 'SET variable=expression, ...', or 'SELECT expression(s) INTO variables(s)'.
+SET sql_mode=DEFAULT;
+DROP TABLE t1;
+#
+# Bug #33030136: EXPLAIN: ASSERTION `CURRENT_THD->LEX->USING_HYPERGRAPH_OPTIMIZER' FAILED.
+#
+CREATE TABLE t1 (a INTEGER);
+EXPLAIN FORMAT=tree
+(SELECT 1 FROM t1)
+UNION ALL
+SELECT 1 IN (SELECT 1 FROM t1) FROM t1 WHERE 1=2;
+EXPLAIN
+-> Append
+    -> Stream results  (cost=0.35 rows=1)
+        -> Table scan on t1  (cost=0.35 rows=1)
+    -> Stream results  (cost=0.00..0.00 rows=0)
+        -> Zero rows (Impossible WHERE)  (cost=0.00..0.00 rows=0)
+
+DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/filesort.result mysql-8.0-8.0.27/mysql-test/r/filesort.result
--- mysql-8.0-8.0.26/mysql-test/r/filesort.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/filesort.result	2021-09-28 11:46:34.000000000 +0000
@@ -182,3 +182,16 @@
 f1
 a
 DROP TABLE t1;
+#
+# Bug #33030289 REGRESSION: ASSERTION `REC_SZ <= M_ELEMENT_SIZE' FAILED.
+#
+CREATE TABLE t(a DECIMAL(55,19) NOT NULL);
+INSERT INTO t VALUES(0),(1),(2),(3),(4),(5);
+SELECT
+(
+SELECT 1 FROM t
+ORDER BY ST_HAUSDORFFDISTANCE(a, ST_ASTEXT(1,'axis-order=lat-long')), a
+LIMIT 1
+);
+ERROR 22023: Invalid GIS data provided to function st_astext.
+DROP TABLE t;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/foreign_key.result mysql-8.0-8.0.27/mysql-test/r/foreign_key.result
--- mysql-8.0-8.0.26/mysql-test/r/foreign_key.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/foreign_key.result	2021-09-28 11:46:34.000000000 +0000
@@ -4933,3 +4933,17 @@
   CONSTRAINT `child_ibfk_1` FOREIGN KEY (`fk`) REFERENCES `parent` (`pk`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 DROP TABLES child, parent;
+#
+# Bug#33114045 - TRANSFER_PREEXISTING_FOREIGN_KEYS: ASSERTION `!FIND->IS_VIRTUAL_GCOL()'
+#                FAILED.
+# Assertion to make sure foreign key is referencing non-virtual column failed.
+#
+CREATE TABLE t (a INT KEY, b INT NOT NULL UNIQUE KEY,
+CONSTRAINT FOREIGN KEY (a) REFERENCES t(b));
+# Without fix, assertion fails for the following ALTER TABLE statements in
+# the debug build. Statements executes successfully in the non-debug build.
+ALTER TABLE t ADD COLUMN a INT GENERATED ALWAYS AS (1) FIRST;
+ERROR 42S21: Duplicate column name 'a'
+ALTER TABLE t ADD COLUMN b INT GENERATED ALWAYS AS (1) FIRST;
+ERROR 42S21: Duplicate column name 'b'
+DROP TABLE t;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/fulltext.result mysql-8.0-8.0.27/mysql-test/r/fulltext.result
--- mysql-8.0-8.0.26/mysql-test/r/fulltext.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/fulltext.result	2021-09-28 11:46:34.000000000 +0000
@@ -15,12 +15,12 @@
 EXPLAIN FORMAT=tree select * from t1 where MATCH(a,b) AGAINST ("collections");
 EXPLAIN
 -> Filter: (match t1.a,t1.b against ('collections'))  (cost=0.35 rows=1)
-    -> Indexed full text search on t1 using a (a='collections')  (cost=0.35 rows=1)
+    -> Full-text index search on t1 using a (a='collections')  (cost=0.35 rows=1)
 
 select * from t1 where MATCH(a,b) AGAINST ("collections");
 a	b
-Only MyISAM tables	support collections
 Full-text indexes	are called collections
+Only MyISAM tables	support collections
 explain select * from t1 where MATCH(a,b) AGAINST ("collections");
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	NULL	fulltext	a	a	0	const	1	100.00	Using where
@@ -37,9 +37,9 @@
 a	b
 select * from t1 where MATCH(a,b) AGAINST ("collections" WITH QUERY EXPANSION);
 a	b
-Only MyISAM tables	support collections
 Full-text indexes	are called collections
 MySQL has now support	for full-text search
+Only MyISAM tables	support collections
 select * from t1 where MATCH(a,b) AGAINST ("indexes" WITH QUERY EXPANSION);
 a	b
 Full-text indexes	are called collections
@@ -47,8 +47,8 @@
 select * from t1 where MATCH(a,b) AGAINST ("indexes collections" WITH QUERY EXPANSION);
 a	b
 Full-text indexes	are called collections
-Only MyISAM tables	support collections
 MySQL has now support	for full-text search
+Only MyISAM tables	support collections
 select * from t1 where MATCH(a,b) AGAINST ("indexes" IN NATURAL LANGUAGE MODE);
 a	b
 Full-text indexes	are called collections
@@ -203,9 +203,9 @@
 Function MATCH ... AGAINST()	is used to do a search
 select * from t1 where MATCH(a,b) AGAINST ("collections") UNION ALL select * from t1 where MATCH(a,b) AGAINST ("indexes");
 a	b
-Only MyISAM tables	support collections
 Full-text indexes	are called collections
 Full-text indexes	are called collections
+Only MyISAM tables	support collections
 delete from t1 where a like "MySQL%";
 update t1 set a='some test foobar' where MATCH a,b AGAINST ('model');
 delete from t1 where MATCH(a,b) AGAINST ("indexes");
@@ -219,13 +219,13 @@
 insert t1 values ("aaa10 bbb20"), ("aaa20 bbb15"), ("aaa30 bbb10");
 select * from t1 where match a against ("+aaa* +bbb*" in boolean mode);
 a
-aaa30 bbb10
-aaa20 bbb15
 aaa10 bbb20
+aaa20 bbb15
+aaa30 bbb10
 select * from t1 where match a against ("+aaa* +bbb1*" in boolean mode);
 a
-aaa30 bbb10
 aaa20 bbb15
+aaa30 bbb10
 select * from t1 where match a against ("+aaa* +ccc*" in boolean mode);
 a
 select * from t1 where match a against ("+aaa10 +(bbb*)" in boolean mode);
@@ -233,12 +233,12 @@
 aaa10 bbb20
 select * from t1 where match a against ("+(+aaa* +bbb1*)" in boolean mode);
 a
-aaa30 bbb10
 aaa20 bbb15
+aaa30 bbb10
 select * from t1 where match a against ("(+aaa* +bbb1*)" in boolean mode);
 a
-aaa30 bbb10
 aaa20 bbb15
+aaa30 bbb10
 drop table t1;
 CREATE TABLE t1 (
 id int(11),
@@ -347,8 +347,8 @@
 insert into t1 values (2,"fullaaa fullzzz");
 select * from t1 where match b against ('full*' in boolean mode);
 a	b
-2	fullaaa fullzzz
 1	I wonder why the fulltext index doesnt work?
+2	fullaaa fullzzz
 drop table t1;
 CREATE TABLE t1 ( id int(11) NOT NULL auto_increment primary key, mytext text NOT NULL, FULLTEXT KEY mytext (mytext)) ENGINE=MyISAM;
 Warnings:
diff -Nru mysql-8.0-8.0.26/mysql-test/r/func_bitwise_ops.result mysql-8.0-8.0.27/mysql-test/r/func_bitwise_ops.result
--- mysql-8.0-8.0.26/mysql-test/r/func_bitwise_ops.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/func_bitwise_ops.result	2021-09-28 11:46:34.000000000 +0000
@@ -1215,6 +1215,8 @@
 3	34567104ABF0F0F0F0	192	3158579	foo
 4	34567100ABF000F0F0	192	3158579	foo
 5	000002	192	3158579	foo
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warnings:
 SELECT BIT_COUNT(group_id), BIT_COUNT(a), BIT_COUNT(192), BIT_COUNT(0x303233),
 BIT_COUNT(binary "foo"), BIT_COUNT(NULL)
 FROM t;
@@ -1231,6 +1233,8 @@
 2	17	2	9	16	NULL
 2	33	2	9	16	NULL
 2	9	2	9	16	NULL
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warnings:
 #
 # aggregate functions in prepared statements
 #
diff -Nru mysql-8.0-8.0.26/mysql-test/r/func_digest.result mysql-8.0-8.0.27/mysql-test/r/func_digest.result
--- mysql-8.0-8.0.26/mysql-test/r/func_digest.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/func_digest.result	2021-09-28 11:46:34.000000000 +0000
@@ -1853,7 +1853,7 @@
 CREATE TABLE ( `a` INTEGER )	YES
 DROP TABLE åäö, 日本語,  𩸽;
 Warnings:
-Warning	1300	Cannot convert string '\xF0\xA9\xB8\xBD' from utf8mb4 to utf8
+Warning	1300	Cannot convert string '\xF0\xA9\xB8\xBD' from utf8mb4 to utf8mb3
 SET NAMES DEFAULT;
 #
 # Bug#27021852: WL#9637: INT MYSQL_EXECUTE_COMMAND(THD*, BOOL):
diff -Nru mysql-8.0-8.0.26/mysql-test/r/func_group.result mysql-8.0-8.0.27/mysql-test/r/func_group.result
--- mysql-8.0-8.0.26/mysql-test/r/func_group.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/func_group.result	2021-09-28 11:46:34.000000000 +0000
@@ -2219,3 +2219,38 @@
 Warnings:
 Note	1003	/* select#1 */ select max(`test`.`t1`.`vc`) AS `MAX(vc)` from `test`.`t1` where (`test`.`t1`.`vc` > '123456')
 DROP TABLE t1;
+#
+# Bug#32552332 - CAN'T WRITE; DUPLICATE KEY IN TABLE '/TMP/#SQL...'
+#
+CREATE TABLE tr (c1 INT);
+INSERT INTO tr VALUES (1);
+CREATE FUNCTION seq_1_to_2() RETURNS INT
+BEGIN
+DECLARE limit_value, return_value INT;
+SET limit_value = 2;
+SELECT c1 INTO return_value FROM tr;
+IF (return_value < limit_value) THEN
+UPDATE tr SET c1 = c1 + 1;
+ELSE
+UPDATE tr SET c1 = 1;
+END IF;
+RETURN (return_value);
+END|
+CREATE TABLE t1 (c1 INT);
+INSERT INTO t1 VALUES (10);
+INSERT INTO t1 VALUES (11);
+SELECT seq_1_to_2() as seq, COUNT(*) FROM t1 GROUP BY seq;
+seq	COUNT(*)
+1	1
+2	1
+SELECT FLOOR(seq_1_to_2() * 2) AS val, COUNT(*) FROM t1 GROUP BY val;
+val	COUNT(*)
+2	1
+4	1
+SELECT val, COUNT(*) FROM (SELECT FLOOR(seq_1_to_2())+1 val FROM t1) x
+GROUP BY x.val;
+val	COUNT(*)
+2	1
+3	1
+DROP TABLE t1, tr;
+DROP FUNCTION seq_1_to_2;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/func_if.result mysql-8.0-8.0.27/mysql-test/r/func_if.result
--- mysql-8.0-8.0.26/mysql-test/r/func_if.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/func_if.result	2021-09-28 11:46:34.000000000 +0000
@@ -33,6 +33,8 @@
 a
 aa
 aaa
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select if(u=1,st,binary st) s from t1 where st like "%a%" order by s;
 s
 A
@@ -41,6 +43,8 @@
 a
 aa
 aaa
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 analyze table t1;
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	status	OK
@@ -48,6 +52,7 @@
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	7	14.29	Using where; Using filesort
 Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 Note	1003	/* select#1 */ select if((`test`.`t1`.`u` = 1),`test`.`t1`.`st`,cast(`test`.`t1`.`st` as char charset binary)) AS `s` from `test`.`t1` where (`test`.`t1`.`st` like '%a%') order by `s`
 select nullif(u, 1) from t1;
 nullif(u, 1)
@@ -321,3 +326,10 @@
 [1]
 # Bug#32231557: Field_blob::store_to_mem: assertion `field_charset == cs' failed.
 DO GROUP_CONCAT(NULLIF(ELT(1, @e), POINT(250,41)) ORDER BY 1);
+# Bug#32816305: Prepare type checking error
+CREATE TABLE t (t_date DATETIME NULL);
+PREPARE ps FROM 'INSERT INTO t SET t_date = NULLIF(?, '''')';
+SET @t_date = NOW();
+EXECUTE ps USING @t_date;
+DEALLOCATE PREPARE ps;
+DROP TABLE t;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/func_math.result mysql-8.0-8.0.27/mysql-test/r/func_math.result
--- mysql-8.0-8.0.26/mysql-test/r/func_math.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/func_math.result	2021-09-28 11:46:34.000000000 +0000
@@ -2057,7 +2057,7 @@
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `5.0 + 96 DIV 1` decimal(4,1) DEFAULT NULL,
-  `5.0 + 96.1234 DIV 1` decimal(8,1) DEFAULT NULL,
+  `5.0 + 96.1234 DIV 1` decimal(4,1) DEFAULT NULL,
   `5.0 + '96' DIV 1` decimal(4,1) DEFAULT NULL,
   `5.0 + CAST('96' AS SIGNED) DIV 1` decimal(22,1) DEFAULT NULL,
   `5.0 + CAST('96' AS UNSIGNED) DIV 1` decimal(23,1) DEFAULT NULL
@@ -2076,3 +2076,38 @@
 SELECT a, 1-a FROM t1;
 ERROR 22003: BIGINT value is out of range in '(1 - `test`.`t1`.`a`)'
 DROP TABLE t1;
+# Bug#31641064: Decimal returned function value overflow with GROUP BY
+CREATE TABLE t1(c1 INTEGER, c2 INTEGER);
+INSERT INTO t1 VALUES(97, 1);
+SET SQL_MODE='';
+SELECT 27 DIV (c2/c1) / 17 AS c1 FROM t1 GROUP BY c1;
+c1
+154.0588
+Warnings:
+Warning	1052	Column 'c1' in group statement is ambiguous
+SELECT 27 DIV CAST(c2/c1 AS CHAR) / 17 AS c1 FROM t1 GROUP BY c1;
+c1
+154.1765
+Warnings:
+Warning	1052	Column 'c1' in group statement is ambiguous
+SELECT 27 DIV CAST(c2/c1 AS DOUBLE) / 17 AS c1 FROM t1 GROUP BY c1;
+c1
+154.0588
+Warnings:
+Warning	1052	Column 'c1' in group statement is ambiguous
+SET SQL_MODE=DEFAULT;
+DROP TABLE t1;
+# Bug#32863037: Assertion `scale >= 0 && precision > 0 &&
+#               scale <= precision' failed
+SELECT * FROM (SELECT -TRUE AS a, --TRUE AS b) AS dt;
+a	b
+-1	1
+# Bug#33142010: Failure on complex const argument to string functions
+CREATE VIEW v AS SELECT -(1 NOT IN (0)) AS c;
+SHOW CREATE TABLE v;
+View	Create View	character_set_client	collation_connection
+v	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v` AS select -((1 <> 0)) AS `c`	utf8mb4	utf8mb4_0900_ai_ci
+SELECT * FROM v;
+c
+-1
+DROP VIEW v;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/func_misc.result mysql-8.0-8.0.27/mysql-test/r/func_misc.result
--- mysql-8.0-8.0.26/mysql-test/r/func_misc.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/func_misc.result	2021-09-28 11:46:34.000000000 +0000
@@ -711,11 +711,13 @@
 INET6_NTOA('1234')	INET6_NTOA(BINARY('1234'))
 NULL	49.50.51.52
 Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 Warning	1411	Incorrect string value: ''1234'' for function inet6_ntoa
 SELECT INET6_NTOA('0123456789abcdef'), INET6_NTOA(BINARY('0123456789abcdef'));
 INET6_NTOA('0123456789abcdef')	INET6_NTOA(BINARY('0123456789abcdef'))
 NULL	3031:3233:3435:3637:3839:6162:6364:6566
 Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 Warning	1411	Incorrect string value: ''0123456789abcdef'' for function inet6_ntoa
 
 # -- Checking double-conversion...
@@ -925,6 +927,8 @@
 SELECT IS_IPV4(BINARY('1.2.3.4'));
 IS_IPV4(BINARY('1.2.3.4'))
 1
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT IS_IPV6(NULL);
 IS_IPV6(NULL)
 NULL
@@ -955,6 +959,8 @@
 SELECT IS_IPV6(BINARY('0000:0000:0000:0000:0000:0000:0000:0001'));
 IS_IPV6(BINARY('0000:0000:0000:0000:0000:0000:0000:0001'))
 1
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 
 # -- Checking IS_IPV4_MAPPED() and IS_IPV4_COMPAT()...
 
diff -Nru mysql-8.0-8.0.26/mysql-test/r/func_regexp.result mysql-8.0-8.0.27/mysql-test/r/func_regexp.result
--- mysql-8.0-8.0.26/mysql-test/r/func_regexp.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/func_regexp.result	2021-09-28 11:46:34.000000000 +0000
@@ -125,6 +125,8 @@
 SELECT NULL REGEXP BINARY NULL;
 NULL REGEXP BINARY NULL
 NULL
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT 'A' REGEXP BINARY NULL;
 ERROR HY000: Character set 'latin1_swedish_ci' cannot be used in conjunction with 'binary' in call to regexp_like.
 SELECT "ABC" REGEXP BINARY NULL;
@@ -170,3 +172,79 @@
 # Bug#58026: massive recursion and crash in regular expression handling
 #
 SELECT '1' RLIKE RPAD('1', 10000, '(');
+# Bug#33089668: Calling regexp_instr() with NULL causes all
+#               further calls of it to return NULL
+SELECT REGEXP_INSTR(e, 'pattern')
+FROM (VALUES ROW('Find pattern'), ROW(NULL), ROW('Find pattern')) AS v(e);
+REGEXP_INSTR(e, 'pattern')
+6
+NULL
+6
+SELECT REGEXP_LIKE(e, 'pattern')
+FROM (VALUES ROW('Find pattern'), ROW(NULL), ROW('Find pattern')) AS v(e);
+REGEXP_LIKE(e, 'pattern')
+1
+NULL
+1
+SELECT REGEXP_REPLACE(e, 'pattern', 'xyz')
+FROM (VALUES ROW('Find pattern'), ROW(NULL), ROW('Find pattern')) AS v(e);
+REGEXP_REPLACE(e, 'pattern', 'xyz')
+Find xyz
+NULL
+Find xyz
+SELECT REGEXP_SUBSTR(e, 'pattern')
+FROM (VALUES ROW('Find pattern'), ROW(NULL), ROW('Find pattern')) AS v(e);
+REGEXP_SUBSTR(e, 'pattern')
+pattern
+NULL
+pattern
+CREATE FUNCTION r_instr(input_text VARCHAR(255)) RETURNS INT DETERMINISTIC
+RETURN REGEXP_INSTR(input_text, 'pattern');
+SELECT r_instr('Find pattern');
+r_instr('Find pattern')
+6
+SELECT r_instr(NULL);
+r_instr(NULL)
+NULL
+SELECT r_instr('Find pattern');
+r_instr('Find pattern')
+6
+DROP FUNCTION r_instr;
+CREATE FUNCTION r_like(input_text VARCHAR(255)) RETURNS BOOLEAN DETERMINISTIC
+RETURN REGEXP_LIKE(input_text, 'pattern');
+SELECT r_like('Find pattern');
+r_like('Find pattern')
+1
+SELECT r_like(NULL);
+r_like(NULL)
+NULL
+SELECT r_like('Find pattern');
+r_like('Find pattern')
+1
+DROP FUNCTION r_like;
+CREATE FUNCTION r_replace(input_text VARCHAR(255))
+RETURNS VARCHAR(255) DETERMINISTIC
+RETURN REGEXP_REPLACE(input_text, 'pattern', 'xyz');
+SELECT r_replace('Find pattern');
+r_replace('Find pattern')
+Find xyz
+SELECT r_replace(NULL);
+r_replace(NULL)
+NULL
+SELECT r_replace('Find pattern');
+r_replace('Find pattern')
+Find xyz
+DROP FUNCTION r_replace;
+CREATE FUNCTION r_substr(input_text VARCHAR(255))
+RETURNS VARCHAR(255) DETERMINISTIC
+RETURN REGEXP_SUBSTR(input_text, 'pattern');
+SELECT r_substr('Find pattern');
+r_substr('Find pattern')
+pattern
+SELECT r_substr(NULL);
+r_substr(NULL)
+NULL
+SELECT r_substr('Find pattern');
+r_substr('Find pattern')
+pattern
+DROP FUNCTION r_substr;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/func_set.result mysql-8.0-8.0.27/mysql-test/r/func_set.result
--- mysql-8.0-8.0.26/mysql-test/r/func_set.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/func_set.result	2021-09-28 11:46:34.000000000 +0000
@@ -69,12 +69,19 @@
 select find_in_set(binary 'a',binary 'A,B,C');
 find_in_set(binary 'a',binary 'A,B,C')
 0
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select find_in_set('a',binary 'A,B,C');
 find_in_set('a',binary 'A,B,C')
 0
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select find_in_set(binary 'a', 'A,B,C');
 find_in_set(binary 'a', 'A,B,C')
 0
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select find_in_set('1','3,1,');
 find_in_set('1','3,1,')
 2
diff -Nru mysql-8.0-8.0.26/mysql-test/r/func_str.result mysql-8.0-8.0.27/mysql-test/r/func_str.result
--- mysql-8.0-8.0.26/mysql-test/r/func_str.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/func_str.result	2021-09-28 11:46:34.000000000 +0000
@@ -30,9 +30,15 @@
 select instr('hello','HE'), instr('hello',binary 'HE'), instr(binary 'hello','HE');
 instr('hello','HE')	instr('hello',binary 'HE')	instr(binary 'hello','HE')
 1	1	0
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select position(binary 'll' in 'hello'),position('a' in binary 'hello');
 position(binary 'll' in 'hello')	position('a' in binary 'hello')
 3	0
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT LOCATE('d', _utf8mb4'abcdef');
 LOCATE('d', _utf8mb4'abcdef')
 4
@@ -897,6 +903,7 @@
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 Note	1003	/* select#1 */ select cast('HE' as char charset binary) AS `binary 'HE'`
 explain select export_set(255,_latin2'y', _latin2'n', _latin2' ');
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -4646,9 +4653,13 @@
 SELECT REPLACE( 'a', binary 'b', NULL ) as xxx;
 xxx
 NULL
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT REPLACE( 'a', binary '', NULL ) as xxx;
 xxx
 NULL
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT REPLACE( 'a', 'b', NULL ) as xxx;
 xxx
 NULL
@@ -4667,6 +4678,8 @@
 SELECT REPLACE( 'a', binary NULL, 'bravo' ) as xxx;
 xxx
 NULL
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 #
 # Bug#22565155 DATA ROWS LOST AFTER ADDING DISTINCT WITH
 # SUBSTR() IN SELECT LIST
@@ -4808,7 +4821,6 @@
 rand(to_days('2028-12-04 15:50:01.284969'))));
 Warnings:
 Warning	1292	Truncated incorrect BINARY value: 'x'5d44f4d736397d92c8267c12''
-Warning	1264	Out of range value for column '(null)' at row 1
 do from_base64(cast(right(11,1)as binary(24)));
 do convert(inet_aton(cast(left(-1,1)as binary(30))) using utf8);
 Warnings:
@@ -5360,3 +5372,143 @@
 ERROR HY000: Cannot convert string 'F\xBC)\x9F' from binary to utf8mb4
 DO ST_SRID(LOCATE(0x58ed0b8e,8,135));
 ERROR HY000: Cannot convert string 'X\xED\x0B\x8E' from binary to utf8mb4
+#
+# Bug #32864958 ITEM_STR_FUNC::PUSH_PACKET_OVERFLOW_WARNING:
+#               ASSERTION `IS_NULLABLE()' FAILED.
+Warnings:
+Warning	3135	'NO_ZERO_DATE', 'NO_ZERO_IN_DATE' and 'ERROR_FOR_DIVISION_BY_ZERO' sql modes should be used with strict mode. They will be merged with strict mode in a future release.
+DO NOT CAST(UTC_TIME AS CHAR(2877246026) CHARACTER SET ujis);
+ERROR 22003: char(n) value is out of range in 'cast_as_char'
+DO REPEAT(LAST_INSERT_ID(''), 4294967295);
+Warnings:
+Warning	1292	Truncated incorrect INTEGER value: ''
+Warning	1301	Result of repeat() was larger than max_allowed_packet (67108864) - truncated
+DO REPEAT(LAST_INSERT_ID(''), 0x96e4ed7e70a7fec7f11572c8980a);
+Warnings:
+Warning	1292	Truncated incorrect BINARY value: 'x'96e4ed7e70a7fec7f11572c8980a''
+Warning	1292	Truncated incorrect BINARY value: 'x'96e4ed7e70a7fec7f11572c8980a''
+Warning	1292	Truncated incorrect INTEGER value: ''
+# Bug#33142010: Failure on complex const argument to string functions
+CREATE VIEW v AS SELECT LPAD('x', 1 NOT IN (0), 1) AS c;
+SHOW CREATE TABLE v;
+View	Create View	character_set_client	collation_connection
+v	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v` AS select lpad('x',(1 <> 0),1) AS `c`	utf8mb4	utf8mb4_0900_ai_ci
+SELECT * FROM v;
+c
+x
+DROP VIEW v;
+CREATE VIEW v AS SELECT RPAD('x', 1 NOT IN (0), 1) AS c;
+SHOW CREATE TABLE v;
+View	Create View	character_set_client	collation_connection
+v	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v` AS select rpad('x',(1 <> 0),1) AS `c`	utf8mb4	utf8mb4_0900_ai_ci
+SELECT * FROM v;
+c
+x
+DROP VIEW v;
+CREATE VIEW v AS SELECT SHA2('x', 1 NOT IN (0)) AS c;
+SHOW CREATE TABLE v;
+View	Create View	character_set_client	collation_connection
+v	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v` AS select sha2('x',(1 <> 0)) AS `c`	utf8mb4	utf8mb4_0900_ai_ci
+SELECT * FROM v;
+c
+NULL
+Warnings:
+Warning	1583	Incorrect parameters in the call to native function 'sha2'
+DROP VIEW v;
+CREATE VIEW v AS SELECT SUBSTR('x', 1 NOT IN (0)) AS c;
+SHOW CREATE TABLE v;
+View	Create View	character_set_client	collation_connection
+v	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v` AS select substr('x',(1 <> 0)) AS `c`	utf8mb4	utf8mb4_0900_ai_ci
+SELECT * FROM v;
+c
+x
+DROP VIEW v;
+CREATE VIEW v AS SELECT SUBSTR('x', 1, 1 NOT IN (0)) AS c;
+SHOW CREATE TABLE v;
+View	Create View	character_set_client	collation_connection
+v	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v` AS select substr('x',1,(1 <> 0)) AS `c`	utf8mb4	utf8mb4_0900_ai_ci
+SELECT * FROM v;
+c
+x
+DROP VIEW v;
+CREATE VIEW v AS SELECT REPEAT('x', 1 NOT IN (0)) AS c;
+SHOW CREATE TABLE v;
+View	Create View	character_set_client	collation_connection
+v	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v` AS select repeat('x',(1 <> 0)) AS `c`	utf8mb4	utf8mb4_0900_ai_ci
+SELECT * FROM v;
+c
+x
+DROP VIEW v;
+CREATE VIEW v AS SELECT SPACE(1 NOT IN (0)) AS c;
+SHOW CREATE TABLE v;
+View	Create View	character_set_client	collation_connection
+v	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v` AS select space((1 <> 0)) AS `c`	utf8mb4	utf8mb4_0900_ai_ci
+SELECT * FROM v;
+c
+ 
+DROP VIEW v;
+CREATE VIEW v AS SELECT LEFT('x', 1 NOT IN (0)) AS c;
+SHOW CREATE TABLE v;
+View	Create View	character_set_client	collation_connection
+v	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v` AS select left('x',(1 <> 0)) AS `c`	utf8mb4	utf8mb4_0900_ai_ci
+SELECT * FROM v;
+c
+x
+DROP VIEW v;
+CREATE VIEW v AS SELECT RIGHT('x', 1 NOT IN (0)) AS c;
+SHOW CREATE TABLE v;
+View	Create View	character_set_client	collation_connection
+v	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v` AS select right('x',(1 <> 0)) AS `c`	utf8mb4	utf8mb4_0900_ai_ci
+SELECT * FROM v;
+c
+x
+DROP VIEW v;
+CREATE TABLE t(s SET('0', '1'));
+CREATE VIEW v AS SELECT FIND_IN_SET(1 NOT IN (0), s) AS c FROM t;
+SHOW CREATE TABLE v;
+View	Create View	character_set_client	collation_connection
+v	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v` AS select find_in_set((1 <> 0),`t`.`s`) AS `c` from `t`	utf8mb4	utf8mb4_0900_ai_ci
+SELECT * FROM v;
+c
+DROP VIEW v;
+DROP TABLE t;
+CREATE VIEW v AS SELECT STR_TO_DATE('2020', 1 NOT IN (0)) AS c;
+SHOW CREATE TABLE v;
+View	Create View	character_set_client	collation_connection
+v	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v` AS select str_to_date('2020',(1 <> 0)) AS `c`	utf8mb4	utf8mb4_0900_ai_ci
+SELECT * FROM v;
+c
+NULL
+Warnings:
+Warning	1411	Incorrect datetime value: '2020' for function str_to_date
+DROP VIEW v;
+#
+# Bug #33180446 SPACE(): Item_str_func::push_packet_overflow_warning:
+#               Assertion `is_nullable()' failed.
+Warnings:
+Warning	3135	'NO_ZERO_DATE', 'NO_ZERO_IN_DATE' and 'ERROR_FOR_DIVISION_BY_ZERO' sql modes should be used with strict mode. They will be merged with strict mode in a future release.
+SELECT space(9223372036854775808);
+space(9223372036854775808)
+NULL
+Warnings:
+Warning	1301	Result of space() was larger than max_allowed_packet (67108864) - truncated
+SELECT length(space(9223372036854775809));
+length(space(9223372036854775809))
+NULL
+Warnings:
+Warning	1301	Result of space() was larger than max_allowed_packet (67108864) - truncated
+CREATE TABLE t(i BIGINT UNSIGNED);
+INSERT INTO t values(9223372036854775808);
+SELECT space(i) FROM t;
+space(i)
+NULL
+Warnings:
+Warning	1301	Result of space() was larger than max_allowed_packet (67108864) - truncated
+DROP TABLE t;
+SET @@collation_connection = 'utf32_bin';
+SELECT space(1073741824);
+space(1073741824)
+NULL
+Warnings:
+Warning	1301	Result of space() was larger than max_allowed_packet (67108864) - truncated
+SET @@collation_connection = default;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/functional_index_debug.result mysql-8.0-8.0.27/mysql-test/r/functional_index_debug.result
--- mysql-8.0-8.0.26/mysql-test/r/functional_index_debug.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/functional_index_debug.result	2021-09-28 11:46:34.000000000 +0000
@@ -46,19 +46,19 @@
   `dbl_with_length` double(4,2) DEFAULT NULL,
   `unsigned_int` int unsigned DEFAULT NULL,
   `geometry_col` point DEFAULT NULL,
-  `0be1882145c73aec7ed86aec997ee2c0` double(22,2) GENERATED ALWAYS AS ((`dbl_with_length` * 2.0)) VIRTUAL,
-  `0bff7277c29f08fcb414d1f41621b86f` decimal(3,0) GENERATED ALWAYS AS (truncate(`decimal_col`,0)) VIRTUAL,
-  `2c22eb88800f17d0db6d0dd3fa970987` double GENERATED ALWAYS AS (st_x(`geometry_col`)) VIRTUAL,
-  `45197ac678c1210c4a64bf22351853e7` varchar(1) CHARACTER SET latin1 GENERATED ALWAYS AS (convert(substr(`str_col`,2,1) using latin1)) VIRTUAL,
-  `4ee8f0f5ed62f4898e0e21c8e2595351` bigint GENERATED ALWAYS AS (json_valid(`json_col`)) VIRTUAL,
-  `5067d63164981f78735a1cbdb19ef208` double GENERATED ALWAYS AS (abs(`dbl_col`)) VIRTUAL,
-  `88ad1ce75f21f5ed3c66937d772979b5` int GENERATED ALWAYS AS (year(`date_col`)) VIRTUAL,
-  `97815b7254f7ac7c263d6d590116c8de` varchar(29) GENERATED ALWAYS AS (addtime(_utf8mb4'01:00:00',`time_with_fractions_col`)) VIRTUAL,
-  `9d4481df7b182f78b99e08a25930c91f` varchar(29) GENERATED ALWAYS AS (addtime(_utf8mb4'01:00:00',`time_col`)) VIRTUAL,
-  `a5848dfab7c8461e1d6bb033aa7afb7e` int unsigned GENERATED ALWAYS AS (abs(`unsigned_int`)) VIRTUAL,
-  `b6c099c314e9ecbf27e3385f0ea88fa3` datetime(6) GENERATED ALWAYS AS ((`datetime_with_fractions_col` - interval 30 day)) VIRTUAL,
-  `bf3e30b3724d85afb72714cc5e9d35a7` double GENERATED ALWAYS AS (round(`dbl_col`,2)) VIRTUAL,
-  `c1c817beeba8f7f70efb7dd56df758b0` datetime GENERATED ALWAYS AS ((`datetime_col` - interval 30 day)) VIRTUAL,
+  `!hidden!idx1!0!0` varchar(1) CHARACTER SET latin1 GENERATED ALWAYS AS (convert(substr(`str_col`,2,1) using latin1)) VIRTUAL,
+  `!hidden!idx10!0!0` double GENERATED ALWAYS AS (round(`dbl_col`,2)) VIRTUAL,
+  `!hidden!idx11!0!0` double(22,2) GENERATED ALWAYS AS ((`dbl_with_length` * 2.0)) VIRTUAL,
+  `!hidden!idx12!0!0` int unsigned GENERATED ALWAYS AS (abs(`unsigned_int`)) VIRTUAL,
+  `!hidden!idx13!0!0` double GENERATED ALWAYS AS (st_x(`geometry_col`)) VIRTUAL,
+  `!hidden!idx2!0!0` double GENERATED ALWAYS AS (abs(`dbl_col`)) VIRTUAL,
+  `!hidden!idx3!0!0` decimal(3,0) GENERATED ALWAYS AS (truncate(`decimal_col`,0)) VIRTUAL,
+  `!hidden!idx4!0!0` int GENERATED ALWAYS AS (year(`date_col`)) VIRTUAL,
+  `!hidden!idx5!0!0` varchar(29) GENERATED ALWAYS AS (addtime(_utf8mb4'01:00:00',`time_col`)) VIRTUAL,
+  `!hidden!idx6!0!0` varchar(29) GENERATED ALWAYS AS (addtime(_utf8mb4'01:00:00',`time_with_fractions_col`)) VIRTUAL,
+  `!hidden!idx7!0!0` datetime GENERATED ALWAYS AS ((`datetime_col` - interval 30 day)) VIRTUAL,
+  `!hidden!idx8!0!0` datetime(6) GENERATED ALWAYS AS ((`datetime_with_fractions_col` - interval 30 day)) VIRTUAL,
+  `!hidden!idx9!0!0` bigint GENERATED ALWAYS AS (json_valid(`json_col`)) VIRTUAL,
   KEY `idx1` ((convert(substr(`str_col`,2,1) using latin1))),
   KEY `idx2` ((abs(`dbl_col`))),
   KEY `idx3` ((truncate(`decimal_col`,0))),
@@ -83,7 +83,7 @@
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `col1` int DEFAULT NULL,
-  `607d81614fbad46c00e1b881fef889f5` bigint GENERATED ALWAYS AS (floor(`col1`)) VIRTUAL,
+  `!hidden!my_index!0!0` bigint GENERATED ALWAYS AS (floor(`col1`)) VIRTUAL,
   KEY `my_index` ((floor(`col1`)))
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 ALTER TABLE t1 RENAME INDEX my_index TO foobar;
@@ -91,7 +91,7 @@
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `col1` int DEFAULT NULL,
-  `1f9c2f0af40893b27d4e43cfbd38d0ac` bigint GENERATED ALWAYS AS (floor(`col1`)) VIRTUAL,
+  `!hidden!foobar!0!0` bigint GENERATED ALWAYS AS (floor(`col1`)) VIRTUAL,
   KEY `foobar` ((floor(`col1`)))
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 SET SESSION debug="-d,show_hidden_columns";
@@ -109,9 +109,9 @@
 t1	CREATE TABLE `t1` (
   `col1` int DEFAULT NULL,
   `col2` int DEFAULT NULL,
-  `1a0b00fb7838a59dd0c459201c53de8b` bigint GENERATED ALWAYS AS ((`col2` + 2)) VIRTUAL,
-  `45197ac678c1210c4a64bf22351853e7` int GENERATED ALWAYS AS (abs(`col1`)) VIRTUAL,
-  `5067d63164981f78735a1cbdb19ef208` bigint GENERATED ALWAYS AS ((`col1` + 1)) VIRTUAL,
+  `!hidden!idx1!0!0` int GENERATED ALWAYS AS (abs(`col1`)) VIRTUAL,
+  `!hidden!idx2!0!0` bigint GENERATED ALWAYS AS ((`col1` + 1)) VIRTUAL,
+  `!hidden!idx2!1!0` bigint GENERATED ALWAYS AS ((`col2` + 2)) VIRTUAL,
   KEY `idx1` ((abs(`col1`))),
   KEY `idx2` (((`col1` + 1)),((`col2` + 2)))
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
@@ -121,7 +121,7 @@
 t1	CREATE TABLE `t1` (
   `col1` int DEFAULT NULL,
   `col2` int DEFAULT NULL,
-  `45197ac678c1210c4a64bf22351853e7` int GENERATED ALWAYS AS (abs(`col1`)) VIRTUAL,
+  `!hidden!idx1!0!0` int GENERATED ALWAYS AS (abs(`col1`)) VIRTUAL,
   KEY `idx1` ((abs(`col1`)))
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 DROP TABLE t1;
@@ -132,18 +132,35 @@
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `j` json DEFAULT NULL,
-  `680963a1f6dcb151c3e713b46b4c3452` bigint unsigned array GENERATED ALWAYS AS (cast(`j` as unsigned array)) VIRTUAL,
+  `!hidden!mv_idx!0!0` bigint unsigned array GENERATED ALWAYS AS (cast(`j` as unsigned array)) VIRTUAL,
   KEY `mv_idx` ((cast(`j` as unsigned array)))
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
-SELECT 680963a1f6dcb151c3e713b46b4c3452 FROM t1 ;
-680963a1f6dcb151c3e713b46b4c3452
-EXPLAIN SELECT 680963a1f6dcb151c3e713b46b4c3452 FROM t1 ;
+SELECT `!hidden!mv_idx!0!0` FROM t1;
+!hidden!mv_idx!0!0
+EXPLAIN SELECT `!hidden!mv_idx!0!0` FROM t1 ;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
 Warnings:
-Note	1003	/* select#1 */ select cast(`j` as unsigned array) AS `680963a1f6dcb151c3e713b46b4c3452` from `test`.`t1`
+Note	1003	/* select#1 */ select cast(`j` as unsigned array) AS `!hidden!mv_idx!0!0` from `test`.`t1`
 SET SESSION debug="-d,show_hidden_columns";
 DROP TABLE t1;
+CREATE TABLE t(
+x INT,
+KEY this_is_a_very_long_index_name_in_fact_it_is_64_characters_long_
+((x+1), (x+2), (x+3))
+);
+SET SESSION debug='+d,show_hidden_columns';
+SHOW CREATE TABLE t;
+Table	Create Table
+t	CREATE TABLE `t` (
+  `x` int DEFAULT NULL,
+  `!hidden!this_is_a_very_long_index_name_in_fact_it_is_64_char!0!0` bigint GENERATED ALWAYS AS ((`x` + 1)) VIRTUAL,
+  `!hidden!this_is_a_very_long_index_name_in_fact_it_is_64_char!1!0` bigint GENERATED ALWAYS AS ((`x` + 2)) VIRTUAL,
+  `!hidden!this_is_a_very_long_index_name_in_fact_it_is_64_char!2!0` bigint GENERATED ALWAYS AS ((`x` + 3)) VIRTUAL,
+  KEY `this_is_a_very_long_index_name_in_fact_it_is_64_characters_long_` (((`x` + 1)),((`x` + 2)),((`x` + 3)))
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+SET SESSION debug='-d,show_hidden_columns';
+DROP TABLE t;
 #
 # Bug#28037195 ASSERTION `FALSE' IN IN
 #              ITEM_FIELD::REPLACE_FIELD_PROCESSOR AT SQL_TABLE.CC:5850
@@ -218,21 +235,17 @@
 CREATE TABLE t1 (
 col1 INT
 , INDEX myKey ((ABS(col1))));
-# Get the expected name of the hidden generated column.
-SELECT MD5(CONCAT("myKey", "0"));
-MD5(CONCAT("myKey", "0"))
-84a85350b439e4a8875061c9b8a13f70
 SET SESSION debug="+d,show_hidden_columns";
 # Column names aren't case sensitive, so this DDL should find the column
 # and give an error saying that the column cannot be removed due to
 # functional index.
-ALTER TABLE t1 DROP COLUMN 84A85350b439e4a8875061c9b8a13f70;
-ERROR HY000: Cannot drop column '84a85350b439e4a8875061c9b8a13f70' because it is used by a functional index. In order to drop the column, you must remove the functional index.
+ALTER TABLE t1 DROP COLUMN `!HIdDEN!MYkEY!0!0`;
+ERROR HY000: Cannot drop column '!hidden!myKey!0!0' because it is used by a functional index. In order to drop the column, you must remove the functional index.
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `col1` int DEFAULT NULL,
-  `84a85350b439e4a8875061c9b8a13f70` int GENERATED ALWAYS AS (abs(`col1`)) VIRTUAL,
+  `!hidden!myKey!0!0` int GENERATED ALWAYS AS (abs(`col1`)) VIRTUAL,
   KEY `myKey` ((abs(`col1`)))
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 # Index names aren't case sensitive, so this DDL should rename the index
@@ -242,7 +255,7 @@
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `col1` int DEFAULT NULL,
-  `ba017fae742f858bd19700513c6b85e5` int GENERATED ALWAYS AS (abs(`col1`)) VIRTUAL,
+  `!hidden!renaMEDkey!0!0` int GENERATED ALWAYS AS (abs(`col1`)) VIRTUAL,
   KEY `renaMEDkey` ((abs(`col1`)))
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 # Index names aren't case sensitive, so this DDL should remove the index
@@ -302,9 +315,9 @@
   `e` enum('a','bbb','cccccc') DEFAULT NULL,
   `s` set('a','bbb','cccccc') DEFAULT NULL,
   `b` bit(5) DEFAULT NULL,
-  `0d1cbc68e8957783288d2b71268047c7` varchar(12) GENERATED ALWAYS AS (nullif(`s`,NULL)) VIRTUAL,
-  `3bb8c14d415110ac3b3c55ce9108ae2d` varchar(6) GENERATED ALWAYS AS (nullif(`e`,NULL)) VIRTUAL,
-  `e0a812eddbaed00becd72bf920eccab8` int unsigned GENERATED ALWAYS AS (nullif(`b`,NULL)) VIRTUAL,
+  `!hidden!functional_index!0!0` varchar(6) GENERATED ALWAYS AS (nullif(`e`,NULL)) VIRTUAL,
+  `!hidden!functional_index_2!0!0` varchar(12) GENERATED ALWAYS AS (nullif(`s`,NULL)) VIRTUAL,
+  `!hidden!functional_index_3!0!0` int unsigned GENERATED ALWAYS AS (nullif(`b`,NULL)) VIRTUAL,
   KEY `functional_index` ((nullif(`e`,NULL))),
   KEY `functional_index_2` ((nullif(`s`,NULL))),
   KEY `functional_index_3` ((nullif(`b`,NULL)))
@@ -329,7 +342,7 @@
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `col1` int DEFAULT NULL,
-  `45197ac678c1210c4a64bf22351853e7` varchar(11) GENERATED ALWAYS AS (soundex(`col1`)) VIRTUAL,
+  `!hidden!idx1!0!0` varchar(11) GENERATED ALWAYS AS (soundex(`col1`)) VIRTUAL,
   KEY `idx1` ((soundex(`col1`)))
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 SET SESSION debug="-d,show_hidden_columns";
@@ -350,7 +363,7 @@
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `col1` int DEFAULT NULL,
-  `2637460955f1f312c3fe5fb148fa23e1` bigint GENERATED ALWAYS AS ((`col1` + 1)) VIRTUAL,
+  `!hidden!functional_index_1!0!0` bigint GENERATED ALWAYS AS ((`col1` + 1)) VIRTUAL,
   KEY `functional_index_1` (((`col1` + 1)))
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 CREATE INDEX functional_index_2 ON t1 ((col1 + 2));
@@ -358,8 +371,8 @@
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `col1` int DEFAULT NULL,
-  `0d1cbc68e8957783288d2b71268047c7` bigint GENERATED ALWAYS AS ((`col1` + 2)) VIRTUAL,
-  `2637460955f1f312c3fe5fb148fa23e1` bigint GENERATED ALWAYS AS ((`col1` + 1)) VIRTUAL,
+  `!hidden!functional_index_1!0!0` bigint GENERATED ALWAYS AS ((`col1` + 1)) VIRTUAL,
+  `!hidden!functional_index_2!0!0` bigint GENERATED ALWAYS AS ((`col1` + 2)) VIRTUAL,
   KEY `functional_index_1` (((`col1` + 1))),
   KEY `functional_index_2` (((`col1` + 2)))
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
@@ -368,9 +381,9 @@
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `col1` int DEFAULT NULL,
-  `0d1cbc68e8957783288d2b71268047c7` bigint GENERATED ALWAYS AS ((`col1` + 2)) VIRTUAL,
-  `2637460955f1f312c3fe5fb148fa23e1` bigint GENERATED ALWAYS AS ((`col1` + 1)) VIRTUAL,
-  `e0a812eddbaed00becd72bf920eccab8` bigint GENERATED ALWAYS AS ((`col1` + 3)) VIRTUAL,
+  `!hidden!functional_index_1!0!0` bigint GENERATED ALWAYS AS ((`col1` + 1)) VIRTUAL,
+  `!hidden!functional_index_2!0!0` bigint GENERATED ALWAYS AS ((`col1` + 2)) VIRTUAL,
+  `!hidden!functional_index_3!0!0` bigint GENERATED ALWAYS AS ((`col1` + 3)) VIRTUAL,
   KEY `functional_index_1` (((`col1` + 1))),
   KEY `functional_index_2` (((`col1` + 2))),
   KEY `functional_index_3` (((`col1` + 3)))
@@ -380,10 +393,10 @@
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `col1` int DEFAULT NULL,
-  `0d1cbc68e8957783288d2b71268047c7` bigint GENERATED ALWAYS AS ((`col1` + 2)) VIRTUAL,
-  `2637460955f1f312c3fe5fb148fa23e1` bigint GENERATED ALWAYS AS ((`col1` + 1)) VIRTUAL,
-  `d751e19906c02ce29a00572cb436f3ff` bigint GENERATED ALWAYS AS ((`col1` + 4)) VIRTUAL,
-  `e0a812eddbaed00becd72bf920eccab8` bigint GENERATED ALWAYS AS ((`col1` + 3)) VIRTUAL,
+  `!hidden!functional_index_1!0!0` bigint GENERATED ALWAYS AS ((`col1` + 1)) VIRTUAL,
+  `!hidden!functional_index_2!0!0` bigint GENERATED ALWAYS AS ((`col1` + 2)) VIRTUAL,
+  `!hidden!functional_index_3!0!0` bigint GENERATED ALWAYS AS ((`col1` + 3)) VIRTUAL,
+  `!hidden!functional_index_4!0!0` bigint GENERATED ALWAYS AS ((`col1` + 4)) VIRTUAL,
   KEY `functional_index_1` (((`col1` + 1))),
   KEY `functional_index_2` (((`col1` + 2))),
   KEY `functional_index_3` (((`col1` + 3))),
@@ -395,10 +408,10 @@
 t1	CREATE TABLE `t1` (
   `col1` int DEFAULT NULL,
   `col2` int DEFAULT NULL,
-  `0d1cbc68e8957783288d2b71268047c7` bigint GENERATED ALWAYS AS ((`col1` + 2)) VIRTUAL,
-  `2637460955f1f312c3fe5fb148fa23e1` bigint GENERATED ALWAYS AS ((`col1` + 1)) VIRTUAL,
-  `d751e19906c02ce29a00572cb436f3ff` bigint GENERATED ALWAYS AS ((`col1` + 4)) VIRTUAL,
-  `e0a812eddbaed00becd72bf920eccab8` bigint GENERATED ALWAYS AS ((`col1` + 3)) VIRTUAL,
+  `!hidden!functional_index_1!0!0` bigint GENERATED ALWAYS AS ((`col1` + 1)) VIRTUAL,
+  `!hidden!functional_index_2!0!0` bigint GENERATED ALWAYS AS ((`col1` + 2)) VIRTUAL,
+  `!hidden!functional_index_3!0!0` bigint GENERATED ALWAYS AS ((`col1` + 3)) VIRTUAL,
+  `!hidden!functional_index_4!0!0` bigint GENERATED ALWAYS AS ((`col1` + 4)) VIRTUAL,
   KEY `functional_index_1` (((`col1` + 1))),
   KEY `functional_index_2` (((`col1` + 2))),
   KEY `functional_index_3` (((`col1` + 3))),
@@ -410,11 +423,11 @@
 t1	CREATE TABLE `t1` (
   `col1` int DEFAULT NULL,
   `col2` int DEFAULT NULL,
-  `0d1cbc68e8957783288d2b71268047c7` bigint GENERATED ALWAYS AS ((`col1` + 2)) VIRTUAL,
-  `2637460955f1f312c3fe5fb148fa23e1` bigint GENERATED ALWAYS AS ((`col1` + 1)) VIRTUAL,
-  `87a3a5599af64f6229889e9ee13e9457` bigint GENERATED ALWAYS AS ((`col1` + `col2`)) VIRTUAL,
-  `d751e19906c02ce29a00572cb436f3ff` bigint GENERATED ALWAYS AS ((`col1` + 4)) VIRTUAL,
-  `e0a812eddbaed00becd72bf920eccab8` bigint GENERATED ALWAYS AS ((`col1` + 3)) VIRTUAL,
+  `!hidden!functional_index_1!0!0` bigint GENERATED ALWAYS AS ((`col1` + 1)) VIRTUAL,
+  `!hidden!functional_index_2!0!0` bigint GENERATED ALWAYS AS ((`col1` + 2)) VIRTUAL,
+  `!hidden!functional_index_3!0!0` bigint GENERATED ALWAYS AS ((`col1` + 3)) VIRTUAL,
+  `!hidden!functional_index_4!0!0` bigint GENERATED ALWAYS AS ((`col1` + 4)) VIRTUAL,
+  `!hidden!functional_index_5!0!0` bigint GENERATED ALWAYS AS ((`col1` + `col2`)) VIRTUAL,
   KEY `functional_index_1` (((`col1` + 1))),
   KEY `functional_index_2` (((`col1` + 2))),
   KEY `functional_index_3` (((`col1` + 3))),
@@ -433,8 +446,8 @@
 t1	CREATE TABLE `t1` (
   `col1` bit(5) DEFAULT NULL,
   `col2` bit(10) DEFAULT NULL,
-  `0d1cbc68e8957783288d2b71268047c7` int unsigned GENERATED ALWAYS AS (nullif(`col2`,NULL)) VIRTUAL,
-  `2637460955f1f312c3fe5fb148fa23e1` int unsigned GENERATED ALWAYS AS (nullif(`col1`,NULL)) VIRTUAL,
+  `!hidden!functional_index_1!0!0` int unsigned GENERATED ALWAYS AS (nullif(`col1`,NULL)) VIRTUAL,
+  `!hidden!functional_index_2!0!0` int unsigned GENERATED ALWAYS AS (nullif(`col2`,NULL)) VIRTUAL,
   KEY `functional_index_1` ((nullif(`col1`,NULL))),
   KEY `functional_index_2` ((nullif(`col2`,NULL)))
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
diff -Nru mysql-8.0-8.0.26/mysql-test/r/functional_index.result mysql-8.0-8.0.27/mysql-test/r/functional_index.result
--- mysql-8.0-8.0.26/mysql-test/r/functional_index.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/functional_index.result	2021-09-28 11:46:34.000000000 +0000
@@ -125,15 +125,18 @@
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment	Visible	Expression
 t1	1	idx1	1	col1	A	0	NULL	NULL	YES	BTREE			YES	NULL
 t1	1	idx1	2	NULL	A	0	NULL	NULL	YES	BTREE			YES	(`col1` + `col2`)
-# Create a funtional index with many functional key parts
+# Create a functional index with many functional key parts. Bug#27168185.
+CREATE INDEX idx2
+ON t1 ((col1 + 1), (col1 + 2), (col1 + 3), (col1 + 4), (col1 + 5));
 # Check that if we try to add a column with the same name as a hidden
 # column, we get an internal error. The column name of the generated
-# column is calculated as MD5(index_name + key_part_number).
-SELECT MD5(CONCAT("idx1", "1"));
-MD5(CONCAT("idx1", "1"))
-56fb28970273a50c6f31dec0fe3b175b
-ALTER TABLE t1 ADD COLUMN `56fb28970273a50c6f31dec0fe3b175b` INT NOT NULL;
-ERROR HY000: Internal error: The column name '56fb28970273a50c6f31dec0fe3b175b' is already in use by a hidden column
+# column is `!hidden!index_name!key_part!counter`.
+ALTER TABLE t1 ADD COLUMN `!hidden!idx1!1!0` INT NOT NULL;
+ERROR HY000: Internal error: The column name '!hidden!idx1!1!0' is already in use by a hidden column
+ALTER TABLE t1 ADD COLUMN `!hidden!idx3!0!0` INT NOT NULL;
+CREATE INDEX idx3 ON t1 ((col1-col2));
+ALTER TABLE t1 ADD COLUMN `!hidden!idx3!0!1` INT NOT NULL;
+ERROR HY000: Internal error: The column name '!hidden!idx3!0!1' is already in use by a hidden column
 DROP TABLE t1;
 # Creating a functional index on already existing columns using
 # ALTER TABLE should work just fine.
@@ -286,12 +289,9 @@
 # Test that doing an UPDATE on a hidden generated column returns "column
 # not found".
 CREATE TABLE t1 (col1 INT, INDEX idx1 ((col1 + col1)));
-# Get the expected name of the hidden generated column.
-SELECT MD5(CONCAT("idx1", "0"));
-MD5(CONCAT("idx1", "0"))
-45197ac678c1210c4a64bf22351853e7
-UPDATE t1 SET 45197ac678c1210c4a64bf22351853e7 = 123;
-ERROR 42S22: Unknown column '45197ac678c1210c4a64bf22351853e7' in 'field list'
+# Update the hidden generated column.
+UPDATE t1 SET `!hidden!idx1!0!0` = 123;
+ERROR 42S22: Unknown column '!hidden!idx1!0!0' in 'field list'
 DROP TABLE t1;
 #
 # Bug#28037245 VIRTUAL COLUMN IS ALLOWED IN THE WHERE CLAUSE FOR SQL
@@ -299,12 +299,8 @@
 #
 CREATE TABLE t3 (c1 INT);
 CREATE INDEX int_func_index ON t3 ((ABS(c1)));
-# Get the expected column name of the functional index
-SELECT MD5(CONCAT('int_func_index', '0'));
-MD5(CONCAT('int_func_index', '0'))
-7cf759b4f03e729c90aa40cc68dd8780
-SELECT * FROM t3 WHERE 7cf759b4f03e729c90aa40cc68dd8780=1;
-ERROR 42S22: Unknown column '7cf759b4f03e729c90aa40cc68dd8780' in 'where clause'
+SELECT * FROM t3 WHERE `!hidden!int_func_index!0!0`=1;
+ERROR 42S22: Unknown column '!hidden!int_func_index!0!0' in 'where clause'
 DROP TABLE t3;
 #
 # Bug#28037375 ALTER TABLE DROP OF A NORMAL COLUMN RAISES ERROR
diff -Nru mysql-8.0-8.0.26/mysql-test/r/func_weight_string.result mysql-8.0-8.0.27/mysql-test/r/func_weight_string.result
--- mysql-8.0-8.0.26/mysql-test/r/func_weight_string.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/func_weight_string.result	2021-09-28 11:46:34.000000000 +0000
@@ -61,16 +61,20 @@
 #
 # BUG#11898467 - SERVER CRASHES ON SELECT HEX(WEIGHT_STRING(STR AS [CHAR|BINARY](N))) IF N IS BIG 
 #
-SELECT HEX(WEIGHT_STRING('ab' AS CHAR(1000000000000000000)));
-HEX(WEIGHT_STRING('ab' AS CHAR(1000000000000000000)))
+SET GLOBAL max_allowed_packet=1024;
+Warnings:
+Warning	1708	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
+SELECT HEX(WEIGHT_STRING('ab' AS CHAR(1000000)));
+HEX(WEIGHT_STRING('ab' AS CHAR(1000000)))
 NULL
 Warnings:
-Warning	1301	Result of weight_string() was larger than max_allowed_packet (67108864) - truncated
-SELECT HEX(WEIGHT_STRING('ab' AS BINARY(1000000000000000000)));
-HEX(WEIGHT_STRING('ab' AS BINARY(1000000000000000000)))
+Warning	1301	Result of weight_string() was larger than max_allowed_packet (1024) - truncated
+SELECT HEX(WEIGHT_STRING('ab' AS BINARY(1000000)));
+HEX(WEIGHT_STRING('ab' AS BINARY(1000000)))
 NULL
 Warnings:
-Warning	1301	Result of cast_as_binary() was larger than max_allowed_packet (67108864) - truncated
+Warning	1301	Result of cast_as_binary() was larger than max_allowed_packet (1024) - truncated
+SET GLOBAL max_allowed_packet=default;
 #
 # BUG#21974321: WEIGHT_STRING RESULT IS WRONG IF USED IN A
 #               VIEW (AS CHAR CLAUSE IS LOST)
diff -Nru mysql-8.0-8.0.26/mysql-test/r/gis-precise.result mysql-8.0-8.0.27/mysql-test/r/gis-precise.result
--- mysql-8.0-8.0.26/mysql-test/r/gis-precise.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/gis-precise.result	2021-09-28 11:46:34.000000000 +0000
@@ -124,7 +124,7 @@
 POLYGON((21.951219512195124 27.4390243902439,26.470588235294116 23.823529411764707,29.28994082840237 26.36094674556213,23.85542168674699 29.819277108433734,21.951219512195124 27.4390243902439))
 select ST_astext(ST_Intersection(ST_GeomFromText('LINESTRING(0 0, 50 45, 40 50, 0 0)'), ST_GeomFromText('LINESTRING(50 5, 55 10, 0 45, 50 5)')));
 ST_astext(ST_Intersection(ST_GeomFromText('LINESTRING(0 0, 50 45, 40 50, 0 0)'), ST_GeomFromText('LINESTRING(50 5, 55 10, 0 45, 50 5)')))
-MULTIPOINT((21.951219512195124 27.4390243902439),(23.85542168674699 29.819277108433734),(26.470588235294116 23.823529411764707),(29.28994082840237 26.36094674556213))
+MULTIPOINT((26.470588235294116 23.823529411764707),(29.28994082840237 26.36094674556213),(23.85542168674699 29.819277108433734),(21.951219512195124 27.4390243902439))
 select ST_astext(ST_Intersection(ST_GeomFromText('LINESTRING(0 0, 50 45, 40 50)'), ST_GeomFromText('LINESTRING(50 5, 55 10, 0 45)')));
 ST_astext(ST_Intersection(ST_GeomFromText('LINESTRING(0 0, 50 45, 40 50)'), ST_GeomFromText('LINESTRING(50 5, 55 10, 0 45)')))
 POINT(29.28994082840237 26.36094674556213)
@@ -136,7 +136,7 @@
 LINESTRING(0 0,46.666666666666664 46.666666666666664)
 select ST_astext(ST_Intersection(ST_GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), ST_GeomFromText('LINESTRING(-10 -10, 200 200, 199 201, -11 -9)')));
 ST_astext(ST_Intersection(ST_GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), ST_GeomFromText('LINESTRING(-10 -10, 200 200, 199 201, -11 -9)')))
-MULTILINESTRING((0 0,46.666666666666664 46.666666666666664),(45.333333333333336 47.333333333333336,8 10))
+GEOMETRYCOLLECTION(LINESTRING(0 0,46.666666666666664 46.666666666666664),LINESTRING(45.333333333333336 47.333333333333336,8 10))
 select ST_astext(ST_UNION(ST_GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), ST_GeomFromText('LINESTRING(-10 -10, 200 200, 199 201, -11 -9)')));
 ST_astext(ST_UNION(ST_GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), ST_GeomFromText('LINESTRING(-10 -10, 200 200, 199 201, -11 -9)')))
 GEOMETRYCOLLECTION(POLYGON((0 0,50 45,40 50,0 0)),LINESTRING(-10 -10,0 0),LINESTRING(46.666666666666664 46.666666666666664,200 200,199 201,45.333333333333336 47.333333333333336),LINESTRING(8 10,-11 -9))
@@ -375,7 +375,7 @@
 GEOMETRYCOLLECTION EMPTY
 select ST_astext(st_symdifference(ST_GeomFromText('multipoint(2 2, 3 3)'), ST_GeomFromText('multipoint(0 0, 4 4)')));
 ST_astext(st_symdifference(ST_GeomFromText('multipoint(2 2, 3 3)'), ST_GeomFromText('multipoint(0 0, 4 4)')))
-MULTIPOINT((0 0),(2 2),(3 3),(4 4))
+MULTIPOINT((2 2),(3 3),(0 0),(4 4))
 select ST_astext(st_symdifference(ST_GeomFromText('multipoint(2 2, 3 3)'), ST_GeomFromText('multipoint(2 2, 3 3)')));
 ST_astext(st_symdifference(ST_GeomFromText('multipoint(2 2, 3 3)'), ST_GeomFromText('multipoint(2 2, 3 3)')))
 GEOMETRYCOLLECTION EMPTY
@@ -685,7 +685,7 @@
 POLYGON((3 1,0 1,0 0,1 0,3 0,3 1))
 select st_astext(st_intersection(ST_GeometryFromText('geometrycollection(polygon((0 0, 1 0, 1 1, 0 1, 0 0)))'), ST_GeometryFromText('geometrycollection(polygon((1 0, 2 0, 2 1, 1 1, 1 0)))')));
 st_astext(st_intersection(ST_GeometryFromText('geometrycollection(polygon((0 0, 1 0, 1 1, 0 1, 0 0)))'), ST_GeometryFromText('geometrycollection(polygon((1 0, 2 0, 2 1, 1 1, 1 0)))')))
-LINESTRING(1 0,1 1)
+LINESTRING(1 1,1 0)
 select st_astext(st_intersection(ST_GeometryFromText('geometrycollection(polygon((0 0, 2 0, 2 1, 0 1, 0 0)))'), ST_GeometryFromText('geometrycollection(polygon((1 0, 3 0, 3 1, 1 1, 1 0)))')));
 st_astext(st_intersection(ST_GeometryFromText('geometrycollection(polygon((0 0, 2 0, 2 1, 0 1, 0 0)))'), ST_GeometryFromText('geometrycollection(polygon((1 0, 3 0, 3 1, 1 1, 1 0)))')))
 POLYGON((1 1,1 0,2 0,2 1,1 1))
@@ -1103,12 +1103,8 @@
 #
 # Invalid geometry in input
 set @centroid_point = ST_CENTROID(ST_UNION(ST_UNION(ST_GEOMFROMTEXT('MULTILINESTRING((-556 966,-721 -210),(-202 390,-954 804,682 504,-394 -254,832 371,907 -369,827 126,-567 -337,-304 -555,-957 -483,-660 792),(-965 -940,814 -804,-477 -909,-128 57,-819 880,761 497,-559 40,-431 427,179 -291,-707 315,137 -781,-416 -371,-5 -156),(-600 -570,-481 -191,991 -361,768 888,-647 566,795 -861,-82 -575,-593 539))'), ST_GEOMFROMTEXT('MULTIPOLYGON(((805 69,249 708,147 455,546 -672,-218 843,458 24,-630 -420,-83 -69, 805 69)),((196 -219,-201 663,-867 521,-910 -315,-749 801,-402 820,-167 -817,-526 -163,744 -988,-588 -370,573 695,-597 513,-246 439, 196 -219)),((32 -903,189 -871,-778 -741,784 340,403 -555,607 -540,-513 -982,700 -124,344 732,714 151,-812 -252,-440 -895,-426 231,-819 -357, 32 -903)),((-395 830,454 -143,788 -279,618 -843,-490 -507,-224 17, -395 830)))')), ST_INTERSECTION(ST_UNION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(-169 -570),MULTIPOINT(384 290,-601 123,408 86,-616 -300,160 -474,-979 -4,-63 -824,-689 -765,-219 802,-54 -93,191 -982,-723 -449),MULTILINESTRING((683 4,864 -634,548 -891,727 -691,-570 32,-334 -438,127 -317,241 -12,-807 947,-987 693,-345 -867,854 -106)),MULTIPOINT(384 290,-601 123,408 86,-616 -300,160 -474,-979 -4,-63 -824,-689 -765,-219 802,-54 -93,191 -982,-723 -449),MULTIPOLYGON(((266 51,851 523,-781 366,-607 -581, 266 51)),((416 -450,-973 880,103 226,-896 -857,-369 761, 416 -450)),((168 171,26 -99,-606 -490,-174 -138,-325 -218,-833 -652,-255 -445,-882 -762,-202 -560, 168 171)),((-423 -216,-531 -190,-147 821,362 441,645 -128,-997 708,134 -426,714 -9,147 842,-887 -870,688 -330,689 17,-314 -262,401 -112,-606 761, -423 -216)),((-582 -373,-360 -84,-727 -171,412 -660,750 -846,-464 718,163 -11,489 -659,586 -324,-741 -198,144 -165,644 -80,930 -487,-504 -205, -582 -373))),MULTIPOLYGON(((266 51,851 523,-781 366,-607 -581, 266 51)),((416 -450,-973 880,103 226,-896 -857,-369 761, 416 -450)),((168 171,26 -99,-606 -490,-174 -138,-325 -218,-833 -652,-255 -445,-882 -762,-202 -560, 168 171)),((-423 -216,-531 -190,-147 821,362 441,645 -128,-997 708,134 -426,714 -9,147 842,-887 -870,688 -330,689 17,-314 -262,401 -112,-606 761, -423 -216)),((-582 -373,-360 -84,-727 -171,412 -660,750 -846,-464 718,163 -11,489 -659,586 -324,-741 -198,144 -165,644 -80,930 -487,-504 -205, -582 -373))),GEOMETRYCOLLECTION(),MULTIPOINT(384 290,-601 123,408 86,-616 -300,160 -474,-979 -4,-63 -824,-689 -765,-219 802,-54 -93,191 -982,-723 -449),MULTILINESTRING((683 4,864 -634,548 -891,727 -691,-570 32,-334 -438,127 -317,241 -12,-807 947,-987 693,-345 -867,854 -106)))'), ST_GEOMFROMTEXT('MULTIPOINT(157 69,-725 -189,-176 -41,676 375,33 -672,-76 47)')), ST_UNION(ST_ENVELOPE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(-896 100,-793 810,243 -525,650 -373,599 170,-554 -890),POINT(945 -828),POINT(945 -828),LINESTRING(-896 100,-793 810,243 -525,650 -373,599 170,-554 -890),POINT(945 -828),MULTIPOINT(-47 307,-768 -425,-3 167,-170 30,-784 721,951 146,407 790,37 850,-466 738),GEOMETRYCOLLECTION(),MULTIPOINT(-47 307,-768 -425,-3 167,-170 30,-784 721,951 146,407 790,37 850,-466 738),MULTIPOLYGON(((104 113,688 423,-859 602,272 978, 104 113)),((981 -394,189 -400,649 -325,-977 371,30 859,590 318,329 -894,-51 262,197 952,-846 -139,-920 399, 981 -394)),((-236 -759,834 757,857 747,437 -146,194 913,316 862,976 -491,-745 933,610 687,-149 -164,-803 -565,451 -275, -236 -759)),((572 96,-160 -607,529 930,-544 -132,458 294, 572 96))))')), ST_CENTROID(ST_GEOMFROMTEXT('POINT(-939 -921)'))))));
-SELECT ST_AsText(@centroid_point) as centroid;
-centroid
-POINT(-90.10262100659752 -77.27906673428264)
-SELECT MBRWITHIN(@centroid_point, ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((541 -927,-414 316,-429 -444,212 260,-125 104,445 563,-713 -975,-976 514),(-830 882,-377 914,-915 919,-535 -23,-508 979),(806 347,-87 220,226 -22,-12 468,707 598,83 951,-592 701,833 964,270 -932,743 -514,231 469,-575 -122,-99 -245,416 465,801 -587))'), ST_GEOMFROMTEXT('LINESTRING(-96 -182,-373 75,697 687,-881 -463,-557 -959,-493 810)'))) as result;
-result
-1
+DO ST_AsText(@centroid_point) as centroid;
+DO MBRWITHIN(@centroid_point, ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((541 -927,-414 316,-429 -444,212 260,-125 104,445 563,-713 -975,-976 514),(-830 882,-377 914,-915 919,-535 -23,-508 979),(806 347,-87 220,226 -22,-12 468,707 598,83 951,-592 701,833 964,270 -932,743 -514,231 469,-575 -122,-99 -245,416 465,801 -587))'), ST_GEOMFROMTEXT('LINESTRING(-96 -182,-373 75,697 687,-881 -463,-557 -959,-493 810)'))) as result;
 # 
 # Bug #19566186  ST_Length RETURNS NON-INF VALUE ON 32BIT PLATFORMS FOR LINESTRING OF INF LENGTH
 #
@@ -1394,12 +1390,8 @@
 #
 # Invalid geometry in input
 set @centroid_point = ST_CENTROID(ST_UNION(ST_UNION(ST_GEOMFROMTEXT('MULTILINESTRING((-556 966,-721 -210),(-202 390,-954 804,682 504,-394 -254,832 371,907 -369,827 126,-567 -337,-304 -555,-957 -483,-660 792),(-965 -940,814 -804,-477 -909,-128 57,-819 880,761 497,-559 40,-431 427,179 -291,-707 315,137 -781,-416 -371,-5 -156),(-600 -570,-481 -191,991 -361,768 888,-647 566,795 -861,-82 -575,-593 539))'), ST_GEOMFROMTEXT('MULTIPOLYGON(((805 69,249 708,147 455,546 -672,-218 843,458 24,-630 -420,-83 -69, 805 69)),((196 -219,-201 663,-867 521,-910 -315,-749 801,-402 820,-167 -817,-526 -163,744 -988,-588 -370,573 695,-597 513,-246 439, 196 -219)),((32 -903,189 -871,-778 -741,784 340,403 -555,607 -540,-513 -982,700 -124,344 732,714 151,-812 -252,-440 -895,-426 231,-819 -357, 32 -903)),((-395 830,454 -143,788 -279,618 -843,-490 -507,-224 17, -395 830)))')), ST_INTERSECTION(ST_UNION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(-169 -570),MULTIPOINT(384 290,-601 123,408 86,-616 -300,160 -474,-979 -4,-63 -824,-689 -765,-219 802,-54 -93,191 -982,-723 -449),MULTILINESTRING((683 4,864 -634,548 -891,727 -691,-570 32,-334 -438,127 -317,241 -12,-807 947,-987 693,-345 -867,854 -106)),MULTIPOINT(384 290,-601 123,408 86,-616 -300,160 -474,-979 -4,-63 -824,-689 -765,-219 802,-54 -93,191 -982,-723 -449),MULTIPOLYGON(((266 51,851 523,-781 366,-607 -581, 266 51)),((416 -450,-973 880,103 226,-896 -857,-369 761, 416 -450)),((168 171,26 -99,-606 -490,-174 -138,-325 -218,-833 -652,-255 -445,-882 -762,-202 -560, 168 171)),((-423 -216,-531 -190,-147 821,362 441,645 -128,-997 708,134 -426,714 -9,147 842,-887 -870,688 -330,689 17,-314 -262,401 -112,-606 761, -423 -216)),((-582 -373,-360 -84,-727 -171,412 -660,750 -846,-464 718,163 -11,489 -659,586 -324,-741 -198,144 -165,644 -80,930 -487,-504 -205, -582 -373))),MULTIPOLYGON(((266 51,851 523,-781 366,-607 -581, 266 51)),((416 -450,-973 880,103 226,-896 -857,-369 761, 416 -450)),((168 171,26 -99,-606 -490,-174 -138,-325 -218,-833 -652,-255 -445,-882 -762,-202 -560, 168 171)),((-423 -216,-531 -190,-147 821,362 441,645 -128,-997 708,134 -426,714 -9,147 842,-887 -870,688 -330,689 17,-314 -262,401 -112,-606 761, -423 -216)),((-582 -373,-360 -84,-727 -171,412 -660,750 -846,-464 718,163 -11,489 -659,586 -324,-741 -198,144 -165,644 -80,930 -487,-504 -205, -582 -373))),GEOMETRYCOLLECTION(),MULTIPOINT(384 290,-601 123,408 86,-616 -300,160 -474,-979 -4,-63 -824,-689 -765,-219 802,-54 -93,191 -982,-723 -449),MULTILINESTRING((683 4,864 -634,548 -891,727 -691,-570 32,-334 -438,127 -317,241 -12,-807 947,-987 693,-345 -867,854 -106)))'), ST_GEOMFROMTEXT('MULTIPOINT(157 69,-725 -189,-176 -41,676 375,33 -672,-76 47)')), ST_UNION(ST_ENVELOPE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(-896 100,-793 810,243 -525,650 -373,599 170,-554 -890),POINT(945 -828),POINT(945 -828),LINESTRING(-896 100,-793 810,243 -525,650 -373,599 170,-554 -890),POINT(945 -828),MULTIPOINT(-47 307,-768 -425,-3 167,-170 30,-784 721,951 146,407 790,37 850,-466 738),GEOMETRYCOLLECTION(),MULTIPOINT(-47 307,-768 -425,-3 167,-170 30,-784 721,951 146,407 790,37 850,-466 738),MULTIPOLYGON(((104 113,688 423,-859 602,272 978, 104 113)),((981 -394,189 -400,649 -325,-977 371,30 859,590 318,329 -894,-51 262,197 952,-846 -139,-920 399, 981 -394)),((-236 -759,834 757,857 747,437 -146,194 913,316 862,976 -491,-745 933,610 687,-149 -164,-803 -565,451 -275, -236 -759)),((572 96,-160 -607,529 930,-544 -132,458 294, 572 96))))')), ST_CENTROID(ST_GEOMFROMTEXT('POINT(-939 -921)'))))));
-SELECT ST_AsText(@centroid_point) as centroid;
-centroid
-POINT(-90.10262100659752 -77.27906673428264)
-SELECT MBRWITHIN(@centroid_point, ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((541 -927,-414 316,-429 -444,212 260,-125 104,445 563,-713 -975,-976 514),(-830 882,-377 914,-915 919,-535 -23,-508 979),(806 347,-87 220,226 -22,-12 468,707 598,83 951,-592 701,833 964,270 -932,743 -514,231 469,-575 -122,-99 -245,416 465,801 -587))'), ST_GEOMFROMTEXT('LINESTRING(-96 -182,-373 75,697 687,-881 -463,-557 -959,-493 810)'))) as result;
-result
-1
+DO ST_AsText(@centroid_point) as centroid;
+DO MBRWITHIN(@centroid_point, ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((541 -927,-414 316,-429 -444,212 260,-125 104,445 563,-713 -975,-976 514),(-830 882,-377 914,-915 919,-535 -23,-508 979),(806 347,-87 220,226 -22,-12 468,707 598,83 951,-592 701,833 964,270 -932,743 -514,231 469,-575 -122,-99 -245,416 465,801 -587))'), ST_GEOMFROMTEXT('LINESTRING(-96 -182,-373 75,697 687,-881 -463,-557 -959,-493 810)'))) as result;
 #
 # Bug #20179082  ST_TOUCHES() RETURNS INCORRECT RESULT WITH GEOMRTRYCOLLECTION GEOMETRY
 #
@@ -2095,32 +2087,32 @@
 st_geomfromtext('polygon((0 5, 1 3, 2 5, 3 2, 6 2, 6 5, 0 5))')))
 as result;
 result
-GEOMETRYCOLLECTION(MULTIPOLYGON(((6 3,2.6666666666666665 3,3 2,6 2,6 3))),POINT(1 3))
+GEOMETRYCOLLECTION(POINT(1 3),POLYGON((6 3,2.6666666666666665 3,3 2,6 2,6 3)))
 select st_astext(st_intersection(
 st_geomfromtext('polygon((0 0, 10 0, 10 3, 0 3, 0 0))'),
 st_geomfromtext('polygon((0 5, 1 3, 4 3, 4 2, 6 2, 6 5, 0 5))')))
 as result;
 result
-GEOMETRYCOLLECTION(MULTIPOLYGON(((6 3,4 3,4 2,6 2,6 3))),LINESTRING(4 3,1 3))
+GEOMETRYCOLLECTION(LINESTRING(4 3,1 3),POLYGON((6 3,4 3,4 2,6 2,6 3)))
 select st_astext(st_intersection(
 st_geomfromtext('polygon((0 0, 10 0, 10 3, 0 3, 0 0))'),
 st_geomfromtext('polygon((0 5, 1 3, 4 3, 4 0, 6 0, 6 3, 5 3, 5 5, 0 5))')))
 as result;
 result
-GEOMETRYCOLLECTION(MULTIPOLYGON(((6 3,4 3,4 0,6 0,6 3))),LINESTRING(4 3,1 3))
+GEOMETRYCOLLECTION(LINESTRING(4 3,1 3),POLYGON((6 3,4 3,4 0,6 0,6 3)))
 select st_astext(st_intersection(
 st_geomfromtext('polygon((0 0, 10 0, 10 3, 0 3, 0 0))'),
 st_geomfromtext('polygon((0 5, 1 3, 2 5, 3 3, 4 3, 4 2, 6 2, 6 5, 0 5))')))
 as result;
 result
-GEOMETRYCOLLECTION(POINT(1 3),LINESTRING(4 3,3 3),MULTIPOLYGON(((6 3,4 3,4 2,6 2,6 3))))
+GEOMETRYCOLLECTION(POINT(1 3),LINESTRING(4 3,3 3),POLYGON((6 3,4 3,4 2,6 2,6 3)))
 select st_astext(st_intersection(
 st_geomfromtext('polygon((0 0, 10 0, 10 3, 0 3, 0 0))'),
 st_geomfromtext('polygon((0 5, 1 3, 2 5, 3 3, 4 3, 4 0,
                           10 0, 10 3, 6 3, 6 5, 0 5))')))
 as result;
 result
-GEOMETRYCOLLECTION(POINT(1 3),LINESTRING(4 3,3 3),MULTIPOLYGON(((10 3,4 3,4 0,10 0,10 3))))
+GEOMETRYCOLLECTION(POINT(1 3),LINESTRING(4 3,3 3),POLYGON((10 3,4 3,4 0,10 0,10 3)))
 #
 # Bug#21198064 GEOMETRY CONSTRUCTION FUNCTIONS ALLOWS INVALID WKT
 #
diff -Nru mysql-8.0-8.0.26/mysql-test/r/grant_alter_user_qa.result mysql-8.0-8.0.27/mysql-test/r/grant_alter_user_qa.result
--- mysql-8.0-8.0.26/mysql-test/r/grant_alter_user_qa.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/grant_alter_user_qa.result	2021-09-28 11:46:34.000000000 +0000
@@ -1167,11 +1167,11 @@
 CREATE USER u1@localhost;
 SHOW CREATE USER u1@localhost;
 CREATE USER for u1@localhost
-CREATE USER 'u1'@'localhost' IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u1`@`localhost` IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u2@localhost IDENTIFIED BY 'auth_string';
 SHOW CREATE USER u2@localhost;
 CREATE USER for u2@localhost
-CREATE USER 'u2'@'localhost' IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u2`@`localhost` IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 # DDL output for SHOW CREATE USER u2@localhost and recreating user
 DROP USER u2@localhost;
 CREATE USER 'u2'@'localhost' IDENTIFIED WITH 'mysql_native_password'
@@ -1184,45 +1184,45 @@
 CREATE USER u3@localhost IDENTIFIED WITH 'sha256_password';
 SHOW CREATE USER u3@localhost;
 CREATE USER for u3@localhost
-CREATE USER 'u3'@'localhost' IDENTIFIED WITH 'sha256_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u3`@`localhost` IDENTIFIED WITH 'sha256_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 ALTER USER u3@localhost IDENTIFIED BY 'auth_string';
 SHOW CREATE USER u3@localhost;
 CREATE USER for u3@localhost
-CREATE USER 'u3'@'localhost' IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u3`@`localhost` IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u4@localhost IDENTIFIED WITH 'sha256_password' BY 'auth_string';
 SHOW CREATE USER u4@localhost;
 CREATE USER for u4@localhost
-CREATE USER 'u4'@'localhost' IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u4`@`localhost` IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER user1@localhost IDENTIFIED WITH 'sha256_password' BY 'auth_string';
 SHOW CREATE USER user1@localhost;
 CREATE USER for user1@localhost
-CREATE USER 'user1'@'localhost' IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `user1`@`localhost` IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 
 CREATE USER user2@localhost IDENTIFIED WITH 'mysql_native_password' BY 'auth_string';
 SHOW CREATE USER user2@localhost;
 CREATE USER for user2@localhost
-CREATE USER 'user2'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `user2`@`localhost` IDENTIFIED WITH 'mysql_native_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 
 CREATE USER u5@localhost REQUIRE SSL;
 SHOW CREATE USER u5@localhost;
 CREATE USER for u5@localhost
-CREATE USER 'u5'@'localhost' IDENTIFIED WITH 'caching_sha2_password' REQUIRE SSL PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u5`@`localhost` IDENTIFIED WITH 'caching_sha2_password' REQUIRE SSL PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 ALTER USER u5@localhost REQUIRE X509;
 # SHOW CREATE USER after ALTER user attributes
 SHOW CREATE USER u5@localhost;
 CREATE USER for u5@localhost
-CREATE USER 'u5'@'localhost' IDENTIFIED WITH 'caching_sha2_password' REQUIRE X509 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u5`@`localhost` IDENTIFIED WITH 'caching_sha2_password' REQUIRE X509 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u6@localhost IDENTIFIED BY 'auth_string'
                          REQUIRE X509 PASSWORD EXPIRE INTERVAL 5 DAY;
 SHOW CREATE USER u6@localhost;
 CREATE USER for u6@localhost
-CREATE USER 'u6'@'localhost' IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>' REQUIRE X509 PASSWORD EXPIRE INTERVAL 5 DAY ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u6`@`localhost` IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>' REQUIRE X509 PASSWORD EXPIRE INTERVAL 5 DAY ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 ALTER USER u6@localhost IDENTIFIED BY 'auth_string'
                         REQUIRE X509 PASSWORD EXPIRE INTERVAL 19 DAY;
 # SHOW CREATE USER after ALTER user attributes
 SHOW CREATE USER u6@localhost;
 CREATE USER for u6@localhost
-CREATE USER 'u6'@'localhost' IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>' REQUIRE X509 PASSWORD EXPIRE INTERVAL 19 DAY ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u6`@`localhost` IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>' REQUIRE X509 PASSWORD EXPIRE INTERVAL 19 DAY ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 # Recreating user from SHOW CREATE output
 DROP USER u6@localhost;
 CREATE USER 'u6'@'localhost' IDENTIFIED WITH 'mysql_native_password'
@@ -1232,23 +1232,23 @@
                          REQUIRE CIPHER 'cipher';
 SHOW CREATE USER u7@localhost;
 CREATE USER for u7@localhost
-CREATE USER 'u7'@'localhost' IDENTIFIED WITH 'sha256_password' REQUIRE CIPHER 'cipher' PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u7`@`localhost` IDENTIFIED WITH 'sha256_password' REQUIRE CIPHER 'cipher' PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u8@localhost IDENTIFIED WITH 'sha256_password' BY 'auth_string'
                          REQUIRE ISSUER 'issuer';
 SHOW CREATE USER u8@localhost;
 CREATE USER for u8@localhost
-CREATE USER 'u8'@'localhost' IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE ISSUER 'issuer' PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u8`@`localhost` IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE ISSUER 'issuer' PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u9@localhost REQUIRE SUBJECT 'sub';
 SHOW CREATE USER u9@localhost;
 CREATE USER for u9@localhost
-CREATE USER 'u9'@'localhost' IDENTIFIED WITH 'caching_sha2_password' REQUIRE SUBJECT 'sub' PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u9`@`localhost` IDENTIFIED WITH 'caching_sha2_password' REQUIRE SUBJECT 'sub' PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u10@localhost IDENTIFIED WITH 'sha256_password' BY 'auth_string'
             REQUIRE CIPHER "DHE-RSA-AES256-SHA" AND
 SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client"
             ISSUER "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA";
 SHOW CREATE USER u10@localhost;
 CREATE USER for u10@localhost
-CREATE USER 'u10'@'localhost' IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client' ISSUER '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA' CIPHER 'DHE-RSA-AES256-SHA' PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u10`@`localhost` IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client' ISSUER '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA' CIPHER 'DHE-RSA-AES256-SHA' PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 ALTER USER u10@localhost IDENTIFIED WITH 'sha256_password' BY 'auth_string'
            REQUIRE CIPHER "DHE-RSA-AES256-SHA" AND
 SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client"
@@ -1259,33 +1259,33 @@
 # SHOW CREATE USER after ALTER user attributes
 SHOW CREATE USER u10@localhost;
 CREATE USER for u10@localhost
-CREATE USER 'u10'@'localhost' IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client' ISSUER '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA' CIPHER 'DHE-RSA-AES256-SHA' WITH MAX_QUERIES_PER_HOUR 60 MAX_UPDATES_PER_HOUR 100 MAX_CONNECTIONS_PER_HOUR 1000 MAX_USER_CONNECTIONS 20 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u10`@`localhost` IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client' ISSUER '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA' CIPHER 'DHE-RSA-AES256-SHA' WITH MAX_QUERIES_PER_HOUR 60 MAX_UPDATES_PER_HOUR 100 MAX_CONNECTIONS_PER_HOUR 1000 MAX_USER_CONNECTIONS 20 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u11@localhost WITH MAX_QUERIES_PER_HOUR 2;
 SHOW CREATE USER u11@localhost;
 CREATE USER for u11@localhost
-CREATE USER 'u11'@'localhost' IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u11`@`localhost` IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u12@localhost IDENTIFIED BY 'auth_string'
                           WITH MAX_QUERIES_PER_HOUR 2;
 SHOW CREATE USER u12@localhost;
 CREATE USER for u12@localhost
-CREATE USER 'u12'@'localhost' IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u12`@`localhost` IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u13@localhost IDENTIFIED WITH 'sha256_password'
                           WITH MAX_CONNECTIONS_PER_HOUR 2;
 SHOW CREATE USER u13@localhost;
 CREATE USER for u13@localhost
-CREATE USER 'u13'@'localhost' IDENTIFIED WITH 'sha256_password' REQUIRE NONE WITH MAX_CONNECTIONS_PER_HOUR 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u13`@`localhost` IDENTIFIED WITH 'sha256_password' REQUIRE NONE WITH MAX_CONNECTIONS_PER_HOUR 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u14@localhost IDENTIFIED WITH 'sha256_password' BY 'auth_string'
                           WITH MAX_USER_CONNECTIONS 2;
 SHOW CREATE USER u14@localhost;
 CREATE USER for u14@localhost
-CREATE USER 'u14'@'localhost' IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE NONE WITH MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u14`@`localhost` IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE NONE WITH MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u15@localhost IDENTIFIED WITH 'sha256_password' BY 'auth_string'
             REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client'
             ISSUER "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA"
             CIPHER 'cipher' WITH MAX_QUERIES_PER_HOUR 2 MAX_USER_CONNECTIONS 2;
 SHOW CREATE USER u15@localhost;
 CREATE USER for u15@localhost
-CREATE USER 'u15'@'localhost' IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client' ISSUER '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA' CIPHER 'cipher' WITH MAX_QUERIES_PER_HOUR 2 MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u15`@`localhost` IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client' ISSUER '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA' CIPHER 'cipher' WITH MAX_QUERIES_PER_HOUR 2 MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 ALTER USER u15@localhost IDENTIFIED WITH 'mysql_native_password' BY 'auth_string'
                          WITH MAX_CONNECTIONS_PER_HOUR 1000
 MAX_USER_CONNECTIONS 20 MAX_QUERIES_PER_HOUR 60
@@ -1293,7 +1293,7 @@
 # SHOW CREATE USER after ALTER user attributes
 SHOW CREATE USER u15@localhost;
 CREATE USER for u15@localhost
-CREATE USER 'u15'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '<non-deterministic-password-hash>' REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client' ISSUER '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA' CIPHER 'cipher' WITH MAX_QUERIES_PER_HOUR 60 MAX_UPDATES_PER_HOUR 100 MAX_CONNECTIONS_PER_HOUR 1000 MAX_USER_CONNECTIONS 20 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u15`@`localhost` IDENTIFIED WITH 'mysql_native_password' AS '<non-deterministic-password-hash>' REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client' ISSUER '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA' CIPHER 'cipher' WITH MAX_QUERIES_PER_HOUR 60 MAX_UPDATES_PER_HOUR 100 MAX_CONNECTIONS_PER_HOUR 1000 MAX_USER_CONNECTIONS 20 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 # Recreating user from SHOW CREATE output
 DROP USER u15@localhost;
 CREATE USER 'u15'@'localhost' IDENTIFIED WITH 'mysql_native_password'
@@ -1606,6 +1606,7 @@
 SET GLOBAL general_log_file=  @old_general_log_file;
 SET GLOBAL general_log=       @old_general_log;
 SET GLOBAL log_output=        @old_log_output;
+TRUNCATE TABLE mysql.general_log;
 
 Bug #20602525 ALTER USER DOES NOT VERIFY AUTH PLUGIN
 
@@ -1669,7 +1670,7 @@
 user1@localhost	user1@localhost
 SHOW CREATE USER user1@localhost;
 CREATE USER for user1@localhost
-CREATE USER 'user1'@'localhost' IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `user1`@`localhost` IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 SHOW CREATE USER user1@47.9.9.9;
 ERROR 42000: Access denied for user 'user1'@'localhost' to database 'mysql'
 SHOW CREATE USER user2;
@@ -1683,13 +1684,13 @@
 user1@localhost	user1@localhost
 SHOW CREATE USER user1@localhost;
 CREATE USER for user1@localhost
-CREATE USER 'user1'@'localhost' IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `user1`@`localhost` IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 SHOW CREATE USER user1@47.9.9.9;
 CREATE USER for user1@47.9.9.9
-CREATE USER 'user1'@'47.9.9.9' IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `user1`@`47.9.9.9` IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 SHOW CREATE USER user2;
 CREATE USER for user2@%
-CREATE USER 'user2'@'%' IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `user2`@`%` IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 SHOW CREATE USER invalid_user;
 ERROR HY000: Operation SHOW CREATE USER failed for 'invalid_user'@'%'
 # case3 with all global privileges except SELECT
@@ -1700,13 +1701,13 @@
 SHOW GRANTS FOR user1@localhost;
 Grants for user1@localhost
 GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `user1`@`localhost`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `user1`@`localhost`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `user1`@`localhost`
 SELECT USER(), CURRENT_USER();
 USER()	CURRENT_USER()
 user1@localhost	user1@localhost
 SHOW CREATE USER user1@localhost;
 CREATE USER for user1@localhost
-CREATE USER 'user1'@'localhost' IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `user1`@`localhost` IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 SHOW CREATE USER user1@47.9.9.9;
 ERROR 42000: Access denied for user 'user1'@'localhost' to database 'mysql'
 # case4 with irrelevant privilege on mysql db
@@ -1724,7 +1725,7 @@
 user1@localhost	user1@localhost
 SHOW CREATE USER user1@localhost;
 CREATE USER for user1@localhost
-CREATE USER 'user1'@'localhost' IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `user1`@`localhost` IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 SHOW CREATE USER user1@47.9.9.9;
 ERROR 42000: Access denied for user 'user1'@'localhost' to database 'mysql'
 SHOW CREATE USER user2;
@@ -1743,6 +1744,6 @@
 ERROR 42000: Access denied for user 'bug20625566_dest'@'localhost' to database 'mysql'
 SHOW CREATE USER bug20625566_dest@localhost;
 CREATE USER for bug20625566_dest@localhost
-CREATE USER 'bug20625566_dest'@'localhost' IDENTIFIED WITH 'caching_sha2_password' AS <secret> REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `bug20625566_dest`@`localhost` IDENTIFIED WITH 'caching_sha2_password' AS <secret> REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 DROP USER user1@localhost, user1@47.9.9.9, user2,
 bug20625566_user@localhost, bug20625566_dest@localhost;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/grant_alter_user.result mysql-8.0-8.0.27/mysql-test/r/grant_alter_user.result
--- mysql-8.0-8.0.26/mysql-test/r/grant_alter_user.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/grant_alter_user.result	2021-09-28 11:46:34.000000000 +0000
@@ -756,169 +756,169 @@
 CREATE USER u1@localhost;
 SHOW CREATE USER u1@localhost;
 CREATE USER for u1@localhost
-CREATE USER 'u1'@'localhost' IDENTIFIED WITH '<default_authentication_plugin>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u1`@`localhost` IDENTIFIED WITH '<default_authentication_plugin>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 ALTER USER u1@localhost IDENTIFIED BY 'auth_string';
 SHOW CREATE USER u1@localhost;
 CREATE USER for u1@localhost
-CREATE USER 'u1'@'localhost' IDENTIFIED WITH '<default_authentication_plugin>' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u1`@`localhost` IDENTIFIED WITH '<default_authentication_plugin>' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u2@localhost IDENTIFIED BY 'auth_string';
 SHOW CREATE USER u2@localhost;
 CREATE USER for u2@localhost
-CREATE USER 'u2'@'localhost' IDENTIFIED WITH '<default_authentication_plugin>' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u2`@`localhost` IDENTIFIED WITH '<default_authentication_plugin>' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 ALTER USER u2@localhost IDENTIFIED WITH 'sha256_password';
 SHOW CREATE USER u2@localhost;
 CREATE USER for u2@localhost
-CREATE USER 'u2'@'localhost' IDENTIFIED WITH 'sha256_password' REQUIRE NONE PASSWORD EXPIRE ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u2`@`localhost` IDENTIFIED WITH 'sha256_password' REQUIRE NONE PASSWORD EXPIRE ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u3@localhost IDENTIFIED WITH 'sha256_password';
 SHOW CREATE USER u3@localhost;
 CREATE USER for u3@localhost
-CREATE USER 'u3'@'localhost' IDENTIFIED WITH 'sha256_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u3`@`localhost` IDENTIFIED WITH 'sha256_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 ALTER USER u3@localhost PASSWORD EXPIRE NEVER;
 SHOW CREATE USER u3@localhost;
 CREATE USER for u3@localhost
-CREATE USER 'u3'@'localhost' IDENTIFIED WITH 'sha256_password' REQUIRE NONE PASSWORD EXPIRE NEVER ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u3`@`localhost` IDENTIFIED WITH 'sha256_password' REQUIRE NONE PASSWORD EXPIRE NEVER ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u4@localhost IDENTIFIED WITH 'sha256_password' BY 'auth_string';
 SHOW CREATE USER u4@localhost;
 CREATE USER for u4@localhost
-CREATE USER 'u4'@'localhost' IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u4`@`localhost` IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 ALTER USER u4@localhost PASSWORD EXPIRE INTERVAL 365 DAY;
 SHOW CREATE USER u4@localhost;
 CREATE USER for u4@localhost
-CREATE USER 'u4'@'localhost' IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE INTERVAL 365 DAY ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u4`@`localhost` IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE INTERVAL 365 DAY ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u5@localhost REQUIRE SSL;
 SHOW CREATE USER u5@localhost;
 CREATE USER for u5@localhost
-CREATE USER 'u5'@'localhost' IDENTIFIED WITH '<default_authentication_plugin>' REQUIRE SSL PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u5`@`localhost` IDENTIFIED WITH '<default_authentication_plugin>' REQUIRE SSL PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 ALTER USER u5@localhost REQUIRE CIPHER "DHE-RSA-AES256-SHA";
 SHOW CREATE USER u5@localhost;
 CREATE USER for u5@localhost
-CREATE USER 'u5'@'localhost' IDENTIFIED WITH '<default_authentication_plugin>' REQUIRE CIPHER 'DHE-RSA-AES256-SHA' PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u5`@`localhost` IDENTIFIED WITH '<default_authentication_plugin>' REQUIRE CIPHER 'DHE-RSA-AES256-SHA' PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u6@localhost IDENTIFIED BY 'auth_string' REQUIRE X509;
 SHOW CREATE USER u6@localhost;
 CREATE USER for u6@localhost
-CREATE USER 'u6'@'localhost' IDENTIFIED WITH '<default_authentication_plugin>' AS '<non-deterministic-password-hash>' REQUIRE X509 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u6`@`localhost` IDENTIFIED WITH '<default_authentication_plugin>' AS '<non-deterministic-password-hash>' REQUIRE X509 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 ALTER USER u6@localhost REQUIRE CIPHER "DHE-RSA-AES256-SHA" WITH MAX_QUERIES_PER_HOUR 2;
 SHOW CREATE USER u6@localhost;
 CREATE USER for u6@localhost
-CREATE USER 'u6'@'localhost' IDENTIFIED WITH '<default_authentication_plugin>' AS '<non-deterministic-password-hash>' REQUIRE CIPHER 'DHE-RSA-AES256-SHA' WITH MAX_QUERIES_PER_HOUR 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u6`@`localhost` IDENTIFIED WITH '<default_authentication_plugin>' AS '<non-deterministic-password-hash>' REQUIRE CIPHER 'DHE-RSA-AES256-SHA' WITH MAX_QUERIES_PER_HOUR 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u7@localhost IDENTIFIED WITH 'sha256_password'
             REQUIRE CIPHER 'DHE-RSA-AES256-SHA';
 SHOW CREATE USER u7@localhost;
 CREATE USER for u7@localhost
-CREATE USER 'u7'@'localhost' IDENTIFIED WITH 'sha256_password' REQUIRE CIPHER 'DHE-RSA-AES256-SHA' PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u7`@`localhost` IDENTIFIED WITH 'sha256_password' REQUIRE CIPHER 'DHE-RSA-AES256-SHA' PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 ALTER USER u7@localhost REQUIRE NONE WITH MAX_USER_CONNECTIONS 12;
 SHOW CREATE USER u7@localhost;
 CREATE USER for u7@localhost
-CREATE USER 'u7'@'localhost' IDENTIFIED WITH 'sha256_password' REQUIRE NONE WITH MAX_USER_CONNECTIONS 12 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u7`@`localhost` IDENTIFIED WITH 'sha256_password' REQUIRE NONE WITH MAX_USER_CONNECTIONS 12 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u8@localhost IDENTIFIED WITH 'sha256_password' BY 'auth_string'
             REQUIRE ISSUER 'issuer';
 SHOW CREATE USER u8@localhost;
 CREATE USER for u8@localhost
-CREATE USER 'u8'@'localhost' IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u8`@`localhost` IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 ALTER USER u8@localhost IDENTIFIED WITH 'mysql_native_password' BY 'auth_string';
 SHOW CREATE USER u8@localhost;
 CREATE USER for u8@localhost
-CREATE USER 'u8'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF' REQUIRE ISSUER 'issuer' PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u8`@`localhost` IDENTIFIED WITH 'mysql_native_password' AS '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF' REQUIRE ISSUER 'issuer' PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u9@localhost REQUIRE SUBJECT 'sub';
 SHOW CREATE USER u9@localhost;
 CREATE USER for u9@localhost
-CREATE USER 'u9'@'localhost' IDENTIFIED WITH '<default_authentication_plugin>' REQUIRE SUBJECT 'sub' PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u9`@`localhost` IDENTIFIED WITH '<default_authentication_plugin>' REQUIRE SUBJECT 'sub' PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 ALTER USER u9@localhost;
 SHOW CREATE USER u9@localhost;
 CREATE USER for u9@localhost
-CREATE USER 'u9'@'localhost' IDENTIFIED WITH '<default_authentication_plugin>' REQUIRE SUBJECT 'sub' PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u9`@`localhost` IDENTIFIED WITH '<default_authentication_plugin>' REQUIRE SUBJECT 'sub' PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u10@localhost IDENTIFIED WITH 'sha256_password' BY 'auth_string'
             REQUIRE CIPHER "DHE-RSA-AES256-SHA" AND
 SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB"
             ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB";
 SHOW CREATE USER u10@localhost;
 CREATE USER for u10@localhost
-CREATE USER 'u10'@'localhost' IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u10`@`localhost` IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 ALTER USER u10@localhost PASSWORD EXPIRE NEVER;
 SHOW CREATE USER u10@localhost;
 CREATE USER for u10@localhost
-CREATE USER 'u10'@'localhost' IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' PASSWORD EXPIRE NEVER ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u10`@`localhost` IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' PASSWORD EXPIRE NEVER ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u11@localhost WITH MAX_QUERIES_PER_HOUR 2;
 SHOW CREATE USER u11@localhost;
 CREATE USER for u11@localhost
-CREATE USER 'u11'@'localhost' IDENTIFIED WITH '<default_authentication_plugin>' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u11`@`localhost` IDENTIFIED WITH '<default_authentication_plugin>' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 ALTER USER u11@localhost WITH MAX_QUERIES_PER_HOUR 10;
 SHOW CREATE USER u11@localhost;
 CREATE USER for u11@localhost
-CREATE USER 'u11'@'localhost' IDENTIFIED WITH '<default_authentication_plugin>' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 10 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u11`@`localhost` IDENTIFIED WITH '<default_authentication_plugin>' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 10 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u12@localhost IDENTIFIED BY 'auth_string'  WITH MAX_QUERIES_PER_HOUR 2;
 SHOW CREATE USER u12@localhost;
 CREATE USER for u12@localhost
-CREATE USER 'u12'@'localhost' IDENTIFIED WITH '<default_authentication_plugin>' AS '<non-deterministic-password-hash>' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u12`@`localhost` IDENTIFIED WITH '<default_authentication_plugin>' AS '<non-deterministic-password-hash>' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 ALTER USER u12@localhost REQUIRE SUBJECT '/C=SE/ST=Uppsala/O=MySQL AB' WITH MAX_QUERIES_PER_HOUR 10;
 SHOW CREATE USER u12@localhost;
 CREATE USER for u12@localhost
-CREATE USER 'u12'@'localhost' IDENTIFIED WITH '<default_authentication_plugin>' AS '<non-deterministic-password-hash>' REQUIRE SUBJECT '/C=SE/ST=Uppsala/O=MySQL AB' WITH MAX_QUERIES_PER_HOUR 10 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u12`@`localhost` IDENTIFIED WITH '<default_authentication_plugin>' AS '<non-deterministic-password-hash>' REQUIRE SUBJECT '/C=SE/ST=Uppsala/O=MySQL AB' WITH MAX_QUERIES_PER_HOUR 10 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u13@localhost IDENTIFIED WITH 'sha256_password'
             WITH MAX_CONNECTIONS_PER_HOUR 2;
 SHOW CREATE USER u13@localhost;
 CREATE USER for u13@localhost
-CREATE USER 'u13'@'localhost' IDENTIFIED WITH 'sha256_password' REQUIRE NONE WITH MAX_CONNECTIONS_PER_HOUR 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u13`@`localhost` IDENTIFIED WITH 'sha256_password' REQUIRE NONE WITH MAX_CONNECTIONS_PER_HOUR 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 ALTER USER u13@localhost REQUIRE SUBJECT '/C=SE/ST=Uppsala/O=MySQL AB' WITH MAX_QUERIES_PER_HOUR 10;
 SHOW CREATE USER u13@localhost;
 CREATE USER for u13@localhost
-CREATE USER 'u13'@'localhost' IDENTIFIED WITH 'sha256_password' REQUIRE SUBJECT '/C=SE/ST=Uppsala/O=MySQL AB' WITH MAX_QUERIES_PER_HOUR 10 MAX_CONNECTIONS_PER_HOUR 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u13`@`localhost` IDENTIFIED WITH 'sha256_password' REQUIRE SUBJECT '/C=SE/ST=Uppsala/O=MySQL AB' WITH MAX_QUERIES_PER_HOUR 10 MAX_CONNECTIONS_PER_HOUR 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u14@localhost IDENTIFIED WITH 'sha256_password' BY 'auth_string'
             WITH MAX_USER_CONNECTIONS 2;
 SHOW CREATE USER u14@localhost;
 CREATE USER for u14@localhost
-CREATE USER 'u14'@'localhost' IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE NONE WITH MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u14`@`localhost` IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE NONE WITH MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 ALTER USER u14@localhost REQUIRE SUBJECT '/C=SE/ST=Uppsala/O=MySQL AB' WITH MAX_QUERIES_PER_HOUR 10
 PASSWORD EXPIRE;
 SHOW CREATE USER u14@localhost;
 CREATE USER for u14@localhost
-CREATE USER 'u14'@'localhost' IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE SUBJECT '/C=SE/ST=Uppsala/O=MySQL AB' WITH MAX_QUERIES_PER_HOUR 10 MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u14`@`localhost` IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE SUBJECT '/C=SE/ST=Uppsala/O=MySQL AB' WITH MAX_QUERIES_PER_HOUR 10 MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u15@localhost IDENTIFIED WITH 'sha256_password' BY 'auth_string'
             REQUIRE SUBJECT '/C=SE/ST=Uppsala/O=MySQL AB' ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB"
             CIPHER 'DHE-RSA-AES256-SHA' WITH MAX_QUERIES_PER_HOUR 2 MAX_USER_CONNECTIONS 2;
 SHOW CREATE USER u15@localhost;
 CREATE USER for u15@localhost
-CREATE USER 'u15'@'localhost' IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE SUBJECT '/C=SE/ST=Uppsala/O=MySQL AB' ISSUER '/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB' CIPHER 'DHE-RSA-AES256-SHA' WITH MAX_QUERIES_PER_HOUR 2 MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u15`@`localhost` IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE SUBJECT '/C=SE/ST=Uppsala/O=MySQL AB' ISSUER '/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB' CIPHER 'DHE-RSA-AES256-SHA' WITH MAX_QUERIES_PER_HOUR 2 MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 ALTER USER u15@localhost REQUIRE X509 PASSWORD EXPIRE INTERVAL 365 DAY;
 SHOW CREATE USER u15@localhost;
 CREATE USER for u15@localhost
-CREATE USER 'u15'@'localhost' IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE X509 WITH MAX_QUERIES_PER_HOUR 2 MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE INTERVAL 365 DAY ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u15`@`localhost` IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE X509 WITH MAX_QUERIES_PER_HOUR 2 MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE INTERVAL 365 DAY ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u16@localhost IDENTIFIED BY 'auth_string' PASSWORD EXPIRE;
 SHOW CREATE USER u16@localhost;
 CREATE USER for u16@localhost
-CREATE USER 'u16'@'localhost' IDENTIFIED WITH '<default_authentication_plugin>' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u16`@`localhost` IDENTIFIED WITH '<default_authentication_plugin>' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 ALTER USER u16@localhost REQUIRE X509 PASSWORD EXPIRE INTERVAL 365 DAY;
 SHOW CREATE USER u16@localhost;
 CREATE USER for u16@localhost
-CREATE USER 'u16'@'localhost' IDENTIFIED WITH '<default_authentication_plugin>' AS '<non-deterministic-password-hash>' REQUIRE X509 PASSWORD EXPIRE ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u16`@`localhost` IDENTIFIED WITH '<default_authentication_plugin>' AS '<non-deterministic-password-hash>' REQUIRE X509 PASSWORD EXPIRE ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u17@localhost WITH MAX_QUERIES_PER_HOUR 200
 MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE NEVER;
 SHOW CREATE USER u17@localhost;
 CREATE USER for u17@localhost
-CREATE USER 'u17'@'localhost' IDENTIFIED WITH '<default_authentication_plugin>' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 200 MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE NEVER ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u17`@`localhost` IDENTIFIED WITH '<default_authentication_plugin>' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 200 MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE NEVER ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 ALTER USER u17@localhost REQUIRE X509 PASSWORD EXPIRE INTERVAL 365 DAY;
 SHOW CREATE USER u17@localhost;
 CREATE USER for u17@localhost
-CREATE USER 'u17'@'localhost' IDENTIFIED WITH '<default_authentication_plugin>' REQUIRE X509 WITH MAX_QUERIES_PER_HOUR 200 MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE INTERVAL 365 DAY ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u17`@`localhost` IDENTIFIED WITH '<default_authentication_plugin>' REQUIRE X509 WITH MAX_QUERIES_PER_HOUR 200 MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE INTERVAL 365 DAY ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u18@localhost IDENTIFIED WITH 'sha256_password' PASSWORD EXPIRE INTERVAL 365 DAY;
 SHOW CREATE USER u18@localhost;
 CREATE USER for u18@localhost
-CREATE USER 'u18'@'localhost' IDENTIFIED WITH 'sha256_password' REQUIRE NONE PASSWORD EXPIRE INTERVAL 365 DAY ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u18`@`localhost` IDENTIFIED WITH 'sha256_password' REQUIRE NONE PASSWORD EXPIRE INTERVAL 365 DAY ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 ALTER USER u18@localhost PASSWORD EXPIRE NEVER;
 SHOW CREATE USER u18@localhost;
 CREATE USER for u18@localhost
-CREATE USER 'u18'@'localhost' IDENTIFIED WITH 'sha256_password' REQUIRE NONE PASSWORD EXPIRE NEVER ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u18`@`localhost` IDENTIFIED WITH 'sha256_password' REQUIRE NONE PASSWORD EXPIRE NEVER ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u19@localhost REQUIRE SUBJECT '/C=SE/ST=Uppsala/O=MySQL AB'
                           ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB"
                           PASSWORD EXPIRE DEFAULT;
 SHOW CREATE USER u19@localhost;
 CREATE USER for u19@localhost
-CREATE USER 'u19'@'localhost' IDENTIFIED WITH '<default_authentication_plugin>' REQUIRE SUBJECT '/C=SE/ST=Uppsala/O=MySQL AB' ISSUER '/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB' PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u19`@`localhost` IDENTIFIED WITH '<default_authentication_plugin>' REQUIRE SUBJECT '/C=SE/ST=Uppsala/O=MySQL AB' ISSUER '/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB' PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 ALTER USER u19@localhost WITH MAX_QUERIES_PER_HOUR 200
 MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE NEVER;
 SHOW CREATE USER u19@localhost;
 CREATE USER for u19@localhost
-CREATE USER 'u19'@'localhost' IDENTIFIED WITH '<default_authentication_plugin>' REQUIRE SUBJECT '/C=SE/ST=Uppsala/O=MySQL AB' ISSUER '/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB' WITH MAX_QUERIES_PER_HOUR 200 MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE NEVER ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u19`@`localhost` IDENTIFIED WITH '<default_authentication_plugin>' REQUIRE SUBJECT '/C=SE/ST=Uppsala/O=MySQL AB' ISSUER '/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB' WITH MAX_QUERIES_PER_HOUR 200 MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE NEVER ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 drop user u1@localhost, u2@localhost, u3@localhost, u4@localhost, u5@localhost,
 u6@localhost, u7@localhost, u8@localhost, u9@localhost, u10@localhost,
 u11@localhost, u12@localhost, u13@localhost, u14@localhost,
diff -Nru mysql-8.0-8.0.26/mysql-test/r/grant_debug.result mysql-8.0-8.0.27/mysql-test/r/grant_debug.result
--- mysql-8.0-8.0.26/mysql-test/r/grant_debug.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/grant_debug.result	2021-09-28 11:46:34.000000000 +0000
@@ -42,7 +42,7 @@
 SHOW GRANTS FOR u1@localhost USING r1;
 Grants for u1@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `u1`@`localhost`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `u1`@`localhost`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `u1`@`localhost`
 GRANT `r1`@`%`,`r2`@`%` TO `u1`@`localhost`
 ALTER USER u1@localhost DEFAULT ROLE r1;
 SET @@global.debug="+d,induce_acl_load_failure";
@@ -52,7 +52,7 @@
 SHOW GRANTS;
 Grants for u1@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `u1`@`localhost`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `u1`@`localhost`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `u1`@`localhost`
 GRANT `r1`@`%`,`r2`@`%` TO `u1`@`localhost`
 REVOKE r1 FROM r2;
 SET @@global.debug="+d,induce_acl_load_failure";
@@ -62,13 +62,13 @@
 SHOW GRANTS FOR u1@localhost USING r1;
 Grants for u1@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `u1`@`localhost`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `u1`@`localhost`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `u1`@`localhost`
 GRANT `r1`@`%`,`r2`@`%` TO `u1`@`localhost`
 # Grant should not have changed
 SHOW GRANTS;
 Grants for u1@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `u1`@`localhost`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `u1`@`localhost`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `u1`@`localhost`
 GRANT `r1`@`%`,`r2`@`%` TO `u1`@`localhost`
 SET @@global.debug="-d,induce_acl_load_failure";
 FLUSH PRIVILEGES;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/grant_dynamic.result mysql-8.0-8.0.27/mysql-test/r/grant_dynamic.result
--- mysql-8.0-8.0.26/mysql-test/r/grant_dynamic.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/grant_dynamic.result	2021-09-28 11:46:34.000000000 +0000
@@ -25,6 +25,7 @@
 mysql.sys	localhost	SYSTEM_USER	N
 root	localhost	APPLICATION_PASSWORD_ADMIN	Y
 root	localhost	AUDIT_ADMIN	Y
+root	localhost	AUTHENTICATION_POLICY_ADMIN	Y
 root	localhost	BACKUP_ADMIN	Y
 root	localhost	BINLOG_ADMIN	Y
 root	localhost	BINLOG_ENCRYPTION_ADMIN	Y
@@ -36,8 +37,10 @@
 root	localhost	FLUSH_TABLES	Y
 root	localhost	FLUSH_USER_RESOURCES	Y
 root	localhost	GROUP_REPLICATION_ADMIN	Y
+root	localhost	GROUP_REPLICATION_STREAM	Y
 root	localhost	INNODB_REDO_LOG_ARCHIVE	Y
 root	localhost	INNODB_REDO_LOG_ENABLE	Y
+root	localhost	PASSWORDLESS_USER_ADMIN	Y
 root	localhost	PERSIST_RO_VARIABLES_ADMIN	Y
 root	localhost	REPLICATION_APPLIER	Y
 root	localhost	REPLICATION_SLAVE_ADMIN	Y
@@ -73,6 +76,7 @@
 mysql.sys	localhost	SYSTEM_USER	N
 root	localhost	APPLICATION_PASSWORD_ADMIN	Y
 root	localhost	AUDIT_ADMIN	Y
+root	localhost	AUTHENTICATION_POLICY_ADMIN	Y
 root	localhost	BACKUP_ADMIN	Y
 root	localhost	BINLOG_ADMIN	Y
 root	localhost	BINLOG_ENCRYPTION_ADMIN	Y
@@ -84,8 +88,10 @@
 root	localhost	FLUSH_TABLES	Y
 root	localhost	FLUSH_USER_RESOURCES	Y
 root	localhost	GROUP_REPLICATION_ADMIN	Y
+root	localhost	GROUP_REPLICATION_STREAM	Y
 root	localhost	INNODB_REDO_LOG_ARCHIVE	Y
 root	localhost	INNODB_REDO_LOG_ENABLE	Y
+root	localhost	PASSWORDLESS_USER_ADMIN	Y
 root	localhost	PERSIST_RO_VARIABLES_ADMIN	Y
 root	localhost	REPLICATION_APPLIER	Y
 root	localhost	REPLICATION_SLAVE_ADMIN	Y
@@ -120,6 +126,7 @@
 mysql.sys	localhost	SYSTEM_USER	N
 root	localhost	APPLICATION_PASSWORD_ADMIN	Y
 root	localhost	AUDIT_ADMIN	Y
+root	localhost	AUTHENTICATION_POLICY_ADMIN	Y
 root	localhost	BACKUP_ADMIN	Y
 root	localhost	BINLOG_ADMIN	Y
 root	localhost	BINLOG_ENCRYPTION_ADMIN	Y
@@ -131,8 +138,10 @@
 root	localhost	FLUSH_TABLES	Y
 root	localhost	FLUSH_USER_RESOURCES	Y
 root	localhost	GROUP_REPLICATION_ADMIN	Y
+root	localhost	GROUP_REPLICATION_STREAM	Y
 root	localhost	INNODB_REDO_LOG_ARCHIVE	Y
 root	localhost	INNODB_REDO_LOG_ENABLE	Y
+root	localhost	PASSWORDLESS_USER_ADMIN	Y
 root	localhost	PERSIST_RO_VARIABLES_ADMIN	Y
 root	localhost	REPLICATION_APPLIER	Y
 root	localhost	REPLICATION_SLAVE_ADMIN	Y
@@ -180,6 +189,7 @@
 mysql.sys	localhost	SYSTEM_USER	N
 root	localhost	APPLICATION_PASSWORD_ADMIN	Y
 root	localhost	AUDIT_ADMIN	Y
+root	localhost	AUTHENTICATION_POLICY_ADMIN	Y
 root	localhost	BACKUP_ADMIN	Y
 root	localhost	BINLOG_ADMIN	Y
 root	localhost	BINLOG_ENCRYPTION_ADMIN	Y
@@ -191,8 +201,10 @@
 root	localhost	FLUSH_TABLES	Y
 root	localhost	FLUSH_USER_RESOURCES	Y
 root	localhost	GROUP_REPLICATION_ADMIN	Y
+root	localhost	GROUP_REPLICATION_STREAM	Y
 root	localhost	INNODB_REDO_LOG_ARCHIVE	Y
 root	localhost	INNODB_REDO_LOG_ENABLE	Y
+root	localhost	PASSWORDLESS_USER_ADMIN	Y
 root	localhost	PERSIST_RO_VARIABLES_ADMIN	Y
 root	localhost	REPLICATION_APPLIER	Y
 root	localhost	REPLICATION_SLAVE_ADMIN	Y
@@ -232,6 +244,7 @@
 mysql.sys	localhost	SYSTEM_USER	N
 root	localhost	APPLICATION_PASSWORD_ADMIN	Y
 root	localhost	AUDIT_ADMIN	Y
+root	localhost	AUTHENTICATION_POLICY_ADMIN	Y
 root	localhost	BACKUP_ADMIN	Y
 root	localhost	BINLOG_ADMIN	Y
 root	localhost	BINLOG_ENCRYPTION_ADMIN	Y
@@ -243,8 +256,10 @@
 root	localhost	FLUSH_TABLES	Y
 root	localhost	FLUSH_USER_RESOURCES	Y
 root	localhost	GROUP_REPLICATION_ADMIN	Y
+root	localhost	GROUP_REPLICATION_STREAM	Y
 root	localhost	INNODB_REDO_LOG_ARCHIVE	Y
 root	localhost	INNODB_REDO_LOG_ENABLE	Y
+root	localhost	PASSWORDLESS_USER_ADMIN	Y
 root	localhost	PERSIST_RO_VARIABLES_ADMIN	Y
 root	localhost	REPLICATION_APPLIER	Y
 root	localhost	REPLICATION_SLAVE_ADMIN	Y
@@ -279,6 +294,7 @@
 mysql.sys	localhost	SYSTEM_USER	N
 root	localhost	APPLICATION_PASSWORD_ADMIN	Y
 root	localhost	AUDIT_ADMIN	Y
+root	localhost	AUTHENTICATION_POLICY_ADMIN	Y
 root	localhost	BACKUP_ADMIN	Y
 root	localhost	BINLOG_ADMIN	Y
 root	localhost	BINLOG_ENCRYPTION_ADMIN	Y
@@ -290,8 +306,10 @@
 root	localhost	FLUSH_TABLES	Y
 root	localhost	FLUSH_USER_RESOURCES	Y
 root	localhost	GROUP_REPLICATION_ADMIN	Y
+root	localhost	GROUP_REPLICATION_STREAM	Y
 root	localhost	INNODB_REDO_LOG_ARCHIVE	Y
 root	localhost	INNODB_REDO_LOG_ENABLE	Y
+root	localhost	PASSWORDLESS_USER_ADMIN	Y
 root	localhost	PERSIST_RO_VARIABLES_ADMIN	Y
 root	localhost	REPLICATION_APPLIER	Y
 root	localhost	REPLICATION_SLAVE_ADMIN	Y
@@ -349,6 +367,7 @@
 mysql.sys	localhost	SYSTEM_USER	N
 root	localhost	APPLICATION_PASSWORD_ADMIN	Y
 root	localhost	AUDIT_ADMIN	Y
+root	localhost	AUTHENTICATION_POLICY_ADMIN	Y
 root	localhost	BACKUP_ADMIN	Y
 root	localhost	BINLOG_ADMIN	Y
 root	localhost	BINLOG_ENCRYPTION_ADMIN	Y
@@ -360,8 +379,10 @@
 root	localhost	FLUSH_TABLES	Y
 root	localhost	FLUSH_USER_RESOURCES	Y
 root	localhost	GROUP_REPLICATION_ADMIN	Y
+root	localhost	GROUP_REPLICATION_STREAM	Y
 root	localhost	INNODB_REDO_LOG_ARCHIVE	Y
 root	localhost	INNODB_REDO_LOG_ENABLE	Y
+root	localhost	PASSWORDLESS_USER_ADMIN	Y
 root	localhost	PERSIST_RO_VARIABLES_ADMIN	Y
 root	localhost	REPLICATION_APPLIER	Y
 root	localhost	REPLICATION_SLAVE_ADMIN	Y
@@ -410,6 +431,7 @@
 mysql.sys	localhost	SYSTEM_USER	N
 root	localhost	APPLICATION_PASSWORD_ADMIN	Y
 root	localhost	AUDIT_ADMIN	Y
+root	localhost	AUTHENTICATION_POLICY_ADMIN	Y
 root	localhost	BACKUP_ADMIN	Y
 root	localhost	BINLOG_ADMIN	Y
 root	localhost	BINLOG_ENCRYPTION_ADMIN	Y
@@ -421,8 +443,10 @@
 root	localhost	FLUSH_TABLES	Y
 root	localhost	FLUSH_USER_RESOURCES	Y
 root	localhost	GROUP_REPLICATION_ADMIN	Y
+root	localhost	GROUP_REPLICATION_STREAM	Y
 root	localhost	INNODB_REDO_LOG_ARCHIVE	Y
 root	localhost	INNODB_REDO_LOG_ENABLE	Y
+root	localhost	PASSWORDLESS_USER_ADMIN	Y
 root	localhost	PERSIST_RO_VARIABLES_ADMIN	Y
 root	localhost	REPLICATION_APPLIER	Y
 root	localhost	REPLICATION_SLAVE_ADMIN	Y
@@ -479,6 +503,7 @@
 mysql.sys	localhost	SYSTEM_USER	N
 root	localhost	APPLICATION_PASSWORD_ADMIN	Y
 root	localhost	AUDIT_ADMIN	Y
+root	localhost	AUTHENTICATION_POLICY_ADMIN	Y
 root	localhost	BACKUP_ADMIN	Y
 root	localhost	BINLOG_ADMIN	Y
 root	localhost	BINLOG_ENCRYPTION_ADMIN	Y
@@ -490,8 +515,10 @@
 root	localhost	FLUSH_TABLES	Y
 root	localhost	FLUSH_USER_RESOURCES	Y
 root	localhost	GROUP_REPLICATION_ADMIN	Y
+root	localhost	GROUP_REPLICATION_STREAM	Y
 root	localhost	INNODB_REDO_LOG_ARCHIVE	Y
 root	localhost	INNODB_REDO_LOG_ENABLE	Y
+root	localhost	PASSWORDLESS_USER_ADMIN	Y
 root	localhost	PERSIST_RO_VARIABLES_ADMIN	Y
 root	localhost	REPLICATION_APPLIER	Y
 root	localhost	REPLICATION_SLAVE_ADMIN	Y
@@ -841,7 +868,7 @@
 SHOW GRANTS FOR u1;
 Grants for u1@%
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `u1`@`%`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,HELLOWORLD,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,NON_DOCUMENTED_PRIVILEGE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,ROUTINE_GRANT,RUBBISH,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `u1`@`%`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,HELLOWORLD,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,NON_DOCUMENTED_PRIVILEGE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,ROUTINE_GRANT,RUBBISH,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `u1`@`%`
 GRANT `r2`@`%` TO `u1`@`%`
 # Boundary value test for privilege_id
 INSERT INTO mysql.global_grants VALUES('u1', '%',
@@ -854,6 +881,7 @@
 Privilege	Context	Comment
 APPLICATION_PASSWORD_ADMIN	Server Admin	
 AUDIT_ADMIN	Server Admin	
+AUTHENTICATION_POLICY_ADMIN	Server Admin	
 Alter	Tables	To alter the table
 Alter routine	Functions,Procedures	To alter or drop stored functions/procedures
 BACKUP_ADMIN	Server Admin	
@@ -880,6 +908,7 @@
 FLUSH_USER_RESOURCES	Server Admin	
 File	File access on server	To read and write files on the server
 GROUP_REPLICATION_ADMIN	Server Admin	
+GROUP_REPLICATION_STREAM	Server Admin	
 Grant option	Databases,Tables,Functions,Procedures	To give to other users those privileges you possess
 HELLOWORLD	Server Admin	
 INNODB_REDO_LOG_ARCHIVE	Server Admin	
@@ -889,6 +918,7 @@
 LENGTH_32_ABCDEFGHIJKLMNOPQRSTUX	Server Admin	
 Lock tables	Databases	To use LOCK TABLES (together with SELECT privilege)
 NON_DOCUMENTED_PRIVILEGE	Server Admin	
+PASSWORDLESS_USER_ADMIN	Server Admin	
 PERSIST_RO_VARIABLES_ADMIN	Server Admin	
 Process	Server Admin	To view the plain text of currently executing queries
 Proxy	Server Admin	To make proxy user possible
@@ -1033,7 +1063,7 @@
 SHOW GRANTS;
 Grants for u1@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `u1`@`localhost`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `u1`@`localhost`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `u1`@`localhost`
 REVOKE ALL ON *.* FROM CURRENT_USER();
 SHOW GRANTS;
 Grants for u1@localhost
diff -Nru mysql-8.0-8.0.26/mysql-test/r/grant_dynamic_session_variables_admin.result mysql-8.0-8.0.27/mysql-test/r/grant_dynamic_session_variables_admin.result
--- mysql-8.0-8.0.26/mysql-test/r/grant_dynamic_session_variables_admin.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/grant_dynamic_session_variables_admin.result	2021-09-28 11:46:34.000000000 +0000
@@ -3,8 +3,8 @@
 SHOW GRANTS FOR root@localhost;
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 # Testing FR1
 CREATE USER wl12217@localhost;
 CREATE DATABASE wl12217;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/grant.result mysql-8.0-8.0.27/mysql-test/r/grant.result
--- mysql-8.0-8.0.26/mysql-test/r/grant.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/grant.result	2021-09-28 11:46:34.000000000 +0000
@@ -156,7 +156,7 @@
 show grants for drop_user2@localhost;
 Grants for drop_user2@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `drop_user2`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `drop_user2`@`localhost` WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `drop_user2`@`localhost` WITH GRANT OPTION
 revoke all privileges, grant option from drop_user2@localhost;
 grant ALL PRIVILEGES on *.* to drop_user@localhost with GRANT OPTION;
 grant ALL PRIVILEGES on test.* to drop_user@localhost with GRANT OPTION;
@@ -164,14 +164,14 @@
 show grants for drop_user@localhost;
 Grants for drop_user@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `drop_user`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `drop_user`@`localhost` WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `drop_user`@`localhost` WITH GRANT OPTION
 GRANT ALL PRIVILEGES ON `test`.* TO `drop_user`@`localhost` WITH GRANT OPTION
 GRANT SELECT (`a`) ON `test`.`t1` TO `drop_user`@`localhost`
 set sql_mode=ansi_quotes;
 show grants for drop_user@localhost;
 Grants for drop_user@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO "drop_user"@"localhost" WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO "drop_user"@"localhost" WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO "drop_user"@"localhost" WITH GRANT OPTION
 GRANT ALL PRIVILEGES ON "test".* TO "drop_user"@"localhost" WITH GRANT OPTION
 GRANT SELECT ("a") ON "test"."t1" TO "drop_user"@"localhost"
 set sql_mode=default;
@@ -179,28 +179,28 @@
 show grants for drop_user@localhost;
 Grants for drop_user@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO drop_user@localhost WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO drop_user@localhost WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO drop_user@localhost WITH GRANT OPTION
 GRANT ALL PRIVILEGES ON test.* TO drop_user@localhost WITH GRANT OPTION
 GRANT SELECT (a) ON test.t1 TO drop_user@localhost
 set sql_mode="ansi_quotes";
 show grants for drop_user@localhost;
 Grants for drop_user@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO drop_user@localhost WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO drop_user@localhost WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO drop_user@localhost WITH GRANT OPTION
 GRANT ALL PRIVILEGES ON test.* TO drop_user@localhost WITH GRANT OPTION
 GRANT SELECT (a) ON test.t1 TO drop_user@localhost
 set sql_quote_show_create=1;
 show grants for drop_user@localhost;
 Grants for drop_user@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO "drop_user"@"localhost" WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO "drop_user"@"localhost" WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO "drop_user"@"localhost" WITH GRANT OPTION
 GRANT ALL PRIVILEGES ON "test".* TO "drop_user"@"localhost" WITH GRANT OPTION
 GRANT SELECT ("a") ON "test"."t1" TO "drop_user"@"localhost"
 set sql_mode="";
 show grants for drop_user@localhost;
 Grants for drop_user@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `drop_user`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `drop_user`@`localhost` WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `drop_user`@`localhost` WITH GRANT OPTION
 GRANT ALL PRIVILEGES ON `test`.* TO `drop_user`@`localhost` WITH GRANT OPTION
 GRANT SELECT (`a`) ON `test`.`t1` TO `drop_user`@`localhost`
 revoke all privileges, grant option from drop_user@localhost;
@@ -433,6 +433,7 @@
 Privilege	Context	Comment
 APPLICATION_PASSWORD_ADMIN	Server Admin	
 AUDIT_ADMIN	Server Admin	
+AUTHENTICATION_POLICY_ADMIN	Server Admin	
 Alter	Tables	To alter the table
 Alter routine	Functions,Procedures	To alter or drop stored functions/procedures
 BACKUP_ADMIN	Server Admin	
@@ -459,12 +460,14 @@
 FLUSH_USER_RESOURCES	Server Admin	
 File	File access on server	To read and write files on the server
 GROUP_REPLICATION_ADMIN	Server Admin	
+GROUP_REPLICATION_STREAM	Server Admin	
 Grant option	Databases,Tables,Functions,Procedures	To give to other users those privileges you possess
 INNODB_REDO_LOG_ARCHIVE	Server Admin	
 INNODB_REDO_LOG_ENABLE	Server Admin	
 Index	Tables	To create or drop indexes
 Insert	Tables	To insert data into tables
 Lock tables	Databases	To use LOCK TABLES (together with SELECT privilege)
+PASSWORDLESS_USER_ADMIN	Server Admin	
 PERSIST_RO_VARIABLES_ADMIN	Server Admin	
 Process	Server Admin	To view the plain text of currently executing queries
 Proxy	Server Admin	To make proxy user possible
@@ -632,23 +635,23 @@
 show grants for root@localhost;
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
 GRANT SELECT ON `бд`.* TO `root`@`localhost`
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 flush privileges;
 show grants for root@localhost;
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
 GRANT SELECT ON `бд`.* TO `root`@`localhost`
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 drop database ÂÄ;
 revoke select on ÂÄ.* from root@localhost;
 show grants for root@localhost;
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 set names latin1;
 create user mysqltest_7@;
 alter user mysqltest_7@ identified by 'systpass';
@@ -1708,7 +1711,7 @@
 SHOW GRANTS FOR mysqltest_1;
 Grants for mysqltest_1@%
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `mysqltest_1`@`%`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `mysqltest_1`@`%`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `mysqltest_1`@`%`
 DROP USER mysqltest_1;
 USE test;
 CREATE USER mysqltest_1;
@@ -1723,7 +1726,7 @@
 SHOW GRANTS FOR mysqltest_1;
 Grants for mysqltest_1@%
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `mysqltest_1`@`%`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `mysqltest_1`@`%`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `mysqltest_1`@`%`
 DROP USER mysqltest_1;
 CREATE DATABASE db1;
 CREATE DATABASE db2;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/grant_user_lock_qa.result mysql-8.0-8.0.27/mysql-test/r/grant_user_lock_qa.result
--- mysql-8.0-8.0.26/mysql-test/r/grant_user_lock_qa.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/grant_user_lock_qa.result	2021-09-28 11:46:34.000000000 +0000
@@ -23,7 +23,7 @@
 
 SHOW CREATE USER user1;
 CREATE USER for user1@%
-CREATE USER 'user1'@'%' IDENTIFIED WITH '<default_authentication_plugin>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `user1`@`%` IDENTIFIED WITH '<default_authentication_plugin>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 SELECT USER();
 USER()
 user1@localhost
@@ -176,7 +176,7 @@
 
 SHOW CREATE USER u2@localhost;
 CREATE USER for u2@localhost
-CREATE USER 'u2'@'localhost' IDENTIFIED WITH '<default_authentication_plugin>' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u2`@`localhost` IDENTIFIED WITH '<default_authentication_plugin>' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 # Recreating user using SHOW CREATE USER output for u2@localhost
 DROP USER u2@localhost;
 CREATE USER 'u2'@'localhost' IDENTIFIED WITH 'mysql_native_password'
@@ -196,7 +196,7 @@
 u2@localhost
 SHOW CREATE USER u2@localhost;
 CREATE USER for u2@localhost
-CREATE USER 'u2'@'localhost' IDENTIFIED WITH '<default_authentication_plugin>' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u2`@`localhost` IDENTIFIED WITH '<default_authentication_plugin>' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u3@localhost IDENTIFIED WITH 'sha256_password'
                          ACCOUNT UNLOCK ACCOUNT LOCK;
 SELECT user,plugin,authentication_string,password_expired,
@@ -210,7 +210,7 @@
 
 SHOW CREATE USER u3@localhost;
 CREATE USER for u3@localhost
-CREATE USER 'u3'@'localhost' IDENTIFIED WITH 'sha256_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u3`@`localhost` IDENTIFIED WITH 'sha256_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 connect(localhost,u3,,test,MASTER_PORT,MASTER_SOCKET);
 ERROR HY000: Access denied for user 'u3'@'localhost'. Account is locked.
 ALTER USER u3@localhost IDENTIFIED WITH 'sha256_password'
@@ -229,7 +229,7 @@
 
 SHOW CREATE USER u3@localhost;
 CREATE USER for u3@localhost
-CREATE USER 'u3'@'localhost' IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE CURRENT DEFAULT
+CREATE USER `u3`@`localhost` IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE CURRENT DEFAULT
 CREATE USER u4@localhost IDENTIFIED WITH 'sha256_password' BY 'auth_string'
                          PASSWORD EXPIRE DEFAULT ACCOUNT LOCK;
 SELECT user,plugin,authentication_string,password_expired,
@@ -253,7 +253,7 @@
 
 SHOW CREATE USER u4@localhost;
 CREATE USER for u4@localhost
-CREATE USER 'u4'@'localhost' IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u4`@`localhost` IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 SELECT USER();
 USER()
 u4@localhost
@@ -287,7 +287,7 @@
 
 SHOW CREATE USER user6@localhost;
 CREATE USER for user6@localhost
-CREATE USER 'user6'@'localhost' IDENTIFIED WITH 'mysql_native_password' REQUIRE NONE PASSWORD EXPIRE NEVER ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `user6`@`localhost` IDENTIFIED WITH 'mysql_native_password' REQUIRE NONE PASSWORD EXPIRE NEVER ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 connect(localhost,user6,,test,MASTER_PORT,MASTER_SOCKET);
 ERROR HY000: Access denied for user 'user6'@'localhost'. Account is locked.
 ALTER USER user6@localhost IDENTIFIED WITH 'mysql_native_password'
@@ -316,7 +316,7 @@
 
 SHOW CREATE USER user7@localhost;
 CREATE USER for user7@localhost
-CREATE USER 'user7'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*1643D320B9787E87A3C6CE2C953B9E4FDBC048BC' REQUIRE NONE PASSWORD EXPIRE NEVER ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `user7`@`localhost` IDENTIFIED WITH 'mysql_native_password' AS '*1643D320B9787E87A3C6CE2C953B9E4FDBC048BC' REQUIRE NONE PASSWORD EXPIRE NEVER ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 SELECT USER();
 USER()
 user7@localhost
@@ -350,7 +350,7 @@
 
 SHOW CREATE USER user8@localhost;
 CREATE USER for user8@localhost
-CREATE USER 'user8'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF' REQUIRE NONE PASSWORD EXPIRE NEVER ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `user8`@`localhost` IDENTIFIED WITH 'mysql_native_password' AS '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF' REQUIRE NONE PASSWORD EXPIRE NEVER ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 SELECT USER();
 USER()
 user8@localhost
@@ -384,7 +384,7 @@
 
 SHOW CREATE USER u5@localhost;
 CREATE USER for u5@localhost
-CREATE USER 'u5'@'localhost' IDENTIFIED WITH '<default_authentication_plugin>' REQUIRE SSL PASSWORD EXPIRE ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u5`@`localhost` IDENTIFIED WITH '<default_authentication_plugin>' REQUIRE SSL PASSWORD EXPIRE ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 connect(localhost,u5,,test,MASTER_PORT,MASTER_SOCKET);
 ERROR HY000: Access denied for user 'u5'@'localhost'. Account is locked.
 ALTER USER u5@localhost REQUIRE SSL PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK;
@@ -404,7 +404,7 @@
 
 SHOW CREATE USER u6@localhost;
 CREATE USER for u6@localhost
-CREATE USER 'u6'@'localhost' IDENTIFIED WITH '<default_authentication_plugin>' AS '<non-deterministic-password-hash>' REQUIRE X509 PASSWORD EXPIRE NEVER ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u6`@`localhost` IDENTIFIED WITH '<default_authentication_plugin>' AS '<non-deterministic-password-hash>' REQUIRE X509 PASSWORD EXPIRE NEVER ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 connect(localhost,u6,auth_string,test,MASTER_PORT,MASTER_SOCKET);
 ERROR HY000: Access denied for user 'u6'@'localhost'. Account is locked.
 ALTER USER u6@localhost ACCOUNT UNLOCK;
@@ -420,7 +420,7 @@
 
 SHOW CREATE USER u6@localhost;
 CREATE USER for u6@localhost
-CREATE USER 'u6'@'localhost' IDENTIFIED WITH '<default_authentication_plugin>' AS '<non-deterministic-password-hash>' REQUIRE X509 PASSWORD EXPIRE NEVER ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u6`@`localhost` IDENTIFIED WITH '<default_authentication_plugin>' AS '<non-deterministic-password-hash>' REQUIRE X509 PASSWORD EXPIRE NEVER ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 SELECT USER();
 USER()
 u6@localhost
@@ -442,7 +442,7 @@
 
 SHOW CREATE USER u7@localhost;
 CREATE USER for u7@localhost
-CREATE USER 'u7'@'localhost' IDENTIFIED WITH 'sha256_password' REQUIRE CIPHER 'DHE-RSA-AES256-SHA' PASSWORD EXPIRE NEVER ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u7`@`localhost` IDENTIFIED WITH 'sha256_password' REQUIRE CIPHER 'DHE-RSA-AES256-SHA' PASSWORD EXPIRE NEVER ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 SELECT USER();
 USER()
 u7@localhost
@@ -463,7 +463,7 @@
 
 SHOW CREATE USER u7@localhost;
 CREATE USER for u7@localhost
-CREATE USER 'u7'@'localhost' IDENTIFIED WITH 'mysql_native_password' REQUIRE CIPHER 'DHE-RSA-AES256-SHA' PASSWORD EXPIRE ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u7`@`localhost` IDENTIFIED WITH 'mysql_native_password' REQUIRE CIPHER 'DHE-RSA-AES256-SHA' PASSWORD EXPIRE ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 connect(localhost,u7,,test,MASTER_PORT,MASTER_SOCKET);
 ERROR HY000: Access denied for user 'u7'@'localhost'. Account is locked.
 CREATE USER u8@localhost IDENTIFIED WITH 'sha256_password' BY 'auth_string'
@@ -484,7 +484,7 @@
 
 SHOW CREATE USER u8@localhost;
 CREATE USER for u8@localhost
-CREATE USER 'u8'@'localhost' IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE ISSUER '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA' PASSWORD EXPIRE NEVER ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u8`@`localhost` IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE ISSUER '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA' PASSWORD EXPIRE NEVER ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 SELECT USER();
 USER()
 u8@localhost
@@ -538,7 +538,7 @@
 
 SHOW CREATE USER u9@localhost;
 CREATE USER for u9@localhost
-CREATE USER 'u9'@'localhost' IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client' PASSWORD EXPIRE NEVER ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u9`@`localhost` IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client' PASSWORD EXPIRE NEVER ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 SELECT USER();
 USER()
 u9@localhost
@@ -562,7 +562,7 @@
 
 SHOW CREATE USER u10@localhost;
 CREATE USER for u10@localhost
-CREATE USER 'u10'@'localhost' IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client' ISSUER '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA' CIPHER 'DHE-RSA-AES256-SHA' PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u10`@`localhost` IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client' ISSUER '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA' CIPHER 'DHE-RSA-AES256-SHA' PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 SELECT USER();
 USER()
 u10@localhost
@@ -583,7 +583,7 @@
 
 SHOW CREATE USER u10@localhost;
 CREATE USER for u10@localhost
-CREATE USER 'u10'@'localhost' IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE CIPHER 'DHE-RSA-AES256-SHA' PASSWORD EXPIRE DEFAULT ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u10`@`localhost` IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE CIPHER 'DHE-RSA-AES256-SHA' PASSWORD EXPIRE DEFAULT ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 connect(localhost,u10,auth_string#y,test,MASTER_PORT,MASTER_SOCKET);
 ERROR HY000: Access denied for user 'u10'@'localhost'. Account is locked.
 CREATE USER u11@localhost WITH MAX_QUERIES_PER_HOUR 2 ACCOUNT LOCK;
@@ -599,7 +599,7 @@
 
 SHOW CREATE USER u11@localhost;
 CREATE USER for u11@localhost
-CREATE USER 'u11'@'localhost' IDENTIFIED WITH '<default_authentication_plugin>' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 2 PASSWORD EXPIRE DEFAULT ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u11`@`localhost` IDENTIFIED WITH '<default_authentication_plugin>' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 2 PASSWORD EXPIRE DEFAULT ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 connect(localhost,u11,,test,MASTER_PORT,MASTER_SOCKET);
 ERROR HY000: Access denied for user 'u11'@'localhost'. Account is locked.
 ALTER USER u11@localhost WITH MAX_QUERIES_PER_HOUR 6 ACCOUNT UNLOCK ACCOUNT UNLOCK;
@@ -615,7 +615,7 @@
 
 SHOW CREATE USER u11@localhost;
 CREATE USER for u11@localhost
-CREATE USER 'u11'@'localhost' IDENTIFIED WITH '<default_authentication_plugin>' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 6 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u11`@`localhost` IDENTIFIED WITH '<default_authentication_plugin>' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 6 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 DROP USER u11@localhost;
 CREATE USER 'u11'@'localhost' IDENTIFIED WITH 'mysql_native_password'
 REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 6 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK;
@@ -646,7 +646,7 @@
 
 SHOW CREATE USER u12@localhost;
 CREATE USER for u12@localhost
-CREATE USER 'u12'@'localhost' IDENTIFIED WITH '<default_authentication_plugin>' AS '<non-deterministic-password-hash>' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 4 PASSWORD EXPIRE ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u12`@`localhost` IDENTIFIED WITH '<default_authentication_plugin>' AS '<non-deterministic-password-hash>' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 4 PASSWORD EXPIRE ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 SELECT USER();
 ERROR HY000: You must reset your password using ALTER USER statement before executing this statement.
 ALTER USER USER() IDENTIFIED BY 'abc';
@@ -677,7 +677,7 @@
 
 SHOW CREATE USER u12@localhost;
 CREATE USER for u12@localhost
-CREATE USER 'u12'@'localhost' IDENTIFIED WITH '<default_authentication_plugin>' AS '<non-deterministic-password-hash>' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 4 PASSWORD EXPIRE NEVER ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u12`@`localhost` IDENTIFIED WITH '<default_authentication_plugin>' AS '<non-deterministic-password-hash>' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 4 PASSWORD EXPIRE NEVER ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 SELECT USER();
 USER()
 u12@localhost
@@ -707,7 +707,7 @@
 
 SHOW CREATE USER u13@localhost;
 CREATE USER for u13@localhost
-CREATE USER 'u13'@'localhost' IDENTIFIED WITH 'sha256_password' REQUIRE NONE WITH MAX_CONNECTIONS_PER_HOUR 2 PASSWORD EXPIRE INTERVAL 20 DAY ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u13`@`localhost` IDENTIFIED WITH 'sha256_password' REQUIRE NONE WITH MAX_CONNECTIONS_PER_HOUR 2 PASSWORD EXPIRE INTERVAL 20 DAY ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 SELECT USER();
 USER()
 u13@localhost
@@ -752,7 +752,7 @@
 
 SHOW CREATE USER u14@localhost;
 CREATE USER for u14@localhost
-CREATE USER 'u14'@'localhost' IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client' ISSUER '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA' WITH MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE INTERVAL 999 DAY ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u14`@`localhost` IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client' ISSUER '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA' WITH MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE INTERVAL 999 DAY ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 SELECT USER();
 USER()
 u14@localhost
diff -Nru mysql-8.0-8.0.26/mysql-test/r/grant_user_lock.result mysql-8.0-8.0.27/mysql-test/r/grant_user_lock.result
--- mysql-8.0-8.0.26/mysql-test/r/grant_user_lock.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/grant_user_lock.result	2021-09-28 11:46:34.000000000 +0000
@@ -75,12 +75,12 @@
 # Should appear without ACCOUNT UNLOCK
 SHOW CREATE USER unlocked_user@localhost;
 CREATE USER for unlocked_user@localhost
-CREATE USER 'unlocked_user'@'localhost' IDENTIFIED WITH '<default_authentication>' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `unlocked_user`@`localhost` IDENTIFIED WITH '<default_authentication>' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 ALTER USER unlocked_user@localhost ACCOUNT LOCK;
 # Should appear with ACCOUNT LOCK
 SHOW CREATE USER unlocked_user@localhost;
 CREATE USER for unlocked_user@localhost
-CREATE USER 'unlocked_user'@'localhost' IDENTIFIED WITH '<default_authentication>' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `unlocked_user`@`localhost` IDENTIFIED WITH '<default_authentication>' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 # roll back changes
 DROP USER unlocked_user@localhost;
 DROP USER unlocked_user2@localhost;
@@ -188,27 +188,27 @@
 Warning	4005	User 'u1'@'localhost' is referenced as a definer account in a stored routine.
 SHOW CREATE USER u1@localhost;
 CREATE USER for u1@localhost
-CREATE USER 'u1'@'localhost' IDENTIFIED WITH '<default_authentication>' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 100 PASSWORD EXPIRE DEFAULT ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u1`@`localhost` IDENTIFIED WITH '<default_authentication>' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 100 PASSWORD EXPIRE DEFAULT ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 # ALTER USER correct SQL syntax 1
 ALTER USER u1@localhost PASSWORD EXPIRE ACCOUNT UNLOCK;
 SHOW CREATE USER u1@localhost;
 CREATE USER for u1@localhost
-CREATE USER 'u1'@'localhost' IDENTIFIED WITH '<default_authentication>' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 100 PASSWORD EXPIRE ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u1`@`localhost` IDENTIFIED WITH '<default_authentication>' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 100 PASSWORD EXPIRE ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 # ALTER USER correct SQL syntax 2
 ALTER USER u1@localhost ACCOUNT LOCK PASSWORD EXPIRE;
 SHOW CREATE USER u1@localhost;
 CREATE USER for u1@localhost
-CREATE USER 'u1'@'localhost' IDENTIFIED WITH '<default_authentication>' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 100 PASSWORD EXPIRE ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u1`@`localhost` IDENTIFIED WITH '<default_authentication>' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 100 PASSWORD EXPIRE ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 # ALTER USER correct SQL syntax 3
 ALTER USER u1@localhost REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 99 ACCOUNT UNLOCK PASSWORD EXPIRE NEVER;
 SHOW CREATE USER u1@localhost;
 CREATE USER for u1@localhost
-CREATE USER 'u1'@'localhost' IDENTIFIED WITH '<default_authentication>' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 99 PASSWORD EXPIRE ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u1`@`localhost` IDENTIFIED WITH '<default_authentication>' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 99 PASSWORD EXPIRE ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 # ALTER USER correct SQL syntax 4
 ALTER USER u1@localhost REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 98 PASSWORD EXPIRE INTERVAL 5 DAY ACCOUNT LOCK;
 SHOW CREATE USER u1@localhost;
 CREATE USER for u1@localhost
-CREATE USER 'u1'@'localhost' IDENTIFIED WITH '<default_authentication>' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 98 PASSWORD EXPIRE ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u1`@`localhost` IDENTIFIED WITH '<default_authentication>' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 98 PASSWORD EXPIRE ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 # ALTER USER invalid SQL syntax
 ALTER USER u1@localhost ACCOUNT UNLOCK WITH MAX_QUERIES_PER_HOUR 97 PASSWORD EXPIRE;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'WITH MAX_QUERIES_PER_HOUR 97 PASSWORD EXPIRE' at line 1
@@ -221,7 +221,7 @@
 Warning	4005	User 'u1'@'localhost' is referenced as a definer account in a stored routine.
 SHOW CREATE USER u1@localhost;
 CREATE USER for u1@localhost
-CREATE USER 'u1'@'localhost' IDENTIFIED WITH '<default_authentication>' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u1`@`localhost` IDENTIFIED WITH '<default_authentication>' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 DROP USER u1@localhost;
 Warnings:
 Warning	4005	User 'u1'@'localhost' is referenced as a definer account in a stored routine.
@@ -231,7 +231,7 @@
 Warning	4005	User 'u1'@'localhost' is referenced as a definer account in a stored routine.
 SHOW CREATE USER u1@localhost;
 CREATE USER for u1@localhost
-CREATE USER 'u1'@'localhost' IDENTIFIED WITH '<default_authentication>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u1`@`localhost` IDENTIFIED WITH '<default_authentication>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 DROP USER u1@localhost;
 Warnings:
 Warning	4005	User 'u1'@'localhost' is referenced as a definer account in a stored routine.
@@ -241,32 +241,32 @@
 Warning	4005	User 'u1'@'localhost' is referenced as a definer account in a stored routine.
 SHOW CREATE USER u1@localhost;
 CREATE USER for u1@localhost
-CREATE USER 'u1'@'localhost' IDENTIFIED WITH '<default_authentication>' REQUIRE NONE PASSWORD EXPIRE ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u1`@`localhost` IDENTIFIED WITH '<default_authentication>' REQUIRE NONE PASSWORD EXPIRE ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 # Duplicated ACCOUNT statement 4
 ALTER USER u1@localhost IDENTIFIED BY 'PASS' ACCOUNT LOCK ACCOUNT UNLOCK;
 SHOW CREATE USER u1@localhost;
 CREATE USER for u1@localhost
-CREATE USER 'u1'@'localhost' IDENTIFIED WITH '<default_authentication>' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u1`@`localhost` IDENTIFIED WITH '<default_authentication>' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 # Duplicated ACCOUNT statement 5
 ALTER USER u1@localhost ACCOUNT UNLOCK ACCOUNT LOCK;
 SHOW CREATE USER u1@localhost;
 CREATE USER for u1@localhost
-CREATE USER 'u1'@'localhost' IDENTIFIED WITH '<default_authentication>' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u1`@`localhost` IDENTIFIED WITH '<default_authentication>' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 # Duplicated ACCOUNT statement 6
 ALTER USER u1@localhost ACCOUNT LOCK PASSWORD EXPIRE ACCOUNT LOCK;
 SHOW CREATE USER u1@localhost;
 CREATE USER for u1@localhost
-CREATE USER 'u1'@'localhost' IDENTIFIED WITH '<default_authentication>' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u1`@`localhost` IDENTIFIED WITH '<default_authentication>' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 # Duplicated ACCOUNT statement 7
 ALTER USER u1@localhost PASSWORD EXPIRE ACCOUNT LOCK PASSWORD EXPIRE NEVER;
 SHOW CREATE USER u1@localhost;
 CREATE USER for u1@localhost
-CREATE USER 'u1'@'localhost' IDENTIFIED WITH '<default_authentication>' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u1`@`localhost` IDENTIFIED WITH '<default_authentication>' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 # Duplicated ACCOUNT statement 8
 ALTER USER u1@localhost PASSWORD EXPIRE NEVER ACCOUNT LOCK PASSWORD EXPIRE INTERVAL 5 DAY ACCOUNT LOCK;
 SHOW CREATE USER u1@localhost;
 CREATE USER for u1@localhost
-CREATE USER 'u1'@'localhost' IDENTIFIED WITH '<default_authentication>' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u1`@`localhost` IDENTIFIED WITH '<default_authentication>' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 # MySQL user table layout from the before ACCOUNT LOCK option
 call mtr.add_suppression("Column count of mysql.* is wrong. "
                          "Expected .*, found .*. "
@@ -332,11 +332,11 @@
 CREATE USER u1 IDENTIFIED BY 'pass';
 SHOW CREATE USER u1;
 CREATE USER for u1@%
-CREATE USER 'u1'@'%' IDENTIFIED WITH '<default_authentication>' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u1`@`%` IDENTIFIED WITH '<default_authentication>' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 ALTER USER u1 ACCOUNT LOCK;
 SHOW CREATE USER u1;
 CREATE USER for u1@%
-CREATE USER 'u1'@'%' IDENTIFIED WITH '<default_authentication>' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u1`@`%` IDENTIFIED WITH '<default_authentication>' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 DROP USER u1;
 # Restart server.
 TRUNCATE TABLE mysql.general_log;
@@ -377,3 +377,4 @@
 SET GLOBAL general_log_file=  @old_general_log_file;
 SET GLOBAL general_log=       @old_general_log;
 SET GLOBAL log_output=        @old_log_output;
+TRUNCATE TABLE mysql.general_log;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/group_by_hypergraph.result mysql-8.0-8.0.27/mysql-test/r/group_by_hypergraph.result
--- mysql-8.0-8.0.26/mysql-test/r/group_by_hypergraph.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/group_by_hypergraph.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,23 @@
+#
+# Bug#32980875: WL#14422: ASSERTION `FALSE' FAILED|SQL/BASIC_ROW_ITERATORS.H
+#
+CREATE TABLE t (x INTEGER);
+INSERT INTO t VALUES (1), (2), (3);
+ANALYZE TABLE t;
+Table	Op	Msg_type	Msg_text
+test.t	analyze	status	OK
+EXPLAIN FORMAT=TREE
+SELECT DISTINCT MIN(t2.x), t1.x
+FROM t t1 JOIN t t2 USING (x)
+GROUP BY t2.x;
+EXPLAIN
+-> Remove duplicates from input grouped on t.x, `MIN(t2.x)`
+    -> Stream results
+        -> Group aggregate: min(t2.x)
+            -> Sort: t2.x
+                -> Inner hash join (t1.x = t2.x)
+                    -> Table scan on t1
+                    -> Hash
+                        -> Table scan on t2
+
+DROP TABLE t;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/group_by.result mysql-8.0-8.0.27/mysql-test/r/group_by.result
--- mysql-8.0-8.0.26/mysql-test/r/group_by.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/group_by.result	2021-09-28 11:46:34.000000000 +0000
@@ -49,7 +49,7 @@
         -> Nested loop inner join  (cost=2.05 rows=4)
             -> Filter: (t1.userID is not null)  (cost=0.65 rows=4)
                 -> Table scan on t1  (cost=0.65 rows=4)
-            -> Single-row index lookup on t2 using PRIMARY (userID=t1.userID)  (cost=0.28 rows=1)
+            -> Single-row covering index lookup on t2 using PRIMARY (userID=t1.userID)  (cost=0.28 rows=1)
 
 SELECT t2.userid, MIN(t1.score) FROM t1, t2 WHERE t1.userID=t2.userID GROUP BY t2.userid;
 userid	MIN(t1.score)
@@ -277,14 +277,14 @@
 Documentation		0
 Host communication		0
 Test Procedures		0
-select row_number() over (), value,description,COUNT(bug_id) from t2 left join t1 on t2.program=t1.product and t2.value=t1.component where program="AAAAA" group by value having COUNT(bug_id) IN (0,2);
-row_number() over ()	value	description	COUNT(bug_id)
+select row_number() over (), value,description,COUNT(DISTINCT bug_id) from t2 left join t1 on t2.program=t1.product and t2.value=t1.component where program="AAAAA" group by value having COUNT(DISTINCT bug_id) IN (0,2);
+row_number() over ()	value	description	COUNT(DISTINCT bug_id)
 1	BBBBBBBBBBBBB - conversion		2
-2	BBBBBBBBBBBBB - generic		2
-3	BBBBBBBBBBBBB - eeeeeeeee		0
-4	Test Procedures		0
-5	Documentation		0
-6	Host communication		0
+2	BBBBBBBBBBBBB - eeeeeeeee		0
+3	BBBBBBBBBBBBB - generic		2
+4	Documentation		0
+5	Host communication		0
+6	Test Procedures		0
 drop table t1,t2;
 create table t1 (foo int);
 insert into t1 values (1);
@@ -411,6 +411,8 @@
 A
 B
 NULL
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warnings:
 a
 b
 SELECT a,count(*) FROM t1 GROUP BY binary a;
@@ -418,6 +420,8 @@
 A	4
 B	4
 NULL	3
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warnings:
 a	1
 b	1
 SELECT binary a FROM t1 GROUP BY 1;
@@ -425,6 +429,8 @@
 A
 B
 NULL
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warnings:
 a
 b
 SELECT binary a,count(*) FROM t1 GROUP BY 1;
@@ -432,6 +438,8 @@
 A	4
 B	4
 NULL	3
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warnings:
 a	1
 b	1
 SET BIG_TABLES=1;
@@ -450,6 +458,9 @@
 A
 B
 NULL
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warnings:
 a
 b
 SELECT a,count(*) FROM t1 GROUP BY binary a ORDER BY binary a;
@@ -457,6 +468,9 @@
 A	4
 B	4
 NULL	3
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warnings:
 a	1
 b	1
 SELECT binary a FROM t1 GROUP BY 1 ORDER BY 1;
@@ -464,6 +478,8 @@
 A
 B
 NULL
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warnings:
 a
 b
 SELECT binary a,count(*) FROM t1 GROUP BY 1 ORDER BY 1;
@@ -471,6 +487,8 @@
 A	4
 B	4
 NULL	3
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warnings:
 a	1
 b	1
 SET BIG_TABLES=0;
@@ -844,9 +862,13 @@
 Warnings:
 Warning	1287	Setting user variables within expressions is deprecated and will be removed in a future release. Consider alternatives: 'SET variable=expression, ...', or 'SELECT expression(s) INTO variables(s)'.
 delete from t2  where a = 2 and b = 'val-2' order by a,b,c,d limit 30;
+ANALYZE TABLE t1, t2;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
 explain select c from t2 where a = 2 and b = 'val-2' group by c;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t2	NULL	ref	PRIMARY,a	PRIMARY	402	const,const	36	100.00	Using where
+1	SIMPLE	t2	NULL	ref	PRIMARY,a	PRIMARY	402	const,const	6	100.00	Using where
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t2`.`c` AS `c` from `test`.`t2` where ((`test`.`t2`.`a` = 2) and (`test`.`t2`.`b` = 'val-2')) group by `test`.`t2`.`c`
 select c from t2 where a = 2 and b = 'val-2' group by c;
@@ -3049,7 +3071,7 @@
 
 EXPLAIN SELECT SQL_BUFFER_RESULT MIN(a), b FROM t1 WHERE t1.b = 'a' GROUP BY b;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	range	b	b	12	NULL	2	100.00	Using where; Using index for group-by; Using temporary
+1	SIMPLE	t1	NULL	range	b	b	12	NULL	1	100.00	Using where; Using index for group-by; Using temporary
 Warnings:
 Note	1003	/* select#1 */ select sql_buffer_result min(`test`.`t1`.`a`) AS `MIN(a)`,`test`.`t1`.`b` AS `b` from `test`.`t1` where (`test`.`t1`.`b` = 'a') group by `test`.`t1`.`b`
 
@@ -3059,7 +3081,7 @@
 
 EXPLAIN SELECT MIN(a), b FROM t1 WHERE t1.b = 'a' GROUP BY b;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	range	b	b	12	NULL	2	100.00	Using where; Using index for group-by
+1	SIMPLE	t1	NULL	range	b	b	12	NULL	1	100.00	Using where; Using index for group-by
 Warnings:
 Note	1003	/* select#1 */ select min(`test`.`t1`.`a`) AS `MIN(a)`,`test`.`t1`.`b` AS `b` from `test`.`t1` where (`test`.`t1`.`b` = 'a') group by `test`.`t1`.`b`
 
@@ -4248,3 +4270,21 @@
 STDDEV_POP(c1)	STDDEV_SAMP(c1)	VAR_POP(c1)	VAR_SAMP(c1)
 NULL	NULL	NULL	NULL
 DROP TABLE t1;
+#
+# Verify that ROLLUP and DISTINCT on nullable GROUP BY expressions
+# work as expected (the sort is not elided).
+#
+CREATE TABLE t1 (a INTEGER);
+INSERT INTO t1 VALUES (NULL), (1), (2);
+SELECT DISTINCT a, COUNT(*) FROM t1 GROUP BY a WITH ROLLUP;
+a	COUNT(*)
+1	1
+2	1
+NULL	1
+NULL	3
+DROP TABLE t1;
+#
+# Bug #33007298: RECENT REGRESSION: CRASH IN QEP_SHARED_OWNER::TABLE
+#
+select is_uuid(avg(distinct json_storage_free('$b*<*#]E')));
+ERROR 22032: Invalid JSON text in argument 1 to function json_storage_free: "Invalid value." at position 0.
diff -Nru mysql-8.0-8.0.26/mysql-test/r/group_min_max.result mysql-8.0-8.0.27/mysql-test/r/group_min_max.result
--- mysql-8.0-8.0.26/mysql-test/r/group_min_max.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/group_min_max.result	2021-09-28 11:46:34.000000000 +0000
@@ -138,7 +138,7 @@
 Note	1003	/* select#1 */ select `test`.`t1`.`a1` AS `a1`,min(`test`.`t1`.`a2`) AS `min(a2)` from `test`.`t1` group by `test`.`t1`.`a1`
 explain format=tree select a1, min(a2) from t1 group by a1;
 EXPLAIN
--> Index range scan on t1 using index_for_group_by(idx_t1_1)  (cost=3.25 rows=5)
+-> Covering index range scan on t1 using index_for_group_by(idx_t1_1)  (cost=3.25 rows=5)
 
 explain select a1, max(a2) from t1 group by a1;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -1697,7 +1697,7 @@
 explain format=tree select a1,a2,b from t1 where (a1 >= 'c' or a2 < 'b') and (b > 'a') group by a1,a2,b;
 EXPLAIN
 -> Filter: (((t1.a1 >= 'c') or (t1.a2 < 'b')) and (t1.b > 'a'))  (cost=11.05 rows=17)
-    -> Index range scan on t1 using index_for_group_by(idx_t1_1)  (cost=11.05 rows=17)
+    -> Covering index range scan on t1 using index_for_group_by(idx_t1_1)  (cost=11.05 rows=17)
 
 explain select a1,a2,b from t1 where (a2 >= 'b') and (b = 'a') group by a1,a2,b;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -2816,7 +2816,7 @@
 3	9
 explain select sql_buffer_result a, max(b)+1 from t1 where a = 0 group by a;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	range	PRIMARY,index	index	4	NULL	3	100.00	Using where; Using index for group-by; Using temporary
+1	SIMPLE	t1	NULL	range	PRIMARY,index	PRIMARY	4	NULL	1	100.00	Using where; Using index for group-by; Using temporary
 Warnings:
 Note	1003	/* select#1 */ select sql_buffer_result `test`.`t1`.`a` AS `a`,(max(`test`.`t1`.`b`) + 1) AS `max(b)+1` from `test`.`t1` where (`test`.`t1`.`a` = 0) group by `test`.`t1`.`a`
 drop table t1;
@@ -3779,7 +3779,7 @@
 (4,14), (4,15), (4,16), (4,17), (4,18), (4,19), (4,20),(5,5);
 EXPLAIN SELECT MAX(c2), c1 FROM t1 WHERE c1 = 4 GROUP BY c1;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	range	c1	c1	5	NULL	7	100.00	Using where; Using index for group-by
+1	SIMPLE	t1	NULL	range	c1	c1	5	NULL	1	100.00	Using where; Using index for group-by
 Warnings:
 Note	1003	/* select#1 */ select max(`test`.`t1`.`c2`) AS `MAX(c2)`,`test`.`t1`.`c1` AS `c1` from `test`.`t1` where (`test`.`t1`.`c1` = 4) group by `test`.`t1`.`c1`
 FLUSH STATUS;
@@ -4487,3 +4487,53 @@
 Note	1276	Field or reference 'test.t1.b' of SELECT #2 was resolved in SELECT #1
 DROP TABLE t1, t2;
 # End of test for Bug#30242457
+#
+# Bug #32769369: SIG11 IN ITEM_FIELD::ITEM_FIELD|SQL/ITEM.CC WITH HYPERGRAPH
+#
+CREATE TABLE t1 (a INTEGER, KEY (a));
+INSERT INTO t1 VALUES (1);
+SELECT SQL_BUFFER_RESULT MIN(t1.a) FROM t1, t1 AS t2;
+MIN(t1.a)
+1
+DROP TABLE t1;
+# Bug#32266286 : ADDING GROUP BY SLOWS DOWN A QUERY.
+#
+CREATE TABLE t0 (i0 INTEGER);
+INSERT INTO t0 VALUES (1), (2), (3), (4), (5);
+INSERT INTO t0 VALUES (6), (7), (8), (9);
+CREATE TABLE t1 (f1 INTEGER, f2 INTEGER, KEY (f1,f2));
+INSERT INTO t1 SELECT 1, i0 from t0;
+INSERT INTO t1 SELECT i0+1, i0*rand()*10 from t0;
+INSERT INTO t1 VALUES (1,0);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+EXPLAIN FORMAT=tree SELECT MIN(f2) FROM t1 WHERE f1=1 GROUP BY f1;
+EXPLAIN
+-> Filter: (t1.f1 = 1)
+    -> Covering index range scan on t1 using index_for_group_by(f1)
+
+SELECT MIN(f2) FROM t1 WHERE f1=1 GROUP BY f1;
+MIN(f2)
+0
+INSERT INTO t1 VALUES (NULL, 1);
+INSERT INTO t1 VALUES (NULL, 2);
+EXPLAIN FORMAT=tree SELECT MIN(f2) FROM t1 WHERE f1 IS NULL GROUP BY f1;
+EXPLAIN
+-> Table scan on <temporary>
+    -> Temporary table with deduplication
+        -> Filter: (t1.f1 is null)
+            -> Covering index range scan on t1 using index_for_group_by(f1)
+
+SELECT MIN(f2) FROM t1 WHERE f1 IS NULL GROUP BY f1;
+MIN(f2)
+1
+DROP TABLE t0,t1;
+#
+# Bug#33139598: REGRESSION: CRASH IN GET_BEST_GROUP_MIN_MAX
+#
+CREATE TABLE t1 (f1 ENUM(''), KEY(f1));
+INSERT INTO t1 VALUES(''),('');
+SELECT 1 FROM t1 WHERE f1=UUID() GROUP BY f1 LIMIT 1;
+1
+DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/hash_join.result mysql-8.0-8.0.27/mysql-test/r/hash_join.result
--- mysql-8.0-8.0.26/mysql-test/r/hash_join.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/hash_join.result	2021-09-28 11:46:34.000000000 +0000
@@ -812,11 +812,11 @@
 EXPLAIN FORMAT=tree SELECT t1.col_int_key AS field1, t2.col_int AS field2 FROM t2
 JOIN t1 ON 1 WHERE (CAST("1" AS JSON) MEMBER OF( t1.col_json->'$[*]'));
 EXPLAIN
--> Inner hash join (no condition)  (cost=*** rows=5)
+-> Inner hash join (no condition)  (cost=*** rows=10)
     -> Table scan on t2  (cost=*** rows=5)
     -> Hash
-        -> Filter: json'"1"' member of (cast(json_extract(col_json,_utf8mb4'$[*]') as char(40) array))  (cost=*** rows=1)
-            -> Index lookup on t1 using mv_idx (cast(json_extract(col_json,_utf8mb4'$[*]') as char(40) array)=json'"1"')  (cost=*** rows=1)
+        -> Filter: json'"1"' member of (cast(json_extract(col_json,_utf8mb4'$[*]') as char(40) array))  (cost=*** rows=2)
+            -> Index lookup on t1 using mv_idx (cast(json_extract(col_json,_utf8mb4'$[*]') as char(40) array)=json'"1"')  (cost=*** rows=2)
 
 SELECT t1.col_int_key AS field1, t2.col_int AS field2 FROM t2
 JOIN t1 ON 1 WHERE (CAST("1" AS JSON) MEMBER OF( t1.col_json->'$[*]'));
@@ -1118,8 +1118,8 @@
                             -> Hash
                                 -> Filter: (t2.f2 is not null)  (cost=0.55 rows=3)
                                     -> Index scan on t2 using f2  (cost=0.55 rows=3)
-                        -> Index lookup on ta3 using f2 (f2=t2.f2)  (cost=0.30 rows=2)
-                    -> Single-row index lookup on ta4 using PRIMARY (f1=t4.f1)  (cost=0.08 rows=1)
+                        -> Covering index lookup on ta3 using f2 (f2=t2.f2)  (cost=0.30 rows=2)
+                    -> Single-row covering index lookup on ta4 using PRIMARY (f1=t4.f1)  (cost=0.08 rows=1)
 
 SELECT /*+ JOIN_PREFIX(t2@qb2, t4@qb1, ta3, ta4) */
 COUNT(*) FROM t1 JOIN t2 AS ta3 JOIN t2 AS ta4
@@ -1234,7 +1234,7 @@
                         -> Index lookup on alias3 using <auto_key0> (col_int_key=alias2.col_int_key, col_varchar_key=alias2.col_varchar_key)
                             -> Materialize  (cost=0.45..0.45 rows=1)
                                 -> Table scan on sq1_alias1  (cost=0.35 rows=1)
-        -> Index lookup on alias1 using idx (col_varchar_key=sq2_alias1.col_varchar)  (cost=0.26 rows=1)
+        -> Covering index lookup on alias1 using idx (col_varchar_key=sq2_alias1.col_varchar)  (cost=0.26 rows=1)
 
 Warnings:
 Note	1276	Field or reference 'test.alias2.col_varchar' of SELECT #3 was resolved in SELECT #1
@@ -1526,7 +1526,7 @@
                                                 -> Limit: 100 row(s)  (cost=9.92 rows=27)
                                                     -> Nested loop left join  (cost=9.92 rows=27)
                                                         -> Table scan on sq1_alias2  (cost=2.25 rows=20)
-                                                        -> Index lookup on sq1_alias1 using col_varchar_key (col_varchar_key=sq1_alias2.col_varchar_key)  (cost=0.26 rows=1)
+                                                        -> Covering index lookup on sq1_alias1 using col_varchar_key (col_varchar_key=sq1_alias2.col_varchar_key)  (cost=0.26 rows=1)
 
 Warnings:
 Note	1276	Field or reference 'alias1.col_varchar' of SELECT #3 was resolved in SELECT #1
@@ -1637,7 +1637,7 @@
         -> Hash
             -> Table scan on subquery1_t1  (cost=0.35 rows=1)
     -> Nested loop semijoin  (cost=3.83 rows=2)
-        -> Index lookup on table2 using <auto_key0> (col_varchar=subquery1_t1.col_varchar)
+        -> Covering index lookup on table2 using <auto_key0> (col_varchar=subquery1_t1.col_varchar)
             -> Materialize  (cost=3.38..3.38 rows=2)
                 -> Table scan on <temporary>  (cost=1.26..2.52 rows=2)
                     -> Temporary table with deduplication  (cost=1.91..3.17 rows=2)
@@ -1957,7 +1957,7 @@
         -> Nested loop inner join  (cost=8.61 rows=1)
             -> Filter: (t1.col1 <> t2.col1)  (cost=0.01 rows=1)
                 -> Index scan on t1 using idx  (cost=0.01 rows=1)
-            -> Index lookup on t1_2 using idx (col1=t1.col1)  (cost=0.25 rows=1)
+            -> Covering index lookup on t1_2 using idx (col1=t1.col1)  (cost=0.25 rows=1)
 
 Warnings:
 Note	1276	Field or reference 'test.t2.col1' of SELECT #3 was resolved in SELECT #1
@@ -3933,3 +3933,20 @@
 SELECT 1 FROM t AS a INNER JOIN t AS b ON a.a=b.b;
 1
 DROP TABLE t;
+# Bug#33204161: Strings with ASCII charset and UCS2 don't match in join
+CREATE TABLE t1(wstr_name VARCHAR(64) COLLATE ucs2_general_ci);
+CREATE TABLE t2(str_name VARCHAR(64) COLLATE ascii_general_ci);
+INSERT INTO t1 VALUES('9337a53f-cfd6-4a68-a1fc-e2d84eba8079');
+INSERT INTO t2 VALUES('9337a53f-cfd6-4a68-a1fc-e2d84eba8079');
+explain SELECT wstr_name, str_name
+FROM t1 INNER JOIN t2 ON t1.wstr_name = t2.str_name;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
+1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Using where; Using join buffer (hash join)
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`wstr_name` AS `wstr_name`,`test`.`t2`.`str_name` AS `str_name` from `test`.`t1` join `test`.`t2` where (`test`.`t1`.`wstr_name` = `test`.`t2`.`str_name`)
+SELECT wstr_name, str_name
+FROM t1 INNER JOIN t2 ON t1.wstr_name = t2.str_name;
+wstr_name	str_name
+9337a53f-cfd6-4a68-a1fc-e2d84eba8079	9337a53f-cfd6-4a68-a1fc-e2d84eba8079
+DROP TABLE t1, t2;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/having.result mysql-8.0-8.0.27/mysql-test/r/having.result
--- mysql-8.0-8.0.26/mysql-test/r/having.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/having.result	2021-09-28 11:46:34.000000000 +0000
@@ -945,3 +945,18 @@
 SELECT 1 HAVING json_objectagg(utc_date(), 1416) <> 0;
 1
 1
+#
+# Bug #33152269: No result set returned when using HAVING COUNT(DISTINCT ...)
+#
+CREATE TABLE t1 (a INTEGER);
+INSERT INTO t1 VALUES (1), (2);
+SELECT DISTINCT
+COUNT(DISTINCT t1.a) AS da
+FROM
+t1
+JOIN t1 AS t2 ON t1.a = t2.a
+GROUP BY t1.a
+HAVING COUNT(DISTINCT t1.a) = 1;
+da
+1
+DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/heap_btree.result mysql-8.0-8.0.27/mysql-test/r/heap_btree.result
--- mysql-8.0-8.0.26/mysql-test/r/heap_btree.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/heap_btree.result	2021-09-28 11:46:34.000000000 +0000
@@ -44,8 +44,8 @@
 select * from t1,t1 as t2 where t1.x=t2.y;
 x	y	x	y
 1	1	1	1
-2	2	2	2
 1	3	1	1
+2	2	2	2
 2	4	2	2
 2	5	2	2
 2	6	2	2
diff -Nru mysql-8.0-8.0.26/mysql-test/r/histogram_equi_height.result mysql-8.0-8.0.27/mysql-test/r/histogram_equi_height.result
--- mysql-8.0-8.0.26/mysql-test/r/histogram_equi_height.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/histogram_equi_height.result	2021-09-28 11:46:34.000000000 +0000
@@ -265,14 +265,14 @@
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	tbl_varchar	NULL	ALL	NULL	NULL	NULL	NULL	10	10.00	Using where
 Warnings:
-Warning	1300	Cannot convert string '\xF0\x9F\x8D\xA3' from utf8mb4 to utf8
+Warning	1300	Cannot convert string '\xF0\x9F\x8D\xA3' from utf8mb4 to utf8mb3
 Note	1003	/* select#1 */ select `test`.`tbl_varchar`.`col1` AS `col1` from `test`.`tbl_varchar` where (`test`.`tbl_varchar`.`col1` in ('ag','ef','?'))
 # Expect "80.0" in column "filtered"
 EXPLAIN SELECT * FROM tbl_varchar WHERE col1 NOT IN ("ag", "ef", "�");
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	tbl_varchar	NULL	ALL	NULL	NULL	NULL	NULL	10	80.00	Using where
 Warnings:
-Warning	1300	Cannot convert string '\xF0\x9F\x8D\xA3' from utf8mb4 to utf8
+Warning	1300	Cannot convert string '\xF0\x9F\x8D\xA3' from utf8mb4 to utf8mb3
 Note	1003	/* select#1 */ select `test`.`tbl_varchar`.`col1` AS `col1` from `test`.`tbl_varchar` where (`test`.`tbl_varchar`.`col1` not in ('ag','ef','?'))
 DROP TABLE tbl_varchar;
 CREATE TABLE tbl_varchar (col1 VARCHAR(255));
diff -Nru mysql-8.0-8.0.26/mysql-test/r/histogram_singleton.result mysql-8.0-8.0.27/mysql-test/r/histogram_singleton.result
--- mysql-8.0-8.0.26/mysql-test/r/histogram_singleton.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/histogram_singleton.result	2021-09-28 11:46:34.000000000 +0000
@@ -186,13 +186,13 @@
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	tbl_varchar	NULL	ALL	NULL	NULL	NULL	NULL	10	10.00	Using where
 Warnings:
-Warning	1300	Cannot convert string '\xF0\x9F\x8D\xA1' from utf8mb4 to utf8
+Warning	1300	Cannot convert string '\xF0\x9F\x8D\xA1' from utf8mb4 to utf8mb3
 Note	1003	/* select#1 */ select `test`.`tbl_varchar`.`col1` AS `col1` from `test`.`tbl_varchar` where (`test`.`tbl_varchar`.`col1` < '?')
 EXPLAIN SELECT * FROM tbl_varchar WHERE "�" > col1;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	tbl_varchar	NULL	ALL	NULL	NULL	NULL	NULL	10	10.00	Using where
 Warnings:
-Warning	1300	Cannot convert string '\xF0\x9F\x8D\xA1' from utf8mb4 to utf8
+Warning	1300	Cannot convert string '\xF0\x9F\x8D\xA1' from utf8mb4 to utf8mb3
 Note	1003	/* select#1 */ select `test`.`tbl_varchar`.`col1` AS `col1` from `test`.`tbl_varchar` where ('?' > `test`.`tbl_varchar`.`col1`)
 # Expect "80.0" in column "filtered"
 EXPLAIN SELECT * FROM tbl_varchar WHERE col1 < "sierra";
@@ -289,14 +289,14 @@
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	tbl_varchar	NULL	ALL	NULL	NULL	NULL	NULL	10	30.00	Using where
 Warnings:
-Warning	1300	Cannot convert string '\xF0\x9F\x8D\xA3' from utf8mb4 to utf8
+Warning	1300	Cannot convert string '\xF0\x9F\x8D\xA3' from utf8mb4 to utf8mb3
 Note	1003	/* select#1 */ select `test`.`tbl_varchar`.`col1` AS `col1` from `test`.`tbl_varchar` where (`test`.`tbl_varchar`.`col1` in ('ag','ef','?'))
 # Expect "50.0" in column "filtered"
 EXPLAIN SELECT * FROM tbl_varchar WHERE col1 NOT IN ("ag", "ef", "�");
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	tbl_varchar	NULL	ALL	NULL	NULL	NULL	NULL	10	50.00	Using where
 Warnings:
-Warning	1300	Cannot convert string '\xF0\x9F\x8D\xA3' from utf8mb4 to utf8
+Warning	1300	Cannot convert string '\xF0\x9F\x8D\xA3' from utf8mb4 to utf8mb3
 Note	1003	/* select#1 */ select `test`.`tbl_varchar`.`col1` AS `col1` from `test`.`tbl_varchar` where (`test`.`tbl_varchar`.`col1` not in ('ag','ef','?'))
 DROP TABLE tbl_varchar;
 #
diff -Nru mysql-8.0-8.0.26/mysql-test/r/hostname_length.result mysql-8.0-8.0.27/mysql-test/r/hostname_length.result
--- mysql-8.0-8.0.26/mysql-test/r/hostname_length.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/hostname_length.result	2021-09-28 11:46:34.000000000 +0000
@@ -12,7 +12,7 @@
 CREATE USER some_user_name@host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890;
 SHOW CREATE USER some_user_name@host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890;
 CREATE USER for some_user_name@host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890
-CREATE USER 'some_user_name'@'host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890' IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `some_user_name`@`host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890` IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 SHOW GRANTS FOR some_user_name@host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890;
 Grants for some_user_name@host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890
 GRANT USAGE ON *.* TO `some_user_name`@`host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890`
diff -Nru mysql-8.0-8.0.26/mysql-test/r/information_schema_keywords.result mysql-8.0-8.0.27/mysql-test/r/information_schema_keywords.result
--- mysql-8.0-8.0.26/mysql-test/r/information_schema_keywords.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/information_schema_keywords.result	2021-09-28 11:46:34.000000000 +0000
@@ -27,6 +27,7 @@
 ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS	0
 AT	0
 ATTRIBUTE	0
+AUTHENTICATION	0
 AUTOEXTEND_SIZE	0
 AUTO_INCREMENT	0
 AVG	0
@@ -55,6 +56,7 @@
 CASE	1
 CATALOG_NAME	0
 CHAIN	0
+CHALLENGE_RESPONSE	0
 CHANGE	1
 CHANGED	0
 CHANNEL	0
@@ -183,6 +185,7 @@
 EXPORT	0
 EXTENDED	0
 EXTENT_SIZE	0
+FACTOR	0
 FAILED_LOGIN_ATTEMPTS	0
 FALSE	1
 FAST	0
@@ -192,6 +195,7 @@
 FILE	0
 FILE_BLOCK_SIZE	0
 FILTER	0
+FINISH	0
 FIRST	0
 FIRST_VALUE	1
 FIXED	0
@@ -226,6 +230,7 @@
 GROUPING	1
 GROUPS	1
 GROUP_REPLICATION	0
+GTID_ONLY	0
 HANDLER	0
 HASH	0
 HAVING	1
@@ -249,7 +254,9 @@
 INDEX	1
 INDEXES	0
 INFILE	1
+INITIAL	0
 INITIAL_SIZE	0
+INITIATE	0
 INNER	1
 INOUT	1
 INSENSITIVE	1
@@ -484,6 +491,7 @@
 REFERENCE	0
 REFERENCES	1
 REGEXP	1
+REGISTRATION	0
 RELAY	0
 RELAYLOG	0
 RELAY_LOG_FILE	0
@@ -694,6 +702,7 @@
 UNIQUE	1
 UNKNOWN	0
 UNLOCK	1
+UNREGISTER	0
 UNSIGNED	1
 UNTIL	0
 UPDATE	1
diff -Nru mysql-8.0-8.0.26/mysql-test/r/initialize-init-acls.result mysql-8.0-8.0.27/mysql-test/r/initialize-init-acls.result
--- mysql-8.0-8.0.26/mysql-test/r/initialize-init-acls.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/initialize-init-acls.result	2021-09-28 11:46:34.000000000 +0000
@@ -23,7 +23,7 @@
 # Must have a password
 SHOW CREATE USER u2@localhost;
 CREATE USER for u2@localhost
-CREATE USER 'u2'@'localhost' IDENTIFIED WITH '<default_auth_plugin>' AS '<password_hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u2`@`localhost` IDENTIFIED WITH '<default_auth_plugin>' AS '<password_hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 # shut server down
 # Server is down
 # close the test connection
diff -Nru mysql-8.0-8.0.26/mysql-test/r/innodb_explain_json_non_select_all.result mysql-8.0-8.0.27/mysql-test/r/innodb_explain_json_non_select_all.result
--- mysql-8.0-8.0.26/mysql-test/r/innodb_explain_json_non_select_all.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/innodb_explain_json_non_select_all.result	2021-09-28 11:46:34.000000000 +0000
@@ -6364,7 +6364,7 @@
 1	UPDATE	t11	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	NULL
 1	SIMPLE	t12	NULL	index	NULL	a	5	NULL	2	100.00	Using index
 Warnings:
-Note	1003	update ignore (`test`.`t1` `t11` join `test`.`t1` `t12`) set `t11`.`a` = 1
+Note	1003	update ignore (`test`.`t1` `t11` join `test`.`t1` `t12`) set `test`.`t11`.`a` = 1
 UPDATE IGNORE v1 SET a = 1;
 ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. 
 SET SESSION sql_safe_updates = DEFAULT;
@@ -6383,7 +6383,7 @@
 1	UPDATE	t11	NULL	ALL	NULL	NULL	NULL	NULL	2	50.00	Using where
 1	SIMPLE	t12	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	NULL
 Warnings:
-Note	1003	update (`test`.`t1` `t11` join `test`.`t1` `t12`) set `t11`.`a` = 1 where (`t11`.`a` > 0)
+Note	1003	update (`test`.`t1` `t11` join `test`.`t1` `t12`) set `test`.`t11`.`a` = 1 where (`test`.`t11`.`a` > 0)
 FLUSH STATUS;
 FLUSH TABLES;
 Variable_name	Value
diff -Nru mysql-8.0-8.0.26/mysql-test/r/innodb_explain_json_non_select_none.result mysql-8.0-8.0.27/mysql-test/r/innodb_explain_json_non_select_none.result
--- mysql-8.0-8.0.26/mysql-test/r/innodb_explain_json_non_select_none.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/innodb_explain_json_non_select_none.result	2021-09-28 11:46:34.000000000 +0000
@@ -6352,7 +6352,7 @@
 1	UPDATE	t11	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	NULL
 1	SIMPLE	t12	NULL	index	NULL	a	5	NULL	2	100.00	Using index
 Warnings:
-Note	1003	update ignore (`test`.`t1` `t11` join `test`.`t1` `t12`) set `t11`.`a` = 1
+Note	1003	update ignore (`test`.`t1` `t11` join `test`.`t1` `t12`) set `test`.`t11`.`a` = 1
 UPDATE IGNORE v1 SET a = 1;
 ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. 
 SET SESSION sql_safe_updates = DEFAULT;
@@ -6371,7 +6371,7 @@
 1	UPDATE	t11	NULL	ALL	NULL	NULL	NULL	NULL	2	50.00	Using where
 1	SIMPLE	t12	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	NULL
 Warnings:
-Note	1003	update (`test`.`t1` `t11` join `test`.`t1` `t12`) set `t11`.`a` = 1 where (`t11`.`a` > 0)
+Note	1003	update (`test`.`t1` `t11` join `test`.`t1` `t12`) set `test`.`t11`.`a` = 1 where (`test`.`t11`.`a` > 0)
 FLUSH STATUS;
 FLUSH TABLES;
 Variable_name	Value
diff -Nru mysql-8.0-8.0.26/mysql-test/r/innodb_explain_non_select_all.result mysql-8.0-8.0.27/mysql-test/r/innodb_explain_non_select_all.result
--- mysql-8.0-8.0.26/mysql-test/r/innodb_explain_non_select_all.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/innodb_explain_non_select_all.result	2021-09-28 11:46:34.000000000 +0000
@@ -2040,7 +2040,7 @@
 1	UPDATE	t11	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	NULL
 1	SIMPLE	t12	NULL	index	NULL	a	5	NULL	2	100.00	Using index
 Warnings:
-Note	1003	update ignore (`test`.`t1` `t11` join `test`.`t1` `t12`) set `t11`.`a` = 1
+Note	1003	update ignore (`test`.`t1` `t11` join `test`.`t1` `t12`) set `test`.`t11`.`a` = 1
 UPDATE IGNORE v1 SET a = 1;
 ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. 
 SET SESSION sql_safe_updates = DEFAULT;
@@ -2059,7 +2059,7 @@
 1	UPDATE	t11	NULL	ALL	NULL	NULL	NULL	NULL	2	50.00	Using where
 1	SIMPLE	t12	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	NULL
 Warnings:
-Note	1003	update (`test`.`t1` `t11` join `test`.`t1` `t12`) set `t11`.`a` = 1 where (`t11`.`a` > 0)
+Note	1003	update (`test`.`t1` `t11` join `test`.`t1` `t12`) set `test`.`t11`.`a` = 1 where (`test`.`t11`.`a` > 0)
 FLUSH STATUS;
 FLUSH TABLES;
 Variable_name	Value
diff -Nru mysql-8.0-8.0.26/mysql-test/r/innodb_explain_non_select_none.result mysql-8.0-8.0.27/mysql-test/r/innodb_explain_non_select_none.result
--- mysql-8.0-8.0.26/mysql-test/r/innodb_explain_non_select_none.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/innodb_explain_non_select_none.result	2021-09-28 11:46:34.000000000 +0000
@@ -2037,7 +2037,7 @@
 1	UPDATE	t11	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	NULL
 1	SIMPLE	t12	NULL	index	NULL	a	5	NULL	2	100.00	Using index
 Warnings:
-Note	1003	update ignore (`test`.`t1` `t11` join `test`.`t1` `t12`) set `t11`.`a` = 1
+Note	1003	update ignore (`test`.`t1` `t11` join `test`.`t1` `t12`) set `test`.`t11`.`a` = 1
 UPDATE IGNORE v1 SET a = 1;
 ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. 
 SET SESSION sql_safe_updates = DEFAULT;
@@ -2056,7 +2056,7 @@
 1	UPDATE	t11	NULL	ALL	NULL	NULL	NULL	NULL	2	50.00	Using where
 1	SIMPLE	t12	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	NULL
 Warnings:
-Note	1003	update (`test`.`t1` `t11` join `test`.`t1` `t12`) set `t11`.`a` = 1 where (`t11`.`a` > 0)
+Note	1003	update (`test`.`t1` `t11` join `test`.`t1` `t12`) set `test`.`t11`.`a` = 1 where (`test`.`t11`.`a` > 0)
 FLUSH STATUS;
 FLUSH TABLES;
 Variable_name	Value
diff -Nru mysql-8.0-8.0.26/mysql-test/r/innodb_pk_extension_on.result mysql-8.0-8.0.27/mysql-test/r/innodb_pk_extension_on.result
--- mysql-8.0-8.0.26/mysql-test/r/innodb_pk_extension_on.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/innodb_pk_extension_on.result	2021-09-28 11:46:34.000000000 +0000
@@ -290,7 +290,7 @@
 ORDER BY pk_2 DESC LIMIT 5;
 EXPLAIN
 -> Limit: 5 row(s)  (cost=0.45 rows=2)
-    -> Index lookup on t1 using k1 (f1=TIMESTAMP'2000-01-03 00:00:00', pk_1=3; iterate backwards)  (cost=0.45 rows=2)
+    -> Covering index lookup on t1 using k1 (f1=TIMESTAMP'2000-01-03 00:00:00', pk_1=3; iterate backwards)  (cost=0.45 rows=2)
 
 FLUSH STATUS;
 SELECT f1, pk_1, pk_2 FROM t1 WHERE pk_1 = 3 AND f1 = '2000-01-03'
diff -Nru mysql-8.0-8.0.26/mysql-test/r/insert.result mysql-8.0-8.0.27/mysql-test/r/insert.result
--- mysql-8.0-8.0.26/mysql-test/r/insert.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/insert.result	2021-09-28 11:46:34.000000000 +0000
@@ -988,14 +988,11 @@
 SHOW ERRORS;
 Level	Code	Message
 Error	1110	Column 'a' specified twice
-Error	1110	Column 'b' specified twice
 INSERT INTO t1(a, a, a, a) VALUES (1, 1, 1, 1);
 ERROR 42000: Column 'a' specified twice
 SHOW ERRORS;
 Level	Code	Message
 Error	1110	Column 'a' specified twice
-Error	1110	Column 'a' specified twice
-Error	1110	Column 'a' specified twice
 DROP TABLE t1;
 CREATE TABLE t1(a INT,
 b INT GENERATED ALWAYS AS (-a) VIRTUAL,
@@ -1078,3 +1075,42 @@
 DEALLOCATE PREPARE stmt;
 DROP VIEW v1;
 DROP TABLE t1, t2;
+#
+# Bug #32169656: MYSQL GIVING QUERY RESULT FOR WRONG COLUMN
+#
+CREATE TABLE t1 (
+Ñ INTEGER,
+N INTEGER,
+a INTEGER,
+b INTEGER,
+c INTEGER,
+d INTEGER,
+e INTEGER,
+f INTEGER,
+g INTEGER,
+h INTEGER,
+i INTEGER,
+j INTEGER,
+k INTEGER,
+l INTEGER,
+m INTEGER,
+na INTEGER,
+o INTEGER,
+p INTEGER,
+q INTEGER,
+r INTEGER,
+s INTEGER,
+t INTEGER,
+u INTEGER,
+v INTEGER,
+w INTEGER,
+x INTEGER,
+y INTEGER,
+z INTEGER,
+aa INTEGER,
+ab INTEGER,
+ac INTEGER,
+ad INTEGER
+);
+INSERT INTO t1 (Ñ, N) VALUES (1, 2);
+DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/join_outer_bka_nobnl.result mysql-8.0-8.0.27/mysql-test/r/join_outer_bka_nobnl.result
--- mysql-8.0-8.0.26/mysql-test/r/join_outer_bka_nobnl.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/join_outer_bka_nobnl.result	2021-09-28 11:46:34.000000000 +0000
@@ -1957,7 +1957,7 @@
             -> Nested loop inner join  (cost=0.70 rows=1)
                 -> Filter: (t3.col_varchar_10 = t2.col_varchar_10)  (cost=0.35 rows=1)
                     -> Table scan on t3  (cost=0.35 rows=1)
-                -> Single-row index lookup on t4 using PRIMARY (pk=t3.col_int)  (cost=0.35 rows=1)
+                -> Single-row covering index lookup on t4 using PRIMARY (pk=t3.col_int)  (cost=0.35 rows=1)
 
 DROP TABLE t1,t2,t3,t4;
 
@@ -3641,7 +3641,7 @@
         -> Nested loop inner join  (cost=1.15 rows=2)
             -> Filter: (t1.pk < 5)  (cost=0.45 rows=2)
                 -> Table scan on t1  (cost=0.45 rows=2)
-            -> Single-row index lookup on t2 using PRIMARY (pk=t1.pk)  (cost=0.30 rows=1)
+            -> Single-row covering index lookup on t2 using PRIMARY (pk=t1.pk)  (cost=0.30 rows=1)
     -> Multi-range index lookup on t3 using k2 (f2=t1.pk)
 
 SELECT * FROM t1 LEFT JOIN t2 ON t1.pk = t2.pk LEFT JOIN t3 ON t2.pk = t3.f2 WHERE t2.pk < 5;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/join_outer_bka.result mysql-8.0-8.0.27/mysql-test/r/join_outer_bka.result
--- mysql-8.0-8.0.26/mysql-test/r/join_outer_bka.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/join_outer_bka.result	2021-09-28 11:46:34.000000000 +0000
@@ -1957,7 +1957,7 @@
             -> Nested loop inner join  (cost=0.70 rows=1)
                 -> Filter: (t3.col_varchar_10 = t2.col_varchar_10)  (cost=0.35 rows=1)
                     -> Table scan on t3  (cost=0.35 rows=1)
-                -> Single-row index lookup on t4 using PRIMARY (pk=t3.col_int)  (cost=0.35 rows=1)
+                -> Single-row covering index lookup on t4 using PRIMARY (pk=t3.col_int)  (cost=0.35 rows=1)
 
 DROP TABLE t1,t2,t3,t4;
 
@@ -3643,7 +3643,7 @@
         -> Nested loop inner join  (cost=1.15 rows=2)
             -> Filter: (t1.pk < 5)  (cost=0.45 rows=2)
                 -> Table scan on t1  (cost=0.45 rows=2)
-            -> Single-row index lookup on t2 using PRIMARY (pk=t1.pk)  (cost=0.30 rows=1)
+            -> Single-row covering index lookup on t2 using PRIMARY (pk=t1.pk)  (cost=0.30 rows=1)
     -> Multi-range index lookup on t3 using k2 (f2=t1.pk)
 
 SELECT * FROM t1 LEFT JOIN t2 ON t1.pk = t2.pk LEFT JOIN t3 ON t2.pk = t3.f2 WHERE t2.pk < 5;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/join_outer.result mysql-8.0-8.0.27/mysql-test/r/join_outer.result
--- mysql-8.0-8.0.26/mysql-test/r/join_outer.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/join_outer.result	2021-09-28 11:46:34.000000000 +0000
@@ -1956,7 +1956,7 @@
             -> Nested loop inner join  (cost=0.70 rows=1)
                 -> Filter: (t3.col_varchar_10 = t2.col_varchar_10)  (cost=0.35 rows=1)
                     -> Table scan on t3  (cost=0.35 rows=1)
-                -> Single-row index lookup on t4 using PRIMARY (pk=t3.col_int)  (cost=0.35 rows=1)
+                -> Single-row covering index lookup on t4 using PRIMARY (pk=t3.col_int)  (cost=0.35 rows=1)
 
 DROP TABLE t1,t2,t3,t4;
 
@@ -3641,7 +3641,7 @@
     -> Nested loop inner join  (cost=1.15 rows=2)
         -> Filter: (t1.pk < 5)  (cost=0.45 rows=2)
             -> Table scan on t1  (cost=0.45 rows=2)
-        -> Single-row index lookup on t2 using PRIMARY (pk=t1.pk)  (cost=0.30 rows=1)
+        -> Single-row covering index lookup on t2 using PRIMARY (pk=t1.pk)  (cost=0.30 rows=1)
     -> Index lookup on t3 using k2 (f2=t1.pk)  (cost=0.38 rows=1)
 
 SELECT * FROM t1 LEFT JOIN t2 ON t1.pk = t2.pk LEFT JOIN t3 ON t2.pk = t3.f2 WHERE t2.pk < 5;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/join.result mysql-8.0-8.0.27/mysql-test/r/join.result
--- mysql-8.0-8.0.26/mysql-test/r/join.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/join.result	2021-09-28 11:46:34.000000000 +0000
@@ -1796,7 +1796,7 @@
 -> Index scan on t1 using j  (cost=411.60 rows=4096)
 -> Select #2 (subquery in projection; dependent)
     -> Limit: 1 row(s)  (cost=410.97 rows=1)
-        -> Index lookup on t2 using j (j=t1.j; iterate backwards)  (cost=410.97 rows=4096)
+        -> Covering index lookup on t2 using j (j=t1.j; iterate backwards)  (cost=410.97 rows=4096)
 
 Warnings:
 Note	1276	Field or reference 'test.t1.j' of SELECT #2 was resolved in SELECT #1
@@ -1848,12 +1848,12 @@
 -> Table scan on <temporary>  (cost=1.26..2.52 rows=2)
     -> Temporary table with deduplication  (cost=1.91..3.17 rows=2)
         -> Table scan on t1  (cost=0.45 rows=2)
--> Select #2 (subquery in projection; dependent)
-    -> Aggregate: count(0)  (cost=1.75 rows=4)
-        -> Nested loop left join  (cost=1.35 rows=4)
-            -> Table scan on t2  (cost=0.45 rows=2)
-            -> Filter: (t3.a > (t2.a - t1.a))  (cost=0.35 rows=2)
-                -> Table scan on t3  (cost=0.35 rows=2)
+        -> Select #2 (subquery in projection; dependent)
+            -> Aggregate: count(0)  (cost=1.75 rows=4)
+                -> Nested loop left join  (cost=1.35 rows=4)
+                    -> Table scan on t2  (cost=0.45 rows=2)
+                    -> Filter: (t3.a > (t2.a - t1.a))  (cost=0.35 rows=2)
+                        -> Table scan on t3  (cost=0.35 rows=2)
 
 Warnings:
 Note	1276	Field or reference 'test.t1.a' of SELECT #2 was resolved in SELECT #1
@@ -2352,6 +2352,97 @@
 2
 DROP TABLE t1;
 #
+# Bug #32663072: WL#14418: ASSERTION `PATH->TYPE == ACCESSPATH::FILTER' FAILED|JOIN_OPTIMIZER.CC
+#
+CREATE TABLE t1 (c1 INTEGER, c2 INTEGER, c3 INTEGER, c4 INTEGER, c5 INTEGER, c6 INTEGER, c7 INTEGER, c8 INTEGER, c9 INTEGER, c10 INTEGER, c11 INTEGER, c12 INTEGER, c13 INTEGER, c14 INTEGER, c15 INTEGER, c16 INTEGER, c17 INTEGER, c18 INTEGER, c19 INTEGER, c20 INTEGER, c21 INTEGER, c22 INTEGER, c23 INTEGER, c24 INTEGER, c25 INTEGER, c26 INTEGER, c27 INTEGER, c28 INTEGER, c29 INTEGER, c30 INTEGER, c31 INTEGER, c32 INTEGER, c33 INTEGER, c34 INTEGER, c35 INTEGER, c36 INTEGER, c37 INTEGER, c38 INTEGER, c39 INTEGER, c40 INTEGER, c41 INTEGER, c42 INTEGER, c43 INTEGER, c44 INTEGER, c45 INTEGER, c46 INTEGER, c47 INTEGER, c48 INTEGER, c49 INTEGER, c50 INTEGER, c51 INTEGER, c52 INTEGER, c53 INTEGER, c54 INTEGER, c55 INTEGER, c56 INTEGER, c57 INTEGER, c58 INTEGER, c59 INTEGER, c60 INTEGER, c61 INTEGER);
+SELECT *
+FROM t1
+NATURAL JOIN (
+SELECT t2.*
+FROM t1 AS t2 JOIN t1 AS t3 ON t3.c1 = t2.c1
+WHERE t2.c3 <> ANY (SELECT c3 FROM t1)
+) AS d1;
+c1	c2	c3	c4	c5	c6	c7	c8	c9	c10	c11	c12	c13	c14	c15	c16	c17	c18	c19	c20	c21	c22	c23	c24	c25	c26	c27	c28	c29	c30	c31	c32	c33	c34	c35	c36	c37	c38	c39	c40	c41	c42	c43	c44	c45	c46	c47	c48	c49	c50	c51	c52	c53	c54	c55	c56	c57	c58	c59	c60	c61
+DROP TABLE t1;
+#
+# Bug #32672275: WL#14418: ASSERTION `ISSINGLEBITSET(PRED.TOTAL_ELIGIBILITY_SET)' FAILED.
+#
+CREATE TABLE t1 ( a INTEGER );
+SELECT *
+FROM t1 AS outer_t1
+WHERE EXISTS (
+SELECT t2.a
+FROM t1
+LEFT JOIN t1 AS t2 ON t2.a = outer_t1.a
+);
+a
+DROP TABLE t1;
+#
+# Bug #32643386: WL#14418: ASSERTION `FD_SET == IT_AND_INSERTED.FIRST->SECOND.ACTIVE_FUNCTIONAL_D
+#
+CREATE TABLE t1 ( a INTEGER );
+SELECT *
+FROM (t1 STRAIGHT_JOIN t1 AS t2) JOIN t1 AS t3 ON t1.a = t3.a
+WHERE t2.a = t3.a
+ORDER BY t1.a;
+a	a	a
+DROP TABLE t1;
+CREATE TABLE t1 (a INTEGER, b INTEGER);
+SELECT *
+FROM (t1 STRAIGHT_JOIN t1 AS t2 ON t1.b = t2.b) JOIN t1 AS t3 ON t1.a = t3.b
+WHERE t1.a < t2.b AND t2.a < t3.b
+ORDER BY t1.b;
+a	b	a	b	a	b
+DROP TABLE t1;
+#
+# Bug #32642893: WL#14418: ASSERTION `!ISMULTIPLEEQUALS(ITEM)' FAILED|MAKE_JOIN_HYPERGRAPH.CC
+#
+CREATE TABLE t1 ( a INTEGER );
+SELECT *
+FROM t1
+LEFT JOIN t1 AS t2 ON t1.a = t2.a
+LEFT JOIN t1 AS t3 ON t2.a = t3.a
+WHERE t2.a = t3.a OR t2.a <> t2.a;
+a	a	a
+DROP TABLE t1;
+#
+# Bug #32707348: WL#14418: RESULT MISMATCHES SEEN WITH HYPERGRAPH
+#
+CREATE TABLE t1 ( a INTEGER, b INTEGER );
+INSERT INTO t1 VALUES (1,2);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+SELECT * FROM t1, t1 AS t2, t1 AS t3 WHERE t1.a = t2.a AND t1.a = t3.b AND t1.a = t3.a;
+a	b	a	b	a	b
+DROP TABLE t1;
+#
+# Bug #32751315: WL#14418: ASSERTION `RIGHT != NULLPTR' FAILED|MAKE_JOIN_HYPERGRAPH.CC
+#
+CREATE TABLE t1 ( pk INTEGER );
+SELECT * FROM
+t1
+JOIN t1 AS t2 ON t1.pk = t2.pk
+JOIN t1 AS t3
+LEFT JOIN t1 AS t4 ON t2.pk = t3.pk AND t4.pk = 135;
+pk	pk	pk	pk
+DROP TABLE t1;
+#
+# Bug #32757178: WL#14418: ASSERTION `!EQ_ITEMS.IS_EMPTY()' FAILED|MAKE_JOIN_HYPERGRAPH.CC
+#
+CREATE TABLE t1 ( a INTEGER, b INTEGER );
+SELECT *
+FROM
+t1
+JOIN t1 AS t2 ON t1.a = t2.b
+LEFT JOIN t1 AS t3 ON t2.b = t3.b
+LEFT JOIN (
+t1 AS t4
+JOIN t1 AS t5 ON t4.b = t5.b
+) ON t2.b = t4.a
+WHERE t1.b >= 6 OR t3.b <> t4.b;
+a	b	a	b	a	b	a	b	a	b
+DROP TABLE t1;
 # Bug#32508878 - MYSQL SERVER CRASH - ASSERTION FAILURE IN
 # DEPS_OF_REMAINING_LATERAL_DERIVED_TABLES::RECALCULATE
 #
@@ -2375,6 +2466,38 @@
 Note	1003	/* select#1 */ select `test`.`x3`.`a` AS `a`,`test`.`x3`.`b` AS `b` from `test`.`t1` `x3` semi join (`test`.`t1` `x1` join `test`.`t1` `x2` join lateral (/* select#3 */ select count(`test`.`t1`.`a`) AS `c` from `test`.`t1` where (`test`.`t1`.`b` = `test`.`x1`.`b`)) `d3`) where ((`test`.`x2`.`b` = `test`.`x1`.`b`) and (`test`.`x1`.`b` = `d3`.`c`))
 DROP TABLE t1;
 #
+# Bug #32917482: SIG11 IN FLATTENINNERJOINS|MAKE_JOIN_HYPERGRAPH.CC
+#
+CREATE TABLE t1 (
+a VARCHAR(1),
+b INTEGER
+);
+SELECT *
+FROM
+t1
+JOIN t1 AS t2 ON t1.b = t2.b
+JOIN t1 AS t3
+JOIN (
+t1 AS t4 STRAIGHT_JOIN t1 AS t5 ON t4.a = t5.b
+) ON t1.b = t4.b
+WHERE t1.a = t5.b;
+a	b	a	b	a	b	a	b	a	b
+DROP TABLE t1;
+#
+# Bug #32939191: HYPERGRAPH: DIFFERENT RESULTS WHEN HYPERGRAPH_OPTIMIZER IS ON/OFF
+#
+CREATE TABLE t1 (a INTEGER);
+INSERT INTO t1 VALUES (1), (2), (3), (4);
+SELECT *
+FROM
+t1
+LEFT JOIN (
+t1 AS t2
+LEFT JOIN t1 AS t3 ON FALSE
+) ON t1.a <=> t3.a
+WHERE t1.a <=> t3.a;
+a	a	a
+DROP TABLE t1;
 # Bug#32915307- RECENT REGRESSION: ASSERTION
 # `JOIN->DEPS_OF_REMAINING_LATERAL_DERIVED_TABLES
 # == CALCULATE_LATERAL_DEPS_OF_FINAL_PLAN(FIRST_TAB_NO)' FAILED.
@@ -2441,3 +2564,71 @@
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`k` AS `k`,`test`.`t2`.`d` AS `d`,`test`.`t3`.`e` AS `e` from `test`.`t1` left join (`test`.`t2`) on((`test`.`t2`.`k` = `test`.`t1`.`t2ref`)) left join `test`.`t3` on((`test`.`t3`.`k` = `test`.`t2`.`t3ref`)) where true
 DROP TABLE t1, t2, t3;
+#
+# Bug #32976194: HYPERGRAPH: ASSERTION `!OVERLAPS(EXPR->LEFT->TABLES_IN_SUBTREE, EXPR->RIGHT->TAB
+#
+CREATE TABLE t1 ( a INTEGER );
+SELECT *
+FROM t1, t1 AS t2, t1 AS t3
+WHERE rand() > 0.5 OR (t1.a = 1 AND t2.a = 1);
+a	a	a
+DROP TABLE t1;
+#
+# Bug #33003335: HYPERGRAPH: ASSERTION `FD_SET == IT_AND_INSERTED.FIRST->SECOND.ACTIVE_FUNCTIONAL
+#
+CREATE TABLE t1 ( a INTEGER, b INTEGER );
+SELECT * FROM
+t1
+STRAIGHT_JOIN t1 AS t2 ON t1.b = t2.b
+JOIN (t1 AS t3 JOIN t1 AS t4 ON t3.a = t4.a AND t3.b = t4.b) ON t2.b = t3.b AND t2.a < t3.a
+ORDER BY t2.b;
+a	b	a	b	a	b	a	b
+DROP TABLE t1;
+#
+# Bug #33003581: HYPERGRAPH: ASSERTION `FALSE' FAILED|SQL/ITEM_CMPFUNC.CC
+#
+CREATE TABLE t1 ( i INTEGER );
+INSERT INTO t1 VALUES (1), (2);
+SELECT * FROM
+t1 LEFT JOIN (SELECT i FROM t1 WHERE FALSE) AS d1 ON t1.i = d1.i
+WHERE NOT EXISTS (SELECT 1 FROM t1 AS inner_t1 WHERE i = d1.i);
+i	i
+1	NULL
+2	NULL
+DROP TABLE t1;
+CREATE TABLE t1 ( a INTEGER, b INTEGER, c INTEGER, d INTEGER, e INTEGER, f INTEGER, g INTEGER, h INTEGER, i INTEGER, j INTEGER, k INTEGER, l INTEGER, m INTEGER, n INTEGER, o INTEGER, p INTEGER, q INTEGER, r INTEGER, s INTEGER, t INTEGER, u INTEGER, v INTEGER, w INTEGER, KEY (a) );
+SELECT 1
+FROM t1 NATURAL JOIN t1 AS t2 NATURAL JOIN t1 AS t3
+WHERE
+t1.a <> ( SELECT SUM(a) FROM t1 );
+1
+DROP TABLE t1;
+#
+# Bug #32366946: USE-AFTER-FREE WITH HYPERGRAPH OPTIMIZER + SORT + REMATERIALIZATION
+#
+CREATE TABLE t1 (
+f1 INTEGER
+);
+INSERT INTO t1 VALUES (1), (2), (3);
+CREATE TABLE t2 (
+pk INTEGER,
+blobfield LONGTEXT
+);
+INSERT INTO t2 VALUES (4, '');
+SELECT *
+FROM t1, t2, LATERAL (
+SELECT pk, blobfield
+GROUP BY pk, blobfield WITH ROLLUP
+) AS d1
+ORDER BY t1.f1, t2.pk;
+f1	pk	blobfield	pk	blobfield
+1	4		4	
+1	4		4	NULL
+1	4		NULL	NULL
+2	4		4	
+2	4		4	NULL
+2	4		NULL	NULL
+3	4		4	
+3	4		4	NULL
+3	4		NULL	NULL
+DROP TABLE t1, t2;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/key_diff.result mysql-8.0-8.0.27/mysql-test/r/key_diff.result
--- mysql-8.0-8.0.26/mysql-test/r/key_diff.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/key_diff.result	2021-09-28 11:46:34.000000000 +0000
@@ -50,6 +50,8 @@
 a	a	a	a
 a	a	b	A
 b	A	A	B
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select * from t1 where a='a';
 a	b
 A	B
diff -Nru mysql-8.0-8.0.26/mysql-test/r/log_components_eventlog.result mysql-8.0-8.0.27/mysql-test/r/log_components_eventlog.result
--- mysql-8.0-8.0.26/mysql-test/r/log_components_eventlog.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/log_components_eventlog.result	2021-09-28 11:46:34.000000000 +0000
@@ -76,6 +76,7 @@
 SET @@session.debug="-d,parser_stmt_to_error_log";
 SET @@session.debug="-d,log_error_normalize";
 FLUSH ERROR LOGS;
+UNINSTALL COMPONENT "file://component_log_sink_syseventlog";
 
 ###
 ### done
diff -Nru mysql-8.0-8.0.26/mysql-test/r/log_state.result mysql-8.0-8.0.27/mysql-test/r/log_state.result
--- mysql-8.0-8.0.26/mysql-test/r/log_state.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/log_state.result	2021-09-28 11:46:34.000000000 +0000
@@ -270,3 +270,5 @@
 SET global general_log_file = @old_general_log_file;
 SET global slow_query_log = @old_slow_query_log;
 SET global slow_query_log_file = @old_slow_query_log_file;
+TRUNCATE TABLE mysql.slow_log;
+TRUNCATE TABLE mysql.general_log;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/log_tables-big.result mysql-8.0-8.0.27/mysql-test/r/log_tables-big.result
--- mysql-8.0-8.0.26/mysql-test/r/log_tables-big.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/log_tables-big.result	2021-09-28 11:46:34.000000000 +0000
@@ -28,5 +28,6 @@
 select release_lock('bug27638');
 release_lock('bug27638')
 1
-TRUNCATE mysql.slow_log;
 set @@global.log_output=default;
+TRUNCATE mysql.general_log;
+TRUNCATE mysql.slow_log;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/log_tables_debug.result mysql-8.0-8.0.27/mysql-test/r/log_tables_debug.result
--- mysql-8.0-8.0.26/mysql-test/r/log_tables_debug.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/log_tables_debug.result	2021-09-28 11:46:34.000000000 +0000
@@ -1,3 +1,4 @@
+SET @old_log_output= @@global.log_output;
 SET @old_general_log= @@global.general_log;
 SET @old_general_log_file= @@global.general_log_file;
 SET @old_slow_query_log= @@global.slow_query_log;
@@ -6,6 +7,7 @@
 # Bug#45387 Information about statement id for prepared
 #           statements missed from general log
 #
+SET @@global.log_output = 'FILE,TABLE';
 SET @@global.general_log = ON;
 SET @@global.general_log_file = 'bug45387_general.log';
 FLUSH LOGS;
@@ -32,7 +34,10 @@
 #
 # Cleanup
 #
+SET global log_output = @old_log_output;
 SET global general_log = @old_general_log;
 SET global general_log_file = @old_general_log_file;
 SET global slow_query_log = @old_slow_query_log;
 SET global slow_query_log_file = @old_slow_query_log_file;
+TRUNCATE TABLE mysql.general_log;
+TRUNCATE TABLE mysql.slow_log;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/log_tables_myisam.result mysql-8.0-8.0.27/mysql-test/r/log_tables_myisam.result
--- mysql-8.0-8.0.26/mysql-test/r/log_tables_myisam.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/log_tables_myisam.result	2021-09-28 11:46:34.000000000 +0000
@@ -1,4 +1,6 @@
 use mysql;
+SET @old_log_output = @@global.log_output;
+SET GLOBAL log_output="FILE,TABLE";
 truncate table general_log;
 select * from general_log;
 event_time	user_host	thread_id	server_id	command_type	argument
@@ -148,4 +150,6 @@
 Warning	3719	'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous.
 set global general_log='ON';
 set global slow_query_log='ON';
+SET GLOBAL log_output=@old_log_output;
+TRUNCATE TABLE mysql.general_log;
 use test;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/log_tables.result mysql-8.0-8.0.27/mysql-test/r/log_tables.result
--- mysql-8.0-8.0.26/mysql-test/r/log_tables.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/log_tables.result	2021-09-28 11:46:34.000000000 +0000
@@ -3,6 +3,7 @@
 SET @old_slow_query_log=   @@global.slow_query_log;
 SET @old_general_log=      @@global.general_log;
 SET @old_long_query_time=  @@session.long_query_time;
+SET GLOBAL log_output="FILE,TABLE";
 use mysql;
 SET @saved_long_query_time = @@long_query_time;
 SET @saved_log_output = @@log_output;
@@ -747,3 +748,5 @@
 SET @@global.log_output=       @old_log_output;
 SET @@global.slow_query_log=   @old_slow_query_log;
 SET @@global.general_log=      @old_general_log;
+TRUNCATE TABLE mysql.slow_log;
+TRUNCATE TABLE mysql.general_log;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/lowercase_table.result mysql-8.0-8.0.27/mysql-test/r/lowercase_table.result
--- mysql-8.0-8.0.26/mysql-test/r/lowercase_table.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/lowercase_table.result	2021-09-28 11:46:34.000000000 +0000
@@ -133,3 +133,4 @@
 ALTER TABLE mysql.GENERAL_LOG DISCARD TABLESPACE;
 ERROR HY000: You cannot 'ALTER' a log table if logging is enabled
 SET GLOBAL log_output= DEFAULT;
+TRUNCATE TABLE MYSQL.general_log;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/mdl_sync.result mysql-8.0-8.0.27/mysql-test/r/mdl_sync.result
--- mysql-8.0-8.0.26/mysql-test/r/mdl_sync.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/mdl_sync.result	2021-09-28 11:46:34.000000000 +0000
@@ -3548,6 +3548,7 @@
 SET @@global.general_log= @old_general_log;
 SET @@global.log_output= @old_log_output;
 SET @@session.sql_log_off= @old_sql_log_off;
+TRUNCATE TABLE mysql.general_log;
 #
 # Additional coverage for bug #50913 "Deadlock between
 # open_and_lock_tables_derived and MDL". The main test
diff -Nru mysql-8.0-8.0.26/mysql-test/r/myisam_explain_json_non_select_all.result mysql-8.0-8.0.27/mysql-test/r/myisam_explain_json_non_select_all.result
--- mysql-8.0-8.0.26/mysql-test/r/myisam_explain_json_non_select_all.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/myisam_explain_json_non_select_all.result	2021-09-28 11:46:34.000000000 +0000
@@ -6269,7 +6269,7 @@
 1	UPDATE	t11	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	NULL
 1	SIMPLE	t12	NULL	index	NULL	a	5	NULL	2	100.00	Using index
 Warnings:
-Note	1003	update ignore (`test`.`t1` `t11` join `test`.`t1` `t12`) set `t11`.`a` = 1
+Note	1003	update ignore (`test`.`t1` `t11` join `test`.`t1` `t12`) set `test`.`t11`.`a` = 1
 UPDATE IGNORE v1 SET a = 1;
 ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. 
 SET SESSION sql_safe_updates = DEFAULT;
@@ -6288,7 +6288,7 @@
 1	UPDATE	t11	NULL	ALL	NULL	NULL	NULL	NULL	2	50.00	Using where
 1	SIMPLE	t12	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	NULL
 Warnings:
-Note	1003	update (`test`.`t1` `t11` join `test`.`t1` `t12`) set `t11`.`a` = 1 where (`t11`.`a` > 0)
+Note	1003	update (`test`.`t1` `t11` join `test`.`t1` `t12`) set `test`.`t11`.`a` = 1 where (`test`.`t11`.`a` > 0)
 FLUSH STATUS;
 FLUSH TABLES;
 Variable_name	Value
diff -Nru mysql-8.0-8.0.26/mysql-test/r/myisam_explain_json_non_select_none.result mysql-8.0-8.0.27/mysql-test/r/myisam_explain_json_non_select_none.result
--- mysql-8.0-8.0.26/mysql-test/r/myisam_explain_json_non_select_none.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/myisam_explain_json_non_select_none.result	2021-09-28 11:46:34.000000000 +0000
@@ -6257,7 +6257,7 @@
 1	UPDATE	t11	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	NULL
 1	SIMPLE	t12	NULL	index	NULL	a	5	NULL	2	100.00	Using index
 Warnings:
-Note	1003	update ignore (`test`.`t1` `t11` join `test`.`t1` `t12`) set `t11`.`a` = 1
+Note	1003	update ignore (`test`.`t1` `t11` join `test`.`t1` `t12`) set `test`.`t11`.`a` = 1
 UPDATE IGNORE v1 SET a = 1;
 ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. 
 SET SESSION sql_safe_updates = DEFAULT;
@@ -6276,7 +6276,7 @@
 1	UPDATE	t11	NULL	ALL	NULL	NULL	NULL	NULL	2	50.00	Using where
 1	SIMPLE	t12	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	NULL
 Warnings:
-Note	1003	update (`test`.`t1` `t11` join `test`.`t1` `t12`) set `t11`.`a` = 1 where (`t11`.`a` > 0)
+Note	1003	update (`test`.`t1` `t11` join `test`.`t1` `t12`) set `test`.`t11`.`a` = 1 where (`test`.`t11`.`a` > 0)
 FLUSH STATUS;
 FLUSH TABLES;
 Variable_name	Value
diff -Nru mysql-8.0-8.0.26/mysql-test/r/myisam_explain_non_select_all.result mysql-8.0-8.0.27/mysql-test/r/myisam_explain_non_select_all.result
--- mysql-8.0-8.0.26/mysql-test/r/myisam_explain_non_select_all.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/myisam_explain_non_select_all.result	2021-09-28 11:46:34.000000000 +0000
@@ -1983,7 +1983,7 @@
 1	UPDATE	t11	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	NULL
 1	SIMPLE	t12	NULL	index	NULL	a	5	NULL	2	100.00	Using index
 Warnings:
-Note	1003	update ignore (`test`.`t1` `t11` join `test`.`t1` `t12`) set `t11`.`a` = 1
+Note	1003	update ignore (`test`.`t1` `t11` join `test`.`t1` `t12`) set `test`.`t11`.`a` = 1
 UPDATE IGNORE v1 SET a = 1;
 ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. 
 SET SESSION sql_safe_updates = DEFAULT;
@@ -2002,7 +2002,7 @@
 1	UPDATE	t11	NULL	ALL	NULL	NULL	NULL	NULL	2	50.00	Using where
 1	SIMPLE	t12	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	NULL
 Warnings:
-Note	1003	update (`test`.`t1` `t11` join `test`.`t1` `t12`) set `t11`.`a` = 1 where (`t11`.`a` > 0)
+Note	1003	update (`test`.`t1` `t11` join `test`.`t1` `t12`) set `test`.`t11`.`a` = 1 where (`test`.`t11`.`a` > 0)
 FLUSH STATUS;
 FLUSH TABLES;
 Variable_name	Value
diff -Nru mysql-8.0-8.0.26/mysql-test/r/myisam_explain_non_select_none.result mysql-8.0-8.0.27/mysql-test/r/myisam_explain_non_select_none.result
--- mysql-8.0-8.0.26/mysql-test/r/myisam_explain_non_select_none.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/myisam_explain_non_select_none.result	2021-09-28 11:46:34.000000000 +0000
@@ -1980,7 +1980,7 @@
 1	UPDATE	t11	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	NULL
 1	SIMPLE	t12	NULL	index	NULL	a	5	NULL	2	100.00	Using index
 Warnings:
-Note	1003	update ignore (`test`.`t1` `t11` join `test`.`t1` `t12`) set `t11`.`a` = 1
+Note	1003	update ignore (`test`.`t1` `t11` join `test`.`t1` `t12`) set `test`.`t11`.`a` = 1
 UPDATE IGNORE v1 SET a = 1;
 ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. 
 SET SESSION sql_safe_updates = DEFAULT;
@@ -1999,7 +1999,7 @@
 1	UPDATE	t11	NULL	ALL	NULL	NULL	NULL	NULL	2	50.00	Using where
 1	SIMPLE	t12	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	NULL
 Warnings:
-Note	1003	update (`test`.`t1` `t11` join `test`.`t1` `t12`) set `t11`.`a` = 1 where (`t11`.`a` > 0)
+Note	1003	update (`test`.`t1` `t11` join `test`.`t1` `t12`) set `test`.`t11`.`a` = 1 where (`test`.`t11`.`a` > 0)
 FLUSH STATUS;
 FLUSH TABLES;
 Variable_name	Value
diff -Nru mysql-8.0-8.0.26/mysql-test/r/myisam.result mysql-8.0-8.0.27/mysql-test/r/myisam.result
--- mysql-8.0-8.0.26/mysql-test/r/myisam.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/myisam.result	2021-09-28 11:46:34.000000000 +0000
@@ -463,6 +463,8 @@
 select concat(a,'.') from t1 where binary a='aaa';
 concat(a,'.')
 aaa.
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 update t1 set a='bbb' where a='aaa';
 select concat(a,'.') from t1;
 concat(a,'.')
diff -Nru mysql-8.0-8.0.26/mysql-test/r/mysqladmin.result mysql-8.0-8.0.27/mysql-test/r/mysqladmin.result
--- mysql-8.0-8.0.26/mysql-test/r/mysqladmin.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/mysqladmin.result	2021-09-28 11:46:34.000000000 +0000
@@ -49,4 +49,14 @@
 # check the output of mysqladmin for old-password
 include/assert_grep.inc [check the output of mysqladmin for old-password]
 # cleanup
+#
+# Bug #32798288: MORE MEANINFUL MESSAGE FOR MISSING INCLUDE DIRECTORY
+#
+mysqladmin: Can't read dir of '/nonexistent' (OS error
+mysqladmin: [ERROR] Stopped processing the 'includedir' directive in file file at line 1.
+mysqladmin: [ERROR] Fatal error in defaults handling. Program aborted!
+mysqladmin: File '\nonexistent' not found (OS error
+mysqladmin: [ERROR] Stopped processing the 'include' directive in file file2 at line 1.
+mysqladmin: [Warning] Using a password on the command line interface can be insecure.
+mysqld is alive
 End of tests
diff -Nru mysql-8.0-8.0.26/mysql-test/r/mysql_client_test.result mysql-8.0-8.0.27/mysql-test/r/mysql_client_test.result
--- mysql-8.0-8.0.26/mysql-test/r/mysql_client_test.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/mysql_client_test.result	2021-09-28 11:46:34.000000000 +0000
@@ -1,5 +1,10 @@
 SET @old_general_log= @@global.general_log;
 SET @old_slow_query_log= @@global.slow_query_log;
+SET @old_log_output = @@global.log_output;
+SET @old_general_log_file = @@global.general_log_file;
+SET GLOBAL log_output="FILE,TABLE";
+SET GLOBAL general_log_file = 'LOG_DIR/master.log';
+SET GLOBAL general_log= 'ON';
 ok
 
 # cat MYSQL_TMP_DIR/test_wl4435.out.log
@@ -122,6 +127,10 @@
 
 SET @@global.general_log= @old_general_log;
 SET @@global.slow_query_log= @old_slow_query_log;
+SET @@global.log_output= @old_log_output;
+SET @@global.general_log_file = @old_general_log_file;
+TRUNCATE TABLE mysql.general_log;
+TRUNCATE TABLE mysql.slow_log;
 #
 # Bug#24963580 INFORMATION_SCHEMA:MDL_REQUEST::
 # INIT_WITH_SOURCE(MDL_KEY::ENUM_MDL_NAMESPACE
diff -Nru mysql-8.0-8.0.26/mysql-test/r/mysqld--help-notwin.result mysql-8.0-8.0.27/mysql-test/r/mysqld--help-notwin.result
--- mysql-8.0-8.0.26/mysql-test/r/mysqld--help-notwin.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/mysqld--help-notwin.result	2021-09-28 11:46:34.000000000 +0000
@@ -50,6 +50,16 @@
  library, for example exit() from libc.so
  -a, --ansi          Use ANSI SQL syntax instead of MySQL syntax. This mode
  will also set transaction isolation level 'serializable'.
+ --authentication-policy=name 
+ Defines policies around how user account can be
+ configured with Multi Factor authentication methods
+ during CREATE/ALTER USER statement. This variable accepts
+ at-most 3 comma separated list of authentication plugin
+ names where each value refers to what authentication
+ plugin should be used in place of 1st Factor
+ Authentication (FA), 2FA and 3FA method. Value *
+ indicates any plugin is allowed for 1FA, 2FA and 3FA
+ method. An empty value means nth FA method is optional.
  --auto-increment-increment[=#] 
  Auto-increment columns are incremented by this
  --auto-increment-offset[=#] 
@@ -1086,9 +1096,11 @@
  --relay-log-recovery 
  If enabled, existing relay logs will be skipped by the
  replication threads. The receiver will start a new relay
- log and request transactions from the source starting at
- the last applied position. The applier will start in this
- new relay log.
+ log and the applier will start reading from the beginning
+ of that file. The receiver's position relative to the
+ source will be reset to the applier's position relative
+ to the source; the receiver uses this in case
+ SOURCE_AUTO_POSITION=0.
  --relay-log-space-limit=# 
  Maximum space to use for all relay logs
  --replica-allow-batching 
@@ -1124,11 +1136,11 @@
  replication connection before aborting the read.
  --replica-parallel-type=name 
  The method used by the replication applier to parallelize
- transactions. DATABASE, which is the default, indicates
- that it may apply transactions in parallel in case they
- update different databases. LOGICAL_CLOCK indicates that
- it decides whether two transactions can be applied in
- parallel using the logical timestamps computed by the
+ transactions. DATABASE, indicates that it may apply
+ transactions in parallel in case they update different
+ databases. LOGICAL_CLOCK, which is the default, indicates
+ that it decides whether two transactions can be applied
+ in parallel using the logical timestamps computed by the
  source, according to
  binlog_transaction_dependency_tracking.
  --replica-parallel-workers=# 
@@ -1140,7 +1152,8 @@
  the limit.
  --replica-preserve-commit-order 
  Force replication worker threads to commit in the same
- order as on the source.
+ order as on the source. Enabled by default
+ (Defaults to on; use --skip-replica-preserve-commit-order to disable.)
  --replica-skip-errors=name 
  Comma-separated list of error numbers. If an applier
  thread on this replica encounters one of these errors
@@ -1391,6 +1404,7 @@
  --slave-preserve-commit-order 
  This option is deprecated. Use
  replica_preserve_commit_order instead.
+ (Defaults to on; use --skip-slave-preserve-commit-order to disable.)
  --slave-rows-search-algorithms=name 
  The set of algorithms used by the replication applier
  while searching the table for rows to update or delete.
@@ -1587,6 +1601,7 @@
 admin-ssl-key (No default value)
 admin-tls-ciphersuites (No default value)
 allow-suspicious-udfs FALSE
+authentication-policy *,,
 auto-increment-increment 1
 auto-increment-offset 1
 autocommit TRUE
@@ -1820,7 +1835,7 @@
 performance-schema-events-waits-history-size -1
 performance-schema-hosts-size -1
 performance-schema-instrument 
-performance-schema-max-cond-classes 100
+performance-schema-max-cond-classes 150
 performance-schema-max-cond-instances -1
 performance-schema-max-digest-length 1024
 performance-schema-max-digest-sample-age 60
@@ -1830,7 +1845,7 @@
 performance-schema-max-index-stat -1
 performance-schema-max-memory-classes 450
 performance-schema-max-metadata-locks -1
-performance-schema-max-mutex-classes 300
+performance-schema-max-mutex-classes 350
 performance-schema-max-mutex-instances -1
 performance-schema-max-prepared-statements-instances -1
 performance-schema-max-program-instances -1
@@ -1840,7 +1855,7 @@
 performance-schema-max-socket-instances -1
 performance-schema-max-sql-text-length 1024
 performance-schema-max-stage-classes 175
-performance-schema-max-statement-classes 218
+performance-schema-max-statement-classes 219
 performance-schema-max-statement-stack 10
 performance-schema-max-table-handles -1
 performance-schema-max-table-instances -1
@@ -1883,10 +1898,10 @@
 replica-exec-mode STRICT
 replica-max-allowed-packet 1073741824
 replica-net-timeout 60
-replica-parallel-type DATABASE
-replica-parallel-workers 0
+replica-parallel-type LOGICAL_CLOCK
+replica-parallel-workers 4
 replica-pending-jobs-size-max 134217728
-replica-preserve-commit-order FALSE
+replica-preserve-commit-order TRUE
 replica-skip-errors (No default value)
 replica-sql-verify-checksum TRUE
 replica-transaction-retries 10
@@ -1933,10 +1948,10 @@
 slave-exec-mode STRICT
 slave-max-allowed-packet 1073741824
 slave-net-timeout 60
-slave-parallel-type DATABASE
-slave-parallel-workers 0
+slave-parallel-type LOGICAL_CLOCK
+slave-parallel-workers 4
 slave-pending-jobs-size-max 134217728
-slave-preserve-commit-order FALSE
+slave-preserve-commit-order TRUE
 slave-rows-search-algorithms INDEX_SCAN,HASH_SCAN
 slave-skip-errors (No default value)
 slave-sql-verify-checksum TRUE
@@ -1969,7 +1984,7 @@
 terminology-use-previous NONE
 thread-cache-size 9
 thread-handling one-thread-per-connection
-thread-stack 262144
+thread-stack 1048576
 tls-ciphersuites (No default value)
 tmp-table-size 16777216
 transaction-alloc-block-size 8192
diff -Nru mysql-8.0-8.0.26/mysql-test/r/mysqld--help-win.result mysql-8.0-8.0.27/mysql-test/r/mysqld--help-win.result
--- mysql-8.0-8.0.26/mysql-test/r/mysqld--help-win.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/mysqld--help-win.result	2021-09-28 11:46:34.000000000 +0000
@@ -50,6 +50,16 @@
  library, for example exit() from libc.so
  -a, --ansi          Use ANSI SQL syntax instead of MySQL syntax. This mode
  will also set transaction isolation level 'serializable'.
+ --authentication-policy=name 
+ Defines policies around how user account can be
+ configured with Multi Factor authentication methods
+ during CREATE/ALTER USER statement. This variable accepts
+ at-most 3 comma separated list of authentication plugin
+ names where each value refers to what authentication
+ plugin should be used in place of 1st Factor
+ Authentication (FA), 2FA and 3FA method. Value *
+ indicates any plugin is allowed for 1FA, 2FA and 3FA
+ method. An empty value means nth FA method is optional.
  --auto-increment-increment[=#] 
  Auto-increment columns are incremented by this
  --auto-increment-offset[=#] 
@@ -1089,9 +1099,11 @@
  --relay-log-recovery 
  If enabled, existing relay logs will be skipped by the
  replication threads. The receiver will start a new relay
- log and request transactions from the source starting at
- the last applied position. The applier will start in this
- new relay log.
+ log and the applier will start reading from the beginning
+ of that file. The receiver's position relative to the
+ source will be reset to the applier's position relative
+ to the source; the receiver uses this in case
+ SOURCE_AUTO_POSITION=0.
  --relay-log-space-limit=# 
  Maximum space to use for all relay logs
  --replica-allow-batching 
@@ -1127,11 +1139,11 @@
  replication connection before aborting the read.
  --replica-parallel-type=name 
  The method used by the replication applier to parallelize
- transactions. DATABASE, which is the default, indicates
- that it may apply transactions in parallel in case they
- update different databases. LOGICAL_CLOCK indicates that
- it decides whether two transactions can be applied in
- parallel using the logical timestamps computed by the
+ transactions. DATABASE, indicates that it may apply
+ transactions in parallel in case they update different
+ databases. LOGICAL_CLOCK, which is the default, indicates
+ that it decides whether two transactions can be applied
+ in parallel using the logical timestamps computed by the
  source, according to
  binlog_transaction_dependency_tracking.
  --replica-parallel-workers=# 
@@ -1143,7 +1155,8 @@
  the limit.
  --replica-preserve-commit-order 
  Force replication worker threads to commit in the same
- order as on the source.
+ order as on the source. Enabled by default
+ (Defaults to on; use --skip-replica-preserve-commit-order to disable.)
  --replica-skip-errors=name 
  Comma-separated list of error numbers. If an applier
  thread on this replica encounters one of these errors
@@ -1397,6 +1410,7 @@
  --slave-preserve-commit-order 
  This option is deprecated. Use
  replica_preserve_commit_order instead.
+ (Defaults to on; use --skip-slave-preserve-commit-order to disable.)
  --slave-rows-search-algorithms=name 
  The set of algorithms used by the replication applier
  while searching the table for rows to update or delete.
@@ -1598,6 +1612,7 @@
 admin-ssl-key (No default value)
 admin-tls-ciphersuites (No default value)
 allow-suspicious-udfs FALSE
+authentication-policy *,,
 auto-increment-increment 1
 auto-increment-offset 1
 autocommit TRUE
@@ -1832,7 +1847,7 @@
 performance-schema-events-waits-history-size -1
 performance-schema-hosts-size -1
 performance-schema-instrument 
-performance-schema-max-cond-classes 100
+performance-schema-max-cond-classes 150
 performance-schema-max-cond-instances -1
 performance-schema-max-digest-length 1024
 performance-schema-max-digest-sample-age 60
@@ -1842,7 +1857,7 @@
 performance-schema-max-index-stat -1
 performance-schema-max-memory-classes 450
 performance-schema-max-metadata-locks -1
-performance-schema-max-mutex-classes 300
+performance-schema-max-mutex-classes 350
 performance-schema-max-mutex-instances -1
 performance-schema-max-prepared-statements-instances -1
 performance-schema-max-program-instances -1
@@ -1852,7 +1867,7 @@
 performance-schema-max-socket-instances -1
 performance-schema-max-sql-text-length 1024
 performance-schema-max-stage-classes 175
-performance-schema-max-statement-classes 218
+performance-schema-max-statement-classes 219
 performance-schema-max-statement-stack 10
 performance-schema-max-table-handles -1
 performance-schema-max-table-instances -1
@@ -1895,10 +1910,10 @@
 replica-exec-mode STRICT
 replica-max-allowed-packet 1073741824
 replica-net-timeout 60
-replica-parallel-type DATABASE
-replica-parallel-workers 0
+replica-parallel-type LOGICAL_CLOCK
+replica-parallel-workers 4
 replica-pending-jobs-size-max 134217728
-replica-preserve-commit-order FALSE
+replica-preserve-commit-order TRUE
 replica-skip-errors (No default value)
 replica-sql-verify-checksum TRUE
 replica-transaction-retries 10
@@ -1947,10 +1962,10 @@
 slave-exec-mode STRICT
 slave-max-allowed-packet 1073741824
 slave-net-timeout 60
-slave-parallel-type DATABASE
-slave-parallel-workers 0
+slave-parallel-type LOGICAL_CLOCK
+slave-parallel-workers 4
 slave-pending-jobs-size-max 134217728
-slave-preserve-commit-order FALSE
+slave-preserve-commit-order TRUE
 slave-rows-search-algorithms INDEX_SCAN,HASH_SCAN
 slave-skip-errors (No default value)
 slave-sql-verify-checksum TRUE
@@ -1984,7 +1999,7 @@
 terminology-use-previous NONE
 thread-cache-size 9
 thread-handling one-thread-per-connection
-thread-stack 262144
+thread-stack 1048576
 tls-ciphersuites (No default value)
 tmp-table-size 16777216
 transaction-alloc-block-size 8192
diff -Nru mysql-8.0-8.0.26/mysql-test/r/mysqldump.result mysql-8.0-8.0.27/mysql-test/r/mysqldump.result
--- mysql-8.0-8.0.26/mysql-test/r/mysqldump.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/mysqldump.result	2021-09-28 11:46:34.000000000 +0000
@@ -5328,6 +5328,7 @@
   `Master_zstd_compression_level` int unsigned NOT NULL COMMENT 'Compression level associated with zstd compression algorithm.',
   `Tls_ciphersuites` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'Ciphersuites used for TLS 1.3 communication with the master server.',
   `Source_connection_auto_failover` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Indicates whether the channel connection failover is enabled.',
+  `Gtid_only` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Indicates if this channel only uses GTIDs and does not persist positions.',
   PRIMARY KEY (`Channel_name`)
 ) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='Master Information';
 /*!40101 SET character_set_client = @saved_cs_client */;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/mysqlpump_charset.result mysql-8.0-8.0.27/mysql-test/r/mysqlpump_charset.result
--- mysql-8.0-8.0.26/mysql-test/r/mysqlpump_charset.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/mysqlpump_charset.result	2021-09-28 11:46:34.000000000 +0000
@@ -304,7 +304,7 @@
 CREATE VIEW `±í¸ñ` AS SELECT _ujis'×Ö¶ÎÒ»';
 Warnings:
 Warning	1300	Invalid ujis character string: 'C397C3'
-Warning	1300	Cannot convert string '\xC3\x97\xC3\x96\xC2\xB6...' from ujis to utf8
+Warning	1300	Cannot convert string '\xC3\x97\xC3\x96\xC2\xB6...' from ujis to utf8mb3
 INSERT INTO Ô�ÂÌÉÃ� VALUES (_ujis'MYSQLPUMP'), (_ujis'한글입력기');
 Warnings:
 Warning	1300	Invalid ujis character string: 'ED959C'
diff -Nru mysql-8.0-8.0.26/mysql-test/r/mysqlpump_long_hostname.result mysql-8.0-8.0.27/mysql-test/r/mysqlpump_long_hostname.result
--- mysql-8.0-8.0.26/mysql-test/r/mysqlpump_long_hostname.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/mysqlpump_long_hostname.result	2021-09-28 11:46:34.000000000 +0000
@@ -3,7 +3,7 @@
 CREATE USER some_user_name@host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890;
 SHOW CREATE USER some_user_name@host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890;
 CREATE USER for some_user_name@host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890
-CREATE USER 'some_user_name'@'host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890' IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `some_user_name`@`host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890` IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 # Create a event with definer.
 CREATE DEFINER=some_user_name@host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890 EVENT e1 ON SCHEDULE EVERY 1 DAY DO SELECT 1;
 SHOW EVENTS LIKE 'e1';
@@ -99,7 +99,7 @@
 # Create user
 SHOW CREATE USER some_user_name@host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890;
 CREATE USER for some_user_name@host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890
-CREATE USER 'some_user_name'@'host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890' IDENTIFIED WITH 'caching_sha2_password' DEFAULT ROLE `u1`@`localhost` REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `some_user_name`@`host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890` IDENTIFIED WITH 'caching_sha2_password' DEFAULT ROLE `u1`@`localhost` REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 # Create a event with definer.
 SHOW EVENTS LIKE 'e1';
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
@@ -126,12 +126,12 @@
 SHOW GRANTS FOR some_user_name@host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890;
 Grants for some_user_name@host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `some_user_name`@`host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `some_user_name`@`host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `some_user_name`@`host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890`
 GRANT INSERT ON `test`.* TO `some_user_name`@`host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890`
 GRANT UPDATE ON `test`.`s1` TO `some_user_name`@`host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890`
 GRANT UPDATE (`f1`) ON `test`.`s2` TO `some_user_name`@`host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890`
 GRANT EXECUTE ON PROCEDURE `test`.`p2` TO `some_user_name`@`host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890`
-GRANT PROXY ON 'root'@'localhost' TO 'some_user_name'@'host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890'
+GRANT PROXY ON `root`@`localhost` TO `some_user_name`@`host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890`
 GRANT `u1`@`localhost` TO `some_user_name`@`host_1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890abcdefghij1234567890`
 # We see roles and default role of 'some_user_name' only, not root.
 # Because we did not dump 'root' user grants.
diff -Nru mysql-8.0-8.0.26/mysql-test/r/mysqltest.result mysql-8.0-8.0.27/mysql-test/r/mysqltest.result
--- mysql-8.0-8.0.26/mysql-test/r/mysqltest.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/mysqltest.result	2021-09-28 11:46:34.000000000 +0000
@@ -1772,7 +1772,7 @@
 Warnings:
 Warning	1681	UNSIGNED for decimal and floating point data types is deprecated and support for it will be removed in a future release.
 Warning	3856	AUTO_INCREMENT support for FLOAT/DOUBLE columns is deprecated and will be removed in a future release. Consider removing AUTO_INCREMENT from column 'c1'.
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 1, -500, "aaa");
 Warnings:
 Warning	1264	Out of range value for column 'c3' at row 1
 Warning	1366	Incorrect decimal value: 'aaa' for column 'c4' at row 1
@@ -1782,7 +1782,7 @@
 DELETE FROM t1;
 INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
 DELETE FROM t1;
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 3, -500, "aaa");
 Warnings:
 Warning	1264	Out of range value for column 'c3' at row 1
 Warning	1366	Incorrect decimal value: 'aaa' for column 'c4' at row 1
@@ -1790,29 +1790,29 @@
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
 DELETE FROM t1;
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 4, -500, "aaa");
 Warnings:
 Warning	1366	Incorrect decimal value: 'aaa' for column 'c4' at row 1
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
 DELETE FROM t1;
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 5, -500, "aaa");
 DELETE FROM t1;
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 6, -500, "aaa");
 Warnings:
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
 DELETE FROM t1;
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 7, -500, "aaa");
 Warnings:
 Warning	1264	Out of range value for column 'c3' at row 1
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
 DELETE FROM t1;
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 8, -500, "aaa");
 Warnings:
 Warning	1264	Out of range value for column 'c3' at row 1
 Warning	1366	Incorrect decimal value: 'aaa' for column 'c4' at row 1
@@ -1820,13 +1820,13 @@
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
 DELETE FROM t1;
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 9, -500, "aaa");
 DELETE FROM t1;
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 10, -500, "aaa");
 Warnings:
 Warning	1366	Incorrect decimal value: 'aaa' for column 'c4' at row 1
 DELETE FROM t1;
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 11, -500, "aaa");
 Warnings:
 Warning	1264	Out of range value for column 'c3' at row 1
 Warning	1366	Incorrect decimal value: 'aaa' for column 'c4' at row 1
@@ -1834,11 +1834,11 @@
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
 DELETE FROM t1;
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 12, -500, "aaa");
 Warnings:
 Warning	1366	Incorrect decimal value: 'aaa' for column 'c4' at row 1
 DELETE FROM t1;
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 13, -500, "aaa");
 Warnings:
 Warning	1264	Out of range value for column 'c3' at row 1
 Warning	1366	Incorrect decimal value: 'aaa' for column 'c4' at row 1
@@ -1846,9 +1846,9 @@
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
 DELETE FROM t1;
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 14, -500, "aaa");
 DELETE FROM t1;
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 15, -500, "aaa");
 Warnings:
 Warning	1264	Out of range value for column 'c3' at row 1
 Warning	1366	Incorrect decimal value: 'aaa' for column 'c4' at row 1
@@ -1856,15 +1856,15 @@
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
 DELETE FROM t1;
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 16, -500, "aaa");
 Warnings:
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
 DELETE FROM t1;
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 17, -500, "aaa");
 DELETE FROM t1;
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 18, -500, "aaa");
 Warnings:
 Warning	1264	Out of range value for column 'c3' at row 1
 Warning	1366	Incorrect decimal value: 'aaa' for column 'c4' at row 1
@@ -1872,17 +1872,17 @@
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
 DELETE FROM t1;
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 19, -500, "aaa");
 DELETE FROM t1;
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 20, -500, "aaa");
 Warnings:
 Warning	1366	Incorrect decimal value: 'aaa' for column 'c4' at row 1
 DELETE FROM t1;
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 21, -500, "aaa");
 Warnings:
 Warning	1366	Incorrect decimal value: 'aaa' for column 'c4' at row 1
 DELETE FROM t1;
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 22, -500, "aaa");
 Warnings:
 Warning	1264	Out of range value for column 'c3' at row 1
 Warning	1366	Incorrect decimal value: 'aaa' for column 'c4' at row 1
@@ -1891,23 +1891,23 @@
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
 DELETE FROM t1;
 
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 23, -500, "aaa");
 Warnings:
 Warning	1366	Incorrect decimal value: 'aaa' for column 'c4' at row 1
 DELETE FROM t1;
 ER_WARN_DATA_OUT_OF_RANGE,ER_TRUNCATED_WRONG_VALUE
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 24, -500, "aaa");
 DELETE FROM t1;
 ER_WARN_DATA_OUT_OF_RANGE,ER_TRUNCATED_WRONG_VALUE,ER_TRUNCATED_WRONG_VALUE_FOR_FIELD
 ER_TRUNCATED_WRONG_VALUE,ER_TRUNCATED_WRONG_VALUE_FOR_FIELD
 
 ER_WARN_DATA_OUT_OF_RANGE,ER_TRUNCATED_WRONG_VALUE
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 25, -500, "aaa");
 Warnings:
 Warning	1366	Incorrect decimal value: 'aaa' for column 'c4' at row 1
 DELETE FROM t1;
 
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 26, -500, "aaa");
 Warnings:
 Warning	1264	Out of range value for column 'c3' at row 1
 Warning	1366	Incorrect decimal value: 'aaa' for column 'c4' at row 1
@@ -1916,14 +1916,14 @@
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
 DELETE FROM t1;
 
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 27, -500, "aaa");
 DELETE FROM t1;
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 28, -500, "aaa");
 Warnings:
 Warning	1264	Out of range value for column 'c3' at row 1
 DELETE FROM t1;
 ER_WARN_DATA_OUT_OF_RANGE
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 29, -500, "aaa");
 Warnings:
 Warning	1264	Out of range value for column 'c3' at row 1
 Warning	1366	Incorrect decimal value: 'aaa' for column 'c4' at row 1
@@ -1934,7 +1934,7 @@
 ER_WARN_DATA_OUT_OF_RANGE,ER_TRUNCATED_WRONG_VALUE,ER_TRUNCATED_WRONG_VALUE_FOR_FIELD
 
 ER_WARN_DATA_OUT_OF_RANGE,ER_TRUNCATED_WRONG_VALUE
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 30, -500, "aaa");
 Warnings:
 Warning	1264	Out of range value for column 'c3' at row 1
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
@@ -1942,18 +1942,18 @@
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
 DELETE FROM t1;
 
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 31, -500, "aaa");
 DELETE FROM t1;
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 32, -500, "aaa");
 Warnings:
 Warning	1366	Incorrect decimal value: 'aaa' for column 'c4' at row 1
 DELETE FROM t1;
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 33, -500, "aaa");
 Warnings:
 Warning	1264	Out of range value for column 'c3' at row 1
 Warning	1366	Incorrect decimal value: 'aaa' for column 'c4' at row 1
 DELETE FROM t1;
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 34, -500, "aaa");
 Warnings:
 Warning	1264	Out of range value for column 'c3' at row 1
 Warning	1366	Incorrect decimal value: 'aaa' for column 'c4' at row 1
@@ -2034,12 +2034,12 @@
 Warnings:
 Warning	1681	UNSIGNED for decimal and floating point data types is deprecated and support for it will be removed in a future release.
 Warning	3856	AUTO_INCREMENT support for FLOAT/DOUBLE columns is deprecated and will be removed in a future release. Consider removing AUTO_INCREMENT from column 'c1'.
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 35, -500, "aaa");
 Warnings:
 Warning	1264	Out of range value for column 'c3' at row 1
 Warning	1366	Incorrect decimal value: 'aaa' for column 'c4' at row 1
 DELETE FROM t1;
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 36, -500, "aaa");
 Warnings:
 Warning	1264	Out of range value for column 'c3' at row 1
 Warning	1366	Incorrect decimal value: 'aaa' for column 'c4' at row 1
@@ -2047,33 +2047,33 @@
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
 DELETE FROM t1;
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 37, -500, "aaa");
 Warnings:
 Warning	1366	Incorrect decimal value: 'aaa' for column 'c4' at row 1
 DELETE FROM t1;
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 38, -500, "aaa");
 Warnings:
 Warning	1366	Incorrect decimal value: 'aaa' for column 'c4' at row 1
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
 DELETE FROM t1;
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 39, -500, "aaa");
 Warnings:
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
 DELETE FROM t1;
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 40, -500, "aaa");
 DELETE FROM t1;
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 41, -500, "aaa");
 Warnings:
 Warning	1264	Out of range value for column 'c3' at row 1
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
 Warning	1292	Truncated incorrect INTEGER value: '9.223372036854776e18'
 DELETE FROM t1;
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 42, -500, "aaa");
 Warnings:
 Warning	1264	Out of range value for column 'c3' at row 1
 DELETE FROM t1;
@@ -2196,3 +2196,14 @@
 CREATE TABLE t1 (i int primary key not null);
 INSERT INTO t1 values(3);
 DROP TABLE t1;
+#
+# Bug#33068833 MISSING END OF BLOCK ERROR WITH `--ASSERT` MYSQLTEST COMMAND
+#
+mysqltest: At line 1: Expression in assert() must begin with $, ` or a number
+mysqltest: At line 1: Assertion failed: assert(0)
+mysqltest: At line 1: Assertion failed: assert($undef_var)
+mysqltest: At line 1: Assertion failed: assert($false_var)
+mysqltest: At line 2: Assertion failed: assert(`SELECT $false_var`)
+mysqltest: At line 4: Assertion failed: assert(`SELECT 0`)
+mysqltest: At line 6: Assertion failed: assert($myvar)
+mysqltest: At line 14: Assertion failed: assert($counter)
diff -Nru mysql-8.0-8.0.26/mysql-test/r/mysql_upgrade_grant.result mysql-8.0-8.0.27/mysql-test/r/mysql_upgrade_grant.result
--- mysql-8.0-8.0.26/mysql-test/r/mysql_upgrade_grant.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/mysql_upgrade_grant.result	2021-09-28 11:46:34.000000000 +0000
@@ -275,8 +275,8 @@
 SHOW GRANTS FOR root@localhost;
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 CREATE USER u1;
 GRANT SUPER ON *.* TO u1;
 Warnings:
@@ -291,8 +291,8 @@
 SHOW GRANTS FOR root@localhost;
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 SHOW GRANTS FOR u1;
 Grants for u1@%
 GRANT SUPER ON *.* TO `u1`@`%`
@@ -307,8 +307,8 @@
 SHOW GRANTS FOR root@localhost;
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 SHOW GRANTS FOR u1;
 Grants for u1@%
 GRANT SUPER ON *.* TO `u1`@`%`
@@ -330,8 +330,8 @@
 SHOW GRANTS FOR root@localhost;
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 SHOW GRANTS FOR u1;
 Grants for u1@%
 GRANT SUPER ON *.* TO `u1`@`%`
@@ -393,8 +393,8 @@
 SHOW GRANTS FOR root@localhost;
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 SHOW GRANTS FOR user1;
 Grants for user1@%
 GRANT SUPER ON *.* TO `user1`@`%`
@@ -404,8 +404,8 @@
 SHOW GRANTS FOR root@localhost;
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 SHOW GRANTS FOR user1;
 Grants for user1@%
 GRANT SUPER ON *.* TO `user1`@`%`
@@ -422,8 +422,8 @@
 SHOW GRANTS FOR root@localhost;
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 CREATE USER u1;
 GRANT SUPER ON *.* TO u1;
 Warnings:
@@ -438,8 +438,8 @@
 SHOW GRANTS FOR root@localhost;
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 SHOW GRANTS FOR u1;
 Grants for u1@%
 GRANT SUPER ON *.* TO `u1`@`%`
@@ -453,8 +453,8 @@
 SHOW GRANTS FOR root@localhost;
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 SHOW GRANTS FOR u1;
 Grants for u1@%
 GRANT SUPER ON *.* TO `u1`@`%`
@@ -476,8 +476,8 @@
 SHOW GRANTS FOR root@localhost;
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 SHOW GRANTS FOR u1;
 Grants for u1@%
 GRANT SUPER ON *.* TO `u1`@`%`
@@ -494,8 +494,8 @@
 SHOW GRANTS FOR root@localhost;
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 CREATE USER u1;
 GRANT SUPER ON *.* TO u1;
 Warnings:
@@ -510,8 +510,8 @@
 SHOW GRANTS FOR root@localhost;
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,BACKUP_ADMIN,CLONE_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,RESOURCE_GROUP_ADMIN,SERVICE_CONNECTION_ADMIN,SHOW_ROUTINE,SYSTEM_USER,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,CLONE_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,RESOURCE_GROUP_ADMIN,SERVICE_CONNECTION_ADMIN,SHOW_ROUTINE,SYSTEM_USER,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 SHOW GRANTS FOR u1;
 Grants for u1@%
 GRANT SUPER ON *.* TO `u1`@`%`
@@ -524,8 +524,8 @@
 SHOW GRANTS FOR root@localhost;
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 SHOW GRANTS FOR u1;
 Grants for u1@%
 GRANT SUPER ON *.* TO `u1`@`%`
@@ -542,8 +542,8 @@
 SHOW GRANTS FOR root@localhost;
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 SHOW GRANTS FOR u1;
 Grants for u1@%
 GRANT SUPER ON *.* TO `u1`@`%`
@@ -567,8 +567,8 @@
 SHOW GRANTS FOR root@localhost;
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 SHOW GRANTS FOR sheldon;
 Grants for sheldon@%
 GRANT SELECT ON *.* TO `sheldon`@`%`
@@ -579,8 +579,8 @@
 SHOW GRANTS FOR root@localhost;
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 SHOW GRANTS FOR sheldon;
 Grants for sheldon@%
 GRANT SELECT ON *.* TO `sheldon`@`%`
diff -Nru mysql-8.0-8.0.26/mysql-test/r/mysql_upgrade.result mysql-8.0-8.0.27/mysql-test/r/mysql_upgrade.result
--- mysql-8.0-8.0.26/mysql-test/r/mysql_upgrade.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/mysql_upgrade.result	2021-09-28 11:46:34.000000000 +0000
@@ -42,5 +42,39 @@
 Pattern "Could not open server upgrade info file \'.*\' for writing\. Please make sure the file is writable\." found
 # Cleanup
 # restart: 
+#
+# Bug #33165861: WL#14183 new privileges not taken into account for upgrades
+#
+CREATE USER u1,u2;
+GRANT CREATE USER ON *.* TO u1;
+GRANT SYSTEM_VARIABLES_ADMIN ON *.* TO u2;
+# There should be no PASSWORDLESS_USER_ADMIN privilege
+SHOW GRANTS FOR u1;
+Grants for u1@%
+GRANT CREATE USER ON *.* TO `u1`@`%`
+# There should be no AUTHENTICATION_POLICY_ADMIN privilege
+SHOW GRANTS FOR u2;
+Grants for u2@%
+GRANT USAGE ON *.* TO `u2`@`%`
+GRANT SYSTEM_VARIABLES_ADMIN ON *.* TO `u2`@`%`
+REVOKE PASSWORDLESS_USER_ADMIN, AUTHENTICATION_POLICY_ADMIN ON *.* FROM root@localhost;
+# restart:--upgrade=FORCE
+# Must have PASSWORDLESS_USER_ADMIN privilege
+SHOW GRANTS FOR u1;
+Grants for u1@%
+GRANT CREATE USER, CREATE ROLE, DROP ROLE ON *.* TO `u1`@`%`
+GRANT PASSWORDLESS_USER_ADMIN ON *.* TO `u1`@`%`
+# Must have AUTHENTICATION_POLICY_ADMIN privilege
+SHOW GRANTS FOR u2;
+Grants for u2@%
+GRANT USAGE ON *.* TO `u2`@`%`
+GRANT AUTHENTICATION_POLICY_ADMIN,SYSTEM_VARIABLES_ADMIN ON *.* TO `u2`@`%`
+# Must have AUTHENTICATION_POLICY_ADMIN, PASSWORDLESS_USER_ADMIN privilegea
+SHOW GRANTS FOR root@localhost;
+Grants for root@localhost
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
+DROP USER u1,u2;
 
 End of tests
diff -Nru mysql-8.0-8.0.26/mysql-test/r/named_pipe.result mysql-8.0-8.0.27/mysql-test/r/named_pipe.result
--- mysql-8.0-8.0.26/mysql-test/r/named_pipe.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/named_pipe.result	2021-09-28 11:46:34.000000000 +0000
@@ -537,6 +537,7 @@
 insert into t3 select * from tmp;
 insert into tmp select * from t3;
 insert into t3 select * from tmp;
+set session innodb_parallel_read_threads=1;
 alter table t3 add t2nr int not null auto_increment primary key first;
 drop table tmp;
 SET BIG_TABLES=1;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/no_binlog.result mysql-8.0-8.0.27/mysql-test/r/no_binlog.result
--- mysql-8.0-8.0.26/mysql-test/r/no_binlog.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/no_binlog.result	2021-09-28 11:46:34.000000000 +0000
@@ -1,8 +1,8 @@
 SHOW BINARY LOGS;
 ERROR HY000: You are not using binary logging
 #
-# Verify that The log-replica-updates and replica-preserve-commit-order
-# are disabled if binary log is disabled.
+# Verify that The log-replica-updates
+# is disabled if binary log is disabled.
 #
 SELECT @@GLOBAL.log_bin;
 @@GLOBAL.log_bin
@@ -10,9 +10,6 @@
 SELECT @@GLOBAL.log_replica_updates;
 @@GLOBAL.log_replica_updates
 0
-SELECT @@GLOBAL.replica_preserve_commit_order;
-@@GLOBAL.replica_preserve_commit_order
-0
 #
 # Bug#32234194: DDL: DIAGNOSTICS_AREA::SET_OK_STATUS: ASSERTION `!IS_SET()'
 #
diff -Nru mysql-8.0-8.0.26/mysql-test/r/null_key_all_myisam.result mysql-8.0-8.0.27/mysql-test/r/null_key_all_myisam.result
--- mysql-8.0-8.0.26/mysql-test/r/null_key_all_myisam.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/null_key_all_myisam.result	2021-09-28 11:46:34.000000000 +0000
@@ -37,7 +37,7 @@
 explain format=tree select * from t1 where (a is null or a = 7) and b=7;
 EXPLAIN
 -> Filter: ((t1.b = 7) and ((t1.a is null) or (t1.a = 7)))  (cost=0.46 rows=2)
-    -> Index lookup on t1 using a (a=7 or NULL, b=7)  (cost=0.46 rows=2)
+    -> Covering index lookup on t1 using a (a=7 or NULL, b=7)  (cost=0.46 rows=2)
 
 explain select * from t1 where (a is null or a = 7) and b=7;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -453,7 +453,7 @@
 explain format=tree select * from t1 where (a is null or a = 7) and b=7;
 EXPLAIN
 -> Filter: ((t1.b = 7) and ((t1.a is null) or (t1.a = 7)))  (cost=0.46 rows=2)
-    -> Index lookup on t1 using b (b=7, a=7 or NULL)  (cost=0.46 rows=2)
+    -> Covering index lookup on t1 using b (b=7, a=7 or NULL)  (cost=0.46 rows=2)
 
 drop table t1;
 set optimizer_switch=default;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/null_key_icp_myisam.result mysql-8.0-8.0.27/mysql-test/r/null_key_icp_myisam.result
--- mysql-8.0-8.0.26/mysql-test/r/null_key_icp_myisam.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/null_key_icp_myisam.result	2021-09-28 11:46:34.000000000 +0000
@@ -37,7 +37,7 @@
 explain format=tree select * from t1 where (a is null or a = 7) and b=7;
 EXPLAIN
 -> Filter: ((t1.b = 7) and ((t1.a is null) or (t1.a = 7)))  (cost=0.46 rows=2)
-    -> Index lookup on t1 using a (a=7 or NULL, b=7)  (cost=0.46 rows=2)
+    -> Covering index lookup on t1 using a (a=7 or NULL, b=7)  (cost=0.46 rows=2)
 
 explain select * from t1 where (a is null or a = 7) and b=7;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -453,7 +453,7 @@
 explain format=tree select * from t1 where (a is null or a = 7) and b=7;
 EXPLAIN
 -> Filter: ((t1.b = 7) and ((t1.a is null) or (t1.a = 7)))  (cost=0.46 rows=2)
-    -> Index lookup on t1 using b (b=7, a=7 or NULL)  (cost=0.46 rows=2)
+    -> Covering index lookup on t1 using b (b=7, a=7 or NULL)  (cost=0.46 rows=2)
 
 drop table t1;
 set optimizer_switch=default;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/null_key_none_myisam.result mysql-8.0-8.0.27/mysql-test/r/null_key_none_myisam.result
--- mysql-8.0-8.0.26/mysql-test/r/null_key_none_myisam.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/null_key_none_myisam.result	2021-09-28 11:46:34.000000000 +0000
@@ -36,7 +36,7 @@
 explain format=tree select * from t1 where (a is null or a = 7) and b=7;
 EXPLAIN
 -> Filter: ((t1.b = 7) and ((t1.a is null) or (t1.a = 7)))  (cost=0.46 rows=2)
-    -> Index lookup on t1 using a (a=7 or NULL, b=7)  (cost=0.46 rows=2)
+    -> Covering index lookup on t1 using a (a=7 or NULL, b=7)  (cost=0.46 rows=2)
 
 explain select * from t1 where (a is null or a = 7) and b=7;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -452,7 +452,7 @@
 explain format=tree select * from t1 where (a is null or a = 7) and b=7;
 EXPLAIN
 -> Filter: ((t1.b = 7) and ((t1.a is null) or (t1.a = 7)))  (cost=0.46 rows=2)
-    -> Index lookup on t1 using b (b=7, a=7 or NULL)  (cost=0.46 rows=2)
+    -> Covering index lookup on t1 using b (b=7, a=7 or NULL)  (cost=0.46 rows=2)
 
 drop table t1;
 set optimizer_switch=default;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/olap.result mysql-8.0-8.0.27/mysql-test/r/olap.result
--- mysql-8.0-8.0.26/mysql-test/r/olap.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/olap.result	2021-09-28 11:46:34.000000000 +0000
@@ -1564,7 +1564,7 @@
 -> Sort: i
     -> Table scan on <temporary>  (cost=2.50..2.50 rows=0)
         -> Temporary table  (cost=2.50..2.50 rows=0)
-            -> Window aggregate with buffering: avg(t1.j) OVER () 
+            -> Window aggregate with buffering: avg(j) OVER () 
                 -> Filter: ((rollup_group_item(t1.i,0) + rollup_group_item(t1.j,1)) is null)
                     -> Table scan on <temporary>  (cost=2.50..2.50 rows=0)
                         -> Temporary table  (cost=2.50..2.50 rows=0)
@@ -2020,7 +2020,7 @@
 FROM t GROUP BY b,a WITH ROLLUP;
 (((@e:=`b`)) NOT BETWEEN 0x0b5f09 AND (CHAR(md5(@pub1),
 (CONNECTION_ID()+LEAD(5225.750000,110) RESPECT NULLS OVER(ORDER BY b, a)))))
-NULL
+1
 1
 1
 1
@@ -2209,3 +2209,44 @@
 NULL
 1
 DROP TABLE t1;
+#
+# Bug #32918927: ASSERTION `!THD->IS_ERROR()' FAILED|SQL/SQL_EXECUTOR.CC
+#
+CREATE TABLE t1 ( a TIME );
+SELECT
+t1.a
+FROM
+t1, t1 AS t2
+GROUP BY t1.a WITH ROLLUP
+HAVING COUNT(*) = 0 AND t1.a = '刔';
+ERROR HY000: Illegal mix of collations for operation '='
+DROP TABLE t1;
+#
+# Bug#33036184: GROUP BY WITH ROLLUP AND CONCAT OVER GROUP BY KEY DOES NOT PRODUCE NULL
+#
+CREATE TABLE t1 (f1 INTEGER PRIMARY KEY);
+INSERT INTO t1 values (1);
+SELECT CONCAT(INSTR(f1,'w')) FROM t1 GROUP BY f1 WITH ROLLUP;
+CONCAT(INSTR(f1,'w'))
+0
+NULL
+DROP TABLE t1;
+#
+# Bug #33041336: WL#14419: ASSERTION `THD->CHANGE_LIST.IS_EMPTY()' FAILED
+#
+CREATE TABLE t1 ( a INTEGER );
+PREPARE ps FROM "SELECT RANK() OVER (ORDER BY a) FROM t1 GROUP BY a WITH ROLLUP";
+DROP TABLE t1;
+#
+# Bug #33123934: QUERY WITH ROLLUP - SEGFAULT IN CHANGE_TO_USE_TMP_FIELDS_EXCEPT_SUMS
+#
+CREATE TABLE t1 ( a VARCHAR(10), b TIMESTAMP );
+SELECT
+REPLACE( IF( t2.a = t2.b, _latin1 'a', 'e'), 'd', 'b' )
+FROM
+t1, t1 AS t2
+GROUP BY
+REPLACE( IF( t2.a = t2.b, _latin1 'a', 'e'), 'd', 'b' )
+WITH ROLLUP;
+REPLACE( IF( t2.a = t2.b, _latin1 'a', 'e'), 'd', 'b' )
+DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/opt_hints_index.result mysql-8.0-8.0.27/mysql-test/r/opt_hints_index.result
--- mysql-8.0-8.0.26/mysql-test/r/opt_hints_index.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/opt_hints_index.result	2021-09-28 11:46:34.000000000 +0000
@@ -187,7 +187,7 @@
 1	SIMPLE	t1	NULL	index	NULL	i_ab	10	NULL	256	12.50	Using where; Using index; Using join buffer (hash join)
 1	SIMPLE	ta	NULL	range	i_a	i_a	5	NULL	160	100.00	Using where; Using index; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `ta`.`a` AS `a` from `test`.`t1` /*+ NO_INDEX(`t1`@`select#1` `i_a`, `i_b`) */  semi join (`test`.`t1` /*+ NO_INDEX(`t1`@`select#2` `i_ab`, `i_b`) */ ) join `test`.`t1` `ta` /*+ INDEX(`ta`@`select#1` `i_a`) */  where ((`test`.`t1`.`b` = `test`.`t1`.`a`) and (`ta`.`a` > 3) and (`test`.`t1`.`a` > 3))
+Note	1003	/* select#1 */ select `test`.`ta`.`a` AS `a` from `test`.`t1` /*+ NO_INDEX(`t1`@`select#1` `i_a`, `i_b`) */  semi join (`test`.`t1` /*+ NO_INDEX(`t1`@`select#2` `i_ab`, `i_b`) */ ) join `test`.`t1` `ta` /*+ INDEX(`ta`@`select#1` `i_a`) */  where ((`test`.`t1`.`b` = `test`.`t1`.`a`) and (`test`.`ta`.`a` > 3) and (`test`.`t1`.`a` > 3))
 EXPLAIN SELECT /*+ INDEX(tb i_a) */ tb.a FROM v2, t1 tb WHERE tb.a > 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	NULL	range	i_a	i_a	5	NULL	160	5.00	Using where; Using index; LooseScan
@@ -195,7 +195,7 @@
 1	SIMPLE	ta	NULL	range	i_a	i_a	5	NULL	160	100.00	Using where; Using index; Using join buffer (hash join)
 1	SIMPLE	tb	NULL	range	i_a	i_a	5	NULL	160	100.00	Using where; Using index; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select /*+ INDEX(`tb`@`select#1` `i_a`) */ `test`.`tb`.`a` AS `a` from `test`.`t1` /*+ NO_INDEX(`t1`@`select#1` `i_a`, `i_b`) */  semi join (`test`.`t1` /*+ NO_INDEX(`t1`@`select#2` `i_ab`, `i_b`) */ ) join `test`.`t1` `ta` /*+ INDEX(`ta`@`select#1` `i_a`) */  join `test`.`t1` `tb` where ((`test`.`t1`.`b` = `test`.`t1`.`a`) and (`test`.`tb`.`a` > 3) and (`ta`.`a` > 3) and (`test`.`t1`.`a` > 3))
+Note	1003	/* select#1 */ select /*+ INDEX(`tb`@`select#1` `i_a`) */ `test`.`tb`.`a` AS `a` from `test`.`t1` /*+ NO_INDEX(`t1`@`select#1` `i_a`, `i_b`) */  semi join (`test`.`t1` /*+ NO_INDEX(`t1`@`select#2` `i_ab`, `i_b`) */ ) join `test`.`t1` `ta` /*+ INDEX(`ta`@`select#1` `i_a`) */  join `test`.`t1` `tb` where ((`test`.`t1`.`b` = `test`.`t1`.`a`) and (`test`.`tb`.`a` > 3) and (`test`.`ta`.`a` > 3) and (`test`.`t1`.`a` > 3))
 EXPLAIN SELECT /*+ INDEX(t1 i_a) */ * FROM t1 IGNORE INDEX(i_a)
 WHERE a = 1 AND b = 2 AND c = 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
diff -Nru mysql-8.0-8.0.26/mysql-test/r/opt_hints_set_var.result mysql-8.0-8.0.27/mysql-test/r/opt_hints_set_var.result
--- mysql-8.0-8.0.26/mysql-test/r/opt_hints_set_var.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/opt_hints_set_var.result	2021-09-28 11:46:34.000000000 +0000
@@ -631,7 +631,7 @@
 test.t1	analyze	status	OK
 EXPLAIN SELECT /*+ SET_VAR(sql_buffer_result=1) */  MIN(a), b FROM t1 WHERE t1.b = 'a' GROUP BY b;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	range	b	b	12	NULL	2	100.00	Using where; Using index for group-by; Using temporary
+1	SIMPLE	t1	NULL	range	b	b	12	NULL	1	100.00	Using where; Using index for group-by; Using temporary
 Warnings:
 Note	1003	/* select#1 */ select /*+ SET_VAR(sql_buffer_result=1) */ sql_buffer_result min(`test`.`t1`.`a`) AS `MIN(a)`,`test`.`t1`.`b` AS `b` from `test`.`t1` where (`test`.`t1`.`b` = 'a') group by `test`.`t1`.`b`
 DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/order_by_all.result mysql-8.0-8.0.27/mysql-test/r/order_by_all.result
--- mysql-8.0-8.0.26/mysql-test/r/order_by_all.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/order_by_all.result	2021-09-28 11:46:34.000000000 +0000
@@ -1299,28 +1299,28 @@
 1	SIMPLE	t2	NULL	range	k2	k2	5	NULL	409	100.00	Using index condition; Using MRR; Using filesort
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t2`.`id` AS `id`,`test`.`t2`.`c3` AS `c3` from `test`.`t2` where (`test`.`t2`.`c2` between 20 and 30) order by `test`.`t2`.`c3` limit 4000
-SELECT id,c3 FROM t2 WHERE c2=11 ORDER BY c3 LIMIT 20;
-id	c3
-6	14
-16	14
-31	14
-41	14
-62	14
-72	14
-82	14
-92	14
-125	14
-135	14
-145	14
-155	14
-165	14
-175	14
-185	14
-195	14
-252	14
-262	14
-272	14
-282	14
+SELECT c3,id FROM t2 WHERE c2=11 ORDER BY c3 LIMIT 20;
+c3	id
+14	125
+14	135
+14	145
+14	155
+14	16
+14	165
+14	175
+14	185
+14	195
+14	252
+14	262
+14	272
+14	282
+14	31
+14	41
+14	6
+14	62
+14	72
+14	82
+14	92
 DROP TABLE t1,t2;
 CREATE TABLE t1 (
 a INT,
@@ -1969,13 +1969,18 @@
 CREATE TABLE t3 (a varchar(32), b char(3), UNIQUE KEY a (a,b))
 charset utf8mb4;
 INSERT INTO t3 SELECT * FROM t1;
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 EXPLAIN
 SELECT d FROM t1, t2
 WHERE t2.b=14 AND t2.a=t1.a AND 5.1<t2.c AND t1.b='DE'
 ORDER BY t2.c LIMIT 1;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	NULL	ref	a,b	b	13	const	4	100.00	Using index condition; Using where; Using temporary; Using filesort
-1	SIMPLE	t2	NULL	ref	a,b,c	a	136	test.t1.a,const	1	78.90	Using index condition
+1	SIMPLE	t2	NULL	ref	a,b,c	a	136	test.t1.a,const	11	78.90	Using index condition
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t2`.`d` AS `d` from `test`.`t1` join `test`.`t2` where ((`test`.`t1`.`b` = 'DE') and (`test`.`t2`.`a` = `test`.`t1`.`a`) and (`test`.`t2`.`b` = 14) and (5.1 < `test`.`t2`.`c`)) order by `test`.`t2`.`c` limit 1
 SELECT d FROM t1, t2
diff -Nru mysql-8.0-8.0.26/mysql-test/r/order_by_icp_mrr.result mysql-8.0-8.0.27/mysql-test/r/order_by_icp_mrr.result
--- mysql-8.0-8.0.26/mysql-test/r/order_by_icp_mrr.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/order_by_icp_mrr.result	2021-09-28 11:46:34.000000000 +0000
@@ -1299,28 +1299,28 @@
 1	SIMPLE	t2	NULL	range	k2	k2	5	NULL	409	100.00	Using index condition; Using MRR; Using filesort
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t2`.`id` AS `id`,`test`.`t2`.`c3` AS `c3` from `test`.`t2` where (`test`.`t2`.`c2` between 20 and 30) order by `test`.`t2`.`c3` limit 4000
-SELECT id,c3 FROM t2 WHERE c2=11 ORDER BY c3 LIMIT 20;
-id	c3
-6	14
-16	14
-31	14
-41	14
-62	14
-72	14
-82	14
-92	14
-125	14
-135	14
-145	14
-155	14
-165	14
-175	14
-185	14
-195	14
-252	14
-262	14
-272	14
-282	14
+SELECT c3,id FROM t2 WHERE c2=11 ORDER BY c3 LIMIT 20;
+c3	id
+14	125
+14	135
+14	145
+14	155
+14	16
+14	165
+14	175
+14	185
+14	195
+14	252
+14	262
+14	272
+14	282
+14	31
+14	41
+14	6
+14	62
+14	72
+14	82
+14	92
 DROP TABLE t1,t2;
 CREATE TABLE t1 (
 a INT,
@@ -1969,13 +1969,18 @@
 CREATE TABLE t3 (a varchar(32), b char(3), UNIQUE KEY a (a,b))
 charset utf8mb4;
 INSERT INTO t3 SELECT * FROM t1;
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 EXPLAIN
 SELECT d FROM t1, t2
 WHERE t2.b=14 AND t2.a=t1.a AND 5.1<t2.c AND t1.b='DE'
 ORDER BY t2.c LIMIT 1;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	NULL	ref	a,b	b	13	const	4	100.00	Using index condition; Using where; Using temporary; Using filesort
-1	SIMPLE	t2	NULL	ref	a,b,c	a	136	test.t1.a,const	1	78.90	Using index condition
+1	SIMPLE	t2	NULL	ref	a,b,c	a	136	test.t1.a,const	11	78.90	Using index condition
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t2`.`d` AS `d` from `test`.`t1` join `test`.`t2` where ((`test`.`t1`.`b` = 'DE') and (`test`.`t2`.`a` = `test`.`t1`.`a`) and (`test`.`t2`.`b` = 14) and (5.1 < `test`.`t2`.`c`)) order by `test`.`t2`.`c` limit 1
 SELECT d FROM t1, t2
diff -Nru mysql-8.0-8.0.26/mysql-test/r/order_by_none.result mysql-8.0-8.0.27/mysql-test/r/order_by_none.result
--- mysql-8.0-8.0.26/mysql-test/r/order_by_none.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/order_by_none.result	2021-09-28 11:46:34.000000000 +0000
@@ -1299,28 +1299,28 @@
 1	SIMPLE	t2	NULL	range	k2	k2	5	NULL	409	100.00	Using where; Using filesort
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t2`.`id` AS `id`,`test`.`t2`.`c3` AS `c3` from `test`.`t2` where (`test`.`t2`.`c2` between 20 and 30) order by `test`.`t2`.`c3` limit 4000
-SELECT id,c3 FROM t2 WHERE c2=11 ORDER BY c3 LIMIT 20;
-id	c3
-6	14
-16	14
-31	14
-41	14
-62	14
-72	14
-82	14
-92	14
-125	14
-135	14
-145	14
-155	14
-165	14
-175	14
-185	14
-195	14
-252	14
-262	14
-272	14
-282	14
+SELECT c3,id FROM t2 WHERE c2=11 ORDER BY c3 LIMIT 20;
+c3	id
+14	125
+14	135
+14	145
+14	155
+14	16
+14	165
+14	175
+14	185
+14	195
+14	252
+14	262
+14	272
+14	282
+14	31
+14	41
+14	6
+14	62
+14	72
+14	82
+14	92
 DROP TABLE t1,t2;
 CREATE TABLE t1 (
 a INT,
@@ -1969,13 +1969,18 @@
 CREATE TABLE t3 (a varchar(32), b char(3), UNIQUE KEY a (a,b))
 charset utf8mb4;
 INSERT INTO t3 SELECT * FROM t1;
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 EXPLAIN
 SELECT d FROM t1, t2
 WHERE t2.b=14 AND t2.a=t1.a AND 5.1<t2.c AND t1.b='DE'
 ORDER BY t2.c LIMIT 1;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	NULL	ref	a,b	b	13	const	4	100.00	Using where; Using temporary; Using filesort
-1	SIMPLE	t2	NULL	ref	a,b,c	a	136	test.t1.a,const	1	78.90	Using where
+1	SIMPLE	t2	NULL	ref	a,b,c	a	136	test.t1.a,const	11	78.90	Using where
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t2`.`d` AS `d` from `test`.`t1` join `test`.`t2` where ((`test`.`t1`.`b` = 'DE') and (`test`.`t2`.`a` = `test`.`t1`.`a`) and (`test`.`t2`.`b` = 14) and (5.1 < `test`.`t2`.`c`)) order by `test`.`t2`.`c` limit 1
 SELECT d FROM t1, t2
diff -Nru mysql-8.0-8.0.26/mysql-test/r/persisted_variables_bugs_debug.result mysql-8.0-8.0.27/mysql-test/r/persisted_variables_bugs_debug.result
--- mysql-8.0-8.0.26/mysql-test/r/persisted_variables_bugs_debug.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/persisted_variables_bugs_debug.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,11 @@
+#
+# Bug#33038262: VARIOUS RACES IN PERSISTEN SYSTEM VARIABLE IMPLEMENTATION
+#
+SET @@debug='+d,check_intern_find_sys_var_lock';
+SET PERSIST_ONLY sql_mode=DEFAULT;
+SET PERSIST sql_mode=DEFAULT;
+RESET PERSIST sql_mode;
+RESET PERSIST;
+SET @@debug='-d,check_intern_find_sys_var_lock';
+# cleanup
+# restart
diff -Nru mysql-8.0-8.0.26/mysql-test/r/persisted_variables_bugs.result mysql-8.0-8.0.27/mysql-test/r/persisted_variables_bugs.result
--- mysql-8.0-8.0.26/mysql-test/r/persisted_variables_bugs.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/persisted_variables_bugs.result	2021-09-28 11:46:34.000000000 +0000
@@ -443,4 +443,30 @@
 VARIABLE_NAME	VARIABLE_VALUE
 replica_exec_mode	STRICT
 RESET PERSIST;
+#
+# Bug #32640588: SOURCE FOR SKIP_SLAVE_START DISPLAYED AS COMPILED
+#   WHEN IT IS PERSISTED
+#
+# Should both be "COMPILED"
+SELECT VARIABLE_NAME, VARIABLE_SOURCE FROM performance_schema.variables_info
+WHERE variable_name LIKE 'skip_%_start' ORDER BY 1;
+VARIABLE_NAME	VARIABLE_SOURCE
+skip_replica_start	COMPILED
+skip_slave_start	COMPILED
+SET PERSIST_ONLY skip_replica_start = ON;
+# Should still be "COMPILED" pre-restart
+SELECT VARIABLE_NAME, VARIABLE_SOURCE FROM performance_schema.variables_info
+WHERE variable_name LIKE 'skip_%_start' ORDER BY 1;
+VARIABLE_NAME	VARIABLE_SOURCE
+skip_replica_start	COMPILED
+skip_slave_start	COMPILED
+# restart:
+# Success criteria: Should be "PERSISTED" post-restart
+SELECT VARIABLE_NAME, VARIABLE_SOURCE FROM performance_schema.variables_info
+WHERE variable_name LIKE 'skip_%_start' ORDER BY 1;
+VARIABLE_NAME	VARIABLE_SOURCE
+skip_replica_start	PERSISTED
+skip_slave_start	PERSISTED
+RESET PERSIST;
+# restart:
 # End of the 8.0 tests
diff -Nru mysql-8.0-8.0.26/mysql-test/r/persisted_variables_extended.result mysql-8.0-8.0.27/mysql-test/r/persisted_variables_extended.result
--- mysql-8.0-8.0.26/mysql-test/r/persisted_variables_extended.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/persisted_variables_extended.result	2021-09-28 11:46:34.000000000 +0000
@@ -243,6 +243,7 @@
 SET GLOBAL general_log_file=  @old_general_log_file;
 SET GLOBAL general_log=       @old_general_log;
 SET GLOBAL log_output=        @old_log_output;
+TRUNCATE TABLE mysql.general_log;
 SET PERSIST block_encryption_mode=DEFAULT, PERSIST ft_boolean_syntax=DEFAULT,
 PERSIST innodb_checksum_algorithm=DEFAULT,
 PERSIST log_error_services=DEFAULT,
diff -Nru mysql-8.0-8.0.26/mysql-test/r/plugin_auth_password_history.result mysql-8.0-8.0.27/mysql-test/r/plugin_auth_password_history.result
--- mysql-8.0-8.0.26/mysql-test/r/plugin_auth_password_history.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/plugin_auth_password_history.result	2021-09-28 11:46:34.000000000 +0000
@@ -5,7 +5,7 @@
 # Must have default password history
 SHOW CREATE USER pwd_history_plugin@localhost;
 CREATE USER for pwd_history_plugin@localhost
-CREATE USER 'pwd_history_plugin'@'localhost' IDENTIFIED WITH 'test_plugin_server' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `pwd_history_plugin`@`localhost` IDENTIFIED WITH 'test_plugin_server' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 # Must be 0: non-local passwords plugin
 SELECT COUNT(*) FROM mysql.password_history WHERE
 User='pwd_history_plugin' AND Host='localhost';
@@ -18,7 +18,7 @@
 # Must have default password reuse interval
 SHOW CREATE USER pwd_history_plugin@localhost;
 CREATE USER for pwd_history_plugin@localhost
-CREATE USER 'pwd_history_plugin'@'localhost' IDENTIFIED WITH 'test_plugin_server' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `pwd_history_plugin`@`localhost` IDENTIFIED WITH 'test_plugin_server' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 # Must be 0: non-local passwords plugin
 SELECT COUNT(*) FROM mysql.password_history WHERE
 User='pwd_history_plugin' AND Host='localhost';
@@ -35,7 +35,7 @@
 # Must have default password reuse interval
 SHOW CREATE USER mohit@localhost;
 CREATE USER for mohit@localhost
-CREATE USER 'mohit'@'localhost' IDENTIFIED WITH 'test_plugin_server' AS 'haha' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `mohit`@`localhost` IDENTIFIED WITH 'test_plugin_server' AS 'haha' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 # Must be 0: password history on
 SELECT COUNT(*) FROM mysql.password_history WHERE
 User='mohit' AND Host='localhost';
diff -Nru mysql-8.0-8.0.26/mysql-test/r/plugin_auth_qa.result mysql-8.0-8.0.27/mysql-test/r/plugin_auth_qa.result
--- mysql-8.0-8.0.26/mysql-test/r/plugin_auth_qa.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/plugin_auth_qa.result	2021-09-28 11:46:34.000000000 +0000
@@ -128,23 +128,23 @@
 SET NAMES ascii;
 CREATE USER 'plüg' IDENTIFIED WITH 'test_plugin_server' AS 'plüg_dest';
 Warnings:
-Warning	1300	Cannot convert string 'pl\xC3\xBCg' from ascii to utf8
-Warning	1300	Cannot convert string 'pl\xC3\xBCg_...' from ascii to utf8
+Warning	1300	Cannot convert string 'pl\xC3\xBCg' from ascii to utf8mb3
+Warning	1300	Cannot convert string 'pl\xC3\xBCg_...' from ascii to utf8mb3
 SELECT user,plugin FROM mysql.user WHERE user NOT IN ('root', 'mysql.sys', 'mysql.session', 'mysql.infoschema');
 user	plugin
 pl??g	test_plugin_server
 DROP USER 'plüg';
 Warnings:
-Warning	1300	Cannot convert string 'pl\xC3\xBCg' from ascii to utf8
+Warning	1300	Cannot convert string 'pl\xC3\xBCg' from ascii to utf8mb3
 CREATE USER 'plüg_dest' IDENTIFIED BY 'plug_dest_passwd';
 Warnings:
-Warning	1300	Cannot convert string 'pl\xC3\xBCg_...' from ascii to utf8
+Warning	1300	Cannot convert string 'pl\xC3\xBCg_...' from ascii to utf8mb3
 SELECT user,plugin FROM mysql.user WHERE user NOT IN ('root', 'mysql.sys', 'mysql.session', 'mysql.infoschema');
 user	plugin
 pl??g_dest	caching_sha2_password
 DROP USER 'plüg_dest';
 Warnings:
-Warning	1300	Cannot convert string 'pl\xC3\xBCg_...' from ascii to utf8
+Warning	1300	Cannot convert string 'pl\xC3\xBCg_...' from ascii to utf8mb3
 SET NAMES latin1;
 ========== test 1.1.1.5 ====================================
 CREATE USER 'plüg' IDENTIFIED WITH 'test_plügin_server' AS 'plüg_dest';
diff -Nru mysql-8.0-8.0.26/mysql-test/r/plugin_auth.result mysql-8.0-8.0.27/mysql-test/r/plugin_auth.result
--- mysql-8.0-8.0.26/mysql-test/r/plugin_auth.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/plugin_auth.result	2021-09-28 11:46:34.000000000 +0000
@@ -138,20 +138,20 @@
 SHOW GRANTS FOR grant_plug;
 Grants for grant_plug@%
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `grant_plug`@`%`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `grant_plug`@`%`
-GRANT PROXY ON 'future_user'@'%' TO 'grant_plug'@'%'
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `grant_plug`@`%`
+GRANT PROXY ON `future_user`@`%` TO `grant_plug`@`%`
 REVOKE PROXY ON future_user FROM grant_plug;
 SHOW GRANTS FOR grant_plug;
 Grants for grant_plug@%
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `grant_plug`@`%`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `grant_plug`@`%`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `grant_plug`@`%`
 ## testing drop user
 CREATE USER test_drop@localhost;
 GRANT PROXY ON future_user TO test_drop@localhost;
 SHOW GRANTS FOR test_drop@localhost;
 Grants for test_drop@localhost
 GRANT USAGE ON *.* TO `test_drop`@`localhost`
-GRANT PROXY ON 'future_user'@'%' TO 'test_drop'@'localhost'
+GRANT PROXY ON `future_user`@`%` TO `test_drop`@`localhost`
 DROP USER test_drop@localhost;
 SELECT * FROM mysql.proxies_priv WHERE Host = 'test_drop' AND User = 'localhost';
 Host	User	Proxied_host	Proxied_user	With_grant	Grantor	Timestamp
diff -Nru mysql-8.0-8.0.26/mysql-test/r/plugin_auth_sha256.result mysql-8.0-8.0.27/mysql-test/r/plugin_auth_sha256.result
--- mysql-8.0-8.0.26/mysql-test/r/plugin_auth_sha256.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/plugin_auth_sha256.result	2021-09-28 11:46:34.000000000 +0000
@@ -21,7 +21,7 @@
 kristofer@localhost	kristofer@localhost
 SHOW CREATE USER 'kristofer'@'localhost';
 CREATE USER for kristofer@localhost
-CREATE USER 'kristofer'@'localhost' IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>'
+CREATE USER `kristofer`@`localhost` IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>'
 Change user (should succeed)
 SELECT USER(),CURRENT_USER();
 USER()	CURRENT_USER()
@@ -45,7 +45,7 @@
 kristofer@localhost	kristofer@localhost
 SHOW CREATE USER 'kristofer'@'localhost';
 CREATE USER for kristofer@localhost
-CREATE USER 'kristofer'@'localhost' IDENTIFIED WITH 'sha256_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `kristofer`@`localhost` IDENTIFIED WITH 'sha256_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 DROP USER 'kristofer'@'localhost';
 CREATE USER 'kristofer'@'33.33.33.33' IDENTIFIED WITH 'sha256_password' BY '123';
 ALTER USER 'kristofer'@'33.33.33.33' IDENTIFIED BY '';
diff -Nru mysql-8.0-8.0.26/mysql-test/r/point_select_hypergraph.result mysql-8.0-8.0.27/mysql-test/r/point_select_hypergraph.result
--- mysql-8.0-8.0.26/mysql-test/r/point_select_hypergraph.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/point_select_hypergraph.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,16 @@
+#
+# Bug #32808908: MAKE PREPARED STATEMENT PLACEHOLDERS SARGABLE IN THE HYPERGRAPH OPTIMIZER
+#
+CREATE TABLE t1 ( pk INTEGER NOT NULL, a INTEGER, PRIMARY KEY ( pk ) );
+INSERT INTO t1 VALUES (1,10), (2,20), (3,30), (4,40), (5,50), (6,60), (7,70), (8,80), (9,90), (10,100);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+PREPARE q FROM 'EXPLAIN FORMAT=tree SELECT * FROM t1 WHERE pk = ?';
+SET @v = 2;
+EXECUTE q USING @v;
+EXPLAIN
+-> Single-row index lookup on t1 using PRIMARY (pk=2)  (cost=0.25..0.25 rows=1)
+
+DROP TABLE t1;
+SET optimizer_switch=DEFAULT;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ps_1general_ci.result mysql-8.0-8.0.27/mysql-test/r/ps_1general_ci.result
--- mysql-8.0-8.0.26/mysql-test/r/ps_1general_ci.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ps_1general_ci.result	2021-09-28 11:46:34.000000000 +0000
@@ -462,7 +462,7 @@
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	NULL	range	PRIMARY	PRIMARY	4	NULL	3	100.00	Using index condition; Using filesort
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` where (`test`.`t1`.`a` > <cache>(1)) order by `test`.`t1`.`b`
+Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` where (`test`.`t1`.`a` > 1) order by `test`.`t1`.`b`
 drop table if exists t2;
 create table t2 (id smallint, name varchar(20)) ;
 prepare stmt1 from ' insert into t2 values(?, ?) ' ;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ps_1general.result mysql-8.0-8.0.27/mysql-test/r/ps_1general.result
--- mysql-8.0-8.0.26/mysql-test/r/ps_1general.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ps_1general.result	2021-09-28 11:46:34.000000000 +0000
@@ -462,7 +462,7 @@
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	NULL	range	PRIMARY	PRIMARY	4	NULL	3	100.00	Using index condition; Using filesort
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` where (`test`.`t1`.`a` > <cache>(1)) order by `test`.`t1`.`b`
+Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` where (`test`.`t1`.`a` > 1) order by `test`.`t1`.`b`
 drop table if exists t2;
 create table t2 (id smallint, name varchar(20)) ;
 prepare stmt1 from ' insert into t2 values(?, ?) ' ;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ps_2myisam.result mysql-8.0-8.0.27/mysql-test/r/ps_2myisam.result
--- mysql-8.0-8.0.26/mysql-test/r/ps_2myisam.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ps_2myisam.result	2021-09-28 11:46:34.000000000 +0000
@@ -783,8 +783,6 @@
     c13 = (select MAX(b) from t1 where a = ?) and c22 = ? ' ;
 execute stmt1 using @arg01, @arg02;
 c4
-Warnings:
-Warning	1292	Truncated incorrect DOUBLE value: 'two'
 prepare stmt1 from ' select a, b FROM t1 outer_table where
    a = (select a from t1 where b = outer_table.b ) order by a ';
 execute stmt1 ;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ps_3innodb.result mysql-8.0-8.0.27/mysql-test/r/ps_3innodb.result
--- mysql-8.0-8.0.26/mysql-test/r/ps_3innodb.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ps_3innodb.result	2021-09-28 11:46:34.000000000 +0000
@@ -783,8 +783,6 @@
     c13 = (select MAX(b) from t1 where a = ?) and c22 = ? ' ;
 execute stmt1 using @arg01, @arg02;
 c4
-Warnings:
-Warning	1292	Truncated incorrect DOUBLE value: 'two'
 prepare stmt1 from ' select a, b FROM t1 outer_table where
    a = (select a from t1 where b = outer_table.b ) order by a ';
 execute stmt1 ;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ps_4heap.result mysql-8.0-8.0.27/mysql-test/r/ps_4heap.result
--- mysql-8.0-8.0.26/mysql-test/r/ps_4heap.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ps_4heap.result	2021-09-28 11:46:34.000000000 +0000
@@ -784,8 +784,6 @@
     c13 = (select MAX(b) from t1 where a = ?) and c22 = ? ' ;
 execute stmt1 using @arg01, @arg02;
 c4
-Warnings:
-Warning	1292	Truncated incorrect DOUBLE value: 'two'
 prepare stmt1 from ' select a, b FROM t1 outer_table where
    a = (select a from t1 where b = outer_table.b ) order by a ';
 execute stmt1 ;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ps_5merge.result mysql-8.0-8.0.27/mysql-test/r/ps_5merge.result
--- mysql-8.0-8.0.26/mysql-test/r/ps_5merge.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ps_5merge.result	2021-09-28 11:46:34.000000000 +0000
@@ -827,8 +827,6 @@
     c13 = (select MAX(b) from t1 where a = ?) and c22 = ? ' ;
 execute stmt1 using @arg01, @arg02;
 c4
-Warnings:
-Warning	1292	Truncated incorrect DOUBLE value: 'two'
 prepare stmt1 from ' select a, b FROM t1 outer_table where
    a = (select a from t1 where b = outer_table.b ) order by a ';
 execute stmt1 ;
@@ -4013,8 +4011,6 @@
     c13 = (select MAX(b) from t1 where a = ?) and c22 = ? ' ;
 execute stmt1 using @arg01, @arg02;
 c4
-Warnings:
-Warning	1292	Truncated incorrect DOUBLE value: 'two'
 prepare stmt1 from ' select a, b FROM t1 outer_table where
    a = (select a from t1 where b = outer_table.b ) order by a ';
 execute stmt1 ;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ps.result mysql-8.0-8.0.27/mysql-test/r/ps.result
--- mysql-8.0-8.0.26/mysql-test/r/ps.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ps.result	2021-09-28 11:46:34.000000000 +0000
@@ -1,4 +1,6 @@
 call mtr.add_suppression('Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT.');
+SET @old_log_output=@@global.log_output;
+SET GLOBAL log_output="FILE,TABLE";
 drop table if exists t1,t2,t3,t4;
 drop database if exists client_test_db;
 create table t1
@@ -4040,3 +4042,18 @@
 EXECUTE s;
 1
 DROP TABLE t1;
+#
+# Bug #32808790: DON'T ADD CACHES AROUND PREPARED STATEMENT PARAMETERS
+#
+CREATE TABLE t1 ( pk INTEGER NOT NULL, a INTEGER );
+PREPARE q FROM 'EXPLAIN FORMAT=tree SELECT * FROM t1 WHERE pk = ?';
+SET @v = 2;
+EXECUTE q USING @v;
+EXPLAIN
+-> Filter: (t1.pk = 2)
+    -> Table scan on t1
+
+DROP TABLE t1;
+SET GLOBAL log_output=@old_log_output;
+TRUNCATE TABLE mysql.general_log;
+TRUNCATE TABLE mysql.slow_log;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ps_type_deduction.result mysql-8.0-8.0.27/mysql-test/r/ps_type_deduction.result
--- mysql-8.0-8.0.26/mysql-test/r/ps_type_deduction.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ps_type_deduction.result	2021-09-28 11:46:34.000000000 +0000
@@ -834,6 +834,8 @@
 json_extract(trace,"$.steps[*].statement_parameters")
 [["VARCHAR", "LONGLONG"]]
 prepare s from 'select BINARY(?)';
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select json_extract(trace,"$.steps[*].statement_parameters") from information_schema.optimizer_trace;
 json_extract(trace,"$.steps[*].statement_parameters")
 [["VARCHAR"]]
@@ -1912,6 +1914,26 @@
 select json_extract(trace,"$.steps[*].statement_parameters") from information_schema.optimizer_trace;
 json_extract(trace,"$.steps[*].statement_parameters")
 [["VARCHAR", "VARCHAR"]]
+prepare s from 'select NULLIF(100,?)';
+select json_extract(trace,"$.steps[*].statement_parameters") from information_schema.optimizer_trace;
+json_extract(trace,"$.steps[*].statement_parameters")
+[["LONGLONG"]]
+prepare s from 'select NULLIF(?,100)';
+select json_extract(trace,"$.steps[*].statement_parameters") from information_schema.optimizer_trace;
+json_extract(trace,"$.steps[*].statement_parameters")
+[["LONGLONG"]]
+prepare s from 'select 200 + NULLIF(?,?)';
+select json_extract(trace,"$.steps[*].statement_parameters") from information_schema.optimizer_trace;
+json_extract(trace,"$.steps[*].statement_parameters")
+[["LONGLONG", "LONGLONG"]]
+prepare s from 'select 200 + NULLIF("100",?)';
+select json_extract(trace,"$.steps[*].statement_parameters") from information_schema.optimizer_trace;
+json_extract(trace,"$.steps[*].statement_parameters")
+[["VARCHAR"]]
+prepare s from 'select 200 + NULLIF(?,"100")';
+select json_extract(trace,"$.steps[*].statement_parameters") from information_schema.optimizer_trace;
+json_extract(trace,"$.steps[*].statement_parameters")
+[["VARCHAR"]]
 prepare s from 'select OCT(?)';
 select json_extract(trace,"$.steps[*].statement_parameters") from information_schema.optimizer_trace;
 json_extract(trace,"$.steps[*].statement_parameters")
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ps_w_max_indexes_64_myisam.result mysql-8.0-8.0.27/mysql-test/r/ps_w_max_indexes_64_myisam.result
--- mysql-8.0-8.0.26/mysql-test/r/ps_w_max_indexes_64_myisam.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ps_w_max_indexes_64_myisam.result	2021-09-28 11:46:34.000000000 +0000
@@ -82,7 +82,7 @@
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	NULL	range	PRIMARY	PRIMARY	4	NULL	3	100.00	Using index condition; Using filesort
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` where (`test`.`t1`.`a` > <cache>(1)) order by `test`.`t1`.`b`
+Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` where (`test`.`t1`.`a` > 1) order by `test`.`t1`.`b`
 DROP TABLE t1, t9;
 drop table if exists t1, t9 ;
 create table t1
@@ -979,8 +979,6 @@
     c13 = (select MAX(b) from t1 where a = ?) and c22 = ? ' ;
 execute stmt1 using @arg01, @arg02;
 c4
-Warnings:
-Warning	1292	Truncated incorrect DOUBLE value: 'two'
 prepare stmt1 from ' select a, b FROM t1 outer_table where
    a = (select a from t1 where b = outer_table.b ) order by a ';
 execute stmt1 ;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ps_w_max_indexes_64.result mysql-8.0-8.0.27/mysql-test/r/ps_w_max_indexes_64.result
--- mysql-8.0-8.0.26/mysql-test/r/ps_w_max_indexes_64.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ps_w_max_indexes_64.result	2021-09-28 11:46:34.000000000 +0000
@@ -82,7 +82,7 @@
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	NULL	range	PRIMARY	PRIMARY	4	NULL	3	100.00	Using index condition; Using filesort
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` where (`test`.`t1`.`a` > <cache>(1)) order by `test`.`t1`.`b`
+Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` where (`test`.`t1`.`a` > 1) order by `test`.`t1`.`b`
 DROP TABLE t1, t9;
 drop table if exists t1, t9 ;
 create table t1
@@ -1114,8 +1114,6 @@
     c13 = (select MAX(b) from t1 where a = ?) and c22 = ? ' ;
 execute stmt1 using @arg01, @arg02;
 c4
-Warnings:
-Warning	1292	Truncated incorrect DOUBLE value: 'two'
 prepare stmt1 from ' select a, b FROM t1 outer_table where
    a = (select a from t1 where b = outer_table.b ) order by a ';
 execute stmt1 ;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/range_all.result mysql-8.0-8.0.27/mysql-test/r/range_all.result
--- mysql-8.0-8.0.26/mysql-test/r/range_all.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/range_all.result	2021-09-28 11:46:34.000000000 +0000
@@ -36,7 +36,7 @@
 explain format=tree select event_date,type,event_id from t1 WHERE event_date >= "1999-07-01" AND event_date < "1999-07-15" AND (type=100600 OR type=100100) ORDER BY event_date;
 EXPLAIN
 -> Filter: ((t1.event_date >= DATE'1999-07-01') and (t1.event_date < DATE'1999-07-15') and ((t1.`type` = 100600) or (t1.`type` = 100100)))  (cost=1.46 rows=1)
-    -> Index range scan on t1 using PRIMARY  (cost=1.46 rows=6)
+    -> Covering index range scan on t1 using PRIMARY  (cost=1.46 rows=6)
 
 select event_date,type,event_id from t1 WHERE event_date >= "1999-07-01" AND event_date < "1999-07-15" AND (type=100600 OR type=100100) ORDER BY event_date;
 event_date	type	event_id
@@ -701,6 +701,7 @@
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	NULL	range	a	a	11	NULL	2	100.00	Using index condition; Using MRR
 Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 Warning	1739	Cannot use ref access on index 'a' due to type or collation conversion on field 'a'
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where (`test`.`t1`.`a` = <cache>(cast('aaa' as char charset binary)))
 explain select * from t1 where a='aaa' collate latin1_bin;
@@ -2678,6 +2679,8 @@
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Using temporary; Using filesort
 1	SIMPLE	t2	NULL	index	b	b	259	NULL	5	20.00	Using where; Using index; Using join buffer (hash join)
 Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 Warning	1739	Cannot use ref access on index 'b' due to type or collation conversion on field 'b'
 Warning	1739	Cannot use range access on index 'b' due to type or collation conversion on field 'b'
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t2`.`b` AS `b` from `test`.`t1` join `test`.`t2` where (`test`.`t1`.`a` = cast(`test`.`t2`.`b` as datetime(6))) order by cast(`test`.`t1`.`a` as char charset binary),cast(`test`.`t2`.`b` as char charset binary)
@@ -2688,12 +2691,17 @@
 2001-01-01 00:00:00	2001-01-01 00:00:00
 2001-01-01 00:00:00	2001.01.01
 2001-01-01 11:22:33	2001-01-01 11:22:33
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 
 EXPLAIN SELECT * FROM t1, t2 WHERE b=a ORDER BY BINARY a, BINARY b;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Using temporary; Using filesort
 1	SIMPLE	t2	NULL	index	b	b	259	NULL	5	20.00	Using where; Using index; Using join buffer (hash join)
 Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 Warning	1739	Cannot use ref access on index 'b' due to type or collation conversion on field 'b'
 Warning	1739	Cannot use range access on index 'b' due to type or collation conversion on field 'b'
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t2`.`b` AS `b` from `test`.`t1` join `test`.`t2` where (cast(`test`.`t2`.`b` as datetime(6)) = `test`.`t1`.`a`) order by cast(`test`.`t1`.`a` as char charset binary),cast(`test`.`t2`.`b` as char charset binary)
@@ -2704,6 +2712,9 @@
 2001-01-01 00:00:00	2001-01-01 00:00:00
 2001-01-01 00:00:00	2001.01.01
 2001-01-01 11:22:33	2001-01-01 11:22:33
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 
 DROP TABLE t1,t2;
 #
@@ -3552,10 +3563,10 @@
 # Bug #21318711: WRONG RESULTS FOR TRUNCATED COLUMN AND AGGREGATION
 #
 CREATE TABLE t1 (
-col1 VARCHAR(5),
+col1 VARCHAR(5) CHARSET utf8mb4 COLLATE utf8mb4_bin,
 col2 INT NOT NULL,
 PRIMARY KEY (col1, col2)
-) ENGINE=InnoDB, CHARSET utf8mb4;
+);
 INSERT INTO t1 VALUES ('abcde', 10);
 EXPLAIN SELECT MAX(col2) FROM t1 WHERE col1 = 'abcdeaa';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -3891,4 +3902,109 @@
 f1	f2
 0	0
 DROP TABLE t;
+#
+# Bug#32523520: OPTIMIZER LOSES PART OF RANGE WHEN OR MULTIPLE
+#	       IDENTICAL RANGES IN RANGE PLAN
+#
+CREATE TABLE t1( a INTEGER, b INTEGER, c INTEGER,
+d VARCHAR(10), PRIMARY KEY (a, b, c));
+INSERT INTO t1 VALUES (1, 1, 1, 'a'), (2, 2, 2,'b'), (3, 3, 3, 'c');
+EXPLAIN SELECT * FROM t1 FORCE INDEX (PRIMARY) WHERE (a=1 AND b=1 AND c=1)
+OR (a=1 AND b=1 AND c=1) OR (a=1 AND b=2 AND c=2);
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	PRIMARY	PRIMARY	12	NULL	2	100.00	Using where
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c`,`test`.`t1`.`d` AS `d` from `test`.`t1` FORCE INDEX (PRIMARY) where (((`test`.`t1`.`c` = 1) and (`test`.`t1`.`b` = 1) and (`test`.`t1`.`a` = 1)) or ((`test`.`t1`.`c` = 1) and (`test`.`t1`.`b` = 1) and (`test`.`t1`.`a` = 1)) or ((`test`.`t1`.`c` = 2) and (`test`.`t1`.`b` = 2) and (`test`.`t1`.`a` = 1)))
+SELECT * FROM t1 FORCE INDEX (PRIMARY) WHERE (a=1 AND b=1 AND c=1)
+OR (a=1 AND b=1 AND c=1) OR (a=1 AND b=2 AND c=2);
+a	b	c	d
+1	1	1	a
+DROP TABLE t1;
+#
+# Bug #31870920: WRONG RESULT WHEN SELECT INT COLUMN WITH RANGE
+#
+CREATE TABLE t1(f1 INTEGER, KEY(f1));
+INSERT INTO t1 VALUES(0),(0),(0);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+EXPLAIN SELECT f1 FROM t1 WHERE f1 NOT IN (0.1, -0.1);
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	index	f1	f1	5	NULL	3	100.00	Using where; Using index
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1` from `test`.`t1` where (`test`.`t1`.`f1` not in (0.1,<cache>(-(0.1))))
+SELECT f1 FROM t1 WHERE f1 NOT IN (0.1, -0.1);
+f1
+0
+0
+0
+DROP TABLE t1;
+#
+# Bug#33067554: INDEX_MERGE: ASSERTION FAILURE:
+#               ROW0SEL.CC:5584:PREBUILT->CAN_PREFETCH_RECORDS() ||
+#               RECORD_BUFFER == NULLPTR
+#
+CREATE TABLE t (
+a INTEGER,
+b INTEGER,
+pk TEXT NOT NULL,
+PRIMARY KEY (pk(110)),
+KEY (a),
+KEY (b)
+);
+INSERT INTO t VALUES
+(51,16777216,''), (-128,0,' nsj  mizb'),
+(0,5900842,' qdblp vgc'), (0,-128,'c  z'),
+(-1,-125,'d'), (95,3345,'dtphyrp'),
+(97,14396343,'du'), (127,0,'fnwyz'),
+(-128,0,'fszpsqd'), (-128,32767,'g uevfc'),
+(-128,0,'hh  lhozu '), (0,0,'m tkr'),
+(0,246,'mgmtel'), (-1,2147483647,'n  hjh'),
+(127,0,'ssw'), (127,0,'t zl'), (0,-1,'uns');
+ANALYZE TABLE t;
+Table	Op	Msg_type	Msg_text
+test.t	analyze	status	OK
+SELECT b FROM t WHERE a = 0 AND b = 0;
+b
+0
+DROP TABLE t;
+# Bug#17769777 EXCESSIVE MEMORY CONSUMPTION WITH MANY AND / BETWEEN
+#              ITEMS
+# Bug#17413040 USING MANY WHERE CONDITIONS MAKES RANGE SCAN DISABLED
+CREATE TABLE t1 (
+a INT,
+b INT,
+KEY (a)
+)ENGINE=INNODB;
+INSERT INTO t1 VALUES (0, 0), (1, 1), (2, 2), (3, 3), (4, 4), (5, 5), (6, 6),
+(7, 7), (8, 8), (9, 9);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+SET RANGE_OPTIMIZER_MAX_MEM_SIZE= 100;
+EXPLAIN SELECT DISTINCT a FROM t1 WHERE (a, b) IN ((0, 0), (1, 1));
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	index	a	a	5	NULL	10	10.00	Using where
+Warnings:
+Warning	3170	Memory capacity of 100 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
+Note	1003	/* select#1 */ select distinct `test`.`t1`.`a` AS `a` from `test`.`t1` where ((`test`.`t1`.`a`,`test`.`t1`.`b`) in ((0,0),(1,1)))
+SET RANGE_OPTIMIZER_MAX_MEM_SIZE= DEFAULT;
+EXPLAIN SELECT DISTINCT a FROM t1 WHERE (a, b) IN ((0, 0), (1, 1));
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	a	a	5	NULL	2	20.00	Using where
+Warnings:
+Note	1003	/* select#1 */ select distinct `test`.`t1`.`a` AS `a` from `test`.`t1` where ((`test`.`t1`.`a`,`test`.`t1`.`b`) in ((0,0),(1,1)))
+DROP TABLE t1;
+# End of test for Bug#17769777 and Bug#17413040
+#
+# Bug#33282123: Const table optimization for aggregates goes wrong with
+#               NO PAD collations
+#
+CREATE TABLE t1 (col1 VARCHAR(5), col2 INTEGER, PRIMARY KEY (col1, col2));
+INSERT INTO t1 VALUES ('abcde', 10);
+# Used to return 10. The expected result is NULL.
+SELECT MAX(col2) FROM t1 WHERE col1 = 'abcde  ';
+MAX(col2)
+NULL
+DROP TABLE t1;
 set optimizer_switch=default;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/range_icp_mrr.result mysql-8.0-8.0.27/mysql-test/r/range_icp_mrr.result
--- mysql-8.0-8.0.26/mysql-test/r/range_icp_mrr.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/range_icp_mrr.result	2021-09-28 11:46:34.000000000 +0000
@@ -36,7 +36,7 @@
 explain format=tree select event_date,type,event_id from t1 WHERE event_date >= "1999-07-01" AND event_date < "1999-07-15" AND (type=100600 OR type=100100) ORDER BY event_date;
 EXPLAIN
 -> Filter: ((t1.event_date >= DATE'1999-07-01') and (t1.event_date < DATE'1999-07-15') and ((t1.`type` = 100600) or (t1.`type` = 100100)))  (cost=1.46 rows=1)
-    -> Index range scan on t1 using PRIMARY  (cost=1.46 rows=6)
+    -> Covering index range scan on t1 using PRIMARY  (cost=1.46 rows=6)
 
 select event_date,type,event_id from t1 WHERE event_date >= "1999-07-01" AND event_date < "1999-07-15" AND (type=100600 OR type=100100) ORDER BY event_date;
 event_date	type	event_id
@@ -701,6 +701,7 @@
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	NULL	range	a	a	11	NULL	2	100.00	Using index condition; Using MRR
 Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 Warning	1739	Cannot use ref access on index 'a' due to type or collation conversion on field 'a'
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where (`test`.`t1`.`a` = <cache>(cast('aaa' as char charset binary)))
 explain select * from t1 where a='aaa' collate latin1_bin;
@@ -2678,6 +2679,8 @@
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Using temporary; Using filesort
 1	SIMPLE	t2	NULL	index	b	b	259	NULL	5	20.00	Using where; Using index; Using join buffer (hash join)
 Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 Warning	1739	Cannot use ref access on index 'b' due to type or collation conversion on field 'b'
 Warning	1739	Cannot use range access on index 'b' due to type or collation conversion on field 'b'
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t2`.`b` AS `b` from `test`.`t1` join `test`.`t2` where (`test`.`t1`.`a` = cast(`test`.`t2`.`b` as datetime(6))) order by cast(`test`.`t1`.`a` as char charset binary),cast(`test`.`t2`.`b` as char charset binary)
@@ -2688,12 +2691,17 @@
 2001-01-01 00:00:00	2001-01-01 00:00:00
 2001-01-01 00:00:00	2001.01.01
 2001-01-01 11:22:33	2001-01-01 11:22:33
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 
 EXPLAIN SELECT * FROM t1, t2 WHERE b=a ORDER BY BINARY a, BINARY b;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Using temporary; Using filesort
 1	SIMPLE	t2	NULL	index	b	b	259	NULL	5	20.00	Using where; Using index; Using join buffer (hash join)
 Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 Warning	1739	Cannot use ref access on index 'b' due to type or collation conversion on field 'b'
 Warning	1739	Cannot use range access on index 'b' due to type or collation conversion on field 'b'
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t2`.`b` AS `b` from `test`.`t1` join `test`.`t2` where (cast(`test`.`t2`.`b` as datetime(6)) = `test`.`t1`.`a`) order by cast(`test`.`t1`.`a` as char charset binary),cast(`test`.`t2`.`b` as char charset binary)
@@ -2704,6 +2712,9 @@
 2001-01-01 00:00:00	2001-01-01 00:00:00
 2001-01-01 00:00:00	2001.01.01
 2001-01-01 11:22:33	2001-01-01 11:22:33
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 
 DROP TABLE t1,t2;
 #
@@ -3552,10 +3563,10 @@
 # Bug #21318711: WRONG RESULTS FOR TRUNCATED COLUMN AND AGGREGATION
 #
 CREATE TABLE t1 (
-col1 VARCHAR(5),
+col1 VARCHAR(5) CHARSET utf8mb4 COLLATE utf8mb4_bin,
 col2 INT NOT NULL,
 PRIMARY KEY (col1, col2)
-) ENGINE=InnoDB, CHARSET utf8mb4;
+);
 INSERT INTO t1 VALUES ('abcde', 10);
 EXPLAIN SELECT MAX(col2) FROM t1 WHERE col1 = 'abcdeaa';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -3891,4 +3902,109 @@
 f1	f2
 0	0
 DROP TABLE t;
+#
+# Bug#32523520: OPTIMIZER LOSES PART OF RANGE WHEN OR MULTIPLE
+#	       IDENTICAL RANGES IN RANGE PLAN
+#
+CREATE TABLE t1( a INTEGER, b INTEGER, c INTEGER,
+d VARCHAR(10), PRIMARY KEY (a, b, c));
+INSERT INTO t1 VALUES (1, 1, 1, 'a'), (2, 2, 2,'b'), (3, 3, 3, 'c');
+EXPLAIN SELECT * FROM t1 FORCE INDEX (PRIMARY) WHERE (a=1 AND b=1 AND c=1)
+OR (a=1 AND b=1 AND c=1) OR (a=1 AND b=2 AND c=2);
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	PRIMARY	PRIMARY	12	NULL	2	100.00	Using where
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c`,`test`.`t1`.`d` AS `d` from `test`.`t1` FORCE INDEX (PRIMARY) where (((`test`.`t1`.`c` = 1) and (`test`.`t1`.`b` = 1) and (`test`.`t1`.`a` = 1)) or ((`test`.`t1`.`c` = 1) and (`test`.`t1`.`b` = 1) and (`test`.`t1`.`a` = 1)) or ((`test`.`t1`.`c` = 2) and (`test`.`t1`.`b` = 2) and (`test`.`t1`.`a` = 1)))
+SELECT * FROM t1 FORCE INDEX (PRIMARY) WHERE (a=1 AND b=1 AND c=1)
+OR (a=1 AND b=1 AND c=1) OR (a=1 AND b=2 AND c=2);
+a	b	c	d
+1	1	1	a
+DROP TABLE t1;
+#
+# Bug #31870920: WRONG RESULT WHEN SELECT INT COLUMN WITH RANGE
+#
+CREATE TABLE t1(f1 INTEGER, KEY(f1));
+INSERT INTO t1 VALUES(0),(0),(0);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+EXPLAIN SELECT f1 FROM t1 WHERE f1 NOT IN (0.1, -0.1);
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	index	f1	f1	5	NULL	3	100.00	Using where; Using index
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1` from `test`.`t1` where (`test`.`t1`.`f1` not in (0.1,<cache>(-(0.1))))
+SELECT f1 FROM t1 WHERE f1 NOT IN (0.1, -0.1);
+f1
+0
+0
+0
+DROP TABLE t1;
+#
+# Bug#33067554: INDEX_MERGE: ASSERTION FAILURE:
+#               ROW0SEL.CC:5584:PREBUILT->CAN_PREFETCH_RECORDS() ||
+#               RECORD_BUFFER == NULLPTR
+#
+CREATE TABLE t (
+a INTEGER,
+b INTEGER,
+pk TEXT NOT NULL,
+PRIMARY KEY (pk(110)),
+KEY (a),
+KEY (b)
+);
+INSERT INTO t VALUES
+(51,16777216,''), (-128,0,' nsj  mizb'),
+(0,5900842,' qdblp vgc'), (0,-128,'c  z'),
+(-1,-125,'d'), (95,3345,'dtphyrp'),
+(97,14396343,'du'), (127,0,'fnwyz'),
+(-128,0,'fszpsqd'), (-128,32767,'g uevfc'),
+(-128,0,'hh  lhozu '), (0,0,'m tkr'),
+(0,246,'mgmtel'), (-1,2147483647,'n  hjh'),
+(127,0,'ssw'), (127,0,'t zl'), (0,-1,'uns');
+ANALYZE TABLE t;
+Table	Op	Msg_type	Msg_text
+test.t	analyze	status	OK
+SELECT b FROM t WHERE a = 0 AND b = 0;
+b
+0
+DROP TABLE t;
+# Bug#17769777 EXCESSIVE MEMORY CONSUMPTION WITH MANY AND / BETWEEN
+#              ITEMS
+# Bug#17413040 USING MANY WHERE CONDITIONS MAKES RANGE SCAN DISABLED
+CREATE TABLE t1 (
+a INT,
+b INT,
+KEY (a)
+)ENGINE=INNODB;
+INSERT INTO t1 VALUES (0, 0), (1, 1), (2, 2), (3, 3), (4, 4), (5, 5), (6, 6),
+(7, 7), (8, 8), (9, 9);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+SET RANGE_OPTIMIZER_MAX_MEM_SIZE= 100;
+EXPLAIN SELECT DISTINCT a FROM t1 WHERE (a, b) IN ((0, 0), (1, 1));
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	index	a	a	5	NULL	10	10.00	Using where
+Warnings:
+Warning	3170	Memory capacity of 100 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
+Note	1003	/* select#1 */ select distinct `test`.`t1`.`a` AS `a` from `test`.`t1` where ((`test`.`t1`.`a`,`test`.`t1`.`b`) in ((0,0),(1,1)))
+SET RANGE_OPTIMIZER_MAX_MEM_SIZE= DEFAULT;
+EXPLAIN SELECT DISTINCT a FROM t1 WHERE (a, b) IN ((0, 0), (1, 1));
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	a	a	5	NULL	2	20.00	Using where
+Warnings:
+Note	1003	/* select#1 */ select distinct `test`.`t1`.`a` AS `a` from `test`.`t1` where ((`test`.`t1`.`a`,`test`.`t1`.`b`) in ((0,0),(1,1)))
+DROP TABLE t1;
+# End of test for Bug#17769777 and Bug#17413040
+#
+# Bug#33282123: Const table optimization for aggregates goes wrong with
+#               NO PAD collations
+#
+CREATE TABLE t1 (col1 VARCHAR(5), col2 INTEGER, PRIMARY KEY (col1, col2));
+INSERT INTO t1 VALUES ('abcde', 10);
+# Used to return 10. The expected result is NULL.
+SELECT MAX(col2) FROM t1 WHERE col1 = 'abcde  ';
+MAX(col2)
+NULL
+DROP TABLE t1;
 set optimizer_switch=default;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/range_icp.result mysql-8.0-8.0.27/mysql-test/r/range_icp.result
--- mysql-8.0-8.0.26/mysql-test/r/range_icp.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/range_icp.result	2021-09-28 11:46:34.000000000 +0000
@@ -36,7 +36,7 @@
 explain format=tree select event_date,type,event_id from t1 WHERE event_date >= "1999-07-01" AND event_date < "1999-07-15" AND (type=100600 OR type=100100) ORDER BY event_date;
 EXPLAIN
 -> Filter: ((t1.event_date >= DATE'1999-07-01') and (t1.event_date < DATE'1999-07-15') and ((t1.`type` = 100600) or (t1.`type` = 100100)))  (cost=1.46 rows=1)
-    -> Index range scan on t1 using PRIMARY  (cost=1.46 rows=6)
+    -> Covering index range scan on t1 using PRIMARY  (cost=1.46 rows=6)
 
 select event_date,type,event_id from t1 WHERE event_date >= "1999-07-01" AND event_date < "1999-07-15" AND (type=100600 OR type=100100) ORDER BY event_date;
 event_date	type	event_id
@@ -701,6 +701,7 @@
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	NULL	range	a	a	11	NULL	2	100.00	Using index condition
 Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 Warning	1739	Cannot use ref access on index 'a' due to type or collation conversion on field 'a'
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where (`test`.`t1`.`a` = <cache>(cast('aaa' as char charset binary)))
 explain select * from t1 where a='aaa' collate latin1_bin;
@@ -2678,6 +2679,8 @@
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Using temporary; Using filesort
 1	SIMPLE	t2	NULL	index	b	b	259	NULL	5	20.00	Using where; Using index; Using join buffer (hash join)
 Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 Warning	1739	Cannot use ref access on index 'b' due to type or collation conversion on field 'b'
 Warning	1739	Cannot use range access on index 'b' due to type or collation conversion on field 'b'
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t2`.`b` AS `b` from `test`.`t1` join `test`.`t2` where (`test`.`t1`.`a` = cast(`test`.`t2`.`b` as datetime(6))) order by cast(`test`.`t1`.`a` as char charset binary),cast(`test`.`t2`.`b` as char charset binary)
@@ -2688,12 +2691,17 @@
 2001-01-01 00:00:00	2001-01-01 00:00:00
 2001-01-01 00:00:00	2001.01.01
 2001-01-01 11:22:33	2001-01-01 11:22:33
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 
 EXPLAIN SELECT * FROM t1, t2 WHERE b=a ORDER BY BINARY a, BINARY b;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Using temporary; Using filesort
 1	SIMPLE	t2	NULL	index	b	b	259	NULL	5	20.00	Using where; Using index; Using join buffer (hash join)
 Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 Warning	1739	Cannot use ref access on index 'b' due to type or collation conversion on field 'b'
 Warning	1739	Cannot use range access on index 'b' due to type or collation conversion on field 'b'
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t2`.`b` AS `b` from `test`.`t1` join `test`.`t2` where (cast(`test`.`t2`.`b` as datetime(6)) = `test`.`t1`.`a`) order by cast(`test`.`t1`.`a` as char charset binary),cast(`test`.`t2`.`b` as char charset binary)
@@ -2704,6 +2712,9 @@
 2001-01-01 00:00:00	2001-01-01 00:00:00
 2001-01-01 00:00:00	2001.01.01
 2001-01-01 11:22:33	2001-01-01 11:22:33
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 
 DROP TABLE t1,t2;
 #
@@ -3552,10 +3563,10 @@
 # Bug #21318711: WRONG RESULTS FOR TRUNCATED COLUMN AND AGGREGATION
 #
 CREATE TABLE t1 (
-col1 VARCHAR(5),
+col1 VARCHAR(5) CHARSET utf8mb4 COLLATE utf8mb4_bin,
 col2 INT NOT NULL,
 PRIMARY KEY (col1, col2)
-) ENGINE=InnoDB, CHARSET utf8mb4;
+);
 INSERT INTO t1 VALUES ('abcde', 10);
 EXPLAIN SELECT MAX(col2) FROM t1 WHERE col1 = 'abcdeaa';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -3891,4 +3902,109 @@
 f1	f2
 0	0
 DROP TABLE t;
+#
+# Bug#32523520: OPTIMIZER LOSES PART OF RANGE WHEN OR MULTIPLE
+#	       IDENTICAL RANGES IN RANGE PLAN
+#
+CREATE TABLE t1( a INTEGER, b INTEGER, c INTEGER,
+d VARCHAR(10), PRIMARY KEY (a, b, c));
+INSERT INTO t1 VALUES (1, 1, 1, 'a'), (2, 2, 2,'b'), (3, 3, 3, 'c');
+EXPLAIN SELECT * FROM t1 FORCE INDEX (PRIMARY) WHERE (a=1 AND b=1 AND c=1)
+OR (a=1 AND b=1 AND c=1) OR (a=1 AND b=2 AND c=2);
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	PRIMARY	PRIMARY	12	NULL	2	100.00	Using where
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c`,`test`.`t1`.`d` AS `d` from `test`.`t1` FORCE INDEX (PRIMARY) where (((`test`.`t1`.`c` = 1) and (`test`.`t1`.`b` = 1) and (`test`.`t1`.`a` = 1)) or ((`test`.`t1`.`c` = 1) and (`test`.`t1`.`b` = 1) and (`test`.`t1`.`a` = 1)) or ((`test`.`t1`.`c` = 2) and (`test`.`t1`.`b` = 2) and (`test`.`t1`.`a` = 1)))
+SELECT * FROM t1 FORCE INDEX (PRIMARY) WHERE (a=1 AND b=1 AND c=1)
+OR (a=1 AND b=1 AND c=1) OR (a=1 AND b=2 AND c=2);
+a	b	c	d
+1	1	1	a
+DROP TABLE t1;
+#
+# Bug #31870920: WRONG RESULT WHEN SELECT INT COLUMN WITH RANGE
+#
+CREATE TABLE t1(f1 INTEGER, KEY(f1));
+INSERT INTO t1 VALUES(0),(0),(0);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+EXPLAIN SELECT f1 FROM t1 WHERE f1 NOT IN (0.1, -0.1);
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	index	f1	f1	5	NULL	3	100.00	Using where; Using index
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1` from `test`.`t1` where (`test`.`t1`.`f1` not in (0.1,<cache>(-(0.1))))
+SELECT f1 FROM t1 WHERE f1 NOT IN (0.1, -0.1);
+f1
+0
+0
+0
+DROP TABLE t1;
+#
+# Bug#33067554: INDEX_MERGE: ASSERTION FAILURE:
+#               ROW0SEL.CC:5584:PREBUILT->CAN_PREFETCH_RECORDS() ||
+#               RECORD_BUFFER == NULLPTR
+#
+CREATE TABLE t (
+a INTEGER,
+b INTEGER,
+pk TEXT NOT NULL,
+PRIMARY KEY (pk(110)),
+KEY (a),
+KEY (b)
+);
+INSERT INTO t VALUES
+(51,16777216,''), (-128,0,' nsj  mizb'),
+(0,5900842,' qdblp vgc'), (0,-128,'c  z'),
+(-1,-125,'d'), (95,3345,'dtphyrp'),
+(97,14396343,'du'), (127,0,'fnwyz'),
+(-128,0,'fszpsqd'), (-128,32767,'g uevfc'),
+(-128,0,'hh  lhozu '), (0,0,'m tkr'),
+(0,246,'mgmtel'), (-1,2147483647,'n  hjh'),
+(127,0,'ssw'), (127,0,'t zl'), (0,-1,'uns');
+ANALYZE TABLE t;
+Table	Op	Msg_type	Msg_text
+test.t	analyze	status	OK
+SELECT b FROM t WHERE a = 0 AND b = 0;
+b
+0
+DROP TABLE t;
+# Bug#17769777 EXCESSIVE MEMORY CONSUMPTION WITH MANY AND / BETWEEN
+#              ITEMS
+# Bug#17413040 USING MANY WHERE CONDITIONS MAKES RANGE SCAN DISABLED
+CREATE TABLE t1 (
+a INT,
+b INT,
+KEY (a)
+)ENGINE=INNODB;
+INSERT INTO t1 VALUES (0, 0), (1, 1), (2, 2), (3, 3), (4, 4), (5, 5), (6, 6),
+(7, 7), (8, 8), (9, 9);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+SET RANGE_OPTIMIZER_MAX_MEM_SIZE= 100;
+EXPLAIN SELECT DISTINCT a FROM t1 WHERE (a, b) IN ((0, 0), (1, 1));
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	index	a	a	5	NULL	10	10.00	Using where
+Warnings:
+Warning	3170	Memory capacity of 100 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
+Note	1003	/* select#1 */ select distinct `test`.`t1`.`a` AS `a` from `test`.`t1` where ((`test`.`t1`.`a`,`test`.`t1`.`b`) in ((0,0),(1,1)))
+SET RANGE_OPTIMIZER_MAX_MEM_SIZE= DEFAULT;
+EXPLAIN SELECT DISTINCT a FROM t1 WHERE (a, b) IN ((0, 0), (1, 1));
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	a	a	5	NULL	2	20.00	Using where
+Warnings:
+Note	1003	/* select#1 */ select distinct `test`.`t1`.`a` AS `a` from `test`.`t1` where ((`test`.`t1`.`a`,`test`.`t1`.`b`) in ((0,0),(1,1)))
+DROP TABLE t1;
+# End of test for Bug#17769777 and Bug#17413040
+#
+# Bug#33282123: Const table optimization for aggregates goes wrong with
+#               NO PAD collations
+#
+CREATE TABLE t1 (col1 VARCHAR(5), col2 INTEGER, PRIMARY KEY (col1, col2));
+INSERT INTO t1 VALUES ('abcde', 10);
+# Used to return 10. The expected result is NULL.
+SELECT MAX(col2) FROM t1 WHERE col1 = 'abcde  ';
+MAX(col2)
+NULL
+DROP TABLE t1;
 set optimizer_switch=default;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/range_mrr_cost.result mysql-8.0-8.0.27/mysql-test/r/range_mrr_cost.result
--- mysql-8.0-8.0.26/mysql-test/r/range_mrr_cost.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/range_mrr_cost.result	2021-09-28 11:46:34.000000000 +0000
@@ -36,7 +36,7 @@
 explain format=tree select event_date,type,event_id from t1 WHERE event_date >= "1999-07-01" AND event_date < "1999-07-15" AND (type=100600 OR type=100100) ORDER BY event_date;
 EXPLAIN
 -> Filter: ((t1.event_date >= DATE'1999-07-01') and (t1.event_date < DATE'1999-07-15') and ((t1.`type` = 100600) or (t1.`type` = 100100)))  (cost=1.46 rows=1)
-    -> Index range scan on t1 using PRIMARY  (cost=1.46 rows=6)
+    -> Covering index range scan on t1 using PRIMARY  (cost=1.46 rows=6)
 
 select event_date,type,event_id from t1 WHERE event_date >= "1999-07-01" AND event_date < "1999-07-15" AND (type=100600 OR type=100100) ORDER BY event_date;
 event_date	type	event_id
@@ -701,6 +701,7 @@
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	NULL	range	a	a	11	NULL	2	100.00	Using where
 Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 Warning	1739	Cannot use ref access on index 'a' due to type or collation conversion on field 'a'
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where (`test`.`t1`.`a` = <cache>(cast('aaa' as char charset binary)))
 explain select * from t1 where a='aaa' collate latin1_bin;
@@ -2679,6 +2680,8 @@
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Using temporary; Using filesort
 1	SIMPLE	t2	NULL	index	b	b	259	NULL	5	20.00	Using where; Using index; Using join buffer (hash join)
 Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 Warning	1739	Cannot use ref access on index 'b' due to type or collation conversion on field 'b'
 Warning	1739	Cannot use range access on index 'b' due to type or collation conversion on field 'b'
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t2`.`b` AS `b` from `test`.`t1` join `test`.`t2` where (`test`.`t1`.`a` = cast(`test`.`t2`.`b` as datetime(6))) order by cast(`test`.`t1`.`a` as char charset binary),cast(`test`.`t2`.`b` as char charset binary)
@@ -2689,12 +2692,17 @@
 2001-01-01 00:00:00	2001-01-01 00:00:00
 2001-01-01 00:00:00	2001.01.01
 2001-01-01 11:22:33	2001-01-01 11:22:33
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 
 EXPLAIN SELECT * FROM t1, t2 WHERE b=a ORDER BY BINARY a, BINARY b;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Using temporary; Using filesort
 1	SIMPLE	t2	NULL	index	b	b	259	NULL	5	20.00	Using where; Using index; Using join buffer (hash join)
 Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 Warning	1739	Cannot use ref access on index 'b' due to type or collation conversion on field 'b'
 Warning	1739	Cannot use range access on index 'b' due to type or collation conversion on field 'b'
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t2`.`b` AS `b` from `test`.`t1` join `test`.`t2` where (cast(`test`.`t2`.`b` as datetime(6)) = `test`.`t1`.`a`) order by cast(`test`.`t1`.`a` as char charset binary),cast(`test`.`t2`.`b` as char charset binary)
@@ -2705,6 +2713,9 @@
 2001-01-01 00:00:00	2001-01-01 00:00:00
 2001-01-01 00:00:00	2001.01.01
 2001-01-01 11:22:33	2001-01-01 11:22:33
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 
 DROP TABLE t1,t2;
 #
@@ -3553,10 +3564,10 @@
 # Bug #21318711: WRONG RESULTS FOR TRUNCATED COLUMN AND AGGREGATION
 #
 CREATE TABLE t1 (
-col1 VARCHAR(5),
+col1 VARCHAR(5) CHARSET utf8mb4 COLLATE utf8mb4_bin,
 col2 INT NOT NULL,
 PRIMARY KEY (col1, col2)
-) ENGINE=InnoDB, CHARSET utf8mb4;
+);
 INSERT INTO t1 VALUES ('abcde', 10);
 EXPLAIN SELECT MAX(col2) FROM t1 WHERE col1 = 'abcdeaa';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -3892,4 +3903,109 @@
 f1	f2
 0	0
 DROP TABLE t;
+#
+# Bug#32523520: OPTIMIZER LOSES PART OF RANGE WHEN OR MULTIPLE
+#	       IDENTICAL RANGES IN RANGE PLAN
+#
+CREATE TABLE t1( a INTEGER, b INTEGER, c INTEGER,
+d VARCHAR(10), PRIMARY KEY (a, b, c));
+INSERT INTO t1 VALUES (1, 1, 1, 'a'), (2, 2, 2,'b'), (3, 3, 3, 'c');
+EXPLAIN SELECT * FROM t1 FORCE INDEX (PRIMARY) WHERE (a=1 AND b=1 AND c=1)
+OR (a=1 AND b=1 AND c=1) OR (a=1 AND b=2 AND c=2);
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	PRIMARY	PRIMARY	12	NULL	2	100.00	Using where
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c`,`test`.`t1`.`d` AS `d` from `test`.`t1` FORCE INDEX (PRIMARY) where (((`test`.`t1`.`c` = 1) and (`test`.`t1`.`b` = 1) and (`test`.`t1`.`a` = 1)) or ((`test`.`t1`.`c` = 1) and (`test`.`t1`.`b` = 1) and (`test`.`t1`.`a` = 1)) or ((`test`.`t1`.`c` = 2) and (`test`.`t1`.`b` = 2) and (`test`.`t1`.`a` = 1)))
+SELECT * FROM t1 FORCE INDEX (PRIMARY) WHERE (a=1 AND b=1 AND c=1)
+OR (a=1 AND b=1 AND c=1) OR (a=1 AND b=2 AND c=2);
+a	b	c	d
+1	1	1	a
+DROP TABLE t1;
+#
+# Bug #31870920: WRONG RESULT WHEN SELECT INT COLUMN WITH RANGE
+#
+CREATE TABLE t1(f1 INTEGER, KEY(f1));
+INSERT INTO t1 VALUES(0),(0),(0);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+EXPLAIN SELECT f1 FROM t1 WHERE f1 NOT IN (0.1, -0.1);
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	index	f1	f1	5	NULL	3	100.00	Using where; Using index
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1` from `test`.`t1` where (`test`.`t1`.`f1` not in (0.1,<cache>(-(0.1))))
+SELECT f1 FROM t1 WHERE f1 NOT IN (0.1, -0.1);
+f1
+0
+0
+0
+DROP TABLE t1;
+#
+# Bug#33067554: INDEX_MERGE: ASSERTION FAILURE:
+#               ROW0SEL.CC:5584:PREBUILT->CAN_PREFETCH_RECORDS() ||
+#               RECORD_BUFFER == NULLPTR
+#
+CREATE TABLE t (
+a INTEGER,
+b INTEGER,
+pk TEXT NOT NULL,
+PRIMARY KEY (pk(110)),
+KEY (a),
+KEY (b)
+);
+INSERT INTO t VALUES
+(51,16777216,''), (-128,0,' nsj  mizb'),
+(0,5900842,' qdblp vgc'), (0,-128,'c  z'),
+(-1,-125,'d'), (95,3345,'dtphyrp'),
+(97,14396343,'du'), (127,0,'fnwyz'),
+(-128,0,'fszpsqd'), (-128,32767,'g uevfc'),
+(-128,0,'hh  lhozu '), (0,0,'m tkr'),
+(0,246,'mgmtel'), (-1,2147483647,'n  hjh'),
+(127,0,'ssw'), (127,0,'t zl'), (0,-1,'uns');
+ANALYZE TABLE t;
+Table	Op	Msg_type	Msg_text
+test.t	analyze	status	OK
+SELECT b FROM t WHERE a = 0 AND b = 0;
+b
+0
+DROP TABLE t;
+# Bug#17769777 EXCESSIVE MEMORY CONSUMPTION WITH MANY AND / BETWEEN
+#              ITEMS
+# Bug#17413040 USING MANY WHERE CONDITIONS MAKES RANGE SCAN DISABLED
+CREATE TABLE t1 (
+a INT,
+b INT,
+KEY (a)
+)ENGINE=INNODB;
+INSERT INTO t1 VALUES (0, 0), (1, 1), (2, 2), (3, 3), (4, 4), (5, 5), (6, 6),
+(7, 7), (8, 8), (9, 9);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+SET RANGE_OPTIMIZER_MAX_MEM_SIZE= 100;
+EXPLAIN SELECT DISTINCT a FROM t1 WHERE (a, b) IN ((0, 0), (1, 1));
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	index	a	a	5	NULL	10	10.00	Using where
+Warnings:
+Warning	3170	Memory capacity of 100 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
+Note	1003	/* select#1 */ select distinct `test`.`t1`.`a` AS `a` from `test`.`t1` where ((`test`.`t1`.`a`,`test`.`t1`.`b`) in ((0,0),(1,1)))
+SET RANGE_OPTIMIZER_MAX_MEM_SIZE= DEFAULT;
+EXPLAIN SELECT DISTINCT a FROM t1 WHERE (a, b) IN ((0, 0), (1, 1));
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	a	a	5	NULL	2	20.00	Using where
+Warnings:
+Note	1003	/* select#1 */ select distinct `test`.`t1`.`a` AS `a` from `test`.`t1` where ((`test`.`t1`.`a`,`test`.`t1`.`b`) in ((0,0),(1,1)))
+DROP TABLE t1;
+# End of test for Bug#17769777 and Bug#17413040
+#
+# Bug#33282123: Const table optimization for aggregates goes wrong with
+#               NO PAD collations
+#
+CREATE TABLE t1 (col1 VARCHAR(5), col2 INTEGER, PRIMARY KEY (col1, col2));
+INSERT INTO t1 VALUES ('abcde', 10);
+# Used to return 10. The expected result is NULL.
+SELECT MAX(col2) FROM t1 WHERE col1 = 'abcde  ';
+MAX(col2)
+NULL
+DROP TABLE t1;
 set optimizer_switch=default;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/range_mrr.result mysql-8.0-8.0.27/mysql-test/r/range_mrr.result
--- mysql-8.0-8.0.26/mysql-test/r/range_mrr.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/range_mrr.result	2021-09-28 11:46:34.000000000 +0000
@@ -36,7 +36,7 @@
 explain format=tree select event_date,type,event_id from t1 WHERE event_date >= "1999-07-01" AND event_date < "1999-07-15" AND (type=100600 OR type=100100) ORDER BY event_date;
 EXPLAIN
 -> Filter: ((t1.event_date >= DATE'1999-07-01') and (t1.event_date < DATE'1999-07-15') and ((t1.`type` = 100600) or (t1.`type` = 100100)))  (cost=1.46 rows=1)
-    -> Index range scan on t1 using PRIMARY  (cost=1.46 rows=6)
+    -> Covering index range scan on t1 using PRIMARY  (cost=1.46 rows=6)
 
 select event_date,type,event_id from t1 WHERE event_date >= "1999-07-01" AND event_date < "1999-07-15" AND (type=100600 OR type=100100) ORDER BY event_date;
 event_date	type	event_id
@@ -701,6 +701,7 @@
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	NULL	range	a	a	11	NULL	2	100.00	Using where; Using MRR
 Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 Warning	1739	Cannot use ref access on index 'a' due to type or collation conversion on field 'a'
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where (`test`.`t1`.`a` = <cache>(cast('aaa' as char charset binary)))
 explain select * from t1 where a='aaa' collate latin1_bin;
@@ -2679,6 +2680,8 @@
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Using temporary; Using filesort
 1	SIMPLE	t2	NULL	index	b	b	259	NULL	5	20.00	Using where; Using index; Using join buffer (hash join)
 Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 Warning	1739	Cannot use ref access on index 'b' due to type or collation conversion on field 'b'
 Warning	1739	Cannot use range access on index 'b' due to type or collation conversion on field 'b'
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t2`.`b` AS `b` from `test`.`t1` join `test`.`t2` where (`test`.`t1`.`a` = cast(`test`.`t2`.`b` as datetime(6))) order by cast(`test`.`t1`.`a` as char charset binary),cast(`test`.`t2`.`b` as char charset binary)
@@ -2689,12 +2692,17 @@
 2001-01-01 00:00:00	2001-01-01 00:00:00
 2001-01-01 00:00:00	2001.01.01
 2001-01-01 11:22:33	2001-01-01 11:22:33
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 
 EXPLAIN SELECT * FROM t1, t2 WHERE b=a ORDER BY BINARY a, BINARY b;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Using temporary; Using filesort
 1	SIMPLE	t2	NULL	index	b	b	259	NULL	5	20.00	Using where; Using index; Using join buffer (hash join)
 Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 Warning	1739	Cannot use ref access on index 'b' due to type or collation conversion on field 'b'
 Warning	1739	Cannot use range access on index 'b' due to type or collation conversion on field 'b'
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t2`.`b` AS `b` from `test`.`t1` join `test`.`t2` where (cast(`test`.`t2`.`b` as datetime(6)) = `test`.`t1`.`a`) order by cast(`test`.`t1`.`a` as char charset binary),cast(`test`.`t2`.`b` as char charset binary)
@@ -2705,6 +2713,9 @@
 2001-01-01 00:00:00	2001-01-01 00:00:00
 2001-01-01 00:00:00	2001.01.01
 2001-01-01 11:22:33	2001-01-01 11:22:33
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 
 DROP TABLE t1,t2;
 #
@@ -3553,10 +3564,10 @@
 # Bug #21318711: WRONG RESULTS FOR TRUNCATED COLUMN AND AGGREGATION
 #
 CREATE TABLE t1 (
-col1 VARCHAR(5),
+col1 VARCHAR(5) CHARSET utf8mb4 COLLATE utf8mb4_bin,
 col2 INT NOT NULL,
 PRIMARY KEY (col1, col2)
-) ENGINE=InnoDB, CHARSET utf8mb4;
+);
 INSERT INTO t1 VALUES ('abcde', 10);
 EXPLAIN SELECT MAX(col2) FROM t1 WHERE col1 = 'abcdeaa';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -3892,4 +3903,109 @@
 f1	f2
 0	0
 DROP TABLE t;
+#
+# Bug#32523520: OPTIMIZER LOSES PART OF RANGE WHEN OR MULTIPLE
+#	       IDENTICAL RANGES IN RANGE PLAN
+#
+CREATE TABLE t1( a INTEGER, b INTEGER, c INTEGER,
+d VARCHAR(10), PRIMARY KEY (a, b, c));
+INSERT INTO t1 VALUES (1, 1, 1, 'a'), (2, 2, 2,'b'), (3, 3, 3, 'c');
+EXPLAIN SELECT * FROM t1 FORCE INDEX (PRIMARY) WHERE (a=1 AND b=1 AND c=1)
+OR (a=1 AND b=1 AND c=1) OR (a=1 AND b=2 AND c=2);
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	PRIMARY	PRIMARY	12	NULL	2	100.00	Using where
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c`,`test`.`t1`.`d` AS `d` from `test`.`t1` FORCE INDEX (PRIMARY) where (((`test`.`t1`.`c` = 1) and (`test`.`t1`.`b` = 1) and (`test`.`t1`.`a` = 1)) or ((`test`.`t1`.`c` = 1) and (`test`.`t1`.`b` = 1) and (`test`.`t1`.`a` = 1)) or ((`test`.`t1`.`c` = 2) and (`test`.`t1`.`b` = 2) and (`test`.`t1`.`a` = 1)))
+SELECT * FROM t1 FORCE INDEX (PRIMARY) WHERE (a=1 AND b=1 AND c=1)
+OR (a=1 AND b=1 AND c=1) OR (a=1 AND b=2 AND c=2);
+a	b	c	d
+1	1	1	a
+DROP TABLE t1;
+#
+# Bug #31870920: WRONG RESULT WHEN SELECT INT COLUMN WITH RANGE
+#
+CREATE TABLE t1(f1 INTEGER, KEY(f1));
+INSERT INTO t1 VALUES(0),(0),(0);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+EXPLAIN SELECT f1 FROM t1 WHERE f1 NOT IN (0.1, -0.1);
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	index	f1	f1	5	NULL	3	100.00	Using where; Using index
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1` from `test`.`t1` where (`test`.`t1`.`f1` not in (0.1,<cache>(-(0.1))))
+SELECT f1 FROM t1 WHERE f1 NOT IN (0.1, -0.1);
+f1
+0
+0
+0
+DROP TABLE t1;
+#
+# Bug#33067554: INDEX_MERGE: ASSERTION FAILURE:
+#               ROW0SEL.CC:5584:PREBUILT->CAN_PREFETCH_RECORDS() ||
+#               RECORD_BUFFER == NULLPTR
+#
+CREATE TABLE t (
+a INTEGER,
+b INTEGER,
+pk TEXT NOT NULL,
+PRIMARY KEY (pk(110)),
+KEY (a),
+KEY (b)
+);
+INSERT INTO t VALUES
+(51,16777216,''), (-128,0,' nsj  mizb'),
+(0,5900842,' qdblp vgc'), (0,-128,'c  z'),
+(-1,-125,'d'), (95,3345,'dtphyrp'),
+(97,14396343,'du'), (127,0,'fnwyz'),
+(-128,0,'fszpsqd'), (-128,32767,'g uevfc'),
+(-128,0,'hh  lhozu '), (0,0,'m tkr'),
+(0,246,'mgmtel'), (-1,2147483647,'n  hjh'),
+(127,0,'ssw'), (127,0,'t zl'), (0,-1,'uns');
+ANALYZE TABLE t;
+Table	Op	Msg_type	Msg_text
+test.t	analyze	status	OK
+SELECT b FROM t WHERE a = 0 AND b = 0;
+b
+0
+DROP TABLE t;
+# Bug#17769777 EXCESSIVE MEMORY CONSUMPTION WITH MANY AND / BETWEEN
+#              ITEMS
+# Bug#17413040 USING MANY WHERE CONDITIONS MAKES RANGE SCAN DISABLED
+CREATE TABLE t1 (
+a INT,
+b INT,
+KEY (a)
+)ENGINE=INNODB;
+INSERT INTO t1 VALUES (0, 0), (1, 1), (2, 2), (3, 3), (4, 4), (5, 5), (6, 6),
+(7, 7), (8, 8), (9, 9);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+SET RANGE_OPTIMIZER_MAX_MEM_SIZE= 100;
+EXPLAIN SELECT DISTINCT a FROM t1 WHERE (a, b) IN ((0, 0), (1, 1));
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	index	a	a	5	NULL	10	10.00	Using where
+Warnings:
+Warning	3170	Memory capacity of 100 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
+Note	1003	/* select#1 */ select distinct `test`.`t1`.`a` AS `a` from `test`.`t1` where ((`test`.`t1`.`a`,`test`.`t1`.`b`) in ((0,0),(1,1)))
+SET RANGE_OPTIMIZER_MAX_MEM_SIZE= DEFAULT;
+EXPLAIN SELECT DISTINCT a FROM t1 WHERE (a, b) IN ((0, 0), (1, 1));
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	a	a	5	NULL	2	20.00	Using where
+Warnings:
+Note	1003	/* select#1 */ select distinct `test`.`t1`.`a` AS `a` from `test`.`t1` where ((`test`.`t1`.`a`,`test`.`t1`.`b`) in ((0,0),(1,1)))
+DROP TABLE t1;
+# End of test for Bug#17769777 and Bug#17413040
+#
+# Bug#33282123: Const table optimization for aggregates goes wrong with
+#               NO PAD collations
+#
+CREATE TABLE t1 (col1 VARCHAR(5), col2 INTEGER, PRIMARY KEY (col1, col2));
+INSERT INTO t1 VALUES ('abcde', 10);
+# Used to return 10. The expected result is NULL.
+SELECT MAX(col2) FROM t1 WHERE col1 = 'abcde  ';
+MAX(col2)
+NULL
+DROP TABLE t1;
 set optimizer_switch=default;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/range_none.result mysql-8.0-8.0.27/mysql-test/r/range_none.result
--- mysql-8.0-8.0.26/mysql-test/r/range_none.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/range_none.result	2021-09-28 11:46:34.000000000 +0000
@@ -35,7 +35,7 @@
 explain format=tree select event_date,type,event_id from t1 WHERE event_date >= "1999-07-01" AND event_date < "1999-07-15" AND (type=100600 OR type=100100) ORDER BY event_date;
 EXPLAIN
 -> Filter: ((t1.event_date >= DATE'1999-07-01') and (t1.event_date < DATE'1999-07-15') and ((t1.`type` = 100600) or (t1.`type` = 100100)))  (cost=1.46 rows=1)
-    -> Index range scan on t1 using PRIMARY  (cost=1.46 rows=6)
+    -> Covering index range scan on t1 using PRIMARY  (cost=1.46 rows=6)
 
 select event_date,type,event_id from t1 WHERE event_date >= "1999-07-01" AND event_date < "1999-07-15" AND (type=100600 OR type=100100) ORDER BY event_date;
 event_date	type	event_id
@@ -700,6 +700,7 @@
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	NULL	range	a	a	11	NULL	2	100.00	Using where
 Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 Warning	1739	Cannot use ref access on index 'a' due to type or collation conversion on field 'a'
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where (`test`.`t1`.`a` = <cache>(cast('aaa' as char charset binary)))
 explain select * from t1 where a='aaa' collate latin1_bin;
@@ -2678,6 +2679,8 @@
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Using temporary; Using filesort
 1	SIMPLE	t2	NULL	index	b	b	259	NULL	5	20.00	Using where; Using index; Using join buffer (hash join)
 Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 Warning	1739	Cannot use ref access on index 'b' due to type or collation conversion on field 'b'
 Warning	1739	Cannot use range access on index 'b' due to type or collation conversion on field 'b'
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t2`.`b` AS `b` from `test`.`t1` join `test`.`t2` where (`test`.`t1`.`a` = cast(`test`.`t2`.`b` as datetime(6))) order by cast(`test`.`t1`.`a` as char charset binary),cast(`test`.`t2`.`b` as char charset binary)
@@ -2688,12 +2691,17 @@
 2001-01-01 00:00:00	2001-01-01 00:00:00
 2001-01-01 00:00:00	2001.01.01
 2001-01-01 11:22:33	2001-01-01 11:22:33
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 
 EXPLAIN SELECT * FROM t1, t2 WHERE b=a ORDER BY BINARY a, BINARY b;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Using temporary; Using filesort
 1	SIMPLE	t2	NULL	index	b	b	259	NULL	5	20.00	Using where; Using index; Using join buffer (hash join)
 Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 Warning	1739	Cannot use ref access on index 'b' due to type or collation conversion on field 'b'
 Warning	1739	Cannot use range access on index 'b' due to type or collation conversion on field 'b'
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t2`.`b` AS `b` from `test`.`t1` join `test`.`t2` where (cast(`test`.`t2`.`b` as datetime(6)) = `test`.`t1`.`a`) order by cast(`test`.`t1`.`a` as char charset binary),cast(`test`.`t2`.`b` as char charset binary)
@@ -2704,6 +2712,9 @@
 2001-01-01 00:00:00	2001-01-01 00:00:00
 2001-01-01 00:00:00	2001.01.01
 2001-01-01 11:22:33	2001-01-01 11:22:33
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 
 DROP TABLE t1,t2;
 #
@@ -3552,10 +3563,10 @@
 # Bug #21318711: WRONG RESULTS FOR TRUNCATED COLUMN AND AGGREGATION
 #
 CREATE TABLE t1 (
-col1 VARCHAR(5),
+col1 VARCHAR(5) CHARSET utf8mb4 COLLATE utf8mb4_bin,
 col2 INT NOT NULL,
 PRIMARY KEY (col1, col2)
-) ENGINE=InnoDB, CHARSET utf8mb4;
+);
 INSERT INTO t1 VALUES ('abcde', 10);
 EXPLAIN SELECT MAX(col2) FROM t1 WHERE col1 = 'abcdeaa';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -3891,4 +3902,109 @@
 f1	f2
 0	0
 DROP TABLE t;
+#
+# Bug#32523520: OPTIMIZER LOSES PART OF RANGE WHEN OR MULTIPLE
+#	       IDENTICAL RANGES IN RANGE PLAN
+#
+CREATE TABLE t1( a INTEGER, b INTEGER, c INTEGER,
+d VARCHAR(10), PRIMARY KEY (a, b, c));
+INSERT INTO t1 VALUES (1, 1, 1, 'a'), (2, 2, 2,'b'), (3, 3, 3, 'c');
+EXPLAIN SELECT * FROM t1 FORCE INDEX (PRIMARY) WHERE (a=1 AND b=1 AND c=1)
+OR (a=1 AND b=1 AND c=1) OR (a=1 AND b=2 AND c=2);
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	PRIMARY	PRIMARY	12	NULL	2	100.00	Using where
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c`,`test`.`t1`.`d` AS `d` from `test`.`t1` FORCE INDEX (PRIMARY) where (((`test`.`t1`.`c` = 1) and (`test`.`t1`.`b` = 1) and (`test`.`t1`.`a` = 1)) or ((`test`.`t1`.`c` = 1) and (`test`.`t1`.`b` = 1) and (`test`.`t1`.`a` = 1)) or ((`test`.`t1`.`c` = 2) and (`test`.`t1`.`b` = 2) and (`test`.`t1`.`a` = 1)))
+SELECT * FROM t1 FORCE INDEX (PRIMARY) WHERE (a=1 AND b=1 AND c=1)
+OR (a=1 AND b=1 AND c=1) OR (a=1 AND b=2 AND c=2);
+a	b	c	d
+1	1	1	a
+DROP TABLE t1;
+#
+# Bug #31870920: WRONG RESULT WHEN SELECT INT COLUMN WITH RANGE
+#
+CREATE TABLE t1(f1 INTEGER, KEY(f1));
+INSERT INTO t1 VALUES(0),(0),(0);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+EXPLAIN SELECT f1 FROM t1 WHERE f1 NOT IN (0.1, -0.1);
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	index	f1	f1	5	NULL	3	100.00	Using where; Using index
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1` from `test`.`t1` where (`test`.`t1`.`f1` not in (0.1,<cache>(-(0.1))))
+SELECT f1 FROM t1 WHERE f1 NOT IN (0.1, -0.1);
+f1
+0
+0
+0
+DROP TABLE t1;
+#
+# Bug#33067554: INDEX_MERGE: ASSERTION FAILURE:
+#               ROW0SEL.CC:5584:PREBUILT->CAN_PREFETCH_RECORDS() ||
+#               RECORD_BUFFER == NULLPTR
+#
+CREATE TABLE t (
+a INTEGER,
+b INTEGER,
+pk TEXT NOT NULL,
+PRIMARY KEY (pk(110)),
+KEY (a),
+KEY (b)
+);
+INSERT INTO t VALUES
+(51,16777216,''), (-128,0,' nsj  mizb'),
+(0,5900842,' qdblp vgc'), (0,-128,'c  z'),
+(-1,-125,'d'), (95,3345,'dtphyrp'),
+(97,14396343,'du'), (127,0,'fnwyz'),
+(-128,0,'fszpsqd'), (-128,32767,'g uevfc'),
+(-128,0,'hh  lhozu '), (0,0,'m tkr'),
+(0,246,'mgmtel'), (-1,2147483647,'n  hjh'),
+(127,0,'ssw'), (127,0,'t zl'), (0,-1,'uns');
+ANALYZE TABLE t;
+Table	Op	Msg_type	Msg_text
+test.t	analyze	status	OK
+SELECT b FROM t WHERE a = 0 AND b = 0;
+b
+0
+DROP TABLE t;
+# Bug#17769777 EXCESSIVE MEMORY CONSUMPTION WITH MANY AND / BETWEEN
+#              ITEMS
+# Bug#17413040 USING MANY WHERE CONDITIONS MAKES RANGE SCAN DISABLED
+CREATE TABLE t1 (
+a INT,
+b INT,
+KEY (a)
+)ENGINE=INNODB;
+INSERT INTO t1 VALUES (0, 0), (1, 1), (2, 2), (3, 3), (4, 4), (5, 5), (6, 6),
+(7, 7), (8, 8), (9, 9);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+SET RANGE_OPTIMIZER_MAX_MEM_SIZE= 100;
+EXPLAIN SELECT DISTINCT a FROM t1 WHERE (a, b) IN ((0, 0), (1, 1));
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	index	a	a	5	NULL	10	10.00	Using where
+Warnings:
+Warning	3170	Memory capacity of 100 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
+Note	1003	/* select#1 */ select distinct `test`.`t1`.`a` AS `a` from `test`.`t1` where ((`test`.`t1`.`a`,`test`.`t1`.`b`) in ((0,0),(1,1)))
+SET RANGE_OPTIMIZER_MAX_MEM_SIZE= DEFAULT;
+EXPLAIN SELECT DISTINCT a FROM t1 WHERE (a, b) IN ((0, 0), (1, 1));
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	a	a	5	NULL	2	20.00	Using where
+Warnings:
+Note	1003	/* select#1 */ select distinct `test`.`t1`.`a` AS `a` from `test`.`t1` where ((`test`.`t1`.`a`,`test`.`t1`.`b`) in ((0,0),(1,1)))
+DROP TABLE t1;
+# End of test for Bug#17769777 and Bug#17413040
+#
+# Bug#33282123: Const table optimization for aggregates goes wrong with
+#               NO PAD collations
+#
+CREATE TABLE t1 (col1 VARCHAR(5), col2 INTEGER, PRIMARY KEY (col1, col2));
+INSERT INTO t1 VALUES ('abcde', 10);
+# Used to return 10. The expected result is NULL.
+SELECT MAX(col2) FROM t1 WHERE col1 = 'abcde  ';
+MAX(col2)
+NULL
+DROP TABLE t1;
 set optimizer_switch=default;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/range_with_memory_limit.result mysql-8.0-8.0.27/mysql-test/r/range_with_memory_limit.result
--- mysql-8.0-8.0.26/mysql-test/r/range_with_memory_limit.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/range_with_memory_limit.result	1970-01-01 00:00:00.000000000 +0000
@@ -1,4480 +0,0 @@
-# Bug#17769777 EXCESSIVE MEMORY CONSUMPTION WITH MANY AND / BETWEEN
-#              ITEMS
-# Bug#17413040 USING MANY WHERE CONDITIONS MAKES RANGE SCAN DISABLED
-CREATE TABLE t1 (
-a INT,
-b INT,
-KEY (a)
-)ENGINE=INNODB;
-INSERT INTO t1 VALUES (0, 0), (1, 1), (2, 2), (3, 3), (4, 4), (5, 5), (6, 6),
-(7, 7), (8, 8), (9, 9);
-ANALYZE TABLE t1;
-Table	Op	Msg_type	Msg_text
-test.t1	analyze	status	OK
-SET RANGE_OPTIMIZER_MAX_MEM_SIZE= 100;
-EXPLAIN SELECT DISTINCT a FROM t1 WHERE (a, b) IN ((0, 0), (1, 1));
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	a	a	5	NULL	10	10.00	Using where
-Warnings:
-Warning	3170	Memory capacity of 100 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select distinct `test`.`t1`.`a` AS `a` from `test`.`t1` where ((`test`.`t1`.`a`,`test`.`t1`.`b`) in ((0,0),(1,1)))
-SET RANGE_OPTIMIZER_MAX_MEM_SIZE= DEFAULT;
-EXPLAIN SELECT DISTINCT a FROM t1 WHERE (a, b) IN ((0, 0), (1, 1));
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	range	a	a	5	NULL	2	20.00	Using where
-Warnings:
-Note	1003	/* select#1 */ select distinct `test`.`t1`.`a` AS `a` from `test`.`t1` where ((`test`.`t1`.`a`,`test`.`t1`.`b`) in ((0,0),(1,1)))
-DROP TABLE t1;
-SET RANGE_OPTIMIZER_MAX_MEM_SIZE= 10;
-drop table if exists t1, t2, t3;
-SET sql_mode = 'NO_ENGINE_SUBSTITUTION';
-CREATE TABLE t1 (
-event_date date DEFAULT '0000-00-00' NOT NULL,
-type int(11) DEFAULT '0' NOT NULL,
-event_id int(11) DEFAULT '0' NOT NULL,
-PRIMARY KEY (event_date,type,event_id)
-);
-Warnings:
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-INSERT INTO t1 VALUES ('1999-07-10',100100,24), ('1999-07-11',100100,25),
-('1999-07-13',100600,0), ('1999-07-13',100600,4), ('1999-07-13',100600,26),
-('1999-07-14',100600,10), ('1999-07-15',100600,16), ('1999-07-15',100800,45),
-('1999-07-15',101000,47), ('1999-07-16',100800,46), ('1999-07-20',100600,5),
-('1999-07-20',100600,27), ('1999-07-21',100600,11), ('1999-07-22',100600,17),
-('1999-07-23',100100,39), ('1999-07-24',100100,39), ('1999-07-24',100500,40),
-('1999-07-25',100100,39), ('1999-07-27',100600,1), ('1999-07-27',100600,6),
-('1999-07-27',100600,28), ('1999-07-28',100600,12), ('1999-07-29',100500,41),
-('1999-07-29',100600,18), ('1999-07-30',100500,41), ('1999-07-31',100500,41),
-('1999-08-01',100700,34), ('1999-08-03',100600,7), ('1999-08-03',100600,29),
-('1999-08-04',100600,13), ('1999-08-05',100500,42), ('1999-08-05',100600,19),
-('1999-08-06',100500,42), ('1999-08-07',100500,42), ('1999-08-08',100500,42),
-('1999-08-10',100600,2), ('1999-08-10',100600,9), ('1999-08-10',100600,30),
-('1999-08-11',100600,14), ('1999-08-12',100600,20), ('1999-08-17',100500,8),
-('1999-08-17',100600,31), ('1999-08-18',100600,15), ('1999-08-19',100600,22),
-('1999-08-24',100600,3), ('1999-08-24',100600,32), ('1999-08-27',100500,43),
-('1999-08-31',100600,33), ('1999-09-17',100100,37), ('1999-09-18',100100,37),
-('1999-09-19',100100,37), ('2000-12-18',100700,38);
-explain select event_date,type,event_id from t1 WHERE event_date >= "1999-07-01" AND event_date < "1999-07-15" AND (type=100600 OR type=100100) ORDER BY event_date;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	PRIMARY	PRIMARY	11	NULL	52	2.11	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`event_date` AS `event_date`,`test`.`t1`.`type` AS `type`,`test`.`t1`.`event_id` AS `event_id` from `test`.`t1` where ((`test`.`t1`.`event_date` >= DATE'1999-07-01') and (`test`.`t1`.`event_date` < DATE'1999-07-15') and ((`test`.`t1`.`type` = 100600) or (`test`.`t1`.`type` = 100100))) order by `test`.`t1`.`event_date`
-explain format=tree select event_date,type,event_id from t1 WHERE event_date >= "1999-07-01" AND event_date < "1999-07-15" AND (type=100600 OR type=100100) ORDER BY event_date;
-EXPLAIN
--> Filter: ((t1.event_date >= DATE'1999-07-01') and (t1.event_date < DATE'1999-07-15') and ((t1.`type` = 100600) or (t1.`type` = 100100)))  (cost=5.45 rows=1)
-    -> Index scan on t1 using PRIMARY  (cost=5.45 rows=52)
-
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-select event_date,type,event_id from t1 WHERE event_date >= "1999-07-01" AND event_date < "1999-07-15" AND (type=100600 OR type=100100) ORDER BY event_date;
-event_date	type	event_id
-1999-07-10	100100	24
-1999-07-11	100100	25
-1999-07-13	100600	0
-1999-07-13	100600	4
-1999-07-13	100600	26
-1999-07-14	100600	10
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-explain select event_date,type,event_id from t1 WHERE type = 100601 and event_date >= "1999-07-01" AND event_date < "1999-07-15" AND (type=100600 OR type=100100) ORDER BY event_date;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE
-Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`event_date` AS `event_date`,`test`.`t1`.`type` AS `type`,`test`.`t1`.`event_id` AS `event_id` from `test`.`t1` where false order by `test`.`t1`.`event_date`
-select event_date,type,event_id from t1 WHERE event_date >= "1999-07-01" AND event_date <= "1999-07-15" AND (type=100600 OR type=100100) or event_date >= "1999-07-01" AND event_date <= "1999-07-15" AND type=100099;
-event_date	type	event_id
-1999-07-10	100100	24
-1999-07-11	100100	25
-1999-07-13	100600	0
-1999-07-13	100600	4
-1999-07-13	100600	26
-1999-07-14	100600	10
-1999-07-15	100600	16
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-drop table t1;
-CREATE TABLE t1 (
-PAPER_ID smallint(6) DEFAULT '0' NOT NULL,
-YEAR smallint(6) DEFAULT '0' NOT NULL,
-ISSUE smallint(6) DEFAULT '0' NOT NULL,
-CLOSED tinyint(4) DEFAULT '0' NOT NULL,
-ISS_DATE date DEFAULT '0000-00-00' NOT NULL,
-PRIMARY KEY (PAPER_ID,YEAR,ISSUE)
-);
-Warnings:
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-INSERT INTO t1 VALUES (3,1999,34,0,'1999-07-12'), (1,1999,111,0,'1999-03-23'),
-(1,1999,222,0,'1999-03-23'), (3,1999,33,0,'1999-07-12'),
-(3,1999,32,0,'1999-07-12'), (3,1999,31,0,'1999-07-12'),
-(3,1999,30,0,'1999-07-12'), (3,1999,29,0,'1999-07-12'),
-(3,1999,28,0,'1999-07-12'), (1,1999,40,1,'1999-05-01'),
-(1,1999,41,1,'1999-05-01'), (1,1999,42,1,'1999-05-01'),
-(1,1999,46,1,'1999-05-01'), (1,1999,47,1,'1999-05-01'),
-(1,1999,48,1,'1999-05-01'), (1,1999,49,1,'1999-05-01'),
-(1,1999,50,0,'1999-05-01'), (1,1999,51,0,'1999-05-01'),
-(1,1999,200,0,'1999-06-28'), (1,1999,52,0,'1999-06-28'),
-(1,1999,53,0,'1999-06-28'), (1,1999,54,0,'1999-06-28'),
-(1,1999,55,0,'1999-06-28'), (1,1999,56,0,'1999-07-01'),
-(1,1999,57,0,'1999-07-01'), (1,1999,58,0,'1999-07-01'),
-(1,1999,59,0,'1999-07-01'), (1,1999,60,0,'1999-07-01'),
-(3,1999,35,0,'1999-07-12');
-select YEAR,ISSUE from t1 where PAPER_ID=3 and (YEAR>1999 or (YEAR=1999 and ISSUE>28))  order by YEAR,ISSUE;
-YEAR	ISSUE
-1999	29
-1999	30
-1999	31
-1999	32
-1999	33
-1999	34
-1999	35
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-check table t1;
-Table	Op	Msg_type	Msg_text
-test.t1	check	status	OK
-repair table t1;
-Table	Op	Msg_type	Msg_text
-test.t1	repair	note	The storage engine for the table doesn't support repair
-drop table t1;
-CREATE TABLE t1 (
-id int(11) NOT NULL auto_increment,
-parent_id int(11) DEFAULT '0' NOT NULL,
-level tinyint(4) DEFAULT '0' NOT NULL,
-PRIMARY KEY (id),
-KEY parent_id (parent_id),
-KEY level (level)
-);
-Warnings:
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-INSERT INTO t1 VALUES (1,0,0), (3,1,1), (4,1,1), (8,2,2), (9,2,2), (17,3,2),
-(22,4,2), (24,4,2), (28,5,2), (29,5,2), (30,5,2), (31,6,2), (32,6,2), (33,6,2),
-(203,7,2), (202,7,2), (20,3,2), (157,0,0), (193,5,2), (40,7,2), (2,1,1),
-(15,2,2), (6,1,1), (34,6,2), (35,6,2), (16,3,2), (7,1,1), (36,7,2), (18,3,2),
-(26,5,2), (27,5,2), (183,4,2), (38,7,2), (25,5,2), (37,7,2), (21,4,2),
-(19,3,2), (5,1,1), (179,5,2);
-SELECT * FROM t1 WHERE level = 1 AND parent_id = 1 order by id;
-id	parent_id	level
-2	1	1
-3	1	1
-4	1	1
-5	1	1
-6	1	1
-7	1	1
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t1 WHERE level = 1 AND parent_id = 1 order by id;
-id	parent_id	level
-2	1	1
-3	1	1
-4	1	1
-5	1	1
-6	1	1
-7	1	1
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-drop table t1;
-create table t1(
-Satellite		varchar(25)	not null,
-SensorMode		varchar(25)	not null,
-FullImageCornersUpperLeftLongitude	double	not null,
-FullImageCornersUpperRightLongitude	double	not null,
-FullImageCornersUpperRightLatitude	double	not null,
-FullImageCornersLowerRightLatitude	double	not null,
-index two (Satellite, SensorMode, FullImageCornersUpperLeftLongitude, FullImageCornersUpperRightLongitude, FullImageCornersUpperRightLatitude, FullImageCornersLowerRightLatitude));
-insert into t1 values("OV-3","PAN1",91,-92,40,50);
-insert into t1 values("OV-4","PAN1",91,-92,40,50);
-select * from t1 where t1.Satellite = "OV-3" and t1.SensorMode = "PAN1" and t1.FullImageCornersUpperLeftLongitude > -90.000000 and t1.FullImageCornersUpperRightLongitude < -82.000000;
-Satellite	SensorMode	FullImageCornersUpperLeftLongitude	FullImageCornersUpperRightLongitude	FullImageCornersUpperRightLatitude	FullImageCornersLowerRightLatitude
-OV-3	PAN1	91	-92	40	50
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-drop table t1;
-create table t1 ( aString char(100) not null default "", key aString (aString(10)) );
-insert t1 (aString) values ( "believe in myself" ), ( "believe" ), ("baaa" ), ( "believe in love");
-select * from t1 where aString < "believe in myself" order by aString;
-aString
-baaa
-believe
-believe in love
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-select * from t1 where aString > "believe in love" order by aString;
-aString
-believe in myself
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-alter table t1 drop key aString;
-select * from t1 where aString < "believe in myself" order by aString;
-aString
-baaa
-believe
-believe in love
-select * from t1 where aString > "believe in love" order by aString;
-aString
-believe in myself
-drop table t1;
-CREATE TABLE t1 (
-t1ID int(10) unsigned NOT NULL auto_increment,
-art binary(1) NOT NULL default '',
-KNR char(5) NOT NULL default '',
-RECHNR char(6) NOT NULL default '',
-POSNR char(2) NOT NULL default '',
-ARTNR char(10) NOT NULL default '',
-TEX char(70) NOT NULL default '',
-PRIMARY KEY  (t1ID),
-KEY IdxArt (art),
-KEY IdxKnr (KNR),
-KEY IdxArtnr (ARTNR)
-) ENGINE=MyISAM;
-Warnings:
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-INSERT INTO t1 (art) VALUES ('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),
-('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),
-('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),
-('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),
-('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),
-('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),
-('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),
-('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),
-('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),
-('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),
-('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),
-('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),
-('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),
-('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),
-('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),
-('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),
-('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),
-('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),
-('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),
-('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),
-('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),
-('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),
-('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),
-('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),
-('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),
-('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),
-('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),('j'),('J'),
-('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),
-('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),
-('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),
-('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),
-('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),
-('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),
-('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),
-('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),
-('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),
-('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),
-('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j'),('j');
-select count(*) from t1 where upper(art) = 'J';
-count(*)
-213
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-select count(*) from t1 where art = 'J' or art = 'j';
-count(*)
-602
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-select count(*) from t1 where art = 'j' or art = 'J';
-count(*)
-602
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-select count(*) from t1 where art = 'j';
-count(*)
-389
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-select count(*) from t1 where art = 'J';
-count(*)
-213
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-drop table t1;
-create table t1 (x int, y int, index(x), index(y));
-insert into t1 (x) values (1),(2),(3),(4),(5),(6),(7),(8),(9);
-update t1 set y=x;
-analyze table t1;
-Table	Op	Msg_type	Msg_text
-test.t1	analyze	status	OK
-explain select * from t1, t1 t2 where t1.y = 8 and t2.x between 7 and t1.y+0;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ref	y	y	5	const	1	100.00	NULL
-1	SIMPLE	t2	NULL	ALL	x	NULL	NULL	NULL	9	11.11	Using where; Using join buffer (hash join)
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`x` AS `x`,`test`.`t1`.`y` AS `y`,`test`.`t2`.`x` AS `x`,`test`.`t2`.`y` AS `y` from `test`.`t1` join `test`.`t1` `t2` where ((`test`.`t1`.`y` = 8) and (`test`.`t2`.`x` between 7 and <cache>((8 + 0))))
-explain select * from t1, t1 t2 where t1.y = 8 and t2.x >= 7 and t2.x <= t1.y+0;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ref	y	y	5	const	1	100.00	NULL
-1	SIMPLE	t2	NULL	ALL	x	NULL	NULL	NULL	9	11.11	Using where; Using join buffer (hash join)
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`x` AS `x`,`test`.`t1`.`y` AS `y`,`test`.`t2`.`x` AS `x`,`test`.`t2`.`y` AS `y` from `test`.`t1` join `test`.`t1` `t2` where ((`test`.`t1`.`y` = 8) and (`test`.`t2`.`x` >= 7) and (`test`.`t2`.`x` <= <cache>((8 + 0))))
-explain select * from t1, t1 t2 where t1.y = 2 and t2.x between t1.y-1 and t1.y+1;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ref	y	y	5	const	1	100.00	NULL
-1	SIMPLE	t2	NULL	ALL	x	NULL	NULL	NULL	9	11.11	Using where; Using join buffer (hash join)
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`x` AS `x`,`test`.`t1`.`y` AS `y`,`test`.`t2`.`x` AS `x`,`test`.`t2`.`y` AS `y` from `test`.`t1` join `test`.`t1` `t2` where ((`test`.`t1`.`y` = 2) and (`test`.`t2`.`x` between <cache>((2 - 1)) and <cache>((2 + 1))))
-explain select * from t1, t1 t2 where t1.y = 2 and t2.x >= t1.y-1 and t2.x <= t1.y+1;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ref	y	y	5	const	1	100.00	NULL
-1	SIMPLE	t2	NULL	ALL	x	NULL	NULL	NULL	9	11.11	Using where; Using join buffer (hash join)
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`x` AS `x`,`test`.`t1`.`y` AS `y`,`test`.`t2`.`x` AS `x`,`test`.`t2`.`y` AS `y` from `test`.`t1` join `test`.`t1` `t2` where ((`test`.`t1`.`y` = 2) and (`test`.`t2`.`x` >= <cache>((2 - 1))) and (`test`.`t2`.`x` <= <cache>((2 + 1))))
-explain select * from t1, t1 t2 where t1.y = 2 and t2.x between 0 and t1.y;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ref	y	y	5	const	1	100.00	NULL
-1	SIMPLE	t2	NULL	ALL	x	NULL	NULL	NULL	9	11.11	Using where; Using join buffer (hash join)
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`x` AS `x`,`test`.`t1`.`y` AS `y`,`test`.`t2`.`x` AS `x`,`test`.`t2`.`y` AS `y` from `test`.`t1` join `test`.`t1` `t2` where ((`test`.`t1`.`y` = 2) and (`test`.`t2`.`x` between 0 and 2))
-explain select * from t1, t1 t2 where t1.y = 2 and t2.x >= 0 and t2.x <= t1.y;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ref	y	y	5	const	1	100.00	NULL
-1	SIMPLE	t2	NULL	ALL	x	NULL	NULL	NULL	9	11.11	Using where; Using join buffer (hash join)
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`x` AS `x`,`test`.`t1`.`y` AS `y`,`test`.`t2`.`x` AS `x`,`test`.`t2`.`y` AS `y` from `test`.`t1` join `test`.`t1` `t2` where ((`test`.`t1`.`y` = 2) and (`test`.`t2`.`x` >= 0) and (`test`.`t2`.`x` <= 2))
-explain select count(*) from t1 where x in (1);
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ref	x	x	5	const	1	100.00	Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select count(0) AS `count(*)` from `test`.`t1` where (`test`.`t1`.`x` = 1)
-explain select count(*) from t1 where x in (1,2);
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	x	x	5	NULL	9	22.22	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select count(0) AS `count(*)` from `test`.`t1` where (`test`.`t1`.`x` in (1,2))
-drop table t1;
-CREATE TABLE t1 (key1 int(11) NOT NULL default '0', KEY i1 (key1));
-Warnings:
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-INSERT INTO t1 VALUES (0),(0),(0),(0),(0),(1),(1);
-CREATE TABLE t2 (keya int(11) NOT NULL default '0', KEY j1 (keya));
-Warnings:
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-INSERT INTO t2 VALUES (0),(0),(1),(1),(2),(2);
-explain select * from t1, t2 where (t1.key1 <t2.keya + 1) and t2.keya=3;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t2	NULL	ref	j1	j1	4	const	1	100.00	Using index
-1	SIMPLE	t1	NULL	index	i1	i1	4	NULL	7	33.33	Using where; Using index; Using join buffer (hash join)
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`key1` AS `key1`,`test`.`t2`.`keya` AS `keya` from `test`.`t1` join `test`.`t2` where ((`test`.`t2`.`keya` = 3) and (`test`.`t1`.`key1` < <cache>((3 + 1))))
-explain select * from t1 force index(i1), t2 force index(j1) where 
-(t1.key1 <t2.keya + 1) and t2.keya=3;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t2	NULL	ref	j1	j1	4	const	1	100.00	Using index
-1	SIMPLE	t1	NULL	index	i1	i1	4	NULL	7	33.33	Using where; Using index; Using join buffer (hash join)
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`key1` AS `key1`,`test`.`t2`.`keya` AS `keya` from `test`.`t1` FORCE INDEX (`i1`) join `test`.`t2` FORCE INDEX (`j1`) where ((`test`.`t2`.`keya` = 3) and (`test`.`t1`.`key1` < <cache>((3 + 1))))
-DROP TABLE t1,t2;
-CREATE TABLE t1 (
-a int(11) default NULL,
-b int(11) default NULL,
-KEY a (a),
-KEY b (b)
-) ENGINE=MyISAM;
-Warnings:
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-INSERT INTO t1 VALUES
-(1,1),(2,1),(3,1),(4,1),(5,1),(6,1),(7,1),(8,1),(9,1),(10,2),(10,2),
-(13,2),(14,2),(15,2),(16,2),(17,3),(17,3),(16,3),(17,3),(19,3),(20,3),
-(21,4),(22,5),(23,5),(24,5),(25,5),(26,5),(30,5),(31,5),(32,5),(33,5),
-(33,5),(33,5),(33,5),(33,5),(34,5),(35,5);
-EXPLAIN SELECT * FROM t1 WHERE a IN(1,2) AND b=5;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ref	a,b	b	5	const	3	20.00	Using where
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where ((`test`.`t1`.`b` = 5) and (`test`.`t1`.`a` in (1,2)))
-SELECT * FROM t1 WHERE a IN(1,2) AND b=5;
-a	b
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-DROP TABLE t1;
-CREATE TABLE t1 (a int, b int, c int, INDEX (c,a,b));
-INSERT INTO t1 VALUES (1,0,0),(1,0,0),(1,0,0);
-INSERT INTO t1 VALUES (0,1,0),(0,1,0),(0,1,0);
-SELECT COUNT(*) FROM t1 WHERE (c=0 and a=1) or (c=0 and b=1);
-COUNT(*)
-6
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT COUNT(*) FROM t1 WHERE (c=0 and b=1) or (c=0 and a=1);
-COUNT(*)
-6
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-DROP TABLE t1;
-CREATE TABLE t1 ( a int not null, b int not null, INDEX ab(a,b) );
-INSERT INTO t1 VALUES (47,1), (70,1), (15,1), (15, 4);
-SELECT * FROM t1
-WHERE
-(
-( b =1 AND a BETWEEN 14 AND 21 ) OR
-( b =2 AND a BETWEEN 16 AND 18 ) OR
-( b =3 AND a BETWEEN 15 AND 19 ) OR
-(a BETWEEN 19 AND 47)
-);
-a	b
-15	1
-47	1
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warnings:
-DROP TABLE t1;
-CREATE TABLE t1 (
-id int( 11 ) unsigned NOT NULL AUTO_INCREMENT ,
-line int( 5 ) unsigned NOT NULL default '0',
-columnid int( 3 ) unsigned NOT NULL default '0',
-owner int( 3 ) unsigned NOT NULL default '0',
-ordinal int( 3 ) unsigned NOT NULL default '0',
-showid smallint( 6 ) unsigned NOT NULL default '1',
-tableid int( 1 ) unsigned NOT NULL default '1',
-content int( 5 ) unsigned NOT NULL default '188',
-PRIMARY KEY ( owner, id ) ,
-KEY menu( owner, showid, columnid ) ,
-KEY `COLUMN` ( owner, columnid, line ) ,
-KEY `LINES` ( owner, tableid, content, id ) ,
-KEY recount( owner, line ) 
-) ENGINE = MYISAM;
-Warnings:
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-INSERT into t1 (owner,id,columnid,line) values (11,15,15,1),(11,13,13,5);
-SELECT id, columnid, tableid, content, showid, line, ordinal FROM t1 WHERE owner=11 AND ((columnid IN ( 15, 13, 14 ) AND line IN ( 1, 2, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 31 )) OR (columnid IN ( 13, 14 ) AND line IN ( 15 ))) LIMIT 0 , 30;
-id	columnid	tableid	content	showid	line	ordinal
-13	13	1	188	1	5	0
-15	15	1	188	1	1	0
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warnings:
-drop table t1;
-create  table t1 (id int(10) primary key);
-Warnings:
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9);
-select id from t1 where id in (2,5,9) ;
-id
-2
-5
-9
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-select id from t1 where id=2 or id=5 or id=9 ;
-id
-2
-5
-9
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-drop table t1;
-create table t1 ( id1 int not null, id2 int not null, idnull int null, c char(20), primary key (id1,id2));
-insert into t1 values (0,1,NULL,"aaa"), (1,1,NULL,"aaa"), (2,1,NULL,"aaa"),
-(3,1,NULL,"aaa"), (4,1,NULL,"aaa"), (5,1,NULL,"aaa"),
-(6,1,NULL,"aaa"), (7,1,NULL,"aaa"), (8,1,NULL,"aaa"),
-(9,1,NULL,"aaa"), (10,1,NULL,"aaa"), (11,1,NULL,"aaa"),
-(12,1,NULL,"aaa"), (13,1,NULL,"aaa"), (14,1,NULL,"aaa"),
-(15,1,NULL,"aaa"), (16,1,NULL,"aaa"), (17,1,NULL,"aaa"),
-(18,1,NULL,"aaa"), (19,1,NULL,"aaa"), (20,1,NULL,"aaa");
-select a.id1, b.idnull from t1 as a, t1 as b where a.id2=1 and a.id1=1 and b.id1=a.idnull order by b.id2 desc limit 1;
-id1	idnull
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-drop table t1;
-create table t1 (
-id int not null auto_increment,
-name char(1) not null,
-uid int not null,
-primary key (id),
-index uid_index (uid));
-create table t2 (
-id int not null auto_increment,
-name char(1) not null,
-uid int not null,
-primary key (id),
-index uid_index (uid));
-insert into t1(id, uid, name) values(1, 0, ' ');
-insert into t1(uid, name) values(0, ' ');
-insert into t2(uid, name) select uid, name from t1;
-insert into t1(uid, name) select uid, name from t2;
-insert into t2(uid, name) select uid, name from t1;
-insert into t1(uid, name) select uid, name from t2;
-insert into t2(uid, name) select uid, name from t1;
-insert into t1(uid, name) select uid, name from t2;
-insert into t2(uid, name) select uid, name from t1;
-insert into t1(uid, name) select uid, name from t2;
-insert into t2(uid, name) select uid, name from t1;
-insert into t1(uid, name) select uid, name from t2;
-insert into t2(uid, name) select uid, name from t1;
-insert into t2(uid, name) select uid, name from t1;
-insert into t2(uid, name) select uid, name from t1;
-insert into t2(uid, name) select uid, name from t1;
-insert into t1(uid, name) select uid, name from t2;
-delete from t2;
-insert into t2(uid, name) values 
-(1, CHAR(64+1)),
-(2, CHAR(64+2)),
-(3, CHAR(64+3)),
-(4, CHAR(64+4)),
-(5, CHAR(64+5)),
-(6, CHAR(64+6)),
-(7, CHAR(64+7)),
-(8, CHAR(64+8)),
-(9, CHAR(64+9)),
-(10, CHAR(64+10)),
-(11, CHAR(64+11)),
-(12, CHAR(64+12)),
-(13, CHAR(64+13)),
-(14, CHAR(64+14)),
-(15, CHAR(64+15)),
-(16, CHAR(64+16)),
-(17, CHAR(64+17)),
-(18, CHAR(64+18)),
-(19, CHAR(64+19)),
-(20, CHAR(64+20)),
-(21, CHAR(64+21)),
-(22, CHAR(64+22)),
-(23, CHAR(64+23)),
-(24, CHAR(64+24)),
-(25, CHAR(64+25)),
-(26, CHAR(64+26));
-insert into t1(uid, name) select uid, name from t2 order by uid;
-delete from t2;
-insert into t2(id, uid, name) select id, uid, name from t1;
-select count(*) from t1;
-count(*)
-1026
-select count(*) from t2;
-count(*)
-1026
-analyze table t1,t2;
-Table	Op	Msg_type	Msg_text
-test.t1	analyze	status	OK
-test.t2	analyze	status	OK
-explain select * from t1, t2  where t1.uid=t2.uid AND t1.uid > 0;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	#	NULL	ALL	uid_index	NULL	NULL	#	28	100.00	Using where
-1	SIMPLE	#	NULL	ref	uid_index	uid_index	4	#	28	100.00	NULL
-explain select * from t1, t2  where t1.uid=t2.uid AND t2.uid > 0;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	#	NULL	ALL	uid_index	NULL	NULL	#	28	100.00	Using where
-1	SIMPLE	#	NULL	ref	uid_index	uid_index	4	#	28	100.00	NULL
-explain select * from t1, t2  where t1.uid=t2.uid AND t1.uid != 0;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	#	NULL	ALL	uid_index	NULL	NULL	#	28	100.00	Using where
-1	SIMPLE	#	NULL	ref	uid_index	uid_index	4	#	28	100.00	NULL
-explain select * from t1, t2  where t1.uid=t2.uid AND t2.uid != 0;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	#	NULL	ALL	uid_index	NULL	NULL	#	28	100.00	Using where
-1	SIMPLE	#	NULL	ref	uid_index	uid_index	4	#	28	100.00	NULL
-select * from t1, t2  where t1.uid=t2.uid AND t1.uid > 0;
-id	name	uid	id	name	uid
-1257	A	1	1257	A	1
-1258	B	2	1258	B	2
-1259	C	3	1259	C	3
-1260	D	4	1260	D	4
-1261	E	5	1261	E	5
-1262	F	6	1262	F	6
-1263	G	7	1263	G	7
-1264	H	8	1264	H	8
-1265	I	9	1265	I	9
-1266	J	10	1266	J	10
-1267	K	11	1267	K	11
-1268	L	12	1268	L	12
-1269	M	13	1269	M	13
-1270	N	14	1270	N	14
-1271	O	15	1271	O	15
-1272	P	16	1272	P	16
-1273	Q	17	1273	Q	17
-1274	R	18	1274	R	18
-1275	S	19	1275	S	19
-1276	T	20	1276	T	20
-1277	U	21	1277	U	21
-1278	V	22	1278	V	22
-1279	W	23	1279	W	23
-1280	X	24	1280	X	24
-1281	Y	25	1281	Y	25
-1282	Z	26	1282	Z	26
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-select * from t1, t2  where t1.uid=t2.uid AND t1.uid != 0;
-id	name	uid	id	name	uid
-1257	A	1	1257	A	1
-1258	B	2	1258	B	2
-1259	C	3	1259	C	3
-1260	D	4	1260	D	4
-1261	E	5	1261	E	5
-1262	F	6	1262	F	6
-1263	G	7	1263	G	7
-1264	H	8	1264	H	8
-1265	I	9	1265	I	9
-1266	J	10	1266	J	10
-1267	K	11	1267	K	11
-1268	L	12	1268	L	12
-1269	M	13	1269	M	13
-1270	N	14	1270	N	14
-1271	O	15	1271	O	15
-1272	P	16	1272	P	16
-1273	Q	17	1273	Q	17
-1274	R	18	1274	R	18
-1275	S	19	1275	S	19
-1276	T	20	1276	T	20
-1277	U	21	1277	U	21
-1278	V	22	1278	V	22
-1279	W	23	1279	W	23
-1280	X	24	1280	X	24
-1281	Y	25	1281	Y	25
-1282	Z	26	1282	Z	26
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-drop table t1,t2;
-create table t1 (x bigint unsigned not null);
-insert into t1(x) values (0xfffffffffffffff0);
-insert into t1(x) values (0xfffffffffffffff1);
-select * from t1;
-x
-18446744073709551600
-18446744073709551601
-select count(*) from t1 where x>0;
-count(*)
-2
-select count(*) from t1 where x=0;
-count(*)
-0
-select count(*) from t1 where x<0;
-count(*)
-0
-select count(*) from t1 where x < -16;
-count(*)
-0
-select count(*) from t1 where x = -16;
-count(*)
-0
-select count(*) from t1 where x > -16;
-count(*)
-2
-select count(*) from t1 where x = 18446744073709551601;
-count(*)
-1
-create table t2 (x bigint not null);
-insert into t2(x) values (-16);
-insert into t2(x) values (-15);
-select * from t2;
-x
--16
--15
-select count(*) from t2 where x>0;
-count(*)
-0
-select count(*) from t2 where x=0;
-count(*)
-0
-select count(*) from t2 where x<0;
-count(*)
-2
-select count(*) from t2 where x < -16;
-count(*)
-0
-select count(*) from t2 where x = -16;
-count(*)
-1
-select count(*) from t2 where x > -16;
-count(*)
-1
-select count(*) from t2 where x = 18446744073709551601;
-count(*)
-0
-drop table t1,t2;
-create table t1 (x bigint unsigned not null primary key) engine=innodb;
-insert into t1(x) values (0xfffffffffffffff0);
-insert into t1(x) values (0xfffffffffffffff1);
-select * from t1;
-x
-18446744073709551600
-18446744073709551601
-select count(*) from t1 where x>0;
-count(*)
-2
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-select count(*) from t1 where x=0;
-count(*)
-0
-select count(*) from t1 where x<0;
-count(*)
-0
-select count(*) from t1 where x < -16;
-count(*)
-0
-select count(*) from t1 where x = -16;
-count(*)
-0
-select count(*) from t1 where x > -16;
-count(*)
-2
-select count(*) from t1 where x = 18446744073709551601;
-count(*)
-1
-drop table t1;
-create table t1 (a bigint unsigned);
-create index t1i on t1(a);
-insert into t1 select 18446744073709551615;
-insert into t1 select 18446744073709551614;
-explain select * from t1 where a <> -1;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	t1i	t1i	9	NULL	2	50.00	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` where (`test`.`t1`.`a` is not null)
-select * from t1 where a <> -1;
-a
-18446744073709551614
-18446744073709551615
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warnings:
-explain select * from t1 where a > -1 or a < -1;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	t1i	t1i	9	NULL	2	50.00	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` where (`test`.`t1`.`a` is not null)
-select * from t1 where a > -1 or a < -1;
-a
-18446744073709551614
-18446744073709551615
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warnings:
-explain select * from t1 where a > -1;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	t1i	t1i	9	NULL	2	50.00	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` where (`test`.`t1`.`a` is not null)
-select * from t1 where a > -1;
-a
-18446744073709551614
-18446744073709551615
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warnings:
-explain select * from t1 where a < -1;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE
-Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` where false
-select * from t1 where a < -1;
-a
-drop table t1;
-set names latin1;
-create table t1 (a char(10), b text, key (a)) character set latin1;
-INSERT INTO t1 (a) VALUES
-('111'),('222'),('222'),('222'),('222'),('444'),('aaa'),('AAA'),('bbb');
-explain select * from t1 where a='aaa';
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ref	a	a	11	const	1	100.00	NULL
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where (`test`.`t1`.`a` = 'aaa')
-explain select * from t1 where a=binary 'aaa';
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	a	NULL	NULL	NULL	9	11.11	Using where
-Warnings:
-Warning	1739	Cannot use ref access on index 'a' due to type or collation conversion on field 'a'
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where (`test`.`t1`.`a` = <cache>(cast('aaa' as char charset binary)))
-explain select * from t1 where a='aaa' collate latin1_bin;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	a	NULL	NULL	NULL	9	11.11	Using where
-Warnings:
-Warning	1739	Cannot use ref access on index 'a' due to type or collation conversion on field 'a'
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where (`test`.`t1`.`a` = <cache>(('aaa' collate latin1_bin)))
-explain select * from t1 where a='aaa' collate latin1_german1_ci;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	a	NULL	NULL	NULL	9	11.11	Using where
-Warnings:
-Warning	1739	Cannot use ref access on index 'a' due to type or collation conversion on field 'a'
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where (`test`.`t1`.`a` = <cache>(('aaa' collate latin1_german1_ci)))
-drop table t1;
-CREATE TABLE t1 (
-`CLIENT` char(3) character set latin1 collate latin1_bin NOT NULL default '000',
-`ARG1` char(3) character set latin1 collate latin1_bin NOT NULL default '',
-`ARG2` char(3) character set latin1 collate latin1_bin NOT NULL default '',
-`FUNCTION` varchar(10) character set latin1 collate latin1_bin NOT NULL default '',
-`FUNCTINT` int(11) NOT NULL default '0',
-KEY `VERI_CLNT~2` (`ARG1`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-INSERT INTO t1 VALUES ('000',' 0',' 0','Text 001',0), ('000',' 0',' 1','Text 002',0),
-('000',' 1',' 2','Text 003',0), ('000',' 2',' 3','Text 004',0),
-('001',' 3',' 0','Text 017',0);
-SELECT count(*) FROM t1 WHERE CLIENT='000' AND (ARG1 != ' 1' OR ARG1 != ' 2');
-count(*)
-4
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT count(*) FROM t1 WHERE CLIENT='000' AND (ARG1 != ' 2' OR ARG1 != ' 1');
-count(*)
-4
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-drop table t1;
-create table t1 (a int);
-insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
-CREATE TABLE t2 (
-pk1 int(11) NOT NULL,
-pk2 int(11) NOT NULL,
-pk3 int(11) NOT NULL,
-pk4 int(11) NOT NULL,
-filler char(82),
-PRIMARY KEY (pk1,pk2,pk3,pk4)
-) DEFAULT CHARSET=latin1;
-Warnings:
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-insert into t2 select 1, A.a+10*B.a, 432, 44, 'fillerZ' from t1 A, t1 B;
-INSERT INTO t2 VALUES (2621, 2635, 0, 0,'filler'), (2621, 2635, 1, 0,'filler'),
-(2621, 2635, 10, 0,'filler'), (2621, 2635, 11, 0,'filler'),
-(2621, 2635, 14, 0,'filler'), (2621, 2635, 1000015, 0,'filler');
-SELECT * FROM t2
-WHERE ((((pk4 =0) AND (pk1 =2621) AND (pk2 =2635)))
-OR ((pk4 =1) AND (((pk1 IN ( 7, 2, 1 ))) OR (pk1 =522)) AND ((pk2 IN ( 0, 2635))))
-) AND (pk3 >=1000000);
-pk1	pk2	pk3	pk4	filler
-2621	2635	1000015	0	filler
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-drop table t1, t2;
-create table t1(a char(2), key(a(1))) charset utf8mb4;
-insert into t1 values ('x'), ('xx');
-explain select a from t1 where a > 'x';
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	a	NULL	NULL	NULL	2	50.00	Using where
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` where (`test`.`t1`.`a` > 'x')
-select a from t1 where a > 'x';
-a
-xx
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-drop table t1;
-CREATE TABLE t1 (
-OXID varchar(32) COLLATE latin1_german2_ci NOT NULL DEFAULT '',
-OXPARENTID varchar(32) COLLATE latin1_german2_ci NOT NULL DEFAULT 'oxrootid',
-OXLEFT int NOT NULL DEFAULT '0',
-OXRIGHT int NOT NULL DEFAULT '0',
-OXROOTID varchar(32) COLLATE latin1_german2_ci NOT NULL DEFAULT '',
-PRIMARY KEY  (OXID),
-KEY OXNID (OXID),
-KEY OXLEFT (OXLEFT),
-KEY OXRIGHT (OXRIGHT),
-KEY OXROOTID (OXROOTID)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_german2_ci;
-INSERT INTO t1 VALUES
-('d8c4177d09f8b11f5.52725521','oxrootid',1,40,'d8c4177d09f8b11f5.52725521'),
-('d8c4177d151affab2.81582770','d8c4177d09f8b11f5.52725521',2,3,
-'d8c4177d09f8b11f5.52725521'),
-('d8c4177d206a333d2.74422679','d8c4177d09f8b11f5.52725521',4,5,
-'d8c4177d09f8b11f5.52725521'),
-('d8c4177d225791924.30714720','d8c4177d09f8b11f5.52725521',6,7,
-'d8c4177d09f8b11f5.52725521'),
-('d8c4177d2380fc201.39666693','d8c4177d09f8b11f5.52725521',8,9,
-'d8c4177d09f8b11f5.52725521'),
-('d8c4177d24ccef970.14957924','d8c4177d09f8b11f5.52725521',10,11,
-'d8c4177d09f8b11f5.52725521');
-EXPLAIN
-SELECT s.oxid FROM t1 v, t1 s 
-WHERE s.oxrootid = 'd8c4177d09f8b11f5.52725521' AND
-v.oxrootid ='d8c4177d09f8b11f5.52725521' AND
-s.oxleft > v.oxleft AND s.oxleft < v.oxright;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	v	NULL	ref	OXLEFT,OXRIGHT,OXROOTID	OXROOTID	34	const	1	100.00	NULL
-1	SIMPLE	s	NULL	ref	OXLEFT,OXROOTID	OXROOTID	34	const	1	16.67	Using where
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`s`.`OXID` AS `oxid` from `test`.`t1` `v` join `test`.`t1` `s` where ((`test`.`s`.`OXROOTID` = 'd8c4177d09f8b11f5.52725521') and (`test`.`v`.`OXROOTID` = 'd8c4177d09f8b11f5.52725521') and (`test`.`s`.`OXLEFT` > `test`.`v`.`OXLEFT`) and (`test`.`s`.`OXLEFT` < `test`.`v`.`OXRIGHT`))
-SELECT s.oxid FROM t1 v, t1 s 
-WHERE s.oxrootid = 'd8c4177d09f8b11f5.52725521' AND
-v.oxrootid ='d8c4177d09f8b11f5.52725521' AND
-s.oxleft > v.oxleft AND s.oxleft < v.oxright;
-oxid
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warnings:
-d8c4177d151affab2.81582770
-d8c4177d206a333d2.74422679
-d8c4177d225791924.30714720
-d8c4177d2380fc201.39666693
-d8c4177d24ccef970.14957924
-DROP TABLE t1;
-create table t1 (
-c1  char(10), c2  char(10), c3  char(10), c4  char(10),
-c5  char(10), c6  char(10), c7  char(10), c8  char(10),
-c9  char(10), c10 char(10), c11 char(10), c12 char(10),
-c13 char(10), c14 char(10), c15 char(10), c16 char(10),
-index(c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12,c13,c14,c15,c16)
-);
-insert into t1 (c1) values ('1'),('1'),('1'),('1');
-select * from t1 where
-c1 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh", 
-"abcdefg1", "123456781", "qwertyui1", "asddfg1", 
-"abcdefg2", "123456782", "qwertyui2", "asddfg2", 
-"abcdefg3", "123456783", "qwertyui3", "asddfg3", 
-"abcdefg4", "123456784", "qwertyui4", "asddfg4",
-"abcdefg5", "123456785", "qwertyui5", "asddfg5",
-"abcdefg6", "123456786", "qwertyui6", "asddfg6",
-"abcdefg7", "123456787", "qwertyui7", "asddfg7",
-"abcdefg8", "123456788", "qwertyui8", "asddfg8",
-"abcdefg9", "123456789", "qwertyui9", "asddfg9",
-"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",
-"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",
-"abcdefgC", "12345678C", "qwertyuiC", "asddfgC")
-and c2 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh", 
-"abcdefg1", "123456781", "qwertyui1", "asddfg1", 
-"abcdefg2", "123456782", "qwertyui2", "asddfg2", 
-"abcdefg3", "123456783", "qwertyui3", "asddfg3", 
-"abcdefg4", "123456784", "qwertyui4", "asddfg4", 
-"abcdefg5", "123456785", "qwertyui5", "asddfg5",
-"abcdefg6", "123456786", "qwertyui6", "asddfg6",
-"abcdefg7", "123456787", "qwertyui7", "asddfg7",
-"abcdefg8", "123456788", "qwertyui8", "asddfg8",
-"abcdefg9", "123456789", "qwertyui9", "asddfg9",
-"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",
-"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",
-"abcdefgC", "12345678C", "qwertyuiC", "asddfgC")
-and c3 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh", 
-"abcdefg1", "123456781", "qwertyui1", "asddfg1", 
-"abcdefg2", "123456782", "qwertyui2", "asddfg2", 
-"abcdefg3", "123456783", "qwertyui3", "asddfg3", 
-"abcdefg4", "123456784", "qwertyui4", "asddfg4", 
-"abcdefg5", "123456785", "qwertyui5", "asddfg5",
-"abcdefg6", "123456786", "qwertyui6", "asddfg6",
-"abcdefg7", "123456787", "qwertyui7", "asddfg7",
-"abcdefg8", "123456788", "qwertyui8", "asddfg8",
-"abcdefg9", "123456789", "qwertyui9", "asddfg9",
-"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",
-"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",
-"abcdefgC", "12345678C", "qwertyuiC", "asddfgC")
-and c4 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh", 
-"abcdefg1", "123456781", "qwertyui1", "asddfg1", 
-"abcdefg2", "123456782", "qwertyui2", "asddfg2", 
-"abcdefg3", "123456783", "qwertyui3", "asddfg3", 
-"abcdefg4", "123456784", "qwertyui4", "asddfg4", 
-"abcdefg5", "123456785", "qwertyui5", "asddfg5", 
-"abcdefg6", "123456786", "qwertyui6", "asddfg6",
-"abcdefg7", "123456787", "qwertyui7", "asddfg7",
-"abcdefg8", "123456788", "qwertyui8", "asddfg8",
-"abcdefg9", "123456789", "qwertyui9", "asddfg9",
-"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",
-"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",
-"abcdefgC", "12345678C", "qwertyuiC", "asddfgC")
-and c5 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh", 
-"abcdefg1", "123456781", "qwertyui1", "asddfg1", 
-"abcdefg2", "123456782", "qwertyui2", "asddfg2", 
-"abcdefg3", "123456783", "qwertyui3", "asddfg3", 
-"abcdefg4", "123456784", "qwertyui4", "asddfg4",
-"abcdefg5", "123456785", "qwertyui5", "asddfg5",
-"abcdefg6", "123456786", "qwertyui6", "asddfg6",
-"abcdefg7", "123456787", "qwertyui7", "asddfg7",
-"abcdefg8", "123456788", "qwertyui8", "asddfg8",
-"abcdefg9", "123456789", "qwertyui9", "asddfg9",
-"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",
-"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",
-"abcdefgC", "12345678C", "qwertyuiC", "asddfgC")
-and c6 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh", 
-"abcdefg1", "123456781", "qwertyui1", "asddfg1", 
-"abcdefg2", "123456782", "qwertyui2", "asddfg2", 
-"abcdefg3", "123456783", "qwertyui3", "asddfg3", 
-"abcdefg4", "123456784", "qwertyui4", "asddfg4",
-"abcdefg5", "123456785", "qwertyui5", "asddfg5",
-"abcdefg6", "123456786", "qwertyui6", "asddfg6",
-"abcdefg7", "123456787", "qwertyui7", "asddfg7",
-"abcdefg8", "123456788", "qwertyui8", "asddfg8",
-"abcdefg9", "123456789", "qwertyui9", "asddfg9",
-"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",
-"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",
-"abcdefgC", "12345678C", "qwertyuiC", "asddfgC")
-and c7 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh", 
-"abcdefg1", "123456781", "qwertyui1", "asddfg1", 
-"abcdefg2", "123456782", "qwertyui2", "asddfg2", 
-"abcdefg3", "123456783", "qwertyui3", "asddfg3", 
-"abcdefg4", "123456784", "qwertyui4", "asddfg4", 
-"abcdefg5", "123456785", "qwertyui5", "asddfg5",
-"abcdefg6", "123456786", "qwertyui6", "asddfg6",
-"abcdefg7", "123456787", "qwertyui7", "asddfg7",
-"abcdefg8", "123456788", "qwertyui8", "asddfg8",
-"abcdefg9", "123456789", "qwertyui9", "asddfg9",
-"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",
-"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",
-"abcdefgC", "12345678C", "qwertyuiC", "asddfgC")
-and c8 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh", 
-"abcdefg1", "123456781", "qwertyui1", "asddfg1", 
-"abcdefg2", "123456782", "qwertyui2", "asddfg2", 
-"abcdefg3", "123456783", "qwertyui3", "asddfg3", 
-"abcdefg4", "123456784", "qwertyui4", "asddfg4", 
-"abcdefg5", "123456785", "qwertyui5", "asddfg5",
-"abcdefg6", "123456786", "qwertyui6", "asddfg6",
-"abcdefg7", "123456787", "qwertyui7", "asddfg7",
-"abcdefg8", "123456788", "qwertyui8", "asddfg8",
-"abcdefg9", "123456789", "qwertyui9", "asddfg9",
-"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",
-"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",
-"abcdefgC", "12345678C", "qwertyuiC", "asddfgC")
-and c9 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh", 
-"abcdefg1", "123456781", "qwertyui1", "asddfg1", 
-"abcdefg2", "123456782", "qwertyui2", "asddfg2", 
-"abcdefg3", "123456783", "qwertyui3", "asddfg3", 
-"abcdefg4", "123456784", "qwertyui4", "asddfg4", 
-"abcdefg5", "123456785", "qwertyui5", "asddfg5",
-"abcdefg6", "123456786", "qwertyui6", "asddfg6",
-"abcdefg7", "123456787", "qwertyui7", "asddfg7",
-"abcdefg8", "123456788", "qwertyui8", "asddfg8",
-"abcdefg9", "123456789", "qwertyui9", "asddfg9",
-"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",
-"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",
-"abcdefgC", "12345678C", "qwertyuiC", "asddfgC")
-and c10 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh", 
-"abcdefg1", "123456781", "qwertyui1", "asddfg1", 
-"abcdefg2", "123456782", "qwertyui2", "asddfg2", 
-"abcdefg3", "123456783", "qwertyui3", "asddfg3", 
-"abcdefg4", "123456784", "qwertyui4", "asddfg4", 
-"abcdefg5", "123456785", "qwertyui5", "asddfg5",
-"abcdefg6", "123456786", "qwertyui6", "asddfg6",
-"abcdefg7", "123456787", "qwertyui7", "asddfg7",
-"abcdefg8", "123456788", "qwertyui8", "asddfg8",
-"abcdefg9", "123456789", "qwertyui9", "asddfg9",
-"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",
-"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",
-"abcdefgC", "12345678C", "qwertyuiC", "asddfgC");
-c1	c2	c3	c4	c5	c6	c7	c8	c9	c10	c11	c12	c13	c14	c15	c16
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-drop table t1;
-End of 4.1 tests
-CREATE TABLE t1 (
-id int(11) NOT NULL auto_increment,
-status varchar(20),
-PRIMARY KEY  (id),
-KEY (status)
-) CHARSET utf8mb4;
-Warnings:
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-INSERT INTO t1 VALUES
-(1,'B'), (2,'B'), (3,'B'), (4,'B'), (5,'B'), (6,'B'),
-(7,'B'), (8,'B'), (9,'B'), (10,'B'), (11,'B'), (12,'B'),
-(13,'B'), (14,'B'), (15,'B'), (16,'B'), (17,'B'), (18,'B'),
-(19,'B'), (20,'B'), (21,'B'), (22,'B'), (23,'B'), (24,'B'), 
-(25,'A'), (26,'A'), (27,'A'), (28,'A'), (29,'A'), (30,'A'),
-(31,'A'), (32,'A'), (33,'A'), (34,'A'), (35,'A'), (36,'A'),
-(37,'A'), (38,'A'), (39,'A'), (40,'A'), (41,'A'), (42,'A'),
-(43,'A'), (44,'A'), (45,'A'), (46,'A'), (47,'A'), (48,'A'),
-(49,'A'), (50,'A'), (51,'A'), (52,'A'), (53,'C'), (54,'C'),
-(55,'C'), (56,'C'), (57,'C'), (58,'C'), (59,'C'), (60,'C');
-EXPLAIN SELECT * FROM t1 WHERE status <> 'A' AND status <> 'B';
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	status	status	83	NULL	60	81.00	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`id` AS `id`,`test`.`t1`.`status` AS `status` from `test`.`t1` where ((`test`.`t1`.`status` <> 'A') and (`test`.`t1`.`status` <> 'B'))
-EXPLAIN SELECT * FROM t1 WHERE status NOT IN ('A','B');
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	status	status	83	NULL	60	80.00	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`id` AS `id`,`test`.`t1`.`status` AS `status` from `test`.`t1` where (`test`.`t1`.`status` not in ('A','B'))
-SELECT * FROM t1 WHERE status <> 'A' AND status <> 'B';
-id	status
-53	C
-54	C
-55	C
-56	C
-57	C
-58	C
-59	C
-60	C
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t1 WHERE status NOT IN ('A','B');
-id	status
-53	C
-54	C
-55	C
-56	C
-57	C
-58	C
-59	C
-60	C
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-EXPLAIN SELECT status FROM t1 WHERE status <> 'A' AND status <> 'B';
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	status	status	83	NULL	60	81.00	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`status` AS `status` from `test`.`t1` where ((`test`.`t1`.`status` <> 'A') and (`test`.`t1`.`status` <> 'B'))
-EXPLAIN SELECT status FROM t1 WHERE status NOT IN ('A','B');
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	status	status	83	NULL	60	80.00	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`status` AS `status` from `test`.`t1` where (`test`.`t1`.`status` not in ('A','B'))
-EXPLAIN SELECT * FROM t1 WHERE status NOT BETWEEN 'A' AND 'B';
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	status	status	83	NULL	60	88.89	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`id` AS `id`,`test`.`t1`.`status` AS `status` from `test`.`t1` where (`test`.`t1`.`status` not between 'A' and 'B')
-EXPLAIN SELECT * FROM t1 WHERE status < 'A' OR status > 'B';
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	status	status	83	NULL	60	55.55	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`id` AS `id`,`test`.`t1`.`status` AS `status` from `test`.`t1` where ((`test`.`t1`.`status` < 'A') or (`test`.`t1`.`status` > 'B'))
-SELECT * FROM t1 WHERE status NOT BETWEEN 'A' AND 'B';
-id	status
-53	C
-54	C
-55	C
-56	C
-57	C
-58	C
-59	C
-60	C
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t1 WHERE status < 'A' OR status > 'B';
-id	status
-53	C
-54	C
-55	C
-56	C
-57	C
-58	C
-59	C
-60	C
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-DROP TABLE t1;
-CREATE TABLE  t1 (a int, b int, primary key(a,b));
-INSERT INTO  t1 VALUES
-(1,1),(1,2),(1,3),(2,1),(2,2),(2,3),(3,1),(3,2),(3,3),(4,1),(4,2),(4,3);
-CREATE VIEW v1 as SELECT a,b FROM t1 WHERE b=3;
-EXPLAIN SELECT a,b FROM t1 WHERE a < 2 and b=3;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	PRIMARY	PRIMARY	8	NULL	12	8.33	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where ((`test`.`t1`.`b` = 3) and (`test`.`t1`.`a` < 2))
-EXPLAIN SELECT a,b FROM v1 WHERE a < 2 and b=3;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	PRIMARY	PRIMARY	8	NULL	12	8.33	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where ((`test`.`t1`.`b` = 3) and (`test`.`t1`.`a` < 2))
-EXPLAIN SELECT a,b FROM t1 WHERE a < 2;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	PRIMARY	PRIMARY	8	NULL	12	33.33	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where (`test`.`t1`.`a` < 2)
-EXPLAIN SELECT a,b FROM v1 WHERE a < 2;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	PRIMARY	PRIMARY	8	NULL	12	8.33	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where ((`test`.`t1`.`b` = 3) and (`test`.`t1`.`a` < 2))
-SELECT a,b FROM t1 WHERE a < 2 and b=3;
-a	b
-1	3
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT a,b FROM v1 WHERE a < 2 and b=3;
-a	b
-1	3
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-DROP VIEW v1;
-DROP TABLE t1;
-CREATE TABLE t1 (name varchar(15) NOT NULL, KEY idx(name));
-INSERT INTO t1 VALUES ('Betty'), ('Anna');
-SELECT * FROM t1;
-name
-Anna
-Betty
-DELETE FROM t1 WHERE name NOT LIKE 'A%a';
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t1;
-name
-Anna
-DROP TABLE t1;
-CREATE TABLE t1 (a int, KEY idx(a));
-INSERT INTO t1 VALUES (NULL), (1), (2), (3);
-SELECT * FROM t1;
-a
-NULL
-1
-2
-3
-DELETE FROM t1 WHERE NOT(a <=> 2);
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t1;
-a
-2
-DROP TABLE t1;
-create table t1 (a int, b int, primary key(a,b));
-create view v1 as select a, b from t1;
-INSERT INTO `t1` VALUES
-(0,0),(1,0),(2,0),(3,0),(4,0),(5,1),(6,1),(7,1),(8,1),(9,1),(10,2),(11,2),(12,2)
-,(13,2),(14,2),(15,3),(16,3),(17,3),(18,3),(19,3);
-explain select * from t1 where a in (3,4)  and b in (1,2,3);
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	PRIMARY	PRIMARY	8	NULL	#	6.00	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where ((`test`.`t1`.`a` in (3,4)) and (`test`.`t1`.`b` in (1,2,3)))
-explain select * from v1 where a in (3,4)  and b in (1,2,3);
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	PRIMARY	PRIMARY	8	NULL	#	6.00	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where ((`test`.`t1`.`a` in (3,4)) and (`test`.`t1`.`b` in (1,2,3)))
-explain select * from t1 where a between 3 and 4 and b between 1 and 2;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	PRIMARY	PRIMARY	8	NULL	#	5.00	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where ((`test`.`t1`.`a` between 3 and 4) and (`test`.`t1`.`b` between 1 and 2))
-explain select * from v1 where a between 3 and 4 and b between 1 and 2;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	PRIMARY	PRIMARY	8	NULL	#	5.00	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where ((`test`.`t1`.`a` between 3 and 4) and (`test`.`t1`.`b` between 1 and 2))
-drop view v1;
-drop table t1;
-create table t3 (a int);
-insert into t3 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
-create table t1 (a varchar(10), filler char(200), key(a)) charset=binary;
-insert into t1 values ('a','');
-insert into t1 values ('a ','');
-insert into t1 values ('a  ', '');
-insert into t1 select concat('a', 1000 + A.a + 10 * (B.a + 10 * C.a)), ''
-  from t3 A, t3 B, t3 C;
-create table t2 (a varchar(10), filler char(200), key(a)) charset utf8mb4;
-insert into t2 select * from t1;
-explain select * from t1 where a between 'a' and 'a ';
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	a	NULL	NULL	NULL	#	11.11	Using where
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`filler` AS `filler` from `test`.`t1` where (`test`.`t1`.`a` between 'a' and 'a ')
-explain select * from t1 where a = 'a' or a='a ';
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	a	NULL	NULL	NULL	#	0.20	Using where
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`filler` AS `filler` from `test`.`t1` where ((`test`.`t1`.`a` = 'a') or (`test`.`t1`.`a` = 'a '))
-explain select * from t2 where a between 'a' and 'A';
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t2	NULL	ref	a	a	43	const	#	100.00	Using index condition
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t2`.`a` AS `a`,`test`.`t2`.`filler` AS `filler` from `test`.`t2` where (`test`.`t2`.`a` between 'a' and 'A')
-explain select * from t2 where a = 'a' or a='A';
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t2	NULL	ref	a	a	43	const	#	100.00	NULL
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t2`.`a` AS `a`,`test`.`t2`.`filler` AS `filler` from `test`.`t2` where ((`test`.`t2`.`a` = 'a') or (`test`.`t2`.`a` = 'A'))
-update t1 set a='b' where a<>'a';
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-explain select * from t1 where a not between 'b' and 'b';
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	a	NULL	NULL	NULL	#	88.89	Using where
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`filler` AS `filler` from `test`.`t1` where (`test`.`t1`.`a` not between 'b' and 'b')
-select a, hex(filler) from t1 where a not between 'b' and 'b';
-a	hex(filler)
-a	0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-drop table t1,t2,t3;
-create table t1 (a int);
-insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
-create table t2 (a int, key(a));
-insert into t2 select 2*(A.a + 10*(B.a + 10*C.a)) from t1 A, t1 B, t1 C;
-set @a="select * from t2 force index (a) where a NOT IN(0";
-select count(*) from (select @a:=concat(@a, ',', a) from t2 ) Z;
-count(*)
-1000
-Warnings:
-Warning	1287	Setting user variables within expressions is deprecated and will be removed in a future release. Consider alternatives: 'SET variable=expression, ...', or 'SELECT expression(s) INTO variables(s)'.
-set @a=concat(@a, ')');
-insert into t2 values (11),(13),(15);
-set @b= concat("explain ", @a);
-prepare stmt1 from @b;
-execute stmt1;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t2	NULL	index	a	a	5	NULL	1003	50.00	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t2`.`a` AS `a` from `test`.`t2` FORCE INDEX (`a`) where (`test`.`t2`.`a` not in (0,0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,32,34,36,38,40,42,44,46,48,50,52,54,56,58,60,62,64,66,68,70,72,74,76,78,80,82,84,86,88,90,92,94,96,98,100,102,104,106,108,110,112,114,116,118,120,122,124,126,128,130,132,134,136,138,140,142,144,146,148,150,152,154,156,158,160,162,164,166,168,170,172,174,176,178,180,182,184,186,188,190,192,194,196,198,200,202,204,206,208,210,212,214,216,218,220,222,224,226,228,230,232,234,236,238,240,242,244,246,248,250,252,254,256,258,260,262,264,266,268,270,272,274,276,278,280,282,284,286,288,290,292,294,296,298,300,302,304,306,308,310,312,314,316,318,320,322,324,326,328,330,332,334,336,338,340,342,344,346,348,350,352,354,356,358,360,362,364,366,368,370,372,374,376,378,380,382,384,386,388,390,392,394,396,398,400,402,404,406,408,410,412,414,416,418,420,422,424,426,428,430,432,434,436,438,440,442,444,446,448,450,452,454,456,458,460,462,464,466,468,470,472,474,476,478,480,482,484,486,488,490,492,494,496,498,500,502,504,506,508,510,512,514,516,518,520,522,524,526,528,530,532,534,536,538,540,542,544,546,548,550,552,554,556,558,560,562,564,566,568,570,572,574,576,578,580,582,584,586,588,590,592,594,596,598,600,602,604,606,608,610,612,614,616,618,620,622,624,626,628,630,632,634,636,638,640,642,644,646,648,650,652,654,656,658,660,662,664,666,668,670,672,674,676,678,680,682,684,686,688,690,692,694,696,698,700,702,704,706,708,710,712,714,716,718,720,722,724,726,728,730,732,734,736,738,740,742,744,746,748,750,752,754,756,758,760,762,764,766,768,770,772,774,776,778,780,782,784,786,788,790,792,794,796,798,800,802,804,806,808,810,812,814,816,818,820,822,824,826,828,830,832,834,836,838,840,842,844,846,848,850,852,854,856,858,860,862,864,866,868,870,872,874,876,878,880,882,884,886,888,890,892,894,896,898,900,902,904,906,908,910,912,914,916,918,920,922,924,926,928,930,932,934,936,938,940,942,944,946,948,950,952,954,956,958,960,962,964,966,968,970,972,974,976,978,980,982,984,986,988,990,992,994,996,998,1000,1002,1004,1006,1008,1010,1012,1014,1016,1018,1020,1022,1024,1026,1028,1030,1032,1034,1036,1038,1040,1042,1044,1046,1048,1050,1052,1054,1056,1058,1060,1062,1064,1066,1068,1070,1072,1074,1076,1078,1080,1082,1084,1086,1088,1090,1092,1094,1096,1098,1100,1102,1104,1106,1108,1110,1112,1114,1116,1118,1120,1122,1124,1126,1128,1130,1132,1134,1136,1138,1140,1142,1144,1146,1148,1150,1152,1154,1156,1158,1160,1162,1164,1166,1168,1170,1172,1174,1176,1178,1180,1182,1184,1186,1188,1190,1192,1194,1196,1198,1200,1202,1204,1206,1208,1210,1212,1214,1216,1218,1220,1222,1224,1226,1228,1230,1232,1234,1236,1238,1240,1242,1244,1246,1248,1250,1252,1254,1256,1258,1260,1262,1264,1266,1268,1270,1272,1274,1276,1278,1280,1282,1284,1286,1288,1290,1292,1294,1296,1298,1300,1302,1304,1306,1308,1310,1312,1314,1316,1318,1320,1322,1324,1326,1328,1330,1332,1334,1336,1338,1340,1342,1344,1346,1348,1350,1352,1354,1356,1358,1360,1362,1364,1366,1368,1370,1372,1374,1376,1378,1380,1382,1384,1386,1388,1390,1392,1394,1396,1398,1400,1402,1404,1406,1408,1410,1412,1414,1416,1418,1420,1422,1424,1426,1428,1430,1432,1434,1436,1438,1440,1442,1444,1446,1448,1450,1452,1454,1456,1458,1460,1462,1464,1466,1468,1470,1472,1474,1476,1478,1480,1482,1484,1486,1488,1490,1492,1494,1496,1498,1500,1502,1504,1506,1508,1510,1512,1514,1516,1518,1520,1522,1524,1526,1528,1530,1532,1534,1536,1538,1540,1542,1544,1546,1548,1550,1552,1554,1556,1558,1560,1562,1564,1566,1568,1570,1572,1574,1576,1578,1580,1582,1584,1586,1588,1590,1592,1594,1596,1598,1600,1602,1604,1606,1608,1610,1612,1614,1616,1618,1620,1622,1624,1626,1628,1630,1632,1634,1636,1638,1640,1642,1644,1646,1648,1650,1652,1654,1656,1658,1660,1662,1664,1666,1668,1670,1672,1674,1676,1678,1680,1682,1684,1686,1688,1690,1692,1694,1696,1698,1700,1702,1704,1706,1708,1710,1712,1714,1716,1718,1720,1722,1724,1726,1728,1730,1732,1734,1736,1738,1740,1742,1744,1746,1748,1750,1752,1754,1756,1758,1760,1762,1764,1766,1768,1770,1772,1774,1776,1778,1780,1782,1784,1786,1788,1790,1792,1794,1796,1798,1800,1802,1804,1806,1808,1810,1812,1814,1816,1818,1820,1822,1824,1826,1828,1830,1832,1834,1836,1838,1840,1842,1844,1846,1848,1850,1852,1854,1856,1858,1860,1862,1864,1866,1868,1870,1872,1874,1876,1878,1880,1882,1884,1886,1888,1890,1892,1894,1896,1898,1900,1902,1904,1906,1908,1910,1912,1914,1916,1918,1920,1922,1924,1926,1928,1930,1932,1934,1936,1938,1940,1942,1944,1946,1948,1950,1952,1954,1956,1958,1960,1962,1964,1966,1968,1970,1972,1974,1976,1978,1980,1982,1984,1986,1988,1990,1992,1994,1996,1998))
-prepare stmt1 from @a;
-execute stmt1;
-a
-11
-13
-15
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-drop table t1, t2;
-CREATE TABLE t1 (
-id int NOT NULL DEFAULT '0',
-b int NOT NULL DEFAULT '0',
-c int NOT NULL DEFAULT '0', 
-INDEX idx1(b,c), INDEX idx2(c));
-INSERT INTO t1(id) VALUES (1), (2), (3), (4), (5), (6), (7), (8);
-INSERT INTO t1(b,c) VALUES (3,4), (3,4);
-ANALYZE TABLE t1;
-Table	Op	Msg_type	Msg_text
-test.t1	analyze	status	OK
-SELECT * FROM t1 WHERE b<=3 AND 3<=c;
-id	b	c
-0	3	4
-0	3	4
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t1 WHERE 3 BETWEEN b AND c;
-id	b	c
-0	3	4
-0	3	4
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-EXPLAIN  SELECT * FROM t1 WHERE b<=3 AND 3<=c;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	idx1,idx2	NULL	NULL	NULL	10	11.11	Using where
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`id` AS `id`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c` from `test`.`t1` where ((`test`.`t1`.`b` <= 3) and (3 <= `test`.`t1`.`c`))
-EXPLAIN  SELECT * FROM t1 WHERE 3 BETWEEN b AND c;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	idx1,idx2	NULL	NULL	NULL	10	11.11	Using where
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`id` AS `id`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c` from `test`.`t1` where (3 between `test`.`t1`.`b` and `test`.`t1`.`c`)
-SELECT * FROM t1 WHERE 0 < b OR 0 > c;
-id	b	c
-0	3	4
-0	3	4
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t1 WHERE 0 NOT BETWEEN b AND c;
-id	b	c
-0	3	4
-0	3	4
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-EXPLAIN SELECT * FROM t1 WHERE 0 < b OR 0 > c;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	idx1,idx2	NULL	NULL	NULL	10	55.55	Using where
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`id` AS `id`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c` from `test`.`t1` where ((0 < `test`.`t1`.`b`) or (0 > `test`.`t1`.`c`))
-EXPLAIN SELECT * FROM t1 WHERE 0 NOT BETWEEN b AND c;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	idx1,idx2	NULL	NULL	NULL	10	88.89	Using where
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`id` AS `id`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c` from `test`.`t1` where (0 not between `test`.`t1`.`b` and `test`.`t1`.`c`)
-EXPLAIN FORMAT=tree SELECT * FROM t1 WHERE 0 NOT BETWEEN b AND c;
-EXPLAIN
--> Filter: (0 not between t1.b and t1.c)  (cost=1.25 rows=9)
-    -> Table scan on t1  (cost=1.25 rows=10)
-
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-DROP TABLE t1;
-CREATE TABLE t1 (                                      
-item char(20) NOT NULL default '',                          
-started datetime NOT NULL default '0000-00-00 00:00:00', 
-price decimal(16,3) NOT NULL default '0.000',                 
-PRIMARY KEY (item,started)                     
-) ENGINE=MyISAM, CHARSET utf8mb4;
-INSERT INTO t1 VALUES
-('A1','2005-11-01 08:00:00',1000),
-('A1','2005-11-15 00:00:00',2000),
-('A1','2005-12-12 08:00:00',3000),
-('A2','2005-12-01 08:00:00',1000);
-EXPLAIN SELECT * FROM t1 WHERE item='A1' AND started<='2005-12-01 24:00:00';
-ERROR HY000: Incorrect DATETIME value: '2005-12-01 24:00:00'
-SELECT * FROM t1 WHERE item='A1' AND started<='2005-12-01 24:00:00';
-ERROR HY000: Incorrect DATETIME value: '2005-12-01 24:00:00'
-SELECT * FROM t1 WHERE item='A1' AND started<='2005-12-02 00:00:00';
-item	started	price
-A1	2005-11-01 08:00:00	1000.000
-A1	2005-11-15 00:00:00	2000.000
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-DROP INDEX `PRIMARY` ON t1;
-EXPLAIN SELECT * FROM t1 WHERE item='A1' AND started<='2005-12-01 24:00:00';
-ERROR HY000: Incorrect DATETIME value: '2005-12-01 24:00:00'
-SELECT * FROM t1 WHERE item='A1' AND started<='2005-12-01 24:00:00';
-ERROR HY000: Incorrect DATETIME value: '2005-12-01 24:00:00'
-SELECT * FROM t1 WHERE item='A1' AND started<='2005-12-02 00:00:00';
-item	started	price
-A1	2005-11-01 08:00:00	1000.000
-A1	2005-11-15 00:00:00	2000.000
-DROP TABLE t1;
-
-BUG#32198 "Comparison of DATE with DATETIME still not using indexes correctly"
-
-CREATE TABLE t1 (
-id int(11) NOT NULL auto_increment,
-dateval date default NULL,
-PRIMARY KEY  (id),
-KEY dateval (dateval)
-) AUTO_INCREMENT=173;
-Warnings:
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-INSERT INTO t1 VALUES
-(1,'2007-01-01'),(2,'2007-01-02'),(3,'2007-01-03'),(4,'2007-01-04'),
-(5,'2007-01-05'),(6,'2007-01-06'),(7,'2007-01-07'),(8,'2007-01-08'),
-(9,'2007-01-09'),(10,'2007-01-10'),(11,'2007-01-11');
-This must use range access:
-explain select * from t1 where dateval >= '2007-01-01 00:00:00' and dateval <= '2007-01-02 23:59:59';
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	dateval	dateval	4	NULL	11	11.11	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`id` AS `id`,`test`.`t1`.`dateval` AS `dateval` from `test`.`t1` where ((`test`.`t1`.`dateval` >= DATE'2007-01-01') and (`test`.`t1`.`dateval` <= DATE'2007-01-02'))
-drop table t1;
-CREATE TABLE t1 (
-a varchar(32), index (a)
-) DEFAULT CHARSET=latin1 COLLATE=latin1_bin;
-INSERT INTO t1 VALUES
-('B'), ('A'), ('A'), ('C'), ('B'), ('A'), ('A');
-SELECT a FROM t1 WHERE a='b' OR a='B';
-a
-B
-B
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-EXPLAIN SELECT a FROM t1 WHERE a='b' OR a='B';
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	a	a	35	NULL	7	55.56	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` where ((`test`.`t1`.`a` = 'b') or (`test`.`t1`.`a` = 'B'))
-DROP TABLE t1;
-CREATE TABLE t1 (f1 TINYINT(11) UNSIGNED NOT NULL, PRIMARY KEY (f1));
-Warnings:
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-INSERT INTO t1 VALUES (127),(254),(0),(1),(255);
-SELECT COUNT(*) FROM t1 WHERE f1 < 256;
-COUNT(*)
-5
-SELECT COUNT(*) FROM t1 WHERE f1 < 256.0;
-COUNT(*)
-5
-SELECT COUNT(*) FROM t1 WHERE f1 < 255;
-COUNT(*)
-4
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT COUNT(*) FROM t1 WHERE f1 < -1;
-COUNT(*)
-0
-SELECT COUNT(*) FROM t1 WHERE f1 > -1;
-COUNT(*)
-5
-DROP TABLE t1;
-CREATE TABLE t1 ( f1 TINYINT(11) NOT NULL, PRIMARY KEY (f1));
-Warnings:
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-INSERT INTO t1 VALUES (127),(126),(0),(-128),(-127);
-SELECT COUNT(*) FROM t1 WHERE f1 < 128;
-COUNT(*)
-5
-SELECT COUNT(*) FROM t1 WHERE f1 < 128.0;
-COUNT(*)
-5
-SELECT COUNT(*) FROM t1 WHERE f1 < 127;
-COUNT(*)
-4
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT COUNT(*) FROM t1 WHERE f1 > -129;
-COUNT(*)
-5
-SELECT COUNT(*) FROM t1 WHERE f1 > -129.0;
-COUNT(*)
-5
-SELECT COUNT(*) FROM t1 WHERE f1 > -128;
-COUNT(*)
-4
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-DROP TABLE t1;
-create table t1 (a int);
-insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
-create table t2 (a int, b int, filler char(100));
-insert into t2 select A.a + 10 * (B.a + 10 * C.a), 10, 'filler' from t1 A,
-t1 B, t1 C where A.a < 5;
-insert into t2 select 1000, b, 'filler' from t2;
-alter table t2 add index (a,b);
-Access method can be range/ALL with #rows >= 500.
-Or it can be ref with #rows = 2, only when there is memory limit.
-explain select * from t2 where a=1000 and b<11;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t2	NULL	ref	a	a	5	const	1	33.33	Using index condition
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t2`.`filler` AS `filler` from `test`.`t2` where ((`test`.`t2`.`a` = 1000) and (`test`.`t2`.`b` < 11))
-drop table t1, t2;
-CREATE TABLE t1( a INT, b INT, KEY( a, b ) );
-CREATE TABLE t2( a INT, b INT, KEY( a, b ) );
-CREATE TABLE t3( a INT, b INT, KEY( a, b ) );
-INSERT INTO t1( a, b ) 
-VALUES (0, 1), (1, 2), (1, 4), (2, 3), (5, 0), (9, 7);
-INSERT INTO t2( a, b ) 
-VALUES ( 1, 1), ( 2, 1), ( 3, 1), ( 4, 1), ( 5, 1),
-( 6, 1), ( 7, 1), ( 8, 1), ( 9, 1), (10, 1), 
-(11, 1), (12, 1), (13, 1), (14, 1), (15, 1),
-(16, 1), (17, 1), (18, 1), (19, 1), (20, 1);
-INSERT INTO t2 SELECT a, 2 FROM t2 WHERE b = 1;
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-INSERT INTO t2 SELECT a, 3 FROM t2 WHERE b = 1;
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-INSERT INTO t2 SELECT -1, -1 FROM t2;
-INSERT INTO t2 SELECT -1, -1 FROM t2;
-INSERT INTO t2 SELECT -1, -1 FROM t2;
-INSERT INTO t3
-VALUES (1, 0), (2, 0), (3, 0), (4, 0), (5, 0),
-(6, 0), (7, 0), (8, 0), (9, 0), (10, 0);
-INSERT INTO t3 SELECT * FROM t3 WHERE a = 10;
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-INSERT INTO t3 SELECT * FROM t3 WHERE a = 10;
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t1 WHERE
-3 <= a AND a < 5 OR 
-5 < a AND b = 3 OR
-3 <= a;
-a	b
-5	0
-9	7
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warnings:
-EXPLAIN
-SELECT * FROM t1 WHERE
-3 <= a AND a < 5 OR 
-5 < a AND b = 3 OR
-3 <= a;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	a	a	10	NULL	6	44.03	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where (((3 <= `test`.`t1`.`a`) and (`test`.`t1`.`a` < 5)) or ((`test`.`t1`.`b` = 3) and (5 < `test`.`t1`.`a`)) or (3 <= `test`.`t1`.`a`))
-SELECT * FROM t1 WHERE
-3 <= a AND a < 5 OR 
-5 <= a AND b = 3 OR
-3 <= a;
-a	b
-5	0
-9	7
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warnings:
-EXPLAIN
-SELECT * FROM t1 WHERE
-3 <= a AND a < 5 OR 
-5 <= a AND b = 3 OR
-3 <= a;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	a	a	10	NULL	6	44.03	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where (((3 <= `test`.`t1`.`a`) and (`test`.`t1`.`a` < 5)) or ((`test`.`t1`.`b` = 3) and (5 <= `test`.`t1`.`a`)) or (3 <= `test`.`t1`.`a`))
-SELECT * FROM t1 WHERE
-3 <= a AND a <= 5 OR 
-5 <= a AND b = 3 OR
-3 <= a;
-a	b
-5	0
-9	7
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warnings:
-EXPLAIN
-SELECT * FROM t1 WHERE
-3 <= a AND a <= 5 OR 
-5 <= a AND b = 3 OR
-3 <= a;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	a	a	10	NULL	6	44.03	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where (((3 <= `test`.`t1`.`a`) and (`test`.`t1`.`a` <= 5)) or ((`test`.`t1`.`b` = 3) and (5 <= `test`.`t1`.`a`)) or (3 <= `test`.`t1`.`a`))
-SELECT * FROM t1 WHERE
-3 <= a AND a <= 5 OR 
-3 <= a;
-a	b
-5	0
-9	7
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warnings:
-EXPLAIN
-SELECT * FROM t1 WHERE
-3 <= a AND a <= 5 OR 
-3 <= a;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	a	a	10	NULL	6	40.74	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where (((3 <= `test`.`t1`.`a`) and (`test`.`t1`.`a` <= 5)) or (3 <= `test`.`t1`.`a`))
-SELECT * FROM t2 WHERE
-5 <= a AND a < 10 AND b = 1 OR
-15 <= a AND a < 20 AND b = 3
-OR
-1 <= a AND b = 1;
-a	b
-1	1
-10	1
-11	1
-12	1
-13	1
-14	1
-15	1
-15	3
-16	1
-16	3
-17	1
-17	3
-18	1
-18	3
-19	1
-19	3
-2	1
-20	1
-3	1
-4	1
-5	1
-6	1
-7	1
-8	1
-9	1
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warnings:
-EXPLAIN
-SELECT * FROM t2 WHERE
-5 <= a AND a < 10 AND b = 1 OR
-15 <= a AND a < 20 AND b = 3
-OR
-1 <= a AND b = 1;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t2	NULL	index	a	a	10	NULL	480	5.47	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b` from `test`.`t2` where (((`test`.`t2`.`b` = 1) and (5 <= `test`.`t2`.`a`) and (`test`.`t2`.`a` < 10)) or ((`test`.`t2`.`b` = 3) and (15 <= `test`.`t2`.`a`) and (`test`.`t2`.`a` < 20)) or ((`test`.`t2`.`b` = 1) and (1 <= `test`.`t2`.`a`)))
-SELECT * FROM t2 WHERE
-5 <= a AND a < 10 AND b = 2 OR
-15 <= a AND a < 20 AND b = 3
-OR
-1 <= a AND b = 1;
-a	b
-1	1
-10	1
-11	1
-12	1
-13	1
-14	1
-15	1
-15	3
-16	1
-16	3
-17	1
-17	3
-18	1
-18	3
-19	1
-19	3
-2	1
-20	1
-3	1
-4	1
-5	1
-5	2
-6	1
-6	2
-7	1
-7	2
-8	1
-8	2
-9	1
-9	2
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warnings:
-EXPLAIN
-SELECT * FROM t2 WHERE
-5 <= a AND a < 10 AND b = 2 OR
-15 <= a AND a < 20 AND b = 3
-OR
-1 <= a AND b = 1;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t2	NULL	index	a	a	10	NULL	480	5.47	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b` from `test`.`t2` where (((`test`.`t2`.`b` = 2) and (5 <= `test`.`t2`.`a`) and (`test`.`t2`.`a` < 10)) or ((`test`.`t2`.`b` = 3) and (15 <= `test`.`t2`.`a`) and (`test`.`t2`.`a` < 20)) or ((`test`.`t2`.`b` = 1) and (1 <= `test`.`t2`.`a`)))
-SELECT * FROM t3 WHERE
-5 <= a AND a < 10 AND b = 3 OR 
-a < 5 OR
-a < 10;
-a	b
-1	0
-2	0
-3	0
-4	0
-5	0
-6	0
-7	0
-8	0
-9	0
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warnings:
-EXPLAIN
-SELECT * FROM t3 WHERE
-5 <= a AND a < 10 AND b = 3 OR 
-a < 5 OR
-a < 10;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t3	NULL	index	a	a	10	NULL	13	56.04	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t3`.`a` AS `a`,`test`.`t3`.`b` AS `b` from `test`.`t3` where (((`test`.`t3`.`b` = 3) and (5 <= `test`.`t3`.`a`) and (`test`.`t3`.`a` < 10)) or (`test`.`t3`.`a` < 5) or (`test`.`t3`.`a` < 10))
-DROP TABLE t1, t2, t3;
-#
-# Bug #47123: Endless 100% CPU loop with STRAIGHT_JOIN
-#
-CREATE TABLE t1(a INT, KEY(a));
-INSERT INTO t1 VALUES (1), (NULL);
-SELECT * FROM t1 WHERE a <> NULL and (a <> NULL or a <= NULL);
-a
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-DROP TABLE t1;
-#
-# Bug#47925: regression of range optimizer and date comparison in 5.1.39!
-#
-CREATE TABLE t1 ( a DATE,     KEY ( a ) );
-CREATE TABLE t2 ( a DATETIME, KEY ( a ) );
-# Make optimizer choose range scan
-INSERT INTO t1 VALUES ('2009-09-22'), ('2009-09-22'), ('2009-09-22');
-INSERT INTO t1 VALUES ('2009-09-23'), ('2009-09-23'), ('2009-09-23');
-INSERT INTO t2 VALUES ('2009-09-22 12:00:00'), ('2009-09-22 12:00:00'),
-('2009-09-22 12:00:00');
-INSERT INTO t2 VALUES ('2009-09-23 12:00:00'), ('2009-09-23 12:00:00'),
-('2009-09-23 12:00:00');
-# DATE vs DATE
-EXPLAIN
-SELECT * FROM t1 WHERE a >= '2009/09/23';
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-X	X	X	NULL	index	a	a	X	X	X	33.33	X
-Warnings:
-X	X	X
-X	X	X
-SELECT * FROM t1 WHERE a >= '2009/09/23';
-a
-2009-09-23
-2009-09-23
-2009-09-23
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t1 WHERE a >= '20090923';
-a
-2009-09-23
-2009-09-23
-2009-09-23
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t1 WHERE a >=  20090923;
-a
-2009-09-23
-2009-09-23
-2009-09-23
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t1 WHERE a >= '2009-9-23';
-a
-2009-09-23
-2009-09-23
-2009-09-23
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t1 WHERE a >= '2009.09.23';
-a
-2009-09-23
-2009-09-23
-2009-09-23
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t1 WHERE a >= '2009:09:23';
-a
-2009-09-23
-2009-09-23
-2009-09-23
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-# DATE vs DATETIME
-EXPLAIN
-SELECT * FROM t2 WHERE a >= '2009/09/23';
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-X	X	X	NULL	index	a	a	X	X	X	33.33	X
-Warnings:
-X	X	X
-X	X	X
-SELECT * FROM t2 WHERE a >= '2009/09/23';
-a
-2009-09-23 12:00:00
-2009-09-23 12:00:00
-2009-09-23 12:00:00
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t2 WHERE a >= '2009/09/23';
-a
-2009-09-23 12:00:00
-2009-09-23 12:00:00
-2009-09-23 12:00:00
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t2 WHERE a >= '20090923';
-a
-2009-09-23 12:00:00
-2009-09-23 12:00:00
-2009-09-23 12:00:00
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t2 WHERE a >=  20090923;
-a
-2009-09-23 12:00:00
-2009-09-23 12:00:00
-2009-09-23 12:00:00
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t2 WHERE a >= '2009-9-23';
-a
-2009-09-23 12:00:00
-2009-09-23 12:00:00
-2009-09-23 12:00:00
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t2 WHERE a >= '2009.09.23';
-a
-2009-09-23 12:00:00
-2009-09-23 12:00:00
-2009-09-23 12:00:00
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t2 WHERE a >= '2009:09:23';
-a
-2009-09-23 12:00:00
-2009-09-23 12:00:00
-2009-09-23 12:00:00
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-# DATETIME vs DATETIME
-EXPLAIN
-SELECT * FROM t2 WHERE a >= '2009/09/23 12:00:00';
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-X	X	X	NULL	index	a	a	X	X	X	33.33	X
-Warnings:
-X	X	X
-X	X	X
-SELECT * FROM t2 WHERE a >= '2009/09/23 12:00:00';
-a
-2009-09-23 12:00:00
-2009-09-23 12:00:00
-2009-09-23 12:00:00
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t2 WHERE a >= '20090923120000';
-a
-2009-09-23 12:00:00
-2009-09-23 12:00:00
-2009-09-23 12:00:00
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t2 WHERE a >=  20090923120000;
-a
-2009-09-23 12:00:00
-2009-09-23 12:00:00
-2009-09-23 12:00:00
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t2 WHERE a >= '2009-9-23 12:00:00';
-a
-2009-09-23 12:00:00
-2009-09-23 12:00:00
-2009-09-23 12:00:00
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t2 WHERE a >= '2009.09.23 12:00:00';
-a
-2009-09-23 12:00:00
-2009-09-23 12:00:00
-2009-09-23 12:00:00
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t2 WHERE a >= '2009:09:23 12:00:00';
-a
-2009-09-23 12:00:00
-2009-09-23 12:00:00
-2009-09-23 12:00:00
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-# DATETIME vs DATE
-EXPLAIN
-SELECT * FROM t1 WHERE a >= '2009/09/23 00:00:00';
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-X	X	X	NULL	index	a	a	X	X	X	33.33	X
-Warnings:
-X	X	X
-X	X	X
-SELECT * FROM t1 WHERE a >= '2009/09/23 00:00:00';
-a
-2009-09-23
-2009-09-23
-2009-09-23
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t1 WHERE a >= '2009/09/23 00:00:00';
-a
-2009-09-23
-2009-09-23
-2009-09-23
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t1 WHERE a >= '20090923000000';
-a
-2009-09-23
-2009-09-23
-2009-09-23
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t1 WHERE a >=  20090923000000;
-a
-2009-09-23
-2009-09-23
-2009-09-23
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t1 WHERE a >= '2009-9-23 00:00:00';
-a
-2009-09-23
-2009-09-23
-2009-09-23
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t1 WHERE a >= '2009.09.23 00:00:00';
-a
-2009-09-23
-2009-09-23
-2009-09-23
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t1 WHERE a >= '2009:09:23 00:00:00';
-a
-2009-09-23
-2009-09-23
-2009-09-23
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-# Test of the new get_date_from_str implementation
-# Behavior differs slightly between the trunk and mysql-pe.
-# The former may give errors for the truncated values, while the latter
-# gives warnings. The purpose of this test is not to interfere, and only
-# preserve existing behavior.
-# This case was made obsolete after the changes applied by
-# Bug#28940878 WRONG RESULT WHEN COMPARING DATE[TIME] WITH STRING
-# as we don't fallback anymore to string comparison if the date is invalid.
-SELECT str_to_date('2007-10-00', '%Y-%m-%d') >= '' AND 
-str_to_date('2007-10-00', '%Y-%m-%d') <= '2007/10/20';
-ERROR HY000: Incorrect DATE value: ''
-SELECT str_to_date('2007-20-00', '%Y-%m-%d') >= '2007/10/20' AND 
-str_to_date('2007-20-00', '%Y-%m-%d') <= '';
-ERROR HY000: Incorrect DATE value: ''
-SELECT str_to_date('2007-10-00', '%Y-%m-%d') BETWEEN '' AND '2007/10/20';
-str_to_date('2007-10-00', '%Y-%m-%d') BETWEEN '' AND '2007/10/20'
-1
-Warnings:
-Warning	1292	Truncated incorrect date value: ''
-SELECT str_to_date('2007-20-00', '%Y-%m-%d') BETWEEN '2007/10/20' AND '';
-str_to_date('2007-20-00', '%Y-%m-%d') BETWEEN '2007/10/20' AND ''
-NULL
-Warnings:
-Warning	1411	Incorrect datetime value: '2007-20-00' for function str_to_date
-SELECT str_to_date('', '%Y-%m-%d');
-str_to_date('', '%Y-%m-%d')
-0000-00-00
-DROP TABLE t1, t2;
-#
-# Bug#48459: valgrind errors with query using 'Range checked for each 
-# record'
-#
-CREATE TABLE t1 (
-a INT,
-b CHAR(2),
-c INT,
-d INT,
-KEY ( c ),
-KEY ( d, a, b ( 2 ) ),
-KEY ( b ( 1 ) )
-);
-INSERT INTO t1 VALUES ( NULL, 'a', 1, 2 ), ( NULL, 'a', 1, 2 ),
-( 1,    'a', 1, 2 ), ( 1,    'a', 1, 2 );
-CREATE TABLE t2 (
-a INT,
-c INT,
-e INT,
-KEY ( e )
-);
-INSERT INTO t2 VALUES ( 1, 1, NULL ), ( 1, 1, NULL );
-# Should not give Valgrind warnings
-SELECT 1
-FROM t1, t2
-WHERE t1.d <> '1' AND t1.b > '1'
-AND t1.a = t2.a AND t1.c = t2.c;
-1
-1
-1
-1
-1
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-DROP TABLE t1, t2;
-#
-# Bug #48665: sql-bench's insert test fails due to wrong result
-#
-CREATE TABLE t1 (a INT, b INT, PRIMARY KEY (a));
-INSERT INTO t1 VALUES (0,0), (1,1);
-EXPLAIN 
-SELECT * FROM t1 FORCE INDEX (PRIMARY) 
-WHERE (a>=1 AND a<=2) OR (a>=4 AND a<=5) OR (a>=0 AND a <=10);
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-@	@	@	NULL	ALL	@	@	@	@	@	57.81	@
-Warnings:
-@	@	@
-@	@	@
-# Should return 2 rows
-SELECT * FROM t1 FORCE INDEX (PRIMARY) 
-WHERE (a>=1 AND a<=2) OR (a>=4 AND a<=5) OR (a>=0 AND a <=10);
-a	b
-0	0
-1	1
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-DROP TABLE t1;
-#
-# Bug #54802: 'NOT BETWEEN' evaluation is incorrect
-#
-CREATE TABLE t1 (c_key INT, c_notkey INT, KEY(c_key));
-INSERT INTO t1 VALUES (1, 1), (2, 2), (3, 3);
-EXPLAIN SELECT * FROM t1 WHERE 2 NOT BETWEEN c_notkey AND c_key;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	c_key	NULL	NULL	NULL	3	66.67	Using where
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`c_key` AS `c_key`,`test`.`t1`.`c_notkey` AS `c_notkey` from `test`.`t1` where (2 not between `test`.`t1`.`c_notkey` and `test`.`t1`.`c_key`)
-SELECT * FROM t1 WHERE 2 NOT BETWEEN c_notkey AND c_key;
-c_key	c_notkey
-1	1
-3	3
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-DROP TABLE t1;
-#
-# Bug #57030: 'BETWEEN' evaluation is incorrect
-#
-CREATE TABLE t1(pk INT PRIMARY KEY, i4 INT);
-CREATE UNIQUE INDEX i4_uq ON t1(i4);
-INSERT INTO t1 VALUES (1,10), (2,20), (3,30);
-EXPLAIN
-SELECT * FROM t1 WHERE i4 BETWEEN 10 AND 10;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	const	i4_uq	i4_uq	5	const	1	100.00	Using index
-Warnings:
-Note	1003	/* select#1 */ select '1' AS `pk`,'10' AS `i4` from `test`.`t1` where true
-SELECT * FROM t1 WHERE i4 BETWEEN 10 AND 10;
-pk	i4
-1	10
-EXPLAIN
-SELECT * FROM t1 WHERE 10 BETWEEN i4 AND i4;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	const	i4_uq	i4_uq	5	const	1	100.00	Using index
-Warnings:
-Note	1003	/* select#1 */ select '1' AS `pk`,'10' AS `i4` from `test`.`t1` where true
-SELECT * FROM t1 WHERE 10 BETWEEN i4 AND i4;
-pk	i4
-1	10
-EXPLAIN
-SELECT * FROM t1 WHERE 10 BETWEEN 10 AND i4;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	i4_uq	i4_uq	5	NULL	3	33.33	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`pk` AS `pk`,`test`.`t1`.`i4` AS `i4` from `test`.`t1` where (10 between 10 and `test`.`t1`.`i4`)
-SELECT * FROM t1 WHERE 10 BETWEEN 10 AND i4;
-pk	i4
-1	10
-2	20
-3	30
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-EXPLAIN
-SELECT * FROM t1 WHERE 10 BETWEEN i4 AND 10;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	i4_uq	i4_uq	5	NULL	3	33.33	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`pk` AS `pk`,`test`.`t1`.`i4` AS `i4` from `test`.`t1` where (10 between `test`.`t1`.`i4` and 10)
-SELECT * FROM t1 WHERE 10 BETWEEN i4 AND 10;
-pk	i4
-1	10
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-EXPLAIN
-SELECT * FROM t1 WHERE 10 BETWEEN 10 AND 10;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	NULL	i4_uq	5	NULL	3	100.00	Using index
-Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`pk` AS `pk`,`test`.`t1`.`i4` AS `i4` from `test`.`t1`
-SELECT * FROM t1 WHERE 10 BETWEEN 10 AND 10;
-pk	i4
-1	10
-2	20
-3	30
-EXPLAIN
-SELECT * FROM t1 WHERE 10 BETWEEN 11 AND 11;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE
-Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`pk` AS `pk`,`test`.`t1`.`i4` AS `i4` from `test`.`t1` where false
-SELECT * FROM t1 WHERE 10 BETWEEN 11 AND 11;
-pk	i4
-EXPLAIN
-SELECT * FROM t1 WHERE 10 BETWEEN 100 AND 0;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE
-Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`pk` AS `pk`,`test`.`t1`.`i4` AS `i4` from `test`.`t1` where false
-SELECT * FROM t1 WHERE 10 BETWEEN 100 AND 0;
-pk	i4
-EXPLAIN
-SELECT * FROM t1 WHERE i4 BETWEEN 100 AND 0;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	i4_uq	i4_uq	5	NULL	3	33.33	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`pk` AS `pk`,`test`.`t1`.`i4` AS `i4` from `test`.`t1` where (`test`.`t1`.`i4` between 100 and 0)
-SELECT * FROM t1 WHERE i4 BETWEEN 100 AND 0;
-pk	i4
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-EXPLAIN
-SELECT * FROM t1 WHERE i4 BETWEEN 10 AND 99999999999999999;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	i4_uq	i4_uq	5	NULL	3	33.33	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`pk` AS `pk`,`test`.`t1`.`i4` AS `i4` from `test`.`t1` where (`test`.`t1`.`i4` between 10 and 99999999999999999)
-SELECT * FROM t1 WHERE i4 BETWEEN 10 AND 99999999999999999;
-pk	i4
-1	10
-2	20
-3	30
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-EXPLAIN
-SELECT * FROM t1 WHERE i4 BETWEEN 999999999999999 AND 30;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	i4_uq	i4_uq	5	NULL	3	33.33	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`pk` AS `pk`,`test`.`t1`.`i4` AS `i4` from `test`.`t1` where (`test`.`t1`.`i4` between 999999999999999 and 30)
-SELECT * FROM t1 WHERE i4 BETWEEN 999999999999999 AND 30;
-pk	i4
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-EXPLAIN
-SELECT * FROM t1 WHERE i4 BETWEEN 10 AND '20';
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	i4_uq	i4_uq	5	NULL	3	33.33	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`pk` AS `pk`,`test`.`t1`.`i4` AS `i4` from `test`.`t1` where (`test`.`t1`.`i4` between 10 and '20')
-SELECT * FROM t1 WHERE i4 BETWEEN 10 AND '20';
-pk	i4
-1	10
-2	20
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-EXPLAIN
-SELECT * FROM t1, t1 as t2 WHERE t2.pk BETWEEN t1.i4 AND t1.i4;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	i4_uq	i4_uq	5	NULL	3	100.00	Using where; Using index
-1	SIMPLE	t2	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.i4	1	100.00	Using where
-Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`pk` AS `pk`,`test`.`t1`.`i4` AS `i4`,`test`.`t2`.`pk` AS `pk`,`test`.`t2`.`i4` AS `i4` from `test`.`t1` join `test`.`t1` `t2` where (`test`.`t2`.`pk` between `test`.`t1`.`i4` and `test`.`t1`.`i4`)
-EXPLAIN FORMAT=tree
-SELECT * FROM t1, t1 as t2 WHERE t2.pk BETWEEN t1.i4 AND t1.i4;
-EXPLAIN
--> Nested loop inner join  (cost=1.60 rows=3)
-    -> Filter: (t1.i4 is not null)  (cost=0.55 rows=3)
-        -> Index scan on t1 using i4_uq  (cost=0.55 rows=3)
-    -> Filter: (t2.pk between t1.i4 and t1.i4)  (cost=0.28 rows=1)
-        -> Single-row index lookup on t2 using PRIMARY (pk=t1.i4)  (cost=0.28 rows=1)
-
-SELECT * FROM t1, t1 as t2 WHERE t2.pk BETWEEN t1.i4 AND t1.i4;
-pk	i4	pk	i4
-EXPLAIN
-SELECT * FROM t1, t1 as t2 WHERE t1.i4 BETWEEN t2.pk AND t2.pk;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	i4_uq	i4_uq	5	NULL	3	100.00	Using where; Using index
-1	SIMPLE	t2	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.i4	1	100.00	Using where
-Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`pk` AS `pk`,`test`.`t1`.`i4` AS `i4`,`test`.`t2`.`pk` AS `pk`,`test`.`t2`.`i4` AS `i4` from `test`.`t1` join `test`.`t1` `t2` where (`test`.`t1`.`i4` between `test`.`t2`.`pk` and `test`.`t2`.`pk`)
-SELECT * FROM t1, t1 as t2 WHERE t1.i4 BETWEEN t2.pk AND t2.pk;
-pk	i4	pk	i4
-DROP TABLE t1;
-#
-# BUG#13519696 - 62940: SELECT RESULTS VARY WITH VERSION AND
-# WITH/WITHOUT INDEX RANGE SCAN
-#
-create table t1 (id int unsigned not null auto_increment primary key);
-insert into t1 values (null);
-insert into t1 select null from t1;
-insert into t1 select null from t1;
-insert into t1 select null from t1;
-insert into t1 select null from t1;
-insert into t1 select null from t1;
-insert into t1 select null from t1;
-insert into t1 select null from t1;
-insert into t1 select null from t1;
-create table t2 (
-id int unsigned not null auto_increment,
-val decimal(5,3) not null,
-primary key (id,val),
-unique key (val,id),
-unique key (id));
-insert into t2 select null,id*0.0009 from t1;
-select count(val) from t2 ignore index (val) where val > 0.1155;
-count(val)
-185
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-select count(val) from t2 force index (val)  where val > 0.1155;
-count(val)
-185
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-drop table t2, t1;
-#
-# BUG#13453382 - REGRESSION SINCE 5.1.39, RANGE OPTIMIZER WRONG
-# RESULTS WITH DECIMAL CONVERSION
-#
-create table t1 (a int,b int,c int,primary key (a,c));
-insert into t1 values (1,1,2),(1,1,3),(1,1,4);
-select convert(3, signed integer) > 2.9;
-convert(3, signed integer) > 2.9
-1
-select * from t1 force  index (primary) where a=1 and c>= 2.9;
-a	b	c
-1	1	3
-1	1	4
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-select * from t1 ignore index (primary) where a=1 and c>= 2.9;
-a	b	c
-1	1	3
-1	1	4
-select * from t1 force  index (primary) where a=1 and c> 2.9;
-a	b	c
-1	1	3
-1	1	4
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-select * from t1 ignore index (primary) where a=1 and c> 2.9;
-a	b	c
-1	1	3
-1	1	4
-drop table t1;
-#
-# BUG#13463488 - 63437: CHAR & BETWEEN WITH INDEX RETURNS WRONG
-# RESULT AFTER MYSQL 5.1.
-#
-CREATE TABLE t1(
-F1 CHAR(5) NOT NULL,
-F2 CHAR(5) NOT NULL,
-F3 CHAR(5) NOT NULL,
-PRIMARY KEY(F1),
-INDEX IDX_F2(F2)
-) COLLATE latin1_swedish_ci;
-INSERT INTO t1 VALUES
-('A','A','A'),('AA','AA','AA'),('AAA','AAA','AAA'),
-('AAAA','AAAA','AAAA'),('AAAAA','AAAAA','AAAAA');
-SELECT * FROM t1 WHERE F1 = 'A    ';
-F1	F2	F3
-A	A	A
-SELECT * FROM t1 IGNORE INDEX(PRIMARY) WHERE F1 = 'A    ';
-F1	F2	F3
-A	A	A
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t1 WHERE F1 >= 'A    ';
-F1	F2	F3
-A	A	A
-AA	AA	AA
-AAA	AAA	AAA
-AAAA	AAAA	AAAA
-AAAAA	AAAAA	AAAAA
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t1 WHERE F1 > 'A    ';
-F1	F2	F3
-AA	AA	AA
-AAA	AAA	AAA
-AAAA	AAAA	AAAA
-AAAAA	AAAAA	AAAAA
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t1 WHERE F1 BETWEEN 'A    ' AND 'AAAAA';
-F1	F2	F3
-A	A	A
-AA	AA	AA
-AAA	AAA	AAA
-AAAA	AAAA	AAAA
-AAAAA	AAAAA	AAAAA
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t1 WHERE F2 BETWEEN 'A    ' AND 'AAAAA';
-F1	F2	F3
-A	A	A
-AA	AA	AA
-AAA	AAA	AAA
-AAAA	AAAA	AAAA
-AAAAA	AAAAA	AAAAA
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t1 WHERE F3 BETWEEN 'A    ' AND 'AAAAA';
-F1	F2	F3
-A	A	A
-AA	AA	AA
-AAA	AAA	AAA
-AAAA	AAAA	AAAA
-AAAAA	AAAAA	AAAAA
-SELECT * FROM t1 IGNORE INDEX(PRIMARY) WHERE F1 BETWEEN 'A    ' AND
-'AAAAA';
-F1	F2	F3
-A	A	A
-AA	AA	AA
-AAA	AAA	AAA
-AAAA	AAAA	AAAA
-AAAAA	AAAAA	AAAAA
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-DROP TABLE t1;
-End of 5.1 tests
-CREATE TABLE t1 (c1 DECIMAL(10,0),INDEX(c1));
-INSERT INTO t1 VALUES (1),(2),(3);
-SELECT c1 FROM t1 WHERE c1 >= 'A' GROUP BY 1;
-c1
-1
-2
-3
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: 'A'
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-DROP TABLE t1;
-create table t1 (a int,b int,key (b),key (a),key (b,a));
-insert into t1(a,b) values (1,2),(3,4),(5,6),(7,8);
-create table t2 (c int);
-insert into t2(c) values (1),(5),(6),(7),(8);
-select 1 from (select c from t1,t2 where b >= 1 and a <=> c group by 1 limit 1) as d1;
-1
-1
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-drop table t1, t2;
-#
-# Bug #26106: Wrong plan may be chosen when there are several possible
-# range and ref accesses
-#
-# Note: The fix for this bug has been reverted. The code will no longer
-# select the optimal plan for the two following test queries. This is
-# not due to a bug but due to minor differences in range estimates
-# produced by the storage engine.
-CREATE TABLE t1( 
-a INT,
-b INT,
-KEY k ( a ),
-KEY l ( a, b )
-);
-INSERT INTO t1(a) VALUES (1);
-INSERT INTO t1 
-VALUES (2,3),(2,3),(2,3),(2,3),(2,3),(2,3),(2,3),(2,3),(2,3),(2,3);
-INSERT INTO t1 SELECT 3, 4 FROM t1 WHERE a = 2 AND b = 3;
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-INSERT INTO t1 SELECT 4, 1 FROM t1 WHERE a = 2 AND b = 3;
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-ANALYZE TABLE t1;
-Table	Op	Msg_type	Msg_text
-test.t1	analyze	status	OK
-INSERT INTO t1 VALUES (1, 2);
-INSERT INTO t1 SELECT a, b FROM t1 WHERE a=1 AND b=2;
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-INSERT INTO t1 SELECT a, b FROM t1 WHERE a=1 AND b=2;
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-INSERT INTO t1 SELECT a, b FROM t1 WHERE a=1 AND b=2;
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-INSERT INTO t1 SELECT a, b FROM t1 WHERE a=1 AND b=2;
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-INSERT INTO t1 SELECT a, b FROM t1 WHERE a=1 AND b=2;
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-INSERT INTO t1 SELECT a, b FROM t1 WHERE a=1 AND b=2;
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-INSERT INTO t1 SELECT a, b FROM t1 WHERE a=1 AND b=2;
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-# This must use range over index l, not k.
-# Update: Due to patch being reverted and minor differences in 
-#         range estimates k is selected.
-EXPLAIN SELECT * FROM t1 WHERE a = 1 AND b >= 2;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ref	k,l	k	5	const	10	33.33	Using where
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where ((`test`.`t1`.`a` = 1) and (`test`.`t1`.`b` >= 2))
-CREATE TABLE t2( 
-a INT, 
-b INT, 
-c INT,
-KEY k ( a ), 
-KEY l ( a, b ),
-KEY m ( b ), 
-KEY n ( a, c )
-);
-INSERT INTO t2(a) VALUES (1);
-INSERT INTO t2 
-VALUES (2,3,3),(2,3,3),(2,3,3),(2,3,3),(2,3,3),
-(2,3,3),(2,3,3),(2,3,3),(2,3,3),(2,3,3);
-INSERT INTO t2 SELECT 3, 4, 4 FROM t2 WHERE a = 2 AND b = 3;
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-INSERT INTO t2 SELECT 4, 1, 1 FROM t2 WHERE a = 2 AND b = 3;
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-ANALYZE TABLE t2;
-Table	Op	Msg_type	Msg_text
-test.t2	analyze	status	OK
-INSERT INTO t2 VALUES (1, 2, 2);
-INSERT INTO t2 SELECT a, b, c FROM t2 WHERE a=1 AND b=2;
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-INSERT INTO t2 SELECT a, b, c FROM t2 WHERE a=1 AND b=2;
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-INSERT INTO t2 SELECT a, b, c FROM t2 WHERE a=1 AND b=2;
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-INSERT INTO t2 SELECT a, b, c FROM t2 WHERE a=1 AND b=2;
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-INSERT INTO t2 SELECT a, b, c FROM t2 WHERE a=1 AND b=2;
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-INSERT INTO t2 SELECT a, b, c FROM t2 WHERE a=1 AND b=2;
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-INSERT INTO t2 VALUES (1, 1, 2);
-# This must use range over index l, not n.
-# Update: Due to patch being reverted and minor differences in 
-#         range estimates k is selected.
-EXPLAIN SELECT * FROM t2 WHERE a = 1 AND b >= 2 AND c >= 2;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t2	NULL	ref	k,l,m,n	l	5	const	8	11.11	Using index condition; Using where
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t2`.`c` AS `c` from `test`.`t2` where ((`test`.`t2`.`a` = 1) and (`test`.`t2`.`b` >= 2) and (`test`.`t2`.`c` >= 2))
-DROP TABLE t1, t2;
-#
-# BUG#11765831: 'RANGE ACCESS' MAY INCORRECTLY FILTER 
-#               AWAY QUALIFYING ROWS
-#
-CREATE TABLE t10(
-K INT NOT NULL AUTO_INCREMENT,
-I INT, J INT,
-PRIMARY KEY(K),
-KEY(I,J)
-);
-INSERT INTO t10(I,J) VALUES (6,1),(6,2),(6,3),(6,4),(6,5),
-(6,6),(6,7),(6,8),(6,9),(6,0);
-CREATE TABLE t100 LIKE t10;
-INSERT INTO t100(I,J) SELECT X.I, X.K+(10*Y.K) FROM t10 AS X,t10 AS Y;
-INSERT INTO t100(I,J) VALUES(8,26);
-
-EXPLAIN SELECT * FROM t100 WHERE I <> 6 OR (I <> 8 AND J = 5);
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t100	NULL	index	I	I	10	NULL	101	90.90	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t100`.`K` AS `K`,`test`.`t100`.`I` AS `I`,`test`.`t100`.`J` AS `J` from `test`.`t100` where ((`test`.`t100`.`I` <> 6) or ((`test`.`t100`.`J` = 5) and (`test`.`t100`.`I` <> 8)))
-
-SELECT * FROM t100 WHERE I <> 6 OR (I <> 8 AND J = 5);
-K	I	J
-128	8	26
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-DROP TABLE t10,t100;
-#
-# BUG#12698916 - JOIN QUERY GIVES WRONG RESULT AT 2ND EXEC. OR
-# AFTER FLUSH TABLES [-INT VS NULL]
-#
-CREATE TABLE t1 (col_int INT, pk INT) ENGINE=InnoDB STATS_PERSISTENT=0;
-INSERT INTO t1 VALUES (-100,1),(1,6);
-CREATE TABLE t2 (
-col_int_key INT,
-col_varchar VARCHAR(100) NOT NULL DEFAULT "DEFAULT",
-pk INT NOT NULL,
-PRIMARY KEY (pk),
-KEY (col_int_key)
-) ENGINE=InnoDB STATS_PERSISTENT=0;
-INSERT INTO t2 VALUES
-(1,"GOOD",1),(100,"",2),(200,"",3),(300,"",4),(400,"",5),(500,"",8);
-EXPLAIN SELECT t1.*,t2.* FROM t1 straight_join t2
-ON t2.col_int_key = t1.col_int WHERE t2.pk < t1.pk;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	#	#	Using where
-1	SIMPLE	t2	NULL	ref	PRIMARY,col_int_key	col_int_key	5	test.t1.col_int	#	#	Using index condition
-Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`col_int` AS `col_int`,`test`.`t1`.`pk` AS `pk`,`test`.`t2`.`col_int_key` AS `col_int_key`,`test`.`t2`.`col_varchar` AS `col_varchar`,`test`.`t2`.`pk` AS `pk` from `test`.`t1` straight_join `test`.`t2` where ((`test`.`t2`.`col_int_key` = `test`.`t1`.`col_int`) and (`test`.`t2`.`pk` < `test`.`t1`.`pk`))
-EXPLAIN FORMAT=tree SELECT t1.*,t2.* FROM t1 straight_join t2
-ON t2.col_int_key = t1.col_int WHERE t2.pk < t1.pk;
-EXPLAIN
--> Nested loop inner join  (cost=1.55 rows=2)
-    -> Filter: (t1.col_int is not null)  (cost=0.45 rows=2)
-        -> Table scan on t1  (cost=0.45 rows=2)
-    -> Index lookup on t2 using col_int_key (col_int_key=t1.col_int), with index condition: (t2.pk < t1.pk)  (cost=0.27 rows=1)
-
-SELECT t1.*,t2.* FROM t1 straight_join t2
-ON t2.col_int_key = t1.col_int WHERE t2.pk < t1.pk;
-col_int	pk	col_int_key	col_varchar	pk
-1	6	1	GOOD	1
-# need FLUSH so that InnoDB statistics change and thus plan changes
-FLUSH TABLES;
-EXPLAIN SELECT t1.*,t2.* FROM t1 straight_join t2
-ON t2.col_int_key = t1.col_int WHERE t2.pk < t1.pk;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	#	#	NULL
-1	SIMPLE	t2	NULL	ALL	PRIMARY,col_int_key	NULL	NULL	NULL	#	#	Using where; Using join buffer (hash join)
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`col_int` AS `col_int`,`test`.`t1`.`pk` AS `pk`,`test`.`t2`.`col_int_key` AS `col_int_key`,`test`.`t2`.`col_varchar` AS `col_varchar`,`test`.`t2`.`pk` AS `pk` from `test`.`t1` straight_join `test`.`t2` where ((`test`.`t2`.`col_int_key` = `test`.`t1`.`col_int`) and (`test`.`t2`.`pk` < `test`.`t1`.`pk`))
-EXPLAIN FORMAT=tree SELECT t1.*,t2.* FROM t1 straight_join t2
-ON t2.col_int_key = t1.col_int WHERE t2.pk < t1.pk;
-EXPLAIN
--> Filter: (t2.pk < t1.pk)  (cost=1.90 rows=4)
-    -> Inner hash join (t2.col_int_key = t1.col_int)  (cost=1.90 rows=4)
-        -> Table scan on t2  (cost=0.22 rows=6)
-        -> Hash
-            -> Table scan on t1  (cost=0.45 rows=2)
-
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT t1.*,t2.* FROM t1 straight_join t2
-ON t2.col_int_key = t1.col_int WHERE t2.pk < t1.pk;
-col_int	pk	col_int_key	col_varchar	pk
-1	6	1	GOOD	1
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-DROP TABLE t1,t2;
-#
-# Bug#12694872 - 
-# VALGRIND: 18,816 BYTES IN 196 BLOCKS ARE DEFINITELY LOST IN UNIQUE::GET
-#
-CREATE TABLE t1 (
-pk INTEGER AUTO_INCREMENT,
-col_int_nokey INTEGER NOT NULL,
-col_int_key INTEGER NOT NULL,
-col_date_key DATE NOT NULL,
-col_varchar_key VARCHAR(1) NOT NULL,
-col_varchar_nokey VARCHAR(1) NOT NULL,
-PRIMARY KEY (pk),
-KEY (col_int_key),
-KEY (col_date_key),
-KEY (col_varchar_key, col_int_key)
-);
-INSERT INTO t1 (
-col_int_key,
-col_int_nokey,
-col_date_key,
-col_varchar_key,
-col_varchar_nokey
-) VALUES 
-(0, 4, '2011-08-25', 'j', 'j'),
-(8, 6, '2004-09-18', 'v', 'v'),
-(1, 3, '2009-12-01', 'c', 'c'),
-(8, 5, '2004-12-17', 'm', 'm'),
-(9, 3, '2000-03-14', 'd', 'd'),
-(6, 2, '2006-05-25', 'y', 'y'),
-(1, 9, '2008-01-23', 't', 't'),
-(6, 3, '2007-06-18', 'd', 'd'),
-(2, 8, '2002-10-13', 's', 's'),
-(4, 1, '1900-01-01', 'r', 'r'),
-(8, 8, '1959-04-25', 'm', 'm'),
-(4, 8, '2006-03-09', 'b', 'b'),
-(4, 5, '2001-06-05', 'x', 'x'),
-(7, 7, '2006-05-28', 'g', 'g'),
-(4, 5, '2001-04-19', 'p', 'p'),
-(1, 1, '1900-01-01', 'q', 'q'),
-(9, 6, '2004-08-20', 'w', 'w'),
-(4, 2, '2004-10-10', 'd', 'd'),
-(8, 9, '2000-04-02', 'e', 'e')
-;
-SET UNIQUE_CHECKS = 0;
-SET FOREIGN_KEY_CHECKS = 0;
-SELECT table2.col_date_key AS field1,
-CONCAT ( table2.col_varchar_nokey, table1.col_varchar_nokey ) AS field2
-FROM ( t1 AS table1 INNER JOIN t1 AS table2
-ON (( table2.pk <> table1.pk ) AND
-( table2.pk >= table1.col_int_nokey ) ) )
-WHERE ( table1.pk > 226 AND
-table1.pk < ( 226 + 102 ) OR
-( table1.col_int_key > 226 AND
-table1.col_int_key < ( 226 + 36 ) OR
-( table1.col_varchar_key <= 'h' OR
-table1.col_int_key > 226 AND
-table1.col_int_key < ( 226 + 227 ) )
-) 
-)
-;
-field1	field2
-1900-01-01	qb
-1900-01-01	qc
-1900-01-01	qd
-1900-01-01	qd
-1900-01-01	qd
-1900-01-01	qe
-1900-01-01	qg
-1900-01-01	rb
-1900-01-01	rc
-1900-01-01	rd
-1900-01-01	rd
-1900-01-01	rd
-1900-01-01	re
-1900-01-01	rg
-1959-04-25	mb
-1959-04-25	mc
-1959-04-25	md
-1959-04-25	md
-1959-04-25	md
-1959-04-25	me
-1959-04-25	mg
-2000-03-14	dc
-2000-03-14	dd
-2000-03-14	dd
-2000-04-02	eb
-2000-04-02	ec
-2000-04-02	ed
-2000-04-02	ed
-2000-04-02	ed
-2000-04-02	eg
-2001-04-19	pb
-2001-04-19	pc
-2001-04-19	pd
-2001-04-19	pd
-2001-04-19	pd
-2001-04-19	pe
-2001-04-19	pg
-2001-06-05	xb
-2001-06-05	xc
-2001-06-05	xd
-2001-06-05	xd
-2001-06-05	xd
-2001-06-05	xe
-2001-06-05	xg
-2002-10-13	sb
-2002-10-13	sc
-2002-10-13	sd
-2002-10-13	sd
-2002-10-13	sd
-2002-10-13	se
-2002-10-13	sg
-2004-08-20	wb
-2004-08-20	wc
-2004-08-20	wd
-2004-08-20	wd
-2004-08-20	wd
-2004-08-20	we
-2004-08-20	wg
-2004-09-18	vd
-2004-10-10	db
-2004-10-10	dc
-2004-10-10	dd
-2004-10-10	dd
-2004-10-10	de
-2004-10-10	dg
-2004-12-17	mc
-2004-12-17	md
-2004-12-17	md
-2004-12-17	md
-2006-03-09	bc
-2006-03-09	bd
-2006-03-09	bd
-2006-03-09	bd
-2006-03-09	be
-2006-03-09	bg
-2006-05-25	yc
-2006-05-25	yd
-2006-05-25	yd
-2006-05-25	yd
-2006-05-28	gb
-2006-05-28	gc
-2006-05-28	gd
-2006-05-28	gd
-2006-05-28	gd
-2006-05-28	ge
-2007-06-18	db
-2007-06-18	dc
-2007-06-18	dd
-2007-06-18	dd
-2007-06-18	dg
-2008-01-23	tc
-2008-01-23	td
-2008-01-23	td
-2008-01-23	td
-2008-01-23	tg
-2009-12-01	cd
-2009-12-01	cd
-2009-12-01	cd
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warnings:
-SET FOREIGN_KEY_CHECKS = 1;
-SET UNIQUE_CHECKS = 1;
-CREATE TABLE t2 SELECT table2.col_date_key AS field1,
-CONCAT ( table2.col_varchar_nokey, table1.col_varchar_nokey ) AS field2
-FROM ( t1 AS table1 INNER JOIN t1 AS table2
-ON (( table2.pk <> table1.pk ) AND
-( table2.pk >= table1.col_int_nokey ) ) )
-WHERE ( table1.pk > 226 AND
-table1.pk < ( 226 + 102 ) OR
-( table1.col_int_key > 226 AND
-table1.col_int_key < ( 226 + 36 ) OR
-( table1.col_varchar_key <= 'h' OR
-table1.col_int_key > 226 AND
-table1.col_int_key < ( 226 + 227 ) )
-) 
-)
-;
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t2
-WHERE (field1, field2) IN (SELECT table2.col_date_key AS field1,
-CONCAT ( table2.col_varchar_nokey, table1.col_varchar_nokey ) AS field2
-FROM ( t1 AS table1 INNER JOIN t1 AS table2
-ON (( table2.pk <> table1.pk ) AND
-( table2.pk >= table1.col_int_nokey ) ) )
-WHERE ( table1.pk > 226 AND
-table1.pk < ( 226 + 102 ) OR
-( table1.col_int_key > 226 AND
-table1.col_int_key < ( 226 + 36 ) OR
-( table1.col_varchar_key <= 'h' OR
-table1.col_int_key > 226 AND
-table1.col_int_key < ( 226 + 227 ) )
-) 
-)
-);
-field1	field2
-1900-01-01	qb
-1900-01-01	qc
-1900-01-01	qd
-1900-01-01	qd
-1900-01-01	qd
-1900-01-01	qe
-1900-01-01	qg
-1900-01-01	rb
-1900-01-01	rc
-1900-01-01	rd
-1900-01-01	rd
-1900-01-01	rd
-1900-01-01	re
-1900-01-01	rg
-1959-04-25	mb
-1959-04-25	mc
-1959-04-25	md
-1959-04-25	md
-1959-04-25	md
-1959-04-25	me
-1959-04-25	mg
-2000-03-14	dc
-2000-03-14	dd
-2000-03-14	dd
-2000-04-02	eb
-2000-04-02	ec
-2000-04-02	ed
-2000-04-02	ed
-2000-04-02	ed
-2000-04-02	eg
-2001-04-19	pb
-2001-04-19	pc
-2001-04-19	pd
-2001-04-19	pd
-2001-04-19	pd
-2001-04-19	pe
-2001-04-19	pg
-2001-06-05	xb
-2001-06-05	xc
-2001-06-05	xd
-2001-06-05	xd
-2001-06-05	xd
-2001-06-05	xe
-2001-06-05	xg
-2002-10-13	sb
-2002-10-13	sc
-2002-10-13	sd
-2002-10-13	sd
-2002-10-13	sd
-2002-10-13	se
-2002-10-13	sg
-2004-08-20	wb
-2004-08-20	wc
-2004-08-20	wd
-2004-08-20	wd
-2004-08-20	wd
-2004-08-20	we
-2004-08-20	wg
-2004-09-18	vd
-2004-10-10	db
-2004-10-10	dc
-2004-10-10	dd
-2004-10-10	dd
-2004-10-10	de
-2004-10-10	dg
-2004-12-17	mc
-2004-12-17	md
-2004-12-17	md
-2004-12-17	md
-2006-03-09	bc
-2006-03-09	bd
-2006-03-09	bd
-2006-03-09	bd
-2006-03-09	be
-2006-03-09	bg
-2006-05-25	yc
-2006-05-25	yd
-2006-05-25	yd
-2006-05-25	yd
-2006-05-28	gb
-2006-05-28	gc
-2006-05-28	gd
-2006-05-28	gd
-2006-05-28	gd
-2006-05-28	ge
-2007-06-18	db
-2007-06-18	dc
-2007-06-18	dd
-2007-06-18	dd
-2007-06-18	dg
-2008-01-23	tc
-2008-01-23	td
-2008-01-23	td
-2008-01-23	td
-2008-01-23	tg
-2009-12-01	cd
-2009-12-01	cd
-2009-12-01	cd
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warnings:
-DROP TABLE t1, t2;
-#
-# BUG#12912171 - ASSERTION FAILED: QUICK->HEAD->READ_SET ==
-# SAVE_READ_SET
-#
-CREATE TABLE t1 (
-a INT,
-b INT,
-c INT,
-PRIMARY KEY (c,a), KEY (a),KEY (a)
-) ENGINE=INNODB PARTITION BY KEY () PARTITIONS 2;
-Warnings:
-Warning	1831	Duplicate index 'a_2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-INSERT INTO t1 VALUES (1,5,1),(2,4,1),(3,3,1),(4,2,1),(5,1,1);
-UPDATE t1 SET b = 0, c=1 WHERE a <=>0;
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t1;
-a	b	c
-1	5	1
-2	4	1
-3	3	1
-4	2	1
-5	1	1
-DROP TABLE t1;
-#
-# BUG#13256446 - ASSERTION QUICK->HEAD->READ_SET ==
-# SAVE_READ_SET' FAILED IN OPT_RANGE.CC:1606 
-#
-CREATE TABLE t1 (
-f1 INT AUTO_INCREMENT,
-f2 INT,
-f3 INT,
-f4 INT,
-PRIMARY KEY (f1),KEY(f2)
-) ENGINE=INNODB;
-CREATE ALGORITHM=MERGE VIEW v2 AS SELECT f1,f2,f3,f4 FROM t1 WHERE f2=103;
-INSERT INTO t1 VALUES (154,0,NULL,0),(0,NULL,9,0),
-(NULL,102,NULL,3),(0,3,NULL,0), (9,0,NULL,0),(0,9,NULL,157);
-SELECT * FROM v2;
-f1	f2	f3	f4
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-UPDATE v2 SET f4=0, f2=NULL, f1=NULL WHERE f1 > 16 ORDER BY f1;
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM v2;
-f1	f2	f3	f4
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-DROP TABLE t1;
-DROP VIEW v2;
-CREATE TABLE t1 (
-f1 INT AUTO_INCREMENT,
-f2 INT,
-f3 INT,
-f4 INT,
-PRIMARY KEY (f1),KEY(f2)
-) ENGINE=INNODB;
-INSERT INTO t1 VALUES(1,NULL,NULL,0), (2,2,0,3), (9,0,107,18),
-(10,0,0,0), (231,0,0,0), (232,0,8,0), (234,0,0,NULL), (235,8,0,3);
-CREATE ALGORITHM=MERGE VIEW v3 AS SELECT f1,f2,f3,f4 FROM t1 WHERE f1<=85 ;
-SELECT * FROM v3;
-f1	f2	f3	f4
-1	NULL	NULL	0
-2	2	0	3
-9	0	107	18
-10	0	0	0
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-UPDATE v3 SET f3=0, f4=4 WHERE f2=68 ORDER BY f1;
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM v3;
-f1	f2	f3	f4
-1	NULL	NULL	0
-2	2	0	3
-9	0	107	18
-10	0	0	0
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-DROP TABLE t1;
-DROP VIEW v3;
-#
-# BUG#13731380: RANGE OPTIMIZER CALLS RECORDS_IN_RANGE() FOR OPEN RANGE
-#
-CREATE TABLE t1 (pk INT PRIMARY KEY);
-INSERT INTO t1 VALUES (1),(3),(5);
-SELECT * FROM t1 WHERE pk <> 3 OR pk < 4;
-pk
-1
-3
-5
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-DROP TABLE t1;
-#
-# BUG#13803810: TOO FEW ROWS RETURNED FOR RANGE ACCESS IN 
-#               VARCHAR INDEX USING DATETIME VALUE
-
-CREATE TABLE t1 (a DATETIME);
-INSERT INTO t1 VALUES ('2001-01-01 00:00:00');
-INSERT INTO t1 VALUES ('2001-01-01 11:22:33');
-CREATE TABLE t2 (b VARCHAR(64), KEY (b)) CHARSET utf8mb4;
-INSERT INTO t2 VALUES ('2001-01-01');
-INSERT INTO t2 VALUES ('2001.01.01');
-INSERT INTO t2 VALUES ('2001#01#01');
-INSERT INTO t2 VALUES ('2001-01-01 00:00:00');
-INSERT INTO t2 VALUES ('2001-01-01 11:22:33');
-
-# range/ref access cannot be used for this query
-
-EXPLAIN SELECT * FROM t2 WHERE b=CAST('2001-01-01' AS DATE);
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t2	NULL	index	b	b	259	NULL	5	20.00	Using where; Using index
-Warnings:
-Warning	1739	Cannot use ref access on index 'b' due to type or collation conversion on field 'b'
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t2`.`b` AS `b` from `test`.`t2` where (`test`.`t2`.`b` = <cache>(cast('2001-01-01' as date)))
-SELECT * FROM t2 WHERE b=CAST('2001-01-01' AS DATE);
-b
-2001#01#01
-2001-01-01
-2001-01-01 00:00:00
-2001.01.01
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warnings:
-
-# range/ref access cannot be used for any of the queries below.
-# See BUG#13814468 about 'Range checked for each record'
-
-EXPLAIN SELECT * FROM t1, t2 WHERE a=b ORDER BY BINARY a, BINARY b;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Using temporary; Using filesort
-1	SIMPLE	t2	NULL	index	b	b	259	NULL	5	20.00	Using where; Using index; Using join buffer (hash join)
-Warnings:
-Warning	1739	Cannot use ref access on index 'b' due to type or collation conversion on field 'b'
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t2`.`b` AS `b` from `test`.`t1` join `test`.`t2` where (`test`.`t1`.`a` = cast(`test`.`t2`.`b` as datetime(6))) order by cast(`test`.`t1`.`a` as char charset binary),cast(`test`.`t2`.`b` as char charset binary)
-SELECT * FROM t1, t2 WHERE a=b ORDER BY BINARY a, BINARY b;
-a	b
-2001-01-01 00:00:00	2001#01#01
-2001-01-01 00:00:00	2001-01-01
-2001-01-01 00:00:00	2001-01-01 00:00:00
-2001-01-01 00:00:00	2001.01.01
-2001-01-01 11:22:33	2001-01-01 11:22:33
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-
-EXPLAIN SELECT * FROM t1, t2 WHERE b=a ORDER BY BINARY a, BINARY b;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Using temporary; Using filesort
-1	SIMPLE	t2	NULL	index	b	b	259	NULL	5	20.00	Using where; Using index; Using join buffer (hash join)
-Warnings:
-Warning	1739	Cannot use ref access on index 'b' due to type or collation conversion on field 'b'
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t2`.`b` AS `b` from `test`.`t1` join `test`.`t2` where (cast(`test`.`t2`.`b` as datetime(6)) = `test`.`t1`.`a`) order by cast(`test`.`t1`.`a` as char charset binary),cast(`test`.`t2`.`b` as char charset binary)
-SELECT * FROM t1, t2 WHERE b=a ORDER BY BINARY a, BINARY b;
-a	b
-2001-01-01 00:00:00	2001#01#01
-2001-01-01 00:00:00	2001-01-01
-2001-01-01 00:00:00	2001-01-01 00:00:00
-2001-01-01 00:00:00	2001.01.01
-2001-01-01 11:22:33	2001-01-01 11:22:33
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-
-DROP TABLE t1,t2;
-#
-# WL#7019: Add support for row value constructors in in predicates to
-# range optimizer
-#
-CREATE TABLE t1 (a INT, b INT, c INT, KEY x(a, b));
-INSERT INTO t1 VALUES (2, 2, 2), (3, 3, 3), (4, 4, 4), (5, 5, 5), (6, 6, 6),
-(7, 7, 7), (8, 8, 8), (9, 9, 9);
-INSERT INTO t1 SELECT * FROM t1;
-INSERT INTO t1 SELECT * FROM t1;
-INSERT INTO t1 SELECT * FROM t1;
-INSERT INTO t1 SELECT * FROM t1;
-INSERT INTO t1 SELECT * FROM t1;
-INSERT INTO t1 SELECT * FROM t1;
-INSERT INTO t1 SELECT * FROM t1;
-INSERT INTO t1 SELECT * FROM t1;
-INSERT INTO t1 SELECT * FROM t1;
-INSERT INTO t1 VALUES (0, 0, 0), (1, 1, 1);
-ANALYZE TABLE t1;
-Table	Op	Msg_type	Msg_text
-test.t1	analyze	status	OK
-CREATE TABLE t2 (a INT, b INT, c INT, d INT, KEY x(a, b));
-INSERT INTO t2 VALUES (2, 2, 2, 2), (3, 3, 3, 3), (4, 4, 4, 4), (5, 5, 5, 5),
-(6, 6, 6, 6), (7, 7, 7, 7), (8, 8, 8, 8), (9, 9, 9, 9);
-INSERT INTO t2 SELECT * FROM t2;
-INSERT INTO t2 SELECT * FROM t2;
-INSERT INTO t2 SELECT * FROM t2;
-INSERT INTO t2 SELECT * FROM t2;
-INSERT INTO t2 SELECT * FROM t2;
-INSERT INTO t2 SELECT * FROM t2;
-INSERT INTO t2 SELECT * FROM t2;
-INSERT INTO t2 SELECT * FROM t2;
-INSERT INTO t2 SELECT * FROM t2;
-INSERT INTO t2 VALUES (0, 0, 0, 0), (1, 1, 1, 1);
-ANALYZE TABLE t2;
-Table	Op	Msg_type	Msg_text
-test.t2	analyze	status	OK
-CREATE TABLE t3 (a INT, b INT, c INT, d INT, KEY x(a, b, c));
-INSERT INTO t3 VALUES (2, 2, 2, 2), (3, 3, 3, 3), (4, 4, 4, 4), (5, 5, 5, 5),
-(6, 6, 6, 6), (7, 7, 7, 7), (8, 8, 8, 8), (9, 9, 9, 9);
-INSERT INTO t3 SELECT * FROM t3;
-INSERT INTO t3 SELECT * FROM t3;
-INSERT INTO t3 SELECT * FROM t3;
-INSERT INTO t3 SELECT * FROM t3;
-INSERT INTO t3 SELECT * FROM t3;
-INSERT INTO t3 SELECT * FROM t3;
-INSERT INTO t3 SELECT * FROM t3;
-INSERT INTO t3 SELECT * FROM t3;
-INSERT INTO t3 SELECT * FROM t3;
-INSERT INTO t3 VALUES (0, 0, 0, 0), (1, 1, 1, 1);
-ANALYZE TABLE t3;
-Table	Op	Msg_type	Msg_text
-test.t3	analyze	status	OK
-EXPLAIN SELECT a, b FROM t1 WHERE (a, b) IN ((NULL, NULL), (NULL, NULL));
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	x	x	10	NULL	4098	2.00	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where ((`test`.`t1`.`a`,`test`.`t1`.`b`) in ((NULL,NULL),(NULL,NULL)))
-EXPLAIN SELECT a, b FROM t1 WHERE (a = 0 AND b = 0) OR (a = 1 AND b = 1);
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	x	x	10	NULL	4098	1.99	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where (((`test`.`t1`.`b` = 0) and (`test`.`t1`.`a` = 0)) or ((`test`.`t1`.`b` = 1) and (`test`.`t1`.`a` = 1)))
-FLUSH STATUS;
-SELECT a, b FROM t1 WHERE (a = 0 AND b = 0) OR (a = 1 AND b = 1);
-a	b
-0	0
-1	1
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warnings:
-SHOW STATUS LIKE 'Handler_read_%';
-Variable_name	Value
-Handler_read_first	1
-Handler_read_key	1
-Handler_read_last	0
-Handler_read_next	4098
-Handler_read_prev	0
-Handler_read_rnd	0
-Handler_read_rnd_next	0
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-EXPLAIN SELECT a, b FROM t1 WHERE (a, b) IN ((0, 0));
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ref	x	x	10	const,const	10	100.00	Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where ((`test`.`t1`.`b` = 0) and (`test`.`t1`.`a` = 0))
-FLUSH STATUS;
-SELECT a, b FROM t1 WHERE (a, b) IN ((0, 0));
-a	b
-0	0
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warnings:
-SHOW STATUS LIKE 'Handler_read_%';
-Variable_name	Value
-Handler_read_first	0
-Handler_read_key	1
-Handler_read_last	0
-Handler_read_next	1
-Handler_read_prev	0
-Handler_read_rnd	0
-Handler_read_rnd_next	0
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-EXPLAIN SELECT a, b FROM t1 WHERE (a, b) IN ((0, 0), (1, 1));
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	x	x	10	NULL	4098	2.00	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where ((`test`.`t1`.`a`,`test`.`t1`.`b`) in ((0,0),(1,1)))
-FLUSH STATUS;
-SELECT a, b FROM t1 WHERE (a, b) IN ((0, 0), (1, 1));
-a	b
-0	0
-1	1
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warnings:
-SHOW STATUS LIKE 'Handler_read_%';
-Variable_name	Value
-Handler_read_first	1
-Handler_read_key	1
-Handler_read_last	0
-Handler_read_next	4098
-Handler_read_prev	0
-Handler_read_rnd	0
-Handler_read_rnd_next	0
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-EXPLAIN SELECT a, b, c FROM t2 WHERE (a, b, c) IN ((0, 0, 0), (1, 1, 1));
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t2	NULL	ALL	x	NULL	NULL	NULL	4098	0.20	Using where
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t2`.`c` AS `c` from `test`.`t2` where ((`test`.`t2`.`a`,`test`.`t2`.`b`,`test`.`t2`.`c`) in ((0,0,0),(1,1,1)))
-FLUSH STATUS;
-SELECT a, b, c FROM t2 WHERE (a, b, c) IN ((0, 0, 0), (1, 1, 1));
-a	b	c
-0	0	0
-1	1	1
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warnings:
-SHOW STATUS LIKE 'Handler_read_%';
-Variable_name	Value
-Handler_read_first	1
-Handler_read_key	1
-Handler_read_last	0
-Handler_read_next	0
-Handler_read_prev	0
-Handler_read_rnd	0
-Handler_read_rnd_next	4099
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-EXPLAIN SELECT a, b, c FROM t3 WHERE (a, b, c) IN ((0, 0, 0), (1, 1, 1));
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t3	NULL	index	x	x	15	NULL	4098	0.20	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t3`.`a` AS `a`,`test`.`t3`.`b` AS `b`,`test`.`t3`.`c` AS `c` from `test`.`t3` where ((`test`.`t3`.`a`,`test`.`t3`.`b`,`test`.`t3`.`c`) in ((0,0,0),(1,1,1)))
-FLUSH STATUS;
-SELECT a, b, c FROM t3 WHERE (a, b, c) IN ((0, 0, 0), (1, 1, 1));
-a	b	c
-0	0	0
-1	1	1
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warnings:
-SHOW STATUS LIKE 'Handler_read_%';
-Variable_name	Value
-Handler_read_first	1
-Handler_read_key	1
-Handler_read_last	0
-Handler_read_next	4098
-Handler_read_prev	0
-Handler_read_rnd	0
-Handler_read_rnd_next	0
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-EXPLAIN SELECT a, b FROM t1 WHERE a = 0 AND b = 0 OR (a, b) IN ((1, 1));
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	x	x	10	NULL	4098	1.99	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where (((`test`.`t1`.`b` = 0) and (`test`.`t1`.`a` = 0)) or ((`test`.`t1`.`b` = 1) and (`test`.`t1`.`a` = 1)))
-FLUSH STATUS;
-SELECT a, b FROM t1 WHERE a = 0 AND b = 0 OR (a, b) IN ((1, 1));
-a	b
-0	0
-1	1
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warnings:
-SHOW STATUS LIKE 'Handler_read_%';
-Variable_name	Value
-Handler_read_first	1
-Handler_read_key	1
-Handler_read_last	0
-Handler_read_next	4098
-Handler_read_prev	0
-Handler_read_rnd	0
-Handler_read_rnd_next	0
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-EXPLAIN SELECT a, b FROM t1 WHERE (a, b) IN ((1, 1)) OR a = 0 AND b = 0;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	x	x	10	NULL	4098	1.99	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where (((`test`.`t1`.`b` = 1) and (`test`.`t1`.`a` = 1)) or ((`test`.`t1`.`b` = 0) and (`test`.`t1`.`a` = 0)))
-FLUSH STATUS;
-SELECT a, b FROM t1 WHERE (a, b) IN ((1, 1)) OR a = 0 AND b = 0;
-a	b
-0	0
-1	1
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warnings:
-SHOW STATUS LIKE 'Handler_read_%';
-Variable_name	Value
-Handler_read_first	1
-Handler_read_key	1
-Handler_read_last	0
-Handler_read_next	4098
-Handler_read_prev	0
-Handler_read_rnd	0
-Handler_read_rnd_next	0
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-EXPLAIN SELECT a, b FROM t2 WHERE (a, b, c) IN ((1, 1, 1)) OR a = 0 AND b = 0 AND c = 0;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t2	NULL	ALL	x	NULL	NULL	NULL	4098	0.20	Using where
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b` from `test`.`t2` where (((`test`.`t2`.`c` = 1) and (`test`.`t2`.`b` = 1) and (`test`.`t2`.`a` = 1)) or ((`test`.`t2`.`c` = 0) and (`test`.`t2`.`b` = 0) and (`test`.`t2`.`a` = 0)))
-FLUSH STATUS;
-SELECT a, b FROM t2 WHERE (a, b, c) IN ((1, 1, 1)) OR a = 0 AND b = 0 AND c = 0;
-a	b
-0	0
-1	1
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warnings:
-SHOW STATUS LIKE 'Handler_read_%';
-Variable_name	Value
-Handler_read_first	1
-Handler_read_key	1
-Handler_read_last	0
-Handler_read_next	0
-Handler_read_prev	0
-Handler_read_rnd	0
-Handler_read_rnd_next	4099
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-EXPLAIN SELECT a, b FROM t3 WHERE (a, b, c) IN ((1, 1, 1)) OR a = 0 AND b = 0 AND c = 0;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t3	NULL	index	x	x	15	NULL	4098	0.20	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t3`.`a` AS `a`,`test`.`t3`.`b` AS `b` from `test`.`t3` where (((`test`.`t3`.`c` = 1) and (`test`.`t3`.`b` = 1) and (`test`.`t3`.`a` = 1)) or ((`test`.`t3`.`c` = 0) and (`test`.`t3`.`b` = 0) and (`test`.`t3`.`a` = 0)))
-FLUSH STATUS;
-SELECT a, b FROM t3 WHERE (a, b, c) IN ((1, 1, 1)) OR a = 0 AND b = 0 AND c = 0;
-a	b
-0	0
-1	1
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warnings:
-SHOW STATUS LIKE 'Handler_read_%';
-Variable_name	Value
-Handler_read_first	1
-Handler_read_key	1
-Handler_read_last	0
-Handler_read_next	4098
-Handler_read_prev	0
-Handler_read_rnd	0
-Handler_read_rnd_next	0
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-EXPLAIN SELECT a, b FROM t1 WHERE (a, b) IN (((SELECT 1), 1));
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ref	x	x	10	const,const	10	100.00	Using index
-Warnings:
-Note	1249	Select 2 was reduced during optimization
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where ((`test`.`t1`.`b` = 1) and (`test`.`t1`.`a` = 1))
-FLUSH STATUS;
-SELECT a, b FROM t1 WHERE (a, b) IN (((SELECT 1), 1));
-a	b
-1	1
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warnings:
-SHOW STATUS LIKE 'Handler_read_%';
-Variable_name	Value
-Handler_read_first	0
-Handler_read_key	1
-Handler_read_last	0
-Handler_read_next	1
-Handler_read_prev	0
-Handler_read_rnd	0
-Handler_read_rnd_next	0
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-EXPLAIN SELECT a, b FROM t1 WHERE (a, b) IN (('0', 0), (1, 1));
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	x	x	10	NULL	4098	2.00	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where ((`test`.`t1`.`a`,`test`.`t1`.`b`) in (('0',0),(1,1)))
-FLUSH STATUS;
-SELECT a, b FROM t1 WHERE (a, b) IN (('0', 0), (1, 1));
-a	b
-0	0
-1	1
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warnings:
-SHOW STATUS LIKE 'Handler_read_%';
-Variable_name	Value
-Handler_read_first	1
-Handler_read_key	1
-Handler_read_last	0
-Handler_read_next	4098
-Handler_read_prev	0
-Handler_read_rnd	0
-Handler_read_rnd_next	0
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SET @v = 0;
-EXPLAIN SELECT a, b FROM t1 WHERE (a, b) IN ((@v, 0), (1, 1));
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	x	x	10	NULL	4098	2.00	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where ((`test`.`t1`.`a`,`test`.`t1`.`b`) in (((@`v`),0),(1,1)))
-FLUSH STATUS;
-SELECT a, b FROM t1 WHERE (a, b) IN ((@v, 0), (1, 1));
-a	b
-0	0
-1	1
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warnings:
-SHOW STATUS LIKE 'Handler_read_%';
-Variable_name	Value
-Handler_read_first	1
-Handler_read_key	1
-Handler_read_last	0
-Handler_read_next	4098
-Handler_read_prev	0
-Handler_read_rnd	0
-Handler_read_rnd_next	0
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-CREATE TABLE t4 ( a INT, b INT );
-INSERT INTO t4 VALUES (1, 1), (2, 2), (3, 3), (4, 4), (5, 5);
-INSERT INTO t4 SELECT a + 5, b + 5 FROM t4;
-INSERT INTO t4 SELECT * FROM t4;
-INSERT INTO t4 SELECT * FROM t4;
-INSERT INTO t4 SELECT * FROM t4;
-INSERT INTO t4 SELECT * FROM t4;
-INSERT INTO t4 SELECT * FROM t4;
-INSERT INTO t4 SELECT * FROM t4;
-# Inner table in a nested-loops join
-EXPLAIN
-SELECT t4.*, t1.a, t1.b
-FROM t4 JOIN t1 USING(a, b)
-WHERE (t4.a, t4.b) IN ((1, 1), (0, 0));
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t4	NULL	ALL	NULL	NULL	NULL	NULL	640	2.00	Using where
-1	SIMPLE	t1	NULL	ref	x	x	10	test.t4.a,test.t4.b	409	100.00	Using index
-Warnings:
-Note	1003	/* select#1 */ select `test`.`t4`.`a` AS `a`,`test`.`t4`.`b` AS `b`,`test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t4` join `test`.`t1` where ((`test`.`t1`.`b` = `test`.`t4`.`b`) and (`test`.`t1`.`a` = `test`.`t4`.`a`) and ((`test`.`t4`.`a`,`test`.`t4`.`b`) in ((1,1),(0,0))))
-# Join on IN
-EXPLAIN
-SELECT t4.*, t1.a, t1.b
-FROM t4 JOIN t1
-WHERE (t1.a, t1.b) IN ((t4.a, t4.b), (0, 0));
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t4	NULL	ALL	NULL	NULL	NULL	NULL	640	100.00	NULL
-1	SIMPLE	t1	NULL	index	x	x	10	NULL	4098	2.00	Using where; Using index; Using join buffer (hash join)
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t4`.`a` AS `a`,`test`.`t4`.`b` AS `b`,`test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t4` join `test`.`t1` where ((`test`.`t1`.`a`,`test`.`t1`.`b`) in ((`test`.`t4`.`a`,`test`.`t4`.`b`),(0,0)))
-EXPLAIN
-SELECT t4.*, t1.a, t1.b
-FROM t4 JOIN t1
-WHERE (t1.a, t1.b) IN ((t4.a, t4.b), (1, 1));
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t4	NULL	ALL	NULL	NULL	NULL	NULL	640	100.00	NULL
-1	SIMPLE	t1	NULL	index	x	x	10	NULL	4098	2.00	Using where; Using index; Using join buffer (hash join)
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t4`.`a` AS `a`,`test`.`t4`.`b` AS `b`,`test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t4` join `test`.`t1` where ((`test`.`t1`.`a`,`test`.`t1`.`b`) in ((`test`.`t4`.`a`,`test`.`t4`.`b`),(1,1)))
-#
-# Tests for non-deterministic functions.
-#
-CREATE FUNCTION f1() RETURNS INT NOT DETERMINISTIC RETURN 1;
-# The statement immediately below should not use range access.
-EXPLAIN SELECT a, b FROM t1 WHERE (a, b, c) IN ((0, 0, 0), (f1(), 1, 1));
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	x	NULL	NULL	NULL	4098	0.20	Using where
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where ((`test`.`t1`.`a`,`test`.`t1`.`b`,`test`.`t1`.`c`) in ((0,0,0),(`f1`(),1,1)))
-EXPLAIN SELECT a, b FROM t1 WHERE (a, b, c) IN ((0, 0, 0), (1, f1(), 1));
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	x	NULL	NULL	NULL	4098	0.20	Using where
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where ((`test`.`t1`.`a`,`test`.`t1`.`b`,`test`.`t1`.`c`) in ((0,0,0),(1,`f1`(),1)))
-EXPLAIN SELECT a, b FROM t1 WHERE (a, b, c) IN ((0, 0, 0), (1, 1, f1()));
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	x	NULL	NULL	NULL	4098	0.20	Using where
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where ((`test`.`t1`.`a`,`test`.`t1`.`b`,`test`.`t1`.`c`) in ((0,0,0),(1,1,`f1`())))
-# The statement immediately below should not use range access.
-EXPLAIN SELECT a, b FROM t1 WHERE (a, b) IN ((f1(), 1));
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	NULL	x	10	NULL	4098	1.00	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where ((`test`.`t1`.`b` = 1) and (`test`.`t1`.`a` = `f1`()))
-DROP FUNCTION f1;
-# The statement immediately below should not use range access.
-EXPLAIN
-SELECT a, b
-FROM t1 AS t1o
-WHERE EXISTS (SELECT /*+ NO_SEMIJOIN() */ 1
-FROM t1
-WHERE (a, b) IN ((t1o.a, t1o.b)) );
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	t1o	NULL	index	NULL	x	10	NULL	4098	100.00	Using where; Using index
-2	DEPENDENT SUBQUERY	t1	NULL	ref	x	x	10	test.t1o.a,test.t1o.b	409	100.00	Using index
-Warnings:
-Note	1276	Field or reference 'test.t1o.a' of SELECT #2 was resolved in SELECT #1
-Note	1276	Field or reference 'test.t1o.b' of SELECT #2 was resolved in SELECT #1
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select /*+ NO_SEMIJOIN(@`select#2`) */ `test`.`t1o`.`a` AS `a`,`test`.`t1o`.`b` AS `b` from `test`.`t1` `t1o` where exists(/* select#2 */ select 1 from `test`.`t1` where ((`test`.`t1`.`a` = `test`.`t1o`.`a`) and (`test`.`t1`.`b` = `test`.`t1o`.`b`)))
-#
-# Tests of dynamic range access
-#
-CREATE TABLE t5 (a int, b int, KEY (a));
-INSERT INTO t5 VALUES (1, 1), (2, 1), (3, 1), (4, 1), (5, 1), (6, 1);
-CREATE TABLE t6 (a int, b int, KEY (a));
-INSERT INTO t6 VALUES (3, 2), (4, 2), (100, 100), (101, 201), (102, 102);
-CREATE TABLE t7 (a int, b int, KEY (a, b));
-INSERT INTO t7 VALUES (1, 1), (2, 2), (1000, 1000), (1001, 1001), (1002, 1002),
-(1003, 1003), (1004, 1004);
-EXPLAIN SELECT *
-FROM t5 JOIN t6 ON t5.a = t6.a JOIN t7
-WHERE t7.a IN (t5.b, t6.b);
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t6	NULL	ALL	a	NULL	NULL	NULL	5	100.00	Using where
-1	SIMPLE	t5	NULL	ref	a	a	5	test.t6.a	1	100.00	NULL
-1	SIMPLE	t7	NULL	index	a	a	10	NULL	7	28.57	Using where; Using index; Using join buffer (hash join)
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t5`.`a` AS `a`,`test`.`t5`.`b` AS `b`,`test`.`t6`.`a` AS `a`,`test`.`t6`.`b` AS `b`,`test`.`t7`.`a` AS `a`,`test`.`t7`.`b` AS `b` from `test`.`t5` join `test`.`t6` join `test`.`t7` where ((`test`.`t5`.`a` = `test`.`t6`.`a`) and (`test`.`t7`.`a` in (`test`.`t5`.`b`,`test`.`t6`.`b`)))
-FLUSH STATUS;
-SELECT *
-FROM t5 JOIN t6 ON t5.a = t6.a JOIN t7
-WHERE t7.a IN (t5.b, t6.b);
-a	b	a	b	a	b
-3	1	3	2	1	1
-3	1	3	2	2	2
-4	1	4	2	1	1
-4	1	4	2	2	2
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warnings:
-SHOW STATUS LIKE 'Handler_read_%';
-Variable_name	Value
-Handler_read_first	2
-Handler_read_key	7
-Handler_read_last	0
-Handler_read_next	9
-Handler_read_prev	0
-Handler_read_rnd	0
-Handler_read_rnd_next	6
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-EXPLAIN SELECT *
-FROM t5 JOIN t6 ON t5.a = t6.a JOIN t7
-WHERE (t7.a, t7.b) IN ((t5.b, 1), (t6.b, 1));
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t6	NULL	ALL	a	NULL	NULL	NULL	5	100.00	Using where
-1	SIMPLE	t5	NULL	ref	a	a	5	test.t6.a	1	100.00	NULL
-1	SIMPLE	t7	NULL	index	a	a	10	NULL	7	14.29	Using where; Using index; Using join buffer (hash join)
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t5`.`a` AS `a`,`test`.`t5`.`b` AS `b`,`test`.`t6`.`a` AS `a`,`test`.`t6`.`b` AS `b`,`test`.`t7`.`a` AS `a`,`test`.`t7`.`b` AS `b` from `test`.`t5` join `test`.`t6` join `test`.`t7` where ((`test`.`t5`.`a` = `test`.`t6`.`a`) and ((`test`.`t7`.`a`,`test`.`t7`.`b`) in ((`test`.`t5`.`b`,1),(`test`.`t6`.`b`,1))))
-FLUSH STATUS;
-SELECT *
-FROM t5 JOIN t6 ON t5.a = t6.a JOIN t7
-WHERE (t7.a, t7.b) IN ((t5.b, 1), (t6.b, 1));
-a	b	a	b	a	b
-3	1	3	2	1	1
-4	1	4	2	1	1
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warnings:
-SHOW STATUS LIKE 'Handler_read_%';
-Variable_name	Value
-Handler_read_first	2
-Handler_read_key	7
-Handler_read_last	0
-Handler_read_next	9
-Handler_read_prev	0
-Handler_read_rnd	0
-Handler_read_rnd_next	6
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-#
-# Regression tests of the worklog below.
-#
-# Make sure we process IN predicates only.
-# The code around this is very unclear.
-EXPLAIN SELECT a, b FROM t1 WHERE (a, b) != (1, 1);
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	x	x	10	NULL	4098	99.00	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where ((`test`.`t1`.`a` <> 1) or (`test`.`t1`.`b` <> 1))
-# This should give us a ref scan, as it always did.
-EXPLAIN SELECT a, b FROM t1 WHERE (a, b) IN ((0, 0));
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ref	x	x	10	const,const	10	100.00	Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where ((`test`.`t1`.`b` = 0) and (`test`.`t1`.`a` = 0))
-EXPLAIN SELECT a, b FROM t1 WHERE (a, c) IN ((0, 0));
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ref	x	x	5	const	409	10.00	Using where
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where ((`test`.`t1`.`c` = 0) and (`test`.`t1`.`a` = 0))
-# ref scan on x(a).
-EXPLAIN SELECT * FROM t1 WHERE (a, c) IN ((0, 0), (1, 1));
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	x	NULL	NULL	NULL	4098	2.00	Using where
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c` from `test`.`t1` where ((`test`.`t1`.`a`,`test`.`t1`.`c`) in ((0,0),(1,1)))
-DROP TABLE t1, t2, t3, t4, t5, t6, t7;
-#
-# Bug#17635476: CRASH IN GET_MM_PARTS() OR ASSERT IN
-# GET_FUNC_MM_TREE_FROM_IN_PREDICATE()
-#
-CREATE TABLE t1 (
-a INT,
-b INT,
-KEY (a)
-) ENGINE = INNODB;
-SELECT DISTINCT a FROM t1 WHERE (a, b) IN ((0, 0), (1, 1));
-a
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-INSERT INTO t1 VALUES (0, 0), (1, 1), (2, 2), (3, 3), (4, 4), (5, 5), (6, 6),
-(7, 7), (8, 8), (9, 9);
-ANALYZE TABLE t1;
-Table	Op	Msg_type	Msg_text
-test.t1	analyze	status	OK
-CREATE TABLE t2 (
-a INT,
-b INT,
-KEY (a, b)
-);
-INSERT INTO t2 SELECT * FROM t1;
-ANALYZE TABLE t2;
-Table	Op	Msg_type	Msg_text
-test.t2	analyze	status	OK
-EXPLAIN SELECT DISTINCT a FROM t1 WHERE (a, b) IN ((0, 0), (1, 1));
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	a	a	5	NULL	10	10.00	Using where
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select distinct `test`.`t1`.`a` AS `a` from `test`.`t1` where ((`test`.`t1`.`a`,`test`.`t1`.`b`) in ((0,0),(1,1)))
-FLUSH STATUS;
-SELECT DISTINCT a FROM t1 WHERE (a, b) IN ((0, 0), (1, 1));
-a
-0
-1
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warnings:
-SHOW STATUS LIKE 'Handler_read_%';
-Variable_name	Value
-Handler_read_first	1
-Handler_read_key	1
-Handler_read_last	0
-Handler_read_next	10
-Handler_read_prev	0
-Handler_read_rnd	0
-Handler_read_rnd_next	0
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-EXPLAIN SELECT DISTINCT a FROM t2 WHERE (a, b) IN ((0, 0), (1, 1));
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t2	NULL	index	a	a	10	NULL	10	10.00	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select distinct `test`.`t2`.`a` AS `a` from `test`.`t2` where ((`test`.`t2`.`a`,`test`.`t2`.`b`) in ((0,0),(1,1)))
-FLUSH STATUS;
-SELECT DISTINCT a FROM t2 WHERE (a, b) IN ((0, 0), (1, 1));
-a
-0
-1
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warnings:
-SHOW STATUS LIKE 'Handler_read_%';
-Variable_name	Value
-Handler_read_first	1
-Handler_read_key	1
-Handler_read_last	0
-Handler_read_next	10
-Handler_read_prev	0
-Handler_read_rnd	0
-Handler_read_rnd_next	0
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-# Should not use range scan.
-EXPLAIN SELECT DISTINCT a FROM t1 WHERE (NULL, b) IN ((0, 0), (1, 1));
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	index	a	a	5	NULL	10	20.00	Using where
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select distinct `test`.`t1`.`a` AS `a` from `test`.`t1` where ((NULL,`test`.`t1`.`b`) in ((0,0),(1,1)))
-# Should not use range scan.
-EXPLAIN SELECT DISTINCT a FROM t2 WHERE (NULL, b) IN ((0, 0), (1, 1));
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t2	NULL	index	a	a	10	NULL	10	20.00	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select distinct `test`.`t2`.`a` AS `a` from `test`.`t2` where ((NULL,`test`.`t2`.`b`) in ((0,0),(1,1)))
-DROP TABLE t1, t2;
-#
-# Bug#17755540 VALGRIND ERROR WHEN SETTING UP ROW COMPARATORS
-#
-CREATE TABLE t2 (a INT, b INT, c INT, d INT, KEY x(a, b));
-INSERT INTO t2 VALUES (2, 2, 2, 2), (3, 3, 3, 3), (4, 4, 4, 4), (5, 5, 5, 5),
-(6, 6, 6, 6), (7, 7, 7, 7), (8, 8, 8, 8), (9, 9, 9, 9);
-INSERT INTO t2 SELECT * FROM t2;
-INSERT INTO t2 VALUES (0, 0, 0, 0), (1, 1, 1, 1);
-ANALYZE TABLE t2;
-Table	Op	Msg_type	Msg_text
-test.t2	analyze	status	OK
-SELECT a, b FROM t2 WHERE (a, b) IN ((0, 0), (1, 1));
-a	b
-0	0
-1	1
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-DROP TABLE t2;
-#
-# BUG#18364815: OPTIMIZER PREFERS TABLE SCAN WHEN 
-#               USING "IN" WITH VALUE OF DIFFERENT TYPE
-#
-CREATE TABLE t1 (a INT PRIMARY KEY, b INT);
-INSERT INTO t1 VALUES (1,1), (2,1), (3,1), (4,1), (5,1), (6,1);
-EXPLAIN SELECT * FROM t1 WHERE a IN (1, 2);
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	PRIMARY	NULL	NULL	NULL	6	33.33	Using where
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where (`test`.`t1`.`a` in (1,2))
-EXPLAIN SELECT * FROM t1 WHERE a IN (1, "2");
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	PRIMARY	NULL	NULL	NULL	6	33.33	Using where
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where (`test`.`t1`.`a` in (1,'2'))
-SELECT * FROM t1 WHERE a IN (1, 2);
-a	b
-1	1
-2	1
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t1 WHERE a IN (1, "2");
-a	b
-1	1
-2	1
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-DROP TABLE t1;
-# 
-# Bug#18715670
-# CRASH IN DECIMAL_ACTUAL_FRACTION COMPARING DECIMAL TO NULLS
-# 
-CREATE TABLE t1(n DECIMAL(39,19) NOT NULL, KEY(n)) engine=innodb;
-INSERT INTO t1 SET n=0;
-SELECT 1 FROM t1 WHERE n NOT IN(NULL, NULL);
-1
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-DROP TABLE t1;
-#
-# Bug#18759597 MISSING ROWS ON WHERE .. 
-#              IN QUERY WITH VARIABLES AND CONCAT
-#
-CREATE TABLE t1 (
-col_varchar_key varchar(2),
-KEY col_varchar_key (col_varchar_key)
-) ENGINE=InnoDB;
-INSERT INTO t1 VALUES ('n'),('xm');
-SET @var1 = 't', @var2 = 'him',
-@var3 = 'n', @var4 = 'n',
-@var5 = 'n', @var6 = 'g',
-@var7 = 'b', @var8 = 'o',
-@var9 = 'm', @var10 = 'xm', @var11 = 'u'
-;
-SELECT col_varchar_key AS field1
-FROM t1
-WHERE ( col_varchar_key, col_varchar_key ) IN (
-('m', @var1  ),
-('n', @var3  ),
-('a', @var5  ),
-('l', @var7  ),
-(CONCAT('x', @var9 ), @var10 )
-);
-field1
-n
-xm
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-DROP TABLE t1;
-#
-# Bug#18535226 	DEBUG CRASH ON QUICK_RANGE_SELECT::RESET
-#
-SET @old_tmp_table_size=@@tmp_table_size;
-SET tmp_table_size=1024;
-CREATE TABLE t1 (
-pk INT NOT NULL,
-col_int_key INT,
-col_date_key date,
-col_date_nokey date,
-col_time_key time,
-col_time_nokey time,
-col_datetime_key datetime,
-col_datetime_nokey datetime,
-col_varchar_key varchar(1),
-col_varchar_nokey varchar(1),
-PRIMARY KEY (pk),
-KEY col_int_key (col_int_key)
-) ENGINE=MyISAM;
-INSERT INTO t1 VALUES
-(5,0,'2001-05-06','2001-05-06','16:21:18','16:21:18','2001-11-08 21:02:12',
-'2001-11-08 21:02:12','x','x'),(6,7,'2006-03-03','2006-03-03','18:56:33',
-'18:56:33','2003-04-01 00:00:00','2003-04-01 00:00:00','i','i'),
-(7,7,'2007-12-28','2007-12-28',NULL,NULL,'1900-01-01 00:00:00',
-'1900-01-01 00:00:00','e','e'),(8,1,'2004-10-20','2004-10-20','09:29:08',
-'09:29:08','2007-07-12 00:00:00','2007-07-12 00:00:00','p','p'),
-(9,7,'2008-04-09','2008-04-09','19:11:10','19:11:10',
-'2005-04-04 01:21:01','2005-04-04 01:21:01','s','s'),
-(10,1,'2005-12-25','2005-12-25','11:57:26','11:57:26',
-'1900-01-01 00:00:00','1900-01-01 00:00:00','j','j');
-SELECT alias1.col_int_key
-FROM
-( SELECT SQ1_alias1.* FROM t1 AS SQ1_alias1, t1 AS SQ1_alias2 ) AS alias1,
-(SELECT 7 AS col_int_nokey) AS alias2
-WHERE
-alias2.col_int_nokey = alias1.pk
-AND alias1.col_varchar_nokey < alias1.col_varchar_key
-ORDER BY alias1.col_varchar_key;
-col_int_key
-DROP TABLE t1;
-SET tmp_table_size=@old_tmp_table_size;
-SET sql_mode = default;
-#
-# Bug#19585938 Crash in get_full_func_mm_tree with null
-#              item_field->table_ref
-#
-CREATE TABLE t1(id INTEGER, col1 INTEGER, col2 INTEGER, PRIMARY KEY(id));
-INSERT INTO t1 VALUES (1,2,3), (3,2,1);
-SELECT (SELECT 1
-FROM t1
-WHERE SUM(1) < id
-) AS c
-FROM t1
-GROUP BY col1;
-c
-1
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT (SELECT 1
-FROM t1
-WHERE id > SUM(1)
-) AS c
-FROM t1
-GROUP BY col1;
-c
-1
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT (SELECT 1
-FROM t1
-WHERE SUM(1) BETWEEN id AND id+1
-) AS c
-FROM t1
-GROUP BY col1;
-c
-1
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT (SELECT 1
-FROM t1
-WHERE id BETWEEN SUM(1) AND SUM(5)
-) AS c
-FROM t1
-GROUP BY col1;
-c
-1
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT (SELECT 1
-FROM t1
-WHERE SUM(1) BETWEEN COUNT(*) AND id
-) AS c
-FROM t1
-GROUP BY col1;
-c
-1
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-DROP TABLE t1;
-#
-# Bug#21415791 VALGRIND ERROR (CONDITIONAL JUMP) AT KEY_AND
-#              (RANGE_OPT_PARAM*, SEL_ARG*, SEL_AR
-#
-CREATE TABLE t1 (
-col_varchar_10 VARCHAR(10),
-pk INTEGER NOT NULL,
-col_int_key INTEGER,
-PRIMARY KEY (pk),
-KEY col_int_key (col_int_key),
-KEY col_varchar_10 (col_varchar_10)
-) ENGINE=InnoDB;
-INSERT INTO t1 (
-pk, col_varchar_10, col_int_key) VALUES
-(1, 'ttttt', 0), (2, 'zzzzz', 0), (3, 'ggggg', 0),
-(4, 'hhhhh', 0), (5, 'kkkkk', 0), (6, 'lllll', 0);
-CREATE TABLE t2 (
-pk INTEGER NOT NULL,
-col_varchar_10 VARCHAR(10),
-PRIMARY KEY (pk),
-KEY col_varchar_10 (col_varchar_10)
-) ENGINE=InnoDB;
-INSERT INTO t2 (
-pk,  col_varchar_10) VALUES
-(1, '00000'), (2, '00000'), (3, '44444'), (4, '00000'),
-(5, NULL), (6, NULL), (7, NULL);
-SELECT COUNT(t1.col_int_key)
-FROM t2 RIGHT OUTER JOIN t1 ON t2.col_varchar_10 <= t1.col_varchar_10
-WHERE t2.pk <> 4 OR t2.pk != t1.col_int_key AND t2.pk <> 1000;
-COUNT(t1.col_int_key)
-24
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-DROP TABLE t1, t2;
-#
-# Bug #20229614: OR CONDITIONS ON MULTI-COLUMN INDEX MAY NOT USE ALL
-#                INDEX COLUMNS TO FILTER ROWS
-#
-CREATE TABLE t1 (
-c1 INT,
-c2 INT,
-c3 INT,
-PRIMARY KEY(c1, c2, c3)
-) ENGINE=INNODB;
-INSERT INTO t1 VALUES (1, 1, 1), (1, 1, 2), (1, 1, 3),
-(1, 1, 4), (1, 1, 5);
-INSERT INTO t1 SELECT c1, 2, c3 FROM t1;
-INSERT INTO t1 SELECT c1, 3, c3 FROM t1 WHERE c2 = 1;
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-ANALYZE TABLE t1;
-Table	Op	Msg_type	Msg_text
-test.t1	analyze	status	OK
-SELECT COUNT(*) FROM t1;
-COUNT(*)
-15
-EXPLAIN SELECT c1, c2, c3
-FROM t1
-WHERE (c1 = 1 AND c2 = 1 AND c3 = 1) OR
-(c1 = 1 AND c2 = 2 AND c3 = 2) OR
-(c1 = 1 AND c2 = 2 AND c3 = 3);
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ref	PRIMARY	PRIMARY	4	const	15	6.67	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`c1` AS `c1`,`test`.`t1`.`c2` AS `c2`,`test`.`t1`.`c3` AS `c3` from `test`.`t1` where (((`test`.`t1`.`c3` = 1) and (`test`.`t1`.`c2` = 1) and (`test`.`t1`.`c1` = 1)) or ((`test`.`t1`.`c3` = 2) and (`test`.`t1`.`c2` = 2) and (`test`.`t1`.`c1` = 1)) or ((`test`.`t1`.`c3` = 3) and (`test`.`t1`.`c2` = 2) and (`test`.`t1`.`c1` = 1)))
-DROP TABLE t1;
-#
-# Bug#21139683: ASSERTION FAILED: TYPE_ARG == MAYBE_KEY ||
-#               TYPE_ARG == IMPOSSIBLE
-#
-CREATE TABLE t1 (
-a BLOB,
-PRIMARY KEY(a(1)),
-KEY(a(1))
-) ENGINE=INNODB;
-SELECT 1 FROM t1 WHERE a <> 'a' OR a <> "";
-1
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-DROP TABLE t1;
-#
-# Bug#19333852: RESULT DIFF IN QUERY HAVING DISTINCT
-#               WITH GROUP BY
-#
-CREATE TABLE t1 (
-v1 VARCHAR(20) CHARACTER SET utf8 NOT NULL,
-pk INTEGER NOT NULL,
-PRIMARY KEY (pk),
-KEY v1_key (v1(10))
-) ENGINE=InnoDB;
-Warnings:
-Warning	3719	'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous.
-INSERT INTO t1 VALUES ('ABCDE',19), ('JLVGO',14);
-EXPLAIN SELECT * FROM t1 WHERE t1.v1 < CHAR(127);
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	v1_key	NULL	NULL	NULL	2	50.00	Using where
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`v1` AS `v1`,`test`.`t1`.`pk` AS `pk` from `test`.`t1` where (`test`.`t1`.`v1` < <cache>(char(127)))
-EXPLAIN SELECT * FROM t1 WHERE t1.v1 = CHAR(127);
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ref	v1_key	v1_key	32	const	1	100.00	Using where
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`v1` AS `v1`,`test`.`t1`.`pk` AS `pk` from `test`.`t1` where (`test`.`t1`.`v1` = <cache>(char(127)))
-EXPLAIN SELECT * FROM t1 WHERE t1.v1 BETWEEN 'f' AND CHAR(127);
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	v1_key	NULL	NULL	NULL	2	50.00	Using where
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`t1`.`v1` AS `v1`,`test`.`t1`.`pk` AS `pk` from `test`.`t1` where (`test`.`t1`.`v1` between 'f' and <cache>(char(127)))
-SELECT * FROM t1 WHERE t1.v1 < CHAR(127);
-v1	pk
-JLVGO	14
-ABCDE	19
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t1 WHERE t1.v1 = CHAR(127);
-v1	pk
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT * FROM t1 WHERE t1.v1 BETWEEN 'f' AND CHAR(127);
-v1	pk
-JLVGO	14
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-DROP TABLE t1;
-#
-# Bug #21761867: ASSERTION `TYPE_ARG == MAYBE_KEY ||
-#                TYPE_ARG == IMPOSSIBLE' FAILED.
-#
-CREATE TABLE t1 (
-c10 INT NOT NULL,
-c12 INT NOT NULL,
-c18 INT,
-PRIMARY KEY (c10,c12),
-UNIQUE KEY key_c12(c12),
-KEY key_c18(c18));
-INSERT INTO t1 VALUES(11,5,0), (12,6,1), (13,7,2), (14,8,3), (15,9,4);
-CREATE TABLE t2 (
-c10 INT NOT NULL,
-c12 INT NOT NULL,
-PRIMARY KEY(c10,c12));
-CREATE TABLE t3 (c10 INT NOT NULL);
-SELECT t2.c10
-FROM t1
-RIGHT JOIN t3
-LEFT JOIN t2
-ON t3.c10 = t2.c10
-ON t1.c12 > t2.c12
-WHERE
-t1.c10 <= 25
-AND
-t1.c18 IS NOT NULL
-OR
-t1.c10 > 5
-AND
-t1.c18 IN (15,16,18);
-c10
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-DROP TABLE t1, t2, t3;
-#
-# Bug #21318711: WRONG RESULTS FOR TRUNCATED COLUMN AND AGGREGATION
-#
-CREATE TABLE t1 (
-col1 VARCHAR(5),
-col2 INT NOT NULL,
-PRIMARY KEY (col1, col2)
-) ENGINE=InnoDB, CHARSET utf8mb4;
-INSERT INTO t1 VALUES ('abcde', 10);
-EXPLAIN SELECT MAX(col2) FROM t1 WHERE col1 = 'abcdeaa';
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ref	PRIMARY	PRIMARY	22	const	1	100.00	Using where; Using index
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select max(`test`.`t1`.`col2`) AS `MAX(col2)` from `test`.`t1` where (`test`.`t1`.`col1` = 'abcdeaa')
-EXPLAIN SELECT MAX(col2) FROM t1 WHERE col1 = 'abcde  ';
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Select tables optimized away
-Warnings:
-Note	1003	/* select#1 */ select max(`test`.`t1`.`col2`) AS `MAX(col2)` from `test`.`t1` where multiple equal('abcde  ', `test`.`t1`.`col1`)
-SELECT MAX(col2) FROM t1 WHERE col1 = 'abcdeaa';
-MAX(col2)
-NULL
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT MAX(col2) FROM t1 WHERE col1 = 'abcde  ';
-MAX(col2)
-10
-DROP TABLE t1;
-#
-# Bug# 22283790: RANGE OPTIMIZER UTILIZES TOO MUCH MEMORY WITH
-#                MANY OR CONDITIONS
-#
-CREATE TABLE t1 (
-f1 INTEGER,
-KEY (f1)
-);
-INSERT INTO t1 VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13),(14),(15);
-SET @orig_range_optimizer_max_mem_size= @@range_optimizer_max_mem_size;
-SET range_optimizer_max_mem_size= 5000;
-EXPLAIN SELECT * FROM t1 WHERE f1=1 OR f1=2 OR f1=3 OR f1=4 OR f1=5
-OR f1=6 OR f1=7 OR f1=8 OR f1=9 OR f1=10 OR f1=11;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	range	f1	f1	5	NULL	11	100.00	Using where; Using index
-Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1` from `test`.`t1` where ((`test`.`t1`.`f1` = 1) or (`test`.`t1`.`f1` = 2) or (`test`.`t1`.`f1` = 3) or (`test`.`t1`.`f1` = 4) or (`test`.`t1`.`f1` = 5) or (`test`.`t1`.`f1` = 6) or (`test`.`t1`.`f1` = 7) or (`test`.`t1`.`f1` = 8) or (`test`.`t1`.`f1` = 9) or (`test`.`t1`.`f1` = 10) or (`test`.`t1`.`f1` = 11))
-SET range_optimizer_max_mem_size= @orig_range_optimizer_max_mem_size;
-DROP TABLE t1;
-#
-# Bug #23623110: REFACTOR USE_COUNT IN THE RANGE OPTIMIZER
-#
-# Tests deleting nodes in tree_delete() not from the end of the
-# linked list.
-#
-CREATE TABLE t1 (
-pk INTEGER,
-PRIMARY KEY (pk)
-);
-SELECT * FROM t1 WHERE pk IN (3, 8) OR pk NOT IN (2);
-pk
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-DROP TABLE t1;
-#
-# Bug #23623110: REFACTOR USE_COUNT IN THE RANGE OPTIMIZER
-#
-# Tests deleting nodes in tree_delete() not from the end of the
-# linked list.
-#
-# Indirectly tests ORing with a tree that has a nonzero refcount,
-# where nodes are also being skipped over. (There was a bug in
-# refcounting such trees earlier.)
-#
-CREATE TABLE t1 (
-col_int_key int,
-pk int NOT NULL,
-col_int int,
-KEY test_idx (pk,col_int_key,col_int)
-);
-SELECT * FROM t1 WHERE
-(col_int_key >= 6 AND pk > 6) OR
-(pk > 2 AND col_int_key = 7 AND col_int > 6);
-col_int_key	pk	col_int
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-DROP TABLE t1;
-#
-#
-# Bug #23259872: OPTIMIZER CHOOSES TO USE NON PRIMARY
-#                INDEX, EVEN THOUGH COST IS HIGHER
-#
-CREATE TABLE `giant_table` (
-`id` int(11) NOT NULL AUTO_INCREMENT,
-`one_id` int(11) NOT NULL,
-`other_id` bigint(20) NOT NULL DEFAULT '0',
-`some_other_id` int(11) DEFAULT 0 NOT NULL,
-`something` double NOT NULL DEFAULT '0',
-`comment` text COLLATE utf8_unicode_ci,
-`flags` int(11) NOT NULL DEFAULT '0',
-`time_created` int(11) NOT NULL DEFAULT '0',
-PRIMARY KEY (`id`),
-KEY `time_created` (`time_created`),
-KEY `some_other_id` (`some_other_id`),
-KEY `one_other_idx` (`one_id`,`other_id`),
-KEY `other_id` (`other_id`,`time_created`)
-) ENGINE=InnoDB AUTO_INCREMENT=101651329
-DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ;
-Warnings:
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-Warning	3778	'utf8_unicode_ci' is a collation of the deprecated character set UTF8MB3. Please consider using UTF8MB4 with an appropriate collation instead.
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-Warning	3719	'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous.
-Warning	3778	'utf8_unicode_ci' is a collation of the deprecated character set UTF8MB3. Please consider using UTF8MB4 with an appropriate collation instead.
-CREATE TABLE t1 (c1 INT);
-INSERT INTO t1 VALUES (66136540), (68983250), (89627210), (77869520),
-(82543190), (67538270), (77282760), (77908170),
-(70923370), (68066360);
-CREATE PROCEDURE p()
-BEGIN
-SET @x = 1;
-REPEAT
-INSERT INTO giant_table(id,one_id)
-SELECT c1 + @x, 0
-FROM t1
-WHERE c1 IN (66136540, 68985250, 89627210, 77869520 , 82543190, 67538270,
-77282760, 77908170, 70923370, 68066360);
-SET @x =  @x + 1;
-UNTIL @x > 30 END REPEAT;
-END $
-CALL p();
-SELECT count(*) FROM giant_table;
-count(*)
-270
-INSERT INTO giant_table (id,one_id) VALUES (66136539, 0), (68983258,1),
-(89628210,1), (77869520,2);
-INSERT INTO giant_table (id,one_id, some_other_id) VALUES(84673401, 0, 1),
-(61069031, 1, 1);
-EXPLAIN SELECT id, something, comment, time_created, one_id, other_id,
-some_other_id, flags
-FROM giant_table
-WHERE id IN (66136539, 68983258, 89628210, 77869520, 82543198, 67538272,
-84673401, 61069031, 68214385, 77282865, 76991297, 64569216,
-89481638, 74534074, 70396537, 80076375, 63308530, 77908270,
-70923271, 68066180)
-AND (giant_table.flags & 0x01) = 0 AND giant_table.some_other_id = 0;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	giant_table	NULL	ref	PRIMARY,some_other_id	some_other_id	4	const	138	50.00	Using index condition; Using where
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`giant_table`.`id` AS `id`,`test`.`giant_table`.`something` AS `something`,`test`.`giant_table`.`comment` AS `comment`,`test`.`giant_table`.`time_created` AS `time_created`,`test`.`giant_table`.`one_id` AS `one_id`,`test`.`giant_table`.`other_id` AS `other_id`,`test`.`giant_table`.`some_other_id` AS `some_other_id`,`test`.`giant_table`.`flags` AS `flags` from `test`.`giant_table` where ((`test`.`giant_table`.`some_other_id` = 0) and (`test`.`giant_table`.`id` in (66136539,68983258,89628210,77869520,82543198,67538272,84673401,61069031,68214385,77282865,76991297,64569216,89481638,74534074,70396537,80076375,63308530,77908270,70923271,68066180)) and ((`test`.`giant_table`.`flags` & 0x01) = 0))
-DROP PROCEDURE p;
-DROP TABLE giant_table, t1;
-#
-# Bug#22671573: SIG11 IN SEL_ARG::RB_INSERT |SQL/OPT_RANGE.CC
-#
-# Tests creating an empty tree (impossible condition) and then ANDing with it.
-#
-CREATE TABLE t1 (
-a INT,
-b INT,
-KEY test_idx (b, a)
-);
-SELECT * FROM t1 WHERE b BETWEEN 8 AND 8 AND a > 8 AND a <= 8;
-a	b
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-DROP TABLE t1;
-#
-# Indirectly tests inserting a node into an empty (impossible) tree.
-#
-CREATE TABLE t1 (
-pk INT,
-PRIMARY KEY ( pk )
-);
-SELECT * FROM t1 WHERE pk = 6 OR pk > 6;
-pk
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-DROP TABLE t1;
-#
-# Indirectly tests ORing with an empty (impossible) tree.
-#
-CREATE TABLE t1 (
-col_int_key INT,
-KEY (col_int_key)
-);
-SELECT * FROM t1 WHERE col_int_key IS NULL OR col_int_key < 9 OR col_int_key = 9;
-col_int_key
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-DROP TABLE t1;
-#
-# Indirectly tests deleting the last node from a tree
-# (which makes it IMPOSSIBLE) and then inserting more than one node.
-#
-CREATE TABLE t1 (
-a VARCHAR(64),
-KEY a (a)
-);
-SELECT * FROM t1 WHERE a IS NULL OR a NOT IN ( 'foo', 'bar' );
-a
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-DROP TABLE t1;
-#
-# Bug#25229315: ASSERTION TABLE->M_RECORD_BUFFER.RECORD_SIZE() ==
-#               RECORD_PREFIX_SIZE(TAB)' FAIL
-#
-CREATE TABLE t1 (pk INT PRIMARY KEY, vc VARCHAR(1)) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1, NULL), (2, 'w');
-CREATE TABLE t2 (
-i INT,
-vc VARCHAR(1),
-pk INT PRIMARY KEY,
-KEY (i),
-KEY (vc)
-) ENGINE=InnoDB;
-INSERT INTO t2 VALUES (1, 'p', 1), (9, 'w', 2), (NULL, 'r', 3);
-ANALYZE TABLE t1, t2;
-Table	Op	Msg_type	Msg_text
-test.t1	analyze	status	OK
-test.t2	analyze	status	OK
-EXPLAIN SELECT MIN(t1.pk) FROM t1, t2 WHERE t2.vc = t1.vc OR t2.i = t1.pk;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	PRIMARY	NULL	NULL	NULL	2	100.00	NULL
-1	SIMPLE	t2	NULL	ALL	i,vc	NULL	NULL	NULL	3	55.56	Using where; Using join buffer (hash join)
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select min(`test`.`t1`.`pk`) AS `MIN(t1.pk)` from `test`.`t1` join `test`.`t2` where ((`test`.`t2`.`vc` = `test`.`t1`.`vc`) or (`test`.`t2`.`i` = `test`.`t1`.`pk`))
-SELECT MIN(t1.pk) FROM t1, t2 WHERE t2.vc = t1.vc OR t2.i = t1.pk;
-MIN(t1.pk)
-1
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-DROP TABLE t1, t2;
-#
-# Bug #26727773: OPTIMIZER CHOSES COMPOSITE INDEX FOR REF OVER RANGE
-#
-CREATE TABLE transactions (
-app_trans_id INT DEFAULT NULL,
-id INT NOT NULL,
-tbl INT NOT NULL DEFAULT 1,
-created TIMESTAMP NOT NULL DEFAULT '2017-01-01 01:01:01',
-trans_type INT NOT NULL,
-description BLOB,
-source_lvl1 INT DEFAULT NULL,
-source_lvl2 INT DEFAULT NULL,
-KEY tbl_id_idx (tbl,id),
-KEY created_idx (created),
-KEY trans_type_created_idx (trans_type,created),
-KEY app_trans_id_idx (app_trans_id)
-) ENGINE=INNODB ;
-CREATE TABLE t1 (c1 INT);
-INSERT INTO t1 VALUES (1), (1000), (2000), (3000), (4000), (5000), (6000),
-(7000), (8000), (9000);
-CREATE PROCEDURE p()
-BEGIN
-SET @x = 1;
-REPEAT
-INSERT IGNORE INTO transactions(id,trans_type, description)
-SELECT c1 + @x, @x , 'abcd'
-  FROM t1;
-SET @x =  @x + 1;
-UNTIL @x > 300 END REPEAT;
-END $
-CALL p();
-SELECT count(*) FROM transactions;
-count(*)
-3000
-INSERT IGNORE INTO transactions(id,trans_type, description, created)
-SELECT 3, 3 , 'abcd', '2018-01-01 01:01:01'
-  FROM dual;
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-EXPLAIN SELECT '2017-10-23 01:01:01', HOUR(created), source_lvl1, source_lvl2,
-COUNT(DISTINCT(app_trans_id))
-FROM transactions
-WHERE created > '2017-10-23 01:01:01' AND tbl = 1 AND trans_type in (3)
-GROUP BY '2017-10-23 01:01:01', HOUR(created), source_lvl1, source_lvl2;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	transactions	NULL	ref	tbl_id_idx,created_idx,trans_type_created_idx	trans_type_created_idx	4	const	#	#	Using index condition; Using where; Using filesort
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select '2017-10-23 01:01:01' AS `2017-10-23 01:01:01`,hour(`test`.`transactions`.`created`) AS `HOUR(created)`,`test`.`transactions`.`source_lvl1` AS `source_lvl1`,`test`.`transactions`.`source_lvl2` AS `source_lvl2`,count(distinct `test`.`transactions`.`app_trans_id`) AS `COUNT(DISTINCT(app_trans_id))` from `test`.`transactions` where ((`test`.`transactions`.`trans_type` = 3) and (`test`.`transactions`.`tbl` = 1) and (`test`.`transactions`.`created` > TIMESTAMP'2017-10-23 01:01:01')) group by '2017-10-23 01:01:01',hour(`test`.`transactions`.`created`),`test`.`transactions`.`source_lvl1`,`test`.`transactions`.`source_lvl2`
-SET optimizer_trace="enabled=on";
-SELECT '2017-10-23 01:01:01', HOUR(created), source_lvl1, source_lvl2,
-COUNT(DISTINCT(app_trans_id))
-FROM transactions
-WHERE created > '2017-10-23 01:01:01' AND tbl = 1 AND trans_type in (3)
-GROUP BY '2017-10-23 01:01:01', HOUR(created), source_lvl1, source_lvl2;
-2017-10-23 01:01:01	HOUR(created)	source_lvl1	source_lvl2	COUNT(DISTINCT(app_trans_id))
-2017-10-23 01:01:01	1	NULL	NULL	0
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-SELECT TRACE INTO @trace FROM INFORMATION_SCHEMA.OPTIMIZER_TRACE;
-SELECT @trace RLIKE "range_uses_more_keyparts";
-@trace RLIKE "range_uses_more_keyparts"
-0
-SET optimizer_trace="enabled=off";
-DROP PROCEDURE p;
-DROP TABLE t1, transactions;
-#
-# Bug #28086754: OPTIMIZER SKIP THE RANG SCAN ON SECOND COLUMN IN A
-#                 COMPOSITE INDEX
-#
-CREATE TABLE test_ref (
-a INT PRIMARY KEY,
-b VARCHAR(20),
-c VARCHAR(20) DEFAULT NULL,
-d VARCHAR(3) DEFAULT NULL,
-id INT DEFAULT NULL,
-KEY idx1 (id, c),
-KEY idx2 (id, d)) ENGINE=INNODB ;
-ANALYZE TABLE t1;
-Table	Op	Msg_type	Msg_text
-test.t1	analyze	Error	Table 'test.t1' doesn't exist
-test.t1	analyze	status	Operation failed
-EXPLAIN SELECT *
-FROM test_ref
-WHERE id=3 AND c LIKE 'gh%'
-ORDER BY c, a
-LIMIT 1;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	test_ref	NULL	ref	idx1,idx2	idx1	5	const	25	11.11	Using index condition
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`test_ref`.`a` AS `a`,`test`.`test_ref`.`b` AS `b`,`test`.`test_ref`.`c` AS `c`,`test`.`test_ref`.`d` AS `d`,`test`.`test_ref`.`id` AS `id` from `test`.`test_ref` where ((`test`.`test_ref`.`id` = 3) and (`test`.`test_ref`.`c` like 'gh%')) order by `test`.`test_ref`.`c`,`test`.`test_ref`.`a` limit 1
-SELECT *
-FROM test_ref
-WHERE id=3 AND c LIKE 'gh%'
-ORDER BY c, a
-LIMIT 1;
-a	b	c	d	id
-34876	D003	gheennse	S	3
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-EXPLAIN SELECT *
-FROM test_ref
-WHERE id=3 AND c LIKE 'gh%'
-ORDER BY c DESC, a DESC
-LIMIT 1;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	test_ref	NULL	ref	idx1,idx2	idx1	5	const	25	11.11	Using where; Backward index scan
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-Note	1003	/* select#1 */ select `test`.`test_ref`.`a` AS `a`,`test`.`test_ref`.`b` AS `b`,`test`.`test_ref`.`c` AS `c`,`test`.`test_ref`.`d` AS `d`,`test`.`test_ref`.`id` AS `id` from `test`.`test_ref` where ((`test`.`test_ref`.`id` = 3) and (`test`.`test_ref`.`c` like 'gh%')) order by `test`.`test_ref`.`c` desc,`test`.`test_ref`.`a` desc limit 1
-SELECT *
-FROM test_ref
-WHERE id=3 AND c LIKE 'gh%'
-ORDER BY c DESC, a DESC
-LIMIT 1;
-a	b	c	d	id
-1770649	D003	gheennse	S	3
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-DROP TABLE test_ref;
-#
-# Bug #30988735: SELECT QUERY WITH ERROR RESULT WITH "NOT IN"
-#                WHERE_CLAUSE
-#
-CREATE TABLE t(f1 INTEGER key, f2 INTEGER)ENGINE=INNODB;
-INSERT INTO t VALUES(0,0);
-ANALYZE TABLE t;
-Table	Op	Msg_type	Msg_text
-test.t	analyze	status	OK
-SELECT f1,f2 FROM t WHERE f1 NOT IN(-0.1,0.1);
-f1	f2
-0	0
-Warnings:
-Warning	3170	Memory capacity of 10 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
-DROP TABLE t;
-SET RANGE_OPTIMIZER_MAX_MEM_SIZE= DEFAULT;
-# End of test for Bug#17769777 and Bug#17413040
diff -Nru mysql-8.0-8.0.26/mysql-test/r/read_only_persisted_plugin_variables.result mysql-8.0-8.0.27/mysql-test/r/read_only_persisted_plugin_variables.result
--- mysql-8.0-8.0.26/mysql-test/r/read_only_persisted_plugin_variables.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/read_only_persisted_plugin_variables.result	2021-09-28 11:46:34.000000000 +0000
@@ -47,7 +47,7 @@
 set @@persist_only.innodb_sync_array_size=1;
 set @@persist_only.innodb_use_native_aio=1;
 set @@persist_only.innodb_write_io_threads=4;
-set @@persist_only.log_replica_updates=0;
+set @@persist_only.log_replica_updates=1;
 set @@persist_only.max_digest_length=1024;
 set @@persist_only.myisam_recover_options='OFF';
 set @@persist_only.ngram_token_size=2;
@@ -150,8 +150,8 @@
 innodb_sync_array_size	1
 innodb_use_native_aio	1
 innodb_write_io_threads	4
-log_replica_updates	OFF
-log_slave_updates	OFF
+log_replica_updates	ON
+log_slave_updates	ON
 max_digest_length	1024
 myisam_recover_options	OFF
 ngram_token_size	2
diff -Nru mysql-8.0-8.0.26/mysql-test/r/regular_expressions_utf-8.result mysql-8.0-8.0.27/mysql-test/r/regular_expressions_utf-8.result
--- mysql-8.0-8.0.26/mysql-test/r/regular_expressions_utf-8.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/regular_expressions_utf-8.result	2021-09-28 11:46:34.000000000 +0000
@@ -913,7 +913,7 @@
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` bigint NOT NULL DEFAULT '0',
-  `b` int NOT NULL DEFAULT '0',
+  `b` int unsigned NOT NULL DEFAULT '0',
   `c` longtext CHARACTER SET latin1 NOT NULL,
   `d` varchar(1) CHARACTER SET latin1 DEFAULT NULL,
   `e` varchar(512) CHARACTER SET latin1 DEFAULT NULL,
@@ -1173,3 +1173,14 @@
 ERROR HY000: The regular expression contains an unclosed bracket expression.
 SET NAMES DEFAULT;
 SET SQL_MODE=DEFAULT;
+#
+# Bug #33290245 Item_func_st_distance_sphere::val_real():
+#               Assertion `is_nullable()' failed.
+select ( _utf32', ,*') regexp 13946;
+ERROR HY000: Cannot convert string '\x2C\x20\x2C\x2A' from utf32 to utf16le
+select regexp_instr( ( _utf32', ,*'), 13946);
+ERROR HY000: Cannot convert string '\x2C\x20\x2C\x2A' from utf32 to utf16le
+select regexp_replace( ( _utf32', ,*'), 13946, 42);
+ERROR HY000: Cannot convert string '\x2C\x20\x2C\x2A' from utf32 to utf16le
+select regexp_substr( ( _utf32', ,*'), 13946);
+ERROR HY000: Cannot convert string '\x2C\x20\x2C\x2A' from utf32 to utf16le
diff -Nru mysql-8.0-8.0.26/mysql-test/r/rename_roles.result mysql-8.0-8.0.27/mysql-test/r/rename_roles.result
--- mysql-8.0-8.0.26/mysql-test/r/rename_roles.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/rename_roles.result	2021-09-28 11:46:34.000000000 +0000
@@ -29,8 +29,8 @@
 SHOW GRANTS;
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 -------------------------------------
 SHOW GRANTS FOR u1@localhost USING r1;
 Grants for u1@localhost
diff -Nru mysql-8.0-8.0.26/mysql-test/r/rewrite_general_log.result mysql-8.0-8.0.27/mysql-test/r/rewrite_general_log.result
--- mysql-8.0-8.0.26/mysql-test/r/rewrite_general_log.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/rewrite_general_log.result	2021-09-28 11:46:34.000000000 +0000
@@ -204,6 +204,7 @@
 SET GLOBAL general_log_file =  '.../mysqld.1/mysqld.log';
 SET GLOBAL log_output=        'FILE';
 SET GLOBAL general_log=       1;
+TRUNCATE TABLE mysql.general_log;
 
 End of 5.7 tests!
 
diff -Nru mysql-8.0-8.0.26/mysql-test/r/rewrite_slow_log.result mysql-8.0-8.0.27/mysql-test/r/rewrite_slow_log.result
--- mysql-8.0-8.0.26/mysql-test/r/rewrite_slow_log.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/rewrite_slow_log.result	2021-09-28 11:46:34.000000000 +0000
@@ -104,5 +104,7 @@
 SET GLOBAL  slow_query_log_file=@old_slow_query_log_file;
 SET GLOBAL  slow_query_log=     @old_slow_query_log;
 SET GLOBAL  log_output=         @old_log_output;
+TRUNCATE TABLE mysql.slow_log;
+TRUNCATE TABLE mysql.general_log;
 SET GLOBAL  master_info_repository= @old_master_info_repository;
 SET GLOBAL  relay_log_info_repository= @old_relay_log_info_repository;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/roles.result mysql-8.0-8.0.27/mysql-test/r/roles.result
--- mysql-8.0-8.0.26/mysql-test/r/roles.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/roles.result	2021-09-28 11:46:34.000000000 +0000
@@ -166,8 +166,8 @@
 SHOW GRANTS FOR current_user() USING `engineering`@`%`,`role`@`%`;
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 GRANT `engineering`@`%`,`role`@`%` TO `root`@`localhost`
 GRANT role1 TO current_user();
 SET ROLE ALL EXCEPT role1;
@@ -781,6 +781,7 @@
 Privilege	Context	Comment
 APPLICATION_PASSWORD_ADMIN	Server Admin	
 AUDIT_ADMIN	Server Admin	
+AUTHENTICATION_POLICY_ADMIN	Server Admin	
 Alter	Tables	To alter the table
 Alter routine	Functions,Procedures	To alter or drop stored functions/procedures
 BACKUP_ADMIN	Server Admin	
@@ -807,12 +808,14 @@
 FLUSH_USER_RESOURCES	Server Admin	
 File	File access on server	To read and write files on the server
 GROUP_REPLICATION_ADMIN	Server Admin	
+GROUP_REPLICATION_STREAM	Server Admin	
 Grant option	Databases,Tables,Functions,Procedures	To give to other users those privileges you possess
 INNODB_REDO_LOG_ARCHIVE	Server Admin	
 INNODB_REDO_LOG_ENABLE	Server Admin	
 Index	Tables	To create or drop indexes
 Insert	Tables	To insert data into tables
 Lock tables	Databases	To use LOCK TABLES (together with SELECT privilege)
+PASSWORDLESS_USER_ADMIN	Server Admin	
 PERSIST_RO_VARIABLES_ADMIN	Server Admin	
 Process	Server Admin	To view the plain text of currently executing queries
 Proxy	Server Admin	To make proxy user possible
@@ -1101,19 +1104,19 @@
 CREATE USER u1 IDENTIFIED BY 'foo' DEFAULT ROLE a,a@localhost,`b`,`b`@local,`c c`,`aaa`, `a`@`a`;
 SHOW CREATE USER u1;
 CREATE USER for u1@%
-CREATE USER 'u1'@'%' IDENTIFIED WITH 'caching_sha2_password' AS '<hash>' DEFAULT ROLE `a`@`%`,`a`@`a`,`a`@`localhost`,`aaa`@`%`,`b`@`%`,`b`@`local`,`c c`@`%` REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u1`@`%` IDENTIFIED WITH 'caching_sha2_password' AS '<hash>' DEFAULT ROLE `a`@`%`,`a`@`a`,`a`@`localhost`,`aaa`@`%`,`b`@`%`,`b`@`local`,`c c`@`%` REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u1;
 ERROR HY000: Operation CREATE USER failed for 'u1'@'%'
 # Same as before and don't crash.
 SHOW CREATE USER u1;
 CREATE USER for u1@%
-CREATE USER 'u1'@'%' IDENTIFIED WITH 'caching_sha2_password' AS '<hash>' DEFAULT ROLE `a`@`%`,`a`@`a`,`a`@`localhost`,`aaa`@`%`,`b`@`%`,`b`@`local`,`c c`@`%` REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u1`@`%` IDENTIFIED WITH 'caching_sha2_password' AS '<hash>' DEFAULT ROLE `a`@`%`,`a`@`a`,`a`@`localhost`,`aaa`@`%`,`b`@`%`,`b`@`local`,`c c`@`%` REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 # check that we can combine different properties with default roles.
 CREATE ROLE r1;
 CREATE USER u2 DEFAULT ROLE r1 REQUIRE SSL ACCOUNT LOCK;
 SHOW CREATE USER u2;
 CREATE USER for u2@%
-CREATE USER 'u2'@'%' IDENTIFIED WITH 'caching_sha2_password' DEFAULT ROLE `r1`@`%` REQUIRE SSL PASSWORD EXPIRE DEFAULT ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u2`@`%` IDENTIFIED WITH 'caching_sha2_password' DEFAULT ROLE `r1`@`%` REQUIRE SSL PASSWORD EXPIRE DEFAULT ACCOUNT LOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 SELECT user,host FROM mysql.user;
 user	host
 a	%
@@ -1148,7 +1151,7 @@
 ALTER USER u1 DEFAULT ROLE r1;
 SHOW CREATE USER u1;
 CREATE USER for u1@%
-CREATE USER 'u1'@'%' IDENTIFIED WITH 'caching_sha2_password' DEFAULT ROLE `r1`@`%` REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u1`@`%` IDENTIFIED WITH 'caching_sha2_password' DEFAULT ROLE `r1`@`%` REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 SELECT * FROM mysql.default_roles;
 HOST	USER	DEFAULT_ROLE_HOST	DEFAULT_ROLE_USER
 %	u1	%	r1
diff -Nru mysql-8.0-8.0.26/mysql-test/r/row.result mysql-8.0-8.0.27/mysql-test/r/row.result
--- mysql-8.0-8.0.26/mysql-test/r/row.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/row.result	2021-09-28 11:46:34.000000000 +0000
@@ -340,7 +340,7 @@
 EXPLAIN
 -> Nested loop inner join  (cost=3.40 rows=7)
     -> Index scan on t2 using PRIMARY  (cost=0.95 rows=7)
-    -> Single-row index lookup on t1 using PRIMARY (a=t2.a, b=t2.b)  (cost=0.26 rows=1)
+    -> Single-row covering index lookup on t1 using PRIMARY (a=t2.a, b=t2.b)  (cost=0.26 rows=1)
 
 EXPLAIN SELECT * FROM t1,t2 WHERE (t1.a,t1.b)=(t2.a,t2.b);
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -352,7 +352,7 @@
 EXPLAIN
 -> Nested loop inner join  (cost=3.40 rows=7)
     -> Index scan on t2 using PRIMARY  (cost=0.95 rows=7)
-    -> Single-row index lookup on t1 using PRIMARY (a=t2.a, b=t2.b)  (cost=0.26 rows=1)
+    -> Single-row covering index lookup on t1 using PRIMARY (a=t2.a, b=t2.b)  (cost=0.26 rows=1)
 
 SELECT * FROM t1,t2 WHERE t1.a=t2.a and t1.b=t2.b;
 a	b	a	b	c
diff -Nru mysql-8.0-8.0.26/mysql-test/r/schema.result mysql-8.0-8.0.27/mysql-test/r/schema.result
--- mysql-8.0-8.0.26/mysql-test/r/schema.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/schema.result	2021-09-28 11:46:34.000000000 +0000
@@ -345,3 +345,11 @@
 ALTER SCHEMA s1 READ ONLY DEFAULT;
 DROP table t1;
 DROP SCHEMA s1;
+#
+# Bug #33183590: COLLATE maybe overwritten by charset if both specified in create database stmt
+#
+CREATE DATABASE test1 COLLATE utf8mb4_bin CHARACTER SET utf8mb4;
+SHOW CREATE DATABASE test1;
+Database	Create Database
+test1	CREATE DATABASE `test1` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin */ /*!80016 DEFAULT ENCRYPTION='N' */
+DROP DATABASE test1;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/select_all_bka_nobnl.result mysql-8.0-8.0.27/mysql-test/r/select_all_bka_nobnl.result
--- mysql-8.0-8.0.26/mysql-test/r/select_all_bka_nobnl.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/select_all_bka_nobnl.result	2021-09-28 11:46:34.000000000 +0000
@@ -544,6 +544,7 @@
 insert into t3 select * from tmp;
 insert into tmp select * from t3;
 insert into t3 select * from tmp;
+set session innodb_parallel_read_threads = 1;
 alter table t3 add t2nr int not null auto_increment primary key first;
 drop table tmp;
 SET BIG_TABLES=1;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/select_all_bka.result mysql-8.0-8.0.27/mysql-test/r/select_all_bka.result
--- mysql-8.0-8.0.26/mysql-test/r/select_all_bka.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/select_all_bka.result	2021-09-28 11:46:34.000000000 +0000
@@ -544,6 +544,7 @@
 insert into t3 select * from tmp;
 insert into tmp select * from t3;
 insert into t3 select * from tmp;
+set session innodb_parallel_read_threads = 1;
 alter table t3 add t2nr int not null auto_increment primary key first;
 drop table tmp;
 SET BIG_TABLES=1;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/select_all.result mysql-8.0-8.0.27/mysql-test/r/select_all.result
--- mysql-8.0-8.0.26/mysql-test/r/select_all.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/select_all.result	2021-09-28 11:46:34.000000000 +0000
@@ -543,6 +543,7 @@
 insert into t3 select * from tmp;
 insert into tmp select * from t3;
 insert into t3 select * from tmp;
+set session innodb_parallel_read_threads = 1;
 alter table t3 add t2nr int not null auto_increment primary key first;
 drop table tmp;
 SET BIG_TABLES=1;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/select_icp_mrr_bka_nobnl.result mysql-8.0-8.0.27/mysql-test/r/select_icp_mrr_bka_nobnl.result
--- mysql-8.0-8.0.26/mysql-test/r/select_icp_mrr_bka_nobnl.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/select_icp_mrr_bka_nobnl.result	2021-09-28 11:46:34.000000000 +0000
@@ -544,6 +544,7 @@
 insert into t3 select * from tmp;
 insert into tmp select * from t3;
 insert into t3 select * from tmp;
+set session innodb_parallel_read_threads = 1;
 alter table t3 add t2nr int not null auto_increment primary key first;
 drop table tmp;
 SET BIG_TABLES=1;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/select_icp_mrr_bka.result mysql-8.0-8.0.27/mysql-test/r/select_icp_mrr_bka.result
--- mysql-8.0-8.0.26/mysql-test/r/select_icp_mrr_bka.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/select_icp_mrr_bka.result	2021-09-28 11:46:34.000000000 +0000
@@ -544,6 +544,7 @@
 insert into t3 select * from tmp;
 insert into tmp select * from t3;
 insert into t3 select * from tmp;
+set session innodb_parallel_read_threads = 1;
 alter table t3 add t2nr int not null auto_increment primary key first;
 drop table tmp;
 SET BIG_TABLES=1;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/select_icp_mrr.result mysql-8.0-8.0.27/mysql-test/r/select_icp_mrr.result
--- mysql-8.0-8.0.26/mysql-test/r/select_icp_mrr.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/select_icp_mrr.result	2021-09-28 11:46:34.000000000 +0000
@@ -543,6 +543,7 @@
 insert into t3 select * from tmp;
 insert into tmp select * from t3;
 insert into t3 select * from tmp;
+set session innodb_parallel_read_threads = 1;
 alter table t3 add t2nr int not null auto_increment primary key first;
 drop table tmp;
 SET BIG_TABLES=1;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/select_none_bka_nobnl.result mysql-8.0-8.0.27/mysql-test/r/select_none_bka_nobnl.result
--- mysql-8.0-8.0.26/mysql-test/r/select_none_bka_nobnl.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/select_none_bka_nobnl.result	2021-09-28 11:46:34.000000000 +0000
@@ -543,6 +543,7 @@
 insert into t3 select * from tmp;
 insert into tmp select * from t3;
 insert into t3 select * from tmp;
+set session innodb_parallel_read_threads = 1;
 alter table t3 add t2nr int not null auto_increment primary key first;
 drop table tmp;
 SET BIG_TABLES=1;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/select_none_bka.result mysql-8.0-8.0.27/mysql-test/r/select_none_bka.result
--- mysql-8.0-8.0.26/mysql-test/r/select_none_bka.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/select_none_bka.result	2021-09-28 11:46:34.000000000 +0000
@@ -543,6 +543,7 @@
 insert into t3 select * from tmp;
 insert into tmp select * from t3;
 insert into t3 select * from tmp;
+set session innodb_parallel_read_threads = 1;
 alter table t3 add t2nr int not null auto_increment primary key first;
 drop table tmp;
 SET BIG_TABLES=1;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/select_none.result mysql-8.0-8.0.27/mysql-test/r/select_none.result
--- mysql-8.0-8.0.26/mysql-test/r/select_none.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/select_none.result	2021-09-28 11:46:34.000000000 +0000
@@ -542,6 +542,7 @@
 insert into t3 select * from tmp;
 insert into tmp select * from t3;
 insert into t3 select * from tmp;
+set session innodb_parallel_read_threads = 1;
 alter table t3 add t2nr int not null auto_increment primary key first;
 drop table tmp;
 SET BIG_TABLES=1;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/server_offline_7.result mysql-8.0-8.0.27/mysql-test/r/server_offline_7.result
--- mysql-8.0-8.0.26/mysql-test/r/server_offline_7.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/server_offline_7.result	2021-09-28 11:46:34.000000000 +0000
@@ -63,12 +63,12 @@
 # Should report 6 root processes
 SELECT COUNT(USER) FROM INFORMATION_SCHEMA.PROCESSLIST;
 COUNT(USER)
-7
+11
 SET GLOBAL offline_mode=ON;
 # Should report 6 root processes
 SELECT COUNT(USER) FROM INFORMATION_SCHEMA.PROCESSLIST;
 COUNT(USER)
-7
+11
 SET GLOBAL offline_mode = @slave_saved_tmp;
 include/rpl_end.inc
 # Restoring the original values.
diff -Nru mysql-8.0-8.0.26/mysql-test/r/session_tracker_trx_state.result mysql-8.0-8.0.27/mysql-test/r/session_tracker_trx_state.result
--- mysql-8.0-8.0.26/mysql-test/r/session_tracker_trx_state.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/session_tracker_trx_state.result	2021-09-28 11:46:34.000000000 +0000
@@ -782,10 +782,10 @@
 -- Tracker : SESSION_TRACK_TRANSACTION_STATE
 -- ________
 
-TRUNCATE TABLE mysql.general_log;
 SET GLOBAL general_log_file=  @old_general_log_file;
 SET GLOBAL general_log=       @old_general_log;
 SET GLOBAL log_output=        @old_log_output;
+TRUNCATE TABLE mysql.general_log;
 ########################################################################
 #
 # XA
diff -Nru mysql-8.0-8.0.26/mysql-test/r/shm.result mysql-8.0-8.0.27/mysql-test/r/shm.result
--- mysql-8.0-8.0.26/mysql-test/r/shm.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/shm.result	2021-09-28 11:46:34.000000000 +0000
@@ -537,6 +537,7 @@
 insert into t3 select * from tmp;
 insert into tmp select * from t3;
 insert into t3 select * from tmp;
+set session innodb_parallel_read_threads=1;
 alter table t3 add t2nr int not null auto_increment primary key first;
 drop table tmp;
 SET BIG_TABLES=1;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/show_check_ci.result mysql-8.0-8.0.27/mysql-test/r/show_check_ci.result
--- mysql-8.0-8.0.26/mysql-test/r/show_check_ci.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/show_check_ci.result	2021-09-28 11:46:34.000000000 +0000
@@ -1,3 +1,5 @@
+SET @old_log_output= @@global.log_output;
+SET GLOBAL log_output="FILE,TABLE";
 drop table if exists t1,t2;
 drop table if exists t1aa,t2aa;
 drop database if exists mysqltest;
@@ -1581,3 +1583,6 @@
 DROP TABLE t1;
 DROP TABLE t2;
 DROP TABLE t3;
+SET @@global.log_output = @old_log_output;
+TRUNCATE TABLE mysql.general_log;
+TRUNCATE TABLE mysql.slow_log;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/show_check_cs.result mysql-8.0-8.0.27/mysql-test/r/show_check_cs.result
--- mysql-8.0-8.0.26/mysql-test/r/show_check_cs.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/show_check_cs.result	2021-09-28 11:46:34.000000000 +0000
@@ -1,3 +1,5 @@
+SET @old_log_output= @@global.log_output;
+SET GLOBAL log_output="FILE,TABLE";
 drop table if exists t1,t2;
 drop table if exists t1aa,t2aa;
 drop database if exists mysqltest;
@@ -1579,3 +1581,6 @@
 DROP TABLE t1;
 DROP TABLE t2;
 DROP TABLE t3;
+SET @@global.log_output = @old_log_output;
+TRUNCATE TABLE mysql.general_log;
+TRUNCATE TABLE mysql.slow_log;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/sigusr1.result mysql-8.0-8.0.27/mysql-test/r/sigusr1.result
--- mysql-8.0-8.0.26/mysql-test/r/sigusr1.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/sigusr1.result	2021-09-28 11:46:34.000000000 +0000
@@ -76,5 +76,7 @@
 1
 # CLEAN UP
 SET @@global.general_log=0;
+TRUNCATE TABLE mysql.general_log;
+TRUNCATE TABLE mysql.slow_log;
 # Restore default settings
 # restart:
diff -Nru mysql-8.0-8.0.26/mysql-test/r/slow_log.result mysql-8.0-8.0.27/mysql-test/r/slow_log.result
--- mysql-8.0-8.0.26/mysql-test/r/slow_log.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/slow_log.result	2021-09-28 11:46:34.000000000 +0000
@@ -63,5 +63,7 @@
 F>/* KILL QUERY: should be logged */ SELECT SLEEP(1002);
 SET @@global.slow_query_log_file= @old_slow_query_log_file;
 SET @@global.log_output         = @old_log_output;
+TRUNCATE TABLE mysql.general_log;
+TRUNCATE TABLE mysql.slow_log;
 #
 # Done.
diff -Nru mysql-8.0-8.0.26/mysql-test/r/sp-bugs.result mysql-8.0-8.0.27/mysql-test/r/sp-bugs.result
--- mysql-8.0-8.0.26/mysql-test/r/sp-bugs.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/sp-bugs.result	2021-09-28 11:46:34.000000000 +0000
@@ -532,3 +532,22 @@
 NULL
 DROP FUNCTION func1;
 DROP FUNCTION func2;
+#
+# Bug#33079184 - sp_lex_instr::reset_lex_and_exec_core: assertion
+#                `error || m_lex->is_exec_started()' failed.
+# Assertion to make sure sp instruction execution is started unless
+# there is an error, failed.
+#
+CREATE PROCEDURE p()
+BEGIN
+DECLARE CONTINUE HANDLER FOR SQLEXCEPTION BEGIN END;
+SET @x = 0;
+WHILE @x < 2 DO
+CASE((SELECT q > 1)) WHEN 1 THEN SELECT 1; END CASE;
+SET @x = @x + 1;
+END WHILE;
+END$
+# Without fix, assertion fails for following statement in debug build.
+# In non-debug build, statement executes successfully.
+CALL p();
+DROP PROCEDURE p;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/sp.result mysql-8.0-8.0.27/mysql-test/r/sp.result
--- mysql-8.0-8.0.26/mysql-test/r/sp.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/sp.result	2021-09-28 11:46:34.000000000 +0000
@@ -2649,6 +2649,7 @@
 end|
 Warnings:
 Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 call bug7743("oneword")|
 Level	Code	Message
 var
@@ -7985,13 +7986,13 @@
 call bug4902()|
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 call bug4902()|
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 drop procedure bug4902|
 drop procedure if exists bug4902_2|
 create procedure bug4902_2()
@@ -8135,13 +8136,13 @@
 call 15298_1();
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 call 15298_2();
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 drop user mysqltest_1@localhost;
 drop procedure 15298_1;
 drop procedure 15298_2;
@@ -8575,3 +8576,84 @@
 ERROR HY000: Recursive stored functions and triggers are not allowed.
 DROP FUNCTION f1;
 DROP FUNCTION f2;
+# Bug#32855634: Assert(m_deque == other.m_deque) in mem_root_deque.h
+CREATE PROCEDURE p1()
+BEGIN
+DROP TEMPORARY TABLE IF EXISTS tmp;
+CREATE TEMPORARY TABLE tmp(name VARCHAR(64), value VARCHAR(64));
+IF EXISTS(SELECT 1
+FROM tmp d
+LEFT JOIN information_schema.columns c
+ON c.table_schema = 'test' AND
+upper(c.column_name) = upper(d.name)
+WHERE c.table_schema IS NULL
+)
+THEN
+SELECT 'then';
+ELSE
+SELECT 'else';
+END IF;
+CASE EXISTS(SELECT 1
+FROM tmp d
+LEFT JOIN information_schema.columns c
+ON c.table_schema = 'test' AND
+upper(c.column_name) = upper(d.name)
+WHERE c.table_schema IS NULL
+)
+WHEN TRUE THEN SELECT 'true';
+WHEN FALSE THEN SELECT 'false';
+END CASE;
+CASE
+WHEN EXISTS(SELECT 1
+FROM tmp d
+LEFT JOIN information_schema.columns c
+ON c.table_schema = 'test' AND
+upper(c.column_name) = upper(d.name)
+WHERE c.table_schema IS NULL
+)
+THEN SELECT 'true';
+ELSE SELECT 'false';
+END CASE;
+WHILE EXISTS(SELECT 1
+FROM tmp d
+LEFT JOIN information_schema.columns c
+ON c.table_schema = 'test' AND
+upper(c.column_name) = upper(d.name)
+WHERE c.table_schema IS NULL
+)
+DO
+SELECT 'while';
+END WHILE;
+REPEAT
+SELECT 'repeat';
+UNTIL NOT
+EXISTS(SELECT 1
+FROM tmp d
+LEFT JOIN information_schema.columns c
+ON c.table_schema = 'test' AND
+upper(c.column_name) = upper(d.name)
+WHERE c.table_schema IS NULL
+)
+END REPEAT;
+DROP TEMPORARY TABLE tmp;
+END;
+//
+CALL p1();
+else
+else
+false
+false
+false
+false
+repeat
+repeat
+CALL p1();
+else
+else
+false
+false
+false
+false
+repeat
+repeat
+DROP PROCEDURE p1;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ssl_compress.result mysql-8.0-8.0.27/mysql-test/r/ssl_compress.result
--- mysql-8.0-8.0.26/mysql-test/r/ssl_compress.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ssl_compress.result	2021-09-28 11:46:34.000000000 +0000
@@ -543,6 +543,7 @@
 insert into t3 select * from tmp;
 insert into tmp select * from t3;
 insert into t3 select * from tmp;
+set session innodb_parallel_read_threads=1;
 alter table t3 add t2nr int not null auto_increment primary key first;
 drop table tmp;
 SET BIG_TABLES=1;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/ssl.result mysql-8.0-8.0.27/mysql-test/r/ssl.result
--- mysql-8.0-8.0.26/mysql-test/r/ssl.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/ssl.result	2021-09-28 11:46:34.000000000 +0000
@@ -546,6 +546,7 @@
 insert into t3 select * from tmp;
 insert into tmp select * from t3;
 insert into t3 select * from tmp;
+set session innodb_parallel_read_threads=1;
 alter table t3 add t2nr int not null auto_increment primary key first;
 drop table tmp;
 SET BIG_TABLES=1;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/status.result mysql-8.0-8.0.27/mysql-test/r/status.result
--- mysql-8.0-8.0.26/mysql-test/r/status.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/status.result	2021-09-28 11:46:34.000000000 +0000
@@ -357,7 +357,7 @@
 TIMESTAMPDIFF(SECOND,'DTVALUE','DTVALUE') <> 0
 1
 set @@global.concurrent_insert= @old_concurrent_insert;
-SET GLOBAL log_output = @old_log_output;
+SET GLOBAL log_output = 'FILE,TABLE';
 #
 # Bug#28786951 SET LAST_QUERY_COST FOR QUERIES WITH SUBQUERIES AND UNIONS
 #
@@ -514,3 +514,6 @@
 Variable_name	Value
 Last_query_cost	9.664743
 DROP TABLE t1, t2;
+SET @@global.log_output = @old_log_output;
+SET @@global.general_log = @old_general_log;
+TRUNCATE TABLE mysql.general_log;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/subquery_all_bka_nobnl.result mysql-8.0-8.0.27/mysql-test/r/subquery_all_bka_nobnl.result
--- mysql-8.0-8.0.26/mysql-test/r/subquery_all_bka_nobnl.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/subquery_all_bka_nobnl.result	2021-09-28 11:46:34.000000000 +0000
@@ -7557,7 +7557,7 @@
 Warnings:
 Note	1276	Field or reference 'test.alias1.col_int_key' of SELECT #3 was resolved in SELECT #2
 Note	1276	Field or reference 'test.alias1.col_varchar_key' of SELECT #3 was resolved in SELECT #2
-Note	1003	/* select#1 */ select `alias2`.`col_varchar_nokey` AS `col_varchar_nokey` from `test`.`t1` `alias2` join `test`.`t1` semi join (`test`.`t1` left join `test`.`t1` `sq2_alias2` on((`sq2_alias2`.`col_int_key` = `test`.`t1`.`pk`))) where ((`alias2`.`col_varchar_key` = `test`.`t1`.`col_varchar_nokey`) and (`test`.`t1`.`pk` <> `test`.`t1`.`col_int_key`) and (`test`.`t1`.`col_varchar_key` > `test`.`t1`.`col_varchar_key`))
+Note	1003	/* select#1 */ select `test`.`alias2`.`col_varchar_nokey` AS `col_varchar_nokey` from `test`.`t1` `alias2` join `test`.`t1` semi join (`test`.`t1` left join `test`.`t1` `sq2_alias2` on((`test`.`sq2_alias2`.`col_int_key` = `test`.`t1`.`pk`))) where ((`test`.`alias2`.`col_varchar_key` = `test`.`t1`.`col_varchar_nokey`) and (`test`.`t1`.`pk` <> `test`.`t1`.`col_int_key`) and (`test`.`t1`.`col_varchar_key` > `test`.`t1`.`col_varchar_key`))
 SELECT * FROM v2;
 col_varchar_nokey
 d
@@ -7588,7 +7588,7 @@
 Warnings:
 Note	1276	Field or reference 'alias1.col_int_key' of SELECT #2 was resolved in SELECT #1
 Note	1276	Field or reference 'alias1.col_varchar_key' of SELECT #2 was resolved in SELECT #1
-Note	1003	/* select#1 */ select `alias2`.`col_varchar_nokey` AS `col_varchar_nokey` from `test`.`t1` `alias2` join `test`.`t1` semi join (`test`.`t1` left join `test`.`t1` `sq2_alias2` on((`sq2_alias2`.`col_int_key` = `test`.`t1`.`pk`))) where ((`alias2`.`col_varchar_key` = `test`.`t1`.`col_varchar_nokey`) and (`test`.`t1`.`pk` <> `test`.`t1`.`col_int_key`) and (`test`.`t1`.`col_varchar_key` > `test`.`t1`.`col_varchar_key`))
+Note	1003	/* select#1 */ select `test`.`alias2`.`col_varchar_nokey` AS `col_varchar_nokey` from `test`.`t1` `alias2` join `test`.`t1` semi join (`test`.`t1` left join `test`.`t1` `sq2_alias2` on((`test`.`sq2_alias2`.`col_int_key` = `test`.`t1`.`pk`))) where ((`test`.`alias2`.`col_varchar_key` = `test`.`t1`.`col_varchar_nokey`) and (`test`.`t1`.`pk` <> `test`.`t1`.`col_int_key`) and (`test`.`t1`.`col_varchar_key` > `test`.`t1`.`col_varchar_key`))
 SELECT alias2.col_varchar_nokey
 FROM t1 AS alias2
 LEFT JOIN v1 AS alias1 ON 1
diff -Nru mysql-8.0-8.0.26/mysql-test/r/subquery_all_bka.result mysql-8.0-8.0.27/mysql-test/r/subquery_all_bka.result
--- mysql-8.0-8.0.26/mysql-test/r/subquery_all_bka.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/subquery_all_bka.result	2021-09-28 11:46:34.000000000 +0000
@@ -7557,7 +7557,7 @@
 Warnings:
 Note	1276	Field or reference 'test.alias1.col_int_key' of SELECT #3 was resolved in SELECT #2
 Note	1276	Field or reference 'test.alias1.col_varchar_key' of SELECT #3 was resolved in SELECT #2
-Note	1003	/* select#1 */ select `alias2`.`col_varchar_nokey` AS `col_varchar_nokey` from `test`.`t1` `alias2` join `test`.`t1` semi join (`test`.`t1` left join `test`.`t1` `sq2_alias2` on((`sq2_alias2`.`col_int_key` = `test`.`t1`.`pk`))) where ((`alias2`.`col_varchar_key` = `test`.`t1`.`col_varchar_nokey`) and (`test`.`t1`.`pk` <> `test`.`t1`.`col_int_key`) and (`test`.`t1`.`col_varchar_key` > `test`.`t1`.`col_varchar_key`))
+Note	1003	/* select#1 */ select `test`.`alias2`.`col_varchar_nokey` AS `col_varchar_nokey` from `test`.`t1` `alias2` join `test`.`t1` semi join (`test`.`t1` left join `test`.`t1` `sq2_alias2` on((`test`.`sq2_alias2`.`col_int_key` = `test`.`t1`.`pk`))) where ((`test`.`alias2`.`col_varchar_key` = `test`.`t1`.`col_varchar_nokey`) and (`test`.`t1`.`pk` <> `test`.`t1`.`col_int_key`) and (`test`.`t1`.`col_varchar_key` > `test`.`t1`.`col_varchar_key`))
 SELECT * FROM v2;
 col_varchar_nokey
 d
@@ -7588,7 +7588,7 @@
 Warnings:
 Note	1276	Field or reference 'alias1.col_int_key' of SELECT #2 was resolved in SELECT #1
 Note	1276	Field or reference 'alias1.col_varchar_key' of SELECT #2 was resolved in SELECT #1
-Note	1003	/* select#1 */ select `alias2`.`col_varchar_nokey` AS `col_varchar_nokey` from `test`.`t1` `alias2` join `test`.`t1` semi join (`test`.`t1` left join `test`.`t1` `sq2_alias2` on((`sq2_alias2`.`col_int_key` = `test`.`t1`.`pk`))) where ((`alias2`.`col_varchar_key` = `test`.`t1`.`col_varchar_nokey`) and (`test`.`t1`.`pk` <> `test`.`t1`.`col_int_key`) and (`test`.`t1`.`col_varchar_key` > `test`.`t1`.`col_varchar_key`))
+Note	1003	/* select#1 */ select `test`.`alias2`.`col_varchar_nokey` AS `col_varchar_nokey` from `test`.`t1` `alias2` join `test`.`t1` semi join (`test`.`t1` left join `test`.`t1` `sq2_alias2` on((`test`.`sq2_alias2`.`col_int_key` = `test`.`t1`.`pk`))) where ((`test`.`alias2`.`col_varchar_key` = `test`.`t1`.`col_varchar_nokey`) and (`test`.`t1`.`pk` <> `test`.`t1`.`col_int_key`) and (`test`.`t1`.`col_varchar_key` > `test`.`t1`.`col_varchar_key`))
 SELECT alias2.col_varchar_nokey
 FROM t1 AS alias2
 LEFT JOIN v1 AS alias1 ON 1
diff -Nru mysql-8.0-8.0.26/mysql-test/r/subquery_all.result mysql-8.0-8.0.27/mysql-test/r/subquery_all.result
--- mysql-8.0-8.0.26/mysql-test/r/subquery_all.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/subquery_all.result	2021-09-28 11:46:34.000000000 +0000
@@ -7556,7 +7556,7 @@
 Warnings:
 Note	1276	Field or reference 'test.alias1.col_int_key' of SELECT #3 was resolved in SELECT #2
 Note	1276	Field or reference 'test.alias1.col_varchar_key' of SELECT #3 was resolved in SELECT #2
-Note	1003	/* select#1 */ select `alias2`.`col_varchar_nokey` AS `col_varchar_nokey` from `test`.`t1` `alias2` join `test`.`t1` semi join (`test`.`t1` left join `test`.`t1` `sq2_alias2` on((`sq2_alias2`.`col_int_key` = `test`.`t1`.`pk`))) where ((`alias2`.`col_varchar_key` = `test`.`t1`.`col_varchar_nokey`) and (`test`.`t1`.`pk` <> `test`.`t1`.`col_int_key`) and (`test`.`t1`.`col_varchar_key` > `test`.`t1`.`col_varchar_key`))
+Note	1003	/* select#1 */ select `test`.`alias2`.`col_varchar_nokey` AS `col_varchar_nokey` from `test`.`t1` `alias2` join `test`.`t1` semi join (`test`.`t1` left join `test`.`t1` `sq2_alias2` on((`test`.`sq2_alias2`.`col_int_key` = `test`.`t1`.`pk`))) where ((`test`.`alias2`.`col_varchar_key` = `test`.`t1`.`col_varchar_nokey`) and (`test`.`t1`.`pk` <> `test`.`t1`.`col_int_key`) and (`test`.`t1`.`col_varchar_key` > `test`.`t1`.`col_varchar_key`))
 SELECT * FROM v2;
 col_varchar_nokey
 d
@@ -7587,7 +7587,7 @@
 Warnings:
 Note	1276	Field or reference 'alias1.col_int_key' of SELECT #2 was resolved in SELECT #1
 Note	1276	Field or reference 'alias1.col_varchar_key' of SELECT #2 was resolved in SELECT #1
-Note	1003	/* select#1 */ select `alias2`.`col_varchar_nokey` AS `col_varchar_nokey` from `test`.`t1` `alias2` join `test`.`t1` semi join (`test`.`t1` left join `test`.`t1` `sq2_alias2` on((`sq2_alias2`.`col_int_key` = `test`.`t1`.`pk`))) where ((`alias2`.`col_varchar_key` = `test`.`t1`.`col_varchar_nokey`) and (`test`.`t1`.`pk` <> `test`.`t1`.`col_int_key`) and (`test`.`t1`.`col_varchar_key` > `test`.`t1`.`col_varchar_key`))
+Note	1003	/* select#1 */ select `test`.`alias2`.`col_varchar_nokey` AS `col_varchar_nokey` from `test`.`t1` `alias2` join `test`.`t1` semi join (`test`.`t1` left join `test`.`t1` `sq2_alias2` on((`test`.`sq2_alias2`.`col_int_key` = `test`.`t1`.`pk`))) where ((`test`.`alias2`.`col_varchar_key` = `test`.`t1`.`col_varchar_nokey`) and (`test`.`t1`.`pk` <> `test`.`t1`.`col_int_key`) and (`test`.`t1`.`col_varchar_key` > `test`.`t1`.`col_varchar_key`))
 SELECT alias2.col_varchar_nokey
 FROM t1 AS alias2
 LEFT JOIN v1 AS alias1 ON 1
diff -Nru mysql-8.0-8.0.26/mysql-test/r/subquery_bugs.result mysql-8.0-8.0.27/mysql-test/r/subquery_bugs.result
--- mysql-8.0-8.0.26/mysql-test/r/subquery_bugs.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/subquery_bugs.result	2021-09-28 11:46:34.000000000 +0000
@@ -604,8 +604,8 @@
         -> Materialize with deduplication  (cost=3.42..3.42 rows=1)
             -> Nested loop left join  (cost=0.81 rows=1)
                 -> Filter: (t1.f1 >= 'o')  (cost=0.46 rows=1)
-                    -> Index range scan on t1 using k1  (cost=0.46 rows=1)
-                -> Single-row index lookup on t2 using PRIMARY (pk=t1.pk)  (cost=0.35 rows=1)
+                    -> Covering index range scan on t1 using k1  (cost=0.46 rows=1)
+                -> Single-row covering index lookup on t2 using PRIMARY (pk=t1.pk)  (cost=0.35 rows=1)
     -> Single-row index lookup on t1 using PRIMARY (pk=`<subquery2>`.pk)  (cost=0.35 rows=1)
 
 DROP TABLE t1, t2;
@@ -787,7 +787,7 @@
                 -> Nested loop left join  (cost=2.50 rows=5)
                     -> Filter: (t3.col_int_key <> t2.pk)  (cost=0.75 rows=5)
                         -> Table scan on t3  (cost=0.75 rows=5)
-                    -> Index lookup on t4 using ix2 (col_int_key=t3.pk)  (cost=0.27 rows=1)
+                    -> Covering index lookup on t4 using ix2 (col_int_key=t3.pk)  (cost=0.27 rows=1)
 
 SELECT * FROM t1 WHERE pk IN (
 SELECT t2.pk FROM
@@ -919,7 +919,7 @@
             -> Index scan on t1 using f2_idx  (cost=0.35 rows=1)
             -> Filter: (cast(t2.f1 as double) > cast(table1.f2 as double))  (cost=0.35 rows=1)
                 -> Index range scan on t2 (re-planned for each iteration)  (cost=0.35 rows=1)
-        -> Index lookup on t3 using f2_idx (f2=t2.f2)  (cost=0.35 rows=1)
+        -> Covering index lookup on t3 using f2_idx (f2=t2.f2)  (cost=0.35 rows=1)
 
 Warnings:
 Note	1276	Field or reference 'test.table1.f2' of SELECT #2 was resolved in SELECT #1
@@ -1130,7 +1130,7 @@
                                 -> Table scan on <subquery4>  (cost=0.49..2.56 rows=5)
                                     -> Materialize with deduplication  (cost=2.06..4.14 rows=5)
                                         -> Index lookup on table_city_user using city (city=table_city.id)  (cost=1.05 rows=5)
-                            -> Single-row index lookup on table_user using PRIMARY (id=`<subquery4>`.`user`)  (cost=0.35 rows=1)
+                            -> Single-row covering index lookup on table_user using PRIMARY (id=`<subquery4>`.`user`)  (cost=0.35 rows=1)
 
 Warnings:
 Note	1276	Field or reference 'test.table_city.id' of SELECT #4 was resolved in SELECT #1
@@ -1190,8 +1190,8 @@
                                         -> Hash
                                             -> Nested loop left join  (cost=1.15 rows=2)
                                                 -> Index scan on b using idx_b  (cost=0.45 rows=2)
-                                                -> Index lookup on c_inner using idx_c (c=b.c)  (cost=0.30 rows=1)
-                    -> Index lookup on d using idx_d (c=`<subquery2>`.c)  (cost=0.60 rows=1)
+                                                -> Covering index lookup on c_inner using idx_c (c=b.c)  (cost=0.30 rows=1)
+                    -> Covering index lookup on d using idx_d (c=`<subquery2>`.c)  (cost=0.60 rows=1)
 
 SELECT /*+ JOIN_ORDER(b, c_inner, c_inner_inner, d, c) */ d.c
 FROM d JOIN c
@@ -1390,7 +1390,7 @@
                         -> Materialize with deduplication  (cost=2.96..2.96 rows=1)
                             -> Filter: (t4.col_int is not null)  (cost=0.35 rows=1)
                                 -> Table scan on t4  (cost=0.35 rows=1)
-    -> Single-row index lookup on t2 using pk (pk=t3.pk)  (cost=0.12 rows=1)
+    -> Single-row covering index lookup on t2 using pk (pk=t3.pk)  (cost=0.12 rows=1)
 
 DROP TABLE t1, t2, t3, t4;
 CREATE TABLE t1 (
@@ -1464,12 +1464,12 @@
         -> Filter: (<in_optimizer>((t1.col_int_key + 6),(t1.col_int_key + 6) in (select #2) is false) and (t1.col_int_key is not null))  (cost=0.35 rows=1)
             -> Table scan on t1  (cost=0.35 rows=1)
             -> Select #2 (subquery in condition; run only once)
-                -> Filter: (((t1.col_int_key + 6) = `<materialized_subquery>`.field4))
+                -> Filter: (((t1.col_int_key + 6) = `<materialized_subquery>`.field4))  (cost=3.45..3.45 rows=16)
                     -> Limit: 1 row(s)
                         -> Index lookup on <materialized_subquery> using <auto_distinct_key> (field4=(t1.col_int_key + 6))
                             -> Materialize with deduplication  (cost=3.45..3.45 rows=16)
                                 -> Index scan on table1s using col_int_unique  (cost=1.85 rows=16)
-        -> Single-row index lookup on t3 using PRIMARY (pk=t1.col_int_key)  (cost=0.35 rows=1)
+        -> Single-row covering index lookup on t3 using PRIMARY (pk=t1.col_int_key)  (cost=0.35 rows=1)
     -> Index lookup on t2 using col_int_key (col_int_key=t1.col_int_key)  (cost=0.40 rows=1)
 
 SELECT *
@@ -1899,3 +1899,113 @@
 NULL
 r
 DROP TABLE t1;
+#
+# Bug #32937950 - HYPERGRAPH: CACHED_ITEM* NEW_CACHED_ITEM: ASSERTION `0' FAILED.
+#
+CREATE TABLE t1 (
+a INTEGER,
+PRIMARY KEY (a)
+) PARTITION BY LINEAR KEY () PARTITIONS 4;
+SELECT 1 FROM t1 WHERE
+( SELECT a FROM ( SELECT 1 ) AS q )
+IN ( SELECT a FROM t1 WHERE a > 0 GROUP BY a );
+1
+DROP TABLE t1;
+#
+# Bug #32934187: HYPERGRAPH: CRASHING IN ITEM_IN_SUBSELECT::EXEC
+#
+CREATE TABLE t1 (a DATETIME);
+INSERT INTO t1 VALUES ('2000-01-01 00:00:00');
+INSERT INTO t1 VALUES ('2000-01-01 00:00:00');
+SET @b := _latin1 'a';
+SELECT 1 FROM t1 WHERE (@b IN ( SELECT a FROM t1 )) = a;
+DROP TABLE t1;
+#
+# Bug#32895824: SIGNAL 6 ASSERTION`!NULL_VALUE || IS_NULLABLE()'
+#               FAILED IN ../SQL/ITEM_FUNC.CC
+#
+CREATE TABLE t(pk INT PRIMARY KEY);
+SELECT 1 FROM t
+WHERE CAST(pk AS UNSIGNED INTEGER) = 1
+AND pk = (SELECT 1 FROM t);
+1
+DROP TABLE t;
+#
+# Bug #32932969: ASSERTION `ITEM->IS_NULLABLE()' FAILED.
+#
+CREATE TABLE t1 (a INTEGER);
+INSERT INTO t1 VALUES (1);
+SELECT 1 FROM t1 GROUP BY (
+SELECT COALESCE(18446744073709551614, COUNT(ST_AREA(ST_ASWKT(a))))
+) WITH ROLLUP;
+ERROR 22023: Invalid GIS data provided to function st_astext.
+DROP TABLE t1;
+#
+# Bug #33076462: PB2: FAILURE IN RQG_MULTI_UPDATE_DELETE TEST
+#
+CREATE TABLE t1 ( c INTEGER, KEY (c) );
+CREATE TABLE t2 ( pk INTEGER );
+INSERT INTO t2 VALUES (7);
+CREATE TABLE t3 (
+a INTEGER,
+b INTEGER,
+c INTEGER,
+KEY (a)
+);
+INSERT INTO t3 VALUES (3,4,NULL);
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
+UPDATE t1, t2
+SET t1.c = 0
+WHERE t1.c <> (
+SELECT
+t3.c
+FROM
+t3
+JOIN t3 AS t3_b ON t3_b.a > t3.a
+WHERE t3.b <= t3.b XOR t2.pk = 3
+);
+DROP TABLE t1, t2, t3;
+#
+# Bug #33030793: WL#14419: ASSERTION `NEW_PATH->COST >= NEW_PATH->INIT_COST' FAILED
+#
+CREATE TABLE t1 ( a BLOB );
+SELECT t1.a
+FROM
+t1,
+LATERAL ( SELECT t1.a FROM t1 AS inner_t1 LIMIT 1 ) AS d1
+WHERE 1 IN ( SELECT a FROM t1 )
+ORDER BY a;
+a
+DROP TABLE t1;
+#
+# Bug #33045256: WL#14419: ASSERTION `NULLPTR != DYNAMIC_CAST<TARGET>(ARG)' FAILED
+#
+CREATE TABLE t1 (a INTEGER);
+INSERT INTO t1 VALUES (1);
+SELECT * FROM (
+SELECT a, JSON_ARRAYAGG(a) OVER () AS b FROM t1
+) AS d1
+WHERE (a,b) IN (
+SELECT a, JSON_ARRAYAGG(a) OVER () AS b FROM t1
+);
+DROP TABLE t1;
+#
+# Bug #33075707: HYPERGRAPH: ASSERTION `COND->REAL_ITEM()->IS_BOOL_FUNC()' FAILED
+#
+CREATE TABLE t1 ( a VARCHAR(1) );
+INSERT INTO t1 VALUES ('0');
+SELECT 1
+FROM t1
+WHERE a NOT IN (
+SELECT 1
+FROM
+t1 AS t2
+LEFT JOIN t1 AS t3 ON (t2.a = t3.a OR 0 IN ( SELECT REGEXP_LIKE(a, '') FROM t1 ))
+);
+1
+1
+DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/subquery_mat_all.result mysql-8.0-8.0.27/mysql-test/r/subquery_mat_all.result
--- mysql-8.0-8.0.26/mysql-test/r/subquery_mat_all.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/subquery_mat_all.result	2021-09-28 11:46:34.000000000 +0000
@@ -683,12 +683,12 @@
 2
 3
 explain
-select a from t1 group by a having a in (select c from t2 where d >= 20);
+select/*+ NO_RANGE_OPTIMIZATION(t1) */ a from t1 group by a having a in (select c from t2 where d >= 20);
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	NULL	index	it1a	it1a	4	NULL	7	100.00	Using index
 2	SUBQUERY	t2	NULL	ALL	NULL	NULL	NULL	NULL	7	33.33	Using where
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` group by `test`.`t1`.`a` having <in_optimizer>(`test`.`t1`.`a`,`test`.`t1`.`a` in ( <materialize> (/* select#2 */ select `test`.`t2`.`c` from `test`.`t2` where (`test`.`t2`.`d` >= 20) ), <primary_index_lookup>(`test`.`t1`.`a` in <temporary table> on <auto_distinct_key> where ((`test`.`t1`.`a` = `<materialized_subquery>`.`c`)))))
+Note	1003	/* select#1 */ select /*+ NO_RANGE_OPTIMIZATION(`t1`@`select#1`) */ `test`.`t1`.`a` AS `a` from `test`.`t1` group by `test`.`t1`.`a` having <in_optimizer>(`test`.`t1`.`a`,`test`.`t1`.`a` in ( <materialize> (/* select#2 */ select `test`.`t2`.`c` from `test`.`t2` where (`test`.`t2`.`d` >= 20) ), <primary_index_lookup>(`test`.`t1`.`a` in <temporary table> on <auto_distinct_key> where ((`test`.`t1`.`a` = `<materialized_subquery>`.`c`)))))
 select a from t1 group by a having a in (select c from t2 where d >= 20);
 a
 2
@@ -698,12 +698,12 @@
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	status	OK
 explain
-select a from t1 group by a having a in (select c from t2 where d >= 20);
+select /*+ NO_RANGE_OPTIMIZATION(t1) */ a from t1 group by a having a in (select c from t2 where d >= 20);
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	NULL	index	it1a,iab	it1a	4	NULL	7	100.00	Using index
 2	SUBQUERY	t2	NULL	ALL	NULL	NULL	NULL	NULL	7	33.33	Using where
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` group by `test`.`t1`.`a` having <in_optimizer>(`test`.`t1`.`a`,`test`.`t1`.`a` in ( <materialize> (/* select#2 */ select `test`.`t2`.`c` from `test`.`t2` where (`test`.`t2`.`d` >= 20) ), <primary_index_lookup>(`test`.`t1`.`a` in <temporary table> on <auto_distinct_key> where ((`test`.`t1`.`a` = `<materialized_subquery>`.`c`)))))
+Note	1003	/* select#1 */ select /*+ NO_RANGE_OPTIMIZATION(`t1`@`select#1`) */ `test`.`t1`.`a` AS `a` from `test`.`t1` group by `test`.`t1`.`a` having <in_optimizer>(`test`.`t1`.`a`,`test`.`t1`.`a` in ( <materialize> (/* select#2 */ select `test`.`t2`.`c` from `test`.`t2` where (`test`.`t2`.`d` >= 20) ), <primary_index_lookup>(`test`.`t1`.`a` in <temporary table> on <auto_distinct_key> where ((`test`.`t1`.`a` = `<materialized_subquery>`.`c`)))))
 select a from t1 group by a having a in (select c from t2 where d >= 20);
 a
 2
diff -Nru mysql-8.0-8.0.26/mysql-test/r/subquery_mat_none.result mysql-8.0-8.0.27/mysql-test/r/subquery_mat_none.result
--- mysql-8.0-8.0.26/mysql-test/r/subquery_mat_none.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/subquery_mat_none.result	2021-09-28 11:46:34.000000000 +0000
@@ -676,12 +676,12 @@
 2
 3
 explain
-select a from t1 group by a having a in (select c from t2 where d >= 20);
+select/*+ NO_RANGE_OPTIMIZATION(t1) */ a from t1 group by a having a in (select c from t2 where d >= 20);
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	NULL	index	it1a	it1a	4	NULL	7	100.00	Using index
 2	DEPENDENT SUBQUERY	t2	NULL	ALL	NULL	NULL	NULL	NULL	7	14.29	Using where
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` group by `test`.`t1`.`a` having <in_optimizer>(`test`.`t1`.`a`,<exists>(/* select#2 */ select `test`.`t2`.`c` from `test`.`t2` where ((`test`.`t2`.`d` >= 20) and (<cache>(`test`.`t1`.`a`) = `test`.`t2`.`c`))))
+Note	1003	/* select#1 */ select /*+ NO_RANGE_OPTIMIZATION(`t1`@`select#1`) */ `test`.`t1`.`a` AS `a` from `test`.`t1` group by `test`.`t1`.`a` having <in_optimizer>(`test`.`t1`.`a`,<exists>(/* select#2 */ select `test`.`t2`.`c` from `test`.`t2` where ((`test`.`t2`.`d` >= 20) and (<cache>(`test`.`t1`.`a`) = `test`.`t2`.`c`))))
 select a from t1 group by a having a in (select c from t2 where d >= 20);
 a
 2
@@ -691,12 +691,12 @@
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	status	OK
 explain
-select a from t1 group by a having a in (select c from t2 where d >= 20);
+select /*+ NO_RANGE_OPTIMIZATION(t1) */ a from t1 group by a having a in (select c from t2 where d >= 20);
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	NULL	index	it1a,iab	it1a	4	NULL	7	100.00	Using index
 2	DEPENDENT SUBQUERY	t2	NULL	ALL	NULL	NULL	NULL	NULL	7	14.29	Using where
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` group by `test`.`t1`.`a` having <in_optimizer>(`test`.`t1`.`a`,<exists>(/* select#2 */ select `test`.`t2`.`c` from `test`.`t2` where ((`test`.`t2`.`d` >= 20) and (<cache>(`test`.`t1`.`a`) = `test`.`t2`.`c`))))
+Note	1003	/* select#1 */ select /*+ NO_RANGE_OPTIMIZATION(`t1`@`select#1`) */ `test`.`t1`.`a` AS `a` from `test`.`t1` group by `test`.`t1`.`a` having <in_optimizer>(`test`.`t1`.`a`,<exists>(/* select#2 */ select `test`.`t2`.`c` from `test`.`t2` where ((`test`.`t2`.`d` >= 20) and (<cache>(`test`.`t1`.`a`) = `test`.`t2`.`c`))))
 select a from t1 group by a having a in (select c from t2 where d >= 20);
 a
 2
diff -Nru mysql-8.0-8.0.26/mysql-test/r/subquery_mat.result mysql-8.0-8.0.27/mysql-test/r/subquery_mat.result
--- mysql-8.0-8.0.26/mysql-test/r/subquery_mat.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/subquery_mat.result	2021-09-28 11:46:34.000000000 +0000
@@ -681,12 +681,12 @@
 2
 3
 explain
-select a from t1 group by a having a in (select c from t2 where d >= 20);
+select/*+ NO_RANGE_OPTIMIZATION(t1) */ a from t1 group by a having a in (select c from t2 where d >= 20);
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	NULL	index	it1a	it1a	4	NULL	7	100.00	Using index
 2	SUBQUERY	t2	NULL	ALL	NULL	NULL	NULL	NULL	7	33.33	Using where
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` group by `test`.`t1`.`a` having <in_optimizer>(`test`.`t1`.`a`,`test`.`t1`.`a` in ( <materialize> (/* select#2 */ select `test`.`t2`.`c` from `test`.`t2` where (`test`.`t2`.`d` >= 20) ), <primary_index_lookup>(`test`.`t1`.`a` in <temporary table> on <auto_distinct_key> where ((`test`.`t1`.`a` = `<materialized_subquery>`.`c`)))))
+Note	1003	/* select#1 */ select /*+ NO_RANGE_OPTIMIZATION(`t1`@`select#1`) */ `test`.`t1`.`a` AS `a` from `test`.`t1` group by `test`.`t1`.`a` having <in_optimizer>(`test`.`t1`.`a`,`test`.`t1`.`a` in ( <materialize> (/* select#2 */ select `test`.`t2`.`c` from `test`.`t2` where (`test`.`t2`.`d` >= 20) ), <primary_index_lookup>(`test`.`t1`.`a` in <temporary table> on <auto_distinct_key> where ((`test`.`t1`.`a` = `<materialized_subquery>`.`c`)))))
 select a from t1 group by a having a in (select c from t2 where d >= 20);
 a
 2
@@ -696,12 +696,12 @@
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	status	OK
 explain
-select a from t1 group by a having a in (select c from t2 where d >= 20);
+select /*+ NO_RANGE_OPTIMIZATION(t1) */ a from t1 group by a having a in (select c from t2 where d >= 20);
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	NULL	index	it1a,iab	it1a	4	NULL	7	100.00	Using index
 2	SUBQUERY	t2	NULL	ALL	NULL	NULL	NULL	NULL	7	33.33	Using where
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` group by `test`.`t1`.`a` having <in_optimizer>(`test`.`t1`.`a`,`test`.`t1`.`a` in ( <materialize> (/* select#2 */ select `test`.`t2`.`c` from `test`.`t2` where (`test`.`t2`.`d` >= 20) ), <primary_index_lookup>(`test`.`t1`.`a` in <temporary table> on <auto_distinct_key> where ((`test`.`t1`.`a` = `<materialized_subquery>`.`c`)))))
+Note	1003	/* select#1 */ select /*+ NO_RANGE_OPTIMIZATION(`t1`@`select#1`) */ `test`.`t1`.`a` AS `a` from `test`.`t1` group by `test`.`t1`.`a` having <in_optimizer>(`test`.`t1`.`a`,`test`.`t1`.`a` in ( <materialize> (/* select#2 */ select `test`.`t2`.`c` from `test`.`t2` where (`test`.`t2`.`d` >= 20) ), <primary_index_lookup>(`test`.`t1`.`a` in <temporary table> on <auto_distinct_key> where ((`test`.`t1`.`a` = `<materialized_subquery>`.`c`)))))
 select a from t1 group by a having a in (select c from t2 where d >= 20);
 a
 2
diff -Nru mysql-8.0-8.0.26/mysql-test/r/subquery_nomat_nosj_bka_nobnl.result mysql-8.0-8.0.27/mysql-test/r/subquery_nomat_nosj_bka_nobnl.result
--- mysql-8.0-8.0.26/mysql-test/r/subquery_nomat_nosj_bka_nobnl.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/subquery_nomat_nosj_bka_nobnl.result	2021-09-28 11:46:34.000000000 +0000
@@ -7557,7 +7557,7 @@
 Warnings:
 Note	1276	Field or reference 'test.alias1.col_int_key' of SELECT #3 was resolved in SELECT #2
 Note	1276	Field or reference 'test.alias1.col_varchar_key' of SELECT #3 was resolved in SELECT #2
-Note	1003	/* select#1 */ select `alias2`.`col_varchar_nokey` AS `col_varchar_nokey` from `test`.`t1` `alias2` left join (`test`.`t1`) on(true) where <in_optimizer>(`alias2`.`col_varchar_key`,<exists>(/* select#3 */ select `test`.`t1`.`col_varchar_nokey` from `test`.`t1` left join `test`.`t1` `sq2_alias2` on((`sq2_alias2`.`col_int_key` = `test`.`t1`.`pk`)) where ((`test`.`t1`.`pk` <> `test`.`t1`.`col_int_key`) and (`test`.`t1`.`col_varchar_key` > `test`.`t1`.`col_varchar_key`) and (<cache>(`alias2`.`col_varchar_key`) = `test`.`t1`.`col_varchar_nokey`))))
+Note	1003	/* select#1 */ select `test`.`alias2`.`col_varchar_nokey` AS `col_varchar_nokey` from `test`.`t1` `alias2` left join (`test`.`t1`) on(true) where <in_optimizer>(`test`.`alias2`.`col_varchar_key`,<exists>(/* select#3 */ select `test`.`t1`.`col_varchar_nokey` from `test`.`t1` left join `test`.`t1` `sq2_alias2` on((`test`.`sq2_alias2`.`col_int_key` = `test`.`t1`.`pk`)) where ((`test`.`t1`.`pk` <> `test`.`t1`.`col_int_key`) and (`test`.`t1`.`col_varchar_key` > `test`.`t1`.`col_varchar_key`) and (<cache>(`test`.`alias2`.`col_varchar_key`) = `test`.`t1`.`col_varchar_nokey`))))
 SELECT * FROM v2;
 col_varchar_nokey
 d
@@ -7588,7 +7588,7 @@
 Warnings:
 Note	1276	Field or reference 'alias1.col_int_key' of SELECT #2 was resolved in SELECT #1
 Note	1276	Field or reference 'alias1.col_varchar_key' of SELECT #2 was resolved in SELECT #1
-Note	1003	/* select#1 */ select `alias2`.`col_varchar_nokey` AS `col_varchar_nokey` from `test`.`t1` `alias2` left join (`test`.`t1`) on(true) where <in_optimizer>(`alias2`.`col_varchar_key`,<exists>(/* select#2 */ select `test`.`t1`.`col_varchar_nokey` from `test`.`t1` left join `test`.`t1` `sq2_alias2` on((`sq2_alias2`.`col_int_key` = `test`.`t1`.`pk`)) where ((`test`.`t1`.`pk` <> `test`.`t1`.`col_int_key`) and (`test`.`t1`.`col_varchar_key` > `test`.`t1`.`col_varchar_key`) and (<cache>(`alias2`.`col_varchar_key`) = `test`.`t1`.`col_varchar_nokey`))))
+Note	1003	/* select#1 */ select `test`.`alias2`.`col_varchar_nokey` AS `col_varchar_nokey` from `test`.`t1` `alias2` left join (`test`.`t1`) on(true) where <in_optimizer>(`test`.`alias2`.`col_varchar_key`,<exists>(/* select#2 */ select `test`.`t1`.`col_varchar_nokey` from `test`.`t1` left join `test`.`t1` `sq2_alias2` on((`test`.`sq2_alias2`.`col_int_key` = `test`.`t1`.`pk`)) where ((`test`.`t1`.`pk` <> `test`.`t1`.`col_int_key`) and (`test`.`t1`.`col_varchar_key` > `test`.`t1`.`col_varchar_key`) and (<cache>(`test`.`alias2`.`col_varchar_key`) = `test`.`t1`.`col_varchar_nokey`))))
 SELECT alias2.col_varchar_nokey
 FROM t1 AS alias2
 LEFT JOIN v1 AS alias1 ON 1
diff -Nru mysql-8.0-8.0.26/mysql-test/r/subquery_nomat_nosj_bka.result mysql-8.0-8.0.27/mysql-test/r/subquery_nomat_nosj_bka.result
--- mysql-8.0-8.0.26/mysql-test/r/subquery_nomat_nosj_bka.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/subquery_nomat_nosj_bka.result	2021-09-28 11:46:34.000000000 +0000
@@ -7557,7 +7557,7 @@
 Warnings:
 Note	1276	Field or reference 'test.alias1.col_int_key' of SELECT #3 was resolved in SELECT #2
 Note	1276	Field or reference 'test.alias1.col_varchar_key' of SELECT #3 was resolved in SELECT #2
-Note	1003	/* select#1 */ select `alias2`.`col_varchar_nokey` AS `col_varchar_nokey` from `test`.`t1` `alias2` left join (`test`.`t1`) on(true) where <in_optimizer>(`alias2`.`col_varchar_key`,<exists>(/* select#3 */ select `test`.`t1`.`col_varchar_nokey` from `test`.`t1` left join `test`.`t1` `sq2_alias2` on((`sq2_alias2`.`col_int_key` = `test`.`t1`.`pk`)) where ((`test`.`t1`.`pk` <> `test`.`t1`.`col_int_key`) and (`test`.`t1`.`col_varchar_key` > `test`.`t1`.`col_varchar_key`) and (<cache>(`alias2`.`col_varchar_key`) = `test`.`t1`.`col_varchar_nokey`))))
+Note	1003	/* select#1 */ select `test`.`alias2`.`col_varchar_nokey` AS `col_varchar_nokey` from `test`.`t1` `alias2` left join (`test`.`t1`) on(true) where <in_optimizer>(`test`.`alias2`.`col_varchar_key`,<exists>(/* select#3 */ select `test`.`t1`.`col_varchar_nokey` from `test`.`t1` left join `test`.`t1` `sq2_alias2` on((`test`.`sq2_alias2`.`col_int_key` = `test`.`t1`.`pk`)) where ((`test`.`t1`.`pk` <> `test`.`t1`.`col_int_key`) and (`test`.`t1`.`col_varchar_key` > `test`.`t1`.`col_varchar_key`) and (<cache>(`test`.`alias2`.`col_varchar_key`) = `test`.`t1`.`col_varchar_nokey`))))
 SELECT * FROM v2;
 col_varchar_nokey
 d
@@ -7588,7 +7588,7 @@
 Warnings:
 Note	1276	Field or reference 'alias1.col_int_key' of SELECT #2 was resolved in SELECT #1
 Note	1276	Field or reference 'alias1.col_varchar_key' of SELECT #2 was resolved in SELECT #1
-Note	1003	/* select#1 */ select `alias2`.`col_varchar_nokey` AS `col_varchar_nokey` from `test`.`t1` `alias2` left join (`test`.`t1`) on(true) where <in_optimizer>(`alias2`.`col_varchar_key`,<exists>(/* select#2 */ select `test`.`t1`.`col_varchar_nokey` from `test`.`t1` left join `test`.`t1` `sq2_alias2` on((`sq2_alias2`.`col_int_key` = `test`.`t1`.`pk`)) where ((`test`.`t1`.`pk` <> `test`.`t1`.`col_int_key`) and (`test`.`t1`.`col_varchar_key` > `test`.`t1`.`col_varchar_key`) and (<cache>(`alias2`.`col_varchar_key`) = `test`.`t1`.`col_varchar_nokey`))))
+Note	1003	/* select#1 */ select `test`.`alias2`.`col_varchar_nokey` AS `col_varchar_nokey` from `test`.`t1` `alias2` left join (`test`.`t1`) on(true) where <in_optimizer>(`test`.`alias2`.`col_varchar_key`,<exists>(/* select#2 */ select `test`.`t1`.`col_varchar_nokey` from `test`.`t1` left join `test`.`t1` `sq2_alias2` on((`test`.`sq2_alias2`.`col_int_key` = `test`.`t1`.`pk`)) where ((`test`.`t1`.`pk` <> `test`.`t1`.`col_int_key`) and (`test`.`t1`.`col_varchar_key` > `test`.`t1`.`col_varchar_key`) and (<cache>(`test`.`alias2`.`col_varchar_key`) = `test`.`t1`.`col_varchar_nokey`))))
 SELECT alias2.col_varchar_nokey
 FROM t1 AS alias2
 LEFT JOIN v1 AS alias1 ON 1
diff -Nru mysql-8.0-8.0.26/mysql-test/r/subquery_nomat_nosj.result mysql-8.0-8.0.27/mysql-test/r/subquery_nomat_nosj.result
--- mysql-8.0-8.0.26/mysql-test/r/subquery_nomat_nosj.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/subquery_nomat_nosj.result	2021-09-28 11:46:34.000000000 +0000
@@ -7556,7 +7556,7 @@
 Warnings:
 Note	1276	Field or reference 'test.alias1.col_int_key' of SELECT #3 was resolved in SELECT #2
 Note	1276	Field or reference 'test.alias1.col_varchar_key' of SELECT #3 was resolved in SELECT #2
-Note	1003	/* select#1 */ select `alias2`.`col_varchar_nokey` AS `col_varchar_nokey` from `test`.`t1` `alias2` left join (`test`.`t1`) on(true) where <in_optimizer>(`alias2`.`col_varchar_key`,<exists>(/* select#3 */ select `test`.`t1`.`col_varchar_nokey` from `test`.`t1` left join `test`.`t1` `sq2_alias2` on((`sq2_alias2`.`col_int_key` = `test`.`t1`.`pk`)) where ((`test`.`t1`.`pk` <> `test`.`t1`.`col_int_key`) and (`test`.`t1`.`col_varchar_key` > `test`.`t1`.`col_varchar_key`) and (<cache>(`alias2`.`col_varchar_key`) = `test`.`t1`.`col_varchar_nokey`))))
+Note	1003	/* select#1 */ select `test`.`alias2`.`col_varchar_nokey` AS `col_varchar_nokey` from `test`.`t1` `alias2` left join (`test`.`t1`) on(true) where <in_optimizer>(`test`.`alias2`.`col_varchar_key`,<exists>(/* select#3 */ select `test`.`t1`.`col_varchar_nokey` from `test`.`t1` left join `test`.`t1` `sq2_alias2` on((`test`.`sq2_alias2`.`col_int_key` = `test`.`t1`.`pk`)) where ((`test`.`t1`.`pk` <> `test`.`t1`.`col_int_key`) and (`test`.`t1`.`col_varchar_key` > `test`.`t1`.`col_varchar_key`) and (<cache>(`test`.`alias2`.`col_varchar_key`) = `test`.`t1`.`col_varchar_nokey`))))
 SELECT * FROM v2;
 col_varchar_nokey
 d
@@ -7587,7 +7587,7 @@
 Warnings:
 Note	1276	Field or reference 'alias1.col_int_key' of SELECT #2 was resolved in SELECT #1
 Note	1276	Field or reference 'alias1.col_varchar_key' of SELECT #2 was resolved in SELECT #1
-Note	1003	/* select#1 */ select `alias2`.`col_varchar_nokey` AS `col_varchar_nokey` from `test`.`t1` `alias2` left join (`test`.`t1`) on(true) where <in_optimizer>(`alias2`.`col_varchar_key`,<exists>(/* select#2 */ select `test`.`t1`.`col_varchar_nokey` from `test`.`t1` left join `test`.`t1` `sq2_alias2` on((`sq2_alias2`.`col_int_key` = `test`.`t1`.`pk`)) where ((`test`.`t1`.`pk` <> `test`.`t1`.`col_int_key`) and (`test`.`t1`.`col_varchar_key` > `test`.`t1`.`col_varchar_key`) and (<cache>(`alias2`.`col_varchar_key`) = `test`.`t1`.`col_varchar_nokey`))))
+Note	1003	/* select#1 */ select `test`.`alias2`.`col_varchar_nokey` AS `col_varchar_nokey` from `test`.`t1` `alias2` left join (`test`.`t1`) on(true) where <in_optimizer>(`test`.`alias2`.`col_varchar_key`,<exists>(/* select#2 */ select `test`.`t1`.`col_varchar_nokey` from `test`.`t1` left join `test`.`t1` `sq2_alias2` on((`test`.`sq2_alias2`.`col_int_key` = `test`.`t1`.`pk`)) where ((`test`.`t1`.`pk` <> `test`.`t1`.`col_int_key`) and (`test`.`t1`.`col_varchar_key` > `test`.`t1`.`col_varchar_key`) and (<cache>(`test`.`alias2`.`col_varchar_key`) = `test`.`t1`.`col_varchar_nokey`))))
 SELECT alias2.col_varchar_nokey
 FROM t1 AS alias2
 LEFT JOIN v1 AS alias1 ON 1
diff -Nru mysql-8.0-8.0.26/mysql-test/r/subquery_none_bka_nobnl.result mysql-8.0-8.0.27/mysql-test/r/subquery_none_bka_nobnl.result
--- mysql-8.0-8.0.26/mysql-test/r/subquery_none_bka_nobnl.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/subquery_none_bka_nobnl.result	2021-09-28 11:46:34.000000000 +0000
@@ -7556,7 +7556,7 @@
 Warnings:
 Note	1276	Field or reference 'test.alias1.col_int_key' of SELECT #3 was resolved in SELECT #2
 Note	1276	Field or reference 'test.alias1.col_varchar_key' of SELECT #3 was resolved in SELECT #2
-Note	1003	/* select#1 */ select `alias2`.`col_varchar_nokey` AS `col_varchar_nokey` from `test`.`t1` `alias2` left join (`test`.`t1`) on(true) where <in_optimizer>(`alias2`.`col_varchar_key`,<exists>(/* select#3 */ select `test`.`t1`.`col_varchar_nokey` from `test`.`t1` left join `test`.`t1` `sq2_alias2` on((`sq2_alias2`.`col_int_key` = `test`.`t1`.`pk`)) where ((`test`.`t1`.`pk` <> `test`.`t1`.`col_int_key`) and (`test`.`t1`.`col_varchar_key` > `test`.`t1`.`col_varchar_key`) and (<cache>(`alias2`.`col_varchar_key`) = `test`.`t1`.`col_varchar_nokey`))))
+Note	1003	/* select#1 */ select `test`.`alias2`.`col_varchar_nokey` AS `col_varchar_nokey` from `test`.`t1` `alias2` left join (`test`.`t1`) on(true) where <in_optimizer>(`test`.`alias2`.`col_varchar_key`,<exists>(/* select#3 */ select `test`.`t1`.`col_varchar_nokey` from `test`.`t1` left join `test`.`t1` `sq2_alias2` on((`test`.`sq2_alias2`.`col_int_key` = `test`.`t1`.`pk`)) where ((`test`.`t1`.`pk` <> `test`.`t1`.`col_int_key`) and (`test`.`t1`.`col_varchar_key` > `test`.`t1`.`col_varchar_key`) and (<cache>(`test`.`alias2`.`col_varchar_key`) = `test`.`t1`.`col_varchar_nokey`))))
 SELECT * FROM v2;
 col_varchar_nokey
 d
@@ -7587,7 +7587,7 @@
 Warnings:
 Note	1276	Field or reference 'alias1.col_int_key' of SELECT #2 was resolved in SELECT #1
 Note	1276	Field or reference 'alias1.col_varchar_key' of SELECT #2 was resolved in SELECT #1
-Note	1003	/* select#1 */ select `alias2`.`col_varchar_nokey` AS `col_varchar_nokey` from `test`.`t1` `alias2` left join (`test`.`t1`) on(true) where <in_optimizer>(`alias2`.`col_varchar_key`,<exists>(/* select#2 */ select `test`.`t1`.`col_varchar_nokey` from `test`.`t1` left join `test`.`t1` `sq2_alias2` on((`sq2_alias2`.`col_int_key` = `test`.`t1`.`pk`)) where ((`test`.`t1`.`pk` <> `test`.`t1`.`col_int_key`) and (`test`.`t1`.`col_varchar_key` > `test`.`t1`.`col_varchar_key`) and (<cache>(`alias2`.`col_varchar_key`) = `test`.`t1`.`col_varchar_nokey`))))
+Note	1003	/* select#1 */ select `test`.`alias2`.`col_varchar_nokey` AS `col_varchar_nokey` from `test`.`t1` `alias2` left join (`test`.`t1`) on(true) where <in_optimizer>(`test`.`alias2`.`col_varchar_key`,<exists>(/* select#2 */ select `test`.`t1`.`col_varchar_nokey` from `test`.`t1` left join `test`.`t1` `sq2_alias2` on((`test`.`sq2_alias2`.`col_int_key` = `test`.`t1`.`pk`)) where ((`test`.`t1`.`pk` <> `test`.`t1`.`col_int_key`) and (`test`.`t1`.`col_varchar_key` > `test`.`t1`.`col_varchar_key`) and (<cache>(`test`.`alias2`.`col_varchar_key`) = `test`.`t1`.`col_varchar_nokey`))))
 SELECT alias2.col_varchar_nokey
 FROM t1 AS alias2
 LEFT JOIN v1 AS alias1 ON 1
diff -Nru mysql-8.0-8.0.26/mysql-test/r/subquery_none_bka.result mysql-8.0-8.0.27/mysql-test/r/subquery_none_bka.result
--- mysql-8.0-8.0.26/mysql-test/r/subquery_none_bka.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/subquery_none_bka.result	2021-09-28 11:46:34.000000000 +0000
@@ -7556,7 +7556,7 @@
 Warnings:
 Note	1276	Field or reference 'test.alias1.col_int_key' of SELECT #3 was resolved in SELECT #2
 Note	1276	Field or reference 'test.alias1.col_varchar_key' of SELECT #3 was resolved in SELECT #2
-Note	1003	/* select#1 */ select `alias2`.`col_varchar_nokey` AS `col_varchar_nokey` from `test`.`t1` `alias2` left join (`test`.`t1`) on(true) where <in_optimizer>(`alias2`.`col_varchar_key`,<exists>(/* select#3 */ select `test`.`t1`.`col_varchar_nokey` from `test`.`t1` left join `test`.`t1` `sq2_alias2` on((`sq2_alias2`.`col_int_key` = `test`.`t1`.`pk`)) where ((`test`.`t1`.`pk` <> `test`.`t1`.`col_int_key`) and (`test`.`t1`.`col_varchar_key` > `test`.`t1`.`col_varchar_key`) and (<cache>(`alias2`.`col_varchar_key`) = `test`.`t1`.`col_varchar_nokey`))))
+Note	1003	/* select#1 */ select `test`.`alias2`.`col_varchar_nokey` AS `col_varchar_nokey` from `test`.`t1` `alias2` left join (`test`.`t1`) on(true) where <in_optimizer>(`test`.`alias2`.`col_varchar_key`,<exists>(/* select#3 */ select `test`.`t1`.`col_varchar_nokey` from `test`.`t1` left join `test`.`t1` `sq2_alias2` on((`test`.`sq2_alias2`.`col_int_key` = `test`.`t1`.`pk`)) where ((`test`.`t1`.`pk` <> `test`.`t1`.`col_int_key`) and (`test`.`t1`.`col_varchar_key` > `test`.`t1`.`col_varchar_key`) and (<cache>(`test`.`alias2`.`col_varchar_key`) = `test`.`t1`.`col_varchar_nokey`))))
 SELECT * FROM v2;
 col_varchar_nokey
 d
@@ -7587,7 +7587,7 @@
 Warnings:
 Note	1276	Field or reference 'alias1.col_int_key' of SELECT #2 was resolved in SELECT #1
 Note	1276	Field or reference 'alias1.col_varchar_key' of SELECT #2 was resolved in SELECT #1
-Note	1003	/* select#1 */ select `alias2`.`col_varchar_nokey` AS `col_varchar_nokey` from `test`.`t1` `alias2` left join (`test`.`t1`) on(true) where <in_optimizer>(`alias2`.`col_varchar_key`,<exists>(/* select#2 */ select `test`.`t1`.`col_varchar_nokey` from `test`.`t1` left join `test`.`t1` `sq2_alias2` on((`sq2_alias2`.`col_int_key` = `test`.`t1`.`pk`)) where ((`test`.`t1`.`pk` <> `test`.`t1`.`col_int_key`) and (`test`.`t1`.`col_varchar_key` > `test`.`t1`.`col_varchar_key`) and (<cache>(`alias2`.`col_varchar_key`) = `test`.`t1`.`col_varchar_nokey`))))
+Note	1003	/* select#1 */ select `test`.`alias2`.`col_varchar_nokey` AS `col_varchar_nokey` from `test`.`t1` `alias2` left join (`test`.`t1`) on(true) where <in_optimizer>(`test`.`alias2`.`col_varchar_key`,<exists>(/* select#2 */ select `test`.`t1`.`col_varchar_nokey` from `test`.`t1` left join `test`.`t1` `sq2_alias2` on((`test`.`sq2_alias2`.`col_int_key` = `test`.`t1`.`pk`)) where ((`test`.`t1`.`pk` <> `test`.`t1`.`col_int_key`) and (`test`.`t1`.`col_varchar_key` > `test`.`t1`.`col_varchar_key`) and (<cache>(`test`.`alias2`.`col_varchar_key`) = `test`.`t1`.`col_varchar_nokey`))))
 SELECT alias2.col_varchar_nokey
 FROM t1 AS alias2
 LEFT JOIN v1 AS alias1 ON 1
diff -Nru mysql-8.0-8.0.26/mysql-test/r/subquery_none.result mysql-8.0-8.0.27/mysql-test/r/subquery_none.result
--- mysql-8.0-8.0.26/mysql-test/r/subquery_none.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/subquery_none.result	2021-09-28 11:46:34.000000000 +0000
@@ -7555,7 +7555,7 @@
 Warnings:
 Note	1276	Field or reference 'test.alias1.col_int_key' of SELECT #3 was resolved in SELECT #2
 Note	1276	Field or reference 'test.alias1.col_varchar_key' of SELECT #3 was resolved in SELECT #2
-Note	1003	/* select#1 */ select `alias2`.`col_varchar_nokey` AS `col_varchar_nokey` from `test`.`t1` `alias2` left join (`test`.`t1`) on(true) where <in_optimizer>(`alias2`.`col_varchar_key`,<exists>(/* select#3 */ select `test`.`t1`.`col_varchar_nokey` from `test`.`t1` left join `test`.`t1` `sq2_alias2` on((`sq2_alias2`.`col_int_key` = `test`.`t1`.`pk`)) where ((`test`.`t1`.`pk` <> `test`.`t1`.`col_int_key`) and (`test`.`t1`.`col_varchar_key` > `test`.`t1`.`col_varchar_key`) and (<cache>(`alias2`.`col_varchar_key`) = `test`.`t1`.`col_varchar_nokey`))))
+Note	1003	/* select#1 */ select `test`.`alias2`.`col_varchar_nokey` AS `col_varchar_nokey` from `test`.`t1` `alias2` left join (`test`.`t1`) on(true) where <in_optimizer>(`test`.`alias2`.`col_varchar_key`,<exists>(/* select#3 */ select `test`.`t1`.`col_varchar_nokey` from `test`.`t1` left join `test`.`t1` `sq2_alias2` on((`test`.`sq2_alias2`.`col_int_key` = `test`.`t1`.`pk`)) where ((`test`.`t1`.`pk` <> `test`.`t1`.`col_int_key`) and (`test`.`t1`.`col_varchar_key` > `test`.`t1`.`col_varchar_key`) and (<cache>(`test`.`alias2`.`col_varchar_key`) = `test`.`t1`.`col_varchar_nokey`))))
 SELECT * FROM v2;
 col_varchar_nokey
 d
@@ -7586,7 +7586,7 @@
 Warnings:
 Note	1276	Field or reference 'alias1.col_int_key' of SELECT #2 was resolved in SELECT #1
 Note	1276	Field or reference 'alias1.col_varchar_key' of SELECT #2 was resolved in SELECT #1
-Note	1003	/* select#1 */ select `alias2`.`col_varchar_nokey` AS `col_varchar_nokey` from `test`.`t1` `alias2` left join (`test`.`t1`) on(true) where <in_optimizer>(`alias2`.`col_varchar_key`,<exists>(/* select#2 */ select `test`.`t1`.`col_varchar_nokey` from `test`.`t1` left join `test`.`t1` `sq2_alias2` on((`sq2_alias2`.`col_int_key` = `test`.`t1`.`pk`)) where ((`test`.`t1`.`pk` <> `test`.`t1`.`col_int_key`) and (`test`.`t1`.`col_varchar_key` > `test`.`t1`.`col_varchar_key`) and (<cache>(`alias2`.`col_varchar_key`) = `test`.`t1`.`col_varchar_nokey`))))
+Note	1003	/* select#1 */ select `test`.`alias2`.`col_varchar_nokey` AS `col_varchar_nokey` from `test`.`t1` `alias2` left join (`test`.`t1`) on(true) where <in_optimizer>(`test`.`alias2`.`col_varchar_key`,<exists>(/* select#2 */ select `test`.`t1`.`col_varchar_nokey` from `test`.`t1` left join `test`.`t1` `sq2_alias2` on((`test`.`sq2_alias2`.`col_int_key` = `test`.`t1`.`pk`)) where ((`test`.`t1`.`pk` <> `test`.`t1`.`col_int_key`) and (`test`.`t1`.`col_varchar_key` > `test`.`t1`.`col_varchar_key`) and (<cache>(`test`.`alias2`.`col_varchar_key`) = `test`.`t1`.`col_varchar_nokey`))))
 SELECT alias2.col_varchar_nokey
 FROM t1 AS alias2
 LEFT JOIN v1 AS alias1 ON 1
diff -Nru mysql-8.0-8.0.26/mysql-test/r/subquery_scalar_to_derived_correlated.result mysql-8.0-8.0.27/mysql-test/r/subquery_scalar_to_derived_correlated.result
--- mysql-8.0-8.0.26/mysql-test/r/subquery_scalar_to_derived_correlated.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/subquery_scalar_to_derived_correlated.result	2021-09-28 11:46:34.000000000 +0000
@@ -867,4 +867,20 @@
 WHERE t2.f2 = ISNULL(dt.f1)) AS field1 FROM t1 AS dt GROUP BY field1;
 field1
 DROP TABLE t1;
+#
+# Bug#32998733: SERVER ABORT FROM JOIN::CREATE_INTERMEDIATE_TABLE
+#
+CREATE TABLE t1 (a INTEGER);
+CREATE TABLE t2 (b INTEGER);
+EXPLAIN SELECT 1 FROM t1 WHERE ( SELECT DISTINCT b FROM t2 WHERE t1.a = t1.a );
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Using where
+2	DEPENDENT SUBQUERY	t2	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Using where; Using temporary
+Warnings:
+Note	1276	Field or reference 'test.t1.a' of SELECT #2 was resolved in SELECT #1
+Note	1276	Field or reference 'test.t1.a' of SELECT #2 was resolved in SELECT #1
+Note	1003	/* select#1 */ select 1 AS `1` from `test`.`t1` where (0 <> (/* select#2 */ select distinct `test`.`t2`.`b` from `test`.`t2` where (`test`.`t1`.`a` = `test`.`t1`.`a`)))
+SELECT 1 FROM t1 WHERE ( SELECT DISTINCT b FROM t2 WHERE t1.a = t1.a );
+1
+DROP TABLE t1,t2;
 SET optimizer_switch = 'subquery_to_derived=default';
diff -Nru mysql-8.0-8.0.26/mysql-test/r/subquery_scalar_to_derived.result mysql-8.0-8.0.27/mysql-test/r/subquery_scalar_to_derived.result
--- mysql-8.0-8.0.26/mysql-test/r/subquery_scalar_to_derived.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/subquery_scalar_to_derived.result	2021-09-28 11:46:34.000000000 +0000
@@ -1382,7 +1382,7 @@
 1	PRIMARY	<derived2>	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Using where; Using join buffer (hash join)
 2	DERIVED	t2	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`i` AS `i`,`test`.`t1`.`j` AS `j` from `test`.`t1` left join (/* select#2 */ select sum(`test`.`t2`.`i`) AS `SUM(t2.i)` from `test`.`t2`) `derived_1_2` on(true) where true group by `test`.`t1`.`i`,`test`.`t1`.`j` with rollup having (rollup_sum_switcher(sum(`test`.`t1`.`j`)) > `derived_1_2`.`SUM(t2.i)`)
+Note	1003	/* select#1 */ select `test`.`t1`.`i` AS `i`,`test`.`t1`.`j` AS `j` from `test`.`t1` left join (/* select#2 */ select sum(`test`.`t2`.`i`) AS `SUM(t2.i)` from `test`.`t2`) `derived_1_2` on(true) where true group by `test`.`t1`.`i`,`test`.`t1`.`j` with rollup having (rollup_sum_switcher(sum(`j`)) > `derived_1_2`.`SUM(t2.i)`)
 DROP TABLE t1, t2;
 Bigger example (TPC-H Q11) where we get a scalar transformation
 in the grouping derived table also, i.e. nested scalar to
@@ -3862,7 +3862,7 @@
                                 -> Inner hash join (no condition)  (cost=42.50 rows=360)
                                     -> Table scan on subquery1_t2  (cost=0.10 rows=20)
                                     -> Hash
-                                        -> Index scan on subquery1_t1 using idx_cc_col_varchar_key  (cost=2.25 rows=20)
+                                        -> Covering index scan on subquery1_t1 using idx_cc_col_varchar_key  (cost=2.25 rows=20)
                             -> Filter: (cc.col_varchar = subquery1_t2.col_varchar_key)  (cost=0.25 rows=0)
                                 -> Index lookup on cc using idx_cc_col_int_key (col_int_key=subquery1_t2.col_int)  (cost=0.25 rows=1)
 
@@ -4346,7 +4346,7 @@
 4	DERIVED	sq1_alias1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
 4	DERIVED	sq1_alias2	NULL	index	NULL	idx_cc_col_date_key	4	NULL	1	100.00	Using index; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `alias1`.`col_int` AS `col_int` from `test`.`c` `alias1` join (/* select#4 */ select min(`sq1_alias1`.`col_int`) AS `sq1_field1` from `test`.`c` `sq1_alias1` join `test`.`c` `sq1_alias2`) `derived_2_4` join `test`.`c` `alias2` join `test`.`c` `alias3` semi join (`test`.`c` `sq2_alias1` join `test`.`c` `sq2_alias2`) where ((`sq2_alias1`.`pk` = `sq2_alias2`.`col_int`) and (`alias2`.`col_int` >= `derived_2_4`.`sq1_field1`))
+Note	1003	/* select#1 */ select `test`.`alias1`.`col_int` AS `col_int` from `test`.`c` `alias1` join (/* select#4 */ select min(`test`.`sq1_alias1`.`col_int`) AS `sq1_field1` from `test`.`c` `sq1_alias1` join `test`.`c` `sq1_alias2`) `derived_2_4` join `test`.`c` `alias2` join `test`.`c` `alias3` semi join (`test`.`c` `sq2_alias1` join `test`.`c` `sq2_alias2`) where ((`test`.`sq2_alias1`.`pk` = `test`.`sq2_alias2`.`col_int`) and (`test`.`alias2`.`col_int` >= `derived_2_4`.`sq1_field1`))
 DROP VIEW view_c;
 DROP TABLE c;
 #
@@ -4448,6 +4448,88 @@
 (SELECT COUNT(*) FROM t1) AS f2
 FROM t1
 GROUP BY f1, f2 WITH ROLLUP;
-COUNT(*)	COUNT(*)
+f1	f2
+DROP TABLE t1;
+#
+# Bug#33057397: FIELD NAMES ARE DISPLAYED INCORRECTLY WITH ROLLUP AND
+#               SUBQUERY_TO_DERIVED
+CREATE TABLE t1 ( f1 INTEGER);
+INSERT INTO t1 VALUES (0);
+SELECT (SELECT MIN(f1) AS min FROM t1 ) AS field1 FROM t1 GROUP BY
+field1 WITH ROLLUP;
+field1
+0
+NULL
+DROP TABLE t1;
+#
+# Bug#33104036: ASSERTION FAILURE IN FIND_SUBQUERY_IN_SELECT_LIST AT
+#               ../SQL/ITEM_SUBSELECT.CC
+CREATE TABLE t1 (f1 INTEGER);
+SELECT (SELECT SUM(f1) AS SQ1_field1 FROM t1) as field1
+FROM t1 GROUP BY f1 WITH ROLLUP ORDER BY f1;
+field1
+DROP TABLE t1;
+Original repro case
+CREATE TABLE t1 (pk integer auto_increment,
+col_int int ,
+col_datetime datetime ,
+col_char_255 char(255) ,
+col_smallint smallint ,
+col_decimal_10_8 decimal(10,8),
+primary key(pk)) ;
+set sql_mode='';
+SELECT alias1.col_decimal_10_8 AS field1 ,
+( SELECT SUM(table1.col_smallint ) AS SQ1_field1
+FROM ( t1 as table1 RIGHT JOIN t1 as table2 ON 1 )
+) AS field2 ,
+GROUPING( LOG(alias1.col_int) ) AS field3
+FROM ( t1 AS alias1
+JOIN
+t1 AS alias2 ON 1  )
+WHERE alias2.pk IN ( SELECT col_char_255 FROM t1 )
+GROUP BY field1, field2, LOG(alias1.col_int)
+WITH ROLLUP
+ORDER BY alias1.col_datetime, field1, field2, LOG(alias1.col_int) ;
+field1	field2	field3
+EXPLAIN SELECT alias1.col_decimal_10_8 AS field1 ,
+( SELECT SUM(table1.col_smallint ) AS SQ1_field1
+FROM ( t1 as table1 RIGHT JOIN t1 as table2 ON 1 )
+) AS field2 ,
+GROUPING( LOG(alias1.col_int) ) AS field3
+FROM ( t1 AS alias1
+JOIN
+t1 AS alias2 ON 1  )
+WHERE alias2.pk IN ( SELECT col_char_255 FROM t1 )
+GROUP BY field1, field2, LOG(alias1.col_int)
+WITH ROLLUP
+ORDER BY alias1.col_datetime, field1, field2, LOG(alias1.col_int) ;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	PRIMARY	alias1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Using temporary; Using filesort
+1	PRIMARY	alias2	NULL	index	PRIMARY	PRIMARY	4	NULL	1	100.00	Using index; Using join buffer (hash join)
+1	PRIMARY	<derived2>	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Using where; Using join buffer (hash join)
+1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Using where; FirstMatch(<derived2>); Using join buffer (hash join)
+2	DERIVED	table2	NULL	index	NULL	PRIMARY	4	NULL	1	100.00	Using index
+2	DERIVED	table1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Using where; Using join buffer (hash join)
+Warnings:
+Note	1003	/* select#1 */ select `test`.`alias1`.`col_decimal_10_8` AS `field1`,`derived_1_2`.`SQ1_field1` AS `field2`,grouping(rollup_group_item(`rollup_group_item(log(alias1.col_int),2)`,2)) AS `field3` from `test`.`t1` `alias1` join `test`.`t1` `alias2` left join (/* select#2 */ select sum(`test`.`table1`.`col_smallint`) AS `SQ1_field1` from `test`.`t1` `table2` left join `test`.`t1` `table1` on(true) where true) `derived_1_2` on(true) semi join (`test`.`t1`) where (cast(`test`.`alias2`.`pk` as double) = cast(`test`.`t1`.`col_char_255` as double)) group by `field1`,`field2`,log(`test`.`alias1`.`col_int`) with rollup order by `test`.`alias1`.`col_datetime`,`field1`,`field2`,log(`test`.`alias1`.`col_int`)
+set sql_mode=default;
+DROP TABLE t1;
+#
+# Bug#33079592: ASSERTION `SELECT->BASE_REF_ITEMS[ITEM_IDX] == ITEM' FAILED
+#
+CREATE TABLE t1 (f1 INTEGER);
+SET optimizer_switch='subquery_to_derived=default';
+SELECT SUM(f1), ROW_NUMBER() OVER (PARTITION BY f1), (SELECT MIN(f1) FROM t1) FROM t1;
+ERROR 42000: In aggregated query without GROUP BY, expression #1 of PARTITION BY or ORDER BY clause of window '<unnamed window>' contains nonaggregated column 'test.t1.f1'; this is incompatible with sql_mode=only_full_group_by
+SELECT SUM(f1), ROW_NUMBER() OVER (), (SELECT MIN(f1) FROM t1) FROM t1 ORDER BY f1;
+SUM(f1)	ROW_NUMBER() OVER ()	(SELECT MIN(f1) FROM t1)
+NULL	1	NULL
+SET optimizer_switch='subquery_to_derived=on';
+SELECT SUM(f1), ROW_NUMBER() OVER (PARTITION BY f1), (SELECT MIN(f1) FROM t1) FROM t1;
+ERROR 42000: In aggregated query without GROUP BY, expression #2 of SELECT list contains nonaggregated column 'test.t1.f1'; this is incompatible with sql_mode=only_full_group_by
+SELECT SUM(f1), ROW_NUMBER() OVER (), (SELECT MIN(f1) FROM t1) FROM t1 ORDER BY f1;
+ERROR 42000: In aggregated query without GROUP BY, expression #2 of SELECT list contains nonaggregated column 'test.t1.f1'; this is incompatible with sql_mode=only_full_group_by
+SELECT SUM(f1), SUM(f1) OVER (), f1, (SELECT MIN(f1) FROM t1) sq FROM t1 ORDER BY f1;
+ERROR 42000: In aggregated query without GROUP BY, expression #2 of SELECT list contains nonaggregated column 'test.t1.f1'; this is incompatible with sql_mode=only_full_group_by
 DROP TABLE t1;
 SET optimizer_switch='subquery_to_derived=default';
diff -Nru mysql-8.0-8.0.26/mysql-test/r/subquery_sj_all_bka_nobnl.result mysql-8.0-8.0.27/mysql-test/r/subquery_sj_all_bka_nobnl.result
--- mysql-8.0-8.0.26/mysql-test/r/subquery_sj_all_bka_nobnl.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/subquery_sj_all_bka_nobnl.result	2021-09-28 11:46:34.000000000 +0000
@@ -4310,7 +4310,7 @@
                 -> Nested loop inner join  (cost=29.95 rows=40)
                     -> Filter: (t1.c is not null)  (cost=15.95 rows=40)
                         -> Index range scan on t1 using kp1, with index condition: (t1.kp1 < 20)  (cost=15.95 rows=40)
-                    -> Single-row index lookup on t4 using PRIMARY (pk=t1.c)  (cost=0.25 rows=1)
+                    -> Single-row covering index lookup on t4 using PRIMARY (pk=t1.c)  (cost=0.25 rows=1)
 
 select * from t3 where a in 
 (select t1.kp1 from t1,t4 where kp1<20 and t4.pk=t1.c);
@@ -4955,6 +4955,11 @@
 (concat('1 - 03', repeat('x', @suffix_len)), concat('2 - 03', repeat('x', @suffix_len)));
 insert into t3_16 values
 (concat('1 - 04', repeat('x', @suffix_len)), concat('2 - 04', repeat('x', @suffix_len)));
+ANALYZE TABLE t1_16, t2_16, t3_16;
+Table	Op	Msg_type	Msg_text
+test.t1_16	analyze	status	OK
+test.t2_16	analyze	status	OK
+test.t3_16	analyze	status	OK
 explain select left(a1,7), left(a2,7)
 from t1_16
 where a1 in (select b1 from t2_16 where b1 > '0');
@@ -5045,6 +5050,11 @@
 insert into t3 values ('1 - 06', '2 - 06');
 insert into t3 values ('1 - 07', '2 - 07');
 insert into t3 values ('1 - 08', '2 - 08');
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 explain
 select * from t1
 where concat(a1,'x') IN
@@ -7115,7 +7125,7 @@
 1	SIMPLE	a	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 1	SIMPLE	t1	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `t1`.`t1field`) and (`test`.`t1`.`t1field` = `t1`.`t1field`))
+Note	1003	/* select#1 */ select `test`.`t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `test`.`t1`.`t1field`) and (`test`.`t1`.`t1field` = `test`.`t1`.`t1field`))
 SELECT t1.t1field
 FROM t1 LEFT JOIN t1 AS t2 ON t1.t1field IN (SELECT v1field FROM v1);
 t1field
@@ -7132,7 +7142,7 @@
 1	SIMPLE	a	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 1	SIMPLE	t1	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `t1`.`t1field`) and (`test`.`t1`.`t1field` = `t1`.`t1field`))
+Note	1003	/* select#1 */ select `test`.`t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `test`.`t1`.`t1field`) and (`test`.`t1`.`t1field` = `test`.`t1`.`t1field`))
 CREATE PROCEDURE p1() 
 BEGIN 
 SELECT t1field
@@ -7200,6 +7210,11 @@
 INSERT INTO works VALUES  ('E4','P2',20);
 INSERT INTO works VALUES  ('E4','P4',40);
 INSERT INTO works VALUES  ('E4','P5',80);
+ANALYZE TABLE staff, proj, works;
+Table	Op	Msg_type	Msg_text
+test.staff	analyze	status	OK
+test.proj	analyze	status	OK
+test.works	analyze	status	OK
 explain SELECT EMPNUM, EMPNAME
 FROM staff
 WHERE EMPNUM IN
@@ -7522,6 +7537,11 @@
 INSERT INTO t3 VALUES  ('E4','P4',40);
 INSERT INTO t3 VALUES  ('E4','P5',80);
 CREATE UNIQUE INDEX t1_IDX ON t1(EMPNUM);
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7569,6 +7589,9 @@
 DEALLOCATE PREPARE stmt;
 DROP INDEX t1_IDX ON t1;
 CREATE INDEX t1_IDX ON t1(EMPNUM);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7579,11 +7602,12 @@
 FROM t2
 WHERE PTYPE = 'Design'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	NULL
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; FirstMatch(t1)
+1	SIMPLE	<subquery2>	NULL	ALL	NULL	NULL	NULL	NULL	NULL	100.00	NULL
+1	SIMPLE	t1	NULL	ref	t1_IDX	t1_IDX	3	<subquery2>.EMPNUM	1	100.00	Using join buffer (Batched Key Access)
+2	MATERIALIZED	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
+2	MATERIALIZED	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `<subquery2>`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 PREPARE stmt FROM "EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7595,23 +7619,28 @@
         WHERE PTYPE = 'Design'))";
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	NULL
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; FirstMatch(t1)
+1	SIMPLE	<subquery2>	NULL	ALL	NULL	NULL	NULL	NULL	NULL	100.00	NULL
+1	SIMPLE	t1	NULL	ref	t1_IDX	t1_IDX	3	<subquery2>.EMPNUM	1	100.00	Using join buffer (Batched Key Access)
+2	MATERIALIZED	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
+2	MATERIALIZED	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `<subquery2>`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 
 This line is only in place to help --skip_if_hypergraph diffing some more.
 
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	NULL
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; FirstMatch(t1)
+1	SIMPLE	<subquery2>	NULL	ALL	NULL	NULL	NULL	NULL	NULL	100.00	NULL
+1	SIMPLE	t1	NULL	ref	t1_IDX	t1_IDX	3	<subquery2>.EMPNUM	1	100.00	Using join buffer (Batched Key Access)
+2	MATERIALIZED	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
+2	MATERIALIZED	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `<subquery2>`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 DEALLOCATE PREPARE stmt;
 DROP INDEX t1_IDX ON t1;
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7622,11 +7651,11 @@
 FROM t2
 WHERE PTYPE = 'Design'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; FirstMatch(t1)
+1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	20.00	Using where; End temporary
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 PREPARE stmt FROM "EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7638,21 +7667,21 @@
         WHERE PTYPE = 'Design'))";
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; FirstMatch(t1)
+1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	20.00	Using where; End temporary
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 
 This line is only in place to help --skip_if_hypergraph diffing some more.
 
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; FirstMatch(t1)
+1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	20.00	Using where; End temporary
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 DEALLOCATE PREPARE stmt;
 DROP TABLE t1, t2, t3;
 #
@@ -8276,6 +8305,12 @@
 create table t2 as select * from t1;
 create table t3 (pk int, a int, primary key(pk));
 insert into t3 select a,a from t0;
+ANALYZE TABLE t0, t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t0	analyze	status	OK
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 explain 
 select * from t1 left join t2 on (t2.a= t1.a and t2.a in (select pk from t3));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -11111,7 +11146,7 @@
 3	MATERIALIZED	subquery2_t2	NULL	eq_ref	PRIMARY,col_varchar_key	PRIMARY	4	test.subquery2_t3.pk	1	7.14	Using where
 3	MATERIALIZED	subquery2_t1	NULL	index	col_int_key	col_int_key	5	NULL	20	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `table2`.`col_varchar_nokey` AS `field1` from `test`.`t2` `table1` join `test`.`t1` `table2` straight_join `test`.`t2` `table3` semi join (`test`.`t1` `subquery1_t2` join `test`.`t1` `subquery1_t3` join `test`.`t2` `subquery1_t1`) semi join (`test`.`t3` `subquery2_t2` join `test`.`t1` `subquery2_t3` join `test`.`t2` `subquery2_t1`) where ((`subquery1_t2`.`pk` = `subquery1_t3`.`col_int_key`) and (`subquery1_t2`.`col_varchar_nokey` = `subquery1_t3`.`col_varchar_key`) and (`subquery2_t2`.`col_varchar_key` = `subquery2_t3`.`col_varchar_key`) and (`subquery2_t2`.`pk` = `subquery2_t3`.`pk`) and (`table3`.`col_int_key` = `table2`.`pk`) and (`<subquery3>`.`subquery2_field1` = `table2`.`pk`) and (`<subquery4>`.`subquery1_field1` = `table3`.`col_int_nokey`) and (`subquery1_t1`.`pk` > 1))
+Note	1003	/* select#1 */ select `test`.`table2`.`col_varchar_nokey` AS `field1` from `test`.`t2` `table1` join `test`.`t1` `table2` straight_join `test`.`t2` `table3` semi join (`test`.`t1` `subquery1_t2` join `test`.`t1` `subquery1_t3` join `test`.`t2` `subquery1_t1`) semi join (`test`.`t3` `subquery2_t2` join `test`.`t1` `subquery2_t3` join `test`.`t2` `subquery2_t1`) where ((`test`.`subquery1_t2`.`pk` = `test`.`subquery1_t3`.`col_int_key`) and (`test`.`subquery1_t2`.`col_varchar_nokey` = `test`.`subquery1_t3`.`col_varchar_key`) and (`test`.`subquery2_t2`.`col_varchar_key` = `test`.`subquery2_t3`.`col_varchar_key`) and (`test`.`subquery2_t2`.`pk` = `test`.`subquery2_t3`.`pk`) and (`test`.`table3`.`col_int_key` = `test`.`table2`.`pk`) and (`<subquery3>`.`subquery2_field1` = `test`.`table2`.`pk`) and (`<subquery4>`.`subquery1_field1` = `test`.`table3`.`col_int_nokey`) and (`test`.`subquery1_t1`.`pk` > 1))
 SELECT * FROM v1;
 field1
 v
diff -Nru mysql-8.0-8.0.26/mysql-test/r/subquery_sj_all_bka.result mysql-8.0-8.0.27/mysql-test/r/subquery_sj_all_bka.result
--- mysql-8.0-8.0.26/mysql-test/r/subquery_sj_all_bka.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/subquery_sj_all_bka.result	2021-09-28 11:46:34.000000000 +0000
@@ -4311,7 +4311,7 @@
                 -> Nested loop inner join  (cost=29.95 rows=40)
                     -> Filter: (t1.c is not null)  (cost=15.95 rows=40)
                         -> Index range scan on t1 using kp1, with index condition: (t1.kp1 < 20)  (cost=15.95 rows=40)
-                    -> Single-row index lookup on t4 using PRIMARY (pk=t1.c)  (cost=0.25 rows=1)
+                    -> Single-row covering index lookup on t4 using PRIMARY (pk=t1.c)  (cost=0.25 rows=1)
 
 select * from t3 where a in 
 (select t1.kp1 from t1,t4 where kp1<20 and t4.pk=t1.c);
@@ -4957,6 +4957,11 @@
 (concat('1 - 03', repeat('x', @suffix_len)), concat('2 - 03', repeat('x', @suffix_len)));
 insert into t3_16 values
 (concat('1 - 04', repeat('x', @suffix_len)), concat('2 - 04', repeat('x', @suffix_len)));
+ANALYZE TABLE t1_16, t2_16, t3_16;
+Table	Op	Msg_type	Msg_text
+test.t1_16	analyze	status	OK
+test.t2_16	analyze	status	OK
+test.t3_16	analyze	status	OK
 explain select left(a1,7), left(a2,7)
 from t1_16
 where a1 in (select b1 from t2_16 where b1 > '0');
@@ -5047,6 +5052,11 @@
 insert into t3 values ('1 - 06', '2 - 06');
 insert into t3 values ('1 - 07', '2 - 07');
 insert into t3 values ('1 - 08', '2 - 08');
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 explain
 select * from t1
 where concat(a1,'x') IN
@@ -7117,7 +7127,7 @@
 1	SIMPLE	a	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 1	SIMPLE	t1	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `t1`.`t1field`) and (`test`.`t1`.`t1field` = `t1`.`t1field`))
+Note	1003	/* select#1 */ select `test`.`t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `test`.`t1`.`t1field`) and (`test`.`t1`.`t1field` = `test`.`t1`.`t1field`))
 SELECT t1.t1field
 FROM t1 LEFT JOIN t1 AS t2 ON t1.t1field IN (SELECT v1field FROM v1);
 t1field
@@ -7134,7 +7144,7 @@
 1	SIMPLE	a	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 1	SIMPLE	t1	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `t1`.`t1field`) and (`test`.`t1`.`t1field` = `t1`.`t1field`))
+Note	1003	/* select#1 */ select `test`.`t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `test`.`t1`.`t1field`) and (`test`.`t1`.`t1field` = `test`.`t1`.`t1field`))
 CREATE PROCEDURE p1() 
 BEGIN 
 SELECT t1field
@@ -7202,6 +7212,11 @@
 INSERT INTO works VALUES  ('E4','P2',20);
 INSERT INTO works VALUES  ('E4','P4',40);
 INSERT INTO works VALUES  ('E4','P5',80);
+ANALYZE TABLE staff, proj, works;
+Table	Op	Msg_type	Msg_text
+test.staff	analyze	status	OK
+test.proj	analyze	status	OK
+test.works	analyze	status	OK
 explain SELECT EMPNUM, EMPNAME
 FROM staff
 WHERE EMPNUM IN
@@ -7524,6 +7539,11 @@
 INSERT INTO t3 VALUES  ('E4','P4',40);
 INSERT INTO t3 VALUES  ('E4','P5',80);
 CREATE UNIQUE INDEX t1_IDX ON t1(EMPNUM);
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7571,6 +7591,9 @@
 DEALLOCATE PREPARE stmt;
 DROP INDEX t1_IDX ON t1;
 CREATE INDEX t1_IDX ON t1(EMPNUM);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7581,11 +7604,12 @@
 FROM t2
 WHERE PTYPE = 'Design'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	NULL
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; FirstMatch(t1)
+1	SIMPLE	<subquery2>	NULL	ALL	NULL	NULL	NULL	NULL	NULL	100.00	NULL
+1	SIMPLE	t1	NULL	ref	t1_IDX	t1_IDX	3	<subquery2>.EMPNUM	1	100.00	Using join buffer (Batched Key Access)
+2	MATERIALIZED	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
+2	MATERIALIZED	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `<subquery2>`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 PREPARE stmt FROM "EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7597,23 +7621,28 @@
         WHERE PTYPE = 'Design'))";
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	NULL
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; FirstMatch(t1)
+1	SIMPLE	<subquery2>	NULL	ALL	NULL	NULL	NULL	NULL	NULL	100.00	NULL
+1	SIMPLE	t1	NULL	ref	t1_IDX	t1_IDX	3	<subquery2>.EMPNUM	1	100.00	Using join buffer (Batched Key Access)
+2	MATERIALIZED	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
+2	MATERIALIZED	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `<subquery2>`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 
 This line is only in place to help --skip_if_hypergraph diffing some more.
 
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	NULL
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; FirstMatch(t1)
+1	SIMPLE	<subquery2>	NULL	ALL	NULL	NULL	NULL	NULL	NULL	100.00	NULL
+1	SIMPLE	t1	NULL	ref	t1_IDX	t1_IDX	3	<subquery2>.EMPNUM	1	100.00	Using join buffer (Batched Key Access)
+2	MATERIALIZED	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
+2	MATERIALIZED	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `<subquery2>`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 DEALLOCATE PREPARE stmt;
 DROP INDEX t1_IDX ON t1;
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7624,11 +7653,11 @@
 FROM t2
 WHERE PTYPE = 'Design'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; FirstMatch(t1)
+1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	20.00	Using where; End temporary; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 PREPARE stmt FROM "EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7640,21 +7669,21 @@
         WHERE PTYPE = 'Design'))";
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; FirstMatch(t1)
+1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	20.00	Using where; End temporary; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 
 This line is only in place to help --skip_if_hypergraph diffing some more.
 
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; FirstMatch(t1)
+1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	20.00	Using where; End temporary; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 DEALLOCATE PREPARE stmt;
 DROP TABLE t1, t2, t3;
 #
@@ -8278,6 +8307,12 @@
 create table t2 as select * from t1;
 create table t3 (pk int, a int, primary key(pk));
 insert into t3 select a,a from t0;
+ANALYZE TABLE t0, t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t0	analyze	status	OK
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 explain 
 select * from t1 left join t2 on (t2.a= t1.a and t2.a in (select pk from t3));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -11114,7 +11149,7 @@
 3	MATERIALIZED	subquery2_t2	NULL	eq_ref	PRIMARY,col_varchar_key	PRIMARY	4	test.subquery2_t3.pk	1	7.14	Using where
 3	MATERIALIZED	subquery2_t1	NULL	index	col_int_key	col_int_key	5	NULL	20	100.00	Using index; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `table2`.`col_varchar_nokey` AS `field1` from `test`.`t2` `table1` join `test`.`t1` `table2` straight_join `test`.`t2` `table3` semi join (`test`.`t1` `subquery1_t2` join `test`.`t1` `subquery1_t3` join `test`.`t2` `subquery1_t1`) semi join (`test`.`t3` `subquery2_t2` join `test`.`t1` `subquery2_t3` join `test`.`t2` `subquery2_t1`) where ((`subquery1_t2`.`pk` = `subquery1_t3`.`col_int_key`) and (`subquery1_t2`.`col_varchar_nokey` = `subquery1_t3`.`col_varchar_key`) and (`subquery2_t2`.`col_varchar_key` = `subquery2_t3`.`col_varchar_key`) and (`subquery2_t2`.`pk` = `subquery2_t3`.`pk`) and (`table3`.`col_int_key` = `table2`.`pk`) and (`<subquery3>`.`subquery2_field1` = `table2`.`pk`) and (`<subquery4>`.`subquery1_field1` = `table3`.`col_int_nokey`) and (`subquery1_t1`.`pk` > 1))
+Note	1003	/* select#1 */ select `test`.`table2`.`col_varchar_nokey` AS `field1` from `test`.`t2` `table1` join `test`.`t1` `table2` straight_join `test`.`t2` `table3` semi join (`test`.`t1` `subquery1_t2` join `test`.`t1` `subquery1_t3` join `test`.`t2` `subquery1_t1`) semi join (`test`.`t3` `subquery2_t2` join `test`.`t1` `subquery2_t3` join `test`.`t2` `subquery2_t1`) where ((`test`.`subquery1_t2`.`pk` = `test`.`subquery1_t3`.`col_int_key`) and (`test`.`subquery1_t2`.`col_varchar_nokey` = `test`.`subquery1_t3`.`col_varchar_key`) and (`test`.`subquery2_t2`.`col_varchar_key` = `test`.`subquery2_t3`.`col_varchar_key`) and (`test`.`subquery2_t2`.`pk` = `test`.`subquery2_t3`.`pk`) and (`test`.`table3`.`col_int_key` = `test`.`table2`.`pk`) and (`<subquery3>`.`subquery2_field1` = `test`.`table2`.`pk`) and (`<subquery4>`.`subquery1_field1` = `test`.`table3`.`col_int_nokey`) and (`test`.`subquery1_t1`.`pk` > 1))
 SELECT * FROM v1;
 field1
 v
diff -Nru mysql-8.0-8.0.26/mysql-test/r/subquery_sj_all.result mysql-8.0-8.0.27/mysql-test/r/subquery_sj_all.result
--- mysql-8.0-8.0.26/mysql-test/r/subquery_sj_all.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/subquery_sj_all.result	2021-09-28 11:46:34.000000000 +0000
@@ -4310,7 +4310,7 @@
                 -> Nested loop inner join  (cost=29.95 rows=40)
                     -> Filter: (t1.c is not null)  (cost=15.95 rows=40)
                         -> Index range scan on t1 using kp1, with index condition: (t1.kp1 < 20)  (cost=15.95 rows=40)
-                    -> Single-row index lookup on t4 using PRIMARY (pk=t1.c)  (cost=0.25 rows=1)
+                    -> Single-row covering index lookup on t4 using PRIMARY (pk=t1.c)  (cost=0.25 rows=1)
 
 select * from t3 where a in 
 (select t1.kp1 from t1,t4 where kp1<20 and t4.pk=t1.c);
@@ -4955,6 +4955,11 @@
 (concat('1 - 03', repeat('x', @suffix_len)), concat('2 - 03', repeat('x', @suffix_len)));
 insert into t3_16 values
 (concat('1 - 04', repeat('x', @suffix_len)), concat('2 - 04', repeat('x', @suffix_len)));
+ANALYZE TABLE t1_16, t2_16, t3_16;
+Table	Op	Msg_type	Msg_text
+test.t1_16	analyze	status	OK
+test.t2_16	analyze	status	OK
+test.t3_16	analyze	status	OK
 explain select left(a1,7), left(a2,7)
 from t1_16
 where a1 in (select b1 from t2_16 where b1 > '0');
@@ -5045,6 +5050,11 @@
 insert into t3 values ('1 - 06', '2 - 06');
 insert into t3 values ('1 - 07', '2 - 07');
 insert into t3 values ('1 - 08', '2 - 08');
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 explain
 select * from t1
 where concat(a1,'x') IN
@@ -7115,7 +7125,7 @@
 1	SIMPLE	a	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 1	SIMPLE	t1	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `t1`.`t1field`) and (`test`.`t1`.`t1field` = `t1`.`t1field`))
+Note	1003	/* select#1 */ select `test`.`t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `test`.`t1`.`t1field`) and (`test`.`t1`.`t1field` = `test`.`t1`.`t1field`))
 SELECT t1.t1field
 FROM t1 LEFT JOIN t1 AS t2 ON t1.t1field IN (SELECT v1field FROM v1);
 t1field
@@ -7132,7 +7142,7 @@
 1	SIMPLE	a	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 1	SIMPLE	t1	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `t1`.`t1field`) and (`test`.`t1`.`t1field` = `t1`.`t1field`))
+Note	1003	/* select#1 */ select `test`.`t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `test`.`t1`.`t1field`) and (`test`.`t1`.`t1field` = `test`.`t1`.`t1field`))
 CREATE PROCEDURE p1() 
 BEGIN 
 SELECT t1field
@@ -7200,6 +7210,11 @@
 INSERT INTO works VALUES  ('E4','P2',20);
 INSERT INTO works VALUES  ('E4','P4',40);
 INSERT INTO works VALUES  ('E4','P5',80);
+ANALYZE TABLE staff, proj, works;
+Table	Op	Msg_type	Msg_text
+test.staff	analyze	status	OK
+test.proj	analyze	status	OK
+test.works	analyze	status	OK
 explain SELECT EMPNUM, EMPNAME
 FROM staff
 WHERE EMPNUM IN
@@ -7522,6 +7537,11 @@
 INSERT INTO t3 VALUES  ('E4','P4',40);
 INSERT INTO t3 VALUES  ('E4','P5',80);
 CREATE UNIQUE INDEX t1_IDX ON t1(EMPNUM);
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7569,6 +7589,9 @@
 DEALLOCATE PREPARE stmt;
 DROP INDEX t1_IDX ON t1;
 CREATE INDEX t1_IDX ON t1(EMPNUM);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7579,11 +7602,12 @@
 FROM t2
 WHERE PTYPE = 'Design'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	NULL
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; FirstMatch(t1)
+1	SIMPLE	<subquery2>	NULL	ALL	NULL	NULL	NULL	NULL	NULL	100.00	NULL
+1	SIMPLE	t1	NULL	ref	t1_IDX	t1_IDX	3	<subquery2>.EMPNUM	1	100.00	NULL
+2	MATERIALIZED	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
+2	MATERIALIZED	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `<subquery2>`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 PREPARE stmt FROM "EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7595,23 +7619,28 @@
         WHERE PTYPE = 'Design'))";
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	NULL
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; FirstMatch(t1)
+1	SIMPLE	<subquery2>	NULL	ALL	NULL	NULL	NULL	NULL	NULL	100.00	NULL
+1	SIMPLE	t1	NULL	ref	t1_IDX	t1_IDX	3	<subquery2>.EMPNUM	1	100.00	NULL
+2	MATERIALIZED	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
+2	MATERIALIZED	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `<subquery2>`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 
 This line is only in place to help --skip_if_hypergraph diffing some more.
 
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	NULL
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; FirstMatch(t1)
+1	SIMPLE	<subquery2>	NULL	ALL	NULL	NULL	NULL	NULL	NULL	100.00	NULL
+1	SIMPLE	t1	NULL	ref	t1_IDX	t1_IDX	3	<subquery2>.EMPNUM	1	100.00	NULL
+2	MATERIALIZED	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
+2	MATERIALIZED	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `<subquery2>`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 DEALLOCATE PREPARE stmt;
 DROP INDEX t1_IDX ON t1;
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7622,11 +7651,11 @@
 FROM t2
 WHERE PTYPE = 'Design'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; FirstMatch(t1)
+1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	20.00	Using where; End temporary; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 PREPARE stmt FROM "EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7638,21 +7667,21 @@
         WHERE PTYPE = 'Design'))";
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; FirstMatch(t1)
+1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	20.00	Using where; End temporary; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 
 This line is only in place to help --skip_if_hypergraph diffing some more.
 
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; FirstMatch(t1)
+1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	20.00	Using where; End temporary; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 DEALLOCATE PREPARE stmt;
 DROP TABLE t1, t2, t3;
 #
@@ -8276,6 +8305,12 @@
 create table t2 as select * from t1;
 create table t3 (pk int, a int, primary key(pk));
 insert into t3 select a,a from t0;
+ANALYZE TABLE t0, t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t0	analyze	status	OK
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 explain 
 select * from t1 left join t2 on (t2.a= t1.a and t2.a in (select pk from t3));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -11112,7 +11147,7 @@
 3	MATERIALIZED	subquery2_t2	NULL	eq_ref	PRIMARY,col_varchar_key	PRIMARY	4	test.subquery2_t3.pk	1	7.14	Using where
 3	MATERIALIZED	subquery2_t1	NULL	index	col_int_key	col_int_key	5	NULL	20	100.00	Using index; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `table2`.`col_varchar_nokey` AS `field1` from `test`.`t2` `table1` join `test`.`t1` `table2` straight_join `test`.`t2` `table3` semi join (`test`.`t1` `subquery1_t2` join `test`.`t1` `subquery1_t3` join `test`.`t2` `subquery1_t1`) semi join (`test`.`t3` `subquery2_t2` join `test`.`t1` `subquery2_t3` join `test`.`t2` `subquery2_t1`) where ((`subquery1_t2`.`pk` = `subquery1_t3`.`col_int_key`) and (`subquery1_t2`.`col_varchar_nokey` = `subquery1_t3`.`col_varchar_key`) and (`subquery2_t2`.`col_varchar_key` = `subquery2_t3`.`col_varchar_key`) and (`subquery2_t2`.`pk` = `subquery2_t3`.`pk`) and (`table3`.`col_int_key` = `table2`.`pk`) and (`<subquery3>`.`subquery2_field1` = `table2`.`pk`) and (`<subquery4>`.`subquery1_field1` = `table3`.`col_int_nokey`) and (`subquery1_t1`.`pk` > 1))
+Note	1003	/* select#1 */ select `test`.`table2`.`col_varchar_nokey` AS `field1` from `test`.`t2` `table1` join `test`.`t1` `table2` straight_join `test`.`t2` `table3` semi join (`test`.`t1` `subquery1_t2` join `test`.`t1` `subquery1_t3` join `test`.`t2` `subquery1_t1`) semi join (`test`.`t3` `subquery2_t2` join `test`.`t1` `subquery2_t3` join `test`.`t2` `subquery2_t1`) where ((`test`.`subquery1_t2`.`pk` = `test`.`subquery1_t3`.`col_int_key`) and (`test`.`subquery1_t2`.`col_varchar_nokey` = `test`.`subquery1_t3`.`col_varchar_key`) and (`test`.`subquery2_t2`.`col_varchar_key` = `test`.`subquery2_t3`.`col_varchar_key`) and (`test`.`subquery2_t2`.`pk` = `test`.`subquery2_t3`.`pk`) and (`test`.`table3`.`col_int_key` = `test`.`table2`.`pk`) and (`<subquery3>`.`subquery2_field1` = `test`.`table2`.`pk`) and (`<subquery4>`.`subquery1_field1` = `test`.`table3`.`col_int_nokey`) and (`test`.`subquery1_t1`.`pk` > 1))
 SELECT * FROM v1;
 field1
 v
diff -Nru mysql-8.0-8.0.26/mysql-test/r/subquery_sj_dupsweed_bka_nobnl.result mysql-8.0-8.0.27/mysql-test/r/subquery_sj_dupsweed_bka_nobnl.result
--- mysql-8.0-8.0.26/mysql-test/r/subquery_sj_dupsweed_bka_nobnl.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/subquery_sj_dupsweed_bka_nobnl.result	2021-09-28 11:46:34.000000000 +0000
@@ -4262,7 +4262,7 @@
         -> Nested loop inner join  (cost=25.86 rows=1)
             -> Filter: (t1.c is not null)  (cost=0.26 rows=1)
                 -> Index lookup on t1 using kp1 (kp1=t3.a)  (cost=0.26 rows=1)
-            -> Single-row index lookup on t4 using PRIMARY (pk=t1.c)  (cost=0.26 rows=1)
+            -> Single-row covering index lookup on t4 using PRIMARY (pk=t1.c)  (cost=0.26 rows=1)
 
 select * from t3 where a in 
 (select t1.kp1 from t1,t4 where kp1<20 and t4.pk=t1.c);
@@ -4892,6 +4892,11 @@
 (concat('1 - 03', repeat('x', @suffix_len)), concat('2 - 03', repeat('x', @suffix_len)));
 insert into t3_16 values
 (concat('1 - 04', repeat('x', @suffix_len)), concat('2 - 04', repeat('x', @suffix_len)));
+ANALYZE TABLE t1_16, t2_16, t3_16;
+Table	Op	Msg_type	Msg_text
+test.t1_16	analyze	status	OK
+test.t2_16	analyze	status	OK
+test.t3_16	analyze	status	OK
 explain select left(a1,7), left(a2,7)
 from t1_16
 where a1 in (select b1 from t2_16 where b1 > '0');
@@ -4982,6 +4987,11 @@
 insert into t3 values ('1 - 06', '2 - 06');
 insert into t3 values ('1 - 07', '2 - 07');
 insert into t3 values ('1 - 08', '2 - 08');
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 explain
 select * from t1
 where concat(a1,'x') IN
@@ -7081,7 +7091,7 @@
 1	SIMPLE	a	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 1	SIMPLE	t1	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `t1`.`t1field`) and (`test`.`t1`.`t1field` = `t1`.`t1field`))
+Note	1003	/* select#1 */ select `test`.`t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `test`.`t1`.`t1field`) and (`test`.`t1`.`t1field` = `test`.`t1`.`t1field`))
 SELECT t1.t1field
 FROM t1 LEFT JOIN t1 AS t2 ON t1.t1field IN (SELECT v1field FROM v1);
 t1field
@@ -7098,7 +7108,7 @@
 1	SIMPLE	a	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 1	SIMPLE	t1	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `t1`.`t1field`) and (`test`.`t1`.`t1field` = `t1`.`t1field`))
+Note	1003	/* select#1 */ select `test`.`t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `test`.`t1`.`t1field`) and (`test`.`t1`.`t1field` = `test`.`t1`.`t1field`))
 CREATE PROCEDURE p1() 
 BEGIN 
 SELECT t1field
@@ -7166,6 +7176,11 @@
 INSERT INTO works VALUES  ('E4','P2',20);
 INSERT INTO works VALUES  ('E4','P4',40);
 INSERT INTO works VALUES  ('E4','P5',80);
+ANALYZE TABLE staff, proj, works;
+Table	Op	Msg_type	Msg_text
+test.staff	analyze	status	OK
+test.proj	analyze	status	OK
+test.works	analyze	status	OK
 explain SELECT EMPNUM, EMPNAME
 FROM staff
 WHERE EMPNUM IN
@@ -7486,6 +7501,11 @@
 INSERT INTO t3 VALUES  ('E4','P4',40);
 INSERT INTO t3 VALUES  ('E4','P5',80);
 CREATE UNIQUE INDEX t1_IDX ON t1(EMPNUM);
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7530,6 +7550,9 @@
 DEALLOCATE PREPARE stmt;
 DROP INDEX t1_IDX ON t1;
 CREATE INDEX t1_IDX ON t1(EMPNUM);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7540,11 +7563,11 @@
 FROM t2
 WHERE PTYPE = 'Design'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	NULL
 1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; End temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
+1	SIMPLE	t1	NULL	ref	t1_IDX	t1_IDX	3	test.t3.EMPNUM	1	100.00	End temporary
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 PREPARE stmt FROM "EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7556,23 +7579,26 @@
         WHERE PTYPE = 'Design'))";
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	NULL
 1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; End temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
+1	SIMPLE	t1	NULL	ref	t1_IDX	t1_IDX	3	test.t3.EMPNUM	1	100.00	End temporary
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 
 This line is only in place to help --skip_if_hypergraph diffing some more.
 
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	NULL
 1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; End temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
+1	SIMPLE	t1	NULL	ref	t1_IDX	t1_IDX	3	test.t3.EMPNUM	1	100.00	End temporary
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 DEALLOCATE PREPARE stmt;
 DROP INDEX t1_IDX ON t1;
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7583,11 +7609,11 @@
 FROM t2
 WHERE PTYPE = 'Design'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
 1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; End temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	20.00	Using where; End temporary
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 PREPARE stmt FROM "EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7599,21 +7625,21 @@
         WHERE PTYPE = 'Design'))";
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
 1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; End temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	20.00	Using where; End temporary
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 
 This line is only in place to help --skip_if_hypergraph diffing some more.
 
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
 1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; End temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	20.00	Using where; End temporary
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 DEALLOCATE PREPARE stmt;
 DROP TABLE t1, t2, t3;
 #
@@ -8234,6 +8260,12 @@
 create table t2 as select * from t1;
 create table t3 (pk int, a int, primary key(pk));
 insert into t3 select a,a from t0;
+ANALYZE TABLE t0, t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t0	analyze	status	OK
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 explain 
 select * from t1 left join t2 on (t2.a= t1.a and t2.a in (select pk from t3));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -11065,7 +11097,7 @@
 1	SIMPLE	subquery2_t1	NULL	ref	col_int_key	col_int_key	5	test.table2.pk	2	100.00	Using index
 1	SIMPLE	subquery1_t1	NULL	index	PRIMARY	col_int_key	5	NULL	20	100.00	Using where; Using index; End temporary
 Warnings:
-Note	1003	/* select#1 */ select `table2`.`col_varchar_nokey` AS `field1` from `test`.`t2` `table1` join `test`.`t1` `table2` straight_join `test`.`t2` `table3` semi join (`test`.`t1` `subquery1_t2` join `test`.`t1` `subquery1_t3` join `test`.`t2` `subquery1_t1`) semi join (`test`.`t3` `subquery2_t2` join `test`.`t1` `subquery2_t3` join `test`.`t2` `subquery2_t1`) where ((`subquery1_t2`.`pk` = `subquery1_t3`.`col_int_key`) and (`subquery1_t2`.`col_varchar_nokey` = `subquery1_t3`.`col_varchar_key`) and (`subquery2_t2`.`col_varchar_key` = `subquery2_t3`.`col_varchar_key`) and (`subquery2_t2`.`pk` = `subquery2_t3`.`pk`) and (`table3`.`col_int_key` = `table2`.`pk`) and (`subquery2_t1`.`col_int_key` = `table2`.`pk`) and (`table3`.`col_int_nokey` = `subquery1_t2`.`col_int_nokey`) and (`subquery1_t1`.`pk` > 1))
+Note	1003	/* select#1 */ select `test`.`table2`.`col_varchar_nokey` AS `field1` from `test`.`t2` `table1` join `test`.`t1` `table2` straight_join `test`.`t2` `table3` semi join (`test`.`t1` `subquery1_t2` join `test`.`t1` `subquery1_t3` join `test`.`t2` `subquery1_t1`) semi join (`test`.`t3` `subquery2_t2` join `test`.`t1` `subquery2_t3` join `test`.`t2` `subquery2_t1`) where ((`test`.`subquery1_t2`.`pk` = `test`.`subquery1_t3`.`col_int_key`) and (`test`.`subquery1_t2`.`col_varchar_nokey` = `test`.`subquery1_t3`.`col_varchar_key`) and (`test`.`subquery2_t2`.`col_varchar_key` = `test`.`subquery2_t3`.`col_varchar_key`) and (`test`.`subquery2_t2`.`pk` = `test`.`subquery2_t3`.`pk`) and (`test`.`table3`.`col_int_key` = `test`.`table2`.`pk`) and (`test`.`subquery2_t1`.`col_int_key` = `test`.`table2`.`pk`) and (`test`.`table3`.`col_int_nokey` = `test`.`subquery1_t2`.`col_int_nokey`) and (`test`.`subquery1_t1`.`pk` > 1))
 SELECT * FROM v1;
 field1
 v
@@ -13074,7 +13106,7 @@
     -> Limit: 1 row(s)  (cost=2.14 rows=1)
         -> Filter: (t3.col_int is null)  (cost=2.14 rows=1)
             -> Nested loop left join  (cost=2.14 rows=1)
-                -> Index lookup on t1 using col_int_key (col_int_key=t4.col_int_key)  (cost=0.27 rows=1)
+                -> Covering index lookup on t1 using col_int_key (col_int_key=t4.col_int_key)  (cost=0.27 rows=1)
                 -> Nested loop inner join  (cost=2.41 rows=1)
                     -> Single-row index lookup on t2 using PRIMARY (pk=t1.pk)  (cost=0.26 rows=1)
                     -> Index lookup on t3 using col_int_key (col_int_key=t2.col_int)  (cost=0.07 rows=1)
diff -Nru mysql-8.0-8.0.26/mysql-test/r/subquery_sj_dupsweed_bka.result mysql-8.0-8.0.27/mysql-test/r/subquery_sj_dupsweed_bka.result
--- mysql-8.0-8.0.26/mysql-test/r/subquery_sj_dupsweed_bka.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/subquery_sj_dupsweed_bka.result	2021-09-28 11:46:34.000000000 +0000
@@ -4263,7 +4263,7 @@
         -> Nested loop inner join  (cost=25.86 rows=1)
             -> Filter: (t1.c is not null)  (cost=0.26 rows=1)
                 -> Index lookup on t1 using kp1 (kp1=t3.a)  (cost=0.26 rows=1)
-            -> Single-row index lookup on t4 using PRIMARY (pk=t1.c)  (cost=0.26 rows=1)
+            -> Single-row covering index lookup on t4 using PRIMARY (pk=t1.c)  (cost=0.26 rows=1)
 
 select * from t3 where a in 
 (select t1.kp1 from t1,t4 where kp1<20 and t4.pk=t1.c);
@@ -4890,6 +4890,11 @@
 (concat('1 - 03', repeat('x', @suffix_len)), concat('2 - 03', repeat('x', @suffix_len)));
 insert into t3_16 values
 (concat('1 - 04', repeat('x', @suffix_len)), concat('2 - 04', repeat('x', @suffix_len)));
+ANALYZE TABLE t1_16, t2_16, t3_16;
+Table	Op	Msg_type	Msg_text
+test.t1_16	analyze	status	OK
+test.t2_16	analyze	status	OK
+test.t3_16	analyze	status	OK
 explain select left(a1,7), left(a2,7)
 from t1_16
 where a1 in (select b1 from t2_16 where b1 > '0');
@@ -4980,6 +4985,11 @@
 insert into t3 values ('1 - 06', '2 - 06');
 insert into t3 values ('1 - 07', '2 - 07');
 insert into t3 values ('1 - 08', '2 - 08');
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 explain
 select * from t1
 where concat(a1,'x') IN
@@ -7079,7 +7089,7 @@
 1	SIMPLE	a	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 1	SIMPLE	t1	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `t1`.`t1field`) and (`test`.`t1`.`t1field` = `t1`.`t1field`))
+Note	1003	/* select#1 */ select `test`.`t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `test`.`t1`.`t1field`) and (`test`.`t1`.`t1field` = `test`.`t1`.`t1field`))
 SELECT t1.t1field
 FROM t1 LEFT JOIN t1 AS t2 ON t1.t1field IN (SELECT v1field FROM v1);
 t1field
@@ -7096,7 +7106,7 @@
 1	SIMPLE	a	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 1	SIMPLE	t1	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `t1`.`t1field`) and (`test`.`t1`.`t1field` = `t1`.`t1field`))
+Note	1003	/* select#1 */ select `test`.`t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `test`.`t1`.`t1field`) and (`test`.`t1`.`t1field` = `test`.`t1`.`t1field`))
 CREATE PROCEDURE p1() 
 BEGIN 
 SELECT t1field
@@ -7164,6 +7174,11 @@
 INSERT INTO works VALUES  ('E4','P2',20);
 INSERT INTO works VALUES  ('E4','P4',40);
 INSERT INTO works VALUES  ('E4','P5',80);
+ANALYZE TABLE staff, proj, works;
+Table	Op	Msg_type	Msg_text
+test.staff	analyze	status	OK
+test.proj	analyze	status	OK
+test.works	analyze	status	OK
 explain SELECT EMPNUM, EMPNAME
 FROM staff
 WHERE EMPNUM IN
@@ -7484,6 +7499,11 @@
 INSERT INTO t3 VALUES  ('E4','P4',40);
 INSERT INTO t3 VALUES  ('E4','P5',80);
 CREATE UNIQUE INDEX t1_IDX ON t1(EMPNUM);
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7528,6 +7548,9 @@
 DEALLOCATE PREPARE stmt;
 DROP INDEX t1_IDX ON t1;
 CREATE INDEX t1_IDX ON t1(EMPNUM);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7538,11 +7561,11 @@
 FROM t2
 WHERE PTYPE = 'Design'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	Start temporary
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Using join buffer (hash join)
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; End temporary; Using join buffer (hash join)
+1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
+1	SIMPLE	t1	NULL	ref	t1_IDX	t1_IDX	3	test.t3.EMPNUM	1	100.00	End temporary
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 PREPARE stmt FROM "EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7554,23 +7577,26 @@
         WHERE PTYPE = 'Design'))";
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	Start temporary
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Using join buffer (hash join)
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; End temporary; Using join buffer (hash join)
+1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
+1	SIMPLE	t1	NULL	ref	t1_IDX	t1_IDX	3	test.t3.EMPNUM	1	100.00	End temporary
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 
 This line is only in place to help --skip_if_hypergraph diffing some more.
 
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	Start temporary
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Using join buffer (hash join)
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; End temporary; Using join buffer (hash join)
+1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
+1	SIMPLE	t1	NULL	ref	t1_IDX	t1_IDX	3	test.t3.EMPNUM	1	100.00	End temporary
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 DEALLOCATE PREPARE stmt;
 DROP INDEX t1_IDX ON t1;
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7581,11 +7607,11 @@
 FROM t2
 WHERE PTYPE = 'Design'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Start temporary
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Using join buffer (hash join)
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; End temporary; Using join buffer (hash join)
+1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	20.00	Using where; End temporary; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 PREPARE stmt FROM "EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7597,21 +7623,21 @@
         WHERE PTYPE = 'Design'))";
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Start temporary
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Using join buffer (hash join)
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; End temporary; Using join buffer (hash join)
+1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	20.00	Using where; End temporary; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 
 This line is only in place to help --skip_if_hypergraph diffing some more.
 
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Start temporary
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Using join buffer (hash join)
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; End temporary; Using join buffer (hash join)
+1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	20.00	Using where; End temporary; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 DEALLOCATE PREPARE stmt;
 DROP TABLE t1, t2, t3;
 #
@@ -8232,6 +8258,12 @@
 create table t2 as select * from t1;
 create table t3 (pk int, a int, primary key(pk));
 insert into t3 select a,a from t0;
+ANALYZE TABLE t0, t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t0	analyze	status	OK
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 explain 
 select * from t1 left join t2 on (t2.a= t1.a and t2.a in (select pk from t3));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -11063,7 +11095,7 @@
 1	SIMPLE	subquery2_t1	NULL	ref	col_int_key	col_int_key	5	test.table2.pk	2	100.00	Using index
 1	SIMPLE	subquery1_t1	NULL	index	PRIMARY	col_int_key	5	NULL	20	100.00	Using where; Using index; End temporary; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `table2`.`col_varchar_nokey` AS `field1` from `test`.`t2` `table1` join `test`.`t1` `table2` straight_join `test`.`t2` `table3` semi join (`test`.`t1` `subquery1_t2` join `test`.`t1` `subquery1_t3` join `test`.`t2` `subquery1_t1`) semi join (`test`.`t3` `subquery2_t2` join `test`.`t1` `subquery2_t3` join `test`.`t2` `subquery2_t1`) where ((`subquery1_t2`.`pk` = `subquery1_t3`.`col_int_key`) and (`subquery1_t2`.`col_varchar_nokey` = `subquery1_t3`.`col_varchar_key`) and (`subquery2_t2`.`col_varchar_key` = `subquery2_t3`.`col_varchar_key`) and (`subquery2_t2`.`pk` = `subquery2_t3`.`pk`) and (`table3`.`col_int_key` = `table2`.`pk`) and (`subquery2_t1`.`col_int_key` = `table2`.`pk`) and (`table3`.`col_int_nokey` = `subquery1_t2`.`col_int_nokey`) and (`subquery1_t1`.`pk` > 1))
+Note	1003	/* select#1 */ select `test`.`table2`.`col_varchar_nokey` AS `field1` from `test`.`t2` `table1` join `test`.`t1` `table2` straight_join `test`.`t2` `table3` semi join (`test`.`t1` `subquery1_t2` join `test`.`t1` `subquery1_t3` join `test`.`t2` `subquery1_t1`) semi join (`test`.`t3` `subquery2_t2` join `test`.`t1` `subquery2_t3` join `test`.`t2` `subquery2_t1`) where ((`test`.`subquery1_t2`.`pk` = `test`.`subquery1_t3`.`col_int_key`) and (`test`.`subquery1_t2`.`col_varchar_nokey` = `test`.`subquery1_t3`.`col_varchar_key`) and (`test`.`subquery2_t2`.`col_varchar_key` = `test`.`subquery2_t3`.`col_varchar_key`) and (`test`.`subquery2_t2`.`pk` = `test`.`subquery2_t3`.`pk`) and (`test`.`table3`.`col_int_key` = `test`.`table2`.`pk`) and (`test`.`subquery2_t1`.`col_int_key` = `test`.`table2`.`pk`) and (`test`.`table3`.`col_int_nokey` = `test`.`subquery1_t2`.`col_int_nokey`) and (`test`.`subquery1_t1`.`pk` > 1))
 SELECT * FROM v1;
 field1
 v
@@ -13082,7 +13114,7 @@
     -> Limit: 1 row(s)  (cost=2.14 rows=1)
         -> Filter: (t3.col_int is null)  (cost=2.14 rows=1)
             -> Nested loop left join  (cost=2.14 rows=1)
-                -> Index lookup on t1 using col_int_key (col_int_key=t4.col_int_key)  (cost=0.27 rows=1)
+                -> Covering index lookup on t1 using col_int_key (col_int_key=t4.col_int_key)  (cost=0.27 rows=1)
                 -> Nested loop inner join  (cost=1.21 rows=1)
                     -> Single-row index lookup on t2 using PRIMARY (pk=t1.pk)  (cost=0.26 rows=1)
                     -> Filter: (t3.col_int_key = t2.col_int)  (cost=0.11 rows=1)
diff -Nru mysql-8.0-8.0.26/mysql-test/r/subquery_sj_dupsweed.result mysql-8.0-8.0.27/mysql-test/r/subquery_sj_dupsweed.result
--- mysql-8.0-8.0.26/mysql-test/r/subquery_sj_dupsweed.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/subquery_sj_dupsweed.result	2021-09-28 11:46:34.000000000 +0000
@@ -4262,7 +4262,7 @@
         -> Nested loop inner join  (cost=25.86 rows=1)
             -> Filter: (t1.c is not null)  (cost=0.26 rows=1)
                 -> Index lookup on t1 using kp1 (kp1=t3.a)  (cost=0.26 rows=1)
-            -> Single-row index lookup on t4 using PRIMARY (pk=t1.c)  (cost=0.26 rows=1)
+            -> Single-row covering index lookup on t4 using PRIMARY (pk=t1.c)  (cost=0.26 rows=1)
 
 select * from t3 where a in 
 (select t1.kp1 from t1,t4 where kp1<20 and t4.pk=t1.c);
@@ -4889,6 +4889,11 @@
 (concat('1 - 03', repeat('x', @suffix_len)), concat('2 - 03', repeat('x', @suffix_len)));
 insert into t3_16 values
 (concat('1 - 04', repeat('x', @suffix_len)), concat('2 - 04', repeat('x', @suffix_len)));
+ANALYZE TABLE t1_16, t2_16, t3_16;
+Table	Op	Msg_type	Msg_text
+test.t1_16	analyze	status	OK
+test.t2_16	analyze	status	OK
+test.t3_16	analyze	status	OK
 explain select left(a1,7), left(a2,7)
 from t1_16
 where a1 in (select b1 from t2_16 where b1 > '0');
@@ -4979,6 +4984,11 @@
 insert into t3 values ('1 - 06', '2 - 06');
 insert into t3 values ('1 - 07', '2 - 07');
 insert into t3 values ('1 - 08', '2 - 08');
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 explain
 select * from t1
 where concat(a1,'x') IN
@@ -7078,7 +7088,7 @@
 1	SIMPLE	a	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 1	SIMPLE	t1	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `t1`.`t1field`) and (`test`.`t1`.`t1field` = `t1`.`t1field`))
+Note	1003	/* select#1 */ select `test`.`t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `test`.`t1`.`t1field`) and (`test`.`t1`.`t1field` = `test`.`t1`.`t1field`))
 SELECT t1.t1field
 FROM t1 LEFT JOIN t1 AS t2 ON t1.t1field IN (SELECT v1field FROM v1);
 t1field
@@ -7095,7 +7105,7 @@
 1	SIMPLE	a	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 1	SIMPLE	t1	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `t1`.`t1field`) and (`test`.`t1`.`t1field` = `t1`.`t1field`))
+Note	1003	/* select#1 */ select `test`.`t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `test`.`t1`.`t1field`) and (`test`.`t1`.`t1field` = `test`.`t1`.`t1field`))
 CREATE PROCEDURE p1() 
 BEGIN 
 SELECT t1field
@@ -7163,6 +7173,11 @@
 INSERT INTO works VALUES  ('E4','P2',20);
 INSERT INTO works VALUES  ('E4','P4',40);
 INSERT INTO works VALUES  ('E4','P5',80);
+ANALYZE TABLE staff, proj, works;
+Table	Op	Msg_type	Msg_text
+test.staff	analyze	status	OK
+test.proj	analyze	status	OK
+test.works	analyze	status	OK
 explain SELECT EMPNUM, EMPNAME
 FROM staff
 WHERE EMPNUM IN
@@ -7483,6 +7498,11 @@
 INSERT INTO t3 VALUES  ('E4','P4',40);
 INSERT INTO t3 VALUES  ('E4','P5',80);
 CREATE UNIQUE INDEX t1_IDX ON t1(EMPNUM);
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7527,6 +7547,9 @@
 DEALLOCATE PREPARE stmt;
 DROP INDEX t1_IDX ON t1;
 CREATE INDEX t1_IDX ON t1(EMPNUM);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7537,11 +7560,11 @@
 FROM t2
 WHERE PTYPE = 'Design'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	Start temporary
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Using join buffer (hash join)
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; End temporary; Using join buffer (hash join)
+1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
+1	SIMPLE	t1	NULL	ref	t1_IDX	t1_IDX	3	test.t3.EMPNUM	1	100.00	End temporary
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 PREPARE stmt FROM "EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7553,23 +7576,26 @@
         WHERE PTYPE = 'Design'))";
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	Start temporary
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Using join buffer (hash join)
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; End temporary; Using join buffer (hash join)
+1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
+1	SIMPLE	t1	NULL	ref	t1_IDX	t1_IDX	3	test.t3.EMPNUM	1	100.00	End temporary
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 
 This line is only in place to help --skip_if_hypergraph diffing some more.
 
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	Start temporary
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Using join buffer (hash join)
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; End temporary; Using join buffer (hash join)
+1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
+1	SIMPLE	t1	NULL	ref	t1_IDX	t1_IDX	3	test.t3.EMPNUM	1	100.00	End temporary
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 DEALLOCATE PREPARE stmt;
 DROP INDEX t1_IDX ON t1;
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7580,11 +7606,11 @@
 FROM t2
 WHERE PTYPE = 'Design'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Start temporary
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Using join buffer (hash join)
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; End temporary; Using join buffer (hash join)
+1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	20.00	Using where; End temporary; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 PREPARE stmt FROM "EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7596,21 +7622,21 @@
         WHERE PTYPE = 'Design'))";
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Start temporary
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Using join buffer (hash join)
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; End temporary; Using join buffer (hash join)
+1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	20.00	Using where; End temporary; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 
 This line is only in place to help --skip_if_hypergraph diffing some more.
 
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Start temporary
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Using join buffer (hash join)
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; End temporary; Using join buffer (hash join)
+1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	20.00	Using where; End temporary; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 DEALLOCATE PREPARE stmt;
 DROP TABLE t1, t2, t3;
 #
@@ -8231,6 +8257,12 @@
 create table t2 as select * from t1;
 create table t3 (pk int, a int, primary key(pk));
 insert into t3 select a,a from t0;
+ANALYZE TABLE t0, t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t0	analyze	status	OK
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 explain 
 select * from t1 left join t2 on (t2.a= t1.a and t2.a in (select pk from t3));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -11062,7 +11094,7 @@
 1	SIMPLE	subquery2_t1	NULL	ref	col_int_key	col_int_key	5	test.table2.pk	2	100.00	Using index
 1	SIMPLE	subquery1_t1	NULL	index	PRIMARY	col_int_key	5	NULL	20	100.00	Using where; Using index; End temporary; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `table2`.`col_varchar_nokey` AS `field1` from `test`.`t2` `table1` join `test`.`t1` `table2` straight_join `test`.`t2` `table3` semi join (`test`.`t1` `subquery1_t2` join `test`.`t1` `subquery1_t3` join `test`.`t2` `subquery1_t1`) semi join (`test`.`t3` `subquery2_t2` join `test`.`t1` `subquery2_t3` join `test`.`t2` `subquery2_t1`) where ((`subquery1_t2`.`pk` = `subquery1_t3`.`col_int_key`) and (`subquery1_t2`.`col_varchar_nokey` = `subquery1_t3`.`col_varchar_key`) and (`subquery2_t2`.`col_varchar_key` = `subquery2_t3`.`col_varchar_key`) and (`subquery2_t2`.`pk` = `subquery2_t3`.`pk`) and (`table3`.`col_int_key` = `table2`.`pk`) and (`subquery2_t1`.`col_int_key` = `table2`.`pk`) and (`table3`.`col_int_nokey` = `subquery1_t2`.`col_int_nokey`) and (`subquery1_t1`.`pk` > 1))
+Note	1003	/* select#1 */ select `test`.`table2`.`col_varchar_nokey` AS `field1` from `test`.`t2` `table1` join `test`.`t1` `table2` straight_join `test`.`t2` `table3` semi join (`test`.`t1` `subquery1_t2` join `test`.`t1` `subquery1_t3` join `test`.`t2` `subquery1_t1`) semi join (`test`.`t3` `subquery2_t2` join `test`.`t1` `subquery2_t3` join `test`.`t2` `subquery2_t1`) where ((`test`.`subquery1_t2`.`pk` = `test`.`subquery1_t3`.`col_int_key`) and (`test`.`subquery1_t2`.`col_varchar_nokey` = `test`.`subquery1_t3`.`col_varchar_key`) and (`test`.`subquery2_t2`.`col_varchar_key` = `test`.`subquery2_t3`.`col_varchar_key`) and (`test`.`subquery2_t2`.`pk` = `test`.`subquery2_t3`.`pk`) and (`test`.`table3`.`col_int_key` = `test`.`table2`.`pk`) and (`test`.`subquery2_t1`.`col_int_key` = `test`.`table2`.`pk`) and (`test`.`table3`.`col_int_nokey` = `test`.`subquery1_t2`.`col_int_nokey`) and (`test`.`subquery1_t1`.`pk` > 1))
 SELECT * FROM v1;
 field1
 v
@@ -13081,7 +13113,7 @@
     -> Limit: 1 row(s)  (cost=2.14 rows=1)
         -> Filter: (t3.col_int is null)  (cost=2.14 rows=1)
             -> Nested loop left join  (cost=2.14 rows=1)
-                -> Index lookup on t1 using col_int_key (col_int_key=t4.col_int_key)  (cost=0.27 rows=1)
+                -> Covering index lookup on t1 using col_int_key (col_int_key=t4.col_int_key)  (cost=0.27 rows=1)
                 -> Nested loop inner join  (cost=1.21 rows=1)
                     -> Single-row index lookup on t2 using PRIMARY (pk=t1.pk)  (cost=0.26 rows=1)
                     -> Filter: (t3.col_int_key = t2.col_int)  (cost=0.11 rows=1)
diff -Nru mysql-8.0-8.0.26/mysql-test/r/subquery_sj_firstmatch_bka_nobnl.result mysql-8.0-8.0.27/mysql-test/r/subquery_sj_firstmatch_bka_nobnl.result
--- mysql-8.0-8.0.26/mysql-test/r/subquery_sj_firstmatch_bka_nobnl.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/subquery_sj_firstmatch_bka_nobnl.result	2021-09-28 11:46:34.000000000 +0000
@@ -4258,7 +4258,7 @@
     -> Nested loop inner join  (cost=25.86 rows=1)
         -> Filter: (t1.c is not null)  (cost=0.26 rows=1)
             -> Index lookup on t1 using kp1 (kp1=t3.a)  (cost=0.26 rows=1)
-        -> Single-row index lookup on t4 using PRIMARY (pk=t1.c)  (cost=0.26 rows=1)
+        -> Single-row covering index lookup on t4 using PRIMARY (pk=t1.c)  (cost=0.26 rows=1)
 
 select * from t3 where a in 
 (select t1.kp1 from t1,t4 where kp1<20 and t4.pk=t1.c);
@@ -4875,6 +4875,11 @@
 (concat('1 - 03', repeat('x', @suffix_len)), concat('2 - 03', repeat('x', @suffix_len)));
 insert into t3_16 values
 (concat('1 - 04', repeat('x', @suffix_len)), concat('2 - 04', repeat('x', @suffix_len)));
+ANALYZE TABLE t1_16, t2_16, t3_16;
+Table	Op	Msg_type	Msg_text
+test.t1_16	analyze	status	OK
+test.t2_16	analyze	status	OK
+test.t3_16	analyze	status	OK
 explain select left(a1,7), left(a2,7)
 from t1_16
 where a1 in (select b1 from t2_16 where b1 > '0');
@@ -4965,6 +4970,11 @@
 insert into t3 values ('1 - 06', '2 - 06');
 insert into t3 values ('1 - 07', '2 - 07');
 insert into t3 values ('1 - 08', '2 - 08');
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 explain
 select * from t1
 where concat(a1,'x') IN
@@ -7063,7 +7073,7 @@
 1	SIMPLE	a	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 1	SIMPLE	t1	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `t1`.`t1field`) and (`test`.`t1`.`t1field` = `t1`.`t1field`))
+Note	1003	/* select#1 */ select `test`.`t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `test`.`t1`.`t1field`) and (`test`.`t1`.`t1field` = `test`.`t1`.`t1field`))
 SELECT t1.t1field
 FROM t1 LEFT JOIN t1 AS t2 ON t1.t1field IN (SELECT v1field FROM v1);
 t1field
@@ -7080,7 +7090,7 @@
 1	SIMPLE	a	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 1	SIMPLE	t1	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `t1`.`t1field`) and (`test`.`t1`.`t1field` = `t1`.`t1field`))
+Note	1003	/* select#1 */ select `test`.`t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `test`.`t1`.`t1field`) and (`test`.`t1`.`t1field` = `test`.`t1`.`t1field`))
 CREATE PROCEDURE p1() 
 BEGIN 
 SELECT t1field
@@ -7148,6 +7158,11 @@
 INSERT INTO works VALUES  ('E4','P2',20);
 INSERT INTO works VALUES  ('E4','P4',40);
 INSERT INTO works VALUES  ('E4','P5',80);
+ANALYZE TABLE staff, proj, works;
+Table	Op	Msg_type	Msg_text
+test.staff	analyze	status	OK
+test.proj	analyze	status	OK
+test.works	analyze	status	OK
 explain SELECT EMPNUM, EMPNAME
 FROM staff
 WHERE EMPNUM IN
@@ -7468,6 +7483,11 @@
 INSERT INTO t3 VALUES  ('E4','P4',40);
 INSERT INTO t3 VALUES  ('E4','P5',80);
 CREATE UNIQUE INDEX t1_IDX ON t1(EMPNUM);
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7512,6 +7532,9 @@
 DEALLOCATE PREPARE stmt;
 DROP INDEX t1_IDX ON t1;
 CREATE INDEX t1_IDX ON t1(EMPNUM);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7522,7 +7545,7 @@
 FROM t2
 WHERE PTYPE = 'Design'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	NULL
+1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	5	100.00	NULL
 1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; FirstMatch(t1)
 Warnings:
@@ -7538,7 +7561,7 @@
         WHERE PTYPE = 'Design'))";
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	NULL
+1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	5	100.00	NULL
 1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; FirstMatch(t1)
 Warnings:
@@ -7548,13 +7571,16 @@
 
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	NULL
+1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	5	100.00	NULL
 1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; FirstMatch(t1)
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 DEALLOCATE PREPARE stmt;
 DROP INDEX t1_IDX ON t1;
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7565,7 +7591,7 @@
 FROM t2
 WHERE PTYPE = 'Design'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	100.00	NULL
 1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; FirstMatch(t1)
 Warnings:
@@ -7581,7 +7607,7 @@
         WHERE PTYPE = 'Design'))";
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	100.00	NULL
 1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; FirstMatch(t1)
 Warnings:
@@ -7591,7 +7617,7 @@
 
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	100.00	NULL
 1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; FirstMatch(t1)
 Warnings:
@@ -8206,6 +8232,12 @@
 create table t2 as select * from t1;
 create table t3 (pk int, a int, primary key(pk));
 insert into t3 select a,a from t0;
+ANALYZE TABLE t0, t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t0	analyze	status	OK
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 explain 
 select * from t1 left join t2 on (t2.a= t1.a and t2.a in (select pk from t3));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -11030,7 +11062,7 @@
 1	SIMPLE	subquery2_t2	NULL	eq_ref	PRIMARY,col_varchar_key	PRIMARY	4	test.subquery2_t3.pk	1	7.14	Using where
 1	SIMPLE	subquery2_t1	NULL	ref	col_int_key	col_int_key	5	test.table2.pk	2	100.00	Using index; FirstMatch(subquery1_t1)
 Warnings:
-Note	1003	/* select#1 */ select `table2`.`col_varchar_nokey` AS `field1` from `test`.`t2` `table1` join `test`.`t1` `table2` straight_join `test`.`t2` `table3` semi join (`test`.`t1` `subquery1_t2` join `test`.`t1` `subquery1_t3` join `test`.`t2` `subquery1_t1`) semi join (`test`.`t3` `subquery2_t2` join `test`.`t1` `subquery2_t3` join `test`.`t2` `subquery2_t1`) where ((`subquery1_t3`.`col_int_key` = `subquery1_t2`.`pk`) and (`subquery1_t3`.`col_varchar_key` = `subquery1_t2`.`col_varchar_nokey`) and (`subquery2_t2`.`col_varchar_key` = `subquery2_t3`.`col_varchar_key`) and (`subquery2_t2`.`pk` = `subquery2_t3`.`pk`) and (`table3`.`col_int_key` = `table2`.`pk`) and (`subquery2_t1`.`col_int_key` = `table2`.`pk`) and (`subquery1_t2`.`col_int_nokey` = `table3`.`col_int_nokey`) and (`subquery1_t1`.`pk` > 1))
+Note	1003	/* select#1 */ select `test`.`table2`.`col_varchar_nokey` AS `field1` from `test`.`t2` `table1` join `test`.`t1` `table2` straight_join `test`.`t2` `table3` semi join (`test`.`t1` `subquery1_t2` join `test`.`t1` `subquery1_t3` join `test`.`t2` `subquery1_t1`) semi join (`test`.`t3` `subquery2_t2` join `test`.`t1` `subquery2_t3` join `test`.`t2` `subquery2_t1`) where ((`test`.`subquery1_t3`.`col_int_key` = `test`.`subquery1_t2`.`pk`) and (`test`.`subquery1_t3`.`col_varchar_key` = `test`.`subquery1_t2`.`col_varchar_nokey`) and (`test`.`subquery2_t2`.`col_varchar_key` = `test`.`subquery2_t3`.`col_varchar_key`) and (`test`.`subquery2_t2`.`pk` = `test`.`subquery2_t3`.`pk`) and (`test`.`table3`.`col_int_key` = `test`.`table2`.`pk`) and (`test`.`subquery2_t1`.`col_int_key` = `test`.`table2`.`pk`) and (`test`.`subquery1_t2`.`col_int_nokey` = `test`.`table3`.`col_int_nokey`) and (`test`.`subquery1_t1`.`pk` > 1))
 SELECT * FROM v1;
 field1
 v
@@ -13023,7 +13055,7 @@
             -> Table scan on t4  (cost=0.85 rows=6)
     -> Filter: (t3.col_int is null)  (cost=2.14 rows=1)
         -> Nested loop left join  (cost=2.14 rows=1)
-            -> Index lookup on t1 using col_int_key (col_int_key=t4.col_int_key)  (cost=0.27 rows=1)
+            -> Covering index lookup on t1 using col_int_key (col_int_key=t4.col_int_key)  (cost=0.27 rows=1)
             -> Nested loop inner join  (cost=2.41 rows=1)
                 -> Single-row index lookup on t2 using PRIMARY (pk=t1.pk)  (cost=0.26 rows=1)
                 -> Index lookup on t3 using col_int_key (col_int_key=t2.col_int)  (cost=0.07 rows=1)
diff -Nru mysql-8.0-8.0.26/mysql-test/r/subquery_sj_firstmatch_bka.result mysql-8.0-8.0.27/mysql-test/r/subquery_sj_firstmatch_bka.result
--- mysql-8.0-8.0.26/mysql-test/r/subquery_sj_firstmatch_bka.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/subquery_sj_firstmatch_bka.result	2021-09-28 11:46:34.000000000 +0000
@@ -4260,7 +4260,7 @@
     -> Nested loop inner join  (cost=25.86 rows=1)
         -> Filter: (t1.c is not null)  (cost=0.26 rows=1)
             -> Index lookup on t1 using kp1 (kp1=t3.a)  (cost=0.26 rows=1)
-        -> Single-row index lookup on t4 using PRIMARY (pk=t1.c)  (cost=0.26 rows=1)
+        -> Single-row covering index lookup on t4 using PRIMARY (pk=t1.c)  (cost=0.26 rows=1)
 
 select * from t3 where a in 
 (select t1.kp1 from t1,t4 where kp1<20 and t4.pk=t1.c);
@@ -4879,6 +4879,11 @@
 (concat('1 - 03', repeat('x', @suffix_len)), concat('2 - 03', repeat('x', @suffix_len)));
 insert into t3_16 values
 (concat('1 - 04', repeat('x', @suffix_len)), concat('2 - 04', repeat('x', @suffix_len)));
+ANALYZE TABLE t1_16, t2_16, t3_16;
+Table	Op	Msg_type	Msg_text
+test.t1_16	analyze	status	OK
+test.t2_16	analyze	status	OK
+test.t3_16	analyze	status	OK
 explain select left(a1,7), left(a2,7)
 from t1_16
 where a1 in (select b1 from t2_16 where b1 > '0');
@@ -4969,6 +4974,11 @@
 insert into t3 values ('1 - 06', '2 - 06');
 insert into t3 values ('1 - 07', '2 - 07');
 insert into t3 values ('1 - 08', '2 - 08');
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 explain
 select * from t1
 where concat(a1,'x') IN
@@ -7067,7 +7077,7 @@
 1	SIMPLE	a	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 1	SIMPLE	t1	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `t1`.`t1field`) and (`test`.`t1`.`t1field` = `t1`.`t1field`))
+Note	1003	/* select#1 */ select `test`.`t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `test`.`t1`.`t1field`) and (`test`.`t1`.`t1field` = `test`.`t1`.`t1field`))
 SELECT t1.t1field
 FROM t1 LEFT JOIN t1 AS t2 ON t1.t1field IN (SELECT v1field FROM v1);
 t1field
@@ -7084,7 +7094,7 @@
 1	SIMPLE	a	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 1	SIMPLE	t1	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `t1`.`t1field`) and (`test`.`t1`.`t1field` = `t1`.`t1field`))
+Note	1003	/* select#1 */ select `test`.`t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `test`.`t1`.`t1field`) and (`test`.`t1`.`t1field` = `test`.`t1`.`t1field`))
 CREATE PROCEDURE p1() 
 BEGIN 
 SELECT t1field
@@ -7152,6 +7162,11 @@
 INSERT INTO works VALUES  ('E4','P2',20);
 INSERT INTO works VALUES  ('E4','P4',40);
 INSERT INTO works VALUES  ('E4','P5',80);
+ANALYZE TABLE staff, proj, works;
+Table	Op	Msg_type	Msg_text
+test.staff	analyze	status	OK
+test.proj	analyze	status	OK
+test.works	analyze	status	OK
 explain SELECT EMPNUM, EMPNAME
 FROM staff
 WHERE EMPNUM IN
@@ -7472,6 +7487,11 @@
 INSERT INTO t3 VALUES  ('E4','P4',40);
 INSERT INTO t3 VALUES  ('E4','P5',80);
 CREATE UNIQUE INDEX t1_IDX ON t1(EMPNUM);
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7516,6 +7536,9 @@
 DEALLOCATE PREPARE stmt;
 DROP INDEX t1_IDX ON t1;
 CREATE INDEX t1_IDX ON t1(EMPNUM);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7526,7 +7549,7 @@
 FROM t2
 WHERE PTYPE = 'Design'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	NULL
+1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	5	100.00	NULL
 1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; FirstMatch(t1)
 Warnings:
@@ -7542,7 +7565,7 @@
         WHERE PTYPE = 'Design'))";
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	NULL
+1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	5	100.00	NULL
 1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; FirstMatch(t1)
 Warnings:
@@ -7552,13 +7575,16 @@
 
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	NULL
+1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	5	100.00	NULL
 1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; FirstMatch(t1)
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 DEALLOCATE PREPARE stmt;
 DROP INDEX t1_IDX ON t1;
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7569,7 +7595,7 @@
 FROM t2
 WHERE PTYPE = 'Design'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	100.00	NULL
 1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; FirstMatch(t1)
 Warnings:
@@ -7585,7 +7611,7 @@
         WHERE PTYPE = 'Design'))";
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	100.00	NULL
 1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; FirstMatch(t1)
 Warnings:
@@ -7595,7 +7621,7 @@
 
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	100.00	NULL
 1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; FirstMatch(t1)
 Warnings:
@@ -8211,6 +8237,12 @@
 create table t2 as select * from t1;
 create table t3 (pk int, a int, primary key(pk));
 insert into t3 select a,a from t0;
+ANALYZE TABLE t0, t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t0	analyze	status	OK
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 explain 
 select * from t1 left join t2 on (t2.a= t1.a and t2.a in (select pk from t3));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -11035,7 +11067,7 @@
 1	SIMPLE	subquery2_t2	NULL	eq_ref	PRIMARY,col_varchar_key	PRIMARY	4	test.subquery2_t3.pk	1	7.14	Using where
 1	SIMPLE	subquery2_t1	NULL	ref	col_int_key	col_int_key	5	test.table2.pk	2	100.00	Using index; FirstMatch(subquery1_t1)
 Warnings:
-Note	1003	/* select#1 */ select `table2`.`col_varchar_nokey` AS `field1` from `test`.`t2` `table1` join `test`.`t1` `table2` straight_join `test`.`t2` `table3` semi join (`test`.`t1` `subquery1_t2` join `test`.`t1` `subquery1_t3` join `test`.`t2` `subquery1_t1`) semi join (`test`.`t3` `subquery2_t2` join `test`.`t1` `subquery2_t3` join `test`.`t2` `subquery2_t1`) where ((`subquery1_t3`.`col_int_key` = `subquery1_t2`.`pk`) and (`subquery1_t3`.`col_varchar_key` = `subquery1_t2`.`col_varchar_nokey`) and (`subquery2_t2`.`col_varchar_key` = `subquery2_t3`.`col_varchar_key`) and (`subquery2_t2`.`pk` = `subquery2_t3`.`pk`) and (`table3`.`col_int_key` = `table2`.`pk`) and (`subquery2_t1`.`col_int_key` = `table2`.`pk`) and (`subquery1_t2`.`col_int_nokey` = `table3`.`col_int_nokey`) and (`subquery1_t1`.`pk` > 1))
+Note	1003	/* select#1 */ select `test`.`table2`.`col_varchar_nokey` AS `field1` from `test`.`t2` `table1` join `test`.`t1` `table2` straight_join `test`.`t2` `table3` semi join (`test`.`t1` `subquery1_t2` join `test`.`t1` `subquery1_t3` join `test`.`t2` `subquery1_t1`) semi join (`test`.`t3` `subquery2_t2` join `test`.`t1` `subquery2_t3` join `test`.`t2` `subquery2_t1`) where ((`test`.`subquery1_t3`.`col_int_key` = `test`.`subquery1_t2`.`pk`) and (`test`.`subquery1_t3`.`col_varchar_key` = `test`.`subquery1_t2`.`col_varchar_nokey`) and (`test`.`subquery2_t2`.`col_varchar_key` = `test`.`subquery2_t3`.`col_varchar_key`) and (`test`.`subquery2_t2`.`pk` = `test`.`subquery2_t3`.`pk`) and (`test`.`table3`.`col_int_key` = `test`.`table2`.`pk`) and (`test`.`subquery2_t1`.`col_int_key` = `test`.`table2`.`pk`) and (`test`.`subquery1_t2`.`col_int_nokey` = `test`.`table3`.`col_int_nokey`) and (`test`.`subquery1_t1`.`pk` > 1))
 SELECT * FROM v1;
 field1
 v
@@ -13033,7 +13065,7 @@
             -> Table scan on t4  (cost=0.85 rows=6)
     -> Filter: (t3.col_int is null)  (cost=2.14 rows=1)
         -> Nested loop left join  (cost=2.14 rows=1)
-            -> Index lookup on t1 using col_int_key (col_int_key=t4.col_int_key)  (cost=0.27 rows=1)
+            -> Covering index lookup on t1 using col_int_key (col_int_key=t4.col_int_key)  (cost=0.27 rows=1)
             -> Nested loop inner join  (cost=2.41 rows=1)
                 -> Single-row index lookup on t2 using PRIMARY (pk=t1.pk)  (cost=0.26 rows=1)
                 -> Index lookup on t3 using col_int_key (col_int_key=t2.col_int)  (cost=0.07 rows=1)
diff -Nru mysql-8.0-8.0.26/mysql-test/r/subquery_sj_firstmatch.result mysql-8.0-8.0.27/mysql-test/r/subquery_sj_firstmatch.result
--- mysql-8.0-8.0.26/mysql-test/r/subquery_sj_firstmatch.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/subquery_sj_firstmatch.result	2021-09-28 11:46:34.000000000 +0000
@@ -4259,7 +4259,7 @@
     -> Nested loop inner join  (cost=25.86 rows=1)
         -> Filter: (t1.c is not null)  (cost=0.26 rows=1)
             -> Index lookup on t1 using kp1 (kp1=t3.a)  (cost=0.26 rows=1)
-        -> Single-row index lookup on t4 using PRIMARY (pk=t1.c)  (cost=0.26 rows=1)
+        -> Single-row covering index lookup on t4 using PRIMARY (pk=t1.c)  (cost=0.26 rows=1)
 
 select * from t3 where a in 
 (select t1.kp1 from t1,t4 where kp1<20 and t4.pk=t1.c);
@@ -4878,6 +4878,11 @@
 (concat('1 - 03', repeat('x', @suffix_len)), concat('2 - 03', repeat('x', @suffix_len)));
 insert into t3_16 values
 (concat('1 - 04', repeat('x', @suffix_len)), concat('2 - 04', repeat('x', @suffix_len)));
+ANALYZE TABLE t1_16, t2_16, t3_16;
+Table	Op	Msg_type	Msg_text
+test.t1_16	analyze	status	OK
+test.t2_16	analyze	status	OK
+test.t3_16	analyze	status	OK
 explain select left(a1,7), left(a2,7)
 from t1_16
 where a1 in (select b1 from t2_16 where b1 > '0');
@@ -4968,6 +4973,11 @@
 insert into t3 values ('1 - 06', '2 - 06');
 insert into t3 values ('1 - 07', '2 - 07');
 insert into t3 values ('1 - 08', '2 - 08');
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 explain
 select * from t1
 where concat(a1,'x') IN
@@ -7066,7 +7076,7 @@
 1	SIMPLE	a	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 1	SIMPLE	t1	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `t1`.`t1field`) and (`test`.`t1`.`t1field` = `t1`.`t1field`))
+Note	1003	/* select#1 */ select `test`.`t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `test`.`t1`.`t1field`) and (`test`.`t1`.`t1field` = `test`.`t1`.`t1field`))
 SELECT t1.t1field
 FROM t1 LEFT JOIN t1 AS t2 ON t1.t1field IN (SELECT v1field FROM v1);
 t1field
@@ -7083,7 +7093,7 @@
 1	SIMPLE	a	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 1	SIMPLE	t1	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `t1`.`t1field`) and (`test`.`t1`.`t1field` = `t1`.`t1field`))
+Note	1003	/* select#1 */ select `test`.`t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `test`.`t1`.`t1field`) and (`test`.`t1`.`t1field` = `test`.`t1`.`t1field`))
 CREATE PROCEDURE p1() 
 BEGIN 
 SELECT t1field
@@ -7151,6 +7161,11 @@
 INSERT INTO works VALUES  ('E4','P2',20);
 INSERT INTO works VALUES  ('E4','P4',40);
 INSERT INTO works VALUES  ('E4','P5',80);
+ANALYZE TABLE staff, proj, works;
+Table	Op	Msg_type	Msg_text
+test.staff	analyze	status	OK
+test.proj	analyze	status	OK
+test.works	analyze	status	OK
 explain SELECT EMPNUM, EMPNAME
 FROM staff
 WHERE EMPNUM IN
@@ -7471,6 +7486,11 @@
 INSERT INTO t3 VALUES  ('E4','P4',40);
 INSERT INTO t3 VALUES  ('E4','P5',80);
 CREATE UNIQUE INDEX t1_IDX ON t1(EMPNUM);
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7515,6 +7535,9 @@
 DEALLOCATE PREPARE stmt;
 DROP INDEX t1_IDX ON t1;
 CREATE INDEX t1_IDX ON t1(EMPNUM);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7525,7 +7548,7 @@
 FROM t2
 WHERE PTYPE = 'Design'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	NULL
+1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	5	100.00	NULL
 1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; FirstMatch(t1)
 Warnings:
@@ -7541,7 +7564,7 @@
         WHERE PTYPE = 'Design'))";
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	NULL
+1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	5	100.00	NULL
 1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; FirstMatch(t1)
 Warnings:
@@ -7551,13 +7574,16 @@
 
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	NULL
+1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	5	100.00	NULL
 1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; FirstMatch(t1)
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 DEALLOCATE PREPARE stmt;
 DROP INDEX t1_IDX ON t1;
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7568,7 +7594,7 @@
 FROM t2
 WHERE PTYPE = 'Design'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	100.00	NULL
 1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; FirstMatch(t1)
 Warnings:
@@ -7584,7 +7610,7 @@
         WHERE PTYPE = 'Design'))";
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	100.00	NULL
 1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; FirstMatch(t1)
 Warnings:
@@ -7594,7 +7620,7 @@
 
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	100.00	NULL
 1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; FirstMatch(t1)
 Warnings:
@@ -8210,6 +8236,12 @@
 create table t2 as select * from t1;
 create table t3 (pk int, a int, primary key(pk));
 insert into t3 select a,a from t0;
+ANALYZE TABLE t0, t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t0	analyze	status	OK
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 explain 
 select * from t1 left join t2 on (t2.a= t1.a and t2.a in (select pk from t3));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -11034,7 +11066,7 @@
 1	SIMPLE	subquery2_t2	NULL	eq_ref	PRIMARY,col_varchar_key	PRIMARY	4	test.subquery2_t3.pk	1	7.14	Using where
 1	SIMPLE	subquery2_t1	NULL	ref	col_int_key	col_int_key	5	test.table2.pk	2	100.00	Using index; FirstMatch(subquery1_t1)
 Warnings:
-Note	1003	/* select#1 */ select `table2`.`col_varchar_nokey` AS `field1` from `test`.`t2` `table1` join `test`.`t1` `table2` straight_join `test`.`t2` `table3` semi join (`test`.`t1` `subquery1_t2` join `test`.`t1` `subquery1_t3` join `test`.`t2` `subquery1_t1`) semi join (`test`.`t3` `subquery2_t2` join `test`.`t1` `subquery2_t3` join `test`.`t2` `subquery2_t1`) where ((`subquery1_t3`.`col_int_key` = `subquery1_t2`.`pk`) and (`subquery1_t3`.`col_varchar_key` = `subquery1_t2`.`col_varchar_nokey`) and (`subquery2_t2`.`col_varchar_key` = `subquery2_t3`.`col_varchar_key`) and (`subquery2_t2`.`pk` = `subquery2_t3`.`pk`) and (`table3`.`col_int_key` = `table2`.`pk`) and (`subquery2_t1`.`col_int_key` = `table2`.`pk`) and (`subquery1_t2`.`col_int_nokey` = `table3`.`col_int_nokey`) and (`subquery1_t1`.`pk` > 1))
+Note	1003	/* select#1 */ select `test`.`table2`.`col_varchar_nokey` AS `field1` from `test`.`t2` `table1` join `test`.`t1` `table2` straight_join `test`.`t2` `table3` semi join (`test`.`t1` `subquery1_t2` join `test`.`t1` `subquery1_t3` join `test`.`t2` `subquery1_t1`) semi join (`test`.`t3` `subquery2_t2` join `test`.`t1` `subquery2_t3` join `test`.`t2` `subquery2_t1`) where ((`test`.`subquery1_t3`.`col_int_key` = `test`.`subquery1_t2`.`pk`) and (`test`.`subquery1_t3`.`col_varchar_key` = `test`.`subquery1_t2`.`col_varchar_nokey`) and (`test`.`subquery2_t2`.`col_varchar_key` = `test`.`subquery2_t3`.`col_varchar_key`) and (`test`.`subquery2_t2`.`pk` = `test`.`subquery2_t3`.`pk`) and (`test`.`table3`.`col_int_key` = `test`.`table2`.`pk`) and (`test`.`subquery2_t1`.`col_int_key` = `test`.`table2`.`pk`) and (`test`.`subquery1_t2`.`col_int_nokey` = `test`.`table3`.`col_int_nokey`) and (`test`.`subquery1_t1`.`pk` > 1))
 SELECT * FROM v1;
 field1
 v
@@ -13032,7 +13064,7 @@
             -> Table scan on t4  (cost=0.85 rows=6)
     -> Filter: (t3.col_int is null)  (cost=2.14 rows=1)
         -> Nested loop left join  (cost=2.14 rows=1)
-            -> Index lookup on t1 using col_int_key (col_int_key=t4.col_int_key)  (cost=0.27 rows=1)
+            -> Covering index lookup on t1 using col_int_key (col_int_key=t4.col_int_key)  (cost=0.27 rows=1)
             -> Nested loop inner join  (cost=2.41 rows=1)
                 -> Single-row index lookup on t2 using PRIMARY (pk=t1.pk)  (cost=0.26 rows=1)
                 -> Index lookup on t3 using col_int_key (col_int_key=t2.col_int)  (cost=0.07 rows=1)
diff -Nru mysql-8.0-8.0.26/mysql-test/r/subquery_sj_loosescan_bka_nobnl.result mysql-8.0-8.0.27/mysql-test/r/subquery_sj_loosescan_bka_nobnl.result
--- mysql-8.0-8.0.26/mysql-test/r/subquery_sj_loosescan_bka_nobnl.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/subquery_sj_loosescan_bka_nobnl.result	2021-09-28 11:46:34.000000000 +0000
@@ -4260,7 +4260,7 @@
     -> Nested loop semijoin with duplicate removal on kp1  (cost=32.26 rows=40)
         -> Filter: ((t1.kp1 < 20) and (t1.c is not null))  (cost=18.26 rows=40)
             -> Index range scan on t1 using kp1  (cost=18.26 rows=40)
-        -> Single-row index lookup on t4 using PRIMARY (pk=t1.c)  (cost=0.25 rows=1)
+        -> Single-row covering index lookup on t4 using PRIMARY (pk=t1.c)  (cost=0.25 rows=1)
     -> Filter: (t3.a = t1.kp1)  (cost=11.00 rows=10)
         -> Table scan on t3  (cost=11.00 rows=100)
 
@@ -4892,6 +4892,11 @@
 (concat('1 - 03', repeat('x', @suffix_len)), concat('2 - 03', repeat('x', @suffix_len)));
 insert into t3_16 values
 (concat('1 - 04', repeat('x', @suffix_len)), concat('2 - 04', repeat('x', @suffix_len)));
+ANALYZE TABLE t1_16, t2_16, t3_16;
+Table	Op	Msg_type	Msg_text
+test.t1_16	analyze	status	OK
+test.t2_16	analyze	status	OK
+test.t3_16	analyze	status	OK
 explain select left(a1,7), left(a2,7)
 from t1_16
 where a1 in (select b1 from t2_16 where b1 > '0');
@@ -4982,6 +4987,11 @@
 insert into t3 values ('1 - 06', '2 - 06');
 insert into t3 values ('1 - 07', '2 - 07');
 insert into t3 values ('1 - 08', '2 - 08');
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 explain
 select * from t1
 where concat(a1,'x') IN
@@ -7081,7 +7091,7 @@
 1	SIMPLE	a	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 1	SIMPLE	t1	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `t1`.`t1field`) and (`test`.`t1`.`t1field` = `t1`.`t1field`))
+Note	1003	/* select#1 */ select `test`.`t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `test`.`t1`.`t1field`) and (`test`.`t1`.`t1field` = `test`.`t1`.`t1field`))
 SELECT t1.t1field
 FROM t1 LEFT JOIN t1 AS t2 ON t1.t1field IN (SELECT v1field FROM v1);
 t1field
@@ -7098,7 +7108,7 @@
 1	SIMPLE	a	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 1	SIMPLE	t1	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `t1`.`t1field`) and (`test`.`t1`.`t1field` = `t1`.`t1field`))
+Note	1003	/* select#1 */ select `test`.`t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `test`.`t1`.`t1field`) and (`test`.`t1`.`t1field` = `test`.`t1`.`t1field`))
 CREATE PROCEDURE p1() 
 BEGIN 
 SELECT t1field
@@ -7166,6 +7176,11 @@
 INSERT INTO works VALUES  ('E4','P2',20);
 INSERT INTO works VALUES  ('E4','P4',40);
 INSERT INTO works VALUES  ('E4','P5',80);
+ANALYZE TABLE staff, proj, works;
+Table	Op	Msg_type	Msg_text
+test.staff	analyze	status	OK
+test.proj	analyze	status	OK
+test.works	analyze	status	OK
 explain SELECT EMPNUM, EMPNAME
 FROM staff
 WHERE EMPNUM IN
@@ -7486,6 +7501,11 @@
 INSERT INTO t3 VALUES  ('E4','P4',40);
 INSERT INTO t3 VALUES  ('E4','P5',80);
 CREATE UNIQUE INDEX t1_IDX ON t1(EMPNUM);
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7530,6 +7550,9 @@
 DEALLOCATE PREPARE stmt;
 DROP INDEX t1_IDX ON t1;
 CREATE INDEX t1_IDX ON t1(EMPNUM);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7540,11 +7563,11 @@
 FROM t2
 WHERE PTYPE = 'Design'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	NULL
 1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; End temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
+1	SIMPLE	t1	NULL	ref	t1_IDX	t1_IDX	3	test.t3.EMPNUM	1	100.00	End temporary
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 PREPARE stmt FROM "EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7556,23 +7579,26 @@
         WHERE PTYPE = 'Design'))";
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	NULL
 1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; End temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
+1	SIMPLE	t1	NULL	ref	t1_IDX	t1_IDX	3	test.t3.EMPNUM	1	100.00	End temporary
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 
 This line is only in place to help --skip_if_hypergraph diffing some more.
 
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	NULL
 1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; End temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
+1	SIMPLE	t1	NULL	ref	t1_IDX	t1_IDX	3	test.t3.EMPNUM	1	100.00	End temporary
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 DEALLOCATE PREPARE stmt;
 DROP INDEX t1_IDX ON t1;
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7583,11 +7609,11 @@
 FROM t2
 WHERE PTYPE = 'Design'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
 1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; End temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	20.00	Using where; End temporary
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 PREPARE stmt FROM "EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7599,21 +7625,21 @@
         WHERE PTYPE = 'Design'))";
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
 1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; End temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	20.00	Using where; End temporary
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 
 This line is only in place to help --skip_if_hypergraph diffing some more.
 
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
 1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; End temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	20.00	Using where; End temporary
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 DEALLOCATE PREPARE stmt;
 DROP TABLE t1, t2, t3;
 #
@@ -8231,6 +8257,12 @@
 create table t2 as select * from t1;
 create table t3 (pk int, a int, primary key(pk));
 insert into t3 select a,a from t0;
+ANALYZE TABLE t0, t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t0	analyze	status	OK
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 explain 
 select * from t1 left join t2 on (t2.a= t1.a and t2.a in (select pk from t3));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -11062,7 +11094,7 @@
 1	SIMPLE	subquery1_t1	NULL	index	PRIMARY	col_int_key	5	NULL	20	100.00	Using where; Using index; End temporary
 1	SIMPLE	table1	NULL	index	NULL	col_int_key	5	NULL	20	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `table2`.`col_varchar_nokey` AS `field1` from `test`.`t2` `table1` join `test`.`t1` `table2` straight_join `test`.`t2` `table3` semi join (`test`.`t1` `subquery1_t2` join `test`.`t1` `subquery1_t3` join `test`.`t2` `subquery1_t1`) semi join (`test`.`t3` `subquery2_t2` join `test`.`t1` `subquery2_t3` join `test`.`t2` `subquery2_t1`) where ((`subquery1_t2`.`pk` = `subquery1_t3`.`col_int_key`) and (`subquery1_t2`.`col_varchar_nokey` = `subquery1_t3`.`col_varchar_key`) and (`subquery2_t2`.`col_varchar_key` = `subquery2_t3`.`col_varchar_key`) and (`subquery2_t2`.`pk` = `subquery2_t3`.`pk`) and (`table2`.`pk` = `subquery2_t1`.`col_int_key`) and (`table3`.`col_int_key` = `subquery2_t1`.`col_int_key`) and (`table3`.`col_int_nokey` = `subquery1_t2`.`col_int_nokey`) and (`subquery1_t1`.`pk` > 1))
+Note	1003	/* select#1 */ select `test`.`table2`.`col_varchar_nokey` AS `field1` from `test`.`t2` `table1` join `test`.`t1` `table2` straight_join `test`.`t2` `table3` semi join (`test`.`t1` `subquery1_t2` join `test`.`t1` `subquery1_t3` join `test`.`t2` `subquery1_t1`) semi join (`test`.`t3` `subquery2_t2` join `test`.`t1` `subquery2_t3` join `test`.`t2` `subquery2_t1`) where ((`test`.`subquery1_t2`.`pk` = `test`.`subquery1_t3`.`col_int_key`) and (`test`.`subquery1_t2`.`col_varchar_nokey` = `test`.`subquery1_t3`.`col_varchar_key`) and (`test`.`subquery2_t2`.`col_varchar_key` = `test`.`subquery2_t3`.`col_varchar_key`) and (`test`.`subquery2_t2`.`pk` = `test`.`subquery2_t3`.`pk`) and (`test`.`table2`.`pk` = `test`.`subquery2_t1`.`col_int_key`) and (`test`.`table3`.`col_int_key` = `test`.`subquery2_t1`.`col_int_key`) and (`test`.`table3`.`col_int_nokey` = `test`.`subquery1_t2`.`col_int_nokey`) and (`test`.`subquery1_t1`.`pk` > 1))
 SELECT * FROM v1;
 field1
 v
diff -Nru mysql-8.0-8.0.26/mysql-test/r/subquery_sj_loosescan_bka.result mysql-8.0-8.0.27/mysql-test/r/subquery_sj_loosescan_bka.result
--- mysql-8.0-8.0.26/mysql-test/r/subquery_sj_loosescan_bka.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/subquery_sj_loosescan_bka.result	2021-09-28 11:46:34.000000000 +0000
@@ -4263,7 +4263,7 @@
         -> Nested loop semijoin with duplicate removal on kp1  (cost=32.26 rows=40)
             -> Filter: ((t1.kp1 < 20) and (t1.c is not null))  (cost=18.26 rows=40)
                 -> Index range scan on t1 using kp1  (cost=18.26 rows=40)
-            -> Single-row index lookup on t4 using PRIMARY (pk=t1.c)  (cost=0.25 rows=1)
+            -> Single-row covering index lookup on t4 using PRIMARY (pk=t1.c)  (cost=0.25 rows=1)
 
 select * from t3 where a in 
 (select t1.kp1 from t1,t4 where kp1<20 and t4.pk=t1.c);
@@ -4890,6 +4890,11 @@
 (concat('1 - 03', repeat('x', @suffix_len)), concat('2 - 03', repeat('x', @suffix_len)));
 insert into t3_16 values
 (concat('1 - 04', repeat('x', @suffix_len)), concat('2 - 04', repeat('x', @suffix_len)));
+ANALYZE TABLE t1_16, t2_16, t3_16;
+Table	Op	Msg_type	Msg_text
+test.t1_16	analyze	status	OK
+test.t2_16	analyze	status	OK
+test.t3_16	analyze	status	OK
 explain select left(a1,7), left(a2,7)
 from t1_16
 where a1 in (select b1 from t2_16 where b1 > '0');
@@ -4980,6 +4985,11 @@
 insert into t3 values ('1 - 06', '2 - 06');
 insert into t3 values ('1 - 07', '2 - 07');
 insert into t3 values ('1 - 08', '2 - 08');
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 explain
 select * from t1
 where concat(a1,'x') IN
@@ -7079,7 +7089,7 @@
 1	SIMPLE	a	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 1	SIMPLE	t1	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `t1`.`t1field`) and (`test`.`t1`.`t1field` = `t1`.`t1field`))
+Note	1003	/* select#1 */ select `test`.`t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `test`.`t1`.`t1field`) and (`test`.`t1`.`t1field` = `test`.`t1`.`t1field`))
 SELECT t1.t1field
 FROM t1 LEFT JOIN t1 AS t2 ON t1.t1field IN (SELECT v1field FROM v1);
 t1field
@@ -7096,7 +7106,7 @@
 1	SIMPLE	a	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 1	SIMPLE	t1	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `t1`.`t1field`) and (`test`.`t1`.`t1field` = `t1`.`t1field`))
+Note	1003	/* select#1 */ select `test`.`t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `test`.`t1`.`t1field`) and (`test`.`t1`.`t1field` = `test`.`t1`.`t1field`))
 CREATE PROCEDURE p1() 
 BEGIN 
 SELECT t1field
@@ -7164,6 +7174,11 @@
 INSERT INTO works VALUES  ('E4','P2',20);
 INSERT INTO works VALUES  ('E4','P4',40);
 INSERT INTO works VALUES  ('E4','P5',80);
+ANALYZE TABLE staff, proj, works;
+Table	Op	Msg_type	Msg_text
+test.staff	analyze	status	OK
+test.proj	analyze	status	OK
+test.works	analyze	status	OK
 explain SELECT EMPNUM, EMPNAME
 FROM staff
 WHERE EMPNUM IN
@@ -7484,6 +7499,11 @@
 INSERT INTO t3 VALUES  ('E4','P4',40);
 INSERT INTO t3 VALUES  ('E4','P5',80);
 CREATE UNIQUE INDEX t1_IDX ON t1(EMPNUM);
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7528,6 +7548,9 @@
 DEALLOCATE PREPARE stmt;
 DROP INDEX t1_IDX ON t1;
 CREATE INDEX t1_IDX ON t1(EMPNUM);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7538,11 +7561,11 @@
 FROM t2
 WHERE PTYPE = 'Design'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	Start temporary
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Using join buffer (hash join)
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; End temporary; Using join buffer (hash join)
+1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
+1	SIMPLE	t1	NULL	ref	t1_IDX	t1_IDX	3	test.t3.EMPNUM	1	100.00	End temporary
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 PREPARE stmt FROM "EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7554,23 +7577,26 @@
         WHERE PTYPE = 'Design'))";
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	Start temporary
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Using join buffer (hash join)
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; End temporary; Using join buffer (hash join)
+1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
+1	SIMPLE	t1	NULL	ref	t1_IDX	t1_IDX	3	test.t3.EMPNUM	1	100.00	End temporary
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 
 This line is only in place to help --skip_if_hypergraph diffing some more.
 
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	Start temporary
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Using join buffer (hash join)
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; End temporary; Using join buffer (hash join)
+1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
+1	SIMPLE	t1	NULL	ref	t1_IDX	t1_IDX	3	test.t3.EMPNUM	1	100.00	End temporary
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 DEALLOCATE PREPARE stmt;
 DROP INDEX t1_IDX ON t1;
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7581,11 +7607,11 @@
 FROM t2
 WHERE PTYPE = 'Design'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Start temporary
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Using join buffer (hash join)
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; End temporary; Using join buffer (hash join)
+1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	20.00	Using where; End temporary; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 PREPARE stmt FROM "EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7597,21 +7623,21 @@
         WHERE PTYPE = 'Design'))";
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Start temporary
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Using join buffer (hash join)
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; End temporary; Using join buffer (hash join)
+1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	20.00	Using where; End temporary; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 
 This line is only in place to help --skip_if_hypergraph diffing some more.
 
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Start temporary
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Using join buffer (hash join)
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; End temporary; Using join buffer (hash join)
+1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	20.00	Using where; End temporary; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 DEALLOCATE PREPARE stmt;
 DROP TABLE t1, t2, t3;
 #
@@ -8229,6 +8255,12 @@
 create table t2 as select * from t1;
 create table t3 (pk int, a int, primary key(pk));
 insert into t3 select a,a from t0;
+ANALYZE TABLE t0, t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t0	analyze	status	OK
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 explain 
 select * from t1 left join t2 on (t2.a= t1.a and t2.a in (select pk from t3));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -11060,7 +11092,7 @@
 1	SIMPLE	subquery1_t1	NULL	index	PRIMARY	col_int_key	5	NULL	20	100.00	Using where; Using index; End temporary; Using join buffer (hash join)
 1	SIMPLE	table1	NULL	index	NULL	col_int_key	5	NULL	20	100.00	Using index; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `table2`.`col_varchar_nokey` AS `field1` from `test`.`t2` `table1` join `test`.`t1` `table2` straight_join `test`.`t2` `table3` semi join (`test`.`t1` `subquery1_t2` join `test`.`t1` `subquery1_t3` join `test`.`t2` `subquery1_t1`) semi join (`test`.`t3` `subquery2_t2` join `test`.`t1` `subquery2_t3` join `test`.`t2` `subquery2_t1`) where ((`subquery1_t2`.`pk` = `subquery1_t3`.`col_int_key`) and (`subquery1_t2`.`col_varchar_nokey` = `subquery1_t3`.`col_varchar_key`) and (`subquery2_t2`.`col_varchar_key` = `subquery2_t3`.`col_varchar_key`) and (`subquery2_t2`.`pk` = `subquery2_t3`.`pk`) and (`table2`.`pk` = `subquery2_t1`.`col_int_key`) and (`table3`.`col_int_key` = `subquery2_t1`.`col_int_key`) and (`table3`.`col_int_nokey` = `subquery1_t2`.`col_int_nokey`) and (`subquery1_t1`.`pk` > 1))
+Note	1003	/* select#1 */ select `test`.`table2`.`col_varchar_nokey` AS `field1` from `test`.`t2` `table1` join `test`.`t1` `table2` straight_join `test`.`t2` `table3` semi join (`test`.`t1` `subquery1_t2` join `test`.`t1` `subquery1_t3` join `test`.`t2` `subquery1_t1`) semi join (`test`.`t3` `subquery2_t2` join `test`.`t1` `subquery2_t3` join `test`.`t2` `subquery2_t1`) where ((`test`.`subquery1_t2`.`pk` = `test`.`subquery1_t3`.`col_int_key`) and (`test`.`subquery1_t2`.`col_varchar_nokey` = `test`.`subquery1_t3`.`col_varchar_key`) and (`test`.`subquery2_t2`.`col_varchar_key` = `test`.`subquery2_t3`.`col_varchar_key`) and (`test`.`subquery2_t2`.`pk` = `test`.`subquery2_t3`.`pk`) and (`test`.`table2`.`pk` = `test`.`subquery2_t1`.`col_int_key`) and (`test`.`table3`.`col_int_key` = `test`.`subquery2_t1`.`col_int_key`) and (`test`.`table3`.`col_int_nokey` = `test`.`subquery1_t2`.`col_int_nokey`) and (`test`.`subquery1_t1`.`pk` > 1))
 SELECT * FROM v1;
 field1
 v
diff -Nru mysql-8.0-8.0.26/mysql-test/r/subquery_sj_loosescan.result mysql-8.0-8.0.27/mysql-test/r/subquery_sj_loosescan.result
--- mysql-8.0-8.0.26/mysql-test/r/subquery_sj_loosescan.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/subquery_sj_loosescan.result	2021-09-28 11:46:34.000000000 +0000
@@ -4262,7 +4262,7 @@
         -> Nested loop semijoin with duplicate removal on kp1  (cost=32.26 rows=40)
             -> Filter: ((t1.kp1 < 20) and (t1.c is not null))  (cost=18.26 rows=40)
                 -> Index range scan on t1 using kp1  (cost=18.26 rows=40)
-            -> Single-row index lookup on t4 using PRIMARY (pk=t1.c)  (cost=0.25 rows=1)
+            -> Single-row covering index lookup on t4 using PRIMARY (pk=t1.c)  (cost=0.25 rows=1)
 
 select * from t3 where a in 
 (select t1.kp1 from t1,t4 where kp1<20 and t4.pk=t1.c);
@@ -4889,6 +4889,11 @@
 (concat('1 - 03', repeat('x', @suffix_len)), concat('2 - 03', repeat('x', @suffix_len)));
 insert into t3_16 values
 (concat('1 - 04', repeat('x', @suffix_len)), concat('2 - 04', repeat('x', @suffix_len)));
+ANALYZE TABLE t1_16, t2_16, t3_16;
+Table	Op	Msg_type	Msg_text
+test.t1_16	analyze	status	OK
+test.t2_16	analyze	status	OK
+test.t3_16	analyze	status	OK
 explain select left(a1,7), left(a2,7)
 from t1_16
 where a1 in (select b1 from t2_16 where b1 > '0');
@@ -4979,6 +4984,11 @@
 insert into t3 values ('1 - 06', '2 - 06');
 insert into t3 values ('1 - 07', '2 - 07');
 insert into t3 values ('1 - 08', '2 - 08');
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 explain
 select * from t1
 where concat(a1,'x') IN
@@ -7078,7 +7088,7 @@
 1	SIMPLE	a	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 1	SIMPLE	t1	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `t1`.`t1field`) and (`test`.`t1`.`t1field` = `t1`.`t1field`))
+Note	1003	/* select#1 */ select `test`.`t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `test`.`t1`.`t1field`) and (`test`.`t1`.`t1field` = `test`.`t1`.`t1field`))
 SELECT t1.t1field
 FROM t1 LEFT JOIN t1 AS t2 ON t1.t1field IN (SELECT v1field FROM v1);
 t1field
@@ -7095,7 +7105,7 @@
 1	SIMPLE	a	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 1	SIMPLE	t1	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `t1`.`t1field`) and (`test`.`t1`.`t1field` = `t1`.`t1field`))
+Note	1003	/* select#1 */ select `test`.`t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `test`.`t1`.`t1field`) and (`test`.`t1`.`t1field` = `test`.`t1`.`t1field`))
 CREATE PROCEDURE p1() 
 BEGIN 
 SELECT t1field
@@ -7163,6 +7173,11 @@
 INSERT INTO works VALUES  ('E4','P2',20);
 INSERT INTO works VALUES  ('E4','P4',40);
 INSERT INTO works VALUES  ('E4','P5',80);
+ANALYZE TABLE staff, proj, works;
+Table	Op	Msg_type	Msg_text
+test.staff	analyze	status	OK
+test.proj	analyze	status	OK
+test.works	analyze	status	OK
 explain SELECT EMPNUM, EMPNAME
 FROM staff
 WHERE EMPNUM IN
@@ -7483,6 +7498,11 @@
 INSERT INTO t3 VALUES  ('E4','P4',40);
 INSERT INTO t3 VALUES  ('E4','P5',80);
 CREATE UNIQUE INDEX t1_IDX ON t1(EMPNUM);
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7527,6 +7547,9 @@
 DEALLOCATE PREPARE stmt;
 DROP INDEX t1_IDX ON t1;
 CREATE INDEX t1_IDX ON t1(EMPNUM);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7537,11 +7560,11 @@
 FROM t2
 WHERE PTYPE = 'Design'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	Start temporary
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Using join buffer (hash join)
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; End temporary; Using join buffer (hash join)
+1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
+1	SIMPLE	t1	NULL	ref	t1_IDX	t1_IDX	3	test.t3.EMPNUM	1	100.00	End temporary
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 PREPARE stmt FROM "EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7553,23 +7576,26 @@
         WHERE PTYPE = 'Design'))";
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	Start temporary
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Using join buffer (hash join)
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; End temporary; Using join buffer (hash join)
+1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
+1	SIMPLE	t1	NULL	ref	t1_IDX	t1_IDX	3	test.t3.EMPNUM	1	100.00	End temporary
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 
 This line is only in place to help --skip_if_hypergraph diffing some more.
 
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	Start temporary
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Using join buffer (hash join)
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; End temporary; Using join buffer (hash join)
+1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
+1	SIMPLE	t1	NULL	ref	t1_IDX	t1_IDX	3	test.t3.EMPNUM	1	100.00	End temporary
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 DEALLOCATE PREPARE stmt;
 DROP INDEX t1_IDX ON t1;
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7580,11 +7606,11 @@
 FROM t2
 WHERE PTYPE = 'Design'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Start temporary
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Using join buffer (hash join)
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; End temporary; Using join buffer (hash join)
+1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	20.00	Using where; End temporary; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 PREPARE stmt FROM "EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7596,21 +7622,21 @@
         WHERE PTYPE = 'Design'))";
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Start temporary
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Using join buffer (hash join)
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; End temporary; Using join buffer (hash join)
+1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	20.00	Using where; End temporary; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 
 This line is only in place to help --skip_if_hypergraph diffing some more.
 
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Start temporary
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Using join buffer (hash join)
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	8.33	Using where; End temporary; Using join buffer (hash join)
+1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where; Start temporary
+1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	20.00	Using where; End temporary; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t3`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `test`.`t3`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 DEALLOCATE PREPARE stmt;
 DROP TABLE t1, t2, t3;
 #
@@ -8228,6 +8254,12 @@
 create table t2 as select * from t1;
 create table t3 (pk int, a int, primary key(pk));
 insert into t3 select a,a from t0;
+ANALYZE TABLE t0, t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t0	analyze	status	OK
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 explain 
 select * from t1 left join t2 on (t2.a= t1.a and t2.a in (select pk from t3));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -11059,7 +11091,7 @@
 1	SIMPLE	subquery1_t1	NULL	index	PRIMARY	col_int_key	5	NULL	20	100.00	Using where; Using index; End temporary; Using join buffer (hash join)
 1	SIMPLE	table1	NULL	index	NULL	col_int_key	5	NULL	20	100.00	Using index; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `table2`.`col_varchar_nokey` AS `field1` from `test`.`t2` `table1` join `test`.`t1` `table2` straight_join `test`.`t2` `table3` semi join (`test`.`t1` `subquery1_t2` join `test`.`t1` `subquery1_t3` join `test`.`t2` `subquery1_t1`) semi join (`test`.`t3` `subquery2_t2` join `test`.`t1` `subquery2_t3` join `test`.`t2` `subquery2_t1`) where ((`subquery1_t2`.`pk` = `subquery1_t3`.`col_int_key`) and (`subquery1_t2`.`col_varchar_nokey` = `subquery1_t3`.`col_varchar_key`) and (`subquery2_t2`.`col_varchar_key` = `subquery2_t3`.`col_varchar_key`) and (`subquery2_t2`.`pk` = `subquery2_t3`.`pk`) and (`table2`.`pk` = `subquery2_t1`.`col_int_key`) and (`table3`.`col_int_key` = `subquery2_t1`.`col_int_key`) and (`table3`.`col_int_nokey` = `subquery1_t2`.`col_int_nokey`) and (`subquery1_t1`.`pk` > 1))
+Note	1003	/* select#1 */ select `test`.`table2`.`col_varchar_nokey` AS `field1` from `test`.`t2` `table1` join `test`.`t1` `table2` straight_join `test`.`t2` `table3` semi join (`test`.`t1` `subquery1_t2` join `test`.`t1` `subquery1_t3` join `test`.`t2` `subquery1_t1`) semi join (`test`.`t3` `subquery2_t2` join `test`.`t1` `subquery2_t3` join `test`.`t2` `subquery2_t1`) where ((`test`.`subquery1_t2`.`pk` = `test`.`subquery1_t3`.`col_int_key`) and (`test`.`subquery1_t2`.`col_varchar_nokey` = `test`.`subquery1_t3`.`col_varchar_key`) and (`test`.`subquery2_t2`.`col_varchar_key` = `test`.`subquery2_t3`.`col_varchar_key`) and (`test`.`subquery2_t2`.`pk` = `test`.`subquery2_t3`.`pk`) and (`test`.`table2`.`pk` = `test`.`subquery2_t1`.`col_int_key`) and (`test`.`table3`.`col_int_key` = `test`.`subquery2_t1`.`col_int_key`) and (`test`.`table3`.`col_int_nokey` = `test`.`subquery1_t2`.`col_int_nokey`) and (`test`.`subquery1_t1`.`pk` > 1))
 SELECT * FROM v1;
 field1
 v
diff -Nru mysql-8.0-8.0.26/mysql-test/r/subquery_sj_mat_bka_nobnl.result mysql-8.0-8.0.27/mysql-test/r/subquery_sj_mat_bka_nobnl.result
--- mysql-8.0-8.0.26/mysql-test/r/subquery_sj_mat_bka_nobnl.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/subquery_sj_mat_bka_nobnl.result	2021-09-28 11:46:34.000000000 +0000
@@ -4511,7 +4511,7 @@
                 -> Nested loop inner join  (cost=32.26 rows=40)
                     -> Filter: ((t1.kp1 < 20) and (t1.c is not null))  (cost=18.26 rows=40)
                         -> Index range scan on t1 using kp1  (cost=18.26 rows=40)
-                    -> Single-row index lookup on t4 using PRIMARY (pk=t1.c)  (cost=0.25 rows=1)
+                    -> Single-row covering index lookup on t4 using PRIMARY (pk=t1.c)  (cost=0.25 rows=1)
 
 select * from t3 where a in 
 (select t1.kp1 from t1,t4 where kp1<20 and t4.pk=t1.c);
@@ -5161,6 +5161,11 @@
 (concat('1 - 03', repeat('x', @suffix_len)), concat('2 - 03', repeat('x', @suffix_len)));
 insert into t3_16 values
 (concat('1 - 04', repeat('x', @suffix_len)), concat('2 - 04', repeat('x', @suffix_len)));
+ANALYZE TABLE t1_16, t2_16, t3_16;
+Table	Op	Msg_type	Msg_text
+test.t1_16	analyze	status	OK
+test.t2_16	analyze	status	OK
+test.t3_16	analyze	status	OK
 explain select left(a1,7), left(a2,7)
 from t1_16
 where a1 in (select b1 from t2_16 where b1 > '0');
@@ -5254,6 +5259,11 @@
 insert into t3 values ('1 - 06', '2 - 06');
 insert into t3 values ('1 - 07', '2 - 07');
 insert into t3 values ('1 - 08', '2 - 08');
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 explain
 select * from t1
 where concat(a1,'x') IN
@@ -7349,7 +7359,7 @@
 1	SIMPLE	a	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 1	SIMPLE	t1	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `t1`.`t1field`) and (`test`.`t1`.`t1field` = `t1`.`t1field`))
+Note	1003	/* select#1 */ select `test`.`t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `test`.`t1`.`t1field`) and (`test`.`t1`.`t1field` = `test`.`t1`.`t1field`))
 SELECT t1.t1field
 FROM t1 LEFT JOIN t1 AS t2 ON t1.t1field IN (SELECT v1field FROM v1);
 t1field
@@ -7366,7 +7376,7 @@
 1	SIMPLE	a	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 1	SIMPLE	t1	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `t1`.`t1field`) and (`test`.`t1`.`t1field` = `t1`.`t1field`))
+Note	1003	/* select#1 */ select `test`.`t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `test`.`t1`.`t1field`) and (`test`.`t1`.`t1field` = `test`.`t1`.`t1field`))
 CREATE PROCEDURE p1() 
 BEGIN 
 SELECT t1field
@@ -7434,6 +7444,11 @@
 INSERT INTO works VALUES  ('E4','P2',20);
 INSERT INTO works VALUES  ('E4','P4',40);
 INSERT INTO works VALUES  ('E4','P5',80);
+ANALYZE TABLE staff, proj, works;
+Table	Op	Msg_type	Msg_text
+test.staff	analyze	status	OK
+test.proj	analyze	status	OK
+test.works	analyze	status	OK
 explain SELECT EMPNUM, EMPNAME
 FROM staff
 WHERE EMPNUM IN
@@ -7760,6 +7775,11 @@
 INSERT INTO t3 VALUES  ('E4','P4',40);
 INSERT INTO t3 VALUES  ('E4','P5',80);
 CREATE UNIQUE INDEX t1_IDX ON t1(EMPNUM);
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7807,6 +7827,9 @@
 DEALLOCATE PREPARE stmt;
 DROP INDEX t1_IDX ON t1;
 CREATE INDEX t1_IDX ON t1(EMPNUM);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7817,12 +7840,12 @@
 FROM t2
 WHERE PTYPE = 'Design'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	NULL
-1	SIMPLE	<subquery2>	NULL	eq_ref	<auto_distinct_key>	<auto_distinct_key>	3	test.t1.EMPNUM	1	100.00	NULL
+1	SIMPLE	<subquery2>	NULL	ALL	NULL	NULL	NULL	NULL	NULL	100.00	NULL
+1	SIMPLE	t1	NULL	ref	t1_IDX	t1_IDX	3	<subquery2>.EMPNUM	1	100.00	NULL
 2	MATERIALIZED	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 2	MATERIALIZED	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`<subquery2>`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `<subquery2>`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 PREPARE stmt FROM "EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7834,25 +7857,28 @@
         WHERE PTYPE = 'Design'))";
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	NULL
-1	SIMPLE	<subquery2>	NULL	eq_ref	<auto_distinct_key>	<auto_distinct_key>	3	test.t1.EMPNUM	1	100.00	NULL
+1	SIMPLE	<subquery2>	NULL	ALL	NULL	NULL	NULL	NULL	NULL	100.00	NULL
+1	SIMPLE	t1	NULL	ref	t1_IDX	t1_IDX	3	<subquery2>.EMPNUM	1	100.00	NULL
 2	MATERIALIZED	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 2	MATERIALIZED	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`<subquery2>`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `<subquery2>`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 
 This line is only in place to help --skip_if_hypergraph diffing some more.
 
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	NULL
-1	SIMPLE	<subquery2>	NULL	eq_ref	<auto_distinct_key>	<auto_distinct_key>	3	test.t1.EMPNUM	1	100.00	NULL
+1	SIMPLE	<subquery2>	NULL	ALL	NULL	NULL	NULL	NULL	NULL	100.00	NULL
+1	SIMPLE	t1	NULL	ref	t1_IDX	t1_IDX	3	<subquery2>.EMPNUM	1	100.00	NULL
 2	MATERIALIZED	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 2	MATERIALIZED	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`<subquery2>`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `<subquery2>`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 DEALLOCATE PREPARE stmt;
 DROP INDEX t1_IDX ON t1;
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7863,12 +7889,12 @@
 FROM t2
 WHERE PTYPE = 'Design'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
-1	SIMPLE	<subquery2>	NULL	eq_ref	<auto_distinct_key>	<auto_distinct_key>	3	test.t1.EMPNUM	1	100.00	NULL
+1	SIMPLE	<subquery2>	NULL	ALL	NULL	NULL	NULL	NULL	NULL	100.00	NULL
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	20.00	Using where
 2	MATERIALIZED	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 2	MATERIALIZED	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`<subquery2>`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `<subquery2>`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 PREPARE stmt FROM "EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7880,23 +7906,23 @@
         WHERE PTYPE = 'Design'))";
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
-1	SIMPLE	<subquery2>	NULL	eq_ref	<auto_distinct_key>	<auto_distinct_key>	3	test.t1.EMPNUM	1	100.00	NULL
+1	SIMPLE	<subquery2>	NULL	ALL	NULL	NULL	NULL	NULL	NULL	100.00	NULL
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	20.00	Using where
 2	MATERIALIZED	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 2	MATERIALIZED	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`<subquery2>`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `<subquery2>`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 
 This line is only in place to help --skip_if_hypergraph diffing some more.
 
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
-1	SIMPLE	<subquery2>	NULL	eq_ref	<auto_distinct_key>	<auto_distinct_key>	3	test.t1.EMPNUM	1	100.00	NULL
+1	SIMPLE	<subquery2>	NULL	ALL	NULL	NULL	NULL	NULL	NULL	100.00	NULL
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	20.00	Using where
 2	MATERIALIZED	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 2	MATERIALIZED	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`<subquery2>`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `<subquery2>`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 DEALLOCATE PREPARE stmt;
 DROP TABLE t1, t2, t3;
 #
@@ -8530,6 +8556,12 @@
 create table t2 as select * from t1;
 create table t3 (pk int, a int, primary key(pk));
 insert into t3 select a,a from t0;
+ANALYZE TABLE t0, t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t0	analyze	status	OK
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 explain 
 select * from t1 left join t2 on (t2.a= t1.a and t2.a in (select pk from t3));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -11407,7 +11439,7 @@
 3	MATERIALIZED	subquery2_t2	NULL	eq_ref	PRIMARY,col_varchar_key	PRIMARY	4	test.subquery2_t3.pk	1	7.14	Using where
 3	MATERIALIZED	subquery2_t1	NULL	index	col_int_key	col_int_key	5	NULL	20	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `table2`.`col_varchar_nokey` AS `field1` from `test`.`t2` `table1` join `test`.`t1` `table2` straight_join `test`.`t2` `table3` semi join (`test`.`t1` `subquery1_t2` join `test`.`t1` `subquery1_t3` join `test`.`t2` `subquery1_t1`) semi join (`test`.`t3` `subquery2_t2` join `test`.`t1` `subquery2_t3` join `test`.`t2` `subquery2_t1`) where ((`subquery1_t2`.`pk` = `subquery1_t3`.`col_int_key`) and (`subquery1_t2`.`col_varchar_nokey` = `subquery1_t3`.`col_varchar_key`) and (`subquery2_t2`.`col_varchar_key` = `subquery2_t3`.`col_varchar_key`) and (`subquery2_t2`.`pk` = `subquery2_t3`.`pk`) and (`table3`.`col_int_key` = `table2`.`pk`) and (`<subquery3>`.`subquery2_field1` = `table2`.`pk`) and (`<subquery4>`.`subquery1_field1` = `table3`.`col_int_nokey`) and (`subquery1_t1`.`pk` > 1))
+Note	1003	/* select#1 */ select `test`.`table2`.`col_varchar_nokey` AS `field1` from `test`.`t2` `table1` join `test`.`t1` `table2` straight_join `test`.`t2` `table3` semi join (`test`.`t1` `subquery1_t2` join `test`.`t1` `subquery1_t3` join `test`.`t2` `subquery1_t1`) semi join (`test`.`t3` `subquery2_t2` join `test`.`t1` `subquery2_t3` join `test`.`t2` `subquery2_t1`) where ((`test`.`subquery1_t2`.`pk` = `test`.`subquery1_t3`.`col_int_key`) and (`test`.`subquery1_t2`.`col_varchar_nokey` = `test`.`subquery1_t3`.`col_varchar_key`) and (`test`.`subquery2_t2`.`col_varchar_key` = `test`.`subquery2_t3`.`col_varchar_key`) and (`test`.`subquery2_t2`.`pk` = `test`.`subquery2_t3`.`pk`) and (`test`.`table3`.`col_int_key` = `test`.`table2`.`pk`) and (`<subquery3>`.`subquery2_field1` = `test`.`table2`.`pk`) and (`<subquery4>`.`subquery1_field1` = `test`.`table3`.`col_int_nokey`) and (`test`.`subquery1_t1`.`pk` > 1))
 SELECT * FROM v1;
 field1
 v
diff -Nru mysql-8.0-8.0.26/mysql-test/r/subquery_sj_mat_bka.result mysql-8.0-8.0.27/mysql-test/r/subquery_sj_mat_bka.result
--- mysql-8.0-8.0.26/mysql-test/r/subquery_sj_mat_bka.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/subquery_sj_mat_bka.result	2021-09-28 11:46:34.000000000 +0000
@@ -4511,7 +4511,7 @@
                 -> Nested loop inner join  (cost=32.26 rows=40)
                     -> Filter: ((t1.kp1 < 20) and (t1.c is not null))  (cost=18.26 rows=40)
                         -> Index range scan on t1 using kp1  (cost=18.26 rows=40)
-                    -> Single-row index lookup on t4 using PRIMARY (pk=t1.c)  (cost=0.25 rows=1)
+                    -> Single-row covering index lookup on t4 using PRIMARY (pk=t1.c)  (cost=0.25 rows=1)
 
 select * from t3 where a in 
 (select t1.kp1 from t1,t4 where kp1<20 and t4.pk=t1.c);
@@ -5162,6 +5162,11 @@
 (concat('1 - 03', repeat('x', @suffix_len)), concat('2 - 03', repeat('x', @suffix_len)));
 insert into t3_16 values
 (concat('1 - 04', repeat('x', @suffix_len)), concat('2 - 04', repeat('x', @suffix_len)));
+ANALYZE TABLE t1_16, t2_16, t3_16;
+Table	Op	Msg_type	Msg_text
+test.t1_16	analyze	status	OK
+test.t2_16	analyze	status	OK
+test.t3_16	analyze	status	OK
 explain select left(a1,7), left(a2,7)
 from t1_16
 where a1 in (select b1 from t2_16 where b1 > '0');
@@ -5255,6 +5260,11 @@
 insert into t3 values ('1 - 06', '2 - 06');
 insert into t3 values ('1 - 07', '2 - 07');
 insert into t3 values ('1 - 08', '2 - 08');
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 explain
 select * from t1
 where concat(a1,'x') IN
@@ -7350,7 +7360,7 @@
 1	SIMPLE	a	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 1	SIMPLE	t1	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `t1`.`t1field`) and (`test`.`t1`.`t1field` = `t1`.`t1field`))
+Note	1003	/* select#1 */ select `test`.`t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `test`.`t1`.`t1field`) and (`test`.`t1`.`t1field` = `test`.`t1`.`t1field`))
 SELECT t1.t1field
 FROM t1 LEFT JOIN t1 AS t2 ON t1.t1field IN (SELECT v1field FROM v1);
 t1field
@@ -7367,7 +7377,7 @@
 1	SIMPLE	a	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 1	SIMPLE	t1	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `t1`.`t1field`) and (`test`.`t1`.`t1field` = `t1`.`t1field`))
+Note	1003	/* select#1 */ select `test`.`t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `test`.`t1`.`t1field`) and (`test`.`t1`.`t1field` = `test`.`t1`.`t1field`))
 CREATE PROCEDURE p1() 
 BEGIN 
 SELECT t1field
@@ -7435,6 +7445,11 @@
 INSERT INTO works VALUES  ('E4','P2',20);
 INSERT INTO works VALUES  ('E4','P4',40);
 INSERT INTO works VALUES  ('E4','P5',80);
+ANALYZE TABLE staff, proj, works;
+Table	Op	Msg_type	Msg_text
+test.staff	analyze	status	OK
+test.proj	analyze	status	OK
+test.works	analyze	status	OK
 explain SELECT EMPNUM, EMPNAME
 FROM staff
 WHERE EMPNUM IN
@@ -7761,6 +7776,11 @@
 INSERT INTO t3 VALUES  ('E4','P4',40);
 INSERT INTO t3 VALUES  ('E4','P5',80);
 CREATE UNIQUE INDEX t1_IDX ON t1(EMPNUM);
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7808,6 +7828,9 @@
 DEALLOCATE PREPARE stmt;
 DROP INDEX t1_IDX ON t1;
 CREATE INDEX t1_IDX ON t1(EMPNUM);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7818,12 +7841,12 @@
 FROM t2
 WHERE PTYPE = 'Design'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	NULL
-1	SIMPLE	<subquery2>	NULL	eq_ref	<auto_distinct_key>	<auto_distinct_key>	3	test.t1.EMPNUM	1	100.00	NULL
+1	SIMPLE	<subquery2>	NULL	ALL	NULL	NULL	NULL	NULL	NULL	100.00	NULL
+1	SIMPLE	t1	NULL	ref	t1_IDX	t1_IDX	3	<subquery2>.EMPNUM	1	100.00	NULL
 2	MATERIALIZED	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 2	MATERIALIZED	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`<subquery2>`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `<subquery2>`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 PREPARE stmt FROM "EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7835,25 +7858,28 @@
         WHERE PTYPE = 'Design'))";
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	NULL
-1	SIMPLE	<subquery2>	NULL	eq_ref	<auto_distinct_key>	<auto_distinct_key>	3	test.t1.EMPNUM	1	100.00	NULL
+1	SIMPLE	<subquery2>	NULL	ALL	NULL	NULL	NULL	NULL	NULL	100.00	NULL
+1	SIMPLE	t1	NULL	ref	t1_IDX	t1_IDX	3	<subquery2>.EMPNUM	1	100.00	NULL
 2	MATERIALIZED	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 2	MATERIALIZED	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`<subquery2>`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `<subquery2>`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 
 This line is only in place to help --skip_if_hypergraph diffing some more.
 
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	NULL
-1	SIMPLE	<subquery2>	NULL	eq_ref	<auto_distinct_key>	<auto_distinct_key>	3	test.t1.EMPNUM	1	100.00	NULL
+1	SIMPLE	<subquery2>	NULL	ALL	NULL	NULL	NULL	NULL	NULL	100.00	NULL
+1	SIMPLE	t1	NULL	ref	t1_IDX	t1_IDX	3	<subquery2>.EMPNUM	1	100.00	NULL
 2	MATERIALIZED	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 2	MATERIALIZED	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`<subquery2>`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `<subquery2>`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 DEALLOCATE PREPARE stmt;
 DROP INDEX t1_IDX ON t1;
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7864,12 +7890,12 @@
 FROM t2
 WHERE PTYPE = 'Design'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
-1	SIMPLE	<subquery2>	NULL	eq_ref	<auto_distinct_key>	<auto_distinct_key>	3	test.t1.EMPNUM	1	100.00	NULL
+1	SIMPLE	<subquery2>	NULL	ALL	NULL	NULL	NULL	NULL	NULL	100.00	NULL
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	20.00	Using where; Using join buffer (hash join)
 2	MATERIALIZED	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 2	MATERIALIZED	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`<subquery2>`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `<subquery2>`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 PREPARE stmt FROM "EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7881,23 +7907,23 @@
         WHERE PTYPE = 'Design'))";
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
-1	SIMPLE	<subquery2>	NULL	eq_ref	<auto_distinct_key>	<auto_distinct_key>	3	test.t1.EMPNUM	1	100.00	NULL
+1	SIMPLE	<subquery2>	NULL	ALL	NULL	NULL	NULL	NULL	NULL	100.00	NULL
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	20.00	Using where; Using join buffer (hash join)
 2	MATERIALIZED	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 2	MATERIALIZED	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`<subquery2>`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `<subquery2>`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 
 This line is only in place to help --skip_if_hypergraph diffing some more.
 
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
-1	SIMPLE	<subquery2>	NULL	eq_ref	<auto_distinct_key>	<auto_distinct_key>	3	test.t1.EMPNUM	1	100.00	NULL
+1	SIMPLE	<subquery2>	NULL	ALL	NULL	NULL	NULL	NULL	NULL	100.00	NULL
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	20.00	Using where; Using join buffer (hash join)
 2	MATERIALIZED	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 2	MATERIALIZED	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`<subquery2>`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `<subquery2>`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 DEALLOCATE PREPARE stmt;
 DROP TABLE t1, t2, t3;
 #
@@ -8531,6 +8557,12 @@
 create table t2 as select * from t1;
 create table t3 (pk int, a int, primary key(pk));
 insert into t3 select a,a from t0;
+ANALYZE TABLE t0, t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t0	analyze	status	OK
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 explain 
 select * from t1 left join t2 on (t2.a= t1.a and t2.a in (select pk from t3));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -11408,7 +11440,7 @@
 3	MATERIALIZED	subquery2_t2	NULL	eq_ref	PRIMARY,col_varchar_key	PRIMARY	4	test.subquery2_t3.pk	1	7.14	Using where
 3	MATERIALIZED	subquery2_t1	NULL	index	col_int_key	col_int_key	5	NULL	20	100.00	Using index; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `table2`.`col_varchar_nokey` AS `field1` from `test`.`t2` `table1` join `test`.`t1` `table2` straight_join `test`.`t2` `table3` semi join (`test`.`t1` `subquery1_t2` join `test`.`t1` `subquery1_t3` join `test`.`t2` `subquery1_t1`) semi join (`test`.`t3` `subquery2_t2` join `test`.`t1` `subquery2_t3` join `test`.`t2` `subquery2_t1`) where ((`subquery1_t2`.`pk` = `subquery1_t3`.`col_int_key`) and (`subquery1_t2`.`col_varchar_nokey` = `subquery1_t3`.`col_varchar_key`) and (`subquery2_t2`.`col_varchar_key` = `subquery2_t3`.`col_varchar_key`) and (`subquery2_t2`.`pk` = `subquery2_t3`.`pk`) and (`table3`.`col_int_key` = `table2`.`pk`) and (`<subquery3>`.`subquery2_field1` = `table2`.`pk`) and (`<subquery4>`.`subquery1_field1` = `table3`.`col_int_nokey`) and (`subquery1_t1`.`pk` > 1))
+Note	1003	/* select#1 */ select `test`.`table2`.`col_varchar_nokey` AS `field1` from `test`.`t2` `table1` join `test`.`t1` `table2` straight_join `test`.`t2` `table3` semi join (`test`.`t1` `subquery1_t2` join `test`.`t1` `subquery1_t3` join `test`.`t2` `subquery1_t1`) semi join (`test`.`t3` `subquery2_t2` join `test`.`t1` `subquery2_t3` join `test`.`t2` `subquery2_t1`) where ((`test`.`subquery1_t2`.`pk` = `test`.`subquery1_t3`.`col_int_key`) and (`test`.`subquery1_t2`.`col_varchar_nokey` = `test`.`subquery1_t3`.`col_varchar_key`) and (`test`.`subquery2_t2`.`col_varchar_key` = `test`.`subquery2_t3`.`col_varchar_key`) and (`test`.`subquery2_t2`.`pk` = `test`.`subquery2_t3`.`pk`) and (`test`.`table3`.`col_int_key` = `test`.`table2`.`pk`) and (`<subquery3>`.`subquery2_field1` = `test`.`table2`.`pk`) and (`<subquery4>`.`subquery1_field1` = `test`.`table3`.`col_int_nokey`) and (`test`.`subquery1_t1`.`pk` > 1))
 SELECT * FROM v1;
 field1
 v
diff -Nru mysql-8.0-8.0.26/mysql-test/r/subquery_sj_mat_nosj.result mysql-8.0-8.0.27/mysql-test/r/subquery_sj_mat_nosj.result
--- mysql-8.0-8.0.26/mysql-test/r/subquery_sj_mat_nosj.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/subquery_sj_mat_nosj.result	2021-09-28 11:46:34.000000000 +0000
@@ -4282,14 +4282,14 @@
 -> Filter: <in_optimizer>(t3.a,t3.a in (select #2))  (cost=10.25 rows=100)
     -> Table scan on t3  (cost=10.25 rows=100)
     -> Select #2 (subquery in condition; run only once)
-        -> Filter: ((t3.a = `<materialized_subquery>`.kp1))
+        -> Filter: ((t3.a = `<materialized_subquery>`.kp1))  (cost=36.26..36.26 rows=40)
             -> Limit: 1 row(s)
                 -> Index lookup on <materialized_subquery> using <auto_distinct_key> (kp1=t3.a)
                     -> Materialize with deduplication  (cost=36.26..36.26 rows=40)
                         -> Nested loop inner join  (cost=32.26 rows=40)
                             -> Filter: ((t1.kp1 < 20) and (t1.c is not null))  (cost=18.26 rows=40)
                                 -> Index range scan on t1 using kp1  (cost=18.26 rows=40)
-                            -> Single-row index lookup on t4 using PRIMARY (pk=t1.c)  (cost=0.25 rows=1)
+                            -> Single-row covering index lookup on t4 using PRIMARY (pk=t1.c)  (cost=0.25 rows=1)
 
 select * from t3 where a in 
 (select t1.kp1 from t1,t4 where kp1<20 and t4.pk=t1.c);
@@ -4925,6 +4925,11 @@
 (concat('1 - 03', repeat('x', @suffix_len)), concat('2 - 03', repeat('x', @suffix_len)));
 insert into t3_16 values
 (concat('1 - 04', repeat('x', @suffix_len)), concat('2 - 04', repeat('x', @suffix_len)));
+ANALYZE TABLE t1_16, t2_16, t3_16;
+Table	Op	Msg_type	Msg_text
+test.t1_16	analyze	status	OK
+test.t2_16	analyze	status	OK
+test.t3_16	analyze	status	OK
 explain select left(a1,7), left(a2,7)
 from t1_16
 where a1 in (select b1 from t2_16 where b1 > '0');
@@ -5015,6 +5020,11 @@
 insert into t3 values ('1 - 06', '2 - 06');
 insert into t3 values ('1 - 07', '2 - 07');
 insert into t3 values ('1 - 08', '2 - 08');
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 explain
 select * from t1
 where concat(a1,'x') IN
@@ -7065,7 +7075,7 @@
 2	SUBQUERY	a	NULL	index	PRIMARY	PRIMARY	4	NULL	2	100.00	Using where; Using index
 4	SUBQUERY	t1	NULL	index	PRIMARY	PRIMARY	4	NULL	2	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `t1`.`t1field` AS `t1field` from `test`.`t1` where <in_optimizer>(`t1`.`t1field`,`t1`.`t1field` in ( <materialize> (/* select#2 */ select `test`.`a`.`t1field` from `test`.`t1` `a` where <in_optimizer>(`test`.`a`.`t1field`,`test`.`a`.`t1field` in ( <materialize> (/* select#4 */ select `test`.`t1`.`t1field` from `test`.`t1` where true ), <primary_index_lookup>(`test`.`a`.`t1field` in <temporary table> on <auto_distinct_key> where ((`test`.`a`.`t1field` = `<materialized_subquery>`.`t1field`))))) ), <primary_index_lookup>(`t1`.`t1field` in <temporary table> on <auto_distinct_key> where ((`t1`.`t1field` = `<materialized_subquery>`.`v1field`)))))
+Note	1003	/* select#1 */ select `test`.`t1`.`t1field` AS `t1field` from `test`.`t1` where <in_optimizer>(`test`.`t1`.`t1field`,`test`.`t1`.`t1field` in ( <materialize> (/* select#2 */ select `test`.`a`.`t1field` from `test`.`t1` `a` where <in_optimizer>(`test`.`a`.`t1field`,`test`.`a`.`t1field` in ( <materialize> (/* select#4 */ select `test`.`t1`.`t1field` from `test`.`t1` where true ), <primary_index_lookup>(`test`.`a`.`t1field` in <temporary table> on <auto_distinct_key> where ((`test`.`a`.`t1field` = `<materialized_subquery>`.`t1field`))))) ), <primary_index_lookup>(`test`.`t1`.`t1field` in <temporary table> on <auto_distinct_key> where ((`test`.`t1`.`t1field` = `<materialized_subquery>`.`v1field`)))))
 SELECT t1.t1field
 FROM t1 LEFT JOIN t1 AS t2 ON t1.t1field IN (SELECT v1field FROM v1);
 t1field
@@ -7082,7 +7092,7 @@
 2	SUBQUERY	a	NULL	index	PRIMARY	PRIMARY	4	NULL	2	100.00	Using where; Using index
 4	SUBQUERY	t1	NULL	index	PRIMARY	PRIMARY	4	NULL	2	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `t1`.`t1field` AS `t1field` from `test`.`t1` where <in_optimizer>(`t1`.`t1field`,`t1`.`t1field` in ( <materialize> (/* select#2 */ select `test`.`a`.`t1field` from `test`.`t1` `a` where <in_optimizer>(`test`.`a`.`t1field`,`test`.`a`.`t1field` in ( <materialize> (/* select#4 */ select `test`.`t1`.`t1field` from `test`.`t1` where true ), <primary_index_lookup>(`test`.`a`.`t1field` in <temporary table> on <auto_distinct_key> where ((`test`.`a`.`t1field` = `<materialized_subquery>`.`t1field`))))) ), <primary_index_lookup>(`t1`.`t1field` in <temporary table> on <auto_distinct_key> where ((`t1`.`t1field` = `<materialized_subquery>`.`v1field`)))))
+Note	1003	/* select#1 */ select `test`.`t1`.`t1field` AS `t1field` from `test`.`t1` where <in_optimizer>(`test`.`t1`.`t1field`,`test`.`t1`.`t1field` in ( <materialize> (/* select#2 */ select `test`.`a`.`t1field` from `test`.`t1` `a` where <in_optimizer>(`test`.`a`.`t1field`,`test`.`a`.`t1field` in ( <materialize> (/* select#4 */ select `test`.`t1`.`t1field` from `test`.`t1` where true ), <primary_index_lookup>(`test`.`a`.`t1field` in <temporary table> on <auto_distinct_key> where ((`test`.`a`.`t1field` = `<materialized_subquery>`.`t1field`))))) ), <primary_index_lookup>(`test`.`t1`.`t1field` in <temporary table> on <auto_distinct_key> where ((`test`.`t1`.`t1field` = `<materialized_subquery>`.`v1field`)))))
 CREATE PROCEDURE p1() 
 BEGIN 
 SELECT t1field
@@ -7150,6 +7160,11 @@
 INSERT INTO works VALUES  ('E4','P2',20);
 INSERT INTO works VALUES  ('E4','P4',40);
 INSERT INTO works VALUES  ('E4','P5',80);
+ANALYZE TABLE staff, proj, works;
+Table	Op	Msg_type	Msg_text
+test.staff	analyze	status	OK
+test.proj	analyze	status	OK
+test.works	analyze	status	OK
 explain SELECT EMPNUM, EMPNAME
 FROM staff
 WHERE EMPNUM IN
@@ -7470,6 +7485,11 @@
 INSERT INTO t3 VALUES  ('E4','P4',40);
 INSERT INTO t3 VALUES  ('E4','P5',80);
 CREATE UNIQUE INDEX t1_IDX ON t1(EMPNUM);
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7514,6 +7534,9 @@
 DEALLOCATE PREPARE stmt;
 DROP INDEX t1_IDX ON t1;
 CREATE INDEX t1_IDX ON t1(EMPNUM);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7524,7 +7547,7 @@
 FROM t2
 WHERE PTYPE = 'Design'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Using where
+1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	100.00	Using where
 2	SUBQUERY	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	100.00	Using where
 3	SUBQUERY	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 Warnings:
@@ -7540,7 +7563,7 @@
         WHERE PTYPE = 'Design'))";
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Using where
+1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	100.00	Using where
 2	SUBQUERY	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	100.00	Using where
 3	SUBQUERY	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 Warnings:
@@ -7550,13 +7573,16 @@
 
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Using where
+1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	100.00	Using where
 2	SUBQUERY	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	100.00	Using where
 3	SUBQUERY	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` where <in_optimizer>(`test`.`t1`.`EMPNUM`,`test`.`t1`.`EMPNUM` in ( <materialize> (/* select#2 */ select `test`.`t3`.`EMPNUM` from `test`.`t3` where <in_optimizer>(`test`.`t3`.`PNUM`,`test`.`t3`.`PNUM` in ( <materialize> (/* select#3 */ select `test`.`t2`.`PNUM` from `test`.`t2` where (`test`.`t2`.`PTYPE` = 'Design') ), <primary_index_lookup>(`test`.`t3`.`PNUM` in <temporary table> on <auto_distinct_key> where ((`test`.`t3`.`PNUM` = `<materialized_subquery>`.`PNUM`))))) ), <primary_index_lookup>(`test`.`t1`.`EMPNUM` in <temporary table> on <auto_distinct_key> where ((`test`.`t1`.`EMPNUM` = `<materialized_subquery>`.`EMPNUM`)))))
 DEALLOCATE PREPARE stmt;
 DROP INDEX t1_IDX ON t1;
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7567,7 +7593,7 @@
 FROM t2
 WHERE PTYPE = 'Design'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Using where
+1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	100.00	Using where
 2	SUBQUERY	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	100.00	Using where
 3	SUBQUERY	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 Warnings:
@@ -7583,7 +7609,7 @@
         WHERE PTYPE = 'Design'))";
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Using where
+1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	100.00	Using where
 2	SUBQUERY	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	100.00	Using where
 3	SUBQUERY	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 Warnings:
@@ -7593,7 +7619,7 @@
 
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Using where
+1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	100.00	Using where
 2	SUBQUERY	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	100.00	Using where
 3	SUBQUERY	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 Warnings:
@@ -8227,6 +8253,12 @@
 create table t2 as select * from t1;
 create table t3 (pk int, a int, primary key(pk));
 insert into t3 select a,a from t0;
+ANALYZE TABLE t0, t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t0	analyze	status	OK
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 explain 
 select * from t1 left join t2 on (t2.a= t1.a and t2.a in (select pk from t3));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -11074,7 +11106,7 @@
 4	SUBQUERY	subquery1_t2	NULL	eq_ref	PRIMARY	PRIMARY	4	test.subquery1_t3.col_int_key	1	10.00	Using where
 4	SUBQUERY	subquery1_t1	NULL	index	PRIMARY	col_int_key	5	NULL	20	100.00	Using where; Using index; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `table2`.`col_varchar_nokey` AS `field1` from `test`.`t2` `table1` join `test`.`t1` `table2` straight_join `test`.`t2` `table3` where ((`table3`.`col_int_key` = `table2`.`pk`) and <in_optimizer>(`table2`.`pk`,`table2`.`pk` in ( <materialize> (/* select#3 */ select `subquery2_t1`.`col_int_key` AS `subquery2_field1` from `test`.`t3` `subquery2_t2` join `test`.`t1` `subquery2_t3` join `test`.`t2` `subquery2_t1` where ((`subquery2_t2`.`pk` = `subquery2_t3`.`pk`) and (`subquery2_t2`.`col_varchar_key` = `subquery2_t3`.`col_varchar_key`)) ), <primary_index_lookup>(`table2`.`pk` in <temporary table> on <auto_distinct_key> where ((`table2`.`pk` = `<materialized_subquery>`.`subquery2_field1`))))) and <in_optimizer>(`table3`.`col_int_nokey`,`table3`.`col_int_nokey` in ( <materialize> (/* select#4 */ select `subquery1_t2`.`col_int_nokey` AS `subquery1_field1` from `test`.`t1` `subquery1_t2` join `test`.`t1` `subquery1_t3` join `test`.`t2` `subquery1_t1` where ((`subquery1_t1`.`pk` > 1) and (`subquery1_t2`.`col_varchar_nokey` = `subquery1_t3`.`col_varchar_key`) and (`subquery1_t2`.`pk` = `subquery1_t3`.`col_int_key`)) ), <primary_index_lookup>(`table3`.`col_int_nokey` in <temporary table> on <auto_distinct_key> where ((`table3`.`col_int_nokey` = `<materialized_subquery>`.`subquery1_field1`))))))
+Note	1003	/* select#1 */ select `test`.`table2`.`col_varchar_nokey` AS `field1` from `test`.`t2` `table1` join `test`.`t1` `table2` straight_join `test`.`t2` `table3` where ((`test`.`table3`.`col_int_key` = `test`.`table2`.`pk`) and <in_optimizer>(`test`.`table2`.`pk`,`test`.`table2`.`pk` in ( <materialize> (/* select#3 */ select `test`.`subquery2_t1`.`col_int_key` AS `subquery2_field1` from `test`.`t3` `subquery2_t2` join `test`.`t1` `subquery2_t3` join `test`.`t2` `subquery2_t1` where ((`test`.`subquery2_t2`.`pk` = `test`.`subquery2_t3`.`pk`) and (`test`.`subquery2_t2`.`col_varchar_key` = `test`.`subquery2_t3`.`col_varchar_key`)) ), <primary_index_lookup>(`test`.`table2`.`pk` in <temporary table> on <auto_distinct_key> where ((`test`.`table2`.`pk` = `<materialized_subquery>`.`subquery2_field1`))))) and <in_optimizer>(`test`.`table3`.`col_int_nokey`,`test`.`table3`.`col_int_nokey` in ( <materialize> (/* select#4 */ select `test`.`subquery1_t2`.`col_int_nokey` AS `subquery1_field1` from `test`.`t1` `subquery1_t2` join `test`.`t1` `subquery1_t3` join `test`.`t2` `subquery1_t1` where ((`test`.`subquery1_t1`.`pk` > 1) and (`test`.`subquery1_t2`.`col_varchar_nokey` = `test`.`subquery1_t3`.`col_varchar_key`) and (`test`.`subquery1_t2`.`pk` = `test`.`subquery1_t3`.`col_int_key`)) ), <primary_index_lookup>(`test`.`table3`.`col_int_nokey` in <temporary table> on <auto_distinct_key> where ((`test`.`table3`.`col_int_nokey` = `<materialized_subquery>`.`subquery1_field1`))))))
 SELECT * FROM v1;
 field1
 v
@@ -13129,7 +13161,7 @@
     -> Filter: <in_optimizer>(t4.col_int_key,t4.col_int_key in (select #2))  (cost=0.85 rows=6)
         -> Table scan on t4  (cost=0.85 rows=6)
         -> Select #2 (subquery in condition; run only once)
-            -> Filter: ((t4.col_int_key = `<materialized_subquery>`.col_int_key))
+            -> Filter: ((t4.col_int_key = `<materialized_subquery>`.col_int_key))  (cost=4.10..4.10 rows=7)
                 -> Limit: 1 row(s)
                     -> Index lookup on <materialized_subquery> using <auto_distinct_key> (col_int_key=t4.col_int_key)
                         -> Materialize with deduplication  (cost=4.10..4.10 rows=7)
diff -Nru mysql-8.0-8.0.26/mysql-test/r/subquery_sj_mat.result mysql-8.0-8.0.27/mysql-test/r/subquery_sj_mat.result
--- mysql-8.0-8.0.26/mysql-test/r/subquery_sj_mat.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/subquery_sj_mat.result	2021-09-28 11:46:34.000000000 +0000
@@ -4510,7 +4510,7 @@
                 -> Nested loop inner join  (cost=32.26 rows=40)
                     -> Filter: ((t1.kp1 < 20) and (t1.c is not null))  (cost=18.26 rows=40)
                         -> Index range scan on t1 using kp1  (cost=18.26 rows=40)
-                    -> Single-row index lookup on t4 using PRIMARY (pk=t1.c)  (cost=0.25 rows=1)
+                    -> Single-row covering index lookup on t4 using PRIMARY (pk=t1.c)  (cost=0.25 rows=1)
 
 select * from t3 where a in 
 (select t1.kp1 from t1,t4 where kp1<20 and t4.pk=t1.c);
@@ -5161,6 +5161,11 @@
 (concat('1 - 03', repeat('x', @suffix_len)), concat('2 - 03', repeat('x', @suffix_len)));
 insert into t3_16 values
 (concat('1 - 04', repeat('x', @suffix_len)), concat('2 - 04', repeat('x', @suffix_len)));
+ANALYZE TABLE t1_16, t2_16, t3_16;
+Table	Op	Msg_type	Msg_text
+test.t1_16	analyze	status	OK
+test.t2_16	analyze	status	OK
+test.t3_16	analyze	status	OK
 explain select left(a1,7), left(a2,7)
 from t1_16
 where a1 in (select b1 from t2_16 where b1 > '0');
@@ -5254,6 +5259,11 @@
 insert into t3 values ('1 - 06', '2 - 06');
 insert into t3 values ('1 - 07', '2 - 07');
 insert into t3 values ('1 - 08', '2 - 08');
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 explain
 select * from t1
 where concat(a1,'x') IN
@@ -7349,7 +7359,7 @@
 1	SIMPLE	a	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 1	SIMPLE	t1	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `t1`.`t1field`) and (`test`.`t1`.`t1field` = `t1`.`t1field`))
+Note	1003	/* select#1 */ select `test`.`t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `test`.`t1`.`t1field`) and (`test`.`t1`.`t1field` = `test`.`t1`.`t1field`))
 SELECT t1.t1field
 FROM t1 LEFT JOIN t1 AS t2 ON t1.t1field IN (SELECT v1field FROM v1);
 t1field
@@ -7366,7 +7376,7 @@
 1	SIMPLE	a	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 1	SIMPLE	t1	NULL	eq_ref	PRIMARY	PRIMARY	4	test.t1.t1field	1	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `t1`.`t1field`) and (`test`.`t1`.`t1field` = `t1`.`t1field`))
+Note	1003	/* select#1 */ select `test`.`t1`.`t1field` AS `t1field` from `test`.`t1` `a` join `test`.`t1` join `test`.`t1` where ((`test`.`a`.`t1field` = `test`.`t1`.`t1field`) and (`test`.`t1`.`t1field` = `test`.`t1`.`t1field`))
 CREATE PROCEDURE p1() 
 BEGIN 
 SELECT t1field
@@ -7434,6 +7444,11 @@
 INSERT INTO works VALUES  ('E4','P2',20);
 INSERT INTO works VALUES  ('E4','P4',40);
 INSERT INTO works VALUES  ('E4','P5',80);
+ANALYZE TABLE staff, proj, works;
+Table	Op	Msg_type	Msg_text
+test.staff	analyze	status	OK
+test.proj	analyze	status	OK
+test.works	analyze	status	OK
 explain SELECT EMPNUM, EMPNAME
 FROM staff
 WHERE EMPNUM IN
@@ -7760,6 +7775,11 @@
 INSERT INTO t3 VALUES  ('E4','P4',40);
 INSERT INTO t3 VALUES  ('E4','P5',80);
 CREATE UNIQUE INDEX t1_IDX ON t1(EMPNUM);
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7807,6 +7827,9 @@
 DEALLOCATE PREPARE stmt;
 DROP INDEX t1_IDX ON t1;
 CREATE INDEX t1_IDX ON t1(EMPNUM);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7817,12 +7840,12 @@
 FROM t2
 WHERE PTYPE = 'Design'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	NULL
-1	SIMPLE	<subquery2>	NULL	eq_ref	<auto_distinct_key>	<auto_distinct_key>	3	test.t1.EMPNUM	1	100.00	NULL
+1	SIMPLE	<subquery2>	NULL	ALL	NULL	NULL	NULL	NULL	NULL	100.00	NULL
+1	SIMPLE	t1	NULL	ref	t1_IDX	t1_IDX	3	<subquery2>.EMPNUM	1	100.00	NULL
 2	MATERIALIZED	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 2	MATERIALIZED	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`<subquery2>`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `<subquery2>`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 PREPARE stmt FROM "EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7834,25 +7857,28 @@
         WHERE PTYPE = 'Design'))";
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	NULL
-1	SIMPLE	<subquery2>	NULL	eq_ref	<auto_distinct_key>	<auto_distinct_key>	3	test.t1.EMPNUM	1	100.00	NULL
+1	SIMPLE	<subquery2>	NULL	ALL	NULL	NULL	NULL	NULL	NULL	100.00	NULL
+1	SIMPLE	t1	NULL	ref	t1_IDX	t1_IDX	3	<subquery2>.EMPNUM	1	100.00	NULL
 2	MATERIALIZED	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 2	MATERIALIZED	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`<subquery2>`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `<subquery2>`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 
 This line is only in place to help --skip_if_hypergraph diffing some more.
 
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	t1_IDX	NULL	NULL	NULL	1	100.00	NULL
-1	SIMPLE	<subquery2>	NULL	eq_ref	<auto_distinct_key>	<auto_distinct_key>	3	test.t1.EMPNUM	1	100.00	NULL
+1	SIMPLE	<subquery2>	NULL	ALL	NULL	NULL	NULL	NULL	NULL	100.00	NULL
+1	SIMPLE	t1	NULL	ref	t1_IDX	t1_IDX	3	<subquery2>.EMPNUM	1	100.00	NULL
 2	MATERIALIZED	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 2	MATERIALIZED	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`<subquery2>`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `<subquery2>`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 DEALLOCATE PREPARE stmt;
 DROP INDEX t1_IDX ON t1;
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7863,12 +7889,12 @@
 FROM t2
 WHERE PTYPE = 'Design'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
-1	SIMPLE	<subquery2>	NULL	eq_ref	<auto_distinct_key>	<auto_distinct_key>	3	test.t1.EMPNUM	1	100.00	NULL
+1	SIMPLE	<subquery2>	NULL	ALL	NULL	NULL	NULL	NULL	NULL	100.00	NULL
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	20.00	Using where; Using join buffer (hash join)
 2	MATERIALIZED	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 2	MATERIALIZED	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`<subquery2>`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `<subquery2>`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 PREPARE stmt FROM "EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7880,23 +7906,23 @@
         WHERE PTYPE = 'Design'))";
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
-1	SIMPLE	<subquery2>	NULL	eq_ref	<auto_distinct_key>	<auto_distinct_key>	3	test.t1.EMPNUM	1	100.00	NULL
+1	SIMPLE	<subquery2>	NULL	ALL	NULL	NULL	NULL	NULL	NULL	100.00	NULL
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	20.00	Using where; Using join buffer (hash join)
 2	MATERIALIZED	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 2	MATERIALIZED	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`<subquery2>`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `<subquery2>`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 
 This line is only in place to help --skip_if_hypergraph diffing some more.
 
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	NULL
-1	SIMPLE	<subquery2>	NULL	eq_ref	<auto_distinct_key>	<auto_distinct_key>	3	test.t1.EMPNUM	1	100.00	NULL
+1	SIMPLE	<subquery2>	NULL	ALL	NULL	NULL	NULL	NULL	NULL	100.00	NULL
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	20.00	Using where; Using join buffer (hash join)
 2	MATERIALIZED	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 2	MATERIALIZED	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`<subquery2>`.`EMPNUM` = `test`.`t1`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
+Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2`) where ((`test`.`t1`.`EMPNUM` = `<subquery2>`.`EMPNUM`) and (`test`.`t3`.`PNUM` = `test`.`t2`.`PNUM`) and (`test`.`t2`.`PTYPE` = 'Design'))
 DEALLOCATE PREPARE stmt;
 DROP TABLE t1, t2, t3;
 #
@@ -8530,6 +8556,12 @@
 create table t2 as select * from t1;
 create table t3 (pk int, a int, primary key(pk));
 insert into t3 select a,a from t0;
+ANALYZE TABLE t0, t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t0	analyze	status	OK
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 explain 
 select * from t1 left join t2 on (t2.a= t1.a and t2.a in (select pk from t3));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -11407,7 +11439,7 @@
 3	MATERIALIZED	subquery2_t2	NULL	eq_ref	PRIMARY,col_varchar_key	PRIMARY	4	test.subquery2_t3.pk	1	7.14	Using where
 3	MATERIALIZED	subquery2_t1	NULL	index	col_int_key	col_int_key	5	NULL	20	100.00	Using index; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `table2`.`col_varchar_nokey` AS `field1` from `test`.`t2` `table1` join `test`.`t1` `table2` straight_join `test`.`t2` `table3` semi join (`test`.`t1` `subquery1_t2` join `test`.`t1` `subquery1_t3` join `test`.`t2` `subquery1_t1`) semi join (`test`.`t3` `subquery2_t2` join `test`.`t1` `subquery2_t3` join `test`.`t2` `subquery2_t1`) where ((`subquery1_t2`.`pk` = `subquery1_t3`.`col_int_key`) and (`subquery1_t2`.`col_varchar_nokey` = `subquery1_t3`.`col_varchar_key`) and (`subquery2_t2`.`col_varchar_key` = `subquery2_t3`.`col_varchar_key`) and (`subquery2_t2`.`pk` = `subquery2_t3`.`pk`) and (`table3`.`col_int_key` = `table2`.`pk`) and (`<subquery3>`.`subquery2_field1` = `table2`.`pk`) and (`<subquery4>`.`subquery1_field1` = `table3`.`col_int_nokey`) and (`subquery1_t1`.`pk` > 1))
+Note	1003	/* select#1 */ select `test`.`table2`.`col_varchar_nokey` AS `field1` from `test`.`t2` `table1` join `test`.`t1` `table2` straight_join `test`.`t2` `table3` semi join (`test`.`t1` `subquery1_t2` join `test`.`t1` `subquery1_t3` join `test`.`t2` `subquery1_t1`) semi join (`test`.`t3` `subquery2_t2` join `test`.`t1` `subquery2_t3` join `test`.`t2` `subquery2_t1`) where ((`test`.`subquery1_t2`.`pk` = `test`.`subquery1_t3`.`col_int_key`) and (`test`.`subquery1_t2`.`col_varchar_nokey` = `test`.`subquery1_t3`.`col_varchar_key`) and (`test`.`subquery2_t2`.`col_varchar_key` = `test`.`subquery2_t3`.`col_varchar_key`) and (`test`.`subquery2_t2`.`pk` = `test`.`subquery2_t3`.`pk`) and (`test`.`table3`.`col_int_key` = `test`.`table2`.`pk`) and (`<subquery3>`.`subquery2_field1` = `test`.`table2`.`pk`) and (`<subquery4>`.`subquery1_field1` = `test`.`table3`.`col_int_nokey`) and (`test`.`subquery1_t1`.`pk` > 1))
 SELECT * FROM v1;
 field1
 v
diff -Nru mysql-8.0-8.0.26/mysql-test/r/subquery_sj_none_bka_nobnl.result mysql-8.0-8.0.27/mysql-test/r/subquery_sj_none_bka_nobnl.result
--- mysql-8.0-8.0.26/mysql-test/r/subquery_sj_none_bka_nobnl.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/subquery_sj_none_bka_nobnl.result	2021-09-28 11:46:34.000000000 +0000
@@ -4268,7 +4268,7 @@
             -> Nested loop inner join  (cost=0.71 rows=1)
                 -> Filter: ((t1.kp1 < 20) and (t1.c is not null))  (cost=0.36 rows=1)
                     -> Index lookup on t1 using kp1 (kp1=<cache>(t3.a))  (cost=0.36 rows=1)
-                -> Single-row index lookup on t4 using PRIMARY (pk=t1.c)  (cost=0.35 rows=1)
+                -> Single-row covering index lookup on t4 using PRIMARY (pk=t1.c)  (cost=0.35 rows=1)
 
 select * from t3 where a in 
 (select t1.kp1 from t1,t4 where kp1<20 and t4.pk=t1.c);
@@ -4894,6 +4894,11 @@
 (concat('1 - 03', repeat('x', @suffix_len)), concat('2 - 03', repeat('x', @suffix_len)));
 insert into t3_16 values
 (concat('1 - 04', repeat('x', @suffix_len)), concat('2 - 04', repeat('x', @suffix_len)));
+ANALYZE TABLE t1_16, t2_16, t3_16;
+Table	Op	Msg_type	Msg_text
+test.t1_16	analyze	status	OK
+test.t2_16	analyze	status	OK
+test.t3_16	analyze	status	OK
 explain select left(a1,7), left(a2,7)
 from t1_16
 where a1 in (select b1 from t2_16 where b1 > '0');
@@ -4984,6 +4989,11 @@
 insert into t3 values ('1 - 06', '2 - 06');
 insert into t3 values ('1 - 07', '2 - 07');
 insert into t3 values ('1 - 08', '2 - 08');
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 explain
 select * from t1
 where concat(a1,'x') IN
@@ -7084,7 +7094,7 @@
 2	DEPENDENT SUBQUERY	a	NULL	unique_subquery	PRIMARY	PRIMARY	4	func	1	100.00	Using where; Using index
 4	DEPENDENT SUBQUERY	t1	NULL	unique_subquery	PRIMARY	PRIMARY	4	func	1	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `t1`.`t1field` AS `t1field` from `test`.`t1` where <in_optimizer>(`t1`.`t1field`,<exists>(<primary_index_lookup>(<cache>(`t1`.`t1field`) in t1 on PRIMARY where <in_optimizer>(`test`.`a`.`t1field`,<exists>(<primary_index_lookup>(<cache>(`test`.`a`.`t1field`) in t1 on PRIMARY))))))
+Note	1003	/* select#1 */ select `test`.`t1`.`t1field` AS `t1field` from `test`.`t1` where <in_optimizer>(`test`.`t1`.`t1field`,<exists>(<primary_index_lookup>(<cache>(`test`.`t1`.`t1field`) in t1 on PRIMARY where <in_optimizer>(`test`.`a`.`t1field`,<exists>(<primary_index_lookup>(<cache>(`test`.`a`.`t1field`) in t1 on PRIMARY))))))
 SELECT t1.t1field
 FROM t1 LEFT JOIN t1 AS t2 ON t1.t1field IN (SELECT v1field FROM v1);
 t1field
@@ -7101,7 +7111,7 @@
 2	DEPENDENT SUBQUERY	a	NULL	unique_subquery	PRIMARY	PRIMARY	4	func	1	100.00	Using where; Using index
 4	DEPENDENT SUBQUERY	t1	NULL	unique_subquery	PRIMARY	PRIMARY	4	func	1	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `t1`.`t1field` AS `t1field` from `test`.`t1` where <in_optimizer>(`t1`.`t1field`,<exists>(<primary_index_lookup>(<cache>(`t1`.`t1field`) in t1 on PRIMARY where <in_optimizer>(`test`.`a`.`t1field`,<exists>(<primary_index_lookup>(<cache>(`test`.`a`.`t1field`) in t1 on PRIMARY))))))
+Note	1003	/* select#1 */ select `test`.`t1`.`t1field` AS `t1field` from `test`.`t1` where <in_optimizer>(`test`.`t1`.`t1field`,<exists>(<primary_index_lookup>(<cache>(`test`.`t1`.`t1field`) in t1 on PRIMARY where <in_optimizer>(`test`.`a`.`t1field`,<exists>(<primary_index_lookup>(<cache>(`test`.`a`.`t1field`) in t1 on PRIMARY))))))
 CREATE PROCEDURE p1() 
 BEGIN 
 SELECT t1field
@@ -7169,6 +7179,11 @@
 INSERT INTO works VALUES  ('E4','P2',20);
 INSERT INTO works VALUES  ('E4','P4',40);
 INSERT INTO works VALUES  ('E4','P5',80);
+ANALYZE TABLE staff, proj, works;
+Table	Op	Msg_type	Msg_text
+test.staff	analyze	status	OK
+test.proj	analyze	status	OK
+test.works	analyze	status	OK
 explain SELECT EMPNUM, EMPNAME
 FROM staff
 WHERE EMPNUM IN
@@ -7489,6 +7504,11 @@
 INSERT INTO t3 VALUES  ('E4','P4',40);
 INSERT INTO t3 VALUES  ('E4','P5',80);
 CREATE UNIQUE INDEX t1_IDX ON t1(EMPNUM);
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7533,6 +7553,9 @@
 DEALLOCATE PREPARE stmt;
 DROP INDEX t1_IDX ON t1;
 CREATE INDEX t1_IDX ON t1(EMPNUM);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7543,7 +7566,7 @@
 FROM t2
 WHERE PTYPE = 'Design'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Using where
+1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	100.00	Using where
 2	DEPENDENT SUBQUERY	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
 3	DEPENDENT SUBQUERY	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 Warnings:
@@ -7559,7 +7582,7 @@
         WHERE PTYPE = 'Design'))";
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Using where
+1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	100.00	Using where
 2	DEPENDENT SUBQUERY	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
 3	DEPENDENT SUBQUERY	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 Warnings:
@@ -7569,13 +7592,16 @@
 
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Using where
+1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	100.00	Using where
 2	DEPENDENT SUBQUERY	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
 3	DEPENDENT SUBQUERY	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` where <in_optimizer>(`test`.`t1`.`EMPNUM`,<exists>(/* select#2 */ select `test`.`t3`.`EMPNUM` from `test`.`t3` where (<in_optimizer>(`test`.`t3`.`PNUM`,<exists>(/* select#3 */ select `test`.`t2`.`PNUM` from `test`.`t2` where ((`test`.`t2`.`PTYPE` = 'Design') and (<cache>(`test`.`t3`.`PNUM`) = `test`.`t2`.`PNUM`)))) and (<cache>(`test`.`t1`.`EMPNUM`) = `test`.`t3`.`EMPNUM`))))
 DEALLOCATE PREPARE stmt;
 DROP INDEX t1_IDX ON t1;
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7586,7 +7612,7 @@
 FROM t2
 WHERE PTYPE = 'Design'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Using where
+1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	100.00	Using where
 2	DEPENDENT SUBQUERY	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
 3	DEPENDENT SUBQUERY	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 Warnings:
@@ -7602,7 +7628,7 @@
         WHERE PTYPE = 'Design'))";
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Using where
+1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	100.00	Using where
 2	DEPENDENT SUBQUERY	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
 3	DEPENDENT SUBQUERY	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 Warnings:
@@ -7612,7 +7638,7 @@
 
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Using where
+1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	100.00	Using where
 2	DEPENDENT SUBQUERY	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
 3	DEPENDENT SUBQUERY	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 Warnings:
@@ -8236,6 +8262,12 @@
 create table t2 as select * from t1;
 create table t3 (pk int, a int, primary key(pk));
 insert into t3 select a,a from t0;
+ANALYZE TABLE t0, t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t0	analyze	status	OK
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 explain 
 select * from t1 left join t2 on (t2.a= t1.a and t2.a in (select pk from t3));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -11077,7 +11109,7 @@
 4	DEPENDENT SUBQUERY	subquery1_t3	NULL	ref	col_varchar_key	col_varchar_key	7	test.subquery1_t2.col_varchar_nokey	1	10.00	Using where
 4	DEPENDENT SUBQUERY	subquery1_t1	NULL	index	PRIMARY	col_int_key	5	NULL	20	100.00	Using where; Using index
 Warnings:
-Note	1003	/* select#1 */ select `table2`.`col_varchar_nokey` AS `field1` from `test`.`t2` `table1` join `test`.`t1` `table2` straight_join `test`.`t2` `table3` where ((`table3`.`col_int_key` = `table2`.`pk`) and <in_optimizer>(`table2`.`pk`,<exists>(/* select#3 */ select `subquery2_t1`.`col_int_key` AS `subquery2_field1` from `test`.`t3` `subquery2_t2` join `test`.`t1` `subquery2_t3` join `test`.`t2` `subquery2_t1` where ((`subquery2_t2`.`col_varchar_key` = `subquery2_t3`.`col_varchar_key`) and (`subquery2_t2`.`pk` = `subquery2_t3`.`pk`) and (<cache>(`table3`.`col_int_key`) = `subquery2_t1`.`col_int_key`)))) and <in_optimizer>(`table3`.`col_int_nokey`,<exists>(/* select#4 */ select `subquery1_t2`.`col_int_nokey` AS `subquery1_field1` from `test`.`t1` `subquery1_t2` join `test`.`t1` `subquery1_t3` join `test`.`t2` `subquery1_t1` where ((`subquery1_t3`.`col_int_key` = `subquery1_t2`.`pk`) and (`subquery1_t3`.`col_varchar_key` = `subquery1_t2`.`col_varchar_nokey`) and (`subquery1_t1`.`pk` > 1) and (<cache>(`table3`.`col_int_nokey`) = `subquery1_t2`.`col_int_nokey`)))))
+Note	1003	/* select#1 */ select `test`.`table2`.`col_varchar_nokey` AS `field1` from `test`.`t2` `table1` join `test`.`t1` `table2` straight_join `test`.`t2` `table3` where ((`test`.`table3`.`col_int_key` = `test`.`table2`.`pk`) and <in_optimizer>(`test`.`table2`.`pk`,<exists>(/* select#3 */ select `test`.`subquery2_t1`.`col_int_key` AS `subquery2_field1` from `test`.`t3` `subquery2_t2` join `test`.`t1` `subquery2_t3` join `test`.`t2` `subquery2_t1` where ((`test`.`subquery2_t2`.`col_varchar_key` = `test`.`subquery2_t3`.`col_varchar_key`) and (`test`.`subquery2_t2`.`pk` = `test`.`subquery2_t3`.`pk`) and (<cache>(`test`.`table3`.`col_int_key`) = `test`.`subquery2_t1`.`col_int_key`)))) and <in_optimizer>(`test`.`table3`.`col_int_nokey`,<exists>(/* select#4 */ select `test`.`subquery1_t2`.`col_int_nokey` AS `subquery1_field1` from `test`.`t1` `subquery1_t2` join `test`.`t1` `subquery1_t3` join `test`.`t2` `subquery1_t1` where ((`test`.`subquery1_t3`.`col_int_key` = `test`.`subquery1_t2`.`pk`) and (`test`.`subquery1_t3`.`col_varchar_key` = `test`.`subquery1_t2`.`col_varchar_nokey`) and (`test`.`subquery1_t1`.`pk` > 1) and (<cache>(`test`.`table3`.`col_int_nokey`) = `test`.`subquery1_t2`.`col_int_nokey`)))))
 SELECT * FROM v1;
 field1
 v
@@ -13114,7 +13146,7 @@
             -> Limit: 1 row(s)  (cost=0.78 rows=1)
                 -> Filter: (t3.col_int is null)  (cost=0.78 rows=1)
                     -> Nested loop left join  (cost=0.78 rows=1)
-                        -> Index lookup on t1 using col_int_key (col_int_key=<cache>(t4.col_int_key))  (cost=0.37 rows=1)
+                        -> Covering index lookup on t1 using col_int_key (col_int_key=<cache>(t4.col_int_key))  (cost=0.37 rows=1)
                         -> Nested loop inner join  (cost=1.03 rows=1)
                             -> Single-row index lookup on t2 using PRIMARY (pk=t1.pk)  (cost=0.34 rows=1)
                             -> Index lookup on t3 using col_int_key (col_int_key=t2.col_int)  (cost=0.27 rows=1)
diff -Nru mysql-8.0-8.0.26/mysql-test/r/subquery_sj_none_bka.result mysql-8.0-8.0.27/mysql-test/r/subquery_sj_none_bka.result
--- mysql-8.0-8.0.26/mysql-test/r/subquery_sj_none_bka.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/subquery_sj_none_bka.result	2021-09-28 11:46:34.000000000 +0000
@@ -4268,7 +4268,7 @@
             -> Nested loop inner join  (cost=0.71 rows=1)
                 -> Filter: ((t1.kp1 < 20) and (t1.c is not null))  (cost=0.36 rows=1)
                     -> Index lookup on t1 using kp1 (kp1=<cache>(t3.a))  (cost=0.36 rows=1)
-                -> Single-row index lookup on t4 using PRIMARY (pk=t1.c)  (cost=0.35 rows=1)
+                -> Single-row covering index lookup on t4 using PRIMARY (pk=t1.c)  (cost=0.35 rows=1)
 
 select * from t3 where a in 
 (select t1.kp1 from t1,t4 where kp1<20 and t4.pk=t1.c);
@@ -4895,6 +4895,11 @@
 (concat('1 - 03', repeat('x', @suffix_len)), concat('2 - 03', repeat('x', @suffix_len)));
 insert into t3_16 values
 (concat('1 - 04', repeat('x', @suffix_len)), concat('2 - 04', repeat('x', @suffix_len)));
+ANALYZE TABLE t1_16, t2_16, t3_16;
+Table	Op	Msg_type	Msg_text
+test.t1_16	analyze	status	OK
+test.t2_16	analyze	status	OK
+test.t3_16	analyze	status	OK
 explain select left(a1,7), left(a2,7)
 from t1_16
 where a1 in (select b1 from t2_16 where b1 > '0');
@@ -4985,6 +4990,11 @@
 insert into t3 values ('1 - 06', '2 - 06');
 insert into t3 values ('1 - 07', '2 - 07');
 insert into t3 values ('1 - 08', '2 - 08');
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 explain
 select * from t1
 where concat(a1,'x') IN
@@ -7077,7 +7087,7 @@
 2	DEPENDENT SUBQUERY	a	NULL	unique_subquery	PRIMARY	PRIMARY	4	func	1	100.00	Using where; Using index
 4	DEPENDENT SUBQUERY	t1	NULL	unique_subquery	PRIMARY	PRIMARY	4	func	1	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `t1`.`t1field` AS `t1field` from `test`.`t1` where <in_optimizer>(`t1`.`t1field`,<exists>(<primary_index_lookup>(<cache>(`t1`.`t1field`) in t1 on PRIMARY where <in_optimizer>(`test`.`a`.`t1field`,<exists>(<primary_index_lookup>(<cache>(`test`.`a`.`t1field`) in t1 on PRIMARY))))))
+Note	1003	/* select#1 */ select `test`.`t1`.`t1field` AS `t1field` from `test`.`t1` where <in_optimizer>(`test`.`t1`.`t1field`,<exists>(<primary_index_lookup>(<cache>(`test`.`t1`.`t1field`) in t1 on PRIMARY where <in_optimizer>(`test`.`a`.`t1field`,<exists>(<primary_index_lookup>(<cache>(`test`.`a`.`t1field`) in t1 on PRIMARY))))))
 SELECT t1.t1field
 FROM t1 LEFT JOIN t1 AS t2 ON t1.t1field IN (SELECT v1field FROM v1);
 t1field
@@ -7094,7 +7104,7 @@
 2	DEPENDENT SUBQUERY	a	NULL	unique_subquery	PRIMARY	PRIMARY	4	func	1	100.00	Using where; Using index
 4	DEPENDENT SUBQUERY	t1	NULL	unique_subquery	PRIMARY	PRIMARY	4	func	1	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `t1`.`t1field` AS `t1field` from `test`.`t1` where <in_optimizer>(`t1`.`t1field`,<exists>(<primary_index_lookup>(<cache>(`t1`.`t1field`) in t1 on PRIMARY where <in_optimizer>(`test`.`a`.`t1field`,<exists>(<primary_index_lookup>(<cache>(`test`.`a`.`t1field`) in t1 on PRIMARY))))))
+Note	1003	/* select#1 */ select `test`.`t1`.`t1field` AS `t1field` from `test`.`t1` where <in_optimizer>(`test`.`t1`.`t1field`,<exists>(<primary_index_lookup>(<cache>(`test`.`t1`.`t1field`) in t1 on PRIMARY where <in_optimizer>(`test`.`a`.`t1field`,<exists>(<primary_index_lookup>(<cache>(`test`.`a`.`t1field`) in t1 on PRIMARY))))))
 CREATE PROCEDURE p1() 
 BEGIN 
 SELECT t1field
@@ -7162,6 +7172,11 @@
 INSERT INTO works VALUES  ('E4','P2',20);
 INSERT INTO works VALUES  ('E4','P4',40);
 INSERT INTO works VALUES  ('E4','P5',80);
+ANALYZE TABLE staff, proj, works;
+Table	Op	Msg_type	Msg_text
+test.staff	analyze	status	OK
+test.proj	analyze	status	OK
+test.works	analyze	status	OK
 explain SELECT EMPNUM, EMPNAME
 FROM staff
 WHERE EMPNUM IN
@@ -7482,6 +7497,11 @@
 INSERT INTO t3 VALUES  ('E4','P4',40);
 INSERT INTO t3 VALUES  ('E4','P5',80);
 CREATE UNIQUE INDEX t1_IDX ON t1(EMPNUM);
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7526,6 +7546,9 @@
 DEALLOCATE PREPARE stmt;
 DROP INDEX t1_IDX ON t1;
 CREATE INDEX t1_IDX ON t1(EMPNUM);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7536,7 +7559,7 @@
 FROM t2
 WHERE PTYPE = 'Design'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Using where
+1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	100.00	Using where
 2	DEPENDENT SUBQUERY	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
 3	DEPENDENT SUBQUERY	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 Warnings:
@@ -7552,7 +7575,7 @@
         WHERE PTYPE = 'Design'))";
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Using where
+1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	100.00	Using where
 2	DEPENDENT SUBQUERY	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
 3	DEPENDENT SUBQUERY	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 Warnings:
@@ -7562,13 +7585,16 @@
 
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Using where
+1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	100.00	Using where
 2	DEPENDENT SUBQUERY	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
 3	DEPENDENT SUBQUERY	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` where <in_optimizer>(`test`.`t1`.`EMPNUM`,<exists>(/* select#2 */ select `test`.`t3`.`EMPNUM` from `test`.`t3` where (<in_optimizer>(`test`.`t3`.`PNUM`,<exists>(/* select#3 */ select `test`.`t2`.`PNUM` from `test`.`t2` where ((`test`.`t2`.`PTYPE` = 'Design') and (<cache>(`test`.`t3`.`PNUM`) = `test`.`t2`.`PNUM`)))) and (<cache>(`test`.`t1`.`EMPNUM`) = `test`.`t3`.`EMPNUM`))))
 DEALLOCATE PREPARE stmt;
 DROP INDEX t1_IDX ON t1;
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7579,7 +7605,7 @@
 FROM t2
 WHERE PTYPE = 'Design'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Using where
+1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	100.00	Using where
 2	DEPENDENT SUBQUERY	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
 3	DEPENDENT SUBQUERY	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 Warnings:
@@ -7595,7 +7621,7 @@
         WHERE PTYPE = 'Design'))";
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Using where
+1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	100.00	Using where
 2	DEPENDENT SUBQUERY	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
 3	DEPENDENT SUBQUERY	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 Warnings:
@@ -7605,7 +7631,7 @@
 
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Using where
+1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	100.00	Using where
 2	DEPENDENT SUBQUERY	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
 3	DEPENDENT SUBQUERY	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 Warnings:
@@ -8229,6 +8255,12 @@
 create table t2 as select * from t1;
 create table t3 (pk int, a int, primary key(pk));
 insert into t3 select a,a from t0;
+ANALYZE TABLE t0, t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t0	analyze	status	OK
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 explain 
 select * from t1 left join t2 on (t2.a= t1.a and t2.a in (select pk from t3));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -11070,7 +11102,7 @@
 4	DEPENDENT SUBQUERY	subquery1_t3	NULL	ref	col_varchar_key	col_varchar_key	7	test.subquery1_t2.col_varchar_nokey	1	10.00	Using where
 4	DEPENDENT SUBQUERY	subquery1_t1	NULL	index	PRIMARY	col_int_key	5	NULL	20	100.00	Using where; Using index; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `table2`.`col_varchar_nokey` AS `field1` from `test`.`t2` `table1` join `test`.`t1` `table2` straight_join `test`.`t2` `table3` where ((`table3`.`col_int_key` = `table2`.`pk`) and <in_optimizer>(`table2`.`pk`,<exists>(/* select#3 */ select `subquery2_t1`.`col_int_key` AS `subquery2_field1` from `test`.`t3` `subquery2_t2` join `test`.`t1` `subquery2_t3` join `test`.`t2` `subquery2_t1` where ((`subquery2_t2`.`col_varchar_key` = `subquery2_t3`.`col_varchar_key`) and (`subquery2_t2`.`pk` = `subquery2_t3`.`pk`) and (<cache>(`table3`.`col_int_key`) = `subquery2_t1`.`col_int_key`)))) and <in_optimizer>(`table3`.`col_int_nokey`,<exists>(/* select#4 */ select `subquery1_t2`.`col_int_nokey` AS `subquery1_field1` from `test`.`t1` `subquery1_t2` join `test`.`t1` `subquery1_t3` join `test`.`t2` `subquery1_t1` where ((`subquery1_t3`.`col_int_key` = `subquery1_t2`.`pk`) and (`subquery1_t3`.`col_varchar_key` = `subquery1_t2`.`col_varchar_nokey`) and (`subquery1_t1`.`pk` > 1) and (<cache>(`table3`.`col_int_nokey`) = `subquery1_t2`.`col_int_nokey`)))))
+Note	1003	/* select#1 */ select `test`.`table2`.`col_varchar_nokey` AS `field1` from `test`.`t2` `table1` join `test`.`t1` `table2` straight_join `test`.`t2` `table3` where ((`test`.`table3`.`col_int_key` = `test`.`table2`.`pk`) and <in_optimizer>(`test`.`table2`.`pk`,<exists>(/* select#3 */ select `test`.`subquery2_t1`.`col_int_key` AS `subquery2_field1` from `test`.`t3` `subquery2_t2` join `test`.`t1` `subquery2_t3` join `test`.`t2` `subquery2_t1` where ((`test`.`subquery2_t2`.`col_varchar_key` = `test`.`subquery2_t3`.`col_varchar_key`) and (`test`.`subquery2_t2`.`pk` = `test`.`subquery2_t3`.`pk`) and (<cache>(`test`.`table3`.`col_int_key`) = `test`.`subquery2_t1`.`col_int_key`)))) and <in_optimizer>(`test`.`table3`.`col_int_nokey`,<exists>(/* select#4 */ select `test`.`subquery1_t2`.`col_int_nokey` AS `subquery1_field1` from `test`.`t1` `subquery1_t2` join `test`.`t1` `subquery1_t3` join `test`.`t2` `subquery1_t1` where ((`test`.`subquery1_t3`.`col_int_key` = `test`.`subquery1_t2`.`pk`) and (`test`.`subquery1_t3`.`col_varchar_key` = `test`.`subquery1_t2`.`col_varchar_nokey`) and (`test`.`subquery1_t1`.`pk` > 1) and (<cache>(`test`.`table3`.`col_int_nokey`) = `test`.`subquery1_t2`.`col_int_nokey`)))))
 SELECT * FROM v1;
 field1
 v
@@ -13112,7 +13144,7 @@
             -> Limit: 1 row(s)  (cost=0.78 rows=1)
                 -> Filter: (t3.col_int is null)  (cost=0.78 rows=1)
                     -> Nested loop left join  (cost=0.78 rows=1)
-                        -> Index lookup on t1 using col_int_key (col_int_key=<cache>(t4.col_int_key))  (cost=0.37 rows=1)
+                        -> Covering index lookup on t1 using col_int_key (col_int_key=<cache>(t4.col_int_key))  (cost=0.37 rows=1)
                         -> Nested loop inner join  (cost=1.03 rows=1)
                             -> Single-row index lookup on t2 using PRIMARY (pk=t1.pk)  (cost=0.34 rows=1)
                             -> Index lookup on t3 using col_int_key (col_int_key=t2.col_int)  (cost=0.27 rows=1)
diff -Nru mysql-8.0-8.0.26/mysql-test/r/subquery_sj_none.result mysql-8.0-8.0.27/mysql-test/r/subquery_sj_none.result
--- mysql-8.0-8.0.26/mysql-test/r/subquery_sj_none.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/subquery_sj_none.result	2021-09-28 11:46:34.000000000 +0000
@@ -4267,7 +4267,7 @@
             -> Nested loop inner join  (cost=0.71 rows=1)
                 -> Filter: ((t1.kp1 < 20) and (t1.c is not null))  (cost=0.36 rows=1)
                     -> Index lookup on t1 using kp1 (kp1=<cache>(t3.a))  (cost=0.36 rows=1)
-                -> Single-row index lookup on t4 using PRIMARY (pk=t1.c)  (cost=0.35 rows=1)
+                -> Single-row covering index lookup on t4 using PRIMARY (pk=t1.c)  (cost=0.35 rows=1)
 
 select * from t3 where a in 
 (select t1.kp1 from t1,t4 where kp1<20 and t4.pk=t1.c);
@@ -4894,6 +4894,11 @@
 (concat('1 - 03', repeat('x', @suffix_len)), concat('2 - 03', repeat('x', @suffix_len)));
 insert into t3_16 values
 (concat('1 - 04', repeat('x', @suffix_len)), concat('2 - 04', repeat('x', @suffix_len)));
+ANALYZE TABLE t1_16, t2_16, t3_16;
+Table	Op	Msg_type	Msg_text
+test.t1_16	analyze	status	OK
+test.t2_16	analyze	status	OK
+test.t3_16	analyze	status	OK
 explain select left(a1,7), left(a2,7)
 from t1_16
 where a1 in (select b1 from t2_16 where b1 > '0');
@@ -4984,6 +4989,11 @@
 insert into t3 values ('1 - 06', '2 - 06');
 insert into t3 values ('1 - 07', '2 - 07');
 insert into t3 values ('1 - 08', '2 - 08');
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 explain
 select * from t1
 where concat(a1,'x') IN
@@ -7076,7 +7086,7 @@
 2	DEPENDENT SUBQUERY	a	NULL	unique_subquery	PRIMARY	PRIMARY	4	func	1	100.00	Using where; Using index
 4	DEPENDENT SUBQUERY	t1	NULL	unique_subquery	PRIMARY	PRIMARY	4	func	1	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `t1`.`t1field` AS `t1field` from `test`.`t1` where <in_optimizer>(`t1`.`t1field`,<exists>(<primary_index_lookup>(<cache>(`t1`.`t1field`) in t1 on PRIMARY where <in_optimizer>(`test`.`a`.`t1field`,<exists>(<primary_index_lookup>(<cache>(`test`.`a`.`t1field`) in t1 on PRIMARY))))))
+Note	1003	/* select#1 */ select `test`.`t1`.`t1field` AS `t1field` from `test`.`t1` where <in_optimizer>(`test`.`t1`.`t1field`,<exists>(<primary_index_lookup>(<cache>(`test`.`t1`.`t1field`) in t1 on PRIMARY where <in_optimizer>(`test`.`a`.`t1field`,<exists>(<primary_index_lookup>(<cache>(`test`.`a`.`t1field`) in t1 on PRIMARY))))))
 SELECT t1.t1field
 FROM t1 LEFT JOIN t1 AS t2 ON t1.t1field IN (SELECT v1field FROM v1);
 t1field
@@ -7093,7 +7103,7 @@
 2	DEPENDENT SUBQUERY	a	NULL	unique_subquery	PRIMARY	PRIMARY	4	func	1	100.00	Using where; Using index
 4	DEPENDENT SUBQUERY	t1	NULL	unique_subquery	PRIMARY	PRIMARY	4	func	1	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `t1`.`t1field` AS `t1field` from `test`.`t1` where <in_optimizer>(`t1`.`t1field`,<exists>(<primary_index_lookup>(<cache>(`t1`.`t1field`) in t1 on PRIMARY where <in_optimizer>(`test`.`a`.`t1field`,<exists>(<primary_index_lookup>(<cache>(`test`.`a`.`t1field`) in t1 on PRIMARY))))))
+Note	1003	/* select#1 */ select `test`.`t1`.`t1field` AS `t1field` from `test`.`t1` where <in_optimizer>(`test`.`t1`.`t1field`,<exists>(<primary_index_lookup>(<cache>(`test`.`t1`.`t1field`) in t1 on PRIMARY where <in_optimizer>(`test`.`a`.`t1field`,<exists>(<primary_index_lookup>(<cache>(`test`.`a`.`t1field`) in t1 on PRIMARY))))))
 CREATE PROCEDURE p1() 
 BEGIN 
 SELECT t1field
@@ -7161,6 +7171,11 @@
 INSERT INTO works VALUES  ('E4','P2',20);
 INSERT INTO works VALUES  ('E4','P4',40);
 INSERT INTO works VALUES  ('E4','P5',80);
+ANALYZE TABLE staff, proj, works;
+Table	Op	Msg_type	Msg_text
+test.staff	analyze	status	OK
+test.proj	analyze	status	OK
+test.works	analyze	status	OK
 explain SELECT EMPNUM, EMPNAME
 FROM staff
 WHERE EMPNUM IN
@@ -7481,6 +7496,11 @@
 INSERT INTO t3 VALUES  ('E4','P4',40);
 INSERT INTO t3 VALUES  ('E4','P5',80);
 CREATE UNIQUE INDEX t1_IDX ON t1(EMPNUM);
+ANALYZE TABLE t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7525,6 +7545,9 @@
 DEALLOCATE PREPARE stmt;
 DROP INDEX t1_IDX ON t1;
 CREATE INDEX t1_IDX ON t1(EMPNUM);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7535,7 +7558,7 @@
 FROM t2
 WHERE PTYPE = 'Design'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Using where
+1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	100.00	Using where
 2	DEPENDENT SUBQUERY	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
 3	DEPENDENT SUBQUERY	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 Warnings:
@@ -7551,7 +7574,7 @@
         WHERE PTYPE = 'Design'))";
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Using where
+1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	100.00	Using where
 2	DEPENDENT SUBQUERY	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
 3	DEPENDENT SUBQUERY	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 Warnings:
@@ -7561,13 +7584,16 @@
 
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Using where
+1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	100.00	Using where
 2	DEPENDENT SUBQUERY	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
 3	DEPENDENT SUBQUERY	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`EMPNAME` AS `EMPNAME` from `test`.`t1` where <in_optimizer>(`test`.`t1`.`EMPNUM`,<exists>(/* select#2 */ select `test`.`t3`.`EMPNUM` from `test`.`t3` where (<in_optimizer>(`test`.`t3`.`PNUM`,<exists>(/* select#3 */ select `test`.`t2`.`PNUM` from `test`.`t2` where ((`test`.`t2`.`PTYPE` = 'Design') and (<cache>(`test`.`t3`.`PNUM`) = `test`.`t2`.`PNUM`)))) and (<cache>(`test`.`t1`.`EMPNUM`) = `test`.`t3`.`EMPNUM`))))
 DEALLOCATE PREPARE stmt;
 DROP INDEX t1_IDX ON t1;
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN SELECT EMPNAME
 FROM t1
 WHERE EMPNUM IN
@@ -7578,7 +7604,7 @@
 FROM t2
 WHERE PTYPE = 'Design'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Using where
+1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	100.00	Using where
 2	DEPENDENT SUBQUERY	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
 3	DEPENDENT SUBQUERY	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 Warnings:
@@ -7594,7 +7620,7 @@
         WHERE PTYPE = 'Design'))";
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Using where
+1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	100.00	Using where
 2	DEPENDENT SUBQUERY	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
 3	DEPENDENT SUBQUERY	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 Warnings:
@@ -7604,7 +7630,7 @@
 
 EXECUTE stmt;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	1	100.00	Using where
+1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	5	100.00	Using where
 2	DEPENDENT SUBQUERY	t3	NULL	ALL	NULL	NULL	NULL	NULL	12	10.00	Using where
 3	DEPENDENT SUBQUERY	t2	NULL	ALL	NULL	NULL	NULL	NULL	6	16.67	Using where
 Warnings:
@@ -8228,6 +8254,12 @@
 create table t2 as select * from t1;
 create table t3 (pk int, a int, primary key(pk));
 insert into t3 select a,a from t0;
+ANALYZE TABLE t0, t1, t2, t3;
+Table	Op	Msg_type	Msg_text
+test.t0	analyze	status	OK
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+test.t3	analyze	status	OK
 explain 
 select * from t1 left join t2 on (t2.a= t1.a and t2.a in (select pk from t3));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -11069,7 +11101,7 @@
 4	DEPENDENT SUBQUERY	subquery1_t3	NULL	ref	col_varchar_key	col_varchar_key	7	test.subquery1_t2.col_varchar_nokey	1	10.00	Using where
 4	DEPENDENT SUBQUERY	subquery1_t1	NULL	index	PRIMARY	col_int_key	5	NULL	20	100.00	Using where; Using index; Using join buffer (hash join)
 Warnings:
-Note	1003	/* select#1 */ select `table2`.`col_varchar_nokey` AS `field1` from `test`.`t2` `table1` join `test`.`t1` `table2` straight_join `test`.`t2` `table3` where ((`table3`.`col_int_key` = `table2`.`pk`) and <in_optimizer>(`table2`.`pk`,<exists>(/* select#3 */ select `subquery2_t1`.`col_int_key` AS `subquery2_field1` from `test`.`t3` `subquery2_t2` join `test`.`t1` `subquery2_t3` join `test`.`t2` `subquery2_t1` where ((`subquery2_t2`.`col_varchar_key` = `subquery2_t3`.`col_varchar_key`) and (`subquery2_t2`.`pk` = `subquery2_t3`.`pk`) and (<cache>(`table3`.`col_int_key`) = `subquery2_t1`.`col_int_key`)))) and <in_optimizer>(`table3`.`col_int_nokey`,<exists>(/* select#4 */ select `subquery1_t2`.`col_int_nokey` AS `subquery1_field1` from `test`.`t1` `subquery1_t2` join `test`.`t1` `subquery1_t3` join `test`.`t2` `subquery1_t1` where ((`subquery1_t3`.`col_int_key` = `subquery1_t2`.`pk`) and (`subquery1_t3`.`col_varchar_key` = `subquery1_t2`.`col_varchar_nokey`) and (`subquery1_t1`.`pk` > 1) and (<cache>(`table3`.`col_int_nokey`) = `subquery1_t2`.`col_int_nokey`)))))
+Note	1003	/* select#1 */ select `test`.`table2`.`col_varchar_nokey` AS `field1` from `test`.`t2` `table1` join `test`.`t1` `table2` straight_join `test`.`t2` `table3` where ((`test`.`table3`.`col_int_key` = `test`.`table2`.`pk`) and <in_optimizer>(`test`.`table2`.`pk`,<exists>(/* select#3 */ select `test`.`subquery2_t1`.`col_int_key` AS `subquery2_field1` from `test`.`t3` `subquery2_t2` join `test`.`t1` `subquery2_t3` join `test`.`t2` `subquery2_t1` where ((`test`.`subquery2_t2`.`col_varchar_key` = `test`.`subquery2_t3`.`col_varchar_key`) and (`test`.`subquery2_t2`.`pk` = `test`.`subquery2_t3`.`pk`) and (<cache>(`test`.`table3`.`col_int_key`) = `test`.`subquery2_t1`.`col_int_key`)))) and <in_optimizer>(`test`.`table3`.`col_int_nokey`,<exists>(/* select#4 */ select `test`.`subquery1_t2`.`col_int_nokey` AS `subquery1_field1` from `test`.`t1` `subquery1_t2` join `test`.`t1` `subquery1_t3` join `test`.`t2` `subquery1_t1` where ((`test`.`subquery1_t3`.`col_int_key` = `test`.`subquery1_t2`.`pk`) and (`test`.`subquery1_t3`.`col_varchar_key` = `test`.`subquery1_t2`.`col_varchar_nokey`) and (`test`.`subquery1_t1`.`pk` > 1) and (<cache>(`test`.`table3`.`col_int_nokey`) = `test`.`subquery1_t2`.`col_int_nokey`)))))
 SELECT * FROM v1;
 field1
 v
@@ -13111,7 +13143,7 @@
             -> Limit: 1 row(s)  (cost=0.78 rows=1)
                 -> Filter: (t3.col_int is null)  (cost=0.78 rows=1)
                     -> Nested loop left join  (cost=0.78 rows=1)
-                        -> Index lookup on t1 using col_int_key (col_int_key=<cache>(t4.col_int_key))  (cost=0.37 rows=1)
+                        -> Covering index lookup on t1 using col_int_key (col_int_key=<cache>(t4.col_int_key))  (cost=0.37 rows=1)
                         -> Nested loop inner join  (cost=1.03 rows=1)
                             -> Single-row index lookup on t2 using PRIMARY (pk=t1.pk)  (cost=0.34 rows=1)
                             -> Index lookup on t3 using col_int_key (col_int_key=t2.col_int)  (cost=0.27 rows=1)
diff -Nru mysql-8.0-8.0.26/mysql-test/r/subselect_debug.result mysql-8.0-8.0.27/mysql-test/r/subselect_debug.result
--- mysql-8.0-8.0.26/mysql-test/r/subselect_debug.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/subselect_debug.result	2021-09-28 11:46:34.000000000 +0000
@@ -74,3 +74,23 @@
 SET DEBUG='-d,create_duplicate_weedout_tmp_table_error';
 DROP TABLE t;
 SET optimizer_switch = DEFAULT;
+#
+# Bug#31117893 - GROUP BY WILL THROW TABLE IS
+#   FULL WHEN TEMPTABLE MEMORY ALLOCATION EXCEED LIMIT
+#
+CREATE TABLE t1(
+id INT,
+pad VARCHAR(60),
+pad1 VARCHAR(513)
+);
+INSERT INTO t1 VALUES (1, REPEAT('a',59), REPEAT('a',512));
+INSERT INTO t1 VALUES (2, REPEAT('a',59), REPEAT('a',512));
+SET SESSION debug = '+d, simulate_temp_storage_engine_full';
+SELECT COUNT(*), pad FROM t1 GROUP BY pad;
+COUNT(*)	pad
+2	aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+SELECT COUNT(*), pad1 FROM t1 GROUP BY pad1;
+COUNT(*)	pad1
+2	aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+SET SESSION debug = '-d, simulate_temp_storage_engine_full';
+DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/system_tables_myisam_lctn_1.result mysql-8.0-8.0.27/mysql-test/r/system_tables_myisam_lctn_1.result
--- mysql-8.0-8.0.26/mysql-test/r/system_tables_myisam_lctn_1.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/system_tables_myisam_lctn_1.result	2021-09-28 11:46:34.000000000 +0000
@@ -16,7 +16,8 @@
 SELECT UPPER(concat(table_schema, ".", table_name))
 FROM INFORMATION_SCHEMA.tables WHERE table_schema =
 'mysql' AND table_name NOT IN('general_log', 'slow_log',
-'ndb_binlog_index');
+'ndb_binlog_index')
+ORDER BY table_name;
 #-----------------------------------------------------------------------
 # Test case to verify altering system table's engine to MyISAM. Changing
 # system table's engine to MyISAM is not allowed.
diff -Nru mysql-8.0-8.0.26/mysql-test/r/system_tables_myisam_lctn_2.result mysql-8.0-8.0.27/mysql-test/r/system_tables_myisam_lctn_2.result
--- mysql-8.0-8.0.26/mysql-test/r/system_tables_myisam_lctn_2.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/system_tables_myisam_lctn_2.result	2021-09-28 11:46:34.000000000 +0000
@@ -17,7 +17,8 @@
 SELECT UPPER(concat(table_schema, ".", table_name))
 FROM INFORMATION_SCHEMA.tables WHERE table_schema =
 'mysql' AND table_name NOT IN('general_log', 'slow_log',
-'ndb_binlog_index');
+'ndb_binlog_index')
+ORDER BY table_name;
 #-----------------------------------------------------------------------
 # Test case to verify altering system table's engine to MyISAM. Changing
 # system table's engine to MyISAM is not allowed.
diff -Nru mysql-8.0-8.0.26/mysql-test/r/system_tables_myisam.result mysql-8.0-8.0.27/mysql-test/r/system_tables_myisam.result
--- mysql-8.0-8.0.26/mysql-test/r/system_tables_myisam.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/system_tables_myisam.result	2021-09-28 11:46:34.000000000 +0000
@@ -16,7 +16,8 @@
 SELECT concat(table_schema, ".", table_name)
 FROM INFORMATION_SCHEMA.tables WHERE table_schema =
 'mysql' AND table_name NOT IN('general_log', 'slow_log',
-'ndb_binlog_index');
+'ndb_binlog_index')
+ORDER BY table_name;
 #-----------------------------------------------------------------------
 # Test case to verify altering system table's engine to MyISAM. Changing
 # system table's engine to MyISAM is not allowed.
diff -Nru mysql-8.0-8.0.26/mysql-test/r/table_value_constructor.result mysql-8.0-8.0.27/mysql-test/r/table_value_constructor.result
--- mysql-8.0-8.0.26/mysql-test/r/table_value_constructor.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/table_value_constructor.result	2021-09-28 11:46:34.000000000 +0000
@@ -655,3 +655,10 @@
 column_0	column_1
 1	9
 2	4
+# Bug#32783943: Item_field::fix_outer_field: assertion `cur_query_block
+CREATE TABLE t (w INTEGER);
+SELECT (VALUES ROW(1) ORDER BY t) AS a FROM t;
+ERROR 42S22: Unknown column 't' in 'order clause'
+SELECT (VALUES ROW(1) ORDER BY w) AS a FROM t;
+a
+DROP TABLE t;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/transactional_acl_tables.result mysql-8.0-8.0.27/mysql-test/r/transactional_acl_tables.result
--- mysql-8.0-8.0.26/mysql-test/r/transactional_acl_tables.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/transactional_acl_tables.result	2021-09-28 11:46:34.000000000 +0000
@@ -1251,7 +1251,7 @@
 SHOW GRANTS FOR u1@h;
 Grants for u1@h
 GRANT USAGE ON *.* TO `u1`@`h`
-GRANT PROXY ON 'plug_dest'@'%' TO 'u1'@'h'
+GRANT PROXY ON `plug_dest`@`%` TO `u1`@`h`
 SET debug="-d,wl7158_replace_proxies_priv_table_3";
 SET debug="+d,wl7158_replace_proxies_priv_table_4";
 REVOKE PROXY ON plug_dest FROM u1@h;
@@ -1262,7 +1262,7 @@
 SHOW GRANTS FOR u1@h;
 Grants for u1@h
 GRANT USAGE ON *.* TO `u1`@`h`
-GRANT PROXY ON 'plug_dest'@'%' TO 'u1'@'h'
+GRANT PROXY ON `plug_dest`@`%` TO `u1`@`h`
 SET debug="-d,wl7158_replace_proxies_priv_table_4";
 DROP USER u1@h;
 CREATE TABLE t1 (a INT);
diff -Nru mysql-8.0-8.0.26/mysql-test/r/type_binary.result mysql-8.0-8.0.27/mysql-test/r/type_binary.result
--- mysql-8.0-8.0.26/mysql-test/r/type_binary.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/type_binary.result	2021-09-28 11:46:34.000000000 +0000
@@ -162,7 +162,7 @@
 Warning	1292	Truncated incorrect INTEGER value: '9999999999999999999999999999999999999999999'
 select convert(0x9999999999999999999999999999999999999999999,unsigned);
 convert(0x9999999999999999999999999999999999999999999,unsigned)
-18446744073709551615
+0
 Warnings:
 Warning	1292	Truncated incorrect BINARY value: 'x'09999999999999999999999999999999999999999999''
 # and an error in strict mode
@@ -182,7 +182,7 @@
 Warning	1292	Truncated incorrect INTEGER value: '9999999999999999999999999999999999999999999'
 select 0x9999999999999999999999999999999999999999999 | 0;
 0x9999999999999999999999999999999999999999999 | 0
-18446744073709551615
+0
 Warnings:
 Warning	1292	Truncated incorrect BINARY value: 'x'09999999999999999999999999999999999999999999''
 # DECIMAL addition, no warning
@@ -196,13 +196,13 @@
 # BIGINT UNSIGNED addition, warning
 select 0x9999999999999999999999999999999999999999999 + 0;
 0x9999999999999999999999999999999999999999999 + 0
-18446744073709551615
+0
 Warnings:
 Warning	1292	Truncated incorrect BINARY value: 'x'09999999999999999999999999999999999999999999''
 # Test truncation inside error message
 select 0x9999999999999999999999999999999999999999999888888888888888888888888888888888888888888888888888888888888888888888888877777777777777777777777777777777777777777777777777777777777776666666666666666666666666666666666666666 + 0;
 0x9999999999999999999999999999999999999999999888888888888888888888888888888888888888888888888888888888888888888888888877777777777777777777777777777777777777777777777777777777777776666666666666666666666666666666666666666 + 0
-18446744073709551615
+0
 Warnings:
 Warning	1292	Truncated incorrect BINARY value: 'x'099999999999999999999999999999999999999999998888888888888888888888888888888888888888888888888888888888888888888888888777777777'
 create table t1 select 0x9999 + 0;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/type_blob.result mysql-8.0-8.0.27/mysql-test/r/type_blob.result
--- mysql-8.0-8.0.26/mysql-test/r/type_blob.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/type_blob.result	2021-09-28 11:46:34.000000000 +0000
@@ -925,20 +925,9 @@
 CREATE TABLE b15776 (a year(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999));
 ERROR HY000: Invalid display width. Use YEAR instead.
 CREATE TABLE b15776 select cast(null as char(4294967295));
-Warnings:
-Warning	1301	Result of cast_as_char() was larger than max_allowed_packet (67108864) - truncated
-show columns from b15776;
-Field	Type	Null	Key	Default	Extra
-cast(null as char(4294967295))	longtext	YES		NULL	
-drop table b15776;
+ERROR 22003: char(n) value is out of range in 'cast_as_char'
 CREATE TABLE b15776 select cast(null as nchar(4294967295));
-Warnings:
-Warning	3720	NATIONAL/NCHAR/NVARCHAR implies the character set UTF8MB3, which will be replaced by UTF8MB4 in a future release. Please consider using CHAR(x) CHARACTER SET UTF8MB4 in order to be unambiguous.
-Warning	1301	Result of cast_as_char() was larger than max_allowed_packet (67108864) - truncated
-show columns from b15776;
-Field	Type	Null	Key	Default	Extra
-cast(null as nchar(4294967295))	longtext	YES		NULL	
-drop table b15776;
+ERROR 22003: char(n) value is out of range in 'cast_as_char'
 CREATE TABLE b15776 select cast(null as binary(4294967295));
 Warnings:
 Warning	1301	Result of cast_as_binary() was larger than max_allowed_packet (67108864) - truncated
@@ -947,16 +936,9 @@
 cast(null as binary(4294967295))	longblob	YES		NULL	
 drop table b15776;
 explain select cast(1 as char(4294967295));
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-Warnings:
-Note	1003	/* select#1 */ select cast(1 as char(4294967295) charset utf8mb4) AS `cast(1 as char(4294967295))`
+ERROR 22003: char(n) value is out of range in 'cast_as_char'
 explain select cast(1 as nchar(4294967295));
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-Warnings:
-Warning	3720	NATIONAL/NCHAR/NVARCHAR implies the character set UTF8MB3, which will be replaced by UTF8MB4 in a future release. Please consider using CHAR(x) CHARACTER SET UTF8MB4 in order to be unambiguous.
-Note	1003	/* select#1 */ select cast(1 as char(4294967295) charset utf8mb3) AS `cast(1 as nchar(4294967295))`
+ERROR 22003: char(n) value is out of range in 'cast_as_char'
 explain select cast(1 as binary(4294967295));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
@@ -982,20 +964,13 @@
 explain select cast(1 as decimal(999999999999999999999999999999999999));
 Got one of the listed errors
 explain select convert(1, char(4294967295));
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-Warnings:
-Note	1003	/* select#1 */ select cast(1 as char(4294967295) charset utf8mb4) AS `convert(1, char(4294967295))`
+ERROR 22003: char(n) value is out of range in 'cast_as_char'
 explain select convert(1, char(4294967296));
 ERROR 42000: Display width out of range for column 'cast as char' (max = 4294967295)
 explain select convert(1, char(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999));
 ERROR 42000: Display width out of range for column 'cast as char' (max = 4294967295)
 explain select convert(1, nchar(4294967295));
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-Warnings:
-Warning	3720	NATIONAL/NCHAR/NVARCHAR implies the character set UTF8MB3, which will be replaced by UTF8MB4 in a future release. Please consider using CHAR(x) CHARACTER SET UTF8MB4 in order to be unambiguous.
-Note	1003	/* select#1 */ select cast(1 as char(4294967295) charset utf8mb3) AS `convert(1, nchar(4294967295))`
+ERROR 22003: char(n) value is out of range in 'cast_as_char'
 explain select convert(1, nchar(4294967296));
 ERROR 42000: Display width out of range for column 'cast as char' (max = 4294967295)
 explain select convert(1, nchar(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999));
diff -Nru mysql-8.0-8.0.26/mysql-test/r/type_newdecimal.result mysql-8.0-8.0.27/mysql-test/r/type_newdecimal.result
--- mysql-8.0-8.0.26/mysql-test/r/type_newdecimal.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/type_newdecimal.result	2021-09-28 11:46:34.000000000 +0000
@@ -2335,3 +2335,140 @@
 a
 0
 DROP TABLE t1;
+# Bug#32785804: Failure in decimal_intg
+CREATE TABLE t(a DECIMAL(10,4));
+INSERT INTO t VALUES(-1),(1),(100);
+SET @d:=' ';
+WITH RECURSIVE cte1 AS (
+SELECT a AS a1 FROM  t
+),
+cte2 AS (
+SELECT (0xfa > @d) AS a2 FROM t
+)
+SELECT cte1.a1
+FROM cte1,cte2
+WHERE cte1.a1 >= cte2.a2;
+ERROR HY000: Cannot convert string '\xFA' from binary to utf8mb4
+DROP TABLE t;
+# Bug#32802251: decimal_bin_size_inline: assertion `scale >= 0 &&
+#               precision > 0 && scale <= precision' failed
+CREATE TABLE t(a DECIMAL(14,14) DEFAULT NULL);
+INSERT INTO t VALUES
+(-0.99999999999999), (-0.99999999999999), (0.15610000000000);
+SELECT WEIGHT_STRING(TRUNCATE((SELECT a FROM t), -17410));
+WEIGHT_STRING(TRUNCATE((SELECT a FROM t), -17410))
+NULL
+DROP TABLE t;
+#
+# Bug#32345941 SELECT RESULT IS MISMATCH WHEN USE COALESCE AND NOT
+#
+SET sql_mode=default;
+SELECT 1.0 div (@a:='xx');
+1.0 div (@a:='xx')
+NULL
+Warnings:
+Warning	1287	Setting user variables within expressions is deprecated and will be removed in a future release. Consider alternatives: 'SET variable=expression, ...', or 'SELECT expression(s) INTO variables(s)'.
+Warning	1366	Incorrect DECIMAL value: '0' for column '' at row -1
+Warning	1365	Division by 0
+SELECT 1.0 div (@a:='1xx');
+1.0 div (@a:='1xx')
+1
+Warnings:
+Warning	1287	Setting user variables within expressions is deprecated and will be removed in a future release. Consider alternatives: 'SET variable=expression, ...', or 'SELECT expression(s) INTO variables(s)'.
+CREATE TABLE t1 (a DECIMAL(10,0), b DECIMAL(10,0), KEY(a)) ENGINE=INNODB;
+INSERT INTO t1 VALUES (0,0),(1,1);
+SELECT a FROM t1 FORCE INDEX(a) WHERE a='m';
+a
+0
+Warnings:
+Warning	1292	Truncated incorrect DECIMAL value: 'm'
+SELECT a FROM t1 FORCE INDEX(a) WHERE a=CONCAT('m');
+a
+0
+Warnings:
+Warning	1366	Incorrect decimal value: 'm' for column 'a' at row 1
+Warning	1366	Incorrect decimal value: 'm' for column 'a' at row 1
+Warning	1366	Incorrect decimal value: 'm' for column 'a' at row 1
+SELECT a FROM t1 FORCE INDEX(a) WHERE a=COALESCE('m');
+a
+0
+Warnings:
+Warning	1366	Incorrect decimal value: 'm' for column 'a' at row 1
+Warning	1366	Incorrect decimal value: 'm' for column 'a' at row 1
+Warning	1366	Incorrect decimal value: 'm' for column 'a' at row 1
+SELECT * FROM t1 WHERE b='m';
+a	b
+0	0
+Warnings:
+Warning	1292	Truncated incorrect DECIMAL value: 'm'
+SELECT * FROM t1 WHERE b=CONCAT('m');
+a	b
+0	0
+Warnings:
+Warning	1366	Incorrect DECIMAL value: '0' for column '' at row -1
+SELECT * FROM t1 WHERE b=COALESCE('m');
+a	b
+0	0
+Warnings:
+Warning	1366	Incorrect DECIMAL value: '0' for column '' at row -1
+SELECT a FROM t1 FORCE INDEX(a) WHERE a='';
+a
+0
+Warnings:
+Warning	1292	Truncated incorrect DECIMAL value: ''
+SELECT a FROM t1 FORCE INDEX(a) WHERE a=CONCAT('');
+a
+0
+Warnings:
+Warning	1366	Incorrect decimal value: '' for column 'a' at row 1
+Warning	1366	Incorrect decimal value: '' for column 'a' at row 1
+Warning	1366	Incorrect decimal value: '' for column 'a' at row 1
+SELECT a FROM t1 FORCE INDEX(a) WHERE a=COALESCE('');
+a
+0
+Warnings:
+Warning	1366	Incorrect decimal value: '' for column 'a' at row 1
+Warning	1366	Incorrect decimal value: '' for column 'a' at row 1
+Warning	1366	Incorrect decimal value: '' for column 'a' at row 1
+SELECT * FROM t1 WHERE b='';
+a	b
+0	0
+Warnings:
+Warning	1292	Truncated incorrect DECIMAL value: ''
+SELECT * FROM t1 WHERE b=CONCAT('');
+a	b
+0	0
+Warnings:
+Warning	1366	Incorrect DECIMAL value: '0' for column '' at row -1
+SELECT * FROM t1 WHERE b=COALESCE('');
+a	b
+0	0
+Warnings:
+Warning	1366	Incorrect DECIMAL value: '0' for column '' at row -1
+CREATE TEMPORARY TABLE tt1 AS SELECT * FROM t1 FORCE INDEX(a) WHERE a='m';
+ERROR 22007: Truncated incorrect DECIMAL value: 'm'
+CREATE TEMPORARY TABLE tt1 AS SELECT * FROM t1 FORCE INDEX(a) WHERE a=CONCAT('m');
+ERROR HY000: Incorrect decimal value: 'm' for column 'a' at row 1
+CREATE TEMPORARY TABLE tt1 AS SELECT * FROM t1 FORCE INDEX(a) WHERE a=COALESCE('m');
+ERROR HY000: Incorrect decimal value: 'm' for column 'a' at row 1
+CREATE TEMPORARY TABLE tt1 AS SELECT * FROM t1 WHERE b='m';
+ERROR 22007: Truncated incorrect DECIMAL value: 'm'
+CREATE TEMPORARY TABLE tt1 AS SELECT * FROM t1 WHERE b=CONCAT('m');
+ERROR HY000: Incorrect DECIMAL value: '0' for column '' at row -1
+CREATE TEMPORARY TABLE tt1 AS SELECT * FROM t1 WHERE b=COALESCE('m');
+ERROR HY000: Incorrect DECIMAL value: '0' for column '' at row -1
+CREATE TABLE t2 (a char(10), b varchar(10));
+INSERT INTO t2 VALUES('x1 y ', 'x1 y ');
+SELECT maketime(1, 2, a) FROM t2;
+maketime(1, 2, a)
+01:02:00.000000
+Warnings:
+Warning	1366	Incorrect DECIMAL value: '0' for column '' at row -1
+Warning	1292	Truncated incorrect DECIMAL value: 'x1 y'
+SELECT maketime(1, 2, b) FROM t2;
+maketime(1, 2, b)
+01:02:00.000000
+Warnings:
+Warning	1366	Incorrect DECIMAL value: '0' for column '' at row -1
+Warning	1292	Truncated incorrect DECIMAL value: 'x1 y '
+DROP TABLE t1, t2;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/type_ranges.result mysql-8.0-8.0.27/mysql-test/r/type_ranges.result
--- mysql-8.0-8.0.26/mysql-test/r/type_ranges.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/type_ranges.result	2021-09-28 11:46:34.000000000 +0000
@@ -297,6 +297,10 @@
 16	16
 drop table t2;
 create table t2 (primary key (auto)) select auto+1 as auto,1 as t1, 'a' as t2, repeat('a',256) as t3, binary repeat('b',256) as t4, repeat('a',4096) as t5, binary repeat('b',4096) as t6, '' as t7, binary '' as t8 from t1;
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 show full columns from t2;
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
 auto	int unsigned	NULL	NO	PRI	NULL		select,insert,update,references	
diff -Nru mysql-8.0-8.0.26/mysql-test/r/type_temporal_fractional.result mysql-8.0-8.0.27/mysql-test/r/type_temporal_fractional.result
--- mysql-8.0-8.0.26/mysql-test/r/type_temporal_fractional.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/type_temporal_fractional.result	2021-09-28 11:46:34.000000000 +0000
@@ -8443,6 +8443,9 @@
 2001-01-01 11:22:33.123000	2001-01-01 11:22:33.1230
 2001-01-01 11:22:33.123000	2001-01-01 11:22:33.12300
 2001-01-01 11:22:33.123000	2001-01-01 11:22:33.123000
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 ALTER TABLE t1 ADD KEY (a);
 SELECT * FROM t1, t2 WHERE a=b ORDER BY BINARY a, BINARY b;
 a	b
@@ -8458,6 +8461,9 @@
 2001-01-01 11:22:33.123000	2001-01-01 11:22:33.1230
 2001-01-01 11:22:33.123000	2001-01-01 11:22:33.12300
 2001-01-01 11:22:33.123000	2001-01-01 11:22:33.123000
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 ALTER TABLE t2 ADD KEY(b);
 SELECT * FROM t1, t2 WHERE a=b ORDER BY BINARY a, BINARY b;
 a	b
@@ -8473,6 +8479,9 @@
 2001-01-01 11:22:33.123000	2001-01-01 11:22:33.1230
 2001-01-01 11:22:33.123000	2001-01-01 11:22:33.12300
 2001-01-01 11:22:33.123000	2001-01-01 11:22:33.123000
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 ALTER TABLE t1 DROP KEY a;
 SELECT * FROM t1, t2 WHERE a=b ORDER BY BINARY a, BINARY b;
 a	b
@@ -8488,6 +8497,9 @@
 2001-01-01 11:22:33.123000	2001-01-01 11:22:33.1230
 2001-01-01 11:22:33.123000	2001-01-01 11:22:33.12300
 2001-01-01 11:22:33.123000	2001-01-01 11:22:33.123000
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1, t2;
 #
 # Testing arithmetic with INT, DECIMAL, FLOAT
@@ -13143,6 +13155,9 @@
 2001-01-01 11:22:33.123000	2001-01-01 11:22:33.1230
 2001-01-01 11:22:33.123000	2001-01-01 11:22:33.12300
 2001-01-01 11:22:33.123000	2001-01-01 11:22:33.123000
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 ALTER TABLE t1 ADD KEY (a);
 SELECT * FROM t1, t2 WHERE a=b ORDER BY BINARY a, BINARY b;
 a	b
@@ -13158,6 +13173,9 @@
 2001-01-01 11:22:33.123000	2001-01-01 11:22:33.1230
 2001-01-01 11:22:33.123000	2001-01-01 11:22:33.12300
 2001-01-01 11:22:33.123000	2001-01-01 11:22:33.123000
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 ALTER TABLE t2 ADD KEY (b);
 SELECT * FROM t1, t2 WHERE a=b ORDER BY BINARY a, BINARY b;
 a	b
@@ -13173,6 +13191,9 @@
 2001-01-01 11:22:33.123000	2001-01-01 11:22:33.1230
 2001-01-01 11:22:33.123000	2001-01-01 11:22:33.12300
 2001-01-01 11:22:33.123000	2001-01-01 11:22:33.123000
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 ALTER TABLE t1 DROP KEY a;
 SELECT * FROM t1, t2 WHERE a=b ORDER BY BINARY a, BINARY b;
 a	b
@@ -13188,6 +13209,9 @@
 2001-01-01 11:22:33.123000	2001-01-01 11:22:33.1230
 2001-01-01 11:22:33.123000	2001-01-01 11:22:33.12300
 2001-01-01 11:22:33.123000	2001-01-01 11:22:33.123000
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1, t2;
 #
 # Testing arithmetic with INT, DECIMAL, FLOAT
diff -Nru mysql-8.0-8.0.26/mysql-test/r/type_varchar.result mysql-8.0-8.0.27/mysql-test/r/type_varchar.result
--- mysql-8.0-8.0.26/mysql-test/r/type_varchar.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/type_varchar.result	2021-09-28 11:46:34.000000000 +0000
@@ -25,9 +25,13 @@
 select binary v='a' from t1;
 binary v='a'
 0
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 select binary v='a ' from t1;
 binary v='a '
 1
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 insert into t1 values('a');
 alter table t1 add primary key (v);
 ERROR 23000: Duplicate entry 'a ' for key 't1.PRIMARY'
diff -Nru mysql-8.0-8.0.26/mysql-test/r/user_account_password_lock_dbug.result mysql-8.0-8.0.27/mysql-test/r/user_account_password_lock_dbug.result
--- mysql-8.0-8.0.26/mysql-test/r/user_account_password_lock_dbug.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/user_account_password_lock_dbug.result	2021-09-28 11:46:34.000000000 +0000
@@ -19,7 +19,7 @@
 # Must say UNBOUNDED
 SHOW CREATE USER foo@localhost;
 CREATE USER for foo@localhost
-CREATE USER 'foo'@'localhost' IDENTIFIED WITH 'caching_sha2_password' AS <secret> REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT FAILED_LOGIN_ATTEMPTS 2 PASSWORD_LOCK_TIME UNBOUNDED
+CREATE USER `foo`@`localhost` IDENTIFIED WITH 'caching_sha2_password' AS <secret> REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT FAILED_LOGIN_ATTEMPTS 2 PASSWORD_LOCK_TIME UNBOUNDED
 # Should fail as unlocked
 ERROR 28000: Access denied for user 'foo'@'localhost' (using password: NO)
 # we lock foo user account
diff -Nru mysql-8.0-8.0.26/mysql-test/r/user_account_password_lock.result mysql-8.0-8.0.27/mysql-test/r/user_account_password_lock.result
--- mysql-8.0-8.0.26/mysql-test/r/user_account_password_lock.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/user_account_password_lock.result	2021-09-28 11:46:34.000000000 +0000
@@ -63,19 +63,19 @@
 # Must contain FAILED_LOGIN_ATTEMPTS and PASSWORD_LOCK_TIME
 SHOW CREATE USER foo@localhost;
 CREATE USER for foo@localhost
-CREATE USER 'foo'@'localhost' IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT FAILED_LOGIN_ATTEMPTS 2 PASSWORD_LOCK_TIME 3
+CREATE USER `foo`@`localhost` IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT FAILED_LOGIN_ATTEMPTS 2 PASSWORD_LOCK_TIME 3
 CREATE USER failed_login_attempts@localhost FAILED_LOGIN_ATTEMPTS 2;
 # FR3 Must contain FAILED_LOGIN_ATTEMPTS
 # FR9 missing PASSWORD_LOCK_TIME: assume zero
 SHOW CREATE USER failed_login_attempts@localhost;
 CREATE USER for failed_login_attempts@localhost
-CREATE USER 'failed_login_attempts'@'localhost' IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT FAILED_LOGIN_ATTEMPTS 2
+CREATE USER `failed_login_attempts`@`localhost` IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT FAILED_LOGIN_ATTEMPTS 2
 CREATE USER password_lock_time@localhost PASSWORD_LOCK_TIME 3;
 # FR3 Must contain PASSWORD_LOCK_TIME
 # FR10 missing FAILED_LOGIN_ATTEMPTS: assume zero
 SHOW CREATE USER password_lock_time@localhost;
 CREATE USER for password_lock_time@localhost
-CREATE USER 'password_lock_time'@'localhost' IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT PASSWORD_LOCK_TIME 3
+CREATE USER `password_lock_time`@`localhost` IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT PASSWORD_LOCK_TIME 3
 # Show create user must be replayable
 DROP USER foo@localhost;
 # Should not fail
@@ -94,7 +94,7 @@
 ERROR 28000: Access denied for user 'foo'@'localhost' (using password: NO)
 SHOW CREATE USER foo@localhost;
 CREATE USER for foo@localhost
-CREATE USER 'foo'@'localhost' IDENTIFIED WITH 'caching_sha2_password' AS <secret> REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT PASSWORD_LOCK_TIME 3
+CREATE USER `foo`@`localhost` IDENTIFIED WITH 'caching_sha2_password' AS <secret> REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT PASSWORD_LOCK_TIME 3
 ALTER USER foo@localhost FAILED_LOGIN_ATTEMPTS 2 PASSWORD_LOCK_TIME 0;
 # Should fail as unlocked
 ERROR 28000: Access denied for user 'foo'@'localhost' (using password: NO)
@@ -102,7 +102,7 @@
 ERROR 28000: Access denied for user 'foo'@'localhost' (using password: NO)
 SHOW CREATE USER foo@localhost;
 CREATE USER for foo@localhost
-CREATE USER 'foo'@'localhost' IDENTIFIED WITH 'caching_sha2_password' AS <secret> REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT FAILED_LOGIN_ATTEMPTS 2
+CREATE USER `foo`@`localhost` IDENTIFIED WITH 'caching_sha2_password' AS <secret> REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT FAILED_LOGIN_ATTEMPTS 2
 DROP USER foo@localhost;
 # Test FR1.7
 CREATE USER foo@localhost IDENTIFIED BY 'foo' FAILED_LOGIN_ATTEMPTS 2 PASSWORD_LOCK_TIME 3;
@@ -117,7 +117,7 @@
 ERROR HY000: Access denied for user 'foo'@'localhost'. Account is blocked for 3 day(s) (3 day(s) remaining) due to 2 consecutive failed logins.
 SHOW CREATE USER foo@localhost;
 CREATE USER for foo@localhost
-CREATE USER 'foo'@'localhost' IDENTIFIED WITH 'caching_sha2_password' AS <secret> REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT FAILED_LOGIN_ATTEMPTS 2 PASSWORD_LOCK_TIME 3
+CREATE USER `foo`@`localhost` IDENTIFIED WITH 'caching_sha2_password' AS <secret> REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT FAILED_LOGIN_ATTEMPTS 2 PASSWORD_LOCK_TIME 3
 ALTER USER foo@localhost PASSWORD_LOCK_TIME 3;
 # Should fail as unlocked
 ERROR 28000: Access denied for user 'foo'@'localhost' (using password: NO)
@@ -125,7 +125,7 @@
 ERROR HY000: Access denied for user 'foo'@'localhost'. Account is blocked for 3 day(s) (3 day(s) remaining) due to 2 consecutive failed logins.
 SHOW CREATE USER foo@localhost;
 CREATE USER for foo@localhost
-CREATE USER 'foo'@'localhost' IDENTIFIED WITH 'caching_sha2_password' AS <secret> REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT FAILED_LOGIN_ATTEMPTS 2 PASSWORD_LOCK_TIME 3
+CREATE USER `foo`@`localhost` IDENTIFIED WITH 'caching_sha2_password' AS <secret> REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT FAILED_LOGIN_ATTEMPTS 2 PASSWORD_LOCK_TIME 3
 DROP USER foo@localhost;
 # Test FR1.9: a successful login resets the failed count
 CREATE USER foo@localhost IDENTIFIED BY 'foo' FAILED_LOGIN_ATTEMPTS 2 PASSWORD_LOCK_TIME 3;
@@ -171,13 +171,13 @@
 FLUSH PRIVILEGES;
 SHOW CREATE USER foo@localhost;
 CREATE USER for foo@localhost
-CREATE USER 'foo'@'localhost' IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT PASSWORD_LOCK_TIME 2
+CREATE USER `foo`@`localhost` IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT PASSWORD_LOCK_TIME 2
 # test missing password lock time
 UPDATE mysql.user SET user_attributes='{"Password_locking": {"failed_login_attempts": 2}}' WHERE user='foo';
 FLUSH PRIVILEGES;
 SHOW CREATE USER foo@localhost;
 CREATE USER for foo@localhost
-CREATE USER 'foo'@'localhost' IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT FAILED_LOGIN_ATTEMPTS 2
+CREATE USER `foo`@`localhost` IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT FAILED_LOGIN_ATTEMPTS 2
 # cleanup
 UPDATE mysql.user SET user_attributes=NULL WHERE user='foo';
 FLUSH PRIVILEGES;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/user_comment.result mysql-8.0-8.0.27/mysql-test/r/user_comment.result
--- mysql-8.0-8.0.26/mysql-test/r/user_comment.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/user_comment.result	2021-09-28 11:46:34.000000000 +0000
@@ -3,7 +3,7 @@
 CREATE USER u1;
 SHOW CREATE USER u1;
 CREATE USER for u1@%
-CREATE USER 'u1'@'%' IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u1`@`%` IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 ALTER USER u1 COMMENT 'free form text';
 SELECT user,user_attributes FROM mysql.user WHERE user='u1';
 user	user_attributes
@@ -37,7 +37,7 @@
 ALTER USER foo@localhost ATTRIBUTE '{"flag":"red"}';
 SHOW CREATE USER foo@localhost;
 CREATE USER for foo@localhost
-CREATE USER 'foo'@'localhost' IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT FAILED_LOGIN_ATTEMPTS 4 PASSWORD_LOCK_TIME 6 ATTRIBUTE '{"flag": "red", "comment": "password lock time"}'
+CREATE USER `foo`@`localhost` IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT FAILED_LOGIN_ATTEMPTS 4 PASSWORD_LOCK_TIME 6 ATTRIBUTE '{"flag": "red", "comment": "password lock time"}'
 SELECT user_attributes FROM mysql.user WHERE user='foo';
 user_attributes
 {"metadata": {"flag": "red", "comment": "password lock time"}, "Password_locking": {"failed_login_attempts": 4, "password_lock_time_days": 6}}
@@ -67,7 +67,7 @@
 CREATE USER foo2@localhost IDENTIFIED BY 'foo' COMMENT 'xxx';
 SHOW CREATE USER foo2@localhost;
 CREATE USER for foo2@localhost
-CREATE USER 'foo2'@'localhost' IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT ATTRIBUTE '{"comment": "xxx"}'
+CREATE USER `foo2`@`localhost` IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT ATTRIBUTE '{"comment": "xxx"}'
 SELECT user,user_attributes FROM mysql.user WHERE user='foo2';
 user	user_attributes
 foo2	{"metadata": {"comment": "xxx"}}
@@ -76,7 +76,7 @@
 ALTER USER foo4 ACCOUNT UNLOCK ATTRIBUTE '{"stuff":"unlocked"}';
 SHOW CREATE USER foo4;
 CREATE USER for foo4@%
-CREATE USER 'foo4'@'%' IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT ATTRIBUTE '{"stuff": "unlocked"}'
+CREATE USER `foo4`@`%` IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT ATTRIBUTE '{"stuff": "unlocked"}'
 SELECT user,user_attributes FROM mysql.user WHERE user like 'foo%';
 user	user_attributes
 foo3	{"metadata": {"comment": "abc"}}
@@ -126,13 +126,13 @@
 +++++ NO_BACKSLASH_ESCAPES = OFF
 CREATE USER u1 COMMENT 'Hello "Smith"';
 DROP USER u1;
-CREATE USER 'u1'@'%' IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT ATTRIBUTE '{"comment": "Hello \\"Smith\\""}';
+CREATE USER `u1`@`%` IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT ATTRIBUTE '{"comment": "Hello \\"Smith\\""}';
 DROP USER u1;
 +++++ NO_BACKSLASH_ESCAPES = ON
 CREATE USER u1 COMMENT 'Hello "Smith"';
 SET @@sql_mode='NO_BACKSLASH_ESCAPES';
 DROP USER u1;
-CREATE USER 'u1'@'%' IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT ATTRIBUTE '{"comment": "Hello \"Smith\""}';
+CREATE USER `u1`@`%` IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT ATTRIBUTE '{"comment": "Hello \"Smith\""}';
 DROP USER u1;
 SET @@sql_mode = @org_sql_mode;
 *
diff -Nru mysql-8.0-8.0.26/mysql-test/r/user_password_history.result mysql-8.0-8.0.27/mysql-test/r/user_password_history.result
--- mysql-8.0-8.0.26/mysql-test/r/user_password_history.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/user_password_history.result	2021-09-28 11:46:34.000000000 +0000
@@ -74,7 +74,7 @@
 # FR6: Must have the password history clauses
 SHOW CREATE USER no_pwd_history@localhost;
 CREATE USER for no_pwd_history@localhost
-CREATE USER 'no_pwd_history'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY 0 PASSWORD REUSE INTERVAL 0 DAY PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `no_pwd_history`@`localhost` IDENTIFIED WITH 'mysql_native_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY 0 PASSWORD REUSE INTERVAL 0 DAY PASSWORD REQUIRE CURRENT DEFAULT
 # NF 1.3 NF 2.3: Must have 0 and 0 for the password history columns
 SELECT Password_reuse_history, Password_reuse_time FROM mysql.user
 WHERE User='no_pwd_history' AND Host='localhost';
@@ -87,7 +87,7 @@
 # FR6: must have the history clauses
 SHOW CREATE USER default_def@localhost;
 CREATE USER for default_def@localhost
-CREATE USER 'default_def'@'localhost' IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `default_def`@`localhost` IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 # NF 1.3 NF 2.3 Must have NULL and NULL for the password history columns
 SELECT Password_reuse_history, Password_reuse_time FROM mysql.user
 WHERE User='default_def' AND Host='localhost';
@@ -303,7 +303,7 @@
 # Must have PASSWORD HISTORY 1 and PASSWORD REUSE INTERVAL 2
 SHOW CREATE USER mohit@localhost;
 CREATE USER for mohit@localhost
-CREATE USER 'mohit'@'localhost' IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY 1 PASSWORD REUSE INTERVAL 2 DAY PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `mohit`@`localhost` IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY 1 PASSWORD REUSE INTERVAL 2 DAY PASSWORD REQUIRE CURRENT DEFAULT
 # Must fail: password history is 1
 ALTER USER mohit@localhost IDENTIFIED BY 'mohit';
 ERROR HY000: Cannot use these credentials for 'mohit@localhost' because they contradict the password history policy
@@ -312,14 +312,14 @@
 # Must have PASSWORD HISTORY 1 and PASSWORD REUSE INTERVAL 2
 SHOW CREATE USER mohit@localhost;
 CREATE USER for mohit@localhost
-CREATE USER 'mohit'@'localhost' IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY 1 PASSWORD REUSE INTERVAL 2 DAY PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `mohit`@`localhost` IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY 1 PASSWORD REUSE INTERVAL 2 DAY PASSWORD REQUIRE CURRENT DEFAULT
 DROP USER mohit@localhost;
 SET GLOBAL password_reuse_interval= default;
 CREATE USER mohit@localhost IDENTIFIED BY 'mohit' PASSWORD HISTORY 1;
 # Must have PASSWORD HISTORY 1
 SHOW CREATE USER mohit@localhost;
 CREATE USER for mohit@localhost
-CREATE USER 'mohit'@'localhost' IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY 1 PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `mohit`@`localhost` IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY 1 PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 # must be 1: password recorded due to interval in CREATE USER
 SELECT COUNT(*) FROM mysql.password_history WHERE
 User='mohit' AND Host='localhost';
diff -Nru mysql-8.0-8.0.26/mysql-test/r/user_var.result mysql-8.0-8.0.27/mysql-test/r/user_var.result
--- mysql-8.0-8.0.26/mysql-test/r/user_var.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/user_var.result	2021-09-28 11:46:34.000000000 +0000
@@ -1082,3 +1082,14 @@
 Warnings:
 Warning	1287	Setting user variables within expressions is deprecated and will be removed in a future release. Consider alternatives: 'SET variable=expression, ...', or 'SELECT expression(s) INTO variables(s)'.
 DROP TABLE t;
+#
+# Bug #32802216: RECENT REGRESSION: PROTOCOL_TEXT::STORE_LONGLONG: ASSERTION `SEND_METADATA || FIELD_TYPES == NULLPTR || FIELD_TYPES[FIELD_POS] == MYSQL_TYPE_LONGLONG' FAILED.
+#
+CREATE TABLE t1 (a TINYINT);
+INSERT INTO t1 VALUES (1);
+SELECT (@a:=a) FROM t1 GROUP BY 1;
+(@a:=a)
+1
+Warnings:
+Warning	1287	Setting user variables within expressions is deprecated and will be removed in a future release. Consider alternatives: 'SET variable=expression, ...', or 'SELECT expression(s) INTO variables(s)'.
+DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/validate_password_component_random_password.result mysql-8.0-8.0.27/mysql-test/r/validate_password_component_random_password.result
--- mysql-8.0-8.0.26/mysql-test/r/validate_password_component_random_password.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/validate_password_component_random_password.result	2021-09-28 11:46:34.000000000 +0000
@@ -1,9 +1,9 @@
 CREATE USER 'usr1'@'localhost' IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr1	localhost	######
+user	host	generated password	auth_factor
+usr1	localhost	######	1
 CREATE USER 'usr2'@'localhost' IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr2	localhost	######
+user	host	generated password	auth_factor
+usr2	localhost	######	1
 GRANT ALL ON mysql.* TO 'usr1'@'localhost';
 INSTALL COMPONENT "file://component_validate_password";
 # password policy LOW (which only check for password length)
@@ -11,36 +11,36 @@
 SET @@global.validate_password.policy=LOW;
 SET @@global.generated_random_password_length = 5;
 CREATE USER 'usr3'@'localhost' IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr3	localhost	######
+user	host	generated password	auth_factor
+usr3	localhost	######	1
 ALTER USER 'usr1'@'localhost' IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr1	localhost	######
+user	host	generated password	auth_factor
+usr1	localhost	######	1
 SET PASSWORD FOR 'usr1'@'localhost' TO RANDOM;
-user	host	generated password
-usr1	localhost	######
+user	host	generated password	auth_factor
+usr1	localhost	######	1
 DROP USER 'usr3'@'localhost';
 SET @@global.generated_random_password_length = 8;
 CREATE USER 'usr3'@'localhost' IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr3	localhost	######
+user	host	generated password	auth_factor
+usr3	localhost	######	1
 ALTER USER 'usr1'@'localhost' IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr1	localhost	######
+user	host	generated password	auth_factor
+usr1	localhost	######	1
 SET PASSWORD FOR 'usr1'@'localhost' TO RANDOM;
-user	host	generated password
-usr1	localhost	######
+user	host	generated password	auth_factor
+usr1	localhost	######	1
 DROP USER 'usr3'@'localhost';
 SET @@global.validate_password.length= 12;
 CREATE USER 'usr3'@'localhost' IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr3	localhost	######
+user	host	generated password	auth_factor
+usr3	localhost	######	1
 ALTER USER 'usr1'@'localhost' IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr1	localhost	######
+user	host	generated password	auth_factor
+usr1	localhost	######	1
 SET PASSWORD FOR 'usr1'@'localhost' TO RANDOM;
-user	host	generated password
-usr1	localhost	######
+user	host	generated password	auth_factor
+usr1	localhost	######	1
 DROP USER 'usr3'@'localhost';
 SET @@global.validate_password.mixed_case_count= 0;
 SET @@global.validate_password.number_count= 0;
@@ -48,14 +48,14 @@
 SET @@global.validate_password.length= 0;
 SET @@global.validate_password.length= DEFAULT;
 CREATE USER 'usr3'@'localhost' IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr3	localhost	######
+user	host	generated password	auth_factor
+usr3	localhost	######	1
 ALTER USER 'usr1'@'localhost' IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr1	localhost	######
+user	host	generated password	auth_factor
+usr1	localhost	######	1
 SET PASSWORD FOR 'usr1'@'localhost' TO RANDOM;
-user	host	generated password
-usr1	localhost	######
+user	host	generated password	auth_factor
+usr1	localhost	######	1
 DROP USER 'usr3'@'localhost';
 # password policy MEDIUM (check for mixed_case, digits, special_chars)
 # default case : atleast 1 mixed_case, 1 digit, 1 special_char
@@ -65,72 +65,72 @@
 SET @@global.validate_password.policy=MEDIUM;
 SET @@global.validate_password.number_count= 0;
 CREATE USER 'usr3'@'localhost' IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr3	localhost	######
+user	host	generated password	auth_factor
+usr3	localhost	######	1
 ALTER USER 'usr1'@'localhost' IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr1	localhost	######
+user	host	generated password	auth_factor
+usr1	localhost	######	1
 SET PASSWORD FOR 'usr1'@'localhost' TO RANDOM;
-user	host	generated password
-usr1	localhost	######
+user	host	generated password	auth_factor
+usr1	localhost	######	1
 DROP USER 'usr3'@'localhost';
 SET @@global.validate_password.mixed_case_count= 0;
 CREATE USER 'usr3'@'localhost' IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr3	localhost	######
+user	host	generated password	auth_factor
+usr3	localhost	######	1
 ALTER USER 'usr1'@'localhost' IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr1	localhost	######
+user	host	generated password	auth_factor
+usr1	localhost	######	1
 SET PASSWORD FOR 'usr1'@'localhost' TO RANDOM;
-user	host	generated password
-usr1	localhost	######
+user	host	generated password	auth_factor
+usr1	localhost	######	1
 DROP USER 'usr3'@'localhost';
 SET @@global.validate_password.special_char_count= 0;
 CREATE USER 'usr3'@'localhost' IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr3	localhost	######
+user	host	generated password	auth_factor
+usr3	localhost	######	1
 ALTER USER 'usr1'@'localhost' IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr1	localhost	######
+user	host	generated password	auth_factor
+usr1	localhost	######	1
 SET PASSWORD FOR 'usr1'@'localhost' TO RANDOM;
-user	host	generated password
-usr1	localhost	######
+user	host	generated password	auth_factor
+usr1	localhost	######	1
 DROP USER 'usr3'@'localhost';
 SET @@global.validate_password.special_char_count= 1;
 SET @@global.validate_password.number_count= 1;
 SET @@global.validate_password.mixed_case_count= 1;
 CREATE USER 'usr3'@'localhost' IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr3	localhost	######
+user	host	generated password	auth_factor
+usr3	localhost	######	1
 ALTER USER 'usr1'@'localhost' IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr1	localhost	######
+user	host	generated password	auth_factor
+usr1	localhost	######	1
 SET PASSWORD FOR 'usr1'@'localhost' TO RANDOM;
-user	host	generated password
-usr1	localhost	######
+user	host	generated password	auth_factor
+usr1	localhost	######	1
 DROP USER 'usr3'@'localhost';
 SET @@global.validate_password.number_count= 2;
 CREATE USER 'usr3'@'localhost' IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr3	localhost	######
+user	host	generated password	auth_factor
+usr3	localhost	######	1
 ALTER USER 'usr1'@'localhost' IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr1	localhost	######
+user	host	generated password	auth_factor
+usr1	localhost	######	1
 SET PASSWORD FOR 'usr1'@'localhost' TO RANDOM;
-user	host	generated password
-usr1	localhost	######
+user	host	generated password	auth_factor
+usr1	localhost	######	1
 DROP USER 'usr3'@'localhost';
 SET @@global.validate_password.number_count= 1;
 SET @@global.validate_password.mixed_case_count= 2;
 CREATE USER 'usr3'@'localhost' IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr3	localhost	######
+user	host	generated password	auth_factor
+usr3	localhost	######	1
 ALTER USER 'usr1'@'localhost' IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr1	localhost	######
+user	host	generated password	auth_factor
+usr1	localhost	######	1
 SET PASSWORD FOR 'usr1'@'localhost' TO RANDOM;
-user	host	generated password
-usr1	localhost	######
+user	host	generated password	auth_factor
+usr1	localhost	######	1
 DROP USER 'usr3'@'localhost';
 SET @@global.validate_password.mixed_case_count= 1;
 SET @@global.validate_password.special_char_count= 2;
@@ -138,28 +138,28 @@
 # No dictionary file present, no dictionary check
 SET @@global.validate_password.policy=STRONG;
 CREATE USER 'usr3'@'localhost' IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr3	localhost	######
+user	host	generated password	auth_factor
+usr3	localhost	######	1
 ALTER USER 'usr1'@'localhost' IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr1	localhost	######
+user	host	generated password	auth_factor
+usr1	localhost	######	1
 SET PASSWORD FOR 'usr1'@'localhost' TO RANDOM;
-user	host	generated password
-usr1	localhost	######
+user	host	generated password	auth_factor
+usr1	localhost	######	1
 DROP USER 'usr3'@'localhost';
 SET @@global.validate_password.dictionary_file="MYSQL_ERRMSG_BASEDIR/dictionary.txt";
 # password policy strong
 # default_file : dictionary.txt
 SET @@global.validate_password.policy=STRONG;
 CREATE USER 'usr3'@'localhost' IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr3	localhost	######
+user	host	generated password	auth_factor
+usr3	localhost	######	1
 ALTER USER 'usr1'@'localhost' IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr1	localhost	######
+user	host	generated password	auth_factor
+usr1	localhost	######	1
 SET PASSWORD FOR 'usr1'@'localhost' TO RANDOM;
-user	host	generated password
-usr1	localhost	######
+user	host	generated password	auth_factor
+usr1	localhost	######	1
 DROP USER 'usr3'@'localhost';
 DROP USER 'usr1'@'localhost';
 DROP USER 'usr2'@'localhost';
diff -Nru mysql-8.0-8.0.26/mysql-test/r/varbinary.result mysql-8.0-8.0.27/mysql-test/r/varbinary.result
--- mysql-8.0-8.0.26/mysql-test/r/varbinary.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/varbinary.result	2021-09-28 11:46:34.000000000 +0000
@@ -394,21 +394,30 @@
 def					binary '12' | '12'	8	21	2	Y	32928	0	63
 binary '12' | '12'
 12
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT binary '12' | binary '12';
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
 def					binary '12' | binary '12'	253	8	2	Y	128	31	63
 binary '12' | binary '12'
 12
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT binary '12' | 0x0001;
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
 def					binary '12' | 0x0001	253	8	2	Y	128	31	63
 binary '12' | 0x0001
 13
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT binary '12' | 1;
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
 def					binary '12' | 1	8	21	2	Y	32928	0	63
 binary '12' | 1
 13
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT '12' | 0x01;
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
 def					'12' | 0x01	8	21	2	N	32929	0	63
@@ -459,6 +468,8 @@
 def					binary '12' << 1	253	8	2	Y	128	31	63
 binary '12' << 1
 bd
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT CAST('12' AS binary) << 1;
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
 def					CAST('12' AS binary) << 1	253	8	2	Y	128	31	63
diff -Nru mysql-8.0-8.0.26/mysql-test/r/variables.result mysql-8.0-8.0.27/mysql-test/r/variables.result
--- mysql-8.0-8.0.26/mysql-test/r/variables.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/variables.result	2021-09-28 11:46:34.000000000 +0000
@@ -2011,7 +2011,8 @@
 LEFT JOIN performance_schema.global_variables b
 ON a.variable_name=b.variable_name
 WHERE b.variable_name IS NULL
-AND a.variable_name NOT IN ('debug_sync');
+AND a.variable_name NOT IN ('debug_sync')
+ORDER BY a.variable_name;
 SET SESSION error_count = @@session.error_count;
 SET SESSION external_user = @@session.external_user;
 SET SESSION gtid_next = @@session.gtid_next;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/version_token.result mysql-8.0-8.0.27/mysql-test/r/version_token.result
--- mysql-8.0-8.0.26/mysql-test/r/version_token.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/version_token.result	2021-09-28 11:46:34.000000000 +0000
@@ -256,6 +256,7 @@
 Privilege	Context	Comment
 APPLICATION_PASSWORD_ADMIN	Server Admin	
 AUDIT_ADMIN	Server Admin	
+AUTHENTICATION_POLICY_ADMIN	Server Admin	
 Alter	Tables	To alter the table
 Alter routine	Functions,Procedures	To alter or drop stored functions/procedures
 BACKUP_ADMIN	Server Admin	
@@ -282,12 +283,14 @@
 FLUSH_USER_RESOURCES	Server Admin	
 File	File access on server	To read and write files on the server
 GROUP_REPLICATION_ADMIN	Server Admin	
+GROUP_REPLICATION_STREAM	Server Admin	
 Grant option	Databases,Tables,Functions,Procedures	To give to other users those privileges you possess
 INNODB_REDO_LOG_ARCHIVE	Server Admin	
 INNODB_REDO_LOG_ENABLE	Server Admin	
 Index	Tables	To create or drop indexes
 Insert	Tables	To insert data into tables
 Lock tables	Databases	To use LOCK TABLES (together with SELECT privilege)
+PASSWORDLESS_USER_ADMIN	Server Admin	
 PERSIST_RO_VARIABLES_ADMIN	Server Admin	
 Process	Server Admin	To view the plain text of currently executing queries
 Proxy	Server Admin	To make proxy user possible
diff -Nru mysql-8.0-8.0.26/mysql-test/r/view.result mysql-8.0-8.0.27/mysql-test/r/view.result
--- mysql-8.0-8.0.26/mysql-test/r/view.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/view.result	2021-09-28 11:46:34.000000000 +0000
@@ -3328,42 +3328,42 @@
 from table_24532;
 describe view_24532_a;
 Field	Type	Null	Key	Default	Extra
-a IS TRUE	int	NO		0	
-a IS NOT TRUE	int	NO		0	
-a IS FALSE	int	NO		0	
-a IS NOT FALSE	int	NO		0	
-a IS UNKNOWN	int	NO		0	
-a IS NOT UNKNOWN	int	NO		0	
-a is NULL	int	NO		0	
-a IS NOT NULL	int	NO		0	
-ISNULL(a)	int	NO		0	
-b IS TRUE	int	NO		0	
-b IS NOT TRUE	int	NO		0	
-b IS FALSE	int	NO		0	
-b IS NOT FALSE	int	NO		0	
-b IS UNKNOWN	int	NO		0	
-b IS NOT UNKNOWN	int	NO		0	
-b is NULL	int	NO		0	
-b IS NOT NULL	int	NO		0	
-ISNULL(b)	int	NO		0	
-c IS TRUE	int	NO		0	
-c IS NOT TRUE	int	NO		0	
-c IS FALSE	int	NO		0	
-c IS NOT FALSE	int	NO		0	
-c IS UNKNOWN	int	NO		0	
-c IS NOT UNKNOWN	int	NO		0	
-c is NULL	int	NO		0	
-c IS NOT NULL	int	NO		0	
-ISNULL(c)	int	NO		0	
-d IS TRUE	int	NO		0	
-d IS NOT TRUE	int	NO		0	
-d IS FALSE	int	NO		0	
-d IS NOT FALSE	int	NO		0	
-d IS UNKNOWN	int	NO		0	
-d IS NOT UNKNOWN	int	NO		0	
-d is NULL	int	NO		0	
-d IS NOT NULL	int	NO		0	
-ISNULL(d)	int	NO		0	
+a IS TRUE	int unsigned	NO		0	
+a IS NOT TRUE	int unsigned	NO		0	
+a IS FALSE	int unsigned	NO		0	
+a IS NOT FALSE	int unsigned	NO		0	
+a IS UNKNOWN	int unsigned	NO		0	
+a IS NOT UNKNOWN	int unsigned	NO		0	
+a is NULL	int unsigned	NO		0	
+a IS NOT NULL	int unsigned	NO		0	
+ISNULL(a)	int unsigned	NO		0	
+b IS TRUE	int unsigned	NO		0	
+b IS NOT TRUE	int unsigned	NO		0	
+b IS FALSE	int unsigned	NO		0	
+b IS NOT FALSE	int unsigned	NO		0	
+b IS UNKNOWN	int unsigned	NO		0	
+b IS NOT UNKNOWN	int unsigned	NO		0	
+b is NULL	int unsigned	NO		0	
+b IS NOT NULL	int unsigned	NO		0	
+ISNULL(b)	int unsigned	NO		0	
+c IS TRUE	int unsigned	NO		0	
+c IS NOT TRUE	int unsigned	NO		0	
+c IS FALSE	int unsigned	NO		0	
+c IS NOT FALSE	int unsigned	NO		0	
+c IS UNKNOWN	int unsigned	NO		0	
+c IS NOT UNKNOWN	int unsigned	NO		0	
+c is NULL	int unsigned	NO		0	
+c IS NOT NULL	int unsigned	NO		0	
+ISNULL(c)	int unsigned	NO		0	
+d IS TRUE	int unsigned	NO		0	
+d IS NOT TRUE	int unsigned	NO		0	
+d IS FALSE	int unsigned	NO		0	
+d IS NOT FALSE	int unsigned	NO		0	
+d IS UNKNOWN	int unsigned	NO		0	
+d IS NOT UNKNOWN	int unsigned	NO		0	
+d is NULL	int unsigned	NO		0	
+d IS NOT NULL	int unsigned	NO		0	
+ISNULL(d)	int unsigned	NO		0	
 create view view_24532_b as
 select
 a IS TRUE,
@@ -3377,13 +3377,13 @@
 from table_24532;
 describe view_24532_b;
 Field	Type	Null	Key	Default	Extra
-a IS TRUE	int	NO		0	
+a IS TRUE	int unsigned	NO		0	
 old_istrue	int	NO		0	
-a IS NOT TRUE	int	NO		0	
+a IS NOT TRUE	int unsigned	NO		0	
 old_isnottrue	int	NO		0	
-a IS FALSE	int	NO		0	
+a IS FALSE	int unsigned	NO		0	
 old_isfalse	int	NO		0	
-a IS NOT FALSE	int	NO		0	
+a IS NOT FALSE	int unsigned	NO		0	
 old_isnotfalse	int	NO		0	
 show create view view_24532_b;
 View	Create View	character_set_client	collation_connection
@@ -5584,7 +5584,7 @@
 2	DEPENDENT SUBQUERY	t2	NULL	ALL	NULL	NULL	NULL	NULL	#	#	Using where
 Warnings:
 Note	1276	Field or reference 'test.t1.a' of SELECT #2 was resolved in SELECT #1
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,(/* select#2 */ select count(0) from `test`.`t1` `t2` where (`t2`.`a` = `test`.`t1`.`a`)) AS `s` from `test`.`t1`
+Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,(/* select#2 */ select count(0) from `test`.`t1` `t2` where (`test`.`t2`.`a` = `test`.`t1`.`a`)) AS `s` from `test`.`t1`
 DROP VIEW v1;
 CREATE VIEW v1 AS SELECT a, b, EXISTS (SELECT COUNT(*) FROM t1 AS t2 WHERE a=t1.a) AS s
 FROM t1;
@@ -5645,7 +5645,7 @@
 2	DEPENDENT SUBQUERY	t2	NULL	ALL	NULL	NULL	NULL	NULL	#	#	Using where
 Warnings:
 Note	1276	Field or reference 'test.t1.a' of SELECT #2 was resolved in SELECT #1
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,exists(/* select#2 */ select count(0) from `test`.`t1` `t2` where (`t2`.`a` = `test`.`t1`.`a`)) AS `s` from `test`.`t1`
+Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,exists(/* select#2 */ select count(0) from `test`.`t1` `t2` where (`test`.`t2`.`a` = `test`.`t1`.`a`)) AS `s` from `test`.`t1`
 DROP VIEW v1;
 CREATE VIEW v1 AS SELECT (SELECT a FROM t2 WHERE a=FLOOR(COUNT(t1.a)/2)) AS s
 FROM t1;
@@ -6761,3 +6761,30 @@
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 4711 AS `a`,count(distinct `v2`.`c`) AS `COUNT(DISTINCT c)` from `v2` group by `a` with rollup	utf8mb4	utf8mb4_0900_ai_ci
 DROP VIEW v1, v2;
+#
+# BUG#30909064 Explain neglects db part of identifier after create view
+#
+CREATE TABLE t1 (
+pk INT,
+col_int_key INT,
+col_int_nokey INT,
+col_varchar_key VARCHAR(10),
+col_varchar_nokey VARCHAR(10),
+KEY col_int_key (col_int_key),
+KEY col_varchar_key (col_varchar_key)
+);
+INSERT INTO t1 VALUES (), ();
+CREATE VIEW v1 AS
+SELECT alias1.col_int_nokey AS field1,
+(SELECT alias2.col_int_key
+FROM t1 AS alias2
+WHERE alias1.col_varchar_key <= alias1.col_varchar_nokey
+) AS field2
+FROM t1 AS alias1;
+DROP VIEW v1;
+EXPLAIN SELECT pk AS foo, col_int_key AS bar FROM t1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	NULL
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`pk` AS `foo`,`test`.`t1`.`col_int_key` AS `bar` from `test`.`t1`
+DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/window_functions_bugs.result mysql-8.0-8.0.27/mysql-test/r/window_functions_bugs.result
--- mysql-8.0-8.0.26/mysql-test/r/window_functions_bugs.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/window_functions_bugs.result	2021-09-28 11:46:34.000000000 +0000
@@ -1092,3 +1092,181 @@
 ERROR 22032: Invalid JSON text in argument 1 to function cast_as_json: "The document is empty." at position 0.
 SELECT JSON_ARRAY(JSON_ARRAYAGG(CAST('' AS JSON)) OVER (), '');
 ERROR 22032: Invalid JSON text in argument 1 to function cast_as_json: "The document is empty." at position 0.
+#
+# Bug #32802301: REGRESSION: TYPE_CONVERSION_STATUS FIELD_VARSTRING::STORE: ASSERTION `!TABLE || (!TABLE->WRITE_SET || BITMAP_IS_SET(TABLE->WRITE_SET, FIELD_INDEX()))' FAILED.
+#
+CREATE TABLE t1 (a TIMESTAMP NOT NULL);
+INSERT INTO t1 VALUES ('2000-01-01 00:00:00');
+SELECT a + INTERVAL(LAST_VALUE(1) OVER ()) SECOND FROM (SELECT a FROM t1) q;
+a + INTERVAL(LAST_VALUE(1) OVER ()) SECOND
+2000-01-01 00:00:01
+DROP TABLE t1;
+#
+# Bug#32820802: WRONG RESULT WITH WINDOW FUNCTION AS PART OF EXPRESSION
+#
+CREATE TABLE t1 (
+f1 INTEGER,
+t1_partkey INTEGER
+);
+CREATE TABLE t2 (
+t2_partkey INTEGER PRIMARY KEY
+);
+INSERT INTO t1 VALUES (34, 1), (10, 1), (4, 1), (6, 1),
+(9, 2), (64, 2), (31,2);
+INSERT INTO t2 VALUES (1), (2), (3), (4), (5), (6), (7);
+ANALYZE TABLE t1, t2;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+SELECT 0.2 * AVG(f1) OVER w AS avg, f1
+FROM t1 JOIN t2 ON t1_partkey = t2_partkey
+WINDOW w AS (PARTITION BY t1_partkey);
+avg	f1
+2.70000	34
+2.70000	10
+2.70000	4
+2.70000	6
+6.93334	9
+6.93334	64
+6.93334	31
+DROP TABLE t1, t2;
+#
+# Bug#32328576: BOOL PROCESS_BUFFERED_WINDOWING_RECORD: ASSERTION `!ROW_ADDED
+#               && !FOUND_FIRST' FAILED.
+#
+CREATE TABLE t(f1 SET('a','b'), f2 INTEGER);
+INSERT INTO t VALUES ('b',1), ('a',2), ('a,b',3), ('b',0), ('a',1);
+SELECT FIRST_VALUE(f2) OVER(ORDER BY f1 RANGE CURRENT ROW) FROM t;
+FIRST_VALUE(f2) OVER(ORDER BY f1 RANGE CURRENT ROW)
+2
+2
+1
+1
+3
+DROP TABLE t;
+#
+# Bug #33012642: WL#14419: ASSERTION `*TO_LEN >= 2 + FROM->SIGN' FAILED
+#
+CREATE TABLE t1 ( a INTEGER NOT NULL );
+INSERT INTO t1 VALUES (4);
+SELECT a, SUM(a) OVER () AS s
+FROM t1
+GROUP BY a
+ORDER BY a, s;
+a	s
+4	4
+DROP TABLE t1;
+#
+# Bug #33014346: WL#14419: ASSERTION `RECEIVER.HASSECONDARYENGINECOSTHOOK()' FAILED
+#
+CREATE TABLE t1 ( a INTEGER, b INTEGER );
+SELECT ROW_NUMBER() OVER (ORDER BY a), COUNT(*) AS m
+FROM t1
+GROUP BY a, b
+ORDER BY a, b, m;
+ROW_NUMBER() OVER (ORDER BY a)	m
+DROP TABLE t1;
+#
+# Bug #33041041: WL#14419: SIG 11 IN WINDOW::APPLY_TEMP_TABLE|SQL/WINDOW.CC
+#
+CREATE TABLE t1 ( a INTEGER );
+PREPARE stmt FROM "SELECT RANK() OVER (ORDER BY a) FROM t1 GROUP BY a";
+EXECUTE stmt;
+RANK() OVER (ORDER BY a)
+EXECUTE stmt;
+RANK() OVER (ORDER BY a)
+DROP TABLE t1;
+#
+# Bug #33067989: WL#14419: RESULT MISMATCH SEEN WITH WINDOW FUNCTION IN SUBQUERY
+#
+CREATE TABLE t1 ( a INTEGER );
+INSERT INTO t1 VALUES (0), (1);
+SELECT a
+FROM t1 AS outer_t1
+WHERE (a,a) IN (
+SELECT MAX(a) OVER (), a FROM t1
+);
+a
+1
+DROP TABLE t1;
+#
+# Bug #33072114: WL#14419: ASSERTION `STATIC_CAST<SIZE_T>(END_BIT_NUM) <= CAPACITY()' FAILED
+#
+CREATE TABLE t1 ( a INTEGER, b INTEGER, c INTEGER, d INTEGER, e INTEGER, f INTEGER, g INTEGER, h INTEGER, i INTEGER, j INTEGER, k INTEGER );
+SELECT
+CUME_DIST() OVER (ORDER BY t1.a)
+FROM
+t1
+NATURAL JOIN t1 AS t2
+NATURAL JOIN t1 AS t3
+NATURAL JOIN t1 AS t4
+GROUP BY t1.a
+WITH ROLLUP;
+CUME_DIST() OVER (ORDER BY t1.a)
+DROP TABLE t1;
+#
+# Bug #33028408: WL#14419: ASSERTION `M_COUNT >= M_FRAME_NULL_COUNT && M_FRAME_NULL_COUNT > 0' FA
+#
+CREATE TABLE t1 ( pk INTEGER );
+INSERT INTO t1 VALUES (2);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+SELECT SUM(pk) OVER (ROWS BETWEEN CURRENT ROW AND 1 FOLLOWING) FROM t1 GROUP BY pk WITH ROLLUP;
+SUM(pk) OVER (ROWS BETWEEN CURRENT ROW AND 1 FOLLOWING)
+2
+NULL
+DROP TABLE t1;
+#
+# Bug #33036143: WL#14419: ASSERTION `M_INDEX_CURSOR.IS_POSITIONED()' FAILED.
+#
+CREATE TABLE t1 ( a LONGTEXT, b INTEGER );
+INSERT INTO t1 VALUES ('1', 0);
+SELECT
+a,
+SUM(1) OVER (ORDER BY b),
+SUM(1) OVER (ORDER BY b DESC)
+FROM t1;
+a	SUM(1) OVER (ORDER BY b)	SUM(1) OVER (ORDER BY b DESC)
+1	1	1
+DROP TABLE t1;
+#
+# Bug #33067260: WL#14419: SIG11 IN MY_FILL_8BIT|STRINGS/CTYPE-SIMPLE.CC
+#
+CREATE TABLE t1 (a INTEGER, b VARCHAR(255));
+INSERT INTO t1 VALUES (1,'x');
+INSERT INTO t1 VALUES (-3,'y');
+CREATE TABLE t2 ( a INTEGER );
+SET sql_mode='';
+SELECT MIN(a) AS field1 FROM t1 WHERE b IN ( SELECT a FROM t2 ) ORDER BY LEAD(a, 5, 7) OVER (ORDER BY b);
+field1
+NULL
+SELECT MIN(a), LEAD(a, 5, 7) OVER (ORDER BY b) AS field1 FROM t1 WHERE b IN ( SELECT a FROM t2 ) ORDER BY b;
+MIN(a)	field1
+NULL	7
+SET sql_mode=DEFAULT;
+DROP TABLE t1, t2;
+#
+# Bug #33075752: WL#14419: ASSERTION `N < SIZE()' FAILED|INCLUDE/PREALLOCED_ARRAY.H
+#
+CREATE TABLE t1 ( a INTEGER );
+SELECT DISTINCT
+0 AS field1,
+RANK() OVER (ORDER BY a) AS field2,
+LAST_VALUE(a) OVER (ORDER BY a + 1) AS field3
+FROM t1
+GROUP BY a, field1 WITH ROLLUP
+ORDER BY field1, field2, field3;
+field1	field2	field3
+DROP TABLE t1;
+#
+# Bug #33181670: Recent regression: Memory leak with window functions and user variables
+#
+CREATE TABLE t1 (a INTEGER);
+INSERT INTO t1 VALUES (1);
+SELECT LAST_VALUE(0) OVER (ORDER BY (@f:='x')) FROM t1;
+LAST_VALUE(0) OVER (ORDER BY (@f:='x'))
+0
+Warnings:
+Warning	1287	Setting user variables within expressions is deprecated and will be removed in a future release. Consider alternatives: 'SET variable=expression, ...', or 'SELECT expression(s) INTO variables(s)'.
+DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/window_functions_explain.result mysql-8.0-8.0.27/mysql-test/r/window_functions_explain.result
--- mysql-8.0-8.0.26/mysql-test/r/window_functions_explain.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/window_functions_explain.result	2021-09-28 11:46:34.000000000 +0000
@@ -5966,7 +5966,7 @@
   }
 }
 Warnings:
-Note	1003	/* select#1 */ select ((((row_number() OVER `w1` * 5) - 1) DIV count(0) OVER `w2`) + 1) AS `cnt` from `test`.`t1` window `w1` AS (ORDER BY `test`.`t1`.`id` ) , `w2` AS () 
+Note	1003	/* select#1 */ select ((((```row_number() OVER w1``` * 5) - 1) DIV count(0) OVER `w2`) + 1) AS `cnt` from `test`.`t1` window `w1` AS (ORDER BY `test`.`t1`.`id` ) , `w2` AS () 
 EXPLAIN FORMAT=JSON SELECT  (ROW_NUMBER() OVER w1 * 5 - 1) DIV (COUNT(*) OVER w2) + 1 AS ntile_manually,
 COUNT(*) OVER w3
 FROM t1 WINDOW w1 AS (ORDER BY id ASC),
@@ -6040,7 +6040,7 @@
   }
 }
 Warnings:
-Note	1003	/* select#1 */ select ((((row_number() OVER `w1` * 5) - 1) DIV count(0) OVER `w2`) + 1) AS `ntile_manually`,count(0) OVER `w3` AS `COUNT(*) OVER w3` from `test`.`t1` window `w1` AS (ORDER BY `test`.`t1`.`id` ) , `w2` AS () , `w3` AS () 
+Note	1003	/* select#1 */ select ((((```row_number() OVER w1``` * 5) - 1) DIV ```count(0) OVER w2```) + 1) AS `ntile_manually`,count(0) OVER `w3` AS `COUNT(*) OVER w3` from `test`.`t1` window `w1` AS (ORDER BY `test`.`t1`.`id` ) , `w2` AS () , `w3` AS () 
 NTILE in combination with a frame that doesn't cover current row (was bug)
 EXPLAIN FORMAT=JSON SELECT id, ROW_NUMBER() OVER w, SUM(id) OVER w, NTILE(5) OVER w FROM t1
 WINDOW w AS (ORDER BY id ROWS BETWEEN UNBOUNDED PRECEDING AND 2 PRECEDING);
@@ -11642,7 +11642,7 @@
   }
 }
 Warnings:
-Note	1003	/* select#1 */ select `test`.`tj2`.`i` AS `i`,sum(sum(`test`.`tj2`.`i`)) OVER ()  AS `SUM(SUM(i)) OVER ()`,sum(`test`.`tj2`.`i`) OVER (ORDER BY `test`.`tj2`.`i` )  AS `SUM(i) OVER (ORDER BY i)`,(sum(`test`.`tj2`.`i`) % 2) AS `MOD(SUM(i),2)`,sum(`test`.`tj2`.`i`) AS `SUM(i)` from `test`.`tj2` group by `test`.`tj2`.`i`
+Note	1003	/* select#1 */ select `test`.`tj2`.`i` AS `i`,sum(```sum(tj2.i)```) OVER ()  AS `SUM(SUM(i)) OVER ()`,sum(`test`.`tj2`.`i`) OVER (ORDER BY `test`.`tj2`.`i` )  AS `SUM(i) OVER (ORDER BY i)`,(sum(`test`.`tj2`.`i`) % 2) AS `MOD(SUM(i),2)`,sum(`test`.`tj2`.`i`) AS `SUM(i)` from `test`.`tj2` group by `test`.`tj2`.`i`
 DROP TABLE tj2;
 ----------------------------------------------------------------------
 -    Bug fixes
@@ -11814,7 +11814,7 @@
   }
 }
 Warnings:
-Note	1003	/* select#1 */ select `test`.`tj`.`j` AS `j`,cast(sum(`test`.`tj`.`j`) OVER (PARTITION BY `test`.`tj`.`i` )  as json) AS `CAST(SUM(j) OVER (PARTITION BY i) AS JSON)`,cast(sum(`test`.`tj`.`j`) OVER ()  as json) AS `CAST(SUM(j) OVER () AS JSON)` from `test`.`tj`
+Note	1003	/* select#1 */ select `test`.`tj`.`j` AS `j`,cast(```sum(tj.j) OVER (PARTITION BY tj.i ) ``` as json) AS `CAST(SUM(j) OVER (PARTITION BY i) AS JSON)`,cast(sum(`test`.`tj`.`j`) OVER ()  as json) AS `CAST(SUM(j) OVER () AS JSON)` from `test`.`tj`
 EXPLAIN FORMAT=JSON SELECT j,CAST(SUM(j) OVER (PARTITION BY i ROWS UNBOUNDED PRECEDING) AS JSON), CAST(SUM(j) OVER (PARTITION BY i ROWS UNBOUNDED PRECEDING) AS JSON) FROM tj;
 EXPLAIN
 {
@@ -14050,7 +14050,7 @@
   }
 }
 Warnings:
-Note	1003	/* select#1 */ select `alias`.`sum1` AS `sum1`,`alias`.`a` AS `a` from (/* select#2 */ select (count(0) OVER ()  + sum(`test`.`t`.`c`) OVER () ) AS `sum1`,`test`.`t`.`a` AS `a` from `test`.`t`) `alias`
+Note	1003	/* select#1 */ select `alias`.`sum1` AS `sum1`,`alias`.`a` AS `a` from (/* select#2 */ select (```count(0) OVER () ``` + sum(`test`.`t`.`c`) OVER () ) AS `sum1`,`test`.`t`.`a` AS `a` from `test`.`t`) `alias`
 Wrong result if subquery window function referenced another column in the select list
 This was OK, but:
 EXPLAIN FORMAT=JSON SELECT * FROM (SELECT SUM(b) OVER (), a FROM t) AS alias;
@@ -15381,7 +15381,7 @@
   }
 }
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,sum(`test`.`t2`.`b`) OVER (ORDER BY `test`.`t1`.`a` )  AS `SUM(t2.b) OVER(ORDER BY t1.a)` from `test`.`t1` join `test`.`t1` `t2` order by `test`.`t2`.`a`
+Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,sum(`test`.`t1`.`b`) OVER (ORDER BY `test`.`t1`.`a` )  AS `SUM(t2.b) OVER(ORDER BY t1.a)` from `test`.`t1` join `test`.`t1` `t2` order by `test`.`t2`.`a`
 DROP TABLE t1;
 #
 # Bug#26612356 WINDOW FUNCTIONS: FIX COST ESTIMATES
@@ -16605,14 +16605,20 @@
                 "adding_tmp_table_in_plan_at_position": 2,
                 "cause": "output_for_window_functions",
                 "with_buffer": false,
-                "write_method": "write_all_rows",
-                "adding_sort_to_previous_table": {
-                  "filesort": {
-                    "adding_sort_to_table": ""
-                  }
+                "write_method": "write_all_rows"
+              },
+              {
+                "filesort": {
+                  "adding_sort_to_table": ""
                 }
               },
               {
+                "adding_tmp_table_in_plan_at_position": 3,
+                "cause": "output_for_window_functions",
+                "with_buffer": true,
+                "write_method": "write_all_rows"
+              },
+              {
                 "creating_tmp_table": {
                   "tmp_table_info": {
                     "table": "intermediate_tmp_table",
@@ -16627,18 +16633,12 @@
                 }
               },
               {
-                "adding_tmp_table_in_plan_at_position": 3,
-                "cause": "output_for_window_functions",
-                "with_buffer": true,
-                "write_method": "write_all_rows",
-                "adding_sort_to_previous_table": {
-                  "filesort": {
-                    "adding_sort_to_table": ""
-                  }
-                },
                 "filesort": {
                   "adding_sort_to_table": ""
                 }
+              },
+              {
+                "adding_sort_to_table": ""
               }
             ]
           }
@@ -16729,7 +16729,7 @@
                           "num_rows_found": 24,
                           "num_initial_chunks_spilled_to_disk": 0,
                           "peak_memory_used": "NNN",
-                          "sort_algorithm": "std::stable_sort",
+                          "sort_algorithm": "std::sort",
                           "sort_mode": "<fixed_sort_key, packed_additional_fields>"
                         }
                       }
@@ -16759,7 +16759,7 @@
                     "num_rows_found": 24,
                     "num_initial_chunks_spilled_to_disk": 0,
                     "peak_memory_used": "NNN",
-                    "sort_algorithm": "std::stable_sort",
+                    "sort_algorithm": "std::sort",
                     "sort_mode": "<fixed_sort_key, packed_additional_fields>"
                   }
                 }
diff -Nru mysql-8.0-8.0.26/mysql-test/r/window_functions_in2exists_hypergraph.result mysql-8.0-8.0.27/mysql-test/r/window_functions_in2exists_hypergraph.result
--- mysql-8.0-8.0.26/mysql-test/r/window_functions_in2exists_hypergraph.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/window_functions_in2exists_hypergraph.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,51 @@
+CREATE TABLE t(a INT);
+INSERT INTO t VALUES (1),(2),(3);
+ANALYZE TABLE t;
+Table	Op	Msg_type	Msg_text
+test.t	analyze	status	OK
+=ALL => NOT EXISTS (select non-equal rows)
+SELECT * FROM t WHERE a = ALL(SELECT ROW_NUMBER() OVER () + 1 FROM t);
+a
+<>SOME => EXISTS (select non-equal rows)
+SELECT * FROM t WHERE a <> SOME(SELECT ROW_NUMBER() OVER () + 1 FROM t);
+a
+1
+2
+3
+SELECT * FROM t WHERE a <> ANY(SELECT ROW_NUMBER() OVER () + 1 FROM t);
+a
+1
+2
+3
+# Correlated => no subquery materialization.
+# IN => EXISTS, error
+SELECT * FROM t upper
+WHERE upper.a IN (SELECT ROW_NUMBER() OVER () FROM t
+WHERE t.a > upper.a);
+a
+1
+# Correlated => no subquery materialization.
+# >ANY => EXISTS(select smaller rows), error
+SELECT * FROM t upper
+WHERE upper.a > ANY (SELECT ROW_NUMBER() OVER () FROM t
+WHERE t.a > upper.a);
+a
+2
+SELECT * FROM t upper
+WHERE upper.a > ALL (SELECT ROW_NUMBER() OVER () FROM t
+WHERE t.a > upper.a);
+a
+2
+3
+DROP TABLE t;
+#
+# Bug#25601138 WINDOW FUNCTION IN CORRELATED SUBQUERY GIVES WRONG RESULT
+#
+CREATE TABLE t1(i INT, j INT, k INT);
+INSERT INTO t1 VALUES (1,1,1),(2,2,2);
+select * from t1 AS upper where i+1
+IN (select row_number() over () + upper.i from t1 );
+i	j	k
+1	1	1
+2	2	2
+DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/window_functions_in2exists.result mysql-8.0-8.0.27/mysql-test/r/window_functions_in2exists.result
--- mysql-8.0-8.0.26/mysql-test/r/window_functions_in2exists.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/window_functions_in2exists.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,32 @@
+CREATE TABLE t(a INT);
+INSERT INTO t VALUES (1),(2),(3);
+ANALYZE TABLE t;
+Table	Op	Msg_type	Msg_text
+test.t	analyze	status	OK
+=ALL => NOT EXISTS (select non-equal rows)
+SELECT * FROM t WHERE a = ALL(SELECT ROW_NUMBER() OVER () + 1 FROM t);
+<>SOME => EXISTS (select non-equal rows)
+SELECT * FROM t WHERE a <> SOME(SELECT ROW_NUMBER() OVER () + 1 FROM t);
+SELECT * FROM t WHERE a <> ANY(SELECT ROW_NUMBER() OVER () + 1 FROM t);
+# Correlated => no subquery materialization.
+# IN => EXISTS, error
+SELECT * FROM t upper
+WHERE upper.a IN (SELECT ROW_NUMBER() OVER () FROM t
+WHERE t.a > upper.a);
+# Correlated => no subquery materialization.
+# >ANY => EXISTS(select smaller rows), error
+SELECT * FROM t upper
+WHERE upper.a > ANY (SELECT ROW_NUMBER() OVER () FROM t
+WHERE t.a > upper.a);
+SELECT * FROM t upper
+WHERE upper.a > ALL (SELECT ROW_NUMBER() OVER () FROM t
+WHERE t.a > upper.a);
+DROP TABLE t;
+#
+# Bug#25601138 WINDOW FUNCTION IN CORRELATED SUBQUERY GIVES WRONG RESULT
+#
+CREATE TABLE t1(i INT, j INT, k INT);
+INSERT INTO t1 VALUES (1,1,1),(2,2,2);
+select * from t1 AS upper where i+1
+IN (select row_number() over () + upper.i from t1 );
+DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/window_functions_interesting_orders.result mysql-8.0-8.0.27/mysql-test/r/window_functions_interesting_orders.result
--- mysql-8.0-8.0.26/mysql-test/r/window_functions_interesting_orders.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/window_functions_interesting_orders.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,110 @@
+CREATE TABLE t1 ( a INTEGER, b INTEGER, c INTEGER );
+INSERT INTO t1 (a,b,c) VALUES (1,2,3);
+INSERT INTO t1 SELECT * FROM t1;
+INSERT INTO t1 SELECT * FROM t1;
+INSERT INTO t1 SELECT * FROM t1;
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+EXPLAIN FORMAT=tree SELECT SUM(c) OVER (PARTITION BY a ORDER BY b) FROM t1;
+EXPLAIN
+-> Window aggregate with buffering: sum(t1.c) OVER (PARTITION BY t1.a ORDER BY t1.b ) 
+    -> Sort: t1.a, t1.b
+        -> Table scan on t1
+
+EXPLAIN FORMAT=tree SELECT SUM(c) OVER (PARTITION BY a ORDER BY b), SUM(c) OVER (ORDER BY a,b) FROM t1;
+EXPLAIN
+-> Window aggregate with buffering: sum(t1.c) OVER (ORDER BY t1.a,t1.b ) 
+    -> Window aggregate with buffering: sum(t1.c) OVER (PARTITION BY t1.a ORDER BY t1.b ) 
+        -> Sort: t1.a, t1.b
+            -> Table scan on t1
+
+EXPLAIN FORMAT=tree SELECT SUM(b) OVER (PARTITION BY a), SUM(c) OVER (ORDER BY a,b) FROM t1;
+EXPLAIN
+-> Window aggregate with buffering: sum(t1.c) OVER (ORDER BY t1.a,t1.b ) 
+    -> Window aggregate with buffering: sum(t1.b) OVER (PARTITION BY t1.a ) 
+        -> Sort: t1.a, t1.b
+            -> Table scan on t1
+
+EXPLAIN FORMAT=tree SELECT SUM(c) OVER (PARTITION BY a ORDER BY b), SUM(c) OVER (ORDER BY b,a) FROM t1;
+EXPLAIN
+-> Window aggregate with buffering: sum(t1.c) OVER (ORDER BY t1.b,t1.a ) 
+    -> Sort: t1.b, t1.a
+        -> Window aggregate with buffering: sum(t1.c) OVER (PARTITION BY t1.a ORDER BY t1.b ) 
+            -> Sort: t1.a, t1.b
+                -> Table scan on t1
+
+CREATE INDEX idx ON t1 (a, b);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+EXPLAIN FORMAT=tree SELECT SUM(c) OVER (PARTITION BY a) FROM t1;
+EXPLAIN
+-> Window aggregate with buffering: sum(t1.c) OVER (PARTITION BY t1.a ) 
+    -> Index scan on t1 using idx
+
+EXPLAIN FORMAT=tree SELECT SUM(c) OVER (PARTITION BY a ORDER BY b) FROM t1;
+EXPLAIN
+-> Window aggregate with buffering: sum(t1.c) OVER (PARTITION BY t1.a ORDER BY t1.b ) 
+    -> Index scan on t1 using idx
+
+ALTER TABLE t1 DROP INDEX idx;
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+EXPLAIN FORMAT=tree SELECT a, SUM(c) OVER (PARTITION BY a) FROM t1 ORDER BY a;
+EXPLAIN
+-> Window aggregate with buffering: sum(t1.c) OVER (PARTITION BY t1.a ) 
+    -> Sort: t1.a
+        -> Table scan on t1
+
+EXPLAIN FORMAT=tree SELECT a, SUM(c) OVER (ORDER BY b), AVG(c) OVER (ORDER BY a), SUM(c) OVER (PARTITION BY a) AS x FROM t1 ORDER BY b, x;
+EXPLAIN
+-> Window aggregate with buffering: sum(t1.c) OVER (ORDER BY t1.b ) 
+    -> Sort: t1.b, x
+        -> Window aggregate with buffering: sum(t1.c) OVER (PARTITION BY t1.a ) 
+            -> Window aggregate with buffering: avg(t1.c) OVER (ORDER BY t1.a ) 
+                -> Sort: t1.a
+                    -> Table scan on t1
+
+EXPLAIN FORMAT=tree SELECT DISTINCT a, SUM(c) OVER (ORDER BY b) FROM t1;
+EXPLAIN
+-> Sort with duplicate removal: t1.a, `SUM(c) OVER (ORDER BY b)`
+    -> Window aggregate with buffering: sum(t1.c) OVER (ORDER BY t1.b ) 
+        -> Sort: t1.b
+            -> Table scan on t1
+
+EXPLAIN FORMAT=tree SELECT DISTINCT a, b, SUM(b) OVER (PARTITION BY a) FROM t1 ORDER BY a;
+EXPLAIN
+-> Remove duplicates from input grouped on t1.a, t1.b  (cost=3.65..5.05 rows=8)
+    -> Window aggregate with buffering: sum(t1.b) OVER (PARTITION BY t1.a )   (cost=3.55..4.25 rows=8)
+        -> Sort: t1.a, t1.b  (cost=3.45..3.45 rows=8)
+            -> Table scan on t1  (cost=0.03..0.25 rows=8)
+
+EXPLAIN FORMAT=tree SELECT DISTINCT a, SUM(c) OVER (ORDER BY b) FROM t1 ORDER BY a;
+EXPLAIN
+-> Sort with duplicate removal: t1.a, `SUM(c) OVER (ORDER BY b)`
+    -> Window aggregate with buffering: sum(t1.c) OVER (ORDER BY t1.b ) 
+        -> Sort: t1.b
+            -> Table scan on t1
+
+EXPLAIN FORMAT=tree SELECT SUM(a) OVER (ORDER BY b) FROM t1 WHERE b=3;
+EXPLAIN
+-> Window aggregate with buffering: sum(t1.a) OVER (ORDER BY t1.b ) 
+    -> Filter: (t1.b = 3)
+        -> Table scan on t1
+
+CREATE INDEX idx ON t1 (a);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+EXPLAIN FORMAT=tree SELECT t1.a, SUM(t1.a) OVER (ORDER BY t1.a), SUM(t2.b) OVER (ORDER BY t2.b) FROM t1 JOIN t1 AS t2 ON t1.a = t2.b;
+EXPLAIN
+-> Window aggregate with buffering: sum(t1.b) OVER (ORDER BY t1.b ) 
+    -> Window aggregate with buffering: sum(t1.a) OVER (ORDER BY t1.a ) 
+        -> Nested loop inner join
+            -> Index scan on t1 using idx
+            -> Filter: (t1.a = t2.b)
+                -> Table scan on t2
+
+DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/r/window_functions.result mysql-8.0-8.0.27/mysql-test/r/window_functions.result
--- mysql-8.0-8.0.26/mysql-test/r/window_functions.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/window_functions.result	2021-09-28 11:46:34.000000000 +0000
@@ -905,20 +905,22 @@
 11	NULL	1
 SELECT id value,
 SUM(id) OVER (ROWS UNBOUNDED PRECEDING)
-FROM t1 u, t2 WHERE t2.user_id = u.id;
+FROM t1 u LEFT JOIN t2 ON t2.user_id = u.id;
 value	SUM(id) OVER (ROWS UNBOUNDED PRECEDING)
 1	1
-2	3
-1	4
+1	2
+2	4
 3	7
 4	11
 4	15
 5	20
+10	30
+11	41
 Aggregate with GROUP BY arguments to window function
 SELECT AVG(id) average,
-SUM(AVG(id)) OVER (ROWS UNBOUNDED PRECEDING)
+SUM(AVG(id)) OVER (ORDER BY sex DESC ROWS UNBOUNDED PRECEDING)
 FROM t1 u, t2 WHERE t2.user_id = u.id GROUP BY sex;
-average	SUM(AVG(id)) OVER (ROWS UNBOUNDED PRECEDING)
+average	SUM(AVG(id)) OVER (ORDER BY sex DESC ROWS UNBOUNDED PRECEDING)
 2.3333	2.3333
 3.2500	5.5833
 Aggregate with GROUP BY in window's ORDER BY clause, with aggregate present in
@@ -1703,12 +1705,12 @@
 ROW_NUMBER() OVER (ORDER BY sex,id)
 FROM t1;
 id	sex	SUM(id) OVER (ORDER BY id ROWS UNBOUNDED PRECEDING)	RANK() OVER (ORDER BY sex,id)	ROW_NUMBER() OVER (ORDER BY sex,id)
+1	M	1	6	6
 10	NULL	25	1	1
 11	NULL	36	2	2
 2	F	3	3	3
 3	F	6	4	4
 4	F	10	5	5
-1	M	1	6	6
 5	M	15	7	7
 SELECT t1.*, SUM(id) OVER (ORDER BY id ROWS UNBOUNDED PRECEDING),
 PERCENT_RANK() OVER (ORDER BY sex,id),
@@ -1716,12 +1718,12 @@
 ROW_NUMBER() OVER (ORDER BY sex,id)
 FROM t1;
 id	sex	SUM(id) OVER (ORDER BY id ROWS UNBOUNDED PRECEDING)	PERCENT_RANK() OVER (ORDER BY sex,id)	CUME_DIST() OVER (ORDER BY sex,id)	ROW_NUMBER() OVER (ORDER BY sex,id)
+1	M	1	0.8333333333333334	0.8571428571428571	6
 10	NULL	25	0	0.14285714285714285	1
 11	NULL	36	0.16666666666666666	0.2857142857142857	2
 2	F	3	0.3333333333333333	0.42857142857142855	3
 3	F	6	0.5	0.5714285714285714	4
 4	F	10	0.6666666666666666	0.7142857142857143	5
-1	M	1	0.8333333333333334	0.8571428571428571	6
 5	M	15	1	1	7
 a little more windows + subquery
 SELECT t.*, SUM(id + r00 + r01) OVER (ORDER BY id ROWS UNBOUNDED PRECEDING) AS s FROM (
@@ -3716,30 +3718,30 @@
 22:30:00	NULL
 SELECT p, t, FIRST_VALUE(t) OVER w FROM t_time2 WINDOW w AS (PARTITION by p );
 p	t	FIRST_VALUE(t) OVER w
-1	12:30:00	12:30:00
-1	22:30:00	12:30:00
-1	13:30:00	12:30:00
+1	00:30:00	12:30:00
+1	00:31:00	12:30:00
 1	01:30:00	12:30:00
-1	15:30:00	12:30:00
-1	20:30:00	12:30:00
 1	04:30:00	12:30:00
 1	06:30:00	12:30:00
+1	12:30:00	12:30:00
+1	13:30:00	12:30:00
+1	15:30:00	12:30:00
 1	18:30:00	12:30:00
+1	20:30:00	12:30:00
 1	21:30:00	12:30:00
-1	00:30:00	12:30:00
-1	00:31:00	12:30:00
-2	12:30:00	12:30:00
-2	22:30:00	12:30:00
-2	13:30:00	12:30:00
+1	22:30:00	12:30:00
+2	00:30:00	12:30:00
+2	00:31:00	12:30:00
 2	01:30:00	12:30:00
-2	15:30:00	12:30:00
-2	20:30:00	12:30:00
 2	04:30:00	12:30:00
 2	06:30:00	12:30:00
+2	12:30:00	12:30:00
+2	13:30:00	12:30:00
+2	15:30:00	12:30:00
 2	18:30:00	12:30:00
+2	20:30:00	12:30:00
 2	21:30:00	12:30:00
-2	00:30:00	12:30:00
-2	00:31:00	12:30:00
+2	22:30:00	12:30:00
 SELECT p, t, FIRST_VALUE(t) OVER w FROM t_time2 WINDOW w AS (PARTITION by p ORDER BY t);
 p	t	FIRST_VALUE(t) OVER w
 1	00:30:00	00:30:00
@@ -4291,28 +4293,28 @@
 With GROUP BY
 SELECT          COUNT(*) OVER (), MOD(SUM(i),2) FROM tj2 GROUP BY i;
 COUNT(*) OVER ()	MOD(SUM(i),2)
-4	1
 4	0
 4	0
+4	1
 4	NULL
 SELECT DISTINCT COUNT(*) OVER (), MOD(SUM(i),2) FROM tj2 GROUP BY i;
 COUNT(*) OVER ()	MOD(SUM(i),2)
-4	1
 4	0
+4	1
 4	NULL
 Bug fix GROUP BY with window function referring column used in grouping expression
 SELECT i, SUM(i) OVER (), MOD(SUM(i),2) FROM tj2 GROUP BY i;
 i	SUM(i) OVER ()	MOD(SUM(i),2)
-1	3	1
 0	3	0
+1	3	1
 2	3	0
 NULL	3	NULL
 SELECT i, SUM(SUM(i)) OVER (), SUM(i) OVER (ORDER BY i), MOD(SUM(i),2), SUM(i) FROM tj2 GROUP BY i;
 i	SUM(SUM(i)) OVER ()	SUM(i) OVER (ORDER BY i)	MOD(SUM(i),2)	SUM(i)
-NULL	7	NULL	NULL	NULL
 0	7	0	0	0
 1	7	1	1	3
 2	7	3	0	4
+NULL	7	NULL	NULL	NULL
 DROP TABLE tj2;
 ----------------------------------------------------------------------
 -    Bug fixes
@@ -6217,14 +6219,6 @@
 a
 2
 3
-=ALL => NOT EXISTS (select non-equal rows)
-SELECT * FROM t WHERE a = ALL(SELECT ROW_NUMBER() OVER () + 1 FROM t);
-ERROR 42000: This version of MySQL doesn't yet support 'the combination of this ALL/ANY/SOME/IN subquery with this comparison operator and with contained window functions'
-<>SOME => EXISTS (select non-equal rows)
-SELECT * FROM t WHERE a <> SOME(SELECT ROW_NUMBER() OVER () + 1 FROM t);
-ERROR 42000: This version of MySQL doesn't yet support 'the combination of this ALL/ANY/SOME/IN subquery with this comparison operator and with contained window functions'
-SELECT * FROM t WHERE a <> ANY(SELECT ROW_NUMBER() OVER () + 1 FROM t);
-ERROR 42000: This version of MySQL doesn't yet support 'the combination of this ALL/ANY/SOME/IN subquery with this comparison operator and with contained window functions'
 SELECT * FROM t WHERE a <> ALL(SELECT ROW_NUMBER() OVER () + 1 FROM t);
 a
 1
@@ -6402,34 +6396,8 @@
 Warnings:
 Note	1276	Field or reference 'test.upper.a' of SELECT #2 was resolved in SELECT #1
 Note	1003	/* select#1 */ select `test`.`upper`.`a` AS `a` from `test`.`t` `upper` semi join ((/* select#3 */ select row_number() OVER ()  AS `rn` from `test`.`t`) `ta`) where (`ta`.`rn` > `test`.`upper`.`a`)
-# Correlated => no subquery materialization.
-# IN => EXISTS, error
-SELECT * FROM t upper
-WHERE upper.a IN (SELECT ROW_NUMBER() OVER () FROM t
-WHERE t.a > upper.a);
-ERROR 42000: This version of MySQL doesn't yet support 'the combination of this ALL/ANY/SOME/IN subquery with this comparison operator and with contained window functions'
-# Correlated => no subquery materialization.
-# >ANY => EXISTS(select smaller rows), error
-SELECT * FROM t upper
-WHERE upper.a > ANY (SELECT ROW_NUMBER() OVER () FROM t
-WHERE t.a > upper.a);
-ERROR 42000: This version of MySQL doesn't yet support 'the combination of this ALL/ANY/SOME/IN subquery with this comparison operator and with contained window functions'
-SELECT * FROM t upper
-WHERE upper.a > ALL (SELECT ROW_NUMBER() OVER () FROM t
-WHERE t.a > upper.a);
-ERROR 42000: This version of MySQL doesn't yet support 'the combination of this ALL/ANY/SOME/IN subquery with this comparison operator and with contained window functions'
 DROP TABLE t;
 #
-# Bug#25601138 WINDOW FUNCTION IN CORRELATED SUBQUERY GIVES WRONG RESULT
-#
-CREATE TABLE t1(i INT, j INT, k INT);
-INSERT INTO t1 VALUES (1,1,1),(2,2,2);
-# When we support this, expected result is 1,1,1 and 2,2,2
-select * from t1 AS upper where i+1
-IN (select row_number() over () + upper.i from t1 );
-ERROR 42000: This version of MySQL doesn't yet support 'the combination of this ALL/ANY/SOME/IN subquery with this comparison operator and with contained window functions'
-DROP TABLE t1;
-#
 # Check window aggregate referencing columns from an outside query
 # All results checked against Postgresql which also allows this.
 CREATE TABLE t1(i INT, j INT, k INT);
diff -Nru mysql-8.0-8.0.26/mysql-test/r/window_jsonaggs.result mysql-8.0-8.0.27/mysql-test/r/window_jsonaggs.result
--- mysql-8.0-8.0.26/mysql-test/r/window_jsonaggs.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/window_jsonaggs.result	2021-09-28 11:46:34.000000000 +0000
@@ -163,18 +163,18 @@
 OVER w jarray_f FROM t1 GROUP BY i,f WITH ROLLUP HAVING GROUPING(f)=1
 WINDOW w AS (ORDER BY f);
 i	f	jarray_i	jarray_f
-NULL	NULL	[null, 1, 2, 3, 4, 5, 8, 9, 10, 11, 13, 15, null]	[null, null, null, null, null, null, null, null, null, null, null, null, null]
 1	NULL	[null, 1, 2, 3, 4, 5, 8, 9, 10, 11, 13, 15, null]	[null, null, null, null, null, null, null, null, null, null, null, null, null]
+10	NULL	[null, 1, 2, 3, 4, 5, 8, 9, 10, 11, 13, 15, null]	[null, null, null, null, null, null, null, null, null, null, null, null, null]
+11	NULL	[null, 1, 2, 3, 4, 5, 8, 9, 10, 11, 13, 15, null]	[null, null, null, null, null, null, null, null, null, null, null, null, null]
+13	NULL	[null, 1, 2, 3, 4, 5, 8, 9, 10, 11, 13, 15, null]	[null, null, null, null, null, null, null, null, null, null, null, null, null]
+15	NULL	[null, 1, 2, 3, 4, 5, 8, 9, 10, 11, 13, 15, null]	[null, null, null, null, null, null, null, null, null, null, null, null, null]
 2	NULL	[null, 1, 2, 3, 4, 5, 8, 9, 10, 11, 13, 15, null]	[null, null, null, null, null, null, null, null, null, null, null, null, null]
 3	NULL	[null, 1, 2, 3, 4, 5, 8, 9, 10, 11, 13, 15, null]	[null, null, null, null, null, null, null, null, null, null, null, null, null]
 4	NULL	[null, 1, 2, 3, 4, 5, 8, 9, 10, 11, 13, 15, null]	[null, null, null, null, null, null, null, null, null, null, null, null, null]
 5	NULL	[null, 1, 2, 3, 4, 5, 8, 9, 10, 11, 13, 15, null]	[null, null, null, null, null, null, null, null, null, null, null, null, null]
 8	NULL	[null, 1, 2, 3, 4, 5, 8, 9, 10, 11, 13, 15, null]	[null, null, null, null, null, null, null, null, null, null, null, null, null]
 9	NULL	[null, 1, 2, 3, 4, 5, 8, 9, 10, 11, 13, 15, null]	[null, null, null, null, null, null, null, null, null, null, null, null, null]
-10	NULL	[null, 1, 2, 3, 4, 5, 8, 9, 10, 11, 13, 15, null]	[null, null, null, null, null, null, null, null, null, null, null, null, null]
-11	NULL	[null, 1, 2, 3, 4, 5, 8, 9, 10, 11, 13, 15, null]	[null, null, null, null, null, null, null, null, null, null, null, null, null]
-13	NULL	[null, 1, 2, 3, 4, 5, 8, 9, 10, 11, 13, 15, null]	[null, null, null, null, null, null, null, null, null, null, null, null, null]
-15	NULL	[null, 1, 2, 3, 4, 5, 8, 9, 10, 11, 13, 15, null]	[null, null, null, null, null, null, null, null, null, null, null, null, null]
+NULL	NULL	[null, 1, 2, 3, 4, 5, 8, 9, 10, 11, 13, 15, null]	[null, null, null, null, null, null, null, null, null, null, null, null, null]
 NULL	NULL	[null, 1, 2, 3, 4, 5, 8, 9, 10, 11, 13, 15, null]	[null, null, null, null, null, null, null, null, null, null, null, null, null]
 # With other window functions
 SELECT i, f, RANK() OVER w rank1, NTH_VALUE(i,3)
@@ -852,8 +852,6 @@
 SELECT 0 & (JSON_ARRAYAGG(1) OVER w) FROM (select 1) as dt  WINDOW w as ();
 0 & (JSON_ARRAYAGG(1) OVER w)
 0
-Warnings:
-Warning	3156	Invalid JSON value for CAST to INTEGER from column json_arrayagg at row 1
 SELECT MAKETIME(((1)<=> (JSON_OBJECTAGG('1',1)OVER())),'1',1);
 MAKETIME(((1)<=> (JSON_OBJECTAGG('1',1)OVER())),'1',1)
 00:01:01
diff -Nru mysql-8.0-8.0.26/mysql-test/r/window_min_max.result mysql-8.0-8.0.27/mysql-test/r/window_min_max.result
--- mysql-8.0-8.0.26/mysql-test/r/window_min_max.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/window_min_max.result	2021-09-28 11:46:34.000000000 +0000
@@ -359,7 +359,7 @@
 3	1	11	3
 4	1	11	4
 NULL	1	48	4
-SELECT k, MIN(i), SUM(j), MIN(k) OVER (ROWS UNBOUNDED PRECEDING) min_wf FROM t
+SELECT k, MIN(i), SUM(j), MIN(k) OVER (ORDER BY k DESC ROWS UNBOUNDED PRECEDING) min_wf FROM t
 GROUP BY (k) WITH ROLLUP ORDER BY k DESC;
 k	MIN(i)	SUM(j)	min_wf
 4	1	11	4
@@ -1285,78 +1285,78 @@
 With GROUP BY
 SELECT          COUNT(*) OVER (), MOD(MIN(i),2) FROM tj2 GROUP BY i ;
 COUNT(*) OVER ()	MOD(MIN(i),2)
-4	1
 4	0
 4	0
+4	1
 4	NULL
 SELECT DISTINCT COUNT(*) OVER (), MOD(MAX(i),2) FROM tj2 GROUP BY i ;
 COUNT(*) OVER ()	MOD(MAX(i),2)
-4	1
 4	0
+4	1
 4	NULL
 Bug fix GROUP BY with window function referring column used in grouping expression
 SELECT i, MIN(i) OVER (), MOD(MIN(i),2) FROM tj2 GROUP BY i ;
 i	MIN(i) OVER ()	MOD(MIN(i),2)
-1	0	1
 0	0	0
+1	0	1
 2	0	0
 NULL	0	NULL
 SELECT i, MAX(MAX(i)) OVER (), MAX(i) OVER (ORDER BY i), MOD(MAX(i),2), MAX(i) FROM tj2 GROUP BY i ;
 i	MAX(MAX(i)) OVER ()	MAX(i) OVER (ORDER BY i)	MOD(MAX(i),2)	MAX(i)
-NULL	2	NULL	NULL	NULL
 0	2	0	0	0
 1	2	1	1	1
 2	2	2	0	2
+NULL	2	NULL	NULL	NULL
 SELECT i, MIN(i) OVER (ORDER BY i) FROM tj UNION ALL SELECT i, MIN(i) OVER (ORDER BY i) FROM tj;
 i	MIN(i) OVER (ORDER BY i)
-NULL	NULL
-NULL	NULL
-7	7
-8	7
-8	7
-9	7
 10	7
 10	7
 10	7
+10	7
+10	7
+10	7
+11	7
 11	7
 12	7
-NULL	NULL
-NULL	NULL
+12	7
+7	7
 7	7
 8	7
 8	7
+8	7
+8	7
 9	7
-10	7
-10	7
-10	7
-11	7
-12	7
+9	7
+NULL	NULL
+NULL	NULL
+NULL	NULL
+NULL	NULL
 SELECT j,CAST(MIN(j) OVER (PARTITION BY i) AS JSON), CAST(MAX(j) OVER () AS JSON) FROM tj;
 j	CAST(MIN(j) OVER (PARTITION BY i) AS JSON)	CAST(MAX(j) OVER () AS JSON)
-NULL	NULL	[1, 2, 3]
-NULL	NULL	[1, 2, 3]
 1	1	[1, 2, 3]
-[1, 2, 3]	[1, 2, 3]	[1, 2, 3]
-[1, 2, 3]	[1, 2, 3]	[1, 2, 3]
 2	2	[1, 2, 3]
 3	3	[1, 2, 3]
 3.14	3	[1, 2, 3]
 3.14	3	[1, 2, 3]
 4	4	[1, 2, 3]
 5	5	[1, 2, 3]
+NULL	NULL	[1, 2, 3]
+NULL	NULL	[1, 2, 3]
+[1, 2, 3]	[1, 2, 3]	[1, 2, 3]
+[1, 2, 3]	[1, 2, 3]	[1, 2, 3]
 SELECT j,CAST(MIN(j) OVER (PARTITION BY i ROWS UNBOUNDED PRECEDING) AS JSON), CAST(MAX(j) OVER (PARTITION BY i ROWS UNBOUNDED PRECEDING) AS JSON) FROM tj;
 j	CAST(MIN(j) OVER (PARTITION BY i ROWS UNBOUNDED PRECEDING) AS JSON)	CAST(MAX(j) OVER (PARTITION BY i ROWS UNBOUNDED PRECEDING) AS JSON)
-NULL	NULL	NULL
-NULL	NULL	NULL
 1	1	1
-[1, 2, 3]	[1, 2, 3]	[1, 2, 3]
-[1, 2, 3]	[1, 2, 3]	[1, 2, 3]
 2	2	2
 3	3	3
 3.14	3	3.14
 3.14	3	3.14
 4	4	4
 5	5	5
+NULL	NULL	NULL
+NULL	NULL	NULL
+[1, 2, 3]	[1, 2, 3]	[1, 2, 3]
+[1, 2, 3]	[1, 2, 3]	[1, 2, 3]
 DROP TABLE tj,tj2;
 CREATE TABLE t1 (i INTEGER, j INTEGER);
 INSERT INTO t1 VALUES (NULL,3),(NULL,3),(NULL,30),(NULL,30),(4,3),
diff -Nru mysql-8.0-8.0.26/mysql-test/r/window_std_var_optimized.result mysql-8.0-8.0.27/mysql-test/r/window_std_var_optimized.result
--- mysql-8.0-8.0.26/mysql-test/r/window_std_var_optimized.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/window_std_var_optimized.result	2021-09-28 11:46:34.000000000 +0000
@@ -290,16 +290,16 @@
 4	1,2,4,4	1.25
 SELECT k, GROUP_CONCAT(j ORDER BY j), STD(k+1) OVER (ORDER BY k DESC ROWS UNBOUNDED PRECEDING) std FROM t GROUP BY (k);
 k	GROUP_CONCAT(j ORDER BY j)	std
-4	1,2,4,4	0
-3	1,2,4,4	0.5
-2	1,2,4,4	0.816496580927726
 1	1,2,4,4,4	1.118033988749895
+2	1,2,4,4	0.816496580927726
+3	1,2,4,4	0.5
+4	1,2,4,4	0
 SELECT k, GROUP_CONCAT(j ORDER BY j), VAR_POP(k+1) OVER (ORDER BY k DESC ROWS UNBOUNDED PRECEDING) variance FROM t GROUP BY (k);
 k	GROUP_CONCAT(j ORDER BY j)	variance
-4	1,2,4,4	0
-3	1,2,4,4	0.25
-2	1,2,4,4	0.6666666666666666
 1	1,2,4,4,4	1.25
+2	1,2,4,4	0.6666666666666666
+3	1,2,4,4	0.25
+4	1,2,4,4	0
 CREATE TABLE t1 (id INTEGER, sex CHAR(1));
 INSERT INTO t1 VALUES (1, 'M');
 INSERT INTO t1 VALUES (2, 'F');
@@ -387,7 +387,7 @@
 3	0	11	1
 4	0	11	1.6666666666666667
 NULL	0	48	1.6666666666666667
-SELECT k, STD(i), SUM(j), STD(k) OVER (ROWS UNBOUNDED PRECEDING) std_wf FROM t
+SELECT k, STD(i), SUM(j), STD(k) OVER (ORDER BY k DESC ROWS UNBOUNDED PRECEDING) std_wf FROM t
 GROUP BY (k) WITH ROLLUP ORDER BY k DESC;
 k	STD(i)	SUM(j)	std_wf
 4	0	11	0
@@ -1237,9 +1237,6 @@
 4	INTEGER	0.7097006411156745
 5	INTEGER	0.7991714459363518
 [1, 2, 3]	ARRAY	1.8718106207626881
-Warnings:
-Warning	1235	This version of MySQL doesn't yet support 'sorting of non-scalar JSON values'
-Warning	3156	Invalid JSON value for CAST to DOUBLE from column j at row 9
 SELECT j, JSON_TYPE(j), VARIANCE(j) OVER (ORDER BY j ROWS 3 PRECEDING) FROM tj;
 j	JSON_TYPE(j)	VARIANCE(j) OVER (ORDER BY j ROWS 3 PRECEDING)
 NULL	NULL	NULL
@@ -1251,9 +1248,6 @@
 4	INTEGER	0.5036749999999994
 5	INTEGER	0.6386749999999992
 [1, 2, 3]	ARRAY	3.5036749999999994
-Warnings:
-Warning	1235	This version of MySQL doesn't yet support 'sorting of non-scalar JSON values'
-Warning	3156	Invalid JSON value for CAST to DOUBLE from column j at row 9
 SELECT j, JSON_TYPE(j), JSON_TYPE(STD(j) OVER (ORDER BY j RANGE 3 PRECEDING)) FROM tj;
 ERROR HY000: Window '<unnamed window>' with RANGE N PRECEDING/FOLLOWING frame requires exactly one ORDER BY expression, of numeric or temporal type
 INSERT INTO tj(j) VALUES ('3.14');
@@ -1322,58 +1316,53 @@
 Bug fix GROUP BY with window function referring column used in grouping expression
 SELECT i, STD(i) OVER (), MOD(STD(i),2) FROM tj2 GROUP BY i ;
 i	STD(i) OVER ()	MOD(STD(i),2)
-1	0.816496580927726	0
 0	0.816496580927726	0
+1	0.816496580927726	0
 2	0.816496580927726	0
 NULL	0.816496580927726	NULL
 SELECT i, VARIANCE(VARIANCE(i)) OVER (), VARIANCE(i) OVER (ORDER BY i), MOD(VARIANCE(i),2), VARIANCE(i) FROM tj2 GROUP BY i ;
 i	VARIANCE(VARIANCE(i)) OVER ()	VARIANCE(i) OVER (ORDER BY i)	MOD(VARIANCE(i),2)	VARIANCE(i)
-NULL	0	NULL	NULL	NULL
 0	0	0	0	0
 1	0	0.25	0	0
 2	0	0.6666666666666666	0	0
+NULL	0	NULL	NULL	NULL
 SELECT i, STD(i) OVER (ORDER BY i) FROM tj UNION ALL SELECT i, STD(i) OVER (ORDER BY i) FROM tj;
 i	STD(i) OVER (ORDER BY i)
-NULL	NULL
-NULL	NULL
-7	0
-8	0.4714045207910316
-8	0.4714045207910316
-9	0.7071067811865475
+10	1.1248582677159726
+10	1.1248582677159726
+10	1.1248582677159726
 10	1.1248582677159726
 10	1.1248582677159726
 10	1.1248582677159726
 11	1.2686114456365272
+11	1.2686114456365272
 12	1.4989708403591155
-NULL	NULL
-NULL	NULL
+12	1.4989708403591155
+7	0
 7	0
 8	0.4714045207910316
 8	0.4714045207910316
+8	0.4714045207910316
+8	0.4714045207910316
 9	0.7071067811865475
-10	1.1248582677159726
-10	1.1248582677159726
-10	1.1248582677159726
-11	1.2686114456365272
-12	1.4989708403591155
+9	0.7071067811865475
+NULL	NULL
+NULL	NULL
+NULL	NULL
+NULL	NULL
 SELECT j,CAST(STD(j) OVER (PARTITION BY i) AS JSON), CAST(VARIANCE(j) OVER () AS JSON) FROM tj;
 j	CAST(STD(j) OVER (PARTITION BY i) AS JSON)	CAST(VARIANCE(j) OVER () AS JSON)
-NULL	NULL	2.711535802469135
-NULL	NULL	2.711535802469135
-1	0.0	2.711535802469135
-[1, 2, 3]	0.0	2.711535802469135
-[1, 2, 3]	0.0	2.711535802469135
-2	0.0	2.711535802469135
-3	0.06599663291074434	2.711535802469135
-3.14	0.06599663291074434	2.711535802469135
-3.14	0.06599663291074434	2.711535802469135
-4	0.0	2.711535802469135
-5	0.0	2.711535802469135
-Warnings:
-Warning	3156	Invalid JSON value for CAST to DOUBLE from column j at row 1
-Warning	3156	Invalid JSON value for CAST to DOUBLE from column j at row 1
-Warning	3156	Invalid JSON value for CAST to DOUBLE from column j at row 1
-Warning	3156	Invalid JSON value for CAST to DOUBLE from column j at row 1
+NULL	NULL	2.71153580246914
+NULL	NULL	2.71153580246914
+1	0	2.71153580246914
+[1, 2, 3]	0	2.71153580246914
+[1, 2, 3]	0	2.71153580246914
+2	0	2.71153580246914
+3	0.06599663291074	2.71153580246914
+3.14	0.06599663291074	2.71153580246914
+3.14	0.06599663291074	2.71153580246914
+4	0	2.71153580246914
+5	0	2.71153580246914
 SELECT j,CAST(STD(j) OVER (PARTITION BY i ROWS UNBOUNDED PRECEDING) AS JSON), CAST(VARIANCE(j) OVER (PARTITION BY i ROWS UNBOUNDED PRECEDING) AS JSON) FROM tj;
 j	CAST(STD(j) OVER (PARTITION BY i ROWS UNBOUNDED PRECEDING) AS JSON)	CAST(VARIANCE(j) OVER (PARTITION BY i ROWS UNBOUNDED PRECEDING) AS JSON)
 NULL	NULL	NULL
@@ -1387,11 +1376,6 @@
 3.14	0.06599663291074434	0.004355555555555542
 4	0.0	0.0
 5	0.0	0.0
-Warnings:
-Warning	3156	Invalid JSON value for CAST to DOUBLE from column j at row 1
-Warning	3156	Invalid JSON value for CAST to DOUBLE from column j at row 1
-Warning	3156	Invalid JSON value for CAST to DOUBLE from column j at row 4
-Warning	3156	Invalid JSON value for CAST to DOUBLE from column j at row 5
 DROP TABLE tj,tj2;
 CREATE TABLE t1 (i INTEGER, j INTEGER);
 INSERT INTO t1 VALUES (NULL,3),(NULL,3),(NULL,30),(NULL,30),(4,3),
diff -Nru mysql-8.0-8.0.26/mysql-test/r/window_std_var.result mysql-8.0-8.0.27/mysql-test/r/window_std_var.result
--- mysql-8.0-8.0.26/mysql-test/r/window_std_var.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/r/window_std_var.result	2021-09-28 11:46:34.000000000 +0000
@@ -290,16 +290,16 @@
 4	1,2,4,4	1.25
 SELECT k, GROUP_CONCAT(j ORDER BY j), STD(k+1) OVER (ORDER BY k DESC ROWS UNBOUNDED PRECEDING) std FROM t GROUP BY (k);
 k	GROUP_CONCAT(j ORDER BY j)	std
-4	1,2,4,4	0
-3	1,2,4,4	0.5
-2	1,2,4,4	0.816496580927726
 1	1,2,4,4,4	1.118033988749895
+2	1,2,4,4	0.816496580927726
+3	1,2,4,4	0.5
+4	1,2,4,4	0
 SELECT k, GROUP_CONCAT(j ORDER BY j), VAR_POP(k+1) OVER (ORDER BY k DESC ROWS UNBOUNDED PRECEDING) variance FROM t GROUP BY (k);
 k	GROUP_CONCAT(j ORDER BY j)	variance
-4	1,2,4,4	0
-3	1,2,4,4	0.25
-2	1,2,4,4	0.6666666666666666
 1	1,2,4,4,4	1.25
+2	1,2,4,4	0.6666666666666666
+3	1,2,4,4	0.25
+4	1,2,4,4	0
 CREATE TABLE t1 (id INTEGER, sex CHAR(1));
 INSERT INTO t1 VALUES (1, 'M');
 INSERT INTO t1 VALUES (2, 'F');
@@ -387,7 +387,7 @@
 3	0	11	1
 4	0	11	1.6666666666666667
 NULL	0	48	1.6666666666666667
-SELECT k, STD(i), SUM(j), STD(k) OVER (ROWS UNBOUNDED PRECEDING) std_wf FROM t
+SELECT k, STD(i), SUM(j), STD(k) OVER (ORDER BY k DESC ROWS UNBOUNDED PRECEDING) std_wf FROM t
 GROUP BY (k) WITH ROLLUP ORDER BY k DESC;
 k	STD(i)	SUM(j)	std_wf
 4	0	11	0
@@ -1237,9 +1237,6 @@
 4	INTEGER	0.7097006411156749
 5	INTEGER	0.799171445936352
 [1, 2, 3]	ARRAY	1.8718106207626881
-Warnings:
-Warning	1235	This version of MySQL doesn't yet support 'sorting of non-scalar JSON values'
-Warning	3156	Invalid JSON value for CAST to DOUBLE from column j at row 9
 SELECT j, JSON_TYPE(j), VARIANCE(j) OVER (ORDER BY j ROWS 3 PRECEDING) FROM tj;
 j	JSON_TYPE(j)	VARIANCE(j) OVER (ORDER BY j ROWS 3 PRECEDING)
 NULL	NULL	NULL
@@ -1251,9 +1248,6 @@
 4	INTEGER	0.503675
 5	INTEGER	0.6386749999999997
 [1, 2, 3]	ARRAY	3.503675
-Warnings:
-Warning	1235	This version of MySQL doesn't yet support 'sorting of non-scalar JSON values'
-Warning	3156	Invalid JSON value for CAST to DOUBLE from column j at row 9
 SELECT j, JSON_TYPE(j), JSON_TYPE(STD(j) OVER (ORDER BY j RANGE 3 PRECEDING)) FROM tj;
 ERROR HY000: Window '<unnamed window>' with RANGE N PRECEDING/FOLLOWING frame requires exactly one ORDER BY expression, of numeric or temporal type
 INSERT INTO tj(j) VALUES ('3.14');
@@ -1322,58 +1316,53 @@
 Bug fix GROUP BY with window function referring column used in grouping expression
 SELECT i, STD(i) OVER (), MOD(STD(i),2) FROM tj2 GROUP BY i ;
 i	STD(i) OVER ()	MOD(STD(i),2)
-1	0.816496580927726	0
 0	0.816496580927726	0
+1	0.816496580927726	0
 2	0.816496580927726	0
 NULL	0.816496580927726	NULL
 SELECT i, VARIANCE(VARIANCE(i)) OVER (), VARIANCE(i) OVER (ORDER BY i), MOD(VARIANCE(i),2), VARIANCE(i) FROM tj2 GROUP BY i ;
 i	VARIANCE(VARIANCE(i)) OVER ()	VARIANCE(i) OVER (ORDER BY i)	MOD(VARIANCE(i),2)	VARIANCE(i)
-NULL	0	NULL	NULL	NULL
 0	0	0	0	0
 1	0	0.25	0	0
 2	0	0.6666666666666666	0	0
+NULL	0	NULL	NULL	NULL
 SELECT i, STD(i) OVER (ORDER BY i) FROM tj UNION ALL SELECT i, STD(i) OVER (ORDER BY i) FROM tj;
 i	STD(i) OVER (ORDER BY i)
-NULL	NULL
-NULL	NULL
-7	0
-8	0.4714045207910316
-8	0.4714045207910316
-9	0.7071067811865475
+10	1.1248582677159726
+10	1.1248582677159726
+10	1.1248582677159726
 10	1.1248582677159726
 10	1.1248582677159726
 10	1.1248582677159726
 11	1.2686114456365272
+11	1.2686114456365272
 12	1.4989708403591155
-NULL	NULL
-NULL	NULL
+12	1.4989708403591155
+7	0
 7	0
 8	0.4714045207910316
 8	0.4714045207910316
+8	0.4714045207910316
+8	0.4714045207910316
 9	0.7071067811865475
-10	1.1248582677159726
-10	1.1248582677159726
-10	1.1248582677159726
-11	1.2686114456365272
-12	1.4989708403591155
+9	0.7071067811865475
+NULL	NULL
+NULL	NULL
+NULL	NULL
+NULL	NULL
 SELECT j,CAST(STD(j) OVER (PARTITION BY i) AS JSON), CAST(VARIANCE(j) OVER () AS JSON) FROM tj;
 j	CAST(STD(j) OVER (PARTITION BY i) AS JSON)	CAST(VARIANCE(j) OVER () AS JSON)
-NULL	NULL	2.711535802469135
-NULL	NULL	2.711535802469135
-1	0.0	2.711535802469135
-[1, 2, 3]	0.0	2.711535802469135
-[1, 2, 3]	0.0	2.711535802469135
-2	0.0	2.711535802469135
-3	0.06599663291074434	2.711535802469135
-3.14	0.06599663291074434	2.711535802469135
-3.14	0.06599663291074434	2.711535802469135
-4	0.0	2.711535802469135
-5	0.0	2.711535802469135
-Warnings:
-Warning	3156	Invalid JSON value for CAST to DOUBLE from column j at row 1
-Warning	3156	Invalid JSON value for CAST to DOUBLE from column j at row 1
-Warning	3156	Invalid JSON value for CAST to DOUBLE from column j at row 1
-Warning	3156	Invalid JSON value for CAST to DOUBLE from column j at row 1
+NULL	NULL	2.71153580246914
+NULL	NULL	2.71153580246914
+1	0	2.71153580246914
+[1, 2, 3]	0	2.71153580246914
+[1, 2, 3]	0	2.71153580246914
+2	0	2.71153580246914
+3	0.06599663291074	2.71153580246914
+3.14	0.06599663291074	2.71153580246914
+3.14	0.06599663291074	2.71153580246914
+4	0	2.71153580246914
+5	0	2.71153580246914
 SELECT j,CAST(STD(j) OVER (PARTITION BY i ROWS UNBOUNDED PRECEDING) AS JSON), CAST(VARIANCE(j) OVER (PARTITION BY i ROWS UNBOUNDED PRECEDING) AS JSON) FROM tj;
 j	CAST(STD(j) OVER (PARTITION BY i ROWS UNBOUNDED PRECEDING) AS JSON)	CAST(VARIANCE(j) OVER (PARTITION BY i ROWS UNBOUNDED PRECEDING) AS JSON)
 NULL	NULL	NULL
@@ -1387,11 +1376,6 @@
 3.14	0.06599663291074434	0.004355555555555542
 4	0.0	0.0
 5	0.0	0.0
-Warnings:
-Warning	3156	Invalid JSON value for CAST to DOUBLE from column j at row 1
-Warning	3156	Invalid JSON value for CAST to DOUBLE from column j at row 1
-Warning	3156	Invalid JSON value for CAST to DOUBLE from column j at row 4
-Warning	3156	Invalid JSON value for CAST to DOUBLE from column j at row 5
 DROP TABLE tj,tj2;
 CREATE TABLE t1 (i INTEGER, j INTEGER);
 INSERT INTO t1 VALUES (NULL,3),(NULL,3),(NULL,30),(NULL,30),(4,3),
diff -Nru mysql-8.0-8.0.26/mysql-test/std_data/dd/sdi/innodb_sdi/mysql.json mysql-8.0-8.0.27/mysql-test/std_data/dd/sdi/innodb_sdi/mysql.json
--- mysql-8.0-8.0.26/mysql-test/std_data/dd/sdi/innodb_sdi/mysql.json	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/std_data/dd/sdi/innodb_sdi/mysql.json	2021-09-28 11:46:34.000000000 +0000
@@ -39165,6 +39165,44 @@
                 "is_explicit_collation": false
             },
             {
+                "name": "Gtid_only",
+                "type": 2,
+                "is_nullable": false,
+                "is_zerofill": false,
+                "is_unsigned": false,
+                "is_auto_increment": false,
+                "is_virtual": false,
+                "hidden": 1,
+                "ordinal_position": 33,
+                "char_length": 1,
+                "numeric_precision": 3,
+                "numeric_scale": 0,
+                "numeric_scale_null": false,
+                "datetime_precision": 0,
+                "datetime_precision_null": 1,
+                "has_no_default": false,
+                "default_value_null": false,
+                "srs_id_null": true,
+                "srs_id": 0,
+                "default_value": "",
+                "default_value_utf8_null": false,
+                "default_value_utf8": "0",
+                "default_option": "",
+                "update_option": "",
+                "comment": "Indicates if this channel only uses GTIDs and does not persist positions.",
+                "generation_expression": "",
+                "generation_expression_utf8": "",
+                "options": "interval_count=0;",
+                "se_private_data": "table_id=X",
+                "engine_attribute": "",
+                "secondary_engine_attribute": "",
+                "column_key": 1,
+                "column_type_utf8": "tinyint(1)",
+                "elements": [],
+                "collation_id": X,
+                "is_explicit_collation": false
+            },
+            {
                 "name": "DB_TRX_ID",
                 "type": 10,
                 "is_nullable": false,
@@ -39173,7 +39211,7 @@
                 "is_auto_increment": false,
                 "is_virtual": false,
                 "hidden": 2,
-                "ordinal_position": 33,
+                "ordinal_position": 34,
                 "char_length": 6,
                 "numeric_precision": 0,
                 "numeric_scale": 0,
@@ -39211,7 +39249,7 @@
                 "is_auto_increment": false,
                 "is_virtual": false,
                 "hidden": 2,
-                "ordinal_position": 34,
+                "ordinal_position": 35,
                 "char_length": 7,
                 "numeric_precision": 0,
                 "numeric_scale": 0,
@@ -39287,14 +39325,14 @@
                         "length": 4294967295,
                         "order": 2,
                         "hidden": true,
-                        "column_opx": 32
+                        "column_opx": 33
                     },
                     {
                         "ordinal_position": 3,
                         "length": 4294967295,
                         "order": 2,
                         "hidden": true,
-                        "column_opx": 33
+                        "column_opx": 34
                     },
                     {
                         "ordinal_position": 4,
@@ -39512,6 +39550,13 @@
                         "order": 2,
                         "hidden": true,
                         "column_opx": 31
+                    },
+                    {
+                        "ordinal_position": 35,
+                        "length": 4294967295,
+                        "order": 2,
+                        "hidden": true,
+                        "column_opx": 32
                     }
                 ],
                 "tablespace_ref": "mysql"
diff -Nru mysql-8.0-8.0.26/mysql-test/std_data/dd/sdi/upgrade/mysql.json mysql-8.0-8.0.27/mysql-test/std_data/dd/sdi/upgrade/mysql.json
--- mysql-8.0-8.0.26/mysql-test/std_data/dd/sdi/upgrade/mysql.json	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/std_data/dd/sdi/upgrade/mysql.json	2021-09-28 11:46:34.000000000 +0000
@@ -38546,6 +38546,44 @@
                 "is_explicit_collation": false
             },
             {
+                "name": "Gtid_only",
+                "type": 2,
+                "is_nullable": false,
+                "is_zerofill": false,
+                "is_unsigned": false,
+                "is_auto_increment": false,
+                "is_virtual": false,
+                "hidden": 1,
+                "ordinal_position": 33,
+                "char_length": 1,
+                "numeric_precision": 3,
+                "numeric_scale": 0,
+                "numeric_scale_null": false,
+                "datetime_precision": 0,
+                "datetime_precision_null": 1,
+                "has_no_default": false,
+                "default_value_null": false,
+                "srs_id_null": true,
+                "srs_id": 0,
+                "default_value": "",
+                "default_value_utf8_null": false,
+                "default_value_utf8": "0",
+                "default_option": "",
+                "update_option": "",
+                "comment": "Indicates if this channel only uses GTIDs and does not persist positions.",
+                "generation_expression": "",
+                "generation_expression_utf8": "",
+                "options": "interval_count=0;",
+                "se_private_data": "table_id=X",
+                "engine_attribute": "",
+                "secondary_engine_attribute": "",
+                "column_key": 1,
+                "column_type_utf8": "tinyint(1)",
+                "elements": [],
+                "collation_id": X,
+                "is_explicit_collation": false
+            },
+            {
                 "name": "DB_TRX_ID",
                 "type": 10,
                 "is_nullable": false,
@@ -38554,7 +38592,7 @@
                 "is_auto_increment": false,
                 "is_virtual": false,
                 "hidden": 2,
-                "ordinal_position": 33,
+                "ordinal_position": 34,
                 "char_length": 6,
                 "numeric_precision": 0,
                 "numeric_scale": 0,
@@ -38592,7 +38630,7 @@
                 "is_auto_increment": false,
                 "is_virtual": false,
                 "hidden": 2,
-                "ordinal_position": 34,
+                "ordinal_position": 35,
                 "char_length": 7,
                 "numeric_precision": 0,
                 "numeric_scale": 0,
@@ -38668,14 +38706,14 @@
                         "length": 4294967295,
                         "order": 2,
                         "hidden": true,
-                        "column_opx": 32
+                        "column_opx": 33
                     },
                     {
                         "ordinal_position": 3,
                         "length": 4294967295,
                         "order": 2,
                         "hidden": true,
-                        "column_opx": 33
+                        "column_opx": 34
                     },
                     {
                         "ordinal_position": 4,
@@ -38893,6 +38931,13 @@
                         "order": 2,
                         "hidden": true,
                         "column_opx": 31
+                    },
+                    {
+                        "ordinal_position": 35,
+                        "length": 4294967295,
+                        "order": 2,
+                        "hidden": true,
+                        "column_opx": 32
                     }
                 ],
                 "tablespace_ref": "mysql"
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/auth_sec/include/grant_as_ddl.inc mysql-8.0-8.0.27/mysql-test/suite/auth_sec/include/grant_as_ddl.inc
--- mysql-8.0-8.0.26/mysql-test/suite/auth_sec/include/grant_as_ddl.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/auth_sec/include/grant_as_ddl.inc	2021-09-28 11:46:34.000000000 +0000
@@ -466,6 +466,7 @@
 SET GLOBAL general_log_file= @old_general_log_file;
 SET GLOBAL general_log= @old_general_log;
 SET GLOBAL log_output= @old_log_output;
+TRUNCATE TABLE mysql.general_log;
 
 --echo -------------------------------------------------------------------------
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/access_credential_control.result mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/access_credential_control.result
--- mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/access_credential_control.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/access_credential_control.result	2021-09-28 11:46:34.000000000 +0000
@@ -5,6 +5,8 @@
 =======================================================================
 
 set @default_plugin=@@global.default_authentication_plugin;
+Warnings:
+Warning	1287	'@@default_authentication_plugin' is deprecated and will be removed in a future release. Please use authentication_policy instead.
 **** Creating user with default_plugin
 CREATE USER 'Tanjotuser1'@'localhost' IDENTIFIED BY 'abc';
 **** Creating user with sha256_password plugin
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/anonymous_grants.result mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/anonymous_grants.result
--- mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/anonymous_grants.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/anonymous_grants.result	2021-09-28 11:46:34.000000000 +0000
@@ -6,6 +6,6 @@
 show grants for ''@'localhost';
 Grants for @localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO ``@`localhost`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO ''@`localhost`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO ``@`localhost`
 # cleanup
 drop user ''@'localhost';
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/atomic_global_db_proxy_grants.result mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/atomic_global_db_proxy_grants.result
--- mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/atomic_global_db_proxy_grants.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/atomic_global_db_proxy_grants.result	2021-09-28 11:46:34.000000000 +0000
@@ -345,15 +345,15 @@
 SHOW GRANTS FOR userX;
 Grants for userX@%
 GRANT USAGE ON *.* TO `userX`@`%`
-GRANT PROXY ON 'proxied'@'%' TO 'userX'@'%'
+GRANT PROXY ON `proxied`@`%` TO `userX`@`%`
 SHOW GRANTS FOR userY;
 Grants for userY@%
 GRANT USAGE ON *.* TO `userY`@`%`
-GRANT PROXY ON 'proxied'@'%' TO 'userY'@'%'
+GRANT PROXY ON `proxied`@`%` TO `userY`@`%`
 SHOW GRANTS FOR userZ;
 Grants for userZ@%
 GRANT USAGE ON *.* TO `userZ`@`%`
-GRANT PROXY ON 'proxied'@'%' TO 'userZ'@'%'
+GRANT PROXY ON `proxied`@`%` TO `userZ`@`%`
 # This event sequence pattern MUST be present in binlog: !Q(GRANT PROXY ON.*proxied.*TO.*userX.*userY.*userZ.*)
 include/assert_binlog_events.inc
 include/save_binlog_position.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/atomic_revokes.result mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/atomic_revokes.result
--- mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/atomic_revokes.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/atomic_revokes.result	2021-09-28 11:46:34.000000000 +0000
@@ -14,7 +14,7 @@
 Grants for userX@%
 GRANT SUPER ON *.* TO `userX`@`%`
 GRANT SELECT ON `db1`.* TO `userX`@`%`
-GRANT PROXY ON 'userY'@'%' TO 'userX'@'%'
+GRANT PROXY ON `userY`@`%` TO `userX`@`%`
 # Case 1 : Revoke from non-existing user
 REVOKE SUPER ON *.* FROM useX, userZ;
 ERROR 42000: There is no such grant defined for user 'useX' on host '%'
@@ -27,7 +27,7 @@
 Grants for userX@%
 GRANT SUPER ON *.* TO `userX`@`%`
 GRANT SELECT ON `db1`.* TO `userX`@`%`
-GRANT PROXY ON 'userY'@'%' TO 'userX'@'%'
+GRANT PROXY ON `userY`@`%` TO `userX`@`%`
 # This event sequence pattern MUST NOT be present in binlog: !Q(REVOKE SUPER ON.*FROM.*userX.*userZ.*)
 include/assert_binlog_events.inc
 # This event sequence pattern MUST NOT be present in binlog: !Q(REVOKE SELCT ON.*db1.*FROM.*userX.*userZ.*)
@@ -44,7 +44,7 @@
 Grants for userX@%
 GRANT SUPER ON *.* TO `userX`@`%`
 GRANT SELECT ON `db1`.* TO `userX`@`%`
-GRANT PROXY ON 'userY'@'%' TO 'userX'@'%'
+GRANT PROXY ON `userY`@`%` TO `userX`@`%`
 # This event sequence pattern MUST NOT be present in binlog: !Q(REVOKE SELECT ON .*db1.*FROM.*userY.*)
 include/assert_binlog_events.inc
 # This event sequence pattern MUST NOT be present in binlog: !Q(REVOKE PROXY ON .*userX.*FROM.*userY.*)
@@ -236,7 +236,7 @@
 GRANT SELECT ON `db1`.* TO `userX`@`%`
 GRANT SELECT, INSERT (`c1`, `c2`) ON `db1`.`table1` TO `userX`@`%`
 GRANT EXECUTE ON PROCEDURE `db1`.`proc1` TO `userX`@`%`
-GRANT PROXY ON 'userY'@'%' TO 'userX'@'%'
+GRANT PROXY ON `userY`@`%` TO `userX`@`%`
 GRANT `roleA`@`%`,`roleB`@`%` TO `userX`@`%`
 # Case 1 : Revoke from non-existing user
 REVOKE ALL PRIVILEGES, GRANT OPTION FROM userX, userZ;
@@ -248,7 +248,7 @@
 GRANT SELECT ON `db1`.* TO `userX`@`%`
 GRANT SELECT, INSERT (`c1`, `c2`) ON `db1`.`table1` TO `userX`@`%`
 GRANT EXECUTE ON PROCEDURE `db1`.`proc1` TO `userX`@`%`
-GRANT PROXY ON 'userY'@'%' TO 'userX'@'%'
+GRANT PROXY ON `userY`@`%` TO `userX`@`%`
 GRANT `roleA`@`%`,`roleB`@`%` TO `userX`@`%`
 # This event sequence pattern MUST NOT be present in binlog: !Q(REVOKE ALL PRIVILEGES, GRANT OPTION FROM.*userX.*,.*userZ.*)
 include/assert_binlog_events.inc
@@ -258,7 +258,7 @@
 SHOW GRANTS FOR userX;
 Grants for userX@%
 GRANT USAGE ON *.* TO `userX`@`%`
-GRANT PROXY ON 'userY'@'%' TO 'userX'@'%'
+GRANT PROXY ON `userY`@`%` TO `userX`@`%`
 GRANT `roleA`@`%`,`roleB`@`%` TO `userX`@`%`
 # This event sequence pattern MUST be present in binlog: !Q(REVOKE ALL PRIVILEGES, GRANT OPTION FROM.*userX.*,.*userA.*)
 include/assert_binlog_events.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/fips.result mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/fips.result
--- mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/fips.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/fips.result	2021-09-28 11:46:34.000000000 +0000
@@ -22,7 +22,7 @@
 md5(8)
 00000000000000000000000000000000
 Level	Code	Message
-Warning	11272	SSL fips mode error: FIPS mode ON/STRICT: MD5 digest is not supported.
+Warning	4073	SSL fips mode error: FIPS mode ON/STRICT: MD5 digest is not supported.
 ##Test: Set server fips mode: STRICT.
 Server fips mode:
 Variable_name	Value
@@ -31,7 +31,7 @@
 md5(8)
 00000000000000000000000000000000
 Level	Code	Message
-Warning	11272	SSL fips mode error: FIPS mode ON/STRICT: MD5 digest is not supported.
+Warning	4073	SSL fips mode error: FIPS mode ON/STRICT: MD5 digest is not supported.
 ##Test: Set server fips mode: INVALID.
 Server fips mode:
 Variable_name	Value
@@ -51,7 +51,7 @@
 md5(8)
 00000000000000000000000000000000
 Level	Code	Message
-Warning	11272	SSL fips mode error: FIPS mode ON/STRICT: MD5 digest is not supported.
+Warning	4073	SSL fips mode error: FIPS mode ON/STRICT: MD5 digest is not supported.
 ##Test: Restart server and provide ssl-fips-mode at server startup: ON with skip ssl
 Server fips mode:
 Variable_name	Value
@@ -60,7 +60,7 @@
 md5(8)
 00000000000000000000000000000000
 Level	Code	Message
-Warning	11272	SSL fips mode error: FIPS mode ON/STRICT: MD5 digest is not supported.
+Warning	4073	SSL fips mode error: FIPS mode ON/STRICT: MD5 digest is not supported.
 ##Test: Restart server and provide ssl-fips-mode at server startup: STRICT
 Server fips mode:
 Variable_name	Value
@@ -69,7 +69,7 @@
 md5(8)
 00000000000000000000000000000000
 Level	Code	Message
-Warning	11272	SSL fips mode error: FIPS mode ON/STRICT: MD5 digest is not supported.
+Warning	4073	SSL fips mode error: FIPS mode ON/STRICT: MD5 digest is not supported.
 ##Test: Restart server and provide weak cipher CAMELLIA256-SHA
 client will only able to connect with only FIPS mode OFF
 Variable_name	Value
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/grant_as_ddl.result mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/grant_as_ddl.result
--- mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/grant_as_ddl.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/grant_as_ddl.result	2021-09-28 11:46:34.000000000 +0000
@@ -366,5 +366,6 @@
 SET GLOBAL general_log_file= @old_general_log_file;
 SET GLOBAL general_log= @old_general_log;
 SET GLOBAL log_output= @old_log_output;
+TRUNCATE TABLE mysql.general_log;
 -------------------------------------------------------------------------
 SET @@global.partial_revokes = @start_partial_revokes;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/key_value_auth.result mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/key_value_auth.result
--- mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/key_value_auth.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/key_value_auth.result	2021-09-28 11:46:34.000000000 +0000
@@ -5,6 +5,8 @@
 =======================================================================
 
 set @default_plugin= @@global.default_authentication_plugin;
+Warnings:
+Warning	1287	'@@default_authentication_plugin' is deprecated and will be removed in a future release. Please use authentication_policy instead.
 CREATE USER 'Tanjotuser1'@'localhost' IDENTIFIED BY 'abc';
 CREATE USER 'Tanjotuser2'@'127.0.0.1' IDENTIFIED BY 'abc';
 select (select plugin from mysql.user where User='Tanjotuser1' and Host='localhost')=@default_plugin;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/mandatory_roles.result mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/mandatory_roles.result
--- mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/mandatory_roles.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/mandatory_roles.result	2021-09-28 11:46:34.000000000 +0000
@@ -190,8 +190,8 @@
 SHOW GRANTS;
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 GRANT `r1`@`%` TO `root`@`localhost`
 DROP USER u1@localhost;
 DROP USER u2@localhost;
@@ -199,7 +199,9 @@
 DROP ROLE r1,r2,r3,r4,r5,rr1;
 CREATE USER u1@localhost IDENTIFIED BY 'foo';
 CREATE ROLE r1, r2, r3;
-SET GLOBAL mandatory_roles="aa ; bb : r3, r1, (r2), *r2,";
+SET GLOBAL mandatory_roles="foo,";
+ERROR 42000: Variable 'mandatory_roles' can't be set to the value of 'foo,'
+SET GLOBAL mandatory_roles="aa ; bb : r3, r1, (r2), *r2";
 SHOW GRANTS;
 Grants for u1@localhost
 GRANT USAGE ON *.* TO `u1`@`localhost`
@@ -216,8 +218,8 @@
 SHOW GRANTS;
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 CREATE USER u1@localhost identified by 'foo';
 GRANT SELECT ON *.* To u1@localhost;
 SELECT CURRENT_USER();
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/mysql_protocol_types.result mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/mysql_protocol_types.result
--- mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/mysql_protocol_types.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/mysql_protocol_types.result	2021-09-28 11:46:34.000000000 +0000
@@ -82,3 +82,4 @@
 SET GLOBAL log_output=        @old_log_output;
 #Cleanup
 DROP USER 'user_tcp'@'127.0.0.1', 'user_ssl'@'127.0.0.1';
+TRUNCATE TABLE mysql.general_log;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/mysql_protocol_types_windows.result mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/mysql_protocol_types_windows.result
--- mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/mysql_protocol_types_windows.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/mysql_protocol_types_windows.result	2021-09-28 11:46:34.000000000 +0000
@@ -53,5 +53,6 @@
 SET GLOBAL general_log_file=  @old_general_log_file;
 SET GLOBAL general_log=       @old_general_log;
 SET GLOBAL log_output=        @old_log_output;
+TRUNCATE TABLE mysql.general_log;
 #Cleanup
 DROP USER 'user_tcp'@'127.0.0.1', 'user_ssl'@'127.0.0.1';
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/openssl_without_fips.result mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/openssl_without_fips.result
--- mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/openssl_without_fips.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/openssl_without_fips.result	2021-09-28 11:46:34.000000000 +0000
@@ -13,6 +13,11 @@
 If FIPS ON set fails, FIPS mode will be set to OFF. All the openssl cryptography should work fine.
 md5(8)
 c9f0f895fb98ab9159f51fd0297e236d
+#
+# Bug #33082255: SERVER EXIT TRYING TO SET FIPS MODE
+#
+SET @@global.ssl_fips_mode = 'ON';
+ERROR HY000: SSL fips mode error: Openssl is not fips enabled
 ##Test: Start the server with SSL FIPS mode ON, server will throw error and abort.
 Pattern "(FIPS_mode_set:fips mode not supported|FIPS_module_mode_set:fingerprint does not match)" found
 Restart server with FIPS mode OFF.
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/partial_revokes_add_remove.result mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/partial_revokes_add_remove.result
--- mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/partial_revokes_add_remove.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/partial_revokes_add_remove.result	2021-09-28 11:46:34.000000000 +0000
@@ -373,7 +373,7 @@
 SHOW GRANTS FOR baz;
 Grants for baz@%
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `baz`@`%`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `baz`@`%`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `baz`@`%`
 DROP USER baz;
 # Create partial_revokes for foo
 GRANT ALL ON *.* TO foo WITH GRANT OPTION;
@@ -383,13 +383,13 @@
 SHOW GRANTS FOR foo;
 Grants for foo@%
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `foo`@`%` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `foo`@`%` WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `foo`@`%` WITH GRANT OPTION
 # create partial revokes again
 REVOKE SELECT ON mysql.* FROM foo;
 SHOW GRANTS FOR foo;
 Grants for foo@%
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `foo`@`%` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `foo`@`%` WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `foo`@`%` WITH GRANT OPTION
 REVOKE SELECT ON `mysql`.* FROM `foo`@`%`
 GRANT ALL ON mysql.* TO bar;
 [connection foo_master]
@@ -402,12 +402,12 @@
 SHOW GRANTS FOR foo;
 Grants for foo@%
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `foo`@`%` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `foo`@`%` WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `foo`@`%` WITH GRANT OPTION
 REVOKE SELECT ON `mysql`.* FROM `foo`@`%`
 SHOW GRANTS FOR bar;
 Grants for bar@%
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `bar`@`%`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `bar`@`%`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `bar`@`%`
 REVOKE SELECT ON `mysql`.* FROM `bar`@`%`
 # grantor should be able to remove the privileges & partial revokes both
 REVOKE ALL ON *.* FROM bar;
@@ -423,14 +423,14 @@
 SHOW GRANTS FOR foo;
 Grants for foo@%
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `foo`@`%` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `foo`@`%` WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `foo`@`%` WITH GRANT OPTION
 REVOKE SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `mysql`.* FROM `foo`@`%`
 # restrictions must pass to bar as well
 GRANT ALL ON *.* TO bar;
 SHOW GRANTS FOR bar;
 Grants for bar@%
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `bar`@`%`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `bar`@`%`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `bar`@`%`
 REVOKE SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `mysql`.* FROM `bar`@`%`
 REVOKE ALL ON *.* FROM foo,bar;
 #
@@ -1181,14 +1181,14 @@
 SHOW GRANTS;
 Grants for bar@%
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `bar`@`%` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `bar`@`%` WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `bar`@`%` WITH GRANT OPTION
 GRANT `r1`@`%` TO `bar`@`%`
 # Grantor should be able to grant ALL global level privilege to grantee
 GRANT ALL ON *.* TO foo;
 SHOW GRANTS FOR foo;
 Grants for foo@%
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `foo`@`%`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `foo`@`%`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `foo`@`%`
 # Grantor should be able to revoke ALL global level privilege from
 # grantee
 REVOKE ALL ON *.* FROM foo;
@@ -1200,7 +1200,7 @@
 SHOW GRANTS;
 Grants for bar@%
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `bar`@`%` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `bar`@`%` WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `bar`@`%` WITH GRANT OPTION
 GRANT `r1`@`%` TO `bar`@`%`
 [connection default]
 # Since, user granted himself all DB level privileges therefore it's
@@ -1208,7 +1208,7 @@
 SHOW GRANTS FOR bar;
 Grants for bar@%
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `bar`@`%` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `bar`@`%` WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `bar`@`%` WITH GRANT OPTION
 GRANT `r1`@`%` TO `bar`@`%`
 DROP USER foo, bar;
 DROP ROLE r1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/password_expired.result mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/password_expired.result
--- mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/password_expired.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/password_expired.result	2021-09-28 11:46:34.000000000 +0000
@@ -5,6 +5,8 @@
 =======================================================================================
 
 set @default_plugin= @@global.default_authentication_plugin;
+Warnings:
+Warning	1287	'@@default_authentication_plugin' is deprecated and will be removed in a future release. Please use authentication_policy instead.
 Creating a user with respect to all the 2 password authentication plugin
 **** Creating user with @default_plugin plugin
 CREATE USER 'Tanjotuser1'@'localhost' IDENTIFIED BY 'abc';
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/password_require_current.result mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/password_require_current.result
--- mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/password_require_current.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/password_require_current.result	2021-09-28 11:46:34.000000000 +0000
@@ -14,10 +14,10 @@
 
 SHOW CREATE USER non_priv_usr;
 CREATE USER for non_priv_usr@%
-CREATE USER 'non_priv_usr'@'%' IDENTIFIED WITH '<default_auth_plugin>' AS '<password_hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `non_priv_usr`@`%` IDENTIFIED WITH '<default_auth_plugin>' AS '<password_hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 SHOW CREATE USER priv_usr;
 CREATE USER for priv_usr@%
-CREATE USER 'priv_usr'@'%' IDENTIFIED WITH '<default_auth_plugin>' AS '<password_hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `priv_usr`@`%` IDENTIFIED WITH '<default_auth_plugin>' AS '<password_hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 SELECT password_require_current from mysql.user
 where user like '%priv_usr' OR user like '%non_priv_usr';
 password_require_current
@@ -210,10 +210,10 @@
 
 SHOW CREATE USER non_priv_usr;
 CREATE USER for non_priv_usr@%
-CREATE USER 'non_priv_usr'@'%' IDENTIFIED WITH '<default_auth_plugin>' AS '<password_hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `non_priv_usr`@`%` IDENTIFIED WITH '<default_auth_plugin>' AS '<password_hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 SHOW CREATE USER priv_usr;
 CREATE USER for priv_usr@%
-CREATE USER 'priv_usr'@'%' IDENTIFIED WITH '<default_auth_plugin>' AS '<password_hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `priv_usr`@`%` IDENTIFIED WITH '<default_auth_plugin>' AS '<password_hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 SELECT password_require_current from mysql.user
 where user like '%priv_usr' OR user like '%non_priv_usr';
 password_require_current
@@ -405,10 +405,10 @@
 
 SHOW CREATE USER non_priv_usr;
 CREATE USER for non_priv_usr@%
-CREATE USER 'non_priv_usr'@'%' IDENTIFIED WITH '<default_auth_plugin>' AS '<password_hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT
+CREATE USER `non_priv_usr`@`%` IDENTIFIED WITH '<default_auth_plugin>' AS '<password_hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT
 SHOW CREATE USER priv_usr;
 CREATE USER for priv_usr@%
-CREATE USER 'priv_usr'@'%' IDENTIFIED WITH '<default_auth_plugin>' AS '<password_hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT
+CREATE USER `priv_usr`@`%` IDENTIFIED WITH '<default_auth_plugin>' AS '<password_hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT
 SELECT password_require_current from mysql.user
 where user like '%priv_usr' OR user like '%non_priv_usr';
 password_require_current
@@ -605,10 +605,10 @@
 
 SHOW CREATE USER non_priv_usr;
 CREATE USER for non_priv_usr@%
-CREATE USER 'non_priv_usr'@'%' IDENTIFIED WITH '<default_auth_plugin>' AS '<password_hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT OPTIONAL
+CREATE USER `non_priv_usr`@`%` IDENTIFIED WITH '<default_auth_plugin>' AS '<password_hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT OPTIONAL
 SHOW CREATE USER priv_usr;
 CREATE USER for priv_usr@%
-CREATE USER 'priv_usr'@'%' IDENTIFIED WITH '<default_auth_plugin>' AS '<password_hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT OPTIONAL
+CREATE USER `priv_usr`@`%` IDENTIFIED WITH '<default_auth_plugin>' AS '<password_hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT OPTIONAL
 SELECT password_require_current from mysql.user
 where user like '%priv_usr' OR user like '%non_priv_usr';
 password_require_current
@@ -805,10 +805,10 @@
 
 SHOW CREATE USER non_priv_usr;
 CREATE USER for non_priv_usr@%
-CREATE USER 'non_priv_usr'@'%' IDENTIFIED WITH '<default_auth_plugin>' AS '<password_hash>' REQUIRE NONE WITH MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE NEVER ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT OPTIONAL
+CREATE USER `non_priv_usr`@`%` IDENTIFIED WITH '<default_auth_plugin>' AS '<password_hash>' REQUIRE NONE WITH MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE NEVER ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT OPTIONAL
 SHOW CREATE USER priv_usr;
 CREATE USER for priv_usr@%
-CREATE USER 'priv_usr'@'%' IDENTIFIED WITH '<default_auth_plugin>' AS '<password_hash>' REQUIRE NONE WITH MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE NEVER ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT OPTIONAL
+CREATE USER `priv_usr`@`%` IDENTIFIED WITH '<default_auth_plugin>' AS '<password_hash>' REQUIRE NONE WITH MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE NEVER ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT OPTIONAL
 SELECT password_require_current from mysql.user
 where user like '%priv_usr' OR user like '%non_priv_usr';
 password_require_current
@@ -997,10 +997,10 @@
 
 SHOW CREATE USER non_priv_usr;
 CREATE USER for non_priv_usr@%
-CREATE USER 'non_priv_usr'@'%' IDENTIFIED WITH '<default_auth_plugin>' AS '<password_hash>' REQUIRE NONE WITH MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL 0 DAY PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `non_priv_usr`@`%` IDENTIFIED WITH '<default_auth_plugin>' AS '<password_hash>' REQUIRE NONE WITH MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL 0 DAY PASSWORD REQUIRE CURRENT DEFAULT
 SHOW CREATE USER priv_usr;
 CREATE USER for priv_usr@%
-CREATE USER 'priv_usr'@'%' IDENTIFIED WITH '<default_auth_plugin>' AS '<password_hash>' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 100 MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL 0 DAY PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `priv_usr`@`%` IDENTIFIED WITH '<default_auth_plugin>' AS '<password_hash>' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 100 MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL 0 DAY PASSWORD REQUIRE CURRENT DEFAULT
 SELECT password_require_current from mysql.user
 where user like '%priv_usr' OR user like '%non_priv_usr';
 password_require_current
@@ -1193,10 +1193,10 @@
 
 SHOW CREATE USER non_priv_usr;
 CREATE USER for non_priv_usr@%
-CREATE USER 'non_priv_usr'@'%' IDENTIFIED WITH '<default_auth_plugin>' AS '<password_hash>' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 100 MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY 0 PASSWORD REUSE INTERVAL 0 DAY PASSWORD REQUIRE CURRENT
+CREATE USER `non_priv_usr`@`%` IDENTIFIED WITH '<default_auth_plugin>' AS '<password_hash>' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 100 MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY 0 PASSWORD REUSE INTERVAL 0 DAY PASSWORD REQUIRE CURRENT
 SHOW CREATE USER priv_usr;
 CREATE USER for priv_usr@%
-CREATE USER 'priv_usr'@'%' IDENTIFIED WITH '<default_auth_plugin>' AS '<password_hash>' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 100 MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY 0 PASSWORD REUSE INTERVAL 0 DAY PASSWORD REQUIRE CURRENT
+CREATE USER `priv_usr`@`%` IDENTIFIED WITH '<default_auth_plugin>' AS '<password_hash>' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 100 MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY 0 PASSWORD REUSE INTERVAL 0 DAY PASSWORD REQUIRE CURRENT
 SELECT password_require_current from mysql.user
 where user like '%priv_usr' OR user like '%non_priv_usr';
 password_require_current
@@ -1459,10 +1459,10 @@
 
 SHOW CREATE USER usr2;
 CREATE USER for usr2@%
-CREATE USER 'usr2'@'%' IDENTIFIED WITH '<default_auth_plugin>' AS '<password_hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT
+CREATE USER `usr2`@`%` IDENTIFIED WITH '<default_auth_plugin>' AS '<password_hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT
 SHOW CREATE USER usr1;
 CREATE USER for usr1@%
-CREATE USER 'usr1'@'%' IDENTIFIED WITH '<default_auth_plugin>' AS '<password_hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT
+CREATE USER `usr1`@`%` IDENTIFIED WITH '<default_auth_plugin>' AS '<password_hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT
 SELECT password_require_current from mysql.user
 where user like '%usr1' OR user like '%usr2';
 password_require_current
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/plugin_auth_caching_sha2_password_default.result mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/plugin_auth_caching_sha2_password_default.result
--- mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/plugin_auth_caching_sha2_password_default.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/plugin_auth_caching_sha2_password_default.result	2021-09-28 11:46:34.000000000 +0000
@@ -123,13 +123,13 @@
 zaphodbeeblebrox@localhost	zaphodbeeblebrox@localhost
 SHOW CREATE USER arthurdent@localhost;
 CREATE USER for arthurdent@localhost
-CREATE USER 'arthurdent'@'localhost' IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>'
+CREATE USER `arthurdent`@`localhost` IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>'
 SHOW CREATE USER marvintheparanoidandroid@localhost;
 CREATE USER for marvintheparanoidandroid@localhost
-CREATE USER 'marvintheparanoidandroid'@'localhost' IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>'
+CREATE USER `marvintheparanoidandroid`@`localhost` IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>'
 SHOW CREATE USER zaphodbeeblebrox@localhost;
 CREATE USER for zaphodbeeblebrox@localhost
-CREATE USER 'zaphodbeeblebrox'@'localhost' IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>'
+CREATE USER `zaphodbeeblebrox`@`localhost` IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>'
 DROP USER arthurdent@localhost;
 DROP USER marvintheparanoidandroid@localhost;
 DROP USER zaphodbeeblebrox@localhost;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/plugin_auth_caching_sha2_password_digest_rounds_20000.result mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/plugin_auth_caching_sha2_password_digest_rounds_20000.result
--- mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/plugin_auth_caching_sha2_password_digest_rounds_20000.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/plugin_auth_caching_sha2_password_digest_rounds_20000.result	2021-09-28 11:46:34.000000000 +0000
@@ -134,13 +134,13 @@
 zaphodbeeblebrox@localhost	zaphodbeeblebrox@localhost
 SHOW CREATE USER arthurdent@localhost;
 CREATE USER for arthurdent@localhost
-CREATE USER 'arthurdent'@'localhost' IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>'
+CREATE USER `arthurdent`@`localhost` IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>'
 SHOW CREATE USER marvintheparanoidandroid@localhost;
 CREATE USER for marvintheparanoidandroid@localhost
-CREATE USER 'marvintheparanoidandroid'@'localhost' IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>'
+CREATE USER `marvintheparanoidandroid`@`localhost` IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>'
 SHOW CREATE USER zaphodbeeblebrox@localhost;
 CREATE USER for zaphodbeeblebrox@localhost
-CREATE USER 'zaphodbeeblebrox'@'localhost' IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>'
+CREATE USER `zaphodbeeblebrox`@`localhost` IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>'
 DROP USER arthurdent@localhost;
 DROP USER marvintheparanoidandroid@localhost;
 DROP USER zaphodbeeblebrox@localhost;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/plugin_auth_caching_sha2_password_digest_rounds_max.result mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/plugin_auth_caching_sha2_password_digest_rounds_max.result
--- mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/plugin_auth_caching_sha2_password_digest_rounds_max.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/plugin_auth_caching_sha2_password_digest_rounds_max.result	2021-09-28 11:46:34.000000000 +0000
@@ -134,13 +134,13 @@
 zaphodbeeblebrox@localhost	zaphodbeeblebrox@localhost
 SHOW CREATE USER arthurdent@localhost;
 CREATE USER for arthurdent@localhost
-CREATE USER 'arthurdent'@'localhost' IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>'
+CREATE USER `arthurdent`@`localhost` IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>'
 SHOW CREATE USER marvintheparanoidandroid@localhost;
 CREATE USER for marvintheparanoidandroid@localhost
-CREATE USER 'marvintheparanoidandroid'@'localhost' IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>'
+CREATE USER `marvintheparanoidandroid`@`localhost` IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>'
 SHOW CREATE USER zaphodbeeblebrox@localhost;
 CREATE USER for zaphodbeeblebrox@localhost
-CREATE USER 'zaphodbeeblebrox'@'localhost' IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>'
+CREATE USER `zaphodbeeblebrox`@`localhost` IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>'
 DROP USER arthurdent@localhost;
 DROP USER marvintheparanoidandroid@localhost;
 DROP USER zaphodbeeblebrox@localhost;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/plugin_auth_caching_sha2_password_digest_rounds_min.result mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/plugin_auth_caching_sha2_password_digest_rounds_min.result
--- mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/plugin_auth_caching_sha2_password_digest_rounds_min.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/plugin_auth_caching_sha2_password_digest_rounds_min.result	2021-09-28 11:46:34.000000000 +0000
@@ -134,13 +134,13 @@
 zaphodbeeblebrox@localhost	zaphodbeeblebrox@localhost
 SHOW CREATE USER arthurdent@localhost;
 CREATE USER for arthurdent@localhost
-CREATE USER 'arthurdent'@'localhost' IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>'
+CREATE USER `arthurdent`@`localhost` IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>'
 SHOW CREATE USER marvintheparanoidandroid@localhost;
 CREATE USER for marvintheparanoidandroid@localhost
-CREATE USER 'marvintheparanoidandroid'@'localhost' IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>'
+CREATE USER `marvintheparanoidandroid`@`localhost` IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>'
 SHOW CREATE USER zaphodbeeblebrox@localhost;
 CREATE USER for zaphodbeeblebrox@localhost
-CREATE USER 'zaphodbeeblebrox'@'localhost' IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>'
+CREATE USER `zaphodbeeblebrox`@`localhost` IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>'
 DROP USER arthurdent@localhost;
 DROP USER marvintheparanoidandroid@localhost;
 DROP USER zaphodbeeblebrox@localhost;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/plugin_auth_caching_sha2_password.result mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/plugin_auth_caching_sha2_password.result
--- mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/plugin_auth_caching_sha2_password.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/plugin_auth_caching_sha2_password.result	2021-09-28 11:46:34.000000000 +0000
@@ -123,13 +123,13 @@
 zaphodbeeblebrox@localhost	zaphodbeeblebrox@localhost
 SHOW CREATE USER arthurdent@localhost;
 CREATE USER for arthurdent@localhost
-CREATE USER 'arthurdent'@'localhost' IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>'
+CREATE USER `arthurdent`@`localhost` IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>'
 SHOW CREATE USER marvintheparanoidandroid@localhost;
 CREATE USER for marvintheparanoidandroid@localhost
-CREATE USER 'marvintheparanoidandroid'@'localhost' IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>'
+CREATE USER `marvintheparanoidandroid`@`localhost` IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>'
 SHOW CREATE USER zaphodbeeblebrox@localhost;
 CREATE USER for zaphodbeeblebrox@localhost
-CREATE USER 'zaphodbeeblebrox'@'localhost' IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>'
+CREATE USER `zaphodbeeblebrox`@`localhost` IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>'
 DROP USER arthurdent@localhost;
 DROP USER marvintheparanoidandroid@localhost;
 DROP USER zaphodbeeblebrox@localhost;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/random_password.result mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/random_password.result
--- mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/random_password.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/random_password.result	2021-09-28 11:46:34.000000000 +0000
@@ -5,34 +5,34 @@
 @@SESSION.generated_random_password_length
 20
 CREATE USER u1 IDENTIFIED BY RANDOM PASSWORD, u2 IDENTIFIED BY RANDOM PASSWORD, u3 IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-u1	%	random
-u2	%	random
-u3	%	random
+user	host	generated password	auth_factor
+u1	%	random	1
+u2	%	random	1
+u3	%	random	1
 CREATE USER u4 IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-u4	%	random
+user	host	generated password	auth_factor
+u4	%	random	1
 select current_user;
 current_user
 foo@%
 ** Verify that REPLACE-syntax works
-user	host	generated password
-foo	%	random
+user	host	generated password	auth_factor
+foo	%	random	1
 ** Verify that RETAIN-syntax works
-user	host	generated password
-foo	%	random
+user	host	generated password	auth_factor
+foo	%	random	1
 ** Verify that ALTER USER works as expected.
 select current_user;
 current_user
 foo@%
 ** Verify that REPLACE-syntax works
-user	host	generated password
-foo	%	random
+user	host	generated password	auth_factor
+foo	%	random	1
 SET PASSWORD FOR u1 = 'foo';
 ** Verify that it works for current user.
 SET PASSWORD TO RANDOM;
-user	host	generated password
-u1	%	random
+user	host	generated password	auth_factor
+u1	%	random	1
 SELECT CURRENT_USER();
 CURRENT_USER()
 u1@%
@@ -45,8 +45,8 @@
 66
 DROP USER u1,u2,u3,u4,foo;
 CREATE USER usr IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr	%	random
+user	host	generated password	auth_factor
+usr	%	random	1
 Logged in successfully through usr
 SELECT CURRENT_USER();
 CURRENT_USER()
@@ -64,120 +64,120 @@
 
 #--Valid combinations/ syntaxes of RANDOM PASSWORD
 CREATE USER 'usr'@'localhost' IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr	localhost	#####
+user	host	generated password	auth_factor
+usr	localhost	#####	1
 ALTER USER 'usr'@'localhost' IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr	localhost	#####
+user	host	generated password	auth_factor
+usr	localhost	#####	1
 SET PASSWORD for 'usr'@'localhost' TO RANDOM;
-user	host	generated password
-usr	localhost	#####
+user	host	generated password	auth_factor
+usr	localhost	#####	1
 DROP USER 'usr'@'localhost';
 
 CREATE USER 'usr' IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr	%	#####
+user	host	generated password	auth_factor
+usr	%	#####	1
 ALTER USER 'usr' IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr	%	#####
+user	host	generated password	auth_factor
+usr	%	#####	1
 SET PASSWORD for 'usr' TO RANDOM;
-user	host	generated password
-usr	%	#####
+user	host	generated password	auth_factor
+usr	%	#####	1
 DROP USER 'usr';
 
 CREATE USER 'usr'@'%' IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr	%	#####
+user	host	generated password	auth_factor
+usr	%	#####	1
 ALTER USER 'usr'@'%' IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr	%	#####
+user	host	generated password	auth_factor
+usr	%	#####	1
 SET PASSWORD for 'usr'@'%' TO RANDOM;
-user	host	generated password
-usr	%	#####
+user	host	generated password	auth_factor
+usr	%	#####	1
 DROP USER 'usr'@'%';
 
 CREATE USER usr IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr	%	#####
+user	host	generated password	auth_factor
+usr	%	#####	1
 ALTER USER usr IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr	%	#####
+user	host	generated password	auth_factor
+usr	%	#####	1
 SET PASSWORD for usr TO RANDOM;
-user	host	generated password
-usr	%	#####
+user	host	generated password	auth_factor
+usr	%	#####	1
 DROP USER usr;
 
 CREATE USER usr@localhost IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr	localhost	#####
+user	host	generated password	auth_factor
+usr	localhost	#####	1
 ALTER USER usr@localhost IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr	localhost	#####
+user	host	generated password	auth_factor
+usr	localhost	#####	1
 SET PASSWORD for usr@localhost TO RANDOM;
-user	host	generated password
-usr	localhost	#####
+user	host	generated password	auth_factor
+usr	localhost	#####	1
 DROP USER usr@localhost;
 
 CREATE USER usr@'%' IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr	%	#####
+user	host	generated password	auth_factor
+usr	%	#####	1
 ALTER USER usr@'%' IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr	%	#####
+user	host	generated password	auth_factor
+usr	%	#####	1
 SET PASSWORD for usr@'%' TO RANDOM;
-user	host	generated password
-usr	%	#####
+user	host	generated password	auth_factor
+usr	%	#####	1
 DROP USER usr@'%';
 
 CREATE USER 'usr'@localhost IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr	localhost	#####
+user	host	generated password	auth_factor
+usr	localhost	#####	1
 ALTER USER 'usr'@localhost IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr	localhost	#####
+user	host	generated password	auth_factor
+usr	localhost	#####	1
 SET PASSWORD for 'usr'@localhost TO RANDOM;
-user	host	generated password
-usr	localhost	#####
+user	host	generated password	auth_factor
+usr	localhost	#####	1
 DROP USER 'usr'@localhost;
 
 CREATE USER usr@'localhost' IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr	localhost	#####
+user	host	generated password	auth_factor
+usr	localhost	#####	1
 ALTER USER usr@'localhost' IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr	localhost	#####
+user	host	generated password	auth_factor
+usr	localhost	#####	1
 SET PASSWORD for usr@'localhost' TO RANDOM;
-user	host	generated password
-usr	localhost	#####
+user	host	generated password	auth_factor
+usr	localhost	#####	1
 DROP USER usr@'localhost';
 
 CREATE USER usr IDENTIFIED BY Random Password;
-user	host	generated password
-usr	%	#####
+user	host	generated password	auth_factor
+usr	%	#####	1
 DROP USER usr;
 CREATE USER usr IDENTIFIED BY random password;
-user	host	generated password
-usr	%	#####
+user	host	generated password	auth_factor
+usr	%	#####	1
 DROP USER usr;
 CREATE USER usr IDENTIFIED BY rANDOm PASSword;
-user	host	generated password
-usr	%	#####
+user	host	generated password	auth_factor
+usr	%	#####	1
 DROP USER usr;
 
 CREATE USER usr1 IDENTIFIED BY RANDOM PASSWORD,
 usr2 IDENTIFIED BY RANDOM PASSWORD,
 usr3 IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr1	%	#####
-usr2	%	#####
-usr3	%	#####
+user	host	generated password	auth_factor
+usr1	%	#####	1
+usr2	%	#####	1
+usr3	%	#####	1
 ALTER USER usr1 IDENTIFIED BY RANDOM PASSWORD,
 usr2 IDENTIFIED BY RANDOM PASSWORD,
 usr3 IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr1	%	#####
-usr2	%	#####
-usr3	%	#####
+user	host	generated password	auth_factor
+usr1	%	#####	1
+usr2	%	#####	1
+usr3	%	#####	1
 DROP USER usr1;
 DROP USER usr2;
 DROP USER usr3;
@@ -196,8 +196,8 @@
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'BY RANDOM PASSWORD' at line 1
 
 CREATE USER 'usr'@'%' IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr	%	######
+user	host	generated password	auth_factor
+usr	%	######	1
 
 ALTER USER usr IDENTIFIED BY RANDOM;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
@@ -219,8 +219,8 @@
 ERROR HY000: Operation ALTER USER failed for 'usr'@'%'
 
 CREATE USER 'usr'@'%' IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr	%	######
+user	host	generated password	auth_factor
+usr	%	######	1
 
 ALTER USER 'usr'@'localhost' IDENTIFIED BY RANDOM PASSWORD;
 ERROR HY000: Operation ALTER USER failed for 'usr'@'localhost'
@@ -233,8 +233,8 @@
 
 #--CREATE temp user with RANDOM PASSWORD
 CREATE USER usr_temp IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr_temp	%	######
+user	host	generated password	auth_factor
+usr_temp	%	######	1
 #--CREATE user with RANDOM PASSWORD
 
 #--Login to usr with RANDOM PASSWORD
@@ -255,8 +255,8 @@
 
 #--CREATE temp user with RANDOM PASSWORD
 CREATE USER usr_temp IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr_temp	%	#####
+user	host	generated password	auth_factor
+usr_temp	%	#####	1
 
 #--CREATE user with RANDOM PASSWORD
 
@@ -275,18 +275,18 @@
 #--Login to usr with RANDOM PASSWORD
 #--SET PASSWORD for user with RANDOM PASSWORD
 SET PASSWORD FOR usr_temp TO RANDOM;
-user	host	generated password
-usr_temp	%	#####
+user	host	generated password	auth_factor
+usr_temp	%	#####	1
 
 #--ALTER user with RANDOM PASSWORD
 ALTER USER usr_temp IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr_temp	%	#####
+user	host	generated password	auth_factor
+usr_temp	%	#####	1
 
 #--CREATE tempuser with RANDOM PASSWORD
 CREATE USER usr_ntemp IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr_ntemp	%	#####
+user	host	generated password	auth_factor
+usr_ntemp	%	#####	1
 #--Disconnect from usr ...
 
 #--ALTER user with RANDOM PASSWORD
@@ -309,8 +309,8 @@
 DROP USER usr_ntemp;
 
 CREATE USER usr_temp IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr_temp	%	#####
+user	host	generated password	auth_factor
+usr_temp	%	#####	1
 GRANT INSERT ON *.* TO usr_temp;
 FLUSH PRIVILEGES;
 
@@ -358,8 +358,8 @@
 #--Disconnect from usr ...
 DROP USER usr;
 CREATE USER usr@localhost IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr	localhost	######
+user	host	generated password	auth_factor
+usr	localhost	######	1
 #-----------------------------------------------------------------------
 # RETAIN CURRENT PASSWORD with ALTER USER and SET PASSWORD
 #-----------------------------------------------------------------------
@@ -449,8 +449,8 @@
 #-----------------------------------------------------------------------
 
 CREATE USER usr IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr	%	#####
+user	host	generated password	auth_factor
+usr	%	#####	1
 
 #--Logged in successfully through usr
 select CURRENT_USER();
@@ -480,10 +480,10 @@
 #-----------------------------------------------------------------------
 
 CREATE USER usr1@localhost IDENTIFIED BY RANDOM PASSWORD, usr2@localhost IDENTIFIED BY RANDOM PASSWORD, usr3@localhost IDENTIFIED BY RANDOM PASSWORD ;
-user	host	generated password
-usr1	localhost	######
-usr2	localhost	######
-usr3	localhost	######
+user	host	generated password	auth_factor
+usr1	localhost	######	1
+usr2	localhost	######	1
+usr3	localhost	######	1
 
 #--Logged in successfully through usr1
 SELECT CURRENT_USER();
@@ -545,19 +545,19 @@
 SET GLOBAL log_output =       'FILE,TABLE';
 SET GLOBAL general_log=       'ON';
 CREATE USER usr@localhost IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr	localhost	######
+user	host	generated password	auth_factor
+usr	localhost	######	1
 ALTER USER usr@localhost IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr	localhost	######
+user	host	generated password	auth_factor
+usr	localhost	######	1
 
 #--Logged in successfully through usr
 SELECT CURRENT_USER();
 CURRENT_USER()
 usr@localhost
 SET PASSWORD TO RANDOM;
-user	host	generated password
-usr	localhost	######
+user	host	generated password	auth_factor
+usr	localhost	######	1
 #--Disconnect from usr ...
 
 
@@ -578,27 +578,28 @@
 SET GLOBAL general_log_file = @old_general_log_file;
 SET GLOBAL log_output = @old_log_output;
 SET GLOBAL general_log= @old_general_log;
+TRUNCATE TABLE mysql.general_log;
 #-----------------------------------------------------------------------
 # Binary log
 #-----------------------------------------------------------------------
 include/save_binlog_position.inc
 CREATE USER usr1 IDENTIFIED BY RANDOM PASSWORD, usr2 IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr1	%	#####
-usr2	%	#####
+user	host	generated password	auth_factor
+usr1	%	#####	1
+usr2	%	#####	1
 # This event sequence pattern MUST be present in binlog: !Q(CREATE USER.*usr1.*usr2.*)
 include/assert_binlog_events.inc
 include/save_binlog_position.inc
 ALTER USER usr1 IDENTIFIED BY RANDOM PASSWORD, usr2 IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr1	%	#####
-usr2	%	#####
+user	host	generated password	auth_factor
+usr1	%	#####	1
+usr2	%	#####	1
 # This event sequence pattern MUST be present in binlog: !Q(ALTER USER.*usr1.*usr2.*)
 include/assert_binlog_events.inc
 include/save_binlog_position.inc
 SET PASSWORD FOR usr1 TO RANDOM;
-user	host	generated password
-usr1	%	#####
+user	host	generated password	auth_factor
+usr1	%	#####	1
 # This event sequence pattern MUST be present in binlog: !Q(ALTER USER.*usr1.*)
 include/assert_binlog_events.inc
 include/save_binlog_position.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/require_secure_transport_windows.result mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/require_secure_transport_windows.result
--- mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/require_secure_transport_windows.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/require_secure_transport_windows.result	2021-09-28 11:46:34.000000000 +0000
@@ -51,5 +51,5 @@
 SET @@global.require_secure_transport = ON;
 # Connection type testing for TCP/IP protocol, secure transport required, should fail.
 #Cleanup
-DROP USER 'user_tcp'@'127.0.0.1', 'user_ssl'@'127.0.0.1';
+DROP USER 'user_tcp'@'127.0.0.1', 'user_ssl'@'127.0.0.1', 'user_requiressl'@'localhost';
 SET @@global.require_secure_transport = OFF;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/system_user_priv.result mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/system_user_priv.result
--- mysql-8.0-8.0.26/mysql-test/suite/auth_sec/r/system_user_priv.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/auth_sec/r/system_user_priv.result	2021-09-28 11:46:34.000000000 +0000
@@ -22,7 +22,7 @@
 SHOW GRANTS FOR non_sys_usr;
 Grants for non_sys_usr@%
 GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `non_sys_usr`@`%`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `non_sys_usr`@`%`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `non_sys_usr`@`%`
 
 # 1.3 Role is granted SYSTEM_USER priv only if it is granted explictly
 CREATE ROLE sys_role;
@@ -42,7 +42,7 @@
 SHOW GRANTS FOR non_sys_role;
 Grants for non_sys_role@%
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `non_sys_role`@`%`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `non_sys_role`@`%`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `non_sys_role`@`%`
 #------------------------------------------------------------------------
 # 2. sys_usr cannot modify the other users properties unless the former
 #    is granted the relevant properties to do so
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/auth_sec/t/mandatory_roles.test mysql-8.0-8.0.27/mysql-test/suite/auth_sec/t/mandatory_roles.test
--- mysql-8.0-8.0.26/mysql-test/suite/auth_sec/t/mandatory_roles.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/auth_sec/t/mandatory_roles.test	2021-09-28 11:46:34.000000000 +0000
@@ -143,7 +143,9 @@
 
 CREATE USER u1@localhost IDENTIFIED BY 'foo';
 CREATE ROLE r1, r2, r3;
-SET GLOBAL mandatory_roles="aa ; bb : r3, r1, (r2), *r2,";
+--error ER_WRONG_VALUE_FOR_VAR
+SET GLOBAL mandatory_roles="foo,";
+SET GLOBAL mandatory_roles="aa ; bb : r3, r1, (r2), *r2";
 connect(con1,localhost,u1,foo,test,,,);
 SHOW GRANTS;
 connection default;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/auth_sec/t/mysql_protocol_types.test mysql-8.0-8.0.27/mysql-test/suite/auth_sec/t/mysql_protocol_types.test
--- mysql-8.0-8.0.26/mysql-test/suite/auth_sec/t/mysql_protocol_types.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/auth_sec/t/mysql_protocol_types.test	2021-09-28 11:46:34.000000000 +0000
@@ -159,5 +159,5 @@
 
 --echo #Cleanup
 DROP USER 'user_tcp'@'127.0.0.1', 'user_ssl'@'127.0.0.1';
-
+TRUNCATE TABLE mysql.general_log;
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/auth_sec/t/mysql_protocol_types_windows.test mysql-8.0-8.0.27/mysql-test/suite/auth_sec/t/mysql_protocol_types_windows.test
--- mysql-8.0-8.0.26/mysql-test/suite/auth_sec/t/mysql_protocol_types_windows.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/auth_sec/t/mysql_protocol_types_windows.test	2021-09-28 11:46:34.000000000 +0000
@@ -76,6 +76,7 @@
 SET GLOBAL general_log_file=  @old_general_log_file;
 SET GLOBAL general_log=       @old_general_log;
 SET GLOBAL log_output=        @old_log_output;
+TRUNCATE TABLE mysql.general_log;
 
 
 --echo #Cleanup
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/auth_sec/t/openssl_without_fips.test mysql-8.0-8.0.27/mysql-test/suite/auth_sec/t/openssl_without_fips.test
--- mysql-8.0-8.0.26/mysql-test/suite/auth_sec/t/openssl_without_fips.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/auth_sec/t/openssl_without_fips.test	2021-09-28 11:46:34.000000000 +0000
@@ -47,6 +47,13 @@
 --echo If FIPS ON set fails, FIPS mode will be set to OFF. All the openssl cryptography should work fine.
 --exec $MYSQL --host=127.0.0.1 -P $MASTER_MYPORT -e "select md5(8);"
 
+--echo #
+--echo # Bug #33082255: SERVER EXIT TRYING TO SET FIPS MODE
+--echo #
+
+--error ER_DA_SSL_FIPS_MODE_ERROR
+SET @@global.ssl_fips_mode = 'ON';
+
 --echo ##Test: Start the server with SSL FIPS mode ON, server will throw error and abort.
 let $error_log = $MYSQLTEST_VARDIR/log/my_restart.err;
 --error 0,1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/auth_sec/t/random_password.test mysql-8.0-8.0.27/mysql-test/suite/auth_sec/t/random_password.test
--- mysql-8.0-8.0.26/mysql-test/suite/auth_sec/t/random_password.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/auth_sec/t/random_password.test	2021-09-28 11:46:34.000000000 +0000
@@ -880,6 +880,7 @@
 SET GLOBAL general_log_file = @old_general_log_file;
 SET GLOBAL log_output = @old_log_output;
 SET GLOBAL general_log= @old_general_log;
+TRUNCATE TABLE mysql.general_log;
 
 --echo #-----------------------------------------------------------------------
 --echo # Binary log
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/auth_sec/t/require_secure_transport_windows.test mysql-8.0-8.0.27/mysql-test/suite/auth_sec/t/require_secure_transport_windows.test
--- mysql-8.0-8.0.26/mysql-test/suite/auth_sec/t/require_secure_transport_windows.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/auth_sec/t/require_secure_transport_windows.test	2021-09-28 11:46:34.000000000 +0000
@@ -135,7 +135,10 @@
 
 --echo #Cleanup
 connection default;
-DROP USER 'user_tcp'@'127.0.0.1', 'user_ssl'@'127.0.0.1';
+DROP USER 'user_tcp'@'127.0.0.1', 'user_ssl'@'127.0.0.1', 'user_requiressl'@'localhost';
 SET @@global.require_secure_transport = OFF;
 
+--let $restart_parameters = restart:
+--source include/restart_mysqld_no_echo.inc
+
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/auth_sec/t/secure_file_priv_warnings_win.test mysql-8.0-8.0.27/mysql-test/suite/auth_sec/t/secure_file_priv_warnings_win.test
--- mysql-8.0-8.0.26/mysql-test/suite/auth_sec/t/secure_file_priv_warnings_win.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/auth_sec/t/secure_file_priv_warnings_win.test	2021-09-28 11:46:34.000000000 +0000
@@ -25,4 +25,11 @@
 let SEARCH_PATTERN= Insecure configuration for --secure-file-priv: Data directory is accessible through --secure-file-priv. Consider choosing a different directory.;
 --source include/search_pattern.inc
 
+
+# Clear extra options
+--let $restart_parameters = restart:
+--source include/restart_mysqld_no_echo.inc
+
+--remove_file $server_log
+
 --echo #-----------------------------------------------------------------------
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/binlog/r/binlog_grant_alter_user.result mysql-8.0-8.0.27/mysql-test/suite/binlog/r/binlog_grant_alter_user.result
--- mysql-8.0-8.0.26/mysql-test/suite/binlog/r/binlog_grant_alter_user.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/binlog/r/binlog_grant_alter_user.result	2021-09-28 11:46:34.000000000 +0000
@@ -1104,11 +1104,11 @@
 CREATE USER u1@localhost;
 SHOW CREATE USER u1@localhost;
 CREATE USER for u1@localhost
-CREATE USER 'u1'@'localhost' IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u1`@`localhost` IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u2@localhost IDENTIFIED BY 'auth_string';
 SHOW CREATE USER u2@localhost;
 CREATE USER for u2@localhost
-CREATE USER 'u2'@'localhost' IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u2`@`localhost` IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 # DDL output for SHOW CREATE USER u2@localhost and recreating user
 DROP USER u2@localhost;
 CREATE USER 'u2'@'localhost' IDENTIFIED WITH 'mysql_native_password'
@@ -1120,75 +1120,75 @@
 CREATE USER u3@localhost IDENTIFIED WITH 'mysql_native_password';
 SHOW CREATE USER u3@localhost;
 CREATE USER for u3@localhost
-CREATE USER 'u3'@'localhost' IDENTIFIED WITH 'mysql_native_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u3`@`localhost` IDENTIFIED WITH 'mysql_native_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u4@localhost IDENTIFIED WITH 'mysql_native_password' BY 'auth_string';
 SHOW CREATE USER u4@localhost;
 CREATE USER for u4@localhost
-CREATE USER 'u4'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u4`@`localhost` IDENTIFIED WITH 'mysql_native_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER user1@localhost IDENTIFIED WITH 'mysql_native_password' BY 'auth_string';
 SHOW CREATE USER user1@localhost;
 CREATE USER for user1@localhost
-CREATE USER 'user1'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `user1`@`localhost` IDENTIFIED WITH 'mysql_native_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 
 CREATE USER user2@localhost IDENTIFIED WITH 'mysql_native_password' BY 'auth_string';
 SHOW CREATE USER user2@localhost;
 CREATE USER for user2@localhost
-CREATE USER 'user2'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `user2`@`localhost` IDENTIFIED WITH 'mysql_native_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 
 CREATE USER u5@localhost REQUIRE SSL;
 SHOW CREATE USER u5@localhost;
 CREATE USER for u5@localhost
-CREATE USER 'u5'@'localhost' IDENTIFIED WITH 'caching_sha2_password' REQUIRE SSL PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u5`@`localhost` IDENTIFIED WITH 'caching_sha2_password' REQUIRE SSL PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u6@localhost IDENTIFIED BY 'auth_string' REQUIRE X509;
 SHOW CREATE USER u6@localhost;
 CREATE USER for u6@localhost
-CREATE USER 'u6'@'localhost' IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>' REQUIRE X509 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u6`@`localhost` IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>' REQUIRE X509 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u7@localhost IDENTIFIED WITH 'mysql_native_password'
             REQUIRE CIPHER 'cipher';
 SHOW CREATE USER u7@localhost;
 CREATE USER for u7@localhost
-CREATE USER 'u7'@'localhost' IDENTIFIED WITH 'mysql_native_password' REQUIRE CIPHER 'cipher' PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u7`@`localhost` IDENTIFIED WITH 'mysql_native_password' REQUIRE CIPHER 'cipher' PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u8@localhost IDENTIFIED WITH 'mysql_native_password' BY 'auth_string'
             REQUIRE ISSUER 'issuer';
 SHOW CREATE USER u8@localhost;
 CREATE USER for u8@localhost
-CREATE USER 'u8'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '<non-deterministic-password-hash>' REQUIRE ISSUER 'issuer' PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u8`@`localhost` IDENTIFIED WITH 'mysql_native_password' AS '<non-deterministic-password-hash>' REQUIRE ISSUER 'issuer' PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u9@localhost REQUIRE SUBJECT 'sub';
 SHOW CREATE USER u9@localhost;
 CREATE USER for u9@localhost
-CREATE USER 'u9'@'localhost' IDENTIFIED WITH 'caching_sha2_password' REQUIRE SUBJECT 'sub' PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u9`@`localhost` IDENTIFIED WITH 'caching_sha2_password' REQUIRE SUBJECT 'sub' PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u10@localhost IDENTIFIED WITH 'mysql_native_password' BY 'auth_string'
             REQUIRE CIPHER "DHE-RSA-AES256-SHA" AND
 SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client"
             ISSUER "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA";
 SHOW CREATE USER u10@localhost;
 CREATE USER for u10@localhost
-CREATE USER 'u10'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '<non-deterministic-password-hash>' REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client' ISSUER '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA' CIPHER 'DHE-RSA-AES256-SHA' PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u10`@`localhost` IDENTIFIED WITH 'mysql_native_password' AS '<non-deterministic-password-hash>' REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client' ISSUER '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA' CIPHER 'DHE-RSA-AES256-SHA' PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u11@localhost WITH MAX_QUERIES_PER_HOUR 2;
 SHOW CREATE USER u11@localhost;
 CREATE USER for u11@localhost
-CREATE USER 'u11'@'localhost' IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u11`@`localhost` IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u12@localhost IDENTIFIED BY 'auth_string'  WITH MAX_QUERIES_PER_HOUR 2;
 SHOW CREATE USER u12@localhost;
 CREATE USER for u12@localhost
-CREATE USER 'u12'@'localhost' IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u12`@`localhost` IDENTIFIED WITH 'caching_sha2_password' AS '<non-deterministic-password-hash>' REQUIRE NONE WITH MAX_QUERIES_PER_HOUR 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u13@localhost IDENTIFIED WITH 'mysql_native_password'
             WITH MAX_CONNECTIONS_PER_HOUR 2;
 SHOW CREATE USER u13@localhost;
 CREATE USER for u13@localhost
-CREATE USER 'u13'@'localhost' IDENTIFIED WITH 'mysql_native_password' REQUIRE NONE WITH MAX_CONNECTIONS_PER_HOUR 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u13`@`localhost` IDENTIFIED WITH 'mysql_native_password' REQUIRE NONE WITH MAX_CONNECTIONS_PER_HOUR 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u14@localhost IDENTIFIED WITH 'mysql_native_password' BY 'auth_string'
             WITH MAX_USER_CONNECTIONS 2;
 SHOW CREATE USER u14@localhost;
 CREATE USER for u14@localhost
-CREATE USER 'u14'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '<non-deterministic-password-hash>' REQUIRE NONE WITH MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u14`@`localhost` IDENTIFIED WITH 'mysql_native_password' AS '<non-deterministic-password-hash>' REQUIRE NONE WITH MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 CREATE USER u15@localhost IDENTIFIED WITH 'mysql_native_password' BY 'auth_string'
             REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client'
             ISSUER "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA"
             CIPHER 'cipher' WITH MAX_QUERIES_PER_HOUR 2 MAX_USER_CONNECTIONS 2;
 SHOW CREATE USER u15@localhost;
 CREATE USER for u15@localhost
-CREATE USER 'u15'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '<non-deterministic-password-hash>' REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client' ISSUER '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA' CIPHER 'cipher' WITH MAX_QUERIES_PER_HOUR 2 MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u15`@`localhost` IDENTIFIED WITH 'mysql_native_password' AS '<non-deterministic-password-hash>' REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client' ISSUER '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA' CIPHER 'cipher' WITH MAX_QUERIES_PER_HOUR 2 MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 DROP USER user1@localhost,u1@localhost,u2@localhost,u3@localhost,u4@localhost,
 u5@localhost,u6@localhost, u7@localhost, u8@localhost,u9@localhost,
 u10@localhost,u11@localhost,u12@localhost,u13@localhost,u14@localhost,
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/binlog/r/binlog_start_slave_heartbeat.result mysql-8.0-8.0.27/mysql-test/suite/binlog/r/binlog_start_slave_heartbeat.result
--- mysql-8.0-8.0.26/mysql-test/suite/binlog/r/binlog_start_slave_heartbeat.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/binlog/r/binlog_start_slave_heartbeat.result	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-include/assert.inc [heartbeat period should be 0.000 in the beginning.]
-START SLAVE;
-ERROR HY000: The server is not configured as slave; fix in config file or with CHANGE MASTER TO
-include/assert.inc [heartbeat period should be 0.000 even after START SLAVE.]
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/binlog/r/binlog_stm_blackhole.result mysql-8.0-8.0.27/mysql-test/suite/binlog/r/binlog_stm_blackhole.result
--- mysql-8.0-8.0.26/mysql-test/suite/binlog/r/binlog_stm_blackhole.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/binlog/r/binlog_stm_blackhole.result	2021-09-28 11:46:34.000000000 +0000
@@ -80,8 +80,8 @@
 t1	1	a	2	b	NULL	5	NULL	NULL	YES	FULLTEXT			YES	NULL
 select * from t1 where MATCH(a,b) AGAINST ("collections");
 a	b
-Only MyISAM tables	support collections
 Full-text indexes	are called collections
+Only MyISAM tables	support collections
 explain select * from t1 where MATCH(a,b) AGAINST ("collections");
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	NULL	fulltext	a	a	0	const	1	100.00	Using where
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/binlog/t/binlog_start_slave_heartbeat-slave.opt mysql-8.0-8.0.27/mysql-test/suite/binlog/t/binlog_start_slave_heartbeat-slave.opt
--- mysql-8.0-8.0.26/mysql-test/suite/binlog/t/binlog_start_slave_heartbeat-slave.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/binlog/t/binlog_start_slave_heartbeat-slave.opt	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
---force-restart
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/binlog/t/binlog_start_slave_heartbeat.test mysql-8.0-8.0.27/mysql-test/suite/binlog/t/binlog_start_slave_heartbeat.test
--- mysql-8.0-8.0.26/mysql-test/suite/binlog/t/binlog_start_slave_heartbeat.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/binlog/t/binlog_start_slave_heartbeat.test	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-###############################################################################
-# BUG#18791604 SERVER HITS ER 1200 ON START SLAVE CMD, STILL HEARTBEAT_PERIOD
-#              SETS TO DEFAULT
-#
-# When a server is not configured as a slave (no CHANGE MASTER done yet),
-# START SLAVE will fail and that is fine. But this resets the heartbeat_period
-# to default which is strange and counterintuitive.
-#
-# We fix this by making sure start slave NEVER affects heartbeat_period.
-# It should NOT be set by anything other than CHANGE MASTER.
-#
-# We test that:
-# 1. On a fresh server start/re-start heartbeat_period is 0.
-# 2  START SLAVE doesnt affect heartbeat_period, it still remains 0.
-###############################################################################
-
---source include/have_binlog_format_statement.inc
-
---let $slave_heartbeat_value= query_get_value("SHOW STATUS like 'Slave_heartbeat_period'", Value, 1)
-
---let $assert_cond= "$slave_heartbeat_value" = 0.000
---let $assert_text= heartbeat period should be 0.000 in the beginning.
---source include/assert.inc
-
---error ER_BAD_SLAVE
-START SLAVE;
-
---let $slave_heartbeat_value= query_get_value("SHOW STATUS like 'Slave_heartbeat_period'", Value, 1)
-
---let $assert_cond= "$slave_heartbeat_value" = 0.000
---let $assert_text= heartbeat period should be 0.000 even after START SLAVE.
---source include/assert.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/binlog_gtid/r/binlog_xa_modify_gtid_executed_explicitly.result mysql-8.0-8.0.27/mysql-test/suite/binlog_gtid/r/binlog_xa_modify_gtid_executed_explicitly.result
--- mysql-8.0-8.0.26/mysql-test/suite/binlog_gtid/r/binlog_xa_modify_gtid_executed_explicitly.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/binlog_gtid/r/binlog_xa_modify_gtid_executed_explicitly.result	2021-09-28 11:46:34.000000000 +0000
@@ -6,7 +6,7 @@
 XA START '1';
 INSERT INTO t1 VALUES(1);
 INSERT INTO mysql.gtid_executed VALUES("aaaaaaaa-aaaa-aaaa-aaaa-bug#21452916", 1, 1);
-ERROR HY000: Please do not modify the gtid_executed table with an XA transaction. This is an internal system table used to store GTIDs for committed transactions. Although modifying it can lead to an inconsistent GTID state, if neccessary you can modify it with a non-XA transaction.
+ERROR HY000: Please do not modify the gtid_executed table with an XA transaction. This is an internal system table used to store GTIDs for committed transactions. Although modifying it can lead to an inconsistent GTID state, if necessary you can modify it with a non-XA transaction.
 XA END '1';
 XA PREPARE '1';
 XA COMMIT '1';
@@ -23,7 +23,7 @@
 XA START '1';
 INSERT INTO t1 VALUES(2);
 UPDATE mysql.gtid_executed SET source_uuid = "aaaaaaaa-aaaa-aaaa-aaaa-bug#21452916" WHERE source_uuid = '$master_uuid';
-ERROR HY000: Please do not modify the gtid_executed table with an XA transaction. This is an internal system table used to store GTIDs for committed transactions. Although modifying it can lead to an inconsistent GTID state, if neccessary you can modify it with a non-XA transaction.
+ERROR HY000: Please do not modify the gtid_executed table with an XA transaction. This is an internal system table used to store GTIDs for committed transactions. Although modifying it can lead to an inconsistent GTID state, if necessary you can modify it with a non-XA transaction.
 XA END '1';
 XA PREPARE '1';
 XA COMMIT '1';
@@ -39,7 +39,7 @@
 XA START '1';
 INSERT INTO t1 VALUES(3);
 DELETE FROM mysql.gtid_executed WHERE source_uuid = '$master_uuid';
-ERROR HY000: Please do not modify the gtid_executed table with an XA transaction. This is an internal system table used to store GTIDs for committed transactions. Although modifying it can lead to an inconsistent GTID state, if neccessary you can modify it with a non-XA transaction.
+ERROR HY000: Please do not modify the gtid_executed table with an XA transaction. This is an internal system table used to store GTIDs for committed transactions. Although modifying it can lead to an inconsistent GTID state, if necessary you can modify it with a non-XA transaction.
 XA END '1';
 XA PREPARE '1';
 XA COMMIT '1';
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/binlog_gtid/t/binlog_gtid_utils-master.opt mysql-8.0-8.0.27/mysql-test/suite/binlog_gtid/t/binlog_gtid_utils-master.opt
--- mysql-8.0-8.0.26/mysql-test/suite/binlog_gtid/t/binlog_gtid_utils-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/binlog_gtid/t/binlog_gtid_utils-master.opt	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
---thread_stack=409600
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/binlog_nogtid/r/binlog_unsafe.result mysql-8.0-8.0.27/mysql-test/suite/binlog_nogtid/r/binlog_unsafe.result
--- mysql-8.0-8.0.26/mysql-test/suite/binlog_nogtid/r/binlog_unsafe.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/binlog_nogtid/r/binlog_unsafe.result	2021-09-28 11:46:34.000000000 +0000
@@ -1,3 +1,5 @@
+SET @old_log_output=@@global.log_output;
+SET GLOBAL log_output="FILE,TABLE";
 #### Setup tables ####
 CREATE TABLE t0 (a VARCHAR(510));
 CREATE TABLE t1 (a CHAR(100));
@@ -2760,4 +2762,6 @@
 Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it invokes a trigger or a stored function that modifies a table that has a column with a DEFAULT expression that may return a different value on the slave.
 DROP FUNCTION f;
 DROP TABLE t;
+SET GLOBAL log_output=@old_log_output;
+TRUNCATE TABLE mysql.general_log;
 "End of tests"
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/binlog_nogtid/t/binlog_unsafe-master.opt mysql-8.0-8.0.27/mysql-test/suite/binlog_nogtid/t/binlog_unsafe-master.opt
--- mysql-8.0-8.0.26/mysql-test/suite/binlog_nogtid/t/binlog_unsafe-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/binlog_nogtid/t/binlog_unsafe-master.opt	2021-09-28 11:46:34.000000000 +0000
@@ -1 +1 @@
-$UDF_EXAMPLE_LIB_OPT --log-output=file,table --thread-stack=512K
+$UDF_EXAMPLE_LIB_OPT
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/binlog_nogtid/t/binlog_unsafe_stmt_capable_engine-master.opt mysql-8.0-8.0.27/mysql-test/suite/binlog_nogtid/t/binlog_unsafe_stmt_capable_engine-master.opt
--- mysql-8.0-8.0.26/mysql-test/suite/binlog_nogtid/t/binlog_unsafe_stmt_capable_engine-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/binlog_nogtid/t/binlog_unsafe_stmt_capable_engine-master.opt	2021-09-28 11:46:34.000000000 +0000
@@ -1 +1 @@
-$UDF_EXAMPLE_LIB_OPT --thread-stack=512K
+$UDF_EXAMPLE_LIB_OPT
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/binlog_nogtid/t/binlog_unsafe.test mysql-8.0-8.0.27/mysql-test/suite/binlog_nogtid/t/binlog_unsafe.test
--- mysql-8.0-8.0.26/mysql-test/suite/binlog_nogtid/t/binlog_unsafe.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/binlog_nogtid/t/binlog_unsafe.test	2021-09-28 11:46:34.000000000 +0000
@@ -106,6 +106,8 @@
 # Thread stack overrun in debug mode on sparc
 --source include/not_sparc_debug.inc
 
+SET @old_log_output=@@global.log_output;
+SET GLOBAL log_output="FILE,TABLE";
 
 --disable_query_log
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
@@ -784,4 +786,6 @@
 DROP FUNCTION f;
 DROP TABLE t;
 
+SET GLOBAL log_output=@old_log_output;
+TRUNCATE TABLE mysql.general_log;
 --echo "End of tests"
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/include/clone_exec_ddl.inc mysql-8.0-8.0.27/mysql-test/suite/clone/include/clone_exec_ddl.inc
--- mysql-8.0-8.0.26/mysql-test/suite/clone/include/clone_exec_ddl.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/include/clone_exec_ddl.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,86 @@
+## Execute / SHOW DDL statement
+## 1. ddl_op         : DDL operation - CREATE TABLE,  DROP TABLE,  ALTER TABLE ...
+## 2. table_num      : Table number  - 1,2,3 ... [t1, t2 ...]
+## 3. ddl_stmt       : DDL statement text following table name
+## 4. ddl_post       : Any other follow up clause like partition
+## 5. ddl_table_rename : If DDL is renaming one table to another
+## 6. ddl_table_extn_from : Old table name extension - _old [t1_old, t2_old ...]
+## 7. ddl_table_extn : Second table name extension - _new [t1_new, t2_new ...]
+## 8. ddl_table_extn_show : Table name extension at test end - _new [t1_new, t2_new ...]
+## 9. ddl_count : Number of DDLs to execute
+
+if (!$ddl_count) {
+  --let $ddl_count = 1
+}
+
+--let $ddl_num = 1
+
+if ($ddl_exec) {
+
+  while ($ddl_num <= $ddl_count) {
+
+    --let $cur_ddl_op    = \$ddl_op$ddl_num$after_dml
+    --let $cur_ddl_stmt  = \$ddl_stmt$ddl_num$after_dml
+    --let $cur_ddl_post  = \$ddl_post$ddl_num$after_dml
+
+    --let $cur_ddl_table_rename = \$ddl_table_rename$ddl_num$after_dml
+    --let $cur_ddl_table_extn  = \$ddl_table_extn$ddl_num$after_dml
+    --let $cur_ddl_table_extn_from  = \$ddl_table_extn_from$ddl_num$after_dml
+
+    if (!$ddl_undo) {
+
+      if (!$cur_ddl_table_rename) {
+
+        if ($ddl_redo_encrypt) {
+          --eval $cur_ddl_op
+        }
+
+        if (!$ddl_redo_encrypt) {
+          --eval $cur_ddl_op t$table_num $cur_ddl_stmt $cur_ddl_post
+        }
+      }
+
+      if ($cur_ddl_table_rename) {
+        --eval $cur_ddl_op t$table_num$cur_ddl_table_extn_from $cur_ddl_stmt t$table_num$cur_ddl_table_extn
+      }
+    }
+
+    if ($ddl_undo) {
+
+      --let $cur_ddl_post =
+
+      if ($ddl_undo_create) {
+        --let $cur_ddl_post = 'undo_0$table_num.ibu'
+      }
+
+      --eval $cur_ddl_op undo_0$table_num $cur_ddl_stmt $cur_ddl_post
+
+      if ($ddl_undo_empty) {
+        --let $inactive_undo_space = undo_0$table_num
+        --source include/wait_until_undo_space_is_empty.inc
+      }
+    }
+    --inc $ddl_num
+  }
+}
+
+if ($ddl_show) {
+  --eval SHOW CREATE TABLE t$table_num$ddl_table_extn_show
+  --eval CHECK TABLE t$table_num$ddl_table_extn_show EXTENDED
+  --eval SELECT count(*) from t$table_num$ddl_table_extn_show
+  --eval SELECT col1, col2, col3 FROM t$table_num$ddl_table_extn_show ORDER BY col1 LIMIT 10;
+  --eval SELECT col1, col2, col3 FROM t$table_num$ddl_table_extn_show ORDER BY col1 DESC LIMIT 10;
+
+  if ($ddl_undo) {
+
+    SELECT NAME, SPACE_TYPE, STATE
+    FROM INFORMATION_SCHEMA.INNODB_TABLESPACES
+    WHERE SPACE_TYPE = 'Undo'
+    ORDER BY NAME;
+
+    SELECT TABLESPACE_NAME, FILE_NAME, FILE_TYPE, ENGINE
+    FROM INFORMATION_SCHEMA.FILES
+    WHERE FILE_NAME LIKE '%undo_0%'
+    ORDER BY TABLESPACE_NAME;
+  }
+}
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/include/create_ddl_schema.inc mysql-8.0-8.0.27/mysql-test/suite/clone/include/create_ddl_schema.inc
--- mysql-8.0-8.0.26/mysql-test/suite/clone/include/create_ddl_schema.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/include/create_ddl_schema.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,30 @@
+--source ../include/create_schema.inc
+
+call execute_dml(0, 0, 100, 100, 10, 0);
+
+CREATE TABLE t SELECT * FROM t1;
+
+if ($ddl_no_table) {
+  DROP table t1;
+  DROP table t2;
+}
+
+if (!$ddl_no_table) {
+  --let $ddl_op = CREATE TABLE
+  --let $ddl_stmt = (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+
+  --eval $ddl_op t0 $ddl_stmt
+  --eval $ddl_op t01 $ddl_stmt
+  --eval $ddl_op t3 $ddl_stmt
+  --eval $ddl_op t11 $ddl_stmt
+  --eval $ddl_op t21 $ddl_stmt
+
+  --let $ddl_op =
+  --let $ddl_stmt =
+
+  INSERT INTO t11 SELECT * FROM t;
+  INSERT INTO t21 SELECT * FROM t;
+}
+
+SHOW VARIABLES LIKE 'clone_ddl_timeout';
+SHOW VARIABLES LIKE 'clone_block_ddl';
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/include/create_schema.inc mysql-8.0-8.0.27/mysql-test/suite/clone/include/create_schema.inc
--- mysql-8.0-8.0.26/mysql-test/suite/clone/include/create_schema.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/include/create_schema.inc	2021-09-28 11:46:34.000000000 +0000
@@ -43,11 +43,13 @@
 
 			WHEN 0 THEN
 				SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
-				INSERT INTO t1 VALUES(v_key, v_key * 10,
+				INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+                                        v_key, v_key * 10,
 					@clol3_text, REPEAT('Large Column Data ', 2048))
 					ON DUPLICATE KEY UPDATE col2 = col2 + 1;
 
-				INSERT INTO t2 VALUES(v_key, v_key * 10,
+				INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+				        v_key, v_key * 10,
 					@clol3_text, REPEAT('Large Column Data ', 2048))
 					ON DUPLICATE KEY UPDATE col2 = col2 + 1;
 
@@ -80,6 +82,34 @@
 		END IF;
 
 	END WHILE;
+	COMMIT;
 END|
 
+if ($clone_ddl) {
+
+# Procedure to execute ddl rebuild in loop
+#	p_loop_count	[IN]	Number of times to execute
+
+CREATE PROCEDURE execute_ddl(
+	p_loop_count	INT)
+BEGIN
+	DECLARE v_idx		INT DEFAULT 0;
+
+	/* Loop and execute DDL. */
+        /* Concurrent DDL and DML creates MDL deadlock. Disabled till fixed. */
+	WHILE(v_idx < p_loop_count) DO
+
+		ALTER TABLE t1 ENGINE = InnoDB;
+
+		ALTER TABLE t2 ENGINE = InnoDB;
+
+		DO SLEEP(0.1);
+
+		SET v_idx = v_idx + 1;
+
+	END WHILE;
+END|
+
+}
+
 DELIMITER ;|
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/include/ddl_clone_abort.inc mysql-8.0-8.0.27/mysql-test/suite/clone/include/ddl_clone_abort.inc
--- mysql-8.0-8.0.26/mysql-test/suite/clone/include/ddl_clone_abort.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/include/ddl_clone_abort.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,30 @@
+# Test DDL command aborting clone on failure
+
+--let $CLONE_DATADIR = $MYSQL_TMP_DIR/data_new
+--let $MYSQLD_DATADIR= `select @@datadir;`
+
+SET GLOBAL DEBUG = '+d,clone_ddl_abort_wait_page_copy';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl WAIT_FOR resume_clone';
+--source ../include/clone_command_send.inc
+
+--connection con1
+--echo # In connection CON1
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl';
+SET DEBUG_SYNC = 'clone_notify_ddl_after_state_block SIGNAL resume_clone';
+
+if ($ddl_error) {
+  --error ER_INTERNAL_ERROR
+}
+--eval $ddl_alter_abort
+
+--connection default
+--echo # In connection DEFAULT
+if (!$ddl_error) {
+  --error ER_CLONE_DDL_IN_PROGRESS
+}
+--reap
+
+SET GLOBAL DEBUG = '-d,clone_ddl_abort_wait_page_copy';
+
+--force-rmdir $CLONE_DATADIR
+SET DEBUG_SYNC = 'RESET';
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/include/ddl_common.inc mysql-8.0-8.0.27/mysql-test/suite/clone/include/ddl_common.inc
--- mysql-8.0-8.0.26/mysql-test/suite/clone/include/ddl_common.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/include/ddl_common.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,305 @@
+## Common file for controlled DDL execution with concurrent Clone
+##
+## 1. ddl_op         : DDL operation - CREATE TABLE,  DROP TABLE,  ALTER TABLE ...
+## 2. ddl_stmt       : DDL statement text following table name
+## 3. ddl_post       : Any other follow up clause like partition
+## 4. ddl_table_extn : Second table name extension - new [t1_new, t2_new ...]
+## 5. dml_stmt1      : DML to be executed after DDL during stage-1 FILE COPY
+## 6. dml_stmt11     : DML to be executed after DDL before sending DDL metadata in FILE COPY
+## 7. dml_stmt2      : DML to be executed after DDL during stage-1 PAGE COPY
+## 8. dml_stmt21     : DML to be executed after DDL before sending DDL metadata in PAGE COPY
+## 9. ddl_skip_check : Skip checking data. Used tables are dropped
+##10. ddl_encryption : restart server with keyring plugin
+
+--source include/count_sessions.inc
+
+## Get rid of the binary logs from previous run.
+RESET MASTER;
+
+--let $CLONE_DATADIR = $MYSQL_TMP_DIR/data_new
+--let $MYSQLD_DATADIR= `select @@datadir;`
+
+if ($remote_clone) {
+  SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+}
+
+if (!$remote_clone) {
+  SET GLOBAL DEBUG = '+d,local_release_clone_file_pin';
+}
+
+if ($ddl_encryption) {
+  SET GLOBAL DEBUG = '+d,log_redo_with_invalid_master_key';
+}
+
+if ($ddl_redo_encrypt) {
+  --let $skip_ddl = 1
+}
+
+--let $ddl_exec = 1
+--let $table_num = 0
+
+if (!$skip_ddl) {
+  --source ../include/clone_exec_ddl.inc
+}
+
+if ($post_dml) {
+  --let $after_dml = _after_dml
+  --source ../include/clone_exec_ddl.inc
+  --let $after_dml =
+}
+
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+--source ../include/clone_command_send.inc
+
+if ($ddl_file_copy) {
+  --let $skip_ddl =
+}
+
+connect (con1,localhost,root,,);
+
+--echo # In connection CON1
+
+if (!$remote_clone) {
+  --echo # Waiting for clone to reach 'Initial metadata transfer'
+  SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_init';
+  --echo # Wait finished
+}
+
+--let $table_num = 01
+
+if (!$skip_ddl) {
+  --source ../include/clone_exec_ddl.inc
+}
+
+if ($post_dml) {
+  --let $after_dml = _after_dml
+  --source ../include/clone_exec_ddl.inc
+  --let $after_dml =
+}
+
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+
+--echo # Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+--echo # Wait finished
+
+--let $table_num = 1
+
+if($remote_clone) {
+  --echo # For remote clone, let the donor progress concurrently
+  --echo # otherwise file pins may not be released causing deadlock
+  SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+}
+
+if (!$skip_ddl) {
+  --source ../include/clone_exec_ddl.inc
+}
+
+--eval $dml_stmt1
+
+--echo # Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+
+if ($post_dml) {
+  --let $after_dml = _after_dml
+  --source ../include/clone_exec_ddl.inc
+  --let $after_dml =
+}
+
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+
+# For remote clone, DDL is executed concurrently. This is to
+# make sure that clone doesn't enter into page copy state
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+
+if (!$remote_clone) {
+  --echo # Waiting for clone to reach DDL metadata for 'file copy'
+  SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_meta';
+  --echo # Wait finished
+}
+
+if(!$in_place_ddl) {
+  --let $table_num = 11
+
+  if (!$skip_ddl) {
+    --source ../include/clone_exec_ddl.inc
+  }
+
+  --eval $dml_stmt11
+
+  if ($post_dml) {
+    --let $after_dml = _after_dml
+    --source ../include/clone_exec_ddl.inc
+    --let $after_dml =
+  }
+}
+
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+
+--echo # Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+--echo # Wait finished
+
+if ($ddl_page_copy) {
+  --let $skip_ddl =
+}
+
+# In place DDL currently waits for page copy to complete. Allow
+# clone to proceed concurrently.
+
+if($in_place_ddl) {
+  SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_page';
+}
+
+--let $table_num = 2
+
+if (!$skip_ddl) {
+  --source ../include/clone_exec_ddl.inc
+}
+
+--eval $dml_stmt2
+
+if ($post_dml) {
+  --let $after_dml = _after_dml
+  --source ../include/clone_exec_ddl.inc
+  --let $after_dml =
+}
+
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+
+if (!$remote_clone) {
+  --echo # Waiting for clone to reach DDL metadata for 'page copy'
+  SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page_meta';
+  --echo # Wait finished
+}
+
+if ($remote_clone) {
+  --echo # Waiting for clone to reach 'redo copy'
+  SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+  --echo # Wait finished
+}
+
+--let $table_num = 21
+
+if (!$skip_ddl) {
+  --source ../include/clone_exec_ddl.inc
+}
+
+--eval $dml_stmt21
+
+if ($post_dml) {
+  --let $after_dml = _after_dml
+  --source ../include/clone_exec_ddl.inc
+  --let $after_dml =
+}
+
+if (!$remote_clone) {
+  SET DEBUG_SYNC = 'now SIGNAL resume_page_meta';
+
+  --echo # Waiting for clone to reach 'redo copy'
+  SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+  --echo # Wait finished
+}
+
+--let $table_num = 3
+
+if (!$skip_ddl) {
+  --source ../include/clone_exec_ddl.inc
+}
+
+if ($post_dml) {
+  --let $after_dml = _after_dml
+  --source ../include/clone_exec_ddl.inc
+  --let $after_dml =
+}
+
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+
+connection default;
+--echo # In connection DEFAULT
+--echo # Waiting for clone to complete
+--reap
+--echo # Wait finished
+
+if ($remote_clone) {
+  SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+}
+
+if (!$remote_clone) {
+  SET GLOBAL DEBUG = '-d,local_release_clone_file_pin';
+}
+
+--disconnect con1
+--source include/wait_until_count_sessions.inc
+
+--echo # Restart server on cloned data directory
+if ($ddl_encryption) {
+  --replace_result $CLONE_DATADIR CLONE_DATADIR $KEYRING_PLUGIN KEYRING_PLUGIN $MYSQL_TMP_DIR MYSQL_TMP_DIR
+  --let restart_parameters="restart: --datadir=$CLONE_DATADIR --early-plugin-load="keyring_file=$KEYRING_PLUGIN" --keyring_file_data=$MYSQL_TMP_DIR/mysecret_keyring"
+}
+
+if (!$ddl_encryption) {
+  --replace_result $CLONE_DATADIR CLONE_DATADIR
+  --let restart_parameters="restart: --datadir=$CLONE_DATADIR"
+}
+
+--source include/restart_mysqld.inc
+
+--let $ddl_exec =
+
+--echo # Check cloned data
+SHOW TABLES;
+
+if (!$ddl_skip_check) {
+  --let $ddl_show = 1
+
+  --let $table_num = 1
+  --source ../include/clone_exec_ddl.inc
+
+  --let $table_num = 11
+  --source ../include/clone_exec_ddl.inc
+
+  --let $table_num = 2
+  --source ../include/clone_exec_ddl.inc
+
+  --let $ddl_show =
+
+  if ($dml_stmt_check) {
+    --eval $dml_stmt_check
+  }
+}
+
+--echo # Restart server back on base data directory
+
+if ($ddl_encryption) {
+  --replace_result $KEYRING_PLUGIN KEYRING_PLUGIN $MYSQL_TMP_DIR MYSQL_TMP_DIR $ENCRYPT_DATADIR ENCRYPT_DATADIR
+  --let restart_parameters=restart: --datadir=$ENCRYPT_DATADIR --early-plugin-load="keyring_file=$KEYRING_PLUGIN" --keyring_file_data=$MYSQL_TMP_DIR/mysecret_keyring
+}
+
+if (!$ddl_encryption) {
+
+  if (!$skip_space_validation) {
+    --let restart_parameters=restart:
+  }
+
+  if ($skip_space_validation) {
+    --let restart_parameters=restart: --skip-innodb-validate-tablespace-paths
+  }
+}
+
+--source include/restart_mysqld.inc
+
+if ($undo_encryption) {
+  SET GLOBAL innodb_undo_log_encrypt = ON;
+  SHOW VARIABLES LIKE 'innodb_undo_log_encrypt';
+}
+
+--force-rmdir $CLONE_DATADIR
+SET DEBUG_SYNC = 'RESET';
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/include/ddl_kill.inc mysql-8.0-8.0.27/mysql-test/suite/clone/include/ddl_kill.inc
--- mysql-8.0-8.0.26/mysql-test/suite/clone/include/ddl_kill.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/include/ddl_kill.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,33 @@
+## KILL DDL command while waiting for clone
+
+--let $CON_ID= `SELECT CONNECTION_ID()`
+
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL kill_ddl';
+--send_eval $ddl_stmt
+
+--connection con1
+--echo # In connection CON1
+
+--echo # Waiting for DDL to reach notification
+SET DEBUG_SYNC = 'now WAIT_FOR kill_ddl';
+--echo # Wait finished
+
+--replace_result $CON_ID CON_ID
+--eval KILL QUERY $CON_ID
+
+--connection con2
+--echo # In connection CON2
+
+if (!$no_interrupt) {
+  --echo # Waiting for DDL to exit with error
+  --error ER_QUERY_INTERRUPTED
+  --reap
+}
+
+--echo # Query should no longer be interrupted and should pass
+if ($no_interrupt) {
+  --reap
+}
+
+--echo # Wait finished
+SET DEBUG_SYNC = 'RESET';
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/include/ddl_lock_clone_wait.inc mysql-8.0-8.0.27/mysql-test/suite/clone/include/ddl_lock_clone_wait.inc
--- mysql-8.0-8.0.26/mysql-test/suite/clone/include/ddl_lock_clone_wait.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/include/ddl_lock_clone_wait.inc	2021-09-28 11:46:34.000000000 +0000
@@ -3,7 +3,7 @@
 --connection con1
 --echo # In connection CON1
 
-SET DEBUG_SYNC = 'clone_marked_abort2 SIGNAL resume_clone WAIT_FOR resume_ddl';
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_clone WAIT_FOR resume_ddl';
 --send_eval $ddl_text
 
 --connection default
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/include/drop_ddl_schema.inc mysql-8.0-8.0.27/mysql-test/suite/clone/include/drop_ddl_schema.inc
--- mysql-8.0-8.0.26/mysql-test/suite/clone/include/drop_ddl_schema.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/include/drop_ddl_schema.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,35 @@
+if ($ddl_drop_schema_tables) {
+  DROP TABLE t;
+
+  if ($ddl_recreate_schema_tables) {
+    --let $ddl_op = CREATE TABLE
+    --let $ddl_stmt = (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+    --eval $ddl_op t1 $ddl_stmt
+    --eval $ddl_op t2 $ddl_stmt
+  }
+
+  --source ../include/drop_schema.inc
+  --let $dropped_schema_tables = 1
+}
+
+if($ddl_drop_tables) {
+  DROP TABLE t0;
+  DROP TABLE t01;
+  if (!$dropped_schema_tables) {
+    DROP TABLE t1;
+    DROP TABLE t2;
+  }
+  DROP TABLE t3;
+  DROP TABLE t11;
+  DROP TABLE t21;
+}
+
+if ($ddl_drop_renamed_tables) {
+  --eval DROP TABLE t0$ddl_table_extn_show
+  --eval DROP TABLE t01$ddl_table_extn_show
+  --eval DROP TABLE t1$ddl_table_extn_show
+  --eval DROP TABLE t2$ddl_table_extn_show
+  --eval DROP TABLE t3$ddl_table_extn_show
+  --eval DROP TABLE t11$ddl_table_extn_show
+  --eval DROP TABLE t21$ddl_table_extn_show
+}
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/include/drop_schema.inc mysql-8.0-8.0.27/mysql-test/suite/clone/include/drop_schema.inc
--- mysql-8.0-8.0.26/mysql-test/suite/clone/include/drop_schema.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/include/drop_schema.inc	2021-09-28 11:46:34.000000000 +0000
@@ -3,3 +3,7 @@
 DROP TABLE t2;
 
 DROP PROCEDURE execute_dml;
+
+if ($clone_ddl) {
+  DROP PROCEDURE execute_ddl;
+}
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/include/encrypt_begin.inc mysql-8.0-8.0.27/mysql-test/suite/clone/include/encrypt_begin.inc
--- mysql-8.0-8.0.26/mysql-test/suite/clone/include/encrypt_begin.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/include/encrypt_begin.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,28 @@
+--echo # Prepare for creating Encrypted Table
+
+--let $ENCRYPT_DATADIR = $MYSQL_TMP_DIR/data_encrypt
+--let $ENCRYPT_ERROR_FILE = $MYSQL_TMP_DIR/boot_encrypt_log
+
+--let BOOTSTRAP_SQL=$MYSQL_TMP_DIR/boot.sql
+--let $START_PAGE_SIZE= `select @@innodb_page_size`
+
+--echo # create bootstrap file
+
+write_file $BOOTSTRAP_SQL;
+CREATE DATABASE test DEFAULT CHARACTER SET latin1;
+EOF
+
+--mkdir $ENCRYPT_DATADIR
+
+--echo # Create and start mysqld with keyring plugin.
+--source include/shutdown_mysqld.inc
+
+--replace_result $MYSQLD MYSQLD $BOOTSTRAP_SQL BOOTSTRAP_SQL $ENCRYPT_DATADIR ENCRYPT_DATADIR $START_PAGE_SIZE PAGE_SIZE $ENCRYPT_ERROR_FILE ENCRYPT_ERROR_FILE
+--let NEW_CMD = $MYSQLD --no-defaults --innodb_dedicated_server=OFF --initialize-insecure --init-file=$BOOTSTRAP_SQL --innodb_page_size=$START_PAGE_SIZE --datadir=$ENCRYPT_DATADIR > $ENCRYPT_ERROR_FILE  2>&1
+
+--exec $NEW_CMD
+
+--replace_result $KEYRING_PLUGIN KEYRING_PLUGIN $MYSQL_TMP_DIR MYSQL_TMP_DIR $ENCRYPT_DATADIR ENCRYPT_DATADIR
+--let $restart_parameters=restart: --datadir=$ENCRYPT_DATADIR --early-plugin-load="keyring_file=$KEYRING_PLUGIN" --keyring_file_data=$MYSQL_TMP_DIR/mysecret_keyring
+
+--source include/start_mysqld.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/include/encrypt_end.inc mysql-8.0-8.0.27/mysql-test/suite/clone/include/encrypt_end.inc
--- mysql-8.0-8.0.26/mysql-test/suite/clone/include/encrypt_end.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/include/encrypt_end.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,9 @@
+--echo # Restart server and remove encrypted data directory
+let $restart_parameters = "restart:";
+--source include/restart_mysqld.inc
+
+# Temporary file Cleanup
+--force-rmdir $ENCRYPT_DATADIR
+--remove_file $ENCRYPT_ERROR_FILE
+--remove_file $BOOTSTRAP_SQL
+--remove_file $MYSQL_TMP_DIR/mysecret_keyring
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/ddl_alter_copy.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/ddl_alter_copy.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/ddl_alter_copy.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/ddl_alter_copy.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,864 @@
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+PARTITION BY KEY(col1) PARTITIONS 5;
+CREATE PROCEDURE execute_dml(
+p_dml_type	INT,
+p_key_min	INT,
+p_key_range	INT,
+p_loop_count	INT,
+p_frequency	INT,
+p_is_rand	INT)
+BEGIN
+DECLARE v_idx		INT DEFAULT 0;
+DECLARE v_commit	INT DEFAULT 0;
+DECLARE v_key		INT DEFAULT 0;
+/* Loop and INSERT data at random position */
+WHILE(v_idx < p_loop_count) DO
+/* Generate key between 1 to p_loop_count */
+IF p_is_rand = 1 THEN
+SET v_key = p_key_min + FLOOR(RAND() * p_key_range);
+ELSE
+SET v_key = p_key_min + (v_idx  % p_key_range);
+END IF;
+CASE p_dml_type
+WHEN 0 THEN
+SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+WHEN 1 THEN
+UPDATE t1 SET col2 = v_idx + 1 WHERE col1 = v_key;
+UPDATE t2 SET col2 = v_idx + 1 WHERE col1 = v_key;
+WHEN 2 THEN
+DELETE FROM t1 WHERE col1 = v_key;
+DELETE FROM t2 WHERE col1 = v_key;
+ELSE
+DELETE FROM t1;
+DELETE FROM t2;
+END CASE;
+SET v_idx = v_idx + 1;
+/* Commit or rollback work at specified frequency. */
+IF v_idx % p_frequency = 0 THEN
+SET v_commit = FLOOR(RAND() * 2);
+IF v_commit = 0 AND p_is_rand = 1 THEN
+ROLLBACK;
+START TRANSACTION;
+ELSE
+COMMIT;
+START TRANSACTION;
+END IF;
+END IF;
+END WHILE;
+COMMIT;
+END|
+call execute_dml(0, 0, 100, 100, 10, 0);
+CREATE TABLE t SELECT * FROM t1;
+CREATE TABLE t0 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t01 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t3 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t11 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t21 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+INSERT INTO t11 SELECT * FROM t;
+INSERT INTO t21 SELECT * FROM t;
+SHOW VARIABLES LIKE 'clone_ddl_timeout';
+Variable_name	Value
+clone_ddl_timeout	300
+SHOW VARIABLES LIKE 'clone_block_ddl';
+Variable_name	Value
+clone_block_ddl	OFF
+# 1. ALTER TABLE ADD COLUMN while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,local_release_clone_file_pin';
+ALTER TABLE t0 ADD COLUMN col5 int, ALGORITHM=COPY ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+# Waiting for clone to reach 'Initial metadata transfer'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_init';
+# Wait finished
+ALTER TABLE t01 ADD COLUMN col5 int, ALGORITHM=COPY ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+ALTER TABLE t1 ADD COLUMN col5 int, ALGORITHM=COPY ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+# Waiting for clone to reach DDL metadata for 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_meta';
+# Wait finished
+ALTER TABLE t11 ADD COLUMN col5 int, ALGORITHM=COPY ;
+INSERT INTO t11 SELECT col1, col2, col3, col4, col2 + 100 FROM t ON DUPLICATE KEY UPDATE col2 = t11.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+ALTER TABLE t2 ADD COLUMN col5 int, ALGORITHM=COPY ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach DDL metadata for 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page_meta';
+# Wait finished
+ALTER TABLE t21 ADD COLUMN col5 int, ALGORITHM=COPY ;
+INSERT INTO t21 SELECT col1, col2, col3, col4, col2 + 100 FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_page_meta';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER TABLE t3 ADD COLUMN col5 int, ALGORITHM=COPY ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,local_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  `col5` int DEFAULT NULL,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	2	Clone Test Row - 0
+1	12	Clone Test Row - 1
+2	22	Clone Test Row - 2
+3	32	Clone Test Row - 3
+4	42	Clone Test Row - 4
+5	52	Clone Test Row - 5
+6	62	Clone Test Row - 6
+7	72	Clone Test Row - 7
+8	82	Clone Test Row - 8
+9	92	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	992	Clone Test Row - 99
+98	982	Clone Test Row - 98
+97	972	Clone Test Row - 97
+96	962	Clone Test Row - 96
+95	952	Clone Test Row - 95
+94	942	Clone Test Row - 94
+93	932	Clone Test Row - 93
+92	922	Clone Test Row - 92
+91	912	Clone Test Row - 91
+90	902	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  `col5` int DEFAULT NULL,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	11	Clone Test Row - 1
+2	21	Clone Test Row - 2
+3	31	Clone Test Row - 3
+4	41	Clone Test Row - 4
+5	51	Clone Test Row - 5
+6	61	Clone Test Row - 6
+7	71	Clone Test Row - 7
+8	81	Clone Test Row - 8
+9	91	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	991	Clone Test Row - 99
+98	981	Clone Test Row - 98
+97	971	Clone Test Row - 97
+96	961	Clone Test Row - 96
+95	951	Clone Test Row - 95
+94	941	Clone Test Row - 94
+93	931	Clone Test Row - 93
+92	921	Clone Test Row - 92
+91	911	Clone Test Row - 91
+90	901	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  `col5` int DEFAULT NULL,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	2	Clone Test Row - 0
+1	12	Clone Test Row - 1
+2	22	Clone Test Row - 2
+3	32	Clone Test Row - 3
+4	42	Clone Test Row - 4
+5	52	Clone Test Row - 5
+6	62	Clone Test Row - 6
+7	72	Clone Test Row - 7
+8	82	Clone Test Row - 8
+9	92	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	992	Clone Test Row - 99
+98	982	Clone Test Row - 98
+97	972	Clone Test Row - 97
+96	962	Clone Test Row - 96
+95	952	Clone Test Row - 95
+94	942	Clone Test Row - 94
+93	932	Clone Test Row - 93
+92	922	Clone Test Row - 92
+91	912	Clone Test Row - 91
+90	902	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# 2. ALTER TABLE DROP COLUMN while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,local_release_clone_file_pin';
+ALTER TABLE t0 DROP COLUMN col5, ALGORITHM=COPY ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+# Waiting for clone to reach 'Initial metadata transfer'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_init';
+# Wait finished
+ALTER TABLE t01 DROP COLUMN col5, ALGORITHM=COPY ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+ALTER TABLE t1 DROP COLUMN col5, ALGORITHM=COPY ;
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+# Waiting for clone to reach DDL metadata for 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_meta';
+# Wait finished
+ALTER TABLE t11 DROP COLUMN col5, ALGORITHM=COPY ;
+INSERT INTO t11 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t11.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+ALTER TABLE t2 DROP COLUMN col5, ALGORITHM=COPY ;
+call execute_dml(1, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach DDL metadata for 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page_meta';
+# Wait finished
+ALTER TABLE t21 DROP COLUMN col5, ALGORITHM=COPY ;
+INSERT INTO t21 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_page_meta';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER TABLE t3 DROP COLUMN col5, ALGORITHM=COPY ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,local_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	2	Clone Test Row - 1
+2	3	Clone Test Row - 2
+3	4	Clone Test Row - 3
+4	5	Clone Test Row - 4
+5	6	Clone Test Row - 5
+6	7	Clone Test Row - 6
+7	8	Clone Test Row - 7
+8	9	Clone Test Row - 8
+9	10	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	100	Clone Test Row - 99
+98	99	Clone Test Row - 98
+97	98	Clone Test Row - 97
+96	97	Clone Test Row - 96
+95	96	Clone Test Row - 95
+94	95	Clone Test Row - 94
+93	94	Clone Test Row - 93
+92	93	Clone Test Row - 92
+91	92	Clone Test Row - 91
+90	91	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	2	Clone Test Row - 0
+1	12	Clone Test Row - 1
+2	22	Clone Test Row - 2
+3	32	Clone Test Row - 3
+4	42	Clone Test Row - 4
+5	52	Clone Test Row - 5
+6	62	Clone Test Row - 6
+7	72	Clone Test Row - 7
+8	82	Clone Test Row - 8
+9	92	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	992	Clone Test Row - 99
+98	982	Clone Test Row - 98
+97	972	Clone Test Row - 97
+96	962	Clone Test Row - 96
+95	952	Clone Test Row - 95
+94	942	Clone Test Row - 94
+93	932	Clone Test Row - 93
+92	922	Clone Test Row - 92
+91	912	Clone Test Row - 91
+90	902	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	2	Clone Test Row - 1
+2	3	Clone Test Row - 2
+3	4	Clone Test Row - 3
+4	5	Clone Test Row - 4
+5	6	Clone Test Row - 5
+6	7	Clone Test Row - 6
+7	8	Clone Test Row - 7
+8	9	Clone Test Row - 8
+9	10	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	100	Clone Test Row - 99
+98	99	Clone Test Row - 98
+97	98	Clone Test Row - 97
+96	97	Clone Test Row - 96
+95	96	Clone Test Row - 95
+94	95	Clone Test Row - 94
+93	94	Clone Test Row - 93
+92	93	Clone Test Row - 92
+91	92	Clone Test Row - 91
+90	91	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# 3. ADD INDEX while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,local_release_clone_file_pin';
+ALTER TABLE t0 ADD INDEX col2_idx(col2), ALGORITHM=COPY ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+# Waiting for clone to reach 'Initial metadata transfer'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_init';
+# Wait finished
+ALTER TABLE t01 ADD INDEX col2_idx(col2), ALGORITHM=COPY ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+ALTER TABLE t1 ADD INDEX col2_idx(col2), ALGORITHM=COPY ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+# Waiting for clone to reach DDL metadata for 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_meta';
+# Wait finished
+ALTER TABLE t11 ADD INDEX col2_idx(col2), ALGORITHM=COPY ;
+INSERT INTO t11 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t11.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+ALTER TABLE t2 ADD INDEX col2_idx(col2), ALGORITHM=COPY ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach DDL metadata for 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page_meta';
+# Wait finished
+ALTER TABLE t21 ADD INDEX col2_idx(col2), ALGORITHM=COPY ;
+INSERT INTO t21 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_page_meta';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER TABLE t3 ADD INDEX col2_idx(col2), ALGORITHM=COPY ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,local_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`),
+  KEY `col2_idx` (`col2`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	3	Clone Test Row - 0
+1	4	Clone Test Row - 1
+2	5	Clone Test Row - 2
+3	6	Clone Test Row - 3
+4	7	Clone Test Row - 4
+5	8	Clone Test Row - 5
+6	9	Clone Test Row - 6
+7	10	Clone Test Row - 7
+8	11	Clone Test Row - 8
+9	12	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	102	Clone Test Row - 99
+98	101	Clone Test Row - 98
+97	100	Clone Test Row - 97
+96	99	Clone Test Row - 96
+95	98	Clone Test Row - 95
+94	97	Clone Test Row - 94
+93	96	Clone Test Row - 93
+92	95	Clone Test Row - 92
+91	94	Clone Test Row - 91
+90	93	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`),
+  KEY `col2_idx` (`col2`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	3	Clone Test Row - 0
+1	13	Clone Test Row - 1
+2	23	Clone Test Row - 2
+3	33	Clone Test Row - 3
+4	43	Clone Test Row - 4
+5	53	Clone Test Row - 5
+6	63	Clone Test Row - 6
+7	73	Clone Test Row - 7
+8	83	Clone Test Row - 8
+9	93	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	993	Clone Test Row - 99
+98	983	Clone Test Row - 98
+97	973	Clone Test Row - 97
+96	963	Clone Test Row - 96
+95	953	Clone Test Row - 95
+94	943	Clone Test Row - 94
+93	933	Clone Test Row - 93
+92	923	Clone Test Row - 92
+91	913	Clone Test Row - 91
+90	903	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`),
+  KEY `col2_idx` (`col2`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	3	Clone Test Row - 0
+1	4	Clone Test Row - 1
+2	5	Clone Test Row - 2
+3	6	Clone Test Row - 3
+4	7	Clone Test Row - 4
+5	8	Clone Test Row - 5
+6	9	Clone Test Row - 6
+7	10	Clone Test Row - 7
+8	11	Clone Test Row - 8
+9	12	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	102	Clone Test Row - 99
+98	101	Clone Test Row - 98
+97	100	Clone Test Row - 97
+96	99	Clone Test Row - 96
+95	98	Clone Test Row - 95
+94	97	Clone Test Row - 94
+93	96	Clone Test Row - 93
+92	95	Clone Test Row - 92
+91	94	Clone Test Row - 91
+90	93	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# 4. DROP INDEX while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,local_release_clone_file_pin';
+ALTER TABLE t0 DROP INDEX col2_idx, ALGORITHM=COPY ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+# Waiting for clone to reach 'Initial metadata transfer'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_init';
+# Wait finished
+ALTER TABLE t01 DROP INDEX col2_idx, ALGORITHM=COPY ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+ALTER TABLE t1 DROP INDEX col2_idx, ALGORITHM=COPY ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+# Waiting for clone to reach DDL metadata for 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_meta';
+# Wait finished
+ALTER TABLE t11 DROP INDEX col2_idx, ALGORITHM=COPY ;
+INSERT INTO t11 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t11.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+ALTER TABLE t2 DROP INDEX col2_idx, ALGORITHM=COPY ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach DDL metadata for 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page_meta';
+# Wait finished
+ALTER TABLE t21 DROP INDEX col2_idx, ALGORITHM=COPY ;
+INSERT INTO t21 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_page_meta';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER TABLE t3 DROP INDEX col2_idx, ALGORITHM=COPY ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,local_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	5	Clone Test Row - 0
+1	6	Clone Test Row - 1
+2	7	Clone Test Row - 2
+3	8	Clone Test Row - 3
+4	9	Clone Test Row - 4
+5	10	Clone Test Row - 5
+6	11	Clone Test Row - 6
+7	12	Clone Test Row - 7
+8	13	Clone Test Row - 8
+9	14	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	104	Clone Test Row - 99
+98	103	Clone Test Row - 98
+97	102	Clone Test Row - 97
+96	101	Clone Test Row - 96
+95	100	Clone Test Row - 95
+94	99	Clone Test Row - 94
+93	98	Clone Test Row - 93
+92	97	Clone Test Row - 92
+91	96	Clone Test Row - 91
+90	95	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	4	Clone Test Row - 0
+1	14	Clone Test Row - 1
+2	24	Clone Test Row - 2
+3	34	Clone Test Row - 3
+4	44	Clone Test Row - 4
+5	54	Clone Test Row - 5
+6	64	Clone Test Row - 6
+7	74	Clone Test Row - 7
+8	84	Clone Test Row - 8
+9	94	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	994	Clone Test Row - 99
+98	984	Clone Test Row - 98
+97	974	Clone Test Row - 97
+96	964	Clone Test Row - 96
+95	954	Clone Test Row - 95
+94	944	Clone Test Row - 94
+93	934	Clone Test Row - 93
+92	924	Clone Test Row - 92
+91	914	Clone Test Row - 91
+90	904	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	5	Clone Test Row - 0
+1	6	Clone Test Row - 1
+2	7	Clone Test Row - 2
+3	8	Clone Test Row - 3
+4	9	Clone Test Row - 4
+5	10	Clone Test Row - 5
+6	11	Clone Test Row - 6
+7	12	Clone Test Row - 7
+8	13	Clone Test Row - 8
+9	14	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	104	Clone Test Row - 99
+98	103	Clone Test Row - 98
+97	102	Clone Test Row - 97
+96	101	Clone Test Row - 96
+95	100	Clone Test Row - 95
+94	99	Clone Test Row - 94
+93	98	Clone Test Row - 93
+92	97	Clone Test Row - 92
+91	96	Clone Test Row - 91
+90	95	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# Cleanup
+DROP TABLE t;
+DROP TABLE t1;
+DROP TABLE t2;
+DROP PROCEDURE execute_dml;
+DROP TABLE t0;
+DROP TABLE t01;
+DROP TABLE t3;
+DROP TABLE t11;
+DROP TABLE t21;
+# Uninstall clone
+UNINSTALL PLUGIN clone;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/ddl_alter_inplace.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/ddl_alter_inplace.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/ddl_alter_inplace.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/ddl_alter_inplace.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,857 @@
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+PARTITION BY KEY(col1) PARTITIONS 5;
+CREATE PROCEDURE execute_dml(
+p_dml_type	INT,
+p_key_min	INT,
+p_key_range	INT,
+p_loop_count	INT,
+p_frequency	INT,
+p_is_rand	INT)
+BEGIN
+DECLARE v_idx		INT DEFAULT 0;
+DECLARE v_commit	INT DEFAULT 0;
+DECLARE v_key		INT DEFAULT 0;
+/* Loop and INSERT data at random position */
+WHILE(v_idx < p_loop_count) DO
+/* Generate key between 1 to p_loop_count */
+IF p_is_rand = 1 THEN
+SET v_key = p_key_min + FLOOR(RAND() * p_key_range);
+ELSE
+SET v_key = p_key_min + (v_idx  % p_key_range);
+END IF;
+CASE p_dml_type
+WHEN 0 THEN
+SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+WHEN 1 THEN
+UPDATE t1 SET col2 = v_idx + 1 WHERE col1 = v_key;
+UPDATE t2 SET col2 = v_idx + 1 WHERE col1 = v_key;
+WHEN 2 THEN
+DELETE FROM t1 WHERE col1 = v_key;
+DELETE FROM t2 WHERE col1 = v_key;
+ELSE
+DELETE FROM t1;
+DELETE FROM t2;
+END CASE;
+SET v_idx = v_idx + 1;
+/* Commit or rollback work at specified frequency. */
+IF v_idx % p_frequency = 0 THEN
+SET v_commit = FLOOR(RAND() * 2);
+IF v_commit = 0 AND p_is_rand = 1 THEN
+ROLLBACK;
+START TRANSACTION;
+ELSE
+COMMIT;
+START TRANSACTION;
+END IF;
+END IF;
+END WHILE;
+COMMIT;
+END|
+call execute_dml(0, 0, 100, 100, 10, 0);
+CREATE TABLE t SELECT * FROM t1;
+CREATE TABLE t0 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t01 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t3 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t11 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t21 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+INSERT INTO t11 SELECT * FROM t;
+INSERT INTO t21 SELECT * FROM t;
+SHOW VARIABLES LIKE 'clone_ddl_timeout';
+Variable_name	Value
+clone_ddl_timeout	300
+SHOW VARIABLES LIKE 'clone_block_ddl';
+Variable_name	Value
+clone_block_ddl	OFF
+# 1. ALTER TABLE ADD COLUMN while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,local_release_clone_file_pin';
+ALTER TABLE t0 ADD COLUMN col5 int, ALGORITHM=INPLACE ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+# Waiting for clone to reach 'Initial metadata transfer'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_init';
+# Wait finished
+ALTER TABLE t01 ADD COLUMN col5 int, ALGORITHM=INPLACE ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+ALTER TABLE t1 ADD COLUMN col5 int, ALGORITHM=INPLACE ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+# Waiting for clone to reach DDL metadata for 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_meta';
+# Wait finished
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_page';
+ALTER TABLE t2 ADD COLUMN col5 int, ALGORITHM=INPLACE ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach DDL metadata for 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page_meta';
+# Wait finished
+ALTER TABLE t21 ADD COLUMN col5 int, ALGORITHM=INPLACE ;
+INSERT INTO t21 SELECT col1, col2, col3, col4, col2 + 100 FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_page_meta';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER TABLE t3 ADD COLUMN col5 int, ALGORITHM=INPLACE ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,local_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  `col5` int DEFAULT NULL,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	11	Clone Test Row - 1
+2	21	Clone Test Row - 2
+3	31	Clone Test Row - 3
+4	41	Clone Test Row - 4
+5	51	Clone Test Row - 5
+6	61	Clone Test Row - 6
+7	71	Clone Test Row - 7
+8	81	Clone Test Row - 8
+9	91	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	991	Clone Test Row - 99
+98	981	Clone Test Row - 98
+97	971	Clone Test Row - 97
+96	961	Clone Test Row - 96
+95	951	Clone Test Row - 95
+94	941	Clone Test Row - 94
+93	931	Clone Test Row - 93
+92	921	Clone Test Row - 92
+91	911	Clone Test Row - 91
+90	901	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	11	Clone Test Row - 1
+2	21	Clone Test Row - 2
+3	31	Clone Test Row - 3
+4	41	Clone Test Row - 4
+5	51	Clone Test Row - 5
+6	61	Clone Test Row - 6
+7	71	Clone Test Row - 7
+8	81	Clone Test Row - 8
+9	91	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	991	Clone Test Row - 99
+98	981	Clone Test Row - 98
+97	971	Clone Test Row - 97
+96	961	Clone Test Row - 96
+95	951	Clone Test Row - 95
+94	941	Clone Test Row - 94
+93	931	Clone Test Row - 93
+92	921	Clone Test Row - 92
+91	911	Clone Test Row - 91
+90	901	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# 2. ALTER TABLE DROP COLUMN while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,local_release_clone_file_pin';
+ALTER TABLE t0 DROP COLUMN col5, ALGORITHM=INPLACE ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+# Waiting for clone to reach 'Initial metadata transfer'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_init';
+# Wait finished
+ALTER TABLE t01 DROP COLUMN col5, ALGORITHM=INPLACE ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+ALTER TABLE t1 DROP COLUMN col5, ALGORITHM=INPLACE ;
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+# Waiting for clone to reach DDL metadata for 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_meta';
+# Wait finished
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_page';
+ALTER TABLE t2 DROP COLUMN col5, ALGORITHM=INPLACE ;
+call execute_dml(1, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach DDL metadata for 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page_meta';
+# Wait finished
+ALTER TABLE t21 DROP COLUMN col5, ALGORITHM=INPLACE ;
+INSERT INTO t21 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_page_meta';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER TABLE t3 DROP COLUMN col5, ALGORITHM=INPLACE ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,local_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	2	Clone Test Row - 1
+2	3	Clone Test Row - 2
+3	4	Clone Test Row - 3
+4	5	Clone Test Row - 4
+5	6	Clone Test Row - 5
+6	7	Clone Test Row - 6
+7	8	Clone Test Row - 7
+8	9	Clone Test Row - 8
+9	10	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	100	Clone Test Row - 99
+98	99	Clone Test Row - 98
+97	98	Clone Test Row - 97
+96	97	Clone Test Row - 96
+95	96	Clone Test Row - 95
+94	95	Clone Test Row - 94
+93	94	Clone Test Row - 93
+92	93	Clone Test Row - 92
+91	92	Clone Test Row - 91
+90	91	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  `col5` int DEFAULT NULL,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	2	Clone Test Row - 1
+2	3	Clone Test Row - 2
+3	4	Clone Test Row - 3
+4	5	Clone Test Row - 4
+5	6	Clone Test Row - 5
+6	7	Clone Test Row - 6
+7	8	Clone Test Row - 7
+8	9	Clone Test Row - 8
+9	10	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	100	Clone Test Row - 99
+98	99	Clone Test Row - 98
+97	98	Clone Test Row - 97
+96	97	Clone Test Row - 96
+95	96	Clone Test Row - 95
+94	95	Clone Test Row - 94
+93	94	Clone Test Row - 93
+92	93	Clone Test Row - 92
+91	92	Clone Test Row - 91
+90	91	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# 3. ADD INDEX while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,local_release_clone_file_pin';
+ALTER TABLE t0 ADD INDEX col2_idx(col2), ALGORITHM=INPLACE ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+# Waiting for clone to reach 'Initial metadata transfer'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_init';
+# Wait finished
+ALTER TABLE t01 ADD INDEX col2_idx(col2), ALGORITHM=INPLACE ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+ALTER TABLE t1 ADD INDEX col2_idx(col2), ALGORITHM=INPLACE ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+# Waiting for clone to reach DDL metadata for 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_meta';
+# Wait finished
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_page';
+ALTER TABLE t2 ADD INDEX col2_idx(col2), ALGORITHM=INPLACE ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach DDL metadata for 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page_meta';
+# Wait finished
+ALTER TABLE t21 ADD INDEX col2_idx(col2), ALGORITHM=INPLACE ;
+INSERT INTO t21 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_page_meta';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER TABLE t3 ADD INDEX col2_idx(col2), ALGORITHM=INPLACE ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,local_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`),
+  KEY `col2_idx` (`col2`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	2	Clone Test Row - 0
+1	3	Clone Test Row - 1
+2	4	Clone Test Row - 2
+3	5	Clone Test Row - 3
+4	6	Clone Test Row - 4
+5	7	Clone Test Row - 5
+6	8	Clone Test Row - 6
+7	9	Clone Test Row - 7
+8	10	Clone Test Row - 8
+9	11	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	101	Clone Test Row - 99
+98	100	Clone Test Row - 98
+97	99	Clone Test Row - 97
+96	98	Clone Test Row - 96
+95	97	Clone Test Row - 95
+94	96	Clone Test Row - 94
+93	95	Clone Test Row - 93
+92	94	Clone Test Row - 92
+91	93	Clone Test Row - 91
+90	92	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	2	Clone Test Row - 0
+1	3	Clone Test Row - 1
+2	4	Clone Test Row - 2
+3	5	Clone Test Row - 3
+4	6	Clone Test Row - 4
+5	7	Clone Test Row - 5
+6	8	Clone Test Row - 6
+7	9	Clone Test Row - 7
+8	10	Clone Test Row - 8
+9	11	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	101	Clone Test Row - 99
+98	100	Clone Test Row - 98
+97	99	Clone Test Row - 97
+96	98	Clone Test Row - 96
+95	97	Clone Test Row - 95
+94	96	Clone Test Row - 94
+93	95	Clone Test Row - 93
+92	94	Clone Test Row - 92
+91	93	Clone Test Row - 91
+90	92	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# 4. DROP INDEX while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,local_release_clone_file_pin';
+ALTER TABLE t0 DROP INDEX col2_idx, ALGORITHM=INPLACE ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+# Waiting for clone to reach 'Initial metadata transfer'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_init';
+# Wait finished
+ALTER TABLE t01 DROP INDEX col2_idx, ALGORITHM=INPLACE ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+ALTER TABLE t1 DROP INDEX col2_idx, ALGORITHM=INPLACE ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+# Waiting for clone to reach DDL metadata for 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_meta';
+# Wait finished
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_page';
+ALTER TABLE t2 DROP INDEX col2_idx, ALGORITHM=INPLACE ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach DDL metadata for 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page_meta';
+# Wait finished
+ALTER TABLE t21 DROP INDEX col2_idx, ALGORITHM=INPLACE ;
+INSERT INTO t21 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_page_meta';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER TABLE t3 DROP INDEX col2_idx, ALGORITHM=INPLACE ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,local_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	5	Clone Test Row - 0
+1	6	Clone Test Row - 1
+2	7	Clone Test Row - 2
+3	8	Clone Test Row - 3
+4	9	Clone Test Row - 4
+5	10	Clone Test Row - 5
+6	11	Clone Test Row - 6
+7	12	Clone Test Row - 7
+8	13	Clone Test Row - 8
+9	14	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	104	Clone Test Row - 99
+98	103	Clone Test Row - 98
+97	102	Clone Test Row - 97
+96	101	Clone Test Row - 96
+95	100	Clone Test Row - 95
+94	99	Clone Test Row - 94
+93	98	Clone Test Row - 93
+92	97	Clone Test Row - 92
+91	96	Clone Test Row - 91
+90	95	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	5	Clone Test Row - 0
+1	6	Clone Test Row - 1
+2	7	Clone Test Row - 2
+3	8	Clone Test Row - 3
+4	9	Clone Test Row - 4
+5	10	Clone Test Row - 5
+6	11	Clone Test Row - 6
+7	12	Clone Test Row - 7
+8	13	Clone Test Row - 8
+9	14	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	104	Clone Test Row - 99
+98	103	Clone Test Row - 98
+97	102	Clone Test Row - 97
+96	101	Clone Test Row - 96
+95	100	Clone Test Row - 95
+94	99	Clone Test Row - 94
+93	98	Clone Test Row - 93
+92	97	Clone Test Row - 92
+91	96	Clone Test Row - 91
+90	95	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# Cleanup
+DROP TABLE t;
+DROP TABLE t1;
+DROP TABLE t2;
+DROP PROCEDURE execute_dml;
+DROP TABLE t0;
+DROP TABLE t01;
+DROP TABLE t3;
+DROP TABLE t11;
+DROP TABLE t21;
+# Uninstall clone
+UNINSTALL PLUGIN clone;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/ddl_basic.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/ddl_basic.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/ddl_basic.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/ddl_basic.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,359 @@
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+PARTITION BY KEY(col1) PARTITIONS 5;
+CREATE PROCEDURE execute_dml(
+p_dml_type	INT,
+p_key_min	INT,
+p_key_range	INT,
+p_loop_count	INT,
+p_frequency	INT,
+p_is_rand	INT)
+BEGIN
+DECLARE v_idx		INT DEFAULT 0;
+DECLARE v_commit	INT DEFAULT 0;
+DECLARE v_key		INT DEFAULT 0;
+/* Loop and INSERT data at random position */
+WHILE(v_idx < p_loop_count) DO
+/* Generate key between 1 to p_loop_count */
+IF p_is_rand = 1 THEN
+SET v_key = p_key_min + FLOOR(RAND() * p_key_range);
+ELSE
+SET v_key = p_key_min + (v_idx  % p_key_range);
+END IF;
+CASE p_dml_type
+WHEN 0 THEN
+SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+WHEN 1 THEN
+UPDATE t1 SET col2 = v_idx + 1 WHERE col1 = v_key;
+UPDATE t2 SET col2 = v_idx + 1 WHERE col1 = v_key;
+WHEN 2 THEN
+DELETE FROM t1 WHERE col1 = v_key;
+DELETE FROM t2 WHERE col1 = v_key;
+ELSE
+DELETE FROM t1;
+DELETE FROM t2;
+END CASE;
+SET v_idx = v_idx + 1;
+/* Commit or rollback work at specified frequency. */
+IF v_idx % p_frequency = 0 THEN
+SET v_commit = FLOOR(RAND() * 2);
+IF v_commit = 0 AND p_is_rand = 1 THEN
+ROLLBACK;
+START TRANSACTION;
+ELSE
+COMMIT;
+START TRANSACTION;
+END IF;
+END IF;
+END WHILE;
+COMMIT;
+END|
+call execute_dml(0, 0, 100, 100, 10, 0);
+CREATE TABLE t SELECT * FROM t1;
+DROP table t1;
+DROP table t2;
+SHOW VARIABLES LIKE 'clone_ddl_timeout';
+Variable_name	Value
+clone_ddl_timeout	300
+SHOW VARIABLES LIKE 'clone_block_ddl';
+Variable_name	Value
+clone_block_ddl	OFF
+# 1. CREATE TABLE while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,local_release_clone_file_pin';
+CREATE TABLE t0 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) PARTITION BY KEY(col1) PARTITIONS 5;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+# Waiting for clone to reach 'Initial metadata transfer'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_init';
+# Wait finished
+CREATE TABLE t01 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) PARTITION BY KEY(col1) PARTITIONS 5;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+CREATE TABLE t1 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) PARTITION BY KEY(col1) PARTITIONS 5;
+INSERT INTO t1 SELECT * FROM t;
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+# Waiting for clone to reach DDL metadata for 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_meta';
+# Wait finished
+CREATE TABLE t11 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) PARTITION BY KEY(col1) PARTITIONS 5;
+INSERT INTO t11 SELECT * FROM t;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+CREATE TABLE t2 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) PARTITION BY KEY(col1) PARTITIONS 5;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach DDL metadata for 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page_meta';
+# Wait finished
+CREATE TABLE t21 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) PARTITION BY KEY(col1) PARTITIONS 5;
+INSERT INTO t21 SELECT * FROM t;
+SET DEBUG_SYNC = 'now SIGNAL resume_page_meta';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+CREATE TABLE t3 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) PARTITION BY KEY(col1) PARTITIONS 5;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,local_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	11	Clone Test Row - 1
+2	21	Clone Test Row - 2
+3	31	Clone Test Row - 3
+4	41	Clone Test Row - 4
+5	51	Clone Test Row - 5
+6	61	Clone Test Row - 6
+7	71	Clone Test Row - 7
+8	81	Clone Test Row - 8
+9	91	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	991	Clone Test Row - 99
+98	981	Clone Test Row - 98
+97	971	Clone Test Row - 97
+96	961	Clone Test Row - 96
+95	951	Clone Test Row - 95
+94	941	Clone Test Row - 94
+93	931	Clone Test Row - 93
+92	921	Clone Test Row - 92
+91	911	Clone Test Row - 91
+90	901	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+CALL execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# 2. DROP TABLE while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,local_release_clone_file_pin';
+DROP TABLE t0  ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+# Waiting for clone to reach 'Initial metadata transfer'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_init';
+# Wait finished
+DROP TABLE t01  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+DROP TABLE t1  ;
+SHOW TABLES;
+Tables_in_test
+t
+t11
+t2
+t21
+t3
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+# Waiting for clone to reach DDL metadata for 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_meta';
+# Wait finished
+DROP TABLE t11  ;
+SHOW TABLES;
+Tables_in_test
+t
+t2
+t21
+t3
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+DROP TABLE t2  ;
+SHOW TABLES;
+Tables_in_test
+t
+t21
+t3
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach DDL metadata for 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page_meta';
+# Wait finished
+DROP TABLE t21  ;
+SHOW TABLES;
+Tables_in_test
+t
+t3
+SET DEBUG_SYNC = 'now SIGNAL resume_page_meta';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+DROP TABLE t3  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,local_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t21
+t3
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# Cleanup
+DROP TABLE t;
+CREATE TABLE t1 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+DROP TABLE t1;
+DROP TABLE t2;
+DROP PROCEDURE execute_dml;
+# Uninstall clone
+UNINSTALL PLUGIN clone;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/ddl_compress_encrypt.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/ddl_compress_encrypt.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/ddl_compress_encrypt.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/ddl_compress_encrypt.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,745 @@
+# Prepare for creating Encrypted Table
+# create bootstrap file
+# Create and start mysqld with keyring plugin.
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+PARTITION BY KEY(col1) PARTITIONS 5;
+CREATE PROCEDURE execute_dml(
+p_dml_type	INT,
+p_key_min	INT,
+p_key_range	INT,
+p_loop_count	INT,
+p_frequency	INT,
+p_is_rand	INT)
+BEGIN
+DECLARE v_idx		INT DEFAULT 0;
+DECLARE v_commit	INT DEFAULT 0;
+DECLARE v_key		INT DEFAULT 0;
+/* Loop and INSERT data at random position */
+WHILE(v_idx < p_loop_count) DO
+/* Generate key between 1 to p_loop_count */
+IF p_is_rand = 1 THEN
+SET v_key = p_key_min + FLOOR(RAND() * p_key_range);
+ELSE
+SET v_key = p_key_min + (v_idx  % p_key_range);
+END IF;
+CASE p_dml_type
+WHEN 0 THEN
+SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+WHEN 1 THEN
+UPDATE t1 SET col2 = v_idx + 1 WHERE col1 = v_key;
+UPDATE t2 SET col2 = v_idx + 1 WHERE col1 = v_key;
+WHEN 2 THEN
+DELETE FROM t1 WHERE col1 = v_key;
+DELETE FROM t2 WHERE col1 = v_key;
+ELSE
+DELETE FROM t1;
+DELETE FROM t2;
+END CASE;
+SET v_idx = v_idx + 1;
+/* Commit or rollback work at specified frequency. */
+IF v_idx % p_frequency = 0 THEN
+SET v_commit = FLOOR(RAND() * 2);
+IF v_commit = 0 AND p_is_rand = 1 THEN
+ROLLBACK;
+START TRANSACTION;
+ELSE
+COMMIT;
+START TRANSACTION;
+END IF;
+END IF;
+END WHILE;
+COMMIT;
+END|
+call execute_dml(0, 0, 100, 100, 10, 0);
+CREATE TABLE t SELECT * FROM t1;
+DROP table t1;
+DROP table t2;
+SHOW VARIABLES LIKE 'clone_ddl_timeout';
+Variable_name	Value
+clone_ddl_timeout	300
+SHOW VARIABLES LIKE 'clone_block_ddl';
+Variable_name	Value
+clone_block_ddl	OFF
+# 1. CREATE TABLE with encryption while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,local_release_clone_file_pin';
+SET GLOBAL DEBUG = '+d,log_redo_with_invalid_master_key';
+CREATE TABLE t0 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ENCRYPTION = "Y" COMPRESSION = "LZ4";
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+# Waiting for clone to reach 'Initial metadata transfer'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_init';
+# Wait finished
+CREATE TABLE t01 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ENCRYPTION = "Y" COMPRESSION = "LZ4";
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+CREATE TABLE t1 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ENCRYPTION = "Y" COMPRESSION = "LZ4";
+INSERT INTO t1 SELECT * FROM t;
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+# Waiting for clone to reach DDL metadata for 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_meta';
+# Wait finished
+CREATE TABLE t11 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ENCRYPTION = "Y" COMPRESSION = "LZ4";
+INSERT INTO t11 SELECT * FROM t;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+CREATE TABLE t2 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ENCRYPTION = "Y" COMPRESSION = "LZ4";
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach DDL metadata for 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page_meta';
+# Wait finished
+CREATE TABLE t21 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ENCRYPTION = "Y" COMPRESSION = "LZ4";
+INSERT INTO t21 SELECT * FROM t;
+SET DEBUG_SYNC = 'now SIGNAL resume_page_meta';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+CREATE TABLE t3 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ENCRYPTION = "Y" COMPRESSION = "LZ4";
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,local_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='LZ4' ENCRYPTION='Y'
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	11	Clone Test Row - 1
+2	21	Clone Test Row - 2
+3	31	Clone Test Row - 3
+4	41	Clone Test Row - 4
+5	51	Clone Test Row - 5
+6	61	Clone Test Row - 6
+7	71	Clone Test Row - 7
+8	81	Clone Test Row - 8
+9	91	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	991	Clone Test Row - 99
+98	981	Clone Test Row - 98
+97	971	Clone Test Row - 97
+96	961	Clone Test Row - 96
+95	951	Clone Test Row - 95
+94	941	Clone Test Row - 94
+93	931	Clone Test Row - 93
+92	921	Clone Test Row - 92
+91	911	Clone Test Row - 91
+90	901	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='LZ4' ENCRYPTION='Y'
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='LZ4' ENCRYPTION='Y'
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+SET DEBUG_SYNC = 'RESET';
+# 2. ALTER TABLE remove encryption while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,local_release_clone_file_pin';
+SET GLOBAL DEBUG = '+d,log_redo_with_invalid_master_key';
+ALTER TABLE t0 ENCRYPTION = "N" COMPRESSION = "None" ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+# Waiting for clone to reach 'Initial metadata transfer'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_init';
+# Wait finished
+ALTER TABLE t01 ENCRYPTION = "N" COMPRESSION = "None" ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+ALTER TABLE t1 ENCRYPTION = "N" COMPRESSION = "None" ;
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+# Waiting for clone to reach DDL metadata for 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_meta';
+# Wait finished
+ALTER TABLE t11 ENCRYPTION = "N" COMPRESSION = "None" ;
+INSERT INTO t11 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t11.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+ALTER TABLE t2 ENCRYPTION = "N" COMPRESSION = "None" ;
+call execute_dml(1, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach DDL metadata for 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page_meta';
+# Wait finished
+ALTER TABLE t21 ENCRYPTION = "N" COMPRESSION = "None" ;
+INSERT INTO t21 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_page_meta';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER TABLE t3 ENCRYPTION = "N" COMPRESSION = "None" ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,local_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='None'
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	2	Clone Test Row - 1
+2	3	Clone Test Row - 2
+3	4	Clone Test Row - 3
+4	5	Clone Test Row - 4
+5	6	Clone Test Row - 5
+6	7	Clone Test Row - 6
+7	8	Clone Test Row - 7
+8	9	Clone Test Row - 8
+9	10	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	100	Clone Test Row - 99
+98	99	Clone Test Row - 98
+97	98	Clone Test Row - 97
+96	97	Clone Test Row - 96
+95	96	Clone Test Row - 95
+94	95	Clone Test Row - 94
+93	94	Clone Test Row - 93
+92	93	Clone Test Row - 92
+91	92	Clone Test Row - 91
+90	91	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='None'
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	11	Clone Test Row - 1
+2	21	Clone Test Row - 2
+3	31	Clone Test Row - 3
+4	41	Clone Test Row - 4
+5	51	Clone Test Row - 5
+6	61	Clone Test Row - 6
+7	71	Clone Test Row - 7
+8	81	Clone Test Row - 8
+9	91	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	991	Clone Test Row - 99
+98	981	Clone Test Row - 98
+97	971	Clone Test Row - 97
+96	961	Clone Test Row - 96
+95	951	Clone Test Row - 95
+94	941	Clone Test Row - 94
+93	931	Clone Test Row - 93
+92	921	Clone Test Row - 92
+91	911	Clone Test Row - 91
+90	901	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='None'
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	2	Clone Test Row - 1
+2	3	Clone Test Row - 2
+3	4	Clone Test Row - 3
+4	5	Clone Test Row - 4
+5	6	Clone Test Row - 5
+6	7	Clone Test Row - 6
+7	8	Clone Test Row - 7
+8	9	Clone Test Row - 8
+9	10	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	100	Clone Test Row - 99
+98	99	Clone Test Row - 98
+97	98	Clone Test Row - 97
+96	97	Clone Test Row - 96
+95	96	Clone Test Row - 95
+94	95	Clone Test Row - 94
+93	94	Clone Test Row - 93
+92	93	Clone Test Row - 92
+91	92	Clone Test Row - 91
+90	91	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+SET DEBUG_SYNC = 'RESET';
+# 3. ALTER TABLE add encryption while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,local_release_clone_file_pin';
+SET GLOBAL DEBUG = '+d,log_redo_with_invalid_master_key';
+ALTER TABLE t0 ENCRYPTION = "Y" COMPRESSION = "LZ4" ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+# Waiting for clone to reach 'Initial metadata transfer'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_init';
+# Wait finished
+ALTER TABLE t01 ENCRYPTION = "Y" COMPRESSION = "LZ4" ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+ALTER TABLE t1 ENCRYPTION = "Y" COMPRESSION = "LZ4" ;
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+# Waiting for clone to reach DDL metadata for 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_meta';
+# Wait finished
+ALTER TABLE t11 ENCRYPTION = "Y" COMPRESSION = "LZ4" ;
+INSERT INTO t11 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t11.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+ALTER TABLE t2 ENCRYPTION = "Y" COMPRESSION = "LZ4" ;
+call execute_dml(1, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach DDL metadata for 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page_meta';
+# Wait finished
+ALTER TABLE t21 ENCRYPTION = "Y" COMPRESSION = "LZ4" ;
+INSERT INTO t21 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_page_meta';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER TABLE t3 ENCRYPTION = "Y" COMPRESSION = "LZ4" ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,local_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='LZ4' ENCRYPTION='Y'
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	2	Clone Test Row - 1
+2	3	Clone Test Row - 2
+3	4	Clone Test Row - 3
+4	5	Clone Test Row - 4
+5	6	Clone Test Row - 5
+6	7	Clone Test Row - 6
+7	8	Clone Test Row - 7
+8	9	Clone Test Row - 8
+9	10	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	100	Clone Test Row - 99
+98	99	Clone Test Row - 98
+97	98	Clone Test Row - 97
+96	97	Clone Test Row - 96
+95	96	Clone Test Row - 95
+94	95	Clone Test Row - 94
+93	94	Clone Test Row - 93
+92	93	Clone Test Row - 92
+91	92	Clone Test Row - 91
+90	91	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='LZ4' ENCRYPTION='Y'
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	2	Clone Test Row - 0
+1	12	Clone Test Row - 1
+2	22	Clone Test Row - 2
+3	32	Clone Test Row - 3
+4	42	Clone Test Row - 4
+5	52	Clone Test Row - 5
+6	62	Clone Test Row - 6
+7	72	Clone Test Row - 7
+8	82	Clone Test Row - 8
+9	92	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	992	Clone Test Row - 99
+98	982	Clone Test Row - 98
+97	972	Clone Test Row - 97
+96	962	Clone Test Row - 96
+95	952	Clone Test Row - 95
+94	942	Clone Test Row - 94
+93	932	Clone Test Row - 93
+92	922	Clone Test Row - 92
+91	912	Clone Test Row - 91
+90	902	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='LZ4' ENCRYPTION='Y'
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	2	Clone Test Row - 1
+2	3	Clone Test Row - 2
+3	4	Clone Test Row - 3
+4	5	Clone Test Row - 4
+5	6	Clone Test Row - 5
+6	7	Clone Test Row - 6
+7	8	Clone Test Row - 7
+8	9	Clone Test Row - 8
+9	10	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	100	Clone Test Row - 99
+98	99	Clone Test Row - 98
+97	98	Clone Test Row - 97
+96	97	Clone Test Row - 96
+95	96	Clone Test Row - 95
+94	95	Clone Test Row - 94
+93	94	Clone Test Row - 93
+92	93	Clone Test Row - 92
+91	92	Clone Test Row - 91
+90	91	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+SET DEBUG_SYNC = 'RESET';
+# 2. DROP TABLE while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,local_release_clone_file_pin';
+SET GLOBAL DEBUG = '+d,log_redo_with_invalid_master_key';
+DROP TABLE t0  ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+# Waiting for clone to reach 'Initial metadata transfer'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_init';
+# Wait finished
+DROP TABLE t01  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+DROP TABLE t1  ;
+SHOW TABLES;
+Tables_in_test
+t
+t11
+t2
+t21
+t3
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+# Waiting for clone to reach DDL metadata for 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_meta';
+# Wait finished
+DROP TABLE t11  ;
+SHOW TABLES;
+Tables_in_test
+t
+t2
+t21
+t3
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+DROP TABLE t2  ;
+SHOW TABLES;
+Tables_in_test
+t
+t21
+t3
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach DDL metadata for 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page_meta';
+# Wait finished
+DROP TABLE t21  ;
+SHOW TABLES;
+Tables_in_test
+t
+t3
+SET DEBUG_SYNC = 'now SIGNAL resume_page_meta';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+DROP TABLE t3  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,local_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t21
+t3
+# Restart server back on base data directory
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+SET DEBUG_SYNC = 'RESET';
+# Cleanup
+DROP TABLE t;
+CREATE TABLE t1 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+DROP TABLE t1;
+DROP TABLE t2;
+DROP PROCEDURE execute_dml;
+# Uninstall clone
+UNINSTALL PLUGIN clone;
+# Restart server and remove encrypted data directory
+# restart:
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/ddl_compress.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/ddl_compress.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/ddl_compress.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/ddl_compress.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,745 @@
+# Prepare for creating Encrypted Table
+# create bootstrap file
+# Create and start mysqld with keyring plugin.
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+PARTITION BY KEY(col1) PARTITIONS 5;
+CREATE PROCEDURE execute_dml(
+p_dml_type	INT,
+p_key_min	INT,
+p_key_range	INT,
+p_loop_count	INT,
+p_frequency	INT,
+p_is_rand	INT)
+BEGIN
+DECLARE v_idx		INT DEFAULT 0;
+DECLARE v_commit	INT DEFAULT 0;
+DECLARE v_key		INT DEFAULT 0;
+/* Loop and INSERT data at random position */
+WHILE(v_idx < p_loop_count) DO
+/* Generate key between 1 to p_loop_count */
+IF p_is_rand = 1 THEN
+SET v_key = p_key_min + FLOOR(RAND() * p_key_range);
+ELSE
+SET v_key = p_key_min + (v_idx  % p_key_range);
+END IF;
+CASE p_dml_type
+WHEN 0 THEN
+SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+WHEN 1 THEN
+UPDATE t1 SET col2 = v_idx + 1 WHERE col1 = v_key;
+UPDATE t2 SET col2 = v_idx + 1 WHERE col1 = v_key;
+WHEN 2 THEN
+DELETE FROM t1 WHERE col1 = v_key;
+DELETE FROM t2 WHERE col1 = v_key;
+ELSE
+DELETE FROM t1;
+DELETE FROM t2;
+END CASE;
+SET v_idx = v_idx + 1;
+/* Commit or rollback work at specified frequency. */
+IF v_idx % p_frequency = 0 THEN
+SET v_commit = FLOOR(RAND() * 2);
+IF v_commit = 0 AND p_is_rand = 1 THEN
+ROLLBACK;
+START TRANSACTION;
+ELSE
+COMMIT;
+START TRANSACTION;
+END IF;
+END IF;
+END WHILE;
+COMMIT;
+END|
+call execute_dml(0, 0, 100, 100, 10, 0);
+CREATE TABLE t SELECT * FROM t1;
+DROP table t1;
+DROP table t2;
+SHOW VARIABLES LIKE 'clone_ddl_timeout';
+Variable_name	Value
+clone_ddl_timeout	300
+SHOW VARIABLES LIKE 'clone_block_ddl';
+Variable_name	Value
+clone_block_ddl	OFF
+# 1. CREATE TABLE with encryption while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,local_release_clone_file_pin';
+SET GLOBAL DEBUG = '+d,log_redo_with_invalid_master_key';
+CREATE TABLE t0 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)  COMPRESSION = "LZ4";
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+# Waiting for clone to reach 'Initial metadata transfer'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_init';
+# Wait finished
+CREATE TABLE t01 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)  COMPRESSION = "LZ4";
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+CREATE TABLE t1 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)  COMPRESSION = "LZ4";
+INSERT INTO t1 SELECT * FROM t;
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+# Waiting for clone to reach DDL metadata for 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_meta';
+# Wait finished
+CREATE TABLE t11 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)  COMPRESSION = "LZ4";
+INSERT INTO t11 SELECT * FROM t;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+CREATE TABLE t2 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)  COMPRESSION = "LZ4";
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach DDL metadata for 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page_meta';
+# Wait finished
+CREATE TABLE t21 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)  COMPRESSION = "LZ4";
+INSERT INTO t21 SELECT * FROM t;
+SET DEBUG_SYNC = 'now SIGNAL resume_page_meta';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+CREATE TABLE t3 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)  COMPRESSION = "LZ4";
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,local_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='LZ4'
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	11	Clone Test Row - 1
+2	21	Clone Test Row - 2
+3	31	Clone Test Row - 3
+4	41	Clone Test Row - 4
+5	51	Clone Test Row - 5
+6	61	Clone Test Row - 6
+7	71	Clone Test Row - 7
+8	81	Clone Test Row - 8
+9	91	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	991	Clone Test Row - 99
+98	981	Clone Test Row - 98
+97	971	Clone Test Row - 97
+96	961	Clone Test Row - 96
+95	951	Clone Test Row - 95
+94	941	Clone Test Row - 94
+93	931	Clone Test Row - 93
+92	921	Clone Test Row - 92
+91	911	Clone Test Row - 91
+90	901	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='LZ4'
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='LZ4'
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+SET DEBUG_SYNC = 'RESET';
+# 2. ALTER TABLE remove encryption while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,local_release_clone_file_pin';
+SET GLOBAL DEBUG = '+d,log_redo_with_invalid_master_key';
+ALTER TABLE t0  COMPRESSION = "None" ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+# Waiting for clone to reach 'Initial metadata transfer'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_init';
+# Wait finished
+ALTER TABLE t01  COMPRESSION = "None" ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+ALTER TABLE t1  COMPRESSION = "None" ;
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+# Waiting for clone to reach DDL metadata for 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_meta';
+# Wait finished
+ALTER TABLE t11  COMPRESSION = "None" ;
+INSERT INTO t11 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t11.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+ALTER TABLE t2  COMPRESSION = "None" ;
+call execute_dml(1, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach DDL metadata for 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page_meta';
+# Wait finished
+ALTER TABLE t21  COMPRESSION = "None" ;
+INSERT INTO t21 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_page_meta';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER TABLE t3  COMPRESSION = "None" ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,local_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='None'
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	2	Clone Test Row - 1
+2	3	Clone Test Row - 2
+3	4	Clone Test Row - 3
+4	5	Clone Test Row - 4
+5	6	Clone Test Row - 5
+6	7	Clone Test Row - 6
+7	8	Clone Test Row - 7
+8	9	Clone Test Row - 8
+9	10	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	100	Clone Test Row - 99
+98	99	Clone Test Row - 98
+97	98	Clone Test Row - 97
+96	97	Clone Test Row - 96
+95	96	Clone Test Row - 95
+94	95	Clone Test Row - 94
+93	94	Clone Test Row - 93
+92	93	Clone Test Row - 92
+91	92	Clone Test Row - 91
+90	91	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='None'
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	11	Clone Test Row - 1
+2	21	Clone Test Row - 2
+3	31	Clone Test Row - 3
+4	41	Clone Test Row - 4
+5	51	Clone Test Row - 5
+6	61	Clone Test Row - 6
+7	71	Clone Test Row - 7
+8	81	Clone Test Row - 8
+9	91	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	991	Clone Test Row - 99
+98	981	Clone Test Row - 98
+97	971	Clone Test Row - 97
+96	961	Clone Test Row - 96
+95	951	Clone Test Row - 95
+94	941	Clone Test Row - 94
+93	931	Clone Test Row - 93
+92	921	Clone Test Row - 92
+91	911	Clone Test Row - 91
+90	901	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='None'
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	2	Clone Test Row - 1
+2	3	Clone Test Row - 2
+3	4	Clone Test Row - 3
+4	5	Clone Test Row - 4
+5	6	Clone Test Row - 5
+6	7	Clone Test Row - 6
+7	8	Clone Test Row - 7
+8	9	Clone Test Row - 8
+9	10	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	100	Clone Test Row - 99
+98	99	Clone Test Row - 98
+97	98	Clone Test Row - 97
+96	97	Clone Test Row - 96
+95	96	Clone Test Row - 95
+94	95	Clone Test Row - 94
+93	94	Clone Test Row - 93
+92	93	Clone Test Row - 92
+91	92	Clone Test Row - 91
+90	91	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+SET DEBUG_SYNC = 'RESET';
+# 3. ALTER TABLE add encryption while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,local_release_clone_file_pin';
+SET GLOBAL DEBUG = '+d,log_redo_with_invalid_master_key';
+ALTER TABLE t0  COMPRESSION = "LZ4" ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+# Waiting for clone to reach 'Initial metadata transfer'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_init';
+# Wait finished
+ALTER TABLE t01  COMPRESSION = "LZ4" ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+ALTER TABLE t1  COMPRESSION = "LZ4" ;
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+# Waiting for clone to reach DDL metadata for 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_meta';
+# Wait finished
+ALTER TABLE t11  COMPRESSION = "LZ4" ;
+INSERT INTO t11 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t11.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+ALTER TABLE t2  COMPRESSION = "LZ4" ;
+call execute_dml(1, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach DDL metadata for 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page_meta';
+# Wait finished
+ALTER TABLE t21  COMPRESSION = "LZ4" ;
+INSERT INTO t21 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_page_meta';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER TABLE t3  COMPRESSION = "LZ4" ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,local_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='LZ4'
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	2	Clone Test Row - 1
+2	3	Clone Test Row - 2
+3	4	Clone Test Row - 3
+4	5	Clone Test Row - 4
+5	6	Clone Test Row - 5
+6	7	Clone Test Row - 6
+7	8	Clone Test Row - 7
+8	9	Clone Test Row - 8
+9	10	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	100	Clone Test Row - 99
+98	99	Clone Test Row - 98
+97	98	Clone Test Row - 97
+96	97	Clone Test Row - 96
+95	96	Clone Test Row - 95
+94	95	Clone Test Row - 94
+93	94	Clone Test Row - 93
+92	93	Clone Test Row - 92
+91	92	Clone Test Row - 91
+90	91	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='LZ4'
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	2	Clone Test Row - 0
+1	12	Clone Test Row - 1
+2	22	Clone Test Row - 2
+3	32	Clone Test Row - 3
+4	42	Clone Test Row - 4
+5	52	Clone Test Row - 5
+6	62	Clone Test Row - 6
+7	72	Clone Test Row - 7
+8	82	Clone Test Row - 8
+9	92	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	992	Clone Test Row - 99
+98	982	Clone Test Row - 98
+97	972	Clone Test Row - 97
+96	962	Clone Test Row - 96
+95	952	Clone Test Row - 95
+94	942	Clone Test Row - 94
+93	932	Clone Test Row - 93
+92	922	Clone Test Row - 92
+91	912	Clone Test Row - 91
+90	902	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='LZ4'
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	2	Clone Test Row - 1
+2	3	Clone Test Row - 2
+3	4	Clone Test Row - 3
+4	5	Clone Test Row - 4
+5	6	Clone Test Row - 5
+6	7	Clone Test Row - 6
+7	8	Clone Test Row - 7
+8	9	Clone Test Row - 8
+9	10	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	100	Clone Test Row - 99
+98	99	Clone Test Row - 98
+97	98	Clone Test Row - 97
+96	97	Clone Test Row - 96
+95	96	Clone Test Row - 95
+94	95	Clone Test Row - 94
+93	94	Clone Test Row - 93
+92	93	Clone Test Row - 92
+91	92	Clone Test Row - 91
+90	91	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+SET DEBUG_SYNC = 'RESET';
+# 2. DROP TABLE while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,local_release_clone_file_pin';
+SET GLOBAL DEBUG = '+d,log_redo_with_invalid_master_key';
+DROP TABLE t0  ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+# Waiting for clone to reach 'Initial metadata transfer'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_init';
+# Wait finished
+DROP TABLE t01  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+DROP TABLE t1  ;
+SHOW TABLES;
+Tables_in_test
+t
+t11
+t2
+t21
+t3
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+# Waiting for clone to reach DDL metadata for 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_meta';
+# Wait finished
+DROP TABLE t11  ;
+SHOW TABLES;
+Tables_in_test
+t
+t2
+t21
+t3
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+DROP TABLE t2  ;
+SHOW TABLES;
+Tables_in_test
+t
+t21
+t3
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach DDL metadata for 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page_meta';
+# Wait finished
+DROP TABLE t21  ;
+SHOW TABLES;
+Tables_in_test
+t
+t3
+SET DEBUG_SYNC = 'now SIGNAL resume_page_meta';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+DROP TABLE t3  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,local_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t21
+t3
+# Restart server back on base data directory
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+SET DEBUG_SYNC = 'RESET';
+# Cleanup
+DROP TABLE t;
+CREATE TABLE t1 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+DROP TABLE t1;
+DROP TABLE t2;
+DROP PROCEDURE execute_dml;
+# Uninstall clone
+UNINSTALL PLUGIN clone;
+# Restart server and remove encrypted data directory
+# restart:
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/ddl_dml.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/ddl_dml.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/ddl_dml.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/ddl_dml.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,429 @@
+CREATE UNDO TABLESPACE undo_003 ADD DATAFILE 'undo_003.ibu';
+CREATE UNDO TABLESPACE undo_004 ADD DATAFILE 'undo_004.ibu';
+SELECT NAME, SPACE_TYPE, STATE
+FROM INFORMATION_SCHEMA.INNODB_TABLESPACES
+WHERE SPACE_TYPE = 'Undo' ORDER BY NAME;
+NAME	SPACE_TYPE	STATE
+innodb_undo_001	Undo	active
+innodb_undo_002	Undo	active
+undo_003	Undo	active
+undo_004	Undo	active
+SELECT TABLESPACE_NAME, FILE_NAME, FILE_TYPE, ENGINE
+FROM INFORMATION_SCHEMA.FILES
+WHERE FILE_NAME LIKE '%undo_00%'
+       ORDER BY TABLESPACE_NAME;
+TABLESPACE_NAME	FILE_NAME	FILE_TYPE	ENGINE
+innodb_undo_001	./undo_001	UNDO LOG	InnoDB
+innodb_undo_002	./undo_002	UNDO LOG	InnoDB
+undo_003	./undo_003.ibu	UNDO LOG	InnoDB
+undo_004	./undo_004.ibu	UNDO LOG	InnoDB
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+SHOW VARIABLES LIKE "clone_buffer_size";
+Variable_name	Value
+clone_buffer_size	4194304
+SET GLOBAL clone_buffer_size = 2097152;
+SHOW VARIABLES LIKE "clone_buffer_size";
+Variable_name	Value
+clone_buffer_size	2097152
+CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+PARTITION BY KEY(col1) PARTITIONS 5;
+CREATE PROCEDURE execute_dml(
+p_dml_type	INT,
+p_key_min	INT,
+p_key_range	INT,
+p_loop_count	INT,
+p_frequency	INT,
+p_is_rand	INT)
+BEGIN
+DECLARE v_idx		INT DEFAULT 0;
+DECLARE v_commit	INT DEFAULT 0;
+DECLARE v_key		INT DEFAULT 0;
+/* Loop and INSERT data at random position */
+WHILE(v_idx < p_loop_count) DO
+/* Generate key between 1 to p_loop_count */
+IF p_is_rand = 1 THEN
+SET v_key = p_key_min + FLOOR(RAND() * p_key_range);
+ELSE
+SET v_key = p_key_min + (v_idx  % p_key_range);
+END IF;
+CASE p_dml_type
+WHEN 0 THEN
+SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+WHEN 1 THEN
+UPDATE t1 SET col2 = v_idx + 1 WHERE col1 = v_key;
+UPDATE t2 SET col2 = v_idx + 1 WHERE col1 = v_key;
+WHEN 2 THEN
+DELETE FROM t1 WHERE col1 = v_key;
+DELETE FROM t2 WHERE col1 = v_key;
+ELSE
+DELETE FROM t1;
+DELETE FROM t2;
+END CASE;
+SET v_idx = v_idx + 1;
+/* Commit or rollback work at specified frequency. */
+IF v_idx % p_frequency = 0 THEN
+SET v_commit = FLOOR(RAND() * 2);
+IF v_commit = 0 AND p_is_rand = 1 THEN
+ROLLBACK;
+START TRANSACTION;
+ELSE
+COMMIT;
+START TRANSACTION;
+END IF;
+END IF;
+END WHILE;
+COMMIT;
+END|
+CREATE PROCEDURE execute_ddl(
+p_loop_count	INT)
+BEGIN
+DECLARE v_idx		INT DEFAULT 0;
+/* Loop and execute DDL. */
+/* Concurrent DDL and DML creates MDL deadlock. Disabled till fixed. */
+WHILE(v_idx < p_loop_count) DO
+ALTER TABLE t1 ENGINE = InnoDB;
+ALTER TABLE t2 ENGINE = InnoDB;
+DO SLEEP(0.1);
+SET v_idx = v_idx + 1;
+END WHILE;
+END|
+call execute_dml(0, 0, 200, 200, 10, 0);
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+SELECT count(*) from t1;
+count(*)
+200
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;
+col1	col2	col3
+199	1990	Clone Test Row - 199
+198	1980	Clone Test Row - 198
+197	1970	Clone Test Row - 197
+196	1960	Clone Test Row - 196
+195	1950	Clone Test Row - 195
+194	1940	Clone Test Row - 194
+193	1930	Clone Test Row - 193
+192	1920	Clone Test Row - 192
+191	1910	Clone Test Row - 191
+190	1900	Clone Test Row - 190
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+SELECT count(*) from t2;
+count(*)
+200
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;
+col1	col2	col3
+199	1990	Clone Test Row - 199
+198	1980	Clone Test Row - 198
+197	1970	Clone Test Row - 197
+196	1960	Clone Test Row - 196
+195	1950	Clone Test Row - 195
+194	1940	Clone Test Row - 194
+193	1930	Clone Test Row - 193
+192	1920	Clone Test Row - 192
+191	1910	Clone Test Row - 191
+190	1900	Clone Test Row - 190
+# In connection con1 - Running Insert Random [100 - 200 Key range]
+call execute_dml(0, 100, 100, 100, 20, 1);
+# In connection con2 - Running Update Random [0 - 25 Key Range]
+call execute_dml(1, 0, 25, 100, 20, 1);
+# In connection con3 - Running Delete Random [26 - 50 Key Range]
+call execute_dml(2, 26, 25, 100, 20, 1);
+# In connection con4 - Running Update Random uncommited [51 - 75 Key Range]
+call execute_ddl(10);
+# In connection default - Cloning database
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_max_data_bandwidth = 5;
+SET GLOBAL clone_max_network_bandwidth = 4;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+select ID, STATE, ERROR_NO from performance_schema.clone_status;
+ID	STATE	ERROR_NO
+1	Completed	0
+select ID, STAGE, STATE from performance_schema.clone_progress;
+ID	STAGE	STATE
+1	DROP DATA	Completed
+1	FILE COPY	Completed
+1	PAGE COPY	Completed
+1	REDO COPY	Completed
+1	FILE SYNC	Completed
+1	RESTART	Not Started
+1	RECOVERY	Not Started
+# In connection default - Finished Cloning
+show variables like 'clone_autotune_concurrency';
+Variable_name	Value
+clone_autotune_concurrency	OFF
+# In connection con1 - Waiting
+# In connection con2 - Waiting
+# In connection con3 - Waiting
+# In connection con4 - Waiting
+commit;
+# In connection default
+# Restart cloned database
+# restart: --datadir=CLONE_DATADIR
+select STATE, ERROR_NO, length(BINLOG_FILE) > 0, length(GTID_EXECUTED) > 0,
+(BINLOG_POSITION > 0) from performance_schema.clone_status;
+STATE	ERROR_NO	length(BINLOG_FILE) > 0	length(GTID_EXECUTED) > 0	(BINLOG_POSITION > 0)
+Completed	0	1	0	1
+call execute_dml(3, 0, 1, 1, 1, 0);
+call execute_dml(0, 0, 200, 200, 10, 0);
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+SELECT count(*) from t1;
+count(*)
+200
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;
+col1	col2	col3
+199	1990	Clone Test Row - 199
+198	1980	Clone Test Row - 198
+197	1970	Clone Test Row - 197
+196	1960	Clone Test Row - 196
+195	1950	Clone Test Row - 195
+194	1940	Clone Test Row - 194
+193	1930	Clone Test Row - 193
+192	1920	Clone Test Row - 192
+191	1910	Clone Test Row - 191
+190	1900	Clone Test Row - 190
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+SELECT count(*) from t2;
+count(*)
+200
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;
+col1	col2	col3
+199	1990	Clone Test Row - 199
+198	1980	Clone Test Row - 198
+197	1970	Clone Test Row - 197
+196	1960	Clone Test Row - 196
+195	1950	Clone Test Row - 195
+194	1940	Clone Test Row - 194
+193	1930	Clone Test Row - 193
+192	1920	Clone Test Row - 192
+191	1910	Clone Test Row - 191
+190	1900	Clone Test Row - 190
+SELECT NAME, SPACE_TYPE, STATE
+FROM INFORMATION_SCHEMA.INNODB_TABLESPACES
+WHERE SPACE_TYPE = 'Undo';
+NAME	SPACE_TYPE	STATE
+innodb_undo_001	Undo	active
+innodb_undo_002	Undo	active
+undo_003	Undo	active
+undo_004	Undo	active
+SELECT TABLESPACE_NAME, FILE_NAME, FILE_TYPE, ENGINE
+FROM INFORMATION_SCHEMA.FILES
+WHERE FILE_NAME LIKE '%undo_00%';
+TABLESPACE_NAME	FILE_NAME	FILE_TYPE	ENGINE
+innodb_undo_001	./undo_001	UNDO LOG	InnoDB
+innodb_undo_002	./undo_002	UNDO LOG	InnoDB
+undo_003	./undo_003.ibu	UNDO LOG	InnoDB
+undo_004	./undo_004.ibu	UNDO LOG	InnoDB
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_max_data_bandwidth = 5;
+SET GLOBAL clone_max_network_bandwidth = 4;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+select ID, STATE, ERROR_NO from performance_schema.clone_status;
+ID	STATE	ERROR_NO
+1	Completed	0
+select ID, STAGE, STATE from performance_schema.clone_progress;
+ID	STAGE	STATE
+1	DROP DATA	Completed
+1	FILE COPY	Completed
+1	PAGE COPY	Completed
+1	REDO COPY	Completed
+1	FILE SYNC	Completed
+1	RESTART	Not Started
+1	RECOVERY	Not Started
+# Restart cloned database
+# restart: --datadir=CLONE_DATADIR1
+select STATE, ERROR_NO, length(BINLOG_FILE) > 0, length(GTID_EXECUTED) > 0,
+(BINLOG_POSITION > 0) from performance_schema.clone_status;
+STATE	ERROR_NO	length(BINLOG_FILE) > 0	length(GTID_EXECUTED) > 0	(BINLOG_POSITION > 0)
+Completed	0	1	0	1
+call execute_dml(3, 0, 1, 1, 1, 0);
+call execute_dml(0, 0, 100, 100, 10, 0);
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+# restart:
+ALTER UNDO TABLESPACE undo_003 SET INACTIVE;
+DROP UNDO TABLESPACE undo_003;
+ALTER UNDO TABLESPACE undo_004 SET INACTIVE;
+DROP UNDO TABLESPACE undo_004;
+SELECT NAME, SPACE_TYPE, STATE
+FROM INFORMATION_SCHEMA.INNODB_TABLESPACES
+WHERE SPACE_TYPE = 'Undo' ORDER BY NAME;
+NAME	SPACE_TYPE	STATE
+innodb_undo_001	Undo	active
+innodb_undo_002	Undo	active
+SELECT TABLESPACE_NAME, FILE_NAME, FILE_TYPE, ENGINE
+FROM INFORMATION_SCHEMA.FILES
+WHERE FILE_NAME LIKE '%undo_00%'
+       ORDER BY TABLESPACE_NAME;
+TABLESPACE_NAME	FILE_NAME	FILE_TYPE	ENGINE
+innodb_undo_001	./undo_001	UNDO LOG	InnoDB
+innodb_undo_002	./undo_002	UNDO LOG	InnoDB
+DROP TABLE t1;
+DROP TABLE t2;
+DROP PROCEDURE execute_dml;
+DROP PROCEDURE execute_ddl;
+UNINSTALL PLUGIN clone;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/ddl_encrypt.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/ddl_encrypt.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/ddl_encrypt.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/ddl_encrypt.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,745 @@
+# Prepare for creating Encrypted Table
+# create bootstrap file
+# Create and start mysqld with keyring plugin.
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+PARTITION BY KEY(col1) PARTITIONS 5;
+CREATE PROCEDURE execute_dml(
+p_dml_type	INT,
+p_key_min	INT,
+p_key_range	INT,
+p_loop_count	INT,
+p_frequency	INT,
+p_is_rand	INT)
+BEGIN
+DECLARE v_idx		INT DEFAULT 0;
+DECLARE v_commit	INT DEFAULT 0;
+DECLARE v_key		INT DEFAULT 0;
+/* Loop and INSERT data at random position */
+WHILE(v_idx < p_loop_count) DO
+/* Generate key between 1 to p_loop_count */
+IF p_is_rand = 1 THEN
+SET v_key = p_key_min + FLOOR(RAND() * p_key_range);
+ELSE
+SET v_key = p_key_min + (v_idx  % p_key_range);
+END IF;
+CASE p_dml_type
+WHEN 0 THEN
+SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+WHEN 1 THEN
+UPDATE t1 SET col2 = v_idx + 1 WHERE col1 = v_key;
+UPDATE t2 SET col2 = v_idx + 1 WHERE col1 = v_key;
+WHEN 2 THEN
+DELETE FROM t1 WHERE col1 = v_key;
+DELETE FROM t2 WHERE col1 = v_key;
+ELSE
+DELETE FROM t1;
+DELETE FROM t2;
+END CASE;
+SET v_idx = v_idx + 1;
+/* Commit or rollback work at specified frequency. */
+IF v_idx % p_frequency = 0 THEN
+SET v_commit = FLOOR(RAND() * 2);
+IF v_commit = 0 AND p_is_rand = 1 THEN
+ROLLBACK;
+START TRANSACTION;
+ELSE
+COMMIT;
+START TRANSACTION;
+END IF;
+END IF;
+END WHILE;
+COMMIT;
+END|
+call execute_dml(0, 0, 100, 100, 10, 0);
+CREATE TABLE t SELECT * FROM t1;
+DROP table t1;
+DROP table t2;
+SHOW VARIABLES LIKE 'clone_ddl_timeout';
+Variable_name	Value
+clone_ddl_timeout	300
+SHOW VARIABLES LIKE 'clone_block_ddl';
+Variable_name	Value
+clone_block_ddl	OFF
+# 1. CREATE TABLE with encryption while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,local_release_clone_file_pin';
+SET GLOBAL DEBUG = '+d,log_redo_with_invalid_master_key';
+CREATE TABLE t0 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ENCRYPTION = "Y" ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+# Waiting for clone to reach 'Initial metadata transfer'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_init';
+# Wait finished
+CREATE TABLE t01 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ENCRYPTION = "Y" ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+CREATE TABLE t1 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ENCRYPTION = "Y" ;
+INSERT INTO t1 SELECT * FROM t;
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+# Waiting for clone to reach DDL metadata for 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_meta';
+# Wait finished
+CREATE TABLE t11 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ENCRYPTION = "Y" ;
+INSERT INTO t11 SELECT * FROM t;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+CREATE TABLE t2 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ENCRYPTION = "Y" ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach DDL metadata for 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page_meta';
+# Wait finished
+CREATE TABLE t21 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ENCRYPTION = "Y" ;
+INSERT INTO t21 SELECT * FROM t;
+SET DEBUG_SYNC = 'now SIGNAL resume_page_meta';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+CREATE TABLE t3 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ENCRYPTION = "Y" ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,local_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 ENCRYPTION='Y'
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	11	Clone Test Row - 1
+2	21	Clone Test Row - 2
+3	31	Clone Test Row - 3
+4	41	Clone Test Row - 4
+5	51	Clone Test Row - 5
+6	61	Clone Test Row - 6
+7	71	Clone Test Row - 7
+8	81	Clone Test Row - 8
+9	91	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	991	Clone Test Row - 99
+98	981	Clone Test Row - 98
+97	971	Clone Test Row - 97
+96	961	Clone Test Row - 96
+95	951	Clone Test Row - 95
+94	941	Clone Test Row - 94
+93	931	Clone Test Row - 93
+92	921	Clone Test Row - 92
+91	911	Clone Test Row - 91
+90	901	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 ENCRYPTION='Y'
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 ENCRYPTION='Y'
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+SET DEBUG_SYNC = 'RESET';
+# 2. ALTER TABLE remove encryption while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,local_release_clone_file_pin';
+SET GLOBAL DEBUG = '+d,log_redo_with_invalid_master_key';
+ALTER TABLE t0 ENCRYPTION = "N"  ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+# Waiting for clone to reach 'Initial metadata transfer'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_init';
+# Wait finished
+ALTER TABLE t01 ENCRYPTION = "N"  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+ALTER TABLE t1 ENCRYPTION = "N"  ;
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+# Waiting for clone to reach DDL metadata for 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_meta';
+# Wait finished
+ALTER TABLE t11 ENCRYPTION = "N"  ;
+INSERT INTO t11 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t11.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+ALTER TABLE t2 ENCRYPTION = "N"  ;
+call execute_dml(1, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach DDL metadata for 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page_meta';
+# Wait finished
+ALTER TABLE t21 ENCRYPTION = "N"  ;
+INSERT INTO t21 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_page_meta';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER TABLE t3 ENCRYPTION = "N"  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,local_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	2	Clone Test Row - 1
+2	3	Clone Test Row - 2
+3	4	Clone Test Row - 3
+4	5	Clone Test Row - 4
+5	6	Clone Test Row - 5
+6	7	Clone Test Row - 6
+7	8	Clone Test Row - 7
+8	9	Clone Test Row - 8
+9	10	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	100	Clone Test Row - 99
+98	99	Clone Test Row - 98
+97	98	Clone Test Row - 97
+96	97	Clone Test Row - 96
+95	96	Clone Test Row - 95
+94	95	Clone Test Row - 94
+93	94	Clone Test Row - 93
+92	93	Clone Test Row - 92
+91	92	Clone Test Row - 91
+90	91	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	11	Clone Test Row - 1
+2	21	Clone Test Row - 2
+3	31	Clone Test Row - 3
+4	41	Clone Test Row - 4
+5	51	Clone Test Row - 5
+6	61	Clone Test Row - 6
+7	71	Clone Test Row - 7
+8	81	Clone Test Row - 8
+9	91	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	991	Clone Test Row - 99
+98	981	Clone Test Row - 98
+97	971	Clone Test Row - 97
+96	961	Clone Test Row - 96
+95	951	Clone Test Row - 95
+94	941	Clone Test Row - 94
+93	931	Clone Test Row - 93
+92	921	Clone Test Row - 92
+91	911	Clone Test Row - 91
+90	901	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	2	Clone Test Row - 1
+2	3	Clone Test Row - 2
+3	4	Clone Test Row - 3
+4	5	Clone Test Row - 4
+5	6	Clone Test Row - 5
+6	7	Clone Test Row - 6
+7	8	Clone Test Row - 7
+8	9	Clone Test Row - 8
+9	10	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	100	Clone Test Row - 99
+98	99	Clone Test Row - 98
+97	98	Clone Test Row - 97
+96	97	Clone Test Row - 96
+95	96	Clone Test Row - 95
+94	95	Clone Test Row - 94
+93	94	Clone Test Row - 93
+92	93	Clone Test Row - 92
+91	92	Clone Test Row - 91
+90	91	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+SET DEBUG_SYNC = 'RESET';
+# 3. ALTER TABLE add encryption while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,local_release_clone_file_pin';
+SET GLOBAL DEBUG = '+d,log_redo_with_invalid_master_key';
+ALTER TABLE t0 ENCRYPTION = "Y"  ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+# Waiting for clone to reach 'Initial metadata transfer'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_init';
+# Wait finished
+ALTER TABLE t01 ENCRYPTION = "Y"  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+ALTER TABLE t1 ENCRYPTION = "Y"  ;
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+# Waiting for clone to reach DDL metadata for 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_meta';
+# Wait finished
+ALTER TABLE t11 ENCRYPTION = "Y"  ;
+INSERT INTO t11 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t11.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+ALTER TABLE t2 ENCRYPTION = "Y"  ;
+call execute_dml(1, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach DDL metadata for 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page_meta';
+# Wait finished
+ALTER TABLE t21 ENCRYPTION = "Y"  ;
+INSERT INTO t21 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_page_meta';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER TABLE t3 ENCRYPTION = "Y"  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,local_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 ENCRYPTION='Y'
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	2	Clone Test Row - 1
+2	3	Clone Test Row - 2
+3	4	Clone Test Row - 3
+4	5	Clone Test Row - 4
+5	6	Clone Test Row - 5
+6	7	Clone Test Row - 6
+7	8	Clone Test Row - 7
+8	9	Clone Test Row - 8
+9	10	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	100	Clone Test Row - 99
+98	99	Clone Test Row - 98
+97	98	Clone Test Row - 97
+96	97	Clone Test Row - 96
+95	96	Clone Test Row - 95
+94	95	Clone Test Row - 94
+93	94	Clone Test Row - 93
+92	93	Clone Test Row - 92
+91	92	Clone Test Row - 91
+90	91	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 ENCRYPTION='Y'
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	2	Clone Test Row - 0
+1	12	Clone Test Row - 1
+2	22	Clone Test Row - 2
+3	32	Clone Test Row - 3
+4	42	Clone Test Row - 4
+5	52	Clone Test Row - 5
+6	62	Clone Test Row - 6
+7	72	Clone Test Row - 7
+8	82	Clone Test Row - 8
+9	92	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	992	Clone Test Row - 99
+98	982	Clone Test Row - 98
+97	972	Clone Test Row - 97
+96	962	Clone Test Row - 96
+95	952	Clone Test Row - 95
+94	942	Clone Test Row - 94
+93	932	Clone Test Row - 93
+92	922	Clone Test Row - 92
+91	912	Clone Test Row - 91
+90	902	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 ENCRYPTION='Y'
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	2	Clone Test Row - 1
+2	3	Clone Test Row - 2
+3	4	Clone Test Row - 3
+4	5	Clone Test Row - 4
+5	6	Clone Test Row - 5
+6	7	Clone Test Row - 6
+7	8	Clone Test Row - 7
+8	9	Clone Test Row - 8
+9	10	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	100	Clone Test Row - 99
+98	99	Clone Test Row - 98
+97	98	Clone Test Row - 97
+96	97	Clone Test Row - 96
+95	96	Clone Test Row - 95
+94	95	Clone Test Row - 94
+93	94	Clone Test Row - 93
+92	93	Clone Test Row - 92
+91	92	Clone Test Row - 91
+90	91	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+SET DEBUG_SYNC = 'RESET';
+# 2. DROP TABLE while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,local_release_clone_file_pin';
+SET GLOBAL DEBUG = '+d,log_redo_with_invalid_master_key';
+DROP TABLE t0  ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+# Waiting for clone to reach 'Initial metadata transfer'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_init';
+# Wait finished
+DROP TABLE t01  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+DROP TABLE t1  ;
+SHOW TABLES;
+Tables_in_test
+t
+t11
+t2
+t21
+t3
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+# Waiting for clone to reach DDL metadata for 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_meta';
+# Wait finished
+DROP TABLE t11  ;
+SHOW TABLES;
+Tables_in_test
+t
+t2
+t21
+t3
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+DROP TABLE t2  ;
+SHOW TABLES;
+Tables_in_test
+t
+t21
+t3
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach DDL metadata for 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page_meta';
+# Wait finished
+DROP TABLE t21  ;
+SHOW TABLES;
+Tables_in_test
+t
+t3
+SET DEBUG_SYNC = 'now SIGNAL resume_page_meta';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+DROP TABLE t3  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,local_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t21
+t3
+# Restart server back on base data directory
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+SET DEBUG_SYNC = 'RESET';
+# Cleanup
+DROP TABLE t;
+CREATE TABLE t1 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+DROP TABLE t1;
+DROP TABLE t2;
+DROP PROCEDURE execute_dml;
+# Uninstall clone
+UNINSTALL PLUGIN clone;
+# Restart server and remove encrypted data directory
+# restart:
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/ddl_mix.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/ddl_mix.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/ddl_mix.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/ddl_mix.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,376 @@
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+PARTITION BY KEY(col1) PARTITIONS 5;
+CREATE PROCEDURE execute_dml(
+p_dml_type	INT,
+p_key_min	INT,
+p_key_range	INT,
+p_loop_count	INT,
+p_frequency	INT,
+p_is_rand	INT)
+BEGIN
+DECLARE v_idx		INT DEFAULT 0;
+DECLARE v_commit	INT DEFAULT 0;
+DECLARE v_key		INT DEFAULT 0;
+/* Loop and INSERT data at random position */
+WHILE(v_idx < p_loop_count) DO
+/* Generate key between 1 to p_loop_count */
+IF p_is_rand = 1 THEN
+SET v_key = p_key_min + FLOOR(RAND() * p_key_range);
+ELSE
+SET v_key = p_key_min + (v_idx  % p_key_range);
+END IF;
+CASE p_dml_type
+WHEN 0 THEN
+SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+WHEN 1 THEN
+UPDATE t1 SET col2 = v_idx + 1 WHERE col1 = v_key;
+UPDATE t2 SET col2 = v_idx + 1 WHERE col1 = v_key;
+WHEN 2 THEN
+DELETE FROM t1 WHERE col1 = v_key;
+DELETE FROM t2 WHERE col1 = v_key;
+ELSE
+DELETE FROM t1;
+DELETE FROM t2;
+END CASE;
+SET v_idx = v_idx + 1;
+/* Commit or rollback work at specified frequency. */
+IF v_idx % p_frequency = 0 THEN
+SET v_commit = FLOOR(RAND() * 2);
+IF v_commit = 0 AND p_is_rand = 1 THEN
+ROLLBACK;
+START TRANSACTION;
+ELSE
+COMMIT;
+START TRANSACTION;
+END IF;
+END IF;
+END WHILE;
+COMMIT;
+END|
+call execute_dml(0, 0, 100, 100, 10, 0);
+CREATE TABLE t SELECT * FROM t1;
+CREATE TABLE t0 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t01 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t3 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t11 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t21 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+INSERT INTO t11 SELECT * FROM t;
+INSERT INTO t21 SELECT * FROM t;
+SHOW VARIABLES LIKE 'clone_ddl_timeout';
+Variable_name	Value
+clone_ddl_timeout	300
+SHOW VARIABLES LIKE 'clone_block_ddl';
+Variable_name	Value
+clone_block_ddl	OFF
+# 1. RENAME and CREATE a TABLE with same name while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,local_release_clone_file_pin';
+ALTER TABLE t0 RENAME t0_new;
+CREATE TABLE t0 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+# Waiting for clone to reach 'Initial metadata transfer'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_init';
+# Wait finished
+ALTER TABLE t01 RENAME t01_new;
+CREATE TABLE t01 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+ALTER TABLE t1 RENAME t1_new;
+CREATE TABLE t1 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+# Waiting for clone to reach DDL metadata for 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_meta';
+# Wait finished
+ALTER TABLE t11 RENAME t11_new;
+CREATE TABLE t11 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ;
+INSERT INTO t11 SELECT * FROM t;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+ALTER TABLE t2 RENAME t2_new;
+CREATE TABLE t2 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach DDL metadata for 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page_meta';
+# Wait finished
+ALTER TABLE t21 RENAME t21_new;
+CREATE TABLE t21 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ;
+INSERT INTO t21 SELECT * FROM t;
+SET DEBUG_SYNC = 'now SIGNAL resume_page_meta';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER TABLE t3 RENAME t3_new;
+CREATE TABLE t3 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,local_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t01_new
+t0_new
+t1
+t11
+t11_new
+t1_new
+t2
+t21
+t2_new
+t3
+SHOW CREATE TABLE t1_new;
+Table	Create Table
+t1_new	CREATE TABLE `t1_new` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t1_new EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1_new	check	status	OK
+SELECT count(*) from t1_new;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1_new ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1_new ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+SHOW CREATE TABLE t11_new;
+Table	Create Table
+t11_new	CREATE TABLE `t11_new` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t11_new EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11_new	check	status	OK
+SELECT count(*) from t11_new;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11_new ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11_new ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+SHOW CREATE TABLE t2_new;
+Table	Create Table
+t2_new	CREATE TABLE `t2_new` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2_new EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2_new	check	status	OK
+SELECT count(*) from t2_new;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2_new ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	11	Clone Test Row - 1
+2	21	Clone Test Row - 2
+3	31	Clone Test Row - 3
+4	41	Clone Test Row - 4
+5	51	Clone Test Row - 5
+6	61	Clone Test Row - 6
+7	71	Clone Test Row - 7
+8	81	Clone Test Row - 8
+9	91	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2_new ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	991	Clone Test Row - 99
+98	981	Clone Test Row - 98
+97	971	Clone Test Row - 97
+96	961	Clone Test Row - 96
+95	951	Clone Test Row - 95
+94	941	Clone Test Row - 94
+93	931	Clone Test Row - 93
+92	921	Clone Test Row - 92
+91	911	Clone Test Row - 91
+90	901	Clone Test Row - 90
+CALL execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# Cleanup
+DROP TABLE t0;
+DROP TABLE t01;
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE t3;
+DROP TABLE t11;
+DROP TABLE t21;
+DROP TABLE t0_new;
+DROP TABLE t01_new;
+DROP TABLE t1_new;
+DROP TABLE t2_new;
+DROP TABLE t3_new;
+DROP TABLE t11_new;
+DROP TABLE t21_new;
+# 2. CREATE & DROP TABLE while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,local_release_clone_file_pin';
+CREATE TABLE t0 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) PARTITION BY KEY(col1) PARTITIONS 5;
+DROP TABLE t0  ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+# Waiting for clone to reach 'Initial metadata transfer'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_init';
+# Wait finished
+CREATE TABLE t01 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) PARTITION BY KEY(col1) PARTITIONS 5;
+DROP TABLE t01  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+CREATE TABLE t1 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) PARTITION BY KEY(col1) PARTITIONS 5;
+INSERT INTO t1 SELECT * FROM t;
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+DROP TABLE t1  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+# Waiting for clone to reach DDL metadata for 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_meta';
+# Wait finished
+CREATE TABLE t11 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) PARTITION BY KEY(col1) PARTITIONS 5;
+INSERT INTO t11 SELECT * FROM t;
+DROP TABLE t11  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+CREATE TABLE t2 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) PARTITION BY KEY(col1) PARTITIONS 5;
+INSERT INTO t2 SELECT * FROM t;
+DROP TABLE t2  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach DDL metadata for 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page_meta';
+# Wait finished
+CREATE TABLE t21 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) PARTITION BY KEY(col1) PARTITIONS 5;
+INSERT INTO t21 SELECT * FROM t;
+DROP TABLE t21  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_page_meta';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+CREATE TABLE t3 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) PARTITION BY KEY(col1) PARTITIONS 5;
+DROP TABLE t3  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,local_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# Cleanup
+DROP TABLE t;
+CREATE TABLE t1 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+DROP TABLE t1;
+DROP TABLE t2;
+DROP PROCEDURE execute_dml;
+# Uninstall clone
+UNINSTALL PLUGIN clone;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/ddl_rename.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/ddl_rename.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/ddl_rename.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/ddl_rename.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,282 @@
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+PARTITION BY KEY(col1) PARTITIONS 5;
+CREATE PROCEDURE execute_dml(
+p_dml_type	INT,
+p_key_min	INT,
+p_key_range	INT,
+p_loop_count	INT,
+p_frequency	INT,
+p_is_rand	INT)
+BEGIN
+DECLARE v_idx		INT DEFAULT 0;
+DECLARE v_commit	INT DEFAULT 0;
+DECLARE v_key		INT DEFAULT 0;
+/* Loop and INSERT data at random position */
+WHILE(v_idx < p_loop_count) DO
+/* Generate key between 1 to p_loop_count */
+IF p_is_rand = 1 THEN
+SET v_key = p_key_min + FLOOR(RAND() * p_key_range);
+ELSE
+SET v_key = p_key_min + (v_idx  % p_key_range);
+END IF;
+CASE p_dml_type
+WHEN 0 THEN
+SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+WHEN 1 THEN
+UPDATE t1 SET col2 = v_idx + 1 WHERE col1 = v_key;
+UPDATE t2 SET col2 = v_idx + 1 WHERE col1 = v_key;
+WHEN 2 THEN
+DELETE FROM t1 WHERE col1 = v_key;
+DELETE FROM t2 WHERE col1 = v_key;
+ELSE
+DELETE FROM t1;
+DELETE FROM t2;
+END CASE;
+SET v_idx = v_idx + 1;
+/* Commit or rollback work at specified frequency. */
+IF v_idx % p_frequency = 0 THEN
+SET v_commit = FLOOR(RAND() * 2);
+IF v_commit = 0 AND p_is_rand = 1 THEN
+ROLLBACK;
+START TRANSACTION;
+ELSE
+COMMIT;
+START TRANSACTION;
+END IF;
+END IF;
+END WHILE;
+COMMIT;
+END|
+call execute_dml(0, 0, 100, 100, 10, 0);
+CREATE TABLE t SELECT * FROM t1;
+CREATE TABLE t0 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t01 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t3 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t11 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t21 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+INSERT INTO t11 SELECT * FROM t;
+INSERT INTO t21 SELECT * FROM t;
+SHOW VARIABLES LIKE 'clone_ddl_timeout';
+Variable_name	Value
+clone_ddl_timeout	300
+SHOW VARIABLES LIKE 'clone_block_ddl';
+Variable_name	Value
+clone_block_ddl	OFF
+# 1. ALTER TABLE RENAME while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,local_release_clone_file_pin';
+ALTER TABLE t0 RENAME t0_new;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+# Waiting for clone to reach 'Initial metadata transfer'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_init';
+# Wait finished
+ALTER TABLE t01 RENAME t01_new;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+ALTER TABLE t1 RENAME t1_new;
+INSERT INTO t1_new SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t1_new.col2 + 1;;
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+# Waiting for clone to reach DDL metadata for 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_meta';
+# Wait finished
+ALTER TABLE t11 RENAME t11_new;
+INSERT INTO t11_new SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t11_new.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+ALTER TABLE t2 RENAME t2_new;
+INSERT INTO t2_new SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t2_new.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach DDL metadata for 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page_meta';
+# Wait finished
+ALTER TABLE t21 RENAME t21_new;
+INSERT INTO t21_new SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21_new.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_page_meta';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER TABLE t3 RENAME t3_new;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,local_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t01_new
+t0_new
+t11_new
+t1_new
+t21
+t2_new
+t3
+SHOW CREATE TABLE t1_new;
+Table	Create Table
+t1_new	CREATE TABLE `t1_new` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t1_new EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1_new	check	status	OK
+SELECT count(*) from t1_new;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1_new ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	11	Clone Test Row - 1
+2	21	Clone Test Row - 2
+3	31	Clone Test Row - 3
+4	41	Clone Test Row - 4
+5	51	Clone Test Row - 5
+6	61	Clone Test Row - 6
+7	71	Clone Test Row - 7
+8	81	Clone Test Row - 8
+9	91	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1_new ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	991	Clone Test Row - 99
+98	981	Clone Test Row - 98
+97	971	Clone Test Row - 97
+96	961	Clone Test Row - 96
+95	951	Clone Test Row - 95
+94	941	Clone Test Row - 94
+93	931	Clone Test Row - 93
+92	921	Clone Test Row - 92
+91	911	Clone Test Row - 91
+90	901	Clone Test Row - 90
+SHOW CREATE TABLE t11_new;
+Table	Create Table
+t11_new	CREATE TABLE `t11_new` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t11_new EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11_new	check	status	OK
+SELECT count(*) from t11_new;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11_new ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	11	Clone Test Row - 1
+2	21	Clone Test Row - 2
+3	31	Clone Test Row - 3
+4	41	Clone Test Row - 4
+5	51	Clone Test Row - 5
+6	61	Clone Test Row - 6
+7	71	Clone Test Row - 7
+8	81	Clone Test Row - 8
+9	91	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11_new ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	991	Clone Test Row - 99
+98	981	Clone Test Row - 98
+97	971	Clone Test Row - 97
+96	961	Clone Test Row - 96
+95	951	Clone Test Row - 95
+94	941	Clone Test Row - 94
+93	931	Clone Test Row - 93
+92	921	Clone Test Row - 92
+91	911	Clone Test Row - 91
+90	901	Clone Test Row - 90
+SHOW CREATE TABLE t2_new;
+Table	Create Table
+t2_new	CREATE TABLE `t2_new` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2_new EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2_new	check	status	OK
+SELECT count(*) from t2_new;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2_new ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	11	Clone Test Row - 1
+2	21	Clone Test Row - 2
+3	31	Clone Test Row - 3
+4	41	Clone Test Row - 4
+5	51	Clone Test Row - 5
+6	61	Clone Test Row - 6
+7	71	Clone Test Row - 7
+8	81	Clone Test Row - 8
+9	91	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2_new ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	991	Clone Test Row - 99
+98	981	Clone Test Row - 98
+97	971	Clone Test Row - 97
+96	961	Clone Test Row - 96
+95	951	Clone Test Row - 95
+94	941	Clone Test Row - 94
+93	931	Clone Test Row - 93
+92	921	Clone Test Row - 92
+91	911	Clone Test Row - 91
+90	901	Clone Test Row - 90
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# Cleanup
+DROP TABLE t;
+CREATE TABLE t1 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+DROP TABLE t1;
+DROP TABLE t2;
+DROP PROCEDURE execute_dml;
+DROP TABLE t0_new;
+DROP TABLE t01_new;
+DROP TABLE t1_new;
+DROP TABLE t2_new;
+DROP TABLE t3_new;
+DROP TABLE t11_new;
+DROP TABLE t21_new;
+# Uninstall clone
+UNINSTALL PLUGIN clone;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/ddl_sys_encrypt_file_copy.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/ddl_sys_encrypt_file_copy.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/ddl_sys_encrypt_file_copy.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/ddl_sys_encrypt_file_copy.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,506 @@
+# Prepare for creating Encrypted Table
+# create bootstrap file
+# Create and start mysqld with keyring plugin.
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+PARTITION BY KEY(col1) PARTITIONS 5;
+CREATE PROCEDURE execute_dml(
+p_dml_type	INT,
+p_key_min	INT,
+p_key_range	INT,
+p_loop_count	INT,
+p_frequency	INT,
+p_is_rand	INT)
+BEGIN
+DECLARE v_idx		INT DEFAULT 0;
+DECLARE v_commit	INT DEFAULT 0;
+DECLARE v_key		INT DEFAULT 0;
+/* Loop and INSERT data at random position */
+WHILE(v_idx < p_loop_count) DO
+/* Generate key between 1 to p_loop_count */
+IF p_is_rand = 1 THEN
+SET v_key = p_key_min + FLOOR(RAND() * p_key_range);
+ELSE
+SET v_key = p_key_min + (v_idx  % p_key_range);
+END IF;
+CASE p_dml_type
+WHEN 0 THEN
+SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+WHEN 1 THEN
+UPDATE t1 SET col2 = v_idx + 1 WHERE col1 = v_key;
+UPDATE t2 SET col2 = v_idx + 1 WHERE col1 = v_key;
+WHEN 2 THEN
+DELETE FROM t1 WHERE col1 = v_key;
+DELETE FROM t2 WHERE col1 = v_key;
+ELSE
+DELETE FROM t1;
+DELETE FROM t2;
+END CASE;
+SET v_idx = v_idx + 1;
+/* Commit or rollback work at specified frequency. */
+IF v_idx % p_frequency = 0 THEN
+SET v_commit = FLOOR(RAND() * 2);
+IF v_commit = 0 AND p_is_rand = 1 THEN
+ROLLBACK;
+START TRANSACTION;
+ELSE
+COMMIT;
+START TRANSACTION;
+END IF;
+END IF;
+END WHILE;
+COMMIT;
+END|
+call execute_dml(0, 0, 100, 100, 10, 0);
+CREATE TABLE t SELECT * FROM t1;
+CREATE TABLE t0 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t01 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t3 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t11 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t21 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+INSERT INTO t11 SELECT * FROM t;
+INSERT INTO t21 SELECT * FROM t;
+SHOW VARIABLES LIKE 'clone_ddl_timeout';
+Variable_name	Value
+clone_ddl_timeout	300
+SHOW VARIABLES LIKE 'clone_block_ddl';
+Variable_name	Value
+clone_block_ddl	OFF
+CREATE TABLESPACE tbs;
+DROP TABLE t1;
+CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+TABLESPACE = tbs;
+DROP TABLE t2;
+CREATE TABLE t2(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+TABLESPACE = tbs;
+# 1. Enable REDO and UNDO encryption while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,local_release_clone_file_pin';
+SET GLOBAL DEBUG = '+d,log_redo_with_invalid_master_key';
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+# Waiting for clone to reach 'Initial metadata transfer'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_init';
+# Wait finished
+SET GLOBAL innodb_redo_log_encrypt = ON;
+SET GLOBAL innodb_undo_log_encrypt = ON;
+ALTER TABLESPACE tbs ENCRYPTION = 'Y';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+SET GLOBAL innodb_redo_log_encrypt = ON;
+SET GLOBAL innodb_undo_log_encrypt = ON;
+ALTER TABLESPACE tbs ENCRYPTION = 'Y';
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+# Waiting for clone to reach DDL metadata for 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_meta';
+# Wait finished
+SET GLOBAL innodb_redo_log_encrypt = ON;
+SET GLOBAL innodb_undo_log_encrypt = ON;
+ALTER TABLESPACE tbs ENCRYPTION = 'Y';
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+SET GLOBAL innodb_redo_log_encrypt = ON;
+SET GLOBAL innodb_undo_log_encrypt = ON;
+ALTER TABLESPACE tbs ENCRYPTION = 'Y';
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach DDL metadata for 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page_meta';
+# Wait finished
+SET GLOBAL innodb_redo_log_encrypt = ON;
+SET GLOBAL innodb_undo_log_encrypt = ON;
+ALTER TABLESPACE tbs ENCRYPTION = 'Y';
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page_meta';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+SET GLOBAL innodb_redo_log_encrypt = ON;
+SET GLOBAL innodb_undo_log_encrypt = ON;
+ALTER TABLESPACE tbs ENCRYPTION = 'Y';
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,local_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) /*!50100 TABLESPACE `tbs` */ ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!80016 ENCRYPTION='Y' */
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	2	Clone Test Row - 0
+1	12	Clone Test Row - 1
+2	22	Clone Test Row - 2
+3	32	Clone Test Row - 3
+4	42	Clone Test Row - 4
+5	52	Clone Test Row - 5
+6	62	Clone Test Row - 6
+7	72	Clone Test Row - 7
+8	82	Clone Test Row - 8
+9	92	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	992	Clone Test Row - 99
+98	982	Clone Test Row - 98
+97	972	Clone Test Row - 97
+96	962	Clone Test Row - 96
+95	952	Clone Test Row - 95
+94	942	Clone Test Row - 94
+93	932	Clone Test Row - 93
+92	922	Clone Test Row - 92
+91	912	Clone Test Row - 91
+90	902	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) /*!50100 TABLESPACE `tbs` */ ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!80016 ENCRYPTION='Y' */
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	2	Clone Test Row - 0
+1	12	Clone Test Row - 1
+2	22	Clone Test Row - 2
+3	32	Clone Test Row - 3
+4	42	Clone Test Row - 4
+5	52	Clone Test Row - 5
+6	62	Clone Test Row - 6
+7	72	Clone Test Row - 7
+8	82	Clone Test Row - 8
+9	92	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	992	Clone Test Row - 99
+98	982	Clone Test Row - 98
+97	972	Clone Test Row - 97
+96	962	Clone Test Row - 96
+95	952	Clone Test Row - 95
+94	942	Clone Test Row - 94
+93	932	Clone Test Row - 93
+92	922	Clone Test Row - 92
+91	912	Clone Test Row - 91
+90	902	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+SET DEBUG_SYNC = 'RESET';
+# 2. Disable REDO and UNDO encryption while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,local_release_clone_file_pin';
+SET GLOBAL DEBUG = '+d,log_redo_with_invalid_master_key';
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+# Waiting for clone to reach 'Initial metadata transfer'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_init';
+# Wait finished
+SET GLOBAL innodb_redo_log_encrypt = OFF;
+SET GLOBAL innodb_undo_log_encrypt = OFF;
+ALTER TABLESPACE tbs ENCRYPTION = 'N';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+SET GLOBAL innodb_redo_log_encrypt = OFF;
+SET GLOBAL innodb_undo_log_encrypt = OFF;
+ALTER TABLESPACE tbs ENCRYPTION = 'N';
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+# Waiting for clone to reach DDL metadata for 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_meta';
+# Wait finished
+SET GLOBAL innodb_redo_log_encrypt = OFF;
+SET GLOBAL innodb_undo_log_encrypt = OFF;
+ALTER TABLESPACE tbs ENCRYPTION = 'N';
+INSERT INTO t11 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t11.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+SET GLOBAL innodb_redo_log_encrypt = OFF;
+SET GLOBAL innodb_undo_log_encrypt = OFF;
+ALTER TABLESPACE tbs ENCRYPTION = 'N';
+call execute_dml(1, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach DDL metadata for 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page_meta';
+# Wait finished
+SET GLOBAL innodb_redo_log_encrypt = OFF;
+SET GLOBAL innodb_undo_log_encrypt = OFF;
+ALTER TABLESPACE tbs ENCRYPTION = 'N';
+INSERT INTO t21 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_page_meta';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+SET GLOBAL innodb_redo_log_encrypt = OFF;
+SET GLOBAL innodb_undo_log_encrypt = OFF;
+ALTER TABLESPACE tbs ENCRYPTION = 'N';
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,local_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) /*!50100 TABLESPACE `tbs` */ ENGINE=InnoDB DEFAULT CHARSET=latin1
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	2	Clone Test Row - 1
+2	3	Clone Test Row - 2
+3	4	Clone Test Row - 3
+4	5	Clone Test Row - 4
+5	6	Clone Test Row - 5
+6	7	Clone Test Row - 6
+7	8	Clone Test Row - 7
+8	9	Clone Test Row - 8
+9	10	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	100	Clone Test Row - 99
+98	99	Clone Test Row - 98
+97	98	Clone Test Row - 97
+96	97	Clone Test Row - 96
+95	96	Clone Test Row - 95
+94	95	Clone Test Row - 94
+93	94	Clone Test Row - 93
+92	93	Clone Test Row - 92
+91	92	Clone Test Row - 91
+90	91	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	11	Clone Test Row - 1
+2	21	Clone Test Row - 2
+3	31	Clone Test Row - 3
+4	41	Clone Test Row - 4
+5	51	Clone Test Row - 5
+6	61	Clone Test Row - 6
+7	71	Clone Test Row - 7
+8	81	Clone Test Row - 8
+9	91	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	991	Clone Test Row - 99
+98	981	Clone Test Row - 98
+97	971	Clone Test Row - 97
+96	961	Clone Test Row - 96
+95	951	Clone Test Row - 95
+94	941	Clone Test Row - 94
+93	931	Clone Test Row - 93
+92	921	Clone Test Row - 92
+91	911	Clone Test Row - 91
+90	901	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) /*!50100 TABLESPACE `tbs` */ ENGINE=InnoDB DEFAULT CHARSET=latin1
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	2	Clone Test Row - 1
+2	3	Clone Test Row - 2
+3	4	Clone Test Row - 3
+4	5	Clone Test Row - 4
+5	6	Clone Test Row - 5
+6	7	Clone Test Row - 6
+7	8	Clone Test Row - 7
+8	9	Clone Test Row - 8
+9	10	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	100	Clone Test Row - 99
+98	99	Clone Test Row - 98
+97	98	Clone Test Row - 97
+96	97	Clone Test Row - 96
+95	96	Clone Test Row - 95
+94	95	Clone Test Row - 94
+93	94	Clone Test Row - 93
+92	93	Clone Test Row - 92
+91	92	Clone Test Row - 91
+90	91	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+SET DEBUG_SYNC = 'RESET';
+# Cleanup
+DROP TABLE t;
+DROP TABLE t1;
+DROP TABLE t2;
+DROP PROCEDURE execute_dml;
+DROP TABLE t0;
+DROP TABLE t01;
+DROP TABLE t3;
+DROP TABLE t11;
+DROP TABLE t21;
+DROP TABLESPACE tbs;
+# Uninstall clone
+UNINSTALL PLUGIN clone;
+# Restart server and remove encrypted data directory
+# restart:
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/ddl_sys_encrypt_page_copy.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/ddl_sys_encrypt_page_copy.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/ddl_sys_encrypt_page_copy.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/ddl_sys_encrypt_page_copy.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,73 @@
+# Prepare for creating Encrypted Table
+# create bootstrap file
+# Create and start mysqld with keyring plugin.
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+# In connection CON1
+CREATE TABLESPACE tbs;
+CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+TABLESPACE = tbs;
+# In connection DEFAULT
+# 1. Enable REDO encryption during PAGE COPY
+SET GLOBAL DEBUG = '+d,clone_ddl_abort_wait_page_copy';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl WAIT_FOR resume_clone';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl';
+SET DEBUG_SYNC = 'clone_notify_ddl_after_state_block SIGNAL resume_clone';
+SET GLOBAL innodb_redo_log_encrypt = ON;
+ERROR HY000: Internal error: Simulated Clone DDL error
+# In connection DEFAULT
+SET GLOBAL DEBUG = '-d,clone_ddl_abort_wait_page_copy';
+SET DEBUG_SYNC = 'RESET';
+# 2. Enable UNDO encryption during PAGE COPY
+SET GLOBAL DEBUG = '+d,clone_ddl_abort_wait_page_copy';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl WAIT_FOR resume_clone';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl';
+SET DEBUG_SYNC = 'clone_notify_ddl_after_state_block SIGNAL resume_clone';
+SET GLOBAL innodb_undo_log_encrypt = ON;
+ERROR HY000: Internal error: Simulated Clone DDL error
+# In connection DEFAULT
+SET GLOBAL DEBUG = '-d,clone_ddl_abort_wait_page_copy';
+SET DEBUG_SYNC = 'RESET';
+# 3. Enable general tablespace encryption during PAGE COPY
+SET GLOBAL DEBUG = '+d,clone_ddl_abort_wait_page_copy';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl WAIT_FOR resume_clone';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl';
+SET DEBUG_SYNC = 'clone_notify_ddl_after_state_block SIGNAL resume_clone';
+ALTER TABLESPACE tbs ENCRYPTION = 'Y';
+# In connection DEFAULT
+ERROR HY000: Concurrent DDL is performed during clone operation. Please try again.
+SET GLOBAL DEBUG = '-d,clone_ddl_abort_wait_page_copy';
+SET DEBUG_SYNC = 'RESET';
+# 4.Disable general tablespace encryption during PAGE COPY
+SET GLOBAL DEBUG = '+d,clone_ddl_abort_wait_page_copy';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl WAIT_FOR resume_clone';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl';
+SET DEBUG_SYNC = 'clone_notify_ddl_after_state_block SIGNAL resume_clone';
+ALTER TABLESPACE tbs ENCRYPTION = 'N';
+# In connection DEFAULT
+ERROR HY000: Concurrent DDL is performed during clone operation. Please try again.
+SET GLOBAL DEBUG = '-d,clone_ddl_abort_wait_page_copy';
+SET DEBUG_SYNC = 'RESET';
+# Cleanup
+DROP TABLE t1;
+DROP TABLESPACE tbs;
+# Uninstall clone
+UNINSTALL PLUGIN clone;
+# Restart server and remove encrypted data directory
+# restart:
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/ddl_truncate.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/ddl_truncate.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/ddl_truncate.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/ddl_truncate.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,280 @@
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+PARTITION BY KEY(col1) PARTITIONS 5;
+CREATE PROCEDURE execute_dml(
+p_dml_type	INT,
+p_key_min	INT,
+p_key_range	INT,
+p_loop_count	INT,
+p_frequency	INT,
+p_is_rand	INT)
+BEGIN
+DECLARE v_idx		INT DEFAULT 0;
+DECLARE v_commit	INT DEFAULT 0;
+DECLARE v_key		INT DEFAULT 0;
+/* Loop and INSERT data at random position */
+WHILE(v_idx < p_loop_count) DO
+/* Generate key between 1 to p_loop_count */
+IF p_is_rand = 1 THEN
+SET v_key = p_key_min + FLOOR(RAND() * p_key_range);
+ELSE
+SET v_key = p_key_min + (v_idx  % p_key_range);
+END IF;
+CASE p_dml_type
+WHEN 0 THEN
+SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+WHEN 1 THEN
+UPDATE t1 SET col2 = v_idx + 1 WHERE col1 = v_key;
+UPDATE t2 SET col2 = v_idx + 1 WHERE col1 = v_key;
+WHEN 2 THEN
+DELETE FROM t1 WHERE col1 = v_key;
+DELETE FROM t2 WHERE col1 = v_key;
+ELSE
+DELETE FROM t1;
+DELETE FROM t2;
+END CASE;
+SET v_idx = v_idx + 1;
+/* Commit or rollback work at specified frequency. */
+IF v_idx % p_frequency = 0 THEN
+SET v_commit = FLOOR(RAND() * 2);
+IF v_commit = 0 AND p_is_rand = 1 THEN
+ROLLBACK;
+START TRANSACTION;
+ELSE
+COMMIT;
+START TRANSACTION;
+END IF;
+END IF;
+END WHILE;
+COMMIT;
+END|
+call execute_dml(0, 0, 100, 100, 10, 0);
+CREATE TABLE t SELECT * FROM t1;
+CREATE TABLE t0 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t01 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t3 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t11 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t21 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+INSERT INTO t11 SELECT * FROM t;
+INSERT INTO t21 SELECT * FROM t;
+SHOW VARIABLES LIKE 'clone_ddl_timeout';
+Variable_name	Value
+clone_ddl_timeout	300
+SHOW VARIABLES LIKE 'clone_block_ddl';
+Variable_name	Value
+clone_block_ddl	OFF
+# 1. TRUNCATE TABLE while clone in progress
+SET global debug="+d,clone_send_deleted_block";
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,local_release_clone_file_pin';
+TRUNCATE TABLE t0  ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+# Waiting for clone to reach 'Initial metadata transfer'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_init';
+# Wait finished
+TRUNCATE TABLE t01  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+TRUNCATE TABLE t1  ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+# Waiting for clone to reach DDL metadata for 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_meta';
+# Wait finished
+TRUNCATE TABLE t11  ;
+INSERT INTO t11 SELECT * FROM t;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+TRUNCATE TABLE t2  ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach DDL metadata for 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page_meta';
+# Wait finished
+TRUNCATE TABLE t21  ;
+INSERT INTO t21 SELECT * FROM t;
+SET DEBUG_SYNC = 'now SIGNAL resume_page_meta';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+TRUNCATE TABLE t3  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,local_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	11	Clone Test Row - 1
+2	21	Clone Test Row - 2
+3	31	Clone Test Row - 3
+4	41	Clone Test Row - 4
+5	51	Clone Test Row - 5
+6	61	Clone Test Row - 6
+7	71	Clone Test Row - 7
+8	81	Clone Test Row - 8
+9	91	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	991	Clone Test Row - 99
+98	981	Clone Test Row - 98
+97	971	Clone Test Row - 97
+96	961	Clone Test Row - 96
+95	951	Clone Test Row - 95
+94	941	Clone Test Row - 94
+93	931	Clone Test Row - 93
+92	921	Clone Test Row - 92
+91	911	Clone Test Row - 91
+90	901	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# Cleanup
+DROP TABLE t;
+DROP TABLE t1;
+DROP TABLE t2;
+DROP PROCEDURE execute_dml;
+DROP TABLE t0;
+DROP TABLE t01;
+DROP TABLE t3;
+DROP TABLE t11;
+DROP TABLE t21;
+# Uninstall clone
+UNINSTALL PLUGIN clone;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/ddl_truncate_same.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/ddl_truncate_same.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/ddl_truncate_same.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/ddl_truncate_same.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,218 @@
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+# Create test schema
+CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+PARTITION BY KEY(col1) PARTITIONS 5;
+CREATE PROCEDURE execute_dml(
+p_dml_type	INT,
+p_key_min	INT,
+p_key_range	INT,
+p_loop_count	INT,
+p_frequency	INT,
+p_is_rand	INT)
+BEGIN
+DECLARE v_idx		INT DEFAULT 0;
+DECLARE v_commit	INT DEFAULT 0;
+DECLARE v_key		INT DEFAULT 0;
+/* Loop and INSERT data at random position */
+WHILE(v_idx < p_loop_count) DO
+/* Generate key between 1 to p_loop_count */
+IF p_is_rand = 1 THEN
+SET v_key = p_key_min + FLOOR(RAND() * p_key_range);
+ELSE
+SET v_key = p_key_min + (v_idx  % p_key_range);
+END IF;
+CASE p_dml_type
+WHEN 0 THEN
+SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+WHEN 1 THEN
+UPDATE t1 SET col2 = v_idx + 1 WHERE col1 = v_key;
+UPDATE t2 SET col2 = v_idx + 1 WHERE col1 = v_key;
+WHEN 2 THEN
+DELETE FROM t1 WHERE col1 = v_key;
+DELETE FROM t2 WHERE col1 = v_key;
+ELSE
+DELETE FROM t1;
+DELETE FROM t2;
+END CASE;
+SET v_idx = v_idx + 1;
+/* Commit or rollback work at specified frequency. */
+IF v_idx % p_frequency = 0 THEN
+SET v_commit = FLOOR(RAND() * 2);
+IF v_commit = 0 AND p_is_rand = 1 THEN
+ROLLBACK;
+START TRANSACTION;
+ELSE
+COMMIT;
+START TRANSACTION;
+END IF;
+END IF;
+END WHILE;
+COMMIT;
+END|
+CALL execute_dml(0, 0, 10, 10, 10, 0);
+SET GLOBAL DEBUG = '+d,local_release_clone_file_pin';
+# 1. Truncate same table in various stages of CLONE
+# In connection DEFAULT
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_0 WAIT_FOR resume_clone_0';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_1 WAIT_FOR resume_clone_1';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_2 WAIT_FOR resume_clone_2';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_3 WAIT_FOR resume_clone_3';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_4 WAIT_FOR resume_clone_4';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_5 WAIT_FOR resume_clone_5';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_6 WAIT_FOR resume_clone_6';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+# Waiting for clone
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_0';
+# Wait finished
+TRUNCATE TABLE t1;
+TRUNCATE TABLE t2;
+CALL execute_dml(0, 0, 10, 10, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_clone_0';
+# Waiting for clone
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_1';
+# Wait finished
+TRUNCATE TABLE t1;
+TRUNCATE TABLE t2;
+CALL execute_dml(0, 0, 10, 10, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_clone_1';
+# Waiting for clone
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_2';
+# Wait finished
+TRUNCATE TABLE t1;
+TRUNCATE TABLE t2;
+CALL execute_dml(0, 0, 10, 10, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_clone_2';
+# Waiting for clone
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_3';
+# Wait finished
+TRUNCATE TABLE t1;
+TRUNCATE TABLE t2;
+CALL execute_dml(0, 0, 10, 10, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_clone_3';
+# Waiting for clone
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_4';
+# Wait finished
+TRUNCATE TABLE t1;
+TRUNCATE TABLE t2;
+CALL execute_dml(0, 0, 10, 10, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_clone_4';
+# Waiting for clone
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_5';
+# Wait finished
+TRUNCATE TABLE t1;
+TRUNCATE TABLE t2;
+CALL execute_dml(0, 0, 10, 10, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_clone_5';
+# Waiting for clone
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_6';
+# Wait finished
+TRUNCATE TABLE t1;
+TRUNCATE TABLE t2;
+CALL execute_dml(0, 0, 10, 10, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_clone_6';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,local_release_clone_file_pin';
+SET DEBUG_SYNC = 'RESET';
+# Restart cloned database
+# restart: --datadir=CLONE_DATADIR
+select STATE, ERROR_NO, length(BINLOG_FILE) > 0, length(GTID_EXECUTED) > 0,
+(BINLOG_POSITION > 0) from performance_schema.clone_status;
+STATE	ERROR_NO	length(BINLOG_FILE) > 0	length(GTID_EXECUTED) > 0	(BINLOG_POSITION > 0)
+Completed	0	1	0	1
+CALL execute_dml(3, 0, 1, 1, 1, 0);
+CALL execute_dml(0, 0, 10, 10, 10, 0);
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+SELECT count(*) from t1;
+count(*)
+10
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;
+col1	col2	col3
+9	90	Clone Test Row - 9
+8	80	Clone Test Row - 8
+7	70	Clone Test Row - 7
+6	60	Clone Test Row - 6
+5	50	Clone Test Row - 5
+4	40	Clone Test Row - 4
+3	30	Clone Test Row - 3
+2	20	Clone Test Row - 2
+1	10	Clone Test Row - 1
+0	0	Clone Test Row - 0
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+SELECT count(*) from t2;
+count(*)
+10
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;
+col1	col2	col3
+9	90	Clone Test Row - 9
+8	80	Clone Test Row - 8
+7	70	Clone Test Row - 7
+6	60	Clone Test Row - 6
+5	50	Clone Test Row - 5
+4	40	Clone Test Row - 4
+3	30	Clone Test Row - 3
+2	20	Clone Test Row - 2
+1	10	Clone Test Row - 1
+0	0	Clone Test Row - 0
+# Cleanup
+# restart:
+DROP TABLE t1;
+DROP TABLE t2;
+DROP PROCEDURE execute_dml;
+# Uninstall clone
+UNINSTALL PLUGIN clone;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/ddl_undo_encrypt.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/ddl_undo_encrypt.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/ddl_undo_encrypt.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/ddl_undo_encrypt.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,900 @@
+# Prepare for creating Encrypted Table
+# create bootstrap file
+# Create and start mysqld with keyring plugin.
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+SET GLOBAL innodb_undo_log_encrypt = ON;
+SHOW VARIABLES LIKE 'innodb_undo_log_encrypt';
+Variable_name	Value
+innodb_undo_log_encrypt	ON
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+PARTITION BY KEY(col1) PARTITIONS 5;
+CREATE PROCEDURE execute_dml(
+p_dml_type	INT,
+p_key_min	INT,
+p_key_range	INT,
+p_loop_count	INT,
+p_frequency	INT,
+p_is_rand	INT)
+BEGIN
+DECLARE v_idx		INT DEFAULT 0;
+DECLARE v_commit	INT DEFAULT 0;
+DECLARE v_key		INT DEFAULT 0;
+/* Loop and INSERT data at random position */
+WHILE(v_idx < p_loop_count) DO
+/* Generate key between 1 to p_loop_count */
+IF p_is_rand = 1 THEN
+SET v_key = p_key_min + FLOOR(RAND() * p_key_range);
+ELSE
+SET v_key = p_key_min + (v_idx  % p_key_range);
+END IF;
+CASE p_dml_type
+WHEN 0 THEN
+SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+WHEN 1 THEN
+UPDATE t1 SET col2 = v_idx + 1 WHERE col1 = v_key;
+UPDATE t2 SET col2 = v_idx + 1 WHERE col1 = v_key;
+WHEN 2 THEN
+DELETE FROM t1 WHERE col1 = v_key;
+DELETE FROM t2 WHERE col1 = v_key;
+ELSE
+DELETE FROM t1;
+DELETE FROM t2;
+END CASE;
+SET v_idx = v_idx + 1;
+/* Commit or rollback work at specified frequency. */
+IF v_idx % p_frequency = 0 THEN
+SET v_commit = FLOOR(RAND() * 2);
+IF v_commit = 0 AND p_is_rand = 1 THEN
+ROLLBACK;
+START TRANSACTION;
+ELSE
+COMMIT;
+START TRANSACTION;
+END IF;
+END IF;
+END WHILE;
+COMMIT;
+END|
+call execute_dml(0, 0, 100, 100, 10, 0);
+CREATE TABLE t SELECT * FROM t1;
+CREATE TABLE t0 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t01 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t3 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t11 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t21 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+INSERT INTO t11 SELECT * FROM t;
+INSERT INTO t21 SELECT * FROM t;
+SHOW VARIABLES LIKE 'clone_ddl_timeout';
+Variable_name	Value
+clone_ddl_timeout	300
+SHOW VARIABLES LIKE 'clone_block_ddl';
+Variable_name	Value
+clone_block_ddl	OFF
+# 1. CREATE UNDO TABLESPACE while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,local_release_clone_file_pin';
+SET GLOBAL DEBUG = '+d,log_redo_with_invalid_master_key';
+CREATE UNDO TABLESPACE undo_00 ADD DATAFILE 'undo_00.ibu';
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+# Waiting for clone to reach 'Initial metadata transfer'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_init';
+# Wait finished
+CREATE UNDO TABLESPACE undo_001 ADD DATAFILE 'undo_001.ibu';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+CREATE UNDO TABLESPACE undo_01 ADD DATAFILE 'undo_01.ibu';
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+# Waiting for clone to reach DDL metadata for 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_meta';
+# Wait finished
+CREATE UNDO TABLESPACE undo_011 ADD DATAFILE 'undo_011.ibu';
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+CREATE UNDO TABLESPACE undo_02 ADD DATAFILE 'undo_02.ibu';
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach DDL metadata for 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page_meta';
+# Wait finished
+CREATE UNDO TABLESPACE undo_021 ADD DATAFILE 'undo_021.ibu';
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page_meta';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+CREATE UNDO TABLESPACE undo_03 ADD DATAFILE 'undo_03.ibu';
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,local_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	3	Clone Test Row - 0
+1	13	Clone Test Row - 1
+2	23	Clone Test Row - 2
+3	33	Clone Test Row - 3
+4	43	Clone Test Row - 4
+5	53	Clone Test Row - 5
+6	63	Clone Test Row - 6
+7	73	Clone Test Row - 7
+8	83	Clone Test Row - 8
+9	93	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	993	Clone Test Row - 99
+98	983	Clone Test Row - 98
+97	973	Clone Test Row - 97
+96	963	Clone Test Row - 96
+95	953	Clone Test Row - 95
+94	943	Clone Test Row - 94
+93	933	Clone Test Row - 93
+92	923	Clone Test Row - 92
+91	913	Clone Test Row - 91
+90	903	Clone Test Row - 90
+SELECT NAME, SPACE_TYPE, STATE
+FROM INFORMATION_SCHEMA.INNODB_TABLESPACES
+WHERE SPACE_TYPE = 'Undo'
+    ORDER BY NAME;
+NAME	SPACE_TYPE	STATE
+innodb_undo_001	Undo	active
+innodb_undo_002	Undo	active
+undo_00	Undo	active
+undo_001	Undo	active
+undo_01	Undo	active
+undo_011	Undo	active
+undo_02	Undo	active
+SELECT TABLESPACE_NAME, FILE_NAME, FILE_TYPE, ENGINE
+FROM INFORMATION_SCHEMA.FILES
+WHERE FILE_NAME LIKE '%undo_0%'
+    ORDER BY TABLESPACE_NAME;
+TABLESPACE_NAME	FILE_NAME	FILE_TYPE	ENGINE
+innodb_undo_001	./undo_001	UNDO LOG	InnoDB
+innodb_undo_002	./undo_002	UNDO LOG	InnoDB
+undo_00	./undo_00.ibu	UNDO LOG	InnoDB
+undo_001	./undo_001.ibu	UNDO LOG	InnoDB
+undo_01	./undo_01.ibu	UNDO LOG	InnoDB
+undo_011	./undo_011.ibu	UNDO LOG	InnoDB
+undo_02	./undo_02.ibu	UNDO LOG	InnoDB
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+SELECT NAME, SPACE_TYPE, STATE
+FROM INFORMATION_SCHEMA.INNODB_TABLESPACES
+WHERE SPACE_TYPE = 'Undo'
+    ORDER BY NAME;
+NAME	SPACE_TYPE	STATE
+innodb_undo_001	Undo	active
+innodb_undo_002	Undo	active
+undo_00	Undo	active
+undo_001	Undo	active
+undo_01	Undo	active
+undo_011	Undo	active
+undo_02	Undo	active
+SELECT TABLESPACE_NAME, FILE_NAME, FILE_TYPE, ENGINE
+FROM INFORMATION_SCHEMA.FILES
+WHERE FILE_NAME LIKE '%undo_0%'
+    ORDER BY TABLESPACE_NAME;
+TABLESPACE_NAME	FILE_NAME	FILE_TYPE	ENGINE
+innodb_undo_001	./undo_001	UNDO LOG	InnoDB
+innodb_undo_002	./undo_002	UNDO LOG	InnoDB
+undo_00	./undo_00.ibu	UNDO LOG	InnoDB
+undo_001	./undo_001.ibu	UNDO LOG	InnoDB
+undo_01	./undo_01.ibu	UNDO LOG	InnoDB
+undo_011	./undo_011.ibu	UNDO LOG	InnoDB
+undo_02	./undo_02.ibu	UNDO LOG	InnoDB
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	3	Clone Test Row - 0
+1	13	Clone Test Row - 1
+2	23	Clone Test Row - 2
+3	33	Clone Test Row - 3
+4	43	Clone Test Row - 4
+5	53	Clone Test Row - 5
+6	63	Clone Test Row - 6
+7	73	Clone Test Row - 7
+8	83	Clone Test Row - 8
+9	93	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	993	Clone Test Row - 99
+98	983	Clone Test Row - 98
+97	973	Clone Test Row - 97
+96	963	Clone Test Row - 96
+95	953	Clone Test Row - 95
+94	943	Clone Test Row - 94
+93	933	Clone Test Row - 93
+92	923	Clone Test Row - 92
+91	913	Clone Test Row - 91
+90	903	Clone Test Row - 90
+SELECT NAME, SPACE_TYPE, STATE
+FROM INFORMATION_SCHEMA.INNODB_TABLESPACES
+WHERE SPACE_TYPE = 'Undo'
+    ORDER BY NAME;
+NAME	SPACE_TYPE	STATE
+innodb_undo_001	Undo	active
+innodb_undo_002	Undo	active
+undo_00	Undo	active
+undo_001	Undo	active
+undo_01	Undo	active
+undo_011	Undo	active
+undo_02	Undo	active
+SELECT TABLESPACE_NAME, FILE_NAME, FILE_TYPE, ENGINE
+FROM INFORMATION_SCHEMA.FILES
+WHERE FILE_NAME LIKE '%undo_0%'
+    ORDER BY TABLESPACE_NAME;
+TABLESPACE_NAME	FILE_NAME	FILE_TYPE	ENGINE
+innodb_undo_001	./undo_001	UNDO LOG	InnoDB
+innodb_undo_002	./undo_002	UNDO LOG	InnoDB
+undo_00	./undo_00.ibu	UNDO LOG	InnoDB
+undo_001	./undo_001.ibu	UNDO LOG	InnoDB
+undo_01	./undo_01.ibu	UNDO LOG	InnoDB
+undo_011	./undo_011.ibu	UNDO LOG	InnoDB
+undo_02	./undo_02.ibu	UNDO LOG	InnoDB
+CALL execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+SET GLOBAL innodb_undo_log_encrypt = ON;
+SHOW VARIABLES LIKE 'innodb_undo_log_encrypt';
+Variable_name	Value
+innodb_undo_log_encrypt	ON
+SET DEBUG_SYNC = 'RESET';
+# 2. TRUNCATE UNDO TABLESPACE while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,local_release_clone_file_pin';
+SET GLOBAL DEBUG = '+d,log_redo_with_invalid_master_key';
+ALTER UNDO TABLESPACE undo_00 SET INACTIVE ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+# Waiting for clone to reach 'Initial metadata transfer'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_init';
+# Wait finished
+ALTER UNDO TABLESPACE undo_001 SET INACTIVE ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+ALTER UNDO TABLESPACE undo_01 SET INACTIVE ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+# Waiting for clone to reach DDL metadata for 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_meta';
+# Wait finished
+ALTER UNDO TABLESPACE undo_011 SET INACTIVE ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+ALTER UNDO TABLESPACE undo_02 SET INACTIVE ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach DDL metadata for 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page_meta';
+# Wait finished
+ALTER UNDO TABLESPACE undo_021 SET INACTIVE ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page_meta';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER UNDO TABLESPACE undo_03 SET INACTIVE ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,local_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	7	Clone Test Row - 0
+1	17	Clone Test Row - 1
+2	27	Clone Test Row - 2
+3	37	Clone Test Row - 3
+4	47	Clone Test Row - 4
+5	57	Clone Test Row - 5
+6	67	Clone Test Row - 6
+7	77	Clone Test Row - 7
+8	87	Clone Test Row - 8
+9	97	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	997	Clone Test Row - 99
+98	987	Clone Test Row - 98
+97	977	Clone Test Row - 97
+96	967	Clone Test Row - 96
+95	957	Clone Test Row - 95
+94	947	Clone Test Row - 94
+93	937	Clone Test Row - 93
+92	927	Clone Test Row - 92
+91	917	Clone Test Row - 91
+90	907	Clone Test Row - 90
+SELECT NAME, SPACE_TYPE, STATE
+FROM INFORMATION_SCHEMA.INNODB_TABLESPACES
+WHERE SPACE_TYPE = 'Undo'
+    ORDER BY NAME;
+NAME	SPACE_TYPE	STATE
+innodb_undo_001	Undo	active
+innodb_undo_002	Undo	active
+undo_00	Undo	empty
+undo_001	Undo	empty
+undo_01	Undo	empty
+undo_011	Undo	empty
+undo_02	Undo	empty
+undo_021	Undo	active
+undo_03	Undo	active
+SELECT TABLESPACE_NAME, FILE_NAME, FILE_TYPE, ENGINE
+FROM INFORMATION_SCHEMA.FILES
+WHERE FILE_NAME LIKE '%undo_0%'
+    ORDER BY TABLESPACE_NAME;
+TABLESPACE_NAME	FILE_NAME	FILE_TYPE	ENGINE
+innodb_undo_001	./undo_001	UNDO LOG	InnoDB
+innodb_undo_002	./undo_002	UNDO LOG	InnoDB
+undo_00	./undo_00.ibu	UNDO LOG	InnoDB
+undo_001	./undo_001.ibu	UNDO LOG	InnoDB
+undo_01	./undo_01.ibu	UNDO LOG	InnoDB
+undo_011	./undo_011.ibu	UNDO LOG	InnoDB
+undo_02	./undo_02.ibu	UNDO LOG	InnoDB
+undo_021	./undo_021.ibu	UNDO LOG	InnoDB
+undo_03	./undo_03.ibu	UNDO LOG	InnoDB
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+SELECT NAME, SPACE_TYPE, STATE
+FROM INFORMATION_SCHEMA.INNODB_TABLESPACES
+WHERE SPACE_TYPE = 'Undo'
+    ORDER BY NAME;
+NAME	SPACE_TYPE	STATE
+innodb_undo_001	Undo	active
+innodb_undo_002	Undo	active
+undo_00	Undo	empty
+undo_001	Undo	empty
+undo_01	Undo	empty
+undo_011	Undo	empty
+undo_02	Undo	empty
+undo_021	Undo	active
+undo_03	Undo	active
+SELECT TABLESPACE_NAME, FILE_NAME, FILE_TYPE, ENGINE
+FROM INFORMATION_SCHEMA.FILES
+WHERE FILE_NAME LIKE '%undo_0%'
+    ORDER BY TABLESPACE_NAME;
+TABLESPACE_NAME	FILE_NAME	FILE_TYPE	ENGINE
+innodb_undo_001	./undo_001	UNDO LOG	InnoDB
+innodb_undo_002	./undo_002	UNDO LOG	InnoDB
+undo_00	./undo_00.ibu	UNDO LOG	InnoDB
+undo_001	./undo_001.ibu	UNDO LOG	InnoDB
+undo_01	./undo_01.ibu	UNDO LOG	InnoDB
+undo_011	./undo_011.ibu	UNDO LOG	InnoDB
+undo_02	./undo_02.ibu	UNDO LOG	InnoDB
+undo_021	./undo_021.ibu	UNDO LOG	InnoDB
+undo_03	./undo_03.ibu	UNDO LOG	InnoDB
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	7	Clone Test Row - 0
+1	17	Clone Test Row - 1
+2	27	Clone Test Row - 2
+3	37	Clone Test Row - 3
+4	47	Clone Test Row - 4
+5	57	Clone Test Row - 5
+6	67	Clone Test Row - 6
+7	77	Clone Test Row - 7
+8	87	Clone Test Row - 8
+9	97	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	997	Clone Test Row - 99
+98	987	Clone Test Row - 98
+97	977	Clone Test Row - 97
+96	967	Clone Test Row - 96
+95	957	Clone Test Row - 95
+94	947	Clone Test Row - 94
+93	937	Clone Test Row - 93
+92	927	Clone Test Row - 92
+91	917	Clone Test Row - 91
+90	907	Clone Test Row - 90
+SELECT NAME, SPACE_TYPE, STATE
+FROM INFORMATION_SCHEMA.INNODB_TABLESPACES
+WHERE SPACE_TYPE = 'Undo'
+    ORDER BY NAME;
+NAME	SPACE_TYPE	STATE
+innodb_undo_001	Undo	active
+innodb_undo_002	Undo	active
+undo_00	Undo	empty
+undo_001	Undo	empty
+undo_01	Undo	empty
+undo_011	Undo	empty
+undo_02	Undo	empty
+undo_021	Undo	active
+undo_03	Undo	active
+SELECT TABLESPACE_NAME, FILE_NAME, FILE_TYPE, ENGINE
+FROM INFORMATION_SCHEMA.FILES
+WHERE FILE_NAME LIKE '%undo_0%'
+    ORDER BY TABLESPACE_NAME;
+TABLESPACE_NAME	FILE_NAME	FILE_TYPE	ENGINE
+innodb_undo_001	./undo_001	UNDO LOG	InnoDB
+innodb_undo_002	./undo_002	UNDO LOG	InnoDB
+undo_00	./undo_00.ibu	UNDO LOG	InnoDB
+undo_001	./undo_001.ibu	UNDO LOG	InnoDB
+undo_01	./undo_01.ibu	UNDO LOG	InnoDB
+undo_011	./undo_011.ibu	UNDO LOG	InnoDB
+undo_02	./undo_02.ibu	UNDO LOG	InnoDB
+undo_021	./undo_021.ibu	UNDO LOG	InnoDB
+undo_03	./undo_03.ibu	UNDO LOG	InnoDB
+CALL execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+SET GLOBAL innodb_undo_log_encrypt = ON;
+SHOW VARIABLES LIKE 'innodb_undo_log_encrypt';
+Variable_name	Value
+innodb_undo_log_encrypt	ON
+SET DEBUG_SYNC = 'RESET';
+# 3. DROP UNDO TABLESPACE while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,local_release_clone_file_pin';
+SET GLOBAL DEBUG = '+d,log_redo_with_invalid_master_key';
+DROP UNDO TABLESPACE undo_00  ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+# Waiting for clone to reach 'Initial metadata transfer'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_init';
+# Wait finished
+DROP UNDO TABLESPACE undo_001  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+DROP UNDO TABLESPACE undo_01  ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+# Waiting for clone to reach DDL metadata for 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_meta';
+# Wait finished
+DROP UNDO TABLESPACE undo_011  ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+DROP UNDO TABLESPACE undo_02  ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach DDL metadata for 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page_meta';
+# Wait finished
+DROP UNDO TABLESPACE undo_021  ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page_meta';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+DROP UNDO TABLESPACE undo_03  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,local_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	11	Clone Test Row - 0
+1	21	Clone Test Row - 1
+2	31	Clone Test Row - 2
+3	41	Clone Test Row - 3
+4	51	Clone Test Row - 4
+5	61	Clone Test Row - 5
+6	71	Clone Test Row - 6
+7	81	Clone Test Row - 7
+8	91	Clone Test Row - 8
+9	101	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	1001	Clone Test Row - 99
+98	991	Clone Test Row - 98
+97	981	Clone Test Row - 97
+96	971	Clone Test Row - 96
+95	961	Clone Test Row - 95
+94	951	Clone Test Row - 94
+93	941	Clone Test Row - 93
+92	931	Clone Test Row - 92
+91	921	Clone Test Row - 91
+90	911	Clone Test Row - 90
+SELECT NAME, SPACE_TYPE, STATE
+FROM INFORMATION_SCHEMA.INNODB_TABLESPACES
+WHERE SPACE_TYPE = 'Undo'
+    ORDER BY NAME;
+NAME	SPACE_TYPE	STATE
+innodb_undo_001	Undo	active
+innodb_undo_002	Undo	active
+undo_021	Undo	empty
+undo_03	Undo	empty
+SELECT TABLESPACE_NAME, FILE_NAME, FILE_TYPE, ENGINE
+FROM INFORMATION_SCHEMA.FILES
+WHERE FILE_NAME LIKE '%undo_0%'
+    ORDER BY TABLESPACE_NAME;
+TABLESPACE_NAME	FILE_NAME	FILE_TYPE	ENGINE
+innodb_undo_001	./undo_001	UNDO LOG	InnoDB
+innodb_undo_002	./undo_002	UNDO LOG	InnoDB
+undo_021	./undo_021.ibu	UNDO LOG	InnoDB
+undo_03	./undo_03.ibu	UNDO LOG	InnoDB
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+SELECT NAME, SPACE_TYPE, STATE
+FROM INFORMATION_SCHEMA.INNODB_TABLESPACES
+WHERE SPACE_TYPE = 'Undo'
+    ORDER BY NAME;
+NAME	SPACE_TYPE	STATE
+innodb_undo_001	Undo	active
+innodb_undo_002	Undo	active
+undo_021	Undo	empty
+undo_03	Undo	empty
+SELECT TABLESPACE_NAME, FILE_NAME, FILE_TYPE, ENGINE
+FROM INFORMATION_SCHEMA.FILES
+WHERE FILE_NAME LIKE '%undo_0%'
+    ORDER BY TABLESPACE_NAME;
+TABLESPACE_NAME	FILE_NAME	FILE_TYPE	ENGINE
+innodb_undo_001	./undo_001	UNDO LOG	InnoDB
+innodb_undo_002	./undo_002	UNDO LOG	InnoDB
+undo_021	./undo_021.ibu	UNDO LOG	InnoDB
+undo_03	./undo_03.ibu	UNDO LOG	InnoDB
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	11	Clone Test Row - 0
+1	21	Clone Test Row - 1
+2	31	Clone Test Row - 2
+3	41	Clone Test Row - 3
+4	51	Clone Test Row - 4
+5	61	Clone Test Row - 5
+6	71	Clone Test Row - 6
+7	81	Clone Test Row - 7
+8	91	Clone Test Row - 8
+9	101	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	1001	Clone Test Row - 99
+98	991	Clone Test Row - 98
+97	981	Clone Test Row - 97
+96	971	Clone Test Row - 96
+95	961	Clone Test Row - 95
+94	951	Clone Test Row - 94
+93	941	Clone Test Row - 93
+92	931	Clone Test Row - 92
+91	921	Clone Test Row - 91
+90	911	Clone Test Row - 90
+SELECT NAME, SPACE_TYPE, STATE
+FROM INFORMATION_SCHEMA.INNODB_TABLESPACES
+WHERE SPACE_TYPE = 'Undo'
+    ORDER BY NAME;
+NAME	SPACE_TYPE	STATE
+innodb_undo_001	Undo	active
+innodb_undo_002	Undo	active
+undo_021	Undo	empty
+undo_03	Undo	empty
+SELECT TABLESPACE_NAME, FILE_NAME, FILE_TYPE, ENGINE
+FROM INFORMATION_SCHEMA.FILES
+WHERE FILE_NAME LIKE '%undo_0%'
+    ORDER BY TABLESPACE_NAME;
+TABLESPACE_NAME	FILE_NAME	FILE_TYPE	ENGINE
+innodb_undo_001	./undo_001	UNDO LOG	InnoDB
+innodb_undo_002	./undo_002	UNDO LOG	InnoDB
+undo_021	./undo_021.ibu	UNDO LOG	InnoDB
+undo_03	./undo_03.ibu	UNDO LOG	InnoDB
+CALL execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+SET GLOBAL innodb_undo_log_encrypt = ON;
+SHOW VARIABLES LIKE 'innodb_undo_log_encrypt';
+Variable_name	Value
+innodb_undo_log_encrypt	ON
+SET DEBUG_SYNC = 'RESET';
+# Cleanup
+DROP TABLE t;
+DROP TABLE t1;
+DROP TABLE t2;
+DROP PROCEDURE execute_dml;
+DROP TABLE t0;
+DROP TABLE t01;
+DROP TABLE t3;
+DROP TABLE t11;
+DROP TABLE t21;
+# Uninstall clone
+UNINSTALL PLUGIN clone;
+# Restart server and remove encrypted data directory
+# restart:
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/ddl_undo.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/ddl_undo.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/ddl_undo.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/ddl_undo.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,875 @@
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+PARTITION BY KEY(col1) PARTITIONS 5;
+CREATE PROCEDURE execute_dml(
+p_dml_type	INT,
+p_key_min	INT,
+p_key_range	INT,
+p_loop_count	INT,
+p_frequency	INT,
+p_is_rand	INT)
+BEGIN
+DECLARE v_idx		INT DEFAULT 0;
+DECLARE v_commit	INT DEFAULT 0;
+DECLARE v_key		INT DEFAULT 0;
+/* Loop and INSERT data at random position */
+WHILE(v_idx < p_loop_count) DO
+/* Generate key between 1 to p_loop_count */
+IF p_is_rand = 1 THEN
+SET v_key = p_key_min + FLOOR(RAND() * p_key_range);
+ELSE
+SET v_key = p_key_min + (v_idx  % p_key_range);
+END IF;
+CASE p_dml_type
+WHEN 0 THEN
+SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+WHEN 1 THEN
+UPDATE t1 SET col2 = v_idx + 1 WHERE col1 = v_key;
+UPDATE t2 SET col2 = v_idx + 1 WHERE col1 = v_key;
+WHEN 2 THEN
+DELETE FROM t1 WHERE col1 = v_key;
+DELETE FROM t2 WHERE col1 = v_key;
+ELSE
+DELETE FROM t1;
+DELETE FROM t2;
+END CASE;
+SET v_idx = v_idx + 1;
+/* Commit or rollback work at specified frequency. */
+IF v_idx % p_frequency = 0 THEN
+SET v_commit = FLOOR(RAND() * 2);
+IF v_commit = 0 AND p_is_rand = 1 THEN
+ROLLBACK;
+START TRANSACTION;
+ELSE
+COMMIT;
+START TRANSACTION;
+END IF;
+END IF;
+END WHILE;
+COMMIT;
+END|
+call execute_dml(0, 0, 100, 100, 10, 0);
+CREATE TABLE t SELECT * FROM t1;
+CREATE TABLE t0 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t01 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t3 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t11 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t21 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+INSERT INTO t11 SELECT * FROM t;
+INSERT INTO t21 SELECT * FROM t;
+SHOW VARIABLES LIKE 'clone_ddl_timeout';
+Variable_name	Value
+clone_ddl_timeout	300
+SHOW VARIABLES LIKE 'clone_block_ddl';
+Variable_name	Value
+clone_block_ddl	OFF
+# 1. CREATE UNDO TABLESPACE while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,local_release_clone_file_pin';
+CREATE UNDO TABLESPACE undo_00 ADD DATAFILE 'undo_00.ibu';
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+# Waiting for clone to reach 'Initial metadata transfer'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_init';
+# Wait finished
+CREATE UNDO TABLESPACE undo_001 ADD DATAFILE 'undo_001.ibu';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+CREATE UNDO TABLESPACE undo_01 ADD DATAFILE 'undo_01.ibu';
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+# Waiting for clone to reach DDL metadata for 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_meta';
+# Wait finished
+CREATE UNDO TABLESPACE undo_011 ADD DATAFILE 'undo_011.ibu';
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+CREATE UNDO TABLESPACE undo_02 ADD DATAFILE 'undo_02.ibu';
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach DDL metadata for 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page_meta';
+# Wait finished
+CREATE UNDO TABLESPACE undo_021 ADD DATAFILE 'undo_021.ibu';
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page_meta';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+CREATE UNDO TABLESPACE undo_03 ADD DATAFILE 'undo_03.ibu';
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,local_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	3	Clone Test Row - 0
+1	13	Clone Test Row - 1
+2	23	Clone Test Row - 2
+3	33	Clone Test Row - 3
+4	43	Clone Test Row - 4
+5	53	Clone Test Row - 5
+6	63	Clone Test Row - 6
+7	73	Clone Test Row - 7
+8	83	Clone Test Row - 8
+9	93	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	993	Clone Test Row - 99
+98	983	Clone Test Row - 98
+97	973	Clone Test Row - 97
+96	963	Clone Test Row - 96
+95	953	Clone Test Row - 95
+94	943	Clone Test Row - 94
+93	933	Clone Test Row - 93
+92	923	Clone Test Row - 92
+91	913	Clone Test Row - 91
+90	903	Clone Test Row - 90
+SELECT NAME, SPACE_TYPE, STATE
+FROM INFORMATION_SCHEMA.INNODB_TABLESPACES
+WHERE SPACE_TYPE = 'Undo'
+    ORDER BY NAME;
+NAME	SPACE_TYPE	STATE
+innodb_undo_001	Undo	active
+innodb_undo_002	Undo	active
+undo_00	Undo	active
+undo_001	Undo	active
+undo_01	Undo	active
+undo_011	Undo	active
+undo_02	Undo	active
+SELECT TABLESPACE_NAME, FILE_NAME, FILE_TYPE, ENGINE
+FROM INFORMATION_SCHEMA.FILES
+WHERE FILE_NAME LIKE '%undo_0%'
+    ORDER BY TABLESPACE_NAME;
+TABLESPACE_NAME	FILE_NAME	FILE_TYPE	ENGINE
+innodb_undo_001	./undo_001	UNDO LOG	InnoDB
+innodb_undo_002	./undo_002	UNDO LOG	InnoDB
+undo_00	./undo_00.ibu	UNDO LOG	InnoDB
+undo_001	./undo_001.ibu	UNDO LOG	InnoDB
+undo_01	./undo_01.ibu	UNDO LOG	InnoDB
+undo_011	./undo_011.ibu	UNDO LOG	InnoDB
+undo_02	./undo_02.ibu	UNDO LOG	InnoDB
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+SELECT NAME, SPACE_TYPE, STATE
+FROM INFORMATION_SCHEMA.INNODB_TABLESPACES
+WHERE SPACE_TYPE = 'Undo'
+    ORDER BY NAME;
+NAME	SPACE_TYPE	STATE
+innodb_undo_001	Undo	active
+innodb_undo_002	Undo	active
+undo_00	Undo	active
+undo_001	Undo	active
+undo_01	Undo	active
+undo_011	Undo	active
+undo_02	Undo	active
+SELECT TABLESPACE_NAME, FILE_NAME, FILE_TYPE, ENGINE
+FROM INFORMATION_SCHEMA.FILES
+WHERE FILE_NAME LIKE '%undo_0%'
+    ORDER BY TABLESPACE_NAME;
+TABLESPACE_NAME	FILE_NAME	FILE_TYPE	ENGINE
+innodb_undo_001	./undo_001	UNDO LOG	InnoDB
+innodb_undo_002	./undo_002	UNDO LOG	InnoDB
+undo_00	./undo_00.ibu	UNDO LOG	InnoDB
+undo_001	./undo_001.ibu	UNDO LOG	InnoDB
+undo_01	./undo_01.ibu	UNDO LOG	InnoDB
+undo_011	./undo_011.ibu	UNDO LOG	InnoDB
+undo_02	./undo_02.ibu	UNDO LOG	InnoDB
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	3	Clone Test Row - 0
+1	13	Clone Test Row - 1
+2	23	Clone Test Row - 2
+3	33	Clone Test Row - 3
+4	43	Clone Test Row - 4
+5	53	Clone Test Row - 5
+6	63	Clone Test Row - 6
+7	73	Clone Test Row - 7
+8	83	Clone Test Row - 8
+9	93	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	993	Clone Test Row - 99
+98	983	Clone Test Row - 98
+97	973	Clone Test Row - 97
+96	963	Clone Test Row - 96
+95	953	Clone Test Row - 95
+94	943	Clone Test Row - 94
+93	933	Clone Test Row - 93
+92	923	Clone Test Row - 92
+91	913	Clone Test Row - 91
+90	903	Clone Test Row - 90
+SELECT NAME, SPACE_TYPE, STATE
+FROM INFORMATION_SCHEMA.INNODB_TABLESPACES
+WHERE SPACE_TYPE = 'Undo'
+    ORDER BY NAME;
+NAME	SPACE_TYPE	STATE
+innodb_undo_001	Undo	active
+innodb_undo_002	Undo	active
+undo_00	Undo	active
+undo_001	Undo	active
+undo_01	Undo	active
+undo_011	Undo	active
+undo_02	Undo	active
+SELECT TABLESPACE_NAME, FILE_NAME, FILE_TYPE, ENGINE
+FROM INFORMATION_SCHEMA.FILES
+WHERE FILE_NAME LIKE '%undo_0%'
+    ORDER BY TABLESPACE_NAME;
+TABLESPACE_NAME	FILE_NAME	FILE_TYPE	ENGINE
+innodb_undo_001	./undo_001	UNDO LOG	InnoDB
+innodb_undo_002	./undo_002	UNDO LOG	InnoDB
+undo_00	./undo_00.ibu	UNDO LOG	InnoDB
+undo_001	./undo_001.ibu	UNDO LOG	InnoDB
+undo_01	./undo_01.ibu	UNDO LOG	InnoDB
+undo_011	./undo_011.ibu	UNDO LOG	InnoDB
+undo_02	./undo_02.ibu	UNDO LOG	InnoDB
+CALL execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# 2. TRUNCATE UNDO TABLESPACE while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,local_release_clone_file_pin';
+ALTER UNDO TABLESPACE undo_00 SET INACTIVE ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+# Waiting for clone to reach 'Initial metadata transfer'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_init';
+# Wait finished
+ALTER UNDO TABLESPACE undo_001 SET INACTIVE ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+ALTER UNDO TABLESPACE undo_01 SET INACTIVE ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+# Waiting for clone to reach DDL metadata for 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_meta';
+# Wait finished
+ALTER UNDO TABLESPACE undo_011 SET INACTIVE ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+ALTER UNDO TABLESPACE undo_02 SET INACTIVE ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach DDL metadata for 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page_meta';
+# Wait finished
+ALTER UNDO TABLESPACE undo_021 SET INACTIVE ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page_meta';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER UNDO TABLESPACE undo_03 SET INACTIVE ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,local_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	7	Clone Test Row - 0
+1	17	Clone Test Row - 1
+2	27	Clone Test Row - 2
+3	37	Clone Test Row - 3
+4	47	Clone Test Row - 4
+5	57	Clone Test Row - 5
+6	67	Clone Test Row - 6
+7	77	Clone Test Row - 7
+8	87	Clone Test Row - 8
+9	97	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	997	Clone Test Row - 99
+98	987	Clone Test Row - 98
+97	977	Clone Test Row - 97
+96	967	Clone Test Row - 96
+95	957	Clone Test Row - 95
+94	947	Clone Test Row - 94
+93	937	Clone Test Row - 93
+92	927	Clone Test Row - 92
+91	917	Clone Test Row - 91
+90	907	Clone Test Row - 90
+SELECT NAME, SPACE_TYPE, STATE
+FROM INFORMATION_SCHEMA.INNODB_TABLESPACES
+WHERE SPACE_TYPE = 'Undo'
+    ORDER BY NAME;
+NAME	SPACE_TYPE	STATE
+innodb_undo_001	Undo	active
+innodb_undo_002	Undo	active
+undo_00	Undo	empty
+undo_001	Undo	empty
+undo_01	Undo	empty
+undo_011	Undo	empty
+undo_02	Undo	empty
+undo_021	Undo	active
+undo_03	Undo	active
+SELECT TABLESPACE_NAME, FILE_NAME, FILE_TYPE, ENGINE
+FROM INFORMATION_SCHEMA.FILES
+WHERE FILE_NAME LIKE '%undo_0%'
+    ORDER BY TABLESPACE_NAME;
+TABLESPACE_NAME	FILE_NAME	FILE_TYPE	ENGINE
+innodb_undo_001	./undo_001	UNDO LOG	InnoDB
+innodb_undo_002	./undo_002	UNDO LOG	InnoDB
+undo_00	./undo_00.ibu	UNDO LOG	InnoDB
+undo_001	./undo_001.ibu	UNDO LOG	InnoDB
+undo_01	./undo_01.ibu	UNDO LOG	InnoDB
+undo_011	./undo_011.ibu	UNDO LOG	InnoDB
+undo_02	./undo_02.ibu	UNDO LOG	InnoDB
+undo_021	./undo_021.ibu	UNDO LOG	InnoDB
+undo_03	./undo_03.ibu	UNDO LOG	InnoDB
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+SELECT NAME, SPACE_TYPE, STATE
+FROM INFORMATION_SCHEMA.INNODB_TABLESPACES
+WHERE SPACE_TYPE = 'Undo'
+    ORDER BY NAME;
+NAME	SPACE_TYPE	STATE
+innodb_undo_001	Undo	active
+innodb_undo_002	Undo	active
+undo_00	Undo	empty
+undo_001	Undo	empty
+undo_01	Undo	empty
+undo_011	Undo	empty
+undo_02	Undo	empty
+undo_021	Undo	active
+undo_03	Undo	active
+SELECT TABLESPACE_NAME, FILE_NAME, FILE_TYPE, ENGINE
+FROM INFORMATION_SCHEMA.FILES
+WHERE FILE_NAME LIKE '%undo_0%'
+    ORDER BY TABLESPACE_NAME;
+TABLESPACE_NAME	FILE_NAME	FILE_TYPE	ENGINE
+innodb_undo_001	./undo_001	UNDO LOG	InnoDB
+innodb_undo_002	./undo_002	UNDO LOG	InnoDB
+undo_00	./undo_00.ibu	UNDO LOG	InnoDB
+undo_001	./undo_001.ibu	UNDO LOG	InnoDB
+undo_01	./undo_01.ibu	UNDO LOG	InnoDB
+undo_011	./undo_011.ibu	UNDO LOG	InnoDB
+undo_02	./undo_02.ibu	UNDO LOG	InnoDB
+undo_021	./undo_021.ibu	UNDO LOG	InnoDB
+undo_03	./undo_03.ibu	UNDO LOG	InnoDB
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	7	Clone Test Row - 0
+1	17	Clone Test Row - 1
+2	27	Clone Test Row - 2
+3	37	Clone Test Row - 3
+4	47	Clone Test Row - 4
+5	57	Clone Test Row - 5
+6	67	Clone Test Row - 6
+7	77	Clone Test Row - 7
+8	87	Clone Test Row - 8
+9	97	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	997	Clone Test Row - 99
+98	987	Clone Test Row - 98
+97	977	Clone Test Row - 97
+96	967	Clone Test Row - 96
+95	957	Clone Test Row - 95
+94	947	Clone Test Row - 94
+93	937	Clone Test Row - 93
+92	927	Clone Test Row - 92
+91	917	Clone Test Row - 91
+90	907	Clone Test Row - 90
+SELECT NAME, SPACE_TYPE, STATE
+FROM INFORMATION_SCHEMA.INNODB_TABLESPACES
+WHERE SPACE_TYPE = 'Undo'
+    ORDER BY NAME;
+NAME	SPACE_TYPE	STATE
+innodb_undo_001	Undo	active
+innodb_undo_002	Undo	active
+undo_00	Undo	empty
+undo_001	Undo	empty
+undo_01	Undo	empty
+undo_011	Undo	empty
+undo_02	Undo	empty
+undo_021	Undo	active
+undo_03	Undo	active
+SELECT TABLESPACE_NAME, FILE_NAME, FILE_TYPE, ENGINE
+FROM INFORMATION_SCHEMA.FILES
+WHERE FILE_NAME LIKE '%undo_0%'
+    ORDER BY TABLESPACE_NAME;
+TABLESPACE_NAME	FILE_NAME	FILE_TYPE	ENGINE
+innodb_undo_001	./undo_001	UNDO LOG	InnoDB
+innodb_undo_002	./undo_002	UNDO LOG	InnoDB
+undo_00	./undo_00.ibu	UNDO LOG	InnoDB
+undo_001	./undo_001.ibu	UNDO LOG	InnoDB
+undo_01	./undo_01.ibu	UNDO LOG	InnoDB
+undo_011	./undo_011.ibu	UNDO LOG	InnoDB
+undo_02	./undo_02.ibu	UNDO LOG	InnoDB
+undo_021	./undo_021.ibu	UNDO LOG	InnoDB
+undo_03	./undo_03.ibu	UNDO LOG	InnoDB
+CALL execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# 3. DROP UNDO TABLESPACE while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,local_release_clone_file_pin';
+DROP UNDO TABLESPACE undo_00  ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+# Waiting for clone to reach 'Initial metadata transfer'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_init';
+# Wait finished
+DROP UNDO TABLESPACE undo_001  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+DROP UNDO TABLESPACE undo_01  ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+# Waiting for clone to reach DDL metadata for 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_meta';
+# Wait finished
+DROP UNDO TABLESPACE undo_011  ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+DROP UNDO TABLESPACE undo_02  ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach DDL metadata for 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page_meta';
+# Wait finished
+DROP UNDO TABLESPACE undo_021  ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page_meta';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+DROP UNDO TABLESPACE undo_03  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,local_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	11	Clone Test Row - 0
+1	21	Clone Test Row - 1
+2	31	Clone Test Row - 2
+3	41	Clone Test Row - 3
+4	51	Clone Test Row - 4
+5	61	Clone Test Row - 5
+6	71	Clone Test Row - 6
+7	81	Clone Test Row - 7
+8	91	Clone Test Row - 8
+9	101	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	1001	Clone Test Row - 99
+98	991	Clone Test Row - 98
+97	981	Clone Test Row - 97
+96	971	Clone Test Row - 96
+95	961	Clone Test Row - 95
+94	951	Clone Test Row - 94
+93	941	Clone Test Row - 93
+92	931	Clone Test Row - 92
+91	921	Clone Test Row - 91
+90	911	Clone Test Row - 90
+SELECT NAME, SPACE_TYPE, STATE
+FROM INFORMATION_SCHEMA.INNODB_TABLESPACES
+WHERE SPACE_TYPE = 'Undo'
+    ORDER BY NAME;
+NAME	SPACE_TYPE	STATE
+innodb_undo_001	Undo	active
+innodb_undo_002	Undo	active
+undo_021	Undo	empty
+undo_03	Undo	empty
+SELECT TABLESPACE_NAME, FILE_NAME, FILE_TYPE, ENGINE
+FROM INFORMATION_SCHEMA.FILES
+WHERE FILE_NAME LIKE '%undo_0%'
+    ORDER BY TABLESPACE_NAME;
+TABLESPACE_NAME	FILE_NAME	FILE_TYPE	ENGINE
+innodb_undo_001	./undo_001	UNDO LOG	InnoDB
+innodb_undo_002	./undo_002	UNDO LOG	InnoDB
+undo_021	./undo_021.ibu	UNDO LOG	InnoDB
+undo_03	./undo_03.ibu	UNDO LOG	InnoDB
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+SELECT NAME, SPACE_TYPE, STATE
+FROM INFORMATION_SCHEMA.INNODB_TABLESPACES
+WHERE SPACE_TYPE = 'Undo'
+    ORDER BY NAME;
+NAME	SPACE_TYPE	STATE
+innodb_undo_001	Undo	active
+innodb_undo_002	Undo	active
+undo_021	Undo	empty
+undo_03	Undo	empty
+SELECT TABLESPACE_NAME, FILE_NAME, FILE_TYPE, ENGINE
+FROM INFORMATION_SCHEMA.FILES
+WHERE FILE_NAME LIKE '%undo_0%'
+    ORDER BY TABLESPACE_NAME;
+TABLESPACE_NAME	FILE_NAME	FILE_TYPE	ENGINE
+innodb_undo_001	./undo_001	UNDO LOG	InnoDB
+innodb_undo_002	./undo_002	UNDO LOG	InnoDB
+undo_021	./undo_021.ibu	UNDO LOG	InnoDB
+undo_03	./undo_03.ibu	UNDO LOG	InnoDB
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	11	Clone Test Row - 0
+1	21	Clone Test Row - 1
+2	31	Clone Test Row - 2
+3	41	Clone Test Row - 3
+4	51	Clone Test Row - 4
+5	61	Clone Test Row - 5
+6	71	Clone Test Row - 6
+7	81	Clone Test Row - 7
+8	91	Clone Test Row - 8
+9	101	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	1001	Clone Test Row - 99
+98	991	Clone Test Row - 98
+97	981	Clone Test Row - 97
+96	971	Clone Test Row - 96
+95	961	Clone Test Row - 95
+94	951	Clone Test Row - 94
+93	941	Clone Test Row - 93
+92	931	Clone Test Row - 92
+91	921	Clone Test Row - 91
+90	911	Clone Test Row - 90
+SELECT NAME, SPACE_TYPE, STATE
+FROM INFORMATION_SCHEMA.INNODB_TABLESPACES
+WHERE SPACE_TYPE = 'Undo'
+    ORDER BY NAME;
+NAME	SPACE_TYPE	STATE
+innodb_undo_001	Undo	active
+innodb_undo_002	Undo	active
+undo_021	Undo	empty
+undo_03	Undo	empty
+SELECT TABLESPACE_NAME, FILE_NAME, FILE_TYPE, ENGINE
+FROM INFORMATION_SCHEMA.FILES
+WHERE FILE_NAME LIKE '%undo_0%'
+    ORDER BY TABLESPACE_NAME;
+TABLESPACE_NAME	FILE_NAME	FILE_TYPE	ENGINE
+innodb_undo_001	./undo_001	UNDO LOG	InnoDB
+innodb_undo_002	./undo_002	UNDO LOG	InnoDB
+undo_021	./undo_021.ibu	UNDO LOG	InnoDB
+undo_03	./undo_03.ibu	UNDO LOG	InnoDB
+CALL execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# Cleanup
+DROP TABLE t;
+DROP TABLE t1;
+DROP TABLE t2;
+DROP PROCEDURE execute_dml;
+DROP TABLE t0;
+DROP TABLE t01;
+DROP TABLE t3;
+DROP TABLE t11;
+DROP TABLE t21;
+# Uninstall clone
+UNINSTALL PLUGIN clone;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/error_archival.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/error_archival.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/error_archival.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/error_archival.result	2021-09-28 11:46:34.000000000 +0000
@@ -27,10 +27,12 @@
 CASE p_dml_type
 WHEN 0 THEN
 SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
-INSERT INTO t1 VALUES(v_key, v_key * 10,
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
-INSERT INTO t2 VALUES(v_key, v_key * 10,
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
 WHEN 1 THEN
@@ -56,6 +58,7 @@
 END IF;
 END IF;
 END WHILE;
+COMMIT;
 END|
 call execute_dml(0, 0, 100, 100, 10, 0);
 SHOW CREATE TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/error_ddl_lock.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/error_ddl_lock.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/error_ddl_lock.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/error_ddl_lock.result	2021-09-28 11:46:34.000000000 +0000
@@ -3,8 +3,15 @@
 SHOW VARIABLES LIKE 'clone_ddl_timeout';
 Variable_name	Value
 clone_ddl_timeout	300
+SHOW VARIABLES LIKE 'clone_block_ddl';
+Variable_name	Value
+clone_block_ddl	OFF
 # Set backup lock timeout to 1 sec
+SET GLOBAL clone_block_ddl = true;
 SET GLOBAL clone_ddl_timeout = 1;
+SHOW VARIABLES LIKE 'clone_block_ddl';
+Variable_name	Value
+clone_block_ddl	ON
 SHOW VARIABLES LIKE 'clone_ddl_timeout';
 Variable_name	Value
 clone_ddl_timeout	1
@@ -14,7 +21,7 @@
 # In connection DEFAULT
 # 1A. Clone while CREATE TABLE in progress
 # In connection CON1
-SET DEBUG_SYNC = 'clone_marked_abort2 SIGNAL resume_clone WAIT_FOR resume_ddl';
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_clone WAIT_FOR resume_ddl';
 CREATE TABLE t1 (col1 INT PRIMARY KEY);
 # In connection DEFAULT
 SET DEBUG_SYNC = 'now WAIT_FOR resume_clone';
@@ -72,7 +79,7 @@
 Innodb_redo_log_enabled	ON
 # 1C. Clone while ALTER INSTANCE in progress
 # In connection CON1
-SET DEBUG_SYNC = 'clone_marked_abort2 SIGNAL resume_clone WAIT_FOR resume_ddl';
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_clone WAIT_FOR resume_ddl';
 ALTER INSTANCE DISABLE INNODB REDO_LOG;
 # In connection DEFAULT
 SET DEBUG_SYNC = 'now WAIT_FOR resume_clone';
@@ -107,7 +114,7 @@
 20
 30
 # In connection CON1
-SET DEBUG_SYNC = 'clone_marked_abort2 SIGNAL resume_clone WAIT_FOR resume_ddl';
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_clone WAIT_FOR resume_ddl';
 ALTER TABLE t1 ADD COLUMN col2 int, ALGORITHM=COPY;
 # In connection DEFAULT
 SET DEBUG_SYNC = 'now WAIT_FOR resume_clone';
@@ -162,7 +169,7 @@
 20	1020
 30	1030
 # In connection CON1
-SET DEBUG_SYNC = 'clone_marked_abort2 SIGNAL resume_clone WAIT_FOR resume_ddl';
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_clone WAIT_FOR resume_ddl';
 ALTER TABLE t1 ADD COLUMN col3 int, ALGORITHM=INPLACE;
 # In connection DEFAULT
 SET DEBUG_SYNC = 'now WAIT_FOR resume_clone';
@@ -221,7 +228,7 @@
   PRIMARY KEY (`col1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 # In connection CON1
-SET DEBUG_SYNC = 'clone_marked_abort2 SIGNAL resume_clone WAIT_FOR resume_ddl';
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_clone WAIT_FOR resume_ddl';
 ALTER TABLE t1 ADD INDEX col2_idx(col2), ALGORITHM=COPY;
 # In connection DEFAULT
 SET DEBUG_SYNC = 'now WAIT_FOR resume_clone';
@@ -276,7 +283,7 @@
   KEY `col2_idx` (`col2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 # In connection CON1
-SET DEBUG_SYNC = 'clone_marked_abort2 SIGNAL resume_clone WAIT_FOR resume_ddl';
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_clone WAIT_FOR resume_ddl';
 ALTER TABLE t1 ADD INDEX col3_idx(col3), ALGORITHM=INPLACE;
 # In connection DEFAULT
 SET DEBUG_SYNC = 'now WAIT_FOR resume_clone';
@@ -345,7 +352,7 @@
   KEY `col3_idx` (`col3`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 # In connection CON1
-SET DEBUG_SYNC = 'clone_marked_abort2 SIGNAL resume_clone WAIT_FOR resume_ddl';
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_clone WAIT_FOR resume_ddl';
 ALTER TABLE t1 DROP INDEX col3_idx, ALGORITHM=COPY;
 # In connection DEFAULT
 SET DEBUG_SYNC = 'now WAIT_FOR resume_clone';
@@ -400,7 +407,7 @@
   KEY `col2_idx` (`col2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 # In connection CON1
-SET DEBUG_SYNC = 'clone_marked_abort2 SIGNAL resume_clone WAIT_FOR resume_ddl';
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_clone WAIT_FOR resume_ddl';
 ALTER TABLE t1 DROP INDEX col2_idx, ALGORITHM=INPLACE;
 # In connection DEFAULT
 SET DEBUG_SYNC = 'now WAIT_FOR resume_clone';
@@ -450,7 +457,7 @@
 20	1020	2020
 30	1030	2030
 # In connection CON1
-SET DEBUG_SYNC = 'clone_marked_abort2 SIGNAL resume_clone WAIT_FOR resume_ddl';
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_clone WAIT_FOR resume_ddl';
 TRUNCATE TABLE t1;
 # In connection DEFAULT
 SET DEBUG_SYNC = 'now WAIT_FOR resume_clone';
@@ -497,7 +504,7 @@
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 # 6B. Clone while DROP TABLE in progress
 # In connection CON1
-SET DEBUG_SYNC = 'clone_marked_abort2 SIGNAL resume_clone WAIT_FOR resume_ddl';
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_clone WAIT_FOR resume_ddl';
 DROP TABLE t1;
 # In connection DEFAULT
 SET DEBUG_SYNC = 'now WAIT_FOR resume_clone';
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/error_ddl_notification.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/error_ddl_notification.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/error_ddl_notification.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/error_ddl_notification.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,213 @@
+# Prepare for creating Encrypted Table
+# create bootstrap file
+# Create and start mysqld with keyring plugin.
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+ENCRYPTION = 'Y';
+CREATE UNDO TABLESPACE undo_02 ADD DATAFILE 'undo_02.ibu';
+ALTER UNDO TABLESPACE undo_02 SET INACTIVE;
+SET DEBUG_SYNC = 'clone_state_transit_file_copy SIGNAL start_ddl WAIT_FOR resume_clone_file';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_inplace WAIT_FOR resume_clone_page';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+# In connection CON2
+# Waiting for clone to reach state transition
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl';
+# Wait finished
+# 1. CREATE TABLE
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL kill_ddl';
+CREATE TABLE t3(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+# In connection CON1
+# Waiting for DDL to reach notification
+SET DEBUG_SYNC = 'now WAIT_FOR kill_ddl';
+# Wait finished
+KILL QUERY CON_ID;
+# In connection CON2
+# Waiting for DDL to exit with error
+ERROR 70100: Query execution was interrupted
+# Query should no longer be interrupted and should pass
+# Wait finished
+SET DEBUG_SYNC = 'RESET';
+# 2A. ALTER TABLE COPY
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL kill_ddl';
+ALTER TABLE t1 ADD INDEX col2_idx(col2), ALGORITHM = COPY;
+# In connection CON1
+# Waiting for DDL to reach notification
+SET DEBUG_SYNC = 'now WAIT_FOR kill_ddl';
+# Wait finished
+KILL QUERY CON_ID;
+# In connection CON2
+# Waiting for DDL to exit with error
+ERROR 70100: Query execution was interrupted
+# Query should no longer be interrupted and should pass
+# Wait finished
+SET DEBUG_SYNC = 'RESET';
+# 2B. ALTER TABLE IN PLACE
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL kill_ddl';
+ALTER TABLE t1 ADD INDEX col2_idx(col2), ALGORITHM = INPLACE;
+# In connection CON1
+# Waiting for DDL to reach notification
+SET DEBUG_SYNC = 'now WAIT_FOR kill_ddl';
+# Wait finished
+KILL QUERY CON_ID;
+# In connection CON2
+# Waiting for DDL to exit with error
+ERROR 70100: Query execution was interrupted
+# Query should no longer be interrupted and should pass
+# Wait finished
+SET DEBUG_SYNC = 'RESET';
+# 3. ALTER TABLE RENAME
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL kill_ddl';
+ALTER TABLE t1 RENAME t3;
+# In connection CON1
+# Waiting for DDL to reach notification
+SET DEBUG_SYNC = 'now WAIT_FOR kill_ddl';
+# Wait finished
+KILL QUERY CON_ID;
+# In connection CON2
+# Waiting for DDL to exit with error
+ERROR 70100: Query execution was interrupted
+# Query should no longer be interrupted and should pass
+# Wait finished
+SET DEBUG_SYNC = 'RESET';
+# 4. TRUNCATE TABLE
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL kill_ddl';
+TRUNCATE TABLE t1;
+# In connection CON1
+# Waiting for DDL to reach notification
+SET DEBUG_SYNC = 'now WAIT_FOR kill_ddl';
+# Wait finished
+KILL QUERY CON_ID;
+# In connection CON2
+# Waiting for DDL to exit with error
+ERROR 70100: Query execution was interrupted
+# Query should no longer be interrupted and should pass
+# Wait finished
+SET DEBUG_SYNC = 'RESET';
+# 5A. ALTER ENABLE Encryption
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL kill_ddl';
+ALTER TABLE t1 ENCRYPTION = "Y";
+# In connection CON1
+# Waiting for DDL to reach notification
+SET DEBUG_SYNC = 'now WAIT_FOR kill_ddl';
+# Wait finished
+KILL QUERY CON_ID;
+# In connection CON2
+# Waiting for DDL to exit with error
+ERROR 70100: Query execution was interrupted
+# Query should no longer be interrupted and should pass
+# Wait finished
+SET DEBUG_SYNC = 'RESET';
+# 5B. ALTER DISABLE ENCRYPTION
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL kill_ddl';
+ALTER TABLE t2 ENCRYPTION = "N";
+# In connection CON1
+# Waiting for DDL to reach notification
+SET DEBUG_SYNC = 'now WAIT_FOR kill_ddl';
+# Wait finished
+KILL QUERY CON_ID;
+# In connection CON2
+# Waiting for DDL to exit with error
+ERROR 70100: Query execution was interrupted
+# Query should no longer be interrupted and should pass
+# Wait finished
+SET DEBUG_SYNC = 'RESET';
+# 6. CREATE UNDO TABLESPACE
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL kill_ddl';
+CREATE UNDO TABLESPACE undo_01 ADD DATAFILE 'undo_01.ibu';
+# In connection CON1
+# Waiting for DDL to reach notification
+SET DEBUG_SYNC = 'now WAIT_FOR kill_ddl';
+# Wait finished
+KILL QUERY CON_ID;
+# In connection CON2
+# Waiting for DDL to exit with error
+ERROR 70100: Query execution was interrupted
+# Query should no longer be interrupted and should pass
+# Wait finished
+SET DEBUG_SYNC = 'RESET';
+# 7A. ENABLE REDO ENCRYPTION
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL kill_ddl';
+SET GLOBAL innodb_redo_log_encrypt = ON;
+# In connection CON1
+# Waiting for DDL to reach notification
+SET DEBUG_SYNC = 'now WAIT_FOR kill_ddl';
+# Wait finished
+KILL QUERY CON_ID;
+# In connection CON2
+# Waiting for DDL to exit with error
+ERROR 70100: Query execution was interrupted
+# Query should no longer be interrupted and should pass
+# Wait finished
+SET DEBUG_SYNC = 'RESET';
+# 7B. ENABLE UNDO ENCRYPTION
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL kill_ddl';
+SET GLOBAL innodb_undo_log_encrypt = ON;
+# In connection CON1
+# Waiting for DDL to reach notification
+SET DEBUG_SYNC = 'now WAIT_FOR kill_ddl';
+# Wait finished
+KILL QUERY CON_ID;
+# In connection CON2
+# Waiting for DDL to exit with error
+ERROR 70100: Query execution was interrupted
+# Query should no longer be interrupted and should pass
+# Wait finished
+SET DEBUG_SYNC = 'RESET';
+SET DEBUG_SYNC = 'now SIGNAL resume_clone_file';
+# Waiting for clone to reach page copy state
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_inplace';
+# Wait finished
+# 8. ALTER TABLE INPLACE during PAGE COPY
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL kill_ddl';
+ALTER TABLE t1 ADD INDEX col2_idx(col2), ALGORITHM = INPLACE;
+# In connection CON1
+# Waiting for DDL to reach notification
+SET DEBUG_SYNC = 'now WAIT_FOR kill_ddl';
+# Wait finished
+KILL QUERY CON_ID;
+# In connection CON2
+# Waiting for DDL to exit with error
+ERROR 70100: Query execution was interrupted
+# Query should no longer be interrupted and should pass
+# Wait finished
+SET DEBUG_SYNC = 'RESET';
+SET DEBUG_SYNC = 'now SIGNAL resume_clone_page';
+# 9A. DROP TABLE
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL kill_ddl';
+DROP TABLE t1;
+# In connection CON1
+# Waiting for DDL to reach notification
+SET DEBUG_SYNC = 'now WAIT_FOR kill_ddl';
+# Wait finished
+KILL QUERY CON_ID;
+# In connection CON2
+# Query should no longer be interrupted and should pass
+# Wait finished
+SET DEBUG_SYNC = 'RESET';
+# 9B. DROP UNDO TABLESPACE
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL kill_ddl';
+DROP UNDO TABLESPACE undo_02;
+# In connection CON1
+# Waiting for DDL to reach notification
+SET DEBUG_SYNC = 'now WAIT_FOR kill_ddl';
+# Wait finished
+KILL QUERY CON_ID;
+# In connection CON2
+# Query should no longer be interrupted and should pass
+# Wait finished
+SET DEBUG_SYNC = 'RESET';
+# In connection default
+# Waiting for Clone to complete
+# Wait finished
+# Cleanup
+DROP TABLE t2;
+SET DEBUG_SYNC = 'RESET';
+# Uninstall clone
+UNINSTALL PLUGIN clone;
+# Restart server and remove encrypted data directory
+# restart:
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/error_ddl.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/error_ddl.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/error_ddl.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/error_ddl.result	2021-09-28 11:46:34.000000000 +0000
@@ -1,18 +1,27 @@
 INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
-SHOW VARIABLES LIKE 'clone_ddl_timeout';
-Variable_name	Value
-clone_ddl_timeout	300
-# Disable backup lock
-SET GLOBAL clone_ddl_timeout = 0;
-SHOW VARIABLES LIKE 'clone_ddl_timeout';
-Variable_name	Value
-clone_ddl_timeout	0
-# 1. CREATE TABLE while clone in progress
-SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl WAIT_FOR resume_clone';
+# 1. CLONE blocked by DDL at beginning
+# In connection CON1
+SET DEBUG_SYNC = 'fil_ibd_created_space SIGNAL start_clone WAIT_FOR resume_ddl_1';
+CREATE TABLE t1(col1 int);
+# In connection DEFAULT
+SET DEBUG_SYNC = 'now WAIT_FOR start_clone';
+SET DEBUG_SYNC = 'clone_begin_wait_ddl SIGNAL start_ddl_1 WAIT_FOR resume_clone_1';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_2 WAIT_FOR resume_clone_2';
 SET GLOBAL clone_autotune_concurrency = OFF;
 SET GLOBAL clone_max_concurrency = 8;
 CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
-SET DEBUG_SYNC = 'now WAIT_FOR start_ddl';
+# In connection CON2
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_1';
+SET DEBUG_SYNC = 'clone_notify_ddl_before_state_block SIGNAL resume_ddl_1';
+CREATE TABLE t2(col1 int);
+# In connection CON1
+# Reap CREATE TABLE t1
+SET DEBUG_SYNC= 'now SIGNAL resume_clone_1';
+# In connection CON2
+# Reap CREATE TABLE t2
+# Disconnect CON2
+# In connection CON1
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_2';
 # 1A. TOO MANY CLONE IN PROGRESS
 SET GLOBAL clone_autotune_concurrency = OFF;
 SET GLOBAL clone_max_concurrency = 8;
@@ -30,281 +39,56 @@
 1	FILE SYNC	Not Started
 1	RESTART	Not Started
 1	RECOVERY	Not Started
-SET DEBUG_SYNC = 'clone_marked_abort SIGNAL resume_clone';
-CREATE TABLE t1 (col1 INT PRIMARY KEY);
-# In connection DEFAULT
-ERROR HY000: Concurrent DDL is performed during clone operation. Please try again.
-SET DEBUG_SYNC = 'RESET';
-# In connection CON1
-SET DEBUG_SYNC = 'RESET';
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `col1` int NOT NULL,
-  PRIMARY KEY (`col1`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
-# 1B. ALTER INSTANCE while clone in progress
-SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl WAIT_FOR resume_clone';
-SET GLOBAL clone_autotune_concurrency = OFF;
-SET GLOBAL clone_max_concurrency = 8;
-CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
-SET DEBUG_SYNC = 'now WAIT_FOR start_ddl';
-SET DEBUG_SYNC = 'clone_marked_abort SIGNAL resume_clone';
+# 2. ALTER INSTANCE while clone in progress
 ALTER INSTANCE DISABLE INNODB REDO_LOG;
-# In connection DEFAULT
-ERROR HY000: Concurrent DDL is performed during clone operation. Please try again.
-SET DEBUG_SYNC = 'RESET';
-# In connection CON1
-SET DEBUG_SYNC = 'RESET';
-ALTER INSTANCE ENABLE INNODB REDO_LOG;
-# 2. ALTER TABLE ADD COLUMN [COPY] while clone in progress
-# In connection DEFAULT
+ERROR HY000: Concurrent clone in progress. Please try after clone is complete.
 INSERT INTO t1 values(10), (20), (30);
 SELECT * FROM t1 ORDER BY col1;
 col1
 10
 20
 30
-SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl WAIT_FOR resume_clone';
-SET GLOBAL clone_autotune_concurrency = OFF;
-SET GLOBAL clone_max_concurrency = 8;
-CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
-SET DEBUG_SYNC = 'now WAIT_FOR start_ddl';
-SET DEBUG_SYNC = 'clone_marked_abort SIGNAL resume_clone';
-ALTER TABLE t1 ADD COLUMN col2 int, ALGORITHM=COPY;
-# In connection DEFAULT
-ERROR HY000: Concurrent DDL is performed during clone operation. Please try again.
-SET DEBUG_SYNC = 'RESET';
-# In connection CON1
-SET DEBUG_SYNC = 'RESET';
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `col1` int NOT NULL,
-  `col2` int DEFAULT NULL,
-  PRIMARY KEY (`col1`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
-SELECT * FROM t1 ORDER BY col1;
-col1	col2
-10	NULL
-20	NULL
-30	NULL
-UPDATE t1 SET col2 = col1 + 1000;
-# 2A. ALTER TABLE ADD COLUMN [INPLACE] while clone in progress
-# In connection DEFAULT
-SELECT * FROM t1 ORDER BY col1;
-col1	col2
-10	1010
-20	1020
-30	1030
-SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl WAIT_FOR resume_clone';
-SET GLOBAL clone_autotune_concurrency = OFF;
-SET GLOBAL clone_max_concurrency = 8;
-CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
-SET DEBUG_SYNC = 'now WAIT_FOR start_ddl';
-SET DEBUG_SYNC = 'clone_marked_abort SIGNAL resume_clone';
-ALTER TABLE t1 ADD COLUMN col3 int, ALGORITHM=INPLACE;
-# In connection DEFAULT
-ERROR HY000: Concurrent DDL is performed during clone operation. Please try again.
-SET DEBUG_SYNC = 'RESET';
-# In connection CON1
-SET DEBUG_SYNC = 'RESET';
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `col1` int NOT NULL,
-  `col2` int DEFAULT NULL,
-  `col3` int DEFAULT NULL,
-  PRIMARY KEY (`col1`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
-SELECT * FROM t1 ORDER BY col1;
-col1	col2	col3
-10	1010	NULL
-20	1020	NULL
-30	1030	NULL
-UPDATE t1 SET col3 = col2 + 1000;
-# 3A. ADD INDEX [COPY] while clone in progress
-# In connection DEFAULT
-SELECT * FROM t1 ORDER BY col1;
-col1	col2	col3
-10	1010	2010
-20	1020	2020
-30	1030	2030
-SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl WAIT_FOR resume_clone';
-SET GLOBAL clone_autotune_concurrency = OFF;
-SET GLOBAL clone_max_concurrency = 8;
-CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
-SET DEBUG_SYNC = 'now WAIT_FOR start_ddl';
-SET DEBUG_SYNC = 'clone_marked_abort SIGNAL resume_clone';
-ALTER TABLE t1 ADD INDEX col2_idx(col2), ALGORITHM=COPY;
-# In connection DEFAULT
-ERROR HY000: Concurrent DDL is performed during clone operation. Please try again.
-SET DEBUG_SYNC = 'RESET';
-# In connection CON1
-SET DEBUG_SYNC = 'RESET';
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `col1` int NOT NULL,
-  `col2` int DEFAULT NULL,
-  `col3` int DEFAULT NULL,
-  PRIMARY KEY (`col1`),
-  KEY `col2_idx` (`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
-SELECT * FROM t1 ORDER BY col1;
-col1	col2	col3
-10	1010	2010
-20	1020	2020
-30	1030	2030
-# 3B. ADD INDEX [INPLACE] while clone in progress
-# In connection DEFAULT
-SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl WAIT_FOR resume_clone';
-SET GLOBAL clone_autotune_concurrency = OFF;
-SET GLOBAL clone_max_concurrency = 8;
-CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
-SET DEBUG_SYNC = 'now WAIT_FOR start_ddl';
-SET DEBUG_SYNC = 'clone_marked_abort SIGNAL resume_clone';
-ALTER TABLE t1 ADD INDEX col3_idx(col3), ALGORITHM=INPLACE;
-# In connection DEFAULT
-ERROR HY000: Concurrent DDL is performed during clone operation. Please try again.
-SET DEBUG_SYNC = 'RESET';
-# In connection CON1
-SET DEBUG_SYNC = 'RESET';
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `col1` int NOT NULL,
-  `col2` int DEFAULT NULL,
-  `col3` int DEFAULT NULL,
-  PRIMARY KEY (`col1`),
-  KEY `col2_idx` (`col2`),
-  KEY `col3_idx` (`col3`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
-SELECT * FROM t1 ORDER BY col1;
-col1	col2	col3
-10	1010	2010
-20	1020	2020
-30	1030	2030
-# 4A. DROP INDEX [COPY] while clone in progress
-# In connection DEFAULT
-SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl WAIT_FOR resume_clone';
-SET GLOBAL clone_autotune_concurrency = OFF;
-SET GLOBAL clone_max_concurrency = 8;
-CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
-SET DEBUG_SYNC = 'now WAIT_FOR start_ddl';
-SET DEBUG_SYNC = 'clone_marked_abort SIGNAL resume_clone';
-ALTER TABLE t1 DROP INDEX col3_idx, ALGORITHM=COPY;
-# In connection DEFAULT
-ERROR HY000: Concurrent DDL is performed during clone operation. Please try again.
-SET DEBUG_SYNC = 'RESET';
-# In connection CON1
-SET DEBUG_SYNC = 'RESET';
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `col1` int NOT NULL,
-  `col2` int DEFAULT NULL,
-  `col3` int DEFAULT NULL,
-  PRIMARY KEY (`col1`),
-  KEY `col2_idx` (`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
-SELECT * FROM t1 ORDER BY col1;
-col1	col2	col3
-10	1010	2010
-20	1020	2020
-30	1030	2030
-# 4B. DROP INDEX [INPLACE] while clone in progress
-# In connection DEFAULT
-SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl WAIT_FOR resume_clone';
-SET GLOBAL clone_autotune_concurrency = OFF;
-SET GLOBAL clone_max_concurrency = 8;
-CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
-SET DEBUG_SYNC = 'now WAIT_FOR start_ddl';
-SET DEBUG_SYNC = 'clone_marked_abort SIGNAL resume_clone';
-ALTER TABLE t1 DROP INDEX col2_idx, ALGORITHM=INPLACE;
+# 3. ALTER DISCARD while clone in progress
+ALTER TABLE t1 DISCARD TABLESPACE;
+ERROR HY000: Concurrent clone in progress. Please try after clone is complete.
+# 4. ALTER IMPORT while clone in progress
+ALTER TABLE t1 IMPORT TABLESPACE;
+ERROR HY000: Concurrent clone in progress. Please try after clone is complete.
+# 5. KILL CLONE command while in progress
+KILL QUERY CON_ID;
+SET DEBUG_SYNC= 'now SIGNAL resume_clone_2';
 # In connection DEFAULT
-ERROR HY000: Concurrent DDL is performed during clone operation. Please try again.
-SET DEBUG_SYNC = 'RESET';
-# In connection CON1
+ERROR 70100: Query execution was interrupted
 SET DEBUG_SYNC = 'RESET';
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `col1` int NOT NULL,
-  `col2` int DEFAULT NULL,
-  `col3` int DEFAULT NULL,
-  PRIMARY KEY (`col1`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
-SELECT * FROM t1 ORDER BY col1;
-col1	col2	col3
-10	1010	2010
-20	1020	2020
-30	1030	2030
-# 5. TRUNCATE TABLE while clone in progress
-# In connection DEFAULT
-SELECT * FROM t1 ORDER BY col1;
-col1	col2	col3
-10	1010	2010
-20	1020	2020
-30	1030	2030
+DROP TABLE t2;
+# 6. Force clone to abort by DDL
+SET GLOBAL DEBUG = '+d,clone_ddl_error_abort';
 SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl WAIT_FOR resume_clone';
 SET GLOBAL clone_autotune_concurrency = OFF;
 SET GLOBAL clone_max_concurrency = 8;
 CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
-SET DEBUG_SYNC = 'now WAIT_FOR start_ddl';
-SET DEBUG_SYNC = 'clone_marked_abort SIGNAL resume_clone';
-TRUNCATE TABLE t1;
-# In connection DEFAULT
-ERROR HY000: Concurrent DDL is performed during clone operation. Please try again.
-SET DEBUG_SYNC = 'RESET';
 # In connection CON1
-SET DEBUG_SYNC = 'RESET';
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `col1` int NOT NULL,
-  `col2` int DEFAULT NULL,
-  `col3` int DEFAULT NULL,
-  PRIMARY KEY (`col1`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
-SELECT * FROM t1 ORDER BY col1;
-col1	col2	col3
-# 6. DROP TABLE while clone in progress
-# In connection DEFAULT
-INSERT INTO t1 values(10, 100, 1000);
-SELECT * FROM t1 ORDER BY col1;
-col1	col2	col3
-10	100	1000
-SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl WAIT_FOR resume_clone';
-SET GLOBAL clone_autotune_concurrency = OFF;
-SET GLOBAL clone_max_concurrency = 8;
-CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
 SET DEBUG_SYNC = 'now WAIT_FOR start_ddl';
-SET DEBUG_SYNC = 'clone_marked_abort SIGNAL resume_clone';
-DROP TABLE t1;
-# In connection DEFAULT
-ERROR HY000: Concurrent DDL is performed during clone operation. Please try again.
-# In connection CON1
-CREATE TABLE t1(col1 int);
-# 7. KILL CLONE command while in progress
-# In connection DEFAULT
-INSERT INTO t1 values(10), (20), (30);
-SELECT * FROM t1 ORDER BY col1;
+SET DEBUG_SYNC = 'clone_notify_ddl_before_state_block SIGNAL resume_clone';
+CREATE TABLE t2(col1 int);
+INSERT INTO t2 VALUES(10), (20), (30);
+SELECT * FROM t2 ORDER BY col1;
 col1
 10
 20
 30
-SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_kill WAIT_FOR resume_clone';
-SET GLOBAL clone_autotune_concurrency = OFF;
-SET GLOBAL clone_max_concurrency = 8;
-CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
-SET DEBUG_SYNC = 'now WAIT_FOR start_kill';
-KILL QUERY CON_ID;
-SET DEBUG_SYNC= 'now SIGNAL resume_clone';
 # In connection DEFAULT
-ERROR 70100: Query execution was interrupted
+ERROR HY000: Concurrent DDL is performed during clone operation. Please try again.
+SET GLOBAL DEBUG = '-d,clone_ddl_error_abort';
+SET DEBUG_SYNC = 'RESET';
 #Cleanup
+DROP TABLE t1;
+DROP TABLE t2;
 # In connection DEFAULT
 SET DEBUG_SYNC = 'RESET';
-DROP TABLE t1;
+# Attempt to uninstall clone if there
+UNINSTALL PLUGIN clone;
+# Restart server
+# restart
+# Uninstall clone if there
 UNINSTALL PLUGIN clone;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/local_boundary.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/local_boundary.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/local_boundary.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/local_boundary.result	2021-09-28 11:46:34.000000000 +0000
@@ -24,10 +24,12 @@
 CASE p_dml_type
 WHEN 0 THEN
 SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
-INSERT INTO t1 VALUES(v_key, v_key * 10,
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
-INSERT INTO t2 VALUES(v_key, v_key * 10,
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
 WHEN 1 THEN
@@ -53,6 +55,7 @@
 END IF;
 END IF;
 END WHILE;
+COMMIT;
 END|
 call execute_dml(0, 0, 150, 150, 10, 0);
 SHOW CREATE TABLE t1;
@@ -130,7 +133,7 @@
 141	1410	Clone Test Row - 141	umn Data Large Column Data Large
 140	1400	Clone Test Row - 140	umn Data Large Column Data Large
 # In connection default - Cloning database
-SET global debug="+d,clone_no_zero_copy";
+SET GLOBAL DEBUG ="+d,clone_no_zero_copy";
 SET DEBUG_SYNC = 'RESET';
 SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_dml1 WAIT_FOR resume_clone1';
 SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_dml2 WAIT_FOR resume_clone2';
@@ -151,7 +154,7 @@
 COMMIT;
 SET DEBUG_SYNC = 'now SIGNAL resume_clone2';
 # In connection default - Cloning database
-SET global debug="-d,clone_no_zero_copy";
+SET GLOBAL DEBUG ="-d,clone_no_zero_copy";
 # Restart cloned database
 # restart: --datadir=CLONE_DATADIR
 SHOW CREATE TABLE t1;
@@ -279,6 +282,7 @@
 141	1410	Clone Test Row - 141	umn Data Large Column Data Large
 140	1400	Clone Test Row - 140	umn Data Large Column Data Large
 # restart:
+SET GLOBAL DEBUG ="+d,clone_arch_log_stop_file_end";
 SET DEBUG_SYNC = 'RESET';
 SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_dml1 WAIT_FOR resume_clone1';
 SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_dml2 WAIT_FOR resume_clone2';
@@ -294,14 +298,15 @@
 SET GLOBAL innodb_buf_flush_list_now = 1;
 SET DEBUG_SYNC = 'now SIGNAL resume_clone1';
 SET DEBUG_SYNC = 'now WAIT_FOR start_dml2';
-SET global debug="+d,clone_arch_log_stop_file_end";
 START TRANSACTION;
 call execute_dml(3, 0, 1, 1, 1, 0);
 call execute_dml(0, 0, 150, 150, 10, 0);
 COMMIT;
 SET DEBUG_SYNC = 'now SIGNAL resume_clone2';
 # In connection default - Cloning database
-SET global debug="-d,clone_arch_log_stop_file_end";
+SET GLOBAL DEBUG ="-d,clone_arch_log_stop_file_end";
+SET GLOBAL DEBUG ="+d,clone_arch_log_stop_file_end";
+SET GLOBAL DEBUG ="+d,clone_arch_log_extra_bytes";
 SET DEBUG_SYNC = 'RESET';
 SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_dml1 WAIT_FOR resume_clone1';
 SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_dml2 WAIT_FOR resume_clone2';
@@ -317,16 +322,14 @@
 SET GLOBAL innodb_buf_flush_list_now = 1;
 SET DEBUG_SYNC = 'now SIGNAL resume_clone1';
 SET DEBUG_SYNC = 'now WAIT_FOR start_dml2';
-SET global debug="+d,clone_arch_log_stop_file_end";
-SET global debug="+d,clone_arch_log_extra_bytes";
 START TRANSACTION;
 call execute_dml(3, 0, 1, 1, 1, 0);
 call execute_dml(0, 0, 150, 150, 10, 0);
 COMMIT;
 SET DEBUG_SYNC = 'now SIGNAL resume_clone2';
 # In connection default - Cloning database
-SET global debug="-d,clone_arch_log_stop_file_end";
-SET global debug="-d,clone_arch_log_extra_bytes";
+SET GLOBAL DEBUG ="-d,clone_arch_log_stop_file_end";
+SET GLOBAL DEBUG ="-d,clone_arch_log_extra_bytes";
 SET DEBUG_SYNC = 'RESET';
 SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_dml1 WAIT_FOR resume_clone1';
 SET GLOBAL clone_autotune_concurrency = OFF;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/local_compress.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/local_compress.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/local_compress.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/local_compress.result	2021-09-28 11:46:34.000000000 +0000
@@ -29,10 +29,12 @@
 CASE p_dml_type
 WHEN 0 THEN
 SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
-INSERT INTO t1 VALUES(v_key, v_key * 10,
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
-INSERT INTO t2 VALUES(v_key, v_key * 10,
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
 WHEN 1 THEN
@@ -58,6 +60,7 @@
 END IF;
 END IF;
 END WHILE;
+COMMIT;
 END|
 DROP TABLE t1;
 DROP TABLE t2;
@@ -422,6 +425,5 @@
 UNINSTALL PLUGIN clone;
 UNINSTALL PLUGIN keyring_file;
 SET DEBUG_SYNC = 'RESET';
-# restart:
 # Restart server and remove encrypted data directory
 # restart:
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/local_dml_auto_tune.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/local_dml_auto_tune.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/local_dml_auto_tune.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/local_dml_auto_tune.result	2021-09-28 11:46:34.000000000 +0000
@@ -50,10 +50,12 @@
 CASE p_dml_type
 WHEN 0 THEN
 SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
-INSERT INTO t1 VALUES(v_key, v_key * 10,
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
-INSERT INTO t2 VALUES(v_key, v_key * 10,
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
 WHEN 1 THEN
@@ -79,6 +81,7 @@
 END IF;
 END IF;
 END WHILE;
+COMMIT;
 END|
 call execute_dml(0, 0, 1000, 1000, 10, 0);
 SHOW CREATE TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/local_dml_compressed_row.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/local_dml_compressed_row.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/local_dml_compressed_row.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/local_dml_compressed_row.result	2021-09-28 11:46:34.000000000 +0000
@@ -50,10 +50,12 @@
 CASE p_dml_type
 WHEN 0 THEN
 SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
-INSERT INTO t1 VALUES(v_key, v_key * 10,
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
-INSERT INTO t2 VALUES(v_key, v_key * 10,
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
 WHEN 1 THEN
@@ -79,6 +81,7 @@
 END IF;
 END IF;
 END WHILE;
+COMMIT;
 END|
 DROP TABLE t1;
 DROP TABLE t2;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/local_dml_no_redo.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/local_dml_no_redo.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/local_dml_no_redo.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/local_dml_no_redo.result	2021-09-28 11:46:34.000000000 +0000
@@ -51,10 +51,12 @@
 CASE p_dml_type
 WHEN 0 THEN
 SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
-INSERT INTO t1 VALUES(v_key, v_key * 10,
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
-INSERT INTO t2 VALUES(v_key, v_key * 10,
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
 WHEN 1 THEN
@@ -80,6 +82,7 @@
 END IF;
 END IF;
 END WHILE;
+COMMIT;
 END|
 call execute_dml(0, 0, 100, 100, 10, 0);
 SHOW CREATE TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/local_dml.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/local_dml.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/local_dml.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/local_dml.result	2021-09-28 11:46:34.000000000 +0000
@@ -50,10 +50,12 @@
 CASE p_dml_type
 WHEN 0 THEN
 SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
-INSERT INTO t1 VALUES(v_key, v_key * 10,
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
-INSERT INTO t2 VALUES(v_key, v_key * 10,
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
 WHEN 1 THEN
@@ -79,6 +81,7 @@
 END IF;
 END IF;
 END WHILE;
+COMMIT;
 END|
 call execute_dml(0, 0, 100, 100, 10, 0);
 SHOW CREATE TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/local_encrypt.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/local_encrypt.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/local_encrypt.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/local_encrypt.result	2021-09-28 11:46:34.000000000 +0000
@@ -29,10 +29,12 @@
 CASE p_dml_type
 WHEN 0 THEN
 SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
-INSERT INTO t1 VALUES(v_key, v_key * 10,
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
-INSERT INTO t2 VALUES(v_key, v_key * 10,
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
 WHEN 1 THEN
@@ -58,6 +60,7 @@
 END IF;
 END IF;
 END WHILE;
+COMMIT;
 END|
 # In connection default - starting clone
 SET DEBUG_SYNC = 'clone_file_copy SIGNAL set_encryption WAIT_FOR resume_clone';
@@ -70,20 +73,20 @@
 Variable_name	Value
 innodb_redo_log_encrypt	OFF
 SET GLOBAL innodb_redo_log_encrypt = ON;
-ERROR HY000: Concurrent clone in progress. Please try after clone is complete.
 SHOW VARIABLES LIKE 'innodb_redo_log_encrypt';
 Variable_name	Value
-innodb_redo_log_encrypt	OFF
+innodb_redo_log_encrypt	ON
 SHOW VARIABLES LIKE 'innodb_undo_log_encrypt';
 Variable_name	Value
 innodb_undo_log_encrypt	OFF
 SET GLOBAL innodb_undo_log_encrypt = ON;
-ERROR HY000: Concurrent clone in progress. Please try after clone is complete.
 SHOW VARIABLES LIKE 'innodb_undo_log_encrypt';
 Variable_name	Value
-innodb_undo_log_encrypt	OFF
+innodb_undo_log_encrypt	ON
 SET DEBUG_SYNC = 'now SIGNAL resume_clone';
 # In connection default - finishing Clone
+SET GLOBAL innodb_redo_log_encrypt = OFF;
+SET GLOBAL innodb_undo_log_encrypt = OFF;
 DROP TABLE t1;
 DROP TABLE t2;
 CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
@@ -455,6 +458,5 @@
 UNINSTALL PLUGIN clone;
 UNINSTALL PLUGIN keyring_file;
 SET DEBUG_SYNC = 'RESET';
-# restart:
 # Restart server and remove encrypted data directory
 # restart:
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/local_features.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/local_features.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/local_features.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/local_features.result	2021-09-28 11:46:34.000000000 +0000
@@ -24,10 +24,12 @@
 CASE p_dml_type
 WHEN 0 THEN
 SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
-INSERT INTO t1 VALUES(v_key, v_key * 10,
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
-INSERT INTO t2 VALUES(v_key, v_key * 10,
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
 WHEN 1 THEN
@@ -53,6 +55,7 @@
 END IF;
 END IF;
 END WHILE;
+COMMIT;
 END|
 DROP TABLE t1;
 DROP TABLE t2;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/local_file_extend.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/local_file_extend.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/local_file_extend.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/local_file_extend.result	2021-09-28 11:46:34.000000000 +0000
@@ -24,10 +24,12 @@
 CASE p_dml_type
 WHEN 0 THEN
 SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
-INSERT INTO t1 VALUES(v_key, v_key * 10,
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
-INSERT INTO t2 VALUES(v_key, v_key * 10,
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
 WHEN 1 THEN
@@ -53,6 +55,7 @@
 END IF;
 END IF;
 END WHILE;
+COMMIT;
 END|
 DROP TABLE t1;
 DROP TABLE t2;
@@ -163,7 +166,7 @@
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=COMPRESSED
 SELECT count(*) from t1;
 count(*)
-20
+40
 SELECT col1, col3, SUBSTRING(col4, 1000, 32) FROM t1 ORDER BY col1 LIMIT 10;
 col1	col3	SUBSTRING(col4, 1000, 32)
 0	Clone Test Row - 0	umn Data Large Column Data Large
@@ -178,16 +181,16 @@
 9	Clone Test Row - 9	umn Data Large Column Data Large
 SELECT col1, col3, SUBSTRING(col4, 1000, 32) FROM t1 ORDER BY col1 DESC LIMIT 10;
 col1	col3	SUBSTRING(col4, 1000, 32)
-19	Clone Test Row - 19	umn Data Large Column Data Large
-18	Clone Test Row - 18	umn Data Large Column Data Large
-17	Clone Test Row - 17	umn Data Large Column Data Large
-16	Clone Test Row - 16	umn Data Large Column Data Large
-15	Clone Test Row - 15	umn Data Large Column Data Large
-14	Clone Test Row - 14	umn Data Large Column Data Large
-13	Clone Test Row - 13	umn Data Large Column Data Large
-12	Clone Test Row - 12	umn Data Large Column Data Large
-11	Clone Test Row - 11	umn Data Large Column Data Large
-10	Clone Test Row - 10	umn Data Large Column Data Large
+69	Clone Test Row - 69	umn Data Large Column Data Large
+68	Clone Test Row - 68	umn Data Large Column Data Large
+67	Clone Test Row - 67	umn Data Large Column Data Large
+66	Clone Test Row - 66	umn Data Large Column Data Large
+65	Clone Test Row - 65	umn Data Large Column Data Large
+64	Clone Test Row - 64	umn Data Large Column Data Large
+63	Clone Test Row - 63	umn Data Large Column Data Large
+62	Clone Test Row - 62	umn Data Large Column Data Large
+61	Clone Test Row - 61	umn Data Large Column Data Large
+60	Clone Test Row - 60	umn Data Large Column Data Large
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
@@ -199,7 +202,7 @@
 ) /*!50100 TABLESPACE `tbs1` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 SELECT count(*) from t2;
 count(*)
-20
+40
 SELECT col1, col3, SUBSTRING(col4, 1000, 32) FROM t2 ORDER BY col1 LIMIT 10;
 col1	col3	SUBSTRING(col4, 1000, 32)
 0	Clone Test Row - 0	umn Data Large Column Data Large
@@ -214,16 +217,16 @@
 9	Clone Test Row - 9	umn Data Large Column Data Large
 SELECT col1, col3, SUBSTRING(col4, 1000, 32) FROM t2 ORDER BY col1 DESC LIMIT 10;
 col1	col3	SUBSTRING(col4, 1000, 32)
-19	Clone Test Row - 19	umn Data Large Column Data Large
-18	Clone Test Row - 18	umn Data Large Column Data Large
-17	Clone Test Row - 17	umn Data Large Column Data Large
-16	Clone Test Row - 16	umn Data Large Column Data Large
-15	Clone Test Row - 15	umn Data Large Column Data Large
-14	Clone Test Row - 14	umn Data Large Column Data Large
-13	Clone Test Row - 13	umn Data Large Column Data Large
-12	Clone Test Row - 12	umn Data Large Column Data Large
-11	Clone Test Row - 11	umn Data Large Column Data Large
-10	Clone Test Row - 10	umn Data Large Column Data Large
+69	Clone Test Row - 69	umn Data Large Column Data Large
+68	Clone Test Row - 68	umn Data Large Column Data Large
+67	Clone Test Row - 67	umn Data Large Column Data Large
+66	Clone Test Row - 66	umn Data Large Column Data Large
+65	Clone Test Row - 65	umn Data Large Column Data Large
+64	Clone Test Row - 64	umn Data Large Column Data Large
+63	Clone Test Row - 63	umn Data Large Column Data Large
+62	Clone Test Row - 62	umn Data Large Column Data Large
+61	Clone Test Row - 61	umn Data Large Column Data Large
+60	Clone Test Row - 60	umn Data Large Column Data Large
 call execute_dml(3, 0, 1, 1, 1, 0);
 call execute_dml(0, 0, 10, 10, 2, 0);
 commit;
@@ -313,7 +316,7 @@
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=COMPRESSED
 SELECT count(*) from t1;
 count(*)
-20
+40
 SELECT col1, col3, SUBSTRING(col4, 1000, 32) FROM t1 ORDER BY col1 LIMIT 10;
 col1	col3	SUBSTRING(col4, 1000, 32)
 0	Clone Test Row - 0	umn Data Large Column Data Large
@@ -328,16 +331,16 @@
 9	Clone Test Row - 9	umn Data Large Column Data Large
 SELECT col1, col3, SUBSTRING(col4, 1000, 32) FROM t1 ORDER BY col1 DESC LIMIT 10;
 col1	col3	SUBSTRING(col4, 1000, 32)
-19	Clone Test Row - 19	umn Data Large Column Data Large
-18	Clone Test Row - 18	umn Data Large Column Data Large
-17	Clone Test Row - 17	umn Data Large Column Data Large
-16	Clone Test Row - 16	umn Data Large Column Data Large
-15	Clone Test Row - 15	umn Data Large Column Data Large
-14	Clone Test Row - 14	umn Data Large Column Data Large
-13	Clone Test Row - 13	umn Data Large Column Data Large
-12	Clone Test Row - 12	umn Data Large Column Data Large
-11	Clone Test Row - 11	umn Data Large Column Data Large
-10	Clone Test Row - 10	umn Data Large Column Data Large
+69	Clone Test Row - 69	umn Data Large Column Data Large
+68	Clone Test Row - 68	umn Data Large Column Data Large
+67	Clone Test Row - 67	umn Data Large Column Data Large
+66	Clone Test Row - 66	umn Data Large Column Data Large
+65	Clone Test Row - 65	umn Data Large Column Data Large
+64	Clone Test Row - 64	umn Data Large Column Data Large
+63	Clone Test Row - 63	umn Data Large Column Data Large
+62	Clone Test Row - 62	umn Data Large Column Data Large
+61	Clone Test Row - 61	umn Data Large Column Data Large
+60	Clone Test Row - 60	umn Data Large Column Data Large
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
@@ -349,7 +352,7 @@
 ) /*!50100 TABLESPACE `tbs1` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 SELECT count(*) from t2;
 count(*)
-20
+40
 SELECT col1, col3, SUBSTRING(col4, 1000, 32) FROM t2 ORDER BY col1 LIMIT 10;
 col1	col3	SUBSTRING(col4, 1000, 32)
 0	Clone Test Row - 0	umn Data Large Column Data Large
@@ -364,16 +367,16 @@
 9	Clone Test Row - 9	umn Data Large Column Data Large
 SELECT col1, col3, SUBSTRING(col4, 1000, 32) FROM t2 ORDER BY col1 DESC LIMIT 10;
 col1	col3	SUBSTRING(col4, 1000, 32)
-19	Clone Test Row - 19	umn Data Large Column Data Large
-18	Clone Test Row - 18	umn Data Large Column Data Large
-17	Clone Test Row - 17	umn Data Large Column Data Large
-16	Clone Test Row - 16	umn Data Large Column Data Large
-15	Clone Test Row - 15	umn Data Large Column Data Large
-14	Clone Test Row - 14	umn Data Large Column Data Large
-13	Clone Test Row - 13	umn Data Large Column Data Large
-12	Clone Test Row - 12	umn Data Large Column Data Large
-11	Clone Test Row - 11	umn Data Large Column Data Large
-10	Clone Test Row - 10	umn Data Large Column Data Large
+69	Clone Test Row - 69	umn Data Large Column Data Large
+68	Clone Test Row - 68	umn Data Large Column Data Large
+67	Clone Test Row - 67	umn Data Large Column Data Large
+66	Clone Test Row - 66	umn Data Large Column Data Large
+65	Clone Test Row - 65	umn Data Large Column Data Large
+64	Clone Test Row - 64	umn Data Large Column Data Large
+63	Clone Test Row - 63	umn Data Large Column Data Large
+62	Clone Test Row - 62	umn Data Large Column Data Large
+61	Clone Test Row - 61	umn Data Large Column Data Large
+60	Clone Test Row - 60	umn Data Large Column Data Large
 call execute_dml(3, 0, 1, 1, 1, 0);
 call execute_dml(0, 0, 10, 10, 2, 0);
 commit;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/local_insert.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/local_insert.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/local_insert.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/local_insert.result	2021-09-28 11:46:34.000000000 +0000
@@ -2,50 +2,51 @@
 CREATE PROCEDURE prepare_data(IN val INT)
 BEGIN
 DECLARE i INT DEFAULT 1;
-WHILE i < val DO
+WHILE i <= val DO
 INSERT INTO t1 (b,c) VALUES (REPEAT(a,600), REPEAT(b,600));
 INSERT INTO t2 (b,c) VALUES (REPEAT(a,600), REPEAT(b,600));
-INSERT INTO t3 (b,c) VALUES (REPEAT(a,600), REPEAT(b,600));
 SET i = i + 1;
 END WHILE;
 END|
 # Case 1 - Normal page archiving process using clone client.
-CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY AUTO_INCREMENT, b LONGBLOB, c
-LONGBLOB);
-CREATE TABLE t2 (a INT NOT NULL PRIMARY KEY AUTO_INCREMENT, b LONGBLOB, c
-LONGBLOB);
-CREATE TABLE t3 (a INT NOT NULL PRIMARY KEY AUTO_INCREMENT, b LONGBLOB, c
-LONGBLOB);
+CREATE TABLE t1 (a INT AUTO_INCREMENT, b LONGBLOB, c LONGBLOB, key k1(a));
+CREATE TABLE t2 (a INT PRIMARY KEY AUTO_INCREMENT, b LONGBLOB, c LONGBLOB);
 SET DEBUG_SYNC = 'clone_file_copy SIGNAL page_signal WAIT_FOR go_page';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL redo_signal WAIT_FOR go_redo';
+SET DEBUG_SYNC = 'clone_donor_after_saving_dynamic_metadata SIGNAL meta_signal WAIT_FOR go_meta';
 SET GLOBAL clone_autotune_concurrency = OFF;
 SET GLOBAL clone_max_concurrency = 8;
 CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
 SET DEBUG_SYNC = 'now WAIT_FOR page_signal';
-CALL prepare_data(100);
+CALL prepare_data(50);
 SET DEBUG_SYNC = 'now SIGNAL go_page';
+SET DEBUG_SYNC = 'now WAIT_FOR redo_signal';
+CALL prepare_data(10);
+SET DEBUG_SYNC = 'now SIGNAL go_redo';
+SET DEBUG_SYNC = 'now WAIT_FOR meta_signal';
+SET GLOBAL debug="+d,periodical_checkpoint_disabled";
+CALL prepare_data(10);
+UPDATE t1 SET a = 100 where a = 1;
+UPDATE t2 SET a = 200 where a = 1;
+SET DEBUG_SYNC = 'now SIGNAL go_meta';
 select count(*) from t1;
 count(*)
-99
+70
 select count(*) from t2;
 count(*)
-99
-select count(*) from t3;
-count(*)
-99
+70
 # restart: --datadir=CLONE_DATADIR
-select count(*) from t1;
-count(*)
-99
-select count(*) from t2;
-count(*)
-99
-select count(*) from t3;
-count(*)
-99
+INSERT INTO t1 (b,c) VALUES (REPEAT(a,600), REPEAT(b,600));
+INSERT INTO t2 (b,c) VALUES (REPEAT(a,600), REPEAT(b,600));
+select count(*), max(a) from t1;
+count(*)	max(a)
+71	101
+select count(*), max(a) from t2;
+count(*)	max(a)
+71	201
 # restart:
 DROP TABLE t1;
 DROP TABLE t2;
-DROP TABLE t3;
 SET DEBUG_SYNC = 'RESET';
 DROP PROCEDURE prepare_data;
 UNINSTALL PLUGIN clone;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/local_stage.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/local_stage.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/local_stage.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/local_stage.result	2021-09-28 11:46:34.000000000 +0000
@@ -24,10 +24,12 @@
 CASE p_dml_type
 WHEN 0 THEN
 SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
-INSERT INTO t1 VALUES(v_key, v_key * 10,
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
-INSERT INTO t2 VALUES(v_key, v_key * 10,
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
 WHEN 1 THEN
@@ -53,6 +55,7 @@
 END IF;
 END IF;
 END WHILE;
+COMMIT;
 END|
 call execute_dml(0, 0, 100, 100, 10, 0);
 SHOW CREATE TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/local_stage_sys.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/local_stage_sys.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/local_stage_sys.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/local_stage_sys.result	2021-09-28 11:46:34.000000000 +0000
@@ -24,10 +24,12 @@
 CASE p_dml_type
 WHEN 0 THEN
 SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
-INSERT INTO t1 VALUES(v_key, v_key * 10,
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
-INSERT INTO t2 VALUES(v_key, v_key * 10,
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
 WHEN 1 THEN
@@ -53,6 +55,7 @@
 END IF;
 END IF;
 END WHILE;
+COMMIT;
 END|
 call execute_dml(0, 0, 100, 100, 10, 0);
 SHOW CREATE TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/local_xa.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/local_xa.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/local_xa.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/local_xa.result	2021-09-28 11:46:34.000000000 +0000
@@ -25,10 +25,12 @@
 CASE p_dml_type
 WHEN 0 THEN
 SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
-INSERT INTO t1 VALUES(v_key, v_key * 10,
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
-INSERT INTO t2 VALUES(v_key, v_key * 10,
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
 WHEN 1 THEN
@@ -54,6 +56,7 @@
 END IF;
 END IF;
 END WHILE;
+COMMIT;
 END|
 call execute_dml(0, 0, 10, 10, 1, 0);
 commit;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_boundary.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_boundary.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_boundary.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_boundary.result	2021-09-28 11:46:34.000000000 +0000
@@ -24,10 +24,12 @@
 CASE p_dml_type
 WHEN 0 THEN
 SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
-INSERT INTO t1 VALUES(v_key, v_key * 10,
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
-INSERT INTO t2 VALUES(v_key, v_key * 10,
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
 WHEN 1 THEN
@@ -53,6 +55,7 @@
 END IF;
 END IF;
 END WHILE;
+COMMIT;
 END|
 call execute_dml(0, 0, 150, 150, 10, 0);
 SHOW CREATE TABLE t1;
@@ -130,7 +133,7 @@
 141	1410	Clone Test Row - 141	umn Data Large Column Data Large
 140	1400	Clone Test Row - 140	umn Data Large Column Data Large
 # In connection default - Cloning database
-SET global debug="+d,clone_no_zero_copy";
+SET GLOBAL DEBUG ="+d,clone_no_zero_copy";
 SET DEBUG_SYNC = 'RESET';
 SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_dml1 WAIT_FOR resume_clone1';
 SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_dml2 WAIT_FOR resume_clone2';
@@ -152,7 +155,7 @@
 COMMIT;
 SET DEBUG_SYNC = 'now SIGNAL resume_clone2';
 # In connection default - Cloning database
-SET global debug="-d,clone_no_zero_copy";
+SET GLOBAL DEBUG ="-d,clone_no_zero_copy";
 # Restart cloned database
 # restart: --datadir=CLONE_DATADIR
 SHOW CREATE TABLE t1;
@@ -280,6 +283,7 @@
 141	1410	Clone Test Row - 141	umn Data Large Column Data Large
 140	1400	Clone Test Row - 140	umn Data Large Column Data Large
 # restart:
+SET GLOBAL DEBUG ="+d,clone_arch_log_stop_file_end";
 SET DEBUG_SYNC = 'RESET';
 SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_dml1 WAIT_FOR resume_clone1';
 SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_dml2 WAIT_FOR resume_clone2';
@@ -296,14 +300,15 @@
 SET GLOBAL innodb_buf_flush_list_now = 1;
 SET DEBUG_SYNC = 'now SIGNAL resume_clone1';
 SET DEBUG_SYNC = 'now WAIT_FOR start_dml2';
-SET global debug="+d,clone_arch_log_stop_file_end";
 START TRANSACTION;
 call execute_dml(3, 0, 1, 1, 1, 0);
 call execute_dml(0, 0, 150, 150, 10, 0);
 COMMIT;
 SET DEBUG_SYNC = 'now SIGNAL resume_clone2';
 # In connection default - Cloning database
-SET global debug="-d,clone_arch_log_stop_file_end";
+SET GLOBAL DEBUG ="-d,clone_arch_log_stop_file_end";
+SET GLOBAL DEBUG ="+d,clone_arch_log_stop_file_end";
+SET GLOBAL DEBUG ="+d,clone_arch_log_extra_bytes";
 SET DEBUG_SYNC = 'RESET';
 SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_dml1 WAIT_FOR resume_clone1';
 SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_dml2 WAIT_FOR resume_clone2';
@@ -320,16 +325,14 @@
 SET GLOBAL innodb_buf_flush_list_now = 1;
 SET DEBUG_SYNC = 'now SIGNAL resume_clone1';
 SET DEBUG_SYNC = 'now WAIT_FOR start_dml2';
-SET global debug="+d,clone_arch_log_stop_file_end";
-SET global debug="+d,clone_arch_log_extra_bytes";
 START TRANSACTION;
 call execute_dml(3, 0, 1, 1, 1, 0);
 call execute_dml(0, 0, 150, 150, 10, 0);
 COMMIT;
 SET DEBUG_SYNC = 'now SIGNAL resume_clone2';
 # In connection default - Cloning database
-SET global debug="-d,clone_arch_log_stop_file_end";
-SET global debug="-d,clone_arch_log_extra_bytes";
+SET GLOBAL DEBUG ="-d,clone_arch_log_stop_file_end";
+SET GLOBAL DEBUG ="-d,clone_arch_log_extra_bytes";
 SET DEBUG_SYNC = 'RESET';
 SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_dml1 WAIT_FOR resume_clone1';
 SET GLOBAL clone_autotune_concurrency = OFF;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_compress.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_compress.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_compress.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_compress.result	2021-09-28 11:46:34.000000000 +0000
@@ -29,10 +29,12 @@
 CASE p_dml_type
 WHEN 0 THEN
 SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
-INSERT INTO t1 VALUES(v_key, v_key * 10,
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
-INSERT INTO t2 VALUES(v_key, v_key * 10,
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
 WHEN 1 THEN
@@ -58,6 +60,7 @@
 END IF;
 END IF;
 END WHILE;
+COMMIT;
 END|
 DROP TABLE t1;
 DROP TABLE t2;
@@ -424,6 +427,5 @@
 UNINSTALL PLUGIN clone;
 UNINSTALL PLUGIN keyring_file;
 SET DEBUG_SYNC = 'RESET';
-# restart:
 # Restart server and remove encrypted data directory
 # restart:
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_ddl_alter_copy.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_ddl_alter_copy.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_ddl_alter_copy.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_ddl_alter_copy.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,840 @@
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+PARTITION BY KEY(col1) PARTITIONS 5;
+CREATE PROCEDURE execute_dml(
+p_dml_type	INT,
+p_key_min	INT,
+p_key_range	INT,
+p_loop_count	INT,
+p_frequency	INT,
+p_is_rand	INT)
+BEGIN
+DECLARE v_idx		INT DEFAULT 0;
+DECLARE v_commit	INT DEFAULT 0;
+DECLARE v_key		INT DEFAULT 0;
+/* Loop and INSERT data at random position */
+WHILE(v_idx < p_loop_count) DO
+/* Generate key between 1 to p_loop_count */
+IF p_is_rand = 1 THEN
+SET v_key = p_key_min + FLOOR(RAND() * p_key_range);
+ELSE
+SET v_key = p_key_min + (v_idx  % p_key_range);
+END IF;
+CASE p_dml_type
+WHEN 0 THEN
+SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+WHEN 1 THEN
+UPDATE t1 SET col2 = v_idx + 1 WHERE col1 = v_key;
+UPDATE t2 SET col2 = v_idx + 1 WHERE col1 = v_key;
+WHEN 2 THEN
+DELETE FROM t1 WHERE col1 = v_key;
+DELETE FROM t2 WHERE col1 = v_key;
+ELSE
+DELETE FROM t1;
+DELETE FROM t2;
+END CASE;
+SET v_idx = v_idx + 1;
+/* Commit or rollback work at specified frequency. */
+IF v_idx % p_frequency = 0 THEN
+SET v_commit = FLOOR(RAND() * 2);
+IF v_commit = 0 AND p_is_rand = 1 THEN
+ROLLBACK;
+START TRANSACTION;
+ELSE
+COMMIT;
+START TRANSACTION;
+END IF;
+END IF;
+END WHILE;
+COMMIT;
+END|
+call execute_dml(0, 0, 100, 100, 10, 0);
+CREATE TABLE t SELECT * FROM t1;
+CREATE TABLE t0 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t01 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t3 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t11 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t21 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+INSERT INTO t11 SELECT * FROM t;
+INSERT INTO t21 SELECT * FROM t;
+SHOW VARIABLES LIKE 'clone_ddl_timeout';
+Variable_name	Value
+clone_ddl_timeout	300
+SHOW VARIABLES LIKE 'clone_block_ddl';
+Variable_name	Value
+clone_block_ddl	OFF
+# 1. ALTER TABLE ADD COLUMN while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+ALTER TABLE t0 ADD COLUMN col5 int, ALGORITHM=COPY ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+ALTER TABLE t01 ADD COLUMN col5 int, ALGORITHM=COPY ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+ALTER TABLE t1 ADD COLUMN col5 int, ALGORITHM=COPY ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+ALTER TABLE t11 ADD COLUMN col5 int, ALGORITHM=COPY ;
+INSERT INTO t11 SELECT col1, col2, col3, col4, col2 + 100 FROM t ON DUPLICATE KEY UPDATE col2 = t11.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+ALTER TABLE t2 ADD COLUMN col5 int, ALGORITHM=COPY ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER TABLE t21 ADD COLUMN col5 int, ALGORITHM=COPY ;
+INSERT INTO t21 SELECT col1, col2, col3, col4, col2 + 100 FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;;
+ALTER TABLE t3 ADD COLUMN col5 int, ALGORITHM=COPY ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  `col5` int DEFAULT NULL,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	2	Clone Test Row - 0
+1	12	Clone Test Row - 1
+2	22	Clone Test Row - 2
+3	32	Clone Test Row - 3
+4	42	Clone Test Row - 4
+5	52	Clone Test Row - 5
+6	62	Clone Test Row - 6
+7	72	Clone Test Row - 7
+8	82	Clone Test Row - 8
+9	92	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	992	Clone Test Row - 99
+98	982	Clone Test Row - 98
+97	972	Clone Test Row - 97
+96	962	Clone Test Row - 96
+95	952	Clone Test Row - 95
+94	942	Clone Test Row - 94
+93	932	Clone Test Row - 93
+92	922	Clone Test Row - 92
+91	912	Clone Test Row - 91
+90	902	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  `col5` int DEFAULT NULL,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	11	Clone Test Row - 1
+2	21	Clone Test Row - 2
+3	31	Clone Test Row - 3
+4	41	Clone Test Row - 4
+5	51	Clone Test Row - 5
+6	61	Clone Test Row - 6
+7	71	Clone Test Row - 7
+8	81	Clone Test Row - 8
+9	91	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	991	Clone Test Row - 99
+98	981	Clone Test Row - 98
+97	971	Clone Test Row - 97
+96	961	Clone Test Row - 96
+95	951	Clone Test Row - 95
+94	941	Clone Test Row - 94
+93	931	Clone Test Row - 93
+92	921	Clone Test Row - 92
+91	911	Clone Test Row - 91
+90	901	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  `col5` int DEFAULT NULL,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	2	Clone Test Row - 0
+1	12	Clone Test Row - 1
+2	22	Clone Test Row - 2
+3	32	Clone Test Row - 3
+4	42	Clone Test Row - 4
+5	52	Clone Test Row - 5
+6	62	Clone Test Row - 6
+7	72	Clone Test Row - 7
+8	82	Clone Test Row - 8
+9	92	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	992	Clone Test Row - 99
+98	982	Clone Test Row - 98
+97	972	Clone Test Row - 97
+96	962	Clone Test Row - 96
+95	952	Clone Test Row - 95
+94	942	Clone Test Row - 94
+93	932	Clone Test Row - 93
+92	922	Clone Test Row - 92
+91	912	Clone Test Row - 91
+90	902	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# 2. ALTER TABLE DROP COLUMN while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+ALTER TABLE t0 DROP COLUMN col5, ALGORITHM=COPY ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+ALTER TABLE t01 DROP COLUMN col5, ALGORITHM=COPY ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+ALTER TABLE t1 DROP COLUMN col5, ALGORITHM=COPY ;
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+ALTER TABLE t11 DROP COLUMN col5, ALGORITHM=COPY ;
+INSERT INTO t11 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t11.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+ALTER TABLE t2 DROP COLUMN col5, ALGORITHM=COPY ;
+call execute_dml(1, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER TABLE t21 DROP COLUMN col5, ALGORITHM=COPY ;
+INSERT INTO t21 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;;
+ALTER TABLE t3 DROP COLUMN col5, ALGORITHM=COPY ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	2	Clone Test Row - 1
+2	3	Clone Test Row - 2
+3	4	Clone Test Row - 3
+4	5	Clone Test Row - 4
+5	6	Clone Test Row - 5
+6	7	Clone Test Row - 6
+7	8	Clone Test Row - 7
+8	9	Clone Test Row - 8
+9	10	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	100	Clone Test Row - 99
+98	99	Clone Test Row - 98
+97	98	Clone Test Row - 97
+96	97	Clone Test Row - 96
+95	96	Clone Test Row - 95
+94	95	Clone Test Row - 94
+93	94	Clone Test Row - 93
+92	93	Clone Test Row - 92
+91	92	Clone Test Row - 91
+90	91	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	2	Clone Test Row - 0
+1	12	Clone Test Row - 1
+2	22	Clone Test Row - 2
+3	32	Clone Test Row - 3
+4	42	Clone Test Row - 4
+5	52	Clone Test Row - 5
+6	62	Clone Test Row - 6
+7	72	Clone Test Row - 7
+8	82	Clone Test Row - 8
+9	92	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	992	Clone Test Row - 99
+98	982	Clone Test Row - 98
+97	972	Clone Test Row - 97
+96	962	Clone Test Row - 96
+95	952	Clone Test Row - 95
+94	942	Clone Test Row - 94
+93	932	Clone Test Row - 93
+92	922	Clone Test Row - 92
+91	912	Clone Test Row - 91
+90	902	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	2	Clone Test Row - 1
+2	3	Clone Test Row - 2
+3	4	Clone Test Row - 3
+4	5	Clone Test Row - 4
+5	6	Clone Test Row - 5
+6	7	Clone Test Row - 6
+7	8	Clone Test Row - 7
+8	9	Clone Test Row - 8
+9	10	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	100	Clone Test Row - 99
+98	99	Clone Test Row - 98
+97	98	Clone Test Row - 97
+96	97	Clone Test Row - 96
+95	96	Clone Test Row - 95
+94	95	Clone Test Row - 94
+93	94	Clone Test Row - 93
+92	93	Clone Test Row - 92
+91	92	Clone Test Row - 91
+90	91	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# 3. ADD INDEX while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+ALTER TABLE t0 ADD INDEX col2_idx(col2), ALGORITHM=COPY ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+ALTER TABLE t01 ADD INDEX col2_idx(col2), ALGORITHM=COPY ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+ALTER TABLE t1 ADD INDEX col2_idx(col2), ALGORITHM=COPY ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+ALTER TABLE t11 ADD INDEX col2_idx(col2), ALGORITHM=COPY ;
+INSERT INTO t11 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t11.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+ALTER TABLE t2 ADD INDEX col2_idx(col2), ALGORITHM=COPY ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER TABLE t21 ADD INDEX col2_idx(col2), ALGORITHM=COPY ;
+INSERT INTO t21 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;;
+ALTER TABLE t3 ADD INDEX col2_idx(col2), ALGORITHM=COPY ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`),
+  KEY `col2_idx` (`col2`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	3	Clone Test Row - 0
+1	4	Clone Test Row - 1
+2	5	Clone Test Row - 2
+3	6	Clone Test Row - 3
+4	7	Clone Test Row - 4
+5	8	Clone Test Row - 5
+6	9	Clone Test Row - 6
+7	10	Clone Test Row - 7
+8	11	Clone Test Row - 8
+9	12	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	102	Clone Test Row - 99
+98	101	Clone Test Row - 98
+97	100	Clone Test Row - 97
+96	99	Clone Test Row - 96
+95	98	Clone Test Row - 95
+94	97	Clone Test Row - 94
+93	96	Clone Test Row - 93
+92	95	Clone Test Row - 92
+91	94	Clone Test Row - 91
+90	93	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`),
+  KEY `col2_idx` (`col2`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	3	Clone Test Row - 0
+1	13	Clone Test Row - 1
+2	23	Clone Test Row - 2
+3	33	Clone Test Row - 3
+4	43	Clone Test Row - 4
+5	53	Clone Test Row - 5
+6	63	Clone Test Row - 6
+7	73	Clone Test Row - 7
+8	83	Clone Test Row - 8
+9	93	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	993	Clone Test Row - 99
+98	983	Clone Test Row - 98
+97	973	Clone Test Row - 97
+96	963	Clone Test Row - 96
+95	953	Clone Test Row - 95
+94	943	Clone Test Row - 94
+93	933	Clone Test Row - 93
+92	923	Clone Test Row - 92
+91	913	Clone Test Row - 91
+90	903	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`),
+  KEY `col2_idx` (`col2`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	3	Clone Test Row - 0
+1	4	Clone Test Row - 1
+2	5	Clone Test Row - 2
+3	6	Clone Test Row - 3
+4	7	Clone Test Row - 4
+5	8	Clone Test Row - 5
+6	9	Clone Test Row - 6
+7	10	Clone Test Row - 7
+8	11	Clone Test Row - 8
+9	12	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	102	Clone Test Row - 99
+98	101	Clone Test Row - 98
+97	100	Clone Test Row - 97
+96	99	Clone Test Row - 96
+95	98	Clone Test Row - 95
+94	97	Clone Test Row - 94
+93	96	Clone Test Row - 93
+92	95	Clone Test Row - 92
+91	94	Clone Test Row - 91
+90	93	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# 4. DROP INDEX while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+ALTER TABLE t0 DROP INDEX col2_idx, ALGORITHM=COPY ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+ALTER TABLE t01 DROP INDEX col2_idx, ALGORITHM=COPY ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+ALTER TABLE t1 DROP INDEX col2_idx, ALGORITHM=COPY ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+ALTER TABLE t11 DROP INDEX col2_idx, ALGORITHM=COPY ;
+INSERT INTO t11 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t11.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+ALTER TABLE t2 DROP INDEX col2_idx, ALGORITHM=COPY ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER TABLE t21 DROP INDEX col2_idx, ALGORITHM=COPY ;
+INSERT INTO t21 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;;
+ALTER TABLE t3 DROP INDEX col2_idx, ALGORITHM=COPY ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	5	Clone Test Row - 0
+1	6	Clone Test Row - 1
+2	7	Clone Test Row - 2
+3	8	Clone Test Row - 3
+4	9	Clone Test Row - 4
+5	10	Clone Test Row - 5
+6	11	Clone Test Row - 6
+7	12	Clone Test Row - 7
+8	13	Clone Test Row - 8
+9	14	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	104	Clone Test Row - 99
+98	103	Clone Test Row - 98
+97	102	Clone Test Row - 97
+96	101	Clone Test Row - 96
+95	100	Clone Test Row - 95
+94	99	Clone Test Row - 94
+93	98	Clone Test Row - 93
+92	97	Clone Test Row - 92
+91	96	Clone Test Row - 91
+90	95	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	4	Clone Test Row - 0
+1	14	Clone Test Row - 1
+2	24	Clone Test Row - 2
+3	34	Clone Test Row - 3
+4	44	Clone Test Row - 4
+5	54	Clone Test Row - 5
+6	64	Clone Test Row - 6
+7	74	Clone Test Row - 7
+8	84	Clone Test Row - 8
+9	94	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	994	Clone Test Row - 99
+98	984	Clone Test Row - 98
+97	974	Clone Test Row - 97
+96	964	Clone Test Row - 96
+95	954	Clone Test Row - 95
+94	944	Clone Test Row - 94
+93	934	Clone Test Row - 93
+92	924	Clone Test Row - 92
+91	914	Clone Test Row - 91
+90	904	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	5	Clone Test Row - 0
+1	6	Clone Test Row - 1
+2	7	Clone Test Row - 2
+3	8	Clone Test Row - 3
+4	9	Clone Test Row - 4
+5	10	Clone Test Row - 5
+6	11	Clone Test Row - 6
+7	12	Clone Test Row - 7
+8	13	Clone Test Row - 8
+9	14	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	104	Clone Test Row - 99
+98	103	Clone Test Row - 98
+97	102	Clone Test Row - 97
+96	101	Clone Test Row - 96
+95	100	Clone Test Row - 95
+94	99	Clone Test Row - 94
+93	98	Clone Test Row - 93
+92	97	Clone Test Row - 92
+91	96	Clone Test Row - 91
+90	95	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# Cleanup
+DROP TABLE t;
+DROP TABLE t1;
+DROP TABLE t2;
+DROP PROCEDURE execute_dml;
+DROP TABLE t0;
+DROP TABLE t01;
+DROP TABLE t3;
+DROP TABLE t11;
+DROP TABLE t21;
+# Uninstall clone
+UNINSTALL PLUGIN clone;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_ddl_alter_inplace.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_ddl_alter_inplace.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_ddl_alter_inplace.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_ddl_alter_inplace.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,833 @@
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+PARTITION BY KEY(col1) PARTITIONS 5;
+CREATE PROCEDURE execute_dml(
+p_dml_type	INT,
+p_key_min	INT,
+p_key_range	INT,
+p_loop_count	INT,
+p_frequency	INT,
+p_is_rand	INT)
+BEGIN
+DECLARE v_idx		INT DEFAULT 0;
+DECLARE v_commit	INT DEFAULT 0;
+DECLARE v_key		INT DEFAULT 0;
+/* Loop and INSERT data at random position */
+WHILE(v_idx < p_loop_count) DO
+/* Generate key between 1 to p_loop_count */
+IF p_is_rand = 1 THEN
+SET v_key = p_key_min + FLOOR(RAND() * p_key_range);
+ELSE
+SET v_key = p_key_min + (v_idx  % p_key_range);
+END IF;
+CASE p_dml_type
+WHEN 0 THEN
+SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+WHEN 1 THEN
+UPDATE t1 SET col2 = v_idx + 1 WHERE col1 = v_key;
+UPDATE t2 SET col2 = v_idx + 1 WHERE col1 = v_key;
+WHEN 2 THEN
+DELETE FROM t1 WHERE col1 = v_key;
+DELETE FROM t2 WHERE col1 = v_key;
+ELSE
+DELETE FROM t1;
+DELETE FROM t2;
+END CASE;
+SET v_idx = v_idx + 1;
+/* Commit or rollback work at specified frequency. */
+IF v_idx % p_frequency = 0 THEN
+SET v_commit = FLOOR(RAND() * 2);
+IF v_commit = 0 AND p_is_rand = 1 THEN
+ROLLBACK;
+START TRANSACTION;
+ELSE
+COMMIT;
+START TRANSACTION;
+END IF;
+END IF;
+END WHILE;
+COMMIT;
+END|
+call execute_dml(0, 0, 100, 100, 10, 0);
+CREATE TABLE t SELECT * FROM t1;
+CREATE TABLE t0 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t01 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t3 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t11 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t21 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+INSERT INTO t11 SELECT * FROM t;
+INSERT INTO t21 SELECT * FROM t;
+SHOW VARIABLES LIKE 'clone_ddl_timeout';
+Variable_name	Value
+clone_ddl_timeout	300
+SHOW VARIABLES LIKE 'clone_block_ddl';
+Variable_name	Value
+clone_block_ddl	OFF
+# 1. ALTER TABLE ADD COLUMN while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+ALTER TABLE t0 ADD COLUMN col5 int, ALGORITHM=INPLACE ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+ALTER TABLE t01 ADD COLUMN col5 int, ALGORITHM=INPLACE ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+ALTER TABLE t1 ADD COLUMN col5 int, ALGORITHM=INPLACE ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_page';
+ALTER TABLE t2 ADD COLUMN col5 int, ALGORITHM=INPLACE ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER TABLE t21 ADD COLUMN col5 int, ALGORITHM=INPLACE ;
+INSERT INTO t21 SELECT col1, col2, col3, col4, col2 + 100 FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;;
+ALTER TABLE t3 ADD COLUMN col5 int, ALGORITHM=INPLACE ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  `col5` int DEFAULT NULL,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	11	Clone Test Row - 1
+2	21	Clone Test Row - 2
+3	31	Clone Test Row - 3
+4	41	Clone Test Row - 4
+5	51	Clone Test Row - 5
+6	61	Clone Test Row - 6
+7	71	Clone Test Row - 7
+8	81	Clone Test Row - 8
+9	91	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	991	Clone Test Row - 99
+98	981	Clone Test Row - 98
+97	971	Clone Test Row - 97
+96	961	Clone Test Row - 96
+95	951	Clone Test Row - 95
+94	941	Clone Test Row - 94
+93	931	Clone Test Row - 93
+92	921	Clone Test Row - 92
+91	911	Clone Test Row - 91
+90	901	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	11	Clone Test Row - 1
+2	21	Clone Test Row - 2
+3	31	Clone Test Row - 3
+4	41	Clone Test Row - 4
+5	51	Clone Test Row - 5
+6	61	Clone Test Row - 6
+7	71	Clone Test Row - 7
+8	81	Clone Test Row - 8
+9	91	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	991	Clone Test Row - 99
+98	981	Clone Test Row - 98
+97	971	Clone Test Row - 97
+96	961	Clone Test Row - 96
+95	951	Clone Test Row - 95
+94	941	Clone Test Row - 94
+93	931	Clone Test Row - 93
+92	921	Clone Test Row - 92
+91	911	Clone Test Row - 91
+90	901	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# 2. ALTER TABLE DROP COLUMN while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+ALTER TABLE t0 DROP COLUMN col5, ALGORITHM=INPLACE ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+ALTER TABLE t01 DROP COLUMN col5, ALGORITHM=INPLACE ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+ALTER TABLE t1 DROP COLUMN col5, ALGORITHM=INPLACE ;
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_page';
+ALTER TABLE t2 DROP COLUMN col5, ALGORITHM=INPLACE ;
+call execute_dml(1, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER TABLE t21 DROP COLUMN col5, ALGORITHM=INPLACE ;
+INSERT INTO t21 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;;
+ALTER TABLE t3 DROP COLUMN col5, ALGORITHM=INPLACE ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	2	Clone Test Row - 1
+2	3	Clone Test Row - 2
+3	4	Clone Test Row - 3
+4	5	Clone Test Row - 4
+5	6	Clone Test Row - 5
+6	7	Clone Test Row - 6
+7	8	Clone Test Row - 7
+8	9	Clone Test Row - 8
+9	10	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	100	Clone Test Row - 99
+98	99	Clone Test Row - 98
+97	98	Clone Test Row - 97
+96	97	Clone Test Row - 96
+95	96	Clone Test Row - 95
+94	95	Clone Test Row - 94
+93	94	Clone Test Row - 93
+92	93	Clone Test Row - 92
+91	92	Clone Test Row - 91
+90	91	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  `col5` int DEFAULT NULL,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	2	Clone Test Row - 1
+2	3	Clone Test Row - 2
+3	4	Clone Test Row - 3
+4	5	Clone Test Row - 4
+5	6	Clone Test Row - 5
+6	7	Clone Test Row - 6
+7	8	Clone Test Row - 7
+8	9	Clone Test Row - 8
+9	10	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	100	Clone Test Row - 99
+98	99	Clone Test Row - 98
+97	98	Clone Test Row - 97
+96	97	Clone Test Row - 96
+95	96	Clone Test Row - 95
+94	95	Clone Test Row - 94
+93	94	Clone Test Row - 93
+92	93	Clone Test Row - 92
+91	92	Clone Test Row - 91
+90	91	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# 3. ADD INDEX while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+ALTER TABLE t0 ADD INDEX col2_idx(col2), ALGORITHM=INPLACE ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+ALTER TABLE t01 ADD INDEX col2_idx(col2), ALGORITHM=INPLACE ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+ALTER TABLE t1 ADD INDEX col2_idx(col2), ALGORITHM=INPLACE ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_page';
+ALTER TABLE t2 ADD INDEX col2_idx(col2), ALGORITHM=INPLACE ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER TABLE t21 ADD INDEX col2_idx(col2), ALGORITHM=INPLACE ;
+INSERT INTO t21 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;;
+ALTER TABLE t3 ADD INDEX col2_idx(col2), ALGORITHM=INPLACE ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`),
+  KEY `col2_idx` (`col2`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	2	Clone Test Row - 0
+1	3	Clone Test Row - 1
+2	4	Clone Test Row - 2
+3	5	Clone Test Row - 3
+4	6	Clone Test Row - 4
+5	7	Clone Test Row - 5
+6	8	Clone Test Row - 6
+7	9	Clone Test Row - 7
+8	10	Clone Test Row - 8
+9	11	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	101	Clone Test Row - 99
+98	100	Clone Test Row - 98
+97	99	Clone Test Row - 97
+96	98	Clone Test Row - 96
+95	97	Clone Test Row - 95
+94	96	Clone Test Row - 94
+93	95	Clone Test Row - 93
+92	94	Clone Test Row - 92
+91	93	Clone Test Row - 91
+90	92	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	2	Clone Test Row - 0
+1	3	Clone Test Row - 1
+2	4	Clone Test Row - 2
+3	5	Clone Test Row - 3
+4	6	Clone Test Row - 4
+5	7	Clone Test Row - 5
+6	8	Clone Test Row - 6
+7	9	Clone Test Row - 7
+8	10	Clone Test Row - 8
+9	11	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	101	Clone Test Row - 99
+98	100	Clone Test Row - 98
+97	99	Clone Test Row - 97
+96	98	Clone Test Row - 96
+95	97	Clone Test Row - 95
+94	96	Clone Test Row - 94
+93	95	Clone Test Row - 93
+92	94	Clone Test Row - 92
+91	93	Clone Test Row - 91
+90	92	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# 4. DROP INDEX while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+ALTER TABLE t0 DROP INDEX col2_idx, ALGORITHM=INPLACE ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+ALTER TABLE t01 DROP INDEX col2_idx, ALGORITHM=INPLACE ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+ALTER TABLE t1 DROP INDEX col2_idx, ALGORITHM=INPLACE ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_page';
+ALTER TABLE t2 DROP INDEX col2_idx, ALGORITHM=INPLACE ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER TABLE t21 DROP INDEX col2_idx, ALGORITHM=INPLACE ;
+INSERT INTO t21 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;;
+ALTER TABLE t3 DROP INDEX col2_idx, ALGORITHM=INPLACE ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	5	Clone Test Row - 0
+1	6	Clone Test Row - 1
+2	7	Clone Test Row - 2
+3	8	Clone Test Row - 3
+4	9	Clone Test Row - 4
+5	10	Clone Test Row - 5
+6	11	Clone Test Row - 6
+7	12	Clone Test Row - 7
+8	13	Clone Test Row - 8
+9	14	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	104	Clone Test Row - 99
+98	103	Clone Test Row - 98
+97	102	Clone Test Row - 97
+96	101	Clone Test Row - 96
+95	100	Clone Test Row - 95
+94	99	Clone Test Row - 94
+93	98	Clone Test Row - 93
+92	97	Clone Test Row - 92
+91	96	Clone Test Row - 91
+90	95	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	5	Clone Test Row - 0
+1	6	Clone Test Row - 1
+2	7	Clone Test Row - 2
+3	8	Clone Test Row - 3
+4	9	Clone Test Row - 4
+5	10	Clone Test Row - 5
+6	11	Clone Test Row - 6
+7	12	Clone Test Row - 7
+8	13	Clone Test Row - 8
+9	14	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	104	Clone Test Row - 99
+98	103	Clone Test Row - 98
+97	102	Clone Test Row - 97
+96	101	Clone Test Row - 96
+95	100	Clone Test Row - 95
+94	99	Clone Test Row - 94
+93	98	Clone Test Row - 93
+92	97	Clone Test Row - 92
+91	96	Clone Test Row - 91
+90	95	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# Cleanup
+DROP TABLE t;
+DROP TABLE t1;
+DROP TABLE t2;
+DROP PROCEDURE execute_dml;
+DROP TABLE t0;
+DROP TABLE t01;
+DROP TABLE t3;
+DROP TABLE t11;
+DROP TABLE t21;
+# Uninstall clone
+UNINSTALL PLUGIN clone;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_ddl_basic_restart.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_ddl_basic_restart.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_ddl_basic_restart.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_ddl_basic_restart.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,348 @@
+SET global debug="+d,clone_restart_apply";
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+PARTITION BY KEY(col1) PARTITIONS 5;
+CREATE PROCEDURE execute_dml(
+p_dml_type	INT,
+p_key_min	INT,
+p_key_range	INT,
+p_loop_count	INT,
+p_frequency	INT,
+p_is_rand	INT)
+BEGIN
+DECLARE v_idx		INT DEFAULT 0;
+DECLARE v_commit	INT DEFAULT 0;
+DECLARE v_key		INT DEFAULT 0;
+/* Loop and INSERT data at random position */
+WHILE(v_idx < p_loop_count) DO
+/* Generate key between 1 to p_loop_count */
+IF p_is_rand = 1 THEN
+SET v_key = p_key_min + FLOOR(RAND() * p_key_range);
+ELSE
+SET v_key = p_key_min + (v_idx  % p_key_range);
+END IF;
+CASE p_dml_type
+WHEN 0 THEN
+SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+WHEN 1 THEN
+UPDATE t1 SET col2 = v_idx + 1 WHERE col1 = v_key;
+UPDATE t2 SET col2 = v_idx + 1 WHERE col1 = v_key;
+WHEN 2 THEN
+DELETE FROM t1 WHERE col1 = v_key;
+DELETE FROM t2 WHERE col1 = v_key;
+ELSE
+DELETE FROM t1;
+DELETE FROM t2;
+END CASE;
+SET v_idx = v_idx + 1;
+/* Commit or rollback work at specified frequency. */
+IF v_idx % p_frequency = 0 THEN
+SET v_commit = FLOOR(RAND() * 2);
+IF v_commit = 0 AND p_is_rand = 1 THEN
+ROLLBACK;
+START TRANSACTION;
+ELSE
+COMMIT;
+START TRANSACTION;
+END IF;
+END IF;
+END WHILE;
+COMMIT;
+END|
+call execute_dml(0, 0, 100, 100, 10, 0);
+CREATE TABLE t SELECT * FROM t1;
+DROP table t1;
+DROP table t2;
+SHOW VARIABLES LIKE 'clone_ddl_timeout';
+Variable_name	Value
+clone_ddl_timeout	300
+SHOW VARIABLES LIKE 'clone_block_ddl';
+Variable_name	Value
+clone_block_ddl	OFF
+# 1. CREATE TABLE while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+CREATE TABLE t0 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) PARTITION BY KEY(col1) PARTITIONS 5;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+CREATE TABLE t01 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) PARTITION BY KEY(col1) PARTITIONS 5;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+CREATE TABLE t1 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) PARTITION BY KEY(col1) PARTITIONS 5;
+INSERT INTO t1 SELECT * FROM t;
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+CREATE TABLE t11 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) PARTITION BY KEY(col1) PARTITIONS 5;
+INSERT INTO t11 SELECT * FROM t;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+CREATE TABLE t2 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) PARTITION BY KEY(col1) PARTITIONS 5;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+CREATE TABLE t21 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) PARTITION BY KEY(col1) PARTITIONS 5;
+INSERT INTO t21 SELECT * FROM t;
+CREATE TABLE t3 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) PARTITION BY KEY(col1) PARTITIONS 5;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	11	Clone Test Row - 1
+2	21	Clone Test Row - 2
+3	31	Clone Test Row - 3
+4	41	Clone Test Row - 4
+5	51	Clone Test Row - 5
+6	61	Clone Test Row - 6
+7	71	Clone Test Row - 7
+8	81	Clone Test Row - 8
+9	91	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	991	Clone Test Row - 99
+98	981	Clone Test Row - 98
+97	971	Clone Test Row - 97
+96	961	Clone Test Row - 96
+95	951	Clone Test Row - 95
+94	941	Clone Test Row - 94
+93	931	Clone Test Row - 93
+92	921	Clone Test Row - 92
+91	911	Clone Test Row - 91
+90	901	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+CALL execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# 2. DROP TABLE while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+DROP TABLE t0  ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+DROP TABLE t01  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+DROP TABLE t1  ;
+SHOW TABLES;
+Tables_in_test
+t
+t11
+t2
+t21
+t3
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+DROP TABLE t11  ;
+SHOW TABLES;
+Tables_in_test
+t
+t2
+t21
+t3
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+DROP TABLE t2  ;
+SHOW TABLES;
+Tables_in_test
+t
+t21
+t3
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+DROP TABLE t21  ;
+SHOW TABLES;
+Tables_in_test
+t
+t3
+DROP TABLE t3  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t21
+t3
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# Cleanup
+DROP TABLE t;
+CREATE TABLE t1 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+DROP TABLE t1;
+DROP TABLE t2;
+DROP PROCEDURE execute_dml;
+# Uninstall clone
+UNINSTALL PLUGIN clone;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_ddl_basic.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_ddl_basic.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_ddl_basic.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_ddl_basic.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,347 @@
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+PARTITION BY KEY(col1) PARTITIONS 5;
+CREATE PROCEDURE execute_dml(
+p_dml_type	INT,
+p_key_min	INT,
+p_key_range	INT,
+p_loop_count	INT,
+p_frequency	INT,
+p_is_rand	INT)
+BEGIN
+DECLARE v_idx		INT DEFAULT 0;
+DECLARE v_commit	INT DEFAULT 0;
+DECLARE v_key		INT DEFAULT 0;
+/* Loop and INSERT data at random position */
+WHILE(v_idx < p_loop_count) DO
+/* Generate key between 1 to p_loop_count */
+IF p_is_rand = 1 THEN
+SET v_key = p_key_min + FLOOR(RAND() * p_key_range);
+ELSE
+SET v_key = p_key_min + (v_idx  % p_key_range);
+END IF;
+CASE p_dml_type
+WHEN 0 THEN
+SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+WHEN 1 THEN
+UPDATE t1 SET col2 = v_idx + 1 WHERE col1 = v_key;
+UPDATE t2 SET col2 = v_idx + 1 WHERE col1 = v_key;
+WHEN 2 THEN
+DELETE FROM t1 WHERE col1 = v_key;
+DELETE FROM t2 WHERE col1 = v_key;
+ELSE
+DELETE FROM t1;
+DELETE FROM t2;
+END CASE;
+SET v_idx = v_idx + 1;
+/* Commit or rollback work at specified frequency. */
+IF v_idx % p_frequency = 0 THEN
+SET v_commit = FLOOR(RAND() * 2);
+IF v_commit = 0 AND p_is_rand = 1 THEN
+ROLLBACK;
+START TRANSACTION;
+ELSE
+COMMIT;
+START TRANSACTION;
+END IF;
+END IF;
+END WHILE;
+COMMIT;
+END|
+call execute_dml(0, 0, 100, 100, 10, 0);
+CREATE TABLE t SELECT * FROM t1;
+DROP table t1;
+DROP table t2;
+SHOW VARIABLES LIKE 'clone_ddl_timeout';
+Variable_name	Value
+clone_ddl_timeout	300
+SHOW VARIABLES LIKE 'clone_block_ddl';
+Variable_name	Value
+clone_block_ddl	OFF
+# 1. CREATE TABLE while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+CREATE TABLE t0 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) PARTITION BY KEY(col1) PARTITIONS 5;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+CREATE TABLE t01 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) PARTITION BY KEY(col1) PARTITIONS 5;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+CREATE TABLE t1 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) PARTITION BY KEY(col1) PARTITIONS 5;
+INSERT INTO t1 SELECT * FROM t;
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+CREATE TABLE t11 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) PARTITION BY KEY(col1) PARTITIONS 5;
+INSERT INTO t11 SELECT * FROM t;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+CREATE TABLE t2 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) PARTITION BY KEY(col1) PARTITIONS 5;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+CREATE TABLE t21 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) PARTITION BY KEY(col1) PARTITIONS 5;
+INSERT INTO t21 SELECT * FROM t;
+CREATE TABLE t3 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) PARTITION BY KEY(col1) PARTITIONS 5;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	11	Clone Test Row - 1
+2	21	Clone Test Row - 2
+3	31	Clone Test Row - 3
+4	41	Clone Test Row - 4
+5	51	Clone Test Row - 5
+6	61	Clone Test Row - 6
+7	71	Clone Test Row - 7
+8	81	Clone Test Row - 8
+9	91	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	991	Clone Test Row - 99
+98	981	Clone Test Row - 98
+97	971	Clone Test Row - 97
+96	961	Clone Test Row - 96
+95	951	Clone Test Row - 95
+94	941	Clone Test Row - 94
+93	931	Clone Test Row - 93
+92	921	Clone Test Row - 92
+91	911	Clone Test Row - 91
+90	901	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+CALL execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# 2. DROP TABLE while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+DROP TABLE t0  ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+DROP TABLE t01  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+DROP TABLE t1  ;
+SHOW TABLES;
+Tables_in_test
+t
+t11
+t2
+t21
+t3
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+DROP TABLE t11  ;
+SHOW TABLES;
+Tables_in_test
+t
+t2
+t21
+t3
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+DROP TABLE t2  ;
+SHOW TABLES;
+Tables_in_test
+t
+t21
+t3
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+DROP TABLE t21  ;
+SHOW TABLES;
+Tables_in_test
+t
+t3
+DROP TABLE t3  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t21
+t3
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# Cleanup
+DROP TABLE t;
+CREATE TABLE t1 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+DROP TABLE t1;
+DROP TABLE t2;
+DROP PROCEDURE execute_dml;
+# Uninstall clone
+UNINSTALL PLUGIN clone;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_ddl_compress_encrypt.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_ddl_compress_encrypt.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_ddl_compress_encrypt.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_ddl_compress_encrypt.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,721 @@
+# Prepare for creating Encrypted Table
+# create bootstrap file
+# Create and start mysqld with keyring plugin.
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+PARTITION BY KEY(col1) PARTITIONS 5;
+CREATE PROCEDURE execute_dml(
+p_dml_type	INT,
+p_key_min	INT,
+p_key_range	INT,
+p_loop_count	INT,
+p_frequency	INT,
+p_is_rand	INT)
+BEGIN
+DECLARE v_idx		INT DEFAULT 0;
+DECLARE v_commit	INT DEFAULT 0;
+DECLARE v_key		INT DEFAULT 0;
+/* Loop and INSERT data at random position */
+WHILE(v_idx < p_loop_count) DO
+/* Generate key between 1 to p_loop_count */
+IF p_is_rand = 1 THEN
+SET v_key = p_key_min + FLOOR(RAND() * p_key_range);
+ELSE
+SET v_key = p_key_min + (v_idx  % p_key_range);
+END IF;
+CASE p_dml_type
+WHEN 0 THEN
+SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+WHEN 1 THEN
+UPDATE t1 SET col2 = v_idx + 1 WHERE col1 = v_key;
+UPDATE t2 SET col2 = v_idx + 1 WHERE col1 = v_key;
+WHEN 2 THEN
+DELETE FROM t1 WHERE col1 = v_key;
+DELETE FROM t2 WHERE col1 = v_key;
+ELSE
+DELETE FROM t1;
+DELETE FROM t2;
+END CASE;
+SET v_idx = v_idx + 1;
+/* Commit or rollback work at specified frequency. */
+IF v_idx % p_frequency = 0 THEN
+SET v_commit = FLOOR(RAND() * 2);
+IF v_commit = 0 AND p_is_rand = 1 THEN
+ROLLBACK;
+START TRANSACTION;
+ELSE
+COMMIT;
+START TRANSACTION;
+END IF;
+END IF;
+END WHILE;
+COMMIT;
+END|
+call execute_dml(0, 0, 100, 100, 10, 0);
+CREATE TABLE t SELECT * FROM t1;
+DROP table t1;
+DROP table t2;
+SHOW VARIABLES LIKE 'clone_ddl_timeout';
+Variable_name	Value
+clone_ddl_timeout	300
+SHOW VARIABLES LIKE 'clone_block_ddl';
+Variable_name	Value
+clone_block_ddl	OFF
+# 1. CREATE TABLE with encryption while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+SET GLOBAL DEBUG = '+d,log_redo_with_invalid_master_key';
+CREATE TABLE t0 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ENCRYPTION = "Y" COMPRESSION = "LZ4";
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+CREATE TABLE t01 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ENCRYPTION = "Y" COMPRESSION = "LZ4";
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+CREATE TABLE t1 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ENCRYPTION = "Y" COMPRESSION = "LZ4";
+INSERT INTO t1 SELECT * FROM t;
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+CREATE TABLE t11 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ENCRYPTION = "Y" COMPRESSION = "LZ4";
+INSERT INTO t11 SELECT * FROM t;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+CREATE TABLE t2 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ENCRYPTION = "Y" COMPRESSION = "LZ4";
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+CREATE TABLE t21 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ENCRYPTION = "Y" COMPRESSION = "LZ4";
+INSERT INTO t21 SELECT * FROM t;
+CREATE TABLE t3 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ENCRYPTION = "Y" COMPRESSION = "LZ4";
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='LZ4' ENCRYPTION='Y'
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	11	Clone Test Row - 1
+2	21	Clone Test Row - 2
+3	31	Clone Test Row - 3
+4	41	Clone Test Row - 4
+5	51	Clone Test Row - 5
+6	61	Clone Test Row - 6
+7	71	Clone Test Row - 7
+8	81	Clone Test Row - 8
+9	91	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	991	Clone Test Row - 99
+98	981	Clone Test Row - 98
+97	971	Clone Test Row - 97
+96	961	Clone Test Row - 96
+95	951	Clone Test Row - 95
+94	941	Clone Test Row - 94
+93	931	Clone Test Row - 93
+92	921	Clone Test Row - 92
+91	911	Clone Test Row - 91
+90	901	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='LZ4' ENCRYPTION='Y'
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='LZ4' ENCRYPTION='Y'
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+SET DEBUG_SYNC = 'RESET';
+# 2. ALTER TABLE remove encryption while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+SET GLOBAL DEBUG = '+d,log_redo_with_invalid_master_key';
+ALTER TABLE t0 ENCRYPTION = "N" COMPRESSION = "None" ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+ALTER TABLE t01 ENCRYPTION = "N" COMPRESSION = "None" ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+ALTER TABLE t1 ENCRYPTION = "N" COMPRESSION = "None" ;
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+ALTER TABLE t11 ENCRYPTION = "N" COMPRESSION = "None" ;
+INSERT INTO t11 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t11.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+ALTER TABLE t2 ENCRYPTION = "N" COMPRESSION = "None" ;
+call execute_dml(1, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER TABLE t21 ENCRYPTION = "N" COMPRESSION = "None" ;
+INSERT INTO t21 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;;
+ALTER TABLE t3 ENCRYPTION = "N" COMPRESSION = "None" ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='None'
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	2	Clone Test Row - 1
+2	3	Clone Test Row - 2
+3	4	Clone Test Row - 3
+4	5	Clone Test Row - 4
+5	6	Clone Test Row - 5
+6	7	Clone Test Row - 6
+7	8	Clone Test Row - 7
+8	9	Clone Test Row - 8
+9	10	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	100	Clone Test Row - 99
+98	99	Clone Test Row - 98
+97	98	Clone Test Row - 97
+96	97	Clone Test Row - 96
+95	96	Clone Test Row - 95
+94	95	Clone Test Row - 94
+93	94	Clone Test Row - 93
+92	93	Clone Test Row - 92
+91	92	Clone Test Row - 91
+90	91	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='None'
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	11	Clone Test Row - 1
+2	21	Clone Test Row - 2
+3	31	Clone Test Row - 3
+4	41	Clone Test Row - 4
+5	51	Clone Test Row - 5
+6	61	Clone Test Row - 6
+7	71	Clone Test Row - 7
+8	81	Clone Test Row - 8
+9	91	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	991	Clone Test Row - 99
+98	981	Clone Test Row - 98
+97	971	Clone Test Row - 97
+96	961	Clone Test Row - 96
+95	951	Clone Test Row - 95
+94	941	Clone Test Row - 94
+93	931	Clone Test Row - 93
+92	921	Clone Test Row - 92
+91	911	Clone Test Row - 91
+90	901	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='None'
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	2	Clone Test Row - 1
+2	3	Clone Test Row - 2
+3	4	Clone Test Row - 3
+4	5	Clone Test Row - 4
+5	6	Clone Test Row - 5
+6	7	Clone Test Row - 6
+7	8	Clone Test Row - 7
+8	9	Clone Test Row - 8
+9	10	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	100	Clone Test Row - 99
+98	99	Clone Test Row - 98
+97	98	Clone Test Row - 97
+96	97	Clone Test Row - 96
+95	96	Clone Test Row - 95
+94	95	Clone Test Row - 94
+93	94	Clone Test Row - 93
+92	93	Clone Test Row - 92
+91	92	Clone Test Row - 91
+90	91	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+SET DEBUG_SYNC = 'RESET';
+# 3. ALTER TABLE add encryption while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+SET GLOBAL DEBUG = '+d,log_redo_with_invalid_master_key';
+ALTER TABLE t0 ENCRYPTION = "Y" COMPRESSION = "LZ4" ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+ALTER TABLE t01 ENCRYPTION = "Y" COMPRESSION = "LZ4" ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+ALTER TABLE t1 ENCRYPTION = "Y" COMPRESSION = "LZ4" ;
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+ALTER TABLE t11 ENCRYPTION = "Y" COMPRESSION = "LZ4" ;
+INSERT INTO t11 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t11.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+ALTER TABLE t2 ENCRYPTION = "Y" COMPRESSION = "LZ4" ;
+call execute_dml(1, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER TABLE t21 ENCRYPTION = "Y" COMPRESSION = "LZ4" ;
+INSERT INTO t21 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;;
+ALTER TABLE t3 ENCRYPTION = "Y" COMPRESSION = "LZ4" ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='LZ4' ENCRYPTION='Y'
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	2	Clone Test Row - 1
+2	3	Clone Test Row - 2
+3	4	Clone Test Row - 3
+4	5	Clone Test Row - 4
+5	6	Clone Test Row - 5
+6	7	Clone Test Row - 6
+7	8	Clone Test Row - 7
+8	9	Clone Test Row - 8
+9	10	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	100	Clone Test Row - 99
+98	99	Clone Test Row - 98
+97	98	Clone Test Row - 97
+96	97	Clone Test Row - 96
+95	96	Clone Test Row - 95
+94	95	Clone Test Row - 94
+93	94	Clone Test Row - 93
+92	93	Clone Test Row - 92
+91	92	Clone Test Row - 91
+90	91	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='LZ4' ENCRYPTION='Y'
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	2	Clone Test Row - 0
+1	12	Clone Test Row - 1
+2	22	Clone Test Row - 2
+3	32	Clone Test Row - 3
+4	42	Clone Test Row - 4
+5	52	Clone Test Row - 5
+6	62	Clone Test Row - 6
+7	72	Clone Test Row - 7
+8	82	Clone Test Row - 8
+9	92	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	992	Clone Test Row - 99
+98	982	Clone Test Row - 98
+97	972	Clone Test Row - 97
+96	962	Clone Test Row - 96
+95	952	Clone Test Row - 95
+94	942	Clone Test Row - 94
+93	932	Clone Test Row - 93
+92	922	Clone Test Row - 92
+91	912	Clone Test Row - 91
+90	902	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='LZ4' ENCRYPTION='Y'
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	2	Clone Test Row - 1
+2	3	Clone Test Row - 2
+3	4	Clone Test Row - 3
+4	5	Clone Test Row - 4
+5	6	Clone Test Row - 5
+6	7	Clone Test Row - 6
+7	8	Clone Test Row - 7
+8	9	Clone Test Row - 8
+9	10	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	100	Clone Test Row - 99
+98	99	Clone Test Row - 98
+97	98	Clone Test Row - 97
+96	97	Clone Test Row - 96
+95	96	Clone Test Row - 95
+94	95	Clone Test Row - 94
+93	94	Clone Test Row - 93
+92	93	Clone Test Row - 92
+91	92	Clone Test Row - 91
+90	91	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+SET DEBUG_SYNC = 'RESET';
+# 2. DROP TABLE while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+SET GLOBAL DEBUG = '+d,log_redo_with_invalid_master_key';
+DROP TABLE t0  ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+DROP TABLE t01  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+DROP TABLE t1  ;
+SHOW TABLES;
+Tables_in_test
+t
+t11
+t2
+t21
+t3
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+DROP TABLE t11  ;
+SHOW TABLES;
+Tables_in_test
+t
+t2
+t21
+t3
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+DROP TABLE t2  ;
+SHOW TABLES;
+Tables_in_test
+t
+t21
+t3
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+DROP TABLE t21  ;
+SHOW TABLES;
+Tables_in_test
+t
+t3
+DROP TABLE t3  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t21
+t3
+# Restart server back on base data directory
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+SET DEBUG_SYNC = 'RESET';
+# Cleanup
+DROP TABLE t;
+CREATE TABLE t1 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+DROP TABLE t1;
+DROP TABLE t2;
+DROP PROCEDURE execute_dml;
+# Uninstall clone
+UNINSTALL PLUGIN clone;
+# Restart server and remove encrypted data directory
+# restart:
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_ddl_compress.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_ddl_compress.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_ddl_compress.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_ddl_compress.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,721 @@
+# Prepare for creating Encrypted Table
+# create bootstrap file
+# Create and start mysqld with keyring plugin.
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+PARTITION BY KEY(col1) PARTITIONS 5;
+CREATE PROCEDURE execute_dml(
+p_dml_type	INT,
+p_key_min	INT,
+p_key_range	INT,
+p_loop_count	INT,
+p_frequency	INT,
+p_is_rand	INT)
+BEGIN
+DECLARE v_idx		INT DEFAULT 0;
+DECLARE v_commit	INT DEFAULT 0;
+DECLARE v_key		INT DEFAULT 0;
+/* Loop and INSERT data at random position */
+WHILE(v_idx < p_loop_count) DO
+/* Generate key between 1 to p_loop_count */
+IF p_is_rand = 1 THEN
+SET v_key = p_key_min + FLOOR(RAND() * p_key_range);
+ELSE
+SET v_key = p_key_min + (v_idx  % p_key_range);
+END IF;
+CASE p_dml_type
+WHEN 0 THEN
+SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+WHEN 1 THEN
+UPDATE t1 SET col2 = v_idx + 1 WHERE col1 = v_key;
+UPDATE t2 SET col2 = v_idx + 1 WHERE col1 = v_key;
+WHEN 2 THEN
+DELETE FROM t1 WHERE col1 = v_key;
+DELETE FROM t2 WHERE col1 = v_key;
+ELSE
+DELETE FROM t1;
+DELETE FROM t2;
+END CASE;
+SET v_idx = v_idx + 1;
+/* Commit or rollback work at specified frequency. */
+IF v_idx % p_frequency = 0 THEN
+SET v_commit = FLOOR(RAND() * 2);
+IF v_commit = 0 AND p_is_rand = 1 THEN
+ROLLBACK;
+START TRANSACTION;
+ELSE
+COMMIT;
+START TRANSACTION;
+END IF;
+END IF;
+END WHILE;
+COMMIT;
+END|
+call execute_dml(0, 0, 100, 100, 10, 0);
+CREATE TABLE t SELECT * FROM t1;
+DROP table t1;
+DROP table t2;
+SHOW VARIABLES LIKE 'clone_ddl_timeout';
+Variable_name	Value
+clone_ddl_timeout	300
+SHOW VARIABLES LIKE 'clone_block_ddl';
+Variable_name	Value
+clone_block_ddl	OFF
+# 1. CREATE TABLE with encryption while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+SET GLOBAL DEBUG = '+d,log_redo_with_invalid_master_key';
+CREATE TABLE t0 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)  COMPRESSION = "LZ4";
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+CREATE TABLE t01 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)  COMPRESSION = "LZ4";
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+CREATE TABLE t1 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)  COMPRESSION = "LZ4";
+INSERT INTO t1 SELECT * FROM t;
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+CREATE TABLE t11 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)  COMPRESSION = "LZ4";
+INSERT INTO t11 SELECT * FROM t;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+CREATE TABLE t2 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)  COMPRESSION = "LZ4";
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+CREATE TABLE t21 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)  COMPRESSION = "LZ4";
+INSERT INTO t21 SELECT * FROM t;
+CREATE TABLE t3 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)  COMPRESSION = "LZ4";
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='LZ4'
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	11	Clone Test Row - 1
+2	21	Clone Test Row - 2
+3	31	Clone Test Row - 3
+4	41	Clone Test Row - 4
+5	51	Clone Test Row - 5
+6	61	Clone Test Row - 6
+7	71	Clone Test Row - 7
+8	81	Clone Test Row - 8
+9	91	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	991	Clone Test Row - 99
+98	981	Clone Test Row - 98
+97	971	Clone Test Row - 97
+96	961	Clone Test Row - 96
+95	951	Clone Test Row - 95
+94	941	Clone Test Row - 94
+93	931	Clone Test Row - 93
+92	921	Clone Test Row - 92
+91	911	Clone Test Row - 91
+90	901	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='LZ4'
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='LZ4'
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+SET DEBUG_SYNC = 'RESET';
+# 2. ALTER TABLE remove encryption while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+SET GLOBAL DEBUG = '+d,log_redo_with_invalid_master_key';
+ALTER TABLE t0  COMPRESSION = "None" ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+ALTER TABLE t01  COMPRESSION = "None" ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+ALTER TABLE t1  COMPRESSION = "None" ;
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+ALTER TABLE t11  COMPRESSION = "None" ;
+INSERT INTO t11 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t11.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+ALTER TABLE t2  COMPRESSION = "None" ;
+call execute_dml(1, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER TABLE t21  COMPRESSION = "None" ;
+INSERT INTO t21 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;;
+ALTER TABLE t3  COMPRESSION = "None" ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='None'
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	2	Clone Test Row - 1
+2	3	Clone Test Row - 2
+3	4	Clone Test Row - 3
+4	5	Clone Test Row - 4
+5	6	Clone Test Row - 5
+6	7	Clone Test Row - 6
+7	8	Clone Test Row - 7
+8	9	Clone Test Row - 8
+9	10	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	100	Clone Test Row - 99
+98	99	Clone Test Row - 98
+97	98	Clone Test Row - 97
+96	97	Clone Test Row - 96
+95	96	Clone Test Row - 95
+94	95	Clone Test Row - 94
+93	94	Clone Test Row - 93
+92	93	Clone Test Row - 92
+91	92	Clone Test Row - 91
+90	91	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='None'
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	11	Clone Test Row - 1
+2	21	Clone Test Row - 2
+3	31	Clone Test Row - 3
+4	41	Clone Test Row - 4
+5	51	Clone Test Row - 5
+6	61	Clone Test Row - 6
+7	71	Clone Test Row - 7
+8	81	Clone Test Row - 8
+9	91	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	991	Clone Test Row - 99
+98	981	Clone Test Row - 98
+97	971	Clone Test Row - 97
+96	961	Clone Test Row - 96
+95	951	Clone Test Row - 95
+94	941	Clone Test Row - 94
+93	931	Clone Test Row - 93
+92	921	Clone Test Row - 92
+91	911	Clone Test Row - 91
+90	901	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='None'
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	2	Clone Test Row - 1
+2	3	Clone Test Row - 2
+3	4	Clone Test Row - 3
+4	5	Clone Test Row - 4
+5	6	Clone Test Row - 5
+6	7	Clone Test Row - 6
+7	8	Clone Test Row - 7
+8	9	Clone Test Row - 8
+9	10	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	100	Clone Test Row - 99
+98	99	Clone Test Row - 98
+97	98	Clone Test Row - 97
+96	97	Clone Test Row - 96
+95	96	Clone Test Row - 95
+94	95	Clone Test Row - 94
+93	94	Clone Test Row - 93
+92	93	Clone Test Row - 92
+91	92	Clone Test Row - 91
+90	91	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+SET DEBUG_SYNC = 'RESET';
+# 3. ALTER TABLE add encryption while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+SET GLOBAL DEBUG = '+d,log_redo_with_invalid_master_key';
+ALTER TABLE t0  COMPRESSION = "LZ4" ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+ALTER TABLE t01  COMPRESSION = "LZ4" ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+ALTER TABLE t1  COMPRESSION = "LZ4" ;
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+ALTER TABLE t11  COMPRESSION = "LZ4" ;
+INSERT INTO t11 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t11.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+ALTER TABLE t2  COMPRESSION = "LZ4" ;
+call execute_dml(1, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER TABLE t21  COMPRESSION = "LZ4" ;
+INSERT INTO t21 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;;
+ALTER TABLE t3  COMPRESSION = "LZ4" ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='LZ4'
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	2	Clone Test Row - 1
+2	3	Clone Test Row - 2
+3	4	Clone Test Row - 3
+4	5	Clone Test Row - 4
+5	6	Clone Test Row - 5
+6	7	Clone Test Row - 6
+7	8	Clone Test Row - 7
+8	9	Clone Test Row - 8
+9	10	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	100	Clone Test Row - 99
+98	99	Clone Test Row - 98
+97	98	Clone Test Row - 97
+96	97	Clone Test Row - 96
+95	96	Clone Test Row - 95
+94	95	Clone Test Row - 94
+93	94	Clone Test Row - 93
+92	93	Clone Test Row - 92
+91	92	Clone Test Row - 91
+90	91	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='LZ4'
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	2	Clone Test Row - 0
+1	12	Clone Test Row - 1
+2	22	Clone Test Row - 2
+3	32	Clone Test Row - 3
+4	42	Clone Test Row - 4
+5	52	Clone Test Row - 5
+6	62	Clone Test Row - 6
+7	72	Clone Test Row - 7
+8	82	Clone Test Row - 8
+9	92	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	992	Clone Test Row - 99
+98	982	Clone Test Row - 98
+97	972	Clone Test Row - 97
+96	962	Clone Test Row - 96
+95	952	Clone Test Row - 95
+94	942	Clone Test Row - 94
+93	932	Clone Test Row - 93
+92	922	Clone Test Row - 92
+91	912	Clone Test Row - 91
+90	902	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='LZ4'
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	2	Clone Test Row - 1
+2	3	Clone Test Row - 2
+3	4	Clone Test Row - 3
+4	5	Clone Test Row - 4
+5	6	Clone Test Row - 5
+6	7	Clone Test Row - 6
+7	8	Clone Test Row - 7
+8	9	Clone Test Row - 8
+9	10	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	100	Clone Test Row - 99
+98	99	Clone Test Row - 98
+97	98	Clone Test Row - 97
+96	97	Clone Test Row - 96
+95	96	Clone Test Row - 95
+94	95	Clone Test Row - 94
+93	94	Clone Test Row - 93
+92	93	Clone Test Row - 92
+91	92	Clone Test Row - 91
+90	91	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+SET DEBUG_SYNC = 'RESET';
+# 2. DROP TABLE while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+SET GLOBAL DEBUG = '+d,log_redo_with_invalid_master_key';
+DROP TABLE t0  ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+DROP TABLE t01  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+DROP TABLE t1  ;
+SHOW TABLES;
+Tables_in_test
+t
+t11
+t2
+t21
+t3
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+DROP TABLE t11  ;
+SHOW TABLES;
+Tables_in_test
+t
+t2
+t21
+t3
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+DROP TABLE t2  ;
+SHOW TABLES;
+Tables_in_test
+t
+t21
+t3
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+DROP TABLE t21  ;
+SHOW TABLES;
+Tables_in_test
+t
+t3
+DROP TABLE t3  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t21
+t3
+# Restart server back on base data directory
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+SET DEBUG_SYNC = 'RESET';
+# Cleanup
+DROP TABLE t;
+CREATE TABLE t1 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+DROP TABLE t1;
+DROP TABLE t2;
+DROP PROCEDURE execute_dml;
+# Uninstall clone
+UNINSTALL PLUGIN clone;
+# Restart server and remove encrypted data directory
+# restart:
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_ddl_dml.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_ddl_dml.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_ddl_dml.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_ddl_dml.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,431 @@
+CREATE UNDO TABLESPACE undo_003 ADD DATAFILE 'undo_003.ibu';
+CREATE UNDO TABLESPACE undo_004 ADD DATAFILE 'undo_004.ibu';
+SELECT NAME, SPACE_TYPE, STATE
+FROM INFORMATION_SCHEMA.INNODB_TABLESPACES
+WHERE SPACE_TYPE = 'Undo' ORDER BY NAME;
+NAME	SPACE_TYPE	STATE
+innodb_undo_001	Undo	active
+innodb_undo_002	Undo	active
+undo_003	Undo	active
+undo_004	Undo	active
+SELECT TABLESPACE_NAME, FILE_NAME, FILE_TYPE, ENGINE
+FROM INFORMATION_SCHEMA.FILES
+WHERE FILE_NAME LIKE '%undo_00%'
+       ORDER BY TABLESPACE_NAME;
+TABLESPACE_NAME	FILE_NAME	FILE_TYPE	ENGINE
+innodb_undo_001	./undo_001	UNDO LOG	InnoDB
+innodb_undo_002	./undo_002	UNDO LOG	InnoDB
+undo_003	./undo_003.ibu	UNDO LOG	InnoDB
+undo_004	./undo_004.ibu	UNDO LOG	InnoDB
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+SHOW VARIABLES LIKE "clone_buffer_size";
+Variable_name	Value
+clone_buffer_size	4194304
+SET GLOBAL clone_buffer_size = 2097152;
+SHOW VARIABLES LIKE "clone_buffer_size";
+Variable_name	Value
+clone_buffer_size	2097152
+CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+PARTITION BY KEY(col1) PARTITIONS 5;
+CREATE PROCEDURE execute_dml(
+p_dml_type	INT,
+p_key_min	INT,
+p_key_range	INT,
+p_loop_count	INT,
+p_frequency	INT,
+p_is_rand	INT)
+BEGIN
+DECLARE v_idx		INT DEFAULT 0;
+DECLARE v_commit	INT DEFAULT 0;
+DECLARE v_key		INT DEFAULT 0;
+/* Loop and INSERT data at random position */
+WHILE(v_idx < p_loop_count) DO
+/* Generate key between 1 to p_loop_count */
+IF p_is_rand = 1 THEN
+SET v_key = p_key_min + FLOOR(RAND() * p_key_range);
+ELSE
+SET v_key = p_key_min + (v_idx  % p_key_range);
+END IF;
+CASE p_dml_type
+WHEN 0 THEN
+SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+WHEN 1 THEN
+UPDATE t1 SET col2 = v_idx + 1 WHERE col1 = v_key;
+UPDATE t2 SET col2 = v_idx + 1 WHERE col1 = v_key;
+WHEN 2 THEN
+DELETE FROM t1 WHERE col1 = v_key;
+DELETE FROM t2 WHERE col1 = v_key;
+ELSE
+DELETE FROM t1;
+DELETE FROM t2;
+END CASE;
+SET v_idx = v_idx + 1;
+/* Commit or rollback work at specified frequency. */
+IF v_idx % p_frequency = 0 THEN
+SET v_commit = FLOOR(RAND() * 2);
+IF v_commit = 0 AND p_is_rand = 1 THEN
+ROLLBACK;
+START TRANSACTION;
+ELSE
+COMMIT;
+START TRANSACTION;
+END IF;
+END IF;
+END WHILE;
+COMMIT;
+END|
+CREATE PROCEDURE execute_ddl(
+p_loop_count	INT)
+BEGIN
+DECLARE v_idx		INT DEFAULT 0;
+/* Loop and execute DDL. */
+/* Concurrent DDL and DML creates MDL deadlock. Disabled till fixed. */
+WHILE(v_idx < p_loop_count) DO
+ALTER TABLE t1 ENGINE = InnoDB;
+ALTER TABLE t2 ENGINE = InnoDB;
+DO SLEEP(0.1);
+SET v_idx = v_idx + 1;
+END WHILE;
+END|
+call execute_dml(0, 0, 200, 200, 10, 0);
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+SELECT count(*) from t1;
+count(*)
+200
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;
+col1	col2	col3
+199	1990	Clone Test Row - 199
+198	1980	Clone Test Row - 198
+197	1970	Clone Test Row - 197
+196	1960	Clone Test Row - 196
+195	1950	Clone Test Row - 195
+194	1940	Clone Test Row - 194
+193	1930	Clone Test Row - 193
+192	1920	Clone Test Row - 192
+191	1910	Clone Test Row - 191
+190	1900	Clone Test Row - 190
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+SELECT count(*) from t2;
+count(*)
+200
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;
+col1	col2	col3
+199	1990	Clone Test Row - 199
+198	1980	Clone Test Row - 198
+197	1970	Clone Test Row - 197
+196	1960	Clone Test Row - 196
+195	1950	Clone Test Row - 195
+194	1940	Clone Test Row - 194
+193	1930	Clone Test Row - 193
+192	1920	Clone Test Row - 192
+191	1910	Clone Test Row - 191
+190	1900	Clone Test Row - 190
+# In connection con1 - Running Insert Random [100 - 200 Key range]
+call execute_dml(0, 100, 100, 100, 20, 1);
+# In connection con2 - Running Update Random [0 - 25 Key Range]
+call execute_dml(1, 0, 25, 100, 20, 1);
+# In connection con3 - Running Delete Random [26 - 50 Key Range]
+call execute_dml(2, 26, 25, 100, 20, 1);
+# In connection con4 - Running Update Random uncommited [51 - 75 Key Range]
+call execute_ddl(10);
+# In connection default - Cloning database
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_max_data_bandwidth = 5;
+SET GLOBAL clone_max_network_bandwidth = 4;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+select ID, STATE, ERROR_NO from performance_schema.clone_status;
+ID	STATE	ERROR_NO
+1	Completed	0
+select ID, STAGE, STATE from performance_schema.clone_progress;
+ID	STAGE	STATE
+1	DROP DATA	Completed
+1	FILE COPY	Completed
+1	PAGE COPY	Completed
+1	REDO COPY	Completed
+1	FILE SYNC	Completed
+1	RESTART	Not Started
+1	RECOVERY	Not Started
+# In connection default - Finished Cloning
+show variables like 'clone_autotune_concurrency';
+Variable_name	Value
+clone_autotune_concurrency	OFF
+# In connection con1 - Waiting
+# In connection con2 - Waiting
+# In connection con3 - Waiting
+# In connection con4 - Waiting
+commit;
+# In connection default
+# Restart cloned database
+# restart: --datadir=CLONE_DATADIR
+select STATE, ERROR_NO, length(BINLOG_FILE) > 0, length(GTID_EXECUTED) > 0,
+(BINLOG_POSITION > 0) from performance_schema.clone_status;
+STATE	ERROR_NO	length(BINLOG_FILE) > 0	length(GTID_EXECUTED) > 0	(BINLOG_POSITION > 0)
+Completed	0	1	0	1
+call execute_dml(3, 0, 1, 1, 1, 0);
+call execute_dml(0, 0, 200, 200, 10, 0);
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+SELECT count(*) from t1;
+count(*)
+200
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;
+col1	col2	col3
+199	1990	Clone Test Row - 199
+198	1980	Clone Test Row - 198
+197	1970	Clone Test Row - 197
+196	1960	Clone Test Row - 196
+195	1950	Clone Test Row - 195
+194	1940	Clone Test Row - 194
+193	1930	Clone Test Row - 193
+192	1920	Clone Test Row - 192
+191	1910	Clone Test Row - 191
+190	1900	Clone Test Row - 190
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+SELECT count(*) from t2;
+count(*)
+200
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;
+col1	col2	col3
+199	1990	Clone Test Row - 199
+198	1980	Clone Test Row - 198
+197	1970	Clone Test Row - 197
+196	1960	Clone Test Row - 196
+195	1950	Clone Test Row - 195
+194	1940	Clone Test Row - 194
+193	1930	Clone Test Row - 193
+192	1920	Clone Test Row - 192
+191	1910	Clone Test Row - 191
+190	1900	Clone Test Row - 190
+SELECT NAME, SPACE_TYPE, STATE
+FROM INFORMATION_SCHEMA.INNODB_TABLESPACES
+WHERE SPACE_TYPE = 'Undo';
+NAME	SPACE_TYPE	STATE
+innodb_undo_001	Undo	active
+innodb_undo_002	Undo	active
+undo_003	Undo	active
+undo_004	Undo	active
+SELECT TABLESPACE_NAME, FILE_NAME, FILE_TYPE, ENGINE
+FROM INFORMATION_SCHEMA.FILES
+WHERE FILE_NAME LIKE '%undo_00%';
+TABLESPACE_NAME	FILE_NAME	FILE_TYPE	ENGINE
+innodb_undo_001	./undo_001	UNDO LOG	InnoDB
+innodb_undo_002	./undo_002	UNDO LOG	InnoDB
+undo_003	./undo_003.ibu	UNDO LOG	InnoDB
+undo_004	./undo_004.ibu	UNDO LOG	InnoDB
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_max_data_bandwidth = 5;
+SET GLOBAL clone_max_network_bandwidth = 4;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+select ID, STATE, ERROR_NO from performance_schema.clone_status;
+ID	STATE	ERROR_NO
+1	Completed	0
+select ID, STAGE, STATE from performance_schema.clone_progress;
+ID	STAGE	STATE
+1	DROP DATA	Completed
+1	FILE COPY	Completed
+1	PAGE COPY	Completed
+1	REDO COPY	Completed
+1	FILE SYNC	Completed
+1	RESTART	Not Started
+1	RECOVERY	Not Started
+# Restart cloned database
+# restart: --datadir=CLONE_DATADIR1
+select STATE, ERROR_NO, length(BINLOG_FILE) > 0, length(GTID_EXECUTED) > 0,
+(BINLOG_POSITION > 0) from performance_schema.clone_status;
+STATE	ERROR_NO	length(BINLOG_FILE) > 0	length(GTID_EXECUTED) > 0	(BINLOG_POSITION > 0)
+Completed	0	1	0	1
+call execute_dml(3, 0, 1, 1, 1, 0);
+call execute_dml(0, 0, 100, 100, 10, 0);
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+# restart:
+ALTER UNDO TABLESPACE undo_003 SET INACTIVE;
+DROP UNDO TABLESPACE undo_003;
+ALTER UNDO TABLESPACE undo_004 SET INACTIVE;
+DROP UNDO TABLESPACE undo_004;
+SELECT NAME, SPACE_TYPE, STATE
+FROM INFORMATION_SCHEMA.INNODB_TABLESPACES
+WHERE SPACE_TYPE = 'Undo' ORDER BY NAME;
+NAME	SPACE_TYPE	STATE
+innodb_undo_001	Undo	active
+innodb_undo_002	Undo	active
+SELECT TABLESPACE_NAME, FILE_NAME, FILE_TYPE, ENGINE
+FROM INFORMATION_SCHEMA.FILES
+WHERE FILE_NAME LIKE '%undo_00%'
+       ORDER BY TABLESPACE_NAME;
+TABLESPACE_NAME	FILE_NAME	FILE_TYPE	ENGINE
+innodb_undo_001	./undo_001	UNDO LOG	InnoDB
+innodb_undo_002	./undo_002	UNDO LOG	InnoDB
+DROP TABLE t1;
+DROP TABLE t2;
+DROP PROCEDURE execute_dml;
+DROP PROCEDURE execute_ddl;
+UNINSTALL PLUGIN clone;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_ddl_encrypt.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_ddl_encrypt.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_ddl_encrypt.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_ddl_encrypt.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,721 @@
+# Prepare for creating Encrypted Table
+# create bootstrap file
+# Create and start mysqld with keyring plugin.
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+PARTITION BY KEY(col1) PARTITIONS 5;
+CREATE PROCEDURE execute_dml(
+p_dml_type	INT,
+p_key_min	INT,
+p_key_range	INT,
+p_loop_count	INT,
+p_frequency	INT,
+p_is_rand	INT)
+BEGIN
+DECLARE v_idx		INT DEFAULT 0;
+DECLARE v_commit	INT DEFAULT 0;
+DECLARE v_key		INT DEFAULT 0;
+/* Loop and INSERT data at random position */
+WHILE(v_idx < p_loop_count) DO
+/* Generate key between 1 to p_loop_count */
+IF p_is_rand = 1 THEN
+SET v_key = p_key_min + FLOOR(RAND() * p_key_range);
+ELSE
+SET v_key = p_key_min + (v_idx  % p_key_range);
+END IF;
+CASE p_dml_type
+WHEN 0 THEN
+SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+WHEN 1 THEN
+UPDATE t1 SET col2 = v_idx + 1 WHERE col1 = v_key;
+UPDATE t2 SET col2 = v_idx + 1 WHERE col1 = v_key;
+WHEN 2 THEN
+DELETE FROM t1 WHERE col1 = v_key;
+DELETE FROM t2 WHERE col1 = v_key;
+ELSE
+DELETE FROM t1;
+DELETE FROM t2;
+END CASE;
+SET v_idx = v_idx + 1;
+/* Commit or rollback work at specified frequency. */
+IF v_idx % p_frequency = 0 THEN
+SET v_commit = FLOOR(RAND() * 2);
+IF v_commit = 0 AND p_is_rand = 1 THEN
+ROLLBACK;
+START TRANSACTION;
+ELSE
+COMMIT;
+START TRANSACTION;
+END IF;
+END IF;
+END WHILE;
+COMMIT;
+END|
+call execute_dml(0, 0, 100, 100, 10, 0);
+CREATE TABLE t SELECT * FROM t1;
+DROP table t1;
+DROP table t2;
+SHOW VARIABLES LIKE 'clone_ddl_timeout';
+Variable_name	Value
+clone_ddl_timeout	300
+SHOW VARIABLES LIKE 'clone_block_ddl';
+Variable_name	Value
+clone_block_ddl	OFF
+# 1. CREATE TABLE with encryption while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+SET GLOBAL DEBUG = '+d,log_redo_with_invalid_master_key';
+CREATE TABLE t0 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ENCRYPTION = "Y" ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+CREATE TABLE t01 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ENCRYPTION = "Y" ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+CREATE TABLE t1 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ENCRYPTION = "Y" ;
+INSERT INTO t1 SELECT * FROM t;
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+CREATE TABLE t11 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ENCRYPTION = "Y" ;
+INSERT INTO t11 SELECT * FROM t;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+CREATE TABLE t2 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ENCRYPTION = "Y" ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+CREATE TABLE t21 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ENCRYPTION = "Y" ;
+INSERT INTO t21 SELECT * FROM t;
+CREATE TABLE t3 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ENCRYPTION = "Y" ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 ENCRYPTION='Y'
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	11	Clone Test Row - 1
+2	21	Clone Test Row - 2
+3	31	Clone Test Row - 3
+4	41	Clone Test Row - 4
+5	51	Clone Test Row - 5
+6	61	Clone Test Row - 6
+7	71	Clone Test Row - 7
+8	81	Clone Test Row - 8
+9	91	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	991	Clone Test Row - 99
+98	981	Clone Test Row - 98
+97	971	Clone Test Row - 97
+96	961	Clone Test Row - 96
+95	951	Clone Test Row - 95
+94	941	Clone Test Row - 94
+93	931	Clone Test Row - 93
+92	921	Clone Test Row - 92
+91	911	Clone Test Row - 91
+90	901	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 ENCRYPTION='Y'
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 ENCRYPTION='Y'
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+SET DEBUG_SYNC = 'RESET';
+# 2. ALTER TABLE remove encryption while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+SET GLOBAL DEBUG = '+d,log_redo_with_invalid_master_key';
+ALTER TABLE t0 ENCRYPTION = "N"  ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+ALTER TABLE t01 ENCRYPTION = "N"  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+ALTER TABLE t1 ENCRYPTION = "N"  ;
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+ALTER TABLE t11 ENCRYPTION = "N"  ;
+INSERT INTO t11 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t11.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+ALTER TABLE t2 ENCRYPTION = "N"  ;
+call execute_dml(1, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER TABLE t21 ENCRYPTION = "N"  ;
+INSERT INTO t21 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;;
+ALTER TABLE t3 ENCRYPTION = "N"  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	2	Clone Test Row - 1
+2	3	Clone Test Row - 2
+3	4	Clone Test Row - 3
+4	5	Clone Test Row - 4
+5	6	Clone Test Row - 5
+6	7	Clone Test Row - 6
+7	8	Clone Test Row - 7
+8	9	Clone Test Row - 8
+9	10	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	100	Clone Test Row - 99
+98	99	Clone Test Row - 98
+97	98	Clone Test Row - 97
+96	97	Clone Test Row - 96
+95	96	Clone Test Row - 95
+94	95	Clone Test Row - 94
+93	94	Clone Test Row - 93
+92	93	Clone Test Row - 92
+91	92	Clone Test Row - 91
+90	91	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	11	Clone Test Row - 1
+2	21	Clone Test Row - 2
+3	31	Clone Test Row - 3
+4	41	Clone Test Row - 4
+5	51	Clone Test Row - 5
+6	61	Clone Test Row - 6
+7	71	Clone Test Row - 7
+8	81	Clone Test Row - 8
+9	91	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	991	Clone Test Row - 99
+98	981	Clone Test Row - 98
+97	971	Clone Test Row - 97
+96	961	Clone Test Row - 96
+95	951	Clone Test Row - 95
+94	941	Clone Test Row - 94
+93	931	Clone Test Row - 93
+92	921	Clone Test Row - 92
+91	911	Clone Test Row - 91
+90	901	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	2	Clone Test Row - 1
+2	3	Clone Test Row - 2
+3	4	Clone Test Row - 3
+4	5	Clone Test Row - 4
+5	6	Clone Test Row - 5
+6	7	Clone Test Row - 6
+7	8	Clone Test Row - 7
+8	9	Clone Test Row - 8
+9	10	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	100	Clone Test Row - 99
+98	99	Clone Test Row - 98
+97	98	Clone Test Row - 97
+96	97	Clone Test Row - 96
+95	96	Clone Test Row - 95
+94	95	Clone Test Row - 94
+93	94	Clone Test Row - 93
+92	93	Clone Test Row - 92
+91	92	Clone Test Row - 91
+90	91	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+SET DEBUG_SYNC = 'RESET';
+# 3. ALTER TABLE add encryption while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+SET GLOBAL DEBUG = '+d,log_redo_with_invalid_master_key';
+ALTER TABLE t0 ENCRYPTION = "Y"  ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+ALTER TABLE t01 ENCRYPTION = "Y"  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+ALTER TABLE t1 ENCRYPTION = "Y"  ;
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+ALTER TABLE t11 ENCRYPTION = "Y"  ;
+INSERT INTO t11 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t11.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+ALTER TABLE t2 ENCRYPTION = "Y"  ;
+call execute_dml(1, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER TABLE t21 ENCRYPTION = "Y"  ;
+INSERT INTO t21 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;;
+ALTER TABLE t3 ENCRYPTION = "Y"  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 ENCRYPTION='Y'
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	2	Clone Test Row - 1
+2	3	Clone Test Row - 2
+3	4	Clone Test Row - 3
+4	5	Clone Test Row - 4
+5	6	Clone Test Row - 5
+6	7	Clone Test Row - 6
+7	8	Clone Test Row - 7
+8	9	Clone Test Row - 8
+9	10	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	100	Clone Test Row - 99
+98	99	Clone Test Row - 98
+97	98	Clone Test Row - 97
+96	97	Clone Test Row - 96
+95	96	Clone Test Row - 95
+94	95	Clone Test Row - 94
+93	94	Clone Test Row - 93
+92	93	Clone Test Row - 92
+91	92	Clone Test Row - 91
+90	91	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 ENCRYPTION='Y'
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	2	Clone Test Row - 0
+1	12	Clone Test Row - 1
+2	22	Clone Test Row - 2
+3	32	Clone Test Row - 3
+4	42	Clone Test Row - 4
+5	52	Clone Test Row - 5
+6	62	Clone Test Row - 6
+7	72	Clone Test Row - 7
+8	82	Clone Test Row - 8
+9	92	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	992	Clone Test Row - 99
+98	982	Clone Test Row - 98
+97	972	Clone Test Row - 97
+96	962	Clone Test Row - 96
+95	952	Clone Test Row - 95
+94	942	Clone Test Row - 94
+93	932	Clone Test Row - 93
+92	922	Clone Test Row - 92
+91	912	Clone Test Row - 91
+90	902	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 ENCRYPTION='Y'
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	2	Clone Test Row - 1
+2	3	Clone Test Row - 2
+3	4	Clone Test Row - 3
+4	5	Clone Test Row - 4
+5	6	Clone Test Row - 5
+6	7	Clone Test Row - 6
+7	8	Clone Test Row - 7
+8	9	Clone Test Row - 8
+9	10	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	100	Clone Test Row - 99
+98	99	Clone Test Row - 98
+97	98	Clone Test Row - 97
+96	97	Clone Test Row - 96
+95	96	Clone Test Row - 95
+94	95	Clone Test Row - 94
+93	94	Clone Test Row - 93
+92	93	Clone Test Row - 92
+91	92	Clone Test Row - 91
+90	91	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+SET DEBUG_SYNC = 'RESET';
+# 2. DROP TABLE while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+SET GLOBAL DEBUG = '+d,log_redo_with_invalid_master_key';
+DROP TABLE t0  ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+DROP TABLE t01  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+DROP TABLE t1  ;
+SHOW TABLES;
+Tables_in_test
+t
+t11
+t2
+t21
+t3
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+DROP TABLE t11  ;
+SHOW TABLES;
+Tables_in_test
+t
+t2
+t21
+t3
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+DROP TABLE t2  ;
+SHOW TABLES;
+Tables_in_test
+t
+t21
+t3
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+DROP TABLE t21  ;
+SHOW TABLES;
+Tables_in_test
+t
+t3
+DROP TABLE t3  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t21
+t3
+# Restart server back on base data directory
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+SET DEBUG_SYNC = 'RESET';
+# Cleanup
+DROP TABLE t;
+CREATE TABLE t1 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+DROP TABLE t1;
+DROP TABLE t2;
+DROP PROCEDURE execute_dml;
+# Uninstall clone
+UNINSTALL PLUGIN clone;
+# Restart server and remove encrypted data directory
+# restart:
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_ddl_mix.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_ddl_mix.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_ddl_mix.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_ddl_mix.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,364 @@
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+PARTITION BY KEY(col1) PARTITIONS 5;
+CREATE PROCEDURE execute_dml(
+p_dml_type	INT,
+p_key_min	INT,
+p_key_range	INT,
+p_loop_count	INT,
+p_frequency	INT,
+p_is_rand	INT)
+BEGIN
+DECLARE v_idx		INT DEFAULT 0;
+DECLARE v_commit	INT DEFAULT 0;
+DECLARE v_key		INT DEFAULT 0;
+/* Loop and INSERT data at random position */
+WHILE(v_idx < p_loop_count) DO
+/* Generate key between 1 to p_loop_count */
+IF p_is_rand = 1 THEN
+SET v_key = p_key_min + FLOOR(RAND() * p_key_range);
+ELSE
+SET v_key = p_key_min + (v_idx  % p_key_range);
+END IF;
+CASE p_dml_type
+WHEN 0 THEN
+SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+WHEN 1 THEN
+UPDATE t1 SET col2 = v_idx + 1 WHERE col1 = v_key;
+UPDATE t2 SET col2 = v_idx + 1 WHERE col1 = v_key;
+WHEN 2 THEN
+DELETE FROM t1 WHERE col1 = v_key;
+DELETE FROM t2 WHERE col1 = v_key;
+ELSE
+DELETE FROM t1;
+DELETE FROM t2;
+END CASE;
+SET v_idx = v_idx + 1;
+/* Commit or rollback work at specified frequency. */
+IF v_idx % p_frequency = 0 THEN
+SET v_commit = FLOOR(RAND() * 2);
+IF v_commit = 0 AND p_is_rand = 1 THEN
+ROLLBACK;
+START TRANSACTION;
+ELSE
+COMMIT;
+START TRANSACTION;
+END IF;
+END IF;
+END WHILE;
+COMMIT;
+END|
+call execute_dml(0, 0, 100, 100, 10, 0);
+CREATE TABLE t SELECT * FROM t1;
+CREATE TABLE t0 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t01 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t3 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t11 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t21 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+INSERT INTO t11 SELECT * FROM t;
+INSERT INTO t21 SELECT * FROM t;
+SHOW VARIABLES LIKE 'clone_ddl_timeout';
+Variable_name	Value
+clone_ddl_timeout	300
+SHOW VARIABLES LIKE 'clone_block_ddl';
+Variable_name	Value
+clone_block_ddl	OFF
+# 1. RENAME and CREATE a TABLE with same name while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+ALTER TABLE t0 RENAME t0_new;
+CREATE TABLE t0 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+ALTER TABLE t01 RENAME t01_new;
+CREATE TABLE t01 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+ALTER TABLE t1 RENAME t1_new;
+CREATE TABLE t1 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+ALTER TABLE t11 RENAME t11_new;
+CREATE TABLE t11 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ;
+INSERT INTO t11 SELECT * FROM t;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+ALTER TABLE t2 RENAME t2_new;
+CREATE TABLE t2 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER TABLE t21 RENAME t21_new;
+CREATE TABLE t21 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ;
+INSERT INTO t21 SELECT * FROM t;
+ALTER TABLE t3 RENAME t3_new;
+CREATE TABLE t3 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t01_new
+t0_new
+t1
+t11
+t11_new
+t1_new
+t2
+t21
+t2_new
+t3
+SHOW CREATE TABLE t1_new;
+Table	Create Table
+t1_new	CREATE TABLE `t1_new` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t1_new EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1_new	check	status	OK
+SELECT count(*) from t1_new;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1_new ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1_new ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+SHOW CREATE TABLE t11_new;
+Table	Create Table
+t11_new	CREATE TABLE `t11_new` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t11_new EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11_new	check	status	OK
+SELECT count(*) from t11_new;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11_new ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11_new ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+SHOW CREATE TABLE t2_new;
+Table	Create Table
+t2_new	CREATE TABLE `t2_new` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2_new EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2_new	check	status	OK
+SELECT count(*) from t2_new;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2_new ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	11	Clone Test Row - 1
+2	21	Clone Test Row - 2
+3	31	Clone Test Row - 3
+4	41	Clone Test Row - 4
+5	51	Clone Test Row - 5
+6	61	Clone Test Row - 6
+7	71	Clone Test Row - 7
+8	81	Clone Test Row - 8
+9	91	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2_new ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	991	Clone Test Row - 99
+98	981	Clone Test Row - 98
+97	971	Clone Test Row - 97
+96	961	Clone Test Row - 96
+95	951	Clone Test Row - 95
+94	941	Clone Test Row - 94
+93	931	Clone Test Row - 93
+92	921	Clone Test Row - 92
+91	911	Clone Test Row - 91
+90	901	Clone Test Row - 90
+CALL execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# Cleanup
+DROP TABLE t0;
+DROP TABLE t01;
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE t3;
+DROP TABLE t11;
+DROP TABLE t21;
+DROP TABLE t0_new;
+DROP TABLE t01_new;
+DROP TABLE t1_new;
+DROP TABLE t2_new;
+DROP TABLE t3_new;
+DROP TABLE t11_new;
+DROP TABLE t21_new;
+# 2. CREATE & DROP TABLE while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+CREATE TABLE t0 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) PARTITION BY KEY(col1) PARTITIONS 5;
+DROP TABLE t0  ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+CREATE TABLE t01 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) PARTITION BY KEY(col1) PARTITIONS 5;
+DROP TABLE t01  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+CREATE TABLE t1 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) PARTITION BY KEY(col1) PARTITIONS 5;
+INSERT INTO t1 SELECT * FROM t;
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+DROP TABLE t1  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+CREATE TABLE t11 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) PARTITION BY KEY(col1) PARTITIONS 5;
+INSERT INTO t11 SELECT * FROM t;
+DROP TABLE t11  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+CREATE TABLE t2 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) PARTITION BY KEY(col1) PARTITIONS 5;
+INSERT INTO t2 SELECT * FROM t;
+DROP TABLE t2  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+CREATE TABLE t21 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) PARTITION BY KEY(col1) PARTITIONS 5;
+INSERT INTO t21 SELECT * FROM t;
+DROP TABLE t21  ;
+CREATE TABLE t3 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB) PARTITION BY KEY(col1) PARTITIONS 5;
+DROP TABLE t3  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# Cleanup
+DROP TABLE t;
+CREATE TABLE t1 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+DROP TABLE t1;
+DROP TABLE t2;
+DROP PROCEDURE execute_dml;
+# Uninstall clone
+UNINSTALL PLUGIN clone;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_ddl_rename_restart.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_ddl_rename_restart.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_ddl_rename_restart.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_ddl_rename_restart.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,277 @@
+SET global debug="+d,clone_restart_apply";
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+PARTITION BY KEY(col1) PARTITIONS 5;
+CREATE PROCEDURE execute_dml(
+p_dml_type	INT,
+p_key_min	INT,
+p_key_range	INT,
+p_loop_count	INT,
+p_frequency	INT,
+p_is_rand	INT)
+BEGIN
+DECLARE v_idx		INT DEFAULT 0;
+DECLARE v_commit	INT DEFAULT 0;
+DECLARE v_key		INT DEFAULT 0;
+/* Loop and INSERT data at random position */
+WHILE(v_idx < p_loop_count) DO
+/* Generate key between 1 to p_loop_count */
+IF p_is_rand = 1 THEN
+SET v_key = p_key_min + FLOOR(RAND() * p_key_range);
+ELSE
+SET v_key = p_key_min + (v_idx  % p_key_range);
+END IF;
+CASE p_dml_type
+WHEN 0 THEN
+SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+WHEN 1 THEN
+UPDATE t1 SET col2 = v_idx + 1 WHERE col1 = v_key;
+UPDATE t2 SET col2 = v_idx + 1 WHERE col1 = v_key;
+WHEN 2 THEN
+DELETE FROM t1 WHERE col1 = v_key;
+DELETE FROM t2 WHERE col1 = v_key;
+ELSE
+DELETE FROM t1;
+DELETE FROM t2;
+END CASE;
+SET v_idx = v_idx + 1;
+/* Commit or rollback work at specified frequency. */
+IF v_idx % p_frequency = 0 THEN
+SET v_commit = FLOOR(RAND() * 2);
+IF v_commit = 0 AND p_is_rand = 1 THEN
+ROLLBACK;
+START TRANSACTION;
+ELSE
+COMMIT;
+START TRANSACTION;
+END IF;
+END IF;
+END WHILE;
+COMMIT;
+END|
+call execute_dml(0, 0, 100, 100, 10, 0);
+CREATE TABLE t SELECT * FROM t1;
+CREATE TABLE t0 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t01 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t3 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t11 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t21 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+INSERT INTO t11 SELECT * FROM t;
+INSERT INTO t21 SELECT * FROM t;
+SHOW VARIABLES LIKE 'clone_ddl_timeout';
+Variable_name	Value
+clone_ddl_timeout	300
+SHOW VARIABLES LIKE 'clone_block_ddl';
+Variable_name	Value
+clone_block_ddl	OFF
+# 1. ALTER TABLE RENAME while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+ALTER TABLE t0 RENAME t0_new;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+ALTER TABLE t01 RENAME t01_new;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+ALTER TABLE t1 RENAME t1_new;
+INSERT INTO t1_new SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t1_new.col2 + 1;;
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+ALTER TABLE t11 RENAME t11_new;
+INSERT INTO t11_new SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t11_new.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+ALTER TABLE t2 RENAME t2_new;
+INSERT INTO t2_new SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t2_new.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER TABLE t21 RENAME t21_new;
+INSERT INTO t21_new SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21_new.col2 + 1;;
+ALTER TABLE t3 RENAME t3_new;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t01_new
+t0_new
+t11_new
+t1_new
+t21
+t2_new
+t3
+SHOW CREATE TABLE t1_new;
+Table	Create Table
+t1_new	CREATE TABLE `t1_new` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t1_new EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1_new	check	status	OK
+SELECT count(*) from t1_new;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1_new ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	11	Clone Test Row - 1
+2	21	Clone Test Row - 2
+3	31	Clone Test Row - 3
+4	41	Clone Test Row - 4
+5	51	Clone Test Row - 5
+6	61	Clone Test Row - 6
+7	71	Clone Test Row - 7
+8	81	Clone Test Row - 8
+9	91	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1_new ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	991	Clone Test Row - 99
+98	981	Clone Test Row - 98
+97	971	Clone Test Row - 97
+96	961	Clone Test Row - 96
+95	951	Clone Test Row - 95
+94	941	Clone Test Row - 94
+93	931	Clone Test Row - 93
+92	921	Clone Test Row - 92
+91	911	Clone Test Row - 91
+90	901	Clone Test Row - 90
+SHOW CREATE TABLE t11_new;
+Table	Create Table
+t11_new	CREATE TABLE `t11_new` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t11_new EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11_new	check	status	OK
+SELECT count(*) from t11_new;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11_new ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	11	Clone Test Row - 1
+2	21	Clone Test Row - 2
+3	31	Clone Test Row - 3
+4	41	Clone Test Row - 4
+5	51	Clone Test Row - 5
+6	61	Clone Test Row - 6
+7	71	Clone Test Row - 7
+8	81	Clone Test Row - 8
+9	91	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11_new ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	991	Clone Test Row - 99
+98	981	Clone Test Row - 98
+97	971	Clone Test Row - 97
+96	961	Clone Test Row - 96
+95	951	Clone Test Row - 95
+94	941	Clone Test Row - 94
+93	931	Clone Test Row - 93
+92	921	Clone Test Row - 92
+91	911	Clone Test Row - 91
+90	901	Clone Test Row - 90
+SHOW CREATE TABLE t2_new;
+Table	Create Table
+t2_new	CREATE TABLE `t2_new` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2_new EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2_new	check	status	OK
+SELECT count(*) from t2_new;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2_new ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	11	Clone Test Row - 1
+2	21	Clone Test Row - 2
+3	31	Clone Test Row - 3
+4	41	Clone Test Row - 4
+5	51	Clone Test Row - 5
+6	61	Clone Test Row - 6
+7	71	Clone Test Row - 7
+8	81	Clone Test Row - 8
+9	91	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2_new ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	991	Clone Test Row - 99
+98	981	Clone Test Row - 98
+97	971	Clone Test Row - 97
+96	961	Clone Test Row - 96
+95	951	Clone Test Row - 95
+94	941	Clone Test Row - 94
+93	931	Clone Test Row - 93
+92	921	Clone Test Row - 92
+91	911	Clone Test Row - 91
+90	901	Clone Test Row - 90
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# Cleanup
+DROP TABLE t;
+CREATE TABLE t1 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+DROP TABLE t1;
+DROP TABLE t2;
+DROP PROCEDURE execute_dml;
+DROP TABLE t0_new;
+DROP TABLE t01_new;
+DROP TABLE t1_new;
+DROP TABLE t2_new;
+DROP TABLE t3_new;
+DROP TABLE t11_new;
+DROP TABLE t21_new;
+# Uninstall clone
+UNINSTALL PLUGIN clone;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_ddl_rename.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_ddl_rename.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_ddl_rename.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_ddl_rename.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,276 @@
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+PARTITION BY KEY(col1) PARTITIONS 5;
+CREATE PROCEDURE execute_dml(
+p_dml_type	INT,
+p_key_min	INT,
+p_key_range	INT,
+p_loop_count	INT,
+p_frequency	INT,
+p_is_rand	INT)
+BEGIN
+DECLARE v_idx		INT DEFAULT 0;
+DECLARE v_commit	INT DEFAULT 0;
+DECLARE v_key		INT DEFAULT 0;
+/* Loop and INSERT data at random position */
+WHILE(v_idx < p_loop_count) DO
+/* Generate key between 1 to p_loop_count */
+IF p_is_rand = 1 THEN
+SET v_key = p_key_min + FLOOR(RAND() * p_key_range);
+ELSE
+SET v_key = p_key_min + (v_idx  % p_key_range);
+END IF;
+CASE p_dml_type
+WHEN 0 THEN
+SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+WHEN 1 THEN
+UPDATE t1 SET col2 = v_idx + 1 WHERE col1 = v_key;
+UPDATE t2 SET col2 = v_idx + 1 WHERE col1 = v_key;
+WHEN 2 THEN
+DELETE FROM t1 WHERE col1 = v_key;
+DELETE FROM t2 WHERE col1 = v_key;
+ELSE
+DELETE FROM t1;
+DELETE FROM t2;
+END CASE;
+SET v_idx = v_idx + 1;
+/* Commit or rollback work at specified frequency. */
+IF v_idx % p_frequency = 0 THEN
+SET v_commit = FLOOR(RAND() * 2);
+IF v_commit = 0 AND p_is_rand = 1 THEN
+ROLLBACK;
+START TRANSACTION;
+ELSE
+COMMIT;
+START TRANSACTION;
+END IF;
+END IF;
+END WHILE;
+COMMIT;
+END|
+call execute_dml(0, 0, 100, 100, 10, 0);
+CREATE TABLE t SELECT * FROM t1;
+CREATE TABLE t0 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t01 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t3 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t11 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t21 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+INSERT INTO t11 SELECT * FROM t;
+INSERT INTO t21 SELECT * FROM t;
+SHOW VARIABLES LIKE 'clone_ddl_timeout';
+Variable_name	Value
+clone_ddl_timeout	300
+SHOW VARIABLES LIKE 'clone_block_ddl';
+Variable_name	Value
+clone_block_ddl	OFF
+# 1. ALTER TABLE RENAME while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+ALTER TABLE t0 RENAME t0_new;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+ALTER TABLE t01 RENAME t01_new;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+ALTER TABLE t1 RENAME t1_new;
+INSERT INTO t1_new SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t1_new.col2 + 1;;
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+ALTER TABLE t11 RENAME t11_new;
+INSERT INTO t11_new SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t11_new.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+ALTER TABLE t2 RENAME t2_new;
+INSERT INTO t2_new SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t2_new.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER TABLE t21 RENAME t21_new;
+INSERT INTO t21_new SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21_new.col2 + 1;;
+ALTER TABLE t3 RENAME t3_new;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t01_new
+t0_new
+t11_new
+t1_new
+t21
+t2_new
+t3
+SHOW CREATE TABLE t1_new;
+Table	Create Table
+t1_new	CREATE TABLE `t1_new` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t1_new EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1_new	check	status	OK
+SELECT count(*) from t1_new;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1_new ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	11	Clone Test Row - 1
+2	21	Clone Test Row - 2
+3	31	Clone Test Row - 3
+4	41	Clone Test Row - 4
+5	51	Clone Test Row - 5
+6	61	Clone Test Row - 6
+7	71	Clone Test Row - 7
+8	81	Clone Test Row - 8
+9	91	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1_new ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	991	Clone Test Row - 99
+98	981	Clone Test Row - 98
+97	971	Clone Test Row - 97
+96	961	Clone Test Row - 96
+95	951	Clone Test Row - 95
+94	941	Clone Test Row - 94
+93	931	Clone Test Row - 93
+92	921	Clone Test Row - 92
+91	911	Clone Test Row - 91
+90	901	Clone Test Row - 90
+SHOW CREATE TABLE t11_new;
+Table	Create Table
+t11_new	CREATE TABLE `t11_new` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t11_new EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11_new	check	status	OK
+SELECT count(*) from t11_new;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11_new ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	11	Clone Test Row - 1
+2	21	Clone Test Row - 2
+3	31	Clone Test Row - 3
+4	41	Clone Test Row - 4
+5	51	Clone Test Row - 5
+6	61	Clone Test Row - 6
+7	71	Clone Test Row - 7
+8	81	Clone Test Row - 8
+9	91	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11_new ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	991	Clone Test Row - 99
+98	981	Clone Test Row - 98
+97	971	Clone Test Row - 97
+96	961	Clone Test Row - 96
+95	951	Clone Test Row - 95
+94	941	Clone Test Row - 94
+93	931	Clone Test Row - 93
+92	921	Clone Test Row - 92
+91	911	Clone Test Row - 91
+90	901	Clone Test Row - 90
+SHOW CREATE TABLE t2_new;
+Table	Create Table
+t2_new	CREATE TABLE `t2_new` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2_new EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2_new	check	status	OK
+SELECT count(*) from t2_new;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2_new ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	11	Clone Test Row - 1
+2	21	Clone Test Row - 2
+3	31	Clone Test Row - 3
+4	41	Clone Test Row - 4
+5	51	Clone Test Row - 5
+6	61	Clone Test Row - 6
+7	71	Clone Test Row - 7
+8	81	Clone Test Row - 8
+9	91	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2_new ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	991	Clone Test Row - 99
+98	981	Clone Test Row - 98
+97	971	Clone Test Row - 97
+96	961	Clone Test Row - 96
+95	951	Clone Test Row - 95
+94	941	Clone Test Row - 94
+93	931	Clone Test Row - 93
+92	921	Clone Test Row - 92
+91	911	Clone Test Row - 91
+90	901	Clone Test Row - 90
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# Cleanup
+DROP TABLE t;
+CREATE TABLE t1 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+DROP TABLE t1;
+DROP TABLE t2;
+DROP PROCEDURE execute_dml;
+DROP TABLE t0_new;
+DROP TABLE t01_new;
+DROP TABLE t1_new;
+DROP TABLE t2_new;
+DROP TABLE t3_new;
+DROP TABLE t11_new;
+DROP TABLE t21_new;
+# Uninstall clone
+UNINSTALL PLUGIN clone;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_ddl_skip_validation.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_ddl_skip_validation.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_ddl_skip_validation.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_ddl_skip_validation.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,841 @@
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+PARTITION BY KEY(col1) PARTITIONS 5;
+CREATE PROCEDURE execute_dml(
+p_dml_type	INT,
+p_key_min	INT,
+p_key_range	INT,
+p_loop_count	INT,
+p_frequency	INT,
+p_is_rand	INT)
+BEGIN
+DECLARE v_idx		INT DEFAULT 0;
+DECLARE v_commit	INT DEFAULT 0;
+DECLARE v_key		INT DEFAULT 0;
+/* Loop and INSERT data at random position */
+WHILE(v_idx < p_loop_count) DO
+/* Generate key between 1 to p_loop_count */
+IF p_is_rand = 1 THEN
+SET v_key = p_key_min + FLOOR(RAND() * p_key_range);
+ELSE
+SET v_key = p_key_min + (v_idx  % p_key_range);
+END IF;
+CASE p_dml_type
+WHEN 0 THEN
+SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+WHEN 1 THEN
+UPDATE t1 SET col2 = v_idx + 1 WHERE col1 = v_key;
+UPDATE t2 SET col2 = v_idx + 1 WHERE col1 = v_key;
+WHEN 2 THEN
+DELETE FROM t1 WHERE col1 = v_key;
+DELETE FROM t2 WHERE col1 = v_key;
+ELSE
+DELETE FROM t1;
+DELETE FROM t2;
+END CASE;
+SET v_idx = v_idx + 1;
+/* Commit or rollback work at specified frequency. */
+IF v_idx % p_frequency = 0 THEN
+SET v_commit = FLOOR(RAND() * 2);
+IF v_commit = 0 AND p_is_rand = 1 THEN
+ROLLBACK;
+START TRANSACTION;
+ELSE
+COMMIT;
+START TRANSACTION;
+END IF;
+END IF;
+END WHILE;
+COMMIT;
+END|
+call execute_dml(0, 0, 100, 100, 10, 0);
+CREATE TABLE t SELECT * FROM t1;
+CREATE TABLE t0 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t01 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t3 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t11 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t21 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+INSERT INTO t11 SELECT * FROM t;
+INSERT INTO t21 SELECT * FROM t;
+SHOW VARIABLES LIKE 'clone_ddl_timeout';
+Variable_name	Value
+clone_ddl_timeout	300
+SHOW VARIABLES LIKE 'clone_block_ddl';
+Variable_name	Value
+clone_block_ddl	OFF
+# restart: --skip-innodb-validate-tablespace-paths
+# 1. ALTER TABLE ADD COLUMN while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+ALTER TABLE t0 ADD COLUMN col5 int, ALGORITHM=COPY ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+ALTER TABLE t01 ADD COLUMN col5 int, ALGORITHM=COPY ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+ALTER TABLE t1 ADD COLUMN col5 int, ALGORITHM=COPY ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+ALTER TABLE t11 ADD COLUMN col5 int, ALGORITHM=COPY ;
+INSERT INTO t11 SELECT col1, col2, col3, col4, col2 + 100 FROM t ON DUPLICATE KEY UPDATE col2 = t11.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+ALTER TABLE t2 ADD COLUMN col5 int, ALGORITHM=COPY ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER TABLE t21 ADD COLUMN col5 int, ALGORITHM=COPY ;
+INSERT INTO t21 SELECT col1, col2, col3, col4, col2 + 100 FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;;
+ALTER TABLE t3 ADD COLUMN col5 int, ALGORITHM=COPY ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  `col5` int DEFAULT NULL,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	2	Clone Test Row - 0
+1	12	Clone Test Row - 1
+2	22	Clone Test Row - 2
+3	32	Clone Test Row - 3
+4	42	Clone Test Row - 4
+5	52	Clone Test Row - 5
+6	62	Clone Test Row - 6
+7	72	Clone Test Row - 7
+8	82	Clone Test Row - 8
+9	92	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	992	Clone Test Row - 99
+98	982	Clone Test Row - 98
+97	972	Clone Test Row - 97
+96	962	Clone Test Row - 96
+95	952	Clone Test Row - 95
+94	942	Clone Test Row - 94
+93	932	Clone Test Row - 93
+92	922	Clone Test Row - 92
+91	912	Clone Test Row - 91
+90	902	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  `col5` int DEFAULT NULL,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	11	Clone Test Row - 1
+2	21	Clone Test Row - 2
+3	31	Clone Test Row - 3
+4	41	Clone Test Row - 4
+5	51	Clone Test Row - 5
+6	61	Clone Test Row - 6
+7	71	Clone Test Row - 7
+8	81	Clone Test Row - 8
+9	91	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	991	Clone Test Row - 99
+98	981	Clone Test Row - 98
+97	971	Clone Test Row - 97
+96	961	Clone Test Row - 96
+95	951	Clone Test Row - 95
+94	941	Clone Test Row - 94
+93	931	Clone Test Row - 93
+92	921	Clone Test Row - 92
+91	911	Clone Test Row - 91
+90	901	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  `col5` int DEFAULT NULL,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	2	Clone Test Row - 0
+1	12	Clone Test Row - 1
+2	22	Clone Test Row - 2
+3	32	Clone Test Row - 3
+4	42	Clone Test Row - 4
+5	52	Clone Test Row - 5
+6	62	Clone Test Row - 6
+7	72	Clone Test Row - 7
+8	82	Clone Test Row - 8
+9	92	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	992	Clone Test Row - 99
+98	982	Clone Test Row - 98
+97	972	Clone Test Row - 97
+96	962	Clone Test Row - 96
+95	952	Clone Test Row - 95
+94	942	Clone Test Row - 94
+93	932	Clone Test Row - 93
+92	922	Clone Test Row - 92
+91	912	Clone Test Row - 91
+90	902	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart: --skip-innodb-validate-tablespace-paths
+SET DEBUG_SYNC = 'RESET';
+# 2. ALTER TABLE DROP COLUMN while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+ALTER TABLE t0 DROP COLUMN col5, ALGORITHM=COPY ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+ALTER TABLE t01 DROP COLUMN col5, ALGORITHM=COPY ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+ALTER TABLE t1 DROP COLUMN col5, ALGORITHM=COPY ;
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+ALTER TABLE t11 DROP COLUMN col5, ALGORITHM=COPY ;
+INSERT INTO t11 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t11.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+ALTER TABLE t2 DROP COLUMN col5, ALGORITHM=COPY ;
+call execute_dml(1, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER TABLE t21 DROP COLUMN col5, ALGORITHM=COPY ;
+INSERT INTO t21 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;;
+ALTER TABLE t3 DROP COLUMN col5, ALGORITHM=COPY ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	2	Clone Test Row - 1
+2	3	Clone Test Row - 2
+3	4	Clone Test Row - 3
+4	5	Clone Test Row - 4
+5	6	Clone Test Row - 5
+6	7	Clone Test Row - 6
+7	8	Clone Test Row - 7
+8	9	Clone Test Row - 8
+9	10	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	100	Clone Test Row - 99
+98	99	Clone Test Row - 98
+97	98	Clone Test Row - 97
+96	97	Clone Test Row - 96
+95	96	Clone Test Row - 95
+94	95	Clone Test Row - 94
+93	94	Clone Test Row - 93
+92	93	Clone Test Row - 92
+91	92	Clone Test Row - 91
+90	91	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	2	Clone Test Row - 0
+1	12	Clone Test Row - 1
+2	22	Clone Test Row - 2
+3	32	Clone Test Row - 3
+4	42	Clone Test Row - 4
+5	52	Clone Test Row - 5
+6	62	Clone Test Row - 6
+7	72	Clone Test Row - 7
+8	82	Clone Test Row - 8
+9	92	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	992	Clone Test Row - 99
+98	982	Clone Test Row - 98
+97	972	Clone Test Row - 97
+96	962	Clone Test Row - 96
+95	952	Clone Test Row - 95
+94	942	Clone Test Row - 94
+93	932	Clone Test Row - 93
+92	922	Clone Test Row - 92
+91	912	Clone Test Row - 91
+90	902	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	2	Clone Test Row - 1
+2	3	Clone Test Row - 2
+3	4	Clone Test Row - 3
+4	5	Clone Test Row - 4
+5	6	Clone Test Row - 5
+6	7	Clone Test Row - 6
+7	8	Clone Test Row - 7
+8	9	Clone Test Row - 8
+9	10	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	100	Clone Test Row - 99
+98	99	Clone Test Row - 98
+97	98	Clone Test Row - 97
+96	97	Clone Test Row - 96
+95	96	Clone Test Row - 95
+94	95	Clone Test Row - 94
+93	94	Clone Test Row - 93
+92	93	Clone Test Row - 92
+91	92	Clone Test Row - 91
+90	91	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart: --skip-innodb-validate-tablespace-paths
+SET DEBUG_SYNC = 'RESET';
+# 3. ADD INDEX while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+ALTER TABLE t0 ADD INDEX col2_idx(col2), ALGORITHM=COPY ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+ALTER TABLE t01 ADD INDEX col2_idx(col2), ALGORITHM=COPY ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+ALTER TABLE t1 ADD INDEX col2_idx(col2), ALGORITHM=COPY ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+ALTER TABLE t11 ADD INDEX col2_idx(col2), ALGORITHM=COPY ;
+INSERT INTO t11 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t11.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+ALTER TABLE t2 ADD INDEX col2_idx(col2), ALGORITHM=COPY ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER TABLE t21 ADD INDEX col2_idx(col2), ALGORITHM=COPY ;
+INSERT INTO t21 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;;
+ALTER TABLE t3 ADD INDEX col2_idx(col2), ALGORITHM=COPY ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`),
+  KEY `col2_idx` (`col2`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	3	Clone Test Row - 0
+1	4	Clone Test Row - 1
+2	5	Clone Test Row - 2
+3	6	Clone Test Row - 3
+4	7	Clone Test Row - 4
+5	8	Clone Test Row - 5
+6	9	Clone Test Row - 6
+7	10	Clone Test Row - 7
+8	11	Clone Test Row - 8
+9	12	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	102	Clone Test Row - 99
+98	101	Clone Test Row - 98
+97	100	Clone Test Row - 97
+96	99	Clone Test Row - 96
+95	98	Clone Test Row - 95
+94	97	Clone Test Row - 94
+93	96	Clone Test Row - 93
+92	95	Clone Test Row - 92
+91	94	Clone Test Row - 91
+90	93	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`),
+  KEY `col2_idx` (`col2`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	3	Clone Test Row - 0
+1	13	Clone Test Row - 1
+2	23	Clone Test Row - 2
+3	33	Clone Test Row - 3
+4	43	Clone Test Row - 4
+5	53	Clone Test Row - 5
+6	63	Clone Test Row - 6
+7	73	Clone Test Row - 7
+8	83	Clone Test Row - 8
+9	93	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	993	Clone Test Row - 99
+98	983	Clone Test Row - 98
+97	973	Clone Test Row - 97
+96	963	Clone Test Row - 96
+95	953	Clone Test Row - 95
+94	943	Clone Test Row - 94
+93	933	Clone Test Row - 93
+92	923	Clone Test Row - 92
+91	913	Clone Test Row - 91
+90	903	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`),
+  KEY `col2_idx` (`col2`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	3	Clone Test Row - 0
+1	4	Clone Test Row - 1
+2	5	Clone Test Row - 2
+3	6	Clone Test Row - 3
+4	7	Clone Test Row - 4
+5	8	Clone Test Row - 5
+6	9	Clone Test Row - 6
+7	10	Clone Test Row - 7
+8	11	Clone Test Row - 8
+9	12	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	102	Clone Test Row - 99
+98	101	Clone Test Row - 98
+97	100	Clone Test Row - 97
+96	99	Clone Test Row - 96
+95	98	Clone Test Row - 95
+94	97	Clone Test Row - 94
+93	96	Clone Test Row - 93
+92	95	Clone Test Row - 92
+91	94	Clone Test Row - 91
+90	93	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart: --skip-innodb-validate-tablespace-paths
+SET DEBUG_SYNC = 'RESET';
+# 4. DROP INDEX while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+ALTER TABLE t0 DROP INDEX col2_idx, ALGORITHM=COPY ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+ALTER TABLE t01 DROP INDEX col2_idx, ALGORITHM=COPY ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+ALTER TABLE t1 DROP INDEX col2_idx, ALGORITHM=COPY ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+ALTER TABLE t11 DROP INDEX col2_idx, ALGORITHM=COPY ;
+INSERT INTO t11 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t11.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+ALTER TABLE t2 DROP INDEX col2_idx, ALGORITHM=COPY ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER TABLE t21 DROP INDEX col2_idx, ALGORITHM=COPY ;
+INSERT INTO t21 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;;
+ALTER TABLE t3 DROP INDEX col2_idx, ALGORITHM=COPY ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	5	Clone Test Row - 0
+1	6	Clone Test Row - 1
+2	7	Clone Test Row - 2
+3	8	Clone Test Row - 3
+4	9	Clone Test Row - 4
+5	10	Clone Test Row - 5
+6	11	Clone Test Row - 6
+7	12	Clone Test Row - 7
+8	13	Clone Test Row - 8
+9	14	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	104	Clone Test Row - 99
+98	103	Clone Test Row - 98
+97	102	Clone Test Row - 97
+96	101	Clone Test Row - 96
+95	100	Clone Test Row - 95
+94	99	Clone Test Row - 94
+93	98	Clone Test Row - 93
+92	97	Clone Test Row - 92
+91	96	Clone Test Row - 91
+90	95	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	4	Clone Test Row - 0
+1	14	Clone Test Row - 1
+2	24	Clone Test Row - 2
+3	34	Clone Test Row - 3
+4	44	Clone Test Row - 4
+5	54	Clone Test Row - 5
+6	64	Clone Test Row - 6
+7	74	Clone Test Row - 7
+8	84	Clone Test Row - 8
+9	94	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	994	Clone Test Row - 99
+98	984	Clone Test Row - 98
+97	974	Clone Test Row - 97
+96	964	Clone Test Row - 96
+95	954	Clone Test Row - 95
+94	944	Clone Test Row - 94
+93	934	Clone Test Row - 93
+92	924	Clone Test Row - 92
+91	914	Clone Test Row - 91
+90	904	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	5	Clone Test Row - 0
+1	6	Clone Test Row - 1
+2	7	Clone Test Row - 2
+3	8	Clone Test Row - 3
+4	9	Clone Test Row - 4
+5	10	Clone Test Row - 5
+6	11	Clone Test Row - 6
+7	12	Clone Test Row - 7
+8	13	Clone Test Row - 8
+9	14	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	104	Clone Test Row - 99
+98	103	Clone Test Row - 98
+97	102	Clone Test Row - 97
+96	101	Clone Test Row - 96
+95	100	Clone Test Row - 95
+94	99	Clone Test Row - 94
+93	98	Clone Test Row - 93
+92	97	Clone Test Row - 92
+91	96	Clone Test Row - 91
+90	95	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# Cleanup
+DROP TABLE t;
+DROP TABLE t1;
+DROP TABLE t2;
+DROP PROCEDURE execute_dml;
+DROP TABLE t0;
+DROP TABLE t01;
+DROP TABLE t3;
+DROP TABLE t11;
+DROP TABLE t21;
+# Uninstall clone
+UNINSTALL PLUGIN clone;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_ddl_sys_encrypt_file_copy.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_ddl_sys_encrypt_file_copy.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_ddl_sys_encrypt_file_copy.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_ddl_sys_encrypt_file_copy.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,494 @@
+# Prepare for creating Encrypted Table
+# create bootstrap file
+# Create and start mysqld with keyring plugin.
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+PARTITION BY KEY(col1) PARTITIONS 5;
+CREATE PROCEDURE execute_dml(
+p_dml_type	INT,
+p_key_min	INT,
+p_key_range	INT,
+p_loop_count	INT,
+p_frequency	INT,
+p_is_rand	INT)
+BEGIN
+DECLARE v_idx		INT DEFAULT 0;
+DECLARE v_commit	INT DEFAULT 0;
+DECLARE v_key		INT DEFAULT 0;
+/* Loop and INSERT data at random position */
+WHILE(v_idx < p_loop_count) DO
+/* Generate key between 1 to p_loop_count */
+IF p_is_rand = 1 THEN
+SET v_key = p_key_min + FLOOR(RAND() * p_key_range);
+ELSE
+SET v_key = p_key_min + (v_idx  % p_key_range);
+END IF;
+CASE p_dml_type
+WHEN 0 THEN
+SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+WHEN 1 THEN
+UPDATE t1 SET col2 = v_idx + 1 WHERE col1 = v_key;
+UPDATE t2 SET col2 = v_idx + 1 WHERE col1 = v_key;
+WHEN 2 THEN
+DELETE FROM t1 WHERE col1 = v_key;
+DELETE FROM t2 WHERE col1 = v_key;
+ELSE
+DELETE FROM t1;
+DELETE FROM t2;
+END CASE;
+SET v_idx = v_idx + 1;
+/* Commit or rollback work at specified frequency. */
+IF v_idx % p_frequency = 0 THEN
+SET v_commit = FLOOR(RAND() * 2);
+IF v_commit = 0 AND p_is_rand = 1 THEN
+ROLLBACK;
+START TRANSACTION;
+ELSE
+COMMIT;
+START TRANSACTION;
+END IF;
+END IF;
+END WHILE;
+COMMIT;
+END|
+call execute_dml(0, 0, 100, 100, 10, 0);
+CREATE TABLE t SELECT * FROM t1;
+CREATE TABLE t0 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t01 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t3 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t11 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t21 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+INSERT INTO t11 SELECT * FROM t;
+INSERT INTO t21 SELECT * FROM t;
+SHOW VARIABLES LIKE 'clone_ddl_timeout';
+Variable_name	Value
+clone_ddl_timeout	300
+SHOW VARIABLES LIKE 'clone_block_ddl';
+Variable_name	Value
+clone_block_ddl	OFF
+CREATE TABLESPACE tbs;
+DROP TABLE t1;
+CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+TABLESPACE = tbs;
+DROP TABLE t2;
+CREATE TABLE t2(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+TABLESPACE = tbs;
+# 1. Enable REDO and UNDO encryption while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+SET GLOBAL DEBUG = '+d,log_redo_with_invalid_master_key';
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+SET GLOBAL innodb_redo_log_encrypt = ON;
+SET GLOBAL innodb_undo_log_encrypt = ON;
+ALTER TABLESPACE tbs ENCRYPTION = 'Y';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+SET GLOBAL innodb_redo_log_encrypt = ON;
+SET GLOBAL innodb_undo_log_encrypt = ON;
+ALTER TABLESPACE tbs ENCRYPTION = 'Y';
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+SET GLOBAL innodb_redo_log_encrypt = ON;
+SET GLOBAL innodb_undo_log_encrypt = ON;
+ALTER TABLESPACE tbs ENCRYPTION = 'Y';
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+SET GLOBAL innodb_redo_log_encrypt = ON;
+SET GLOBAL innodb_undo_log_encrypt = ON;
+ALTER TABLESPACE tbs ENCRYPTION = 'Y';
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+SET GLOBAL innodb_redo_log_encrypt = ON;
+SET GLOBAL innodb_undo_log_encrypt = ON;
+ALTER TABLESPACE tbs ENCRYPTION = 'Y';
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET GLOBAL innodb_redo_log_encrypt = ON;
+SET GLOBAL innodb_undo_log_encrypt = ON;
+ALTER TABLESPACE tbs ENCRYPTION = 'Y';
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) /*!50100 TABLESPACE `tbs` */ ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!80016 ENCRYPTION='Y' */
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	2	Clone Test Row - 0
+1	12	Clone Test Row - 1
+2	22	Clone Test Row - 2
+3	32	Clone Test Row - 3
+4	42	Clone Test Row - 4
+5	52	Clone Test Row - 5
+6	62	Clone Test Row - 6
+7	72	Clone Test Row - 7
+8	82	Clone Test Row - 8
+9	92	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	992	Clone Test Row - 99
+98	982	Clone Test Row - 98
+97	972	Clone Test Row - 97
+96	962	Clone Test Row - 96
+95	952	Clone Test Row - 95
+94	942	Clone Test Row - 94
+93	932	Clone Test Row - 93
+92	922	Clone Test Row - 92
+91	912	Clone Test Row - 91
+90	902	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) /*!50100 TABLESPACE `tbs` */ ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!80016 ENCRYPTION='Y' */
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	2	Clone Test Row - 0
+1	12	Clone Test Row - 1
+2	22	Clone Test Row - 2
+3	32	Clone Test Row - 3
+4	42	Clone Test Row - 4
+5	52	Clone Test Row - 5
+6	62	Clone Test Row - 6
+7	72	Clone Test Row - 7
+8	82	Clone Test Row - 8
+9	92	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	992	Clone Test Row - 99
+98	982	Clone Test Row - 98
+97	972	Clone Test Row - 97
+96	962	Clone Test Row - 96
+95	952	Clone Test Row - 95
+94	942	Clone Test Row - 94
+93	932	Clone Test Row - 93
+92	922	Clone Test Row - 92
+91	912	Clone Test Row - 91
+90	902	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+SET DEBUG_SYNC = 'RESET';
+# 2. Disable REDO and UNDO encryption while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+SET GLOBAL DEBUG = '+d,log_redo_with_invalid_master_key';
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+SET GLOBAL innodb_redo_log_encrypt = OFF;
+SET GLOBAL innodb_undo_log_encrypt = OFF;
+ALTER TABLESPACE tbs ENCRYPTION = 'N';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+SET GLOBAL innodb_redo_log_encrypt = OFF;
+SET GLOBAL innodb_undo_log_encrypt = OFF;
+ALTER TABLESPACE tbs ENCRYPTION = 'N';
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+SET GLOBAL innodb_redo_log_encrypt = OFF;
+SET GLOBAL innodb_undo_log_encrypt = OFF;
+ALTER TABLESPACE tbs ENCRYPTION = 'N';
+INSERT INTO t11 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t11.col2 + 1;;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+SET GLOBAL innodb_redo_log_encrypt = OFF;
+SET GLOBAL innodb_undo_log_encrypt = OFF;
+ALTER TABLESPACE tbs ENCRYPTION = 'N';
+call execute_dml(1, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+SET GLOBAL innodb_redo_log_encrypt = OFF;
+SET GLOBAL innodb_undo_log_encrypt = OFF;
+ALTER TABLESPACE tbs ENCRYPTION = 'N';
+INSERT INTO t21 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;;
+SET GLOBAL innodb_redo_log_encrypt = OFF;
+SET GLOBAL innodb_undo_log_encrypt = OFF;
+ALTER TABLESPACE tbs ENCRYPTION = 'N';
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) /*!50100 TABLESPACE `tbs` */ ENGINE=InnoDB DEFAULT CHARSET=latin1
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	2	Clone Test Row - 1
+2	3	Clone Test Row - 2
+3	4	Clone Test Row - 3
+4	5	Clone Test Row - 4
+5	6	Clone Test Row - 5
+6	7	Clone Test Row - 6
+7	8	Clone Test Row - 7
+8	9	Clone Test Row - 8
+9	10	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	100	Clone Test Row - 99
+98	99	Clone Test Row - 98
+97	98	Clone Test Row - 97
+96	97	Clone Test Row - 96
+95	96	Clone Test Row - 95
+94	95	Clone Test Row - 94
+93	94	Clone Test Row - 93
+92	93	Clone Test Row - 92
+91	92	Clone Test Row - 91
+90	91	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	11	Clone Test Row - 1
+2	21	Clone Test Row - 2
+3	31	Clone Test Row - 3
+4	41	Clone Test Row - 4
+5	51	Clone Test Row - 5
+6	61	Clone Test Row - 6
+7	71	Clone Test Row - 7
+8	81	Clone Test Row - 8
+9	91	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	991	Clone Test Row - 99
+98	981	Clone Test Row - 98
+97	971	Clone Test Row - 97
+96	961	Clone Test Row - 96
+95	951	Clone Test Row - 95
+94	941	Clone Test Row - 94
+93	931	Clone Test Row - 93
+92	921	Clone Test Row - 92
+91	911	Clone Test Row - 91
+90	901	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) /*!50100 TABLESPACE `tbs` */ ENGINE=InnoDB DEFAULT CHARSET=latin1
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	2	Clone Test Row - 1
+2	3	Clone Test Row - 2
+3	4	Clone Test Row - 3
+4	5	Clone Test Row - 4
+5	6	Clone Test Row - 5
+6	7	Clone Test Row - 6
+7	8	Clone Test Row - 7
+8	9	Clone Test Row - 8
+9	10	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	100	Clone Test Row - 99
+98	99	Clone Test Row - 98
+97	98	Clone Test Row - 97
+96	97	Clone Test Row - 96
+95	96	Clone Test Row - 95
+94	95	Clone Test Row - 94
+93	94	Clone Test Row - 93
+92	93	Clone Test Row - 92
+91	92	Clone Test Row - 91
+90	91	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart: --datadir=ENCRYPT_DATADIR --early-plugin-load=keyring_file=KEYRING_PLUGIN --keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring
+SET DEBUG_SYNC = 'RESET';
+# Cleanup
+DROP TABLE t;
+DROP TABLE t1;
+DROP TABLE t2;
+DROP PROCEDURE execute_dml;
+DROP TABLE t0;
+DROP TABLE t01;
+DROP TABLE t3;
+DROP TABLE t11;
+DROP TABLE t21;
+DROP TABLESPACE tbs;
+# Uninstall clone
+UNINSTALL PLUGIN clone;
+# Restart server and remove encrypted data directory
+# restart:
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_ddl_truncate_restart.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_ddl_truncate_restart.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_ddl_truncate_restart.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_ddl_truncate_restart.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,275 @@
+SET global debug="+d,clone_restart_apply";
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+PARTITION BY KEY(col1) PARTITIONS 5;
+CREATE PROCEDURE execute_dml(
+p_dml_type	INT,
+p_key_min	INT,
+p_key_range	INT,
+p_loop_count	INT,
+p_frequency	INT,
+p_is_rand	INT)
+BEGIN
+DECLARE v_idx		INT DEFAULT 0;
+DECLARE v_commit	INT DEFAULT 0;
+DECLARE v_key		INT DEFAULT 0;
+/* Loop and INSERT data at random position */
+WHILE(v_idx < p_loop_count) DO
+/* Generate key between 1 to p_loop_count */
+IF p_is_rand = 1 THEN
+SET v_key = p_key_min + FLOOR(RAND() * p_key_range);
+ELSE
+SET v_key = p_key_min + (v_idx  % p_key_range);
+END IF;
+CASE p_dml_type
+WHEN 0 THEN
+SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+WHEN 1 THEN
+UPDATE t1 SET col2 = v_idx + 1 WHERE col1 = v_key;
+UPDATE t2 SET col2 = v_idx + 1 WHERE col1 = v_key;
+WHEN 2 THEN
+DELETE FROM t1 WHERE col1 = v_key;
+DELETE FROM t2 WHERE col1 = v_key;
+ELSE
+DELETE FROM t1;
+DELETE FROM t2;
+END CASE;
+SET v_idx = v_idx + 1;
+/* Commit or rollback work at specified frequency. */
+IF v_idx % p_frequency = 0 THEN
+SET v_commit = FLOOR(RAND() * 2);
+IF v_commit = 0 AND p_is_rand = 1 THEN
+ROLLBACK;
+START TRANSACTION;
+ELSE
+COMMIT;
+START TRANSACTION;
+END IF;
+END IF;
+END WHILE;
+COMMIT;
+END|
+call execute_dml(0, 0, 100, 100, 10, 0);
+CREATE TABLE t SELECT * FROM t1;
+CREATE TABLE t0 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t01 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t3 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t11 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t21 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+INSERT INTO t11 SELECT * FROM t;
+INSERT INTO t21 SELECT * FROM t;
+SHOW VARIABLES LIKE 'clone_ddl_timeout';
+Variable_name	Value
+clone_ddl_timeout	300
+SHOW VARIABLES LIKE 'clone_block_ddl';
+Variable_name	Value
+clone_block_ddl	OFF
+# 1. TRUNCATE TABLE while clone in progress
+SET global debug="+d,clone_send_deleted_block";
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+TRUNCATE TABLE t0  ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+TRUNCATE TABLE t01  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+TRUNCATE TABLE t1  ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+TRUNCATE TABLE t11  ;
+INSERT INTO t11 SELECT * FROM t;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+TRUNCATE TABLE t2  ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+TRUNCATE TABLE t21  ;
+INSERT INTO t21 SELECT * FROM t;
+TRUNCATE TABLE t3  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	11	Clone Test Row - 1
+2	21	Clone Test Row - 2
+3	31	Clone Test Row - 3
+4	41	Clone Test Row - 4
+5	51	Clone Test Row - 5
+6	61	Clone Test Row - 6
+7	71	Clone Test Row - 7
+8	81	Clone Test Row - 8
+9	91	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	991	Clone Test Row - 99
+98	981	Clone Test Row - 98
+97	971	Clone Test Row - 97
+96	961	Clone Test Row - 96
+95	951	Clone Test Row - 95
+94	941	Clone Test Row - 94
+93	931	Clone Test Row - 93
+92	921	Clone Test Row - 92
+91	911	Clone Test Row - 91
+90	901	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# Cleanup
+DROP TABLE t;
+DROP TABLE t1;
+DROP TABLE t2;
+DROP PROCEDURE execute_dml;
+DROP TABLE t0;
+DROP TABLE t01;
+DROP TABLE t3;
+DROP TABLE t11;
+DROP TABLE t21;
+# Uninstall clone
+UNINSTALL PLUGIN clone;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_ddl_truncate.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_ddl_truncate.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_ddl_truncate.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_ddl_truncate.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,274 @@
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+PARTITION BY KEY(col1) PARTITIONS 5;
+CREATE PROCEDURE execute_dml(
+p_dml_type	INT,
+p_key_min	INT,
+p_key_range	INT,
+p_loop_count	INT,
+p_frequency	INT,
+p_is_rand	INT)
+BEGIN
+DECLARE v_idx		INT DEFAULT 0;
+DECLARE v_commit	INT DEFAULT 0;
+DECLARE v_key		INT DEFAULT 0;
+/* Loop and INSERT data at random position */
+WHILE(v_idx < p_loop_count) DO
+/* Generate key between 1 to p_loop_count */
+IF p_is_rand = 1 THEN
+SET v_key = p_key_min + FLOOR(RAND() * p_key_range);
+ELSE
+SET v_key = p_key_min + (v_idx  % p_key_range);
+END IF;
+CASE p_dml_type
+WHEN 0 THEN
+SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+WHEN 1 THEN
+UPDATE t1 SET col2 = v_idx + 1 WHERE col1 = v_key;
+UPDATE t2 SET col2 = v_idx + 1 WHERE col1 = v_key;
+WHEN 2 THEN
+DELETE FROM t1 WHERE col1 = v_key;
+DELETE FROM t2 WHERE col1 = v_key;
+ELSE
+DELETE FROM t1;
+DELETE FROM t2;
+END CASE;
+SET v_idx = v_idx + 1;
+/* Commit or rollback work at specified frequency. */
+IF v_idx % p_frequency = 0 THEN
+SET v_commit = FLOOR(RAND() * 2);
+IF v_commit = 0 AND p_is_rand = 1 THEN
+ROLLBACK;
+START TRANSACTION;
+ELSE
+COMMIT;
+START TRANSACTION;
+END IF;
+END IF;
+END WHILE;
+COMMIT;
+END|
+call execute_dml(0, 0, 100, 100, 10, 0);
+CREATE TABLE t SELECT * FROM t1;
+CREATE TABLE t0 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t01 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t3 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t11 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t21 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+INSERT INTO t11 SELECT * FROM t;
+INSERT INTO t21 SELECT * FROM t;
+SHOW VARIABLES LIKE 'clone_ddl_timeout';
+Variable_name	Value
+clone_ddl_timeout	300
+SHOW VARIABLES LIKE 'clone_block_ddl';
+Variable_name	Value
+clone_block_ddl	OFF
+# 1. TRUNCATE TABLE while clone in progress
+SET global debug="+d,clone_send_deleted_block";
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+TRUNCATE TABLE t0  ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+TRUNCATE TABLE t01  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+TRUNCATE TABLE t1  ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+TRUNCATE TABLE t11  ;
+INSERT INTO t11 SELECT * FROM t;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+TRUNCATE TABLE t2  ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+TRUNCATE TABLE t21  ;
+INSERT INTO t21 SELECT * FROM t;
+TRUNCATE TABLE t3  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	1	Clone Test Row - 0
+1	11	Clone Test Row - 1
+2	21	Clone Test Row - 2
+3	31	Clone Test Row - 3
+4	41	Clone Test Row - 4
+5	51	Clone Test Row - 5
+6	61	Clone Test Row - 6
+7	71	Clone Test Row - 7
+8	81	Clone Test Row - 8
+9	91	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	991	Clone Test Row - 99
+98	981	Clone Test Row - 98
+97	971	Clone Test Row - 97
+96	961	Clone Test Row - 96
+95	951	Clone Test Row - 95
+94	941	Clone Test Row - 94
+93	931	Clone Test Row - 93
+92	921	Clone Test Row - 92
+91	911	Clone Test Row - 91
+90	901	Clone Test Row - 90
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+call execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# Cleanup
+DROP TABLE t;
+DROP TABLE t1;
+DROP TABLE t2;
+DROP PROCEDURE execute_dml;
+DROP TABLE t0;
+DROP TABLE t01;
+DROP TABLE t3;
+DROP TABLE t11;
+DROP TABLE t21;
+# Uninstall clone
+UNINSTALL PLUGIN clone;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_ddl_undo.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_ddl_undo.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_ddl_undo.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_ddl_undo.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,857 @@
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t2(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+PARTITION BY KEY(col1) PARTITIONS 5;
+CREATE PROCEDURE execute_dml(
+p_dml_type	INT,
+p_key_min	INT,
+p_key_range	INT,
+p_loop_count	INT,
+p_frequency	INT,
+p_is_rand	INT)
+BEGIN
+DECLARE v_idx		INT DEFAULT 0;
+DECLARE v_commit	INT DEFAULT 0;
+DECLARE v_key		INT DEFAULT 0;
+/* Loop and INSERT data at random position */
+WHILE(v_idx < p_loop_count) DO
+/* Generate key between 1 to p_loop_count */
+IF p_is_rand = 1 THEN
+SET v_key = p_key_min + FLOOR(RAND() * p_key_range);
+ELSE
+SET v_key = p_key_min + (v_idx  % p_key_range);
+END IF;
+CASE p_dml_type
+WHEN 0 THEN
+SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
+@clol3_text, REPEAT('Large Column Data ', 2048))
+ON DUPLICATE KEY UPDATE col2 = col2 + 1;
+WHEN 1 THEN
+UPDATE t1 SET col2 = v_idx + 1 WHERE col1 = v_key;
+UPDATE t2 SET col2 = v_idx + 1 WHERE col1 = v_key;
+WHEN 2 THEN
+DELETE FROM t1 WHERE col1 = v_key;
+DELETE FROM t2 WHERE col1 = v_key;
+ELSE
+DELETE FROM t1;
+DELETE FROM t2;
+END CASE;
+SET v_idx = v_idx + 1;
+/* Commit or rollback work at specified frequency. */
+IF v_idx % p_frequency = 0 THEN
+SET v_commit = FLOOR(RAND() * 2);
+IF v_commit = 0 AND p_is_rand = 1 THEN
+ROLLBACK;
+START TRANSACTION;
+ELSE
+COMMIT;
+START TRANSACTION;
+END IF;
+END IF;
+END WHILE;
+COMMIT;
+END|
+call execute_dml(0, 0, 100, 100, 10, 0);
+CREATE TABLE t SELECT * FROM t1;
+CREATE TABLE t0 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t01 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t3 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t11 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+CREATE TABLE t21 (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+INSERT INTO t11 SELECT * FROM t;
+INSERT INTO t21 SELECT * FROM t;
+SHOW VARIABLES LIKE 'clone_ddl_timeout';
+Variable_name	Value
+clone_ddl_timeout	300
+SHOW VARIABLES LIKE 'clone_block_ddl';
+Variable_name	Value
+clone_block_ddl	OFF
+# 1. CREATE UNDO TABLESPACE while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+CREATE UNDO TABLESPACE undo_00 ADD DATAFILE 'undo_00.ibu';
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+CREATE UNDO TABLESPACE undo_001 ADD DATAFILE 'undo_001.ibu';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+CREATE UNDO TABLESPACE undo_01 ADD DATAFILE 'undo_01.ibu';
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+CREATE UNDO TABLESPACE undo_011 ADD DATAFILE 'undo_011.ibu';
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+CREATE UNDO TABLESPACE undo_02 ADD DATAFILE 'undo_02.ibu';
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+CREATE UNDO TABLESPACE undo_021 ADD DATAFILE 'undo_021.ibu';
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+CREATE UNDO TABLESPACE undo_03 ADD DATAFILE 'undo_03.ibu';
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	3	Clone Test Row - 0
+1	13	Clone Test Row - 1
+2	23	Clone Test Row - 2
+3	33	Clone Test Row - 3
+4	43	Clone Test Row - 4
+5	53	Clone Test Row - 5
+6	63	Clone Test Row - 6
+7	73	Clone Test Row - 7
+8	83	Clone Test Row - 8
+9	93	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	993	Clone Test Row - 99
+98	983	Clone Test Row - 98
+97	973	Clone Test Row - 97
+96	963	Clone Test Row - 96
+95	953	Clone Test Row - 95
+94	943	Clone Test Row - 94
+93	933	Clone Test Row - 93
+92	923	Clone Test Row - 92
+91	913	Clone Test Row - 91
+90	903	Clone Test Row - 90
+SELECT NAME, SPACE_TYPE, STATE
+FROM INFORMATION_SCHEMA.INNODB_TABLESPACES
+WHERE SPACE_TYPE = 'Undo'
+    ORDER BY NAME;
+NAME	SPACE_TYPE	STATE
+innodb_undo_001	Undo	active
+innodb_undo_002	Undo	active
+undo_00	Undo	active
+undo_001	Undo	active
+undo_01	Undo	active
+undo_011	Undo	active
+undo_02	Undo	active
+SELECT TABLESPACE_NAME, FILE_NAME, FILE_TYPE, ENGINE
+FROM INFORMATION_SCHEMA.FILES
+WHERE FILE_NAME LIKE '%undo_0%'
+    ORDER BY TABLESPACE_NAME;
+TABLESPACE_NAME	FILE_NAME	FILE_TYPE	ENGINE
+innodb_undo_001	./undo_001	UNDO LOG	InnoDB
+innodb_undo_002	./undo_002	UNDO LOG	InnoDB
+undo_00	./undo_00.ibu	UNDO LOG	InnoDB
+undo_001	./undo_001.ibu	UNDO LOG	InnoDB
+undo_01	./undo_01.ibu	UNDO LOG	InnoDB
+undo_011	./undo_011.ibu	UNDO LOG	InnoDB
+undo_02	./undo_02.ibu	UNDO LOG	InnoDB
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+SELECT NAME, SPACE_TYPE, STATE
+FROM INFORMATION_SCHEMA.INNODB_TABLESPACES
+WHERE SPACE_TYPE = 'Undo'
+    ORDER BY NAME;
+NAME	SPACE_TYPE	STATE
+innodb_undo_001	Undo	active
+innodb_undo_002	Undo	active
+undo_00	Undo	active
+undo_001	Undo	active
+undo_01	Undo	active
+undo_011	Undo	active
+undo_02	Undo	active
+SELECT TABLESPACE_NAME, FILE_NAME, FILE_TYPE, ENGINE
+FROM INFORMATION_SCHEMA.FILES
+WHERE FILE_NAME LIKE '%undo_0%'
+    ORDER BY TABLESPACE_NAME;
+TABLESPACE_NAME	FILE_NAME	FILE_TYPE	ENGINE
+innodb_undo_001	./undo_001	UNDO LOG	InnoDB
+innodb_undo_002	./undo_002	UNDO LOG	InnoDB
+undo_00	./undo_00.ibu	UNDO LOG	InnoDB
+undo_001	./undo_001.ibu	UNDO LOG	InnoDB
+undo_01	./undo_01.ibu	UNDO LOG	InnoDB
+undo_011	./undo_011.ibu	UNDO LOG	InnoDB
+undo_02	./undo_02.ibu	UNDO LOG	InnoDB
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	3	Clone Test Row - 0
+1	13	Clone Test Row - 1
+2	23	Clone Test Row - 2
+3	33	Clone Test Row - 3
+4	43	Clone Test Row - 4
+5	53	Clone Test Row - 5
+6	63	Clone Test Row - 6
+7	73	Clone Test Row - 7
+8	83	Clone Test Row - 8
+9	93	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	993	Clone Test Row - 99
+98	983	Clone Test Row - 98
+97	973	Clone Test Row - 97
+96	963	Clone Test Row - 96
+95	953	Clone Test Row - 95
+94	943	Clone Test Row - 94
+93	933	Clone Test Row - 93
+92	923	Clone Test Row - 92
+91	913	Clone Test Row - 91
+90	903	Clone Test Row - 90
+SELECT NAME, SPACE_TYPE, STATE
+FROM INFORMATION_SCHEMA.INNODB_TABLESPACES
+WHERE SPACE_TYPE = 'Undo'
+    ORDER BY NAME;
+NAME	SPACE_TYPE	STATE
+innodb_undo_001	Undo	active
+innodb_undo_002	Undo	active
+undo_00	Undo	active
+undo_001	Undo	active
+undo_01	Undo	active
+undo_011	Undo	active
+undo_02	Undo	active
+SELECT TABLESPACE_NAME, FILE_NAME, FILE_TYPE, ENGINE
+FROM INFORMATION_SCHEMA.FILES
+WHERE FILE_NAME LIKE '%undo_0%'
+    ORDER BY TABLESPACE_NAME;
+TABLESPACE_NAME	FILE_NAME	FILE_TYPE	ENGINE
+innodb_undo_001	./undo_001	UNDO LOG	InnoDB
+innodb_undo_002	./undo_002	UNDO LOG	InnoDB
+undo_00	./undo_00.ibu	UNDO LOG	InnoDB
+undo_001	./undo_001.ibu	UNDO LOG	InnoDB
+undo_01	./undo_01.ibu	UNDO LOG	InnoDB
+undo_011	./undo_011.ibu	UNDO LOG	InnoDB
+undo_02	./undo_02.ibu	UNDO LOG	InnoDB
+CALL execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# 2. TRUNCATE UNDO TABLESPACE while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+ALTER UNDO TABLESPACE undo_00 SET INACTIVE ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+ALTER UNDO TABLESPACE undo_001 SET INACTIVE ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+ALTER UNDO TABLESPACE undo_01 SET INACTIVE ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+ALTER UNDO TABLESPACE undo_011 SET INACTIVE ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+ALTER UNDO TABLESPACE undo_02 SET INACTIVE ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+ALTER UNDO TABLESPACE undo_021 SET INACTIVE ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+ALTER UNDO TABLESPACE undo_03 SET INACTIVE ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	7	Clone Test Row - 0
+1	17	Clone Test Row - 1
+2	27	Clone Test Row - 2
+3	37	Clone Test Row - 3
+4	47	Clone Test Row - 4
+5	57	Clone Test Row - 5
+6	67	Clone Test Row - 6
+7	77	Clone Test Row - 7
+8	87	Clone Test Row - 8
+9	97	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	997	Clone Test Row - 99
+98	987	Clone Test Row - 98
+97	977	Clone Test Row - 97
+96	967	Clone Test Row - 96
+95	957	Clone Test Row - 95
+94	947	Clone Test Row - 94
+93	937	Clone Test Row - 93
+92	927	Clone Test Row - 92
+91	917	Clone Test Row - 91
+90	907	Clone Test Row - 90
+SELECT NAME, SPACE_TYPE, STATE
+FROM INFORMATION_SCHEMA.INNODB_TABLESPACES
+WHERE SPACE_TYPE = 'Undo'
+    ORDER BY NAME;
+NAME	SPACE_TYPE	STATE
+innodb_undo_001	Undo	active
+innodb_undo_002	Undo	active
+undo_00	Undo	empty
+undo_001	Undo	empty
+undo_01	Undo	empty
+undo_011	Undo	empty
+undo_02	Undo	empty
+undo_021	Undo	active
+undo_03	Undo	active
+SELECT TABLESPACE_NAME, FILE_NAME, FILE_TYPE, ENGINE
+FROM INFORMATION_SCHEMA.FILES
+WHERE FILE_NAME LIKE '%undo_0%'
+    ORDER BY TABLESPACE_NAME;
+TABLESPACE_NAME	FILE_NAME	FILE_TYPE	ENGINE
+innodb_undo_001	./undo_001	UNDO LOG	InnoDB
+innodb_undo_002	./undo_002	UNDO LOG	InnoDB
+undo_00	./undo_00.ibu	UNDO LOG	InnoDB
+undo_001	./undo_001.ibu	UNDO LOG	InnoDB
+undo_01	./undo_01.ibu	UNDO LOG	InnoDB
+undo_011	./undo_011.ibu	UNDO LOG	InnoDB
+undo_02	./undo_02.ibu	UNDO LOG	InnoDB
+undo_021	./undo_021.ibu	UNDO LOG	InnoDB
+undo_03	./undo_03.ibu	UNDO LOG	InnoDB
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+SELECT NAME, SPACE_TYPE, STATE
+FROM INFORMATION_SCHEMA.INNODB_TABLESPACES
+WHERE SPACE_TYPE = 'Undo'
+    ORDER BY NAME;
+NAME	SPACE_TYPE	STATE
+innodb_undo_001	Undo	active
+innodb_undo_002	Undo	active
+undo_00	Undo	empty
+undo_001	Undo	empty
+undo_01	Undo	empty
+undo_011	Undo	empty
+undo_02	Undo	empty
+undo_021	Undo	active
+undo_03	Undo	active
+SELECT TABLESPACE_NAME, FILE_NAME, FILE_TYPE, ENGINE
+FROM INFORMATION_SCHEMA.FILES
+WHERE FILE_NAME LIKE '%undo_0%'
+    ORDER BY TABLESPACE_NAME;
+TABLESPACE_NAME	FILE_NAME	FILE_TYPE	ENGINE
+innodb_undo_001	./undo_001	UNDO LOG	InnoDB
+innodb_undo_002	./undo_002	UNDO LOG	InnoDB
+undo_00	./undo_00.ibu	UNDO LOG	InnoDB
+undo_001	./undo_001.ibu	UNDO LOG	InnoDB
+undo_01	./undo_01.ibu	UNDO LOG	InnoDB
+undo_011	./undo_011.ibu	UNDO LOG	InnoDB
+undo_02	./undo_02.ibu	UNDO LOG	InnoDB
+undo_021	./undo_021.ibu	UNDO LOG	InnoDB
+undo_03	./undo_03.ibu	UNDO LOG	InnoDB
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	7	Clone Test Row - 0
+1	17	Clone Test Row - 1
+2	27	Clone Test Row - 2
+3	37	Clone Test Row - 3
+4	47	Clone Test Row - 4
+5	57	Clone Test Row - 5
+6	67	Clone Test Row - 6
+7	77	Clone Test Row - 7
+8	87	Clone Test Row - 8
+9	97	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	997	Clone Test Row - 99
+98	987	Clone Test Row - 98
+97	977	Clone Test Row - 97
+96	967	Clone Test Row - 96
+95	957	Clone Test Row - 95
+94	947	Clone Test Row - 94
+93	937	Clone Test Row - 93
+92	927	Clone Test Row - 92
+91	917	Clone Test Row - 91
+90	907	Clone Test Row - 90
+SELECT NAME, SPACE_TYPE, STATE
+FROM INFORMATION_SCHEMA.INNODB_TABLESPACES
+WHERE SPACE_TYPE = 'Undo'
+    ORDER BY NAME;
+NAME	SPACE_TYPE	STATE
+innodb_undo_001	Undo	active
+innodb_undo_002	Undo	active
+undo_00	Undo	empty
+undo_001	Undo	empty
+undo_01	Undo	empty
+undo_011	Undo	empty
+undo_02	Undo	empty
+undo_021	Undo	active
+undo_03	Undo	active
+SELECT TABLESPACE_NAME, FILE_NAME, FILE_TYPE, ENGINE
+FROM INFORMATION_SCHEMA.FILES
+WHERE FILE_NAME LIKE '%undo_0%'
+    ORDER BY TABLESPACE_NAME;
+TABLESPACE_NAME	FILE_NAME	FILE_TYPE	ENGINE
+innodb_undo_001	./undo_001	UNDO LOG	InnoDB
+innodb_undo_002	./undo_002	UNDO LOG	InnoDB
+undo_00	./undo_00.ibu	UNDO LOG	InnoDB
+undo_001	./undo_001.ibu	UNDO LOG	InnoDB
+undo_01	./undo_01.ibu	UNDO LOG	InnoDB
+undo_011	./undo_011.ibu	UNDO LOG	InnoDB
+undo_02	./undo_02.ibu	UNDO LOG	InnoDB
+undo_021	./undo_021.ibu	UNDO LOG	InnoDB
+undo_03	./undo_03.ibu	UNDO LOG	InnoDB
+CALL execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# 3. DROP UNDO TABLESPACE while clone in progress
+RESET MASTER;
+SET GLOBAL DEBUG = '+d,remote_release_clone_file_pin';
+DROP UNDO TABLESPACE undo_00  ;
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_file_init WAIT_FOR resume_file_init';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_file WAIT_FOR resume_file';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_file_ack WAIT_FOR resume_file_ack';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_file_meta WAIT_FOR resume_file_meta';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_page WAIT_FOR resume_page';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_page_meta WAIT_FOR resume_page_meta';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_redo WAIT_FOR resume_redo';
+SET GLOBAL clone_autotune_concurrency = OFF;
+SET GLOBAL clone_max_concurrency = 8;
+SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
+CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
+# In connection CON1
+DROP UNDO TABLESPACE undo_001  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_file_init';
+# Waiting for clone to reach 'file copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file';
+# Wait finished
+# For remote clone, let the donor progress concurrently
+# otherwise file pins may not be released causing deadlock
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_file';
+DROP UNDO TABLESPACE undo_01  ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+# Flush all dirty pages to track
+SET GLOBAL innodb_buf_flush_list_now = 1;
+SET DEBUG_SYNC = 'now SIGNAL resume_file';
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_file_ack';
+SET DEBUG_SYNC = 'now SIGNAL resume_file_ack';
+DROP UNDO TABLESPACE undo_011  ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_file_meta';
+# Waiting for clone to reach 'page copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_page';
+# Wait finished
+DROP UNDO TABLESPACE undo_02  ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_page';
+# Waiting for clone to reach 'redo copy'
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_redo';
+# Wait finished
+DROP UNDO TABLESPACE undo_021  ;
+CALL execute_dml(0, 0, 100, 100, 10, 0);
+DROP UNDO TABLESPACE undo_03  ;
+SET DEBUG_SYNC = 'now SIGNAL resume_redo';
+# In connection DEFAULT
+# Waiting for clone to complete
+# Wait finished
+SET GLOBAL DEBUG = '-d,remote_release_clone_file_pin';
+# Restart server on cloned data directory
+# restart: --datadir=CLONE_DATADIR
+# Check cloned data
+SHOW TABLES;
+Tables_in_test
+t
+t0
+t01
+t1
+t11
+t2
+t21
+t3
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SELECT count(*) from t1;
+count(*)
+100
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	11	Clone Test Row - 0
+1	21	Clone Test Row - 1
+2	31	Clone Test Row - 2
+3	41	Clone Test Row - 3
+4	51	Clone Test Row - 4
+5	61	Clone Test Row - 5
+6	71	Clone Test Row - 6
+7	81	Clone Test Row - 7
+8	91	Clone Test Row - 8
+9	101	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	1001	Clone Test Row - 99
+98	991	Clone Test Row - 98
+97	981	Clone Test Row - 97
+96	971	Clone Test Row - 96
+95	961	Clone Test Row - 95
+94	951	Clone Test Row - 94
+93	941	Clone Test Row - 93
+92	931	Clone Test Row - 92
+91	921	Clone Test Row - 91
+90	911	Clone Test Row - 90
+SELECT NAME, SPACE_TYPE, STATE
+FROM INFORMATION_SCHEMA.INNODB_TABLESPACES
+WHERE SPACE_TYPE = 'Undo'
+    ORDER BY NAME;
+NAME	SPACE_TYPE	STATE
+innodb_undo_001	Undo	active
+innodb_undo_002	Undo	active
+undo_021	Undo	empty
+undo_03	Undo	empty
+SELECT TABLESPACE_NAME, FILE_NAME, FILE_TYPE, ENGINE
+FROM INFORMATION_SCHEMA.FILES
+WHERE FILE_NAME LIKE '%undo_0%'
+    ORDER BY TABLESPACE_NAME;
+TABLESPACE_NAME	FILE_NAME	FILE_TYPE	ENGINE
+innodb_undo_001	./undo_001	UNDO LOG	InnoDB
+innodb_undo_002	./undo_002	UNDO LOG	InnoDB
+undo_021	./undo_021.ibu	UNDO LOG	InnoDB
+undo_03	./undo_03.ibu	UNDO LOG	InnoDB
+SHOW CREATE TABLE t11;
+Table	Create Table
+t11	CREATE TABLE `t11` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CHECK TABLE t11 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t11	check	status	OK
+SELECT count(*) from t11;
+count(*)
+100
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	0	Clone Test Row - 0
+1	10	Clone Test Row - 1
+2	20	Clone Test Row - 2
+3	30	Clone Test Row - 3
+4	40	Clone Test Row - 4
+5	50	Clone Test Row - 5
+6	60	Clone Test Row - 6
+7	70	Clone Test Row - 7
+8	80	Clone Test Row - 8
+9	90	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t11 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	990	Clone Test Row - 99
+98	980	Clone Test Row - 98
+97	970	Clone Test Row - 97
+96	960	Clone Test Row - 96
+95	950	Clone Test Row - 95
+94	940	Clone Test Row - 94
+93	930	Clone Test Row - 93
+92	920	Clone Test Row - 92
+91	910	Clone Test Row - 91
+90	900	Clone Test Row - 90
+SELECT NAME, SPACE_TYPE, STATE
+FROM INFORMATION_SCHEMA.INNODB_TABLESPACES
+WHERE SPACE_TYPE = 'Undo'
+    ORDER BY NAME;
+NAME	SPACE_TYPE	STATE
+innodb_undo_001	Undo	active
+innodb_undo_002	Undo	active
+undo_021	Undo	empty
+undo_03	Undo	empty
+SELECT TABLESPACE_NAME, FILE_NAME, FILE_TYPE, ENGINE
+FROM INFORMATION_SCHEMA.FILES
+WHERE FILE_NAME LIKE '%undo_0%'
+    ORDER BY TABLESPACE_NAME;
+TABLESPACE_NAME	FILE_NAME	FILE_TYPE	ENGINE
+innodb_undo_001	./undo_001	UNDO LOG	InnoDB
+innodb_undo_002	./undo_002	UNDO LOG	InnoDB
+undo_021	./undo_021.ibu	UNDO LOG	InnoDB
+undo_03	./undo_03.ibu	UNDO LOG	InnoDB
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `col1` int NOT NULL,
+  `col2` int DEFAULT NULL,
+  `col3` varchar(64) DEFAULT NULL,
+  `col4` blob,
+  PRIMARY KEY (`col1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+/*!50100 PARTITION BY KEY (col1)
+PARTITIONS 5 */
+CHECK TABLE t2 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t2	check	status	OK
+SELECT count(*) from t2;
+count(*)
+100
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;;
+col1	col2	col3
+0	11	Clone Test Row - 0
+1	21	Clone Test Row - 1
+2	31	Clone Test Row - 2
+3	41	Clone Test Row - 3
+4	51	Clone Test Row - 4
+5	61	Clone Test Row - 5
+6	71	Clone Test Row - 6
+7	81	Clone Test Row - 7
+8	91	Clone Test Row - 8
+9	101	Clone Test Row - 9
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;;
+col1	col2	col3
+99	1001	Clone Test Row - 99
+98	991	Clone Test Row - 98
+97	981	Clone Test Row - 97
+96	971	Clone Test Row - 96
+95	961	Clone Test Row - 95
+94	951	Clone Test Row - 94
+93	941	Clone Test Row - 93
+92	931	Clone Test Row - 92
+91	921	Clone Test Row - 91
+90	911	Clone Test Row - 90
+SELECT NAME, SPACE_TYPE, STATE
+FROM INFORMATION_SCHEMA.INNODB_TABLESPACES
+WHERE SPACE_TYPE = 'Undo'
+    ORDER BY NAME;
+NAME	SPACE_TYPE	STATE
+innodb_undo_001	Undo	active
+innodb_undo_002	Undo	active
+undo_021	Undo	empty
+undo_03	Undo	empty
+SELECT TABLESPACE_NAME, FILE_NAME, FILE_TYPE, ENGINE
+FROM INFORMATION_SCHEMA.FILES
+WHERE FILE_NAME LIKE '%undo_0%'
+    ORDER BY TABLESPACE_NAME;
+TABLESPACE_NAME	FILE_NAME	FILE_TYPE	ENGINE
+innodb_undo_001	./undo_001	UNDO LOG	InnoDB
+innodb_undo_002	./undo_002	UNDO LOG	InnoDB
+undo_021	./undo_021.ibu	UNDO LOG	InnoDB
+undo_03	./undo_03.ibu	UNDO LOG	InnoDB
+CALL execute_dml(1, 0, 100, 100, 10, 0);
+# Restart server back on base data directory
+# restart:
+SET DEBUG_SYNC = 'RESET';
+# Cleanup
+DROP TABLE t;
+DROP TABLE t1;
+DROP TABLE t2;
+DROP PROCEDURE execute_dml;
+DROP TABLE t0;
+DROP TABLE t01;
+DROP TABLE t3;
+DROP TABLE t11;
+DROP TABLE t21;
+# Uninstall clone
+UNINSTALL PLUGIN clone;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_dml_auto_tune.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_dml_auto_tune.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_dml_auto_tune.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_dml_auto_tune.result	2021-09-28 11:46:34.000000000 +0000
@@ -50,10 +50,12 @@
 CASE p_dml_type
 WHEN 0 THEN
 SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
-INSERT INTO t1 VALUES(v_key, v_key * 10,
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
-INSERT INTO t2 VALUES(v_key, v_key * 10,
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
 WHEN 1 THEN
@@ -79,6 +81,7 @@
 END IF;
 END IF;
 END WHILE;
+COMMIT;
 END|
 call execute_dml(0, 0, 1000, 1000, 10, 0);
 SHOW CREATE TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_dml_compressed_row.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_dml_compressed_row.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_dml_compressed_row.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_dml_compressed_row.result	2021-09-28 11:46:34.000000000 +0000
@@ -50,10 +50,12 @@
 CASE p_dml_type
 WHEN 0 THEN
 SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
-INSERT INTO t1 VALUES(v_key, v_key * 10,
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
-INSERT INTO t2 VALUES(v_key, v_key * 10,
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
 WHEN 1 THEN
@@ -79,6 +81,7 @@
 END IF;
 END IF;
 END WHILE;
+COMMIT;
 END|
 DROP TABLE t1;
 DROP TABLE t2;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_dml_gtid.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_dml_gtid.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_dml_gtid.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_dml_gtid.result	2021-09-28 11:46:34.000000000 +0000
@@ -50,10 +50,12 @@
 CASE p_dml_type
 WHEN 0 THEN
 SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
-INSERT INTO t1 VALUES(v_key, v_key * 10,
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
-INSERT INTO t2 VALUES(v_key, v_key * 10,
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
 WHEN 1 THEN
@@ -79,6 +81,7 @@
 END IF;
 END IF;
 END WHILE;
+COMMIT;
 END|
 call execute_dml(0, 0, 100, 100, 10, 0);
 SHOW CREATE TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_dml_no_binlog.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_dml_no_binlog.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_dml_no_binlog.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_dml_no_binlog.result	2021-09-28 11:46:34.000000000 +0000
@@ -50,10 +50,12 @@
 CASE p_dml_type
 WHEN 0 THEN
 SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
-INSERT INTO t1 VALUES(v_key, v_key * 10,
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
-INSERT INTO t2 VALUES(v_key, v_key * 10,
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
 WHEN 1 THEN
@@ -79,6 +81,7 @@
 END IF;
 END IF;
 END WHILE;
+COMMIT;
 END|
 call execute_dml(0, 0, 100, 100, 10, 0);
 SHOW CREATE TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_dml_no_ssl.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_dml_no_ssl.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_dml_no_ssl.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_dml_no_ssl.result	2021-09-28 11:46:34.000000000 +0000
@@ -50,10 +50,12 @@
 CASE p_dml_type
 WHEN 0 THEN
 SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
-INSERT INTO t1 VALUES(v_key, v_key * 10,
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
-INSERT INTO t2 VALUES(v_key, v_key * 10,
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
 WHEN 1 THEN
@@ -79,6 +81,7 @@
 END IF;
 END IF;
 END WHILE;
+COMMIT;
 END|
 call execute_dml(0, 0, 100, 100, 10, 0);
 SHOW CREATE TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_dml_recovery.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_dml_recovery.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_dml_recovery.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_dml_recovery.result	2021-09-28 11:46:34.000000000 +0000
@@ -32,10 +32,12 @@
 CASE p_dml_type
 WHEN 0 THEN
 SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
-INSERT INTO t1 VALUES(v_key, v_key * 10,
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
-INSERT INTO t2 VALUES(v_key, v_key * 10,
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
 WHEN 1 THEN
@@ -61,6 +63,7 @@
 END IF;
 END IF;
 END WHILE;
+COMMIT;
 END|
 # Insert rows
 call execute_dml(0, 0, 100, 100, 10, 0);
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_dml_replace.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_dml_replace.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_dml_replace.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_dml_replace.result	2021-09-28 11:46:34.000000000 +0000
@@ -56,10 +56,12 @@
 CASE p_dml_type
 WHEN 0 THEN
 SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
-INSERT INTO t1 VALUES(v_key, v_key * 10,
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
-INSERT INTO t2 VALUES(v_key, v_key * 10,
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
 WHEN 1 THEN
@@ -85,6 +87,7 @@
 END IF;
 END IF;
 END WHILE;
+COMMIT;
 END|
 call execute_dml(0, 0, 100, 100, 10, 0);
 SHOW CREATE TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_dml.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_dml.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_dml.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_dml.result	2021-09-28 11:46:34.000000000 +0000
@@ -50,10 +50,12 @@
 CASE p_dml_type
 WHEN 0 THEN
 SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
-INSERT INTO t1 VALUES(v_key, v_key * 10,
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
-INSERT INTO t2 VALUES(v_key, v_key * 10,
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
 WHEN 1 THEN
@@ -79,6 +81,7 @@
 END IF;
 END IF;
 END WHILE;
+COMMIT;
 END|
 call execute_dml(0, 0, 100, 100, 10, 0);
 SHOW CREATE TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_dml_ssl_certificate.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_dml_ssl_certificate.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_dml_ssl_certificate.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_dml_ssl_certificate.result	2021-09-28 11:46:34.000000000 +0000
@@ -50,10 +50,12 @@
 CASE p_dml_type
 WHEN 0 THEN
 SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
-INSERT INTO t1 VALUES(v_key, v_key * 10,
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
-INSERT INTO t2 VALUES(v_key, v_key * 10,
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
 WHEN 1 THEN
@@ -79,6 +81,7 @@
 END IF;
 END IF;
 END WHILE;
+COMMIT;
 END|
 call execute_dml(0, 0, 100, 100, 10, 0);
 SHOW CREATE TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_dml_ssl.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_dml_ssl.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_dml_ssl.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_dml_ssl.result	2021-09-28 11:46:34.000000000 +0000
@@ -50,10 +50,12 @@
 CASE p_dml_type
 WHEN 0 THEN
 SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
-INSERT INTO t1 VALUES(v_key, v_key * 10,
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
-INSERT INTO t2 VALUES(v_key, v_key * 10,
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
 WHEN 1 THEN
@@ -79,6 +81,7 @@
 END IF;
 END IF;
 END WHILE;
+COMMIT;
 END|
 call execute_dml(0, 0, 100, 100, 10, 0);
 SHOW CREATE TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_dml_upgrade.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_dml_upgrade.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_dml_upgrade.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_dml_upgrade.result	2021-09-28 11:46:34.000000000 +0000
@@ -85,10 +85,12 @@
 CASE p_dml_type
 WHEN 0 THEN
 SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
-INSERT INTO t1 VALUES(v_key, v_key * 10,
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
-INSERT INTO t2 VALUES(v_key, v_key * 10,
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
 WHEN 1 THEN
@@ -114,6 +116,7 @@
 END IF;
 END IF;
 END WHILE;
+COMMIT;
 END|
 call execute_dml(0, 0, 100, 100, 10, 0);
 SHOW CREATE TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_encrypt.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_encrypt.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_encrypt.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_encrypt.result	2021-09-28 11:46:34.000000000 +0000
@@ -29,10 +29,12 @@
 CASE p_dml_type
 WHEN 0 THEN
 SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
-INSERT INTO t1 VALUES(v_key, v_key * 10,
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
-INSERT INTO t2 VALUES(v_key, v_key * 10,
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
 WHEN 1 THEN
@@ -58,6 +60,7 @@
 END IF;
 END IF;
 END WHILE;
+COMMIT;
 END|
 # In connection default - starting clone
 SET DEBUG_SYNC = 'clone_file_copy SIGNAL set_encryption WAIT_FOR resume_clone';
@@ -71,20 +74,20 @@
 Variable_name	Value
 innodb_redo_log_encrypt	OFF
 SET GLOBAL innodb_redo_log_encrypt = ON;
-ERROR HY000: Concurrent clone in progress. Please try after clone is complete.
 SHOW VARIABLES LIKE 'innodb_redo_log_encrypt';
 Variable_name	Value
-innodb_redo_log_encrypt	OFF
+innodb_redo_log_encrypt	ON
 SHOW VARIABLES LIKE 'innodb_undo_log_encrypt';
 Variable_name	Value
 innodb_undo_log_encrypt	OFF
 SET GLOBAL innodb_undo_log_encrypt = ON;
-ERROR HY000: Concurrent clone in progress. Please try after clone is complete.
 SHOW VARIABLES LIKE 'innodb_undo_log_encrypt';
 Variable_name	Value
-innodb_undo_log_encrypt	OFF
+innodb_undo_log_encrypt	ON
 SET DEBUG_SYNC = 'now SIGNAL resume_clone';
 # In connection default - finishing Clone
+SET GLOBAL innodb_redo_log_encrypt = OFF;
+SET GLOBAL innodb_undo_log_encrypt = OFF;
 DROP TABLE t1;
 DROP TABLE t2;
 CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
@@ -458,6 +461,5 @@
 UNINSTALL PLUGIN clone;
 UNINSTALL PLUGIN keyring_file;
 SET DEBUG_SYNC = 'RESET';
-# restart:
 # Restart server and remove encrypted data directory
 # restart:
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_error_ddl_lock.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_error_ddl_lock.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_error_ddl_lock.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_error_ddl_lock.result	2021-09-28 11:46:34.000000000 +0000
@@ -3,8 +3,15 @@
 SHOW VARIABLES LIKE 'clone_ddl_timeout';
 Variable_name	Value
 clone_ddl_timeout	300
+SHOW VARIABLES LIKE 'clone_block_ddl';
+Variable_name	Value
+clone_block_ddl	OFF
 # Set backup lock timeout to 1 sec
+SET GLOBAL clone_block_ddl = true;
 SET GLOBAL clone_ddl_timeout = 1;
+SHOW VARIABLES LIKE 'clone_block_ddl';
+Variable_name	Value
+clone_block_ddl	ON
 SHOW VARIABLES LIKE 'clone_ddl_timeout';
 Variable_name	Value
 clone_ddl_timeout	1
@@ -14,7 +21,7 @@
 # In connection DEFAULT
 # 1A. Clone while CREATE TABLE in progress
 # In connection CON1
-SET DEBUG_SYNC = 'clone_marked_abort2 SIGNAL resume_clone WAIT_FOR resume_ddl';
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_clone WAIT_FOR resume_ddl';
 CREATE TABLE t1 (col1 INT PRIMARY KEY);
 # In connection DEFAULT
 SET DEBUG_SYNC = 'now WAIT_FOR resume_clone';
@@ -68,7 +75,7 @@
 Innodb_redo_log_enabled	ON
 # 1C. Clone while ALTER INSTANCE in progress
 # In connection CON1
-SET DEBUG_SYNC = 'clone_marked_abort2 SIGNAL resume_clone WAIT_FOR resume_ddl';
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_clone WAIT_FOR resume_ddl';
 ALTER INSTANCE DISABLE INNODB REDO_LOG;
 # In connection DEFAULT
 SET DEBUG_SYNC = 'now WAIT_FOR resume_clone';
@@ -97,7 +104,7 @@
 20
 30
 # In connection CON1
-SET DEBUG_SYNC = 'clone_marked_abort2 SIGNAL resume_clone WAIT_FOR resume_ddl';
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_clone WAIT_FOR resume_ddl';
 ALTER TABLE t1 ADD COLUMN col2 int, ALGORITHM=COPY;
 # In connection DEFAULT
 SET DEBUG_SYNC = 'now WAIT_FOR resume_clone';
@@ -147,7 +154,7 @@
 20	1020
 30	1030
 # In connection CON1
-SET DEBUG_SYNC = 'clone_marked_abort2 SIGNAL resume_clone WAIT_FOR resume_ddl';
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_clone WAIT_FOR resume_ddl';
 ALTER TABLE t1 ADD COLUMN col3 int, ALGORITHM=INPLACE;
 # In connection DEFAULT
 SET DEBUG_SYNC = 'now WAIT_FOR resume_clone';
@@ -201,7 +208,7 @@
   PRIMARY KEY (`col1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 # In connection CON1
-SET DEBUG_SYNC = 'clone_marked_abort2 SIGNAL resume_clone WAIT_FOR resume_ddl';
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_clone WAIT_FOR resume_ddl';
 ALTER TABLE t1 ADD INDEX col2_idx(col2), ALGORITHM=COPY;
 # In connection DEFAULT
 SET DEBUG_SYNC = 'now WAIT_FOR resume_clone';
@@ -251,7 +258,7 @@
   KEY `col2_idx` (`col2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 # In connection CON1
-SET DEBUG_SYNC = 'clone_marked_abort2 SIGNAL resume_clone WAIT_FOR resume_ddl';
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_clone WAIT_FOR resume_ddl';
 ALTER TABLE t1 ADD INDEX col3_idx(col3), ALGORITHM=INPLACE;
 # In connection DEFAULT
 SET DEBUG_SYNC = 'now WAIT_FOR resume_clone';
@@ -316,7 +323,7 @@
   KEY `col3_idx` (`col3`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 # In connection CON1
-SET DEBUG_SYNC = 'clone_marked_abort2 SIGNAL resume_clone WAIT_FOR resume_ddl';
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_clone WAIT_FOR resume_ddl';
 ALTER TABLE t1 DROP INDEX col3_idx, ALGORITHM=COPY;
 # In connection DEFAULT
 SET DEBUG_SYNC = 'now WAIT_FOR resume_clone';
@@ -366,7 +373,7 @@
   KEY `col2_idx` (`col2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 # In connection CON1
-SET DEBUG_SYNC = 'clone_marked_abort2 SIGNAL resume_clone WAIT_FOR resume_ddl';
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_clone WAIT_FOR resume_ddl';
 ALTER TABLE t1 DROP INDEX col2_idx, ALGORITHM=INPLACE;
 # In connection DEFAULT
 SET DEBUG_SYNC = 'now WAIT_FOR resume_clone';
@@ -411,7 +418,7 @@
 20	1020	2020
 30	1030	2030
 # In connection CON1
-SET DEBUG_SYNC = 'clone_marked_abort2 SIGNAL resume_clone WAIT_FOR resume_ddl';
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_clone WAIT_FOR resume_ddl';
 TRUNCATE TABLE t1;
 # In connection DEFAULT
 SET DEBUG_SYNC = 'now WAIT_FOR resume_clone';
@@ -453,7 +460,7 @@
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 # 6B. Clone while DROP TABLE in progress
 # In connection CON1
-SET DEBUG_SYNC = 'clone_marked_abort2 SIGNAL resume_clone WAIT_FOR resume_ddl';
+SET DEBUG_SYNC = 'clone_notify_ddl SIGNAL resume_clone WAIT_FOR resume_ddl';
 DROP TABLE t1;
 # In connection DEFAULT
 SET DEBUG_SYNC = 'now WAIT_FOR resume_clone';
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_error_ddl.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_error_ddl.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_error_ddl.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_error_ddl.result	1970-01-01 00:00:00.000000000 +0000
@@ -1,322 +0,0 @@
-INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
-SHOW VARIABLES LIKE 'clone_ddl_timeout';
-Variable_name	Value
-clone_ddl_timeout	300
-# Disable backup lock
-SET GLOBAL clone_ddl_timeout = 0;
-SHOW VARIABLES LIKE 'clone_ddl_timeout';
-Variable_name	Value
-clone_ddl_timeout	0
-# 1. CREATE TABLE while clone in progress
-SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl WAIT_FOR resume_clone';
-SET GLOBAL clone_autotune_concurrency = OFF;
-SET GLOBAL clone_max_concurrency = 8;
-SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
-CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
-SET DEBUG_SYNC = 'now WAIT_FOR start_ddl';
-# 1A. TOO MANY CLONE IN PROGRESS
-SET GLOBAL clone_autotune_concurrency = OFF;
-SET GLOBAL clone_max_concurrency = 8;
-SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
-CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
-ERROR HY000: Too many concurrent clone operations. Maximum allowed - 1.
-select ID, STATE, ERROR_NO from performance_schema.clone_status;
-ID	STATE	ERROR_NO
-1	In Progress	0
-select ID, STAGE, STATE from performance_schema.clone_progress;
-ID	STAGE	STATE
-1	DROP DATA	Completed
-1	FILE COPY	In Progress
-1	PAGE COPY	Not Started
-1	REDO COPY	Not Started
-1	FILE SYNC	Not Started
-1	RESTART	Not Started
-1	RECOVERY	Not Started
-SET DEBUG_SYNC = 'clone_marked_abort SIGNAL resume_clone';
-CREATE TABLE t1 (col1 INT PRIMARY KEY);
-# In connection DEFAULT
-ERROR HY000: Clone Donor Error: 3633 : Concurrent DDL is performed during clone operation. Please try again..
-SET DEBUG_SYNC = 'RESET';
-# In connection CON1
-SET DEBUG_SYNC = 'RESET';
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `col1` int NOT NULL,
-  PRIMARY KEY (`col1`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
-# 1B. ALTER INSTANCE while clone in progress
-SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl WAIT_FOR resume_clone';
-SET GLOBAL clone_autotune_concurrency = OFF;
-SET GLOBAL clone_max_concurrency = 8;
-SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
-CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
-SET DEBUG_SYNC = 'now WAIT_FOR start_ddl';
-SET DEBUG_SYNC = 'clone_marked_abort SIGNAL resume_clone';
-ALTER INSTANCE DISABLE INNODB REDO_LOG;
-# In connection DEFAULT
-ERROR HY000: Clone Donor Error: 3633 : Concurrent DDL is performed during clone operation. Please try again..
-SET DEBUG_SYNC = 'RESET';
-# In connection CON1
-SET DEBUG_SYNC = 'RESET';
-ALTER INSTANCE ENABLE INNODB REDO_LOG;
-# 2. ALTER TABLE ADD COLUMN [COPY] while clone in progress
-# In connection DEFAULT
-INSERT INTO t1 values(10), (20), (30);
-SELECT * FROM t1 ORDER BY col1;
-col1
-10
-20
-30
-SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl WAIT_FOR resume_clone';
-SET GLOBAL clone_autotune_concurrency = OFF;
-SET GLOBAL clone_max_concurrency = 8;
-SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
-CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
-SET DEBUG_SYNC = 'now WAIT_FOR start_ddl';
-SET DEBUG_SYNC = 'clone_marked_abort SIGNAL resume_clone';
-ALTER TABLE t1 ADD COLUMN col2 int, ALGORITHM=COPY;
-# In connection DEFAULT
-ERROR HY000: Clone Donor Error: 3633 : Concurrent DDL is performed during clone operation. Please try again..
-SET DEBUG_SYNC = 'RESET';
-# In connection CON1
-SET DEBUG_SYNC = 'RESET';
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `col1` int NOT NULL,
-  `col2` int DEFAULT NULL,
-  PRIMARY KEY (`col1`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
-SELECT * FROM t1 ORDER BY col1;
-col1	col2
-10	NULL
-20	NULL
-30	NULL
-UPDATE t1 SET col2 = col1 + 1000;
-# 2A. ALTER TABLE ADD COLUMN [INPLACE] while clone in progress
-# In connection DEFAULT
-SELECT * FROM t1 ORDER BY col1;
-col1	col2
-10	1010
-20	1020
-30	1030
-SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl WAIT_FOR resume_clone';
-SET GLOBAL clone_autotune_concurrency = OFF;
-SET GLOBAL clone_max_concurrency = 8;
-SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
-CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
-SET DEBUG_SYNC = 'now WAIT_FOR start_ddl';
-SET DEBUG_SYNC = 'clone_marked_abort SIGNAL resume_clone';
-ALTER TABLE t1 ADD COLUMN col3 int, ALGORITHM=INPLACE;
-# In connection DEFAULT
-ERROR HY000: Clone Donor Error: 3633 : Concurrent DDL is performed during clone operation. Please try again..
-SET DEBUG_SYNC = 'RESET';
-# In connection CON1
-SET DEBUG_SYNC = 'RESET';
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `col1` int NOT NULL,
-  `col2` int DEFAULT NULL,
-  `col3` int DEFAULT NULL,
-  PRIMARY KEY (`col1`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
-SELECT * FROM t1 ORDER BY col1;
-col1	col2	col3
-10	1010	NULL
-20	1020	NULL
-30	1030	NULL
-UPDATE t1 SET col3 = col2 + 1000;
-# 3A. ADD INDEX [COPY] while clone in progress
-# In connection DEFAULT
-SELECT * FROM t1 ORDER BY col1;
-col1	col2	col3
-10	1010	2010
-20	1020	2020
-30	1030	2030
-SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl WAIT_FOR resume_clone';
-SET GLOBAL clone_autotune_concurrency = OFF;
-SET GLOBAL clone_max_concurrency = 8;
-SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
-CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
-SET DEBUG_SYNC = 'now WAIT_FOR start_ddl';
-SET DEBUG_SYNC = 'clone_marked_abort SIGNAL resume_clone';
-ALTER TABLE t1 ADD INDEX col2_idx(col2), ALGORITHM=COPY;
-# In connection DEFAULT
-ERROR HY000: Clone Donor Error: 3633 : Concurrent DDL is performed during clone operation. Please try again..
-SET DEBUG_SYNC = 'RESET';
-# In connection CON1
-SET DEBUG_SYNC = 'RESET';
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `col1` int NOT NULL,
-  `col2` int DEFAULT NULL,
-  `col3` int DEFAULT NULL,
-  PRIMARY KEY (`col1`),
-  KEY `col2_idx` (`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
-SELECT * FROM t1 ORDER BY col1;
-col1	col2	col3
-10	1010	2010
-20	1020	2020
-30	1030	2030
-# 3B. ADD INDEX [INPLACE] while clone in progress
-# In connection DEFAULT
-SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl WAIT_FOR resume_clone';
-SET GLOBAL clone_autotune_concurrency = OFF;
-SET GLOBAL clone_max_concurrency = 8;
-SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
-CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
-SET DEBUG_SYNC = 'now WAIT_FOR start_ddl';
-SET DEBUG_SYNC = 'clone_marked_abort SIGNAL resume_clone';
-ALTER TABLE t1 ADD INDEX col3_idx(col3), ALGORITHM=INPLACE;
-# In connection DEFAULT
-ERROR HY000: Clone Donor Error: 3633 : Concurrent DDL is performed during clone operation. Please try again..
-SET DEBUG_SYNC = 'RESET';
-# In connection CON1
-SET DEBUG_SYNC = 'RESET';
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `col1` int NOT NULL,
-  `col2` int DEFAULT NULL,
-  `col3` int DEFAULT NULL,
-  PRIMARY KEY (`col1`),
-  KEY `col2_idx` (`col2`),
-  KEY `col3_idx` (`col3`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
-SELECT * FROM t1 ORDER BY col1;
-col1	col2	col3
-10	1010	2010
-20	1020	2020
-30	1030	2030
-# 4A. DROP INDEX [COPY] while clone in progress
-# In connection DEFAULT
-SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl WAIT_FOR resume_clone';
-SET GLOBAL clone_autotune_concurrency = OFF;
-SET GLOBAL clone_max_concurrency = 8;
-SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
-CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
-SET DEBUG_SYNC = 'now WAIT_FOR start_ddl';
-SET DEBUG_SYNC = 'clone_marked_abort SIGNAL resume_clone';
-ALTER TABLE t1 DROP INDEX col3_idx, ALGORITHM=COPY;
-# In connection DEFAULT
-ERROR HY000: Clone Donor Error: 3633 : Concurrent DDL is performed during clone operation. Please try again..
-SET DEBUG_SYNC = 'RESET';
-# In connection CON1
-SET DEBUG_SYNC = 'RESET';
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `col1` int NOT NULL,
-  `col2` int DEFAULT NULL,
-  `col3` int DEFAULT NULL,
-  PRIMARY KEY (`col1`),
-  KEY `col2_idx` (`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
-SELECT * FROM t1 ORDER BY col1;
-col1	col2	col3
-10	1010	2010
-20	1020	2020
-30	1030	2030
-# 4B. DROP INDEX [INPLACE] while clone in progress
-# In connection DEFAULT
-SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl WAIT_FOR resume_clone';
-SET GLOBAL clone_autotune_concurrency = OFF;
-SET GLOBAL clone_max_concurrency = 8;
-SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
-CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
-SET DEBUG_SYNC = 'now WAIT_FOR start_ddl';
-SET DEBUG_SYNC = 'clone_marked_abort SIGNAL resume_clone';
-ALTER TABLE t1 DROP INDEX col2_idx, ALGORITHM=INPLACE;
-# In connection DEFAULT
-ERROR HY000: Clone Donor Error: 3633 : Concurrent DDL is performed during clone operation. Please try again..
-SET DEBUG_SYNC = 'RESET';
-# In connection CON1
-SET DEBUG_SYNC = 'RESET';
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `col1` int NOT NULL,
-  `col2` int DEFAULT NULL,
-  `col3` int DEFAULT NULL,
-  PRIMARY KEY (`col1`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
-SELECT * FROM t1 ORDER BY col1;
-col1	col2	col3
-10	1010	2010
-20	1020	2020
-30	1030	2030
-# 5. TRUNCATE TABLE while clone in progress
-# In connection DEFAULT
-SELECT * FROM t1 ORDER BY col1;
-col1	col2	col3
-10	1010	2010
-20	1020	2020
-30	1030	2030
-SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl WAIT_FOR resume_clone';
-SET GLOBAL clone_autotune_concurrency = OFF;
-SET GLOBAL clone_max_concurrency = 8;
-SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
-CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
-SET DEBUG_SYNC = 'now WAIT_FOR start_ddl';
-SET DEBUG_SYNC = 'clone_marked_abort SIGNAL resume_clone';
-TRUNCATE TABLE t1;
-# In connection DEFAULT
-ERROR HY000: Clone Donor Error: 3633 : Concurrent DDL is performed during clone operation. Please try again..
-SET DEBUG_SYNC = 'RESET';
-# In connection CON1
-SET DEBUG_SYNC = 'RESET';
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `col1` int NOT NULL,
-  `col2` int DEFAULT NULL,
-  `col3` int DEFAULT NULL,
-  PRIMARY KEY (`col1`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
-SELECT * FROM t1 ORDER BY col1;
-col1	col2	col3
-# 6. DROP TABLE while clone in progress
-# In connection DEFAULT
-INSERT INTO t1 values(10, 100, 1000);
-SELECT * FROM t1 ORDER BY col1;
-col1	col2	col3
-10	100	1000
-SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl WAIT_FOR resume_clone';
-SET GLOBAL clone_autotune_concurrency = OFF;
-SET GLOBAL clone_max_concurrency = 8;
-SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
-CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
-SET DEBUG_SYNC = 'now WAIT_FOR start_ddl';
-SET DEBUG_SYNC = 'clone_marked_abort SIGNAL resume_clone';
-DROP TABLE t1;
-# In connection DEFAULT
-ERROR HY000: Clone Donor Error: 3633 : Concurrent DDL is performed during clone operation. Please try again..
-# In connection CON1
-CREATE TABLE t1(col1 int);
-# 7. KILL CLONE command while in progress
-# In connection DEFAULT
-INSERT INTO t1 values(10), (20), (30);
-SELECT * FROM t1 ORDER BY col1;
-col1
-10
-20
-30
-SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_kill WAIT_FOR resume_clone';
-SET GLOBAL clone_autotune_concurrency = OFF;
-SET GLOBAL clone_max_concurrency = 8;
-SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
-CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
-SET DEBUG_SYNC = 'now WAIT_FOR start_kill';
-KILL QUERY CON_ID;
-SET DEBUG_SYNC= 'now SIGNAL resume_clone';
-# In connection DEFAULT
-ERROR 70100: Query execution was interrupted
-#Cleanup
-# In connection DEFAULT
-SET DEBUG_SYNC = 'RESET';
-DROP TABLE t1;
-UNINSTALL PLUGIN clone;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_features.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_features.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_features.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_features.result	2021-09-28 11:46:34.000000000 +0000
@@ -24,10 +24,12 @@
 CASE p_dml_type
 WHEN 0 THEN
 SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
-INSERT INTO t1 VALUES(v_key, v_key * 10,
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
-INSERT INTO t2 VALUES(v_key, v_key * 10,
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
 WHEN 1 THEN
@@ -53,6 +55,7 @@
 END IF;
 END IF;
 END WHILE;
+COMMIT;
 END|
 DROP TABLE t1;
 DROP TABLE t2;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_file_extend.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_file_extend.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_file_extend.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_file_extend.result	2021-09-28 11:46:34.000000000 +0000
@@ -24,10 +24,12 @@
 CASE p_dml_type
 WHEN 0 THEN
 SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
-INSERT INTO t1 VALUES(v_key, v_key * 10,
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
-INSERT INTO t2 VALUES(v_key, v_key * 10,
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
 WHEN 1 THEN
@@ -53,6 +55,7 @@
 END IF;
 END IF;
 END WHILE;
+COMMIT;
 END|
 DROP TABLE t1;
 DROP TABLE t2;
@@ -164,7 +167,7 @@
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=COMPRESSED
 SELECT count(*) from t1;
 count(*)
-20
+40
 SELECT col1, col3, SUBSTRING(col4, 1000, 32) FROM t1 ORDER BY col1 LIMIT 10;
 col1	col3	SUBSTRING(col4, 1000, 32)
 0	Clone Test Row - 0	umn Data Large Column Data Large
@@ -179,16 +182,16 @@
 9	Clone Test Row - 9	umn Data Large Column Data Large
 SELECT col1, col3, SUBSTRING(col4, 1000, 32) FROM t1 ORDER BY col1 DESC LIMIT 10;
 col1	col3	SUBSTRING(col4, 1000, 32)
-19	Clone Test Row - 19	umn Data Large Column Data Large
-18	Clone Test Row - 18	umn Data Large Column Data Large
-17	Clone Test Row - 17	umn Data Large Column Data Large
-16	Clone Test Row - 16	umn Data Large Column Data Large
-15	Clone Test Row - 15	umn Data Large Column Data Large
-14	Clone Test Row - 14	umn Data Large Column Data Large
-13	Clone Test Row - 13	umn Data Large Column Data Large
-12	Clone Test Row - 12	umn Data Large Column Data Large
-11	Clone Test Row - 11	umn Data Large Column Data Large
-10	Clone Test Row - 10	umn Data Large Column Data Large
+69	Clone Test Row - 69	umn Data Large Column Data Large
+68	Clone Test Row - 68	umn Data Large Column Data Large
+67	Clone Test Row - 67	umn Data Large Column Data Large
+66	Clone Test Row - 66	umn Data Large Column Data Large
+65	Clone Test Row - 65	umn Data Large Column Data Large
+64	Clone Test Row - 64	umn Data Large Column Data Large
+63	Clone Test Row - 63	umn Data Large Column Data Large
+62	Clone Test Row - 62	umn Data Large Column Data Large
+61	Clone Test Row - 61	umn Data Large Column Data Large
+60	Clone Test Row - 60	umn Data Large Column Data Large
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
@@ -200,7 +203,7 @@
 ) /*!50100 TABLESPACE `tbs1` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 SELECT count(*) from t2;
 count(*)
-20
+40
 SELECT col1, col3, SUBSTRING(col4, 1000, 32) FROM t2 ORDER BY col1 LIMIT 10;
 col1	col3	SUBSTRING(col4, 1000, 32)
 0	Clone Test Row - 0	umn Data Large Column Data Large
@@ -215,16 +218,16 @@
 9	Clone Test Row - 9	umn Data Large Column Data Large
 SELECT col1, col3, SUBSTRING(col4, 1000, 32) FROM t2 ORDER BY col1 DESC LIMIT 10;
 col1	col3	SUBSTRING(col4, 1000, 32)
-19	Clone Test Row - 19	umn Data Large Column Data Large
-18	Clone Test Row - 18	umn Data Large Column Data Large
-17	Clone Test Row - 17	umn Data Large Column Data Large
-16	Clone Test Row - 16	umn Data Large Column Data Large
-15	Clone Test Row - 15	umn Data Large Column Data Large
-14	Clone Test Row - 14	umn Data Large Column Data Large
-13	Clone Test Row - 13	umn Data Large Column Data Large
-12	Clone Test Row - 12	umn Data Large Column Data Large
-11	Clone Test Row - 11	umn Data Large Column Data Large
-10	Clone Test Row - 10	umn Data Large Column Data Large
+69	Clone Test Row - 69	umn Data Large Column Data Large
+68	Clone Test Row - 68	umn Data Large Column Data Large
+67	Clone Test Row - 67	umn Data Large Column Data Large
+66	Clone Test Row - 66	umn Data Large Column Data Large
+65	Clone Test Row - 65	umn Data Large Column Data Large
+64	Clone Test Row - 64	umn Data Large Column Data Large
+63	Clone Test Row - 63	umn Data Large Column Data Large
+62	Clone Test Row - 62	umn Data Large Column Data Large
+61	Clone Test Row - 61	umn Data Large Column Data Large
+60	Clone Test Row - 60	umn Data Large Column Data Large
 call execute_dml(3, 0, 1, 1, 1, 0);
 call execute_dml(0, 0, 10, 10, 2, 0);
 commit;
@@ -315,7 +318,7 @@
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=COMPRESSED
 SELECT count(*) from t1;
 count(*)
-20
+40
 SELECT col1, col3, SUBSTRING(col4, 1000, 32) FROM t1 ORDER BY col1 LIMIT 10;
 col1	col3	SUBSTRING(col4, 1000, 32)
 0	Clone Test Row - 0	umn Data Large Column Data Large
@@ -330,16 +333,16 @@
 9	Clone Test Row - 9	umn Data Large Column Data Large
 SELECT col1, col3, SUBSTRING(col4, 1000, 32) FROM t1 ORDER BY col1 DESC LIMIT 10;
 col1	col3	SUBSTRING(col4, 1000, 32)
-19	Clone Test Row - 19	umn Data Large Column Data Large
-18	Clone Test Row - 18	umn Data Large Column Data Large
-17	Clone Test Row - 17	umn Data Large Column Data Large
-16	Clone Test Row - 16	umn Data Large Column Data Large
-15	Clone Test Row - 15	umn Data Large Column Data Large
-14	Clone Test Row - 14	umn Data Large Column Data Large
-13	Clone Test Row - 13	umn Data Large Column Data Large
-12	Clone Test Row - 12	umn Data Large Column Data Large
-11	Clone Test Row - 11	umn Data Large Column Data Large
-10	Clone Test Row - 10	umn Data Large Column Data Large
+69	Clone Test Row - 69	umn Data Large Column Data Large
+68	Clone Test Row - 68	umn Data Large Column Data Large
+67	Clone Test Row - 67	umn Data Large Column Data Large
+66	Clone Test Row - 66	umn Data Large Column Data Large
+65	Clone Test Row - 65	umn Data Large Column Data Large
+64	Clone Test Row - 64	umn Data Large Column Data Large
+63	Clone Test Row - 63	umn Data Large Column Data Large
+62	Clone Test Row - 62	umn Data Large Column Data Large
+61	Clone Test Row - 61	umn Data Large Column Data Large
+60	Clone Test Row - 60	umn Data Large Column Data Large
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
@@ -351,7 +354,7 @@
 ) /*!50100 TABLESPACE `tbs1` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 SELECT count(*) from t2;
 count(*)
-20
+40
 SELECT col1, col3, SUBSTRING(col4, 1000, 32) FROM t2 ORDER BY col1 LIMIT 10;
 col1	col3	SUBSTRING(col4, 1000, 32)
 0	Clone Test Row - 0	umn Data Large Column Data Large
@@ -366,16 +369,16 @@
 9	Clone Test Row - 9	umn Data Large Column Data Large
 SELECT col1, col3, SUBSTRING(col4, 1000, 32) FROM t2 ORDER BY col1 DESC LIMIT 10;
 col1	col3	SUBSTRING(col4, 1000, 32)
-19	Clone Test Row - 19	umn Data Large Column Data Large
-18	Clone Test Row - 18	umn Data Large Column Data Large
-17	Clone Test Row - 17	umn Data Large Column Data Large
-16	Clone Test Row - 16	umn Data Large Column Data Large
-15	Clone Test Row - 15	umn Data Large Column Data Large
-14	Clone Test Row - 14	umn Data Large Column Data Large
-13	Clone Test Row - 13	umn Data Large Column Data Large
-12	Clone Test Row - 12	umn Data Large Column Data Large
-11	Clone Test Row - 11	umn Data Large Column Data Large
-10	Clone Test Row - 10	umn Data Large Column Data Large
+69	Clone Test Row - 69	umn Data Large Column Data Large
+68	Clone Test Row - 68	umn Data Large Column Data Large
+67	Clone Test Row - 67	umn Data Large Column Data Large
+66	Clone Test Row - 66	umn Data Large Column Data Large
+65	Clone Test Row - 65	umn Data Large Column Data Large
+64	Clone Test Row - 64	umn Data Large Column Data Large
+63	Clone Test Row - 63	umn Data Large Column Data Large
+62	Clone Test Row - 62	umn Data Large Column Data Large
+61	Clone Test Row - 61	umn Data Large Column Data Large
+60	Clone Test Row - 60	umn Data Large Column Data Large
 call execute_dml(3, 0, 1, 1, 1, 0);
 call execute_dml(0, 0, 10, 10, 2, 0);
 commit;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_insert.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_insert.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_insert.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_insert.result	2021-09-28 11:46:34.000000000 +0000
@@ -2,51 +2,45 @@
 CREATE PROCEDURE prepare_data(IN val INT)
 BEGIN
 DECLARE i INT DEFAULT 1;
-WHILE i < val DO
+WHILE i <= val DO
 INSERT INTO t1 (b,c) VALUES (REPEAT(a,600), REPEAT(b,600));
 INSERT INTO t2 (b,c) VALUES (REPEAT(a,600), REPEAT(b,600));
-INSERT INTO t3 (b,c) VALUES (REPEAT(a,600), REPEAT(b,600));
 SET i = i + 1;
 END WHILE;
 END|
 # Case 1 - Normal page archiving process using clone client.
-CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY AUTO_INCREMENT, b LONGBLOB, c
-LONGBLOB);
-CREATE TABLE t2 (a INT NOT NULL PRIMARY KEY AUTO_INCREMENT, b LONGBLOB, c
-LONGBLOB);
-CREATE TABLE t3 (a INT NOT NULL PRIMARY KEY AUTO_INCREMENT, b LONGBLOB, c
-LONGBLOB);
+CREATE TABLE t1 (a INT AUTO_INCREMENT, b LONGBLOB, c LONGBLOB, key k1(a));
+CREATE TABLE t2 (a INT PRIMARY KEY AUTO_INCREMENT, b LONGBLOB, c LONGBLOB);
 SET DEBUG_SYNC = 'clone_file_copy SIGNAL page_signal WAIT_FOR go_page';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL redo_signal WAIT_FOR go_redo';
 SET GLOBAL clone_autotune_concurrency = OFF;
 SET GLOBAL clone_max_concurrency = 8;
 SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
 CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
 SET DEBUG_SYNC = 'now WAIT_FOR page_signal';
-CALL prepare_data(100);
+CALL prepare_data(50);
 SET DEBUG_SYNC = 'now SIGNAL go_page';
+SET DEBUG_SYNC = 'now WAIT_FOR redo_signal';
+CALL prepare_data(10);
+SET DEBUG_SYNC = 'now SIGNAL go_redo';
 select count(*) from t1;
 count(*)
-99
+60
 select count(*) from t2;
 count(*)
-99
-select count(*) from t3;
-count(*)
-99
+60
 # restart: --datadir=CLONE_DATADIR
-select count(*) from t1;
-count(*)
-99
-select count(*) from t2;
-count(*)
-99
-select count(*) from t3;
-count(*)
-99
+INSERT INTO t1 (b,c) VALUES (REPEAT(a,600), REPEAT(b,600));
+INSERT INTO t2 (b,c) VALUES (REPEAT(a,600), REPEAT(b,600));
+select count(*), max(a) from t1;
+count(*)	max(a)
+61	61
+select count(*), max(a) from t2;
+count(*)	max(a)
+61	61
 # restart:
 DROP TABLE t1;
 DROP TABLE t2;
-DROP TABLE t3;
 SET DEBUG_SYNC = 'RESET';
 DROP PROCEDURE prepare_data;
 UNINSTALL PLUGIN clone;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_stage_restart.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_stage_restart.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_stage_restart.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_stage_restart.result	2021-09-28 11:46:34.000000000 +0000
@@ -25,10 +25,12 @@
 CASE p_dml_type
 WHEN 0 THEN
 SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
-INSERT INTO t1 VALUES(v_key, v_key * 10,
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
-INSERT INTO t2 VALUES(v_key, v_key * 10,
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
 WHEN 1 THEN
@@ -54,6 +56,7 @@
 END IF;
 END IF;
 END WHILE;
+COMMIT;
 END|
 call execute_dml(0, 0, 100, 100, 10, 0);
 SHOW CREATE TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_stage.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_stage.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_stage.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_stage.result	2021-09-28 11:46:34.000000000 +0000
@@ -24,10 +24,12 @@
 CASE p_dml_type
 WHEN 0 THEN
 SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
-INSERT INTO t1 VALUES(v_key, v_key * 10,
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
-INSERT INTO t2 VALUES(v_key, v_key * 10,
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
 WHEN 1 THEN
@@ -53,6 +55,7 @@
 END IF;
 END IF;
 END WHILE;
+COMMIT;
 END|
 call execute_dml(0, 0, 100, 100, 10, 0);
 SHOW CREATE TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_stage_sys.result mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_stage_sys.result
--- mysql-8.0-8.0.26/mysql-test/suite/clone/r/remote_stage_sys.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/r/remote_stage_sys.result	2021-09-28 11:46:34.000000000 +0000
@@ -24,10 +24,12 @@
 CASE p_dml_type
 WHEN 0 THEN
 SET @clol3_text = CONCAT('Clone Test Row - ', v_key);
-INSERT INTO t1 VALUES(v_key, v_key * 10,
+INSERT INTO t1 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
-INSERT INTO t2 VALUES(v_key, v_key * 10,
+INSERT INTO t2 (col1, col2, col3, col4) VALUES (
+v_key, v_key * 10,
 @clol3_text, REPEAT('Large Column Data ', 2048))
 ON DUPLICATE KEY UPDATE col2 = col2 + 1;
 WHEN 1 THEN
@@ -53,6 +55,7 @@
 END IF;
 END IF;
 END WHILE;
+COMMIT;
 END|
 call execute_dml(0, 0, 100, 100, 10, 0);
 SHOW CREATE TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/ddl_alter_copy.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/ddl_alter_copy.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/ddl_alter_copy.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/ddl_alter_copy.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,84 @@
+# Test clone with concurrent alter ADD and DROP
+--source include/have_debug_sync.inc
+
+--replace_result $CLONE_PLUGIN CLONE_PLUGIN
+--eval INSTALL PLUGIN clone SONAME '$CLONE_PLUGIN'
+
+--let $algorithm = COPY
+
+if($in_place_ddl) {
+  --let $algorithm = INPLACE
+}
+
+--source ../include/create_ddl_schema.inc
+
+## Restart server without loading all tablespaces. This would force
+## Clone to load the tablespaces with concurrent DDL
+if ($skip_space_validation) {
+  --let restart_parameters=restart: --skip-innodb-validate-tablespace-paths
+  --source include/restart_mysqld.inc
+}
+
+--let $dml_stmt_check = call execute_dml(1, 0, 100, 100, 10, 0)
+
+--echo # 1. ALTER TABLE ADD COLUMN while clone in progress
+--let $ddl_op1 = ALTER TABLE
+--let $ddl_stmt1 = ADD COLUMN col5 int, ALGORITHM=$algorithm
+
+--let $dml_stmt1 = CALL execute_dml(0, 0, 100, 100, 10, 0)
+--let $dml_stmt11 = INSERT INTO t11 SELECT col1, col2, col3, col4, col2 + 100 FROM t ON DUPLICATE KEY UPDATE col2 = t11.col2 + 1;
+
+--let $dml_stmt2 = CALL execute_dml(0, 0, 100, 100, 10, 0)
+--let $dml_stmt21 = INSERT INTO t21 SELECT col1, col2, col3, col4, col2 + 100 FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;
+
+--source ../include/ddl_common.inc
+
+--echo # 2. ALTER TABLE DROP COLUMN while clone in progress
+--let $ddl_op1 = ALTER TABLE
+--let $ddl_stmt1 = DROP COLUMN col5, ALGORITHM=$algorithm
+
+--let $dml_stmt1 = call execute_dml(1, 0, 100, 100, 10, 0)
+--let $dml_stmt11 = INSERT INTO t11 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t11.col2 + 1;
+--let $dml_stmt2 = call execute_dml(1, 0, 100, 100, 10, 0)
+--let $dml_stmt21 = INSERT INTO t21 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;
+
+--source ../include/ddl_common.inc
+
+--echo # 3. ADD INDEX while clone in progress
+--let $ddl_op1 = ALTER TABLE
+--let $ddl_stmt1 = ADD INDEX col2_idx(col2), ALGORITHM=$algorithm
+
+--let $dml_stmt1 = CALL execute_dml(0, 0, 100, 100, 10, 0)
+--let $dml_stmt11 = INSERT INTO t11 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t11.col2 + 1;
+
+--let $dml_stmt2 = CALL execute_dml(0, 0, 100, 100, 10, 0)
+--let $dml_stmt21 = INSERT INTO t21 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;
+
+--source ../include/ddl_common.inc
+
+# Reset space validation to restart the server back in normal mode
+# after test is over. This step is required just before the last
+# test execution of ddl_common.inc
+if ($skip_space_validation) {
+  --let $skip_space_validation =
+}
+
+--echo # 4. DROP INDEX while clone in progress
+--let $ddl_op1 = ALTER TABLE
+--let $ddl_stmt1 = DROP INDEX col2_idx, ALGORITHM=$algorithm
+
+--let $dml_stmt1 = CALL execute_dml(0, 0, 100, 100, 10, 0)
+--let $dml_stmt11 = INSERT INTO t11 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t11.col2 + 1;
+
+--let $dml_stmt2 = CALL execute_dml(0, 0, 100, 100, 10, 0)
+--let $dml_stmt21 = INSERT INTO t21 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;
+
+--source ../include/ddl_common.inc
+
+--echo # Cleanup
+--let $ddl_drop_schema_tables = 1
+--let $ddl_drop_tables = 1
+--source ../include/drop_ddl_schema.inc
+
+--echo # Uninstall clone
+UNINSTALL PLUGIN clone;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/ddl_alter_inplace.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/ddl_alter_inplace.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/ddl_alter_inplace.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/ddl_alter_inplace.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,4 @@
+## Test clone with concurrent alter ADD and DROP INPLACE
+
+--let $in_place_ddl = 1
+--source ddl_alter_copy.test
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/ddl_basic.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/ddl_basic.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/ddl_basic.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/ddl_basic.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,46 @@
+# Test clone with concurrent DDL
+--source include/have_debug_sync.inc
+
+--replace_result $CLONE_PLUGIN CLONE_PLUGIN
+--eval INSTALL PLUGIN clone SONAME '$CLONE_PLUGIN'
+
+--let $ddl_no_table = 1
+--source ../include/create_ddl_schema.inc
+
+--let $dml_stmt_check = CALL execute_dml(1, 0, 100, 100, 10, 0)
+
+--echo # 1. CREATE TABLE while clone in progress
+--let $ddl_op1 = CREATE TABLE
+--let $ddl_stmt1 = (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+--let $ddl_post1 = PARTITION BY KEY(col1) PARTITIONS 5
+
+--let $dml_stmt1  = INSERT INTO t1 SELECT * FROM t
+--let $dml_stmt11 = INSERT INTO t11 SELECT * FROM t
+
+--let $dml_stmt2 = CALL execute_dml(0, 0, 100, 100, 10, 0)
+--let $dml_stmt21 = INSERT INTO t21 SELECT * FROM t
+
+--source ../include/ddl_common.inc
+
+--echo # 2. DROP TABLE while clone in progress
+--let $ddl_op1 = DROP TABLE
+--let $ddl_stmt1 =
+--let $ddl_post1 =
+
+--let $dml_stmt1 = SHOW TABLES
+--let $dml_stmt11 = SHOW TABLES
+
+--let $dml_stmt2 = SHOW TABLES
+--let $dml_stmt21 = SHOW TABLES
+
+--let $ddl_skip_check = 1
+
+--source ../include/ddl_common.inc
+
+--echo # Cleanup
+--let $ddl_drop_schema_tables = 1
+--let $ddl_recreate_schema_tables = 1
+--source ../include/drop_ddl_schema.inc
+
+--echo # Uninstall clone
+UNINSTALL PLUGIN clone;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/ddl_compress_encrypt.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/ddl_compress_encrypt.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/ddl_compress_encrypt.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/ddl_compress_encrypt.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,9 @@
+# Test clone with concurrent DDL with page compression
+
+--source include/have_punch_hole.inc
+--disable_query_log
+call mtr.add_suppression("\\[Warning\\] .*MY-\\d+.* Punch hole failed for .*");
+--enable_query_log
+
+--let ddl_compress = 1
+--source ddl_encrypt.test
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/ddl_compress.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/ddl_compress.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/ddl_compress.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/ddl_compress.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,10 @@
+# Test clone with concurrent DDL with page compression
+
+--source include/have_punch_hole.inc
+--disable_query_log
+call mtr.add_suppression("\\[Warning\\] .*MY-\\d+.* Punch hole failed for .*");
+--enable_query_log
+
+--let ddl_compress = 1
+--let $ddl_no_encrypt = 1
+--source ddl_encrypt.test
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/ddl_dml.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/ddl_dml.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/ddl_dml.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/ddl_dml.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,3 @@
+# Test clone with concurrent DML and DDL
+--let clone_ddl = 1
+--source local_dml.test
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/ddl_encrypt.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/ddl_encrypt.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/ddl_encrypt.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/ddl_encrypt.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,90 @@
+# Test clone with concurrent encryption DDL
+--source include/have_debug_sync.inc
+--source include/big_test.inc
+
+--source include/have_innodb_max_16k.inc
+--source ../include/encrypt_begin.inc
+
+--replace_result $CLONE_PLUGIN CLONE_PLUGIN
+--eval INSTALL PLUGIN clone SONAME '$CLONE_PLUGIN'
+
+--let $ddl_no_table = 1
+--let $ddl_encryption = 1
+
+--let $encryption_enable = ENCRYPTION = "Y"
+--let $encryption_disable = ENCRYPTION = "N"
+
+if ($ddl_compress) {
+  --let $compression_enable = COMPRESSION = "LZ4"
+  --let $compression_disable = COMPRESSION = "None"
+  if ($ddl_no_encrypt) {
+    --let $encryption_enable =
+    --let $encryption_disable =
+  }
+}
+
+--source ../include/create_ddl_schema.inc
+
+--let $dml_stmt_check = call execute_dml(1, 0, 100, 100, 10, 0)
+
+--echo # 1. CREATE TABLE with encryption while clone in progress
+--let $ddl_op1 = CREATE TABLE
+--let $ddl_stmt1 = (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+--let $ddl_post1 = $encryption_enable $compression_enable
+
+--let $dml_stmt1  = INSERT INTO t1 SELECT * FROM t
+--let $dml_stmt11 = INSERT INTO t11 SELECT * FROM t
+
+--let $dml_stmt2 = CALL execute_dml(0, 0, 100, 100, 10, 0)
+--let $dml_stmt21 = INSERT INTO t21 SELECT * FROM t
+
+--source ../include/ddl_common.inc
+
+--echo # 2. ALTER TABLE remove encryption while clone in progress
+--let $ddl_op1 = ALTER TABLE
+--let $ddl_stmt1 = $encryption_disable $compression_disable
+--let $ddl_post1 =
+
+--let $dml_stmt1 = call execute_dml(1, 0, 100, 100, 10, 0)
+--let $dml_stmt11 = INSERT INTO t11 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t11.col2 + 1;
+--let $dml_stmt2 = call execute_dml(1, 0, 100, 100, 10, 0)
+--let $dml_stmt21 = INSERT INTO t21 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;
+
+--source ../include/ddl_common.inc
+
+--echo # 3. ALTER TABLE add encryption while clone in progress
+--let $ddl_op1 = ALTER TABLE
+--let $ddl_stmt1 = $encryption_enable $compression_enable
+--let $ddl_post1 =
+
+--let $dml_stmt1 = call execute_dml(1, 0, 100, 100, 10, 0)
+--let $dml_stmt11 = INSERT INTO t11 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t11.col2 + 1;
+--let $dml_stmt2 = call execute_dml(1, 0, 100, 100, 10, 0)
+--let $dml_stmt21 = INSERT INTO t21 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;
+
+--source ../include/ddl_common.inc
+
+--echo # 2. DROP TABLE while clone in progress
+--let $ddl_op1 = DROP TABLE
+--let $ddl_stmt1 =
+--let $ddl_post1 =
+
+--let $dml_stmt1 = SHOW TABLES
+--let $dml_stmt11 = SHOW TABLES
+
+--let $dml_stmt2 = SHOW TABLES
+--let $dml_stmt21 = SHOW TABLES
+
+--let $ddl_skip_check = 1
+
+--source ../include/ddl_common.inc
+
+--echo # Cleanup
+--let $ddl_drop_schema_tables = 1
+--let $ddl_recreate_schema_tables = 1
+--source ../include/drop_ddl_schema.inc
+
+--echo # Uninstall clone
+UNINSTALL PLUGIN clone;
+
+--source ../include/encrypt_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/ddl_mix.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/ddl_mix.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/ddl_mix.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/ddl_mix.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,66 @@
+# Test clone with concurrent DDL
+--source include/have_debug_sync.inc
+
+--replace_result $CLONE_PLUGIN CLONE_PLUGIN
+--eval INSTALL PLUGIN clone SONAME '$CLONE_PLUGIN'
+
+--source ../include/create_ddl_schema.inc
+
+--echo # 1. RENAME and CREATE a TABLE with same name while clone in progress
+--let $dml_stmt_check = CALL execute_dml(1, 0, 100, 100, 10, 0)
+--let $ddl_count = 2
+--let $ddl_table_extn_show = _new
+
+--let $ddl_table_rename1 = 1
+--let $ddl_table_extn1 = _new
+--let $ddl_op1 = ALTER TABLE
+--let $ddl_stmt1 = RENAME
+
+--let $ddl_op2 = CREATE TABLE
+--let $ddl_stmt2 = (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+--let $ddl_post1 = PARTITION BY KEY(col1) PARTITIONS 5
+
+--let $dml_stmt1  = CALL execute_dml(0, 0, 100, 100, 10, 0)
+--let $dml_stmt11 = INSERT INTO t11 SELECT * FROM t
+
+--let $dml_stmt2 = CALL execute_dml(0, 0, 100, 100, 10, 0)
+--let $dml_stmt21 = INSERT INTO t21 SELECT * FROM t
+
+--source ../include/ddl_common.inc
+
+--let $ddl_count =
+--let $ddl_table_rename1 =
+--let $ddl_table_extn1 =
+
+--echo # Cleanup
+--let $ddl_drop_tables = 1
+--let $ddl_drop_renamed_tables = 1
+--source ../include/drop_ddl_schema.inc
+
+--echo # 2. CREATE & DROP TABLE while clone in progress
+--let $dml_stmt_check = CALL execute_dml(1, 0, 100, 100, 10, 0)
+--let $ddl_op1 = CREATE TABLE
+--let $ddl_stmt1 = (col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+--let $ddl_post1 = PARTITION BY KEY(col1) PARTITIONS 5
+
+--let $dml_stmt1  = INSERT INTO t1 SELECT * FROM t
+--let $dml_stmt11 = INSERT INTO t11 SELECT * FROM t
+
+--let $dml_stmt2 = INSERT INTO t2 SELECT * FROM t
+--let $dml_stmt21 = INSERT INTO t21 SELECT * FROM t
+
+--let $post_dml = 1
+--let $ddl_op1_after_dml = DROP TABLE
+
+--let $ddl_skip_check = 1
+--source ../include/ddl_common.inc
+
+--echo # Cleanup
+--let $ddl_drop_schema_tables = 1
+--let $ddl_recreate_schema_tables = 1
+--let $ddl_drop_tables =
+--let $ddl_drop_renamed_tables =
+--source ../include/drop_ddl_schema.inc
+
+--echo # Uninstall clone
+UNINSTALL PLUGIN clone;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/ddl_rename.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/ddl_rename.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/ddl_rename.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/ddl_rename.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,33 @@
+# Test clone with concurrent rename
+--source include/have_debug_sync.inc
+
+--replace_result $CLONE_PLUGIN CLONE_PLUGIN
+--eval INSTALL PLUGIN clone SONAME '$CLONE_PLUGIN'
+
+--source ../include/create_ddl_schema.inc
+
+--echo # 1. ALTER TABLE RENAME while clone in progress
+
+--let $ddl_table_extn_show = _new
+
+--let $ddl_table_rename1 = 1
+--let $ddl_table_extn1 = _new
+--let $ddl_op1 = ALTER TABLE
+--let $ddl_stmt1 = RENAME
+
+--let $dml_stmt1 = INSERT INTO t1_new SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t1_new.col2 + 1;
+--let $dml_stmt11 = INSERT INTO t11_new SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t11_new.col2 + 1;
+
+--let $dml_stmt2 = INSERT INTO t2_new SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t2_new.col2 + 1;
+--let $dml_stmt21 = INSERT INTO t21_new SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21_new.col2 + 1;
+
+--source ../include/ddl_common.inc
+
+--echo # Cleanup
+--let $ddl_drop_schema_tables = 1
+--let $ddl_recreate_schema_tables = 1
+--let $ddl_drop_renamed_tables = 1
+--source ../include/drop_ddl_schema.inc
+
+--echo # Uninstall clone
+UNINSTALL PLUGIN clone;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/ddl_sys_encrypt_file_copy.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/ddl_sys_encrypt_file_copy.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/ddl_sys_encrypt_file_copy.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/ddl_sys_encrypt_file_copy.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,67 @@
+# Test clone with concurrent enable/disable of REDO and UNDO encryption
+--source include/have_debug_sync.inc
+
+--source include/have_innodb_max_16k.inc
+--source ../include/encrypt_begin.inc
+
+--replace_result $CLONE_PLUGIN CLONE_PLUGIN
+--eval INSTALL PLUGIN clone SONAME '$CLONE_PLUGIN'
+
+--let $ddl_file_copy = 1
+
+--let $ddl_encryption = 1
+--let $ddl_redo_encrypt = 1
+--let $ddl_count = 3
+
+--source ../include/create_ddl_schema.inc
+
+# Re-create first two tables within tablespace
+CREATE TABLESPACE tbs;
+
+DROP TABLE t1;
+CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+TABLESPACE = tbs;
+
+DROP TABLE t2;
+CREATE TABLE t2(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+TABLESPACE = tbs;
+
+--let $dml_stmt_check = call execute_dml(1, 0, 100, 100, 10, 0)
+
+--echo # 1. Enable REDO and UNDO encryption while clone in progress
+--let $ddl_op1 = SET GLOBAL innodb_redo_log_encrypt = ON
+--let $ddl_op2 = SET GLOBAL innodb_undo_log_encrypt = ON
+--let $ddl_op3 = ALTER TABLESPACE tbs ENCRYPTION = 'Y'
+
+--let $dml_stmt1 = CALL execute_dml(0, 0, 100, 100, 10, 0)
+--let $dml_stmt11 = CALL execute_dml(0, 0, 100, 100, 10, 0)
+
+--let $dml_stmt2 = CALL execute_dml(0, 0, 100, 100, 10, 0)
+--let $dml_stmt21 = CALL execute_dml(0, 0, 100, 100, 10, 0)
+
+--source ../include/ddl_common.inc
+
+--echo # 2. Disable REDO and UNDO encryption while clone in progress
+--let $ddl_op1 = SET GLOBAL innodb_redo_log_encrypt = OFF
+--let $ddl_op2 = SET GLOBAL innodb_undo_log_encrypt = OFF
+--let $ddl_op3 = ALTER TABLESPACE tbs ENCRYPTION = 'N'
+
+--let $dml_stmt1 = call execute_dml(1, 0, 100, 100, 10, 0)
+--let $dml_stmt11 = INSERT INTO t11 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t11.col2 + 1;
+
+--let $dml_stmt2 = call execute_dml(1, 0, 100, 100, 10, 0)
+--let $dml_stmt21 = INSERT INTO t21 SELECT * FROM t ON DUPLICATE KEY UPDATE col2 = t21.col2 + 1;
+
+--source ../include/ddl_common.inc
+
+--echo # Cleanup
+--let $ddl_drop_schema_tables = 1
+--let $ddl_drop_tables = 1
+--source ../include/drop_ddl_schema.inc
+
+DROP TABLESPACE tbs;
+
+--echo # Uninstall clone
+UNINSTALL PLUGIN clone;
+
+--source ../include/encrypt_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/ddl_sys_encrypt_page_copy.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/ddl_sys_encrypt_page_copy.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/ddl_sys_encrypt_page_copy.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/ddl_sys_encrypt_page_copy.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,52 @@
+# Test clone with concurrent enable/disable of REDO and UNDO encryption
+--source include/have_debug_sync.inc
+
+--source include/have_innodb_max_16k.inc
+--source ../include/encrypt_begin.inc
+--source include/count_sessions.inc
+
+--replace_result $CLONE_PLUGIN CLONE_PLUGIN
+--eval INSTALL PLUGIN clone SONAME '$CLONE_PLUGIN'
+
+--connect (con1,localhost,root,,)
+--echo # In connection CON1
+
+CREATE TABLESPACE tbs;
+
+CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+TABLESPACE = tbs;
+
+--connection default
+--echo # In connection DEFAULT
+
+--echo # 1. Enable REDO encryption during PAGE COPY
+--let $ddl_error = 1
+--let $ddl_alter_abort= SET GLOBAL innodb_redo_log_encrypt = ON
+--source ../include/ddl_clone_abort.inc
+
+--echo # 2. Enable UNDO encryption during PAGE COPY
+--let $ddl_error = 1
+--let $ddl_alter_abort= SET GLOBAL innodb_undo_log_encrypt = ON
+--source ../include/ddl_clone_abort.inc
+
+--echo # 3. Enable general tablespace encryption during PAGE COPY
+--let $ddl_error =
+--let $ddl_alter_abort=ALTER TABLESPACE tbs ENCRYPTION = 'Y'
+--source ../include/ddl_clone_abort.inc
+
+--echo # 4.Disable general tablespace encryption during PAGE COPY
+--let $ddl_error =
+--let $ddl_alter_abort=ALTER TABLESPACE tbs ENCRYPTION = 'N'
+--source ../include/ddl_clone_abort.inc
+
+--disconnect con1
+
+--echo # Cleanup
+DROP TABLE t1;
+DROP TABLESPACE tbs;
+
+--echo # Uninstall clone
+UNINSTALL PLUGIN clone;
+
+--source include/wait_until_count_sessions.inc
+--source ../include/encrypt_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/ddl_truncate_same.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/ddl_truncate_same.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/ddl_truncate_same.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/ddl_truncate_same.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,132 @@
+# Test clone error cases with concurrent DDL
+--source include/have_debug_sync.inc
+--source include/have_log_bin.inc
+--source include/count_sessions.inc
+
+--let $CLONE_DATADIR = $MYSQL_TMP_DIR/data_new
+
+--replace_result $CLONE_PLUGIN CLONE_PLUGIN
+--eval INSTALL PLUGIN clone SONAME '$CLONE_PLUGIN'
+
+--echo # Create test schema
+--source ../include/create_schema.inc
+CALL execute_dml(0, 0, 10, 10, 10, 0);
+
+SET GLOBAL DEBUG = '+d,local_release_clone_file_pin';
+
+--echo # 1. Truncate same table in various stages of CLONE
+--echo # In connection DEFAULT
+SET DEBUG_SYNC = 'clone_before_init_meta SIGNAL start_ddl_0 WAIT_FOR resume_clone_0';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_1 WAIT_FOR resume_clone_1';
+SET DEBUG_SYNC = 'clone_file_copy_end_before_ack SIGNAL start_ddl_2 WAIT_FOR resume_clone_2';
+SET DEBUG_SYNC = 'clone_before_file_ddl_meta SIGNAL start_ddl_3 WAIT_FOR resume_clone_3';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_4 WAIT_FOR resume_clone_4';
+SET DEBUG_SYNC = 'clone_before_page_ddl_meta SIGNAL start_ddl_5 WAIT_FOR resume_clone_5';
+SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl_6 WAIT_FOR resume_clone_6';
+--source ../include/clone_command_send.inc
+
+--connect (con1,localhost,root,,)
+--echo # In connection CON1
+
+--echo # Waiting for clone
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_0';
+--echo # Wait finished
+TRUNCATE TABLE t1;
+TRUNCATE TABLE t2;
+CALL execute_dml(0, 0, 10, 10, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_clone_0';
+
+--echo # Waiting for clone
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_1';
+--echo # Wait finished
+TRUNCATE TABLE t1;
+TRUNCATE TABLE t2;
+CALL execute_dml(0, 0, 10, 10, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_clone_1';
+
+--echo # Waiting for clone
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_2';
+--echo # Wait finished
+TRUNCATE TABLE t1;
+TRUNCATE TABLE t2;
+CALL execute_dml(0, 0, 10, 10, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_clone_2';
+
+--echo # Waiting for clone
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_3';
+--echo # Wait finished
+TRUNCATE TABLE t1;
+TRUNCATE TABLE t2;
+CALL execute_dml(0, 0, 10, 10, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_clone_3';
+
+--echo # Waiting for clone
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_4';
+--echo # Wait finished
+TRUNCATE TABLE t1;
+TRUNCATE TABLE t2;
+CALL execute_dml(0, 0, 10, 10, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_clone_4';
+
+--echo # Waiting for clone
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_5';
+--echo # Wait finished
+TRUNCATE TABLE t1;
+TRUNCATE TABLE t2;
+CALL execute_dml(0, 0, 10, 10, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_clone_5';
+
+--echo # Waiting for clone
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_6';
+--echo # Wait finished
+TRUNCATE TABLE t1;
+TRUNCATE TABLE t2;
+CALL execute_dml(0, 0, 10, 10, 10, 0);
+SET DEBUG_SYNC = 'now SIGNAL resume_clone_6';
+
+--connection default
+--echo # In connection DEFAULT
+
+--echo # Waiting for clone to complete
+--reap
+--echo # Wait finished
+
+SET GLOBAL DEBUG = '-d,local_release_clone_file_pin';
+
+disconnect con1;
+
+SET DEBUG_SYNC = 'RESET';
+--source include/wait_until_count_sessions.inc
+
+--echo # Restart cloned database
+--replace_result $CLONE_DATADIR CLONE_DATADIR
+--let restart_parameters="restart: --datadir=$CLONE_DATADIR"
+--source include/restart_mysqld.inc
+
+select STATE, ERROR_NO, length(BINLOG_FILE) > 0, length(GTID_EXECUTED) > 0,
+(BINLOG_POSITION > 0) from performance_schema.clone_status;
+
+# Execute procedure to delete all rows and insert
+CALL execute_dml(3, 0, 1, 1, 1, 0);
+CALL execute_dml(0, 0, 10, 10, 10, 0);
+
+# Check table in cloned database
+SHOW CREATE TABLE t1;
+SELECT count(*) from t1;
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 LIMIT 10;
+SELECT col1, col2, col3 FROM t1 ORDER BY col1 DESC LIMIT 10;
+
+SHOW CREATE TABLE t2;
+SELECT count(*) from t2;
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 LIMIT 10;
+SELECT col1, col2, col3 FROM t2 ORDER BY col1 DESC LIMIT 10;
+
+--echo # Cleanup
+--let restart_parameters="restart:"
+--source include/restart_mysqld.inc
+
+--source ../include/drop_schema.inc
+--force-rmdir $CLONE_DATADIR
+
+--echo # Uninstall clone
+UNINSTALL PLUGIN clone;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/ddl_truncate.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/ddl_truncate.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/ddl_truncate.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/ddl_truncate.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,31 @@
+# Test clone with concurrent truncate
+--source include/have_debug_sync.inc
+
+--replace_result $CLONE_PLUGIN CLONE_PLUGIN
+--eval INSTALL PLUGIN clone SONAME '$CLONE_PLUGIN'
+
+--source ../include/create_ddl_schema.inc
+
+--let $dml_stmt_check = call execute_dml(1, 0, 100, 100, 10, 0)
+
+--echo # 1. TRUNCATE TABLE while clone in progress
+--let $ddl_op1 = TRUNCATE TABLE
+
+--let $dml_stmt1 = CALL execute_dml(0, 0, 100, 100, 10, 0)
+--let $dml_stmt11 = INSERT INTO t11 SELECT * FROM t
+
+--let $dml_stmt2 = CALL execute_dml(0, 0, 100, 100, 10, 0)
+--let $dml_stmt21 = INSERT INTO t21 SELECT * FROM t
+
+# We don't need to reset it back as server is restarted.
+SET global debug="+d,clone_send_deleted_block";
+
+--source ../include/ddl_common.inc
+
+--echo # Cleanup
+--let $ddl_drop_schema_tables = 1
+--let $ddl_drop_tables = 1
+--source ../include/drop_ddl_schema.inc
+
+--echo # Uninstall clone
+UNINSTALL PLUGIN clone;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/ddl_undo_encrypt.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/ddl_undo_encrypt.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/ddl_undo_encrypt.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/ddl_undo_encrypt.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,6 @@
+# Test clone with concurrent encrypted UNDO tablespace
+
+--source include/big_test.inc
+
+--let undo_encryption = 1
+--source ddl_undo.test
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/ddl_undo.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/ddl_undo.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/ddl_undo.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/ddl_undo.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,59 @@
+# Test clone with concurrent UNDO DDL
+--source include/have_debug_sync.inc
+
+if ($undo_encryption) {
+  --let $ddl_encryption = 1
+  --source include/have_innodb_max_16k.inc
+  --source ../include/encrypt_begin.inc
+
+  SET GLOBAL innodb_undo_log_encrypt = ON;
+  SHOW VARIABLES LIKE 'innodb_undo_log_encrypt';
+}
+
+--replace_result $CLONE_PLUGIN CLONE_PLUGIN
+--eval INSTALL PLUGIN clone SONAME '$CLONE_PLUGIN'
+
+--source ../include/create_ddl_schema.inc
+
+--let $dml_stmt_check = CALL execute_dml(1, 0, 100, 100, 10, 0)
+
+--let $dml_stmt1  = CALL execute_dml(0, 0, 100, 100, 10, 0)
+--let $dml_stmt11 = CALL execute_dml(0, 0, 100, 100, 10, 0)
+
+--let $dml_stmt2 = CALL execute_dml(0, 0, 100, 100, 10, 0)
+--let $dml_stmt21 = CALL execute_dml(0, 0, 100, 100, 10, 0)
+--let $ddl_undo = 1
+
+--echo # 1. CREATE UNDO TABLESPACE while clone in progress
+--let $ddl_undo_create = 1
+--let $ddl_op1 = CREATE UNDO TABLESPACE
+--let $ddl_stmt1 = ADD DATAFILE
+
+--source ../include/ddl_common.inc
+--let $ddl_undo_create =
+
+--echo # 2. TRUNCATE UNDO TABLESPACE while clone in progress
+--let $ddl_undo_empty = 1
+--let $ddl_op1 = ALTER UNDO TABLESPACE
+--let $ddl_stmt1 = SET INACTIVE
+
+--source ../include/ddl_common.inc
+--let $ddl_undo_empty =
+
+--echo # 3. DROP UNDO TABLESPACE while clone in progress
+--let $ddl_op1 = DROP UNDO TABLESPACE
+--let $ddl_stmt1 =
+
+--source ../include/ddl_common.inc
+
+--echo # Cleanup
+--let $ddl_drop_schema_tables = 1
+--let $ddl_drop_tables = 1
+--source ../include/drop_ddl_schema.inc
+
+--echo # Uninstall clone
+UNINSTALL PLUGIN clone;
+
+if ($undo_encryption) {
+  --source ../include/encrypt_end.inc
+}
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/error_ddl_lock.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/error_ddl_lock.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/error_ddl_lock.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/error_ddl_lock.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,9 +17,13 @@
 --replace_result $CLONE_PLUGIN CLONE_PLUGIN
 --eval INSTALL PLUGIN clone SONAME '$CLONE_PLUGIN'
 SHOW VARIABLES LIKE 'clone_ddl_timeout';
+SHOW VARIABLES LIKE 'clone_block_ddl';
 
 --echo # Set backup lock timeout to 1 sec
+SET GLOBAL clone_block_ddl = true;
 SET GLOBAL clone_ddl_timeout = 1;
+
+SHOW VARIABLES LIKE 'clone_block_ddl';
 SHOW VARIABLES LIKE 'clone_ddl_timeout';
 SHOW VARIABLES LIKE "lock_wait_timeout";
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/error_ddl_notification.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/error_ddl_notification.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/error_ddl_notification.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/error_ddl_notification.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,126 @@
+# Test clone with concurrent DDL interrupted
+--source include/have_innodb_max_16k.inc
+--source include/have_debug_sync.inc
+--source include/count_sessions.inc
+
+--source ../include/encrypt_begin.inc
+
+--let $CLONE_DATADIR = $MYSQL_TMP_DIR/data_new
+
+--replace_result $CLONE_PLUGIN CLONE_PLUGIN
+--eval INSTALL PLUGIN clone SONAME '$CLONE_PLUGIN'
+
+CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB);
+
+CREATE TABLE t2(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+ENCRYPTION = 'Y';
+
+CREATE UNDO TABLESPACE undo_02 ADD DATAFILE 'undo_02.ibu';
+
+ALTER UNDO TABLESPACE undo_02 SET INACTIVE;
+
+--let $inactive_undo_space = undo_02
+--source include/wait_until_undo_space_is_empty.inc
+
+SET DEBUG_SYNC = 'clone_state_transit_file_copy SIGNAL start_ddl WAIT_FOR resume_clone_file';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_ddl_inplace WAIT_FOR resume_clone_page';
+--source ../include/clone_command_send.inc
+
+connect (con1,localhost,root,,);
+--echo # In connection CON1
+
+connect (con2,localhost,root,,);
+--echo # In connection CON2
+
+--echo # Waiting for clone to reach state transition
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl';
+--echo # Wait finished
+
+--echo # 1. CREATE TABLE
+--let $ddl_stmt = CREATE TABLE t3(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
+--source ../include/ddl_kill.inc
+
+--echo # 2A. ALTER TABLE COPY
+--let $ddl_stmt = ALTER TABLE t1 ADD INDEX col2_idx(col2), ALGORITHM = COPY
+--source ../include/ddl_kill.inc
+
+--echo # 2B. ALTER TABLE IN PLACE
+--let $ddl_stmt = ALTER TABLE t1 ADD INDEX col2_idx(col2), ALGORITHM = INPLACE
+--source ../include/ddl_kill.inc
+
+--echo # 3. ALTER TABLE RENAME
+--let $ddl_stmt = ALTER TABLE t1 RENAME t3
+--source ../include/ddl_kill.inc
+
+--echo # 4. TRUNCATE TABLE
+--let $ddl_stmt = TRUNCATE TABLE t1
+--source ../include/ddl_kill.inc
+
+--echo # 5A. ALTER ENABLE Encryption
+--let $ddl_stmt = ALTER TABLE t1 ENCRYPTION = "Y"
+--source ../include/ddl_kill.inc
+
+--echo # 5B. ALTER DISABLE ENCRYPTION
+--let $ddl_stmt = ALTER TABLE t2 ENCRYPTION = "N"
+--source ../include/ddl_kill.inc
+
+--echo # 6. CREATE UNDO TABLESPACE
+--let $ddl_stmt = CREATE UNDO TABLESPACE undo_01 ADD DATAFILE 'undo_01.ibu'
+--source ../include/ddl_kill.inc
+
+--echo # 7A. ENABLE REDO ENCRYPTION
+--let $ddl_stmt = SET GLOBAL innodb_redo_log_encrypt = ON
+--source ../include/ddl_kill.inc
+
+--echo # 7B. ENABLE UNDO ENCRYPTION
+--let $ddl_stmt = SET GLOBAL innodb_undo_log_encrypt = ON
+--source ../include/ddl_kill.inc
+
+SET DEBUG_SYNC = 'now SIGNAL resume_clone_file';
+
+--echo # Waiting for clone to reach page copy state
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_inplace';
+--echo # Wait finished
+
+--echo # 8. ALTER TABLE INPLACE during PAGE COPY
+--let $ddl_stmt = ALTER TABLE t1 ADD INDEX col2_idx(col2), ALGORITHM = INPLACE
+--source ../include/ddl_kill.inc
+
+SET DEBUG_SYNC = 'now SIGNAL resume_clone_page';
+
+## DROP commands deleted the file and sends notofication
+## to clone as post DDL action. By this time the DDL command
+## is already committed and KILL must be ignored.
+--let $no_interrupt = 1
+
+--echo # 9A. DROP TABLE
+--let $ddl_stmt = DROP TABLE t1
+--source ../include/ddl_kill.inc
+
+--echo # 9B. DROP UNDO TABLESPACE
+--let $ddl_stmt = DROP UNDO TABLESPACE undo_02
+--source ../include/ddl_kill.inc
+
+--let $no_interrupt =
+
+--connection default
+
+--echo # In connection default
+--echo # Waiting for Clone to complete
+--reap
+--echo # Wait finished
+
+--echo # Cleanup
+DROP TABLE t2;
+
+--disconnect con1
+--disconnect con2
+--source include/wait_until_count_sessions.inc
+
+--force-rmdir $CLONE_DATADIR
+SET DEBUG_SYNC = 'RESET';
+
+--echo # Uninstall clone
+UNINSTALL PLUGIN clone;
+
+--source ../include/encrypt_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/error_ddl.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/error_ddl.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/error_ddl.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/error_ddl.test	2021-09-28 11:46:34.000000000 +0000
@@ -1,4 +1,4 @@
-# Test clone error with concurrent DDL
+# Test clone error cases with concurrent DDL
 --source include/have_debug_sync.inc
 --source include/count_sessions.inc
 
@@ -11,320 +11,112 @@
 --let $CLONE_DATADIR2 = $MYSQL_TMP_DIR/data_new2
 --let $MYSQLD_DATADIR= `select @@datadir;`
 
---let $ddl_err = ER_CLONE_DDL_IN_PROGRESS
-
-if($remote_clone) {
---let $ddl_err = ER_CLONE_DONOR
-}
-
 --replace_result $CLONE_PLUGIN CLONE_PLUGIN
 --eval INSTALL PLUGIN clone SONAME '$CLONE_PLUGIN'
-SHOW VARIABLES LIKE 'clone_ddl_timeout';
 
---echo # Disable backup lock
-SET GLOBAL clone_ddl_timeout = 0;
-SHOW VARIABLES LIKE 'clone_ddl_timeout';
-
---echo # 1. CREATE TABLE while clone in progress
-SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl WAIT_FOR resume_clone';
---source ../include/clone_command_send.inc
-
-connect (con1,localhost,root,,);
-SET DEBUG_SYNC = 'now WAIT_FOR start_ddl';
-
---echo # 1A. TOO MANY CLONE IN PROGRESS
---let $CLONE_DATADIR = $CLONE_DATADIR2
---let $clone_err = ER_CLONE_TOO_MANY_CONCURRENT_CLONES
---source ../include/clone_command.inc
---let $clone_err = 0
---let $CLONE_DATADIR = $MYSQL_TMP_DIR/data_new
-
-SET DEBUG_SYNC = 'clone_marked_abort SIGNAL resume_clone';
---send CREATE TABLE t1 (col1 INT PRIMARY KEY)
-
-connection default;
---echo # In connection DEFAULT
---error $ddl_err
---reap
-SET DEBUG_SYNC = 'RESET';
-
-connection con1;
+--echo # 1. CLONE blocked by DDL at beginning
+--connect (con1,localhost,root,,)
 --echo # In connection CON1
---reap
-SET DEBUG_SYNC = 'RESET';
-SHOW CREATE TABLE t1;
---force-rmdir $CLONE_DATADIR
+SET DEBUG_SYNC = 'fil_ibd_created_space SIGNAL start_clone WAIT_FOR resume_ddl_1';
+--send CREATE TABLE t1(col1 int)
 
---echo # 1B. ALTER INSTANCE while clone in progress
-connection default;
-SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl WAIT_FOR resume_clone';
---source ../include/clone_command_send.inc
-
-connection con1;
-SET DEBUG_SYNC = 'now WAIT_FOR start_ddl';
-SET DEBUG_SYNC = 'clone_marked_abort SIGNAL resume_clone';
---send ALTER INSTANCE DISABLE INNODB REDO_LOG
-
-connection default;
---echo # In connection DEFAULT
---error $ddl_err
---reap
-SET DEBUG_SYNC = 'RESET';
-
-connection con1;
---echo # In connection CON1
---reap
-SET DEBUG_SYNC = 'RESET';
-ALTER INSTANCE ENABLE INNODB REDO_LOG;
---force-rmdir $CLONE_DATADIR
-
---echo # 2. ALTER TABLE ADD COLUMN [COPY] while clone in progress
-connection default;
+--connection default
 --echo # In connection DEFAULT
-INSERT INTO t1 values(10), (20), (30);
-SELECT * FROM t1 ORDER BY col1;
+--let $CON_ID= `SELECT CONNECTION_ID()`
 
-SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl WAIT_FOR resume_clone';
+SET DEBUG_SYNC = 'now WAIT_FOR start_clone';
+SET DEBUG_SYNC = 'clone_begin_wait_ddl SIGNAL start_ddl_1 WAIT_FOR resume_clone_1';
+SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl_2 WAIT_FOR resume_clone_2';
 --source ../include/clone_command_send.inc
 
-connection con1;
-SET DEBUG_SYNC = 'now WAIT_FOR start_ddl';
-SET DEBUG_SYNC = 'clone_marked_abort SIGNAL resume_clone';
---send ALTER TABLE t1 ADD COLUMN col2 int, ALGORITHM=COPY
-
-connection default;
---echo # In connection DEFAULT
---error $ddl_err
---reap
-SET DEBUG_SYNC = 'RESET';
+--connect (con2,localhost,root,,)
+--echo # In connection CON2
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_1';
+SET DEBUG_SYNC = 'clone_notify_ddl_before_state_block SIGNAL resume_ddl_1';
+--send CREATE TABLE t2(col1 int)
 
-connection con1;
+--connection con1
 --echo # In connection CON1
+--echo # Reap CREATE TABLE t1
 --reap
-SET DEBUG_SYNC = 'RESET';
+SET DEBUG_SYNC= 'now SIGNAL resume_clone_1';
 
-SHOW CREATE TABLE t1;
-SELECT * FROM t1 ORDER BY col1;
-UPDATE t1 SET col2 = col1 + 1000;
---force-rmdir $CLONE_DATADIR
-
---echo # 2A. ALTER TABLE ADD COLUMN [INPLACE] while clone in progress
-connection default;
---echo # In connection DEFAULT
-SELECT * FROM t1 ORDER BY col1;
-
-SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl WAIT_FOR resume_clone';
---source ../include/clone_command_send.inc
-
-connection con1;
-SET DEBUG_SYNC = 'now WAIT_FOR start_ddl';
-SET DEBUG_SYNC = 'clone_marked_abort SIGNAL resume_clone';
---send ALTER TABLE t1 ADD COLUMN col3 int, ALGORITHM=INPLACE
-
-connection default;
---echo # In connection DEFAULT
---error $ddl_err
---reap
-SET DEBUG_SYNC = 'RESET';
-
-connection con1;
---echo # In connection CON1
+--connection con2
+--echo # In connection CON2
+--echo # Reap CREATE TABLE t2
 --reap
-SET DEBUG_SYNC = 'RESET';
 
-SHOW CREATE TABLE t1;
-SELECT * FROM t1 ORDER BY col1;
-UPDATE t1 SET col3 = col2 + 1000;
---force-rmdir $CLONE_DATADIR
+--echo # Disconnect CON2
+--disconnect con2
 
---echo # 3A. ADD INDEX [COPY] while clone in progress
-connection default;
---echo # In connection DEFAULT
-SELECT * FROM t1 ORDER BY col1;
-
-SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl WAIT_FOR resume_clone';
---source ../include/clone_command_send.inc
-
-connection con1;
-SET DEBUG_SYNC = 'now WAIT_FOR start_ddl';
-SET DEBUG_SYNC = 'clone_marked_abort SIGNAL resume_clone';
---send ALTER TABLE t1 ADD INDEX col2_idx(col2), ALGORITHM=COPY
-
-connection default;
---echo # In connection DEFAULT
---error $ddl_err
---reap
-SET DEBUG_SYNC = 'RESET';
-
-connection con1;
+--connection con1
 --echo # In connection CON1
---reap
-SET DEBUG_SYNC = 'RESET';
-
-SHOW CREATE TABLE t1;
-SELECT * FROM t1 ORDER BY col1;
---force-rmdir $CLONE_DATADIR
-
---echo # 3B. ADD INDEX [INPLACE] while clone in progress
-connection default;
---echo # In connection DEFAULT
-
-SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl WAIT_FOR resume_clone';
---source ../include/clone_command_send.inc
-
-connection con1;
-SET DEBUG_SYNC = 'now WAIT_FOR start_ddl';
-SET DEBUG_SYNC = 'clone_marked_abort SIGNAL resume_clone';
---send ALTER TABLE t1 ADD INDEX col3_idx(col3), ALGORITHM=INPLACE
+SET DEBUG_SYNC = 'now WAIT_FOR start_ddl_2';
 
-connection default;
---echo # In connection DEFAULT
---error $ddl_err
---reap
-SET DEBUG_SYNC = 'RESET';
+--echo # 1A. TOO MANY CLONE IN PROGRESS
+--let $CLONE_DATADIR = $CLONE_DATADIR2
+--let $clone_err = ER_CLONE_TOO_MANY_CONCURRENT_CLONES
+--source ../include/clone_command.inc
+--let $clone_err = 0
+--let $CLONE_DATADIR = $MYSQL_TMP_DIR/data_new
 
-connection con1;
---echo # In connection CON1
---reap
-SET DEBUG_SYNC = 'RESET';
+--echo # 2. ALTER INSTANCE while clone in progress
+--error ER_CLONE_IN_PROGRESS
+ALTER INSTANCE DISABLE INNODB REDO_LOG;
 
-SHOW CREATE TABLE t1;
+INSERT INTO t1 values(10), (20), (30);
 SELECT * FROM t1 ORDER BY col1;
---force-rmdir $CLONE_DATADIR
-
---echo # 4A. DROP INDEX [COPY] while clone in progress
-connection default;
---echo # In connection DEFAULT
 
-SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl WAIT_FOR resume_clone';
---source ../include/clone_command_send.inc
+--echo # 3. ALTER DISCARD while clone in progress
+--error ER_CLONE_IN_PROGRESS
+ALTER TABLE t1 DISCARD TABLESPACE;
+
+--echo # 4. ALTER IMPORT while clone in progress
+--error ER_CLONE_IN_PROGRESS
+ALTER TABLE t1 IMPORT TABLESPACE;
 
-connection con1;
-SET DEBUG_SYNC = 'now WAIT_FOR start_ddl';
-SET DEBUG_SYNC = 'clone_marked_abort SIGNAL resume_clone';
---send ALTER TABLE t1 DROP INDEX col3_idx, ALGORITHM=COPY
+--echo # 5. KILL CLONE command while in progress
+--replace_result $CON_ID CON_ID
+--eval KILL QUERY $CON_ID
+SET DEBUG_SYNC= 'now SIGNAL resume_clone_2';
 
 connection default;
 --echo # In connection DEFAULT
---error $ddl_err
---reap
-SET DEBUG_SYNC = 'RESET';
-
-connection con1;
---echo # In connection CON1
+--error ER_QUERY_INTERRUPTED
 --reap
-SET DEBUG_SYNC = 'RESET';
 
-SHOW CREATE TABLE t1;
-SELECT * FROM t1 ORDER BY col1;
 --force-rmdir $CLONE_DATADIR
-
---echo # 4B. DROP INDEX [INPLACE] while clone in progress
-connection default;
---echo # In connection DEFAULT
-
-SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl WAIT_FOR resume_clone';
---source ../include/clone_command_send.inc
-
-connection con1;
-SET DEBUG_SYNC = 'now WAIT_FOR start_ddl';
-SET DEBUG_SYNC = 'clone_marked_abort SIGNAL resume_clone';
---send ALTER TABLE t1 DROP INDEX col2_idx, ALGORITHM=INPLACE
-
-connection default;
---echo # In connection DEFAULT
---error $ddl_err
---reap
-SET DEBUG_SYNC = 'RESET';
-
-connection con1;
---echo # In connection CON1
---reap
 SET DEBUG_SYNC = 'RESET';
+DROP TABLE t2;
 
-SHOW CREATE TABLE t1;
-SELECT * FROM t1 ORDER BY col1;
---force-rmdir $CLONE_DATADIR
-
---echo # 5. TRUNCATE TABLE while clone in progress
-connection default;
---echo # In connection DEFAULT
-SELECT * FROM t1 ORDER BY col1;
+--echo # 6. Force clone to abort by DDL
+SET GLOBAL DEBUG = '+d,clone_ddl_error_abort';
 
 SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_ddl WAIT_FOR resume_clone';
 --source ../include/clone_command_send.inc
 
-connection con1;
-SET DEBUG_SYNC = 'now WAIT_FOR start_ddl';
-SET DEBUG_SYNC = 'clone_marked_abort SIGNAL resume_clone';
---send TRUNCATE TABLE t1
-
-connection default;
---echo # In connection DEFAULT
---error $ddl_err
---reap
-SET DEBUG_SYNC = 'RESET';
-
-connection con1;
+--connection con1
 --echo # In connection CON1
---reap
-SET DEBUG_SYNC = 'RESET';
-
-SHOW CREATE TABLE t1;
-SELECT * FROM t1 ORDER BY col1;
---force-rmdir $CLONE_DATADIR
-
---echo # 6. DROP TABLE while clone in progress
-connection default;
---echo # In connection DEFAULT
-INSERT INTO t1 values(10, 100, 1000);
-SELECT * FROM t1 ORDER BY col1;
-
-SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_ddl WAIT_FOR resume_clone';
---source ../include/clone_command_send.inc
-
-connection con1;
 SET DEBUG_SYNC = 'now WAIT_FOR start_ddl';
-SET DEBUG_SYNC = 'clone_marked_abort SIGNAL resume_clone';
---send DROP TABLE t1
+SET DEBUG_SYNC = 'clone_notify_ddl_before_state_block SIGNAL resume_clone';
 
-connection default;
---echo # In connection DEFAULT
---error $ddl_err
---reap
-
-connection con1;
---echo # In connection CON1
---reap
-CREATE TABLE t1(col1 int);
-
---force-rmdir $CLONE_DATADIR
-
---echo # 7. KILL CLONE command while in progress
-connection default;
---echo # In connection DEFAULT
---let $CON_ID= `SELECT CONNECTION_ID()`
-
-INSERT INTO t1 values(10), (20), (30);
-SELECT * FROM t1 ORDER BY col1;
-
-SET DEBUG_SYNC = 'clone_redo_copy SIGNAL start_kill WAIT_FOR resume_clone';
---source ../include/clone_command_send.inc
-
-connection con1;
-SET DEBUG_SYNC = 'now WAIT_FOR start_kill';
---replace_result $CON_ID CON_ID
---eval KILL QUERY $CON_ID
-SET DEBUG_SYNC= 'now SIGNAL resume_clone';
+CREATE TABLE t2(col1 int);
+INSERT INTO t2 VALUES(10), (20), (30);
+SELECT * FROM t2 ORDER BY col1;
 
 connection default;
 --echo # In connection DEFAULT
---error ER_QUERY_INTERRUPTED
+--error ER_CLONE_DDL_IN_PROGRESS
 --reap
 
+SET GLOBAL DEBUG = '-d,clone_ddl_error_abort';
+
 --force-rmdir $CLONE_DATADIR
+SET DEBUG_SYNC = 'RESET';
 
 --echo #Cleanup
+DROP TABLE t1;
+DROP TABLE t2;
 
 connection default;
 --echo # In connection DEFAULT
@@ -332,7 +124,14 @@
 disconnect con1;
 SET DEBUG_SYNC = 'RESET';
 
-DROP TABLE t1;
+--echo # Attempt to uninstall clone if there
+--error 0, ER_PLUGIN_CANNOT_BE_UNINSTALLED
 UNINSTALL PLUGIN clone;
 
+--echo # Restart server
 --source include/wait_until_count_sessions.inc
+--source include/restart_mysqld.inc
+
+--echo # Uninstall clone if there
+--error 0, ER_SP_DOES_NOT_EXIST
+UNINSTALL PLUGIN clone;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/local_boundary.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/local_boundary.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/local_boundary.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/local_boundary.test	2021-09-28 11:46:34.000000000 +0000
@@ -31,7 +31,7 @@
 ## Test-1: Clone with dirty pages and redo log [No zero copy/sendfile]
 
 --echo # In connection default - Cloning database
-SET global debug="+d,clone_no_zero_copy";
+SET GLOBAL DEBUG ="+d,clone_no_zero_copy";
 SET DEBUG_SYNC = 'RESET';
 SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_dml1 WAIT_FOR resume_clone1';
 SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_dml2 WAIT_FOR resume_clone2';
@@ -56,7 +56,7 @@
 connection default;
 --echo # In connection default - Cloning database
 --reap
-SET global debug="-d,clone_no_zero_copy";
+SET GLOBAL DEBUG ="-d,clone_no_zero_copy";
 
 disconnect con1;
 
@@ -92,6 +92,7 @@
 --force-rmdir $CLONE_DATADIR
 
 ## Test-2A: Clone with redo log ending at file boundary
+SET GLOBAL DEBUG ="+d,clone_arch_log_stop_file_end";
 SET DEBUG_SYNC = 'RESET';
 SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_dml1 WAIT_FOR resume_clone1';
 SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_dml2 WAIT_FOR resume_clone2';
@@ -109,8 +110,6 @@
 SET DEBUG_SYNC = 'now SIGNAL resume_clone1';
 SET DEBUG_SYNC = 'now WAIT_FOR start_dml2';
 
-SET global debug="+d,clone_arch_log_stop_file_end";
-
 START TRANSACTION;
 # Execute procedure to delete all rows and insert 150 rows
 call execute_dml(3, 0, 1, 1, 1, 0);
@@ -123,12 +122,14 @@
 --echo # In connection default - Cloning database
 --reap
 
-SET global debug="-d,clone_arch_log_stop_file_end";
+SET GLOBAL DEBUG ="-d,clone_arch_log_stop_file_end";
 
 # Removed cloned data
 --force-rmdir $CLONE_DATADIR
 
 ## Test-2B: Clone with redo log ending at file boundary + some bytes
+SET GLOBAL DEBUG ="+d,clone_arch_log_stop_file_end";
+SET GLOBAL DEBUG ="+d,clone_arch_log_extra_bytes";
 SET DEBUG_SYNC = 'RESET';
 SET DEBUG_SYNC = 'clone_file_copy SIGNAL start_dml1 WAIT_FOR resume_clone1';
 SET DEBUG_SYNC = 'clone_page_copy SIGNAL start_dml2 WAIT_FOR resume_clone2';
@@ -146,9 +147,6 @@
 SET DEBUG_SYNC = 'now SIGNAL resume_clone1';
 SET DEBUG_SYNC = 'now WAIT_FOR start_dml2';
 
-SET global debug="+d,clone_arch_log_stop_file_end";
-SET global debug="+d,clone_arch_log_extra_bytes";
-
 START TRANSACTION;
 # Execute procedure to delete all rows and insert 150 rows
 call execute_dml(3, 0, 1, 1, 1, 0);
@@ -161,8 +159,8 @@
 --echo # In connection default - Cloning database
 --reap
 
-SET global debug="-d,clone_arch_log_stop_file_end";
-SET global debug="-d,clone_arch_log_extra_bytes";
+SET GLOBAL DEBUG ="-d,clone_arch_log_stop_file_end";
+SET GLOBAL DEBUG ="-d,clone_arch_log_extra_bytes";
 
 # Removed cloned data
 --force-rmdir $CLONE_DATADIR
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/local_dml.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/local_dml.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/local_dml.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/local_dml.test	2021-09-28 11:46:34.000000000 +0000
@@ -80,6 +80,11 @@
 --let clone_throttle = 1
 }
 
+if ($clone_ddl) {
+  --let num_rows = 200
+  --let clone_throttle = 1
+}
+
 # Insert rows
 --eval call execute_dml(0, 0, $num_rows, $num_rows, 10, 0)
 
@@ -108,8 +113,15 @@
 
 --echo # In connection con4 - Running Update Random uncommited [51 - 75 Key Range]
 connect (con4,localhost,root,,);
-begin;
---send call execute_dml(1, 51, 25, 100, 200, 1)
+
+if ($clone_ddl) {
+  --send call execute_ddl(10)
+}
+
+if (!$clone_ddl) {
+  begin;
+  --send call execute_dml(1, 51, 25, 100, 200, 1)
+}
 
 --echo # In connection default - Cloning database
 --connection clone_conn_1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/local_encrypt.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/local_encrypt.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/local_encrypt.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/local_encrypt.test	2021-09-28 11:46:34.000000000 +0000
@@ -4,33 +4,10 @@
 --source include/have_debug_sync.inc
 --source include/count_sessions.inc
 
---echo # Prepare for creating Encrypted Table
 --let $CLONE_DATADIR = $MYSQL_TMP_DIR/data_new
 --let $MYSQLD_DATADIR= `select @@datadir;`
 
---let $ENCRYPT_DATADIR = $MYSQL_TMP_DIR/data_encrypt
---let $ENCRYPT_ERROR_FILE = $MYSQL_TMP_DIR/boot_encrypt_log
-
---let BOOTSTRAP_SQL=$MYSQL_TMP_DIR/boot.sql
---let $START_PAGE_SIZE= `select @@innodb_page_size`
-
---echo # create bootstrap file
-write_file $BOOTSTRAP_SQL;
-CREATE DATABASE test DEFAULT CHARACTER SET latin1;
-EOF
---mkdir $ENCRYPT_DATADIR
-
---echo # Create and start mysqld with keyring plugin.
---source include/shutdown_mysqld.inc
-
---replace_result $MYSQLD MYSQLD $BOOTSTRAP_SQL BOOTSTRAP_SQL $ENCRYPT_DATADIR ENCRYPT_DATADIR $START_PAGE_SIZE PAGE_SIZE $ENCRYPT_ERROR_FILE ENCRYPT_ERROR_FILE
---let NEW_CMD = $MYSQLD --no-defaults --innodb_dedicated_server=OFF --initialize-insecure --init-file=$BOOTSTRAP_SQL --innodb_log_file_size=5M --innodb_log_files_in_group=2 --innodb_page_size=$START_PAGE_SIZE --datadir=$ENCRYPT_DATADIR > $ENCRYPT_ERROR_FILE  2>&1
-
---exec $NEW_CMD
-
---replace_result $KEYRING_PLUGIN KEYRING_PLUGIN $MYSQL_TMP_DIR MYSQL_TMP_DIR $ENCRYPT_DATADIR ENCRYPT_DATADIR
---let $restart_parameters=restart: --datadir=$ENCRYPT_DATADIR --early-plugin-load="keyring_file=$KEYRING_PLUGIN" --keyring_file_data=$MYSQL_TMP_DIR/mysecret_keyring
---source include/start_mysqld.inc
+--source ../include/encrypt_begin.inc
 
 --echo ## Install plugin
 --replace_result $CLONE_PLUGIN CLONE_PLUGIN
@@ -41,7 +18,7 @@
 
 if(!$page_compression) {
 --echo # In connection default - starting clone
-# Validate that redo and undo encryption cannot be set when clone in progress. */
+# Validate that redo and undo encryption can be set when clone in progress. */
 SET DEBUG_SYNC = 'clone_file_copy SIGNAL set_encryption WAIT_FOR resume_clone';
 --source ../include/clone_command_send.inc
 
@@ -50,12 +27,10 @@
 SET DEBUG_SYNC = 'now WAIT_FOR set_encryption';
 
 SHOW VARIABLES LIKE 'innodb_redo_log_encrypt';
---error ER_CLONE_IN_PROGRESS
 SET GLOBAL innodb_redo_log_encrypt = ON;
 SHOW VARIABLES LIKE 'innodb_redo_log_encrypt';
 
 SHOW VARIABLES LIKE 'innodb_undo_log_encrypt';
---error ER_CLONE_IN_PROGRESS
 SET GLOBAL innodb_undo_log_encrypt = ON;
 SHOW VARIABLES LIKE 'innodb_undo_log_encrypt';
 
@@ -66,6 +41,8 @@
 --reap
 disconnect con1;
 --force-rmdir $CLONE_DATADIR
+SET GLOBAL innodb_redo_log_encrypt = OFF;
+SET GLOBAL innodb_undo_log_encrypt = OFF;
 }
 
 # Modify the schema and add compressed table
@@ -229,16 +206,4 @@
 UNINSTALL PLUGIN keyring_file;
 SET DEBUG_SYNC = 'RESET';
 
-# Restart default database
---let restart_parameters="restart:"
---source include/restart_mysqld.inc
-
---echo # Restart server and remove encrypted data directory
-let $restart_parameters = "restart:";
---source include/restart_mysqld.inc
-
-# Temporary file Cleanup
---force-rmdir $ENCRYPT_DATADIR
---remove_file $ENCRYPT_ERROR_FILE
---remove_file $BOOTSTRAP_SQL
---remove_file $MYSQL_TMP_DIR/mysecret_keyring
+--source ../include/encrypt_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/local_insert.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/local_insert.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/local_insert.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/local_insert.test	2021-09-28 11:46:34.000000000 +0000
@@ -19,10 +19,9 @@
 BEGIN
   DECLARE i INT DEFAULT 1;
 
-  WHILE i < val DO
+  WHILE i <= val DO
     INSERT INTO t1 (b,c) VALUES (REPEAT(a,600), REPEAT(b,600));
     INSERT INTO t2 (b,c) VALUES (REPEAT(a,600), REPEAT(b,600));
-    INSERT INTO t3 (b,c) VALUES (REPEAT(a,600), REPEAT(b,600));
     SET i = i + 1;
   END WHILE;
 END|
@@ -30,37 +29,52 @@
 
 --echo # Case 1 - Normal page archiving process using clone client.
 
-CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY AUTO_INCREMENT, b LONGBLOB, c
-LONGBLOB);
-CREATE TABLE t2 (a INT NOT NULL PRIMARY KEY AUTO_INCREMENT, b LONGBLOB, c
-LONGBLOB);
-CREATE TABLE t3 (a INT NOT NULL PRIMARY KEY AUTO_INCREMENT, b LONGBLOB, c
-LONGBLOB);
+CREATE TABLE t1 (a INT AUTO_INCREMENT, b LONGBLOB, c LONGBLOB, key k1(a));
+CREATE TABLE t2 (a INT PRIMARY KEY AUTO_INCREMENT, b LONGBLOB, c LONGBLOB);
 
 --connection con1
 SET DEBUG_SYNC = 'clone_file_copy SIGNAL page_signal WAIT_FOR go_page';
+SET DEBUG_SYNC = 'clone_page_copy SIGNAL redo_signal WAIT_FOR go_redo';
+
+if (!$remote_clone) {
+  SET DEBUG_SYNC = 'clone_donor_after_saving_dynamic_metadata SIGNAL meta_signal WAIT_FOR go_meta';
+}
 --source ../include/clone_command_send.inc
 
 --connection con2
 SET DEBUG_SYNC = 'now WAIT_FOR page_signal';
-CALL prepare_data(100);
+CALL prepare_data(50);
 SET DEBUG_SYNC = 'now SIGNAL go_page';
 
+SET DEBUG_SYNC = 'now WAIT_FOR redo_signal';
+CALL prepare_data(10);
+SET DEBUG_SYNC = 'now SIGNAL go_redo';
+
+if (!$remote_clone) {
+  SET DEBUG_SYNC = 'now WAIT_FOR meta_signal';
+  SET GLOBAL debug="+d,periodical_checkpoint_disabled";
+  CALL prepare_data(10);
+  UPDATE t1 SET a = 100 where a = 1;
+  UPDATE t2 SET a = 200 where a = 1;
+  SET DEBUG_SYNC = 'now SIGNAL go_meta';
+}
+
 --connection con1
 --reap
 
 select count(*) from t1;
 select count(*) from t2;
-select count(*) from t3;
 
 # Restart server on cloned data directory
 --replace_result $CLONE_DATADIR CLONE_DATADIR
 --let restart_parameters="restart: --datadir=$CLONE_DATADIR"
 --source include/restart_mysqld.inc
 
-select count(*) from t1;
-select count(*) from t2;
-select count(*) from t3;
+INSERT INTO t1 (b,c) VALUES (REPEAT(a,600), REPEAT(b,600));
+INSERT INTO t2 (b,c) VALUES (REPEAT(a,600), REPEAT(b,600));
+
+select count(*), max(a) from t1;
+select count(*), max(a) from t2;
 
 #Cleanup
 --let restart_parameters="restart:"
@@ -69,7 +83,6 @@
 --connection con1
 DROP TABLE t1;
 DROP TABLE t2;
-DROP TABLE t3;
 
 SET DEBUG_SYNC = 'RESET';
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/remote_ddl_alter_copy.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/remote_ddl_alter_copy.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/remote_ddl_alter_copy.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/remote_ddl_alter_copy.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,8 @@
+# Test remote clone error with concurrent DDL
+
+--let $HOST = 127.0.0.1
+--let $PORT =`select @@port`
+--let $USER = root
+--let remote_clone = 1
+
+--source ddl_alter_copy.test
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/remote_ddl_alter_inplace.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/remote_ddl_alter_inplace.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/remote_ddl_alter_inplace.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/remote_ddl_alter_inplace.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,8 @@
+# Test remote clone error with concurrent DDL
+
+--let $HOST = 127.0.0.1
+--let $PORT =`select @@port`
+--let $USER = root
+--let remote_clone = 1
+
+--source ddl_alter_inplace.test
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/remote_ddl_basic_restart.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/remote_ddl_basic_restart.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/remote_ddl_basic_restart.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/remote_ddl_basic_restart.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,6 @@
+# Test remote clone error with concurrent DDL and network error restart
+
+--source include/have_debug.inc
+SET global debug="+d,clone_restart_apply";
+
+--source remote_ddl_basic.test
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/remote_ddl_basic.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/remote_ddl_basic.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/remote_ddl_basic.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/remote_ddl_basic.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,8 @@
+# Test remote clone error with concurrent DDL
+
+--let $HOST = 127.0.0.1
+--let $PORT =`select @@port`
+--let $USER = root
+--let remote_clone = 1
+
+--source ddl_basic.test
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/remote_ddl_compress_encrypt.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/remote_ddl_compress_encrypt.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/remote_ddl_compress_encrypt.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/remote_ddl_compress_encrypt.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,8 @@
+# Test remote clone error with concurrent DDL
+
+--let $HOST = 127.0.0.1
+--let $PORT =`select @@port`
+--let $USER = root
+--let remote_clone = 1
+
+--source ddl_compress_encrypt.test
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/remote_ddl_compress.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/remote_ddl_compress.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/remote_ddl_compress.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/remote_ddl_compress.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,8 @@
+# Test remote clone error with concurrent DDL
+
+--let $HOST = 127.0.0.1
+--let $PORT =`select @@port`
+--let $USER = root
+--let remote_clone = 1
+
+--source ddl_compress.test
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/remote_ddl_dml.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/remote_ddl_dml.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/remote_ddl_dml.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/remote_ddl_dml.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,8 @@
+# Test remote clone with concurrent DML and DDL
+
+--let $HOST = 127.0.0.1
+--let $PORT =`select @@port`
+--let $USER = root
+--let remote_clone = 1
+
+--source ddl_dml.test
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/remote_ddl_encrypt.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/remote_ddl_encrypt.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/remote_ddl_encrypt.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/remote_ddl_encrypt.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,8 @@
+# Test remote clone error with concurrent DDL
+
+--let $HOST = 127.0.0.1
+--let $PORT =`select @@port`
+--let $USER = root
+--let remote_clone = 1
+
+--source ddl_encrypt.test
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/remote_ddl_mix.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/remote_ddl_mix.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/remote_ddl_mix.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/remote_ddl_mix.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,8 @@
+# Test remote clone error with concurrent DDL
+
+--let $HOST = 127.0.0.1
+--let $PORT =`select @@port`
+--let $USER = root
+--let remote_clone = 1
+
+--source ddl_mix.test
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/remote_ddl_rename_restart.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/remote_ddl_rename_restart.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/remote_ddl_rename_restart.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/remote_ddl_rename_restart.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,6 @@
+# Test remote clone error with concurrent DDL and network error restart
+
+--source include/have_debug.inc
+SET global debug="+d,clone_restart_apply";
+
+--source remote_ddl_rename.test
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/remote_ddl_rename.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/remote_ddl_rename.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/remote_ddl_rename.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/remote_ddl_rename.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,8 @@
+# Test remote clone error with concurrent DDL
+
+--let $HOST = 127.0.0.1
+--let $PORT =`select @@port`
+--let $USER = root
+--let remote_clone = 1
+
+--source ddl_rename.test
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/remote_ddl_skip_validation.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/remote_ddl_skip_validation.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/remote_ddl_skip_validation.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/remote_ddl_skip_validation.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,9 @@
+# Test clone remote command with innodb-validate-tablespace-paths OFF
+
+--let $HOST = 127.0.0.1
+--let $PORT =`select @@port`
+--let $USER = root
+--let remote_clone = 1
+--let skip_space_validation = 1
+
+--source ddl_alter_copy.test
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/remote_ddl_sys_encrypt_file_copy.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/remote_ddl_sys_encrypt_file_copy.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/remote_ddl_sys_encrypt_file_copy.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/remote_ddl_sys_encrypt_file_copy.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,8 @@
+# Test remote clone error with concurrent DDL
+
+--let $HOST = 127.0.0.1
+--let $PORT =`select @@port`
+--let $USER = root
+--let remote_clone = 1
+
+--source ddl_sys_encrypt_file_copy.test
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/remote_ddl_truncate_restart.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/remote_ddl_truncate_restart.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/remote_ddl_truncate_restart.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/remote_ddl_truncate_restart.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,6 @@
+# Test remote clone error with concurrent DDL and network error restart
+
+--source include/have_debug.inc
+SET global debug="+d,clone_restart_apply";
+
+--source remote_ddl_truncate.test
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/remote_ddl_truncate.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/remote_ddl_truncate.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/remote_ddl_truncate.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/remote_ddl_truncate.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,8 @@
+# Test remote clone error with concurrent DDL
+
+--let $HOST = 127.0.0.1
+--let $PORT =`select @@port`
+--let $USER = root
+--let remote_clone = 1
+
+--source ddl_truncate.test
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/remote_ddl_undo.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/remote_ddl_undo.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/remote_ddl_undo.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/remote_ddl_undo.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,8 @@
+# Test remote clone error with concurrent DDL
+
+--let $HOST = 127.0.0.1
+--let $PORT =`select @@port`
+--let $USER = root
+--let remote_clone = 1
+
+--source ddl_undo.test
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/clone/t/remote_error_ddl.test mysql-8.0-8.0.27/mysql-test/suite/clone/t/remote_error_ddl.test
--- mysql-8.0-8.0.26/mysql-test/suite/clone/t/remote_error_ddl.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/clone/t/remote_error_ddl.test	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-# Test remote clone error with concurrent DDL
-
---let $HOST = 127.0.0.1
---let $PORT =`select @@port`
---let $USER = root
---let remote_clone = 1
-
---source error_ddl.test
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/component_keyring_file/r/clone_local_encrypt.result mysql-8.0-8.0.27/mysql-test/suite/component_keyring_file/r/clone_local_encrypt.result
--- mysql-8.0-8.0.26/mysql-test/suite/component_keyring_file/r/clone_local_encrypt.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/component_keyring_file/r/clone_local_encrypt.result	2021-09-28 11:46:34.000000000 +0000
@@ -69,26 +69,26 @@
 SET GLOBAL clone_autotune_concurrency = OFF;
 SET GLOBAL clone_max_concurrency = 8;
 CLONE LOCAL DATA DIRECTORY = 'CLONE_DATADIR';
-# In connection con1 - Trying to set redo and undo encryption
+# In connection con1 - Set redo and undo encryption
 SET DEBUG_SYNC = 'now WAIT_FOR set_encryption';
 SHOW VARIABLES LIKE 'innodb_redo_log_encrypt';
 Variable_name	Value
 innodb_redo_log_encrypt	OFF
 SET GLOBAL innodb_redo_log_encrypt = ON;
-ERROR HY000: Concurrent clone in progress. Please try after clone is complete.
 SHOW VARIABLES LIKE 'innodb_redo_log_encrypt';
 Variable_name	Value
-innodb_redo_log_encrypt	OFF
+innodb_redo_log_encrypt	ON
 SHOW VARIABLES LIKE 'innodb_undo_log_encrypt';
 Variable_name	Value
 innodb_undo_log_encrypt	OFF
 SET GLOBAL innodb_undo_log_encrypt = ON;
-ERROR HY000: Concurrent clone in progress. Please try after clone is complete.
 SHOW VARIABLES LIKE 'innodb_undo_log_encrypt';
 Variable_name	Value
-innodb_undo_log_encrypt	OFF
+innodb_undo_log_encrypt	ON
 SET DEBUG_SYNC = 'now SIGNAL resume_clone';
 # In connection default - finishing Clone
+SET GLOBAL innodb_redo_log_encrypt = OFF;
+SET GLOBAL innodb_undo_log_encrypt = OFF;
 DROP TABLE t1;
 DROP TABLE t2;
 CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/component_keyring_file/r/clone_remote_encrypt.result mysql-8.0-8.0.27/mysql-test/suite/component_keyring_file/r/clone_remote_encrypt.result
--- mysql-8.0-8.0.26/mysql-test/suite/component_keyring_file/r/clone_remote_encrypt.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/component_keyring_file/r/clone_remote_encrypt.result	2021-09-28 11:46:34.000000000 +0000
@@ -70,26 +70,26 @@
 SET GLOBAL clone_max_concurrency = 8;
 SET GLOBAL clone_valid_donor_list = 'HOST:PORT';
 CLONE INSTANCE FROM USER@HOST:PORT IDENTIFIED BY '' DATA DIRECTORY = 'CLONE_DATADIR';
-# In connection con1 - Trying to set redo and undo encryption
+# In connection con1 - Set redo and undo encryption
 SET DEBUG_SYNC = 'now WAIT_FOR set_encryption';
 SHOW VARIABLES LIKE 'innodb_redo_log_encrypt';
 Variable_name	Value
 innodb_redo_log_encrypt	OFF
 SET GLOBAL innodb_redo_log_encrypt = ON;
-ERROR HY000: Concurrent clone in progress. Please try after clone is complete.
 SHOW VARIABLES LIKE 'innodb_redo_log_encrypt';
 Variable_name	Value
-innodb_redo_log_encrypt	OFF
+innodb_redo_log_encrypt	ON
 SHOW VARIABLES LIKE 'innodb_undo_log_encrypt';
 Variable_name	Value
 innodb_undo_log_encrypt	OFF
 SET GLOBAL innodb_undo_log_encrypt = ON;
-ERROR HY000: Concurrent clone in progress. Please try after clone is complete.
 SHOW VARIABLES LIKE 'innodb_undo_log_encrypt';
 Variable_name	Value
-innodb_undo_log_encrypt	OFF
+innodb_undo_log_encrypt	ON
 SET DEBUG_SYNC = 'now SIGNAL resume_clone';
 # In connection default - finishing Clone
+SET GLOBAL innodb_redo_log_encrypt = OFF;
+SET GLOBAL innodb_undo_log_encrypt = OFF;
 DROP TABLE t1;
 DROP TABLE t2;
 CREATE TABLE t1(col1 INT PRIMARY KEY, col2 int, col3 varchar(64), col4 BLOB)
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/component_keyring_file/r/load_windows.result mysql-8.0-8.0.27/mysql-test/suite/component_keyring_file/r/load_windows.result
--- mysql-8.0-8.0.26/mysql-test/suite/component_keyring_file/r/load_windows.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/component_keyring_file/r/load_windows.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,17 @@
+#
+# Bug #32950322: SERVER GIVES ERROR WHILE LOADING COMPONENT ON WINDOWS
+#
+# ----------------------------------------------------------------------
+# Setup
+# Creating local configuration file for keyring component: component_keyring_file
+# Creating manifest file for current MySQL server instance
+# Re-starting mysql server with manifest file
+# ----------------------------------------------------------------------
+include/assert.inc [Expect MY-013709 to appear  times.]
+# ----------------------------------------------------------------------
+# Teardown
+# Removing manifest file for current MySQL server instance
+# Removing local keyring file for keyring component: component_keyring_file
+# Removing local configuration file for keyring component: component_keyring_file
+# Restarting server without the manifest file
+# ----------------------------------------------------------------------
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/component_keyring_file/r/tablespace_encrypt_8.result mysql-8.0-8.0.27/mysql-test/suite/component_keyring_file/r/tablespace_encrypt_8.result
--- mysql-8.0-8.0.26/mysql-test/suite/component_keyring_file/r/tablespace_encrypt_8.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/component_keyring_file/r/tablespace_encrypt_8.result	2021-09-28 11:46:34.000000000 +0000
@@ -7,7 +7,7 @@
 #########################################################################
 # RESTART 1 : WITH KEYRING
 #########################################################################
-SET SESSION debug= '+d,BtrBulk_insert_inject_error';
+SET SESSION debug= '+d,ddl_btree_build_insert_return_interrupt';
 
 #########
 # SETUP #
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/component_keyring_file/r/upgrade.result mysql-8.0-8.0.27/mysql-test/suite/component_keyring_file/r/upgrade.result
--- mysql-8.0-8.0.26/mysql-test/suite/component_keyring_file/r/upgrade.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/component_keyring_file/r/upgrade.result	2021-09-28 11:46:34.000000000 +0000
@@ -94,7 +94,7 @@
 SHOW GRANTS FOR 'root'@'localhost';
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
 GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
 ########################################################################
 # Remove copied files and stop the server.
@@ -166,7 +166,7 @@
 SHOW GRANTS FOR 'root'@'localhost';
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
 GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
 ########################################################################
 # Remove copied files and stop the server.
@@ -237,7 +237,7 @@
 SHOW GRANTS FOR 'root'@'localhost';
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
 GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
 ########################################################################
 # Remove copied files and stop the server.
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/component_keyring_file/t/load_windows.test mysql-8.0-8.0.27/mysql-test/suite/component_keyring_file/t/load_windows.test
--- mysql-8.0-8.0.26/mysql-test/suite/component_keyring_file/t/load_windows.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/component_keyring_file/t/load_windows.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,39 @@
+--source include/have_component_keyring_file.inc
+--source include/windows.inc
+
+--echo #
+--echo # Bug #32950322: SERVER GIVES ERROR WHILE LOADING COMPONENT ON WINDOWS
+--echo #
+
+--echo # ----------------------------------------------------------------------
+--echo # Setup
+
+--let PLUGIN_DIR_OPT = $KEYRING_FILE_COMPONENT_OPT
+
+# Data directory location
+--let CURRENT_DATADIR = `SELECT @@datadir`
+
+--let COMPONENT_LIBRARY = `SELECT SUBSTRING_INDEX('$KEYRING_FILE_COMPONENT_LOAD', '=', -1)`
+--let COMPONENT_DIR = $KEYRING_FILE_COMPONENT_DIR
+--let COMPONENT_NAME = `SELECT SUBSTRING_INDEX('$COMPONENT_LIBRARY', '.', 1)`
+
+# Create local keyring config
+--let KEYRING_FILE_PATH = `SELECT CONCAT( '$MYSQLTEST_VARDIR', '/keyring_file')`
+--let KEYRING_CONFIG_CONTENT = `SELECT CONCAT('{ \"path\": \"', '$KEYRING_FILE_PATH','\", \"read_only\": false }')`
+--source include/keyring_tests/helper/local_keyring_create_config.inc
+
+# Create local windows line ending manifest file for current server instance
+--let LOCAL_MANIFEST_CONTENT = `SELECT CONCAT('{\r\n \"components\": \"file://', '$COMPONENT_NAME', '\"\r\n }\r\n')`
+--source include/keyring_tests/helper/instance_create_manifest.inc
+
+# Restart server with manifest file
+--source include/keyring_tests/helper/start_server_with_manifest.inc
+--echo # ----------------------------------------------------------------------
+
+# Success criteria: should not produce warnings and should load the component
+--let $expected_errors=0
+--let $assert_text= Expect MY-013709 to appear $expected_error times.
+-- let $assert_cond= [SELECT COUNT(*) as received_errors FROM performance_schema.error_log WHERE error_code="MY-013709", received_errors, 1] = $expected_errors
+--source include/assert.inc
+
+--source ../inc/teardown_component.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/connection_control/r/system_variables.result mysql-8.0-8.0.27/mysql-test/suite/connection_control/r/system_variables.result
--- mysql-8.0-8.0.26/mysql-test/suite/connection_control/r/system_variables.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/connection_control/r/system_variables.result	2021-09-28 11:46:34.000000000 +0000
@@ -9,8 +9,8 @@
 SHOW GRANTS;
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 SET @saved_value = @@global.connection_control_failed_connections_threshold;
 SELECT @saved_value;
 @saved_value
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/encryption/r/upgrade.result mysql-8.0-8.0.27/mysql-test/suite/encryption/r/upgrade.result
--- mysql-8.0-8.0.26/mysql-test/suite/encryption/r/upgrade.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/encryption/r/upgrade.result	2021-09-28 11:46:34.000000000 +0000
@@ -78,7 +78,7 @@
 SHOW GRANTS FOR 'root'@'localhost';
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
 GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
 ########################################################################
 # Remove copied files and stop the server.
@@ -140,7 +140,7 @@
 SHOW GRANTS FOR 'root'@'localhost';
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
 GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
 ########################################################################
 # Remove copied files and stop the server.
@@ -201,7 +201,7 @@
 SHOW GRANTS FOR 'root'@'localhost';
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
 GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
 ########################################################################
 # Remove copied files and stop the server.
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/engines/iuds/r/strings_charsets_update_delete.result mysql-8.0-8.0.27/mysql-test/suite/engines/iuds/r/strings_charsets_update_delete.result
--- mysql-8.0-8.0.26/mysql-test/suite/engines/iuds/r/strings_charsets_update_delete.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/engines/iuds/r/strings_charsets_update_delete.result	2021-09-28 11:46:34.000000000 +0000
@@ -770,6 +770,9 @@
 |	|
 }	}
 ~	~
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 UPDATE t7 SET a=CHAR(ASCII(a)+32) WHERE ASCII(a) >= 65 AND ASCII(a) <= 90;
 UPDATE t7 SET a=CHAR(ASCII(a)-32) WHERE ASCII(a) >= 97 AND ASCII(a) <= 122;
 SELECT a,HEX(a) FROM t7;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/funcs_1/r/innodb_trig_03e.result mysql-8.0-8.0.27/mysql-test/suite/funcs_1/r/innodb_trig_03e.result
--- mysql-8.0-8.0.26/mysql-test/suite/funcs_1/r/innodb_trig_03e.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/funcs_1/r/innodb_trig_03e.result	2021-09-28 11:46:34.000000000 +0000
@@ -582,7 +582,7 @@
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `test_yesprivs`@`localhost`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_yesprivs`@`localhost`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_yesprivs`@`localhost`
 create User test_noprivs@localhost;
 set password for test_noprivs@localhost = 'PWD';
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
@@ -642,7 +642,7 @@
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `test_yesprivs`@`localhost`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_yesprivs`@`localhost`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_yesprivs`@`localhost`
 select current_user;
 current_user
 test_yesprivs@localhost
@@ -659,8 +659,8 @@
 show grants;
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 drop trigger trg1_1;
 use priv_db;
 Warnings:
@@ -695,7 +695,7 @@
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `test_yesprivs`@`localhost`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_yesprivs`@`localhost`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_yesprivs`@`localhost`
 GRANT TRIGGER ON `priv_db`.* TO `test_yesprivs`@`localhost`
 Warnings:
 Warning	3719	'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous.
@@ -761,7 +761,7 @@
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `test_yesprivs`@`localhost`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_yesprivs`@`localhost`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_yesprivs`@`localhost`
 select current_user;
 current_user
 test_yesprivs@localhost
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/funcs_1/r/innodb_trig_03.result mysql-8.0-8.0.27/mysql-test/suite/funcs_1/r/innodb_trig_03.result
--- mysql-8.0-8.0.26/mysql-test/suite/funcs_1/r/innodb_trig_03.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/funcs_1/r/innodb_trig_03.result	2021-09-28 11:46:34.000000000 +0000
@@ -123,7 +123,7 @@
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `test_noprivs`@`localhost`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_noprivs`@`localhost`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_noprivs`@`localhost`
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
 grant TRIGGER on *.* to test_yesprivs@localhost;
 grant SELECT on priv_db.t1 to test_yesprivs@localhost;
@@ -212,7 +212,7 @@
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
 GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `test_noprivs`@`localhost`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_noprivs`@`localhost`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_noprivs`@`localhost`
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
 grant TRIGGER, UPDATE on *.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
@@ -225,7 +225,7 @@
 show grants;
 Grants for test_noprivs@localhost
 GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `test_noprivs`@`localhost`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_noprivs`@`localhost`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_noprivs`@`localhost`
 select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
@@ -465,7 +465,7 @@
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
 GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `test_noprivs`@`localhost`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_noprivs`@`localhost`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_noprivs`@`localhost`
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
 grant TRIGGER, SELECT on *.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
@@ -478,7 +478,7 @@
 show grants;
 Grants for test_noprivs@localhost
 GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `test_noprivs`@`localhost`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_noprivs`@`localhost`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_noprivs`@`localhost`
 create trigger trg5a_1 before INSERT on t1 for each row
 set @test_var = new.f1;
 set @test_var = 'before trig 3.5.3.8-1a';
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/funcs_1/r/is_basics_mixed.result mysql-8.0-8.0.27/mysql-test/suite/funcs_1/r/is_basics_mixed.result
--- mysql-8.0-8.0.26/mysql-test/suite/funcs_1/r/is_basics_mixed.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/funcs_1/r/is_basics_mixed.result	2021-09-28 11:46:34.000000000 +0000
@@ -128,7 +128,7 @@
 SHOW GRANTS FOR testuser1@localhost;
 Grants for testuser1@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `testuser1`@`localhost`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `testuser1`@`localhost`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `testuser1`@`localhost`
 # Establish connection testuser1 (user=testuser1)
 USE information_schema;
 CREATE TABLE schemata                              ( c1 INT );
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/funcs_1/r/is_columns_mysql.result mysql-8.0-8.0.27/mysql-test/suite/funcs_1/r/is_columns_mysql.result
--- mysql-8.0-8.0.26/mysql-test/suite/funcs_1/r/is_columns_mysql.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/funcs_1/r/is_columns_mysql.result	2021-09-28 11:46:34.000000000 +0000
@@ -183,6 +183,7 @@
 def	mysql	slave_master_info	Master_zstd_compression_level	30	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int unsigned			select,insert,update,references	Compression level associated with zstd compression algorithm.		NULL
 def	mysql	slave_master_info	Tls_ciphersuites	31	NULL	YES	text	65535	65535	NULL	NULL	NULL	utf8	utf8_bin	text			select,insert,update,references	Ciphersuites used for TLS 1.3 communication with the master server.		NULL
 def	mysql	slave_master_info	Source_connection_auto_failover	32	0	NO	tinyint	NULL	NULL	3	0	NULL	NULL	NULL	tinyint(1)			select,insert,update,references	Indicates whether the channel connection failover is enabled.		NULL
+def	mysql	slave_master_info	Gtid_only	33	0	NO	tinyint	NULL	NULL	3	0	NULL	NULL	NULL	tinyint(1)			select,insert,update,references	Indicates if this channel only uses GTIDs and does not persist positions.		NULL
 def	mysql	slave_relay_log_info	Number_of_lines	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int unsigned			select,insert,update,references	Number of lines in the file or rows in the table. Used to version table definitions.		NULL
 def	mysql	slave_relay_log_info	Relay_log_name	2	NULL	YES	text	65535	65535	NULL	NULL	NULL	utf8	utf8_bin	text			select,insert,update,references	The name of the current relay log file.		NULL
 def	mysql	slave_relay_log_info	Relay_log_pos	3	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint unsigned			select,insert,update,references	The relay log position of the last executed event.		NULL
@@ -545,6 +546,7 @@
 NULL	mysql	slave_master_info	Master_zstd_compression_level	int	NULL	NULL	NULL	NULL	int unsigned
 1.0000	mysql	slave_master_info	Tls_ciphersuites	text	65535	65535	utf8	utf8_bin	text
 NULL	mysql	slave_master_info	Source_connection_auto_failover	tinyint	NULL	NULL	NULL	NULL	tinyint(1)
+NULL	mysql	slave_master_info	Gtid_only	tinyint	NULL	NULL	NULL	NULL	tinyint(1)
 NULL	mysql	slave_relay_log_info	Number_of_lines	int	NULL	NULL	NULL	NULL	int unsigned
 1.0000	mysql	slave_relay_log_info	Relay_log_name	text	65535	65535	utf8	utf8_bin	text
 NULL	mysql	slave_relay_log_info	Relay_log_pos	bigint	NULL	NULL	NULL	NULL	bigint unsigned
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/funcs_1/r/is_key_column_usage_ci.result mysql-8.0-8.0.27/mysql-test/suite/funcs_1/r/is_key_column_usage_ci.result
--- mysql-8.0-8.0.26/mysql-test/suite/funcs_1/r/is_key_column_usage_ci.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/funcs_1/r/is_key_column_usage_ci.result	2021-09-28 11:46:34.000000000 +0000
@@ -261,13 +261,6 @@
 def	performance_schema	PRIMARY	def	performance_schema	replication_applier_status_by_coordinator	CHANNEL_NAME
 def	performance_schema	PRIMARY	def	performance_schema	replication_applier_status_by_worker	CHANNEL_NAME
 def	performance_schema	PRIMARY	def	performance_schema	replication_applier_status_by_worker	WORKER_ID
-def	performance_schema	PRIMARY	def	performance_schema	replication_asynchronous_connection_failover	CHANNEL_NAME
-def	performance_schema	PRIMARY	def	performance_schema	replication_asynchronous_connection_failover	HOST
-def	performance_schema	PRIMARY	def	performance_schema	replication_asynchronous_connection_failover	MANAGED_NAME
-def	performance_schema	PRIMARY	def	performance_schema	replication_asynchronous_connection_failover	NETWORK_NAMESPACE
-def	performance_schema	PRIMARY	def	performance_schema	replication_asynchronous_connection_failover	PORT
-def	performance_schema	PRIMARY	def	performance_schema	replication_asynchronous_connection_failover_managed	CHANNEL_NAME
-def	performance_schema	PRIMARY	def	performance_schema	replication_asynchronous_connection_failover_managed	MANAGED_NAME
 def	performance_schema	PRIMARY	def	performance_schema	replication_connection_configuration	CHANNEL_NAME
 def	performance_schema	PRIMARY	def	performance_schema	replication_connection_status	CHANNEL_NAME
 def	performance_schema	PRIMARY	def	performance_schema	rwlock_instances	OBJECT_INSTANCE_BEGIN
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/funcs_1/r/is_key_column_usage.result mysql-8.0-8.0.27/mysql-test/suite/funcs_1/r/is_key_column_usage.result
--- mysql-8.0-8.0.26/mysql-test/suite/funcs_1/r/is_key_column_usage.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/funcs_1/r/is_key_column_usage.result	2021-09-28 11:46:34.000000000 +0000
@@ -261,13 +261,6 @@
 def	performance_schema	PRIMARY	def	performance_schema	replication_applier_status_by_coordinator	CHANNEL_NAME
 def	performance_schema	PRIMARY	def	performance_schema	replication_applier_status_by_worker	CHANNEL_NAME
 def	performance_schema	PRIMARY	def	performance_schema	replication_applier_status_by_worker	WORKER_ID
-def	performance_schema	PRIMARY	def	performance_schema	replication_asynchronous_connection_failover	CHANNEL_NAME
-def	performance_schema	PRIMARY	def	performance_schema	replication_asynchronous_connection_failover	HOST
-def	performance_schema	PRIMARY	def	performance_schema	replication_asynchronous_connection_failover	MANAGED_NAME
-def	performance_schema	PRIMARY	def	performance_schema	replication_asynchronous_connection_failover	NETWORK_NAMESPACE
-def	performance_schema	PRIMARY	def	performance_schema	replication_asynchronous_connection_failover	PORT
-def	performance_schema	PRIMARY	def	performance_schema	replication_asynchronous_connection_failover_managed	CHANNEL_NAME
-def	performance_schema	PRIMARY	def	performance_schema	replication_asynchronous_connection_failover_managed	MANAGED_NAME
 def	performance_schema	PRIMARY	def	performance_schema	replication_connection_configuration	CHANNEL_NAME
 def	performance_schema	PRIMARY	def	performance_schema	replication_connection_status	CHANNEL_NAME
 def	performance_schema	PRIMARY	def	performance_schema	rwlock_instances	OBJECT_INSTANCE_BEGIN
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/funcs_1/r/is_statistics_ci.result mysql-8.0-8.0.27/mysql-test/suite/funcs_1/r/is_statistics_ci.result
--- mysql-8.0-8.0.26/mysql-test/suite/funcs_1/r/is_statistics_ci.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/funcs_1/r/is_statistics_ci.result	2021-09-28 11:46:34.000000000 +0000
@@ -325,15 +325,6 @@
 def	performance_schema	replication_applier_status_by_worker	performance_schema	PRIMARY
 def	performance_schema	replication_applier_status_by_worker	performance_schema	PRIMARY
 def	performance_schema	replication_applier_status_by_worker	performance_schema	THREAD_ID
-def	performance_schema	replication_asynchronous_connection_failover	performance_schema	CHANNEL_NAME
-def	performance_schema	replication_asynchronous_connection_failover	performance_schema	CHANNEL_NAME
-def	performance_schema	replication_asynchronous_connection_failover	performance_schema	PRIMARY
-def	performance_schema	replication_asynchronous_connection_failover	performance_schema	PRIMARY
-def	performance_schema	replication_asynchronous_connection_failover	performance_schema	PRIMARY
-def	performance_schema	replication_asynchronous_connection_failover	performance_schema	PRIMARY
-def	performance_schema	replication_asynchronous_connection_failover	performance_schema	PRIMARY
-def	performance_schema	replication_asynchronous_connection_failover_managed	performance_schema	PRIMARY
-def	performance_schema	replication_asynchronous_connection_failover_managed	performance_schema	PRIMARY
 def	performance_schema	replication_connection_configuration	performance_schema	PRIMARY
 def	performance_schema	replication_connection_status	performance_schema	PRIMARY
 def	performance_schema	replication_connection_status	performance_schema	THREAD_ID
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/funcs_1/r/is_statistics_cs.result mysql-8.0-8.0.27/mysql-test/suite/funcs_1/r/is_statistics_cs.result
--- mysql-8.0-8.0.26/mysql-test/suite/funcs_1/r/is_statistics_cs.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/funcs_1/r/is_statistics_cs.result	2021-09-28 11:46:34.000000000 +0000
@@ -325,15 +325,6 @@
 def	performance_schema	replication_applier_status_by_worker	performance_schema	PRIMARY
 def	performance_schema	replication_applier_status_by_worker	performance_schema	PRIMARY
 def	performance_schema	replication_applier_status_by_worker	performance_schema	THREAD_ID
-def	performance_schema	replication_asynchronous_connection_failover	performance_schema	CHANNEL_NAME
-def	performance_schema	replication_asynchronous_connection_failover	performance_schema	CHANNEL_NAME
-def	performance_schema	replication_asynchronous_connection_failover	performance_schema	PRIMARY
-def	performance_schema	replication_asynchronous_connection_failover	performance_schema	PRIMARY
-def	performance_schema	replication_asynchronous_connection_failover	performance_schema	PRIMARY
-def	performance_schema	replication_asynchronous_connection_failover	performance_schema	PRIMARY
-def	performance_schema	replication_asynchronous_connection_failover	performance_schema	PRIMARY
-def	performance_schema	replication_asynchronous_connection_failover_managed	performance_schema	PRIMARY
-def	performance_schema	replication_asynchronous_connection_failover_managed	performance_schema	PRIMARY
 def	performance_schema	replication_connection_configuration	performance_schema	PRIMARY
 def	performance_schema	replication_connection_status	performance_schema	PRIMARY
 def	performance_schema	replication_connection_status	performance_schema	THREAD_ID
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/funcs_1/r/is_table_constraints_ci.result mysql-8.0-8.0.27/mysql-test/suite/funcs_1/r/is_table_constraints_ci.result
--- mysql-8.0-8.0.26/mysql-test/suite/funcs_1/r/is_table_constraints_ci.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/funcs_1/r/is_table_constraints_ci.result	2021-09-28 11:46:34.000000000 +0000
@@ -159,8 +159,6 @@
 def	performance_schema	PRIMARY	performance_schema	replication_applier_status
 def	performance_schema	PRIMARY	performance_schema	replication_applier_status_by_coordinator
 def	performance_schema	PRIMARY	performance_schema	replication_applier_status_by_worker
-def	performance_schema	PRIMARY	performance_schema	replication_asynchronous_connection_failover
-def	performance_schema	PRIMARY	performance_schema	replication_asynchronous_connection_failover_managed
 def	performance_schema	PRIMARY	performance_schema	replication_connection_configuration
 def	performance_schema	PRIMARY	performance_schema	replication_connection_status
 def	performance_schema	PRIMARY	performance_schema	rwlock_instances
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/funcs_1/r/is_table_constraints.result mysql-8.0-8.0.27/mysql-test/suite/funcs_1/r/is_table_constraints.result
--- mysql-8.0-8.0.26/mysql-test/suite/funcs_1/r/is_table_constraints.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/funcs_1/r/is_table_constraints.result	2021-09-28 11:46:34.000000000 +0000
@@ -159,8 +159,6 @@
 def	performance_schema	PRIMARY	performance_schema	replication_applier_status
 def	performance_schema	PRIMARY	performance_schema	replication_applier_status_by_coordinator
 def	performance_schema	PRIMARY	performance_schema	replication_applier_status_by_worker
-def	performance_schema	PRIMARY	performance_schema	replication_asynchronous_connection_failover
-def	performance_schema	PRIMARY	performance_schema	replication_asynchronous_connection_failover_managed
 def	performance_schema	PRIMARY	performance_schema	replication_connection_configuration
 def	performance_schema	PRIMARY	performance_schema	replication_connection_status
 def	performance_schema	PRIMARY	performance_schema	rwlock_instances
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/funcs_1/r/memory_trig_03e.result mysql-8.0-8.0.27/mysql-test/suite/funcs_1/r/memory_trig_03e.result
--- mysql-8.0-8.0.26/mysql-test/suite/funcs_1/r/memory_trig_03e.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/funcs_1/r/memory_trig_03e.result	2021-09-28 11:46:34.000000000 +0000
@@ -583,7 +583,7 @@
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `test_yesprivs`@`localhost`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_yesprivs`@`localhost`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_yesprivs`@`localhost`
 create User test_noprivs@localhost;
 set password for test_noprivs@localhost = 'PWD';
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
@@ -643,7 +643,7 @@
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `test_yesprivs`@`localhost`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_yesprivs`@`localhost`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_yesprivs`@`localhost`
 select current_user;
 current_user
 test_yesprivs@localhost
@@ -660,8 +660,8 @@
 show grants;
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 drop trigger trg1_1;
 use priv_db;
 Warnings:
@@ -696,7 +696,7 @@
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `test_yesprivs`@`localhost`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_yesprivs`@`localhost`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_yesprivs`@`localhost`
 GRANT TRIGGER ON `priv_db`.* TO `test_yesprivs`@`localhost`
 Warnings:
 Warning	3719	'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous.
@@ -762,7 +762,7 @@
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `test_yesprivs`@`localhost`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_yesprivs`@`localhost`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_yesprivs`@`localhost`
 select current_user;
 current_user
 test_yesprivs@localhost
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/funcs_1/r/memory_trig_03.result mysql-8.0-8.0.27/mysql-test/suite/funcs_1/r/memory_trig_03.result
--- mysql-8.0-8.0.26/mysql-test/suite/funcs_1/r/memory_trig_03.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/funcs_1/r/memory_trig_03.result	2021-09-28 11:46:34.000000000 +0000
@@ -124,7 +124,7 @@
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `test_noprivs`@`localhost`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_noprivs`@`localhost`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_noprivs`@`localhost`
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
 grant TRIGGER on *.* to test_yesprivs@localhost;
 grant SELECT on priv_db.t1 to test_yesprivs@localhost;
@@ -213,7 +213,7 @@
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
 GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `test_noprivs`@`localhost`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_noprivs`@`localhost`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_noprivs`@`localhost`
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
 grant TRIGGER, UPDATE on *.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
@@ -226,7 +226,7 @@
 show grants;
 Grants for test_noprivs@localhost
 GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `test_noprivs`@`localhost`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_noprivs`@`localhost`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_noprivs`@`localhost`
 select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
@@ -466,7 +466,7 @@
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
 GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `test_noprivs`@`localhost`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_noprivs`@`localhost`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_noprivs`@`localhost`
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
 grant TRIGGER, SELECT on *.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
@@ -479,7 +479,7 @@
 show grants;
 Grants for test_noprivs@localhost
 GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `test_noprivs`@`localhost`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_noprivs`@`localhost`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_noprivs`@`localhost`
 create trigger trg5a_1 before INSERT on t1 for each row
 set @test_var = new.f1;
 set @test_var = 'before trig 3.5.3.8-1a';
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/funcs_1/r/myisam_trig_03e.result mysql-8.0-8.0.27/mysql-test/suite/funcs_1/r/myisam_trig_03e.result
--- mysql-8.0-8.0.26/mysql-test/suite/funcs_1/r/myisam_trig_03e.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/funcs_1/r/myisam_trig_03e.result	2021-09-28 11:46:34.000000000 +0000
@@ -583,7 +583,7 @@
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `test_yesprivs`@`localhost`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_yesprivs`@`localhost`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_yesprivs`@`localhost`
 create User test_noprivs@localhost;
 set password for test_noprivs@localhost = 'PWD';
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
@@ -643,7 +643,7 @@
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `test_yesprivs`@`localhost`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_yesprivs`@`localhost`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_yesprivs`@`localhost`
 select current_user;
 current_user
 test_yesprivs@localhost
@@ -660,8 +660,8 @@
 show grants;
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 drop trigger trg1_1;
 use priv_db;
 Warnings:
@@ -696,7 +696,7 @@
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `test_yesprivs`@`localhost`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_yesprivs`@`localhost`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_yesprivs`@`localhost`
 GRANT TRIGGER ON `priv_db`.* TO `test_yesprivs`@`localhost`
 Warnings:
 Warning	3719	'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous.
@@ -762,7 +762,7 @@
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `test_yesprivs`@`localhost`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_yesprivs`@`localhost`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_yesprivs`@`localhost`
 select current_user;
 current_user
 test_yesprivs@localhost
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/funcs_1/r/myisam_trig_03.result mysql-8.0-8.0.27/mysql-test/suite/funcs_1/r/myisam_trig_03.result
--- mysql-8.0-8.0.26/mysql-test/suite/funcs_1/r/myisam_trig_03.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/funcs_1/r/myisam_trig_03.result	2021-09-28 11:46:34.000000000 +0000
@@ -124,7 +124,7 @@
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `test_noprivs`@`localhost`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_noprivs`@`localhost`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_noprivs`@`localhost`
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
 grant TRIGGER on *.* to test_yesprivs@localhost;
 grant SELECT on priv_db.t1 to test_yesprivs@localhost;
@@ -213,7 +213,7 @@
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
 GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `test_noprivs`@`localhost`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_noprivs`@`localhost`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_noprivs`@`localhost`
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
 grant TRIGGER, UPDATE on *.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
@@ -226,7 +226,7 @@
 show grants;
 Grants for test_noprivs@localhost
 GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `test_noprivs`@`localhost`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_noprivs`@`localhost`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_noprivs`@`localhost`
 select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
@@ -466,7 +466,7 @@
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
 GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `test_noprivs`@`localhost`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_noprivs`@`localhost`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_noprivs`@`localhost`
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
 grant TRIGGER, SELECT on *.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
@@ -479,7 +479,7 @@
 show grants;
 Grants for test_noprivs@localhost
 GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `test_noprivs`@`localhost`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_noprivs`@`localhost`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `test_noprivs`@`localhost`
 create trigger trg5a_1 before INSERT on t1 for each row
 set @test_var = new.f1;
 set @test_var = 'before trig 3.5.3.8-1a';
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result mysql-8.0-8.0.27/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
--- mysql-8.0-8.0.26/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result	2021-09-28 11:46:34.000000000 +0000
@@ -70,8 +70,8 @@
 SHOW GRANTS;
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 CREATE INDEX i_processlist ON processlist (user);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
 DROP TABLE processlist;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/gcol/r/gcol_keys_innodb.result mysql-8.0-8.0.27/mysql-test/suite/gcol/r/gcol_keys_innodb.result
--- mysql-8.0-8.0.26/mysql-test/suite/gcol/r/gcol_keys_innodb.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/gcol/r/gcol_keys_innodb.result	2021-09-28 11:46:34.000000000 +0000
@@ -506,6 +506,7 @@
                         "rowid_ordered": true,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": 1,
                         "rows": 3,
                         "cost": 0.560618,
                         "chosen": true
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/gcol/r/gcol_keys_myisam.result mysql-8.0-8.0.27/mysql-test/suite/gcol/r/gcol_keys_myisam.result
--- mysql-8.0-8.0.26/mysql-test/suite/gcol/r/gcol_keys_myisam.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/gcol/r/gcol_keys_myisam.result	2021-09-28 11:46:34.000000000 +0000
@@ -255,6 +255,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 4,
                         "cost": 1.66,
                         "chosen": true
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/gcol/r/gcol_supported_sql_funcs_innodb.result mysql-8.0-8.0.27/mysql-test/suite/gcol/r/gcol_supported_sql_funcs_innodb.result
--- mysql-8.0-8.0.26/mysql-test/suite/gcol/r/gcol_supported_sql_funcs_innodb.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/gcol/r/gcol_supported_sql_funcs_innodb.result	2021-09-28 11:46:34.000000000 +0000
@@ -1600,6 +1600,8 @@
 # BINARY
 set sql_warnings = 1;
 create table t1 (a varchar(10), b varbinary(10) generated always as (binary a) virtual) charset latin1;
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/gcol/r/gcol_supported_sql_funcs_myisam.result mysql-8.0-8.0.27/mysql-test/suite/gcol/r/gcol_supported_sql_funcs_myisam.result
--- mysql-8.0-8.0.26/mysql-test/suite/gcol/r/gcol_supported_sql_funcs_myisam.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/gcol/r/gcol_supported_sql_funcs_myisam.result	2021-09-28 11:46:34.000000000 +0000
@@ -1600,6 +1600,8 @@
 # BINARY
 set sql_warnings = 1;
 create table t1 (a varchar(10), b varbinary(10) generated always as (binary a) virtual) charset latin1;
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/gcol/t/gcol_insert_ignore.test mysql-8.0-8.0.27/mysql-test/suite/gcol/t/gcol_insert_ignore.test
--- mysql-8.0-8.0.26/mysql-test/suite/gcol/t/gcol_insert_ignore.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/gcol/t/gcol_insert_ignore.test	2021-09-28 11:46:34.000000000 +0000
@@ -1,4 +1,5 @@
 --source include/big_test.inc
+--source include/not_valgrind.inc
 
 --echo #
 --echo # Bug #30664660 GCOLS, CRASH AND CORRUPTIONS WITH DELETE IGNORE + JSON
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/gcol_ndb/r/gcol_keys_ndb.result mysql-8.0-8.0.27/mysql-test/suite/gcol_ndb/r/gcol_keys_ndb.result
--- mysql-8.0-8.0.26/mysql-test/suite/gcol_ndb/r/gcol_keys_ndb.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/gcol_ndb/r/gcol_keys_ndb.result	2021-09-28 11:46:34.000000000 +0000
@@ -249,6 +249,7 @@
                         "rowid_ordered": false,
                         "using_mrr": true,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 3,
                         "cost": 1.31,
                         "chosen": true
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/gcol_ndb/r/gcol_supported_sql_funcs_ndb.result mysql-8.0-8.0.27/mysql-test/suite/gcol_ndb/r/gcol_supported_sql_funcs_ndb.result
--- mysql-8.0-8.0.26/mysql-test/suite/gcol_ndb/r/gcol_supported_sql_funcs_ndb.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/gcol_ndb/r/gcol_supported_sql_funcs_ndb.result	2021-09-28 11:46:34.000000000 +0000
@@ -1600,6 +1600,8 @@
 # BINARY
 set sql_warnings = 1;
 create table t1 (a varchar(10), b varbinary(10) generated always as (binary a) virtual) charset latin1;
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/gis/r/gis_bugs_crashes.result mysql-8.0-8.0.27/mysql-test/suite/gis/r/gis_bugs_crashes.result
--- mysql-8.0-8.0.26/mysql-test/suite/gis/r/gis_bugs_crashes.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/gis/r/gis_bugs_crashes.result	2021-09-28 11:46:34.000000000 +0000
@@ -473,7 +473,7 @@
 # BUG#20211639 : ASSERTION `LHS.DENOMINATOR() != 0' FAILED
 ######################################################################################################
 # Invalid geometry in input
-SELECT ST_ISEMPTY(ST_INTERSECTION(
+DO ST_ISEMPTY(ST_INTERSECTION(
 ST_UNION(
 ST_GEOMFROMTEXT('MULTIPOINT(-9 4,10 -4,3 -10,-6 5,2 -4,-4 -8,1 10,4 10,6 6,9 2,9 4,-10 5,-6 7)'),
 ST_GEOMFROMTEXT('MULTIPOLYGON(((3 5,-7 -2,-5 -1,1 -4,2 9,-9 -6,-6 10,-7 2,9 -2,-2 1,-1 4,-3 10, 3 5)),'
@@ -489,9 +489,8 @@
                                                        '((8 -3,-5 0,2 -4,-8 -5,4 10,10 -8,5 3,-8 -9,-7 -2,8 9,-3 -3,-10 7,-10 -8,-7 -10,-5 -9, 8 -3)),'
                                                        '((4 9,8 -7,1 -10,9 6,-4 8,-7 1,3 -3,8 2,-10 3,-8 8,-3 1,2 0, 4 9)))'),
 ST_GEOMFROMTEXT('LINESTRING(0 -3,8 9,10 -3,-8 7,4 4,8 -8,10 6,5 7)')))));
-ERROR 22023: Invalid GIS data provided to function st_union.
 # Invalid geometry in input
-SELECT ST_ISEMPTY(ST_INTERSECTION(
+DO ST_ISEMPTY(ST_INTERSECTION(
 ST_CONVEXHULL(
 ST_GEOMFROMTEXT('POLYGON((0 10,-4 7,10 5,-8 -6,9 1,4 7,5 0,-3 -1,9 10,-7 -5, 0 10))')),
 ST_UNION(
@@ -501,7 +500,6 @@
 ST_GEOMFROMTEXT('MULTIPOLYGON(((-10 0,-9 -8,4 -6,-8 6,0 -1,1 0,5 2,8 -5, -10 0)),'
                                                        '((-9 10,4 -8,-9 5,7 -9,-5 9,3 7,-5 -7,-4 -7,1 -7,10 2, -9 10)),'
                                                        '((-2 6,-2 -6,-7 -5,1 4,7 -4,5 10,7 4,-6 -4,0 4,-3 0,0 2, -2 6)))'))));
-ERROR 22023: Invalid GIS data provided to function st_union.
 SELECT ST_ISEMPTY(ST_UNION(
 ST_INTERSECTION(
 ST_UNION(
@@ -523,7 +521,7 @@
 ST_GEOMFROMTEXT('MULTIP
 0
 # Invalid geometry in input
-SELECT ST_SRID(
+DO ST_SRID(
 ST_INTERSECTION(
 ST_UNION(
 ST_UNION(
@@ -604,7 +602,6 @@
 ST_GEOMFROMTEXT(
 'LINESTRING(4 -3,2 -10,5 -5,8 5,8 -3,-4 -9,2 -2,-3 4,-7 5,-9 -10)'),
 ST_GEOMFROMTEXT('MULTIPOINT(-7 10,-9 8,3 3,5 5,10 -8,10 -9)'))))))));
-ERROR 22023: Invalid GIS data provided to function st_union.
 ######################################################################################################
 # BUG#20218936 : ASSERTION `(M_PREVIOUS_OPERATION != OVERLAY::OPERATION_CONTINUE)' FAILED
 ######################################################################################################
@@ -1174,7 +1171,7 @@
 ST_ASTEXT(ST_INTERSECTION(
 ST_GEOMFROMTEXT('POLYGON((6 8, 4 1, 6 8, -0.2 2,6 6.3, 3 7, 4 7.1, 6 8))'),
 ST_GEOMFROMTEXT('MULTIPOLYGON(((6 4,3 3,-8.4 6,-.0 4,6 4)))')))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((1.7254659689012 3.335403817141154,2.6837209693283324 4,1.8666664746665438 4,1.2965517524471035 3.448275889464939,1.7254659689012 3.335403817141154))),MULTIPOINT((1.2965517524471029 3.448275889464939),(4.7368421052631575 3.5789473684210527),(4.857142857142858 4)))
+GEOMETRYCOLLECTION(MULTIPOINT((4.857142857142858 4),(4.7368421052631575 3.5789473684210527),(1.2965517524471029 3.448275889464939)),POLYGON((1.7254659689012 3.335403817141154,2.6837209693283324 4,1.8666664746665438 4,1.2965517524471035 3.448275889464939,1.7254659689012 3.335403817141154)))
 SELECT ST_DISJOINT(ST_GEOMFROMTEXT(
 'MULTIPOINT(189.7654 2)'),
 ST_GEOMFROMWKB(ST_ASWKB(
@@ -1201,7 +1198,7 @@
 POINT(1,5),POINT(-3.6,5),POINT(6,3),POINT(2,8),POINT(7,1.2),POINT(2,8))))))));
 ERROR 22023: Invalid GIS data provided to function polygon.
 # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(
+DO ST_ASTEXT(ST_INTERSECTION(
 ST_GEOMFROMWKB(ST_ASWKB(
 GEOMETRYCOLLECTION(
 POINT(7,7),
@@ -1217,7 +1214,6 @@
 MULTIPOINT(POINT(1,8),POINT(.6,8),POINT(.8,3))))),
 ST_GEOMFROMTEXT(
 'POLYGON((3 6,2 3,2 8,3 -1.6,4 -0.7654,3 6))')));
-ERROR 22023: Invalid GIS data provided to function st_union.
 SELECT MBREQUALS(ST_SYMDIFFERENCE(
 ST_GEOMFROMTEXT(
 'POINT(5 0)'),
@@ -1355,20 +1351,24 @@
 ######################################################################################################
 # BUG#20402476 : ASSERTION FAILURE IN ITEM_FUNC_SPATIAL_OPERATION::VAL_STR FUNCTION
 ######################################################################################################
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(
 ST_GEOMFROMTEXT('LINESTRING(-10 -9,-4 -4)'),
-ST_GEOMFROMTEXT('MULTIPOINT(2 6,2 6,8 0,6 4,5 9,0 -9,0 -10,9 1,10 8,5 -9)')));
-ST_ASTEXT(ST_SYMDIFFERENCE(
+ST_GEOMFROMTEXT('MULTIPOINT(2 6,2 6,8 0,6 4,5 9,0 -9,0 -10,9 1,10 8,5 -9)')),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(-10 -9,-4 -4),POINT(0 -10),POINT(0 -9),POINT(2 6),POINT(5 -9),POINT(5 9),POINT(6 4),POINT(8 0),POINT(9 1),POINT(10 8))'));
+ST_EQUALS(ST_SYMDIFFERENCE(
 ST_GEOMFROMTEXT('LINESTRING(-10 -9,-4 -4)'),
-ST_GEOMFROMTEXT('MULTIPOINT(2 6,2 6,8 0,6 4,5 9,0 -9,0 -10,9 1,10 8,5 -9)')))
-GEOMETRYCOLLECTION(LINESTRING(-10 -9,-4 -4),POINT(0 -10),POINT(0 -9),POINT(2 6),POINT(5 -9),POINT(5 9),POINT(6 4),POINT(8 0),POINT(9 1),POINT(10 8))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(
+ST_GEOMFROMTEXT('MULTIPOINT(2 6,2 6,8 0,6 4,5 9,0 -9,0 -10,9 1,10 8,5 -9)')),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(-10 -9,-4 -4),POINT(0 -10),POINT(0 -9),POINT(2 6),POINT(5
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(
 ST_GEOMFROMTEXT('MULTIPOINT(2 6,2 6,8 0,6 4,5 9,0 -9,0 -10,9 1,10 8,5 -9)'),
-ST_GEOMFROMTEXT('LINESTRING(-10 -9,-4 -4)')));
-ST_ASTEXT(ST_SYMDIFFERENCE(
+ST_GEOMFROMTEXT('LINESTRING(-10 -9,-4 -4)')),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(-10 -9,-4 -4),POINT(0 -10),POINT(0 -9),POINT(2 6),POINT(5 -9),POINT(5 9),POINT(6 4),POINT(8 0),POINT(9 1),POINT(10 8))'));
+ST_EQUALS(ST_SYMDIFFERENCE(
 ST_GEOMFROMTEXT('MULTIPOINT(2 6,2 6,8 0,6 4,5 9,0 -9,0 -10,9 1,10 8,5 -9)'),
-ST_GEOMFROMTEXT('LINESTRING(-10 -9,-4 -4)')))
-GEOMETRYCOLLECTION(LINESTRING(-10 -9,-4 -4),POINT(0 -10),POINT(0 -9),POINT(2 6),POINT(5 -9),POINT(5 9),POINT(6 4),POINT(8 0),POINT(9 1),POINT(10 8))
+ST_GEOMFROMTEXT('LINESTRING(-10 -9,-4 -4)')),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(-10 -9,-4 -4),POINT(0 -10),POINT(0 -9),POINT(2 6),POINT(5
+1
 ######################################################################################################
 # BUG#20133571 : ASSERTION `GRES->HAS_GEOM_HEADER_SPACE()' FAILED
 ######################################################################################################
@@ -1381,7 +1381,7 @@
 ST_GEOMFROMTEXT('MULTILINESTRING((-10 3,-9 -4,-9 3,-1 3),'
                                       '(3 10,7 9,-7 2,2 -9,7 10,7 8,3 -4,-9 -1,-5 -8,-7 5,4 9,-3 -6,9 1),'
                                       '(4 4,-7 -3,1 -4,-10 -8)
-GEOMETRYCOLLECTION(MULTIPOINT((-6.2 -0.19999999999999996),(-5.127659574468085 -1.8085106382978724),(-5 -2),(-4.152542372881356 -3.3559322033898304),(-3.333333333333333 -4.666666666666666),(-2.8703703703703702 -5.407407407407407),(-2.786259541984733 -5.541984732824428),(-2.7857142857142856 3),(-2.633587786259542 -5.786259541984733),(-2.2142857142857144 3),(-2.16 0.08000000000000007),(-2.1111111111111107 0.11111111111111116),(-1.5314685314685315 -2.8531468531468533),(-1.5283018867924527 -2.867924528301887),(-1.3486238532110093 -3.706422018348624),(-1.1204819277108435 -4.771084337349397),(-1.0952380952380953 -4.888888888888889),(-1 -5.333333333333333),(-0.7727272727272725 -1.2272727272727266),(-0.666666666666667 1.0303030303030303),(-0.5454545454545454 -7.454545454545455),(-0.07224334600760418 0.27376425855513276),(0.08411214953271028 0.07476635514018692),(0.3 -2.3),(1.4210526315789478 -3.4210526315789473),(1.6363636363636367 -3.6363636363636367),(1.6666666666666667 -3.6666666666666665),(1.790322580645161 -2.096774193548387),(2.2857142857142856 -4.285714285714286),(2.3589743589743586 -2.8205128205128203),(2.387755102040816 -2.857142857142857),(2.6363636363636367 -4.636363636363637),(2.846153846153846 6.923076923076923),(3 10),(3.041666666666667 -5.041666666666666),(3.0851063829787235 -3.74468085106383),(3.174721189591078 -3.858736059479554),(3.3082437275985663 -4.028673835125447),(6.696969696969697 8.848484848484848),(7 10)),LINESTRING(7 9,-5 3))
+GEOMETRYCOLLECTION(MULTIPOINT((-2.7857142857142856 3),(-2.2142857142857144 3),(3 10),(-1 -5.333333333333333),(3.041666666666667 -5.041666666666666),(3.3082437275985663 -4.028673835125447),(6.696969696969697 8.848484848484848),(7 10),(3.0851063829787235 -3.74468085106383),(1.6666666666666667 -3.6666666666666665),(-1.5283018867924527 -2.867924528301887),(-5 -2),(-6.2 -0.19999999999999996),(-0.07224334600760418 0.27376425855513276),(-0.7727272727272725 -1.2272727272727266),(-1.5314685314685315 -2.8531468531468533),(-2.786259541984733 -5.541984732824428),(-2.633587786259542 -5.786259541984733),(-1.0952380952380953 -4.888888888888889),(1.4210526315789478 -3.4210526315789473),(2.387755102040816 -2.857142857142857),(-0.666666666666667 1.0303030303030303),(-2.1111111111111107 0.11111111111111116),(-2.16 0.08000000000000007),(-5.127659574468085 -1.8085106382978724),(-4.152542372881356 -3.3559322033898304),(-1.3486238532110093 -3.706422018348624),(-1.1204819277108435 -4.771084337349397),(-2.8703703703703702 -5.407407407407407),(3.174721189591078 -3.858736059479554),(2.6363636363636367 -4.636363636363637),(0.08411214953271028 0.07476635514018692),(0.3 -2.3),(1.6363636363636367 -3.6363636363636367),(1.790322580645161 -2.096774193548387),(2.846153846153846 6.923076923076923),(2.3589743589743586 -2.8205128205128203),(2.2857142857142856 -4.285714285714286),(-0.5454545454545454 -7.454545454545455),(-3.333333333333333 -4.666666666666666)),LINESTRING(7 9,-5 3))
 ######################################################################################################
 # BUG#20120173 : ASSERTION FAILURE WITH GEOMETRY SET OPERATIONS IN ITEM_GEOFUNC.CC FILE
 ######################################################################################################
@@ -1405,7 +1405,7 @@
 # BUG#20142402 : ASSERTION FAILURE IN GIS_GEOMETRY_COLLECTION::APPEND_GEOMETRY FUNCTION
 ######################################################################################################
 # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(
+DO ST_ASTEXT(ST_SYMDIFFERENCE(
 ST_GEOMFROMTEXT('LINESTRING(6 -6,4 -2,5 -1,1 1,-10 10,-1 -10,-8 8,-4 -9,-4 -3,1 -9,5 -2,-4 0,3 5,0 -5)'),
 ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
                             'MULTIPOLYGON(((0 2,-5 -9,7 1,-10 2,-7 1,6 0,0 -4, 0 2)),'
@@ -1442,28 +1442,27 @@
                             'MULTILINESTRING((-3 -1,-8 -5,4 10),'
                                             '(-5 10,-5 -9,4 0,8 3,5 9)),'
                             'MULTIPOINT(0 -2,9 2,-6 0,8 -5,1 -2,8 0,9 6,-9 1,-5 -6,1 9,-6 -5,4 3,-2 -6))')));
-ERROR 22023: Invalid GIS data provided to function st_union.
 ######################################################################################################
 # BUG#20415950 : WL#7225 : ASSERTION FAILURE IN ITEM_GEOFUNC_SETOPS.CC FILE
 ######################################################################################################
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOLYGON(((2 -6,10 -4,1 8, 2 -6)),'
+# Invalid geometry in input
+DO ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOLYGON(((2 -6,10 -4,1 8, 2 -6)),'
                                                               '((-3 1,-7 2,3 -6,-1 2,3 8,-5 9,-10 9,9 9,4 4,-2 2,-5 8, -3 1)))'),
 ST_GEOMFROMTEXT('LINESTRING(-9 -6,7 -3,0 -5,-4 -9,-5 7,-7 7,8 -4,0 0,-5 2,2 8,1 -8,-5 3,-3 -9,-8 -2)')));
-ERROR 22023: Invalid GIS data provided to function st_intersection.
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('LINESTRING(-9 -6,7 -3,0 -5,-4 -9,-5 7,-7 7,8 -4,0 0,-5 2,2 8,1 -8,-5 3,-3 -9,-8 -2)'),
+# Invalid geometry in input
+DO ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('LINESTRING(-9 -6,7 -3,0 -5,-4 -9,-5 7,-7 7,8 -4,0 0,-5 2,2 8,1 -8,-5 3,-3 -9,-8 -2)'),
 ST_GEOMFROMTEXT('MULTIPOLYGON(((2 -6,10 -4,1 8, 2 -6)),'
                                                  '((-3 1,-7 2,3 -6,-1 2,3 8,-5 9,-10 9,9 9,4 4,-2 2,-5 8, -3 1)))')));
-ERROR 22023: Invalid GIS data provided to function st_intersection.
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOLYGON(((2 -6,10 -4,1 8, 2 -6)),'
+# Invalid geometry in input
+DO ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOLYGON(((2 -6,10 -4,1 8, 2 -6)),'
                                                               '((-3 1,-7 2,3 -6,-1 2,3 8,-5 9,-10 9,9 9,4 4,-2 2,-5 8, -3 1)))'),
 ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
-                                                       'LINESTRING(-9 -6,7 -3,0 -5,-4 -9,-5 7,-7 7,8 -4,0 0,-5 2,2 8,1 -8,-5 3,-3 -9,-8 -2)')));
-ERROR 22023: Invalid GIS data provided to function st_geomfromtext.
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
-                                                       'LINESTRING(-9 -6,7 -3,0 -5,-4 -9,-5 7,-7 7,8 -4,0 0,-5 2,2 8,1 -8,-5 3,-3 -9,-8 -2)'),
+                                                       'LINESTRING(-9 -6,7 -3,0 -5,-4 -9,-5 7,-7 7,8 -4,0 0,-5 2,2 8,1 -8,-5 3,-3 -9,-8 -2))')));
+# Invalid geometry in input
+DO ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
+                                                       'LINESTRING(-9 -6,7 -3,0 -5,-4 -9,-5 7,-7 7,8 -4,0 0,-5 2,2 8,1 -8,-5 3,-3 -9,-8 -2))'),
 ST_GEOMFROMTEXT('MULTIPOLYGON(((2 -6,10 -4,1 8, 2 -6)),'
                                                               '((-3 1,-7 2,3 -6,-1 2,3 8,-5 9,-10 9,9 9,4 4,-2 2,-5 8, -3 1)))')));
-ERROR 22023: Invalid GIS data provided to function st_geomfromtext.
 SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMWKB(ST_ASWKB(ST_GEOMFROMTEXT('MULTIPOLYGON(((7 0,-0.7654 0,-.3 -0.7654,-3 -2,0 7,8 3,7 0)))'))),
 ST_GEOMFROMWKB(ST_ASWKB(POLYGON(LINESTRING(POINT(4,9), POINT(0,2), POINT(-9.9,5), POINT(2.3,6), POINT(5,4), POINT(4,9)),
 LINESTRING(POINT(3,2), POINT(5,-.3), POINT(3,2)),
@@ -1559,7 +1558,8 @@
 LINESTRING(POINT(7,3),POINT(8,3),POINT(4,4),POINT(3,8),POINT(4.2,9),POINT(6,4),POINT(8,8),POINT(-.7,1),POINT(7,3))))),
 ST_GEOMFROMWKB(ST_ASWKB(POINT(5,+.1)))));
 ERROR 22023: Invalid GIS data provided to function polygon.
-SELECT ST_ASTEXT(
+#invalid geometry as input
+DO ST_ASTEXT(
 ST_SYMDIFFERENCE(
 ST_GEOMFROMTEXT(
 'GEOMETRYCOLLECTION('
@@ -1567,14 +1567,6 @@
                         'MULTIPOINT(7 -6,9 1,-4 2,1 -8,-7 -4,1 0,5 0,-3 -8,-6 0,-6 2,5 -6,1 2,4 8,-5 -7),'
                         'POINT(5 2))'),
 ST_GEOMFROMTEXT('MULTIPOLYGON(((5 -1,-2 7,-9 6,-4 2,4 -7,-2 1,9 2,-7 9,6 0,8 0,-5 -9,-8 2,-6 4,10 2,5 -1)))')));
-ST_ASTEXT(
-ST_SYMDIFFERENCE(
-ST_GEOMFROMTEXT(
-'GEOMETRYCOLLECTION('
-                        'LINESTRING(8 -2,-2 -10,8 5),'
-                        'MULTIPOINT(7 -6,9 1,-4 2,1 -8,-7 -4,1 0,5 0,-3 -8,-6 0,-6 2,5 -6,1 2,4 8,-5 -7),'
-                        '
-GEOMETRYCOLLECTION(MULTILINESTRING((8 -2,3.15625 -5.875),(3.064935064935065 -5.948051948051948,-2 -10,1.7142857142857144 -4.428571428571429),(1.8095238095238093 -4.285714285714286,1.8823529411764706 -4.176470588235294,4.4324324324324325 -0.35135135135135176,5.087719298245614 0.631578947368421),(6.67741935483871 3.016129032258065,8 5)),MULTIPOINT((-7 -4),(-3 -8),(1 -8),(1 2),(4 8),(5 -6),(7 -6),(9 1)),POINT(5 2),MULTIPOLYGON(((5 -1,-2 7,-9 6,-4 2,4 -7,-2 1,9 2,-7 9,6 0,8 0,-5 -9,-8 2,-6 4,10 2,5 -1))))
 SELECT ST_ASTEXT(
 ST_INTERSECTION(
 ST_GEOMFROMWKB(ST_ASWKB(
@@ -1585,7 +1577,8 @@
 ST_ASWKB(
 ST_GEOMFROMTEXT('MULTIPOINT(1 189.7654,41,-1032.34324 9,6.4 1,4 9)')))));
 ERROR 22023: Invalid GIS data provided to function polygon.
-SELECT ST_ASTEXT(
+#invalid geometry as input
+DO ST_ASTEXT(
 ST_SYMDIFFERENCE(
 ST_GEOMFROMTEXT(
 'GEOMETRYCOLLECTION('
@@ -1598,22 +1591,13 @@
 ST_GEOMFROMTEXT(
 'MULTIPOLYGON(((8 2,8 10,1 10, 8 2)),'
                                '((-10 9,1 -5,7 10,8 -6,7 -9,5 5,-8 -3,10 -6,6 -2, -10 9)))')));
-ST_ASTEXT(
-ST_SYMDIFFERENCE(
-ST_GEOMFROMTEXT(
-'GEOMETRYCOLLECTION('
-                        'GEOMETRYCOLLECTION(),'
-                        'MULTIPOINT(-5 -2,7 -4,5 -10,4 1,6 -3,-2 4,6 9),'
-                        'LINESTRING(8 4,0 -10,-10 10,-2 -9),'
-   
-GEOMETRYCOLLECTION(MULTIPOINT((-2 4),(4 1),(5 -10),(7 -4)),MULTILINESTRING((7.436619718309859 3.014084507042254,7.3086419753086425 2.7901234567901234,5.714285714285714 0),(2.9565217391304346 -4.826086956521738,0 -10,-3.0909090909090917 -3.8181818181818183),(-4.5588235294117645 -0.8823529411764706,-8.625 7.25),(-9.238095238095237 8.476190476190476,-10 10,-9.407407407407408 8.592592592592593),(-9.092783505154639 7.845360824742269,-5.241157556270096 -1.302250803858521),(-4.264150943396226 -3.6226415094339623,-2 -9),(-3.3164556962025316 0.49367088607594933,-3.9375 -0.5),(-5.735849056603774 -3.3773584905660377,-8 -7,-7.04 -3.16),(-6.818181818181818 -2.2727272727272725,-6 1,-7 0,-8.390243902439025 6.951219512195122),(-8.608695652173914 8.043478260869565,-9 10,-8.319327731092438 7.844537815126051),(-7.800000000000001 6.199999999999999,-5.4 -1.4),(-4.722222222222221 -3.5462962962962963,-3 -9,-0.7628865979381443 -4.206185567010309),(-3 -9,-0.33840304182509495 -3.2965779467680605),(1.659305993690852 0.9842271293375386,2.942446043165468 3.7338129496402876,4 6,4.64 5.84),(5.2727272727272725 5.681818181818182,7.301587301587301 5.174603174603175),(7 -10,2.5436893203883493 -4.757281553398059),(7 -10,1.5599999999999996 -3.5999999999999996),(-2.058080808080808 0.6565656565656566,-7.954887218045113 7.593984962406015,-10 10,-9.567567567567568 8.702702702702702),(-9.421052631578947 8.263157894736842,-9 7,-8.777777777777779 7.444444444444445),(-8.511627906976745 7.976744186046512,-8 9,-7.7238493723849375 7.435146443514644),(-7.4206896551724135 5.7172413793103445,-6.089795918367347 -1.8244897959183672),(-5.818181818181818 -3.3636363636363633,-5 -8,-4.205882352941177 -3.632352941176471),(-3.5984251968503935 -0.2913385826771657,-3.429530201342282 0.6375838926174495),(0.12658227848101244 2.037974683544304,0.16666666666666652 2.0256410256410255),(3.410958904109589 1.0273972602739727,5.666666666666666 0.3333333333333335,7.642156862745098 -0.27450980392156854),(7.581521739130435 0.6956521739130435,5.8 -0.6000000000000001),(0.5454545454545459 -4.421487603305785,0.5423728813559325 -4.423728813559322,-3 -7),(7.8478260869565215 -3.5652173913043477,7.684210526315789 -3.6842105263157894),(5.52542372881356 -5.254237288135593,-1 -10,-1.7446808510638299 -4.042553191489362),(-1 -10,-2 -2,-1.6400000000000001 -1.6400000000000001),(-1.6382978723404256 0.9148936170212767,-2.6486486486486487 3.9459459459459456,-4 8,-9 9,-8.870588235294118 8.223529411764705),(-8.73076923076923 7.384615384615385,-7.093023255813954 -2.441860465116279),(-6.9714285714285715 -3.171428571428571,6.771929824561403 -7.403508771929825,7.565217391304348 -7.304347826086957),(10 -7,8.551724137931034 -5.758620689655173),(7.952830188679245 -5.245283018867925,6.2558139534883725 -3.7906976744186043),(-0.23880597014925353 1.7761194029850742,-3.2631578947368425 4.368421052631579,-4 5,3.258064516129032 7.419354838709677),(6.384615384615385 8.461538461538462,7.081632653061224 8.693877551020408)),MULTIPOLYGON(((8 2,8 10,1 10,8 2)),((-10 9,1 -5,7 10,8 -6,7 -9,5 5,-8 -3,10 -6,6 -2,-10 9))))
 SELECT ST_ASTEXT(
 ST_INTERSECTION(
 ST_GEOMFROMTEXT('MULTIPOLYGON(((2 9,-2 9,-3 -5)),((-10 6,1 6,3 -4,-1 6)))'),
 ST_GEOMFROMTEXT('MULTIPOINT(8 -2,-2 -5,9 -9,-4 -10,-9 -4,10 -3,9 10,-1 -5,-3 3)')));
 ERROR 22023: Invalid GIS data provided to function st_geomfromtext.
 # Invalid geometry in input.
-SELECT ST_ASTEXT(
+DO ST_ASTEXT(
 ST_SYMDIFFERENCE(
 ST_GEOMFROMTEXT('MULTIPOLYGON(((-2 3,3 2,-7 4,-8 -4,-8 8,4 3,-10 -4,0 6,-4 7,-9 3,-6 0,-1 -8,-5 -3,2 -6,-7 -7, -2 3)),'
                                          '((-8 -9,-4 7,-5 5,6 -9,-6 -4,-1 6,-7 8,-2 0,1 -4,-9 -5,2 -3,0 6,8 -6, -8 -9)),'
@@ -1623,11 +1607,6 @@
 ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
                                   'LINESTRING(0 1,8 -9,-1 0,-9 -3,-9 10,-9 2,1 -4,-6 1,1 9,-9 -6,5 -7,3 10,2 -1,8 -4),'
                                   'POINT(4 8))')));
-ST_ASTEXT(
-ST_SYMDIFFERENCE(
-ST_GEOMFROMTEXT('MULTIPOLYGON(((-2 3,3 2,-7 4,-8 -4,-8 8,4 3,-10 -4,0 6,-4 7,-9 3,-6 0,-1 -8,-5 -3,2 -6,-7 -7, -2 3)),'
-                                         '((-8 -9,-4 7,-5 5,6 -9,-6 -4,-1 6,-7 8,-2 0,1 -4,-9 -5,2 -3,0 6,
-GEOMETRYCOLLECTION(MULTIPOLYGON(((-2 3,-7 -7,2 -6,-5 -3,-1 -8,-6 0,-9 3,-4 7,0 6,-10 -4,4 3,-8 8,-8 -4,-7 4,3 2,-2 3)),((-8 -9,8 -6,0 6,2 -3,-9 -5,1 -4,-2 0,-7 8,-1 6,-6 -4,6 -9,-5 5,-4 7,-8 -9)),((-4 -5,-10 8,-1 -1,-5 -7,-5 5,0 6,10 1,6 -9,8 -4,6 7,-10 2,10 -8,0 -7,-4 -5)),((4 -9,7 -5,3 -6,4 -9)),((-8 -4,5 4,-3 8,-10 -2,-3 -3,5 -8,9 -8,3 7,8 -1,8 4,-8 -4))),MULTILINESTRING((0.0412 0.9484,0.5714 0.2857),(5.3333 -5.6666,5.9130 -6.3913,5.9354 -6.4193,6.6666 -7.3333),(7.2 -8,8 -9,7 -8),(6.6666 -7.6666,6.5714 -7.5714),(4.6 -5.6,4 -5),(2 -3,-0.6666 -0.3333,-1 0,-1.0551 -0.0206),(-1.7272 -0.2727,-1.7804 -0.2926),(-3.8571 -1.0714,-4.0769 -1.1538,-4.6923 -1.3846,-5 -1.5),(-6.2413 -1.9655,-7.3448 -2.3793,-7.8196 -2.5573),(-8 -2.625,-9 -3,-9 -2.1428),(-9 -0.5714,-9 1.5),(-9 2.3125,-9 3),(-9 5.8333,-9 7),(-9 7,-9 5.8333),(-9 2,-8 1.4),(-9 2,-7.7323 1.2394),(-7.3720 1.0232,-6.5531 0.5319,-6.5 0.5,-5.875 0.125),(-5 -0.3999,-4.3846 -0.7692),(-3.5569 -1.2658,-3.0909 -1.5454),(0.0869 -3.3478,-1.3333 -2.3333),(-1.7096 -2.0645,-2.7058 -1.3529,-3.1652 -1.0247),(-3.7894 -0.5789,-4.1578 -0.3157,-5 0.2857),(-5.4166 0.5833,-5.5757 0.6969,-6 1,-5.3 1.8),(-5 2.1428,-4.6 2.6),(-4.0312 3.25,-3.9148 3.3829),(-3.8172 3.4946,-3.2903 4.0967,-2.0458 5.5190,-1.9696 5.6060),(-0.8260 6.9130,1 9,-0.5 6.75),(-0.8571 6.2142,-1.1538 5.7692,-1.4782 5.2826),(-2.8823 3.1764,-3 3),(-3.8 1.7999,-5 0),(-5.25 -0.375,-5.5161 -0.7741),(-6.2 -1.7999,-6.5 -2.25,-6.6521 -2.4782,-7.4347 -3.6521,-7.5 -3.75),(-8.2857 -4.9285,-9 -6,-7.2807 -6.1228),(-9 -6,-6.5862 -6.1724),(-5 -6.2857,-4.5454 -6.3181),(-2.3043 -6.4782,-2.2121 -6.4848),(-1.9345 -6.5046,-0.8333 -6.5833,0.4137 -6.6724),(3.3103 -6.8793,4.3945 -6.9567,5 -7,4.9496 -6.5719),(4.8285 -5.5428,4.8125 -5.4062),(4.2142 -0.3214,3.9444 1.9722,3.8333 2.9166),(3.8144 3.0773,3.7932 3.2573),(3.625 4.6875,3.5 5.75,3.4468 6.2021,3.4347 6.3043),(3 10,2.6315 5.9473),(3 10,2.5652 5.2173),(2.5217 4.7391,2.4233 3.6569),(2.3037 2.3407,2.2857 2.1428),(6 -3,7.25 -3.625,8 -4)),POINT(4 8))
 SELECT ST_ASTEXT(
 ST_INTERSECTION(
 ST_GEOMFROMTEXT('MULTILINESTRING((3 -.7),(4 -1032.34324),(2 1,8 7),(7 5,-4 8,2.2 8,2 8,6 7))'),
@@ -1687,7 +1666,7 @@
 ST_GEOMFROMWKB(ST_ASWKB(ST_GEOMFROMTEXT('POLYGON((1 5,+.8 -0.7654,1 5))')))));
 ERROR 22023: Invalid GIS data provided to function st_geomfromtext.
 # Invalid geometry in input
-SELECT ST_ASTEXT(
+DO ST_ASTEXT(
 ST_SYMDIFFERENCE(
 ST_GEOMFROMTEXT('POLYGON((0 4,-8 -1,1 9,0 4))'),
 ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
@@ -1708,7 +1687,6 @@
                             'MULTILINESTRING((6 -5,-3 3,-6 8,9 -7,3 10,-9 -9,1 2,8 -9),'
                                             '(5 -10,6 -10,9 10,-1 -5,-8 4,-7 1,8 1,-2 9,3 5,-10 3,6 5,-9 7,-7 -7,-2 2,1 5),'
                                             '(-6 0,10 -1,2 4,9 3,1 -5),(6 8,-10 1,-3 3,10 6)),POINT(-3 0))')));
-ERROR 22023: Invalid GIS data provided to function st_union.
 SELECT ST_ASTEXT(
 ST_INTERSECTION(
 ST_GEOMFROMWKB(ST_ASWKB(ST_GEOMFROMTEXT('POLYGON((1 3,+.5 -1032.34324,1 3))')),0),
@@ -1817,29 +1795,17 @@
 # BUG#20379857 : ASSERTION `ENTER_COUNT == 0' FAILED
 ######################################################################################################
 # Invalid geometry in input.
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(
+DO ST_ASTEXT(ST_SYMDIFFERENCE(
 ST_GEOMFROMTEXT('POLYGON((-4 0,7 -8,-5 1,1 9,-9 -7,9 6,-6 -9,-4 0))'),
 ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
                         'MULTILINESTRING((5 8,-5 -8,3 -7,-2 -7,6 2,6 3,6 10,7 7,1 0,-6 -1,8 -4,-2 1,9 -10,4 -2)),'
                         'LINESTRING(-1 -2,10 -7,8 -5))')));
-ST_ASTEXT(ST_SYMDIFFERENCE(
-ST_GEOMFROMTEXT('POLYGON((-4 0,7 -8,-5 1,1 9,-9 -7,9 6,-6 -9,-4 0))'),
-ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
-                        'MULTILINESTRING((5 8,-5 -8,3 -7,-2 -7,6 2,6 3,6 10,7 7,1 0,-6 -1,8 -4,-2 1,9 -10,4 -2)),'
-   
-GEOMETRYCOLLECTION(POLYGON((-4 0,7 -8,-5 1,1 9,-9 -7,9 6,-6 -9,-4 0)),MULTILINESTRING((-1 -2,0.375 -2.625),(-0.5696202531645591 -0.9113924050632936,-1.1702127659574466 -1.872340425531915),(-1.25 -2,-5 -8),(-5 -8,3 -7,-2 -7,0.9938650306748467 -3.6319018404907975),(1.0666666666666669 -3.55,6 2,6 3,6 3.8333333333333335),(1.5 0.583333333333333,1 0,0.6164383561643836 -0.0547945205479452),(1 0,0.6164383561643836 -0.054794520547945216),(-3.17910447761194 -0.5970149253731343,-4.163934426229508 -0.7377049180327869),(-5.176470588235294 -0.8823529411764706,-6 -1,-5.338582677165355 -1.141732283464567),(-1.9067796610169485 -1.8771186440677967,-1.906779661016949 -1.8771186440677967,-1.215189873417724 -2.0253164556962022),(-0.8666666666666663 -2.1,0.5882352941176467 -2.4117647058823533),(2 -1,0.40909090909090917 -0.20454545454545459),(-0.29032258064516125 -0.7096774193548387,1 -2),(7 -8,9 -10,4 -2)))
 # Invalid geometry in input.
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(
+DO ST_ASTEXT(ST_SYMDIFFERENCE(
 ST_GEOMFROMTEXT('POLYGON((-4 0,7 -8,-5 1,1 9,-9 -7,9 6,-6 -9,-4 0))'),
 ST_GEOMFROMTEXT('MULTILINESTRING((5 8,-5 -8,3 -7,-2 -7,6 2,6 3,6 10,7 7,1 0,-6 -1,8 -4,-2 1,9 -10,4 -2),(-1 -2,10 -7,8 -5))')));
-ST_ASTEXT(ST_SYMDIFFERENCE(
-ST_GEOMFROMTEXT('POLYGON((-4 0,7 -8,-5 1,1 9,-9 -7,9 6,-6 -9,-4 0))'),
-ST_GEOMFROMTEXT('MULTILINESTRING((5 8,-5 -8,3 -7,-2 -7,6 2,6 3,6 10,7 7,1 0,-6 -1,8 -4,-2 1,9 -10,4 -2),(-1 -2,10 -7,8 -5))')))
-GEOMETRYCOLLECTION(POLYGON((-4 0,7 -8,-5 1,1 9,-9 -7,9 6,-6 -9,-4 0)),MULTILINESTRING((-0.5696202531645573 -0.9113924050632907,-1.1702127659574466 -1.872340425531915),(-1.25 -2,-5 -8),(-5 -8,3 -7,-2 -7,0.9938650306748467 -3.6319018404907975),(1.0666666666666669 -3.55,6 2,6 3,6 3.8333333333333335),(1.5 0.583333333333333,1 0,0.6164383561643836 -0.0547945205479452),(1 0,-2.92 -0.56),(-3.17910447761194 -0.5970149253731343,-4.163934426229508 -0.7377049180327869),(-5.176470588235294 -0.8823529411764706,-6 -1,-5.338582677165355 -1.141732283464567),(-4.303030303030303 -1.3636363636363635,-1.906779661016949 -1.8771186440677967,-1.215189873417721 -2.0253164556962027),(-0.8666666666666663 -2.1,0.5882352941176467 -2.4117647058823533),(2 -1,0.40909090909090917 -0.20454545454545459),(-0.29032258064516125 -0.7096774193548387,1 -2),(7 -8,9 -10,4 -2),(-1 -2,0.375 -2.625)))
 # Invalid geometry in input.
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POLYGON((-4 0,7 -8,-5 1,1 9,-9 -7,9 6,-6 -9,-4 0))'), ST_GEOMFROMTEXT('LINESTRING(-1 -2,10 -7,8 -5)')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POLYGON((-4 0,7 -8,-5 1,1 9,-9 -7,9 6,-6 -9,-4 0))'), ST_GEOMFROMTEXT('LINESTRING(-1 -2,10 -7,8 -5)')))
-GEOMETRYCOLLECTION(POLYGON((-4 0,7 -8,-5 1,1 9,-9 -7,9 6,-6 -9,-4 0)),LINESTRING(-1 -2,0.375 -2.625))
+DO ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POLYGON((-4 0,7 -8,-5 1,1 9,-9 -7,9 6,-6 -9,-4 0))'), ST_GEOMFROMTEXT('LINESTRING(-1 -2,10 -7,8 -5)')));
 ######################################################################################################
 # BUG#20422341 : ST_ISSIMPLE(MULTILINESTRING) RETURNS INCORRECT RESULT
 ######################################################################################################
@@ -1852,7 +1818,8 @@
 ######################################################################################################
 # BUG#20430837 : WL#7225: BOOST_ASSERT( ENTER_COUNT == 0 )
 ######################################################################################################
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(
+#invalid geometry as input
+DO ST_ASTEXT(ST_SYMDIFFERENCE(
 ST_GEOMFROMTEXT('MULTIPOLYGON(((7 -6,-2 8,-5 -4,2 7,4 9,0 -9,8 2,5 -2,9 0,-6 1,10 -10,7 -6)),'
                                  '((-7 -4,9 3,-9 8,0 -4,5 -9,-7 -4)),'
                                  '((-10 1,-5 -3,1 -1,-9 -5,10 -9,9 -7,-4 9,8 0,2 0,-10 1)))'),
@@ -1861,11 +1828,6 @@
                         'MULTIPOINT(3 1,-5 10,-5 -6,7 -10,5 -5,-10 -7,-8 7,9 0,6 -4,5 7),'
                         'LINESTRING(5 -8,-7 -6,-3 6,-3 1,-5 4,-1 0,8 5,5 1,-2 3,1 10,8 5,6 2,7 4),'
                         'MULTIPOINT(0 1,-7 -7,-3 -2,6 -1,-9 -9,2 6,-9 -6,-4 0,0 10))')));
-ST_ASTEXT(ST_SYMDIFFERENCE(
-ST_GEOMFROMTEXT('MULTIPOLYGON(((7 -6,-2 8,-5 -4,2 7,4 9,0 -9,8 2,5 -2,9 0,-6 1,10 -10,7 -6)),'
-                                 '((-7 -4,9 3,-9 8,0 -4,5 -9,-7 -4)),'
-                                 '((-10 1,-5 -3,1 -1,-9 -5,10
-GEOMETRYCOLLECTION(MULTIPOLYGON(((7 -6,-2 8,-5 -4,2 7,4 9,0 -9,8 2,5 -2,9 0,-6 1,10 -10,7 -6)),((-7 -4,9 3,-9 8,0 -4,5 -9,-7 -4)),((-10 1,-5 -3,1 -1,-9 -5,10 -9,9 -7,-4 9,8 0,2 0,-10 1))),MULTIPOINT((-10 -7),(-5 -6),(-5 10),(5 7),(7 -10)),MULTILINESTRING((3.8 -7.8,1.189189189189189 -7.364864864864865),(0.39285714285714324 -7.232142857142857,-7 -6,-6.819672131147541 -5.459016393442623),(-6.414634146341464 -4.2439024390243905,-6.3076923076923075 -3.9230769230769234,-6.219512195121951 -3.658536585365854),(-4.8108108108108105 0.5675675675675675,-4.695652173913043 0.9130434782608692,-4.384615384615385 1.8461538461538458),(-3 6,-3 4),(-3.5454545454545454 1.8181818181818183,-5 4,-3.4 2.4),(-1.8888888888888888 0.8888888888888888,-1.7142857142857144 0.7142857142857144),(-0.6086956521739131 0.21739130434782608,0.0714285714285714 0.5952380952380952,1.9712918660287082 1.6507177033492824,2.0526315789473686 1.695906432748538,2.4225352112676055 1.9014084507042253),(5.933333333333334 3.8518518518518516,8 5,6.931034482758621 3.574712643678161),(5.6 1.7999999999999998,5.279069767441861 1.3720930232558142,5 1,4.654320987654321 1.0987654320987654),(2.388059701492537 1.7462686567164178,1.9375 1.875),(-1.0071942446043165 5.316546762589928,-0.8297872340425532 5.7304964539007095,-0.7142857142857142 6,-0.5405405405405406 6.405405405405405),(3.3333333333333335 8.333333333333334,3.780821917808219 8.013698630136986),(8 5,7.03125 3.546875),(6.804878048780488 3.6097560975609757,7 4)),MULTIPOINT((-9 -9),(-9 -6),(-7 -7),(0 10)))
 SELECT ST_ASTEXT(ST_DIFFERENCE(
 ST_GEOMFROMTEXT('LINESTRING(5 -8,-7 -6,-3 6,-3 1,-5 4,-1 0,8 5,5 1,-2 3, 1 10,8 5,6 2,7 4)'),
 ST_GEOMFROMTEXT('MULTILINESTRING((1.9375 1.875,1.7441860465116283 1.9302325581395348,-0.7692307692307692 2.6483516483516487,'
@@ -1907,7 +1869,8 @@
 ST_GEOMFROMTEXT('LINESTRING(-2 -2,-4 0,1 -8,-2 6,8 5,-7 -8,3 0,4 -1,-7 10,-4 10)'),
 ST_GEOMFROMTEXT('LINESTRING(-5 -4,3 0,4 -1,7 -4,2 -1,-4 -1,-2 6)')))
 MULTILINESTRING((-2 -2,-4 0,1 -8,-2 6,8 5,-7 -8,3 0),(3 0,-7 10,-4 10),(-5 -4,3 0),(4 -1,7 -4,2 -1,-4 -1,-2 6))
-SELECT ST_ASTEXT(ST_INTERSECTION(
+# Invalid geometry in input.
+DO ST_ASTEXT(ST_INTERSECTION(
 ST_GEOMFROMWKB(
 ST_ASWKB(
 ST_GEOMFROMTEXT('MULTILINESTRING((1 5, -4.3 -.1),'
@@ -1927,14 +1890,8 @@
                                       '(5 2,2 3,9 5,6 1,10.0002 2.232432,-6.2 9,8 10.0002,9 3.0,5 -8.7,5 2))),'
                         'MULTILINESTRING((5 10.0002,2 7,-0.7654 0,5 3),'
                                         '(0 -0.7654,4 10.0002,4 +.1,-.8 3,-.1 8,10.0002 2,+.9 -1032.34324)))')));
-ST_ASTEXT(ST_INTERSECTION(
-ST_GEOMFROMWKB(
-ST_ASWKB(
-ST_GEOMFROMTEXT('MULTILINESTRING((1 5, -4.3 -.1),'
-                                            '(0 6,8.6 6,189.7654 5,1 3,6 3,3 5,6 2.232432,0 4),'
-                                            '(-6 5,1 2
-GEOMETRYCOLLECTION(POINT(-1.3068033885057968 6.95588691462719),POINT(-1.250432813361253 9.348630781695498),POINT(-0.5326974515460634 -0.629698715046247),POINT(-0.3237169258807251 2.7557858007322666),POINT(-0.3093463318554086 2.9885894239423596),POINT(-0.2870773950336814 3.3493462004543613),POINT(-0.27224727752722444 3.5895941040589596),POINT(-0.26002971768202054 3.7875185735512633),POINT(0.19922180034015047 2.5490331600680305),POINT(0.20348293501690584 8.213958459413115),POINT(0.20670833865183072 6.559793242463126),POINT(0.20706121970032634 6.3788163408990215),POINT(0.20779986151819596 5.999999999999999),POINT(0.21087723180606566 4.421754463612131),POINT(0.21122968964554562 4.240994607017413),POINT(0.21182127180948937 3.9375985830383744),POINT(0.2126701994349945 3.502221585687387),POINT(0.2136823839732358 2.983117422044227),POINT(0.21373120040140098 2.9580816601363997),POINT(0.21454060039978828 2.5429766142332513),POINT(0.21523554423848199 2.186571011767442),POINT(0.21538050637760223 2.1122264163466085),POINT(0.2185007981672563 0.5119683620393687),POINT(0.39436697479256644 8.039435908761082),POINT(0.4375000000000009 8),POINT(0.4460055443973996 -116.16503721642789),POINT(0.5720091516699135 8.057199771171568),POINT(0.6163999319893212 2.9818945936617283),POINT(0.8122406639004149 3.394190871369295),POINT(0.9813981034250419 6),POINT(1 2.232432),POINT(1.0000224788601089 5.9922197425210015),POINT(1.0053012917379935 4.165146520195549),POINT(1.00865931451096 3.0028864381703197),POINT(1.0150805760981134 0.7803952510726049),POINT(1.0388693195486667 3.8833920413539995),POINT(1.0412371134020617 3.876288659793815),POINT(1.2569493468662905 2.972202612534838),POINT(1.3 3.1),POINT(1.5230208408561547 1.9079166365753808),POINT(1.5923914063484486 4.76304343746062),POINT(1.6756969713169383 1.2972121147322464),POINT(1.7017543859649122 3.2339181286549707),POINT(2 3),POINT(2.28326548655475 1.3412256626058738),POINT(2.3207547169811322 1.5849056603773581),POINT(2.3435512850038953 1.7330833525253189),POINT(2.370748356394707 6),POINT(2.386740331491713 3.110497237569061),POINT(2.403519711951156 1.2472751700426596),POINT(2.412406123379353 2.180639801965793),POINT(2.5321325326209725 2.958861462036321),POINT(2.540973363458562 3.0163268624807147),POINT(2.550910316925152 3.080917060013486),POINT(2.6887552170098443 1.6595295465330486),POINT(2.953757225433526 5.699421965317919),POINT(3 6),POINT(3.0067352148266244 6),POINT(3.009100471227746 5.648822426306062),POINT(3.018909545454914 4.192436181818035),POINT(3.0202739190800645 3.989863040459968),POINT(3.0262101246182627 3.1084946370747915),POINT(3.02679622572439 3.0214742344277536),POINT(3.026796475292346 3.0214371802338764),POINT(3.0272528247444535 2.9536814420941813),POINT(3.0307335913939544 2.4368803096727456),POINT(3.033663567232252 2.001856941640744),POINT(3.033831569455859 1.9769130864064213),POINT(3.0364682172170467 1.5854411246265734),POINT(3.0421060737811922 0.7483695969510409),POINT(3.0435512346111793 0.5338017075536241),POINT(3.0498391451947966 -0.39978552692639546),POINT(3.0516129643768455 -0.663150427335685),POINT(3.22810602509037 -796.1565697664814),POINT(3.257735784867088 0.5799055159509486),POINT(3.420244763820535 0.452942836940772),POINT(3.5555555555555554 3.4444444444444446),POINT(4.007785622525587 4.735738859405178),POINT(4.132774777756052 2.5487432499511145),POINT(4.17391304347826 4.583850931677019),POINT(4.184712625258058 3.8216551503096703),POINT(4.3686805736779 4.087546284214733),POINT(4.38014506152931 4.104116049223448),POINT(4.428571428571429 4.142857142857142),POINT(4.576032868900963 3.5460739550271665),POINT(4.584905660377359 3.566037735849057),POINT(4.957703927492448 4.7492447129909365),POINT(5 1.4359928939902957),POINT(5.000958495470734 4.801150194565025),POINT(5.001920672853931 4.601536538283199),POINT(5.005671512443617 3.823386045765801),POINT(5.006447650211121 3.6623682331926375),POINT(5.007727215776458 3.3969091136893894),POINT(5.008933207833419 3.1467135799541666),POINT(5.009435631356616 3.042480620191782),POINT(5.009640396364852 3),POINT(5.009963648324956 2.9329380353522083),POINT(5.011937172407166 2.5235100393406356),POINT(5.017203083598111 1.4310422627786465),POINT(5.0184945033490065 1.1631238697955268),POINT(5.019096693039546 1.0381933860792287),POINT(5.027386389591994 -0.6815899586538308),POINT(5.038811021211276 -3.051748028281736),POINT(5.153811622682032 3.0440103072139495),POINT(5.285714285714286 5.142857142857143),POINT(5.395321452430659 1.0828320372418117),POINT(5.411764705882353 3.235294117647059),POINT(5.6615415557907065 2.926121133261659),POINT(5.666666666666667 6),POINT(5.750265604998302 3.0503298338042706),POINT(5.790142575524733 3.106155359520246),POINT(6.06556854930577 3.0536705195899865),POINT(6.097893693429729 2.9215559542319918),POINT(6.3076923076923075 4.769230769230769),POINT(6.433333333333334 4.266666666666667),POINT(6.562970132999666 -5.083960177332983),POINT(6.581467724157924 -0.6960939149653314),POINT(6.587895790751739 0.8287260628328568),POINT(6.588528668432964 0.9788527794357833),POINT(6.589763454480116 1.2717598931881184),POINT(6.594396750598089 2.3708372565959053),POINT(6.596696373737318 2.9163374086133445),POINT(6.597299068253058 3.0593042905984476),POINT(6.59958542838319 3.6016582864672273),POINT(6.611170446274414 0.8237668507898244),POINT(6.666666666666667 6),POINT(6.826605423768893 -373.94819977080806),POINT(6.851694915254237 2.1355932203389836),POINT(6.98889569410794 1.5910529131698257),POINT(7.233062330623306 -2.168292682926829),POINT(7.985622025683107 3.0740137972921215),POINT(8.15490202638159 0.5280884271661537),POINT(8.177611896515856 0.4899997066562394),POINT(8.182127406208988 0.5202536216002172),POINT(8.253731343283583 1),POINT(8.275939597269154 6.586131990897179),POINT(8.525404608739807 2.820210878556703),POINT(8.54865385265276 2.838809529741019),POINT(8.962933842995367 2.891581490761452),POINT(8.982721744049384 -2.9728484549347467),POINT(10.0002 -1032.34324),POINT(-0.7894269180314115 2.9936120963106445),POINT(-0.7566506759703445 3.309638028783253),POINT(-0.7065026362038664 3.6678383128295255),POINT(-0.7053428345352559 3.676122610462458),POINT(-0.5322427770870091 2.8382300111567345),POINT(0.048405275947358994 -0.6351220403152757),POINT(0.10749009908434837 2.209528709622637),POINT(0.23588693775379155 2.5345369799220876),POINT(0.502294295440373 7.6422084936296075),POINT(0.5912311307833158 3.434012408867871),POINT(0.6191428705587008 2.142601182370785),POINT(0.6231653577819406 0.9117872439343158),POINT(0.6237828169691946 0.7228550405709191),POINT(0.7298834721962262 3.7849802218028437),POINT(0.9225495059559787 1.7175497403299207),POINT(1.0043920788723937 4.479838197767776),POINT(1.011679851207373 1.9574351515393573),POINT(1.0118303293156554 1.9053525093718235),POINT(1.0146591820584798 0.9262458018827147),POINT(1.1812448804366062 4.9275020478253575),POINT(1.3644094598868468 2.90677162033946),POINT(1.3882103518465296 2.97082934095975),POINT(1.3990488221743331 3),POINT(1.43457260366905 7.088390762359726),POINT(1.604942857142857 6),POINT(1.7007312147193645 1.283240303215405),POINT(1.871304347826087 1.3860869565217393),POINT(1.8756165050639775 6.685150623941507),POINT(1.9943714821763603 4.602251407129456),POINT(2.0600461893764432 1.2720554272517324),POINT(2.0949344815723228 1.4883622029203474),POINT(2.5137103366277773 6),POINT(2.5419298092694866 6.075949888667898),POINT(3.160359289329147 -775.4271995955245),POINT(3.2336465227304965 -767.0972558089059),POINT(3.266733333333333 6),POINT(4 1.7237686978764892),POINT(4 2.9435044207790746),POINT(4 3.8),POINT(4 4.077477333333333),POINT(4 4.742857142857143),POINT(5.0642816882081485 -559.0243444093659),POINT(5.094956799689188 4.913948159627026),POINT(5.265670276474132 4.812536221179306),POINT(6.476721471593684 4.093114113625265),POINT(7.087453458422117 -329.0674155638844),POINT(8.565495871140024 2.8522826056077957),POINT(9.098259943108358 -100.51594478484922),MULTILINESTRING((-0.7653999999999996 8.881784197001252e-16,-0.7654 0,5 3),(0.7984790874524714 4.806083650190114,0.21122968964554634 4.240994607017228),(0.20779986151819552 6.000000000000227,0.5 6),(1.959700171718825 6,2.05 6),(3.006735214826623 6.000000000000227,3.2727272727272725 6,5.3446750972261565 6,5.640054397824088 5.999999999999999),(7.857257142857143 6,8.571440815976686 6,8.6 6,8.99967072990898 5.997793890390168),(8.6 6,189.7654 5,8.987909888345353 3.0846331996048573),(8.56420058670109 3.0801439308973055,7.985622025683106 3.074013797292121,7.552065143908058 3.0694201918774104),(6.597299068253058 3.0593042905983094,6.06556854930577 3.0536705195899856),(5.348691697728959 3.046075093186876,5.153811622682031 3.0440103072139504),(5.009435631356617 3.042480620191588,4.349104133767298 3.035484300976422,3.6355363469936135 3.0279239346510916),(2.0385111797954947 3.011003194227284,1.2493395517616932 3.0026417929531757,1 3),(1 3,1.25 3),(2.5384615384615383 3,3.0269408593064977 3,3.616216 3,4.333333333333334 3),(5.181818181818182 3,5.333333333333333 3),(5.714314285714286 3,6 3,5.806473464858518 3.1290176900943214),(5.454545454545455 3.3636363636363633,5.00644765021112 3.662368233192586,4.8 3.8,4.714285714285714 3.857142857142857,4.578947368421053 3.9473684210526314),(4.333333333333333 4.111111111111111,3.0135311866190753 4.990979208920617),(3.013554649957279 4.987495528175677,4.0616928480122985 4.020564282670766),(4.220788028120986 3.873795372863086,4.418832382925834 3.6910949665502386),(5.2015078273876965 2.9690591283907626,5.294441808196902 2.8833254245907063),(5.497296552036384 2.696187325357923,6 2.232432,5.594194449425349 2.3519801509030223),(6 2.232432,5.311014836272068 2.4354033546467093),(5.159967073339523 2.479901220018568,5.011937172407167 2.523510039340435,4.2246414098172025 2.7554431720887047,3.578674942152815 2.945741448308139),(2.7079171620240383 3.2022620462925824,2.575576742767682 3.241248827989936),(2.1233856960245974 3.374461898674866,1.0795040326672316 3.6819838693310745,0.9649694452659672 3.715725147928354,0.9383071519877015 3.7235797173292338,0.7972370128659554 3.765138227940425),(-0.3237169258807242 2.7557858007322658,0.17057191599583205 2.56036037479875,0.19922180034015025 2.5490331600680296),(0.21454060039978806 2.542976614233339,0.37734024032055036 2.4786110322537906),(6.242571337505677 -474.43547325137604,6.826605423768893 -373.9481997708082),(8.982721744049384 -2.972848454934746,9 0),(9 0,189.7654 1,8.962933842995369 2.891581490761455),(8.536722473971128 2.8960405756065573,8.408441507515107 2.897382669588586,7.430708887013444 2.907611849351259),(6.596696373737318 2.916337408613302,6.097893693429729 2.9215559542319927),(5.309933236744222 2.929799710232665,5.225931834987745 2.9306785450192585),(5.009963648324956 2.932938035352371,4.3067976265507335 2.94029465973915,3.580166200685639 2.9478967825695905),(2.1101717707519874 2.963276076416004,1.2569493468662902 2.972202612534839,1 2.9748908536795886,0.6149864872883697 2.978918920607094,0.47067814990151646 2.9804286952565526,0.3895121129291965 2.98127786604763),(-1.4 3,-1.306803388505795 6.9558869146271896),(-1.2504328133612521 9.348630781695498,0.31147540983606553 9.91822950819672,0.3751862474892954 9.463133893291465),(0.5800167993280267 8,0.85246534186352 6.05386113944861,1.3638480456882514 4.8544607817247,1.4831932773109244 4.80672268907563),(2.7391304347826084 4.304347826086957,3.018909545454913 4.192436181818039,3.727272727272727 3.909090909090909),(4.132938081864926 3.74682476725403,4.333333333333334 3.666666666666667),(4.902439024390244 3.4390243902439024,5.007727215776458 3.396909113689417),(5.7778019750935545 3.0888792099625784,6 3,5.64 2.2800000000000002),(5.019096693039545 1.0381933860790902,5 1),(5 1,5.019280792729704 1),(5.1355938277179325 1,6 1),(6.454545454545455 1,6.568050583356943 1,6.588617817148249 1),(8.316239316239315 1,9 1),(4.46857804565248 -501.90067007298705,0.4460055443973996 -116.16503721642778),(-0.6865879576035461 -7.5575053130871765,-0.7261514394429778 -3.7636533189761394),(-0.7653999999999996 8.881784197001252e-16,-0.7055293317678581 0.031153433360465096),(-0.48481473565998395 0.14600128230826104,0.21850079816725643 0.5119683620393971,1 0.9186179623269854),(2.324260118172246 1.6076907681195998,2.837760148563958 1.8748882030200635,3.0338315694558604 1.9769130864062845,3.8285992929416066 2.390466902352798),(4.454545454545455 3.2727272727272725,3.9718874308478944 3.5140562845760526),(3.909090909090909 3.5454545454545454,3.4 3.8,3.020273919080065 3.9898630404600226),(2.412406123379353 2.1806398019657944,2.9435510802156513 2.0277891350321307,3.033663567232251 2.0018569416406535,3.7926407441832835 1.7834416744123878),(5.789913532037456 1.2086748923076345,6.091429433528652 1.1219059113715355,6.248741316520661 1.0766353577826588),(6.440982669530936 1.0213129478799579,6.572065590386247 0.9835904549550702,6.588528668432964 0.9788527794357362),(8.15490202638159 0.5280884271661532,8.18212740620899 0.5202536216002167),(8.177611896515856 0.4899997066562385,8.144306401587228 0.49709622464264097),(6.587895790751739 0.8287260628326987,6.559717156435642 0.8347301827439912),(5.018494503349007 1.1631238697952528,5 1.167064558139535,3.6468388143533286 1.4553873322949888,3.0364682172170445 1.5854411246266409),(1.5230208408561545 1.907916636575382,1 2.019358511627907,0.2364719009066274 2.1820461071718453,0.21523554423848168 2.1865710117674553),(0 2.232432,0.20583742977736258 2.117552483741816),(0.2153805063776022 2.112226416346857,1 1.6743240000000001),(2.2172202431565786 0.9949836445323683,2.228987144996931 0.988416442480053,3.04355123461118 0.5338017075534935,3.1987487660730998 0.44718472366447437),(3.272727272727273 0.4058967272727272,4 0,3.420244763820535 0.45294283694077225),(3.2577357848670885 0.5799055159509479,3.042106073781193 0.7483695969508517),(1.5145510415099104 1.9417958339603585,1 2.3437968749999993,0.49916424953825045 2.7350826306068425,0.376565054257604 2.8308651675322727,0.33014067808162784 2.8671349368006327),(1 0,1.32 0.384),(1 0,1.6820976351523418 0.8185171621828095),(1 0,1.7692307692307692 0.9230769230769231),(2.3207547169811322 1.5849056603773586,3.030733591393955 2.436880309672688,3.1739130434782608 2.608695652173913),(3.96875 3.5625,4.184712625258057 3.821655150309668,4.453608247422681 4.144329896907217,4.461538461538462 4.153846153846154,4.704060652458992 4.44487278295079),(5.493413900889959 5.392096681067951,5.863239160499081 5.835886992598898),(6.08107280245768 5.675708790169281,6.181818181818182 5.272727272727273),(6.48149684453794 4.074012621848242,6.570247933884298 3.7190082644628095,6.585246218925046 3.6590151242998155,6.5995854283831905 3.6016582864672375),(6.9375 2.25,7 2,6.851694915254237 2.1355932203389827),(6.594396750598089 2.3708372565960323,6.128394845228898 2.796896141505008),(5.467153284671533 3.4014598540145986,5.005671512443617 3.8233860457658357,4.976190476190477 3.850340136054422,4.787810383747178 4.022573363431151,4.595419847328245 4.198473282442748,4.503547393598493 4.282470954424235),(2.4636027452583242 6.147563204335246,2.2241035856573705 6.366533864541832,2.1741221724427535 6.412231156623768),(0.3943669747925682 8.039435908761082,0.20348293501690584 8.213958459413107),(-0.1752389675387337 5.161128725872514,0.14881901177715107 6.347806546715802),(0.20670833865183091 6.559793242463002,0.2867630190410645 6.8529479238357425),(0.6 8,0.6060238218140649 6.156811087286171,0.6079474591914528 5.568210163234189,0.614985277874548 3.4147551363801174,0.6156517714518788 3.210819228239097),(0.6246098681047852 0.4697911999691291,0.6419435163447376 -4.834015791493288),(3.281209938024379 -783.5596393894779,1.0290092830088593 -4.040530969832162,1.0156054490564213 0.5987291550334248),(1.0086593145109592 3.0028864381703197,1.0063480798617226 3.80283806286684,1.00626504485418 3.831577675788367,1.005845997485208 3.9766160100591605),(0.9967859042368499 5.9935718084737,0.6666666666666667 5.333333333333333,0.21087723180606543 4.4217544636123876),(0.20706121970032676 6.378816340898766,0.2284922020474155 6.314523393857754,0.9685212893551598 4.09443613193452,1 4),(2.0460878080557694 0.938549589258974,2.1914893617021276 0.7446808510638299,2.6052344828254053 0.19302068956612642,2.9014778325123154 -0.2019704433497537),(3.049839145194796 -0.39978552692628,5 -3),(6.3385518590998045 -4.784735812133072,6.562970132999667 -5.08396017733289),(8 -7,7.233062330623306 -2.16829268292683),(7.010274295409558 -0.7647280610802148,7 -0.7,6.9839616248860015 -0.6998503167840819),(6.581467724157925 -0.6960939149653118,5.027386389591995 -0.6815899586541239,5 -0.6813343664985977,3.0516129643768455 -0.6631504273357223),(2.678211929802206 -0.6596655439054776,0.22074060902229764 -0.6367304143985352),(5 0,5.024008414362973 0.019205963251847685),(6.38556086465178 1.1084043555472025,6.4066720887377855 1.1252926592838577,6.515996313447897 1.212748540816685,6.589763454480116 1.2717598931883658),(8.974375935866124 3.17937357374995,8.93904156611594 5.591578492976794,8.545456199729294 6.181897510654993),(6.571428571428571 5.857142857142858,6.218405777667094 5.574724622133675,5.5747237598811035 5.059779007904883),(5.084942084942085 4.667953667953668,5.068965517241379 4.655172413793103,5.001920672853931 4.601536538283145,4.771089625728822 4.416871700583058,4.445783132530121 4.156626506024097),(3 3,2.550910316925152 3.080917060013487),(2.386740331491712 3.110497237569061,1.7017543859649127 3.233918128654971,1.1674528301886793 3.330188679245283,0.8122406639004152 3.394190871369294,0.7393077198119982 3.4073319423762167,0.6221081321605393 3.428448985196299)))
-SELECT ST_ASTEXT(ST_INTERSECTION(
+# Invalid geometry in input.
+DO ST_ASTEXT(ST_INTERSECTION(
 ST_GEOMFROMWKB(
 ST_ASWKB(
 ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
@@ -1952,7 +1909,6 @@
 ST_GEOMFROMWKB(
 ST_ASWKB(
 ST_GEOMFROMTEXT('LINESTRING(0 -5, 5 10.0002)')))));
-ERROR HY000: Inconsistent intersection points.
 # Invalid geometry in input
 DO ST_ASTEXT(ST_UNION(
 ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
@@ -1960,7 +1916,8 @@
                         'MULTIPOINT(-1032.34324 5, 8 -1032.34324, -0.7654 3, -1032.34324 4, 1 1, 8 2),'
                         'POLYGON((7 2, 6.9 +.6, -0.7654 -.5, 2.4 7, 7 3, 7 2)))'),
 ST_GEOMFROMWKB(ST_ASWKB(POLYGON(LINESTRING(POINT(7,9), POINT(7,3), POINT(7,6), POINT(0,6), POINT(7,9)))))));
-SELECT
+# Invalid geometry in input
+DO
 ST_ASTEXT(ST_INTERSECTION(
 ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
                         'MULTIPOINT(4 2, 2 4, 4 1, 5 -3.9, 10.0002 3, 2.232432 2, 189.7654 -.9, 7 7),'
@@ -1976,11 +1933,6 @@
                                         '(-9.3 189.7654, 7 0, 10.0002 -1032.34324, 3 9.6, 9 10.0002),'
                                         '(1 8, 9 -0.7654, -0.7654 3, 8 5, 3 3)),'
                                         'POINT(-1032.34324 1))')));
-ST_ASTEXT(ST_INTERSECTION(
-ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
-                        'MULTIPOINT(4 2, 2 4, 4 1, 5 -3.9, 10.0002 3, 2.232432 2, 189.7654 -.9, 7 7),'
-                        'POLYGON((8 3, -0.7654 -.0, 10.0002 8, 1 6, 189.7654 4, -1032.3
-GEOMETRYCOLLECTION(MULTIPOINT((-0.3372510561638601 3.097690680136934),(-0.3348537979249109 2.8339874793358657),(-0.31984330357976365 1.1828030803811294),(-0.3102416127352067 0.12659788409820827),(-0.30901013251605036 -0.008867402981812766),(-0.23389056889323 -0.008358533397143653),(-0.22460317460317458 0.13095238095238115),(-0.14904961902666525 1.264255714600019),(-0.05168002135159308 2.724799679726104),(-0.022025625381330127 3.169615619280049),(0.000690994704595964 9.624539670870856),(0.22916666666666669 6.937500000000002),(0.40370586839786693 -0.13841248990864097),(0.49060531000304763 -0.00345070514031498),(0.5267424687808875 0.05267319341422105),(0.5827047144377622 -0.19978310131312538),(0.6042825300016732 0.1730991116949987),(0.7870372295619745 -0.0014426371948452754),(0.8790860445781419 0.08790684632088777),(0.9253601792083448 0.6717583871248964),(0.97941212605967 0.18529086546297013),(0.9868946509409237 0.19255396530208113),(1.7900313279896287 2.0146618548741326),(1.9520445748710875 2.2662813883407877),(2.558705879251926 1.7182718293428634),(2.973817659883715 3.8531767312122014),(3.01884563632834 6.794925377015943),(3.0256607304627385 5.780534179150209),(3.0379404330629587 3.9527645277814827),(3.0497503740285703 2.1949164443099107),(4.472604020566513 4.195154589765787),(4.495378280106891 3.598151312042756),(4.853226108482295 6.7720484045616836),(4.897429656432777 5.033694152417507),(4.923369225347917 4.01359142281459),(4.931538864962354 3.6923111541323737),(5.306415990488793 4.385405341567708),(5.533619466518825 4.437246324530273),(5.850470783392912 4.140188313357164),(6.237374965413903 4.59782211089372),(6.366732867789951 4.34669314711598),(6.521964885470061 5.565308265203652),(6.678652025552896 3.741148890192884),(6.749804972479449 2.9127827899047984),(6.864792393175456 1.5740935946074899),(7.607159315043259 0.7607007174899763),(7.809094413356824 0.5394454786452623),(8.184175358475203 0.8184011678241642),(8.314626170828312 0.5651504832624566)),LINESTRING(1 8,9 -0.7654),MULTILINESTRING((5 0,2.7597928441960367 -0.6195528193173043),(1.775131641068095 -0.6086123824033698,1 -0.34285478796218644),(1 0.09999800003999926,6.014223362843059 0.6014103080781297,7.267997404338554 0.7267852047297609),(7.642921243007735 0.530995995407173,6.01451790886655 0.44819582587433615),(-0.6159558538577858 0.11105309217672277,-1.0710967783936887 0.824525345172105,1 1.8122450536837855,2.1656295600705677 2.3681414759641783,2.232432 2.4),(1 -1032.34324,-1032.34324 -7,-9.425842657009719 -0.07062599896532706),(1 -1032.34324,-1032.34324 -7,1 0,0.9353243308592405 0.5820810222668358),(0.8850980392156863 1.0341176470588236,0.8653527872903526 1.2118249143868265,0.6658833657166321 3.007049708550308,0.5555555555555556 4),(4.818759065979881 8.127503626391952,4.8422953496841235 7.201912791403436),(4.851096941208207 6.855780302928425,4.87390175403246 5.958955383200179),(4.923714833332804 4.000000000000028,4.931988965065491 3.67461046121388,4.9490686504210935 3.002932619958754),(4.975465706384498 1.9648386975099186,4.9765189274243795 1.9234195952429616,4.987954333338013 1.4737093928576428),(4.98964009527577 1.4074149081731946,4.997132111722381 1.1127829328916619),(6.252618890656156 8.701047556262463,6.278579228917415 8.398816024097846),(6.34223193789655 7.65776806210345,6.38189994395877 7.19595118863109,6.489622787505965 5.941836557043759),(6.65641787175112 4,6.6879049135354105 3.6334263141710057),(6.736617790481372 3.0663086099500996,6.742209554837968 3.001209014868172),(6.778231154860737 2.581843779471811,6.855428333499585 1.6831104369397565,6.856221115174684 1.6738808337687203),(6.92205495631125 0.9074400241480589,7 0,7.00193752755703 -0.6666867128236821),(7 0,10.0002 -1032.34324,7.19822834951391 -615.2843816965766),(3.0686821851493917 -0.6229848468383352,3.0599053207576734 0.683405616483924,3.056959772078886 1.1218351662041641),(3.0559864247872506 1.266712831227096,3.055710429508456 1.3077932882156347),(3.0545138694844614 1.4858950036318674,3.0454709427987376 2.8318874509911893,3.0447971012912785 2.9321852429868613),(3.044309490834742 3.004763514884919,3.0376230858794173 4),(3.026278613514555 5.688565511261913,3.024330366640106 5.978551891748793,3.021168772806692 6.449138635320651),(2.003560729594184 6.900423597601892,2.517574709397424 6.337231330280977,2.843182344770838 5.9804711843932115),(4.650717594177106 4,4.954672345398416 3.66696437795559,5.561257516116146 3.002344171029442),(6.010554091463437 2.5100611458358344,6.143355087689498 2.36455441429581,6.77600593280985 1.6713746995685672,6.781067671450078 1.665828679083936),(7.975149847761971 0.35750269055340267,8.92945268624466 -0.6881030720011179),(8.79567904259395 -0.6866167312125725,6.014638027896728 0.3857133153539962),(4.4458861583671405 0.9906018288328557,3.8150313209483655 1.233850523696011),(3.583284020325487 1.3232090021777307,3.3563815059468847 1.4106993996669466),(3.0966996066611596 1.5108290639480293,2.183697454428104 1.862869769297358),(1.8925403055915835 1.9751358442383773,1 2.319286751182747),(-0.7286285204098598 3.008390142968978,1 3.402811052547517,1.7958482044428012 3.584399617688366),(2.1194969917738806 3.658246512828595,3.6172999999999997 4),(6.006641700797518 4.545175736600186,8 5,6.007299668007257 4.202919867203036),(5.5 4,4.798780487804878 3.7195121951219514,3.5884518755955996 3.2353807502382397,3.011986461167452 3.004794584466981)),POINT(-9.425842657009722 -0.07062599896532756),POINT(-1.0710967783936893 0.8245253451721046),POINT(-0.6159558538577823 0.11105309217672288),POINT(-0.4103840779064605 0.12150589434373948),POINT(0.6658833657165815 3.007049708550308),POINT(1 0.09999800003999848),POINT(1 0.1932203389830507),POINT(1 2.319286751182748),POINT(1.7958482044428017 3.584399617688366),POINT(2.183697454428104 1.8628697692973573),POINT(2.517574709397425 6.337231330280977),POINT(3.0147408839139533 7.405896353565595),POINT(3.024330366640105 5.978551891748793),POINT(3.0355143686115698 4.31387156114215),POINT(3.044309490834621 3.0047635148849197),POINT(3.068682185149391 -0.6229848468381078),POINT(3.0736043130969715 5.728003594247476),POINT(3.096699606661158 1.5108290639480284),POINT(3.8256403046067464 4.047536975975254),POINT(4.6372529469906745 4.014752877305993),POINT(4.918034043140146 4.223403465215238),POINT(4.931988965065489 3.6746104612138804),POINT(4.949068650421168 3.002932619958754),POINT(4.959020578899399 2.6115618366298747),POINT(4.989640095275769 1.407414908173223),POINT(5.060546055317748 4.3293052354297),POINT(5.561257516116257 3.002344171029442),POINT(5.581905534979697 2.979720652961121),POINT(6.006641700797517 4.545175736600159),POINT(6.007299668007257 4.202919867202903),POINT(6.010554091463437 2.510061145835798),POINT(6.014223362843059 0.6014103080781439),POINT(6.01451790886655 0.44819582587457063),POINT(6.014638027896727 0.38571331535397135),POINT(6.381899943958768 7.19595118863109),POINT(6.489622787505977 5.941836557043759),POINT(6.5340770841083 5.424297454193579),POINT(6.736617790481368 3.066308609950101),POINT(6.7422095548379275 3.001209014868172),POINT(6.855428333499582 1.683110436939785),POINT(6.868783766954554 1.527625825175619),POINT(6.900738424652399 1.5347084265689828),POINT(6.92205495631125 0.9074400241480305),POINT(7.642921243007737 0.5309959954071728),POINT(7.975149847761969 0.35750269055340356))
 SELECT ST_ASTEXT(ST_SYMDIFFERENCE(
 ST_GEOMFROMTEXT('MULTILINESTRING((-.4 2, 2.232432 3, 6 9, 8 189.7654, -1032.34324 5.4, 2.232432 9),'
                                     '(-1032.34324 3, 8 -1.6),'
@@ -1995,7 +1947,7 @@
                                     '(0 -.2, 8 1, -.5 7, 6 +.2)
 MULTILINESTRING((-0.4 2,2.232432 3,6 9,8 189.7654,-1032.34324 5.4,2.232432 9),(-1032.34324 3,8 -1.6),(0 -0.2,4 0.4),(8 1,-0.5 7,6 0.2),(-8 1,4.8 6,2 0.5),(10.0002 2,9 -1032.34324,0.3 8,0 5,8 1),(4 0.4,2 8),(6 7,0.1 7,0 -0.5))
 # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(
+DO ST_ASTEXT(ST_INTERSECTION(
 ST_GEOMFROMWKB(
 ST_ASWKB(
 ST_GEOMFROMTEXT(
@@ -2035,13 +1987,6 @@
                     'POINT(5 -3),'
                     'POINT(189.7654 7),'
                     'LINESTRING(0 -5, 5 10.0002))')))));
-ST_ASTEXT(ST_INTERSECTION(
-ST_GEOMFROMWKB(
-ST_ASWKB(
-ST_GEOMFROMTEXT(
-'GEOMETRYCOLLECTION('
-                    'MULTILINESTRING((4 -0.7654, -1032.34324 -1032.34324, 8 8, 1 0, 6 7, -1032.34324 -.0, -1032.34324 189.7654, 9 2, -9.6 -1032.34324, 5 6, 0 9.0))
-GEOMETRYCOLLECTION(POINT(189.7654 7),MULTILINESTRING((0 -5,3.292963051740192 4.879020873742646),(3.4166552778157406 5.250102499658334,5 10.0002)),POINT(0.12620388226869128 -4.621383305038637),POINT(1.5590929759332939 -0.3226587084810814),POINT(1.7692035507146042 0.3076814202858417),POINT(2.10297901999461 1.3090211791446282),POINT(2.3636019839711424 2.0909004959927855),POINT(2.4999500010001157 2.4999500010001157),POINT(2.6658818886980953 2.9977523013701024),POINT(2.711272291927571 3.1339253266745004),POINT(2.818166446364838 3.4546120657523685),POINT(3.041634982968928 4.1250266143061),POINT(3.0743159332915333 4.22307077251193),POINT(3.142812245539349 4.42856244910787),POINT(3.2399688962985955 4.720036287651639),POINT(3.335083004110828 5.005382415652646),POINT(3.8888456794924497 6.66669259230453),POINT(4.081066014377414 7.243361285772817))
 DO ST_ASTEXT(ST_SYMDIFFERENCE(
 ST_UNION(
 ST_GEOMFROMTEXT('MULTIPOLYGON(((10 0,-10 -3,-10 6,-10 7,4 6,6 1,-9 -8,10 0)))'),
@@ -2070,7 +2015,8 @@
 DO ST_ASTEXT(ST_SYMDIFFERENCE(
 ST_GEOMFROMTEXT('MULTILINESTRING((-3 9,3 -4,7 9,4 5,2 -6,-2 -1,-6 2))'),
 ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((-3 -8,0 -8,4 -8,0 -3,3 6,6 9,2 1,9 6,1 6,-8 -2,2 5,-1 5,-6 9,-3 -8)))')));
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(
+# Invalid geometry in input.
+DO ST_ASTEXT(ST_SYMDIFFERENCE(
 ST_SYMDIFFERENCE(
 ST_GEOMFROMTEXT('MULTIPOINT(10 -8,-2 6,-6 3,-3 7,7 -3,-8 -9,-3 9,-1 -7)'),
 ST_GEOMFROMTEXT('LINESTRING(-10 0,-4 4,9 5,-7 -8,3 -5,-9 5,0 -6,-9 -4,9 -1,0 -2,-9 4,-7 -8,4 0)')),
@@ -2079,13 +2025,6 @@
                                         '(7 0,10 -7,10 2,-2 9,-2 10,-7 -10,6 5,-3 10,7 6,2 -6,8 9,9 -4,3 -2,3 1))'),
 ST_GEOMFROMTEXT('MULTIPOLYGON(((-1 -1,7 4,1 10,-1 -1)),'
                                      '((-3 -9,2 8,5 6,3 -5,-5 4,-5 -7,-1 -7,3 5,-4 6,9 -4,-5 2,-5 9,-3 -9)))'))));
-ST_ASTEXT(ST_SYMDIFFERENCE(
-ST_SYMDIFFERENCE(
-ST_GEOMFROMTEXT('MULTIPOINT(10 -8,-2 6,-6 3,-3 7,7 -3,-8 -9,-3 9,-1 -7)'),
-ST_GEOMFROMTEXT('LINESTRING(-10 0,-4 4,9 5,-7 -8,3 -5,-9 5,0 -6,-9 -4,9 -1,0 -2,-9 4,-7 -8,4 0)')),
-ST_SYMDIFFERENCE(
-ST_GEOMFROMTEXT(
-GEOMETRYCOLLECTION(POINT(-8 -9),POINT(-6 3),POINT(-3 7),POINT(-3 9),POINT(-2 6),POINT(10 -8),MULTIPOLYGON(((-1 -1,7 4,1 10,-1 -1)),((-3 -9,2 8,5 6,3 -5,-5 4,-5 -7,-1 -7,3 5,-4 6,9 -4,-5 2,-5 9,-3 -9))),MULTILINESTRING((-4.627906976744186 3.5813953488372094,-4.413793103448276 3.7241379310344827),(-4 4,-1.6363636363636362 4.181818181818182),(-4 4,-0.03546099290780147 4.304964539007092),(0.9351851851851851 4.37962962962963,2.8421052631578947 4.526315789473684,4.75886524822695 4.673758865248226),(6.214285714285714 4.785714285714286,4.093333333333334 1.0133333333333336,3.3100303951367778 0.37689969604863194,1.7482014388489207 -0.8920863309352516),(-3.43312101910828 -5.101910828025478,-5 -6.375,-7 -8,-3.6666666666666665 -7),(-7 -8,-3.236559139784946 -6.870967741935484),(-2.290322580645161 -6.587096774193548,-0.7037037037037033 -6.111111111111111,3 -5),(3 -5,0.3913043478260869 -2.8260869565217392),(3 -5,-0.8740157480314958 -1.7716535433070866),(-4.1020408163265305 0.9183673469387754,-5 1.666666666666666,-9 5,-5 0.11111111111111072),(-9 5,-3.8571428571428568 -1.2857142857142856),(-1.5576923076923075 -4.096153846153847,-0.47368421052631593 -5.421052631578947,0 -6,-0.6206896551724138 -5.862068965517241),(0 -6,-1.9877300613496933 -5.558282208588957),(-3.4177215189873418 -5.240506329113924,-5 -4.888888888888889,-9 -4,-5 -3.3333333333333335),(-9 -4,-3.6545454545454543 -3.1090909090909093),(-1.1443298969072164 -2.6907216494845354,0.5294117647058822 -2.4117647058823533,0.67741935483871 -2.387096774193548,3.5625 -1.90625),(3.960000000000001 -1.8399999999999999,5.794520547945206 -1.5342465753424657),(5.592233009708738 -1.3786407766990292,3.6185567010309274 -1.597938144329897,3.4411764705882355 -1.6176470588235294),(0 -2,-0.7868852459016393 -1.4754098360655736),(-4.08 0.7200000000000002,-5 1.3333333333333335,-9 4,-7 -8,-5 -6.545454545454546),(-9 4,-7 -8,-3.4018691588785046 -5.3831775700934585),(-1.537414965986395 -4.0272108843537415,0.48 -2.5599999999999996,0.6932515337423313 -2.404907975460123,2.393258426966293 -1.1685393258426968,3.8952380952380956 -0.07619047619047592),(6 -2,5.818181818181818 -2.6363636363636362),(3.4571428571428573 -2.4857142857142858,3.382716049382716 -1.5925925925925926,3.212328767123288 0.45205479452054753),(2.595505617977528 1.2471910112359552,2.5326633165829144 0.9748743718592965,2.07 -1.0300000000000002),(0 -10,-2.604651162790698 -7.655813953488372),(-3.2098765432098766 -7.111111111111111,-3.3333333333333335 -7),(-5 -5.5,-10 -1,-5 -0.16666666666666663),(-1.9090909090909092 0.5227272727272727,-1.6842105263157894 0.5789473684210527,-0.6666666666666665 0.8333333333333334),(-0.06349206349206371 0.9841269841269841,0 1,-0.028985507246376812 1.1014492753623188),(-0.3888888888888889 2.361111111111111,-0.704225352112676 3.464788732394366),(-1.3191489361702127 5.617021276595745,-2 8,-2.1333333333333333 5.733333333333333),(-2.1991341991341997 4.614718614718615,-2.406896551724138 1.0827586206896553),(-2.8823529411764706 -7,-3 -9),(8.573770491803279 -3.6721311475409837,8.65 -3.85),(10 -7,10 2,6.793103448275862 3.8706896551724137),(4.821917808219178 5.020547945205479,1.6652719665271967 6.861924686192468),(0.547945205479452 7.513698630136986,-2 9,-2 10,-3.0344827586206895 5.862068965517241),(-3.161290322580646 5.35483870967742,-3.8292682926829267 2.6829268292682924),(-4.153846153846153 1.384615384615385,-5 -2,-7 -10,-4.4 -7),(-7 -10,-3.356060606060606 -5.795454545454545),(-1.3904109589041096 -3.527397260273972,0.13080168776371348 -1.772151898734177,1.125 -0.625,2.5199999999999996 0.9846153846153847),(4.926605504587156 5.5963302752293576,1.8033707865168536 7.331460674157303),(0.6330275229357802 7.9816513761467895,-3 10,0.7288135593220337 8.508474576271187),(3.6666666666666665 7.333333333333334,7 6,6.411764705882353 4.588235294117647),(5.873239436619718 3.295774647887324,4.330097087378641 -0.40776699029126195,3.7676767676767677 -1.7575757575757578),(3.4516129032258065 -2.5161290322580645,2.6028368794326244 -4.553191489361701),(2.586206896551724 -4.53448275862069,3.5 -2.25),(3.7073170731707314 -1.731707317073171,4.258823529411765 -0.35294117647058787),(6.285714285714286 4.714285714285714,8 9,9 -4),(3.5142857142857142 -2.1714285714285717,3 -1.4285714285714286,3 0.6153846153846154)))
 ######################################################################################################
 # BUG#20462962 : ASSERTION `GEOMETRY::IS_VALID_GEOTYPE(GT)' FAILED
 ######################################################################################################
@@ -2102,7 +2041,7 @@
 ST_GEOMFROMWKB(ST_ASWKB(GEOMETRYCOLLECTION(
 MULTIPOINT(POINT(8,-6.0), POINT(9,2), POINT(9,1), POINT(-0,6), POINT(8,6), POINT(4,3), POINT(.7,6)),
 MULTIPOINT(POINT(8,-0.7654), POINT(2,7), POINT(8,-0.7654), POINT(-.0,7), POINT(.0,6
-GEOMETRYCOLLECTION(MULTILINESTRING((-0.7654 2.232432,3.6737899158554317 2.099559283781633),(3.927301157948162 4.545468302232982,2.8 4)),POINT(3.927301157948163 4.545468302232982))
+GEOMETRYCOLLECTION(LINESTRING(-0.7654 2.232432,3.6737899158554317 2.099559283781633),LINESTRING(3.927301157948162 4.545468302232982,2.8 4),POINT(3.927301157948163 4.545468302232982))
 ######################################################################################################
 # BUG#20408240 : ST_DIFFERENCE : ASSERTION `T1->RESULT_RANGE' FAILED
 ######################################################################################################
@@ -2117,7 +2056,8 @@
                         'POLYGON((8 -7,1 -7,-9 0,9 8,-9 7,-10 -2,5 3,8 -8,-10 0,-3 -8,2 9,-7 4,-2 -8,8 -7)))'),
 ST_GEOMFROMT
 GEOMETRYCOLLECTION(POLYGON((8 -7,1 -7,-9 0,9 8,-9 7,-10 -2,5 3,8 -8,-10 0,-3 -8,2 9,-7 4,-2 -8,8 -7)),POINT(-10 -3),POINT(-10 -1))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(
+#invalid geometry as input
+DO ST_ASTEXT(ST_SYMDIFFERENCE(
 ST_GEOMFROMTEXT('POLYGON((-10 -4,7 -3,7 4,-5 8,1 -7,-10 -4))'),
 ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
                         'MULTIPOINT(6 6,3 -7,6 -10,2 8),'
@@ -2125,12 +2065,6 @@
                         'GEOMETRYCOLLECTION('
                             'MULTILINESTRING((8 8,4 8,2 -2,4 0,7 -7,-5 10,-6 -2,-7 -1,-1 5,-3 -1),'
                                             '(-7 10,1 0,-1 7,9 2,-2 6,-1 -1,-1 -1))))')));
-ST_ASTEXT(ST_SYMDIFFERENCE(
-ST_GEOMFROMTEXT('POLYGON((-10 -4,7 -3,7 4,-5 8,1 -7,-10 -4))'),
-ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
-                        'MULTIPOINT(6 6,3 -7,6 -10,2 8),'
-                        'LINESTRING(0 -4,-2 2,-3 6,2 -3,-10 -4,5 -7
-GEOMETRYCOLLECTION(POLYGON((-10 -4,1 -7,-5 8,7 4,7 -3,-10 -4)),MULTIPOINT((2 8),(3 -7),(6 -10),(6 6)),MULTILINESTRING((-0.19230769230769232 -3.4230769230769234,-2 2,-3 6,2 -3,-0.5161290322580645 -3.2096774193548385),(0.6521739130434785 -6.130434782608695,7 -1,-1.4000000000000004 -1),(-2.013333333333333 0.5333333333333334,7 4,-0.4285714285714288 -3.428571428571429),(7 4,-0.4375 -3.4375),(-0.34883720930232553 -3.6279069767441863,0.032786885245901676 -3.4098360655737707,6 0),(3.4375 5.1875,2 -2,4 0,5.327868852459016 -3.098360655737705),(4.289036544850498 -3.159468438538206,-3.1538461538461533 7.384615384615385),(-3 3,-1 5,-2.2727272727272725 1.1818181818181817),(-4.6 7,1 0,-0.894736842105263 6.631578947368421),(1 6,7 3),(7 2.7272727272727275,-2 6,-1 -1)))
 ######################################################################################################
 # BUG#20141918 : ASSERTION `CUR_SHAPE != GCALC_FUNCTION::SHAPE_POINT' FAILED
 ######################################################################################################
@@ -6485,7 +6419,7 @@
 ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('POLYGON((1 8,-17 -13,19
 -9,1 8))'), ST_GEOMFROMTEXT('POLYGON((8 6,5 7,-1 4,-8 -7,0 -17,8 6),(3 6,5
 5,0 -2,3 6))')))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((6.792727272727273 2.5290909090909093,4.668246445497631 4.535545023696683,0 -2,3 6,-1 4,-8 -7,-4.326530612244898 -11.591836734693878,2.1306532663316586 -10.874371859296481,6.792727272727273 2.5290909090909093)),((3.0769230769230766 6.038461538461538,3 6,3.25 5.875,3.0769230769230766 6.038461538461538))),POINT(6.792727272727273 2.5290909090909075))
+GEOMETRYCOLLECTION(POINT(6.792727272727273 2.5290909090909075),MULTIPOLYGON(((6.792727272727273 2.5290909090909093,4.668246445497631 4.535545023696683,0 -2,3 6,-1 4,-8 -7,-4.326530612244898 -11.591836734693878,2.1306532663316586 -10.874371859296481,6.792727272727273 2.5290909090909093)),((3.0769230769230766 6.038461538461538,3 6,3.25 5.875,3.0769230769230766 6.038461538461538))))
 #####################################################################################################
 # BUG#21890717 ASSERTION FAILED: GEOMETRY::LESS<SEGMENTPOINT>()(P0, P1)
 #####################################################################################################
@@ -6604,3 +6538,38 @@
 10,10 0,0 0 ),(0 8,4 4,4 6,0 8))'), ST_GEOMFROMTEXT('POLYGON((0 8,-8 8,-2 2,0
 8))')))
 POINT(0 8)
+#
+# Bug #33290245 Item_func_st_distance_sphere::val_real():
+#               Assertion `is_nullable()' failed.
+do st_astext( ( _utf32', ,*') regexp 13946);
+ERROR HY000: Cannot convert string '\x2C\x20\x2C\x2A' from utf32 to utf16le
+do st_aswkb( ( _utf32', ,*') regexp 13946);
+ERROR HY000: Cannot convert string '\x2C\x20\x2C\x2A' from utf32 to utf16le
+do st_centroid( ( _utf32', ,*') regexp 13946);
+ERROR HY000: Cannot convert string '\x2C\x20\x2C\x2A' from utf32 to utf16le
+do st_contains( ( _utf32', ,*') regexp 13946, ( _utf32', ,*') regexp 13946);
+ERROR HY000: Cannot convert string '\x2C\x20\x2C\x2A' from utf32 to utf16le
+do st_convexhull( ( _utf32', ,*') regexp 13946);
+ERROR HY000: Cannot convert string '\x2C\x20\x2C\x2A' from utf32 to utf16le
+do st_distance_sphere( ( ( _utf32', ,*') regexp 13946), 1, 42);
+ERROR HY000: Cannot convert string '\x2C\x20\x2C\x2A' from utf32 to utf16le
+do st_envelope( ( _utf32', ,*') regexp 13946);
+ERROR HY000: Cannot convert string '\x2C\x20\x2C\x2A' from utf32 to utf16le
+do st_geometrytype( ( _utf32', ,*') regexp 13946);
+ERROR HY000: Cannot convert string '\x2C\x20\x2C\x2A' from utf32 to utf16le
+do st_geomfromtext( ( _utf32', ,*') regexp 13946);
+ERROR HY000: Cannot convert string '\x2C\x20\x2C\x2A' from utf32 to utf16le
+do st_issimple( ( _utf32', ,*') regexp 13946);
+ERROR HY000: Cannot convert string '\x2C\x20\x2C\x2A' from utf32 to utf16le
+do st_isvalid( ( _utf32', ,*') regexp 13946);
+ERROR HY000: Cannot convert string '\x2C\x20\x2C\x2A' from utf32 to utf16le
+do st_latitude( ( _utf32', ,*') regexp 13946);
+ERROR HY000: Cannot convert string '\x2C\x20\x2C\x2A' from utf32 to utf16le
+do st_makeenvelope( ( _utf32', ,*') regexp 13946, 'POINT(0 0)');
+ERROR HY000: Cannot convert string '\x2C\x20\x2C\x2A' from utf32 to utf16le
+do st_simplify( ( _utf32', ,*') regexp 13946, 'POINT(0 0)');
+ERROR HY000: Cannot convert string '\x2C\x20\x2C\x2A' from utf32 to utf16le
+do st_srid( st_pointfromtext(( _utf32', ,*') regexp 13946));
+ERROR HY000: Cannot convert string '\x2C\x20\x2C\x2A' from utf32 to utf16le
+do st_validate( ( _utf32', ,*') regexp 13946);
+ERROR HY000: Cannot convert string '\x2C\x20\x2C\x2A' from utf32 to utf16le
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/gis/r/gis_ubsan.result mysql-8.0-8.0.27/mysql-test/suite/gis/r/gis_ubsan.result
--- mysql-8.0-8.0.26/mysql-test/suite/gis/r/gis_ubsan.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/gis/r/gis_ubsan.result	2021-09-28 11:46:34.000000000 +0000
@@ -117,7 +117,7 @@
 )
 ,'3536-12-23 04:13:33.501612'
 );
-ERROR SR001: There's no spatial reference system with SRID 909325619.
+ERROR 22023: Invalid GIS data provided to function st_symdifference.
 do st_symdifference(
 polygon(
 linestring(
@@ -174,6 +174,7 @@
 )
 )
 );
+ERROR 22023: Invalid GIS data provided to function st_symdifference.
 #
 # BUG#31053222 UBSAN: INTERSECTION.HPP SIGNED INTEGER OVERFLOW IN SEGMENTS_TUPLED
 #
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/gis/r/spatial_operators_intersection.result mysql-8.0-8.0.27/mysql-test/suite/gis/r/spatial_operators_intersection.result
--- mysql-8.0-8.0.26/mysql-test/suite/gis/r/spatial_operators_intersection.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/gis/r/spatial_operators_intersection.result	2021-09-28 11:46:34.000000000 +0000
@@ -162,752 +162,612 @@
 #====================================================================================
 # point,point
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_center),ST_GEOMFROMTEXT(@star_center)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_center),ST_GEOMFROMTEXT(@star_center)))
-POINT(15 10)
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_center)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_center)))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_center))) FROM gis_geometrycollection WHERE fid=105;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_center)))
-POINT(15 10)
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_center),ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('POINT(15 10)'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_center),ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('POINT(15 10)'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('POINT(15 10)')) FROM gis_geometrycollection WHERE fid=105;
+ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('POINT(15 10)'))
+1
 #====================================================================================
 # point,multipoint
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_bottom_left),ST_GEOMFROMTEXT(@star_bottom_points)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_bottom_left),ST_GEOMFROMTEXT(@star_bottom_points)))
-POINT(5 0)
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_center),ST_GEOMFROMTEXT(@star_bottom_points)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_center),ST_GEOMFROMTEXT(@star_bottom_points)))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_bottom_points))) FROM gis_geometrycollection WHERE fid=106;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_bottom_points)))
-POINT(5 0)
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_bottom_left),ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('POINT(5 0)'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_bottom_left),ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('POINT(5 0)'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_center),ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_center),ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('POINT(5 0)')) FROM gis_geometrycollection WHERE fid=106;
+ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('POINT(5 0)'))
+1
 #====================================================================================
 # point,linestring
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_top_to_center)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_top_to_center)))
-POINT(15 25)
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_bottom_left),ST_GEOMFROMTEXT(@star_top_to_center)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_bottom_left),ST_GEOMFROMTEXT(@star_top_to_center)))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top_to_center))) FROM gis_geometrycollection WHERE fid=104;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top_to_center)))
-POINT(15 25)
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('POINT(15 25)'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('POINT(15 25)'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_bottom_left),ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_bottom_left),ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('POINT(15 25)')) FROM gis_geometrycollection WHERE fid=104;
+ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('POINT(15 25)'))
+1
 #====================================================================================
 # point,multilinestring
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_lines_near_vertical)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_lines_near_vertical)))
-POINT(15 25)
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_center),ST_GEOMFROMTEXT(@star_lines_near_vertical)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_center),ST_GEOMFROMTEXT(@star_lines_near_vertical)))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_lines_near_vertical))) FROM gis_geometrycollection WHERE fid=104;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_lines_near_vertical)))
-POINT(15 25)
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('POINT(15 25)'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('POINT(15 25)'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_center),ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_center),ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('POINT(15 25)')) FROM gis_geometrycollection WHERE fid=104;
+ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('POINT(15 25)'))
+1
 #====================================================================================
 # point,polygon
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star)))
-POINT(15 25)
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_3),ST_GEOMFROMTEXT(@star)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_3),ST_GEOMFROMTEXT(@star)))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star))) FROM gis_geometrycollection WHERE fid=104;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star)))
-POINT(15 25)
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star)),ST_GEOMFROMTEXT('POINT(15 25)'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star)),ST_GEOMFROMTEXT('POINT(15 25)'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_3),ST_GEOMFROMTEXT(@star)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_3),ST_GEOMFROMTEXT(@star)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star)),ST_GEOMFROMTEXT('POINT(15 25)')) FROM gis_geometrycollection WHERE fid=104;
+ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star)),ST_GEOMFROMTEXT('POINT(15 25)'))
+1
 #====================================================================================
 # point,multipolygon
 #====================================================================================
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_of_elems)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_of_elems)))
-POINT(15 25)
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_3),ST_GEOMFROMTEXT(@star_of_elems)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_3),ST_GEOMFROMTEXT(@star_of_elems)))
-GEOMETRYCOLLECTION EMPTY
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_of_elems))) FROM gis_geometrycollection WHERE fid=104;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_of_elems)))
-POINT(15 25)
 #====================================================================================
 # point,geometrycollection
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_collection_elems)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_collection_elems)))
-POINT(15 25)
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_3),ST_GEOMFROMTEXT(@star_collection_elems)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_3),ST_GEOMFROMTEXT(@star_collection_elems)))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_collection_elems))) FROM gis_geometrycollection WHERE fid=104;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_collection_elems)))
-POINT(15 25)
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_collection_multilinestr)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_collection_multilinestr)))
-POINT(15 25)
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('POINT(0 0)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('POINT(0 0)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('POINT(0 0)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(0 0)),GEOMETRYCOLLECTION())')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('POINT(0 0)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(0 0)),GEOMETRYCOLLECTION())')))
-POINT(0 0)
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POINT(15 25)'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POINT(15 25)'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_3),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_3),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POINT(15 25)')) FROM gis_geometrycollection WHERE fid=104;
+ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POINT(15 25)'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_collection_multilinestr)),ST_GEOMFROMTEXT('POINT(15 25)'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_collection_multilinestr)),ST_GEOMFROMTEXT('POINT(15 25)'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('POINT(0 0)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('POINT(0 0)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('POINT(0 0)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(0 0)),GEOMETRYCOLLECTION())')),ST_GEOMFROMTEXT('POINT(0 0)'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('POINT(0 0)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(0 0)),GEOMETRYCOLLECTION())')),ST_GEOMFROMTEXT('POINT(0 0)'))
+1
 #====================================================================================
 # multipoint,point
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_top)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_top)))
-POINT(15 25)
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_bottom_points),ST_GEOMFROMTEXT(@star_center)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_bottom_points),ST_GEOMFROMTEXT(@star_center)))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_bottom_left))) FROM gis_geometrycollection WHERE fid=108;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_bottom_left)))
-POINT(5 0)
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_top)),ST_GEOMFROMTEXT('POINT(15 25)'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_top)),ST_GEOMFROMTEXT('POINT(15 25)'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_bottom_points),ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_bottom_points),ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_bottom_left)),ST_GEOMFROMTEXT('POINT(5 0)')) FROM gis_geometrycollection WHERE fid=108;
+ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_bottom_left)),ST_GEOMFROMTEXT('POINT(5 0)'))
+1
 #====================================================================================
 # multipoint,multipoint
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_bottom_points)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_bottom_points)))
-MULTIPOINT((5 0),(25 0))
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_bottom_points),ST_GEOMFROMTEXT(@star_all_points)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_bottom_points),ST_GEOMFROMTEXT(@star_all_points)))
-MULTIPOINT((5 0),(25 0))
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_all_points_1)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_all_points_1)))
-MULTIPOINT((5 0),(15 10),(15 25),(25 0))
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_all_points))) FROM gis_geometrycollection WHERE fid=108;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_all_points)))
-MULTIPOINT((5 0),(25 0))
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(25 0))'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(25 0))'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_bottom_points),ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(25 0))'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_bottom_points),ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(25 0))'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_all_points_1)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(15 10),(15 25),(25 0))'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_all_points_1)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(15 10),(15 25),(25 0))'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(25 0))')) FROM gis_geometrycollection WHERE fid=108;
+ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(25 0))'))
+1
 #====================================================================================
 # multipoint,linestring
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_top_to_center)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_top_to_center)))
-MULTIPOINT((15 10),(15 25))
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_top_to_center)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_top_to_center)))
-MULTIPOINT((15 10),(15 25))
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top_to_center))) FROM gis_geometrycollection WHERE fid=109;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top_to_center)))
-MULTIPOINT((15 10),(15 25))
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('MULTIPOINT((15 10),(15 25))'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('MULTIPOINT((15 10),(15 25))'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('MULTIPOINT((15 10),(15 25))'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('MULTIPOINT((15 10),(15 25))'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('MULTIPOINT((15 10),(15 25))')) FROM gis_geometrycollection WHERE fid=109;
+ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('MULTIPOINT((15 10),(15 25))'))
+1
 #====================================================================================
 # multipoint,multilinestring
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_lines_near_vertical)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_lines_near_vertical)))
-POINT(15 25)
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_lines_near_horizontal)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_lines_near_horizontal)))
-POINT(25 0)
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_lines_near_horizontal))) FROM gis_geometrycollection WHERE fid=109;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_lines_near_horizontal)))
-POINT(25 0)
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('POINT(15 25)'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('POINT(15 25)'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_lines_near_horizontal)),ST_GEOMFROMTEXT('POINT(25 0)'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_lines_near_horizontal)),ST_GEOMFROMTEXT('POINT(25 0)'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_lines_near_horizontal)),ST_GEOMFROMTEXT('POINT(25 0)')) FROM gis_geometrycollection WHERE fid=109;
+ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_lines_near_horizontal)),ST_GEOMFROMTEXT('POINT(25 0)'))
+1
 #====================================================================================
 # multipoint,polygon
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_elem_vertical)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_elem_vertical)))
-MULTIPOINT((5 0),(15 10),(15 25),(25 0))
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_elem_horizontal)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_elem_horizontal)))
-MULTIPOINT((15 10),(25 0))
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_elem_horizontal))) FROM gis_geometrycollection WHERE fid=109;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_elem_horizontal)))
-MULTIPOINT((15 10),(25 0))
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(15 10),(15 25),(25 0))'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(15 10),(15 25),(25 0))'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_elem_horizontal)),ST_GEOMFROMTEXT('MULTIPOINT((15 10),(25 0))'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_elem_horizontal)),ST_GEOMFROMTEXT('MULTIPOINT((15 10),(25 0))'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_elem_horizontal)),ST_GEOMFROMTEXT('MULTIPOINT((15 10),(25 0))')) FROM gis_geometrycollection WHERE fid=109;
+ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_elem_horizontal)),ST_GEOMFROMTEXT('MULTIPOINT((15 10),(25 0))'))
+1
 #====================================================================================
 # multipoint,multipolygon
 #====================================================================================
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOINT(0 0,0 30,30 25)'),ST_GEOMFROMTEXT(@star_of_elems)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOINT(0 0,0 30,30 25)'),ST_GEOMFROMTEXT(@star_of_elems)))
-GEOMETRYCOLLECTION EMPTY
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_of_elems)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_of_elems)))
-MULTIPOINT((5 0),(15 10),(15 25),(25 0))
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_of_elems))) FROM gis_geometrycollection WHERE fid=109;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_of_elems)))
-MULTIPOINT((5 0),(15 10),(15 25),(25 0))
 #====================================================================================
 # multipoint,geometrycollection
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOINT(0 0,0 30,30 25)'),ST_GEOMFROMTEXT(@star_collection_elems)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOINT(0 0,0 30,30 25)'),ST_GEOMFROMTEXT(@star_collection_elems)))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_collection_elems)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_collection_elems)))
-MULTIPOINT((5 0),(15 10),(15 25),(25 0))
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_collection_elems))) FROM gis_geometrycollection WHERE fid=109;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_collection_elems)))
-MULTIPOINT((5 0),(15 10),(15 25),(25 0))
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_collection_multilinestr)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_collection_multilinestr)))
-MULTIPOINT((5 0),(15 10),(15 25),(25 0))
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOINT(0 0,10 10)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOINT(0 0,10 10)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOINT(0 0,10 10)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(0 0)),'
-                                                                                              'GEOMETRYCOLLECTION())')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOINT(0 0,10 10)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(0 0)),'
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOINT(0 0,0 30,30 25)'),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOINT(0 0,0 30,30 25)'),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(15 10),(15 25),(25 0))'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(15 10),(15 25),(25 0))'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(15 10),(15 25),(25 0))')) FROM gis_geometrycollection WHERE fid=109;
+ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(15 10),(15 25),(25 0))'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_collection_multilinestr)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(15 10),(15 25),(25 0))'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_collection_multilinestr)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(15 10),(15 25),(25 0))'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOINT(0 0,10 10)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOINT(0 0,10 10)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOINT(0 0,10 10)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(0 0)),'
+                                                                                              'GEOMETRYCOLLECTION())')),ST_GEOMFROMTEXT('POINT(0 0)'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOINT(0 0,10 10)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(0 0)),'
                                                                                               'GEOMETRYCOLLECTION())'))
-POINT(0 0)
+1
 #====================================================================================
 # linestring,point
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_center)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_center)))
-POINT(15 10)
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('LINESTRING(15 25,15 10)'),ST_GEOMFROMTEXT('POINT(15 10)')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('LINESTRING(15 25,15 10)'),ST_GEOMFROMTEXT('POINT(15 10)')))
-POINT(15 10)
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_bottom_left)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_bottom_left)))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_INTERSECTION(g,g2)) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=110 and fid2=105;
-ST_ASTEXT(ST_INTERSECTION(g,g2))
-GEOMETRYCOLLECTION EMPTY
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('POINT(15 10)'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('POINT(15 10)'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('LINESTRING(15 25,15 10)'),ST_GEOMFROMTEXT('POINT(15 10)')),ST_GEOMFROMTEXT('POINT(15 10)'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('LINESTRING(15 25,15 10)'),ST_GEOMFROMTEXT('POINT(15 10)')),ST_GEOMFROMTEXT('POINT(15 10)'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_bottom_left)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_bottom_left)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,g2),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=110 and fid2=105;
+ST_EQUALS(ST_INTERSECTION(g,g2),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
 #====================================================================================
 # linestring,multipoint
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_vertical),ST_GEOMFROMTEXT('MULTIPOINT(15 10,15 25)')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_vertical),ST_GEOMFROMTEXT('MULTIPOINT(15 10,15 25)')))
-MULTIPOINT((15 10),(15 25))
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_vertical),ST_GEOMFROMTEXT(@star_all_points)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_vertical),ST_GEOMFROMTEXT(@star_all_points)))
-MULTIPOINT((15 10),(15 25))
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT('MULTIPOINT(15 10,15 25)'))) FROM gis_geometrycollection WHERE fid=111;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT('MULTIPOINT(15 10,15 25)')))
-MULTIPOINT((15 10),(15 25))
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_vertical),ST_GEOMFROMTEXT('MULTIPOINT(15 10,15 25)')),ST_GEOMFROMTEXT('MULTIPOINT((15 10),(15 25))'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_vertical),ST_GEOMFROMTEXT('MULTIPOINT(15 10,15 25)')),ST_GEOMFROMTEXT('MULTIPOINT((15 10),(15 25))'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_vertical),ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('MULTIPOINT((15 10),(15 25))'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_vertical),ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('MULTIPOINT((15 10),(15 25))'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT('MULTIPOINT(15 10,15 25)')),ST_GEOMFROMTEXT('MULTIPOINT((15 10),(15 25))')) FROM gis_geometrycollection WHERE fid=111;
+ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT('MULTIPOINT(15 10,15 25)')),ST_GEOMFROMTEXT('MULTIPOINT((15 10),(15 25))'))
+1
 #====================================================================================
 # linestring,linestring
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_vertical),ST_GEOMFROMTEXT(@star_top_to_center)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_vertical),ST_GEOMFROMTEXT(@star_top_to_center)))
-LINESTRING(15 10,15 25)
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_line_vertical)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_line_vertical)))
-LINESTRING(15 25,15 10)
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_top_to_center_1)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_top_to_center_1)))
-LINESTRING(15 25,15 10)
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top_to_center))) FROM gis_geometrycollection WHERE fid=111;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top_to_center)))
-LINESTRING(15 10,15 25)
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_vertical),ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('LINESTRING(15 10,15 25)'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_vertical),ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('LINESTRING(15 10,15 25)'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_line_vertical)),ST_GEOMFROMTEXT('LINESTRING(15 25,15 10)'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_line_vertical)),ST_GEOMFROMTEXT('LINESTRING(15 25,15 10)'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_top_to_center_1)),ST_GEOMFROMTEXT('LINESTRING(15 25,15 10)'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_top_to_center_1)),ST_GEOMFROMTEXT('LINESTRING(15 25,15 10)'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('LINESTRING(15 10,15 25)')) FROM gis_geometrycollection WHERE fid=111;
+ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('LINESTRING(15 10,15 25)'))
+1
 #====================================================================================
 # linestring,multilinestring
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_lines_near_horizontal)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_lines_near_horizontal)))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_lines_near_vertical)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_lines_near_vertical)))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_lines_near_horizontal))) FROM gis_geometrycollection WHERE fid=110;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_lines_near_horizontal)))
-GEOMETRYCOLLECTION EMPTY
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_lines_near_horizontal)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_lines_near_horizontal)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_lines_near_horizontal)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')) FROM gis_geometrycollection WHERE fid=110;
+ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_lines_near_horizontal)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
 #====================================================================================
 # linestring,polygon
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT('POLYGON((11 15,19 15,19 10,11 15))')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT('POLYGON((11 15,19 15,19 10,11 15))')))
-LINESTRING(11 15,19 15)
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_elem_horizontal)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_elem_horizontal)))
-LINESTRING(10 15,20 15)
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT('POLYGON((11 15,19 15,19 10,11 15))'))) FROM gis_geometrycollection WHERE fid=110;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT('POLYGON((11 15,19 15,19 10,11 15))')))
-LINESTRING(11 15,19 15)
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT('POLYGON((11 15,19 15,19 10,11 15))')),ST_GEOMFROMTEXT('LINESTRING(11 15,19 15)'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT('POLYGON((11 15,19 15,19 10,11 15))')),ST_GEOMFROMTEXT('LINESTRING(11 15,19 15)'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_elem_horizontal)),ST_GEOMFROMTEXT('LINESTRING(10 15,20 15)'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_elem_horizontal)),ST_GEOMFROMTEXT('LINESTRING(10 15,20 15)'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT('POLYGON((11 15,19 15,19 10,11 15))')),ST_GEOMFROMTEXT('LINESTRING(11 15,19 15)')) FROM gis_geometrycollection WHERE fid=110;
+ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT('POLYGON((11 15,19 15,19 10,11 15))')),ST_GEOMFROMTEXT('LINESTRING(11 15,19 15)'))
+1
 #====================================================================================
 # linestring,multipolygon
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT('MULTIPOLYGON(((11 15,19 15,19 25,11 15)))')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT('MULTIPOLYGON(((11 15,19 15,19 25,11 15)))')))
-LINESTRING(11 15,19 15)
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_of_elems)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_of_elems)))
-GEOMETRYCOLLECTION(MULTILINESTRING((11 15,19 15)),POINT(10 15),POINT(20 15))
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT('MULTIPOLYGON(((11 15,19 15,19 25,11 15)),((25 0,0 15,25 10,25 0)))'))) FROM gis_geometrycollection WHERE fid=110;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT('MULTIPOLYGON(((11 15,19 15,19 25,11 15)),((25 0,0 15,25 10,25 0)))')))
-LINESTRING(11 15,19 15)
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT('MULTIPOLYGON(((11 15,19 15,19 25,11 15)))')),ST_GEOMFROMTEXT('LINESTRING(11 15,19 15)'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT('MULTIPOLYGON(((11 15,19 15,19 25,11 15)))')),ST_GEOMFROMTEXT('LINESTRING(11 15,19 15)'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT('MULTIPOLYGON(((11 15,19 15,19 25,11 15)),((25 0,0 15,25 10,25 0)))')),ST_GEOMFROMTEXT('LINESTRING(11 15,19 15)')) FROM gis_geometrycollection WHERE fid=110;
+ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT('MULTIPOLYGON(((11 15,19 15,19 25,11 15)),((25 0,0 15,25 10,25 0)))')),ST_GEOMFROMTEXT('LINESTRING(11 15,19 15)'))
+1
 #====================================================================================
 # linestring,geometrycollectionn
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_collection_elems_3)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_collection_elems_3)))
-GEOMETRYCOLLECTION EMPTY
-# Invalid geometry in input.
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_collection_elems)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_collection_elems)))
-LINESTRING(10 15,20 15)
-# Invalid geometry in input.
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_collection_elems))) FROM gis_geometrycollection WHERE fid=110;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_collection_elems)))
-LINESTRING(10 15,20 15)
-# Invalid geometry in input.
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_collection_multilinestr)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_collection_multilinestr)))
-LINESTRING(10 15,20 15)
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('LINESTRING(0 0,10 10)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('LINESTRING(0 0,10 10)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('LINESTRING(0 0,10 10)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
-                                                                                              'GEOMETRYCOLLECTION(POLYGON((5 5,15 5,15 15,5 5))))')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('LINESTRING(0 0,10 10)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
-                                                                                              'GEOMETRYCOLLECTION(POLYGON((5 5,15 5,15 15,5 5))))')))
-LINESTRING(5 5,10 10)
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_collection_elems_3)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_collection_elems_3)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('LINESTRING(0 0,10 10)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('LINESTRING(0 0,10 10)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('LINESTRING(0 0,10 10)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
+                                                                                              'GEOMETRYCOLLECTION(POLYGON((5 5,15 5,15 15,5 5))))')),ST_GEOMFROMTEXT('LINESTRING(5 5,10 10)'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('LINESTRING(0 0,10 10)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
+                                                                                              'GEOMETRYCOLLECTION(POLYGON((5 5,15 5,15 15,5 5))))')),S
+1
 #====================================================================================
 # multilinestring,point
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_top)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_top)))
-POINT(15 25)
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_center)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_center)))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top))) FROM gis_geometrycollection WHERE fid=114;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top)))
-POINT(15 25)
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_top)),ST_GEOMFROMTEXT('POINT(15 25)'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_top)),ST_GEOMFROMTEXT('POINT(15 25)'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top)),ST_GEOMFROMTEXT('POINT(15 25)')) FROM gis_geometrycollection WHERE fid=114;
+ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top)),ST_GEOMFROMTEXT('POINT(15 25)'))
+1
 #====================================================================================
 # multilinestring,multipoint
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_bottom_points)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_bottom_points)))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_all_points)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_all_points)))
-POINT(15 25)
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_bottom_points))) FROM gis_geometrycollection WHERE fid=114;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_bottom_points)))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_INTERSECTION(g,g2)) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=114 and fid2=108;
-ST_ASTEXT(ST_INTERSECTION(g,g2))
-GEOMETRYCOLLECTION EMPTY
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('POINT(15 25)'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('POINT(15 25)'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')) FROM gis_geometrycollection WHERE fid=114;
+ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,g2),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=114 and fid2=108;
+ST_EQUALS(ST_INTERSECTION(g,g2),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
 #====================================================================================
 # multilinestring,linestring
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_line_vertical)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_line_vertical)))
-POINT(15 25)
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_line_horizontal)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_line_horizontal)))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_line_vertical))) FROM gis_geometrycollection WHERE fid=114;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_line_vertical)))
-POINT(15 25)
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_line_vertical)),ST_GEOMFROMTEXT('POINT(15 25)'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_line_vertical)),ST_GEOMFROMTEXT('POINT(15 25)'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_line_horizontal)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_line_horizontal)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_line_vertical)),ST_GEOMFROMTEXT('POINT(15 25)')) FROM gis_geometrycollection WHERE fid=114;
+ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_line_vertical)),ST_GEOMFROMTEXT('POINT(15 25)'))
+1
 #====================================================================================
 # multilinestring,multilinestring
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT('MULTILINESTRING((0 5,15 25,0 15))')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT('MULTILINESTRING((0 5,15 25,0 15))')))
-LINESTRING(0 5,15 25)
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_lines_near_horizontal)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_lines_near_horizontal)))
-MULTIPOINT((0 5),(5.172413793103448 11.89655172413793),(10 25),(12 25))
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT('MULTILINESTRING((0 5,15 25,0 15))'))) FROM gis_geometrycollection WHERE fid=114;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT('MULTILINESTRING((0 5,15 25,0 15))')))
-LINESTRING(0 5,15 25)
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_line_vertical))) FROM gis_geometrycollection WHERE fid=114;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_line_vertical)))
-POINT(15 25)
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((0 0, 1 1), (10 10, 11 11), (20 20, 21 21))'),
-ST_GEOMFROMTEXT('MULTILINESTRING((0 0, 1 1), (10 10, 11 11), (20 20, 19 19))')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((0 0, 1 1), (10 10, 11 11), (20 20, 21 21))'),
-ST_GEOMFROMTEXT('MULTILINESTRING((0 0, 1 1), (10 10, 11 11), (20 20, 19 19))')))
-GEOMETRYCOLLECTION(POINT(20 20),MULTILINESTRING((0 0,1 1),(10 10,11 11)))
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT('MULTILINESTRING((0 5,15 25,0 15))')),ST_GEOMFROMTEXT('LINESTRING(0 5,15 25)'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT('MULTILINESTRING((0 5,15 25,0 15))')),ST_GEOMFROMTEXT('LINESTRING(0 5,15 25)'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_lines_near_horizontal)),ST_GEOMFROMTEXT('MULTIPOINT((0 5),(5.172413793103448 11.89655172413793),(10 25),(12 25))'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_lines_near_horizontal)),ST_GEOMFROMTEXT('MULTIPOINT((0 5),(5.172413793103448 11.89655172413793),(10 25),(12 25))'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT('MULTILINESTRING((0 5,15 25,0 15))')),ST_GEOMFROMTEXT('LINESTRING(0 5,15 25)')) FROM gis_geometrycollection WHERE fid=114;
+ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT('MULTILINESTRING((0 5,15 25,0 15))')),ST_GEOMFROMTEXT('LINESTRING(0 5,15 25)'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_line_vertical)),ST_GEOMFROMTEXT('POINT(15 25)')) FROM gis_geometrycollection WHERE fid=114;
+ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_line_vertical)),ST_GEOMFROMTEXT('POINT(15 25)'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((0 0, 1 1), (10 10, 11 11), (20 20, 21 21))'),
+ST_GEOMFROMTEXT('MULTILINESTRING((0 0, 1 1), (10 10, 11 11), (20 20, 19 19))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(20 20),MULTILINESTRING((0 0,1 1),(10 10,11 11)))'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((0 0, 1 1), (10 10, 11 11), (20 20, 21 21))'),
+ST_GEOMFROMTEXT('MULTILINESTRING((0 0, 1 1), (10 10, 11 11), (20 20, 19 19))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(20 20),MULTILINESTRING((0 0
+1
 #====================================================================================
 # multilinestring,polygon
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_elem_vertical)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_elem_vertical)))
-POINT(15 25)
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_elem_horizontal)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_elem_horizontal)))
-LINESTRING(5.172413793103448 11.89655172413793,7.5 15)
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_elem_vertical))) FROM gis_geometrycollection WHERE fid=114;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_elem_vertical)))
-POINT(15 25)
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('POINT(15 25)'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('POINT(15 25)'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_elem_horizontal)),ST_GEOMFROMTEXT('LINESTRING(5.172413793103448 11.89655172413793,7.5 15)'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_elem_horizontal)),ST_GEOMFROMTEXT('LINESTRING(5.172413793103448 11.89655172413793,7.5 15)'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('POINT(15 25)')) FROM gis_geometrycollection WHERE fid=114;
+ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('POINT(15 25)'))
+1
 #====================================================================================
 # multilinestring,multipolygon
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((0 25,25 0,25 30))'),ST_GEOMFROMTEXT(@star_elem_vertical)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((0 25,25 0,25 30))'),ST_GEOMFROMTEXT(@star_elem_vertical)))
-LINESTRING(10.714285714285715 14.285714285714286,25 0)
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_of_elems)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_of_elems)))
-GEOMETRYCOLLECTION(MULTILINESTRING((5.172413793103448 11.89655172413793,7.5 15)),POINT(15 25))
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_of_elems))) FROM gis_geometrycollection WHERE fid=114;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_of_elems)))
-GEOMETRYCOLLECTION(MULTILINESTRING((5.172413793103448 11.89655172413793,7.5 15)),POINT(15 25))
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((0 25,25 0,25 30))'),ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('LINESTRING(10.714285714285715 14.285714285714286,25 0)'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((0 25,25 0,25 30))'),ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('LINESTRING(10.714285714285715 14.285714285714286,25 0)'))
+1
 #====================================================================================
 # multilinestring,geometrycollection
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((0 25,25 0,25 30))'),ST_GEOMFROMTEXT(@star_collection_elems)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((0 25,25 0,25 30))'),ST_GEOMFROMTEXT(@star_collection_elems)))
-MULTILINESTRING((10 15,25 0),(25 11.875,25 15))
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_collection_elems)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_collection_elems)))
-GEOMETRYCOLLECTION(MULTILINESTRING((4.883720930232558 11.511627906976745,7.5 15)),POINT(15 25))
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_collection_elems))) FROM gis_geometrycollection WHERE fid=114;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_collection_elems)))
-GEOMETRYCOLLECTION(MULTILINESTRING((4.883720930232558 11.511627906976745,7.5 15)),POINT(15 25))
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_horizontal),ST_GEOMFROMTEXT(@star_collection_multilinestr)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_horizontal),ST_GEOMFROMTEXT(@star_collection_multilinestr)))
-MULTILINESTRING((25 0,0 15),(6 15,4.2 12),(0 15,15 30,6 15),(4.2 12,0 5))
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((0 0,10 10),(5 5,15 15))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((0 0,10 10),(5 5,15 15))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((0 0,10 10))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
-                                                                                                     'GEOMETRYCOLLECTION(POLYGON((5 5,15 5,15 15,5 5))))')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((0 0,10 10))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((0 25,25 0,25 30))'),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('MULTILINESTRING((10 15,25 0),(25 11.875,25 15))'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((0 25,25 0,25 30))'),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('MULTILINESTRING((10 15,25 0),(25 11.875,25 15))'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((4.883720930232558 11.511627906976745,7.5 15)),POINT(15 25))'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((4.883720930232558 11.511627906976745,7.5 15)),POINT(15 25))'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((4.883720930232558 11.511627906976745,7.5 15)),POINT(15 25))')) FROM gis_geometrycollection WHERE fid=114;
+ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((4.883720930232558 11.511627906976745,7.5 15)),POINT(15 25))'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_horizontal),ST_GEOMFROMTEXT(@star_collection_multilinestr)),ST_GEOMFROMTEXT('MULTILINESTRING((25 0,0 15),(6 15,4.2 12),(0 15,15 30,6 15),(4.2 12,0 5))'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_horizontal),ST_GEOMFROMTEXT(@star_collection_multilinestr)),ST_GEOMFROMTEXT('MULTILINESTRING((25 0,0 15),(6 15,4.2 12),(0 15,15 30,6 15),(4.2 12,0 5))'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((0 0,10 10),(5 5,15 15))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((0 0,10 10),(5 5,15 15))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((0 0,10 10))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
+                                                                                                     'GEOMETRYCOLLECTION(POLYGON((5 5,15 5,15 15,5 5))))')),ST_GEOMFROMTEXT('LINESTRING(5 5,10 10)'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((0 0,10 10))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
                                                                                                      'GEOMETRYCOLLECTION(POLYGON((5 5,15 5,15 1
-LINESTRING(5 5,10 10)
+1
 #====================================================================================
 # polygon,point
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_center)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_center)))
-POINT(15 10)
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT('POINT(0 0)')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT('POINT(0 0)')))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_center))) FROM gis_geometrycollection WHERE fid=100;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_center)))
-POINT(15 10)
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('POINT(15 10)'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('POINT(15 10)'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT('POINT(0 0)')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT('POINT(0 0)')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('POINT(15 10)')) FROM gis_geometrycollection WHERE fid=100;
+ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('POINT(15 10)'))
+1
 #====================================================================================
 # polygon,multipoint
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_all_points)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_all_points)))
-MULTIPOINT((5 0),(15 10),(15 25),(25 0))
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT('MULTIPOINT(0 0,30 25)')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT('MULTIPOINT(0 0,30 25)')))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_all_points))) FROM gis_geometrycollection WHERE fid=100;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_all_points)))
-MULTIPOINT((5 0),(15 10),(15 25),(25 0))
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_all_points)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_all_points)))
-MULTIPOINT((5 0),(15 10),(15 25),(25 0))
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(15 10),(15 25),(25 0))'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(15 10),(15 25),(25 0))'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT('MULTIPOINT(0 0,30 25)')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT('MULTIPOINT(0 0,30 25)')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(15 10),(15 25),(25 0))')) FROM gis_geometrycollection WHERE fid=100;
+ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(15 10),(15 25),(25 0))'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(15 10),(15 25),(25 0))'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(15 10),(15 25),(25 0))'))
+1
 #====================================================================================
 # polygon,linestring
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_line_vertical)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_line_vertical)))
-LINESTRING(15 5,15 25)
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star_line_horizontal)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star_line_horizontal)))
-LINESTRING(11 15,19 15)
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_line_vertical))) FROM gis_geometrycollection WHERE fid=100;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_line_vertical)))
-LINESTRING(15 5,15 25)
-SELECT ST_ASTEXT(ST_INTERSECTION(g,g2)) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=100 and fid2=111;
-ST_ASTEXT(ST_INTERSECTION(g,g2))
-LINESTRING(15 5,15 25)
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_line_vertical)),ST_GEOMFROMTEXT('LINESTRING(15 5,15 25)'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_line_vertical)),ST_GEOMFROMTEXT('LINESTRING(15 5,15 25)'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star_line_horizontal)),ST_GEOMFROMTEXT('LINESTRING(11 15,19 15)'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star_line_horizontal)),ST_GEOMFROMTEXT('LINESTRING(11 15,19 15)'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_line_vertical)),ST_GEOMFROMTEXT('LINESTRING(15 5,15 25)')) FROM gis_geometrycollection WHERE fid=100;
+ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_line_vertical)),ST_GEOMFROMTEXT('LINESTRING(15 5,15 25)'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,g2),ST_GEOMFROMTEXT('LINESTRING(15 5,15 25)')) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=100 and fid2=111;
+ST_EQUALS(ST_INTERSECTION(g,g2),ST_GEOMFROMTEXT('LINESTRING(15 5,15 25)'))
+1
 #====================================================================================
 # polygon,multilinestring
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_lines_near_vertical)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_lines_near_vertical)))
-GEOMETRYCOLLECTION(MULTILINESTRING((4.883720930232558 11.511627906976745,7.5 15)),POINT(15 25))
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star_lines_near_horizontal)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star_lines_near_horizontal)))
-LINESTRING(25 0,8.870967741935484 9.67741935483871)
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_lines_near_vertical))) FROM gis_geometrycollection WHERE fid=100;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_lines_near_vertical)))
-GEOMETRYCOLLECTION(MULTILINESTRING((4.883720930232558 11.511627906976745,7.5 15)),POINT(15 25))
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((4.883720930232558 11.511627906976745,7.5 15)),POINT(15 25))'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((4.883720930232558 11.511627906976745,7.5 15)),POINT(15 25))'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star_lines_near_horizontal)),ST_GEOMFROMTEXT('LINESTRING(25 0,8.870967741935484 9.67741935483871)'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star_lines_near_horizontal)),ST_GEOMFROMTEXT('LINESTRING(25 0,8.870967741935484 9.67741935483871)'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((4.883720930232558 11.511627906976745,7.5 15)),POINT(15 25))')) FROM gis_geometrycollection WHERE fid=100;
+ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((4.883720930232558 11.511627906976745,7.5 15)),POINT(15 25))'))
+1
 #====================================================================================
 # polygon,polygon
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_elem_vertical)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_elem_vertical)))
-POLYGON((15 25,5 0,15 5,25 0,15 25))
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star)))
-POLYGON((15 25,5 0,15 5,25 0,15 25))
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_elem_vertical))) FROM gis_geometrycollection WHERE fid=100;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_elem_vertical)))
-POLYGON((15 25,5 0,15 5,25 0,15 25))
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('POLYGON((15 25,5 0,15 5,25 0,15 25))'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('POLYGON((15 25,5 0,15 5,25 0,15 25))'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star)),ST_GEOMFROMTEXT('POLYGON((15 25,5 0,15 5,25 0,15 25))'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star)),ST_GEOMFROMTEXT('POLYGON((15 25,5 0,15 5,25 0,15 25))'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('POLYGON((15 25,5 0,15 5,25 0,15 25))')) FROM gis_geometrycollection WHERE fid=100;
+ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('POLYGON((15 25,5 0,15 5,25 0,15 25))'))
+1
 #====================================================================================
 # polygon,multipolygon
 #====================================================================================
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_of_elems)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_of_elems)))
-MULTIPOLYGON(((0 15,25 0,22 10,30 15,0 15)),((25 0,15 25,5 0,15 5,25 0)))
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_of_elems_3)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_of_elems_3)))
-GEOMETRYCOLLECTION EMPTY
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_of_elems))) FROM gis_geometrycollection WHERE fid=100;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_of_elems)))
-MULTIPOLYGON(((0 15,25 0,22 10,30 15,0 15)),((25 0,15 25,5 0,15 5,25 0)))
 #====================================================================================
 # polygon,geomertycollection
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_collection_elems)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_collection_elems)))
-POLYGON((7 10,5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10))
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_collection_elems_3)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_collection_elems_3)))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_collection_elems))) FROM gis_geometrycollection WHERE fid=100;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_collection_elems)))
-POLYGON((7 10,5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10))
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_collection_multilinestr)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_collection_multilinestr)))
-POLYGON((7 10,5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10))
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('POLYGON((0 0,10 10,10 0,0 0))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('POLYGON((0 0,10 10,10 0,0 0))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())')))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 5,15 5,15 15,5 5)))')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 5,15 5,15 15,5 5)))')))
-POLYGON((10 10,5 5,10 5,10 10))
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0),(4 4,4 6,6 6,6 4,4 4))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
-                                                                                                                         'POLYGON((4 4,4 6,6 6,6 4,4 4)))')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0),(4 4,4 6,6 6,6 4,4 4))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POLYGON((7 10,5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10))'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POLYGON((7 10,5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10))'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_collection_elems_3)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_collection_elems_3)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POLYGON((7 10,5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10))')) FROM gis_geometrycollection WHERE fid=100;
+ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POLYGON((7 10,5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10))'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_collection_multilinestr)),ST_GEOMFROMTEXT('POLYGON((7 10,5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10))'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_collection_multilinestr)),ST_GEOMFROMTEXT('POLYGON((7 10,5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10))'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('POLYGON((0 0,10 10,10 0,0 0))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('POLYGON((0 0,10 10,10 0,0 0))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 5,15 5,15 15,5 5)))')),ST_GEOMFROMTEXT('POLYGON((10 10,5 5,10 5,10 10))'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 5,15 5,15 15,5 5)))')),ST_GEOMFROMTEXT('POLYGON((10 10,5 5,10 5,10 10))'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0),(4 4,4 6,6 6,6 4,4 4))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
+                                                                                                                         'POLYGON((4 4,4 6,6 6,6 4,4 4)))')),ST_GEOMFROMTEXT('LINESTRING(4 4,4 6,6 6,6 4,4 4)'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0),(4 4,4 6,6 6,6 4,4 4))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
                                                                                                                    
-LINESTRING(4 4,4 6,6 6,6 4,4 4)
+1
 #====================================================================================
 # multipolygon,point
 #====================================================================================
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_top)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_top)))
-POINT(15 25)
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('POINT(30 30)')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('POINT(30 30)')))
-GEOMETRYCOLLECTION EMPTY
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top))) FROM gis_geometrycollection WHERE fid=103;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top)))
-POINT(15 25)
 #====================================================================================
 # multipolygon,multipoint
 #====================================================================================
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_bottom_points)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_bottom_points)))
-MULTIPOINT((5 0),(25 0))
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('MULTIPOINT(30 30,0 35)')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('MULTIPOINT(30 30,0 35)')))
-GEOMETRYCOLLECTION EMPTY
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_bottom_points))) FROM gis_geometrycollection WHERE fid=103;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_bottom_points)))
-MULTIPOINT((5 0),(25 0))
 #====================================================================================
 # multipolygon,linestring
 #====================================================================================
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_top_to_center)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_top_to_center)))
-GEOMETRYCOLLECTION(MULTILINESTRING((15 15,15 10)),POINT(15 25))
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('LINESTRING(30 30,0 35)')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('LINESTRING(30 30,0 35)')))
-GEOMETRYCOLLECTION EMPTY
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top_to_center))) FROM gis_geometrycollection WHERE fid=103;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top_to_center)))
-GEOMETRYCOLLECTION(MULTILINESTRING((15 15,15 10)),POINT(15 25))
 #====================================================================================
 # multipolygon,multilinestring
 #====================================================================================
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_lines_near_vertical)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_lines_near_vertical)))
-GEOMETRYCOLLECTION(MULTILINESTRING((5.172413793103448 11.89655172413793,7.5 15)),POINT(15 25))
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('MULTILINESTRING((0 30,30 30,0 35))')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('MULTILINESTRING((0 30,30 30,0 35))')))
-GEOMETRYCOLLECTION EMPTY
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_lines_near_vertical))) FROM gis_geometrycollection WHERE fid=103;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_lines_near_vertical)))
-GEOMETRYCOLLECTION(MULTILINESTRING((5.172413793103448 11.89655172413793,7.5 15)),POINT(15 25))
 #====================================================================================
 # multipolygon,polygon
 #====================================================================================
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star)))
-MULTIPOLYGON(((0 15,25 0,22 10,30 15,0 15)),((25 0,15 25,5 0,15 5,25 0)))
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('POLYGON((0 0,15 25,35 0,0 0))')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('POLYGON((0 0,15 25,35 0,0 0))')))
-MULTIPOLYGON(((6.617647058823529 11.029411764705882,25 0,22 10,25.333333333333332 12.083333333333334,23 15,9 15,6.617647058823529 11.029411764705882)),((25 0,15 25,5 0,15 5,25 0)))
 #====================================================================================
 # multipolygon,multipolygon
 #====================================================================================
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,5 0,5 5,0 0)),((5 5,10 0,5 0,5 5)))')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,5 0,5 5,0 0)),((5 5,10 0,5 0,5 5)))')))
-POLYGON((6.428571428571429 3.571428571428571,5 0,8.333333333333334 1.6666666666666665,6.428571428571429 3.571428571428571))
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((5 5,5 10,10 10,10 5,5 5)))'),
-ST_GEOMFROMTEXT('MULTIPOLYGON(((3 3,3 7,7 7,7 3,3 3)),((9 9,9 15,15 15,15 9,9 9)))')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((5 5,5 10,10 10,10 5,5 5)))'),
-ST_GEOMFROMTEXT('MULTIPOLYGON(((3 3,3 7,7 7,7 3,3 3)),((9 9,9 15,15 15,15 9,9 9)))')))
-MULTIPOLYGON(((3 5,3 3,5 3,5 5,3 5)),((5 7,5 5,7 5,7 7,5 7)),((9 10,9 9,10 9,10 10,9 10)))
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((5 5,5 10,10 10,10 5,5 5)))'),
+ST_GEOMFROMTEXT('MULTIPOLYGON(((3 3,3 7,7 7,7 3,3 3)),((9 9,9 15,15 15,15 9,9 9)))')),ST_GEOMFROMTEXT('MULTIPOLYGON(((3 5,3 3,5 3,5 5,3 5)),((5 7,5 5,7 5,7 7,5 7)),((9 10,9 9,10 9,10 10,9 10)))'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((5 5,5 10,10 10,10 5,5 5)))'),
+ST_GEOMFROMTEXT('MULTIPOLYGON(((3 3,3 7,7 7,7 3,3 3)),((9 9,9 15,15 15,15 9,9 9)))')),ST_GEOMFROMTEXT('MULTIPOLYGON(((3 5,3 3,5 3,5 5,3 5)),((5
+1
 #====================================================================================
 # multipolygon,geometrycollectionn
 #====================================================================================
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_collection_elems_3)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_collection_elems_3)))
-GEOMETRYCOLLECTION EMPTY
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_collection_elems)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_collection_elems)))
-MULTIPOLYGON(((0 15,25 0,22 10,30 15,0 15)),((25 0,15 25,5 0,15 5,25 0)))
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_collection_elems))) FROM gis_geometrycollection WHERE fid=103;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_collection_elems)))
-MULTIPOLYGON(((0 15,25 0,22 10,30 15,0 15)),((25 0,15 25,5 0,15 5,25 0)))
-SELECT ST_ASTEXT(ST_INTERSECTION(g,g2)) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=115 and fid2=115;
-ST_ASTEXT(ST_INTERSECTION(g,g2))
-POLYGON((7 10,5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10))
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_collection_multilinestr)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_collection_multilinestr)))
-MULTIPOLYGON(((0 15,25 0,22 10,30 15,0 15)),((25 0,15 25,5 0,15 5,25 0)))
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,10 10,10 0,0 0)))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,10 10,10 0,0 0)))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())')))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 5,15 5,15 15,5 5)))')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 5,15 5,15 15,5 5)))')))
-POLYGON((10 10,5 5,10 5,10 10))
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)),((4 4,4 6,6 6,6 4,4 4)))'),
-ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((4 4,4 6,6 6,6 4,4 4)))')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)),((4 4,4 6,6 6,6 4,4 4)))'),
-ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((4 4,4 6,6 6,6 4,4 4)))')))
-POLYGON((4 6,4 4,6 4,6 6,4 6))
+SELECT ST_EQUALS(ST_INTERSECTION(g,g2),ST_GEOMFROMTEXT('POLYGON((7 10,5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10))')) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=115 and fid2=115;
+ST_EQUALS(ST_INTERSECTION(g,g2),ST_GEOMFROMTEXT('POLYGON((7 10,5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10))'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,10 10,10 0,0 0)))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,10 10,10 0,0 0)))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 5,15 5,15 15,5 5)))')),ST_GEOMFROMTEXT('POLYGON((10 10,5 5,10 5,10 10))'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 5,15 5,15 15,5 5)))')),ST_GEOMFROMTEXT('POLYGON((10 10,5 5,10 5,10 10))'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)),((4 4,4 6,6 6,6 4,4 4)))'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((4 4,4 6,6 6,6 4,4 4)))')),ST_GEOMFROMTEXT('POLYGON((4 6,4 4,6 4,6 6,4 6))'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)),((4 4,4 6,6 6,6 4,4 4)))'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((4 4,4 6,6 6,6 4,4 4)))')),ST_GEOMFROMTEXT('POLYGON((4 6,4 4,6 4,6 6,4 6))'))
+1
 #====================================================================================
 # geometrycollection,point
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_top)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_top)))
-POINT(15 25)
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('POINT(30 30)')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('POINT(30 30)')))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top))) FROM gis_geometrycollection WHERE fid=115;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top)))
-POINT(15 25)
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_top)),ST_GEOMFROMTEXT('POINT(15 25)'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_top)),ST_GEOMFROMTEXT('POINT(15 25)'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('POINT(30 30)')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('POINT(30 30)')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top)),ST_GEOMFROMTEXT('POINT(15 25)')) FROM gis_geometrycollection WHERE fid=115;
+ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top)),ST_GEOMFROMTEXT('POINT(15 25)'))
+1
 #====================================================================================
 # geometrycollection,multipoint
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_bottom_points)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_bottom_points)))
-MULTIPOINT((5 0),(25 0))
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('MULTIPOINT(30 30,0 35)')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('MULTIPOINT(30 30,0 35)')))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_bottom_points))) FROM gis_geometrycollection WHERE fid=115;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_bottom_points)))
-MULTIPOINT((5 0),(25 0))
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(25 0))'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(25 0))'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('MULTIPOINT(30 30,0 35)')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('MULTIPOINT(30 30,0 35)')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(25 0))')) FROM gis_geometrycollection WHERE fid=115;
+ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(25 0))'))
+1
 #====================================================================================
 # geometrycollection,linestring
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_top_to_center)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_top_to_center)))
-LINESTRING(15 25,15 10)
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('LINESTRING(30 30,0 35)')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('LINESTRING(30 30,0 35)')))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top_to_center))) FROM gis_geometrycollection WHERE fid=115;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top_to_center)))
-LINESTRING(15 25,15 10)
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('LINESTRING(15 25,15 10)'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('LINESTRING(15 25,15 10)'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('LINESTRING(30 30,0 35)')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('LINESTRING(30 30,0 35)')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('LINESTRING(15 25,15 10)')) FROM gis_geometrycollection WHERE fid=115;
+ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('LINESTRING(15 25,15 10)'))
+1
 #====================================================================================
 # geometrycollection,multilinestring
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_lines_near_vertical)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_lines_near_vertical)))
-GEOMETRYCOLLECTION(MULTILINESTRING((4.883720930232558 11.511627906976745,7.5 15)),POINT(15 25))
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('MULTILINESTRING((0 30,30 30,0 35))')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('MULTILINESTRING((0 30,30 30,0 35))')))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_lines_near_vertical))) FROM gis_geometrycollection WHERE fid=115;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_lines_near_vertical)))
-GEOMETRYCOLLECTION(MULTILINESTRING((4.883720930232558 11.511627906976745,7.5 15)),POINT(15 25))
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((4.883720930232558 11.511627906976745,7.5 15)),POINT(15 25))'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((4.883720930232558 11.511627906976745,7.5 15)),POINT(15 25))'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('MULTILINESTRING((0 30,30 30,0 35))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('MULTILINESTRING((0 30,30 30,0 35))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((4.883720930232558 11.511627906976745,7.5 15)),POINT(15 25))')) FROM gis_geometrycollection WHERE fid=115;
+ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((4.883720930232558 11.511627906976745,7.5 15)),POINT(15 25))'))
+1
 #====================================================================================
 # geometrycollection,polygon
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star)))
-POLYGON((7 10,5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10))
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_elem_vertical))) FROM gis_geometrycollection WHERE fid=115;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_elem_vertical)))
-POLYGON((15 25,5 0,15 5,25 0,15 25))
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_elem_vertical)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_elem_vertical)))
-POLYGON((15 25,5 0,15 5,25 0,15 25))
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('POLYGON((0 0,15 25,35 0,0 0))')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('POLYGON((0 0,15 25,35 0,0 0))')))
-POLYGON((6.3 10.5,7 10,5 0,15 5,25 0,22 10,25.333333333333332 12.083333333333334,23 15,20 15,15 25,10 15,9 15,6.3 10.5))
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star)),ST_GEOMFROMTEXT('POLYGON((7 10,5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10))'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star)),ST_GEOMFROMTEXT('POLYGON((7 10,5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10))'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('POLYGON((15 25,5 0,15 5,25 0,15 25))')) FROM gis_geometrycollection WHERE fid=115;
+ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('POLYGON((15 25,5 0,15 5,25 0,15 25))'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('POLYGON((15 25,5 0,15 5,25 0,15 25))'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('POLYGON((15 25,5 0,15 5,25 0,15 25))'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('POLYGON((0 0,15 25,35 0,0 0))')),ST_GEOMFROMTEXT('POLYGON((6.3 10.5,7 10,5 0,15 5,25 0,22 10,25.333333333333332 12.083333333333334,23 15,20 15,15 25,10 15,9 15,6.3 10.5))'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('POLYGON((0 0,15 25,35 0,0 0))')),ST_GEOMFROMTEXT('POLYGON((6.3 10.5,7 10,5 0,15 5,25 0,22 10,25.333333333333332 12.083333333333334,23 15,20 15,15 25,10 15,9 15,6.3 10.5))')
+1
 #====================================================================================
 # geometrycollection,multipolygon
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,0 0)))')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,0 0)))')))
-GEOMETRYCOLLECTION EMPTY
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_of_elems)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_of_elems)))
-MULTIPOLYGON(((0 15,25 0,22 10,30 15,0 15)),((25 0,15 25,5 0,15 5,25 0)))
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_collection_elems))) FROM gis_geometrycollection WHERE fid=115;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_collection_elems)))
-POLYGON((7 10,5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10))
-SELECT ST_ASTEXT(ST_INTERSECTION(g,g2)) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=115 and fid2=215;
-ST_ASTEXT(ST_INTERSECTION(g,g2))
-POLYGON((7 10,5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10))
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(3 3,6 6))'),
-ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((5 5,5 10,10 10,10 5,5 5)))')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(3 3,6 6))'),
-ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((5 5,5 10,10 10,10 5,5 5)))')))
-GEOMETRYCOLLECTION(POINT(0 0),MULTILINESTRING((3 3,5 5),(5 5,6 6)))
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,0 0)))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,0 0)))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POLYGON((7 10,5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10))')) FROM gis_geometrycollection WHERE fid=115;
+ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POLYGON((7 10,5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10))'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(g,g2),ST_GEOMFROMTEXT('POLYGON((7 10,5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10))')) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=115 and fid2=215;
+ST_EQUALS(ST_INTERSECTION(g,g2),ST_GEOMFROMTEXT('POLYGON((7 10,5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10))'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(3 3,6 6))'),
+ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((5 5,5 10,10 10,10 5,5 5)))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(0 0),MULTILINESTRING((3 3,5 5),(5 5,6 6)))'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(3 3,6 6))'),
+ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((5 5,5 10,10 10,10 5,5 5)))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(0 0),MULTILINESTRING((3 3,5 5)
+1
 #====================================================================================
 # geometrycollection,geometrycollectionn
 #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_collection_elems_3)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_collection_elems_3)))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_multilinestr),ST_GEOMFROMTEXT(@star_collection_elems)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_multilinestr),ST_GEOMFROMTEXT(@star_collection_elems)))
-POLYGON((7 10,5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10))
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_collection_elems)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_collection_elems)))
-POLYGON((7 10,5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10))
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(1 1,2 2))'),
-ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(0 0),POINT(5 5))')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(1 1,2 2))'),
-ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(0 0),POINT(5 5))')))
-POINT(0 0)
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(2 2),POLYGON((0 0,0 5,5 5,5 0,0 0)))'),
-ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOINT(0 0,5 5))')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(2 2),POLYGON((0 0,0 5,5 5,5 0,0 0)))'),
-ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOINT(0 0,5 5))')))
-MULTIPOINT((0 0),(5 5))
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())'),
-ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())))')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())'),
-ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())))')))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())'),
-ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(1 1), GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())))')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())'),
-ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(1 1), GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())))')))
-GEOMETRYCOLLECTION EMPTY
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_collection_elems_3)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_collection_elems_3)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_multilinestr),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POLYGON((7 10,5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10))'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_multilinestr),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POLYGON((7 10,5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10))'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POLYGON((7 10,5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10))'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POLYGON((7 10,5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10))'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(1 1,2 2))'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(0 0),POINT(5 5))')),ST_GEOMFROMTEXT('POINT(0 0)'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(1 1,2 2))'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(0 0),POINT(5 5))')),ST_GEOMFROMTEXT('POINT(0 0)'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(2 2),POLYGON((0 0,0 5,5 5,5 0,0 0)))'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOINT(0 0,5 5))')),ST_GEOMFROMTEXT('MULTIPOINT((0 0),(5 5))'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(2 2),POLYGON((0 0,0 5,5 5,5 0,0 0)))'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOINT(0 0,5 5))')),ST_GEOMFROMTEXT('MULTIPOINT((0 0),(5 5))'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(1 1), GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(1 1), GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
 #####################################################################################
 # Testing ST_INTERSECTION() with 2 geometries of same SRID
 #####################################################################################
@@ -1000,33 +860,9 @@
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '))' at line 1
 SELECT ST_ASTEXT(ST_INTERSECTION(,ST_GEOMFROMTEXT(@star_top)));
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ',ST_GEOMFROMTEXT(@star_top)))' at line 1
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star_of_elems)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star_of_elems)))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((25 0,19 15,11 15,5 0,15 5,25 0))),LINESTRING(19 15,15 25,11 15))
 SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star_collection_elems)));
 ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star_collection_elems)))
 POLYGON((15 25,5 0,15 5,25 0,15 25))
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_elem_vertical))) FROM gis_geometrycollection WHERE fid=103;
-ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_elem_vertical)))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((25 0,19 15,11 15,5 0,15 5,25 0))),LINESTRING(19 15,15 25,11 15))
-# Invalig geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_elem_vertical)));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_elem_vertical)))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((25 0,19 15,11 15,5 0,15 5,25 0))),LINESTRING(19 15,15 25,11 15))
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),
-ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,15 25,35 0,0 0)),((5 0,15 25,25 0,15 5,5 0)))')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),
-ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,15 25,35 0,0 0)),((5 0,15 25,25 0,15 5,5 0)))')))
-GEOMETRYCOLLECTION(MULTIPOINT((6.617647058823529 11.029411764705882),(9 15),(23 15),(25.333333333333332 12.083333333333334)),MULTILINESTRING((5 0,15 5,24.999999999999993 2.6645352591003757e-15),(19 15,15 25,11 15),(8.870967741935484 9.67741935483871,5 0)),MULTIPOLYGON(((8.870967741935484 9.67741935483871,25 0,19 15,11 15,8.870967741935484 9.67741935483871))))
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),
-ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,15 25,35 0,0 0)),((5 0,15 25,25 0,15 5,5 0)))')));
-ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),
-ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,15 25,35 0,0 0)),((5 0,15 25,25 0,15 5,5 0)))')))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((15 25,5 0,15 5,25 0,22 10,25.333333333333332 12.083333333333334,23 15,20 15,15 25))),MULTIPOINT((6.3 10.5),(9 15)))
 CREATE TABLE t1 (pk INT PRIMARY KEY, g GEOMETRY NOT NULL);
 INSERT INTO t1 VALUES (1, ST_GEOMFROMTEXT('POINT(1 1)'));
 INSERT INTO t1 VALUES (2, ST_GEOMFROMTEXT('LINESTRING(1 1, 2 2)'));
@@ -1109,453 +945,461 @@
 GEOMETRYCOLLECTION(POLYGON(LINESTRING(POINT(1,1), POINT(10,1), POINT(10,10),
 POINT(1,10), POINT(1,1)), LINESTRING(POINT(4,4),POINT(4,6),POINT(6,6),
 POINT(6,4),POINT(4,4))))));
-SELECT ST_ASTEXT(ST_INTERSECTION(a.g, b.g)) FROM t1 AS a JOIN t1 AS b ORDER BY a.pk, b.pk;
-ST_ASTEXT(ST_INTERSECTION(a.g, b.g))
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-LINESTRING(1 1,2 2)
-POINT(1 1)
-LINESTRING(1 1,2 2)
-MULTIPOINT((1 1),(2 2))
-LINESTRING(1 1,2 2)
-POINT(1 1)
-POINT(1 1)
-LINESTRING(1 1,2 2)
-POINT(1 1)
-LINESTRING(1 1,2 2)
-POINT(1 1)
-LINESTRING(1 1,2 2)
-MULTIPOINT((1 1),(2 2))
-LINESTRING(1 1,2 2)
-POINT(1 1)
-POINT(1 1)
-LINESTRING(1 1,2 2)
-LINESTRING(1 1,2 2)
-LINESTRING(1 1,2 2)
-LINESTRING(1 1,2 2)
-POINT(1 1)
-POINT(1 1)
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-POINT(1 1)
-POINT(1 1)
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-POINT(1 1)
-POINT(1 1)
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-POINT(1 1)
-POINT(1 1)
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-POINT(1 1)
-POINT(1 1)
-LINESTRING(1 1,2 2)
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-POLYGON((0 10,0 0,10 0,10 10,0 10),(6 4,4 4,4 6,6 6,6 4))
-MULTIPOINT((1 1),(2 2))
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4)))
-POINT(1 1)
-LINESTRING(1 1,2 2)
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-POLYGON((0 10,0 0,10 0,10 10,0 10),(6 4,4 4,4 6,6 6,6 4))
-MULTIPOINT((1 1),(2 2))
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4)))
-POLYGON((0 10,0 0,10 0,10 10,0 10),(6 4,4 4,4 6,6 6,6 5,6 4))
-POLYGON((0 10,0 0,10 0,10 10,0 10),(4 6,6 6,6 4,4 4,4 6))
-POLYGON((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4))
-POINT(1 1)
-MULTIPOINT((1 1),(2 2))
-POINT(1 1)
-MULTIPOINT((1 1),(2 2))
-MULTIPOINT((1 1),(2 2))
-MULTIPOINT((1 1),(2 2))
-POINT(1 1)
-POINT(1 1)
-MULTIPOINT((1 1),(2 2))
-POINT(1 1)
-MULTIPOINT((1 1),(2 2))
-POINT(1 1)
-MULTIPOINT((1 1),(2 2))
-MULTIPOINT((1 1),(2 2))
-MULTIPOINT((1 1),(2 2))
-POINT(1 1)
-POINT(1 1)
-MULTIPOINT((1 1),(2 2))
-MULTIPOINT((1 1),(2 2))
-MULTIPOINT((1 1),(2 2))
-MULTIPOINT((1 1),(2 2))
-POINT(1 1)
-LINESTRING(1 1,2 2)
-POINT(1 1)
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-MULTIPOINT((1 1),(2 2))
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-POINT(1 1)
-POINT(1 1)
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-POINT(1 1)
-LINESTRING(1 1,2 2)
-POINT(1 1)
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-MULTIPOINT((1 1),(2 2))
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-POINT(1 1)
-POINT(1 1)
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-POINT(1 1)
-POINT(1 1)
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))
-POINT(1 1)
-POINT(1 1)
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))
-POINT(1 1)
-POINT(1 1)
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))
-POINT(1 1)
-POINT(1 1)
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10)))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((5 10,5 6,6 6,6 5,10 5,10 10,5 10))),POINT(1 1))
-POINT(1 1)
-POINT(1 1)
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))
-POINT(1 1)
-POINT(1 1)
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(7 6,6 6,6 7,7 7,7 6)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))
-POINT(1 1)
-POINT(1 1)
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))
-POINT(1 1)
-POINT(1 1)
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(7 6,6 6,6 7,7 7,7 6)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6))),POINT(1 1))
-POINT(1 1)
-LINESTRING(1 1,2 2)
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4)))
-MULTIPOINT((1 1),(2 2))
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4)))
-POINT(1 1)
-LINESTRING(1 1,2 2)
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4)))
-MULTIPOINT((1 1),(2 2))
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 5,6 4)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(4 6,6 6,6 4,4 4,4 6)))
-POLYGON((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4))
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-POINT(1 1)
-LINESTRING(1 1,2 2)
-POINT(1 1)
-LINESTRING(1 1,2 2)
-MULTIPOINT((1 1),(2 2))
-LINESTRING(1 1,2 2)
-POINT(1 1)
-POINT(1 1)
-LINESTRING(1 1,2 2)
-POINT(1 1)
-LINESTRING(1 1,2 2)
-POINT(1 1)
-LINESTRING(1 1,2 2)
-MULTIPOINT((1 1),(2 2))
-LINESTRING(1 1,2 2)
-POINT(1 1)
-POINT(1 1)
-LINESTRING(1 1,2 2)
-LINESTRING(1 1,2 2)
-LINESTRING(1 1,2 2)
-LINESTRING(1 1,2 2)
-POINT(1 1)
-POINT(1 1)
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-POINT(1 1)
-POINT(1 1)
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-POINT(1 1)
-POINT(1 1)
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-POINT(1 1)
-POINT(1 1)
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-POINT(1 1)
-POINT(1 1)
-LINESTRING(1 1,2 2)
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-POLYGON((0 10,0 0,10 0,10 10,0 10),(6 4,4 4,4 6,6 6,6 4))
-MULTIPOINT((1 1),(2 2))
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4)))
-POINT(1 1)
-LINESTRING(1 1,2 2)
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-POLYGON((0 10,0 0,10 0,10 10,0 10),(6 4,4 4,4 6,6 6,6 4))
-MULTIPOINT((1 1),(2 2))
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4)))
-POLYGON((0 10,0 0,10 0,10 10,0 10),(6 4,4 4,4 6,6 6,6 5,6 4))
-POLYGON((0 10,0 0,10 0,10 10,0 10),(4 6,6 6,6 4,4 4,4 6))
-POLYGON((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4))
-POINT(1 1)
-MULTIPOINT((1 1),(2 2))
-POINT(1 1)
-MULTIPOINT((1 1),(2 2))
-MULTIPOINT((1 1),(2 2))
-MULTIPOINT((1 1),(2 2))
-POINT(1 1)
-POINT(1 1)
-MULTIPOINT((1 1),(2 2))
-POINT(1 1)
-MULTIPOINT((1 1),(2 2))
-POINT(1 1)
-MULTIPOINT((1 1),(2 2))
-MULTIPOINT((1 1),(2 2))
-MULTIPOINT((1 1),(2 2))
-POINT(1 1)
-POINT(1 1)
-MULTIPOINT((1 1),(2 2))
-MULTIPOINT((1 1),(2 2))
-MULTIPOINT((1 1),(2 2))
-MULTIPOINT((1 1),(2 2))
-POINT(1 1)
-LINESTRING(1 1,2 2)
-POINT(1 1)
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-MULTIPOINT((1 1),(2 2))
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-POINT(1 1)
-POINT(1 1)
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-POINT(1 1)
-LINESTRING(1 1,2 2)
-POINT(1 1)
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-MULTIPOINT((1 1),(2 2))
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-POINT(1 1)
-POINT(1 1)
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-POINT(1 1)
-POINT(1 1)
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))
-POINT(1 1)
-POINT(1 1)
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))
-POINT(1 1)
-POINT(1 1)
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))
-POINT(1 1)
-POINT(1 1)
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10)))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((5 10,5 6,6 6,6 5,10 5,10 10,5 10))),POINT(1 1))
-POINT(1 1)
-POINT(1 1)
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))
-POINT(1 1)
-POINT(1 1)
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(7 6,6 6,6 7,7 7,7 6)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))
-POINT(1 1)
-POINT(1 1)
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))
-POINT(1 1)
-POINT(1 1)
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(7 6,6 6,6 7,7 7,7 6)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6))),POINT(1 1))
-POINT(1 1)
-LINESTRING(1 1,2 2)
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4)))
-MULTIPOINT((1 1),(2 2))
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4)))
-POINT(1 1)
-LINESTRING(1 1,2 2)
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4)))
-MULTIPOINT((1 1),(2 2))
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 5,6 4)))
-MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(4 6,6 6,6 4,4 4,4 6)))
-POLYGON((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4))
-POINT(1 1)
-LINESTRING(1 1,2 2)
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-POLYGON((0 10,0 0,10 0,10 10,0 10),(6 4,4 4,4 6,6 6,6 5,6 4))
-MULTIPOINT((1 1),(2 2))
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-MULTIPOLYGON(((5 10,5 5,10 5,10 10,5 10)),((1 0,1 1,0 1,0 0,1 0)))
-MULTIPOLYGON(((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)),((1 0,1 1,0 1,0 0,1 0)))
-MULTIPOLYGON(((1 10,1 1,10 1,10 10,1 10),(4 6,6 6,6 5,6 4,4 4,4 6)),((1 0,1 1,0 1,0 0,1 0)))
-POINT(1 1)
-LINESTRING(1 1,2 2)
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-POLYGON((0 10,0 0,10 0,10 10,0 10),(6 4,4 4,4 6,6 6,6 5,6 4))
-MULTIPOINT((1 1),(2 2))
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-MULTIPOLYGON(((5 10,5 5,10 5,10 10,5 10)),((1 0,1 1,0 1,0 0,1 0)))
-MULTIPOLYGON(((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)),((1 0,1 1,0 1,0 0,1 0)))
-MULTIPOLYGON(((1 10,1 1,10 1,10 10,1 10),(4 6,6 6,6 5,6 4,4 4,4 6)),((1 0,1 1,0 1,0 0,1 0)))
-POLYGON((10 10,0 10,0 0,10 0,10 10),(5 5,6 5,6 4,4 4,4 6,5 6,5 5))
-POLYGON((10 10,0 10,0 0,10 0,10 10),(5 5,6 5,6 4,4 4,4 6,5 6,5 5))
-POLYGON((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 5,6 4))
-POINT(1 1)
-LINESTRING(1 1,2 2)
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-POLYGON((0 10,0 0,10 0,10 10,0 10),(4 6,6 6,6 4,4 4,4 6))
-MULTIPOINT((1 1),(2 2))
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-MULTIPOLYGON(((5 10,5 5,10 5,10 10,5 10)),((1 0,1 1,0 1,0 0,1 0)))
-MULTIPOLYGON(((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)),((1 0,1 1,0 1,0 0,1 0)))
-MULTIPOLYGON(((1 10,1 1,10 1,10 10,1 10),(4 6,6 6,6 4,4 4,4 6)),((1 0,1 1,0 1,0 0,1 0)))
-POINT(1 1)
-LINESTRING(1 1,2 2)
-POLYGON((0 1,0 0,1 0,1 1,0 1))
-POLYGON((0 10,0 0,10 0,10 10,0 10),(4 6,6 6,6 4,4 4,4 6))
-MULTIPOINT((1 1),(2 2))
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-MULTIPOLYGON(((5 10,5 5,10 5,10 10,5 10)),((1 0,1 1,0 1,0 0,1 0)))
-MULTIPOLYGON(((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)),((1 0,1 1,0 1,0 0,1 0)))
-MULTIPOLYGON(((1 10,1 1,10 1,10 10,1 10),(4 6,6 6,6 4,4 4,4 6)),((1 0,1 1,0 1,0 0,1 0)))
-POLYGON((10 10,0 10,0 0,10 0,10 10),(5 6,5 5,6 5,6 4,4 4,4 6,5 6))
-POLYGON((10 10,0 10,0 0,10 0,10 10),(5 6,5 5,4 4,4 6,5 6))
-POLYGON((1 10,1 1,10 1,10 10,1 10),(4 6,6 6,6 4,4 4,4 6))
-POINT(1 1)
-LINESTRING(1 1,2 2)
-POINT(1 1)
-POLYGON((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4))
-MULTIPOINT((1 1),(2 2))
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((5 10,5 6,6 6,6 5,10 5,10 10,5 10))),POINT(1 1))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6))),POINT(1 1))
-POLYGON((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4))
-POINT(1 1)
-LINESTRING(1 1,2 2)
-POINT(1 1)
-POLYGON((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4))
-MULTIPOINT((1 1),(2 2))
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((5 10,5 6,6 6,6 5,10 5,10 10,5 10))),POINT(1 1))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6))),POINT(1 1))
-POLYGON((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4))
-POLYGON((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 5,6 4))
-POLYGON((1 10,1 1,10 1,10 10,1 10),(4 6,6 6,6 4,4 4,4 6))
-POLYGON((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4))
+CREATE TABLE intersection_results (pk INT PRIMARY KEY AUTO_INCREMENT, g GEOMETRY NOT NULL);
+INSERT INTO intersection_results(g)
+VALUES
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 10,0 10),(6 4,4 4,4 6,6 6,6 4))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4)))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 10,0 10),(6 4,4 4,4 6,6 6,6 4))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 10,0 10),(6 4,4 4,4 6,6 6,6 5,6 4))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 10,0 10),(4 6,6 6,6 4,4 4,4 6))')),
+(ST_GEOMFROMTEXT('POLYGON((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((5 10,5 6,6 6,6 5,10 5,10 10,5 10))),POINT(1 1))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(7 6,6 6,6 7,7 7,7 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(7 6,6 6,6 7,7 7,7 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6))),POINT(1 1))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4)))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 5,6 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(4 6,6 6,6 4,4 4,4 6)))')),
+(ST_GEOMFROMTEXT('POLYGON((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 10,0 10),(6 4,4 4,4 6,6 6,6 4))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4)))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 10,0 10),(6 4,4 4,4 6,6 6,6 4))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 10,0 10),(6 4,4 4,4 6,6 6,6 5,6 4))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 10,0 10),(4 6,6 6,6 4,4 4,4 6))')),
+(ST_GEOMFROMTEXT('POLYGON((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((5 10,5 6,6 6,6 5,10 5,10 10,5 10))),POINT(1 1))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(7 6,6 6,6 7,7 7,7 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(7 6,6 6,6 7,7 7,7 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6))),POINT(1 1))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4)))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 5,6 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(4 6,6 6,6 4,4 4,4 6)))')),
+(ST_GEOMFROMTEXT('POLYGON((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 10,0 10),(6 4,4 4,4 6,6 6,6 5,6 4))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 10,5 5,10 5,10 10,5 10)),((1 0,1 1,0 1,0 0,1 0)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)),((1 0,1 1,0 1,0 0,1 0)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 10,1 1,10 1,10 10,1 10),(4 6,6 6,6 5,6 4,4 4,4 6)),((1 0,1 1,0 1,0 0,1 0)))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 10,0 10),(6 4,4 4,4 6,6 6,6 5,6 4))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 10,5 5,10 5,10 10,5 10)),((1 0,1 1,0 1,0 0,1 0)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)),((1 0,1 1,0 1,0 0,1 0)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 10,1 1,10 1,10 10,1 10),(4 6,6 6,6 5,6 4,4 4,4 6)),((1 0,1 1,0 1,0 0,1 0)))')),
+(ST_GEOMFROMTEXT('POLYGON((10 10,0 10,0 0,10 0,10 10),(5 5,6 5,6 4,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((10 10,0 10,0 0,10 0,10 10),(5 5,6 5,6 4,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 5,6 4))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 10,0 10),(4 6,6 6,6 4,4 4,4 6))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 10,5 5,10 5,10 10,5 10)),((1 0,1 1,0 1,0 0,1 0)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)),((1 0,1 1,0 1,0 0,1 0)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 10,1 1,10 1,10 10,1 10),(4 6,6 6,6 4,4 4,4 6)),((1 0,1 1,0 1,0 0,1 0)))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 10,0 10),(4 6,6 6,6 4,4 4,4 6))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 10,5 5,10 5,10 10,5 10)),((1 0,1 1,0 1,0 0,1 0)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)),((1 0,1 1,0 1,0 0,1 0)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 10,1 1,10 1,10 10,1 10),(4 6,6 6,6 4,4 4,4 6)),((1 0,1 1,0 1,0 0,1 0)))')),
+(ST_GEOMFROMTEXT('POLYGON((10 10,0 10,0 0,10 0,10 10),(5 6,5 5,6 5,6 4,4 4,4 6,5 6))')),
+(ST_GEOMFROMTEXT('POLYGON((10 10,0 10,0 0,10 0,10 10),(5 6,5 5,4 4,4 6,5 6))')),
+(ST_GEOMFROMTEXT('POLYGON((1 10,1 1,10 1,10 10,1 10),(4 6,6 6,6 4,4 4,4 6))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POLYGON((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((5 10,5 6,6 6,6 5,10 5,10 10,5 10))),POINT(1 1))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6))),POINT(1 1))')),
+(ST_GEOMFROMTEXT('POLYGON((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POLYGON((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((5 10,5 6,6 6,6 5,10 5,10 10,5 10))),POINT(1 1))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6))),POINT(1 1))')),
+(ST_GEOMFROMTEXT('POLYGON((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4))')),
+(ST_GEOMFROMTEXT('POLYGON((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 5,6 4))')),
+(ST_GEOMFROMTEXT('POLYGON((1 10,1 1,10 1,10 10,1 10),(4 6,6 6,6 4,4 4,4 6))')),
+(ST_GEOMFROMTEXT('POLYGON((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4))'));
+CREATE TABLE intersection (pk INT PRIMARY KEY AUTO_INCREMENT, g GEOMETRY NOT NULL);
+INSERT INTO intersection SELECT 0, ST_INTERSECTION(a.g, b.g) FROM t1 AS a JOIN t1 AS b ORDER BY a.pk, b.pk;
+SELECT SUM(ST_EQUALS(a.g, b.g)) FROM intersection AS a, intersection_results AS b WHERE a.pk = b.pk;
+SUM(ST_EQUALS(a.g, b.g))
+441
 #clean up
 DROP TABLE gis_geometrycollection;
 DROP TABLE gis_geometrycollection_2;
 DROP TABLE t1;
+DROP TABLE intersection;
+DROP TABLE intersection_results;
 #
 # Bug#21927558 ST_INTERSECTION(POLYGON, POLYGON) RETURNS SELF
 # INTERSECTING POLYGON
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/gis/r/spatial_operators_symdifference.result mysql-8.0-8.0.27/mysql-test/suite/gis/r/spatial_operators_symdifference.result
--- mysql-8.0-8.0.26/mysql-test/suite/gis/r/spatial_operators_symdifference.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/gis/r/spatial_operators_symdifference.result	2021-09-28 11:46:34.000000000 +0000
@@ -162,778 +162,634 @@
 #====================================================================================
 # point,point
 #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_center),ST_GEOMFROMTEXT(@star_center)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_center),ST_GEOMFROMTEXT(@star_center)))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_center)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_center)))
-MULTIPOINT((15 10),(15 25))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_center))) FROM gis_geometrycollection WHERE fid=105;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_center)))
-GEOMETRYCOLLECTION EMPTY
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_center),ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_center),ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('MULTIPOINT((15 10),(15 25))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('MULTIPOINT((15 10),(15 25))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')) FROM gis_geometrycollection WHERE fid=105;
+ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
 #====================================================================================
 # point,multipoint
 #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_bottom_left),ST_GEOMFROMTEXT(@star_bottom_points)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_bottom_left),ST_GEOMFROMTEXT(@star_bottom_points)))
-POINT(25 0)
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_center),ST_GEOMFROMTEXT(@star_bottom_points)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_center),ST_GEOMFROMTEXT(@star_bottom_points)))
-MULTIPOINT((5 0),(15 10),(25 0))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_bottom_points))) FROM gis_geometrycollection WHERE fid=106;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_bottom_points)))
-POINT(25 0)
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_bottom_left),ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('POINT(25 0)'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_bottom_left),ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('POINT(25 0)'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_center),ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(15 10),(25 0))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_center),ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(15 10),(25 0))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('POINT(25 0)')) FROM gis_geometrycollection WHERE fid=106;
+ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('POINT(25 0)'))
+1
 #====================================================================================
 # point,linestring
 #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_top_to_center)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_top_to_center)))
-LINESTRING(15 25,15 10)
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_bottom_left),ST_GEOMFROMTEXT(@star_top_to_center)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_bottom_left),ST_GEOMFROMTEXT(@star_top_to_center)))
-GEOMETRYCOLLECTION(LINESTRING(15 25,15 10),POINT(5 0))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top_to_center))) FROM gis_geometrycollection WHERE fid=104;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top_to_center)))
-LINESTRING(15 25,15 10)
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('LINESTRING(15 25,15 10)'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('LINESTRING(15 25,15 10)'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_bottom_left),ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(15 25,15 10),POINT(5 0))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_bottom_left),ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(15 25,15 10),POINT(5 0))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('LINESTRING(15 25,15 10)')) FROM gis_geometrycollection WHERE fid=104;
+ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('LINESTRING(15 25,15 10)'))
+1
 #====================================================================================
 # point,multilinestring
 #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_lines_near_vertical)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_lines_near_vertical)))
-LINESTRING(0 5,15 25,0 25)
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_center),ST_GEOMFROMTEXT(@star_lines_near_vertical)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_center),ST_GEOMFROMTEXT(@star_lines_near_vertical)))
-GEOMETRYCOLLECTION(MULTILINESTRING((0 5,15 25,0 25)),POINT(15 10))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_lines_near_vertical))) FROM gis_geometrycollection WHERE fid=104;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_lines_near_vertical)))
-LINESTRING(0 5,15 25,0 25)
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('LINESTRING(0 5,15 25,0 25)'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('LINESTRING(0 5,15 25,0 25)'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_center),ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((0 5,15 25,0 25)),POINT(15 10))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_center),ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((0 5,15 25,0 25)),POINT(15 10))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('LINESTRING(0 5,15 25,0 25)')) FROM gis_geometrycollection WHERE fid=104;
+ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('LINESTRING(0 5,15 25,0 25)'))
+1
 #====================================================================================
 # point,polygon
 #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star)))
-POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_3),ST_GEOMFROMTEXT(@star)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_3),ST_GEOMFROMTEXT(@star)))
-GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),POINT(75 25))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star))) FROM gis_geometrycollection WHERE fid=104;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star)))
-POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_3),ST_GEOMFROMTEXT(@star)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),POINT(75 25))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_3),ST_GEOMFROMTEXT(@star)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),POINT(75 25))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))')) FROM gis_geometrycollection WHERE fid=104;
+ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))'))
+1
 #====================================================================================
 # point,multipolygon
 #====================================================================================
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_of_elems)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_of_elems)))
-MULTIPOLYGON(((5 0,15 5,25 0,15 25,5 0)),((25 0,22 10,30 15,0 15,25 0)))
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_3),ST_GEOMFROMTEXT(@star_of_elems)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_3),ST_GEOMFROMTEXT(@star_of_elems)))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((5 0,15 5,25 0,15 25,5 0)),((25 0,22 10,30 15,0 15,25 0))),POINT(75 25))
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_of_elems))) FROM gis_geometrycollection WHERE fid=104;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_of_elems)))
-MULTIPOLYGON(((5 0,15 5,25 0,15 25,5 0)),((25 0,22 10,30 15,0 15,25 0)))
 #====================================================================================
 # point,geometrycollection
 #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_collection_elems)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_collection_elems)))
-POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_3),ST_GEOMFROMTEXT(@star_collection_elems)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_3),ST_GEOMFROMTEXT(@star_collection_elems)))
-GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),POINT(75 25))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_collection_elems))) FROM gis_geometrycollection WHERE fid=104;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_collection_elems)))
-POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_collection_multilinestr)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_collection_multilinestr)))
-GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),MULTILINESTRING((0 15,15 30,6 15),(4.2 12,0 5)))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POINT(0 0)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POINT(0 0)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')))
-POINT(0 0)
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POINT(0 0)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(),GEOMETRYCOLLECTION())')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POINT(0 0)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(),GEOMETRYCOLLECTION())')))
-POINT(0 0)
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_3),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),POINT(75 25))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_3),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),POINT(75 25))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))')) FROM gis_geometrycollection WHERE fid=104;
+ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_collection_multilinestr)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),MULTILINESTRING((0 15,15 30,6 15),(4.2 12,0 5)))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_collection_multilinestr)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),MULTILINESTRING((0 15,15 30,6 15),(4.2 12,0 5)))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POINT(0 0)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')),ST_GEOMFROMTEXT('POINT(0 0)'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POINT(0 0)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')),ST_GEOMFROMTEXT('POINT(0 0)'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POINT(0 0)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(),GEOMETRYCOLLECTION())')),ST_GEOMFROMTEXT('POINT(0 0)'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POINT(0 0)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(),GEOMETRYCOLLECTION())')),ST_GEOMFROMTEXT('POINT(0 0)'))
+1
 #====================================================================================
 # multipoint,point
 #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_top)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_top)))
-MULTIPOINT((5 0),(15 10),(25 0))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_bottom_points),ST_GEOMFROMTEXT(@star_center)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_bottom_points),ST_GEOMFROMTEXT(@star_center)))
-MULTIPOINT((5 0),(15 10),(25 0))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_bottom_left))) FROM gis_geometrycollection WHERE fid=108;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_bottom_left)))
-POINT(25 0)
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_top)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(15 10),(25 0))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_top)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(15 10),(25 0))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_bottom_points),ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(15 10),(25 0))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_bottom_points),ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(15 10),(25 0))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_bottom_left)),ST_GEOMFROMTEXT('POINT(25 0)')) FROM gis_geometrycollection WHERE fid=108;
+ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_bottom_left)),ST_GEOMFROMTEXT('POINT(25 0)'))
+1
 #====================================================================================
 # multipoint,multipoint
 #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_bottom_points)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_bottom_points)))
-MULTIPOINT((15 10),(15 25))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_bottom_points),ST_GEOMFROMTEXT(@star_all_points)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_bottom_points),ST_GEOMFROMTEXT(@star_all_points)))
-MULTIPOINT((15 10),(15 25))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_all_points_1)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_all_points_1)))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_all_points))) FROM gis_geometrycollection WHERE fid=108;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_all_points)))
-MULTIPOINT((15 10),(15 25))
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('MULTIPOINT((15 10),(15 25))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('MULTIPOINT((15 10),(15 25))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_bottom_points),ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('MULTIPOINT((15 10),(15 25))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_bottom_points),ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('MULTIPOINT((15 10),(15 25))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_all_points_1)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_all_points_1)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('MULTIPOINT((15 10),(15 25))')) FROM gis_geometrycollection WHERE fid=108;
+ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('MULTIPOINT((15 10),(15 25))'))
+1
 #====================================================================================
 # multipoint,linestring
 #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_top_to_center)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_top_to_center)))
-GEOMETRYCOLLECTION(LINESTRING(15 25,15 10),POINT(5 0),POINT(25 0))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_top_to_center)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_top_to_center)))
-GEOMETRYCOLLECTION(LINESTRING(15 25,15 10),POINT(5 0),POINT(25 0))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top_to_center))) FROM gis_geometrycollection WHERE fid=109;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top_to_center)))
-GEOMETRYCOLLECTION(LINESTRING(15 25,15 10),POINT(5 0),POINT(25 0))
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(15 25,15 10),POINT(5 0),POINT(25 0))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(15 25,15 10),POINT(5 0),POINT(25 0))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(15 25,15 10),POINT(5 0),POINT(25 0))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(15 25,15 10),POINT(5 0),POINT(25 0))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(15 25,15 10),POINT(5 0),POINT(25 0))')) FROM gis_geometrycollection WHERE fid=109;
+ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(15 25,15 10),POINT(5 0),POINT(25 0))'))
+1
 #====================================================================================
 # multipoint,multilinestring
 #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_lines_near_vertical)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_lines_near_vertical)))
-GEOMETRYCOLLECTION(MULTILINESTRING((0 5,15 25,0 25)),POINT(5 0),POINT(15 10),POINT(25 0))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_lines_near_horizontal)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_lines_near_horizontal)))
-GEOMETRYCOLLECTION(MULTILINESTRING((25 0,0 15,15 30,0 5)),POINT(5 0),POINT(15 10),POINT(15 25))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_lines_near_horizontal))) FROM gis_geometrycollection WHERE fid=109;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_lines_near_horizontal)))
-GEOMETRYCOLLECTION(MULTILINESTRING((25 0,0 15,15 30,0 5)),POINT(5 0),POINT(15 10),POINT(15 25))
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((0 5,15 25,0 25)),POINT(5 0),POINT(15 10),POINT(25 0))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((0 5,15 25,0 25)),POINT(5 0),POINT(15 10),POINT(25 0))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_lines_near_horizontal)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((25 0,0 15,15 30,0 5)),POINT(5 0),POINT(15 10),POINT(15 25))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_lines_near_horizontal)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((25 0,0 15,15 30,0 5)),POINT(5 0),POINT(15 10),POINT(15 25))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_lines_near_horizontal)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((25 0,0 15,15 30,0 5)),POINT(5 0),POINT(15 10),POINT(15 25))')) FROM gis_geometrycollection WHERE fid=109;
+ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_lines_near_horizontal)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((25 0,0 15,15 30,0 5)),POINT(5 0),POINT(15 10),POINT(15 25))'))
+1
 #====================================================================================
 # multipoint,polygon
 #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_elem_vertical)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_elem_vertical)))
-POLYGON((5 0,15 5,25 0,15 25,5 0))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_elem_horizontal)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_elem_horizontal)))
-GEOMETRYCOLLECTION(POLYGON((25 0,22 10,30 15,0 15,25 0)),POINT(5 0),POINT(15 25))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_elem_horizontal))) FROM gis_geometrycollection WHERE fid=109;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_elem_horizontal)))
-GEOMETRYCOLLECTION(POLYGON((25 0,22 10,30 15,0 15,25 0)),POINT(5 0),POINT(15 25))
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,15 25,5 0))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,15 25,5 0))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_elem_horizontal)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((25 0,22 10,30 15,0 15,25 0)),POINT(5 0),POINT(15 25))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_elem_horizontal)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((25 0,22 10,30 15,0 15,25 0)),POINT(5 0),POINT(15 25))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_elem_horizontal)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((25 0,22 10,30 15,0 15,25 0)),POINT(5 0),POINT(15 25))')) FROM gis_geometrycollection WHERE fid=109;
+ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_elem_horizontal)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((25 0,22 10,30 15,0 15,25 0)),POINT(5 0),POINT(15 25))'))
+1
 #====================================================================================
 # multipoint,multipolygon
 #====================================================================================
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOINT(0 0,0 30,30 25)'),ST_GEOMFROMTEXT(@star_of_elems)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOINT(0 0,0 30,30 25)'),ST_GEOMFROMTEXT(@star_of_elems)))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((5 0,15 5,25 0,15 25,5 0)),((25 0,22 10,30 15,0 15,25 0))),POINT(0 0),POINT(0 30),POINT(30 25))
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_of_elems)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_of_elems)))
-MULTIPOLYGON(((5 0,15 5,25 0,15 25,5 0)),((25 0,22 10,30 15,0 15,25 0)))
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_of_elems))) FROM gis_geometrycollection WHERE fid=109;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_of_elems)))
-MULTIPOLYGON(((5 0,15 5,25 0,15 25,5 0)),((25 0,22 10,30 15,0 15,25 0)))
 #====================================================================================
 # multipoint,geometrycollection
 #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOINT(0 0,0 30,30 25)'),ST_GEOMFROMTEXT(@star_collection_elems)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOINT(0 0,0 30,30 25)'),ST_GEOMFROMTEXT(@star_collection_elems)))
-GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),POINT(0 0),POINT(0 30),POINT(30 25))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_collection_elems)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_collection_elems)))
-POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_collection_elems))) FROM gis_geometrycollection WHERE fid=109;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_collection_elems)))
-POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_collection_multilinestr)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_collection_multilinestr)))
-GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),MULTILINESTRING((0 15,15 30,6 15),(4.2 12,0 5)))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOINT(0 0)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOINT(0 0)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')))
-POINT(0 0)
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOINT(0 0,1 1)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOINT(0 0,1 1)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')))
-MULTIPOINT((0 0),(1 1))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOINT(0 0,1 1)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(),GEOMETRYCOLLECTION())')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOINT(0 0,1 1)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(),GEOMETRYCOLLECTION())')))
-MULTIPOINT((0 0),(1 1))
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOINT(0 0,0 30,30 25)'),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),POINT(0 0),POINT(0 30),POINT(30 25))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOINT(0 0,0 30,30 25)'),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),POINT(0 0),POINT(0 30),POINT(30 25))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))')) FROM gis_geometrycollection WHERE fid=109;
+ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_collection_multilinestr)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),MULTILINESTRING((0 15,15 30,6 15),(4.2 12,0 5)))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_collection_multilinestr)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),MULTILINESTRING((0 15,15 30,6 15),(4.2 12
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOINT(0 0)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')),ST_GEOMFROMTEXT('POINT(0 0)'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOINT(0 0)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')),ST_GEOMFROMTEXT('POINT(0 0)'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOINT(0 0,1 1)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')),ST_GEOMFROMTEXT('MULTIPOINT((0 0),(1 1))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOINT(0 0,1 1)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')),ST_GEOMFROMTEXT('MULTIPOINT((0 0),(1 1))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOINT(0 0,1 1)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(),GEOMETRYCOLLECTION())')),ST_GEOMFROMTEXT('MULTIPOINT((0 0),(1 1))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOINT(0 0,1 1)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(),GEOMETRYCOLLECTION())')),ST_GEOMFROMTEXT('MULTIPOINT((0 0),(1 1))'))
+1
 #====================================================================================
 # linestring,point
 #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_center)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_center)))
-LINESTRING(15 25,15 10)
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('LINESTRING(15 25,15 10)'),ST_GEOMFROMTEXT('POINT(15 10)')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('LINESTRING(15 25,15 10)'),ST_GEOMFROMTEXT('POINT(15 10)')))
-LINESTRING(15 25,15 10)
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_bottom_left)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_bottom_left)))
-GEOMETRYCOLLECTION(LINESTRING(15 25,15 10),POINT(5 0))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,g2)) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=110 and fid2=105;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,g2))
-GEOMETRYCOLLECTION(LINESTRING(10 15,20 15),POINT(15 10))
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('LINESTRING(15 25,15 10)'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('LINESTRING(15 25,15 10)'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('LINESTRING(15 25,15 10)'),ST_GEOMFROMTEXT('POINT(15 10)')),ST_GEOMFROMTEXT('LINESTRING(15 25,15 10)'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('LINESTRING(15 25,15 10)'),ST_GEOMFROMTEXT('POINT(15 10)')),ST_GEOMFROMTEXT('LINESTRING(15 25,15 10)'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_bottom_left)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(15 25,15 10),POINT(5 0))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_bottom_left)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(15 25,15 10),POINT(5 0))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,g2),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(10 15,20 15),POINT(15 10))')) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=110 and fid2=105;
+ST_EQUALS(ST_SYMDIFFERENCE(g,g2),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(10 15,20 15),POINT(15 10))'))
+1
 #====================================================================================
 # linestring,multipoint
 #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_vertical),ST_GEOMFROMTEXT('MULTIPOINT(15 10,15 25)')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_vertical),ST_GEOMFROMTEXT('MULTIPOINT(15 10,15 25)')))
-LINESTRING(15 5,15 25)
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_vertical),ST_GEOMFROMTEXT(@star_all_points)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_vertical),ST_GEOMFROMTEXT(@star_all_points)))
-GEOMETRYCOLLECTION(LINESTRING(15 5,15 25),POINT(5 0),POINT(25 0))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT('MULTIPOINT(15 10,15 25)'))) FROM gis_geometrycollection WHERE fid=111;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT('MULTIPOINT(15 10,15 25)')))
-LINESTRING(15 5,15 25)
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_vertical),ST_GEOMFROMTEXT('MULTIPOINT(15 10,15 25)')),ST_GEOMFROMTEXT('LINESTRING(15 5,15 25)'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_vertical),ST_GEOMFROMTEXT('MULTIPOINT(15 10,15 25)')),ST_GEOMFROMTEXT('LINESTRING(15 5,15 25)'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_vertical),ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(15 5,15 25),POINT(5 0),POINT(25 0))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_vertical),ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(15 5,15 25),POINT(5 0),POINT(25 0))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT('MULTIPOINT(15 10,15 25)')),ST_GEOMFROMTEXT('LINESTRING(15 5,15 25)')) FROM gis_geometrycollection WHERE fid=111;
+ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT('MULTIPOINT(15 10,15 25)')),ST_GEOMFROMTEXT('LINESTRING(15 5,15 25)'))
+1
 #====================================================================================
 # linestring,linestring
 #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_vertical),ST_GEOMFROMTEXT(@star_top_to_center)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_vertical),ST_GEOMFROMTEXT(@star_top_to_center)))
-LINESTRING(15 5,15 10)
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_line_vertical)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_line_vertical)))
-LINESTRING(15 5,15 10)
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_top_to_center_1)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_top_to_center_1)))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top_to_center))) FROM gis_geometrycollection WHERE fid=111;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top_to_center)))
-LINESTRING(15 5,15 10)
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_vertical),ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('LINESTRING(15 5,15 10)'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_vertical),ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('LINESTRING(15 5,15 10)'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_line_vertical)),ST_GEOMFROMTEXT('LINESTRING(15 5,15 10)'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_line_vertical)),ST_GEOMFROMTEXT('LINESTRING(15 5,15 10)'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_top_to_center_1)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_top_to_center_1)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('LINESTRING(15 5,15 10)')) FROM gis_geometrycollection WHERE fid=111;
+ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('LINESTRING(15 5,15 10)'))
+1
 #====================================================================================
 # linestring,multilinestring
 #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_lines_near_horizontal)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_lines_near_horizontal)))
-MULTILINESTRING((10 15,20 15),(25 0,0 15,15 30,0 5))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_lines_near_vertical)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_lines_near_vertical)))
-MULTILINESTRING((10 15,20 15),(0 5,15 25,0 25))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_lines_near_horizontal))) FROM gis_geometrycollection WHERE fid=110;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_lines_near_horizontal)))
-MULTILINESTRING((10 15,20 15),(25 0,0 15,15 30,0 5))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('LINESTRING(0 0, 1 1)'),ST_GEOMFROMTEXT('MULTILINESTRING((0 0, 1 1))')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('LINESTRING(0 0, 1 1)'),ST_GEOMFROMTEXT('MULTILINESTRING((0 0, 1 1))')))
-GEOMETRYCOLLECTION EMPTY
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_lines_near_horizontal)),ST_GEOMFROMTEXT('MULTILINESTRING((10 15,20 15),(25 0,0 15,15 30,0 5))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_lines_near_horizontal)),ST_GEOMFROMTEXT('MULTILINESTRING((10 15,20 15),(25 0,0 15,15 30,0 5))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('MULTILINESTRING((10 15,20 15),(0 5,15 25,0 25))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('MULTILINESTRING((10 15,20 15),(0 5,15 25,0 25))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_lines_near_horizontal)),ST_GEOMFROMTEXT('MULTILINESTRING((10 15,20 15),(25 0,0 15,15 30,0 5))')) FROM gis_geometrycollection WHERE fid=110;
+ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_lines_near_horizontal)),ST_GEOMFROMTEXT('MULTILINESTRING((10 15,20 15),(25 0,0 15,15 30,0 5))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('LINESTRING(0 0, 1 1)'),ST_GEOMFROMTEXT('MULTILINESTRING((0 0, 1 1))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('LINESTRING(0 0, 1 1)'),ST_GEOMFROMTEXT('MULTILINESTRING((0 0, 1 1))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
 #====================================================================================
 # linestring,polygon
 #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT('POLYGON((11 15,19 15,19 10,11 15))')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT('POLYGON((11 15,19 15,19 10,11 15))')))
-GEOMETRYCOLLECTION(POLYGON((11 15,19 10,19 15,11 15)),MULTILINESTRING((10 15,11 15),(19 15,20 15)))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_elem_horizontal)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_elem_horizontal)))
-POLYGON((25 0,22 10,30 15,0 15,25 0))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT('POLYGON((11 15,19 15,19 25,11 15))'))) FROM gis_geometrycollection WHERE fid=110;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT('POLYGON((11 15,19 15,19 25,11 15))')))
-GEOMETRYCOLLECTION(POLYGON((11 15,19 15,19 25,11 15)),MULTILINESTRING((10 15,11 15),(19 15,20 15)))
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT('POLYGON((11 15,19 15,19 10,11 15))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((11 15,19 10,19 15,11 15)),MULTILINESTRING((10 15,11 15),(19 15,20 15)))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT('POLYGON((11 15,19 15,19 10,11 15))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((11 15,19 10,19 15,11 15)),MULTILINESTRING((10 15,11 15),(19 15,20 15)))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_elem_horizontal)),ST_GEOMFROMTEXT('POLYGON((25 0,22 10,30 15,0 15,25 0))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_elem_horizontal)),ST_GEOMFROMTEXT('POLYGON((25 0,22 10,30 15,0 15,25 0))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT('POLYGON((11 15,19 15,19 25,11 15))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((11 15,19 15,19 25,11 15)),MULTILINESTRING((10 15,11 15),(19 15,20 15)))')) FROM gis_geometrycollection WHERE fid=110;
+ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT('POLYGON((11 15,19 15,19 25,11 15))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((11 15,19 15,19 25,11 15)),MULTILINESTRING((10 15,11 15),(19 15,20 15)))'))
+1
 #====================================================================================
 # linestring,multipolygon
 #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT('MULTIPOLYGON(((11 15,19 15,19 25,11 15)))')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT('MULTIPOLYGON(((11 15,19 15,19 25,11 15)))')))
-GEOMETRYCOLLECTION(POLYGON((11 15,19 15,19 25,11 15)),MULTILINESTRING((10 15,11 15),(19 15,20 15)))
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_of_elems)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_of_elems)))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((5 0,15 5,25 0,15 25,5 0)),((25 0,22 10,30 15,0 15,25 0))),MULTILINESTRING((10 15,11 15),(19 15,20 15)))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT('MULTIPOLYGON(((11 15,19 15,19 25,11 15)),((25 0,0 15,25 10,25 0)))'))) FROM gis_geometrycollection WHERE fid=110;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT('MULTIPOLYGON(((11 15,19 15,19 25,11 15)),((25 0,0 15,25 10,25 0)))')))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((11 15,19 15,19 25,11 15)),((25 0,25 10,0 15,25 0))),MULTILINESTRING((10 15,11 15),(19 15,20 15)))
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT('MULTIPOLYGON(((11 15,19 15,19 25,11 15)))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((11 15,19 15,19 25,11 15)),MULTILINESTRING((10 15,11 15),(19 15,20 15)))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT('MULTIPOLYGON(((11 15,19 15,19 25,11 15)))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((11 15,19 15,19 25,11 15)),MULTILINESTRING((10 15,11 15),(19 15,20 15)))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT('MULTIPOLYGON(((11 15,19 15,19 25,11 15)),((25 0,0 15,25 10,25 0)))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((11 15,19 15,19 25,11 15)),((25 0,25 10,0 15,25 0))),MULTILINESTRING((10 15,11 15),(19 15,20 15)))')) FROM gis_geometrycollection WHERE fid=110;
+ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT('MULTIPOLYGON(((11 15,19 15,19 25,11 15)),((25 0,0 15,25 10,25 0)))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((11 15,19 15,19 25,11 15)),((25 0,25 10,0 15,25 0))),MULTILINESTRING((10 15,11 15),(19 15
+1
 #====================================================================================
 # linestring,geometrycollection
 #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_collection_elems)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_collection_elems)))
-POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_collection_elems_3)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_collection_elems_3)))
-GEOMETRYCOLLECTION(POLYGON((65 0,75 5,85 0,82 10,90 15,80 15,75 25,70 15,60 15,67 10,65 0)),LINESTRING(10 15,20 15))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_collection_elems))) FROM gis_geometrycollection WHERE fid=110;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_collection_elems)))
-POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_collection_multilinestr)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_collection_multilinestr)))
-GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),MULTILINESTRING((0 15,15 30,6 15),(4.2 12,0 5)))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('LINESTRING(0 0,1 1)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('LINESTRING(0 0,1 1)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')))
-LINESTRING(0 0,1 1)
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('LINESTRING(0 0,1 1)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(),GEOMETRYCOLLECTION())')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('LINESTRING(0 0,1 1)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(),GEOMETRYCOLLECTION())')))
-LINESTRING(0 0,1 1)
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_collection_elems_3)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((65 0,75 5,85 0,82 10,90 15,80 15,75 25,70 15,60 15,67 10,65 0)),LINESTRING(10 15,20 15))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_collection_elems_3)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((65 0,75 5,85 0,82 10,90 15,80 15,75 25,70 15,60 15,67 10,65 0)),LINESTRING(10 15,20 15))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))')) FROM gis_geometrycollection WHERE fid=110;
+ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_collection_multilinestr)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),MULTILINESTRING((0 15,15 30,6 15),(4.2 12,0 5)))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_collection_multilinestr)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),MULTILINESTRING((0 15,15 30,6 15),(4
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('LINESTRING(0 0,1 1)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')),ST_GEOMFROMTEXT('LINESTRING(0 0,1 1)'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('LINESTRING(0 0,1 1)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')),ST_GEOMFROMTEXT('LINESTRING(0 0,1 1)'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('LINESTRING(0 0,1 1)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(),GEOMETRYCOLLECTION())')),ST_GEOMFROMTEXT('LINESTRING(0 0,1 1)'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('LINESTRING(0 0,1 1)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(),GEOMETRYCOLLECTION())')),ST_GEOMFROMTEXT('LINESTRING(0 0,1 1)'))
+1
 #====================================================================================
 # multilinestring,point
 #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_top)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_top)))
-LINESTRING(0 5,15 25,0 25)
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_center)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_center)))
-GEOMETRYCOLLECTION(MULTILINESTRING((0 5,15 25,0 25)),POINT(15 10))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top))) FROM gis_geometrycollection WHERE fid=114;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top)))
-LINESTRING(0 5,15 25,0 25)
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_top)),ST_GEOMFROMTEXT('LINESTRING(0 5,15 25,0 25)'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_top)),ST_GEOMFROMTEXT('LINESTRING(0 5,15 25,0 25)'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((0 5,15 25,0 25)),POINT(15 10))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((0 5,15 25,0 25)),POINT(15 10))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top)),ST_GEOMFROMTEXT('LINESTRING(0 5,15 25,0 25)')) FROM gis_geometrycollection WHERE fid=114;
+ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top)),ST_GEOMFROMTEXT('LINESTRING(0 5,15 25,0 25)'))
+1
 #====================================================================================
 # multilinestring,multipoint
 #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_bottom_points)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_bottom_points)))
-GEOMETRYCOLLECTION(MULTILINESTRING((0 5,15 25,0 25)),POINT(5 0),POINT(25 0))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_all_points)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_all_points)))
-GEOMETRYCOLLECTION(MULTILINESTRING((0 5,15 25,0 25)),POINT(5 0),POINT(15 10),POINT(25 0))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_bottom_points))) FROM gis_geometrycollection WHERE fid=114;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_bottom_points)))
-GEOMETRYCOLLECTION(MULTILINESTRING((0 5,15 25,0 25)),POINT(5 0),POINT(25 0))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,g2)) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=114 and fid2=108;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,g2))
-GEOMETRYCOLLECTION(MULTILINESTRING((0 5,15 25,0 25)),POINT(5 0),POINT(25 0))
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((0 5,15 25,0 25)),POINT(5 0),POINT(25 0))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((0 5,15 25,0 25)),POINT(5 0),POINT(25 0))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((0 5,15 25,0 25)),POINT(5 0),POINT(15 10),POINT(25 0))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((0 5,15 25,0 25)),POINT(5 0),POINT(15 10),POINT(25 0))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((0 5,15 25,0 25)),POINT(5 0),POINT(25 0))')) FROM gis_geometrycollection WHERE fid=114;
+ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((0 5,15 25,0 25)),POINT(5 0),POINT(25 0))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,g2),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((0 5,15 25,0 25)),POINT(5 0),POINT(25 0))')) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=114 and fid2=108;
+ST_EQUALS(ST_SYMDIFFERENCE(g,g2),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((0 5,15 25,0 25)),POINT(5 0),POINT(25 0))'))
+1
 #====================================================================================
 # multilinestring,linestring
 #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_line_vertical)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_line_vertical)))
-MULTILINESTRING((15 5,15 25),(0 5,15 25,0 25))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_line_horizontal)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_line_horizontal)))
-MULTILINESTRING((10 15,20 15),(0 5,15 25,0 25))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_line_vertical))) FROM gis_geometrycollection WHERE fid=114;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_line_vertical)))
-MULTILINESTRING((15 5,15 25),(0 5,15 25,0 25))
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_line_vertical)),ST_GEOMFROMTEXT('MULTILINESTRING((15 5,15 25),(0 5,15 25,0 25))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_line_vertical)),ST_GEOMFROMTEXT('MULTILINESTRING((15 5,15 25),(0 5,15 25,0 25))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_line_horizontal)),ST_GEOMFROMTEXT('MULTILINESTRING((10 15,20 15),(0 5,15 25,0 25))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_line_horizontal)),ST_GEOMFROMTEXT('MULTILINESTRING((10 15,20 15),(0 5,15 25,0 25))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_line_vertical)),ST_GEOMFROMTEXT('MULTILINESTRING((15 5,15 25),(0 5,15 25,0 25))')) FROM gis_geometrycollection WHERE fid=114;
+ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_line_vertical)),ST_GEOMFROMTEXT('MULTILINESTRING((15 5,15 25),(0 5,15 25,0 25))'))
+1
 #====================================================================================
 # multilinestring,multilinestring
 #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT('MULTILINESTRING((0 5,15 25,0 15))')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT('MULTILINESTRING((0 5,15 25,0 15))')))
-MULTILINESTRING((15 25,0 25),(15 25,0 15))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_lines_near_horizontal)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_lines_near_horizontal)))
-MULTILINESTRING((0 5,15 25,0 25),(25 0,0 15,15 30,0 5))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT('MULTILINESTRING((0 5,15 25,0 15))'))) FROM gis_geometrycollection WHERE fid=114;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT('MULTILINESTRING((0 5,15 25,0 15))')))
-MULTILINESTRING((15 25,0 25),(15 25,0 15))
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT('MULTILINESTRING((0 5,15 25,0 15))')),ST_GEOMFROMTEXT('MULTILINESTRING((15 25,0 25),(15 25,0 15))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT('MULTILINESTRING((0 5,15 25,0 15))')),ST_GEOMFROMTEXT('MULTILINESTRING((15 25,0 25),(15 25,0 15))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_lines_near_horizontal)),ST_GEOMFROMTEXT('MULTILINESTRING((0 5,15 25,0 25),(25 0,0 15,15 30,0 5))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_lines_near_horizontal)),ST_GEOMFROMTEXT('MULTILINESTRING((0 5,15 25,0 25),(25 0,0 15,15 30,0 5))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT('MULTILINESTRING((0 5,15 25,0 15))')),ST_GEOMFROMTEXT('MULTILINESTRING((15 25,0 25),(15 25,0 15))')) FROM gis_geometrycollection WHERE fid=114;
+ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT('MULTILINESTRING((0 5,15 25,0 15))')),ST_GEOMFROMTEXT('MULTILINESTRING((15 25,0 25),(15 25,0 15))'))
+1
 #====================================================================================
 # multilinestring,multilinestring
 #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_line_vertical))) FROM gis_geometrycollection WHERE fid=114;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_line_vertical)))
-MULTILINESTRING((15 5,15 25),(0 5,15 25,0 25))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_elem_vertical)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_elem_vertical)))
-GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,15 25,5 0)),LINESTRING(0 5,15 25,0 25))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_elem_horizontal)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_elem_horizontal)))
-GEOMETRYCOLLECTION(POLYGON((25 0,22 10,30 15,0 15,25 0)),MULTILINESTRING((0 5,5.172413793103448 11.89655172413793),(7.5 15,15 25,0 25)))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_elem_vertical))) FROM gis_geometrycollection WHERE fid=114;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_elem_vertical)))
-GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,15 25,5 0)),LINESTRING(0 5,15 25,0 25))
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_line_vertical)),ST_GEOMFROMTEXT('MULTILINESTRING((15 5,15 25),(0 5,15 25,0 25))')) FROM gis_geometrycollection WHERE fid=114;
+ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_line_vertical)),ST_GEOMFROMTEXT('MULTILINESTRING((15 5,15 25),(0 5,15 25,0 25))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,15 25,5 0)),LINESTRING(0 5,15 25,0 25))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,15 25,5 0)),LINESTRING(0 5,15 25,0 25))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_elem_horizontal)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((25 0,22 10,30 15,0 15,25 0)),MULTILINESTRING((0 5,5.172413793103448 11.89655172413793),(7.5 15,15 25,0 25)))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_elem_horizontal)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((25 0,22 10,30 15,0 15,25 0)),MULTILINESTRING((0 5,5.172413793103448 11.89655172413793),(7.5 15,15 25
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,15 25,5 0)),LINESTRING(0 5,15 25,0 25))')) FROM gis_geometrycollection WHERE fid=114;
+ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,15 25,5 0)),LINESTRING(0 5,15 25,0 25))'))
+1
 #====================================================================================
 # multilinestring,multipolygon
 #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTILINESTRING((0 25,25 0,25 30))'),ST_GEOMFROMTEXT(@star_elem_vertical)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTILINESTRING((0 25,25 0,25 30))'),ST_GEOMFROMTEXT(@star_elem_vertical)))
-GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,15 25,5 0)),MULTILINESTRING((0 25,10.714285714285715 14.285714285714286),(25 0,25 30)))
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_of_elems)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_of_elems)))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((5 0,15 5,25 0,15 25,5 0)),((25 0,22 10,30 15,0 15,25 0))),MULTILINESTRING((0 5,5.172413793103448 11.89655172413793),(7.5 15,15 25,0 25)))
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_of_elems))) FROM gis_geometrycollection WHERE fid=114;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_of_elems)))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((5 0,15 5,25 0,15 25,5 0)),((25 0,22 10,30 15,0 15,25 0))),MULTILINESTRING((0 5,5.172413793103448 11.89655172413793),(7.5 15,15 25,0 25)))
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTILINESTRING((0 25,25 0,25 30))'),ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,15 25,5 0)),MULTILINESTRING((0 25,10.714285714285715 14.285714285714286),(25 0,25 30)))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTILINESTRING((0 25,25 0,25 30))'),ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,15 25,5 0)),MULTILINESTRING((0 25,10.714285714285715 14.285714285714286),(25 
+1
 #====================================================================================
 # multilinestring,geometrycollection
 #====================================================================================
-# Invalid geometry in input.
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTILINESTRING((0 25,25 0,25 30))'),ST_GEOMFROMTEXT(@star_collection_elems)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTILINESTRING((0 25,25 0,25 30))'),ST_GEOMFROMTEXT(@star_collection_elems)))
-GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),MULTILINESTRING((0 25,10 15),(25 0,25 11.875),(25 15,25 30)))
-# Invalid geometry in input.
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_collection_elems)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_collection_elems)))
-GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),MULTILINESTRING((0 5,4.883720930232558 11.511627906976745),(7.5 15,15 25,0 25)))
-# Invalid geometry in input.
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_collection_elems))) FROM gis_geometrycollection WHERE fid=114;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_collection_elems)))
-GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),MULTILINESTRING((0 5,4.883720930232558 11.511627906976745),(7.5 15,15 25,0 25)))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_horizontal),ST_GEOMFROMTEXT(@star_collection_multilinestr)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_horizontal),ST_GEOMFROMTEXT(@star_collection_multilinestr)))
-POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTILINESTRING((0 0,1 1),(2 2,3 3))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTILINESTRING((0 0,1 1),(2 2,3 3))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')))
-MULTILINESTRING((0 0,1 1),(2 2,3 3))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTILINESTRING((0 0,1 1,2 2))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
-                                                                                                        'GEOMETRYCOLLECTION(),GEOMETRYCOLLECTION())')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTILINESTRING((0 0,1 1,2 2))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_horizontal),ST_GEOMFROMTEXT(@star_collection_multilinestr)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_horizontal),ST_GEOMFROMTEXT(@star_collection_multilinestr)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTILINESTRING((0 0,1 1),(2 2,3 3))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')),ST_GEOMFROMTEXT('MULTILINESTRING((0 0,1 1),(2 2,3 3))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTILINESTRING((0 0,1 1),(2 2,3 3))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')),ST_GEOMFROMTEXT('MULTILINESTRING((0 0,1 1),(2 2,3 3))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTILINESTRING((0 0,1 1,2 2))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
+                                                                                                        'GEOMETRYCOLLECTION(),GEOMETRYCOLLECTION())')),ST_GEOMFROMTEXT('LINESTRING(0 0,1 1,2 2)'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTILINESTRING((0 0,1 1,2 2))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
                                                                                                         'GEOMETRYCOLLECTION(),GEOMETRYCOLLEC
-LINESTRING(0 0,1 1,2 2)
+1
 #====================================================================================
 # polygon,point
 #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_center)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_center)))
-POLYGON((5 0,7 10,0 15,10 15,15 25,20 15,30 15,22 10,25 0,15 5,5 0))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT('POINT(0 0)')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT('POINT(0 0)')))
-GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,15 25,5 0)),POINT(0 0))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_center))) FROM gis_geometrycollection WHERE fid=100;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_center)))
-POLYGON((5 0,7 10,0 15,10 15,15 25,20 15,30 15,22 10,25 0,15 5,5 0))
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('POLYGON((5 0,7 10,0 15,10 15,15 25,20 15,30 15,22 10,25 0,15 5,5 0))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('POLYGON((5 0,7 10,0 15,10 15,15 25,20 15,30 15,22 10,25 0,15 5,5 0))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT('POINT(0 0)')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,15 25,5 0)),POINT(0 0))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT('POINT(0 0)')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,15 25,5 0)),POINT(0 0))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('POLYGON((5 0,7 10,0 15,10 15,15 25,20 15,30 15,22 10,25 0,15 5,5 0))')) FROM gis_geometrycollection WHERE fid=100;
+ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('POLYGON((5 0,7 10,0 15,10 15,15 25,20 15,30 15,22 10,25 0,15 5,5 0))'))
+1
 #====================================================================================
 # polygon,multipoint
 #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_all_points)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_all_points)))
-POLYGON((5 0,7 10,0 15,10 15,15 25,20 15,30 15,22 10,25 0,15 5,5 0))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT('MULTIPOINT(0 0,30 25)')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT('MULTIPOINT(0 0,30 25)')))
-GEOMETRYCOLLECTION(POLYGON((5 0,15 25,25 0,15 5,5 0)),POINT(0 0),POINT(30 25))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_all_points))) FROM gis_geometrycollection WHERE fid=100;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_all_points)))
-POLYGON((5 0,7 10,0 15,10 15,15 25,20 15,30 15,22 10,25 0,15 5,5 0))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_all_points)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_all_points)))
-POLYGON((5 0,7 10,0 15,10 15,15 25,20 15,30 15,22 10,25 0,15 5,5 0))
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('POLYGON((5 0,7 10,0 15,10 15,15 25,20 15,30 15,22 10,25 0,15 5,5 0))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('POLYGON((5 0,7 10,0 15,10 15,15 25,20 15,30 15,22 10,25 0,15 5,5 0))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT('MULTIPOINT(0 0,30 25)')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 25,25 0,15 5,5 0)),POINT(0 0),POINT(30 25))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT('MULTIPOINT(0 0,30 25)')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 25,25 0,15 5,5 0)),POINT(0 0),POINT(30 25))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('POLYGON((5 0,7 10,0 15,10 15,15 25,20 15,30 15,22 10,25 0,15 5,5 0))')) FROM gis_geometrycollection WHERE fid=100;
+ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('POLYGON((5 0,7 10,0 15,10 15,15 25,20 15,30 15,22 10,25 0,15 5,5 0))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('POLYGON((5 0,7 10,0 15,10 15,15 25,20 15,30 15,22 10,25 0,15 5,5 0))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('POLYGON((5 0,7 10,0 15,10 15,15 25,20 15,30 15,22 10,25 0,15 5,5 0))'))
+1
 #====================================================================================
 # polygon,linestring
 #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_line_vertical)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_line_vertical)))
-POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star_line_horizontal)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star_line_horizontal)))
-GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,15 25,5 0)),MULTILINESTRING((10 15,11 15),(19 15,20 15)))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_line_vertical))) FROM gis_geometrycollection WHERE fid=100;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_line_vertical)))
-POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,g2)) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=100 and fid2=111;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,g2))
-POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_line_vertical)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_line_vertical)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star_line_horizontal)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,15 25,5 0)),MULTILINESTRING((10 15,11 15),(19 15,20 15)))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star_line_horizontal)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,15 25,5 0)),MULTILINESTRING((10 15,11 15),(19 15,20 15)))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_line_vertical)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))')) FROM gis_geometrycollection WHERE fid=100;
+ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_line_vertical)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,g2),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))')) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=100 and fid2=111;
+ST_EQUALS(ST_SYMDIFFERENCE(g,g2),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))'))
+1
 #====================================================================================
 # polygon,multilinestring
 #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_lines_near_vertical)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_lines_near_vertical)))
-GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),MULTILINESTRING((0 5,4.883720930232558 11.511627906976745),(7.5 15,15 25,0 25)))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star_lines_near_horizontal)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star_lines_near_horizontal)))
-GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,15 25,5 0)),LINESTRING(8.870967741935484 9.67741935483871,0 15,15 30,0 5))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_lines_near_vertical))) FROM gis_geometrycollection WHERE fid=100;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_lines_near_vertical)))
-GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),MULTILINESTRING((0 5,4.883720930232558 11.511627906976745),(7.5 15,15 25,0 25)))
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),MULTILINESTRING((0 5,4.883720930232558 11.511627906976745),(7.5 15,15 25,0 25)))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),MULTILINESTRING((0 5,4.883720930232558 11.51162790697674
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star_lines_near_horizontal)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,15 25,5 0)),LINESTRING(8.870967741935484 9.67741935483871,0 15,15 30,0 5))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star_lines_near_horizontal)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,15 25,5 0)),LINESTRING(8.870967741935484 9.67741935483871,0 15,15 30,0 5))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),MULTILINESTRING((0 5,4.883720930232558 11.511627906976745),(7.5 15,15 25,0 25)))')) FROM gis_geometrycollection WHERE fid=100;
+ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),MULTILINESTRING((0 5,4.883720930232558 11.511627906976745),(7.5 15,15 25,0 25
+1
 #====================================================================================
 # polygon,polygon
 #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_elem_vertical)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_elem_vertical)))
-MULTIPOLYGON(((15 25,25 0,22 10,30 15,20 15,15 25)),((15 25,10 15,0 15,7 10,5 0,15 25)))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_3),ST_GEOMFROMTEXT(@star_elem_vertical)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_3),ST_GEOMFROMTEXT(@star_elem_vertical)))
-MULTIPOLYGON(((65 0,75 5,85 0,82 10,90 15,80 15,75 25,70 15,60 15,67 10,65 0)),((5 0,15 5,25 0,15 25,5 0)))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star)))
-MULTIPOLYGON(((15 25,25 0,22 10,30 15,20 15,15 25)),((15 25,10 15,0 15,7 10,5 0,15 25)))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_elem_vertical))) FROM gis_geometrycollection WHERE fid=100;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_elem_vertical)))
-MULTIPOLYGON(((15 25,25 0,22 10,30 15,20 15,15 25)),((15 25,10 15,0 15,7 10,5 0,15 25)))
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('MULTIPOLYGON(((15 25,25 0,22 10,30 15,20 15,15 25)),((15 25,10 15,0 15,7 10,5 0,15 25)))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('MULTIPOLYGON(((15 25,25 0,22 10,30 15,20 15,15 25)),((15 25,10 15,0 15,7 10,5 0,15 25)))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_3),ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('MULTIPOLYGON(((65 0,75 5,85 0,82 10,90 15,80 15,75 25,70 15,60 15,67 10,65 0)),((5 0,15 5,25 0,15 25,5 0)))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_3),ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('MULTIPOLYGON(((65 0,75 5,85 0,82 10,90 15,80 15,75 25,70 15,60 15,67 10,65 0)),((5 0,15 5,25 0,15 25,5 0)))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star)),ST_GEOMFROMTEXT('MULTIPOLYGON(((15 25,25 0,22 10,30 15,20 15,15 25)),((15 25,10 15,0 15,7 10,5 0,15 25)))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star)),ST_GEOMFROMTEXT('MULTIPOLYGON(((15 25,25 0,22 10,30 15,20 15,15 25)),((15 25,10 15,0 15,7 10,5 0,15 25)))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('MULTIPOLYGON(((15 25,25 0,22 10,30 15,20 15,15 25)),((15 25,10 15,0 15,7 10,5 0,15 25)))')) FROM gis_geometrycollection WHERE fid=100;
+ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('MULTIPOLYGON(((15 25,25 0,22 10,30 15,20 15,15 25)),((15 25,10 15,0 15,7 10,5 0,15 25)))'))
+1
 #====================================================================================
 # polygon,multipolygon
 #====================================================================================
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_of_elems)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_of_elems)))
-GEOMETRYCOLLECTION EMPTY
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_of_elems_3)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_of_elems_3)))
-MULTIPOLYGON(((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),((65 0,75 5,85 0,75 25,65 0)),((85 0,82 10,90 15,60 15,85 0)))
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_of_elems))) FROM gis_geometrycollection WHERE fid=100;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_of_elems)))
-GEOMETRYCOLLECTION EMPTY
 #====================================================================================
 # polygon,geometrycollection
 #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_collection_elems_3)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_collection_elems_3)))
-MULTIPOLYGON(((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),((65 0,75 5,85 0,82 10,90 15,80 15,75 25,70 15,60 15,67 10,65 0)))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POLYGON((0 0,2 2,3 0,0 0))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POLYGON((0 0,2 2,3 0,0 0))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')))
-POLYGON((0 0,2 2,3 0,0 0))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 5,5 5,5 0,0 0),(2 2,2 3,3 3,3 2,2 2))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
-                                                                                                                      'GEOMETRYCOLLECTION())')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 5,5 5,5 0,0 0),(2 2,2 3,3 3,3 2,2 2))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_collection_elems_3)),ST_GEOMFROMTEXT('MULTIPOLYGON(((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),((65 0,75 5,85 0,82 10,90 15,80 15,75 25,70 15,60 15,67 10,65 0)))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_collection_elems_3)),ST_GEOMFROMTEXT('MULTIPOLYGON(((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),((65 0,75 5,85 0,82 10,90 15,80 15,75 25,70 15,60 15,67 10,65 0)))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POLYGON((0 0,2 2,3 0,0 0))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')),ST_GEOMFROMTEXT('POLYGON((0 0,2 2,3 0,0 0))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POLYGON((0 0,2 2,3 0,0 0))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')),ST_GEOMFROMTEXT('POLYGON((0 0,2 2,3 0,0 0))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 5,5 5,5 0,0 0),(2 2,2 3,3 3,3 2,2 2))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
+                                                                                                                      'GEOMETRYCOLLECTION())')),ST_GEOMFROMTEXT('POLYGON((0 0,0 5,5 5,5 0,0 0),(2 2,2 3,3 3,3 2,2 2))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 5,5 5,5 0,0 0),(2 2,2 3,3 3,3 2,2 2))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
                                                                                                                       
-POLYGON((0 0,0 5,5 5,5 0,0 0),(2 2,2 3,3 3,3 2,2 2))
+1
 #====================================================================================
 # multipolygon,point
 #====================================================================================
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_top)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_top)))
-MULTIPOLYGON(((5 0,15 25,25 0,15 5,5 0)),((25 0,0 15,30 15,22 10,25 0)))
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('POINT(30 30)')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('POINT(30 30)')))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((5 0,15 5,25 0,15 25,5 0)),((25 0,22 10,30 15,0 15,25 0))),POINT(30 30))
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top))) FROM gis_geometrycollection WHERE fid=103;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top)))
-MULTIPOLYGON(((5 0,15 25,25 0,15 5,5 0)),((25 0,0 15,30 15,22 10,25 0)))
 #====================================================================================
 # multipolygon,multipoint
 #====================================================================================
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_bottom_points)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_bottom_points)))
-MULTIPOLYGON(((5 0,15 25,25 0,15 5,5 0)),((25 0,0 15,30 15,22 10,25 0)))
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('MULTIPOINT(30 30,0 35)')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('MULTIPOINT(30 30,0 35)')))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((5 0,15 25,25 0,15 5,5 0)),((25 0,0 15,30 15,22 10,25 0))),POINT(0 35),POINT(30 30))
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_bottom_points))) FROM gis_geometrycollection WHERE fid=103;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_bottom_points)))
-MULTIPOLYGON(((5 0,15 25,25 0,15 5,5 0)),((25 0,0 15,30 15,22 10,25 0)))
 #====================================================================================
 # multipolygon,linestring
 #====================================================================================
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_top_to_center)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_top_to_center)))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((5 0,15 5,25 0,15 25,5 0)),((25 0,22 10,30 15,0 15,25 0))),LINESTRING(15 25,15 15))
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('LINESTRING(30 30,0 35)')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('LINESTRING(30 30,0 35)')))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((5 0,15 5,25 0,15 25,5 0)),((25 0,22 10,30 15,0 15,25 0))),LINESTRING(30 30,0 35))
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top_to_center))) FROM gis_geometrycollection WHERE fid=103;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top_to_center)))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((5 0,15 5,25 0,15 25,5 0)),((25 0,22 10,30 15,0 15,25 0))),LINESTRING(15 25,15 15))
 #====================================================================================
 # multipolygon,multilinestring
 #====================================================================================
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_lines_near_vertical)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_lines_near_vertical)))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((5 0,15 5,25 0,15 25,5 0)),((25 0,22 10,30 15,0 15,25 0))),MULTILINESTRING((0 5,5.172413793103448 11.89655172413793),(7.5 15,15 25,0 25)))
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('MULTILINESTRING((0 30,30 30,0 35))')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('MULTILINESTRING((0 30,30 30,0 35))')))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((5 0,15 5,25 0,15 25,5 0)),((25 0,22 10,30 15,0 15,25 0))),LINESTRING(0 30,30 30,0 35))
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_lines_near_vertical))) FROM gis_geometrycollection WHERE fid=103;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_lines_near_vertical)))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((5 0,15 5,25 0,15 25,5 0)),((25 0,22 10,30 15,0 15,25 0))),MULTILINESTRING((0 5,5.172413793103448 11.89655172413793),(7.5 15,15 25,0 25)))
 #====================================================================================
 # multipolygon,polygon
 #====================================================================================
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star)))
-GEOMETRYCOLLECTION EMPTY
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('POLYGON((0 0,15 25,35 0,0 0))')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('POLYGON((0 0,15 25,35 0,0 0))')))
-MULTIPOLYGON(((25.333333333333332 12.083333333333334,30 15,23 15,25.333333333333332 12.083333333333334)),((25.333333333333332 12.083333333333334,22 10,25 0,35 0,25.333333333333332 12.083333333333334)),((23 15,15 25,9 15,23 15)),((9 15,0 15,6.617647058823529 11.029411764705882,9 15)),((25 0,15 5,5 0,25 0)))
 #====================================================================================
 # multipolygon,multipolygon
 #====================================================================================
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)))')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)))')))
-MULTIPOLYGON(((25 0,22 10,30 15,0 15,25 0)),((5 0,15 5,25 0,15 25,5 0)),((5 0,5 5,0 5,0 0,5 0)))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((5 5,5 10,10 10,10 0,5 5)))'),
-ST_GEOMFROMTEXT('MULTIPOLYGON(((3 3,3 7,7 7,7 3,3 3)),((9 9,9 15,15 15,15 9,9 9)))')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((5 5,5 10,10 10,10 0,5 5)))'),
-ST_GEOMFROMTEXT('MULTIPOLYGON(((3 3,3 7,7 7,7 3,3 3)),((9 9,9 15,15 15,15 9,9 9)))')))
-MULTIPOLYGON(((5 3,3 3,3 5,0 5,0 0,5 0,5 3)),((5 3,7 3,5 5,5 3)),((3 5,5 5,5 7,3 7,3 5)),((9 10,5 10,5 7,7 7,7 3,10 0,10 9,9 9,9 10)),((9 10,10 10,10 9,15 9,15 15,9 15,9 10)))
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((5 5,5 10,10 10,10 0,5 5)))'),
+ST_GEOMFROMTEXT('MULTIPOLYGON(((3 3,3 7,7 7,7 3,3 3)),((9 9,9 15,15 15,15 9,9 9)))')),ST_GEOMFROMTEXT('MULTIPOLYGON(((5 3,3 3,3 5,0 5,0 0,5 0,5 3)),((5 3,7 3,5 5,5 3)),((3 5,5 5,5 7,3 7,3 5)),((9 10,5 10,5 7,7 7,7 3,10 0,10 9,9 9,9 10)),((9 10,10 10,10 9,15 9,15 15,9 15,9 10)))
+'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((5 5,5 10,10 10,10 0,5 5)))'),
+ST_GEOMFROMTEXT('MULTIPOLYGON(((3 3,3 7,7 7,7 3,3 3)),((9 9,9 15,15 15,15 9,9 9)))')),ST_GEOMFROMTEXT('MULTIPOLYGON(((5 3,3 3,3 5,0 5,0 0,5 0,
+1
 #====================================================================================
 # multipolygon,geometrycollectionn
 #====================================================================================
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_collection_elems_3)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_collection_elems_3)))
-MULTIPOLYGON(((5 0,15 5,25 0,15 25,5 0)),((25 0,22 10,30 15,0 15,25 0)),((65 0,75 5,85 0,82 10,90 15,80 15,75 25,70 15,60 15,67 10,65 0)))
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_collection_multilinestr)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_collection_multilinestr)))
-MULTILINESTRING((0 15,15 30,6 15),(4.2 12,0 5))
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_collection_elems)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_collection_elems)))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,2 2,3 0,0 0)))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,2 2,3 0,0 0)))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')))
-POLYGON((0 0,2 2,3 0,0 0))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0),(2 2,2 3,3 3,3 2,2 2)),((5 5,5 7,7 7,7 5,5 5)))'),
-ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0),(2 2,2 3,3 3,3 2,2 2)),((5 5,5 7,7 7,7 5,5 5)))'),
-ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())')))
-MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0),(2 2,2 3,3 3,3 2,2 2)),((5 5,5 7,7 7,7 5,5 5)))
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,2 2,3 0,0 0)))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')),ST_GEOMFROMTEXT('POLYGON((0 0,2 2,3 0,0 0))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,2 2,3 0,0 0)))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')),ST_GEOMFROMTEXT('POLYGON((0 0,2 2,3 0,0 0))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0),(2 2,2 3,3 3,3 2,2 2)),((5 5,5 7,7 7,7 5,5 5)))'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())')),ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0),(2 2,2 3,3 3,3 2,2 2)),((5 5,5 7,7 7,7 5,5 5)))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0),(2 2,2 3,3 3,3 2,2 2)),((5 5,5 7,7 7,7 5,5 5)))'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())')),ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0),(2 2,2 3,3
+1
 #====================================================================================
 # geometrycollection,point
 #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_top)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_top)))
-POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('POINT(30 30)')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('POINT(30 30)')))
-GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),POINT(30 30))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top))) FROM gis_geometrycollection WHERE fid=115;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top)))
-POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_top)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_top)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('POINT(30 30)')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),POINT(30 30))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('POINT(30 30)')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),POINT(30 30))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))')) FROM gis_geometrycollection WHERE fid=115;
+ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))'))
+1
 #====================================================================================
 # geometrycollection,multipoint
 #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_bottom_points)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_bottom_points)))
-POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('MULTIPOINT(30 30,0 35)')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('MULTIPOINT(30 30,0 35)')))
-GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),POINT(0 35),POINT(30 30))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_bottom_points))) FROM gis_geometrycollection WHERE fid=115;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_bottom_points)))
-POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('MULTIPOINT(30 30,0 35)')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),POINT(0 35),POINT(30 30))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('MULTIPOINT(30 30,0 35)')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),POINT(0 35),POINT(30 30))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))')) FROM gis_geometrycollection WHERE fid=115;
+ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))'))
+1
 #====================================================================================
 # geometrycollection,linestring
 #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_top_to_center)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_top_to_center)))
-POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('LINESTRING(30 30,0 35)')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('LINESTRING(30 30,0 35)')))
-GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),LINESTRING(30 30,0 35))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top_to_center))) FROM gis_geometrycollection WHERE fid=115;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top_to_center)))
-POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('LINESTRING(30 30,0 35)')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),LINESTRING(30 30,0 35))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('LINESTRING(30 30,0 35)')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),LINESTRING(30 30,0 35))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))')) FROM gis_geometrycollection WHERE fid=115;
+ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))'))
+1
 #====================================================================================
 # geometrycollection,multilinestring
 #====================================================================================
-# Invalid geometry in input.
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_lines_near_vertical)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_lines_near_vertical)))
-GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),MULTILINESTRING((0 5,4.883720930232558 11.511627906976745),(7.5 15,15 25,0 25)))
-# Invalid geometry in input.
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('MULTILINESTRING((0 30,30 30,0 35))')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('MULTILINESTRING((0 30,30 30,0 35))')))
-GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),LINESTRING(0 30,30 30,0 35))
-# Invalid geometry in input.
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_lines_near_vertical))) FROM gis_geometrycollection WHERE fid=115;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_lines_near_vertical)))
-GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),MULTILINESTRING((0 5,4.883720930232558 11.511627906976745),(7.5 15,15 25,0 25)))
 #====================================================================================
 # geometrycollection,polygon
 #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('POLYGON((0 0,0 5,5 5,5 0,0 0))')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('POLYGON((0 0,0 5,5 5,5 0,0 0))')))
-MULTIPOLYGON(((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),((5 0,5 5,0 5,0 0,5 0)))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_elem_vertical)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_elem_vertical)))
-MULTIPOLYGON(((15 25,25 0,22 10,30 15,20 15,15 25)),((15 25,10 15,0 15,7 10,5 0,15 25)))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star)))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('POLYGON((0 0,15 25,35 0,0 0))')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('POLYGON((0 0,15 25,35 0,0 0))')))
-MULTIPOLYGON(((9 15,0 15,6.3 10.5,9 15)),((9 15,10 15,15 25,9 15)),((6.299999999999999 10.5,0 0,5 0,7 10,6.299999999999999 10.5)),((25.333333333333332 12.083333333333334,30 15,23 15,25.333333333333332 12.083333333333334)),((25.333333333333332 12.083333333333334,22 10,25 0,35 0,25.333333333333332 12.083333333333334)),((23 15,15 25,20 15,23 15)),((5 0,25 0,15 5,5 0)))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_elem_vertical))) FROM gis_geometrycollection WHERE fid=115;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_elem_vertical)))
-MULTIPOLYGON(((15 25,25 0,22 10,30 15,20 15,15 25)),((15 25,10 15,0 15,7 10,5 0,15 25)))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(2 2,5 5))'),
-ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0),(4 4,4 6,6 6,6 4,4 4))')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(2 2,5 5))'),
-ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0),(4 4,4 6,6 6,6 4,4 4))')))
-GEOMETRYCOLLECTION(POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4)),LINESTRING(4 4,5 5))
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('POLYGON((0 0,0 5,5 5,5 0,0 0))')),ST_GEOMFROMTEXT('MULTIPOLYGON(((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),((5 0,5 5,0 5,0 0,5 0)))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('POLYGON((0 0,0 5,5 5,5 0,0 0))')),ST_GEOMFROMTEXT('MULTIPOLYGON(((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),((5 0,5 5,0 5,0 0,5 0)))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('MULTIPOLYGON(((15 25,25 0,22 10,30 15,20 15,15 25)),((15 25,10 15,0 15,7 10,5 0,15 25)))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('MULTIPOLYGON(((15 25,25 0,22 10,30 15,20 15,15 25)),((15 25,10 15,0 15,7 10,5 0,15 25)))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('POLYGON((0 0,15 25,35 0,0 0))')),ST_GEOMFROMTEXT('MULTIPOLYGON(((9 15,0 15,6.3 10.5,9 15)),((9 15,10 15,15 25,9 15)),((6.299999999999999 10.5,0 0,5 0,7 10,6.299999999999999 10.5)),((25.333333333333332 12.083333333333334,30 15,23 15,25.333333333333332 12.083333333333334)),((25.333333333333332 12.083333333333334,22 10,25 0,35 0,25.333333333333332 12.083333333333334)),((23 15,15 25,20 15,23 15)),((5 0,25 0,15 5,5 0)))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('POLYGON((0 0,15 25,35 0,0 0))')),ST_GEOMFROMTEXT('MULTIPOLYGON(((9 15,0 15,6.3 10.5,9 15)),((9 15,10 15,15 25,9 15)),((6.299999999999999 10.5,0 0,5 0,7 10,6.29999999999999
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('MULTIPOLYGON(((15 25,25 0,22 10,30 15,20 15,15 25)),((15 25,10 15,0 15,7 10,5 0,15 25)))')) FROM gis_geometrycollection WHERE fid=115;
+ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('MULTIPOLYGON(((15 25,25 0,22 10,30 15,20 15,15 25)),((15 25,10 15,0 15,7 10,5 0,15 25)))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(2 2,5 5))'),
+ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0),(4 4,4 6,6 6,6 4,4 4))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4)),LINESTRING(4 4,5 5))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(2 2,5 5))'),
+ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0),(4 4,4 6,6 6,6 4,4 4))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6
+1
 #====================================================================================
 # geometrycollection,multipolygon
 #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)))')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)))')))
-MULTIPOLYGON(((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),((5 0,5 5,0 5,0 0,5 0)))
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_of_elems)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_of_elems)))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(2 2,4 4))'),
-ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((5 5,5 10,10 10,10 5,5 5)))')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(2 2,4 4))'),
-ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((5 5,5 10,10 10,10 5,5 5)))')))
-MULTIPOLYGON(((0 0,5 0,5 5,0 5,0 0)),((5 5,10 5,10 10,5 10,5 5)))
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)))')),ST_GEOMFROMTEXT('MULTIPOLYGON(((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),((5 0,5 5,0 5,0 0,5 0)))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)))')),ST_GEOMFROMTEXT('MULTIPOLYGON(((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),((5 0,5 5,0 5,0 0,5 0)))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(2 2,4 4))'),
+ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((5 5,5 10,10 10,10 5,5 5)))')),ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,5 0,5 5,0 5,0 0)),((5 5,10 5,10 10,5 10,5 5)))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(2 2,4 4))'),
+ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((5 5,5 10,10 10,10 5,5 5)))')),ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,5 0,5 5,0 5,0 0)),((5 5,10 5,10 10,
+1
 #====================================================================================
 # geometrycollection,geometrycollectionn
 #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_collection_elems_3)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_collection_elems_3)))
-MULTIPOLYGON(((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),((65 0,75 5,85 0,82 10,90 15,80 15,75 25,70 15,60 15,67 10,65 0)))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_collection_elems)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_collection_elems)))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_collection_elems))) FROM gis_geometrycollection WHERE fid=115;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_collection_elems)))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,g2)) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=115 and fid2=215;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,g2))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_multilinestr),ST_GEOMFROMTEXT(@star_collection_elems)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_multilinestr),ST_GEOMFROMTEXT(@star_collection_elems)))
-MULTILINESTRING((0 15,15 30,6 15),(4.2 12,0 5))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(0 0,2 2),POINT(4 4),POINT(6 6))'),
-ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(4 4),POINT(6 6))')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(0 0,2 2),POINT(4 4),POINT(6 6))'),
-ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(4 4),POINT(6 6))')))
-LINESTRING(0 0,2 2)
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOINT(0 0,2 2),POINT(4 4),POINT(6 6))'),
-ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(4 4),POINT(6 6))')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOINT(0 0,2 2),POINT(4 4),POINT(6 6))'),
-ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(4 4),POINT(6 6))')))
-MULTIPOINT((0 0),(2 2))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((0 0,1 1),(2 2,3 3)),POINT(4 4),POINT(6 6))'),
-ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(4 4),POINT(6 6))')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((0 0,1 1),(2 2,3 3)),POINT(4 4),POINT(6 6))'),
-ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(4 4),POINT(6 6))')))
-MULTILINESTRING((0 0,1 1),(2 2,3 3))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((6 6,6 10,10 10,10 6,6 6))),'
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_collection_elems_3)),ST_GEOMFROMTEXT('MULTIPOLYGON(((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),((65 0,75 5,85 0,82 10,90 15,80 15,75 25,70 15,60 15,67 10,65 0)))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_collection_elems_3)),ST_GEOMFROMTEXT('MULTIPOLYGON(((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),((65 0,75 5,85 0,82 10,90 15,80 15,75 25,70 15,60 15,
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')) FROM gis_geometrycollection WHERE fid=115;
+ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,g2),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=115 and fid2=215;
+ST_EQUALS(ST_SYMDIFFERENCE(g,g2),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_multilinestr),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('MULTILINESTRING((0 15,15 30,6 15),(4.2 12,0 5))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_multilinestr),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('MULTILINESTRING((0 15,15 30,6 15),(4.2 12,0 5))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(0 0,2 2),POINT(4 4),POINT(6 6))'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(4 4),POINT(6 6))')),ST_GEOMFROMTEXT('LINESTRING(0 0,2 2)'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(0 0,2 2),POINT(4 4),POINT(6 6))'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(4 4),POINT(6 6))')),ST_GEOMFROMTEXT('LINESTRING(0 0,2 2)'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOINT(0 0,2 2),POINT(4 4),POINT(6 6))'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(4 4),POINT(6 6))')),ST_GEOMFROMTEXT('MULTIPOINT((0 0),(2 2))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOINT(0 0,2 2),POINT(4 4),POINT(6 6))'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(4 4),POINT(6 6))')),ST_GEOMFROMTEXT('MULTIPOINT((0 0),(2 2))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((0 0,1 1),(2 2,3 3)),POINT(4 4),POINT(6 6))'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(4 4),POINT(6 6))')),ST_GEOMFROMTEXT('MULTILINESTRING((0 0,1 1),(2 2,3 3))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((0 0,1 1),(2 2,3 3)),POINT(4 4),POINT(6 6))'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(4 4),POINT(6 6))')),ST_GEOMFROMTEXT('MULTILINESTRING((0 0,1 1),(2 2,3 3))'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((6 6,6 10,10 10,10 6,6 6))),'
                                                                      'POINT(14 14),POINT(16 16))'),
-ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(14 14),POINT(16 16))')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((6 6,6 10,10 10,10 6,6 6))),'
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(14 14),POINT(16 16))')),ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((6 6,6 10,10 10,10 6,6 6)))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((6 6,6 10,10 10,10 6,6 6))),'
                                                                      'POINT(14 14),POINT(16 16))'),
 ST_GEOMFROMTEXT('GEOMETR
-MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((6 6,6 10,10 10,10 6,6 6)))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())'),
-ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())))')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())'),
-ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())))')))
-GEOMETRYCOLLECTION EMPTY
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())'),
-ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(1 1), GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())))')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())'),
-ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(1 1), GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())))')))
-POINT(1 1)
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(1 1)))'),
-ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())))')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(1 1)))'),
-ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())))')))
-POINT(1 1)
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(1 1)))'),
-ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(1 1), GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())))')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(1 1)))'),
-ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(1 1), GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())))')))
-GEOMETRYCOLLECTION EMPTY
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(1 1), GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())))')),ST_GEOMFROMTEXT('POINT(1 1)'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(1 1), GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())))')),ST_GEOMFROMTEXT('POINT(1 1)'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(1 1)))'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())))')),ST_GEOMFROMTEXT('POINT(1 1)'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(1 1)))'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())))')),ST_GEOMFROMTEXT('POINT(1 1)'))
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(1 1)))'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(1 1), GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(1 1)))'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(1 1), GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'))
+1
 #####################################################################################
 # Testing ST_SYMDIFFERENCE() with 2 geometries of same SRID
 #####################################################################################
 SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top,0),ST_GEOMFROMTEXT(@star_center,0)));
 ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top,0),ST_GEOMFROMTEXT(@star_center,0)))
-MULTIPOINT((15 10),(15 25))
+MULTIPOINT((15 25),(15 10))
 SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top,4145),ST_GEOMFROMTEXT(@star_center,4145)));
-ERROR 22S00: st_symdifference(POINT, POINT) has not been implemented for geographic spatial reference systems.
+ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top,4145),ST_GEOMFROMTEXT(@star_center,4145)))
+MULTIPOINT((15 25),(15 10))
 SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top,2000),ST_GEOMFROMTEXT(@star_center,2000)));
 ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top,2000),ST_GEOMFROMTEXT(@star_center,2000)))
-MULTIPOINT((15 10),(15 25))
+MULTIPOINT((15 25),(15 10))
 SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top,4326),ST_GEOMFROMTEXT(@star_center,4326)));
-ERROR 22S00: st_symdifference(POINT, POINT) has not been implemented for geographic spatial reference systems.
+ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top,4326),ST_GEOMFROMTEXT(@star_center,4326)))
+MULTIPOINT((15 25),(15 10))
 SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top,4135),ST_GEOMFROMTEXT(@star_center,4135)));
-ERROR 22S00: st_symdifference(POINT, POINT) has not been implemented for geographic spatial reference systems.
+ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top,4135),ST_GEOMFROMTEXT(@star_center,4135)))
+MULTIPOINT((15 25),(15 10))
 SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top,-1),ST_GEOMFROMTEXT(@star_center,-1)));
 ERROR 22003: SRID value is out of range in 'st_geomfromtext'
 SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top,-1024),ST_GEOMFROMTEXT(@star_center,-1024)));
@@ -949,7 +805,7 @@
 ERROR HY000: Binary geometry function st_symdifference given two geometries of different srids: 4145 and 4326, which should have been identical.
 SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top,0),ST_GEOMFROMTEXT(@star_center,0)));
 ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top,0),ST_GEOMFROMTEXT(@star_center,0)))
-MULTIPOINT((15 10),(15 25))
+MULTIPOINT((15 25),(15 10))
 SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top,-1),ST_GEOMFROMTEXT(@star_center,-1)));
 ERROR 22003: SRID value is out of range in 'st_geomfromtext'
 SELECT ST_ASTEXT(ST_SYMDIFFERENCE(NULL,ST_GEOMFROMTEXT(@star_top)));
@@ -1015,7 +871,7 @@
 GEOMETRYCOLLECTION EMPTY
 SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star_collection_elems)));
 ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star_collection_elems)))
-MULTIPOLYGON(((15 25,25 0,22 10,30 15,20 15,15 25)),((15 25,10 15,0 15,7 10,5 0,15 25)))
+MULTIPOLYGON(((25 0,22 10,30 15,20 15,15 25,25 0)),((15 25,10 15,0 15,7 10,5 0,15 25)))
 SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_collection_elems))) FROM gis_geometrycollection WHERE fid=100;
 ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_collection_elems)))
 GEOMETRYCOLLECTION EMPTY
@@ -1025,38 +881,6 @@
 SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_collection_elems)));
 ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_collection_elems)))
 GEOMETRYCOLLECTION EMPTY
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_elem_vertical))) FROM gis_geometrycollection WHERE fid=103;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_elem_vertical)))
-GEOMETRYCOLLECTION EMPTY
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_elem_vertical)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_elem_vertical)))
-GEOMETRYCOLLECTION EMPTY
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_of_elems)));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_of_elems)))
-GEOMETRYCOLLECTION EMPTY
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),
-ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,15 25,35 0,0 0)),((5 0,15 25,25 0,15 5,5 0)))')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),
-ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,15 25,35 0,0 0)),((5 0,15 25,25 0,15 5,5 0)))')))
-MULTIPOLYGON(((9 15,0 15,6.617647058823529 11.029411764705882,9 15)),((9 15,19 15,15 25,9 15)),((25.333333333333332 12.083333333333334,30 15,23 15,25.333333333333332 12.083333333333334)),((25.333333333333332 12.083333333333334,22 10,25 0,35 0,25.333333333333332 12.083333333333334)),((23 15,15 25,19 15,23 15)))
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_of_elems))) FROM gis_geometrycollection WHERE fid=103;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_of_elems)))
-GEOMETRYCOLLECTION EMPTY
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,g2)) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=103 and fid2=103;
-ST_ASTEXT(ST_SYMDIFFERENCE(g,g2))
-GEOMETRYCOLLECTION EMPTY
-# Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),
-ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,15 25,35 0,0 0)),((5 0,15 25,25 0,15 5,5 0)))')));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),
-ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,15 25,35 0,0 0)),((5 0,15 25,25 0,15 5,5 0)))')))
-MULTIPOLYGON(((9 15,0 15,6.3 10.5,9 15)),((9 15,10 15,15 25,9 15)),((6.299999999999999 10.5,0 0,5 0,7 10,6.299999999999999 10.5)),((25.333333333333332 12.083333333333334,30 15,23 15,25.333333333333332 12.083333333333334)),((25.333333333333332 12.083333333333334,22 10,25 0,35 0,25.333333333333332 12.083333333333334)),((23 15,15 25,20 15,23 15)),((5 0,25 0,15 25,5 0)))
 CREATE TABLE t1 (pk INT PRIMARY KEY, g GEOMETRY NOT NULL);
 INSERT INTO t1 VALUES (1, ST_GEOMFROMTEXT('POINT(1 1)'));
 INSERT INTO t1 VALUES (2, ST_GEOMFROMTEXT('LINESTRING(1 1, 2 2)'));
@@ -1139,453 +963,461 @@
 GEOMETRYCOLLECTION(POLYGON(LINESTRING(POINT(1,1), POINT(10,1), POINT(10,10),
 POINT(1,10), POINT(1,1)), LINESTRING(POINT(4,4),POINT(4,6),POINT(6,6),
 POINT(6,4),POINT(4,4))))));
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(a.g, b.g)) FROM t1 AS a JOIN t1 AS b ORDER BY a.pk, b.pk;
-ST_ASTEXT(ST_SYMDIFFERENCE(a.g, b.g))
-GEOMETRYCOLLECTION EMPTY
-LINESTRING(1 1,2 2)
-POLYGON((0 0,1 0,1 1,0 1,0 0))
-POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))
-POINT(2 2)
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5)))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6)))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))
-GEOMETRYCOLLECTION EMPTY
-LINESTRING(1 1,2 2)
-POLYGON((0 0,1 0,1 1,0 1,0 0))
-POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))
-POINT(2 2)
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5)))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6)))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))
-POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))
-POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))
-POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))
-LINESTRING(1 1,2 2)
-GEOMETRYCOLLECTION EMPTY
-GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),LINESTRING(1 1,2 2))
-POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))
-LINESTRING(1 1,2 2)
-LINESTRING(3 3,4 4)
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),LINESTRING(1 1,2 2))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),LINESTRING(1 1,2 2))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))
-LINESTRING(1 1,2 2)
-GEOMETRYCOLLECTION EMPTY
-GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),LINESTRING(1 1,2 2))
-POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))
-LINESTRING(1 1,2 2)
-LINESTRING(3 3,4 4)
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),LINESTRING(1 1,2 2))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),LINESTRING(1 1,2 2))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))
-POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))
-POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))
-POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))
-POLYGON((0 0,1 0,1 1,0 1,0 0))
-GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),LINESTRING(1 1,2 2))
-GEOMETRYCOLLECTION EMPTY
-POLYGON((0 1,1 1,1 0,10 0,10 10,0 10,0 1),(4 4,4 6,6 6,6 4,4 4))
-GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),POINT(2 2))
-GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),MULTILINESTRING((1 1,2 2),(3 3,4 4)))
-POLYGON((5 5,10 5,10 10,5 10,5 5))
-POLYGON((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))
-POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))
-POLYGON((0 0,1 0,1 1,0 1,0 0))
-GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),LINESTRING(1 1,2 2))
-GEOMETRYCOLLECTION EMPTY
-POLYGON((0 1,1 1,1 0,10 0,10 10,0 10,0 1),(4 4,4 6,6 6,6 4,4 4))
-GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),POINT(2 2))
-GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),MULTILINESTRING((1 1,2 2),(3 3,4 4)))
-POLYGON((5 5,10 5,10 10,5 10,5 5))
-POLYGON((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))
-POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))
-POLYGON((1 0,10 0,10 5,10 10,0 10,0 1,1 1,1 0),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))
-POLYGON((1 0,10 0,10 5,10 10,0 10,0 1,1 1,1 0),(5 5,4 4,4 6,5 6,5 5))
-MULTIPOLYGON(((1 1,0 1,0 0,1 0,1 1)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))
-POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))
-POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))
-POLYGON((0 1,1 1,1 0,10 0,10 10,0 10,0 1),(4 4,4 6,6 6,6 4,4 4))
-GEOMETRYCOLLECTION EMPTY
-POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-MULTIPOLYGON(((5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)))
-MULTIPOLYGON(((5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)),((6 6,7 6,7 7,6 7,6 6)))
-MULTIPOLYGON(((0 1,1 1,1 10,0 10,0 1)),((10 1,1 1,1 0,10 0,10 1)))
-POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))
-POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))
-POLYGON((0 1,1 1,1 0,10 0,10 10,0 10,0 1),(4 4,4 6,6 6,6 4,4 4))
-GEOMETRYCOLLECTION EMPTY
-POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))
-POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))
-MULTIPOLYGON(((5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)))
-MULTIPOLYGON(((5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)),((6 6,7 6,7 7,6 7,6 6)))
-MULTIPOLYGON(((0 1,1 1,1 10,0 10,0 1)),((10 1,1 1,1 0,10 0,10 1)))
-POLYGON((5 6,5 5,6 5,6 6,5 6))
-POLYGON((5 6,5 5,4 4,6 4,6 6,5 6))
-POLYGON((1 10,0 10,0 0,10 0,10 1,1 1,1 10))
-POINT(2 2)
-LINESTRING(1 1,2 2)
-GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),POINT(2 2))
-POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))
-GEOMETRYCOLLECTION EMPTY
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),POINT(2 2))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),POINT(2 2))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))
-POINT(2 2)
-LINESTRING(1 1,2 2)
-GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),POINT(2 2))
-POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))
-GEOMETRYCOLLECTION EMPTY
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),POINT(2 2))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),POINT(2 2))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))
-POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))
-POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))
-POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-LINESTRING(3 3,4 4)
-GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),MULTILINESTRING((1 1,2 2),(3 3,4 4)))
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-GEOMETRYCOLLECTION EMPTY
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-LINESTRING(3 3,4 4)
-GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),MULTILINESTRING((1 1,2 2),(3 3,4 4)))
-POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-GEOMETRYCOLLECTION EMPTY
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))
-POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))
-POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))
-POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5)))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),LINESTRING(1 1,2 2))
-POLYGON((5 5,10 5,10 10,5 10,5 5))
-MULTIPOLYGON(((6 5,6 6,5 6,5 5,6 5)),((6 5,6 4,4 4,4 6,5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5)))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),POINT(2 2))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))
-GEOMETRYCOLLECTION EMPTY
-POLYGON((6 6,7 6,7 7,6 7,6 6))
-MULTIPOLYGON(((6 5,6 6,5 6,5 5,6 5)),((6 5,6 4,4 4,4 6,5 6,5 10,1 10,1 1,10 1,10 5,6 5)))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5)))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),LINESTRING(1 1,2 2))
-POLYGON((5 5,10 5,10 10,5 10,5 5))
-MULTIPOLYGON(((6 5,6 6,5 6,5 5,6 5)),((6 5,6 4,4 4,4 6,5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5)))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),POINT(2 2))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))
-GEOMETRYCOLLECTION EMPTY
-POLYGON((6 6,7 6,7 7,6 7,6 6))
-MULTIPOLYGON(((6 5,6 6,5 6,5 5,6 5)),((6 5,6 4,4 4,4 6,5 6,5 10,1 10,1 1,10 1,10 5,6 5)))
-POLYGON((5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6,5 10))
-POLYGON((5 10,0 10,0 1,1 1,1 0,10 0,10 5,5 5,4 4,4 6,5 6,5 10))
-MULTIPOLYGON(((1 1,0 1,0 0,1 0,1 1)),((1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6,5 10,1 10,1 1)),((6 5,6 6,5 6,5 5,6 5)))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6)))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),LINESTRING(1 1,2 2))
-POLYGON((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))
-MULTIPOLYGON(((6 6,5 6,5 5,6 5,6 6)),((6 6,7 6,7 7,6 7,6 6)),((6 5,6 4,4 4,4 6,5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5)))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),POINT(2 2))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))
-POLYGON((6 6,7 6,7 7,6 7,6 6))
-GEOMETRYCOLLECTION EMPTY
-MULTIPOLYGON(((6 6,5 6,5 5,6 5,6 6)),((6 6,7 6,7 7,6 7,6 6)),((6 5,6 4,4 4,4 6,5 6,5 10,1 10,1 1,10 1,10 5,6 5)))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6)))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),LINESTRING(1 1,2 2))
-POLYGON((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))
-MULTIPOLYGON(((6 6,5 6,5 5,6 5,6 6)),((6 6,7 6,7 7,6 7,6 6)),((6 5,6 4,4 4,4 6,5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5)))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),POINT(2 2))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))
-POLYGON((6 6,7 6,7 7,6 7,6 6))
-GEOMETRYCOLLECTION EMPTY
-MULTIPOLYGON(((6 6,5 6,5 5,6 5,6 6)),((6 6,7 6,7 7,6 7,6 6)),((6 5,6 4,4 4,4 6,5 6,5 10,1 10,1 1,10 1,10 5,6 5)))
-MULTIPOLYGON(((6 6,7 6,7 7,6 7,6 6)),((5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6,5 10)))
-MULTIPOLYGON(((6 6,7 6,7 7,6 7,6 6)),((5 10,0 10,0 1,1 1,1 0,10 0,10 5,5 5,4 4,4 6,5 6,5 10)))
-MULTIPOLYGON(((1 1,0 1,0 0,1 0,1 1)),((1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6,5 10,1 10,1 1)),((6 6,5 6,5 5,6 5,6 6)),((6 6,7 6,7 7,6 7,6 6)))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))
-POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))
-MULTIPOLYGON(((0 1,1 1,1 10,0 10,0 1)),((10 1,1 1,1 0,10 0,10 1)))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))
-MULTIPOLYGON(((5 6,5 10,1 10,1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)))
-MULTIPOLYGON(((5 6,5 10,1 10,1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)),((6 6,7 6,7 7,6 7,6 6)))
-GEOMETRYCOLLECTION EMPTY
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))
-POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))
-MULTIPOLYGON(((0 1,1 1,1 10,0 10,0 1)),((10 1,1 1,1 0,10 0,10 1)))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))
-MULTIPOLYGON(((5 6,5 10,1 10,1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)))
-MULTIPOLYGON(((5 6,5 10,1 10,1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)),((6 6,7 6,7 7,6 7,6 6)))
-GEOMETRYCOLLECTION EMPTY
-MULTIPOLYGON(((1 10,0 10,0 1,1 1,1 10)),((10 1,1 1,1 0,10 0,10 1)),((5 6,5 5,6 5,6 6,5 6)))
-MULTIPOLYGON(((1 10,0 10,0 1,1 1,1 10)),((10 1,1 1,1 0,10 0,10 1)),((5 6,5 5,4 4,6 4,6 6,5 6)))
-POLYGON((1 1,0 1,0 0,1 0,1 1))
-GEOMETRYCOLLECTION EMPTY
-LINESTRING(1 1,2 2)
-POLYGON((0 0,1 0,1 1,0 1,0 0))
-POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))
-POINT(2 2)
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5)))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6)))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))
-GEOMETRYCOLLECTION EMPTY
-LINESTRING(1 1,2 2)
-POLYGON((0 0,1 0,1 1,0 1,0 0))
-POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))
-POINT(2 2)
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5)))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6)))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))
-POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))
-POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))
-POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))
-LINESTRING(1 1,2 2)
-GEOMETRYCOLLECTION EMPTY
-GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),LINESTRING(1 1,2 2))
-POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))
-LINESTRING(1 1,2 2)
-LINESTRING(3 3,4 4)
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),LINESTRING(1 1,2 2))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),LINESTRING(1 1,2 2))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))
-LINESTRING(1 1,2 2)
-GEOMETRYCOLLECTION EMPTY
-GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),LINESTRING(1 1,2 2))
-POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))
-LINESTRING(1 1,2 2)
-LINESTRING(3 3,4 4)
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),LINESTRING(1 1,2 2))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),LINESTRING(1 1,2 2))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))
-POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))
-POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))
-POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))
-POLYGON((0 0,1 0,1 1,0 1,0 0))
-GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),LINESTRING(1 1,2 2))
-GEOMETRYCOLLECTION EMPTY
-POLYGON((0 1,1 1,1 0,10 0,10 10,0 10,0 1),(4 4,4 6,6 6,6 4,4 4))
-GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),POINT(2 2))
-GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),MULTILINESTRING((1 1,2 2),(3 3,4 4)))
-POLYGON((5 5,10 5,10 10,5 10,5 5))
-POLYGON((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))
-POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))
-POLYGON((0 0,1 0,1 1,0 1,0 0))
-GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),LINESTRING(1 1,2 2))
-GEOMETRYCOLLECTION EMPTY
-POLYGON((0 1,1 1,1 0,10 0,10 10,0 10,0 1),(4 4,4 6,6 6,6 4,4 4))
-GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),POINT(2 2))
-GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),MULTILINESTRING((1 1,2 2),(3 3,4 4)))
-POLYGON((5 5,10 5,10 10,5 10,5 5))
-POLYGON((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))
-POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))
-POLYGON((1 0,10 0,10 5,10 10,0 10,0 1,1 1,1 0),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))
-POLYGON((1 0,10 0,10 5,10 10,0 10,0 1,1 1,1 0),(5 5,4 4,4 6,5 6,5 5))
-MULTIPOLYGON(((1 1,0 1,0 0,1 0,1 1)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))
-POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))
-POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))
-POLYGON((0 1,1 1,1 0,10 0,10 10,0 10,0 1),(4 4,4 6,6 6,6 4,4 4))
-GEOMETRYCOLLECTION EMPTY
-POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))
-POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))
-MULTIPOLYGON(((5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)))
-MULTIPOLYGON(((5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)),((6 6,7 6,7 7,6 7,6 6)))
-MULTIPOLYGON(((0 1,1 1,1 10,0 10,0 1)),((10 1,1 1,1 0,10 0,10 1)))
-POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))
-POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))
-POLYGON((0 1,1 1,1 0,10 0,10 10,0 10,0 1),(4 4,4 6,6 6,6 4,4 4))
-GEOMETRYCOLLECTION EMPTY
-POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))
-POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))
-MULTIPOLYGON(((5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)))
-MULTIPOLYGON(((5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)),((6 6,7 6,7 7,6 7,6 6)))
-MULTIPOLYGON(((0 1,1 1,1 10,0 10,0 1)),((10 1,1 1,1 0,10 0,10 1)))
-POLYGON((5 6,5 5,6 5,6 6,5 6))
-POLYGON((5 6,5 5,4 4,6 4,6 6,5 6))
-POLYGON((1 10,0 10,0 0,10 0,10 1,1 1,1 10))
-POINT(2 2)
-LINESTRING(1 1,2 2)
-GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),POINT(2 2))
-POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))
-GEOMETRYCOLLECTION EMPTY
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),POINT(2 2))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),POINT(2 2))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))
-POINT(2 2)
-LINESTRING(1 1,2 2)
-GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),POINT(2 2))
-POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))
-GEOMETRYCOLLECTION EMPTY
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),POINT(2 2))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),POINT(2 2))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))
-POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))
-POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))
-POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-LINESTRING(3 3,4 4)
-GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),MULTILINESTRING((1 1,2 2),(3 3,4 4)))
-POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-GEOMETRYCOLLECTION EMPTY
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-LINESTRING(3 3,4 4)
-GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),MULTILINESTRING((1 1,2 2),(3 3,4 4)))
-POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))
-MULTILINESTRING((1 1,2 2),(3 3,4 4))
-GEOMETRYCOLLECTION EMPTY
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))
-POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))
-POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))
-POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5)))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),LINESTRING(1 1,2 2))
-POLYGON((5 5,10 5,10 10,5 10,5 5))
-MULTIPOLYGON(((6 5,6 6,5 6,5 5,6 5)),((6 5,6 4,4 4,4 6,5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5)))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),POINT(2 2))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))
-GEOMETRYCOLLECTION EMPTY
-POLYGON((6 6,7 6,7 7,6 7,6 6))
-MULTIPOLYGON(((6 5,6 6,5 6,5 5,6 5)),((6 5,6 4,4 4,4 6,5 6,5 10,1 10,1 1,10 1,10 5,6 5)))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5)))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),LINESTRING(1 1,2 2))
-POLYGON((5 5,10 5,10 10,5 10,5 5))
-MULTIPOLYGON(((6 5,6 6,5 6,5 5,6 5)),((6 5,6 4,4 4,4 6,5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5)))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),POINT(2 2))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))
-GEOMETRYCOLLECTION EMPTY
-POLYGON((6 6,7 6,7 7,6 7,6 6))
-MULTIPOLYGON(((6 5,6 6,5 6,5 5,6 5)),((6 5,6 4,4 4,4 6,5 6,5 10,1 10,1 1,10 1,10 5,6 5)))
-POLYGON((5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6,5 10))
-POLYGON((5 10,0 10,0 1,1 1,1 0,10 0,10 5,5 5,4 4,4 6,5 6,5 10))
-MULTIPOLYGON(((1 1,0 1,0 0,1 0,1 1)),((1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6,5 10,1 10,1 1)),((6 5,6 6,5 6,5 5,6 5)))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6)))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),LINESTRING(1 1,2 2))
-POLYGON((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))
-MULTIPOLYGON(((6 6,5 6,5 5,6 5,6 6)),((6 6,7 6,7 7,6 7,6 6)),((6 5,6 4,4 4,4 6,5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5)))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),POINT(2 2))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))
-POLYGON((6 6,7 6,7 7,6 7,6 6))
-GEOMETRYCOLLECTION EMPTY
-MULTIPOLYGON(((6 6,5 6,5 5,6 5,6 6)),((6 6,7 6,7 7,6 7,6 6)),((6 5,6 4,4 4,4 6,5 6,5 10,1 10,1 1,10 1,10 5,6 5)))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6)))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),LINESTRING(1 1,2 2))
-POLYGON((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))
-MULTIPOLYGON(((6 6,5 6,5 5,6 5,6 6)),((6 6,7 6,7 7,6 7,6 6)),((6 5,6 4,4 4,4 6,5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5)))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),POINT(2 2))
-GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))
-POLYGON((6 6,7 6,7 7,6 7,6 6))
-GEOMETRYCOLLECTION EMPTY
-MULTIPOLYGON(((6 6,5 6,5 5,6 5,6 6)),((6 6,7 6,7 7,6 7,6 6)),((6 5,6 4,4 4,4 6,5 6,5 10,1 10,1 1,10 1,10 5,6 5)))
-MULTIPOLYGON(((6 6,7 6,7 7,6 7,6 6)),((5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6,5 10)))
-MULTIPOLYGON(((6 6,7 6,7 7,6 7,6 6)),((5 10,0 10,0 1,1 1,1 0,10 0,10 5,5 5,4 4,4 6,5 6,5 10)))
-MULTIPOLYGON(((1 1,0 1,0 0,1 0,1 1)),((1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6,5 10,1 10,1 1)),((6 6,5 6,5 5,6 5,6 6)),((6 6,7 6,7 7,6 7,6 6)))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))
-POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))
-MULTIPOLYGON(((0 1,1 1,1 10,0 10,0 1)),((10 1,1 1,1 0,10 0,10 1)))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))
-MULTIPOLYGON(((5 6,5 10,1 10,1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)))
-MULTIPOLYGON(((5 6,5 10,1 10,1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)),((6 6,7 6,7 7,6 7,6 6)))
-GEOMETRYCOLLECTION EMPTY
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))
-POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))
-MULTIPOLYGON(((0 1,1 1,1 10,0 10,0 1)),((10 1,1 1,1 0,10 0,10 1)))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))
-MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))
-MULTIPOLYGON(((5 6,5 10,1 10,1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)))
-MULTIPOLYGON(((5 6,5 10,1 10,1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)),((6 6,7 6,7 7,6 7,6 6)))
-GEOMETRYCOLLECTION EMPTY
-MULTIPOLYGON(((1 10,0 10,0 1,1 1,1 10)),((10 1,1 1,1 0,10 0,10 1)),((5 6,5 5,6 5,6 6,5 6)))
-MULTIPOLYGON(((1 10,0 10,0 1,1 1,1 10)),((10 1,1 1,1 0,10 0,10 1)),((5 6,5 5,4 4,6 4,6 6,5 6)))
-POLYGON((1 1,0 1,0 0,1 0,1 1))
-POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))
-POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))
-POLYGON((1 0,10 0,10 5,10 10,0 10,0 1,1 1,1 0),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))
-POLYGON((5 6,5 5,6 5,6 6,5 6))
-POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))
-POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))
-POLYGON((5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6,5 10))
-MULTIPOLYGON(((6 6,7 6,7 7,6 7,6 6)),((5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6,5 10)))
-MULTIPOLYGON(((1 10,0 10,0 1,1 1,1 10)),((10 1,1 1,1 0,10 0,10 1)),((5 6,5 5,6 5,6 6,5 6)))
-POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))
-POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))
-POLYGON((1 0,10 0,10 5,10 10,0 10,0 1,1 1,1 0),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))
-POLYGON((5 6,5 5,6 5,6 6,5 6))
-POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))
-POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))
-POLYGON((5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6,5 10))
-MULTIPOLYGON(((6 6,7 6,7 7,6 7,6 6)),((5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6,5 10)))
-MULTIPOLYGON(((1 10,0 10,0 1,1 1,1 10)),((10 1,1 1,1 0,10 0,10 1)),((5 6,5 5,6 5,6 6,5 6)))
-GEOMETRYCOLLECTION EMPTY
-POLYGON((4 4,6 4,6 5,5 5,4 4))
-MULTIPOLYGON(((10 1,1 1,1 10,0 10,0 0,10 0,10 1)),((5 6,5 5,6 5,6 6,5 6)))
-POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))
-POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))
-POLYGON((1 0,10 0,10 5,10 10,0 10,0 1,1 1,1 0),(5 5,4 4,4 6,5 6,5 5))
-POLYGON((5 6,5 5,4 4,6 4,6 6,5 6))
-POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))
-POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))
-POLYGON((5 10,0 10,0 1,1 1,1 0,10 0,10 5,5 5,4 4,4 6,5 6,5 10))
-MULTIPOLYGON(((6 6,7 6,7 7,6 7,6 6)),((5 10,0 10,0 1,1 1,1 0,10 0,10 5,5 5,4 4,4 6,5 6,5 10)))
-MULTIPOLYGON(((1 10,0 10,0 1,1 1,1 10)),((10 1,1 1,1 0,10 0,10 1)),((5 6,5 5,4 4,6 4,6 6,5 6)))
-POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))
-POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))
-POLYGON((1 0,10 0,10 5,10 10,0 10,0 1,1 1,1 0),(5 5,4 4,4 6,5 6,5 5))
-POLYGON((5 6,5 5,4 4,6 4,6 6,5 6))
-POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))
-POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))
-POLYGON((5 10,0 10,0 1,1 1,1 0,10 0,10 5,5 5,4 4,4 6,5 6,5 10))
-MULTIPOLYGON(((6 6,7 6,7 7,6 7,6 6)),((5 10,0 10,0 1,1 1,1 0,10 0,10 5,5 5,4 4,4 6,5 6,5 10)))
-MULTIPOLYGON(((1 10,0 10,0 1,1 1,1 10)),((10 1,1 1,1 0,10 0,10 1)),((5 6,5 5,4 4,6 4,6 6,5 6)))
-POLYGON((4 4,6 4,6 5,5 5,4 4))
-GEOMETRYCOLLECTION EMPTY
-MULTIPOLYGON(((10 1,1 1,1 10,0 10,0 0,10 0,10 1)),((5 6,5 5,4 4,6 4,6 6,5 6)))
-POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))
-POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))
-MULTIPOLYGON(((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)),((1 1,0 1,0 0,1 0,1 1)))
-POLYGON((1 10,0 10,0 0,10 0,10 1,1 1,1 10))
-POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))
-POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))
-MULTIPOLYGON(((5 6,5 10,1 10,1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)),((1 1,0 1,0 0,1 0,1 1)))
-MULTIPOLYGON(((5 6,5 10,1 10,1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)),((1 1,0 1,0 0,1 0,1 1)),((6 6,7 6,7 7,6 7,6 6)))
-POLYGON((1 1,0 1,0 0,1 0,1 1))
-POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))
-POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))
-MULTIPOLYGON(((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)),((1 1,0 1,0 0,1 0,1 1)))
-POLYGON((1 10,0 10,0 0,10 0,10 1,1 1,1 10))
-POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))
-POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))
-MULTIPOLYGON(((5 6,5 10,1 10,1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)),((1 1,0 1,0 0,1 0,1 1)))
-MULTIPOLYGON(((5 6,5 10,1 10,1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)),((1 1,0 1,0 0,1 0,1 1)),((6 6,7 6,7 7,6 7,6 6)))
-POLYGON((1 1,0 1,0 0,1 0,1 1))
-MULTIPOLYGON(((10 1,1 1,1 10,0 10,0 0,10 0,10 1)),((5 6,5 5,6 5,6 6,5 6)))
-MULTIPOLYGON(((10 1,1 1,1 10,0 10,0 0,10 0,10 1)),((5 6,5 5,4 4,6 4,6 6,5 6)))
-GEOMETRYCOLLECTION EMPTY
+CREATE TABLE symdifference_results (pk INT PRIMARY KEY AUTO_INCREMENT, g GEOMETRY NOT NULL);
+INSERT INTO symdifference_results(g)
+VALUES
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,1 0,1 1,0 1,0 0))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POINT(2 2)')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,1 0,1 1,0 1,0 0))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POINT(2 2)')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('LINESTRING(3 3,4 4)')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('LINESTRING(3 3,4 4)')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,1 0,1 1,0 1,0 0))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,1 1,1 0,10 0,10 10,0 10,0 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),POINT(2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((5 5,10 5,10 10,5 10,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,1 0,1 1,0 1,0 0))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,1 1,1 0,10 0,10 10,0 10,0 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),POINT(2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((5 5,10 5,10 10,5 10,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((1 0,10 0,10 5,10 10,0 10,0 1,1 1,1 0),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((1 0,10 0,10 5,10 10,0 10,0 1,1 1,1 0),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 1,0 1,0 0,1 0,1 1)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,1 1,1 0,10 0,10 10,0 10,0 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)),((6 6,7 6,7 7,6 7,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,1 1,1 10,0 10,0 1)),((10 1,1 1,1 0,10 0,10 1)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,1 1,1 0,10 0,10 10,0 10,0 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)),((6 6,7 6,7 7,6 7,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,1 1,1 10,0 10,0 1)),((10 1,1 1,1 0,10 0,10 1)))')),
+(ST_GEOMFROMTEXT('POLYGON((5 6,5 5,6 5,6 6,5 6))')),
+(ST_GEOMFROMTEXT('POLYGON((5 6,5 5,4 4,6 4,6 6,5 6))')),
+(ST_GEOMFROMTEXT('POLYGON((1 10,0 10,0 0,10 0,10 1,1 1,1 10))')),
+(ST_GEOMFROMTEXT('POINT(2 2)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),POINT(2 2))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),POINT(2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),POINT(2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('POINT(2 2)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),POINT(2 2))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),POINT(2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),POINT(2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('LINESTRING(3 3,4 4)')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('LINESTRING(3 3,4 4)')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('POLYGON((5 5,10 5,10 10,5 10,5 5))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 5,6 6,5 6,5 5,6 5)),((6 5,6 4,4 4,4 6,5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),POINT(2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('POLYGON((6 6,7 6,7 7,6 7,6 6))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 5,6 6,5 6,5 5,6 5)),((6 5,6 4,4 4,4 6,5 6,5 10,1 10,1 1,10 1,10 5,6 5)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('POLYGON((5 5,10 5,10 10,5 10,5 5))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 5,6 6,5 6,5 5,6 5)),((6 5,6 4,4 4,4 6,5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),POINT(2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('POLYGON((6 6,7 6,7 7,6 7,6 6))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 5,6 6,5 6,5 5,6 5)),((6 5,6 4,4 4,4 6,5 6,5 10,1 10,1 1,10 1,10 5,6 5)))')),
+(ST_GEOMFROMTEXT('POLYGON((5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6,5 10))')),
+(ST_GEOMFROMTEXT('POLYGON((5 10,0 10,0 1,1 1,1 0,10 0,10 5,5 5,4 4,4 6,5 6,5 10))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 1,0 1,0 0,1 0,1 1)),((1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6,5 10,1 10,1 1)),((6 5,6 6,5 6,5 5,6 5)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('POLYGON((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 6,5 6,5 5,6 5,6 6)),((6 6,7 6,7 7,6 7,6 6)),((6 5,6 4,4 4,4 6,5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),POINT(2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((6 6,7 6,7 7,6 7,6 6))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 6,5 6,5 5,6 5,6 6)),((6 6,7 6,7 7,6 7,6 6)),((6 5,6 4,4 4,4 6,5 6,5 10,1 10,1 1,10 1,10 5,6 5)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('POLYGON((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 6,5 6,5 5,6 5,6 6)),((6 6,7 6,7 7,6 7,6 6)),((6 5,6 4,4 4,4 6,5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),POINT(2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((6 6,7 6,7 7,6 7,6 6))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 6,5 6,5 5,6 5,6 6)),((6 6,7 6,7 7,6 7,6 6)),((6 5,6 4,4 4,4 6,5 6,5 10,1 10,1 1,10 1,10 5,6 5)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 6,7 6,7 7,6 7,6 6)),((5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 6,7 6,7 7,6 7,6 6)),((5 10,0 10,0 1,1 1,1 0,10 0,10 5,5 5,4 4,4 6,5 6,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 1,0 1,0 0,1 0,1 1)),((1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6,5 10,1 10,1 1)),((6 6,5 6,5 5,6 5,6 6)),((6 6,7 6,7 7,6 7,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,1 1,1 10,0 10,0 1)),((10 1,1 1,1 0,10 0,10 1)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,1 10,1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,1 10,1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)),((6 6,7 6,7 7,6 7,6 6)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,1 1,1 10,0 10,0 1)),((10 1,1 1,1 0,10 0,10 1)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,1 10,1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,1 10,1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)),((6 6,7 6,7 7,6 7,6 6)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 10,0 10,0 1,1 1,1 10)),((10 1,1 1,1 0,10 0,10 1)),((5 6,5 5,6 5,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 10,0 10,0 1,1 1,1 10)),((10 1,1 1,1 0,10 0,10 1)),((5 6,5 5,4 4,6 4,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,0 1,0 0,1 0,1 1))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,1 0,1 1,0 1,0 0))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POINT(2 2)')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,1 0,1 1,0 1,0 0))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POINT(2 2)')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('LINESTRING(3 3,4 4)')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('LINESTRING(3 3,4 4)')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,1 0,1 1,0 1,0 0))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,1 1,1 0,10 0,10 10,0 10,0 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),POINT(2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((5 5,10 5,10 10,5 10,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,1 0,1 1,0 1,0 0))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,1 1,1 0,10 0,10 10,0 10,0 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),POINT(2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((5 5,10 5,10 10,5 10,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((1 0,10 0,10 5,10 10,0 10,0 1,1 1,1 0),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((1 0,10 0,10 5,10 10,0 10,0 1,1 1,1 0),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 1,0 1,0 0,1 0,1 1)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,1 1,1 0,10 0,10 10,0 10,0 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)),((6 6,7 6,7 7,6 7,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,1 1,1 10,0 10,0 1)),((10 1,1 1,1 0,10 0,10 1)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,1 1,1 0,10 0,10 10,0 10,0 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)),((6 6,7 6,7 7,6 7,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,1 1,1 10,0 10,0 1)),((10 1,1 1,1 0,10 0,10 1)))')),
+(ST_GEOMFROMTEXT('POLYGON((5 6,5 5,6 5,6 6,5 6))')),
+(ST_GEOMFROMTEXT('POLYGON((5 6,5 5,4 4,6 4,6 6,5 6))')),
+(ST_GEOMFROMTEXT('POLYGON((1 10,0 10,0 0,10 0,10 1,1 1,1 10))')),
+(ST_GEOMFROMTEXT('POINT(2 2)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),POINT(2 2))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),POINT(2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),POINT(2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('POINT(2 2)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),POINT(2 2))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),POINT(2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),POINT(2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('LINESTRING(3 3,4 4)')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('LINESTRING(3 3,4 4)')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('POLYGON((5 5,10 5,10 10,5 10,5 5))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 5,6 6,5 6,5 5,6 5)),((6 5,6 4,4 4,4 6,5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),POINT(2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('POLYGON((6 6,7 6,7 7,6 7,6 6))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 5,6 6,5 6,5 5,6 5)),((6 5,6 4,4 4,4 6,5 6,5 10,1 10,1 1,10 1,10 5,6 5)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('POLYGON((5 5,10 5,10 10,5 10,5 5))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 5,6 6,5 6,5 5,6 5)),((6 5,6 4,4 4,4 6,5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),POINT(2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('POLYGON((6 6,7 6,7 7,6 7,6 6))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 5,6 6,5 6,5 5,6 5)),((6 5,6 4,4 4,4 6,5 6,5 10,1 10,1 1,10 1,10 5,6 5)))')),
+(ST_GEOMFROMTEXT('POLYGON((5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6,5 10))')),
+(ST_GEOMFROMTEXT('POLYGON((5 10,0 10,0 1,1 1,1 0,10 0,10 5,5 5,4 4,4 6,5 6,5 10))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 1,0 1,0 0,1 0,1 1)),((1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6,5 10,1 10,1 1)),((6 5,6 6,5 6,5 5,6 5)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('POLYGON((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 6,5 6,5 5,6 5,6 6)),((6 6,7 6,7 7,6 7,6 6)),((6 5,6 4,4 4,4 6,5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),POINT(2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((6 6,7 6,7 7,6 7,6 6))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 6,5 6,5 5,6 5,6 6)),((6 6,7 6,7 7,6 7,6 6)),((6 5,6 4,4 4,4 6,5 6,5 10,1 10,1 1,10 1,10 5,6 5)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('POLYGON((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 6,5 6,5 5,6 5,6 6)),((6 6,7 6,7 7,6 7,6 6)),((6 5,6 4,4 4,4 6,5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),POINT(2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((6 6,7 6,7 7,6 7,6 6))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 6,5 6,5 5,6 5,6 6)),((6 6,7 6,7 7,6 7,6 6)),((6 5,6 4,4 4,4 6,5 6,5 10,1 10,1 1,10 1,10 5,6 5)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 6,7 6,7 7,6 7,6 6)),((5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 6,7 6,7 7,6 7,6 6)),((5 10,0 10,0 1,1 1,1 0,10 0,10 5,5 5,4 4,4 6,5 6,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 1,0 1,0 0,1 0,1 1)),((1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6,5 10,1 10,1 1)),((6 6,5 6,5 5,6 5,6 6)),((6 6,7 6,7 7,6 7,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,1 1,1 10,0 10,0 1)),((10 1,1 1,1 0,10 0,10 1)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,1 10,1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,1 10,1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)),((6 6,7 6,7 7,6 7,6 6)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,1 1,1 10,0 10,0 1)),((10 1,1 1,1 0,10 0,10 1)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,1 10,1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,1 10,1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)),((6 6,7 6,7 7,6 7,6 6)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 10,0 10,0 1,1 1,1 10)),((10 1,1 1,1 0,10 0,10 1)),((5 6,5 5,6 5,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 10,0 10,0 1,1 1,1 10)),((10 1,1 1,1 0,10 0,10 1)),((5 6,5 5,4 4,6 4,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,0 1,0 0,1 0,1 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((1 0,10 0,10 5,10 10,0 10,0 1,1 1,1 0),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((5 6,5 5,6 5,6 6,5 6))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6,5 10))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 6,7 6,7 7,6 7,6 6)),((5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 10,0 10,0 1,1 1,1 10)),((10 1,1 1,1 0,10 0,10 1)),((5 6,5 5,6 5,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((1 0,10 0,10 5,10 10,0 10,0 1,1 1,1 0),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((5 6,5 5,6 5,6 6,5 6))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6,5 10))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 6,7 6,7 7,6 7,6 6)),((5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 10,0 10,0 1,1 1,1 10)),((10 1,1 1,1 0,10 0,10 1)),((5 6,5 5,6 5,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('POLYGON((4 4,6 4,6 5,5 5,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((10 1,1 1,1 10,0 10,0 0,10 0,10 1)),((5 6,5 5,6 5,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((1 0,10 0,10 5,10 10,0 10,0 1,1 1,1 0),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((5 6,5 5,4 4,6 4,6 6,5 6))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((5 10,0 10,0 1,1 1,1 0,10 0,10 5,5 5,4 4,4 6,5 6,5 10))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 6,7 6,7 7,6 7,6 6)),((5 10,0 10,0 1,1 1,1 0,10 0,10 5,5 5,4 4,4 6,5 6,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 10,0 10,0 1,1 1,1 10)),((10 1,1 1,1 0,10 0,10 1)),((5 6,5 5,4 4,6 4,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((1 0,10 0,10 5,10 10,0 10,0 1,1 1,1 0),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((5 6,5 5,4 4,6 4,6 6,5 6))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((5 10,0 10,0 1,1 1,1 0,10 0,10 5,5 5,4 4,4 6,5 6,5 10))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 6,7 6,7 7,6 7,6 6)),((5 10,0 10,0 1,1 1,1 0,10 0,10 5,5 5,4 4,4 6,5 6,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 10,0 10,0 1,1 1,1 10)),((10 1,1 1,1 0,10 0,10 1)),((5 6,5 5,4 4,6 4,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('POLYGON((4 4,6 4,6 5,5 5,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((10 1,1 1,1 10,0 10,0 0,10 0,10 1)),((5 6,5 5,4 4,6 4,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)),((1 1,0 1,0 0,1 0,1 1)))')),
+(ST_GEOMFROMTEXT('POLYGON((1 10,0 10,0 0,10 0,10 1,1 1,1 10))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,1 10,1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)),((1 1,0 1,0 0,1 0,1 1)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,1 10,1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)),((1 1,0 1,0 0,1 0,1 1)),((6 6,7 6,7 7,6 7,6 6)))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,0 1,0 0,1 0,1 1))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)),((1 1,0 1,0 0,1 0,1 1)))')),
+(ST_GEOMFROMTEXT('POLYGON((1 10,0 10,0 0,10 0,10 1,1 1,1 10))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,1 10,1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)),((1 1,0 1,0 0,1 0,1 1)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,1 10,1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)),((1 1,0 1,0 0,1 0,1 1)),((6 6,7 6,7 7,6 7,6 6)))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,0 1,0 0,1 0,1 1))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((10 1,1 1,1 10,0 10,0 0,10 0,10 1)),((5 6,5 5,6 5,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((10 1,1 1,1 10,0 10,0 0,10 0,10 1)),((5 6,5 5,4 4,6 4,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+CREATE TABLE symdifference (pk INT PRIMARY KEY AUTO_INCREMENT, g GEOMETRY NOT NULL);
+INSERT INTO symdifference SELECT 0, ST_SYMDIFFERENCE(a.g, b.g) FROM t1 AS a JOIN t1 AS b ORDER BY a.pk, b.pk;
+SELECT SUM(ST_EQUALS(a.g, b.g)) FROM symdifference AS a, symdifference_results AS b WHERE a.pk = b.pk;
+SUM(ST_EQUALS(a.g, b.g))
+441
 #clean up
 DROP TABLE gis_geometrycollection;
 DROP TABLE gis_geometrycollection_2;
 DROP TABLE t1;
+DROP TABLE symdifference;
+DROP TABLE symdifference_results;
 #
 # Bug #21263152 ST_SYMDIFFERENCE(POLYGON, POLYGON) MAY RETURN AN INVALID
 # MULTIPOLYGON
@@ -1649,12 +1481,16 @@
 ST_GEOMFROMTEXT('POINT(0 0)', 2000)
 ))
 GEOMETRYCOLLECTION EMPTY
-# Geographic SRS (should fail)
+# Geographic SRS (should pass)
 SELECT ST_ASTEXT(ST_SYMDIFFERENCE(
 ST_GEOMFROMTEXT('POINT(0 0)', 4326),
 ST_GEOMFROMTEXT('POINT(0 0)', 4326)
 ));
-ERROR 22S00: st_symdifference(POINT, POINT) has not been implemented for geographic spatial reference systems.
+ST_ASTEXT(ST_SYMDIFFERENCE(
+ST_GEOMFROMTEXT('POINT(0 0)', 4326),
+ST_GEOMFROMTEXT('POINT(0 0)', 4326)
+))
+GEOMETRYCOLLECTION EMPTY
 #
 # Bug #25510403 SRID OF RESULT OF SET OPERATION IS DIFFERENT FROM INPUT
 # GEOMETRIES
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/gis/r/spatial_op_testingfunc_mix.result mysql-8.0-8.0.27/mysql-test/suite/gis/r/spatial_op_testingfunc_mix.result
--- mysql-8.0-8.0.26/mysql-test/suite/gis/r/spatial_op_testingfunc_mix.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/gis/r/spatial_op_testingfunc_mix.result	2021-09-28 11:46:34.000000000 +0000
@@ -524,26 +524,26 @@
 #-------------------------------------------------------------------------------------------
 # Spatial Operators with ST_SYMDIFFERENCE()
 #-------------------------------------------------------------------------------------------
-SELECT ST_ASTEXT(ST_UNION(ST_SYMDIFFERENCE(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_horizontal),ST_GEOMFROMTEXT(@star_elem_vertical)),
-ST_GEOMFROMTEXT(@star_2)),ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_1),ST_GEOMFROMTEXT(@star_2))));
-ST_ASTEXT(ST_UNION(ST_SYMDIFFERENCE(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_horizontal),ST_GEOMFROMTEXT(@star_elem_vertical)),
-ST_GEOMFROMTEXT(@star_2)),ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_1),ST_GEOMFROMTEXT(@star_2))))
-MULTIPOLYGON(((20 2.5,15.909090909090908 4.545454545454546,15 0,20 2.5)),((20 2.5,25 0,23.695652173913043 4.3478260869565215,23.333333333333336 4.166666666666667,19 15,20 15,15 25,10 15,0 15,7 10,5 0,15 5,15.909090909090908 4.545454545454546,16.071429972789407 5.357142459183436,20.454545435878362 2.727272963927534,20 2.5),(11 15,10.777778284173866 14.444445710434662,10 15,11 15)),((20 15,30 15,25 25,20 15)),((23.695652173913043 4.3478260869565215,25 5,35 0,32 10,40 15,30 15,22 10,23.695652173913043 4.3478260869565215)))
-SELECT ST_ASTEXT(ST_DIFFERENCE(ST_SYMDIFFERENCE(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_horizontal),ST_GEOMFROMTEXT(@star_elem_vertical)),
-ST_GEOMFROMTEXT(@star_2)),ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_1),ST_GEOMFROMTEXT(@star_2))));
-ST_ASTEXT(ST_DIFFERENCE(ST_SYMDIFFERENCE(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_horizontal),ST_GEOMFROMTEXT(@star_elem_vertical)),
-ST_GEOMFROMTEXT(@star_2)),ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_1),ST_GEOMFROMTEXT(@star_2))))
-POLYGON((20.454545435878362 2.727272963927534,22.05644715646448 3.5282235782322404,23.333333333333332 4.166666666666667,19 15,11 15,10.777778284173866 14.444445710434662,17 10,16.071429972789407 5.357142459183436,20.454545435878362 2.727272963927534))
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_SYMDIFFERENCE(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_horizontal),ST_GEOMFROMTEXT(@star_elem_vertical)),
-ST_GEOMFROMTEXT(@star_2)),ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_1),ST_GEOMFROMTEXT(@star_2))));
-ST_ASTEXT(ST_SYMDIFFERENCE(ST_SYMDIFFERENCE(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_horizontal),ST_GEOMFROMTEXT(@star_elem_vertical)),
-ST_GEOMFROMTEXT(@star_2)),ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_1),ST_GEOMFROMTEXT(@star_2))))
-MULTIPOLYGON(((16.071428650510203 5.357143252551023,20.454545435878362 2.727272963927534,25 0,23.333333398692986 4.166666503267538,19 15,11 15,10.777778284173866 14.444445710434662,17 10,10.777777750841748 14.444444377104368,8.870967741935484 9.67741935483871,16.071428650510203 5.357143252551023)),((10.777778284173866 14.444445710434662,10 15,10.777777750841748 14.44444437710437,10.777778284173866 14.444445710434662)),((11 15,15 25,10 15,11 15)),((19 15,20 15,15 25,19 15)),((8.870967741935484 9.67741935483871,0 15,7 10,5 0,8.870967741935484 9.67741935483871)))
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_SYMDIFFERENCE(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_horizontal),ST_GEOMFROMTEXT(@star_elem_vertical)),
-ST_GEOMFROMTEXT(@star_2)),ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_1),ST_GEOMFROMTEXT(@star_2))));
-ST_ASTEXT(ST_INTERSECTION(ST_SYMDIFFERENCE(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_horizontal),ST_GEOMFROMTEXT(@star_elem_vertical)),
-ST_GEOMFROMTEXT(@star_2)),ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_1),ST_GEOMFROMTEXT(@star_2))))
-GEOMETRYCOLLECTION(MULTIPOINT((16.071429972789407 5.357142459183436),(20.454545435878362 2.727272963927534),(22.05644715646448 3.5282235782322404)),MULTILINESTRING((15 5,15.90909090909091 4.545454545454546),(-1.7763568394002505e-15 15,0 15)),MULTIPOLYGON(((20 2.5,25 0,20.454545659504127 2.727272829752063,20 2.5)),((15 0,20 2.5,15.909090909090908 4.545454545454546,15 0)),((19 15,15 25,11 15,19 15)),((20 15,30 15,25 25,20 15)),((23.695652173913043 4.3478260869565215,23.333333398692986 4.166666503267538,25 0,23.695652173913043 4.3478260869565215)),((17 10,10.777778284173866 14.444445710434662,10.777777750841748 14.444444377104368,17 10)),((15.90909090909091 4.545454545454546,16.071428650510203 5.357143252551023,8.870967741935484 9.67741935483871,5 0,15 5,15.90909090909091 4.545454545454546)),((0 15,8.870967741935484 9.67741935483871,10.777777750841748 14.44444437710437,10 15,0 15)),((22 10,23.695652173913043 4.3478260869565215,25 5,35 0,32 10,40 15,30 15,22 10))))
+SELECT ST_EQUALS(ST_UNION(ST_SYMDIFFERENCE(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_horizontal),ST_GEOMFROMTEXT(@star_elem_vertical)),
+ST_GEOMFROMTEXT(@star_2)),ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_1),ST_GEOMFROMTEXT(@star_2))),ST_GEOMFROMTEXT('MULTIPOLYGON(((20 2.5,15.909090909090908 4.545454545454546,15 0,20 2.5)),((20 2.5,25 0,23.695652173913043 4.3478260869565215,23.333333333333336 4.166666666666667,19 15,20 15,15 25,10 15,0 15,7 10,5 0,15 5,15.909090909090908 4.545454545454546,16.071429972789407 5.357142459183436,20.454545435878362 2.727272963927534,20 2.5),(11 15,10.777778284173866 14.444445710434662,10 15,11 15)),((20 15,30 15,25 25,20 15)),((23.695652173913043 4.3478260869565215,25 5,35 0,32 10,40 15,30 15,22 10,23.695652173913043 4.3478260869565215)))'));
+ST_EQUALS(ST_UNION(ST_SYMDIFFERENCE(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_horizontal),ST_GEOMFROMTEXT(@star_elem_vertical)),
+ST_GEOMFROMTEXT(@star_2)),ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_1),ST_GEOMFROMTEXT(@star_2))),ST_GEOMFROMTEXT('MULTIPOLYGON
+1
+SELECT ST_EQUALS(ST_DIFFERENCE(ST_SYMDIFFERENCE(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_horizontal),ST_GEOMFROMTEXT(@star_elem_vertical)),
+ST_GEOMFROMTEXT(@star_2)),ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_1),ST_GEOMFROMTEXT(@star_2))),ST_GEOMFROMTEXT('POLYGON((20.454545435878362 2.727272963927534,22.05644715646448 3.5282235782322404,23.333333333333332 4.166666666666667,19 15,11 15,10.777778284173866 14.444445710434662,17 10,16.071429972789407 5.357142459183436,20.454545435878362 2.727272963927534))'));
+ST_EQUALS(ST_DIFFERENCE(ST_SYMDIFFERENCE(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_horizontal),ST_GEOMFROMTEXT(@star_elem_vertical)),
+ST_GEOMFROMTEXT(@star_2)),ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_1),ST_GEOMFROMTEXT(@star_2))),ST_GEOMFROMTEXT('POLYGON
+1
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_SYMDIFFERENCE(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_horizontal),ST_GEOMFROMTEXT(@star_elem_vertical)),
+ST_GEOMFROMTEXT(@star_2)),ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_1),ST_GEOMFROMTEXT(@star_2))),ST_GEOMFROMTEXT('MULTIPOLYGON(((16.071428650510203 5.357143252551023,20.454545435878362 2.727272963927534,25 0,23.333333398692986 4.166666503267538,19 15,11 15,10.777778284173866 14.444445710434662,17 10,10.777777750841748 14.444444377104368,8.870967741935484 9.67741935483871,16.071428650510203 5.357143252551023)),((10.777778284173866 14.444445710434662,10 15,10.777777750841748 14.44444437710437,10.777778284173866 14.444445710434662)),((11 15,15 25,10 15,11 15)),((19 15,20 15,15 25,19 15)),((8.870967741935484 9.67741935483871,0 15,7 10,5 0,8.870967741935484 9.67741935483871)))'));
+ST_EQUALS(ST_SYMDIFFERENCE(ST_SYMDIFFERENCE(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_horizontal),ST_GEOMFROMTEXT(@star_elem_vertical)),
+ST_GEOMFROMTEXT(@star_2)),ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_1),ST_GEOMFROMTEXT(@star_2))),ST_GEOMFROMTEXT('MULT
+1
+SELECT ST_EQUALS(ST_INTERSECTION(ST_SYMDIFFERENCE(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_horizontal),ST_GEOMFROMTEXT(@star_elem_vertical)),
+ST_GEOMFROMTEXT(@star_2)),ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_1),ST_GEOMFROMTEXT(@star_2))),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOINT((16.071429972789407 5.357142459183436),(20.454545435878362 2.727272963927534),(22.05644715646448 3.5282235782322404)),MULTIPOLYGON(((20 2.5,25 0,20.454545659504127 2.727272829752063,20 2.5)),((15 0,20 2.5,15.909090909090908 4.545454545454546,15 0)),((19 15,15 25,11 15,19 15)),((20 15,30 15,25 25,20 15)),((23.695652173913043 4.3478260869565215,23.333333398692986 4.166666503267538,25 0,23.695652173913043 4.3478260869565215)),((17 10,10.777778284173866 14.444445710434662,10.777777750841748 14.444444377104368,17 10)),((15.90909090909091 4.545454545454546,16.071428650510203 5.357143252551023,8.870967741935484 9.67741935483871,5 0,15 5,15.90909090909091 4.545454545454546)),((0 15,8.870967741935484 9.67741935483871,10.777777750841748 14.44444437710437,10 15,0 15)),((22 10,23.695652173913043 4.3478260869565215,25 5,35 0,32 10,40 15,30 15,22 10))))'));
+ST_EQUALS(ST_INTERSECTION(ST_SYMDIFFERENCE(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_horizontal),ST_GEOMFROMTEXT(@star_elem_vertical)),
+ST_GEOMFROMTEXT(@star_2)),ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_1),ST_GEOMFROMTEXT(@star_2))),ST_GEOMFROMTEXT('GEOME
+1
 #-------------------------------------------------------------------------------------------
 # Spatial Operators with ST_INTERSECTION()
 #-------------------------------------------------------------------------------------------
@@ -1449,7 +1449,7 @@
 GEOMETRYCOLLECTION EMPTY
 SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOINT(2 2, 3 3)'),ST_GEOMFROMTEXT('MULTIPOINT(0 0, 4 4)')));
 ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOINT(2 2, 3 3)'),ST_GEOMFROMTEXT('MULTIPOINT(0 0, 4 4)')))
-MULTIPOINT((0 0),(2 2),(3 3),(4 4))
+MULTIPOINT((2 2),(3 3),(0 0),(4 4))
 SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOINT(2 2, 3 3)'),ST_GEOMFROMTEXT('MULTIPOINT(2 2, 3 3)')));
 ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOINT(2 2, 3 3)'),ST_GEOMFROMTEXT('MULTIPOINT(2 2, 3 3)')))
 GEOMETRYCOLLECTION EMPTY
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/gis/r/st_collect.result mysql-8.0-8.0.27/mysql-test/suite/gis/r/st_collect.result
--- mysql-8.0-8.0.26/mysql-test/suite/gis/r/st_collect.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/gis/r/st_collect.result	2021-09-28 11:46:34.000000000 +0000
@@ -97,42 +97,42 @@
 SELECT ST_ASTEXT(ST_COLLECT(DISTINCT location)) AS geo, SUM(running_number)
 OVER()  FROM table_simple_aggregation GROUP BY running_number;
 geo	SUM(running_number)
-OVER()
+MULTIPOINT((0 0))	55
+MULTIPOINT((0 0))	55
 MULTIPOINT((0 0))	55
 MULTIPOINT((0 0))	55
 MULTIPOINT((1 0))	55
 MULTIPOINT((2 0))	55
 MULTIPOINT((3 0))	55
-MULTIPOINT((0 0))	55
 NULL	55
-MULTIPOINT((0 0))	55
 NULL	55
 NULL	55
+OVER()
 SELECT ST_ASTEXT(ST_COLLECT(DISTINCT location)) AS geo, SUM(grouping_condition)
 OVER(), grouping_condition FROM table_simple_aggregation GROUP BY
 grouping_condition;
 geo	SUM(grouping_condition)
-OVER()	grouping_condition
 MULTIPOINT((0 0))	1	NULL
 MULTIPOINT((0 0),(1 0),(3 0))	1	0
 MULTIPOINT((0 0),(2 0))	1	1
+OVER()	grouping_condition
 SELECT ST_ASTEXT(ST_COLLECT(location)) AS geo, SUM(grouping_condition) OVER(),
 grouping_condition FROM table_simple_aggregation GROUP BY grouping_condition;
 geo	SUM(grouping_condition) OVER()	grouping_condition
+MULTIPOINT((0 0),(0 0))	1	NULL
 MULTIPOINT((0 0),(1 0),(3 0))	1	0
 MULTIPOINT((0 0),(2 0))	1	1
-MULTIPOINT((0 0),(0 0))	1	NULL
 SELECT ST_ASTEXT(ST_COLLECT(location)) AS geo, SUM(running_number) OVER()  FROM
 table_simple_aggregation GROUP BY running_number;
 geo	SUM(running_number) OVER()
 MULTIPOINT((0 0))	55
 MULTIPOINT((0 0))	55
+MULTIPOINT((0 0))	55
+MULTIPOINT((0 0))	55
 MULTIPOINT((1 0))	55
 MULTIPOINT((2 0))	55
 MULTIPOINT((3 0))	55
-MULTIPOINT((0 0))	55
 NULL	55
-MULTIPOINT((0 0))	55
 NULL	55
 NULL	55
 # Teardown of testing NULL data
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/gis/r/st_intersection.result mysql-8.0-8.0.27/mysql-test/suite/gis/r/st_intersection.result
--- mysql-8.0-8.0.26/mysql-test/suite/gis/r/st_intersection.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/gis/r/st_intersection.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,130 @@
+#####################################################################################
+# Creating a spatial Geometry object
+#####################################################################################
+USE test;
+CREATE TABLE gis_geometrycollection (fid INTEGER NOT NULL PRIMARY KEY, g GEOMETRY);
+SET @star_of_elems='MULTIPOLYGON(((5 0,15 5,25 0,22 10,30 15,19 15,5 0)),((19 15,15 25,11 15,19 15)))';
+SET @star_collection_elems='GEOMETRYCOLLECTION(POLYGON((5 0,7 10,0 15,10 15,15 25,20 15,30 15,22 10,25 0,15 5,5 0),(10 6,10 10,7 12,13 13,15 18,17 13,21 13,18 10,20 6,15 8,10 6)),MULTILINESTRING((25 0,0 15,15 30,0 5)),LINESTRING(15 25,15 10),MULTIPOINT(5 0,25 0),POINT(15 25))';
+# INSERT star
+INSERT INTO gis_geometrycollection VALUES (103,ST_GEOMFROMTEXT(@star_of_elems));
+CREATE TABLE gis_geometrycollection_2 SELECT fid as fid2,g as g2 FROM gis_geometrycollection;
+# Checking the integrity of the above create/insert statements
+# 1 row.
+SELECT count(g IS NULL) FROM gis_geometrycollection;
+count(g IS NULL)
+1
+# 1 row.
+SELECT count(g2 IS NULL) FROM gis_geometrycollection_2;
+count(g2 IS NULL)
+1
+#####################################################################################
+# Testing ST_Intersection() with different ways to pass input geometries
+#####################################################################################
+SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_collection_elems)));
+ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_collection_elems)))
+GEOMETRYCOLLECTION(POLYGON((15 25,11 15,13.8 15,15 18,16.2 15,19 15,15 25)),POLYGON((30 15,19 15,17.133333333333333 13,21 13,18 10,20 6,15 8,10.957446808510639 6.382978723404255,5 0,15 5,25 0,22 10,30 15)),LINESTRING(13 7.2,12.179487179487179 7.6923076923076925),LINESTRING(15 18,15 15),LINESTRING(15 10.714285714285715,15 10))
+SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('POLYGON((1 1,2 1,2 2,1 2,1 1))')));
+ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('POLYGON((1 1,2 1,2 2,1 2,1 1))')))
+GEOMETRYCOLLECTION EMPTY
+SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('POINT(0 0)'),ST_GEOMFROMTEXT('POLYGON((1 1,2 1,2 2,1 2,1 1))')));
+ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('POINT(0 0)'),ST_GEOMFROMTEXT('POLYGON((1 1,2 1,2 2,1 2,1 1))')))
+GEOMETRYCOLLECTION EMPTY
+SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_of_elems))) FROM gis_geometrycollection WHERE fid=103;
+ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_of_elems)))
+MULTIPOLYGON(((19 15,5 0,15 5,25 0,22 10,30 15,19 15)),((11 15,19 15,15 25,11 15)))
+SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT('POINT(0 0)'))) FROM gis_geometrycollection WHERE fid=103;
+ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT('POINT(0 0)')))
+GEOMETRYCOLLECTION EMPTY
+SELECT ST_ASTEXT(ST_INTERSECTION(g,g2)) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=103 and fid2=103;
+ST_ASTEXT(ST_INTERSECTION(g,g2))
+MULTIPOLYGON(((19 15,5 0,15 5,25 0,22 10,30 15,19 15)),((11 15,19 15,15 25,11 15)))
+#####################################################################################
+# Verify ST_Intersection() returns NULL if at least one of its arguments are NULL.
+#####################################################################################
+SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),NULL));
+ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),NULL))
+NULL
+SELECT ST_ASTEXT(ST_INTERSECTION(NULL,ST_GEOMFROMTEXT(@star_of_elems)));
+ST_ASTEXT(ST_INTERSECTION(NULL,ST_GEOMFROMTEXT(@star_of_elems)))
+NULL
+SELECT ST_ASTEXT(ST_INTERSECTION(NULL,ST_GEOMFROMTEXT('POINT(0 0)')));
+ST_ASTEXT(ST_INTERSECTION(NULL,ST_GEOMFROMTEXT('POINT(0 0)')))
+NULL
+SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('POINT(0 0)'),NULL));
+ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('POINT(0 0)'),NULL))
+NULL
+SELECT ST_ASTEXT(ST_INTERSECTION(g,NULL)) FROM gis_geometrycollection WHERE fid=103;
+ST_ASTEXT(ST_INTERSECTION(g,NULL))
+NULL
+SELECT ST_ASTEXT(ST_INTERSECTION(NULL,NULL));
+ST_ASTEXT(ST_INTERSECTION(NULL,NULL))
+NULL
+SELECT ST_ASTEXT(ST_INTERSECTION(fid,NULL)) FROM gis_geometrycollection WHERE fid=103;
+ST_ASTEXT(ST_INTERSECTION(fid,NULL))
+NULL
+#####################################################################################
+# WL#8579 Spatial Reference Systems
+#####################################################################################
+# SRID 0 (should pass)
+SELECT ST_ASTEXT(ST_INTERSECTION(
+ST_GEOMFROMTEXT('POINT(0 0)', 0),
+ST_GEOMFROMTEXT('POINT(0 0)', 0)
+));
+ST_ASTEXT(ST_INTERSECTION(
+ST_GEOMFROMTEXT('POINT(0 0)', 0),
+ST_GEOMFROMTEXT('POINT(0 0)', 0)
+))
+POINT(0 0)
+# Projected SRS (should pass)
+SELECT ST_ASTEXT(ST_INTERSECTION(
+ST_GEOMFROMTEXT('POINT(0 0)', 2000),
+ST_GEOMFROMTEXT('POINT(0 0)', 2000)
+));
+ST_ASTEXT(ST_INTERSECTION(
+ST_GEOMFROMTEXT('POINT(0 0)', 2000),
+ST_GEOMFROMTEXT('POINT(0 0)', 2000)
+))
+POINT(0 0)
+# Geographic SRS (should fail)
+--error ER_NOT_IMPLEMENTED_FOR_GEOGRAPHIC_SRS
+SELECT ST_ASTEXT(ST_INTERSECTION(
+ST_GEOMFROMTEXT('POINT(0 0)', 4326),
+ST_GEOMFROMTEXT('POINT(0 0)', 4326)
+))
+#####################################################################################
+# Invalid function calls
+#####################################################################################
+# Undefined SRS' in the input geometries should return ER_SRS_NOT_FOUND.
+DO ST_ASTEXT(ST_INTERSECTION(x'40420f00010100000000000000000000000000000000000000',x'40420f00010100000000000000000000000000000000000000'));
+ERROR SR001: There's no spatial reference system with SRID 1000000.
+# Different SRIDs in the input geometries should return ER_GIS_DIFFERENT_SRIDS.
+DO ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('POINT(0 0)'),ST_GEOMFROMTEXT('POINT(0 1)',4326)));
+ERROR HY000: Binary geometry function st_intersection given two geometries of different srids: 0 and 4326, which should have been identical.
+DO ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('POINT(0 0)',4145),ST_GEOMFROMTEXT('POINT(0 1)',4326)));
+ERROR HY000: Binary geometry function st_intersection given two geometries of different srids: 4145 and 4326, which should have been identical.
+# Not syntactically well-formed geometry input should result in ER_GIS_INVALID_DATA.
+SELECT ST_ASTEXT(ST_INTERSECTION(fid,ST_GEOMFROMTEXT('POINT(0 0)'))) FROM gis_geometrycollection WHERE fid=103;
+ERROR 22023: Invalid GIS data provided to function st_intersection.
+SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('POINT(0 0)'),fid)) FROM gis_geometrycollection WHERE fid=103;
+ERROR 22023: Invalid GIS data provided to function st_intersection.
+# Return ER_GEOMETRY_PARAM_(LONGITUDE/LATITUDE)_OUT_OF_RANGE if longitude and latitude values are not
+# within their respective ranges (-180,180] and [-90,90]).
+SET @pt = ST_GeomFromText('POINT(0 0)', 4326);
+SET @pt_lat_minus_91 = x'E6100000010100000000000000000000000000000000C056C0';
+SET @pt_lat_plus_91 = x'E6100000010100000000000000000000000000000000C05640';
+SET @pt_long_minus_181 = x'E610000001010000000000000000A066C00000000000000000';
+SET @pt_long_plus_181 = x'E610000001010000000000000000A066400000000000000000';
+DO ST_INTERSECTION(@pt_lat_minus_91, @pt);
+ERROR 22S03: A parameter of function st_intersection contains a geometry with latitude -91.000000, which is out of range. It must be within [-90.000000, 90.000000].
+DO ST_INTERSECTION(@pt_lat_plus_91, @pt);
+ERROR 22S03: A parameter of function st_intersection contains a geometry with latitude 91.000000, which is out of range. It must be within [-90.000000, 90.000000].
+DO ST_INTERSECTION(@pt_long_minus_181, @pt);
+ERROR 22S02: A parameter of function st_intersection contains a geometry with longitude -181.000000, which is out of range. It must be within (-180.000000, 180.000000].
+DO ST_INTERSECTION(@pt_long_plus_181, @pt);
+ERROR 22S02: A parameter of function st_intersection contains a geometry with longitude 181.000000, which is out of range. It must be within (-180.000000, 180.000000].
+SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('POLYGON((1 1,2 1,2 2,1 2,1 1))'),ST_GEOMFROMTEXT('POLYGON((0 1,1.5 1,1 2,0 2,0 1))')));
+ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('POLYGON((1 1,2 1,2 2,1 2,1 1))'),ST_GEOMFROMTEXT('POLYGON((0 1,1.5 1,1 2,0 2,0 1))')))
+POLYGON((1 2,1 1,1.5 1,1 2))
+#clean up
+DROP TABLE gis_geometrycollection;
+DROP TABLE gis_geometrycollection_2;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/gis/r/st_symdifference.result mysql-8.0-8.0.27/mysql-test/suite/gis/r/st_symdifference.result
--- mysql-8.0-8.0.26/mysql-test/suite/gis/r/st_symdifference.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/gis/r/st_symdifference.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,134 @@
+#####################################################################################
+# Creating a spatial Geometry object
+#####################################################################################
+USE test;
+CREATE TABLE gis_geometrycollection (fid INTEGER NOT NULL PRIMARY KEY, g GEOMETRY);
+SET @star_of_elems='MULTIPOLYGON(((5 0,15 5,25 0,22 10,30 15,19 15,5 0)),((19 15,15 25,11 15,19 15)))';
+SET @star_collection_elems='GEOMETRYCOLLECTION(MULTIPOLYGON(((5 0,15 5,25 0,22 10,30 15,19 15,5 0)),((19 15,15 25,11 15,19 15))),POLYGON((5 0,7 10,0 15,10 15,15 25,20 15,30 15,22 10,25 0,15 5,5 0),(10 6,10 10,7 12,13 13,15 18,17 13,21 13,18 10,20 6,15 8,10 6)),MULTILINESTRING((25 0,0 15,15 30,0 5)),LINESTRING(15 25,15 10),MULTIPOINT(5 0,25 0),POINT(15 25))';
+# INSERT star
+INSERT INTO gis_geometrycollection VALUES (103,ST_GEOMFROMTEXT(@star_of_elems));
+CREATE TABLE gis_geometrycollection_2 SELECT fid as fid2,g as g2 FROM gis_geometrycollection;
+# Checking the integrity of the above create/insert statements
+# 1 row.
+SELECT count(g IS NULL) FROM gis_geometrycollection;
+count(g IS NULL)
+1
+# 1 row.
+SELECT count(g2 IS NULL) FROM gis_geometrycollection_2;
+count(g2 IS NULL)
+1
+#####################################################################################
+# Testing ST_SymDifference() with different ways to pass input geometries
+#####################################################################################
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_collection_elems)));
+ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_collection_elems)))
+GEOMETRYCOLLECTION(MULTIPOLYGON(((15.074704491725768 10.794326241134751,10.957442978734894 6.382977191493957,10.957446808510639 6.382978723404255,15.074704491725768 10.794326241134751)),((15.074704491725768 10.794326241134751,19 15,16.2 15,17 13,17.133333333333333 13,15.074704491725768 10.794326241134751)),((10.957442978734894 6.382977191493957,10 6,10 10,7 12,13 13,13.8 15,11 15,15 25,10 15,0 15,7 10,5 0,10.957442978734894 6.382977191493957)),((15 25,19 15,20 15,15 25))),MULTILINESTRING((12.179487179487179 7.692307692307692,10 9),(0 15,15 30,6 15),(4.2 12,0 5),(15 15,15 10.714285714285714)))
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('POLYGON((1 1,2 1,2 2,1 2,1 1))')));
+ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('POLYGON((1 1,2 1,2 2,1 2,1 1))')))
+MULTIPOLYGON(((1 1,2 1,2 2,1 2,1 1)),((5 0,15 5,25 0,22 10,30 15,19 15,5 0)),((19 15,15 25,11 15,19 15)))
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POINT(0 0)'),ST_GEOMFROMTEXT('POLYGON((1 1,2 1,2 2,1 2,1 1))')));
+ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POINT(0 0)'),ST_GEOMFROMTEXT('POLYGON((1 1,2 1,2 2,1 2,1 1))')))
+GEOMETRYCOLLECTION(POLYGON((1 1,2 1,2 2,1 2,1 1)),POINT(0 0))
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_of_elems))) FROM gis_geometrycollection WHERE fid=103;
+ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_of_elems)))
+GEOMETRYCOLLECTION EMPTY
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT('POINT(0 0)'))) FROM gis_geometrycollection WHERE fid=103;
+ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT('POINT(0 0)')))
+GEOMETRYCOLLECTION(MULTIPOLYGON(((5 0,15 5,25 0,22 10,30 15,19 15,5 0)),((19 15,15 25,11 15,19 15))),POINT(0 0))
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,g2)) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=103 and fid2=103;
+ST_ASTEXT(ST_SYMDIFFERENCE(g,g2))
+GEOMETRYCOLLECTION EMPTY
+#####################################################################################
+# Verify ST_SymDifference() returns NULL if at least one of its arguments are NULL.
+#####################################################################################
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),NULL));
+ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),NULL))
+NULL
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(NULL,ST_GEOMFROMTEXT(@star_of_elems)));
+ST_ASTEXT(ST_SYMDIFFERENCE(NULL,ST_GEOMFROMTEXT(@star_of_elems)))
+NULL
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(NULL,ST_GEOMFROMTEXT('POINT(0 0)')));
+ST_ASTEXT(ST_SYMDIFFERENCE(NULL,ST_GEOMFROMTEXT('POINT(0 0)')))
+NULL
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POINT(0 0)'),NULL));
+ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POINT(0 0)'),NULL))
+NULL
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,NULL)) FROM gis_geometrycollection WHERE fid=103;
+ST_ASTEXT(ST_SYMDIFFERENCE(g,NULL))
+NULL
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(NULL,NULL));
+ST_ASTEXT(ST_SYMDIFFERENCE(NULL,NULL))
+NULL
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(fid,NULL)) FROM gis_geometrycollection WHERE fid=103;
+ST_ASTEXT(ST_SYMDIFFERENCE(fid,NULL))
+NULL
+#####################################################################################
+# WL#8579 Spatial Reference Systems
+#####################################################################################
+# SRID 0 (should pass)
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(
+ST_GEOMFROMTEXT('POINT(0 0)', 0),
+ST_GEOMFROMTEXT('POINT(0 0)', 0)
+));
+ST_ASTEXT(ST_SYMDIFFERENCE(
+ST_GEOMFROMTEXT('POINT(0 0)', 0),
+ST_GEOMFROMTEXT('POINT(0 0)', 0)
+))
+GEOMETRYCOLLECTION EMPTY
+# Projected SRS (should pass)
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(
+ST_GEOMFROMTEXT('POINT(0 0)', 2000),
+ST_GEOMFROMTEXT('POINT(0 0)', 2000)
+));
+ST_ASTEXT(ST_SYMDIFFERENCE(
+ST_GEOMFROMTEXT('POINT(0 0)', 2000),
+ST_GEOMFROMTEXT('POINT(0 0)', 2000)
+))
+GEOMETRYCOLLECTION EMPTY
+# Geographic SRS (should pass)
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(
+ST_GEOMFROMTEXT('POINT(0 0)', 4326),
+ST_GEOMFROMTEXT('POINT(0 0)', 4326)
+));
+ST_ASTEXT(ST_SYMDIFFERENCE(
+ST_GEOMFROMTEXT('POINT(0 0)', 4326),
+ST_GEOMFROMTEXT('POINT(0 0)', 4326)
+))
+GEOMETRYCOLLECTION EMPTY
+#####################################################################################
+# Invalid function calls
+#####################################################################################
+# Undefined SRS' in the input geometries should return ER_SRS_NOT_FOUND.
+DO ST_ASTEXT(ST_SYMDIFFERENCE(x'40420f00010100000000000000000000000000000000000000',x'40420f00010100000000000000000000000000000000000000'));
+ERROR SR001: There's no spatial reference system with SRID 1000000.
+# Different SRIDs in the input geometries should return ER_GIS_DIFFERENT_SRIDS.
+DO ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POINT(0 0)'),ST_GEOMFROMTEXT('POINT(0 1)',4326)));
+ERROR HY000: Binary geometry function st_symdifference given two geometries of different srids: 0 and 4326, which should have been identical.
+DO ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POINT(0 0)',4145),ST_GEOMFROMTEXT('POINT(0 1)',4326)));
+ERROR HY000: Binary geometry function st_symdifference given two geometries of different srids: 4145 and 4326, which should have been identical.
+# Not syntactically well-formed geometry input should result in ER_GIS_INVALID_DATA.
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(fid,ST_GEOMFROMTEXT('POINT(0 0)'))) FROM gis_geometrycollection WHERE fid=103;
+ERROR 22023: Invalid GIS data provided to function st_symdifference.
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POINT(0 0)'),fid)) FROM gis_geometrycollection WHERE fid=103;
+ERROR 22023: Invalid GIS data provided to function st_symdifference.
+# Return ER_GEOMETRY_PARAM_(LONGITUDE/LATITUDE)_OUT_OF_RANGE if longitude and latitude values are not
+# within their respective ranges (-180,180] and [-90,90]).
+SET @pt = ST_GeomFromText('POINT(0 0)', 4326);
+SET @pt_lat_minus_91 = x'E6100000010100000000000000000000000000000000C056C0';
+SET @pt_lat_plus_91 = x'E6100000010100000000000000000000000000000000C05640';
+SET @pt_long_minus_181 = x'E610000001010000000000000000A066C00000000000000000';
+SET @pt_long_plus_181 = x'E610000001010000000000000000A066400000000000000000';
+#====================================================================================
+# DIFFERENCE polygon,polygon
+#====================================================================================
+# Cartesian SRS
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POLYGON((1 1,2 1,2 2,1 2,1 1))'),ST_GEOMFROMTEXT('POLYGON((0 1,1.5 1,1 2,0 2,0 1))')));
+ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POLYGON((1 1,2 1,2 2,1 2,1 1))'),ST_GEOMFROMTEXT('POLYGON((0 1,1.5 1,1 2,0 2,0 1))')))
+MULTIPOLYGON(((1 2,1.5 1,2 1,2 2,1 2)),((1 2,0 2,0 1,1 1,1 2)))
+# Geographic SRS
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POLYGON((1 1,1 2,2 2,2 1,1 1))', 4326),ST_GEOMFROMTEXT('POLYGON((0 1,0 2,1 2,1 1,0 1))', 4326)));
+ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POLYGON((1 1,1 2,2 2,2 1,1 1))', 4326),ST_GEOMFROMTEXT('POLYGON((0 1,0 2,1 2,1 1,0 1))', 4326)))
+POLYGON((2 1,0 1,0 2,1 2,2 2,2 1))
+#clean up
+DROP TABLE gis_geometrycollection;
+DROP TABLE gis_geometrycollection_2;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/gis/t/gis_bugs_crashes.test mysql-8.0-8.0.27/mysql-test/suite/gis/t/gis_bugs_crashes.test
--- mysql-8.0-8.0.26/mysql-test/suite/gis/t/gis_bugs_crashes.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/gis/t/gis_bugs_crashes.test	2021-09-28 11:46:34.000000000 +0000
@@ -286,6 +286,7 @@
 --echo ######################################################################################################
 
 --echo # Invalid geometry in input
+#--error ER_GIS_INVALID_DATA
 DO MBRWITHIN(
     ST_CENTROID(
         ST_UNION(
@@ -461,8 +462,7 @@
 --echo ######################################################################################################
 
 --echo # Invalid geometry in input
---error ER_GIS_INVALID_DATA
-SELECT ST_ISEMPTY(ST_INTERSECTION(
+DO ST_ISEMPTY(ST_INTERSECTION(
                       ST_UNION(
                           ST_GEOMFROMTEXT('MULTIPOINT(-9 4,10 -4,3 -10,-6 5,2 -4,-4 -8,1 10,4 10,6 6,9 2,9 4,-10 5,-6 7)'),
                           ST_GEOMFROMTEXT('MULTIPOLYGON(((3 5,-7 -2,-5 -1,1 -4,2 9,-9 -6,-6 10,-7 2,9 -2,-2 1,-1 4,-3 10, 3 5)),'
@@ -480,8 +480,7 @@
                           ST_GEOMFROMTEXT('LINESTRING(0 -3,8 9,10 -3,-8 7,4 4,8 -8,10 6,5 7)')))));
 
 --echo # Invalid geometry in input
---error ER_GIS_INVALID_DATA
-SELECT ST_ISEMPTY(ST_INTERSECTION(
+DO ST_ISEMPTY(ST_INTERSECTION(
                       ST_CONVEXHULL(
                           ST_GEOMFROMTEXT('POLYGON((0 10,-4 7,10 5,-8 -6,9 1,4 7,5 0,-3 -1,9 10,-7 -5, 0 10))')),
                   ST_UNION(
@@ -506,8 +505,7 @@
                           ST_GEOMFROMTEXT('MULTILINESTRING((10 10,2 -9,-8 2,9 -2,-10 -4,10 7,-10 8,-4 7,-9 3,8 8))'))));
 
 --echo # Invalid geometry in input
---error ER_GIS_INVALID_DATA
-SELECT ST_SRID(
+DO ST_SRID(
     ST_INTERSECTION(
         ST_UNION(
             ST_UNION(
@@ -1097,8 +1095,8 @@
 
 
 --echo # Invalid geometry in input
---error ER_GIS_INVALID_DATA
-SELECT ST_ASTEXT(ST_INTERSECTION(
+#--error ER_GIS_INVALID_DATA
+DO ST_ASTEXT(ST_INTERSECTION(
                      ST_GEOMFROMWKB(ST_ASWKB(
                          GEOMETRYCOLLECTION(
                              POINT(7,7),
@@ -1252,13 +1250,15 @@
 --echo # BUG#20402476 : ASSERTION FAILURE IN ITEM_FUNC_SPATIAL_OPERATION::VAL_STR FUNCTION
 --echo ######################################################################################################
 
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(
-      ST_GEOMFROMTEXT('LINESTRING(-10 -9,-4 -4)'),
-      ST_GEOMFROMTEXT('MULTIPOINT(2 6,2 6,8 0,6 4,5 9,0 -9,0 -10,9 1,10 8,5 -9)')));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(
-      ST_GEOMFROMTEXT('MULTIPOINT(2 6,2 6,8 0,6 4,5 9,0 -9,0 -10,9 1,10 8,5 -9)'),
-      ST_GEOMFROMTEXT('LINESTRING(-10 -9,-4 -4)')));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(
+ST_GEOMFROMTEXT('LINESTRING(-10 -9,-4 -4)'),
+ST_GEOMFROMTEXT('MULTIPOINT(2 6,2 6,8 0,6 4,5 9,0 -9,0 -10,9 1,10 8,5 -9)')),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(-10 -9,-4 -4),POINT(0 -10),POINT(0 -9),POINT(2 6),POINT(5 -9),POINT(5 9),POINT(6 4),POINT(8 0),POINT(9 1),POINT(10 8))'));
+
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(
+ST_GEOMFROMTEXT('MULTIPOINT(2 6,2 6,8 0,6 4,5 9,0 -9,0 -10,9 1,10 8,5 -9)'),
+ST_GEOMFROMTEXT('LINESTRING(-10 -9,-4 -4)')),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(-10 -9,-4 -4),POINT(0 -10),POINT(0 -9),POINT(2 6),POINT(5 -9),POINT(5 9),POINT(6 4),POINT(8 0),POINT(9 1),POINT(10 8))'));
 
 --echo ######################################################################################################
 --echo # BUG#20133571 : ASSERTION `GRES->HAS_GEOM_HEADER_SPACE()' FAILED
@@ -1309,8 +1309,7 @@
 --echo ######################################################################################################
 
 --echo # Invalid geometry in input
---error ER_GIS_INVALID_DATA
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(
+DO ST_ASTEXT(ST_SYMDIFFERENCE(
       ST_GEOMFROMTEXT('LINESTRING(6 -6,4 -2,5 -1,1 1,-10 10,-1 -10,-8 8,-4 -9,-4 -3,1 -9,5 -2,-4 0,3 5,0 -5)'),
       ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
                             'MULTIPOLYGON(((0 2,-5 -9,7 1,-10 2,-7 1,6 0,0 -4, 0 2)),'
@@ -1352,25 +1351,29 @@
 --echo # BUG#20415950 : WL#7225 : ASSERTION FAILURE IN ITEM_GEOFUNC_SETOPS.CC FILE
 --echo ######################################################################################################
 
---error ER_GIS_INVALID_DATA
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOLYGON(((2 -6,10 -4,1 8, 2 -6)),'
+--echo # Invalid geometry in input
+#--error ER_GIS_INVALID_DATA
+DO ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOLYGON(((2 -6,10 -4,1 8, 2 -6)),'
                                                               '((-3 1,-7 2,3 -6,-1 2,3 8,-5 9,-10 9,9 9,4 4,-2 2,-5 8, -3 1)))'),
                                  ST_GEOMFROMTEXT('LINESTRING(-9 -6,7 -3,0 -5,-4 -9,-5 7,-7 7,8 -4,0 0,-5 2,2 8,1 -8,-5 3,-3 -9,-8 -2)')));
 
---error ER_GIS_INVALID_DATA
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('LINESTRING(-9 -6,7 -3,0 -5,-4 -9,-5 7,-7 7,8 -4,0 0,-5 2,2 8,1 -8,-5 3,-3 -9,-8 -2)'),
+--echo # Invalid geometry in input
+#--error ER_GIS_INVALID_DATA
+DO ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('LINESTRING(-9 -6,7 -3,0 -5,-4 -9,-5 7,-7 7,8 -4,0 0,-5 2,2 8,1 -8,-5 3,-3 -9,-8 -2)'),
                                  ST_GEOMFROMTEXT('MULTIPOLYGON(((2 -6,10 -4,1 8, 2 -6)),'
                                                  '((-3 1,-7 2,3 -6,-1 2,3 8,-5 9,-10 9,9 9,4 4,-2 2,-5 8, -3 1)))')));
 
---error ER_GIS_INVALID_DATA
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOLYGON(((2 -6,10 -4,1 8, 2 -6)),'
+--echo # Invalid geometry in input
+#--error ER_GIS_INVALID_DATA
+DO ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOLYGON(((2 -6,10 -4,1 8, 2 -6)),'
                                                               '((-3 1,-7 2,3 -6,-1 2,3 8,-5 9,-10 9,9 9,4 4,-2 2,-5 8, -3 1)))'),
                                  ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
-                                                       'LINESTRING(-9 -6,7 -3,0 -5,-4 -9,-5 7,-7 7,8 -4,0 0,-5 2,2 8,1 -8,-5 3,-3 -9,-8 -2)')));
- 
---error ER_GIS_INVALID_DATA
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
-                                                       'LINESTRING(-9 -6,7 -3,0 -5,-4 -9,-5 7,-7 7,8 -4,0 0,-5 2,2 8,1 -8,-5 3,-3 -9,-8 -2)'),
+                                                       'LINESTRING(-9 -6,7 -3,0 -5,-4 -9,-5 7,-7 7,8 -4,0 0,-5 2,2 8,1 -8,-5 3,-3 -9,-8 -2))')));
+
+--echo # Invalid geometry in input
+#--error ER_GIS_INVALID_DATA
+DO ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
+                                                       'LINESTRING(-9 -6,7 -3,0 -5,-4 -9,-5 7,-7 7,8 -4,0 0,-5 2,2 8,1 -8,-5 3,-3 -9,-8 -2))'),
                                  ST_GEOMFROMTEXT('MULTIPOLYGON(((2 -6,10 -4,1 8, 2 -6)),'
                                                               '((-3 1,-7 2,3 -6,-1 2,3 8,-5 9,-10 9,9 9,4 4,-2 2,-5 8, -3 1)))')));
 
@@ -1491,7 +1494,8 @@
                           LINESTRING(POINT(7,3),POINT(8,3),POINT(4,4),POINT(3,8),POINT(4.2,9),POINT(6,4),POINT(8,8),POINT(-.7,1),POINT(7,3))))),
             ST_GEOMFROMWKB(ST_ASWKB(POINT(5,+.1)))));
 
-SELECT ST_ASTEXT(
+--echo #invalid geometry as input
+DO ST_ASTEXT(
       ST_SYMDIFFERENCE(
             ST_GEOMFROMTEXT(
                   'GEOMETRYCOLLECTION('
@@ -1511,7 +1515,8 @@
                   ST_ASWKB(
                         ST_GEOMFROMTEXT('MULTIPOINT(1 189.7654,41,-1032.34324 9,6.4 1,4 9)')))));
 
-SELECT ST_ASTEXT(
+--echo #invalid geometry as input
+DO ST_ASTEXT(
       ST_SYMDIFFERENCE(
             ST_GEOMFROMTEXT(
                   'GEOMETRYCOLLECTION('
@@ -1535,7 +1540,7 @@
 # on some compilers, the rounded off number differs from the expected result.
 --echo # Invalid geometry in input.
 --replace_regex /([0-9]+\.[0-9]{4})[0-9]*/\1/  /([0-9]*\.[0-9]{2})[0-9]*(e[-+]*[0-9]+)/\1\2/
-SELECT ST_ASTEXT(
+DO ST_ASTEXT(
       ST_SYMDIFFERENCE(
             ST_GEOMFROMTEXT('MULTIPOLYGON(((-2 3,3 2,-7 4,-8 -4,-8 8,4 3,-10 -4,0 6,-4 7,-9 3,-6 0,-1 -8,-5 -3,2 -6,-7 -7, -2 3)),'
                                          '((-8 -9,-4 7,-5 5,6 -9,-6 -4,-1 6,-7 8,-2 0,1 -4,-9 -5,2 -3,0 6,8 -6, -8 -9)),'
@@ -1614,8 +1619,7 @@
                                  ST_GEOMFROMWKB(ST_ASWKB(ST_GEOMFROMTEXT('POLYGON((1 5,+.8 -0.7654,1 5))')))));
 
 --echo # Invalid geometry in input
---error ER_GIS_INVALID_DATA
-SELECT ST_ASTEXT(
+DO ST_ASTEXT(
     ST_SYMDIFFERENCE(
         ST_GEOMFROMTEXT('POLYGON((0 4,-8 -1,1 9,0 4))'),
         ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
@@ -1754,19 +1758,19 @@
 --echo ######################################################################################################
 
 --echo # Invalid geometry in input.
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(
+DO ST_ASTEXT(ST_SYMDIFFERENCE(
     ST_GEOMFROMTEXT('POLYGON((-4 0,7 -8,-5 1,1 9,-9 -7,9 6,-6 -9,-4 0))'),
     ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
                         'MULTILINESTRING((5 8,-5 -8,3 -7,-2 -7,6 2,6 3,6 10,7 7,1 0,-6 -1,8 -4,-2 1,9 -10,4 -2)),'
                         'LINESTRING(-1 -2,10 -7,8 -5))')));
 
 --echo # Invalid geometry in input.
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(
+DO ST_ASTEXT(ST_SYMDIFFERENCE(
     ST_GEOMFROMTEXT('POLYGON((-4 0,7 -8,-5 1,1 9,-9 -7,9 6,-6 -9,-4 0))'),
     ST_GEOMFROMTEXT('MULTILINESTRING((5 8,-5 -8,3 -7,-2 -7,6 2,6 3,6 10,7 7,1 0,-6 -1,8 -4,-2 1,9 -10,4 -2),(-1 -2,10 -7,8 -5))')));
 
 --echo # Invalid geometry in input.
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POLYGON((-4 0,7 -8,-5 1,1 9,-9 -7,9 6,-6 -9,-4 0))'), ST_GEOMFROMTEXT('LINESTRING(-1 -2,10 -7,8 -5)')));
+DO ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POLYGON((-4 0,7 -8,-5 1,1 9,-9 -7,9 6,-6 -9,-4 0))'), ST_GEOMFROMTEXT('LINESTRING(-1 -2,10 -7,8 -5)')));
 
 --echo ######################################################################################################
 --echo # BUG#20422341 : ST_ISSIMPLE(MULTILINESTRING) RETURNS INCORRECT RESULT
@@ -1780,7 +1784,8 @@
 --echo # BUG#20430837 : WL#7225: BOOST_ASSERT( ENTER_COUNT == 0 )
 --echo ######################################################################################################
 
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(
+--echo #invalid geometry as input
+DO ST_ASTEXT(ST_SYMDIFFERENCE(
     ST_GEOMFROMTEXT('MULTIPOLYGON(((7 -6,-2 8,-5 -4,2 7,4 9,0 -9,8 2,5 -2,9 0,-6 1,10 -10,7 -6)),'
                                  '((-7 -4,9 3,-9 8,0 -4,5 -9,-7 -4)),'
                                  '((-10 1,-5 -3,1 -1,-9 -5,10 -9,9 -7,-4 9,8 0,2 0,-10 1)))'),
@@ -1824,7 +1829,8 @@
     ST_GEOMFROMTEXT('LINESTRING(-2 -2,-4 0,1 -8,-2 6,8 5,-7 -8,3 0,4 -1,-7 10,-4 10)'),
     ST_GEOMFROMTEXT('LINESTRING(-5 -4,3 0,4 -1,7 -4,2 -1,-4 -1,-2 6)')));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(
+--echo # Invalid geometry in input.
+DO ST_ASTEXT(ST_INTERSECTION(
     ST_GEOMFROMWKB(
         ST_ASWKB(
             ST_GEOMFROMTEXT('MULTILINESTRING((1 5, -4.3 -.1),'
@@ -1845,8 +1851,9 @@
                         'MULTILINESTRING((5 10.0002,2 7,-0.7654 0,5 3),'
                                         '(0 -0.7654,4 10.0002,4 +.1,-.8 3,-.1 8,10.0002 2,+.9 -1032.34324)))')));
 
---error ER_BOOST_GEOMETRY_INCONSISTENT_TURNS_EXCEPTION
-SELECT ST_ASTEXT(ST_INTERSECTION(
+#--error ER_BOOST_GEOMETRY_INCONSISTENT_TURNS_EXCEPTION
+--echo # Invalid geometry in input.
+DO ST_ASTEXT(ST_INTERSECTION(
     ST_GEOMFROMWKB(
         ST_ASWKB(
             ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
@@ -1873,7 +1880,8 @@
                         'POLYGON((7 2, 6.9 +.6, -0.7654 -.5, 2.4 7, 7 3, 7 2)))'),
     ST_GEOMFROMWKB(ST_ASWKB(POLYGON(LINESTRING(POINT(7,9), POINT(7,3), POINT(7,6), POINT(0,6), POINT(7,9)))))));
 
-SELECT
+--echo # Invalid geometry in input
+DO
 ST_ASTEXT(ST_INTERSECTION(
     ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
                         'MULTIPOINT(4 2, 2 4, 4 1, 5 -3.9, 10.0002 3, 2.232432 2, 189.7654 -.9, 7 7),'
@@ -1900,7 +1908,7 @@
                        LINESTRING(POINT(6,7), POINT(+.1,7), POINT(0,-.5)))))));
 
 --echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(
+DO ST_ASTEXT(ST_INTERSECTION(
     ST_GEOMFROMWKB(
         ST_ASWKB(
             ST_GEOMFROMTEXT(
@@ -1975,7 +1983,8 @@
     ST_GEOMFROMTEXT('MULTILINESTRING((-3 9,3 -4,7 9,4 5,2 -6,-2 -1,-6 2))'),
     ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((-3 -8,0 -8,4 -8,0 -3,3 6,6 9,2 1,9 6,1 6,-8 -2,2 5,-1 5,-6 9,-3 -8)))')));
 
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(
+--echo # Invalid geometry in input.
+DO ST_ASTEXT(ST_SYMDIFFERENCE(
     ST_SYMDIFFERENCE(
         ST_GEOMFROMTEXT('MULTIPOINT(10 -8,-2 6,-6 3,-3 7,7 -3,-8 -9,-3 9,-1 -7)'),
         ST_GEOMFROMTEXT('LINESTRING(-10 0,-4 4,9 5,-7 -8,3 -5,-9 5,0 -6,-9 -4,9 -1,0 -2,-9 4,-7 -8,4 0)')),
@@ -2009,7 +2018,8 @@
                         'POLYGON((8 -7,1 -7,-9 0,9 8,-9 7,-10 -2,5 3,8 -8,-10 0,-3 -8,2 9,-7 4,-2 -8,8 -7)))'),
     ST_GEOMFROMTEXT('LINESTRING(-7 4,-7 4,9 3,1 -2,-10 2)')));
 
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(
+--echo #invalid geometry as input
+DO ST_ASTEXT(ST_SYMDIFFERENCE(
     ST_GEOMFROMTEXT('POLYGON((-10 -4,7 -3,7 4,-5 8,1 -7,-10 -4))'),
     ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
                         'MULTIPOINT(6 6,3 -7,6 -10,2 8),'
@@ -6486,3 +6496,40 @@
 SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10
 10,10 0,0 0 ),(0 8,4 4,4 6,0 8))'), ST_GEOMFROMTEXT('POLYGON((0 8,-8 8,-2 2,0
 8))')));
+
+--echo #
+--echo # Bug #33290245 Item_func_st_distance_sphere::val_real():
+--echo #               Assertion `is_nullable()' failed.
+
+--error ER_CANNOT_CONVERT_STRING
+do st_astext( ( _utf32', ,*') regexp 13946);
+--error ER_CANNOT_CONVERT_STRING
+do st_aswkb( ( _utf32', ,*') regexp 13946);
+--error ER_CANNOT_CONVERT_STRING
+do st_centroid( ( _utf32', ,*') regexp 13946);
+--error ER_CANNOT_CONVERT_STRING
+do st_contains( ( _utf32', ,*') regexp 13946, ( _utf32', ,*') regexp 13946);
+--error ER_CANNOT_CONVERT_STRING
+do st_convexhull( ( _utf32', ,*') regexp 13946);
+--error ER_CANNOT_CONVERT_STRING
+do st_distance_sphere( ( ( _utf32', ,*') regexp 13946), 1, 42);
+--error ER_CANNOT_CONVERT_STRING
+do st_envelope( ( _utf32', ,*') regexp 13946);
+--error ER_CANNOT_CONVERT_STRING
+do st_geometrytype( ( _utf32', ,*') regexp 13946);
+--error ER_CANNOT_CONVERT_STRING
+do st_geomfromtext( ( _utf32', ,*') regexp 13946);
+--error ER_CANNOT_CONVERT_STRING
+do st_issimple( ( _utf32', ,*') regexp 13946);
+--error ER_CANNOT_CONVERT_STRING
+do st_isvalid( ( _utf32', ,*') regexp 13946);
+--error ER_CANNOT_CONVERT_STRING
+do st_latitude( ( _utf32', ,*') regexp 13946);
+--error ER_CANNOT_CONVERT_STRING
+do st_makeenvelope( ( _utf32', ,*') regexp 13946, 'POINT(0 0)');
+--error ER_CANNOT_CONVERT_STRING
+do st_simplify( ( _utf32', ,*') regexp 13946, 'POINT(0 0)');
+--error ER_CANNOT_CONVERT_STRING
+do st_srid( st_pointfromtext(( _utf32', ,*') regexp 13946));
+--error ER_CANNOT_CONVERT_STRING
+do st_validate( ( _utf32', ,*') regexp 13946);
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/gis/t/gis_ubsan.test mysql-8.0-8.0.27/mysql-test/suite/gis/t/gis_ubsan.test
--- mysql-8.0-8.0.26/mysql-test/suite/gis/t/gis_ubsan.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/gis/t/gis_ubsan.test	2021-09-28 11:46:34.000000000 +0000
@@ -66,7 +66,7 @@
 --echo # BUG#30358736 UBSAN: SIGNED INTEGER OVERFLOW IN BOOST'S PARTITION.HPP
 --echo #
 
---error ER_SRS_NOT_FOUND
+--error ER_GIS_INVALID_DATA
 do mbrwithin(
  st_symdifference(
   polygon(
@@ -127,6 +127,7 @@
 ,'3536-12-23 04:13:33.501612'
 );
 
+--error ER_GIS_INVALID_DATA
 do st_symdifference(
   polygon(
    linestring(
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/gis/t/spatial_operators_intersection.test mysql-8.0-8.0.27/mysql-test/suite/gis/t/spatial_operators_intersection.test
--- mysql-8.0-8.0.26/mysql-test/suite/gis/t/spatial_operators_intersection.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/gis/t/spatial_operators_intersection.test	2021-09-28 11:46:34.000000000 +0000
@@ -207,562 +207,456 @@
 --echo #####################################################################################
 --echo # ST_INTERSECTION(g1,g2)
 --echo #####################################################################################
-
 --echo #====================================================================================
 --echo # point,point
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_center),ST_GEOMFROMTEXT(@star_center)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_center),ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('POINT(15 10)'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_center)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_center))) FROM gis_geometrycollection WHERE fid=105;
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('POINT(15 10)')) FROM gis_geometrycollection WHERE fid=105;
 
 --echo #====================================================================================
 --echo # point,multipoint
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_bottom_left),ST_GEOMFROMTEXT(@star_bottom_points)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_bottom_left),ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('POINT(5 0)'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_center),ST_GEOMFROMTEXT(@star_bottom_points)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_center),ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_bottom_points))) FROM gis_geometrycollection WHERE fid=106;
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('POINT(5 0)')) FROM gis_geometrycollection WHERE fid=106;
 
 --echo #====================================================================================
 --echo # point,linestring
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_top_to_center)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('POINT(15 25)'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_bottom_left),ST_GEOMFROMTEXT(@star_top_to_center)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_bottom_left),ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top_to_center))) FROM gis_geometrycollection WHERE fid=104;
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('POINT(15 25)')) FROM gis_geometrycollection WHERE fid=104;
 
 --echo #====================================================================================
 --echo # point,multilinestring
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_lines_near_vertical)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('POINT(15 25)'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_center),ST_GEOMFROMTEXT(@star_lines_near_vertical)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_center),ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_lines_near_vertical))) FROM gis_geometrycollection WHERE fid=104;
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('POINT(15 25)')) FROM gis_geometrycollection WHERE fid=104;
 
 --echo #====================================================================================
 --echo # point,polygon
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star)),ST_GEOMFROMTEXT('POINT(15 25)'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_3),ST_GEOMFROMTEXT(@star)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_3),ST_GEOMFROMTEXT(@star)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star))) FROM gis_geometrycollection WHERE fid=104;
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star)),ST_GEOMFROMTEXT('POINT(15 25)')) FROM gis_geometrycollection WHERE fid=104;
 
 --echo #====================================================================================
 --echo # point,multipolygon
 --echo #====================================================================================
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_of_elems)));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_3),ST_GEOMFROMTEXT(@star_of_elems)));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_of_elems))) FROM gis_geometrycollection WHERE fid=104;
-
 --echo #====================================================================================
 --echo # point,geometrycollection
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_collection_elems)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POINT(15 25)'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_3),ST_GEOMFROMTEXT(@star_collection_elems)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_3),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_collection_elems))) FROM gis_geometrycollection WHERE fid=104;
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POINT(15 25)')) FROM gis_geometrycollection WHERE fid=104;
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_collection_multilinestr)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_collection_multilinestr)),ST_GEOMFROMTEXT('POINT(15 25)'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('POINT(0 0)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('POINT(0 0)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('POINT(0 0)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(0 0)),GEOMETRYCOLLECTION())')));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('POINT(0 0)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(0 0)),GEOMETRYCOLLECTION())')),ST_GEOMFROMTEXT('POINT(0 0)'));
 
 --echo #====================================================================================
 --echo # multipoint,point
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_top)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_top)),ST_GEOMFROMTEXT('POINT(15 25)'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_bottom_points),ST_GEOMFROMTEXT(@star_center)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_bottom_points),ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_bottom_left))) FROM gis_geometrycollection WHERE fid=108;
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_bottom_left)),ST_GEOMFROMTEXT('POINT(5 0)')) FROM gis_geometrycollection WHERE fid=108;
 
 --echo #====================================================================================
 --echo # multipoint,multipoint
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_bottom_points)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(25 0))'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_bottom_points),ST_GEOMFROMTEXT(@star_all_points)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_bottom_points),ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(25 0))'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_all_points_1)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_all_points_1)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(15 10),(15 25),(25 0))'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_all_points))) FROM gis_geometrycollection WHERE fid=108;
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(25 0))')) FROM gis_geometrycollection WHERE fid=108;
 
 --echo #====================================================================================
 --echo # multipoint,linestring
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_top_to_center)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('MULTIPOINT((15 10),(15 25))'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_top_to_center)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('MULTIPOINT((15 10),(15 25))'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top_to_center))) FROM gis_geometrycollection WHERE fid=109;
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('MULTIPOINT((15 10),(15 25))')) FROM gis_geometrycollection WHERE fid=109;
 
 --echo #====================================================================================
 --echo # multipoint,multilinestring
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_lines_near_vertical)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('POINT(15 25)'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_lines_near_horizontal)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_lines_near_horizontal)),ST_GEOMFROMTEXT('POINT(25 0)'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_lines_near_horizontal))) FROM gis_geometrycollection WHERE fid=109;
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_lines_near_horizontal)),ST_GEOMFROMTEXT('POINT(25 0)')) FROM gis_geometrycollection WHERE fid=109;
 
 --echo #====================================================================================
 --echo # multipoint,polygon
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_elem_vertical)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(15 10),(15 25),(25 0))'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_elem_horizontal)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_elem_horizontal)),ST_GEOMFROMTEXT('MULTIPOINT((15 10),(25 0))'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_elem_horizontal))) FROM gis_geometrycollection WHERE fid=109;
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_elem_horizontal)),ST_GEOMFROMTEXT('MULTIPOINT((15 10),(25 0))')) FROM gis_geometrycollection WHERE fid=109;
 
 --echo #====================================================================================
 --echo # multipoint,multipolygon
 --echo #====================================================================================
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOINT(0 0,0 30,30 25)'),ST_GEOMFROMTEXT(@star_of_elems)));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_of_elems)));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_of_elems))) FROM gis_geometrycollection WHERE fid=109;
-
 --echo #====================================================================================
 --echo # multipoint,geometrycollection
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOINT(0 0,0 30,30 25)'),ST_GEOMFROMTEXT(@star_collection_elems)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOINT(0 0,0 30,30 25)'),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_collection_elems)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(15 10),(15 25),(25 0))'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_collection_elems))) FROM gis_geometrycollection WHERE fid=109;
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(15 10),(15 25),(25 0))')) FROM gis_geometrycollection WHERE fid=109;
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_collection_multilinestr)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_collection_multilinestr)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(15 10),(15 25),(25 0))'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOINT(0 0,10 10)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOINT(0 0,10 10)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOINT(0 0,10 10)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(0 0)),'
-                                                                                              'GEOMETRYCOLLECTION())')));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOINT(0 0,10 10)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(0 0)),'
+                                                                                              'GEOMETRYCOLLECTION())')),ST_GEOMFROMTEXT('POINT(0 0)'));
 
 --echo #====================================================================================
 --echo # linestring,point
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_center)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('POINT(15 10)'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('LINESTRING(15 25,15 10)'),ST_GEOMFROMTEXT('POINT(15 10)')));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('LINESTRING(15 25,15 10)'),ST_GEOMFROMTEXT('POINT(15 10)')),ST_GEOMFROMTEXT('POINT(15 10)'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_bottom_left)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_bottom_left)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(g,g2)) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=110 and fid2=105;
+SELECT ST_EQUALS(ST_INTERSECTION(g,g2),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=110 and fid2=105;
 
 --echo #====================================================================================
 --echo # linestring,multipoint
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_vertical),ST_GEOMFROMTEXT('MULTIPOINT(15 10,15 25)')));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_vertical),ST_GEOMFROMTEXT('MULTIPOINT(15 10,15 25)')),ST_GEOMFROMTEXT('MULTIPOINT((15 10),(15 25))'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_vertical),ST_GEOMFROMTEXT(@star_all_points)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_vertical),ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('MULTIPOINT((15 10),(15 25))'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT('MULTIPOINT(15 10,15 25)'))) FROM gis_geometrycollection WHERE fid=111;
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT('MULTIPOINT(15 10,15 25)')),ST_GEOMFROMTEXT('MULTIPOINT((15 10),(15 25))')) FROM gis_geometrycollection WHERE fid=111;
 
 --echo #====================================================================================
 --echo # linestring,linestring
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_vertical),ST_GEOMFROMTEXT(@star_top_to_center)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_vertical),ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('LINESTRING(15 10,15 25)'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_line_vertical)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_line_vertical)),ST_GEOMFROMTEXT('LINESTRING(15 25,15 10)'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_top_to_center_1)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_top_to_center_1)),ST_GEOMFROMTEXT('LINESTRING(15 25,15 10)'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top_to_center))) FROM gis_geometrycollection WHERE fid=111;
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('LINESTRING(15 10,15 25)')) FROM gis_geometrycollection WHERE fid=111;
 
 --echo #====================================================================================
 --echo # linestring,multilinestring
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_lines_near_horizontal)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_lines_near_horizontal)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_lines_near_vertical)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_lines_near_horizontal))) FROM gis_geometrycollection WHERE fid=110;
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_lines_near_horizontal)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')) FROM gis_geometrycollection WHERE fid=110;
 
 --echo #====================================================================================
 --echo # linestring,polygon
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT('POLYGON((11 15,19 15,19 10,11 15))')));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT('POLYGON((11 15,19 15,19 10,11 15))')),ST_GEOMFROMTEXT('LINESTRING(11 15,19 15)'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_elem_horizontal)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_elem_horizontal)),ST_GEOMFROMTEXT('LINESTRING(10 15,20 15)'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT('POLYGON((11 15,19 15,19 10,11 15))'))) FROM gis_geometrycollection WHERE fid=110;
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT('POLYGON((11 15,19 15,19 10,11 15))')),ST_GEOMFROMTEXT('LINESTRING(11 15,19 15)')) FROM gis_geometrycollection WHERE fid=110;
 
 --echo #====================================================================================
 --echo # linestring,multipolygon
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT('MULTIPOLYGON(((11 15,19 15,19 25,11 15)))')));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT('MULTIPOLYGON(((11 15,19 15,19 25,11 15)))')),ST_GEOMFROMTEXT('LINESTRING(11 15,19 15)'));
 
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_of_elems)));
-
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT('MULTIPOLYGON(((11 15,19 15,19 25,11 15)),((25 0,0 15,25 10,25 0)))'))) FROM gis_geometrycollection WHERE fid=110;
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT('MULTIPOLYGON(((11 15,19 15,19 25,11 15)),((25 0,0 15,25 10,25 0)))')),ST_GEOMFROMTEXT('LINESTRING(11 15,19 15)')) FROM gis_geometrycollection WHERE fid=110;
 
 --echo #====================================================================================
 --echo # linestring,geometrycollectionn
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_collection_elems_3)));
-
---echo # Invalid geometry in input.
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_collection_elems)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_collection_elems_3)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
 
---echo # Invalid geometry in input.
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_collection_elems))) FROM gis_geometrycollection WHERE fid=110;
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('LINESTRING(0 0,10 10)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
 
---echo # Invalid geometry in input.
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_collection_multilinestr)));
-
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('LINESTRING(0 0,10 10)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')));
-
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('LINESTRING(0 0,10 10)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
-                                                                                              'GEOMETRYCOLLECTION(POLYGON((5 5,15 5,15 15,5 5))))')));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('LINESTRING(0 0,10 10)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
+                                                                                              'GEOMETRYCOLLECTION(POLYGON((5 5,15 5,15 15,5 5))))')),ST_GEOMFROMTEXT('LINESTRING(5 5,10 10)'));
 
 --echo #====================================================================================
 --echo # multilinestring,point
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_top)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_top)),ST_GEOMFROMTEXT('POINT(15 25)'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_center)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top))) FROM gis_geometrycollection WHERE fid=114;
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top)),ST_GEOMFROMTEXT('POINT(15 25)')) FROM gis_geometrycollection WHERE fid=114;
 
 --echo #====================================================================================
 --echo # multilinestring,multipoint
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_bottom_points)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_all_points)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('POINT(15 25)'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_bottom_points))) FROM gis_geometrycollection WHERE fid=114;
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')) FROM gis_geometrycollection WHERE fid=114;
 
-SELECT ST_ASTEXT(ST_INTERSECTION(g,g2)) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=114 and fid2=108;
+SELECT ST_EQUALS(ST_INTERSECTION(g,g2),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=114 and fid2=108;
 
 --echo #====================================================================================
 --echo # multilinestring,linestring
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_line_vertical)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_line_vertical)),ST_GEOMFROMTEXT('POINT(15 25)'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_line_horizontal)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_line_horizontal)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_line_vertical))) FROM gis_geometrycollection WHERE fid=114;
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_line_vertical)),ST_GEOMFROMTEXT('POINT(15 25)')) FROM gis_geometrycollection WHERE fid=114;
 
 --echo #====================================================================================
 --echo # multilinestring,multilinestring
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT('MULTILINESTRING((0 5,15 25,0 15))')));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT('MULTILINESTRING((0 5,15 25,0 15))')),ST_GEOMFROMTEXT('LINESTRING(0 5,15 25)'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_lines_near_horizontal)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_lines_near_horizontal)),ST_GEOMFROMTEXT('MULTIPOINT((0 5),(5.172413793103448 11.89655172413793),(10 25),(12 25))'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT('MULTILINESTRING((0 5,15 25,0 15))'))) FROM gis_geometrycollection WHERE fid=114;
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT('MULTILINESTRING((0 5,15 25,0 15))')),ST_GEOMFROMTEXT('LINESTRING(0 5,15 25)')) FROM gis_geometrycollection WHERE fid=114;
 
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_line_vertical))) FROM gis_geometrycollection WHERE fid=114;
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_line_vertical)),ST_GEOMFROMTEXT('POINT(15 25)')) FROM gis_geometrycollection WHERE fid=114;
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((0 0, 1 1), (10 10, 11 11), (20 20, 21 21))'),
-                                 ST_GEOMFROMTEXT('MULTILINESTRING((0 0, 1 1), (10 10, 11 11), (20 20, 19 19))')));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((0 0, 1 1), (10 10, 11 11), (20 20, 21 21))'),
+ST_GEOMFROMTEXT('MULTILINESTRING((0 0, 1 1), (10 10, 11 11), (20 20, 19 19))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(20 20),MULTILINESTRING((0 0,1 1),(10 10,11 11)))'));
 
 --echo #====================================================================================
 --echo # multilinestring,polygon
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_elem_vertical)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('POINT(15 25)'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_elem_horizontal)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_elem_horizontal)),ST_GEOMFROMTEXT('LINESTRING(5.172413793103448 11.89655172413793,7.5 15)'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_elem_vertical))) FROM gis_geometrycollection WHERE fid=114;
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('POINT(15 25)')) FROM gis_geometrycollection WHERE fid=114;
 
 --echo #====================================================================================
 --echo # multilinestring,multipolygon
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((0 25,25 0,25 30))'),ST_GEOMFROMTEXT(@star_elem_vertical)));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_of_elems)));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_of_elems))) FROM gis_geometrycollection WHERE fid=114;
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((0 25,25 0,25 30))'),ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('LINESTRING(10.714285714285715 14.285714285714286,25 0)'));
 
 --echo #====================================================================================
 --echo # multilinestring,geometrycollection
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((0 25,25 0,25 30))'),ST_GEOMFROMTEXT(@star_collection_elems)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((0 25,25 0,25 30))'),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('MULTILINESTRING((10 15,25 0),(25 11.875,25 15))'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_collection_elems)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((4.883720930232558 11.511627906976745,7.5 15)),POINT(15 25))'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_collection_elems))) FROM gis_geometrycollection WHERE fid=114;
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((4.883720930232558 11.511627906976745,7.5 15)),POINT(15 25))')) FROM gis_geometrycollection WHERE fid=114;
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_horizontal),ST_GEOMFROMTEXT(@star_collection_multilinestr)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_lines_near_horizontal),ST_GEOMFROMTEXT(@star_collection_multilinestr)),ST_GEOMFROMTEXT('MULTILINESTRING((25 0,0 15),(6 15,4.2 12),(0 15,15 30,6 15),(4.2 12,0 5))'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((0 0,10 10),(5 5,15 15))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((0 0,10 10),(5 5,15 15))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((0 0,10 10))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
-                                                                                                     'GEOMETRYCOLLECTION(POLYGON((5 5,15 5,15 15,5 5))))')));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((0 0,10 10))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
+                                                                                                     'GEOMETRYCOLLECTION(POLYGON((5 5,15 5,15 15,5 5))))')),ST_GEOMFROMTEXT('LINESTRING(5 5,10 10)'));
 
 --echo #====================================================================================
 --echo # polygon,point
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_center)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('POINT(15 10)'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT('POINT(0 0)')));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT('POINT(0 0)')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_center))) FROM gis_geometrycollection WHERE fid=100;
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('POINT(15 10)')) FROM gis_geometrycollection WHERE fid=100;
 
 --echo #====================================================================================
 --echo # polygon,multipoint
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_all_points)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(15 10),(15 25),(25 0))'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT('MULTIPOINT(0 0,30 25)')));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT('MULTIPOINT(0 0,30 25)')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_all_points))) FROM gis_geometrycollection WHERE fid=100;
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(15 10),(15 25),(25 0))')) FROM gis_geometrycollection WHERE fid=100;
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_all_points)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(15 10),(15 25),(25 0))'));
 
 --echo #====================================================================================
 --echo # polygon,linestring
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_line_vertical)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_line_vertical)),ST_GEOMFROMTEXT('LINESTRING(15 5,15 25)'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star_line_horizontal)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star_line_horizontal)),ST_GEOMFROMTEXT('LINESTRING(11 15,19 15)'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_line_vertical))) FROM gis_geometrycollection WHERE fid=100;
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_line_vertical)),ST_GEOMFROMTEXT('LINESTRING(15 5,15 25)')) FROM gis_geometrycollection WHERE fid=100;
 
-SELECT ST_ASTEXT(ST_INTERSECTION(g,g2)) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=100 and fid2=111;
+SELECT ST_EQUALS(ST_INTERSECTION(g,g2),ST_GEOMFROMTEXT('LINESTRING(15 5,15 25)')) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=100 and fid2=111;
 
 --echo #====================================================================================
 --echo # polygon,multilinestring
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_lines_near_vertical)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((4.883720930232558 11.511627906976745,7.5 15)),POINT(15 25))'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star_lines_near_horizontal)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star_lines_near_horizontal)),ST_GEOMFROMTEXT('LINESTRING(25 0,8.870967741935484 9.67741935483871)'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_lines_near_vertical))) FROM gis_geometrycollection WHERE fid=100;
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((4.883720930232558 11.511627906976745,7.5 15)),POINT(15 25))')) FROM gis_geometrycollection WHERE fid=100;
 
 --echo #====================================================================================
 --echo # polygon,polygon
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_elem_vertical)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('POLYGON((15 25,5 0,15 5,25 0,15 25))'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star)),ST_GEOMFROMTEXT('POLYGON((15 25,5 0,15 5,25 0,15 25))'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_elem_vertical))) FROM gis_geometrycollection WHERE fid=100;
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('POLYGON((15 25,5 0,15 5,25 0,15 25))')) FROM gis_geometrycollection WHERE fid=100;
 
 --echo #====================================================================================
 --echo # polygon,multipolygon
 --echo #====================================================================================
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_of_elems)));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_of_elems_3)));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_of_elems))) FROM gis_geometrycollection WHERE fid=100;
-
 --echo #====================================================================================
 --echo # polygon,geomertycollection
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_collection_elems)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POLYGON((7 10,5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10))'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_collection_elems_3)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_collection_elems_3)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_collection_elems))) FROM gis_geometrycollection WHERE fid=100;
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POLYGON((7 10,5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10))')) FROM gis_geometrycollection WHERE fid=100;
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_collection_multilinestr)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_collection_multilinestr)),ST_GEOMFROMTEXT('POLYGON((7 10,5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10))'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('POLYGON((0 0,10 10,10 0,0 0))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())')));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('POLYGON((0 0,10 10,10 0,0 0))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 5,15 5,15 15,5 5)))')));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 5,15 5,15 15,5 5)))')),ST_GEOMFROMTEXT('POLYGON((10 10,5 5,10 5,10 10))'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0),(4 4,4 6,6 6,6 4,4 4))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
-                                                                                                                         'POLYGON((4 4,4 6,6 6,6 4,4 4)))')));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0),(4 4,4 6,6 6,6 4,4 4))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
+                                                                                                                         'POLYGON((4 4,4 6,6 6,6 4,4 4)))')),ST_GEOMFROMTEXT('LINESTRING(4 4,4 6,6 6,6 4,4 4)'));
 
 --echo #====================================================================================
 --echo # multipolygon,point
 --echo #====================================================================================
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_top)));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('POINT(30 30)')));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top))) FROM gis_geometrycollection WHERE fid=103;
-
 --echo #====================================================================================
 --echo # multipolygon,multipoint
 --echo #====================================================================================
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_bottom_points)));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('MULTIPOINT(30 30,0 35)')));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_bottom_points))) FROM gis_geometrycollection WHERE fid=103;
-
 --echo #====================================================================================
 --echo # multipolygon,linestring
 --echo #====================================================================================
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_top_to_center)));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('LINESTRING(30 30,0 35)')));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top_to_center))) FROM gis_geometrycollection WHERE fid=103;
-
 --echo #====================================================================================
 --echo # multipolygon,multilinestring
 --echo #====================================================================================
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_lines_near_vertical)));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('MULTILINESTRING((0 30,30 30,0 35))')));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_lines_near_vertical))) FROM gis_geometrycollection WHERE fid=103;
-
 --echo #====================================================================================
 --echo # multipolygon,polygon
 --echo #====================================================================================
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star)));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('POLYGON((0 0,15 25,35 0,0 0))')));
-
 --echo #====================================================================================
 --echo # multipolygon,multipolygon
 --echo #====================================================================================
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,5 0,5 5,0 0)),((5 5,10 0,5 0,5 5)))')));
-
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((5 5,5 10,10 10,10 5,5 5)))'),
-                                 ST_GEOMFROMTEXT('MULTIPOLYGON(((3 3,3 7,7 7,7 3,3 3)),((9 9,9 15,15 15,15 9,9 9)))')));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((5 5,5 10,10 10,10 5,5 5)))'),
+ST_GEOMFROMTEXT('MULTIPOLYGON(((3 3,3 7,7 7,7 3,3 3)),((9 9,9 15,15 15,15 9,9 9)))')),ST_GEOMFROMTEXT('MULTIPOLYGON(((3 5,3 3,5 3,5 5,3 5)),((5 7,5 5,7 5,7 7,5 7)),((9 10,9 9,10 9,10 10,9 10)))'));
 
 --echo #====================================================================================
 --echo # multipolygon,geometrycollectionn
 --echo #====================================================================================
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_collection_elems_3)));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_collection_elems)));
+SELECT ST_EQUALS(ST_INTERSECTION(g,g2),ST_GEOMFROMTEXT('POLYGON((7 10,5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10))')) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=115 and fid2=115;
 
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_collection_elems))) FROM gis_geometrycollection WHERE fid=103;
-
-SELECT ST_ASTEXT(ST_INTERSECTION(g,g2)) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=115 and fid2=115;
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_collection_multilinestr)));
-
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,10 10,10 0,0 0)))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())')));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,10 10,10 0,0 0)))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 5,15 5,15 15,5 5)))')));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 5,15 5,15 15,5 5)))')),ST_GEOMFROMTEXT('POLYGON((10 10,5 5,10 5,10 10))'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)),((4 4,4 6,6 6,6 4,4 4)))'),
-                                 ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((4 4,4 6,6 6,6 4,4 4)))')));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)),((4 4,4 6,6 6,6 4,4 4)))'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((4 4,4 6,6 6,6 4,4 4)))')),ST_GEOMFROMTEXT('POLYGON((4 6,4 4,6 4,6 6,4 6))'));
 
 --echo #====================================================================================
 --echo # geometrycollection,point
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_top)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_top)),ST_GEOMFROMTEXT('POINT(15 25)'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('POINT(30 30)')));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('POINT(30 30)')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top))) FROM gis_geometrycollection WHERE fid=115;
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top)),ST_GEOMFROMTEXT('POINT(15 25)')) FROM gis_geometrycollection WHERE fid=115;
 
 --echo #====================================================================================
 --echo # geometrycollection,multipoint
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_bottom_points)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(25 0))'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('MULTIPOINT(30 30,0 35)')));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('MULTIPOINT(30 30,0 35)')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_bottom_points))) FROM gis_geometrycollection WHERE fid=115;
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(25 0))')) FROM gis_geometrycollection WHERE fid=115;
 
 --echo #====================================================================================
 --echo # geometrycollection,linestring
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_top_to_center)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('LINESTRING(15 25,15 10)'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('LINESTRING(30 30,0 35)')));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('LINESTRING(30 30,0 35)')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top_to_center))) FROM gis_geometrycollection WHERE fid=115;
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('LINESTRING(15 25,15 10)')) FROM gis_geometrycollection WHERE fid=115;
 
 --echo #====================================================================================
 --echo # geometrycollection,multilinestring
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_lines_near_vertical)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((4.883720930232558 11.511627906976745,7.5 15)),POINT(15 25))'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('MULTILINESTRING((0 30,30 30,0 35))')));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('MULTILINESTRING((0 30,30 30,0 35))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_lines_near_vertical))) FROM gis_geometrycollection WHERE fid=115;
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((4.883720930232558 11.511627906976745,7.5 15)),POINT(15 25))')) FROM gis_geometrycollection WHERE fid=115;
 
 --echo #====================================================================================
 --echo # geometrycollection,polygon
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star)),ST_GEOMFROMTEXT('POLYGON((7 10,5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10))'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_elem_vertical))) FROM gis_geometrycollection WHERE fid=115;
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('POLYGON((15 25,5 0,15 5,25 0,15 25))')) FROM gis_geometrycollection WHERE fid=115;
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_elem_vertical)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('POLYGON((15 25,5 0,15 5,25 0,15 25))'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('POLYGON((0 0,15 25,35 0,0 0))')));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('POLYGON((0 0,15 25,35 0,0 0))')),ST_GEOMFROMTEXT('POLYGON((6.3 10.5,7 10,5 0,15 5,25 0,22 10,25.333333333333332 12.083333333333334,23 15,20 15,15 25,10 15,9 15,6.3 10.5))'));
 
 --echo #====================================================================================
 --echo # geometrycollection,multipolygon
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,0 0)))')));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,0 0)))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
 
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_of_elems)));
-
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_collection_elems))) FROM gis_geometrycollection WHERE fid=115;
+SELECT ST_EQUALS(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POLYGON((7 10,5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10))')) FROM gis_geometrycollection WHERE fid=115;
 
-SELECT ST_ASTEXT(ST_INTERSECTION(g,g2)) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=115 and fid2=215;
+SELECT ST_EQUALS(ST_INTERSECTION(g,g2),ST_GEOMFROMTEXT('POLYGON((7 10,5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10))')) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=115 and fid2=215;
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(3 3,6 6))'),
-                                 ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((5 5,5 10,10 10,10 5,5 5)))')));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(3 3,6 6))'),
+ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((5 5,5 10,10 10,10 5,5 5)))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(0 0),MULTILINESTRING((3 3,5 5),(5 5,6 6)))'));
 
 --echo #====================================================================================
 --echo # geometrycollection,geometrycollectionn
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_collection_elems_3)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_collection_elems_3)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_multilinestr),ST_GEOMFROMTEXT(@star_collection_elems)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_multilinestr),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POLYGON((7 10,5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10))'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_collection_elems)));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POLYGON((7 10,5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10))'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(1 1,2 2))'),
-                                 ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(0 0),POINT(5 5))')));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(1 1,2 2))'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(0 0),POINT(5 5))')),ST_GEOMFROMTEXT('POINT(0 0)'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(2 2),POLYGON((0 0,0 5,5 5,5 0,0 0)))'),
-                                 ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOINT(0 0,5 5))')));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(2 2),POLYGON((0 0,0 5,5 5,5 0,0 0)))'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOINT(0 0,5 5))')),ST_GEOMFROMTEXT('MULTIPOINT((0 0),(5 5))'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())'),
-                                 ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())))')));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())'),
-                                 ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(1 1), GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())))')));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(1 1), GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
 
 --echo #####################################################################################
 --echo # Testing ST_INTERSECTION() with 2 geometries of same SRID
@@ -876,25 +770,8 @@
 --error ER_PARSE_ERROR
 SELECT ST_ASTEXT(ST_INTERSECTION(,ST_GEOMFROMTEXT(@star_top)));
 
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star_of_elems)));
-
 SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star_collection_elems)));
 
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_elem_vertical))) FROM gis_geometrycollection WHERE fid=103;
-
---echo # Invalig geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_elem_vertical)));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),
-                                 ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,15 25,35 0,0 0)),((5 0,15 25,25 0,15 5,5 0)))')));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_collection_elems),
-                                 ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,15 25,35 0,0 0)),((5 0,15 25,25 0,15 5,5 0)))')));
-
 # Test with all combinations of geometry types, including types inside
 # geometry collections. These queries are for coverage of code
 # paths. The results have not been verified.
@@ -983,12 +860,464 @@
   POINT(1,10), POINT(1,1)), LINESTRING(POINT(4,4),POINT(4,6),POINT(6,6),
   POINT(6,4),POINT(4,4))))));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(a.g, b.g)) FROM t1 AS a JOIN t1 AS b ORDER BY a.pk, b.pk;
+CREATE TABLE intersection_results (pk INT PRIMARY KEY AUTO_INCREMENT, g GEOMETRY NOT NULL);
+
+INSERT INTO intersection_results(g)
+VALUES
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 10,0 10),(6 4,4 4,4 6,6 6,6 4))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4)))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 10,0 10),(6 4,4 4,4 6,6 6,6 4))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 10,0 10),(6 4,4 4,4 6,6 6,6 5,6 4))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 10,0 10),(4 6,6 6,6 4,4 4,4 6))')),
+(ST_GEOMFROMTEXT('POLYGON((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((5 10,5 6,6 6,6 5,10 5,10 10,5 10))),POINT(1 1))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(7 6,6 6,6 7,7 7,7 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(7 6,6 6,6 7,7 7,7 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6))),POINT(1 1))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4)))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 5,6 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(4 6,6 6,6 4,4 4,4 6)))')),
+(ST_GEOMFROMTEXT('POLYGON((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 10,0 10),(6 4,4 4,4 6,6 6,6 4))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4)))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 10,0 10),(6 4,4 4,4 6,6 6,6 4))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 10,0 10),(6 4,4 4,4 6,6 6,6 5,6 4))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 10,0 10),(4 6,6 6,6 4,4 4,4 6))')),
+(ST_GEOMFROMTEXT('POLYGON((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((5 10,5 6,6 6,6 5,10 5,10 10,5 10))),POINT(1 1))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(7 6,6 6,6 7,7 7,7 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(7 6,6 6,6 7,7 7,7 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6))),POINT(1 1))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4)))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 5,6 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,0 0,1 0,1 1,0 1)),((1 10,1 1,10 1,10 10,1 10),(4 6,6 6,6 4,4 4,4 6)))')),
+(ST_GEOMFROMTEXT('POLYGON((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 10,0 10),(6 4,4 4,4 6,6 6,6 5,6 4))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 10,5 5,10 5,10 10,5 10)),((1 0,1 1,0 1,0 0,1 0)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)),((1 0,1 1,0 1,0 0,1 0)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 10,1 1,10 1,10 10,1 10),(4 6,6 6,6 5,6 4,4 4,4 6)),((1 0,1 1,0 1,0 0,1 0)))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 10,0 10),(6 4,4 4,4 6,6 6,6 5,6 4))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 10,5 5,10 5,10 10,5 10)),((1 0,1 1,0 1,0 0,1 0)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)),((1 0,1 1,0 1,0 0,1 0)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 10,1 1,10 1,10 10,1 10),(4 6,6 6,6 5,6 4,4 4,4 6)),((1 0,1 1,0 1,0 0,1 0)))')),
+(ST_GEOMFROMTEXT('POLYGON((10 10,0 10,0 0,10 0,10 10),(5 5,6 5,6 4,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((10 10,0 10,0 0,10 0,10 10),(5 5,6 5,6 4,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 5,6 4))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 10,0 10),(4 6,6 6,6 4,4 4,4 6))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 10,5 5,10 5,10 10,5 10)),((1 0,1 1,0 1,0 0,1 0)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)),((1 0,1 1,0 1,0 0,1 0)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 10,1 1,10 1,10 10,1 10),(4 6,6 6,6 4,4 4,4 6)),((1 0,1 1,0 1,0 0,1 0)))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,0 0,1 0,1 1,0 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 10,0 10),(4 6,6 6,6 4,4 4,4 6))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 10,5 5,10 5,10 10,5 10)),((1 0,1 1,0 1,0 0,1 0)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 10,5 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6)),((1 0,1 1,0 1,0 0,1 0)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 10,1 1,10 1,10 10,1 10),(4 6,6 6,6 4,4 4,4 6)),((1 0,1 1,0 1,0 0,1 0)))')),
+(ST_GEOMFROMTEXT('POLYGON((10 10,0 10,0 0,10 0,10 10),(5 6,5 5,6 5,6 4,4 4,4 6,5 6))')),
+(ST_GEOMFROMTEXT('POLYGON((10 10,0 10,0 0,10 0,10 10),(5 6,5 5,4 4,4 6,5 6))')),
+(ST_GEOMFROMTEXT('POLYGON((1 10,1 1,10 1,10 10,1 10),(4 6,6 6,6 4,4 4,4 6))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POLYGON((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((5 10,5 6,6 6,6 5,10 5,10 10,5 10))),POINT(1 1))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6))),POINT(1 1))')),
+(ST_GEOMFROMTEXT('POLYGON((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4))')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POINT(1 1)')),
+(ST_GEOMFROMTEXT('POLYGON((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4))')),
+(ST_GEOMFROMTEXT('MULTIPOINT((1 1),(2 2))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((5 10,5 6,6 6,6 5,10 5,10 10,5 10))),POINT(1 1))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((5 10,5 6,6 6,6 5,10 5,10 10,5 10),(6 6,6 7,7 7,7 6,6 6))),POINT(1 1))')),
+(ST_GEOMFROMTEXT('POLYGON((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4))')),
+(ST_GEOMFROMTEXT('POLYGON((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 5,6 4))')),
+(ST_GEOMFROMTEXT('POLYGON((1 10,1 1,10 1,10 10,1 10),(4 6,6 6,6 4,4 4,4 6))')),
+(ST_GEOMFROMTEXT('POLYGON((1 10,1 1,10 1,10 10,1 10),(6 4,4 4,4 6,6 6,6 4))'));
+
+CREATE TABLE intersection (pk INT PRIMARY KEY AUTO_INCREMENT, g GEOMETRY NOT NULL);
+
+INSERT INTO intersection SELECT 0, ST_INTERSECTION(a.g, b.g) FROM t1 AS a JOIN t1 AS b ORDER BY a.pk, b.pk;
+
+SELECT SUM(ST_EQUALS(a.g, b.g)) FROM intersection AS a, intersection_results AS b WHERE a.pk = b.pk;
 
 --echo #clean up
 DROP TABLE gis_geometrycollection;
 DROP TABLE gis_geometrycollection_2;
 DROP TABLE t1;
+DROP TABLE intersection;
+DROP TABLE intersection_results;
 
 --echo #
 --echo # Bug#21927558 ST_INTERSECTION(POLYGON, POLYGON) RETURNS SELF
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/gis/t/spatial_operators_symdifference.test mysql-8.0-8.0.27/mysql-test/suite/gis/t/spatial_operators_symdifference.test
--- mysql-8.0-8.0.26/mysql-test/suite/gis/t/spatial_operators_symdifference.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/gis/t/spatial_operators_symdifference.test	2021-09-28 11:46:34.000000000 +0000
@@ -210,580 +210,322 @@
 --echo #====================================================================================
 --echo # point,point
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_center),ST_GEOMFROMTEXT(@star_center)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_center)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_center))) FROM gis_geometrycollection WHERE fid=105;
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_center),ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('MULTIPOINT((15 10),(15 25))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')) FROM gis_geometrycollection WHERE fid=105;
 --echo #====================================================================================
 --echo # point,multipoint
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_bottom_left),ST_GEOMFROMTEXT(@star_bottom_points)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_center),ST_GEOMFROMTEXT(@star_bottom_points)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_bottom_points))) FROM gis_geometrycollection WHERE fid=106;
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_bottom_left),ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('POINT(25 0)'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_center),ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(15 10),(25 0))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('POINT(25 0)')) FROM gis_geometrycollection WHERE fid=106;
 --echo #====================================================================================
 --echo # point,linestring
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_top_to_center)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_bottom_left),ST_GEOMFROMTEXT(@star_top_to_center)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top_to_center))) FROM gis_geometrycollection WHERE fid=104;
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('LINESTRING(15 25,15 10)'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_bottom_left),ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(15 25,15 10),POINT(5 0))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('LINESTRING(15 25,15 10)')) FROM gis_geometrycollection WHERE fid=104;
 --echo #====================================================================================
 --echo # point,multilinestring
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_lines_near_vertical)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_center),ST_GEOMFROMTEXT(@star_lines_near_vertical)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_lines_near_vertical))) FROM gis_geometrycollection WHERE fid=104;
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('LINESTRING(0 5,15 25,0 25)'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_center),ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((0 5,15 25,0 25)),POINT(15 10))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('LINESTRING(0 5,15 25,0 25)')) FROM gis_geometrycollection WHERE fid=104;
 --echo #====================================================================================
 --echo # point,polygon
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_3),ST_GEOMFROMTEXT(@star)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star))) FROM gis_geometrycollection WHERE fid=104;
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_3),ST_GEOMFROMTEXT(@star)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),POINT(75 25))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))')) FROM gis_geometrycollection WHERE fid=104;
 --echo #====================================================================================
 --echo # point,multipolygon
 --echo #====================================================================================
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_of_elems)));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_3),ST_GEOMFROMTEXT(@star_of_elems)));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_of_elems))) FROM gis_geometrycollection WHERE fid=104;
-
 --echo #====================================================================================
 --echo # point,geometrycollection
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_collection_elems)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_3),ST_GEOMFROMTEXT(@star_collection_elems)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_collection_elems))) FROM gis_geometrycollection WHERE fid=104;
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_collection_multilinestr)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POINT(0 0)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POINT(0 0)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(),GEOMETRYCOLLECTION())')));
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_3),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),POINT(75 25))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))')) FROM gis_geometrycollection WHERE fid=104;
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top),ST_GEOMFROMTEXT(@star_collection_multilinestr)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),MULTILINESTRING((0 15,15 30,6 15),(4.2 12,0 5)))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POINT(0 0)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')),ST_GEOMFROMTEXT('POINT(0 0)'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POINT(0 0)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(),GEOMETRYCOLLECTION())')),ST_GEOMFROMTEXT('POINT(0 0)'));
 --echo #====================================================================================
 --echo # multipoint,point
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_top)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_bottom_points),ST_GEOMFROMTEXT(@star_center)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_bottom_left))) FROM gis_geometrycollection WHERE fid=108;
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_top)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(15 10),(25 0))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_bottom_points),ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('MULTIPOINT((5 0),(15 10),(25 0))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_bottom_left)),ST_GEOMFROMTEXT('POINT(25 0)')) FROM gis_geometrycollection WHERE fid=108;
 --echo #====================================================================================
 --echo # multipoint,multipoint
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_bottom_points)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_bottom_points),ST_GEOMFROMTEXT(@star_all_points)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_all_points_1)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_all_points))) FROM gis_geometrycollection WHERE fid=108;
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('MULTIPOINT((15 10),(15 25))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_bottom_points),ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('MULTIPOINT((15 10),(15 25))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_all_points_1)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('MULTIPOINT((15 10),(15 25))')) FROM gis_geometrycollection WHERE fid=108;
 --echo #====================================================================================
 --echo # multipoint,linestring
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_top_to_center)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_top_to_center)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top_to_center))) FROM gis_geometrycollection WHERE fid=109;
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(15 25,15 10),POINT(5 0),POINT(25 0))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(15 25,15 10),POINT(5 0),POINT(25 0))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(15 25,15 10),POINT(5 0),POINT(25 0))')) FROM gis_geometrycollection WHERE fid=109;
 --echo #====================================================================================
 --echo # multipoint,multilinestring
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_lines_near_vertical)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_lines_near_horizontal)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_lines_near_horizontal))) FROM gis_geometrycollection WHERE fid=109;
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((0 5,15 25,0 25)),POINT(5 0),POINT(15 10),POINT(25 0))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_lines_near_horizontal)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((25 0,0 15,15 30,0 5)),POINT(5 0),POINT(15 10),POINT(15 25))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_lines_near_horizontal)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((25 0,0 15,15 30,0 5)),POINT(5 0),POINT(15 10),POINT(15 25))')) FROM gis_geometrycollection WHERE fid=109;
 --echo #====================================================================================
 --echo # multipoint,polygon
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_elem_vertical)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_elem_horizontal)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_elem_horizontal))) FROM gis_geometrycollection WHERE fid=109;
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,15 25,5 0))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_elem_horizontal)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((25 0,22 10,30 15,0 15,25 0)),POINT(5 0),POINT(15 25))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_elem_horizontal)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((25 0,22 10,30 15,0 15,25 0)),POINT(5 0),POINT(15 25))')) FROM gis_geometrycollection WHERE fid=109;
 --echo #====================================================================================
 --echo # multipoint,multipolygon
 --echo #====================================================================================
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOINT(0 0,0 30,30 25)'),ST_GEOMFROMTEXT(@star_of_elems)));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_of_elems)));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_of_elems))) FROM gis_geometrycollection WHERE fid=109;
-
 --echo #====================================================================================
 --echo # multipoint,geometrycollection
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOINT(0 0,0 30,30 25)'),ST_GEOMFROMTEXT(@star_collection_elems)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_collection_elems)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_collection_elems))) FROM gis_geometrycollection WHERE fid=109;
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_collection_multilinestr)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOINT(0 0)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOINT(0 0,1 1)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOINT(0 0,1 1)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(),GEOMETRYCOLLECTION())')));
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOINT(0 0,0 30,30 25)'),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),POINT(0 0),POINT(0 30),POINT(30 25))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))')) FROM gis_geometrycollection WHERE fid=109;
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_all_points),ST_GEOMFROMTEXT(@star_collection_multilinestr)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),MULTILINESTRING((0 15,15 30,6 15),(4.2 12,0 5)))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOINT(0 0)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')),ST_GEOMFROMTEXT('POINT(0 0)'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOINT(0 0,1 1)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')),ST_GEOMFROMTEXT('MULTIPOINT((0 0),(1 1))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOINT(0 0,1 1)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(),GEOMETRYCOLLECTION())')),ST_GEOMFROMTEXT('MULTIPOINT((0 0),(1 1))'));
 --echo #====================================================================================
 --echo # linestring,point
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_center)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('LINESTRING(15 25,15 10)'),ST_GEOMFROMTEXT('POINT(15 10)')));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_bottom_left)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,g2)) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=110 and fid2=105;
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('LINESTRING(15 25,15 10)'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('LINESTRING(15 25,15 10)'),ST_GEOMFROMTEXT('POINT(15 10)')),ST_GEOMFROMTEXT('LINESTRING(15 25,15 10)'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_bottom_left)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(15 25,15 10),POINT(5 0))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,g2),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(10 15,20 15),POINT(15 10))')) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=110 and fid2=105;
 --echo #====================================================================================
 --echo # linestring,multipoint
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_vertical),ST_GEOMFROMTEXT('MULTIPOINT(15 10,15 25)')));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_vertical),ST_GEOMFROMTEXT(@star_all_points)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT('MULTIPOINT(15 10,15 25)'))) FROM gis_geometrycollection WHERE fid=111;
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_vertical),ST_GEOMFROMTEXT('MULTIPOINT(15 10,15 25)')),ST_GEOMFROMTEXT('LINESTRING(15 5,15 25)'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_vertical),ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(15 5,15 25),POINT(5 0),POINT(25 0))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT('MULTIPOINT(15 10,15 25)')),ST_GEOMFROMTEXT('LINESTRING(15 5,15 25)')) FROM gis_geometrycollection WHERE fid=111;
 --echo #====================================================================================
 --echo # linestring,linestring
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_vertical),ST_GEOMFROMTEXT(@star_top_to_center)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_line_vertical)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_top_to_center_1)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top_to_center))) FROM gis_geometrycollection WHERE fid=111;
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_vertical),ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('LINESTRING(15 5,15 10)'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_line_vertical)),ST_GEOMFROMTEXT('LINESTRING(15 5,15 10)'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top_to_center),ST_GEOMFROMTEXT(@star_top_to_center_1)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('LINESTRING(15 5,15 10)')) FROM gis_geometrycollection WHERE fid=111;
 --echo #====================================================================================
 --echo # linestring,multilinestring
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_lines_near_horizontal)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_lines_near_vertical)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_lines_near_horizontal))) FROM gis_geometrycollection WHERE fid=110;
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('LINESTRING(0 0, 1 1)'),ST_GEOMFROMTEXT('MULTILINESTRING((0 0, 1 1))')));
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_lines_near_horizontal)),ST_GEOMFROMTEXT('MULTILINESTRING((10 15,20 15),(25 0,0 15,15 30,0 5))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('MULTILINESTRING((10 15,20 15),(0 5,15 25,0 25))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_lines_near_horizontal)),ST_GEOMFROMTEXT('MULTILINESTRING((10 15,20 15),(25 0,0 15,15 30,0 5))')) FROM gis_geometrycollection WHERE fid=110;
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('LINESTRING(0 0, 1 1)'),ST_GEOMFROMTEXT('MULTILINESTRING((0 0, 1 1))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
 --echo #====================================================================================
 --echo # linestring,polygon
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT('POLYGON((11 15,19 15,19 10,11 15))')));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_elem_horizontal)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT('POLYGON((11 15,19 15,19 25,11 15))'))) FROM gis_geometrycollection WHERE fid=110;
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT('POLYGON((11 15,19 15,19 10,11 15))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((11 15,19 10,19 15,11 15)),MULTILINESTRING((10 15,11 15),(19 15,20 15)))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_elem_horizontal)),ST_GEOMFROMTEXT('POLYGON((25 0,22 10,30 15,0 15,25 0))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT('POLYGON((11 15,19 15,19 25,11 15))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((11 15,19 15,19 25,11 15)),MULTILINESTRING((10 15,11 15),(19 15,20 15)))')) FROM gis_geometrycollection WHERE fid=110;
 --echo #====================================================================================
 --echo # linestring,multipolygon
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT('MULTIPOLYGON(((11 15,19 15,19 25,11 15)))')));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_of_elems)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT('MULTIPOLYGON(((11 15,19 15,19 25,11 15)),((25 0,0 15,25 10,25 0)))'))) FROM gis_geometrycollection WHERE fid=110;
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT('MULTIPOLYGON(((11 15,19 15,19 25,11 15)))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((11 15,19 15,19 25,11 15)),MULTILINESTRING((10 15,11 15),(19 15,20 15)))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT('MULTIPOLYGON(((11 15,19 15,19 25,11 15)),((25 0,0 15,25 10,25 0)))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((11 15,19 15,19 25,11 15)),((25 0,25 10,0 15,25 0))),MULTILINESTRING((10 15,11 15),(19 15,20 15)))')) FROM gis_geometrycollection WHERE fid=110;
 --echo #====================================================================================
 --echo # linestring,geometrycollection
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_collection_elems)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_collection_elems_3)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_collection_elems))) FROM gis_geometrycollection WHERE fid=110;
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_collection_multilinestr)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('LINESTRING(0 0,1 1)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('LINESTRING(0 0,1 1)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(),GEOMETRYCOLLECTION())')));
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_collection_elems_3)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((65 0,75 5,85 0,82 10,90 15,80 15,75 25,70 15,60 15,67 10,65 0)),LINESTRING(10 15,20 15))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))')) FROM gis_geometrycollection WHERE fid=110;
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_line_horizontal),ST_GEOMFROMTEXT(@star_collection_multilinestr)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),MULTILINESTRING((0 15,15 30,6 15),(4.2 12,0 5)))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('LINESTRING(0 0,1 1)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')),ST_GEOMFROMTEXT('LINESTRING(0 0,1 1)'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('LINESTRING(0 0,1 1)'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(),GEOMETRYCOLLECTION())')),ST_GEOMFROMTEXT('LINESTRING(0 0,1 1)'));
 --echo #====================================================================================
 --echo # multilinestring,point
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_top)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_center)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top))) FROM gis_geometrycollection WHERE fid=114;
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_top)),ST_GEOMFROMTEXT('LINESTRING(0 5,15 25,0 25)'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((0 5,15 25,0 25)),POINT(15 10))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top)),ST_GEOMFROMTEXT('LINESTRING(0 5,15 25,0 25)')) FROM gis_geometrycollection WHERE fid=114;
 --echo #====================================================================================
 --echo # multilinestring,multipoint
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_bottom_points)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_all_points)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_bottom_points))) FROM gis_geometrycollection WHERE fid=114;
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,g2)) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=114 and fid2=108;
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((0 5,15 25,0 25)),POINT(5 0),POINT(25 0))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((0 5,15 25,0 25)),POINT(5 0),POINT(15 10),POINT(25 0))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((0 5,15 25,0 25)),POINT(5 0),POINT(25 0))')) FROM gis_geometrycollection WHERE fid=114;
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,g2),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((0 5,15 25,0 25)),POINT(5 0),POINT(25 0))')) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=114 and fid2=108;
 --echo #====================================================================================
 --echo # multilinestring,linestring
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_line_vertical)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_line_horizontal)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_line_vertical))) FROM gis_geometrycollection WHERE fid=114;
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_line_vertical)),ST_GEOMFROMTEXT('MULTILINESTRING((15 5,15 25),(0 5,15 25,0 25))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_line_horizontal)),ST_GEOMFROMTEXT('MULTILINESTRING((10 15,20 15),(0 5,15 25,0 25))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_line_vertical)),ST_GEOMFROMTEXT('MULTILINESTRING((15 5,15 25),(0 5,15 25,0 25))')) FROM gis_geometrycollection WHERE fid=114;
 --echo #====================================================================================
 --echo # multilinestring,multilinestring
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT('MULTILINESTRING((0 5,15 25,0 15))')));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_lines_near_horizontal)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT('MULTILINESTRING((0 5,15 25,0 15))'))) FROM gis_geometrycollection WHERE fid=114;
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT('MULTILINESTRING((0 5,15 25,0 15))')),ST_GEOMFROMTEXT('MULTILINESTRING((15 25,0 25),(15 25,0 15))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_lines_near_horizontal)),ST_GEOMFROMTEXT('MULTILINESTRING((0 5,15 25,0 25),(25 0,0 15,15 30,0 5))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT('MULTILINESTRING((0 5,15 25,0 15))')),ST_GEOMFROMTEXT('MULTILINESTRING((15 25,0 25),(15 25,0 15))')) FROM gis_geometrycollection WHERE fid=114;
 --echo #====================================================================================
 --echo # multilinestring,multilinestring
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_line_vertical))) FROM gis_geometrycollection WHERE fid=114;
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_elem_vertical)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_elem_horizontal)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_elem_vertical))) FROM gis_geometrycollection WHERE fid=114;
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_line_vertical)),ST_GEOMFROMTEXT('MULTILINESTRING((15 5,15 25),(0 5,15 25,0 25))')) FROM gis_geometrycollection WHERE fid=114;
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,15 25,5 0)),LINESTRING(0 5,15 25,0 25))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_elem_horizontal)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((25 0,22 10,30 15,0 15,25 0)),MULTILINESTRING((0 5,5.172413793103448 11.89655172413793),(7.5 15,15 25,0 25)))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,15 25,5 0)),LINESTRING(0 5,15 25,0 25))')) FROM gis_geometrycollection WHERE fid=114;
 --echo #====================================================================================
 --echo # multilinestring,multipolygon
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTILINESTRING((0 25,25 0,25 30))'),ST_GEOMFROMTEXT(@star_elem_vertical)));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_of_elems)));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_of_elems))) FROM gis_geometrycollection WHERE fid=114;
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTILINESTRING((0 25,25 0,25 30))'),ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,15 25,5 0)),MULTILINESTRING((0 25,10.714285714285715 14.285714285714286),(25 0,25 30)))'));
 --echo #====================================================================================
 --echo # multilinestring,geometrycollection
 --echo #====================================================================================
---echo # Invalid geometry in input.
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTILINESTRING((0 25,25 0,25 30))'),ST_GEOMFROMTEXT(@star_collection_elems)));
-
---echo # Invalid geometry in input.
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_vertical),ST_GEOMFROMTEXT(@star_collection_elems)));
-
---echo # Invalid geometry in input.
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_collection_elems))) FROM gis_geometrycollection WHERE fid=114;
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_horizontal),ST_GEOMFROMTEXT(@star_collection_multilinestr)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTILINESTRING((0 0,1 1),(2 2,3 3))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTILINESTRING((0 0,1 1,2 2))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
-                                                                                                        'GEOMETRYCOLLECTION(),GEOMETRYCOLLECTION())')));
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_lines_near_horizontal),ST_GEOMFROMTEXT(@star_collection_multilinestr)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTILINESTRING((0 0,1 1),(2 2,3 3))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')),ST_GEOMFROMTEXT('MULTILINESTRING((0 0,1 1),(2 2,3 3))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTILINESTRING((0 0,1 1,2 2))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
+                                                                                                        'GEOMETRYCOLLECTION(),GEOMETRYCOLLECTION())')),ST_GEOMFROMTEXT('LINESTRING(0 0,1 1,2 2)'));
 --echo #====================================================================================
 --echo # polygon,point
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_center)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT('POINT(0 0)')));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_center))) FROM gis_geometrycollection WHERE fid=100;
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('POLYGON((5 0,7 10,0 15,10 15,15 25,20 15,30 15,22 10,25 0,15 5,5 0))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT('POINT(0 0)')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,15 25,5 0)),POINT(0 0))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_center)),ST_GEOMFROMTEXT('POLYGON((5 0,7 10,0 15,10 15,15 25,20 15,30 15,22 10,25 0,15 5,5 0))')) FROM gis_geometrycollection WHERE fid=100;
 --echo #====================================================================================
 --echo # polygon,multipoint
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_all_points)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT('MULTIPOINT(0 0,30 25)')));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_all_points))) FROM gis_geometrycollection WHERE fid=100;
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_all_points)));
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('POLYGON((5 0,7 10,0 15,10 15,15 25,20 15,30 15,22 10,25 0,15 5,5 0))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT('MULTIPOINT(0 0,30 25)')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 25,25 0,15 5,5 0)),POINT(0 0),POINT(30 25))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('POLYGON((5 0,7 10,0 15,10 15,15 25,20 15,30 15,22 10,25 0,15 5,5 0))')) FROM gis_geometrycollection WHERE fid=100;
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_all_points)),ST_GEOMFROMTEXT('POLYGON((5 0,7 10,0 15,10 15,15 25,20 15,30 15,22 10,25 0,15 5,5 0))'));
 --echo #====================================================================================
 --echo # polygon,linestring
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_line_vertical)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star_line_horizontal)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_line_vertical))) FROM gis_geometrycollection WHERE fid=100;
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,g2)) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=100 and fid2=111;
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_line_vertical)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star_line_horizontal)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,15 25,5 0)),MULTILINESTRING((10 15,11 15),(19 15,20 15)))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_line_vertical)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))')) FROM gis_geometrycollection WHERE fid=100;
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,g2),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))')) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=100 and fid2=111;
 --echo #====================================================================================
 --echo # polygon,multilinestring
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_lines_near_vertical)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star_lines_near_horizontal)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_lines_near_vertical))) FROM gis_geometrycollection WHERE fid=100;
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),MULTILINESTRING((0 5,4.883720930232558 11.511627906976745),(7.5 15,15 25,0 25)))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star_lines_near_horizontal)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,15 25,5 0)),LINESTRING(8.870967741935484 9.67741935483871,0 15,15 30,0 5))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_lines_near_vertical)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),MULTILINESTRING((0 5,4.883720930232558 11.511627906976745),(7.5 15,15 25,0 25)))')) FROM gis_geometrycollection WHERE fid=100;
 --echo #====================================================================================
 --echo # polygon,polygon
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_elem_vertical)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_3),ST_GEOMFROMTEXT(@star_elem_vertical)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_elem_vertical))) FROM gis_geometrycollection WHERE fid=100;
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('MULTIPOLYGON(((15 25,25 0,22 10,30 15,20 15,15 25)),((15 25,10 15,0 15,7 10,5 0,15 25)))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_3),ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('MULTIPOLYGON(((65 0,75 5,85 0,82 10,90 15,80 15,75 25,70 15,60 15,67 10,65 0)),((5 0,15 5,25 0,15 25,5 0)))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_vertical),ST_GEOMFROMTEXT(@star)),ST_GEOMFROMTEXT('MULTIPOLYGON(((15 25,25 0,22 10,30 15,20 15,15 25)),((15 25,10 15,0 15,7 10,5 0,15 25)))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('MULTIPOLYGON(((15 25,25 0,22 10,30 15,20 15,15 25)),((15 25,10 15,0 15,7 10,5 0,15 25)))')) FROM gis_geometrycollection WHERE fid=100;
 --echo #====================================================================================
 --echo # polygon,multipolygon
 --echo #====================================================================================
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_of_elems)));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_of_elems_3)));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_of_elems))) FROM gis_geometrycollection WHERE fid=100;
-
 --echo #====================================================================================
 --echo # polygon,geometrycollection
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_collection_elems_3)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POLYGON((0 0,2 2,3 0,0 0))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 5,5 5,5 0,0 0),(2 2,2 3,3 3,3 2,2 2))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
-                                                                                                                      'GEOMETRYCOLLECTION())')));
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_collection_elems_3)),ST_GEOMFROMTEXT('MULTIPOLYGON(((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),((65 0,75 5,85 0,82 10,90 15,80 15,75 25,70 15,60 15,67 10,65 0)))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POLYGON((0 0,2 2,3 0,0 0))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')),ST_GEOMFROMTEXT('POLYGON((0 0,2 2,3 0,0 0))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POLYGON((0 0,0 5,5 5,5 0,0 0),(2 2,2 3,3 3,3 2,2 2))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION('
+                                                                                                                      'GEOMETRYCOLLECTION())')),ST_GEOMFROMTEXT('POLYGON((0 0,0 5,5 5,5 0,0 0),(2 2,2 3,3 3,3 2,2 2))'));
 --echo #====================================================================================
 --echo # multipolygon,point
 --echo #====================================================================================
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_top)));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('POINT(30 30)')));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top))) FROM gis_geometrycollection WHERE fid=103;
-
 --echo #====================================================================================
 --echo # multipolygon,multipoint
 --echo #====================================================================================
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_bottom_points)));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('MULTIPOINT(30 30,0 35)')));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_bottom_points))) FROM gis_geometrycollection WHERE fid=103;
-
 --echo #====================================================================================
 --echo # multipolygon,linestring
 --echo #====================================================================================
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_top_to_center)));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('LINESTRING(30 30,0 35)')));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top_to_center))) FROM gis_geometrycollection WHERE fid=103;
-
 --echo #====================================================================================
 --echo # multipolygon,multilinestring
 --echo #====================================================================================
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_lines_near_vertical)));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('MULTILINESTRING((0 30,30 30,0 35))')));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_lines_near_vertical))) FROM gis_geometrycollection WHERE fid=103;
-
 --echo #====================================================================================
 --echo # multipolygon,polygon
 --echo #====================================================================================
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star)));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('POLYGON((0 0,15 25,35 0,0 0))')));
-
 --echo #====================================================================================
 --echo # multipolygon,multipolygon
 --echo #====================================================================================
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)))')));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((5 5,5 10,10 10,10 0,5 5)))'),
-                                  ST_GEOMFROMTEXT('MULTIPOLYGON(((3 3,3 7,7 7,7 3,3 3)),((9 9,9 15,15 15,15 9,9 9)))')));
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((5 5,5 10,10 10,10 0,5 5)))'),
+ST_GEOMFROMTEXT('MULTIPOLYGON(((3 3,3 7,7 7,7 3,3 3)),((9 9,9 15,15 15,15 9,9 9)))')),ST_GEOMFROMTEXT('MULTIPOLYGON(((5 3,3 3,3 5,0 5,0 0,5 0,5 3)),((5 3,7 3,5 5,5 3)),((3 5,5 5,5 7,3 7,3 5)),((9 10,5 10,5 7,7 7,7 3,10 0,10 9,9 9,9 10)),((9 10,10 10,10 9,15 9,15 15,9 15,9 10)))
+'));
 --echo #====================================================================================
 --echo # multipolygon,geometrycollectionn
 --echo #====================================================================================
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_collection_elems_3)));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_collection_multilinestr)));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_collection_elems)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,2 2,3 0,0 0)))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0),(2 2,2 3,3 3,3 2,2 2)),((5 5,5 7,7 7,7 5,5 5)))'),
-                                  ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())')));
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,2 2,3 0,0 0)))'),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()')),ST_GEOMFROMTEXT('POLYGON((0 0,2 2,3 0,0 0))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0),(2 2,2 3,3 3,3 2,2 2)),((5 5,5 7,7 7,7 5,5 5)))'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())')),ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0),(2 2,2 3,3 3,3 2,2 2)),((5 5,5 7,7 7,7 5,5 5)))'));
 --echo #====================================================================================
 --echo # geometrycollection,point
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_top)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('POINT(30 30)')));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top))) FROM gis_geometrycollection WHERE fid=115;
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_top)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('POINT(30 30)')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),POINT(30 30))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))')) FROM gis_geometrycollection WHERE fid=115;
 --echo #====================================================================================
 --echo # geometrycollection,multipoint
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_bottom_points)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('MULTIPOINT(30 30,0 35)')));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_bottom_points))) FROM gis_geometrycollection WHERE fid=115;
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('MULTIPOINT(30 30,0 35)')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),POINT(0 35),POINT(30 30))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_bottom_points)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))')) FROM gis_geometrycollection WHERE fid=115;
 --echo #====================================================================================
 --echo # geometrycollection,linestring
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_top_to_center)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('LINESTRING(30 30,0 35)')));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top_to_center))) FROM gis_geometrycollection WHERE fid=115;
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('LINESTRING(30 30,0 35)')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),LINESTRING(30 30,0 35))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_top_to_center)),ST_GEOMFROMTEXT('POLYGON((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0))')) FROM gis_geometrycollection WHERE fid=115;
 --echo #====================================================================================
 --echo # geometrycollection,multilinestring
 --echo #====================================================================================
---echo # Invalid geometry in input.
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_lines_near_vertical)));
-
---echo # Invalid geometry in input.
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('MULTILINESTRING((0 30,30 30,0 35))')));
-
---echo # Invalid geometry in input.
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_lines_near_vertical))) FROM gis_geometrycollection WHERE fid=115;
-
 --echo #====================================================================================
 --echo # geometrycollection,polygon
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('POLYGON((0 0,0 5,5 5,5 0,0 0))')));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_elem_vertical)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('POLYGON((0 0,15 25,35 0,0 0))')));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_elem_vertical))) FROM gis_geometrycollection WHERE fid=115;
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(2 2,5 5))'),
-                                  ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0),(4 4,4 6,6 6,6 4,4 4))')));
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('POLYGON((0 0,0 5,5 5,5 0,0 0))')),ST_GEOMFROMTEXT('MULTIPOLYGON(((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),((5 0,5 5,0 5,0 0,5 0)))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('MULTIPOLYGON(((15 25,25 0,22 10,30 15,20 15,15 25)),((15 25,10 15,0 15,7 10,5 0,15 25)))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('POLYGON((0 0,15 25,35 0,0 0))')),ST_GEOMFROMTEXT('MULTIPOLYGON(((9 15,0 15,6.3 10.5,9 15)),((9 15,10 15,15 25,9 15)),((6.299999999999999 10.5,0 0,5 0,7 10,6.299999999999999 10.5)),((25.333333333333332 12.083333333333334,30 15,23 15,25.333333333333332 12.083333333333334)),((25.333333333333332 12.083333333333334,22 10,25 0,35 0,25.333333333333332 12.083333333333334)),((23 15,15 25,20 15,23 15)),((5 0,25 0,15 5,5 0)))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_elem_vertical)),ST_GEOMFROMTEXT('MULTIPOLYGON(((15 25,25 0,22 10,30 15,20 15,15 25)),((15 25,10 15,0 15,7 10,5 0,15 25)))')) FROM gis_geometrycollection WHERE fid=115;
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(2 2,5 5))'),
+ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0),(4 4,4 6,6 6,6 4,4 4))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4)),LINESTRING(4 4,5 5))'));
 --echo #====================================================================================
 --echo # geometrycollection,multipolygon
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)))')));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_of_elems)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(2 2,4 4))'),
-                                  ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((5 5,5 10,10 10,10 5,5 5)))')));
-
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)))')),ST_GEOMFROMTEXT('MULTIPOLYGON(((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),((5 0,5 5,0 5,0 0,5 0)))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(2 2,4 4))'),
+ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((5 5,5 10,10 10,10 5,5 5)))')),ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,5 0,5 5,0 5,0 0)),((5 5,10 5,10 10,5 10,5 5)))'));
 --echo #====================================================================================
 --echo # geometrycollection,geometrycollectionn
 --echo #====================================================================================
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_collection_elems_3)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_collection_elems)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_collection_elems))) FROM gis_geometrycollection WHERE fid=115;
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,g2)) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=115 and fid2=215;
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_multilinestr),ST_GEOMFROMTEXT(@star_collection_elems)));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(0 0,2 2),POINT(4 4),POINT(6 6))'),
-                                  ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(4 4),POINT(6 6))')));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOINT(0 0,2 2),POINT(4 4),POINT(6 6))'),
-                                  ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(4 4),POINT(6 6))')));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((0 0,1 1),(2 2,3 3)),POINT(4 4),POINT(6 6))'),
-                                  ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(4 4),POINT(6 6))')));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((6 6,6 10,10 10,10 6,6 6))),'
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_collection_elems_3)),ST_GEOMFROMTEXT('MULTIPOLYGON(((5 0,15 5,25 0,22 10,30 15,20 15,15 25,10 15,0 15,7 10,5 0)),((65 0,75 5,85 0,82 10,90 15,80 15,75 25,70 15,60 15,67 10,65 0)))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')) FROM gis_geometrycollection WHERE fid=115;
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(g,g2),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=115 and fid2=215;
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_multilinestr),ST_GEOMFROMTEXT(@star_collection_elems)),ST_GEOMFROMTEXT('MULTILINESTRING((0 15,15 30,6 15),(4.2 12,0 5))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(0 0,2 2),POINT(4 4),POINT(6 6))'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(4 4),POINT(6 6))')),ST_GEOMFROMTEXT('LINESTRING(0 0,2 2)'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOINT(0 0,2 2),POINT(4 4),POINT(6 6))'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(4 4),POINT(6 6))')),ST_GEOMFROMTEXT('MULTIPOINT((0 0),(2 2))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((0 0,1 1),(2 2,3 3)),POINT(4 4),POINT(6 6))'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(4 4),POINT(6 6))')),ST_GEOMFROMTEXT('MULTILINESTRING((0 0,1 1),(2 2,3 3))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((6 6,6 10,10 10,10 6,6 6))),'
                                                                      'POINT(14 14),POINT(16 16))'),
-                                  ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(14 14),POINT(16 16))')));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())'),
-                                  ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())))')));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())'),
-                                  ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(1 1), GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())))')));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(1 1)))'),
-                                  ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())))')));
-
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(1 1)))'),
-                                  ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(1 1), GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())))')));
-
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(14 14),POINT(16 16))')),ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((6 6,6 10,10 10,10 6,6 6)))'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(1 1), GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())))')),ST_GEOMFROMTEXT('POINT(1 1)'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(1 1)))'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())))')),ST_GEOMFROMTEXT('POINT(1 1)'));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(1 1)))'),
+ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(1 1), GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())))')),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
 --echo #####################################################################################
 --echo # Testing ST_SYMDIFFERENCE() with 2 geometries of same SRID
 --echo #####################################################################################
 SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top,0),ST_GEOMFROMTEXT(@star_center,0)));
 
---error ER_NOT_IMPLEMENTED_FOR_GEOGRAPHIC_SRS
 SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top,4145),ST_GEOMFROMTEXT(@star_center,4145)));
 
 SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top,2000),ST_GEOMFROMTEXT(@star_center,2000)));
 
---error ER_NOT_IMPLEMENTED_FOR_GEOGRAPHIC_SRS
 SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top,4326),ST_GEOMFROMTEXT(@star_center,4326)));
 
---error ER_NOT_IMPLEMENTED_FOR_GEOGRAPHIC_SRS
 SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_top,4135),ST_GEOMFROMTEXT(@star_center,4135)));
 
 --error ER_DATA_OUT_OF_RANGE
@@ -890,29 +632,6 @@
 
 SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star),ST_GEOMFROMTEXT(@star_collection_elems)));
 
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_elem_vertical))) FROM gis_geometrycollection WHERE fid=103;
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_elem_vertical)));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_of_elems)));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),
-                                  ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,15 25,35 0,0 0)),((5 0,15 25,25 0,15 5,5 0)))')));
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_of_elems))) FROM gis_geometrycollection WHERE fid=103;
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,g2)) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=103 and fid2=103;
-
---echo # Invalid geometry in input
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_collection_elems),
-                                  ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,15 25,35 0,0 0)),((5 0,15 25,25 0,15 5,5 0)))')));
-
 # Test with all combinations of geometry types, including types inside
 # geometry collections. These queries are for coverage of code
 # paths. The results have not been verified.
@@ -1001,12 +720,461 @@
   POINT(1,10), POINT(1,1)), LINESTRING(POINT(4,4),POINT(4,6),POINT(6,6),
   POINT(6,4),POINT(4,4))))));
 
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(a.g, b.g)) FROM t1 AS a JOIN t1 AS b ORDER BY a.pk, b.pk;
+CREATE TABLE symdifference_results (pk INT PRIMARY KEY AUTO_INCREMENT, g GEOMETRY NOT NULL);
+INSERT INTO symdifference_results(g)
+VALUES
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,1 0,1 1,0 1,0 0))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POINT(2 2)')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,1 0,1 1,0 1,0 0))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POINT(2 2)')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('LINESTRING(3 3,4 4)')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('LINESTRING(3 3,4 4)')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,1 0,1 1,0 1,0 0))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,1 1,1 0,10 0,10 10,0 10,0 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),POINT(2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((5 5,10 5,10 10,5 10,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,1 0,1 1,0 1,0 0))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,1 1,1 0,10 0,10 10,0 10,0 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),POINT(2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((5 5,10 5,10 10,5 10,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((1 0,10 0,10 5,10 10,0 10,0 1,1 1,1 0),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((1 0,10 0,10 5,10 10,0 10,0 1,1 1,1 0),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 1,0 1,0 0,1 0,1 1)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,1 1,1 0,10 0,10 10,0 10,0 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)),((6 6,7 6,7 7,6 7,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,1 1,1 10,0 10,0 1)),((10 1,1 1,1 0,10 0,10 1)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,1 1,1 0,10 0,10 10,0 10,0 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)),((6 6,7 6,7 7,6 7,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,1 1,1 10,0 10,0 1)),((10 1,1 1,1 0,10 0,10 1)))')),
+(ST_GEOMFROMTEXT('POLYGON((5 6,5 5,6 5,6 6,5 6))')),
+(ST_GEOMFROMTEXT('POLYGON((5 6,5 5,4 4,6 4,6 6,5 6))')),
+(ST_GEOMFROMTEXT('POLYGON((1 10,0 10,0 0,10 0,10 1,1 1,1 10))')),
+(ST_GEOMFROMTEXT('POINT(2 2)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),POINT(2 2))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),POINT(2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),POINT(2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('POINT(2 2)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),POINT(2 2))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),POINT(2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),POINT(2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('LINESTRING(3 3,4 4)')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('LINESTRING(3 3,4 4)')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('POLYGON((5 5,10 5,10 10,5 10,5 5))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 5,6 6,5 6,5 5,6 5)),((6 5,6 4,4 4,4 6,5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),POINT(2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('POLYGON((6 6,7 6,7 7,6 7,6 6))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 5,6 6,5 6,5 5,6 5)),((6 5,6 4,4 4,4 6,5 6,5 10,1 10,1 1,10 1,10 5,6 5)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('POLYGON((5 5,10 5,10 10,5 10,5 5))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 5,6 6,5 6,5 5,6 5)),((6 5,6 4,4 4,4 6,5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),POINT(2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('POLYGON((6 6,7 6,7 7,6 7,6 6))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 5,6 6,5 6,5 5,6 5)),((6 5,6 4,4 4,4 6,5 6,5 10,1 10,1 1,10 1,10 5,6 5)))')),
+(ST_GEOMFROMTEXT('POLYGON((5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6,5 10))')),
+(ST_GEOMFROMTEXT('POLYGON((5 10,0 10,0 1,1 1,1 0,10 0,10 5,5 5,4 4,4 6,5 6,5 10))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 1,0 1,0 0,1 0,1 1)),((1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6,5 10,1 10,1 1)),((6 5,6 6,5 6,5 5,6 5)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('POLYGON((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 6,5 6,5 5,6 5,6 6)),((6 6,7 6,7 7,6 7,6 6)),((6 5,6 4,4 4,4 6,5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),POINT(2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((6 6,7 6,7 7,6 7,6 6))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 6,5 6,5 5,6 5,6 6)),((6 6,7 6,7 7,6 7,6 6)),((6 5,6 4,4 4,4 6,5 6,5 10,1 10,1 1,10 1,10 5,6 5)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('POLYGON((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 6,5 6,5 5,6 5,6 6)),((6 6,7 6,7 7,6 7,6 6)),((6 5,6 4,4 4,4 6,5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),POINT(2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((6 6,7 6,7 7,6 7,6 6))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 6,5 6,5 5,6 5,6 6)),((6 6,7 6,7 7,6 7,6 6)),((6 5,6 4,4 4,4 6,5 6,5 10,1 10,1 1,10 1,10 5,6 5)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 6,7 6,7 7,6 7,6 6)),((5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 6,7 6,7 7,6 7,6 6)),((5 10,0 10,0 1,1 1,1 0,10 0,10 5,5 5,4 4,4 6,5 6,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 1,0 1,0 0,1 0,1 1)),((1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6,5 10,1 10,1 1)),((6 6,5 6,5 5,6 5,6 6)),((6 6,7 6,7 7,6 7,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,1 1,1 10,0 10,0 1)),((10 1,1 1,1 0,10 0,10 1)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,1 10,1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,1 10,1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)),((6 6,7 6,7 7,6 7,6 6)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,1 1,1 10,0 10,0 1)),((10 1,1 1,1 0,10 0,10 1)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,1 10,1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,1 10,1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)),((6 6,7 6,7 7,6 7,6 6)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 10,0 10,0 1,1 1,1 10)),((10 1,1 1,1 0,10 0,10 1)),((5 6,5 5,6 5,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 10,0 10,0 1,1 1,1 10)),((10 1,1 1,1 0,10 0,10 1)),((5 6,5 5,4 4,6 4,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,0 1,0 0,1 0,1 1))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,1 0,1 1,0 1,0 0))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POINT(2 2)')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,1 0,1 1,0 1,0 0))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POINT(2 2)')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('LINESTRING(3 3,4 4)')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('LINESTRING(3 3,4 4)')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,1 0,1 1,0 1,0 0))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,1 1,1 0,10 0,10 10,0 10,0 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),POINT(2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((5 5,10 5,10 10,5 10,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,1 0,1 1,0 1,0 0))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,1 1,1 0,10 0,10 10,0 10,0 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),POINT(2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((5 5,10 5,10 10,5 10,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((1 0,10 0,10 5,10 10,0 10,0 1,1 1,1 0),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((1 0,10 0,10 5,10 10,0 10,0 1,1 1,1 0),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 1,0 1,0 0,1 0,1 1)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,1 1,1 0,10 0,10 10,0 10,0 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)),((6 6,7 6,7 7,6 7,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,1 1,1 10,0 10,0 1)),((10 1,1 1,1 0,10 0,10 1)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((0 1,1 1,1 0,10 0,10 10,0 10,0 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)),((6 6,7 6,7 7,6 7,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,1 1,1 10,0 10,0 1)),((10 1,1 1,1 0,10 0,10 1)))')),
+(ST_GEOMFROMTEXT('POLYGON((5 6,5 5,6 5,6 6,5 6))')),
+(ST_GEOMFROMTEXT('POLYGON((5 6,5 5,4 4,6 4,6 6,5 6))')),
+(ST_GEOMFROMTEXT('POLYGON((1 10,0 10,0 0,10 0,10 1,1 1,1 10))')),
+(ST_GEOMFROMTEXT('POINT(2 2)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),POINT(2 2))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),POINT(2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),POINT(2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('POINT(2 2)')),
+(ST_GEOMFROMTEXT('LINESTRING(1 1,2 2)')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),POINT(2 2))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),POINT(2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),POINT(2 2))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('LINESTRING(3 3,4 4)')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('LINESTRING(3 3,4 4)')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTILINESTRING((1 1,2 2),(3 3,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('POLYGON((5 5,10 5,10 10,5 10,5 5))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 5,6 6,5 6,5 5,6 5)),((6 5,6 4,4 4,4 6,5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),POINT(2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('POLYGON((6 6,7 6,7 7,6 7,6 6))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 5,6 6,5 6,5 5,6 5)),((6 5,6 4,4 4,4 6,5 6,5 10,1 10,1 1,10 1,10 5,6 5)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('POLYGON((5 5,10 5,10 10,5 10,5 5))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 5,6 6,5 6,5 5,6 5)),((6 5,6 4,4 4,4 6,5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),POINT(2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('POLYGON((6 6,7 6,7 7,6 7,6 6))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 5,6 6,5 6,5 5,6 5)),((6 5,6 4,4 4,4 6,5 6,5 10,1 10,1 1,10 1,10 5,6 5)))')),
+(ST_GEOMFROMTEXT('POLYGON((5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6,5 10))')),
+(ST_GEOMFROMTEXT('POLYGON((5 10,0 10,0 1,1 1,1 0,10 0,10 5,5 5,4 4,4 6,5 6,5 10))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 1,0 1,0 0,1 0,1 1)),((1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6,5 10,1 10,1 1)),((6 5,6 6,5 6,5 5,6 5)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('POLYGON((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 6,5 6,5 5,6 5,6 6)),((6 6,7 6,7 7,6 7,6 6)),((6 5,6 4,4 4,4 6,5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),POINT(2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((6 6,7 6,7 7,6 7,6 6))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 6,5 6,5 5,6 5,6 6)),((6 6,7 6,7 7,6 7,6 6)),((6 5,6 4,4 4,4 6,5 6,5 10,1 10,1 1,10 1,10 5,6 5)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),LINESTRING(1 1,2 2))')),
+(ST_GEOMFROMTEXT('POLYGON((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 6,5 6,5 5,6 5,6 6)),((6 6,7 6,7 7,6 7,6 6)),((6 5,6 4,4 4,4 6,5 6,5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),POINT(2 2))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((5 5,10 5,10 10,5 10,5 5),(6 6,6 7,7 7,7 6,6 6))),MULTILINESTRING((1 1,2 2),(3 3,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((6 6,7 6,7 7,6 7,6 6))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 6,5 6,5 5,6 5,6 6)),((6 6,7 6,7 7,6 7,6 6)),((6 5,6 4,4 4,4 6,5 6,5 10,1 10,1 1,10 1,10 5,6 5)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 6,7 6,7 7,6 7,6 6)),((5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 6,7 6,7 7,6 7,6 6)),((5 10,0 10,0 1,1 1,1 0,10 0,10 5,5 5,4 4,4 6,5 6,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 1,0 1,0 0,1 0,1 1)),((1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6,5 10,1 10,1 1)),((6 6,5 6,5 5,6 5,6 6)),((6 6,7 6,7 7,6 7,6 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,1 1,1 10,0 10,0 1)),((10 1,1 1,1 0,10 0,10 1)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,1 10,1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,1 10,1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)),((6 6,7 6,7 7,6 7,6 6)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 1,1 1,1 10,0 10,0 1)),((10 1,1 1,1 0,10 0,10 1)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)),((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,1 10,1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,1 10,1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)),((6 6,7 6,7 7,6 7,6 6)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 10,0 10,0 1,1 1,1 10)),((10 1,1 1,1 0,10 0,10 1)),((5 6,5 5,6 5,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 10,0 10,0 1,1 1,1 10)),((10 1,1 1,1 0,10 0,10 1)),((5 6,5 5,4 4,6 4,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,0 1,0 0,1 0,1 1))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((1 0,10 0,10 5,10 10,0 10,0 1,1 1,1 0),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((5 6,5 5,6 5,6 6,5 6))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6,5 10))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 6,7 6,7 7,6 7,6 6)),((5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 10,0 10,0 1,1 1,1 10)),((10 1,1 1,1 0,10 0,10 1)),((5 6,5 5,6 5,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((1 0,10 0,10 5,10 10,0 10,0 1,1 1,1 0),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((5 6,5 5,6 5,6 6,5 6))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(6 5,6 4,4 4,4 6,5 6,5 5,6 5))')),
+(ST_GEOMFROMTEXT('POLYGON((5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6,5 10))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 6,7 6,7 7,6 7,6 6)),((5 10,0 10,0 1,1 1,1 0,10 0,10 5,6 5,6 4,4 4,4 6,5 6,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 10,0 10,0 1,1 1,1 10)),((10 1,1 1,1 0,10 0,10 1)),((5 6,5 5,6 5,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('POLYGON((4 4,6 4,6 5,5 5,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((10 1,1 1,1 10,0 10,0 0,10 0,10 1)),((5 6,5 5,6 5,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((1 0,10 0,10 5,10 10,0 10,0 1,1 1,1 0),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((5 6,5 5,4 4,6 4,6 6,5 6))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((5 10,0 10,0 1,1 1,1 0,10 0,10 5,5 5,4 4,4 6,5 6,5 10))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 6,7 6,7 7,6 7,6 6)),((5 10,0 10,0 1,1 1,1 0,10 0,10 5,5 5,4 4,4 6,5 6,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 10,0 10,0 1,1 1,1 10)),((10 1,1 1,1 0,10 0,10 1)),((5 6,5 5,4 4,6 4,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((1 0,10 0,10 5,10 10,0 10,0 1,1 1,1 0),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((5 6,5 5,4 4,6 4,6 6,5 6))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((0 10,0 0,10 0,10 5,10 10,0 10),(5 5,4 4,4 6,5 6,5 5))')),
+(ST_GEOMFROMTEXT('POLYGON((5 10,0 10,0 1,1 1,1 0,10 0,10 5,5 5,4 4,4 6,5 6,5 10))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((6 6,7 6,7 7,6 7,6 6)),((5 10,0 10,0 1,1 1,1 0,10 0,10 5,5 5,4 4,4 6,5 6,5 10)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 10,0 10,0 1,1 1,1 10)),((10 1,1 1,1 0,10 0,10 1)),((5 6,5 5,4 4,6 4,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('POLYGON((4 4,6 4,6 5,5 5,4 4))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((10 1,1 1,1 10,0 10,0 0,10 0,10 1)),((5 6,5 5,4 4,6 4,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)),((1 1,0 1,0 0,1 0,1 1)))')),
+(ST_GEOMFROMTEXT('POLYGON((1 10,0 10,0 0,10 0,10 1,1 1,1 10))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,1 10,1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)),((1 1,0 1,0 0,1 0,1 1)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,1 10,1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)),((1 1,0 1,0 0,1 0,1 1)),((6 6,7 6,7 7,6 7,6 6)))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,0 1,0 0,1 0,1 1))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4)),((1 1,0 1,0 0,1 0,1 1)))')),
+(ST_GEOMFROMTEXT('POLYGON((1 10,0 10,0 0,10 0,10 1,1 1,1 10))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,10 1,10 10,1 10,1 1),(4 4,4 6,6 6,6 4,4 4))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,1 10,1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)),((1 1,0 1,0 0,1 0,1 1)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((5 6,5 10,1 10,1 1,10 1,10 5,6 5,6 4,4 4,4 6,5 6)),((5 6,5 5,6 5,6 6,5 6)),((1 1,0 1,0 0,1 0,1 1)),((6 6,7 6,7 7,6 7,6 6)))')),
+(ST_GEOMFROMTEXT('POLYGON((1 1,0 1,0 0,1 0,1 1))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((10 1,1 1,1 10,0 10,0 0,10 0,10 1)),((5 6,5 5,6 5,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('MULTIPOLYGON(((10 1,1 1,1 10,0 10,0 0,10 0,10 1)),((5 6,5 5,4 4,6 4,6 6,5 6)))')),
+(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION EMPTY'));
+#
+CREATE TABLE symdifference (pk INT PRIMARY KEY AUTO_INCREMENT, g GEOMETRY NOT NULL);
+INSERT INTO symdifference SELECT 0, ST_SYMDIFFERENCE(a.g, b.g) FROM t1 AS a JOIN t1 AS b ORDER BY a.pk, b.pk;
+SELECT SUM(ST_EQUALS(a.g, b.g)) FROM symdifference AS a, symdifference_results AS b WHERE a.pk = b.pk;
 
 --echo #clean up
 DROP TABLE gis_geometrycollection;
 DROP TABLE gis_geometrycollection_2;
 DROP TABLE t1;
+DROP TABLE symdifference;
+DROP TABLE symdifference_results;
 
 --echo #
 --echo # Bug #21263152 ST_SYMDIFFERENCE(POLYGON, POLYGON) MAY RETURN AN INVALID
@@ -1059,8 +1227,7 @@
   ST_GEOMFROMTEXT('POINT(0 0)', 2000)
 ));
 
---echo # Geographic SRS (should fail)
---error ER_NOT_IMPLEMENTED_FOR_GEOGRAPHIC_SRS
+--echo # Geographic SRS (should pass)
 SELECT ST_ASTEXT(ST_SYMDIFFERENCE(
   ST_GEOMFROMTEXT('POINT(0 0)', 4326),
   ST_GEOMFROMTEXT('POINT(0 0)', 4326)
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/gis/t/spatial_op_testingfunc_mix.test mysql-8.0-8.0.27/mysql-test/suite/gis/t/spatial_op_testingfunc_mix.test
--- mysql-8.0-8.0.26/mysql-test/suite/gis/t/spatial_op_testingfunc_mix.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/gis/t/spatial_op_testingfunc_mix.test	2021-09-28 11:46:34.000000000 +0000
@@ -433,17 +433,17 @@
 --echo #-------------------------------------------------------------------------------------------
 --echo # Spatial Operators with ST_SYMDIFFERENCE()
 --echo #-------------------------------------------------------------------------------------------
-SELECT ST_ASTEXT(ST_UNION(ST_SYMDIFFERENCE(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_horizontal),ST_GEOMFROMTEXT(@star_elem_vertical)),
-       ST_GEOMFROMTEXT(@star_2)),ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_1),ST_GEOMFROMTEXT(@star_2))));
+SELECT ST_EQUALS(ST_UNION(ST_SYMDIFFERENCE(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_horizontal),ST_GEOMFROMTEXT(@star_elem_vertical)),
+ST_GEOMFROMTEXT(@star_2)),ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_1),ST_GEOMFROMTEXT(@star_2))),ST_GEOMFROMTEXT('MULTIPOLYGON(((20 2.5,15.909090909090908 4.545454545454546,15 0,20 2.5)),((20 2.5,25 0,23.695652173913043 4.3478260869565215,23.333333333333336 4.166666666666667,19 15,20 15,15 25,10 15,0 15,7 10,5 0,15 5,15.909090909090908 4.545454545454546,16.071429972789407 5.357142459183436,20.454545435878362 2.727272963927534,20 2.5),(11 15,10.777778284173866 14.444445710434662,10 15,11 15)),((20 15,30 15,25 25,20 15)),((23.695652173913043 4.3478260869565215,25 5,35 0,32 10,40 15,30 15,22 10,23.695652173913043 4.3478260869565215)))'));
 
-SELECT ST_ASTEXT(ST_DIFFERENCE(ST_SYMDIFFERENCE(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_horizontal),ST_GEOMFROMTEXT(@star_elem_vertical)),
-       ST_GEOMFROMTEXT(@star_2)),ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_1),ST_GEOMFROMTEXT(@star_2))));
+SELECT ST_EQUALS(ST_DIFFERENCE(ST_SYMDIFFERENCE(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_horizontal),ST_GEOMFROMTEXT(@star_elem_vertical)),
+ST_GEOMFROMTEXT(@star_2)),ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_1),ST_GEOMFROMTEXT(@star_2))),ST_GEOMFROMTEXT('POLYGON((20.454545435878362 2.727272963927534,22.05644715646448 3.5282235782322404,23.333333333333332 4.166666666666667,19 15,11 15,10.777778284173866 14.444445710434662,17 10,16.071429972789407 5.357142459183436,20.454545435878362 2.727272963927534))'));
 
-SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_SYMDIFFERENCE(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_horizontal),ST_GEOMFROMTEXT(@star_elem_vertical)),
-       ST_GEOMFROMTEXT(@star_2)),ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_1),ST_GEOMFROMTEXT(@star_2))));
+SELECT ST_EQUALS(ST_SYMDIFFERENCE(ST_SYMDIFFERENCE(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_horizontal),ST_GEOMFROMTEXT(@star_elem_vertical)),
+ST_GEOMFROMTEXT(@star_2)),ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_1),ST_GEOMFROMTEXT(@star_2))),ST_GEOMFROMTEXT('MULTIPOLYGON(((16.071428650510203 5.357143252551023,20.454545435878362 2.727272963927534,25 0,23.333333398692986 4.166666503267538,19 15,11 15,10.777778284173866 14.444445710434662,17 10,10.777777750841748 14.444444377104368,8.870967741935484 9.67741935483871,16.071428650510203 5.357143252551023)),((10.777778284173866 14.444445710434662,10 15,10.777777750841748 14.44444437710437,10.777778284173866 14.444445710434662)),((11 15,15 25,10 15,11 15)),((19 15,20 15,15 25,19 15)),((8.870967741935484 9.67741935483871,0 15,7 10,5 0,8.870967741935484 9.67741935483871)))'));
 
-SELECT ST_ASTEXT(ST_INTERSECTION(ST_SYMDIFFERENCE(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_horizontal),ST_GEOMFROMTEXT(@star_elem_vertical)),
-       ST_GEOMFROMTEXT(@star_2)),ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_1),ST_GEOMFROMTEXT(@star_2))));
+SELECT ST_EQUALS(ST_INTERSECTION(ST_SYMDIFFERENCE(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_elem_horizontal),ST_GEOMFROMTEXT(@star_elem_vertical)),
+ST_GEOMFROMTEXT(@star_2)),ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_1),ST_GEOMFROMTEXT(@star_2))),ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOINT((16.071429972789407 5.357142459183436),(20.454545435878362 2.727272963927534),(22.05644715646448 3.5282235782322404)),MULTIPOLYGON(((20 2.5,25 0,20.454545659504127 2.727272829752063,20 2.5)),((15 0,20 2.5,15.909090909090908 4.545454545454546,15 0)),((19 15,15 25,11 15,19 15)),((20 15,30 15,25 25,20 15)),((23.695652173913043 4.3478260869565215,23.333333398692986 4.166666503267538,25 0,23.695652173913043 4.3478260869565215)),((17 10,10.777778284173866 14.444445710434662,10.777777750841748 14.444444377104368,17 10)),((15.90909090909091 4.545454545454546,16.071428650510203 5.357143252551023,8.870967741935484 9.67741935483871,5 0,15 5,15.90909090909091 4.545454545454546)),((0 15,8.870967741935484 9.67741935483871,10.777777750841748 14.44444437710437,10 15,0 15)),((22 10,23.695652173913043 4.3478260869565215,25 5,35 0,32 10,40 15,30 15,22 10))))'));
 
 --echo #-------------------------------------------------------------------------------------------
 --echo # Spatial Operators with ST_INTERSECTION()
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/gis/t/st_collect.test mysql-8.0-8.0.27/mysql-test/suite/gis/t/st_collect.test
--- mysql-8.0-8.0.26/mysql-test/suite/gis/t/st_collect.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/gis/t/st_collect.test	2021-09-28 11:46:34.000000000 +0000
@@ -27,6 +27,7 @@
 --echo # result shall be
 --echo # MULTIPOINT((0 0),(1 0),(3 0))
 --echo # MULTIPOINT((2 0),(0 0))
+--sorted_result
 SELECT ST_ASTEXT(ST_COLLECT( DISTINCT location )) AS t FROM
 table_simple_aggregation GROUP BY grouping_condition;
 
@@ -65,13 +66,17 @@
 
 
 --echo Excercising multiple code paths.
+--sorted_result
 SELECT ST_ASTEXT(ST_COLLECT(DISTINCT location)) AS geo, SUM(running_number)
 OVER()  FROM table_simple_aggregation GROUP BY running_number;
+--sorted_result
 SELECT ST_ASTEXT(ST_COLLECT(DISTINCT location)) AS geo, SUM(grouping_condition)
 OVER(), grouping_condition FROM table_simple_aggregation GROUP BY
 grouping_condition;
+--sorted_result
 SELECT ST_ASTEXT(ST_COLLECT(location)) AS geo, SUM(grouping_condition) OVER(),
 grouping_condition FROM table_simple_aggregation GROUP BY grouping_condition;
+--sorted_result
 SELECT ST_ASTEXT(ST_COLLECT(location)) AS geo, SUM(running_number) OVER()  FROM
 table_simple_aggregation GROUP BY running_number;
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/gis/t/st_intersection.test mysql-8.0-8.0.27/mysql-test/suite/gis/t/st_intersection.test
--- mysql-8.0-8.0.26/mysql-test/suite/gis/t/st_intersection.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/gis/t/st_intersection.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,118 @@
+###############################################################################
+#                                                                             #
+# This test tests the ST_Intersection function.                               #
+# ST_Intersection returns the intersection geometry between two geometries.   #
+# The function is defined by OGC standard documents.                          #
+#                                                                             #
+###############################################################################
+
+--echo #####################################################################################
+--echo # Creating a spatial Geometry object
+--echo #####################################################################################
+USE test;
+CREATE TABLE gis_geometrycollection (fid INTEGER NOT NULL PRIMARY KEY, g GEOMETRY);
+# Geometric elements constructing a star
+SET @star_of_elems='MULTIPOLYGON(((5 0,15 5,25 0,22 10,30 15,19 15,5 0)),((19 15,15 25,11 15,19 15)))';
+SET @star_collection_elems='GEOMETRYCOLLECTION(POLYGON((5 0,7 10,0 15,10 15,15 25,20 15,30 15,22 10,25 0,15 5,5 0),(10 6,10 10,7 12,13 13,15 18,17 13,21 13,18 10,20 6,15 8,10 6)),MULTILINESTRING((25 0,0 15,15 30,0 5)),LINESTRING(15 25,15 10),MULTIPOINT(5 0,25 0),POINT(15 25))';
+--echo # INSERT star
+--disable_warnings
+INSERT INTO gis_geometrycollection VALUES (103,ST_GEOMFROMTEXT(@star_of_elems));
+--enable_warnings
+CREATE TABLE gis_geometrycollection_2 SELECT fid as fid2,g as g2 FROM gis_geometrycollection;
+--echo # Checking the integrity of the above create/insert statements
+--echo # 1 row.
+SELECT count(g IS NULL) FROM gis_geometrycollection;
+--echo # 1 row.
+SELECT count(g2 IS NULL) FROM gis_geometrycollection_2;
+
+--echo #####################################################################################
+--echo # Testing ST_Intersection() with different ways to pass input geometries
+--echo #####################################################################################
+SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_collection_elems)));
+SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('POLYGON((1 1,2 1,2 2,1 2,1 1))')));
+SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('POINT(0 0)'),ST_GEOMFROMTEXT('POLYGON((1 1,2 1,2 2,1 2,1 1))')));
+SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT(@star_of_elems))) FROM gis_geometrycollection WHERE fid=103;
+SELECT ST_ASTEXT(ST_INTERSECTION(g,ST_GEOMFROMTEXT('POINT(0 0)'))) FROM gis_geometrycollection WHERE fid=103;
+SELECT ST_ASTEXT(ST_INTERSECTION(g,g2)) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=103 and fid2=103;
+
+--echo #####################################################################################
+--echo # Verify ST_Intersection() returns NULL if at least one of its arguments are NULL.
+--echo #####################################################################################
+SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT(@star_of_elems),NULL));
+SELECT ST_ASTEXT(ST_INTERSECTION(NULL,ST_GEOMFROMTEXT(@star_of_elems)));
+SELECT ST_ASTEXT(ST_INTERSECTION(NULL,ST_GEOMFROMTEXT('POINT(0 0)')));
+SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('POINT(0 0)'),NULL));
+SELECT ST_ASTEXT(ST_INTERSECTION(g,NULL)) FROM gis_geometrycollection WHERE fid=103;
+SELECT ST_ASTEXT(ST_INTERSECTION(NULL,NULL));
+SELECT ST_ASTEXT(ST_INTERSECTION(fid,NULL)) FROM gis_geometrycollection WHERE fid=103;
+
+--echo #####################################################################################
+--echo # WL#8579 Spatial Reference Systems
+--echo #####################################################################################
+--echo # SRID 0 (should pass)
+SELECT ST_ASTEXT(ST_INTERSECTION(
+  ST_GEOMFROMTEXT('POINT(0 0)', 0),
+  ST_GEOMFROMTEXT('POINT(0 0)', 0)
+));
+--echo # Projected SRS (should pass)
+SELECT ST_ASTEXT(ST_INTERSECTION(
+  ST_GEOMFROMTEXT('POINT(0 0)', 2000),
+  ST_GEOMFROMTEXT('POINT(0 0)', 2000)
+));
+echo # Geographic SRS (should fail)
+--error ER_NOT_IMPLEMENTED_FOR_GEOGRAPHIC_SRS
+SELECT ST_ASTEXT(ST_INTERSECTION(
+  ST_GEOMFROMTEXT('POINT(0 0)', 4326),
+  ST_GEOMFROMTEXT('POINT(0 0)', 4326)
+));
+
+--echo #####################################################################################
+--echo # Invalid function calls
+--echo #####################################################################################
+--echo # Undefined SRS' in the input geometries should return ER_SRS_NOT_FOUND.
+# Assume SRID 1000000000 is undefined.
+--error ER_SRS_NOT_FOUND
+DO ST_ASTEXT(ST_INTERSECTION(x'40420f00010100000000000000000000000000000000000000',x'40420f00010100000000000000000000000000000000000000'));
+
+--echo # Different SRIDs in the input geometries should return ER_GIS_DIFFERENT_SRIDS.
+--error ER_GIS_DIFFERENT_SRIDS
+DO ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('POINT(0 0)'),ST_GEOMFROMTEXT('POINT(0 1)',4326)));
+--error ER_GIS_DIFFERENT_SRIDS
+DO ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('POINT(0 0)',4145),ST_GEOMFROMTEXT('POINT(0 1)',4326)));
+
+--echo # Not syntactically well-formed geometry input should result in ER_GIS_INVALID_DATA.
+--error ER_GIS_INVALID_DATA
+SELECT ST_ASTEXT(ST_INTERSECTION(fid,ST_GEOMFROMTEXT('POINT(0 0)'))) FROM gis_geometrycollection WHERE fid=103;
+--error ER_GIS_INVALID_DATA
+SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('POINT(0 0)'),fid)) FROM gis_geometrycollection WHERE fid=103;
+
+--echo # Return ER_GEOMETRY_PARAM_(LONGITUDE/LATITUDE)_OUT_OF_RANGE if longitude and latitude values are not
+--echo # within their respective ranges (-180,180] and [-90,90]).
+SET @pt = ST_GeomFromText('POINT(0 0)', 4326);
+
+# SRID=4326, long=0, lat=-91.
+SET @pt_lat_minus_91 = x'E6100000010100000000000000000000000000000000C056C0';
+
+# SRID=4326, long=0, lat=91.
+SET @pt_lat_plus_91 = x'E6100000010100000000000000000000000000000000C05640';
+
+# SRID=4326, long=-181, lat=0.
+SET @pt_long_minus_181 = x'E610000001010000000000000000A066C00000000000000000';
+
+# SRID=4326, long=181, lat=0.
+SET @pt_long_plus_181 = x'E610000001010000000000000000A066400000000000000000';
+
+--error ER_GEOMETRY_PARAM_LATITUDE_OUT_OF_RANGE
+DO ST_INTERSECTION(@pt_lat_minus_91, @pt);
+--error ER_GEOMETRY_PARAM_LATITUDE_OUT_OF_RANGE
+DO ST_INTERSECTION(@pt_lat_plus_91, @pt);
+--error ER_GEOMETRY_PARAM_LONGITUDE_OUT_OF_RANGE
+DO ST_INTERSECTION(@pt_long_minus_181, @pt);
+--error ER_GEOMETRY_PARAM_LONGITUDE_OUT_OF_RANGE
+DO ST_INTERSECTION(@pt_long_plus_181, @pt);
+
+SELECT ST_ASTEXT(ST_INTERSECTION(ST_GEOMFROMTEXT('POLYGON((1 1,2 1,2 2,1 2,1 1))'),ST_GEOMFROMTEXT('POLYGON((0 1,1.5 1,1 2,0 2,0 1))')));
+
+--echo #clean up
+DROP TABLE gis_geometrycollection;
+DROP TABLE gis_geometrycollection_2;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/gis/t/st_symdifference.test mysql-8.0-8.0.27/mysql-test/suite/gis/t/st_symdifference.test
--- mysql-8.0-8.0.26/mysql-test/suite/gis/t/st_symdifference.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/gis/t/st_symdifference.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,121 @@
+###############################################################################
+#                                                                             #
+# This test tests the ST_SymDifference function.                              #
+# ST_SymDifference returns the geometry corresponding to the first geometry   #
+# minus the second geometry.                                                  #
+# The function is defined by OGC standard documents.                          #
+#                                                                             #
+###############################################################################
+
+--echo #####################################################################################
+--echo # Creating a spatial Geometry object
+--echo #####################################################################################
+USE test;
+CREATE TABLE gis_geometrycollection (fid INTEGER NOT NULL PRIMARY KEY, g GEOMETRY);
+# Geometric elements constructing a star
+SET @star_of_elems='MULTIPOLYGON(((5 0,15 5,25 0,22 10,30 15,19 15,5 0)),((19 15,15 25,11 15,19 15)))';
+SET @star_collection_elems='GEOMETRYCOLLECTION(MULTIPOLYGON(((5 0,15 5,25 0,22 10,30 15,19 15,5 0)),((19 15,15 25,11 15,19 15))),POLYGON((5 0,7 10,0 15,10 15,15 25,20 15,30 15,22 10,25 0,15 5,5 0),(10 6,10 10,7 12,13 13,15 18,17 13,21 13,18 10,20 6,15 8,10 6)),MULTILINESTRING((25 0,0 15,15 30,0 5)),LINESTRING(15 25,15 10),MULTIPOINT(5 0,25 0),POINT(15 25))';
+--echo # INSERT star
+INSERT INTO gis_geometrycollection VALUES (103,ST_GEOMFROMTEXT(@star_of_elems));
+CREATE TABLE gis_geometrycollection_2 SELECT fid as fid2,g as g2 FROM gis_geometrycollection;
+--echo # Checking the integrity of the above create/insert statements
+--echo # 1 row.
+SELECT count(g IS NULL) FROM gis_geometrycollection;
+--echo # 1 row.
+SELECT count(g2 IS NULL) FROM gis_geometrycollection_2;
+--echo #####################################################################################
+--echo # Testing ST_SymDifference() with different ways to pass input geometries
+--echo #####################################################################################
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_collection_elems)));
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT('POLYGON((1 1,2 1,2 2,1 2,1 1))')));
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POINT(0 0)'),ST_GEOMFROMTEXT('POLYGON((1 1,2 1,2 2,1 2,1 1))')));
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT(@star_of_elems))) FROM gis_geometrycollection WHERE fid=103;
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,ST_GEOMFROMTEXT('POINT(0 0)'))) FROM gis_geometrycollection WHERE fid=103;
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,g2)) FROM gis_geometrycollection,gis_geometrycollection_2 WHERE fid=103 and fid2=103;
+
+--echo #####################################################################################
+--echo # Verify ST_SymDifference() returns NULL if at least one of its arguments are NULL.
+--echo #####################################################################################
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(@star_of_elems),NULL));
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(NULL,ST_GEOMFROMTEXT(@star_of_elems)));
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(NULL,ST_GEOMFROMTEXT('POINT(0 0)')));
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POINT(0 0)'),NULL));
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(g,NULL)) FROM gis_geometrycollection WHERE fid=103;
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(NULL,NULL));
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(fid,NULL)) FROM gis_geometrycollection WHERE fid=103;
+
+--echo #####################################################################################
+--echo # WL#8579 Spatial Reference Systems
+--echo #####################################################################################
+--echo # SRID 0 (should pass)
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(
+  ST_GEOMFROMTEXT('POINT(0 0)', 0),
+  ST_GEOMFROMTEXT('POINT(0 0)', 0)
+));
+--echo # Projected SRS (should pass)
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(
+  ST_GEOMFROMTEXT('POINT(0 0)', 2000),
+  ST_GEOMFROMTEXT('POINT(0 0)', 2000)
+));
+--echo # Geographic SRS (should pass)
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(
+  ST_GEOMFROMTEXT('POINT(0 0)', 4326),
+  ST_GEOMFROMTEXT('POINT(0 0)', 4326)
+));
+
+--echo #####################################################################################
+--echo # Invalid function calls
+--echo #####################################################################################
+--echo # Undefined SRS' in the input geometries should return ER_SRS_NOT_FOUND.
+# Assume SRID 1000000000 is undefined.
+--error ER_SRS_NOT_FOUND
+DO ST_ASTEXT(ST_SYMDIFFERENCE(x'40420f00010100000000000000000000000000000000000000',x'40420f00010100000000000000000000000000000000000000'));
+
+--echo # Different SRIDs in the input geometries should return ER_GIS_DIFFERENT_SRIDS.
+--error ER_GIS_DIFFERENT_SRIDS
+DO ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POINT(0 0)'),ST_GEOMFROMTEXT('POINT(0 1)',4326)));
+--error ER_GIS_DIFFERENT_SRIDS
+DO ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POINT(0 0)',4145),ST_GEOMFROMTEXT('POINT(0 1)',4326)));
+
+--echo # Not syntactically well-formed geometry input should result in ER_GIS_INVALID_DATA.
+--error ER_GIS_INVALID_DATA
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(fid,ST_GEOMFROMTEXT('POINT(0 0)'))) FROM gis_geometrycollection WHERE fid=103;
+--error ER_GIS_INVALID_DATA
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POINT(0 0)'),fid)) FROM gis_geometrycollection WHERE fid=103;
+
+--echo # Return ER_GEOMETRY_PARAM_(LONGITUDE/LATITUDE)_OUT_OF_RANGE if longitude and latitude values are not
+--echo # within their respective ranges (-180,180] and [-90,90]).
+SET @pt = ST_GeomFromText('POINT(0 0)', 4326);
+
+# SRID=4326, long=0, lat=-91.
+SET @pt_lat_minus_91 = x'E6100000010100000000000000000000000000000000C056C0';
+
+# SRID=4326, long=0, lat=91.
+SET @pt_lat_plus_91 = x'E6100000010100000000000000000000000000000000C05640';
+
+# SRID=4326, long=-181, lat=0.
+SET @pt_long_minus_181 = x'E610000001010000000000000000A066C00000000000000000';
+
+# SRID=4326, long=181, lat=0.
+SET @pt_long_plus_181 = x'E610000001010000000000000000A066400000000000000000';
+
+#--error ER_GEOMETRY_PARAM_LATITUDE_OUT_OF_RANGE
+#DO ST_SYMDIFFERENCE(@pt_lat_minus_91, @pt);
+#--error ER_GEOMETRY_PARAM_LATITUDE_OUT_OF_RANGE
+#DO ST_SYMDIFFERENCE(@pt_lat_plus_91, @pt);
+#--error ER_GEOMETRY_PARAM_LONGITUDE_OUT_OF_RANGE
+#DO ST_SYMDIFFERENCE(@pt_long_minus_181, @pt);
+#--error ER_GEOMETRY_PARAM_LONGITUDE_OUT_OF_RANGE
+#DO ST_SYMDIFFERENCE(@pt_long_plus_181, @pt);
+
+--echo #====================================================================================
+--echo # DIFFERENCE polygon,polygon
+--echo #====================================================================================
+--echo # Cartesian SRS
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POLYGON((1 1,2 1,2 2,1 2,1 1))'),ST_GEOMFROMTEXT('POLYGON((0 1,1.5 1,1 2,0 2,0 1))')));
+--echo # Geographic SRS
+SELECT ST_ASTEXT(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT('POLYGON((1 1,1 2,2 2,2 1,1 1))', 4326),ST_GEOMFROMTEXT('POLYGON((0 1,0 2,1 2,1 1,0 1))', 4326)));
+
+--echo #clean up
+DROP TABLE gis_geometrycollection;
+DROP TABLE gis_geometrycollection_2;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_acf_membership_updates_2groups.inc mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_acf_membership_updates_2groups.inc
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_acf_membership_updates_2groups.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_acf_membership_updates_2groups.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,221 @@
+#
+# Validate that list of senders is updated when a replica has two configured
+# groups
+#
+# Test:
+#   0. The test requires 5 servers:
+#        server1: group A primary
+#        server2: group A secondary
+#        server3: group B primary
+#        server4: group B secondary
+#        server5: single server
+#   1. Deploy a 1 member group A in single primary mode.
+#   2. Deploy a 1 member group B in single primary mode.
+#   3. Configure replica to manage the asynchronous connection
+#      to groups A and B.
+#   4. Create and start the managed channel.
+#   5. Add secondary member to group A and validate is added to list of senders
+#   6. Add secondary member to group B and validate is added to list of senders
+#   7. Remove secondary member from group B and validate is removed from
+#      list of senders
+#   8. Remove secondary member from group A and validate is removed from
+#      list of senders
+#   9. Clean up.
+#
+################################################################################
+
+--source include/big_test.inc
+--source include/have_group_replication_plugin.inc
+--let $rpl_skip_group_replication_start= 1
+--let $rpl_server_count= 5
+--source include/group_replication.inc
+
+--echo
+--echo # 1. Deploy a 1 member group A in single primary mode.
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $server1_uuid= `SELECT @@server_uuid`
+--let $group_replication_group_name= aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa
+--let $group_a= $group_replication_group_name
+--disable_query_log
+--eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_GR_PORT_1,localhost:$SERVER_GR_PORT_2"
+--enable_query_log
+--source include/start_and_bootstrap_group_replication.inc
+
+--echo
+--echo # 2. Deploy a 1 member group B in single primary mode.
+--echo
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--let $server3_uuid= `SELECT @@server_uuid`
+--let $group_replication_group_name= bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb
+--let $group_b= $group_replication_group_name
+--disable_query_log
+if ($have_xcom_stack){
+--eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_GR_PORT_3,localhost:$SERVER_GR_PORT_4"
+}
+if (!$have_xcom_stack){
+--eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_MYPORT_3,localhost:$SERVER_MYPORT_4"
+}
+--enable_query_log
+--source include/start_and_bootstrap_group_replication.inc
+
+--echo
+--echo # 3. Configure replica to manage the asynchronous connection
+--echo #    to groups A and B.
+--echo
+--let $rpl_connection_name= server5
+--source include/rpl_connection.inc
+
+--replace_result $SERVER_MYPORT_1 SERVER_MYPORT_1 $group_a GROUP_A
+--eval SELECT asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', '$group_a', '127.0.0.1', $SERVER_MYPORT_1, '', 90, 70);
+
+--replace_result $SERVER_MYPORT_3 SERVER_MYPORT_3 $group_b GROUP_B
+--eval SELECT asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', '$group_b', '127.0.0.1', $SERVER_MYPORT_3, '', 85, 65);
+
+--let $assert_text= 'There is one row in performance_schema.replication_asynchronous_connection_failover for server1'
+--let $assert_cond= [SELECT  COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover WHERE port=$SERVER_MYPORT_1, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'There is one row in performance_schema.replication_asynchronous_connection_failover for server3'
+--let $assert_cond= [SELECT  COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover WHERE port=$SERVER_MYPORT_3, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'There is one row in performance_schema.replication_asynchronous_connection_failover_managed for group A'
+--let $assert_cond= [SELECT  COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover_managed WHERE managed_name="$group_a", count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'There is one row in performance_schema.replication_asynchronous_connection_failover_managed for group B'
+--let $assert_cond= [SELECT  COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover_managed WHERE managed_name="$group_b", count, 1] = 1
+--source include/assert.inc
+
+--echo
+--echo # 4. Create and start the managed channel.
+--echo
+--let $rpl_connection_name= server5
+--source include/rpl_connection.inc
+--replace_result $SERVER_MYPORT_1 SERVER_1_PORT
+--eval CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=1, SOURCE_PORT=$SERVER_MYPORT_1, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1'
+
+--let $rpl_channel_name='ch1'
+--source include/start_slave.inc
+--let $rpl_channel_name=
+
+--let $assert_text= Verify channel ch1 IO_THREAD is ON and connected to server1
+--let $assert_cond= "[SELECT SERVICE_STATE FROM performance_schema.replication_connection_status WHERE channel_name=\'ch1\' AND source_uuid=\'$server1_uuid\', SERVICE_STATE, 1]" = "ON"
+--source include/assert.inc
+
+--let $wait_condition= SELECT COUNT(*)=2 FROM performance_schema.replication_asynchronous_connection_failover
+--source include/wait_condition.inc
+
+--echo
+--echo # 5. Add secondary member to group A and validate is added to list of senders
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $server2_uuid= `SELECT @@server_uuid`
+--let $group_replication_group_name= $group_a
+--disable_query_log
+if ($have_xcom_stack){
+--eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_GR_PORT_1,localhost:$SERVER_GR_PORT_2"
+}
+
+if (!$have_xcom_stack){
+--eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_MYPORT_1,localhost:$SERVER_MYPORT_2"
+}
+--enable_query_log
+--source include/start_group_replication.inc
+
+--let $rpl_connection_name= server5
+--source include/rpl_connection.inc
+--let $wait_condition= SELECT COUNT(*)=3 FROM performance_schema.replication_asynchronous_connection_failover
+--source include/wait_condition.inc
+
+--echo
+--echo # 6. Add secondary member to group B and validate is added to list of senders
+--echo
+--let $rpl_connection_name= server4
+--source include/rpl_connection.inc
+--let $server4_uuid= `SELECT @@server_uuid`
+--let $group_replication_group_name= $group_b
+--disable_query_log
+if ($have_xcom_stack){
+--eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_GR_PORT_3,localhost:$SERVER_GR_PORT_4"
+}
+if (!$have_xcom_stack){
+--eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_MYPORT_3,localhost:$SERVER_MYPORT_4"
+}
+--enable_query_log
+--source include/start_group_replication.inc
+
+--let $rpl_connection_name= server5
+--source include/rpl_connection.inc
+--let $wait_condition= SELECT COUNT(*)=4 FROM performance_schema.replication_asynchronous_connection_failover
+--source include/wait_condition.inc
+
+--echo
+--echo # 7. Remove secondary member from group B and validate is removed from
+--echo #    list of senders
+--echo
+--let $rpl_connection_name= server4
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_connection_name= server5
+--source include/rpl_connection.inc
+--let $wait_condition= SELECT COUNT(*)=3 FROM performance_schema.replication_asynchronous_connection_failover
+--source include/wait_condition.inc
+
+--echo
+--echo # 8. Remove secondary member from group A and validate is removed from
+--echo #    list of senders
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_connection_name= server5
+--source include/rpl_connection.inc
+--let $wait_condition= SELECT COUNT(*)=2 FROM performance_schema.replication_asynchronous_connection_failover
+--source include/wait_condition.inc
+
+--echo
+--echo # 9. Clean up.
+--echo
+--let $rpl_connection_name= server5
+--source include/rpl_connection.inc
+
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("The source .* for channel 'ch1' has joined the group .*, and so added its entry into replication_asynchronous_connection_failover table.");
+call mtr.add_suppression("The master's UUID has changed, although this should not happen unless you have changed it manually.");
+call mtr.add_suppression("The source .* for channel 'ch1' has left the group .*, and so removed its entry from replication_asynchronous_connection_failover table.");
+call mtr.add_suppression("The group .* for the channel .* has been removed, and so removed its entry from replication_asynchronous_connection_failover_managed and all the group members from replication_asynchronous_connection_failover table.");
+call mtr.add_suppression("The group .* for the channel .* has been added, and so added its entry in replication_asynchronous_connection_failover_managed and source to replication_asynchronous_connection_failover table.");
+SET SESSION sql_log_bin = 1;
+
+--let $rpl_channel_name='ch1'
+--source include/stop_slave.inc
+
+--let $rpl_reset_slave_all= 1
+--let $rpl_multi_source= 1
+--source include/rpl_reset_slave.inc
+--let $rpl_channel_name=
+--let $rpl_reset_slave_all=
+--let $rpl_multi_source=
+
+--replace_result $group_a GROUP_A
+--eval SELECT asynchronous_connection_failover_delete_managed('ch1', '$group_a')
+
+--replace_result $group_b GROUP_B
+--eval SELECT asynchronous_connection_failover_delete_managed('ch1', '$group_b')
+
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_capture.inc mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_capture.inc
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_capture.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_capture.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,78 @@
+################################################################################
+# This test is only checking that capture code does not cause
+# errors, for complete testing it will need to be completed when
+# WL#6826, WL#6833, WL#6834, WL#6842, WL#6829, WL#6855 and WL#7237
+# are finished.
+#
+# Test:
+# 0. The test requires two servers: M1 and M2.
+# 1. With both members ONLINE, create table t1 on M1, create table t2 on M2.
+# 2. On M1, perform some DML operations, create temporary table t3.
+#    On M2, perform DML operation.
+# 3. On M1, check tables and GTID_EXECUTED details.
+# 4. On M2, check tables and GTID_EXECUTED details.
+#    Diff tables t1 and t2 on M1 and M2.
+# 5. Clean up.
+################################################################################
+--let $group_replication_group_name= 8a94f357-aab4-11df-86ab-c80aa9429562
+--source include/have_group_replication_plugin.inc
+--source include/group_replication.inc
+
+--connection server1
+CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
+
+--connection server2
+CREATE TABLE t2 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
+
+--source include/rpl_sync.inc
+
+--connection server1
+BEGIN;
+INSERT INTO t1 VALUES (1);
+INSERT INTO t2 VALUES (2);
+COMMIT;
+
+INSERT INTO t1 VALUES (3);
+
+BEGIN;
+INSERT INTO t1 VALUES (4);
+ROLLBACK;
+
+BEGIN;
+INSERT INTO t1 VALUES (5);
+INSERT INTO t1 VALUES (6);
+COMMIT;
+
+CREATE TEMPORARY TABLE t3 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
+
+--connection server2
+INSERT INTO t1 VALUES (1000);
+
+--source include/rpl_sync.inc
+
+--connection server1
+--echo
+--echo server1
+
+--let $server1_gtid_executed= `SELECT @@GLOBAL.GTID_EXECUTED`
+SHOW TABLES FROM test;
+
+--connection server2
+--echo
+--echo server2
+--let $server2_gtid_executed= `SELECT @@GLOBAL.GTID_EXECUTED`
+SHOW TABLES FROM test;
+
+--let $assert_text= server1 GTID_EXECUTED must be equal to server2 GTID_EXECUTED
+--let $assert_cond= "$server1_gtid_executed" = "$server2_gtid_executed"
+--source include/assert.inc
+
+--let  $diff_tables= server1:test.t1, server2:test.t1
+--source include/diff_tables.inc
+--let  $diff_tables= server1:test.t2, server2:test.t2
+--source include/diff_tables.inc
+--echo
+
+--connection server1
+DROP TABLE t1, t2, t3;
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_change_master_hidden.inc mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_change_master_hidden.inc
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_change_master_hidden.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_change_master_hidden.inc	2021-09-28 11:46:34.000000000 +0000
@@ -17,9 +17,16 @@
 SET sql_log_bin=0;
 CREATE USER 'manish'@'%' IDENTIFIED BY 'unique_password';
 GRANT REPLICATION SLAVE ON *.* TO 'manish'@'%';
+
+CREATE USER 'internal_usr'@'%' IDENTIFIED BY 'unique_password';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'internal_usr'@'%';
 FLUSH PRIVILEGES;
 SET sql_log_bin=1;
 
+--disable_warnings
+CHANGE MASTER TO MASTER_USER='internal_usr', MASTER_PASSWORD='unique_password' FOR CHANNEL 'group_replication_recovery';
+--enable_warnings
+
 SET @old_log_output= @@log_output;
 SET GLOBAL log_output= 'TABLE';
 TRUNCATE mysql.general_log;
@@ -46,17 +53,6 @@
 
 --connection server2
 
-SET sql_log_bin=0;
-call mtr.add_suppression(".*Invalid .* username when attempting to connect to the master server.*");
-call mtr.add_suppression("There was an error when connecting to the donor server");
-call mtr.add_suppression("For details please check performance_schema.replication_connection_status table and error log messages of Slave I/O for channel group_replication_recovery.");
-SET sql_log_bin=1;
-
---disable_query_log
---eval SET GLOBAL group_replication_group_name= "$group_replication_group_name"
---enable_query_log
-START GROUP_REPLICATION;
-
 --let $expected_value_user=`SELECT User_name FROM mysql.slave_master_info WHERE Channel_name LIKE 'group_replication_recovery'`
 --let $expected_value_password=`SELECT User_password FROM mysql.slave_master_info WHERE Channel_name LIKE 'group_replication_recovery'`
 --let $assert_text= The default values of the User_name and User_password are empty without a previous change master.
@@ -69,6 +65,8 @@
 RESET REPLICA ALL FOR CHANNEL 'group_replication_recovery';
 SET sql_log_bin=0;
 DROP USER manish;
+DROP USER internal_usr;
 SET sql_log_bin=1;
 SET @@global.log_output= @old_log_output;
+TRUNCATE TABLE mysql.general_log;
 --source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_clone_integration_basics_with_ssl.inc mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_clone_integration_basics_with_ssl.inc
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_clone_integration_basics_with_ssl.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_clone_integration_basics_with_ssl.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,195 @@
+###############################################################################
+# This test verifies that if the missing transactions on a joining members are
+# above threshold the server will use clone as its recovery strategy with SSL
+#
+# 0. The test requires two servers: M1 and M2.
+# 1. Install the clone plugin on server 1
+# 2. Create a user that requires SSL
+# 3. Bootstrap server1 and add some data
+# 4. Restart server 2 with a monitoring process (mysqld_safe) if needed
+# 5. Install the clone plugin
+#    Setup the server so group replication starts on boot
+# 6. Configure the plugin to use SSL while Cloning
+#    Start group replication on server 2
+#    Wait for it to restart and come back
+#    Check clone was completed
+# 7. Cleanup
+#
+
+--source include/have_mysqld_monitoring_process.inc
+--source include/have_clone_plugin.inc
+--source include/force_restart.inc
+--source include/have_group_replication_plugin.inc
+--let $rpl_skip_group_replication_start= 1
+--source include/group_replication.inc
+
+# Validate plugins
+--let plugins = CLONE_PLUGIN,GROUP_REPLICATION
+--source include/check_plugin_dir.inc
+
+--echo
+--echo ############################################################
+--echo # 1. Install clone plugin on server1.
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--replace_result $CLONE_PLUGIN CLONE_PLUGIN
+--eval INSTALL PLUGIN clone SONAME '$CLONE_PLUGIN'
+
+--echo
+--echo ############################################################
+--echo # 2. Create a user that requires SSL
+
+SET SESSION sql_log_bin=0;
+CREATE USER 'rec_ssl_user'@'%' REQUIRE SSL;
+GRANT replication slave ON *.* TO 'rec_ssl_user'@'%';
+GRANT BACKUP_ADMIN ON *.* TO "rec_ssl_user";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'rec_ssl_user'@'%';
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin=1;
+
+--let $conf_rec_ssl_mode_s1= `SELECT @@GLOBAL.group_replication_ssl_mode;`
+--eval SET GLOBAL group_replication_ssl_mode= REQUIRED
+
+--disable_warnings
+CHANGE REPLICATION SOURCE TO SOURCE_USER="rec_ssl_user" FOR CHANNEL "group_replication_recovery";
+--enable_warnings
+
+--echo
+--echo ############################################################
+--echo # 3. Bootstrap server1 and add some data
+
+--source include/start_and_bootstrap_group_replication.inc
+
+CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1);
+INSERT INTO t1 VALUES (2);
+
+--echo
+--echo #######################################################################
+--echo # 4. Restart server 2 with a monitoring process (mysqld_safe) if needed
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+SET SESSION sql_log_bin=0;
+CREATE USER 'rec_ssl_user'@'%' REQUIRE SSL;
+GRANT replication slave ON *.* TO 'rec_ssl_user'@'%';
+GRANT BACKUP_ADMIN ON *.* TO "rec_ssl_user";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'rec_ssl_user'@'%';
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin=1;
+
+--let $conf_rec_ssl_mode_s2= `SELECT @@GLOBAL.group_replication_ssl_mode;`
+--eval SET GLOBAL group_replication_ssl_mode= REQUIRED
+
+--let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
+--let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $_group_replication_comm_stack= `SELECT @@GLOBAL.group_replication_communication_stack`
+--let $_group_replication_ssl_mode= `SELECT @@GLOBAL.group_replication_ssl_mode`
+
+--let $plugin_list= $GROUP_REPLICATION
+--source include/spawn_monitoring_process.inc
+
+--echo
+--echo ############################################################
+--echo # 5. Setup the server so group replication starts on boot
+
+--disable_query_log
+--eval SET PERSIST group_replication_group_name= "$group_replication_group_name"
+--eval SET PERSIST group_replication_local_address= "$_group_replication_local_address"
+--eval SET PERSIST group_replication_group_seeds= "$_group_replication_group_seeds"
+--eval SET PERSIST group_replication_communication_stack= "$_group_replication_comm_stack"
+--eval SET PERSIST group_replication_ssl_mode= "$_group_replication_ssl_mode"
+
+SET PERSIST group_replication_start_on_boot= ON;
+
+# Configure also SSL settings
+
+--eval SET PERSIST group_replication_recovery_use_ssl=1
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--eval SET PERSIST group_replication_recovery_ssl_ca= '$MYSQL_TEST_DIR/std_data/cacert.pem'
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--eval SET PERSIST group_replication_recovery_ssl_cert= '$MYSQL_TEST_DIR/std_data/client-cert.pem'
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--eval SET PERSIST group_replication_recovery_ssl_key= '$MYSQL_TEST_DIR/std_data/client-key.pem'
+--enable_query_log
+
+--replace_result $CLONE_PLUGIN CLONE_PLUGIN
+--eval INSTALL PLUGIN clone SONAME '$CLONE_PLUGIN'
+
+--echo
+--echo ############################################################
+--echo # 6. Configure the plugin to use SSL while Cloning
+--echo #    Start group replication on server 2
+--echo #    Wait for it to restart and come back
+--echo #    Check clone was completed
+
+--disable_warnings
+CHANGE REPLICATION SOURCE TO SOURCE_USER="rec_ssl_user" FOR CHANNEL "group_replication_recovery";
+--enable_warnings
+
+--let $_group_replication_threshold_save= `SELECT @@GLOBAL.group_replication_clone_threshold`
+SET GLOBAL group_replication_clone_threshold= 1;
+
+START GROUP_REPLICATION;
+
+--source include/wait_until_disconnected.inc
+
+--let $rpl_server_number= 2
+--source include/rpl_reconnect.inc
+
+--let $group_replication_member_state=ONLINE
+--source include/gr_wait_for_member_state.inc
+
+--let $assert_text= Clone must be completed
+--let $assert_cond= [SELECT state="Completed" FROM performance_schema.clone_status] = 1;
+--source include/assert.inc
+
+# See if the data has been properly cloned in server2
+--let $diff_tables=server1:test.t1 ,server2:test.t1
+--source include/diff_tables.inc
+
+--echo
+--echo ############################################################
+--echo # 7. Cleanup
+
+--eval SET GLOBAL group_replication_clone_threshold= $_group_replication_threshold_save;
+
+RESET PERSIST IF EXISTS group_replication_group_name;
+RESET PERSIST IF EXISTS group_replication_local_address;
+RESET PERSIST IF EXISTS group_replication_group_seeds;
+RESET PERSIST IF EXISTS group_replication_start_on_boot;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
+RESET PERSIST IF EXISTS group_replication_ssl_mode;
+
+RESET PERSIST IF EXISTS group_replication_recovery_use_ssl;
+RESET PERSIST IF EXISTS group_replication_recovery_ssl_ca;
+RESET PERSIST IF EXISTS group_replication_recovery_ssl_cert;
+RESET PERSIST IF EXISTS group_replication_recovery_ssl_key;
+
+--disable_query_log
+--eval SET GLOBAL group_replication_ssl_mode= $conf_rec_ssl_mode_s2
+--enable_query_log
+
+DROP TABLE t1;
+
+--source include/rpl_sync.inc
+
+set session sql_log_bin=0;
+call mtr.add_suppression("This member will start distributed recovery using clone. It is due to the number of missing transactions being higher than the configured threshold of*");
+call mtr.add_suppression("Clone removing all user data for provisioning: Started");
+call mtr.add_suppression("Clone removing all user data for provisioning: Finished");
+set session sql_log_bin=1;
+
+--source include/clean_monitoring_process.inc
+
+--connection server1
+--echo server1
+
+--disable_query_log
+--eval SET GLOBAL group_replication_ssl_mode= $conf_rec_ssl_mode_s1
+--enable_query_log
+
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_consistent_reads_primary_failover.inc mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_consistent_reads_primary_failover.inc
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_consistent_reads_primary_failover.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_consistent_reads_primary_failover.inc	2021-09-28 11:46:34.000000000 +0000
@@ -53,11 +53,13 @@
 
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
+
 --source include/start_group_replication.inc
 --let $member2_uuid= query_get_value(SELECT @@SERVER_UUID, @@SERVER_UUID, 1)
 
 --let $rpl_connection_name= server3
 --source include/rpl_connection.inc
+
 --source include/start_group_replication.inc
 
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_consistent_statement_hold.inc mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_consistent_statement_hold.inc
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_consistent_statement_hold.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_consistent_statement_hold.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,62 @@
+################################################################################
+# Validate that a given statement goes through the `trans_begin` hook on Group
+# Replication on server1.
+#
+# ==== Usage ====
+#
+# --let $statement_to_hold= STATEMENT
+#
+#
+# Parameters:
+#
+#   $statement_to_hold
+#     The statement to be validated.
+#
+################################################################################
+
+if (!$statement_to_hold)
+{
+  --die "Missing argument 'statement_to_hold'"
+}
+
+--echo
+--echo # Instrument GR to hold the statement on
+--echo # `trans_begin` hook on server1.
+--let $rpl_connection_name= server_1
+--source include/rpl_connection.inc
+--let $debug_point= group_replication_wait_on_observer_trans
+--source include/add_debug_point.inc
+
+--echo
+--echo # Execute the statement on server1.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--send_eval $statement_to_hold
+
+--echo
+--echo # Validate that the statement went on
+--echo # `trans_begin` hook on server1.
+--let $rpl_connection_name= server_1
+--source include/rpl_connection.inc
+SET DEBUG_SYNC= "now WAIT_FOR signal.group_replication_wait_on_observer_trans_waiting";
+
+--echo
+--echo # Release the statement from
+--echo # `trans_begin` hook on server1.
+SET DEBUG_SYNC= 'now SIGNAL signal.group_replication_wait_on_observer_trans_continue';
+
+--echo
+--echo # Reap the statement on server1.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--disable_result_log
+--reap
+--enable_result_log
+
+--echo
+--echo # Remove GR instrumentaion to hold the statement on
+--echo # `trans_begin` hook on server1.
+--let $rpl_connection_name= server_1
+--source include/rpl_connection.inc
+--let $debug_point= group_replication_wait_on_observer_trans
+--source include/remove_debug_point.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_crash_donor_server.inc mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_crash_donor_server.inc
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_crash_donor_server.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_crash_donor_server.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,214 @@
+################################################################################
+# This test verifies whether the group_replication works fine if the
+# donor server is killed when the joiner is already on recovery phase-2.
+#
+# Test:
+# 0. The test requires three servers: M1,M2 and M3.
+# 1. Start GR on servers M1 and M2.
+# 2. Execute some operations on the group through server M1
+#    using procedure dml_operations.
+# 3. Join M3 to the group and wait until the server is in Recovery.
+# 4. Identify the donor server for M3.
+# 5. perform the transactions on the group.
+# 6. Wait until recovery phase-1 on M3 ends.
+# 7. Kill and restart the donor server during phase-2 of M3 recovery.
+# 8.Wait until all the members are online.
+# 9.Verify that all the members have same data.
+# 10.Cleanup
+################################################################################
+
+# This test does crashes servers, thence we skip it on valgrind.
+--source include/not_valgrind.inc
+--source include/big_test.inc
+--source include/force_restart.inc
+
+--source include/set_privilege_checks_user_as_system_user.inc
+--source include/have_group_replication_plugin.inc
+--let $rpl_server_count= 3
+--let $rpl_skip_group_replication_start= 1
+--source include/group_replication.inc
+
+# START GR on Two servers M1 and M2
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+SET sql_log_bin=0;
+CREATE TABLE t1(a int primary key);
+SET sql_log_bin=1;
+
+# Extract the server_uuid
+--let $server1_uuid= query_get_value(SELECT @@SERVER_UUID, @@SERVER_UUID, 1)
+
+--source include/start_and_bootstrap_group_replication.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+SET sql_log_bin=0;
+CREATE TABLE t1(a int primary key);
+SET sql_log_bin=1;
+
+# Extract the server_uuid
+--let $server2_uuid= query_get_value(SELECT @@SERVER_UUID, @@SERVER_UUID, 1)
+
+--source include/start_group_replication.inc
+
+# Perform the transactions on group through server1 so
+# that when M3 joins it will be in recovery for some time.
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+# Create the procedure to perform dml operations
+delimiter $$;
+CREATE PROCEDURE dml_operations()
+     BEGIN
+     declare x INT;
+     set x=1;
+     while x<100 do
+     insert into t1 values (x);
+     update t1 set a=x+200 where a=x;
+     delete from t1 where a<250;
+     set x=x+1;
+     end  while;
+     end$$
+delimiter ;$$
+--echo
+
+--echo ----call procedure----
+call dml_operations();
+--echo
+
+# Wait for the data to get synced on server2
+--source include/rpl_sync.inc
+
+# JOIN M3 to the group
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+
+SET sql_log_bin=0;
+CREATE TABLE t1(a int primary key);
+SET sql_log_bin=1;
+LOCK TABLES t1 READ;
+
+--let $rpl_connection_name= server_3
+--source include/rpl_connection.inc
+
+SET SESSION sql_log_bin= 0;
+call mtr.add_suppression("There was an error when connecting to the donor server.*");
+call mtr.add_suppression("For details please check performance_schema.replication_connection_status table and error log messages of Slave I/O for channel group_replication_recovery.");
+call mtr.add_suppression("Slave I/O for channel 'group_replication_recovery': Master command COM_REGISTER_SLAVE failed: failed registering on master, reconnecting to try again.*");
+SET SESSION sql_log_bin= 1;
+
+--let $group_replication_start_member_state= RECOVERING
+--source include/start_group_replication.inc
+
+# Identify the donor_server for M3
+
+--let $wait_timeout= 100
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_connection_status WHERE channel_name='group_replication_recovery' AND service_state='ON'
+--source include/wait_condition.inc
+
+let $donor_id= 1;
+let $other_id= 2;
+
+if(`SELECT COUNT(*)=1 FROM performance_schema.replication_connection_status WHERE channel_name='group_replication_recovery' AND service_state='ON' AND source_uuid='$server2_uuid'`)
+{
+  let $donor_id= 2;
+  let $other_id= 1;
+}
+
+# Connect to server which is neither M3 nor the donor server and
+# Create procedure to perform dml operations and call it using send.
+# So that these operations gets executed while server M3 is in recovery.
+
+--let $rpl_connection_silent= 1
+--let $rpl_connection_name= server$other_id
+--source include/rpl_connection.inc
+# Create the procedure to perform dml operations
+delimiter $$;
+CREATE PROCEDURE dml_operations_2()
+     BEGIN
+     declare x INT;
+     set x=100;
+     while x<200 do
+     insert into t1 values (x);
+     update t1 set a=x+200 where a=x;
+     delete from t1 where a<320;
+     set x=x+1;
+     end  while;
+     end$$
+delimiter ;$$
+--echo
+
+--echo ----call procedure----
+send call dml_operations_2();
+--echo
+
+# Wait until Recovery phase1 ends.(until the service_state of group_replication_recovery goes to OFF state.)
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+UNLOCK TABLES;
+--let $wait_timeout=200
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_connection_status WHERE channel_name='group_replication_recovery' AND service_state='OFF';
+--source include/wait_condition.inc
+
+# Kill the donor server during phase 2 of M3's recovery
+--let $rpl_connection_name= server$donor_id
+--source include/rpl_connection.inc
+
+SET sql_log_bin=0;
+call mtr.add_suppression(".*Slave SQL for channel 'group_replication_applier': ... The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state*");
+SET sql_log_bin=1;
+
+# kill donor server
+--echo # killing
+--let $group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
+--let $group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $restart_parameters=restart:--group_replication_local_address=$group_replication_local_address --group_replication_group_seeds=$group_replication_group_seeds --group_replication_group_name=$group_replication_group_name
+--replace_result $group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--source include/kill_and_restart_mysqld.inc
+--echo # restarting
+
+# Needed as we are not using rpl_restart_server.inc
+--let $rpl_server_number= $donor_id
+--source include/rpl_reconnect.inc
+
+--let $rpl_connection_name= server$other_id
+--source include/rpl_connection.inc
+reap;
+# Wait until group has only 2 members, that is, donor server's death is detected by
+# the group.
+--echo # check that there are 2 mebers in the group
+--let $group_replication_number_of_members= 2
+--source include/gr_wait_for_number_of_members.inc
+
+--sleep 5
+
+# Start GR on killed and restarted donor server and wait until all the servers are ONLINE.
+# Start GR on donor server
+--let $rpl_connection_name= server$donor_id
+--source include/rpl_connection.inc
+
+--let $wait_timeout= 200
+--source include/start_group_replication.inc
+
+--let $rpl_connection_name= server$other_id
+--source include/rpl_connection.inc
+
+--let $wait_timeout= 200
+--let $wait_condition= SELECT COUNT(*) = 3 FROM performance_schema.replication_group_members where MEMBER_STATE='ONLINE';
+--source include/wait_condition.inc
+
+--source include/rpl_sync.inc
+
+# Verify that table t1 has same data on all the servers.
+--let $diff_tables=server1:t1, server2:t1, server3:t1
+--source include/diff_tables.inc
+
+# Clean up.
+drop table t1;
+drop procedure dml_operations;
+drop procedure dml_operations_2;
+--let $skip_restore_connection= 0
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_delayed_view_change_uuid_local_commit.inc mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_delayed_view_change_uuid_local_commit.inc
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_delayed_view_change_uuid_local_commit.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_delayed_view_change_uuid_local_commit.inc	2021-09-28 11:46:34.000000000 +0000
@@ -55,8 +55,8 @@
 --echo
 --echo ############################################################
 --echo #  2. Start 2 servers.
---echo #     Only setup recovery_user on server2 for force server3
---echo #     to recover from it.
+--echo #     Only setup recovery_user with GRANT REPLICATION SLAVE on server2
+--echo #     for force server3 to recover from it.
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
 
@@ -64,6 +64,12 @@
 --source include/gtid_utils.inc
 SET sql_log_bin = 1;
 
+SET SESSION sql_log_bin= 0;
+--eval CREATE USER "$recovery_user" IDENTIFIED BY "$recovery_password"
+--eval GRANT GROUP_REPLICATION_STREAM ON *.* TO "$recovery_user"
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
+
 SET @group_replication_view_change_uuid_save= @@GLOBAL.group_replication_view_change_uuid;
 --eval SET @@GLOBAL.group_replication_view_change_uuid = "$view_change_uuid"
 
@@ -82,6 +88,7 @@
 SET SESSION sql_log_bin= 0;
 --eval CREATE USER "$recovery_user" IDENTIFIED BY "$recovery_password"
 --eval GRANT REPLICATION SLAVE ON *.* TO "$recovery_user"
+--eval GRANT GROUP_REPLICATION_STREAM ON *.* TO "$recovery_user"
 FLUSH PRIVILEGES;
 SET SESSION sql_log_bin= 1;
 
@@ -117,10 +124,19 @@
 SET sql_log_bin = 1;
 
 SET SESSION sql_log_bin= 0;
+call mtr.add_suppression("Slave I/O for channel 'group_replication_recovery': Master command COM_REGISTER_SLAVE failed*");
+call mtr.add_suppression("Slave I/O thread couldn't register on master*");
 call mtr.add_suppression("There was an error when connecting to the donor server.*");
 call mtr.add_suppression("For details please check performance_schema.replication_connection_status table and error log messages of Slave I/O for channel group_replication_recovery.");
 SET SESSION sql_log_bin= 1;
 
+SET SESSION sql_log_bin= 0;
+--eval CREATE USER "$recovery_user" IDENTIFIED BY "$recovery_password"
+--eval GRANT REPLICATION SLAVE ON *.* TO "$recovery_user"
+--eval GRANT GROUP_REPLICATION_STREAM ON *.* TO "$recovery_user"
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
+
 --disable_warnings
 --eval CHANGE REPLICATION SOURCE TO SOURCE_USER= '$recovery_user', SOURCE_PASSWORD= '$recovery_password' FOR CHANNEL 'group_replication_recovery'
 --enable_warnings
@@ -357,6 +373,10 @@
 --source include/stop_group_replication.inc
 SET @@GLOBAL.group_replication_view_change_uuid= @group_replication_view_change_uuid_save;
 
+SET SESSION sql_log_bin= 0;
+--eval DROP USER "$recovery_user"
+SET SESSION sql_log_bin= 1;
+
 SET sql_log_bin = 0;
 --source include/gtid_utils_end.inc
 SET sql_log_bin = 1;
@@ -367,8 +387,13 @@
 --source include/stop_group_replication.inc
 SET @@GLOBAL.group_replication_view_change_uuid= @group_replication_view_change_uuid_save;
 
+SET SESSION sql_log_bin= 0;
+--eval DROP USER "$recovery_user"
+SET SESSION sql_log_bin= 1;
+
 SET sql_log_bin = 0;
 --source include/gtid_utils_end.inc
 SET sql_log_bin = 1;
 
 --source include/group_replication_end.inc
+
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_exit_state_action_on_member_expel.inc mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_exit_state_action_on_member_expel.inc
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_exit_state_action_on_member_expel.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_exit_state_action_on_member_expel.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,175 @@
+###############################################################################
+#
+# group_replication_exit_state_action sysvar specifies which action is taken by
+# a server once it has involuntarily left the group. Currently there are only
+# two actions: either the server continues running but with super_read_only
+# enabled (READ_ONLY) or it aborts (ABORT_SERVER).
+#
+# In order to verify the expected behaviour, this test shall test that the
+# specified exit action is executed correctly after an expel by the other
+# members of the group.
+#
+# Test:
+# 0) Setup group of 3 members (M1, M2 and M3).
+# 1) Force expel of member 1.
+# 1.1) Verify that member 1 went to super_read_only mode.
+# 2) Relaunch member 1 with exit state action to ABORT_SERVER.
+# 3) Force expel again of member 1.
+# 3.1) Verify that member 1 aborted.
+# 4) Relaunch member 1.
+# 5) Cleanup.
+#
+################################################################################
+# Test involves sending SIGSTOP and SIGCONT signals using kill Linux command.
+--source include/linux.inc
+--source include/big_test.inc
+--source include/have_group_replication_plugin.inc
+
+--echo
+--echo #########################################################################
+--echo # 0) Setup group of 3 members (M1, M2 and M3).
+--echo #########################################################################
+--echo
+--let $rpl_server_count= 3
+--source include/group_replication.inc
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+SET SESSION sql_log_bin = 0;
+CREATE TABLE pid_table(pid_no INT PRIMARY KEY);
+--let $pid_file=`SELECT @@pid_file`
+--replace_result $pid_file pid_file
+--eval LOAD DATA LOCAL INFILE '$pid_file' INTO TABLE pid_table
+--let $server_pid=`SELECT pid_no FROM pid_table`
+DROP TABLE pid_table;
+
+# Supress log errors since they are expected.
+call mtr.add_suppression("Member was expelled from the group due to network failures, changing member status to ERROR.");
+call mtr.add_suppression("The server was automatically set into read only mode after an error was detected.");
+call mtr.add_suppression("Skipping leave operation: concurrent attempt to leave the group is on-going.");
+call mtr.add_suppression("The plugin encountered a critical error and will abort: Member was expelled from the group due to network failures.");
+call mtr.add_suppression("Error, maximum number of retries exceeded when waiting for the internal server session state to be operating");
+call mtr.add_suppression("Failed to establish an internal server connection to execute plugin operations");
+call mtr.add_suppression("Unable to confirm whether the server has left the group or not.*");
+call mtr.add_suppression(".* read failed");
+call mtr.add_suppression("\\[GCS\\] Unable to resolve peer address.");
+SET SESSION sql_log_bin = 1;
+
+--let $member1_uuid= `SELECT @@GLOBAL.server_uuid`
+--let $local_address_server1= `SELECT @@GLOBAL.group_replication_local_address`
+--let $group_seeds_server1= `SELECT @@GLOBAL.group_replication_group_seeds`
+
+
+--echo
+--echo #########################################################################
+--echo # 1) Force expel of member 1.
+--echo #########################################################################
+--echo
+# Then we send a SIGSTOP to it. This will stop the server from sending the
+# keep-alive message and thus it will be viewed as a faulty node by the rest of
+# the group (and consequently expelled).
+--exec kill -19 $server_pid
+
+# Wait until the group settles on 2 members
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $group_replication_number_of_members= 2
+--source include/gr_wait_for_number_of_members.inc
+
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--let $group_replication_number_of_members= 2
+--source include/gr_wait_for_number_of_members.inc
+
+--echo
+--echo #########################################################################
+--echo # 1.1) Verify that member 1 went to super_read_only mode.
+--echo #########################################################################
+--echo
+# Send SIGCONT to server, so it can continue (now that he is expelled)
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--exec kill -18 $server_pid
+
+# Verify that the member entered an error state
+--let $group_replication_member_state= ERROR
+--let $group_replication_member_id= $member1_uuid
+--source include/gr_wait_for_member_state.inc
+
+# Then verify that it enabled super_read_only
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $assert_text= super_read_only should be enabled
+--let $assert_cond= [SELECT @@GLOBAL.super_read_only] = 1;
+--source include/assert.inc
+--source include/stop_group_replication.inc
+
+--echo
+--echo #########################################################################
+--echo # 2) Set exit state action to ABORT_SERVER on member 1.
+--echo #########################################################################
+--echo
+# Set the exit state action sysvar to ABORT_SERVER
+SET @@GLOBAL.group_replication_exit_state_action = ABORT_SERVER;
+--source include/start_group_replication.inc
+--let $group_replication_number_of_members = 3
+--source include/gr_wait_for_number_of_members.inc
+
+--echo
+--echo #########################################################################
+--echo # 3) Force expel again of member 1.
+--echo #########################################################################
+--echo
+# Inform MTR that we are expecting an abort and that it should wait before
+# restarting the aborting member
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+# Send SIGSTOP again
+--exec kill -19 $server_pid
+# Wait until the group settles on 2 members
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $group_replication_number_of_members= 2
+--source include/gr_wait_for_number_of_members.inc
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--let $group_replication_number_of_members= 2
+--source include/gr_wait_for_number_of_members.inc
+
+--echo
+--echo #########################################################################
+--echo # 3.1) Wait until server is aborted.
+--echo #########################################################################
+--echo
+# Send SIGCONT to server, so it can continue (now that he is expelled)
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--exec kill -18 $server_pid
+# Wait until the connection is dropped
+--source include/wait_until_disconnected.inc
+
+--echo
+--echo #########################################################################
+--echo # 4) Relaunch member 1.
+--echo #########################################################################
+--echo
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--let $rpl_server_number= 1
+--source include/rpl_reconnect.inc
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--replace_result $group_seeds_server1 GROUP_SEEDS_SERVER1
+--eval SET @@global.group_replication_group_seeds="$group_seeds_server1"
+--replace_result $local_address_server1 LOCAL_ADDRESS_SERVER1
+--eval SET @@global.group_replication_local_address="$local_address_server1"
+--source include/start_group_replication.inc
+# Wait for member to stabilize in the group
+--let $group_replication_number_of_members = 3
+--source include/gr_wait_for_number_of_members.inc
+
+--echo
+--echo #########################################################################
+--echo # 5) Cleanup.
+--echo #########################################################################
+--echo
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_gcs_psi_threads.inc mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_gcs_psi_threads.inc
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_gcs_psi_threads.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_gcs_psi_threads.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,81 @@
+################################################################################
+# Verify that entries corresponding to the GCS performance schema instrumented
+# threads are in the threads table only during the execution of the
+# group replication plugin.
+#
+# Test:
+# 0. The test requires one Server: M1
+# 1. Verify that no entries corresponding to the instrumented GCS threads are
+#    in the threads table.
+# 2. Start GR on M1.
+# 3. Verify that the entries corresponding to the instrumented GCS threads are
+#    in the threads table.
+# 4. Stop GR on M1.
+# 5. Verify that no entries corresponding to the instrumented GCS threads
+#    remain in the threads table.
+# 6. Test end.
+################################################################################
+
+--source include/have_group_replication_plugin.inc
+--let $rpl_skip_group_replication_start= 1
+--source include/group_replication.inc
+
+--echo
+--echo ############################################################
+--echo # 1. Verify that the entries corresponding to the
+--echo #    instrumented GCS threads are not in the threads
+--echo #    table immediately after plugin installation
+--echo #    (before starting the GR).
+--connection server1
+--sorted_result
+SELECT * FROM performance_schema.threads WHERE NAME LIKE '%THD_Gcs_%';
+--let $assert_text= 'There should be no GCS instrumented threads entries in the threads table before starting the GR'
+--let $assert_cond= COUNT(*) = 0 FROM performance_schema.threads WHERE NAME LIKE "%THD_Gcs_%"
+--source include/assert.inc
+
+--echo
+--echo ############################################################
+--echo # 2. Start the GR
+--source include/start_and_bootstrap_group_replication.inc
+
+let $have_xcom_stack= `SELECT @@group_replication_communication_stack LIKE 'XCOM'`;
+--let $rpl_gcs_number_of_threads=
+if ($have_xcom_stack)
+{
+  --let $rpl_gcs_number_of_threads= 4
+}
+if (!$have_xcom_stack)
+{
+  --let $rpl_gcs_number_of_threads= 4
+}
+
+--echo
+--echo ############################################################
+--echo # 3. Verify that the entries corresponding to the
+--echo #    instrumented GCS threads are in the threads table
+--echo #    after starting the GR.
+--sorted_result
+--let $assert_text= 'There should be $rpl_gcs_number_of_threads GCS instrumented thread entries in the threads table after starting the GR'
+--let $assert_cond= COUNT(*) = $rpl_gcs_number_of_threads FROM performance_schema.threads WHERE NAME LIKE "%THD_Gcs_%"
+--source include/assert.inc
+
+--echo
+--echo ############################################################
+--echo # 4. Stop the GR
+--source include/stop_group_replication.inc
+
+--echo
+--echo ############################################################
+--echo # 5. Verify that no entries corresponding to the
+--echo #    instrumented GCS threads remain in the threads table
+--echo #    after stopping the GR.
+--sorted_result
+SELECT * FROM performance_schema.threads WHERE NAME LIKE '%THD_Gcs_%';
+--let $assert_text= 'There should be no extra psi keys added after starting the GR'
+--let $assert_cond= COUNT(*) = 0 FROM performance_schema.threads WHERE NAME LIKE "%THD_Gcs_%"
+--source include/assert.inc
+
+--echo
+--echo ############################################################
+--echo # 6. Test end.
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_majority_loss_restart.inc mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_majority_loss_restart.inc
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_majority_loss_restart.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_majority_loss_restart.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,195 @@
+################################################################################
+# Validate that when a group looses the majority, if the faulty member tries to
+# rejoin it will be disallowed to unblock the group and user needs to use
+# group_replication_force_members option.
+#
+# 0. Start with 2 servers running GR
+# 1. Crash server 2.
+# 2. Execute a transaction on server 1, which will block
+#    since the group does not have majority.
+# 3. Assert that group is still blocked.
+# 4. Restart server 2 with group_replication_start_on_boot=ON,
+#    server 2 will be refused to join the group.
+# 5. Unblock group with server1 as a single member.
+# 6. Check that statement did unblock and was applied on
+#    server1.
+# 7. Rejoin server2
+# 8. Execute a transaction on both members.
+# 9. Validate data.
+#10. Clean up.
+################################################################################
+# This test does crashes servers, thence we skip it on valgrind.
+--source include/not_valgrind.inc
+--source include/big_test.inc
+--source include/force_restart.inc
+--source include/have_group_replication_plugin.inc
+--source include/group_replication.inc
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $member1_uuid= query_get_value(SELECT @@SERVER_UUID, @@SERVER_UUID, 1)
+--let $member1_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $member2_uuid= query_get_value(SELECT @@SERVER_UUID, @@SERVER_UUID, 1)
+--let $member2_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
+--let $member2_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
+
+SET SESSION sql_log_bin= 0;
+call mtr.add_suppression("Timeout on wait for view after joining group");
+call mtr.add_suppression("read failed");
+call mtr.add_suppression("The member was unable to join the group. Local port: *.*");
+call mtr.add_suppression("Error connecting to all peers. Member join failed. Local port: *.*");
+SET SESSION sql_log_bin= 1;
+
+
+--echo
+--echo ############################################################
+--echo # 1. Crash server 2.
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--enable_reconnect
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.2.expect
+--shutdown_server 0
+--source include/wait_until_disconnected.inc
+--source include/wait_until_connected_again.inc
+--disable_reconnect
+--source include/rpl_reconnect.inc
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--let $group_replication_member_state= UNREACHABLE
+--let $group_replication_member_id= $member2_uuid
+--source include/gr_wait_for_member_state.inc
+
+
+--echo
+--echo ############################################################
+--echo # 2. Execute a transaction on server 1, which will block
+--echo #    since the group does not have majority.
+--let $rpl_connection_name= server_1
+--source include/rpl_connection.inc
+# This transaction will be blocked since group lost its majority.
+# Though it needs to be delivered to the group when unblocked.
+--send CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY)
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $wait_condition= SELECT PROCESSLIST_STATE="waiting for handler commit" FROM performance_schema.threads WHERE processlist_INFO LIKE "CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY)"
+--source include/wait_condition.inc
+
+
+--echo
+--echo ############################################################
+--echo # 3. Assert that group is still blocked.
+--let $group_replication_number_of_members= 2
+--source include/gr_wait_for_number_of_members.inc
+
+--let $assert_text= server 2 is marked as unreachable
+--let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_group_members WHERE member_id="$member2_uuid" AND member_state="UNREACHABLE"] = 1
+--source include/assert.inc
+
+
+--echo
+--echo ############################################################
+--echo # 4. Restart server 2 with group_replication_start_on_boot=ON,
+--echo #    server 2 will be refused to join the group.
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $restart_parameters=restart:--group_replication_local_address=$member2_group_replication_local_address --group_replication_group_seeds=$member2_group_replication_group_seeds --group_replication_start_on_boot=ON --group-replication-group-name=$group_replication_group_name
+--replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $member2_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $member2_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--source include/kill_and_restart_mysqld.inc
+
+# Give it some time to try and fail
+--sleep 75
+
+--let $rpl_server_number= 2
+--source include/rpl_reconnect.inc
+--let $group_replication_member_state= OFFLINE
+--source include/gr_wait_for_member_state.inc
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $assert_text= server 2 is marked as unreachable
+--let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_group_members WHERE member_id="$member2_uuid" AND member_state="UNREACHABLE"] = 1
+--source include/assert.inc
+
+
+--echo
+--echo ############################################################
+--echo # 5. Unblock group with server1 as a single member.
+--let $local_address_server1= `SELECT @@GLOBAL.group_replication_local_address`
+--replace_result $local_address_server1 SERVER1_ADDRESS
+--eval SET GLOBAL group_replication_force_members= "$local_address_server1"
+
+
+--echo
+--echo ############################################################
+--echo # 6. Check that statement did unblock and was applied on
+--echo #    server1.
+--let $rpl_connection_name= server_1
+--source include/rpl_connection.inc
+--reap
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $wait_condition= SELECT COUNT(*)=1 FROM information_schema.tables WHERE TABLE_SCHEMA="test" AND TABLE_NAME="t1";
+--source include/wait_condition.inc
+
+
+--echo
+--echo ############################################################
+--echo # 7. Rejoin server2
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+# Ensure that GR is already stopped on server2.
+--let $skip_assert_read_only= 1
+--source include/stop_group_replication.inc
+--source include/start_group_replication.inc
+
+
+--echo
+--echo ############################################################
+--echo # 8. Execute a transaction on both members.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+INSERT INTO t1 VALUES (1);
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+INSERT INTO t1 VALUES (2);
+
+--source include/rpl_sync.inc
+
+
+--echo
+--echo ############################################################
+--echo # 9. Validate data.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $assert_text= 'There are two values in table t1'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM t1, count, 1] = 2
+--source include/assert.inc
+--source include/show_binlog_events.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $assert_text= 'There are two values in table t1'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM t1, count, 1] = 2
+--source include/assert.inc
+
+--let $binlog_file= LAST
+--source include/show_binlog_events.inc
+
+--let $diff_tables= server1:test.t1, server2:test.t1
+--source include/diff_tables.inc
+
+
+--echo
+--echo ############################################################
+--echo # 10. Clean up.
+DROP TABLE t1;
+
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_psi_keys.inc mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_psi_keys.inc
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_psi_keys.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_psi_keys.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,53 @@
+################################################################################
+# Verify that performance schema keys are available in instrument table
+# immediately after plugin installation.
+#
+# Test:
+# 0. The test requires one Server: M1
+# 1. Verify that performance schema keys are available in instrument table
+#    immediately after plugin installation (before starting the GR).
+# 2. Start GR on M1
+# 3. Verify that there are no extra psi keys that were added after starting
+#    the GR
+# 4. Verify that performance_schema.threads list the usual
+#    threads after member is ONLINE.
+# 5. Test end.
+################################################################################
+
+--source include/have_group_replication_plugin.inc
+--let $rpl_skip_group_replication_start= 1
+--source include/group_replication.inc
+
+--echo
+--echo ############################################################
+--echo # 1. verify that performance schema keys are available in instrument
+--echo #    table immediately after plugin installation
+--echo #    (before starting the GR).
+--connection server1
+SELECT * FROM performance_schema.setup_instruments WHERE NAME LIKE '%group_rpl%' AND NAME NOT LIKE 'wait/synch/%/group_rpl/GCS_%' AND NAME NOT LIKE '%GCS_XCom::xcom_cache%';
+--let $psi_keys_count_before_gr=`SELECT COUNT(*) FROM performance_schema.setup_instruments WHERE NAME LIKE '%group_rpl%' AND NAME NOT LIKE 'wait/synch/%/group_rpl/GCS_%' AND NAME NOT LIKE '%GCS_XCom::xcom_cache%'`
+
+--echo
+--echo ############################################################
+--echo # 2. Start the GR
+--source include/start_and_bootstrap_group_replication.inc
+
+--echo
+--echo ############################################################
+--echo # 3. Verify that there are no extra psi keys that were added
+--echo #   after starting the GR
+--let $psi_keys_count_after_gr=`SELECT COUNT(*) FROM performance_schema.setup_instruments WHERE NAME LIKE '%group_rpl%' AND NAME NOT LIKE 'wait/synch/%/group_rpl/GCS_%' AND NAME NOT LIKE '%GCS_XCom::xcom_cache%'`
+--let $assert_text= 'There should be no extra psi keys added after starting the GR'
+--let $assert_cond= $psi_keys_count_before_gr = $psi_keys_count_after_gr
+--source include/assert.inc
+
+--echo
+--echo ############################################################
+--echo # 4. Verify that performance_schema.threads list the usual
+--echo #    threads after member is ONLINE.
+SELECT NAME, TYPE, INSTRUMENTED FROM performance_schema.threads WHERE NAME LIKE '%group_rpl%' ORDER BY NAME;
+
+--echo
+--echo ############################################################
+--echo # 5. Test end.
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_recovery_donor_failover.inc mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_recovery_donor_failover.inc
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_recovery_donor_failover.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_recovery_donor_failover.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,115 @@
+################################################################################
+# Recovery donor failover test
+# This test focus on the failover mechanism where a joiner changes it's donor
+# whenever the one in use leaves the group while recovery is happening.
+#
+# To test this, a new member is started but recovery blocked. While at this state
+# the donor is killed, forcing the joiner to change to a new one. As there is
+# no donor identification as of now, we just unblock and check that recovery
+# was successful
+#
+# Test:
+# 0. The test requires three servers: M1, M2 and M3.
+# 1. Bootstrap group on M1. Insert some data. Start GR on M2.
+# 2. Stop the applier on both servers to block recovery.
+# 3. Start GR on M3. It should go into RECOVERING state. Identify the DONOR.
+# 4. Stop GR on the donor making it leave the group.
+# 5. Unblock recovery i.e. Start the applier on failover member and watch M3 go
+#    ONLINE despite the donor exit. Vaidate data on M3.
+# 6. Clean up.
+################################################################################
+
+--source include/big_test.inc
+--let $group_replication_group_name= 55d07150-9a4d-11e3-a5e2-0800200c9a66
+--source include/have_group_replication_plugin.inc
+--let $rpl_skip_group_replication_start= 1
+--let $rpl_server_count= 3
+--source include/group_replication.inc
+
+--echo #
+--echo # Setup a new 2 member group
+--echo #
+
+--connection server1
+
+--source include/start_and_bootstrap_group_replication.inc
+
+--let $group_replication_number_of_members= 1
+--source include/gr_wait_for_number_of_members.inc
+
+#insert some data
+CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1);
+
+--connection server2
+#extract server uuid for calculations below
+--let $server2_uuid= query_get_value(SELECT @@SERVER_UUID, @@SERVER_UUID, 1)
+
+--source include/start_group_replication.inc
+
+--let $group_replication_number_of_members= 2
+--source include/gr_wait_for_number_of_members.inc
+
+#Stop the applier on both servers to block recovery
+STOP SLAVE SQL_THREAD FOR CHANNEL "group_replication_applier";
+
+--connection server1
+STOP SLAVE SQL_THREAD FOR CHANNEL "group_replication_applier";
+
+--echo #
+--echo # Start recovery on a new member and kill the donor
+--echo #
+
+--connection server3
+SET SESSION sql_log_bin= 0;
+call mtr.add_suppression(".*Error when configuring the asynchronous recovery channel connection *.*");
+SET SESSION sql_log_bin= 1;
+
+--let $group_replication_start_member_state= RECOVERING
+--source include/start_group_replication.inc
+
+--echo # Find if server 1 or 2 is the donor
+
+#give it time to connect
+--sleep 5
+
+#Find what member is the donor
+--let $donor_id= 1
+--let $failover= 2
+if (`SELECT COUNT(*)=1 FROM performance_schema.replication_connection_status WHERE channel_name='group_replication_recovery' AND service_state='ON' AND source_uuid='$server2_uuid'`)
+{
+  --let $donor_id= 2
+  --let $failover= 1
+}
+
+--echo # Stop group replication on the donor making it leave the group
+--connection server$donor_id
+--source include/stop_group_replication.inc
+
+--echo # Unblock recovery and watch the member go online despite the donor exit
+--connection server$failover
+START SLAVE SQL_THREAD FOR CHANNEL "group_replication_applier";
+
+--connection server3
+
+--let $group_replication_member_state= ONLINE
+--source include/gr_wait_for_member_state.inc
+
+--let $assert_text= On the recovered member, the table should exist and have 1 elements;
+--let $assert_cond= [select count(*) from t1] = 1;
+--source include/assert.inc
+
+--let $assert_text= On the recovered member, the executed GTID should be the same as on the donor plus the view changes
+--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = "55d07150-9a4d-11e3-a5e2-0800200c9a66:1-5";
+--source include/assert.inc
+
+--echo #
+--echo # Cleaning up
+--echo #
+
+--connection server$donor_id
+--source include/start_group_replication.inc
+
+DROP TABLE t1;
+
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_replicate_anonymous_server_to_group_error_cases.inc mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_replicate_anonymous_server_to_group_error_cases.inc
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_replicate_anonymous_server_to_group_error_cases.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_replicate_anonymous_server_to_group_error_cases.inc	2021-09-28 11:46:34.000000000 +0000
@@ -280,6 +280,15 @@
 CALL mtr.add_suppression("The group_replication_group_name .*. is the same as");
 SET session sql_log_bin=1;
 
+--let $allow_rpl_inited=1
+--let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
+--let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $restart_parameters=restart:--group_replication_group_name=$group_replication_group_name --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_bootstrap_group=1 --group_replication_start_on_boot=OFF
+--replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_ROUP_SEEDS
+--source include/restart_mysqld.inc
+--let $rpl_server_number= 1
+--source include/rpl_reconnect.inc
+
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
 --source include/stop_group_replication.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_replicate_anonymous_server_to_group.inc mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_replicate_anonymous_server_to_group.inc
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_replicate_anonymous_server_to_group.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_replicate_anonymous_server_to_group.inc	2021-09-28 11:46:34.000000000 +0000
@@ -199,6 +199,15 @@
 CALL mtr.add_suppression("Using ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS implies limitations on the replication topology");
 SET session sql_log_bin=1;
 
+--let $allow_rpl_inited=1
+--let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
+--let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $restart_parameters=restart:--group_replication_group_name=$group_replication_group_name --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_bootstrap_group=1 --group_replication_start_on_boot=OFF
+--replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--source include/restart_mysqld.inc
+--let $rpl_server_number= 1
+--source include/rpl_reconnect.inc
+
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
 --source include/stop_group_replication.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_replicate_group_to_group.inc mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_replicate_group_to_group.inc
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_replicate_group_to_group.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_replicate_group_to_group.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,250 @@
+################################################################################
+#
+# Bug#25674926 VIEW CHANGE LOG EVENTS GENERATE NEW GTIDS
+#
+# Problem: When there is replication (async) between two groups,
+#          group nodes are confused when it receives view_change_log_event
+#          that is generated on the other group and the event is making
+#          infinite round trips between the groups in case if the async
+#          replication is circular replication.
+#
+# Scenario: Verify Group Replication behavior when we establish a
+#           circular replication connection from a server in a group
+#           to another server in the other group.
+# Steps to reproduce:
+#  0. The test requires six servers: M1, M2, M3, M4, M5 and M6.
+#  1. Bootstrap start a group, GR1, on M1. Start GR on M2 and add it GR1.
+#  2. Bootstrap start a group, GR2, on M3. Start GR on M4 and add it GR2.
+#  3. Setup a asynchronous replication connection from M3(GR2) into M1(GR1)
+#     i.e. M3 -> M1.
+#  4. Setup a asynchronous replication connection from M1(GR1) into M3(GR2)
+#     i.e. M1 -> M3.
+#  5. Test view change event issue by adding/dropping nodes from the groups.
+#     Add node M5 to group GR1, and add node M6 to group GR2 and immediately
+#     drop the node from group (GR2). (This step is just to generate more
+#     VIEW_EVENTs)
+#  6. Execute some transactions on M3.
+#  7. Wait until transactions executed on M3 are applied on all nodes of GR1
+#     and GR2.
+#  8. Execute some transactions on M1.
+#  9. Wait until transactions executed on M1 are applied on all nodes of GR1
+#     and GR2.
+# 10. Validate data on all nodes (M1, M2, M3, M4 and M5).
+# 11. Check that GTID_EXECUTED on all servers are as expected.
+# 12. Clean data.
+# 13. Stop circular replication between groups.
+# 14. Stop Group Replication on all nodes (M1, M2, M3, M4 and M5).
+################################################################################
+
+# This test script needs '6' servers. Hence marking it as big test.
+--source include/big_test.inc
+
+--let $group_replication_group_name= 8a94f357-aab4-11df-86ab-c80aa9420000
+--source include/have_group_replication_plugin.inc
+--let $rpl_skip_group_replication_start= 1
+--let $rpl_server_count= 6
+--source include/group_replication.inc
+
+--echo
+--echo #################################################################
+--echo #  1. Setup Group Replication on M1 and M2 and create group GR1.
+--let $group_replication_group_name= 8a94f357-aab4-11df-86ab-c80aa9420000
+--connection server1
+--let $server1_local_address = `SELECT @@GLOBAL.group_replication_local_address;`
+SET @@GLOBAL.group_replication_group_seeds= "";
+--source include/start_and_bootstrap_group_replication.inc
+
+--connection server2
+--replace_result $server1_local_address GROUP_REPLICATION_GROUP_SEEDS
+--eval SET @@GLOBAL.group_replication_group_seeds= "$server1_local_address"
+--source include/start_group_replication.inc
+
+--let $group_replication_number_of_members= 2
+--source include/gr_wait_for_number_of_members.inc
+
+--echo
+--echo #################################################################
+--echo #  2. Setup Group Replication on M1 and M2 and create group GR2.
+--let $group_replication_group_name= 8a94f357-aab4-11df-86ab-c80aa942000d
+--connection server3
+--let $server3_local_address = `SELECT @@GLOBAL.group_replication_local_address;`
+SET @@GLOBAL.group_replication_group_seeds= "";
+--source include/start_and_bootstrap_group_replication.inc
+
+--connection server4
+--replace_result $server3_local_address GROUP_REPLICATION_GROUP_SEEDS
+--eval SET @@GLOBAL.group_replication_group_seeds= "$server3_local_address"
+--source include/start_group_replication.inc
+
+--let $group_replication_number_of_members= 2
+--source include/gr_wait_for_number_of_members.inc
+
+--echo
+--echo ###############################################################
+--echo #  3. Setup a asynchronous replication connection from M3 (GR2)
+--echo #     to M1 (GR1).
+--connection server1
+--replace_result $SERVER_MYPORT_3 SERVER_3_PORT
+--eval CHANGE REPLICATION SOURCE TO SOURCE_HOST="127.0.0.1", SOURCE_USER="root", SOURCE_PASSWORD="", SOURCE_PORT=$SERVER_MYPORT_3, SOURCE_AUTO_POSITION=1
+--source include/start_slave.inc
+
+--echo
+--echo ###############################################################
+--echo #  4. Setup a asynchronous replication connection from M1 (GR1)
+--echo #     to M3 (GR2).
+--connection server3
+--replace_result $SERVER_MYPORT_1 SERVER_1_PORT
+--eval CHANGE REPLICATION SOURCE TO SOURCE_HOST="127.0.0.1", SOURCE_USER="root", SOURCE_PASSWORD="", SOURCE_PORT=$SERVER_MYPORT_1, SOURCE_AUTO_POSITION=1
+--source include/start_slave.inc
+
+--echo
+--echo ###############################################################
+--echo #  5. Test view change issue by adding/dropping nodes from the
+--echo #     groups (just to generate more VIEW_EVENTs).
+--echo # 5.1. Add a node M5 to group (GR1).
+--let $group_replication_group_name= 8a94f357-aab4-11df-86ab-c80aa9420000
+--connection server5
+--replace_result $server1_local_address GROUP_REPLICATION_GROUP_SEEDS
+--eval SET @@GLOBAL.group_replication_group_seeds= "$server1_local_address"
+--source include/start_group_replication.inc
+
+--let $group_replication_number_of_members= 3
+--source include/gr_wait_for_number_of_members.inc
+
+--echo
+--echo ################################################################
+--echo # 5.2. Add and immediately drop a node M6 to group (GR2).
+--let $group_replication_group_name= 8a94f357-aab4-11df-86ab-c80aa942000d
+--connection server6
+--replace_result $server3_local_address GROUP_REPLICATION_GROUP_SEEDS
+--eval SET @@GLOBAL.group_replication_group_seeds= "$server3_local_address"
+--source include/start_group_replication.inc
+
+--let $group_replication_number_of_members= 3
+--source include/gr_wait_for_number_of_members.inc
+--source include/stop_group_replication.inc
+
+--echo
+--echo ############################################################
+--echo #  6. Execute some transactions on M3 (GR2).
+--connection server3
+CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (0);
+INSERT INTO t1 VALUES (1);
+UPDATE t1 SET c1=2 WHERE c1=0;
+DELETE FROM t1 WHERE c1=1;
+
+--echo
+--echo ############################################################
+--echo #  7. Wait until transactions executed on M3 are applied
+--echo #     on all nodes in both groups.
+--connection server3
+--let $sync_slave_connection= server1
+--source include/sync_slave_sql_with_master.inc
+--connection server3
+--let $sync_slave_connection= server2
+--source include/sync_slave_sql_with_master.inc
+--connection server3
+--let $sync_slave_connection= server4
+--source include/sync_slave_sql_with_master.inc
+--connection server3
+--let $sync_slave_connection= server5
+--source include/sync_slave_sql_with_master.inc
+
+--echo
+--echo ############################################################
+--echo #  8. Execute some transactions on M1 (GR1).
+--connection server1
+CREATE TABLE t2 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (0);
+INSERT INTO t2 VALUES (1);
+UPDATE t2 SET c1=2 WHERE c1=0;
+DELETE FROM t2 WHERE c1=1;
+
+--echo
+--echo ############################################################
+--echo #  9. Wait until transactions executed on M1 are applied
+--echo #     on all nodes in both groups.
+--connection server1
+--let $sync_slave_connection= server2
+--source include/sync_slave_sql_with_master.inc
+--connection server1
+--let $sync_slave_connection= server3
+--source include/sync_slave_sql_with_master.inc
+--connection server1
+--let $sync_slave_connection= server4
+--source include/sync_slave_sql_with_master.inc
+--connection server1
+--let $sync_slave_connection= server5
+--source include/sync_slave_sql_with_master.inc
+
+--echo
+--echo #########################################################################
+--echo # 10. Validate data on all nodes (M1, M2, M3, M4 and M5)
+--let diff_tables=server_1:t1, server_2:t1, server_3:t1, server_4:t1, server_5:t1
+--source include/diff_tables.inc
+
+--let diff_tables=server_1:t2, server_2:t2, server_3:t2, server_4:t2, server_5:t2
+--source include/diff_tables.inc
+
+--echo
+--echo #########################################################################
+--echo # 11. Check that GTID_EXECUTED on all servers are as expected.
+--let $i=1
+while ($i <= 5)
+{
+  --connection server$i
+  SET SESSION sql_log_bin= 0;
+  --source include/gtid_utils.inc
+  SET SESSION sql_log_bin= 1;
+  --let $expected_gtid_set= 8a94f357-aab4-11df-86ab-c80aa9420000:1-8, 8a94f357-aab4-11df-86ab-c80aa942000d:1-8
+  --let $assert_text= Check that GTID_EXECUTED set on all servers are as expected.
+  --let $assert_cond= GTID_IS_EQUAL("[SELECT @@GLOBAL.GTID_EXECUTED]", "$expected_gtid_set")
+  --source include/assert.inc
+  SET SESSION sql_log_bin= 0;
+  --source include/gtid_utils_end.inc
+  SET SESSION sql_log_bin= 1;
+  --inc $i
+}
+
+--echo
+--echo ############################################################
+--echo #  12. Clean data.
+--connection server3
+DROP TABLE t1;
+DROP TABLE t2;
+
+--let $sync_slave_connection= server1
+--source include/sync_slave_sql_with_master.inc
+--connection server3
+--let $sync_slave_connection= server2
+--source include/sync_slave_sql_with_master.inc
+--connection server3
+--let $sync_slave_connection= server4
+--source include/sync_slave_sql_with_master.inc
+--connection server3
+--let $sync_slave_connection= server5
+--source include/sync_slave_sql_with_master.inc
+
+--echo
+--echo ##############################################################
+--echo # 13. Stop asynchronous replication between M3->M1 and M1->M3.
+--connection server1
+--source include/stop_slave.inc
+CHANGE REPLICATION SOURCE TO SOURCE_AUTO_POSITION=0 FOR CHANNEL "";
+--connection server3
+--source include/stop_slave.inc
+CHANGE REPLICATION SOURCE TO SOURCE_AUTO_POSITION=0 FOR CHANNEL "";
+
+--echo
+--echo ############################################################
+--echo # 14. Stop Group Replication on all 5 nodes.
+--let $i=1
+while ($i <= 5)
+{
+  --connection server$i
+  --source include/stop_group_replication.inc
+  --inc $i
+}
+
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_ssl.inc mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_ssl.inc
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_ssl.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_ssl.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,118 @@
+################################################################################
+# Base test to verify the basic SSL support on Group replication recovery
+#
+# Test:
+# 0. The test requires two servers: M1 and M2.
+# 1. Setup the first member (M1) with a recovery user that requires SSL.
+# 2. Add some data and bootstrap start a group on M1.
+# 3. Configure joining member (M2) to use SSL options on recovery. Start GR on
+#    M2. Check the data is there.
+# 4. Clean up.
+################################################################################
+
+--source include/have_group_replication_plugin.inc
+--let $rpl_skip_group_replication_start= 1
+--source include/group_replication.inc
+
+--echo #
+--echo # Setup the first member with a recovery user that requires SSL
+--echo #
+
+--connection server1
+--echo server1
+
+# create a user for replication that requires ssl encryption
+set session sql_log_bin=0;
+CREATE USER 'rec_ssl_user'@'%' REQUIRE SSL;
+GRANT replication slave ON *.* TO 'rec_ssl_user'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'rec_ssl_user'@'%';
+set session sql_log_bin=1;
+
+--let $conf_rec_ssl_mode_s1= `SELECT @@GLOBAL.group_replication_ssl_mode;`
+--eval SET GLOBAL group_replication_ssl_mode= REQUIRED
+
+--echo #
+--echo # Add some data and start the member
+--echo #
+
+CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1);
+
+--source include/start_and_bootstrap_group_replication.inc
+
+--echo #
+--echo # Configure a joining member to use SSL options on recovery and start it
+--echo #
+
+--connection server2
+--echo server2
+
+set session sql_log_bin=0;
+CREATE USER 'rec_ssl_user'@'%' REQUIRE SSL;
+GRANT replication slave ON *.* TO 'rec_ssl_user'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'rec_ssl_user'@'%';
+set session sql_log_bin=1;
+
+--let $conf_rec_use_ssl= `SELECT @@GLOBAL.group_replication_recovery_use_ssl;`
+--let $conf_rec_ssl_ca= `SELECT @@GLOBAL.group_replication_recovery_ssl_ca;`
+--let $conf_rec_ssl_cert= `SELECT @@GLOBAL.group_replication_recovery_ssl_cert;`
+--let $conf_rec_ssl_key= `SELECT @@GLOBAL.group_replication_recovery_ssl_key;`
+
+--disable_warnings
+CHANGE REPLICATION SOURCE TO SOURCE_USER="rec_ssl_user" FOR CHANNEL "group_replication_recovery";
+--enable_warnings
+
+--eval SET GLOBAL group_replication_recovery_use_ssl=1
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--eval SET GLOBAL group_replication_recovery_ssl_ca= '$MYSQL_TEST_DIR/std_data/cacert.pem'
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--eval SET GLOBAL group_replication_recovery_ssl_cert= '$MYSQL_TEST_DIR/std_data/client-cert.pem'
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--eval SET GLOBAL group_replication_recovery_ssl_key= '$MYSQL_TEST_DIR/std_data/client-key.pem'
+
+--let $conf_rec_ssl_mode_s2= `SELECT @@GLOBAL.group_replication_ssl_mode;`
+--eval SET GLOBAL group_replication_ssl_mode= REQUIRED
+
+--source include/start_group_replication.inc
+
+--echo #
+--echo # Check the data is there
+--echo #
+
+--let $assert_text= On the recovered member, the table should exist and have 1 elements;
+--let $assert_cond= [select count(*) from t1] = 1;
+--source include/assert.inc
+
+--echo #
+--echo # Clean up
+--echo #
+
+--disable_query_log
+--eval SET @@GLOBAL.group_replication_recovery_use_ssl= $conf_rec_use_ssl
+--eval SET @@GLOBAL.group_replication_recovery_ssl_ca= "$conf_rec_ssl_ca"
+--eval SET @@GLOBAL.group_replication_recovery_ssl_cert= "$conf_rec_ssl_cert"
+--eval SET @@GLOBAL.group_replication_recovery_ssl_key= "$conf_rec_ssl_key"
+--eval SET GLOBAL group_replication_ssl_mode= $conf_rec_ssl_mode_s2
+--enable_query_log
+
+--connection server1
+--echo server1
+
+set session sql_log_bin=0;
+DROP USER 'rec_ssl_user';
+set session sql_log_bin=1;
+
+--disable_query_log
+--eval SET GLOBAL group_replication_ssl_mode= $conf_rec_ssl_mode_s1
+--enable_query_log
+
+DROP TABLE t1;
+
+--connection server2
+--echo server2
+
+set session sql_log_bin=0;
+DROP USER 'rec_ssl_user';
+set session sql_log_bin=1;
+
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_ssl_mode_verify_identity_error.inc mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_ssl_mode_verify_identity_error.inc
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_ssl_mode_verify_identity_error.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_ssl_mode_verify_identity_error.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,92 @@
+#
+# Validate that Group Replication ssl mode works properly.
+#
+# Steps:
+#   1. Start one member with GCS SSL enabled with ssl mode
+#      VERIFY_IDENTITY.
+#   2. Start the second member with GCS SSL enabled and
+#      validating server certificate against the CA plus
+#      validating that server hostname matches server
+#      certificate hostname, the member will not be able to
+#      join the group, since the certificate contains an invalid
+#      hostname.
+#   3. Clean up.
+#
+--source include/big_test.inc
+--source include/check_openssl_version.inc
+--source include/have_group_replication_plugin.inc
+--let $rpl_skip_group_replication_start= 1
+--source include/group_replication.inc
+
+#check which stack are we using
+--let $have_mysql_stack= `SELECT @@group_replication_communication_stack LIKE 'MySQL'`
+
+--echo
+--echo ############################################################
+--echo # 1. Start one member with GCS SSL enabled.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+SET @group_replication_ssl_mode_save= @@GLOBAL.group_replication_ssl_mode;
+SET GLOBAL group_replication_ssl_mode= VERIFY_IDENTITY;
+--source include/start_and_bootstrap_group_replication.inc
+
+--let $grep_file= $MYSQLTEST_VARDIR/tmp/group_replication_ssl_mode_verify_identity_error.1.err
+--let $grep_pattern= Group communication SSL configuration: group_replication_ssl_mode: "VERIFY_IDENTITY"
+--let $grep_output= print_count
+--source include/grep_pattern.inc
+
+
+--echo
+--echo ############################################################
+--echo # 2. Start the second member with GCS SSL enabled and
+--echo #    validating server certificate against the CA plus
+--echo #    validating that server hostname matches server
+--echo #    certificate hostname, the member will not be able to
+--echo #    join the group, since the certificate does contain the
+--echo #    hostname 'localhost' and the hostname is '127.0.0.1'.
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+SET @group_replication_ssl_mode_save= @@GLOBAL.group_replication_ssl_mode;
+
+--disable_query_log
+--eval SET GLOBAL group_replication_group_name= '$group_replication_group_name'
+--enable_query_log
+SET GLOBAL group_replication_ssl_mode= VERIFY_IDENTITY;
+
+--error ER_GROUP_REPLICATION_CONFIGURATION
+START GROUP_REPLICATION;
+
+--let $assert_text= Check that Group Replication is running with SSL VERIFY_IDENTITY enabled
+--let $assert_file= $MYSQLTEST_VARDIR/tmp/group_replication_ssl_mode_verify_identity_error.2.err
+--let $assert_select= group_replication_ssl_mode: "VERIFY_IDENTITY"
+--let $assert_count= 1
+--source include/assert_grep.inc
+
+if(!$have_mysql_stack) {
+  --let $have_windows = `SELECT CONVERT(@@version_compile_os using latin1) IN ("Win32", "Win64", "Windows")`
+
+  --let $assert_count_for_test=1
+  if($have_windows) {
+    --let $assert_count_for_test=2
+  }
+
+  --let $assert_text= Check that Group Replication errors out when a certificate with a wrong hostname is provided
+  --let $assert_file= $MYSQLTEST_VARDIR/tmp/group_replication_ssl_mode_verify_identity_error.2.err
+  --let $assert_only_after= XCom initialized and ready to accept incoming connections
+  --let $assert_select= Failed to verify the server certificate via X509 certificate matching functions
+  --let $assert_count= $assert_count_for_test
+  --source include/assert_grep.inc
+}
+
+--echo
+--echo ############################################################
+--echo # 3. Clean up.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+SET GLOBAL group_replication_ssl_mode= @group_replication_ssl_mode_save;
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+SET GLOBAL group_replication_ssl_mode= @group_replication_ssl_mode_save;
+
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_ssl_tls13.inc mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_ssl_tls13.inc
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_ssl_tls13.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_ssl_tls13.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,320 @@
+#
+# Validate that Group Replication ssl mode works properly with TLSv1.3.
+#
+# Steps:
+# 0. Configure members to use encryption and save defaults.
+# 1. 2 members group with OpenSSL 1.1.1
+#    No --tls-ciphersuites
+#    No --tls-version
+#    Outcome: group will work.
+# 2. 2 members group with OpenSSL 1.1.1
+#    No --tls-ciphersuites
+#    server1: --tls-version='TLSv1,TLSv1.1,TLSv1.2,TLSv1.3'
+#    server2: --tls-version='TLSv1,TLSv1.1,TLSv1.2'
+#    Outcome: group will work.
+# 3. 2 members group with OpenSSL 1.1.1
+#    No --tls-ciphersuites
+#    server1: --tls-version='TLSv1.3'
+#    server2: --tls-version='TLSv1,TLSv1.1,TLSv1.2'
+#    Outcome: group will not work.
+# 4. 2 members group with OpenSSL 1.1.1
+#    No --tls-ciphersuites
+#    server1: --tls-version='TLSv1.3'
+#    server2: --tls-version='TLSv1.3'
+#    Outcome: group will work.
+# 5. 2 members group with OpenSSL 1.1.1
+#    --tls-ciphersuites='TLS_AES_256_GCM_SHA384'
+#    server1: --tls-version='TLSv1,TLSv1.1,TLSv1.2,TLSv1.3'
+#    server2: --tls-version='TLSv1,TLSv1.1,TLSv1.2,TLSv1.3'
+#    Outcome: group will work.
+# 6. 2 members group with OpenSSL 1.1.1
+#    --tls-ciphersuites= '', which will disable all ciphers.
+#    No --tls-version
+#    Outcome: group will not work.
+# 7. Clean up.
+#
+--source include/big_test.inc
+--source include/have_tlsv13.inc
+--source include/have_group_replication_plugin.inc
+--source include/force_restart.inc
+--let $rpl_skip_group_replication_start= 1
+--source include/group_replication.inc
+
+
+#check which stack are we using
+--let $have_mysql_stack= `SELECT @@group_replication_communication_stack LIKE 'MySQL'`
+
+--echo
+--echo ############################################################
+--echo # 0. Configure members to use encryption and save defaults.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+SET @tls_version_save= @@GLOBAL.tls_version;
+SET @tls_ciphersuites_save= @@GLOBAL.tls_ciphersuites;
+SET @group_replication_ssl_mode_save= @@GLOBAL.group_replication_ssl_mode;
+
+--let $tls_version_recovery_save_s1=
+--let $tls_ciphersuites_recovery_save_s1=
+if($have_mysql_stack) {
+  --let $tls_version_recovery_save_s1= @@GLOBAL.group_replication_recovery_tls_version;
+  --let $tls_ciphersuites_recovery_save_s1= @@GLOBAL.group_replication_recovery_tls_ciphersuites;
+}
+
+SET @@GLOBAL.group_replication_ssl_mode= REQUIRED;
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+SET @tls_version_save= @@GLOBAL.tls_version;
+SET @tls_ciphersuites_save= @@GLOBAL.tls_ciphersuites;
+SET @group_replication_ssl_mode_save= @@GLOBAL.group_replication_ssl_mode;
+SET @@GLOBAL.group_replication_ssl_mode= REQUIRED;
+
+--let $tls_version_recovery_save_s2=
+--let $tls_ciphersuites_recovery_save_s2=
+if($have_mysql_stack) {
+  --let $tls_version_recovery_save_s2= @@GLOBAL.group_replication_recovery_tls_version;
+  --let $tls_ciphersuites_recovery_save_s2= @@GLOBAL.group_replication_recovery_tls_ciphersuites;
+}
+
+SET SESSION sql_log_bin= 0;
+call mtr.add_suppression("\\[GCS\\] Error connecting to all peers. Member join failed. Local port:*");
+call mtr.add_suppression("\\[GCS\\] The member was unable to join the group.*");
+call mtr.add_suppression("Timeout on wait for view after joining group");
+SET SESSION sql_log_bin= 1;
+
+
+--echo
+--echo ############################################################
+--echo # 1. 2 members group with OpenSSL 1.1.1
+--echo #    No --tls-ciphersuites
+--echo #    No --tls-version
+--echo #    Outcome: group will work.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/start_and_bootstrap_group_replication.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--source include/start_group_replication.inc
+
+--let $group_replication_number_of_members= 2
+--source include/gr_wait_for_number_of_members.inc
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+
+--echo
+--echo ############################################################
+--echo # 2. 2 members group with OpenSSL 1.1.1
+--echo #    No --tls-ciphersuites
+--echo #    server1: --tls-version='TLSv1,TLSv1.1,TLSv1.2,TLSv1.3'
+--echo #    server2: --tls-version='TLSv1,TLSv1.1,TLSv1.2'
+--echo #    Outcome: group will work.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+SET @@GLOBAL.tls_version= 'TLSv1,TLSv1.1,TLSv1.2,TLSv1.3';
+if($have_mysql_stack) {
+  SET @@GLOBAL.group_replication_recovery_tls_version= 'TLSv1,TLSv1.1,TLSv1.2,TLSv1.3';
+}
+ALTER INSTANCE RELOAD TLS;
+--source include/start_and_bootstrap_group_replication.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+SET @@GLOBAL.tls_version= 'TLSv1,TLSv1.1,TLSv1.2';
+if($have_mysql_stack) {
+  SET @@GLOBAL.group_replication_recovery_tls_version= 'TLSv1,TLSv1.1,TLSv1.2';
+}
+ALTER INSTANCE RELOAD TLS;
+--source include/start_group_replication.inc
+
+--let $group_replication_number_of_members= 2
+--source include/gr_wait_for_number_of_members.inc
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+
+--echo
+--echo ############################################################
+--echo # 3. 2 members group with OpenSSL 1.1.1
+--echo #    No --tls-ciphersuites
+--echo #    server1: --tls-version='TLSv1.3'
+--echo #    server2: --tls-version='TLSv1,TLSv1.1,TLSv1.2'
+--echo #    Outcome: group will not work.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+SET @@GLOBAL.tls_version= 'TLSv1.3';
+if($have_mysql_stack) {
+  SET @@GLOBAL.group_replication_recovery_tls_version= 'TLSv1.3';
+}
+ALTER INSTANCE RELOAD TLS;
+--source include/start_and_bootstrap_group_replication.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+SET @@GLOBAL.tls_version= 'TLSv1,TLSv1.1,TLSv1.2';
+if($have_mysql_stack) {
+  SET @@GLOBAL.group_replication_recovery_tls_version= 'TLSv1,TLSv1.1,TLSv1.2';
+}
+ALTER INSTANCE RELOAD TLS;
+
+--error ER_GROUP_REPLICATION_CONFIGURATION
+START GROUP_REPLICATION;
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+
+--echo
+--echo ############################################################
+--echo # 4. 2 members group with OpenSSL 1.1.1
+--echo #    No --tls-ciphersuites
+--echo #    server1: --tls-version='TLSv1.3'
+--echo #    server2: --tls-version='TLSv1.3'
+--echo #    Outcome: group will work.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+SET @@GLOBAL.tls_version= 'TLSv1.3';
+if($have_mysql_stack) {
+  SET @@GLOBAL.group_replication_recovery_tls_version= 'TLSv1.3';
+}
+ALTER INSTANCE RELOAD TLS;
+--source include/start_and_bootstrap_group_replication.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+SET @@GLOBAL.tls_version= 'TLSv1.3';
+if($have_mysql_stack) {
+  SET @@GLOBAL.group_replication_recovery_tls_version= 'TLSv1.3';
+}
+ALTER INSTANCE RELOAD TLS;
+--source include/start_group_replication.inc
+
+--let $group_replication_number_of_members= 2
+--source include/gr_wait_for_number_of_members.inc
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+
+--echo
+--echo ############################################################
+--echo # 5. 2 members group with OpenSSL 1.1.1
+--echo #    --tls-ciphersuites='TLS_AES_256_GCM_SHA384'
+--echo #    server1: --tls-version='TLSv1,TLSv1.1,TLSv1.2,TLSv1.3'
+--echo #    server2: --tls-version='TLSv1,TLSv1.1,TLSv1.2,TLSv1.3'
+--echo #    Outcome: group will work.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+SET @@GLOBAL.tls_version= 'TLSv1,TLSv1.1,TLSv1.2,TLSv1.3';
+SET @@GLOBAL.tls_ciphersuites= 'TLS_AES_256_GCM_SHA384';
+if($have_mysql_stack) {
+  SET @@GLOBAL.group_replication_recovery_tls_version= 'TLSv1,TLSv1.1,TLSv1.2,TLSv1.3';
+  SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= 'TLS_AES_256_GCM_SHA384';
+}
+ALTER INSTANCE RELOAD TLS;
+--source include/start_and_bootstrap_group_replication.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+SET @@GLOBAL.tls_version= 'TLSv1,TLSv1.1,TLSv1.2,TLSv1.3';
+SET @@GLOBAL.tls_ciphersuites= 'TLS_AES_256_GCM_SHA384';
+if($have_mysql_stack) {
+  SET @@GLOBAL.group_replication_recovery_tls_version= 'TLSv1,TLSv1.1,TLSv1.2,TLSv1.3';
+  SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= 'TLS_AES_256_GCM_SHA384';
+}
+ALTER INSTANCE RELOAD TLS;
+--source include/start_group_replication.inc
+
+--let $group_replication_number_of_members= 2
+--source include/gr_wait_for_number_of_members.inc
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+
+--echo
+--echo ############################################################
+--echo # 6. 2 members group with OpenSSL 1.1.1
+--echo #    --tls-ciphersuites= '', which will disable all ciphers.
+--echo #    No --tls-version
+--echo #    Outcome: group will not work.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/gr_set_bootstrap_group.inc
+
+SET @@GLOBAL.tls_ciphersuites= '';
+if($have_mysql_stack) {
+  SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= '';
+}
+ALTER INSTANCE RELOAD TLS;
+
+--error ER_GROUP_REPLICATION_CONFIGURATION
+START GROUP_REPLICATION;
+
+--source include/gr_clear_bootstrap_group.inc
+
+if(!$have_mysql_stack) {
+  --let $grep_file= $MYSQLTEST_VARDIR/tmp/gr_ssl_tls13.1.err
+  --let $grep_pattern= Error connecting using SSL
+  --let $grep_output= boolean
+  --source include/grep_pattern.inc
+}
+
+--echo
+--echo ############################################################
+--echo # 7. Clean up.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+SET @@GLOBAL.group_replication_ssl_mode= @group_replication_ssl_mode_save;
+SET @@GLOBAL.tls_version= @tls_version_save;
+SET @@GLOBAL.tls_ciphersuites= @tls_ciphersuites_save;
+if($have_mysql_stack) {
+  SET @@GLOBAL.group_replication_recovery_tls_version= $tls_version_recovery_save_s1;
+  SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= $tls_ciphersuites_recovery_save_s1;
+}
+ALTER INSTANCE RELOAD TLS;
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+SET @@GLOBAL.group_replication_ssl_mode= @group_replication_ssl_mode_save;
+SET @@GLOBAL.tls_version= @tls_version_save;
+SET @@GLOBAL.tls_ciphersuites= @tls_ciphersuites_save;
+if($have_mysql_stack) {
+  SET @@GLOBAL.group_replication_recovery_tls_version= $tls_version_recovery_save_s2;
+  SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= $tls_ciphersuites_recovery_save_s2;
+}
+ALTER INSTANCE RELOAD TLS;
+
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_ssl_tls13_runtime_invalid_configuration.inc mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_ssl_tls13_runtime_invalid_configuration.inc
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_ssl_tls13_runtime_invalid_configuration.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_ssl_tls13_runtime_invalid_configuration.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,239 @@
+#
+# Validate that Group Replication SSL mode does not work with TLS v1.3 when
+# an invalid configuration is set at server runtime.
+#
+# Steps:
+# 0. Configure members to use encryption and save defaults.
+# 1. 2 members group with OpenSSL 1.1.1
+#    Verify that it is not possible to start group replication  when :
+#      * TLS version is 1.3
+#      * Intersection of the allowed TLS chipersuites for all the members is
+#        empty.
+#    server1: --tls-version='TLSv1.3'
+#    server1: --tls-ciphersuites='TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384'
+#    server2: --tls-version='TLSv1.3'
+#    server2: --tls-ciphersuites='TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_CCM_SHA256'
+#    Outcome: group will not work.
+# 2. 2 members group with OpenSSL 1.1.1
+#    Verify that it is not possible to join a node to a group when
+#    TLS v1.3 is allowed but there is no compatible ciphersuite :
+#      * TLS chipersuite of the node is incompatible  with the group, therefore
+#        TLS v1.3 is not supported
+#      * SLL cipher of the node is compatible with the group
+#    --tls-version='TLSv1.3'
+#    server1: --tls-ciphersuites='TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384'
+#    server1: --ssl-cipher='AES256-SHA:AES256-SHA256'
+#    server2: --tls-ciphersuites='TLS_AES_128_CCM_SHA256'
+#    server2: --ssl-cipher='AES256-SHA256:CAMELLIA256-SHA'
+#    Outcome: group will not work.
+# 3. Clean up.
+#
+
+
+--source include/big_test.inc
+--source include/have_tlsv13.inc
+--source include/have_group_replication_plugin.inc
+--let $rpl_server_count= 2
+--source include/force_restart.inc
+--let $rpl_skip_group_replication_start= 1
+--source include/group_replication.inc
+
+#check which stack are we using
+--let $have_mysql_stack= `SELECT @@group_replication_communication_stack LIKE 'MySQL'`
+
+--echo
+--echo ############################################################
+--echo # 0. Configure members to use encryption and save defaults.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+SET @tls_version_save= @@GLOBAL.tls_version;
+SET @tls_ciphersuites_save= @@GLOBAL.tls_ciphersuites;
+SET @ssl_cipher_save= @@GLOBAL.ssl_cipher;
+SET @group_replication_ssl_mode_save= @@GLOBAL.group_replication_ssl_mode;
+SET @@GLOBAL.group_replication_ssl_mode= REQUIRED;
+
+--let $tls_version_recovery_save_s1=
+--let $tls_ciphersuites_recovery_save_s1=
+--let $ssl_cipher_recovery_save_s1=
+if($have_mysql_stack) {
+  --let $tls_version_recovery_save_s1= @@GLOBAL.group_replication_recovery_tls_version;
+  --let $tls_ciphersuites_recovery_save_s1= @@GLOBAL.group_replication_recovery_tls_ciphersuites;
+  --let $ssl_cipher_recovery_save_s1= @@GLOBAL.group_replication_recovery_ssl_cipher;
+}
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+SET @tls_version_save= @@GLOBAL.tls_version;
+SET @tls_ciphersuites_save= @@GLOBAL.tls_ciphersuites;
+SET @ssl_cipher_save= @@GLOBAL.ssl_cipher;
+SET @group_replication_ssl_mode_save= @@GLOBAL.group_replication_ssl_mode;
+SET @@GLOBAL.group_replication_ssl_mode= REQUIRED;
+
+--let $tls_version_recovery_save_s2=
+--let $tls_ciphersuites_recovery_save_s2=
+--let $ssl_cipher_recovery_save_s2=
+if($have_mysql_stack) {
+  --let $tls_version_recovery_save_s2= @@GLOBAL.group_replication_recovery_tls_version;
+  --let $tls_ciphersuites_recovery_save_s2= @@GLOBAL.group_replication_recovery_tls_ciphersuites;
+  --let $ssl_cipher_recovery_save_s2= @@GLOBAL.group_replication_recovery_ssl_cipher;
+}
+
+SET SESSION sql_log_bin= 0;
+call mtr.add_suppression("\\[GCS\\] Error connecting to all peers. Member join failed. Local port:*");
+call mtr.add_suppression("\\[GCS\\] The member was unable to join the group.*");
+call mtr.add_suppression("Timeout on wait for view after joining group");
+call mtr.add_suppression("Error connecting to the local group communication engine instance");
+SET SESSION sql_log_bin= 1;
+
+--echo
+--echo ############################################################
+--echo # 1. 2 members group with OpenSSL 1.1.1
+--echo #    Verify that it is not possible to start group replication  when :
+--echo #      * TLS version is 1.3
+--echo #      * Intersection of the allowed TLS chipersuites for all the members
+--echo #        is empty.
+--echo #    server1: --tls-version='TLSv1.3'
+--echo #    server1: --tls-ciphersuites='TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384'
+--echo #    server2: --tls-version='TLSv1.3'
+--echo #    server2: --tls-ciphersuites='TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_CCM_SHA256'
+--echo #    Outcome: group will not work.
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+SET @@GLOBAL.tls_version= 'TLSv1.3';
+SET @@GLOBAL.tls_ciphersuites= 'TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384';
+if($have_mysql_stack) {
+  SET @@GLOBAL.group_replication_recovery_tls_version= 'TLSv1.3';
+  SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= 'TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384';
+}
+ALTER INSTANCE RELOAD TLS;
+--source include/start_and_bootstrap_group_replication.inc
+
+# Try to add 2nd server
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--eval SET GLOBAL group_replication_group_name= "$group_replication_group_name"
+
+SET @@GLOBAL.tls_version= 'TLSv1.3';
+SET @@GLOBAL.tls_ciphersuites= 'TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_CCM_SHA256';
+if($have_mysql_stack) {
+  SET @@GLOBAL.group_replication_recovery_tls_version= 'TLSv1.3';
+  SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= 'TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_CCM_SHA256';
+}
+ALTER INSTANCE RELOAD TLS;
+
+--error ER_GROUP_REPLICATION_CONFIGURATION
+START GROUP_REPLICATION;
+
+if(!$have_mysql_stack) {
+  --let $assert_file = $MYSQLTEST_VARDIR/tmp/gr_ssl_tls13_runtime_invalid_configuration.2.err
+  --let $assert_only_after=  .*XCom initialized and ready to accept incoming connections.*
+  --let $assert_select =.*Error connecting using SSL.*
+  --let $assert_match =.*Error connecting using SSL.*
+  --let $assert_text = Found the expected error line in the server log.
+  --source include/assert_grep.inc
+}
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+
+--echo
+--echo ############################################################
+--echo # 2. 2 members group with OpenSSL 1.1.1
+--echo #    Verify that it is not possible to join a node to a group when
+--echo #    TLS v1.3 is allowed but there is no compatible ciphersuite :
+--echo #      * TLS chipersuite of the node is incompatible  with the group,
+--echo #        therefore TLS v1.3 is not supported
+--echo #      * SLL cipher of the node is compatible with the group
+--echo #    --tls-version='TLSv1.3'
+--echo #    server1: --tls-ciphersuites='TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384'
+--echo #    server1: --ssl-cipher='AES256-SHA:AES256-SHA256'
+--echo #    server2: --tls-ciphersuites='TLS_AES_128_CCM_SHA256'
+--echo #    server2: --ssl-cipher='AES256-SHA256:CAMELLIA256-SHA'
+--echo #    Outcome: group will not work.
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+SET @@GLOBAL.tls_version= 'TLSv1.3';
+SET @@GLOBAL.ssl_cipher= 'AES256-SHA:AES256-SHA256';
+SET @@GLOBAL.tls_ciphersuites= 'TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384';
+if($have_mysql_stack) {
+  SET @@GLOBAL.group_replication_recovery_tls_version= 'TLSv1.3';
+  SET @@GLOBAL.group_replication_recovery_ssl_cipher= 'AES256-SHA:AES256-SHA256';
+  SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= 'TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384';
+}
+ALTER INSTANCE RELOAD TLS;
+--source include/start_and_bootstrap_group_replication.inc
+
+# Try to add 2nd server
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--eval SET GLOBAL group_replication_group_name= "$group_replication_group_name"
+
+SET @@GLOBAL.tls_version= 'TLSv1.3';
+SET @@GLOBAL.ssl_cipher= 'AES256-SHA256:CAMELLIA256-SHA';
+SET @@GLOBAL.tls_ciphersuites = 'TLS_AES_128_CCM_SHA256';
+if($have_mysql_stack) {
+  SET @@GLOBAL.group_replication_recovery_tls_version= 'TLSv1.3';
+  SET @@GLOBAL.group_replication_recovery_ssl_cipher= 'AES256-SHA256:CAMELLIA256-SHA';
+  SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= 'TLS_AES_128_CCM_SHA256';
+}
+ALTER INSTANCE RELOAD TLS;
+
+--error ER_GROUP_REPLICATION_CONFIGURATION
+START GROUP_REPLICATION;
+
+if(!$have_mysql_stack) {
+  --let $assert_file = $MYSQLTEST_VARDIR/tmp/gr_ssl_tls13_runtime_invalid_configuration.2.err
+  --let $assert_only_after=  .*XCom initialized and ready to accept incoming connections.*
+  --let $assert_select =.*Error connecting using SSL.*
+  --let $assert_match =.*Error connecting using SSL.*
+  --let $assert_text = Found the expected error line in the server log.
+  --source include/assert_grep.inc
+}
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+
+--echo
+--echo ############################################################
+--echo # 3. Clean up.
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+SET @@GLOBAL.group_replication_ssl_mode= @group_replication_ssl_mode_save;
+SET @@GLOBAL.tls_version= @tls_version_save;
+SET @@GLOBAL.tls_ciphersuites= @tls_ciphersuites_save;
+SET @@GLOBAL.ssl_cipher = @ssl_cipher_save;
+if($have_mysql_stack) {
+  SET @@GLOBAL.group_replication_recovery_tls_version= $tls_version_recovery_save_s1;
+  SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= $tls_ciphersuites_recovery_save_s1;
+  SET @@GLOBAL.group_replication_recovery_ssl_cipher= $ssl_cipher_recovery_save_s1;
+}
+ALTER INSTANCE RELOAD TLS;
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+SET @@GLOBAL.group_replication_ssl_mode= @group_replication_ssl_mode_save;
+SET @@GLOBAL.tls_version= @tls_version_save;
+SET @@GLOBAL.tls_ciphersuites= @tls_ciphersuites_save;
+SET @@GLOBAL.ssl_cipher = @ssl_cipher_save;
+if($have_mysql_stack) {
+  SET @@GLOBAL.group_replication_recovery_tls_version= $tls_version_recovery_save_s2;
+  SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= $tls_ciphersuites_recovery_save_s2;
+  SET @@GLOBAL.group_replication_recovery_ssl_cipher= $ssl_cipher_recovery_save_s2;
+}
+ALTER INSTANCE RELOAD TLS;
+
+
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_startup_check_node_seed_skips_own_address.inc mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_startup_check_node_seed_skips_own_address.inc
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_startup_check_node_seed_skips_own_address.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_startup_check_node_seed_skips_own_address.inc	2021-09-28 11:46:34.000000000 +0000
@@ -55,13 +55,25 @@
 --let $original_server_2_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $original_server_2_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
 
+let $have_xcom_stack= `SELECT @@group_replication_communication_stack LIKE 'XCOM'`;
+--let $_rpl_gcs_server_port=
+if ($have_xcom_stack)
+{
+  --let $_rpl_gcs_server_port= $SERVER_GR_PORT_2
+}
+if (!$have_xcom_stack)
+{
+  --let $_rpl_gcs_server_port= $SERVER_MYPORT_2
+}
+
+
 --echo "1. Test local address with raw address and seeds with name"
 
 # Assemble the new values:
 # - local address with raw values
 # - local address first in seeds with name (which is default)
 --let $localhost_address= [::1]:
---let $local_address_with_raw_address= $localhost_address$SERVER_GR_PORT_2
+--let $local_address_with_raw_address= $localhost_address$_rpl_gcs_server_port
 
 # Set values
 --disable_query_log
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_suspect_member_resumes_after_crash.inc mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_suspect_member_resumes_after_crash.inc
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/include/gr_suspect_member_resumes_after_crash.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/include/gr_suspect_member_resumes_after_crash.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,209 @@
+#######################################################################################
+# WL11570 - GR: options to defer member eviction after a suspicion
+#
+# In a group of 3 servers, we crash one of them, restart it and make it join the group
+# again, which fails. When it finally is expelled from the group, as its suspicion
+# on other members times out, it is finally able to rejoin the group.
+# Test :
+# 0. This test requires a group with 3 servers.
+# 1. Set the group_replication_member_expel_timeout parameter to 3600 seconds.
+# 2. Create table t1 and insert some data, checking that it is replicated to all
+#    servers.
+# 3. Crash server 3 and it will restart.
+#    This will make server 3 not answer to "I am alive" GCS messages and it will
+#    eventually be considered faulty.
+# 4. Check that all members are still in the group on servers 1 and 2, which should
+#    both be ONLINE.
+#    Server 3 should still be in the group but UNREACHABLE.
+# 5. Insert data into table t1 on server 2 and check that it is replicated to server 1.
+# 6. Restart GR on server 3 and it should fail since its
+#    suspicion still hasn't timed out on other members.
+# 7. Wait until server 3 is expelled from the group.
+# 8. Server 3 was expelled! Start GR on server 3.
+# 9. Check that server 3 retrieves the data inserted while
+#    it was suspended. Then, use it to insert new data into
+#    table t1 which should be replicated to servers 1 and 2.
+# 10. Clean up.
+#######################################################################################
+
+# Don't test this under valgrind, memory leaks will occur
+--source include/not_valgrind.inc
+--source include/big_test.inc
+--source include/force_restart.inc
+--source include/have_group_replication_plugin.inc
+--let $rpl_server_count= 3
+--source include/group_replication.inc
+
+
+--echo
+--echo ############################################################
+--echo # 1. Set group_replication_member_expel_timeout to
+--echo #    3600 seconds.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+SET GLOBAL group_replication_member_expel_timeout = 3600;
+--let $server1_local_address= `SELECT @@GLOBAL.group_replication_local_address`
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+SET GLOBAL group_replication_member_expel_timeout = 3600;
+
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+SET GLOBAL group_replication_member_expel_timeout = 3600;
+set session sql_log_bin=0;
+call mtr.add_suppression("read failed");
+call mtr.add_suppression("The member was unable to join the group. Local port: *.*");
+call mtr.add_suppression("Timeout on wait for view after joining group");
+call mtr.add_suppression("Error connecting to all peers. Member join failed. Local port: *.*");
+call mtr.add_suppression("Unable to start MySQL Network Provider*.*");
+call mtr.add_suppression("Timeout while waiting for the group communication engine to be ready*.*");
+call mtr.add_suppression("The group communication engine is not ready for the member to join*.*");
+
+set session sql_log_bin=1;
+
+
+--echo
+--echo ############################################################
+--echo # 2. Create a table and insert some data. Check that
+--echo #    it is replicated to all servers.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY);
+INSERT INTO t1 VALUES (1);
+--source include/rpl_sync.inc
+
+
+--echo
+--echo ############################################################
+--echo # 3. Crash server 3 and it will restart.
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--let $group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
+--let $group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $restart_parameters=restart:--group_replication_local_address=$group_replication_local_address --group_replication_group_seeds=$group_replication_group_seeds --group_replication_group_name=$group_replication_group_name
+--replace_result $group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--source include/kill_and_restart_mysqld.inc
+
+--echo #
+--echo # Restarting server 3
+# Needed as we are not using rpl_restart_server.inc
+--let $rpl_server_number= 3
+--source include/rpl_reconnect.inc
+
+
+--echo
+--echo ############################################################
+--echo # 4. Check that all members are still in the group on
+--echo #    servers 1 and 2, which should both be ONLINE.
+--echo #    Server 3 should still be in the group but UNREACHABLE.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+let $wait_condition=SELECT COUNT(*)=2 FROM performance_schema.replication_group_members where MEMBER_STATE="ONLINE";
+--source include/wait_condition.inc
+let $wait_condition=SELECT COUNT(*)=1 FROM performance_schema.replication_group_members where MEMBER_STATE="UNREACHABLE";
+--source include/wait_condition.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+let $wait_condition=SELECT COUNT(*)=2 FROM performance_schema.replication_group_members where MEMBER_STATE="ONLINE";
+--source include/wait_condition.inc
+let $wait_condition=SELECT COUNT(*)=1 FROM performance_schema.replication_group_members where MEMBER_STATE="UNREACHABLE";
+--source include/wait_condition.inc
+
+
+--echo
+--echo ############################################################
+--echo # 5. Insert data into table t1 on server 2 and check that
+--echo #    it is replicated to server 1.
+INSERT INTO t1 VALUES (2);
+let $wait_condition=SELECT COUNT(*)=2 FROM t1;
+--source include/wait_condition.inc
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+let $wait_condition=SELECT COUNT(*)=2 FROM t1;
+--source include/wait_condition.inc
+
+
+--echo
+--echo ############################################################
+--echo # 6. Restart GR on server 3 and it should fail since its
+--echo #    suspicion still hasn't timed out on other members.
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--eval SET GLOBAL group_replication_group_name= "$group_replication_group_name"
+--replace_result $server1_local_address SERVER1_LOCAL_ADDRESS
+--eval SET GLOBAL group_replication_group_seeds= "$server1_local_address"
+--error ER_GROUP_REPLICATION_CONFIGURATION
+START GROUP_REPLICATION;
+
+
+--echo
+--echo ############################################################
+--echo # 7. Wait until server 3 is expelled from the group.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+SET GLOBAL group_replication_member_expel_timeout = DEFAULT;
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+SET GLOBAL group_replication_member_expel_timeout = DEFAULT;
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+let $wait_condition=SELECT COUNT(*)=2 FROM performance_schema.replication_group_members;
+--source include/wait_condition.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+let $wait_condition=SELECT COUNT(*)=2 FROM performance_schema.replication_group_members;
+--source include/wait_condition.inc
+
+
+--echo
+--echo ############################################################
+--echo # 8. Server 3 was expelled! Start GR on server 3.
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--source include/start_group_replication.inc
+SET GLOBAL group_replication_member_expel_timeout = DEFAULT;
+
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+let $wait_condition=SELECT COUNT(*)=3 FROM performance_schema.replication_group_members where MEMBER_STATE="ONLINE";
+--source include/wait_condition.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+let $wait_condition=SELECT COUNT(*)=3 FROM performance_schema.replication_group_members where MEMBER_STATE="ONLINE";
+--source include/wait_condition.inc
+
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+let $wait_condition=SELECT COUNT(*)=3 FROM performance_schema.replication_group_members where MEMBER_STATE="ONLINE";
+--source include/wait_condition.inc
+
+
+--echo
+--echo ############################################################
+--echo # 9. Check that server 3 retrieves the data inserted while
+--echo #    it was suspended. Then, use it to insert new data into
+--echo #    table t1 which should be replicated to servers 1 and 2.
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+let $wait_condition=SELECT COUNT(*)=2 FROM t1;
+--source include/wait_condition.inc
+INSERT INTO t1 VALUES (3);
+--source include/rpl_sync.inc
+--let $diff_tables=server1:t1, server2:t1, server3:t1
+--source include/diff_tables.inc
+
+
+--echo
+--echo ############################################################
+--echo # 10. Clean up.
+DROP TABLE t1;
+
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_abort_query_on_plugin_error.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_abort_query_on_plugin_error.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_abort_query_on_plugin_error.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_abort_query_on_plugin_error.result	2021-09-28 11:46:34.000000000 +0000
@@ -6,6 +6,11 @@
 #######################
 # Start a 2 server group
 server1
+SET sql_log_bin=0;
+CREATE USER 'dummy_user'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'dummy_user'@'%';
+FLUSH PRIVILEGES;
+SET sql_log_bin=1;
 include/start_and_bootstrap_group_replication.inc
 CREATE TABLE t1 (a INT NOT NULL AUTO_INCREMENT PRIMARY KEY , b INT);
 server2
@@ -14,7 +19,14 @@
 #####################################################################
 # Restart group replication on server 2 inducing a failure on recovery
 include/stop_group_replication.inc
+SET sql_log_bin=0;
+CREATE USER 'dummy_user'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'dummy_user'@'%';
+FLUSH PRIVILEGES;
+SET sql_log_bin=1;
 set session sql_log_bin=0;
+call mtr.add_suppression("Slave I/O for channel 'group_replication_recovery': Master command COM_REGISTER_SLAVE failed*");
+call mtr.add_suppression("Slave I/O thread couldn't register on master*");
 call mtr.add_suppression("There was an error when connecting to the donor*");
 call mtr.add_suppression("For details please check performance_schema.replication_connection_status table and error log messages of Slave I/O for channel group_replication_recovery.");
 call mtr.add_suppression("Maximum number of retries when*");
@@ -44,6 +56,9 @@
 ##########################################
 # Solve the issue and re-execute the query
 include/stop_group_replication.inc
+SET sql_log_bin=0;
+DROP USER 'dummy_user'@'%';
+SET sql_log_bin=1;
 CHANGE REPLICATION SOURCE TO SOURCE_USER='root' FOR CHANNEL 'group_replication_recovery';
 include/start_group_replication.inc
 INSERT INTO test.t1 (b) VALUES (1);
@@ -51,6 +66,9 @@
 
 #######################################################################
 # Assert that server1 and server2 have the same data and GTID_EXECUTED.
+SET sql_log_bin=0;
+DROP USER 'dummy_user'@'%';
+SET sql_log_bin=1;
 server1
 include/assert.inc ['There is a value 1 in table t1 on server1']
 server2
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_disable_failover.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_disable_failover.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_disable_failover.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_disable_failover.result	2021-09-28 11:46:34.000000000 +0000
@@ -1,22 +1,20 @@
-include/group_replication.inc [rpl_server_count=4]
+include/group_replication.inc [rpl_server_count=3]
 Warnings:
 Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection server1]
 
 ############################################################
-# 1. Deploy a 3 members group in single primary mode.
+# 1. Deploy a 2 members group in single primary mode.
 [connection server1]
 include/start_and_bootstrap_group_replication.inc
 [connection server2]
 include/start_group_replication.inc
-[connection server3]
-include/start_group_replication.inc
 
 ############################################################
 # 2. Configure replica to manage the asynchronous connection
 #    to group.
-[connection server4]
+[connection server3]
 SELECT asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', 'GROUP_NAME', '127.0.0.1', SERVER_MYPORT_1, '', 90, 70);
 asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', 'GROUP_NAME', '127.0.0.1', SERVER_MYPORT_1, '', 90, 70)
 The UDF asynchronous_connection_failover_add_managed() executed successfully.
@@ -25,7 +23,7 @@
 
 ############################################################
 # 2. Create and start the managed channel.
-[connection server4]
+[connection server3]
 CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=1, SOURCE_PORT=SERVER_1_PORT, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1';
 Warnings:
 Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
@@ -34,46 +32,16 @@
 include/assert.inc [Verify channel ch1 IO_THREAD is ON and connected to server1]
 
 ############################################################
-# 3. Disable the SOURCE_CONNECTION_AUTO_FAILOVER option but
-#    leave the channel running.
-[connection server4]
+# 3. Try disable the SOURCE_CONNECTION_AUTO_FAILOVER option
+#    without stopping the channel.
+[connection server3]
 CHANGE REPLICATION SOURCE TO SOURCE_CONNECTION_AUTO_FAILOVER=0 FOR CHANNEL 'ch1';
-include/assert.inc [Verify replica_monitor thread is not running]
+ERROR HY000: This operation cannot be performed with running replication threads; run STOP SLAVE FOR CHANNEL 'ch1' first
+include/assert.inc [Verify replica_monitor thread is running]
 
 ############################################################
-# 4. Make server2 the group primary, despite primary_weight
-#    is bigger, since SOURCE_CONNECTION_AUTO_FAILOVER is
-#    disabled on channel 'ch1', ch1 will remain connected to
-#    server1.
-[connection server2]
-SELECT group_replication_set_as_primary("SERVER2_UUID");
-group_replication_set_as_primary("SERVER2_UUID")
-Primary server switched to: SERVER2_UUID
-include/gr_assert_primary_member.inc
-[connection server4]
-include/assert.inc [Verify channel ch1 IO_THREAD is ON and connected to server1]
-
-############################################################
-# 5. Shutdown server1, since SOURCE_CONNECTION_AUTO_FAILOVER
-# is disabled on channel ch1, ch1 will stop (instead of reconnect).
-[connection server1]
-include/rpl_stop_server.inc [server_number=1]
-[connection server4]
-Wait until ch1 IO_THREAD stops
-include/assert.inc [Verify channel ch1 SQL_THREAD is ON]
-
-############################################################
-# 6. Verify that replication_asynchronous_connection_failover
-#    did not change after SOURCE_CONNECTION_AUTO_FAILOVER was
-#    disabled.
-[connection server4]
-include/assert.inc ['There is one row in performance_schema.replication_asynchronous_connection_failover for server1']
-include/assert.inc ['There is one row in performance_schema.replication_asynchronous_connection_failover for server2']
-include/assert.inc ['There is one row in performance_schema.replication_asynchronous_connection_failover for server3']
-
-############################################################
-# 7. Clean up.
-[connection server4]
+# 4. Clean up.
+[connection server3]
 include/stop_slave.inc [FOR CHANNEL 'ch1']
 include/rpl_reset_slave.inc
 SELECT asynchronous_connection_failover_delete_managed('ch1', 'GROUP_NAME');
@@ -81,16 +49,8 @@
 The UDF asynchronous_connection_failover_delete_managed() executed successfully.
 include/assert.inc ['There are no rows in performance_schema.replication_asynchronous_connection_failover']
 include/assert.inc ['There are no rows in performance_schema.replication_asynchronous_connection_failover_managed']
-SET SESSION sql_log_bin = 0;
-call mtr.add_suppression("The source .* for channel 'ch1' has joined the group .*, and so added its entry into replication_asynchronous_connection_failover table.");
-call mtr.add_suppression("The source .* for channel 'ch1' has left the group .*, and so removed its entry from replication_asynchronous_connection_failover table.");
-call mtr.add_suppression("The group .* for the channel .* has been removed, and so removed its entry from replication_asynchronous_connection_failover_managed and all the group members from replication_asynchronous_connection_failover table.");
-call mtr.add_suppression("The group .* for the channel .* has been added, and so added its entry in replication_asynchronous_connection_failover_managed and source to replication_asynchronous_connection_failover table.");
-SET SESSION sql_log_bin = 1;
-[connection server3]
-include/stop_group_replication.inc
 [connection server2]
 include/stop_group_replication.inc
 [connection server1]
-include/rpl_reconnect.inc
+include/stop_group_replication.inc
 include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_enable_disable_on_secondaries.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_enable_disable_on_secondaries.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_enable_disable_on_secondaries.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_enable_disable_on_secondaries.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,37 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+############################################################
+# 1. Try to enable and disable a replication failover configuration
+#    on a secondary.
+#    It will not be allowed.
+[connection server1]
+include/start_and_bootstrap_group_replication.inc
+[connection server2]
+include/start_group_replication.inc
+include/gr_assert_secondary_member.inc
+SELECT asynchronous_connection_failover_reset();
+ERROR HY000: Can't initialize function 'asynchronous_connection_failover_reset'; Can't execute the given operation while Group Replication is running.
+SELECT asynchronous_connection_failover_add_source('ch1', '127.0.0.1', 3306, '', 50);
+ERROR HY000: Can't initialize function 'asynchronous_connection_failover_add_source'; Can't execute the given operation on a Group Replication secondary member.
+SELECT asynchronous_connection_failover_delete_source('ch1', '127.0.0.1', 3306, '');
+ERROR HY000: Can't initialize function 'asynchronous_connection_failover_delete_source'; Can't execute the given operation on a Group Replication secondary member.
+SELECT asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa','127.0.0.1', 3306, '', 80, 60);
+ERROR HY000: Can't initialize function 'asynchronous_connection_failover_add_managed'; Can't execute the given operation on a Group Replication secondary member.
+SELECT asynchronous_connection_failover_delete_managed('ch1', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa');
+ERROR HY000: Can't initialize function 'asynchronous_connection_failover_delete_managed'; Can't execute the given operation on a Group Replication secondary member.
+CHANGE REPLICATION SOURCE TO SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=1 FOR CHANNEL 'ch1';
+ERROR HY000: This operation cannot be performed on a Group Replication secondary member, it must be done on the group primary.
+
+############################################################
+# 2. Check that configuration was not changed.
+[connection server2]
+include/assert.inc [There must be no failover sources]
+include/assert.inc [There must be no failover managed sources]
+include/assert.inc ['There is no replication channel ch1']
+
+############################################################
+# 3. Clean up.
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_enable_failover.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_enable_failover.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_enable_failover.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_enable_failover.result	2021-09-28 11:46:34.000000000 +0000
@@ -28,6 +28,10 @@
 #    to the group.
 [connection server4]
 CHANGE REPLICATION SOURCE TO SOURCE_CONNECTION_AUTO_FAILOVER=1 FOR CHANNEL 'ch1';
+ERROR HY000: This operation cannot be performed with running replication threads; run STOP SLAVE FOR CHANNEL 'ch1' first
+include/stop_slave.inc [FOR CHANNEL 'ch1']
+CHANGE REPLICATION SOURCE TO SOURCE_CONNECTION_AUTO_FAILOVER=1 FOR CHANNEL 'ch1';
+include/start_slave.inc [FOR CHANNEL 'ch1']
 SELECT asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', 'GROUP_NAME', '127.0.0.1', SERVER_MYPORT_2, '', 90, 70);
 asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', 'GROUP_NAME', '127.0.0.1', SERVER_MYPORT_2, '', 90, 70)
 The UDF asynchronous_connection_failover_add_managed() executed successfully.
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_membership_updates_2groups_mysql.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_membership_updates_2groups_mysql.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_membership_updates_2groups_mysql.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_membership_updates_2groups_mysql.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,90 @@
+include/group_replication.inc [rpl_server_count=5]
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+# 1. Deploy a 1 member group A in single primary mode.
+
+[connection server1]
+include/start_and_bootstrap_group_replication.inc
+
+# 2. Deploy a 1 member group B in single primary mode.
+
+[connection server3]
+include/start_and_bootstrap_group_replication.inc
+
+# 3. Configure replica to manage the asynchronous connection
+#    to groups A and B.
+
+[connection server5]
+SELECT asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', 'GROUP_A', '127.0.0.1', SERVER_MYPORT_1, '', 90, 70);;
+asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', 'GROUP_A', '127.0.0.1', SERVER_MYPORT_1, '', 90, 70)
+The UDF asynchronous_connection_failover_add_managed() executed successfully.
+SELECT asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', 'GROUP_B', '127.0.0.1', SERVER_MYPORT_3, '', 85, 65);;
+asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', 'GROUP_B', '127.0.0.1', SERVER_MYPORT_3, '', 85, 65)
+The UDF asynchronous_connection_failover_add_managed() executed successfully.
+include/assert.inc ['There is one row in performance_schema.replication_asynchronous_connection_failover for server1']
+include/assert.inc ['There is one row in performance_schema.replication_asynchronous_connection_failover for server3']
+include/assert.inc ['There is one row in performance_schema.replication_asynchronous_connection_failover_managed for group A']
+include/assert.inc ['There is one row in performance_schema.replication_asynchronous_connection_failover_managed for group B']
+
+# 4. Create and start the managed channel.
+
+[connection server5]
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=1, SOURCE_PORT=SERVER_1_PORT, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+include/start_slave.inc [FOR CHANNEL 'ch1']
+include/assert.inc [Verify channel ch1 IO_THREAD is ON and connected to server1]
+
+# 5. Add secondary member to group A and validate is added to list of senders
+
+[connection server2]
+include/start_group_replication.inc
+[connection server5]
+
+# 6. Add secondary member to group B and validate is added to list of senders
+
+[connection server4]
+include/start_group_replication.inc
+[connection server5]
+
+# 7. Remove secondary member from group B and validate is removed from
+#    list of senders
+
+[connection server4]
+include/stop_group_replication.inc
+[connection server5]
+
+# 8. Remove secondary member from group A and validate is removed from
+#    list of senders
+
+[connection server2]
+include/stop_group_replication.inc
+[connection server5]
+
+# 9. Clean up.
+
+[connection server5]
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("The source .* for channel 'ch1' has joined the group .*, and so added its entry into replication_asynchronous_connection_failover table.");
+call mtr.add_suppression("The master's UUID has changed, although this should not happen unless you have changed it manually.");
+call mtr.add_suppression("The source .* for channel 'ch1' has left the group .*, and so removed its entry from replication_asynchronous_connection_failover table.");
+call mtr.add_suppression("The group .* for the channel .* has been removed, and so removed its entry from replication_asynchronous_connection_failover_managed and all the group members from replication_asynchronous_connection_failover table.");
+call mtr.add_suppression("The group .* for the channel .* has been added, and so added its entry in replication_asynchronous_connection_failover_managed and source to replication_asynchronous_connection_failover table.");
+SET SESSION sql_log_bin = 1;
+include/stop_slave.inc [FOR CHANNEL 'ch1']
+include/rpl_reset_slave.inc
+SELECT asynchronous_connection_failover_delete_managed('ch1', 'GROUP_A');
+asynchronous_connection_failover_delete_managed('ch1', 'GROUP_A')
+The UDF asynchronous_connection_failover_delete_managed() executed successfully.
+SELECT asynchronous_connection_failover_delete_managed('ch1', 'GROUP_B');
+asynchronous_connection_failover_delete_managed('ch1', 'GROUP_B')
+The UDF asynchronous_connection_failover_delete_managed() executed successfully.
+[connection server3]
+include/stop_group_replication.inc
+[connection server1]
+include/stop_group_replication.inc
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_receiver_add_delete_managed_on_mpm.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_receiver_add_delete_managed_on_mpm.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_receiver_add_delete_managed_on_mpm.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_receiver_add_delete_managed_on_mpm.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,87 @@
+include/group_replication.inc [rpl_server_count=4]
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+############################################################
+# 1. Deploy a 2 members group A in multi-primary mode.
+[connection server1]
+include/start_and_bootstrap_group_replication.inc
+[connection server2]
+include/start_group_replication.inc
+
+############################################################
+# 2. Deploy a 2 members group A in multi-primary mode.
+[connection server3]
+include/start_and_bootstrap_group_replication.inc
+[connection server4]
+include/start_group_replication.inc
+############################################################
+# 3. Add group A replication failover managed source into a member in
+#    group B, server3.
+#    It will be allowed but the configuration will not be propagated.
+[connection server3]
+SELECT asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', 'GROUP_A', '127.0.0.1', SERVER_MYPORT_2, '', 90, 70);;
+asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', 'GROUP_A', '127.0.0.1', SERVER_MYPORT_2, '', 90, 70)
+The UDF asynchronous_connection_failover_add_managed() executed successfully.
+include/assert.inc ['There is one row in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['The version of replication_asynchronous_connection_failover can be equal or greater than 1']
+include/assert.inc ['There is one row in performance_schema.replication_asynchronous_connection_failover_managed for group A']
+include/assert.inc ['The version of replication_asynchronous_connection_failover_managed must be 1']
+[connection server4]
+include/assert.inc ['There are no rows in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['There is no version of replication_asynchronous_connection_failover']
+include/assert.inc ['There are no rows in performance_schema.replication_asynchronous_connection_failover_managed']
+include/assert.inc ['There is no version of replication_asynchronous_connection_failover_managed']
+
+############################################################
+# 4. Create and start the managed channel on group B, server3.
+[connection server3]
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=1, SOURCE_PORT=SERVER_1_PORT, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+include/start_slave.inc [FOR CHANNEL 'ch1']
+include/assert.inc [Verify channel ch1 IO_THREAD is ON and connected to server1]
+include/assert.inc ['The version of replication_asynchronous_connection_failover can be equal or greater than 2']
+include/assert.inc ['There is one row in performance_schema.replication_asynchronous_connection_failover_managed for group A']
+include/assert.inc ['The version of replication_asynchronous_connection_failover_managed must be 1']
+[connection server4]
+include/assert.inc ['There is no replication channel ch1']
+include/assert.inc ['There are no rows in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['There is no version of replication_asynchronous_connection_failover']
+include/assert.inc ['There are no rows in performance_schema.replication_asynchronous_connection_failover_managed']
+include/assert.inc ['There is no version of replication_asynchronous_connection_failover_managed']
+############################################################
+# 5. Delete group A replication failover managed source in a member in
+#    group B, server3.
+#    It will be allowed but the configuration will not be propagated.
+[connection server3]
+include/stop_slave.inc [FOR CHANNEL 'ch1']
+SELECT asynchronous_connection_failover_delete_managed('ch1', 'GROUP_A');
+asynchronous_connection_failover_delete_managed('ch1', 'GROUP_A')
+The UDF asynchronous_connection_failover_delete_managed() executed successfully.
+include/assert.inc ['There are no rows in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['The version of replication_asynchronous_connection_failover can be equal or greater than 3']
+include/assert.inc ['There are no rows in performance_schema.replication_asynchronous_connection_failover_managed']
+include/assert.inc ['The version of replication_asynchronous_connection_failover_managed must be 2']
+[connection server4]
+include/assert.inc ['There is no replication channel ch1']
+include/assert.inc ['There are no rows in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['There is no version of replication_asynchronous_connection_failover']
+include/assert.inc ['There are no rows in performance_schema.replication_asynchronous_connection_failover_managed']
+include/assert.inc ['There is no version of replication_asynchronous_connection_failover_managed']
+
+############################################################
+# 6. Clean up.
+[connection server4]
+include/stop_group_replication.inc
+[connection server3]
+include/stop_group_replication.inc
+include/rpl_reset_slave.inc
+[connection server2]
+include/stop_group_replication.inc
+[connection server1]
+include/stop_group_replication.inc
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_receiver_add_delete_managed.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_receiver_add_delete_managed.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_receiver_add_delete_managed.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_receiver_add_delete_managed.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,132 @@
+include/group_replication.inc [rpl_server_count=5]
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("The master's UUID has changed, although this should not happen unless you have changed it manually. The old UUID was.*");
+SET SESSION sql_log_bin = 1;
+[connection server2]
+[connection server3]
+[connection server4]
+[connection server5]
+#
+# 1. Deploy a 3 members receiver group in single primary mode.
+#
+[connection server1]
+SET GLOBAL GROUP_REPLICATION_GROUP_SEEDS= "LOCAL_ADDRESS_SERVER1, LOCAL_ADDRESS_SERVER2";
+include/start_and_bootstrap_group_replication.inc
+[connection server2]
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_PORT=SERVER_4_PORT, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1, SOURCE_CONNECTION_AUTO_FAILOVER=1 FOR CHANNEL 'ch1';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+SET GLOBAL GROUP_REPLICATION_GROUP_SEEDS= "LOCAL_ADDRESS_SERVER1, LOCAL_ADDRESS_SERVER2";
+include/start_group_replication.inc
+#
+# 2. Deploy a 2 members sender group in single primary mode.
+#    The third member of the group i.e. server5 will be added later
+#    to verify changes are getting synced to receiver group members.
+#
+[connection server3]
+SET GLOBAL GROUP_REPLICATION_GROUP_SEEDS= "LOCAL_ADDRESS_SERVER3, LOCAL_ADDRESS_SERVER4, LOCAL_ADDRESS_SERVER5";
+include/start_and_bootstrap_group_replication.inc
+[connection server4]
+SET GLOBAL GROUP_REPLICATION_GROUP_SEEDS= "LOCAL_ADDRESS_SERVER3, LOCAL_ADDRESS_SERVER4, LOCAL_ADDRESS_SERVER5";
+include/start_group_replication.inc
+
+# 3. Create a replication channel to replicate from server3 to
+#    server1.
+
+[connection server1]
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_PORT=SERVER_4_PORT, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1, SOURCE_CONNECTION_AUTO_FAILOVER=1 FOR CHANNEL 'ch1';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+
+# 4. Add replication connection details of managed channel ch1
+#    to replication_asynchronous_connection_failover_managed table
+#    through asynchronous_connection_failover_add_managed() UDF.
+
+SELECT asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', "GROUP_B",'127.0.0.1', SERVER_MYPORT_4, '', 80, 60);
+asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', "GROUP_B",'127.0.0.1', SERVER_MYPORT_4, '', 80, 60)
+The UDF asynchronous_connection_failover_add_managed() executed successfully.
+
+# 5. Start replica for channel ch1.
+
+include/start_slave.inc [FOR CHANNEL 'ch1']
+
+# 6. Verify replication_asynchronous_connection_failover on
+#    server1 has two rows and member action configuration version
+#    value for replication_asynchronous_connection_failover
+#    and for replication_asynchronous_connection_failover_managed.
+
+
+# 7. Verify replication_asynchronous_connection_failover on
+#    server2 has two rows and member action configuration version
+#    value for replication_asynchronous_connection_failover
+#    and for replication_asynchronous_connection_failover_managed.
+
+[connection server2]
+#
+# 8. Add another member i.e. server5 to sender group.
+#
+[connection server5]
+SET GLOBAL GROUP_REPLICATION_GROUP_SEEDS= "LOCAL_ADDRESS_SERVER3, LOCAL_ADDRESS_SERVER4, LOCAL_ADDRESS_SERVER5";
+include/start_group_replication.inc
+include/assert.inc [There are three members in the group.]
+
+# 9. Verify replication_asynchronous_connection_failover on
+#    server1 has three rows and member action configuration version
+#    value for replication_asynchronous_connection_failover
+#    and for replication_asynchronous_connection_failover_managed.
+
+[connection server1]
+
+# 10. Verify replication_asynchronous_connection_failover on
+#     server2 has three rows and member action configuration version
+#     value for replication_asynchronous_connection_failover
+#     and for replication_asynchronous_connection_failover_managed.
+
+[connection server2]
+
+# 11. Delete replication connection details for managed channel ch1
+#     from replication_asynchronous_connection_failover_managed
+#     and replication_asynchronous_connection_failover table
+#     through asynchronous_connection_failover_delete_managed() UDF.
+
+[connection server1]
+SELECT asynchronous_connection_failover_delete_managed('ch1', 'GROUP_B');
+asynchronous_connection_failover_delete_managed('ch1', 'GROUP_B')
+The UDF asynchronous_connection_failover_delete_managed() executed successfully.
+
+# 12. Verify replication_asynchronous_connection_failover on
+#     server1 is empty and member action configuration version
+#     value for replication_asynchronous_connection_failover
+#     and for replication_asynchronous_connection_failover_managed.
+
+
+# 13. Verify replication_asynchronous_connection_failover on
+#     server2 is empty and member action configuration version
+#     value for replication_asynchronous_connection_failover
+#     and for replication_asynchronous_connection_failover_managed.
+
+[connection server2]
+#
+# 14. Clean up.
+#
+[connection server1]
+include/stop_slave.inc [FOR CHANNEL 'ch1']
+include/rpl_reset_slave.inc
+[connection server5]
+include/stop_group_replication.inc
+[connection server4]
+include/stop_group_replication.inc
+[connection server3]
+include/stop_group_replication.inc
+[connection server2]
+include/stop_group_replication.inc
+include/rpl_reset_slave.inc
+[connection server1]
+include/stop_group_replication.inc
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_receiver_add_delete_source_on_mpm.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_receiver_add_delete_source_on_mpm.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_receiver_add_delete_source_on_mpm.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_receiver_add_delete_source_on_mpm.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,35 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+############################################################
+# 1. Add replication failover sources into a member in
+#    a multi-primary mode group.
+#    It will be allowed but the configuration will not be propagated.
+[connection server1]
+SELECT asynchronous_connection_failover_add_source('ch1', '127.0.0.1', 3306, '', 50);
+asynchronous_connection_failover_add_source('ch1', '127.0.0.1', 3306, '', 50)
+The UDF asynchronous_connection_failover_add_source() executed successfully.
+include/assert.inc ['There is one row in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['The version of replication_asynchronous_connection_failover must be 1']
+[connection server2]
+include/assert.inc ['There are no rows in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['There is no version of replication_asynchronous_connection_failover']
+############################################################
+# 2. Delete replication failover sources in a member in
+#    a multi-primary mode group.
+#    It will be allowed but the configuration will not be propagated.
+[connection server1]
+SELECT asynchronous_connection_failover_delete_source('ch1', '127.0.0.1', 3306, '');
+asynchronous_connection_failover_delete_source('ch1', '127.0.0.1', 3306, '')
+The UDF asynchronous_connection_failover_delete_source() executed successfully.
+include/assert.inc ['There are no rows in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['The version of replication_asynchronous_connection_failover must be 2']
+[connection server2]
+include/assert.inc ['There are no rows in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['There is no version of replication_asynchronous_connection_failover']
+
+############################################################
+# 3. Clean up.
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_receiver_add_delete_source.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_receiver_add_delete_source.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_receiver_add_delete_source.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_receiver_add_delete_source.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,94 @@
+include/group_replication.inc [rpl_server_count=5]
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+# 1. Deploy a 3 members group in single primary mode.
+
+[connection server1]
+include/start_and_bootstrap_group_replication.inc
+[connection server2]
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_PORT=SERVER_4_PORT, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1, SOURCE_CONNECTION_AUTO_FAILOVER=1 FOR CHANNEL 'ch1';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+include/start_group_replication.inc
+[connection server3]
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_PORT=SERVER_4_PORT, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1, SOURCE_CONNECTION_AUTO_FAILOVER=1 FOR CHANNEL 'ch1';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+include/start_group_replication.inc
+
+# 2. Create a replication channel to replicate from server4 to
+#    server1.
+
+[connection server1]
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_PORT=SERVER_4_PORT, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1, SOURCE_CONNECTION_AUTO_FAILOVER=1 FOR CHANNEL 'ch1';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+
+# 3. Add replication connection details of server4 and server5
+#    to replication_asynchronous_connection_failover table
+#    through asynchronous_connection_failover_add_source() UDF.
+
+SELECT asynchronous_connection_failover_add_source('ch1', '127.0.0.1', SERVER_MYPORT_4, '', 50);
+asynchronous_connection_failover_add_source('ch1', '127.0.0.1', SERVER_MYPORT_4, '', 50)
+The UDF asynchronous_connection_failover_add_source() executed successfully.
+SELECT asynchronous_connection_failover_add_source('ch1', '127.0.0.1', SERVER_MYPORT_5, '', 40);
+asynchronous_connection_failover_add_source('ch1', '127.0.0.1', SERVER_MYPORT_5, '', 40)
+The UDF asynchronous_connection_failover_add_source() executed successfully.
+
+# 4. Start replica for channel ch1.
+
+include/start_slave.inc [FOR CHANNEL 'ch1']
+
+# 5. Verify replication_asynchronous_connection_failover on
+#    server1 has two rows (of server4 and server5) and member action
+#    configuration version value is 2 in
+#    replication_group_configuration_version.
+
+
+# 6. Verify replication_asynchronous_connection_failover on
+#    server2 and server3 has two rows (of server4 and server5) and
+#    member action configuration version value is 2 in
+#    replication_group_configuration_version.
+
+[connection server2]
+[connection server3]
+
+# 7. Delete replication connection details of server4 and server5
+#    from replication_asynchronous_connection_failover table
+#    through asynchronous_connection_failover_delete_source() UDF.
+
+[connection server1]
+SELECT asynchronous_connection_failover_delete_source('ch1', '127.0.0.1', SERVER_MYPORT_4, '');
+asynchronous_connection_failover_delete_source('ch1', '127.0.0.1', SERVER_MYPORT_4, '')
+The UDF asynchronous_connection_failover_delete_source() executed successfully.
+SELECT asynchronous_connection_failover_delete_source('ch1', '127.0.0.1', SERVER_MYPORT_5, '');
+asynchronous_connection_failover_delete_source('ch1', '127.0.0.1', SERVER_MYPORT_5, '')
+The UDF asynchronous_connection_failover_delete_source() executed successfully.
+
+# 8. Verify replication_asynchronous_connection_failover on
+#    server1 is empty and member action configuration version value
+#    is 4 in replication_group_configuration_version.
+
+
+# 9. Verify replication_asynchronous_connection_failover on
+#    server2 is empty and member action configuration version value
+#    is 4 in replication_group_configuration_version.
+
+[connection server2]
+
+# 10. Clean up.
+
+[connection server1]
+include/stop_slave.inc [FOR CHANNEL 'ch1']
+include/rpl_reset_slave.inc
+[connection server2]
+include/rpl_reset_slave.inc
+[connection server3]
+include/rpl_reset_slave.inc
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_receiver_clone_on_rejoin.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_receiver_clone_on_rejoin.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_receiver_clone_on_rejoin.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_receiver_clone_on_rejoin.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,206 @@
+include/group_replication.inc [rpl_server_count=4]
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+[connection server2]
+[connection server3]
+
+# 1. Install clone plugin on server1.
+
+[connection server1]
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+
+# 2. Create replication channel ch1
+#    with SOURCE_CONNECTION_AUTO_FAILOVER enabled.
+#    And verify managed channel and non-managed source addition
+#    is successful in failover tables.
+
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=1, SOURCE_PORT=SERVER_MYPORT_4, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+SELECT asynchronous_connection_failover_add_source('ch1', '127.0.0.1', SERVER_MYPORT_4, '', 90);
+asynchronous_connection_failover_add_source('ch1', '127.0.0.1', SERVER_MYPORT_4, '', 90)
+The UDF asynchronous_connection_failover_add_source() executed successfully.
+SELECT asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', '10.0.0.2', 3306, '', 80, 70);
+asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', '10.0.0.2', 3306, '', 80, 70)
+The UDF asynchronous_connection_failover_add_managed() executed successfully.
+include/assert.inc ['There are 2 rows in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['The version of replication_asynchronous_connection_failover must be 2']
+include/assert.inc ['There is 1 row in performance_schema.replication_asynchronous_connection_failover_managed']
+include/assert.inc ['The version of replication_asynchronous_connection_failover_managed must be 1']
+include/assert.inc ['SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1']
+
+# 3. Bootstrap server1 and add some data
+#    Verify channel 'ch1' is running.
+
+SET GLOBAL GROUP_REPLICATION_GROUP_SEEDS= "LOCAL_ADDRESS_SERVER1, LOCAL_ADDRESS_SERVER2, LOCAL_ADDRESS_SERVER3";
+include/start_and_bootstrap_group_replication.inc
+CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1);
+INSERT INTO t1 VALUES (2);
+include/assert.inc ['CHANNEL ch1 is running']
+
+# 4. Install the clone plugin and start GR on server3
+
+[connection server3]
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+
+# 5. Create replication channel ch1
+#    with SOURCE_CONNECTION_AUTO_FAILOVER enabled.
+#    And verify managed channel and non-managed source synced
+#    is successful to failover tables.
+
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=0, SOURCE_PORT=SERVER_MYPORT_4, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+SET GLOBAL GROUP_REPLICATION_GROUP_SEEDS= "LOCAL_ADDRESS_SERVER1, LOCAL_ADDRESS_SERVER2, LOCAL_ADDRESS_SERVER3";
+include/start_group_replication.inc
+include/assert.inc ['There are 2 rows in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['The version of replication_asynchronous_connection_failover must be 2']
+include/assert.inc ['There is 1 row in performance_schema.replication_asynchronous_connection_failover_managed']
+include/assert.inc ['The version of replication_asynchronous_connection_failover_managed must be 1']
+include/assert.inc ['SOURCE_CONNECTION_AUTO_FAILOVER must be enabled for ch1']
+
+# 6. Restart server 2 with a monitoring process (mysqld_safe)
+
+[connection server2]
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='10.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=0, SOURCE_PORT=3306, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+SET PERSIST local_infile= ON;
+include/spawn_monitoring_process.inc
+
+# 7. Setup server2 so group replication starts on boot
+#    Install the Clone plugin
+
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+
+# 8. On a empty server2 start group replication
+#    Wait for it to restart and come back
+#    Check clone was completed
+
+SET GLOBAL group_replication_clone_threshold= 1;
+SET GLOBAL GROUP_REPLICATION_GROUP_SEEDS= "LOCAL_ADDRESS_SERVER1, LOCAL_ADDRESS_SERVER2, LOCAL_ADDRESS_SERVER3";
+START GROUP_REPLICATION;
+include/rpl_reconnect.inc
+include/gr_wait_for_member_state.inc
+include/assert.inc [Clone must be completed]
+
+# 9. Verify data has been properly cloned in server2.
+
+include/diff_tables.inc [server1:test.t1, server2:test.t1, server3:test.t1]
+include/assert.inc ['There are 2 rows in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['The version of replication_asynchronous_connection_failover must be 2']
+include/assert.inc ['There is 1 row in performance_schema.replication_asynchronous_connection_failover_managed']
+include/assert.inc ['The version of replication_asynchronous_connection_failover_managed must be 1']
+include/assert.inc ['SOURCE_CONNECTION_AUTO_FAILOVER must be enabled for ch1']
+
+# 10. Get server2 expelled.
+
+[connection server2]
+SET GLOBAL super_read_only = 0;
+SET @debug_saved = @@GLOBAL.DEBUG;
+SET @@GLOBAL.DEBUG='+d,group_replication_stop_before_rejoin';
+include/gr_expel_member_from_group.inc
+SET SESSION sql_log_bin = 0;
+CREATE TABLE pid_table(pid_no INT PRIMARY KEY);
+LOAD DATA LOCAL INFILE 'pid_file' INTO TABLE pid_table;
+DROP TABLE pid_table;
+SET SESSION sql_log_bin = 1;
+SET GLOBAL super_read_only = 1;
+SET DEBUG_SYNC = "now WAIT_FOR signal.autorejoin_waiting";
+include/assert.inc [Auto-rejoin should be running]
+
+# 11. Add more data and new source to failover table
+#     on server 1 before server2 rejoins.
+
+[connection server1]
+SELECT asynchronous_connection_failover_add_source('ch1', '10.0.0.1', 3307, '', 50);
+asynchronous_connection_failover_add_source('ch1', '10.0.0.1', 3307, '', 50)
+The UDF asynchronous_connection_failover_add_source() executed successfully.
+INSERT INTO t1 VALUES (3);
+INSERT INTO t1 VALUES (4);
+include/assert.inc ['There are 3 rows in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['The version of replication_asynchronous_connection_failover must be 2']
+include/rpl_sync.inc
+
+# 12. Unblock the rejoin, another clone should happen
+
+[connection server2]
+SET GLOBAL group_replication_clone_threshold= 1;
+SET DEBUG_SYNC = "now SIGNAL signal.autorejoin_continue";
+include/rpl_reconnect.inc
+include/gr_wait_for_member_state.inc
+include/assert.inc [Clone must be completed]
+
+# 13. Verify if the data and failover tables
+#     has been properly cloned in server2.
+
+include/diff_tables.inc [server1:test.t1, server2:test.t1, server3:test.t1]
+include/assert.inc ['There are 3 rows in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['The version of replication_asynchronous_connection_failover must be 3']
+include/assert.inc ['There is 1 row in performance_schema.replication_asynchronous_connection_failover_managed']
+include/assert.inc ['The version of replication_asynchronous_connection_failover_managed must be 1']
+include/assert.inc ['SOURCE_CONNECTION_AUTO_FAILOVER must be enabled for ch1']
+
+# 14. Stop the replication channel 'ch1' on server1, and change
+#     primary to server2. The asynchronous replication channel (ch1)
+#     connection will be started without any error.
+
+[connection server1]
+include/stop_slave.inc [FOR CHANNEL 'ch1']
+[connection server2]
+SELECT group_replication_set_as_primary("SERVER2_UUID");
+group_replication_set_as_primary("SERVER2_UUID")
+Primary server switched to: SERVER2_UUID
+include/gr_wait_primary_member_uuid.inc
+include/wait_for_slave_to_start.inc [FOR CHANNEL 'ch1']
+include/assert.inc [Verify replica_monitor thread is running]
+
+# 15. Cleanup
+
+DROP TABLE t1;
+RESET PERSIST IF EXISTS group_replication_enforce_update_everywhere_checks;
+RESET PERSIST IF EXISTS group_replication_single_primary_mode;
+RESET PERSIST IF EXISTS group_replication_group_name;
+RESET PERSIST IF EXISTS group_replication_local_address;
+RESET PERSIST IF EXISTS group_replication_group_seeds;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
+RESET PERSIST IF EXISTS group_replication_start_on_boot;
+RESET PERSIST IF EXISTS local_infile;
+include/stop_slave.inc [FOR CHANNEL 'ch1']
+include/rpl_reset_slave.inc
+[connection server1]
+include/stop_group_replication.inc
+UNINSTALL PLUGIN clone;
+include/rpl_reset_slave.inc
+set session sql_log_bin=0;
+call mtr.add_suppression("The Monitor IO thread failed to connect to the source .* for channel 'ch1', thence it will try to connect to another source.");
+set session sql_log_bin=1;
+[connection server3]
+include/stop_group_replication.inc
+UNINSTALL PLUGIN clone;
+include/rpl_reset_slave.inc
+[connection server2]
+include/stop_group_replication.inc
+UNINSTALL PLUGIN clone;
+set session sql_log_bin=0;
+call mtr.add_suppression("Recovery from master pos .* and file .* for channel 'ch1'. Previous relay log pos and relay log file had been set to .* respectively.");
+call mtr.add_suppression("The Monitor IO thread failed to connect to the source .* for channel 'ch1', thence it will try to connect to another source.");
+call mtr.add_suppression("This member will start distributed recovery using clone. It is due to the number of missing transactions being higher than the configured threshold of*");
+call mtr.add_suppression("Member was expelled from the group due to network failures, changing member status to ERROR.");
+call mtr.add_suppression("The server was automatically set into read only mode after an error was detected.");
+call mtr.add_suppression("Started auto-rejoin procedure attempt*");
+call mtr.add_suppression("Auto-rejoin procedure attempt 1 of 1");
+call mtr.add_suppression("Clone removing all user data for provisioning: Started");
+call mtr.add_suppression("Clone removing all user data for provisioning: Finished");
+call mtr.add_suppression("Relay log information for channel 'ch1' was found after a clone operation. Relay log recovery will be executed to adjust positions .*");
+call mtr.add_suppression("Error during .* Could not locate rotate event from the master.");
+call mtr.add_suppression("Server was not able to find a rotate event from master server to initialize relay log recovery for channel .*");
+set session sql_log_bin=1;
+include/clean_monitoring_process.inc
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_receiver_failover_channel_non_existent_on_the_group.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_receiver_failover_channel_non_existent_on_the_group.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_receiver_failover_channel_non_existent_on_the_group.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_receiver_failover_channel_non_existent_on_the_group.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,60 @@
+include/group_replication.inc [rpl_server_count=3]
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+############################################################
+# 1. Deploy a group in single-primary mode on server1 and server2.
+[connection server1]
+include/start_and_bootstrap_group_replication.inc
+include/gr_assert_primary_member.inc
+[connection server2]
+SET SESSION sql_log_bin= 0;
+call mtr.add_suppression("Unable to set SOURCE_CONNECTION_AUTO_FAILOVER on a non-existent or misconfigured replication channel 'ch1', please create the channel and rejoin the server to the group.");
+call mtr.add_suppression("A message sent through the Group Replication message deliver service was not delivered successfully. The server will now leave the group.*");
+call mtr.add_suppression("The server was automatically set into read only mode after an error was detected.");
+call mtr.add_suppression("Skipping leave operation: concurrent attempt to leave the group is on-going.");
+SET SESSION sql_log_bin= 1;
+include/start_group_replication.inc
+include/gr_assert_secondary_member.inc
+
+############################################################
+# 2. Configure a failover channel on server1 that replicates
+#    from server3.
+[connection server3]
+[connection server1]
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=1, SOURCE_PORT=SERVER_3_PORT, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+SELECT asynchronous_connection_failover_add_source('ch1', '127.0.0.1', SERVER_MYPORT_3, '', 50);;
+asynchronous_connection_failover_add_source('ch1', '127.0.0.1', SERVER_MYPORT_3, '', 50)
+The UDF asynchronous_connection_failover_add_source() executed successfully.
+include/start_slave.inc [FOR CHANNEL 'ch1']
+include/assert.inc ['There is 1 row in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['The version of replication_asynchronous_connection_failover must be 1']
+include/assert.inc ['SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1']
+include/assert.inc [Verify channel ch1 IO_THREAD is ON and connected to server3]
+include/assert.inc [Verify channel ch1 SQL_THREAD is ON]
+include/assert.inc [Verify replica_monitor thread is running]
+
+############################################################
+# 3. Server2 will leave the group once server propagates
+#    failover channel 'ch1' server2 does not have that channel.
+[connection server2]
+include/gr_wait_for_member_state.inc
+include/assert.inc ['There are 0 rows in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['There is no version of replication_asynchronous_connection_failover']
+include/assert.inc ['There is no channel ch1']
+include/assert.inc [Verify replica_monitor thread is not running]
+include/assert_grep.inc [Unable to set SOURCE_CONNECTION_AUTO_FAILOVER on a non-existent or misconfigured replication channel 'ch1', please create the channel and rejoin the server to the group.]
+
+############################################################
+# 4. Clean up.
+[connection server2]
+include/stop_group_replication.inc
+[connection server1]
+include/stop_group_replication.inc
+include/rpl_reset_slave.inc
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_receiver_member_join.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_receiver_member_join.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_receiver_member_join.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_receiver_member_join.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,111 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+############################################################
+# 1. Add a single server and managed sources to failover
+#    channel 'ch1' to server1.
+[connection server1]
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='10.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=1, SOURCE_PORT=3306, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+SELECT asynchronous_connection_failover_add_source('ch1', '10.0.0.1', 3306, '', 50);
+asynchronous_connection_failover_add_source('ch1', '10.0.0.1', 3306, '', 50)
+The UDF asynchronous_connection_failover_add_source() executed successfully.
+SELECT asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', '10.0.0.2', 3306, '', 90, 70);
+asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', '10.0.0.2', 3306, '', 90, 70)
+The UDF asynchronous_connection_failover_add_managed() executed successfully.
+include/assert.inc ['There are 2 rows in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['The version of replication_asynchronous_connection_failover must be 2']
+include/assert.inc ['There is 1 row in performance_schema.replication_asynchronous_connection_failover_managed']
+include/assert.inc ['The version of replication_asynchronous_connection_failover_managed must be 1']
+include/assert.inc ['SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1']
+include/assert.inc ['SOURCE_CONNECTION_AUTO_FAILOVER=1 must be persisted on ch1']
+SELECT * FROM performance_schema.replication_asynchronous_connection_failover;
+CHANNEL_NAME	HOST	PORT	NETWORK_NAMESPACE	WEIGHT	MANAGED_NAME
+ch1	10.0.0.1	3306		50	
+ch1	10.0.0.2	3306		70	aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa
+SELECT * FROM performance_schema.replication_asynchronous_connection_failover_managed;
+CHANNEL_NAME	MANAGED_NAME	MANAGED_TYPE	CONFIGURATION
+ch1	aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa	GroupReplication	{"Primary_weight": 90, "Secondary_weight": 70}
+SELECT * FROM performance_schema.replication_group_configuration_version WHERE name LIKE 'replication_asynchronous_connection_failover%';
+name	version
+replication_asynchronous_connection_failover	2
+replication_asynchronous_connection_failover_managed	1
+
+############################################################
+# 2. Bootstrap the group on server1, all failover configuration
+#    will be preserved.
+[connection server1]
+SELECT group_replication_disable_member_action("mysql_start_failover_channels_if_primary", "AFTER_PRIMARY_ELECTION");
+group_replication_disable_member_action("mysql_start_failover_channels_if_primary", "AFTER_PRIMARY_ELECTION")
+OK
+include/start_and_bootstrap_group_replication.inc
+include/assert.inc [The action mysql_start_failover_channels_if_primary must be disabled]
+include/assert.inc ['There are 2 rows in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['The version of replication_asynchronous_connection_failover must be 2']
+include/assert.inc ['There is 1 row in performance_schema.replication_asynchronous_connection_failover_managed']
+include/assert.inc ['The version of replication_asynchronous_connection_failover_managed must be 1']
+include/assert.inc ['SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1']
+include/assert.inc ['SOURCE_CONNECTION_AUTO_FAILOVER=1 must be persisted on ch1']
+SELECT * FROM performance_schema.replication_asynchronous_connection_failover;
+CHANNEL_NAME	HOST	PORT	NETWORK_NAMESPACE	WEIGHT	MANAGED_NAME
+ch1	10.0.0.1	3306		50	
+ch1	10.0.0.2	3306		70	aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa
+SELECT * FROM performance_schema.replication_asynchronous_connection_failover_managed;
+CHANNEL_NAME	MANAGED_NAME	MANAGED_TYPE	CONFIGURATION
+ch1	aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa	GroupReplication	{"Primary_weight": 90, "Secondary_weight": 70}
+SELECT * FROM performance_schema.replication_group_configuration_version WHERE name LIKE 'replication_asynchronous_connection_failover%';
+name	version
+replication_asynchronous_connection_failover	2
+replication_asynchronous_connection_failover_managed	1
+
+############################################################
+# 3. Join server2 to the group, it will replace its failover
+#    configuration.
+[connection server2]
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='10.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=0, SOURCE_PORT=3306, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+SELECT asynchronous_connection_failover_add_source('ch9', '10.0.0.19', 3306, '', 50);
+asynchronous_connection_failover_add_source('ch9', '10.0.0.19', 3306, '', 50)
+The UDF asynchronous_connection_failover_add_source() executed successfully.
+SELECT asynchronous_connection_failover_add_source('ch9', '10.0.0.20', 3306, '', 50);
+asynchronous_connection_failover_add_source('ch9', '10.0.0.20', 3306, '', 50)
+The UDF asynchronous_connection_failover_add_source() executed successfully.
+SELECT asynchronous_connection_failover_add_managed('ch9', 'GroupReplication', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', '10.0.0.29', 3306, '', 90, 70);
+asynchronous_connection_failover_add_managed('ch9', 'GroupReplication', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', '10.0.0.29', 3306, '', 90, 70)
+The UDF asynchronous_connection_failover_add_managed() executed successfully.
+include/assert.inc ['SOURCE_CONNECTION_AUTO_FAILOVER=0 must be persisted on ch1']
+include/start_group_replication.inc
+include/assert.inc [The action mysql_start_failover_channels_if_primary must be disabled]
+include/assert.inc ['There are 2 rows in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['The version of replication_asynchronous_connection_failover must be 2']
+include/assert.inc ['There is 1 row in performance_schema.replication_asynchronous_connection_failover_managed']
+include/assert.inc ['The version of replication_asynchronous_connection_failover_managed must be 1']
+include/assert.inc ['SOURCE_CONNECTION_AUTO_FAILOVER must be enabled for ch1']
+SELECT * FROM performance_schema.replication_asynchronous_connection_failover;
+CHANNEL_NAME	HOST	PORT	NETWORK_NAMESPACE	WEIGHT	MANAGED_NAME
+ch1	10.0.0.1	3306		50	
+ch1	10.0.0.2	3306		70	aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa
+SELECT * FROM performance_schema.replication_asynchronous_connection_failover_managed;
+CHANNEL_NAME	MANAGED_NAME	MANAGED_TYPE	CONFIGURATION
+ch1	aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa	GroupReplication	{"Primary_weight": 90, "Secondary_weight": 70}
+SELECT * FROM performance_schema.replication_group_configuration_version WHERE name LIKE 'replication_asynchronous_connection_failover%';
+name	version
+replication_asynchronous_connection_failover	2
+replication_asynchronous_connection_failover_managed	1
+include/assert.inc ['SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1']
+include/assert.inc ['SOURCE_CONNECTION_AUTO_FAILOVER=1 must be persisted on ch1']
+
+############################################################
+# 4. Clean up.
+[connection server1]
+include/rpl_reset_slave.inc
+[connection server2]
+include/rpl_reset_slave.inc
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_receiver_mpm_to_spm.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_receiver_mpm_to_spm.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_receiver_mpm_to_spm.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_receiver_mpm_to_spm.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,137 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+############################################################
+# 1. Deploy a group in multi-primary mode on server1 and server2.
+[connection server1]
+include/start_and_bootstrap_group_replication.inc
+[connection server2]
+include/start_group_replication.inc
+
+############################################################
+# 2. Configure a failover channel on server1 that replicates
+#    from server3.
+[connection server3]
+[connection server1]
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=1, SOURCE_PORT=SERVER_3_PORT, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+SELECT asynchronous_connection_failover_add_source('ch1', '127.0.0.1', SERVER_MYPORT_3, '', 50);;
+asynchronous_connection_failover_add_source('ch1', '127.0.0.1', SERVER_MYPORT_3, '', 50)
+The UDF asynchronous_connection_failover_add_source() executed successfully.
+include/start_slave.inc [FOR CHANNEL 'ch1']
+include/assert.inc ['There is 1 row in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['The version of replication_asynchronous_connection_failover must be 1']
+include/assert.inc ['SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1']
+include/assert.inc [Verify channel ch1 IO_THREAD is ON and connected to server3]
+include/assert.inc [Verify replica_monitor thread is running]
+
+############################################################
+# 3. Configure the same failover channel on server2.
+#    In single-primary mode, the mode to which we will change,
+#    the failover channels must exist on all members.
+#    The channel is created with SOURCE_CONNECTION_AUTO_FAILOVER=0
+#    to show that it will change to SOURCE_CONNECTION_AUTO_FAILOVER=1
+#    when group mode changes to single-primary mode.
+[connection server2]
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=0, SOURCE_PORT=SERVER_3_PORT, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+
+############################################################
+# 4. Add some failovers sources to server2 that will be replaced
+#    when server1 becomes the primary in single-primary mode.
+SELECT asynchronous_connection_failover_add_source('ch1', '10.0.0.1', 3306, '', 50);
+asynchronous_connection_failover_add_source('ch1', '10.0.0.1', 3306, '', 50)
+The UDF asynchronous_connection_failover_add_source() executed successfully.
+SELECT asynchronous_connection_failover_add_source('ch1', '10.0.0.2', 3306, '', 50);
+asynchronous_connection_failover_add_source('ch1', '10.0.0.2', 3306, '', 50)
+The UDF asynchronous_connection_failover_add_source() executed successfully.
+include/assert.inc ['There are 2 rows in performance_schema.replication_asynchronous_connection_failover']
+SELECT * FROM performance_schema.replication_asynchronous_connection_failover;
+CHANNEL_NAME	HOST	PORT	NETWORK_NAMESPACE	WEIGHT	MANAGED_NAME
+ch1	10.0.0.1	3306		50	
+ch1	10.0.0.2	3306		50	
+SELECT * FROM performance_schema.replication_group_configuration_version WHERE name LIKE 'replication_asynchronous_connection_failover';
+name	version
+replication_asynchronous_connection_failover	2
+
+############################################################
+# 5. Change to single-primary mode.
+#    The primary must be server1, since when a member has
+#    replication channels running it must be the primary.
+[connection server1]
+SELECT group_replication_switch_to_single_primary_mode("MEMBER1_UUID");
+group_replication_switch_to_single_primary_mode("MEMBER1_UUID")
+Mode switched to single-primary successfully.
+include/gr_assert_primary_member.inc
+[connection server2]
+include/gr_assert_secondary_member.inc
+
+############################################################
+# 6. Validate that server1 replication failover channels
+#    configuration is preserved, and that it did replace the
+#    one on server2.
+[connection server1]
+include/assert.inc ['There is 1 row in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['The version of replication_asynchronous_connection_failover must be 1']
+include/assert.inc ['SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1']
+include/assert.inc [Verify channel ch1 IO_THREAD is ON and connected to server3]
+include/assert.inc ['Validate the number of workers on performance_schema.replication_applier_status_by_worker table for channel ch1']
+include/assert.inc [Verify replica_monitor thread is running]
+SELECT * FROM performance_schema.replication_asynchronous_connection_failover;
+CHANNEL_NAME	HOST	PORT	NETWORK_NAMESPACE	WEIGHT	MANAGED_NAME
+ch1	127.0.0.1	PORT		50	
+SELECT * FROM performance_schema.replication_group_configuration_version WHERE name LIKE 'replication_asynchronous_connection_failover';
+name	version
+replication_asynchronous_connection_failover	1
+[connection server2]
+include/assert.inc ['There is 1 row in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['The version of replication_asynchronous_connection_failover must be 1']
+include/assert.inc ['SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1']
+include/assert.inc [Verify channel ch1 IO_THREAD is OFF]
+include/assert.inc [Verify replica_monitor thread is not running]
+SELECT * FROM performance_schema.replication_asynchronous_connection_failover;
+CHANNEL_NAME	HOST	PORT	NETWORK_NAMESPACE	WEIGHT	MANAGED_NAME
+ch1	127.0.0.1	PORT		50	
+SELECT * FROM performance_schema.replication_group_configuration_version WHERE name LIKE 'replication_asynchronous_connection_failover';
+name	version
+replication_asynchronous_connection_failover	1
+
+############################################################
+# 7. server1 leaves the group.
+#    server2 is the new primary and does start the failover
+#    channel.
+[connection server1]
+include/stop_group_replication.inc
+[connection server2]
+include/gr_wait_primary_member_uuid.inc
+include/wait_for_slave_to_start.inc [FOR CHANNEL 'ch1']
+include/assert.inc ['There is 1 row in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['The version of replication_asynchronous_connection_failover must be 1']
+include/assert.inc ['SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1']
+include/assert.inc [Verify channel ch1 IO_THREAD is ON and connected to server3]
+include/assert.inc ['Validate the number of workers on performance_schema.replication_applier_status_by_worker table for channel ch1']
+include/assert.inc [Verify replica_monitor thread is running]
+SELECT * FROM performance_schema.replication_asynchronous_connection_failover;
+CHANNEL_NAME	HOST	PORT	NETWORK_NAMESPACE	WEIGHT	MANAGED_NAME
+ch1	127.0.0.1	PORT		50	
+SELECT * FROM performance_schema.replication_group_configuration_version WHERE name LIKE 'replication_asynchronous_connection_failover';
+name	version
+replication_asynchronous_connection_failover	1
+
+############################################################
+# 8. Clean up.
+[connection server2]
+include/stop_group_replication.inc
+include/rpl_reset_slave.inc
+[connection server1]
+include/rpl_reset_slave.inc
+[connection server3]
+include/stop_dump_threads.inc
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_receiver_network_partition.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_receiver_network_partition.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_receiver_network_partition.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_receiver_network_partition.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,110 @@
+include/group_replication.inc [rpl_server_count=4]
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+############################################################
+# 1. Deploy group A in single-primary mode on server1 and server2.
+[connection server1]
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("This server is not able to reach a majority of members in the group. This server will skip the replication failover channels handling until this server is back to the group majority.");
+call mtr.add_suppression("This server is back to the group majority. Replication failover channels handling is resumed.");
+SET SESSION sql_log_bin = 1;
+include/start_and_bootstrap_group_replication.inc
+[connection server2]
+SET SESSION sql_log_bin= 0;
+CREATE TABLE pid_table(pid_no INT);
+LOAD DATA LOCAL INFILE 'pid_file' INTO TABLE pid_table;
+DROP TABLE pid_table;
+SET SESSION sql_log_bin= 1;
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=1, SOURCE_PORT=SERVER_3_PORT, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+include/start_group_replication.inc
+
+############################################################
+# 2. Deploy group B in single-primary mode on server3.
+#    Configure server4 as part of group B but not join it to
+#    the group.
+[connection server3]
+include/start_and_bootstrap_group_replication.inc
+[connection server4]
+
+############################################################
+# 3. Configure a failover channel on server1 that replicates
+#    from server3.
+[connection server1]
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=1, SOURCE_PORT=SERVER_3_PORT, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+SELECT asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', 'GROUP_B', '127.0.0.1', SERVER_MYPORT_3, '', 85, 65);;
+asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', 'GROUP_B', '127.0.0.1', SERVER_MYPORT_3, '', 85, 65)
+The UDF asynchronous_connection_failover_add_managed() executed successfully.
+include/start_slave.inc [FOR CHANNEL 'ch1']
+include/assert.inc [Verify channel ch1 IO_THREAD is ON and connected to server3]
+include/assert.inc ['There is one row in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['The version of replication_asynchronous_connection_failover must be 1 or greater']
+include/assert.inc ['There is one row in performance_schema.replication_asynchronous_connection_failover_managed for group B']
+include/assert.inc ['The version of replication_asynchronous_connection_failover_managed must be 1']
+[connection server2]
+include/assert.inc ['There is one row in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['The version of replication_asynchronous_connection_failover must be equal or greater than the one on server1']
+include/assert.inc ['There is one row in performance_schema.replication_asynchronous_connection_failover_managed for group B']
+include/assert.inc ['The version of replication_asynchronous_connection_failover_managed must be 1']
+
+############################################################
+# 4. Suspend server2, server1 will see it UNREACHABLE.
+[connection server2]
+[connection server1]
+include/gr_wait_for_member_state.inc
+
+############################################################
+# 5. Add server4 to group B.
+[connection server4]
+include/start_group_replication.inc
+
+############################################################
+# 6. Since group A does not have a ONLINE majority, server1
+#    will not detect the membership changes on group B.
+[connection server1]
+include/assert.inc ['There is one row in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['The version of replication_asynchronous_connection_failover must remain the same']
+include/assert_grep.inc [Only one majority loss warning is logged]
+
+############################################################
+# 7. Resume server2.
+[connection server2]
+[connection server1]
+
+############################################################
+# 8. server1 will update group B membership.
+[connection server1]
+include/assert.inc [Verify channel ch1 IO_THREAD is ON and connected to server3]
+include/assert.inc ['The version of replication_asynchronous_connection_failover must be 2 or greater']
+include/assert.inc ['The version of replication_asynchronous_connection_failover must be equal or greater than the one on server1 on step 6']
+include/assert.inc ['There is one row in performance_schema.replication_asynchronous_connection_failover_managed for group B']
+include/assert.inc ['The version of replication_asynchronous_connection_failover_managed must be 1']
+
+############################################################
+# 9. server2 will also update group B membership.
+[connection server2]
+include/assert.inc ['The version of replication_asynchronous_connection_failover must be equal or greater than the one on server1']
+include/assert.inc ['There is one row in performance_schema.replication_asynchronous_connection_failover_managed for group B']
+include/assert.inc ['The version of replication_asynchronous_connection_failover_managed must be 1']
+
+############################################################
+# 10. Clean up.
+[connection server2]
+include/stop_group_replication.inc
+include/rpl_reset_slave.inc
+[connection server1]
+include/stop_group_replication.inc
+include/rpl_reset_slave.inc
+[connection server4]
+include/stop_group_replication.inc
+[connection server3]
+include/stop_group_replication.inc
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_receiver_old_primary_rejoin.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_receiver_old_primary_rejoin.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_receiver_old_primary_rejoin.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_receiver_old_primary_rejoin.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,90 @@
+include/group_replication.inc [rpl_server_count=3]
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+############################################################
+# 1. Deploy a group in single-primary mode on server1 and server2.
+[connection server1]
+SET SESSION sql_log_bin= 0;
+call mtr.add_suppression("The 'slave applier' thread of channel 'ch1' will error out as this server is a group secondary.");
+call mtr.add_suppression("The 'slave IO' thread of channel 'ch1' will error out as this server is a group secondary.");
+call mtr.add_suppression("Run function 'applier_start' in plugin 'group_replication' failed");
+call mtr.add_suppression("Run function 'thread_start' in plugin 'group_replication' failed");
+call mtr.add_suppression("Slave SQL for channel 'ch1': Fatal error: Failed to run 'applier_start' hook, Error_code: MY-013117");
+call mtr.add_suppression("Slave I/O for channel 'ch1': Fatal error: Failed to run 'thread_start' hook, Error_code: MY-013117");
+call mtr.add_suppression("Plugin group_replication reported: 'Can't start slave IO THREAD of channel 'ch1' when group replication is running with single-primary mode on a secondary member.");
+SET SESSION sql_log_bin= 1;
+include/start_and_bootstrap_group_replication.inc
+include/gr_assert_primary_member.inc
+[connection server2]
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=0, SOURCE_PORT=SERVER_3_PORT, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+include/start_group_replication.inc
+include/gr_assert_secondary_member.inc
+
+############################################################
+# 2. Configure and start a failover channel on server1 that
+#    replicates from server3.
+[connection server3]
+[connection server1]
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=1, SOURCE_PORT=SERVER_3_PORT, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+SELECT asynchronous_connection_failover_add_source('ch1', '127.0.0.1', SERVER_MYPORT_3, '', 50);;
+asynchronous_connection_failover_add_source('ch1', '127.0.0.1', SERVER_MYPORT_3, '', 50)
+The UDF asynchronous_connection_failover_add_source() executed successfully.
+include/start_slave.inc [FOR CHANNEL 'ch1']
+
+############################################################
+# 3. Validate server1 and server2 configuration.
+[connection server1]
+include/assert.inc ['There is 1 row in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['The version of replication_asynchronous_connection_failover must be 1']
+include/assert.inc ['SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1']
+include/assert.inc [Verify channel ch1 IO_THREAD is ON and connected to server3]
+include/assert.inc [Verify channel ch1 SQL_THREAD is ON]
+include/assert.inc [Verify replica_monitor thread is running]
+[connection server2]
+include/assert.inc ['The version of replication_asynchronous_connection_failover must be 1']
+include/assert.inc ['SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1']
+include/assert.inc [Verify channel ch1 IO_THREAD is OFF]
+include/assert.inc [Verify channel ch1 SQL_THREAD is OFF]
+include/assert.inc [Verify replica_monitor thread is not running]
+
+############################################################
+# 4. Server1 will restart and rejoin the group as secondary.
+[connection server1]
+# restart:--group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group-replication-start-on-boot=1 --skip-slave-start=0
+include/rpl_reconnect.inc
+include/gr_wait_for_member_state.inc
+
+############################################################
+# 5. Validate server1 and server2 configuration.
+[connection server1]
+include/gr_assert_secondary_member.inc
+include/assert.inc ['There is 1 row in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['The version of replication_asynchronous_connection_failover must be 1']
+include/assert.inc ['SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1']
+[connection server2]
+include/gr_assert_primary_member.inc
+include/assert.inc ['There is 1 row in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['The version of replication_asynchronous_connection_failover must be 1']
+include/assert.inc ['SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1']
+include/assert.inc [Verify channel ch1 IO_THREAD is ON and connected to server3]
+include/assert.inc [Verify channel ch1 SQL_THREAD is ON]
+include/assert.inc [Verify replica_monitor thread is running]
+
+############################################################
+# 6. Clean up.
+[connection server1]
+include/stop_group_replication.inc
+include/rpl_reset_slave.inc
+[connection server2]
+include/stop_group_replication.inc
+include/rpl_reset_slave.inc
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_receiver_on_spm.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_receiver_on_spm.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_receiver_on_spm.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_receiver_on_spm.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,163 @@
+include/group_replication.inc [rpl_server_count=4]
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("The master's UUID has changed, although this should not happen unless you have changed it manually. The old UUID was.*");
+SET SESSION sql_log_bin = 1;
+[connection server2]
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("Can't start slave IO THREAD of channel 'ch1' when group replication is running with single-primary mode on a secondary member.");
+call mtr.add_suppression("Can't start slave SQL THREAD of channel 'ch1' when group replication is running with single-primary mode on a secondary member.");
+call mtr.add_suppression("Run function 'thread_start' in plugin 'group_replication' failed");
+call mtr.add_suppression("Run function 'applier_start' in plugin 'group_replication' failed");
+call mtr.add_suppression("Failed to run 'thread_start' hook");
+call mtr.add_suppression("Failed to run 'applier_start' hook");
+call mtr.add_suppression("The master's UUID has changed, although this should not happen unless you have changed it manually. The old UUID was.*");
+SET SESSION sql_log_bin = 1;
+
+# 1. Create a replication channel to replicate from server4 to
+#    to server1 on both server1 and 2.
+
+[connection server1]
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_PORT=SERVER_4_PORT, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1, SOURCE_CONNECTION_AUTO_FAILOVER=1 FOR CHANNEL 'ch1';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server2]
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_PORT=SERVER_4_PORT, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1, SOURCE_CONNECTION_AUTO_FAILOVER=1 FOR CHANNEL 'ch1';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+
+# 2. Add server4 using asynchronous_connection_failover_add_managed
+#    UDF on stand alone server2.
+#    It will be allowed but the configuration will not be propagated.
+
+[connection server2]
+SELECT asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', 'GROUP_NAME_SERVER1', '127.0.0.1', SERVER_MYPORT_4, '', 90, 70);;
+asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', 'GROUP_NAME_SERVER1', '127.0.0.1', SERVER_MYPORT_4, '', 90, 70)
+The UDF asynchronous_connection_failover_add_managed() executed successfully.
+include/assert.inc ['There is one row in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['The version of replication_asynchronous_connection_failover must be 1']
+include/assert.inc ['There is one row in performance_schema.replication_asynchronous_connection_failover_managed']
+include/assert.inc ['The version of replication_asynchronous_connection_failover_managed must be 1']
+[connection server1]
+include/assert.inc ['There are no rows in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['There is no version of replication_asynchronous_connection_failover']
+include/assert.inc ['There are no rows in performance_schema.replication_asynchronous_connection_failover_managed']
+include/assert.inc ['There is no version of replication_asynchronous_connection_failover_managed']
+
+# 3. Deploy a 2 members receiver group in single primary mode.
+#    Since server1 will bootstrap the group, server1 configuration will
+#    be the group configuration, which will override server2
+#    configuration when server2 joins the group.
+
+[connection server1]
+include/start_and_bootstrap_group_replication.inc
+include/assert.inc ['The performance_schema.replication_asynchronous_connection_failover table is empty']
+include/assert.inc ['The version of replication_asynchronous_connection_failover must be 0']
+include/assert.inc ['The performance_schema.replication_asynchronous_connection_failover_managed table is empty']
+include/assert.inc ['The version of replication_asynchronous_connection_failover_managed must be 0']
+[connection server2]
+include/start_group_replication.inc
+include/assert.inc ['The performance_schema.replication_asynchronous_connection_failover table is empty']
+include/assert.inc ['The version of replication_asynchronous_connection_failover must be 0']
+include/assert.inc ['The performance_schema.replication_asynchronous_connection_failover_managed table is empty']
+include/assert.inc ['The version of replication_asynchronous_connection_failover_managed must be 0']
+
+# 4. Error adding managed group to secondary server2.
+
+SELECT asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', 'GROUP_A', '127.0.0.1', SERVER_MYPORT_5, '', 90, 70);;
+ERROR HY000: Can't initialize function 'asynchronous_connection_failover_add_managed'; Can't execute the given operation on a Group Replication secondary member.
+SELECT asynchronous_connection_failover_add_source('ch1', '127.0.0.1', SERVER_MYPORT_5, '', 50);
+ERROR HY000: Can't initialize function 'asynchronous_connection_failover_add_source'; Can't execute the given operation on a Group Replication secondary member.
+include/assert.inc ['There are no rows in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['There is no version of replication_asynchronous_connection_failover']
+include/assert.inc ['There are no rows in performance_schema.replication_asynchronous_connection_failover_managed']
+include/assert.inc ['There is no version of replication_asynchronous_connection_failover_managed']
+#
+# 5. Deploy a 2 members sender group in single primary mode.
+#
+[connection server3]
+include/start_and_bootstrap_group_replication.inc
+[connection server4]
+include/start_group_replication.inc
+
+# 6. Error starting a replication channel on secondary member server2.
+
+[connection server2]
+START REPLICA FOR CHANNEL 'ch1';
+include/wait_for_slave_sql_error.inc [errno=13117 FOR CHANNEL 'ch1']
+include/assert_grep.inc [Server executed GTID set is logged.]
+include/assert_grep.inc [Server executed GTID set is logged.]
+STOP REPLICA FOR CHANNEL 'ch1';
+Warnings:
+Note	3084	Replication thread(s) for channel 'ch1' are already stopped.
+
+# 7. Add replication connection details of managed channel ch1
+#    to replication_asynchronous_connection_failover_managed table
+#    through asynchronous_connection_failover_add_managed() UDF.
+
+[connection server1]
+SELECT asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', "GROUP_NAME_SERVER2",'127.0.0.1', SERVER_MYPORT_4, '', 80, 60);
+asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', "GROUP_NAME_SERVER2",'127.0.0.1', SERVER_MYPORT_4, '', 80, 60)
+The UDF asynchronous_connection_failover_add_managed() executed successfully.
+
+# 8. Verify replication_asynchronous_connection_failover on
+#    server1 has two rows and member action configuration version
+#    value for replication_asynchronous_connection_failover
+#    and for replication_asynchronous_connection_failover_managed.
+#    And the channel 'ch1' is connected to server3.
+
+
+#  9. Verify replication_asynchronous_connection_failover on
+#     server2 has two rows and member action configuration version
+#     value for replication_asynchronous_connection_failover
+#     and for replication_asynchronous_connection_failover_managed.
+
+[connection server2]
+
+# 10. Stop group replication on existing primary (server1), the new
+#     primary will establish asynchronous replication channel (ch1)
+#     connection with sender which is server3.
+#     And the channel 'ch1' is connected to server3.
+
+[connection server1]
+include/stop_group_replication.inc
+[connection server2]
+include/gr_wait_primary_member_uuid.inc
+
+# 11. Delete replication connection details for managed channel ch1
+#     from replication_asynchronous_connection_failover_managed
+#     and replication_asynchronous_connection_failover table
+#     through asynchronous_connection_failover_delete_managed() UDF.
+
+[connection server2]
+SELECT asynchronous_connection_failover_delete_managed('ch1', 'GROUP_NAME_SERVER2');
+asynchronous_connection_failover_delete_managed('ch1', 'GROUP_NAME_SERVER2')
+The UDF asynchronous_connection_failover_delete_managed() executed successfully.
+
+# 12. Verify replication_asynchronous_connection_failover on
+#     server2 is empty and member action configuration version
+#     value for replication_asynchronous_connection_failover
+#     and for replication_asynchronous_connection_failover_managed.
+#     And the channel 'ch1' is connected to server3.
+
+[connection server2]
+#
+# 13. Clean up.
+#
+[connection server1]
+include/rpl_reset_slave.inc
+[connection server2]
+include/stop_slave.inc [FOR CHANNEL 'ch1']
+include/rpl_reset_slave.inc
+[connection server4]
+include/stop_group_replication.inc
+[connection server3]
+include/stop_group_replication.inc
+[connection server2]
+include/stop_group_replication.inc
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_receiver_primary_change.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_receiver_primary_change.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_receiver_primary_change.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_receiver_primary_change.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,119 @@
+include/group_replication.inc [rpl_server_count=4]
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("The master's UUID has changed, although this should not happen unless you have changed it manually. The old UUID was.*");
+SET SESSION sql_log_bin = 1;
+[connection server2]
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("The master's UUID has changed, although this should not happen unless you have changed it manually. The old UUID was.*");
+SET SESSION sql_log_bin = 1;
+
+# 1. Create a replication channel to replicate from server4 to
+#    to server1 on both server1 and 2.
+
+[connection server1]
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_PORT=SERVER_4_PORT, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1, SOURCE_CONNECTION_AUTO_FAILOVER=1 FOR CHANNEL 'ch1';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server2]
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_PORT=SERVER_4_PORT, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1, SOURCE_CONNECTION_AUTO_FAILOVER=1 FOR CHANNEL 'ch1';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+
+# 2. Deploy a 2 members receiver group in single primary mode.
+
+[connection server1]
+include/start_and_bootstrap_group_replication.inc
+include/wait_for_slave_to_start.inc [FOR CHANNEL 'ch1']
+include/assert.inc [Verify replica_monitor thread is running]
+[connection server2]
+include/start_group_replication.inc
+#
+# 3. Deploy a 2 members sender group in single primary mode.
+#
+[connection server3]
+include/start_and_bootstrap_group_replication.inc
+[connection server4]
+include/start_group_replication.inc
+
+# 4. Add replication connection details of managed channel ch1
+#    to replication_asynchronous_connection_failover_managed table
+#    through asynchronous_connection_failover_add_managed() UDF.
+
+[connection server1]
+SELECT asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', "GROUP_NAME_SERVER2",'127.0.0.1', SERVER_MYPORT_4, '', 80, 60);
+asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', "GROUP_NAME_SERVER2",'127.0.0.1', SERVER_MYPORT_4, '', 80, 60)
+The UDF asynchronous_connection_failover_add_managed() executed successfully.
+
+# 5. Verify replication_asynchronous_connection_failover on
+#    server1 has two rows and member action configuration version
+#    value for replication_asynchronous_connection_failover
+#    and for replication_asynchronous_connection_failover_managed.
+
+
+#  6. Verify replication_asynchronous_connection_failover on
+#     server2 has two rows and member action configuration version
+#     value for replication_asynchronous_connection_failover
+#     and for replication_asynchronous_connection_failover_managed.
+
+[connection server2]
+
+# 7. Stop group replication on existing primary (server1), and change
+#    primary to server2. The asynchronous replication channel (ch1)
+#    connection will be started without any error.
+
+[connection server1]
+include/stop_slave.inc [FOR CHANNEL 'ch1']
+[connection server2]
+SELECT group_replication_set_as_primary("SERVER2_UUID");
+group_replication_set_as_primary("SERVER2_UUID")
+Primary server switched to: SERVER2_UUID
+include/gr_wait_primary_member_uuid.inc
+include/wait_for_slave_to_start.inc [FOR CHANNEL 'ch1']
+include/assert.inc [Verify replica_monitor thread is running]
+
+# 8. Delete replication connection details for managed channel ch1
+#    from replication_asynchronous_connection_failover_managed
+#    and replication_asynchronous_connection_failover table
+#    through asynchronous_connection_failover_delete_managed() UDF.
+
+[connection server2]
+SELECT asynchronous_connection_failover_delete_managed('ch1', 'GROUP_NAME_SERVER2');
+asynchronous_connection_failover_delete_managed('ch1', 'GROUP_NAME_SERVER2')
+The UDF asynchronous_connection_failover_delete_managed() executed successfully.
+
+# 9. Verify replication_asynchronous_connection_failover on
+#    server2 is empty and member action configuration version
+#    value for replication_asynchronous_connection_failover
+#    and for replication_asynchronous_connection_failover_managed.
+
+[connection server2]
+
+# 10. Verify replication_asynchronous_connection_failover on
+#     server1 is empty and member action configuration version
+#     value for replication_asynchronous_connection_failover
+#     and for replication_asynchronous_connection_failover_managed.
+
+[connection server1]
+#
+# 11. Clean up.
+#
+[connection server1]
+include/rpl_reset_slave.inc
+[connection server2]
+include/stop_slave.inc [FOR CHANNEL 'ch1']
+include/rpl_reset_slave.inc
+[connection server4]
+include/stop_group_replication.inc
+[connection server3]
+include/stop_group_replication.inc
+[connection server2]
+include/stop_group_replication.inc
+[connection server1]
+include/stop_group_replication.inc
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_receiver_reset_channel.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_receiver_reset_channel.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_receiver_reset_channel.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_receiver_reset_channel.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,91 @@
+include/group_replication.inc [rpl_server_count=4]
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+############################################################
+# 1. Deploy a group in single-primary mode on server1 and server2.
+[connection server1]
+include/start_and_bootstrap_group_replication.inc
+include/gr_assert_primary_member.inc
+[connection server2]
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=0, SOURCE_PORT=SERVER_4_PORT, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+include/start_group_replication.inc
+include/gr_assert_secondary_member.inc
+
+############################################################
+# 2. Configure and start a failover channel on server1 that
+#    replicates from server4.
+[connection server4]
+[connection server1]
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=1, SOURCE_PORT=SERVER_4_PORT, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+SELECT asynchronous_connection_failover_add_source('ch1', '127.0.0.1', SERVER_MYPORT_4, '', 50);;
+asynchronous_connection_failover_add_source('ch1', '127.0.0.1', SERVER_MYPORT_4, '', 50)
+The UDF asynchronous_connection_failover_add_source() executed successfully.
+include/start_slave.inc [FOR CHANNEL 'ch1']
+
+############################################################
+# 3. Validate server1 and server2 configuration.
+[connection server1]
+include/assert.inc ['There is 1 row in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['The version of replication_asynchronous_connection_failover must be 1']
+include/assert.inc ['SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1']
+include/assert.inc [Verify channel ch1 IO_THREAD is ON and connected to server4]
+include/assert.inc [Verify channel ch1 SQL_THREAD is ON]
+include/assert.inc [Verify replica_monitor thread is running]
+[connection server2]
+include/assert.inc ['The version of replication_asynchronous_connection_failover must be 1']
+include/assert.inc ['SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1']
+include/assert.inc [Verify channel ch1 IO_THREAD is OFF]
+include/assert.inc [Verify channel ch1 SQL_THREAD is OFF]
+include/assert.inc [Verify replica_monitor thread is not running]
+
+############################################################
+# 4. Stop and delete channel 'ch1' on server1 and server2.
+[connection server2]
+include/rpl_reset_slave.inc
+[connection server1]
+include/stop_slave.inc [FOR CHANNEL 'ch1']
+include/rpl_reset_slave.inc
+SELECT asynchronous_connection_failover_delete_source('ch1', '127.0.0.1', SERVER_MYPORT_4, '');;
+asynchronous_connection_failover_delete_source('ch1', '127.0.0.1', SERVER_MYPORT_4, '')
+The UDF asynchronous_connection_failover_delete_source() executed successfully.
+
+############################################################
+# 5. Validate server1 and server2 configuration.
+[connection server1]
+include/assert.inc ['There are 0 rows in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['The version of replication_asynchronous_connection_failover must be 2']
+include/assert.inc ['Verify ch1 was deleted']
+include/assert.inc [Verify replica_monitor thread is not running]
+[connection server2]
+include/assert.inc ['The version of replication_asynchronous_connection_failover must be 2']
+include/assert.inc ['Verify ch1 was deleted']
+include/assert.inc [Verify replica_monitor thread is not running]
+
+############################################################
+# 6. Add server3 to the group.
+[connection server3]
+include/start_group_replication.inc
+include/gr_assert_secondary_member.inc
+include/assert.inc ['There are 0 rows in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['The version of replication_asynchronous_connection_failover must be 2']
+include/assert.inc ['Verify ch1 does noet exist']
+include/assert.inc [Verify replica_monitor thread is not running]
+
+############################################################
+# 7. Clean up.
+[connection server3]
+include/stop_group_replication.inc
+[connection server2]
+include/stop_group_replication.inc
+[connection server1]
+include/stop_group_replication.inc
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_receiver_source_connection_auto_failover_disabled.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_receiver_source_connection_auto_failover_disabled.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_receiver_source_connection_auto_failover_disabled.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_receiver_source_connection_auto_failover_disabled.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,90 @@
+include/group_replication.inc [rpl_server_count=3]
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+# 1. Create a replication channel to replicate from server3 on
+#    server2.
+
+[connection server2]
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_PORT=SERVER_3_PORT, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1, SOURCE_CONNECTION_AUTO_FAILOVER=0 FOR CHANNEL 'ch1';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+
+# 2. Deploy a 2 members group in single primary mode.
+
+[connection server1]
+include/start_and_bootstrap_group_replication.inc
+[connection server2]
+include/start_group_replication.inc
+
+# 3. Create a replication channel to replicate from server3 on
+#    server1.
+
+[connection server1]
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_PORT=SERVER_3_PORT, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1, SOURCE_CONNECTION_AUTO_FAILOVER=1 FOR CHANNEL 'ch1';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+
+# 4. Add replication connection details of server3 to
+#    replication_asynchronous_connection_failover table
+#    through asynchronous_connection_failover_add_source() UDF.
+
+[connection server1]
+SELECT asynchronous_connection_failover_add_source('ch1', '127.0.0.1', SERVER_MYPORT_3, '', 50);
+asynchronous_connection_failover_add_source('ch1', '127.0.0.1', SERVER_MYPORT_3, '', 50)
+The UDF asynchronous_connection_failover_add_source() executed successfully.
+
+# 5. Start replica for channel ch1.
+
+include/start_slave.inc [FOR CHANNEL 'ch1']
+
+# 6. Verify replication_asynchronous_connection_failover on
+#    server1 has one row.
+
+
+# 7. Verify replication_asynchronous_connection_failover on
+#    server2 has one row.
+
+[connection server2]
+
+# 8. Verify SOURCE_CONNECTION_AUTO_FAILOVER status is received on
+#    server 2.
+
+
+# 9. Stop replication channel ch1.
+
+[connection server1]
+include/stop_slave.inc [FOR CHANNEL 'ch1']
+
+# 10. Disable SOURCE_CONNECTION_AUTO_FAILOVER for replication channel ch1.
+
+[connection server1]
+CHANGE REPLICATION SOURCE TO SOURCE_CONNECTION_AUTO_FAILOVER=0 FOR CHANNEL 'ch1';
+
+# 11. Verify SOURCE_CONNECTION_AUTO_FAILOVER status is received on
+#     server 2.
+
+[connection server2]
+
+# 12. Change primary to server2.
+#     The asynchronous replication channel (ch1) won't be started
+#     as SOURCE_CONNECTION_AUTO_FAILOVER  is disabled.
+
+SELECT group_replication_set_as_primary("SERVER2_UUID");
+group_replication_set_as_primary("SERVER2_UUID")
+Primary server switched to: SERVER2_UUID
+include/gr_wait_primary_member_uuid.inc
+
+# 13. Clean up.
+
+SELECT asynchronous_connection_failover_delete_source('ch1', '127.0.0.1', SERVER_MYPORT_3, '');
+asynchronous_connection_failover_delete_source('ch1', '127.0.0.1', SERVER_MYPORT_3, '')
+The UDF asynchronous_connection_failover_delete_source() executed successfully.
+include/rpl_reset_slave.inc
+[connection server1]
+include/rpl_reset_slave.inc
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_receiver_spm_to_mpm.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_receiver_spm_to_mpm.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_receiver_spm_to_mpm.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_receiver_spm_to_mpm.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,124 @@
+include/group_replication.inc [rpl_server_count=4]
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+############################################################
+# 1. Deploy a group in single-primary mode on server1 and server2.
+[connection server1]
+include/start_and_bootstrap_group_replication.inc
+include/gr_assert_primary_member.inc
+[connection server2]
+[connection server2]
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=1, SOURCE_PORT=SERVER_3_PORT, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+include/start_group_replication.inc
+include/gr_assert_secondary_member.inc
+
+############################################################
+# 2. Configure a failover channel on server1 that replicates
+#    from server3.
+[connection server3]
+[connection server1]
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=1, SOURCE_PORT=SERVER_3_PORT, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+SELECT asynchronous_connection_failover_add_source('ch1', '127.0.0.1', SERVER_MYPORT_3, '', 50);;
+asynchronous_connection_failover_add_source('ch1', '127.0.0.1', SERVER_MYPORT_3, '', 50)
+The UDF asynchronous_connection_failover_add_source() executed successfully.
+include/start_slave.inc [FOR CHANNEL 'ch1']
+include/assert.inc ['There is 1 row in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['The version of replication_asynchronous_connection_failover must be 1']
+include/assert.inc ['SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1']
+include/assert.inc [Verify channel ch1 IO_THREAD is ON and connected to server3]
+include/assert.inc [Verify channel ch1 SQL_THREAD is ON]
+include/assert.inc [Verify replica_monitor thread is running]
+
+############################################################
+# 3. Assert failover channel configuration on server2.
+[connection server2]
+include/assert.inc ['There is 1 row in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['The version of replication_asynchronous_connection_failover must be 1']
+include/assert.inc ['SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1']
+include/assert.inc [Verify channel ch1 IO_THREAD is OFF]
+include/assert.inc [Verify channel ch1 SQL_THREAD is OFF]
+include/assert.inc [Verify replica_monitor thread is not running]
+SELECT * FROM performance_schema.replication_asynchronous_connection_failover;
+CHANNEL_NAME	HOST	PORT	NETWORK_NAMESPACE	WEIGHT	MANAGED_NAME
+ch1	127.0.0.1	#####		50	
+SELECT * FROM performance_schema.replication_group_configuration_version WHERE name LIKE 'replication_asynchronous_connection_failover';
+name	version
+replication_asynchronous_connection_failover	1
+
+############################################################
+# 4. Change to multi-primary mode.
+#    The failover channel will remain working on server1.
+[connection server1]
+SELECT group_replication_switch_to_multi_primary_mode();
+group_replication_switch_to_multi_primary_mode()
+Mode switched to multi-primary successfully.
+include/gr_assert_multi_primary_mode.inc
+include/check_slave_is_running.inc [FOR CHANNEL 'ch1']
+[connection server2]
+include/gr_assert_multi_primary_mode.inc
+
+############################################################
+# 5. Add more sources to channel 'ch1' on server1
+#    and change SOURCE_CONNECTION_AUTO_FAILOVER value,
+#    they will not be propagated to server2.
+[connection server1]
+SELECT asynchronous_connection_failover_add_source('ch1', '127.0.0.1', SERVER_MYPORT_4, '', 50);;
+asynchronous_connection_failover_add_source('ch1', '127.0.0.1', SERVER_MYPORT_4, '', 50)
+The UDF asynchronous_connection_failover_add_source() executed successfully.
+include/stop_slave.inc [FOR CHANNEL 'ch1']
+CHANGE REPLICATION SOURCE TO SOURCE_CONNECTION_AUTO_FAILOVER=0 FOR CHANNEL 'ch1';
+include/start_slave.inc [FOR CHANNEL 'ch1']
+include/assert.inc ['There are 2 rows in performance_schema.replication_asynchronous_connection_failover']
+SELECT * FROM performance_schema.replication_asynchronous_connection_failover;
+CHANNEL_NAME	HOST	PORT	NETWORK_NAMESPACE	WEIGHT	MANAGED_NAME
+ch1	127.0.0.1	#####		50	
+ch1	127.0.0.1	#####		50	
+SELECT * FROM performance_schema.replication_group_configuration_version WHERE name LIKE 'replication_asynchronous_connection_failover';
+name	version
+replication_asynchronous_connection_failover	2
+[connection server2]
+include/assert.inc ['There is 1 row in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['The version of replication_asynchronous_connection_failover must be 1']
+include/assert.inc ['SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1']
+include/assert.inc [Verify channel ch1 IO_THREAD is OFF]
+include/assert.inc [Verify channel ch1 SQL_THREAD is OFF]
+include/assert.inc [Verify replica_monitor thread is not running]
+SELECT * FROM performance_schema.replication_asynchronous_connection_failover;
+CHANNEL_NAME	HOST	PORT	NETWORK_NAMESPACE	WEIGHT	MANAGED_NAME
+ch1	127.0.0.1	#####		50	
+SELECT * FROM performance_schema.replication_group_configuration_version WHERE name LIKE 'replication_asynchronous_connection_failover';
+name	version
+replication_asynchronous_connection_failover	1
+
+############################################################
+# 6. server1 will leave the group, despite 'ch1' is a failover
+#    channel, since the group is on multi-primary mode, server2
+#    will not start channel 'ch1'.
+[connection server1]
+include/stop_group_replication.inc
+[connection server2]
+include/assert.inc [The action mysql_start_failover_channels_if_primary is enabled]
+include/assert.inc ['There is 1 row in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['The version of replication_asynchronous_connection_failover must be 1']
+include/assert.inc ['SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1']
+include/assert.inc [Verify channel ch1 IO_THREAD is OFF]
+include/assert.inc [Verify channel ch1 SQL_THREAD is OFF]
+include/assert.inc [Verify replica_monitor thread is not running]
+
+############################################################
+# 7. Clean up.
+[connection server2]
+include/stop_group_replication.inc
+include/rpl_reset_slave.inc
+[connection server1]
+include/rpl_reset_slave.inc
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_receiver_status_reset.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_receiver_status_reset.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_receiver_status_reset.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_receiver_status_reset.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,37 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+############################################################
+# 1. Deploy a group in single-primary mode on server1
+#    configure a failover channel 'ch1'.
+[connection server1]
+include/start_and_bootstrap_group_replication.inc
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='10.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=1, SOURCE_PORT=3306, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+
+############################################################
+# 2. Leave the group and only then reset the failover
+#    channel 'ch1'.
+[connection server1]
+include/stop_group_replication.inc
+include/rpl_reset_slave.inc
+
+############################################################
+# 3. Deploy again a group in single-primary mode on server1.
+[connection server1]
+include/start_and_bootstrap_group_replication.inc
+
+############################################################
+# 4. Join server2 to the group.
+#    server2 successful join will validate that past ch1
+#    failover status is properly clean on server.
+[connection server2]
+include/start_group_replication.inc
+############################################################
+# 5. Clean up.
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_reset.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_reset.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_reset.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_reset.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,49 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+############################################################
+# 1. Try to reset asynchronous reconnection configuration on
+#    a server running GR.
+#    It will not be allowed.
+[connection server1]
+include/start_and_bootstrap_group_replication.inc
+SELECT asynchronous_connection_failover_reset();
+ERROR HY000: Can't initialize function 'asynchronous_connection_failover_reset'; Can't execute the given operation while Group Replication is running.
+
+############################################################
+# 2. Try to reset asynchronous reconnection configuration on
+#    a server not running GR.
+#    It will be allowed.
+[connection server2]
+include/start_group_replication.inc
+[connection server3]
+SELECT asynchronous_connection_failover_add_managed('ch1_3', 'GroupReplication', 'FAILOVER_GROUP_NAME', '127.0.0.1', SERVER_MYPORT_2, '', 80, 60);
+asynchronous_connection_failover_add_managed('ch1_3', 'GroupReplication', 'FAILOVER_GROUP_NAME', '127.0.0.1', SERVER_MYPORT_2, '', 80, 60)
+The UDF asynchronous_connection_failover_add_managed() executed successfully.
+include/assert.inc ['There is one row in performance_schema.replication_asynchronous_connection_failover_managed']
+include/assert.inc ['The version of replication_asynchronous_connection_failover_managed must be 1']
+include/assert.inc ['There is one row in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['The version of replication_asynchronous_connection_failover must be 1']
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=1, SOURCE_PORT=SERVER_1_PORT, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=2 FOR CHANNEL 'ch1_3';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+include/start_slave.inc [FOR CHANNEL 'ch1_3']
+include/assert.inc ['The version of replication_asynchronous_connection_failover must be 2 or greater']
+include/stop_slave.inc [FOR CHANNEL 'ch1_3']
+SELECT asynchronous_connection_failover_reset();
+asynchronous_connection_failover_reset()
+The UDF asynchronous_connection_failover_reset() executed successfully.
+include/assert.inc ['There is no row in performance_schema.replication_asynchronous_connection_failover_managed']
+include/assert.inc ['There is no version of replication_asynchronous_connection_failover_managed']
+include/assert.inc ['There is no row in performance_schema.replication_asynchronous_connection_failover']
+include/assert.inc ['There is no version of replication_asynchronous_connection_failover']
+
+############################################################
+# 3. Clean up.
+[connection server3]
+include/rpl_reset_slave.inc
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_sender_no_majority.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_sender_no_majority.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_sender_no_majority.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_sender_no_majority.result	2021-09-28 11:46:34.000000000 +0000
@@ -101,6 +101,7 @@
 call mtr.add_suppression("The source .* for channel 'ch1' has left the group .*, and so removed its entry from replication_asynchronous_connection_failover table.");
 call mtr.add_suppression("The group .* for the channel .* has been removed, and so removed its entry from replication_asynchronous_connection_failover_managed and all the group members from replication_asynchronous_connection_failover table.");
 call mtr.add_suppression("The group .* for the channel .* has been added, and so added its entry in replication_asynchronous_connection_failover_managed and source to replication_asynchronous_connection_failover table.");
+call mtr.add_suppression("The Monitor IO thread failed to detect if the source belongs to the group majority on the source.*");
 SET SESSION sql_log_bin = 1;
 [connection server2]
 include/stop_group_replication.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_start_failover_channels_error_on_bootstrap.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_start_failover_channels_error_on_bootstrap.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_start_failover_channels_error_on_bootstrap.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_start_failover_channels_error_on_bootstrap.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,49 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+############################################################
+# 1. Configure server2 to be a asynchronous replica of server1,
+#    configuring a failover channel to server1.
+[connection server1]
+[connection server2]
+SELECT asynchronous_connection_failover_add_source('ch1', '127.0.0.1', SERVER_MYPORT_1, '', 50);;
+asynchronous_connection_failover_add_source('ch1', '127.0.0.1', SERVER_MYPORT_1, '', 50)
+The UDF asynchronous_connection_failover_add_source() executed successfully.
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=1, SOURCE_PORT=SERVER_1_PORT, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+
+############################################################
+# 2. Bootstrap a group on server2.
+#    Since `mysql_start_failover_channels_if_primary` member
+#    action is enabled, once server2 becomes the primary it
+#    will start 'ch1'. Though we are injecting a failure on
+#    channel start, thence the member will change to ERROR
+#    state.
+[connection server2]
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("The member action \"mysql_start_failover_channels_if_primary\" for event \"AFTER_PRIMARY_ELECTION\" with priority \"10\" failed. Please check previous messages in the error log for hints about what could have caused this failure.");
+call mtr.add_suppression("The server was automatically set into read only mode after an error was detected.");
+call mtr.add_suppression("Skipping leave operation: concurrent attempt to leave the group is on-going.");
+SET SESSION sql_log_bin = 1;
+include/assert.inc [The action mysql_start_failover_channels_if_primary must be enabled]
+SET @@GLOBAL.DEBUG='+d,force_error_on_start_failover_channels';
+SET GLOBAL group_replication_group_name= "GROUP_REPLICATION_GROUP_NAME";
+START GROUP_REPLICATION;
+include/gr_wait_for_member_state.inc
+SET @@GLOBAL.DEBUG='-d,force_error_on_start_failover_channels';
+include/assert.inc [The super_read_only mode must be 1]
+include/assert.inc [The read_only mode must be 1]
+include/assert.inc [Verify channel ch1 IO_THREAD is OFF]
+include/assert.inc [Verify channel ch1 SQL_THREAD is OFF]
+include/assert.inc [Verify replica_monitor thread is not running]
+include/assert_grep.inc [The member action "mysql_start_failover_channels_if_primary" for event "AFTER_PRIMARY_ELECTION" with priority "10" failed.]
+############################################################
+# 3. Clean up.
+[connection server2]
+include/stop_group_replication.inc
+include/rpl_reset_slave.inc
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_start_failover_channels_on_bootstrap.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_start_failover_channels_on_bootstrap.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_acf_start_failover_channels_on_bootstrap.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_acf_start_failover_channels_on_bootstrap.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,38 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+############################################################
+# 1. Configure server2 to be a asynchronous replica of server1,
+#    configuring a failover channel to server1.
+[connection server1]
+[connection server2]
+SELECT asynchronous_connection_failover_add_source('ch1', '127.0.0.1', SERVER_MYPORT_1, '', 50);;
+asynchronous_connection_failover_add_source('ch1', '127.0.0.1', SERVER_MYPORT_1, '', 50)
+The UDF asynchronous_connection_failover_add_source() executed successfully.
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=1, SOURCE_PORT=SERVER_1_PORT, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+
+############################################################
+# 2. Bootstrap a group on server2.
+#    Since `mysql_start_failover_channels_if_primary` member
+#    action is enabled, channel 'ch1' will be started.
+[connection server2]
+include/assert.inc [The action mysql_start_failover_channels_if_primary must be enabled]
+include/start_and_bootstrap_group_replication.inc
+include/gr_assert_primary_member.inc
+include/wait_for_slave_to_start.inc [FOR CHANNEL 'ch1']
+include/assert_grep.inc [The member action "mysql_start_failover_channels_if_primary" for event "AFTER_PRIMARY_ELECTION" with priority "10" will be run.]
+include/assert.inc ['SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1']
+include/assert.inc [Verify channel ch1 IO_THREAD is ON]
+include/assert.inc [Verify channel ch1 SQL_THREAD is ON]
+include/assert.inc [Verify replica_monitor thread is running]
+############################################################
+# 3. Clean up.
+[connection server2]
+include/stop_group_replication.inc
+include/rpl_reset_slave.inc
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_add_node_with_ill_configurated_stack.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_add_node_with_ill_configurated_stack.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_add_node_with_ill_configurated_stack.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_add_node_with_ill_configurated_stack.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,33 @@
+# 1. Skip the group start
+include/group_replication.inc [rpl_server_count=3]
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+# 2. Start and bootstrap the group with server 1
+[connection server1]
+include/start_and_bootstrap_group_replication.inc
+# 3. Start server 2
+[connection server2]
+include/start_group_replication.inc
+# 4. Change server 3 communication stack and local address to MySQL
+[connection server3]
+SET SESSION sql_log_bin= 0;
+call mtr.add_suppression("\\[GCS\\] Error connecting to all peers. Member join failed. Local port:*");
+call mtr.add_suppression("\\[GCS\\] The member was unable to join the group.*");
+call mtr.add_suppression("Timeout on wait for view after joining group");
+SET SESSION sql_log_bin= 1;
+SET GLOBAL group_replication_local_address= "GROUP_REPLICATION_SERVER_3_ADDRESS";
+SET GLOBAL group_replication_communication_stack= MySQL;
+# 5. Manually start server 3 and expect it to fail while joining the
+#    group
+SET GLOBAL group_replication_group_name= "GROUP_REPLICATION_GROUP_NAME";
+START GROUP_REPLICATION;
+ERROR HY000: The server is not configured properly to be an active member of the group. Please see more details on error log.
+# 6. Restore server 3 original address
+SET GLOBAL group_replication_local_address= "GROUP_REPLICATION_SERVER_3_LOCAL_ADDRESS";
+SET GLOBAL group_replication_communication_stack= "XCOM";
+# 7. Server 3 must successfully join the group
+include/start_group_replication.inc
+# 8. Clean up.
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_add_node_with_same_local_address.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_add_node_with_same_local_address.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_add_node_with_same_local_address.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_add_node_with_same_local_address.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,30 @@
+# 1. Skip the group start
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+# 2. Start and bootstrap the group with server 1
+[connection server1]
+include/start_and_bootstrap_group_replication.inc
+# 3. Change server 2 group_replication_local_address to be the same as
+#    server 1
+[connection server2]
+SET SESSION sql_log_bin= 0;
+call mtr.add_suppression("\\[GCS\\] Error connecting to all peers. Member join failed. Local port:*");
+call mtr.add_suppression("\\[GCS\\] The member was unable to join the group.*");
+call mtr.add_suppression("Timeout on wait for view after joining group");
+SET SESSION sql_log_bin= 1;
+SET @local_address_save= @@GLOBAL.group_replication_local_address;
+SET GLOBAL group_replication_local_address= "GROUP_REPLICATION_SERVER_1_ADDRESS";
+# 4. Manually start server 2 and expect it to fail while joining the
+#    group
+SET GLOBAL group_replication_group_name= "GROUP_REPLICATION_GROUP_NAME";
+START GROUP_REPLICATION;
+ERROR HY000: The server is not configured properly to be an active member of the group. Please see more details on error log.
+# 5. Restore server 2 original address
+SET @@GLOBAL.group_replication_local_address= @local_address_save;
+# 6. Server 2 must successfully join the group
+include/start_group_replication.inc
+# 7. Clean up.
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_applier_and_shutdown.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_applier_and_shutdown.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_applier_and_shutdown.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_applier_and_shutdown.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,46 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+# 1. Start GR on server1 & server2.
+[connection server1]
+include/start_and_bootstrap_group_replication.inc
+[connection server2]
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("There was an issue on the primary election process: Could not wait for the execution of local transactions. The member will now leave the group.");
+call mtr.add_suppression("Skipping leave operation: concurrent attempt to leave the group is on-going.");
+call mtr.add_suppression("Fatal error during execution on the Applier process of Group Replication. The server will now leave the group.");
+call mtr.add_suppression("Skipping leave operation: member already left the group.");
+call mtr.add_suppression("The server was automatically set into read only mode after an error was detected.");
+call mtr.add_suppression("Error, maximum number of retries exceeded when waiting for the internal server session state to be operating");
+call mtr.add_suppression("Failed to establish an internal server connection to execute plugin operations");
+SET SESSION sql_log_bin = 1;
+include/start_group_replication.inc
+
+# 2. Add debug point to
+#    2.1. make sure primary change fails on server2.
+#    2.2. delay primary change operation to allow shutdown to send KILL signals
+#    2.3. block applier processing so suspension packets is not processed
+SET @@GLOBAL.DEBUG= '+d,group_replication_wait_for_current_events_execution_fail';
+
+# 3. Stop GR on server1, server2 become primary
+[connection server1]
+include/stop_group_replication.inc
+
+# 4. Primary change happens on server2 but is delayed with help of
+#    group_replication_wait_for_current_events_execution_fail debug point.
+[connection server2]
+SET DEBUG_SYNC= "now WAIT_FOR signal.group_replication_wait_for_current_events_execution_fail_applier_add_suspension_packet";
+
+# 5. Execute shutdown so that applier threads receives the KILL signal.
+# restart:--group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_single_primary_mode=1 --group_replication_enforce_update_everywhere_checks=0
+include/rpl_reconnect.inc
+
+# 6. Cleanup
+[connection server1]
+include/start_and_bootstrap_group_replication.inc
+[connection server2]
+include/start_group_replication.inc
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_applier_initialization.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_applier_initialization.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_applier_initialization.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_applier_initialization.result	2021-09-28 11:46:34.000000000 +0000
@@ -9,6 +9,7 @@
 call mtr.add_suppression("On shutdown there was a timeout on the group replication applier *.*");
 call mtr.add_suppression("The member is leaving a group without being on one");
 set session sql_log_bin=1;
+SET @group_replication_components_stop_timeout_save = @@GLOBAL.group_replication_components_stop_timeout;
 SET GLOBAL group_replication_group_name= "2d249320-2e06-11e3-aa6e-0800200c9a66";
 SET @debug_save= @@GLOBAL.DEBUG;
 SET GLOBAL debug= 'd,double_unique_handler';
@@ -25,7 +26,7 @@
 ERROR HY000: The START GROUP_REPLICATION command failed as the applier module failed to start.
 SET DEBUG_SYNC= "now SIGNAL signal.applier_continue";
 SET @@GLOBAL.DEBUG= @debug_save;
-SET GLOBAL group_replication_components_stop_timeout= 31536000;
+SET GLOBAl group_replication_components_stop_timeout = @group_replication_components_stop_timeout_save;
 include/start_group_replication.inc
 include/stop_group_replication.inc
 SET @@GLOBAL.DEBUG= @debug_save;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_applier_require_row_format.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_applier_require_row_format.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_applier_require_row_format.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_applier_require_row_format.result	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-include/group_replication.inc
-Warnings:
-Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
-[connection server1]
-
-# 1) Stop the applier for `server1`.
-include/gr_stop_applier_sql_thread.inc
-STOP REPLICA SQL_THREAD FOR CHANNEL "group_replication_applier";
-
-# 2) Verify that is not possible to change `REQUIRE_ROW_FORMAT` option
-CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 0 FOR CHANNEL "group_replication_applier";
-ERROR HY000: CHANGE MASTER with the given parameters cannot be performed on channel 'group_replication_applier'.
-CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 1 FOR CHANNEL "group_replication_applier";
-ERROR HY000: CHANGE MASTER with the given parameters cannot be performed on channel 'group_replication_applier'.
-
-# 3) Verify that `REQUIRE_ROW_FORMAT` is set for the GR channels.
-include/assert.inc [Require_row_format column in performance_schema.replication_applier_configuration is set to YES for GR applier channel]
-include/assert.inc [Require_row_format column in performance_schema.replication_applier_configuration is set to YES for GR recovery channel]
-
-# Cleanup
-include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_autorejoin_failure_during_mid_join.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_autorejoin_failure_during_mid_join.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_autorejoin_failure_during_mid_join.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_autorejoin_failure_during_mid_join.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,58 @@
+include/group_replication.inc [rpl_server_count=3]
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+# 1. Start 3 servers.
+SET sql_log_bin = 0;
+call mtr.add_suppression("Member was expelled from the group due to network failures, changing member status to ERROR.");
+call mtr.add_suppression("Started auto-rejoin procedure attempt*");
+call mtr.add_suppression("Auto-rejoin procedure attempt*");
+call mtr.add_suppression("The server was automatically set into read only mode after an error was detected.");
+call mtr.add_suppression("Unable to confirm whether the server has left the group or not. Check performance_schema.replication_group_members to check group membership information.");
+call mtr.add_suppression("Timeout while waiting for a view change event during the leave step before a auto-rejoin attempt.");
+call mtr.add_suppression("Timeout while waiting for a view change event during the auto-rejoin procedure");
+call mtr.add_suppression("Error while sending message in the group replication incremental recovery process.");
+SET sql_log_bin = 1;
+include/gr_autorejoin_monitoring.inc
+SET @debug_saved = @@GLOBAL.DEBUG;
+SET @group_replication_autorejoin_tries_saved = @@GLOBAL.group_replication_autorejoin_tries;
+include/start_and_bootstrap_group_replication.inc
+[connection server2]
+include/start_group_replication.inc
+[connection server3]
+include/start_group_replication.inc
+
+# 2. Enable auto-rejoin and expel one of the members.
+[connection server1]
+SET GLOBAL group_replication_autorejoin_tries = 1;
+SET @@GLOBAL.DEBUG='+d,group_replication_skip_wait_for_view_modification';
+SET @@GLOBAL.DEBUG='+d,group_replication_force_view_modification_timeout';
+SET @@GLOBAL.DEBUG='+d,group_replication_autorejoin_allow_join_to_change_state';
+include/gr_expel_member_from_group.inc
+SET SESSION sql_log_bin = 0;
+CREATE TABLE pid_table(pid_no INT PRIMARY KEY);
+LOAD DATA LOCAL INFILE 'pid_file' INTO TABLE pid_table;
+DROP TABLE pid_table;
+SET SESSION sql_log_bin = 1;
+
+# 3. Make sure view-change initiated by auto-rejoin has changed member
+#    state out of ERROR.
+#    Unblock wait_for_view_modification to fail during auto rejoin.
+SET DEBUG_SYNC= "now SIGNAL signal.group_replication_autorejoin_allow_join_to_change_state_resume";
+
+# 4. Verify that the expelled member will try to rejoin the group.
+
+# 5. Assert member state is set to ERROR on view change failure.
+include/gr_wait_for_member_state.inc
+include/assert_and_disable_read_only.inc
+
+# 6. Cleanup.
+[connection server1]
+SET @@GLOBAL.DEBUG = @debug_saved;
+include/stop_group_replication.inc
+include/start_group_replication.inc
+SET @@GLOBAL.group_replication_autorejoin_tries = @group_replication_autorejoin_tries_saved;
+include/gr_end_autorejoin_monitoring.inc
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_autorejoin_with_clone_while_recovery_locked.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_autorejoin_with_clone_while_recovery_locked.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_autorejoin_with_clone_while_recovery_locked.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_autorejoin_with_clone_while_recovery_locked.result	2021-09-28 11:46:34.000000000 +0000
@@ -109,6 +109,7 @@
 RESET PERSIST group_replication_autorejoin_tries;
 RESET PERSIST group_replication_components_stop_timeout;
 RESET PERSIST local_infile;
+RESET PERSIST group_replication_communication_stack;
 SET sql_log_bin=0;
 call mtr.add_suppression('Member was expelled from the group due to network failures, changing member status to ERROR.');
 call mtr.add_suppression('The server was automatically set into read only mode after an error was detected.');
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_blocked_start_gr_killed.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_blocked_start_gr_killed.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_blocked_start_gr_killed.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_blocked_start_gr_killed.result	2021-09-28 11:46:34.000000000 +0000
@@ -18,6 +18,9 @@
 CALL mtr.add_suppression("MYSQL_BIN_LOG::open failed to sync the index file.");
 CALL mtr.add_suppression("Failed in open_log.*called from Relay_log_info::rli_init_info");
 CALL mtr.add_suppression("Failed to setup the group replication applier thread.");
+CALL mtr.add_suppression("Fatal error during execution on the Applier process of Group Replication. The server will now leave the group.");
+CALL mtr.add_suppression("Unable to confirm whether the server has left the group or not. Check performance_schema.replication_group_members to check group membership information.");
+CALL mtr.add_suppression("The server was automatically set into read only mode after an error was detected.");
 SET sql_log_bin=1;
 SET GLOBAL group_replication_group_name= "GROUP_REPLICATION_GROUP_NAME";
 SET GLOBAL group_replication_bootstrap_group=ON;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_bootstrap_group_on_server_with_running_channels.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_bootstrap_group_on_server_with_running_channels.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_bootstrap_group_on_server_with_running_channels.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_bootstrap_group_on_server_with_running_channels.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,39 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+############################################################
+# 1. Configure and start a replication channel to replicate
+#    from server1.
+[connection server2]
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_PORT=SERVER_1_PORT;
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+include/start_slave.inc
+
+############################################################
+# 2. Bootstrap the group on server2.
+#    Check that GR and replication channel are working.
+[connection server2]
+include/start_and_bootstrap_group_replication.inc
+include/gr_assert_primary_member.inc
+include/check_slave_is_running.inc
+
+############################################################
+# 3. Write something on server1 and read it on server2.
+[connection server1]
+CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY);
+INSERT INTO t1 VALUES (1);
+include/sync_slave_sql_with_master.inc
+[connection server2]
+include/assert.inc ['There is one row in t1']
+
+############################################################
+# 4. Clean up.
+[connection server1]
+DROP TABLE t1;
+include/sync_slave_sql_with_master.inc
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_capture_mysql.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_capture_mysql.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_capture_mysql.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_capture_mysql.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,41 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
+CREATE TABLE t2 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
+include/rpl_sync.inc
+BEGIN;
+INSERT INTO t1 VALUES (1);
+INSERT INTO t2 VALUES (2);
+COMMIT;
+INSERT INTO t1 VALUES (3);
+BEGIN;
+INSERT INTO t1 VALUES (4);
+ROLLBACK;
+BEGIN;
+INSERT INTO t1 VALUES (5);
+INSERT INTO t1 VALUES (6);
+COMMIT;
+CREATE TEMPORARY TABLE t3 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1000);
+include/rpl_sync.inc
+
+server1
+SHOW TABLES FROM test;
+Tables_in_test
+t1
+t2
+
+server2
+SHOW TABLES FROM test;
+Tables_in_test
+t1
+t2
+include/assert.inc [server1 GTID_EXECUTED must be equal to server2 GTID_EXECUTED]
+include/diff_tables.inc [server1:test.t1, server2:test.t1]
+include/diff_tables.inc [server1:test.t2, server2:test.t2]
+
+DROP TABLE t1, t2, t3;
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_certifier_garbage_collection_with_clone.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_certifier_garbage_collection_with_clone.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_certifier_garbage_collection_with_clone.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_certifier_garbage_collection_with_clone.result	2021-09-28 11:46:34.000000000 +0000
@@ -111,6 +111,7 @@
 RESET PERSIST group_replication_local_address;
 RESET PERSIST group_replication_group_seeds;
 RESET PERSIST group_replication_start_on_boot;
+RESET PERSIST group_replication_communication_stack;
 SET GLOBAL group_replication_start_on_boot= GROUP_REPLICATION_START_ON_BOOT;
 SET SESSION sql_log_bin=0;
 call mtr.add_suppression("This member will start distributed recovery using clone. It is due to the number of missing transactions being higher than the configured threshold of 1.");
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_change_master_hidden_ps_protocol.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_change_master_hidden_ps_protocol.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_change_master_hidden_ps_protocol.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_change_master_hidden_ps_protocol.result	2021-09-28 11:46:34.000000000 +0000
@@ -8,8 +8,11 @@
 SET sql_log_bin=0;
 CREATE USER 'manish'@'%' IDENTIFIED BY 'unique_password';
 GRANT REPLICATION SLAVE ON *.* TO 'manish'@'%';
+CREATE USER 'internal_usr'@'%' IDENTIFIED BY 'unique_password';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'internal_usr'@'%';
 FLUSH PRIVILEGES;
 SET sql_log_bin=1;
+CHANGE MASTER TO MASTER_USER='internal_usr', MASTER_PASSWORD='unique_password' FOR CHANNEL 'group_replication_recovery';
 SET @old_log_output= @@log_output;
 SET GLOBAL log_output= 'TABLE';
 TRUNCATE mysql.general_log;
@@ -22,18 +25,14 @@
 ERROR 42S22: Unknown column 'password' in 'field list'
 server1
 include/assert.inc [The CHANGE REPLICATION SOURCE TO is logged with the password value replaced with the keyword <secret>.]
-SET sql_log_bin=0;
-call mtr.add_suppression(".*Invalid .* username when attempting to connect to the master server.*");
-call mtr.add_suppression("There was an error when connecting to the donor server");
-call mtr.add_suppression("For details please check performance_schema.replication_connection_status table and error log messages of Slave I/O for channel group_replication_recovery.");
-SET sql_log_bin=1;
-START GROUP_REPLICATION;
 include/assert.inc [The default values of the User_name and User_password are empty without a previous change master.]
 RESET REPLICA ALL FOR CHANNEL 'group_replication_recovery';
 SET sql_log_bin=0;
 DROP USER manish;
+DROP USER internal_usr;
 SET sql_log_bin=1;
 SET @@global.log_output= @old_log_output;
+TRUNCATE TABLE mysql.general_log;
 include/group_replication_end.inc
 # MASTER_PASSWORD value for the CHANGE MASTER command will not be logged in the error log.
 Occurrences of 'master_password' in the input file: 0
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_change_master_hidden.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_change_master_hidden.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_change_master_hidden.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_change_master_hidden.result	2021-09-28 11:46:34.000000000 +0000
@@ -8,8 +8,11 @@
 SET sql_log_bin=0;
 CREATE USER 'manish'@'%' IDENTIFIED BY 'unique_password';
 GRANT REPLICATION SLAVE ON *.* TO 'manish'@'%';
+CREATE USER 'internal_usr'@'%' IDENTIFIED BY 'unique_password';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'internal_usr'@'%';
 FLUSH PRIVILEGES;
 SET sql_log_bin=1;
+CHANGE MASTER TO MASTER_USER='internal_usr', MASTER_PASSWORD='unique_password' FOR CHANNEL 'group_replication_recovery';
 SET @old_log_output= @@log_output;
 SET GLOBAL log_output= 'TABLE';
 TRUNCATE mysql.general_log;
@@ -22,18 +25,14 @@
 ERROR 42S22: Unknown column 'password' in 'field list'
 server1
 include/assert.inc [The CHANGE REPLICATION SOURCE TO is logged with the password value replaced with the keyword <secret>.]
-SET sql_log_bin=0;
-call mtr.add_suppression(".*Invalid .* username when attempting to connect to the master server.*");
-call mtr.add_suppression("There was an error when connecting to the donor server");
-call mtr.add_suppression("For details please check performance_schema.replication_connection_status table and error log messages of Slave I/O for channel group_replication_recovery.");
-SET sql_log_bin=1;
-START GROUP_REPLICATION;
 include/assert.inc [The default values of the User_name and User_password are empty without a previous change master.]
 RESET REPLICA ALL FOR CHANNEL 'group_replication_recovery';
 SET sql_log_bin=0;
 DROP USER manish;
+DROP USER internal_usr;
 SET sql_log_bin=1;
 SET @@global.log_output= @old_log_output;
+TRUNCATE TABLE mysql.general_log;
 include/group_replication_end.inc
 # MASTER_PASSWORD value for the CHANGE MASTER command will not be logged in the error log.
 Occurrences of 'master_password' in the input file: 0
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_change_master_not_replicated.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_change_master_not_replicated.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_change_master_not_replicated.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_change_master_not_replicated.result	2021-09-28 11:46:34.000000000 +0000
@@ -8,13 +8,21 @@
 SET sql_log_bin=0;
 CREATE USER 'manish'@'%' IDENTIFIED BY 'rpl';
 GRANT REPLICATION SLAVE ON *.* TO 'manish'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'manish'@'%';
 FLUSH PRIVILEGES;
 SET sql_log_bin=1;
+CHANGE MASTER TO MASTER_USER='manish', MASTER_PASSWORD='rpl' FOR CHANNEL 'group_replication_recovery';
 include/start_and_bootstrap_group_replication.inc
 CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
 [connection server2]
 # Second CHANGE MASTER with valid options will work fine.
 CHANGE REPLICATION SOURCE TO SOURCE_USER='manish', SOURCE_PASSWORD='rpl' FOR CHANNEL 'group_replication_recovery';
+SET sql_log_bin=0;
+CREATE USER 'manish'@'%' IDENTIFIED BY 'rpl';
+GRANT REPLICATION SLAVE ON *.* TO 'manish'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'manish'@'%';
+FLUSH PRIVILEGES;
+SET sql_log_bin=1;
 include/start_group_replication.inc
 # Asserting that CHANGE MASTER is not logged in the binary log of the server 2.
 Occurrences of 'CHANGE MASTER' in the input file: 0
@@ -27,6 +35,9 @@
 RESET SLAVE ALL FOR CHANNEL 'group_replication_recovery';
 Warnings:
 Warning	1287	'RESET SLAVE' is deprecated and will be removed in a future release. Please use RESET REPLICA instead
+SET sql_log_bin=0;
+DROP USER manish;
+SET sql_log_bin=1;
 [connection server1]
 DROP TABLE t1;
 SET sql_log_bin=0;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_check_count_tx_remote_applier_queue_2.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_check_count_tx_remote_applier_queue_2.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_check_count_tx_remote_applier_queue_2.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_check_count_tx_remote_applier_queue_2.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,66 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+############################################################
+# 1. Bootstrap group on server1.
+[connection server1]
+SET SESSION sql_log_bin=0;
+CREATE TABLE test.t1 (c1 INT NOT NULL PRIMARY KEY);
+SET SESSION sql_log_bin=1;
+include/start_and_bootstrap_group_replication.inc
+
+############################################################
+# 2. Join server2 to the group, it will block on recovery,
+#    during the catchup of transactions queued into
+#    group_replication_applier channel.
+[connection server_2]
+SET SESSION sql_log_bin=0;
+CREATE TABLE test.t1 (c1 INT NOT NULL PRIMARY KEY);
+SET SESSION sql_log_bin=1;
+LOCK TABLE test.t1 READ;
+[connection server2]
+SET @@GLOBAL.DEBUG= '+d,recovery_thread_wait_before_wait_for_applier_module_recovery';
+include/start_group_replication.inc
+SET DEBUG_SYNC = "now WAIT_FOR signal.recovery_thread_wait_before_wait_for_applier_module_recovery";
+include/assert.inc [Verify MEMBER_STATE is RECOVERING]
+
+############################################################
+# 3. Commit 2 transactions on server1 while server2 is in recovery.
+[connection server1]
+INSERT INTO test.t1 VALUES (1);
+INSERT INTO test.t1 VALUES (2);
+
+############################################################
+# 4. Verify the values of performance_schema.replication_group_member_stats
+#    while server2 is in RECOVERING state.
+#    More precisely, server2 did applied all data from
+#    group_replication_recovery channel, but it is still applying the data
+#    queued on group_replication_applier (which is blocked by the locked table t1).
+[connection server2]
+include/assert.inc [Verify MEMBER_STATE is RECOVERING]
+[connection server1]
+
+############################################################
+# 5. Unblock recovery on server2.
+[connection server2]
+SET @@GLOBAL.DEBUG= '-d,recovery_thread_wait_before_wait_for_applier_module_recovery';
+SET DEBUG_SYNC= "now SIGNAL signal.recovery_thread_resume_before_wait_for_applier_module_recovery";
+[connection server_2]
+UNLOCK TABLES;
+include/gr_wait_for_member_state.inc
+
+############################################################
+# 6. Verify the values of performance_schema.replication_group_member_stats
+#    once server2 is ONLINE.
+[connection server2]
+[connection server1]
+
+############################################################
+# 7. Clean up.
+[connection server2]
+SET DEBUG_SYNC= 'RESET';
+DROP TABLE test.t1;
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_clone_applier_stop.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_clone_applier_stop.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_clone_applier_stop.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_clone_applier_stop.result	2021-09-28 11:46:34.000000000 +0000
@@ -116,5 +116,6 @@
 RESET PERSIST group_replication_local_address;
 RESET PERSIST group_replication_group_seeds;
 RESET PERSIST group_replication_start_on_boot;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 include/clean_monitoring_process.inc
 include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_clone_integration_basics.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_clone_integration_basics.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_clone_integration_basics.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_clone_integration_basics.result	2021-09-28 11:46:34.000000000 +0000
@@ -66,6 +66,7 @@
 RESET PERSIST IF EXISTS group_replication_local_address;
 RESET PERSIST IF EXISTS group_replication_group_seeds;
 RESET PERSIST IF EXISTS group_replication_start_on_boot;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 SET GLOBAL group_replication_start_on_boot= START_ON_BOOT_VALUE;
 set session sql_log_bin=0;
 call mtr.add_suppression(".*This member has more executed transactions *.*");
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_clone_integration_basics_with_ssl_mysql.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_clone_integration_basics_with_ssl_mysql.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_clone_integration_basics_with_ssl_mysql.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_clone_integration_basics_with_ssl_mysql.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,83 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+############################################################
+# 1. Install clone plugin on server1.
+[connection server1]
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+
+############################################################
+# 2. Create a user that requires SSL
+SET SESSION sql_log_bin=0;
+CREATE USER 'rec_ssl_user'@'%' REQUIRE SSL;
+GRANT replication slave ON *.* TO 'rec_ssl_user'@'%';
+GRANT BACKUP_ADMIN ON *.* TO "rec_ssl_user";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'rec_ssl_user'@'%';
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin=1;
+SET GLOBAL group_replication_ssl_mode= REQUIRED;
+CHANGE REPLICATION SOURCE TO SOURCE_USER="rec_ssl_user" FOR CHANNEL "group_replication_recovery";
+
+############################################################
+# 3. Bootstrap server1 and add some data
+include/start_and_bootstrap_group_replication.inc
+CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1);
+INSERT INTO t1 VALUES (2);
+
+#######################################################################
+# 4. Restart server 2 with a monitoring process (mysqld_safe) if needed
+[connection server2]
+SET SESSION sql_log_bin=0;
+CREATE USER 'rec_ssl_user'@'%' REQUIRE SSL;
+GRANT replication slave ON *.* TO 'rec_ssl_user'@'%';
+GRANT BACKUP_ADMIN ON *.* TO "rec_ssl_user";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'rec_ssl_user'@'%';
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin=1;
+SET GLOBAL group_replication_ssl_mode= REQUIRED;
+include/spawn_monitoring_process.inc
+
+############################################################
+# 5. Setup the server so group replication starts on boot
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+
+############################################################
+# 6. Configure the plugin to use SSL while Cloning
+#    Start group replication on server 2
+#    Wait for it to restart and come back
+#    Check clone was completed
+CHANGE REPLICATION SOURCE TO SOURCE_USER="rec_ssl_user" FOR CHANNEL "group_replication_recovery";
+SET GLOBAL group_replication_clone_threshold= 1;
+START GROUP_REPLICATION;
+include/rpl_reconnect.inc
+include/gr_wait_for_member_state.inc
+include/assert.inc [Clone must be completed]
+include/diff_tables.inc [server1:test.t1 ,server2:test.t1]
+
+############################################################
+# 7. Cleanup
+SET GLOBAL group_replication_clone_threshold= 9223372036854775807;;
+RESET PERSIST IF EXISTS group_replication_group_name;
+RESET PERSIST IF EXISTS group_replication_local_address;
+RESET PERSIST IF EXISTS group_replication_group_seeds;
+RESET PERSIST IF EXISTS group_replication_start_on_boot;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
+RESET PERSIST IF EXISTS group_replication_ssl_mode;
+RESET PERSIST IF EXISTS group_replication_recovery_use_ssl;
+RESET PERSIST IF EXISTS group_replication_recovery_ssl_ca;
+RESET PERSIST IF EXISTS group_replication_recovery_ssl_cert;
+RESET PERSIST IF EXISTS group_replication_recovery_ssl_key;
+DROP TABLE t1;
+include/rpl_sync.inc
+set session sql_log_bin=0;
+call mtr.add_suppression("This member will start distributed recovery using clone. It is due to the number of missing transactions being higher than the configured threshold of*");
+call mtr.add_suppression("Clone removing all user data for provisioning: Started");
+call mtr.add_suppression("Clone removing all user data for provisioning: Finished");
+set session sql_log_bin=1;
+include/clean_monitoring_process.inc
+server1
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_clone_integration_basics_with_ssl.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_clone_integration_basics_with_ssl.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_clone_integration_basics_with_ssl.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_clone_integration_basics_with_ssl.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,9 +11,14 @@
 
 ############################################################
 # 2. Create a user that requires SSL
+SET SESSION sql_log_bin=0;
 CREATE USER 'rec_ssl_user'@'%' REQUIRE SSL;
 GRANT replication slave ON *.* TO 'rec_ssl_user'@'%';
 GRANT BACKUP_ADMIN ON *.* TO "rec_ssl_user";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'rec_ssl_user'@'%';
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin=1;
+SET GLOBAL group_replication_ssl_mode= REQUIRED;
 CHANGE REPLICATION SOURCE TO SOURCE_USER="rec_ssl_user" FOR CHANNEL "group_replication_recovery";
 
 ############################################################
@@ -26,6 +31,14 @@
 #######################################################################
 # 4. Restart server 2 with a monitoring process (mysqld_safe) if needed
 [connection server2]
+SET SESSION sql_log_bin=0;
+CREATE USER 'rec_ssl_user'@'%' REQUIRE SSL;
+GRANT replication slave ON *.* TO 'rec_ssl_user'@'%';
+GRANT BACKUP_ADMIN ON *.* TO "rec_ssl_user";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'rec_ssl_user'@'%';
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin=1;
+SET GLOBAL group_replication_ssl_mode= REQUIRED;
 include/spawn_monitoring_process.inc
 
 ############################################################
@@ -52,6 +65,8 @@
 RESET PERSIST IF EXISTS group_replication_local_address;
 RESET PERSIST IF EXISTS group_replication_group_seeds;
 RESET PERSIST IF EXISTS group_replication_start_on_boot;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
+RESET PERSIST IF EXISTS group_replication_ssl_mode;
 RESET PERSIST IF EXISTS group_replication_recovery_use_ssl;
 RESET PERSIST IF EXISTS group_replication_recovery_ssl_ca;
 RESET PERSIST IF EXISTS group_replication_recovery_ssl_cert;
@@ -64,4 +79,5 @@
 call mtr.add_suppression("Clone removing all user data for provisioning: Finished");
 set session sql_log_bin=1;
 include/clean_monitoring_process.inc
+server1
 include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_clone_integration_clone_on_rejoin.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_clone_integration_clone_on_rejoin.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_clone_integration_clone_on_rejoin.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_clone_integration_clone_on_rejoin.result	2021-09-28 11:46:34.000000000 +0000
@@ -89,6 +89,7 @@
 RESET PERSIST IF EXISTS group_replication_group_seeds;
 RESET PERSIST IF EXISTS group_replication_start_on_boot;
 RESET PERSIST IF EXISTS local_infile;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 UNINSTALL PLUGIN clone;
 SET GLOBAL group_replication_clone_threshold= 9223372036854775807;
 set session sql_log_bin=0;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_clone_integration_clone_on_server_start.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_clone_integration_clone_on_server_start.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_clone_integration_clone_on_server_start.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_clone_integration_clone_on_server_start.result	2021-09-28 11:46:34.000000000 +0000
@@ -64,6 +64,7 @@
 RESET PERSIST IF EXISTS group_replication_group_seeds;
 RESET PERSIST IF EXISTS group_replication_start_on_boot;
 RESET PERSIST IF EXISTS group_replication_clone_threshold;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 SET GLOBAL group_replication_clone_threshold= 9223372036854775807;
 DROP TABLE t1;
 include/rpl_sync.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_clone_integration_clone_operations_on_runnning_member.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_clone_integration_clone_operations_on_runnning_member.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_clone_integration_clone_operations_on_runnning_member.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_clone_integration_clone_operations_on_runnning_member.result	2021-09-28 11:46:34.000000000 +0000
@@ -70,6 +70,7 @@
 RESET PERSIST IF EXISTS group_replication_local_address;
 RESET PERSIST IF EXISTS group_replication_group_seeds;
 RESET PERSIST IF EXISTS group_replication_start_on_boot;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 SET GLOBAL group_replication_start_on_boot= START_ON_BOOT_VALUE;
 UNINSTALL PLUGIN clone;
 set session sql_log_bin=0;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_clone_integration_ddl_error.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_clone_integration_ddl_error.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_clone_integration_ddl_error.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_clone_integration_ddl_error.result	2021-09-28 11:46:34.000000000 +0000
@@ -64,6 +64,7 @@
 RESET PERSIST IF EXISTS group_replication_local_address;
 RESET PERSIST IF EXISTS group_replication_group_seeds;
 RESET PERSIST IF EXISTS group_replication_start_on_boot;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 SET GLOBAL group_replication_start_on_boot= START_ON_BOOT_VALUE;
 [connection server_1_1]
 DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_clone_integration_kill_donor_during_clone.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_clone_integration_kill_donor_during_clone.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_clone_integration_kill_donor_during_clone.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_clone_integration_kill_donor_during_clone.result	2021-09-28 11:46:34.000000000 +0000
@@ -69,6 +69,7 @@
 RESET PERSIST IF EXISTS group_replication_local_address;
 RESET PERSIST IF EXISTS group_replication_group_seeds;
 RESET PERSIST IF EXISTS group_replication_start_on_boot;
+RESET PERSIST group_replication_communication_stack;
 set session sql_log_bin=0;
 call mtr.add_suppression("This member will start distributed recovery using clone. It is due to the number of missing transactions being higher than the configured threshold of 1.");
 call mtr.add_suppression("Internal query: CLONE INSTANCE FROM \'root\'@\'127.0.0.1\':[0-9]+ IDENTIFIED BY \'\\*\\*\\*\\*\\*\' REQUIRE NO SSL; result in error. Error number:*");
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_clone_integration_no_privileges.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_clone_integration_no_privileges.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_clone_integration_no_privileges.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_clone_integration_no_privileges.result	2021-09-28 11:46:34.000000000 +0000
@@ -10,8 +10,12 @@
 #    Bootstrap a group on server1.
 [connection server1]
 INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+SET SESSION sql_log_bin= 0;
 CREATE USER "recovery_user" IDENTIFIED BY "recovery_password";
 GRANT REPLICATION SLAVE ON *.* TO "recovery_user";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO "recovery_user"@'%';;
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
 CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1);
 INSERT INTO t1 VALUES (2);
@@ -21,6 +25,11 @@
 # 2. Install clone plugin on server2.
 #    Restart server with a monitoring process (mysqld_safe) if needed
 [connection server2]
+SET SESSION sql_log_bin= 0;
+CREATE USER "recovery_user" IDENTIFIED BY "recovery_password";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO "recovery_user"@'%';;
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
 INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
 include/spawn_monitoring_process.inc
 
@@ -42,6 +51,7 @@
 RESET PERSIST IF EXISTS group_replication_local_address;
 RESET PERSIST IF EXISTS group_replication_group_seeds;
 RESET PERSIST IF EXISTS group_replication_start_on_boot;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 DROP TABLE t1;
 DROP USER "recovery_user";
 include/rpl_sync.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_clone_integration_purged_donor.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_clone_integration_purged_donor.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_clone_integration_purged_donor.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_clone_integration_purged_donor.result	2021-09-28 11:46:34.000000000 +0000
@@ -44,6 +44,7 @@
 RESET PERSIST IF EXISTS group_replication_group_name;
 RESET PERSIST IF EXISTS group_replication_local_address;
 RESET PERSIST IF EXISTS group_replication_group_seeds;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 DROP TABLE t1;
 include/gtid_utils_end.inc
 include/rpl_sync.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_clone_integration_recovery_priv_user_preservation.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_clone_integration_recovery_priv_user_preservation.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_clone_integration_recovery_priv_user_preservation.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_clone_integration_recovery_priv_user_preservation.result	2021-09-28 11:46:34.000000000 +0000
@@ -51,6 +51,7 @@
 RESET PERSIST IF EXISTS group_replication_local_address;
 RESET PERSIST IF EXISTS group_replication_group_seeds;
 RESET PERSIST IF EXISTS group_replication_start_on_boot;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 DROP TABLE db1.t1;
 DROP DATABASE db1;
 include/rpl_sync.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_clone_integration_start_gr_during_user_clone.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_clone_integration_start_gr_during_user_clone.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_clone_integration_start_gr_during_user_clone.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_clone_integration_start_gr_during_user_clone.result	2021-09-28 11:46:34.000000000 +0000
@@ -55,6 +55,7 @@
 RESET PERSIST IF EXISTS group_replication_group_name;
 RESET PERSIST IF EXISTS group_replication_local_address;
 RESET PERSIST IF EXISTS group_replication_group_seeds;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 DROP TABLE test.t1;
 include/rpl_sync.inc
 SET SESSION sql_log_bin=0;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_clone_integration_stop_donor_during_clone_failover.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_clone_integration_stop_donor_during_clone_failover.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_clone_integration_stop_donor_during_clone_failover.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_clone_integration_stop_donor_during_clone_failover.result	2021-09-28 11:46:34.000000000 +0000
@@ -85,6 +85,7 @@
 RESET PERSIST IF EXISTS group_replication_local_address;
 RESET PERSIST IF EXISTS group_replication_group_seeds;
 RESET PERSIST IF EXISTS group_replication_start_on_boot;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 set session sql_log_bin=0;
 call mtr.add_suppression("This member will start distributed recovery using clone. It is due to the number of missing transactions being higher than the configured threshold of 1.");
 call mtr.add_suppression("Internal query: CLONE INSTANCE FROM \'root\'@\'127.0.0.1\':[0-9]+ IDENTIFIED BY \'\\*\\*\\*\\*\\*\' REQUIRE NO SSL; result in error. Error number:*");
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_clone_integration_stop_donor_during_clone.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_clone_integration_stop_donor_during_clone.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_clone_integration_stop_donor_during_clone.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_clone_integration_stop_donor_during_clone.result	2021-09-28 11:46:34.000000000 +0000
@@ -76,6 +76,7 @@
 RESET PERSIST IF EXISTS group_replication_local_address;
 RESET PERSIST IF EXISTS group_replication_group_seeds;
 RESET PERSIST IF EXISTS group_replication_start_on_boot;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 DROP TABLE t1;
 set session sql_log_bin=0;
 call mtr.add_suppression("This member will start distributed recovery using clone. It is due to the number of missing transactions being higher than the configured threshold of 1.");
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_clone_integration_stop_joiner_during_clone.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_clone_integration_stop_joiner_during_clone.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_clone_integration_stop_joiner_during_clone.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_clone_integration_stop_joiner_during_clone.result	2021-09-28 11:46:34.000000000 +0000
@@ -68,6 +68,7 @@
 RESET PERSIST IF EXISTS group_replication_local_address;
 RESET PERSIST IF EXISTS group_replication_group_seeds;
 RESET PERSIST IF EXISTS group_replication_start_on_boot;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 DROP TABLE t1;
 include/rpl_sync.inc
 set session sql_log_bin=0;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_clone_integration_stop_primary_member.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_clone_integration_stop_primary_member.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_clone_integration_stop_primary_member.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_clone_integration_stop_primary_member.result	2021-09-28 11:46:34.000000000 +0000
@@ -80,6 +80,7 @@
 RESET PERSIST IF EXISTS group_replication_local_address;
 RESET PERSIST IF EXISTS group_replication_group_seeds;
 RESET PERSIST IF EXISTS group_replication_start_on_boot;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 SET GLOBAL read_only= FALSE;
 set session sql_log_bin=0;
 call mtr.add_suppression("This member will start distributed recovery using clone. It is due to the number of missing transactions being higher than the configured threshold of 1.");
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_clone_with_consistency_after.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_clone_with_consistency_after.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_clone_with_consistency_after.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_clone_with_consistency_after.result	2021-09-28 11:46:34.000000000 +0000
@@ -54,6 +54,7 @@
 RESET PERSIST group_replication_group_seeds;
 RESET PERSIST group_replication_start_on_boot;
 RESET PERSIST group_replication_consistency;
+RESET PERSIST group_replication_communication_stack;
 SET GLOBAL group_replication_start_on_boot= START_ON_BOOT_VALUE;
 SET GLOBAL group_replication_consistency = GROUP_REPLICATION_CONSISTENCY;
 SET GLOBAL group_replication_clone_threshold= GROUP_REPLICATION_CLONE_THRESHOLD;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_communication_protocol_and_different_member_states.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_communication_protocol_and_different_member_states.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_communication_protocol_and_different_member_states.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_communication_protocol_and_different_member_states.result	2021-09-28 11:46:34.000000000 +0000
@@ -28,7 +28,7 @@
 [connection server1]
 SELECT group_replication_get_communication_protocol();
 group_replication_get_communication_protocol()
-8.0.16
+GR_COMMUNICATION_PROTOCOL_VERSION
 ###############################################################################
 #  5. Check that it is *not* possible to query the communication_protocol value via a RECOVERING member.
 [connection server2]
@@ -50,7 +50,7 @@
 #  7. Check that it is possible to query the communication_protocol value via an ONLINE member when a minority of members are UNREACHABLE.
 SELECT group_replication_get_communication_protocol();
 group_replication_get_communication_protocol()
-8.0.16
+GR_COMMUNICATION_PROTOCOL_VERSION
 ###############################################################################
 #  8. Check that it is *not* possible to query the communication_protocol value via an ONLINE member when a majority of members are UNREACHABLE.
 [connection server3]
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_communication_protocol.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_communication_protocol.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_communication_protocol.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_communication_protocol.result	2021-09-28 11:46:34.000000000 +0000
@@ -20,8 +20,10 @@
 group_replication_set_communication_protocol("5.7.14")
 The operation group_replication_set_communication_protocol completed successfully
 include/assert.inc [communication_protocol is supposed to be 5.7.14]
+include/assert.inc [protocol_version (5.7.14) should be 5.7.14]
 [connection server2]
 include/assert.inc [communication_protocol is supposed to be 5.7.14]
+include/assert.inc [protocol_version (5.7.14) should be 5.7.14]
 ###############################################################################
 # 3. Increase communication_protocol.
 [connection server1]
@@ -29,8 +31,10 @@
 group_replication_set_communication_protocol("8.0.16")
 The operation group_replication_set_communication_protocol completed successfully
 include/assert.inc [communication_protocol is supposed to be 8.0.16]
+include/assert.inc [protocol_version (8.0.16) should be 8.0.16]
 [connection server2]
 include/assert.inc [communication_protocol is supposed to be 8.0.16]
+include/assert.inc [protocol_version (8.0.16) should be 8.0.16]
 ###############################################################################
 # 4. Confirm invalid calls to group_replication_get_communication_protocol
 [connection server1]
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_consistent_delayed_view_change_with_local_txn.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_consistent_delayed_view_change_with_local_txn.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_consistent_delayed_view_change_with_local_txn.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_consistent_delayed_view_change_with_local_txn.result	2021-09-28 11:46:34.000000000 +0000
@@ -13,6 +13,7 @@
 SET SESSION sql_log_bin= 0;
 CREATE USER "recovery_user" IDENTIFIED BY "recovery_password";
 GRANT REPLICATION SLAVE ON *.* TO "recovery_user";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'recovery_user'@'%';
 FLUSH PRIVILEGES;
 SET SESSION sql_log_bin= 1;
 include/start_and_bootstrap_group_replication.inc
@@ -20,6 +21,11 @@
 ############################################################
 # 02. Start server2
 [connection server2]
+SET SESSION sql_log_bin= 0;
+CREATE USER "recovery_user" IDENTIFIED BY "recovery_password";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'recovery_user'@'%';
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
 include/start_group_replication.inc
 
 ############################################################
@@ -57,6 +63,11 @@
 ############################################################
 # 08. Start server3
 [connection server3]
+SET SESSION sql_log_bin= 0;
+CREATE USER "recovery_user" IDENTIFIED BY "recovery_password";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'recovery_user'@'%';
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
 CHANGE REPLICATION SOURCE TO SOURCE_USER= 'recovery_user', SOURCE_PASSWORD= 'recovery_password' FOR CHANNEL 'group_replication_recovery';
 Warnings:
 Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
@@ -64,6 +75,8 @@
 SET SESSION sql_log_bin= 0;
 call mtr.add_suppression("There was an error when connecting to the donor server*");
 call mtr.add_suppression("For details please check performance_schema*");
+call mtr.add_suppression("Slave I/O for channel 'group_replication_recovery': Master command COM_REGISTER_SLAVE failed*");
+call mtr.add_suppression("Slave I/O thread couldn't register on master");
 SET SESSION sql_log_bin= 1;
 include/start_group_replication.inc
 
@@ -160,4 +173,12 @@
 SET SESSION sql_log_bin= 0;
 DROP USER "recovery_user";
 SET SESSION sql_log_bin= 1;
+[connection server2]
+SET SESSION sql_log_bin= 0;
+DROP USER "recovery_user";
+SET SESSION sql_log_bin= 1;
+[connection server3]
+SET SESSION sql_log_bin= 0;
+DROP USER "recovery_user";
+SET SESSION sql_log_bin= 1;
 include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_consistent_statement_hold_select_do.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_consistent_statement_hold_select_do.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_consistent_statement_hold_select_do.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_consistent_statement_hold_select_do.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,110 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+############################################################
+# 1. Bootstrap group on server1.
+[connection server1]
+include/start_and_bootstrap_group_replication.inc
+CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY);
+
+############################################################
+# 2. Validate that a given SELECT that access tables goes
+#    through the `trans_begin` hook on Group Replication on
+#    server1.
+
+# Instrument GR to hold the statement on
+# `trans_begin` hook on server1.
+[connection server_1]
+# Adding debug point 'group_replication_wait_on_observer_trans' to @@GLOBAL.debug
+
+# Execute the statement on server1.
+[connection server1]
+SELECT * FROM t1;
+
+# Validate that the statement went on
+# `trans_begin` hook on server1.
+[connection server_1]
+SET DEBUG_SYNC= "now WAIT_FOR signal.group_replication_wait_on_observer_trans_waiting";
+
+# Release the statement from
+# `trans_begin` hook on server1.
+SET DEBUG_SYNC= 'now SIGNAL signal.group_replication_wait_on_observer_trans_continue';
+
+# Reap the statement on server1.
+[connection server1]
+
+# Remove GR instrumentaion to hold the statement on
+# `trans_begin` hook on server1.
+[connection server_1]
+# Removing debug point 'group_replication_wait_on_observer_trans' from @@GLOBAL.debug
+
+############################################################
+# 3. Validate that a given SELECT that calls a UDF goes
+#    through the `trans_begin` hook on Group Replication on
+#    server1.
+
+# Instrument GR to hold the statement on
+# `trans_begin` hook on server1.
+[connection server_1]
+# Adding debug point 'group_replication_wait_on_observer_trans' to @@GLOBAL.debug
+
+# Execute the statement on server1.
+[connection server1]
+SELECT group_replication_enable_member_action("mysql_disable_super_read_only_if_primary", "AFTER_PRIMARY_ELECTION");;
+
+# Validate that the statement went on
+# `trans_begin` hook on server1.
+[connection server_1]
+SET DEBUG_SYNC= "now WAIT_FOR signal.group_replication_wait_on_observer_trans_waiting";
+
+# Release the statement from
+# `trans_begin` hook on server1.
+SET DEBUG_SYNC= 'now SIGNAL signal.group_replication_wait_on_observer_trans_continue';
+
+# Reap the statement on server1.
+[connection server1]
+
+# Remove GR instrumentaion to hold the statement on
+# `trans_begin` hook on server1.
+[connection server_1]
+# Removing debug point 'group_replication_wait_on_observer_trans' from @@GLOBAL.debug
+
+############################################################
+# 4. Validate that a given DO that calls a UDF goes
+#    through the `trans_begin` hook on Group Replication on
+#    server1.
+
+# Instrument GR to hold the statement on
+# `trans_begin` hook on server1.
+[connection server_1]
+# Adding debug point 'group_replication_wait_on_observer_trans' to @@GLOBAL.debug
+
+# Execute the statement on server1.
+[connection server1]
+DO group_replication_enable_member_action("mysql_disable_super_read_only_if_primary", "AFTER_PRIMARY_ELECTION");;
+
+# Validate that the statement went on
+# `trans_begin` hook on server1.
+[connection server_1]
+SET DEBUG_SYNC= "now WAIT_FOR signal.group_replication_wait_on_observer_trans_waiting";
+
+# Release the statement from
+# `trans_begin` hook on server1.
+SET DEBUG_SYNC= 'now SIGNAL signal.group_replication_wait_on_observer_trans_continue';
+
+# Reap the statement on server1.
+[connection server1]
+
+# Remove GR instrumentaion to hold the statement on
+# `trans_begin` hook on server1.
+[connection server_1]
+# Removing debug point 'group_replication_wait_on_observer_trans' from @@GLOBAL.debug
+
+############################################################
+# 5. Clean up.
+[connection server1]
+DROP TABLE t1;
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_consistent_statement_hold_show.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_consistent_statement_hold_show.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_consistent_statement_hold_show.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_consistent_statement_hold_show.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,433 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+############################################################
+# 1. Bootstrap group on server1.
+[connection server1]
+include/start_and_bootstrap_group_replication.inc
+CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY);
+CREATE TABLE t2 (c1 INT NOT NULL PRIMARY KEY);
+USE test;
+CREATE PROCEDURE procedure1()
+BEGIN
+end$$
+CREATE FUNCTION function1() RETURNS INT RETURN (SELECT COUNT(*) FROM t1);
+CREATE EVENT event1
+ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 1 SECOND
+ON COMPLETION PRESERVE
+DISABLE
+DO
+BEGIN
+END$$
+CREATE TRIGGER trigger1 BEFORE INSERT ON t1 FOR EACH ROW
+BEGIN
+INSERT INTO t2 VALUES (NEW.c1);
+END|
+
+############################################################
+# 2. Validate that a given SHOW statement goes through the
+#    `trans_begin` hook on Group Replication on server1.
+
+# Instrument GR to hold the statement on
+# `trans_begin` hook on server1.
+[connection server_1]
+# Adding debug point 'group_replication_wait_on_observer_trans' to @@GLOBAL.debug
+
+# Execute the statement on server1.
+[connection server1]
+SHOW DATABASES;
+
+# Validate that the statement went on
+# `trans_begin` hook on server1.
+[connection server_1]
+SET DEBUG_SYNC= "now WAIT_FOR signal.group_replication_wait_on_observer_trans_waiting";
+
+# Release the statement from
+# `trans_begin` hook on server1.
+SET DEBUG_SYNC= 'now SIGNAL signal.group_replication_wait_on_observer_trans_continue';
+
+# Reap the statement on server1.
+[connection server1]
+
+# Remove GR instrumentaion to hold the statement on
+# `trans_begin` hook on server1.
+[connection server_1]
+# Removing debug point 'group_replication_wait_on_observer_trans' from @@GLOBAL.debug
+
+# Instrument GR to hold the statement on
+# `trans_begin` hook on server1.
+[connection server_1]
+# Adding debug point 'group_replication_wait_on_observer_trans' to @@GLOBAL.debug
+
+# Execute the statement on server1.
+[connection server1]
+SHOW TABLES;
+
+# Validate that the statement went on
+# `trans_begin` hook on server1.
+[connection server_1]
+SET DEBUG_SYNC= "now WAIT_FOR signal.group_replication_wait_on_observer_trans_waiting";
+
+# Release the statement from
+# `trans_begin` hook on server1.
+SET DEBUG_SYNC= 'now SIGNAL signal.group_replication_wait_on_observer_trans_continue';
+
+# Reap the statement on server1.
+[connection server1]
+
+# Remove GR instrumentaion to hold the statement on
+# `trans_begin` hook on server1.
+[connection server_1]
+# Removing debug point 'group_replication_wait_on_observer_trans' from @@GLOBAL.debug
+
+# Instrument GR to hold the statement on
+# `trans_begin` hook on server1.
+[connection server_1]
+# Adding debug point 'group_replication_wait_on_observer_trans' to @@GLOBAL.debug
+
+# Execute the statement on server1.
+[connection server1]
+SHOW INDEX FROM t1;
+
+# Validate that the statement went on
+# `trans_begin` hook on server1.
+[connection server_1]
+SET DEBUG_SYNC= "now WAIT_FOR signal.group_replication_wait_on_observer_trans_waiting";
+
+# Release the statement from
+# `trans_begin` hook on server1.
+SET DEBUG_SYNC= 'now SIGNAL signal.group_replication_wait_on_observer_trans_continue';
+
+# Reap the statement on server1.
+[connection server1]
+
+# Remove GR instrumentaion to hold the statement on
+# `trans_begin` hook on server1.
+[connection server_1]
+# Removing debug point 'group_replication_wait_on_observer_trans' from @@GLOBAL.debug
+
+# Instrument GR to hold the statement on
+# `trans_begin` hook on server1.
+[connection server_1]
+# Adding debug point 'group_replication_wait_on_observer_trans' to @@GLOBAL.debug
+
+# Execute the statement on server1.
+[connection server1]
+SHOW KEYS FROM t1;
+
+# Validate that the statement went on
+# `trans_begin` hook on server1.
+[connection server_1]
+SET DEBUG_SYNC= "now WAIT_FOR signal.group_replication_wait_on_observer_trans_waiting";
+
+# Release the statement from
+# `trans_begin` hook on server1.
+SET DEBUG_SYNC= 'now SIGNAL signal.group_replication_wait_on_observer_trans_continue';
+
+# Reap the statement on server1.
+[connection server1]
+
+# Remove GR instrumentaion to hold the statement on
+# `trans_begin` hook on server1.
+[connection server_1]
+# Removing debug point 'group_replication_wait_on_observer_trans' from @@GLOBAL.debug
+
+# Instrument GR to hold the statement on
+# `trans_begin` hook on server1.
+[connection server_1]
+# Adding debug point 'group_replication_wait_on_observer_trans' to @@GLOBAL.debug
+
+# Execute the statement on server1.
+[connection server1]
+SHOW GRANTS FOR CURRENT_USER();
+
+# Validate that the statement went on
+# `trans_begin` hook on server1.
+[connection server_1]
+SET DEBUG_SYNC= "now WAIT_FOR signal.group_replication_wait_on_observer_trans_waiting";
+
+# Release the statement from
+# `trans_begin` hook on server1.
+SET DEBUG_SYNC= 'now SIGNAL signal.group_replication_wait_on_observer_trans_continue';
+
+# Reap the statement on server1.
+[connection server1]
+
+# Remove GR instrumentaion to hold the statement on
+# `trans_begin` hook on server1.
+[connection server_1]
+# Removing debug point 'group_replication_wait_on_observer_trans' from @@GLOBAL.debug
+
+# Instrument GR to hold the statement on
+# `trans_begin` hook on server1.
+[connection server_1]
+# Adding debug point 'group_replication_wait_on_observer_trans' to @@GLOBAL.debug
+
+# Execute the statement on server1.
+[connection server1]
+SHOW CREATE DATABASE test;
+
+# Validate that the statement went on
+# `trans_begin` hook on server1.
+[connection server_1]
+SET DEBUG_SYNC= "now WAIT_FOR signal.group_replication_wait_on_observer_trans_waiting";
+
+# Release the statement from
+# `trans_begin` hook on server1.
+SET DEBUG_SYNC= 'now SIGNAL signal.group_replication_wait_on_observer_trans_continue';
+
+# Reap the statement on server1.
+[connection server1]
+
+# Remove GR instrumentaion to hold the statement on
+# `trans_begin` hook on server1.
+[connection server_1]
+# Removing debug point 'group_replication_wait_on_observer_trans' from @@GLOBAL.debug
+
+# Instrument GR to hold the statement on
+# `trans_begin` hook on server1.
+[connection server_1]
+# Adding debug point 'group_replication_wait_on_observer_trans' to @@GLOBAL.debug
+
+# Execute the statement on server1.
+[connection server1]
+SHOW TABLE STATUS FROM test;
+
+# Validate that the statement went on
+# `trans_begin` hook on server1.
+[connection server_1]
+SET DEBUG_SYNC= "now WAIT_FOR signal.group_replication_wait_on_observer_trans_waiting";
+
+# Release the statement from
+# `trans_begin` hook on server1.
+SET DEBUG_SYNC= 'now SIGNAL signal.group_replication_wait_on_observer_trans_continue';
+
+# Reap the statement on server1.
+[connection server1]
+
+# Remove GR instrumentaion to hold the statement on
+# `trans_begin` hook on server1.
+[connection server_1]
+# Removing debug point 'group_replication_wait_on_observer_trans' from @@GLOBAL.debug
+
+# Instrument GR to hold the statement on
+# `trans_begin` hook on server1.
+[connection server_1]
+# Adding debug point 'group_replication_wait_on_observer_trans' to @@GLOBAL.debug
+
+# Execute the statement on server1.
+[connection server1]
+SHOW TRIGGERS FROM test;
+
+# Validate that the statement went on
+# `trans_begin` hook on server1.
+[connection server_1]
+SET DEBUG_SYNC= "now WAIT_FOR signal.group_replication_wait_on_observer_trans_waiting";
+
+# Release the statement from
+# `trans_begin` hook on server1.
+SET DEBUG_SYNC= 'now SIGNAL signal.group_replication_wait_on_observer_trans_continue';
+
+# Reap the statement on server1.
+[connection server1]
+
+# Remove GR instrumentaion to hold the statement on
+# `trans_begin` hook on server1.
+[connection server_1]
+# Removing debug point 'group_replication_wait_on_observer_trans' from @@GLOBAL.debug
+
+# Instrument GR to hold the statement on
+# `trans_begin` hook on server1.
+[connection server_1]
+# Adding debug point 'group_replication_wait_on_observer_trans' to @@GLOBAL.debug
+
+# Execute the statement on server1.
+[connection server1]
+SHOW CREATE PROCEDURE test.procedure1;
+
+# Validate that the statement went on
+# `trans_begin` hook on server1.
+[connection server_1]
+SET DEBUG_SYNC= "now WAIT_FOR signal.group_replication_wait_on_observer_trans_waiting";
+
+# Release the statement from
+# `trans_begin` hook on server1.
+SET DEBUG_SYNC= 'now SIGNAL signal.group_replication_wait_on_observer_trans_continue';
+
+# Reap the statement on server1.
+[connection server1]
+
+# Remove GR instrumentaion to hold the statement on
+# `trans_begin` hook on server1.
+[connection server_1]
+# Removing debug point 'group_replication_wait_on_observer_trans' from @@GLOBAL.debug
+
+# Instrument GR to hold the statement on
+# `trans_begin` hook on server1.
+[connection server_1]
+# Adding debug point 'group_replication_wait_on_observer_trans' to @@GLOBAL.debug
+
+# Execute the statement on server1.
+[connection server1]
+SHOW CREATE FUNCTION test.function1;
+
+# Validate that the statement went on
+# `trans_begin` hook on server1.
+[connection server_1]
+SET DEBUG_SYNC= "now WAIT_FOR signal.group_replication_wait_on_observer_trans_waiting";
+
+# Release the statement from
+# `trans_begin` hook on server1.
+SET DEBUG_SYNC= 'now SIGNAL signal.group_replication_wait_on_observer_trans_continue';
+
+# Reap the statement on server1.
+[connection server1]
+
+# Remove GR instrumentaion to hold the statement on
+# `trans_begin` hook on server1.
+[connection server_1]
+# Removing debug point 'group_replication_wait_on_observer_trans' from @@GLOBAL.debug
+
+# Instrument GR to hold the statement on
+# `trans_begin` hook on server1.
+[connection server_1]
+# Adding debug point 'group_replication_wait_on_observer_trans' to @@GLOBAL.debug
+
+# Execute the statement on server1.
+[connection server1]
+SHOW PROCEDURE CODE test.procedure1;
+
+# Validate that the statement went on
+# `trans_begin` hook on server1.
+[connection server_1]
+SET DEBUG_SYNC= "now WAIT_FOR signal.group_replication_wait_on_observer_trans_waiting";
+
+# Release the statement from
+# `trans_begin` hook on server1.
+SET DEBUG_SYNC= 'now SIGNAL signal.group_replication_wait_on_observer_trans_continue';
+
+# Reap the statement on server1.
+[connection server1]
+
+# Remove GR instrumentaion to hold the statement on
+# `trans_begin` hook on server1.
+[connection server_1]
+# Removing debug point 'group_replication_wait_on_observer_trans' from @@GLOBAL.debug
+
+# Instrument GR to hold the statement on
+# `trans_begin` hook on server1.
+[connection server_1]
+# Adding debug point 'group_replication_wait_on_observer_trans' to @@GLOBAL.debug
+
+# Execute the statement on server1.
+[connection server1]
+SHOW FUNCTION CODE test.function1;
+
+# Validate that the statement went on
+# `trans_begin` hook on server1.
+[connection server_1]
+SET DEBUG_SYNC= "now WAIT_FOR signal.group_replication_wait_on_observer_trans_waiting";
+
+# Release the statement from
+# `trans_begin` hook on server1.
+SET DEBUG_SYNC= 'now SIGNAL signal.group_replication_wait_on_observer_trans_continue';
+
+# Reap the statement on server1.
+[connection server1]
+
+# Remove GR instrumentaion to hold the statement on
+# `trans_begin` hook on server1.
+[connection server_1]
+# Removing debug point 'group_replication_wait_on_observer_trans' from @@GLOBAL.debug
+
+# Instrument GR to hold the statement on
+# `trans_begin` hook on server1.
+[connection server_1]
+# Adding debug point 'group_replication_wait_on_observer_trans' to @@GLOBAL.debug
+
+# Execute the statement on server1.
+[connection server1]
+SHOW CREATE EVENT test.event1;
+
+# Validate that the statement went on
+# `trans_begin` hook on server1.
+[connection server_1]
+SET DEBUG_SYNC= "now WAIT_FOR signal.group_replication_wait_on_observer_trans_waiting";
+
+# Release the statement from
+# `trans_begin` hook on server1.
+SET DEBUG_SYNC= 'now SIGNAL signal.group_replication_wait_on_observer_trans_continue';
+
+# Reap the statement on server1.
+[connection server1]
+
+# Remove GR instrumentaion to hold the statement on
+# `trans_begin` hook on server1.
+[connection server_1]
+# Removing debug point 'group_replication_wait_on_observer_trans' from @@GLOBAL.debug
+
+# Instrument GR to hold the statement on
+# `trans_begin` hook on server1.
+[connection server_1]
+# Adding debug point 'group_replication_wait_on_observer_trans' to @@GLOBAL.debug
+
+# Execute the statement on server1.
+[connection server1]
+SHOW CREATE TRIGGER test.trigger1;
+
+# Validate that the statement went on
+# `trans_begin` hook on server1.
+[connection server_1]
+SET DEBUG_SYNC= "now WAIT_FOR signal.group_replication_wait_on_observer_trans_waiting";
+
+# Release the statement from
+# `trans_begin` hook on server1.
+SET DEBUG_SYNC= 'now SIGNAL signal.group_replication_wait_on_observer_trans_continue';
+
+# Reap the statement on server1.
+[connection server1]
+
+# Remove GR instrumentaion to hold the statement on
+# `trans_begin` hook on server1.
+[connection server_1]
+# Removing debug point 'group_replication_wait_on_observer_trans' from @@GLOBAL.debug
+
+# Instrument GR to hold the statement on
+# `trans_begin` hook on server1.
+[connection server_1]
+# Adding debug point 'group_replication_wait_on_observer_trans' to @@GLOBAL.debug
+
+# Execute the statement on server1.
+[connection server1]
+SHOW CREATE USER CURRENT_USER();
+
+# Validate that the statement went on
+# `trans_begin` hook on server1.
+[connection server_1]
+SET DEBUG_SYNC= "now WAIT_FOR signal.group_replication_wait_on_observer_trans_waiting";
+
+# Release the statement from
+# `trans_begin` hook on server1.
+SET DEBUG_SYNC= 'now SIGNAL signal.group_replication_wait_on_observer_trans_continue';
+
+# Reap the statement on server1.
+[connection server1]
+
+# Remove GR instrumentaion to hold the statement on
+# `trans_begin` hook on server1.
+[connection server_1]
+# Removing debug point 'group_replication_wait_on_observer_trans' from @@GLOBAL.debug
+
+############################################################
+# 3. Clean up.
+[connection server1]
+DROP PROCEDURE procedure1;
+DROP FUNCTION function1;
+DROP EVENT event1;
+DROP TRIGGER trigger1;
+DROP TABLE t2;
+DROP TABLE t1;
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_crash_donor_server_mysql.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_crash_donor_server_mysql.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_crash_donor_server_mysql.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_crash_donor_server_mysql.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,76 @@
+include/group_replication.inc [rpl_server_count=3]
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+[connection server1]
+SET sql_log_bin=0;
+CREATE TABLE t1(a int primary key);
+SET sql_log_bin=1;
+include/start_and_bootstrap_group_replication.inc
+[connection server2]
+SET sql_log_bin=0;
+CREATE TABLE t1(a int primary key);
+SET sql_log_bin=1;
+include/start_group_replication.inc
+[connection server1]
+CREATE PROCEDURE dml_operations()
+BEGIN
+declare x INT;
+set x=1;
+while x<100 do
+insert into t1 values (x);
+update t1 set a=x+200 where a=x;
+delete from t1 where a<250;
+set x=x+1;
+end  while;
+end$$
+
+----call procedure----
+call dml_operations();
+
+include/rpl_sync.inc
+[connection server3]
+SET sql_log_bin=0;
+CREATE TABLE t1(a int primary key);
+SET sql_log_bin=1;
+LOCK TABLES t1 READ;
+[connection server_3]
+SET SESSION sql_log_bin= 0;
+call mtr.add_suppression("There was an error when connecting to the donor server.*");
+call mtr.add_suppression("For details please check performance_schema.replication_connection_status table and error log messages of Slave I/O for channel group_replication_recovery.");
+call mtr.add_suppression("Slave I/O for channel 'group_replication_recovery': Master command COM_REGISTER_SLAVE failed: failed registering on master, reconnecting to try again.*");
+SET SESSION sql_log_bin= 1;
+include/start_group_replication.inc
+CREATE PROCEDURE dml_operations_2()
+BEGIN
+declare x INT;
+set x=100;
+while x<200 do
+insert into t1 values (x);
+update t1 set a=x+200 where a=x;
+delete from t1 where a<320;
+set x=x+1;
+end  while;
+end$$
+
+----call procedure----
+call dml_operations_2();
+
+UNLOCK TABLES;
+SET sql_log_bin=0;
+call mtr.add_suppression(".*Slave SQL for channel 'group_replication_applier': ... The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state*");
+SET sql_log_bin=1;
+# killing
+# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME
+# restarting
+include/rpl_reconnect.inc
+# check that there are 2 mebers in the group
+include/rpl_gr_wait_for_number_of_members.inc
+include/start_group_replication.inc
+include/rpl_sync.inc
+include/diff_tables.inc [server1:t1, server2:t1, server3:t1]
+drop table t1;
+drop procedure dml_operations;
+drop procedure dml_operations_2;
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_crash_recovery_server.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_crash_recovery_server.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_crash_recovery_server.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_crash_recovery_server.result	2021-09-28 11:46:34.000000000 +0000
@@ -44,7 +44,7 @@
 [connection server3]
 UNLOCK TABLES;
 # killing
-# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME
+# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_communication_stack=GROUP_REPLICATION_COMMUNICATION_STACK
 # restarting
 include/rpl_reconnect.inc
 [connection server2]
@@ -67,7 +67,7 @@
 UNLOCK TABLES;
 [connection server3]
 # killing
-# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME
+# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_communication_stack=GROUP_REPLICATION_COMMUNICATION_STACK
 # restarting
 include/rpl_reconnect.inc
 [connection server2]
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_delayed_view_change_write_local_commit_donor_crash.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_delayed_view_change_write_local_commit_donor_crash.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_delayed_view_change_write_local_commit_donor_crash.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_delayed_view_change_write_local_commit_donor_crash.result	2021-09-28 11:46:34.000000000 +0000
@@ -21,6 +21,7 @@
 CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
 CREATE USER "recovery_user" IDENTIFIED BY "recovery_password";
 GRANT REPLICATION SLAVE ON *.* TO "recovery_user";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO "recovery_user";
 FLUSH PRIVILEGES;
 SET SESSION sql_log_bin= 1;
 include/start_group_replication.inc
@@ -50,6 +51,9 @@
 CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
 call mtr.add_suppression("There was an error when connecting to the donor server.*");
 call mtr.add_suppression("For details please check performance_schema.replication_connection_status table and error log messages of Slave I/O for channel group_replication_recovery.");
+CREATE USER "recovery_user" IDENTIFIED BY "recovery_password";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO "recovery_user";
+FLUSH PRIVILEGES;
 SET SESSION sql_log_bin= 1;
 CHANGE REPLICATION SOURCE TO SOURCE_USER= 'recovery_user', SOURCE_PASSWORD= 'recovery_password' FOR CHANNEL 'group_replication_recovery';
 SET @group_replication_recovery_reconnect_interval_saved= @@GLOBAL.group_replication_recovery_reconnect_interval;
@@ -144,4 +148,7 @@
 [connection server3]
 SET @@GLOBAL.group_replication_recovery_reconnect_interval= @group_replication_recovery_reconnect_interval_saved;
 SET GLOBAL debug= '-d,group_replication_skip_read_mode';
+SET SESSION sql_log_bin= 0;
+DROP USER "recovery_user";
+SET SESSION sql_log_bin= 1;
 include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_delayed_view_change_write_local_commit.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_delayed_view_change_write_local_commit.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_delayed_view_change_write_local_commit.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_delayed_view_change_write_local_commit.result	2021-09-28 11:46:34.000000000 +0000
@@ -9,12 +9,17 @@
 
 ############################################################
 #  2. Start 2 servers.
-#     Only setup recovery_user on server2 for force server3
-#     to recover from it.
+#     Only setup recovery_user with GRANT REPLICATION SLAVE on server2
+#     for force server3 to recover from it.
 [connection server1]
 SET sql_log_bin = 0;
 include/gtid_utils.inc
 SET sql_log_bin = 1;
+SET SESSION sql_log_bin= 0;
+CREATE USER "recovery_user" IDENTIFIED BY "recovery_password";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO "recovery_user";
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
 SET @group_replication_view_change_uuid_save= @@GLOBAL.group_replication_view_change_uuid;
 SET @@GLOBAL.group_replication_view_change_uuid = "AUTOMATIC";
 include/start_and_bootstrap_group_replication.inc
@@ -27,6 +32,7 @@
 SET SESSION sql_log_bin= 0;
 CREATE USER "recovery_user" IDENTIFIED BY "recovery_password";
 GRANT REPLICATION SLAVE ON *.* TO "recovery_user";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO "recovery_user";
 FLUSH PRIVILEGES;
 SET SESSION sql_log_bin= 1;
 SET @group_replication_view_change_uuid_save= @@GLOBAL.group_replication_view_change_uuid;
@@ -50,9 +56,17 @@
 include/gtid_utils.inc
 SET sql_log_bin = 1;
 SET SESSION sql_log_bin= 0;
+call mtr.add_suppression("Slave I/O for channel 'group_replication_recovery': Master command COM_REGISTER_SLAVE failed*");
+call mtr.add_suppression("Slave I/O thread couldn't register on master*");
 call mtr.add_suppression("There was an error when connecting to the donor server.*");
 call mtr.add_suppression("For details please check performance_schema.replication_connection_status table and error log messages of Slave I/O for channel group_replication_recovery.");
 SET SESSION sql_log_bin= 1;
+SET SESSION sql_log_bin= 0;
+CREATE USER "recovery_user" IDENTIFIED BY "recovery_password";
+GRANT REPLICATION SLAVE ON *.* TO "recovery_user";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO "recovery_user";
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
 CHANGE REPLICATION SOURCE TO SOURCE_USER= 'recovery_user', SOURCE_PASSWORD= 'recovery_password' FOR CHANNEL 'group_replication_recovery';
 SET @group_replication_view_change_uuid_save= @@GLOBAL.group_replication_view_change_uuid;
 SET @@GLOBAL.group_replication_view_change_uuid = "AUTOMATIC";;
@@ -133,12 +147,18 @@
 [connection server1]
 include/stop_group_replication.inc
 SET @@GLOBAL.group_replication_view_change_uuid= @group_replication_view_change_uuid_save;
+SET SESSION sql_log_bin= 0;
+DROP USER "recovery_user";
+SET SESSION sql_log_bin= 1;
 SET sql_log_bin = 0;
 include/gtid_utils_end.inc
 SET sql_log_bin = 1;
 [connection server3]
 include/stop_group_replication.inc
 SET @@GLOBAL.group_replication_view_change_uuid= @group_replication_view_change_uuid_save;
+SET SESSION sql_log_bin= 0;
+DROP USER "recovery_user";
+SET SESSION sql_log_bin= 1;
 SET sql_log_bin = 0;
 include/gtid_utils_end.inc
 SET sql_log_bin = 1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_exit_state_action_on_majority_loss.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_exit_state_action_on_majority_loss.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_exit_state_action_on_majority_loss.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_exit_state_action_on_majority_loss.result	2021-09-28 11:46:34.000000000 +0000
@@ -19,6 +19,8 @@
 call mtr.add_suppression("\\[GCS\\] read failed");
 call mtr.add_suppression("The plugin encountered a critical error and will abort: This member could not reach a majority of the members.");
 SET SESSION sql_log_bin = 1;
+[connection server3]
+[connection server1]
 [connection server2]
 [connection server3]
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_exit_state_action_on_member_expel_mysql.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_exit_state_action_on_member_expel_mysql.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_exit_state_action_on_member_expel_mysql.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_exit_state_action_on_member_expel_mysql.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,84 @@
+
+#########################################################################
+# 0) Setup group of 3 members (M1, M2 and M3).
+#########################################################################
+
+include/group_replication.inc [rpl_server_count=3]
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+[connection server1]
+SET SESSION sql_log_bin = 0;
+CREATE TABLE pid_table(pid_no INT PRIMARY KEY);
+LOAD DATA LOCAL INFILE 'pid_file' INTO TABLE pid_table;
+DROP TABLE pid_table;
+call mtr.add_suppression("Member was expelled from the group due to network failures, changing member status to ERROR.");
+call mtr.add_suppression("The server was automatically set into read only mode after an error was detected.");
+call mtr.add_suppression("Skipping leave operation: concurrent attempt to leave the group is on-going.");
+call mtr.add_suppression("The plugin encountered a critical error and will abort: Member was expelled from the group due to network failures.");
+call mtr.add_suppression("Error, maximum number of retries exceeded when waiting for the internal server session state to be operating");
+call mtr.add_suppression("Failed to establish an internal server connection to execute plugin operations");
+call mtr.add_suppression("Unable to confirm whether the server has left the group or not.*");
+call mtr.add_suppression(".* read failed");
+call mtr.add_suppression("\\[GCS\\] Unable to resolve peer address.");
+SET SESSION sql_log_bin = 1;
+
+#########################################################################
+# 1) Force expel of member 1.
+#########################################################################
+
+[connection server2]
+include/rpl_gr_wait_for_number_of_members.inc
+[connection server3]
+include/rpl_gr_wait_for_number_of_members.inc
+
+#########################################################################
+# 1.1) Verify that member 1 went to super_read_only mode.
+#########################################################################
+
+[connection server1]
+include/gr_wait_for_member_state.inc
+[connection server1]
+include/assert.inc [super_read_only should be enabled]
+include/stop_group_replication.inc
+
+#########################################################################
+# 2) Set exit state action to ABORT_SERVER on member 1.
+#########################################################################
+
+SET @@GLOBAL.group_replication_exit_state_action = ABORT_SERVER;
+include/start_group_replication.inc
+include/rpl_gr_wait_for_number_of_members.inc
+
+#########################################################################
+# 3) Force expel again of member 1.
+#########################################################################
+
+[connection server2]
+include/rpl_gr_wait_for_number_of_members.inc
+[connection server3]
+include/rpl_gr_wait_for_number_of_members.inc
+
+#########################################################################
+# 3.1) Wait until server is aborted.
+#########################################################################
+
+[connection server1]
+
+#########################################################################
+# 4) Relaunch member 1.
+#########################################################################
+
+include/rpl_reconnect.inc
+[connection server1]
+SET @@global.group_replication_group_seeds="GROUP_SEEDS_SERVER1";
+SET @@global.group_replication_local_address="LOCAL_ADDRESS_SERVER1";
+include/start_group_replication.inc
+include/rpl_gr_wait_for_number_of_members.inc
+
+#########################################################################
+# 5) Cleanup.
+#########################################################################
+
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_flow_control_options.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_flow_control_options.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_flow_control_options.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_flow_control_options.result	2021-09-28 11:46:34.000000000 +0000
@@ -261,6 +261,7 @@
 
 ############################################################
 # Clean up.
+# restart:--group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS
 include/rpl_reconnect.inc
 [connection server1]
 SET GLOBAL group_replication_flow_control_mode= @group_replication_flow_control_mode_save;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_gcs_psi_threads_mysql.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_gcs_psi_threads_mysql.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_gcs_psi_threads_mysql.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_gcs_psi_threads_mysql.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,40 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+############################################################
+# 1. Verify that the entries corresponding to the
+#    instrumented GCS threads are not in the threads
+#    table immediately after plugin installation
+#    (before starting the GR).
+SELECT * FROM performance_schema.threads WHERE NAME LIKE '%THD_Gcs_%';
+THREAD_ID	NAME	TYPE	PROCESSLIST_ID	PROCESSLIST_USER	PROCESSLIST_HOST	PROCESSLIST_DB	PROCESSLIST_COMMAND	PROCESSLIST_TIME	PROCESSLIST_STATE	PROCESSLIST_INFO	PARENT_THREAD_ID	ROLE	INSTRUMENTED	HISTORY	CONNECTION_TYPE	THREAD_OS_ID	RESOURCE_GROUP
+include/assert.inc ['There should be no GCS instrumented threads entries in the threads table before starting the GR']
+
+############################################################
+# 2. Start the GR
+include/start_and_bootstrap_group_replication.inc
+
+############################################################
+# 3. Verify that the entries corresponding to the
+#    instrumented GCS threads are in the threads table
+#    after starting the GR.
+include/assert.inc ['There should be 4 GCS instrumented thread entries in the threads table after starting the GR']
+
+############################################################
+# 4. Stop the GR
+include/stop_group_replication.inc
+
+############################################################
+# 5. Verify that no entries corresponding to the
+#    instrumented GCS threads remain in the threads table
+#    after stopping the GR.
+SELECT * FROM performance_schema.threads WHERE NAME LIKE '%THD_Gcs_%';
+THREAD_ID	NAME	TYPE	PROCESSLIST_ID	PROCESSLIST_USER	PROCESSLIST_HOST	PROCESSLIST_DB	PROCESSLIST_COMMAND	PROCESSLIST_TIME	PROCESSLIST_STATE	PROCESSLIST_INFO	PARENT_THREAD_ID	ROLE	INSTRUMENTED	HISTORY	CONNECTION_TYPE	THREAD_OS_ID	RESOURCE_GROUP
+include/assert.inc ['There should be no extra psi keys added after starting the GR']
+
+############################################################
+# 6. Test end.
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_gcs_psi_threads.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_gcs_psi_threads.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_gcs_psi_threads.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_gcs_psi_threads.result	2021-09-28 11:46:34.000000000 +0000
@@ -21,13 +21,7 @@
 # 3. Verify that the entries corresponding to the
 #    instrumented GCS threads are in the threads table
 #    after starting the GR.
-SELECT NAME,TYPE FROM performance_schema.threads WHERE NAME LIKE '%THD_Gcs_%';
-NAME	TYPE
-thread/group_rpl/THD_Gcs_ext_logger_impl::m_consumer	BACKGROUND
-thread/group_rpl/THD_Gcs_xcom_control::m_suspicions_processing_thread	BACKGROUND
-thread/group_rpl/THD_Gcs_xcom_control::m_xcom_thread	BACKGROUND
-thread/group_rpl/THD_Gcs_xcom_engine::m_engine_thread	BACKGROUND
-include/assert.inc ['There should be 4 GCS instrumented thread entries in the threads table after starting the GR']
+include/assert.inc ['There should be 5 GCS instrumented thread entries in the threads table after starting the GR']
 
 ############################################################
 # 4. Stop the GR
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_gcs_psi_threads_xcom.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_gcs_psi_threads_xcom.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_gcs_psi_threads_xcom.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_gcs_psi_threads_xcom.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,40 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+############################################################
+# 1. Verify that the entries corresponding to the
+#    instrumented GCS threads are not in the threads
+#    table immediately after plugin installation
+#    (before starting the GR).
+SELECT * FROM performance_schema.threads WHERE NAME LIKE '%THD_Gcs_%';
+THREAD_ID	NAME	TYPE	PROCESSLIST_ID	PROCESSLIST_USER	PROCESSLIST_HOST	PROCESSLIST_DB	PROCESSLIST_COMMAND	PROCESSLIST_TIME	PROCESSLIST_STATE	PROCESSLIST_INFO	PARENT_THREAD_ID	ROLE	INSTRUMENTED	HISTORY	CONNECTION_TYPE	THREAD_OS_ID	RESOURCE_GROUP
+include/assert.inc ['There should be no GCS instrumented threads entries in the threads table before starting the GR']
+
+############################################################
+# 2. Start the GR
+include/start_and_bootstrap_group_replication.inc
+
+############################################################
+# 3. Verify that the entries corresponding to the
+#    instrumented GCS threads are in the threads table
+#    after starting the GR.
+include/assert.inc ['There should be 4 GCS instrumented thread entries in the threads table after starting the GR']
+
+############################################################
+# 4. Stop the GR
+include/stop_group_replication.inc
+
+############################################################
+# 5. Verify that no entries corresponding to the
+#    instrumented GCS threads remain in the threads table
+#    after stopping the GR.
+SELECT * FROM performance_schema.threads WHERE NAME LIKE '%THD_Gcs_%';
+THREAD_ID	NAME	TYPE	PROCESSLIST_ID	PROCESSLIST_USER	PROCESSLIST_HOST	PROCESSLIST_DB	PROCESSLIST_COMMAND	PROCESSLIST_TIME	PROCESSLIST_STATE	PROCESSLIST_INFO	PARENT_THREAD_ID	ROLE	INSTRUMENTED	HISTORY	CONNECTION_TYPE	THREAD_OS_ID	RESOURCE_GROUP
+include/assert.inc ['There should be no extra psi keys added after starting the GR']
+
+############################################################
+# 6. Test end.
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_huge_gtid_executed.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_huge_gtid_executed.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_huge_gtid_executed.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_huge_gtid_executed.result	2021-09-28 11:46:34.000000000 +0000
@@ -43,6 +43,7 @@
 # 5. Wait for stable set propagation and certification info
 #    garbage collection.
 [connection server2]
+[connection server1]
 
 ############################################################
 # 6. Check that stable set is properly updated after stable
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_implicit_commit.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_implicit_commit.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_implicit_commit.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_implicit_commit.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,47 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+############################################################
+# 1. Create table t1 with engine set to memory on server1
+CREATE TABLE t1(a INT, b INT) engine=memory;
+include/rpl_sync.inc
+
+############################################################
+# 2. Restart server1 and start group replication
+# restart:--group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS
+include/rpl_reconnect.inc
+include/start_group_replication.inc
+
+############################################################
+# 3. Create a new table based on t1. This will create an
+#    implicit commit due previous restart
+CREATE TABLE t2 LIKE t1;
+include/rpl_sync.inc
+
+############################################################
+# 4. Wait for GTID_EXECUTED has 6 gtids
+
+############################################################
+# 5. On binary log from first start we shall have: two
+#    views and a create table.
+include/assert_binlog_events.inc [Gtid # Query/BEGIN # View_change # Query/COMMIT # Gtid # Query/BEGIN # View_change # Query/COMMIT # Gtid # !Q(CREATE.*)]
+
+############################################################
+# 6. On binary log from second start we shall have: a view,
+#    a truncate table and a create table
+include/assert_binlog_events.inc [Gtid # Query/BEGIN # View_change # Query/COMMIT # Gtid # !Q(TRUNCATE.*) # Gtid # !Q(CREATE.*)]
+
+############################################################
+# 7. On server 2 binary log we shall have: two views, a
+#    create table, a view, a truncate table and a create table
+[connection server2]
+include/assert_binlog_events.inc [Gtid # Query/BEGIN # View_change # Query/COMMIT # Gtid # Query/BEGIN # View_change # Query/COMMIT # Gtid # !Q(CREATE.*) # Gtid # Query/BEGIN # View_change # Query/COMMIT # Gtid # !Q(TRUNCATE.*) # Gtid # !Q(CREATE.*)]
+
+############################################################
+# 8. Cleanup
+DROP TABLE t1;
+DROP TABLE t2;
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_ip_whitelist_deprecation.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_ip_whitelist_deprecation.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_ip_whitelist_deprecation.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_ip_whitelist_deprecation.result	2021-09-28 11:46:34.000000000 +0000
@@ -32,4 +32,6 @@
 SET @@GLOBAL.group_replication_ip_whitelist= GROUP_REPLICATION_IP_WHITELIST;
 Warnings:
 Warning	1287	'group_replication_ip_whitelist' is deprecated and will be removed in a future release. Please use group_replication_ip_allowlist instead
+# restart:--group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_bootstrap_group=1
+include/rpl_reconnect.inc
 include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_kill_applier_module.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_kill_applier_module.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_kill_applier_module.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_kill_applier_module.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,49 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+############################################################
+# 1. Create a table t1 on the group.
+[connection server1]
+SET sql_log_bin=0;
+call mtr.add_suppression("Fatal error during execution on the Applier process of Group Replication. The server will now leave the group.");
+call mtr.add_suppression("The server was automatically set into read only mode after an error was detected.");
+call mtr.add_suppression("Error writing relay log configuration.");
+call mtr.add_suppression("Failed to stop the group replication applier thread.");
+SET sql_log_bin=1;
+CREATE TABLE test.t1 (c1 INT NOT NULL PRIMARY KEY);
+include/rpl_sync.inc
+
+############################################################
+# 2. Kill the "Group replication applier module" thread on
+#    server1.
+[connection server1]
+KILL PROCESSLIST_ID;
+
+############################################################
+# 3. Commit a transaction on server2.
+#    Once the transaction message is delivered to server1,
+#    the applier module will be awaken and it will detect
+#    that its thread was killed, which will move the
+#    member to ERROR state.
+[connection server2]
+INSERT INTO t1 VALUES (1);
+
+############################################################
+# 4. Server1 will move to ERROR state.
+[connection server1]
+include/gr_wait_for_member_state.inc
+
+############################################################
+# 5. Server2 is ONLINE and alone on the group.
+[connection server2]
+
+############################################################
+# 6. Clean up.
+[connection server1]
+include/stop_group_replication.inc
+include/start_group_replication.inc
+DROP TABLE t1;
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_lock_acl_cache_followed_by_view_change_comm_stack_mysql.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_lock_acl_cache_followed_by_view_change_comm_stack_mysql.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_lock_acl_cache_followed_by_view_change_comm_stack_mysql.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_lock_acl_cache_followed_by_view_change_comm_stack_mysql.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,71 @@
+include/group_replication.inc [rpl_server_count=3]
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+############################################################
+# 1. Deploy a group in single-primary mode with 2 members.
+[connection server1]
+include/start_and_bootstrap_group_replication.inc
+[connection server2]
+include/start_group_replication.inc
+
+############################################################
+# 2. Hold a ACL statement, CREATE USER, on its propagation
+#    to the group. The ACL_CACHE lock is acquired by the
+#    ACL statement.
+[connection server1]
+SET @debug_save= @@GLOBAL.DEBUG;
+SET @@GLOBAL.DEBUG='+d,group_replication_pause_on_before_commit_hook';
+[connection server_1]
+CREATE USER 'user';
+[connection server1]
+SET GLOBAL DEBUG= @debug_save;
+
+############################################################
+# 3. Add a 3rd member to the group.
+#    BUG: the view install on server1 will be blocked by the
+#         ACL statement.
+[connection server3]
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("There was an error when connecting to the donor server. Please check that group_replication_recovery channel credentials.*");
+call mtr.add_suppression("For details please check performance_schema.replication_connection_status table and error log messages of Slave I/O for channel group_replication_recovery.");
+call mtr.add_suppression("Member was expelled from the group due to network failures, changing member status to ERROR.");
+call mtr.add_suppression("The server was automatically set into read only mode after an error was detected.");
+SET SESSION sql_log_bin = 1;
+SET GLOBAL group_replication_group_name= "GROUP_REPLICATION_GROUP_NAME";
+START GROUP_REPLICATION;
+
+############################################################
+# 4. Wait until the group has 3 members and then resume the
+#    ACL statement.
+#    server3 may be in RECOVERING state but it will be part of
+#    the group.
+[connection server1]
+include/rpl_gr_wait_for_number_of_members.inc
+[connection server_1]
+
+############################################################
+# 5. Wait server3 to be ONLINE
+[connection server3]
+include/gr_wait_for_member_state.inc
+
+############################################################
+# 6. An extra view can be generated when auto rejoin occurs,
+#    so define event_sequence for assert_binlog_events.inc
+[connection server1]
+
+############################################################
+# 7. Verify that all members data is equal.
+include/assert_binlog_events.inc
+[connection server2]
+include/assert_binlog_events.inc
+[connection server3]
+include/assert_binlog_events.inc
+
+############################################################
+# 8. Clean up.
+[connection server1]
+DROP USER 'user';
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_lock_acl_cache_followed_by_view_change_comm_stack_xcom.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_lock_acl_cache_followed_by_view_change_comm_stack_xcom.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_lock_acl_cache_followed_by_view_change_comm_stack_xcom.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_lock_acl_cache_followed_by_view_change_comm_stack_xcom.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,65 @@
+include/group_replication.inc [rpl_server_count=3]
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+############################################################
+# 1. Deploy a group in single-primary mode with 2 members.
+[connection server1]
+include/start_and_bootstrap_group_replication.inc
+[connection server2]
+include/start_group_replication.inc
+
+############################################################
+# 2. Hold a ACL statement, CREATE USER, on its propagation
+#    to the group. The ACL_CACHE lock is acquired by the
+#    ACL statement.
+[connection server1]
+SET @debug_save= @@GLOBAL.DEBUG;
+SET @@GLOBAL.DEBUG='+d,group_replication_pause_on_before_commit_hook';
+[connection server_1]
+CREATE USER 'user';
+[connection server1]
+SET GLOBAL DEBUG= @debug_save;
+
+############################################################
+# 3. Add a 3rd member to the group.
+#    BUG: the view install on server1 will be blocked by the
+#         ACL statement.
+[connection server3]
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("There was an error when connecting to the donor server. Please check that group_replication_recovery channel credentials.*");
+call mtr.add_suppression("For details please check performance_schema.replication_connection_status table and error log messages of Slave I/O for channel group_replication_recovery.");
+SET SESSION sql_log_bin = 1;
+SET GLOBAL group_replication_group_name= "GROUP_REPLICATION_GROUP_NAME";
+START GROUP_REPLICATION;
+
+############################################################
+# 4. Wait until the group has 3 members and then resume the
+#    ACL statement.
+#    server3 may be in RECOVERING state but it will be part of
+#    the group.
+[connection server1]
+include/rpl_gr_wait_for_number_of_members.inc
+[connection server_1]
+
+############################################################
+# 5. Verify that all members data is equal.
+[connection server3]
+include/gr_wait_for_member_state.inc
+[connection server1]
+include/assert.inc [GTID_EXECUTED must contain 4 transactions]
+include/assert_binlog_events.inc [Gtid # Query/BEGIN # View_change # Query/COMMIT # Gtid # Query/BEGIN # View_change # Query/COMMIT # Gtid # Query/BEGIN # View_change # Query/COMMIT # Gtid # !Q(CREATE.*)]
+[connection server2]
+include/assert.inc [GTID_EXECUTED must contain 4 transactions]
+include/assert_binlog_events.inc [Gtid # Query/BEGIN # View_change # Query/COMMIT # Gtid # Query/BEGIN # View_change # Query/COMMIT # Gtid # Query/BEGIN # View_change # Query/COMMIT # Gtid # !Q(CREATE.*)]
+[connection server3]
+include/assert.inc [GTID_EXECUTED must contain 4 transactions]
+include/assert_binlog_events.inc [Gtid # Query/BEGIN # View_change # Query/COMMIT # Gtid # Query/BEGIN # View_change # Query/COMMIT # Gtid # Query/BEGIN # View_change # Query/COMMIT # Gtid # !Q(CREATE.*)]
+
+############################################################
+# 6. Clean up.
+[connection server1]
+DROP USER 'user';
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_lower_case_table_names_different.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_lower_case_table_names_different.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_lower_case_table_names_different.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_lower_case_table_names_different.result	2021-09-28 11:46:34.000000000 +0000
@@ -24,7 +24,7 @@
 ##     does not match. And verifies only one member is shown in the
 ##     group as the join failed.
 
-# restart:--group_replication_start_on_boot=1 --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --lower_case_table_names=2 --loose-debug=+d,group_replication_wait_before_leave_on_error
+# restart:--group_replication_start_on_boot=1 --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_communication_stack=GROUP_REPLICATION_COMMUNICATION_STACK --lower_case_table_names=2 --loose-debug=+d,group_replication_wait_before_leave_on_error
 include/rpl_reconnect.inc
 SET DEBUG_SYNC= "now WAIT_FOR signal.wait_leave_process";
 include/assert.inc ['Assert group has one member']
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_majority_loss_5_to_2_recovery.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_majority_loss_5_to_2_recovery.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_majority_loss_5_to_2_recovery.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_majority_loss_5_to_2_recovery.result	2021-09-28 11:46:34.000000000 +0000
@@ -6,11 +6,26 @@
 Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection server1]
+SET SESSION sql_log_bin= 0;
+CREATE USER "recovery_user" IDENTIFIED BY "recovery_password";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO "recovery_user";
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
 [connection server1]
 include/start_and_bootstrap_group_replication.inc
 [connection server3]
+SET SESSION sql_log_bin= 0;
+CREATE USER "recovery_user" IDENTIFIED BY "recovery_password";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO "recovery_user";
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
 include/start_group_replication.inc
 [connection server4]
+SET SESSION sql_log_bin= 0;
+CREATE USER "recovery_user" IDENTIFIED BY "recovery_password";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO "recovery_user";
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
 include/start_group_replication.inc
 [connection server5]
 include/start_group_replication.inc
@@ -25,6 +40,7 @@
 SET SESSION sql_log_bin= 0;
 CREATE USER "recovery_user" IDENTIFIED BY "recovery_password";
 GRANT REPLICATION SLAVE ON *.* TO "recovery_user";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO "recovery_user";
 FLUSH PRIVILEGES;
 SET SESSION sql_log_bin= 1;
 STOP SLAVE SQL_THREAD FOR CHANNEL "group_replication_applier";
@@ -36,6 +52,11 @@
 #    will be forced to recover from member 5, since it will
 #    not be able to authenticate on any other member.
 [connection server2]
+SET SESSION sql_log_bin= 0;
+CREATE USER "recovery_user" IDENTIFIED BY "recovery_password";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO "recovery_user";
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
 CHANGE REPLICATION SOURCE TO SOURCE_USER="recovery_user", SOURCE_PASSWORD="recovery_password" FOR CHANNEL "group_replication_recovery";
 SET SESSION sql_log_bin= 0;
 call mtr.add_suppression("There was an error when connecting to the donor server.*");
@@ -86,7 +107,6 @@
 [connection server2]
 include/gr_wait_for_member_state.inc
 [connection server1]
-CREATE USER "recovery_user" IDENTIFIED BY "recovery_password";
 GRANT REPLICATION SLAVE ON *.* TO "recovery_user";
 FLUSH PRIVILEGES;
 [connection server2]
@@ -117,23 +137,41 @@
 [connection server_3]
 include/rpl_reconnect.inc
 include/assert.inc ['There are no values in table t1']
+SET SESSION sql_log_bin= 0;
+DROP USER "recovery_user";
+FLUSH PRIVILEGES;
 DROP TABLE t1;
+SET SESSION sql_log_bin= 1;
 [connection server_4]
 include/rpl_reconnect.inc
 include/assert.inc ['There are no values in table t1']
+SET SESSION sql_log_bin= 0;
+DROP USER "recovery_user";
+FLUSH PRIVILEGES;
 DROP TABLE t1;
+SET SESSION sql_log_bin= 1;
 [connection server_5]
 include/rpl_reconnect.inc
 include/assert.inc ['There are no values in table t1']
+SET SESSION sql_log_bin= 0;
 DROP TABLE t1;
 DROP USER "recovery_user";
 FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
 [connection server1]
+SET SESSION sql_log_bin= 0;
 DROP TABLE t1;
 DROP USER "recovery_user";
 FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
 SET SESSION sql_log_bin= 0;
 call mtr.add_suppression("The member lost contact with a majority of the members in the group. Until the network is restored.*");
 call mtr.add_suppression("The member resumed contact with a majority of the members in the group.*");
 SET SESSION sql_log_bin= 1;
+[connection server2]
+SET SESSION sql_log_bin= 0;
+DROP TABLE t1;
+DROP USER "recovery_user";
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
 include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_majority_loss_5_to_2.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_majority_loss_5_to_2.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_majority_loss_5_to_2.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_majority_loss_5_to_2.result	2021-09-28 11:46:34.000000000 +0000
@@ -91,4 +91,6 @@
 call mtr.add_suppression("The member lost contact with a majority of the members in the group. Until the network is restored.*");
 call mtr.add_suppression("The member resumed contact with a majority of the members in the group.*");
 set session sql_log_bin=1;
+[connection server4]
+[connection server5]
 include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_majority_loss_restart_mysql.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_majority_loss_restart_mysql.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_majority_loss_restart_mysql.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_majority_loss_restart_mysql.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,109 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+[connection server1]
+[connection server2]
+SET SESSION sql_log_bin= 0;
+call mtr.add_suppression("Timeout on wait for view after joining group");
+call mtr.add_suppression("read failed");
+call mtr.add_suppression("The member was unable to join the group. Local port: *.*");
+call mtr.add_suppression("Error connecting to all peers. Member join failed. Local port: *.*");
+SET SESSION sql_log_bin= 1;
+
+############################################################
+# 1. Crash server 2.
+[connection server2]
+include/rpl_reconnect.inc
+[connection server1]
+include/gr_wait_for_member_state.inc
+
+############################################################
+# 2. Execute a transaction on server 1, which will block
+#    since the group does not have majority.
+[connection server_1]
+CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY);
+[connection server1]
+
+############################################################
+# 3. Assert that group is still blocked.
+include/rpl_gr_wait_for_number_of_members.inc
+include/assert.inc [server 2 is marked as unreachable]
+
+############################################################
+# 4. Restart server 2 with group_replication_start_on_boot=ON,
+#    server 2 will be refused to join the group.
+[connection server2]
+# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_start_on_boot=ON --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME
+include/rpl_reconnect.inc
+include/gr_wait_for_member_state.inc
+[connection server1]
+include/assert.inc [server 2 is marked as unreachable]
+
+############################################################
+# 5. Unblock group with server1 as a single member.
+SET GLOBAL group_replication_force_members= "SERVER1_ADDRESS";
+
+############################################################
+# 6. Check that statement did unblock and was applied on
+#    server1.
+[connection server_1]
+[connection server1]
+
+############################################################
+# 7. Rejoin server2
+[connection server2]
+include/stop_group_replication.inc
+include/start_group_replication.inc
+
+############################################################
+# 8. Execute a transaction on both members.
+[connection server1]
+INSERT INTO t1 VALUES (1);
+[connection server2]
+INSERT INTO t1 VALUES (2);
+include/rpl_sync.inc
+
+############################################################
+# 9. Validate data.
+[connection server1]
+include/assert.inc ['There are two values in table t1']
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+server-binary-log.000001	#	Query	#	#	BEGIN
+server-binary-log.000001	#	Query	#	#	COMMIT
+server-binary-log.000001	#	Query	#	#	BEGIN
+server-binary-log.000001	#	Query	#	#	COMMIT
+server-binary-log.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY)
+server-binary-log.000001	#	Query	#	#	BEGIN
+server-binary-log.000001	#	Query	#	#	COMMIT
+server-binary-log.000001	#	Query	#	#	BEGIN
+server-binary-log.000001	#	Table_map	#	#	table_id: # (test.t1)
+server-binary-log.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+server-binary-log.000001	#	Xid	#	#	COMMIT /* XID */
+server-binary-log.000001	#	Query	#	#	BEGIN
+server-binary-log.000001	#	Table_map	#	#	table_id: # (test.t1)
+server-binary-log.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+server-binary-log.000001	#	Xid	#	#	COMMIT /* XID */
+[connection server2]
+include/assert.inc ['There are two values in table t1']
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+server-binary-log.000003	#	Query	#	#	use `test`; CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY)
+server-binary-log.000003	#	Query	#	#	BEGIN
+server-binary-log.000003	#	Query	#	#	COMMIT
+server-binary-log.000003	#	Query	#	#	BEGIN
+server-binary-log.000003	#	Table_map	#	#	table_id: # (test.t1)
+server-binary-log.000003	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+server-binary-log.000003	#	Xid	#	#	COMMIT /* XID */
+server-binary-log.000003	#	Query	#	#	BEGIN
+server-binary-log.000003	#	Table_map	#	#	table_id: # (test.t1)
+server-binary-log.000003	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+server-binary-log.000003	#	Xid	#	#	COMMIT /* XID */
+include/diff_tables.inc [server1:test.t1, server2:test.t1]
+
+############################################################
+# 10. Clean up.
+DROP TABLE t1;
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_member_actions_defaults.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_member_actions_defaults.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_member_actions_defaults.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_member_actions_defaults.result	2021-09-28 11:46:34.000000000 +0000
@@ -6,8 +6,9 @@
 
 ############################################################
 # 1. Validate Group Replication members actions default values.
-include/assert.inc [There must be one member action]
+include/assert.inc [There must be two member actions]
 include/assert.inc [mysql_disable_super_read_only_if_primary action default value]
+include/assert.inc [mysql_start_failover_channels_if_primary action default value]
 include/assert.inc [There must be one GR configuration version]
 include/assert.inc [The version of replication_group_member_actions must be 1]
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_member_actions_enable_disable_errors_1.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_member_actions_enable_disable_errors_1.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_member_actions_enable_disable_errors_1.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_member_actions_enable_disable_errors_1.result	2021-09-28 11:46:34.000000000 +0000
@@ -84,13 +84,15 @@
 ############################################################
 # 7. Check that configuration was not changed.
 [connection server1]
-include/assert.inc [There must be one member action]
+include/assert.inc [There must be two member actions]
 include/assert.inc [mysql_disable_super_read_only_if_primary action default value]
+include/assert.inc [mysql_start_failover_channels_if_primary action default value]
 include/assert.inc [There must be one GR configuration version]
 include/assert.inc [The version of replication_group_member_actions must be 1]
 [connection server2]
-include/assert.inc [There must be one member action]
+include/assert.inc [There must be two member actions]
 include/assert.inc [mysql_disable_super_read_only_if_primary action default value]
+include/assert.inc [mysql_start_failover_channels_if_primary action default value]
 include/assert.inc [There must be one GR configuration version]
 include/assert.inc [The version of replication_group_member_actions must be 1]
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_member_actions_error_on_read_on_member_join.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_member_actions_error_on_read_on_member_join.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_member_actions_error_on_read_on_member_join.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_member_actions_error_on_read_on_member_join.result	2021-09-28 11:46:34.000000000 +0000
@@ -6,11 +6,13 @@
 [connection server1]
 SET SESSION sql_log_bin = 0;
 call mtr.add_suppression("Unable to read the member actions configuration during group membership change. Please check the tables 'mysql.replication_group_member_actions' and 'mysql.replication_group_configuration_version'.");
+call mtr.add_suppression("Unable to read the replication failover channels configuration during group membership change. Please check the tables .*");
 SET SESSION sql_log_bin = 1;
 [connection server2]
 SET SESSION sql_log_bin = 0;
 call mtr.add_suppression("Unable to parse the member actions configuration sent by the group on member join.");
 call mtr.add_suppression("The group members were unable to send their member actions configuration. Please check the tables 'mysql.replication_group_member_actions' and 'mysql.replication_group_configuration_version' on all members.");
+call mtr.add_suppression("Unable to parse the replication failover channels configuration sent by the group on member join.");
 SET SESSION sql_log_bin = 1;
 
 ############################################################
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_member_actions_error_on_update_on_member_join_lower_version_group.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_member_actions_error_on_update_on_member_join_lower_version_group.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_member_actions_error_on_update_on_member_join_lower_version_group.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_member_actions_error_on_update_on_member_join_lower_version_group.result	2021-09-28 11:46:34.000000000 +0000
@@ -7,6 +7,8 @@
 SET SESSION sql_log_bin = 0;
 call mtr.add_suppression("This member joined a group on which all members do not support member actions, as such it did reset its member configuration to the default one.");
 call mtr.add_suppression("Unable to reset to member actions default configuration on member join. Please check the tables 'mysql.replication_group_member_actions' and 'mysql.replication_group_configuration_version'.");
+call mtr.add_suppression("This member joined a group on which all members do not support replication failover channels integration on Group Replication, as such it did reset its replication failover channels configuration to the default one.");
+call mtr.add_suppression("Unable to reset to replication failover channels default configuration on member join. Please check the tables .*");
 SET SESSION sql_log_bin = 1;
 
 ############################################################
@@ -49,8 +51,9 @@
 # 3. Rejoin the group without the failure injection on the joiner.
 [connection server2]
 include/start_group_replication.inc
-include/assert.inc [There must be one member action]
+include/assert.inc [There must be two member actions]
 include/assert.inc [mysql_disable_super_read_only_if_primary action default value]
+include/assert.inc [mysql_start_failover_channels_if_primary action default value]
 include/assert.inc [There must be one GR configuration version]
 include/assert.inc [The version of replication_group_member_actions must be 1]
 include/assert_grep.inc [This member joined a group on which all members do not support member actions, as such it did reset its member configuration to the default one.]
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_member_actions_join_lower_version_group.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_member_actions_join_lower_version_group.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_member_actions_join_lower_version_group.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_member_actions_join_lower_version_group.result	2021-09-28 11:46:34.000000000 +0000
@@ -6,6 +6,7 @@
 [connection server2]
 SET SESSION sql_log_bin = 0;
 call mtr.add_suppression("This member joined a group on which all members do not support member actions, as such it did reset its member configuration to the default one.");
+call mtr.add_suppression("This member joined a group on which all members do not support replication failover channels integration on Group Replication, as such it did reset its replication failover channels configuration to the default one.");
 SET SESSION sql_log_bin = 1;
 
 ############################################################
@@ -35,8 +36,9 @@
 include/assert.inc [The action mysql_disable_super_read_only_if_primary must be disabled]
 include/assert.inc [The version of replication_group_member_actions must be 2]
 include/start_group_replication.inc
-include/assert.inc [There must be one member action]
+include/assert.inc [There must be two member actions]
 include/assert.inc [mysql_disable_super_read_only_if_primary action default value]
+include/assert.inc [mysql_start_failover_channels_if_primary action default value]
 include/assert.inc [There must be one GR configuration version]
 include/assert.inc [The version of replication_group_member_actions must be 1]
 include/assert_grep.inc [This member joined a group on which all members do not support member actions, as such it did reset its member configuration to the default one.]
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_member_actions_reset.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_member_actions_reset.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_member_actions_reset.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_member_actions_reset.result	2021-09-28 11:46:34.000000000 +0000
@@ -29,8 +29,9 @@
 SELECT group_replication_reset_member_actions();
 group_replication_reset_member_actions()
 OK
-include/assert.inc [There must be one member action]
+include/assert.inc [There must be two member actions]
 include/assert.inc [mysql_disable_super_read_only_if_primary action default value]
+include/assert.inc [mysql_start_failover_channels_if_primary action default value]
 include/assert.inc [There must be one GR configuration version]
 include/assert.inc [The version of replication_group_member_actions must be 1]
 include/assert_grep.inc [Member actions configuration was reset.]
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_multiple_starts_after_clone.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_multiple_starts_after_clone.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_multiple_starts_after_clone.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_multiple_starts_after_clone.result	2021-09-28 11:46:34.000000000 +0000
@@ -101,6 +101,7 @@
 RESET PERSIST group_replication_local_address;
 RESET PERSIST group_replication_group_seeds;
 RESET PERSIST group_replication_start_on_boot;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 SET GLOBAL group_replication_clone_threshold= GROUP_REPLICATION_CLONE_THRESHOLD;
 SET GLOBAL group_replication_start_on_boot= START_ON_BOOT_VALUE;
 UNINSTALL PLUGIN clone;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_no_user_start_failure.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_no_user_start_failure.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_no_user_start_failure.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_no_user_start_failure.result	2021-09-28 11:46:34.000000000 +0000
@@ -7,6 +7,11 @@
 # Delete the user and check the start fails
 #
 [connection server1]
+USE test;
+CREATE TABLE test.tmp_user AS SELECT * FROM mysql.user;
+INSERT INTO tmp_user SELECT * FROM mysql.user;
+CREATE TABLE tmp_global_grants AS SELECT * FROM mysql.global_grants;
+INSERT INTO tmp_global_grants SELECT * FROM mysql.global_grants;
 DROP USER "mysql.session"@"localhost";
 SET GLOBAL group_replication_group_name= "GROUP_REPLICATION_GROUP_NAME";
 START GROUP_REPLICATION;
@@ -33,4 +38,6 @@
 call mtr.add_suppression("It was not possible to establish a connection to server SQL service");
 call mtr.add_suppression("On plugin shutdown it was not possible to reset the server read mode settings.");
 SET SESSION sql_log_bin= 1;
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_start_on_boot=0 --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME
+include/rpl_reconnect.inc
 include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_perfschema_group_communication_information.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_perfschema_group_communication_information.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_perfschema_group_communication_information.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_perfschema_group_communication_information.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,55 @@
+include/group_replication.inc [rpl_server_count=2]
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+#########################################################################
+# 0) The test uses 2 servers: M1 and M2. Confirm the table is empty
+#    before starting Group Replication. M1 bootstraps the group in
+#    single-primary mode.
+include/assert.inc [The performance_schema.replication_group_communication_information table should be empty]
+include/start_and_bootstrap_group_replication.inc
+[connection server2]
+include/start_group_replication.inc
+########################################################################
+# 1) Confirm the preferred consensus leader is the PRIMARY.
+include/assert.inc [The UUID of the PRIMARY member should match the UUID of the preferred consensus leader]
+[connection server1]
+include/assert.inc [The UUID of the PRIMARY member should match the UUID of the preferred consensus leader]
+########################################################################
+# 2) Switch to multi-primary mode, confirm everyone is a preferred
+#    consensus leader.
+SELECT group_replication_switch_to_multi_primary_mode();
+group_replication_switch_to_multi_primary_mode()
+Mode switched to multi-primary successfully.
+[connection server2]
+[connection server1]
+########################################################################
+# 3) Confirm write_concurrency matches the result of
+#    group_replication_get_write_concurrency.
+include/assert.inc [write_concurrency (10) should be 10]
+[connection server2]
+include/assert.inc [write_concurrency (10) should be 10]
+########################################################################
+# 4) Confirm protocol_version matches the result of
+#    group_replication_get_communication_protocol.
+[connection server1]
+include/assert.inc [protocol_version (8.0.27) should be 8.0.27]
+[connection server2]
+include/assert.inc [protocol_version (8.0.27) should be 8.0.27]
+########################################################################
+# 5) Switch to single-primary mode. Switch communication_protocol to
+#    8.0.21. Confirm everyone is a preferred consensus leader even in
+#    single-primary
+[connection server1]
+SELECT group_replication_switch_to_single_primary_mode();
+group_replication_switch_to_single_primary_mode()
+Mode switched to single-primary successfully.
+SELECT group_replication_set_communication_protocol("8.0.21");
+group_replication_set_communication_protocol("8.0.21")
+The operation group_replication_set_communication_protocol completed successfully
+[connection server2]
+########################################################################
+# 6) Cleanup.
+[connection server1]
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_perfschema_group_member_stats_additional_columns.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_perfschema_group_member_stats_additional_columns.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_perfschema_group_member_stats_additional_columns.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_perfschema_group_member_stats_additional_columns.result	2021-09-28 11:46:34.000000000 +0000
@@ -19,12 +19,12 @@
 [connection server2]
 [connection server1]
 include/assert.inc ['The value of COUNT_TRANSACTIONS_REMOTE_APPLIED should be 0 on server 1']
-include/assert.inc ['The value of COUNT_TRANSACTIONS_REMOTE_APPLIED should be 3 on server 2']
+include/assert.inc ['The value of COUNT_TRANSACTIONS_REMOTE_APPLIED should be 4 on server 2']
 include/assert.inc ['The value of COUNT_TRANSACTIONS_LOCAL_PROPOSED should be 2 on server 1']
 include/assert.inc ['The value of COUNT_TRANSACTIONS_LOCAL_PROPOSED should be 0 on server 2']
 [connection server2]
 include/assert.inc ['The value of COUNT_TRANSACTIONS_REMOTE_APPLIED should be 0 on server 1']
-include/assert.inc ['The value of COUNT_TRANSACTIONS_REMOTE_APPLIED should be 3 on server 2']
+include/assert.inc ['The value of COUNT_TRANSACTIONS_REMOTE_APPLIED should be 4 on server 2']
 include/assert.inc ['The value of COUNT_TRANSACTIONS_LOCAL_PROPOSED should be 2 on server 1']
 include/assert.inc ['The value of COUNT_TRANSACTIONS_LOCAL_PROPOSED should be 0 on server 2']
 
@@ -44,7 +44,7 @@
 include/rpl_sync.inc
 [connection server1]
 include/assert.inc ['The value of COUNT_TRANSACTIONS_REMOTE_APPLIED should be 0 on server 1']
-include/assert.inc ['The value of COUNT_TRANSACTIONS_REMOTE_APPLIED should be 4 on server 2']
+include/assert.inc ['The value of COUNT_TRANSACTIONS_REMOTE_APPLIED should be 5 on server 2']
 include/assert.inc ['The value of COUNT_TRANSACTIONS_LOCAL_PROPOSED should be 4 on server 1']
 include/assert.inc ['The value of COUNT_TRANSACTIONS_LOCAL_PROPOSED should be 0 on server 2']
 include/assert.inc ['The value of COUNT_TRANSACTIONS_LOCAL_ROLLBACK should be 1 on server 1']
@@ -53,7 +53,7 @@
 include/assert.inc ['The value of COUNT_CONFLICTS_DETECTED should be 1 on server 2']
 [connection server2]
 include/assert.inc ['The value of COUNT_TRANSACTIONS_REMOTE_APPLIED should be 0 on server 1']
-include/assert.inc ['The value of COUNT_TRANSACTIONS_REMOTE_APPLIED should be 4 on server 2']
+include/assert.inc ['The value of COUNT_TRANSACTIONS_REMOTE_APPLIED should be 5 on server 2']
 include/assert.inc ['The value of COUNT_TRANSACTIONS_LOCAL_PROPOSED should be 4 on server 1']
 include/assert.inc ['The value of COUNT_TRANSACTIONS_LOCAL_PROPOSED should be 0 on server 2']
 include/assert.inc ['The value of COUNT_TRANSACTIONS_LOCAL_ROLLBACK should be 1 on server 1']
@@ -87,7 +87,7 @@
 include/assert.inc ['The value of COUNT_TRANSACTIONS_REMOTE_IN_APPLIER_QUEUE should be 0 on server 1']
 include/assert.inc ['The value of COUNT_TRANSACTIONS_REMOTE_IN_APPLIER_QUEUE should be 0 on server 2']
 include/assert.inc ['The value of COUNT_TRANSACTIONS_REMOTE_APPLIED should be 10 on server 1']
-include/assert.inc ['The value of COUNT_TRANSACTIONS_REMOTE_APPLIED should be 4 on server 2']
+include/assert.inc ['The value of COUNT_TRANSACTIONS_REMOTE_APPLIED should be 5 on server 2']
 include/assert.inc ['The value of COUNT_TRANSACTIONS_LOCAL_PROPOSED should be 4 on server 1']
 include/assert.inc ['The value of COUNT_TRANSACTIONS_LOCAL_PROPOSED should be 10 on server 2']
 include/assert.inc ['The value of COUNT_TRANSACTIONS_LOCAL_ROLLBACK should be 1 on server 1']
@@ -98,7 +98,7 @@
 include/assert.inc ['The value of COUNT_TRANSACTIONS_REMOTE_IN_APPLIER_QUEUE should be 0 on server 1']
 include/assert.inc ['The value of COUNT_TRANSACTIONS_REMOTE_IN_APPLIER_QUEUE should be 0 on server 2']
 include/assert.inc ['The value of COUNT_TRANSACTIONS_REMOTE_APPLIED should be 10 on server 1']
-include/assert.inc ['The value of COUNT_TRANSACTIONS_REMOTE_APPLIED should be 4 on server 2']
+include/assert.inc ['The value of COUNT_TRANSACTIONS_REMOTE_APPLIED should be 5 on server 2']
 include/assert.inc ['The value of COUNT_TRANSACTIONS_LOCAL_PROPOSED should be 4 on server 1']
 include/assert.inc ['The value of COUNT_TRANSACTIONS_LOCAL_PROPOSED should be 10 on server 2']
 include/assert.inc ['The value of COUNT_TRANSACTIONS_LOCAL_ROLLBACK should be 1 on server 1']
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_perfschema_parallel_applier.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_perfschema_parallel_applier.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_perfschema_parallel_applier.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_perfschema_parallel_applier.result	2021-09-28 11:46:34.000000000 +0000
@@ -64,6 +64,7 @@
 ZSTD_COMPRESSION_LEVEL	3
 TLS_CIPHERSUITES	NULL
 SOURCE_CONNECTION_AUTO_FAILOVER	0
+GTID_ONLY	1
 
 SELECT * FROM performance_schema.replication_connection_status WHERE channel_name = "group_replication_applier";
 CHANNEL_NAME	group_replication_applier
@@ -268,6 +269,7 @@
 ZSTD_COMPRESSION_LEVEL	3
 TLS_CIPHERSUITES	NULL
 SOURCE_CONNECTION_AUTO_FAILOVER	0
+GTID_ONLY	1
 
 SELECT * FROM performance_schema.replication_connection_status WHERE channel_name = "group_replication_applier";
 CHANNEL_NAME	group_replication_applier
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_perfschema.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_perfschema.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_perfschema.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_perfschema.result	2021-09-28 11:46:34.000000000 +0000
@@ -41,11 +41,11 @@
 NETWORK_INTERFACE	
 AUTO_POSITION	1
 SSL_ALLOWED	NO
-SSL_CA_FILE	
+SSL_CA_FILE	CA
 SSL_CA_PATH	
-SSL_CERTIFICATE	
+SSL_CERTIFICATE	CERT
 SSL_CIPHER	
-SSL_KEY	
+SSL_KEY	KEY
 SSL_VERIFY_SERVER_CERTIFICATE	NO
 SSL_CRL_FILE	
 SSL_CRL_PATH	
@@ -60,6 +60,7 @@
 ZSTD_COMPRESSION_LEVEL	3
 TLS_CIPHERSUITES	NULL
 SOURCE_CONNECTION_AUTO_FAILOVER	0
+GTID_ONLY	1
 #group_replication_applier channel configuration
 SELECT * FROM performance_schema.replication_connection_configuration WHERE channel_name LIKE "group_replication_applier";
 CHANNEL_NAME	group_replication_applier
@@ -88,6 +89,7 @@
 ZSTD_COMPRESSION_LEVEL	3
 TLS_CIPHERSUITES	NULL
 SOURCE_CONNECTION_AUTO_FAILOVER	0
+GTID_ONLY	1
 
 SELECT * FROM performance_schema.replication_connection_status WHERE channel_name = "group_replication_applier";
 CHANNEL_NAME	group_replication_applier
@@ -127,10 +129,25 @@
 COUNT_TRANSACTIONS_RETRIES	0
 
 SELECT * FROM performance_schema.replication_applier_status_by_coordinator WHERE channel_name = "group_replication_applier";
+CHANNEL_NAME	group_replication_applier
+THREAD_ID	[THREAD_ID]
+SERVICE_STATE	ON
+LAST_ERROR_NUMBER	0
+LAST_ERROR_MESSAGE	
+LAST_ERROR_TIMESTAMP	0000-00-00 00:00:00.000000
+LAST_PROCESSED_TRANSACTION	[LAST_PROCESSED_TRANSACTION]
+LAST_PROCESSED_TRANSACTION_ORIGINAL_COMMIT_TIMESTAMP	[ORIGINAL_COMMIT_TIMESTAMP]
+LAST_PROCESSED_TRANSACTION_IMMEDIATE_COMMIT_TIMESTAMP	[IMMEDIATE_COMMIT_TIMESTAMP]
+LAST_PROCESSED_TRANSACTION_START_BUFFER_TIMESTAMP	[START_BUFFER_TIMESTAMP]
+LAST_PROCESSED_TRANSACTION_END_BUFFER_TIMESTAMP	[END_BUFFER_TIMESTAMP]
+PROCESSING_TRANSACTION	
+PROCESSING_TRANSACTION_ORIGINAL_COMMIT_TIMESTAMP	0000-00-00 00:00:00.000000
+PROCESSING_TRANSACTION_IMMEDIATE_COMMIT_TIMESTAMP	0000-00-00 00:00:00.000000
+PROCESSING_TRANSACTION_START_BUFFER_TIMESTAMP	0000-00-00 00:00:00.000000
 
 SELECT * FROM performance_schema.replication_applier_status_by_worker WHERE channel_name = "group_replication_applier";
 CHANNEL_NAME	group_replication_applier
-WORKER_ID	0
+WORKER_ID	1
 THREAD_ID	[THREAD_ID]
 SERVICE_STATE	ON
 LAST_ERROR_NUMBER	0
@@ -183,11 +200,11 @@
 NETWORK_INTERFACE	
 AUTO_POSITION	1
 SSL_ALLOWED	NO
-SSL_CA_FILE	
+SSL_CA_FILE	CA
 SSL_CA_PATH	
-SSL_CERTIFICATE	
+SSL_CERTIFICATE	CERT
 SSL_CIPHER	
-SSL_KEY	
+SSL_KEY	KEY
 SSL_VERIFY_SERVER_CERTIFICATE	NO
 SSL_CRL_FILE	
 SSL_CRL_PATH	
@@ -202,6 +219,7 @@
 ZSTD_COMPRESSION_LEVEL	3
 TLS_CIPHERSUITES	NULL
 SOURCE_CONNECTION_AUTO_FAILOVER	0
+GTID_ONLY	1
 #group_replication_applier channel configuration
 SELECT * FROM performance_schema.replication_connection_configuration WHERE channel_name LIKE "group_replication_applier";
 CHANNEL_NAME	group_replication_applier
@@ -230,6 +248,7 @@
 ZSTD_COMPRESSION_LEVEL	3
 TLS_CIPHERSUITES	NULL
 SOURCE_CONNECTION_AUTO_FAILOVER	0
+GTID_ONLY	1
 
 SELECT * FROM performance_schema.replication_connection_status WHERE channel_name = "group_replication_applier";
 CHANNEL_NAME	group_replication_applier
@@ -269,10 +288,25 @@
 COUNT_TRANSACTIONS_RETRIES	0
 
 SELECT * FROM performance_schema.replication_applier_status_by_coordinator WHERE channel_name = "group_replication_applier";
+CHANNEL_NAME	group_replication_applier
+THREAD_ID	[THREAD_ID]
+SERVICE_STATE	OFF
+LAST_ERROR_NUMBER	0
+LAST_ERROR_MESSAGE	
+LAST_ERROR_TIMESTAMP	0000-00-00 00:00:00.000000
+LAST_PROCESSED_TRANSACTION	[LAST_PROCESSED_TRANSACTION]
+LAST_PROCESSED_TRANSACTION_ORIGINAL_COMMIT_TIMESTAMP	[ORIGINAL_COMMIT_TIMESTAMP]
+LAST_PROCESSED_TRANSACTION_IMMEDIATE_COMMIT_TIMESTAMP	[IMMEDIATE_COMMIT_TIMESTAMP]
+LAST_PROCESSED_TRANSACTION_START_BUFFER_TIMESTAMP	[START_BUFFER_TIMESTAMP]
+LAST_PROCESSED_TRANSACTION_END_BUFFER_TIMESTAMP	[END_BUFFER_TIMESTAMP]
+PROCESSING_TRANSACTION	
+PROCESSING_TRANSACTION_ORIGINAL_COMMIT_TIMESTAMP	0000-00-00 00:00:00.000000
+PROCESSING_TRANSACTION_IMMEDIATE_COMMIT_TIMESTAMP	0000-00-00 00:00:00.000000
+PROCESSING_TRANSACTION_START_BUFFER_TIMESTAMP	0000-00-00 00:00:00.000000
 
 SELECT * FROM performance_schema.replication_applier_status_by_worker WHERE channel_name = "group_replication_applier";
 CHANNEL_NAME	group_replication_applier
-WORKER_ID	0
+WORKER_ID	1
 THREAD_ID	NULL
 SERVICE_STATE	OFF
 LAST_ERROR_NUMBER	0
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_persist_only_variables.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_persist_only_variables.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_persist_only_variables.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_persist_only_variables.result	2021-09-28 11:46:34.000000000 +0000
@@ -29,6 +29,7 @@
 SET PERSIST_ONLY group_replication_clone_threshold = @@GLOBAL.group_replication_clone_threshold;
 SET PERSIST_ONLY group_replication_communication_debug_options = @@GLOBAL.group_replication_communication_debug_options;
 SET PERSIST_ONLY group_replication_communication_max_message_size = @@GLOBAL.group_replication_communication_max_message_size;
+SET PERSIST_ONLY group_replication_communication_stack = @@GLOBAL.group_replication_communication_stack;
 SET PERSIST_ONLY group_replication_components_stop_timeout = @@GLOBAL.group_replication_components_stop_timeout;
 SET PERSIST_ONLY group_replication_compression_threshold = @@GLOBAL.group_replication_compression_threshold;
 SET PERSIST_ONLY group_replication_consistency = @@GLOBAL.group_replication_consistency;
@@ -53,6 +54,7 @@
 SET PERSIST_ONLY group_replication_member_expel_timeout = @@GLOBAL.group_replication_member_expel_timeout;
 SET PERSIST_ONLY group_replication_member_weight = @@GLOBAL.group_replication_member_weight;
 SET PERSIST_ONLY group_replication_message_cache_size = @@GLOBAL.group_replication_message_cache_size;
+SET PERSIST_ONLY group_replication_paxos_single_leader = @@GLOBAL.group_replication_paxos_single_leader;
 SET PERSIST_ONLY group_replication_poll_spin_loops = @@GLOBAL.group_replication_poll_spin_loops;
 SET PERSIST_ONLY group_replication_recovery_complete_at = @@GLOBAL.group_replication_recovery_complete_at;
 SET PERSIST_ONLY group_replication_recovery_compression_algorithms = @@GLOBAL.group_replication_recovery_compression_algorithms;
@@ -80,7 +82,7 @@
 SET PERSIST_ONLY group_replication_unreachable_majority_timeout = @@GLOBAL.group_replication_unreachable_majority_timeout;
 SET PERSIST_ONLY group_replication_view_change_uuid = @@GLOBAL.group_replication_view_change_uuid;
 
-include/assert.inc ['Expect 58 persisted variables.']
+include/assert.inc ['Expect 60 persisted variables.']
 
 ############################################################
 # 2. Restart server, it must bootstrap the group and preserve
@@ -89,9 +91,9 @@
 include/rpl_reconnect.inc
 include/gr_wait_for_member_state.inc
 
-include/assert.inc ['Expect 58 persisted variables in persisted_variables table.']
-include/assert.inc ['Expect 57 variables which last value was set through SET PERSIST.']
-include/assert.inc ['Expect 49 persisted variables with matching persisted and global values.']
+include/assert.inc ['Expect 60 persisted variables in persisted_variables table.']
+include/assert.inc ['Expect 59 variables which last value was set through SET PERSIST.']
+include/assert.inc ['Expect 50 persisted variables with matching persisted and global values.']
 
 ############################################################
 # 3. Test RESET PERSIST IF EXISTS.
@@ -104,6 +106,7 @@
 RESET PERSIST IF EXISTS group_replication_clone_threshold;
 RESET PERSIST IF EXISTS group_replication_communication_debug_options;
 RESET PERSIST IF EXISTS group_replication_communication_max_message_size;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 RESET PERSIST IF EXISTS group_replication_components_stop_timeout;
 RESET PERSIST IF EXISTS group_replication_compression_threshold;
 RESET PERSIST IF EXISTS group_replication_consistency;
@@ -128,6 +131,7 @@
 RESET PERSIST IF EXISTS group_replication_member_expel_timeout;
 RESET PERSIST IF EXISTS group_replication_member_weight;
 RESET PERSIST IF EXISTS group_replication_message_cache_size;
+RESET PERSIST IF EXISTS group_replication_paxos_single_leader;
 RESET PERSIST IF EXISTS group_replication_poll_spin_loops;
 RESET PERSIST IF EXISTS group_replication_recovery_complete_at;
 RESET PERSIST IF EXISTS group_replication_recovery_compression_algorithms;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_persist_variables.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_persist_variables.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_persist_variables.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_persist_variables.result	2021-09-28 11:46:34.000000000 +0000
@@ -29,6 +29,7 @@
 SET PERSIST group_replication_clone_threshold = @@GLOBAL.group_replication_clone_threshold;
 SET PERSIST group_replication_communication_debug_options = @@GLOBAL.group_replication_communication_debug_options;
 SET PERSIST group_replication_communication_max_message_size = @@GLOBAL.group_replication_communication_max_message_size;
+SET PERSIST group_replication_communication_stack = @@GLOBAL.group_replication_communication_stack;
 SET PERSIST group_replication_components_stop_timeout = @@GLOBAL.group_replication_components_stop_timeout;
 SET PERSIST group_replication_compression_threshold = @@GLOBAL.group_replication_compression_threshold;
 SET PERSIST group_replication_consistency = @@GLOBAL.group_replication_consistency;
@@ -55,6 +56,7 @@
 SET PERSIST group_replication_member_expel_timeout = @@GLOBAL.group_replication_member_expel_timeout;
 SET PERSIST group_replication_member_weight = @@GLOBAL.group_replication_member_weight;
 SET PERSIST group_replication_message_cache_size = @@GLOBAL.group_replication_message_cache_size;
+SET PERSIST group_replication_paxos_single_leader = @@GLOBAL.group_replication_paxos_single_leader;
 SET PERSIST group_replication_poll_spin_loops = @@GLOBAL.group_replication_poll_spin_loops;
 SET PERSIST group_replication_recovery_complete_at = @@GLOBAL.group_replication_recovery_complete_at;
 SET PERSIST group_replication_recovery_compression_algorithms = @@GLOBAL.group_replication_recovery_compression_algorithms;
@@ -82,7 +84,7 @@
 SET PERSIST group_replication_unreachable_majority_timeout = @@GLOBAL.group_replication_unreachable_majority_timeout;
 SET PERSIST group_replication_view_change_uuid = @@GLOBAL.group_replication_view_change_uuid;
 
-include/assert.inc ['Expect 58 persisted variables.']
+include/assert.inc ['Expect 60 persisted variables.']
 
 ############################################################
 # 2. Restart server, it must bootstrap the group and preserve
@@ -91,9 +93,9 @@
 include/rpl_reconnect.inc
 include/gr_wait_for_member_state.inc
 
-include/assert.inc ['Expect 58 persisted variables in persisted_variables table.']
-include/assert.inc ['Expect 57 variables which last value was set through SET PERSIST.']
-include/assert.inc ['Expect 57 variables which last value was set through SET PERSIST is equal to its global value.']
+include/assert.inc ['Expect 60 persisted variables in persisted_variables table.']
+include/assert.inc ['Expect 59 variables which last value was set through SET PERSIST.']
+include/assert.inc ['Expect 59 variables which last value was set through SET PERSIST is equal to its global value.']
 
 ############################################################
 # 3. Test RESET PERSIST.
@@ -106,6 +108,7 @@
 RESET PERSIST group_replication_clone_threshold;
 RESET PERSIST group_replication_communication_debug_options;
 RESET PERSIST group_replication_communication_max_message_size;
+RESET PERSIST group_replication_communication_stack;
 RESET PERSIST group_replication_components_stop_timeout;
 RESET PERSIST group_replication_compression_threshold;
 RESET PERSIST group_replication_consistency;
@@ -130,6 +133,7 @@
 RESET PERSIST group_replication_member_expel_timeout;
 RESET PERSIST group_replication_member_weight;
 RESET PERSIST group_replication_message_cache_size;
+RESET PERSIST group_replication_paxos_single_leader;
 RESET PERSIST group_replication_poll_spin_loops;
 RESET PERSIST group_replication_recovery_complete_at;
 RESET PERSIST group_replication_recovery_compression_algorithms;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_plugin_components_stop_timeout.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_plugin_components_stop_timeout.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_plugin_components_stop_timeout.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_plugin_components_stop_timeout.result	2021-09-28 11:46:34.000000000 +0000
@@ -3,6 +3,7 @@
 Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection server1]
+SET @group_replication_components_stop_timeout_save = @@GLOBAL.group_replication_components_stop_timeout;
 SET GLOBAL group_replication_group_name= "2d249320-2e06-11e3-aa6e-0800200c9a66";
 SET GLOBAL group_replication_components_stop_timeout= NULL;
 ERROR 42000: Incorrect argument type to variable 'group_replication_components_stop_timeout'
@@ -21,5 +22,5 @@
 include/start_and_bootstrap_group_replication.inc
 SET GLOBAL group_replication_components_stop_timeout= 3153;
 include/assert.inc [The value for group_replication_components_stop_timeout should be 3153]
-SET GLOBAL group_replication_components_stop_timeout= 31536000;
+SET GLOBAl group_replication_components_stop_timeout = @group_replication_components_stop_timeout_save;
 include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_primary_failover_consistency_cmd_not_hold.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_primary_failover_consistency_cmd_not_hold.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_primary_failover_consistency_cmd_not_hold.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_primary_failover_consistency_cmd_not_hold.result	2021-09-28 11:46:34.000000000 +0000
@@ -17,6 +17,30 @@
 SHOW GLOBAL VARIABLES LIKE 'group_replication_consistency';
 Variable_name	Value
 group_replication_consistency	EVENTUAL
+SHOW PROCESSLIST;
+SHOW STATUS;
+SHOW ENGINE INNODB LOGS;
+SHOW ENGINE INNODB STATUS;
+SHOW ENGINE INNODB MUTEX;
+SHOW MASTER STATUS;
+SHOW REPLICA STATUS;
+SHOW CHARACTER SET;
+SHOW COLLATION;
+SHOW BINARY LOGS;
+SHOW OPEN TABLES;
+SHOW REPLICAS;
+SHOW BINLOG EVENTS;
+SHOW WARNINGS;
+SHOW ERRORS;
+SHOW ENGINES;
+SHOW PRIVILEGES;
+SHOW PROCEDURE STATUS;
+SHOW FUNCTION STATUS;
+SHOW PLUGINS;
+SHOW EVENTS;
+SHOW PROFILE;
+SHOW PROFILES;
+SHOW RELAYLOG EVENTS;
 
 # 3. Validate SQL command SET will not block
 SET @@GLOBAL.group_replication_member_weight= DEFAULT;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_primary_mode_group_operations_24.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_primary_mode_group_operations_24.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_primary_mode_group_operations_24.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_primary_mode_group_operations_24.result	2021-09-28 11:46:34.000000000 +0000
@@ -8,6 +8,7 @@
 #    configuration is accepted
 SET @@GLOBAL.DEBUG= '+d,group_replication_block_group_action';
 [connection server2]
+[connection server3]
 
 # 2. Execute switch to single primary mode
 [connection server1]
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_primary_mode_group_operations_26.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_primary_mode_group_operations_26.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_primary_mode_group_operations_26.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_primary_mode_group_operations_26.result	2021-09-28 11:46:34.000000000 +0000
@@ -93,4 +93,6 @@
 [connection server1]
 COMMIT;
 DROP TABLE t1;
+[connection server2]
+DROP TABLE t1;
 include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_primary_mode_group_operations_27.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_primary_mode_group_operations_27.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_primary_mode_group_operations_27.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_primary_mode_group_operations_27.result	2021-09-28 11:46:34.000000000 +0000
@@ -34,7 +34,7 @@
 # 6. Kill the primary selected when action was executed. Configure as
 #    single primary
 [connection server3]
-# Kill and restart:--group-replication-start-on-boot=0 --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS  --group_replication_single_primary_mode=TRUE --group_replication_enforce_update_everywhere_checks=FALSE
+# Kill and restart:--group-replication-start-on-boot=0 --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS  --group_replication_single_primary_mode=TRUE --group_replication_enforce_update_everywhere_checks=FALSE --group_replication_communication_stack=GROUP_REPLICATION_COMMUNICATION_STACK
 include/rpl_reconnect.inc
 
 # 7. Wait group detect exit of server3
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_primary_mode_group_operations_28.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_primary_mode_group_operations_28.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_primary_mode_group_operations_28.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_primary_mode_group_operations_28.result	2021-09-28 11:46:34.000000000 +0000
@@ -63,6 +63,9 @@
 
 # 13. Clean up
 DROP TABLE t1;
+[connection server2]
+DROP TABLE t1;
+[connection server1]
 set session sql_log_bin=0;
 call mtr.add_suppression("Error while executing a group configuration operation: The appointed primary for election left the group, this operation will be aborted.*");
 set session sql_log_bin=1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_primary_mode_group_operations_30.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_primary_mode_group_operations_30.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_primary_mode_group_operations_30.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_primary_mode_group_operations_30.result	2021-09-28 11:46:34.000000000 +0000
@@ -35,7 +35,7 @@
 
 # 6. Kill the stuck secondary
 [connection server3]
-# Kill and restart:--group-replication-start-on-boot=0 --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS  --group_replication_single_primary_mode=TRUE --group_replication_enforce_update_everywhere_checks=FALSE
+# Kill and restart:--group-replication-start-on-boot=0 --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS  --group_replication_single_primary_mode=TRUE --group_replication_enforce_update_everywhere_checks=FALSE --group_replication_communication_stack=GROUP_REPLICATION_COMMUNICATION_STACK
 include/rpl_reconnect.inc
 
 # 7. Check that the action finishes
@@ -51,4 +51,6 @@
 # 9. Cleanup
 [connection server2]
 DROP TABLE t1;
+[connection server3]
+DROP TABLE t1;
 include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_primary_mode_group_operations_31.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_primary_mode_group_operations_31.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_primary_mode_group_operations_31.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_primary_mode_group_operations_31.result	2021-09-28 11:46:34.000000000 +0000
@@ -47,4 +47,7 @@
 
 # 9. Cleanup
 DROP TABLE t1;
+[connection server_3]
+DROP TABLE t1;
+[connection server_2]
 include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_primary_mode_group_operations_concurrent_member_shutdown.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_primary_mode_group_operations_concurrent_member_shutdown.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_primary_mode_group_operations_concurrent_member_shutdown.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_primary_mode_group_operations_concurrent_member_shutdown.result	2021-09-28 11:46:34.000000000 +0000
@@ -43,6 +43,9 @@
 call mtr.add_suppression("Error writing relay log configuration.");
 call mtr.add_suppression("Failed to stop the group replication applier thread.");
 call mtr.add_suppression("Error while executing a group configuration operation: Mode switched to single-primary with reported warnings: *");
+call mtr.add_suppression("Fatal error during execution on the Applier process of Group Replication. The server will now leave the group.");
+call mtr.add_suppression("Skipping leave operation: concurrent attempt to leave the group is on-going.");
+call mtr.add_suppression("The server was automatically set into read only mode after an error was detected.");
 set session sql_log_bin=1;
 [connection server1]
 include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_primary_mode_group_operations_joining_during_election.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_primary_mode_group_operations_joining_during_election.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_primary_mode_group_operations_joining_during_election.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_primary_mode_group_operations_joining_during_election.result	2021-09-28 11:46:34.000000000 +0000
@@ -9,19 +9,32 @@
 #    Server 3 has a user for recovery, so he is the only valid donor
 [connection server1]
 set session sql_log_bin=0;
+call mtr.add_suppression("Slave I/O for channel 'group_replication_recovery': Master command COM_REGISTER_SLAVE failed*");
+call mtr.add_suppression("Slave I/O thread couldn't register on master");
 call mtr.add_suppression("The function 'group_replication_switch_to_multi_primary_mode' failed. A primary election is occurring in the group. Wait for it to end.");
 call mtr.add_suppression("There was an error when connecting to the donor server. Please check that group_replication_recovery channel credentials.*");
 call mtr.add_suppression("For details please check performance_schema.replication_connection_status table*");
 set session sql_log_bin=1;
 CREATE TABLE test.t1 (a INT PRIMARY KEY NOT NULL AUTO_INCREMENT);
+SET sql_log_bin=0;
+CREATE USER 'recovery_user'@'%' IDENTIFIED BY 'rpl';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'recovery_user'@'%';
+FLUSH PRIVILEGES;
+SET sql_log_bin=1;
 include/start_and_bootstrap_group_replication.inc
 [connection server2]
 SET GLOBAL group_replication_member_weight= 90;
+SET sql_log_bin=0;
+CREATE USER 'recovery_user'@'%' IDENTIFIED BY 'rpl';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'recovery_user'@'%';
+FLUSH PRIVILEGES;
+SET sql_log_bin=1;
 include/start_group_replication.inc
 [connection server3]
 SET sql_log_bin=0;
 CREATE USER 'recovery_user'@'%' IDENTIFIED BY 'rpl';
 GRANT REPLICATION SLAVE ON *.* TO 'recovery_user'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'recovery_user'@'%';
 FLUSH PRIVILEGES;
 SET sql_log_bin=1;
 include/start_group_replication.inc
@@ -81,5 +94,12 @@
 SET sql_log_bin=1;
 DROP TABLE t1;
 [connection server2]
+SET sql_log_bin=0;
+DROP USER recovery_user;
+SET sql_log_bin=1;
 SET @@GLOBAL.group_replication_member_weight= DEFAULT;
+[connection server1]
+SET sql_log_bin=0;
+DROP USER recovery_user;
+SET sql_log_bin=1;
 include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_protocol_stack_tables_and_migration.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_protocol_stack_tables_and_migration.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_protocol_stack_tables_and_migration.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_protocol_stack_tables_and_migration.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,49 @@
+# 1. Start the group normally.
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+# 2. Assert that the value in group_replication_communication_stack is the
+#    same as the one the in P_S table for incoming connections
+include/assert.inc [Assert that the configured communication stack is the same as reported in P_S tables]
+include/assert.inc [Assert that the configured communication stack is the same as reported in P_S tables]
+# 3. Stop both servers and backup the communication stack value, local_address
+#    and seeds
+include/stop_group_replication.inc
+include/assert.inc [Assert that the configured communication stack remains valid with a stopped server]
+include/stop_group_replication.inc
+# 4. In server 1, change to MySQL stack and adjust the local_address and seeds
+#    accordingly
+# 5. Start and bootstrap the group with server 1
+SET GLOBAL group_replication_communication_stack= MySQL;
+include/start_and_bootstrap_group_replication.inc
+# 6. In server 2, change to MySQL stack and adjust the local_address and seeds
+#    accordingly
+# 7. Start server 2.
+SET GLOBAL group_replication_communication_stack= MySQL;
+include/start_group_replication.inc
+# 8. Assert that the value in group_replication_communication_stack is the
+#    same as the one the in P_S table for incoming connections
+include/assert.inc [Assert that the configured communication stack is the same as reported in P_S tables]
+include/assert.inc [Assert that the configured communication stack is the same as reported in P_S tables]
+# 9. In server 1, change the protocol to XCom and check that it differs
+#     group_replication_communication_stack
+# 10. Stop server 1
+SET GLOBAL group_replication_communication_stack= XCOM;
+include/assert.inc [Assert that the configured communication stack is different then the one reported in P_S tables]
+include/stop_group_replication.inc
+# 11. In server 2, change the protocol to XCom and check that it differs
+#     group_replication_communication_stack
+# 12. Stop server 2
+SET GLOBAL group_replication_communication_stack= XCOM;
+include/assert.inc [Assert that the configured communication stack is different then the one reported in P_S tables]
+include/stop_group_replication.inc
+# 13. Bootstrap the group with server 1.
+SET GLOBAL group_replication_communication_stack= XCOM;
+include/start_and_bootstrap_group_replication.inc
+# 14. Join Server 2.
+SET GLOBAL group_replication_communication_stack= XCOM;
+include/start_group_replication.inc
+# 15. Clean up.
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_psi_keys_mysql.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_psi_keys_mysql.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_psi_keys_mysql.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_psi_keys_mysql.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,166 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+############################################################
+# 1. verify that performance schema keys are available in instrument
+#    table immediately after plugin installation
+#    (before starting the GR).
+SELECT * FROM performance_schema.setup_instruments WHERE NAME LIKE '%group_rpl%' AND NAME NOT LIKE 'wait/synch/%/group_rpl/GCS_%' AND NAME NOT LIKE '%GCS_XCom::xcom_cache%';
+NAME	ENABLED	TIMED	PROPERTIES	VOLATILITY	DOCUMENTATION
+wait/synch/mutex/group_rpl/LOCK_applier_module_run	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_applier_module_suspend	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_autorejoin_module	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_certifier_broadcast_run	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_certifier_broadcast_dispatcher_run	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_certification_info	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_certification_members	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_channel_observation_list	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_channel_observation_removal	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_clone_donor_list	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_clone_handler_run	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_clone_query	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_clone_read_mode	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_count_down_latch	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_delayed_init_run	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_delayed_init_server_ready	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_force_members_running	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/key_GR_LOCK_group_action_coordinator_process	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/key_GR_LOCK_group_action_coordinator_thread	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/key_GR_LOCK_group_action_coordinator_thread_end	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_group_info_manager	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/key_GR_LOCK_group_part_handler_abort	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/key_GR_LOCK_group_part_handler_run	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_multi_primary_action_notification	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_pipeline_continuation	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_pipeline_stats_flow_control	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_pipeline_stats_transactions_waiting_apply	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_plugin_modules_termination	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_plugin_online	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_plugin_running	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_primary_election_action_phase	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_primary_election_action_notification	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_primary_election_primary_process_run	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_primary_election_running_flag	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_primary_election_secondary_process_run	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_primary_election_validation_notification	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_primary_promotion_policy	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_recovery	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_recovery_donor_selection	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_recovery_module_run	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_server_ongoing_transaction_handler	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_message_service_run	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_session_thread_method_exec	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_session_thread_run	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_stage_monitor_handler	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_synchronized_queue	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_transaction_unblocking	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_group_member_info_manager_update_lock	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_group_member_info_update_lock	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_view_modification_wait	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_wait_ticket	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_write_lock_protection	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_mysql_thread_run	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_mysql_thread_dispatcher_run	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_connection_map	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_mysql_handler_thread_run	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_mysql_thread_handler_dispatcher_run	YES	YES	singleton	0	NULL
+wait/synch/rwlock/group_rpl/RWLOCK_certifier_stable_gtid_set	YES	YES	singleton	0	NULL
+wait/synch/rwlock/group_rpl/RWLOCK_channel_observation_list	YES	YES	singleton	0	NULL
+wait/synch/rwlock/group_rpl/RWLOCK_gcs_operations	YES	YES	singleton	0	NULL
+wait/synch/rwlock/group_rpl/RWLOCK_gcs_operations_view_change_observers	YES	YES	singleton	0	NULL
+wait/synch/rwlock/group_rpl/RWLOCK_group_event_observation_list	YES	YES	singleton	0	NULL
+wait/synch/rwlock/group_rpl/RWLOCK_io_cache_unused_list	YES	YES	singleton	0	NULL
+wait/synch/rwlock/group_rpl/RWLOCK_plugin_stop	YES	YES	singleton	0	NULL
+wait/synch/rwlock/group_rpl/RWLOCK_transaction_observation_list	YES	YES	singleton	0	NULL
+wait/synch/rwlock/group_rpl/RWLOCK_transaction_consistency_manager_map	YES	YES	singleton	0	NULL
+wait/synch/rwlock/group_rpl/RWLOCK_transaction_consistency_manager_prepared_transactions_on_my_applier	YES	YES	singleton	0	NULL
+wait/synch/rwlock/group_rpl/RWLOCK_flow_control_module_info	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_applier_module_run	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_applier_module_suspend	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_applier_module_wait	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_certifier_broadcast_run	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_certifier_broadcast_dispatcher_run	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_clone_handler_run	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_delayed_init_run	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_delayed_init_server_ready	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_group_action_coordinator_process	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_group_action_coordinator_thread	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_group_action_coordinator_thread_end	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_group_part_handler_run	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_group_part_handler_abort	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_message_service_run	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_multi_primary_action_notification	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_view_modification_wait	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_pipeline_continuation	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_synchronized_queue	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_count_down_latch	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_wait_ticket	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_recovery_module_run	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_recovery	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_session_thread_method_exec	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_session_thread_run	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_pipeline_stats_flow_control	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_primary_election_action_notification	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_primary_election_primary_process_run	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_primary_election_secondary_process_run	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_primary_election_validation_notification	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_write_lock_protection	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_plugin_online	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_primary_promotion_policy	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_autorejoin_module	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_mysql_thread_run	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_mysql_thread_dispatcher_run	YES	YES	singleton	0	NULL
+stage/group_rpl/Undergoing auto-rejoin procedure	YES	YES	progress	0	NULL
+stage/group_rpl/Multi-primary Switch: waiting for pending transactions to finish	YES	YES	progress	0	NULL
+stage/group_rpl/Multi-primary Switch: waiting on another member step completion	YES	YES	progress	0	NULL
+stage/group_rpl/Multi-primary Switch: applying buffered transactions	YES	YES	progress	0	NULL
+stage/group_rpl/Multi-primary Switch: waiting for operation to complete on all members	YES	YES	progress	0	NULL
+stage/group_rpl/Primary Election: applying buffered transactions	YES	YES	progress	0	NULL
+stage/group_rpl/Primary Election: waiting on current primary transaction execution	YES	YES	progress	0	NULL
+stage/group_rpl/Primary Election: waiting for members to enable super_read_only	YES	YES	progress	0	NULL
+stage/group_rpl/Primary Election: stabilizing transactions from former primaries	YES	YES	progress	0	NULL
+stage/group_rpl/Primary Switch: checking current primary pre-conditions	YES	YES	progress	0	NULL
+stage/group_rpl/Primary Switch: waiting for pending transactions to finish	YES	YES	progress	0	NULL
+stage/group_rpl/Primary Switch: executing Primary election	YES	YES	progress	0	NULL
+stage/group_rpl/Primary Switch: waiting on another member step completion	YES	YES	progress	0	NULL
+stage/group_rpl/Primary Switch: waiting for operation to complete on all members	YES	YES	progress	0	NULL
+stage/group_rpl/Single-primary Switch: checking group pre-conditions	YES	YES	progress	0	NULL
+stage/group_rpl/Single-primary Switch: executing Primary election	YES	YES	progress	0	NULL
+stage/group_rpl/Single-primary Switch: waiting for operation to complete on all members	YES	YES	progress	0	NULL
+stage/group_rpl/Group Replication Module: Executing	YES	YES		0	NULL
+stage/group_rpl/Group Replication Module: Suspending	YES	YES		0	NULL
+stage/group_rpl/Group Replication Recovery: Connecting to donor	YES	YES		0	NULL
+stage/group_rpl/Group Replication Recovery: Transferring state from donor	YES	YES		0	NULL
+stage/group_rpl/Group Replication Cloning process: Preparing	YES	YES	progress	0	NULL
+stage/group_rpl/Group Replication Cloning process: Executing	YES	YES	progress	0	NULL
+
+############################################################
+# 2. Start the GR
+include/start_and_bootstrap_group_replication.inc
+
+############################################################
+# 3. Verify that there are no extra psi keys that were added
+#   after starting the GR
+include/assert.inc ['There should be no extra psi keys added after starting the GR']
+
+############################################################
+# 4. Verify that performance_schema.threads list the usual
+#    threads after member is ONLINE.
+SELECT NAME, TYPE, INSTRUMENTED FROM performance_schema.threads WHERE NAME LIKE '%group_rpl%' ORDER BY NAME;
+NAME	TYPE	INSTRUMENTED
+thread/group_rpl/THD_applier_module_receiver	FOREGROUND	YES
+thread/group_rpl/THD_certifier_broadcast	BACKGROUND	YES
+thread/group_rpl/THD_Gcs_ext_logger_impl::m_consumer	BACKGROUND	YES
+thread/group_rpl/THD_Gcs_xcom_control::m_suspicions_processing_thread	BACKGROUND	YES
+thread/group_rpl/THD_Gcs_xcom_control::m_xcom_thread	BACKGROUND	YES
+thread/group_rpl/THD_Gcs_xcom_engine::m_engine_thread	BACKGROUND	YES
+thread/group_rpl/THD_message_service_handler	BACKGROUND	YES
+thread/group_rpl/THD_mysql_thread	BACKGROUND	YES
+thread/group_rpl/THD_mysql_thread_handler	BACKGROUND	YES
+
+############################################################
+# 5. Test end.
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_psi_keys.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_psi_keys.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_psi_keys.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_psi_keys.result	1970-01-01 00:00:00.000000000 +0000
@@ -1,162 +0,0 @@
-include/group_replication.inc
-Warnings:
-Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
-[connection server1]
-
-############################################################
-# 1. verify that performance schema keys are available in instrument
-#    table immediately after plugin installation
-#    (before starting the GR).
-SELECT * FROM performance_schema.setup_instruments WHERE NAME LIKE '%group_rpl%' AND NAME NOT LIKE 'wait/synch/%/group_rpl/GCS_%' AND NAME NOT LIKE '%GCS_XCom::xcom_cache%';
-NAME	ENABLED	TIMED	PROPERTIES	VOLATILITY	DOCUMENTATION
-wait/synch/mutex/group_rpl/LOCK_applier_module_run	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_applier_module_suspend	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_autorejoin_module	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_certifier_broadcast_run	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_certifier_broadcast_dispatcher_run	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_certification_info	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_certification_members	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_channel_observation_list	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_channel_observation_removal	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_clone_donor_list	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_clone_handler_run	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_clone_query	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_clone_read_mode	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_count_down_latch	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_delayed_init_run	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_delayed_init_server_ready	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_force_members_running	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/key_GR_LOCK_group_action_coordinator_process	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/key_GR_LOCK_group_action_coordinator_thread	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/key_GR_LOCK_group_action_coordinator_thread_end	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_group_info_manager	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/key_GR_LOCK_group_part_handler_abort	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/key_GR_LOCK_group_part_handler_run	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_multi_primary_action_notification	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_pipeline_continuation	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_pipeline_stats_flow_control	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_pipeline_stats_transactions_waiting_apply	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_plugin_modules_termination	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_plugin_online	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_plugin_running	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_primary_election_action_phase	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_primary_election_action_notification	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_primary_election_primary_process_run	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_primary_election_running_flag	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_primary_election_secondary_process_run	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_primary_election_validation_notification	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_primary_promotion_policy	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_recovery	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_recovery_donor_selection	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_recovery_module_run	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_server_ongoing_transaction_handler	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_message_service_run	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_session_thread_method_exec	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_session_thread_run	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_stage_monitor_handler	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_synchronized_queue	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_transaction_unblocking	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_group_member_info_manager_update_lock	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_group_member_info_update_lock	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_view_modification_wait	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_wait_ticket	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_write_lock_protection	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_mysql_thread_run	YES	YES	singleton	0	NULL
-wait/synch/mutex/group_rpl/LOCK_mysql_thread_dispatcher_run	YES	YES	singleton	0	NULL
-wait/synch/rwlock/group_rpl/RWLOCK_certifier_stable_gtid_set	YES	YES	singleton	0	NULL
-wait/synch/rwlock/group_rpl/RWLOCK_channel_observation_list	YES	YES	singleton	0	NULL
-wait/synch/rwlock/group_rpl/RWLOCK_gcs_operations	YES	YES	singleton	0	NULL
-wait/synch/rwlock/group_rpl/RWLOCK_gcs_operations_view_change_observers	YES	YES	singleton	0	NULL
-wait/synch/rwlock/group_rpl/RWLOCK_group_event_observation_list	YES	YES	singleton	0	NULL
-wait/synch/rwlock/group_rpl/RWLOCK_io_cache_unused_list	YES	YES	singleton	0	NULL
-wait/synch/rwlock/group_rpl/RWLOCK_plugin_stop	YES	YES	singleton	0	NULL
-wait/synch/rwlock/group_rpl/RWLOCK_transaction_observation_list	YES	YES	singleton	0	NULL
-wait/synch/rwlock/group_rpl/RWLOCK_transaction_consistency_manager_map	YES	YES	singleton	0	NULL
-wait/synch/rwlock/group_rpl/RWLOCK_transaction_consistency_manager_prepared_transactions_on_my_applier	YES	YES	singleton	0	NULL
-wait/synch/rwlock/group_rpl/RWLOCK_flow_control_module_info	YES	YES	singleton	0	NULL
-wait/synch/cond/group_rpl/COND_applier_module_run	YES	YES	singleton	0	NULL
-wait/synch/cond/group_rpl/COND_applier_module_suspend	YES	YES	singleton	0	NULL
-wait/synch/cond/group_rpl/COND_applier_module_wait	YES	YES	singleton	0	NULL
-wait/synch/cond/group_rpl/COND_certifier_broadcast_run	YES	YES	singleton	0	NULL
-wait/synch/cond/group_rpl/COND_certifier_broadcast_dispatcher_run	YES	YES	singleton	0	NULL
-wait/synch/cond/group_rpl/COND_clone_handler_run	YES	YES	singleton	0	NULL
-wait/synch/cond/group_rpl/COND_delayed_init_run	YES	YES	singleton	0	NULL
-wait/synch/cond/group_rpl/COND_delayed_init_server_ready	YES	YES	singleton	0	NULL
-wait/synch/cond/group_rpl/COND_group_action_coordinator_process	YES	YES	singleton	0	NULL
-wait/synch/cond/group_rpl/COND_group_action_coordinator_thread	YES	YES	singleton	0	NULL
-wait/synch/cond/group_rpl/COND_group_action_coordinator_thread_end	YES	YES	singleton	0	NULL
-wait/synch/cond/group_rpl/COND_group_part_handler_run	YES	YES	singleton	0	NULL
-wait/synch/cond/group_rpl/COND_group_part_handler_abort	YES	YES	singleton	0	NULL
-wait/synch/cond/group_rpl/COND_message_service_run	YES	YES	singleton	0	NULL
-wait/synch/cond/group_rpl/COND_multi_primary_action_notification	YES	YES	singleton	0	NULL
-wait/synch/cond/group_rpl/COND_view_modification_wait	YES	YES	singleton	0	NULL
-wait/synch/cond/group_rpl/COND_pipeline_continuation	YES	YES	singleton	0	NULL
-wait/synch/cond/group_rpl/COND_synchronized_queue	YES	YES	singleton	0	NULL
-wait/synch/cond/group_rpl/COND_count_down_latch	YES	YES	singleton	0	NULL
-wait/synch/cond/group_rpl/COND_wait_ticket	YES	YES	singleton	0	NULL
-wait/synch/cond/group_rpl/COND_recovery_module_run	YES	YES	singleton	0	NULL
-wait/synch/cond/group_rpl/COND_recovery	YES	YES	singleton	0	NULL
-wait/synch/cond/group_rpl/COND_session_thread_method_exec	YES	YES	singleton	0	NULL
-wait/synch/cond/group_rpl/COND_session_thread_run	YES	YES	singleton	0	NULL
-wait/synch/cond/group_rpl/COND_pipeline_stats_flow_control	YES	YES	singleton	0	NULL
-wait/synch/cond/group_rpl/COND_primary_election_action_notification	YES	YES	singleton	0	NULL
-wait/synch/cond/group_rpl/COND_primary_election_primary_process_run	YES	YES	singleton	0	NULL
-wait/synch/cond/group_rpl/COND_primary_election_secondary_process_run	YES	YES	singleton	0	NULL
-wait/synch/cond/group_rpl/COND_primary_election_validation_notification	YES	YES	singleton	0	NULL
-wait/synch/cond/group_rpl/COND_write_lock_protection	YES	YES	singleton	0	NULL
-wait/synch/cond/group_rpl/COND_plugin_online	YES	YES	singleton	0	NULL
-wait/synch/cond/group_rpl/COND_primary_promotion_policy	YES	YES	singleton	0	NULL
-wait/synch/cond/group_rpl/COND_autorejoin_module	YES	YES	singleton	0	NULL
-wait/synch/cond/group_rpl/COND_mysql_thread_run	YES	YES	singleton	0	NULL
-wait/synch/cond/group_rpl/COND_mysql_thread_dispatcher_run	YES	YES	singleton	0	NULL
-stage/group_rpl/Undergoing auto-rejoin procedure	YES	YES	progress	0	NULL
-stage/group_rpl/Multi-primary Switch: waiting for pending transactions to finish	YES	YES	progress	0	NULL
-stage/group_rpl/Multi-primary Switch: waiting on another member step completion	YES	YES	progress	0	NULL
-stage/group_rpl/Multi-primary Switch: applying buffered transactions	YES	YES	progress	0	NULL
-stage/group_rpl/Multi-primary Switch: waiting for operation to complete on all members	YES	YES	progress	0	NULL
-stage/group_rpl/Primary Election: applying buffered transactions	YES	YES	progress	0	NULL
-stage/group_rpl/Primary Election: waiting on current primary transaction execution	YES	YES	progress	0	NULL
-stage/group_rpl/Primary Election: waiting for members to enable super_read_only	YES	YES	progress	0	NULL
-stage/group_rpl/Primary Election: stabilizing transactions from former primaries	YES	YES	progress	0	NULL
-stage/group_rpl/Primary Switch: checking current primary pre-conditions	YES	YES	progress	0	NULL
-stage/group_rpl/Primary Switch: waiting for pending transactions to finish	YES	YES	progress	0	NULL
-stage/group_rpl/Primary Switch: executing Primary election	YES	YES	progress	0	NULL
-stage/group_rpl/Primary Switch: waiting on another member step completion	YES	YES	progress	0	NULL
-stage/group_rpl/Primary Switch: waiting for operation to complete on all members	YES	YES	progress	0	NULL
-stage/group_rpl/Single-primary Switch: checking group pre-conditions	YES	YES	progress	0	NULL
-stage/group_rpl/Single-primary Switch: executing Primary election	YES	YES	progress	0	NULL
-stage/group_rpl/Single-primary Switch: waiting for operation to complete on all members	YES	YES	progress	0	NULL
-stage/group_rpl/Group Replication Module: Executing	YES	YES		0	NULL
-stage/group_rpl/Group Replication Module: Suspending	YES	YES		0	NULL
-stage/group_rpl/Group Replication Recovery: Connecting to donor	YES	YES		0	NULL
-stage/group_rpl/Group Replication Recovery: Transferring state from donor	YES	YES		0	NULL
-stage/group_rpl/Group Replication Cloning process: Preparing	YES	YES	progress	0	NULL
-stage/group_rpl/Group Replication Cloning process: Executing	YES	YES	progress	0	NULL
-
-############################################################
-# 2. Start the GR
-include/start_and_bootstrap_group_replication.inc
-
-############################################################
-# 3. Verify that there are no extra psi keys that were added
-#   after starting the GR
-include/assert.inc ['There should be no extra psi keys added after starting the GR']
-
-############################################################
-# 4. Verify that performance_schema.threads list the usual
-#    threads after member is ONLINE.
-SELECT NAME, TYPE, INSTRUMENTED FROM performance_schema.threads WHERE NAME LIKE '%group_rpl%' ORDER BY NAME;
-NAME	TYPE	INSTRUMENTED
-thread/group_rpl/THD_applier_module_receiver	FOREGROUND	YES
-thread/group_rpl/THD_certifier_broadcast	BACKGROUND	YES
-thread/group_rpl/THD_Gcs_ext_logger_impl::m_consumer	BACKGROUND	YES
-thread/group_rpl/THD_Gcs_xcom_control::m_suspicions_processing_thread	BACKGROUND	YES
-thread/group_rpl/THD_Gcs_xcom_control::m_xcom_thread	BACKGROUND	YES
-thread/group_rpl/THD_Gcs_xcom_engine::m_engine_thread	BACKGROUND	YES
-thread/group_rpl/THD_message_service_handler	BACKGROUND	YES
-thread/group_rpl/THD_mysql_thread	BACKGROUND	YES
-
-############################################################
-# 5. Test end.
-include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_psi_keys_xcom.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_psi_keys_xcom.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_psi_keys_xcom.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_psi_keys_xcom.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,166 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+############################################################
+# 1. verify that performance schema keys are available in instrument
+#    table immediately after plugin installation
+#    (before starting the GR).
+SELECT * FROM performance_schema.setup_instruments WHERE NAME LIKE '%group_rpl%' AND NAME NOT LIKE 'wait/synch/%/group_rpl/GCS_%' AND NAME NOT LIKE '%GCS_XCom::xcom_cache%';
+NAME	ENABLED	TIMED	PROPERTIES	VOLATILITY	DOCUMENTATION
+wait/synch/mutex/group_rpl/LOCK_applier_module_run	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_applier_module_suspend	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_autorejoin_module	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_certifier_broadcast_run	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_certifier_broadcast_dispatcher_run	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_certification_info	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_certification_members	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_channel_observation_list	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_channel_observation_removal	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_clone_donor_list	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_clone_handler_run	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_clone_query	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_clone_read_mode	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_count_down_latch	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_delayed_init_run	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_delayed_init_server_ready	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_force_members_running	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/key_GR_LOCK_group_action_coordinator_process	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/key_GR_LOCK_group_action_coordinator_thread	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/key_GR_LOCK_group_action_coordinator_thread_end	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_group_info_manager	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/key_GR_LOCK_group_part_handler_abort	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/key_GR_LOCK_group_part_handler_run	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_multi_primary_action_notification	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_pipeline_continuation	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_pipeline_stats_flow_control	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_pipeline_stats_transactions_waiting_apply	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_plugin_modules_termination	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_plugin_online	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_plugin_running	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_primary_election_action_phase	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_primary_election_action_notification	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_primary_election_primary_process_run	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_primary_election_running_flag	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_primary_election_secondary_process_run	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_primary_election_validation_notification	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_primary_promotion_policy	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_recovery	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_recovery_donor_selection	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_recovery_module_run	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_server_ongoing_transaction_handler	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_message_service_run	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_session_thread_method_exec	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_session_thread_run	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_stage_monitor_handler	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_synchronized_queue	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_transaction_unblocking	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_group_member_info_manager_update_lock	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_group_member_info_update_lock	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_view_modification_wait	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_wait_ticket	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_write_lock_protection	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_mysql_thread_run	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_mysql_thread_dispatcher_run	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_connection_map	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_mysql_handler_thread_run	YES	YES	singleton	0	NULL
+wait/synch/mutex/group_rpl/LOCK_mysql_thread_handler_dispatcher_run	YES	YES	singleton	0	NULL
+wait/synch/rwlock/group_rpl/RWLOCK_certifier_stable_gtid_set	YES	YES	singleton	0	NULL
+wait/synch/rwlock/group_rpl/RWLOCK_channel_observation_list	YES	YES	singleton	0	NULL
+wait/synch/rwlock/group_rpl/RWLOCK_gcs_operations	YES	YES	singleton	0	NULL
+wait/synch/rwlock/group_rpl/RWLOCK_gcs_operations_view_change_observers	YES	YES	singleton	0	NULL
+wait/synch/rwlock/group_rpl/RWLOCK_group_event_observation_list	YES	YES	singleton	0	NULL
+wait/synch/rwlock/group_rpl/RWLOCK_io_cache_unused_list	YES	YES	singleton	0	NULL
+wait/synch/rwlock/group_rpl/RWLOCK_plugin_stop	YES	YES	singleton	0	NULL
+wait/synch/rwlock/group_rpl/RWLOCK_transaction_observation_list	YES	YES	singleton	0	NULL
+wait/synch/rwlock/group_rpl/RWLOCK_transaction_consistency_manager_map	YES	YES	singleton	0	NULL
+wait/synch/rwlock/group_rpl/RWLOCK_transaction_consistency_manager_prepared_transactions_on_my_applier	YES	YES	singleton	0	NULL
+wait/synch/rwlock/group_rpl/RWLOCK_flow_control_module_info	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_applier_module_run	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_applier_module_suspend	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_applier_module_wait	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_certifier_broadcast_run	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_certifier_broadcast_dispatcher_run	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_clone_handler_run	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_delayed_init_run	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_delayed_init_server_ready	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_group_action_coordinator_process	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_group_action_coordinator_thread	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_group_action_coordinator_thread_end	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_group_part_handler_run	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_group_part_handler_abort	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_message_service_run	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_multi_primary_action_notification	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_view_modification_wait	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_pipeline_continuation	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_synchronized_queue	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_count_down_latch	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_wait_ticket	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_recovery_module_run	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_recovery	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_session_thread_method_exec	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_session_thread_run	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_pipeline_stats_flow_control	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_primary_election_action_notification	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_primary_election_primary_process_run	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_primary_election_secondary_process_run	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_primary_election_validation_notification	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_write_lock_protection	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_plugin_online	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_primary_promotion_policy	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_autorejoin_module	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_mysql_thread_run	YES	YES	singleton	0	NULL
+wait/synch/cond/group_rpl/COND_mysql_thread_dispatcher_run	YES	YES	singleton	0	NULL
+stage/group_rpl/Undergoing auto-rejoin procedure	YES	YES	progress	0	NULL
+stage/group_rpl/Multi-primary Switch: waiting for pending transactions to finish	YES	YES	progress	0	NULL
+stage/group_rpl/Multi-primary Switch: waiting on another member step completion	YES	YES	progress	0	NULL
+stage/group_rpl/Multi-primary Switch: applying buffered transactions	YES	YES	progress	0	NULL
+stage/group_rpl/Multi-primary Switch: waiting for operation to complete on all members	YES	YES	progress	0	NULL
+stage/group_rpl/Primary Election: applying buffered transactions	YES	YES	progress	0	NULL
+stage/group_rpl/Primary Election: waiting on current primary transaction execution	YES	YES	progress	0	NULL
+stage/group_rpl/Primary Election: waiting for members to enable super_read_only	YES	YES	progress	0	NULL
+stage/group_rpl/Primary Election: stabilizing transactions from former primaries	YES	YES	progress	0	NULL
+stage/group_rpl/Primary Switch: checking current primary pre-conditions	YES	YES	progress	0	NULL
+stage/group_rpl/Primary Switch: waiting for pending transactions to finish	YES	YES	progress	0	NULL
+stage/group_rpl/Primary Switch: executing Primary election	YES	YES	progress	0	NULL
+stage/group_rpl/Primary Switch: waiting on another member step completion	YES	YES	progress	0	NULL
+stage/group_rpl/Primary Switch: waiting for operation to complete on all members	YES	YES	progress	0	NULL
+stage/group_rpl/Single-primary Switch: checking group pre-conditions	YES	YES	progress	0	NULL
+stage/group_rpl/Single-primary Switch: executing Primary election	YES	YES	progress	0	NULL
+stage/group_rpl/Single-primary Switch: waiting for operation to complete on all members	YES	YES	progress	0	NULL
+stage/group_rpl/Group Replication Module: Executing	YES	YES		0	NULL
+stage/group_rpl/Group Replication Module: Suspending	YES	YES		0	NULL
+stage/group_rpl/Group Replication Recovery: Connecting to donor	YES	YES		0	NULL
+stage/group_rpl/Group Replication Recovery: Transferring state from donor	YES	YES		0	NULL
+stage/group_rpl/Group Replication Cloning process: Preparing	YES	YES	progress	0	NULL
+stage/group_rpl/Group Replication Cloning process: Executing	YES	YES	progress	0	NULL
+
+############################################################
+# 2. Start the GR
+include/start_and_bootstrap_group_replication.inc
+
+############################################################
+# 3. Verify that there are no extra psi keys that were added
+#   after starting the GR
+include/assert.inc ['There should be no extra psi keys added after starting the GR']
+
+############################################################
+# 4. Verify that performance_schema.threads list the usual
+#    threads after member is ONLINE.
+SELECT NAME, TYPE, INSTRUMENTED FROM performance_schema.threads WHERE NAME LIKE '%group_rpl%' ORDER BY NAME;
+NAME	TYPE	INSTRUMENTED
+thread/group_rpl/THD_applier_module_receiver	FOREGROUND	YES
+thread/group_rpl/THD_certifier_broadcast	BACKGROUND	YES
+thread/group_rpl/THD_Gcs_ext_logger_impl::m_consumer	BACKGROUND	YES
+thread/group_rpl/THD_Gcs_xcom_control::m_suspicions_processing_thread	BACKGROUND	YES
+thread/group_rpl/THD_Gcs_xcom_control::m_xcom_thread	BACKGROUND	YES
+thread/group_rpl/THD_Gcs_xcom_engine::m_engine_thread	BACKGROUND	YES
+thread/group_rpl/THD_message_service_handler	BACKGROUND	YES
+thread/group_rpl/THD_mysql_thread	BACKGROUND	YES
+thread/group_rpl/THD_mysql_thread_handler	BACKGROUND	YES
+
+############################################################
+# 5. Test end.
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_random_password.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_random_password.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_random_password.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_random_password.result	2021-09-28 11:46:34.000000000 +0000
@@ -66,8 +66,8 @@
 SET @@SESSION.generated_random_password_length = 30;
 #-- CREATE user usr2 with RANDOM PASSWORD
 CREATE USER usr2@localhost IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr2	localhost	#####
+user	host	generated password	auth_factor
+usr2	localhost	#####	1
 #-- ALTER with RANDOM PASSWORD
 SELECT @@GLOBAL.generated_random_password_length;
 @@GLOBAL.generated_random_password_length
@@ -108,8 +108,8 @@
 SET @@GLOBAL.generated_random_password_length = 15;
 #-- CREATE user usr3 with RANDOM PASSWORD
 CREATE USER usr3@localhost IDENTIFIED BY RANDOM PASSWORD;
-user	host	generated password
-usr3	localhost	#####
+user	host	generated password	auth_factor
+usr3	localhost	#####	1
 #-- SET PASSWORD with RANDOM PASSWORD
 SELECT @@GLOBAL.generated_random_password_length;
 @@GLOBAL.generated_random_password_length
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_recovery_change_master.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_recovery_change_master.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_recovery_change_master.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_recovery_change_master.result	2021-09-28 11:46:34.000000000 +0000
@@ -8,6 +8,7 @@
 SET sql_log_bin=0;
 CREATE USER 'manish'@'%' IDENTIFIED BY 'rpl';
 GRANT REPLICATION SLAVE ON *.* TO 'manish'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'manish'@'%';
 FLUSH PRIVILEGES;
 SET sql_log_bin=1;
 include/start_and_bootstrap_group_replication.inc
@@ -26,6 +27,12 @@
 # Second CHANGE MASTER with valid options will work fine.
 CHANGE REPLICATION SOURCE TO SOURCE_USER='manish', SOURCE_PASSWORD='rpl' FOR CHANNEL 'group_replication_recovery';
 include/assert.inc [A new user is created after the execution of the change master]
+SET sql_log_bin=0;
+CREATE USER 'manish'@'%' IDENTIFIED BY 'rpl';
+GRANT REPLICATION SLAVE ON *.* TO 'manish'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'manish'@'%';
+FLUSH PRIVILEGES;
+SET sql_log_bin=1;
 include/start_group_replication.inc
 # Ensuring the the two members are online.
 include/rpl_gr_wait_for_number_of_members.inc
@@ -35,4 +42,7 @@
 SET sql_log_bin=0;
 DROP USER manish;
 SET sql_log_bin=1;
+SET sql_log_bin=0;
+DROP USER manish;
+SET sql_log_bin=1;
 include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_recovery_conflicting_data_failover.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_recovery_conflicting_data_failover.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_recovery_conflicting_data_failover.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_recovery_conflicting_data_failover.result	2021-09-28 11:46:34.000000000 +0000
@@ -30,6 +30,7 @@
 SET SESSION sql_log_bin= 0;
 CREATE USER "recovery_user" IDENTIFIED BY "recovery_password";
 GRANT REPLICATION SLAVE ON *.* TO "recovery_user";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO "recovery_user"@'%';;
 FLUSH PRIVILEGES;
 SET SESSION sql_log_bin= 1;
 include/start_group_replication.inc
@@ -39,6 +40,11 @@
 # 2) Server 2 has conflicting data
 #
 SET SESSION sql_log_bin= 0;
+CREATE USER "recovery_user" IDENTIFIED BY "recovery_password";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO "recovery_user"@'%';;
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
+SET SESSION sql_log_bin= 0;
 call mtr.add_suppression("There was an error when connecting to the donor*");
 call mtr.add_suppression("For details please check performance_schema.replication_connection_status table and error log messages of Slave I/O for channel group_replication_recovery.");
 call mtr.add_suppression("Slave SQL for channel 'group_replication_recovery': Error 'Table 'lost_test_table'*");
@@ -69,6 +75,7 @@
 SET SESSION sql_log_bin= 0;
 CREATE USER "recovery_user" IDENTIFIED BY "recovery_password";
 GRANT REPLICATION SLAVE ON *.* TO "recovery_user";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO "recovery_user"@'%';;
 FLUSH PRIVILEGES;
 SET SESSION sql_log_bin= 1;
 include/gr_wait_for_member_state.inc
@@ -82,6 +89,9 @@
 include/stop_group_replication.inc
 DROP TABLE lost_test_table;
 RESET MASTER;
+SET SESSION sql_log_bin= 0;
+DROP USER "recovery_user";
+SET SESSION sql_log_bin= 1;
 include/stop_group_replication.inc
 SET SESSION sql_log_bin= 0;
 DROP USER "recovery_user";
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_recovery_donor_failover_mysql.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_recovery_donor_failover_mysql.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_recovery_donor_failover_mysql.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_recovery_donor_failover_mysql.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,43 @@
+include/group_replication.inc [rpl_server_count=3]
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+#
+# Setup a new 2 member group
+#
+include/start_and_bootstrap_group_replication.inc
+include/rpl_gr_wait_for_number_of_members.inc
+CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1);
+include/start_group_replication.inc
+include/rpl_gr_wait_for_number_of_members.inc
+STOP SLAVE SQL_THREAD FOR CHANNEL "group_replication_applier";
+Warnings:
+Warning	1287	'STOP SLAVE' is deprecated and will be removed in a future release. Please use STOP REPLICA instead
+STOP SLAVE SQL_THREAD FOR CHANNEL "group_replication_applier";
+Warnings:
+Warning	1287	'STOP SLAVE' is deprecated and will be removed in a future release. Please use STOP REPLICA instead
+#
+# Start recovery on a new member and kill the donor
+#
+SET SESSION sql_log_bin= 0;
+call mtr.add_suppression(".*Error when configuring the asynchronous recovery channel connection *.*");
+SET SESSION sql_log_bin= 1;
+include/start_group_replication.inc
+# Find if server 1 or 2 is the donor
+# Stop group replication on the donor making it leave the group
+include/stop_group_replication.inc
+# Unblock recovery and watch the member go online despite the donor exit
+START SLAVE SQL_THREAD FOR CHANNEL "group_replication_applier";
+Warnings:
+Warning	1287	'START SLAVE' is deprecated and will be removed in a future release. Please use START REPLICA instead
+include/gr_wait_for_member_state.inc
+include/assert.inc [On the recovered member, the table should exist and have 1 elements;]
+include/assert.inc [On the recovered member, the executed GTID should be the same as on the donor plus the view changes]
+#
+# Cleaning up
+#
+include/start_group_replication.inc
+DROP TABLE t1;
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_recovery_endpoints_invalid_donor.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_recovery_endpoints_invalid_donor.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_recovery_endpoints_invalid_donor.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_recovery_endpoints_invalid_donor.result	2021-09-28 11:46:34.000000000 +0000
@@ -73,6 +73,7 @@
 RESET PERSIST IF EXISTS group_replication_local_address;
 RESET PERSIST IF EXISTS group_replication_group_seeds;
 RESET PERSIST IF EXISTS group_replication_start_on_boot;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 SET GLOBAL group_replication_start_on_boot= START_ON_BOOT_VALUE;
 include/clean_monitoring_process.inc
 UNINSTALL PLUGIN clone;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_recovery_endpoints_ipv6_ipv4.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_recovery_endpoints_ipv6_ipv4.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_recovery_endpoints_ipv6_ipv4.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_recovery_endpoints_ipv6_ipv4.result	2021-09-28 11:46:34.000000000 +0000
@@ -49,6 +49,7 @@
 RESET PERSIST IF EXISTS group_replication_local_address;
 RESET PERSIST IF EXISTS group_replication_group_seeds;
 RESET PERSIST IF EXISTS group_replication_start_on_boot;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 SET GLOBAL group_replication_start_on_boot= START_ON_BOOT_VALUE;
 DROP TABLE t1;
 include/rpl_sync.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_recovery_endpoints_iterate_list_clone.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_recovery_endpoints_iterate_list_clone.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_recovery_endpoints_iterate_list_clone.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_recovery_endpoints_iterate_list_clone.result	2021-09-28 11:46:34.000000000 +0000
@@ -52,6 +52,7 @@
 RESET PERSIST IF EXISTS group_replication_local_address;
 RESET PERSIST IF EXISTS group_replication_group_seeds;
 RESET PERSIST IF EXISTS group_replication_start_on_boot;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 SET GLOBAL group_replication_start_on_boot= START_ON_BOOT_VALUE;
 DROP TABLE t1;
 include/rpl_sync.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_recovery_endpoints_iterate_list_incremental.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_recovery_endpoints_iterate_list_incremental.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_recovery_endpoints_iterate_list_incremental.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_recovery_endpoints_iterate_list_incremental.result	2021-09-28 11:46:34.000000000 +0000
@@ -19,6 +19,7 @@
 SET sql_log_bin = 0;
 CREATE USER 'rpl_user'@'%';
 GRANT REPLICATION SLAVE ON *.* TO 'rpl_user'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'rpl_user'@'%';;
 SET sql_log_bin = 1;
 #
 # 2. Set the first advertised endpoint to the donor admin port and the
@@ -33,6 +34,10 @@
 
 # 4. Change the user of recovery channel for the joiner
 [connection server2]
+SET sql_log_bin = 0;
+CREATE USER 'rpl_user'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'rpl_user'@'%';;
+SET sql_log_bin = 1;
 CHANGE REPLICATION SOURCE TO SOURCE_USER='rpl_user' FOR CHANNEL 'group_replication_recovery';
 Warnings:
 Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
@@ -69,6 +74,7 @@
 Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 SET GLOBAL group_replication_recovery_reconnect_interval= 60;
 SET GLOBAL group_replication_recovery_retry_count= 10;
+DROP USER 'rpl_user'@'%';
 [connection server1]
 DROP USER 'rpl_user'@'%';
 include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_recovery_endpoints_multiple_valid.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_recovery_endpoints_multiple_valid.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_recovery_endpoints_multiple_valid.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_recovery_endpoints_multiple_valid.result	2021-09-28 11:46:34.000000000 +0000
@@ -45,6 +45,7 @@
 RESET PERSIST IF EXISTS group_replication_local_address;
 RESET PERSIST IF EXISTS group_replication_group_seeds;
 RESET PERSIST IF EXISTS group_replication_start_on_boot;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 SET GLOBAL group_replication_start_on_boot= START_ON_BOOT_VALUE;
 DROP TABLE t1;
 include/rpl_sync.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_recovery_endpoints_no_fallback.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_recovery_endpoints_no_fallback.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_recovery_endpoints_no_fallback.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_recovery_endpoints_no_fallback.result	2021-09-28 11:46:34.000000000 +0000
@@ -77,6 +77,7 @@
 RESET PERSIST IF EXISTS group_replication_local_address;
 RESET PERSIST IF EXISTS group_replication_group_seeds;
 RESET PERSIST IF EXISTS group_replication_start_on_boot;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 SET GLOBAL group_replication_start_on_boot= START_ON_BOOT_VALUE;
 include/clean_monitoring_process.inc
 UNINSTALL PLUGIN clone;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_recovery_endpoints_retry_clone.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_recovery_endpoints_retry_clone.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_recovery_endpoints_retry_clone.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_recovery_endpoints_retry_clone.result	2021-09-28 11:46:34.000000000 +0000
@@ -60,6 +60,7 @@
 RESET PERSIST IF EXISTS group_replication_local_address;
 RESET PERSIST IF EXISTS group_replication_group_seeds;
 RESET PERSIST IF EXISTS group_replication_start_on_boot;
+RESET PERSIST group_replication_communication_stack;
 SET GLOBAL group_replication_start_on_boot= START_ON_BOOT_VALUE;
 DROP TABLE t1;
 include/rpl_sync.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_recovery_lower_max_retry_count.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_recovery_lower_max_retry_count.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_recovery_lower_max_retry_count.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_recovery_lower_max_retry_count.result	2021-09-28 11:46:34.000000000 +0000
@@ -7,6 +7,11 @@
 # 1. Bootstrap start a group on M1.
 
 [connection server1]
+SET sql_log_bin=0;
+CREATE USER 'user_with_no_priv_s1'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'user_with_no_priv_s1'@'%';
+FLUSH PRIVILEGES;
+SET sql_log_bin=1;
 include/start_and_bootstrap_group_replication.inc
 
 # 2. Setup environment to fail donor connection and start GR on M2.
@@ -17,7 +22,12 @@
 SET @debug_save= @@GLOBAL.DEBUG;
 SET @recovery_reconnect_interval_save= @@GLOBAL.GROUP_REPLICATION_RECOVERY_RECONNECT_INTERVAL;
 SET @recovery_retry_count_save= @@GLOBAL.group_replication_recovery_retry_count;
-CHANGE REPLICATION SOURCE TO SOURCE_USER="user_does_not_exist" FOR CHANNEL "group_replication_recovery";
+SET sql_log_bin=0;
+CREATE USER 'user_with_no_priv_s1'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'user_with_no_priv_s1'@'%';
+FLUSH PRIVILEGES;
+SET sql_log_bin=1;
+CHANGE REPLICATION SOURCE TO SOURCE_USER="user_with_no_priv_s1" FOR CHANNEL "group_replication_recovery";
 SET SESSION sql_log_bin = 0;
 call mtr.add_suppression("Maximum number of retries when trying to connect to a donor reached. Aborting group replication incremental recovery.");
 call mtr.add_suppression("Fatal error during the incremental recovery process of Group Replication. The server will leave the group.");
@@ -46,4 +56,12 @@
 SET @@GLOBAL.DEBUG= @debug_save;
 SET @@GLOBAL.GROUP_REPLICATION_RECOVERY_RECONNECT_INTERVAL= @recovery_reconnect_interval_save;
 SET @@GLOBAL.group_replication_recovery_retry_count= @recovery_retry_count_save;
+SET sql_log_bin=0;
+SET GLOBAL super_read_only = 0;
+DROP USER user_with_no_priv_s1;
+SET sql_log_bin=1;
+SET sql_log_bin=0;
+SET GLOBAL super_read_only = 0;
+DROP USER user_with_no_priv_s1;
+SET sql_log_bin=1;
 include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_recovery_purged_donor_failover.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_recovery_purged_donor_failover.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_recovery_purged_donor_failover.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_recovery_purged_donor_failover.result	2021-09-28 11:46:34.000000000 +0000
@@ -9,6 +9,11 @@
 include/start_and_bootstrap_group_replication.inc
 CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1);
+SET SESSION sql_log_bin= 0;
+CREATE USER "recovery_user" IDENTIFIED BY "recovery_password";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO "recovery_user"@'%';;
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
 include/start_group_replication.inc
 #
 # Purge member 1 binlog after a flush and create a replication user
@@ -20,6 +25,7 @@
 CALL mtr.add_suppression("Cannot replicate to server with server_uuid*");
 CREATE USER "recovery_user" IDENTIFIED BY "recovery_password";
 GRANT REPLICATION SLAVE ON *.* TO "recovery_user";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO "recovery_user"@'%';;
 FLUSH PRIVILEGES;
 SET SESSION sql_log_bin= 1;
 #
@@ -28,6 +34,9 @@
 # 2) Server 2 does not has the correct replication user
 #
 SET SESSION sql_log_bin= 0;
+CREATE USER "recovery_user" IDENTIFIED BY "recovery_password";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO "recovery_user"@'%';;
+FLUSH PRIVILEGES;
 call mtr.add_suppression("There was an error when connecting to the donor*");
 call mtr.add_suppression("For details please check performance_schema.replication_connection_status table and error log messages of Slave I/O for channel group_replication_recovery.");
 call mtr.add_suppression("Slave I/O for channel 'group_replication_recovery': Got fatal error 1236*");
@@ -48,7 +57,6 @@
 # The joiner should now be able to connect to server 2 when failing over.
 #
 SET SESSION sql_log_bin= 0;
-CREATE USER "recovery_user" IDENTIFIED BY "recovery_password";
 GRANT REPLICATION SLAVE ON *.* TO "recovery_user";
 FLUSH PRIVILEGES;
 SET SESSION sql_log_bin= 1;
@@ -62,6 +70,9 @@
 SET SESSION sql_log_bin= 0;
 DROP USER "recovery_user";
 SET SESSION sql_log_bin= 1;
+SET SESSION sql_log_bin= 0;
+DROP USER "recovery_user";
+SET SESSION sql_log_bin= 1;
 SET SESSION sql_log_bin= 0;
 DROP USER "recovery_user";
 SET SESSION sql_log_bin= 1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_recovery_reconnection_options.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_recovery_reconnection_options.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_recovery_reconnection_options.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_recovery_reconnection_options.result	2021-09-28 11:46:34.000000000 +0000
@@ -21,6 +21,8 @@
 #
 SET SESSION sql_log_bin= 0;
 call mtr.add_suppression("There was an error when connecting to the donor*");
+call mtr.add_suppression("Slave I/O for channel 'group_replication_recovery': Master command COM_REGISTER_SLAVE failed*");
+call mtr.add_suppression("Slave I/O thread couldn't register on master*");
 call mtr.add_suppression("For details please check performance_schema.replication_connection_status table and error log messages of Slave I/O for channel group_replication_recovery.");
 SET SESSION sql_log_bin= 1;
 SET @debug_save_rec_int= @@GLOBAL.group_replication_recovery_reconnect_interval;
@@ -54,6 +56,21 @@
 # Set the recovery user and pass so it can't connect to any of the donors
 # After 10 second it should still be recovering, as the process is sleeping
 #
+SET SESSION sql_log_bin= 0;
+CREATE USER "recovery_user" IDENTIFIED BY "recovery_password";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO "recovery_user"@'%';;
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
+SET SESSION sql_log_bin= 0;
+CREATE USER "recovery_user" IDENTIFIED BY "recovery_password";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO "recovery_user"@'%';;
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
+SET SESSION sql_log_bin= 0;
+CREATE USER "recovery_user" IDENTIFIED BY "recovery_password";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO "recovery_user"@'%';;
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
 CHANGE REPLICATION SOURCE TO SOURCE_USER="recovery_user", SOURCE_PASSWORD="recovery_password" FOR CHANNEL 'group_replication_recovery';
 SET GLOBAL group_replication_group_name= "c827dcd0-2646-11e5-867f-0800200c9a66";;
 START GROUP_REPLICATION;
@@ -63,12 +80,10 @@
 # The joiner should now connect to server 1 or 2 when failing over.
 #
 SET SESSION sql_log_bin= 0;
-CREATE USER "recovery_user" IDENTIFIED BY "recovery_password";
 GRANT REPLICATION SLAVE ON *.* TO "recovery_user";
 FLUSH PRIVILEGES;
 SET SESSION sql_log_bin= 1;
 SET SESSION sql_log_bin= 0;
-CREATE USER "recovery_user" IDENTIFIED BY "recovery_password";
 GRANT REPLICATION SLAVE ON *.* TO "recovery_user";
 FLUSH PRIVILEGES;
 SET SESSION sql_log_bin= 1;
@@ -80,6 +95,9 @@
 #
 SET @@GLOBAL.group_replication_recovery_reconnect_interval= @debug_save_rec_int;
 SET @@GLOBAL.group_replication_recovery_retry_count= @debug_save_retries;
+SET SESSION sql_log_bin= 0;
+DROP USER "recovery_user";
+SET SESSION sql_log_bin= 1;
 DROP TABLE t1;
 SET SESSION sql_log_bin= 0;
 DROP USER "recovery_user";
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_recovery_ssl_and_ssl_mode.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_recovery_ssl_and_ssl_mode.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_recovery_ssl_and_ssl_mode.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_recovery_ssl_and_ssl_mode.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,8 +11,16 @@
 SET SESSION sql_log_bin=0;
 CREATE USER 'rec_ssl_user'@'%' REQUIRE SSL;
 GRANT replication slave ON *.* TO 'rec_ssl_user'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'rec_ssl_user'@'%';
+FLUSH PRIVILEGES;
 SET SESSION sql_log_bin=1;
 [connection server2]
+SET SESSION sql_log_bin=0;
+CREATE USER 'rec_ssl_user'@'%' REQUIRE SSL;
+GRANT replication slave ON *.* TO 'rec_ssl_user'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'rec_ssl_user'@'%';
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin=1;
 CHANGE REPLICATION SOURCE TO SOURCE_USER="rec_ssl_user" FOR CHANNEL "group_replication_recovery";
 
 ############################################################
@@ -55,4 +63,8 @@
 SET SESSION sql_log_bin=0;
 DROP USER 'rec_ssl_user';
 SET SESSION sql_log_bin=1;
+[connection server2]
+SET SESSION sql_log_bin=0;
+DROP USER 'rec_ssl_user';
+SET SESSION sql_log_bin=1;
 include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_recovery_tlsv13_nondefault_ciphersuite.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_recovery_tlsv13_nondefault_ciphersuite.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_recovery_tlsv13_nondefault_ciphersuite.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_recovery_tlsv13_nondefault_ciphersuite.result	2021-09-28 11:46:34.000000000 +0000
@@ -10,11 +10,17 @@
 SET SESSION sql_log_bin=0;
 CREATE USER 'rec_ssl_user'@'%' REQUIRE SSL;
 GRANT replication slave ON *.* TO 'rec_ssl_user'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'rec_ssl_user'@'%';
+FLUSH PRIVILEGES;
 SET SESSION sql_log_bin=1;
 SET @tls_version_saved= @@GLOBAL.tls_version;
 SET GLOBAL tls_version='TLSv1.3';
 SET @tls_ciphersuites_saved= @@GLOBAL.tls_ciphersuites;
 SET GLOBAL tls_ciphersuites='TLS_AES_128_CCM_8_SHA256';
+SET @group_replication_recovery_tls_ciphersuites_saved= @@GLOBAL.group_replication_recovery_tls_ciphersuites;
+SET GLOBAL group_replication_recovery_tls_ciphersuites='TLS_AES_128_CCM_8_SHA256';
+SET @conf_rec_ssl_mode= @@GLOBAL.group_replication_ssl_mode;
+SET GLOBAL group_replication_ssl_mode= REQUIRED;
 ALTER INSTANCE RELOAD TLS;
 #
 # Add some data and start the member
@@ -26,10 +32,18 @@
 # Configure a joining member to use SSL options on recovery and start it
 #
 [connection server2]
+SET SESSION sql_log_bin=0;
+CREATE USER 'rec_ssl_user'@'%' REQUIRE SSL;
+GRANT replication slave ON *.* TO 'rec_ssl_user'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'rec_ssl_user'@'%';
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin=1;
 SET @tls_version_saved= @@GLOBAL.tls_version;
 SET GLOBAL tls_version='TLSv1.3';
 SET @tls_ciphersuites_saved= @@GLOBAL.tls_ciphersuites;
 SET GLOBAL tls_ciphersuites='TLS_AES_128_CCM_8_SHA256';
+SET @conf_rec_ssl_mode= @@GLOBAL.group_replication_ssl_mode;
+SET GLOBAL group_replication_ssl_mode= REQUIRED;
 ALTER INSTANCE RELOAD TLS;
 CHANGE REPLICATION SOURCE TO SOURCE_USER="rec_ssl_user" FOR CHANNEL "group_replication_recovery";
 SET @group_replication_recovery_use_ssl_saved= @@GLOBAL.group_replication_recovery_use_ssl;
@@ -56,6 +70,12 @@
 [connection server1]
 SET @@GLOBAL.tls_version= @tls_version_saved;
 SET @@GLOBAL.tls_ciphersuites= @tls_ciphersuites_saved;
+SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= @group_replication_recovery_tls_ciphersuites_saved;
+SET @@GLOBAL.group_replication_ssl_mode= @conf_rec_ssl_mode;
+ALTER INSTANCE RELOAD TLS;
+Warnings:
+Warning	4038	A deprecated TLS version TLSv1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+Warning	4038	A deprecated TLS version TLSv1.1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
 ALTER INSTANCE RELOAD TLS;
 Warnings:
 Warning	4038	A deprecated TLS version TLSv1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
@@ -64,4 +84,13 @@
 DROP USER 'rec_ssl_user';
 SET SESSION sql_log_bin=1;
 DROP TABLE t1;
+[connection server2]
+SET SESSION sql_log_bin=0;
+DROP USER 'rec_ssl_user';
+SET SESSION sql_log_bin=1;
+SET @@GLOBAL.group_replication_ssl_mode= @conf_rec_ssl_mode;
+ALTER INSTANCE RELOAD TLS;
+Warnings:
+Warning	4038	A deprecated TLS version TLSv1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+Warning	4038	A deprecated TLS version TLSv1.1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
 include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_recovery_tlsv13.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_recovery_tlsv13.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_recovery_tlsv13.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_recovery_tlsv13.result	2021-09-28 11:46:34.000000000 +0000
@@ -10,9 +10,13 @@
 SET SESSION sql_log_bin=0;
 CREATE USER 'rec_ssl_user'@'%' REQUIRE SSL;
 GRANT replication slave ON *.* TO 'rec_ssl_user'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'rec_ssl_user'@'%';
+FLUSH PRIVILEGES;
 SET SESSION sql_log_bin=1;
 SET @tls_version_saved= @@GLOBAL.tls_version;
 SET GLOBAL tls_version='TLSv1.3';
+SET @conf_rec_ssl_mode= @@GLOBAL.group_replication_ssl_mode;
+SET GLOBAL group_replication_ssl_mode= REQUIRED;
 ALTER INSTANCE RELOAD TLS;
 #
 # Add some data and start the member
@@ -24,9 +28,17 @@
 # Configure a joining member to use SSL options on recovery and start it
 #
 [connection server2]
+SET SESSION sql_log_bin=0;
+CREATE USER 'rec_ssl_user'@'%' REQUIRE SSL;
+GRANT replication slave ON *.* TO 'rec_ssl_user'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'rec_ssl_user'@'%';
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin=1;
 CHANGE REPLICATION SOURCE TO SOURCE_USER="rec_ssl_user" FOR CHANNEL "group_replication_recovery";
 SET @group_replication_recovery_use_ssl_saved= @@GLOBAL.group_replication_recovery_use_ssl;
 SET GLOBAL group_replication_recovery_use_ssl=1;
+SET @conf_rec_ssl_mode= @@GLOBAL.group_replication_ssl_mode;
+SET GLOBAL group_replication_ssl_mode= REQUIRED;
 include/start_group_replication.inc
 #
 # Check the data is there
@@ -38,6 +50,7 @@
 SET @@GLOBAL.group_replication_recovery_use_ssl= @group_replication_recovery_use_ssl_saved;
 [connection server1]
 SET @@GLOBAL.tls_version= @tls_version_saved;
+SET @@GLOBAL.group_replication_ssl_mode= @conf_rec_ssl_mode;
 ALTER INSTANCE RELOAD TLS;
 Warnings:
 Warning	4038	A deprecated TLS version TLSv1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
@@ -46,4 +59,13 @@
 DROP USER 'rec_ssl_user';
 SET SESSION sql_log_bin=1;
 DROP TABLE t1;
+[connection server2]
+SET SESSION sql_log_bin=0;
+DROP USER 'rec_ssl_user';
+SET SESSION sql_log_bin=1;
+SET @@GLOBAL.group_replication_ssl_mode= @conf_rec_ssl_mode;
+ALTER INSTANCE RELOAD TLS;
+Warnings:
+Warning	4038	A deprecated TLS version TLSv1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+Warning	4038	A deprecated TLS version TLSv1.1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
 include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_relay_log_name_change.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_relay_log_name_change.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_relay_log_name_change.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_relay_log_name_change.result	2021-09-28 11:46:34.000000000 +0000
@@ -1,18 +1,3 @@
-SET SESSION sql_log_bin=0;
-call mtr.add_suppression("Failed to open the relay log");
-call mtr.add_suppression("Could not find target log file mentioned in relay log info in the index file");
-call mtr.add_suppression("Failed to initialize the master info structure for channel");
-call mtr.add_suppression("Failed to create or recover replication info repositories");
-call mtr.add_suppression("Failed to setup the group replication applier thread");
-call mtr.add_suppression("Unable to initialize the Group Replication applier module");
-call mtr.add_suppression("Leaving a group without being on one");
-call mtr.add_suppression("Error checking relay log repository.");
-call mtr.add_suppression("Slave failed to initialize relay log info structure from the repository");
-call mtr.add_suppression("Error while starting the group replication applier thread");
-call mtr.add_suppression("It was not possible to identify the group replication applier thread");
-call mtr.add_suppression("It was not possible to reset the server read mode settings. Try to reset them manually.");
-call mtr.add_suppression("Error running internal SQL query:*");
-SET SESSION sql_log_bin=1;
 include/start_and_bootstrap_group_replication.inc
 
 ##############################################
@@ -24,13 +9,8 @@
 # 2: Restart the server changing the relay-log option
 # restart:--group-replication-start-on-boot=ON --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_bootstrap_group=ON --relay-log=new-relay-log-name
 include/gr_wait_for_member_state.inc
-RESET SLAVE FOR CHANNEL 'group_replication_applier';
-Warnings:
-Warning	1287	'RESET SLAVE' is deprecated and will be removed in a future release. Please use RESET REPLICA instead
 
 #######################################################
-# 3: Restart the server again after removing the broken
-#    group_replication_applier channel
-# restart:--group-replication-start-on-boot=ON --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_bootstrap_group=ON --relay-log=new-relay-log-name --relay-log=new-relay-log-name
-include/gr_wait_for_member_state.inc
-include/stop_group_replication.inc
+# 3: Cleanup
+# restart:--group-replication-start-on-boot=ON --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_bootstrap_group=ON --relay-log=new-relay-log-name --relay-log=server-relay-log --group_replication_start_on_boot=OFF
+include/rpl_connect.inc [creating server_1]
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_replicate_group_to_group_mysql.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_replicate_group_to_group_mysql.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_replicate_group_to_group_mysql.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_replicate_group_to_group_mysql.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,154 @@
+include/group_replication.inc [rpl_server_count=6]
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+#################################################################
+#  1. Setup Group Replication on M1 and M2 and create group GR1.
+SET @@GLOBAL.group_replication_group_seeds= "";
+include/start_and_bootstrap_group_replication.inc
+SET @@GLOBAL.group_replication_group_seeds= "GROUP_REPLICATION_GROUP_SEEDS";
+include/start_group_replication.inc
+include/rpl_gr_wait_for_number_of_members.inc
+
+#################################################################
+#  2. Setup Group Replication on M1 and M2 and create group GR2.
+SET @@GLOBAL.group_replication_group_seeds= "";
+include/start_and_bootstrap_group_replication.inc
+SET @@GLOBAL.group_replication_group_seeds= "GROUP_REPLICATION_GROUP_SEEDS";
+include/start_group_replication.inc
+include/rpl_gr_wait_for_number_of_members.inc
+
+###############################################################
+#  3. Setup a asynchronous replication connection from M3 (GR2)
+#     to M1 (GR1).
+CHANGE REPLICATION SOURCE TO SOURCE_HOST="127.0.0.1", SOURCE_USER="root", SOURCE_PASSWORD="", SOURCE_PORT=SERVER_3_PORT, SOURCE_AUTO_POSITION=1;
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+include/start_slave.inc
+
+###############################################################
+#  4. Setup a asynchronous replication connection from M1 (GR1)
+#     to M3 (GR2).
+CHANGE REPLICATION SOURCE TO SOURCE_HOST="127.0.0.1", SOURCE_USER="root", SOURCE_PASSWORD="", SOURCE_PORT=SERVER_1_PORT, SOURCE_AUTO_POSITION=1;
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+include/start_slave.inc
+
+###############################################################
+#  5. Test view change issue by adding/dropping nodes from the
+#     groups (just to generate more VIEW_EVENTs).
+# 5.1. Add a node M5 to group (GR1).
+SET @@GLOBAL.group_replication_group_seeds= "GROUP_REPLICATION_GROUP_SEEDS";
+include/start_group_replication.inc
+include/rpl_gr_wait_for_number_of_members.inc
+
+################################################################
+# 5.2. Add and immediately drop a node M6 to group (GR2).
+SET @@GLOBAL.group_replication_group_seeds= "GROUP_REPLICATION_GROUP_SEEDS";
+include/start_group_replication.inc
+include/rpl_gr_wait_for_number_of_members.inc
+include/stop_group_replication.inc
+
+############################################################
+#  6. Execute some transactions on M3 (GR2).
+CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (0);
+INSERT INTO t1 VALUES (1);
+UPDATE t1 SET c1=2 WHERE c1=0;
+DELETE FROM t1 WHERE c1=1;
+
+############################################################
+#  7. Wait until transactions executed on M3 are applied
+#     on all nodes in both groups.
+include/sync_slave_sql_with_master.inc
+include/sync_slave_sql_with_master.inc
+include/sync_slave_sql_with_master.inc
+include/sync_slave_sql_with_master.inc
+
+############################################################
+#  8. Execute some transactions on M1 (GR1).
+CREATE TABLE t2 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (0);
+INSERT INTO t2 VALUES (1);
+UPDATE t2 SET c1=2 WHERE c1=0;
+DELETE FROM t2 WHERE c1=1;
+
+############################################################
+#  9. Wait until transactions executed on M1 are applied
+#     on all nodes in both groups.
+include/sync_slave_sql_with_master.inc
+include/sync_slave_sql_with_master.inc
+include/sync_slave_sql_with_master.inc
+include/sync_slave_sql_with_master.inc
+
+#########################################################################
+# 10. Validate data on all nodes (M1, M2, M3, M4 and M5)
+include/diff_tables.inc [server_1:t1, server_2:t1, server_3:t1, server_4:t1, server_5:t1]
+include/diff_tables.inc [server_1:t2, server_2:t2, server_3:t2, server_4:t2, server_5:t2]
+
+#########################################################################
+# 11. Check that GTID_EXECUTED on all servers are as expected.
+SET SESSION sql_log_bin= 0;
+include/gtid_utils.inc
+SET SESSION sql_log_bin= 1;
+include/assert.inc [Check that GTID_EXECUTED set on all servers are as expected.]
+SET SESSION sql_log_bin= 0;
+include/gtid_utils_end.inc
+SET SESSION sql_log_bin= 1;
+SET SESSION sql_log_bin= 0;
+include/gtid_utils.inc
+SET SESSION sql_log_bin= 1;
+include/assert.inc [Check that GTID_EXECUTED set on all servers are as expected.]
+SET SESSION sql_log_bin= 0;
+include/gtid_utils_end.inc
+SET SESSION sql_log_bin= 1;
+SET SESSION sql_log_bin= 0;
+include/gtid_utils.inc
+SET SESSION sql_log_bin= 1;
+include/assert.inc [Check that GTID_EXECUTED set on all servers are as expected.]
+SET SESSION sql_log_bin= 0;
+include/gtid_utils_end.inc
+SET SESSION sql_log_bin= 1;
+SET SESSION sql_log_bin= 0;
+include/gtid_utils.inc
+SET SESSION sql_log_bin= 1;
+include/assert.inc [Check that GTID_EXECUTED set on all servers are as expected.]
+SET SESSION sql_log_bin= 0;
+include/gtid_utils_end.inc
+SET SESSION sql_log_bin= 1;
+SET SESSION sql_log_bin= 0;
+include/gtid_utils.inc
+SET SESSION sql_log_bin= 1;
+include/assert.inc [Check that GTID_EXECUTED set on all servers are as expected.]
+SET SESSION sql_log_bin= 0;
+include/gtid_utils_end.inc
+SET SESSION sql_log_bin= 1;
+
+############################################################
+#  12. Clean data.
+DROP TABLE t1;
+DROP TABLE t2;
+include/sync_slave_sql_with_master.inc
+include/sync_slave_sql_with_master.inc
+include/sync_slave_sql_with_master.inc
+include/sync_slave_sql_with_master.inc
+
+##############################################################
+# 13. Stop asynchronous replication between M3->M1 and M1->M3.
+include/stop_slave.inc
+CHANGE REPLICATION SOURCE TO SOURCE_AUTO_POSITION=0 FOR CHANNEL "";
+include/stop_slave.inc
+CHANGE REPLICATION SOURCE TO SOURCE_AUTO_POSITION=0 FOR CHANNEL "";
+
+############################################################
+# 14. Stop Group Replication on all 5 nodes.
+include/stop_group_replication.inc
+include/stop_group_replication.inc
+include/stop_group_replication.inc
+include/stop_group_replication.inc
+include/stop_group_replication.inc
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_replicate_local_anonymous_server_to_group_error_cases.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_replicate_local_anonymous_server_to_group_error_cases.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_replicate_local_anonymous_server_to_group_error_cases.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_replicate_local_anonymous_server_to_group_error_cases.result	2021-09-28 11:46:34.000000000 +0000
@@ -107,6 +107,8 @@
 CALL mtr.add_suppression("Replication channel '' is configured with ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS");
 CALL mtr.add_suppression("The group_replication_group_name .*. is the same as");
 SET session sql_log_bin=1;
+# restart:--group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_ROUP_SEEDS --group_replication_bootstrap_group=1 --group_replication_start_on_boot=OFF
+include/rpl_reconnect.inc
 [connection server2]
 include/stop_group_replication.inc
 include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_replicate_local_anonymous_server_to_group.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_replicate_local_anonymous_server_to_group.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_replicate_local_anonymous_server_to_group.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_replicate_local_anonymous_server_to_group.result	2021-09-28 11:46:34.000000000 +0000
@@ -77,6 +77,8 @@
 SET session sql_log_bin=0;
 CALL mtr.add_suppression("Using ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS implies limitations on the replication topology");
 SET session sql_log_bin=1;
+# restart:--group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_bootstrap_group=1 --group_replication_start_on_boot=OFF
+include/rpl_reconnect.inc
 [connection server2]
 include/stop_group_replication.inc
 include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_replicate_uuid_anonymous_server_to_group_error_cases.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_replicate_uuid_anonymous_server_to_group_error_cases.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_replicate_uuid_anonymous_server_to_group_error_cases.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_replicate_uuid_anonymous_server_to_group_error_cases.result	2021-09-28 11:46:34.000000000 +0000
@@ -107,6 +107,8 @@
 CALL mtr.add_suppression("Replication channel '' is configured with ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS");
 CALL mtr.add_suppression("The group_replication_group_name .*. is the same as");
 SET session sql_log_bin=1;
+# restart:--group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_ROUP_SEEDS --group_replication_bootstrap_group=1 --group_replication_start_on_boot=OFF
+include/rpl_reconnect.inc
 [connection server2]
 include/stop_group_replication.inc
 include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_replicate_uuid_anonymous_server_to_group.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_replicate_uuid_anonymous_server_to_group.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_replicate_uuid_anonymous_server_to_group.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_replicate_uuid_anonymous_server_to_group.result	2021-09-28 11:46:34.000000000 +0000
@@ -77,6 +77,8 @@
 SET session sql_log_bin=0;
 CALL mtr.add_suppression("Using ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS implies limitations on the replication topology");
 SET session sql_log_bin=1;
+# restart:--group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_bootstrap_group=1 --group_replication_start_on_boot=OFF
+include/rpl_reconnect.inc
 [connection server2]
 include/stop_group_replication.inc
 include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_server_failover_while_dml.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_server_failover_while_dml.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_server_failover_while_dml.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_server_failover_while_dml.result	2021-09-28 11:46:34.000000000 +0000
@@ -39,6 +39,8 @@
 include/start_group_replication.inc
 include/rpl_sync.inc
 include/diff_tables.inc [server_1:t1, server2:t1, server3:t1]
+[connection server_3]
+[connection server_1]
 drop table t1;
 drop procedure dml_operations;
 include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_show_global_and_session_variables.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_show_global_and_session_variables.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_show_global_and_session_variables.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_show_global_and_session_variables.result	2021-09-28 11:46:34.000000000 +0000
@@ -7,8 +7,8 @@
 include/start_and_bootstrap_group_replication.inc
 include/stop_group_replication.inc
 
-# Test#1: Basic check that there are 59 GR variables.
-include/assert.inc [There are 59 GR variables at present.]
+# Test#1: Basic check that there are 61 GR variables.
+include/assert.inc [There are 61 GR variables at present.]
 
 # Test#2: Verify group replication related variables at GLOBAL scope.
 SET @@SESSION.group_replication_allow_local_lower_version_join= 1;
@@ -97,6 +97,8 @@
 ERROR HY000: Variable 'group_replication_recovery_tls_ciphersuites' is a GLOBAL variable and should be set with SET GLOBAL
 SET @@SESSION.group_replication_view_change_uuid= "AUTOMATIC";
 ERROR HY000: Variable 'group_replication_view_change_uuid' is a GLOBAL variable and should be set with SET GLOBAL
+SET @@SESSION.group_replication_paxos_single_leader= 1;
+ERROR HY000: Variable 'group_replication_paxos_single_leader' is a GLOBAL variable and should be set with SET GLOBAL
 
 # Test#3: Verify group replication related variables at SESSION scope.
 SET @@SESSION.group_replication_consistency= "EVENTUAL";
@@ -104,6 +106,8 @@
 
 # Test#4: Verify GLOBAL and SESSION variables
 include/start_group_replication.inc
+SET GLOBAL group_replication_recovery_ssl_crl= 'crl-client-revoked.crl';
+SET GLOBAL group_replication_recovery_tls_ciphersuites= "";
 include/assert.inc [Verify GLOBAL value of group_replication_allow_local_lower_version_join]
 include/assert.inc [Verify GLOBAL value of group_replication_allow_local_lower_version_join]
 include/assert.inc [Verify SESSION value of group_replication_allow_local_lower_version_join]
@@ -277,6 +281,10 @@
 include/assert.inc [Verify SESSION value of group_replication_recovery_tls_ciphersuites]
 include/assert.inc [Verify SESSION value of group_replication_recovery_tls_ciphersuites]
 include/assert.inc [Verify SESSION value of group_replication_view_change_uuid]
+include/assert.inc [Verify GLOBAL value of group_replication_paxos_single_leader]
+include/assert.inc [Verify GLOBAL value of group_replication_paxos_single_leader]
+include/assert.inc [Verify SESSION value of group_replication_paxos_single_leader]
+include/assert.inc [Verify SESSION value of group_replication_paxos_single_leader]
 
 # Clean up
 include/stop_group_replication.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_single_primary_async_gr_start_on_boot.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_single_primary_async_gr_start_on_boot.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_single_primary_async_gr_start_on_boot.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_single_primary_async_gr_start_on_boot.result	2021-09-28 11:46:34.000000000 +0000
@@ -82,8 +82,8 @@
 include/assert.inc [Verify channel ch3_2 SQL_THREAD is OFF]
 
 # 17. Verify occurrence of error message
-Occurrences of 'Can't start slave IO THREAD of channel 'ch3_2' when group replication is running with single-primary mode on a secondary member.' in the input file: 3
-Occurrences of 'Can't start slave SQL THREAD of channel 'ch3_2' when group replication is running with single-primary mode on a secondary member.' in the input file: 3
+Occurrences of 'Can't start slave IO THREAD of channel 'ch3_2' when group replication is running with single-primary mode on a secondary member.' in the input file: 2
+Occurrences of 'Can't start slave SQL THREAD of channel 'ch3_2' when group replication is running with single-primary mode on a secondary member.' in the input file: 2
 
 # 18. Cleanup
 [connection server1]
@@ -98,4 +98,9 @@
 RESET SLAVE ALL FOR CHANNEL '';
 Warnings:
 Warning	1287	'RESET SLAVE' is deprecated and will be removed in a future release. Please use RESET REPLICA instead
+# restart:--group-replication-start-on-boot=OFF --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS
+include/rpl_reconnect.inc
+[connection server1]
+# restart:--group-replication-start-on-boot=OFF --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS
+include/rpl_reconnect.inc
 include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_single_primary_mixed_configuration.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_single_primary_mixed_configuration.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_single_primary_mixed_configuration.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_single_primary_mixed_configuration.result	2021-09-28 11:46:34.000000000 +0000
@@ -20,6 +20,7 @@
 call mtr.add_suppression("The member configuration is not compatible with the group configuration. .* .member configuration option: \\[group_replication_enforce_update_everywhere_checks\\], group configuration option: \\[\\].");
 call mtr.add_suppression("The member configuration is not compatible with the group configuration. .* .member configuration option: \\[group_replication_single_primary_mode\\], group configuration option: \\[\\].");
 call mtr.add_suppression("This member joined a group on which all members do not support member actions, as such it did reset its member configuration to the default one.");
+call mtr.add_suppression("This member joined a group on which all members do not support replication failover channels integration on Group Replication, as such it did reset its replication failover channels configuration to the default one.");
 SET SQL_LOG_BIN=1;
 SET GLOBAL group_replication_enforce_update_everywhere_checks= 0;
 SET GLOBAL group_replication_single_primary_mode= 0;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_singlewriter_enabled_on_mode_switch.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_singlewriter_enabled_on_mode_switch.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_singlewriter_enabled_on_mode_switch.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_singlewriter_enabled_on_mode_switch.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,154 @@
+
+####
+# 0) The test requires three servers.
+####
+
+include/group_replication.inc [rpl_server_count=3]
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("A member is joining the group while a group configuration operation is occurring*");
+SET SESSION sql_log_bin = 1;
+[connection server2]
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("A member is joining the group while a group configuration operation is occurring*");
+SET SESSION sql_log_bin = 1;
+[connection server3]
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("A member is joining the group while a group configuration operation is occurring*");
+SET SESSION sql_log_bin = 1;
+
+####
+# 1) Switch to SPM on every member. For each member that was elected as
+# primary in SPM, the WRITE_CONSENSUS_LEADERS_MEMBER_ID_PREFERRED and
+# WRITE_CONSENSUS_LEADERS_MEMBER_ID_ACTIVE fields of the
+# performance_schema.replication_group_communication_information PFS
+# table should contain *only* the UUID of that member.
+####
+
+[connection server1]
+SELECT group_replication_switch_to_single_primary_mode("MEMBER1_UUID");
+group_replication_switch_to_single_primary_mode("MEMBER1_UUID")
+Mode switched to single-primary successfully.
+include/assert.inc [The first server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_PREFERRED]
+include/assert.inc [The first server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_ACTUAL]
+[connection server2]
+include/assert.inc [The first server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_PREFERRED]
+include/assert.inc [The first server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_ACTUAL]
+[connection server3]
+include/assert.inc [The first server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_PREFERRED]
+include/assert.inc [The first server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_ACTUAL]
+[connection server3]
+include/stop_group_replication.inc
+[connection server2]
+include/stop_group_replication.inc
+[connection server1]
+include/stop_group_replication.inc
+[connection server1]
+include/start_and_bootstrap_group_replication.inc
+[connection server2]
+include/start_group_replication.inc
+[connection server3]
+include/start_group_replication.inc
+[connection server2]
+SELECT group_replication_switch_to_multi_primary_mode();
+group_replication_switch_to_multi_primary_mode()
+Mode switched to multi-primary successfully.
+SELECT group_replication_switch_to_single_primary_mode("MEMBER2_UUID");
+group_replication_switch_to_single_primary_mode("MEMBER2_UUID")
+Mode switched to single-primary successfully.
+include/assert.inc [The second server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_PREFERRED]
+include/assert.inc [The second server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_ACTUAL]
+[connection server1]
+include/assert.inc [The second server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_PREFERRED]
+include/assert.inc [The second server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_ACTUAL]
+[connection server3]
+include/assert.inc [The second server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_PREFERRED]
+include/assert.inc [The second server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_ACTUAL]
+[connection server3]
+SELECT group_replication_switch_to_multi_primary_mode();
+group_replication_switch_to_multi_primary_mode()
+Mode switched to multi-primary successfully.
+SELECT group_replication_switch_to_single_primary_mode("MEMBER3_UUID");
+group_replication_switch_to_single_primary_mode("MEMBER3_UUID")
+Mode switched to single-primary successfully.
+include/assert.inc [The third server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_PREFERRED]
+include/assert.inc [The third server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_ACTUAL]
+[connection server1]
+include/assert.inc [The third server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_PREFERRED]
+include/assert.inc [The third server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_ACTUAL]
+[connection server2]
+include/assert.inc [The third server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_PREFERRED]
+include/assert.inc [The third server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_ACTUAL]
+
+####
+# 2) Change the communication protocol to 8.0.21.
+####
+
+SELECT group_replication_set_communication_protocol("8.0.21");
+group_replication_set_communication_protocol("8.0.21")
+The operation group_replication_set_communication_protocol completed successfully
+
+####
+# 3) Switch to SPM on every member. For each member that was elected as
+# primary in SPM the WRITE_CONSENSUS_LEADERS_MEMBER_ID_PREFERRED and
+# WRITE_CONSENSUS_LEADERS_MEMBER_ID_ACTIVE fields of the
+# performance_schema.replication_group_communication_information PFS
+# table should contain the UUIDs of *all* the members in the group.
+####
+
+[connection server1]
+SELECT group_replication_switch_to_multi_primary_mode();
+group_replication_switch_to_multi_primary_mode()
+Mode switched to multi-primary successfully.
+SELECT group_replication_switch_to_single_primary_mode("MEMBER1_UUID");
+group_replication_switch_to_single_primary_mode("MEMBER1_UUID")
+Mode switched to single-primary successfully.
+include/assert.inc [All members should be in WRITE_CONSENSUS_LEADERS_PREFERRED]
+include/assert.inc [All members should be in WRITE_CONSENSUS_LEADERS_ACTUAL]
+[connection server2]
+include/assert.inc [All members should be in WRITE_CONSENSUS_LEADERS_PREFERRED]
+include/assert.inc [All members should be in WRITE_CONSENSUS_LEADERS_ACTUAL]
+[connection server3]
+include/assert.inc [All members should be in WRITE_CONSENSUS_LEADERS_PREFERRED]
+include/assert.inc [All members should be in WRITE_CONSENSUS_LEADERS_ACTUAL]
+[connection server2]
+SELECT group_replication_switch_to_multi_primary_mode();
+group_replication_switch_to_multi_primary_mode()
+Mode switched to multi-primary successfully.
+SELECT group_replication_switch_to_single_primary_mode("MEMBER2_UUID");
+group_replication_switch_to_single_primary_mode("MEMBER2_UUID")
+Mode switched to single-primary successfully.
+include/assert.inc [All members should be in WRITE_CONSENSUS_LEADERS_PREFERRED]
+include/assert.inc [All members should be in WRITE_CONSENSUS_LEADERS_ACTUAL]
+[connection server1]
+include/assert.inc [All members should be in WRITE_CONSENSUS_LEADERS_PREFERRED]
+include/assert.inc [All members should be in WRITE_CONSENSUS_LEADERS_ACTUAL]
+[connection server3]
+include/assert.inc [All members should be in WRITE_CONSENSUS_LEADERS_PREFERRED]
+include/assert.inc [All members should be in WRITE_CONSENSUS_LEADERS_ACTUAL]
+[connection server3]
+SELECT group_replication_switch_to_multi_primary_mode();
+group_replication_switch_to_multi_primary_mode()
+Mode switched to multi-primary successfully.
+SELECT group_replication_switch_to_single_primary_mode("MEMBER3_UUID");
+group_replication_switch_to_single_primary_mode("MEMBER3_UUID")
+Mode switched to single-primary successfully.
+include/assert.inc [All members should be in WRITE_CONSENSUS_LEADERS_PREFERRED]
+include/assert.inc [All members should be in WRITE_CONSENSUS_LEADERS_ACTUAL]
+[connection server1]
+include/assert.inc [All members should be in WRITE_CONSENSUS_LEADERS_PREFERRED]
+include/assert.inc [All members should be in WRITE_CONSENSUS_LEADERS_ACTUAL]
+[connection server2]
+include/assert.inc [All members should be in WRITE_CONSENSUS_LEADERS_PREFERRED]
+include/assert.inc [All members should be in WRITE_CONSENSUS_LEADERS_ACTUAL]
+
+####
+# 4) Cleanup.
+####
+
+[connection server1]
+include/stop_group_replication.inc
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_singlewriter_option.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_singlewriter_option.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_singlewriter_option.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_singlewriter_option.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,135 @@
+include/group_replication.inc [rpl_server_count=3]
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+[connection server3]
+SET sql_log_bin = 0;
+call mtr.add_suppression("This member is configured with a group_replication_paxos_single_leader option value of*");
+SET sql_log_bin = 1;
+
+####
+# 0) Verify that the default value of
+# group_replication_paxos_single_leader is true
+####
+
+[connection server1]
+SET @@GLOBAL.group_replication_paxos_single_leader = default;
+include/assert.inc [The default of group_replication_paxos_single_leader should be 0]
+
+####
+# 1) The test requires three servers.
+####
+
+SET @@GLOBAL.group_replication_paxos_single_leader = 1;
+include/start_and_bootstrap_group_replication.inc
+[connection server2]
+include/start_group_replication.inc
+[connection server3]
+include/start_group_replication.inc
+
+####
+# 2) Verify that the UUID present in
+# WRITE_CONSENSUS_LEADERS_MEMBER_ID_PREFERRED and in
+# WRITE_CONSENSUS_LEADERS_MEMBER_ID_ACTIVE is the UUID of the primary
+####
+
+[connection server1]
+include/assert.inc [The first server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_PREFERRED]
+include/assert.inc [The first server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_ACTUAL]
+[connection server2]
+include/assert.inc [The first server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_PREFERRED]
+include/assert.inc [The first server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_ACTUAL]
+[connection server3]
+include/assert.inc [The first server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_PREFERRED]
+include/assert.inc [The first server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_ACTUAL]
+
+####
+# 3) Change the value of group_replication_paxos_single_leader to false
+####
+
+[connection server1]
+SET GLOBAL group_replication_paxos_single_leader = 0;
+
+####
+# 4) Verify that the value of the new sysvar is false
+####
+
+include/assert.inc [The value of group_replication_paxos_single_leader should be 0]
+
+####
+# 5) The group should still be using single-leader
+####
+
+include/assert.inc [The first server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_PREFERRED]
+include/assert.inc [The first server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_ACTUAL]
+[connection server2]
+include/assert.inc [The first server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_PREFERRED]
+include/assert.inc [The first server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_ACTUAL]
+[connection server3]
+include/assert.inc [The first server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_PREFERRED]
+include/assert.inc [The first server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_ACTUAL]
+
+####
+# 6) Reboot the plugin (add only 2 of the members)
+####
+
+[connection server3]
+include/stop_group_replication.inc
+[connection server2]
+include/stop_group_replication.inc
+[connection server1]
+include/stop_group_replication.inc
+include/start_and_bootstrap_group_replication.inc
+[connection server2]
+SET GLOBAL group_replication_paxos_single_leader = 0;
+include/start_group_replication.inc
+
+####
+# 7) Verify that the UUIDs contained in
+# WRITE_CONSENSUS_LEADERS_MEMBER_ID_PREFERRED and in
+# WRITE_CONSENSUS_LEADERS_MEMBER_ID_ACTIVE contain all the UUIDs of all
+# the members in the group
+####
+
+[connection server1]
+include/assert.inc [All members should be in WRITE_CONSENSUS_LEADERS_PREFERRED]
+include/assert.inc [All members should be in WRITE_CONSENSUS_LEADERS_ACTUAL]
+[connection server2]
+include/assert.inc [All members should be in WRITE_CONSENSUS_LEADERS_PREFERRED]
+include/assert.inc [All members should be in WRITE_CONSENSUS_LEADERS_ACTUAL]
+
+####
+# 8) Change the sysvar value on the third member to true
+####
+
+[connection server3]
+SET GLOBAL group_replication_paxos_single_leader = 1;
+
+####
+# 9) Try to add the third member
+####
+
+START GROUP_REPLICATION;
+ERROR HY000: The server is not configured properly to be an active member of the group. Please see more details on error log.
+[connection server1]
+include/assert.inc [All members should be in WRITE_CONSENSUS_LEADERS_PREFERRED]
+include/assert.inc [All members should be in WRITE_CONSENSUS_LEADERS_ACTUAL]
+include/assert.inc [Member 3 should not have been added to the group]
+[connection server2]
+include/assert.inc [All members should be in WRITE_CONSENSUS_LEADERS_PREFERRED]
+include/assert.inc [All members should be in WRITE_CONSENSUS_LEADERS_ACTUAL]
+include/assert.inc [Member 3 should not have been added to the group]
+
+####
+# 10) Cleanup.
+####
+
+[connection server1]
+SET GLOBAL group_replication_paxos_single_leader = 1;
+[connection server2]
+SET GLOBAL group_replication_paxos_single_leader = 1;
+[connection server3]
+SET GLOBAL group_replication_paxos_single_leader = 1;
+[connection server1]
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_skip_wait_for_view_modification.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_skip_wait_for_view_modification.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_skip_wait_for_view_modification.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_skip_wait_for_view_modification.result	2021-09-28 11:46:34.000000000 +0000
@@ -10,6 +10,8 @@
 SET SESSION sql_log_bin= 0;
 call mtr.add_suppression("Timeout on wait for view after joining group");
 call mtr.add_suppression("While leaving the group due to a stop, shutdown or failure there was a timeout receiving a view change. This can lead to a possible inconsistent state. Check the log for more details");
+call mtr.add_suppression("Timeout while waiting for the group communication engine to exit*.*");
+call mtr.add_suppression("The member has failed to gracefully leave the group*.*");
 SET SESSION sql_log_bin= 1;
 SET @@GLOBAL.DEBUG='+d,group_replication_force_view_modification_timeout';
 START GROUP_REPLICATION;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_sql_api_max_connections.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_sql_api_max_connections.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_sql_api_max_connections.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_sql_api_max_connections.result	2021-09-28 11:46:34.000000000 +0000
@@ -9,7 +9,7 @@
 # 1. Set max_connections to the value of current connections.
 [connection server1]
 SET @max_connections_saved = @@GLOBAL.max_connections;
-SET @@GLOBAL.max_connections= CURRENT_CONNECTIONS;
+SET @@GLOBAL.max_connections= (CURRENT_CONNECTIONS + 2);
 include/assert.inc [max_connections must be the value of current connections]
 # 2. Start Group Replication, the connections established
 #    through SQL API must not be disallowed due to
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_ssl_fips_mode.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_ssl_fips_mode.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_ssl_fips_mode.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_ssl_fips_mode.result	2021-09-28 11:46:34.000000000 +0000
@@ -25,10 +25,10 @@
 INSERT INTO t1 VALUES (1, 'test');
 INSERT INTO t1 VALUES (2, MD5(8));
 Warnings:
-Warning	11272	SSL fips mode error: FIPS mode ON/STRICT: MD5 digest is not supported.
+Warning	4073	SSL fips mode error: FIPS mode ON/STRICT: MD5 digest is not supported.
 SHOW WARNINGS;
 Level	Code	Message
-Warning	11272	SSL fips mode error: FIPS mode ON/STRICT: MD5 digest is not supported.
+Warning	4073	SSL fips mode error: FIPS mode ON/STRICT: MD5 digest is not supported.
 #
 # 4. Configure joining member (M2) to use SSL and Fips mode options on recovery.
 #    Start GR on M2. Check the data is there.
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_ssl_mode_verify_identity_error_mysql.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_ssl_mode_verify_identity_error_mysql.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_ssl_mode_verify_identity_error_mysql.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_ssl_mode_verify_identity_error_mysql.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,35 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+############################################################
+# 1. Start one member with GCS SSL enabled.
+[connection server1]
+SET @group_replication_ssl_mode_save= @@GLOBAL.group_replication_ssl_mode;
+SET GLOBAL group_replication_ssl_mode= VERIFY_IDENTITY;
+include/start_and_bootstrap_group_replication.inc
+Occurrences of 'Group communication SSL configuration: group_replication_ssl_mode: "VERIFY_IDENTITY"' in the input file: 1
+
+############################################################
+# 2. Start the second member with GCS SSL enabled and
+#    validating server certificate against the CA plus
+#    validating that server hostname matches server
+#    certificate hostname, the member will not be able to
+#    join the group, since the certificate does contain the
+#    hostname 'localhost' and the hostname is '127.0.0.1'.
+[connection server2]
+SET @group_replication_ssl_mode_save= @@GLOBAL.group_replication_ssl_mode;
+SET GLOBAL group_replication_ssl_mode= VERIFY_IDENTITY;
+START GROUP_REPLICATION;
+ERROR HY000: The server is not configured properly to be an active member of the group. Please see more details on error log.
+include/assert_grep.inc [Check that Group Replication is running with SSL VERIFY_IDENTITY enabled]
+
+############################################################
+# 3. Clean up.
+[connection server1]
+SET GLOBAL group_replication_ssl_mode= @group_replication_ssl_mode_save;
+[connection server2]
+SET GLOBAL group_replication_ssl_mode= @group_replication_ssl_mode_save;
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_ssl_mode_verify_identity_error_xcom.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_ssl_mode_verify_identity_error_xcom.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_ssl_mode_verify_identity_error_xcom.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_ssl_mode_verify_identity_error_xcom.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,36 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+############################################################
+# 1. Start one member with GCS SSL enabled.
+[connection server1]
+SET @group_replication_ssl_mode_save= @@GLOBAL.group_replication_ssl_mode;
+SET GLOBAL group_replication_ssl_mode= VERIFY_IDENTITY;
+include/start_and_bootstrap_group_replication.inc
+Occurrences of 'Group communication SSL configuration: group_replication_ssl_mode: "VERIFY_IDENTITY"' in the input file: 1
+
+############################################################
+# 2. Start the second member with GCS SSL enabled and
+#    validating server certificate against the CA plus
+#    validating that server hostname matches server
+#    certificate hostname, the member will not be able to
+#    join the group, since the certificate does contain the
+#    hostname 'localhost' and the hostname is '127.0.0.1'.
+[connection server2]
+SET @group_replication_ssl_mode_save= @@GLOBAL.group_replication_ssl_mode;
+SET GLOBAL group_replication_ssl_mode= VERIFY_IDENTITY;
+START GROUP_REPLICATION;
+ERROR HY000: The server is not configured properly to be an active member of the group. Please see more details on error log.
+include/assert_grep.inc [Check that Group Replication is running with SSL VERIFY_IDENTITY enabled]
+include/assert_grep.inc [Check that Group Replication errors out when a certificate with a wrong hostname is provided]
+
+############################################################
+# 3. Clean up.
+[connection server1]
+SET GLOBAL group_replication_ssl_mode= @group_replication_ssl_mode_save;
+[connection server2]
+SET GLOBAL group_replication_ssl_mode= @group_replication_ssl_mode_save;
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_ssl_mysql.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_ssl_mysql.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_ssl_mysql.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_ssl_mysql.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,54 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+#
+# Setup the first member with a recovery user that requires SSL
+#
+server1
+set session sql_log_bin=0;
+CREATE USER 'rec_ssl_user'@'%' REQUIRE SSL;
+GRANT replication slave ON *.* TO 'rec_ssl_user'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'rec_ssl_user'@'%';
+set session sql_log_bin=1;
+SET GLOBAL group_replication_ssl_mode= REQUIRED;
+#
+# Add some data and start the member
+#
+CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1);
+include/start_and_bootstrap_group_replication.inc
+#
+# Configure a joining member to use SSL options on recovery and start it
+#
+server2
+set session sql_log_bin=0;
+CREATE USER 'rec_ssl_user'@'%' REQUIRE SSL;
+GRANT replication slave ON *.* TO 'rec_ssl_user'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'rec_ssl_user'@'%';
+set session sql_log_bin=1;
+CHANGE REPLICATION SOURCE TO SOURCE_USER="rec_ssl_user" FOR CHANNEL "group_replication_recovery";
+SET GLOBAL group_replication_recovery_use_ssl=1;
+SET GLOBAL group_replication_recovery_ssl_ca= 'MYSQL_TEST_DIR/std_data/cacert.pem';
+SET GLOBAL group_replication_recovery_ssl_cert= 'MYSQL_TEST_DIR/std_data/client-cert.pem';
+SET GLOBAL group_replication_recovery_ssl_key= 'MYSQL_TEST_DIR/std_data/client-key.pem';
+SET GLOBAL group_replication_ssl_mode= REQUIRED;
+include/start_group_replication.inc
+#
+# Check the data is there
+#
+include/assert.inc [On the recovered member, the table should exist and have 1 elements;]
+#
+# Clean up
+#
+server1
+set session sql_log_bin=0;
+DROP USER 'rec_ssl_user';
+set session sql_log_bin=1;
+DROP TABLE t1;
+server2
+set session sql_log_bin=0;
+DROP USER 'rec_ssl_user';
+set session sql_log_bin=1;
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_ssl_on_admin_interface.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_ssl_on_admin_interface.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_ssl_on_admin_interface.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_ssl_on_admin_interface.result	2021-09-28 11:46:34.000000000 +0000
@@ -40,13 +40,11 @@
 #
 # Clean up
 #
-SET @@GLOBAL.group_replication_recovery_use_ssl= 0;
-SET @@GLOBAL.group_replication_recovery_ssl_ca= "";
-SET @@GLOBAL.group_replication_recovery_ssl_cert= "";
-SET @@GLOBAL.group_replication_recovery_ssl_key= "";
 [connection server1]
 set session sql_log_bin=0;
 DROP USER 'rec_ssl_user';
 set session sql_log_bin=1;
 DROP TABLE t1;
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --report_port=ADMIN_PORT
+include/rpl_reconnect.inc
 include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_ssl_options2.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_ssl_options2.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_ssl_options2.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_ssl_options2.result	2021-09-28 11:46:34.000000000 +0000
@@ -34,13 +34,6 @@
 #
 # Clean up
 #
-SET @@GLOBAL.group_replication_recovery_use_ssl= 0;
-SET @@GLOBAL.group_replication_recovery_ssl_ca= "";
-SET @@GLOBAL.group_replication_recovery_ssl_capath= "";
-SET @@GLOBAL.group_replication_recovery_ssl_cert= "";
-SET @@GLOBAL.group_replication_recovery_ssl_key= "";
-SET @@GLOBAL.group_replication_recovery_ssl_crl= "";
-SET @@GLOBAL.group_replication_recovery_ssl_crlpath= "";
 server1
 set session sql_log_bin=0;
 DROP USER 'rec_ssl_user';
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_ssl_options.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_ssl_options.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_ssl_options.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_ssl_options.result	2021-09-28 11:46:34.000000000 +0000
@@ -88,14 +88,6 @@
 #
 # Clean up
 #
-SET @@GLOBAL.group_replication_recovery_use_ssl= 0;
-SET @@GLOBAL.group_replication_recovery_ssl_verify_server_cert= 0;
-SET @@GLOBAL.group_replication_recovery_retry_count= 10;
-SET @@GLOBAL.group_replication_recovery_ssl_ca= "";
-SET @@GLOBAL.group_replication_recovery_ssl_capath= "";
-SET @@GLOBAL.group_replication_recovery_ssl_cert= "";
-SET @@GLOBAL.group_replication_recovery_ssl_cipher= "";
-SET @@GLOBAL.group_replication_recovery_ssl_key= "";
 server1
 set session sql_log_bin=0;
 DROP USER 'rec_ssl_user';
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_ssl.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_ssl.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_ssl.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_ssl.result	2021-09-28 11:46:34.000000000 +0000
@@ -10,7 +10,9 @@
 set session sql_log_bin=0;
 CREATE USER 'rec_ssl_user'@'%' REQUIRE SSL;
 GRANT replication slave ON *.* TO 'rec_ssl_user'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'rec_ssl_user'@'%';
 set session sql_log_bin=1;
+SET GLOBAL group_replication_ssl_mode= REQUIRED;
 #
 # Add some data and start the member
 #
@@ -21,11 +23,17 @@
 # Configure a joining member to use SSL options on recovery and start it
 #
 server2
+set session sql_log_bin=0;
+CREATE USER 'rec_ssl_user'@'%' REQUIRE SSL;
+GRANT replication slave ON *.* TO 'rec_ssl_user'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'rec_ssl_user'@'%';
+set session sql_log_bin=1;
 CHANGE REPLICATION SOURCE TO SOURCE_USER="rec_ssl_user" FOR CHANNEL "group_replication_recovery";
 SET GLOBAL group_replication_recovery_use_ssl=1;
 SET GLOBAL group_replication_recovery_ssl_ca= 'MYSQL_TEST_DIR/std_data/cacert.pem';
 SET GLOBAL group_replication_recovery_ssl_cert= 'MYSQL_TEST_DIR/std_data/client-cert.pem';
 SET GLOBAL group_replication_recovery_ssl_key= 'MYSQL_TEST_DIR/std_data/client-key.pem';
+SET GLOBAL group_replication_ssl_mode= REQUIRED;
 include/start_group_replication.inc
 #
 # Check the data is there
@@ -34,13 +42,13 @@
 #
 # Clean up
 #
-SET @@GLOBAL.group_replication_recovery_use_ssl= 0;
-SET @@GLOBAL.group_replication_recovery_ssl_ca= "";
-SET @@GLOBAL.group_replication_recovery_ssl_cert= "";
-SET @@GLOBAL.group_replication_recovery_ssl_key= "";
 server1
 set session sql_log_bin=0;
 DROP USER 'rec_ssl_user';
 set session sql_log_bin=1;
 DROP TABLE t1;
+server2
+set session sql_log_bin=0;
+DROP USER 'rec_ssl_user';
+set session sql_log_bin=1;
 include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_ssl_tls13_mysql.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_ssl_tls13_mysql.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_ssl_tls13_mysql.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_ssl_tls13_mysql.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,182 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+############################################################
+# 0. Configure members to use encryption and save defaults.
+[connection server1]
+SET @tls_version_save= @@GLOBAL.tls_version;
+SET @tls_ciphersuites_save= @@GLOBAL.tls_ciphersuites;
+SET @group_replication_ssl_mode_save= @@GLOBAL.group_replication_ssl_mode;
+SET @@GLOBAL.group_replication_ssl_mode= REQUIRED;
+[connection server2]
+SET @tls_version_save= @@GLOBAL.tls_version;
+SET @tls_ciphersuites_save= @@GLOBAL.tls_ciphersuites;
+SET @group_replication_ssl_mode_save= @@GLOBAL.group_replication_ssl_mode;
+SET @@GLOBAL.group_replication_ssl_mode= REQUIRED;
+SET SESSION sql_log_bin= 0;
+call mtr.add_suppression("\\[GCS\\] Error connecting to all peers. Member join failed. Local port:*");
+call mtr.add_suppression("\\[GCS\\] The member was unable to join the group.*");
+call mtr.add_suppression("Timeout on wait for view after joining group");
+SET SESSION sql_log_bin= 1;
+
+############################################################
+# 1. 2 members group with OpenSSL 1.1.1
+#    No --tls-ciphersuites
+#    No --tls-version
+#    Outcome: group will work.
+[connection server1]
+include/start_and_bootstrap_group_replication.inc
+[connection server2]
+include/start_group_replication.inc
+include/rpl_gr_wait_for_number_of_members.inc
+[connection server1]
+include/stop_group_replication.inc
+[connection server2]
+include/stop_group_replication.inc
+
+############################################################
+# 2. 2 members group with OpenSSL 1.1.1
+#    No --tls-ciphersuites
+#    server1: --tls-version='TLSv1,TLSv1.1,TLSv1.2,TLSv1.3'
+#    server2: --tls-version='TLSv1,TLSv1.1,TLSv1.2'
+#    Outcome: group will work.
+[connection server1]
+SET @@GLOBAL.tls_version= 'TLSv1,TLSv1.1,TLSv1.2,TLSv1.3';
+SET @@GLOBAL.group_replication_recovery_tls_version= 'TLSv1,TLSv1.1,TLSv1.2,TLSv1.3';
+ALTER INSTANCE RELOAD TLS;
+Warnings:
+Warning	4038	A deprecated TLS version TLSv1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+Warning	4038	A deprecated TLS version TLSv1.1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+include/start_and_bootstrap_group_replication.inc
+[connection server2]
+SET @@GLOBAL.tls_version= 'TLSv1,TLSv1.1,TLSv1.2';
+SET @@GLOBAL.group_replication_recovery_tls_version= 'TLSv1,TLSv1.1,TLSv1.2';
+ALTER INSTANCE RELOAD TLS;
+Warnings:
+Warning	4038	A deprecated TLS version TLSv1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+Warning	4038	A deprecated TLS version TLSv1.1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+include/start_group_replication.inc
+include/rpl_gr_wait_for_number_of_members.inc
+[connection server1]
+include/stop_group_replication.inc
+[connection server2]
+include/stop_group_replication.inc
+
+############################################################
+# 3. 2 members group with OpenSSL 1.1.1
+#    No --tls-ciphersuites
+#    server1: --tls-version='TLSv1.3'
+#    server2: --tls-version='TLSv1,TLSv1.1,TLSv1.2'
+#    Outcome: group will not work.
+[connection server1]
+SET @@GLOBAL.tls_version= 'TLSv1.3';
+SET @@GLOBAL.group_replication_recovery_tls_version= 'TLSv1.3';
+ALTER INSTANCE RELOAD TLS;
+include/start_and_bootstrap_group_replication.inc
+[connection server2]
+SET @@GLOBAL.tls_version= 'TLSv1,TLSv1.1,TLSv1.2';
+SET @@GLOBAL.group_replication_recovery_tls_version= 'TLSv1,TLSv1.1,TLSv1.2';
+ALTER INSTANCE RELOAD TLS;
+Warnings:
+Warning	4038	A deprecated TLS version TLSv1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+Warning	4038	A deprecated TLS version TLSv1.1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+START GROUP_REPLICATION;
+ERROR HY000: The server is not configured properly to be an active member of the group. Please see more details on error log.
+[connection server1]
+include/stop_group_replication.inc
+
+############################################################
+# 4. 2 members group with OpenSSL 1.1.1
+#    No --tls-ciphersuites
+#    server1: --tls-version='TLSv1.3'
+#    server2: --tls-version='TLSv1.3'
+#    Outcome: group will work.
+[connection server1]
+SET @@GLOBAL.tls_version= 'TLSv1.3';
+SET @@GLOBAL.group_replication_recovery_tls_version= 'TLSv1.3';
+ALTER INSTANCE RELOAD TLS;
+include/start_and_bootstrap_group_replication.inc
+[connection server2]
+SET @@GLOBAL.tls_version= 'TLSv1.3';
+SET @@GLOBAL.group_replication_recovery_tls_version= 'TLSv1.3';
+ALTER INSTANCE RELOAD TLS;
+include/start_group_replication.inc
+include/rpl_gr_wait_for_number_of_members.inc
+[connection server1]
+include/stop_group_replication.inc
+[connection server2]
+include/stop_group_replication.inc
+
+############################################################
+# 5. 2 members group with OpenSSL 1.1.1
+#    --tls-ciphersuites='TLS_AES_256_GCM_SHA384'
+#    server1: --tls-version='TLSv1,TLSv1.1,TLSv1.2,TLSv1.3'
+#    server2: --tls-version='TLSv1,TLSv1.1,TLSv1.2,TLSv1.3'
+#    Outcome: group will work.
+[connection server1]
+SET @@GLOBAL.tls_version= 'TLSv1,TLSv1.1,TLSv1.2,TLSv1.3';
+SET @@GLOBAL.tls_ciphersuites= 'TLS_AES_256_GCM_SHA384';
+SET @@GLOBAL.group_replication_recovery_tls_version= 'TLSv1,TLSv1.1,TLSv1.2,TLSv1.3';
+SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= 'TLS_AES_256_GCM_SHA384';
+ALTER INSTANCE RELOAD TLS;
+Warnings:
+Warning	4038	A deprecated TLS version TLSv1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+Warning	4038	A deprecated TLS version TLSv1.1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+include/start_and_bootstrap_group_replication.inc
+[connection server2]
+SET @@GLOBAL.tls_version= 'TLSv1,TLSv1.1,TLSv1.2,TLSv1.3';
+SET @@GLOBAL.tls_ciphersuites= 'TLS_AES_256_GCM_SHA384';
+SET @@GLOBAL.group_replication_recovery_tls_version= 'TLSv1,TLSv1.1,TLSv1.2,TLSv1.3';
+SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= 'TLS_AES_256_GCM_SHA384';
+ALTER INSTANCE RELOAD TLS;
+Warnings:
+Warning	4038	A deprecated TLS version TLSv1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+Warning	4038	A deprecated TLS version TLSv1.1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+include/start_group_replication.inc
+include/rpl_gr_wait_for_number_of_members.inc
+[connection server1]
+include/stop_group_replication.inc
+[connection server2]
+include/stop_group_replication.inc
+
+############################################################
+# 6. 2 members group with OpenSSL 1.1.1
+#    --tls-ciphersuites= '', which will disable all ciphers.
+#    No --tls-version
+#    Outcome: group will not work.
+[connection server1]
+SET @@GLOBAL.tls_ciphersuites= '';
+SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= '';
+ALTER INSTANCE RELOAD TLS;
+Warnings:
+Warning	4038	A deprecated TLS version TLSv1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+Warning	4038	A deprecated TLS version TLSv1.1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+START GROUP_REPLICATION;
+ERROR HY000: The server is not configured properly to be an active member of the group. Please see more details on error log.
+
+############################################################
+# 7. Clean up.
+[connection server1]
+SET @@GLOBAL.group_replication_ssl_mode= @group_replication_ssl_mode_save;
+SET @@GLOBAL.tls_version= @tls_version_save;
+SET @@GLOBAL.tls_ciphersuites= @tls_ciphersuites_save;
+SET @@GLOBAL.group_replication_recovery_tls_version= $tls_version_recovery_save_s1;
+SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= $tls_ciphersuites_recovery_save_s1;
+ALTER INSTANCE RELOAD TLS;
+Warnings:
+Warning	4038	A deprecated TLS version TLSv1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+Warning	4038	A deprecated TLS version TLSv1.1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+[connection server2]
+SET @@GLOBAL.group_replication_ssl_mode= @group_replication_ssl_mode_save;
+SET @@GLOBAL.tls_version= @tls_version_save;
+SET @@GLOBAL.tls_ciphersuites= @tls_ciphersuites_save;
+SET @@GLOBAL.group_replication_recovery_tls_version= $tls_version_recovery_save_s2;
+SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= $tls_ciphersuites_recovery_save_s2;
+ALTER INSTANCE RELOAD TLS;
+Warnings:
+Warning	4038	A deprecated TLS version TLSv1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+Warning	4038	A deprecated TLS version TLSv1.1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_ssl_tls13_runtime_invalid_configuration_mysql.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_ssl_tls13_runtime_invalid_configuration_mysql.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_ssl_tls13_runtime_invalid_configuration_mysql.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_ssl_tls13_runtime_invalid_configuration_mysql.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,120 @@
+include/group_replication.inc [rpl_server_count=2]
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+############################################################
+# 0. Configure members to use encryption and save defaults.
+[connection server1]
+SET @tls_version_save= @@GLOBAL.tls_version;
+SET @tls_ciphersuites_save= @@GLOBAL.tls_ciphersuites;
+SET @ssl_cipher_save= @@GLOBAL.ssl_cipher;
+SET @group_replication_ssl_mode_save= @@GLOBAL.group_replication_ssl_mode;
+SET @@GLOBAL.group_replication_ssl_mode= REQUIRED;
+[connection server2]
+SET @tls_version_save= @@GLOBAL.tls_version;
+SET @tls_ciphersuites_save= @@GLOBAL.tls_ciphersuites;
+SET @ssl_cipher_save= @@GLOBAL.ssl_cipher;
+SET @group_replication_ssl_mode_save= @@GLOBAL.group_replication_ssl_mode;
+SET @@GLOBAL.group_replication_ssl_mode= REQUIRED;
+SET SESSION sql_log_bin= 0;
+call mtr.add_suppression("\\[GCS\\] Error connecting to all peers. Member join failed. Local port:*");
+call mtr.add_suppression("\\[GCS\\] The member was unable to join the group.*");
+call mtr.add_suppression("Timeout on wait for view after joining group");
+call mtr.add_suppression("Error connecting to the local group communication engine instance");
+SET SESSION sql_log_bin= 1;
+
+############################################################
+# 1. 2 members group with OpenSSL 1.1.1
+#    Verify that it is not possible to start group replication  when :
+#      * TLS version is 1.3
+#      * Intersection of the allowed TLS chipersuites for all the members
+#        is empty.
+#    server1: --tls-version='TLSv1.3'
+#    server1: --tls-ciphersuites='TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384'
+#    server2: --tls-version='TLSv1.3'
+#    server2: --tls-ciphersuites='TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_CCM_SHA256'
+#    Outcome: group will not work.
+[connection server1]
+SET @@GLOBAL.tls_version= 'TLSv1.3';
+SET @@GLOBAL.tls_ciphersuites= 'TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384';
+SET @@GLOBAL.group_replication_recovery_tls_version= 'TLSv1.3';
+SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= 'TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384';
+ALTER INSTANCE RELOAD TLS;
+include/start_and_bootstrap_group_replication.inc
+[connection server2]
+SET GLOBAL group_replication_group_name= "GROUP_REPLICATION_GROUP_NAME";
+SET @@GLOBAL.tls_version= 'TLSv1.3';
+SET @@GLOBAL.tls_ciphersuites= 'TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_CCM_SHA256';
+SET @@GLOBAL.group_replication_recovery_tls_version= 'TLSv1.3';
+SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= 'TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_CCM_SHA256';
+ALTER INSTANCE RELOAD TLS;
+START GROUP_REPLICATION;
+ERROR HY000: The server is not configured properly to be an active member of the group. Please see more details on error log.
+[connection server1]
+include/stop_group_replication.inc
+
+############################################################
+# 2. 2 members group with OpenSSL 1.1.1
+#    Verify that it is not possible to join a node to a group when
+#    TLS v1.3 is allowed but there is no compatible ciphersuite :
+#      * TLS chipersuite of the node is incompatible  with the group,
+#        therefore TLS v1.3 is not supported
+#      * SLL cipher of the node is compatible with the group
+#    --tls-version='TLSv1.3'
+#    server1: --tls-ciphersuites='TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384'
+#    server1: --ssl-cipher='AES256-SHA:AES256-SHA256'
+#    server2: --tls-ciphersuites='TLS_AES_128_CCM_SHA256'
+#    server2: --ssl-cipher='AES256-SHA256:CAMELLIA256-SHA'
+#    Outcome: group will not work.
+[connection server1]
+SET @@GLOBAL.tls_version= 'TLSv1.3';
+SET @@GLOBAL.ssl_cipher= 'AES256-SHA:AES256-SHA256';
+SET @@GLOBAL.tls_ciphersuites= 'TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384';
+SET @@GLOBAL.group_replication_recovery_tls_version= 'TLSv1.3';
+SET @@GLOBAL.group_replication_recovery_ssl_cipher= 'AES256-SHA:AES256-SHA256';
+SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= 'TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384';
+ALTER INSTANCE RELOAD TLS;
+include/start_and_bootstrap_group_replication.inc
+[connection server2]
+SET GLOBAL group_replication_group_name= "GROUP_REPLICATION_GROUP_NAME";
+SET @@GLOBAL.tls_version= 'TLSv1.3';
+SET @@GLOBAL.ssl_cipher= 'AES256-SHA256:CAMELLIA256-SHA';
+SET @@GLOBAL.tls_ciphersuites = 'TLS_AES_128_CCM_SHA256';
+SET @@GLOBAL.group_replication_recovery_tls_version= 'TLSv1.3';
+SET @@GLOBAL.group_replication_recovery_ssl_cipher= 'AES256-SHA256:CAMELLIA256-SHA';
+SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= 'TLS_AES_128_CCM_SHA256';
+ALTER INSTANCE RELOAD TLS;
+START GROUP_REPLICATION;
+ERROR HY000: The server is not configured properly to be an active member of the group. Please see more details on error log.
+[connection server1]
+include/stop_group_replication.inc
+
+############################################################
+# 3. Clean up.
+[connection server1]
+SET @@GLOBAL.group_replication_ssl_mode= @group_replication_ssl_mode_save;
+SET @@GLOBAL.tls_version= @tls_version_save;
+SET @@GLOBAL.tls_ciphersuites= @tls_ciphersuites_save;
+SET @@GLOBAL.ssl_cipher = @ssl_cipher_save;
+SET @@GLOBAL.group_replication_recovery_tls_version= $tls_version_recovery_save_s1;
+SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= $tls_ciphersuites_recovery_save_s1;
+SET @@GLOBAL.group_replication_recovery_ssl_cipher= $ssl_cipher_recovery_save_s1;
+ALTER INSTANCE RELOAD TLS;
+Warnings:
+Warning	4038	A deprecated TLS version TLSv1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+Warning	4038	A deprecated TLS version TLSv1.1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+[connection server2]
+SET @@GLOBAL.group_replication_ssl_mode= @group_replication_ssl_mode_save;
+SET @@GLOBAL.tls_version= @tls_version_save;
+SET @@GLOBAL.tls_ciphersuites= @tls_ciphersuites_save;
+SET @@GLOBAL.ssl_cipher = @ssl_cipher_save;
+SET @@GLOBAL.group_replication_recovery_tls_version= $tls_version_recovery_save_s2;
+SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= $tls_ciphersuites_recovery_save_s2;
+SET @@GLOBAL.group_replication_recovery_ssl_cipher= $ssl_cipher_recovery_save_s2;
+ALTER INSTANCE RELOAD TLS;
+Warnings:
+Warning	4038	A deprecated TLS version TLSv1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+Warning	4038	A deprecated TLS version TLSv1.1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_ssl_tls13_runtime_invalid_configuration_xcom.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_ssl_tls13_runtime_invalid_configuration_xcom.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_ssl_tls13_runtime_invalid_configuration_xcom.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_ssl_tls13_runtime_invalid_configuration_xcom.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,106 @@
+include/group_replication.inc [rpl_server_count=2]
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+############################################################
+# 0. Configure members to use encryption and save defaults.
+[connection server1]
+SET @tls_version_save= @@GLOBAL.tls_version;
+SET @tls_ciphersuites_save= @@GLOBAL.tls_ciphersuites;
+SET @ssl_cipher_save= @@GLOBAL.ssl_cipher;
+SET @group_replication_ssl_mode_save= @@GLOBAL.group_replication_ssl_mode;
+SET @@GLOBAL.group_replication_ssl_mode= REQUIRED;
+[connection server2]
+SET @tls_version_save= @@GLOBAL.tls_version;
+SET @tls_ciphersuites_save= @@GLOBAL.tls_ciphersuites;
+SET @ssl_cipher_save= @@GLOBAL.ssl_cipher;
+SET @group_replication_ssl_mode_save= @@GLOBAL.group_replication_ssl_mode;
+SET @@GLOBAL.group_replication_ssl_mode= REQUIRED;
+SET SESSION sql_log_bin= 0;
+call mtr.add_suppression("\\[GCS\\] Error connecting to all peers. Member join failed. Local port:*");
+call mtr.add_suppression("\\[GCS\\] The member was unable to join the group.*");
+call mtr.add_suppression("Timeout on wait for view after joining group");
+call mtr.add_suppression("Error connecting to the local group communication engine instance");
+SET SESSION sql_log_bin= 1;
+
+############################################################
+# 1. 2 members group with OpenSSL 1.1.1
+#    Verify that it is not possible to start group replication  when :
+#      * TLS version is 1.3
+#      * Intersection of the allowed TLS chipersuites for all the members
+#        is empty.
+#    server1: --tls-version='TLSv1.3'
+#    server1: --tls-ciphersuites='TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384'
+#    server2: --tls-version='TLSv1.3'
+#    server2: --tls-ciphersuites='TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_CCM_SHA256'
+#    Outcome: group will not work.
+[connection server1]
+SET @@GLOBAL.tls_version= 'TLSv1.3';
+SET @@GLOBAL.tls_ciphersuites= 'TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384';
+ALTER INSTANCE RELOAD TLS;
+include/start_and_bootstrap_group_replication.inc
+[connection server2]
+SET GLOBAL group_replication_group_name= "GROUP_REPLICATION_GROUP_NAME";
+SET @@GLOBAL.tls_version= 'TLSv1.3';
+SET @@GLOBAL.tls_ciphersuites= 'TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_CCM_SHA256';
+ALTER INSTANCE RELOAD TLS;
+START GROUP_REPLICATION;
+ERROR HY000: The server is not configured properly to be an active member of the group. Please see more details on error log.
+include/assert_grep.inc [Found the expected error line in the server log.]
+[connection server1]
+include/stop_group_replication.inc
+
+############################################################
+# 2. 2 members group with OpenSSL 1.1.1
+#    Verify that it is not possible to join a node to a group when
+#    TLS v1.3 is allowed but there is no compatible ciphersuite :
+#      * TLS chipersuite of the node is incompatible  with the group,
+#        therefore TLS v1.3 is not supported
+#      * SLL cipher of the node is compatible with the group
+#    --tls-version='TLSv1.3'
+#    server1: --tls-ciphersuites='TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384'
+#    server1: --ssl-cipher='AES256-SHA:AES256-SHA256'
+#    server2: --tls-ciphersuites='TLS_AES_128_CCM_SHA256'
+#    server2: --ssl-cipher='AES256-SHA256:CAMELLIA256-SHA'
+#    Outcome: group will not work.
+[connection server1]
+SET @@GLOBAL.tls_version= 'TLSv1.3';
+SET @@GLOBAL.ssl_cipher= 'AES256-SHA:AES256-SHA256';
+SET @@GLOBAL.tls_ciphersuites= 'TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384';
+ALTER INSTANCE RELOAD TLS;
+include/start_and_bootstrap_group_replication.inc
+[connection server2]
+SET GLOBAL group_replication_group_name= "GROUP_REPLICATION_GROUP_NAME";
+SET @@GLOBAL.tls_version= 'TLSv1.3';
+SET @@GLOBAL.ssl_cipher= 'AES256-SHA256:CAMELLIA256-SHA';
+SET @@GLOBAL.tls_ciphersuites = 'TLS_AES_128_CCM_SHA256';
+ALTER INSTANCE RELOAD TLS;
+START GROUP_REPLICATION;
+ERROR HY000: The server is not configured properly to be an active member of the group. Please see more details on error log.
+include/assert_grep.inc [Found the expected error line in the server log.]
+[connection server1]
+include/stop_group_replication.inc
+
+############################################################
+# 3. Clean up.
+[connection server1]
+SET @@GLOBAL.group_replication_ssl_mode= @group_replication_ssl_mode_save;
+SET @@GLOBAL.tls_version= @tls_version_save;
+SET @@GLOBAL.tls_ciphersuites= @tls_ciphersuites_save;
+SET @@GLOBAL.ssl_cipher = @ssl_cipher_save;
+ALTER INSTANCE RELOAD TLS;
+Warnings:
+Warning	4038	A deprecated TLS version TLSv1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+Warning	4038	A deprecated TLS version TLSv1.1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+[connection server2]
+SET @@GLOBAL.group_replication_ssl_mode= @group_replication_ssl_mode_save;
+SET @@GLOBAL.tls_version= @tls_version_save;
+SET @@GLOBAL.tls_ciphersuites= @tls_ciphersuites_save;
+SET @@GLOBAL.ssl_cipher = @ssl_cipher_save;
+ALTER INSTANCE RELOAD TLS;
+Warnings:
+Warning	4038	A deprecated TLS version TLSv1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+Warning	4038	A deprecated TLS version TLSv1.1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_ssl_tls13_runtime_valid_configuration.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_ssl_tls13_runtime_valid_configuration.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_ssl_tls13_runtime_valid_configuration.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_ssl_tls13_runtime_valid_configuration.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,12 +11,16 @@
 SET @tls_ciphersuites_save= @@GLOBAL.tls_ciphersuites;
 SET @ssl_cipher_save= @@GLOBAL.ssl_cipher;
 SET @group_replication_ssl_mode_save= @@GLOBAL.group_replication_ssl_mode;
+SET @group_replication_recovery_tls_version_save= @@GLOBAL.group_replication_recovery_tls_version;
+SET @group_replication_recovery_tls_ciphersuites_save= @@GLOBAL.group_replication_recovery_tls_ciphersuites;
 SET @@GLOBAL.group_replication_ssl_mode= REQUIRED;
 [connection server2]
 SET @tls_version_save= @@GLOBAL.tls_version;
 SET @tls_ciphersuites_save= @@GLOBAL.tls_ciphersuites;
 SET @ssl_cipher_save= @@GLOBAL.ssl_cipher;
 SET @group_replication_ssl_mode_save= @@GLOBAL.group_replication_ssl_mode;
+SET @group_replication_recovery_tls_version_save= @@GLOBAL.group_replication_recovery_tls_version;
+SET @group_replication_recovery_tls_ciphersuites_save= @@GLOBAL.group_replication_recovery_tls_ciphersuites;
 SET @@GLOBAL.group_replication_ssl_mode= REQUIRED;
 SET SESSION sql_log_bin= 0;
 call mtr.add_suppression("\\[GCS\\] Error connecting to all peers. Member join failed. Local port:*");
@@ -29,6 +33,8 @@
 SET @tls_ciphersuites_save= @@GLOBAL.tls_ciphersuites;
 SET @ssl_cipher_save= @@GLOBAL.ssl_cipher;
 SET @group_replication_ssl_mode_save= @@GLOBAL.group_replication_ssl_mode;
+SET @group_replication_recovery_tls_version_save= @@GLOBAL.group_replication_recovery_tls_version;
+SET @group_replication_recovery_tls_ciphersuites_save= @@GLOBAL.group_replication_recovery_tls_ciphersuites;
 SET @@GLOBAL.group_replication_ssl_mode= REQUIRED;
 SET SESSION sql_log_bin= 0;
 call mtr.add_suppression("\\[GCS\\] Error connecting to all peers. Member join failed. Local port:*");
@@ -86,11 +92,15 @@
 [connection server1]
 SET @@GLOBAL.tls_version= 'TLSv1.3';
 SET @@GLOBAL.tls_ciphersuites= 'TLS_AES_128_CCM_SHA256';
+SET @@GLOBAL.group_replication_recovery_tls_version= 'TLSv1.3';
+SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= 'TLS_AES_128_CCM_SHA256';
 ALTER INSTANCE RELOAD TLS;
 include/start_and_bootstrap_group_replication.inc
 [connection server2]
 SET @@GLOBAL.tls_version= 'TLSv1.3';
 SET @@GLOBAL.tls_ciphersuites= 'TLS_AES_128_CCM_SHA256';
+SET @@GLOBAL.group_replication_recovery_tls_version= 'TLSv1.3';
+SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= 'TLS_AES_128_CCM_SHA256';
 ALTER INSTANCE RELOAD TLS;
 include/start_group_replication.inc
 include/rpl_gr_wait_for_number_of_members.inc
@@ -112,16 +122,22 @@
 [connection server1]
 SET @@GLOBAL.tls_version= 'TLSv1.3';
 SET @@GLOBAL.tls_ciphersuites= 'TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384';
+SET @@GLOBAL.group_replication_recovery_tls_version= 'TLSv1.3';
+SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= 'TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384';
 ALTER INSTANCE RELOAD TLS;
 include/start_and_bootstrap_group_replication.inc
 [connection server2]
 SET @@GLOBAL.tls_version= 'TLSv1.3';
 SET @@GLOBAL.tls_ciphersuites= 'TLS_AES_256_GCM_SHA384:TLS_AES_128_CCM_SHA256';
+SET @@GLOBAL.group_replication_recovery_tls_version= 'TLSv1.3';
+SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= 'TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384';
 ALTER INSTANCE RELOAD TLS;
 include/start_group_replication.inc
 [connection server3]
 SET @@GLOBAL.tls_version= 'TLSv1.3';
 SET @@GLOBAL.tls_ciphersuites= 'TLS_AES_128_CCM_8_SHA256: TLS_AES_256_GCM_SHA384';
+SET @@GLOBAL.group_replication_recovery_tls_version= 'TLSv1.3';
+SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= 'TLS_AES_128_CCM_8_SHA256: TLS_AES_256_GCM_SHA384';
 ALTER INSTANCE RELOAD TLS;
 include/start_group_replication.inc
 include/rpl_gr_wait_for_number_of_members.inc
@@ -190,6 +206,8 @@
 SET @@GLOBAL.tls_version= @tls_version_save;
 SET @@GLOBAL.tls_ciphersuites= @tls_ciphersuites_save;
 SET @@GLOBAL.ssl_cipher = @ssl_cipher_save;
+SET @@GLOBAL.group_replication_recovery_tls_version= @group_replication_recovery_tls_version_save;
+SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= @group_replication_recovery_tls_ciphersuites_save;
 ALTER INSTANCE RELOAD TLS;
 Warnings:
 Warning	4038	A deprecated TLS version TLSv1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
@@ -199,6 +217,8 @@
 SET @@GLOBAL.tls_version= @tls_version_save;
 SET @@GLOBAL.tls_ciphersuites= @tls_ciphersuites_save;
 SET @@GLOBAL.ssl_cipher = @ssl_cipher_save;
+SET @@GLOBAL.group_replication_recovery_tls_version= @group_replication_recovery_tls_version_save;
+SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= @group_replication_recovery_tls_ciphersuites_save;
 ALTER INSTANCE RELOAD TLS;
 Warnings:
 Warning	4038	A deprecated TLS version TLSv1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
@@ -208,6 +228,8 @@
 SET @@GLOBAL.tls_version= @tls_version_save;
 SET @@GLOBAL.tls_ciphersuites = @tls_ciphersuites_save;
 SET @@GLOBAL.ssl_cipher = @ssl_cipher_save;
+SET @@GLOBAL.group_replication_recovery_tls_version= @group_replication_recovery_tls_version_save;
+SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= @group_replication_recovery_tls_ciphersuites_save;
 ALTER INSTANCE RELOAD TLS;
 Warnings:
 Warning	4038	A deprecated TLS version TLSv1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_ssl_tls13_xcom.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_ssl_tls13_xcom.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_ssl_tls13_xcom.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_ssl_tls13_xcom.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,168 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+############################################################
+# 0. Configure members to use encryption and save defaults.
+[connection server1]
+SET @tls_version_save= @@GLOBAL.tls_version;
+SET @tls_ciphersuites_save= @@GLOBAL.tls_ciphersuites;
+SET @group_replication_ssl_mode_save= @@GLOBAL.group_replication_ssl_mode;
+SET @@GLOBAL.group_replication_ssl_mode= REQUIRED;
+[connection server2]
+SET @tls_version_save= @@GLOBAL.tls_version;
+SET @tls_ciphersuites_save= @@GLOBAL.tls_ciphersuites;
+SET @group_replication_ssl_mode_save= @@GLOBAL.group_replication_ssl_mode;
+SET @@GLOBAL.group_replication_ssl_mode= REQUIRED;
+SET SESSION sql_log_bin= 0;
+call mtr.add_suppression("\\[GCS\\] Error connecting to all peers. Member join failed. Local port:*");
+call mtr.add_suppression("\\[GCS\\] The member was unable to join the group.*");
+call mtr.add_suppression("Timeout on wait for view after joining group");
+SET SESSION sql_log_bin= 1;
+
+############################################################
+# 1. 2 members group with OpenSSL 1.1.1
+#    No --tls-ciphersuites
+#    No --tls-version
+#    Outcome: group will work.
+[connection server1]
+include/start_and_bootstrap_group_replication.inc
+[connection server2]
+include/start_group_replication.inc
+include/rpl_gr_wait_for_number_of_members.inc
+[connection server1]
+include/stop_group_replication.inc
+[connection server2]
+include/stop_group_replication.inc
+
+############################################################
+# 2. 2 members group with OpenSSL 1.1.1
+#    No --tls-ciphersuites
+#    server1: --tls-version='TLSv1,TLSv1.1,TLSv1.2,TLSv1.3'
+#    server2: --tls-version='TLSv1,TLSv1.1,TLSv1.2'
+#    Outcome: group will work.
+[connection server1]
+SET @@GLOBAL.tls_version= 'TLSv1,TLSv1.1,TLSv1.2,TLSv1.3';
+ALTER INSTANCE RELOAD TLS;
+Warnings:
+Warning	4038	A deprecated TLS version TLSv1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+Warning	4038	A deprecated TLS version TLSv1.1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+include/start_and_bootstrap_group_replication.inc
+[connection server2]
+SET @@GLOBAL.tls_version= 'TLSv1,TLSv1.1,TLSv1.2';
+ALTER INSTANCE RELOAD TLS;
+Warnings:
+Warning	4038	A deprecated TLS version TLSv1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+Warning	4038	A deprecated TLS version TLSv1.1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+include/start_group_replication.inc
+include/rpl_gr_wait_for_number_of_members.inc
+[connection server1]
+include/stop_group_replication.inc
+[connection server2]
+include/stop_group_replication.inc
+
+############################################################
+# 3. 2 members group with OpenSSL 1.1.1
+#    No --tls-ciphersuites
+#    server1: --tls-version='TLSv1.3'
+#    server2: --tls-version='TLSv1,TLSv1.1,TLSv1.2'
+#    Outcome: group will not work.
+[connection server1]
+SET @@GLOBAL.tls_version= 'TLSv1.3';
+ALTER INSTANCE RELOAD TLS;
+include/start_and_bootstrap_group_replication.inc
+[connection server2]
+SET @@GLOBAL.tls_version= 'TLSv1,TLSv1.1,TLSv1.2';
+ALTER INSTANCE RELOAD TLS;
+Warnings:
+Warning	4038	A deprecated TLS version TLSv1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+Warning	4038	A deprecated TLS version TLSv1.1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+START GROUP_REPLICATION;
+ERROR HY000: The server is not configured properly to be an active member of the group. Please see more details on error log.
+[connection server1]
+include/stop_group_replication.inc
+
+############################################################
+# 4. 2 members group with OpenSSL 1.1.1
+#    No --tls-ciphersuites
+#    server1: --tls-version='TLSv1.3'
+#    server2: --tls-version='TLSv1.3'
+#    Outcome: group will work.
+[connection server1]
+SET @@GLOBAL.tls_version= 'TLSv1.3';
+ALTER INSTANCE RELOAD TLS;
+include/start_and_bootstrap_group_replication.inc
+[connection server2]
+SET @@GLOBAL.tls_version= 'TLSv1.3';
+ALTER INSTANCE RELOAD TLS;
+include/start_group_replication.inc
+include/rpl_gr_wait_for_number_of_members.inc
+[connection server1]
+include/stop_group_replication.inc
+[connection server2]
+include/stop_group_replication.inc
+
+############################################################
+# 5. 2 members group with OpenSSL 1.1.1
+#    --tls-ciphersuites='TLS_AES_256_GCM_SHA384'
+#    server1: --tls-version='TLSv1,TLSv1.1,TLSv1.2,TLSv1.3'
+#    server2: --tls-version='TLSv1,TLSv1.1,TLSv1.2,TLSv1.3'
+#    Outcome: group will work.
+[connection server1]
+SET @@GLOBAL.tls_version= 'TLSv1,TLSv1.1,TLSv1.2,TLSv1.3';
+SET @@GLOBAL.tls_ciphersuites= 'TLS_AES_256_GCM_SHA384';
+ALTER INSTANCE RELOAD TLS;
+Warnings:
+Warning	4038	A deprecated TLS version TLSv1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+Warning	4038	A deprecated TLS version TLSv1.1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+include/start_and_bootstrap_group_replication.inc
+[connection server2]
+SET @@GLOBAL.tls_version= 'TLSv1,TLSv1.1,TLSv1.2,TLSv1.3';
+SET @@GLOBAL.tls_ciphersuites= 'TLS_AES_256_GCM_SHA384';
+ALTER INSTANCE RELOAD TLS;
+Warnings:
+Warning	4038	A deprecated TLS version TLSv1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+Warning	4038	A deprecated TLS version TLSv1.1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+include/start_group_replication.inc
+include/rpl_gr_wait_for_number_of_members.inc
+[connection server1]
+include/stop_group_replication.inc
+[connection server2]
+include/stop_group_replication.inc
+
+############################################################
+# 6. 2 members group with OpenSSL 1.1.1
+#    --tls-ciphersuites= '', which will disable all ciphers.
+#    No --tls-version
+#    Outcome: group will not work.
+[connection server1]
+SET @@GLOBAL.tls_ciphersuites= '';
+ALTER INSTANCE RELOAD TLS;
+Warnings:
+Warning	4038	A deprecated TLS version TLSv1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+Warning	4038	A deprecated TLS version TLSv1.1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+START GROUP_REPLICATION;
+ERROR HY000: The server is not configured properly to be an active member of the group. Please see more details on error log.
+Pattern found.
+
+############################################################
+# 7. Clean up.
+[connection server1]
+SET @@GLOBAL.group_replication_ssl_mode= @group_replication_ssl_mode_save;
+SET @@GLOBAL.tls_version= @tls_version_save;
+SET @@GLOBAL.tls_ciphersuites= @tls_ciphersuites_save;
+ALTER INSTANCE RELOAD TLS;
+Warnings:
+Warning	4038	A deprecated TLS version TLSv1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+Warning	4038	A deprecated TLS version TLSv1.1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+[connection server2]
+SET @@GLOBAL.group_replication_ssl_mode= @group_replication_ssl_mode_save;
+SET @@GLOBAL.tls_version= @tls_version_save;
+SET @@GLOBAL.tls_ciphersuites= @tls_ciphersuites_save;
+ALTER INSTANCE RELOAD TLS;
+Warnings:
+Warning	4038	A deprecated TLS version TLSv1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+Warning	4038	A deprecated TLS version TLSv1.1 is enabled for channel mysql_main. Please use TLSv1.2 or higher.
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_start_channel_on_server_start.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_start_channel_on_server_start.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_start_channel_on_server_start.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_start_channel_on_server_start.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,44 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+############################################################
+# 1. Configure a replication channel to replicate from server1
+[connection server2]
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_PORT=SERVER_1_PORT;
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+
+############################################################
+# 2. Restart the server with GR configured to start together with
+#    server, and set --skip_slave_start=0.
+[connection server2]
+# restart:--group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_bootstrap_group=1 --group_replication_start_on_boot=1  --group_replication_single_primary_mode=1 --group_replication_enforce_update_everywhere_checks=0 --skip_slave_start=0
+
+############################################################
+# 3. Wait until server is up.
+#    Check that GR and replication channel are working.
+include/rpl_reconnect.inc
+[connection server2]
+include/gr_wait_for_member_state.inc
+include/gr_assert_primary_member.inc
+include/wait_for_slave_to_start.inc
+
+############################################################
+# 4. Write something on server1 and read it on server2.
+[connection server1]
+CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY);
+INSERT INTO t1 VALUES (1);
+include/sync_slave_sql_with_master.inc
+[connection server2]
+include/assert.inc ['There is one row in t1']
+
+############################################################
+# 5. Clean up.
+[connection server1]
+DROP TABLE t1;
+include/sync_slave_sql_with_master.inc
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_start_gr_credential_options_clone.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_start_gr_credential_options_clone.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_start_gr_credential_options_clone.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_start_gr_credential_options_clone.result	2021-09-28 11:46:34.000000000 +0000
@@ -48,6 +48,7 @@
 RESET PERSIST group_replication_local_address;
 RESET PERSIST group_replication_group_seeds;
 RESET PERSIST group_replication_start_on_boot;
+RESET PERSIST group_replication_communication_stack;
 CHANGE REPLICATION SOURCE TO SOURCE_USER='root' FOR CHANNEL 'group_replication_recovery';
 Warnings:
 Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_start_gr_with_credentials_2.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_start_gr_with_credentials_2.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_start_gr_with_credentials_2.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_start_gr_with_credentials_2.result	2021-09-28 11:46:34.000000000 +0000
@@ -187,4 +187,5 @@
 DROP USER 'proxy_user_wp';
 SET SESSION sql_log_bin = 1;
 UNINSTALL PLUGIN test_plugin_server;
+TRUNCATE mysql.general_log;
 include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_start_gr_with_credentials_3.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_start_gr_with_credentials_3.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_start_gr_with_credentials_3.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_start_gr_with_credentials_3.result	2021-09-28 11:46:34.000000000 +0000
@@ -165,3 +165,5 @@
 SET SQL_LOG_BIN=1;
 UNINSTALL PLUGIN test_plugin_server;
 include/group_replication_end.inc
+[connection server2]
+TRUNCATE mysql.general_log;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_start_gr_with_credentials_mysql_connections.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_start_gr_with_credentials_mysql_connections.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_start_gr_with_credentials_mysql_connections.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_start_gr_with_credentials_mysql_connections.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,104 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+# 1. Bootstrap M1. And create new users.
+[connection server1]
+include/start_and_bootstrap_group_replication.inc
+SET SQL_LOG_BIN=0;
+CREATE USER 'regular_user_p' IDENTIFIED BY 'password';
+CREATE USER 'regular_user_wp' IDENTIFIED BY '';
+GRANT REPLICATION SLAVE ON *.* TO "regular_user_p";
+GRANT REPLICATION SLAVE ON *.* TO "regular_user_wp";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO "regular_user_p";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO "regular_user_wp";
+SET SQL_LOG_BIN=1;
+
+# 2. Reset recovery interval to 1 and count to 2 for M2.
+[connection server2]
+SET SQL_LOG_BIN=0;
+CREATE USER 'regular_user_p' IDENTIFIED BY 'password';
+CREATE USER 'regular_user_wp' IDENTIFIED BY '';
+GRANT REPLICATION SLAVE ON *.* TO "regular_user_p";
+GRANT REPLICATION SLAVE ON *.* TO "regular_user_wp";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO "regular_user_p";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO "regular_user_wp";
+SET SQL_LOG_BIN=1;
+SET @saved_group_replication_recovery_reconnect_interval = @@GLOBAL.group_replication_recovery_reconnect_interval;
+SET @saved_gr_recovery_retry_count = @@GLOBAL.group_replication_recovery_retry_count;
+SET GLOBAL group_replication_recovery_reconnect_interval= 1;
+SET GLOBAL group_replication_recovery_retry_count= 2;
+SET GLOBAL group_replication_group_name= "GROUP_REPLICATION_GROUP_NAME";
+
+# 3. Test START GR works without any option.
+include/start_group_replication.inc
+include/stop_group_replication.inc
+
+# 4. Delete recovery channel and test START GR, it should fail.
+RESET SLAVE ALL FOR CHANNEL 'group_replication_recovery';
+Warnings:
+Warning	1287	'RESET SLAVE' is deprecated and will be removed in a future release. Please use RESET REPLICA instead
+START GROUP_REPLICATION;
+ERROR HY000: The server is not configured properly to be an active member of the group. Please see more details on error log.
+
+# 5. Pass USER as root and test START GR, member should come ONLINE.
+#    START GR without parameter fails, credentials are removed on STOP.
+START GROUP_REPLICATION USER='root';
+include/gr_wait_for_member_state.inc
+include/stop_group_replication.inc
+START GROUP_REPLICATION;
+ERROR HY000: The server is not configured properly to be an active member of the group. Please see more details on error log.
+
+# 6. Test wrong credentials do not connect with master.
+START GROUP_REPLICATION USER='regular_user_p',PASSWORD='wrong';
+ERROR HY000: The server is not configured properly to be an active member of the group. Please see more details on error log.
+START GROUP_REPLICATION USER='regular_user_p';
+ERROR HY000: The server is not configured properly to be an active member of the group. Please see more details on error log.
+START GROUP_REPLICATION USER='regular_user_wp' ,  PASSWORD='password';
+ERROR HY000: The server is not configured properly to be an active member of the group. Please see more details on error log.
+
+# 7. Test right credentials in START GR connect with master.
+START GROUP_REPLICATION USER='regular_user_p' , PASSWORD='password';
+include/gr_wait_for_member_state.inc
+include/stop_group_replication.inc
+START GROUP_REPLICATION USER='regular_user_p' , PASSWORD='password' , DEFAULT_AUTH= 'auth_test_plugin';
+include/gr_wait_for_member_state.inc
+include/stop_group_replication.inc
+START GROUP_REPLICATION PASSWORD='password' , USER='regular_user_p', DEFAULT_AUTH='auth_test_plugin';
+include/gr_wait_for_member_state.inc
+include/stop_group_replication.inc
+START GROUP_REPLICATION USER='regular_user_p' , DEFAULT_AUTH= '' , PASSWORD='password';
+include/gr_wait_for_member_state.inc
+include/stop_group_replication.inc
+START GROUP_REPLICATION USER='regular_user_wp';
+include/gr_wait_for_member_state.inc
+include/stop_group_replication.inc
+START GROUP_REPLICATION USER='regular_user_wp' , PASSWORD='';
+include/gr_wait_for_member_state.inc
+include/stop_group_replication.inc
+
+# 8. Cleanup.
+CHANGE REPLICATION SOURCE TO SOURCE_USER='root' , SOURCE_PASSWORD='' FOR CHANNEL 'group_replication_recovery';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("Error while executing a group configuration operation: Could not extract the access credentials for XCom connections.*");
+call mtr.add_suppression("\\[GCS\\] Error connecting to the local group communication engine instance.*");
+call mtr.add_suppression("\\[GCS\\] Error testing to the local group communication engine instance.");
+call mtr.add_suppression("Timeout on wait for view after joining group.");
+SET SESSION sql_log_bin = 1;
+SET @@GLOBAL.group_replication_recovery_reconnect_interval = @saved_group_replication_recovery_reconnect_interval;
+SET @@GLOBAL.group_replication_recovery_retry_count = @saved_gr_recovery_retry_count;
+SET SQL_LOG_BIN=0;
+DROP USER 'regular_user_p';
+DROP USER 'regular_user_wp';
+SET SQL_LOG_BIN=1;
+[connection server1]
+SET SQL_LOG_BIN=0;
+DROP USER 'regular_user_p';
+DROP USER 'regular_user_wp';
+SET SQL_LOG_BIN=1;
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_start_replication_auto_with_ssl_recovery.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_start_replication_auto_with_ssl_recovery.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_start_replication_auto_with_ssl_recovery.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_start_replication_auto_with_ssl_recovery.result	2021-09-28 11:46:34.000000000 +0000
@@ -9,7 +9,10 @@
 set session sql_log_bin=0;
 CREATE USER 'rec_ssl_user'@'%' REQUIRE SSL;
 GRANT replication slave ON *.* TO 'rec_ssl_user'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'rec_ssl_user'@'%';
+FLUSH PRIVILEGES;
 set session sql_log_bin=1;
+SET GLOBAL group_replication_ssl_mode= REQUIRED;
 #
 # Start the member and add some data
 #
@@ -19,8 +22,15 @@
 #
 # On server 1 restart the server. Group replication should start at boot
 #
+set session sql_log_bin=0;
+CREATE USER 'rec_ssl_user'@'%' REQUIRE SSL;
+GRANT replication slave ON *.* TO 'rec_ssl_user'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'rec_ssl_user'@'%';
+FLUSH PRIVILEGES;
+set session sql_log_bin=1;
+SET GLOBAL group_replication_ssl_mode= REQUIRED;
 CHANGE REPLICATION SOURCE TO SOURCE_USER= 'rec_ssl_user' FOR CHANNEL 'group_replication_recovery';
-# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_start_on_boot=1
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_start_on_boot=1 --group_replication_ssl_mode=REQUIRED
 include/gr_wait_for_member_state.inc
 #
 # On server 1 after restart, recovery should be successful
@@ -44,3 +54,7 @@
 Warnings:
 Warning	1287	'RESET SLAVE' is deprecated and will be removed in a future release. Please use RESET REPLICA instead
 RESET MASTER;
+[connection server1]
+SET SESSION sql_log_bin=0;
+DROP USER 'rec_ssl_user';
+SET SESSION sql_log_bin=1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_start_stop_applier_thd_crash.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_start_stop_applier_thd_crash.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_start_stop_applier_thd_crash.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_start_stop_applier_thd_crash.result	2021-09-28 11:46:34.000000000 +0000
@@ -13,6 +13,9 @@
 call mtr.add_suppression("Error writing relay log configuration.");
 call mtr.add_suppression("Error writing master configuration");
 call mtr.add_suppression("Error reading master configuration");
+call mtr.add_suppression("Fatal error during execution on the Applier process of Group Replication. The server will now leave the group.");
+call mtr.add_suppression("Unable to confirm whether the server has left the group or not. Check performance_schema.replication_group_members to check group membership information.");
+call mtr.add_suppression("The server was automatically set into read only mode after an error was detected.");
 SET sql_log_bin = 1;
 
 # 1. START GROUP_REPLICATION on server1.
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_start_stop_parallel_applier_database.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_start_stop_parallel_applier_database.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_start_stop_parallel_applier_database.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_start_stop_parallel_applier_database.result	2021-09-28 11:46:34.000000000 +0000
@@ -3,8 +3,9 @@
 Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection server1]
-include/assert.inc [Default slave parallel type must be DATABASE]
-include/assert.inc [Default slave parallel workers must be 0]
+include/assert.inc [Default slave parallel type must be LOGICAL_CLOCK]
+include/assert.inc [Default slave parallel workers must be 4]
+include/assert.inc [Default slave preserve commit order 1]
 SET @replica_parallel_type_saved= @@GLOBAL.REPLICA_PARALLEL_TYPE;
 SET @replica_parallel_workers_saved= @@GLOBAL.REPLICA_PARALLEL_WORKERS;
 SET @slave_preserver_commit_order_saved= @@GLOBAL.REPLICA_PRESERVE_COMMIT_ORDER;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_startup_verifications_not_table_repositories.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_startup_verifications_not_table_repositories.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_startup_verifications_not_table_repositories.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_startup_verifications_not_table_repositories.result	2021-09-28 11:46:34.000000000 +0000
@@ -36,12 +36,18 @@
 include/assert.inc [Master info repository info storage is set to file]
 START GROUP_REPLICATION;
 ERROR HY000: The server is not configured properly to be an active member of the group. Please see more details on error log.
+SET sql_log_bin=0;
+CREATE USER 'internal_usr'@'%' IDENTIFIED BY 'unique_password';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'internal_usr'@'%';
+FLUSH PRIVILEGES;
+SET sql_log_bin=1;
 SET @@GLOBAL.relay_log_info_repository='TABLE';
 Warnings:
 Warning	1287	'@@relay_log_info_repository' is deprecated and will be removed in a future release.
 SET @@GLOBAL.master_info_repository='TABLE';
 Warnings:
 Warning	1287	'@@master_info_repository' is deprecated and will be removed in a future release.
+CHANGE MASTER TO MASTER_USER='internal_usr', MASTER_PASSWORD='unique_password' FOR CHANNEL 'group_replication_recovery';
 include/start_group_replication.inc
 SET @@GLOBAL.master_info_repository='FILE';
 ERROR HY000: Failure while changing the type of replication repository: Repository conversion is possible when only default channel exists.
@@ -56,3 +62,6 @@
 Warning	1287	'@@master_info_repository' is deprecated and will be removed in a future release.
 call mtr.add_suppression("Master info repository must be set to TABLE.");
 call mtr.add_suppression("Relay log info repository must be set to TABLE.");
+SET sql_log_bin=0;
+DROP USER 'internal_usr';
+SET sql_log_bin=1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_startup_verifications.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_startup_verifications.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_startup_verifications.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_startup_verifications.result	2021-09-28 11:46:34.000000000 +0000
@@ -22,16 +22,19 @@
 #
 SET @replica_parallel_type_saved= @@GLOBAL.REPLICA_PARALLEL_TYPE;
 SET @replica_parallel_workers_saved= @@GLOBAL.REPLICA_PARALLEL_WORKERS;
+SET @replica_preserve_commit_order= @@GLOBAL.REPLICA_PRESERVE_COMMIT_ORDER;
 SET @@GLOBAL.REPLICA_PARALLEL_TYPE= "DATABASE";
 SET GLOBAL REPLICA_PARALLEL_WORKERS= 4;
 START GROUP_REPLICATION;
 ERROR HY000: The server is not configured properly to be an active member of the group. Please see more details on error log.
 SET @@GLOBAL.REPLICA_PARALLEL_TYPE= "LOGICAL_CLOCK";
 SET GLOBAL REPLICA_PARALLEL_WORKERS= 4;
+SET @@GLOBAL.REPLICA_PRESERVE_COMMIT_ORDER= OFF;
 START GROUP_REPLICATION;
 ERROR HY000: The server is not configured properly to be an active member of the group. Please see more details on error log.
 SET @@GLOBAL.REPLICA_PARALLEL_TYPE= @replica_parallel_type_saved;
 SET @@GLOBAL.REPLICA_PARALLEL_WORKERS= @replica_parallel_workers_saved;
+SET @@GLOBAL.REPLICA_PRESERVE_COMMIT_ORDER= @replica_preserve_commit_order;
 call mtr.add_suppression("Binlog format should be ROW for Group Replication");
 call mtr.add_suppression("Extraction of transaction write sets requires*");
 call mtr.add_suppression("In order to use parallel applier on Group Replication, parameter replica-parallel-type must be set to 'LOGICAL_CLOCK'");
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_suspect_member_resumes_after_crash_mysql.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_suspect_member_resumes_after_crash_mysql.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_suspect_member_resumes_after_crash_mysql.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_suspect_member_resumes_after_crash_mysql.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,94 @@
+include/group_replication.inc [rpl_server_count=3]
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+############################################################
+# 1. Set group_replication_member_expel_timeout to
+#    3600 seconds.
+[connection server1]
+SET GLOBAL group_replication_member_expel_timeout = 3600;
+[connection server2]
+SET GLOBAL group_replication_member_expel_timeout = 3600;
+[connection server3]
+SET GLOBAL group_replication_member_expel_timeout = 3600;
+set session sql_log_bin=0;
+call mtr.add_suppression("read failed");
+call mtr.add_suppression("The member was unable to join the group. Local port: *.*");
+call mtr.add_suppression("Timeout on wait for view after joining group");
+call mtr.add_suppression("Error connecting to all peers. Member join failed. Local port: *.*");
+call mtr.add_suppression("Unable to start MySQL Network Provider*.*");
+call mtr.add_suppression("Timeout while waiting for the group communication engine to be ready*.*");
+call mtr.add_suppression("The group communication engine is not ready for the member to join*.*");
+set session sql_log_bin=1;
+
+############################################################
+# 2. Create a table and insert some data. Check that
+#    it is replicated to all servers.
+[connection server1]
+CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY);
+INSERT INTO t1 VALUES (1);
+include/rpl_sync.inc
+
+############################################################
+# 3. Crash server 3 and it will restart.
+[connection server3]
+# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME
+#
+# Restarting server 3
+include/rpl_reconnect.inc
+
+############################################################
+# 4. Check that all members are still in the group on
+#    servers 1 and 2, which should both be ONLINE.
+#    Server 3 should still be in the group but UNREACHABLE.
+[connection server1]
+[connection server2]
+
+############################################################
+# 5. Insert data into table t1 on server 2 and check that
+#    it is replicated to server 1.
+INSERT INTO t1 VALUES (2);
+[connection server1]
+
+############################################################
+# 6. Restart GR on server 3 and it should fail since its
+#    suspicion still hasn't timed out on other members.
+[connection server3]
+SET GLOBAL group_replication_group_name= "GROUP_REPLICATION_GROUP_NAME";
+SET GLOBAL group_replication_group_seeds= "SERVER1_LOCAL_ADDRESS";
+START GROUP_REPLICATION;
+ERROR HY000: The server is not configured properly to be an active member of the group. Please see more details on error log.
+
+############################################################
+# 7. Wait until server 3 is expelled from the group.
+[connection server1]
+SET GLOBAL group_replication_member_expel_timeout = DEFAULT;
+[connection server2]
+SET GLOBAL group_replication_member_expel_timeout = DEFAULT;
+[connection server1]
+[connection server2]
+
+############################################################
+# 8. Server 3 was expelled! Start GR on server 3.
+[connection server3]
+include/start_group_replication.inc
+SET GLOBAL group_replication_member_expel_timeout = DEFAULT;
+[connection server1]
+[connection server2]
+[connection server3]
+
+############################################################
+# 9. Check that server 3 retrieves the data inserted while
+#    it was suspended. Then, use it to insert new data into
+#    table t1 which should be replicated to servers 1 and 2.
+[connection server3]
+INSERT INTO t1 VALUES (3);
+include/rpl_sync.inc
+include/diff_tables.inc [server1:t1, server2:t1, server3:t1]
+
+############################################################
+# 10. Clean up.
+DROP TABLE t1;
+include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_suspect_member_resumes_after_crash.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_suspect_member_resumes_after_crash.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_suspect_member_resumes_after_crash.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_suspect_member_resumes_after_crash.result	2021-09-28 11:46:34.000000000 +0000
@@ -18,6 +18,9 @@
 call mtr.add_suppression("The member was unable to join the group. Local port: *.*");
 call mtr.add_suppression("Timeout on wait for view after joining group");
 call mtr.add_suppression("Error connecting to all peers. Member join failed. Local port: *.*");
+call mtr.add_suppression("Unable to start MySQL Network Provider*.*");
+call mtr.add_suppression("Timeout while waiting for the group communication engine to be ready*.*");
+call mtr.add_suppression("The group communication engine is not ready for the member to join*.*");
 set session sql_log_bin=1;
 
 ############################################################
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_uninstall_while_network_blocked.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_uninstall_while_network_blocked.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_uninstall_while_network_blocked.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_uninstall_while_network_blocked.result	2021-09-28 11:46:34.000000000 +0000
@@ -9,7 +9,7 @@
 [connection server2]
 
 # 1. Kill and restart server 2
-# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS2 --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME
+# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS2 --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_communication_stack=GROUP_REPLICATION_COMMUNICATION_STACK
 include/rpl_reconnect.inc
 [connection server1]
 
@@ -38,7 +38,7 @@
 
 # 6. Clean-up
 [connection server1]
-# CR_SERVER_LOST, CR_SERVER_GONE_ERROR
+# CR_SERVER_LOST, CR_SERVER_GONE_ERROR or Rollback
 Got one of the listed errors
 include/rpl_start_server.inc [server_number=1]
 include/rpl_reconnect.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_variables_default_values.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_variables_default_values.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_variables_default_values.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_variables_default_values.result	2021-09-28 11:46:34.000000000 +0000
@@ -26,9 +26,9 @@
 #
 # Test Unit#1
 # Set global/session group replication variables to default.
-# Curently there are 59 group replication variables.
+# Curently there are 61 group replication variables.
 #
-include/assert.inc [There are 59 GR variables at present.]
+include/assert.inc [There are 61 GR variables at present.]
 SET @@GLOBAL.group_replication_auto_increment_increment= default;
 ERROR 42000: Variable 'group_replication_auto_increment_increment' can't be set to the value of 'DEFAULT'
 SET @@GLOBAL.group_replication_compression_threshold= default;
@@ -82,6 +82,8 @@
 SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= default;
 SET @@GLOBAL.group_replication_advertise_recovery_endpoints = default;
 SET @@GLOBAL.group_replication_view_change_uuid= default;
+SET @@GLOBAL.group_replication_communication_stack = default;
+SET @@GLOBAL.group_replication_paxos_single_leader = default;
 SET @@SESSION.group_replication_consistency= default;
 #
 # Test Unit#2
@@ -90,7 +92,7 @@
 include/assert.inc [Default group_replication_allow_local_lower_version_join is OFF/0]
 include/assert.inc [Default group_replication_auto_increment_increment is 7]
 include/assert.inc [Default group_replication_bootstrap_group is OFF/0]
-include/assert.inc [Default group_replication_components_stop_timeout is 31536000]
+include/assert.inc [Default group_replication_components_stop_timeout is 300]
 include/assert.inc [Default group_replication_compression_threshold is 1000000]
 include/assert.inc [Default group_replication_force_members is ""(EMPTY)]
 include/assert.inc [Default group_replication_ip_allowlist is AUTOMATIC]
@@ -130,6 +132,8 @@
 include/assert.inc [Default group_replication_recovery_tls_ciphersuites is NULL]
 include/assert.inc [Default group_replication_advertise_recovery_endpoints is "DEFAULT"]
 include/assert.inc [Default group_replication_view_change_uuid is "AUTOMATIC"]
+include/assert.inc [Default group_replication_communication_stack is XCom]
+include/assert.inc [Default group_replication_paxos_single_leader is 0]
 #
 # Clean up
 #
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_variables_mysqladmin.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_variables_mysqladmin.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_variables_mysqladmin.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_variables_mysqladmin.result	2021-09-28 11:46:34.000000000 +0000
@@ -14,7 +14,7 @@
 group_replication_bootstrap_group
 OFF
 group_replication_components_stop_timeout
-31536000
+300
 group_replication_compression_threshold
 1000000
 group_replication_force_members
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_variables_privileges.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_variables_privileges.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_variables_privileges.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_variables_privileges.result	2021-09-28 11:46:34.000000000 +0000
@@ -41,6 +41,8 @@
 ERROR 42000: Access denied; you need (at least one of) the SUPER or SYSTEM_VARIABLES_ADMIN privilege(s) for this operation
 SET GLOBAL group_replication_communication_max_message_size = @@GLOBAL.group_replication_communication_max_message_size;
 ERROR 42000: Access denied; you need (at least one of) the SUPER or SYSTEM_VARIABLES_ADMIN privilege(s) for this operation
+SET GLOBAL group_replication_communication_stack = @@GLOBAL.group_replication_communication_stack;
+ERROR 42000: Access denied; you need (at least one of) the SUPER or SYSTEM_VARIABLES_ADMIN privilege(s) for this operation
 SET GLOBAL group_replication_components_stop_timeout = @@GLOBAL.group_replication_components_stop_timeout;
 ERROR 42000: Access denied; you need (at least one of) the SUPER or SYSTEM_VARIABLES_ADMIN privilege(s) for this operation
 SET GLOBAL group_replication_compression_threshold = @@GLOBAL.group_replication_compression_threshold;
@@ -91,6 +93,8 @@
 ERROR 42000: Access denied; you need (at least one of) the SUPER or SYSTEM_VARIABLES_ADMIN privilege(s) for this operation
 SET GLOBAL group_replication_message_cache_size = @@GLOBAL.group_replication_message_cache_size;
 ERROR 42000: Access denied; you need (at least one of) the SUPER or SYSTEM_VARIABLES_ADMIN privilege(s) for this operation
+SET GLOBAL group_replication_paxos_single_leader = @@GLOBAL.group_replication_paxos_single_leader;
+ERROR 42000: Access denied; you need (at least one of) the SUPER or SYSTEM_VARIABLES_ADMIN privilege(s) for this operation
 SET GLOBAL group_replication_poll_spin_loops = @@GLOBAL.group_replication_poll_spin_loops;
 ERROR 42000: Access denied; you need (at least one of) the SUPER or SYSTEM_VARIABLES_ADMIN privilege(s) for this operation
 SET GLOBAL group_replication_recovery_complete_at = @@GLOBAL.group_replication_recovery_complete_at;
@@ -165,6 +169,7 @@
 SET GLOBAL group_replication_clone_threshold = @@GLOBAL.group_replication_clone_threshold;
 SET GLOBAL group_replication_communication_debug_options = @@GLOBAL.group_replication_communication_debug_options;
 SET GLOBAL group_replication_communication_max_message_size = @@GLOBAL.group_replication_communication_max_message_size;
+SET GLOBAL group_replication_communication_stack = @@GLOBAL.group_replication_communication_stack;
 SET GLOBAL group_replication_components_stop_timeout = @@GLOBAL.group_replication_components_stop_timeout;
 SET GLOBAL group_replication_compression_threshold = @@GLOBAL.group_replication_compression_threshold;
 SET GLOBAL group_replication_consistency = @@GLOBAL.group_replication_consistency;
@@ -193,6 +198,7 @@
 SET GLOBAL group_replication_member_expel_timeout = @@GLOBAL.group_replication_member_expel_timeout;
 SET GLOBAL group_replication_member_weight = @@GLOBAL.group_replication_member_weight;
 SET GLOBAL group_replication_message_cache_size = @@GLOBAL.group_replication_message_cache_size;
+SET GLOBAL group_replication_paxos_single_leader = @@GLOBAL.group_replication_paxos_single_leader;
 SET GLOBAL group_replication_poll_spin_loops = @@GLOBAL.group_replication_poll_spin_loops;
 SET GLOBAL group_replication_recovery_complete_at = @@GLOBAL.group_replication_recovery_complete_at;
 SET GLOBAL group_replication_recovery_compression_algorithms = @@GLOBAL.group_replication_recovery_compression_algorithms;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_view_change_delayed_write_order.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_view_change_delayed_write_order.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_view_change_delayed_write_order.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_view_change_delayed_write_order.result	2021-09-28 11:46:34.000000000 +0000
@@ -9,6 +9,7 @@
 SET SESSION sql_log_bin= 0;
 CREATE USER "recovery_user" IDENTIFIED BY "recovery_password";
 GRANT REPLICATION SLAVE ON *.* TO "recovery_user";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO "recovery_user"@'%';;
 FLUSH PRIVILEGES;
 SET SESSION sql_log_bin= 1;
 #
@@ -17,6 +18,11 @@
 include/start_and_bootstrap_group_replication.inc
 CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
 [connection server2]
+SET SESSION sql_log_bin= 0;
+CREATE USER "recovery_user" IDENTIFIED BY "recovery_password";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO "recovery_user"@'%';;
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
 include/start_group_replication.inc
 #
 # 3. Block a local transaction on server 1
@@ -27,6 +33,11 @@
 # 4. Start server 3, it should be stuck in recovery
 #    Even after 15 seconds it should still be stuck
 [connection server3]
+SET SESSION sql_log_bin= 0;
+CREATE USER "recovery_user" IDENTIFIED BY "recovery_password";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO "recovery_user"@'%';;
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
 CHANGE REPLICATION SOURCE TO SOURCE_USER= 'recovery_user', SOURCE_PASSWORD= 'recovery_password' FOR CHANNEL 'group_replication_recovery';
 include/start_group_replication.inc
 include/gr_wait_for_member_state.inc
@@ -66,7 +77,16 @@
 SET SESSION sql_log_bin= 1;
 [connection server3]
 SET SESSION sql_log_bin= 0;
+DROP USER "recovery_user";
+SET SESSION sql_log_bin= 1;
+SET SESSION sql_log_bin= 0;
+call mtr.add_suppression("Slave I/O for channel 'group_replication_recovery': Master command COM_REGISTER_SLAVE failed.*");
+call mtr.add_suppression("Slave I/O thread couldn't register on master.*");
 call mtr.add_suppression("There was an error when connecting to the donor server.*");
 call mtr.add_suppression("For details please check performance_schema.replication_connection_status table and error log messages of Slave I/O for channel group_replication_recovery.");
 SET SESSION sql_log_bin= 1;
+[connection server2]
+SET SESSION sql_log_bin= 0;
+DROP USER "recovery_user";
+SET SESSION sql_log_bin= 1;
 include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_view_change_uuid_check_configuration.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_view_change_uuid_check_configuration.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_view_change_uuid_check_configuration.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_view_change_uuid_check_configuration.result	2021-09-28 11:46:34.000000000 +0000
@@ -46,4 +46,7 @@
 ERROR HY000: Variable 'group_replication_group_name' cannot be set to the value of '9f46e042-98a0-439d-a8fb-7130670ca49b'. The value is the same as group_replication_view_change_uuid. Please change group_replication_view_change_uuid to AUTOMATIC
 ####################################################################
 # 5. Cleanup
+RESET PERSIST;
 SET GLOBAL group_replication_view_change_uuid = VIEW_CHANGE_UUID;
+Warnings:
+Warning	3615	Variable group_replication_ip_allowlist does not exist in persisted config file
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_view_change_uuid_delayed_write_local_commit.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_view_change_uuid_delayed_write_local_commit.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_view_change_uuid_delayed_write_local_commit.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_view_change_uuid_delayed_write_local_commit.result	2021-09-28 11:46:34.000000000 +0000
@@ -9,12 +9,17 @@
 
 ############################################################
 #  2. Start 2 servers.
-#     Only setup recovery_user on server2 for force server3
-#     to recover from it.
+#     Only setup recovery_user with GRANT REPLICATION SLAVE on server2
+#     for force server3 to recover from it.
 [connection server1]
 SET sql_log_bin = 0;
 include/gtid_utils.inc
 SET sql_log_bin = 1;
+SET SESSION sql_log_bin= 0;
+CREATE USER "recovery_user" IDENTIFIED BY "recovery_password";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO "recovery_user";
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
 SET @group_replication_view_change_uuid_save= @@GLOBAL.group_replication_view_change_uuid;
 SET @@GLOBAL.group_replication_view_change_uuid = "c0dec0de-c0de-c0de-c0de-c0dec0dec0de";
 include/start_and_bootstrap_group_replication.inc
@@ -27,6 +32,7 @@
 SET SESSION sql_log_bin= 0;
 CREATE USER "recovery_user" IDENTIFIED BY "recovery_password";
 GRANT REPLICATION SLAVE ON *.* TO "recovery_user";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO "recovery_user";
 FLUSH PRIVILEGES;
 SET SESSION sql_log_bin= 1;
 SET @group_replication_view_change_uuid_save= @@GLOBAL.group_replication_view_change_uuid;
@@ -50,9 +56,17 @@
 include/gtid_utils.inc
 SET sql_log_bin = 1;
 SET SESSION sql_log_bin= 0;
+call mtr.add_suppression("Slave I/O for channel 'group_replication_recovery': Master command COM_REGISTER_SLAVE failed*");
+call mtr.add_suppression("Slave I/O thread couldn't register on master*");
 call mtr.add_suppression("There was an error when connecting to the donor server.*");
 call mtr.add_suppression("For details please check performance_schema.replication_connection_status table and error log messages of Slave I/O for channel group_replication_recovery.");
 SET SESSION sql_log_bin= 1;
+SET SESSION sql_log_bin= 0;
+CREATE USER "recovery_user" IDENTIFIED BY "recovery_password";
+GRANT REPLICATION SLAVE ON *.* TO "recovery_user";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO "recovery_user";
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
 CHANGE REPLICATION SOURCE TO SOURCE_USER= 'recovery_user', SOURCE_PASSWORD= 'recovery_password' FOR CHANNEL 'group_replication_recovery';
 SET @group_replication_view_change_uuid_save= @@GLOBAL.group_replication_view_change_uuid;
 SET @@GLOBAL.group_replication_view_change_uuid = "c0dec0de-c0de-c0de-c0de-c0dec0dec0de";;
@@ -133,12 +147,18 @@
 [connection server1]
 include/stop_group_replication.inc
 SET @@GLOBAL.group_replication_view_change_uuid= @group_replication_view_change_uuid_save;
+SET SESSION sql_log_bin= 0;
+DROP USER "recovery_user";
+SET SESSION sql_log_bin= 1;
 SET sql_log_bin = 0;
 include/gtid_utils_end.inc
 SET sql_log_bin = 1;
 [connection server3]
 include/stop_group_replication.inc
 SET @@GLOBAL.group_replication_view_change_uuid= @group_replication_view_change_uuid_save;
+SET SESSION sql_log_bin= 0;
+DROP USER "recovery_user";
+SET SESSION sql_log_bin= 1;
 SET sql_log_bin = 0;
 include/gtid_utils_end.inc
 SET sql_log_bin = 1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_view_change_uuid_validation_with_anonymous_server.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_view_change_uuid_validation_with_anonymous_server.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_view_change_uuid_validation_with_anonymous_server.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_view_change_uuid_validation_with_anonymous_server.result	2021-09-28 11:46:34.000000000 +0000
@@ -124,4 +124,9 @@
 [connection server2]
 include/stop_group_replication.inc
 SET GLOBAL group_replication_view_change_uuid = VIEW_CHANGE_UUID;
+[connection server1]
+RESET PERSIST;
+include/rpl_reconnect.inc
 include/group_replication_end.inc
+Warnings:
+Warning	3615	Variable group_replication_ip_allowlist does not exist in persisted config file
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_write_concurrency.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_write_concurrency.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_write_concurrency.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_write_concurrency.result	2021-09-28 11:46:34.000000000 +0000
@@ -12,6 +12,7 @@
 # 2. Confirm default value on M1, M2
 [connection server1]
 include/assert.inc [write_concurrency is supposed to be 10 by default]
+include/assert.inc [write_concurrency (10) should be 10]
 [connection server2]
 SET SESSION sql_log_bin = 0;
 call mtr.add_suppression("Could not execute Write_rows event on table test.t2; Duplicate entry '11'*");
@@ -22,19 +23,24 @@
 call mtr.add_suppression(".*Slave SQL for channel 'group_replication_applier': ... The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state*");
 SET SESSION sql_log_bin = 1;
 include/assert.inc [write_concurrency is supposed to be 10 by default]
+include/assert.inc [write_concurrency (10) should be 10]
 ###############################################################################
 # 3. Increase write_concurrency via M1, confirm on M1, M2
 [connection server1]
 SELECT group_replication_set_write_concurrency(42);
 group_replication_set_write_concurrency(42)
 UDF is asynchronous, check log or call group_replication_get_write_concurrency().
+include/assert.inc [write_concurrency (42) should be 42]
 [connection server2]
+include/assert.inc [write_concurrency (42) should be 42]
 ###############################################################################
 # 4. Decrease write_concurrency via M2, confirm on M1, M2
 SELECT group_replication_set_write_concurrency(10);
 group_replication_set_write_concurrency(10)
 UDF is asynchronous, check log or call group_replication_get_write_concurrency().
+include/assert.inc [write_concurrency (10) should be 10]
 [connection server1]
+include/assert.inc [write_concurrency (10) should be 10]
 ###############################################################################
 # 5. Confirm invalid calls to group_replication_get_write_concurrency
 SELECT group_replication_get_write_concurrency(1);
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_xplugin_global_variables.result mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_xplugin_global_variables.result
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/r/gr_xplugin_global_variables.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/r/gr_xplugin_global_variables.result	2021-09-28 11:46:34.000000000 +0000
@@ -27,7 +27,7 @@
 include/gr_wait_for_member_state.inc
 include/assert.inc [group_replication_allow_local_lower_version_join is OFF]
 include/assert.inc [group_replication_auto_increment_increment is 7]
-include/assert.inc [group_replication_components_stop_timeout is 31536000]
+include/assert.inc [group_replication_components_stop_timeout is 300]
 include/assert.inc [group_replication_compression_threshold is 1000000]
 include/assert.inc [group_replication_enforce_update_everywhere_checks is ON]
 include/assert.inc [group_replication_flow_control_applier_threshold is 25000]
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_abort_query_on_plugin_error.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_abort_query_on_plugin_error.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_abort_query_on_plugin_error.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_abort_query_on_plugin_error.test	2021-09-28 11:46:34.000000000 +0000
@@ -34,6 +34,13 @@
 
 --connection server1
 --echo server1
+
+SET sql_log_bin=0;
+CREATE USER 'dummy_user'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'dummy_user'@'%';
+FLUSH PRIVILEGES;
+SET sql_log_bin=1;
+
 --source include/start_and_bootstrap_group_replication.inc
 
 CREATE TABLE t1 (a INT NOT NULL AUTO_INCREMENT PRIMARY KEY , b INT);
@@ -49,7 +56,15 @@
 
 --source include/stop_group_replication.inc
 
+SET sql_log_bin=0;
+CREATE USER 'dummy_user'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'dummy_user'@'%';
+FLUSH PRIVILEGES;
+SET sql_log_bin=1;
+
 set session sql_log_bin=0;
+call mtr.add_suppression("Slave I/O for channel 'group_replication_recovery': Master command COM_REGISTER_SLAVE failed*");
+call mtr.add_suppression("Slave I/O thread couldn't register on master*");
 call mtr.add_suppression("There was an error when connecting to the donor*");
 call mtr.add_suppression("For details please check performance_schema.replication_connection_status table and error log messages of Slave I/O for channel group_replication_recovery.");
 call mtr.add_suppression("Maximum number of retries when*");
@@ -94,6 +109,10 @@
 --source include/stop_group_replication.inc
 
 --disable_warnings
+SET sql_log_bin=0;
+DROP USER 'dummy_user'@'%';
+SET sql_log_bin=1;
+
 CHANGE REPLICATION SOURCE TO SOURCE_USER='root' FOR CHANNEL 'group_replication_recovery';
 --enable_warnings
 
@@ -108,6 +127,11 @@
 --echo # Assert that server1 and server2 have the same data and GTID_EXECUTED.
 
 --connection server1
+SET sql_log_bin=0;
+DROP USER 'dummy_user'@'%';
+SET sql_log_bin=1;
+
+--connection server1
 --echo server1
 --let $assert_text= 'There is a value 1 in table t1 on server1'
 --let $assert_cond= [SELECT COUNT(*) AS count FROM t1, count, 1] = 1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_2groups_failover.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_2groups_failover.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_2groups_failover.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_2groups_failover.test	2021-09-28 11:46:34.000000000 +0000
@@ -31,6 +31,9 @@
 --let $rpl_server_count= 5
 --source include/group_replication.inc
 
+#check which stack are we using
+--let $have_xcom_stack= `SELECT @@group_replication_communication_stack LIKE 'XCOM'`
+
 
 --echo
 --echo # 1. Deploy a 2 members group A in single primary mode.
@@ -41,7 +44,15 @@
 --let $group_replication_group_name= aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa
 --let $group_a= $group_replication_group_name
 --disable_query_log
+
+if ($have_xcom_stack){
 --eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_GR_PORT_1,localhost:$SERVER_GR_PORT_2"
+}
+
+if (!$have_xcom_stack){
+--eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_MYPORT_1,localhost:$SERVER_MYPORT_2"
+}
+
 --enable_query_log
 --source include/start_and_bootstrap_group_replication.inc
 
@@ -49,7 +60,13 @@
 --source include/rpl_connection.inc
 --let $server2_uuid= `SELECT @@server_uuid`
 --disable_query_log
+if ($have_xcom_stack){
 --eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_GR_PORT_1,localhost:$SERVER_GR_PORT_2"
+}
+
+if (!$have_xcom_stack){
+--eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_MYPORT_1,localhost:$SERVER_MYPORT_2"
+}
 --enable_query_log
 --source include/start_group_replication.inc
 
@@ -63,7 +80,12 @@
 --let $group_replication_group_name= bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb
 --let $group_b= $group_replication_group_name
 --disable_query_log
+if ($have_xcom_stack){
 --eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_GR_PORT_3,localhost:$SERVER_GR_PORT_4"
+}
+if (!$have_xcom_stack){
+--eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_MYPORT_3,localhost:$SERVER_MYPORT_4"
+}
 --enable_query_log
 --source include/start_and_bootstrap_group_replication.inc
 
@@ -71,7 +93,12 @@
 --source include/rpl_connection.inc
 --let $server4_uuid= `SELECT @@server_uuid`
 --disable_query_log
+if ($have_xcom_stack){
 --eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_GR_PORT_3,localhost:$SERVER_GR_PORT_4"
+}
+if (!$have_xcom_stack){
+--eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_MYPORT_3,localhost:$SERVER_MYPORT_4"
+}
 --enable_query_log
 --source include/start_group_replication.inc
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_disable_failover.cnf mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_disable_failover.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_disable_failover.cnf	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_disable_failover.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -9,14 +9,7 @@
 loose-group_replication_enforce_update_everywhere_checks= FALSE
 
 [mysqld.3]
-loose-group_replication_single_primary_mode= TRUE
-loose-group_replication_enforce_update_everywhere_checks= FALSE
-
-[mysqld.4]
 
 [ENV]
 SERVER_MYPORT_3=		@mysqld.3.port
 SERVER_MYSOCK_3=		@mysqld.3.socket
-
-SERVER_MYPORT_4=		@mysqld.4.port
-SERVER_MYSOCK_4=		@mysqld.4.socket
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_disable_failover.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_disable_failover.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_disable_failover.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_disable_failover.test	2021-09-28 11:46:34.000000000 +0000
@@ -1,41 +1,29 @@
 ################################################################################
-# Validate that the replication asynchronous connection failover feature can be
-# enabled or disabled on running channel (replica doesn't need to be stopped),
-# and so Monitor IO thread MUST not update sender details or stop channel, for
-# the channel which is no longer managed i.e. SOURCE_CONNECTION_AUTO_FAILOVER=0.
+# Validate that the replication asynchronous connection failover feature cannot
+# be disabled on running channels.
 #
 # Test:
 # 0. The test requires 4 servers:
 #      server1: group primary
 #      server2: group secondary
-#      server3: group secondary
-#      server4: replica server
-# 1. Deploy a 3 members group in single primary mode.
+#      server3: replica server
+# 1. Deploy a 2 members group in single primary mode.
 # 2. Configure replica to manage the asynchronous connection
 #    to group.
-# 3. Disable the SOURCE_CONNECTION_AUTO_FAILOVER option but
-#    leave the channel running.
-# 4. Make server2 the group primary, despite primary_weight
-#    is bigger, since SOURCE_CONNECTION_AUTO_FAILOVER is
-#    disabled on channel 'ch1', ch1 will remain connected to
-#    server1.
-# 5. Shutdown server1, since SOURCE_CONNECTION_AUTO_FAILOVER
-#    is disabled on channel ch1, ch1 will stop (instead of reconnect).
-# 6. Verify that replication_asynchronous_connection_failover
-#    did not change after SOURCE_CONNECTION_AUTO_FAILOVER was
-#    disabled.
-# 7. Clean up.
+# 3. Try disable the SOURCE_CONNECTION_AUTO_FAILOVER option
+#    without stopping the channel.
+# 4. Clean up.
 ################################################################################
 --source include/big_test.inc
 --source include/have_group_replication_plugin.inc
 --let $rpl_skip_group_replication_start= 1
---let $rpl_server_count= 4
+--let $rpl_server_count= 3
 --source include/group_replication.inc
 
 
 --echo
 --echo ############################################################
---echo # 1. Deploy a 3 members group in single primary mode.
+--echo # 1. Deploy a 2 members group in single primary mode.
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
 --let $server1_uuid= `SELECT @@server_uuid`
@@ -45,16 +33,12 @@
 --source include/rpl_connection.inc
 --source include/start_group_replication.inc
 
---let $rpl_connection_name= server3
---source include/rpl_connection.inc
---source include/start_group_replication.inc
-
 
 --echo
 --echo ############################################################
 --echo # 2. Configure replica to manage the asynchronous connection
 --echo #    to group.
---let $rpl_connection_name= server4
+--let $rpl_connection_name= server3
 --source include/rpl_connection.inc
 
 --replace_result $SERVER_MYPORT_1 SERVER_MYPORT_1 $group_replication_group_name GROUP_NAME
@@ -72,7 +56,7 @@
 --echo
 --echo ############################################################
 --echo # 2. Create and start the managed channel.
---let $rpl_connection_name= server4
+--let $rpl_connection_name= server3
 --source include/rpl_connection.inc
 --replace_result $SERVER_MYPORT_1 SERVER_1_PORT
 --eval CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=1, SOURCE_PORT=$SERVER_MYPORT_1, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1'
@@ -85,99 +69,31 @@
 --let $assert_cond= "[SELECT SERVICE_STATE FROM performance_schema.replication_connection_status WHERE channel_name=\'ch1\' AND source_uuid=\'$server1_uuid\', SERVICE_STATE, 1]" = "ON"
 --source include/assert.inc
 
---let $wait_condition= SELECT COUNT(*)=3 FROM performance_schema.replication_asynchronous_connection_failover
+--let $wait_condition= SELECT COUNT(*)=2 FROM performance_schema.replication_asynchronous_connection_failover
 --source include/wait_condition.inc
 
 
 --echo
 --echo ############################################################
---echo # 3. Disable the SOURCE_CONNECTION_AUTO_FAILOVER option but
---echo #    leave the channel running.
---let $rpl_connection_name= server4
+--echo # 3. Try disable the SOURCE_CONNECTION_AUTO_FAILOVER option
+--echo #    without stopping the channel.
+--let $rpl_connection_name= server3
 --source include/rpl_connection.inc
+--error ER_SLAVE_CHANNEL_MUST_STOP
 CHANGE REPLICATION SOURCE TO SOURCE_CONNECTION_AUTO_FAILOVER=0 FOR CHANNEL 'ch1';
 
---let $assert_text= Verify replica_monitor thread is not running
---let $assert_cond= "[select count(*) FROM performance_schema.threads where NAME=\"thread/sql/replica_monitor\"]" = 0;
+--let $assert_text= Verify replica_monitor thread is running
+--let $assert_cond= "[select count(*) FROM performance_schema.threads where NAME=\"thread/sql/replica_monitor\"]" = 1;
 --source include/assert.inc
 
 
 --echo
 --echo ############################################################
---echo # 4. Make server2 the group primary, despite primary_weight
---echo #    is bigger, since SOURCE_CONNECTION_AUTO_FAILOVER is
---echo #    disabled on channel 'ch1', ch1 will remain connected to
---echo #    server1.
---let $rpl_connection_name= server2
---source include/rpl_connection.inc
---let $server2_uuid= `SELECT @@server_uuid`
---replace_result $server2_uuid SERVER2_UUID
---eval SELECT group_replication_set_as_primary("$server2_uuid")
---source include/gr_assert_primary_member.inc
-
---let $rpl_connection_name= server4
---source include/rpl_connection.inc
---let $assert_text= Verify channel ch1 IO_THREAD is ON and connected to server1
---let $assert_cond= "[SELECT SERVICE_STATE FROM performance_schema.replication_connection_status WHERE channel_name=\'ch1\' AND source_uuid=\'$server1_uuid\', SERVICE_STATE, 1]" = "ON"
---source include/assert.inc
-
-
---echo
---echo ############################################################
---echo # 5. Shutdown server1, since SOURCE_CONNECTION_AUTO_FAILOVER
---echo # is disabled on channel ch1, ch1 will stop (instead of reconnect).
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
-# When a member leaves a group it does close all dump threads.
-# Though we need to shutdown instead of simply leave the group to avoid
-# the legacy IO thread reconnection. It is not possible to disable it.
-# MASTER_RETRY_COUNT minimum value is 1, 0 value means infinite.
---let $rpl_server_number= 1
---source include/rpl_stop_server.inc
-
---let $rpl_connection_name= server4
---source include/rpl_connection.inc
---echo Wait until ch1 IO_THREAD stops
---let $wait_condition= SELECT service_state="OFF" FROM performance_schema.replication_connection_status WHERE channel_name="ch1"
---source include/wait_condition.inc
-
---let $assert_text= Verify channel ch1 SQL_THREAD is ON
---let $assert_cond= "[SELECT SERVICE_STATE FROM performance_schema.replication_applier_status WHERE channel_name=\'ch1\', SERVICE_STATE, 1]" = "ON"
---source include/assert.inc
-
-
---echo
---echo ############################################################
---echo # 6. Verify that replication_asynchronous_connection_failover
---echo #    did not change after SOURCE_CONNECTION_AUTO_FAILOVER was
---echo #    disabled.
---let $rpl_connection_name= server4
---source include/rpl_connection.inc
-
---let $assert_text= 'There is one row in performance_schema.replication_asynchronous_connection_failover for server1'
---let $assert_cond= [SELECT  COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover WHERE port=$SERVER_MYPORT_1, count, 1] = 1
---source include/assert.inc
-
---let $assert_text= 'There is one row in performance_schema.replication_asynchronous_connection_failover for server2'
---let $assert_cond= [SELECT  COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover WHERE port=$SERVER_MYPORT_2, count, 1] = 1
---source include/assert.inc
-
---let $assert_text= 'There is one row in performance_schema.replication_asynchronous_connection_failover for server3'
---let $assert_cond= [SELECT  COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover WHERE port=$SERVER_MYPORT_3, count, 1] = 1
---source include/assert.inc
-
-
---echo
---echo ############################################################
---echo # 7. Clean up.
---let $rpl_connection_name= server4
+--echo # 4. Clean up.
+--let $rpl_connection_name= server3
 --source include/rpl_connection.inc
 --let $rpl_channel_name='ch1'
---let $slave_error_param= Last_IO_Errno
---let $slave_io_errno=2003
 --source include/stop_slave.inc
---let $slave_error_param=
---let $slave_io_errno=
 
 --let $rpl_reset_slave_all= 1
 --let $rpl_multi_source= 1
@@ -197,28 +113,12 @@
 --let $assert_cond= [SELECT  COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover_managed, count, 1] = 0
 --source include/assert.inc
 
-SET SESSION sql_log_bin = 0;
-call mtr.add_suppression("The source .* for channel 'ch1' has joined the group .*, and so added its entry into replication_asynchronous_connection_failover table.");
-call mtr.add_suppression("The source .* for channel 'ch1' has left the group .*, and so removed its entry from replication_asynchronous_connection_failover table.");
-call mtr.add_suppression("The group .* for the channel .* has been removed, and so removed its entry from replication_asynchronous_connection_failover_managed and all the group members from replication_asynchronous_connection_failover table.");
-call mtr.add_suppression("The group .* for the channel .* has been added, and so added its entry in replication_asynchronous_connection_failover_managed and source to replication_asynchronous_connection_failover table.");
-SET SESSION sql_log_bin = 1;
-
---let $rpl_connection_name= server3
---source include/rpl_connection.inc
---source include/stop_group_replication.inc
-
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
 --source include/stop_group_replication.inc
 
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
---enable_reconnect
---exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
---source include/wait_until_connected_again.inc
---disable_reconnect
---let $rpl_server_number= 1
---source include/rpl_reconnect.inc
+--source include/stop_group_replication.inc
 
 --source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_enable_disable_on_secondaries.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_enable_disable_on_secondaries.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_enable_disable_on_secondaries.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_enable_disable_on_secondaries.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,77 @@
+###############################################################################
+# Validate that UDFs
+#   asynchronous_connection_failover_reset
+#   asynchronous_connection_failover_add_source
+#   asynchronous_connection_failover_delete_source
+#   asynchronous_connection_failover_add_managed
+#   asynchronous_connection_failover_delete_managed
+# cannot be changed on a Group Replication secondary member.
+#
+# Test:
+#   0. This test requires two servers
+#   1. Try to enable and disable a replication failover configuration
+#      on a secondary.
+#      It will not be allowed.
+#   2. Check that configuration was not changed.
+#   3. Clean up
+###############################################################################
+--source include/have_group_replication_plugin.inc
+--let $rpl_skip_group_replication_start= 1
+--let $rpl_group_replication_single_primary_mode=1
+--source include/group_replication.inc
+
+--echo ############################################################
+--echo # 1. Try to enable and disable a replication failover configuration
+--echo #    on a secondary.
+--echo #    It will not be allowed.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/start_and_bootstrap_group_replication.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--source include/start_group_replication.inc
+--source include/gr_assert_secondary_member.inc
+
+--error ER_CANT_INITIALIZE_UDF
+SELECT asynchronous_connection_failover_reset();
+
+--error ER_CANT_INITIALIZE_UDF
+SELECT asynchronous_connection_failover_add_source('ch1', '127.0.0.1', 3306, '', 50);
+
+--error ER_CANT_INITIALIZE_UDF
+SELECT asynchronous_connection_failover_delete_source('ch1', '127.0.0.1', 3306, '');
+
+--error ER_CANT_INITIALIZE_UDF
+SELECT asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa','127.0.0.1', 3306, '', 80, 60);
+
+--error ER_CANT_INITIALIZE_UDF
+SELECT asynchronous_connection_failover_delete_managed('ch1', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa');
+
+--error ER_OPERATION_NOT_ALLOWED_ON_GR_SECONDARY
+CHANGE REPLICATION SOURCE TO SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=1 FOR CHANNEL 'ch1';
+
+
+--echo
+--echo ############################################################
+--echo # 2. Check that configuration was not changed.
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--let $assert_text= There must be no failover sources
+--let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_asynchronous_connection_failover] = 0
+--source include/assert.inc
+
+--let $assert_text= There must be no failover managed sources
+--let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_asynchronous_connection_failover_managed] = 0
+--source include/assert.inc
+
+--let $assert_text= 'There is no replication channel ch1'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM performance_schema.replication_connection_status where CHANNEL_NAME="ch1", count, 1] = 0
+--source include/assert.inc
+
+
+--echo
+--echo ############################################################
+--echo # 3. Clean up.
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_enable_failover.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_enable_failover.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_enable_failover.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_enable_failover.test	2021-09-28 11:46:34.000000000 +0000
@@ -1,6 +1,6 @@
 ################################################################################
-# Validate that the replication asynchronous connection failover feature can be
-# enabled when a replication channel is already running.
+# Validate that the replication asynchronous connection failover feature cannot
+# be enabled when a replication channel is already running.
 #
 # Test:
 # 0. The test requires 4 servers:
@@ -62,8 +62,17 @@
 --let $rpl_connection_name= server4
 --source include/rpl_connection.inc
 
+--error ER_SLAVE_CHANNEL_MUST_STOP
 CHANGE REPLICATION SOURCE TO SOURCE_CONNECTION_AUTO_FAILOVER=1 FOR CHANNEL 'ch1';
 
+--let $rpl_channel_name='ch1'
+--source include/stop_slave.inc
+
+CHANGE REPLICATION SOURCE TO SOURCE_CONNECTION_AUTO_FAILOVER=1 FOR CHANNEL 'ch1';
+
+--source include/start_slave.inc
+--let $rpl_channel_name=
+
 --replace_result $SERVER_MYPORT_2 SERVER_MYPORT_2 $group_replication_group_name GROUP_NAME
 --eval SELECT asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', '$group_replication_group_name', '127.0.0.1', $SERVER_MYPORT_2, '', 90, 70)
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_membership_updates_2groups_mysql.cnf mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_membership_updates_2groups_mysql.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_membership_updates_2groups_mysql.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_membership_updates_2groups_mysql.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,34 @@
+!include ../my.cnf
+
+[mysqld.1]
+loose-group_replication_communication_stack=MySQL
+loose-group_replication_single_primary_mode= TRUE
+loose-group_replication_enforce_update_everywhere_checks= FALSE
+
+[mysqld.2]
+loose-group_replication_communication_stack=MySQL
+loose-group_replication_single_primary_mode= TRUE
+loose-group_replication_enforce_update_everywhere_checks= FALSE
+
+[mysqld.3]
+loose-group_replication_communication_stack=MySQL
+loose-group_replication_single_primary_mode= TRUE
+loose-group_replication_enforce_update_everywhere_checks= FALSE
+
+[mysqld.4]
+loose-group_replication_communication_stack=MySQL
+loose-group_replication_single_primary_mode= TRUE
+loose-group_replication_enforce_update_everywhere_checks= FALSE
+
+[mysqld.5]
+loose-group_replication_communication_stack=MySQL
+
+[ENV]
+SERVER_MYPORT_3=		@mysqld.3.port
+SERVER_MYSOCK_3=		@mysqld.3.socket
+
+SERVER_MYPORT_4=		@mysqld.4.port
+SERVER_MYSOCK_4=		@mysqld.4.socket
+
+SERVER_MYPORT_5=		@mysqld.5.port
+SERVER_MYSOCK_5=		@mysqld.5.socket
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_membership_updates_2groups_mysql.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_membership_updates_2groups_mysql.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_membership_updates_2groups_mysql.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_membership_updates_2groups_mysql.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,27 @@
+#
+# Validate that list of senders is updated when a replica has two configured
+# groups
+#
+# Test:
+#   0. The test requires 5 servers:
+#        server1: group A primary
+#        server2: group A secondary
+#        server3: group B primary
+#        server4: group B secondary
+#        server5: single server
+#   1. Deploy a 1 member group A in single primary mode.
+#   2. Deploy a 1 member group B in single primary mode.
+#   3. Configure replica to manage the asynchronous connection
+#      to groups A and B.
+#   4. Create and start the managed channel.
+#   5. Add secondary member to group A and validate is added to list of senders
+#   6. Add secondary member to group B and validate is added to list of senders
+#   7. Remove secondary member from group B and validate is removed from
+#      list of senders
+#   8. Remove secondary member from group A and validate is removed from
+#      list of senders
+#   9. Clean up.
+#
+################################################################################
+
+--source ../include/gr_acf_membership_updates_2groups.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_membership_updates_2groups.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_membership_updates_2groups.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_membership_updates_2groups.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_membership_updates_2groups.test	2021-09-28 11:46:34.000000000 +0000
@@ -24,182 +24,4 @@
 #
 ################################################################################
 
---source include/big_test.inc
---source include/have_group_replication_plugin.inc
---let $rpl_skip_group_replication_start= 1
---let $rpl_server_count= 5
---source include/group_replication.inc
-
---echo
---echo # 1. Deploy a 1 member group A in single primary mode.
---echo
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
---let $server1_uuid= `SELECT @@server_uuid`
---let $group_replication_group_name= aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa
---let $group_a= $group_replication_group_name
---disable_query_log
---eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_GR_PORT_1,localhost:$SERVER_GR_PORT_2"
---enable_query_log
---source include/start_and_bootstrap_group_replication.inc
-
---echo
---echo # 2. Deploy a 1 member group B in single primary mode.
---echo
---let $rpl_connection_name= server3
---source include/rpl_connection.inc
---let $server3_uuid= `SELECT @@server_uuid`
---let $group_replication_group_name= bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb
---let $group_b= $group_replication_group_name
---disable_query_log
---eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_GR_PORT_3,localhost:$SERVER_GR_PORT_4"
---enable_query_log
---source include/start_and_bootstrap_group_replication.inc
-
---echo
---echo # 3. Configure replica to manage the asynchronous connection
---echo #    to groups A and B.
---echo
---let $rpl_connection_name= server5
---source include/rpl_connection.inc
-
---replace_result $SERVER_MYPORT_1 SERVER_MYPORT_1 $group_a GROUP_A
---eval SELECT asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', '$group_a', '127.0.0.1', $SERVER_MYPORT_1, '', 90, 70);
-
---replace_result $SERVER_MYPORT_3 SERVER_MYPORT_3 $group_b GROUP_B
---eval SELECT asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', '$group_b', '127.0.0.1', $SERVER_MYPORT_3, '', 85, 65);
-
---let $assert_text= 'There is one row in performance_schema.replication_asynchronous_connection_failover for server1'
---let $assert_cond= [SELECT  COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover WHERE port=$SERVER_MYPORT_1, count, 1] = 1
---source include/assert.inc
-
---let $assert_text= 'There is one row in performance_schema.replication_asynchronous_connection_failover for server3'
---let $assert_cond= [SELECT  COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover WHERE port=$SERVER_MYPORT_3, count, 1] = 1
---source include/assert.inc
-
---let $assert_text= 'There is one row in performance_schema.replication_asynchronous_connection_failover_managed for group A'
---let $assert_cond= [SELECT  COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover_managed WHERE managed_name="$group_a", count, 1] = 1
---source include/assert.inc
-
---let $assert_text= 'There is one row in performance_schema.replication_asynchronous_connection_failover_managed for group B'
---let $assert_cond= [SELECT  COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover_managed WHERE managed_name="$group_b", count, 1] = 1
---source include/assert.inc
-
---echo
---echo # 4. Create and start the managed channel.
---echo
---let $rpl_connection_name= server5
---source include/rpl_connection.inc
---replace_result $SERVER_MYPORT_1 SERVER_1_PORT
---eval CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=1, SOURCE_PORT=$SERVER_MYPORT_1, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1'
-
---let $rpl_channel_name='ch1'
---source include/start_slave.inc
---let $rpl_channel_name=
-
---let $assert_text= Verify channel ch1 IO_THREAD is ON and connected to server1
---let $assert_cond= "[SELECT SERVICE_STATE FROM performance_schema.replication_connection_status WHERE channel_name=\'ch1\' AND source_uuid=\'$server1_uuid\', SERVICE_STATE, 1]" = "ON"
---source include/assert.inc
-
---let $wait_condition= SELECT COUNT(*)=2 FROM performance_schema.replication_asynchronous_connection_failover
---source include/wait_condition.inc
-
---echo
---echo # 5. Add secondary member to group A and validate is added to list of senders
---echo
---let $rpl_connection_name= server2
---source include/rpl_connection.inc
---let $server2_uuid= `SELECT @@server_uuid`
---let $group_replication_group_name= $group_a
---disable_query_log
---eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_GR_PORT_1,localhost:$SERVER_GR_PORT_2"
---enable_query_log
---source include/start_group_replication.inc
-
---let $rpl_connection_name= server5
---source include/rpl_connection.inc
---let $wait_condition= SELECT COUNT(*)=3 FROM performance_schema.replication_asynchronous_connection_failover
---source include/wait_condition.inc
-
---echo
---echo # 6. Add secondary member to group B and validate is added to list of senders
---echo
---let $rpl_connection_name= server4
---source include/rpl_connection.inc
---let $server4_uuid= `SELECT @@server_uuid`
---let $group_replication_group_name= $group_b
---disable_query_log
---eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_GR_PORT_3,localhost:$SERVER_GR_PORT_4"
---enable_query_log
---source include/start_group_replication.inc
-
---let $rpl_connection_name= server5
---source include/rpl_connection.inc
---let $wait_condition= SELECT COUNT(*)=4 FROM performance_schema.replication_asynchronous_connection_failover
---source include/wait_condition.inc
-
---echo
---echo # 7. Remove secondary member from group B and validate is removed from
---echo #    list of senders
---echo
---let $rpl_connection_name= server4
---source include/rpl_connection.inc
---source include/stop_group_replication.inc
-
---let $rpl_connection_name= server5
---source include/rpl_connection.inc
---let $wait_condition= SELECT COUNT(*)=3 FROM performance_schema.replication_asynchronous_connection_failover
---source include/wait_condition.inc
-
---echo
---echo # 8. Remove secondary member from group A and validate is removed from
---echo #    list of senders
---echo
---let $rpl_connection_name= server2
---source include/rpl_connection.inc
---source include/stop_group_replication.inc
-
---let $rpl_connection_name= server5
---source include/rpl_connection.inc
---let $wait_condition= SELECT COUNT(*)=2 FROM performance_schema.replication_asynchronous_connection_failover
---source include/wait_condition.inc
-
---echo
---echo # 9. Clean up.
---echo
---let $rpl_connection_name= server5
---source include/rpl_connection.inc
-
-SET SESSION sql_log_bin = 0;
-call mtr.add_suppression("The source .* for channel 'ch1' has joined the group .*, and so added its entry into replication_asynchronous_connection_failover table.");
-call mtr.add_suppression("The master's UUID has changed, although this should not happen unless you have changed it manually.");
-call mtr.add_suppression("The source .* for channel 'ch1' has left the group .*, and so removed its entry from replication_asynchronous_connection_failover table.");
-call mtr.add_suppression("The group .* for the channel .* has been removed, and so removed its entry from replication_asynchronous_connection_failover_managed and all the group members from replication_asynchronous_connection_failover table.");
-call mtr.add_suppression("The group .* for the channel .* has been added, and so added its entry in replication_asynchronous_connection_failover_managed and source to replication_asynchronous_connection_failover table.");
-SET SESSION sql_log_bin = 1;
-
---let $rpl_channel_name='ch1'
---source include/stop_slave.inc
-
---let $rpl_reset_slave_all= 1
---let $rpl_multi_source= 1
---source include/rpl_reset_slave.inc
---let $rpl_channel_name=
---let $rpl_reset_slave_all=
---let $rpl_multi_source=
-
---replace_result $group_a GROUP_A
---eval SELECT asynchronous_connection_failover_delete_managed('ch1', '$group_a')
-
---replace_result $group_b GROUP_B
---eval SELECT asynchronous_connection_failover_delete_managed('ch1', '$group_b')
-
---let $rpl_connection_name= server3
---source include/rpl_connection.inc
---source include/stop_group_replication.inc
-
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
---source include/stop_group_replication.inc
-
---source include/group_replication_end.inc
+--source ../include/gr_acf_membership_updates_2groups.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_monitor_io_stopping.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_monitor_io_stopping.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_monitor_io_stopping.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_monitor_io_stopping.test	2021-09-28 11:46:34.000000000 +0000
@@ -35,7 +35,13 @@
 --let $group_replication_group_name= aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa
 --let $group_a= $group_replication_group_name
 --disable_query_log
+if ($have_xcom_stack){
 --eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_GR_PORT_1,localhost:$SERVER_GR_PORT_2"
+}
+
+if (!$have_xcom_stack){
+--eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_MYPORT_1,localhost:$SERVER_MYPORT_2"
+}
 --enable_query_log
 --source include/start_and_bootstrap_group_replication.inc
 
@@ -43,7 +49,13 @@
 --source include/rpl_connection.inc
 --let $server2_uuid= `SELECT @@server_uuid`
 --disable_query_log
+if ($have_xcom_stack){
 --eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_GR_PORT_1,localhost:$SERVER_GR_PORT_2"
+}
+
+if (!$have_xcom_stack){
+--eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_MYPORT_1,localhost:$SERVER_MYPORT_2"
+}
 --enable_query_log
 --source include/start_group_replication.inc
 
@@ -57,7 +69,12 @@
 --let $group_replication_group_name= bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb
 --let $group_b= $group_replication_group_name
 --disable_query_log
+if ($have_xcom_stack){
 --eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_GR_PORT_3,localhost:$SERVER_GR_PORT_4"
+}
+if (!$have_xcom_stack){
+--eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_MYPORT_3,localhost:$SERVER_MYPORT_4"
+}
 --enable_query_log
 --source include/start_and_bootstrap_group_replication.inc
 
@@ -65,7 +82,12 @@
 --source include/rpl_connection.inc
 --let $server4_uuid= `SELECT @@server_uuid`
 --disable_query_log
+if ($have_xcom_stack){
 --eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_GR_PORT_3,localhost:$SERVER_GR_PORT_4"
+}
+if (!$have_xcom_stack){
+--eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_MYPORT_3,localhost:$SERVER_MYPORT_4"
+}
 --enable_query_log
 --source include/start_group_replication.inc
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_msr_2groups_failover.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_msr_2groups_failover.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_msr_2groups_failover.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_msr_2groups_failover.test	2021-09-28 11:46:34.000000000 +0000
@@ -29,6 +29,8 @@
 --let $rpl_server_count= 7
 --source include/group_replication.inc
 
+#check which stack are we using
+--let $have_xcom_stack= `SELECT @@group_replication_communication_stack LIKE 'XCOM'`
 
 --echo
 --echo ############################################################
@@ -39,7 +41,12 @@
 --let $group_replication_group_name= aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa
 --let $group_a= $group_replication_group_name
 --disable_query_log
---eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_GR_PORT_1,localhost:$SERVER_GR_PORT_2,localhost:$SERVER_GR_PORT_3"
+if ($have_xcom_stack){
+  --eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_GR_PORT_1,localhost:$SERVER_GR_PORT_2,localhost:$SERVER_GR_PORT_3"
+}
+if (!$have_xcom_stack){
+  --eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_MYPORT_1,localhost:$SERVER_MYPORT_2,localhost:$SERVER_MYPORT_3"
+}
 --enable_query_log
 --source include/start_and_bootstrap_group_replication.inc
 
@@ -47,7 +54,12 @@
 --source include/rpl_connection.inc
 --let $server2_uuid= `SELECT @@server_uuid`
 --disable_query_log
---eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_GR_PORT_1,localhost:$SERVER_GR_PORT_2,localhost:$SERVER_GR_PORT_3"
+if ($have_xcom_stack){
+  --eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_GR_PORT_1,localhost:$SERVER_GR_PORT_2,localhost:$SERVER_GR_PORT_3"
+}
+if (!$have_xcom_stack){
+  --eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_MYPORT_1,localhost:$SERVER_MYPORT_2,localhost:$SERVER_MYPORT_3"
+}
 --enable_query_log
 SET GLOBAL group_replication_member_weight=99;
 --source include/start_group_replication.inc
@@ -56,7 +68,12 @@
 --source include/rpl_connection.inc
 --let $server3_uuid= `SELECT @@server_uuid`
 --disable_query_log
---eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_GR_PORT_1,localhost:$SERVER_GR_PORT_2,localhost:$SERVER_GR_PORT_3"
+if ($have_xcom_stack){
+  --eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_GR_PORT_1,localhost:$SERVER_GR_PORT_2,localhost:$SERVER_GR_PORT_3"
+}
+if (!$have_xcom_stack){
+  --eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_MYPORT_1,localhost:$SERVER_MYPORT_2,localhost:$SERVER_MYPORT_3"
+}
 --enable_query_log
 --source include/start_group_replication.inc
 
@@ -70,7 +87,12 @@
 --let $group_replication_group_name= bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb
 --let $group_b= $group_replication_group_name
 --disable_query_log
---eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_GR_PORT_4,localhost:$SERVER_GR_PORT_5,localhost:$SERVER_GR_PORT_6"
+if ($have_xcom_stack){
+  --eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_GR_PORT_4,localhost:$SERVER_GR_PORT_5,localhost:$SERVER_GR_PORT_6"
+}
+if (!$have_xcom_stack){
+  --eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_MYPORT_4,localhost:$SERVER_MYPORT_5,localhost:$SERVER_MYPORT_6"
+}
 --enable_query_log
 --source include/start_and_bootstrap_group_replication.inc
 
@@ -78,7 +100,12 @@
 --source include/rpl_connection.inc
 --let $server5_uuid= `SELECT @@server_uuid`
 --disable_query_log
---eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_GR_PORT_4,localhost:$SERVER_GR_PORT_5,localhost:$SERVER_GR_PORT_6"
+if ($have_xcom_stack){
+  --eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_GR_PORT_4,localhost:$SERVER_GR_PORT_5,localhost:$SERVER_GR_PORT_6"
+}
+if (!$have_xcom_stack){
+  --eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_MYPORT_4,localhost:$SERVER_MYPORT_5,localhost:$SERVER_MYPORT_6"
+}
 --enable_query_log
 SET GLOBAL group_replication_member_weight=99;
 --source include/start_group_replication.inc
@@ -87,7 +114,12 @@
 --source include/rpl_connection.inc
 --let $server6_uuid= `SELECT @@server_uuid`
 --disable_query_log
---eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_GR_PORT_4,localhost:$SERVER_GR_PORT_5,localhost:$SERVER_GR_PORT_6"
+if ($have_xcom_stack){
+  --eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_GR_PORT_4,localhost:$SERVER_GR_PORT_5,localhost:$SERVER_GR_PORT_6"
+}
+if (!$have_xcom_stack){
+  --eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_MYPORT_4,localhost:$SERVER_MYPORT_5,localhost:$SERVER_MYPORT_6"
+}
 --enable_query_log
 --source include/start_group_replication.inc
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_add_delete_managed.cnf mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_add_delete_managed.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_add_delete_managed.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_add_delete_managed.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,32 @@
+!include ../my.cnf
+
+[mysqld.1]
+loose-group_replication_single_primary_mode= TRUE
+loose-group_replication_enforce_update_everywhere_checks= FALSE
+
+[mysqld.2]
+loose-group_replication_single_primary_mode= TRUE
+loose-group_replication_enforce_update_everywhere_checks= FALSE
+
+[mysqld.3]
+loose-group_replication_single_primary_mode= TRUE
+loose-group_replication_enforce_update_everywhere_checks= FALSE
+
+
+[mysqld.4]
+loose-group_replication_single_primary_mode= TRUE
+loose-group_replication_enforce_update_everywhere_checks= FALSE
+
+[mysqld.5]
+loose-group_replication_single_primary_mode= TRUE
+loose-group_replication_enforce_update_everywhere_checks= FALSE
+
+[ENV]
+SERVER_MYPORT_3=		@mysqld.3.port
+SERVER_MYSOCK_3=		@mysqld.3.socket
+
+SERVER_MYPORT_4=		@mysqld.4.port
+SERVER_MYSOCK_4=		@mysqld.4.socket
+
+SERVER_MYPORT_5=		@mysqld.5.port
+SERVER_MYSOCK_5=		@mysqld.5.socket
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_add_delete_managed_on_mpm.cnf mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_add_delete_managed_on_mpm.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_add_delete_managed_on_mpm.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_add_delete_managed_on_mpm.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,16 @@
+!include ../my.cnf
+
+[mysqld.1]
+
+[mysqld.2]
+
+[mysqld.3]
+
+[mysqld.4]
+
+[ENV]
+SERVER_MYPORT_3=		@mysqld.3.port
+SERVER_MYSOCK_3=		@mysqld.3.socket
+
+SERVER_MYPORT_4=		@mysqld.4.port
+SERVER_MYSOCK_4=		@mysqld.4.socket
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_add_delete_managed_on_mpm.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_add_delete_managed_on_mpm.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_add_delete_managed_on_mpm.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_add_delete_managed_on_mpm.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,268 @@
+###############################################################################
+# Validate that UDFs
+#   asynchronous_connection_failover_add_managed
+#   asynchronous_connection_failover_delete_managed
+# can be used on groups in multi-primary mode.
+#
+# Test:
+#   0. This test requires 4 servers
+#       server1: multi-primary group A primary
+#       server2: multi-primary group A primary
+#       server3: multi-primary group B primary
+#       server4: multi-primary group B primary
+#      Group B will replicate from group A.
+#   1. Deploy a 2 members group A in multi-primary mode.
+#   2. Deploy a 2 members group A in multi-primary mode.
+#   3. Add group A replication failover managed source into a member in
+#      group B, server3.
+#      It will be allowed but the configuration will not be propagated.
+#   4. Create and start the managed channel on group B, server3.
+#   5. Delete group A replication failover managed source in a member in
+#      group B, server3.
+#      It will be allowed but the configuration will not be propagated.
+#   6. Clean up
+###############################################################################
+--source include/big_test.inc
+--source include/have_group_replication_plugin.inc
+--let $rpl_skip_group_replication_start= 1
+--let $rpl_server_count= 4
+--source include/group_replication.inc
+
+# Use the appropriate XCom port, that does depend on
+# `group_replication_communication_stack`.
+--let $have_xcom_stack= `SELECT @@group_replication_communication_stack LIKE 'XCOM'`
+--let $group_a_group_seeds= "localhost:$SERVER_GR_PORT_1,localhost:$SERVER_GR_PORT_2"
+--let $group_b_group_seeds= "localhost:$SERVER_GR_PORT_3,localhost:$SERVER_GR_PORT_4"
+if (!$have_xcom_stack) {
+  --let $group_a_group_seeds= "localhost:$SERVER_MYPORT_1,localhost:$SERVER_MYPORT_2"
+  --let $group_b_group_seeds= "localhost:$SERVER_MYPORT_3,localhost:$SERVER_MYPORT_4"
+}
+
+
+--echo
+--echo ############################################################
+--echo # 1. Deploy a 2 members group A in multi-primary mode.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $server1_uuid= `SELECT @@server_uuid`
+--let $group_replication_group_name= aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa
+--let $group_a= $group_replication_group_name
+--disable_query_log
+--eval SET GLOBAL group_replication_group_seeds= $group_a_group_seeds
+--enable_query_log
+--source include/start_and_bootstrap_group_replication.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $server2_uuid= `SELECT @@server_uuid`
+--disable_query_log
+--eval SET GLOBAL group_replication_group_seeds= $group_a_group_seeds
+--enable_query_log
+--source include/start_group_replication.inc
+
+
+--echo
+--echo ############################################################
+--echo # 2. Deploy a 2 members group A in multi-primary mode.
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--let $server3_uuid= `SELECT @@server_uuid`
+--let $group_replication_group_name= bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb
+--let $group_b= $group_replication_group_name
+--disable_query_log
+--eval SET GLOBAL group_replication_group_seeds= $group_b_group_seeds
+--enable_query_log
+--source include/start_and_bootstrap_group_replication.inc
+
+--let $rpl_connection_name= server4
+--source include/rpl_connection.inc
+--let $server4_uuid= `SELECT @@server_uuid`
+--disable_query_log
+--eval SET GLOBAL group_replication_group_seeds= $group_b_group_seeds
+--enable_query_log
+--source include/start_group_replication.inc
+
+
+
+--echo ############################################################
+--echo # 3. Add group A replication failover managed source into a member in
+--echo #    group B, server3.
+--echo #    It will be allowed but the configuration will not be propagated.
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+
+--replace_result $SERVER_MYPORT_2 SERVER_MYPORT_2 $group_a GROUP_A
+--eval SELECT asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', '$group_a', '127.0.0.1', $SERVER_MYPORT_2, '', 90, 70);
+
+--let $assert_text= 'There is one row in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover can be equal or greater than 1'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] >= 1
+--source include/assert.inc
+
+--let $assert_text= 'There is one row in performance_schema.replication_asynchronous_connection_failover_managed for group A'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover_managed WHERE managed_name="$group_a", count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover_managed must be 1'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover_managed\', version, 1] = 1
+--source include/assert.inc
+
+--let $rpl_connection_name= server4
+--source include/rpl_connection.inc
+
+--let $assert_text= 'There are no rows in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= 'There is no version of replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', count, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= 'There are no rows in performance_schema.replication_asynchronous_connection_failover_managed'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover_managed, count, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= 'There is no version of replication_asynchronous_connection_failover_managed'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover_managed\', count, 1] = 0
+--source include/assert.inc
+
+
+--echo
+--echo ############################################################
+--echo # 4. Create and start the managed channel on group B, server3.
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--replace_result $SERVER_MYPORT_1 SERVER_1_PORT
+--eval CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=1, SOURCE_PORT=$SERVER_MYPORT_1, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1'
+
+--let $rpl_channel_name='ch1'
+--source include/start_slave.inc
+--let $rpl_channel_name=
+
+--let $assert_text= Verify channel ch1 IO_THREAD is ON and connected to server1
+--let $assert_cond= "[SELECT SERVICE_STATE FROM performance_schema.replication_connection_status WHERE channel_name=\'ch1\' AND source_uuid=\'$server1_uuid\', SERVICE_STATE, 1]" = "ON"
+--source include/assert.inc
+
+--let $wait_condition= SELECT COUNT(*)=2 FROM performance_schema.replication_asynchronous_connection_failover
+--source include/wait_condition.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover can be equal or greater than 2'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] >= 2
+--source include/assert.inc
+
+--let $assert_text= 'There is one row in performance_schema.replication_asynchronous_connection_failover_managed for group A'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover_managed WHERE managed_name="$group_a", count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover_managed must be 1'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover_managed\', version, 1] = 1
+--source include/assert.inc
+
+--let $rpl_connection_name= server4
+--source include/rpl_connection.inc
+
+--let $assert_text= 'There is no replication channel ch1'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM performance_schema.replication_connection_status where CHANNEL_NAME="ch1", count, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= 'There are no rows in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= 'There is no version of replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', count, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= 'There are no rows in performance_schema.replication_asynchronous_connection_failover_managed'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover_managed, count, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= 'There is no version of replication_asynchronous_connection_failover_managed'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover_managed\', count, 1] = 0
+--source include/assert.inc
+
+
+--echo ############################################################
+--echo # 5. Delete group A replication failover managed source in a member in
+--echo #    group B, server3.
+--echo #    It will be allowed but the configuration will not be propagated.
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+
+--let $rpl_channel_name='ch1'
+--source include/stop_slave.inc
+
+--replace_result $group_a GROUP_A
+--eval SELECT asynchronous_connection_failover_delete_managed('ch1', '$group_a')
+
+--let $assert_text= 'There are no rows in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover can be equal or greater than 3'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] >= 3
+--source include/assert.inc
+
+--let $assert_text= 'There are no rows in performance_schema.replication_asynchronous_connection_failover_managed'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover_managed, count, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover_managed must be 2'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover_managed\', version, 1] = 2
+--source include/assert.inc
+
+--let $rpl_connection_name= server4
+--source include/rpl_connection.inc
+
+--let $assert_text= 'There is no replication channel ch1'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM performance_schema.replication_connection_status where CHANNEL_NAME="ch1", count, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= 'There are no rows in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= 'There is no version of replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', count, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= 'There are no rows in performance_schema.replication_asynchronous_connection_failover_managed'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover_managed, count, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= 'There is no version of replication_asynchronous_connection_failover_managed'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover_managed\', count, 1] = 0
+--source include/assert.inc
+
+
+--echo
+--echo ############################################################
+--echo # 6. Clean up.
+--let $rpl_connection_name= server4
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_channel_name='ch1'
+--let $rpl_reset_slave_all= 1
+--let $rpl_multi_source= 1
+--source include/rpl_reset_slave.inc
+--let $rpl_channel_name=
+--let $rpl_reset_slave_all=
+--let $rpl_multi_source=
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_add_delete_managed.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_add_delete_managed.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_add_delete_managed.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_add_delete_managed.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,361 @@
+################################################################################
+#
+# Validate that receiver group members do receive changes to
+# replication_asynchronous_connection_failover_managed
+# and replication_asynchronous_connection_failover table using
+# asynchronous_connection_failover_add_managed() and
+# asynchronous_connection_failover_delete_managed() UDFs.
+#
+# Test:
+# 0. The test requires 5 servers:
+#      server1: group1 primary (async channel to server3)
+#      server2: group1 secondary
+#      server3: group2 primary
+#      server4: group2 secondary
+#      server5: group2 secondary
+# 1. Deploy a 2 members receiver group in single primary mode.
+# 2. Deploy a 2 members sender group in single primary mode.
+#    The third member of the group i.e. server5 will be added later
+#    to verify changes are getting synced to receiver group members.
+# 3. Create a replication channel to replicate from server3 to
+#    server1.
+# 4. Add replication connection details of managed channel ch1
+#    to replication_asynchronous_connection_failover_managed table
+#    through asynchronous_connection_failover_add_managed() UDF.
+# 5. Start replica for channel ch1.
+# 6. Verify replication_asynchronous_connection_failover on
+#    server1 has two rows and member action configuration version
+#    value for replication_asynchronous_connection_failover
+#    and for replication_asynchronous_connection_failover_managed.
+# 7. Verify replication_asynchronous_connection_failover on
+#    server2 has two rows and member action configuration version
+#    value for replication_asynchronous_connection_failover
+#    and for replication_asynchronous_connection_failover_managed.
+# 8. Add another member i.e. server5 to sender group.
+# 9. Verify replication_asynchronous_connection_failover on
+#    server1 has three rows and member action configuration version
+#    value for replication_asynchronous_connection_failover
+#    and for replication_asynchronous_connection_failover_managed.
+# 10. Verify replication_asynchronous_connection_failover on
+#     server2 has three rows and member action configuration version
+#     value for replication_asynchronous_connection_failover
+#     and for replication_asynchronous_connection_failover_managed.
+# 11. Delete replication connection details for managed channel ch1
+#     from replication_asynchronous_connection_failover_managed
+#     and replication_asynchronous_connection_failover table
+#     through asynchronous_connection_failover_delete_managed() UDF.
+# 12. Verify replication_asynchronous_connection_failover on
+#     server1 is empty and member action configuration version
+#     value for replication_asynchronous_connection_failover
+#     and for replication_asynchronous_connection_failover_managed.
+# 13. Verify replication_asynchronous_connection_failover on
+#     server2 is empty and member action configuration version
+#     value for replication_asynchronous_connection_failover
+#     and for replication_asynchronous_connection_failover_managed.
+# 14. Clean up.
+--source include/big_test.inc
+--source include/have_group_replication_plugin.inc
+--let $rpl_skip_group_replication_start= 1
+--let $rpl_server_count= 5
+--source include/group_replication.inc
+
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("The master's UUID has changed, although this should not happen unless you have changed it manually. The old UUID was.*");
+SET SESSION sql_log_bin = 1;
+
+# Get address and UUID of all servers
+--let $local_address_server1= `SELECT @@GLOBAL.group_replication_local_address`
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $local_address_server2= `SELECT @@GLOBAL.group_replication_local_address`
+
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--let $local_address_server3= `SELECT @@GLOBAL.group_replication_local_address`
+
+--let $rpl_connection_name= server4
+--source include/rpl_connection.inc
+--let $local_address_server4= `SELECT @@GLOBAL.group_replication_local_address`
+
+--let $rpl_connection_name= server5
+--source include/rpl_connection.inc
+--let $local_address_server5= `SELECT @@GLOBAL.group_replication_local_address`
+
+--let $group_a= `SELECT UUID()`
+--let $group_b= `SELECT UUID()`
+
+
+--echo #
+--echo # 1. Deploy a 3 members receiver group in single primary mode.
+--echo #
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $group_replication_group_name = $group_a
+--replace_result $local_address_server1 LOCAL_ADDRESS_SERVER1 $local_address_server2 LOCAL_ADDRESS_SERVER2
+--eval SET GLOBAL GROUP_REPLICATION_GROUP_SEEDS= "$local_address_server1, $local_address_server2"
+--source include/start_and_bootstrap_group_replication.inc
+
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+# The failover channel must be created on all group members.
+--replace_result $SERVER_MYPORT_4 SERVER_4_PORT
+--eval CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_PORT=$SERVER_MYPORT_4, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1, SOURCE_CONNECTION_AUTO_FAILOVER=1 FOR CHANNEL 'ch1'
+
+--let $group_replication_group_name = $group_a
+--replace_result $local_address_server1 LOCAL_ADDRESS_SERVER1 $local_address_server2 LOCAL_ADDRESS_SERVER2
+--eval SET GLOBAL GROUP_REPLICATION_GROUP_SEEDS= "$local_address_server1, $local_address_server2"
+--source include/start_group_replication.inc
+
+
+--echo #
+--echo # 2. Deploy a 2 members sender group in single primary mode.
+--echo #    The third member of the group i.e. server5 will be added later
+--echo #    to verify changes are getting synced to receiver group members.
+--echo #
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--let $group_replication_group_name = $group_b
+--replace_result $local_address_server3 LOCAL_ADDRESS_SERVER3 $local_address_server4 LOCAL_ADDRESS_SERVER4 $local_address_server5 LOCAL_ADDRESS_SERVER5
+--eval SET GLOBAL GROUP_REPLICATION_GROUP_SEEDS= "$local_address_server3, $local_address_server4, $local_address_server5"
+--source include/start_and_bootstrap_group_replication.inc
+
+
+--let $rpl_connection_name= server4
+--source include/rpl_connection.inc
+--let $group_replication_group_name = $group_b
+--replace_result $local_address_server3 LOCAL_ADDRESS_SERVER3 $local_address_server4 LOCAL_ADDRESS_SERVER4 $local_address_server5 LOCAL_ADDRESS_SERVER5
+--eval SET GLOBAL GROUP_REPLICATION_GROUP_SEEDS= "$local_address_server3, $local_address_server4, $local_address_server5"
+--source include/start_group_replication.inc
+
+
+--echo
+--echo # 3. Create a replication channel to replicate from server3 to
+--echo #    server1.
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--replace_result $SERVER_MYPORT_4 SERVER_4_PORT
+--eval CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_PORT=$SERVER_MYPORT_4, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1, SOURCE_CONNECTION_AUTO_FAILOVER=1 FOR CHANNEL 'ch1'
+
+
+--echo
+--echo # 4. Add replication connection details of managed channel ch1
+--echo #    to replication_asynchronous_connection_failover_managed table
+--echo #    through asynchronous_connection_failover_add_managed() UDF.
+--echo
+--replace_result $SERVER_MYPORT_4 SERVER_MYPORT_4 $group_b GROUP_B
+--eval SELECT asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', "$group_b",'127.0.0.1', $SERVER_MYPORT_4, '', 80, 60)
+
+
+--echo
+--echo # 5. Start replica for channel ch1.
+--echo
+--let $rpl_channel_name='ch1'
+--source include/start_slave.inc
+--let $rpl_channel_name=
+
+
+--echo
+--echo # 6. Verify replication_asynchronous_connection_failover on
+--echo #    server1 has two rows and member action configuration version
+--echo #    value for replication_asynchronous_connection_failover
+--echo #    and for replication_asynchronous_connection_failover_managed.
+--echo
+--let $wait_condition= SELECT COUNT(*)=2 FROM performance_schema.replication_asynchronous_connection_failover
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_asynchronous_connection_failover_managed
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover' and version>=2
+--source include/wait_condition.inc
+--let $failover_version_step6= query_get_value(SELECT VERSION FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover', VERSION, 1)
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover_managed' and version=1
+--source include/wait_condition.inc
+
+
+--echo
+--echo # 7. Verify replication_asynchronous_connection_failover on
+--echo #    server2 has two rows and member action configuration version
+--echo #    value for replication_asynchronous_connection_failover
+--echo #    and for replication_asynchronous_connection_failover_managed.
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $wait_condition= SELECT COUNT(*)=2 FROM performance_schema.replication_asynchronous_connection_failover
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_asynchronous_connection_failover_managed
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover' and version>=$failover_version_step6
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover_managed' and version=1
+--source include/wait_condition.inc
+
+
+--echo #
+--echo # 8. Add another member i.e. server5 to sender group.
+--echo #
+--let $rpl_connection_name= server5
+--source include/rpl_connection.inc
+--replace_result $local_address_server3 LOCAL_ADDRESS_SERVER3 $local_address_server4 LOCAL_ADDRESS_SERVER4 $local_address_server5 LOCAL_ADDRESS_SERVER5
+--eval SET GLOBAL GROUP_REPLICATION_GROUP_SEEDS= "$local_address_server3, $local_address_server4, $local_address_server5"
+--source include/start_group_replication.inc
+
+--let $assert_text= There are three members in the group.
+--let $assert_cond= "[SELECT COUNT(*) from performance_schema.replication_group_members WHERE MEMBER_STATE=\"ONLINE\"]" = 3
+--source include/assert.inc
+
+
+--echo
+--echo # 9. Verify replication_asynchronous_connection_failover on
+--echo #    server1 has three rows and member action configuration version
+--echo #    value for replication_asynchronous_connection_failover
+--echo #    and for replication_asynchronous_connection_failover_managed.
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--let $wait_condition=SELECT COUNT(*)=3 FROM performance_schema.replication_asynchronous_connection_failover
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_asynchronous_connection_failover_managed
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover' and version>=3
+--source include/wait_condition.inc
+--let $failover_version_step9= query_get_value(SELECT VERSION FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover', VERSION, 1)
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover_managed' and version=1
+--source include/wait_condition.inc
+
+
+--echo
+--echo # 10. Verify replication_asynchronous_connection_failover on
+--echo #     server2 has three rows and member action configuration version
+--echo #     value for replication_asynchronous_connection_failover
+--echo #     and for replication_asynchronous_connection_failover_managed.
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--let $wait_condition=SELECT COUNT(*)=3 FROM performance_schema.replication_asynchronous_connection_failover
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_asynchronous_connection_failover_managed
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover' and version>=$failover_version_step9
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover_managed' and version=1
+--source include/wait_condition.inc
+
+
+--echo
+--echo # 11. Delete replication connection details for managed channel ch1
+--echo #     from replication_asynchronous_connection_failover_managed
+--echo #     and replication_asynchronous_connection_failover table
+--echo #     through asynchronous_connection_failover_delete_managed() UDF.
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--replace_result $group_b GROUP_B
+--eval SELECT asynchronous_connection_failover_delete_managed('ch1', '$group_b')
+
+
+--echo
+--echo # 12. Verify replication_asynchronous_connection_failover on
+--echo #     server1 is empty and member action configuration version
+--echo #     value for replication_asynchronous_connection_failover
+--echo #     and for replication_asynchronous_connection_failover_managed.
+--echo
+--let $wait_condition= SELECT COUNT(*)=0 FROM performance_schema.replication_asynchronous_connection_failover
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=0 FROM performance_schema.replication_asynchronous_connection_failover_managed
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover' and version>=4
+--source include/wait_condition.inc
+--let $failover_version_step12= query_get_value(SELECT VERSION FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover', VERSION, 1)
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover_managed' and version=2
+--source include/wait_condition.inc
+
+
+--echo
+--echo # 13. Verify replication_asynchronous_connection_failover on
+--echo #     server2 is empty and member action configuration version
+--echo #     value for replication_asynchronous_connection_failover
+--echo #     and for replication_asynchronous_connection_failover_managed.
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--let $wait_condition= SELECT COUNT(*)=0 FROM performance_schema.replication_asynchronous_connection_failover
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=0 FROM performance_schema.replication_asynchronous_connection_failover_managed
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover' and version>=$failover_version_step12
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover_managed' and version=2
+--source include/wait_condition.inc
+
+
+--echo #
+--echo # 14. Clean up.
+--echo #
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--let $rpl_channel_name='ch1'
+--source include/stop_slave.inc
+
+--let $rpl_reset_slave_all= 1
+--let $rpl_multi_source= 1
+--source include/rpl_reset_slave.inc
+--let $rpl_channel_name=
+--let $rpl_reset_slave_all=
+--let $rpl_multi_source=
+
+--let $rpl_connection_name= server5
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_connection_name= server4
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_channel_name='ch1'
+--let $rpl_reset_slave_all= 1
+--let $rpl_multi_source= 1
+--source include/rpl_reset_slave.inc
+--let $rpl_channel_name=
+--let $rpl_reset_slave_all=
+--let $rpl_multi_source=
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_skip_sync = 1
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_add_delete_source.cnf mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_add_delete_source.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_add_delete_source.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_add_delete_source.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,27 @@
+!include ../my.cnf
+
+[mysqld.1]
+loose-group_replication_single_primary_mode= TRUE
+loose-group_replication_enforce_update_everywhere_checks= FALSE
+
+[mysqld.2]
+loose-group_replication_single_primary_mode= TRUE
+loose-group_replication_enforce_update_everywhere_checks= FALSE
+
+[mysqld.3]
+loose-group_replication_single_primary_mode= TRUE
+loose-group_replication_enforce_update_everywhere_checks= FALSE
+
+[mysqld.4]
+
+[mysqld.5]
+
+[ENV]
+SERVER_MYPORT_3=		@mysqld.3.port
+SERVER_MYSOCK_3=		@mysqld.3.socket
+
+SERVER_MYPORT_4=		@mysqld.4.port
+SERVER_MYSOCK_4=		@mysqld.4.socket
+
+SERVER_MYPORT_5=		@mysqld.5.port
+SERVER_MYSOCK_5=		@mysqld.5.socket
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_add_delete_source_on_mpm.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_add_delete_source_on_mpm.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_add_delete_source_on_mpm.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_add_delete_source_on_mpm.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,83 @@
+###############################################################################
+# Validate that UDFs
+#   asynchronous_connection_failover_add_source
+#   asynchronous_connection_failover_delete_source
+# can be used on groups in multi-primary mode,
+# but the configuration will not be propagated.
+#
+# Test:
+#   0. This test requires two servers
+#   1. Add replication failover sources into a member in
+#      a multi-primary mode group.
+#      It will be allowed but the configuration will not be propagated.
+#   2. Delete replication failover sources in a member in
+#      a multi-primary mode group.
+#      It will be allowed but the configuration will not be propagated.
+#   3. Clean up
+###############################################################################
+--source include/have_group_replication_plugin.inc
+--source include/group_replication.inc
+
+
+--echo ############################################################
+--echo # 1. Add replication failover sources into a member in
+--echo #    a multi-primary mode group.
+--echo #    It will be allowed but the configuration will not be propagated.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+SELECT asynchronous_connection_failover_add_source('ch1', '127.0.0.1', 3306, '', 50);
+
+--let $assert_text= 'There is one row in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be 1'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] = 1
+--source include/assert.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--let $assert_text= 'There are no rows in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= 'There is no version of replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', count, 1] = 0
+--source include/assert.inc
+
+
+--echo ############################################################
+--echo # 2. Delete replication failover sources in a member in
+--echo #    a multi-primary mode group.
+--echo #    It will be allowed but the configuration will not be propagated.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+SELECT asynchronous_connection_failover_delete_source('ch1', '127.0.0.1', 3306, '');
+
+--let $assert_text= 'There are no rows in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be 2'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] = 2
+--source include/assert.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--let $assert_text= 'There are no rows in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= 'There is no version of replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', count, 1] = 0
+--source include/assert.inc
+
+
+--echo
+--echo ############################################################
+--echo # 3. Clean up.
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_add_delete_source.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_add_delete_source.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_add_delete_source.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_add_delete_source.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,225 @@
+################################################################################
+#
+# Validate that receiver group members does receive changes to
+# replication_asynchronous_connection_failover table using
+# asynchronous_connection_failover_add_source() and
+# asynchronous_connection_failover_delete_source() UDFs.
+#
+# Test:
+# 0. The test requires 5 servers:
+#      server1: group primary (async channel to server4)
+#      server2: group secondary
+#      server3: group secondary
+#      server4: source server
+#      server5: source server
+# 1. Deploy a 3 members group in single primary mode.
+# 2. Create a replication channel to replicate from server4 to
+#    server1.
+# 3. Add replication connection details of server4 and server5
+#    to replication_asynchronous_connection_failover table
+#    through asynchronous_connection_failover_add_source() UDF.
+# 4. Start replica for channel ch1.
+# 5. Verify replication_asynchronous_connection_failover on
+#    server1 has two rows (of server4 and server5) and member action
+#    configuration version value is 2 in
+#    replication_group_configuration_version.
+# 6. Verify replication_asynchronous_connection_failover on
+#    server2 and server 3 has two rows (of server4 and server5) and
+#    member action configuration version value is 2 in
+#    replication_group_configuration_version.
+# 7. Delete replication connection details of server4 and server5
+#    from replication_asynchronous_connection_failover table
+#    through asynchronous_connection_failover_delete_source() UDF.
+# 8. Verify replication_asynchronous_connection_failover on
+#    server1 is empty and member action configuration version value
+#    is 4 in replication_group_configuration_version.
+# 9. Verify replication_asynchronous_connection_failover on
+#    server2 is empty and member action configuration version value
+#    is 4 in replication_group_configuration_version.
+# 10. Clean up.
+#
+--source include/big_test.inc
+--source include/have_group_replication_plugin.inc
+--let $rpl_skip_group_replication_start= 1
+--let $rpl_server_count= 5
+--source include/group_replication.inc
+
+
+--echo
+--echo # 1. Deploy a 3 members group in single primary mode.
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/start_and_bootstrap_group_replication.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+# The failover channel must be created on all group members.
+--replace_result $SERVER_MYPORT_4 SERVER_4_PORT
+--eval CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_PORT=$SERVER_MYPORT_4, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1, SOURCE_CONNECTION_AUTO_FAILOVER=1 FOR CHANNEL 'ch1'
+
+--source include/start_group_replication.inc
+
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+
+# The failover channel must be created on all group members.
+--replace_result $SERVER_MYPORT_4 SERVER_4_PORT
+--eval CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_PORT=$SERVER_MYPORT_4, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1, SOURCE_CONNECTION_AUTO_FAILOVER=1 FOR CHANNEL 'ch1'
+
+--source include/start_group_replication.inc
+
+
+--echo
+--echo # 2. Create a replication channel to replicate from server4 to
+--echo #    server1.
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--replace_result $SERVER_MYPORT_4 SERVER_4_PORT
+--eval CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_PORT=$SERVER_MYPORT_4, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1, SOURCE_CONNECTION_AUTO_FAILOVER=1 FOR CHANNEL 'ch1'
+
+
+--echo
+--echo # 3. Add replication connection details of server4 and server5
+--echo #    to replication_asynchronous_connection_failover table
+--echo #    through asynchronous_connection_failover_add_source() UDF.
+--echo
+--replace_result $SERVER_MYPORT_4 SERVER_MYPORT_4
+--eval SELECT asynchronous_connection_failover_add_source('ch1', '127.0.0.1', $SERVER_MYPORT_4, '', 50)
+
+--replace_result $SERVER_MYPORT_5 SERVER_MYPORT_5
+--eval SELECT asynchronous_connection_failover_add_source('ch1', '127.0.0.1', $SERVER_MYPORT_5, '', 40)
+
+
+--echo
+--echo # 4. Start replica for channel ch1.
+--echo
+--let $rpl_channel_name='ch1'
+--source include/start_slave.inc
+--let $rpl_channel_name=
+
+
+--echo
+--echo # 5. Verify replication_asynchronous_connection_failover on
+--echo #    server1 has two rows (of server4 and server5) and member action
+--echo #    configuration version value is 2 in
+--echo #    replication_group_configuration_version.
+--echo
+--let $wait_condition= SELECT COUNT(*)=2 FROM performance_schema.replication_asynchronous_connection_failover
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover' and version>=2
+--source include/wait_condition.inc
+--let $failover_version_step5= query_get_value(SELECT VERSION FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover', VERSION, 1)
+
+
+
+
+--echo
+--echo # 6. Verify replication_asynchronous_connection_failover on
+--echo #    server2 and server3 has two rows (of server4 and server5) and
+--echo #    member action configuration version value is 2 in
+--echo #    replication_group_configuration_version.
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--let $wait_condition= SELECT COUNT(*)=2 FROM performance_schema.replication_asynchronous_connection_failover
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover' and version>=$failover_version_step5
+--source include/wait_condition.inc
+
+
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+
+--let $wait_condition= SELECT COUNT(*)=2 FROM performance_schema.replication_asynchronous_connection_failover
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover' and version>=$failover_version_step5
+--source include/wait_condition.inc
+
+
+--echo
+--echo # 7. Delete replication connection details of server4 and server5
+--echo #    from replication_asynchronous_connection_failover table
+--echo #    through asynchronous_connection_failover_delete_source() UDF.
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--replace_result $SERVER_MYPORT_4 SERVER_MYPORT_4
+--eval SELECT asynchronous_connection_failover_delete_source('ch1', '127.0.0.1', $SERVER_MYPORT_4, '')
+
+--replace_result $SERVER_MYPORT_5 SERVER_MYPORT_5
+--eval SELECT asynchronous_connection_failover_delete_source('ch1', '127.0.0.1', $SERVER_MYPORT_5, '')
+
+
+--echo
+--echo # 8. Verify replication_asynchronous_connection_failover on
+--echo #    server1 is empty and member action configuration version value
+--echo #    is 4 in replication_group_configuration_version.
+--echo
+--let $wait_condition= SELECT COUNT(*)=0 FROM performance_schema.replication_asynchronous_connection_failover
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover' and version>=3
+--source include/wait_condition.inc
+--let $failover_version_step8= query_get_value(SELECT VERSION FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover', VERSION, 1)
+
+
+--echo
+--echo # 9. Verify replication_asynchronous_connection_failover on
+--echo #    server2 is empty and member action configuration version value
+--echo #    is 4 in replication_group_configuration_version.
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--let $wait_condition= SELECT COUNT(*)=0 FROM performance_schema.replication_asynchronous_connection_failover
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover' and version>=$failover_version_step8
+--source include/wait_condition.inc
+
+
+--echo
+--echo # 10. Clean up.
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--let $rpl_channel_name='ch1'
+--source include/stop_slave.inc
+
+--let $rpl_reset_slave_all= 1
+--let $rpl_multi_source= 1
+--source include/rpl_reset_slave.inc
+--let $rpl_channel_name=
+--let $rpl_reset_slave_all=
+--let $rpl_multi_source=
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $rpl_channel_name='ch1'
+--let $rpl_reset_slave_all= 1
+--let $rpl_multi_source= 1
+--source include/rpl_reset_slave.inc
+--let $rpl_channel_name=
+--let $rpl_reset_slave_all=
+--let $rpl_multi_source=
+
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--let $rpl_channel_name='ch1'
+--let $rpl_reset_slave_all= 1
+--let $rpl_multi_source= 1
+--source include/rpl_reset_slave.inc
+--let $rpl_channel_name=
+--let $rpl_reset_slave_all=
+--let $rpl_multi_source=
+
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_clone_on_rejoin.cnf mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_clone_on_rejoin.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_clone_on_rejoin.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_clone_on_rejoin.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,25 @@
+!include ../my.cnf
+
+[mysqld.1]
+loose-group_replication_single_primary_mode= TRUE
+loose-group_replication_enforce_update_everywhere_checks= FALSE
+
+[mysqld.2]
+loose-group_replication_single_primary_mode= TRUE
+loose-group_replication_enforce_update_everywhere_checks= FALSE
+
+[mysqld.3]
+loose-group_replication_single_primary_mode= TRUE
+loose-group_replication_enforce_update_everywhere_checks= FALSE
+
+[mysqld.4]
+loose-group_replication_single_primary_mode= TRUE
+loose-group_replication_enforce_update_everywhere_checks= FALSE
+
+[ENV]
+SERVER_MYPORT_3=    @mysqld.3.port
+SERVER_MYSOCK_3=    @mysqld.3.socket
+
+[ENV]
+SERVER_MYPORT_4=    @mysqld.4.port
+SERVER_MYSOCK_4=    @mysqld.4.socket
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_clone_on_rejoin.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_clone_on_rejoin.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_clone_on_rejoin.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_clone_on_rejoin.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,488 @@
+###############################################################################
+# This test verifies that cloning works with replication channel failover when
+# the member auto rejoins the group after an issue.
+#
+# 0. This test requires 4 servers server1, server2, server3 and server4
+#    (source).
+# 1. Install clone plugin on server1.
+# 2. Create replication channel ch1
+#    with SOURCE_CONNECTION_AUTO_FAILOVER enabled.
+#    And verify managed channel and non-managed source addition
+#    is successful in failover tables.
+# 3. Bootstrap server1 and add some data
+#    Verify channel 'ch1' is running.
+# 4. Install the clone plugin and start GR on server3
+# 5. Create replication channel ch1
+#    with SOURCE_CONNECTION_AUTO_FAILOVER enabled.
+#    And verify managed channel and non-managed source synced
+#    is successful to failover tables.
+# 6. Restart server 2 with a monitoring process (mysqld_safe)
+# 7. Setup server2 so group replication starts on boot
+#    Install the Clone plugin
+# 8. On a empty server2 start group replication
+#    Wait for it to restart and come back
+#    Check clone was completed
+# 9. Verify data has been properly cloned in server2.
+# 10. Get server2 expelled.
+# 11. Add more data and new source to failover table
+#     on server 1 before server2 rejoins.
+# 12. Unblock the rejoin, another clone should happen
+# 13. Verify if the data and failover tables
+#     has been properly cloned in server2.
+# 14. Stop the replication channel 'ch1' on server1, and change
+#     primary to server2. The asynchronous replication channel (ch1)
+#     connection will be started without any error.
+# 15. Cleanup
+#
+
+--source include/big_test.inc
+--source include/have_debug_sync.inc
+--source include/linux.inc
+--source include/have_mysqld_monitoring_process.inc
+--source include/have_clone_plugin.inc
+--source include/have_group_replication_plugin.inc
+--let $rpl_server_count= 4
+
+--let $rpl_skip_group_replication_start= 1
+--source include/group_replication.inc
+
+
+# Get address and UUID of all servers
+--let $local_address_server1= `SELECT @@GLOBAL.group_replication_local_address`
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $local_address_server2= `SELECT @@GLOBAL.group_replication_local_address`
+
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--let $local_address_server3= `SELECT @@GLOBAL.group_replication_local_address`
+
+
+--echo
+--echo # 1. Install clone plugin on server1.
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--replace_result $CLONE_PLUGIN CLONE_PLUGIN
+--eval INSTALL PLUGIN clone SONAME '$CLONE_PLUGIN'
+
+
+--echo
+--echo # 2. Create replication channel ch1
+--echo #    with SOURCE_CONNECTION_AUTO_FAILOVER enabled.
+--echo #    And verify managed channel and non-managed source addition
+--echo #    is successful in failover tables.
+--echo
+--replace_result $SERVER_MYPORT_4 SERVER_MYPORT_4
+--eval CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=1, SOURCE_PORT=$SERVER_MYPORT_4, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1'
+
+--replace_result $SERVER_MYPORT_4 SERVER_MYPORT_4
+--eval SELECT asynchronous_connection_failover_add_source('ch1', '127.0.0.1', $SERVER_MYPORT_4, '', 90)
+SELECT asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', '10.0.0.2', 3306, '', 80, 70);
+
+--let $assert_text= 'There are 2 rows in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 2
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be 2'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] = 2
+--source include/assert.inc
+
+--let $assert_text= 'There is 1 row in performance_schema.replication_asynchronous_connection_failover_managed'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover_managed, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover_managed must be 1'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover_managed\', version, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM performance_schema.replication_connection_configuration WHERE CHANNEL_NAME="ch1" AND SOURCE_CONNECTION_AUTO_FAILOVER=1, count, 1] = 1
+--source include/assert.inc
+
+
+--echo
+--echo # 3. Bootstrap server1 and add some data
+--echo #    Verify channel 'ch1' is running.
+--echo
+
+--replace_result $local_address_server1 LOCAL_ADDRESS_SERVER1 $local_address_server2 LOCAL_ADDRESS_SERVER2 $local_address_server3 LOCAL_ADDRESS_SERVER3
+--eval SET GLOBAL GROUP_REPLICATION_GROUP_SEEDS= "$local_address_server1, $local_address_server2, $local_address_server3"
+
+--source include/start_and_bootstrap_group_replication.inc
+
+CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1);
+INSERT INTO t1 VALUES (2);
+
+
+--let $assert_text= 'CHANNEL ch1 is running'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM performance_schema.replication_connection_status WHERE CHANNEL_NAME="ch1" AND SERVICE_STATE="ON", count, 1] = 1
+--source include/assert.inc
+
+
+--echo
+--echo # 4. Install the clone plugin and start GR on server3
+--echo
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+
+--replace_result $CLONE_PLUGIN CLONE_PLUGIN
+--eval INSTALL PLUGIN clone SONAME '$CLONE_PLUGIN'
+
+
+--echo
+--echo # 5. Create replication channel ch1
+--echo #    with SOURCE_CONNECTION_AUTO_FAILOVER enabled.
+--echo #    And verify managed channel and non-managed source synced
+--echo #    is successful to failover tables.
+--echo
+--replace_result $SERVER_MYPORT_4 SERVER_MYPORT_4
+--eval CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=0, SOURCE_PORT=$SERVER_MYPORT_4, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1'
+
+--replace_result $local_address_server1 LOCAL_ADDRESS_SERVER1 $local_address_server2 LOCAL_ADDRESS_SERVER2 $local_address_server3 LOCAL_ADDRESS_SERVER3
+--eval SET GLOBAL GROUP_REPLICATION_GROUP_SEEDS= "$local_address_server1, $local_address_server2, $local_address_server3"
+--source include/start_group_replication.inc
+
+
+--let $assert_text= 'There are 2 rows in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 2
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be 2'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] = 2
+--source include/assert.inc
+
+--let $assert_text= 'There is 1 row in performance_schema.replication_asynchronous_connection_failover_managed'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover_managed, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover_managed must be 1'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover_managed\', version, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'SOURCE_CONNECTION_AUTO_FAILOVER must be enabled for ch1'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM performance_schema.replication_connection_configuration WHERE CHANNEL_NAME="ch1" AND SOURCE_CONNECTION_AUTO_FAILOVER=1, count, 1] = 1
+--source include/assert.inc
+
+
+--echo
+--echo # 6. Restart server 2 with a monitoring process (mysqld_safe)
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='10.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=0, SOURCE_PORT=3306, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1';
+
+--let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
+--let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $_group_replication_comm_stack= `SELECT @@GLOBAL.group_replication_communication_stack`
+
+# after the restart with mysqld_safe we need this option for expel operations
+SET PERSIST local_infile= ON;
+
+--let $plugin_list= $GROUP_REPLICATION
+--source include/spawn_monitoring_process.inc
+
+
+--echo
+--echo # 7. Setup server2 so group replication starts on boot
+--echo #    Install the Clone plugin
+--echo
+--disable_query_log
+--eval SET PERSIST group_replication_group_name= "$group_replication_group_name"
+--eval SET PERSIST group_replication_local_address= "$_group_replication_local_address"
+--eval SET PERSIST group_replication_group_seeds= "$_group_replication_group_seeds"
+--eval SET PERSIST group_replication_communication_stack= "$_group_replication_comm_stack"
+
+SET PERSIST group_replication_enforce_update_everywhere_checks=FALSE;
+SET PERSIST group_replication_single_primary_mode=TRUE;
+SET PERSIST group_replication_start_on_boot= ON;
+--enable_query_log
+
+--replace_result $CLONE_PLUGIN CLONE_PLUGIN
+--eval INSTALL PLUGIN clone SONAME '$CLONE_PLUGIN'
+
+
+--echo
+--echo # 8. On a empty server2 start group replication
+--echo #    Wait for it to restart and come back
+--echo #    Check clone was completed
+--echo
+--let $_group_replication_threshold_save= `SELECT @@GLOBAL.group_replication_clone_threshold`
+SET GLOBAL group_replication_clone_threshold= 1;
+
+
+--replace_result $local_address_server1 LOCAL_ADDRESS_SERVER1 $local_address_server2 LOCAL_ADDRESS_SERVER2 $local_address_server3 LOCAL_ADDRESS_SERVER3
+--eval SET GLOBAL GROUP_REPLICATION_GROUP_SEEDS= "$local_address_server1, $local_address_server2, $local_address_server3"
+START GROUP_REPLICATION;
+
+--source include/wait_until_disconnected.inc
+
+--let $rpl_server_number= 2
+--source include/rpl_reconnect.inc
+
+--let $group_replication_member_state=ONLINE
+--source include/gr_wait_for_member_state.inc
+
+--let $assert_text= Clone must be completed
+--let $assert_cond= [SELECT state="Completed" FROM performance_schema.clone_status] = 1;
+--source include/assert.inc
+
+
+--echo
+--echo # 9. Verify data has been properly cloned in server2.
+--echo
+--let $diff_tables=server1:test.t1, server2:test.t1, server3:test.t1
+--source include/diff_tables.inc
+
+
+--let $assert_text= 'There are 2 rows in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 2
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be 2'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] = 2
+--source include/assert.inc
+
+--let $assert_text= 'There is 1 row in performance_schema.replication_asynchronous_connection_failover_managed'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover_managed, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover_managed must be 1'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover_managed\', version, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'SOURCE_CONNECTION_AUTO_FAILOVER must be enabled for ch1'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM performance_schema.replication_connection_configuration WHERE CHANNEL_NAME="ch1" AND SOURCE_CONNECTION_AUTO_FAILOVER=1, count, 1] = 1
+--source include/assert.inc
+
+
+--echo
+--echo # 10. Get server2 expelled.
+--echo
+--let $rpl_connection_name = server2
+--source include/rpl_connection.inc
+
+SET GLOBAL super_read_only = 0;
+SET @debug_saved = @@GLOBAL.DEBUG;
+SET @@GLOBAL.DEBUG='+d,group_replication_stop_before_rejoin';
+
+# Force expel on member 2
+--let $member_id = `SELECT @@GLOBAL.server_uuid`
+--let $rpl_server_count= 3
+--source include/gr_expel_member_from_group.inc
+SET GLOBAL super_read_only = 1;
+--let $rpl_server_count= 4
+
+SET DEBUG_SYNC = "now WAIT_FOR signal.autorejoin_waiting";
+
+# Verify that it is currently running
+--let $assert_text = Auto-rejoin should be running
+--let $assert_count_var = `SELECT COUNT(*) FROM performance_schema.events_stages_current WHERE EVENT_NAME LIKE '%auto-rejoin%'`
+--let $assert_cond = $assert_count_var = 1
+--source include/assert.inc
+
+
+--echo
+--echo # 11. Add more data and new source to failover table
+--echo #     on server 1 before server2 rejoins.
+--echo
+--let $rpl_connection_name = server1
+--source include/rpl_connection.inc
+
+SELECT asynchronous_connection_failover_add_source('ch1', '10.0.0.1', 3307, '', 50);
+
+INSERT INTO t1 VALUES (3);
+INSERT INTO t1 VALUES (4);
+
+--let $assert_text= 'There are 3 rows in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 3
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be 2'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] = 3
+--source include/assert.inc
+
+
+--source include/rpl_sync.inc
+
+
+--echo
+--echo # 12. Unblock the rejoin, another clone should happen
+--echo
+--let $rpl_connection_name = server2
+--source include/rpl_connection.inc
+
+SET GLOBAL group_replication_clone_threshold= 1;
+
+SET DEBUG_SYNC = "now SIGNAL signal.autorejoin_continue";
+
+--source include/wait_until_disconnected.inc
+
+--let $rpl_server_number= 2
+--source include/rpl_reconnect.inc
+
+--let $group_replication_member_state=ONLINE
+--source include/gr_wait_for_member_state.inc
+
+--let $assert_text= Clone must be completed
+--let $assert_cond= [SELECT state="Completed" FROM performance_schema.clone_status] = 1;
+--source include/assert.inc
+
+
+--echo
+--echo # 13. Verify if the data and failover tables
+--echo #     has been properly cloned in server2.
+--echo
+--let $diff_tables=server1:test.t1, server2:test.t1, server3:test.t1
+--source include/diff_tables.inc
+
+--let $assert_text= 'There are 3 rows in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 3
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be 3'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] = 3
+--source include/assert.inc
+
+--let $assert_text= 'There is 1 row in performance_schema.replication_asynchronous_connection_failover_managed'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover_managed, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover_managed must be 1'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover_managed\', version, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'SOURCE_CONNECTION_AUTO_FAILOVER must be enabled for ch1'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM performance_schema.replication_connection_configuration WHERE CHANNEL_NAME="ch1" AND SOURCE_CONNECTION_AUTO_FAILOVER=1, count, 1] = 1
+--source include/assert.inc
+
+
+--echo
+--echo # 14. Stop the replication channel 'ch1' on server1, and change
+--echo #     primary to server2. The asynchronous replication channel (ch1)
+--echo #     connection will be started without any error.
+--echo
+--let $server2_uuid= `SELECT @@server_uuid`
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--let $rpl_channel_name='ch1'
+--source include/stop_slave.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--replace_result $server2_uuid SERVER2_UUID
+--eval SELECT group_replication_set_as_primary("$server2_uuid")
+
+--let $group_replication_expected_uuid= $server2_uuid
+--source include/gr_wait_primary_member_uuid.inc
+
+--let $wait_condition=SELECT COUNT(*)=3 FROM performance_schema.replication_group_members where MEMBER_STATE="ONLINE"
+--source include/wait_condition.inc
+
+--let $rpl_channel_name='ch1'
+--source include/wait_for_slave_to_start.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_connection_configuration where CHANNEL_NAME='ch1' and HOST='127.0.0.1' and PORT=$SERVER_MYPORT_4
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_connection_status where CHANNEL_NAME='ch1' and SERVICE_STATE='ON'
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_applier_status where CHANNEL_NAME='ch1' and SERVICE_STATE='ON'
+--source include/wait_condition.inc
+
+--let $assert_text= Verify replica_monitor thread is running
+--let $assert_cond= "[select count(*) FROM performance_schema.threads where NAME=\"thread/sql/replica_monitor\"]" = 1;
+--source include/assert.inc
+
+
+--echo
+--echo # 15. Cleanup
+--echo
+DROP TABLE t1;
+
+RESET PERSIST IF EXISTS group_replication_enforce_update_everywhere_checks;
+RESET PERSIST IF EXISTS group_replication_single_primary_mode;
+RESET PERSIST IF EXISTS group_replication_group_name;
+RESET PERSIST IF EXISTS group_replication_local_address;
+RESET PERSIST IF EXISTS group_replication_group_seeds;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
+RESET PERSIST IF EXISTS group_replication_start_on_boot;
+RESET PERSIST IF EXISTS local_infile;
+
+--let $rpl_channel_name='ch1'
+--source include/stop_slave.inc
+
+--let $rpl_reset_slave_all= 1
+--let $rpl_multi_source= 1
+--source include/rpl_reset_slave.inc
+--let $rpl_channel_name=
+--let $rpl_reset_slave_all=
+--let $rpl_multi_source=
+
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+UNINSTALL PLUGIN clone;
+
+--let $rpl_channel_name='ch1'
+--let $rpl_reset_slave_all= 1
+--let $rpl_multi_source= 1
+--source include/rpl_reset_slave.inc
+--let $rpl_channel_name=
+--let $rpl_reset_slave_all=
+--let $rpl_multi_source=
+
+set session sql_log_bin=0;
+call mtr.add_suppression("The Monitor IO thread failed to connect to the source .* for channel 'ch1', thence it will try to connect to another source.");
+set session sql_log_bin=1;
+
+
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+UNINSTALL PLUGIN clone;
+
+--let $rpl_channel_name='ch1'
+--let $rpl_reset_slave_all= 1
+--let $rpl_multi_source= 1
+--source include/rpl_reset_slave.inc
+--let $rpl_channel_name=
+--let $rpl_reset_slave_all=
+--let $rpl_multi_source=
+
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--disable_query_log
+--eval SET GLOBAL group_replication_clone_threshold= $_group_replication_threshold_save
+--enable_query_log
+--source include/stop_group_replication.inc
+UNINSTALL PLUGIN clone;
+
+set session sql_log_bin=0;
+call mtr.add_suppression("Recovery from master pos .* and file .* for channel 'ch1'. Previous relay log pos and relay log file had been set to .* respectively.");
+call mtr.add_suppression("The Monitor IO thread failed to connect to the source .* for channel 'ch1', thence it will try to connect to another source.");
+call mtr.add_suppression("This member will start distributed recovery using clone. It is due to the number of missing transactions being higher than the configured threshold of*");
+call mtr.add_suppression("Member was expelled from the group due to network failures, changing member status to ERROR.");
+call mtr.add_suppression("The server was automatically set into read only mode after an error was detected.");
+call mtr.add_suppression("Started auto-rejoin procedure attempt*");
+call mtr.add_suppression("Auto-rejoin procedure attempt 1 of 1");
+call mtr.add_suppression("Clone removing all user data for provisioning: Started");
+call mtr.add_suppression("Clone removing all user data for provisioning: Finished");
+call mtr.add_suppression("Relay log information for channel 'ch1' was found after a clone operation. Relay log recovery will be executed to adjust positions .*");
+call mtr.add_suppression("Error during .* Could not locate rotate event from the master.");
+call mtr.add_suppression("Server was not able to find a rotate event from master server to initialize relay log recovery for channel .*");
+set session sql_log_bin=1;
+
+--source include/clean_monitoring_process.inc
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_failover_channel_non_existent_on_the_group.cnf mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_failover_channel_non_existent_on_the_group.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_failover_channel_non_existent_on_the_group.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_failover_channel_non_existent_on_the_group.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,11 @@
+!include ../my.cnf
+
+[mysqld.1]
+
+[mysqld.2]
+
+[mysqld.3]
+
+[ENV]
+SERVER_MYPORT_3=		@mysqld.3.port
+SERVER_MYSOCK_3=		@mysqld.3.socket
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_failover_channel_non_existent_on_the_group.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_failover_channel_non_existent_on_the_group.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_failover_channel_non_existent_on_the_group.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_failover_channel_non_existent_on_the_group.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,143 @@
+###############################################################################
+# Validate that on a single-primary mode group, all replication failover channels
+# must exist, otherwise the members that do not have the channel will leave the
+# group and move to ERROR state.
+#
+# Test:
+#   0. This test requires three servers:
+#        server1, server2: group
+#        server3: single server
+#   1. Deploy a group in single-primary mode on server1 and server2.
+#   2. Configure a failover channel on server1 that replicates
+#      from server3.
+#   3. Server2 will leave the group once server propagates
+#      failover channel 'ch1' server2 does not have that channel.
+#   4. Clean up.
+###############################################################################
+--source include/big_test.inc
+--source include/have_group_replication_plugin.inc
+--let $rpl_group_replication_single_primary_mode=1
+--let $rpl_skip_group_replication_start= 1
+--let $rpl_server_count= 3
+--source include/group_replication.inc
+
+
+--echo
+--echo ############################################################
+--echo # 1. Deploy a group in single-primary mode on server1 and server2.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/start_and_bootstrap_group_replication.inc
+--source include/gr_assert_primary_member.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+SET SESSION sql_log_bin= 0;
+call mtr.add_suppression("Unable to set SOURCE_CONNECTION_AUTO_FAILOVER on a non-existent or misconfigured replication channel 'ch1', please create the channel and rejoin the server to the group.");
+call mtr.add_suppression("A message sent through the Group Replication message deliver service was not delivered successfully. The server will now leave the group.*");
+call mtr.add_suppression("The server was automatically set into read only mode after an error was detected.");
+call mtr.add_suppression("Skipping leave operation: concurrent attempt to leave the group is on-going.");
+SET SESSION sql_log_bin= 1;
+
+--source include/start_group_replication.inc
+--source include/gr_assert_secondary_member.inc
+
+
+--echo
+--echo ############################################################
+--echo # 2. Configure a failover channel on server1 that replicates
+--echo #    from server3.
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--let $server3_uuid= `SELECT @@server_uuid`
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--replace_result $SERVER_MYPORT_3 SERVER_3_PORT
+--eval CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=1, SOURCE_PORT=$SERVER_MYPORT_3, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1'
+
+--replace_result $SERVER_MYPORT_3 SERVER_MYPORT_3
+--eval SELECT asynchronous_connection_failover_add_source('ch1', '127.0.0.1', $SERVER_MYPORT_3, '', 50);
+
+--let $rpl_channel_name='ch1'
+--source include/start_slave.inc
+
+--let $assert_text= 'There is 1 row in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be 1'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM performance_schema.replication_connection_configuration WHERE CHANNEL_NAME="ch1" AND SOURCE_CONNECTION_AUTO_FAILOVER=1, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= Verify channel ch1 IO_THREAD is ON and connected to server3
+--let $assert_cond= "[SELECT SERVICE_STATE FROM performance_schema.replication_connection_status WHERE channel_name=\'ch1\' AND source_uuid=\'$server3_uuid\', SERVICE_STATE, 1]" = "ON"
+--source include/assert.inc
+
+--let $assert_text= Verify channel ch1 SQL_THREAD is ON
+--let $assert_cond= "[SELECT SERVICE_STATE FROM performance_schema.replication_applier_status WHERE channel_name = \'ch1\', SERVICE_STATE, 1]" = "ON"
+--source include/assert.inc
+
+--let $assert_text= Verify replica_monitor thread is running
+--let $assert_cond= "[select count(*) FROM performance_schema.threads where NAME=\"thread/sql/replica_monitor\"]" = 1;
+--source include/assert.inc
+
+
+--echo
+--echo ############################################################
+--echo # 3. Server2 will leave the group once server propagates
+--echo #    failover channel 'ch1' server2 does not have that channel.
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--let $group_replication_member_state = ERROR
+--source include/gr_wait_for_member_state.inc
+
+--let $assert_text= 'There are 0 rows in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= 'There is no version of replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', count, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= 'There is no channel ch1'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM performance_schema.replication_connection_configuration WHERE CHANNEL_NAME="ch1", count, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= Verify replica_monitor thread is not running
+--let $assert_cond= "[select count(*) FROM performance_schema.threads where NAME=\"thread/sql/replica_monitor\"]" = 0;
+--source include/assert.inc
+
+--let $assert_only_after = CURRENT_TEST: group_replication.gr_acf_receiver_failover_channel_non_existent_on_the_group
+--let $assert_file= $MYSQLTEST_VARDIR/log/mysqld.2.err
+--let $assert_select= Unable to set SOURCE_CONNECTION_AUTO_FAILOVER on a non-existent or misconfigured replication channel 'ch1', please create the channel and rejoin the server to the group.
+--let $assert_count= 1
+--let $assert_text= Unable to set SOURCE_CONNECTION_AUTO_FAILOVER on a non-existent or misconfigured replication channel 'ch1', please create the channel and rejoin the server to the group.
+--source include/assert_grep.inc
+
+
+--echo
+--echo ############################################################
+--echo # 4. Clean up.
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_channel_name='ch1'
+--let $rpl_multi_source= 1
+--let $rpl_reset_slave_all= 1
+--source include/rpl_reset_slave.inc
+--let $rpl_channel_name=
+--let $rpl_multi_source=
+
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_member_join.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_member_join.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_member_join.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_member_join.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,190 @@
+###############################################################################
+# Validate that, on single-primary mode:
+#  * the replication failover channels configuration of the member that
+#    bootstraps a group, becomes the group configuration.
+#  * a member that joins the group, overrides its configuration with the
+#    one of the group.
+#
+# Test:
+#   0. This test requires two servers
+#   1. Add a single server and managed sources to failover
+#      channel 'ch1' to server1.
+#   2. Bootstrap the group on server1, all failover configuration
+#      will be preserved.
+#   3. Join server2 to the group, it will replace its failover
+#      configuration.
+#   4. Clean up
+###############################################################################
+--source include/have_group_replication_plugin.inc
+--let $rpl_skip_group_replication_start= 1
+--let $rpl_group_replication_single_primary_mode=1
+--source include/group_replication.inc
+
+
+--echo
+--echo ############################################################
+--echo # 1. Add a single server and managed sources to failover
+--echo #    channel 'ch1' to server1.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='10.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=1, SOURCE_PORT=3306, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1';
+SELECT asynchronous_connection_failover_add_source('ch1', '10.0.0.1', 3306, '', 50);
+SELECT asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', '10.0.0.2', 3306, '', 90, 70);
+
+--let $assert_text= 'There are 2 rows in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 2
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be 2'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] = 2
+--source include/assert.inc
+
+--let $assert_text= 'There is 1 row in performance_schema.replication_asynchronous_connection_failover_managed'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover_managed, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover_managed must be 1'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover_managed\', version, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM performance_schema.replication_connection_configuration WHERE CHANNEL_NAME="ch1" AND SOURCE_CONNECTION_AUTO_FAILOVER=1, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'SOURCE_CONNECTION_AUTO_FAILOVER=1 must be persisted on ch1'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM mysql.slave_master_info WHERE CHANNEL_NAME="ch1" AND SOURCE_CONNECTION_AUTO_FAILOVER=1, count, 1] = 1
+--source include/assert.inc
+
+SELECT * FROM performance_schema.replication_asynchronous_connection_failover;
+
+SELECT * FROM performance_schema.replication_asynchronous_connection_failover_managed;
+
+SELECT * FROM performance_schema.replication_group_configuration_version WHERE name LIKE 'replication_asynchronous_connection_failover%';
+
+
+--echo
+--echo ############################################################
+--echo # 2. Bootstrap the group on server1, all failover configuration
+--echo #    will be preserved.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+# Do not automatically start failover channels.
+SELECT group_replication_disable_member_action("mysql_start_failover_channels_if_primary", "AFTER_PRIMARY_ELECTION");
+
+--source include/start_and_bootstrap_group_replication.inc
+
+--let $assert_text= The action mysql_start_failover_channels_if_primary must be disabled
+--let $assert_cond= [SELECT enabled FROM performance_schema.replication_group_member_actions WHERE name=\'mysql_start_failover_channels_if_primary\' AND event=\'AFTER_PRIMARY_ELECTION\', enabled, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= 'There are 2 rows in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 2
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be 2'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] = 2
+--source include/assert.inc
+
+--let $assert_text= 'There is 1 row in performance_schema.replication_asynchronous_connection_failover_managed'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover_managed, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover_managed must be 1'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover_managed\', version, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM performance_schema.replication_connection_configuration WHERE CHANNEL_NAME="ch1" AND SOURCE_CONNECTION_AUTO_FAILOVER=1, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'SOURCE_CONNECTION_AUTO_FAILOVER=1 must be persisted on ch1'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM mysql.slave_master_info WHERE CHANNEL_NAME="ch1" AND SOURCE_CONNECTION_AUTO_FAILOVER=1, count, 1] = 1
+--source include/assert.inc
+
+SELECT * FROM performance_schema.replication_asynchronous_connection_failover;
+
+SELECT * FROM performance_schema.replication_asynchronous_connection_failover_managed;
+
+SELECT * FROM performance_schema.replication_group_configuration_version WHERE name LIKE 'replication_asynchronous_connection_failover%';
+
+
+--echo
+--echo ############################################################
+--echo # 3. Join server2 to the group, it will replace its failover
+--echo #    configuration.
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='10.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=0, SOURCE_PORT=3306, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1';
+SELECT asynchronous_connection_failover_add_source('ch9', '10.0.0.19', 3306, '', 50);
+SELECT asynchronous_connection_failover_add_source('ch9', '10.0.0.20', 3306, '', 50);
+SELECT asynchronous_connection_failover_add_managed('ch9', 'GroupReplication', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', '10.0.0.29', 3306, '', 90, 70);
+
+--let $assert_text= 'SOURCE_CONNECTION_AUTO_FAILOVER=0 must be persisted on ch1'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM mysql.slave_master_info WHERE CHANNEL_NAME="ch1" AND SOURCE_CONNECTION_AUTO_FAILOVER=0, count, 1] = 1
+--source include/assert.inc
+
+--source include/start_group_replication.inc
+
+--let $assert_text= The action mysql_start_failover_channels_if_primary must be disabled
+--let $assert_cond= [SELECT enabled FROM performance_schema.replication_group_member_actions WHERE name=\'mysql_start_failover_channels_if_primary\' AND event=\'AFTER_PRIMARY_ELECTION\', enabled, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= 'There are 2 rows in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 2
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be 2'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] = 2
+--source include/assert.inc
+
+--let $assert_text= 'There is 1 row in performance_schema.replication_asynchronous_connection_failover_managed'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover_managed, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover_managed must be 1'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover_managed\', version, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'SOURCE_CONNECTION_AUTO_FAILOVER must be enabled for ch1'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM performance_schema.replication_connection_configuration WHERE CHANNEL_NAME="ch1" AND SOURCE_CONNECTION_AUTO_FAILOVER=1, count, 1] = 1
+--source include/assert.inc
+
+SELECT * FROM performance_schema.replication_asynchronous_connection_failover;
+
+SELECT * FROM performance_schema.replication_asynchronous_connection_failover_managed;
+
+SELECT * FROM performance_schema.replication_group_configuration_version WHERE name LIKE 'replication_asynchronous_connection_failover%';
+
+--let $assert_text= 'SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM performance_schema.replication_connection_configuration WHERE CHANNEL_NAME="ch1" AND SOURCE_CONNECTION_AUTO_FAILOVER=1, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'SOURCE_CONNECTION_AUTO_FAILOVER=1 must be persisted on ch1'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM mysql.slave_master_info WHERE CHANNEL_NAME="ch1" AND SOURCE_CONNECTION_AUTO_FAILOVER=1, count, 1] = 1
+--source include/assert.inc
+
+--echo
+--echo ############################################################
+--echo # 4. Clean up.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $rpl_channel_name='ch1'
+--let $rpl_multi_source= 1
+--let $rpl_reset_slave_all= 1
+--source include/rpl_reset_slave.inc
+--let $rpl_channel_name=
+--let $rpl_multi_source=
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $rpl_channel_name='ch1'
+--let $rpl_multi_source= 1
+--let $rpl_reset_slave_all= 1
+--source include/rpl_reset_slave.inc
+--let $rpl_channel_name=
+--let $rpl_multi_source=
+
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_mpm_to_spm.cnf mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_mpm_to_spm.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_mpm_to_spm.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_mpm_to_spm.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,11 @@
+!include ../my.cnf
+
+[mysqld.1]
+
+[mysqld.2]
+
+[mysqld.3]
+
+[ENV]
+SERVER_MYPORT_3=		@mysqld.3.port
+SERVER_MYSOCK_3=		@mysqld.3.socket
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_mpm_to_spm.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_mpm_to_spm.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_mpm_to_spm.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_mpm_to_spm.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,285 @@
+###############################################################################
+# Validate that on a group mode change from multi to single-primary,
+# the primary shall override the replication failover channels configuration
+# on all group members.
+#
+# Test:
+#   0. This test requires three servers
+#   1. Deploy a group in multi-primary mode on server1 and server2.
+#   2. Configure a failover channel on server1 that replicates
+#      from server3.
+#   3. Configure the same failover channel on server2.
+#      In single-primary mode, the mode to which we will change,
+#      the failover channels must exist on all members.
+#      The channel is created with SOURCE_CONNECTION_AUTO_FAILOVER=0
+#      to show that it will change to SOURCE_CONNECTION_AUTO_FAILOVER=1
+#      when group mode changes to single-primary mode.
+#   4. Add some failovers sources to server2 that will be replaced
+#      when server1 becomes the primary in single-primary mode.
+#   5. Change to single-primary mode.
+#      The primary must be server1, since when a member has
+#      replication channels running it must be the primary.
+#   6. Validate that server1 replication failover channels
+#      configuration is preserved, and that it did replace the
+#      one on server2.
+#   7. server1 leaves the group.
+#      server2 is the new primary and does start the failover
+#      channel.
+#   8. Clean up.
+###############################################################################
+--source include/big_test.inc
+--source include/have_group_replication_plugin.inc
+--let $rpl_skip_group_replication_start= 1
+--source include/group_replication.inc
+
+
+--echo
+--echo ############################################################
+--echo # 1. Deploy a group in multi-primary mode on server1 and server2.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $server1_uuid= query_get_value(SELECT @@SERVER_UUID, @@SERVER_UUID, 1)
+--source include/start_and_bootstrap_group_replication.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--source include/start_group_replication.inc
+
+
+--echo
+--echo ############################################################
+--echo # 2. Configure a failover channel on server1 that replicates
+--echo #    from server3.
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--let $server3_uuid= `SELECT @@server_uuid`
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--replace_result $SERVER_MYPORT_3 SERVER_3_PORT
+--eval CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=1, SOURCE_PORT=$SERVER_MYPORT_3, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1'
+
+--replace_result $SERVER_MYPORT_3 SERVER_MYPORT_3
+--eval SELECT asynchronous_connection_failover_add_source('ch1', '127.0.0.1', $SERVER_MYPORT_3, '', 50);
+
+--let $rpl_channel_name='ch1'
+--source include/start_slave.inc
+
+--let $assert_text= 'There is 1 row in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be 1'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM performance_schema.replication_connection_configuration WHERE CHANNEL_NAME="ch1" AND SOURCE_CONNECTION_AUTO_FAILOVER=1, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= Verify channel ch1 IO_THREAD is ON and connected to server3
+--let $assert_cond= "[SELECT SERVICE_STATE FROM performance_schema.replication_connection_status WHERE channel_name=\'ch1\' AND source_uuid=\'$server3_uuid\', SERVICE_STATE, 1]" = "ON"
+--source include/assert.inc
+
+--let $assert_text= Verify replica_monitor thread is running
+--let $assert_cond= "[select count(*) FROM performance_schema.threads where NAME=\"thread/sql/replica_monitor\"]" = 1;
+--source include/assert.inc
+
+
+--echo
+--echo ############################################################
+--echo # 3. Configure the same failover channel on server2.
+--echo #    In single-primary mode, the mode to which we will change,
+--echo #    the failover channels must exist on all members.
+--echo #    The channel is created with SOURCE_CONNECTION_AUTO_FAILOVER=0
+--echo #    to show that it will change to SOURCE_CONNECTION_AUTO_FAILOVER=1
+--echo #    when group mode changes to single-primary mode.
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--replace_result $SERVER_MYPORT_3 SERVER_3_PORT
+--eval CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=0, SOURCE_PORT=$SERVER_MYPORT_3, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1'
+
+
+--echo
+--echo ############################################################
+--echo # 4. Add some failovers sources to server2 that will be replaced
+--echo #    when server1 becomes the primary in single-primary mode.
+SELECT asynchronous_connection_failover_add_source('ch1', '10.0.0.1', 3306, '', 50);
+SELECT asynchronous_connection_failover_add_source('ch1', '10.0.0.2', 3306, '', 50);
+
+--let $assert_text= 'There are 2 rows in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 2
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be 2'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] = 2
+
+SELECT * FROM performance_schema.replication_asynchronous_connection_failover;
+
+SELECT * FROM performance_schema.replication_group_configuration_version WHERE name LIKE 'replication_asynchronous_connection_failover';
+
+--echo
+--echo ############################################################
+--echo # 5. Change to single-primary mode.
+--echo #    The primary must be server1, since when a member has
+--echo #    replication channels running it must be the primary.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--replace_result $server1_uuid MEMBER1_UUID
+--eval SELECT group_replication_switch_to_single_primary_mode("$server1_uuid")
+--source include/gr_assert_primary_member.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--source include/gr_assert_secondary_member.inc
+
+
+--echo
+--echo ############################################################
+--echo # 6. Validate that server1 replication failover channels
+--echo #    configuration is preserved, and that it did replace the
+--echo #    one on server2.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--let $assert_text= 'There is 1 row in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be 1'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM performance_schema.replication_connection_configuration WHERE CHANNEL_NAME="ch1" AND SOURCE_CONNECTION_AUTO_FAILOVER=1, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= Verify channel ch1 IO_THREAD is ON and connected to server3
+--let $assert_cond= "[SELECT SERVICE_STATE FROM performance_schema.replication_connection_status WHERE channel_name=\'ch1\' AND source_uuid=\'$server3_uuid\', SERVICE_STATE, 1]" = "ON"
+--source include/assert.inc
+
+--let $applier_workers= `SELECT @@GLOBAL.SLAVE_PARALLEL_WORKERS`
+--let $assert_text= 'Validate the number of workers on performance_schema.replication_applier_status_by_worker table for channel ch1'
+--let $assert_cond= MAX(WORKER_ID) = $applier_workers FROM performance_schema.replication_applier_status_by_worker WHERE channel_name = "ch1"
+--source include/assert.inc
+
+--let $assert_text= Verify replica_monitor thread is running
+--let $assert_cond= "[select count(*) FROM performance_schema.threads where NAME=\"thread/sql/replica_monitor\"]" = 1;
+--source include/assert.inc
+
+--replace_column 3 PORT
+SELECT * FROM performance_schema.replication_asynchronous_connection_failover;
+
+SELECT * FROM performance_schema.replication_group_configuration_version WHERE name LIKE 'replication_asynchronous_connection_failover';
+
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--let $assert_text= 'There is 1 row in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be 1'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM performance_schema.replication_connection_configuration WHERE CHANNEL_NAME="ch1" AND SOURCE_CONNECTION_AUTO_FAILOVER=1, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= Verify channel ch1 IO_THREAD is OFF
+--let $assert_cond= "[SELECT SERVICE_STATE FROM performance_schema.replication_connection_status WHERE channel_name=\'ch1\', SERVICE_STATE, 1]" = "OFF"
+--source include/assert.inc
+
+--let $assert_text= Verify replica_monitor thread is not running
+--let $assert_cond= "[select count(*) FROM performance_schema.threads where NAME=\"thread/sql/replica_monitor\"]" = 0;
+--source include/assert.inc
+
+--replace_column 3 PORT
+SELECT * FROM performance_schema.replication_asynchronous_connection_failover;
+
+SELECT * FROM performance_schema.replication_group_configuration_version WHERE name LIKE 'replication_asynchronous_connection_failover';
+
+
+--echo
+--echo ############################################################
+--echo # 7. server1 leaves the group.
+--echo #    server2 is the new primary and does start the failover
+--echo #    channel.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--let $server2_uuid= `SELECT @@server_uuid`
+--let $group_replication_expected_uuid= $server2_uuid
+--source include/gr_wait_primary_member_uuid.inc
+
+--let $rpl_channel_name= 'ch1'
+--source include/wait_for_slave_to_start.inc
+
+--let $assert_text= 'There is 1 row in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be 1'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM performance_schema.replication_connection_configuration WHERE CHANNEL_NAME="ch1" AND SOURCE_CONNECTION_AUTO_FAILOVER=1, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= Verify channel ch1 IO_THREAD is ON and connected to server3
+--let $assert_cond= "[SELECT SERVICE_STATE FROM performance_schema.replication_connection_status WHERE channel_name=\'ch1\' AND source_uuid=\'$server3_uuid\', SERVICE_STATE, 1]" = "ON"
+--source include/assert.inc
+
+--let $applier_workers= `SELECT @@GLOBAL.SLAVE_PARALLEL_WORKERS`
+--let $assert_text= 'Validate the number of workers on performance_schema.replication_applier_status_by_worker table for channel ch1'
+--let $assert_cond= MAX(WORKER_ID) = $applier_workers FROM performance_schema.replication_applier_status_by_worker WHERE channel_name = "ch1"
+--source include/assert.inc
+
+--let $assert_text= Verify replica_monitor thread is running
+--let $assert_cond= "[select count(*) FROM performance_schema.threads where NAME=\"thread/sql/replica_monitor\"]" = 1;
+--source include/assert.inc
+
+--replace_column 3 PORT
+SELECT * FROM performance_schema.replication_asynchronous_connection_failover;
+
+SELECT * FROM performance_schema.replication_group_configuration_version WHERE name LIKE 'replication_asynchronous_connection_failover';
+
+
+--echo
+--echo ############################################################
+--echo # 8. Clean up.
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_channel_name='ch1'
+--let $rpl_multi_source= 1
+--let $rpl_reset_slave_all= 1
+--source include/rpl_reset_slave.inc
+--let $rpl_channel_name=
+--let $rpl_multi_source=
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $rpl_channel_name='ch1'
+--let $rpl_multi_source= 1
+--let $rpl_reset_slave_all= 1
+--source include/rpl_reset_slave.inc
+--let $rpl_channel_name=
+--let $rpl_multi_source=
+
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+# Ensure that all dump threads are stopped.
+--source include/stop_dump_threads.inc
+
+--let $rpl_group_replication_single_primary_mode=1
+--let $rpl_group_replication_reset_persistent_vars=1
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_network_partition.cnf mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_network_partition.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_network_partition.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_network_partition.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,17 @@
+!include ../my.cnf
+
+[mysqld.1]
+
+[mysqld.2]
+local-infile=       true
+
+[mysqld.3]
+
+[mysqld.4]
+
+[ENV]
+SERVER_MYPORT_3=		@mysqld.3.port
+SERVER_MYSOCK_3=		@mysqld.3.socket
+
+SERVER_MYPORT_4=		@mysqld.4.port
+SERVER_MYSOCK_4=		@mysqld.4.socket
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_network_partition.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_network_partition.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_network_partition.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_network_partition.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,323 @@
+###############################################################################
+# Validate that whenever the primary loses contact with the majority, if there
+# is a running Monitor IO thread, the Monitor IO thread will not monitor
+# sources until the primary returns to the group majority.
+#
+# Test:
+#   0. This test requires 4 servers:
+#        server1: group A primary
+#        server2: group A secondary
+#        server3: group B primary
+#        server4: group B secondary
+#   1. Deploy group A in single-primary mode on server1 and server2.
+#   2. Deploy group B in single-primary mode on server3.
+#      Configure server4 as part of group B but not join it to
+#      the group.
+#   3. Configure a failover channel on server1 that replicates
+#      from server3.
+#   4. Suspend server2, server1 will see it UNREACHABLE.
+#   5. Add server4 to group B.
+#   6. Since group A does not have a ONLINE majority, server1
+#      will not detect the membership changes on group B.
+#   7. Resume server2.
+#   8. server1 will update group B membership.
+#   9. server2 will also update group B membership.
+#  10. Clean up.
+###############################################################################
+--source include/linux.inc
+--source include/big_test.inc
+--source include/have_group_replication_plugin.inc
+--let $rpl_group_replication_single_primary_mode=1
+--let $rpl_skip_group_replication_start= 1
+--let $rpl_server_count= 4
+--source include/group_replication.inc
+
+# Use the appropriate XCom port, that does depend on
+# `group_replication_communication_stack`.
+--let $have_xcom_stack= `SELECT @@group_replication_communication_stack LIKE 'XCOM'`
+--let $group_a_group_seeds= "localhost:$SERVER_GR_PORT_1,localhost:$SERVER_GR_PORT_2"
+--let $group_b_group_seeds= "localhost:$SERVER_GR_PORT_3,localhost:$SERVER_GR_PORT_4"
+if (!$have_xcom_stack) {
+  --let $group_a_group_seeds= "localhost:$SERVER_MYPORT_1,localhost:$SERVER_MYPORT_2"
+  --let $group_b_group_seeds= "localhost:$SERVER_MYPORT_3,localhost:$SERVER_MYPORT_4"
+}
+
+--echo
+--echo ############################################################
+--echo # 1. Deploy group A in single-primary mode on server1 and server2.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("This server is not able to reach a majority of members in the group. This server will skip the replication failover channels handling until this server is back to the group majority.");
+call mtr.add_suppression("This server is back to the group majority. Replication failover channels handling is resumed.");
+SET SESSION sql_log_bin = 1;
+
+--let $group_replication_group_name= aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa
+--let $group_a= $group_replication_group_name
+--disable_query_log
+--eval SET GLOBAL group_replication_group_seeds= $group_a_group_seeds
+--enable_query_log
+--source include/start_and_bootstrap_group_replication.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $server2_uuid= `SELECT @@server_uuid`
+
+# Get server2 pid.
+SET SESSION sql_log_bin= 0;
+CREATE TABLE pid_table(pid_no INT);
+--let $pid_file= `SELECT @@GLOBAL.pid_file`
+--replace_result $pid_file pid_file
+--eval LOAD DATA LOCAL INFILE '$pid_file' INTO TABLE pid_table
+--let $server2_pid=`SELECT pid_no FROM pid_table`
+DROP TABLE pid_table;
+SET SESSION sql_log_bin= 1;
+
+# Replication failover channels must be created on all group members.
+--replace_result $SERVER_MYPORT_3 SERVER_3_PORT
+--eval CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=1, SOURCE_PORT=$SERVER_MYPORT_3, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1'
+
+--disable_query_log
+--eval SET GLOBAL group_replication_group_seeds= $group_a_group_seeds
+--enable_query_log
+--source include/start_group_replication.inc
+
+
+--echo
+--echo ############################################################
+--echo # 2. Deploy group B in single-primary mode on server3.
+--echo #    Configure server4 as part of group B but not join it to
+--echo #    the group.
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--let $server3_uuid= `SELECT @@server_uuid`
+--let $group_replication_group_name= bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb
+--let $group_b= $group_replication_group_name
+--disable_query_log
+--eval SET GLOBAL group_replication_group_seeds= $group_b_group_seeds
+--enable_query_log
+--source include/start_and_bootstrap_group_replication.inc
+
+--let $rpl_connection_name= server4
+--source include/rpl_connection.inc
+--disable_query_log
+--eval SET GLOBAL group_replication_group_seeds= $group_b_group_seeds
+--enable_query_log
+
+
+--echo
+--echo ############################################################
+--echo # 3. Configure a failover channel on server1 that replicates
+--echo #    from server3.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--replace_result $SERVER_MYPORT_3 SERVER_3_PORT
+--eval CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=1, SOURCE_PORT=$SERVER_MYPORT_3, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1'
+
+--replace_result $SERVER_MYPORT_3 SERVER_MYPORT_3 $group_b GROUP_B
+--eval SELECT asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', '$group_b', '127.0.0.1', $SERVER_MYPORT_3, '', 85, 65);
+
+--let $rpl_channel_name='ch1'
+--source include/start_slave.inc
+
+--let $assert_text= Verify channel ch1 IO_THREAD is ON and connected to server3
+--let $assert_cond= "[SELECT SERVICE_STATE FROM performance_schema.replication_connection_status WHERE channel_name=\'ch1\' AND source_uuid=\'$server3_uuid\', SERVICE_STATE, 1]" = "ON"
+--source include/assert.inc
+
+--let $assert_text= 'There is one row in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 1
+--source include/assert.inc
+
+--let $failover_version_step3= `SELECT version FROM performance_schema.replication_group_configuration_version WHERE name='replication_asynchronous_connection_failover'`
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be 1 or greater'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] >= 1
+--source include/assert.inc
+
+--let $assert_text= 'There is one row in performance_schema.replication_asynchronous_connection_failover_managed for group B'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover_managed WHERE managed_name="$group_b", count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover_managed must be 1'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover_managed\', version, 1] = 1
+--source include/assert.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--let $assert_text= 'There is one row in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be equal or greater than the one on server1'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] >= $failover_version_step3
+--source include/assert.inc
+
+--let $assert_text= 'There is one row in performance_schema.replication_asynchronous_connection_failover_managed for group B'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover_managed WHERE managed_name="$group_b", count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover_managed must be 1'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover_managed\', version, 1] = 1
+--source include/assert.inc
+
+
+--echo
+--echo ############################################################
+--echo # 4. Suspend server2, server1 will see it UNREACHABLE.
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--exec kill -19 $server2_pid
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--let $group_replication_member_state= UNREACHABLE
+--let $group_replication_member_id= $server2_uuid
+--source include/gr_wait_for_member_state.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.error_log WHERE error_code='MY-013788' AND PRIO='Warning' AND data LIKE "This server is not able to reach a majority of members in the group. This server will skip the replication failover channels handling until this server is back to the group majority."
+--source include/wait_condition.inc
+
+
+--echo
+--echo ############################################################
+--echo # 5. Add server4 to group B.
+--let $rpl_connection_name= server4
+--source include/rpl_connection.inc
+--source include/start_group_replication.inc
+
+--let $wait_condition=SELECT COUNT(*)=2 FROM performance_schema.replication_group_members where MEMBER_STATE="ONLINE"
+--source include/wait_condition.inc
+
+
+--echo
+--echo ############################################################
+--echo # 6. Since group A does not have a ONLINE majority, server1
+--echo #    will not detect the membership changes on group B.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $failover_version_step6= `SELECT version FROM performance_schema.replication_group_configuration_version WHERE name='replication_asynchronous_connection_failover'`
+
+# Give some time to Monitor IO thread to attempt reach group B
+--sleep 15
+
+--let $assert_text= 'There is one row in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must remain the same'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] = $failover_version_step6
+--source include/assert.inc
+
+--let $assert_file= $MYSQLTEST_VARDIR/log/mysqld.1.err
+--let $assert_select= This server is not able to reach a majority of members in the group. This server will skip the replication failover channels handling until this server is back to the group majority.
+--let $assert_count= 1
+--let $assert_text= Only one majority loss warning is logged
+--source include/assert_grep.inc
+
+
+--echo
+--echo ############################################################
+--echo # 7. Resume server2.
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--exec kill -18 $server2_pid
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $wait_condition=SELECT COUNT(*)=2 FROM performance_schema.replication_group_members where MEMBER_STATE="ONLINE"
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.error_log WHERE error_code='MY-013789' AND PRIO='Warning' AND data LIKE "This server is back to the group majority. Replication failover channels handling is resumed."
+--source include/wait_condition.inc
+
+
+--echo
+--echo ############################################################
+--echo # 8. server1 will update group B membership.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--let $wait_condition= SELECT COUNT(*)=2 FROM performance_schema.replication_asynchronous_connection_failover
+--source include/wait_condition.inc
+
+--let $assert_text= Verify channel ch1 IO_THREAD is ON and connected to server3
+--let $assert_cond= "[SELECT SERVICE_STATE FROM performance_schema.replication_connection_status WHERE channel_name=\'ch1\' AND source_uuid=\'$server3_uuid\', SERVICE_STATE, 1]" = "ON"
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be 2 or greater'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] >= 2
+--source include/assert.inc
+--let $failover_version_step8= `SELECT version FROM performance_schema.replication_group_configuration_version WHERE name='replication_asynchronous_connection_failover'`
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be equal or greater than the one on server1 on step 6'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] >= $failover_version_step6
+--source include/assert.inc
+
+--let $assert_text= 'There is one row in performance_schema.replication_asynchronous_connection_failover_managed for group B'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover_managed WHERE managed_name="$group_b", count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover_managed must be 1'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover_managed\', version, 1] = 1
+--source include/assert.inc
+
+
+--echo
+--echo ############################################################
+--echo # 9. server2 will also update group B membership.
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--let $wait_condition= SELECT COUNT(*)=2 FROM performance_schema.replication_asynchronous_connection_failover
+--source include/wait_condition.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be equal or greater than the one on server1'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] >= $failover_version_step8
+--source include/assert.inc
+
+--let $assert_text= 'There is one row in performance_schema.replication_asynchronous_connection_failover_managed for group B'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover_managed WHERE managed_name="$group_b", count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover_managed must be 1'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover_managed\', version, 1] = 1
+--source include/assert.inc
+
+
+--echo
+--echo ############################################################
+--echo # 10. Clean up.
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_channel_name='ch1'
+--let $rpl_multi_source= 1
+--let $rpl_reset_slave_all= 1
+--source include/rpl_reset_slave.inc
+--let $rpl_channel_name=
+--let $rpl_multi_source=
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_channel_name='ch1'
+--let $rpl_multi_source= 1
+--let $rpl_reset_slave_all= 1
+--source include/rpl_reset_slave.inc
+--let $rpl_channel_name=
+--let $rpl_multi_source=
+
+--let $rpl_connection_name= server4
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_old_primary_rejoin.cnf mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_old_primary_rejoin.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_old_primary_rejoin.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_old_primary_rejoin.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,15 @@
+!include ../my.cnf
+
+[mysqld.1]
+loose-group_replication_single_primary_mode= TRUE
+loose-group_replication_enforce_update_everywhere_checks= FALSE
+
+[mysqld.2]
+loose-group_replication_single_primary_mode= TRUE
+loose-group_replication_enforce_update_everywhere_checks= FALSE
+
+[mysqld.3]
+
+[ENV]
+SERVER_MYPORT_3=		@mysqld.3.port
+SERVER_MYSOCK_3=		@mysqld.3.socket
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_old_primary_rejoin.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_old_primary_rejoin.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_old_primary_rejoin.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_old_primary_rejoin.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,230 @@
+###############################################################################
+# Validate that a primary can leave and rejoin the group when it has
+# replication failover channels running.
+#
+# Test:
+#   0. This test requires three servers:
+#        server1, server2: group
+#        server3: single server
+#   2. Configure and start a failover channel on server1 that
+#      replicates from server3.
+#   3. Validate server1 and server2 configuration.
+#   4. Server1 will restart and rejoin the group as secondary.
+#   5. Validate server1 and server2 configuration.
+#   6. Clean up.
+###############################################################################
+--source include/big_test.inc
+--source include/have_group_replication_plugin.inc
+--let $rpl_skip_group_replication_start= 1
+--let $rpl_server_count= 3
+--source include/group_replication.inc
+
+
+--echo
+--echo ############################################################
+--echo # 1. Deploy a group in single-primary mode on server1 and server2.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+SET SESSION sql_log_bin= 0;
+call mtr.add_suppression("The 'slave applier' thread of channel 'ch1' will error out as this server is a group secondary.");
+call mtr.add_suppression("The 'slave IO' thread of channel 'ch1' will error out as this server is a group secondary.");
+call mtr.add_suppression("Run function 'applier_start' in plugin 'group_replication' failed");
+call mtr.add_suppression("Run function 'thread_start' in plugin 'group_replication' failed");
+call mtr.add_suppression("Slave SQL for channel 'ch1': Fatal error: Failed to run 'applier_start' hook, Error_code: MY-013117");
+call mtr.add_suppression("Slave I/O for channel 'ch1': Fatal error: Failed to run 'thread_start' hook, Error_code: MY-013117");
+call mtr.add_suppression("Plugin group_replication reported: 'Can't start slave IO THREAD of channel 'ch1' when group replication is running with single-primary mode on a secondary member.");
+SET SESSION sql_log_bin= 1;
+
+--source include/start_and_bootstrap_group_replication.inc
+--source include/gr_assert_primary_member.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--replace_result $SERVER_MYPORT_3 SERVER_3_PORT
+--eval CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=0, SOURCE_PORT=$SERVER_MYPORT_3, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1'
+
+--source include/start_group_replication.inc
+--source include/gr_assert_secondary_member.inc
+
+
+--echo
+--echo ############################################################
+--echo # 2. Configure and start a failover channel on server1 that
+--echo #    replicates from server3.
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--let $server3_uuid= `SELECT @@server_uuid`
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--replace_result $SERVER_MYPORT_3 SERVER_3_PORT
+--eval CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=1, SOURCE_PORT=$SERVER_MYPORT_3, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1'
+
+--replace_result $SERVER_MYPORT_3 SERVER_MYPORT_3
+--eval SELECT asynchronous_connection_failover_add_source('ch1', '127.0.0.1', $SERVER_MYPORT_3, '', 50);
+
+--let $rpl_channel_name='ch1'
+--source include/start_slave.inc
+
+
+--echo
+--echo ############################################################
+--echo # 3. Validate server1 and server2 configuration.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--let $assert_text= 'There is 1 row in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be 1'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM performance_schema.replication_connection_configuration WHERE CHANNEL_NAME="ch1" AND SOURCE_CONNECTION_AUTO_FAILOVER=1, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= Verify channel ch1 IO_THREAD is ON and connected to server3
+--let $assert_cond= "[SELECT SERVICE_STATE FROM performance_schema.replication_connection_status WHERE channel_name=\'ch1\' AND source_uuid=\'$server3_uuid\', SERVICE_STATE, 1]" = "ON"
+--source include/assert.inc
+
+--let $assert_text= Verify channel ch1 SQL_THREAD is ON
+--let $assert_cond= "[SELECT SERVICE_STATE FROM performance_schema.replication_applier_status WHERE channel_name = \'ch1\', SERVICE_STATE, 1]" = "ON"
+--source include/assert.inc
+
+--let $assert_text= Verify replica_monitor thread is running
+--let $assert_cond= "[select count(*) FROM performance_schema.threads where NAME=\"thread/sql/replica_monitor\"]" = 1;
+--source include/assert.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_asynchronous_connection_failover
+--source include/wait_condition.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be 1'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM performance_schema.replication_connection_configuration WHERE CHANNEL_NAME="ch1" AND SOURCE_CONNECTION_AUTO_FAILOVER=1, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= Verify channel ch1 IO_THREAD is OFF
+--let $assert_cond= "[SELECT SERVICE_STATE FROM performance_schema.replication_connection_status WHERE channel_name=\'ch1\', SERVICE_STATE, 1]" = "OFF"
+--source include/assert.inc
+
+--let $assert_text= Verify channel ch1 SQL_THREAD is OFF
+--let $assert_cond= "[SELECT SERVICE_STATE FROM performance_schema.replication_applier_status WHERE channel_name = \'ch1\', SERVICE_STATE, 1]" = "OFF"
+--source include/assert.inc
+
+--let $assert_text= Verify replica_monitor thread is not running
+--let $assert_cond= "[select count(*) FROM performance_schema.threads where NAME=\"thread/sql/replica_monitor\"]" = 0;
+--source include/assert.inc
+
+
+--echo
+--echo ############################################################
+--echo # 4. Server1 will restart and rejoin the group as secondary.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--let $allow_rpl_inited=1
+--let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
+--let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $restart_parameters=restart:--group-replication-group-name=$group_replication_group_name --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group-replication-start-on-boot=1 --skip-slave-start=0
+--replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--source include/restart_mysqld.inc
+
+--let $rpl_server_number= 1
+--source include/rpl_reconnect.inc
+
+--let $group_replication_member_state= ONLINE
+--source include/gr_wait_for_member_state.inc
+
+
+--echo
+--echo ############################################################
+--echo # 5. Validate server1 and server2 configuration.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/gr_assert_secondary_member.inc
+
+--let $assert_text= 'There is 1 row in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be 1'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM performance_schema.replication_connection_configuration WHERE CHANNEL_NAME="ch1" AND SOURCE_CONNECTION_AUTO_FAILOVER=1, count, 1] = 1
+--source include/assert.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_connection_status WHERE CHANNEL_NAME="ch1" and SERVICE_STATE="OFF"
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_applier_status WHERE CHANNEL_NAME="ch1" AND SERVICE_STATE = "OFF"
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=0 FROM performance_schema.threads WHERE NAME="thread/sql/replica_monitor"
+--source include/wait_condition.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--source include/gr_assert_primary_member.inc
+
+--let $assert_text= 'There is 1 row in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be 1'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM performance_schema.replication_connection_configuration WHERE CHANNEL_NAME="ch1" AND SOURCE_CONNECTION_AUTO_FAILOVER=1, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= Verify channel ch1 IO_THREAD is ON and connected to server3
+--let $assert_cond= "[SELECT SERVICE_STATE FROM performance_schema.replication_connection_status WHERE channel_name=\'ch1\' AND source_uuid=\'$server3_uuid\', SERVICE_STATE, 1]" = "ON"
+--source include/assert.inc
+
+--let $assert_text= Verify channel ch1 SQL_THREAD is ON
+--let $assert_cond= "[SELECT SERVICE_STATE FROM performance_schema.replication_applier_status WHERE channel_name = \'ch1\', SERVICE_STATE, 1]" = "ON"
+--source include/assert.inc
+
+--let $assert_text= Verify replica_monitor thread is running
+--let $assert_cond= "[select count(*) FROM performance_schema.threads where NAME=\"thread/sql/replica_monitor\"]" = 1;
+--source include/assert.inc
+
+
+--echo
+--echo ############################################################
+--echo # 6. Clean up.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_channel_name='ch1'
+--let $rpl_multi_source= 1
+--let $rpl_reset_slave_all= 1
+--source include/rpl_reset_slave.inc
+--let $rpl_channel_name=
+--let $rpl_multi_source=
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_channel_name='ch1'
+--let $rpl_multi_source= 1
+--let $rpl_reset_slave_all= 1
+--source include/rpl_reset_slave.inc
+--let $rpl_channel_name=
+--let $rpl_multi_source=
+
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_on_spm.cnf mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_on_spm.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_on_spm.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_on_spm.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,33 @@
+!include ../my.cnf
+
+[mysqld.1]
+loose-group_replication_single_primary_mode= TRUE
+loose-group_replication_enforce_update_everywhere_checks= FALSE
+
+[mysqld.2]
+loose-group_replication_single_primary_mode= TRUE
+loose-group_replication_enforce_update_everywhere_checks= FALSE
+
+[mysqld.3]
+loose-group_replication_single_primary_mode= TRUE
+loose-group_replication_enforce_update_everywhere_checks= FALSE
+
+
+[mysqld.4]
+loose-group_replication_single_primary_mode= TRUE
+loose-group_replication_enforce_update_everywhere_checks= FALSE
+
+[mysqld.5]
+loose-group_replication_single_primary_mode= TRUE
+loose-group_replication_enforce_update_everywhere_checks= FALSE
+
+
+[ENV]
+SERVER_MYPORT_3=		@mysqld.3.port
+SERVER_MYSOCK_3=		@mysqld.3.socket
+
+SERVER_MYPORT_4=		@mysqld.4.port
+SERVER_MYSOCK_4=		@mysqld.4.socket
+
+SERVER_MYPORT_5=		@mysqld.5.port
+SERVER_MYSOCK_5=		@mysqld.5.socket
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_on_spm.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_on_spm.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_on_spm.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_on_spm.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,465 @@
+################################################################################
+#
+# Validate that:
+# -  The Automatic Connection failover feature for Receiver works when
+#    asynchronous replication receiver is a Primary member.
+# -  Whenever a running managed channel receiver who is also the Primary on a
+#    Single-Primary mode goes in OFFLINE/ERROR group replication state, then
+#    the new selected PRIMARY of the receiver group MUST establish asynchronous
+#    replication connection with the sender.
+#
+# Test:
+# 0. The test requires 5 servers:
+#      server1: single-primary group A primary
+#      server2: single-primary group A secondary
+#      server3: single-primary group B primary
+#      server4: single-primary group B secondary
+#      server5: stand alone server
+# 1. Create a replication channel to replicate from server4 to
+#    to server1 on both server1 and 2.
+# 2. Add group A replication failover managed source into secondary
+#    member in group B, server4.
+#    It will be allowed but the configuration will not be propagated.
+# 3. Deploy a 2 members receiver group in single primary mode.
+# 4. Error adding managed group to secondary server2.
+# 5. Deploy a 2 members sender group in single primary mode.
+# 6. Error starting a replication channel on secondary member server2.
+# 7. Add replication connection details of managed channel ch1
+#    to replication_asynchronous_connection_failover_managed table
+#    through asynchronous_connection_failover_add_managed() UDF.
+# 8. Verify replication_asynchronous_connection_failover on
+#    server1 has two rows and member action configuration version
+#    value for replication_asynchronous_connection_failover
+#    and for replication_asynchronous_connection_failover_managed.
+#    And the channel 'ch1' is connected to server3.
+# 9. Verify replication_asynchronous_connection_failover on
+#    server2 has two rows and member action configuration version
+#    value for replication_asynchronous_connection_failover
+#    and for replication_asynchronous_connection_failover_managed.
+# 10. Stop group replication on existing primary (server1), the new
+#     primary will establish asynchronous replication channel (ch1)
+#     connection with sender which is server3.
+#     And the channel 'ch1' is connected to server3.
+# 11. Delete replication connection details for managed channel ch1
+#     from replication_asynchronous_connection_failover_managed
+#     and replication_asynchronous_connection_failover table
+#     through asynchronous_connection_failover_delete_managed() UDF.
+# 12. Verify replication_asynchronous_connection_failover on
+#     server2 is empty and member action configuration version
+#     value for replication_asynchronous_connection_failover
+#     and for replication_asynchronous_connection_failover_managed.
+#     And the channel 'ch1' is connected to server3.
+# 13. Clean up.
+--source include/big_test.inc
+--source include/have_group_replication_plugin.inc
+--let $rpl_skip_group_replication_start= 1
+--let $rpl_server_count= 4
+--source include/group_replication.inc
+
+--let $group_A= `SELECT UUID()`
+--let $group_B= `SELECT UUID()`
+
+# Use the appropriate XCom port, that does depend on
+# `group_replication_communication_stack`.
+--let $have_xcom_stack= `SELECT @@group_replication_communication_stack LIKE 'XCOM'`
+--let $group_a_group_seeds= "localhost:$SERVER_GR_PORT_1,localhost:$SERVER_GR_PORT_2"
+--let $group_b_group_seeds= "localhost:$SERVER_GR_PORT_3,localhost:$SERVER_GR_PORT_4"
+if (!$have_xcom_stack) {
+  --let $group_a_group_seeds= "localhost:$SERVER_MYPORT_1,localhost:$SERVER_MYPORT_2"
+  --let $group_b_group_seeds= "localhost:$SERVER_MYPORT_3,localhost:$SERVER_MYPORT_4"
+}
+
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("The master's UUID has changed, although this should not happen unless you have changed it manually. The old UUID was.*");
+SET SESSION sql_log_bin = 1;
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("Can't start slave IO THREAD of channel 'ch1' when group replication is running with single-primary mode on a secondary member.");
+call mtr.add_suppression("Can't start slave SQL THREAD of channel 'ch1' when group replication is running with single-primary mode on a secondary member.");
+call mtr.add_suppression("Run function 'thread_start' in plugin 'group_replication' failed");
+call mtr.add_suppression("Run function 'applier_start' in plugin 'group_replication' failed");
+call mtr.add_suppression("Failed to run 'thread_start' hook");
+call mtr.add_suppression("Failed to run 'applier_start' hook");
+call mtr.add_suppression("The master's UUID has changed, although this should not happen unless you have changed it manually. The old UUID was.*");
+SET SESSION sql_log_bin = 1;
+
+
+--echo
+--echo # 1. Create a replication channel to replicate from server4 to
+--echo #    to server1 on both server1 and 2.
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--replace_result $SERVER_MYPORT_4 SERVER_4_PORT
+--eval CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_PORT=$SERVER_MYPORT_4, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1, SOURCE_CONNECTION_AUTO_FAILOVER=1 FOR CHANNEL 'ch1'
+
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--replace_result $SERVER_MYPORT_4 SERVER_4_PORT
+--eval CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_PORT=$SERVER_MYPORT_4, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1, SOURCE_CONNECTION_AUTO_FAILOVER=1 FOR CHANNEL 'ch1'
+
+
+--echo
+--echo # 2. Add server4 using asynchronous_connection_failover_add_managed
+--echo #    UDF on stand alone server2.
+--echo #    It will be allowed but the configuration will not be propagated.
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--replace_result $SERVER_MYPORT_4 SERVER_MYPORT_4 $group_A GROUP_NAME_SERVER1
+--eval SELECT asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', '$group_A', '127.0.0.1', $SERVER_MYPORT_4, '', 90, 70);
+
+
+--let $assert_text= 'There is one row in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be 1'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'There is one row in performance_schema.replication_asynchronous_connection_failover_managed'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover_managed WHERE managed_name="$group_A", count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover_managed must be 1'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover_managed\', version, 1] = 1
+--source include/assert.inc
+
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--let $assert_text= 'There are no rows in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= 'There is no version of replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', count, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= 'There are no rows in performance_schema.replication_asynchronous_connection_failover_managed'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover_managed, count, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= 'There is no version of replication_asynchronous_connection_failover_managed'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover_managed\', count, 1] = 0
+--source include/assert.inc
+
+
+--echo
+--echo # 3. Deploy a 2 members receiver group in single primary mode.
+--echo #    Since server1 will bootstrap the group, server1 configuration will
+--echo #    be the group configuration, which will override server2
+--echo #    configuration when server2 joins the group.
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $group_replication_group_name = $group_A
+--disable_query_log
+--eval SET GLOBAL group_replication_group_seeds= $group_a_group_seeds
+--enable_query_log
+--source include/start_and_bootstrap_group_replication.inc
+
+--let $assert_text= 'The performance_schema.replication_asynchronous_connection_failover table is empty'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = "0"
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be 0'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', count, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= 'The performance_schema.replication_asynchronous_connection_failover_managed table is empty'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover_managed WHERE managed_name="$group_A", count, 1] = "0"
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover_managed must be 0'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover_managed\', count, 1] = 0
+--source include/assert.inc
+
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $group_replication_group_name = $group_A
+--disable_query_log
+--eval SET GLOBAL group_replication_group_seeds= $group_a_group_seeds
+--enable_query_log
+--source include/start_group_replication.inc
+
+--let $assert_text= 'The performance_schema.replication_asynchronous_connection_failover table is empty'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = "0"
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be 0'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', count, 1] = "0"
+--source include/assert.inc
+
+--let $assert_text= 'The performance_schema.replication_asynchronous_connection_failover_managed table is empty'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover_managed WHERE managed_name="$group_A", count, 1] = "0"
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover_managed must be 0'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover_managed\', count, 1] = "0"
+--source include/assert.inc
+
+
+--echo
+--echo # 4. Error adding managed group to secondary server2.
+--echo
+--replace_result $SERVER_MYPORT_5 SERVER_MYPORT_5 $group_A GROUP_A
+--error ER_CANT_INITIALIZE_UDF
+--eval SELECT asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', '$group_A', '127.0.0.1', $SERVER_MYPORT_5, '', 90, 70);
+
+--replace_result $SERVER_MYPORT_5 SERVER_MYPORT_5
+--error ER_CANT_INITIALIZE_UDF
+--eval SELECT asynchronous_connection_failover_add_source('ch1', '127.0.0.1', $SERVER_MYPORT_5, '', 50)
+
+--let $assert_text= 'There are no rows in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= 'There is no version of replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', count, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= 'There are no rows in performance_schema.replication_asynchronous_connection_failover_managed'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover_managed WHERE managed_name="$group_A", count, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= 'There is no version of replication_asynchronous_connection_failover_managed'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover_managed\', count, 1] = 0
+--source include/assert.inc
+
+
+--echo #
+--echo # 5. Deploy a 2 members sender group in single primary mode.
+--echo #
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--let $group_replication_group_name = $group_B
+--disable_query_log
+--eval SET GLOBAL group_replication_group_seeds= $group_b_group_seeds
+--enable_query_log
+--source include/start_and_bootstrap_group_replication.inc
+
+
+--let $rpl_connection_name= server4
+--source include/rpl_connection.inc
+--let $group_replication_group_name = $group_B
+--disable_query_log
+--eval SET GLOBAL group_replication_group_seeds= $group_b_group_seeds
+--enable_query_log
+--source include/start_group_replication.inc
+
+
+--echo
+--echo # 6. Error starting a replication channel on secondary member server2.
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+START REPLICA FOR CHANNEL 'ch1';
+
+--let $slave_sql_errno= 13117
+--let $rpl_channel_name= 'ch1'
+--source include/wait_for_slave_sql_error.inc
+
+--let $assert_file= $MYSQLTEST_VARDIR/log/mysqld.2.err
+--let $assert_count = 1
+--let $assert_select = Can\'t start slave IO THREAD of channel \'ch1\' when group replication is running with single-primary mode on a secondary member
+--let $assert_text = Server executed GTID set is logged.
+--source include/assert_grep.inc
+
+--let $assert_file= $MYSQLTEST_VARDIR/log/mysqld.2.err
+--let $assert_count = 1
+--let $assert_select = Can\'t start slave SQL THREAD of channel \'ch1\' when group replication is running with single-primary mode on a secondary member
+--let $assert_text = Server executed GTID set is logged.
+--source include/assert_grep.inc
+
+STOP REPLICA FOR CHANNEL 'ch1';
+
+
+--echo
+--echo # 7. Add replication connection details of managed channel ch1
+--echo #    to replication_asynchronous_connection_failover_managed table
+--echo #    through asynchronous_connection_failover_add_managed() UDF.
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--replace_result $SERVER_MYPORT_4 SERVER_MYPORT_4 $group_B GROUP_NAME_SERVER2
+--eval SELECT asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', "$group_B",'127.0.0.1', $SERVER_MYPORT_4, '', 80, 60)
+
+
+--echo
+--echo # 8. Verify replication_asynchronous_connection_failover on
+--echo #    server1 has two rows and member action configuration version
+--echo #    value for replication_asynchronous_connection_failover
+--echo #    and for replication_asynchronous_connection_failover_managed.
+--echo #    And the channel 'ch1' is connected to server3.
+--echo
+--let $wait_condition= SELECT COUNT(*)=2 FROM performance_schema.replication_asynchronous_connection_failover
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_asynchronous_connection_failover_managed
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover' and version>=2
+--source include/wait_condition.inc
+--let $failover_version_step8= query_get_value(SELECT VERSION FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover', VERSION, 1)
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover_managed' and version=1
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_connection_configuration where CHANNEL_NAME='ch1' and HOST='127.0.0.1' and PORT=$SERVER_MYPORT_3
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_connection_status where CHANNEL_NAME='ch1' and SERVICE_STATE='ON'
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_applier_status where CHANNEL_NAME='ch1' and SERVICE_STATE='ON'
+--source include/wait_condition.inc
+
+
+
+
+--echo
+--echo #  9. Verify replication_asynchronous_connection_failover on
+--echo #     server2 has two rows and member action configuration version
+--echo #     value for replication_asynchronous_connection_failover
+--echo #     and for replication_asynchronous_connection_failover_managed.
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--let $wait_condition= SELECT COUNT(*)=2 FROM performance_schema.replication_asynchronous_connection_failover
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_asynchronous_connection_failover_managed
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover' and version>=$failover_version_step8
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover_managed' and version=1
+--source include/wait_condition.inc
+
+
+--echo
+--echo # 10. Stop group replication on existing primary (server1), the new
+--echo #     primary will establish asynchronous replication channel (ch1)
+--echo #     connection with sender which is server3.
+--echo #     And the channel 'ch1' is connected to server3.
+--echo
+--let $server2_uuid= `SELECT @@server_uuid`
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--source include/stop_group_replication.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--let $group_replication_expected_uuid= $server2_uuid
+--source include/gr_wait_primary_member_uuid.inc
+
+--let $wait_condition=SELECT COUNT(*)=1 FROM performance_schema.replication_group_members where MEMBER_STATE="ONLINE"
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_connection_status where CHANNEL_NAME='ch1' and SERVICE_STATE='ON'
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_applier_status where CHANNEL_NAME='ch1' and SERVICE_STATE='ON'
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_connection_configuration where CHANNEL_NAME='ch1' and HOST='127.0.0.1' and PORT=$SERVER_MYPORT_3
+--source include/wait_condition.inc
+
+
+--echo
+--echo # 11. Delete replication connection details for managed channel ch1
+--echo #     from replication_asynchronous_connection_failover_managed
+--echo #     and replication_asynchronous_connection_failover table
+--echo #     through asynchronous_connection_failover_delete_managed() UDF.
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--replace_result $group_B GROUP_NAME_SERVER2
+--eval SELECT asynchronous_connection_failover_delete_managed('ch1', '$group_B')
+
+
+--echo
+--echo # 12. Verify replication_asynchronous_connection_failover on
+--echo #     server2 is empty and member action configuration version
+--echo #     value for replication_asynchronous_connection_failover
+--echo #     and for replication_asynchronous_connection_failover_managed.
+--echo #     And the channel 'ch1' is connected to server3.
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--let $wait_condition= SELECT COUNT(*)=0 FROM performance_schema.replication_asynchronous_connection_failover
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=0 FROM performance_schema.replication_asynchronous_connection_failover_managed
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover' and version>=3
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_connection_status where CHANNEL_NAME='ch1' and SERVICE_STATE='ON'
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_applier_status where CHANNEL_NAME='ch1' and SERVICE_STATE='ON'
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_connection_configuration where CHANNEL_NAME='ch1' and HOST='127.0.0.1' and PORT=$SERVER_MYPORT_3
+--source include/wait_condition.inc
+
+
+--echo #
+--echo # 13. Clean up.
+--echo #
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--let $rpl_channel_name='ch1'
+--let $rpl_reset_slave_all= 1
+--let $rpl_multi_source= 1
+--source include/rpl_reset_slave.inc
+--let $rpl_channel_name=
+--let $rpl_reset_slave_all=
+--let $rpl_multi_source=
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--let $rpl_channel_name='ch1'
+--source include/stop_slave.inc
+
+--let $rpl_reset_slave_all= 1
+--let $rpl_multi_source= 1
+--source include/rpl_reset_slave.inc
+--let $rpl_channel_name=
+--let $rpl_reset_slave_all=
+--let $rpl_multi_source=
+
+--let $rpl_connection_name= server4
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_skip_sync = 1
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_primary_change.cnf mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_primary_change.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_primary_change.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_primary_change.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,24 @@
+!include ../my.cnf
+
+[mysqld.1]
+loose-group_replication_single_primary_mode= TRUE
+loose-group_replication_enforce_update_everywhere_checks= FALSE
+
+[mysqld.2]
+loose-group_replication_single_primary_mode= TRUE
+loose-group_replication_enforce_update_everywhere_checks= FALSE
+
+[mysqld.3]
+loose-group_replication_single_primary_mode= TRUE
+loose-group_replication_enforce_update_everywhere_checks= FALSE
+
+[mysqld.4]
+loose-group_replication_single_primary_mode= TRUE
+loose-group_replication_enforce_update_everywhere_checks= FALSE
+
+[ENV]
+SERVER_MYPORT_3=		@mysqld.3.port
+SERVER_MYSOCK_3=		@mysqld.3.socket
+
+SERVER_MYPORT_4=		@mysqld.4.port
+SERVER_MYSOCK_4=		@mysqld.4.socket
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_primary_change.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_primary_change.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_primary_change.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_primary_change.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,360 @@
+################################################################################
+#
+# Validate that:
+# -  The Automatic Connection failover feature for Receiver works when
+#    asynchronous replication receiver is a Primary member.
+# -  Whenever there is a running Managed channel receiver who is also the
+#    Primary on a Single-primary group, if the Primary changes, then the new
+#    selected Primary of the receiver group MUST establish asynchronous
+#    replication connection with the sender, provided
+#    mysql_start_failover_channels_if_primary internal member action is
+#    enabled on the receiver group.
+#
+# Test:
+# 0. The test requires 4 servers:
+#      server1: single-primary group A primary
+#      server2: single-primary group A secondary
+#      server3: single-primary group B primary
+#      server4: single-primary group B secondary
+# 1. Create a replication channel to replicate from server4 to
+#    to server1 on both server1 and 2.
+# 2. Deploy a 2 members receiver group in single primary mode.
+# 3. Deploy a 2 members sender group in single primary mode.
+# 4. Add replication connection details of managed channel ch1
+#    to replication_asynchronous_connection_failover_managed table
+#    through asynchronous_connection_failover_add_managed() UDF.
+# 5. Verify replication_asynchronous_connection_failover on
+#    server1 has two rows and member action configuration version
+#    value for replication_asynchronous_connection_failover
+#    and for replication_asynchronous_connection_failover_managed.
+# 6. Verify replication_asynchronous_connection_failover on
+#    server2 has two rows and member action configuration version
+#    value for replication_asynchronous_connection_failover
+#    and for replication_asynchronous_connection_failover_managed.
+# 7. Stop group replication on existing primary (server1), the new
+#     primary will establish asynchronous replication channel (ch1)
+#     connection with sender which is server4.
+# 8. Delete replication connection details for managed channel ch1
+#    from replication_asynchronous_connection_failover_managed
+#    and replication_asynchronous_connection_failover table
+#    through asynchronous_connection_failover_delete_managed() UDF.
+# 9. Verify replication_asynchronous_connection_failover on
+#    server2 is empty and member action configuration version
+#    value for replication_asynchronous_connection_failover
+#    and for replication_asynchronous_connection_failover_managed.
+# 10. Verify replication_asynchronous_connection_failover on
+#     server1 is empty and member action configuration version
+#     value for replication_asynchronous_connection_failover
+#     and for replication_asynchronous_connection_failover_managed.
+# 11. Clean up.
+--source include/big_test.inc
+--source include/have_group_replication_plugin.inc
+--let $rpl_skip_group_replication_start= 1
+--let $rpl_server_count= 4
+--source include/group_replication.inc
+
+--let $group_A= `SELECT UUID()`
+--let $group_B= `SELECT UUID()`
+
+# Use the appropriate XCom port, that does depend on
+# `group_replication_communication_stack`.
+--let $have_xcom_stack= `SELECT @@group_replication_communication_stack LIKE 'XCOM'`
+--let $group_a_group_seeds= "localhost:$SERVER_GR_PORT_1,localhost:$SERVER_GR_PORT_2"
+--let $group_b_group_seeds= "localhost:$SERVER_GR_PORT_3,localhost:$SERVER_GR_PORT_4"
+if (!$have_xcom_stack) {
+  --let $group_a_group_seeds= "localhost:$SERVER_MYPORT_1,localhost:$SERVER_MYPORT_2"
+  --let $group_b_group_seeds= "localhost:$SERVER_MYPORT_3,localhost:$SERVER_MYPORT_4"
+}
+
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("The master's UUID has changed, although this should not happen unless you have changed it manually. The old UUID was.*");
+SET SESSION sql_log_bin = 1;
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("The master's UUID has changed, although this should not happen unless you have changed it manually. The old UUID was.*");
+SET SESSION sql_log_bin = 1;
+
+
+--echo
+--echo # 1. Create a replication channel to replicate from server4 to
+--echo #    to server1 on both server1 and 2.
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--replace_result $SERVER_MYPORT_4 SERVER_4_PORT
+--eval CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_PORT=$SERVER_MYPORT_4, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1, SOURCE_CONNECTION_AUTO_FAILOVER=1 FOR CHANNEL 'ch1'
+
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--replace_result $SERVER_MYPORT_4 SERVER_4_PORT
+--eval CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_PORT=$SERVER_MYPORT_4, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1, SOURCE_CONNECTION_AUTO_FAILOVER=1 FOR CHANNEL 'ch1'
+
+
+--echo
+--echo # 2. Deploy a 2 members receiver group in single primary mode.
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $group_replication_group_name = $group_A
+--disable_query_log
+--eval SET GLOBAL group_replication_group_seeds= $group_a_group_seeds
+--enable_query_log
+--source include/start_and_bootstrap_group_replication.inc
+
+--let $rpl_channel_name='ch1'
+--source include/wait_for_slave_to_start.inc
+
+--let $assert_text= Verify replica_monitor thread is running
+--let $assert_cond= "[select count(*) FROM performance_schema.threads where NAME=\"thread/sql/replica_monitor\"]" = 1;
+--source include/assert.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $group_replication_group_name = $group_A
+--disable_query_log
+--eval SET GLOBAL group_replication_group_seeds= $group_a_group_seeds
+--enable_query_log
+--source include/start_group_replication.inc
+
+
+--echo #
+--echo # 3. Deploy a 2 members sender group in single primary mode.
+--echo #
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--let $group_replication_group_name = $group_B
+--disable_query_log
+--eval SET GLOBAL group_replication_group_seeds= $group_b_group_seeds
+--enable_query_log
+--source include/start_and_bootstrap_group_replication.inc
+
+
+--let $rpl_connection_name= server4
+--source include/rpl_connection.inc
+--let $group_replication_group_name = $group_B
+--disable_query_log
+--eval SET GLOBAL group_replication_group_seeds= $group_b_group_seeds
+--enable_query_log
+--source include/start_group_replication.inc
+
+
+
+--echo
+--echo # 4. Add replication connection details of managed channel ch1
+--echo #    to replication_asynchronous_connection_failover_managed table
+--echo #    through asynchronous_connection_failover_add_managed() UDF.
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--replace_result $SERVER_MYPORT_4 SERVER_MYPORT_4 $group_B GROUP_NAME_SERVER2
+--eval SELECT asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', "$group_B",'127.0.0.1', $SERVER_MYPORT_4, '', 80, 60)
+
+
+--echo
+--echo # 5. Verify replication_asynchronous_connection_failover on
+--echo #    server1 has two rows and member action configuration version
+--echo #    value for replication_asynchronous_connection_failover
+--echo #    and for replication_asynchronous_connection_failover_managed.
+--echo
+--let $wait_condition= SELECT COUNT(*)=2 FROM performance_schema.replication_asynchronous_connection_failover
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_asynchronous_connection_failover_managed
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover' and version>=2
+--source include/wait_condition.inc
+--let $failover_version_step5= query_get_value(SELECT VERSION FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover', VERSION, 1)
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover_managed' and version=1
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_connection_configuration where CHANNEL_NAME='ch1' and HOST='127.0.0.1' and PORT=$SERVER_MYPORT_3
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_connection_status where CHANNEL_NAME='ch1' and SERVICE_STATE='ON'
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_applier_status where CHANNEL_NAME='ch1' and SERVICE_STATE='ON'
+--source include/wait_condition.inc
+
+
+--echo
+--echo #  6. Verify replication_asynchronous_connection_failover on
+--echo #     server2 has two rows and member action configuration version
+--echo #     value for replication_asynchronous_connection_failover
+--echo #     and for replication_asynchronous_connection_failover_managed.
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--let $wait_condition= SELECT COUNT(*)=2 FROM performance_schema.replication_asynchronous_connection_failover
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_asynchronous_connection_failover_managed
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover' and version>=$failover_version_step5
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover_managed' and version=1
+--source include/wait_condition.inc
+
+
+--echo
+--echo # 7. Stop group replication on existing primary (server1), and change
+--echo #    primary to server2. The asynchronous replication channel (ch1)
+--echo #    connection will be started without any error.
+--echo
+--let $server2_uuid= `SELECT @@server_uuid`
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--let $rpl_channel_name='ch1'
+--source include/stop_slave.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--replace_result $server2_uuid SERVER2_UUID
+--eval SELECT group_replication_set_as_primary("$server2_uuid")
+
+--let $group_replication_expected_uuid= $server2_uuid
+--source include/gr_wait_primary_member_uuid.inc
+
+--let $wait_condition=SELECT COUNT(*)=2 FROM performance_schema.replication_group_members where MEMBER_STATE="ONLINE"
+--source include/wait_condition.inc
+
+--let $rpl_channel_name='ch1'
+--source include/wait_for_slave_to_start.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_connection_configuration where CHANNEL_NAME='ch1' and HOST='127.0.0.1' and PORT=$SERVER_MYPORT_3
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_connection_status where CHANNEL_NAME='ch1' and SERVICE_STATE='ON'
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_applier_status where CHANNEL_NAME='ch1' and SERVICE_STATE='ON'
+--source include/wait_condition.inc
+
+--let $assert_text= Verify replica_monitor thread is running
+--let $assert_cond= "[select count(*) FROM performance_schema.threads where NAME=\"thread/sql/replica_monitor\"]" = 1;
+--source include/assert.inc
+
+
+--echo
+--echo # 8. Delete replication connection details for managed channel ch1
+--echo #    from replication_asynchronous_connection_failover_managed
+--echo #    and replication_asynchronous_connection_failover table
+--echo #    through asynchronous_connection_failover_delete_managed() UDF.
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--replace_result $group_B GROUP_NAME_SERVER2
+--eval SELECT asynchronous_connection_failover_delete_managed('ch1', '$group_B')
+
+
+--echo
+--echo # 9. Verify replication_asynchronous_connection_failover on
+--echo #    server2 is empty and member action configuration version
+--echo #    value for replication_asynchronous_connection_failover
+--echo #    and for replication_asynchronous_connection_failover_managed.
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--let $wait_condition= SELECT COUNT(*)=0 FROM performance_schema.replication_asynchronous_connection_failover
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=0 FROM performance_schema.replication_asynchronous_connection_failover_managed
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover' and version>=3
+--source include/wait_condition.inc
+--let $failover_version_step9= query_get_value(SELECT VERSION FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover', VERSION, 1)
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_connection_configuration where CHANNEL_NAME='ch1' and HOST='127.0.0.1' and PORT=$SERVER_MYPORT_3
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_connection_status where CHANNEL_NAME='ch1' and SERVICE_STATE='ON'
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_applier_status where CHANNEL_NAME='ch1' and SERVICE_STATE='ON'
+--source include/wait_condition.inc
+
+
+--echo
+--echo # 10. Verify replication_asynchronous_connection_failover on
+--echo #     server1 is empty and member action configuration version
+--echo #     value for replication_asynchronous_connection_failover
+--echo #     and for replication_asynchronous_connection_failover_managed.
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--let $wait_condition= SELECT COUNT(*)=0 FROM performance_schema.replication_asynchronous_connection_failover
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=0 FROM performance_schema.replication_asynchronous_connection_failover_managed
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover' and version>=$failover_version_step9
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_connection_status where CHANNEL_NAME='ch1' and SERVICE_STATE='OFF'
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_applier_status where CHANNEL_NAME='ch1' and SERVICE_STATE='OFF'
+--source include/wait_condition.inc
+
+
+
+--echo #
+--echo # 11. Clean up.
+--echo #
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--let $rpl_channel_name='ch1'
+--let $rpl_reset_slave_all= 1
+--let $rpl_multi_source= 1
+--source include/rpl_reset_slave.inc
+--let $rpl_channel_name=
+--let $rpl_reset_slave_all=
+--let $rpl_multi_source=
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--let $rpl_channel_name='ch1'
+--source include/stop_slave.inc
+
+--let $rpl_reset_slave_all= 1
+--let $rpl_multi_source= 1
+--source include/rpl_reset_slave.inc
+--let $rpl_channel_name=
+--let $rpl_reset_slave_all=
+--let $rpl_multi_source=
+
+--let $rpl_connection_name= server4
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_reset_channel.cnf mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_reset_channel.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_reset_channel.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_reset_channel.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,22 @@
+!include ../my.cnf
+
+[mysqld.1]
+loose-group_replication_single_primary_mode= TRUE
+loose-group_replication_enforce_update_everywhere_checks= FALSE
+
+[mysqld.2]
+loose-group_replication_single_primary_mode= TRUE
+loose-group_replication_enforce_update_everywhere_checks= FALSE
+
+[mysqld.3]
+loose-group_replication_single_primary_mode= TRUE
+loose-group_replication_enforce_update_everywhere_checks= FALSE
+
+[mysqld.4]
+
+[ENV]
+SERVER_MYPORT_3=		@mysqld.3.port
+SERVER_MYSOCK_3=		@mysqld.3.socket
+
+SERVER_MYPORT_4=		@mysqld.4.port
+SERVER_MYSOCK_4=		@mysqld.4.socket
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_reset_channel.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_reset_channel.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_reset_channel.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_reset_channel.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,227 @@
+###############################################################################
+# Validate that when a failover is deleted, its status shared with the group is
+# also deleted.
+#
+# Test:
+#   0. This test requires three servers:
+#        server1, server2: group
+#        server3: single server
+#   2. Configure and start a failover channel on server1 that
+#      replicates from server3.
+#   3. Validate server1 and server2 configuration.
+#   4. Stop and delete channel 'ch1' on server1 and server2.
+#   5. Validate server1 and server2 configuration.
+#   6. Add server3 to the group.
+#   7. Clean up.
+###############################################################################
+--source include/big_test.inc
+--source include/have_group_replication_plugin.inc
+--let $rpl_skip_group_replication_start= 1
+--let $rpl_server_count= 4
+--source include/group_replication.inc
+
+
+--echo
+--echo ############################################################
+--echo # 1. Deploy a group in single-primary mode on server1 and server2.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/start_and_bootstrap_group_replication.inc
+--source include/gr_assert_primary_member.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--replace_result $SERVER_MYPORT_4 SERVER_4_PORT
+--eval CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=0, SOURCE_PORT=$SERVER_MYPORT_4, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1'
+
+--source include/start_group_replication.inc
+--source include/gr_assert_secondary_member.inc
+
+
+--echo
+--echo ############################################################
+--echo # 2. Configure and start a failover channel on server1 that
+--echo #    replicates from server4.
+--let $rpl_connection_name= server4
+--source include/rpl_connection.inc
+--let $server4_uuid= `SELECT @@server_uuid`
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--replace_result $SERVER_MYPORT_4 SERVER_4_PORT
+--eval CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=1, SOURCE_PORT=$SERVER_MYPORT_4, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1'
+
+--replace_result $SERVER_MYPORT_4 SERVER_MYPORT_4
+--eval SELECT asynchronous_connection_failover_add_source('ch1', '127.0.0.1', $SERVER_MYPORT_4, '', 50);
+
+--let $rpl_channel_name='ch1'
+--source include/start_slave.inc
+
+
+--echo
+--echo ############################################################
+--echo # 3. Validate server1 and server2 configuration.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--let $assert_text= 'There is 1 row in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be 1'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM performance_schema.replication_connection_configuration WHERE CHANNEL_NAME="ch1" AND SOURCE_CONNECTION_AUTO_FAILOVER=1, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= Verify channel ch1 IO_THREAD is ON and connected to server4
+--let $assert_cond= "[SELECT SERVICE_STATE FROM performance_schema.replication_connection_status WHERE channel_name=\'ch1\' AND source_uuid=\'$server4_uuid\', SERVICE_STATE, 1]" = "ON"
+--source include/assert.inc
+
+--let $assert_text= Verify channel ch1 SQL_THREAD is ON
+--let $assert_cond= "[SELECT SERVICE_STATE FROM performance_schema.replication_applier_status WHERE channel_name = \'ch1\', SERVICE_STATE, 1]" = "ON"
+--source include/assert.inc
+
+--let $assert_text= Verify replica_monitor thread is running
+--let $assert_cond= "[select count(*) FROM performance_schema.threads where NAME=\"thread/sql/replica_monitor\"]" = 1;
+--source include/assert.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_asynchronous_connection_failover
+--source include/wait_condition.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be 1'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM performance_schema.replication_connection_configuration WHERE CHANNEL_NAME="ch1" AND SOURCE_CONNECTION_AUTO_FAILOVER=1, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= Verify channel ch1 IO_THREAD is OFF
+--let $assert_cond= "[SELECT SERVICE_STATE FROM performance_schema.replication_connection_status WHERE channel_name=\'ch1\', SERVICE_STATE, 1]" = "OFF"
+--source include/assert.inc
+
+--let $assert_text= Verify channel ch1 SQL_THREAD is OFF
+--let $assert_cond= "[SELECT SERVICE_STATE FROM performance_schema.replication_applier_status WHERE channel_name = \'ch1\', SERVICE_STATE, 1]" = "OFF"
+--source include/assert.inc
+
+--let $assert_text= Verify replica_monitor thread is not running
+--let $assert_cond= "[select count(*) FROM performance_schema.threads where NAME=\"thread/sql/replica_monitor\"]" = 0;
+--source include/assert.inc
+
+
+--echo
+--echo ############################################################
+--echo # 4. Stop and delete channel 'ch1' on server1 and server2.
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $rpl_channel_name='ch1'
+--let $rpl_multi_source= 1
+--let $rpl_reset_slave_all= 1
+--source include/rpl_reset_slave.inc
+--let $rpl_channel_name=
+--let $rpl_multi_source=
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $rpl_channel_name='ch1'
+--source include/stop_slave.inc
+
+--let $rpl_channel_name='ch1'
+--let $rpl_multi_source= 1
+--let $rpl_reset_slave_all= 1
+--source include/rpl_reset_slave.inc
+--let $rpl_channel_name=
+--let $rpl_multi_source=
+
+--replace_result $SERVER_MYPORT_4 SERVER_MYPORT_4
+--eval SELECT asynchronous_connection_failover_delete_source('ch1', '127.0.0.1', $SERVER_MYPORT_4, '');
+
+
+--echo
+--echo ############################################################
+--echo # 5. Validate server1 and server2 configuration.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--let $assert_text= 'There are 0 rows in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be 2'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] = 2
+--source include/assert.inc
+
+--let $assert_text= 'Verify ch1 was deleted'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM performance_schema.replication_connection_configuration WHERE CHANNEL_NAME="ch1", count, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= Verify replica_monitor thread is not running
+--let $assert_cond= "[select count(*) FROM performance_schema.threads where NAME=\"thread/sql/replica_monitor\"]" = 0;
+--source include/assert.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--let $wait_condition= SELECT COUNT(*)=0 FROM performance_schema.replication_asynchronous_connection_failover
+--source include/wait_condition.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be 2'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] = 2
+--source include/assert.inc
+
+--let $assert_text= 'Verify ch1 was deleted'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM performance_schema.replication_connection_configuration WHERE CHANNEL_NAME="ch1", count, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= Verify replica_monitor thread is not running
+--let $assert_cond= "[select count(*) FROM performance_schema.threads where NAME=\"thread/sql/replica_monitor\"]" = 0;
+--source include/assert.inc
+
+
+--echo
+--echo ############################################################
+--echo # 6. Add server3 to the group.
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--source include/start_group_replication.inc
+--source include/gr_assert_secondary_member.inc
+
+--let $assert_text= 'There are 0 rows in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be 2'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] = 2
+--source include/assert.inc
+
+--let $assert_text= 'Verify ch1 does noet exist'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM performance_schema.replication_connection_configuration WHERE CHANNEL_NAME="ch1", count, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= Verify replica_monitor thread is not running
+--let $assert_cond= "[select count(*) FROM performance_schema.threads where NAME=\"thread/sql/replica_monitor\"]" = 0;
+--source include/assert.inc
+
+
+--echo
+--echo ############################################################
+--echo # 7. Clean up.
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_source_connection_auto_failover_disabled.cnf mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_source_connection_auto_failover_disabled.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_source_connection_auto_failover_disabled.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_source_connection_auto_failover_disabled.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,15 @@
+!include ../my.cnf
+
+[mysqld.1]
+loose-group_replication_single_primary_mode= TRUE
+loose-group_replication_enforce_update_everywhere_checks= FALSE
+
+[mysqld.2]
+loose-group_replication_single_primary_mode= TRUE
+loose-group_replication_enforce_update_everywhere_checks= FALSE
+
+[mysqld.3]
+
+[ENV]
+SERVER_MYPORT_3=		@mysqld.3.port
+SERVER_MYSOCK_3=		@mysqld.3.socket
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_source_connection_auto_failover_disabled.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_source_connection_auto_failover_disabled.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_source_connection_auto_failover_disabled.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_source_connection_auto_failover_disabled.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,202 @@
+################################################################################
+#
+# Validate that receiver group members do receive value of
+# SOURCE_CONNECTION_AUTO_FAILOVER parameter of CHANGE REPLICATION
+# SOURCE command.
+#
+# Test:
+# 0. The test requires 3 servers:
+#      server1: group primary (async channel to server3)
+#      server2: group secondary
+#      server3: source server
+# 1. Create a replication channel to replicate from server3 on
+#    server2.
+# 2. Deploy a 2 members group in single primary mode.
+# 3. Create a replication channel to replicate from server3 on
+#    server1.
+# 4. Add replication connection details of server3 to
+#    replication_asynchronous_connection_failover table
+#    through asynchronous_connection_failover_add_source() UDF.
+# 5. Start replica for channel ch1.
+# 6. Verify replication_asynchronous_connection_failover on
+#    server1 has one row.
+# 7. Verify replication_asynchronous_connection_failover on
+#    server2 has one row.
+# 8. Verify SOURCE_CONNECTION_AUTO_FAILOVER status is received on
+#    server 2.
+# 9. Stop replication channel ch1.
+# 10. Disable SOURCE_CONNECTION_AUTO_FAILOVER for replication channel ch1.
+# 11. Verify SOURCE_CONNECTION_AUTO_FAILOVER status is received on
+#     server 2.
+# 12. Change primary to server2.
+#     The asynchronous replication channel (ch1) won't be started
+#     as SOURCE_CONNECTION_AUTO_FAILOVER  is disabled.
+# 13. Clean up.
+#
+--source include/big_test.inc
+--source include/have_group_replication_plugin.inc
+--let $rpl_skip_group_replication_start= 1
+--let $rpl_server_count= 3
+--source include/group_replication.inc
+
+
+--echo
+--echo # 1. Create a replication channel to replicate from server3 on
+--echo #    server2.
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--replace_result $SERVER_MYPORT_3 SERVER_3_PORT
+--eval CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_PORT=$SERVER_MYPORT_3, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1, SOURCE_CONNECTION_AUTO_FAILOVER=0 FOR CHANNEL 'ch1'
+
+
+--echo
+--echo # 2. Deploy a 2 members group in single primary mode.
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/start_and_bootstrap_group_replication.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--source include/start_group_replication.inc
+
+
+--echo
+--echo # 3. Create a replication channel to replicate from server3 on
+--echo #    server1.
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--replace_result $SERVER_MYPORT_3 SERVER_3_PORT
+--eval CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_PORT=$SERVER_MYPORT_3, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1, SOURCE_CONNECTION_AUTO_FAILOVER=1 FOR CHANNEL 'ch1'
+
+
+--echo
+--echo # 4. Add replication connection details of server3 to
+--echo #    replication_asynchronous_connection_failover table
+--echo #    through asynchronous_connection_failover_add_source() UDF.
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--replace_result $SERVER_MYPORT_3 SERVER_MYPORT_3
+--eval SELECT asynchronous_connection_failover_add_source('ch1', '127.0.0.1', $SERVER_MYPORT_3, '', 50)
+
+
+--echo
+--echo # 5. Start replica for channel ch1.
+--echo
+--let $rpl_channel_name='ch1'
+--source include/start_slave.inc
+--let $rpl_channel_name=
+
+
+--echo
+--echo # 6. Verify replication_asynchronous_connection_failover on
+--echo #    server1 has one row.
+--echo
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_asynchronous_connection_failover
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover' and version>=1
+--source include/wait_condition.inc
+--let $failover_version_step6= query_get_value(SELECT VERSION FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover', VERSION, 1)
+
+
+--echo
+--echo # 7. Verify replication_asynchronous_connection_failover on
+--echo #    server2 has one row.
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_asynchronous_connection_failover
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_configuration_version where name='replication_asynchronous_connection_failover' and version>=$failover_version_step6
+--source include/wait_condition.inc
+
+
+--echo
+--echo # 8. Verify SOURCE_CONNECTION_AUTO_FAILOVER status is received on
+--echo #    server 2.
+--echo
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_connection_configuration WHERE CHANNEL_NAME="ch1" AND SOURCE_CONNECTION_AUTO_FAILOVER="1"
+--source include/wait_condition.inc
+
+
+--echo
+--echo # 9. Stop replication channel ch1.
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--let $rpl_channel_name='ch1'
+--source include/stop_slave.inc
+
+
+--echo
+--echo # 10. Disable SOURCE_CONNECTION_AUTO_FAILOVER for replication channel ch1.
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--eval CHANGE REPLICATION SOURCE TO SOURCE_CONNECTION_AUTO_FAILOVER=0 FOR CHANNEL 'ch1'
+
+
+--echo
+--echo # 11. Verify SOURCE_CONNECTION_AUTO_FAILOVER status is received on
+--echo #     server 2.
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_connection_configuration WHERE CHANNEL_NAME="ch1" AND SOURCE_CONNECTION_AUTO_FAILOVER="0"
+--source include/wait_condition.inc
+
+
+--echo
+--echo # 12. Change primary to server2.
+--echo #     The asynchronous replication channel (ch1) won't be started
+--echo #     as SOURCE_CONNECTION_AUTO_FAILOVER  is disabled.
+--echo
+--let $server2_uuid= `SELECT @@server_uuid`
+
+--replace_result $server2_uuid SERVER2_UUID
+--eval SELECT group_replication_set_as_primary("$server2_uuid")
+
+--let $group_replication_expected_uuid= $server2_uuid
+--source include/gr_wait_primary_member_uuid.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_connection_status where CHANNEL_NAME='ch1' and SERVICE_STATE='OFF'
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_applier_status where CHANNEL_NAME='ch1' and SERVICE_STATE='OFF'
+--source include/wait_condition.inc
+
+
+--echo
+--echo # 13. Clean up.
+--echo
+--replace_result $SERVER_MYPORT_3 SERVER_MYPORT_3
+--eval SELECT asynchronous_connection_failover_delete_source('ch1', '127.0.0.1', $SERVER_MYPORT_3, '')
+
+# If the channel is running RESET SLAVE on server2 will fail,
+# which shows that successful run of the RESET SLAVE is validating
+# that the channel didn't started.
+--let $rpl_channel_name='ch1'
+--let $rpl_reset_slave_all= 1
+--let $rpl_multi_source= 1
+--source include/rpl_reset_slave.inc
+--let $rpl_reset_slave_all=
+--let $rpl_multi_source=
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--let $rpl_reset_slave_all= 1
+--let $rpl_multi_source= 1
+--source include/rpl_reset_slave.inc
+--let $rpl_reset_slave_all=
+--let $rpl_multi_source=
+--let $rpl_channel_name=
+
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_spm_to_mpm.cnf mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_spm_to_mpm.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_spm_to_mpm.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_spm_to_mpm.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,16 @@
+!include ../my.cnf
+
+[mysqld.1]
+
+[mysqld.2]
+
+[mysqld.3]
+
+[mysqld.4]
+
+[ENV]
+SERVER_MYPORT_3=		@mysqld.3.port
+SERVER_MYSOCK_3=		@mysqld.3.socket
+
+SERVER_MYPORT_4=		@mysqld.4.port
+SERVER_MYSOCK_4=		@mysqld.4.socket
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_spm_to_mpm.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_spm_to_mpm.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_spm_to_mpm.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_spm_to_mpm.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,284 @@
+###############################################################################
+# Validate that on a group mode change from single to multi-primary,
+# following will get disabled in multi-primary mode:
+# * configuration (managed channels sources states,
+#   SOURCE_CONNECTION_AUTO_FAILOVER value) propagation;
+# * channels start on primary election.
+#
+# Test:
+#   0. This test requires four servers:
+#        server1, server2: group
+#        server3: single server
+#        server4: single server
+#   1. Deploy a group in single-primary mode on server1 and server2.
+#   2. Configure a failover channel on server1 that replicates
+#      from server3.
+#   3. Assert failover channel configuration on server2.
+#   4. Change to multi-primary mode.
+#      The failover channel will remain working on server1.
+#   5. Add more sources to channel 'ch1' on server1
+#      and change SOURCE_CONNECTION_AUTO_FAILOVER value,
+#      they will not be propagated to server2.
+#   6. server1 will leave the group, despite 'ch1' is a failover
+#      channel, since the group is on multi-primary mode, server2
+#      will not start channel 'ch1'.
+#   7. Clean up.
+###############################################################################
+--source include/big_test.inc
+--source include/have_group_replication_plugin.inc
+--let $rpl_group_replication_single_primary_mode=1
+--let $rpl_skip_group_replication_start= 1
+--let $rpl_server_count= 4
+--source include/group_replication.inc
+
+
+--echo
+--echo ############################################################
+--echo # 1. Deploy a group in single-primary mode on server1 and server2.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $server1_uuid= query_get_value(SELECT @@SERVER_UUID, @@SERVER_UUID, 1)
+--source include/start_and_bootstrap_group_replication.inc
+--source include/gr_assert_primary_member.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+# Replication failover channels must be created on all group members.
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--replace_result $SERVER_MYPORT_3 SERVER_3_PORT
+--eval CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=1, SOURCE_PORT=$SERVER_MYPORT_3, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1'
+
+--source include/start_group_replication.inc
+--source include/gr_assert_secondary_member.inc
+
+
+--echo
+--echo ############################################################
+--echo # 2. Configure a failover channel on server1 that replicates
+--echo #    from server3.
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--let $server3_uuid= `SELECT @@server_uuid`
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--replace_result $SERVER_MYPORT_3 SERVER_3_PORT
+--eval CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=1, SOURCE_PORT=$SERVER_MYPORT_3, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1'
+
+--replace_result $SERVER_MYPORT_3 SERVER_MYPORT_3
+--eval SELECT asynchronous_connection_failover_add_source('ch1', '127.0.0.1', $SERVER_MYPORT_3, '', 50);
+
+--let $rpl_channel_name='ch1'
+--source include/start_slave.inc
+
+--let $assert_text= 'There is 1 row in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be 1'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM performance_schema.replication_connection_configuration WHERE CHANNEL_NAME="ch1" AND SOURCE_CONNECTION_AUTO_FAILOVER=1, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= Verify channel ch1 IO_THREAD is ON and connected to server3
+--let $assert_cond= "[SELECT SERVICE_STATE FROM performance_schema.replication_connection_status WHERE channel_name=\'ch1\' AND source_uuid=\'$server3_uuid\', SERVICE_STATE, 1]" = "ON"
+--source include/assert.inc
+
+--let $assert_text= Verify channel ch1 SQL_THREAD is ON
+--let $assert_cond= "[SELECT SERVICE_STATE FROM performance_schema.replication_applier_status WHERE channel_name = \'ch1\', SERVICE_STATE, 1]" = "ON"
+--source include/assert.inc
+
+--let $assert_text= Verify replica_monitor thread is running
+--let $assert_cond= "[select count(*) FROM performance_schema.threads where NAME=\"thread/sql/replica_monitor\"]" = 1;
+--source include/assert.inc
+
+--echo
+--echo ############################################################
+--echo # 3. Assert failover channel configuration on server2.
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--let $assert_text= 'There is 1 row in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be 1'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM performance_schema.replication_connection_configuration WHERE CHANNEL_NAME="ch1" AND SOURCE_CONNECTION_AUTO_FAILOVER=1, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= Verify channel ch1 IO_THREAD is OFF
+--let $assert_cond= "[SELECT SERVICE_STATE FROM performance_schema.replication_connection_status WHERE channel_name=\'ch1\', SERVICE_STATE, 1]" = "OFF"
+--source include/assert.inc
+
+--let $assert_text= Verify channel ch1 SQL_THREAD is OFF
+--let $assert_cond= "[SELECT SERVICE_STATE FROM performance_schema.replication_applier_status WHERE channel_name = \'ch1\', SERVICE_STATE, 1]" = "OFF"
+--source include/assert.inc
+
+--let $assert_text= Verify replica_monitor thread is not running
+--let $assert_cond= "[select count(*) FROM performance_schema.threads where NAME=\"thread/sql/replica_monitor\"]" = 0;
+--source include/assert.inc
+
+--replace_column 3 #####
+SELECT * FROM performance_schema.replication_asynchronous_connection_failover;
+
+SELECT * FROM performance_schema.replication_group_configuration_version WHERE name LIKE 'replication_asynchronous_connection_failover';
+
+
+--echo
+--echo ############################################################
+--echo # 4. Change to multi-primary mode.
+--echo #    The failover channel will remain working on server1.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--replace_result $server1_uuid MEMBER1_UUID
+SELECT group_replication_switch_to_multi_primary_mode();
+--source include/gr_assert_multi_primary_mode.inc
+
+--let $rpl_channel_name= 'ch1'
+--source include/check_slave_is_running.inc
+--let $rpl_channel_name=
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--source include/gr_assert_multi_primary_mode.inc
+
+
+--echo
+--echo ############################################################
+--echo # 5. Add more sources to channel 'ch1' on server1
+--echo #    and change SOURCE_CONNECTION_AUTO_FAILOVER value,
+--echo #    they will not be propagated to server2.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--replace_result $SERVER_MYPORT_4 SERVER_MYPORT_4
+--eval SELECT asynchronous_connection_failover_add_source('ch1', '127.0.0.1', $SERVER_MYPORT_4, '', 50);
+
+--let $rpl_channel_name='ch1'
+--source include/stop_slave.inc
+
+CHANGE REPLICATION SOURCE TO SOURCE_CONNECTION_AUTO_FAILOVER=0 FOR CHANNEL 'ch1';
+
+--let $rpl_channel_name='ch1'
+--source include/start_slave.inc
+
+
+--let $assert_text= 'There are 2 rows in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 2
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be 2'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] = 2
+
+--replace_column 3 #####
+SELECT * FROM performance_schema.replication_asynchronous_connection_failover;
+
+SELECT * FROM performance_schema.replication_group_configuration_version WHERE name LIKE 'replication_asynchronous_connection_failover';
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--let $assert_text= 'There is 1 row in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be 1'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM performance_schema.replication_connection_configuration WHERE CHANNEL_NAME="ch1" AND SOURCE_CONNECTION_AUTO_FAILOVER=1, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= Verify channel ch1 IO_THREAD is OFF
+--let $assert_cond= "[SELECT SERVICE_STATE FROM performance_schema.replication_connection_status WHERE channel_name=\'ch1\', SERVICE_STATE, 1]" = "OFF"
+--source include/assert.inc
+
+--let $assert_text= Verify channel ch1 SQL_THREAD is OFF
+--let $assert_cond= "[SELECT SERVICE_STATE FROM performance_schema.replication_applier_status WHERE channel_name = \'ch1\', SERVICE_STATE, 1]" = "OFF"
+--source include/assert.inc
+
+--let $assert_text= Verify replica_monitor thread is not running
+--let $assert_cond= "[select count(*) FROM performance_schema.threads where NAME=\"thread/sql/replica_monitor\"]" = 0;
+--source include/assert.inc
+
+--replace_column 3 #####
+SELECT * FROM performance_schema.replication_asynchronous_connection_failover;
+
+SELECT * FROM performance_schema.replication_group_configuration_version WHERE name LIKE 'replication_asynchronous_connection_failover';
+
+
+--echo
+--echo ############################################################
+--echo # 6. server1 will leave the group, despite 'ch1' is a failover
+--echo #    channel, since the group is on multi-primary mode, server2
+--echo #    will not start channel 'ch1'.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--let $assert_text= The action mysql_start_failover_channels_if_primary is enabled
+--let $assert_cond= [SELECT enabled FROM performance_schema.replication_group_member_actions WHERE name=\'mysql_start_failover_channels_if_primary\' AND event=\'AFTER_PRIMARY_ELECTION\', enabled, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'There is 1 row in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be 1'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM performance_schema.replication_connection_configuration WHERE CHANNEL_NAME="ch1" AND SOURCE_CONNECTION_AUTO_FAILOVER=1, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= Verify channel ch1 IO_THREAD is OFF
+--let $assert_cond= "[SELECT SERVICE_STATE FROM performance_schema.replication_connection_status WHERE channel_name=\'ch1\', SERVICE_STATE, 1]" = "OFF"
+--source include/assert.inc
+
+--let $assert_text= Verify channel ch1 SQL_THREAD is OFF
+--let $assert_cond= "[SELECT SERVICE_STATE FROM performance_schema.replication_applier_status WHERE channel_name = \'ch1\', SERVICE_STATE, 1]" = "OFF"
+--source include/assert.inc
+
+--let $assert_text= Verify replica_monitor thread is not running
+--let $assert_cond= "[select count(*) FROM performance_schema.threads where NAME=\"thread/sql/replica_monitor\"]" = 0;
+--source include/assert.inc
+
+
+--echo
+--echo ############################################################
+--echo # 7. Clean up.
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_channel_name='ch1'
+--let $rpl_multi_source= 1
+--let $rpl_reset_slave_all= 1
+--source include/rpl_reset_slave.inc
+--let $rpl_channel_name=
+--let $rpl_multi_source=
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $rpl_channel_name='ch1'
+--let $rpl_multi_source= 1
+--let $rpl_reset_slave_all= 1
+--source include/rpl_reset_slave.inc
+--let $rpl_channel_name=
+--let $rpl_multi_source=
+
+--let $rpl_group_replication_reset_persistent_vars=1
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_status_reset.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_status_reset.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_receiver_status_reset.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_receiver_status_reset.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,72 @@
+###############################################################################
+# Validate that failover channels status is properly maintained, even when a
+# channel is reset when GR is not running.
+#
+# Test:
+#   0. This test requires two servers:
+#        server1, server2: group
+#   1. Deploy a group in single-primary mode on server1
+#      configure a failover channel 'ch1'.
+#   2. Leave the group and only then reset the failover
+#      channel 'ch1'.
+#   3. Deploy again a group in single-primary mode on server1.
+#   4. Join server2 to the group.
+#      server2 successful join will validate that past ch1
+#      failover status is properly clean on server.
+#   5. Clean up.
+###############################################################################
+--source include/big_test.inc
+--source include/have_group_replication_plugin.inc
+--let $rpl_group_replication_single_primary_mode=1
+--let $rpl_skip_group_replication_start= 1
+--source include/group_replication.inc
+
+
+--echo
+--echo ############################################################
+--echo # 1. Deploy a group in single-primary mode on server1
+--echo #    configure a failover channel 'ch1'.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/start_and_bootstrap_group_replication.inc
+
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='10.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=1, SOURCE_PORT=3306, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1';
+
+
+--echo
+--echo ############################################################
+--echo # 2. Leave the group and only then reset the failover
+--echo #    channel 'ch1'.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_channel_name='ch1'
+--let $rpl_multi_source= 1
+--let $rpl_reset_slave_all= 1
+--source include/rpl_reset_slave.inc
+--let $rpl_channel_name=
+--let $rpl_multi_source=
+
+
+--echo
+--echo ############################################################
+--echo # 3. Deploy again a group in single-primary mode on server1.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/start_and_bootstrap_group_replication.inc
+
+
+--echo
+--echo ############################################################
+--echo # 4. Join server2 to the group.
+--echo #    server2 successful join will validate that past ch1
+--echo #    failover status is properly clean on server.
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--source include/start_group_replication.inc
+
+
+--echo ############################################################
+--echo # 5. Clean up.
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_reset.cnf mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_reset.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_reset.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_reset.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,11 @@
+!include ../my.cnf
+
+[mysqld.1]
+
+[mysqld.2]
+
+[mysqld.3]
+
+[ENV]
+SERVER_MYPORT_3=		@mysqld.3.port
+SERVER_MYSOCK_3=		@mysqld.3.socket
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_reset.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_reset.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_reset.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_reset.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,121 @@
+###############################################################################
+# Validate several scenarios on the UDF:
+#   asynchronous_connection_failover_reset
+#
+# Test:
+#   0. This test requires three servers
+#      server1: group primary
+#      server2: group secondary
+#      server3: standalone server
+#
+#   1. Try to reset asynchronous reconnection configuration on
+#      a server running GR.
+#      It will not be allowed.
+#   2. Try to reset asynchronous reconnection configuration on
+#      a server not running GR.
+#      It will be allowed.
+#   3. Clean up
+###############################################################################
+--source include/have_group_replication_plugin.inc
+--let $rpl_skip_group_replication_start= 1
+--let $rpl_group_replication_single_primary_mode=1
+--source include/group_replication.inc
+
+--echo
+--echo ############################################################
+--echo # 1. Try to reset asynchronous reconnection configuration on
+--echo #    a server running GR.
+--echo #    It will not be allowed.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/start_and_bootstrap_group_replication.inc
+
+--error ER_CANT_INITIALIZE_UDF
+SELECT asynchronous_connection_failover_reset();
+
+
+--echo
+--echo ############################################################
+--echo # 2. Try to reset asynchronous reconnection configuration on
+--echo #    a server not running GR.
+--echo #    It will be allowed.
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--source include/start_group_replication.inc
+
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--replace_result $SERVER_MYPORT_2 SERVER_MYPORT_2 $group_replication_group_name FAILOVER_GROUP_NAME
+--eval SELECT asynchronous_connection_failover_add_managed('ch1_3', 'GroupReplication', '$group_replication_group_name', '127.0.0.1', $SERVER_MYPORT_2, '', 80, 60)
+
+--let $assert_text= 'There is one row in performance_schema.replication_asynchronous_connection_failover_managed'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover_managed, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover_managed must be 1'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover_managed\', version, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'There is one row in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be 1'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] = 1
+--source include/assert.inc
+
+--replace_result $SERVER_MYPORT_1 SERVER_1_PORT
+--eval CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=1, SOURCE_PORT=$SERVER_MYPORT_1, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=2 FOR CHANNEL 'ch1_3'
+
+--let $rpl_channel_name='ch1_3'
+--source include/start_slave.inc
+--let $rpl_channel_name=
+
+--let $wait_condition= SELECT COUNT(*)=2 FROM performance_schema.replication_asynchronous_connection_failover
+--source include/wait_condition.inc
+
+--let $assert_text= 'The version of replication_asynchronous_connection_failover must be 2 or greater'
+--let $assert_cond= [SELECT version FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', version, 1] >= 2
+--source include/assert.inc
+
+--let $rpl_channel_name='ch1_3'
+--source include/stop_slave.inc
+--let $rpl_channel_name=
+
+# Reset asynchronous reconnection configuration
+SELECT asynchronous_connection_failover_reset();
+
+--let $assert_text= 'There is no row in performance_schema.replication_asynchronous_connection_failover_managed'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover_managed, count, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= 'There is no version of replication_asynchronous_connection_failover_managed'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover_managed\', count, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= 'There is no row in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= 'There is no version of replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_group_configuration_version WHERE name=\'replication_asynchronous_connection_failover\', count, 1] = 0
+--source include/assert.inc
+
+
+--echo
+--echo ############################################################
+--echo # 3. Clean up.
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+
+--let $rpl_reset_slave_all= 1
+--let $rpl_multi_source= 1
+--let $rpl_channel_name='ch1_3'
+--source include/rpl_reset_slave.inc
+--let $rpl_channel_name=
+--let $rpl_reset_slave_all=
+--let $rpl_multi_source=
+
+--let $rpl_skip_sync= 1
+--let $rpl_only_running_threads= 1
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_sender_change_group.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_sender_change_group.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_sender_change_group.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_sender_change_group.test	2021-09-28 11:46:34.000000000 +0000
@@ -37,7 +37,13 @@
 --let $group_replication_group_name= aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa
 --let $group_a= $group_replication_group_name
 --disable_query_log
+if ($have_xcom_stack){
 --eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_GR_PORT_1,localhost:$SERVER_GR_PORT_2"
+}
+
+if (!$have_xcom_stack){
+--eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_MYPORT_1,localhost:$SERVER_MYPORT_2"
+}
 --enable_query_log
 --source include/start_and_bootstrap_group_replication.inc
 
@@ -45,7 +51,13 @@
 --source include/rpl_connection.inc
 --let $server2_uuid= `SELECT @@server_uuid`
 --disable_query_log
+if ($have_xcom_stack){
 --eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_GR_PORT_1,localhost:$SERVER_GR_PORT_2"
+}
+
+if (!$have_xcom_stack){
+--eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_MYPORT_1,localhost:$SERVER_MYPORT_2"
+}
 --enable_query_log
 --source include/start_group_replication.inc
 
@@ -59,7 +71,12 @@
 --let $group_replication_group_name= bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb
 --let $group_b= $group_replication_group_name
 --disable_query_log
+if ($have_xcom_stack){
 --eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_GR_PORT_3,localhost:$SERVER_GR_PORT_4"
+}
+if (!$have_xcom_stack){
+--eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_MYPORT_3,localhost:$SERVER_MYPORT_4"
+}
 --enable_query_log
 --source include/start_and_bootstrap_group_replication.inc
 
@@ -67,7 +84,12 @@
 --source include/rpl_connection.inc
 --let $server4_uuid= `SELECT @@server_uuid`
 --disable_query_log
+if ($have_xcom_stack){
 --eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_GR_PORT_3,localhost:$SERVER_GR_PORT_4"
+}
+if (!$have_xcom_stack){
+--eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_MYPORT_3,localhost:$SERVER_MYPORT_4"
+}
 --enable_query_log
 --source include/start_group_replication.inc
 
@@ -150,7 +172,12 @@
 
 --let $group_replication_group_name= bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb
 --disable_query_log
+if ($have_xcom_stack){
 --eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_GR_PORT_3,localhost:$SERVER_GR_PORT_4"
+}
+if (!$have_xcom_stack){
+--eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_MYPORT_3,localhost:$SERVER_MYPORT_4"
+}
 --enable_query_log
 --source include/start_group_replication.inc
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_sender_no_majority_2groups.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_sender_no_majority_2groups.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_sender_no_majority_2groups.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_sender_no_majority_2groups.test	2021-09-28 11:46:34.000000000 +0000
@@ -43,7 +43,13 @@
 --let $group_replication_group_name= aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa
 --let $group_a= $group_replication_group_name
 --disable_query_log
+if ($have_xcom_stack){
 --eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_GR_PORT_1,localhost:$SERVER_GR_PORT_2"
+}
+
+if (!$have_xcom_stack){
+--eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_MYPORT_1,localhost:$SERVER_MYPORT_2"
+}
 --enable_query_log
 --source include/start_and_bootstrap_group_replication.inc
 
@@ -51,7 +57,13 @@
 --source include/rpl_connection.inc
 --let $server2_uuid= `SELECT @@server_uuid`
 --disable_query_log
+if ($have_xcom_stack){
 --eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_GR_PORT_1,localhost:$SERVER_GR_PORT_2"
+}
+
+if (!$have_xcom_stack){
+--eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_MYPORT_1,localhost:$SERVER_MYPORT_2"
+}
 --enable_query_log
 --source include/start_group_replication.inc
 
@@ -65,14 +77,24 @@
 --let $group_replication_group_name= bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb
 --let $group_b= $group_replication_group_name
 --disable_query_log
+if ($have_xcom_stack){
 --eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_GR_PORT_3,localhost:$SERVER_GR_PORT_4"
+}
+if (!$have_xcom_stack){
+--eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_MYPORT_3,localhost:$SERVER_MYPORT_4"
+}
 --enable_query_log
 --source include/start_and_bootstrap_group_replication.inc
 
 --let $rpl_connection_name= server4
 --source include/rpl_connection.inc
 --disable_query_log
+if ($have_xcom_stack){
 --eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_GR_PORT_3,localhost:$SERVER_GR_PORT_4"
+}
+if (!$have_xcom_stack){
+--eval SET GLOBAL group_replication_group_seeds= "localhost:$SERVER_MYPORT_3,localhost:$SERVER_MYPORT_4"
+}
 --enable_query_log
 --source include/start_group_replication.inc
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_sender_no_majority.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_sender_no_majority.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_sender_no_majority.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_sender_no_majority.test	2021-09-28 11:46:34.000000000 +0000
@@ -240,6 +240,7 @@
 call mtr.add_suppression("The source .* for channel 'ch1' has left the group .*, and so removed its entry from replication_asynchronous_connection_failover table.");
 call mtr.add_suppression("The group .* for the channel .* has been removed, and so removed its entry from replication_asynchronous_connection_failover_managed and all the group members from replication_asynchronous_connection_failover table.");
 call mtr.add_suppression("The group .* for the channel .* has been added, and so added its entry in replication_asynchronous_connection_failover_managed and source to replication_asynchronous_connection_failover table.");
+call mtr.add_suppression("The Monitor IO thread failed to detect if the source belongs to the group majority on the source.*");
 SET SESSION sql_log_bin = 1;
 
 --let $rpl_connection_name= server2
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_start_failover_channels_error_on_bootstrap.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_start_failover_channels_error_on_bootstrap.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_start_failover_channels_error_on_bootstrap.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_start_failover_channels_error_on_bootstrap.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,118 @@
+###############################################################################
+# Validate that member action `mysql_start_failover_channels_if_primary` is
+# triggered on group bootstrap when enabled, and member will change to ERROR
+# state when there are errors on the channels start.
+#
+# Test:
+#   0. This test requires two servers.
+#   1. Configure server2 to be a asynchronous replica of server1,
+#      configuring a failover channel to server1.
+#   2. Bootstrap a group on server2.
+#      Since `mysql_start_failover_channels_if_primary` member
+#      action is enabled, once server2 becomes the primary it
+#      will start 'ch1'. Though we are injecting a failure on
+#      channel start, thence the member will change to ERROR
+#      state.
+#   3. Clean up.
+###############################################################################
+--source include/have_debug.inc
+--source include/have_group_replication_plugin.inc
+--let $rpl_skip_group_replication_start= 1
+--let $rpl_group_replication_single_primary_mode=1
+--source include/group_replication.inc
+
+
+--echo ############################################################
+--echo # 1. Configure server2 to be a asynchronous replica of server1,
+--echo #    configuring a failover channel to server1.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $server1_uuid= `SELECT @@server_uuid`
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--replace_result $SERVER_MYPORT_1 SERVER_MYPORT_1
+--eval SELECT asynchronous_connection_failover_add_source('ch1', '127.0.0.1', $SERVER_MYPORT_1, '', 50);
+
+--replace_result $SERVER_MYPORT_1 SERVER_1_PORT
+--eval CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=1, SOURCE_PORT=$SERVER_MYPORT_1, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1'
+
+
+--echo
+--echo ############################################################
+--echo # 2. Bootstrap a group on server2.
+--echo #    Since `mysql_start_failover_channels_if_primary` member
+--echo #    action is enabled, once server2 becomes the primary it
+--echo #    will start 'ch1'. Though we are injecting a failure on
+--echo #    channel start, thence the member will change to ERROR
+--echo #    state.
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("The member action \"mysql_start_failover_channels_if_primary\" for event \"AFTER_PRIMARY_ELECTION\" with priority \"10\" failed. Please check previous messages in the error log for hints about what could have caused this failure.");
+call mtr.add_suppression("The server was automatically set into read only mode after an error was detected.");
+call mtr.add_suppression("Skipping leave operation: concurrent attempt to leave the group is on-going.");
+SET SESSION sql_log_bin = 1;
+
+--let $assert_text= The action mysql_start_failover_channels_if_primary must be enabled
+--let $assert_cond= [SELECT enabled FROM performance_schema.replication_group_member_actions WHERE name=\'mysql_start_failover_channels_if_primary\' AND event=\'AFTER_PRIMARY_ELECTION\', enabled, 1] = 1
+--source include/assert.inc
+
+SET @@GLOBAL.DEBUG='+d,force_error_on_start_failover_channels';
+
+--replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--eval SET GLOBAL group_replication_group_name= "$group_replication_group_name"
+--source include/gr_set_bootstrap_group.inc
+
+START GROUP_REPLICATION;
+
+--let $group_replication_member_state = ERROR
+--source include/gr_wait_for_member_state.inc
+
+--source include/gr_clear_bootstrap_group.inc
+SET @@GLOBAL.DEBUG='-d,force_error_on_start_failover_channels';
+
+--let $assert_text= The super_read_only mode must be 1
+--let $assert_cond= "[SELECT @@GLOBAL.super_read_only]" = 1;
+--source include/assert.inc
+
+--let $assert_text= The read_only mode must be 1
+--let $assert_cond= "[SELECT @@GLOBAL.read_only]" = 1;
+--source include/assert.inc
+
+--let $assert_text= Verify channel ch1 IO_THREAD is OFF
+--let $assert_cond= "[SELECT SERVICE_STATE FROM performance_schema.replication_connection_status WHERE channel_name=\'ch1\', SERVICE_STATE, 1]" = "OFF"
+--source include/assert.inc
+
+--let $assert_text= Verify channel ch1 SQL_THREAD is OFF
+--let $assert_cond= "[SELECT SERVICE_STATE FROM performance_schema.replication_applier_status WHERE channel_name=\'ch1\', SERVICE_STATE, 1]" = "OFF"
+--source include/assert.inc
+
+--let $assert_text= Verify replica_monitor thread is not running
+--let $assert_cond= "[select count(*) FROM performance_schema.threads where NAME=\"thread/sql/replica_monitor\"]" = 0;
+--source include/assert.inc
+
+--let $assert_only_after = CURRENT_TEST: group_replication.gr_acf_start_failover_channels_error_on_bootstrap
+--let $assert_file= $MYSQLTEST_VARDIR/log/mysqld.2.err
+--let $assert_select= The member action "mysql_start_failover_channels_if_primary" for event "AFTER_PRIMARY_ELECTION" with priority "10" failed. Please check previous messages in the error log for hints about what could have caused this failure.
+--let $assert_count= 1
+--let $assert_text= The member action "mysql_start_failover_channels_if_primary" for event "AFTER_PRIMARY_ELECTION" with priority "10" failed.
+--source include/assert_grep.inc
+
+
+--echo ############################################################
+--echo # 3. Clean up.
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_channel_name= 'ch1'
+--let $rpl_reset_slave_all= 1
+--let $rpl_multi_source= 1
+--source include/rpl_reset_slave.inc
+--let $rpl_channel_name=
+--let $rpl_reset_slave_all=
+--let $rpl_multi_source=
+
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_start_failover_channels_on_bootstrap.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_start_failover_channels_on_bootstrap.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_start_failover_channels_on_bootstrap.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_start_failover_channels_on_bootstrap.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,92 @@
+###############################################################################
+# Validate that member action `mysql_disable_super_read_only_if_primary` is
+# triggered on group bootstrap when enabled.
+#
+# Test:
+#   0. This test requires two servers.
+#   1. Configure server2 to be a asynchronous replica of server1,
+#      configuring a failover channel to server1.
+#   2. Bootstrap a group on server2.
+#      Since `mysql_start_failover_channels_if_primary` member
+#      action is enabled, channel 'ch1' will be started.
+#   3. Clean up.
+###############################################################################
+--source include/have_group_replication_plugin.inc
+--let $rpl_skip_group_replication_start= 1
+--let $rpl_group_replication_single_primary_mode=1
+--source include/group_replication.inc
+
+
+--echo ############################################################
+--echo # 1. Configure server2 to be a asynchronous replica of server1,
+--echo #    configuring a failover channel to server1.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $server1_uuid= `SELECT @@server_uuid`
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--replace_result $SERVER_MYPORT_1 SERVER_MYPORT_1
+--eval SELECT asynchronous_connection_failover_add_source('ch1', '127.0.0.1', $SERVER_MYPORT_1, '', 50);
+
+--replace_result $SERVER_MYPORT_1 SERVER_1_PORT
+--eval CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_CONNECTION_AUTO_FAILOVER=1, SOURCE_PORT=$SERVER_MYPORT_1, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1 FOR CHANNEL 'ch1'
+
+
+--echo
+--echo ############################################################
+--echo # 2. Bootstrap a group on server2.
+--echo #    Since `mysql_start_failover_channels_if_primary` member
+--echo #    action is enabled, channel 'ch1' will be started.
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--let $assert_text= The action mysql_start_failover_channels_if_primary must be enabled
+--let $assert_cond= [SELECT enabled FROM performance_schema.replication_group_member_actions WHERE name=\'mysql_start_failover_channels_if_primary\' AND event=\'AFTER_PRIMARY_ELECTION\', enabled, 1] = 1
+--source include/assert.inc
+
+--source include/start_and_bootstrap_group_replication.inc
+--source include/gr_assert_primary_member.inc
+
+--let $rpl_channel_name= 'ch1'
+--source include/wait_for_slave_to_start.inc
+
+--let $assert_only_after = CURRENT_TEST: group_replication.gr_acf_start_failover_channels_on_bootstrap
+--let $assert_file= $MYSQLTEST_VARDIR/log/mysqld.2.err
+--let $assert_select= The member action "mysql_start_failover_channels_if_primary" for event "AFTER_PRIMARY_ELECTION" with priority "10" will be run.
+--let $assert_count= 1
+--let $assert_text= The member action "mysql_start_failover_channels_if_primary" for event "AFTER_PRIMARY_ELECTION" with priority "10" will be run.
+--source include/assert_grep.inc
+
+--let $assert_text= 'SOURCE_CONNECTION_AUTO_FAILOVER must be enabled on ch1'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM performance_schema.replication_connection_configuration WHERE CHANNEL_NAME="ch1" AND SOURCE_CONNECTION_AUTO_FAILOVER=1, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= Verify channel ch1 IO_THREAD is ON
+--let $assert_cond= "[SELECT SERVICE_STATE FROM performance_schema.replication_connection_status WHERE channel_name=\'ch1\', SERVICE_STATE, 1]" = "ON"
+--source include/assert.inc
+
+--let $assert_text= Verify channel ch1 SQL_THREAD is ON
+--let $assert_cond= "[SELECT SERVICE_STATE FROM performance_schema.replication_applier_status WHERE channel_name=\'ch1\', SERVICE_STATE, 1]" = "ON"
+--source include/assert.inc
+
+--let $assert_text= Verify replica_monitor thread is running
+--let $assert_cond= "[select count(*) FROM performance_schema.threads where NAME=\"thread/sql/replica_monitor\"]" = 1;
+--source include/assert.inc
+
+
+--echo ############################################################
+--echo # 3. Clean up.
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_channel_name= 'ch1'
+--let $rpl_reset_slave_all= 1
+--let $rpl_multi_source= 1
+--source include/rpl_reset_slave.inc
+--let $rpl_channel_name=
+--let $rpl_reset_slave_all=
+--let $rpl_multi_source=
+
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_switch_highest_weight_auto.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_switch_highest_weight_auto.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_acf_switch_highest_weight_auto.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_acf_switch_highest_weight_auto.test	2021-09-28 11:46:34.000000000 +0000
@@ -45,6 +45,9 @@
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
 
+#check which stack are we using
+--let $have_xcom_stack= `SELECT @@group_replication_communication_stack LIKE 'XCOM'`
+
 --let $_group_replication_group_seeds=
 --let $_rpl_gcs_server_address= localhost
 
@@ -52,7 +55,15 @@
 while ($_rpl_server)
 {
 
---let $_rpl_gcs_server_port= \$SERVER_GR_PORT_$_rpl_server
+  --let $_rpl_gcs_server_port=
+  if ($have_xcom_stack)
+  {
+    --let $_rpl_gcs_server_port= \$SERVER_GR_PORT_$_rpl_server
+  }
+  if (!$have_xcom_stack)
+  {
+    --let $_rpl_gcs_server_port= \$SERVER_MYPORT_$_rpl_server
+  }
 
   if ($_group_replication_group_seeds != "")
   {
@@ -112,7 +123,15 @@
 --let $_rpl_server=4
 while ($_rpl_server > 2)
 {
-  --let $_rpl_gcs_server_port= \$SERVER_GR_PORT_$_rpl_server
+  --let $_rpl_gcs_server_port=
+  if ($have_xcom_stack)
+  {
+    --let $_rpl_gcs_server_port= \$SERVER_GR_PORT_$_rpl_server
+  }
+  if (!$have_xcom_stack)
+  {
+    --let $_rpl_gcs_server_port= \$SERVER_MYPORT_$_rpl_server
+  }
 
   if ($_group_replication_group_seeds != "")
   {
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_addmember_during_dml.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_addmember_during_dml.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_addmember_during_dml.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_addmember_during_dml.test	2021-09-28 11:46:34.000000000 +0000
@@ -26,6 +26,7 @@
 --echo
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
+
 --source include/start_group_replication.inc
 
 # Make sure number of servers in the group is 2
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_add_node_with_ill_configurated_stack.cnf mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_add_node_with_ill_configurated_stack.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_add_node_with_ill_configurated_stack.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_add_node_with_ill_configurated_stack.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,12 @@
+!include ../my.cnf
+
+[mysqld.1]
+
+[mysqld.2]
+
+[mysqld.3]
+
+[ENV]
+SERVER_MYPORT_3=		@mysqld.3.port
+SERVER_MYSOCK_3=		@mysqld.3.socket
+
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_add_node_with_ill_configurated_stack.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_add_node_with_ill_configurated_stack.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_add_node_with_ill_configurated_stack.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_add_node_with_ill_configurated_stack.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,82 @@
+################################################################################
+# When using the MySQL communication stack, if we start three mysqls in the same
+# physical server and we misconfigure one of them with MySQL stack data,
+# START GROUP_REPLICATION must fail with an appropriate ERROR.
+# This can only happen with the XCom communication stack in place.
+#
+# Test:
+# 0. The test requires three servers:
+#    - M1 and M2 will start with XCom
+#    - M3 will be configured as XCom, but not started
+# 1. Skip the group start
+# 2. Start and bootstrap the group with server 1
+# 3. Start server 2
+# 4. Change server 3 communication stack and local address to MySQL
+# 5. Manually start server 3 and expect it to fail while joining the group
+# 6. Restore server 3 original address
+# 7. Server 3 must successfully join the group
+# 8. Clean up.
+#
+################################################################################
+
+--source include/have_group_replication_xcom_communication_stack.inc
+--source include/big_test.inc
+--source include/have_group_replication_plugin.inc
+
+--echo # 1. Skip the group start
+--let $rpl_skip_group_replication_start= 1
+--let $rpl_server_count= 3
+--source include/group_replication.inc
+
+--echo # 2. Start and bootstrap the group with server 1
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/start_and_bootstrap_group_replication.inc
+
+--echo # 3. Start server 2
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--source include/start_group_replication.inc
+
+--echo # 4. Change server 3 communication stack and local address to MySQL
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+
+--let $server_3_local_address= `SELECT @@GLOBAL.group_replication_local_address`
+--let $server_3_comm_stack= `SELECT @@GLOBAL.group_replication_communication_stack`
+
+# Adding suppressions
+SET SESSION sql_log_bin= 0;
+call mtr.add_suppression("\\[GCS\\] Error connecting to all peers. Member join failed. Local port:*");
+call mtr.add_suppression("\\[GCS\\] The member was unable to join the group.*");
+call mtr.add_suppression("Timeout on wait for view after joining group");
+SET SESSION sql_log_bin= 1;
+
+--let $server_3_mysql_address= 127.0.0.1:$SERVER_MYPORT_3
+
+--replace_result $server_3_mysql_address GROUP_REPLICATION_SERVER_3_ADDRESS
+--eval SET GLOBAL group_replication_local_address= "$server_3_mysql_address"
+SET GLOBAL group_replication_communication_stack= MySQL;
+
+
+--echo # 5. Manually start server 3 and expect it to fail while joining the
+--echo #    group
+
+--replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--eval SET GLOBAL group_replication_group_name= "$group_replication_group_name"
+
+--error ER_GROUP_REPLICATION_CONFIGURATION
+START GROUP_REPLICATION;
+
+--echo # 6. Restore server 3 original address
+--replace_result $server_3_local_address GROUP_REPLICATION_SERVER_3_LOCAL_ADDRESS
+--eval SET GLOBAL group_replication_local_address= "$server_3_local_address"
+--eval SET GLOBAL group_replication_communication_stack= "$server_3_comm_stack"
+
+--echo # 7. Server 3 must successfully join the group
+--source include/start_group_replication.inc
+
+--echo # 8. Clean up.
+
+# This is the end... My only friend the end!
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_add_node_with_same_local_address.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_add_node_with_same_local_address.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_add_node_with_same_local_address.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_add_node_with_same_local_address.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,69 @@
+################################################################################
+# When using the MySQL communication stack, if we start two mysqls in the same
+# physical server and we misconfigure them by provinding the same local_address
+# to both, START GROUP_REPLICATION must fail with an appropriate ERROR.
+# This can only happen with the MySQL communication stack, because if we use
+# XCom, we will observe an error when we try to bind to the same address.
+#
+#
+# Test:
+# 0. The test requires two servers: M1 and M2 and can only run with MySQL stack
+# 1. Skip the group start
+# 2. Start and bootstrap the group with server 1
+# 3. Change server 2 group_replication_local_address to be the same as server 1
+# 4. Manually start server 2 and expect it to fail while joining the group
+# 5. Restore server 2 original address
+# 6. Server 2 must successfully join the group
+# 7. Clean up.
+#
+################################################################################
+
+--source include/have_group_replication_mysql_communication_stack.inc
+--source include/have_group_replication_plugin.inc
+
+--echo # 1. Skip the group start
+--let $rpl_skip_group_replication_start= 1
+--source include/group_replication.inc
+
+--echo # 2. Start and bootstrap the group with server 1
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/start_and_bootstrap_group_replication.inc
+
+--let $server_1_local_address= `SELECT @@GLOBAL.group_replication_local_address`
+
+--echo # 3. Change server 2 group_replication_local_address to be the same as
+--echo #    server 1
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+# Adding suppressions
+SET SESSION sql_log_bin= 0;
+call mtr.add_suppression("\\[GCS\\] Error connecting to all peers. Member join failed. Local port:*");
+call mtr.add_suppression("\\[GCS\\] The member was unable to join the group.*");
+call mtr.add_suppression("Timeout on wait for view after joining group");
+SET SESSION sql_log_bin= 1;
+
+SET @local_address_save= @@GLOBAL.group_replication_local_address;
+--replace_result $server_1_local_address GROUP_REPLICATION_SERVER_1_ADDRESS
+--eval SET GLOBAL group_replication_local_address= "$server_1_local_address"
+
+--echo # 4. Manually start server 2 and expect it to fail while joining the
+--echo #    group
+
+--replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--eval SET GLOBAL group_replication_group_name= "$group_replication_group_name"
+
+--error ER_GROUP_REPLICATION_CONFIGURATION
+START GROUP_REPLICATION;
+
+--echo # 5. Restore server 2 original address
+SET @@GLOBAL.group_replication_local_address= @local_address_save;
+
+--echo # 6. Server 2 must successfully join the group
+--source include/start_group_replication.inc
+
+--echo # 7. Clean up.
+
+# This is the end... My only friend the end!
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_applier_and_shutdown.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_applier_and_shutdown.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_applier_and_shutdown.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_applier_and_shutdown.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,103 @@
+##############################################################################
+#
+# This test validates parallel shutdown of all members is safe.
+# When shutdown happens 2 parallel things may happen in group replication.
+# View change may happen due to member shutdown and applier may stop due to
+# kill received from shutdown operation.
+# This test makes sure above mentioned parallel operations are handled properly.
+#
+# Test:
+# 0. The test requires two servers: M1(primary) and M2(secondary).
+# 1. Start GR on server1 & server2.
+# 2. Add debug point to
+#    2.1. make sure primary change fails on server2.
+#    2.2. delay primary change operation to allow shutdown to send KILL signals
+#    2.3. block applier processing so suspension packets is not processed
+# 3. Stop GR on server1, server2 become primary
+# 4. Primary change happens on server2 but is delayed with help of
+#    group_replication_wait_for_current_events_execution_fail debug point.
+# 5. Execute shutdown so that applier threads receives the KILL signal.
+# 6. Cleanup
+##############################################################################
+
+# Do not run on valgrind due to restart and sleeps used.
+--source include/not_valgrind.inc
+# Big-test due to restart of server
+--source include/big_test.inc
+--source include/have_debug_sync.inc
+--source include/have_group_replication_plugin.inc
+--let $rpl_group_replication_single_primary_mode=1
+--let $rpl_skip_group_replication_start= 1
+--source include/group_replication.inc
+
+--echo
+--echo # 1. Start GR on server1 & server2.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/start_and_bootstrap_group_replication.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("There was an issue on the primary election process: Could not wait for the execution of local transactions. The member will now leave the group.");
+call mtr.add_suppression("Skipping leave operation: concurrent attempt to leave the group is on-going.");
+call mtr.add_suppression("Fatal error during execution on the Applier process of Group Replication. The server will now leave the group.");
+call mtr.add_suppression("Skipping leave operation: member already left the group.");
+call mtr.add_suppression("The server was automatically set into read only mode after an error was detected.");
+call mtr.add_suppression("Error, maximum number of retries exceeded when waiting for the internal server session state to be operating");
+call mtr.add_suppression("Failed to establish an internal server connection to execute plugin operations");
+SET SESSION sql_log_bin = 1;
+--source include/start_group_replication.inc
+
+--echo
+--echo # 2. Add debug point to
+--echo #    2.1. make sure primary change fails on server2.
+--echo #    2.2. delay primary change operation to allow shutdown to send KILL signals
+--echo #    2.3. block applier processing so suspension packets is not processed
+
+SET @@GLOBAL.DEBUG= '+d,group_replication_wait_for_current_events_execution_fail';
+
+--echo
+--echo # 3. Stop GR on server1, server2 become primary
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--source include/stop_group_replication.inc
+
+--echo
+--echo # 4. Primary change happens on server2 but is delayed with help of
+--echo #    group_replication_wait_for_current_events_execution_fail debug point.
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+SET DEBUG_SYNC= "now WAIT_FOR signal.group_replication_wait_for_current_events_execution_fail_applier_add_suspension_packet";
+
+--echo
+--echo # 5. Execute shutdown so that applier threads receives the KILL signal.
+
+--let $allow_rpl_inited=1
+--let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
+--let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $restart_parameters=restart:--group-replication-group-name=$group_replication_group_name --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_single_primary_mode=1 --group_replication_enforce_update_everywhere_checks=0
+--replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--let $shutdown_server_timeout = 18000
+--source include/restart_mysqld.inc
+
+--let $rpl_server_number= 2
+--source include/rpl_reconnect.inc
+
+--echo
+--echo # 6. Cleanup
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/start_and_bootstrap_group_replication.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--source include/start_group_replication.inc
+
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_applier_initialization.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_applier_initialization.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_applier_initialization.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_applier_initialization.test	2021-09-28 11:46:34.000000000 +0000
@@ -32,7 +32,7 @@
 call mtr.add_suppression("The member is leaving a group without being on one");
 set session sql_log_bin=1;
 
---let $debug_save_timeout= `SELECT @@GLOBAL.group_replication_components_stop_timeout`
+SET @group_replication_components_stop_timeout_save = @@GLOBAL.group_replication_components_stop_timeout;
 
 --eval SET GLOBAL group_replication_group_name= "$group_replication_group_name"
 --source include/gr_set_bootstrap_group.inc
@@ -73,7 +73,7 @@
 #give it time to die
 --sleep 5
 
---eval SET GLOBAL group_replication_components_stop_timeout= $debug_save_timeout
+SET GLOBAl group_replication_components_stop_timeout = @group_replication_components_stop_timeout_save;
 #start and stop commands should work properly
 --source include/start_group_replication.inc
 --source include/stop_group_replication.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_applier_require_row_format.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_applier_require_row_format.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_applier_require_row_format.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_applier_require_row_format.test	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-# ==== Purpose ====
-#
-# To verify that `REQUIRE_ROW_FORMAT` option is not settable for GR channels and
-# that the option has default value to `1`.
-#
-# ==== Implementation ====
-#
-# 1) Stop the applier for `server1`.
-# 2) Verify that is not possible to change `REQUIRE_ROW_FORMAT` option
-# 3) Verify that `REQUIRE_ROW_FORMAT` is set for the GR channels.
-#
-# ==== References ====
-#
-# WL#12968: Configure replication applier to require row-based replication
-#
-
---source include/have_group_replication_plugin.inc
---source include/group_replication.inc
-
---echo
---echo # 1) Stop the applier for `server1`.
---source include/gr_stop_applier_sql_thread.inc
-
---echo
---echo # 2) Verify that is not possible to change `REQUIRE_ROW_FORMAT` option
---error ER_SLAVE_CHANNEL_OPERATION_NOT_ALLOWED
---eval CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 0 FOR CHANNEL "group_replication_applier"
---error ER_SLAVE_CHANNEL_OPERATION_NOT_ALLOWED
---eval CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 1 FOR CHANNEL "group_replication_applier"
-
---echo
---echo # 3) Verify that `REQUIRE_ROW_FORMAT` is set for the GR channels.
---let $count = `SELECT COUNT(*) FROM performance_schema.replication_applier_configuration WHERE Require_row_format = "YES" AND Channel_name = "group_replication_applier"`
---let $assert_text = Require_row_format column in performance_schema.replication_applier_configuration is set to YES for GR applier channel
---let $assert_cond = 1 = $count
---source include/assert.inc
-
---let $count = `SELECT COUNT(*) FROM performance_schema.replication_applier_configuration WHERE Require_row_format = "YES" AND Channel_name = "group_replication_recovery"`
---let $assert_text = Require_row_format column in performance_schema.replication_applier_configuration is set to YES for GR recovery channel
---let $assert_cond = 1 = $count
---source include/assert.inc
-
---echo
---echo # Cleanup
---source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_autorejoin_failure_during_mid_join.cnf mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_autorejoin_failure_during_mid_join.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_autorejoin_failure_during_mid_join.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_autorejoin_failure_during_mid_join.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,14 @@
+!include ../my.cnf
+
+[mysqld.1]
+local-infile=       true
+
+[mysqld.2]
+local-infile=       true
+
+[mysqld.3]
+local-infile=       true
+
+[ENV]
+SERVER_MYPORT_3=		@mysqld.3.port
+SERVER_MYSOCK_3=		@mysqld.3.socket
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_autorejoin_failure_during_mid_join.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_autorejoin_failure_during_mid_join.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_autorejoin_failure_during_mid_join.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_autorejoin_failure_during_mid_join.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,129 @@
+################################################################################
+#
+# The auto-rejoin process is a mechanism that allows a server that left the
+# group due to flaky network (either on his side or on the other members) to
+# try to join again up to group_replication_autorejoin_tries number of times.
+#
+# This test verifies that if view changes modification takes time then state
+# of the member is reset to ERROR state.
+# Description : Auto rejoin starts a new view and member moves to RECOVERING
+# and then ONLINE state.
+# It is possible that on a slow machine member will move to RECOVERING/ONLINE
+# and view change time will expire. In such scenario auto rejoin threads
+# initiate member leave, which is in parallel/post to join.
+# When member leaves old state of RECOVERING/ONLINE should be reset to ERROR
+# since member is leaving the group.
+#
+# Test:
+# 0. The test requires three servers.
+# 1. Start 3 servers.
+# 2. Enable auto-rejoin and expel one of the members.
+# 3. Make sure view-change initiated by auto-rejoin has changed member
+#    state out of ERROR.
+#    Unblock wait_for_view_modification to fail during auto rejoin.
+# 4. Verify that the expelled member will try to rejoin the group.
+# 5. Assert member state is set to ERROR on view change failure.
+# 6. Cleanup.
+################################################################################
+--source include/have_debug.inc
+--source include/big_test.inc
+--source include/linux.inc
+--source include/have_group_replication_plugin.inc
+--let $rpl_skip_group_replication_start= 1
+--let $rpl_server_count = 3
+--source include/group_replication.inc
+
+--echo
+--echo # 1. Start 3 servers.
+
+SET sql_log_bin = 0;
+call mtr.add_suppression("Member was expelled from the group due to network failures, changing member status to ERROR.");
+call mtr.add_suppression("Started auto-rejoin procedure attempt*");
+call mtr.add_suppression("Auto-rejoin procedure attempt*");
+call mtr.add_suppression("The server was automatically set into read only mode after an error was detected.");
+call mtr.add_suppression("Unable to confirm whether the server has left the group or not. Check performance_schema.replication_group_members to check group membership information.");
+call mtr.add_suppression("Timeout while waiting for a view change event during the leave step before a auto-rejoin attempt.");
+call mtr.add_suppression("Timeout while waiting for a view change event during the auto-rejoin procedure");
+call mtr.add_suppression("Error while sending message in the group replication incremental recovery process.");
+SET sql_log_bin = 1;
+
+--source include/gr_autorejoin_monitoring.inc
+--let $server1_uuid= `SELECT @@GLOBAL.SERVER_UUID`
+SET @debug_saved = @@GLOBAL.DEBUG;
+SET @group_replication_autorejoin_tries_saved = @@GLOBAL.group_replication_autorejoin_tries;
+
+--source include/start_and_bootstrap_group_replication.inc
+
+--let $rpl_connection_name = server2
+--source include/rpl_connection.inc
+
+--source include/start_group_replication.inc
+
+--let $rpl_connection_name = server3
+--source include/rpl_connection.inc
+
+--source include/start_group_replication.inc
+
+--echo
+--echo # 2. Enable auto-rejoin and expel one of the members.
+
+--let $rpl_connection_name = server1
+--source include/rpl_connection.inc
+
+SET GLOBAL group_replication_autorejoin_tries = 1;
+SET @@GLOBAL.DEBUG='+d,group_replication_skip_wait_for_view_modification';
+SET @@GLOBAL.DEBUG='+d,group_replication_force_view_modification_timeout';
+SET @@GLOBAL.DEBUG='+d,group_replication_autorejoin_allow_join_to_change_state';
+
+# Force expel on member 1
+--let $member_id = `SELECT @@GLOBAL.server_uuid`
+--source include/gr_expel_member_from_group.inc
+
+--echo
+--echo # 3. Make sure view-change initiated by auto-rejoin has changed member
+--echo #    state out of ERROR.
+--echo #    Unblock wait_for_view_modification to fail during auto rejoin.
+
+--let $wait_condition=SELECT COUNT(*)=1 FROM performance_schema.replication_group_members WHERE member_id='$server1_uuid' AND MEMBER_STATE!="ERROR";
+--source include/wait_condition_or_abort.inc
+
+SET DEBUG_SYNC= "now SIGNAL signal.group_replication_autorejoin_allow_join_to_change_state_resume";
+
+--echo
+--echo # 4. Verify that the expelled member will try to rejoin the group.
+
+--let $wait_condition = SELECT IS_AUTOREJOIN_RUNNING() = FALSE
+--source include/wait_condition_or_abort.inc
+
+--let $wait_condition= SELECT COUNT(*)>=1 FROM performance_schema.error_log WHERE error_code='MY-013374' AND data LIKE '%Timeout while waiting for a view change event during the auto-rejoin procedure%'
+--source include/wait_condition_or_abort.inc
+
+--let $wait_condition= SELECT COUNT(*)>=1 FROM performance_schema.error_log WHERE error_code='MY-013375' AND data LIKE '%Auto-rejoin procedure attempt 1 of 1 finished. Member was not able to join the group.%'
+--source include/wait_condition_or_abort.inc
+
+--echo
+--echo # 5. Assert member state is set to ERROR on view change failure.
+
+# Should be in ERROR state
+--let $group_replication_member_state= ERROR
+--let $group_replication_member_id= $member_id
+--source include/gr_wait_for_member_state.inc
+
+# Verify that super_read_only is enabled
+--source include/assert_and_disable_read_only.inc
+
+--echo
+--echo # 6. Cleanup.
+
+--let $rpl_connection_name = server1
+--source include/rpl_connection.inc
+
+SET @@GLOBAL.DEBUG = @debug_saved;
+
+--source include/stop_group_replication.inc
+--source include/start_group_replication.inc
+
+SET @@GLOBAL.group_replication_autorejoin_tries = @group_replication_autorejoin_tries_saved;
+
+--source include/gr_end_autorejoin_monitoring.inc
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_autorejoin_with_clone_while_recovery_locked.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_autorejoin_with_clone_while_recovery_locked.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_autorejoin_with_clone_while_recovery_locked.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_autorejoin_with_clone_while_recovery_locked.test	2021-09-28 11:46:34.000000000 +0000
@@ -92,6 +92,8 @@
 --let $_group_replication_clone_threshold= `SELECT @@GLOBAL.group_replication_clone_threshold`
 --let $_group_replication_autorejoin_tries= `SELECT @@GLOBAL.group_replication_autorejoin_tries`
 --let $_group_replication_components_stop_timeout= `SELECT @@GLOBAL.group_replication_components_stop_timeout`
+--let $_group_replication_comm_stack= `SELECT @@GLOBAL.group_replication_communication_stack`
+
 
 --let $plugin_list= $GROUP_REPLICATION
 --source include/spawn_monitoring_process.inc
@@ -100,6 +102,7 @@
 --eval SET PERSIST group_replication_group_name= "$group_replication_group_name"
 --eval SET PERSIST group_replication_local_address= "$_group_replication_local_address"
 --eval SET PERSIST group_replication_group_seeds= "$_group_replication_group_seeds"
+--eval SET PERSIST group_replication_communication_stack= "$_group_replication_comm_stack"
 --enable_query_log
 
 SET PERSIST group_replication_start_on_boot= ON;
@@ -272,6 +275,7 @@
 RESET PERSIST group_replication_autorejoin_tries;
 RESET PERSIST group_replication_components_stop_timeout;
 RESET PERSIST local_infile;
+RESET PERSIST group_replication_communication_stack;
 
 --disable_query_log
 --eval SET GLOBAL group_replication_start_on_boot= $_group_replication_start_on_boot
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_blocked_start_gr_killed.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_blocked_start_gr_killed.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_blocked_start_gr_killed.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_blocked_start_gr_killed.test	2021-09-28 11:46:34.000000000 +0000
@@ -47,6 +47,9 @@
 CALL mtr.add_suppression("MYSQL_BIN_LOG::open failed to sync the index file.");
 CALL mtr.add_suppression("Failed in open_log.*called from Relay_log_info::rli_init_info");
 CALL mtr.add_suppression("Failed to setup the group replication applier thread.");
+CALL mtr.add_suppression("Fatal error during execution on the Applier process of Group Replication. The server will now leave the group.");
+CALL mtr.add_suppression("Unable to confirm whether the server has left the group or not. Check performance_schema.replication_group_members to check group membership information.");
+CALL mtr.add_suppression("The server was automatically set into read only mode after an error was detected.");
 SET sql_log_bin=1;
 
 --replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_bootstrap_group_on_server_with_running_channels.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_bootstrap_group_on_server_with_running_channels.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_bootstrap_group_on_server_with_running_channels.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_bootstrap_group_on_server_with_running_channels.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,77 @@
+###############################################################################
+# Validate that when a group is being bootstrapped on server that has
+# replication channels running, those channels remain running.
+#
+# Test:
+#   0. This test requires 2 servers
+#       server1: single server
+#       server2: group in single-primary mode
+#      server2 will replicate from server1.
+#   1. Configure and start a replication channel to replicate
+#      from server1.
+#   2. Bootstrap the group on server2.
+#      Check that GR and replication channel are working.
+#   3. Write something on server1 and read it on server2.
+#   4. Clean up
+###############################################################################
+--source include/big_test.inc
+--source include/have_group_replication_plugin.inc
+--let $rpl_group_replication_single_primary_mode=1
+--let $rpl_skip_group_replication_start= 1
+--source include/group_replication.inc
+
+
+--echo
+--echo ############################################################
+--echo # 1. Configure and start a replication channel to replicate
+--echo #    from server1.
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--replace_result $SERVER_MYPORT_1 SERVER_1_PORT
+--eval CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_PORT=$SERVER_MYPORT_1
+
+--source include/start_slave.inc
+
+
+--echo
+--echo ############################################################
+--echo # 2. Bootstrap the group on server2.
+--echo #    Check that GR and replication channel are working.
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--source include/start_and_bootstrap_group_replication.inc
+--source include/gr_assert_primary_member.inc
+
+--source include/check_slave_is_running.inc
+
+
+--echo
+--echo ############################################################
+--echo # 3. Write something on server1 and read it on server2.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY);
+INSERT INTO t1 VALUES (1);
+
+--let $sync_slave_connection= server2
+--source include/sync_slave_sql_with_master.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $assert_text= 'There is one row in t1'
+--let $assert_cond= [SELECT COUNT(*) count FROM t1, count, 1] = 1
+--source include/assert.inc
+
+
+--echo
+--echo ############################################################
+--echo # 4. Clean up.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+DROP TABLE t1;
+
+--let $sync_slave_connection= server2
+--source include/sync_slave_sql_with_master.inc
+
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_capture_mysql-master.opt mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_capture_mysql-master.opt
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_capture_mysql-master.opt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_capture_mysql-master.opt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1 @@
+--loose-group_replication_communication_stack=MySQL
\ No newline at end of file
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_capture_mysql-slave.opt mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_capture_mysql-slave.opt
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_capture_mysql-slave.opt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_capture_mysql-slave.opt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1 @@
+--loose-group_replication_communication_stack=MySQL
\ No newline at end of file
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_capture_mysql.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_capture_mysql.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_capture_mysql.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_capture_mysql.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,11 @@
+################################################################################
+# This test is only checking that capture code does not cause
+# errors, for complete testing it will need to be completed when
+# WL#6826, WL#6833, WL#6834, WL#6842, WL#6829, WL#6855 and WL#7237
+# are finished.
+#
+# Runs only with MySQL Stack configured in master and slave opt files.
+#
+################################################################################
+
+--source ../include/gr_capture.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_capture.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_capture.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_capture.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_capture.test	2021-09-28 11:46:34.000000000 +0000
@@ -4,75 +4,8 @@
 # WL#6826, WL#6833, WL#6834, WL#6842, WL#6829, WL#6855 and WL#7237
 # are finished.
 #
-# Test:
-# 0. The test requires two servers: M1 and M2.
-# 1. With both members ONLINE, create table t1 on M1, create table t2 on M2.
-# 2. On M1, perform some DML operations, create temporary table t3.
-#    On M2, perform DML operation.
-# 3. On M1, check tables and GTID_EXECUTED details.
-# 4. On M2, check tables and GTID_EXECUTED details.
-#    Diff tables t1 and t2 on M1 and M2.
-# 5. Clean up.
+# Runs with all communication stacks
+#
 ################################################################################
---let $group_replication_group_name= 8a94f357-aab4-11df-86ab-c80aa9429562
---source include/have_group_replication_plugin.inc
---source include/group_replication.inc
-
---connection server1
-CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
-
---connection server2
-CREATE TABLE t2 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
-
---source include/rpl_sync.inc
-
---connection server1
-BEGIN;
-INSERT INTO t1 VALUES (1);
-INSERT INTO t2 VALUES (2);
-COMMIT;
-
-INSERT INTO t1 VALUES (3);
-
-BEGIN;
-INSERT INTO t1 VALUES (4);
-ROLLBACK;
-
-BEGIN;
-INSERT INTO t1 VALUES (5);
-INSERT INTO t1 VALUES (6);
-COMMIT;
-
-CREATE TEMPORARY TABLE t3 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
-
---connection server2
-INSERT INTO t1 VALUES (1000);
-
---source include/rpl_sync.inc
-
---connection server1
---echo
---echo server1
-
---let $server1_gtid_executed= `SELECT @@GLOBAL.GTID_EXECUTED`
-SHOW TABLES FROM test;
-
---connection server2
---echo
---echo server2
---let $server2_gtid_executed= `SELECT @@GLOBAL.GTID_EXECUTED`
-SHOW TABLES FROM test;
-
---let $assert_text= server1 GTID_EXECUTED must be equal to server2 GTID_EXECUTED
---let $assert_cond= "$server1_gtid_executed" = "$server2_gtid_executed"
---source include/assert.inc
-
---let  $diff_tables= server1:test.t1, server2:test.t1
---source include/diff_tables.inc
---let  $diff_tables= server1:test.t2, server2:test.t2
---source include/diff_tables.inc
---echo
 
---connection server1
-DROP TABLE t1, t2, t3;
---source include/group_replication_end.inc
+--source ../include/gr_capture.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_certifier_garbage_collection_with_clone.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_certifier_garbage_collection_with_clone.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_certifier_garbage_collection_with_clone.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_certifier_garbage_collection_with_clone.test	2021-09-28 11:46:34.000000000 +0000
@@ -70,6 +70,7 @@
 
 --let $_group_replication_local_address2= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds2= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $_group_replication_comm_stack= `SELECT @@GLOBAL.group_replication_communication_stack`
 
 --let $plugin_list= $GROUP_REPLICATION
 --source include/spawn_monitoring_process.inc
@@ -83,6 +84,7 @@
 --eval SET PERSIST group_replication_group_name= "$group_replication_group_name"
 --eval SET PERSIST group_replication_local_address= "$_group_replication_local_address2"
 --eval SET PERSIST group_replication_group_seeds= "$_group_replication_group_seeds2"
+--eval SET PERSIST group_replication_communication_stack= "$_group_replication_comm_stack"
 
 --let $_group_replication_start_on_boot_save = `SELECT @@GLOBAL.group_replication_start_on_boot;`
 SET PERSIST group_replication_start_on_boot= ON;
@@ -296,6 +298,7 @@
 RESET PERSIST group_replication_local_address;
 RESET PERSIST group_replication_group_seeds;
 RESET PERSIST group_replication_start_on_boot;
+RESET PERSIST group_replication_communication_stack;
 
 --replace_result $_group_replication_start_on_boot_save GROUP_REPLICATION_START_ON_BOOT
 --eval SET GLOBAL group_replication_start_on_boot= $_group_replication_start_on_boot_save
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_change_master_not_replicated.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_change_master_not_replicated.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_change_master_not_replicated.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_change_master_not_replicated.test	2021-09-28 11:46:34.000000000 +0000
@@ -25,9 +25,14 @@
 SET sql_log_bin=0;
 CREATE USER 'manish'@'%' IDENTIFIED BY 'rpl';
 GRANT REPLICATION SLAVE ON *.* TO 'manish'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'manish'@'%';
 FLUSH PRIVILEGES;
 SET sql_log_bin=1;
 
+--disable_warnings
+CHANGE MASTER TO MASTER_USER='manish', MASTER_PASSWORD='rpl' FOR CHANNEL 'group_replication_recovery';
+--enable_warnings
+
 --source include/start_and_bootstrap_group_replication.inc
 
 # Add some data for recovery
@@ -41,6 +46,13 @@
 CHANGE REPLICATION SOURCE TO SOURCE_USER='manish', SOURCE_PASSWORD='rpl' FOR CHANNEL 'group_replication_recovery';
 --enable_warnings
 
+SET sql_log_bin=0;
+CREATE USER 'manish'@'%' IDENTIFIED BY 'rpl';
+GRANT REPLICATION SLAVE ON *.* TO 'manish'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'manish'@'%';
+FLUSH PRIVILEGES;
+SET sql_log_bin=1;
+
 --source include/start_group_replication.inc
 
 --let $MYSQLD_DATADIR= `select @@datadir;`
@@ -73,6 +85,10 @@
 --source include/rpl_connection.inc
 RESET SLAVE ALL FOR CHANNEL 'group_replication_recovery';
 
+SET sql_log_bin=0;
+DROP USER manish;
+SET sql_log_bin=1;
+
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_check_count_tx_remote_applier_queue_2.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_check_count_tx_remote_applier_queue_2.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_check_count_tx_remote_applier_queue_2.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_check_count_tx_remote_applier_queue_2.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,191 @@
+################################################################################
+# Validate that COUNT_TRANSACTIONS_REMOTE_IN_APPLIER_QUEUE is updated when
+# members in RECOVERING state progress from group_replication_recovery catch-up
+# to the catch-up of transactions queued into group_replication_applier channel.
+#
+# Scenario:
+# 0. This test requires 2 servers.
+# 1. Bootstrap group on server1.
+# 2. Join server2 to the group, it will block on recovery,
+#    during the catchup of transactions queued into
+#    group_replication_applier channel.
+# 3. Commit 2 transactions on server1 while server2 is in recovery.
+# 4. Verify the values of performance_schema.replication_group_member_stats
+#    while server2 is in RECOVERING state.
+#    More precisely, server2 did applied all data from
+#    group_replication_recovery channel, but it is still applying the data
+#    queued on group_replication_applier (which is blocked by the locked table t1).
+# 5. Unblock recovery on server2.
+# 6. Verify the values of performance_schema.replication_group_member_stats
+#    once server2 is ONLINE.
+# 7. Clean up.
+################################################################################
+--source include/have_debug_sync.inc
+# Sequential applier blocks on a different place due to the LOCK TABLE,
+# which will cause a different value on COUNT_TRANSACTIONS_REMOTE_IN_APPLIER_QUEUE.
+--source include/only_mts_replica_parallel_workers.inc
+--source include/have_group_replication_plugin.inc
+--let $rpl_skip_group_replication_start= 1
+--source include/group_replication.inc
+
+
+--echo
+--echo ############################################################
+--echo # 1. Bootstrap group on server1.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $server1_uuid= `SELECT @@server_uuid`
+
+SET SESSION sql_log_bin=0;
+CREATE TABLE test.t1 (c1 INT NOT NULL PRIMARY KEY);
+SET SESSION sql_log_bin=1;
+
+--source include/start_and_bootstrap_group_replication.inc
+
+
+--echo
+--echo ############################################################
+--echo # 2. Join server2 to the group, it will block on recovery,
+--echo #    during the catchup of transactions queued into
+--echo #    group_replication_applier channel.
+--let $rpl_connection_name= server_2
+--source include/rpl_connection.inc
+--let $server2_uuid= `SELECT @@server_uuid`
+
+SET SESSION sql_log_bin=0;
+CREATE TABLE test.t1 (c1 INT NOT NULL PRIMARY KEY);
+SET SESSION sql_log_bin=1;
+
+# Block the transactions that will be queued to group_replication_applier channel.
+LOCK TABLE test.t1 READ;
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+SET @@GLOBAL.DEBUG= '+d,recovery_thread_wait_before_wait_for_applier_module_recovery';
+
+--let $group_replication_start_member_state= RECOVERING
+--source include/start_group_replication.inc
+
+# Wait until group_replication_recovery is consumed and plugin starts
+# the catch-up of group_replication_applier channel.
+SET DEBUG_SYNC = "now WAIT_FOR signal.recovery_thread_wait_before_wait_for_applier_module_recovery";
+
+--let $assert_text= Verify MEMBER_STATE is RECOVERING
+--let $assert_cond= "[SELECT MEMBER_STATE FROM performance_schema.replication_group_members WHERE MEMBER_ID=\'$server2_uuid\', MEMBER_STATE, 1]" = "RECOVERING"
+--source include/assert.inc
+
+
+--echo
+--echo ############################################################
+--echo # 3. Commit 2 transactions on server1 while server2 is in recovery.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+INSERT INTO test.t1 VALUES (1);
+INSERT INTO test.t1 VALUES (2);
+
+
+--echo
+--echo ############################################################
+--echo # 4. Verify the values of performance_schema.replication_group_member_stats
+--echo #    while server2 is in RECOVERING state.
+--echo #    More precisely, server2 did applied all data from
+--echo #    group_replication_recovery channel, but it is still applying the data
+--echo #    queued on group_replication_applier (which is blocked by the locked table t1).
+# server1 and 2
+# COUNT_TRANSACTIONS_IN_QUEUE 0
+# COUNT_TRANSACTIONS_CHECKED 2
+# COUNT_CONFLICTS_DETECTED 0
+# COUNT_TRANSACTIONS_LOCAL_ROLLBACK 0
+#
+# server1
+# COUNT_TRANSACTIONS_LOCAL_PROPOSED 2
+# COUNT_TRANSACTIONS_REMOTE_IN_APPLIER_QUEUE 0
+# COUNT_TRANSACTIONS_REMOTE_APPLIED 2
+#
+# server2
+# COUNT_TRANSACTIONS_LOCAL_PROPOSED 0
+# COUNT_TRANSACTIONS_REMOTE_IN_APPLIER_QUEUE 3
+# COUNT_TRANSACTIONS_REMOTE_APPLIED 0
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $assert_text= Verify MEMBER_STATE is RECOVERING
+--let $assert_cond= "[SELECT MEMBER_STATE FROM performance_schema.replication_group_members WHERE MEMBER_ID=\'$server2_uuid\', MEMBER_STATE, 1]" = "RECOVERING"
+--source include/assert.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_member_stats WHERE member_id='$server2_uuid' AND COUNT_TRANSACTIONS_IN_QUEUE=0 AND COUNT_TRANSACTIONS_CHECKED=2 AND COUNT_CONFLICTS_DETECTED=0 AND COUNT_TRANSACTIONS_LOCAL_ROLLBACK=0 AND COUNT_TRANSACTIONS_REMOTE_IN_APPLIER_QUEUE=3 AND COUNT_TRANSACTIONS_REMOTE_APPLIED=0 AND COUNT_TRANSACTIONS_LOCAL_PROPOSED=0
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_member_stats WHERE member_id='$server1_uuid' AND COUNT_TRANSACTIONS_IN_QUEUE=0 AND COUNT_TRANSACTIONS_CHECKED=2 AND COUNT_CONFLICTS_DETECTED=0 AND COUNT_TRANSACTIONS_LOCAL_ROLLBACK=0 AND COUNT_TRANSACTIONS_REMOTE_IN_APPLIER_QUEUE=0 AND COUNT_TRANSACTIONS_REMOTE_APPLIED=2 AND COUNT_TRANSACTIONS_LOCAL_PROPOSED=2
+--source include/wait_condition.inc
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_member_stats WHERE member_id='$server2_uuid' AND COUNT_TRANSACTIONS_IN_QUEUE=0 AND COUNT_TRANSACTIONS_CHECKED=2 AND COUNT_CONFLICTS_DETECTED=0 AND COUNT_TRANSACTIONS_LOCAL_ROLLBACK=0 AND COUNT_TRANSACTIONS_REMOTE_IN_APPLIER_QUEUE=3 AND COUNT_TRANSACTIONS_REMOTE_APPLIED=0 AND COUNT_TRANSACTIONS_LOCAL_PROPOSED=0
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_member_stats WHERE member_id='$server1_uuid' AND COUNT_TRANSACTIONS_IN_QUEUE=0 AND COUNT_TRANSACTIONS_CHECKED=2 AND COUNT_CONFLICTS_DETECTED=0 AND COUNT_TRANSACTIONS_LOCAL_ROLLBACK=0 AND COUNT_TRANSACTIONS_REMOTE_IN_APPLIER_QUEUE=0 AND COUNT_TRANSACTIONS_REMOTE_APPLIED=2 AND COUNT_TRANSACTIONS_LOCAL_PROPOSED=2
+--source include/wait_condition.inc
+
+
+--echo
+--echo ############################################################
+--echo # 5. Unblock recovery on server2.
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+SET @@GLOBAL.DEBUG= '-d,recovery_thread_wait_before_wait_for_applier_module_recovery';
+SET DEBUG_SYNC= "now SIGNAL signal.recovery_thread_resume_before_wait_for_applier_module_recovery";
+
+--let $rpl_connection_name= server_2
+--source include/rpl_connection.inc
+UNLOCK TABLES;
+
+--let $group_replication_member_state= ONLINE
+--source include/gr_wait_for_member_state.inc
+
+
+--echo
+--echo ############################################################
+--echo # 6. Verify the values of performance_schema.replication_group_member_stats
+--echo #    once server2 is ONLINE.
+# server1 and 2
+# COUNT_TRANSACTIONS_IN_QUEUE 0
+# COUNT_TRANSACTIONS_CHECKED 2
+# COUNT_CONFLICTS_DETECTED 0
+# COUNT_TRANSACTIONS_LOCAL_ROLLBACK 0
+# COUNT_TRANSACTIONS_REMOTE_IN_APPLIER_QUEUE 0
+# COUNT_TRANSACTIONS_REMOTE_APPLIED 2
+#
+# server1
+# COUNT_TRANSACTIONS_LOCAL_PROPOSED 2
+#
+# server2
+# COUNT_TRANSACTIONS_LOCAL_PROPOSED 0
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_member_stats WHERE member_id='$server2_uuid' AND COUNT_TRANSACTIONS_IN_QUEUE=0 AND COUNT_TRANSACTIONS_CHECKED=2 AND COUNT_CONFLICTS_DETECTED=0 AND COUNT_TRANSACTIONS_LOCAL_ROLLBACK=0 AND COUNT_TRANSACTIONS_REMOTE_IN_APPLIER_QUEUE=0 AND COUNT_TRANSACTIONS_REMOTE_APPLIED=2 AND COUNT_TRANSACTIONS_LOCAL_PROPOSED=0
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_member_stats WHERE member_id='$server1_uuid' AND COUNT_TRANSACTIONS_IN_QUEUE=0 AND COUNT_TRANSACTIONS_CHECKED=2 AND COUNT_CONFLICTS_DETECTED=0 AND COUNT_TRANSACTIONS_LOCAL_ROLLBACK=0 AND COUNT_TRANSACTIONS_REMOTE_IN_APPLIER_QUEUE=0 AND COUNT_TRANSACTIONS_REMOTE_APPLIED=2 AND COUNT_TRANSACTIONS_LOCAL_PROPOSED=2
+--source include/wait_condition.inc
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_member_stats WHERE member_id='$server2_uuid' AND COUNT_TRANSACTIONS_IN_QUEUE=0 AND COUNT_TRANSACTIONS_CHECKED=2 AND COUNT_CONFLICTS_DETECTED=0 AND COUNT_TRANSACTIONS_LOCAL_ROLLBACK=0 AND COUNT_TRANSACTIONS_REMOTE_IN_APPLIER_QUEUE=0 AND COUNT_TRANSACTIONS_REMOTE_APPLIED=2 AND COUNT_TRANSACTIONS_LOCAL_PROPOSED=0
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_member_stats WHERE member_id='$server1_uuid' AND COUNT_TRANSACTIONS_IN_QUEUE=0 AND COUNT_TRANSACTIONS_CHECKED=2 AND COUNT_CONFLICTS_DETECTED=0 AND COUNT_TRANSACTIONS_LOCAL_ROLLBACK=0 AND COUNT_TRANSACTIONS_REMOTE_IN_APPLIER_QUEUE=0 AND COUNT_TRANSACTIONS_REMOTE_APPLIED=2 AND COUNT_TRANSACTIONS_LOCAL_PROPOSED=2
+--source include/wait_condition.inc
+
+
+--echo
+--echo ############################################################
+--echo # 7. Clean up.
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+SET DEBUG_SYNC= 'RESET';
+
+DROP TABLE test.t1;
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_applier_reset.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_applier_reset.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_applier_reset.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_applier_reset.test	2021-09-28 11:46:34.000000000 +0000
@@ -60,6 +60,7 @@
 
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $_group_replication_comm_stack= `SELECT @@GLOBAL.group_replication_communication_stack`
 
 --let $plugin_list= $GROUP_REPLICATION
 --source include/spawn_monitoring_process.inc
@@ -73,6 +74,8 @@
 --eval SET PERSIST group_replication_group_name= "$group_replication_group_name"
 --eval SET PERSIST group_replication_local_address= "$_group_replication_local_address"
 --eval SET PERSIST group_replication_group_seeds= "$_group_replication_group_seeds"
+--eval SET PERSIST group_replication_communication_stack= "$_group_replication_comm_stack"
+
 
 SET PERSIST group_replication_start_on_boot= OFF;
 --enable_query_log
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_applier_stop.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_applier_stop.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_applier_stop.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_applier_stop.test	2021-09-28 11:46:34.000000000 +0000
@@ -59,6 +59,7 @@
 --let $member2_uuid= query_get_value(SELECT @@SERVER_UUID, @@SERVER_UUID, 1)
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $_group_replication_comm_stack= `SELECT @@GLOBAL.group_replication_communication_stack`
 
 --let $plugin_list= $GROUP_REPLICATION
 --source include/spawn_monitoring_process.inc
@@ -67,6 +68,7 @@
 --eval SET PERSIST group_replication_group_name= "$group_replication_group_name"
 --eval SET PERSIST group_replication_local_address= "$_group_replication_local_address"
 --eval SET PERSIST group_replication_group_seeds= "$_group_replication_group_seeds"
+--eval SET PERSIST group_replication_communication_stack= "$_group_replication_comm_stack"
 SET PERSIST group_replication_start_on_boot= ON;
 --enable_query_log
 --replace_result $CLONE_PLUGIN CLONE_PLUGIN
@@ -250,6 +252,7 @@
 RESET PERSIST group_replication_local_address;
 RESET PERSIST group_replication_group_seeds;
 RESET PERSIST group_replication_start_on_boot;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 
 --source include/clean_monitoring_process.inc
 --source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_basics.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_basics.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_basics.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_basics.test	2021-09-28 11:46:34.000000000 +0000
@@ -57,6 +57,7 @@
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
 --let $_group_replication_start_on_boot= `SELECT @@GLOBAL.group_replication_start_on_boot`
+--let $_group_replication_comm_stack= `SELECT @@GLOBAL.group_replication_communication_stack`
 
 --let $plugin_list= $GROUP_REPLICATION
 --source include/spawn_monitoring_process.inc
@@ -70,6 +71,7 @@
 --eval SET PERSIST group_replication_group_name= "$group_replication_group_name"
 --eval SET PERSIST group_replication_local_address= "$_group_replication_local_address"
 --eval SET PERSIST group_replication_group_seeds= "$_group_replication_group_seeds"
+--eval SET PERSIST group_replication_communication_stack= "$_group_replication_comm_stack"
 
 SET PERSIST group_replication_start_on_boot= ON;
 --enable_query_log
@@ -161,6 +163,7 @@
 RESET PERSIST IF EXISTS group_replication_local_address;
 RESET PERSIST IF EXISTS group_replication_group_seeds;
 RESET PERSIST IF EXISTS group_replication_start_on_boot;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 
 --replace_result $_group_replication_start_on_boot START_ON_BOOT_VALUE
 --eval SET GLOBAL group_replication_start_on_boot= $_group_replication_start_on_boot
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_basics_with_ssl_mysql-master.opt mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_basics_with_ssl_mysql-master.opt
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_basics_with_ssl_mysql-master.opt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_basics_with_ssl_mysql-master.opt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,2 @@
+$CLONE_PLUGIN_OPT
+--loose-group_replication_communication_stack=MySQL
\ No newline at end of file
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_basics_with_ssl_mysql-slave.opt mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_basics_with_ssl_mysql-slave.opt
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_basics_with_ssl_mysql-slave.opt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_basics_with_ssl_mysql-slave.opt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,2 @@
+$CLONE_PLUGIN_OPT
+--loose-group_replication_communication_stack=MySQL
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_basics_with_ssl_mysql.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_basics_with_ssl_mysql.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_basics_with_ssl_mysql.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_basics_with_ssl_mysql.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,20 @@
+###############################################################################
+# This test verifies that if the missing transactions on a joining members are
+# above threshold the server will use clone as its recovery strategy with SSL
+#
+# 0. The test requires two servers: M1 and M2.
+# 1. Install the clone plugin on server 1
+# 2. Create a user that requires SSL
+# 3. Bootstrap server1 and add some data
+# 4. Restart server 2 with a monitoring process (mysqld_safe) if needed
+# 5. Install the clone plugingr_clone_integration_basics_with_ssl
+#    Setup the server so group replication starts on boot
+# 6. Configure the plugin to use SSL while Cloning
+#    Start group replication on server 2
+#    Wait for it to restart and come back
+#    Check clone was completed
+# 7. Cleanup
+#
+
+--source include/big_test.inc
+--source ../include/gr_clone_integration_basics_with_ssl.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_basics_with_ssl.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_basics_with_ssl.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_basics_with_ssl.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_basics_with_ssl.test	2021-09-28 11:46:34.000000000 +0000
@@ -16,147 +16,4 @@
 # 7. Cleanup
 #
 
---source include/have_mysqld_monitoring_process.inc
---source include/have_clone_plugin.inc
---source include/force_restart.inc
---source include/have_group_replication_plugin.inc
---let $rpl_skip_group_replication_start= 1
---source include/group_replication.inc
-
-# Validate plugins
---let plugins = CLONE_PLUGIN,GROUP_REPLICATION
---source include/check_plugin_dir.inc
-
---echo
---echo ############################################################
---echo # 1. Install clone plugin on server1.
-
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
-
---replace_result $CLONE_PLUGIN CLONE_PLUGIN
---eval INSTALL PLUGIN clone SONAME '$CLONE_PLUGIN'
-
---echo
---echo ############################################################
---echo # 2. Create a user that requires SSL
-
-CREATE USER 'rec_ssl_user'@'%' REQUIRE SSL;
-GRANT replication slave ON *.* TO 'rec_ssl_user'@'%';
-GRANT BACKUP_ADMIN ON *.* TO "rec_ssl_user";
-
-# Execute a change master here so this settings are cloned
-
---disable_warnings
-CHANGE REPLICATION SOURCE TO SOURCE_USER="rec_ssl_user" FOR CHANNEL "group_replication_recovery";
---enable_warnings
-
---echo
---echo ############################################################
---echo # 3. Bootstrap server1 and add some data
-
---source include/start_and_bootstrap_group_replication.inc
-
-CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1);
-INSERT INTO t1 VALUES (2);
-
---echo
---echo #######################################################################
---echo # 4. Restart server 2 with a monitoring process (mysqld_safe) if needed
-
---let $rpl_connection_name= server2
---source include/rpl_connection.inc
-
---let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
---let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
-
---let $plugin_list= $GROUP_REPLICATION
---source include/spawn_monitoring_process.inc
-
---echo
---echo ############################################################
---echo # 5. Setup the server so group replication starts on boot
-
---disable_query_log
---eval SET PERSIST group_replication_group_name= "$group_replication_group_name"
---eval SET PERSIST group_replication_local_address= "$_group_replication_local_address"
---eval SET PERSIST group_replication_group_seeds= "$_group_replication_group_seeds"
-
-SET PERSIST group_replication_start_on_boot= ON;
-
-# Configure also SSL settings
-
---eval SET PERSIST group_replication_recovery_use_ssl=1
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
---eval SET PERSIST group_replication_recovery_ssl_ca= '$MYSQL_TEST_DIR/std_data/cacert.pem'
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
---eval SET PERSIST group_replication_recovery_ssl_cert= '$MYSQL_TEST_DIR/std_data/client-cert.pem'
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
---eval SET PERSIST group_replication_recovery_ssl_key= '$MYSQL_TEST_DIR/std_data/client-key.pem'
---enable_query_log
-
---replace_result $CLONE_PLUGIN CLONE_PLUGIN
---eval INSTALL PLUGIN clone SONAME '$CLONE_PLUGIN'
-
---echo
---echo ############################################################
---echo # 6. Configure the plugin to use SSL while Cloning
---echo #    Start group replication on server 2
---echo #    Wait for it to restart and come back
---echo #    Check clone was completed
-
---disable_warnings
-CHANGE REPLICATION SOURCE TO SOURCE_USER="rec_ssl_user" FOR CHANNEL "group_replication_recovery";
---enable_warnings
-
---let $_group_replication_threshold_save= `SELECT @@GLOBAL.group_replication_clone_threshold`
-SET GLOBAL group_replication_clone_threshold= 1;
-
-START GROUP_REPLICATION;
-
---source include/wait_until_disconnected.inc
-
---let $rpl_server_number= 2
---source include/rpl_reconnect.inc
-
---let $group_replication_member_state=ONLINE
---source include/gr_wait_for_member_state.inc
-
---let $assert_text= Clone must be completed
---let $assert_cond= [SELECT state="Completed" FROM performance_schema.clone_status] = 1;
---source include/assert.inc
-
-# See if the data has been properly cloned in server2
---let $diff_tables=server1:test.t1 ,server2:test.t1
---source include/diff_tables.inc
-
---echo
---echo ############################################################
---echo # 7. Cleanup
-
---eval SET GLOBAL group_replication_clone_threshold= $_group_replication_threshold_save;
-
-RESET PERSIST IF EXISTS group_replication_group_name;
-RESET PERSIST IF EXISTS group_replication_local_address;
-RESET PERSIST IF EXISTS group_replication_group_seeds;
-RESET PERSIST IF EXISTS group_replication_start_on_boot;
-
-RESET PERSIST IF EXISTS group_replication_recovery_use_ssl;
-RESET PERSIST IF EXISTS group_replication_recovery_ssl_ca;
-RESET PERSIST IF EXISTS group_replication_recovery_ssl_cert;
-RESET PERSIST IF EXISTS group_replication_recovery_ssl_key;
-
-DROP TABLE t1;
-
---source include/rpl_sync.inc
-
-set session sql_log_bin=0;
-call mtr.add_suppression("This member will start distributed recovery using clone. It is due to the number of missing transactions being higher than the configured threshold of*");
-call mtr.add_suppression("Clone removing all user data for provisioning: Started");
-call mtr.add_suppression("Clone removing all user data for provisioning: Finished");
-set session sql_log_bin=1;
-
---source include/clean_monitoring_process.inc
-
---source include/group_replication_end.inc
+--source ../include/gr_clone_integration_basics_with_ssl.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_clone_on_rejoin.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_clone_on_rejoin.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_clone_on_rejoin.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_clone_on_rejoin.test	2021-09-28 11:46:34.000000000 +0000
@@ -73,6 +73,7 @@
 
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $_group_replication_comm_stack= `SELECT @@GLOBAL.group_replication_communication_stack`
 
 # after the restart with mysqld_safe we need this option for expel operations
 SET PERSIST local_infile= ON;
@@ -89,6 +90,7 @@
 --eval SET PERSIST group_replication_group_name= "$group_replication_group_name"
 --eval SET PERSIST group_replication_local_address= "$_group_replication_local_address"
 --eval SET PERSIST group_replication_group_seeds= "$_group_replication_group_seeds"
+--eval SET PERSIST group_replication_communication_stack= "$_group_replication_comm_stack"
 
 SET PERSIST group_replication_start_on_boot= ON;
 --enable_query_log
@@ -211,6 +213,7 @@
 RESET PERSIST IF EXISTS group_replication_group_seeds;
 RESET PERSIST IF EXISTS group_replication_start_on_boot;
 RESET PERSIST IF EXISTS local_infile;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 
 UNINSTALL PLUGIN clone;
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_clone_on_server_start.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_clone_on_server_start.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_clone_on_server_start.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_clone_on_server_start.test	2021-09-28 11:46:34.000000000 +0000
@@ -60,6 +60,7 @@
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
 --let $_group_replication_start_boot_save= `SELECT @@GLOBAL.group_replication_start_on_boot`
+--let $_group_replication_comm_stack= `SELECT @@GLOBAL.group_replication_communication_stack`
 
 RESET SLAVE ALL;
 
@@ -76,6 +77,7 @@
 --eval SET PERSIST group_replication_group_name= "$group_replication_group_name"
 --eval SET PERSIST group_replication_local_address= "$_group_replication_local_address"
 --eval SET PERSIST group_replication_group_seeds= "$_group_replication_group_seeds"
+--eval SET PERSIST  group_replication_communication_stack= "$_group_replication_comm_stack"
 
 SET PERSIST group_replication_start_on_boot= ON;
 --enable_query_log
@@ -157,6 +159,7 @@
 RESET PERSIST IF EXISTS group_replication_group_seeds;
 RESET PERSIST IF EXISTS group_replication_start_on_boot;
 RESET PERSIST IF EXISTS group_replication_clone_threshold;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 
 --eval SET GLOBAL group_replication_clone_threshold= $_group_replication_threshold_save
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_clone_operations_on_runnning_member.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_clone_operations_on_runnning_member.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_clone_operations_on_runnning_member.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_clone_operations_on_runnning_member.test	2021-09-28 11:46:34.000000000 +0000
@@ -57,6 +57,8 @@
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
 --let $_group_replication_start_on_boot= `SELECT @@GLOBAL.group_replication_start_on_boot`
+--let $_group_replication_comm_stack= `SELECT @@GLOBAL.group_replication_communication_stack`
+
 
 --let $plugin_list= $GROUP_REPLICATION
 --source include/spawn_monitoring_process.inc
@@ -71,6 +73,7 @@
 --eval SET PERSIST group_replication_group_name= "$group_replication_group_name"
 --eval SET PERSIST group_replication_local_address= "$_group_replication_local_address"
 --eval SET PERSIST group_replication_group_seeds= "$_group_replication_group_seeds"
+--eval SET PERSIST group_replication_communication_stack= "$_group_replication_comm_stack"
 
 SET PERSIST group_replication_start_on_boot= ON;
 --enable_query_log
@@ -175,6 +178,7 @@
 RESET PERSIST IF EXISTS group_replication_local_address;
 RESET PERSIST IF EXISTS group_replication_group_seeds;
 RESET PERSIST IF EXISTS group_replication_start_on_boot;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 
 --replace_result $_group_replication_start_on_boot START_ON_BOOT_VALUE
 --eval SET GLOBAL group_replication_start_on_boot= $_group_replication_start_on_boot
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_ddl_error.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_ddl_error.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_ddl_error.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_ddl_error.test	2021-09-28 11:46:34.000000000 +0000
@@ -55,6 +55,7 @@
 
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $_group_replication_comm_stack= `SELECT @@GLOBAL.group_replication_communication_stack`
 
 --let $plugin_list= $GROUP_REPLICATION
 --source include/spawn_monitoring_process.inc
@@ -68,6 +69,7 @@
 --eval SET PERSIST group_replication_group_name= "$group_replication_group_name"
 --eval SET PERSIST group_replication_local_address= "$_group_replication_local_address"
 --eval SET PERSIST group_replication_group_seeds= "$_group_replication_group_seeds"
+--eval SET PERSIST group_replication_communication_stack= "$_group_replication_comm_stack"
 
 --let $_group_replication_start_on_boot_save= `SELECT @@GLOBAL.group_replication_start_on_boot`
 SET PERSIST group_replication_start_on_boot= ON;
@@ -160,6 +162,7 @@
 RESET PERSIST IF EXISTS group_replication_local_address;
 RESET PERSIST IF EXISTS group_replication_group_seeds;
 RESET PERSIST IF EXISTS group_replication_start_on_boot;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 --replace_result $_group_replication_start_on_boot_save START_ON_BOOT_VALUE
 --eval SET GLOBAL group_replication_start_on_boot= $_group_replication_start_on_boot_save
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_different_recovery_user.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_different_recovery_user.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_different_recovery_user.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_different_recovery_user.test	2021-09-28 11:46:34.000000000 +0000
@@ -16,6 +16,7 @@
 # 4. Cleanup
 #
 
+--source include/have_group_replication_xcom_communication_stack.inc
 --source include/have_mysqld_monitoring_process.inc
 --source include/have_clone_plugin.inc
 --source include/force_restart.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_error_fallback.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_error_fallback.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_error_fallback.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_error_fallback.test	2021-09-28 11:46:34.000000000 +0000
@@ -54,6 +54,7 @@
 
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $_group_replication_comm_stack= `SELECT @@GLOBAL.group_replication_communication_stack`
 
 --let $plugin_list= $GROUP_REPLICATION
 --source include/spawn_monitoring_process.inc
@@ -83,6 +84,7 @@
 --disable_query_log
 --eval SET GLOBAL group_replication_local_address= "$_group_replication_local_address"
 --eval SET GLOBAL group_replication_group_seeds= "$_group_replication_group_seeds"
+--eval SET GLOBAL group_replication_communication_stack= "$_group_replication_comm_stack"
 --enable_query_log
 
 --source include/start_group_replication.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_kill_donor_during_clone.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_kill_donor_during_clone.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_kill_donor_during_clone.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_kill_donor_during_clone.test	2021-09-28 11:46:34.000000000 +0000
@@ -58,6 +58,7 @@
 
 --let $rpl_connection_name= server3
 --source include/rpl_connection.inc
+
 --let $server3_port = `SELECT @@port`
 --let $server3_ip_port= 127.0.0.1:$server3_port
 
@@ -75,6 +76,7 @@
 
 --let $_group_replication_local_address2= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds2= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $_group_replication_comm_stack= `SELECT @@GLOBAL.group_replication_communication_stack`
 
 --let $plugin_list= $GROUP_REPLICATION
 --source include/spawn_monitoring_process.inc
@@ -87,6 +89,7 @@
 --eval SET PERSIST  group_replication_group_name= "$group_replication_group_name"
 --eval SET PERSIST  group_replication_local_address= "$_group_replication_local_address2"
 --eval SET PERSIST  group_replication_group_seeds= "$_group_replication_group_seeds2"
+--eval SET PERSIST group_replication_communication_stack= "$_group_replication_comm_stack"
 
 SET PERSIST group_replication_start_on_boot= ON;
 --enable_query_log
@@ -188,6 +191,7 @@
 RESET PERSIST IF EXISTS group_replication_local_address;
 RESET PERSIST IF EXISTS group_replication_group_seeds;
 RESET PERSIST IF EXISTS group_replication_start_on_boot;
+RESET PERSIST group_replication_communication_stack;
 
 set session sql_log_bin=0;
 call mtr.add_suppression("This member will start distributed recovery using clone. It is due to the number of missing transactions being higher than the configured threshold of 1.");
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_no_privileges.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_no_privileges.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_no_privileges.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_no_privileges.test	2021-09-28 11:46:34.000000000 +0000
@@ -41,10 +41,14 @@
 --eval INSTALL PLUGIN clone SONAME '$CLONE_PLUGIN'
 
 # Create a recovery user without clone privileges.
+SET SESSION sql_log_bin= 0;
 --let $recovery_user= recovery_user
 --let $recovery_password= recovery_password
 --eval CREATE USER "$recovery_user" IDENTIFIED BY "$recovery_password"
 --eval GRANT REPLICATION SLAVE ON *.* TO "$recovery_user"
+--eval GRANT GROUP_REPLICATION_STREAM ON *.* TO "$recovery_user"@'%';
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
 
 # Add some data for recovery
 CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
@@ -62,13 +66,19 @@
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
 
+SET SESSION sql_log_bin= 0;
+--eval CREATE USER "$recovery_user" IDENTIFIED BY "$recovery_password"
+--eval GRANT GROUP_REPLICATION_STREAM ON *.* TO "$recovery_user"@'%';
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
+
 --replace_result $CLONE_PLUGIN CLONE_PLUGIN
 --eval INSTALL PLUGIN clone SONAME '$CLONE_PLUGIN'
 
 # Deal with server 2 that needs mysql safe
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
-
+--let $_group_replication_comm_stack= `SELECT @@GLOBAL.group_replication_communication_stack`
 --let $plugin_list= $GROUP_REPLICATION
 --source include/spawn_monitoring_process.inc
 
@@ -77,6 +87,7 @@
 --eval SET PERSIST  group_replication_group_name= "$group_replication_group_name"
 --eval SET PERSIST  group_replication_local_address= "$_group_replication_local_address"
 --eval SET PERSIST  group_replication_group_seeds= "$_group_replication_group_seeds"
+--eval SET PERSIST  group_replication_communication_stack= "$_group_replication_comm_stack"
 SET PERSIST group_replication_start_on_boot= ON;
 --enable_query_log
 
@@ -114,6 +125,7 @@
 RESET PERSIST IF EXISTS group_replication_local_address;
 RESET PERSIST IF EXISTS group_replication_group_seeds;
 RESET PERSIST IF EXISTS group_replication_start_on_boot;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 
 DROP TABLE t1;
 --eval DROP USER "$recovery_user"
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_no_recovery_credentials.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_no_recovery_credentials.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_no_recovery_credentials.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_no_recovery_credentials.test	2021-09-28 11:46:34.000000000 +0000
@@ -12,6 +12,7 @@
 # 5. Cleanup
 #
 
+--source include/have_group_replication_xcom_communication_stack.inc
 --source include/have_clone_plugin.inc
 --source include/have_group_replication_plugin.inc
 --let $rpl_skip_group_replication_start= 1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_purged_donor.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_purged_donor.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_purged_donor.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_purged_donor.test	2021-09-28 11:46:34.000000000 +0000
@@ -75,6 +75,7 @@
 
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $_group_replication_comm_stack= `SELECT @@GLOBAL.group_replication_communication_stack`
 
 --let $plugin_list= $GROUP_REPLICATION
 --source include/spawn_monitoring_process.inc
@@ -84,6 +85,8 @@
 --eval SET PERSIST  group_replication_group_name= "$group_replication_group_name"
 --eval SET PERSIST  group_replication_local_address= "$_group_replication_local_address"
 --eval SET PERSIST  group_replication_group_seeds= "$_group_replication_group_seeds"
+--eval SET PERSIST  group_replication_communication_stack= "$_group_replication_comm_stack"
+
 --enable_query_log
 
 --echo
@@ -116,6 +119,8 @@
 RESET PERSIST IF EXISTS group_replication_group_name;
 RESET PERSIST IF EXISTS group_replication_local_address;
 RESET PERSIST IF EXISTS group_replication_group_seeds;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
+
 
 DROP TABLE t1;
 --source include/gtid_utils_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_recovery_priv_user_preservation.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_recovery_priv_user_preservation.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_recovery_priv_user_preservation.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_recovery_priv_user_preservation.test	2021-09-28 11:46:34.000000000 +0000
@@ -67,6 +67,7 @@
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
 --let $_group_replication_start_boot_save= `SELECT @@GLOBAL.group_replication_start_on_boot`
+--let $_group_replication_comm_stack= `SELECT @@GLOBAL.group_replication_communication_stack`
 
 --let $plugin_list= $GROUP_REPLICATION
 --source include/spawn_monitoring_process.inc
@@ -79,6 +80,7 @@
 --eval SET PERSIST group_replication_group_name= "$group_replication_group_name"
 --eval SET PERSIST group_replication_local_address= "$_group_replication_local_address"
 --eval SET PERSIST group_replication_group_seeds= "$_group_replication_group_seeds"
+--eval SET PERSIST group_replication_communication_stack= "$_group_replication_comm_stack"
 
 SET PERSIST group_replication_start_on_boot= ON;
 --enable_query_log
@@ -145,6 +147,7 @@
 RESET PERSIST IF EXISTS group_replication_local_address;
 RESET PERSIST IF EXISTS group_replication_group_seeds;
 RESET PERSIST IF EXISTS group_replication_start_on_boot;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 
 DROP TABLE db1.t1;
 DROP DATABASE db1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_start_gr_during_user_clone.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_start_gr_during_user_clone.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_start_gr_during_user_clone.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_start_gr_during_user_clone.test	2021-09-28 11:46:34.000000000 +0000
@@ -59,6 +59,7 @@
 
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $_group_replication_comm_stack= `SELECT @@GLOBAL.group_replication_communication_stack`
 
 --let $plugin_list= $GROUP_REPLICATION
 --source include/spawn_monitoring_process.inc
@@ -67,6 +68,7 @@
 --eval SET PERSIST  group_replication_group_name= "$group_replication_group_name"
 --eval SET PERSIST  group_replication_local_address= "$_group_replication_local_address"
 --eval SET PERSIST  group_replication_group_seeds= "$_group_replication_group_seeds"
+--eval SET PERSIST group_replication_communication_stack= "$_group_replication_comm_stack"
 --enable_query_log
 
 --replace_result $CLONE_PLUGIN CLONE_PLUGIN
@@ -130,6 +132,7 @@
 RESET PERSIST IF EXISTS group_replication_group_name;
 RESET PERSIST IF EXISTS group_replication_local_address;
 RESET PERSIST IF EXISTS group_replication_group_seeds;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 
 DROP TABLE test.t1;
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_stop_donor_during_clone_failover.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_stop_donor_during_clone_failover.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_stop_donor_during_clone_failover.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_stop_donor_during_clone_failover.test	2021-09-28 11:46:34.000000000 +0000
@@ -88,6 +88,7 @@
 
 --let $_group_replication_local_address2= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds2= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $_group_replication_comm_stack= `SELECT @@GLOBAL.group_replication_communication_stack`
 
 --let $plugin_list= $GROUP_REPLICATION
 --source include/spawn_monitoring_process.inc
@@ -100,6 +101,7 @@
 --eval SET PERSIST  group_replication_group_name= "$group_replication_group_name"
 --eval SET PERSIST  group_replication_local_address= "$_group_replication_local_address2"
 --eval SET PERSIST  group_replication_group_seeds= "$_group_replication_group_seeds2"
+--eval SET PERSIST  group_replication_communication_stack= "$_group_replication_comm_stack"
 
 SET PERSIST group_replication_start_on_boot= ON;
 --enable_query_log
@@ -232,6 +234,7 @@
 RESET PERSIST IF EXISTS group_replication_local_address;
 RESET PERSIST IF EXISTS group_replication_group_seeds;
 RESET PERSIST IF EXISTS group_replication_start_on_boot;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 
 set session sql_log_bin=0;
 call mtr.add_suppression("This member will start distributed recovery using clone. It is due to the number of missing transactions being higher than the configured threshold of 1.");
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_stop_donor_during_clone.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_stop_donor_during_clone.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_stop_donor_during_clone.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_stop_donor_during_clone.test	2021-09-28 11:46:34.000000000 +0000
@@ -63,6 +63,7 @@
 
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $_group_replication_comm_stack= `SELECT @@GLOBAL.group_replication_communication_stack`
 
 --let $plugin_list= $GROUP_REPLICATION
 --source include/spawn_monitoring_process.inc
@@ -75,6 +76,7 @@
 --eval SET PERSIST  group_replication_group_name= "$group_replication_group_name"
 --eval SET PERSIST  group_replication_local_address= "$_group_replication_local_address"
 --eval SET PERSIST  group_replication_group_seeds= "$_group_replication_group_seeds"
+--eval SET PERSIST group_replication_communication_stack= "$_group_replication_comm_stack"
 
 SET PERSIST group_replication_start_on_boot= ON;
 --enable_query_log
@@ -177,6 +179,7 @@
 RESET PERSIST IF EXISTS group_replication_local_address;
 RESET PERSIST IF EXISTS group_replication_group_seeds;
 RESET PERSIST IF EXISTS group_replication_start_on_boot;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 
 DROP TABLE t1;
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_stop_joiner_during_clone.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_stop_joiner_during_clone.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_stop_joiner_during_clone.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_stop_joiner_during_clone.test	2021-09-28 11:46:34.000000000 +0000
@@ -73,6 +73,7 @@
 
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $_group_replication_comm_stack= `SELECT @@GLOBAL.group_replication_communication_stack`
 
 --let $plugin_list= $GROUP_REPLICATION
 --source include/spawn_monitoring_process.inc
@@ -81,6 +82,7 @@
 --eval SET PERSIST  group_replication_group_name= "$group_replication_group_name"
 --eval SET PERSIST  group_replication_local_address= "$_group_replication_local_address"
 --eval SET PERSIST  group_replication_group_seeds= "$_group_replication_group_seeds"
+--eval SET PERSIST group_replication_communication_stack= "$_group_replication_comm_stack"
 
 SET PERSIST group_replication_start_on_boot= ON;
 --enable_query_log
@@ -165,6 +167,7 @@
 RESET PERSIST IF EXISTS group_replication_local_address;
 RESET PERSIST IF EXISTS group_replication_group_seeds;
 RESET PERSIST IF EXISTS group_replication_start_on_boot;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 
 DROP TABLE t1;
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_stop_primary_member.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_stop_primary_member.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_integration_stop_primary_member.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_integration_stop_primary_member.test	2021-09-28 11:46:34.000000000 +0000
@@ -77,6 +77,7 @@
 
 --let $_group_replication_local_address2= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds2= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $_group_replication_comm_stack= `SELECT @@GLOBAL.group_replication_communication_stack`
 
 # Persist the primary mode settings so mysqld_safe starts with them
 SET PERSIST group_replication_enforce_update_everywhere_checks= OFF;
@@ -93,6 +94,7 @@
 --eval SET PERSIST  group_replication_group_name= "$group_replication_group_name"
 --eval SET PERSIST  group_replication_local_address= "$_group_replication_local_address2"
 --eval SET PERSIST  group_replication_group_seeds= "$_group_replication_group_seeds2"
+--eval SET PERSIST  group_replication_communication_stack= "$_group_replication_comm_stack"
 
 SET PERSIST group_replication_start_on_boot= ON;
 --enable_query_log
@@ -201,6 +203,7 @@
 RESET PERSIST IF EXISTS group_replication_local_address;
 RESET PERSIST IF EXISTS group_replication_group_seeds;
 RESET PERSIST IF EXISTS group_replication_start_on_boot;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 
 SET GLOBAL read_only= FALSE;
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_with_consistency_after.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_with_consistency_after.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_clone_with_consistency_after.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_clone_with_consistency_after.test	2021-09-28 11:46:34.000000000 +0000
@@ -58,6 +58,7 @@
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
 --let $_group_replication_start_on_boot= `SELECT @@GLOBAL.group_replication_start_on_boot`
+--let $_group_replication_comm_stack= `SELECT @@GLOBAL.group_replication_communication_stack`
 
 --let $_group_replication_consistency_save= `SELECT @@GLOBAL.group_replication_consistency`
 SET PERSIST group_replication_consistency= AFTER;
@@ -74,6 +75,7 @@
 --eval SET PERSIST group_replication_group_name= "$group_replication_group_name"
 --eval SET PERSIST group_replication_local_address= "$_group_replication_local_address"
 --eval SET PERSIST group_replication_group_seeds= "$_group_replication_group_seeds"
+--eval SET PERSIST  group_replication_communication_stack= "$_group_replication_comm_stack"
 
 SET PERSIST group_replication_start_on_boot= ON;
 --enable_query_log
@@ -139,6 +141,8 @@
 RESET PERSIST group_replication_group_seeds;
 RESET PERSIST group_replication_start_on_boot;
 RESET PERSIST group_replication_consistency;
+RESET PERSIST group_replication_communication_stack;
+
 
 --replace_result $_group_replication_start_on_boot START_ON_BOOT_VALUE
 --eval SET GLOBAL group_replication_start_on_boot= $_group_replication_start_on_boot
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_communication_protocol_and_different_member_states.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_communication_protocol_and_different_member_states.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_communication_protocol_and_different_member_states.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_communication_protocol_and_different_member_states.test	2021-09-28 11:46:34.000000000 +0000
@@ -31,6 +31,7 @@
 
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
+
 # Will be used to recover server2 later on.
 --let $local_address_server2= `SELECT @@GLOBAL.group_replication_local_address`
 --let $group_seeds_server2= `SELECT @@GLOBAL.group_replication_group_seeds`
@@ -43,8 +44,8 @@
 
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
-# Will be used to hide the version of the server later on.
---let $mysql_version= `SELECT SUBSTRING_INDEX(VERSION(), '-', 1)`
+# Will be used to hide the result of `group_replication_get_communication_protocol` later on.
+--let $gr_communication_protocol_version= `SELECT group_replication_get_communication_protocol()`
 
 --echo ###############################################################################
 --echo #  2. Check that it is *not* possible to modify the communication_protocol value via an ONLINE member when some other member is in RECOVERING state.
@@ -81,6 +82,7 @@
 --echo #  4. Check that it is possible to query the communication_protocol value via an ONLINE member when some other members are in RECOVERING state.
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
+--replace_result $gr_communication_protocol_version GR_COMMUNICATION_PROTOCOL_VERSION
 SELECT group_replication_get_communication_protocol();
 
 --echo ###############################################################################
@@ -132,6 +134,7 @@
 
 --echo ###############################################################################
 --echo #  7. Check that it is possible to query the communication_protocol value via an ONLINE member when a minority of members are UNREACHABLE.
+--replace_result $gr_communication_protocol_version GR_COMMUNICATION_PROTOCOL_VERSION
 SELECT group_replication_get_communication_protocol();
 
 --echo ###############################################################################
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_communication_protocol.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_communication_protocol.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_communication_protocol.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_communication_protocol.test	2021-09-28 11:46:34.000000000 +0000
@@ -45,6 +45,11 @@
 --let $assert_cond= "$gr_protocol" = "$gr_new_protocol"
 --source include/assert.inc
 
+--let $communication_protocol_table= query_get_value(SELECT protocol_version FROM performance_schema.replication_group_communication_information, protocol_version, 1)
+--let $assert_text= protocol_version ($communication_protocol_table) should be $gr_protocol
+--let $assert_cond= "$communication_protocol_table" = "$gr_protocol"
+--source include/assert.inc
+
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
 
@@ -53,6 +58,11 @@
 --let $assert_cond= "$gr_protocol" = "$gr_new_protocol"
 --source include/assert.inc
 
+--let $communication_protocol_table= query_get_value(SELECT protocol_version FROM performance_schema.replication_group_communication_information, protocol_version, 1)
+--let $assert_text= protocol_version ($communication_protocol_table) should be $gr_protocol
+--let $assert_cond= "$communication_protocol_table" = "$gr_protocol"
+--source include/assert.inc
+
 --echo ###############################################################################
 --echo # 3. Increase communication_protocol.
 --let $gr_new_protocol= 8.0.16
@@ -67,6 +77,11 @@
 --let $assert_cond= "$gr_protocol" = "$gr_new_protocol"
 --source include/assert.inc
 
+--let $communication_protocol_table= query_get_value(SELECT protocol_version FROM performance_schema.replication_group_communication_information, protocol_version, 1)
+--let $assert_text= protocol_version ($communication_protocol_table) should be $gr_protocol
+--let $assert_cond= "$communication_protocol_table" = "$gr_protocol"
+--source include/assert.inc
+
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
 
@@ -75,6 +90,11 @@
 --let $assert_cond= "$gr_protocol" = "$gr_new_protocol"
 --source include/assert.inc
 
+--let $communication_protocol_table= query_get_value(SELECT protocol_version FROM performance_schema.replication_group_communication_information, protocol_version, 1)
+--let $assert_text= protocol_version ($communication_protocol_table) should be $gr_protocol
+--let $assert_cond= "$communication_protocol_table" = "$gr_protocol"
+--source include/assert.inc
+
 --echo ###############################################################################
 --echo # 4. Confirm invalid calls to group_replication_get_communication_protocol
 --let $rpl_connection_name= server1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_consistent_delayed_view_change_with_local_txn.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_consistent_delayed_view_change_with_local_txn.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_consistent_delayed_view_change_with_local_txn.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_consistent_delayed_view_change_with_local_txn.test	2021-09-28 11:46:34.000000000 +0000
@@ -44,6 +44,7 @@
 SET SESSION sql_log_bin= 0;
 CREATE USER "recovery_user" IDENTIFIED BY "recovery_password";
 GRANT REPLICATION SLAVE ON *.* TO "recovery_user";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'recovery_user'@'%';
 FLUSH PRIVILEGES;
 SET SESSION sql_log_bin= 1;
 
@@ -55,6 +56,12 @@
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
 
+SET SESSION sql_log_bin= 0;
+CREATE USER "recovery_user" IDENTIFIED BY "recovery_password";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'recovery_user'@'%';
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
+
 --source include/start_group_replication.inc
 
 --echo
@@ -128,11 +135,19 @@
 --let $rpl_connection_name= server3
 --source include/rpl_connection.inc
 
+SET SESSION sql_log_bin= 0;
+CREATE USER "recovery_user" IDENTIFIED BY "recovery_password";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'recovery_user'@'%';
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
+
 CHANGE REPLICATION SOURCE TO SOURCE_USER= 'recovery_user', SOURCE_PASSWORD= 'recovery_password' FOR CHANNEL 'group_replication_recovery';
 
 SET SESSION sql_log_bin= 0;
 call mtr.add_suppression("There was an error when connecting to the donor server*");
 call mtr.add_suppression("For details please check performance_schema*");
+call mtr.add_suppression("Slave I/O for channel 'group_replication_recovery': Master command COM_REGISTER_SLAVE failed*");
+call mtr.add_suppression("Slave I/O thread couldn't register on master");
 SET SESSION sql_log_bin= 1;
 
 --let $group_replication_start_member_state= RECOVERING
@@ -225,5 +240,19 @@
 SET SESSION sql_log_bin= 0;
 DROP USER "recovery_user";
 SET SESSION sql_log_bin= 1;
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+SET SESSION sql_log_bin= 0;
+DROP USER "recovery_user";
+SET SESSION sql_log_bin= 1;
+
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+
+SET SESSION sql_log_bin= 0;
+DROP USER "recovery_user";
+SET SESSION sql_log_bin= 1;
 
 --source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_consistent_statement_hold_select_do.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_consistent_statement_hold_select_do.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_consistent_statement_hold_select_do.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_consistent_statement_hold_select_do.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,71 @@
+################################################################################
+# Validate that SELECT and DO statements which output does depend on data
+# consistency or do call UDFs go through the `trans_begin` hook on Group
+# Replication on server1.
+#
+# Test:
+#  0. The test requires one group member: M1.
+#  1. Bootstrap group on server1.
+#  2. Validate that a given SELECT that access tables goes
+#     through the `trans_begin` hook on Group Replication on
+#     server1.
+#  3. Validate that a given SELECT that calls a UDF goes
+#     through the `trans_begin` hook on Group Replication on
+#     server1.
+#  4. Validate that a given DO that calls a UDF goes
+#     through the `trans_begin` hook on Group Replication on
+#     server1.
+#  5. Clean up.
+################################################################################
+--source include/have_debug_sync.inc
+--source include/have_group_replication_plugin.inc
+--let $rpl_group_replication_single_primary_mode=1
+--let $rpl_skip_group_replication_start= 1
+--source include/group_replication.inc
+
+
+--echo
+--echo ############################################################
+--echo # 1. Bootstrap group on server1.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/start_and_bootstrap_group_replication.inc
+
+CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY);
+
+
+--echo
+--echo ############################################################
+--echo # 2. Validate that a given SELECT that access tables goes
+--echo #    through the `trans_begin` hook on Group Replication on
+--echo #    server1.
+--let $statement_to_hold= SELECT * FROM t1
+--source ../include/gr_consistent_statement_hold.inc
+
+
+--echo
+--echo ############################################################
+--echo # 3. Validate that a given SELECT that calls a UDF goes
+--echo #    through the `trans_begin` hook on Group Replication on
+--echo #    server1.
+--let $statement_to_hold= SELECT group_replication_enable_member_action("mysql_disable_super_read_only_if_primary", "AFTER_PRIMARY_ELECTION");
+--source ../include/gr_consistent_statement_hold.inc
+
+
+--echo
+--echo ############################################################
+--echo # 4. Validate that a given DO that calls a UDF goes
+--echo #    through the `trans_begin` hook on Group Replication on
+--echo #    server1.
+--let $statement_to_hold= DO group_replication_enable_member_action("mysql_disable_super_read_only_if_primary", "AFTER_PRIMARY_ELECTION");
+--source ../include/gr_consistent_statement_hold.inc
+
+
+--echo
+--echo ############################################################
+--echo # 5. Clean up.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+DROP TABLE t1;
+
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_consistent_statement_hold_show.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_consistent_statement_hold_show.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_consistent_statement_hold_show.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_consistent_statement_hold_show.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,118 @@
+################################################################################
+# Validate that SHOW statements which output does depend on data consistency
+# go through the `trans_begin` hook on Group Replication on server1.
+#
+# Test:
+#  0. The test requires one group member: M1.
+#  1. Bootstrap group on server1.
+#  2. Validate that a given SHOW statement goes through the
+#     `trans_begin` hook on Group Replication on server1.
+#  3. Clean up.
+################################################################################
+--source include/have_debug_sync.inc
+--source include/have_group_replication_plugin.inc
+--let $rpl_group_replication_single_primary_mode=1
+--let $rpl_skip_group_replication_start= 1
+--source include/group_replication.inc
+
+
+--echo
+--echo ############################################################
+--echo # 1. Bootstrap group on server1.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/start_and_bootstrap_group_replication.inc
+
+CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY);
+CREATE TABLE t2 (c1 INT NOT NULL PRIMARY KEY);
+
+USE test;
+delimiter $$;
+CREATE PROCEDURE procedure1()
+     BEGIN
+     end$$
+delimiter ;$$
+
+CREATE FUNCTION function1() RETURNS INT RETURN (SELECT COUNT(*) FROM t1);
+
+delimiter $$;
+CREATE EVENT event1
+ ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 1 SECOND
+ ON COMPLETION PRESERVE
+ DISABLE
+ DO
+ BEGIN
+END$$
+delimiter ;$$
+
+DELIMITER |;
+CREATE TRIGGER trigger1 BEFORE INSERT ON t1 FOR EACH ROW
+BEGIN
+  INSERT INTO t2 VALUES (NEW.c1);
+END|
+DELIMITER ;|
+
+
+--echo
+--echo ############################################################
+--echo # 2. Validate that a given SHOW statement goes through the
+--echo #    `trans_begin` hook on Group Replication on server1.
+--let $statement_to_hold= SHOW DATABASES
+--source ../include/gr_consistent_statement_hold.inc
+
+--let $statement_to_hold= SHOW TABLES
+--source ../include/gr_consistent_statement_hold.inc
+
+--let $statement_to_hold= SHOW INDEX FROM t1
+--source ../include/gr_consistent_statement_hold.inc
+
+--let $statement_to_hold= SHOW KEYS FROM t1
+--source ../include/gr_consistent_statement_hold.inc
+
+--let $statement_to_hold= SHOW GRANTS FOR CURRENT_USER()
+--source ../include/gr_consistent_statement_hold.inc
+
+--let $statement_to_hold= SHOW CREATE DATABASE test
+--source ../include/gr_consistent_statement_hold.inc
+
+--let $statement_to_hold= SHOW TABLE STATUS FROM test
+--source ../include/gr_consistent_statement_hold.inc
+
+--let $statement_to_hold= SHOW TRIGGERS FROM test
+--source ../include/gr_consistent_statement_hold.inc
+
+--let $statement_to_hold= SHOW CREATE PROCEDURE test.procedure1
+--source ../include/gr_consistent_statement_hold.inc
+
+--let $statement_to_hold= SHOW CREATE FUNCTION test.function1
+--source ../include/gr_consistent_statement_hold.inc
+
+--let $statement_to_hold= SHOW PROCEDURE CODE test.procedure1
+--source ../include/gr_consistent_statement_hold.inc
+
+--let $statement_to_hold= SHOW FUNCTION CODE test.function1
+--source ../include/gr_consistent_statement_hold.inc
+
+--let $statement_to_hold= SHOW CREATE EVENT test.event1
+--source ../include/gr_consistent_statement_hold.inc
+
+--let $statement_to_hold= SHOW CREATE TRIGGER test.trigger1
+--source ../include/gr_consistent_statement_hold.inc
+
+--let $statement_to_hold= SHOW CREATE USER CURRENT_USER()
+--source ../include/gr_consistent_statement_hold.inc
+
+
+--echo
+--echo ############################################################
+--echo # 3. Clean up.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+DROP PROCEDURE procedure1;
+DROP FUNCTION function1;
+DROP EVENT event1;
+DROP TRIGGER trigger1;
+DROP TABLE t2;
+DROP TABLE t1;
+
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_crash_donor_server_mysql.cnf mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_crash_donor_server_mysql.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_crash_donor_server_mysql.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_crash_donor_server_mysql.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,14 @@
+!include ../my.cnf
+
+[mysqld.1]
+loose-group_replication_communication_stack=MySQL
+
+[mysqld.2]
+loose-group_replication_communication_stack=MySQL
+
+[mysqld.3]
+loose-group_replication_communication_stack=MySQL
+
+[ENV]
+SERVER_MYPORT_3=                @mysqld.3.port
+SERVER_MYSOCK_3=                @mysqld.3.socket
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_crash_donor_server_mysql.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_crash_donor_server_mysql.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_crash_donor_server_mysql.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_crash_donor_server_mysql.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,21 @@
+################################################################################
+# This test verifies whether the group_replication works fine if the
+# donor server is killed when the joiner is already on recovery phase-2.
+#
+# Test:
+# 0. The test requires three servers: M1,M2 and M3.
+# 1. Start GR on servers M1 and M2.
+# 2. Execute some operations on the group through server M1
+#    using procedure dml_operations.
+# 3. Join M3 to the group and wait until the server is in Recovery.
+# 4. Identify the donor server for M3.
+# 5. perform the transactions on the group.
+# 6. Wait until recovery phase-1 on M3 ends.
+# 7. Kill and restart the donor server during phase-2 of M3 recovery.
+# 8.Wait until all the members are online.
+# 9.Verify that all the members have same data.
+# 10.Cleanup
+################################################################################
+
+--source ../include/gr_crash_donor_server.inc
+
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_crash_donor_server.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_crash_donor_server.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_crash_donor_server.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_crash_donor_server.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,198 +17,5 @@
 # 10.Cleanup
 ################################################################################
 
-# This test does crashes servers, thence we skip it on valgrind.
---source include/not_valgrind.inc
---source include/big_test.inc
---source include/force_restart.inc
+--source ../include/gr_crash_donor_server.inc
 
---source include/set_privilege_checks_user_as_system_user.inc
---source include/have_group_replication_plugin.inc
---let $rpl_server_count= 3
---let $rpl_skip_group_replication_start= 1
---source include/group_replication.inc
-
-# START GR on Two servers M1 and M2
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
-
-SET sql_log_bin=0;
-CREATE TABLE t1(a int primary key);
-SET sql_log_bin=1;
-
-# Extract the server_uuid
---let $server1_uuid= query_get_value(SELECT @@SERVER_UUID, @@SERVER_UUID, 1)
-
---source include/start_and_bootstrap_group_replication.inc
-
---let $rpl_connection_name= server2
---source include/rpl_connection.inc
-
-SET sql_log_bin=0;
-CREATE TABLE t1(a int primary key);
-SET sql_log_bin=1;
-
-# Extract the server_uuid
---let $server2_uuid= query_get_value(SELECT @@SERVER_UUID, @@SERVER_UUID, 1)
-
---source include/start_group_replication.inc
-
-# Perform the transactions on group through server1 so
-# that when M3 joins it will be in recovery for some time.
-
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
-
-# Create the procedure to perform dml operations
-delimiter $$;
-CREATE PROCEDURE dml_operations()
-     BEGIN
-     declare x INT;
-     set x=1;
-     while x<100 do
-     insert into t1 values (x);
-     update t1 set a=x+200 where a=x;
-     delete from t1 where a<250;
-     set x=x+1;
-     end  while;
-     end$$
-delimiter ;$$
---echo
-
---echo ----call procedure----
-call dml_operations();
---echo
-
-# Wait for the data to get synced on server2
---source include/rpl_sync.inc
-
-# JOIN M3 to the group
---let $rpl_connection_name= server3
---source include/rpl_connection.inc
-
-SET sql_log_bin=0;
-CREATE TABLE t1(a int primary key);
-SET sql_log_bin=1;
-LOCK TABLES t1 READ;
-
---let $rpl_connection_name= server_3
---source include/rpl_connection.inc
-
-SET SESSION sql_log_bin= 0;
-call mtr.add_suppression("There was an error when connecting to the donor server.*");
-call mtr.add_suppression("For details please check performance_schema.replication_connection_status table and error log messages of Slave I/O for channel group_replication_recovery.");
-call mtr.add_suppression("Slave I/O for channel 'group_replication_recovery': Master command COM_REGISTER_SLAVE failed: failed registering on master, reconnecting to try again.*");
-SET SESSION sql_log_bin= 1;
-
---let $group_replication_start_member_state= RECOVERING
---source include/start_group_replication.inc
-
-# Identify the donor_server for M3
-
---let $wait_timeout= 100
---let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_connection_status WHERE channel_name='group_replication_recovery' AND service_state='ON'
---source include/wait_condition.inc
-
-let $donor_id= 1;
-let $other_id= 2;
-
-if(`SELECT COUNT(*)=1 FROM performance_schema.replication_connection_status WHERE channel_name='group_replication_recovery' AND service_state='ON' AND source_uuid='$server2_uuid'`)
-{
-  let $donor_id= 2;
-  let $other_id= 1;
-}
-
-# Connect to server which is neither M3 nor the donor server and
-# Create procedure to perform dml operations and call it using send.
-# So that these operations gets executed while server M3 is in recovery.
-
---let $rpl_connection_silent= 1
---let $rpl_connection_name= server$other_id
---source include/rpl_connection.inc
-# Create the procedure to perform dml operations
-delimiter $$;
-CREATE PROCEDURE dml_operations_2()
-     BEGIN
-     declare x INT;
-     set x=100;
-     while x<200 do
-     insert into t1 values (x);
-     update t1 set a=x+200 where a=x;
-     delete from t1 where a<320;
-     set x=x+1;
-     end  while;
-     end$$
-delimiter ;$$
---echo
-
---echo ----call procedure----
-send call dml_operations_2();
---echo
-
-# Wait until Recovery phase1 ends.(until the service_state of group_replication_recovery goes to OFF state.)
---let $rpl_connection_name= server3
---source include/rpl_connection.inc
-UNLOCK TABLES;
---let $wait_timeout=200
---let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_connection_status WHERE channel_name='group_replication_recovery' AND service_state='OFF';
---source include/wait_condition.inc
-
-# Kill the donor server during phase 2 of M3's recovery
---let $rpl_connection_name= server$donor_id
---source include/rpl_connection.inc
-
-SET sql_log_bin=0;
-call mtr.add_suppression(".*Slave SQL for channel 'group_replication_applier': ... The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state*");
-SET sql_log_bin=1;
-
-# kill donor server
---echo # killing
---let $group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
---let $group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
---let $restart_parameters=restart:--group_replication_local_address=$group_replication_local_address --group_replication_group_seeds=$group_replication_group_seeds --group_replication_group_name=$group_replication_group_name
---replace_result $group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
---source include/kill_and_restart_mysqld.inc
---echo # restarting
-
-# Needed as we are not using rpl_restart_server.inc
---let $rpl_server_number= $donor_id
---source include/rpl_reconnect.inc
-
---let $rpl_connection_name= server$other_id
---source include/rpl_connection.inc
-reap;
-# Wait until group has only 2 members, that is, donor server's death is detected by
-# the group.
---echo # check that there are 2 mebers in the group
---let $group_replication_number_of_members= 2
---source include/gr_wait_for_number_of_members.inc
-
---sleep 5
-
-# Start GR on killed and restarted donor server and wait until all the servers are ONLINE.
-# Start GR on donor server
---let $rpl_connection_name= server$donor_id
---source include/rpl_connection.inc
-
---let $wait_timeout= 200
---source include/start_group_replication.inc
-
---let $rpl_connection_name= server$other_id
---source include/rpl_connection.inc
-
---let $wait_timeout= 200
---let $wait_condition= SELECT COUNT(*) = 3 FROM performance_schema.replication_group_members where MEMBER_STATE='ONLINE';
---source include/wait_condition.inc
-
---source include/rpl_sync.inc
-
-# Verify that table t1 has same data on all the servers.
---let $diff_tables=server1:t1, server2:t1, server3:t1
---source include/diff_tables.inc
-
-# Clean up.
-drop table t1;
-drop procedure dml_operations;
-drop procedure dml_operations_2;
---let $skip_restore_connection= 0
---source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_crash_recovery_server.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_crash_recovery_server.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_crash_recovery_server.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_crash_recovery_server.test	2021-09-28 11:46:34.000000000 +0000
@@ -126,8 +126,9 @@
 --echo # killing
 --let $group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
---let $restart_parameters=restart:--group_replication_local_address=$group_replication_local_address --group_replication_group_seeds=$group_replication_group_seeds --group_replication_group_name=$group_replication_group_name
---replace_result $group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--let $group_replication_comm_stack= `SELECT @@GLOBAL.group_replication_communication_stack`
+--let $restart_parameters=restart:--group_replication_local_address=$group_replication_local_address --group_replication_group_seeds=$group_replication_group_seeds --group_replication_group_name=$group_replication_group_name --group_replication_communication_stack=$group_replication_comm_stack
+--replace_result $group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $group_replication_comm_stack GROUP_REPLICATION_COMMUNICATION_STACK
 
 --source include/kill_and_restart_mysqld.inc
 --echo # restarting
@@ -189,8 +190,9 @@
 # Kill the recovery server
 # kill server M3
 --echo # killing
---let $restart_parameters=restart:--group_replication_local_address=$group_replication_local_address --group_replication_group_seeds=$group_replication_group_seeds --group_replication_group_name=$group_replication_group_name
---replace_result $group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--let $restart_parameters=restart:--group_replication_local_address=$group_replication_local_address --group_replication_group_seeds=$group_replication_group_seeds --group_replication_group_name=$group_replication_group_name --group_replication_communication_stack=$group_replication_comm_stack
+--let $group_replication_comm_stack= `SELECT @@GLOBAL.group_replication_communication_stack`
+--replace_result $group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $group_replication_comm_stack GROUP_REPLICATION_COMMUNICATION_STACK
 --source include/kill_and_restart_mysqld.inc
 --echo # restarting
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_crash_while_dml_and_some_server_recovering.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_crash_while_dml_and_some_server_recovering.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_crash_while_dml_and_some_server_recovering.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_crash_while_dml_and_some_server_recovering.test	2021-09-28 11:46:34.000000000 +0000
@@ -68,6 +68,7 @@
 SET sql_log_bin=0;
 CREATE TABLE t1(a int primary key);
 SET sql_log_bin=1;
+
 LOCK TABLES t1 READ;
 
 --let $rpl_connection_name= server_3
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_delayed_view_change_write_local_commit_donor_crash.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_delayed_view_change_write_local_commit_donor_crash.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_delayed_view_change_write_local_commit_donor_crash.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_delayed_view_change_write_local_commit_donor_crash.test	2021-09-28 11:46:34.000000000 +0000
@@ -71,6 +71,7 @@
 CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
 --eval CREATE USER "$recovery_user" IDENTIFIED BY "$recovery_password"
 --eval GRANT REPLICATION SLAVE ON *.* TO "$recovery_user"
+--eval GRANT GROUP_REPLICATION_STREAM ON *.* TO "$recovery_user"
 FLUSH PRIVILEGES;
 SET SESSION sql_log_bin= 1;
 
@@ -110,6 +111,10 @@
 CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
 call mtr.add_suppression("There was an error when connecting to the donor server.*");
 call mtr.add_suppression("For details please check performance_schema.replication_connection_status table and error log messages of Slave I/O for channel group_replication_recovery.");
+
+--eval CREATE USER "$recovery_user" IDENTIFIED BY "$recovery_password"
+--eval GRANT GROUP_REPLICATION_STREAM ON *.* TO "$recovery_user"
+FLUSH PRIVILEGES;
 SET SESSION sql_log_bin= 1;
 
 --disable_warnings
@@ -317,4 +322,8 @@
 SET @@GLOBAL.group_replication_recovery_reconnect_interval= @group_replication_recovery_reconnect_interval_saved;
 SET GLOBAL debug= '-d,group_replication_skip_read_mode';
 
+SET SESSION sql_log_bin= 0;
+--eval DROP USER "$recovery_user"
+SET SESSION sql_log_bin= 1;
+
 --source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_exit_state_action_on_majority_loss.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_exit_state_action_on_majority_loss.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_exit_state_action_on_majority_loss.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_exit_state_action_on_majority_loss.test	2021-09-28 11:46:34.000000000 +0000
@@ -45,6 +45,12 @@
 call mtr.add_suppression("The plugin encountered a critical error and will abort: This member could not reach a majority of the members.");
 SET SESSION sql_log_bin = 1;
 
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
 # Get address, seeds and UUID of all servers
 --let $local_address_server1= `SELECT @@GLOBAL.group_replication_local_address`
 --let $group_seeds_server1= `SELECT @@GLOBAL.group_replication_group_seeds`
@@ -68,6 +74,7 @@
 # Crash server 2
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
+
 --enable_reconnect
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.2.expect
 --shutdown_server 0
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_exit_state_action_on_member_expel_mysql.cnf mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_exit_state_action_on_member_expel_mysql.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_exit_state_action_on_member_expel_mysql.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_exit_state_action_on_member_expel_mysql.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,17 @@
+!include ../my.cnf
+
+[mysqld.1]
+loose-group_replication_communication_stack=MySQL
+local-infile=       true
+group_replication_autorejoin_tries= 0
+
+[mysqld.2]
+loose-group_replication_communication_stack=MySQL
+
+[mysqld.3]
+loose-group_replication_communication_stack=MySQL
+report-port=        @mysqld.3.port
+
+[ENV]
+SERVER_MYPORT_3=		@mysqld.3.port
+SERVER_MYSOCK_3=		@mysqld.3.socket
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_exit_state_action_on_member_expel_mysql.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_exit_state_action_on_member_expel_mysql.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_exit_state_action_on_member_expel_mysql.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_exit_state_action_on_member_expel_mysql.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,25 @@
+###############################################################################
+#
+# group_replication_exit_state_action sysvar specifies which action is taken by
+# a server once it has involuntarily left the group. Currently there are only
+# two actions: either the server continues running but with super_read_only
+# enabled (READ_ONLY) or it aborts (ABORT_SERVER).
+#
+# In order to verify the expected behaviour, this test shall test that the
+# specified exit action is executed correctly after an expel by the other
+# members of the group.
+#
+# Test:
+# 0) Setup group of 3 members (M1, M2 and M3).
+# 1) Force expel of member 1.
+# 1.1) Verify that member 1 went to super_read_only mode.
+# 2) Relaunch member 1 with exit state action to ABORT_SERVER.
+# 3) Force expel again of member 1.
+# 3.1) Verify that member 1 aborted.
+# 4) Relaunch member 1.
+# 5) Cleanup.
+#
+################################################################################
+
+--source ../include/gr_exit_state_action_on_member_expel.inc
+
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_exit_state_action_on_member_expel.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_exit_state_action_on_member_expel.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_exit_state_action_on_member_expel.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_exit_state_action_on_member_expel.test	2021-09-28 11:46:34.000000000 +0000
@@ -20,156 +20,6 @@
 # 5) Cleanup.
 #
 ################################################################################
-# Test involves sending SIGSTOP and SIGCONT signals using kill Linux command.
---source include/linux.inc
---source include/big_test.inc
---source include/have_group_replication_plugin.inc
 
---echo
---echo #########################################################################
---echo # 0) Setup group of 3 members (M1, M2 and M3).
---echo #########################################################################
---echo
---let $rpl_server_count= 3
---source include/group_replication.inc
+--source ../include/gr_exit_state_action_on_member_expel.inc
 
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
-SET SESSION sql_log_bin = 0;
-CREATE TABLE pid_table(pid_no INT PRIMARY KEY);
---let $pid_file=`SELECT @@pid_file`
---replace_result $pid_file pid_file
---eval LOAD DATA LOCAL INFILE '$pid_file' INTO TABLE pid_table
---let $server_pid=`SELECT pid_no FROM pid_table`
-DROP TABLE pid_table;
-
-# Supress log errors since they are expected.
-call mtr.add_suppression("Member was expelled from the group due to network failures, changing member status to ERROR.");
-call mtr.add_suppression("The server was automatically set into read only mode after an error was detected.");
-call mtr.add_suppression("Skipping leave operation: concurrent attempt to leave the group is on-going.");
-call mtr.add_suppression("The plugin encountered a critical error and will abort: Member was expelled from the group due to network failures.");
-call mtr.add_suppression("Error, maximum number of retries exceeded when waiting for the internal server session state to be operating");
-call mtr.add_suppression("Failed to establish an internal server connection to execute plugin operations");
-call mtr.add_suppression("Unable to confirm whether the server has left the group or not.*");
-call mtr.add_suppression(".* read failed");
-call mtr.add_suppression("\\[GCS\\] Unable to resolve peer address.");
-SET SESSION sql_log_bin = 1;
-
---let $member1_uuid= `SELECT @@GLOBAL.server_uuid`
---let $local_address_server1= `SELECT @@GLOBAL.group_replication_local_address`
---let $group_seeds_server1= `SELECT @@GLOBAL.group_replication_group_seeds`
-
-
---echo
---echo #########################################################################
---echo # 1) Force expel of member 1.
---echo #########################################################################
---echo
-# Then we send a SIGSTOP to it. This will stop the server from sending the
-# keep-alive message and thus it will be viewed as a faulty node by the rest of
-# the group (and consequently expelled).
---exec kill -19 $server_pid
-
-# Wait until the group settles on 2 members
---let $rpl_connection_name= server2
---source include/rpl_connection.inc
---let $group_replication_number_of_members= 2
---source include/gr_wait_for_number_of_members.inc
-
---let $rpl_connection_name= server3
---source include/rpl_connection.inc
---let $group_replication_number_of_members= 2
---source include/gr_wait_for_number_of_members.inc
-
---echo
---echo #########################################################################
---echo # 1.1) Verify that member 1 went to super_read_only mode.
---echo #########################################################################
---echo
-# Send SIGCONT to server, so it can continue (now that he is expelled)
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
---exec kill -18 $server_pid
-
-# Verify that the member entered an error state
---let $group_replication_member_state= ERROR
---let $group_replication_member_id= $member1_uuid
---source include/gr_wait_for_member_state.inc
-
-# Then verify that it enabled super_read_only
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
---let $assert_text= super_read_only should be enabled
---let $assert_cond= [SELECT @@GLOBAL.super_read_only] = 1;
---source include/assert.inc
---source include/stop_group_replication.inc
-
---echo
---echo #########################################################################
---echo # 2) Set exit state action to ABORT_SERVER on member 1.
---echo #########################################################################
---echo
-# Set the exit state action sysvar to ABORT_SERVER
-SET @@GLOBAL.group_replication_exit_state_action = ABORT_SERVER;
---source include/start_group_replication.inc
---let $group_replication_number_of_members = 3
---source include/gr_wait_for_number_of_members.inc
-
---echo
---echo #########################################################################
---echo # 3) Force expel again of member 1.
---echo #########################################################################
---echo
-# Inform MTR that we are expecting an abort and that it should wait before
-# restarting the aborting member
---exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
-# Send SIGSTOP again
---exec kill -19 $server_pid
-# Wait until the group settles on 2 members
---let $rpl_connection_name= server2
---source include/rpl_connection.inc
---let $group_replication_number_of_members= 2
---source include/gr_wait_for_number_of_members.inc
---let $rpl_connection_name= server3
---source include/rpl_connection.inc
---let $group_replication_number_of_members= 2
---source include/gr_wait_for_number_of_members.inc
-
---echo
---echo #########################################################################
---echo # 3.1) Wait until server is aborted.
---echo #########################################################################
---echo
-# Send SIGCONT to server, so it can continue (now that he is expelled)
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
---exec kill -18 $server_pid
-# Wait until the connection is dropped
---source include/wait_until_disconnected.inc
-
---echo
---echo #########################################################################
---echo # 4) Relaunch member 1.
---echo #########################################################################
---echo
---exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
---let $rpl_server_number= 1
---source include/rpl_reconnect.inc
-
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
---replace_result $group_seeds_server1 GROUP_SEEDS_SERVER1
---eval SET @@global.group_replication_group_seeds="$group_seeds_server1"
---replace_result $local_address_server1 LOCAL_ADDRESS_SERVER1
---eval SET @@global.group_replication_local_address="$local_address_server1"
---source include/start_group_replication.inc
-# Wait for member to stabilize in the group
---let $group_replication_number_of_members = 3
---source include/gr_wait_for_number_of_members.inc
-
---echo
---echo #########################################################################
---echo # 5) Cleanup.
---echo #########################################################################
---echo
---source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_flow_control_options.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_flow_control_options.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_flow_control_options.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_flow_control_options.test	2021-09-28 11:46:34.000000000 +0000
@@ -492,6 +492,11 @@
 --echo ############################################################
 --echo # Clean up.
 
+--let $allow_rpl_inited= 1
+--let $restart_parameters=restart:--group_replication_group_name=$group_replication_group_name --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds
+--replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--source include/restart_mysqld.inc
+
 --let $rpl_server_number= 2
 --source include/rpl_reconnect.inc
 
@@ -512,4 +517,6 @@
 
 SET @@GLOBAL.DEBUG= @debug_saved;
 
+
+
 --source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_gcs_psi_threads_mysql.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_gcs_psi_threads_mysql.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_gcs_psi_threads_mysql.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_gcs_psi_threads_mysql.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,10 @@
+################################################################################
+# Verify that entries corresponding to the GCS performance schema instrumented
+# threads are in the threads table only during the execution of the
+# group replication plugin using MySQL protocol stack
+################################################################################
+
+--source include/have_group_replication_plugin_base.inc
+--source include/have_group_replication_mysql_communication_stack.inc
+
+--source ../include/gr_gcs_psi_threads.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_gcs_psi_threads.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_gcs_psi_threads.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_gcs_psi_threads.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_gcs_psi_threads.test	1970-01-01 00:00:00.000000000 +0000
@@ -1,71 +0,0 @@
-################################################################################
-# Verify that entries corresponding to the GCS performance schema instrumented
-# threads are in the threads table only during the execution of the
-# group replication plugin.
-#
-# Test:
-# 0. The test requires one Server: M1
-# 1. Verify that no entries corresponding to the instrumented GCS threads are
-#    in the threads table.
-# 2. Start GR on M1.
-# 3. Verify that the entries corresponding to the instrumented GCS threads are
-#    in the threads table.
-# 4. Stop GR on M1.
-# 5. Verify that no entries corresponding to the instrumented GCS threads
-#    remain in the threads table.
-# 6. Test end.
-################################################################################
-
---source include/have_group_replication_plugin.inc
---let $rpl_skip_group_replication_start= 1
---source include/group_replication.inc
-
---echo
---echo ############################################################
---echo # 1. Verify that the entries corresponding to the
---echo #    instrumented GCS threads are not in the threads
---echo #    table immediately after plugin installation
---echo #    (before starting the GR).
---connection server1
---sorted_result
-SELECT * FROM performance_schema.threads WHERE NAME LIKE '%THD_Gcs_%';
---let $assert_text= 'There should be no GCS instrumented threads entries in the threads table before starting the GR'
---let $assert_cond= COUNT(*) = 0 FROM performance_schema.threads WHERE NAME LIKE "%THD_Gcs_%"
---source include/assert.inc
-
---echo
---echo ############################################################
---echo # 2. Start the GR
---source include/start_and_bootstrap_group_replication.inc
-
---echo
---echo ############################################################
---echo # 3. Verify that the entries corresponding to the
---echo #    instrumented GCS threads are in the threads table
---echo #    after starting the GR.
---sorted_result
-SELECT NAME,TYPE FROM performance_schema.threads WHERE NAME LIKE '%THD_Gcs_%';
---let $assert_text= 'There should be 4 GCS instrumented thread entries in the threads table after starting the GR'
---let $assert_cond= COUNT(*) = 4 FROM performance_schema.threads WHERE NAME LIKE "%THD_Gcs_%"
---source include/assert.inc
-
---echo
---echo ############################################################
---echo # 4. Stop the GR
---source include/stop_group_replication.inc
-
---echo
---echo ############################################################
---echo # 5. Verify that no entries corresponding to the
---echo #    instrumented GCS threads remain in the threads table
---echo #    after stopping the GR.
---sorted_result
-SELECT * FROM performance_schema.threads WHERE NAME LIKE '%THD_Gcs_%';
---let $assert_text= 'There should be no extra psi keys added after starting the GR'
---let $assert_cond= COUNT(*) = 0 FROM performance_schema.threads WHERE NAME LIKE "%THD_Gcs_%"
---source include/assert.inc
-
---echo
---echo ############################################################
---echo # 6. Test end.
---source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_gcs_psi_threads_xcom.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_gcs_psi_threads_xcom.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_gcs_psi_threads_xcom.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_gcs_psi_threads_xcom.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,10 @@
+################################################################################
+# Verify that entries corresponding to the GCS performance schema instrumented
+# threads are in the threads table only during the execution of the
+# group replication plugin using XCom protocol stack
+################################################################################
+
+--source include/have_group_replication_plugin_base.inc
+--source include/have_group_replication_xcom_communication_stack.inc
+
+--source ../include/gr_gcs_psi_threads.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_huge_gtid_executed.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_huge_gtid_executed.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_huge_gtid_executed.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_huge_gtid_executed.test	2021-09-28 11:46:34.000000000 +0000
@@ -115,6 +115,12 @@
 --let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_member_stats WHERE Transactions_committed_all_members = "$_gtid_executed" and member_id in (SELECT @@server_uuid)
 --source include/wait_condition.inc
 
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $wait_timeout= 240
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_member_stats WHERE Transactions_committed_all_members = "$_gtid_executed" and member_id in (SELECT @@server_uuid)
+--source include/wait_condition.inc
+
 
 --echo
 --echo ############################################################
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_implicit_commit.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_implicit_commit.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_implicit_commit.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_implicit_commit.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,116 @@
+###############################################################################
+#
+# This test confirm that an implicit TRUNCATE statement is managed by Group
+# Replication when a replicated memory table is first updated after a server
+# crash or a server restart.
+#
+# Test:
+#   0. The test requires two serves
+#   1. Create table t1 with engine set to memory on server1
+#   2. Restart server1 and start group replication
+#   3. Create a new table based on t1. This will create an
+#      implicit commit due previous restart
+#   4. Wait for GTID_EXECUTED has 6 gtids
+#   5. On binary log from first start we shall have: two
+#      views and a create table.
+#   6. On binary log from second start we shall have: a view,
+#      a truncate table and a create table
+#   7. On server 2 binary log we shall have: two views, a
+#      create table, a view, a truncate table and a create table
+#   8. Cleanup
+#
+###############################################################################
+--source include/have_group_replication_plugin.inc
+--source include/group_replication.inc
+
+
+--echo
+--echo ############################################################
+--echo # 1. Create table t1 with engine set to memory on server1
+
+CREATE TABLE t1(a INT, b INT) engine=memory;
+
+--source include/rpl_sync.inc
+
+
+--echo
+--echo ############################################################
+--echo # 2. Restart server1 and start group replication
+
+--let $allow_rpl_inited=1
+--let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
+--let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $restart_parameters=restart:--group-replication-group-name=$group_replication_group_name --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds
+--replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--source include/restart_mysqld.inc
+
+--let $rpl_server_number= 1
+--source include/rpl_reconnect.inc
+
+--source include/start_group_replication.inc
+
+
+--echo
+--echo ############################################################
+--echo # 3. Create a new table based on t1. This will create an
+--echo #    implicit commit due previous restart
+
+CREATE TABLE t2 LIKE t1;
+
+--source include/rpl_sync.inc
+
+--echo
+--echo ############################################################
+--echo # 4. Wait for GTID_EXECUTED has 6 gtids
+
+--let $wait_condition= SELECT @@GLOBAL.GTID_EXECUTED = "$group_replication_group_name:1-6"
+--source include/wait_condition.inc
+
+
+--echo
+--echo ############################################################
+--echo # 5. On binary log from first start we shall have: two
+--echo #    views and a create table.
+
+# The sequence of events that make up a View Change
+--let $vcle_seq= Gtid # Query/BEGIN # View_change # Query/COMMIT
+
+# limit to remove match with stop on last line
+--let $limit= 0, 12
+--let $binlog_file= server-binary-log.000001
+--let $event_sequence= $vcle_seq # $vcle_seq # Gtid # !Q(CREATE.*)
+--source include/assert_binlog_events.inc
+
+
+--echo
+--echo ############################################################
+--echo # 6. On binary log from second start we shall have: a view,
+--echo #    a truncate table and a create table
+
+--let $binlog_file= server-binary-log.000002
+--let $event_sequence= $vcle_seq # Gtid # !Q(TRUNCATE.*) # Gtid # !Q(CREATE.*)
+--source include/assert_binlog_events.inc
+
+
+--echo
+--echo ############################################################
+--echo # 7. On server 2 binary log we shall have: two views, a
+--echo #    create table, a view, a truncate table and a create table
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--let $limit=
+--let $binlog_file= server-binary-log.000001
+--let $event_sequence= $vcle_seq # $vcle_seq # Gtid # !Q(CREATE.*) # $vcle_seq # Gtid # !Q(TRUNCATE.*) # Gtid # !Q(CREATE.*)
+--source include/assert_binlog_events.inc
+
+
+--echo
+--echo ############################################################
+--echo # 8. Cleanup
+
+DROP TABLE t1;
+DROP TABLE t2;
+
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ip_whitelist_deprecation.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ip_whitelist_deprecation.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ip_whitelist_deprecation.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ip_whitelist_deprecation.test	2021-09-28 11:46:34.000000000 +0000
@@ -71,4 +71,13 @@
 
 --replace_result $saved_gr_ip_whitelist GROUP_REPLICATION_IP_WHITELIST
 --eval SET @@GLOBAL.group_replication_ip_whitelist= $saved_gr_ip_whitelist
+
+--let $allow_rpl_inited=1
+--let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
+--let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $restart_parameters=restart:--group_replication_group_name=$group_replication_group_name --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_bootstrap_group=1
+--replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--source include/restart_mysqld.inc
+--let $rpl_server_number= 1
+--source include/rpl_reconnect.inc
 --source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_join_with_suspect_member.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_join_with_suspect_member.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_join_with_suspect_member.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_join_with_suspect_member.test	2021-09-28 11:46:34.000000000 +0000
@@ -26,6 +26,8 @@
 --source include/not_valgrind.inc
 # Test involves sending SIGSTOP and SIGCONT signals using kill Linux command.
 --source include/linux.inc
+# Only run in XCom due to connection issues with MySQL stack
+--source include/have_group_replication_xcom_communication_stack.inc
 --source include/big_test.inc
 --source include/force_restart.inc
 --source include/have_group_replication_plugin.inc
@@ -142,6 +144,9 @@
 --echo # Try to start GR on server4.
 --let $rpl_connection_name= server4
 --source include/rpl_connection.inc
+
+--let $group_replication_comm_stack= `SELECT @@GLOBAL.group_replication_communication_stack`
+
 --replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
 --eval SET GLOBAL group_replication_group_name= "$group_replication_group_name"
 --replace_result $server1_local_address SERVER1_LOCAL_ADDRESS
@@ -182,6 +187,8 @@
 --source include/rpl_connection.inc
 let $wait_condition=SELECT COUNT(*)=2 FROM performance_schema.replication_group_members where MEMBER_STATE="ONLINE";
 --source include/wait_condition.inc
+let $wait_condition=SELECT COUNT(*)=0 FROM performance_schema.replication_group_members where MEMBER_STATE="UNREACHABLE";
+--source include/wait_condition.inc
 
 --echo
 --echo #############################################################
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_kill_applier_module.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_kill_applier_module.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_kill_applier_module.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_kill_applier_module.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,91 @@
+################################################################################
+# Validate that when the "Group replication applier module" thread is killed, on
+# the next event that goes through it, the member moves to ERROR state.
+#
+# Test:
+# 0. The test requires two servers M1 & M2
+# 1. Create a table t1 on the group.
+# 2. Kill the "Group replication applier module" thread on
+# 3. Commit a transaction on server2.
+#    Once the transaction message is delivered to server1,
+#    the applier module will be awaken and it will detect
+#    that its thread was killed, which will move the
+#    member to ERROR state.
+# 4. Server1 will move to ERROR state.
+# 5. Server2 is ONLINE and alone on the group.
+# 6. Clean up
+################################################################################
+--source include/have_group_replication_plugin.inc
+--source include/group_replication.inc
+
+
+--echo
+--echo ############################################################
+--echo # 1. Create a table t1 on the group.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+SET sql_log_bin=0;
+call mtr.add_suppression("Fatal error during execution on the Applier process of Group Replication. The server will now leave the group.");
+call mtr.add_suppression("The server was automatically set into read only mode after an error was detected.");
+call mtr.add_suppression("Error writing relay log configuration.");
+call mtr.add_suppression("Failed to stop the group replication applier thread.");
+SET sql_log_bin=1;
+
+CREATE TABLE test.t1 (c1 INT NOT NULL PRIMARY KEY);
+--source include/rpl_sync.inc
+
+
+--echo
+--echo ############################################################
+--echo # 2. Kill the "Group replication applier module" thread on
+--echo #    server1.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $processlist_id= `SELECT PROCESSLIST_ID FROM performance_schema.threads WHERE NAME="thread/group_rpl/THD_applier_module_receiver"`
+--replace_result $processlist_id PROCESSLIST_ID
+--eval KILL $processlist_id
+
+
+--echo
+--echo ############################################################
+--echo # 3. Commit a transaction on server2.
+--echo #    Once the transaction message is delivered to server1,
+--echo #    the applier module will be awaken and it will detect
+--echo #    that its thread was killed, which will move the
+--echo #    member to ERROR state.
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+INSERT INTO t1 VALUES (1);
+
+
+--echo
+--echo ############################################################
+--echo # 4. Server1 will move to ERROR state.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $group_replication_member_state = ERROR
+--source include/gr_wait_for_member_state.inc
+
+--let $wait_condition=SELECT COUNT(*)=0 FROM performance_schema.threads WHERE NAME="thread/group_rpl/THD_applier_module_receiver"
+--source include/wait_condition.inc
+
+
+--echo
+--echo ############################################################
+--echo # 5. Server2 is ONLINE and alone on the group.
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $wait_condition=SELECT COUNT(*)=1 FROM performance_schema.replication_group_members where MEMBER_STATE="ONLINE"
+--source include/wait_condition.inc
+
+
+--echo
+--echo ############################################################
+--echo # 6. Clean up.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+--source include/start_group_replication.inc
+DROP TABLE t1;
+
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_lock_acl_cache_followed_by_view_change_comm_stack_mysql.cnf mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_lock_acl_cache_followed_by_view_change_comm_stack_mysql.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_lock_acl_cache_followed_by_view_change_comm_stack_mysql.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_lock_acl_cache_followed_by_view_change_comm_stack_mysql.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,11 @@
+!include ../my.cnf
+
+[mysqld.1]
+
+[mysqld.2]
+
+[mysqld.3]
+
+[ENV]
+SERVER_MYPORT_3=		@mysqld.3.port
+SERVER_MYSOCK_3=		@mysqld.3.socket
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_lock_acl_cache_followed_by_view_change_comm_stack_mysql.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_lock_acl_cache_followed_by_view_change_comm_stack_mysql.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_lock_acl_cache_followed_by_view_change_comm_stack_mysql.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_lock_acl_cache_followed_by_view_change_comm_stack_mysql.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,180 @@
+###########################################################
+#
+#  This tests verifies that a new view will not be blocked, for a member
+#  holding an ACL lock.
+#
+#  When group_replication_communication_stack is configured as MySQL the XCOM
+#  connection will fail to authenticate and then retry.
+#  The retry may happen in two ways:
+#   1) internal XCOM retries, which does not cause differences on the server logs
+#   2) auto-rejoin, which will log a extra View_change:
+#
+#  The tests confirm if group logged an extra view before asserting log events
+#  to work on both ways.
+#
+#  Test:
+#  0. The test requires three servers.
+#  1. Deploy a group in single-primary mode with 2 members.
+#  2. Hold a ACL statement, CREATE USER, on its propagation
+#     to the group. The ACL_CACHE lock is acquired by the
+#     ACL statement.
+#  3. Add a 3rd member to the group.
+#     BUG: the view install on server1 will be blocked by the
+#          ACL statement.
+#  4. Wait until the group has 3 members and then resume the
+#     ACL statement.
+#     server3 may be in RECOVERING state but it will be part of
+#     the group.
+#  5. Wait server3 to be ONLINE
+#  6. An extra view can be generated when auto rejoin occurs,
+#     so define event_sequence for assert_binlog_events.inc
+#  7. Verify that all members data is equal.
+#  8. Clean up.
+###########################################################
+
+--source include/big_test.inc
+--source include/have_debug.inc
+--source include/have_group_replication_mysql_communication_stack.inc
+--source include/have_group_replication_plugin.inc
+--let $rpl_group_replication_single_primary_mode=1
+--let $rpl_skip_group_replication_start= 1
+--let $rpl_server_count= 3
+--source include/group_replication.inc
+
+--let $vcle_seq= Gtid # Query/BEGIN # View_change # Query/COMMIT
+
+--echo
+--echo ############################################################
+--echo # 1. Deploy a group in single-primary mode with 2 members.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--source include/start_and_bootstrap_group_replication.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--source include/start_group_replication.inc
+
+
+--echo
+--echo ############################################################
+--echo # 2. Hold a ACL statement, CREATE USER, on its propagation
+--echo #    to the group. The ACL_CACHE lock is acquired by the
+--echo #    ACL statement.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+SET @debug_save= @@GLOBAL.DEBUG;
+SET @@GLOBAL.DEBUG='+d,group_replication_pause_on_before_commit_hook';
+
+--let $rpl_connection_name= server_1
+--source include/rpl_connection.inc
+--send CREATE USER 'user'
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $wait_condition=SELECT COUNT(*)=1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE User="root" AND State="waiting for handler commit" AND Info="CREATE USER 'user'@'%'"
+--source include/wait_condition.inc
+
+SET GLOBAL DEBUG= @debug_save;
+
+
+--echo
+--echo ############################################################
+--echo # 3. Add a 3rd member to the group.
+--echo #    BUG: the view install on server1 will be blocked by the
+--echo #         ACL statement.
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("There was an error when connecting to the donor server. Please check that group_replication_recovery channel credentials.*");
+call mtr.add_suppression("For details please check performance_schema.replication_connection_status table and error log messages of Slave I/O for channel group_replication_recovery.");
+call mtr.add_suppression("Member was expelled from the group due to network failures, changing member status to ERROR.");
+call mtr.add_suppression("The server was automatically set into read only mode after an error was detected.");
+SET SESSION sql_log_bin = 1;
+
+# ACL_CACHE lock hold on server1 is also also acquired by dump thread, which
+# means that if server2 recovery channel connects to server1 it will fail and
+# retry until the ACL_CACHE lock is released or server3 connects to server2.
+--replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--eval SET GLOBAL group_replication_group_name= "$group_replication_group_name"
+--source include/start_group_replication_command.inc
+
+
+--echo
+--echo ############################################################
+--echo # 4. Wait until the group has 3 members and then resume the
+--echo #    ACL statement.
+--echo #    server3 may be in RECOVERING state but it will be part of
+--echo #    the group.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $group_replication_number_of_members= 3
+--source include/gr_wait_for_number_of_members.inc
+
+--let $rpl_connection_name= server_1
+--source include/rpl_connection.inc
+--reap
+
+
+--echo
+--echo ############################################################
+--echo # 5. Wait server3 to be ONLINE
+
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--let $group_replication_member_state = ONLINE
+--source include/gr_wait_for_member_state.inc
+
+
+--echo
+--echo ############################################################
+--echo # 6. An extra view can be generated when auto rejoin occurs,
+--echo #    so define event_sequence for assert_binlog_events.inc
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--let $gtid_with_extra_view=$group_replication_group_name:1-5
+--let $gtid_executed=`SELECT @@GLOBAL.GTID_EXECUTED`
+
+if ( $gtid_executed == $gtid_with_extra_view)
+{
+  --let $event_sequence= $vcle_seq # $vcle_seq # $vcle_seq # $vcle_seq # Gtid # !Q(CREATE.*)
+}
+
+if ( $gtid_executed != $gtid_with_extra_view)
+{
+  --let $event_sequence= $vcle_seq # $vcle_seq # $vcle_seq # Gtid # !Q(CREATE.*)
+}
+
+--echo
+--echo ############################################################
+--echo # 7. Verify that all members data is equal.
+
+--let $dont_print_pattern= 1
+--source include/assert_binlog_events.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+# previously defined event_sequence
+--let $dont_print_pattern= 1
+--source include/assert_binlog_events.inc
+
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+
+# previously defined event_sequence
+--let $dont_print_pattern= 1
+--source include/assert_binlog_events.inc
+
+--echo
+--echo ############################################################
+--echo # 8. Clean up.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+DROP USER 'user';
+
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_lock_acl_cache_followed_by_view_change_comm_stack_xcom.cnf mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_lock_acl_cache_followed_by_view_change_comm_stack_xcom.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_lock_acl_cache_followed_by_view_change_comm_stack_xcom.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_lock_acl_cache_followed_by_view_change_comm_stack_xcom.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,11 @@
+!include ../my.cnf
+
+[mysqld.1]
+
+[mysqld.2]
+
+[mysqld.3]
+
+[ENV]
+SERVER_MYPORT_3=		@mysqld.3.port
+SERVER_MYSOCK_3=		@mysqld.3.socket
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_lock_acl_cache_followed_by_view_change_comm_stack_xcom.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_lock_acl_cache_followed_by_view_change_comm_stack_xcom.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_lock_acl_cache_followed_by_view_change_comm_stack_xcom.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_lock_acl_cache_followed_by_view_change_comm_stack_xcom.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,153 @@
+###########################################################
+#
+#  This tests verifies that a new view will not be blocked, for a member
+#  holding an ACL lock.
+#
+#  Test:
+#  0. The test requires three servers.
+#  1. Deploy a group in single-primary mode with 2 members.
+#  2. Hold a ACL statement, CREATE USER, on its propagation
+#     to the group. The ACL_CACHE lock is acquired by the
+#     ACL statement.
+#  3. Add a 3rd member to the group.
+#     BUG: the view install on server1 will be blocked by the
+#          ACL statement.
+#  4. Wait until the group has 3 members and then resume the
+#     ACL statement.
+#     server3 may be in RECOVERING state but it will be part of
+#     the group.
+#  5. Verify that all members data is equal.
+#  6. Clean up.
+###########################################################
+
+--source include/big_test.inc
+--source include/have_debug.inc
+--source include/have_group_replication_xcom_communication_stack.inc
+--source include/have_group_replication_plugin.inc
+--let $rpl_group_replication_single_primary_mode=1
+--let $rpl_skip_group_replication_start= 1
+--let $rpl_server_count= 3
+--source include/group_replication.inc
+
+--let $vcle_seq= Gtid # Query/BEGIN # View_change # Query/COMMIT
+
+--echo
+--echo ############################################################
+--echo # 1. Deploy a group in single-primary mode with 2 members.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--source include/start_and_bootstrap_group_replication.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--source include/start_group_replication.inc
+
+
+--echo
+--echo ############################################################
+--echo # 2. Hold a ACL statement, CREATE USER, on its propagation
+--echo #    to the group. The ACL_CACHE lock is acquired by the
+--echo #    ACL statement.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+SET @debug_save= @@GLOBAL.DEBUG;
+SET @@GLOBAL.DEBUG='+d,group_replication_pause_on_before_commit_hook';
+
+--let $rpl_connection_name= server_1
+--source include/rpl_connection.inc
+--send CREATE USER 'user'
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $wait_condition=SELECT COUNT(*)=1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE User="root" AND State="waiting for handler commit" AND Info="CREATE USER 'user'@'%'"
+--source include/wait_condition.inc
+
+SET GLOBAL DEBUG= @debug_save;
+
+
+--echo
+--echo ############################################################
+--echo # 3. Add a 3rd member to the group.
+--echo #    BUG: the view install on server1 will be blocked by the
+--echo #         ACL statement.
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("There was an error when connecting to the donor server. Please check that group_replication_recovery channel credentials.*");
+call mtr.add_suppression("For details please check performance_schema.replication_connection_status table and error log messages of Slave I/O for channel group_replication_recovery.");
+SET SESSION sql_log_bin = 1;
+
+# ACL_CACHE lock hold on server1 is also also acquired by dump thread, which
+# means that if server2 recovery channel connects to server1 it will fail and
+# retry until the ACL_CACHE lock is released or server3 connects to server2.
+--replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--eval SET GLOBAL group_replication_group_name= "$group_replication_group_name"
+--source include/start_group_replication_command.inc
+
+
+--echo
+--echo ############################################################
+--echo # 4. Wait until the group has 3 members and then resume the
+--echo #    ACL statement.
+--echo #    server3 may be in RECOVERING state but it will be part of
+--echo #    the group.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $group_replication_number_of_members= 3
+--source include/gr_wait_for_number_of_members.inc
+
+--let $rpl_connection_name= server_1
+--source include/rpl_connection.inc
+--reap
+
+
+--echo
+--echo ############################################################
+--echo # 5. Verify that all members data is equal.
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--let $group_replication_member_state = ONLINE
+--source include/gr_wait_for_member_state.inc
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--let $assert_text = GTID_EXECUTED must contain 4 transactions
+--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = "$group_replication_group_name:1-4";
+--source include/assert.inc
+
+--let $event_sequence= $vcle_seq # $vcle_seq # $vcle_seq # Gtid # !Q(CREATE.*)
+--source include/assert_binlog_events.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--let $assert_text = GTID_EXECUTED must contain 4 transactions
+--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = "$group_replication_group_name:1-4";
+--source include/assert.inc
+
+--let $event_sequence= $vcle_seq # $vcle_seq # $vcle_seq # Gtid # !Q(CREATE.*)
+--source include/assert_binlog_events.inc
+
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+
+--let $assert_text = GTID_EXECUTED must contain 4 transactions
+--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = "$group_replication_group_name:1-4";
+--source include/assert.inc
+
+--let $event_sequence= $vcle_seq # $vcle_seq # $vcle_seq # Gtid # !Q(CREATE.*)
+--source include/assert_binlog_events.inc
+
+
+--echo
+--echo ############################################################
+--echo # 6. Clean up.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+DROP USER 'user';
+
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_lower_case_table_names_different.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_lower_case_table_names_different.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_lower_case_table_names_different.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_lower_case_table_names_different.test	2021-09-28 11:46:34.000000000 +0000
@@ -47,6 +47,7 @@
 
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $_group_replication_comm_stack= `SELECT @@GLOBAL.group_replication_communication_stack`
 
 set session sql_log_bin=0;
 call mtr.add_suppression("The member is configured with a lower_case_table_names option value .*");
@@ -59,8 +60,8 @@
 --echo ##     group as the join failed.
 --echo
 
---let $restart_parameters=restart:--group_replication_start_on_boot=1 --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_group_name=$group_replication_group_name --lower_case_table_names=2 --loose-debug="+d,group_replication_wait_before_leave_on_error"
---replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--let $restart_parameters=restart:--group_replication_start_on_boot=1 --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_group_name=$group_replication_group_name --group_replication_communication_stack=$_group_replication_comm_stack --lower_case_table_names=2 --loose-debug="+d,group_replication_wait_before_leave_on_error"
+--replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_group_replication_comm_stack GROUP_REPLICATION_COMMUNICATION_STACK
 --source include/restart_mysqld.inc
 
 #Needed as we are not using rpl_restart_server.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_majority_loss_5_to_2_recovery.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_majority_loss_5_to_2_recovery.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_majority_loss_5_to_2_recovery.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_majority_loss_5_to_2_recovery.test	2021-09-28 11:46:34.000000000 +0000
@@ -35,17 +35,41 @@
 --let $rpl_skip_group_replication_start= 1
 --source include/group_replication.inc
 
+--let $recovery_user= recovery_user
+--let $recovery_password= recovery_password
+
 --let $rpl_connection_name= server1
+
+SET SESSION sql_log_bin= 0;
+--eval CREATE USER "$recovery_user" IDENTIFIED BY "$recovery_password"
+--eval GRANT GROUP_REPLICATION_STREAM ON *.* TO "recovery_user"
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
+
 --source include/rpl_connection.inc
 --source include/start_and_bootstrap_group_replication.inc
 
 --let $rpl_connection_name= server3
 --source include/rpl_connection.inc
+
+SET SESSION sql_log_bin= 0;
+--eval CREATE USER "$recovery_user" IDENTIFIED BY "$recovery_password"
+--eval GRANT GROUP_REPLICATION_STREAM ON *.* TO "recovery_user"
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
+
 --source include/start_group_replication.inc
 --let $member3_uuid= query_get_value(SELECT @@SERVER_UUID, @@SERVER_UUID, 1)
 
 --let $rpl_connection_name= server4
 --source include/rpl_connection.inc
+
+SET SESSION sql_log_bin= 0;
+--eval CREATE USER "$recovery_user" IDENTIFIED BY "$recovery_password"
+--eval GRANT GROUP_REPLICATION_STREAM ON *.* TO "recovery_user"
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
+
 --source include/start_group_replication.inc
 --let $member4_uuid= query_get_value(SELECT @@SERVER_UUID, @@SERVER_UUID, 1)
 
@@ -65,12 +89,11 @@
 --let $rpl_connection_name= server5
 --source include/rpl_connection.inc
 --let $server5_uuid= `SELECT @@GLOBAL.SERVER_UUID`
---let $recovery_user= recovery_user
---let $recovery_password= recovery_password
 
 SET SESSION sql_log_bin= 0;
 --eval CREATE USER "$recovery_user" IDENTIFIED BY "$recovery_password"
 --eval GRANT REPLICATION SLAVE ON *.* TO "$recovery_user"
+--eval GRANT GROUP_REPLICATION_STREAM ON *.* TO "recovery_user"
 FLUSH PRIVILEGES;
 SET SESSION sql_log_bin= 1;
 
@@ -86,6 +109,13 @@
 --echo #    not be able to authenticate on any other member.
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
+
+SET SESSION sql_log_bin= 0;
+--eval CREATE USER "$recovery_user" IDENTIFIED BY "$recovery_password"
+--eval GRANT GROUP_REPLICATION_STREAM ON *.* TO "recovery_user"
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
+
 --let $local_address_server2= `SELECT @@GLOBAL.group_replication_local_address`
 
 --disable_warnings
@@ -239,7 +269,6 @@
 
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
---eval CREATE USER "$recovery_user" IDENTIFIED BY "$recovery_password"
 --eval GRANT REPLICATION SLAVE ON *.* TO "$recovery_user"
 FLUSH PRIVILEGES;
 
@@ -321,7 +350,13 @@
 --let $assert_text= 'There are no values in table t1'
 --let $assert_cond= [SELECT COUNT(*) AS count FROM t1, count, 1] = 0
 --source include/assert.inc
+
+SET SESSION sql_log_bin= 0;
+--eval DROP USER "$recovery_user"
+FLUSH PRIVILEGES;
+
 DROP TABLE t1;
+SET SESSION sql_log_bin= 1;
 
 --let $rpl_connection_name= server_4
 --source include/rpl_connection.inc
@@ -330,7 +365,13 @@
 --let $assert_text= 'There are no values in table t1'
 --let $assert_cond= [SELECT COUNT(*) AS count FROM t1, count, 1] = 0
 --source include/assert.inc
+
+SET SESSION sql_log_bin= 0;
+--eval DROP USER "$recovery_user"
+FLUSH PRIVILEGES;
+
 DROP TABLE t1;
+SET SESSION sql_log_bin= 1;
 
 --let $rpl_connection_name= server_5
 --source include/rpl_connection.inc
@@ -339,20 +380,34 @@
 --let $assert_text= 'There are no values in table t1'
 --let $assert_cond= [SELECT COUNT(*) AS count FROM t1, count, 1] = 0
 --source include/assert.inc
+
+SET SESSION sql_log_bin= 0;
 DROP TABLE t1;
 --eval DROP USER "$recovery_user"
 FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
 
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
 
+SET SESSION sql_log_bin= 0;
 DROP TABLE t1;
 --eval DROP USER "$recovery_user"
 FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
 
 SET SESSION sql_log_bin= 0;
 call mtr.add_suppression("The member lost contact with a majority of the members in the group. Until the network is restored.*");
 call mtr.add_suppression("The member resumed contact with a majority of the members in the group.*");
 SET SESSION sql_log_bin= 1;
 
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+SET SESSION sql_log_bin= 0;
+DROP TABLE t1;
+--eval DROP USER "$recovery_user"
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
+
 --source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_majority_loss_5_to_2.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_majority_loss_5_to_2.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_majority_loss_5_to_2.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_majority_loss_5_to_2.test	2021-09-28 11:46:34.000000000 +0000
@@ -287,4 +287,10 @@
 call mtr.add_suppression("The member resumed contact with a majority of the members in the group.*");
 set session sql_log_bin=1;
 
+--let $rpl_connection_name= server4
+--source include/rpl_connection.inc
+
+--let $rpl_connection_name= server5
+--source include/rpl_connection.inc
+
 --source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_majority_loss_restart_mysql-master.opt mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_majority_loss_restart_mysql-master.opt
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_majority_loss_restart_mysql-master.opt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_majority_loss_restart_mysql-master.opt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1 @@
+--loose-group_replication_communication_stack=MySQL
\ No newline at end of file
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_majority_loss_restart_mysql-slave.opt mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_majority_loss_restart_mysql-slave.opt
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_majority_loss_restart_mysql-slave.opt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_majority_loss_restart_mysql-slave.opt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1 @@
+--loose-group_replication_communication_stack=MySQL
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_majority_loss_restart_mysql.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_majority_loss_restart_mysql.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_majority_loss_restart_mysql.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_majority_loss_restart_mysql.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,22 @@
+################################################################################
+# Validate that when a group looses the majority, if the faulty member tries to
+# rejoin it will be disallowed to unblock the group and user needs to use
+# group_replication_force_members option.
+#
+# 0. Start with 2 servers running GR
+# 1. Crash server 2.
+# 2. Execute a transaction on server 1, which will block
+#    since the group does not have majority.
+# 3. Assert that group is still blocked.
+# 4. Restart server 2 with group_replication_start_on_boot=ON,
+#    server 2 will be refused to join the group.
+# 5. Unblock group with server1 as a single member.
+# 6. Check that statement did unblock and was applied on
+#    server1.
+# 7. Rejoin server2
+# 8. Execute a transaction on both members.
+# 9. Validate data.
+#10. Clean up.
+################################################################################
+
+--source ../include/gr_majority_loss_restart.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_majority_loss_restart.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_majority_loss_restart.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_majority_loss_restart.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_majority_loss_restart.test	2021-09-28 11:46:34.000000000 +0000
@@ -18,178 +18,5 @@
 # 9. Validate data.
 #10. Clean up.
 ################################################################################
-# This test does crashes servers, thence we skip it on valgrind.
---source include/not_valgrind.inc
---source include/big_test.inc
---source include/force_restart.inc
---source include/have_group_replication_plugin.inc
---source include/group_replication.inc
 
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
---let $member1_uuid= query_get_value(SELECT @@SERVER_UUID, @@SERVER_UUID, 1)
---let $member1_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
-
---let $rpl_connection_name= server2
---source include/rpl_connection.inc
---let $member2_uuid= query_get_value(SELECT @@SERVER_UUID, @@SERVER_UUID, 1)
---let $member2_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
---let $member2_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
-
-SET SESSION sql_log_bin= 0;
-call mtr.add_suppression("Timeout on wait for view after joining group");
-call mtr.add_suppression("read failed");
-call mtr.add_suppression("The member was unable to join the group. Local port: *.*");
-call mtr.add_suppression("Error connecting to all peers. Member join failed. Local port: *.*");
-SET SESSION sql_log_bin= 1;
-
-
---echo
---echo ############################################################
---echo # 1. Crash server 2.
---let $rpl_connection_name= server2
---source include/rpl_connection.inc
---enable_reconnect
---exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.2.expect
---shutdown_server 0
---source include/wait_until_disconnected.inc
---source include/wait_until_connected_again.inc
---disable_reconnect
---source include/rpl_reconnect.inc
-
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
-
---let $group_replication_member_state= UNREACHABLE
---let $group_replication_member_id= $member2_uuid
---source include/gr_wait_for_member_state.inc
-
-
---echo
---echo ############################################################
---echo # 2. Execute a transaction on server 1, which will block
---echo #    since the group does not have majority.
---let $rpl_connection_name= server_1
---source include/rpl_connection.inc
-# This transaction will be blocked since group lost its majority.
-# Though it needs to be delivered to the group when unblocked.
---send CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY)
-
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
---let $wait_condition= SELECT PROCESSLIST_STATE="waiting for handler commit" FROM performance_schema.threads WHERE processlist_INFO LIKE "CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY)"
---source include/wait_condition.inc
-
-
---echo
---echo ############################################################
---echo # 3. Assert that group is still blocked.
---let $group_replication_number_of_members= 2
---source include/gr_wait_for_number_of_members.inc
-
---let $assert_text= server 2 is marked as unreachable
---let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_group_members WHERE member_id="$member2_uuid" AND member_state="UNREACHABLE"] = 1
---source include/assert.inc
-
-
---echo
---echo ############################################################
---echo # 4. Restart server 2 with group_replication_start_on_boot=ON,
---echo #    server 2 will be refused to join the group.
---let $rpl_connection_name= server2
---source include/rpl_connection.inc
---let $restart_parameters=restart:--group_replication_local_address=$member2_group_replication_local_address --group_replication_group_seeds=$member2_group_replication_group_seeds --group_replication_start_on_boot=ON --group-replication-group-name=$group_replication_group_name
---replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $member2_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $member2_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
---source include/kill_and_restart_mysqld.inc
-
-# Give it some time to try and fail
---sleep 75
-
---let $rpl_server_number= 2
---source include/rpl_reconnect.inc
---let $group_replication_member_state= OFFLINE
---source include/gr_wait_for_member_state.inc
-
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
---let $assert_text= server 2 is marked as unreachable
---let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_group_members WHERE member_id="$member2_uuid" AND member_state="UNREACHABLE"] = 1
---source include/assert.inc
-
-
---echo
---echo ############################################################
---echo # 5. Unblock group with server1 as a single member.
---let $local_address_server1= `SELECT @@GLOBAL.group_replication_local_address`
---replace_result $local_address_server1 SERVER1_ADDRESS
---eval SET GLOBAL group_replication_force_members= "$local_address_server1"
-
-
---echo
---echo ############################################################
---echo # 6. Check that statement did unblock and was applied on
---echo #    server1.
---let $rpl_connection_name= server_1
---source include/rpl_connection.inc
---reap
-
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
---let $wait_condition= SELECT COUNT(*)=1 FROM information_schema.tables WHERE TABLE_SCHEMA="test" AND TABLE_NAME="t1";
---source include/wait_condition.inc
-
-
---echo
---echo ############################################################
---echo # 7. Rejoin server2
---let $rpl_connection_name= server2
---source include/rpl_connection.inc
-# Ensure that GR is already stopped on server2.
---let $skip_assert_read_only= 1
---source include/stop_group_replication.inc
---source include/start_group_replication.inc
-
-
---echo
---echo ############################################################
---echo # 8. Execute a transaction on both members.
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
-INSERT INTO t1 VALUES (1);
-
---let $rpl_connection_name= server2
---source include/rpl_connection.inc
-INSERT INTO t1 VALUES (2);
-
---source include/rpl_sync.inc
-
-
---echo
---echo ############################################################
---echo # 9. Validate data.
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
---let $assert_text= 'There are two values in table t1'
---let $assert_cond= [SELECT COUNT(*) AS count FROM t1, count, 1] = 2
---source include/assert.inc
---source include/show_binlog_events.inc
-
---let $rpl_connection_name= server2
---source include/rpl_connection.inc
---let $assert_text= 'There are two values in table t1'
---let $assert_cond= [SELECT COUNT(*) AS count FROM t1, count, 1] = 2
---source include/assert.inc
-
---let $binlog_file= LAST
---source include/show_binlog_events.inc
-
---let $diff_tables= server1:test.t1, server2:test.t1
---source include/diff_tables.inc
-
-
---echo
---echo ############################################################
---echo # 10. Clean up.
-DROP TABLE t1;
-
---source include/group_replication_end.inc
+--source ../include/gr_majority_loss_restart.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_member_actions_defaults.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_member_actions_defaults.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_member_actions_defaults.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_member_actions_defaults.test	2021-09-28 11:46:34.000000000 +0000
@@ -14,14 +14,18 @@
 --echo
 --echo ############################################################
 --echo # 1. Validate Group Replication members actions default values.
---let $assert_text= There must be one member action
---let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_group_member_actions] = 1
+--let $assert_text= There must be two member actions
+--let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_group_member_actions] = 2
 --source include/assert.inc
 
 --let $assert_text= mysql_disable_super_read_only_if_primary action default value
 --let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_group_member_actions WHERE name=\'mysql_disable_super_read_only_if_primary\' AND enabled=1 AND type=\'INTERNAL\' AND event=\'AFTER_PRIMARY_ELECTION\' AND priority=1 AND error_handling=\'IGNORE\'] = 1
 --source include/assert.inc
 
+--let $assert_text= mysql_start_failover_channels_if_primary action default value
+--let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_group_member_actions WHERE name=\'mysql_start_failover_channels_if_primary\' AND enabled=1 AND type=\'INTERNAL\' AND event=\'AFTER_PRIMARY_ELECTION\' AND priority=10 AND error_handling=\'CRITICAL\'] = 1
+--source include/assert.inc
+
 --let $assert_text= There must be one GR configuration version
 --let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_group_configuration_version] = 1
 --source include/assert.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_member_actions_enable_disable_errors_1.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_member_actions_enable_disable_errors_1.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_member_actions_enable_disable_errors_1.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_member_actions_enable_disable_errors_1.test	2021-09-28 11:46:34.000000000 +0000
@@ -153,14 +153,18 @@
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
 
---let $assert_text= There must be one member action
---let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_group_member_actions] = 1
+--let $assert_text= There must be two member actions
+--let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_group_member_actions] = 2
 --source include/assert.inc
 
 --let $assert_text= mysql_disable_super_read_only_if_primary action default value
 --let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_group_member_actions WHERE name=\'mysql_disable_super_read_only_if_primary\' AND enabled=1 AND type=\'INTERNAL\' AND event=\'AFTER_PRIMARY_ELECTION\' AND priority=1 AND error_handling=\'IGNORE\'] = 1
 --source include/assert.inc
 
+--let $assert_text= mysql_start_failover_channels_if_primary action default value
+--let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_group_member_actions WHERE name=\'mysql_start_failover_channels_if_primary\' AND enabled=1 AND type=\'INTERNAL\' AND event=\'AFTER_PRIMARY_ELECTION\' AND priority=10 AND error_handling=\'CRITICAL\'] = 1
+--source include/assert.inc
+
 --let $assert_text= There must be one GR configuration version
 --let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_group_configuration_version] = 1
 --source include/assert.inc
@@ -172,14 +176,18 @@
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
 
---let $assert_text= There must be one member action
---let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_group_member_actions] = 1
+--let $assert_text= There must be two member actions
+--let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_group_member_actions] = 2
 --source include/assert.inc
 
 --let $assert_text= mysql_disable_super_read_only_if_primary action default value
 --let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_group_member_actions WHERE name=\'mysql_disable_super_read_only_if_primary\' AND enabled=1 AND type=\'INTERNAL\' AND event=\'AFTER_PRIMARY_ELECTION\' AND priority=1 AND error_handling=\'IGNORE\'] = 1
 --source include/assert.inc
 
+--let $assert_text= mysql_start_failover_channels_if_primary action default value
+--let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_group_member_actions WHERE name=\'mysql_start_failover_channels_if_primary\' AND enabled=1 AND type=\'INTERNAL\' AND event=\'AFTER_PRIMARY_ELECTION\' AND priority=10 AND error_handling=\'CRITICAL\'] = 1
+--source include/assert.inc
+
 --let $assert_text= There must be one GR configuration version
 --let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_group_configuration_version] = 1
 --source include/assert.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_member_actions_error_on_read_on_member_join.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_member_actions_error_on_read_on_member_join.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_member_actions_error_on_read_on_member_join.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_member_actions_error_on_read_on_member_join.test	2021-09-28 11:46:34.000000000 +0000
@@ -23,6 +23,7 @@
 --source include/rpl_connection.inc
 SET SESSION sql_log_bin = 0;
 call mtr.add_suppression("Unable to read the member actions configuration during group membership change. Please check the tables 'mysql.replication_group_member_actions' and 'mysql.replication_group_configuration_version'.");
+call mtr.add_suppression("Unable to read the replication failover channels configuration during group membership change. Please check the tables .*");
 SET SESSION sql_log_bin = 1;
 
 --let $rpl_connection_name= server2
@@ -30,6 +31,7 @@
 SET SESSION sql_log_bin = 0;
 call mtr.add_suppression("Unable to parse the member actions configuration sent by the group on member join.");
 call mtr.add_suppression("The group members were unable to send their member actions configuration. Please check the tables 'mysql.replication_group_member_actions' and 'mysql.replication_group_configuration_version' on all members.");
+call mtr.add_suppression("Unable to parse the replication failover channels configuration sent by the group on member join.");
 SET SESSION sql_log_bin = 1;
 
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_member_actions_error_on_update_on_member_join_lower_version_group.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_member_actions_error_on_update_on_member_join_lower_version_group.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_member_actions_error_on_update_on_member_join_lower_version_group.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_member_actions_error_on_update_on_member_join_lower_version_group.test	2021-09-28 11:46:34.000000000 +0000
@@ -27,6 +27,8 @@
 SET SESSION sql_log_bin = 0;
 call mtr.add_suppression("This member joined a group on which all members do not support member actions, as such it did reset its member configuration to the default one.");
 call mtr.add_suppression("Unable to reset to member actions default configuration on member join. Please check the tables 'mysql.replication_group_member_actions' and 'mysql.replication_group_configuration_version'.");
+call mtr.add_suppression("This member joined a group on which all members do not support replication failover channels integration on Group Replication, as such it did reset its replication failover channels configuration to the default one.");
+call mtr.add_suppression("Unable to reset to replication failover channels default configuration on member join. Please check the tables .*");
 SET SESSION sql_log_bin = 1;
 
 
@@ -102,14 +104,18 @@
 --source include/rpl_connection.inc
 --source include/start_group_replication.inc
 
---let $assert_text= There must be one member action
---let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_group_member_actions] = 1
+--let $assert_text= There must be two member actions
+--let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_group_member_actions] = 2
 --source include/assert.inc
 
 --let $assert_text= mysql_disable_super_read_only_if_primary action default value
 --let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_group_member_actions WHERE name=\'mysql_disable_super_read_only_if_primary\' AND enabled=1 AND type=\'INTERNAL\' AND event=\'AFTER_PRIMARY_ELECTION\' AND priority=1 AND error_handling=\'IGNORE\'] = 1
 --source include/assert.inc
 
+--let $assert_text= mysql_start_failover_channels_if_primary action default value
+--let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_group_member_actions WHERE name=\'mysql_start_failover_channels_if_primary\' AND enabled=1 AND type=\'INTERNAL\' AND event=\'AFTER_PRIMARY_ELECTION\' AND priority=10 AND error_handling=\'CRITICAL\'] = 1
+--source include/assert.inc
+
 --let $assert_text= There must be one GR configuration version
 --let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_group_configuration_version] = 1
 --source include/assert.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_member_actions_join_lower_version_group.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_member_actions_join_lower_version_group.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_member_actions_join_lower_version_group.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_member_actions_join_lower_version_group.test	2021-09-28 11:46:34.000000000 +0000
@@ -24,6 +24,7 @@
 --source include/rpl_connection.inc
 SET SESSION sql_log_bin = 0;
 call mtr.add_suppression("This member joined a group on which all members do not support member actions, as such it did reset its member configuration to the default one.");
+call mtr.add_suppression("This member joined a group on which all members do not support replication failover channels integration on Group Replication, as such it did reset its replication failover channels configuration to the default one.");
 SET SESSION sql_log_bin = 1;
 
 
@@ -67,14 +68,18 @@
 
 --source include/start_group_replication.inc
 
---let $assert_text= There must be one member action
---let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_group_member_actions] = 1
+--let $assert_text= There must be two member actions
+--let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_group_member_actions] = 2
 --source include/assert.inc
 
 --let $assert_text= mysql_disable_super_read_only_if_primary action default value
 --let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_group_member_actions WHERE name=\'mysql_disable_super_read_only_if_primary\' AND enabled=1 AND type=\'INTERNAL\' AND event=\'AFTER_PRIMARY_ELECTION\' AND priority=1 AND error_handling=\'IGNORE\'] = 1
 --source include/assert.inc
 
+--let $assert_text= mysql_start_failover_channels_if_primary action default value
+--let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_group_member_actions WHERE name=\'mysql_start_failover_channels_if_primary\' AND enabled=1 AND type=\'INTERNAL\' AND event=\'AFTER_PRIMARY_ELECTION\' AND priority=10 AND error_handling=\'CRITICAL\'] = 1
+--source include/assert.inc
+
 --let $assert_text= There must be one GR configuration version
 --let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_group_configuration_version] = 1
 --source include/assert.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_member_actions_reset.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_member_actions_reset.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_member_actions_reset.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_member_actions_reset.test	2021-09-28 11:46:34.000000000 +0000
@@ -62,14 +62,18 @@
 
 SELECT group_replication_reset_member_actions();
 
---let $assert_text= There must be one member action
---let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_group_member_actions] = 1
+--let $assert_text= There must be two member actions
+--let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_group_member_actions] = 2
 --source include/assert.inc
 
 --let $assert_text= mysql_disable_super_read_only_if_primary action default value
 --let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_group_member_actions WHERE name=\'mysql_disable_super_read_only_if_primary\' AND enabled=1 AND type=\'INTERNAL\' AND event=\'AFTER_PRIMARY_ELECTION\' AND priority=1 AND error_handling=\'IGNORE\'] = 1
 --source include/assert.inc
 
+--let $assert_text= mysql_start_failover_channels_if_primary action default value
+--let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_group_member_actions WHERE name=\'mysql_start_failover_channels_if_primary\' AND enabled=1 AND type=\'INTERNAL\' AND event=\'AFTER_PRIMARY_ELECTION\' AND priority=10 AND error_handling=\'CRITICAL\'] = 1
+--source include/assert.inc
+
 --let $assert_text= There must be one GR configuration version
 --let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_group_configuration_version] = 1
 --source include/assert.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_member_expel_during_shutdown.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_member_expel_during_shutdown.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_member_expel_during_shutdown.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_member_expel_during_shutdown.test	2021-09-28 11:46:34.000000000 +0000
@@ -32,7 +32,6 @@
 --let $wait_condition=SELECT COUNT(*)=5 FROM performance_schema.replication_group_members where MEMBER_STATE="ONLINE"
 --source include/wait_condition.inc
 
-
 --echo
 --echo ############################################################
 --echo # 2. Crash member 5.
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_multiple_starts_after_clone.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_multiple_starts_after_clone.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_multiple_starts_after_clone.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_multiple_starts_after_clone.test	2021-09-28 11:46:34.000000000 +0000
@@ -51,6 +51,7 @@
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
 --let $_group_replication_start_boot_save= `SELECT @@GLOBAL.group_replication_start_on_boot`
+--let $_group_replication_comm_stack= `SELECT @@GLOBAL.group_replication_communication_stack`
 --let $server2_datadir= `SELECT @@DATADIR`
 
 --let $plugin_list= $GROUP_REPLICATION
@@ -60,6 +61,7 @@
 --eval SET PERSIST group_replication_group_name= "$group_replication_group_name"
 --eval SET PERSIST group_replication_local_address= "$_group_replication_local_address"
 --eval SET PERSIST group_replication_group_seeds= "$_group_replication_group_seeds"
+--eval SET PERSIST group_replication_communication_stack= "$_group_replication_comm_stack"
 SET PERSIST group_replication_start_on_boot= ON;
 --enable_query_log
 
@@ -187,6 +189,7 @@
 RESET PERSIST group_replication_local_address;
 RESET PERSIST group_replication_group_seeds;
 RESET PERSIST group_replication_start_on_boot;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 
 --replace_result $_group_replication_threshold_save GROUP_REPLICATION_CLONE_THRESHOLD
 --eval SET GLOBAL group_replication_clone_threshold= $_group_replication_threshold_save
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_no_user_start_failure.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_no_user_start_failure.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_no_user_start_failure.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_no_user_start_failure.test	2021-09-28 11:46:34.000000000 +0000
@@ -24,6 +24,12 @@
 #save user timestamps for later restore
 let $date_to_restore=`SELECT password_last_changed from mysql.user where user='mysql.session'`;
 let $date_to_restore_priv=`SELECT timestamp from mysql.tables_priv where user='mysql.session'`;
+USE test;
+CREATE TABLE test.tmp_user AS SELECT * FROM mysql.user;
+INSERT INTO tmp_user SELECT * FROM mysql.user;
+
+CREATE TABLE tmp_global_grants AS SELECT * FROM mysql.global_grants;
+INSERT INTO tmp_global_grants SELECT * FROM mysql.global_grants;
 
 DROP USER "mysql.session"@"localhost";
 
@@ -67,7 +73,15 @@
 --echo #
 
 --disable_query_log
---eval INSERT IGNORE INTO mysql.user VALUES ('localhost','mysql.session','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','','','','',0,0,0,0,'mysql_native_password','*THISISNOTAVALIDPASSWORDTHATCANBEUSEDHERE','N',"$date_to_restore",NULL,'Y', 'N', 'N', NULL, NULL, NULL, NULL);
+--disable_result_log
+TRUNCATE TABLE mysql.user;
+INSERT IGNORE INTO mysql.user SELECT * FROM tmp_user;
+DROP TABLE tmp_user;
+
+TRUNCATE TABLE mysql.global_grants;
+INSERT IGNORE INTO mysql.global_grants SELECT * FROM tmp_global_grants;
+DROP TABLE tmp_global_grants;
+--enable_result_log
 
 --eval INSERT IGNORE INTO mysql.tables_priv VALUES ('localhost', 'mysql', 'mysql.session', 'user', 'root\@localhost', "$date_to_restore_priv", 'Select', '');
 
@@ -87,4 +101,13 @@
 call mtr.add_suppression("On plugin shutdown it was not possible to reset the server read mode settings.");
 SET SESSION sql_log_bin= 1;
 
+--let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
+--let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_start_on_boot=0 --group_replication_group_name=$group_replication_group_name
+--replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--source include/restart_mysqld.inc
+--let $rpl_server_number= 1
+--source include/rpl_reconnect.inc
+
+
 --source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_parallel_start_uninstall.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_parallel_start_uninstall.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_parallel_start_uninstall.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_parallel_start_uninstall.test	2021-09-28 11:46:34.000000000 +0000
@@ -12,6 +12,7 @@
 # 6. Cleanup.
 ################################################################################
 --source include/have_debug_sync.inc
+--source include/have_group_replication_xcom_communication_stack.inc
 --source include/have_group_replication_plugin.inc
 --let $rpl_skip_group_replication_start= 1
 --source include/group_replication.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_perfschema_group_communication_information.cnf mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_perfschema_group_communication_information.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_perfschema_group_communication_information.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_perfschema_group_communication_information.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,7 @@
+!include ../my.cnf
+
+[mysqld.1]
+group_replication_paxos_single_leader = 1
+
+[mysqld.2]
+group_replication_paxos_single_leader = 1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_perfschema_group_communication_information.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_perfschema_group_communication_information.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_perfschema_group_communication_information.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_perfschema_group_communication_information.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,163 @@
+################################################################################
+# WL #9149
+#
+# This test checks the basic functionality of the Group Replication
+# performance_schema.replication_group_communication_information table.
+#
+# Test:
+#  0) The test uses 2 servers: M1 and M2. Confirm the table is empty before
+#     starting Group Replication. M1 bootstraps the group in single-primary
+#     mode.
+#  1) Confirm the preferred consensus leader is the PRIMARY.
+#  2) Switch to multi-primary mode. Confirm everyone is a preferred consensus
+#     leader.
+#  3) Confirm write_concurrency matches the result of
+#     group_replication_get_write_concurrency.
+#  4) Confirm protocol_version matches the result of
+#     group_replication_get_communication_protocol.
+#  5) Switch to single-primary mode. Switch communication_protocol to 8.0.21.
+#     Confirm everyone is a preferred consensus leader even in single-primary
+#     mode.
+#  6) Cleanup.
+################################################################################
+--source include/have_group_replication_plugin.inc
+--let $rpl_server_count= 2
+--let $rpl_skip_group_replication_start= 1
+--let $rpl_group_replication_single_primary_mode= 1
+--source include/group_replication.inc
+
+--echo #########################################################################
+--echo # 0) The test uses 2 servers: M1 and M2. Confirm the table is empty
+--echo #    before starting Group Replication. M1 bootstraps the group in
+--echo #    single-primary mode.
+--let $assert_text= The performance_schema.replication_group_communication_information table should be empty
+--let $assert_cond= "[SELECT COUNT(*) FROM performance_schema.replication_group_communication_information]" = "0"
+--source include/assert.inc
+
+--source include/start_and_bootstrap_group_replication.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--source include/start_group_replication.inc
+
+--echo ########################################################################
+--echo # 1) Confirm the preferred consensus leader is the PRIMARY.
+--let $preferred_leader_uuid= query_get_value(SELECT write_consensus_leaders_preferred FROM performance_schema.replication_group_communication_information, write_consensus_leaders_preferred, 1)
+--let $primary_uuid= query_get_value(SELECT member_id FROM performance_schema.replication_group_members WHERE member_role = "PRIMARY", member_id, 1)
+--let $assert_text= The UUID of the PRIMARY member should match the UUID of the preferred consensus leader
+--let $assert_cond= "$primary_uuid" = "$preferred_leader_uuid"
+--source include/assert.inc
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--let $preferred_leader_uuid= query_get_value(SELECT write_consensus_leaders_preferred FROM performance_schema.replication_group_communication_information, write_consensus_leaders_preferred, 1)
+--let $primary_uuid= query_get_value(SELECT member_id FROM performance_schema.replication_group_members WHERE member_role = "PRIMARY", member_id, 1)
+--let $assert_text= The UUID of the PRIMARY member should match the UUID of the preferred consensus leader
+--let $assert_cond= "$primary_uuid" = "$preferred_leader_uuid"
+--source include/assert.inc
+
+--echo ########################################################################
+--echo # 2) Switch to multi-primary mode, confirm everyone is a preferred
+--echo #    consensus leader.
+SELECT group_replication_switch_to_multi_primary_mode();
+
+--let $preferred_leader_uuids= query_get_value(SELECT write_consensus_leaders_preferred FROM performance_schema.replication_group_communication_information, write_consensus_leaders_preferred, 1)
+--let $primary_uuid_1= query_get_value(SELECT member_id FROM performance_schema.replication_group_members WHERE member_role = "PRIMARY", member_id, 1)
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_communication_information WHERE write_consensus_leaders_preferred LIKE "%$primary_uuid_1%"
+--source include/wait_condition_or_abort.inc
+--let $primary_uuid_2= query_get_value(SELECT member_id FROM performance_schema.replication_group_members WHERE member_role = "PRIMARY", member_id, 2)
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_communication_information WHERE write_consensus_leaders_preferred LIKE "%$primary_uuid_2%"
+--source include/wait_condition_or_abort.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--let $preferred_leader_uuids= query_get_value(SELECT write_consensus_leaders_preferred FROM performance_schema.replication_group_communication_information, write_consensus_leaders_preferred, 1)
+--let $primary_uuid_1= query_get_value(SELECT member_id FROM performance_schema.replication_group_members WHERE member_role = "PRIMARY", member_id, 1)
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_communication_information WHERE write_consensus_leaders_preferred LIKE "%$primary_uuid_1%"
+--source include/wait_condition_or_abort.inc
+--let $primary_uuid_2= query_get_value(SELECT member_id FROM performance_schema.replication_group_members WHERE member_role = "PRIMARY", member_id, 2)
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_communication_information WHERE write_consensus_leaders_preferred LIKE "%$primary_uuid_2%"
+--source include/wait_condition_or_abort.inc
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--echo ########################################################################
+--echo # 3) Confirm write_concurrency matches the result of
+--echo #    group_replication_get_write_concurrency.
+--let $write_concurrency_udf= `SELECT group_replication_get_write_concurrency()`
+--let $write_concurrency_table= query_get_value(SELECT write_concurrency FROM performance_schema.replication_group_communication_information, write_concurrency, 1)
+--let $assert_text= write_concurrency ($write_concurrency_table) should be $write_concurrency_udf
+--let $assert_cond= "$write_concurrency_table" = "$write_concurrency_udf"
+--source include/assert.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--let $write_concurrency_udf= `SELECT group_replication_get_write_concurrency()`
+--let $write_concurrency_table= query_get_value(SELECT write_concurrency FROM performance_schema.replication_group_communication_information, write_concurrency, 1)
+--let $assert_text= write_concurrency ($write_concurrency_table) should be $write_concurrency_udf
+--let $assert_cond= "$write_concurrency_table" = "$write_concurrency_udf"
+--source include/assert.inc
+
+
+--echo ########################################################################
+--echo # 4) Confirm protocol_version matches the result of
+--echo #    group_replication_get_communication_protocol.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--let $communication_protocol_udf= `SELECT group_replication_get_communication_protocol()`
+--let $communication_protocol_table= query_get_value(SELECT protocol_version FROM performance_schema.replication_group_communication_information, protocol_version, 1)
+--let $assert_text= protocol_version ($communication_protocol_table) should be $communication_protocol_udf
+--let $assert_cond= "$communication_protocol_table" = "$communication_protocol_udf"
+--source include/assert.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--let $communication_protocol_udf= `SELECT group_replication_get_communication_protocol()`
+--let $communication_protocol_table= query_get_value(SELECT protocol_version FROM performance_schema.replication_group_communication_information, protocol_version, 1)
+--let $assert_text= protocol_version ($communication_protocol_table) should be $communication_protocol_udf
+--let $assert_cond= "$communication_protocol_table" = "$communication_protocol_udf"
+--source include/assert.inc
+
+--echo ########################################################################
+--echo # 5) Switch to single-primary mode. Switch communication_protocol to
+--echo #    8.0.21. Confirm everyone is a preferred consensus leader even in
+--echo #    single-primary
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+SELECT group_replication_switch_to_single_primary_mode();
+SELECT group_replication_set_communication_protocol("8.0.21");
+
+--let $preferred_leader_uuids= query_get_value(SELECT write_consensus_leaders_preferred FROM performance_schema.replication_group_communication_information, write_consensus_leaders_preferred, 1)
+--let $member_uuid_1= $primary_uuid_1
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_communication_information WHERE write_consensus_leaders_preferred LIKE "%$member_uuid_1%"
+--source include/wait_condition.inc
+--let $member_uuid_2= $primary_uuid_2
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_communication_information WHERE write_consensus_leaders_preferred LIKE "%$member_uuid_2%"
+--source include/wait_condition_or_abort.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--let $preferred_leader_uuids= query_get_value(SELECT write_consensus_leaders_preferred FROM performance_schema.replication_group_communication_information, write_consensus_leaders_preferred, 1)
+--let $member_uuid_1= $primary_uuid_1
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_communication_information WHERE write_consensus_leaders_preferred LIKE "%$member_uuid_1%"
+--source include/wait_condition_or_abort.inc
+--let $member_uuid_2= $primary_uuid_2
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_group_communication_information WHERE write_consensus_leaders_preferred LIKE "%$member_uuid_2%"
+--source include/wait_condition_or_abort.inc
+
+--echo ########################################################################
+--echo # 6) Cleanup.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--let $rpl_group_replication_reset_persistent_vars= 1
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_perfschema_group_member_stats_additional_columns.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_perfschema_group_member_stats_additional_columns.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_perfschema_group_member_stats_additional_columns.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_perfschema_group_member_stats_additional_columns.test	2021-09-28 11:46:34.000000000 +0000
@@ -55,7 +55,7 @@
 ## Member join adds to remote applied
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
---let $wait_condition= SELECT COUNT_TRANSACTIONS_REMOTE_APPLIED = 3 from performance_schema.replication_group_member_stats where member_id='$server2_uuid';
+--let $wait_condition= SELECT COUNT_TRANSACTIONS_REMOTE_APPLIED = 4 from performance_schema.replication_group_member_stats where member_id='$server2_uuid';
 --source include/wait_condition.inc
 
 ## Assert COUNT_TRANSACTIONS_REMOTE_APPLIED is 0 on server 1
@@ -63,10 +63,10 @@
 --let $assert_text= 'The value of COUNT_TRANSACTIONS_REMOTE_APPLIED should be 0 on server 1'
 --let $assert_cond= $transaction_remote_applied_1= 0
 --source include/assert.inc
-## Assert COUNT_TRANSACTIONS_REMOTE_APPLIED is 3 on server 2
+## Assert COUNT_TRANSACTIONS_REMOTE_APPLIED is 4 on server 2
 --let $transaction_remote_applied_2= query_get_value(SELECT COUNT_TRANSACTIONS_REMOTE_APPLIED FROM performance_schema.replication_group_member_stats where member_id='$server2_uuid', COUNT_TRANSACTIONS_REMOTE_APPLIED, 1)
---let $assert_text= 'The value of COUNT_TRANSACTIONS_REMOTE_APPLIED should be 3 on server 2'
---let $assert_cond= $transaction_remote_applied_2= 3
+--let $assert_text= 'The value of COUNT_TRANSACTIONS_REMOTE_APPLIED should be 4 on server 2'
+--let $assert_cond= $transaction_remote_applied_2= 4
 --source include/assert.inc
 
 ## Assert COUNT_TRANSACTIONS_LOCAL_PROPOSED is 2 on server 1
@@ -92,10 +92,10 @@
 --let $assert_text= 'The value of COUNT_TRANSACTIONS_REMOTE_APPLIED should be 0 on server 1'
 --let $assert_cond= $transaction_remote_applied_1= 0
 --source include/assert.inc
-## Assert COUNT_TRANSACTIONS_REMOTE_APPLIED is 3 on server 2
+## Assert COUNT_TRANSACTIONS_REMOTE_APPLIED is 4 on server 2
 --let $transaction_remote_applied_2= query_get_value(SELECT COUNT_TRANSACTIONS_REMOTE_APPLIED FROM performance_schema.replication_group_member_stats where member_id='$server2_uuid', COUNT_TRANSACTIONS_REMOTE_APPLIED, 1)
---let $assert_text= 'The value of COUNT_TRANSACTIONS_REMOTE_APPLIED should be 3 on server 2'
---let $assert_cond= $transaction_remote_applied_2= 3
+--let $assert_text= 'The value of COUNT_TRANSACTIONS_REMOTE_APPLIED should be 4 on server 2'
+--let $assert_cond= $transaction_remote_applied_2= 4
 --source include/assert.inc
 
 ## Assert COUNT_TRANSACTIONS_LOCAL_PROPOSED is 2 on server 1
@@ -141,7 +141,7 @@
 ## Else assert will fail for remote member assert checks
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
---let $wait_condition= SELECT COUNT_TRANSACTIONS_REMOTE_APPLIED = 4 from performance_schema.replication_group_member_stats where member_id='$server2_uuid';
+--let $wait_condition= SELECT COUNT_TRANSACTIONS_REMOTE_APPLIED = 5 from performance_schema.replication_group_member_stats where member_id='$server2_uuid';
 --source include/wait_condition.inc
 
 ############################################################
@@ -153,10 +153,10 @@
 --let $assert_text= 'The value of COUNT_TRANSACTIONS_REMOTE_APPLIED should be 0 on server 1'
 --let $assert_cond= $transaction_remote_applied_2_1= 0
 --source include/assert.inc
-## Assert COUNT_TRANSACTIONS_REMOTE_APPLIED is 4 on server 2
+## Assert COUNT_TRANSACTIONS_REMOTE_APPLIED is 5 on server 2
 --let $transaction_remote_applied_2_2= query_get_value(SELECT COUNT_TRANSACTIONS_REMOTE_APPLIED FROM performance_schema.replication_group_member_stats where member_id='$server2_uuid', COUNT_TRANSACTIONS_REMOTE_APPLIED, 1)
---let $assert_text= 'The value of COUNT_TRANSACTIONS_REMOTE_APPLIED should be 4 on server 2'
---let $assert_cond= $transaction_remote_applied_2_2= 4
+--let $assert_text= 'The value of COUNT_TRANSACTIONS_REMOTE_APPLIED should be 5 on server 2'
+--let $assert_cond= $transaction_remote_applied_2_2= 5
 --source include/assert.inc
 
 ## Assert COUNT_TRANSACTIONS_LOCAL_PROPOSED is 4 on server 1
@@ -202,10 +202,10 @@
 --let $assert_text= 'The value of COUNT_TRANSACTIONS_REMOTE_APPLIED should be 0 on server 1'
 --let $assert_cond= $_transaction_remote_applied_= 0
 --source include/assert.inc
-## Assert COUNT_TRANSACTIONS_REMOTE_APPLIED is 4 on server 2
+## Assert COUNT_TRANSACTIONS_REMOTE_APPLIED is 5 on server 2
 --let $_transaction_remote_applied_= query_get_value(SELECT COUNT_TRANSACTIONS_REMOTE_APPLIED FROM performance_schema.replication_group_member_stats where member_id='$server2_uuid', COUNT_TRANSACTIONS_REMOTE_APPLIED, 1)
---let $assert_text= 'The value of COUNT_TRANSACTIONS_REMOTE_APPLIED should be 4 on server 2'
---let $assert_cond= $_transaction_remote_applied_= 4
+--let $assert_text= 'The value of COUNT_TRANSACTIONS_REMOTE_APPLIED should be 5 on server 2'
+--let $assert_cond= $_transaction_remote_applied_= 5
 --source include/assert.inc
 
 ## Assert COUNT_TRANSACTIONS_LOCAL_PROPOSED is 4 on server 1
@@ -344,10 +344,10 @@
 --let $assert_text= 'The value of COUNT_TRANSACTIONS_REMOTE_APPLIED should be 10 on server 1'
 --let $assert_cond= $transaction_remote_applied_4_1= 10
 --source include/assert.inc
-## Assert COUNT_TRANSACTIONS_REMOTE_APPLIED is 4 on server 2
+## Assert COUNT_TRANSACTIONS_REMOTE_APPLIED is 5 on server 2
 --let $transaction_remote_applied_4_2= query_get_value(SELECT COUNT_TRANSACTIONS_REMOTE_APPLIED FROM performance_schema.replication_group_member_stats where member_id='$server2_uuid', COUNT_TRANSACTIONS_REMOTE_APPLIED, 1)
---let $assert_text= 'The value of COUNT_TRANSACTIONS_REMOTE_APPLIED should be 4 on server 2'
---let $assert_cond= $transaction_remote_applied_4_2= 4
+--let $assert_text= 'The value of COUNT_TRANSACTIONS_REMOTE_APPLIED should be 5 on server 2'
+--let $assert_cond= $transaction_remote_applied_4_2= 5
 --source include/assert.inc
 
 ## Assert COUNT_TRANSACTIONS_LOCAL_PROPOSED is 4 on server 1
@@ -393,9 +393,6 @@
 --let $wait_condition= SELECT COUNT_TRANSACTIONS_REMOTE_APPLIED = 10 from performance_schema.replication_group_member_stats where member_id='$server1_uuid';
 --source include/wait_condition.inc
 
-#--let $wait_condition= SELECT COUNT_TRANSACTIONS_REMOTE_APPLIED = 4 from performance_schema.replication_group_member_stats where member_id='$server2_uuid';
-#--source include/wait_condition.inc
-
 
 ## Assert COUNT_TRANSACTIONS_REMOTE_IN_APPLIER_QUEUE is 0 on server 1
 --let $transaction_remote_in_applier_queue_5_1= query_get_value(SELECT COUNT_TRANSACTIONS_REMOTE_IN_APPLIER_QUEUE FROM performance_schema.replication_group_member_stats where member_id='$server1_uuid', COUNT_TRANSACTIONS_REMOTE_IN_APPLIER_QUEUE, 1)
@@ -413,10 +410,10 @@
 --let $assert_text= 'The value of COUNT_TRANSACTIONS_REMOTE_APPLIED should be 10 on server 1'
 --let $assert_cond= $transaction_remote_applied_5_1= 10
 --source include/assert.inc
-## Assert COUNT_TRANSACTIONS_REMOTE_APPLIED is 4 on server 2
+## Assert COUNT_TRANSACTIONS_REMOTE_APPLIED is 5 on server 2
 --let $transaction_remote_applied_5_2= query_get_value(SELECT COUNT_TRANSACTIONS_REMOTE_APPLIED FROM performance_schema.replication_group_member_stats where member_id='$server2_uuid', COUNT_TRANSACTIONS_REMOTE_APPLIED, 1)
---let $assert_text= 'The value of COUNT_TRANSACTIONS_REMOTE_APPLIED should be 4 on server 2'
---let $assert_cond= $transaction_remote_applied_5_2= 4
+--let $assert_text= 'The value of COUNT_TRANSACTIONS_REMOTE_APPLIED should be 5 on server 2'
+--let $assert_cond= $transaction_remote_applied_5_2= 5
 --source include/assert.inc
 
 ## Assert COUNT_TRANSACTIONS_LOCAL_PROPOSED is 4 on server 1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_perfschema-master.opt mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_perfschema-master.opt
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_perfschema-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_perfschema-master.opt	2021-09-28 11:46:34.000000000 +0000
@@ -1 +1,2 @@
 --force-restart
+--replica-parallel-workers=0
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_perfschema-slave.opt mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_perfschema-slave.opt
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_perfschema-slave.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_perfschema-slave.opt	2021-09-28 11:46:34.000000000 +0000
@@ -1 +1,2 @@
 --force-restart
+--replica-parallel-workers=0
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_perfschema.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_perfschema.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_perfschema.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_perfschema.test	2021-09-28 11:46:34.000000000 +0000
@@ -20,7 +20,6 @@
 # 8. Test end.
 ################################################################################
 
---source include/not_mts_replica_parallel_workers.inc
 --let $group_replication_group_name= 8a94f357-aab4-11df-86ab-c80aa9429444
 --source include/not_have_privilege_checks_user.inc
 --source include/have_group_replication_plugin.inc
@@ -83,8 +82,9 @@
 --let $assert_cond= COUNT(*) = 1 FROM performance_schema.replication_applier_status WHERE channel_name = "group_replication_applier"
 --source include/assert.inc
 
+# Even if worker number is set to 0, since GR channels use GTID_ONLY there is always at least one worker active
 --let $assert_text= 'There is no Group Replication applier channel on performance_schema.replication_applier_status_by_coordinator table'
---let $assert_cond= COUNT(*) = 0 FROM performance_schema.replication_applier_status_by_coordinator WHERE channel_name = "group_replication_applier"
+--let $assert_cond= COUNT(*) = 1 FROM performance_schema.replication_applier_status_by_coordinator WHERE channel_name = "group_replication_applier"
 --source include/assert.inc
 
 --let $assert_text= 'There is a Group Replication applier channel on performance_schema.replication_applier_status_by_worker table'
@@ -112,6 +112,10 @@
 --source include/wait_condition.inc
 
 --echo #group_replication_recovery channel configuration
+--let $group_replication_ca= `SELECT @@group_replication_recovery_ssl_ca`
+--let $group_replication_cert= `SELECT @@group_replication_recovery_ssl_cert`
+--let $group_replication_ssl_key= `SELECT @@group_replication_recovery_ssl_key`
+--replace_result $group_replication_ssl_key KEY $group_replication_cert CERT $group_replication_ca CA
 --query_vertical SELECT * FROM performance_schema.replication_connection_configuration WHERE channel_name LIKE "group_replication_recovery"
 
 --echo #group_replication_applier channel configuration
@@ -128,6 +132,7 @@
 --query_vertical SELECT * FROM performance_schema.replication_applier_status WHERE channel_name = "group_replication_applier"
 
 --echo
+--replace_column 2 [THREAD_ID] 7 [LAST_PROCESSED_TRANSACTION] 8 [ORIGINAL_COMMIT_TIMESTAMP] 9 [IMMEDIATE_COMMIT_TIMESTAMP] 10 [START_BUFFER_TIMESTAMP] 11 [END_BUFFER_TIMESTAMP]
 --query_vertical SELECT * FROM performance_schema.replication_applier_status_by_coordinator WHERE channel_name = "group_replication_applier"
 
 --echo
@@ -169,7 +174,7 @@
 --source include/assert.inc
 
 --let $assert_text= 'There is still no Group Replication applier channel on performance_schema.replication_applier_status_by_coordinator table'
---let $assert_cond= COUNT(*) = 0 FROM performance_schema.replication_applier_status_by_coordinator WHERE channel_name = "group_replication_applier"
+--let $assert_cond= COUNT(*) = 1 FROM performance_schema.replication_applier_status_by_coordinator WHERE channel_name = "group_replication_applier"
 --source include/assert.inc
 
 --let $assert_text= 'There is still a Group Replication applier channel on performance_schema.replication_applier_status_by_worker table'
@@ -183,6 +188,10 @@
 --echo #    on common replication P_S tables.
 
 --echo #group_replication_recovery channel configuration
+--let $group_replication_ca= `SELECT @@group_replication_recovery_ssl_ca`
+--let $group_replication_cert= `SELECT @@group_replication_recovery_ssl_cert`
+--let $group_replication_ssl_key= `SELECT @@group_replication_recovery_ssl_key`
+--replace_result $group_replication_ssl_key KEY $group_replication_cert CERT $group_replication_ca CA
 --query_vertical SELECT * FROM performance_schema.replication_connection_configuration WHERE channel_name LIKE "group_replication_recovery"
 
 --echo #group_replication_applier channel configuration
@@ -199,6 +208,7 @@
 --query_vertical SELECT * FROM performance_schema.replication_applier_status WHERE channel_name = "group_replication_applier"
 
 --echo
+--replace_column 2 [THREAD_ID] 7 [LAST_PROCESSED_TRANSACTION] 8 [ORIGINAL_COMMIT_TIMESTAMP] 9 [IMMEDIATE_COMMIT_TIMESTAMP] 10 [START_BUFFER_TIMESTAMP] 11 [END_BUFFER_TIMESTAMP]
 --query_vertical SELECT * FROM performance_schema.replication_applier_status_by_coordinator WHERE channel_name = "group_replication_applier"
 
 --echo
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_persist_only_variables.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_persist_only_variables.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_persist_only_variables.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_persist_only_variables.test	2021-09-28 11:46:34.000000000 +0000
@@ -11,6 +11,7 @@
 # 4. Clean up.
 ################################################################################
 --source include/big_test.inc
+--source include/have_group_replication_xcom_communication_stack.inc
 --source include/have_group_replication_plugin.inc
 --let $rpl_skip_group_replication_start= 1
 --source include/group_replication.inc
@@ -90,7 +91,7 @@
 --source include/assert.inc
 
 #  TODO: Update this once Bug#27322592 is FIXED.
---let $persisted_variables = 49
+--let $persisted_variables = 50
 --let $assert_text= 'Expect $persisted_variables persisted variables with matching persisted and global values.'
 --let $assert_cond= [SELECT COUNT(*) as count FROM performance_schema.variables_info vi JOIN performance_schema.persisted_variables pv JOIN performance_schema.global_variables gv ON vi.variable_name=pv.variable_name AND vi.variable_name=gv.variable_name AND pv.variable_value=gv.variable_value WHERE vi.variable_source="PERSISTED", count, 1] = $persisted_variables
 --source include/assert.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_persist_variables.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_persist_variables.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_persist_variables.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_persist_variables.test	2021-09-28 11:46:34.000000000 +0000
@@ -11,6 +11,7 @@
 # 4. Clean up.
 ################################################################################
 --source include/big_test.inc
+--source include/have_group_replication_xcom_communication_stack.inc
 --source include/have_group_replication_plugin.inc
 --let $rpl_skip_group_replication_start= 1
 --source include/group_replication.inc
@@ -57,7 +58,6 @@
 --let $assert_cond= [SELECT COUNT(*) as count FROM performance_schema.persisted_variables, count, 1] = $countvars
 --source include/assert.inc
 
-
 --echo
 --echo ############################################################
 --echo # 2. Restart server, it must bootstrap the group and preserve
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_plugin_components_stop_timeout.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_plugin_components_stop_timeout.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_plugin_components_stop_timeout.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_plugin_components_stop_timeout.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,7 +17,7 @@
 --let $rpl_skip_group_replication_start= 1
 --source include/group_replication.inc
 
---let $debug_save_timeout= `SELECT @@GLOBAL.group_replication_components_stop_timeout`
+SET @group_replication_components_stop_timeout_save = @@GLOBAL.group_replication_components_stop_timeout;
 
 --eval SET GLOBAL group_replication_group_name= "$group_replication_group_name"
 
@@ -68,5 +68,5 @@
 --let $assert_cond= "[SELECT @@GLOBAL.group_replication_components_stop_timeout]" = 3153
 --source include/assert.inc
 
---eval SET GLOBAL group_replication_components_stop_timeout= $debug_save_timeout
+SET GLOBAl group_replication_components_stop_timeout = @group_replication_components_stop_timeout_save;
 --source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_primary_failover_consistency_cmd_not_hold.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_primary_failover_consistency_cmd_not_hold.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_primary_failover_consistency_cmd_not_hold.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_primary_failover_consistency_cmd_not_hold.test	2021-09-28 11:46:34.000000000 +0000
@@ -54,6 +54,56 @@
 
 SHOW GLOBAL VARIABLES LIKE 'group_replication_consistency';
 
+--disable_result_log
+SHOW PROCESSLIST;
+
+SHOW STATUS;
+
+SHOW ENGINE INNODB LOGS;
+
+SHOW ENGINE INNODB STATUS;
+
+SHOW ENGINE INNODB MUTEX;
+
+SHOW MASTER STATUS;
+
+SHOW REPLICA STATUS;
+
+SHOW CHARACTER SET;
+
+SHOW COLLATION;
+
+SHOW BINARY LOGS;
+
+SHOW OPEN TABLES;
+
+SHOW REPLICAS;
+
+SHOW BINLOG EVENTS;
+
+SHOW WARNINGS;
+
+SHOW ERRORS;
+
+SHOW ENGINES;
+
+SHOW PRIVILEGES;
+
+SHOW PROCEDURE STATUS;
+
+SHOW FUNCTION STATUS;
+
+SHOW PLUGINS;
+
+SHOW EVENTS;
+
+SHOW PROFILE;
+
+SHOW PROFILES;
+
+SHOW RELAYLOG EVENTS;
+--enable_result_log
+
 --echo
 --echo # 3. Validate SQL command SET will not block
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_24.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_24.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_24.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_24.test	2021-09-28 11:46:34.000000000 +0000
@@ -31,6 +31,9 @@
 --source include/rpl_connection.inc
 --let $server2_uuid= query_get_value(SELECT @@SERVER_UUID, @@SERVER_UUID, 1)
 
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+
 --echo
 --echo # 2. Execute switch to single primary mode
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_26.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_26.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_26.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_26.test	2021-09-28 11:46:34.000000000 +0000
@@ -236,6 +236,11 @@
 
 DROP TABLE t1;
 
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+DROP TABLE t1;
+
 --let $rpl_group_replication_single_primary_mode=1
 --let $rpl_group_replication_reset_persistent_vars=1
 --source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_27.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_27.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_27.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_27.test	2021-09-28 11:46:34.000000000 +0000
@@ -115,9 +115,10 @@
 
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $_group_replication_comm_stack= `SELECT @@GLOBAL.group_replication_communication_stack`
 
---replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
---let $restart_parameters=restart:--group-replication-start-on-boot=0 --group-replication-group-name=$group_replication_group_name --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds  --group_replication_single_primary_mode=TRUE --group_replication_enforce_update_everywhere_checks=FALSE
+--replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_group_replication_comm_stack GROUP_REPLICATION_COMMUNICATION_STACK
+--let $restart_parameters=restart:--group-replication-start-on-boot=0 --group-replication-group-name=$group_replication_group_name --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds  --group_replication_single_primary_mode=TRUE --group_replication_enforce_update_everywhere_checks=FALSE --group_replication_communication_stack=$_group_replication_comm_stack
 --source include/kill_and_restart_mysqld.inc
 
 --let $rpl_server_number= 3
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_28.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_28.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_28.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_28.test	2021-09-28 11:46:34.000000000 +0000
@@ -181,6 +181,14 @@
 
 DROP TABLE t1;
 
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+DROP TABLE t1;
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
 set session sql_log_bin=0;
 call mtr.add_suppression("Error while executing a group configuration operation: The appointed primary for election left the group, this operation will be aborted.*");
 set session sql_log_bin=1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_30.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_30.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_30.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_30.test	2021-09-28 11:46:34.000000000 +0000
@@ -105,9 +105,10 @@
 
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $_group_replication_comm_stack= `SELECT @@GLOBAL.group_replication_communication_stack`
 
---replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
---let $restart_parameters=restart:--group-replication-start-on-boot=0 --group-replication-group-name=$group_replication_group_name --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds  --group_replication_single_primary_mode=TRUE --group_replication_enforce_update_everywhere_checks=FALSE
+--replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_group_replication_comm_stack GROUP_REPLICATION_COMMUNICATION_STACK
+--let $restart_parameters=restart:--group-replication-start-on-boot=0 --group-replication-group-name=$group_replication_group_name --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds  --group_replication_single_primary_mode=TRUE --group_replication_enforce_update_everywhere_checks=FALSE --group_replication_communication_stack=$_group_replication_comm_stack
 --source include/kill_and_restart_mysqld.inc
 
 --let $rpl_server_number= 3
@@ -141,6 +142,11 @@
 
 DROP TABLE t1;
 
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+
+DROP TABLE t1;
+
 --let $rpl_group_replication_single_primary_mode=1
 --let $rpl_group_replication_reset_persistent_vars=1
 --source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_31.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_31.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_31.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_31.test	2021-09-28 11:46:34.000000000 +0000
@@ -37,10 +37,12 @@
 
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
+
 --source include/start_group_replication.inc
 
 --let $rpl_connection_name= server3
 --source include/rpl_connection.inc
+
 --source include/start_group_replication.inc
 
 --echo
@@ -118,5 +120,12 @@
 
 DROP TABLE t1;
 
+--let $rpl_connection_name= server_3
+--source include/rpl_connection.inc
+DROP TABLE t1;
+
+--let $rpl_connection_name= server_2
+--source include/rpl_connection.inc
+
 --let $rpl_group_replication_reset_persistent_vars=1
 --source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_concurrent_member_shutdown.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_concurrent_member_shutdown.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_concurrent_member_shutdown.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_concurrent_member_shutdown.test	2021-09-28 11:46:34.000000000 +0000
@@ -96,6 +96,9 @@
 call mtr.add_suppression("Error writing relay log configuration.");
 call mtr.add_suppression("Failed to stop the group replication applier thread.");
 call mtr.add_suppression("Error while executing a group configuration operation: Mode switched to single-primary with reported warnings: *");
+call mtr.add_suppression("Fatal error during execution on the Applier process of Group Replication. The server will now leave the group.");
+call mtr.add_suppression("Skipping leave operation: concurrent attempt to leave the group is on-going.");
+call mtr.add_suppression("The server was automatically set into read only mode after an error was detected.");
 set session sql_log_bin=1;
 
 --let $rpl_connection_name= server1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_force_members.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_force_members.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_force_members.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_force_members.test	2021-09-28 11:46:34.000000000 +0000
@@ -25,7 +25,6 @@
 CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY);
 --source include/rpl_sync.inc
 
-
 --echo
 --echo ############################################################
 --echo # 2. Collect server uuids and increase member2 weight.
@@ -48,7 +47,6 @@
 --source include/rpl_connection.inc
 --let $member4_uuid= query_get_value(SELECT @@SERVER_UUID, @@SERVER_UUID, 1)
 
-
 --echo
 --echo ############################################################
 --echo # 3. Block the group action on member2.
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_joining_during_election.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_joining_during_election.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_joining_during_election.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_joining_during_election.test	2021-09-28 11:46:34.000000000 +0000
@@ -37,6 +37,8 @@
 --source include/rpl_connection.inc
 
 set session sql_log_bin=0;
+call mtr.add_suppression("Slave I/O for channel 'group_replication_recovery': Master command COM_REGISTER_SLAVE failed*");
+call mtr.add_suppression("Slave I/O thread couldn't register on master");
 call mtr.add_suppression("The function 'group_replication_switch_to_multi_primary_mode' failed. A primary election is occurring in the group. Wait for it to end.");
 call mtr.add_suppression("There was an error when connecting to the donor server. Please check that group_replication_recovery channel credentials.*");
 call mtr.add_suppression("For details please check performance_schema.replication_connection_status table*");
@@ -44,6 +46,12 @@
 
 CREATE TABLE test.t1 (a INT PRIMARY KEY NOT NULL AUTO_INCREMENT);
 
+SET sql_log_bin=0;
+CREATE USER 'recovery_user'@'%' IDENTIFIED BY 'rpl';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'recovery_user'@'%';
+FLUSH PRIVILEGES;
+SET sql_log_bin=1;
+
 --source include/start_and_bootstrap_group_replication.inc
 
 --let $rpl_connection_name= server2
@@ -51,6 +59,12 @@
 
 SET GLOBAL group_replication_member_weight= 90;
 
+SET sql_log_bin=0;
+CREATE USER 'recovery_user'@'%' IDENTIFIED BY 'rpl';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'recovery_user'@'%';
+FLUSH PRIVILEGES;
+SET sql_log_bin=1;
+
 --source include/start_group_replication.inc
 
 --let $rpl_connection_name= server3
@@ -62,6 +76,7 @@
 SET sql_log_bin=0;
 CREATE USER 'recovery_user'@'%' IDENTIFIED BY 'rpl';
 GRANT REPLICATION SLAVE ON *.* TO 'recovery_user'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'recovery_user'@'%';
 FLUSH PRIVILEGES;
 SET sql_log_bin=1;
 
@@ -190,8 +205,20 @@
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
 
+SET sql_log_bin=0;
+DROP USER recovery_user;
+SET sql_log_bin=1;
+
 SET @@GLOBAL.group_replication_member_weight= DEFAULT;
 
 --let $rpl_group_replication_single_primary_mode=0
 --let $rpl_group_replication_reset_persistent_vars=1
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+SET sql_log_bin=0;
+DROP USER recovery_user;
+SET sql_log_bin=1;
+
 --source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_net_partition_1.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_net_partition_1.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_net_partition_1.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_net_partition_1.test	2021-09-28 11:46:34.000000000 +0000
@@ -39,6 +39,7 @@
 
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
+
 --let $member2_uuid= query_get_value(SELECT @@SERVER_UUID, @@SERVER_UUID, 1)
 --let $local_address_server2= `SELECT @@GLOBAL.group_replication_local_address`
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_net_partition_2.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_net_partition_2.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_net_partition_2.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_primary_mode_group_operations_net_partition_2.test	2021-09-28 11:46:34.000000000 +0000
@@ -39,6 +39,7 @@
 
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
+
 --let $member2_uuid= query_get_value(SELECT @@SERVER_UUID, @@SERVER_UUID, 1)
 --let $local_address_server2= `SELECT @@GLOBAL.group_replication_local_address`
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_protocol_stack_tables_and_migration.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_protocol_stack_tables_and_migration.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_protocol_stack_tables_and_migration.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_protocol_stack_tables_and_migration.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,200 @@
+################################################################################
+# This test fits two purposes:
+# - Make sure that P_S tables will report values of the communication stack
+#   that are coherent with the specified design;
+# - Make sure that we can use mixed values for running variables and connection
+#   protocol in the same group if we follow the upgrade/downgrade design rules.
+#
+#
+# Test:
+# 0. The test requires two servers: M1 and M2.
+# 1. Start the group normally.
+# 2. Assert that the value in group_replication_communication_stack is the
+#    same as the one the in P_S table for incoming connections
+# 3. Stop both servers and backup the communication stack value, local_address
+#     and seeds
+# 4. In server 1, change to MySQL stack and adjust the local_address and seeds
+#    accordingly
+# 5. Start and bootstrap the group with server 1
+# 6. In server 2, change to MySQL stack and adjust the local_address and seeds
+#    accordingly
+# 7. Start server 2.
+# 8. Assert that the value in group_replication_communication_stack is the
+#    same as the one the in P_S table for incoming connections
+# 9. In server 1, change the protocol to XCom and check that it differs
+#     group_replication_communication_stack
+# 10. Stop server 1
+# 11. In server 2, change the protocol to XCom and check that it differs
+#     group_replication_communication_stack
+# 12. Stop server 2
+# 13. Bootstrap the group with server 1.
+# 14. Join Server 2.
+# 15. Clean up.
+#
+################################################################################
+
+--echo # 1. Start the group normally.
+--source include/big_test.inc
+--source include/have_group_replication_plugin.inc
+--source include/group_replication.inc
+
+--echo # 2. Assert that the value in group_replication_communication_stack is the
+--echo #    same as the one the in P_S table for incoming connections
+
+--let $_rpl_server= 2
+while ($_rpl_server)
+{
+  --let $_rpl_connection_name= server$_rpl_server
+  --connection $_rpl_connection_name
+
+  --let $server_uuid= `SELECT @@server_uuid`
+
+  --let $comm_stack_value= `SELECT @@group_replication_communication_stack`
+  --let $incoming_ps_value= `SELECT MEMBER_COMMUNICATION_STACK FROM performance_schema.replication_group_members WHERE MEMBER_ID="$server_uuid"`
+
+  --let $assert_cond= "$comm_stack_value" = "$incoming_ps_value"
+  --let $assert_text= Assert that the configured communication stack is the same as reported in P_S tables
+  --source include/assert.inc
+
+  --dec $_rpl_server
+}
+
+--echo # 3. Stop both servers and backup the communication stack value, local_address
+--echo #    and seeds
+--connection server2
+--let $communication_stack_save_2= `SELECT @@GLOBAL.group_replication_communication_stack`
+--let $local_addr_save_2= `SELECT @@GLOBAL.group_replication_local_address`
+--let $seeds_save_2= `SELECT @@GLOBAL.group_replication_group_seeds`
+--source include/stop_group_replication.inc
+
+--let $server_2_uuid= `SELECT @@server_uuid`
+--let $incoming_ps_value_server2_stopped= `SELECT MEMBER_COMMUNICATION_STACK FROM performance_schema.replication_group_members WHERE MEMBER_ID="$server_2_uuid"`
+--let $assert_cond= "$communication_stack_save_2" = "$incoming_ps_value_server2_stopped"
+--let $assert_text= Assert that the configured communication stack remains valid with a stopped server
+--source include/assert.inc
+
+--connection server1
+--let $communication_stack_save_1= `SELECT @@GLOBAL.group_replication_communication_stack`
+--let $local_addr_save_1= `SELECT @@GLOBAL.group_replication_local_address`
+--let $seeds_save_1= `SELECT @@GLOBAL.group_replication_group_seeds`
+--source include/stop_group_replication.inc
+
+--echo # 4. In server 1, change to MySQL stack and adjust the local_address and seeds
+--echo #    accordingly
+--echo # 5. Start and bootstrap the group with server 1
+
+SET GLOBAL group_replication_communication_stack= MySQL;
+--let $server_address_1= localhost:$SERVER_MYPORT_1
+--disable_query_log
+--eval SET GLOBAL group_replication_local_address= "$server_address_1"
+--eval SET GLOBAL group_replication_group_seeds= "$server_address_1"
+--enable_query_log
+--source include/start_and_bootstrap_group_replication.inc
+
+--echo # 6. In server 2, change to MySQL stack and adjust the local_address and seeds
+--echo #    accordingly
+--echo # 7. Start server 2.
+--connection server2
+SET GLOBAL group_replication_communication_stack= MySQL;
+--let $server_address_2= localhost:$SERVER_MYPORT_2
+--disable_query_log
+--eval SET GLOBAL group_replication_local_address= "$server_address_2"
+--eval SET GLOBAL group_replication_group_seeds= "$server_address_1"
+--enable_query_log
+--source include/start_group_replication.inc
+
+
+--echo # 8. Assert that the value in group_replication_communication_stack is the
+--echo #    same as the one the in P_S table for incoming connections
+
+--let $_rpl_server= 2
+while ($_rpl_server)
+{
+  --let $_rpl_connection_name= server$_rpl_server
+  --connection $_rpl_connection_name
+
+  --let $server_uuid= `SELECT @@server_uuid`
+
+  --let $comm_stack_value= `SELECT @@group_replication_communication_stack`
+  --let $incoming_ps_value= `SELECT MEMBER_COMMUNICATION_STACK FROM performance_schema.replication_group_members WHERE MEMBER_ID="$server_uuid"`
+
+  --let $assert_cond= "$comm_stack_value" = "$incoming_ps_value"
+  --let $assert_text= Assert that the configured communication stack is the same as reported in P_S tables
+  --source include/assert.inc
+
+  --dec $_rpl_server
+}
+
+--echo # 9. In server 1, change the protocol to XCom and check that it differs
+--echo #     group_replication_communication_stack
+--echo # 10. Stop server 1
+--connection server1
+SET GLOBAL group_replication_communication_stack= XCOM;
+
+--let $server_uuid= `SELECT @@server_uuid`
+
+--let $comm_stack_value= `SELECT @@group_replication_communication_stack`
+--let $incoming_ps_value= `SELECT MEMBER_COMMUNICATION_STACK FROM performance_schema.replication_group_members WHERE MEMBER_ID="$server_uuid"`
+
+--let $assert_cond= "$comm_stack_value" != "$incoming_ps_value"
+--let $assert_text= Assert that the configured communication stack is different then the one reported in P_S tables
+--source include/assert.inc
+
+--source include/stop_group_replication.inc
+
+
+--echo # 11. In server 2, change the protocol to XCom and check that it differs
+--echo #     group_replication_communication_stack
+--echo # 12. Stop server 2
+--connection server2
+SET GLOBAL group_replication_communication_stack= XCOM;
+
+--let $server_uuid= `SELECT @@server_uuid`
+
+--let $comm_stack_value= `SELECT @@group_replication_communication_stack`
+--let $incoming_ps_value= `SELECT MEMBER_COMMUNICATION_STACK FROM performance_schema.replication_group_members WHERE MEMBER_ID="$server_uuid"`
+
+--let $assert_cond= "$comm_stack_value" != "$incoming_ps_value"
+--let $assert_text= Assert that the configured communication stack is different then the one reported in P_S tables
+--source include/assert.inc
+
+--source include/stop_group_replication.inc
+
+--echo # 13. Bootstrap the group with server 1.
+--connection server1
+SET GLOBAL group_replication_communication_stack= XCOM;
+--let $server_address_1= localhost:$SERVER_GR_PORT_1
+--disable_query_log
+--eval SET GLOBAL group_replication_local_address= "$server_address_1"
+--eval SET GLOBAL group_replication_group_seeds= "$server_address_1"
+--enable_query_log
+--source include/start_and_bootstrap_group_replication.inc
+
+--echo # 14. Join Server 2.
+--connection server2
+SET GLOBAL group_replication_communication_stack= XCOM;
+--let $server_address_2= localhost:$SERVER_GR_PORT_2
+--disable_query_log
+--eval SET GLOBAL group_replication_local_address= "$server_address_2"
+--eval SET GLOBAL group_replication_group_seeds= "$server_address_1"
+--enable_query_log
+--source include/start_group_replication.inc
+
+--echo # 15. Clean up.
+
+--connection server2
+--disable_query_log
+--eval SET GLOBAL group_replication_communication_stack= "$communication_stack_save_2"
+--eval SET GLOBAL group_replication_local_address= "$local_addr_save_2"
+--eval SET GLOBAL group_replication_group_seeds= "$seeds_save_2"
+--enable_query_log
+
+--connection server1
+--disable_query_log
+--eval SET GLOBAL group_replication_communication_stack= "$communication_stack_save_1"
+--eval SET GLOBAL group_replication_local_address= "$local_addr_save_1"
+--eval SET GLOBAL group_replication_group_seeds= "$seeds_save_1"
+--enable_query_log
+
+## This is the end... My only friend the end!
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ps_applying_trx_recovery_channel.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ps_applying_trx_recovery_channel.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ps_applying_trx_recovery_channel.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ps_applying_trx_recovery_channel.test	2021-09-28 11:46:34.000000000 +0000
@@ -12,7 +12,6 @@
 #
 
 # the test enables MTS in one server
---source include/not_mts_replica_parallel_workers.inc
 --source include/have_group_replication_plugin.inc
 --let $rpl_skip_group_replication_start= 1
 --source include/group_replication.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_psi_keys-master.opt mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_psi_keys-master.opt
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_psi_keys-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_psi_keys-master.opt	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
---loose-performance-schema-max-mutex-classes=512
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_psi_keys_mysql-master.opt mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_psi_keys_mysql-master.opt
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_psi_keys_mysql-master.opt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_psi_keys_mysql-master.opt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1 @@
+--loose-performance-schema-max-mutex-classes=512
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_psi_keys_mysql.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_psi_keys_mysql.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_psi_keys_mysql.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_psi_keys_mysql.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,10 @@
+################################################################################
+# Verify that performance schema keys are available in instrument table
+# immediately after plugin installation with MySQL
+################################################################################
+
+--source include/have_group_replication_plugin_base.inc
+--source include/have_group_replication_mysql_communication_stack.inc
+
+--source ../include/gr_psi_keys.inc
+
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_psi_keys.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_psi_keys.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_psi_keys.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_psi_keys.test	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-################################################################################
-# Verify that performance schema keys are available in instrument table
-# immediately after plugin installation.
-#
-# Test:
-# 0. The test requires one Server: M1
-# 1. Verify that performance schema keys are available in instrument table
-#    immediately after plugin installation (before starting the GR).
-# 2. Start GR on M1
-# 3. Verify that there are no extra psi keys that were added after starting
-#    the GR
-# 4. Verify that performance_schema.threads list the usual
-#    threads after member is ONLINE.
-# 5. Test end.
-################################################################################
-
---source include/have_group_replication_plugin.inc
---let $rpl_skip_group_replication_start= 1
---source include/group_replication.inc
-
---echo
---echo ############################################################
---echo # 1. verify that performance schema keys are available in instrument
---echo #    table immediately after plugin installation
---echo #    (before starting the GR).
---connection server1
-SELECT * FROM performance_schema.setup_instruments WHERE NAME LIKE '%group_rpl%' AND NAME NOT LIKE 'wait/synch/%/group_rpl/GCS_%' AND NAME NOT LIKE '%GCS_XCom::xcom_cache%';
---let $psi_keys_count_before_gr=`SELECT COUNT(*) FROM performance_schema.setup_instruments WHERE NAME LIKE '%group_rpl%' AND NAME NOT LIKE 'wait/synch/%/group_rpl/GCS_%' AND NAME NOT LIKE '%GCS_XCom::xcom_cache%'`
-
---echo
---echo ############################################################
---echo # 2. Start the GR
---source include/start_and_bootstrap_group_replication.inc
-
---echo
---echo ############################################################
---echo # 3. Verify that there are no extra psi keys that were added
---echo #   after starting the GR
---let $psi_keys_count_after_gr=`SELECT COUNT(*) FROM performance_schema.setup_instruments WHERE NAME LIKE '%group_rpl%' AND NAME NOT LIKE 'wait/synch/%/group_rpl/GCS_%' AND NAME NOT LIKE '%GCS_XCom::xcom_cache%'`
---let $assert_text= 'There should be no extra psi keys added after starting the GR'
---let $assert_cond= $psi_keys_count_before_gr = $psi_keys_count_after_gr
---source include/assert.inc
-
---echo
---echo ############################################################
---echo # 4. Verify that performance_schema.threads list the usual
---echo #    threads after member is ONLINE.
-SELECT NAME, TYPE, INSTRUMENTED FROM performance_schema.threads WHERE NAME LIKE '%group_rpl%' ORDER BY NAME;
-
---echo
---echo ############################################################
---echo # 5. Test end.
---source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_psi_keys_xcom-master.opt mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_psi_keys_xcom-master.opt
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_psi_keys_xcom-master.opt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_psi_keys_xcom-master.opt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1 @@
+--loose-performance-schema-max-mutex-classes=512
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_psi_keys_xcom.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_psi_keys_xcom.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_psi_keys_xcom.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_psi_keys_xcom.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,10 @@
+################################################################################
+# Verify that performance schema keys are available in instrument table
+# immediately after plugin installation with XCom
+################################################################################
+
+--source include/have_group_replication_plugin_base.inc
+--source include/have_group_replication_xcom_communication_stack.inc
+
+--source ../include/gr_psi_keys.inc
+
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_change_master.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_change_master.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_change_master.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_change_master.test	2021-09-28 11:46:34.000000000 +0000
@@ -31,6 +31,7 @@
 SET sql_log_bin=0;
 CREATE USER 'manish'@'%' IDENTIFIED BY 'rpl';
 GRANT REPLICATION SLAVE ON *.* TO 'manish'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'manish'@'%';
 FLUSH PRIVILEGES;
 SET sql_log_bin=1;
 
@@ -73,6 +74,13 @@
 --let $assert_cond= `SELECT COUNT(*) = 1 FROM mysql.slave_master_info WHERE User_name LIKE 'manish'`
 --source include/assert.inc
 
+SET sql_log_bin=0;
+CREATE USER 'manish'@'%' IDENTIFIED BY 'rpl';
+GRANT REPLICATION SLAVE ON *.* TO 'manish'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'manish'@'%';
+FLUSH PRIVILEGES;
+SET sql_log_bin=1;
+
 --source include/start_group_replication.inc
 
 --echo # Ensuring the the two members are online.
@@ -89,4 +97,10 @@
 SET sql_log_bin=0;
 DROP USER manish;
 SET sql_log_bin=1;
+
+--connection server2
+SET sql_log_bin=0;
+DROP USER manish;
+SET sql_log_bin=1;
+
 --source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_channel.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_channel.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_channel.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_channel.test	2021-09-28 11:46:34.000000000 +0000
@@ -31,6 +31,7 @@
 
 --connection server2
 --echo server2
+
 --source include/start_and_bootstrap_group_replication.inc
 
 # Add some data for recovery
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_conflicting_data_failover.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_conflicting_data_failover.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_conflicting_data_failover.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_conflicting_data_failover.test	2021-09-28 11:46:34.000000000 +0000
@@ -68,6 +68,7 @@
 SET SESSION sql_log_bin= 0;
 --eval CREATE USER "$recovery_user" IDENTIFIED BY "$recovery_password"
 --eval GRANT REPLICATION SLAVE ON *.* TO "$recovery_user"
+--eval GRANT GROUP_REPLICATION_STREAM ON *.* TO "$recovery_user"@'%';
 FLUSH PRIVILEGES;
 SET SESSION sql_log_bin= 1;
 
@@ -82,6 +83,12 @@
 --connection server3
 
 SET SESSION sql_log_bin= 0;
+--eval CREATE USER "$recovery_user" IDENTIFIED BY "$recovery_password"
+--eval GRANT GROUP_REPLICATION_STREAM ON *.* TO "$recovery_user"@'%';
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
+
+SET SESSION sql_log_bin= 0;
 call mtr.add_suppression("There was an error when connecting to the donor*");
 call mtr.add_suppression("For details please check performance_schema.replication_connection_status table and error log messages of Slave I/O for channel group_replication_recovery.");
 call mtr.add_suppression("Slave SQL for channel 'group_replication_recovery': Error 'Table 'lost_test_table'*");
@@ -127,6 +134,7 @@
 SET SESSION sql_log_bin= 0;
 --eval CREATE USER "$recovery_user" IDENTIFIED BY "$recovery_password"
 --eval GRANT REPLICATION SLAVE ON *.* TO "$recovery_user"
+--eval GRANT GROUP_REPLICATION_STREAM ON *.* TO "$recovery_user"@'%';
 FLUSH PRIVILEGES;
 SET SESSION sql_log_bin= 1;
 
@@ -154,6 +162,10 @@
 
 RESET MASTER;
 
+SET SESSION sql_log_bin= 0;
+--eval DROP USER "$recovery_user"
+SET SESSION sql_log_bin= 1;
+
 --connection server2
 
 --source include/stop_group_replication.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_connection_options.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_connection_options.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_connection_options.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_connection_options.test	2021-09-28 11:46:34.000000000 +0000
@@ -25,6 +25,7 @@
 
 --source include/big_test.inc
 --source include/have_debug.inc
+--source include/have_group_replication_xcom_communication_stack.inc
 --let $group_replication_group_name= b5eb4110-a3a2-11e3-a5e2-0800200c9a66
 --source include/set_privilege_checks_user_as_system_user.inc
 --let $rpl_privilege_checks_user_grant_option = 1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_donor_failover_mysql.cnf mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_donor_failover_mysql.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_donor_failover_mysql.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_donor_failover_mysql.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,14 @@
+!include ../my.cnf
+
+[mysqld.1]
+loose-group_replication_communication_stack=MySQL
+
+[mysqld.2]
+loose-group_replication_communication_stack=MySQL
+
+[mysqld.3]
+loose-group_replication_communication_stack=MySQL
+
+[ENV]
+SERVER_MYPORT_3=		@mysqld.3.port
+SERVER_MYSOCK_3=		@mysqld.3.socket
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_donor_failover_mysql.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_donor_failover_mysql.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_donor_failover_mysql.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_donor_failover_mysql.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,22 @@
+################################################################################
+# Recovery donor failover test
+# This test focus on the failover mechanism where a joiner changes it's donor
+# whenever the one in use leaves the group while recovery is happening.
+#
+# To test this, a new member is started but recovery blocked. While at this state
+# the donor is killed, forcing the joiner to change to a new one. As there is
+# no donor identification as of now, we just unblock and check that recovery
+# was successful
+#
+# Test:
+# 0. The test requires three servers: M1, M2 and M3.
+# 1. Bootstrap group on M1. Insert some data. Start GR on M2.
+# 2. Stop the applier on both servers to block recovery.
+# 3. Start GR on M3. It should go into RECOVERING state. Identify the DONOR.
+# 4. Stop GR on the donor making it leave the group.
+# 5. Unblock recovery i.e. Start the applier on failover member and watch M3 go
+#    ONLINE despite the donor exit. Vaidate data on M3.
+# 6. Clean up.
+################################################################################
+
+--source ../include/gr_recovery_donor_failover.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_donor_failover.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_donor_failover.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_donor_failover.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_donor_failover.test	2021-09-28 11:46:34.000000000 +0000
@@ -19,97 +19,4 @@
 # 6. Clean up.
 ################################################################################
 
---source include/big_test.inc
---let $group_replication_group_name= 55d07150-9a4d-11e3-a5e2-0800200c9a66
---source include/have_group_replication_plugin.inc
---let $rpl_skip_group_replication_start= 1
---let $rpl_server_count= 3
---source include/group_replication.inc
-
---echo #
---echo # Setup a new 2 member group
---echo #
-
---connection server1
-
---source include/start_and_bootstrap_group_replication.inc
-
---let $group_replication_number_of_members= 1
---source include/gr_wait_for_number_of_members.inc
-
-#insert some data
-CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1);
-
---connection server2
-#extract server uuid for calculations below
---let $server2_uuid= query_get_value(SELECT @@SERVER_UUID, @@SERVER_UUID, 1)
-
---source include/start_group_replication.inc
-
---let $group_replication_number_of_members= 2
---source include/gr_wait_for_number_of_members.inc
-
-#Stop the applier on both servers to block recovery
-STOP SLAVE SQL_THREAD FOR CHANNEL "group_replication_applier";
-
---connection server1
-STOP SLAVE SQL_THREAD FOR CHANNEL "group_replication_applier";
-
---echo #
---echo # Start recovery on a new member and kill the donor
---echo #
-
---connection server3
-SET SESSION sql_log_bin= 0;
-call mtr.add_suppression(".*Error when configuring the asynchronous recovery channel connection *.*");
-SET SESSION sql_log_bin= 1;
-
---let $group_replication_start_member_state= RECOVERING
---source include/start_group_replication.inc
-
---echo # Find if server 1 or 2 is the donor
-
-#give it time to connect
---sleep 5
-
-#Find what member is the donor
---let $donor_id= 1
---let $failover= 2
-if (`SELECT COUNT(*)=1 FROM performance_schema.replication_connection_status WHERE channel_name='group_replication_recovery' AND service_state='ON' AND source_uuid='$server2_uuid'`)
-{
-  --let $donor_id= 2
-  --let $failover= 1
-}
-
---echo # Stop group replication on the donor making it leave the group
---connection server$donor_id
---source include/stop_group_replication.inc
-
---echo # Unblock recovery and watch the member go online despite the donor exit
---connection server$failover
-START SLAVE SQL_THREAD FOR CHANNEL "group_replication_applier";
-
---connection server3
-
---let $group_replication_member_state= ONLINE
---source include/gr_wait_for_member_state.inc
-
---let $assert_text= On the recovered member, the table should exist and have 1 elements;
---let $assert_cond= [select count(*) from t1] = 1;
---source include/assert.inc
-
---let $assert_text= On the recovered member, the executed GTID should be the same as on the donor plus the view changes
---let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = "55d07150-9a4d-11e3-a5e2-0800200c9a66:1-5";
---source include/assert.inc
-
---echo #
---echo # Cleaning up
---echo #
-
---connection server$donor_id
---source include/start_group_replication.inc
-
-DROP TABLE t1;
-
---source include/group_replication_end.inc
+--source ../include/gr_recovery_donor_failover.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_donor_public_key.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_donor_public_key.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_donor_public_key.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_donor_public_key.test	2021-09-28 11:46:34.000000000 +0000
@@ -19,6 +19,8 @@
 #    must change to ONLINE.
 # 6. Clean up.
 ################################################################################
+
+--source include/have_group_replication_xcom_communication_stack.inc
 --source include/big_test.inc
 --source include/set_privilege_checks_user_as_system_user.inc
 --let $rpl_privilege_checks_user_grant_option = 1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_double_view_update.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_double_view_update.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_double_view_update.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_double_view_update.test	2021-09-28 11:46:34.000000000 +0000
@@ -18,6 +18,7 @@
 --source include/big_test.inc
 --source include/have_debug.inc
 --source include/have_debug_sync.inc
+--source include/have_group_replication_xcom_communication_stack.inc
 --let $group_replication_group_name= 6749cab0-93ae-11e5-a837-0800200c9a66
 --source include/have_group_replication_plugin.inc
 --let $rpl_skip_group_replication_start= 1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_endpoints_invalid_donor.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_endpoints_invalid_donor.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_endpoints_invalid_donor.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_endpoints_invalid_donor.test	2021-09-28 11:46:34.000000000 +0000
@@ -60,6 +60,7 @@
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
 --let $_group_replication_start_on_boot= `SELECT @@GLOBAL.group_replication_start_on_boot`
+--let $_group_replication_comm_stack= `SELECT @@GLOBAL.group_replication_communication_stack`
 
 --let $plugin_list= $GROUP_REPLICATION
 --source include/spawn_monitoring_process.inc
@@ -75,6 +76,7 @@
 --eval SET PERSIST group_replication_group_name= "$group_replication_group_name"
 --eval SET PERSIST group_replication_local_address= "$_group_replication_local_address"
 --eval SET PERSIST group_replication_group_seeds= "$_group_replication_group_seeds"
+--eval SET PERSIST group_replication_communication_stack= "$_group_replication_comm_stack"
 
 SET PERSIST group_replication_start_on_boot= ON;
 --enable_query_log
@@ -165,6 +167,7 @@
 RESET PERSIST IF EXISTS group_replication_local_address;
 RESET PERSIST IF EXISTS group_replication_group_seeds;
 RESET PERSIST IF EXISTS group_replication_start_on_boot;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 
 --replace_result $_group_replication_start_on_boot START_ON_BOOT_VALUE
 --eval SET GLOBAL group_replication_start_on_boot= $_group_replication_start_on_boot
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_endpoints_ipv6_ipv4.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_endpoints_ipv6_ipv4.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_endpoints_ipv6_ipv4.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_endpoints_ipv6_ipv4.test	2021-09-28 11:46:34.000000000 +0000
@@ -63,6 +63,7 @@
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
 --let $_group_replication_start_on_boot= `SELECT @@GLOBAL.group_replication_start_on_boot`
+--let $_group_replication_comm_stack= `SELECT @@GLOBAL.group_replication_communication_stack`
 
 --let $plugin_list= $GROUP_REPLICATION
 --source include/spawn_monitoring_process.inc
@@ -75,6 +76,7 @@
 --eval SET PERSIST group_replication_group_name= "$group_replication_group_name"
 --eval SET PERSIST group_replication_local_address= "$_group_replication_local_address"
 --eval SET PERSIST group_replication_group_seeds= "$_group_replication_group_seeds"
+--eval SET PERSIST group_replication_communication_stack= "$_group_replication_comm_stack"
 
 SET PERSIST group_replication_start_on_boot= ON;
 --enable_query_log
@@ -143,6 +145,7 @@
 RESET PERSIST IF EXISTS group_replication_local_address;
 RESET PERSIST IF EXISTS group_replication_group_seeds;
 RESET PERSIST IF EXISTS group_replication_start_on_boot;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 
 --replace_result $_group_replication_start_on_boot START_ON_BOOT_VALUE
 --eval SET GLOBAL group_replication_start_on_boot= $_group_replication_start_on_boot
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_endpoints_iterate_list_clone.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_endpoints_iterate_list_clone.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_endpoints_iterate_list_clone.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_endpoints_iterate_list_clone.test	2021-09-28 11:46:34.000000000 +0000
@@ -63,6 +63,7 @@
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
 --let $_group_replication_start_on_boot= `SELECT @@GLOBAL.group_replication_start_on_boot`
+--let $_group_replication_comm_stack= `SELECT @@GLOBAL.group_replication_communication_stack`
 
 --let $plugin_list= $GROUP_REPLICATION
 --source include/spawn_monitoring_process.inc
@@ -75,6 +76,7 @@
 --eval SET PERSIST group_replication_group_name= "$group_replication_group_name"
 --eval SET PERSIST group_replication_local_address= "$_group_replication_local_address"
 --eval SET PERSIST group_replication_group_seeds= "$_group_replication_group_seeds"
+--eval SET PERSIST group_replication_communication_stack= "$_group_replication_comm_stack"
 
 SET PERSIST group_replication_start_on_boot= ON;
 --enable_query_log
@@ -155,6 +157,7 @@
 RESET PERSIST IF EXISTS group_replication_local_address;
 RESET PERSIST IF EXISTS group_replication_group_seeds;
 RESET PERSIST IF EXISTS group_replication_start_on_boot;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 
 --replace_result $_group_replication_start_on_boot START_ON_BOOT_VALUE
 --eval SET GLOBAL group_replication_start_on_boot= $_group_replication_start_on_boot
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_endpoints_iterate_list_incremental.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_endpoints_iterate_list_incremental.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_endpoints_iterate_list_incremental.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_endpoints_iterate_list_incremental.test	2021-09-28 11:46:34.000000000 +0000
@@ -55,6 +55,7 @@
 SET sql_log_bin = 0;
 --eval CREATE USER 'rpl_user'@'%'
 --eval GRANT REPLICATION SLAVE ON *.* TO 'rpl_user'@'%'
+--eval GRANT GROUP_REPLICATION_STREAM ON *.* TO 'rpl_user'@'%';
 SET sql_log_bin = 1;
 
 --echo #
@@ -82,6 +83,11 @@
 --let $rpl_connection_name = server2
 --source include/rpl_connection.inc
 
+SET sql_log_bin = 0;
+--eval CREATE USER 'rpl_user'@'%'
+--eval GRANT GROUP_REPLICATION_STREAM ON *.* TO 'rpl_user'@'%';
+SET sql_log_bin = 1;
+
 CHANGE REPLICATION SOURCE TO SOURCE_USER='rpl_user' FOR CHANNEL 'group_replication_recovery';
 
 --echo
@@ -161,6 +167,8 @@
 --eval SET GLOBAL group_replication_recovery_reconnect_interval= $_group_replication_recovery_reconnect_interval_save
 --eval SET GLOBAL group_replication_recovery_retry_count= $_group_replication_recovery_retry_count_save
 
+--eval DROP USER 'rpl_user'@'%'
+
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_endpoints_multiple_valid.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_endpoints_multiple_valid.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_endpoints_multiple_valid.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_endpoints_multiple_valid.test	2021-09-28 11:46:34.000000000 +0000
@@ -64,6 +64,7 @@
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
 --let $_group_replication_start_on_boot= `SELECT @@GLOBAL.group_replication_start_on_boot`
+--let $_group_replication_comm_stack= `SELECT @@GLOBAL.group_replication_communication_stack`
 
 --let $plugin_list= $GROUP_REPLICATION
 --source include/spawn_monitoring_process.inc
@@ -76,6 +77,7 @@
 --eval SET PERSIST group_replication_group_name= "$group_replication_group_name"
 --eval SET PERSIST group_replication_local_address= "$_group_replication_local_address"
 --eval SET PERSIST group_replication_group_seeds= "$_group_replication_group_seeds"
+--eval SET PERSIST group_replication_communication_stack= "$_group_replication_comm_stack"
 
 SET PERSIST group_replication_start_on_boot= ON;
 --enable_query_log
@@ -116,6 +118,7 @@
 RESET PERSIST IF EXISTS group_replication_local_address;
 RESET PERSIST IF EXISTS group_replication_group_seeds;
 RESET PERSIST IF EXISTS group_replication_start_on_boot;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 
 --replace_result $_group_replication_start_on_boot START_ON_BOOT_VALUE
 --eval SET GLOBAL group_replication_start_on_boot= $_group_replication_start_on_boot
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_endpoints_no_fallback.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_endpoints_no_fallback.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_endpoints_no_fallback.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_endpoints_no_fallback.test	2021-09-28 11:46:34.000000000 +0000
@@ -71,6 +71,8 @@
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
 --let $_group_replication_start_on_boot= `SELECT @@GLOBAL.group_replication_start_on_boot`
+--let $_group_replication_comm_stack= `SELECT @@GLOBAL.group_replication_communication_stack`
+
 
 --let $plugin_list= $GROUP_REPLICATION
 --let $mysqld_extra_settings= --log_error=$MYSQLTEST_VARDIR/tmp/gr_recovery_endpoints_no_fallback.2.err
@@ -87,6 +89,7 @@
 --eval SET PERSIST group_replication_group_name= "$group_replication_group_name"
 --eval SET PERSIST group_replication_local_address= "$_group_replication_local_address"
 --eval SET PERSIST group_replication_group_seeds= "$_group_replication_group_seeds"
+--eval SET PERSIST group_replication_communication_stack= "$_group_replication_comm_stack"
 
 SET PERSIST group_replication_start_on_boot= ON;
 --enable_query_log
@@ -182,6 +185,7 @@
 RESET PERSIST IF EXISTS group_replication_local_address;
 RESET PERSIST IF EXISTS group_replication_group_seeds;
 RESET PERSIST IF EXISTS group_replication_start_on_boot;
+RESET PERSIST IF EXISTS group_replication_communication_stack;
 
 --replace_result $_group_replication_start_on_boot START_ON_BOOT_VALUE
 --eval SET GLOBAL group_replication_start_on_boot= $_group_replication_start_on_boot
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_endpoints_retry_clone.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_endpoints_retry_clone.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_endpoints_retry_clone.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_endpoints_retry_clone.test	2021-09-28 11:46:34.000000000 +0000
@@ -65,6 +65,7 @@
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
 --let $_group_replication_start_on_boot= `SELECT @@GLOBAL.group_replication_start_on_boot`
+--let $_group_replication_comm_stack= `SELECT @@GLOBAL.group_replication_communication_stack`
 
 --let $plugin_list= $GROUP_REPLICATION
 --source include/spawn_monitoring_process.inc
@@ -77,6 +78,7 @@
 --eval SET PERSIST group_replication_group_name= "$group_replication_group_name"
 --eval SET PERSIST group_replication_local_address= "$_group_replication_local_address"
 --eval SET PERSIST group_replication_group_seeds= "$_group_replication_group_seeds"
+--eval SET PERSIST group_replication_communication_stack= "$_group_replication_comm_stack"
 
 SET PERSIST group_replication_start_on_boot= ON;
 --enable_query_log
@@ -157,6 +159,7 @@
 RESET PERSIST IF EXISTS group_replication_local_address;
 RESET PERSIST IF EXISTS group_replication_group_seeds;
 RESET PERSIST IF EXISTS group_replication_start_on_boot;
+RESET PERSIST group_replication_communication_stack;
 
 --replace_result $_group_replication_start_on_boot START_ON_BOOT_VALUE
 --eval SET GLOBAL group_replication_start_on_boot= $_group_replication_start_on_boot
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_lower_max_retry_count.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_lower_max_retry_count.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_lower_max_retry_count.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_lower_max_retry_count.test	2021-09-28 11:46:34.000000000 +0000
@@ -28,6 +28,12 @@
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
 
+SET sql_log_bin=0;
+CREATE USER 'user_with_no_priv_s1'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'user_with_no_priv_s1'@'%';
+FLUSH PRIVILEGES;
+SET sql_log_bin=1;
+
 --source include/start_and_bootstrap_group_replication.inc
 
 --echo
@@ -43,7 +49,12 @@
 SET @recovery_reconnect_interval_save= @@GLOBAL.GROUP_REPLICATION_RECOVERY_RECONNECT_INTERVAL;
 SET @recovery_retry_count_save= @@GLOBAL.group_replication_recovery_retry_count;
 --disable_warnings
-CHANGE REPLICATION SOURCE TO SOURCE_USER="user_does_not_exist" FOR CHANNEL "group_replication_recovery";
+SET sql_log_bin=0;
+CREATE USER 'user_with_no_priv_s1'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'user_with_no_priv_s1'@'%';
+FLUSH PRIVILEGES;
+SET sql_log_bin=1;
+CHANGE REPLICATION SOURCE TO SOURCE_USER="user_with_no_priv_s1" FOR CHANNEL "group_replication_recovery";
 --enable_warnings
 
 SET SESSION sql_log_bin = 0;
@@ -100,4 +111,15 @@
 SET @@GLOBAL.GROUP_REPLICATION_RECOVERY_RECONNECT_INTERVAL= @recovery_reconnect_interval_save;
 SET @@GLOBAL.group_replication_recovery_retry_count= @recovery_retry_count_save;
 
+SET sql_log_bin=0;
+SET GLOBAL super_read_only = 0;
+DROP USER user_with_no_priv_s1;
+SET sql_log_bin=1;
+
+--connection server1
+SET sql_log_bin=0;
+SET GLOBAL super_read_only = 0;
+DROP USER user_with_no_priv_s1;
+SET sql_log_bin=1;
+
 --source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_purged_donor_failover.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_purged_donor_failover.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_purged_donor_failover.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_purged_donor_failover.test	2021-09-28 11:46:34.000000000 +0000
@@ -36,6 +36,13 @@
 INSERT INTO t1 VALUES (1);
 
 --connection server2
+
+SET SESSION sql_log_bin= 0;
+--eval CREATE USER "$recovery_user" IDENTIFIED BY "$recovery_password"
+--eval GRANT GROUP_REPLICATION_STREAM ON *.* TO "$recovery_user"@'%';
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
+
 --source include/start_group_replication.inc
 
 --echo #
@@ -78,6 +85,7 @@
 CALL mtr.add_suppression("Cannot replicate to server with server_uuid*");
 --eval CREATE USER "$recovery_user" IDENTIFIED BY "$recovery_password"
 --eval GRANT REPLICATION SLAVE ON *.* TO "$recovery_user"
+--eval GRANT GROUP_REPLICATION_STREAM ON *.* TO "$recovery_user"@'%';
 FLUSH PRIVILEGES;
 SET SESSION sql_log_bin= 1;
 
@@ -90,6 +98,10 @@
 --connection server3
 
 SET SESSION sql_log_bin= 0;
+--eval CREATE USER "$recovery_user" IDENTIFIED BY "$recovery_password"
+--eval GRANT GROUP_REPLICATION_STREAM ON *.* TO "$recovery_user"@'%';
+FLUSH PRIVILEGES;
+
 call mtr.add_suppression("There was an error when connecting to the donor*");
 call mtr.add_suppression("For details please check performance_schema.replication_connection_status table and error log messages of Slave I/O for channel group_replication_recovery.");
 call mtr.add_suppression("Slave I/O for channel 'group_replication_recovery': Got fatal error 1236*");
@@ -127,7 +139,6 @@
 
 --connection server2
 SET SESSION sql_log_bin= 0;
---eval CREATE USER "$recovery_user" IDENTIFIED BY "$recovery_password"
 --eval GRANT REPLICATION SLAVE ON *.* TO "$recovery_user"
 FLUSH PRIVILEGES;
 SET SESSION sql_log_bin= 1;
@@ -149,6 +160,10 @@
 
 DROP TABLE t1;
 
+SET SESSION sql_log_bin= 0;
+--eval DROP USER "$recovery_user"
+SET SESSION sql_log_bin= 1;
+
 --connection server2
 
 SET SESSION sql_log_bin= 0;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_reconnection_options.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_reconnection_options.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_reconnection_options.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_reconnection_options.test	2021-09-28 11:46:34.000000000 +0000
@@ -57,6 +57,8 @@
 
 SET SESSION sql_log_bin= 0;
 call mtr.add_suppression("There was an error when connecting to the donor*");
+call mtr.add_suppression("Slave I/O for channel 'group_replication_recovery': Master command COM_REGISTER_SLAVE failed*");
+call mtr.add_suppression("Slave I/O thread couldn't register on master*");
 call mtr.add_suppression("For details please check performance_schema.replication_connection_status table and error log messages of Slave I/O for channel group_replication_recovery.");
 SET SESSION sql_log_bin= 1;
 
@@ -132,6 +134,27 @@
 --echo # After 10 second it should still be recovering, as the process is sleeping
 --echo #
 
+--connection server1
+SET SESSION sql_log_bin= 0;
+--eval CREATE USER "$recovery_user" IDENTIFIED BY "$recovery_password"
+--eval GRANT GROUP_REPLICATION_STREAM ON *.* TO "$recovery_user"@'%';
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
+
+--connection server2
+SET SESSION sql_log_bin= 0;
+--eval CREATE USER "$recovery_user" IDENTIFIED BY "$recovery_password"
+--eval GRANT GROUP_REPLICATION_STREAM ON *.* TO "$recovery_user"@'%';
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
+
+--connection server3
+SET SESSION sql_log_bin= 0;
+--eval CREATE USER "$recovery_user" IDENTIFIED BY "$recovery_password"
+--eval GRANT GROUP_REPLICATION_STREAM ON *.* TO "$recovery_user"@'%';
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
+
 --disable_warnings
 --eval CHANGE REPLICATION SOURCE TO SOURCE_USER="$recovery_user", SOURCE_PASSWORD="$recovery_password" FOR CHANNEL 'group_replication_recovery'
 --enable_warnings
@@ -152,14 +175,12 @@
 
 --connection server1
 SET SESSION sql_log_bin= 0;
---eval CREATE USER "$recovery_user" IDENTIFIED BY "$recovery_password"
 --eval GRANT REPLICATION SLAVE ON *.* TO "$recovery_user"
 FLUSH PRIVILEGES;
 SET SESSION sql_log_bin= 1;
 
 --connection server2
 SET SESSION sql_log_bin= 0;
---eval CREATE USER "$recovery_user" IDENTIFIED BY "$recovery_password"
 --eval GRANT REPLICATION SLAVE ON *.* TO "$recovery_user"
 FLUSH PRIVILEGES;
 SET SESSION sql_log_bin= 1;
@@ -183,6 +204,10 @@
 SET @@GLOBAL.group_replication_recovery_reconnect_interval= @debug_save_rec_int;
 SET @@GLOBAL.group_replication_recovery_retry_count= @debug_save_retries;
 
+SET SESSION sql_log_bin= 0;
+--eval DROP USER "$recovery_user"
+SET SESSION sql_log_bin= 1;
+
 DROP TABLE t1;
 
 --connection server2
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_slave_commands.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_slave_commands.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_slave_commands.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_slave_commands.test	2021-09-28 11:46:34.000000000 +0000
@@ -53,6 +53,7 @@
 # Skip configuration of recovery channel
 
 --source include/big_test.inc
+--source include/have_group_replication_xcom_communication_stack.inc
 --let $skip_recovery_configuration = 1
 --source include/have_group_replication_plugin.inc
 --let $rpl_skip_group_replication_start= 1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_ssl_and_ssl_mode.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_ssl_and_ssl_mode.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_ssl_and_ssl_mode.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_ssl_and_ssl_mode.test	2021-09-28 11:46:34.000000000 +0000
@@ -28,10 +28,20 @@
 SET SESSION sql_log_bin=0;
 CREATE USER 'rec_ssl_user'@'%' REQUIRE SSL;
 GRANT replication slave ON *.* TO 'rec_ssl_user'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'rec_ssl_user'@'%';
+FLUSH PRIVILEGES;
 SET SESSION sql_log_bin=1;
 
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
+
+SET SESSION sql_log_bin=0;
+CREATE USER 'rec_ssl_user'@'%' REQUIRE SSL;
+GRANT replication slave ON *.* TO 'rec_ssl_user'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'rec_ssl_user'@'%';
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin=1;
+
 --disable_warnings
 CHANGE REPLICATION SOURCE TO SOURCE_USER="rec_ssl_user" FOR CHANNEL "group_replication_recovery";
 --enable_warnings
@@ -111,6 +121,13 @@
 
 SET SESSION sql_log_bin=0;
 DROP USER 'rec_ssl_user';
+SET SESSION sql_log_bin=1;
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+SET SESSION sql_log_bin=0;
+DROP USER 'rec_ssl_user';
 SET SESSION sql_log_bin=1;
 
 --source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_tlsv13_empty_ciphersuites.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_tlsv13_empty_ciphersuites.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_tlsv13_empty_ciphersuites.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_tlsv13_empty_ciphersuites.test	2021-09-28 11:46:34.000000000 +0000
@@ -14,6 +14,7 @@
 ################################################################################
 
 --source include/have_tlsv13.inc
+--source include/have_group_replication_xcom_communication_stack.inc
 --source include/have_group_replication_plugin.inc
 --let $rpl_skip_group_replication_start= 1
 --source include/group_replication.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_tlsv13_incompatible_ciphersuites.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_tlsv13_incompatible_ciphersuites.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_tlsv13_incompatible_ciphersuites.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_tlsv13_incompatible_ciphersuites.test	2021-09-28 11:46:34.000000000 +0000
@@ -12,6 +12,7 @@
 ################################################################################
 
 --source include/have_tlsv13.inc
+--source include/have_group_replication_xcom_communication_stack.inc
 --source include/have_group_replication_plugin.inc
 --let $rpl_skip_group_replication_start= 1
 --source include/group_replication.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_tlsv13_incompatible_version.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_tlsv13_incompatible_version.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_tlsv13_incompatible_version.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_tlsv13_incompatible_version.test	2021-09-28 11:46:34.000000000 +0000
@@ -13,6 +13,7 @@
 ################################################################################
 
 --source include/have_tlsv13.inc
+--source include/have_group_replication_xcom_communication_stack.inc
 --source include/have_group_replication_plugin.inc
 --let $rpl_skip_group_replication_start= 1
 --source include/group_replication.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_tlsv13_nondefault_ciphersuite.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_tlsv13_nondefault_ciphersuite.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_tlsv13_nondefault_ciphersuite.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_tlsv13_nondefault_ciphersuite.test	2021-09-28 11:46:34.000000000 +0000
@@ -27,12 +27,20 @@
 SET SESSION sql_log_bin=0;
 CREATE USER 'rec_ssl_user'@'%' REQUIRE SSL;
 GRANT replication slave ON *.* TO 'rec_ssl_user'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'rec_ssl_user'@'%';
+FLUSH PRIVILEGES;
 SET SESSION sql_log_bin=1;
 
 SET @tls_version_saved= @@GLOBAL.tls_version;
 SET GLOBAL tls_version='TLSv1.3';
 SET @tls_ciphersuites_saved= @@GLOBAL.tls_ciphersuites;
 SET GLOBAL tls_ciphersuites='TLS_AES_128_CCM_8_SHA256';
+SET @group_replication_recovery_tls_ciphersuites_saved= @@GLOBAL.group_replication_recovery_tls_ciphersuites;
+SET GLOBAL group_replication_recovery_tls_ciphersuites='TLS_AES_128_CCM_8_SHA256';
+
+SET @conf_rec_ssl_mode= @@GLOBAL.group_replication_ssl_mode;
+SET GLOBAL group_replication_ssl_mode= REQUIRED;
+
 ALTER INSTANCE RELOAD TLS;
 
 --echo #
@@ -51,11 +59,22 @@
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
 
+SET SESSION sql_log_bin=0;
+CREATE USER 'rec_ssl_user'@'%' REQUIRE SSL;
+GRANT replication slave ON *.* TO 'rec_ssl_user'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'rec_ssl_user'@'%';
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin=1;
+
 # Configure TLS on the server to allow GCS connections over TLS
 SET @tls_version_saved= @@GLOBAL.tls_version;
 SET GLOBAL tls_version='TLSv1.3';
 SET @tls_ciphersuites_saved= @@GLOBAL.tls_ciphersuites;
 SET GLOBAL tls_ciphersuites='TLS_AES_128_CCM_8_SHA256';
+
+SET @conf_rec_ssl_mode= @@GLOBAL.group_replication_ssl_mode;
+SET GLOBAL group_replication_ssl_mode= REQUIRED;
+
 ALTER INSTANCE RELOAD TLS;
 
 --disable_warnings
@@ -92,6 +111,11 @@
 --source include/rpl_connection.inc
 SET @@GLOBAL.tls_version= @tls_version_saved;
 SET @@GLOBAL.tls_ciphersuites= @tls_ciphersuites_saved;
+SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= @group_replication_recovery_tls_ciphersuites_saved;
+
+SET @@GLOBAL.group_replication_ssl_mode= @conf_rec_ssl_mode;
+ALTER INSTANCE RELOAD TLS;
+
 ALTER INSTANCE RELOAD TLS;
 
 SET SESSION sql_log_bin=0;
@@ -100,4 +124,14 @@
 
 DROP TABLE t1;
 
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+SET SESSION sql_log_bin=0;
+DROP USER 'rec_ssl_user';
+SET SESSION sql_log_bin=1;
+
+SET @@GLOBAL.group_replication_ssl_mode= @conf_rec_ssl_mode;
+ALTER INSTANCE RELOAD TLS;
+
 --source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_tlsv13.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_tlsv13.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_recovery_tlsv13.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_recovery_tlsv13.test	2021-09-28 11:46:34.000000000 +0000
@@ -25,10 +25,16 @@
 SET SESSION sql_log_bin=0;
 CREATE USER 'rec_ssl_user'@'%' REQUIRE SSL;
 GRANT replication slave ON *.* TO 'rec_ssl_user'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'rec_ssl_user'@'%';
+FLUSH PRIVILEGES;
 SET SESSION sql_log_bin=1;
 
 SET @tls_version_saved= @@GLOBAL.tls_version;
 SET GLOBAL tls_version='TLSv1.3';
+
+SET @conf_rec_ssl_mode= @@GLOBAL.group_replication_ssl_mode;
+SET GLOBAL group_replication_ssl_mode= REQUIRED;
+
 ALTER INSTANCE RELOAD TLS;
 
 --echo #
@@ -46,6 +52,13 @@
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
 
+SET SESSION sql_log_bin=0;
+CREATE USER 'rec_ssl_user'@'%' REQUIRE SSL;
+GRANT replication slave ON *.* TO 'rec_ssl_user'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'rec_ssl_user'@'%';
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin=1;
+
 --disable_warnings
 CHANGE REPLICATION SOURCE TO SOURCE_USER="rec_ssl_user" FOR CHANNEL "group_replication_recovery";
 --enable_warnings
@@ -53,6 +66,9 @@
 SET @group_replication_recovery_use_ssl_saved= @@GLOBAL.group_replication_recovery_use_ssl;
 SET GLOBAL group_replication_recovery_use_ssl=1;
 
+SET @conf_rec_ssl_mode= @@GLOBAL.group_replication_ssl_mode;
+SET GLOBAL group_replication_ssl_mode= REQUIRED;
+
 --source include/start_group_replication.inc
 
 --echo #
@@ -73,6 +89,8 @@
 --source include/rpl_connection.inc
 
 SET @@GLOBAL.tls_version= @tls_version_saved;
+
+SET @@GLOBAL.group_replication_ssl_mode= @conf_rec_ssl_mode;
 ALTER INSTANCE RELOAD TLS;
 
 SET SESSION sql_log_bin=0;
@@ -81,4 +99,14 @@
 
 DROP TABLE t1;
 
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+SET SESSION sql_log_bin=0;
+DROP USER 'rec_ssl_user';
+SET SESSION sql_log_bin=1;
+
+SET @@GLOBAL.group_replication_ssl_mode= @conf_rec_ssl_mode;
+ALTER INSTANCE RELOAD TLS;
+
 --source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_relay_log_name_change.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_relay_log_name_change.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_relay_log_name_change.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_relay_log_name_change.test	2021-09-28 11:46:34.000000000 +0000
@@ -7,34 +7,18 @@
 # configured.
 #
 # Then, it will restart the server again change the relay-log option. The
-# expected behavior is that GR should fail to start. It will remove the
-# "group_replication_applier" channel manually in order to make it work
-# properly on the next restart.
-#
+# expected behavior is that GR should not fail to start. At start GR will
+# simply use the first relay log file with the new name.
 # Finally, the test will restart the server again and the GR plug-in should
 # work fine.
 #
 # ==== Related Bugs and Worklogs ====
 #
 # BUG#23600405 CRASH IF RELAY LOG ISN'T FOUND
+# WL#7491: GTID-based replication applier recovery and positioning
 #
---source include/have_group_replication_plugin.inc
 
-SET SESSION sql_log_bin=0;
-call mtr.add_suppression("Failed to open the relay log");
-call mtr.add_suppression("Could not find target log file mentioned in relay log info in the index file");
-call mtr.add_suppression("Failed to initialize the master info structure for channel");
-call mtr.add_suppression("Failed to create or recover replication info repositories");
-call mtr.add_suppression("Failed to setup the group replication applier thread");
-call mtr.add_suppression("Unable to initialize the Group Replication applier module");
-call mtr.add_suppression("Leaving a group without being on one");
-call mtr.add_suppression("Error checking relay log repository.");
-call mtr.add_suppression("Slave failed to initialize relay log info structure from the repository");
-call mtr.add_suppression("Error while starting the group replication applier thread");
-call mtr.add_suppression("It was not possible to identify the group replication applier thread");
-call mtr.add_suppression("It was not possible to reset the server read mode settings. Try to reset them manually.");
-call mtr.add_suppression("Error running internal SQL query:*");
-SET SESSION sql_log_bin=1;
+--source include/have_group_replication_plugin.inc
 
 --source include/start_and_bootstrap_group_replication.inc
 
@@ -59,29 +43,21 @@
 --replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
 --source include/restart_mysqld.inc
 
---let $wait_condition= SELECT last_error_number != 0 FROM performance_schema.replication_applier_status_by_worker where channel_name='group_replication_applier';
---source include/wait_condition.inc
-
---let $group_replication_member_state= OFFLINE
+--let $group_replication_member_state= ONLINE
 --source include/gr_wait_for_member_state.inc
 
-# As the slave repository was broken (by the relay-log option change)
-# we need to fix the group_replication_applier channel manually.
-RESET SLAVE FOR CHANNEL 'group_replication_applier';
-
 --echo
 --echo #######################################################
---echo # 3: Restart the server again after removing the broken
---echo #    group_replication_applier channel
+--echo # 3: Cleanup
+
 --let $allow_rpl_inited=1
---let $restart_parameters= $restart_parameters --relay-log=new-relay-log-name
+--let $restart_parameters= $restart_parameters --relay-log=server-relay-log --group_replication_start_on_boot=OFF
 --replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
 --source include/restart_mysqld.inc
 
---let $group_replication_member_state= ONLINE
---source include/gr_wait_for_member_state.inc
-
---source include/stop_group_replication.inc
+--let $rpl_server_number= 1
+--let $rpl_connection_name= server_1
+--source include/rpl_connect.inc
 
 --let $skip_recovery_configuration= 1
 --source include/gr_clear_configuration.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_replicate_group_to_group_mysql.cnf mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_replicate_group_to_group_mysql.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_replicate_group_to_group_mysql.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_replicate_group_to_group_mysql.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,32 @@
+!include ../my.cnf
+
+[mysqld.1]
+loose-group_replication_communication_stack=MySQL
+
+[mysqld.2]
+loose-group_replication_communication_stack=MySQL
+
+[mysqld.3]
+loose-group_replication_communication_stack=MySQL
+
+[mysqld.4]
+loose-group_replication_communication_stack=MySQL
+
+[mysqld.5]
+loose-group_replication_communication_stack=MySQL
+
+[mysqld.6]
+loose-group_replication_communication_stack=MySQL
+
+[ENV]
+SERVER_MYPORT_3=		@mysqld.3.port
+SERVER_MYSOCK_3=		@mysqld.3.socket
+
+SERVER_MYPORT_4=		@mysqld.4.port
+SERVER_MYSOCK_4=		@mysqld.4.socket
+
+SERVER_MYPORT_5=		@mysqld.5.port
+SERVER_MYSOCK_5=		@mysqld.5.socket
+
+SERVER_MYPORT_6=		@mysqld.6.port
+SERVER_MYSOCK_6=		@mysqld.6.socket
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_replicate_group_to_group_mysql.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_replicate_group_to_group_mysql.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_replicate_group_to_group_mysql.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_replicate_group_to_group_mysql.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,39 @@
+################################################################################
+#
+# Bug#25674926 VIEW CHANGE LOG EVENTS GENERATE NEW GTIDS
+#
+# Problem: When there is replication (async) between two groups,
+#          group nodes are confused when it receives view_change_log_event
+#          that is generated on the other group and the event is making
+#          infinite round trips between the groups in case if the async
+#          replication is circular replication.
+#
+# Scenario: Verify Group Replication behavior when we establish a
+#           circular replication connection from a server in a group
+#           to another server in the other group.
+# Steps to reproduce:
+#  0. The test requires six servers: M1, M2, M3, M4, M5 and M6.
+#  1. Bootstrap start a group, GR1, on M1. Start GR on M2 and add it GR1.
+#  2. Bootstrap start a group, GR2, on M3. Start GR on M4 and add it GR2.
+#  3. Setup a asynchronous replication connection from M3(GR2) into M1(GR1)
+#     i.e. M3 -> M1.
+#  4. Setup a asynchronous replication connection from M1(GR1) into M3(GR2)
+#     i.e. M1 -> M3.
+#  5. Test view change event issue by adding/dropping nodes from the groups.
+#     Add node M5 to group GR1, and add node M6 to group GR2 and immediately
+#     drop the node from group (GR2). (This step is just to generate more
+#     VIEW_EVENTs)
+#  6. Execute some transactions on M3.
+#  7. Wait until transactions executed on M3 are applied on all nodes of GR1
+#     and GR2.
+#  8. Execute some transactions on M1.
+#  9. Wait until transactions executed on M1 are applied on all nodes of GR1
+#     and GR2.
+# 10. Validate data on all nodes (M1, M2, M3, M4 and M5).
+# 11. Check that GTID_EXECUTED on all servers are as expected.
+# 12. Clean data.
+# 13. Stop circular replication between groups.
+# 14. Stop Group Replication on all nodes (M1, M2, M3, M4 and M5).
+################################################################################
+
+--source ../include/gr_replicate_group_to_group.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_replicate_group_to_group.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_replicate_group_to_group.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_replicate_group_to_group.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_replicate_group_to_group.test	2021-09-28 11:46:34.000000000 +0000
@@ -36,215 +36,4 @@
 # 14. Stop Group Replication on all nodes (M1, M2, M3, M4 and M5).
 ################################################################################
 
-# This test script needs '6' servers. Hence marking it as big test.
---source include/big_test.inc
-
---let $group_replication_group_name= 8a94f357-aab4-11df-86ab-c80aa9420000
---source include/have_group_replication_plugin.inc
---let $rpl_skip_group_replication_start= 1
---let $rpl_server_count= 6
---source include/group_replication.inc
-
---echo
---echo #################################################################
---echo #  1. Setup Group Replication on M1 and M2 and create group GR1.
---let $group_replication_group_name= 8a94f357-aab4-11df-86ab-c80aa9420000
---connection server1
---let $server1_local_address = `SELECT @@GLOBAL.group_replication_local_address;`
-SET @@GLOBAL.group_replication_group_seeds= "";
---source include/start_and_bootstrap_group_replication.inc
-
---connection server2
---replace_result $server1_local_address GROUP_REPLICATION_GROUP_SEEDS
---eval SET @@GLOBAL.group_replication_group_seeds= "$server1_local_address"
---source include/start_group_replication.inc
-
---let $group_replication_number_of_members= 2
---source include/gr_wait_for_number_of_members.inc
-
---echo
---echo #################################################################
---echo #  2. Setup Group Replication on M1 and M2 and create group GR2.
---let $group_replication_group_name= 8a94f357-aab4-11df-86ab-c80aa942000d
---connection server3
---let $server3_local_address = `SELECT @@GLOBAL.group_replication_local_address;`
-SET @@GLOBAL.group_replication_group_seeds= "";
---source include/start_and_bootstrap_group_replication.inc
-
---connection server4
---replace_result $server3_local_address GROUP_REPLICATION_GROUP_SEEDS
---eval SET @@GLOBAL.group_replication_group_seeds= "$server3_local_address"
---source include/start_group_replication.inc
-
---let $group_replication_number_of_members= 2
---source include/gr_wait_for_number_of_members.inc
-
---echo
---echo ###############################################################
---echo #  3. Setup a asynchronous replication connection from M3 (GR2)
---echo #     to M1 (GR1).
---connection server1
---replace_result $SERVER_MYPORT_3 SERVER_3_PORT
---eval CHANGE REPLICATION SOURCE TO SOURCE_HOST="127.0.0.1", SOURCE_USER="root", SOURCE_PASSWORD="", SOURCE_PORT=$SERVER_MYPORT_3, SOURCE_AUTO_POSITION=1
---source include/start_slave.inc
-
---echo
---echo ###############################################################
---echo #  4. Setup a asynchronous replication connection from M1 (GR1)
---echo #     to M3 (GR2).
---connection server3
---replace_result $SERVER_MYPORT_1 SERVER_1_PORT
---eval CHANGE REPLICATION SOURCE TO SOURCE_HOST="127.0.0.1", SOURCE_USER="root", SOURCE_PASSWORD="", SOURCE_PORT=$SERVER_MYPORT_1, SOURCE_AUTO_POSITION=1
---source include/start_slave.inc
-
---echo
---echo ###############################################################
---echo #  5. Test view change issue by adding/dropping nodes from the
---echo #     groups (just to generate more VIEW_EVENTs).
---echo # 5.1. Add a node M5 to group (GR1).
---let $group_replication_group_name= 8a94f357-aab4-11df-86ab-c80aa9420000
---connection server5
---replace_result $server1_local_address GROUP_REPLICATION_GROUP_SEEDS
---eval SET @@GLOBAL.group_replication_group_seeds= "$server1_local_address"
---source include/start_group_replication.inc
-
---let $group_replication_number_of_members= 3
---source include/gr_wait_for_number_of_members.inc
-
---echo
---echo ################################################################
---echo # 5.2. Add and immediately drop a node M6 to group (GR2).
---let $group_replication_group_name= 8a94f357-aab4-11df-86ab-c80aa942000d
---connection server6
---replace_result $server3_local_address GROUP_REPLICATION_GROUP_SEEDS
---eval SET @@GLOBAL.group_replication_group_seeds= "$server3_local_address"
---source include/start_group_replication.inc
-
---let $group_replication_number_of_members= 3
---source include/gr_wait_for_number_of_members.inc
---source include/stop_group_replication.inc
-
---echo
---echo ############################################################
---echo #  6. Execute some transactions on M3 (GR2).
---connection server3
-CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (0);
-INSERT INTO t1 VALUES (1);
-UPDATE t1 SET c1=2 WHERE c1=0;
-DELETE FROM t1 WHERE c1=1;
-
---echo
---echo ############################################################
---echo #  7. Wait until transactions executed on M3 are applied
---echo #     on all nodes in both groups.
---connection server3
---let $sync_slave_connection= server1
---source include/sync_slave_sql_with_master.inc
---connection server3
---let $sync_slave_connection= server2
---source include/sync_slave_sql_with_master.inc
---connection server3
---let $sync_slave_connection= server4
---source include/sync_slave_sql_with_master.inc
---connection server3
---let $sync_slave_connection= server5
---source include/sync_slave_sql_with_master.inc
-
---echo
---echo ############################################################
---echo #  8. Execute some transactions on M1 (GR1).
---connection server1
-CREATE TABLE t2 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
-INSERT INTO t2 VALUES (0);
-INSERT INTO t2 VALUES (1);
-UPDATE t2 SET c1=2 WHERE c1=0;
-DELETE FROM t2 WHERE c1=1;
-
---echo
---echo ############################################################
---echo #  9. Wait until transactions executed on M1 are applied
---echo #     on all nodes in both groups.
---connection server1
---let $sync_slave_connection= server2
---source include/sync_slave_sql_with_master.inc
---connection server1
---let $sync_slave_connection= server3
---source include/sync_slave_sql_with_master.inc
---connection server1
---let $sync_slave_connection= server4
---source include/sync_slave_sql_with_master.inc
---connection server1
---let $sync_slave_connection= server5
---source include/sync_slave_sql_with_master.inc
-
---echo
---echo #########################################################################
---echo # 10. Validate data on all nodes (M1, M2, M3, M4 and M5)
---let diff_tables=server_1:t1, server_2:t1, server_3:t1, server_4:t1, server_5:t1
---source include/diff_tables.inc
-
---let diff_tables=server_1:t2, server_2:t2, server_3:t2, server_4:t2, server_5:t2
---source include/diff_tables.inc
-
---echo
---echo #########################################################################
---echo # 11. Check that GTID_EXECUTED on all servers are as expected.
---let $i=1
-while ($i <= 5)
-{
-  --connection server$i
-  SET SESSION sql_log_bin= 0;
-  --source include/gtid_utils.inc
-  SET SESSION sql_log_bin= 1;
-  --let $expected_gtid_set= 8a94f357-aab4-11df-86ab-c80aa9420000:1-8, 8a94f357-aab4-11df-86ab-c80aa942000d:1-8
-  --let $assert_text= Check that GTID_EXECUTED set on all servers are as expected.
-  --let $assert_cond= GTID_IS_EQUAL("[SELECT @@GLOBAL.GTID_EXECUTED]", "$expected_gtid_set")
-  --source include/assert.inc
-  SET SESSION sql_log_bin= 0;
-  --source include/gtid_utils_end.inc
-  SET SESSION sql_log_bin= 1;
-  --inc $i
-}
-
---echo
---echo ############################################################
---echo #  12. Clean data.
---connection server3
-DROP TABLE t1;
-DROP TABLE t2;
-
---let $sync_slave_connection= server1
---source include/sync_slave_sql_with_master.inc
---connection server3
---let $sync_slave_connection= server2
---source include/sync_slave_sql_with_master.inc
---connection server3
---let $sync_slave_connection= server4
---source include/sync_slave_sql_with_master.inc
---connection server3
---let $sync_slave_connection= server5
---source include/sync_slave_sql_with_master.inc
-
---echo
---echo ##############################################################
---echo # 13. Stop asynchronous replication between M3->M1 and M1->M3.
---connection server1
---source include/stop_slave.inc
-CHANGE REPLICATION SOURCE TO SOURCE_AUTO_POSITION=0 FOR CHANNEL "";
---connection server3
---source include/stop_slave.inc
-CHANGE REPLICATION SOURCE TO SOURCE_AUTO_POSITION=0 FOR CHANNEL "";
-
---echo
---echo ############################################################
---echo # 14. Stop Group Replication on all 5 nodes.
---let $i=1
-while ($i <= 5)
-{
-  --connection server$i
-  --source include/stop_group_replication.inc
-  --inc $i
-}
-
---source include/group_replication_end.inc
+--source ../include/gr_replicate_group_to_group.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_replicate_group_to_server_parallel_applier_db.cnf mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_replicate_group_to_server_parallel_applier_db.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_replicate_group_to_server_parallel_applier_db.cnf	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_replicate_group_to_server_parallel_applier_db.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -8,6 +8,7 @@
 replica-parallel-type=       database
 replica-parallel-workers=    4
 replica-transaction-retries= 0
+replica-preserve-commit-order= 0
 
 [ENV]
 SERVER_MYPORT_3=		@mysqld.3.port
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_replication_timestamps.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_replication_timestamps.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_replication_timestamps.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_replication_timestamps.test	2021-09-28 11:46:34.000000000 +0000
@@ -34,8 +34,6 @@
 ## WL#7374 Performance schema tables to monitor replication lags and queue
 
 
-# accesses to some tables in the test require only one applier thread (worker)
---source include/not_mts_replica_parallel_workers.inc
 --source include/big_test.inc
 --source include/have_group_replication_plugin.inc
 --let $rpl_skip_group_replication_start= 1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_roles.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_roles.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_roles.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_roles.test	2021-09-28 11:46:34.000000000 +0000
@@ -19,6 +19,7 @@
 #    all GR members.
 # 5.Clean Up.
 ###############################################################################
+--source include/have_group_replication_xcom_communication_stack.inc
 --source include/not_have_privilege_checks_user.inc
 --source include/have_group_replication_plugin.inc
 --let $rpl_server_count= 2
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_savepoint_crash.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_savepoint_crash.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_savepoint_crash.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_savepoint_crash.test	2021-09-28 11:46:34.000000000 +0000
@@ -24,6 +24,7 @@
 
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
+
 --let $member2_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 
 --let $rpl_connection_name= server1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_server_failover_while_dml_on_other.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_server_failover_while_dml_on_other.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_server_failover_while_dml_on_other.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_server_failover_while_dml_on_other.test	2021-09-28 11:46:34.000000000 +0000
@@ -82,6 +82,7 @@
 
 --let $rpl_connection_name= server3
 --source include/rpl_connection.inc
+
 # Wait until group has only 2 members, that is, server2's death is detected by
 # the group.
 --echo # check that there are 2 members in the group
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_server_failover_while_dml.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_server_failover_while_dml.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_server_failover_while_dml.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_server_failover_while_dml.test	2021-09-28 11:46:34.000000000 +0000
@@ -86,6 +86,7 @@
 
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
+
 # Wait until group has only 2 members, that is, server1 death is detected by
 # the group.
 --echo # check that there are 2 members in the group
@@ -104,6 +105,11 @@
 --let $diff_tables=server_1:t1, server2:t1, server3:t1
 --source include/diff_tables.inc
 
+--let $rpl_connection_name= server_3
+--source include/rpl_connection.inc
+
+--let $rpl_connection_name= server_1
+--source include/rpl_connection.inc
 drop table t1;
 drop procedure dml_operations;
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_show_global_and_session_variables.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_show_global_and_session_variables.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_show_global_and_session_variables.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_show_global_and_session_variables.test	2021-09-28 11:46:34.000000000 +0000
@@ -16,7 +16,10 @@
 # 5. Clean-up
 #######################################################################################
 
+--source include/have_group_replication_xcom_communication_stack.inc
 --source include/big_test.inc
+--source include/force_restart.inc
+
 --let $group_replication_group_name= aaaaaaaa-cccc-bbbb-cccc-aaaaaaaaaaaa
 --source include/have_group_replication_plugin.inc
 --let $rpl_skip_group_replication_start= 1
@@ -29,7 +32,7 @@
 
 --sleep 30
 
---let $gr_var_count= 59
+--let $gr_var_count= 61
 --echo
 --echo # Test#1: Basic check that there are $gr_var_count GR variables.
 
@@ -85,6 +88,7 @@
 --let $saved_gr_recovery_tls_version = `SELECT @@GLOBAL.group_replication_recovery_tls_version`
 --let $saved_gr_recovery_tls_ciphersuites = `SELECT @@GLOBAL.group_replication_recovery_tls_ciphersuites`
 --let $saved_gr_view_change_uuid = `SELECT @@GLOBAL.group_replication_view_change_uuid`
+--let $saved_gr_paxos_single_leader = `SELECT @@GLOBAL.group_replication_paxos_single_leader`
 --enable_query_log
 
 
@@ -178,6 +182,8 @@
 SET @@SESSION.group_replication_recovery_tls_ciphersuites= "";
 --error ER_GLOBAL_VARIABLE
 SET @@SESSION.group_replication_view_change_uuid= "AUTOMATIC";
+--error ER_GLOBAL_VARIABLE
+SET @@SESSION.group_replication_paxos_single_leader= 1;
 
 # Set values to GLOBAL GR variables to test further.
 --disable_query_log
@@ -201,7 +207,6 @@
 eval SET GLOBAL group_replication_recovery_ssl_capath= '';
 eval SET GLOBAL group_replication_recovery_ssl_cert= '$MYSQL_TEST_DIR/std_data/client-cert.pem';
 SET GLOBAL group_replication_recovery_ssl_cipher= 'DHE-RSA-AES256-SHA';
-SET GLOBAL group_replication_recovery_ssl_crl= 'crl-client-revoked.crl';
 eval SET GLOBAL group_replication_recovery_ssl_crlpath= '';
 eval SET GLOBAL group_replication_recovery_ssl_key= '$MYSQL_TEST_DIR/std_data/client-key.pem';
 SET GLOBAl group_replication_recovery_ssl_verify_server_cert= ON;
@@ -225,6 +230,7 @@
 SET GLOBAL group_replication_recovery_tls_version= "";
 SET GLOBAL group_replication_recovery_tls_ciphersuites= "";
 SET GLOBAL group_replication_view_change_uuid= "aaaaaaaa-cccc-bbbb-dddd-eeeeeeeeeeee";
+SET GLOBAL group_replication_paxos_single_leader= 1;
 --enable_query_log
 
 
@@ -243,6 +249,10 @@
 # Start GR
 --source include/start_group_replication.inc
 
+# Setting this value after start to avoid conflixts when using MySQL stack.
+SET GLOBAL group_replication_recovery_ssl_crl= 'crl-client-revoked.crl';
+SET GLOBAL group_replication_recovery_tls_ciphersuites= "";
+
 # Assert the values of the variables set
 # group_replication_allow_local_lower_version_join
 --let $assert_text= Verify GLOBAL value of group_replication_allow_local_lower_version_join
@@ -979,6 +989,23 @@
 --let $assert_cond= "[SELECT * FROM performance_schema.session_variables WHERE VARIABLE_NAME=\'group_replication_view_change_uuid\', VARIABLE_VALUE, 1]" = "aaaaaaaa-cccc-bbbb-dddd-eeeeeeeeeeee"
 --source include/assert.inc
 
+# group_replication_paxos_single_leader
+--let $assert_text= Verify GLOBAL value of group_replication_paxos_single_leader
+--let $assert_cond= "[SHOW GLOBAL VARIABLES LIKE \'group_replication_paxos_single_leader\', Value, 1]" = "ON"
+--source include/assert.inc
+
+--let $assert_text= Verify GLOBAL value of group_replication_paxos_single_leader
+--let $assert_cond= "[SELECT * FROM performance_schema.global_variables WHERE VARIABLE_NAME=\'group_replication_paxos_single_leader\', VARIABLE_VALUE, 1]" = "ON"
+--source include/assert.inc
+
+--let $assert_text= Verify SESSION value of group_replication_paxos_single_leader
+--let $assert_cond= "[SHOW SESSION VARIABLES LIKE \'group_replication_paxos_single_leader\', Value, 1]" = "ON"
+--source include/assert.inc
+
+--let $assert_text= Verify SESSION value of group_replication_paxos_single_leader
+--let $assert_cond= "[SELECT * FROM performance_schema.session_variables WHERE VARIABLE_NAME=\'group_replication_paxos_single_leader\', VARIABLE_VALUE, 1]" = "ON"
+--source include/assert.inc
+
 --echo
 --echo # Clean up
 --source include/stop_group_replication.inc
@@ -1029,7 +1056,10 @@
 --eval SET @@GLOBAL.group_replication_recovery_tls_version= "$saved_gr_recovery_tls_version"
 --eval SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= "$saved_gr_recovery_tls_ciphersuites"
 --eval SET @@GLOBAL.group_replication_view_change_uuid= "$saved_gr_view_change_uuid"
+--eval SET @@GLOBAL.group_replication_paxos_single_leader= $saved_gr_paxos_single_leader
 --enable_query_log
 
+
+
 --source include/group_replication_end.inc
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_single_primary_async_gr_start_on_boot.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_single_primary_async_gr_start_on_boot.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_single_primary_async_gr_start_on_boot.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_single_primary_async_gr_start_on_boot.test	2021-09-28 11:46:34.000000000 +0000
@@ -231,4 +231,25 @@
 
 RESET SLAVE ALL FOR CHANNEL '';
 
+--let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
+--let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $restart_parameters=restart:--group-replication-start-on-boot=OFF --group-replication-group-name=$group_replication_group_name --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds
+--replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--source include/restart_mysqld.inc
+
+--let $rpl_server_number= 2
+--source include/rpl_reconnect.inc
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
+--let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $restart_parameters=restart:--group-replication-start-on-boot=OFF --group-replication-group-name=$group_replication_group_name --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds
+--replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--source include/restart_mysqld.inc
+
+--let $rpl_server_number= 1
+--source include/rpl_reconnect.inc
+
 --source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_single_primary_double_change.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_single_primary_double_change.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_single_primary_double_change.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_single_primary_double_change.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,7 +17,7 @@
 #
 ###############################################################################
 
-
+--source include/have_group_replication_xcom_communication_stack.inc
 --source include/have_group_replication_plugin.inc
 --let $rpl_server_count= 3
 --let $rpl_skip_group_replication_start= 1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_single_primary_majority_loss_1.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_single_primary_majority_loss_1.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_single_primary_majority_loss_1.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_single_primary_majority_loss_1.test	2021-09-28 11:46:34.000000000 +0000
@@ -27,6 +27,7 @@
 --source include/group_replication.inc
 
 # Start group replication on all the servers
+
 --source include/start_and_bootstrap_group_replication.inc
 --let $member1_uuid= query_get_value(SELECT @@SERVER_UUID, @@SERVER_UUID, 1)
 
@@ -37,6 +38,7 @@
 
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
+
 --source include/start_group_replication.inc
 --let $member2_uuid= query_get_value(SELECT @@SERVER_UUID, @@SERVER_UUID, 1)
 # save this, since it will be used to recover the server later on
@@ -45,6 +47,7 @@
 
 --let $rpl_connection_name= server3
 --source include/rpl_connection.inc
+
 --source include/start_group_replication.inc
 --let $member3_uuid= query_get_value(SELECT @@SERVER_UUID, @@SERVER_UUID, 1)
 # save this, since it will be used to recover the server later on
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_single_primary_majority_loss_2.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_single_primary_majority_loss_2.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_single_primary_majority_loss_2.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_single_primary_majority_loss_2.test	2021-09-28 11:46:34.000000000 +0000
@@ -27,6 +27,7 @@
 # Start group replication on all the servers
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
+
 --source include/start_and_bootstrap_group_replication.inc
 --let $member1_uuid= query_get_value(SELECT @@SERVER_UUID, @@SERVER_UUID, 1)
 # save this, since it will be used to recover the server later on
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_single_primary_mixed_configuration.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_single_primary_mixed_configuration.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_single_primary_mixed_configuration.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_single_primary_mixed_configuration.test	2021-09-28 11:46:34.000000000 +0000
@@ -34,6 +34,7 @@
 call mtr.add_suppression("The member configuration is not compatible with the group configuration. .* .member configuration option: \\[group_replication_enforce_update_everywhere_checks\\], group configuration option: \\[\\].");
 call mtr.add_suppression("The member configuration is not compatible with the group configuration. .* .member configuration option: \\[group_replication_single_primary_mode\\], group configuration option: \\[\\].");
 call mtr.add_suppression("This member joined a group on which all members do not support member actions, as such it did reset its member configuration to the default one.");
+call mtr.add_suppression("This member joined a group on which all members do not support replication failover channels integration on Group Replication, as such it did reset its replication failover channels configuration to the default one.");
 SET SQL_LOG_BIN=1;
 
 SET GLOBAL group_replication_enforce_update_everywhere_checks= 0;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_single_primary_stop.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_single_primary_stop.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_single_primary_stop.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_single_primary_stop.test	2021-09-28 11:46:34.000000000 +0000
@@ -34,10 +34,12 @@
 
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
+
 --source include/start_group_replication.inc
 
 --let $rpl_connection_name= server3
 --source include/rpl_connection.inc
+
 --source include/start_group_replication.inc
 
 --echo #
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_singlewriter_enabled_on_mode_switch.cnf mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_singlewriter_enabled_on_mode_switch.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_singlewriter_enabled_on_mode_switch.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_singlewriter_enabled_on_mode_switch.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,14 @@
+!include ../my.cnf
+
+[mysqld.1]
+group_replication_paxos_single_leader = 1
+
+[mysqld.2]
+group_replication_paxos_single_leader = 1
+
+[mysqld.3]
+group_replication_paxos_single_leader = 1
+
+[ENV]
+SERVER_MYPORT_3=		@mysqld.3.port
+SERVER_MYSOCK_3=		@mysqld.3.socket
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_singlewriter_enabled_on_mode_switch.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_singlewriter_enabled_on_mode_switch.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_singlewriter_enabled_on_mode_switch.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_singlewriter_enabled_on_mode_switch.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,369 @@
+################################################################################
+#
+# Starting from communication protocol version 8.0.22, XCom will use a single
+# leader consensus algorithm based on Multi-Paxos when running GR in SPM.
+#
+# This test shall verify that, upon switching the group mode from MPM to SPM,
+# when on communication protocol v8.0.22, a single leader is used. It will also
+# test that when switching from MPM to SPM while using a previous communication
+# protocol, the previous consensus algorithm is used (i.e. all members as
+# leaders).
+#
+# Test:
+# 0) The test requires three servers.
+# 1) Switch to SPM on every member. For each member that was elected as primary
+# in SPM, the WRITE_CONSENSUS_LEADERS_MEMBER_ID_PREFERRED and
+# WRITE_CONSENSUS_LEADERS_MEMBER_ID_ACTIVE fields of the
+# performance_schema.replication_group_communication_information PFS table
+# should contain *only* the UUID of that member.
+# 2) Change the communication protocol to 8.0.21.
+# 3) Switch to SPM on every member. For each member that was elected as primary
+# in SPM the WRITE_CONSENSUS_LEADERS_MEMBER_ID_PREFERRED and
+# WRITE_CONSENSUS_LEADERS_MEMBER_ID_ACTIVE fields of the
+# performance_schema.replication_group_communication_information PFS table
+# should contain the UUIDs of *all* the members in the group.
+# 4) Cleanup.
+#
+################################################################################
+--source include/big_test.inc
+--source include/have_group_replication_plugin.inc
+
+--echo
+--echo ####
+--echo # 0) The test requires three servers.
+--echo ####
+--echo
+--let $rpl_server_count = 3
+--let $rpl_group_replication_single_primary_mode=0
+--source include/group_replication.inc
+
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("A member is joining the group while a group configuration operation is occurring*");
+SET SESSION sql_log_bin = 1;
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("A member is joining the group while a group configuration operation is occurring*");
+SET SESSION sql_log_bin = 1;
+
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("A member is joining the group while a group configuration operation is occurring*");
+SET SESSION sql_log_bin = 1;
+
+--echo
+--echo ####
+--echo # 1) Switch to SPM on every member. For each member that was elected as
+--echo # primary in SPM, the WRITE_CONSENSUS_LEADERS_MEMBER_ID_PREFERRED and
+--echo # WRITE_CONSENSUS_LEADERS_MEMBER_ID_ACTIVE fields of the
+--echo # performance_schema.replication_group_communication_information PFS
+--echo # table should contain *only* the UUID of that member.
+--echo ####
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+# Elect member 1
+--let $server1_uuid = `SELECT @@server_uuid`
+--replace_result $server1_uuid MEMBER1_UUID
+--eval SELECT group_replication_switch_to_single_primary_mode("$server1_uuid")
+
+# Verify preferred and active members of member 1
+--let $assert_text = The first server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_PREFERRED
+--let $assert_cond = "[SELECT WRITE_CONSENSUS_LEADERS_PREFERRED FROM performance_schema.replication_group_communication_information]" = "$server1_uuid"
+--source include/assert.inc
+--let $assert_text = The first server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_ACTUAL
+--let $assert_cond = "[SELECT WRITE_CONSENSUS_LEADERS_ACTUAL from performance_schema.replication_group_communication_information]" = "$server1_uuid"
+--source include/assert.inc
+
+# Verify preferred and active members of member 2
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $assert_text = The first server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_PREFERRED
+--let $assert_cond = "[SELECT WRITE_CONSENSUS_LEADERS_PREFERRED from performance_schema.replication_group_communication_information]" = "$server1_uuid"
+--source include/assert.inc
+--let $assert_text = The first server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_ACTUAL
+--let $assert_cond = "[SELECT WRITE_CONSENSUS_LEADERS_ACTUAL from performance_schema.replication_group_communication_information]" = "$server1_uuid"
+--source include/assert.inc
+
+# Verify preferred and active members of member 3
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--let $assert_text = The first server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_PREFERRED
+--let $assert_cond = "[SELECT WRITE_CONSENSUS_LEADERS_PREFERRED from performance_schema.replication_group_communication_information]" = "$server1_uuid"
+--source include/assert.inc
+--let $assert_text = The first server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_ACTUAL
+--let $assert_cond = "[SELECT WRITE_CONSENSUS_LEADERS_ACTUAL from performance_schema.replication_group_communication_information]" = "$server1_uuid"
+--source include/assert.inc
+
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/start_and_bootstrap_group_replication.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--source include/start_group_replication.inc
+
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--source include/start_group_replication.inc
+
+# Elect member 2
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $server2_uuid = `SELECT @@server_uuid`
+
+--eval SELECT group_replication_switch_to_multi_primary_mode()
+--replace_result $server2_uuid MEMBER2_UUID
+--eval SELECT group_replication_switch_to_single_primary_mode("$server2_uuid")
+
+--let $wait_condition = SELECT COUNT(*)=1 FROM performance_schema.replication_group_members WHERE MEMBER_ID = "$server2_uuid" AND MEMBER_ROLE = 'PRIMARY'
+--source include/wait_condition.inc
+
+# Verify preferred and active members of member 2
+--let $assert_text = The second server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_PREFERRED
+--let $assert_cond = "[SELECT WRITE_CONSENSUS_LEADERS_PREFERRED from performance_schema.replication_group_communication_information]" = "$server2_uuid"
+--source include/assert.inc
+--let $assert_text = The second server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_ACTUAL
+--let $assert_cond = "[SELECT WRITE_CONSENSUS_LEADERS_ACTUAL from performance_schema.replication_group_communication_information]" = "$server2_uuid"
+--source include/assert.inc
+
+# Verify preferred and active members of member 1
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $assert_text = The second server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_PREFERRED
+--let $assert_cond = "[SELECT WRITE_CONSENSUS_LEADERS_PREFERRED from performance_schema.replication_group_communication_information]" = "$server2_uuid"
+--source include/assert.inc
+--let $assert_text = The second server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_ACTUAL
+--let $assert_cond = "[SELECT WRITE_CONSENSUS_LEADERS_ACTUAL from performance_schema.replication_group_communication_information]" = "$server2_uuid"
+--source include/assert.inc
+
+# Verify preferred and active members of member 3
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--let $assert_text = The second server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_PREFERRED
+--let $assert_cond = "[SELECT WRITE_CONSENSUS_LEADERS_PREFERRED from performance_schema.replication_group_communication_information]" = "$server2_uuid"
+--source include/assert.inc
+--let $assert_text = The second server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_ACTUAL
+--let $assert_cond = "[SELECT WRITE_CONSENSUS_LEADERS_ACTUAL from performance_schema.replication_group_communication_information]" = "$server2_uuid"
+--source include/assert.inc
+
+# Elect member 3
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--let $server3_uuid = `SELECT @@server_uuid`
+
+--eval SELECT group_replication_switch_to_multi_primary_mode()
+--replace_result $server3_uuid MEMBER3_UUID
+--eval SELECT group_replication_switch_to_single_primary_mode("$server3_uuid")
+
+--let $wait_condition = SELECT COUNT(*)=1 FROM performance_schema.replication_group_members WHERE MEMBER_ID = "$server3_uuid" AND MEMBER_ROLE = 'PRIMARY'
+--source include/wait_condition.inc
+
+# Verify preferred and active members of member 3
+--let $assert_text = The third server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_PREFERRED
+--let $assert_cond = "[SELECT WRITE_CONSENSUS_LEADERS_PREFERRED from performance_schema.replication_group_communication_information]" = "$server3_uuid"
+--source include/assert.inc
+--let $assert_text = The third server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_ACTUAL
+--let $assert_cond = "[SELECT WRITE_CONSENSUS_LEADERS_ACTUAL from performance_schema.replication_group_communication_information]" = "$server3_uuid"
+--source include/assert.inc
+
+# Verify preferred and active members of member 1
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $assert_text = The third server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_PREFERRED
+--let $assert_cond = "[SELECT WRITE_CONSENSUS_LEADERS_PREFERRED from performance_schema.replication_group_communication_information]" = "$server3_uuid"
+--source include/assert.inc
+--let $assert_text = The third server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_ACTUAL
+--let $assert_cond = "[SELECT WRITE_CONSENSUS_LEADERS_ACTUAL from performance_schema.replication_group_communication_information]" = "$server3_uuid"
+--source include/assert.inc
+
+# Verify preferred and active members of member 2
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $assert_text = The third server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_PREFERRED
+--let $assert_cond = "[SELECT WRITE_CONSENSUS_LEADERS_PREFERRED from performance_schema.replication_group_communication_information]" = "$server3_uuid"
+--source include/assert.inc
+--let $assert_text = The third server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_ACTUAL
+--let $assert_cond = "[SELECT WRITE_CONSENSUS_LEADERS_ACTUAL from performance_schema.replication_group_communication_information]" = "$server3_uuid"
+--source include/assert.inc
+
+--echo
+--echo ####
+--echo # 2) Change the communication protocol to 8.0.21.
+--echo ####
+--echo
+--eval SELECT group_replication_set_communication_protocol("8.0.21")
+
+--echo
+--echo ####
+--echo # 3) Switch to SPM on every member. For each member that was elected as
+--echo # primary in SPM the WRITE_CONSENSUS_LEADERS_MEMBER_ID_PREFERRED and
+--echo # WRITE_CONSENSUS_LEADERS_MEMBER_ID_ACTIVE fields of the
+--echo # performance_schema.replication_group_communication_information PFS
+--echo # table should contain the UUIDs of *all* the members in the group.
+--echo ####
+--echo
+
+# Elect member 1
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--eval SELECT group_replication_switch_to_multi_primary_mode()
+--replace_result $server1_uuid MEMBER1_UUID
+--eval SELECT group_replication_switch_to_single_primary_mode("$server1_uuid")
+
+--let $wait_condition = SELECT COUNT(*)=1 FROM performance_schema.replication_group_members WHERE MEMBER_ID = "$server1_uuid" AND MEMBER_ROLE = 'PRIMARY'
+--source include/wait_condition.inc
+
+# Verify preferred and active members of member 1
+--let $assert_text = All members should be in WRITE_CONSENSUS_LEADERS_PREFERRED
+--let $num_rows = `SELECT COUNT(*) FROM performance_schema.replication_group_communication_information WHERE WRITE_CONSENSUS_LEADERS_PREFERRED LIKE '%$server1_uuid%' AND WRITE_CONSENSUS_LEADERS_PREFERRED LIKE '%$server2_uuid%' AND WRITE_CONSENSUS_LEADERS_PREFERRED LIKE '%$server3_uuid%'`
+--let $assert_cond = "$num_rows" = "1"
+--source include/assert.inc
+--let $assert_text = All members should be in WRITE_CONSENSUS_LEADERS_ACTUAL
+--let $num_rows = `SELECT COUNT(*) FROM performance_schema.replication_group_communication_information WHERE WRITE_CONSENSUS_LEADERS_ACTUAL LIKE '%$server1_uuid%' AND WRITE_CONSENSUS_LEADERS_ACTUAL LIKE '%$server2_uuid%' AND WRITE_CONSENSUS_LEADERS_ACTUAL LIKE '%$server3_uuid%'`
+--let $assert_cond = "$num_rows" = "1"
+--source include/assert.inc
+
+# Verify preferred and active members of member 2
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $assert_text = All members should be in WRITE_CONSENSUS_LEADERS_PREFERRED
+--let $num_rows = `SELECT COUNT(*) FROM performance_schema.replication_group_communication_information WHERE WRITE_CONSENSUS_LEADERS_PREFERRED LIKE '%$server1_uuid%' AND WRITE_CONSENSUS_LEADERS_PREFERRED LIKE '%$server2_uuid%' AND WRITE_CONSENSUS_LEADERS_PREFERRED LIKE '%$server3_uuid%'`
+--let $assert_cond = "$num_rows" = "1"
+--source include/assert.inc
+--let $assert_text = All members should be in WRITE_CONSENSUS_LEADERS_ACTUAL
+--let $num_rows = `SELECT COUNT(*) FROM performance_schema.replication_group_communication_information WHERE WRITE_CONSENSUS_LEADERS_ACTUAL LIKE '%$server1_uuid%' AND WRITE_CONSENSUS_LEADERS_ACTUAL LIKE '%$server2_uuid%' AND WRITE_CONSENSUS_LEADERS_ACTUAL LIKE '%$server3_uuid%'`
+--let $assert_cond = "$num_rows" = "1"
+--source include/assert.inc
+
+# Verify preferred and active members of member 3
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--let $assert_text = All members should be in WRITE_CONSENSUS_LEADERS_PREFERRED
+--let $num_rows = `SELECT COUNT(*) FROM performance_schema.replication_group_communication_information WHERE WRITE_CONSENSUS_LEADERS_PREFERRED LIKE '%$server1_uuid%' AND WRITE_CONSENSUS_LEADERS_PREFERRED LIKE '%$server2_uuid%' AND WRITE_CONSENSUS_LEADERS_PREFERRED LIKE '%$server3_uuid%'`
+--let $assert_cond = "$num_rows" = "1"
+--source include/assert.inc
+--let $assert_text = All members should be in WRITE_CONSENSUS_LEADERS_ACTUAL
+--let $num_rows = `SELECT COUNT(*) FROM performance_schema.replication_group_communication_information WHERE WRITE_CONSENSUS_LEADERS_ACTUAL LIKE '%$server1_uuid%' AND WRITE_CONSENSUS_LEADERS_ACTUAL LIKE '%$server2_uuid%' AND WRITE_CONSENSUS_LEADERS_ACTUAL LIKE '%$server3_uuid%'`
+--let $assert_cond = "$num_rows" = "1"
+--source include/assert.inc
+
+# Elect member 2
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $server2_uuid = `SELECT @@server_uuid`
+
+--eval SELECT group_replication_switch_to_multi_primary_mode()
+--replace_result $server2_uuid MEMBER2_UUID
+--eval SELECT group_replication_switch_to_single_primary_mode("$server2_uuid")
+
+--let $wait_condition = SELECT COUNT(*)=1 FROM performance_schema.replication_group_members WHERE MEMBER_ID = "$server2_uuid" AND MEMBER_ROLE = 'PRIMARY'
+--source include/wait_condition.inc
+
+# Verify preferred and active members of member 2
+--let $assert_text = All members should be in WRITE_CONSENSUS_LEADERS_PREFERRED
+--let $num_rows = `SELECT COUNT(*) FROM performance_schema.replication_group_communication_information WHERE WRITE_CONSENSUS_LEADERS_PREFERRED LIKE '%$server1_uuid%' AND WRITE_CONSENSUS_LEADERS_PREFERRED LIKE '%$server2_uuid%' AND WRITE_CONSENSUS_LEADERS_PREFERRED LIKE '%$server3_uuid%'`
+--let $assert_cond = "$num_rows" = "1"
+--source include/assert.inc
+--let $assert_text = All members should be in WRITE_CONSENSUS_LEADERS_ACTUAL
+--let $num_rows = `SELECT COUNT(*) FROM performance_schema.replication_group_communication_information WHERE WRITE_CONSENSUS_LEADERS_ACTUAL LIKE '%$server1_uuid%' AND WRITE_CONSENSUS_LEADERS_ACTUAL LIKE '%$server2_uuid%' AND WRITE_CONSENSUS_LEADERS_ACTUAL LIKE '%$server3_uuid%'`
+--let $assert_cond = "$num_rows" = "1"
+--source include/assert.inc
+
+# Verify preferred and active members of member 1
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $assert_text = All members should be in WRITE_CONSENSUS_LEADERS_PREFERRED
+--let $num_rows = `SELECT COUNT(*) FROM performance_schema.replication_group_communication_information WHERE WRITE_CONSENSUS_LEADERS_PREFERRED LIKE '%$server1_uuid%' AND WRITE_CONSENSUS_LEADERS_PREFERRED LIKE '%$server2_uuid%' AND WRITE_CONSENSUS_LEADERS_PREFERRED LIKE '%$server3_uuid%'`
+--let $assert_cond = "$num_rows" = "1"
+--source include/assert.inc
+--let $assert_text = All members should be in WRITE_CONSENSUS_LEADERS_ACTUAL
+--let $num_rows = `SELECT COUNT(*) FROM performance_schema.replication_group_communication_information WHERE WRITE_CONSENSUS_LEADERS_ACTUAL LIKE '%$server1_uuid%' AND WRITE_CONSENSUS_LEADERS_ACTUAL LIKE '%$server2_uuid%' AND WRITE_CONSENSUS_LEADERS_ACTUAL LIKE '%$server3_uuid%'`
+--let $assert_cond = "$num_rows" = "1"
+--source include/assert.inc
+
+# Verify preferred and active members of member 3
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--let $assert_text = All members should be in WRITE_CONSENSUS_LEADERS_PREFERRED
+--let $num_rows = `SELECT COUNT(*) FROM performance_schema.replication_group_communication_information WHERE WRITE_CONSENSUS_LEADERS_PREFERRED LIKE '%$server1_uuid%' AND WRITE_CONSENSUS_LEADERS_PREFERRED LIKE '%$server2_uuid%' AND WRITE_CONSENSUS_LEADERS_PREFERRED LIKE '%$server3_uuid%'`
+--let $assert_cond = "$num_rows" = "1"
+--source include/assert.inc
+--let $assert_text = All members should be in WRITE_CONSENSUS_LEADERS_ACTUAL
+--let $num_rows = `SELECT COUNT(*) FROM performance_schema.replication_group_communication_information WHERE WRITE_CONSENSUS_LEADERS_ACTUAL LIKE '%$server1_uuid%' AND WRITE_CONSENSUS_LEADERS_ACTUAL LIKE '%$server2_uuid%' AND WRITE_CONSENSUS_LEADERS_ACTUAL LIKE '%$server3_uuid%'`
+--let $assert_cond = "$num_rows" = "1"
+--source include/assert.inc
+
+# Elect member 3
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--let $server3_uuid = `SELECT @@server_uuid`
+
+--eval SELECT group_replication_switch_to_multi_primary_mode()
+--replace_result $server3_uuid MEMBER3_UUID
+--eval SELECT group_replication_switch_to_single_primary_mode("$server3_uuid")
+
+--let $wait_condition = SELECT COUNT(*)=1 FROM performance_schema.replication_group_members WHERE MEMBER_ID = "$server3_uuid" AND MEMBER_ROLE = 'PRIMARY'
+--source include/wait_condition.inc
+
+# Verify preferred and active members of member 3
+--let $assert_text = All members should be in WRITE_CONSENSUS_LEADERS_PREFERRED
+--let $num_rows = `SELECT COUNT(*) FROM performance_schema.replication_group_communication_information WHERE WRITE_CONSENSUS_LEADERS_PREFERRED LIKE '%$server1_uuid%' AND WRITE_CONSENSUS_LEADERS_PREFERRED LIKE '%$server2_uuid%' AND WRITE_CONSENSUS_LEADERS_PREFERRED LIKE '%$server3_uuid%'`
+--let $assert_cond = "$num_rows" = "1"
+--source include/assert.inc
+--let $assert_text = All members should be in WRITE_CONSENSUS_LEADERS_ACTUAL
+--let $num_rows = `SELECT COUNT(*) FROM performance_schema.replication_group_communication_information WHERE WRITE_CONSENSUS_LEADERS_ACTUAL LIKE '%$server1_uuid%' AND WRITE_CONSENSUS_LEADERS_ACTUAL LIKE '%$server2_uuid%' AND WRITE_CONSENSUS_LEADERS_ACTUAL LIKE '%$server3_uuid%'`
+--let $assert_cond = "$num_rows" = "1"
+--source include/assert.inc
+
+# Verify preferred and active members of member 1
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $assert_text = All members should be in WRITE_CONSENSUS_LEADERS_PREFERRED
+--let $num_rows = `SELECT COUNT(*) FROM performance_schema.replication_group_communication_information WHERE WRITE_CONSENSUS_LEADERS_PREFERRED LIKE '%$server1_uuid%' AND WRITE_CONSENSUS_LEADERS_PREFERRED LIKE '%$server2_uuid%' AND WRITE_CONSENSUS_LEADERS_PREFERRED LIKE '%$server3_uuid%'`
+--let $assert_cond = "$num_rows" = "1"
+--source include/assert.inc
+--let $assert_text = All members should be in WRITE_CONSENSUS_LEADERS_ACTUAL
+--let $num_rows = `SELECT COUNT(*) FROM performance_schema.replication_group_communication_information WHERE WRITE_CONSENSUS_LEADERS_ACTUAL LIKE '%$server1_uuid%' AND WRITE_CONSENSUS_LEADERS_ACTUAL LIKE '%$server2_uuid%' AND WRITE_CONSENSUS_LEADERS_ACTUAL LIKE '%$server3_uuid%'`
+--let $assert_cond = "$num_rows" = "1"
+--source include/assert.inc
+
+# Verify preferred and active members of member 2
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $assert_text = All members should be in WRITE_CONSENSUS_LEADERS_PREFERRED
+--let $num_rows = `SELECT COUNT(*) FROM performance_schema.replication_group_communication_information WHERE WRITE_CONSENSUS_LEADERS_PREFERRED LIKE '%$server1_uuid%' AND WRITE_CONSENSUS_LEADERS_PREFERRED LIKE '%$server2_uuid%' AND WRITE_CONSENSUS_LEADERS_PREFERRED LIKE '%$server3_uuid%'`
+--let $assert_cond = "$num_rows" = "1"
+--source include/assert.inc
+--let $assert_text = All members should be in WRITE_CONSENSUS_LEADERS_ACTUAL
+--let $num_rows = `SELECT COUNT(*) FROM performance_schema.replication_group_communication_information WHERE WRITE_CONSENSUS_LEADERS_ACTUAL LIKE '%$server1_uuid%' AND WRITE_CONSENSUS_LEADERS_ACTUAL LIKE '%$server2_uuid%' AND WRITE_CONSENSUS_LEADERS_ACTUAL LIKE '%$server3_uuid%'`
+--let $assert_cond = "$num_rows" = "1"
+--source include/assert.inc
+
+--echo
+--echo ####
+--echo # 4) Cleanup.
+--echo ####
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+--let $rpl_group_replication_single_primary_mode=1
+--let $rpl_group_replication_reset_persistent_vars=1
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_singlewriter_option.cnf mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_singlewriter_option.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_singlewriter_option.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_singlewriter_option.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,15 @@
+!include ../my.cnf
+
+[mysqld.1]
+group_replication_paxos_single_leader = 1
+
+[mysqld.2]
+group_replication_paxos_single_leader = 1
+
+[mysqld.3]
+group_replication_paxos_single_leader = 1
+report-port=        @mysqld.3.port
+
+[ENV]
+SERVER_MYPORT_3=		@mysqld.3.port
+SERVER_MYSOCK_3=		@mysqld.3.socket
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_singlewriter_option.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_singlewriter_option.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_singlewriter_option.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_singlewriter_option.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,291 @@
+################################################################################
+#
+# This test shall verify that the group_replication_paxos_single_leader system
+# variable correctly enables/disables the single-leader behavior introduced in
+# WL#9149 and also that a member with a different value on this system variable
+# cannot join the group.
+#
+# Test:
+# 0) Verify that the default value of group_replication_paxos_single_leader is
+# true
+# 1) The test requires three servers.
+# 2) Verify that the UUID present in WRITE_CONSENSUS_LEADERS_MEMBER_ID_PREFERRED
+# and in WRITE_CONSENSUS_LEADERS_MEMBER_ID_ACTIVE is the UUID of the primary
+# 3) Change the value of group_replication_paxos_single_leader to false
+# 4) Verify that the value of the new sysvar is false
+# 5) The group should still be using single-leader
+# 6) Reboot the plugin (add only 2 of the members)
+# 7) Verify that the UUIDs contained in
+# WRITE_CONSENSUS_LEADERS_MEMBER_ID_PREFERRED and in
+# WRITE_CONSENSUS_LEADERS_MEMBER_ID_ACTIVE contain all the UUIDs of all the
+# members in the group
+# 8) Change the sysvar value on the third member to true
+# 9) Try to add the third member
+# 9.1) Adding the third member should fail
+# 10) Cleanup.
+#
+################################################################################
+--source include/big_test.inc
+--source include/have_debug.inc
+--source include/linux.inc
+--source include/have_group_replication_plugin.inc
+--let $rpl_server_count = 3
+--let $rpl_group_replication_single_primary_mode=1
+--let $rpl_skip_group_replication_start=1
+--source include/group_replication.inc
+
+--let $rpl_connection_name = server3
+--source include/rpl_connection.inc
+
+SET sql_log_bin = 0;
+call mtr.add_suppression("This member is configured with a group_replication_paxos_single_leader option value of*");
+SET sql_log_bin = 1;
+
+--echo
+--echo ####
+--echo # 0) Verify that the default value of
+--echo # group_replication_paxos_single_leader is true
+--echo ####
+--echo
+--let $rpl_connection_name = server1
+--source include/rpl_connection.inc
+
+SET @@GLOBAL.group_replication_paxos_single_leader = default;
+--let $assert_text = The default of group_replication_paxos_single_leader should be 0
+--let $assert_cond = [SELECT @@GLOBAL.group_replication_paxos_single_leader] = 0
+--source include/assert.inc
+
+--echo
+--echo ####
+--echo # 1) The test requires three servers.
+--echo ####
+--echo
+SET @@GLOBAL.group_replication_paxos_single_leader = 1;
+--source include/start_and_bootstrap_group_replication.inc
+
+--let $rpl_connection_name = server2
+--source include/rpl_connection.inc
+--source include/start_group_replication.inc
+
+--let $rpl_connection_name = server3
+--source include/rpl_connection.inc
+--source include/start_group_replication.inc
+
+--echo
+--echo ####
+--echo # 2) Verify that the UUID present in
+--echo # WRITE_CONSENSUS_LEADERS_MEMBER_ID_PREFERRED and in
+--echo # WRITE_CONSENSUS_LEADERS_MEMBER_ID_ACTIVE is the UUID of the primary
+--echo ####
+--echo
+--let $rpl_connection_name = server1
+--source include/rpl_connection.inc
+--let $server1_uuid = `SELECT @@server_uuid`
+# Verify preferred and active members of member 1
+--let $assert_text = The first server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_PREFERRED
+--let $assert_cond = "[SELECT WRITE_CONSENSUS_LEADERS_PREFERRED FROM performance_schema.replication_group_communication_information]" = "$server1_uuid"
+--source include/assert.inc
+--let $assert_text = The first server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_ACTUAL
+--let $assert_cond = "[SELECT WRITE_CONSENSUS_LEADERS_ACTUAL from performance_schema.replication_group_communication_information]" = "$server1_uuid"
+--source include/assert.inc
+
+# Verify preferred and active members of member 2
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $assert_text = The first server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_PREFERRED
+--let $assert_cond = "[SELECT WRITE_CONSENSUS_LEADERS_PREFERRED from performance_schema.replication_group_communication_information]" = "$server1_uuid"
+--source include/assert.inc
+--let $assert_text = The first server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_ACTUAL
+--let $assert_cond = "[SELECT WRITE_CONSENSUS_LEADERS_ACTUAL from performance_schema.replication_group_communication_information]" = "$server1_uuid"
+--source include/assert.inc
+
+# Verify preferred and active members of member 3
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--let $assert_text = The first server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_PREFERRED
+--let $assert_cond = "[SELECT WRITE_CONSENSUS_LEADERS_PREFERRED from performance_schema.replication_group_communication_information]" = "$server1_uuid"
+--source include/assert.inc
+--let $assert_text = The first server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_ACTUAL
+--let $assert_cond = "[SELECT WRITE_CONSENSUS_LEADERS_ACTUAL from performance_schema.replication_group_communication_information]" = "$server1_uuid"
+--source include/assert.inc
+
+--echo
+--echo ####
+--echo # 3) Change the value of group_replication_paxos_single_leader to false
+--echo ####
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+SET GLOBAL group_replication_paxos_single_leader = 0;
+
+--echo
+--echo ####
+--echo # 4) Verify that the value of the new sysvar is false
+--echo ####
+--echo
+--let $assert_text = The value of group_replication_paxos_single_leader should be 0
+--let $assert_cond = [SELECT @@GLOBAL.group_replication_paxos_single_leader] = 0
+--source include/assert.inc
+
+--echo
+--echo ####
+--echo # 5) The group should still be using single-leader
+--echo ####
+--echo
+--let $server1_uuid = `SELECT @@server_uuid`
+# Verify preferred and active members of member 1
+--let $assert_text = The first server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_PREFERRED
+--let $assert_cond = "[SELECT WRITE_CONSENSUS_LEADERS_PREFERRED FROM performance_schema.replication_group_communication_information]" = "$server1_uuid"
+--source include/assert.inc
+--let $assert_text = The first server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_ACTUAL
+--let $assert_cond = "[SELECT WRITE_CONSENSUS_LEADERS_ACTUAL from performance_schema.replication_group_communication_information]" = "$server1_uuid"
+--source include/assert.inc
+
+# Verify preferred and active members of member 2
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $assert_text = The first server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_PREFERRED
+--let $assert_cond = "[SELECT WRITE_CONSENSUS_LEADERS_PREFERRED from performance_schema.replication_group_communication_information]" = "$server1_uuid"
+--source include/assert.inc
+--let $assert_text = The first server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_ACTUAL
+--let $assert_cond = "[SELECT WRITE_CONSENSUS_LEADERS_ACTUAL from performance_schema.replication_group_communication_information]" = "$server1_uuid"
+--source include/assert.inc
+
+# Verify preferred and active members of member 3
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--let $assert_text = The first server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_PREFERRED
+--let $assert_cond = "[SELECT WRITE_CONSENSUS_LEADERS_PREFERRED from performance_schema.replication_group_communication_information]" = "$server1_uuid"
+--source include/assert.inc
+--let $assert_text = The first server's UUID should be the only UUID in WRITE_CONSENSUS_LEADERS_ACTUAL
+--let $assert_cond = "[SELECT WRITE_CONSENSUS_LEADERS_ACTUAL from performance_schema.replication_group_communication_information]" = "$server1_uuid"
+--source include/assert.inc
+
+--echo
+--echo ####
+--echo # 6) Reboot the plugin (add only 2 of the members)
+--echo ####
+--echo
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--let $server3_uuid = `SELECT @@GLOBAL.server_uuid`
+--source include/stop_group_replication.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+--source include/start_and_bootstrap_group_replication.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+SET GLOBAL group_replication_paxos_single_leader = 0;
+--source include/start_group_replication.inc
+
+--echo
+--echo ####
+--echo # 7) Verify that the UUIDs contained in
+--echo # WRITE_CONSENSUS_LEADERS_MEMBER_ID_PREFERRED and in
+--echo # WRITE_CONSENSUS_LEADERS_MEMBER_ID_ACTIVE contain all the UUIDs of all
+--echo # the members in the group
+--echo ####
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+# Verify preferred and active members of member 1
+--let $assert_text = All members should be in WRITE_CONSENSUS_LEADERS_PREFERRED
+--let $num_rows = `SELECT COUNT(*) FROM performance_schema.replication_group_communication_information WHERE WRITE_CONSENSUS_LEADERS_PREFERRED LIKE '%$server1_uuid%' AND WRITE_CONSENSUS_LEADERS_PREFERRED LIKE '%$server2_uuid%'`
+--let $assert_cond = "$num_rows" = "1"
+--source include/assert.inc
+--let $assert_text = All members should be in WRITE_CONSENSUS_LEADERS_ACTUAL
+--let $num_rows = `SELECT COUNT(*) FROM performance_schema.replication_group_communication_information WHERE WRITE_CONSENSUS_LEADERS_ACTUAL LIKE '%$server1_uuid%' AND WRITE_CONSENSUS_LEADERS_ACTUAL LIKE '%$server2_uuid%'`
+--let $assert_cond = "$num_rows" = "1"
+--source include/assert.inc
+
+# Verify preferred and active members of member 2
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $assert_text = All members should be in WRITE_CONSENSUS_LEADERS_PREFERRED
+--let $num_rows = `SELECT COUNT(*) FROM performance_schema.replication_group_communication_information WHERE WRITE_CONSENSUS_LEADERS_PREFERRED LIKE '%$server1_uuid%' AND WRITE_CONSENSUS_LEADERS_PREFERRED LIKE '%$server2_uuid%'`
+--let $assert_cond = "$num_rows" = "1"
+--source include/assert.inc
+--let $assert_text = All members should be in WRITE_CONSENSUS_LEADERS_ACTUAL
+--let $num_rows = `SELECT COUNT(*) FROM performance_schema.replication_group_communication_information WHERE WRITE_CONSENSUS_LEADERS_ACTUAL LIKE '%$server1_uuid%' AND WRITE_CONSENSUS_LEADERS_ACTUAL LIKE '%$server2_uuid%'`
+--let $assert_cond = "$num_rows" = "1"
+--source include/assert.inc
+
+--echo
+--echo ####
+--echo # 8) Change the sysvar value on the third member to true
+--echo ####
+--echo
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+
+SET GLOBAL group_replication_paxos_single_leader = 1;
+
+--echo
+--echo ####
+--echo # 9) Try to add the third member
+--echo ####
+--echo
+--error ER_GROUP_REPLICATION_CONFIGURATION
+START GROUP_REPLICATION;
+
+# The third member should not have been added
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--let $assert_text = All members should be in WRITE_CONSENSUS_LEADERS_PREFERRED
+--let $num_rows = `SELECT COUNT(*) FROM performance_schema.replication_group_communication_information WHERE WRITE_CONSENSUS_LEADERS_PREFERRED LIKE '%$server1_uuid%' AND WRITE_CONSENSUS_LEADERS_PREFERRED LIKE '%$server2_uuid%'`
+--let $assert_cond = "$num_rows" = "1"
+--source include/assert.inc
+--let $assert_text = All members should be in WRITE_CONSENSUS_LEADERS_ACTUAL
+--let $num_rows = `SELECT COUNT(*) FROM performance_schema.replication_group_communication_information WHERE WRITE_CONSENSUS_LEADERS_ACTUAL LIKE '%$server1_uuid%' AND WRITE_CONSENSUS_LEADERS_ACTUAL LIKE '%$server2_uuid%'`
+--let $assert_cond = "$num_rows" = "1"
+--source include/assert.inc
+--let $assert_text = Member 3 should not have been added to the group
+--let $num_rows = `SELECT COUNT(*) FROM performance_schema.replication_group_members WHERE MEMBER_ID LIKE '%$server3_uuid%'`
+--let $assert_cond = "$num_rows" = "0"
+--source include/assert.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--let $assert_text = All members should be in WRITE_CONSENSUS_LEADERS_PREFERRED
+--let $num_rows = `SELECT COUNT(*) FROM performance_schema.replication_group_communication_information WHERE WRITE_CONSENSUS_LEADERS_PREFERRED LIKE '%$server1_uuid%' AND WRITE_CONSENSUS_LEADERS_PREFERRED LIKE '%$server2_uuid%'`
+--let $assert_cond = "$num_rows" = "1"
+--source include/assert.inc
+--let $assert_text = All members should be in WRITE_CONSENSUS_LEADERS_ACTUAL
+--let $num_rows = `SELECT COUNT(*) FROM performance_schema.replication_group_communication_information WHERE WRITE_CONSENSUS_LEADERS_ACTUAL LIKE '%$server1_uuid%' AND WRITE_CONSENSUS_LEADERS_ACTUAL LIKE '%$server2_uuid%'`
+--let $assert_cond = "$num_rows" = "1"
+--source include/assert.inc
+--let $assert_text = Member 3 should not have been added to the group
+--let $num_rows = `SELECT COUNT(*) FROM performance_schema.replication_group_members WHERE MEMBER_ID LIKE '%$server3_uuid%'`
+--let $assert_cond = "$num_rows" = "0"
+--source include/assert.inc
+
+--echo
+--echo ####
+--echo # 10) Cleanup.
+--echo ####
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+SET GLOBAL group_replication_paxos_single_leader = 1;
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+SET GLOBAL group_replication_paxos_single_leader = 1;
+
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+SET GLOBAL group_replication_paxos_single_leader = 1;
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_skip_wait_for_view_modification.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_skip_wait_for_view_modification.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_skip_wait_for_view_modification.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_skip_wait_for_view_modification.test	2021-09-28 11:46:34.000000000 +0000
@@ -33,6 +33,8 @@
 SET SESSION sql_log_bin= 0;
 call mtr.add_suppression("Timeout on wait for view after joining group");
 call mtr.add_suppression("While leaving the group due to a stop, shutdown or failure there was a timeout receiving a view change. This can lead to a possible inconsistent state. Check the log for more details");
+call mtr.add_suppression("Timeout while waiting for the group communication engine to exit*.*");
+call mtr.add_suppression("The member has failed to gracefully leave the group*.*");
 SET SESSION sql_log_bin= 1;
 
 SET @@GLOBAL.DEBUG='+d,group_replication_force_view_modification_timeout';
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_sql_api_max_connections.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_sql_api_max_connections.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_sql_api_max_connections.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_sql_api_max_connections.test	2021-09-28 11:46:34.000000000 +0000
@@ -26,10 +26,10 @@
 
 --source include/count_sessions.inc
 --replace_result $count_sessions CURRENT_CONNECTIONS
---eval SET @@GLOBAL.max_connections= $count_sessions
+--eval SET @@GLOBAL.max_connections= ($count_sessions + 2)
 
 --let $assert_text= max_connections must be the value of current connections
---let $assert_cond= [SELECT @@GLOBAL.max_connections] = $count_sessions
+--let $assert_cond= [SELECT @@GLOBAL.max_connections] = ($count_sessions + 2)
 --source include/assert.inc
 
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_fips_mode.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_fips_mode.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_fips_mode.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_fips_mode.test	2021-09-28 11:46:34.000000000 +0000
@@ -14,6 +14,7 @@
 ################################################################################
 
 --source include/big_test.inc
+--source include/have_group_replication_xcom_communication_stack.inc
 --source include/have_fips.inc
 --source include/have_group_replication_plugin.inc
 --let $rpl_skip_group_replication_start= 1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_mode.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_mode.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_mode.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_mode.test	2021-09-28 11:46:34.000000000 +0000
@@ -18,6 +18,7 @@
 #   6. Clean up.
 #
 --source include/big_test.inc
+--source include/have_group_replication_xcom_communication_stack.inc
 --source include/have_group_replication_plugin.inc
 --let $rpl_skip_group_replication_start= 1
 --source include/group_replication.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_mode_tls_source_incompatible_certificates.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_mode_tls_source_incompatible_certificates.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_mode_tls_source_incompatible_certificates.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_mode_tls_source_incompatible_certificates.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,6 +17,7 @@
 #   3. Clean up.
 #
 --source include/big_test.inc
+--source include/have_group_replication_xcom_communication_stack.inc
 --source include/have_group_replication_plugin.inc
 --let $rpl_skip_group_replication_start= 1
 --source include/group_replication.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_mode_tls_source_mysql_admin.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_mode_tls_source_mysql_admin.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_mode_tls_source_mysql_admin.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_mode_tls_source_mysql_admin.test	2021-09-28 11:46:34.000000000 +0000
@@ -19,6 +19,7 @@
 #   6. Clean up.
 #
 --source include/big_test.inc
+--source include/have_group_replication_xcom_communication_stack.inc
 --source include/have_group_replication_plugin.inc
 --let $rpl_skip_group_replication_start= 1
 --source include/group_replication.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_mode_verify_identity_error_mysql-master.opt mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_mode_verify_identity_error_mysql-master.opt
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_mode_verify_identity_error_mysql-master.opt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_mode_verify_identity_error_mysql-master.opt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,3 @@
+--log_error=$MYSQLTEST_VARDIR/tmp/group_replication_ssl_mode_verify_identity_error.1.err
+--loose-group_replication_communication_stack=MySQL
+
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_mode_verify_identity_error_mysql-slave.opt mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_mode_verify_identity_error_mysql-slave.opt
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_mode_verify_identity_error_mysql-slave.opt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_mode_verify_identity_error_mysql-slave.opt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,7 @@
+--log_error=$MYSQLTEST_VARDIR/tmp/group_replication_ssl_mode_verify_identity_error.2.err
+--ssl-ca=$MYSQL_TEST_DIR/std_data/new_certs_for_bad_host/ca-bad-host.pem
+--ssl-key=$MYSQL_TEST_DIR/std_data/new_certs_for_bad_host/server-key-bad-host.pem
+--ssl-cert=$MYSQL_TEST_DIR/std_data/new_certs_for_bad_host/server-cert-bad-host.pem
+--loose-group_replication_communication_stack=MySQL
+
+
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_mode_verify_identity_error_mysql.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_mode_verify_identity_error_mysql.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_mode_verify_identity_error_mysql.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_mode_verify_identity_error_mysql.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,8 @@
+################################################################################
+# Validate that Group Replication ssl mode works properly with MySQL
+################################################################################
+
+--source include/have_group_replication_plugin_base.inc
+--source include/have_group_replication_mysql_communication_stack.inc
+
+--source ../include/gr_ssl_mode_verify_identity_error.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_mode_verify_identity_error.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_mode_verify_identity_error.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_mode_verify_identity_error.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_mode_verify_identity_error.test	1970-01-01 00:00:00.000000000 +0000
@@ -1,82 +0,0 @@
-#
-# Validate that Group Replication ssl mode works properly.
-#
-# Steps:
-#   1. Start one member with GCS SSL enabled with ssl mode
-#      VERIFY_IDENTITY.
-#   2. Start the second member with GCS SSL enabled and
-#      validating server certificate against the CA plus
-#      validating that server hostname matches server
-#      certificate hostname, the member will not be able to
-#      join the group, since the certificate contains an invalid
-#      hostname.
-#   3. Clean up.
-#
---source include/big_test.inc
---source include/check_openssl_version.inc
---source include/have_group_replication_plugin.inc
---let $rpl_skip_group_replication_start= 1
---source include/group_replication.inc
-
-
---echo
---echo ############################################################
---echo # 1. Start one member with GCS SSL enabled.
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
-SET @group_replication_ssl_mode_save= @@GLOBAL.group_replication_ssl_mode;
-SET GLOBAL group_replication_ssl_mode= VERIFY_IDENTITY;
---source include/start_and_bootstrap_group_replication.inc
-
---let $grep_file= $MYSQLTEST_VARDIR/tmp/group_replication_ssl_mode_verify_identity_error.1.err
---let $grep_pattern= Group communication SSL configuration: group_replication_ssl_mode: "VERIFY_IDENTITY"
---let $grep_output= print_count
---source include/grep_pattern.inc
-
-
---echo
---echo ############################################################
---echo # 2. Start the second member with GCS SSL enabled and
---echo #    validating server certificate against the CA plus
---echo #    validating that server hostname matches server
---echo #    certificate hostname, the member will not be able to
---echo #    join the group, since the certificate does contain the
---echo #    hostname 'localhost' and the hostname is '127.0.0.1'.
---let $rpl_connection_name= server2
---source include/rpl_connection.inc
-SET @group_replication_ssl_mode_save= @@GLOBAL.group_replication_ssl_mode;
-
---disable_query_log
---eval SET GLOBAL group_replication_group_name= '$group_replication_group_name'
---enable_query_log
-SET GLOBAL group_replication_ssl_mode= VERIFY_IDENTITY;
-
---error ER_GROUP_REPLICATION_CONFIGURATION
-START GROUP_REPLICATION;
-
---let $assert_text= Check that Group Replication is running with SSL VERIFY_IDENTITY enabled
---let $assert_file= $MYSQLTEST_VARDIR/tmp/group_replication_ssl_mode_verify_identity_error.2.err
---let $assert_select= group_replication_ssl_mode: "VERIFY_IDENTITY"
---let $assert_count= 1
---source include/assert_grep.inc
-
---let $assert_text= Check that Group Replication errors out when a certificate with a wrong hostname is provided
---let $assert_file= $MYSQLTEST_VARDIR/tmp/group_replication_ssl_mode_verify_identity_error.2.err
---let $assert_only_after= XCom initialized and ready to accept incoming connections
---let $assert_select= Failed to verify the server certificate via X509 certificate matching functions
---let $assert_count= 1
---source include/assert_grep.inc
-
-
---echo
---echo ############################################################
---echo # 3. Clean up.
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
-SET GLOBAL group_replication_ssl_mode= @group_replication_ssl_mode_save;
-
---let $rpl_connection_name= server2
---source include/rpl_connection.inc
-SET GLOBAL group_replication_ssl_mode= @group_replication_ssl_mode_save;
-
---source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_mode_verify_identity_error_xcom-master.opt mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_mode_verify_identity_error_xcom-master.opt
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_mode_verify_identity_error_xcom-master.opt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_mode_verify_identity_error_xcom-master.opt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1 @@
+--log_error=$MYSQLTEST_VARDIR/tmp/group_replication_ssl_mode_verify_identity_error.1.err
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_mode_verify_identity_error_xcom-slave.opt mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_mode_verify_identity_error_xcom-slave.opt
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_mode_verify_identity_error_xcom-slave.opt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_mode_verify_identity_error_xcom-slave.opt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,5 @@
+--log_error=$MYSQLTEST_VARDIR/tmp/group_replication_ssl_mode_verify_identity_error.2.err
+--ssl-ca=$MYSQL_TEST_DIR/std_data/new_certs_for_bad_host/ca-bad-host.pem
+--ssl-key=$MYSQL_TEST_DIR/std_data/new_certs_for_bad_host/server-key-bad-host.pem
+--ssl-cert=$MYSQL_TEST_DIR/std_data/new_certs_for_bad_host/server-cert-bad-host.pem
+
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_mode_verify_identity_error_xcom.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_mode_verify_identity_error_xcom.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_mode_verify_identity_error_xcom.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_mode_verify_identity_error_xcom.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,8 @@
+################################################################################
+# Validate that Group Replication ssl mode works properly with XCom
+################################################################################
+
+--source include/have_group_replication_plugin_base.inc
+--source include/have_group_replication_xcom_communication_stack.inc
+
+--source ../include/gr_ssl_mode_verify_identity_error.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_mysql-master.opt mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_mysql-master.opt
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_mysql-master.opt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_mysql-master.opt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1 @@
+--loose-group_replication_communication_stack=MySQL
\ No newline at end of file
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_mysql-slave.opt mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_mysql-slave.opt
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_mysql-slave.opt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_mysql-slave.opt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1 @@
+--loose-group_replication_communication_stack=MySQL
\ No newline at end of file
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_mysql.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_mysql.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_mysql.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_mysql.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,16 @@
+################################################################################
+# Base test to verify the basic SSL support on Group replication recovery
+#
+# Test:
+# 0. The test requires two servers: M1 and M2.
+# 1. Setup the first member (M1) with a recovery user that requires SSL.
+# 2. Add some data and bootstrap start a group on M1.
+# 3. Configure joining member (M2) to use SSL options on recovery. Start GR on
+#    M2. Check the data is there.
+# 4. Clean up.
+#
+# Works with all communication stacks.
+#
+################################################################################
+
+--source ../include/gr_ssl.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_on_admin_interface.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_on_admin_interface.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_on_admin_interface.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_on_admin_interface.test	2021-09-28 11:46:34.000000000 +0000
@@ -13,6 +13,7 @@
 # 4. Clean up.
 ################################################################################
 
+--source include/have_group_replication_xcom_communication_stack.inc
 --source include/have_group_replication_plugin.inc
 --let $rpl_skip_group_replication_start= 1
 --source include/group_replication.inc
@@ -25,6 +26,8 @@
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
 
+--let $_default_report_port= `SELECT @@GLOBAL.report_port`
+
 --let $allow_rpl_inited= 1
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
@@ -94,10 +97,12 @@
 --echo # Clean up
 --echo #
 
+--disable_query_log
 --eval SET @@GLOBAL.group_replication_recovery_use_ssl= $conf_rec_use_ssl
 --eval SET @@GLOBAL.group_replication_recovery_ssl_ca= "$conf_rec_ssl_ca"
 --eval SET @@GLOBAL.group_replication_recovery_ssl_cert= "$conf_rec_ssl_cert"
 --eval SET @@GLOBAL.group_replication_recovery_ssl_key= "$conf_rec_ssl_key"
+--enable_query_log
 
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
@@ -108,4 +113,16 @@
 
 DROP TABLE t1;
 
+--let $allow_rpl_inited= 1
+--let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
+--let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $_admin_port= `SELECT @@GLOBAL.admin_port`
+--let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --report_port=$_default_report_port
+--replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_default_report_port ADMIN_PORT
+--source include/restart_mysqld.inc
+
+# Needed as we are not using rpl_restart_server.inc
+--let $rpl_server_number= 1
+--source include/rpl_reconnect.inc
+
 --source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_options2.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_options2.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_options2.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_options2.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,6 +17,7 @@
 # 6. Clean up.
 ################################################################################
 
+--source include/have_group_replication_xcom_communication_stack.inc
 --source include/have_group_replication_plugin.inc
 --let $rpl_skip_group_replication_start= 1
 --source include/group_replication.inc
@@ -130,16 +131,16 @@
 
 # No need to print this to the result file
 
---disable_result_log
+--disable_query_log
 --eval SET @@GLOBAL.group_replication_recovery_use_ssl= $conf_rec_use_ssl
 
 --eval SET @@GLOBAL.group_replication_recovery_ssl_ca= "$conf_rec_ssl_ca"
---eval SET @@GLOBAL.group_replication_recovery_ssl_capath= "$conf_rec_ssl_ca"
+--eval SET @@GLOBAL.group_replication_recovery_ssl_capath= "$conf_rec_ssl_capath"
 --eval SET @@GLOBAL.group_replication_recovery_ssl_cert= "$conf_rec_ssl_cert"
 --eval SET @@GLOBAL.group_replication_recovery_ssl_key= "$conf_rec_ssl_key"
 --eval SET @@GLOBAL.group_replication_recovery_ssl_crl= "$conf_rec_ssl_crl"
 --eval SET @@GLOBAL.group_replication_recovery_ssl_crlpath= "$conf_rec_ssl_crlpath"
---enable_result_log
+--enable_query_log
 
 --connection server1
 --echo server1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_options.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_options.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_options.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_options.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,6 +17,7 @@
 # 8. Clean up.
 ################################################################################
 
+--source include/have_group_replication_xcom_communication_stack.inc
 --source include/big_test.inc
 --let $group_replication_group_name= ebe0b000-f0e7-11e4-b80c-0800200c9a66
 --source include/have_group_replication_plugin.inc
@@ -214,17 +215,17 @@
 
 # No need to print this to the result file
 
---disable_result_log
+--disable_query_log
 --eval SET @@GLOBAL.group_replication_recovery_use_ssl= $conf_rec_use_ssl
 --eval SET @@GLOBAL.group_replication_recovery_ssl_verify_server_cert= $conf_rec_ssl_verify
 --eval SET @@GLOBAL.group_replication_recovery_retry_count= $conf_rec_retries
 
 --eval SET @@GLOBAL.group_replication_recovery_ssl_ca= "$conf_rec_ssl_ca"
---eval SET @@GLOBAL.group_replication_recovery_ssl_capath= "$conf_rec_ssl_ca"
+--eval SET @@GLOBAL.group_replication_recovery_ssl_capath= "$conf_rec_ssl_capath"
 --eval SET @@GLOBAL.group_replication_recovery_ssl_cert= "$conf_rec_ssl_cert"
 --eval SET @@GLOBAL.group_replication_recovery_ssl_cipher= "$conf_rec_ssl_cipher"
 --eval SET @@GLOBAL.group_replication_recovery_ssl_key= "$conf_rec_ssl_key"
---enable_result_log
+--enable_query_log
 
 --connection server1
 --echo server1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl.test	2021-09-28 11:46:34.000000000 +0000
@@ -8,84 +8,9 @@
 # 3. Configure joining member (M2) to use SSL options on recovery. Start GR on
 #    M2. Check the data is there.
 # 4. Clean up.
+#
+# Works with all communication stacks.
+#
 ################################################################################
 
---source include/have_group_replication_plugin.inc
---let $rpl_skip_group_replication_start= 1
---source include/group_replication.inc
-
---echo #
---echo # Setup the first member with a recovery user that requires SSL
---echo #
-
---connection server1
---echo server1
-
-# create a user for replication that requires ssl encryption
-set session sql_log_bin=0;
-CREATE USER 'rec_ssl_user'@'%' REQUIRE SSL;
-GRANT replication slave ON *.* TO 'rec_ssl_user'@'%';
-set session sql_log_bin=1;
-
---echo #
---echo # Add some data and start the member
---echo #
-
-CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1);
-
---source include/start_and_bootstrap_group_replication.inc
-
---echo #
---echo # Configure a joining member to use SSL options on recovery and start it
---echo #
-
---connection server2
---echo server2
-
---let $conf_rec_use_ssl= `SELECT @@GLOBAL.group_replication_recovery_use_ssl;`
---let $conf_rec_ssl_ca= `SELECT @@GLOBAL.group_replication_recovery_ssl_ca;`
---let $conf_rec_ssl_cert= `SELECT @@GLOBAL.group_replication_recovery_ssl_cert;`
---let $conf_rec_ssl_key= `SELECT @@GLOBAL.group_replication_recovery_ssl_key;`
-
---disable_warnings
-CHANGE REPLICATION SOURCE TO SOURCE_USER="rec_ssl_user" FOR CHANNEL "group_replication_recovery";
---enable_warnings
-
---eval SET GLOBAL group_replication_recovery_use_ssl=1
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
---eval SET GLOBAL group_replication_recovery_ssl_ca= '$MYSQL_TEST_DIR/std_data/cacert.pem'
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
---eval SET GLOBAL group_replication_recovery_ssl_cert= '$MYSQL_TEST_DIR/std_data/client-cert.pem'
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
---eval SET GLOBAL group_replication_recovery_ssl_key= '$MYSQL_TEST_DIR/std_data/client-key.pem'
-
---source include/start_group_replication.inc
-
---echo #
---echo # Check the data is there
---echo #
-
---let $assert_text= On the recovered member, the table should exist and have 1 elements;
---let $assert_cond= [select count(*) from t1] = 1;
---source include/assert.inc
-
---echo #
---echo # Clean up
---echo #
-
---eval SET @@GLOBAL.group_replication_recovery_use_ssl= $conf_rec_use_ssl
---eval SET @@GLOBAL.group_replication_recovery_ssl_ca= "$conf_rec_ssl_ca"
---eval SET @@GLOBAL.group_replication_recovery_ssl_cert= "$conf_rec_ssl_cert"
---eval SET @@GLOBAL.group_replication_recovery_ssl_key= "$conf_rec_ssl_key"
-
---connection server1
---echo server1
-
-set session sql_log_bin=0;
-DROP USER 'rec_ssl_user';
-set session sql_log_bin=1;
-
-DROP TABLE t1;
-
---source include/group_replication_end.inc
+--source ../include/gr_ssl.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_tls13-master.opt mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_tls13-master.opt
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_tls13-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_tls13-master.opt	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
---log_error=$MYSQLTEST_VARDIR/tmp/gr_ssl_tls13.1.err
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_tls13_mysql-master.opt mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_tls13_mysql-master.opt
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_tls13_mysql-master.opt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_tls13_mysql-master.opt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1 @@
+--log_error=$MYSQLTEST_VARDIR/tmp/gr_ssl_tls13.1.err
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_tls13_mysql.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_tls13_mysql.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_tls13_mysql.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_tls13_mysql.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,9 @@
+################################################################################
+# Basic TLS 1.3 testing with MySql
+################################################################################
+
+--source include/have_group_replication_plugin_base.inc
+--source include/have_group_replication_mysql_communication_stack.inc
+
+--source ../include/gr_ssl_tls13.inc
+
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_tls13_runtime_invalid_configuration_mysql-slave.opt mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_tls13_runtime_invalid_configuration_mysql-slave.opt
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_tls13_runtime_invalid_configuration_mysql-slave.opt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_tls13_runtime_invalid_configuration_mysql-slave.opt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1 @@
+--log_error=$MYSQLTEST_VARDIR/tmp/gr_ssl_tls13_runtime_invalid_configuration.2.err
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_tls13_runtime_invalid_configuration_mysql.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_tls13_runtime_invalid_configuration_mysql.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_tls13_runtime_invalid_configuration_mysql.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_tls13_runtime_invalid_configuration_mysql.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,8 @@
+################################################################################
+# Runtime Invalid Configuration TLS 1.3 testing with MySQL
+################################################################################
+
+--source include/have_group_replication_plugin_base.inc
+--source include/have_group_replication_mysql_communication_stack.inc
+
+--source ../include/gr_ssl_tls13_runtime_invalid_configuration.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_tls13_runtime_invalid_configuration-slave.opt mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_tls13_runtime_invalid_configuration-slave.opt
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_tls13_runtime_invalid_configuration-slave.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_tls13_runtime_invalid_configuration-slave.opt	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
---log_error=$MYSQLTEST_VARDIR/tmp/gr_ssl_tls13_runtime_invalid_configuration.2.err
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_tls13_runtime_invalid_configuration.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_tls13_runtime_invalid_configuration.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_tls13_runtime_invalid_configuration.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_tls13_runtime_invalid_configuration.test	1970-01-01 00:00:00.000000000 +0000
@@ -1,188 +0,0 @@
-#
-# Validate that Group Replication SSL mode does not work with TLS v1.3 when
-# an invalid configuration is set at server runtime.
-#
-# Steps:
-# 0. Configure members to use encryption and save defaults.
-# 1. 2 members group with OpenSSL 1.1.1
-#    Verify that it is not possible to start group replication  when :
-#      * TLS version is 1.3
-#      * Intersection of the allowed TLS chipersuites for all the members is
-#        empty.
-#    server1: --tls-version='TLSv1.3'
-#    server1: --tls-ciphersuites='TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384'
-#    server2: --tls-version='TLSv1.3'
-#    server2: --tls-ciphersuites='TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_CCM_SHA256'
-#    Outcome: group will not work.
-# 2. 2 members group with OpenSSL 1.1.1
-#    Verify that it is not possible to join a node to a group when
-#    TLS v1.3 is allowed but there is no compatible ciphersuite :
-#      * TLS chipersuite of the node is incompatible  with the group, therefore
-#        TLS v1.3 is not supported
-#      * SLL cipher of the node is compatible with the group
-#    --tls-version='TLSv1.3'
-#    server1: --tls-ciphersuites='TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384'
-#    server1: --ssl-cipher='AES256-SHA:AES256-SHA256'
-#    server2: --tls-ciphersuites='TLS_AES_128_CCM_SHA256'
-#    server2: --ssl-cipher='AES256-SHA256:CAMELLIA256-SHA'
-#    Outcome: group will not work.
-# 3. Clean up.
-#
-
-
---source include/big_test.inc
---source include/have_tlsv13.inc
---source include/have_group_replication_plugin.inc
---let $rpl_server_count= 2
---source include/force_restart.inc
---let $rpl_skip_group_replication_start= 1
---source include/group_replication.inc
-
-
---echo
---echo ############################################################
---echo # 0. Configure members to use encryption and save defaults.
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
-SET @tls_version_save= @@GLOBAL.tls_version;
-SET @tls_ciphersuites_save= @@GLOBAL.tls_ciphersuites;
-SET @ssl_cipher_save= @@GLOBAL.ssl_cipher;
-SET @group_replication_ssl_mode_save= @@GLOBAL.group_replication_ssl_mode;
-SET @@GLOBAL.group_replication_ssl_mode= REQUIRED;
-
---let $rpl_connection_name= server2
---source include/rpl_connection.inc
-SET @tls_version_save= @@GLOBAL.tls_version;
-SET @tls_ciphersuites_save= @@GLOBAL.tls_ciphersuites;
-SET @ssl_cipher_save= @@GLOBAL.ssl_cipher;
-SET @group_replication_ssl_mode_save= @@GLOBAL.group_replication_ssl_mode;
-SET @@GLOBAL.group_replication_ssl_mode= REQUIRED;
-
-SET SESSION sql_log_bin= 0;
-call mtr.add_suppression("\\[GCS\\] Error connecting to all peers. Member join failed. Local port:*");
-call mtr.add_suppression("\\[GCS\\] The member was unable to join the group.*");
-call mtr.add_suppression("Timeout on wait for view after joining group");
-call mtr.add_suppression("Error connecting to the local group communication engine instance");
-SET SESSION sql_log_bin= 1;
-
---echo
---echo ############################################################
---echo # 1. 2 members group with OpenSSL 1.1.1
---echo #    Verify that it is not possible to start group replication  when :
---echo #      * TLS version is 1.3
---echo #      * Intersection of the allowed TLS chipersuites for all the members
---echo #        is empty.
---echo #    server1: --tls-version='TLSv1.3'
---echo #    server1: --tls-ciphersuites='TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384'
---echo #    server2: --tls-version='TLSv1.3'
---echo #    server2: --tls-ciphersuites='TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_CCM_SHA256'
---echo #    Outcome: group will not work.
-
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
-
-SET @@GLOBAL.tls_version= 'TLSv1.3';
-SET @@GLOBAL.tls_ciphersuites= 'TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384';
-ALTER INSTANCE RELOAD TLS;
---source include/start_and_bootstrap_group_replication.inc
-
-# Try to add 2nd server
---let $rpl_connection_name= server2
---source include/rpl_connection.inc
-
---replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
---eval SET GLOBAL group_replication_group_name= "$group_replication_group_name"
-
-SET @@GLOBAL.tls_version= 'TLSv1.3';
-SET @@GLOBAL.tls_ciphersuites= 'TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_CCM_SHA256';
-ALTER INSTANCE RELOAD TLS;
-
---error ER_GROUP_REPLICATION_CONFIGURATION
-START GROUP_REPLICATION;
-
---let $assert_file = $MYSQLTEST_VARDIR/tmp/gr_ssl_tls13_runtime_invalid_configuration.2.err
---let $assert_only_after=  .*XCom initialized and ready to accept incoming connections.*
---let $assert_select =.*Error connecting using SSL.*
---let $assert_match =.*Error connecting using SSL.*
---let $assert_text = Found the expected error line in the server log.
---source include/assert_grep.inc
-
-
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
---source include/stop_group_replication.inc
-
-
---echo
---echo ############################################################
---echo # 2. 2 members group with OpenSSL 1.1.1
---echo #    Verify that it is not possible to join a node to a group when
---echo #    TLS v1.3 is allowed but there is no compatible ciphersuite :
---echo #      * TLS chipersuite of the node is incompatible  with the group,
---echo #        therefore TLS v1.3 is not supported
---echo #      * SLL cipher of the node is compatible with the group
---echo #    --tls-version='TLSv1.3'
---echo #    server1: --tls-ciphersuites='TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384'
---echo #    server1: --ssl-cipher='AES256-SHA:AES256-SHA256'
---echo #    server2: --tls-ciphersuites='TLS_AES_128_CCM_SHA256'
---echo #    server2: --ssl-cipher='AES256-SHA256:CAMELLIA256-SHA'
---echo #    Outcome: group will not work.
-
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
-
-SET @@GLOBAL.tls_version= 'TLSv1.3';
-SET @@GLOBAL.ssl_cipher= 'AES256-SHA:AES256-SHA256';
-SET @@GLOBAL.tls_ciphersuites= 'TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384';
-ALTER INSTANCE RELOAD TLS;
---source include/start_and_bootstrap_group_replication.inc
-
-# Try to add 2nd server
---let $rpl_connection_name= server2
---source include/rpl_connection.inc
-
---replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
---eval SET GLOBAL group_replication_group_name= "$group_replication_group_name"
-
-SET @@GLOBAL.tls_version= 'TLSv1.3';
-SET @@GLOBAL.ssl_cipher= 'AES256-SHA256:CAMELLIA256-SHA';
-SET @@GLOBAL.tls_ciphersuites  ='TLS_AES_128_CCM_SHA256';
-ALTER INSTANCE RELOAD TLS;
-
---error ER_GROUP_REPLICATION_CONFIGURATION
-START GROUP_REPLICATION;
-
---let $assert_file = $MYSQLTEST_VARDIR/tmp/gr_ssl_tls13_runtime_invalid_configuration.2.err
---let $assert_only_after=  .*XCom initialized and ready to accept incoming connections.*
---let $assert_select =.*Error connecting using SSL.*
---let $assert_match =.*Error connecting using SSL.*
---let $assert_text = Found the expected error line in the server log.
---source include/assert_grep.inc
-
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
---source include/stop_group_replication.inc
-
-
---echo
---echo ############################################################
---echo # 3. Clean up.
-
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
-SET @@GLOBAL.group_replication_ssl_mode= @group_replication_ssl_mode_save;
-SET @@GLOBAL.tls_version= @tls_version_save;
-SET @@GLOBAL.tls_ciphersuites= @tls_ciphersuites_save;
-SET @@GLOBAL.ssl_cipher = @ssl_cipher_save;
-ALTER INSTANCE RELOAD TLS;
-
---let $rpl_connection_name= server2
---source include/rpl_connection.inc
-SET @@GLOBAL.group_replication_ssl_mode= @group_replication_ssl_mode_save;
-SET @@GLOBAL.tls_version= @tls_version_save;
-SET @@GLOBAL.tls_ciphersuites= @tls_ciphersuites_save;
-SET @@GLOBAL.ssl_cipher = @ssl_cipher_save;
-ALTER INSTANCE RELOAD TLS;
-
-
---source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_tls13_runtime_invalid_configuration_xcom-slave.opt mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_tls13_runtime_invalid_configuration_xcom-slave.opt
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_tls13_runtime_invalid_configuration_xcom-slave.opt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_tls13_runtime_invalid_configuration_xcom-slave.opt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1 @@
+--log_error=$MYSQLTEST_VARDIR/tmp/gr_ssl_tls13_runtime_invalid_configuration.2.err
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_tls13_runtime_invalid_configuration_xcom.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_tls13_runtime_invalid_configuration_xcom.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_tls13_runtime_invalid_configuration_xcom.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_tls13_runtime_invalid_configuration_xcom.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,8 @@
+################################################################################
+# Runtime Invalid Configuration TLS 1.3 testing with XCom
+################################################################################
+
+--source include/have_group_replication_plugin_base.inc
+--source include/have_group_replication_xcom_communication_stack.inc
+
+--source ../include/gr_ssl_tls13_runtime_invalid_configuration.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_tls13_runtime_valid_configuration.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_tls13_runtime_valid_configuration.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_tls13_runtime_valid_configuration.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_tls13_runtime_valid_configuration.test	2021-09-28 11:46:34.000000000 +0000
@@ -65,6 +65,9 @@
 SET @tls_ciphersuites_save= @@GLOBAL.tls_ciphersuites;
 SET @ssl_cipher_save= @@GLOBAL.ssl_cipher;
 SET @group_replication_ssl_mode_save= @@GLOBAL.group_replication_ssl_mode;
+SET @group_replication_recovery_tls_version_save= @@GLOBAL.group_replication_recovery_tls_version;
+SET @group_replication_recovery_tls_ciphersuites_save= @@GLOBAL.group_replication_recovery_tls_ciphersuites;
+
 SET @@GLOBAL.group_replication_ssl_mode= REQUIRED;
 
 --let $rpl_connection_name= server2
@@ -73,8 +76,12 @@
 SET @tls_ciphersuites_save= @@GLOBAL.tls_ciphersuites;
 SET @ssl_cipher_save= @@GLOBAL.ssl_cipher;
 SET @group_replication_ssl_mode_save= @@GLOBAL.group_replication_ssl_mode;
+SET @group_replication_recovery_tls_version_save= @@GLOBAL.group_replication_recovery_tls_version;
+SET @group_replication_recovery_tls_ciphersuites_save= @@GLOBAL.group_replication_recovery_tls_ciphersuites;
+
 SET @@GLOBAL.group_replication_ssl_mode= REQUIRED;
 
+
 SET SESSION sql_log_bin= 0;
 call mtr.add_suppression("\\[GCS\\] Error connecting to all peers. Member join failed. Local port:*");
 call mtr.add_suppression("\\[GCS\\] The member was unable to join the group.*");
@@ -88,6 +95,9 @@
 SET @tls_ciphersuites_save= @@GLOBAL.tls_ciphersuites;
 SET @ssl_cipher_save= @@GLOBAL.ssl_cipher;
 SET @group_replication_ssl_mode_save= @@GLOBAL.group_replication_ssl_mode;
+SET @group_replication_recovery_tls_version_save= @@GLOBAL.group_replication_recovery_tls_version;
+SET @group_replication_recovery_tls_ciphersuites_save= @@GLOBAL.group_replication_recovery_tls_ciphersuites;
+
 SET @@GLOBAL.group_replication_ssl_mode= REQUIRED;
 
 SET SESSION sql_log_bin= 0;
@@ -163,6 +173,10 @@
 
 SET @@GLOBAL.tls_version= 'TLSv1.3';
 SET @@GLOBAL.tls_ciphersuites= 'TLS_AES_128_CCM_SHA256';
+
+SET @@GLOBAL.group_replication_recovery_tls_version= 'TLSv1.3';
+SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= 'TLS_AES_128_CCM_SHA256';
+
 ALTER INSTANCE RELOAD TLS;
 --source include/start_and_bootstrap_group_replication.inc
 
@@ -171,6 +185,10 @@
 
 SET @@GLOBAL.tls_version= 'TLSv1.3';
 SET @@GLOBAL.tls_ciphersuites= 'TLS_AES_128_CCM_SHA256';
+
+SET @@GLOBAL.group_replication_recovery_tls_version= 'TLSv1.3';
+SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= 'TLS_AES_128_CCM_SHA256';
+
 ALTER INSTANCE RELOAD TLS;
 --source include/start_group_replication.inc
 
@@ -204,6 +222,10 @@
 
 SET @@GLOBAL.tls_version= 'TLSv1.3';
 SET @@GLOBAL.tls_ciphersuites= 'TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384';
+
+SET @@GLOBAL.group_replication_recovery_tls_version= 'TLSv1.3';
+SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= 'TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384';
+
 ALTER INSTANCE RELOAD TLS;
 --source include/start_and_bootstrap_group_replication.inc
 
@@ -212,6 +234,10 @@
 
 SET @@GLOBAL.tls_version= 'TLSv1.3';
 SET @@GLOBAL.tls_ciphersuites= 'TLS_AES_256_GCM_SHA384:TLS_AES_128_CCM_SHA256';
+
+SET @@GLOBAL.group_replication_recovery_tls_version= 'TLSv1.3';
+SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= 'TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384';
+
 ALTER INSTANCE RELOAD TLS;
 --source include/start_group_replication.inc
 
@@ -220,6 +246,10 @@
 
 SET @@GLOBAL.tls_version= 'TLSv1.3';
 SET @@GLOBAL.tls_ciphersuites= 'TLS_AES_128_CCM_8_SHA256: TLS_AES_256_GCM_SHA384';
+
+SET @@GLOBAL.group_replication_recovery_tls_version= 'TLSv1.3';
+SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= 'TLS_AES_128_CCM_8_SHA256: TLS_AES_256_GCM_SHA384';
+
 ALTER INSTANCE RELOAD TLS;
 --source include/start_group_replication.inc
 
@@ -310,6 +340,9 @@
 SET @@GLOBAL.tls_version= @tls_version_save;
 SET @@GLOBAL.tls_ciphersuites= @tls_ciphersuites_save;
 SET @@GLOBAL.ssl_cipher = @ssl_cipher_save;
+SET @@GLOBAL.group_replication_recovery_tls_version= @group_replication_recovery_tls_version_save;
+SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= @group_replication_recovery_tls_ciphersuites_save;
+
 ALTER INSTANCE RELOAD TLS;
 
 --let $rpl_connection_name= server2
@@ -318,6 +351,8 @@
 SET @@GLOBAL.tls_version= @tls_version_save;
 SET @@GLOBAL.tls_ciphersuites= @tls_ciphersuites_save;
 SET @@GLOBAL.ssl_cipher = @ssl_cipher_save;
+SET @@GLOBAL.group_replication_recovery_tls_version= @group_replication_recovery_tls_version_save;
+SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= @group_replication_recovery_tls_ciphersuites_save;
 ALTER INSTANCE RELOAD TLS;
 
 --let $rpl_connection_name= server3
@@ -326,6 +361,8 @@
 SET @@GLOBAL.tls_version= @tls_version_save;
 SET @@GLOBAL.tls_ciphersuites = @tls_ciphersuites_save;
 SET @@GLOBAL.ssl_cipher = @ssl_cipher_save;
+SET @@GLOBAL.group_replication_recovery_tls_version= @group_replication_recovery_tls_version_save;
+SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= @group_replication_recovery_tls_ciphersuites_save;
 ALTER INSTANCE RELOAD TLS;
 
 --source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_tls13.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_tls13.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_tls13.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_tls13.test	1970-01-01 00:00:00.000000000 +0000
@@ -1,264 +0,0 @@
-#
-# Validate that Group Replication ssl mode works properly with TLSv1.3.
-#
-# Steps:
-# 0. Configure members to use encryption and save defaults.
-# 1. 2 members group with OpenSSL 1.1.1
-#    No --tls-ciphersuites
-#    No --tls-version
-#    Outcome: group will work.
-# 2. 2 members group with OpenSSL 1.1.1
-#    No --tls-ciphersuites
-#    server1: --tls-version='TLSv1,TLSv1.1,TLSv1.2,TLSv1.3'
-#    server2: --tls-version='TLSv1,TLSv1.1,TLSv1.2'
-#    Outcome: group will work.
-# 3. 2 members group with OpenSSL 1.1.1
-#    No --tls-ciphersuites
-#    server1: --tls-version='TLSv1.3'
-#    server2: --tls-version='TLSv1,TLSv1.1,TLSv1.2'
-#    Outcome: group will not work.
-# 4. 2 members group with OpenSSL 1.1.1
-#    No --tls-ciphersuites
-#    server1: --tls-version='TLSv1.3'
-#    server2: --tls-version='TLSv1.3'
-#    Outcome: group will work.
-# 5. 2 members group with OpenSSL 1.1.1
-#    --tls-ciphersuites='TLS_AES_256_GCM_SHA384'
-#    server1: --tls-version='TLSv1,TLSv1.1,TLSv1.2,TLSv1.3'
-#    server2: --tls-version='TLSv1,TLSv1.1,TLSv1.2,TLSv1.3'
-#    Outcome: group will work.
-# 6. 2 members group with OpenSSL 1.1.1
-#    --tls-ciphersuites= '', which will disable all ciphers.
-#    No --tls-version
-#    Outcome: group will not work.
-# 7. Clean up.
-#
---source include/big_test.inc
---source include/have_tlsv13.inc
---source include/have_group_replication_plugin.inc
---source include/force_restart.inc
---let $rpl_skip_group_replication_start= 1
---source include/group_replication.inc
-
-
---echo
---echo ############################################################
---echo # 0. Configure members to use encryption and save defaults.
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
-SET @tls_version_save= @@GLOBAL.tls_version;
-SET @tls_ciphersuites_save= @@GLOBAL.tls_ciphersuites;
-SET @group_replication_ssl_mode_save= @@GLOBAL.group_replication_ssl_mode;
-SET @@GLOBAL.group_replication_ssl_mode= REQUIRED;
-
---let $rpl_connection_name= server2
---source include/rpl_connection.inc
-SET @tls_version_save= @@GLOBAL.tls_version;
-SET @tls_ciphersuites_save= @@GLOBAL.tls_ciphersuites;
-SET @group_replication_ssl_mode_save= @@GLOBAL.group_replication_ssl_mode;
-SET @@GLOBAL.group_replication_ssl_mode= REQUIRED;
-
-SET SESSION sql_log_bin= 0;
-call mtr.add_suppression("\\[GCS\\] Error connecting to all peers. Member join failed. Local port:*");
-call mtr.add_suppression("\\[GCS\\] The member was unable to join the group.*");
-call mtr.add_suppression("Timeout on wait for view after joining group");
-SET SESSION sql_log_bin= 1;
-
-
---echo
---echo ############################################################
---echo # 1. 2 members group with OpenSSL 1.1.1
---echo #    No --tls-ciphersuites
---echo #    No --tls-version
---echo #    Outcome: group will work.
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
---source include/start_and_bootstrap_group_replication.inc
-
---let $rpl_connection_name= server2
---source include/rpl_connection.inc
---source include/start_group_replication.inc
-
---let $group_replication_number_of_members= 2
---source include/gr_wait_for_number_of_members.inc
-
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
---source include/stop_group_replication.inc
-
---let $rpl_connection_name= server2
---source include/rpl_connection.inc
---source include/stop_group_replication.inc
-
-
---echo
---echo ############################################################
---echo # 2. 2 members group with OpenSSL 1.1.1
---echo #    No --tls-ciphersuites
---echo #    server1: --tls-version='TLSv1,TLSv1.1,TLSv1.2,TLSv1.3'
---echo #    server2: --tls-version='TLSv1,TLSv1.1,TLSv1.2'
---echo #    Outcome: group will work.
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
-
-SET @@GLOBAL.tls_version= 'TLSv1,TLSv1.1,TLSv1.2,TLSv1.3';
-ALTER INSTANCE RELOAD TLS;
---source include/start_and_bootstrap_group_replication.inc
-
---let $rpl_connection_name= server2
---source include/rpl_connection.inc
-
-SET @@GLOBAL.tls_version= 'TLSv1,TLSv1.1,TLSv1.2';
-ALTER INSTANCE RELOAD TLS;
---source include/start_group_replication.inc
-
---let $group_replication_number_of_members= 2
---source include/gr_wait_for_number_of_members.inc
-
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
---source include/stop_group_replication.inc
-
---let $rpl_connection_name= server2
---source include/rpl_connection.inc
---source include/stop_group_replication.inc
-
-
---echo
---echo ############################################################
---echo # 3. 2 members group with OpenSSL 1.1.1
---echo #    No --tls-ciphersuites
---echo #    server1: --tls-version='TLSv1.3'
---echo #    server2: --tls-version='TLSv1,TLSv1.1,TLSv1.2'
---echo #    Outcome: group will not work.
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
-
-SET @@GLOBAL.tls_version= 'TLSv1.3';
-ALTER INSTANCE RELOAD TLS;
---source include/start_and_bootstrap_group_replication.inc
-
---let $rpl_connection_name= server2
---source include/rpl_connection.inc
-
-SET @@GLOBAL.tls_version= 'TLSv1,TLSv1.1,TLSv1.2';
-ALTER INSTANCE RELOAD TLS;
-
---error ER_GROUP_REPLICATION_CONFIGURATION
-START GROUP_REPLICATION;
-
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
---source include/stop_group_replication.inc
-
-
---echo
---echo ############################################################
---echo # 4. 2 members group with OpenSSL 1.1.1
---echo #    No --tls-ciphersuites
---echo #    server1: --tls-version='TLSv1.3'
---echo #    server2: --tls-version='TLSv1.3'
---echo #    Outcome: group will work.
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
-
-SET @@GLOBAL.tls_version= 'TLSv1.3';
-ALTER INSTANCE RELOAD TLS;
---source include/start_and_bootstrap_group_replication.inc
-
---let $rpl_connection_name= server2
---source include/rpl_connection.inc
-
-SET @@GLOBAL.tls_version= 'TLSv1.3';
-ALTER INSTANCE RELOAD TLS;
---source include/start_group_replication.inc
-
---let $group_replication_number_of_members= 2
---source include/gr_wait_for_number_of_members.inc
-
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
---source include/stop_group_replication.inc
-
---let $rpl_connection_name= server2
---source include/rpl_connection.inc
---source include/stop_group_replication.inc
-
-
---echo
---echo ############################################################
---echo # 5. 2 members group with OpenSSL 1.1.1
---echo #    --tls-ciphersuites='TLS_AES_256_GCM_SHA384'
---echo #    server1: --tls-version='TLSv1,TLSv1.1,TLSv1.2,TLSv1.3'
---echo #    server2: --tls-version='TLSv1,TLSv1.1,TLSv1.2,TLSv1.3'
---echo #    Outcome: group will work.
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
-
-SET @@GLOBAL.tls_version= 'TLSv1,TLSv1.1,TLSv1.2,TLSv1.3';
-SET @@GLOBAL.tls_ciphersuites= 'TLS_AES_256_GCM_SHA384';
-ALTER INSTANCE RELOAD TLS;
---source include/start_and_bootstrap_group_replication.inc
-
---let $rpl_connection_name= server2
---source include/rpl_connection.inc
-
-SET @@GLOBAL.tls_version= 'TLSv1,TLSv1.1,TLSv1.2,TLSv1.3';
-SET @@GLOBAL.tls_ciphersuites= 'TLS_AES_256_GCM_SHA384';
-ALTER INSTANCE RELOAD TLS;
---source include/start_group_replication.inc
-
---let $group_replication_number_of_members= 2
---source include/gr_wait_for_number_of_members.inc
-
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
---source include/stop_group_replication.inc
-
---let $rpl_connection_name= server2
---source include/rpl_connection.inc
---source include/stop_group_replication.inc
-
-
---echo
---echo ############################################################
---echo # 6. 2 members group with OpenSSL 1.1.1
---echo #    --tls-ciphersuites= '', which will disable all ciphers.
---echo #    No --tls-version
---echo #    Outcome: group will not work.
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
---source include/gr_set_bootstrap_group.inc
-
-SET @@GLOBAL.tls_ciphersuites= '';
-ALTER INSTANCE RELOAD TLS;
-
---error ER_GROUP_REPLICATION_CONFIGURATION
-START GROUP_REPLICATION;
-
---source include/gr_clear_bootstrap_group.inc
-
---let $grep_file= $MYSQLTEST_VARDIR/tmp/gr_ssl_tls13.1.err
---let $grep_pattern= Error connecting using SSL
---let $grep_output= boolean
---source include/grep_pattern.inc
-
-
---echo
---echo ############################################################
---echo # 7. Clean up.
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
-SET @@GLOBAL.group_replication_ssl_mode= @group_replication_ssl_mode_save;
-SET @@GLOBAL.tls_version= @tls_version_save;
-SET @@GLOBAL.tls_ciphersuites= @tls_ciphersuites_save;
-ALTER INSTANCE RELOAD TLS;
-
---let $rpl_connection_name= server2
---source include/rpl_connection.inc
-SET @@GLOBAL.group_replication_ssl_mode= @group_replication_ssl_mode_save;
-SET @@GLOBAL.tls_version= @tls_version_save;
-SET @@GLOBAL.tls_ciphersuites= @tls_ciphersuites_save;
-ALTER INSTANCE RELOAD TLS;
-
---source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_tls13_xcom-master.opt mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_tls13_xcom-master.opt
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_tls13_xcom-master.opt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_tls13_xcom-master.opt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1 @@
+--log_error=$MYSQLTEST_VARDIR/tmp/gr_ssl_tls13.1.err
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_tls13_xcom.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_tls13_xcom.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_ssl_tls13_xcom.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_ssl_tls13_xcom.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,9 @@
+################################################################################
+# Basic TLS 1.3 testing with XCom
+################################################################################
+
+--source include/have_group_replication_plugin_base.inc
+--source include/have_group_replication_xcom_communication_stack.inc
+
+--source ../include/gr_ssl_tls13.inc
+
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_start_channel_on_server_start.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_start_channel_on_server_start.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_start_channel_on_server_start.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_start_channel_on_server_start.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,97 @@
+###############################################################################
+# Validate that when a group is being bootstrapped on server start, all
+# configured replication channels MUST be started unless skipped
+# (through --skip-slave-start).
+#
+# Test:
+#   0. This test requires 2 servers
+#       server1: single server
+#       server2: group in single-primary mode
+#      server2 will replicate from server1.
+#   1. Configure a replication channel to replicate from server1
+#   2. Restart the server with GR configured to start together with
+#      server, and set --skip_slave_start=0.
+#   3. Wait until server is up.
+#      Check that GR and replication channel are working.
+#   4. Write something on server1 and read it on server2.
+#   5. Clean up
+###############################################################################
+--source include/big_test.inc
+--source include/force_restart.inc
+--source include/have_group_replication_plugin.inc
+--let $rpl_group_replication_single_primary_mode=1
+--let $rpl_skip_group_replication_start= 1
+--source include/group_replication.inc
+
+
+--echo
+--echo ############################################################
+--echo # 1. Configure a replication channel to replicate from server1
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--replace_result $SERVER_MYPORT_1 SERVER_1_PORT
+--eval CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_PORT=$SERVER_MYPORT_1
+
+
+--echo
+--echo ############################################################
+--echo # 2. Restart the server with GR configured to start together with
+--echo #    server, and set --skip_slave_start=0.
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $allow_rpl_inited= 1
+--let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
+--let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $restart_parameters=restart:--group_replication_group_name=$group_replication_group_name --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_bootstrap_group=1 --group_replication_start_on_boot=1  --group_replication_single_primary_mode=1 --group_replication_enforce_update_everywhere_checks=0 --skip_slave_start=0
+--replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--source include/restart_mysqld.inc
+
+
+--echo
+--echo ############################################################
+--echo # 3. Wait until server is up.
+--echo #    Check that GR and replication channel are working.
+--let $rpl_server_number= 2
+--source include/rpl_reconnect.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--let $group_replication_member_state= ONLINE
+--source include/gr_wait_for_member_state.inc
+
+--source include/gr_assert_primary_member.inc
+
+--source include/wait_for_slave_to_start.inc
+
+
+--echo
+--echo ############################################################
+--echo # 4. Write something on server1 and read it on server2.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY);
+INSERT INTO t1 VALUES (1);
+
+--let $sync_slave_connection= server2
+--source include/sync_slave_sql_with_master.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $assert_text= 'There is one row in t1'
+--let $assert_cond= [SELECT COUNT(*) count FROM t1, count, 1] = 1
+--source include/assert.inc
+
+
+--echo
+--echo ############################################################
+--echo # 5. Clean up.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+DROP TABLE t1;
+
+--let $sync_slave_connection= server2
+--source include/sync_slave_sql_with_master.inc
+
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_start_gr_credential_options_clone.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_start_gr_credential_options_clone.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_start_gr_credential_options_clone.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_start_gr_credential_options_clone.test	2021-09-28 11:46:34.000000000 +0000
@@ -15,6 +15,7 @@
 # 7. Cleanup
 ###############################################################################
 
+--source include/have_group_replication_xcom_communication_stack.inc
 --source include/have_mysqld_monitoring_process.inc
 --source include/have_clone_plugin.inc
 --source include/force_restart.inc
@@ -60,6 +61,7 @@
 
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $_group_replication_comm_stack= `SELECT @@GLOBAL.group_replication_communication_stack`
 
 --let $plugin_list= $GROUP_REPLICATION
 --source include/spawn_monitoring_process.inc
@@ -73,6 +75,7 @@
 --eval SET PERSIST group_replication_group_name= "$group_replication_group_name"
 --eval SET PERSIST group_replication_local_address= "$_group_replication_local_address"
 --eval SET PERSIST group_replication_group_seeds= "$_group_replication_group_seeds"
+--eval SET PERSIST group_replication_communication_stack= "$_group_replication_comm_stack"
 
 SET PERSIST group_replication_start_on_boot= OFF;
 --enable_query_log
@@ -119,6 +122,7 @@
 RESET PERSIST group_replication_local_address;
 RESET PERSIST group_replication_group_seeds;
 RESET PERSIST group_replication_start_on_boot;
+RESET PERSIST group_replication_communication_stack;
 CHANGE REPLICATION SOURCE TO SOURCE_USER='root' FOR CHANNEL 'group_replication_recovery';
 
 DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_start_gr_with_credentials_2.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_start_gr_with_credentials_2.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_start_gr_with_credentials_2.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_start_gr_with_credentials_2.test	2021-09-28 11:46:34.000000000 +0000
@@ -18,6 +18,7 @@
 ################################################################################
 
 --source include/big_test.inc
+--source include/have_group_replication_xcom_communication_stack.inc
 --source include/have_group_replication_plugin.inc
 --let $rpl_skip_group_replication_start= 1
 --source include/group_replication.inc
@@ -54,7 +55,6 @@
 GRANT PROXY ON 'proxy_user_wp' to 'plug_user_wp';
 GRANT REPLICATION SLAVE ON *.* TO 'plug_user_p';
 GRANT REPLICATION SLAVE ON *.* TO 'plug_user_wp';
-
 SET SQL_LOG_BIN=1;
 
 --echo
@@ -321,4 +321,5 @@
 SET SESSION sql_log_bin = 1;
 UNINSTALL PLUGIN test_plugin_server;
 
+TRUNCATE mysql.general_log;
 --source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_start_gr_with_credentials_3.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_start_gr_with_credentials_3.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_start_gr_with_credentials_3.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_start_gr_with_credentials_3.test	2021-09-28 11:46:34.000000000 +0000
@@ -21,6 +21,7 @@
 ################################################################################
 
 --source include/big_test.inc
+--source include/have_group_replication_xcom_communication_stack.inc
 --source include/have_group_replication_plugin.inc
 --let $rpl_skip_group_replication_start= 1
 --source include/group_replication.inc
@@ -280,3 +281,7 @@
 UNINSTALL PLUGIN test_plugin_server;
 
 --source include/group_replication_end.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+TRUNCATE mysql.general_log;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_start_gr_with_credentials_mysql_connections.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_start_gr_with_credentials_mysql_connections.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_start_gr_with_credentials_mysql_connections.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_start_gr_with_credentials_mysql_connections.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,175 @@
+################################################################################
+# This test proves credential for recovery can be passed via START GR command
+# using the MySQL stack.
+#
+# Test:
+# 0. The test requires two servers: M1 and M2.
+# 1. Bootstrap M1. And create new users.
+# 2. Reset recovery interval to 1 and count to 2 for M2.
+# 3. Test START GR works without any option.
+# 4. Delete recovery channel and test START GR, it should fail.
+# 5. Pass USER as root and test START GR, member should come ONLINE.
+#    START GR without parameter fails, credentials are removed on STOP.
+# 6. Test wrong credentials do not come online and START GR fails.
+# 7. Test right credentials in START GR connect with master.
+# 8. Cleanup.
+################################################################################
+
+--source include/have_group_replication_mysql_communication_stack.inc
+--source include/big_test.inc
+--source include/have_group_replication_plugin.inc
+--let $rpl_skip_group_replication_start= 1
+--source include/group_replication.inc
+
+--echo
+--echo # 1. Bootstrap M1. And create new users.
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--source include/start_and_bootstrap_group_replication.inc
+
+SET SQL_LOG_BIN=0;
+
+CREATE USER 'regular_user_p' IDENTIFIED BY 'password';
+CREATE USER 'regular_user_wp' IDENTIFIED BY '';
+
+GRANT REPLICATION SLAVE ON *.* TO "regular_user_p";
+GRANT REPLICATION SLAVE ON *.* TO "regular_user_wp";
+
+GRANT GROUP_REPLICATION_STREAM ON *.* TO "regular_user_p";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO "regular_user_wp";
+
+SET SQL_LOG_BIN=1;
+
+--echo
+--echo # 2. Reset recovery interval to 1 and count to 2 for M2.
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+SET SQL_LOG_BIN=0;
+
+CREATE USER 'regular_user_p' IDENTIFIED BY 'password';
+CREATE USER 'regular_user_wp' IDENTIFIED BY '';
+
+GRANT REPLICATION SLAVE ON *.* TO "regular_user_p";
+GRANT REPLICATION SLAVE ON *.* TO "regular_user_wp";
+
+GRANT GROUP_REPLICATION_STREAM ON *.* TO "regular_user_p";
+GRANT GROUP_REPLICATION_STREAM ON *.* TO "regular_user_wp";
+
+SET SQL_LOG_BIN=1;
+
+SET @saved_group_replication_recovery_reconnect_interval = @@GLOBAL.group_replication_recovery_reconnect_interval;
+SET @saved_gr_recovery_retry_count = @@GLOBAL.group_replication_recovery_retry_count;
+
+SET GLOBAL group_replication_recovery_reconnect_interval= 1;
+SET GLOBAL group_replication_recovery_retry_count= 2;
+--replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--eval SET GLOBAL group_replication_group_name= "$group_replication_group_name"
+
+--echo
+--echo # 3. Test START GR works without any option.
+
+--source include/start_group_replication.inc
+--source include/stop_group_replication.inc
+
+--echo
+--echo # 4. Delete recovery channel and test START GR, it should fail.
+
+RESET SLAVE ALL FOR CHANNEL 'group_replication_recovery';
+
+--error ER_GROUP_REPLICATION_CONFIGURATION
+START GROUP_REPLICATION;
+
+--echo
+--echo # 5. Pass USER as root and test START GR, member should come ONLINE.
+--echo #    START GR without parameter fails, credentials are removed on STOP.
+
+START GROUP_REPLICATION USER='root';
+--let $group_replication_member_state = ONLINE
+--source include/gr_wait_for_member_state.inc
+--source include/stop_group_replication.inc
+
+--error ER_GROUP_REPLICATION_CONFIGURATION
+START GROUP_REPLICATION;
+
+--echo
+--echo # 6. Test wrong credentials do not connect with master.
+
+--error ER_GROUP_REPLICATION_CONFIGURATION
+START GROUP_REPLICATION USER='regular_user_p',PASSWORD='wrong';
+
+--error ER_GROUP_REPLICATION_CONFIGURATION
+START GROUP_REPLICATION USER='regular_user_p';
+
+--error ER_GROUP_REPLICATION_CONFIGURATION
+START GROUP_REPLICATION USER='regular_user_wp' ,  PASSWORD='password';
+
+--echo
+--echo # 7. Test right credentials in START GR connect with master.
+
+START GROUP_REPLICATION USER='regular_user_p' , PASSWORD='password';
+--let $group_replication_member_state = ONLINE
+--source include/gr_wait_for_member_state.inc
+--source include/stop_group_replication.inc
+
+START GROUP_REPLICATION USER='regular_user_p' , PASSWORD='password' , DEFAULT_AUTH= 'auth_test_plugin';
+--let $group_replication_member_state = ONLINE
+--source include/gr_wait_for_member_state.inc
+--source include/stop_group_replication.inc
+
+START GROUP_REPLICATION PASSWORD='password' , USER='regular_user_p', DEFAULT_AUTH='auth_test_plugin';
+--let $group_replication_member_state = ONLINE
+--source include/gr_wait_for_member_state.inc
+--source include/stop_group_replication.inc
+
+START GROUP_REPLICATION USER='regular_user_p' , DEFAULT_AUTH= '' , PASSWORD='password';
+--let $group_replication_member_state = ONLINE
+--source include/gr_wait_for_member_state.inc
+--source include/stop_group_replication.inc
+
+START GROUP_REPLICATION USER='regular_user_wp';
+--let $group_replication_member_state = ONLINE
+--source include/gr_wait_for_member_state.inc
+--source include/stop_group_replication.inc
+
+START GROUP_REPLICATION USER='regular_user_wp' , PASSWORD='';
+--let $group_replication_member_state = ONLINE
+--source include/gr_wait_for_member_state.inc
+--source include/stop_group_replication.inc
+
+--echo
+--echo # 8. Cleanup.
+
+CHANGE REPLICATION SOURCE TO SOURCE_USER='root' , SOURCE_PASSWORD='' FOR CHANNEL 'group_replication_recovery';
+
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("Error while executing a group configuration operation: Could not extract the access credentials for XCom connections.*");
+call mtr.add_suppression("\\[GCS\\] Error connecting to the local group communication engine instance.*");
+call mtr.add_suppression("\\[GCS\\] Error testing to the local group communication engine instance.");
+call mtr.add_suppression("Timeout on wait for view after joining group.");
+SET SESSION sql_log_bin = 1;
+
+SET @@GLOBAL.group_replication_recovery_reconnect_interval = @saved_group_replication_recovery_reconnect_interval;
+SET @@GLOBAL.group_replication_recovery_retry_count = @saved_gr_recovery_retry_count;
+
+SET SQL_LOG_BIN=0;
+
+DROP USER 'regular_user_p';
+DROP USER 'regular_user_wp';
+
+SET SQL_LOG_BIN=1;
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+SET SQL_LOG_BIN=0;
+
+DROP USER 'regular_user_p';
+DROP USER 'regular_user_wp';
+
+SET SQL_LOG_BIN=1;
+
+--source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_start_gr_with_credentials.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_start_gr_with_credentials.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_start_gr_with_credentials.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_start_gr_with_credentials.test	2021-09-28 11:46:34.000000000 +0000
@@ -14,6 +14,7 @@
 # 8. Cleanup.
 ################################################################################
 
+--source include/have_group_replication_xcom_communication_stack.inc
 --source include/big_test.inc
 --source include/have_group_replication_plugin.inc
 --let $rpl_skip_group_replication_start= 1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_start_replication_auto_with_ssl_recovery.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_start_replication_auto_with_ssl_recovery.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_start_replication_auto_with_ssl_recovery.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_start_replication_auto_with_ssl_recovery.test	2021-09-28 11:46:34.000000000 +0000
@@ -53,8 +53,13 @@
 set session sql_log_bin=0;
 CREATE USER 'rec_ssl_user'@'%' REQUIRE SSL;
 GRANT replication slave ON *.* TO 'rec_ssl_user'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'rec_ssl_user'@'%';
+FLUSH PRIVILEGES;
 set session sql_log_bin=1;
 
+--let $conf_rec_ssl_mode_s2= `SELECT @@GLOBAL.group_replication_ssl_mode;`
+--eval SET GLOBAL group_replication_ssl_mode= REQUIRED
+
 --echo #
 --echo # Start the member and add some data
 --echo #
@@ -70,11 +75,21 @@
 
 --connection server1
 
+set session sql_log_bin=0;
+CREATE USER 'rec_ssl_user'@'%' REQUIRE SSL;
+GRANT replication slave ON *.* TO 'rec_ssl_user'@'%';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'rec_ssl_user'@'%';
+FLUSH PRIVILEGES;
+set session sql_log_bin=1;
+
+--let $conf_rec_ssl_mode_s1= `SELECT @@GLOBAL.group_replication_ssl_mode;`
+--eval SET GLOBAL group_replication_ssl_mode= REQUIRED
+
 --disable_warnings
 CHANGE REPLICATION SOURCE TO SOURCE_USER= 'rec_ssl_user' FOR CHANNEL 'group_replication_recovery';
 --enable_warnings
 
---let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_start_on_boot=1
+--let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_start_on_boot=1 --group_replication_ssl_mode=REQUIRED
 --replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
 --source include/restart_mysqld.inc
 
@@ -115,6 +130,10 @@
 
 --source include/stop_group_replication.inc
 
+--disable_query_log
+--eval SET GLOBAL group_replication_ssl_mode= $conf_rec_ssl_mode_s2
+--enable_query_log
+
 RESET SLAVE ALL FOR CHANNEL "group_replication_applier";
 RESET MASTER;
 
@@ -122,7 +141,18 @@
 
 --source include/stop_group_replication.inc
 
+--disable_query_log
+--eval SET GLOBAL group_replication_ssl_mode= $conf_rec_ssl_mode_s1
+--enable_query_log
+
 RESET SLAVE ALL FOR CHANNEL "group_replication_applier";
 RESET MASTER;
 
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+SET SESSION sql_log_bin=0;
+DROP USER 'rec_ssl_user';
+SET SESSION sql_log_bin=1;
+
 --source include/gr_clear_configuration.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_start_stop_applier_thd_crash.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_start_stop_applier_thd_crash.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_start_stop_applier_thd_crash.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_start_stop_applier_thd_crash.test	2021-09-28 11:46:34.000000000 +0000
@@ -31,6 +31,9 @@
 call mtr.add_suppression("Error writing relay log configuration.");
 call mtr.add_suppression("Error writing master configuration");
 call mtr.add_suppression("Error reading master configuration");
+call mtr.add_suppression("Fatal error during execution on the Applier process of Group Replication. The server will now leave the group.");
+call mtr.add_suppression("Unable to confirm whether the server has left the group or not. Check performance_schema.replication_group_members to check group membership information.");
+call mtr.add_suppression("The server was automatically set into read only mode after an error was detected.");
 SET sql_log_bin = 1;
 
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_start_stop_parallel_applier_database.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_start_stop_parallel_applier_database.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_start_stop_parallel_applier_database.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_start_stop_parallel_applier_database.test	2021-09-28 11:46:34.000000000 +0000
@@ -21,18 +21,22 @@
 # 6. Stop applier thread. Test with default REPLICA_PARALLEL_TYPE and default
 #    REPLICA_PARALLEL_WORKERS. Start applier thread should succeed.
 ################################################################################
---source include/not_mts_replica_parallel_workers.inc
+--source include/only_mts_replica_parallel_workers.inc
 --source include/have_group_replication_plugin.inc
 --source include/group_replication.inc
 
 # If these assert fails there is no point in continue the test,
 # since it relies on DATABASE as default value.
---let $assert_text= Default slave parallel type must be DATABASE
---let $assert_cond= "[SELECT @@GLOBAL.REPLICA_PARALLEL_TYPE]" = "DATABASE"
+--let $assert_text= Default slave parallel type must be LOGICAL_CLOCK
+--let $assert_cond= "[SELECT @@GLOBAL.REPLICA_PARALLEL_TYPE]" = "LOGICAL_CLOCK"
 --source include/assert.inc
 
---let $assert_text= Default slave parallel workers must be 0
---let $assert_cond= [SELECT @@GLOBAL.REPLICA_PARALLEL_WORKERS] = 0
+--let $assert_text= Default slave parallel workers must be 4
+--let $assert_cond= [SELECT @@GLOBAL.REPLICA_PARALLEL_WORKERS] = 4
+--source include/assert.inc
+
+--let $assert_text= Default slave preserve commit order 1
+--let $assert_cond= [SELECT @@GLOBAL.REPLICA_PRESERVE_COMMIT_ORDER] = 1
 --source include/assert.inc
 
 # Save defaults.
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_startup_verifications_not_table_repositories.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_startup_verifications_not_table_repositories.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_startup_verifications_not_table_repositories.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_startup_verifications_not_table_repositories.test	2021-09-28 11:46:34.000000000 +0000
@@ -125,9 +125,19 @@
 # Test that the variable cannot be changed when group replication is running
 #
 
+SET sql_log_bin=0;
+CREATE USER 'internal_usr'@'%' IDENTIFIED BY 'unique_password';
+GRANT GROUP_REPLICATION_STREAM ON *.* TO 'internal_usr'@'%';
+FLUSH PRIVILEGES;
+SET sql_log_bin=1;
+
 SET @@GLOBAL.relay_log_info_repository='TABLE';
 SET @@GLOBAL.master_info_repository='TABLE';
 
+--disable_warnings
+CHANGE MASTER TO MASTER_USER='internal_usr', MASTER_PASSWORD='unique_password' FOR CHANNEL 'group_replication_recovery';
+--enable_warnings
+
 --source include/start_group_replication.inc
 
 --error ER_CHANGE_RPL_INFO_REPOSITORY_FAILURE
@@ -151,4 +161,8 @@
 call mtr.add_suppression("Master info repository must be set to TABLE.");
 call mtr.add_suppression("Relay log info repository must be set to TABLE.");
 
+SET sql_log_bin=0;
+DROP USER 'internal_usr';
+SET sql_log_bin=1;
+
 --source include/gr_clear_configuration.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_startup_verifications.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_startup_verifications.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_startup_verifications.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_startup_verifications.test	2021-09-28 11:46:34.000000000 +0000
@@ -23,7 +23,6 @@
 # 4. Restore the old configuration values.
 ################################################################################
 
---source include/not_mts_replica_parallel_workers.inc
 --source include/have_group_replication_plugin.inc
 
 --connection server1
@@ -64,6 +63,7 @@
 --echo #
 SET @replica_parallel_type_saved= @@GLOBAL.REPLICA_PARALLEL_TYPE;
 SET @replica_parallel_workers_saved= @@GLOBAL.REPLICA_PARALLEL_WORKERS;
+SET @replica_preserve_commit_order= @@GLOBAL.REPLICA_PRESERVE_COMMIT_ORDER;
 
 SET @@GLOBAL.REPLICA_PARALLEL_TYPE= "DATABASE";
 SET GLOBAL REPLICA_PARALLEL_WORKERS= 4;
@@ -72,11 +72,13 @@
 
 SET @@GLOBAL.REPLICA_PARALLEL_TYPE= "LOGICAL_CLOCK";
 SET GLOBAL REPLICA_PARALLEL_WORKERS= 4;
+SET @@GLOBAL.REPLICA_PRESERVE_COMMIT_ORDER= OFF;
 --error ER_GROUP_REPLICATION_CONFIGURATION
 START GROUP_REPLICATION;
 
 SET @@GLOBAL.REPLICA_PARALLEL_TYPE= @replica_parallel_type_saved;
 SET @@GLOBAL.REPLICA_PARALLEL_WORKERS= @replica_parallel_workers_saved;
+SET @@GLOBAL.REPLICA_PRESERVE_COMMIT_ORDER= @replica_preserve_commit_order;
 
 call mtr.add_suppression("Binlog format should be ROW for Group Replication");
 call mtr.add_suppression("Extraction of transaction write sets requires*");
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_suspect_member_expelled.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_suspect_member_expelled.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_suspect_member_expelled.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_suspect_member_expelled.test	2021-09-28 11:46:34.000000000 +0000
@@ -41,7 +41,6 @@
 SET GLOBAL group_replication_member_expel_timeout = 15;
 SELECT @@GLOBAL.group_replication_member_expel_timeout;
 
-
 # Kill server3
 --echo #
 --echo # Crash server 3
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_suspect_member_resumes_after_crash_join_retries.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_suspect_member_resumes_after_crash_join_retries.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_suspect_member_resumes_after_crash_join_retries.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_suspect_member_resumes_after_crash_join_retries.test	2021-09-28 11:46:34.000000000 +0000
@@ -71,6 +71,7 @@
 --source include/rpl_connection.inc
 --let $group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
+
 --let $restart_parameters=restart:--group_replication_local_address=$group_replication_local_address --group_replication_group_seeds=$group_replication_group_seeds --group_replication_group_name=$group_replication_group_name --group_replication_start_on_boot=1
 --replace_result $group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
 --source include/kill_and_restart_mysqld.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_suspect_member_resumes_after_crash_mysql.cnf mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_suspect_member_resumes_after_crash_mysql.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_suspect_member_resumes_after_crash_mysql.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_suspect_member_resumes_after_crash_mysql.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,15 @@
+!include ../my.cnf
+
+[mysqld.1]
+loose-group_replication_communication_stack=MySQL
+
+[mysqld.2]
+loose-group_replication_communication_stack=MySQL
+
+[mysqld.3]
+local-infile=       true
+loose-group_replication_communication_stack=MySQL
+
+[ENV]
+SERVER_MYPORT_3=		@mysqld.3.port
+SERVER_MYSOCK_3=		@mysqld.3.socket
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_suspect_member_resumes_after_crash_mysql.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_suspect_member_resumes_after_crash_mysql.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_suspect_member_resumes_after_crash_mysql.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_suspect_member_resumes_after_crash_mysql.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,29 @@
+#######################################################################################
+# WL11570 - GR: options to defer member eviction after a suspicion
+#
+# In a group of 3 servers, we crash one of them, restart it and make it join the group
+# again, which fails. When it finally is expelled from the group, as its suspicion
+# on other members times out, it is finally able to rejoin the group.
+# Test :
+# 0. This test requires a group with 3 servers.
+# 1. Set the group_replication_member_expel_timeout parameter to 3600 seconds.
+# 2. Create table t1 and insert some data, checking that it is replicated to all
+#    servers.
+# 3. Crash server 3 and it will restart.
+#    This will make server 3 not answer to "I am alive" GCS messages and it will
+#    eventually be considered faulty.
+# 4. Check that all members are still in the group on servers 1 and 2, which should
+#    both be ONLINE.
+#    Server 3 should still be in the group but UNREACHABLE.
+# 5. Insert data into table t1 on server 2 and check that it is replicated to server 1.
+# 6. Restart GR on server 3 and it should fail since its
+#    suspicion still hasn't timed out on other members.
+# 7. Wait until server 3 is expelled from the group.
+# 8. Server 3 was expelled! Start GR on server 3.
+# 9. Check that server 3 retrieves the data inserted while
+#    it was suspended. Then, use it to insert new data into
+#    table t1 which should be replicated to servers 1 and 2.
+# 10. Clean up.
+#######################################################################################
+
+--source ../include/gr_suspect_member_resumes_after_crash.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_suspect_member_resumes_after_crash.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_suspect_member_resumes_after_crash.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_suspect_member_resumes_after_crash.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_suspect_member_resumes_after_crash.test	2021-09-28 11:46:34.000000000 +0000
@@ -26,180 +26,4 @@
 # 10. Clean up.
 #######################################################################################
 
-# Don't test this under valgrind, memory leaks will occur
---source include/not_valgrind.inc
---source include/big_test.inc
---source include/force_restart.inc
---source include/have_group_replication_plugin.inc
---let $rpl_server_count= 3
---source include/group_replication.inc
-
-
---echo
---echo ############################################################
---echo # 1. Set group_replication_member_expel_timeout to
---echo #    3600 seconds.
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
-SET GLOBAL group_replication_member_expel_timeout = 3600;
---let $server1_local_address= `SELECT @@GLOBAL.group_replication_local_address`
-
---let $rpl_connection_name= server2
---source include/rpl_connection.inc
-SET GLOBAL group_replication_member_expel_timeout = 3600;
-
---let $rpl_connection_name= server3
---source include/rpl_connection.inc
-SET GLOBAL group_replication_member_expel_timeout = 3600;
-set session sql_log_bin=0;
-call mtr.add_suppression("read failed");
-call mtr.add_suppression("The member was unable to join the group. Local port: *.*");
-call mtr.add_suppression("Timeout on wait for view after joining group");
-call mtr.add_suppression("Error connecting to all peers. Member join failed. Local port: *.*");
-set session sql_log_bin=1;
-
-
---echo
---echo ############################################################
---echo # 2. Create a table and insert some data. Check that
---echo #    it is replicated to all servers.
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
-CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY);
-INSERT INTO t1 VALUES (1);
---source include/rpl_sync.inc
-
-
---echo
---echo ############################################################
---echo # 3. Crash server 3 and it will restart.
---let $rpl_connection_name= server3
---source include/rpl_connection.inc
---let $group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
---let $group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
---let $restart_parameters=restart:--group_replication_local_address=$group_replication_local_address --group_replication_group_seeds=$group_replication_group_seeds --group_replication_group_name=$group_replication_group_name
---replace_result $group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
---source include/kill_and_restart_mysqld.inc
-
---echo #
---echo # Restarting server 3
-# Needed as we are not using rpl_restart_server.inc
---let $rpl_server_number= 3
---source include/rpl_reconnect.inc
-
-
---echo
---echo ############################################################
---echo # 4. Check that all members are still in the group on
---echo #    servers 1 and 2, which should both be ONLINE.
---echo #    Server 3 should still be in the group but UNREACHABLE.
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
-let $wait_condition=SELECT COUNT(*)=2 FROM performance_schema.replication_group_members where MEMBER_STATE="ONLINE";
---source include/wait_condition.inc
-let $wait_condition=SELECT COUNT(*)=1 FROM performance_schema.replication_group_members where MEMBER_STATE="UNREACHABLE";
---source include/wait_condition.inc
-
---let $rpl_connection_name= server2
---source include/rpl_connection.inc
-let $wait_condition=SELECT COUNT(*)=2 FROM performance_schema.replication_group_members where MEMBER_STATE="ONLINE";
---source include/wait_condition.inc
-let $wait_condition=SELECT COUNT(*)=1 FROM performance_schema.replication_group_members where MEMBER_STATE="UNREACHABLE";
---source include/wait_condition.inc
-
-
---echo
---echo ############################################################
---echo # 5. Insert data into table t1 on server 2 and check that
---echo #    it is replicated to server 1.
-INSERT INTO t1 VALUES (2);
-let $wait_condition=SELECT COUNT(*)=2 FROM t1;
---source include/wait_condition.inc
-
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
-let $wait_condition=SELECT COUNT(*)=2 FROM t1;
---source include/wait_condition.inc
-
-
---echo
---echo ############################################################
---echo # 6. Restart GR on server 3 and it should fail since its
---echo #    suspicion still hasn't timed out on other members.
---let $rpl_connection_name= server3
---source include/rpl_connection.inc
---replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
---eval SET GLOBAL group_replication_group_name= "$group_replication_group_name"
---replace_result $server1_local_address SERVER1_LOCAL_ADDRESS
---eval SET GLOBAL group_replication_group_seeds= "$server1_local_address"
---error ER_GROUP_REPLICATION_CONFIGURATION
-START GROUP_REPLICATION;
-
-
---echo
---echo ############################################################
---echo # 7. Wait until server 3 is expelled from the group.
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
-SET GLOBAL group_replication_member_expel_timeout = DEFAULT;
---let $rpl_connection_name= server2
---source include/rpl_connection.inc
-SET GLOBAL group_replication_member_expel_timeout = DEFAULT;
-
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
-let $wait_condition=SELECT COUNT(*)=2 FROM performance_schema.replication_group_members;
---source include/wait_condition.inc
-
---let $rpl_connection_name= server2
---source include/rpl_connection.inc
-let $wait_condition=SELECT COUNT(*)=2 FROM performance_schema.replication_group_members;
---source include/wait_condition.inc
-
-
---echo
---echo ############################################################
---echo # 8. Server 3 was expelled! Start GR on server 3.
---let $rpl_connection_name= server3
---source include/rpl_connection.inc
---source include/start_group_replication.inc
-SET GLOBAL group_replication_member_expel_timeout = DEFAULT;
-
-
---let $rpl_connection_name= server1
---source include/rpl_connection.inc
-let $wait_condition=SELECT COUNT(*)=3 FROM performance_schema.replication_group_members where MEMBER_STATE="ONLINE";
---source include/wait_condition.inc
-
---let $rpl_connection_name= server2
---source include/rpl_connection.inc
-let $wait_condition=SELECT COUNT(*)=3 FROM performance_schema.replication_group_members where MEMBER_STATE="ONLINE";
---source include/wait_condition.inc
-
---let $rpl_connection_name= server3
---source include/rpl_connection.inc
-let $wait_condition=SELECT COUNT(*)=3 FROM performance_schema.replication_group_members where MEMBER_STATE="ONLINE";
---source include/wait_condition.inc
-
-
---echo
---echo ############################################################
---echo # 9. Check that server 3 retrieves the data inserted while
---echo #    it was suspended. Then, use it to insert new data into
---echo #    table t1 which should be replicated to servers 1 and 2.
---let $rpl_connection_name= server3
---source include/rpl_connection.inc
-let $wait_condition=SELECT COUNT(*)=2 FROM t1;
---source include/wait_condition.inc
-INSERT INTO t1 VALUES (3);
---source include/rpl_sync.inc
---let $diff_tables=server1:t1, server2:t1, server3:t1
---source include/diff_tables.inc
-
-
---echo
---echo ############################################################
---echo # 10. Clean up.
-DROP TABLE t1;
-
---source include/group_replication_end.inc
+--source ../include/gr_suspect_member_resumes_after_crash.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_to_binlogless_slave.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_to_binlogless_slave.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_to_binlogless_slave.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_to_binlogless_slave.test	2021-09-28 11:46:34.000000000 +0000
@@ -24,7 +24,6 @@
 # 6. Ensure that the test is cleaned up and closed.
 ################################################################################
 
---source include/not_mts_replica_parallel_workers.inc
 --source include/have_group_replication_plugin.inc
 --let $rpl_skip_group_replication_start= 1
 --let $rpl_server_count= 4
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_uninstall_while_network_blocked.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_uninstall_while_network_blocked.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_uninstall_while_network_blocked.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_uninstall_while_network_blocked.test	2021-09-28 11:46:34.000000000 +0000
@@ -36,12 +36,13 @@
 # Save the variables, for server restart.
 --let $member2_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $group_replication_comm_stack= `SELECT @@GLOBAL.group_replication_communication_stack`
 --let $member2_uuid= query_get_value(SELECT @@SERVER_UUID, @@SERVER_UUID, 1)
 
 --echo
 --echo # 1. Kill and restart server 2
---let $restart_parameters=restart:--group_replication_local_address=$member2_group_replication_local_address --group_replication_group_seeds=$group_replication_group_seeds --group_replication_group_name=$group_replication_group_name
---replace_result $member2_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS2 $group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--let $restart_parameters=restart:--group_replication_local_address=$member2_group_replication_local_address --group_replication_group_seeds=$group_replication_group_seeds --group_replication_group_name=$group_replication_group_name --group_replication_communication_stack=$group_replication_comm_stack
+--replace_result $member2_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS2 $group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $group_replication_comm_stack GROUP_REPLICATION_COMMUNICATION_STACK
 --source include/kill_and_restart_mysqld.inc
 
 --let $rpl_server_number= 2
@@ -99,8 +100,8 @@
 --source include/rpl_connection.inc
 
 # terminate send calling reap
---echo # CR_SERVER_LOST, CR_SERVER_GONE_ERROR
---error 2006,2013
+--echo # CR_SERVER_LOST, CR_SERVER_GONE_ERROR or Rollback
+--error 2006,2013,3100
 --reap
 
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_variables_default_values.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_variables_default_values.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_variables_default_values.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_variables_default_values.test	2021-09-28 11:46:34.000000000 +0000
@@ -1,3 +1,4 @@
+
 ################################################################################
 # Base test to verify the default values of the group replication variables.
 #
@@ -9,6 +10,7 @@
 ################################################################################
 
 --let $group_replication_group_name= dddddddd-dddd-dddd-dddd-dddddddddddd
+--source include/force_restart.inc
 --source include/have_group_replication_plugin.inc
 --let $rpl_skip_group_replication_start= 1
 --source include/group_replication.inc
@@ -85,9 +87,11 @@
 --let $saved_gr_recovery_tls_ciphersuites = `SELECT @@GLOBAL.group_replication_recovery_tls_ciphersuites;`
 --let $saved_gr_advertise_recovery_endpoints = `SELECT @@GLOBAL.group_replication_advertise_recovery_endpoints;`
 --let $saved_gr_view_change_uuid = `SELECT @@GLOBAL.group_replication_view_change_uuid;`
+--let $saved_gr_communication_stack = `SELECT @@GLOBAL.group_replication_communication_stack;`
+--let $saved_gr_paxos_single_leader = `SELECT @@GLOBAL.group_replication_paxos_single_leader;`
 
 # Total number of GR variables.
---let $total_gr_vars= 59
+--let $total_gr_vars= 61
 
 --echo #
 --echo # Test Unit#1
@@ -156,6 +160,8 @@
 SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= default;
 SET @@GLOBAL.group_replication_advertise_recovery_endpoints = default;
 SET @@GLOBAL.group_replication_view_change_uuid= default;
+SET @@GLOBAL.group_replication_communication_stack = default;
+SET @@GLOBAL.group_replication_paxos_single_leader = default;
 
 # Session variables
 SET @@SESSION.group_replication_consistency= default;
@@ -181,8 +187,8 @@
 --source include/assert.inc
 
 # group_replication_components_stop_timeout
---let $assert_text= Default group_replication_components_stop_timeout is 31536000
---let $assert_cond= "[SELECT @@GLOBAL.group_replication_components_stop_timeout]" = 31536000
+--let $assert_text= Default group_replication_components_stop_timeout is 300
+--let $assert_cond= "[SELECT @@GLOBAL.group_replication_components_stop_timeout]" = 300
 --source include/assert.inc
 
 # group_replication_compression_threshold
@@ -380,6 +386,17 @@
 --let $assert_cond= "[SELECT @@GLOBAL.group_replication_view_change_uuid]" = "AUTOMATIC"
 --source include/assert.inc
 
+# group_replication_communication_stack
+--let $assert_text= Default group_replication_communication_stack is XCom
+--let $assert_cond= "[SELECT @@GLOBAL.group_replication_communication_stack]" = "XCom"
+--source include/assert.inc
+
+# group_replication_paxos_single_leader
+--let $assert_text= Default group_replication_paxos_single_leader is 0
+--let $assert_cond= "[SELECT @@GLOBAL.group_replication_paxos_single_leader]" = 0
+--source include/assert.inc
+
+
 --echo #
 --echo # Clean up
 --echo #
@@ -434,6 +451,8 @@
 --eval SET @@GLOBAL.group_replication_recovery_tls_ciphersuites= "$saved_gr_recovery_tls_ciphersuites"
 --eval SET @@GLOBAL.group_replication_advertise_recovery_endpoints= "$saved_gr_advertise_recovery_endpoints"
 --eval SET @@GLOBAL.group_replication_view_change_uuid= "$saved_gr_view_change_uuid"
+--eval SET @@GLOBAL.group_replication_communication_stack= "$saved_gr_communication_stack"
+--eval SET @@GLOBAL.group_replication_paxos_single_leader= $saved_gr_paxos_single_leader
 --enable_query_log
 
 --let $total_gr_vars=
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_view_change_delayed_write_order.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_view_change_delayed_write_order.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_view_change_delayed_write_order.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_view_change_delayed_write_order.test	2021-09-28 11:46:34.000000000 +0000
@@ -37,6 +37,7 @@
 SET SESSION sql_log_bin= 0;
 --eval CREATE USER "$recovery_user" IDENTIFIED BY "$recovery_password"
 --eval GRANT REPLICATION SLAVE ON *.* TO "$recovery_user"
+--eval GRANT GROUP_REPLICATION_STREAM ON *.* TO "$recovery_user"@'%';
 FLUSH PRIVILEGES;
 SET SESSION sql_log_bin= 1;
 
@@ -54,6 +55,12 @@
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
 
+SET SESSION sql_log_bin= 0;
+--eval CREATE USER "$recovery_user" IDENTIFIED BY "$recovery_password"
+--eval GRANT GROUP_REPLICATION_STREAM ON *.* TO "$recovery_user"@'%';
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
+
 --source include/start_group_replication.inc
 
 --echo #
@@ -73,6 +80,12 @@
 --let $rpl_connection_name= server3
 --source include/rpl_connection.inc
 
+SET SESSION sql_log_bin= 0;
+--eval CREATE USER "$recovery_user" IDENTIFIED BY "$recovery_password"
+--eval GRANT GROUP_REPLICATION_STREAM ON *.* TO "$recovery_user"@'%';
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
+
 --disable_warnings
 --eval CHANGE REPLICATION SOURCE TO SOURCE_USER= '$recovery_user', SOURCE_PASSWORD= '$recovery_password' FOR CHANNEL 'group_replication_recovery'
 --enable_warnings
@@ -171,8 +184,21 @@
 --source include/rpl_connection.inc
 
 SET SESSION sql_log_bin= 0;
+--eval DROP USER "$recovery_user"
+SET SESSION sql_log_bin= 1;
+
+SET SESSION sql_log_bin= 0;
+call mtr.add_suppression("Slave I/O for channel 'group_replication_recovery': Master command COM_REGISTER_SLAVE failed.*");
+call mtr.add_suppression("Slave I/O thread couldn't register on master.*");
 call mtr.add_suppression("There was an error when connecting to the donor server.*");
 call mtr.add_suppression("For details please check performance_schema.replication_connection_status table and error log messages of Slave I/O for channel group_replication_recovery.");
 SET SESSION sql_log_bin= 1;
 
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+SET SESSION sql_log_bin= 0;
+--eval DROP USER "$recovery_user"
+SET SESSION sql_log_bin= 1;
+
 --source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_view_change_uuid_check_configuration.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_view_change_uuid_check_configuration.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_view_change_uuid_check_configuration.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_view_change_uuid_check_configuration.test	2021-09-28 11:46:34.000000000 +0000
@@ -147,7 +147,14 @@
 --echo ####################################################################
 --echo # 5. Cleanup
 
+RESET PERSIST;
 --replace_result $view_change_uuid_save VIEW_CHANGE_UUID
 --eval SET GLOBAL group_replication_view_change_uuid = $view_change_uuid_save
 
+--let $allow_rpl_inited=1
+--let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
+--let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $restart_parameters=restart:--group-replication-start-on-boot=OFF --group-replication-group-name=$group_replication_group_name --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_bootstrap_group=1
+--source include/restart_mysqld_no_echo.inc
+
 --source include/gr_clear_configuration.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_view_change_uuid_validation_with_anonymous_server.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_view_change_uuid_validation_with_anonymous_server.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_view_change_uuid_validation_with_anonymous_server.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_view_change_uuid_validation_with_anonymous_server.test	2021-09-28 11:46:34.000000000 +0000
@@ -300,4 +300,17 @@
 --replace_result $view_change_uuid_save VIEW_CHANGE_UUID
 --eval SET GLOBAL group_replication_view_change_uuid = $view_change_uuid_save
 
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+RESET PERSIST;
+
+--let $allow_rpl_inited=1
+--let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
+--let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $restart_parameters=restart:--group-replication-start-on-boot=OFF --group-replication-group-name=$group_replication_group_name --group_replication_local_address
+--source include/restart_mysqld_no_echo.inc
+--let $rpl_server_number= 1
+--source include/rpl_reconnect.inc
+
 --source include/group_replication_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_with_credential_and_channel.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_with_credential_and_channel.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_with_credential_and_channel.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_with_credential_and_channel.test	2021-09-28 11:46:34.000000000 +0000
@@ -15,6 +15,7 @@
 # 7. Cleanup.
 ################################################################################
 
+--source include/have_group_replication_xcom_communication_stack.inc
 --source include/have_group_replication_plugin.inc
 --let $rpl_skip_group_replication_start= 1
 --source include/group_replication.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_write_concurrency.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_write_concurrency.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_write_concurrency.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_write_concurrency.test	2021-09-28 11:46:34.000000000 +0000
@@ -41,6 +41,11 @@
 --let $assert_cond = [SELECT group_replication_get_write_concurrency()] = $gr_write_concurrency_default
 --source include/assert.inc
 
+--let $write_concurrency_table= query_get_value(SELECT write_concurrency FROM performance_schema.replication_group_communication_information, write_concurrency, 1)
+--let $assert_text= write_concurrency ($write_concurrency_table) should be $gr_write_concurrency_default
+--let $assert_cond= "$write_concurrency_table" = "$gr_write_concurrency_default"
+--source include/assert.inc
+
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
 SET SESSION sql_log_bin = 0;
@@ -56,6 +61,11 @@
 --let $assert_cond = [SELECT group_replication_get_write_concurrency()] = $gr_write_concurrency_default
 --source include/assert.inc
 
+--let $write_concurrency_table= query_get_value(SELECT write_concurrency FROM performance_schema.replication_group_communication_information, write_concurrency, 1)
+--let $assert_text= write_concurrency ($write_concurrency_table) should be $gr_write_concurrency_default
+--let $assert_cond= "$write_concurrency_table" = "$gr_write_concurrency_default"
+--source include/assert.inc
+
 --echo ###############################################################################
 --echo # 3. Increase write_concurrency via M1, confirm on M1, M2
 --let $gr_new_write_concurrency= 42
@@ -68,12 +78,22 @@
 --let $wait_condition= SELECT group_replication_get_write_concurrency() = $gr_new_write_concurrency
 --source include/wait_condition.inc
 
+--let $write_concurrency_table= query_get_value(SELECT write_concurrency FROM performance_schema.replication_group_communication_information, write_concurrency, 1)
+--let $assert_text= write_concurrency ($write_concurrency_table) should be $gr_new_write_concurrency
+--let $assert_cond= "$write_concurrency_table" = "$gr_new_write_concurrency"
+--source include/assert.inc
+
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
 
 --let $wait_condition= SELECT group_replication_get_write_concurrency() = $gr_new_write_concurrency
 --source include/wait_condition.inc
 
+--let $write_concurrency_table= query_get_value(SELECT write_concurrency FROM performance_schema.replication_group_communication_information, write_concurrency, 1)
+--let $assert_text= write_concurrency ($write_concurrency_table) should be $gr_new_write_concurrency
+--let $assert_cond= "$write_concurrency_table" = "$gr_new_write_concurrency"
+--source include/assert.inc
+
 --echo ###############################################################################
 --echo # 4. Decrease write_concurrency via M2, confirm on M1, M2
 --let $gr_new_write_concurrency= 10
@@ -83,12 +103,22 @@
 --let $wait_condition= SELECT group_replication_get_write_concurrency() = $gr_new_write_concurrency
 --source include/wait_condition.inc
 
+--let $write_concurrency_table= query_get_value(SELECT write_concurrency FROM performance_schema.replication_group_communication_information, write_concurrency, 1)
+--let $assert_text= write_concurrency ($write_concurrency_table) should be $gr_new_write_concurrency
+--let $assert_cond= "$write_concurrency_table" = "$gr_new_write_concurrency"
+--source include/assert.inc
+
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
 
 --let $wait_condition= SELECT group_replication_get_write_concurrency() = $gr_new_write_concurrency
 --source include/wait_condition.inc
 
+--let $write_concurrency_table= query_get_value(SELECT write_concurrency FROM performance_schema.replication_group_communication_information, write_concurrency, 1)
+--let $assert_text= write_concurrency ($write_concurrency_table) should be $gr_new_write_concurrency
+--let $assert_cond= "$write_concurrency_table" = "$gr_new_write_concurrency"
+--source include/assert.inc
+
 --echo ###############################################################################
 --echo # 5. Confirm invalid calls to group_replication_get_write_concurrency
 --error ER_CANT_INITIALIZE_UDF
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_xplugin_global_variables.test mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_xplugin_global_variables.test
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/gr_xplugin_global_variables.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/gr_xplugin_global_variables.test	2021-09-28 11:46:34.000000000 +0000
@@ -14,6 +14,7 @@
 ###############################################################################
 
 --source include/big_test.inc
+--source include/have_group_replication_xcom_communication_stack.inc
 --source include/have_mysqlx_plugin.inc
 --source include/have_group_replication_plugin_base.inc
 
@@ -67,8 +68,8 @@
 --let $assert_cond= "[SELECT @@GLOBAL.group_replication_auto_increment_increment]" = "7"
 --source include/assert.inc
 
---let $assert_text= group_replication_components_stop_timeout is 31536000
---let $assert_cond= "[SELECT @@GLOBAL.group_replication_components_stop_timeout]" = "31536000"
+--let $assert_text= group_replication_components_stop_timeout is 300
+--let $assert_cond= "[SELECT @@GLOBAL.group_replication_components_stop_timeout]" = "300"
 --source include/assert.inc
 
 --let $assert_text= group_replication_compression_threshold is 1000000
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/suite.opt mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/suite.opt
--- mysql-8.0-8.0.26/mysql-test/suite/group_replication/t/suite.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/group_replication/t/suite.opt	2021-09-28 11:46:34.000000000 +0000
@@ -1 +1,4 @@
 $GROUP_REPLICATION_OPT --plugin-load=$GROUP_REPLICATION
+--loose-group_replication_recovery_ssl_ca=$MYSQL_TEST_DIR/std_data/cacert.pem
+--loose-group_replication_recovery_ssl_cert=$MYSQL_TEST_DIR/std_data/client-cert.pem
+--loose-group_replication_recovery_ssl_key=$MYSQL_TEST_DIR/std_data/client-key.pem
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/include/innodb_bulk_inject_errors.inc mysql-8.0-8.0.27/mysql-test/suite/innodb/include/innodb_bulk_inject_errors.inc
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/include/innodb_bulk_inject_errors.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/include/innodb_bulk_inject_errors.inc	2021-09-28 11:46:34.000000000 +0000
@@ -44,21 +44,21 @@
 --echo # ###########################################################
 --echo # Inject error during bulk insert
 
-SET debug = '+d,ib_btr_bulk_insert_inject_error';
+SET debug = '+d,ddl_btree_build_too_big_record';
 
 # Move table to general tablespace
 --replace_regex /not counting BLOBs, is [0-9]+/not counting BLOBs, is #value#/
 --error ER_TOO_BIG_ROWSIZE
 ALTER TABLE t1 TABLESPACE ts1;
 
-SET debug = '-d,ib_btr_bulk_insert_inject_error';
+SET debug = '-d,ddl_btree_build_too_big_record';
 
 FLUSH TABLES;
 
 --echo # ###########################################################
 --echo # Inject error during bulk reserve space
 
-SET debug = '+d,ib_btr_bulk_prepare_space_error';
+SET debug = '+d,ddl_btree_build_oom';
 
 # Move table to general tablespace
 --error ER_OUT_OF_RESOURCES
@@ -66,7 +66,7 @@
 
 FLUSH TABLES;
 
-SET debug = '-d,ib_btr_bulk_prepare_space_error';
+SET debug = '-d,ddl_btree_build_oom';
 
 --echo # ###########################################################
 --echo # No error - check for final success
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/r/alter_table_stage_progress.result mysql-8.0-8.0.27/mysql-test/suite/innodb/r/alter_table_stage_progress.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/r/alter_table_stage_progress.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/r/alter_table_stage_progress.result	2021-09-28 11:46:34.000000000 +0000
@@ -1,4 +1,7 @@
+SET SESSION innodb_ddl_threads=1;
+SET SESSION innodb_parallel_read_threads=1;
 CREATE TABLE wl5889 (a INT) ENGINE=INNODB;
+INSERT INTO wl5889 VALUE(1);
 ALTER TABLE wl5889 ADD COLUMN b INT, ALGORITHM=INPLACE;
 SELECT
 event_name,
@@ -12,7 +15,11 @@
 work_completed > 0	1
 work_estimated > 0	1
 work_completed <= work_estimated	1
-event_name	stage/innodb/alter table (flush)
+event_name	stage/innodb/alter table (end)
+work_completed > 0	0
+work_estimated > 0	0
+work_completed <= work_estimated	1
+event_name	stage/innodb/alter table (end)
 work_completed > 0	1
 work_estimated > 0	1
 work_completed <= work_estimated	1
@@ -28,4 +35,8 @@
 work_completed > 0	1
 work_estimated > 0	1
 work_completed <= work_estimated	1
+event_name	stage/innodb/alter table (read PK and internal sort)
+work_completed > 0	0
+work_estimated > 0	0
+work_completed <= work_estimated	1
 DROP TABLE wl5889;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/r/ddl_kill.result mysql-8.0-8.0.27/mysql-test/suite/innodb/r/ddl_kill.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/r/ddl_kill.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/r/ddl_kill.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,36 @@
+# Check if a DDL operation can be interrupted.
+CREATE PROCEDURE insert_rows(IN BASE INT, IN SIZE INT)
+BEGIN
+DECLARE i INT DEFAULT BASE;
+WHILE (i <= SIZE) DO
+INSERT INTO t values (i);
+SET i = i + 1;
+END WHILE;
+END|
+CREATE TABLE t(c int) ENGINE=INNODB;
+# Insert rows
+CALL insert_rows(1, 1000);
+# con1: Start the DDL
+SET SESSION DEBUG='+d,ddl_merge_sort_interrupt';
+SET DEBUG_SYNC='ddl_merge_sort_interrupt SIGNAL ready WAIT_FOR interrupt';
+ALTER TABLE t ADD PRIMARY KEY(c);;
+# default: Kill the DDL
+SET DEBUG_SYNC='now WAIT_FOR ready';
+KILL QUERY @id;
+SET DEBUG_SYNC='now SIGNAL interrupt';
+# con1: reap
+ERROR 70100: Query execution was interrupted
+# con2: Start the DDL
+SET SESSION DEBUG='+d,ddl_btree_build_interrupt';
+SET DEBUG_SYNC='ddl_btree_build_interrupt SIGNAL ready WAIT_FOR interrupt';
+ALTER TABLE t ADD index i(c);;
+# default: Kill the DDL
+SET DEBUG_SYNC='now WAIT_FOR ready';
+KILL QUERY @id;
+SET DEBUG_SYNC='now SIGNAL interrupt';
+# con2: reap
+ERROR 70100: Query execution was interrupted
+# Cleanup
+SET DEBUG_SYNC="RESET";
+DROP PROCEDURE insert_rows;
+DROP TABLE t;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/r/ddl_prepare.result mysql-8.0-8.0.27/mysql-test/suite/innodb/r/ddl_prepare.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/r/ddl_prepare.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/r/ddl_prepare.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,28 @@
+SET global innodb_print_ddl_logs = ON;
+
+# In CONNECTION - DEFAULT
+CREATE TABLE t (col1 INT PRIMARY KEY, col2 INT);
+INSERT INTO t VALUES(1,1), (2,2), (3,3), (4,4);
+SET DEBUG_SYNC= 'alter_table_inplace_after_lock_downgrade SIGNAL do_insert WAIT_FOR resume_ddl';
+ALTER TABLE t DROP COLUMN col2;
+
+# In CONNECTION - 1
+SET DEBUG_SYNC= 'now WAIT_FOR do_insert';
+START TRANSACTION;
+INSERT INTO t VALUES(10,10);
+set session debug = "+d, crash_after_flush_engine_log";
+# Crash right after flushing InnoDB redo log
+COMMIT;
+ERROR HY000: Lost connection to MySQL server during query
+
+# In CONNECTION - DEFAULT
+ERROR HY000: Lost connection to MySQL server during query
+
+# restart
+SELECT * FROM t ORDER BY col1;
+col1	col2
+1	1
+2	2
+3	3
+4	4
+DROP TABLE t;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/r/foreign_key.result mysql-8.0-8.0.27/mysql-test/suite/innodb/r/foreign_key.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/r/foreign_key.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/r/foreign_key.result	2021-09-28 11:46:34.000000000 +0000
@@ -551,3 +551,150 @@
 id	for_name	ref_name
 test/......................................_ibfk_1	test/......................................	test/t1
 DROP TABLES `......................................`, t1;
+#
+# Bug#33053297 VIRTUAL INDEX CORRUPTED DURING CASCADE UPDATE ON CHILD TABLE
+#
+#Test-Case 1
+CREATE TABLE `emails` (
+`id` int unsigned NOT NULL AUTO_INCREMENT,
+PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+ROW_FORMAT=DYNAMIC;
+CREATE TABLE `email_stats` (
+`id` bigint unsigned NOT NULL AUTO_INCREMENT,
+`email_id` int unsigned DEFAULT NULL,
+`date_sent` datetime NOT NULL,
+`generated_sent_date` date GENERATED ALWAYS AS
+(concat(year(`date_sent`),'-',lpad(month(`date_sent`),2,'0'),
+'-',lpad(dayofmonth(`date_sent`),2,'0'))) VIRTUAL,
+PRIMARY KEY (`id`),
+KEY `IDX_ES1` (`email_id`),
+KEY `mautic_generated_sent_date_email_id`
+(`generated_sent_date`,`email_id`),
+CONSTRAINT `FK_EA1` FOREIGN KEY (`email_id`) REFERENCES
+`emails` (`id`) ON DELETE SET NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+ROW_FORMAT=DYNAMIC;
+INSERT INTO `emails` VALUES (1);
+INSERT INTO `email_stats` (`id`, `email_id`,  `date_sent`) VALUES
+(1,1,'2020-10-22 13:32:41');
+SELECT * FROM `email_stats`;
+id	email_id	date_sent	generated_sent_date
+1	1	2020-10-22 13:32:41	2020-10-22
+DELETE FROM `emails`;
+DELETE FROM `email_stats`;
+DROP TABLE `email_stats`;
+DROP TABLE `emails`;
+# Test-Case 2
+CREATE TABLE `emails` (
+`id` int unsigned NOT NULL AUTO_INCREMENT,
+PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+ROW_FORMAT=DYNAMIC;
+CREATE TABLE `email_stats` (
+`id` bigint unsigned NOT NULL AUTO_INCREMENT,
+`email_id` int unsigned DEFAULT NULL,
+`date_sent` datetime NOT NULL,
+`generated_sent_date` date GENERATED ALWAYS AS
+(concat(year(`date_sent`),'-',lpad(month(`date_sent`),2,'0'),
+'-',lpad(dayofmonth(`date_sent`),2,'0'))) VIRTUAL,
+PRIMARY KEY (`id`),
+KEY `IDX_ES1` (`email_id`),
+KEY `mautic_generated_sent_date_email_id`
+(`generated_sent_date`,`email_id`),
+CONSTRAINT `FK_EA1` FOREIGN KEY (`email_id`) REFERENCES
+`emails` (`id`) ON DELETE SET NULL ON UPDATE SET NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+ROW_FORMAT=DYNAMIC;
+INSERT INTO `emails` VALUES (1);
+INSERT INTO `email_stats` (`id`, `email_id`,  `date_sent`) VALUES
+(1,1,'2020-10-22 13:32:41');
+UPDATE `emails` SET `id` = 2 where `id` = 1;
+SELECT id FROM `email_stats` WHERE `generated_sent_date` IS NULL;
+id
+SELECT * FROM `email_stats`;
+id	email_id	date_sent	generated_sent_date
+1	NULL	2020-10-22 13:32:41	2020-10-22
+UPDATE `email_stats` SET `email_id`=2
+WHERE DATE(`generated_sent_date`) = '2020-10-22';
+SELECT * FROM `email_stats`;
+id	email_id	date_sent	generated_sent_date
+1	2	2020-10-22 13:32:41	2020-10-22
+DROP TABLE `email_stats`;
+DROP TABLE `emails`;
+# test-case 3
+CREATE TABLE `emails` (
+`id` int unsigned NOT NULL AUTO_INCREMENT,
+PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+ROW_FORMAT=DYNAMIC;
+CREATE TABLE `email_stats` (
+`id` bigint unsigned NOT NULL AUTO_INCREMENT,
+`email_id` int unsigned DEFAULT NULL,
+`date_sent` datetime NOT NULL,
+`generated_sent_email` varchar(20) GENERATED ALWAYS AS
+(CONCAT(YEAR(`date_sent`),'-', COALESCE(`email_id`, ' '))) VIRTUAL,
+PRIMARY KEY (`id`),
+KEY `idx_es1` (`email_id`),
+KEY `mautic_generated_sent_date_email`
+(`generated_sent_email`,`email_id`),
+CONSTRAINT `fk_ea1` FOREIGN KEY (`email_id`) REFERENCES
+`emails` (`id`) ON DELETE SET NULL
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+ROW_FORMAT=DYNAMIC;
+INSERT INTO `emails` VALUES (1);
+INSERT INTO `email_stats` (`id`, `email_id`,  `date_sent`) VALUES
+(1,1,'2020-10-22 13:32:41');
+SELECT * FROM `email_stats`;
+id	email_id	date_sent	generated_sent_email
+1	1	2020-10-22 13:32:41	2020-1
+SELECT `date_sent` FROM `email_stats` WHERE `generated_sent_email` = '2020-1';
+date_sent
+2020-10-22 13:32:41
+DELETE FROM `emails`;
+SELECT * FROM `email_stats`;
+id	email_id	date_sent	generated_sent_email
+1	NULL	2020-10-22 13:32:41	2020- 
+SELECT `date_sent` FROM `email_stats` WHERE `generated_sent_email` = '2020-';
+date_sent
+2020-10-22 13:32:41
+DROP TABLE `email_stats`;
+DROP TABLE `emails`;
+# test-case 4
+CREATE TABLE `emails` (
+`id` int unsigned NOT NULL AUTO_INCREMENT,
+PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+ROW_FORMAT=DYNAMIC;
+CREATE TABLE `email_stats` (
+`id` bigint unsigned NOT NULL AUTO_INCREMENT,
+`email_id` int unsigned DEFAULT NULL,
+`date_sent` datetime NOT NULL,
+`generated_sent_email` varchar(20) GENERATED ALWAYS AS
+(CONCAT(YEAR(`date_sent`),'-', COALESCE(`email_id`, ' '))) VIRTUAL,
+PRIMARY KEY (`id`),
+KEY `idx_es1` (`email_id`),
+KEY `mautic_generated_sent_date_email`
+(`generated_sent_email`,`email_id`),
+CONSTRAINT `fk_ea1` FOREIGN KEY (`email_id`) REFERENCES
+`emails` (`id`) ON UPDATE SET NULL
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+ROW_FORMAT=DYNAMIC;
+INSERT INTO `emails` VALUES (1);
+INSERT INTO `email_stats` (`id`, `email_id`,  `date_sent`) VALUES
+(1,1,'2020-10-22 13:32:41');
+SELECT * FROM `email_stats`;
+id	email_id	date_sent	generated_sent_email
+1	1	2020-10-22 13:32:41	2020-1
+SELECT `date_sent` FROM `email_stats` WHERE `generated_sent_email` = '2020-1';
+date_sent
+2020-10-22 13:32:41
+UPDATE `emails` SET `id` = 2 WHERE `id` = 1;
+SELECT * FROM `email_stats`;
+id	email_id	date_sent	generated_sent_email
+1	NULL	2020-10-22 13:32:41	2020- 
+SELECT `date_sent` FROM `email_stats` WHERE `generated_sent_email` = '2020-';
+date_sent
+2020-10-22 13:32:41
+DROP TABLE `email_stats`;
+DROP TABLE `emails`;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/r/implicit_to_explicit_conversion.result mysql-8.0-8.0.27/mysql-test/suite/innodb/r/implicit_to_explicit_conversion.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/r/implicit_to_explicit_conversion.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/r/implicit_to_explicit_conversion.result	2021-09-28 11:46:34.000000000 +0000
@@ -166,3 +166,33 @@
 2	2
 COMMIT;
 DROP TABLE t1;
+CREATE TABLE t1(id INT PRIMARY KEY) ENGINE=InnoDB;
+INSERT INTO t1 (id) VALUES (1),(3);
+BEGIN;
+INSERT INTO t1 (id) VALUES (2);
+BEGIN;
+INSERT INTO t1 (id) VALUES (4);
+BEGIN;
+SET DEBUG_SYNC = "before_lock_rec_convert_impl_to_expl_for_trx
+        SIGNAL c2_decided
+        WAIT_FOR c2_can_convert";
+SET DEBUG_SYNC = "after_lock_clust_rec_read_check_and_lock SIGNAL c2_will_wait";
+SELECT * FROM t1 WHERE id=2 FOR UPDATE;
+SET DEBUG_SYNC = "now WAIT_FOR c2_decided";
+SET DEBUG_SYNC = "after_trx_erase_lists
+        SIGNAL c1_will_commit
+        WAIT_FOR c1_can_commit";
+COMMIT;
+SET DEBUG_SYNC = "now WAIT_FOR c1_will_commit";
+SET DEBUG_SYNC = "after_lock_clust_rec_read_check_and_lock SIGNAL c2_can_convert WAIT_FOR c3_can_verify";
+SELECT * FROM t1 WHERE id=2 FOR UPDATE;;
+SET DEBUG_SYNC = "now WAIT_FOR c2_will_wait";
+SET DEBUG_SYNC = "now SIGNAL c1_can_commit";
+SET DEBUG_SYNC = "now SIGNAL c3_can_verify";
+id
+2
+COMMIT;
+id
+2
+COMMIT;
+DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/r/innochecksum_1.result mysql-8.0-8.0.27/mysql-test/suite/innodb/r/innochecksum_1.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/r/innochecksum_1.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/r/innochecksum_1.result	2021-09-28 11:46:34.000000000 +0000
@@ -1,7 +1,7 @@
 # Set the environmental variables
 call mtr.add_suppression("\\[ERROR\\] .*MY-\\d+.* Unable to read page \\[page id: space=.*, page number=.*\\] into the buffer pool after 100 attempts");
 call mtr.add_suppression("\\[ERROR\\] .*MY-\\d+.* Database page corruption on disk or a failed");
-call mtr.add_suppression("\\[ERROR\\] .*MY-\\d+.* Assertion failure: ut0ut\.cc:");
+call mtr.add_suppression("\\[ERROR\\] .*MY-\\d+.* Assertion failure: buf0buf\.cc:[0-9]+:ib::fatal triggered");
 SET GLOBAL innodb_file_per_table=on;
 [1]: Test is to corrupt the ibd file, & do repair for (innodb|crc32|none) checksum through innochecksum tool
 # Create and populate the table to be corrupted
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/r/innodb-2byte-collation.result mysql-8.0-8.0.27/mysql-test/suite/innodb/r/innodb-2byte-collation.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/r/innodb-2byte-collation.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/r/innodb-2byte-collation.result	2021-09-28 11:46:34.000000000 +0000
@@ -102,6 +102,8 @@
 s1
 a
 b
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE 2byte_collation;
 SET @innodb_change_buffering_debug_orig = @@innodb_change_buffering_debug;
 SET GLOBAL innodb_change_buffering_debug = 1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/r/innodb_bug19164038.result mysql-8.0-8.0.27/mysql-test/suite/innodb/r/innodb_bug19164038.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/r/innodb_bug19164038.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/r/innodb_bug19164038.result	2021-09-28 11:46:34.000000000 +0000
@@ -28,6 +28,7 @@
 SELECT @@innodb_sort_buffer_size;
 @@innodb_sort_buffer_size
 65536
-SET SESSION debug="+d,row_merge_instrument_log_check_flush";
+SET SESSION debug="+d,ddl_instrument_log_check_flush";
 ALTER TABLE t1 ADD COLUMN c3 INT;
+SET SESSION debug="-d,ddl_instrument_log_check_flush";
 DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/r/innodb_bulk_inject_errors.result mysql-8.0-8.0.27/mysql-test/suite/innodb/r/innodb_bulk_inject_errors.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/r/innodb_bulk_inject_errors.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/r/innodb_bulk_inject_errors.result	2021-09-28 11:46:34.000000000 +0000
@@ -8,18 +8,18 @@
 TABLESPACE innodb_file_per_table;
 # ###########################################################
 # Inject error during bulk insert
-SET debug = '+d,ib_btr_bulk_insert_inject_error';
+SET debug = '+d,ddl_btree_build_too_big_record';
 ALTER TABLE t1 TABLESPACE ts1;
 ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is #value#. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs
-SET debug = '-d,ib_btr_bulk_insert_inject_error';
+SET debug = '-d,ddl_btree_build_too_big_record';
 FLUSH TABLES;
 # ###########################################################
 # Inject error during bulk reserve space
-SET debug = '+d,ib_btr_bulk_prepare_space_error';
+SET debug = '+d,ddl_btree_build_oom';
 ALTER TABLE t1 TABLESPACE ts1;
 ERROR HY000: Out of memory; check if mysqld or some other process uses all available memory; if not, you may have to use 'ulimit' to allow mysqld to use more memory or you can add more swap space
 FLUSH TABLES;
-SET debug = '-d,ib_btr_bulk_prepare_space_error';
+SET debug = '-d,ddl_btree_build_oom';
 # ###########################################################
 # No error - check for final success
 ALTER TABLE t1 TABLESPACE ts1;
@@ -38,18 +38,18 @@
 TABLESPACE innodb_file_per_table;
 # ###########################################################
 # Inject error during bulk insert
-SET debug = '+d,ib_btr_bulk_insert_inject_error';
+SET debug = '+d,ddl_btree_build_too_big_record';
 ALTER TABLE t1 TABLESPACE ts1;
 ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is #value#. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs
-SET debug = '-d,ib_btr_bulk_insert_inject_error';
+SET debug = '-d,ddl_btree_build_too_big_record';
 FLUSH TABLES;
 # ###########################################################
 # Inject error during bulk reserve space
-SET debug = '+d,ib_btr_bulk_prepare_space_error';
+SET debug = '+d,ddl_btree_build_oom';
 ALTER TABLE t1 TABLESPACE ts1;
 ERROR HY000: Out of memory; check if mysqld or some other process uses all available memory; if not, you may have to use 'ulimit' to allow mysqld to use more memory or you can add more swap space
 FLUSH TABLES;
-SET debug = '-d,ib_btr_bulk_prepare_space_error';
+SET debug = '-d,ddl_btree_build_oom';
 # ###########################################################
 # No error - check for final success
 ALTER TABLE t1 TABLESPACE ts1;
@@ -68,18 +68,18 @@
 TABLESPACE innodb_file_per_table;
 # ###########################################################
 # Inject error during bulk insert
-SET debug = '+d,ib_btr_bulk_insert_inject_error';
+SET debug = '+d,ddl_btree_build_too_big_record';
 ALTER TABLE t1 TABLESPACE ts1;
 ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is #value#. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs
-SET debug = '-d,ib_btr_bulk_insert_inject_error';
+SET debug = '-d,ddl_btree_build_too_big_record';
 FLUSH TABLES;
 # ###########################################################
 # Inject error during bulk reserve space
-SET debug = '+d,ib_btr_bulk_prepare_space_error';
+SET debug = '+d,ddl_btree_build_oom';
 ALTER TABLE t1 TABLESPACE ts1;
 ERROR HY000: Out of memory; check if mysqld or some other process uses all available memory; if not, you may have to use 'ulimit' to allow mysqld to use more memory or you can add more swap space
 FLUSH TABLES;
-SET debug = '-d,ib_btr_bulk_prepare_space_error';
+SET debug = '-d,ddl_btree_build_oom';
 # ###########################################################
 # No error - check for final success
 ALTER TABLE t1 TABLESPACE ts1;
@@ -99,18 +99,18 @@
 TABLESPACE innodb_file_per_table;
 # ###########################################################
 # Inject error during bulk insert
-SET debug = '+d,ib_btr_bulk_insert_inject_error';
+SET debug = '+d,ddl_btree_build_too_big_record';
 ALTER TABLE t1 TABLESPACE ts1;
 ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is #value#. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs
-SET debug = '-d,ib_btr_bulk_insert_inject_error';
+SET debug = '-d,ddl_btree_build_too_big_record';
 FLUSH TABLES;
 # ###########################################################
 # Inject error during bulk reserve space
-SET debug = '+d,ib_btr_bulk_prepare_space_error';
+SET debug = '+d,ddl_btree_build_oom';
 ALTER TABLE t1 TABLESPACE ts1;
 ERROR HY000: Out of memory; check if mysqld or some other process uses all available memory; if not, you may have to use 'ulimit' to allow mysqld to use more memory or you can add more swap space
 FLUSH TABLES;
-SET debug = '-d,ib_btr_bulk_prepare_space_error';
+SET debug = '-d,ddl_btree_build_oom';
 # ###########################################################
 # No error - check for final success
 ALTER TABLE t1 TABLESPACE ts1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/r/innodb_ctype_ldml.result mysql-8.0-8.0.27/mysql-test/suite/innodb/r/innodb_ctype_ldml.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/r/innodb_ctype_ldml.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/r/innodb_ctype_ldml.result	2021-09-28 11:46:34.000000000 +0000
@@ -560,6 +560,8 @@
 s1
 a
 b
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1;
 SET NAMES utf8 COLLATE utf8_phone_ci;
 Warnings:
@@ -760,6 +762,8 @@
 飵	753D
 ç³³	753E
 å’—	753F
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 #
 # WL#5624, the same test with UCS2
 #
@@ -888,6 +892,8 @@
 飵	753D
 ç³³	753E
 å’—	753F
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1;
 #
 # WL#5624, unsupported features
@@ -924,6 +930,8 @@
 x	02CE101F
 u	101F
 X	105A
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1;
 #
 # WL#5624, testing Bengali collations
@@ -950,6 +958,8 @@
 0376	09A209BC	E0A6A2E0A6BC
 0376	09DD	E0A79D
 0377	09A3	E0A6A3
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1;
 SET NAMES utf8, collation_connection=utf8_bengali_traditional_ci;
 Warnings:
@@ -1072,6 +1082,8 @@
 15D2	09B709CD	E0A6B7E0A78D
 15D3	09B809CD	E0A6B8E0A78D
 15D4	09B909CD	E0A6B9E0A78D
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT HEX(WEIGHT_STRING(a)) as wa,
 GROUP_CONCAT(HEX(CONVERT(a USING ucs2)) ORDER BY LENGTH(a), BINARY a)
 FROM t1 GROUP BY a ORDER BY a;
@@ -1141,6 +1153,8 @@
 15D2	09B709CD
 15D3	09B809CD
 15D4	09B909CD
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1;
 #
 # WL#5624, shift after, using expansion
@@ -1221,6 +1235,8 @@
 AA	0E293358
 AAA	0E293359
 1	0E2A
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 DROP TABLE t1;
 #
 # End of WL#5624
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/r/innodb_extend_and_initialize_windows.result mysql-8.0-8.0.27/mysql-test/suite/innodb/r/innodb_extend_and_initialize_windows.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/r/innodb_extend_and_initialize_windows.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/r/innodb_extend_and_initialize_windows.result	2021-09-28 11:46:34.000000000 +0000
@@ -21,3 +21,4 @@
 select @@global.innodb_extend_and_initialize;
 @@global.innodb_extend_and_initialize
 1
+RESET PERSIST innodb_extend_and_initialize;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/r/innodb-index-debug.result mysql-8.0-8.0.27/mysql-test/suite/innodb/r/innodb-index-debug.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/r/innodb-index-debug.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/r/innodb-index-debug.result	2021-09-28 11:46:34.000000000 +0000
@@ -22,15 +22,15 @@
 CREATE TABLE bug13861218 (c1 INT NOT NULL, c2 INT NOT NULL, INDEX(c2))
 ENGINE=InnoDB;
 INSERT INTO bug13861218 VALUES (8, 0), (4, 0), (0, 0);
-SET DEBUG='+d,ib_row_merge_buf_add_two';
+SET DEBUG='+d,ddl_buf_add_two';
 CREATE UNIQUE INDEX ui ON bug13861218(c1);
-SET DEBUG='-d,ib_row_merge_buf_add_two';
+SET DEBUG='-d,ddl_buf_add_two';
 DROP TABLE bug13861218;
 CREATE TABLE bug13861218 (c1 INT NOT NULL, c2 INT UNIQUE) ENGINE=InnoDB;
 INSERT INTO bug13861218 VALUES (8, NULL), (4, NULL), (0, NULL);
-SET DEBUG='+d,ib_row_merge_buf_add_two';
+SET DEBUG='+d,ddl_buf_add_two';
 CREATE UNIQUE INDEX ui ON bug13861218(c1);
-SET DEBUG='-d,ib_row_merge_buf_add_two';
+SET DEBUG='-d,ddl_buf_add_two';
 DROP TABLE bug13861218;
 #
 # Bug #17657223	EXCESSIVE TEMPORARY FILE USAGE IN ALTER TABLE
@@ -50,15 +50,15 @@
 insert into t1 select NULL,'aaaa','bbbb' from t480;
 insert into t1 select NULL,'aaaaa','bbbbb' from t480;
 insert into t1 select NULL,'aaaaaa','bbbbbb' from t480;
-SET DEBUG = '+d,row_merge_write_failure';
+SET DEBUG = '+d,ddl_write_failure';
 alter table t1 drop primary key,add primary key(f2,f1);
 ERROR HY000: Temporary file write failure.
-SET DEBUG = '-d,row_merge_write_failure';
+SET DEBUG = '-d,ddl_write_failure';
 drop table t1;
 create table t1(k1 int auto_increment primary key,
 k2 char(200),k3 char(200))engine=innodb;
 insert into t1 values(NULL,'a','b'), (NULL,'aa','bb');
-SET DEBUG_SYNC= 'row_merge_after_scan
+SET DEBUG_SYNC= 'ddl_after_scan
 SIGNAL opened WAIT_FOR flushed';
 optimize table t1;
 connection default
@@ -78,7 +78,7 @@
 drop table t1;
 create table t1(k1 int auto_increment primary key,
 k2 char(200),k3 char(200))engine=innodb;
-SET DEBUG_SYNC= 'row_merge_after_scan
+SET DEBUG_SYNC= 'ddl_after_scan
 SIGNAL opened WAIT_FOR flushed';
 ALTER TABLE t1 ADD COLUMN k4 int, ALGORITHM=INPLACE;
 connection default
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/r/innodb-index-online.result mysql-8.0-8.0.27/mysql-test/suite/innodb/r/innodb-index-online.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/r/innodb-index-online.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/r/innodb-index-online.result	2021-09-28 11:46:34.000000000 +0000
@@ -5,7 +5,7 @@
 INSERT INTO t1 VALUES (1,1,''), (2,2,''), (3,3,''), (4,4,''), (5,5,'');
 SET GLOBAL innodb_monitor_enable = module_ddl;
 SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count > 0;
+subsystem = 'ddl' and count > 16;
 name	count
 SET DEBUG_SYNC = 'RESET';
 SET DEBUG_SYNC = 'write_row_noreplace SIGNAL have_handle WAIT_FOR go_ahead';
@@ -17,7 +17,7 @@
 SET DEBUG_SYNC = 'now SIGNAL go_ahead';
 ERROR 23000: Duplicate entry '1' for key 't1.PRIMARY'
 SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count > 0;
+subsystem = 'ddl' and count > 16;
 name	count
 SET GLOBAL innodb_monitor_reset = module_ddl;
 SET SESSION DEBUG = '+d,innodb_OOM_prepare_inplace_alter';
@@ -54,10 +54,8 @@
 ALTER TABLE t1 ADD UNIQUE INDEX(c2);
 SET DEBUG_SYNC = 'now WAIT_FOR scanned';
 SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count > 0;
+subsystem = 'ddl' and count > 16;
 name	count
-ddl_online_create_index	1
-ddl_pending_alter_table	1
 SET GLOBAL innodb_monitor_reset = module_ddl;
 BEGIN;
 INSERT INTO t1 VALUES(7,4,2);
@@ -68,9 +66,8 @@
 ALTER TABLE t1 ADD UNIQUE INDEX(c2);
 SET DEBUG_SYNC = 'now WAIT_FOR created';
 SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count > 0;
+subsystem = 'ddl' and count > 16;
 name	count
-ddl_pending_alter_table	1
 SET GLOBAL innodb_monitor_reset = module_ddl;
 INSERT INTO t1 VALUES(6,3,1);
 SET DEBUG_SYNC = 'now SIGNAL dml_done';
@@ -78,7 +75,7 @@
 DELETE FROM t1 WHERE c1=6;
 ALTER TABLE t1 ADD UNIQUE INDEX(c2);
 SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count > 0;
+subsystem = 'ddl' and count > 16;
 name	count
 SET GLOBAL innodb_monitor_reset = module_ddl;
 INSERT INTO t1 VALUES(6,3,1);
@@ -120,16 +117,14 @@
 CREATE INDEX c2d ON t1(c2);
 SET DEBUG_SYNC = 'now WAIT_FOR c2d_created';
 SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count > 0;
+subsystem = 'ddl' and count > 16;
 name	count
-ddl_online_create_index	1
-ddl_pending_alter_table	1
 SET GLOBAL innodb_monitor_reset = module_ddl;
 KILL QUERY @id;
 SET DEBUG_SYNC = 'now SIGNAL kill_done';
 ERROR 70100: Query execution was interrupted
 SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count > 0;
+subsystem = 'ddl' and count > 16;
 name	count
 SET GLOBAL innodb_monitor_reset = module_ddl;
 CHECK TABLE t1;
@@ -186,10 +181,8 @@
 UPDATE t1 SET c2 = c2 + 1;
 SET DEBUG_SYNC = 'now WAIT_FOR c2e_created';
 SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count > 0;
+subsystem = 'ddl' and count > 16;
 name	count
-ddl_online_create_index	1
-ddl_pending_alter_table	1
 SET GLOBAL innodb_monitor_reset = module_ddl;
 BEGIN;
 DELETE FROM t1;
@@ -208,10 +201,8 @@
 DELETE FROM t1;
 ROLLBACK;
 SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count > 0;
+subsystem = 'ddl' and count > 16;
 name	count
-ddl_online_create_index	1
-ddl_pending_alter_table	1
 SET GLOBAL innodb_monitor_reset = module_ddl;
 SELECT sf.name, sf.pos FROM INFORMATION_SCHEMA.INNODB_INDEXES si
 INNER JOIN INFORMATION_SCHEMA.INNODB_FIELDS sf
@@ -220,7 +211,7 @@
 SET DEBUG_SYNC = 'now SIGNAL dml2_done';
 ERROR HY000: Creating index 'c2e' required more than 'innodb_online_alter_log_max_size' bytes of modification log. Please try again.
 SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count > 0;
+subsystem = 'ddl' and count > 16;
 name	count
 SET GLOBAL innodb_monitor_reset = module_ddl;
 SELECT sf.name, sf.pos FROM INFORMATION_SCHEMA.INNODB_INDEXES si
@@ -228,22 +219,20 @@
 ON si.index_id = sf.index_id WHERE si.name = 'c2e';
 NAME	POS
 SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count > 0;
+subsystem = 'ddl' and count > 16;
 name	count
 SET GLOBAL innodb_monitor_reset = module_ddl;
 ALTER TABLE t1 COMMENT 'testing if c2e will be dropped';
 SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count > 0;
+subsystem = 'ddl' and count > 16;
 name	count
 SET GLOBAL innodb_monitor_reset = module_ddl;
 SET DEBUG_SYNC = 'row_log_apply_before SIGNAL c2f_created WAIT_FOR dml3_done';
 ALTER TABLE t1 ADD INDEX c2f(c22f), CHANGE c2 c22f INT;
 SET DEBUG_SYNC = 'now WAIT_FOR c2f_created';
 SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count > 0;
+subsystem = 'ddl' and count > 16;
 name	count
-ddl_online_create_index	1
-ddl_pending_alter_table	1
 SET GLOBAL innodb_monitor_reset = module_ddl;
 BEGIN;
 INSERT INTO t1 SELECT 320 + c1, c2, c3 FROM t1 WHERE c1 > 160;
@@ -254,16 +243,14 @@
 DELETE FROM t1;
 ROLLBACK;
 SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count > 0;
+subsystem = 'ddl' and count > 16;
 name	count
-ddl_online_create_index	1
-ddl_pending_alter_table	1
 SET GLOBAL innodb_monitor_reset = module_ddl;
 SET DEBUG_SYNC = 'now SIGNAL dml3_done';
 Warnings:
 Warning	1831	Duplicate index 'c2f' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
 SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count > 0;
+subsystem = 'ddl' and count > 16;
 name	count
 SET GLOBAL innodb_monitor_reset = module_ddl;
 SELECT COUNT(c22f) FROM t1;
@@ -292,11 +279,11 @@
 ON si.index_id = sf.index_id WHERE si.name = 'c3p5';
 NAME	POS
 SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count > 0;
+subsystem = 'ddl' and count > 16;
 name	count
 SET GLOBAL innodb_monitor_reset = module_ddl;
 SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count > 0;
+subsystem = 'ddl' and count > 16;
 name	count
 SET GLOBAL innodb_monitor_reset = module_ddl;
 SHOW CREATE TABLE t1;
@@ -311,7 +298,7 @@
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci STATS_PERSISTENT=1 COMMENT='testing if c2e will be dropped'
 ALTER TABLE t1 DROP INDEX c2d, DROP INDEX c2f;
 SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count > 0;
+subsystem = 'ddl' and count > 16;
 name	count
 SET GLOBAL innodb_monitor_reset = module_ddl;
 ALTER TABLE t1 ADD INDEX c2h(c22f), ALGORITHM = INPLACE;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/r/innodb-index.result mysql-8.0-8.0.27/mysql-test/suite/innodb/r/innodb-index.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/r/innodb-index.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/r/innodb-index.result	2021-09-28 11:46:34.000000000 +0000
@@ -1256,7 +1256,7 @@
 affected rows: 0
 info: Records: 0  Duplicates: 0  Warnings: 0
 SELECT name, count_reset FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count_reset > 0;
+subsystem = 'ddl' and count_reset > 0 AND count_reset > 16;
 name	count_reset
 SET GLOBAL innodb_monitor_reset = module_ddl;
 drop table t1;
@@ -1269,7 +1269,7 @@
 affected rows: 0
 info: Records: 0  Duplicates: 0  Warnings: 0
 SELECT name, count_reset FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count_reset > 0;
+subsystem = 'ddl' and count_reset > 0 AND count_reset > 16;
 name	count_reset
 SET GLOBAL innodb_monitor_reset = module_ddl;
 drop table t1;
@@ -1299,7 +1299,7 @@
 affected rows: 0
 info: Records: 0  Duplicates: 0  Warnings: 0
 SELECT name, count_reset FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count_reset > 0;
+subsystem = 'ddl' and count_reset > 0 AND count_reset > 16;
 name	count_reset
 SET GLOBAL innodb_monitor_reset = module_ddl;
 # Skip sort
@@ -1309,7 +1309,7 @@
 affected rows: 0
 info: Records: 0  Duplicates: 0  Warnings: 0
 SELECT name, count_reset FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count_reset > 0;
+subsystem = 'ddl' and count_reset > 0 AND count_reset > 16;
 name	count_reset
 SET GLOBAL innodb_monitor_reset = module_ddl;
 # Skip sort
@@ -1318,7 +1318,7 @@
 affected rows: 0
 info: Records: 0  Duplicates: 0  Warnings: 0
 SELECT name, count_reset FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count_reset > 0;
+subsystem = 'ddl' and count_reset > 0 AND count_reset > 16;
 name	count_reset
 SET GLOBAL innodb_monitor_reset = module_ddl;
 # Skip sort
@@ -1327,7 +1327,7 @@
 affected rows: 0
 info: Records: 0  Duplicates: 0  Warnings: 0
 SELECT name, count_reset FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count_reset > 0;
+subsystem = 'ddl' and count_reset > 0 AND count_reset > 16;
 name	count_reset
 SET GLOBAL innodb_monitor_reset = module_ddl;
 # Skip sort
@@ -1336,7 +1336,7 @@
 affected rows: 0
 info: Records: 0  Duplicates: 0  Warnings: 0
 SELECT name, count_reset FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count_reset > 0;
+subsystem = 'ddl' and count_reset > 0 AND count_reset > 16;
 name	count_reset
 SET GLOBAL innodb_monitor_reset = module_ddl;
 # Must sort
@@ -1345,9 +1345,8 @@
 affected rows: 0
 info: Records: 0  Duplicates: 0  Warnings: 0
 SELECT name, count_reset FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count_reset > 0;
+subsystem = 'ddl' and count_reset > 0 AND count_reset > 16;
 name	count_reset
-ddl_sort_file_alter_table	2
 SET GLOBAL innodb_monitor_reset = module_ddl;
 # Skip sort
 # Reusing the same pk
@@ -1356,7 +1355,7 @@
 affected rows: 0
 info: Records: 0  Duplicates: 0  Warnings: 0
 SELECT name, count_reset FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count_reset > 0;
+subsystem = 'ddl' and count_reset > 0 AND count_reset > 16;
 name	count_reset
 SET GLOBAL innodb_monitor_reset = module_ddl;
 # Skip sort
@@ -1366,7 +1365,7 @@
 affected rows: 0
 info: Records: 0  Duplicates: 0  Warnings: 0
 SELECT name, count_reset FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count_reset > 0;
+subsystem = 'ddl' and count_reset > 0 AND count_reset > 16;
 name	count_reset
 SET GLOBAL innodb_monitor_reset = module_ddl;
 # Skip sort
@@ -1376,9 +1375,8 @@
 affected rows: 0
 info: Records: 0  Duplicates: 0  Warnings: 0
 SELECT name, count_reset FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count_reset > 0;
+subsystem = 'ddl' and count_reset > 0 AND count_reset > 16;
 name	count_reset
-ddl_sort_file_alter_table	2
 SET GLOBAL innodb_monitor_reset = module_ddl;
 # Skip sort
 # Reusing the same pk
@@ -1386,7 +1384,7 @@
 affected rows: 0
 info: Records: 0  Duplicates: 0  Warnings: 0
 SELECT name, count_reset FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count_reset > 0;
+subsystem = 'ddl' and count_reset > 0 AND count_reset > 16;
 name	count_reset
 SET GLOBAL innodb_monitor_reset = module_ddl;
 # Skip sort
@@ -1395,7 +1393,7 @@
 affected rows: 0
 info: Records: 0  Duplicates: 0  Warnings: 0
 SELECT name, count_reset FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count_reset > 0;
+subsystem = 'ddl' and count_reset > 0 AND count_reset > 16;
 name	count_reset
 SET GLOBAL innodb_monitor_reset = module_ddl;
 # Skip sort
@@ -1404,7 +1402,7 @@
 affected rows: 0
 info: Records: 0  Duplicates: 0  Warnings: 0
 SELECT name, count_reset FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count_reset > 0;
+subsystem = 'ddl' and count_reset > 0 AND count_reset > 16;
 name	count_reset
 SET GLOBAL innodb_monitor_reset = module_ddl;
 # Skip sort
@@ -1415,7 +1413,7 @@
 test.t1	optimize	status	OK
 affected rows: 2
 SELECT name, count_reset FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count_reset > 0;
+subsystem = 'ddl' and count_reset > 0 AND count_reset > 16;
 name	count_reset
 SET GLOBAL innodb_monitor_reset = module_ddl;
 # Sort files used for adding secondary index
@@ -1424,16 +1422,15 @@
 affected rows: 0
 info: Records: 0  Duplicates: 0  Warnings: 0
 SELECT name, count_reset FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count_reset > 0;
+subsystem = 'ddl' and count_reset > 0 AND count_reset > 16;
 name	count_reset
-ddl_sort_file_alter_table	2
 SET GLOBAL innodb_monitor_reset = module_ddl;
 # No sort files used for dropping secondary index
 alter table t1 drop primary key, add primary key(f1,f5),drop index i;
 affected rows: 0
 info: Records: 0  Duplicates: 0  Warnings: 0
 SELECT name, count_reset FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count_reset > 0;
+subsystem = 'ddl' and count_reset > 0 AND count_reset > 16;
 name	count_reset
 SET GLOBAL innodb_monitor_reset = module_ddl;
 # Skip sort
@@ -1443,7 +1440,7 @@
 affected rows: 0
 info: Records: 0  Duplicates: 0  Warnings: 0
 SELECT name, count_reset FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count_reset > 0;
+subsystem = 'ddl' and count_reset > 0 AND count_reset > 16;
 name	count_reset
 SET GLOBAL innodb_monitor_reset = module_ddl;
 # Must sort
@@ -1452,9 +1449,8 @@
 affected rows: 0
 info: Records: 0  Duplicates: 0  Warnings: 0
 SELECT name, count_reset FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count_reset > 0;
+subsystem = 'ddl' and count_reset > 0 AND count_reset > 16;
 name	count_reset
-ddl_sort_file_alter_table	2
 SET GLOBAL innodb_monitor_reset = module_ddl;
 # Skip sort
 # Change PK(f1,f3) to (f1,added_column,f3,added_column)
@@ -1463,7 +1459,7 @@
 affected rows: 0
 info: Records: 0  Duplicates: 0  Warnings: 0
 SELECT name, count_reset FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count_reset > 0;
+subsystem = 'ddl' and count_reset > 0 AND count_reset > 16;
 name	count_reset
 SET GLOBAL innodb_monitor_reset = module_ddl;
 # Adding Secondary index alone.
@@ -1471,9 +1467,8 @@
 affected rows: 0
 info: Records: 0  Duplicates: 0  Warnings: 0
 SELECT name, count_reset FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count_reset > 0;
+subsystem = 'ddl' and count_reset > 0 AND count_reset > 16;
 name	count_reset
-ddl_sort_file_alter_table	2
 SET GLOBAL innodb_monitor_reset = module_ddl;
 # Must sort
 # Change PK(f1,f3) to (existing_column,f1)
@@ -1481,9 +1476,8 @@
 affected rows: 0
 info: Records: 0  Duplicates: 0  Warnings: 0
 SELECT name, count_reset FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count_reset > 0;
+subsystem = 'ddl' and count_reset > 0 AND count_reset > 16;
 name	count_reset
-ddl_sort_file_alter_table	3
 SET GLOBAL innodb_monitor_reset = module_ddl;
 # Skip sort for PK.
 # Change PK(f4,f1) to (added_columns,f4,f1)
@@ -1493,9 +1487,8 @@
 affected rows: 0
 info: Records: 0  Duplicates: 0  Warnings: 0
 SELECT name, count_reset FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count_reset > 0;
+subsystem = 'ddl' and count_reset > 0 AND count_reset > 16;
 name	count_reset
-ddl_sort_file_alter_table	2
 SET GLOBAL innodb_monitor_reset = module_ddl;
 # Skip sort for PK.
 # Change PK(f5n,f6n,f4,f1) to
@@ -1506,9 +1499,8 @@
 affected rows: 0
 info: Records: 0  Duplicates: 0  Warnings: 0
 SELECT name, count_reset FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count_reset > 0;
+subsystem = 'ddl' and count_reset > 0 AND count_reset > 16;
 name	count_reset
-ddl_sort_file_alter_table	2
 SET GLOBAL innodb_monitor_reset = module_ddl;
 SET GLOBAL innodb_monitor_disable = module_ddl;
 select count(*) from t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/r/innodb_misc1.result mysql-8.0-8.0.27/mysql-test/suite/innodb/r/innodb_misc1.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/r/innodb_misc1.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/r/innodb_misc1.result	2021-09-28 11:46:34.000000000 +0000
@@ -642,6 +642,8 @@
 SELECT * FROM t2 WHERE BINARY b = 'customer_over';
 a	b	c
 1	customer_over	1
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT DISTINCT p0.a FROM t2 p0 WHERE p0.b = 'customer_over';
 a
 1
@@ -649,9 +651,13 @@
 SELECT DISTINCT p0.a FROM t2 p0 WHERE BINARY p0.b = 'customer_over';
 a
 1
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT p0.a FROM t2 p0 WHERE BINARY p0.b = 'customer_over';
 a
 1
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 drop table t2, t1;
 CREATE TABLE t1 ( a int ) ENGINE=innodb;
 BEGIN;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/r/innodb.result mysql-8.0-8.0.27/mysql-test/suite/innodb/r/innodb.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/r/innodb.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/r/innodb.result	2021-09-28 11:46:34.000000000 +0000
@@ -3164,6 +3164,8 @@
 SELECT * FROM t2 WHERE BINARY b = 'customer_over';
 a	b	c
 1	customer_over	1
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT DISTINCT p0.a FROM t2 p0 WHERE p0.b = 'customer_over';
 a
 1
@@ -3171,9 +3173,13 @@
 SELECT DISTINCT p0.a FROM t2 p0 WHERE BINARY p0.b = 'customer_over';
 a
 1
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 SELECT p0.a FROM t2 p0 WHERE BINARY p0.b = 'customer_over';
 a
 1
+Warnings:
+Warning	1287	'BINARY expr' is deprecated and will be removed in a future release. Please use CAST instead
 drop table t2, t1;
 CREATE TABLE t1 ( a int ) ENGINE=innodb;
 BEGIN;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/r/innodb_stats_table_flag_sample_pages.result mysql-8.0-8.0.27/mysql-test/suite/innodb/r/innodb_stats_table_flag_sample_pages.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/r/innodb_stats_table_flag_sample_pages.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/r/innodb_stats_table_flag_sample_pages.result	2021-09-28 11:46:34.000000000 +0000
@@ -37,16 +37,16 @@
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-5' at line 2
 CREATE TABLE test_ps_sample_pages (a INT, PRIMARY KEY (a)) ENGINE=INNODB
 STATS_SAMPLE_PAGES=0;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '0' at line 2
+ERROR 42000: The valid range for stats_sample_pages is [1, 65535]. Error near '0' at line 2
 CREATE TABLE test_ps_sample_pages (a INT, PRIMARY KEY (a)) ENGINE=INNODB
 STATS_SAMPLE_PAGES=67000;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '67000' at line 2
+ERROR 42000: The valid range for stats_sample_pages is [1, 65535]. Error near '67000' at line 2
 CREATE TABLE test_ps_sample_pages (a INT, PRIMARY KEY (a)) ENGINE=INNODB
 STATS_SAMPLE_PAGES=670000;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '670000' at line 2
+ERROR 42000: The valid range for stats_sample_pages is [1, 65535]. Error near '670000' at line 2
 CREATE TABLE test_ps_sample_pages (a INT, PRIMARY KEY (a)) ENGINE=INNODB
 STATS_SAMPLE_PAGES=65536;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '65536' at line 2
+ERROR 42000: The valid range for stats_sample_pages is [1, 65535]. Error near '65536' at line 2
 CREATE TABLE test_ps_sample_pages (a INT, PRIMARY KEY (a)) ENGINE=INNODB
 STATS_SAMPLE_PAGES=65535;
 SHOW CREATE TABLE test_ps_sample_pages;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/r/innodb-table-online.result mysql-8.0-8.0.27/mysql-test/suite/innodb/r/innodb-table-online.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/r/innodb-table-online.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/r/innodb-table-online.result	2021-09-28 11:46:34.000000000 +0000
@@ -225,7 +225,7 @@
 ALTER TABLE t1 ADD PRIMARY KEY(c22f), CHANGE c2 c22f INT;
 ERROR 42000: Multiple primary key defined
 ALTER TABLE t1 DROP PRIMARY KEY, ADD PRIMARY KEY(c22f), CHANGE c2 c22f INT;
-ERROR 23000: Duplicate entry '5' for key 't1.PRIMARY'
+ERROR 23000: Duplicate entry 'N' for key 't1.PRIMARY'
 ALTER TABLE t1 DROP PRIMARY KEY, ADD PRIMARY KEY(c1,c22f,c4(5)),
 CHANGE c2 c22f INT, CHANGE c3 c3 TEXT NULL, CHANGE c1 c1 INT AFTER c22f,
 ADD COLUMN c4 VARCHAR(6) DEFAULT 'Online';
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/r/innodb_temporary_file_path.result mysql-8.0-8.0.27/mysql-test/suite/innodb/r/innodb_temporary_file_path.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/r/innodb_temporary_file_path.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/r/innodb_temporary_file_path.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,41 @@
+SELECT @@innodb_temp_data_file_path;
+@@innodb_temp_data_file_path
+ibtmp1:12M:autoextend
+SELECT FILE_NAME FROM INFORMATION_SCHEMA.FILES
+WHERE TABLESPACE_NAME='innodb_temporary';
+FILE_NAME
+./ibtmp1
+# restart: --innodb-temp-data-file-path=mytemp:12M:autoextend
+SELECT @@innodb_temp_data_file_path;
+@@innodb_temp_data_file_path
+mytemp:12M:autoextend
+SELECT FILE_NAME FROM INFORMATION_SCHEMA.FILES
+WHERE TABLESPACE_NAME='innodb_temporary';
+FILE_NAME
+./mytemp
+# restart: --innodb-temp-data-file-path=./mytemp:12M:autoextend
+SELECT @@innodb_temp_data_file_path;
+@@innodb_temp_data_file_path
+./mytemp:12M:autoextend
+SELECT FILE_NAME FROM INFORMATION_SCHEMA.FILES
+WHERE TABLESPACE_NAME='innodb_temporary';
+FILE_NAME
+./mytemp
+SET GLOBAL innodb_fast_shutdown = 0;
+# restart: --innodb-read-only
+SELECT @@innodb_temp_data_file_path;
+@@innodb_temp_data_file_path
+ibtmp1:12M:autoextend
+SELECT FILE_NAME FROM INFORMATION_SCHEMA.FILES
+WHERE TABLESPACE_NAME='innodb_temporary';
+FILE_NAME
+./mytemp
+# restart: --innodb-temp-data-file-path=MYSQL_TMP_DIR/mytemp:12M:autoextend
+SELECT @@innodb_temp_data_file_path;
+@@innodb_temp_data_file_path
+MYSQL_TMP_DIR/mytemp:12M:autoextend
+SELECT FILE_NAME FROM INFORMATION_SCHEMA.FILES
+WHERE TABLESPACE_NAME='innodb_temporary';
+FILE_NAME
+MYSQL_TMP_DIR/mytemp
+# restart:
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/r/multi_value_debug.result mysql-8.0-8.0.27/mysql-test/suite/innodb/r/multi_value_debug.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/r/multi_value_debug.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/r/multi_value_debug.result	2021-09-28 11:46:34.000000000 +0000
@@ -312,7 +312,7 @@
 INSERT INTO t1(f1) VALUES (CAST('[1,3]' AS JSON));
 INSERT INTO t1(f1) VALUES (CAST('[1,3,9,8]' AS JSON));
 INSERT INTO t1(f1) VALUES (CAST('[1,3,9,8,10,11,20,30]' AS JSON));
-SET DEBUG='+d, row_merge_add_multi_value';
+SET DEBUG='+d, ddl_add_multi_value';
 CREATE INDEX idx1 ON t1((CAST(f1->"$[*]" AS UNSIGNED ARRAY)));
 SELECT * FROM t1 WHERE 9 MEMBER OF (f1->'$[*]');
 id	f1
@@ -324,7 +324,7 @@
 SELECT * FROM t1 WHERE 30 MEMBER OF (f1->'$[*]');
 id	f1
 3	[1, 3, 9, 8, 10, 11, 20, 30]
-SET DEBUG='-d, row_merge_add_multi_value';
+SET DEBUG='-d, ddl_add_multi_value';
 CHECK TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/r/nonmonotone_trx_ids.result mysql-8.0-8.0.27/mysql-test/suite/innodb/r/nonmonotone_trx_ids.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/r/nonmonotone_trx_ids.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/r/nonmonotone_trx_ids.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,253 @@
+CREATE TABLE t1(id INT PRIMARY KEY, v INT NOT NULL) ENGINE=InnoDB;
+# Adding debug point 'trx_sys_rw_trx_add_rc' to @@GLOBAL.debug
+CREATE PROCEDURE create_rw_transactions(k INT)
+BEGIN
+WHILE 1 DO
+START TRANSACTION;
+UPDATE t1 SET v=v+1 WHERE id=k;
+COMMIT;
+END WHILE;
+END|
+INSERT INTO t1 (id,v) VALUES (0,0);
+CALL create_rw_transactions(0);
+INSERT INTO t1 (id,v) VALUES (1,0);
+CALL create_rw_transactions(1);
+INSERT INTO t1 (id,v) VALUES (2,0);
+CALL create_rw_transactions(2);
+INSERT INTO t1 (id,v) VALUES (3,0);
+CALL create_rw_transactions(3);
+INSERT INTO t1 (id,v) VALUES (4,0);
+CALL create_rw_transactions(4);
+INSERT INTO t1 (id,v) VALUES (5,0);
+CALL create_rw_transactions(5);
+INSERT INTO t1 (id,v) VALUES (6,0);
+CALL create_rw_transactions(6);
+INSERT INTO t1 (id,v) VALUES (7,0);
+CALL create_rw_transactions(7);
+INSERT INTO t1 (id,v) VALUES (8,0);
+CALL create_rw_transactions(8);
+INSERT INTO t1 (id,v) VALUES (9,0);
+CALL create_rw_transactions(9);
+INSERT INTO t1 (id,v) VALUES (10,0);
+CALL create_rw_transactions(10);
+INSERT INTO t1 (id,v) VALUES (11,0);
+CALL create_rw_transactions(11);
+INSERT INTO t1 (id,v) VALUES (12,0);
+CALL create_rw_transactions(12);
+INSERT INTO t1 (id,v) VALUES (13,0);
+CALL create_rw_transactions(13);
+INSERT INTO t1 (id,v) VALUES (14,0);
+CALL create_rw_transactions(14);
+INSERT INTO t1 (id,v) VALUES (15,0);
+CALL create_rw_transactions(15);
+INSERT INTO t1 (id,v) VALUES (16,0);
+CALL create_rw_transactions(16);
+INSERT INTO t1 (id,v) VALUES (17,0);
+CALL create_rw_transactions(17);
+INSERT INTO t1 (id,v) VALUES (18,0);
+CALL create_rw_transactions(18);
+INSERT INTO t1 (id,v) VALUES (19,0);
+CALL create_rw_transactions(19);
+INSERT INTO t1 (id,v) VALUES (20,0);
+CALL create_rw_transactions(20);
+INSERT INTO t1 (id,v) VALUES (21,0);
+CALL create_rw_transactions(21);
+INSERT INTO t1 (id,v) VALUES (22,0);
+CALL create_rw_transactions(22);
+INSERT INTO t1 (id,v) VALUES (23,0);
+CALL create_rw_transactions(23);
+INSERT INTO t1 (id,v) VALUES (24,0);
+CALL create_rw_transactions(24);
+INSERT INTO t1 (id,v) VALUES (25,0);
+CALL create_rw_transactions(25);
+INSERT INTO t1 (id,v) VALUES (26,0);
+CALL create_rw_transactions(26);
+INSERT INTO t1 (id,v) VALUES (27,0);
+CALL create_rw_transactions(27);
+INSERT INTO t1 (id,v) VALUES (28,0);
+CALL create_rw_transactions(28);
+INSERT INTO t1 (id,v) VALUES (29,0);
+CALL create_rw_transactions(29);
+INSERT INTO t1 (id,v) VALUES (30,0);
+CALL create_rw_transactions(30);
+INSERT INTO t1 (id,v) VALUES (31,0);
+CALL create_rw_transactions(31);
+INSERT INTO t1 (id,v) VALUES (32,0);
+CALL create_rw_transactions(32);
+INSERT INTO t1 (id,v) VALUES (33,0);
+CALL create_rw_transactions(33);
+INSERT INTO t1 (id,v) VALUES (34,0);
+CALL create_rw_transactions(34);
+INSERT INTO t1 (id,v) VALUES (35,0);
+CALL create_rw_transactions(35);
+INSERT INTO t1 (id,v) VALUES (36,0);
+CALL create_rw_transactions(36);
+INSERT INTO t1 (id,v) VALUES (37,0);
+CALL create_rw_transactions(37);
+INSERT INTO t1 (id,v) VALUES (38,0);
+CALL create_rw_transactions(38);
+INSERT INTO t1 (id,v) VALUES (39,0);
+CALL create_rw_transactions(39);
+INSERT INTO t1 (id,v) VALUES (40,0);
+CALL create_rw_transactions(40);
+INSERT INTO t1 (id,v) VALUES (41,0);
+CALL create_rw_transactions(41);
+INSERT INTO t1 (id,v) VALUES (42,0);
+CALL create_rw_transactions(42);
+INSERT INTO t1 (id,v) VALUES (43,0);
+CALL create_rw_transactions(43);
+INSERT INTO t1 (id,v) VALUES (44,0);
+CALL create_rw_transactions(44);
+INSERT INTO t1 (id,v) VALUES (45,0);
+CALL create_rw_transactions(45);
+INSERT INTO t1 (id,v) VALUES (46,0);
+CALL create_rw_transactions(46);
+INSERT INTO t1 (id,v) VALUES (47,0);
+CALL create_rw_transactions(47);
+INSERT INTO t1 (id,v) VALUES (48,0);
+CALL create_rw_transactions(48);
+INSERT INTO t1 (id,v) VALUES (49,0);
+CALL create_rw_transactions(49);
+INSERT INTO t1 (id,v) VALUES (50,0);
+CALL create_rw_transactions(50);
+INSERT INTO t1 (id,v) VALUES (51,0);
+CALL create_rw_transactions(51);
+INSERT INTO t1 (id,v) VALUES (52,0);
+CALL create_rw_transactions(52);
+INSERT INTO t1 (id,v) VALUES (53,0);
+CALL create_rw_transactions(53);
+INSERT INTO t1 (id,v) VALUES (54,0);
+CALL create_rw_transactions(54);
+INSERT INTO t1 (id,v) VALUES (55,0);
+CALL create_rw_transactions(55);
+INSERT INTO t1 (id,v) VALUES (56,0);
+CALL create_rw_transactions(56);
+INSERT INTO t1 (id,v) VALUES (57,0);
+CALL create_rw_transactions(57);
+INSERT INTO t1 (id,v) VALUES (58,0);
+CALL create_rw_transactions(58);
+INSERT INTO t1 (id,v) VALUES (59,0);
+CALL create_rw_transactions(59);
+INSERT INTO t1 (id,v) VALUES (60,0);
+CALL create_rw_transactions(60);
+INSERT INTO t1 (id,v) VALUES (61,0);
+CALL create_rw_transactions(61);
+INSERT INTO t1 (id,v) VALUES (62,0);
+CALL create_rw_transactions(62);
+INSERT INTO t1 (id,v) VALUES (63,0);
+CALL create_rw_transactions(63);
+INSERT INTO t1 (id,v) VALUES (64,0);
+CALL create_rw_transactions(64);
+INSERT INTO t1 (id,v) VALUES (65,0);
+CALL create_rw_transactions(65);
+INSERT INTO t1 (id,v) VALUES (66,0);
+CALL create_rw_transactions(66);
+INSERT INTO t1 (id,v) VALUES (67,0);
+CALL create_rw_transactions(67);
+INSERT INTO t1 (id,v) VALUES (68,0);
+CALL create_rw_transactions(68);
+INSERT INTO t1 (id,v) VALUES (69,0);
+CALL create_rw_transactions(69);
+INSERT INTO t1 (id,v) VALUES (70,0);
+CALL create_rw_transactions(70);
+INSERT INTO t1 (id,v) VALUES (71,0);
+CALL create_rw_transactions(71);
+INSERT INTO t1 (id,v) VALUES (72,0);
+CALL create_rw_transactions(72);
+INSERT INTO t1 (id,v) VALUES (73,0);
+CALL create_rw_transactions(73);
+INSERT INTO t1 (id,v) VALUES (74,0);
+CALL create_rw_transactions(74);
+INSERT INTO t1 (id,v) VALUES (75,0);
+CALL create_rw_transactions(75);
+INSERT INTO t1 (id,v) VALUES (76,0);
+CALL create_rw_transactions(76);
+INSERT INTO t1 (id,v) VALUES (77,0);
+CALL create_rw_transactions(77);
+INSERT INTO t1 (id,v) VALUES (78,0);
+CALL create_rw_transactions(78);
+INSERT INTO t1 (id,v) VALUES (79,0);
+CALL create_rw_transactions(79);
+INSERT INTO t1 (id,v) VALUES (80,0);
+CALL create_rw_transactions(80);
+INSERT INTO t1 (id,v) VALUES (81,0);
+CALL create_rw_transactions(81);
+INSERT INTO t1 (id,v) VALUES (82,0);
+CALL create_rw_transactions(82);
+INSERT INTO t1 (id,v) VALUES (83,0);
+CALL create_rw_transactions(83);
+INSERT INTO t1 (id,v) VALUES (84,0);
+CALL create_rw_transactions(84);
+INSERT INTO t1 (id,v) VALUES (85,0);
+CALL create_rw_transactions(85);
+INSERT INTO t1 (id,v) VALUES (86,0);
+CALL create_rw_transactions(86);
+INSERT INTO t1 (id,v) VALUES (87,0);
+CALL create_rw_transactions(87);
+INSERT INTO t1 (id,v) VALUES (88,0);
+CALL create_rw_transactions(88);
+INSERT INTO t1 (id,v) VALUES (89,0);
+CALL create_rw_transactions(89);
+INSERT INTO t1 (id,v) VALUES (90,0);
+CALL create_rw_transactions(90);
+INSERT INTO t1 (id,v) VALUES (91,0);
+CALL create_rw_transactions(91);
+INSERT INTO t1 (id,v) VALUES (92,0);
+CALL create_rw_transactions(92);
+INSERT INTO t1 (id,v) VALUES (93,0);
+CALL create_rw_transactions(93);
+INSERT INTO t1 (id,v) VALUES (94,0);
+CALL create_rw_transactions(94);
+INSERT INTO t1 (id,v) VALUES (95,0);
+CALL create_rw_transactions(95);
+INSERT INTO t1 (id,v) VALUES (96,0);
+CALL create_rw_transactions(96);
+INSERT INTO t1 (id,v) VALUES (97,0);
+CALL create_rw_transactions(97);
+INSERT INTO t1 (id,v) VALUES (98,0);
+CALL create_rw_transactions(98);
+INSERT INTO t1 (id,v) VALUES (99,0);
+CALL create_rw_transactions(99);
+INSERT INTO t1 (id,v) VALUES (100,0);
+CALL create_rw_transactions(100);
+INSERT INTO t1 (id,v) VALUES (101,0);
+CALL create_rw_transactions(101);
+INSERT INTO t1 (id,v) VALUES (102,0);
+CALL create_rw_transactions(102);
+INSERT INTO t1 (id,v) VALUES (103,0);
+CALL create_rw_transactions(103);
+INSERT INTO t1 (id,v) VALUES (104,0);
+CALL create_rw_transactions(104);
+INSERT INTO t1 (id,v) VALUES (105,0);
+CALL create_rw_transactions(105);
+INSERT INTO t1 (id,v) VALUES (106,0);
+CALL create_rw_transactions(106);
+INSERT INTO t1 (id,v) VALUES (107,0);
+CALL create_rw_transactions(107);
+INSERT INTO t1 (id,v) VALUES (108,0);
+CALL create_rw_transactions(108);
+INSERT INTO t1 (id,v) VALUES (109,0);
+CALL create_rw_transactions(109);
+INSERT INTO t1 (id,v) VALUES (110,0);
+CALL create_rw_transactions(110);
+INSERT INTO t1 (id,v) VALUES (111,0);
+CALL create_rw_transactions(111);
+INSERT INTO t1 (id,v) VALUES (112,0);
+CALL create_rw_transactions(112);
+INSERT INTO t1 (id,v) VALUES (113,0);
+CALL create_rw_transactions(113);
+INSERT INTO t1 (id,v) VALUES (114,0);
+CALL create_rw_transactions(114);
+INSERT INTO t1 (id,v) VALUES (115,0);
+CALL create_rw_transactions(115);
+INSERT INTO t1 (id,v) VALUES (116,0);
+CALL create_rw_transactions(116);
+INSERT INTO t1 (id,v) VALUES (117,0);
+CALL create_rw_transactions(117);
+INSERT INTO t1 (id,v) VALUES (118,0);
+CALL create_rw_transactions(118);
+INSERT INTO t1 (id,v) VALUES (119,0);
+CALL create_rw_transactions(119);
+DROP PROCEDURE create_rw_transactions;
+DROP TABLE t1;
+# Removing debug point 'trx_sys_rw_trx_add_rc' from @@GLOBAL.debug
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/r/table_encrypt_debug.result mysql-8.0-8.0.27/mysql-test/suite/innodb/r/table_encrypt_debug.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/r/table_encrypt_debug.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/r/table_encrypt_debug.result	2021-09-28 11:46:34.000000000 +0000
@@ -204,3 +204,6 @@
 DROP TABLE tde_db.test_tbl;
 DROP DATABASE tde_db;
 SET GLOBAL innodb_file_per_table=1;
+# restart
+CREATE TABLE test.t1(c1 INT, c2 char(20)) ENCRYPTION="Y" ENGINE = InnoDB;
+DROP TABLE test.t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/r/tablespace_encrypt_8.result mysql-8.0-8.0.27/mysql-test/suite/innodb/r/tablespace_encrypt_8.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/r/tablespace_encrypt_8.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/r/tablespace_encrypt_8.result	2021-09-28 11:46:34.000000000 +0000
@@ -1,7 +1,7 @@
 #########################################################################
 # RESTART 1 : WITH KEYRING PLUGIN
 #########################################################################
-SET SESSION debug= '+d,BtrBulk_insert_inject_error';
+SET SESSION debug= '+d,ddl_btree_build_insert_return_interrupt';
 
 #########
 # SETUP #
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/r/tablespace_portability.result mysql-8.0-8.0.27/mysql-test/suite/innodb/r/tablespace_portability.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/r/tablespace_portability.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/r/tablespace_portability.result	2021-09-28 11:46:34.000000000 +0000
@@ -203,6 +203,7 @@
 include/save_error_log_position.inc
 # restart:
 include/assert_error_log.inc [server: 1, pattern: .*\[Warning\].*Tablespace .*, name 'test/t1', file '.*test.*t1.ibd' is missing]
-# restart: --innodb_directories=TMP_DIR
+# restart: --innodb_directories=INNODB_DIR
 ALTER TABLE t1 FORCE;
 DROP TABLE t1;
+# restart: 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/r/undo-order.result mysql-8.0-8.0.27/mysql-test/suite/innodb/r/undo-order.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/r/undo-order.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/r/undo-order.result	2021-09-28 11:46:34.000000000 +0000
@@ -23,3 +23,4 @@
 DELETE FROM t1;
 commit;
 DROP TABLE t1;
+# restart:
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/r/virtual_debug.result mysql-8.0-8.0.27/mysql-test/suite/innodb/r/virtual_debug.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/r/virtual_debug.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/r/virtual_debug.result	2021-09-28 11:46:34.000000000 +0000
@@ -178,7 +178,7 @@
 CREATE TABLE t1 ( id INT ,a VARCHAR(20), b VARCHAR(20) ,c VARCHAR(40)
 GENERATED ALWAYS AS (CONCAT(a,b)),key(c));
 INSERT INTO t1 (id,a,b) VALUES (10,'aditya','hello');
-SET DEBUG_SYNC= 'row_merge_after_scan SIGNAL opened WAIT_FOR go_ddl';
+SET DEBUG_SYNC= 'ddl_after_scan SIGNAL opened WAIT_FOR go_ddl';
 ALTER TABLE t1 ADD CONSTRAINT  pk1 PRIMARY KEY (id);
 SET DEBUG_SYNC= 'now WAIT_FOR opened';
 UPDATE t1 SET a = 'fg', id = 20 WHERE id = 10;
@@ -517,10 +517,10 @@
 SELECT NAME, ORDINAL_POSITION, TYPE, HIDDEN, GENERATION_EXPRESSION_UTF8 FROM mysql.columns WHERE TABLE_ID=@tid ORDER BY ORDINAL_POSITION;
 NAME	ORDINAL_POSITION	TYPE	HIDDEN	GENERATION_EXPRESSION_UTF8
 c1	1	MYSQL_TYPE_LONG	Visible	NULL
-098d432fa868a5bc6c9a67e14025a0d3	2	MYSQL_TYPE_LONG	SQL	(`c1` = 127)
-1e5e5b695019aad3e147c00991a2df1a	3	MYSQL_TYPE_NEWDECIMAL	SQL	(`c1` + -(-(1)))
-2782f905f5ba1955a9c7f086be07eefe	4	MYSQL_TYPE_LONG	SQL	(`c1` > 26)
-645826a2684a0937f93b08935f31319f	5	MYSQL_TYPE_LONGLONG	SQL	(`c1` + `c1`)
+!hidden!idx!0!0	2	MYSQL_TYPE_LONG	SQL	(`c1` = 127)
+!hidden!idx!1!0	3	MYSQL_TYPE_LONGLONG	SQL	(`c1` + `c1`)
+!hidden!idx!3!0	4	MYSQL_TYPE_NEWDECIMAL	SQL	(`c1` + -(-(1)))
+!hidden!idx!4!0	5	MYSQL_TYPE_LONG	SQL	(`c1` > 26)
 DB_ROW_ID	6	MYSQL_TYPE_INT24	SE	NULL
 DB_TRX_ID	7	MYSQL_TYPE_INT24	SE	NULL
 DB_ROLL_PTR	8	MYSQL_TYPE_LONGLONG	SE	NULL
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/t/alter_crash.test mysql-8.0-8.0.27/mysql-test/suite/innodb/t/alter_crash.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/t/alter_crash.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/t/alter_crash.test	2021-09-28 11:46:34.000000000 +0000
@@ -6,7 +6,7 @@
 
 --disable_query_log
 call mtr.add_suppression(' Cannot find a free slot for an undo log');
-call mtr.add_suppression(' row_merge_rename_index_to_add failed with error 47');
+call mtr.add_suppression(' ddl_rename_index_to_add failed with error 47');
 call mtr.add_suppression(' Flagged corruption of `c[23]`');
 call mtr.add_suppression(' Index `c[23]` .*is corrupted');
 --enable_query_log
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/t/alter_table_stage_progress.test mysql-8.0-8.0.27/mysql-test/suite/innodb/t/alter_table_stage_progress.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/t/alter_table_stage_progress.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/t/alter_table_stage_progress.test	2021-09-28 11:46:34.000000000 +0000
@@ -3,16 +3,18 @@
 # WL#5889 Add InnoDB events to Performance Schema's Event Stage table
 #
 
+SET SESSION innodb_ddl_threads=1;
+SET SESSION innodb_parallel_read_threads=1;
 
 CREATE TABLE wl5889 (a INT) ENGINE=INNODB;
-
+INSERT INTO wl5889 VALUE(1);
 ALTER TABLE wl5889 ADD COLUMN b INT, ALGORITHM=INPLACE;
 
 -- vertical_results
 
 # If the SELECT below fails with an empty result or missing rows, then maybe
 # 'events_stages_history' filled up - only the most recent N events are
-# displayed in it. If this happens, then maybe N newer evets were generated
+# displayed in it. If this happens, then maybe N newer events were generated
 # after the 'stage/innodb/alter table%' events which we expect to show up below.
 # If this:
 # SELECT COUNT(*) FROM performance_schema.events_stages_history;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/t/case_insensitive_fs.test mysql-8.0-8.0.27/mysql-test/suite/innodb/t/case_insensitive_fs.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/t/case_insensitive_fs.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/t/case_insensitive_fs.test	2021-09-28 11:46:34.000000000 +0000
@@ -85,3 +85,8 @@
 DROP TABLESPACE ts2;
 DROP TABLESPACE ts3;
 
+let $restart_parameters = restart:;
+--source include/restart_mysqld_no_echo.inc
+--rmdir $KNOWN_DIR_LC/test
+--rmdir $KNOWN_DIR_LC
+
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/t/checkpoint_too_soon.test mysql-8.0-8.0.27/mysql-test/suite/innodb/t/checkpoint_too_soon.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/t/checkpoint_too_soon.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/t/checkpoint_too_soon.test	2021-09-28 11:46:34.000000000 +0000
@@ -1,5 +1,13 @@
 --source include/have_debug.inc # --debug=+d,crash_after_checkpoint
 
+# This test might take long time if the number of cpu cores dedicated
+# to run the test is not high enough. That is because, this test uses
+# 50 connections in parallel to generate a lot of redo log data before
+# forcing a crash.
+#
+# Therefore, run it only when the --big-test mtr-flag is present.
+--source include/big_test.inc
+
 # We want to quickly produce redo which is difficult to consume.
 # We will modify just one field (val++) in a large record (~1k)
 # which means transaction threads will write just a few bytes
@@ -70,8 +78,14 @@
 # The 32000 is just some value I found sufficient to give ourselves some time to request crash but not enough to
 # page cleaners to eat too much as they become more and more agressive as redo grows longer.
 # In particular I found myself unable to reach log_lsn_checkpoint_age > 6945280 even with 50 user threads vs 1 PC.
+let $wait_timeout=600;
 let $wait_condition=SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME='log_lsn_checkpoint_age' AND `COUNT` > 6945280-1200796+32000;
+let $silent_failure=1;
 --source include/wait_condition.inc
+if (!$success) {
+  --skip Skip rest of the test due to timeout on waiting for big enough checkpoint age
+}
+let $silent_failure=0;
 --source include/kill_mysqld.inc
 # This message is after the kill, not before, to minimize delay between satisfying wait_condition and kill.
 --echo Killed the server while it had large checkpoint age
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/t/dblwr_encrypt_recover.test mysql-8.0-8.0.27/mysql-test/suite/innodb/t/dblwr_encrypt_recover.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/t/dblwr_encrypt_recover.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/t/dblwr_encrypt_recover.test	2021-09-28 11:46:34.000000000 +0000
@@ -1,4 +1,5 @@
 --source include/have_debug.inc
+--source include/not_valgrind.inc
 
 create table t1 (f1 int primary key, f2 blob) ENCRYPTION='Y';
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/t/dblwr_encrypt_rowcomp.test mysql-8.0-8.0.27/mysql-test/suite/innodb/t/dblwr_encrypt_rowcomp.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/t/dblwr_encrypt_rowcomp.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/t/dblwr_encrypt_rowcomp.test	2021-09-28 11:46:34.000000000 +0000
@@ -1,5 +1,6 @@
 --source include/have_debug.inc
 --source include/have_innodb_16k.inc
+--source include/not_valgrind.inc
 
 create table t1 (f1 int, f2 blob) ENCRYPTION='Y';
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/t/dblwr_encrypt.test mysql-8.0-8.0.27/mysql-test/suite/innodb/t/dblwr_encrypt.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/t/dblwr_encrypt.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/t/dblwr_encrypt.test	2021-09-28 11:46:34.000000000 +0000
@@ -1,4 +1,5 @@
 --source include/have_debug.inc
+--source include/not_valgrind.inc
 
 --echo #
 --echo # WL#13775 - InnoDB: Encrypt DBLWR files
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/t/dblwr_unencrypt.test mysql-8.0-8.0.27/mysql-test/suite/innodb/t/dblwr_unencrypt.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/t/dblwr_unencrypt.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/t/dblwr_unencrypt.test	2021-09-28 11:46:34.000000000 +0000
@@ -1,4 +1,5 @@
 --source include/have_debug.inc
+--source include/not_valgrind.inc
 
 --echo #
 --echo # WL#13775 - InnoDB: Encrypt DBLWR files
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/t/ddl_kill.test mysql-8.0-8.0.27/mysql-test/suite/innodb/t/ddl_kill.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/t/ddl_kill.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/t/ddl_kill.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,67 @@
+--source include/have_debug.inc
+--source include/big_test.inc
+
+--echo # Check if a DDL operation can be interrupted.
+
+DELIMITER |;
+CREATE PROCEDURE insert_rows(IN BASE INT, IN SIZE INT)
+BEGIN
+	DECLARE i INT DEFAULT BASE;
+	WHILE (i <= SIZE) DO
+		INSERT INTO t values (i);
+		SET i = i + 1;
+	END WHILE;
+END|
+DELIMITER ;|
+
+CREATE TABLE t(c int) ENGINE=INNODB;
+
+--echo # Insert rows
+CALL insert_rows(1, 1000);
+
+connect (con1,localhost,root,,);
+connection con1;
+--echo # con1: Start the DDL
+let $ID= `SELECT @id := CONNECTION_ID()`;
+SET SESSION DEBUG='+d,ddl_merge_sort_interrupt';
+SET DEBUG_SYNC='ddl_merge_sort_interrupt SIGNAL ready WAIT_FOR interrupt';
+--send ALTER TABLE t ADD PRIMARY KEY(c);
+
+connection default;
+--echo # default: Kill the DDL
+let $ignore= `SELECT @id := $ID`;
+SET DEBUG_SYNC='now WAIT_FOR ready';
+KILL QUERY @id;
+SET DEBUG_SYNC='now SIGNAL interrupt';
+
+connection con1;
+--echo # con1: reap
+--error ER_QUERY_INTERRUPTED
+--reap
+
+connect (con2,localhost,root,,);
+connection con2;
+--echo # con2: Start the DDL
+let $ID= `SELECT @id := CONNECTION_ID()`;
+SET SESSION DEBUG='+d,ddl_btree_build_interrupt';
+SET DEBUG_SYNC='ddl_btree_build_interrupt SIGNAL ready WAIT_FOR interrupt';
+--send ALTER TABLE t ADD index i(c);
+
+connection default;
+--echo # default: Kill the DDL
+let $ignore= `SELECT @id := $ID`;
+SET DEBUG_SYNC='now WAIT_FOR ready';
+KILL QUERY @id;
+SET DEBUG_SYNC='now SIGNAL interrupt';
+
+connection con2;
+--echo # con2: reap
+--error ER_QUERY_INTERRUPTED
+--reap
+
+connection default;
+--echo # Cleanup
+SET DEBUG_SYNC="RESET";
+DROP PROCEDURE insert_rows;
+DROP TABLE t;
+disconnect con1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/t/ddl_prepare.test mysql-8.0-8.0.27/mysql-test/suite/innodb/t/ddl_prepare.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/t/ddl_prepare.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/t/ddl_prepare.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,49 @@
+--source include/have_debug.inc
+--source include/have_debug_sync.inc
+--source include/have_log_bin.inc
+
+SET global innodb_print_ddl_logs = ON;
+
+connect(con1,localhost,root,,);
+
+connection default;
+--echo
+--echo # In CONNECTION - DEFAULT
+
+CREATE TABLE t (col1 INT PRIMARY KEY, col2 INT);
+INSERT INTO t VALUES(1,1), (2,2), (3,3), (4,4);
+
+SET DEBUG_SYNC= 'alter_table_inplace_after_lock_downgrade SIGNAL do_insert WAIT_FOR resume_ddl';
+
+--send ALTER TABLE t DROP COLUMN col2
+
+connection con1;
+--echo
+--echo # In CONNECTION - 1
+SET DEBUG_SYNC= 'now WAIT_FOR do_insert';
+
+START TRANSACTION;
+INSERT INTO t VALUES(10,10);
+
+set session debug = "+d, crash_after_flush_engine_log";
+--echo # Crash right after flushing InnoDB redo log
+
+--source include/expect_crash.inc
+
+--error CR_SERVER_LOST
+COMMIT;
+
+connection default;
+--echo
+--echo # In CONNECTION - DEFAULT
+
+--error CR_SERVER_LOST
+--reap
+
+--echo
+--source include/start_mysqld.inc
+
+SELECT * FROM t ORDER BY col1;
+
+# Cleanup
+DROP TABLE t;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/t/foreign_key.test mysql-8.0-8.0.27/mysql-test/suite/innodb/t/foreign_key.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/t/foreign_key.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/t/foreign_key.test	2021-09-28 11:46:34.000000000 +0000
@@ -545,3 +545,143 @@
 SHOW CREATE TABLE `......................................`;
 SELECT id, for_name, ref_name FROM information_schema.innodb_foreign WHERE id LIKE 'test%';
 DROP TABLES `......................................`, t1;
+
+--echo #
+--echo # Bug#33053297 VIRTUAL INDEX CORRUPTED DURING CASCADE UPDATE ON CHILD TABLE
+--echo #
+
+--echo #Test-Case 1
+CREATE TABLE `emails` (
+`id` int unsigned NOT NULL AUTO_INCREMENT,
+PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+ROW_FORMAT=DYNAMIC;
+
+CREATE TABLE `email_stats` (
+`id` bigint unsigned NOT NULL AUTO_INCREMENT,
+`email_id` int unsigned DEFAULT NULL,
+`date_sent` datetime NOT NULL,
+`generated_sent_date` date GENERATED ALWAYS AS
+(concat(year(`date_sent`),'-',lpad(month(`date_sent`),2,'0'),
+'-',lpad(dayofmonth(`date_sent`),2,'0'))) VIRTUAL,
+PRIMARY KEY (`id`),
+KEY `IDX_ES1` (`email_id`),
+KEY `mautic_generated_sent_date_email_id`
+(`generated_sent_date`,`email_id`),
+CONSTRAINT `FK_EA1` FOREIGN KEY (`email_id`) REFERENCES
+`emails` (`id`) ON DELETE SET NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+ROW_FORMAT=DYNAMIC;
+
+INSERT INTO `emails` VALUES (1);
+INSERT INTO `email_stats` (`id`, `email_id`,  `date_sent`) VALUES
+(1,1,'2020-10-22 13:32:41');
+SELECT * FROM `email_stats`;
+DELETE FROM `emails`;
+DELETE FROM `email_stats`;
+
+#clean up.
+DROP TABLE `email_stats`;
+DROP TABLE `emails`;
+
+--echo # Test-Case 2
+CREATE TABLE `emails` (
+`id` int unsigned NOT NULL AUTO_INCREMENT,
+PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+ROW_FORMAT=DYNAMIC;
+
+CREATE TABLE `email_stats` (
+`id` bigint unsigned NOT NULL AUTO_INCREMENT,
+`email_id` int unsigned DEFAULT NULL,
+`date_sent` datetime NOT NULL,
+`generated_sent_date` date GENERATED ALWAYS AS
+(concat(year(`date_sent`),'-',lpad(month(`date_sent`),2,'0'),
+'-',lpad(dayofmonth(`date_sent`),2,'0'))) VIRTUAL,
+PRIMARY KEY (`id`),
+KEY `IDX_ES1` (`email_id`),
+KEY `mautic_generated_sent_date_email_id`
+(`generated_sent_date`,`email_id`),
+CONSTRAINT `FK_EA1` FOREIGN KEY (`email_id`) REFERENCES
+`emails` (`id`) ON DELETE SET NULL ON UPDATE SET NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+ROW_FORMAT=DYNAMIC;
+INSERT INTO `emails` VALUES (1);
+INSERT INTO `email_stats` (`id`, `email_id`,  `date_sent`) VALUES
+(1,1,'2020-10-22 13:32:41');
+UPDATE `emails` SET `id` = 2 where `id` = 1;
+SELECT id FROM `email_stats` WHERE `generated_sent_date` IS NULL;
+SELECT * FROM `email_stats`;
+UPDATE `email_stats` SET `email_id`=2
+WHERE DATE(`generated_sent_date`) = '2020-10-22';
+SELECT * FROM `email_stats`;
+
+#clean up.
+DROP TABLE `email_stats`;
+DROP TABLE `emails`;
+
+--echo # test-case 3
+CREATE TABLE `emails` (
+`id` int unsigned NOT NULL AUTO_INCREMENT,
+PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+ROW_FORMAT=DYNAMIC;
+CREATE TABLE `email_stats` (
+`id` bigint unsigned NOT NULL AUTO_INCREMENT,
+`email_id` int unsigned DEFAULT NULL,
+`date_sent` datetime NOT NULL,
+`generated_sent_email` varchar(20) GENERATED ALWAYS AS
+(CONCAT(YEAR(`date_sent`),'-', COALESCE(`email_id`, ' '))) VIRTUAL,
+PRIMARY KEY (`id`),
+KEY `idx_es1` (`email_id`),
+KEY `mautic_generated_sent_date_email`
+(`generated_sent_email`,`email_id`),
+CONSTRAINT `fk_ea1` FOREIGN KEY (`email_id`) REFERENCES
+`emails` (`id`) ON DELETE SET NULL
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+ROW_FORMAT=DYNAMIC;
+INSERT INTO `emails` VALUES (1);
+INSERT INTO `email_stats` (`id`, `email_id`,  `date_sent`) VALUES
+(1,1,'2020-10-22 13:32:41');
+SELECT * FROM `email_stats`;
+SELECT `date_sent` FROM `email_stats` WHERE `generated_sent_email` = '2020-1';
+DELETE FROM `emails`;
+SELECT * FROM `email_stats`;
+SELECT `date_sent` FROM `email_stats` WHERE `generated_sent_email` = '2020-';
+
+#clean up.
+DROP TABLE `email_stats`;
+DROP TABLE `emails`;
+
+--echo # test-case 4
+CREATE TABLE `emails` (
+`id` int unsigned NOT NULL AUTO_INCREMENT,
+PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+ROW_FORMAT=DYNAMIC;
+CREATE TABLE `email_stats` (
+`id` bigint unsigned NOT NULL AUTO_INCREMENT,
+`email_id` int unsigned DEFAULT NULL,
+`date_sent` datetime NOT NULL,
+`generated_sent_email` varchar(20) GENERATED ALWAYS AS
+(CONCAT(YEAR(`date_sent`),'-', COALESCE(`email_id`, ' '))) VIRTUAL,
+PRIMARY KEY (`id`),
+KEY `idx_es1` (`email_id`),
+KEY `mautic_generated_sent_date_email`
+(`generated_sent_email`,`email_id`),
+CONSTRAINT `fk_ea1` FOREIGN KEY (`email_id`) REFERENCES
+`emails` (`id`) ON UPDATE SET NULL
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+ROW_FORMAT=DYNAMIC;
+INSERT INTO `emails` VALUES (1);
+INSERT INTO `email_stats` (`id`, `email_id`,  `date_sent`) VALUES
+(1,1,'2020-10-22 13:32:41');
+SELECT * FROM `email_stats`;
+SELECT `date_sent` FROM `email_stats` WHERE `generated_sent_email` = '2020-1';
+UPDATE `emails` SET `id` = 2 WHERE `id` = 1;
+SELECT * FROM `email_stats`;
+SELECT `date_sent` FROM `email_stats` WHERE `generated_sent_email` = '2020-';
+
+#clean up.
+DROP TABLE `email_stats`;
+DROP TABLE `emails`;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/t/hidden_directory_win.test mysql-8.0-8.0.27/mysql-test/suite/innodb/t/hidden_directory_win.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/t/hidden_directory_win.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/t/hidden_directory_win.test	2021-09-28 11:46:34.000000000 +0000
@@ -80,6 +80,11 @@
 DROP TABLE t2;
 DROP TABLESPACE ts1;
 DROP TABLESPACE ts2;
+
+# Remove --innodb-directories=
+--let $restart_parameters = restart:
+--source include/restart_mysqld_no_echo.inc
+
 --exec attrib -S -H $MYSQL_TMP_DIR/other_dir
 --remove_file $MYSQL_TMP_DIR/other_dir/ibdata1
 --remove_file $MYSQL_TMP_DIR/other_dir/test/t1.ibd
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/t/implicit_to_explicit_conversion.test mysql-8.0-8.0.27/mysql-test/suite/innodb/t/implicit_to_explicit_conversion.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/t/implicit_to_explicit_conversion.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/t/implicit_to_explicit_conversion.test	2021-09-28 11:46:34.000000000 +0000
@@ -1,4 +1,5 @@
 --source include/have_debug_sync.inc
+--source include/count_sessions.inc
 
 # Scenario:
 # C1 obtains implicit lock
@@ -350,3 +351,73 @@
 --disconnect C3
 
 DROP TABLE t1;
+
+# Scenario:
+# C1 obtains implicit lock
+# C2 notices the implicit lock and decides to do impl-to-expl conversion
+# C1 starts commit and pauses after trx_erase_lists
+# C3 ignores C1 (as it is no longer in rw-list) and adds own exclusive lock on
+#    the record
+# C2 finishes impl-to-explicit conversion
+# (at this point we have two X locks on the same row)
+
+CREATE TABLE t1(id INT PRIMARY KEY) ENGINE=InnoDB;
+INSERT INTO t1 (id) VALUES (1),(3);
+
+--connect(C1,localhost,root,,test)
+--connect(C2,localhost,root,,test)
+--connect(C3,localhost,root,,test)
+
+--connection C1
+    BEGIN;
+    INSERT INTO t1 (id) VALUES (2);
+
+--connection C3
+    #ensure that C3 has assigned trx->id before we start hogging the trx_sys->mutex
+    BEGIN;
+    INSERT INTO t1 (id) VALUES (4);
+
+--connection C2
+    BEGIN;
+    SET DEBUG_SYNC = "before_lock_rec_convert_impl_to_expl_for_trx
+        SIGNAL c2_decided
+        WAIT_FOR c2_can_convert";
+    SET DEBUG_SYNC = "after_lock_clust_rec_read_check_and_lock SIGNAL c2_will_wait";
+    --send SELECT * FROM t1 WHERE id=2 FOR UPDATE
+
+--connection C1
+    SET DEBUG_SYNC = "now WAIT_FOR c2_decided";
+    SET DEBUG_SYNC = "after_trx_erase_lists
+        SIGNAL c1_will_commit
+        WAIT_FOR c1_can_commit";
+    --send COMMIT
+
+--connection C3
+    SET DEBUG_SYNC = "now WAIT_FOR c1_will_commit";
+    SET DEBUG_SYNC = "after_lock_clust_rec_read_check_and_lock SIGNAL c2_can_convert WAIT_FOR c3_can_verify";
+    --send SELECT * FROM t1 WHERE id=2 FOR UPDATE;
+
+--connection default
+    SET DEBUG_SYNC = "now WAIT_FOR c2_will_wait";
+    SET DEBUG_SYNC = "now SIGNAL c1_can_commit";
+    SET DEBUG_SYNC = "now SIGNAL c3_can_verify";
+
+--connection C3
+    --reap
+    COMMIT;
+
+--connection C1
+    --reap
+
+--connection C2
+    --reap
+    COMMIT;
+
+--connection default
+--disconnect C1
+--disconnect C2
+--disconnect C3
+
+DROP TABLE t1;
+
+--source include/wait_until_count_sessions.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/t/innochecksum_1.test mysql-8.0-8.0.27/mysql-test/suite/innodb/t/innochecksum_1.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/t/innochecksum_1.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/t/innochecksum_1.test	2021-09-28 11:46:34.000000000 +0000
@@ -16,7 +16,7 @@
 call mtr.add_suppression("\\[ERROR\\] .*MY-\\d+.* Unable to read page \\[page id: space=.*, page number=.*\\] into the buffer pool after 100 attempts");
 call mtr.add_suppression("\\[ERROR\\] .*MY-\\d+.* Database page corruption on disk or a failed");
 # ib::fatal() calls ut_error
-call mtr.add_suppression("\\[ERROR\\] .*MY-\\d+.* Assertion failure: ut0ut\.cc:");
+call mtr.add_suppression("\\[ERROR\\] .*MY-\\d+.* Assertion failure: buf0buf\.cc:[0-9]+:ib::fatal triggered");
 SET GLOBAL innodb_file_per_table=on;
 
 --echo [1]: Test is to corrupt the ibd file, & do repair for (innodb|crc32|none) checksum through innochecksum tool
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/t/innodb_bug14147491.test mysql-8.0-8.0.27/mysql-test/suite/innodb/t/innodb_bug14147491.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/t/innodb_bug14147491.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/t/innodb_bug14147491.test	2021-09-28 11:46:34.000000000 +0000
@@ -14,7 +14,7 @@
 CALL mtr.add_suppression("\\[ERROR\\] .* Unable to read page \\[page id: space=.*, page number=.*\\] into the buffer pool after 100 attempts");
 CALL mtr.add_suppression("\\[ERROR\\] .* Database page corruption on disk or a failed");
 # ib::fatal() calls ut_error
-call mtr.add_suppression("\\[ERROR\\] .* Assertion failure: ut0ut\.cc:");
+call mtr.add_suppression("\\[ERROR\\] .* Assertion failure: buf0buf\.cc:[0-9]+:ib::fatal triggered");
 --enable_query_log
 
 # Disable compression for this table, otherwise our pattern matching below
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/t/innodb_bug19164038.test mysql-8.0-8.0.27/mysql-test/suite/innodb/t/innodb_bug19164038.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/t/innodb_bug19164038.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/t/innodb_bug19164038.test	2021-09-28 11:46:34.000000000 +0000
@@ -36,8 +36,9 @@
 # Use small sort buffer pool so that we won't have all rows in the buffer.
 SELECT @@innodb_sort_buffer_size;
 
-SET SESSION debug="+d,row_merge_instrument_log_check_flush";
+SET SESSION debug="+d,ddl_instrument_log_check_flush";
 ALTER TABLE t1 ADD COLUMN c3 INT;
+SET SESSION debug="-d,ddl_instrument_log_check_flush";
 
 # Clean up.
 DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/t/innodb_bug29692250.test mysql-8.0-8.0.27/mysql-test/suite/innodb/t/innodb_bug29692250.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/t/innodb_bug29692250.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/t/innodb_bug29692250.test	2021-09-28 11:46:34.000000000 +0000
@@ -9,7 +9,7 @@
 --disable_query_log
 CALL mtr.add_suppression("\\[ERROR\\] .* Unable to read page \\[page id: space=.*, page number=.*\\] into the buffer pool after 100 attempts");
 CALL mtr.add_suppression("\\[ERROR\\] .* Database page corruption on disk or a failed");
-CALL mtr.add_suppression("\\[ERROR\\] .* Assertion failure: ut0ut\.cc:");
+CALL mtr.add_suppression("\\[ERROR\\] .* Assertion failure: buf0buf\.cc:[0-9]+:ib::fatal triggered");
 CALL mtr.add_suppression("\\[ERROR\\] .* Trying to do I/O to a tablespace which exists without an \.ibd data file");
 CALL mtr.add_suppression("\\[ERROR\\] .* trying to read page \\[page id: space=.*, page number=.*\\] in nonexisting or being-dropped tablespace");
 --enable_query_log
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/t/innodb_extend_and_initialize_windows.test mysql-8.0-8.0.27/mysql-test/suite/innodb/t/innodb_extend_and_initialize_windows.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/t/innodb_extend_and_initialize_windows.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/t/innodb_extend_and_initialize_windows.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,3 +17,9 @@
 let $restart_parameters = restart: --innodb-extend-and-initialize=FALSE;
 --source include/restart_mysqld.inc
 select @@global.innodb_extend_and_initialize;
+
+# Clean up
+let $restart_parameters = restart:;
+--source include/restart_mysqld_no_echo.inc
+
+RESET PERSIST innodb_extend_and_initialize;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/t/innodb-index-debug.test mysql-8.0-8.0.27/mysql-test/suite/innodb/t/innodb-index-debug.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/t/innodb-index-debug.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/t/innodb-index-debug.test	2021-09-28 11:46:34.000000000 +0000
@@ -32,20 +32,20 @@
 CREATE TABLE bug13861218 (c1 INT NOT NULL, c2 INT NOT NULL, INDEX(c2))
 ENGINE=InnoDB;
 INSERT INTO bug13861218 VALUES (8, 0), (4, 0), (0, 0);
-SET DEBUG='+d,ib_row_merge_buf_add_two';
+SET DEBUG='+d,ddl_buf_add_two';
 # Force creation of a PRIMARY KEY on c1 to see what happens on the index(c2).
 # No crash here, because n_uniq for c2 includes the clustered index fields
 CREATE UNIQUE INDEX ui ON bug13861218(c1);
-SET DEBUG='-d,ib_row_merge_buf_add_two';
+SET DEBUG='-d,ddl_buf_add_two';
 DROP TABLE bug13861218;
 
 CREATE TABLE bug13861218 (c1 INT NOT NULL, c2 INT UNIQUE) ENGINE=InnoDB;
 INSERT INTO bug13861218 VALUES (8, NULL), (4, NULL), (0, NULL);
-SET DEBUG='+d,ib_row_merge_buf_add_two';
+SET DEBUG='+d,ddl_buf_add_two';
 # Force creation of a PRIMARY KEY on c1 to see what happens on the index(c2).
 # assertion failure: ut_ad(cmp_dtuple_rec(dtuple, rec, rec_offsets) > 0)
 CREATE UNIQUE INDEX ui ON bug13861218(c1);
-SET DEBUG='-d,ib_row_merge_buf_add_two';
+SET DEBUG='-d,ddl_buf_add_two';
 DROP TABLE bug13861218;
 
 --echo #
@@ -70,10 +70,10 @@
 insert into t1 select NULL,'aaaa','bbbb' from t480;
 insert into t1 select NULL,'aaaaa','bbbbb' from t480;
 insert into t1 select NULL,'aaaaaa','bbbbbb' from t480;
-SET DEBUG = '+d,row_merge_write_failure';
+SET DEBUG = '+d,ddl_write_failure';
 --error ER_TEMP_FILE_WRITE_FAILURE
 alter table t1 drop primary key,add primary key(f2,f1);
-SET DEBUG = '-d,row_merge_write_failure';
+SET DEBUG = '-d,ddl_write_failure';
 drop table t1;
 
 # Optimize table via inplace algorithm
@@ -81,7 +81,7 @@
 create table t1(k1 int auto_increment primary key,
 k2 char(200),k3 char(200))engine=innodb;
 insert into t1 values(NULL,'a','b'), (NULL,'aa','bb');
-SET DEBUG_SYNC= 'row_merge_after_scan
+SET DEBUG_SYNC= 'ddl_after_scan
 SIGNAL opened WAIT_FOR flushed';
 send optimize table t1;
 connection default;
@@ -100,7 +100,7 @@
 # Log file creation failure.
 create table t1(k1 int auto_increment primary key,
 k2 char(200),k3 char(200))engine=innodb;
-SET DEBUG_SYNC= 'row_merge_after_scan
+SET DEBUG_SYNC= 'ddl_after_scan
 SIGNAL opened WAIT_FOR flushed';
 send ALTER TABLE t1 ADD COLUMN k4 int, ALGORITHM=INPLACE;
 connection default;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/t/innodb-index-online.test mysql-8.0-8.0.27/mysql-test/suite/innodb/t/innodb-index-online.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/t/innodb-index-online.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/t/innodb-index-online.test	2021-09-28 11:46:34.000000000 +0000
@@ -2,7 +2,7 @@
 
 let $innodb_metrics_select=
 SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count > 0;
+subsystem = 'ddl' and count > 16;
 
 # DISCARD TABLESPACE needs file-per-table
 SET @global_innodb_file_per_table_orig = @@global.innodb_file_per_table;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/t/innodb-index.test mysql-8.0-8.0.27/mysql-test/suite/innodb/t/innodb-index.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/t/innodb-index.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/t/innodb-index.test	2021-09-28 11:46:34.000000000 +0000
@@ -521,7 +521,7 @@
 SET GLOBAL innodb_monitor_enable = module_ddl;
 let $innodb_metrics_select=
 SELECT name, count_reset FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE
-subsystem = 'ddl' and count_reset > 0;
+subsystem = 'ddl' and count_reset > 0 AND count_reset > 16;
 
 # Table with Blob data.
 create table t1(f1 int not null, f2 blob)engine=innodb;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/t/innodb-table-online.test mysql-8.0-8.0.27/mysql-test/suite/innodb/t/innodb-table-online.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/t/innodb-table-online.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/t/innodb-table-online.test	2021-09-28 11:46:34.000000000 +0000
@@ -239,6 +239,7 @@
 SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL rebuilt3 WAIT_FOR dml3_done';
 --error ER_MULTIPLE_PRI_KEY
 ALTER TABLE t1 ADD PRIMARY KEY(c22f), CHANGE c2 c22f INT;
+--replace_regex /'\d'/'N'/
 --error ER_DUP_ENTRY
 ALTER TABLE t1 DROP PRIMARY KEY, ADD PRIMARY KEY(c22f), CHANGE c2 c22f INT;
 --send
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/t/innodb_temporary_file_path.test mysql-8.0-8.0.27/mysql-test/suite/innodb/t/innodb_temporary_file_path.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/t/innodb_temporary_file_path.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/t/innodb_temporary_file_path.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,62 @@
+#######################################################################
+# Bug#32840635: WRONG FILE_NAME OF INNODB_TEMPORARY TABLESPACE IN
+#               INFORMATION_SCHEMA.FILES TABLE
+#######################################################################
+--source include/not_windows.inc
+
+# This test verifies that the value of innodb_temp_data_file_path and
+# the value of FILE_NAME of innodb_temporary tablespace in
+# INFORMATION_SCHEMA.FILES match
+
+SELECT @@innodb_temp_data_file_path;
+
+SELECT FILE_NAME FROM INFORMATION_SCHEMA.FILES
+  WHERE TABLESPACE_NAME='innodb_temporary';
+
+# Restart the server with a non-default value of innodb-temp-data-file-path
+--let $restart_parameters = restart: --innodb-temp-data-file-path=mytemp:12M:autoextend
+--source include/restart_mysqld.inc
+
+# Verify that the new temp data file path is reflect correctly
+SELECT @@innodb_temp_data_file_path;
+
+SELECT FILE_NAME FROM INFORMATION_SCHEMA.FILES
+  WHERE TABLESPACE_NAME='innodb_temporary';
+
+# Restart the server with a relative path for innodb-temp-data-file-path
+--let $restart_parameters = restart: --innodb-temp-data-file-path=./mytemp:12M:autoextend
+--source include/restart_mysqld.inc
+
+# Verify that the new temp data file path is reflect correctly
+SELECT @@innodb_temp_data_file_path;
+
+SELECT FILE_NAME FROM INFORMATION_SCHEMA.FILES
+  WHERE TABLESPACE_NAME='innodb_temporary';
+
+# Restart the server with a non-default innodb-temp-data-file-path and read only mode
+--let $restart_parameters = restart: --innodb-temp-data-file-path=newtemp:12M:autoextend
+--source include/restart_innodb_read_only.inc
+
+# Since the server is started in read only mode, the filepath is not updated and hence
+# innodb_temp_data_file_path variable and file_name in information_schema.files will
+# be different
+SELECT @@innodb_temp_data_file_path;
+SELECT FILE_NAME FROM INFORMATION_SCHEMA.FILES
+  WHERE TABLESPACE_NAME='innodb_temporary';
+
+# Restart the server with an absolute path for innodb-temp-data-file-path
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+--let $restart_parameters = restart: --innodb-temp-data-file-path=$MYSQL_TMP_DIR/mytemp:12M:autoextend
+--source include/restart_mysqld.inc
+
+# Verify that the new temp data file path is reflect correctly
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+SELECT @@innodb_temp_data_file_path;
+
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+SELECT FILE_NAME FROM INFORMATION_SCHEMA.FILES
+  WHERE TABLESPACE_NAME='innodb_temporary';
+
+# Restart the server with the default innodb-temp-data-file-path
+--let $restart_parameters = restart:
+--source include/restart_mysqld.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/t/lob_ibd_size_replace.test mysql-8.0-8.0.27/mysql-test/suite/innodb/t/lob_ibd_size_replace.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/t/lob_ibd_size_replace.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/t/lob_ibd_size_replace.test	2021-09-28 11:46:34.000000000 +0000
@@ -1,4 +1,4 @@
---source include/no_valgrind_without_big.inc
+--source include/not_valgrind.inc
 --source include/have_debug.inc
 
 --echo #
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/t/max_trx_id.test mysql-8.0-8.0.27/mysql-test/suite/innodb/t/max_trx_id.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/t/max_trx_id.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/t/max_trx_id.test	2021-09-28 11:46:34.000000000 +0000
@@ -1,5 +1,6 @@
 --source include/have_debug.inc
 --source include/have_debug_sync.inc
+--source include/not_valgrind.inc
 --source include/count_sessions.inc
 
 --echo # Initialize new data directory and restart MySQL on that data directory.
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/t/multi_value_debug.test mysql-8.0-8.0.27/mysql-test/suite/innodb/t/multi_value_debug.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/t/multi_value_debug.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/t/multi_value_debug.test	2021-09-28 11:46:34.000000000 +0000
@@ -184,7 +184,7 @@
 INSERT INTO t1(f1) VALUES (CAST('[1,3,9,8]' AS JSON));
 INSERT INTO t1(f1) VALUES (CAST('[1,3,9,8,10,11,20,30]' AS JSON));
 
-SET DEBUG='+d, row_merge_add_multi_value';
+SET DEBUG='+d, ddl_add_multi_value';
 
 CREATE INDEX idx1 ON t1((CAST(f1->"$[*]" AS UNSIGNED ARRAY)));
 
@@ -192,7 +192,7 @@
 SELECT * FROM t1 WHERE 11 MEMBER OF (f1->'$[*]');
 SELECT * FROM t1 WHERE 30 MEMBER OF (f1->'$[*]');
 
-SET DEBUG='-d, row_merge_add_multi_value';
+SET DEBUG='-d, ddl_add_multi_value';
 
 CHECK TABLE t1;
 DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/t/nonmonotone_trx_ids.test mysql-8.0-8.0.27/mysql-test/suite/innodb/t/nonmonotone_trx_ids.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/t/nonmonotone_trx_ids.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/t/nonmonotone_trx_ids.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,41 @@
+--source include/big_test.inc
+--source include/have_debug.inc
+--source include/count_sessions.inc
+
+CREATE TABLE t1(id INT PRIMARY KEY, v INT NOT NULL) ENGINE=InnoDB;
+
+--let $debug_point=trx_sys_rw_trx_add_rc
+--let $debug_type=GLOBAL
+--source include/add_debug_point.inc
+
+DELIMITER |;
+CREATE PROCEDURE create_rw_transactions(k INT)
+ BEGIN
+     WHILE 1 DO
+       START TRANSACTION;
+         UPDATE t1 SET v=v+1 WHERE id=k;
+       COMMIT;
+     END WHILE;
+ END|
+DELIMITER ;|
+let $N=120;
+let $i=0;
+while($i<$N){
+    --connect(C$i,localhost,root,,test)
+        --eval INSERT INTO t1 (id,v) VALUES ($i,0)
+        --send_eval CALL create_rw_transactions($i)
+    --inc $i
+}
+--sleep 30
+let $i=0;
+while($i<$N){
+    --disconnect C$i
+    --inc $i
+}
+--connection default
+
+DROP PROCEDURE create_rw_transactions;
+DROP TABLE t1;
+--source include/remove_debug_point.inc
+
+--source include/wait_until_count_sessions.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/t/table_encrypt_debug.test mysql-8.0-8.0.27/mysql-test/suite/innodb/t/table_encrypt_debug.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/t/table_encrypt_debug.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/t/table_encrypt_debug.test	2021-09-28 11:46:34.000000000 +0000
@@ -215,6 +215,20 @@
 DROP DATABASE tde_db;
 eval SET GLOBAL innodb_file_per_table=$innodb_file_per_table;
 
+# Clean up
+--source include/shutdown_mysqld.inc
+--remove_file $MYSQLD_DATADIR/t1.cfg_back
+--remove_file $MYSQLD_DATADIR/t1.cfp_back
+--remove_file $MYSQLD_DATADIR/t1.ibd_back
+
+# Tests above might leave this in bad state
+--remove_file $MYSQL_TMP_DIR/mysecret_keyring
+--source include/start_mysqld.inc
+
+# Verify normal operation
+CREATE TABLE test.t1(c1 INT, c2 char(20)) ENCRYPTION="Y" ENGINE = InnoDB;
+DROP TABLE test.t1;
+
 --disable_query_log
 call mtr.add_suppression("\\[Warning\\].* Can't generate new master key for tablespace encryption, please check the keyring plugin is loaded.");
 call mtr.add_suppression("\\[Warning\\].* Cannot calculate statistics for table .* because the \.ibd file is missing");
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/t/tablespace_encrypt_8.test mysql-8.0-8.0.27/mysql-test/suite/innodb/t/tablespace_encrypt_8.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/t/tablespace_encrypt_8.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/t/tablespace_encrypt_8.test	2021-09-28 11:46:34.000000000 +0000
@@ -15,7 +15,7 @@
 --early-plugin-load=keyring_file=$KEYRING_PLUGIN --loose-keyring_file_data=$MYSQL_TMP_DIR/mysecret_keyring $KEYRING_PLUGIN_OPT --performance-schema-consumer-events-stages-current=ON --performance-schema-events-stages-history-size=1000;
 --source include/restart_mysqld_no_echo.inc
 
-SET SESSION debug= '+d,BtrBulk_insert_inject_error';
+SET SESSION debug= '+d,ddl_btree_build_insert_return_interrupt';
 
 --echo
 --echo #########
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/t/tablespace_portability.test mysql-8.0-8.0.27/mysql-test/suite/innodb/t/tablespace_portability.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/t/tablespace_portability.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/t/tablespace_portability.test	2021-09-28 11:46:34.000000000 +0000
@@ -64,14 +64,15 @@
 --echo #
 
 let MYSQLD_DATADIR= `SELECT @@datadir`;
---mkdir $MYSQL_TMP_DIR/test
+let INNODB_DIR=$MYSQLTEST_VARDIR/test;
+--mkdir $INNODB_DIR
 
 CREATE TABLE t1(a INT);
 
 --source include/save_error_log_position.inc
 --source include/shutdown_mysqld.inc
 
---copy_file $MYSQLD_DATADIR/test/t1.ibd $MYSQL_TMP_DIR/test/t1.ibd
+--copy_file $MYSQLD_DATADIR/test/t1.ibd $INNODB_DIR/t1.ibd
 --remove_file $MYSQLD_DATADIR/test/t1.ibd
 
 --source include/start_mysqld.inc
@@ -79,9 +80,15 @@
 let $error_pattern = .*\\[Warning\\].*Tablespace .*, name 'test/t1', file '.*test.*t1.ibd' is missing;
 --source include/assert_error_log.inc
 
---replace_result $MYSQL_TMP_DIR TMP_DIR
---let restart_parameters="restart: --innodb_directories=$MYSQL_TMP_DIR"
+--replace_result $INNODB_DIR INNODB_DIR
+--let restart_parameters="restart: --innodb_directories=$INNODB_DIR"
 --source include/restart_mysqld.inc
 
 ALTER TABLE t1 FORCE;
 DROP TABLE t1;
+
+# Clean up
+--let restart_parameters="restart: "
+--source include/restart_mysqld.inc
+
+--rmdir $INNODB_DIR
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/t/undo-order.test mysql-8.0-8.0.27/mysql-test/suite/innodb/t/undo-order.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/t/undo-order.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/t/undo-order.test	2021-09-28 11:46:34.000000000 +0000
@@ -39,3 +39,5 @@
 --source include/wait_until_count_sessions.inc
 
 DROP TABLE t1;
+let $restart_parameters = restart:;
+--source include/restart_mysqld.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/t/virtual_debug.test mysql-8.0-8.0.27/mysql-test/suite/innodb/t/virtual_debug.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/t/virtual_debug.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/t/virtual_debug.test	2021-09-28 11:46:34.000000000 +0000
@@ -199,7 +199,7 @@
 connect (con1,localhost,root);
 connection con1;
 
-SET DEBUG_SYNC= 'row_merge_after_scan SIGNAL opened WAIT_FOR go_ddl';
+SET DEBUG_SYNC= 'ddl_after_scan SIGNAL opened WAIT_FOR go_ddl';
 send ALTER TABLE t1 ADD CONSTRAINT  pk1 PRIMARY KEY (id);
 
 connection default;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/t/zlob_ibd_size_replace.test mysql-8.0-8.0.27/mysql-test/suite/innodb/t/zlob_ibd_size_replace.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/t/zlob_ibd_size_replace.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/t/zlob_ibd_size_replace.test	2021-09-28 11:46:34.000000000 +0000
@@ -1,6 +1,7 @@
 --source include/big_test.inc
 --source include/have_innodb_16k.inc
 --source include/have_debug.inc
+--source include/not_valgrind.inc
 
 --echo #
 --echo # BUG 31222046 - .IDB GROWS INDEFENITELY (BUG #96466 WITH REPLACE)
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb/t/zlob_ibd_size.test mysql-8.0-8.0.27/mysql-test/suite/innodb/t/zlob_ibd_size.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb/t/zlob_ibd_size.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb/t/zlob_ibd_size.test	2021-09-28 11:46:34.000000000 +0000
@@ -1,6 +1,8 @@
 --source include/big_test.inc
 --source include/have_innodb_16k.inc
 --source include/have_debug.inc
+--source include/not_valgrind.inc
+
 
 --echo # Ensure that there is not already lot of data to be purged.
 --echo # If timeout happens here, then check the chain of previously
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/include/mecab.inc mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/include/mecab.inc
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/include/mecab.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/include/mecab.inc	2021-09-28 11:46:34.000000000 +0000
@@ -102,20 +102,14 @@
   -- skip Test fail to load mecab parser, IPADIC files for $ipadic_charset might be missing.
 }
 
-if ($mecab_charset != $mysql_charset) {
-  UNINSTALL PLUGIN mecab;
-  --remove_file $MYSQL_DATADIR/mecabrc
-  -- skip Test mecab charset mismatch (MeCab: $mecab_charset vs MySQL: $mysql_charset). Correct IPADIC files might be missing.
-}
-
 --enable_query_log
 
 SHOW STATUS LIKE 'mecab_charset';
 
-SET NAMES utf8;
+SET NAMES utf8mb3;
 eval CREATE TABLE page (
   page_id int(8) unsigned NOT NULL AUTO_INCREMENT,
-  page_title varchar(255) CHARACTER SET $mecab_charset NOT NULL DEFAULT '',
+  page_title varchar(255) CHARACTER SET $mysql_charset NOT NULL DEFAULT '',
   PRIMARY KEY (page_id),
   FULLTEXT KEY page_title (page_title) WITH PARSER mecab
 ) ENGINE=InnoDB;
@@ -134,7 +128,8 @@
 (11,'鉄�');
 
 SET GLOBAL innodb_ft_aux_table="test/page";
-SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE
+ORDER BY WORD, DOC_ID, POSITION;
 SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_TABLE;
 
 SHOW CREATE TABLE page;
@@ -153,7 +148,7 @@
 SELECT * FROM page WHERE MATCH(page_title) AGAINST('鉄�');
 SELECT * FROM page WHERE MATCH(page_title) AGAINST('鉄�' WITH QUERY EXPANSION);
 
-eval ALTER TABLE page add column c1 varchar(100) CHARACTER SET $mecab_charset DEFAULT 'ﾚﾓﾅ';
+eval ALTER TABLE page add column c1 varchar(100) CHARACTER SET $mysql_charset DEFAULT 'ﾚﾓﾅ';
 ALTER TABLE page ADD FULLTEXT INDEX idx1 (page_title,c1) WITH PARSER mecab;
 SELECT * FROM page WHERE MATCH(page_title,c1) AGAINST('ﾚﾓﾅ');
 SELECT * FROM page WHERE MATCH(page_title,c1) AGAINST('-ﾚﾓﾅ' IN BOOLEAN MODE);
@@ -169,22 +164,22 @@
 
 INSERT INTO page VALUES (1,'日本');
 
-# We don't return charset mismatch error because of parallel fts build.
+--error ER_ERROR_ON_WRITE
 CREATE FULLTEXT INDEX ft_idx ON page(page_title) WITH PARSER mecab;
 
-SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE
+ORDER BY WORD, DOC_ID, POSITION;
 SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_TABLE;
 
---error ER_ERROR_ON_WRITE
 INSERT INTO page VALUES (2,'日本');
 
---error ER_ERROR_ON_WRITE
+--error ER_FT_MATCHING_KEY_NOT_FOUND
 SELECT * FROM page WHERE MATCH(page_title) AGAINST('日本');
 
 DROP TABLE page;
 
 # Test utf8mb4
-if ($mecab_charset == 'utf8')
+if ($mecab_charset == 'utf8mb4')
 {
   SET NAMES utf8mb4;
 
@@ -202,7 +197,8 @@
     (3,'鉄�😊100電車');
 
   SET GLOBAL innodb_ft_aux_table="test/page";
-  SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE;
+  SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE
+  ORDER BY WORD, DOC_ID, POSITION;
   SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_TABLE;
 
   SHOW CREATE TABLE page;
@@ -232,7 +228,8 @@
     (3,'鉄�ⅴ100電車');
 
   SET GLOBAL innodb_ft_aux_table="test/page";
-  SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE;
+  SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE
+  ORDER BY WORD, DOC_ID, POSITION;
   SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_TABLE;
 
   SHOW CREATE TABLE page;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/include/ngram.inc mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/include/ngram.inc
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/include/ngram.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/include/ngram.inc	2021-09-28 11:46:34.000000000 +0000
@@ -63,6 +63,7 @@
 # bigram search
 SELECT * FROM articles_1 WHERE
 	MATCH(title_char) AGAINST('En');
+--sorted_result
 SELECT * FROM articles_1 WHERE
 	MATCH(title_varchar) AGAINST('nd');
 SELECT * FROM articles_1 WHERE
@@ -75,40 +76,52 @@
 	MATCH(title_text,title_varchar) AGAINST('er');
 
 # try search for an entire word
+--sorted_result
 SELECT * FROM articles_1 WHERE
 	MATCH(title_char) AGAINST('West');
+--sorted_result
 SELECT * FROM articles_1 WHERE
 	MATCH(title_varchar) AGAINST('first');
+--sorted_result
 SELECT * FROM articles_1 WHERE
 	MATCH(title_text) AGAINST('United');
+--sorted_result
 SELECT * FROM articles_1 WHERE
 	MATCH(title_char,title_varchar) AGAINST('in');
+--sorted_result
 SELECT * FROM articles_1 WHERE
 	MATCH(title_text,title_varchar) AGAINST('St');
 
 # boolean mode
+--sorted_result
 SELECT * FROM articles_1 WHERE
 	MATCH(title_char) AGAINST('En la' IN BOOLEAN MODE);
 SELECT * FROM articles_1 WHERE
 	MATCH(title_char) AGAINST('+En -la' IN BOOLEAN MODE);
 SELECT * FROM articles_1 WHERE
 	MATCH(title_char) AGAINST('-En +la' IN BOOLEAN MODE);
+--sorted_result
 SELECT * FROM articles_1 WHERE
 	MATCH(title_char) AGAINST('+En +la' IN BOOLEAN MODE);
 SELECT * FROM articles_1 WHERE
 	MATCH(title_char) AGAINST('-En -la' IN BOOLEAN MODE);
 
+--sorted_result
 SELECT * FROM articles_1 WHERE
 	MATCH(title_varchar) AGAINST('in nc' IN BOOLEAN MODE);
 SELECT * FROM articles_1 WHERE
 	MATCH(title_varchar) AGAINST('+in -nc' IN BOOLEAN MODE);
+--sorted_result
 SELECT * FROM articles_1 WHERE
 	MATCH(title_varchar) AGAINST('+in <la' IN BOOLEAN MODE);
+--sorted_result
 SELECT * FROM articles_1 WHERE
 	MATCH(title_varchar) AGAINST('+la >la' IN BOOLEAN MODE);
+--sorted_result
 SELECT * FROM articles_1 WHERE
 	MATCH(title_varchar) AGAINST('~in la' IN BOOLEAN MODE);
 
+--sorted_result
 SELECT * FROM articles_1 WHERE
 	MATCH(title_varchar,title_text) AGAINST('Ca Ox' IN BOOLEAN MODE);
 SELECT * FROM articles_1 WHERE
@@ -119,18 +132,23 @@
 	MATCH(title_varchar,title_text) AGAINST('"Un" "-i*"' IN BOOLEAN MODE);
 
 # query expansion mode
+--sorted_result
 SELECT * FROM articles_1 WHERE
         MATCH(title_char) AGAINST('la'  WITH QUERY EXPANSION);
+--sorted_result
 SELECT * FROM articles_1 WHERE
         MATCH(title_varchar) AGAINST('po'  WITH QUERY EXPANSION);
+--sorted_result
 SELECT * FROM articles_1 WHERE
         MATCH(title_text) AGAINST('Ca'  WITH QUERY EXPANSION);
+--sorted_result
 SELECT * FROM articles_1 WHERE
         MATCH(title_char,title_varchar) AGAINST('Ca'  WITH QUERY EXPANSION);
+--sorted_result
 SELECT * FROM articles_1 WHERE
         MATCH(title_text,title_varchar) AGAINST('Ca'  WITH QUERY EXPANSION);
 
-# proximity search - not supoorted yet
+# proximity search - not supported yet
 SELECT * FROM articles_1
         WHERE MATCH (title_text)
         AGAINST ('"Ca da"@2' IN BOOLEAN MODE);
@@ -139,6 +157,7 @@
         AGAINST ('"Ca da"@5' IN BOOLEAN MODE);
 
 # FTS condition and Join in where clause
+--sorted_result
 SELECT * FROM articles_1 t1,articles_1 t2
         WHERE MATCH(t2.title_varchar,t2.title_text) AGAINST('Ca Ox' IN BOOLEAN MODE)
         AND t1.seq = t2.seq ;
@@ -159,6 +178,7 @@
 SELECT * FROM articles_1
         WHERE MATCH (title_char,title_text,title_varchar)
         AGAINST ('"United States"@2' IN BOOLEAN MODE);
+--sorted_result
 SELECT * FROM articles_1
         WHERE MATCH (title_char,title_text,title_varchar)
         AGAINST ('States' WITH QUERY EXPANSION);
@@ -230,6 +250,7 @@
         MATCH(c2) AGAINST("-我幾 -�啊" IN BOOLEAN MODE);
 SELECT * FROM articles WHERE
         MATCH(c2) AGAINST("我幾 �啊" IN BOOLEAN MODE);
+--sorted_result
 SELECT * FROM articles WHERE
         MATCH(c2) AGAINST("<我幾 >�啊" IN BOOLEAN MODE);
 
@@ -275,6 +296,7 @@
         MATCH(j3) AGAINST('�長' WITH QUERY EXPANSION);
 #SELECT * FROM articles WHERE
 #        MATCH(k2) AGAINST('국�' WITH QUERY EXPANSION);
+--sorted_result
 SELECT * FROM articles WHERE
         MATCH(e1) AGAINST('testing' WITH QUERY EXPANSION) ;
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/basic.result mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/basic.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/basic.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/basic.result	2021-09-28 11:46:34.000000000 +0000
@@ -48,20 +48,20 @@
 WHERE MATCH (title,body)
 AGAINST ('MySQL' IN NATURAL LANGUAGE MODE);
 id	title	body
-6	MySQL Security	When configured properly, MySQL ...
 1	MySQL Tutorial	DBMS stands for DataBase ...
 2	How To Use MySQL Well	After you went through a ...
 3	Optimizing MySQL	In this tutorial we will show ...
 4	1001 MySQL Tricks	1. Never run mysqld as root. 2. ...
 5	MySQL vs. YourSQL	In the following database comparison ...
+6	MySQL Security	When configured properly, MySQL ...
 SELECT * FROM articles WHERE MATCH (title,body)
 AGAINST ('+MySQL -YourSQL' IN BOOLEAN MODE);
 id	title	body
-6	MySQL Security	When configured properly, MySQL ...
 1	MySQL Tutorial	DBMS stands for DataBase ...
 2	How To Use MySQL Well	After you went through a ...
 3	Optimizing MySQL	In this tutorial we will show ...
 4	1001 MySQL Tricks	1. Never run mysqld as root. 2. ...
+6	MySQL Security	When configured properly, MySQL ...
 SELECT * FROM articles WHERE MATCH (title,body)
 AGAINST ('DBMS Security' IN BOOLEAN MODE);
 id	title	body
@@ -74,21 +74,21 @@
 SELECT * FROM articles WHERE MATCH (title,body)
 AGAINST ('+MySQL YourSQL' IN BOOLEAN MODE);
 id	title	body
-5	MySQL vs. YourSQL	In the following database comparison ...
-6	MySQL Security	When configured properly, MySQL ...
 1	MySQL Tutorial	DBMS stands for DataBase ...
 2	How To Use MySQL Well	After you went through a ...
 3	Optimizing MySQL	In this tutorial we will show ...
 4	1001 MySQL Tricks	1. Never run mysqld as root. 2. ...
+5	MySQL vs. YourSQL	In the following database comparison ...
+6	MySQL Security	When configured properly, MySQL ...
 SELECT * FROM articles WHERE MATCH (title,body)
 AGAINST ('+MySQL ~YourSQL' IN BOOLEAN MODE);
 id	title	body
-6	MySQL Security	When configured properly, MySQL ...
 1	MySQL Tutorial	DBMS stands for DataBase ...
 2	How To Use MySQL Well	After you went through a ...
 3	Optimizing MySQL	In this tutorial we will show ...
 4	1001 MySQL Tricks	1. Never run mysqld as root. 2. ...
 5	MySQL vs. YourSQL	In the following database comparison ...
+6	MySQL Security	When configured properly, MySQL ...
 SELECT * FROM articles WHERE MATCH (title,body)
 AGAINST ('t*' IN BOOLEAN MODE);
 id	title	body
@@ -99,12 +99,12 @@
 SELECT * FROM articles WHERE MATCH (title,body)
 AGAINST ('MY*' IN BOOLEAN MODE);
 id	title	body
-6	MySQL Security	When configured properly, MySQL ...
 1	MySQL Tutorial	DBMS stands for DataBase ...
 2	How To Use MySQL Well	After you went through a ...
 3	Optimizing MySQL	In this tutorial we will show ...
 4	1001 MySQL Tricks	1. Never run mysqld as root. 2. ...
 5	MySQL vs. YourSQL	In the following database comparison ...
+6	MySQL Security	When configured properly, MySQL ...
 SELECT * FROM articles WHERE MATCH (title,body)
 AGAINST ('ru*' IN BOOLEAN MODE);
 id	title	body
@@ -112,31 +112,31 @@
 SELECT * FROM articles WHERE MATCH (title,body)
 AGAINST ('+ MySQL >Well < stands' IN BOOLEAN MODE);
 id	title	body
+1	MySQL Tutorial	DBMS stands for DataBase ...
 2	How To Use MySQL Well	After you went through a ...
-6	MySQL Security	When configured properly, MySQL ...
 3	Optimizing MySQL	In this tutorial we will show ...
 4	1001 MySQL Tricks	1. Never run mysqld as root. 2. ...
 5	MySQL vs. YourSQL	In the following database comparison ...
-1	MySQL Tutorial	DBMS stands for DataBase ...
+6	MySQL Security	When configured properly, MySQL ...
 SELECT * FROM articles WHERE MATCH (title,body)
 AGAINST ('+ MySQL - (Well stands)' IN BOOLEAN MODE);
 id	title	body
-6	MySQL Security	When configured properly, MySQL ...
 3	Optimizing MySQL	In this tutorial we will show ...
 4	1001 MySQL Tricks	1. Never run mysqld as root. 2. ...
 5	MySQL vs. YourSQL	In the following database comparison ...
+6	MySQL Security	When configured properly, MySQL ...
 SELECT * FROM articles WHERE MATCH (title,body)
 AGAINST ('+ MySQL + (>Well < stands)' IN BOOLEAN MODE);
 id	title	body
-2	How To Use MySQL Well	After you went through a ...
 1	MySQL Tutorial	DBMS stands for DataBase ...
+2	How To Use MySQL Well	After you went through a ...
 SELECT * FROM articles WHERE MATCH (title,body)
 AGAINST ('YourSQL + (+MySQL - (Tricks Security))' IN BOOLEAN MODE);
 id	title	body
-5	MySQL vs. YourSQL	In the following database comparison ...
 1	MySQL Tutorial	DBMS stands for DataBase ...
 2	How To Use MySQL Well	After you went through a ...
 3	Optimizing MySQL	In this tutorial we will show ...
+5	MySQL vs. YourSQL	In the following database comparison ...
 SELECT * FROM articles WHERE MATCH (title,body)
 AGAINST ('(+MySQL - (Tricks Security)) - YourSQL' IN BOOLEAN MODE);
 id	title	body
@@ -172,9 +172,9 @@
 WHERE MATCH (title,body)
 AGAINST ('test' WITH QUERY EXPANSION);
 id	title	body
-7	test query expansion	for database ...
 1	MySQL Tutorial	DBMS stands for DataBase ...
 5	MySQL vs. YourSQL	In the following database comparison ...
+7	test query expansion	for database ...
 SELECT * FROM articles
 WHERE MATCH (title,body)
 AGAINST ('"following comparison"@3' IN BOOLEAN MODE);
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/bug_32831765.result mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/bug_32831765.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/bug_32831765.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/bug_32831765.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,111 @@
+#
+# Bug#32831765 SERVER HITS OOM CONDITION WHEN LOADING TWO
+# INNODB TABLES WITH FTS INDEXES
+#
+create table t1 ( `id` int unsigned NOT NULL AUTO_INCREMENT, `col01` text,
+`col02` text, `col03` text, `col04` text, `col05` text, `col06` text, `col07`
+text, `col08` text, `col09` text, `col10` text, `col11` text, `col12` text,
+`col13` text, `col14` text, `col15` text, `col16` text, `col17` text, `col18`
+text, `col19` text, `col20` text, `col21` text, `col22` text, `col23` text,
+`col24` text, `col25` text, `col26` text, `col27` text, `col28` text, `col29`
+text, `col30` text, PRIMARY KEY (`id`), FULLTEXT KEY (`col01`), FULLTEXT KEY
+(`col02`), FULLTEXT KEY (`col03`), FULLTEXT KEY (`col04`), FULLTEXT KEY
+(`col05`), FULLTEXT KEY (`col06`), FULLTEXT KEY (`col07`), FULLTEXT KEY
+(`col08`), FULLTEXT KEY (`col09`), FULLTEXT KEY (`col10`), FULLTEXT KEY
+(`col11`), FULLTEXT KEY (`col12`), FULLTEXT KEY (`col13`), FULLTEXT KEY
+(`col14`), FULLTEXT KEY (`col15`), FULLTEXT KEY (`col16`), FULLTEXT KEY
+(`col17`), FULLTEXT KEY (`col18`), FULLTEXT KEY (`col19`), FULLTEXT KEY
+(`col20`), FULLTEXT KEY (`col21`), FULLTEXT KEY (`col22`), FULLTEXT KEY
+(`col23`), FULLTEXT KEY (`col24`), FULLTEXT KEY (`col25`), FULLTEXT KEY
+(`col26`), FULLTEXT KEY (`col27`), FULLTEXT KEY (`col28`), FULLTEXT KEY
+(`col29`), FULLTEXT KEY (`col30`)) engine=innodb;
+create table t2 ( `id` int unsigned NOT NULL AUTO_INCREMENT, `col01` text,
+`col02` text, `col03` text, `col04` text, `col05` text, `col06` text, `col07`
+text, `col08` text, `col09` text, `col10` text, `col11` text, `col12` text,
+`col13` text, `col14` text, `col15` text, `col16` text, `col17` text, `col18`
+text, `col19` text, `col20` text, `col21` text, `col22` text, `col23` text,
+`col24` text, `col25` text, `col26` text, `col27` text, `col28` text, `col29`
+text, `col30` text, PRIMARY KEY (`id`), FULLTEXT KEY (`col01`), FULLTEXT KEY
+(`col02`), FULLTEXT KEY (`col03`), FULLTEXT KEY (`col04`), FULLTEXT KEY
+(`col05`), FULLTEXT KEY (`col06`), FULLTEXT KEY (`col07`), FULLTEXT KEY
+(`col08`), FULLTEXT KEY (`col09`), FULLTEXT KEY (`col10`), FULLTEXT KEY
+(`col11`), FULLTEXT KEY (`col12`), FULLTEXT KEY (`col13`), FULLTEXT KEY
+(`col14`), FULLTEXT KEY (`col15`), FULLTEXT KEY (`col16`), FULLTEXT KEY
+(`col17`), FULLTEXT KEY (`col18`), FULLTEXT KEY (`col19`), FULLTEXT KEY
+(`col20`), FULLTEXT KEY (`col21`), FULLTEXT KEY (`col22`), FULLTEXT KEY
+(`col23`), FULLTEXT KEY (`col24`), FULLTEXT KEY (`col25`), FULLTEXT KEY
+(`col26`), FULLTEXT KEY (`col27`), FULLTEXT KEY (`col28`), FULLTEXT KEY
+(`col29`), FULLTEXT KEY (`col30`)) engine=innodb;
+create table t3 ( `id` int unsigned NOT NULL AUTO_INCREMENT, `col01` text,
+`col02` text, `col03` text, `col04` text, `col05` text, `col06` text, `col07`
+text, `col08` text, `col09` text, `col10` text, `col11` text, `col12` text,
+`col13` text, `col14` text, `col15` text, `col16` text, `col17` text, `col18`
+text, `col19` text, `col20` text, `col21` text, `col22` text, `col23` text,
+`col24` text, `col25` text, `col26` text, `col27` text, `col28` text, `col29`
+text, `col30` text, PRIMARY KEY (`id`), FULLTEXT KEY (`col01`), FULLTEXT KEY
+(`col02`), FULLTEXT KEY (`col03`), FULLTEXT KEY (`col04`), FULLTEXT KEY
+(`col05`), FULLTEXT KEY (`col06`), FULLTEXT KEY (`col07`), FULLTEXT KEY
+(`col08`), FULLTEXT KEY (`col09`), FULLTEXT KEY (`col10`), FULLTEXT KEY
+(`col11`), FULLTEXT KEY (`col12`), FULLTEXT KEY (`col13`), FULLTEXT KEY
+(`col14`), FULLTEXT KEY (`col15`), FULLTEXT KEY (`col16`), FULLTEXT KEY
+(`col17`), FULLTEXT KEY (`col18`), FULLTEXT KEY (`col19`), FULLTEXT KEY
+(`col20`), FULLTEXT KEY (`col21`), FULLTEXT KEY (`col22`), FULLTEXT KEY
+(`col23`), FULLTEXT KEY (`col24`), FULLTEXT KEY (`col25`), FULLTEXT KEY
+(`col26`), FULLTEXT KEY (`col27`), FULLTEXT KEY (`col28`), FULLTEXT KEY
+(`col29`), FULLTEXT KEY (`col30`)) engine=innodb;
+create table t4 ( `id` int unsigned NOT NULL AUTO_INCREMENT, `col01` text,
+`col02` text, `col03` text, `col04` text, `col05` text, `col06` text, `col07`
+text, `col08` text, `col09` text, `col10` text, `col11` text, `col12` text,
+`col13` text, `col14` text, `col15` text, `col16` text, `col17` text, `col18`
+text, `col19` text, `col20` text, `col21` text, `col22` text, `col23` text,
+`col24` text, `col25` text, `col26` text, `col27` text, `col28` text, `col29`
+text, `col30` text, PRIMARY KEY (`id`), FULLTEXT KEY (`col01`), FULLTEXT KEY
+(`col02`), FULLTEXT KEY (`col03`), FULLTEXT KEY (`col04`), FULLTEXT KEY
+(`col05`), FULLTEXT KEY (`col06`), FULLTEXT KEY (`col07`), FULLTEXT KEY
+(`col08`), FULLTEXT KEY (`col09`), FULLTEXT KEY (`col10`), FULLTEXT KEY
+(`col11`), FULLTEXT KEY (`col12`), FULLTEXT KEY (`col13`), FULLTEXT KEY
+(`col14`), FULLTEXT KEY (`col15`), FULLTEXT KEY (`col16`), FULLTEXT KEY
+(`col17`), FULLTEXT KEY (`col18`), FULLTEXT KEY (`col19`), FULLTEXT KEY
+(`col20`), FULLTEXT KEY (`col21`), FULLTEXT KEY (`col22`), FULLTEXT KEY
+(`col23`), FULLTEXT KEY (`col24`), FULLTEXT KEY (`col25`), FULLTEXT KEY
+(`col26`), FULLTEXT KEY (`col27`), FULLTEXT KEY (`col28`), FULLTEXT KEY
+(`col29`), FULLTEXT KEY (`col30`)) engine=innodb;
+#create procedure to inset into the table.
+CREATE  PROCEDURE `proc_insert`(IN tab_name VARCHAR(40))
+BEGIN
+DECLARE i INT DEFAULT 1;
+SET @insert_tbl =CONCAT('INSERT INTO ', tab_name, '( `col01`, `col02`,
+	`col03`, `col04`, `col05`, `col06`, `col07`, `col08`, `col09`, `col10`,
+	`col11`, `col12`, `col13`, `col14`, `col15`, `col16`, `col17`, `col18`,
+	`col19`, `col20`, `col21`, `col22`, `col23`, `col24`, `col25`, `col26`,
+	`col27`, `col28`, `col29`, `col30`)
+	VALUES ( MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()),
+	MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()),
+	MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()),
+	MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()),
+	MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()),
+	MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()),
+	MD5(RAND()))');
+PREPARE ins_stmt FROM @insert_tbl;
+while (i <= 2000) DO
+EXECUTE ins_stmt;
+SET i = i + 1;
+END WHILE;
+DEALLOCATE PREPARE ins_stmt;
+END |
+call proc_insert('t1');;
+call proc_insert('t1');;
+call proc_insert('t2');;
+call proc_insert('t2');;
+call proc_insert('t3');;
+call proc_insert('t3');;
+call proc_insert('t4');;
+call proc_insert('t4');;
+SET GLOBAL DEBUG="+d,fts_optimize_wq_count_check";
+SET GLOBAL DEBUG="-d,fts_optimize_wq_count_check";
+# clean up
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE t3;
+DROP TABLE t4;
+DROP PROCEDURE proc_insert;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/ddl.result mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/ddl.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/ddl.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/ddl.result	2021-09-28 11:46:34.000000000 +0000
@@ -39,16 +39,16 @@
 SELECT * FROM fts_test WHERE MATCH (title,body)
 AGAINST ('+MySQL -YourSQL' IN BOOLEAN MODE);
 id	title	body
-6	MySQL Security	When configured properly, MySQL ...
-12	MySQL Security	When configured properly, MySQL ...
 1	MySQL Tutorial	DBMS stands for DataBase ...
+10	1001 MySQL Tricks	1. Never run mysqld as root. 2. ...
+12	MySQL Security	When configured properly, MySQL ...
 2	How To Use MySQL Well	After you went through a ...
 3	Optimizing MySQL	In this tutorial we will show ...
 4	1001 MySQL Tricks	1. Never run mysqld as root. 2. ...
+6	MySQL Security	When configured properly, MySQL ...
 7	MySQL Tutorial	DBMS stands for DataBase ...
 8	How To Use MySQL Well	After you went through a ...
 9	Optimizing MySQL	In this tutorial we will show ...
-10	1001 MySQL Tricks	1. Never run mysqld as root. 2. ...
 TRUNCATE TABLE fts_test;
 DROP INDEX idx ON fts_test;
 INSERT INTO fts_test (title,body) VALUES
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/fic.result mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/fic.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/fic.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/fic.result	2021-09-28 11:46:34.000000000 +0000
@@ -42,11 +42,11 @@
 SELECT * FROM articles WHERE MATCH (title,body)
 AGAINST ('+MySQL -YourSQL' IN BOOLEAN MODE);
 id	title	body
-6	MySQL Security	When configured properly, MySQL ...
 1	MySQL Tutorial	DBMS stands for DataBase ...
 2	How To Use MySQL Well	After you went through a ...
 3	Optimizing MySQL	In this tutorial we will show ...
 4	1001 MySQL Tricks	1. Never run mysqld as root. 2. ...
+6	MySQL Security	When configured properly, MySQL ...
 SELECT * FROM articles WHERE MATCH (title,body)
 AGAINST ('DBMS Security' IN BOOLEAN MODE);
 id	title	body
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/fulltext2.result mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/fulltext2.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/fulltext2.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/fulltext2.result	2021-09-28 11:46:34.000000000 +0000
@@ -279,9 +279,9 @@
 fts_doc_id	first_name	last_name	score
 1	Bart	Simpson	0
 2	Homer	Simpson	0.7141907215118408
+3	Marge	Simpson	0
 4	Lisa	Simpson	0
 5	Maggie	Simpson	0
-3	Marge	Simpson	0
 6	Ned	Flanders	0
 7	Nelson	Muntz	0
 DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/fulltext_misc.result mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/fulltext_misc.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/fulltext_misc.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/fulltext_misc.result	2021-09-28 11:46:34.000000000 +0000
@@ -198,3 +198,67 @@
 2
 DROP TABLE t1,t2;
 End of 5.1 tests
+#
+# Bug#32979815: WL#14422: ASSERTION `!(USED_TABS & (~READ_TABLES & ~FILTER_FOR_TABLE))' FAILED
+#
+CREATE TABLE t (x VARCHAR(10), FULLTEXT (x));
+SELECT 1 FROM t
+WHERE x IN
+(SELECT MATCH (t2.x) AGAINST ('abc')
+FROM t AS t1 JOIN t AS t2
+ON t1.x = t2.x
+GROUP BY t2.x
+HAVING t2.x = '');
+1
+DROP TABLE t;
+#
+# Bug#32980875: WL#14422: ASSERTION `FALSE' FAILED|SQL/BASIC_ROW_ITERATORS.H
+#
+CREATE TABLE t (a VARCHAR(10), FULLTEXT (a));
+INSERT INTO t VALUES ('a'), ('b'), ('c');
+ANALYZE TABLE t;
+Table	Op	Msg_type	Msg_text
+test.t	analyze	status	OK
+PREPARE prep_stmt FROM '
+
+ SELECT DISTINCT
+   MATCH (t1.a) AGAINST(''x''),
+   MIN(t2.a),
+   t1.a
+ FROM t AS t1 JOIN t AS t2 ON t1.a = t2.a
+ GROUP BY MATCH (t1.a) AGAINST(''x''), t1.a
+
+';
+EXECUTE prep_stmt;
+MATCH (t1.a) AGAINST('x')	MIN(t2.a)	a
+0	a	a
+0	b	b
+0	c	c
+EXECUTE prep_stmt;
+MATCH (t1.a) AGAINST('x')	MIN(t2.a)	a
+0	a	a
+0	b	b
+0	c	c
+DEALLOCATE PREPARE prep_stmt;
+DROP TABLE t;
+#
+# Bug#32990422: WL#14422: RESULT MISMATCH WITH FTS FUNCTION
+#
+CREATE TABLE t (i INTEGER, x VARCHAR(10), FULLTEXT (x));
+INSERT INTO t VALUES (0, 'a'), (1, 'b'), (0, 'c');
+SELECT i = 0 AS a, MATCH(x) AGAINST('d') AS b FROM t GROUP BY a, b;
+a	b
+0	0
+1	0
+DROP TABLE t;
+#
+# Bug#32996515: WL#14422: RESULT MISMATCH WITH DISTINCT AND GROUP BY ON FTS FUNCTION
+#
+CREATE TABLE t (a INTEGER, b VARCHAR(10), FULLTEXT(b));
+INSERT INTO t VALUES (1, 'a'), (2, 'b');
+SELECT DISTINCT MATCH (b) AGAINST ('x'), a
+FROM t GROUP BY MATCH (b) AGAINST ('x'), a;
+MATCH (b) AGAINST ('x')	a
+0	1
+0	2
+DROP TABLE t;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/fulltext.result mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/fulltext.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/fulltext.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/fulltext.result	2021-09-28 11:46:34.000000000 +0000
@@ -31,31 +31,31 @@
 Only MyISAM tables	support collections
 select * from t1 where MATCH(a,b) AGAINST ("collections" WITH QUERY EXPANSION);
 a	b
-Only MyISAM tables	support collections
 Full-text indexes	are called collections
-MySQL has now support	for full-text search
 Full-text search in MySQL	implements vector space model
+MySQL has now support	for full-text search
+Only MyISAM tables	support collections
 select * from t1 where MATCH(a,b) AGAINST ("indexes" WITH QUERY EXPANSION);
 a	b
 Full-text indexes	are called collections
-Only MyISAM tables	support collections
-MySQL has now support	for full-text search
 Full-text search in MySQL	implements vector space model
+MySQL has now support	for full-text search
+Only MyISAM tables	support collections
 select * from t1 where MATCH(a,b) AGAINST ("indexes collections" WITH QUERY EXPANSION);
 a	b
-Only MyISAM tables	support collections
 Full-text indexes	are called collections
-MySQL has now support	for full-text search
 Full-text search in MySQL	implements vector space model
+MySQL has now support	for full-text search
+Only MyISAM tables	support collections
 select * from t1 where MATCH(a,b) AGAINST ("indexes" IN NATURAL LANGUAGE MODE);
 a	b
 Full-text indexes	are called collections
 select * from t1 where MATCH(a,b) AGAINST ("indexes" IN NATURAL LANGUAGE MODE WITH QUERY EXPANSION);
 a	b
 Full-text indexes	are called collections
-Only MyISAM tables	support collections
-MySQL has now support	for full-text search
 Full-text search in MySQL	implements vector space model
+MySQL has now support	for full-text search
+Only MyISAM tables	support collections
 select * from t1 where MATCH(a,b) AGAINST ("indexes" IN BOOLEAN MODE WITH QUERY EXPANSION);
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'WITH QUERY EXPANSION)' at line 1
 explain select * from t1 where MATCH(a,b) AGAINST ("collections");
@@ -118,13 +118,13 @@
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where (match `test`.`t1`.`a`,`test`.`t1`.`b` against ('support -collections' in boolean mode))
 select * from t1 where MATCH(a,b) AGAINST("support  collections" IN BOOLEAN MODE);
 a	b
-Only MyISAM tables	support collections
-MySQL has now support	for full-text search
 Full-text indexes	are called collections
+MySQL has now support	for full-text search
+Only MyISAM tables	support collections
 select * from t1 where MATCH(a,b) AGAINST("support +collections" IN BOOLEAN MODE);
 a	b
-Only MyISAM tables	support collections
 Full-text indexes	are called collections
+Only MyISAM tables	support collections
 select * from t1 where MATCH(a,b) AGAINST("sear*" IN BOOLEAN MODE);
 a	b
 MySQL has now support	for full-text search
@@ -464,14 +464,14 @@
 PREPARE stmt from "SELECT a, FORMAT(MATCH(a) AGAINST('test1 test'),6) FROM t1 WHERE MATCH(a) AGAINST('test1 test')";
 EXECUTE stmt;
 a	FORMAT(MATCH(a) AGAINST('test1 test'),6)
-test1	0.227645
 test	0.031008
 test	0.031008
+test1	0.227645
 EXECUTE stmt;
 a	FORMAT(MATCH(a) AGAINST('test1 test'),6)
-test1	0.227645
 test	0.031008
 test	0.031008
+test1	0.227645
 DEALLOCATE PREPARE stmt;
 DROP TABLE t1;
 CREATE TABLE t1 (a VARCHAR(255), FULLTEXT(a)) ENGINE = InnoDB;
@@ -692,3 +692,17 @@
 DEALLOCATE PREPARE stmt;
 DROP TABLE t1;
 End of 5.1 tests
+#
+# Bug#33041720: REDUNDANT CALL TO INIT_FTFUNCS() IN MULTI-TABLE DELETE
+#
+CREATE TABLE t1 (id INTEGER);
+CREATE TABLE t2 (id INTEGER, x VARCHAR(10), FULLTEXT(x));
+INSERT INTO t1 VALUES (1), (2), (3), (4), (5);
+INSERT INTO t2 VALUES (1, 'abc'), (2, 'xyz'), (3, 'abc def'), (4, NULL);
+DELETE t1 FROM t1, t2 WHERE t1.id = t2.id AND MATCH (t2.x) AGAINST ('abc');
+SELECT * FROM t1;
+id
+2
+4
+5
+DROP TABLE t1, t2;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/hypergraph_optimizer.result mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/hypergraph_optimizer.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/hypergraph_optimizer.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/hypergraph_optimizer.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,99 @@
+CREATE TABLE t(x VARCHAR(100), FULLTEXT KEY (x));
+INSERT INTO t VALUES ('abc'), ('xyz'), (NULL), ('abc abc'), ('abc xyz');
+ANALYZE TABLE t;
+Table	Op	Msg_type	Msg_text
+test.t	analyze	status	OK
+SELECT a.x, MATCH (a.x) AGAINST ('abc') AS score_a,
+b.x, MATCH (b.x) AGAINST ('xyz') AS score_b
+FROM t a, t b WHERE a.x = b.x;
+x	score_a	x	score_b
+abc	0.0492168664932251	abc	0
+abc abc	0.0984337329864502	abc abc	0
+abc xyz	0.0492168664932251	abc xyz	0.15835624933242798
+xyz	0	xyz	0.15835624933242798
+SELECT x, MATCH (x) AGAINST ('abc') AS score FROM t
+WHERE MATCH (x) AGAINST ('abc') > NULL;
+x	score
+SELECT x, MATCH (x) AGAINST ('abc') AS score FROM t
+WHERE MATCH (x) AGAINST ('abc')
+AND MATCH (x) AGAINST ('abc') > 0.05;
+x	score
+abc abc	0.0984337329864502
+SELECT x, MATCH (x) AGAINST ('abc') AS score FROM t
+WHERE MATCH (x) AGAINST ('abc') > 0.05
+AND MATCH (x) AGAINST ('abc');
+x	score
+abc abc	0.0984337329864502
+SELECT x, MATCH (x) AGAINST ('abc') AS score FROM t GROUP BY x;
+x	score
+NULL	0
+abc	0.0492168664932251
+abc abc	0.0984337329864502
+abc xyz	0.0492168664932251
+xyz	0
+SELECT x, MATCH (x) AGAINST ('abc') AS score FROM t GROUP BY x, score;
+x	score
+NULL	0
+abc	0.0492168664932251
+abc abc	0.0984337329864502
+abc xyz	0.0492168664932251
+xyz	0
+SELECT MATCH (x) AGAINST ('abc') AS score FROM t GROUP BY score;
+score
+0
+0.0492168664932251
+0.0984337329864502
+SELECT x, MATCH (x) AGAINST ('abc')+1 AS score FROM t GROUP BY x;
+x	score
+NULL	1
+abc	1.049216866493225
+abc abc	1.0984337329864502
+abc xyz	1.049216866493225
+xyz	1
+SELECT x, CONCAT(MATCH (x) AGAINST ('abc'), MAX(x)) AS score FROM t GROUP BY x;
+x	score
+NULL	NULL
+abc	0.0492168664932251abc
+abc abc	0.0984337329864502abc abc
+abc xyz	0.0492168664932251abc xyz
+xyz	0xyz
+SELECT x FROM t GROUP BY x HAVING MATCH (x) AGAINST ('abc');
+x
+abc
+abc abc
+abc xyz
+SELECT x FROM t GROUP BY x HAVING MATCH (x) AGAINST ('abc') > 0;
+x
+abc
+abc abc
+abc xyz
+SELECT MATCH (x) AGAINST ('abc') AS score FROM t
+GROUP BY score WITH ROLLUP HAVING score > 0;
+score
+0.0492168664932251
+0.0984337329864502
+SELECT MATCH (x) AGAINST ('abc') AS score FROM t
+GROUP BY score WITH ROLLUP HAVING score > 0 OR score IS NULL;
+score
+0.0492168664932251
+0.0984337329864502
+NULL
+SELECT MATCH (x) AGAINST ('abc') AS score, x FROM t
+GROUP BY x WITH ROLLUP ORDER BY score, x;
+score	x
+0	NULL
+0	NULL
+0	xyz
+0.0492168664932251	abc
+0.0492168664932251	abc xyz
+0.0984337329864502	abc abc
+SELECT ANY_VALUE(x), MATCH (x) AGAINST ('abc') AS score
+FROM t
+WHERE x IN ('abc', 'abc abc', 'xyz')
+GROUP BY score
+ORDER BY score;
+ANY_VALUE(x)	score
+xyz	0
+abc	0.0492168664932251
+abc abc	0.0984337329864502
+DROP TABLE t;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/mecab_sjis.result mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/mecab_sjis.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/mecab_sjis.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/mecab_sjis.result	2021-09-28 11:46:34.000000000 +0000
@@ -5,9 +5,9 @@
 SHOW STATUS LIKE 'mecab_charset';
 Variable_name	Value
 mecab_charset	sjis
-SET NAMES utf8;
+SET NAMES utf8mb3;
 Warnings:
-Warning	3719	'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous.
+Warning	1287	'utf8mb3' is deprecated and will be removed in a future release. Please use utf8mb4 instead
 CREATE TABLE page (
 page_id int(8) unsigned NOT NULL AUTO_INCREMENT,
 page_title varchar(255) CHARACTER SET sjis NOT NULL DEFAULT '',
@@ -29,7 +29,8 @@
 (10,'ツル'),
 (11,'鉄�');
 SET GLOBAL innodb_ft_aux_table="test/page";
-SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE
+ORDER BY WORD, DOC_ID, POSITION;
 WORD	FIRST_DOC_ID	LAST_DOC_ID	DOC_COUNT	DOC_ID	POSITION
 100	7	8	2	7	4
 100	7	8	2	8	0
@@ -128,16 +129,15 @@
 Warning	1681	Integer display width is deprecated and will be removed in a future release.
 INSERT INTO page VALUES (1,'日本');
 CREATE FULLTEXT INDEX ft_idx ON page(page_title) WITH PARSER mecab;
-Warnings:
-Warning	124	InnoDB rebuilding table to add column FTS_DOC_ID
-SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE;
+ERROR HY000: Fulltext index charset 'big5' doesn't match mecab charset 'sjis'.
+SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE
+ORDER BY WORD, DOC_ID, POSITION;
 WORD	FIRST_DOC_ID	LAST_DOC_ID	DOC_COUNT	DOC_ID	POSITION
 SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_TABLE;
 WORD	FIRST_DOC_ID	LAST_DOC_ID	DOC_COUNT	DOC_ID	POSITION
 INSERT INTO page VALUES (2,'日本');
-ERROR HY000: Fulltext index charset 'big5' doesn't match mecab charset 'sjis'.
 SELECT * FROM page WHERE MATCH(page_title) AGAINST('日本');
-ERROR HY000: Fulltext index charset 'big5' doesn't match mecab charset 'sjis'.
+ERROR HY000: Can't find FULLTEXT index matching the column list
 DROP TABLE page;
 CREATE TABLE page (
 page_id int(8) unsigned NOT NULL AUTO_INCREMENT,
@@ -152,13 +152,14 @@
 (2,'鉄�ⅹ'),
 (3,'鉄�ⅴ100電車');
 SET GLOBAL innodb_ft_aux_table="test/page";
-SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE
+ORDER BY WORD, DOC_ID, POSITION;
 WORD	FIRST_DOC_ID	LAST_DOC_ID	DOC_COUNT	DOC_ID	POSITION
+â…´100	4	4	1	4	4
 鉄�	3	4	2	3	0
 鉄�	3	4	2	4	0
 電車	4	4	1	4	9
 ﾚﾓﾅ	2	2	1	2	2
-â…´100	4	4	1	4	4
 SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_TABLE;
 WORD	FIRST_DOC_ID	LAST_DOC_ID	DOC_COUNT	DOC_ID	POSITION
 SHOW CREATE TABLE page;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/mecab_ujis.result mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/mecab_ujis.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/mecab_ujis.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/mecab_ujis.result	2021-09-28 11:46:34.000000000 +0000
@@ -5,9 +5,9 @@
 SHOW STATUS LIKE 'mecab_charset';
 Variable_name	Value
 mecab_charset	ujis
-SET NAMES utf8;
+SET NAMES utf8mb3;
 Warnings:
-Warning	3719	'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous.
+Warning	1287	'utf8mb3' is deprecated and will be removed in a future release. Please use utf8mb4 instead
 CREATE TABLE page (
 page_id int(8) unsigned NOT NULL AUTO_INCREMENT,
 page_title varchar(255) CHARACTER SET ujis NOT NULL DEFAULT '',
@@ -29,14 +29,14 @@
 (10,'ツル'),
 (11,'鉄�');
 SET GLOBAL innodb_ft_aux_table="test/page";
-SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE
+ORDER BY WORD, DOC_ID, POSITION;
 WORD	FIRST_DOC_ID	LAST_DOC_ID	DOC_COUNT	DOC_ID	POSITION
 100	7	8	2	7	4
 100	7	8	2	8	0
 sd	3	3	1	3	0
 sibley	10	10	1	10	8
 _(	10	10	1	10	6
-ﾚﾓﾅ	2	2	1	2	0
 キム	6	6	1	6	0
 システム	5	5	1	5	16
 ツル	10	11	2	10	0
@@ -49,6 +49,7 @@
 鉄�	7	12	2	7	0
 鉄�	7	12	2	12	0
 電車	7	7	1	7	7
+ﾚﾓﾅ	2	2	1	2	0
 SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_TABLE;
 WORD	FIRST_DOC_ID	LAST_DOC_ID	DOC_COUNT	DOC_ID	POSITION
 SHOW CREATE TABLE page;
@@ -128,16 +129,15 @@
 Warning	1681	Integer display width is deprecated and will be removed in a future release.
 INSERT INTO page VALUES (1,'日本');
 CREATE FULLTEXT INDEX ft_idx ON page(page_title) WITH PARSER mecab;
-Warnings:
-Warning	124	InnoDB rebuilding table to add column FTS_DOC_ID
-SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE;
+ERROR HY000: Fulltext index charset 'big5' doesn't match mecab charset 'ujis'.
+SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE
+ORDER BY WORD, DOC_ID, POSITION;
 WORD	FIRST_DOC_ID	LAST_DOC_ID	DOC_COUNT	DOC_ID	POSITION
 SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_TABLE;
 WORD	FIRST_DOC_ID	LAST_DOC_ID	DOC_COUNT	DOC_ID	POSITION
 INSERT INTO page VALUES (2,'日本');
-ERROR HY000: Fulltext index charset 'big5' doesn't match mecab charset 'ujis'.
 SELECT * FROM page WHERE MATCH(page_title) AGAINST('日本');
-ERROR HY000: Fulltext index charset 'big5' doesn't match mecab charset 'ujis'.
+ERROR HY000: Can't find FULLTEXT index matching the column list
 DROP TABLE page;
 CREATE TABLE page (
 page_id int(8) unsigned NOT NULL AUTO_INCREMENT,
@@ -152,13 +152,14 @@
 (2,'鉄�ⅹ'),
 (3,'鉄�ⅴ100電車');
 SET GLOBAL innodb_ft_aux_table="test/page";
-SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE
+ORDER BY WORD, DOC_ID, POSITION;
 WORD	FIRST_DOC_ID	LAST_DOC_ID	DOC_COUNT	DOC_ID	POSITION
 100	4	4	1	4	7
-ﾚﾓﾅ	2	2	1	2	3
 鉄�	3	4	2	3	0
 鉄�	3	4	2	4	0
 電車	4	4	1	4	10
+ﾚﾓﾅ	2	2	1	2	3
 SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_TABLE;
 WORD	FIRST_DOC_ID	LAST_DOC_ID	DOC_COUNT	DOC_ID	POSITION
 SHOW CREATE TABLE page;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/mecab_utf8mb3.result mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/mecab_utf8mb3.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/mecab_utf8mb3.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/mecab_utf8mb3.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,194 @@
+call mtr.add_suppression("unknown variable 'loose_mecab_rc_file");
+call mtr.add_suppression("Fulltext index charset 'big5' doesn't match mecab charset");
+call mtr.add_suppression("Mecab: createModel.* failed: param.cpp");
+call mtr.add_suppression("Plugin 'mecab' init function returned error");
+SHOW STATUS LIKE 'mecab_charset';
+Variable_name	Value
+mecab_charset	utf8mb4
+SET NAMES utf8mb3;
+Warnings:
+Warning	1287	'utf8mb3' is deprecated and will be removed in a future release. Please use utf8mb4 instead
+CREATE TABLE page (
+page_id int(8) unsigned NOT NULL AUTO_INCREMENT,
+page_title varchar(255) CHARACTER SET utf8mb3 NOT NULL DEFAULT '',
+PRIMARY KEY (page_id),
+FULLTEXT KEY page_title (page_title) WITH PARSER mecab
+) ENGINE=InnoDB;
+Warnings:
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1287	'utf8mb3' is deprecated and will be removed in a future release. Please use utf8mb4 instead
+INSERT INTO page VALUES
+(1,'ﾚﾓﾅ'),
+(2,'SDレモナ'),
+(3,'レモナ'),
+(4,'データベース管�システム'),
+(5,'キム'),
+(6,'鉄�100電車'),
+(7,'100'),
+(8,'ラフィタ・カスティージョ'),
+(9,'ツル科_(Sibley)'),
+(10,'ツル'),
+(11,'鉄�');
+SET GLOBAL innodb_ft_aux_table="test/page";
+SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE
+ORDER BY WORD, DOC_ID, POSITION;
+WORD	FIRST_DOC_ID	LAST_DOC_ID	DOC_COUNT	DOC_ID	POSITION
+100	7	8	2	7	6
+100	7	8	2	8	0
+sd	3	3	1	3	0
+sibley	10	10	1	10	11
+_(	10	10	1	10	9
+キム	6	6	1	6	0
+システム	5	5	1	5	24
+ツル	10	11	2	10	0
+ツル	10	11	2	11	0
+データベース	5	5	1	5	0
+ラフィタ・カスティージョ	9	9	1	9	0
+レモナ	3	4	2	3	2
+レモナ	3	4	2	4	0
+管�	5	5	1	5	18
+鉄�	7	12	2	7	0
+鉄�	7	12	2	12	0
+電車	7	7	1	7	9
+ﾚﾓﾅ	2	2	1	2	0
+SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_TABLE;
+WORD	FIRST_DOC_ID	LAST_DOC_ID	DOC_COUNT	DOC_ID	POSITION
+SHOW CREATE TABLE page;
+Table	Create Table
+page	CREATE TABLE `page` (
+  `page_id` int unsigned NOT NULL AUTO_INCREMENT,
+  `page_title` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '',
+  PRIMARY KEY (`page_id`),
+  FULLTEXT KEY `page_title` (`page_title`) /*!50100 WITH PARSER `mecab` */ 
+) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+SELECT * FROM page WHERE MATCH(page_title) AGAINST("ﾚﾓﾅ" IN BOOLEAN MODE);
+page_id	page_title
+1	ﾚﾓﾅ
+SELECT * FROM page WHERE MATCH(page_title) AGAINST("キムショウカン" IN BOOLEAN MODE);
+page_id	page_title
+SELECT * FROM page WHERE MATCH(page_title) AGAINST("100" IN BOOLEAN MODE);
+page_id	page_title
+6	鉄�100電車
+7	100
+SELECT * FROM page WHERE MATCH(page_title) AGAINST("ツル*" IN BOOLEAN MODE);
+page_id	page_title
+9	ツル科_(Sibley)
+10	ツル
+SELECT * FROM page WHERE MATCH(page_title) AGAINST("ラフィタ・カスティージョ");
+page_id	page_title
+8	ラフィタ・カスティージョ
+SELECT * FROM page WHERE MATCH(page_title) AGAINST("ラフィタ・カスティージョ" IN BOOLEAN MODE);
+page_id	page_title
+SELECT * FROM page WHERE MATCH(page_title) AGAINST("+ラフィタ・カスティージョ +データベース" IN BOOLEAN MODE);
+page_id	page_title
+SELECT * FROM page WHERE MATCH(page_title) AGAINST("+ラフィタ・カスティージョ +(データベース)" IN BOOLEAN MODE);
+page_id	page_title
+SELECT * FROM page WHERE MATCH(page_title) AGAINST("-ラフィタ・カスティージョ +(データベース)" IN BOOLEAN MODE);
+page_id	page_title
+4	データベース管�システム
+SELECT * FROM page WHERE MATCH(page_title) AGAINST("ラフィタ・カスティージョ 鉄�" IN BOOLEAN MODE);
+page_id	page_title
+6	鉄�100電車
+11	鉄�
+SELECT * FROM page WHERE MATCH(page_title) AGAINST("<ラフィタ・カスティージョ >鉄�" IN BOOLEAN MODE);
+page_id	page_title
+6	鉄�100電車
+11	鉄�
+SELECT * FROM page WHERE MATCH(page_title) AGAINST('鉄�');
+page_id	page_title
+6	鉄�100電車
+11	鉄�
+SELECT * FROM page WHERE MATCH(page_title) AGAINST('鉄�' WITH QUERY EXPANSION);
+page_id	page_title
+6	鉄�100電車
+7	100
+11	鉄�
+ALTER TABLE page add column c1 varchar(100) CHARACTER SET utf8mb3 DEFAULT 'ﾚﾓﾅ';
+Warnings:
+Warning	1287	'utf8mb3' is deprecated and will be removed in a future release. Please use utf8mb4 instead
+ALTER TABLE page ADD FULLTEXT INDEX idx1 (page_title,c1) WITH PARSER mecab;
+SELECT * FROM page WHERE MATCH(page_title,c1) AGAINST('ﾚﾓﾅ');
+page_id	page_title	c1
+1	ﾚﾓﾅ	ﾚﾓﾅ
+2	SDレモナ	ﾚﾓﾅ
+3	レモナ	ﾚﾓﾅ
+4	データベース管�システム	ﾚﾓﾅ
+5	キム	ﾚﾓﾅ
+6	鉄�100電車	ﾚﾓﾅ
+7	100	ﾚﾓﾅ
+8	ラフィタ・カスティージョ	ﾚﾓﾅ
+9	ツル科_(Sibley)	ﾚﾓﾅ
+10	ツル	ﾚﾓﾅ
+11	鉄�	ﾚﾓﾅ
+SELECT * FROM page WHERE MATCH(page_title,c1) AGAINST('-ﾚﾓﾅ' IN BOOLEAN MODE);
+page_id	page_title	c1
+DROP TABLE page;
+CREATE TABLE page (
+page_id int(8) unsigned NOT NULL AUTO_INCREMENT,
+page_title varchar(255) CHARACTER SET big5 NOT NULL DEFAULT '',
+PRIMARY KEY (page_id)
+)ENGINE=InnoDB;
+Warnings:
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+INSERT INTO page VALUES (1,'日本');
+CREATE FULLTEXT INDEX ft_idx ON page(page_title) WITH PARSER mecab;
+ERROR HY000: Fulltext index charset 'big5' doesn't match mecab charset 'utf8mb4'.
+SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE
+ORDER BY WORD, DOC_ID, POSITION;
+WORD	FIRST_DOC_ID	LAST_DOC_ID	DOC_COUNT	DOC_ID	POSITION
+SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_TABLE;
+WORD	FIRST_DOC_ID	LAST_DOC_ID	DOC_COUNT	DOC_ID	POSITION
+INSERT INTO page VALUES (2,'日本');
+SELECT * FROM page WHERE MATCH(page_title) AGAINST('日本');
+ERROR HY000: Can't find FULLTEXT index matching the column list
+DROP TABLE page;
+SET NAMES utf8mb4;
+CREATE TABLE page (
+page_id int(8) unsigned NOT NULL AUTO_INCREMENT,
+page_title varchar(255) CHARACTER SET utf8mb4 NOT NULL DEFAULT '',
+PRIMARY KEY (page_id),
+FULLTEXT KEY page_title (page_title) WITH PARSER mecab
+) ENGINE=InnoDB;
+Warnings:
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+INSERT INTO page VALUES
+(1,'😃ﾚﾓﾅ'),
+(2,'鉄�😄'),
+(3,'鉄�😊100電車');
+SET GLOBAL innodb_ft_aux_table="test/page";
+SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE
+ORDER BY WORD, DOC_ID, POSITION;
+WORD	FIRST_DOC_ID	LAST_DOC_ID	DOC_COUNT	DOC_ID	POSITION
+100	4	4	1	4	10
+鉄�	3	4	2	3	0
+鉄�	3	4	2	4	0
+電車	4	4	1	4	13
+ﾚﾓﾅ	2	2	1	2	4
+SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_TABLE;
+WORD	FIRST_DOC_ID	LAST_DOC_ID	DOC_COUNT	DOC_ID	POSITION
+SHOW CREATE TABLE page;
+Table	Create Table
+page	CREATE TABLE `page` (
+  `page_id` int unsigned NOT NULL AUTO_INCREMENT,
+  `page_title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '',
+  PRIMARY KEY (`page_id`),
+  FULLTEXT KEY `page_title` (`page_title`) /*!50100 WITH PARSER `mecab` */ 
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+SELECT * FROM page WHERE MATCH(page_title) AGAINST("ﾚﾓﾅ" IN BOOLEAN MODE);
+page_id	page_title
+1	😃ﾚﾓﾅ
+SELECT * FROM page WHERE MATCH(page_title) AGAINST('鉄�');
+page_id	page_title
+2	鉄�😄
+3	鉄�😊100電車
+SELECT * FROM page WHERE MATCH(page_title) AGAINST('鉄�😄');
+page_id	page_title
+2	鉄�😄
+3	鉄�😊100電車
+SELECT * FROM page WHERE MATCH(page_title) AGAINST('鉄�' WITH QUERY EXPANSION);
+page_id	page_title
+3	鉄�😊100電車
+2	鉄�😄
+DROP TABLE page;
+SET GLOBAL innodb_ft_aux_table=default;
+UNINSTALL PLUGIN mecab;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/mecab_utf8mb4.result mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/mecab_utf8mb4.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/mecab_utf8mb4.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/mecab_utf8mb4.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,193 @@
+call mtr.add_suppression("unknown variable 'loose_mecab_rc_file");
+call mtr.add_suppression("Fulltext index charset 'big5' doesn't match mecab charset");
+call mtr.add_suppression("Mecab: createModel.* failed: param.cpp");
+call mtr.add_suppression("Plugin 'mecab' init function returned error");
+SHOW STATUS LIKE 'mecab_charset';
+Variable_name	Value
+mecab_charset	utf8mb4
+SET NAMES utf8mb3;
+Warnings:
+Warning	1287	'utf8mb3' is deprecated and will be removed in a future release. Please use utf8mb4 instead
+CREATE TABLE page (
+page_id int(8) unsigned NOT NULL AUTO_INCREMENT,
+page_title varchar(255) CHARACTER SET utf8mb4 NOT NULL DEFAULT '',
+PRIMARY KEY (page_id),
+FULLTEXT KEY page_title (page_title) WITH PARSER mecab
+) ENGINE=InnoDB;
+Warnings:
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+INSERT INTO page VALUES
+(1,'ﾚﾓﾅ'),
+(2,'SDレモナ'),
+(3,'レモナ'),
+(4,'データベース管�システム'),
+(5,'キム'),
+(6,'鉄�100電車'),
+(7,'100'),
+(8,'ラフィタ・カスティージョ'),
+(9,'ツル科_(Sibley)'),
+(10,'ツル'),
+(11,'鉄�');
+SET GLOBAL innodb_ft_aux_table="test/page";
+SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE
+ORDER BY WORD, DOC_ID, POSITION;
+WORD	FIRST_DOC_ID	LAST_DOC_ID	DOC_COUNT	DOC_ID	POSITION
+100	7	8	2	7	6
+100	7	8	2	8	0
+sd	3	3	1	3	0
+sibley	10	10	1	10	11
+_(	10	10	1	10	9
+キム	6	6	1	6	0
+システム	5	5	1	5	24
+ツル	10	11	2	10	0
+ツル	10	11	2	11	0
+データベース	5	5	1	5	0
+ラフィタ・カスティージョ	9	9	1	9	0
+管�	5	5	1	5	18
+鉄�	7	12	2	7	0
+鉄�	7	12	2	12	0
+電車	7	7	1	7	9
+ﾚﾓﾅ	2	4	3	2	0
+ﾚﾓﾅ	2	4	3	3	2
+ﾚﾓﾅ	2	4	3	4	0
+SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_TABLE;
+WORD	FIRST_DOC_ID	LAST_DOC_ID	DOC_COUNT	DOC_ID	POSITION
+SHOW CREATE TABLE page;
+Table	Create Table
+page	CREATE TABLE `page` (
+  `page_id` int unsigned NOT NULL AUTO_INCREMENT,
+  `page_title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '',
+  PRIMARY KEY (`page_id`),
+  FULLTEXT KEY `page_title` (`page_title`) /*!50100 WITH PARSER `mecab` */ 
+) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+SELECT * FROM page WHERE MATCH(page_title) AGAINST("ﾚﾓﾅ" IN BOOLEAN MODE);
+page_id	page_title
+1	ﾚﾓﾅ
+2	SDレモナ
+3	レモナ
+SELECT * FROM page WHERE MATCH(page_title) AGAINST("キムショウカン" IN BOOLEAN MODE);
+page_id	page_title
+SELECT * FROM page WHERE MATCH(page_title) AGAINST("100" IN BOOLEAN MODE);
+page_id	page_title
+6	鉄�100電車
+7	100
+SELECT * FROM page WHERE MATCH(page_title) AGAINST("ツル*" IN BOOLEAN MODE);
+page_id	page_title
+9	ツル科_(Sibley)
+10	ツル
+SELECT * FROM page WHERE MATCH(page_title) AGAINST("ラフィタ・カスティージョ");
+page_id	page_title
+8	ラフィタ・カスティージョ
+SELECT * FROM page WHERE MATCH(page_title) AGAINST("ラフィタ・カスティージョ" IN BOOLEAN MODE);
+page_id	page_title
+SELECT * FROM page WHERE MATCH(page_title) AGAINST("+ラフィタ・カスティージョ +データベース" IN BOOLEAN MODE);
+page_id	page_title
+SELECT * FROM page WHERE MATCH(page_title) AGAINST("+ラフィタ・カスティージョ +(データベース)" IN BOOLEAN MODE);
+page_id	page_title
+SELECT * FROM page WHERE MATCH(page_title) AGAINST("-ラフィタ・カスティージョ +(データベース)" IN BOOLEAN MODE);
+page_id	page_title
+4	データベース管�システム
+SELECT * FROM page WHERE MATCH(page_title) AGAINST("ラフィタ・カスティージョ 鉄�" IN BOOLEAN MODE);
+page_id	page_title
+6	鉄�100電車
+11	鉄�
+SELECT * FROM page WHERE MATCH(page_title) AGAINST("<ラフィタ・カスティージョ >鉄�" IN BOOLEAN MODE);
+page_id	page_title
+6	鉄�100電車
+11	鉄�
+SELECT * FROM page WHERE MATCH(page_title) AGAINST('鉄�');
+page_id	page_title
+6	鉄�100電車
+11	鉄�
+SELECT * FROM page WHERE MATCH(page_title) AGAINST('鉄�' WITH QUERY EXPANSION);
+page_id	page_title
+6	鉄�100電車
+7	100
+11	鉄�
+ALTER TABLE page add column c1 varchar(100) CHARACTER SET utf8mb4 DEFAULT 'ﾚﾓﾅ';
+ALTER TABLE page ADD FULLTEXT INDEX idx1 (page_title,c1) WITH PARSER mecab;
+SELECT * FROM page WHERE MATCH(page_title,c1) AGAINST('ﾚﾓﾅ');
+page_id	page_title	c1
+1	ﾚﾓﾅ	ﾚﾓﾅ
+2	SDレモナ	ﾚﾓﾅ
+3	レモナ	ﾚﾓﾅ
+4	データベース管�システム	ﾚﾓﾅ
+5	キム	ﾚﾓﾅ
+6	鉄�100電車	ﾚﾓﾅ
+7	100	ﾚﾓﾅ
+8	ラフィタ・カスティージョ	ﾚﾓﾅ
+9	ツル科_(Sibley)	ﾚﾓﾅ
+10	ツル	ﾚﾓﾅ
+11	鉄�	ﾚﾓﾅ
+SELECT * FROM page WHERE MATCH(page_title,c1) AGAINST('-ﾚﾓﾅ' IN BOOLEAN MODE);
+page_id	page_title	c1
+DROP TABLE page;
+CREATE TABLE page (
+page_id int(8) unsigned NOT NULL AUTO_INCREMENT,
+page_title varchar(255) CHARACTER SET big5 NOT NULL DEFAULT '',
+PRIMARY KEY (page_id)
+)ENGINE=InnoDB;
+Warnings:
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+INSERT INTO page VALUES (1,'日本');
+CREATE FULLTEXT INDEX ft_idx ON page(page_title) WITH PARSER mecab;
+ERROR HY000: Fulltext index charset 'big5' doesn't match mecab charset 'utf8mb4'.
+SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE
+ORDER BY WORD, DOC_ID, POSITION;
+WORD	FIRST_DOC_ID	LAST_DOC_ID	DOC_COUNT	DOC_ID	POSITION
+SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_TABLE;
+WORD	FIRST_DOC_ID	LAST_DOC_ID	DOC_COUNT	DOC_ID	POSITION
+INSERT INTO page VALUES (2,'日本');
+SELECT * FROM page WHERE MATCH(page_title) AGAINST('日本');
+ERROR HY000: Can't find FULLTEXT index matching the column list
+DROP TABLE page;
+SET NAMES utf8mb4;
+CREATE TABLE page (
+page_id int(8) unsigned NOT NULL AUTO_INCREMENT,
+page_title varchar(255) CHARACTER SET utf8mb4 NOT NULL DEFAULT '',
+PRIMARY KEY (page_id),
+FULLTEXT KEY page_title (page_title) WITH PARSER mecab
+) ENGINE=InnoDB;
+Warnings:
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+INSERT INTO page VALUES
+(1,'😃ﾚﾓﾅ'),
+(2,'鉄�😄'),
+(3,'鉄�😊100電車');
+SET GLOBAL innodb_ft_aux_table="test/page";
+SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE
+ORDER BY WORD, DOC_ID, POSITION;
+WORD	FIRST_DOC_ID	LAST_DOC_ID	DOC_COUNT	DOC_ID	POSITION
+100	4	4	1	4	10
+鉄�	3	4	2	3	0
+鉄�	3	4	2	4	0
+電車	4	4	1	4	13
+ﾚﾓﾅ	2	2	1	2	4
+SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_TABLE;
+WORD	FIRST_DOC_ID	LAST_DOC_ID	DOC_COUNT	DOC_ID	POSITION
+SHOW CREATE TABLE page;
+Table	Create Table
+page	CREATE TABLE `page` (
+  `page_id` int unsigned NOT NULL AUTO_INCREMENT,
+  `page_title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '',
+  PRIMARY KEY (`page_id`),
+  FULLTEXT KEY `page_title` (`page_title`) /*!50100 WITH PARSER `mecab` */ 
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+SELECT * FROM page WHERE MATCH(page_title) AGAINST("ﾚﾓﾅ" IN BOOLEAN MODE);
+page_id	page_title
+1	😃ﾚﾓﾅ
+SELECT * FROM page WHERE MATCH(page_title) AGAINST('鉄�');
+page_id	page_title
+2	鉄�😄
+3	鉄�😊100電車
+SELECT * FROM page WHERE MATCH(page_title) AGAINST('鉄�😄');
+page_id	page_title
+2	鉄�😄
+3	鉄�😊100電車
+SELECT * FROM page WHERE MATCH(page_title) AGAINST('鉄�' WITH QUERY EXPANSION);
+page_id	page_title
+3	鉄�😊100電車
+2	鉄�😄
+DROP TABLE page;
+SET GLOBAL innodb_ft_aux_table=default;
+UNINSTALL PLUGIN mecab;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/mecab_utf8.result mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/mecab_utf8.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/mecab_utf8.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/mecab_utf8.result	1970-01-01 00:00:00.000000000 +0000
@@ -1,193 +0,0 @@
-call mtr.add_suppression("unknown variable 'loose_mecab_rc_file");
-call mtr.add_suppression("Fulltext index charset 'big5' doesn't match mecab charset");
-call mtr.add_suppression("Mecab: createModel.* failed: param.cpp");
-call mtr.add_suppression("Plugin 'mecab' init function returned error");
-SHOW STATUS LIKE 'mecab_charset';
-Variable_name	Value
-mecab_charset	utf8
-SET NAMES utf8;
-Warnings:
-Warning	3719	'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous.
-CREATE TABLE page (
-page_id int(8) unsigned NOT NULL AUTO_INCREMENT,
-page_title varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '',
-PRIMARY KEY (page_id),
-FULLTEXT KEY page_title (page_title) WITH PARSER mecab
-) ENGINE=InnoDB;
-Warnings:
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-Warning	3719	'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous.
-INSERT INTO page VALUES
-(1,'ﾚﾓﾅ'),
-(2,'SDレモナ'),
-(3,'レモナ'),
-(4,'データベース管�システム'),
-(5,'キム'),
-(6,'鉄�100電車'),
-(7,'100'),
-(8,'ラフィタ・カスティージョ'),
-(9,'ツル科_(Sibley)'),
-(10,'ツル'),
-(11,'鉄�');
-SET GLOBAL innodb_ft_aux_table="test/page";
-SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE;
-WORD	FIRST_DOC_ID	LAST_DOC_ID	DOC_COUNT	DOC_ID	POSITION
-100	7	8	2	7	6
-100	7	8	2	8	0
-sd	3	3	1	3	0
-sibley	10	10	1	10	11
-_(	10	10	1	10	9
-キム	6	6	1	6	0
-システム	5	5	1	5	24
-ツル	10	11	2	10	0
-ツル	10	11	2	11	0
-データベース	5	5	1	5	0
-ラフィタ・カスティージョ	9	9	1	9	0
-レモナ	3	4	2	3	2
-レモナ	3	4	2	4	0
-管�	5	5	1	5	18
-鉄�	7	12	2	7	0
-鉄�	7	12	2	12	0
-電車	7	7	1	7	9
-ﾚﾓﾅ	2	2	1	2	0
-SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_TABLE;
-WORD	FIRST_DOC_ID	LAST_DOC_ID	DOC_COUNT	DOC_ID	POSITION
-SHOW CREATE TABLE page;
-Table	Create Table
-page	CREATE TABLE `page` (
-  `page_id` int unsigned NOT NULL AUTO_INCREMENT,
-  `page_title` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '',
-  PRIMARY KEY (`page_id`),
-  FULLTEXT KEY `page_title` (`page_title`) /*!50100 WITH PARSER `mecab` */ 
-) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
-SELECT * FROM page WHERE MATCH(page_title) AGAINST("ﾚﾓﾅ" IN BOOLEAN MODE);
-page_id	page_title
-1	ﾚﾓﾅ
-SELECT * FROM page WHERE MATCH(page_title) AGAINST("キムショウカン" IN BOOLEAN MODE);
-page_id	page_title
-SELECT * FROM page WHERE MATCH(page_title) AGAINST("100" IN BOOLEAN MODE);
-page_id	page_title
-6	鉄�100電車
-7	100
-SELECT * FROM page WHERE MATCH(page_title) AGAINST("ツル*" IN BOOLEAN MODE);
-page_id	page_title
-9	ツル科_(Sibley)
-10	ツル
-SELECT * FROM page WHERE MATCH(page_title) AGAINST("ラフィタ・カスティージョ");
-page_id	page_title
-8	ラフィタ・カスティージョ
-SELECT * FROM page WHERE MATCH(page_title) AGAINST("ラフィタ・カスティージョ" IN BOOLEAN MODE);
-page_id	page_title
-SELECT * FROM page WHERE MATCH(page_title) AGAINST("+ラフィタ・カスティージョ +データベース" IN BOOLEAN MODE);
-page_id	page_title
-SELECT * FROM page WHERE MATCH(page_title) AGAINST("+ラフィタ・カスティージョ +(データベース)" IN BOOLEAN MODE);
-page_id	page_title
-SELECT * FROM page WHERE MATCH(page_title) AGAINST("-ラフィタ・カスティージョ +(データベース)" IN BOOLEAN MODE);
-page_id	page_title
-4	データベース管�システム
-SELECT * FROM page WHERE MATCH(page_title) AGAINST("ラフィタ・カスティージョ 鉄�" IN BOOLEAN MODE);
-page_id	page_title
-6	鉄�100電車
-11	鉄�
-SELECT * FROM page WHERE MATCH(page_title) AGAINST("<ラフィタ・カスティージョ >鉄�" IN BOOLEAN MODE);
-page_id	page_title
-6	鉄�100電車
-11	鉄�
-SELECT * FROM page WHERE MATCH(page_title) AGAINST('鉄�');
-page_id	page_title
-6	鉄�100電車
-11	鉄�
-SELECT * FROM page WHERE MATCH(page_title) AGAINST('鉄�' WITH QUERY EXPANSION);
-page_id	page_title
-6	鉄�100電車
-7	100
-11	鉄�
-ALTER TABLE page add column c1 varchar(100) CHARACTER SET utf8 DEFAULT 'ﾚﾓﾅ';
-Warnings:
-Warning	3719	'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous.
-ALTER TABLE page ADD FULLTEXT INDEX idx1 (page_title,c1) WITH PARSER mecab;
-SELECT * FROM page WHERE MATCH(page_title,c1) AGAINST('ﾚﾓﾅ');
-page_id	page_title	c1
-1	ﾚﾓﾅ	ﾚﾓﾅ
-2	SDレモナ	ﾚﾓﾅ
-3	レモナ	ﾚﾓﾅ
-4	データベース管�システム	ﾚﾓﾅ
-5	キム	ﾚﾓﾅ
-6	鉄�100電車	ﾚﾓﾅ
-7	100	ﾚﾓﾅ
-8	ラフィタ・カスティージョ	ﾚﾓﾅ
-9	ツル科_(Sibley)	ﾚﾓﾅ
-10	ツル	ﾚﾓﾅ
-11	鉄�	ﾚﾓﾅ
-SELECT * FROM page WHERE MATCH(page_title,c1) AGAINST('-ﾚﾓﾅ' IN BOOLEAN MODE);
-page_id	page_title	c1
-DROP TABLE page;
-CREATE TABLE page (
-page_id int(8) unsigned NOT NULL AUTO_INCREMENT,
-page_title varchar(255) CHARACTER SET big5 NOT NULL DEFAULT '',
-PRIMARY KEY (page_id)
-)ENGINE=InnoDB;
-Warnings:
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-INSERT INTO page VALUES (1,'日本');
-CREATE FULLTEXT INDEX ft_idx ON page(page_title) WITH PARSER mecab;
-Warnings:
-Warning	124	InnoDB rebuilding table to add column FTS_DOC_ID
-SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE;
-WORD	FIRST_DOC_ID	LAST_DOC_ID	DOC_COUNT	DOC_ID	POSITION
-SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_TABLE;
-WORD	FIRST_DOC_ID	LAST_DOC_ID	DOC_COUNT	DOC_ID	POSITION
-INSERT INTO page VALUES (2,'日本');
-ERROR HY000: Fulltext index charset 'big5' doesn't match mecab charset 'utf8'.
-SELECT * FROM page WHERE MATCH(page_title) AGAINST('日本');
-ERROR HY000: Fulltext index charset 'big5' doesn't match mecab charset 'utf8'.
-DROP TABLE page;
-SET NAMES utf8mb4;
-CREATE TABLE page (
-page_id int(8) unsigned NOT NULL AUTO_INCREMENT,
-page_title varchar(255) CHARACTER SET utf8mb4 NOT NULL DEFAULT '',
-PRIMARY KEY (page_id),
-FULLTEXT KEY page_title (page_title) WITH PARSER mecab
-) ENGINE=InnoDB;
-Warnings:
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
-INSERT INTO page VALUES
-(1,'😃ﾚﾓﾅ'),
-(2,'鉄�😄'),
-(3,'鉄�😊100電車');
-SET GLOBAL innodb_ft_aux_table="test/page";
-SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE;
-WORD	FIRST_DOC_ID	LAST_DOC_ID	DOC_COUNT	DOC_ID	POSITION
-100	4	4	1	4	10
-ﾚﾓﾅ	2	2	1	2	4
-鉄�	3	4	2	3	0
-鉄�	3	4	2	4	0
-電車	4	4	1	4	13
-SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_TABLE;
-WORD	FIRST_DOC_ID	LAST_DOC_ID	DOC_COUNT	DOC_ID	POSITION
-SHOW CREATE TABLE page;
-Table	Create Table
-page	CREATE TABLE `page` (
-  `page_id` int unsigned NOT NULL AUTO_INCREMENT,
-  `page_title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '',
-  PRIMARY KEY (`page_id`),
-  FULLTEXT KEY `page_title` (`page_title`) /*!50100 WITH PARSER `mecab` */ 
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
-SELECT * FROM page WHERE MATCH(page_title) AGAINST("ﾚﾓﾅ" IN BOOLEAN MODE);
-page_id	page_title
-1	😃ﾚﾓﾅ
-SELECT * FROM page WHERE MATCH(page_title) AGAINST('鉄�');
-page_id	page_title
-2	鉄�😄
-3	鉄�😊100電車
-SELECT * FROM page WHERE MATCH(page_title) AGAINST('鉄�😄');
-page_id	page_title
-2	鉄�😄
-3	鉄�😊100電車
-SELECT * FROM page WHERE MATCH(page_title) AGAINST('鉄�' WITH QUERY EXPANSION);
-page_id	page_title
-3	鉄�😊100電車
-2	鉄�😄
-DROP TABLE page;
-SET GLOBAL innodb_ft_aux_table=default;
-UNINSTALL PLUGIN mecab;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/misc.result mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/misc.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/misc.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/misc.result	2021-09-28 11:46:34.000000000 +0000
@@ -383,19 +383,19 @@
 SELECT id FROM t1 WHERE MATCH (a,b)
 AGAINST ('+MySQL -YourSQL' IN BOOLEAN MODE);
 id
-106
 1
-52
 103
 104
+106
+52
 SELECT id FROM t1 WHERE MATCH (a,b)
 AGAINST ('+MySQL -YourSQL' IN BOOLEAN MODE) AND (a IS NOT NULL OR b IS NOT NULL);
 id
-106
 1
-52
 103
 104
+106
+52
 SELECT id FROM t1 WHERE MATCH (a,b)
 AGAINST ('+MySQL -YourSQL' IN BOOLEAN MODE) AND (a IS NULL AND b IS NOT NULL);
 id
@@ -913,30 +913,30 @@
 6	MySQL Security	When configured properly, MySQL ...	0.000000003771856604828372
 SELECT * FROM articles where  MATCH(title, body) AGAINST ('MySQL - (database - tutorial)' IN BOOLEAN MODE);
 id	title	body
-6	MySQL Security	When configured properly, MySQL ...
 1	MySQL Tutorial	DBMS stands for DataBase ...
 2	How To Use MySQL Well	After you went through a ...
 3	Optimizing MySQL	In this tutorial we will show ...
 4	1001 MySQL Tricks	1. Never run mysqld as root. 2. ...
+6	MySQL Security	When configured properly, MySQL ...
 SELECT * FROM articles where MATCH(title, body) AGAINST ('MySQL - (- tutorial database)' IN BOOLEAN MODE);
 id	title	body
-6	MySQL Security	When configured properly, MySQL ...
 1	MySQL Tutorial	DBMS stands for DataBase ...
 2	How To Use MySQL Well	After you went through a ...
 3	Optimizing MySQL	In this tutorial we will show ...
 4	1001 MySQL Tricks	1. Never run mysqld as root. 2. ...
+6	MySQL Security	When configured properly, MySQL ...
 SELECT * FROM articles where MATCH(title, body) AGAINST ('MySQL - (- tutorial database) -Tricks' IN BOOLEAN MODE);
 id	title	body
-6	MySQL Security	When configured properly, MySQL ...
 1	MySQL Tutorial	DBMS stands for DataBase ...
 2	How To Use MySQL Well	After you went through a ...
 3	Optimizing MySQL	In this tutorial we will show ...
+6	MySQL Security	When configured properly, MySQL ...
 SELECT * FROM articles where MATCH(title, body) AGAINST ('-Tricks MySQL - (- tutorial database)' IN BOOLEAN MODE);
 id	title	body
-6	MySQL Security	When configured properly, MySQL ...
 1	MySQL Tutorial	DBMS stands for DataBase ...
 2	How To Use MySQL Well	After you went through a ...
 3	Optimizing MySQL	In this tutorial we will show ...
+6	MySQL Security	When configured properly, MySQL ...
 DROP TABLE articles;
 drop table if exists t1;
 Warnings:
@@ -1189,12 +1189,12 @@
 SELECT id FROM t1 WHERE MATCH (a,b)
 AGAINST ('MySQL' IN NATURAL LANGUAGE MODE);
 id
-6
 1
 2
 3
 4
 5
+6
 DROP TABLE t1;
 CREATE TABLE `t` (`a` char(20) character set utf8mb4 default null,
 fulltext key (`a`)) ENGINE=INNODB;
@@ -1298,24 +1298,24 @@
 INSERT INTO ift values (4, "-donot--skip-networking");
 SELECT * FROM ift WHERE MATCH (b) AGAINST ('--skip-networking');
 a	b
+1	skip
 2	skip and networking
 3	--skip-networking
 4	-donot--skip-networking
-1	skip
 SELECT * FROM ift WHERE MATCH (b) AGAINST ('skip-networking');
 a	b
+1	skip
 2	skip and networking
 3	--skip-networking
 4	-donot--skip-networking
-1	skip
 SELECT * FROM ift WHERE MATCH (b) AGAINST ('----');
 a	b
 SELECT * FROM ift WHERE MATCH (b) AGAINST ('-donot--skip-networking');
 a	b
-4	-donot--skip-networking
+1	skip
 2	skip and networking
 3	--skip-networking
-1	skip
+4	-donot--skip-networking
 DROP TABLE ift;
 CREATE TABLE articles (
 id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,
@@ -1376,32 +1376,32 @@
 SELECT * FROM t1 WHERE MATCH (a) AGAINST ('("know mysql" good)' IN BOOLEAN MODE);
 id	a
 1	Do you know MySQL is a good database
-4	Do you know MySQL
 2	How to build a good database
+4	Do you know MySQL
 6	Do you feel good
 7	MySQL is good
 8	MySQL is good to know
 SELECT * FROM t1 WHERE MATCH (a) AGAINST ('+("know mysql" good)' IN BOOLEAN MODE);
 id	a
 1	Do you know MySQL is a good database
-4	Do you know MySQL
 2	How to build a good database
+4	Do you know MySQL
 6	Do you feel good
 7	MySQL is good
 8	MySQL is good to know
 SELECT * FROM t1 WHERE MATCH (a) AGAINST ('(good "know mysql")' IN BOOLEAN MODE);
 id	a
 1	Do you know MySQL is a good database
-4	Do you know MySQL
 2	How to build a good database
+4	Do you know MySQL
 6	Do you feel good
 7	MySQL is good
 8	MySQL is good to know
 SELECT * FROM t1 WHERE MATCH (a) AGAINST ('+(good "know mysql")' IN BOOLEAN MODE);
 id	a
 1	Do you know MySQL is a good database
-4	Do you know MySQL
 2	How to build a good database
+4	Do you know MySQL
 6	Do you feel good
 7	MySQL is good
 8	MySQL is good to know
@@ -1553,20 +1553,20 @@
 innodb myisam engines
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT(0x00, '"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00));
 a
+innodb
 innodb myisam
-myisam innodb
 innodb myisam engines
 myisam
-innodb
+myisam innodb
 storage engine innodb
 storage engine myisam
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', '@', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00));
 a
+innodb
 innodb myisam
-myisam innodb
 innodb myisam engines
 myisam
-innodb
+myisam innodb
 storage engine innodb
 storage engine myisam
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', '@', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00, '"'));
@@ -1575,20 +1575,20 @@
 innodb myisam engines
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', '(', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', ')'));
 a
+innodb
 innodb myisam
-myisam innodb
 innodb myisam engines
 myisam
-innodb
+myisam innodb
 storage engine innodb
 storage engine myisam
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', 'm', 'y', 'i', 's', 'a', 'm'));
 a
+innodb
 innodb myisam
-myisam innodb
 innodb myisam engines
 myisam
-innodb
+myisam innodb
 storage engine innodb
 storage engine myisam
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', 'm', 'y', 'i', 's', 'a', 'm', '"'));
@@ -1648,11 +1648,11 @@
 innodb myisam engines
 SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT(0x00, '"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00));
 b
+innodb
 innodb myisam
-myisam innodb
 innodb myisam engines
 myisam
-innodb
+myisam innodb
 storage engine innodb
 storage engine myisam
 SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT('"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', '@', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00, '"','@', '2') IN BOOLEAN MODE);
@@ -1708,20 +1708,20 @@
 innodb myisam engines
 SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT(0x00, '"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00));
 c
+innodb
 innodb myisam
-myisam innodb
 innodb myisam engines
 myisam
-innodb
+myisam innodb
 storage engine innodb
 storage engine myisam
 SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', '@', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00));
 c
+innodb
 innodb myisam
-myisam innodb
 innodb myisam engines
 myisam
-innodb
+myisam innodb
 storage engine innodb
 storage engine myisam
 SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', '@', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00, '"'));
@@ -1730,20 +1730,20 @@
 innodb myisam engines
 SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', '(', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', ')'));
 c
+innodb
 innodb myisam
-myisam innodb
 innodb myisam engines
 myisam
-innodb
+myisam innodb
 storage engine innodb
 storage engine myisam
 SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', 'm', 'y', 'i', 's', 'a', 'm'));
 c
+innodb
 innodb myisam
-myisam innodb
 innodb myisam engines
 myisam
-innodb
+myisam innodb
 storage engine innodb
 storage engine myisam
 SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', 'm', 'y', 'i', 's', 'a', 'm', '"'));
@@ -1785,75 +1785,75 @@
 a
 innodb
 innodb myisam
+innodb myisam engines
 myisam innodb
 storage engine innodb
-innodb myisam engines
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '"'));
 a
 innodb
 innodb myisam
+innodb myisam engines
 myisam innodb
 storage engine innodb
-innodb myisam engines
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT(0x00, '"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', 0x00, 0x00, 0x00, '"'));
 a
 innodb
 innodb myisam
+innodb myisam engines
 myisam innodb
 storage engine innodb
-innodb myisam engines
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT(0x00, '"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00));
 a
+innodb
 innodb myisam
-myisam innodb
 innodb myisam engines
 myisam
-innodb
+myisam innodb
 storage engine innodb
 storage engine myisam
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', '@', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00));
 a
+innodb
 innodb myisam
-myisam innodb
 innodb myisam engines
 myisam
-innodb
+myisam innodb
 storage engine innodb
 storage engine myisam
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', '@', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00, '"'));
 a
+innodb
 innodb myisam
-myisam innodb
 innodb myisam engines
 myisam
-innodb
+myisam innodb
 storage engine innodb
 storage engine myisam
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', '(', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', ')'));
 a
+innodb
 innodb myisam
-myisam innodb
 innodb myisam engines
 myisam
-innodb
+myisam innodb
 storage engine innodb
 storage engine myisam
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', 'm', 'y', 'i', 's', 'a', 'm'));
 a
+innodb
 innodb myisam
-myisam innodb
 innodb myisam engines
 myisam
-innodb
+myisam innodb
 storage engine innodb
 storage engine myisam
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', 'm', 'y', 'i', 's', 'a', 'm', '"'));
 a
+innodb
 innodb myisam
-myisam innodb
 innodb myisam engines
 myisam
-innodb
+myisam innodb
 storage engine innodb
 storage engine myisam
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', '@', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00, '"','@', '2') IN BOOLEAN MODE);
@@ -1881,43 +1881,43 @@
 4	ghome windows
 SELECT * FROM t1 WHERE MATCH (a) AGAINST ('g *' IN NATURAL LANGUAGE MODE WITH QUERY EXPANSION);
 id	a
+1	know database
+2	good database
 3	gmail email
 4	ghome windows
-2	good database
-1	know database
 SELECT * FROM t1 WHERE MATCH (a) AGAINST ('g * k *' IN NATURAL LANGUAGE MODE WITH QUERY EXPANSION);
 id	a
 1	know database
+2	good database
 3	gmail email
 4	ghome windows
-2	good database
 SELECT * FROM t1 WHERE MATCH (a) AGAINST ('g * k * d *' IN NATURAL LANGUAGE MODE WITH QUERY EXPANSION);
 id	a
 1	know database
+2	good database
 3	gmail email
 4	ghome windows
-2	good database
 SELECT * FROM t1 WHERE MATCH (a) AGAINST ('g * go *' IN NATURAL LANGUAGE MODE WITH QUERY EXPANSION);
 id	a
+1	know database
 2	good database
 3	gmail email
 4	ghome windows
-1	know database
 SELECT * FROM t1 WHERE MATCH (a) AGAINST ('g * good' IN NATURAL LANGUAGE MODE WITH QUERY EXPANSION);
 id	a
+1	know database
 2	good database
 3	gmail email
 4	ghome windows
-1	know database
 SELECT * FROM t1 WHERE MATCH (a) AGAINST ('gm * go *' IN NATURAL LANGUAGE MODE WITH QUERY EXPANSION);
 id	a
-3	gmail email
-2	good database
 1	know database
+2	good database
+3	gmail email
 SELECT * FROM t1 WHERE MATCH (a) AGAINST ('good *' IN NATURAL LANGUAGE MODE WITH QUERY EXPANSION);
 id	a
-2	good database
 1	know database
+2	good database
 SELECT * FROM t1 WHERE MATCH (a) AGAINST ('g* database' IN NATURAL LANGUAGE MODE WITH QUERY EXPANSION);
 id	a
 1	know database
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/ngram_1.result mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/ngram_1.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/ngram_1.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/ngram_1.result	2021-09-28 11:46:34.000000000 +0000
@@ -90,8 +90,8 @@
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('nd');
 seq	title_char	title_varchar	title_text
-3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('50');
 seq	title_char	title_varchar	title_text
@@ -114,47 +114,47 @@
 seq	title_char	title_varchar	title_text
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('first');
 seq	title_char	title_varchar	title_text
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_text) AGAINST('United');
 seq	title_char	title_varchar	title_text
-3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
+3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_char,title_varchar) AGAINST('in');
 seq	title_char	title_varchar	title_text
-5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
+5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 SELECT * FROM articles_1 WHERE
 MATCH(title_text,title_varchar) AGAINST('St');
 seq	title_char	title_varchar	title_text
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_char) AGAINST('En la' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
-2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
+3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 SELECT * FROM articles_1 WHERE
 MATCH(title_char) AGAINST('+En -la' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
@@ -165,8 +165,8 @@
 SELECT * FROM articles_1 WHERE
 MATCH(title_char) AGAINST('+En +la' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
-2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
@@ -175,10 +175,10 @@
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('in nc' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
+1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('+in -nc' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
@@ -186,28 +186,28 @@
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('+in <la' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
+1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
-1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('+la >la' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
-3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('~in la' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
-3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar,title_text) AGAINST('Ca Ox' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
+5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar,title_text) AGAINST('s+ Ox' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
@@ -224,43 +224,43 @@
 SELECT * FROM articles_1 WHERE
 MATCH(title_char) AGAINST('la'  WITH QUERY EXPANSION);
 seq	title_char	title_varchar	title_text
-5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
-2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
+5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('po'  WITH QUERY EXPANSION);
 seq	title_char	title_varchar	title_text
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 SELECT * FROM articles_1 WHERE
 MATCH(title_text) AGAINST('Ca'  WITH QUERY EXPANSION);
 seq	title_char	title_varchar	title_text
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
+1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
-1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_char,title_varchar) AGAINST('Ca'  WITH QUERY EXPANSION);
 seq	title_char	title_varchar	title_text
-5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
+1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
-1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_text,title_varchar) AGAINST('Ca'  WITH QUERY EXPANSION);
 seq	title_char	title_varchar	title_text
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
-1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1
 WHERE MATCH (title_text)
 AGAINST ('"Ca da"@2' IN BOOLEAN MODE);
@@ -273,9 +273,9 @@
 WHERE MATCH(t2.title_varchar,t2.title_text) AGAINST('Ca Ox' IN BOOLEAN MODE)
 AND t1.seq = t2.seq ;
 seq	title_char	title_varchar	title_text	seq	title_char	title_varchar	title_text
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand	7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life	5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland	2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
+5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life	5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand	7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT COUNT(*) FROM articles_1 t1,articles_1 t2
 WHERE MATCH(t1.title_char) AGAINST('la')
 AND t1.seq = t2.seq
@@ -305,11 +305,11 @@
 WHERE MATCH (title_char,title_text,title_varchar)
 AGAINST ('States' WITH QUERY EXPANSION);
 seq	title_char	title_varchar	title_text
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
-5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
+5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SET SESSION innodb_ft_enable_stopword=1;
 DROP TABLE articles_1;
 # Test Case 2: CJK charset and collation on row_type
@@ -511,8 +511,8 @@
 SELECT * FROM articles WHERE
 MATCH(c2) AGAINST("<我幾 >�啊" IN BOOLEAN MODE);
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
-3	救命啊!	�啊! 你好	生日快樂	雨季	雨��り�� �や���よ�	雨雲	저분� �어를 잘 합니다	저는 서울�서 살고 있습니다.	recording test
 2	你好嗎?	我幾好，你呢	好�冇見	左�	左��れる	☆�折⇔左折	제 �름� Charles입니다.	운�� 좋아해요*	row row1 value
+3	救命啊!	�啊! 你好	生日快樂	雨季	雨��り�� �や���よ�	雨雲	저분� �어를 잘 합니다	저는 서울�서 살고 있습니다.	recording test
 INSERT INTO articles (c1,c2,c3,j1,j2,j3,k1,k2,e1) VALUES
 ('歡迎','你好','喂 ','日�長','言も言���','�や��よ�','제가 미국�입니다.','한국�� 공부합니다%','testing row row1 xy');
 ANALYZE TABLE articles;
@@ -560,9 +560,9 @@
 SELECT * FROM articles WHERE
 MATCH(e1) AGAINST('testing' WITH QUERY EXPANSION) ;
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
-3	救命啊!	�啊! 你好	生日快樂	雨季	雨��り�� �や���よ�	雨雲	저분� �어를 잘 합니다	저는 서울�서 살고 있습니다.	recording test
 1	歡迎	你好	喂	日�長	言も言���	�や���よ�	제가 미국�입니다.	한국�� 공부합니다%	testing row row1 xy
 2	你好嗎?	我幾好，你呢	好�冇見	左�	左��れる	☆�折⇔左折	제 �름� Charles입니다.	운�� 좋아해요*	row row1 value
+3	救命啊!	�啊! 你好	生日快樂	雨季	雨��り�� �や���よ�	雨雲	저분� �어를 잘 합니다	저는 서울�서 살고 있습니다.	recording test
 SELECT * FROM articles WHERE
 MATCH(c2) AGAINST('"我幾 �啊"@3' IN BOOLEAN MODE);
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
@@ -1320,8 +1320,8 @@
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('nd');
 seq	title_char	title_varchar	title_text
-3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('50');
 seq	title_char	title_varchar	title_text
@@ -1344,47 +1344,47 @@
 seq	title_char	title_varchar	title_text
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('first');
 seq	title_char	title_varchar	title_text
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_text) AGAINST('United');
 seq	title_char	title_varchar	title_text
-3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
+3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_char,title_varchar) AGAINST('in');
 seq	title_char	title_varchar	title_text
-5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
+5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 SELECT * FROM articles_1 WHERE
 MATCH(title_text,title_varchar) AGAINST('St');
 seq	title_char	title_varchar	title_text
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_char) AGAINST('En la' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
-2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
+3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 SELECT * FROM articles_1 WHERE
 MATCH(title_char) AGAINST('+En -la' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
@@ -1395,8 +1395,8 @@
 SELECT * FROM articles_1 WHERE
 MATCH(title_char) AGAINST('+En +la' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
-2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
@@ -1405,10 +1405,10 @@
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('in nc' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
+1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('+in -nc' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
@@ -1416,28 +1416,28 @@
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('+in <la' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
+1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
-1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('+la >la' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
-3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('~in la' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
-3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar,title_text) AGAINST('Ca Ox' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
+5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar,title_text) AGAINST('s+ Ox' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
@@ -1454,43 +1454,43 @@
 SELECT * FROM articles_1 WHERE
 MATCH(title_char) AGAINST('la'  WITH QUERY EXPANSION);
 seq	title_char	title_varchar	title_text
-5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
-2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
+5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('po'  WITH QUERY EXPANSION);
 seq	title_char	title_varchar	title_text
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 SELECT * FROM articles_1 WHERE
 MATCH(title_text) AGAINST('Ca'  WITH QUERY EXPANSION);
 seq	title_char	title_varchar	title_text
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
+1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
-1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_char,title_varchar) AGAINST('Ca'  WITH QUERY EXPANSION);
 seq	title_char	title_varchar	title_text
-5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
+1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
-1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_text,title_varchar) AGAINST('Ca'  WITH QUERY EXPANSION);
 seq	title_char	title_varchar	title_text
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
-1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1
 WHERE MATCH (title_text)
 AGAINST ('"Ca da"@2' IN BOOLEAN MODE);
@@ -1503,9 +1503,9 @@
 WHERE MATCH(t2.title_varchar,t2.title_text) AGAINST('Ca Ox' IN BOOLEAN MODE)
 AND t1.seq = t2.seq ;
 seq	title_char	title_varchar	title_text	seq	title_char	title_varchar	title_text
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand	7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life	5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland	2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
+5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life	5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand	7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT COUNT(*) FROM articles_1 t1,articles_1 t2
 WHERE MATCH(t1.title_char) AGAINST('la')
 AND t1.seq = t2.seq
@@ -1535,11 +1535,11 @@
 WHERE MATCH (title_char,title_text,title_varchar)
 AGAINST ('States' WITH QUERY EXPANSION);
 seq	title_char	title_varchar	title_text
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
-5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
+5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SET SESSION innodb_ft_enable_stopword=1;
 DROP TABLE articles_1;
 # Test Case 2: CJK charset and collation on row_type
@@ -1741,8 +1741,8 @@
 SELECT * FROM articles WHERE
 MATCH(c2) AGAINST("<我幾 >�啊" IN BOOLEAN MODE);
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
-3	救命啊!	�啊! 你好	生日快樂	雨季	雨��り�� �や���よ�	雨雲	저분� �어를 잘 합니다	저는 서울�서 살고 있습니다.	recording test
 2	你好嗎?	我幾好，你呢	好�冇見	左�	左��れる	☆�折⇔左折	제 �름� Charles입니다.	운�� 좋아해요*	row row1 value
+3	救命啊!	�啊! 你好	生日快樂	雨季	雨��り�� �や���よ�	雨雲	저분� �어를 잘 합니다	저는 서울�서 살고 있습니다.	recording test
 INSERT INTO articles (c1,c2,c3,j1,j2,j3,k1,k2,e1) VALUES
 ('歡迎','你好','喂 ','日�長','言も言���','�や��よ�','제가 미국�입니다.','한국�� 공부합니다%','testing row row1 xy');
 ANALYZE TABLE articles;
@@ -1790,9 +1790,9 @@
 SELECT * FROM articles WHERE
 MATCH(e1) AGAINST('testing' WITH QUERY EXPANSION) ;
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
-3	救命啊!	�啊! 你好	生日快樂	雨季	雨��り�� �や���よ�	雨雲	저분� �어를 잘 합니다	저는 서울�서 살고 있습니다.	recording test
 1	歡迎	你好	喂	日�長	言も言���	�や���よ�	제가 미국�입니다.	한국�� 공부합니다%	testing row row1 xy
 2	你好嗎?	我幾好，你呢	好�冇見	左�	左��れる	☆�折⇔左折	제 �름� Charles입니다.	운�� 좋아해요*	row row1 value
+3	救命啊!	�啊! 你好	生日快樂	雨季	雨��り�� �や���よ�	雨雲	저분� �어를 잘 합니다	저는 서울�서 살고 있습니다.	recording test
 SELECT * FROM articles WHERE
 MATCH(c2) AGAINST('"我幾 �啊"@3' IN BOOLEAN MODE);
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
@@ -2550,8 +2550,8 @@
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('nd');
 seq	title_char	title_varchar	title_text
-3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('50');
 seq	title_char	title_varchar	title_text
@@ -2574,47 +2574,47 @@
 seq	title_char	title_varchar	title_text
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('first');
 seq	title_char	title_varchar	title_text
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_text) AGAINST('United');
 seq	title_char	title_varchar	title_text
-3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
+3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_char,title_varchar) AGAINST('in');
 seq	title_char	title_varchar	title_text
-5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
+5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 SELECT * FROM articles_1 WHERE
 MATCH(title_text,title_varchar) AGAINST('St');
 seq	title_char	title_varchar	title_text
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_char) AGAINST('En la' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
-2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
+3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 SELECT * FROM articles_1 WHERE
 MATCH(title_char) AGAINST('+En -la' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
@@ -2625,8 +2625,8 @@
 SELECT * FROM articles_1 WHERE
 MATCH(title_char) AGAINST('+En +la' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
-2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
@@ -2635,10 +2635,10 @@
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('in nc' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
+1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('+in -nc' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
@@ -2646,28 +2646,28 @@
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('+in <la' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
+1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
-1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('+la >la' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
-3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('~in la' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
-3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar,title_text) AGAINST('Ca Ox' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
+5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar,title_text) AGAINST('s+ Ox' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
@@ -2684,43 +2684,43 @@
 SELECT * FROM articles_1 WHERE
 MATCH(title_char) AGAINST('la'  WITH QUERY EXPANSION);
 seq	title_char	title_varchar	title_text
-5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
-2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
+5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('po'  WITH QUERY EXPANSION);
 seq	title_char	title_varchar	title_text
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 SELECT * FROM articles_1 WHERE
 MATCH(title_text) AGAINST('Ca'  WITH QUERY EXPANSION);
 seq	title_char	title_varchar	title_text
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
+1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
-1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_char,title_varchar) AGAINST('Ca'  WITH QUERY EXPANSION);
 seq	title_char	title_varchar	title_text
-5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
+1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
-1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_text,title_varchar) AGAINST('Ca'  WITH QUERY EXPANSION);
 seq	title_char	title_varchar	title_text
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
-1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1
 WHERE MATCH (title_text)
 AGAINST ('"Ca da"@2' IN BOOLEAN MODE);
@@ -2733,9 +2733,9 @@
 WHERE MATCH(t2.title_varchar,t2.title_text) AGAINST('Ca Ox' IN BOOLEAN MODE)
 AND t1.seq = t2.seq ;
 seq	title_char	title_varchar	title_text	seq	title_char	title_varchar	title_text
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand	7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life	5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland	2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
+5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life	5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand	7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT COUNT(*) FROM articles_1 t1,articles_1 t2
 WHERE MATCH(t1.title_char) AGAINST('la')
 AND t1.seq = t2.seq
@@ -2765,11 +2765,11 @@
 WHERE MATCH (title_char,title_text,title_varchar)
 AGAINST ('States' WITH QUERY EXPANSION);
 seq	title_char	title_varchar	title_text
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
-5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
+5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SET SESSION innodb_ft_enable_stopword=1;
 DROP TABLE articles_1;
 # Test Case 2: CJK charset and collation on row_type
@@ -2971,8 +2971,8 @@
 SELECT * FROM articles WHERE
 MATCH(c2) AGAINST("<我幾 >�啊" IN BOOLEAN MODE);
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
-3	救命啊!	�啊! 你好	生日快樂	雨季	雨��り�� �や���よ�	雨雲	저분� �어를 잘 합니다	저는 서울�서 살고 있습니다.	recording test
 2	你好嗎?	我幾好，你呢	好�冇見	左�	左��れる	☆�折⇔左折	제 �름� Charles입니다.	운�� 좋아해요*	row row1 value
+3	救命啊!	�啊! 你好	生日快樂	雨季	雨��り�� �や���よ�	雨雲	저분� �어를 잘 합니다	저는 서울�서 살고 있습니다.	recording test
 INSERT INTO articles (c1,c2,c3,j1,j2,j3,k1,k2,e1) VALUES
 ('歡迎','你好','喂 ','日�長','言も言���','�や��よ�','제가 미국�입니다.','한국�� 공부합니다%','testing row row1 xy');
 ANALYZE TABLE articles;
@@ -3020,9 +3020,9 @@
 SELECT * FROM articles WHERE
 MATCH(e1) AGAINST('testing' WITH QUERY EXPANSION) ;
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
-3	救命啊!	�啊! 你好	生日快樂	雨季	雨��り�� �や���よ�	雨雲	저분� �어를 잘 합니다	저는 서울�서 살고 있습니다.	recording test
 1	歡迎	你好	喂	日�長	言も言���	�や���よ�	제가 미국�입니다.	한국�� 공부합니다%	testing row row1 xy
 2	你好嗎?	我幾好，你呢	好�冇見	左�	左��れる	☆�折⇔左折	제 �름� Charles입니다.	운�� 좋아해요*	row row1 value
+3	救命啊!	�啊! 你好	生日快樂	雨季	雨��り�� �や���よ�	雨雲	저분� �어를 잘 합니다	저는 서울�서 살고 있습니다.	recording test
 SELECT * FROM articles WHERE
 MATCH(c2) AGAINST('"我幾 �啊"@3' IN BOOLEAN MODE);
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
@@ -3780,8 +3780,8 @@
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('nd');
 seq	title_char	title_varchar	title_text
-3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('50');
 seq	title_char	title_varchar	title_text
@@ -3804,47 +3804,47 @@
 seq	title_char	title_varchar	title_text
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('first');
 seq	title_char	title_varchar	title_text
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_text) AGAINST('United');
 seq	title_char	title_varchar	title_text
-3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
+3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_char,title_varchar) AGAINST('in');
 seq	title_char	title_varchar	title_text
-5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
+5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 SELECT * FROM articles_1 WHERE
 MATCH(title_text,title_varchar) AGAINST('St');
 seq	title_char	title_varchar	title_text
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_char) AGAINST('En la' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
-2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
+3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 SELECT * FROM articles_1 WHERE
 MATCH(title_char) AGAINST('+En -la' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
@@ -3855,8 +3855,8 @@
 SELECT * FROM articles_1 WHERE
 MATCH(title_char) AGAINST('+En +la' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
-2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
@@ -3865,10 +3865,10 @@
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('in nc' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
+1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('+in -nc' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
@@ -3876,28 +3876,28 @@
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('+in <la' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
+1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
-1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('+la >la' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
-3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('~in la' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
-3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar,title_text) AGAINST('Ca Ox' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
+5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar,title_text) AGAINST('s+ Ox' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
@@ -3914,43 +3914,43 @@
 SELECT * FROM articles_1 WHERE
 MATCH(title_char) AGAINST('la'  WITH QUERY EXPANSION);
 seq	title_char	title_varchar	title_text
-5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
-2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
+5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('po'  WITH QUERY EXPANSION);
 seq	title_char	title_varchar	title_text
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 SELECT * FROM articles_1 WHERE
 MATCH(title_text) AGAINST('Ca'  WITH QUERY EXPANSION);
 seq	title_char	title_varchar	title_text
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
+1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
-1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_char,title_varchar) AGAINST('Ca'  WITH QUERY EXPANSION);
 seq	title_char	title_varchar	title_text
-5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
+1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
-1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_text,title_varchar) AGAINST('Ca'  WITH QUERY EXPANSION);
 seq	title_char	title_varchar	title_text
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
-1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1
 WHERE MATCH (title_text)
 AGAINST ('"Ca da"@2' IN BOOLEAN MODE);
@@ -3963,9 +3963,9 @@
 WHERE MATCH(t2.title_varchar,t2.title_text) AGAINST('Ca Ox' IN BOOLEAN MODE)
 AND t1.seq = t2.seq ;
 seq	title_char	title_varchar	title_text	seq	title_char	title_varchar	title_text
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand	7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life	5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland	2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
+5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life	5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand	7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT COUNT(*) FROM articles_1 t1,articles_1 t2
 WHERE MATCH(t1.title_char) AGAINST('la')
 AND t1.seq = t2.seq
@@ -3995,11 +3995,11 @@
 WHERE MATCH (title_char,title_text,title_varchar)
 AGAINST ('States' WITH QUERY EXPANSION);
 seq	title_char	title_varchar	title_text
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
-5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
+5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SET SESSION innodb_ft_enable_stopword=1;
 DROP TABLE articles_1;
 # Test Case 2: CJK charset and collation on row_type
@@ -4201,8 +4201,8 @@
 SELECT * FROM articles WHERE
 MATCH(c2) AGAINST("<我幾 >�啊" IN BOOLEAN MODE);
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
-3	救命啊!	�啊! 你好	生日快樂	雨季	雨��り�� �や���よ�	雨雲	저분� �어를 잘 합니다	저는 서울�서 살고 있습니다.	recording test
 2	你好嗎?	我幾好，你呢	好�冇見	左�	左��れる	☆�折⇔左折	제 �름� Charles입니다.	운�� 좋아해요*	row row1 value
+3	救命啊!	�啊! 你好	生日快樂	雨季	雨��り�� �や���よ�	雨雲	저분� �어를 잘 합니다	저는 서울�서 살고 있습니다.	recording test
 INSERT INTO articles (c1,c2,c3,j1,j2,j3,k1,k2,e1) VALUES
 ('歡迎','你好','喂 ','日�長','言も言���','�や��よ�','제가 미국�입니다.','한국�� 공부합니다%','testing row row1 xy');
 ANALYZE TABLE articles;
@@ -4250,9 +4250,9 @@
 SELECT * FROM articles WHERE
 MATCH(e1) AGAINST('testing' WITH QUERY EXPANSION) ;
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
-3	救命啊!	�啊! 你好	生日快樂	雨季	雨��り�� �や���よ�	雨雲	저분� �어를 잘 합니다	저는 서울�서 살고 있습니다.	recording test
 1	歡迎	你好	喂	日�長	言も言���	�や���よ�	제가 미국�입니다.	한국�� 공부합니다%	testing row row1 xy
 2	你好嗎?	我幾好，你呢	好�冇見	左�	左��れる	☆�折⇔左折	제 �름� Charles입니다.	운�� 좋아해요*	row row1 value
+3	救命啊!	�啊! 你好	生日快樂	雨季	雨��り�� �や���よ�	雨雲	저분� �어를 잘 합니다	저는 서울�서 살고 있습니다.	recording test
 SELECT * FROM articles WHERE
 MATCH(c2) AGAINST('"我幾 �啊"@3' IN BOOLEAN MODE);
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
@@ -5010,8 +5010,8 @@
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('nd');
 seq	title_char	title_varchar	title_text
-3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('50');
 seq	title_char	title_varchar	title_text
@@ -5034,47 +5034,47 @@
 seq	title_char	title_varchar	title_text
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('first');
 seq	title_char	title_varchar	title_text
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_text) AGAINST('United');
 seq	title_char	title_varchar	title_text
-3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
+3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_char,title_varchar) AGAINST('in');
 seq	title_char	title_varchar	title_text
-5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
+5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 SELECT * FROM articles_1 WHERE
 MATCH(title_text,title_varchar) AGAINST('St');
 seq	title_char	title_varchar	title_text
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_char) AGAINST('En la' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
-2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
+3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 SELECT * FROM articles_1 WHERE
 MATCH(title_char) AGAINST('+En -la' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
@@ -5085,8 +5085,8 @@
 SELECT * FROM articles_1 WHERE
 MATCH(title_char) AGAINST('+En +la' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
-2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
@@ -5095,10 +5095,10 @@
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('in nc' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
+1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('+in -nc' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
@@ -5106,28 +5106,28 @@
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('+in <la' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
+1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
-1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('+la >la' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
-3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('~in la' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
-3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar,title_text) AGAINST('Ca Ox' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
+5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar,title_text) AGAINST('s+ Ox' IN BOOLEAN MODE);
 seq	title_char	title_varchar	title_text
@@ -5144,43 +5144,43 @@
 SELECT * FROM articles_1 WHERE
 MATCH(title_char) AGAINST('la'  WITH QUERY EXPANSION);
 seq	title_char	title_varchar	title_text
-5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
-2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
+5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_varchar) AGAINST('po'  WITH QUERY EXPANSION);
 seq	title_char	title_varchar	title_text
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 SELECT * FROM articles_1 WHERE
 MATCH(title_text) AGAINST('Ca'  WITH QUERY EXPANSION);
 seq	title_char	title_varchar	title_text
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
+1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
-1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_char,title_varchar) AGAINST('Ca'  WITH QUERY EXPANSION);
 seq	title_char	title_varchar	title_text
-5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
+1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
-1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
 MATCH(title_text,title_varchar) AGAINST('Ca'  WITH QUERY EXPANSION);
 seq	title_char	title_varchar	title_text
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
-1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
+5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1
 WHERE MATCH (title_text)
 AGAINST ('"Ca da"@2' IN BOOLEAN MODE);
@@ -5193,9 +5193,9 @@
 WHERE MATCH(t2.title_varchar,t2.title_text) AGAINST('Ca Ox' IN BOOLEAN MODE)
 AND t1.seq = t2.seq ;
 seq	title_char	title_varchar	title_text	seq	title_char	title_varchar	title_text
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand	7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life	5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
 2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland	2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
+5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life	5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand	7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT COUNT(*) FROM articles_1 t1,articles_1 t2
 WHERE MATCH(t1.title_char) AGAINST('la')
 AND t1.seq = t2.seq
@@ -5225,11 +5225,11 @@
 WHERE MATCH (title_char,title_text,title_varchar)
 AGAINST ('States' WITH QUERY EXPANSION);
 seq	title_char	title_varchar	title_text
-7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
-2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
-5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+2	spoken as a first language by the majority populations of several states	including the United Kingdom i*	 and the United States, Canada, Australia, Ireland
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
+5	significant number of English words are constructed on the basis of roots from Latin	because Latin in some form was the lingua franca of the Christian Church	and of European intellectual life
+7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SET SESSION innodb_ft_enable_stopword=1;
 DROP TABLE articles_1;
 # Test Case 2: CJK charset and collation on row_type
@@ -5431,8 +5431,8 @@
 SELECT * FROM articles WHERE
 MATCH(c2) AGAINST("<我幾 >�啊" IN BOOLEAN MODE);
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
-3	救命啊!	�啊! 你好	生日快樂	雨季	雨��り�� �や���よ�	雨雲	저분� �어를 잘 합니다	저는 서울�서 살고 있습니다.	recording test
 2	你好嗎?	我幾好，你呢	好�冇見	左�	左��れる	☆�折⇔左折	제 �름� Charles입니다.	운�� 좋아해요*	row row1 value
+3	救命啊!	�啊! 你好	生日快樂	雨季	雨��り�� �や���よ�	雨雲	저분� �어를 잘 합니다	저는 서울�서 살고 있습니다.	recording test
 INSERT INTO articles (c1,c2,c3,j1,j2,j3,k1,k2,e1) VALUES
 ('歡迎','你好','喂 ','日�長','言も言���','�や��よ�','제가 미국�입니다.','한국�� 공부합니다%','testing row row1 xy');
 ANALYZE TABLE articles;
@@ -5480,9 +5480,9 @@
 SELECT * FROM articles WHERE
 MATCH(e1) AGAINST('testing' WITH QUERY EXPANSION) ;
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
-3	救命啊!	�啊! 你好	生日快樂	雨季	雨��り�� �や���よ�	雨雲	저분� �어를 잘 합니다	저는 서울�서 살고 있습니다.	recording test
 1	歡迎	你好	喂	日�長	言も言���	�や���よ�	제가 미국�입니다.	한국�� 공부합니다%	testing row row1 xy
 2	你好嗎?	我幾好，你呢	好�冇見	左�	左��れる	☆�折⇔左折	제 �름� Charles입니다.	운�� 좋아해요*	row row1 value
+3	救命啊!	�啊! 你好	生日快樂	雨季	雨��り�� �や���よ�	雨雲	저분� �어를 잘 합니다	저는 서울�서 살고 있습니다.	recording test
 SELECT * FROM articles WHERE
 MATCH(c2) AGAINST('"我幾 �啊"@3' IN BOOLEAN MODE);
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/ngram_debug.result mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/ngram_debug.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/ngram_debug.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/ngram_debug.result	2021-09-28 11:46:34.000000000 +0000
@@ -41,9 +41,9 @@
 SELECT * FROM articles WHERE
 MATCH(title) AGAINST('mysql');
 id	title
-4	MySQL database
-3	My SQL is good
 2	Myname is wonder
+3	My SQL is good
+4	MySQL database
 SELECT * FROM articles WHERE
 MATCH(title) AGAINST('mysql' IN BOOLEAN MODE);
 id	title
@@ -78,11 +78,11 @@
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('的* 或* 东西' IN BOOLEAN MODE);
 id	title	body
-5	数�库是数�的结构化集�	它�以是任何东西
 1	从简�购物清�到画展	或�业网络中的海�数�
+2	�想将数�添加到数�库	访问�处�计算机数�库中�存的数�
 3	从简�的购物清�到画展	或�业网络中的海�数�
 4	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
-2	�想将数�添加到数�库	访问�处�计算机数�库中�存的数�
+5	数�库是数�的结构化集�	它�以是任何东西
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('简�的' IN BOOLEAN MODE);
 id	title	body
@@ -146,12 +146,12 @@
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('数� (+xyz -bc)' IN BOOLEAN MODE);
 id	title	body
+1	从简�购物清�到画展	或�业网络中的海�数�
 2	�想将数�添加到数�库	访问�处�计算机数�库中�存的数�
+3	从简�的购物清�到画展	或�业网络中的海�数�
 4	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
 5	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数� abc xyz
 6	数�库是数�的结构化集�	它�以是任何东西
-1	从简�购物清�到画展	或�业网络中的海�数�
-3	从简�的购物清�到画展	或�业网络中的海�数�
 DROP TABLE user_stopword;
 DROP TABLE articles;
 SET GLOBAL innodb_ft_server_stopword_table=default;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/ngram.result mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/ngram.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/ngram.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/ngram.result	2021-09-28 11:46:34.000000000 +0000
@@ -17,17 +17,17 @@
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('数�');
 id	title	body
-3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
 1	数�库是数�的结构化集�	它�以是任何东西
-4	需�使用数�库管�系统	计算机是处�大�数�的�想工具
 2	从简�的购物清�到画展	或�业网络中的海�数�
+3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
+4	需�使用数�库管�系统	计算机是处�大�数�的�想工具
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('æ•°*' IN BOOLEAN MODE);
 id	title	body
-3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
 1	数�库是数�的结构化集�	它�以是任何东西
-4	需�使用数�库管�系统	计算机是处�大�数�的�想工具
 2	从简�的购物清�到画展	或�业网络中的海�数�
+3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
+4	需�使用数�库管�系统	计算机是处�大�数�的�想工具
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('+数�库 -计算机' IN BOOLEAN MODE);
 id	title	body
@@ -39,21 +39,21 @@
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('数�库');
 id	title	body
-3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
 1	数�库是数�的结构化集�	它�以是任何东西
-4	需�使用数�库管�系统	计算机是处�大�数�的�想工具
 2	从简�的购物清�到画展	或�业网络中的海�数�
+3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
+4	需�使用数�库管�系统	计算机是处�大�数�的�想工具
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('数�库' IN BOOLEAN MODE);
 id	title	body
-3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
 1	数�库是数�的结构化集�	它�以是任何东西
+3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
 4	需�使用数�库管�系统	计算机是处�大�数�的�想工具
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('"数�库"' IN BOOLEAN MODE);
 id	title	body
-3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
 1	数�库是数�的结构化集�	它�以是任何东西
+3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
 4	需�使用数�库管�系统	计算机是处�大�数�的�想工具
 DROP TABLE articles;
 # Test Case 2: Test Chinese with GBK Charset.
@@ -74,17 +74,17 @@
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('数�');
 id	title	body
-3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
 1	数�库是数�的结构化集�	它�以是任何东西
-4	需�使用数�库管�系统	计算机是处�大�数�的�想工具
 2	从简�的购物清�到画展	或�业网络中的海�数�
+3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
+4	需�使用数�库管�系统	计算机是处�大�数�的�想工具
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('æ•°*' IN BOOLEAN MODE);
 id	title	body
-3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
 1	数�库是数�的结构化集�	它�以是任何东西
-4	需�使用数�库管�系统	计算机是处�大�数�的�想工具
 2	从简�的购物清�到画展	或�业网络中的海�数�
+3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
+4	需�使用数�库管�系统	计算机是处�大�数�的�想工具
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('+数�库 -计算机' IN BOOLEAN MODE);
 id	title	body
@@ -96,21 +96,21 @@
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('数�库');
 id	title	body
-3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
 1	数�库是数�的结构化集�	它�以是任何东西
-4	需�使用数�库管�系统	计算机是处�大�数�的�想工具
 2	从简�的购物清�到画展	或�业网络中的海�数�
+3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
+4	需�使用数�库管�系统	计算机是处�大�数�的�想工具
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('数�库' IN BOOLEAN MODE);
 id	title	body
-3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
 1	数�库是数�的结构化集�	它�以是任何东西
+3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
 4	需�使用数�库管�系统	计算机是处�大�数�的�想工具
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('"数�库"' IN BOOLEAN MODE);
 id	title	body
-3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
 1	数�库是数�的结构化集�	它�以是任何东西
+3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
 4	需�使用数�库管�系统	计算机是处�大�数�的�想工具
 DROP TABLE articles;
 # Test Case 3: Test Chinese with UTF8 Charset.
@@ -131,17 +131,17 @@
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('数�');
 id	title	body
-3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
 1	数�库是数�的结构化集�	它�以是任何东西
-4	需�使用数�库管�系统	计算机是处�大�数�的�想工具
 2	从简�的购物清�到画展	或�业网络中的海�数�
+3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
+4	需�使用数�库管�系统	计算机是处�大�数�的�想工具
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('æ•°*' IN BOOLEAN MODE);
 id	title	body
-3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
 1	数�库是数�的结构化集�	它�以是任何东西
-4	需�使用数�库管�系统	计算机是处�大�数�的�想工具
 2	从简�的购物清�到画展	或�业网络中的海�数�
+3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
+4	需�使用数�库管�系统	计算机是处�大�数�的�想工具
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('+数�库 -计算机' IN BOOLEAN MODE);
 id	title	body
@@ -153,21 +153,21 @@
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('数�库');
 id	title	body
-3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
 1	数�库是数�的结构化集�	它�以是任何东西
-4	需�使用数�库管�系统	计算机是处�大�数�的�想工具
 2	从简�的购物清�到画展	或�业网络中的海�数�
+3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
+4	需�使用数�库管�系统	计算机是处�大�数�的�想工具
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('数�库' IN BOOLEAN MODE);
 id	title	body
-3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
 1	数�库是数�的结构化集�	它�以是任何东西
+3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
 4	需�使用数�库管�系统	计算机是处�大�数�的�想工具
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('"数�库"' IN BOOLEAN MODE);
 id	title	body
-3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
 1	数�库是数�的结构化集�	它�以是任何东西
+3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
 4	需�使用数�库管�系统	计算机是处�大�数�的�想工具
 DROP TABLE articles;
 # Test Case 4: Test Chinese with gb18030 Charset.
@@ -188,17 +188,17 @@
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('数�');
 id	title	body
-3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
 1	数�库是数�的结构化集�	它�以是任何东西
-4	需�使用数�库管�系统	计算机是处�大�数�的�想工具
 2	从简�的购物清�到画展	或�业网络中的海�数�
+3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
+4	需�使用数�库管�系统	计算机是处�大�数�的�想工具
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('æ•°*' IN BOOLEAN MODE);
 id	title	body
-3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
 1	数�库是数�的结构化集�	它�以是任何东西
-4	需�使用数�库管�系统	计算机是处�大�数�的�想工具
 2	从简�的购物清�到画展	或�业网络中的海�数�
+3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
+4	需�使用数�库管�系统	计算机是处�大�数�的�想工具
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('+数�库 -计算机' IN BOOLEAN MODE);
 id	title	body
@@ -210,29 +210,29 @@
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('数�库');
 id	title	body
-3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
 1	数�库是数�的结构化集�	它�以是任何东西
-4	需�使用数�库管�系统	计算机是处�大�数�的�想工具
 2	从简�的购物清�到画展	或�业网络中的海�数�
+3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
+4	需�使用数�库管�系统	计算机是处�大�数�的�想工具
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('数�库' IN BOOLEAN MODE);
 id	title	body
-3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
 1	数�库是数�的结构化集�	它�以是任何东西
+3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
 4	需�使用数�库管�系统	计算机是处�大�数�的�想工具
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('"数�库"' IN BOOLEAN MODE);
 id	title	body
-3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
 1	数�库是数�的结构化集�	它�以是任何东西
+3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
 4	需�使用数�库管�系统	计算机是处�大�数�的�想工具
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('数�库' WITH QUERY EXPANSION);
 id	title	body
-3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
+1	数�库是数�的结构化集�	它�以是任何东西
 2	从简�的购物清�到画展	或�业网络中的海�数�
+3	�想将数�添加到数�库	或访问�处�计算机数�库中�存的数�
 4	需�使用数�库管�系统	计算机是处�大�数�的�想工具
-1	数�库是数�的结构化集�	它�以是任何东西
 ALTER TABLE articles DROP INDEX `idx1`;
 SELECT * FROM articles;
 id	title	body
@@ -259,17 +259,17 @@
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('データ');
 id	title	body
-3	データベース�データを追加�る��	コンピュータ�データベース�格��れ��るアクセス��よ�プロセスデータ
-4	データベース管�システムを使用�る必��	コンピュータ��大��データを処��る����想的�ツール��る
 1	データベース��構造化�れ�コレクション��	�れ�何も�る�������
 2	シンプル�買�物リスト�ら画�ギャラリー�	����業�ットワーク内�データ�膨大��
+3	データベース�データを追加�る��	コンピュータ�データベース�格��れ��るアクセス��よ�プロセスデータ
+4	データベース管�システムを使用�る必��	コンピュータ��大��データを処��る����想的�ツール��る
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('デ*' IN BOOLEAN MODE);
 id	title	body
-3	データベース�データを追加�る��	コンピュータ�データベース�格��れ��るアクセス��よ�プロセスデータ
-4	データベース管�システムを使用�る必��	コンピュータ��大��データを処��る����想的�ツール��る
 1	データベース��構造化�れ�コレクション��	�れ�何も�る�������
 2	シンプル�買�物リスト�ら画�ギャラリー�	����業�ットワーク内�データ�膨大��
+3	データベース�データを追加�る��	コンピュータ�データベース�格��れ��るアクセス��よ�プロセスデータ
+4	データベース管�システムを使用�る必��	コンピュータ��大��データを処��る����想的�ツール��る
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('+データベース -コンピュータ' IN BOOLEAN MODE);
 id	title	body
@@ -281,22 +281,22 @@
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('データベース');
 id	title	body
-3	データベース�データを追加�る��	コンピュータ�データベース�格��れ��るアクセス��よ�プロセスデータ
-4	データベース管�システムを使用�る必��	コンピュータ��大��データを処��る����想的�ツール��る
 1	データベース��構造化�れ�コレクション��	�れ�何も�る�������
 2	シンプル�買�物リスト�ら画�ギャラリー�	����業�ットワーク内�データ�膨大��
+3	データベース�データを追加�る��	コンピュータ�データベース�格��れ��るアクセス��よ�プロセスデータ
+4	データベース管�システムを使用�る必��	コンピュータ��大��データを処��る����想的�ツール��る
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('データベース' IN BOOLEAN MODE);
 id	title	body
+1	データベース��構造化�れ�コレクション��	�れ�何も�る�������
 3	データベース�データを追加�る��	コンピュータ�データベース�格��れ��るアクセス��よ�プロセスデータ
 4	データベース管�システムを使用�る必��	コンピュータ��大��データを処��る����想的�ツール��る
-1	データベース��構造化�れ�コレクション��	�れ�何も�る�������
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('"データベース"' IN BOOLEAN MODE);
 id	title	body
+1	データベース��構造化�れ�コレクション��	�れ�何も�る�������
 3	データベース�データを追加�る��	コンピュータ�データベース�格��れ��るアクセス��よ�プロセスデータ
 4	データベース管�システムを使用�る必��	コンピュータ��大��データを処��る����想的�ツール��る
-1	データベース��構造化�れ�コレクション��	�れ�何も�る�������
 DROP TABLE articles;
 # Test Case 6: Test Korean with EUCKR Charset.
 CREATE TABLE articles (
@@ -316,17 +316,17 @@
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('��터');
 id	title	body
-3	��터베�스� ��터를 추가하려면	액세스, 프로세스 ��터를 컴퓨터 ��터베�스� 저장
-4	��터베�스 관리 시스템� 사용해야합니다	컴퓨터는 많� 양� ��터를 처리하기위한 ���� �구입니다
 1	��터베�스� 구조 모�입니다	그것� 무엇�든 � 수 있습니다
 2	간단한 쇼핑 목��서 사진 갤러리	�는 기업 네트워��서 ��터� 엄청난 양�
+3	��터베�스� ��터를 추가하려면	액세스, 프로세스 ��터를 컴퓨터 ��터베�스� 저장
+4	��터베�스 관리 시스템� 사용해야합니다	컴퓨터는 많� 양� ��터를 처리하기위한 ���� �구입니다
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('�*' IN BOOLEAN MODE);
 id	title	body
-3	��터베�스� ��터를 추가하려면	액세스, 프로세스 ��터를 컴퓨터 ��터베�스� 저장
-4	��터베�스 관리 시스템� 사용해야합니다	컴퓨터는 많� 양� ��터를 처리하기위한 ���� �구입니다
 1	��터베�스� 구조 모�입니다	그것� 무엇�든 � 수 있습니다
 2	간단한 쇼핑 목��서 사진 갤러리	�는 기업 네트워��서 ��터� 엄청난 양�
+3	��터베�스� ��터를 추가하려면	액세스, 프로세스 ��터를 컴퓨터 ��터베�스� 저장
+4	��터베�스 관리 시스템� 사용해야합니다	컴퓨터는 많� 양� ��터를 처리하기위한 ���� �구입니다
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('+��터베�스 -컴퓨터' IN BOOLEAN MODE);
 id	title	body
@@ -338,22 +338,22 @@
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('��터베�스');
 id	title	body
-3	��터베�스� ��터를 추가하려면	액세스, 프로세스 ��터를 컴퓨터 ��터베�스� 저장
-4	��터베�스 관리 시스템� 사용해야합니다	컴퓨터는 많� 양� ��터를 처리하기위한 ���� �구입니다
 1	��터베�스� 구조 모�입니다	그것� 무엇�든 � 수 있습니다
 2	간단한 쇼핑 목��서 사진 갤러리	�는 기업 네트워��서 ��터� 엄청난 양�
+3	��터베�스� ��터를 추가하려면	액세스, 프로세스 ��터를 컴퓨터 ��터베�스� 저장
+4	��터베�스 관리 시스템� 사용해야합니다	컴퓨터는 많� 양� ��터를 처리하기위한 ���� �구입니다
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('��터베�스' IN BOOLEAN MODE);
 id	title	body
+1	��터베�스� 구조 모�입니다	그것� 무엇�든 � 수 있습니다
 3	��터베�스� ��터를 추가하려면	액세스, 프로세스 ��터를 컴퓨터 ��터베�스� 저장
 4	��터베�스 관리 시스템� 사용해야합니다	컴퓨터는 많� 양� ��터를 처리하기위한 ���� �구입니다
-1	��터베�스� 구조 모�입니다	그것� 무엇�든 � 수 있습니다
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('"��터베�스"' IN BOOLEAN MODE);
 id	title	body
+1	��터베�스� 구조 모�입니다	그것� 무엇�든 � 수 있습니다
 3	��터베�스� ��터를 추가하려면	액세스, 프로세스 ��터를 컴퓨터 ��터베�스� 저장
 4	��터베�스 관리 시스템� 사용해야합니다	컴퓨터는 많� 양� ��터를 처리하기위한 ���� �구입니다
-1	��터베�스� 구조 모�입니다	그것� 무엇�든 � 수 있습니다
 DROP TABLE articles;
 # Test Case 7: Test different ngram token size.
 CREATE TABLE articles (
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/opt.result mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/opt.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/opt.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/opt.result	2021-09-28 11:46:34.000000000 +0000
@@ -221,8 +221,8 @@
 FROM wp
 WHERE MATCH(title, text) AGAINST ('database');
 docid	score
-5	0.45528939366340637
 1	0.22764469683170319
+5	0.45528939366340637
 SHOW SESSION STATUS LIKE 'Handler_read%';
 Variable_name	Value
 Handler_read_first	0
@@ -291,8 +291,8 @@
 FROM wp
 WHERE MATCH(title, text) AGAINST ('database');
 docid	score1	score2
-5	0.45528939366340637	0.000000001885928302414186
 1	0.22764469683170319	0.000000003771856604828372
+5	0.45528939366340637	0.000000001885928302414186
 SHOW SESSION STATUS LIKE 'Handler_read%';
 Variable_name	Value
 Handler_read_first	0
@@ -329,8 +329,8 @@
 WHERE MATCH(title, text) AGAINST ('database')
 GROUP BY score;
 FTS_DOC_ID	score
-5	0.45528939366340637
 1	0.22764469683170319
+5	0.45528939366340637
 SHOW SESSION STATUS LIKE 'Handler_read%';
 Variable_name	Value
 Handler_read_first	0
@@ -365,14 +365,13 @@
 Sort_rows	0
 Sort_scan	0
 If count optimization applies, EXPLAIN shows
-"Select tables optimized away."
-EXPLAIN SELECT COUNT(*)
+"Rows fetched before execution."
+EXPLAIN FORMAT=TREE SELECT COUNT(*)
 FROM wp
 WHERE MATCH(title,text) AGAINST ('database' IN NATURAL LANGUAGE MODE);
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Select tables optimized away
-Warnings:
-Note	1003	/* select#1 */ select count(0) AS `COUNT(*)` from `test`.`wp` where (match `test`.`wp`.`title`,`test`.`wp`.`text` against ('database'))
+EXPLAIN
+-> Rows fetched before execution  (cost=0.00..0.00 rows=1)
+
 FLUSH STATUS;
 SELECT COUNT(*)
 FROM wp
@@ -390,66 +389,40 @@
 Handler_read_rnd	0
 Handler_read_rnd_next	0
 Optimization applies also to COUNT(expr) as long as expr is not nullable
-EXPLAIN SELECT COUNT(title)
+EXPLAIN FORMAT=TREE SELECT COUNT(title)
 FROM wp
 WHERE MATCH(title,text) AGAINST ('database' IN NATURAL LANGUAGE MODE);
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Select tables optimized away
-Warnings:
-Note	1003	/* select#1 */ select count(`test`.`wp`.`title`) AS `COUNT(title)` from `test`.`wp` where (match `test`.`wp`.`title`,`test`.`wp`.`text` against ('database'))
+EXPLAIN
+-> Rows fetched before execution  (cost=0.00..0.00 rows=1)
+
 SELECT COUNT(title)
 FROM wp
 WHERE MATCH(title,text) AGAINST ('database' IN NATURAL LANGUAGE MODE);
 COUNT(title)
 2
 Optimization does not apply if not a single table query.
-EXPLAIN SELECT count(*)
-FROM wp, t1 
-WHERE MATCH(title, text) AGAINST ('database');
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	wp	NULL	fulltext	idx	idx	0	const	1	100.00	Using where; Ft_hints: no_ranking; Using index
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	6	100.00	NULL
-Warnings:
-Note	1003	/* select#1 */ select count(0) AS `count(*)` from `test`.`wp` join `test`.`t1` where (match `test`.`wp`.`title`,`test`.`wp`.`text` against ('database'))
+Pattern "-> Aggregate" found
 SELECT count(*)
 FROM wp, t1 
 WHERE MATCH(title, text) AGAINST ('database');
 count(*)
 12
 Optimization does not apply if MATCH is part of an expression
-EXPLAIN SELECT COUNT(title) 
-FROM wp 
-WHERE MATCH(title,text) AGAINST ('database' IN NATURAL LANGUAGE MODE) > 0;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	wp	NULL	fulltext	idx	idx	0	const	1	100.00	Using where; Ft_hints: rank > 0
-Warnings:
-Note	1003	/* select#1 */ select count(`test`.`wp`.`title`) AS `COUNT(title)` from `test`.`wp` where ((match `test`.`wp`.`title`,`test`.`wp`.`text` against ('database')) > 0)
+Pattern "-> Aggregate" found
 SELECT COUNT(title) 
 FROM wp 
 WHERE MATCH(title,text) AGAINST ('database' IN NATURAL LANGUAGE MODE) > 0;
 COUNT(title)
 2
 Optimization does not apply if MATCH is part of an expression
-EXPLAIN SELECT COUNT(title) 
-FROM wp 
-WHERE MATCH(title,text) AGAINST ('database' IN NATURAL LANGUAGE MODE) > 0;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	wp	NULL	fulltext	idx	idx	0	const	1	100.00	Using where; Ft_hints: rank > 0
-Warnings:
-Note	1003	/* select#1 */ select count(`test`.`wp`.`title`) AS `COUNT(title)` from `test`.`wp` where ((match `test`.`wp`.`title`,`test`.`wp`.`text` against ('database')) > 0)
+Pattern "-> Aggregate" found
 SELECT COUNT(title) 
 FROM wp 
 WHERE MATCH(title,text) AGAINST ('database' IN NATURAL LANGUAGE MODE) > 0;
 COUNT(title)
 2
 Optimization does not apply if COUNT expression is nullable
-EXPLAIN SELECT COUNT(dummy) 
-FROM wp 
-WHERE MATCH(title,text) AGAINST ('database' IN NATURAL LANGUAGE MODE);
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	wp	NULL	fulltext	idx	idx	0	const	1	100.00	Using where; Ft_hints: no_ranking
-Warnings:
-Note	1003	/* select#1 */ select count(`test`.`wp`.`dummy`) AS `COUNT(dummy)` from `test`.`wp` where (match `test`.`wp`.`title`,`test`.`wp`.`text` against ('database'))
+Pattern "-> Aggregate" found
 SELECT COUNT(dummy) 
 FROM wp 
 WHERE MATCH(title,text) AGAINST ('database' IN NATURAL LANGUAGE MODE);
@@ -494,8 +467,8 @@
 FROM wp
 WHERE MATCH(title, text) AGAINST ('database');
 docid	score
-5	2.2718474864959717
 1	1.6663280725479126
+5	2.2718474864959717
 SHOW SESSION STATUS LIKE 'Handler_read%';
 Variable_name	Value
 Handler_read_first	0
@@ -587,12 +560,12 @@
 FROM wp
 WHERE MATCH(title, text) AGAINST ('+MySQL -database');
 docid	score
-5	0
 1	0
-6	0.000000003771856604828372
 2	0.000000001885928302414186
 3	0.000000001885928302414186
 4	0.000000001885928302414186
+5	0
+6	0.000000003771856604828372
 SHOW SESSION STATUS LIKE 'Handler_read%';
 Variable_name	Value
 Handler_read_first	0
@@ -795,8 +768,8 @@
 FROM wp 
 WHERE MATCH(title, text) AGAINST ('database');
 docid	score
-5	0.9562782645225525
 1	0.5756555199623108
+5	0.9562782645225525
 SHOW SESSION STATUS LIKE 'Handler_read%';
 Variable_name	Value
 Handler_read_first	0
@@ -915,19 +888,19 @@
 Note	1003	/* select#1 */ select `test`.`t1`.`FTS_DOC_ID` AS `FTS_DOC_ID`,`test`.`t1`.`title` AS `title` from `test`.`t1` where (match `test`.`t1`.`title`,`test`.`t1`.`text` against ('+very +fast' with query expansion))
 SELECT FTS_DOC_ID, title FROM t1 WHERE MATCH(title, text) AGAINST ('+very +fast' WITH QUERY EXPANSION);
 FTS_DOC_ID	title
+1	MySQL Tutorial
+10	MySQL software is Open Source
 11	The MySQL Database Server is very fast, reliable, scalable, and easy to use
 12	MySQL Server works in client/server enviornment ......
-10	MySQL software is Open Source
-4	1001 MySQL Tricks
+13	MyISAM
 14	A large amount of contributed MySQL software is available
 2	How To Use MySQL Well
-13	MyISAM
+3	Optimizing MySQL
+4	1001 MySQL Tricks
 5	MySQL vs. YourSQL database
+6	MySQL Security
 8	MySQL is a database management system
-1	MySQL Tutorial
 9	MySQL databases are relational
-6	MySQL Security
-3	Optimizing MySQL
 EXPLAIN
 SELECT FTS_DOC_ID, title FROM t1 WHERE MATCH(title, text) AGAINST ('"very fast"@3' IN BOOLEAN MODE);
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -943,6 +916,7 @@
 1	SIMPLE	t1	NULL	fulltext	ft_idx	ft_idx	0	const	1	100.00	Using where; Ft_hints: no_ranking; Using index
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`FTS_DOC_ID` AS `FTS_DOC_ID` from `test`.`t1` where (match `test`.`t1`.`title`,`test`.`t1`.`text` against ('+for' in boolean mode))
+Pattern "Full-text covering index search on t1 using ft_idx" found
 SELECT FTS_DOC_ID  FROM t1
 WHERE MATCH(title, text) AGAINST ('+for' IN BOOLEAN MODE);
 FTS_DOC_ID
@@ -1077,9 +1051,9 @@
 ORDER BY `rank`
 LIMIT 3;
 FTS_DOC_ID	rank
-9	0.15835624933242798
-12	0.15835624933242798
 1	0.15835624933242798
+12	0.15835624933242798
+9	0.15835624933242798
 EXPLAIN
 SELECT FTS_DOC_ID, MATCH (title, text) AGAINST ('fast database' IN NATURAL LANGUAGE MODE) as `rank`
 FROM t1 WHERE MATCH (title, text) AGAINST ('fast database' IN NATURAL LANGUAGE MODE)
@@ -1137,6 +1111,7 @@
 1	SIMPLE	t1	NULL	fulltext	ft_idx	ft_idx	0	const	1	100.00	Using where; Ft_hints: sorted, limit = 3; Using index
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`FTS_DOC_ID` AS `FTS_DOC_ID`,(match `test`.`t1`.`title`,`test`.`t1`.`text` against ('+database' in boolean mode)) AS `rank` from `test`.`t1` where (match `test`.`t1`.`title`,`test`.`t1`.`text` against ('+database' in boolean mode)) order by (match `test`.`t1`.`title`,`test`.`t1`.`text` against ('+database' in boolean mode)) desc limit 3
+Pattern "Full-text covering index search on t1 using ft_idx" found
 SELECT FTS_DOC_ID,  MATCH(title, text) AGAINST ('+database' IN BOOLEAN MODE) as `rank`
 FROM t1 WHERE MATCH(title, text) AGAINST ('+database' IN BOOLEAN MODE)
 ORDER BY MATCH(title, text) AGAINST ('+database' IN BOOLEAN MODE)  DESC
@@ -1153,6 +1128,16 @@
 1	SIMPLE	t1	NULL	fulltext	PRIMARY,FTS_DOC_ID_INDEX,ft_idx	ft_idx	0	const	1	100.00	Using where; Ft_hints: sorted; Using index
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`FTS_DOC_ID` AS `FTS_DOC_ID`,(match `test`.`t1`.`title`,`test`.`t1`.`text` against ('+database' in boolean mode)) AS `rank` from `test`.`t1` where ((match `test`.`t1`.`title`,`test`.`t1`.`text` against ('+database' in boolean mode)) and (`test`.`t1`.`FTS_DOC_ID` > 1)) order by (match `test`.`t1`.`title`,`test`.`t1`.`text` against ('+database' in boolean mode)) desc limit 3
+EXPLAIN FORMAT=TREE
+SELECT FTS_DOC_ID,  MATCH(title, text) AGAINST ('+database' IN BOOLEAN MODE) as `rank`
+FROM t1 WHERE MATCH(title, text) AGAINST ('+database' IN BOOLEAN MODE) and FTS_DOC_ID > 1
+ORDER BY MATCH(title, text) AGAINST ('+database' IN BOOLEAN MODE)  DESC
+LIMIT 3;
+EXPLAIN
+-> Limit: 3 row(s)
+    -> Filter:
+        -> Full-text covering index search on t1 using ft_idx (title='+database')
+
 SELECT FTS_DOC_ID,  MATCH(title, text) AGAINST ('+database' IN BOOLEAN MODE) as `rank`
 FROM t1 WHERE MATCH(title, text) AGAINST ('+database' IN BOOLEAN MODE) and FTS_DOC_ID > 1
 ORDER BY MATCH(title, text) AGAINST ('+database' IN BOOLEAN MODE)  DESC
@@ -1216,12 +1201,12 @@
 SELECT FTS_DOC_ID FROM t1
 WHERE MATCH (title, text) AGAINST ('fast database' IN NATURAL LANGUAGE MODE) > 0.1;
 FTS_DOC_ID
+1
 11
+12
 5
 8
-1
 9
-12
 # additional test for correct behaviour
 EXPLAIN SELECT * FROM t1 ORDER BY MATCH (title, text) AGAINST ('fast database' IN NATURAL LANGUAGE MODE) DESC LIMIT 10;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -1233,12 +1218,12 @@
 MATCH (title, text) AGAINST ('mysql' IN NATURAL LANGUAGE MODE)
 LIMIT 6;
 FTS_DOC_ID
+1
 11
+12
 5
 8
-1
 9
-12
 # test OR condition
 SELECT FTS_DOC_ID
 FROM t1
@@ -1373,12 +1358,12 @@
 MATCH(b.title, b.text) AGAINST ('+mysql' IN BOOLEAN MODE) and
 a.FTS_DOC_ID = b.FTS_DOC_ID;
 FTS_DOC_ID	FTS_DOC_ID
-5	5
-8	8
 1	1
-9	9
 11	11
 12	12
+5	5
+8	8
+9	9
 EXPLAIN SELECT a.FTS_DOC_ID, b.FTS_DOC_ID
 FROM t1 a, t1 b
 WHERE MATCH(a.title, a.text) AGAINST ('+database' IN BOOLEAN MODE) and
@@ -1395,42 +1380,42 @@
 WHERE MATCH(a.title, a.text) AGAINST ('+database' IN BOOLEAN MODE) and
 MATCH(b.title, b.text) AGAINST ('+database' IN BOOLEAN MODE);
 FTS_DOC_ID	MATCH(a.title, a.text) AGAINST ('+database' IN BOOLEAN MODE)	FTS_DOC_ID	MATCH(b.title, b.text) AGAINST ('+database' IN BOOLEAN MODE)
-5	0.47506874799728394	5	0.47506874799728394
-5	0.47506874799728394	8	0.31671249866485596
-5	0.47506874799728394	1	0.15835624933242798
-5	0.47506874799728394	9	0.15835624933242798
-5	0.47506874799728394	11	0.15835624933242798
-5	0.47506874799728394	12	0.15835624933242798
-8	0.31671249866485596	5	0.47506874799728394
-8	0.31671249866485596	8	0.31671249866485596
-8	0.31671249866485596	1	0.15835624933242798
-8	0.31671249866485596	9	0.15835624933242798
-8	0.31671249866485596	11	0.15835624933242798
-8	0.31671249866485596	12	0.15835624933242798
-1	0.15835624933242798	5	0.47506874799728394
-1	0.15835624933242798	8	0.31671249866485596
 1	0.15835624933242798	1	0.15835624933242798
-1	0.15835624933242798	9	0.15835624933242798
 1	0.15835624933242798	11	0.15835624933242798
 1	0.15835624933242798	12	0.15835624933242798
-9	0.15835624933242798	5	0.47506874799728394
-9	0.15835624933242798	8	0.31671249866485596
-9	0.15835624933242798	1	0.15835624933242798
-9	0.15835624933242798	9	0.15835624933242798
-9	0.15835624933242798	11	0.15835624933242798
-9	0.15835624933242798	12	0.15835624933242798
-11	0.15835624933242798	5	0.47506874799728394
-11	0.15835624933242798	8	0.31671249866485596
+1	0.15835624933242798	5	0.47506874799728394
+1	0.15835624933242798	8	0.31671249866485596
+1	0.15835624933242798	9	0.15835624933242798
 11	0.15835624933242798	1	0.15835624933242798
-11	0.15835624933242798	9	0.15835624933242798
 11	0.15835624933242798	11	0.15835624933242798
 11	0.15835624933242798	12	0.15835624933242798
-12	0.15835624933242798	5	0.47506874799728394
-12	0.15835624933242798	8	0.31671249866485596
+11	0.15835624933242798	5	0.47506874799728394
+11	0.15835624933242798	8	0.31671249866485596
+11	0.15835624933242798	9	0.15835624933242798
 12	0.15835624933242798	1	0.15835624933242798
-12	0.15835624933242798	9	0.15835624933242798
 12	0.15835624933242798	11	0.15835624933242798
 12	0.15835624933242798	12	0.15835624933242798
+12	0.15835624933242798	5	0.47506874799728394
+12	0.15835624933242798	8	0.31671249866485596
+12	0.15835624933242798	9	0.15835624933242798
+5	0.47506874799728394	1	0.15835624933242798
+5	0.47506874799728394	11	0.15835624933242798
+5	0.47506874799728394	12	0.15835624933242798
+5	0.47506874799728394	5	0.47506874799728394
+5	0.47506874799728394	8	0.31671249866485596
+5	0.47506874799728394	9	0.15835624933242798
+8	0.31671249866485596	1	0.15835624933242798
+8	0.31671249866485596	11	0.15835624933242798
+8	0.31671249866485596	12	0.15835624933242798
+8	0.31671249866485596	5	0.47506874799728394
+8	0.31671249866485596	8	0.31671249866485596
+8	0.31671249866485596	9	0.15835624933242798
+9	0.15835624933242798	1	0.15835624933242798
+9	0.15835624933242798	11	0.15835624933242798
+9	0.15835624933242798	12	0.15835624933242798
+9	0.15835624933242798	5	0.47506874799728394
+9	0.15835624933242798	8	0.31671249866485596
+9	0.15835624933242798	9	0.15835624933242798
 EXPLAIN SELECT a.FTS_DOC_ID, MATCH(a.title, a.text) AGAINST ('+database' IN BOOLEAN MODE),
 b.FTS_DOC_ID, MATCH(b.title, b.text) AGAINST ('+database' IN BOOLEAN MODE)
 FROM t1 a, t1 b
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/plugin_1.result mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/plugin_1.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/plugin_1.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/plugin_1.result	2021-09-28 11:46:34.000000000 +0000
@@ -42,8 +42,8 @@
 MATCH(title, body) AGAINST('dbms' WITH QUERY EXPANSION);
 id	title	body	body1	body2	body3
 1	MySQL Tutorial	DBMS stands for MySQL DataBase ...	row1col4	row1col5	row1col5
-3	Optimizing MySQL	In this tutorial we will show ...	row3col4	row3col5	row3col5 for
 2	How To Use MySQL Well	After you went through a ...	row2col4	row2col5	row2col5
+3	Optimizing MySQL	In this tutorial we will show ...	row3col4	row3col5	row3col5 for
 4	1001 MySQL Tricks	How to use full-text search engine	row4col4	row4col5	row4col5
 5	Go MySQL Tricks	How to use full text search engine	row5col4 this	row5col5	row5col5
 SELECT * FROM articles WHERE
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/plugin_debug.result mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/plugin_debug.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/plugin_debug.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/plugin_debug.result	2021-09-28 11:46:34.000000000 +0000
@@ -74,19 +74,19 @@
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('full-text' WITH QUERY EXPANSION);
 id	title	body
-4	1001 MySQL Tricks	How to use full-text search engine
-5	Go MySQL Tricks	How to use full text search engine
-2	How To Use MySQL Well	After you went through a ...
 1	MySQL Tutorial	DBMS stands for MySQL DataBase ...
+2	How To Use MySQL Well	After you went through a ...
 3	Optimizing MySQL	In this tutorial we will show ...
+4	1001 MySQL Tricks	How to use full-text search engine
+5	Go MySQL Tricks	How to use full text search engine
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('full text' WITH QUERY EXPANSION);
 id	title	body
-5	Go MySQL Tricks	How to use full text search engine
-4	1001 MySQL Tricks	How to use full-text search engine
-2	How To Use MySQL Well	After you went through a ...
 1	MySQL Tutorial	DBMS stands for MySQL DataBase ...
+2	How To Use MySQL Well	After you went through a ...
 3	Optimizing MySQL	In this tutorial we will show ...
+4	1001 MySQL Tricks	How to use full-text search engine
+5	Go MySQL Tricks	How to use full text search engine
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('"mysql database"' IN BOOLEAN MODE);
 id	title	body
@@ -198,11 +198,11 @@
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('>mysql <database ~search' IN BOOLEAN MODE);
 id	title	body
+1	MySQL Tutorial	DBMS stands for MySQL DataBase ...
+2	MySQL Tutorial	DBMS stands for MySQL good one DataBase ...
 3	How To Use MySQL Well	After you went through a ...
 4	Optimizing MySQL	In this tutorial we will show ...
 5	1001 MySQL Tricks	How to use full-text search engine
-1	MySQL Tutorial	DBMS stands for MySQL DataBase ...
-2	MySQL Tutorial	DBMS stands for MySQL good one DataBase ...
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('+(mysql database) -engine' IN BOOLEAN MODE);
 id	title	body
@@ -252,13 +252,13 @@
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('+("dbms stands" search) -good' IN BOOLEAN MODE);
 id	title	body
-5	1001 MySQL Tricks	How to use full-text search engine
 1	MySQL Tutorial	DBMS stands for MySQL DataBase ...
+5	1001 MySQL Tricks	How to use full-text search engine
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('+("dbms stands" "full text") -good' IN BOOLEAN MODE);
 id	title	body
-5	1001 MySQL Tricks	How to use full-text search engine
 1	MySQL Tutorial	DBMS stands for MySQL DataBase ...
+5	1001 MySQL Tricks	How to use full-text search engine
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('("msyql database")@3' IN BOOLEAN MODE);
 id	title	body
@@ -281,8 +281,8 @@
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('数�库');
 id	title	body
-3	� 想 将 数� 添加 到 数�库	或 访问�处� 计算机 数�库 中 �存 的 数�
 1	数�库 是 数� 的 结构化 集�	它 �以 是 任何 东西
+3	� 想 将 数� 添加 到 数�库	或 访问�处� 计算机 数�库 中 �存 的 数�
 4	需� 使用 数�库 管�系统	计算机 是 处� 大� 数� 的 �想 工具
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('数�');
@@ -290,8 +290,8 @@
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('数�*');
 id	title	body
-3	� 想 将 数� 添加 到 数�库	或 访问�处� 计算机 数�库 中 �存 的 数�
 1	数�库 是 数� 的 结构化 集�	它 �以 是 任何 东西
+3	� 想 将 数� 添加 到 数�库	或 访问�处� 计算机 数�库 中 �存 的 数�
 4	需� 使用 数�库 管�系统	计算机 是 处� 大� 数� 的 �想 工具
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('+数�库 -计算机');
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/plugin.result mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/plugin.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/plugin.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/plugin.result	2021-09-28 11:46:34.000000000 +0000
@@ -92,19 +92,19 @@
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('full-text' WITH QUERY EXPANSION);
 id	title	body
-4	1001 MySQL Tricks	How to use full-text search engine
-5	Go MySQL Tricks	How to use full text search engine
-2	How To Use MySQL Well	After you went through a ...
 1	MySQL Tutorial	DBMS stands for MySQL DataBase ...
+2	How To Use MySQL Well	After you went through a ...
 3	Optimizing MySQL	In this tutorial we will show ...
+4	1001 MySQL Tricks	How to use full-text search engine
+5	Go MySQL Tricks	How to use full text search engine
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('full text' WITH QUERY EXPANSION);
 id	title	body
-5	Go MySQL Tricks	How to use full text search engine
-4	1001 MySQL Tricks	How to use full-text search engine
-2	How To Use MySQL Well	After you went through a ...
 1	MySQL Tutorial	DBMS stands for MySQL DataBase ...
+2	How To Use MySQL Well	After you went through a ...
 3	Optimizing MySQL	In this tutorial we will show ...
+4	1001 MySQL Tricks	How to use full-text search engine
+5	Go MySQL Tricks	How to use full text search engine
 SELECT * FROM articles WHERE
 MATCH(title, body) AGAINST('"mysql database"' IN BOOLEAN MODE);
 id	title	body
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/stopword.result mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/stopword.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/stopword.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/stopword.result	2021-09-28 11:46:34.000000000 +0000
@@ -259,12 +259,12 @@
 6	MySQL Security	When configured properly, MySQL ...
 SELECT * FROM articles WHERE MATCH(title,body) AGAINST ("what" WITH QUERY EXPANSION);
 id	title	body
-3	where will Optimizing MySQL	In what tutorial we will show ...
 1	MySQL from Tutorial	DBMS stands for DataBase ...
-6	MySQL Security	When configured properly, MySQL ...
 2	when To Use MySQL Well	After that you went through a ...
+3	where will Optimizing MySQL	In what tutorial we will show ...
 4	1001 MySQL Tricks	1. Never run mysqld as root. 2. ...
 5	MySQL vs. YourSQL	In the following database comparison ...
+6	MySQL Security	When configured properly, MySQL ...
 SELECT * FROM articles WHERE MATCH(title,body) AGAINST("whe*" IN BOOLEAN MODE);
 id	title	body
 2	when To Use MySQL Well	After that you went through a ...
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/subexpr.result mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/subexpr.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/subexpr.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/subexpr.result	2021-09-28 11:46:34.000000000 +0000
@@ -69,14 +69,14 @@
 f1	f2
 1	Pumpkin soup with cheese bread
 10	This row contains pumpkin and cheese
-15	This row contains all four cheese, souffle, pumpkin and  tart
-7	This row contains only cheese
 12	This row contains both souffle and cheese
 13	This row contains both tart and cheese
+14	This row contains all three souffle, pumpkin and  tart
+15	This row contains all four cheese, souffle, pumpkin and  tart
 6	This row contains only pumpkin
+7	This row contains only cheese
 8	This row contains pumpkin and souffle
 9	This row contains pumpkin and tart
-14	This row contains all three souffle, pumpkin and  tart
 SELECT * FROM t1 WHERE MATCH(f2)
 AGAINST('+pumpkin +(souffle)' IN BOOLEAN MODE);
 f1	f2
@@ -93,9 +93,9 @@
 SELECT * FROM t1 WHERE MATCH(f2)
 AGAINST('+pumpkin +(>souffle <tart)' IN BOOLEAN MODE);
 f1	f2
-8	This row contains pumpkin and souffle
 14	This row contains all three souffle, pumpkin and  tart
 15	This row contains all four cheese, souffle, pumpkin and  tart
+8	This row contains pumpkin and souffle
 9	This row contains pumpkin and tart
 SELECT * FROM t1 WHERE MATCH(f2)
 AGAINST('+pumpkin +(souffle tart)' IN BOOLEAN MODE);
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/sync_block.result mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/sync_block.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/sync_block.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/sync_block.result	2021-09-28 11:46:34.000000000 +0000
@@ -65,3 +65,5 @@
 SET GLOBAL slow_query_log = @old_slow_query_log;
 SET GLOBAL long_query_time = @old_long_query_time;
 SET GLOBAL binlog_order_commits = @old_binlog_order_commits;
+TRUNCATE TABLE mysql.general_log;
+TRUNCATE TABLE mysql.slow_log;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/transaction.result mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/transaction.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/r/transaction.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/r/transaction.result	2021-09-28 11:46:34.000000000 +0000
@@ -53,8 +53,8 @@
 AGAINST ('tutorial' WITH QUERY EXPANSION);
 id	a	b
 1	MySQL from Tutorial	DBMS stands for DataBase ...
-3	where will Optimizing MySQL	what In this tutorial we will show ...
 2	when To Use MySQL Well	After that you went through a ...
+3	where will Optimizing MySQL	what In this tutorial we will show ...
 COMMIT;
 SELECT * FROM t1
 WHERE MATCH (a,b)
@@ -67,18 +67,18 @@
 WHERE MATCH (a,b)
 AGAINST ('request MySQL' IN BOOLEAN MODE);
 id	a	b
-4	MySQL Tutorial	request docteam for oraclehelp.
 1	MySQL from Tutorial	DBMS stands for DataBase ...
 2	when To Use MySQL Well	After that you went through a ...
 3	where will Optimizing MySQL	what In this tutorial we will show ...
+4	MySQL Tutorial	request docteam for oraclehelp.
 SELECT * FROM t1
 WHERE MATCH (a,b)
 AGAINST ('tutorial' WITH QUERY EXPANSION);
 id	a	b
 1	MySQL from Tutorial	DBMS stands for DataBase ...
-4	MySQL Tutorial	request docteam for oraclehelp.
-3	where will Optimizing MySQL	what In this tutorial we will show ...
 2	when To Use MySQL Well	After that you went through a ...
+3	where will Optimizing MySQL	what In this tutorial we will show ...
+4	MySQL Tutorial	request docteam for oraclehelp.
 START TRANSACTION;
 INSERT INTO t1 (a,b) VALUES (NULL,NULL);
 SELECT * FROM t1
@@ -171,15 +171,15 @@
 AGAINST ('tutorial' WITH QUERY EXPANSION);
 id	a	b
 1	MySQL from Tutorial	DBMS stands for DataBase ...
-3	where will Optimizing MySQL	what In this tutorial we will show ...
 2	when To Use MySQL Well	After that you went through a ...
+3	where will Optimizing MySQL	what In this tutorial we will show ...
 SELECT * FROM t1
 WHERE MATCH (a,b)
 AGAINST ('tutorial' WITH QUERY EXPANSION);
 id	a	b
 1	MySQL from Tutorial	DBMS stands for DataBase ...
-3	where will Optimizing MySQL	what In this tutorial we will show ...
 2	when To Use MySQL Well	After that you went through a ...
+3	where will Optimizing MySQL	what In this tutorial we will show ...
 ROLLBACK;
 SELECT * FROM t1
 WHERE MATCH (a,b)
@@ -199,8 +199,8 @@
 AGAINST ('tutorial' WITH QUERY EXPANSION);
 id	a	b
 1	MySQL from Tutorial	DBMS stands for DataBase ...
-3	where will Optimizing MySQL	what In this tutorial we will show ...
 2	when To Use MySQL Well	After that you went through a ...
+3	where will Optimizing MySQL	what In this tutorial we will show ...
 START TRANSACTION;
 INSERT INTO t1 (a,b) VALUES (NULL,NULL);
 UPDATE t1 SET a = 'Trial version' , b = 'query performace 1255 minute on 2.1Hz Memory 2GB...'
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/basic.test mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/basic.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/basic.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/basic.test	2021-09-28 11:46:34.000000000 +0000
@@ -46,12 +46,14 @@
 	FROM articles;
 
 # 'MySQL' treated as stopword (stopword functionality not yet supported)
+--sorted_result
 SELECT * FROM articles
 	WHERE MATCH (title,body)
 	AGAINST ('MySQL' IN NATURAL LANGUAGE MODE);
 
 # Boolean search
 # Select rows contain "MySQL" but not "YourSQL"
+--sorted_result
 SELECT * FROM articles WHERE MATCH (title,body)
 	AGAINST ('+MySQL -YourSQL' IN BOOLEAN MODE);
 
@@ -64,11 +66,13 @@
 	AGAINST ('+MySQL +YourSQL' IN BOOLEAN MODE);
 
 # Select rows contain "MySQL" but rank rows with "YourSQL" higher
+--sorted_result
 SELECT * FROM articles WHERE MATCH (title,body)
 	AGAINST ('+MySQL YourSQL' IN BOOLEAN MODE);
 
 # Test negation operator. Select rows contain MySQL,
 # if the row contains "YourSQL", rank it lower
+--sorted_result
 SELECT * FROM articles WHERE MATCH (title,body)
 	AGAINST ('+MySQL ~YourSQL' IN BOOLEAN MODE);
 
@@ -79,6 +83,7 @@
 	AGAINST ('t*' IN BOOLEAN MODE);
 
 # Test wild card search, notice row 6 with 2 "MySQL" rank first
+--sorted_result
 SELECT * FROM articles WHERE MATCH (title,body)
 	AGAINST ('MY*' IN BOOLEAN MODE);
 
@@ -90,21 +95,25 @@
 # the word relevance rank and the "<" operator decreases it
 # Following test puts rows with "Well" on top and rows
 # with "stands" at the bottom
+--sorted_result
 SELECT * FROM articles WHERE MATCH (title,body)
 	AGAINST ('+ MySQL >Well < stands' IN BOOLEAN MODE);
 
 # Test sub-expression boolean search. Find rows contain
 # "MySQL" but not "Well" or "stands".
+--sorted_result
 SELECT * FROM articles WHERE MATCH (title,body)
 	AGAINST ('+ MySQL - (Well stands)' IN BOOLEAN MODE);
 
 # Test sub-expression boolean search. Find rows contain
 # "MySQL" and "Well" or "MySQL" and "stands". But rank the 
 # doc with "Well" higher, and doc with "stands" lower.
+--sorted_result
 SELECT * FROM articles WHERE MATCH (title,body)
 	AGAINST ('+ MySQL + (>Well < stands)' IN BOOLEAN MODE);
 
 # Test nested sub-expression.
+--sorted_result
 SELECT * FROM articles WHERE MATCH (title,body)
 	AGAINST ('YourSQL + (+MySQL - (Tricks Security))' IN BOOLEAN MODE);
 
@@ -133,6 +142,7 @@
 # This query will return result containing word "database" as
 # the query expand from "test" to words in document just
 # inserted above
+--sorted_result
 SELECT * FROM articles
         WHERE MATCH (title,body)
         AGAINST ('test' WITH QUERY EXPANSION);
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/bug_32831765.test mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/bug_32831765.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/bug_32831765.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/bug_32831765.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,196 @@
+--echo #
+--echo # Bug#32831765 SERVER HITS OOM CONDITION WHEN LOADING TWO
+--echo # INNODB TABLES WITH FTS INDEXES
+--echo #
+
+--source include/have_debug.inc
+
+create table t1 ( `id` int unsigned NOT NULL AUTO_INCREMENT, `col01` text,
+`col02` text, `col03` text, `col04` text, `col05` text, `col06` text, `col07`
+text, `col08` text, `col09` text, `col10` text, `col11` text, `col12` text,
+`col13` text, `col14` text, `col15` text, `col16` text, `col17` text, `col18`
+text, `col19` text, `col20` text, `col21` text, `col22` text, `col23` text,
+`col24` text, `col25` text, `col26` text, `col27` text, `col28` text, `col29`
+text, `col30` text, PRIMARY KEY (`id`), FULLTEXT KEY (`col01`), FULLTEXT KEY
+(`col02`), FULLTEXT KEY (`col03`), FULLTEXT KEY (`col04`), FULLTEXT KEY
+(`col05`), FULLTEXT KEY (`col06`), FULLTEXT KEY (`col07`), FULLTEXT KEY
+(`col08`), FULLTEXT KEY (`col09`), FULLTEXT KEY (`col10`), FULLTEXT KEY
+(`col11`), FULLTEXT KEY (`col12`), FULLTEXT KEY (`col13`), FULLTEXT KEY
+(`col14`), FULLTEXT KEY (`col15`), FULLTEXT KEY (`col16`), FULLTEXT KEY
+(`col17`), FULLTEXT KEY (`col18`), FULLTEXT KEY (`col19`), FULLTEXT KEY
+(`col20`), FULLTEXT KEY (`col21`), FULLTEXT KEY (`col22`), FULLTEXT KEY
+(`col23`), FULLTEXT KEY (`col24`), FULLTEXT KEY (`col25`), FULLTEXT KEY
+(`col26`), FULLTEXT KEY (`col27`), FULLTEXT KEY (`col28`), FULLTEXT KEY
+(`col29`), FULLTEXT KEY (`col30`)) engine=innodb;
+
+create table t2 ( `id` int unsigned NOT NULL AUTO_INCREMENT, `col01` text,
+`col02` text, `col03` text, `col04` text, `col05` text, `col06` text, `col07`
+text, `col08` text, `col09` text, `col10` text, `col11` text, `col12` text,
+`col13` text, `col14` text, `col15` text, `col16` text, `col17` text, `col18`
+text, `col19` text, `col20` text, `col21` text, `col22` text, `col23` text,
+`col24` text, `col25` text, `col26` text, `col27` text, `col28` text, `col29`
+text, `col30` text, PRIMARY KEY (`id`), FULLTEXT KEY (`col01`), FULLTEXT KEY
+(`col02`), FULLTEXT KEY (`col03`), FULLTEXT KEY (`col04`), FULLTEXT KEY
+(`col05`), FULLTEXT KEY (`col06`), FULLTEXT KEY (`col07`), FULLTEXT KEY
+(`col08`), FULLTEXT KEY (`col09`), FULLTEXT KEY (`col10`), FULLTEXT KEY
+(`col11`), FULLTEXT KEY (`col12`), FULLTEXT KEY (`col13`), FULLTEXT KEY
+(`col14`), FULLTEXT KEY (`col15`), FULLTEXT KEY (`col16`), FULLTEXT KEY
+(`col17`), FULLTEXT KEY (`col18`), FULLTEXT KEY (`col19`), FULLTEXT KEY
+(`col20`), FULLTEXT KEY (`col21`), FULLTEXT KEY (`col22`), FULLTEXT KEY
+(`col23`), FULLTEXT KEY (`col24`), FULLTEXT KEY (`col25`), FULLTEXT KEY
+(`col26`), FULLTEXT KEY (`col27`), FULLTEXT KEY (`col28`), FULLTEXT KEY
+(`col29`), FULLTEXT KEY (`col30`)) engine=innodb;
+
+
+create table t3 ( `id` int unsigned NOT NULL AUTO_INCREMENT, `col01` text,
+`col02` text, `col03` text, `col04` text, `col05` text, `col06` text, `col07`
+text, `col08` text, `col09` text, `col10` text, `col11` text, `col12` text,
+`col13` text, `col14` text, `col15` text, `col16` text, `col17` text, `col18`
+text, `col19` text, `col20` text, `col21` text, `col22` text, `col23` text,
+`col24` text, `col25` text, `col26` text, `col27` text, `col28` text, `col29`
+text, `col30` text, PRIMARY KEY (`id`), FULLTEXT KEY (`col01`), FULLTEXT KEY
+(`col02`), FULLTEXT KEY (`col03`), FULLTEXT KEY (`col04`), FULLTEXT KEY
+(`col05`), FULLTEXT KEY (`col06`), FULLTEXT KEY (`col07`), FULLTEXT KEY
+(`col08`), FULLTEXT KEY (`col09`), FULLTEXT KEY (`col10`), FULLTEXT KEY
+(`col11`), FULLTEXT KEY (`col12`), FULLTEXT KEY (`col13`), FULLTEXT KEY
+(`col14`), FULLTEXT KEY (`col15`), FULLTEXT KEY (`col16`), FULLTEXT KEY
+(`col17`), FULLTEXT KEY (`col18`), FULLTEXT KEY (`col19`), FULLTEXT KEY
+(`col20`), FULLTEXT KEY (`col21`), FULLTEXT KEY (`col22`), FULLTEXT KEY
+(`col23`), FULLTEXT KEY (`col24`), FULLTEXT KEY (`col25`), FULLTEXT KEY
+(`col26`), FULLTEXT KEY (`col27`), FULLTEXT KEY (`col28`), FULLTEXT KEY
+(`col29`), FULLTEXT KEY (`col30`)) engine=innodb;
+
+create table t4 ( `id` int unsigned NOT NULL AUTO_INCREMENT, `col01` text,
+`col02` text, `col03` text, `col04` text, `col05` text, `col06` text, `col07`
+text, `col08` text, `col09` text, `col10` text, `col11` text, `col12` text,
+`col13` text, `col14` text, `col15` text, `col16` text, `col17` text, `col18`
+text, `col19` text, `col20` text, `col21` text, `col22` text, `col23` text,
+`col24` text, `col25` text, `col26` text, `col27` text, `col28` text, `col29`
+text, `col30` text, PRIMARY KEY (`id`), FULLTEXT KEY (`col01`), FULLTEXT KEY
+(`col02`), FULLTEXT KEY (`col03`), FULLTEXT KEY (`col04`), FULLTEXT KEY
+(`col05`), FULLTEXT KEY (`col06`), FULLTEXT KEY (`col07`), FULLTEXT KEY
+(`col08`), FULLTEXT KEY (`col09`), FULLTEXT KEY (`col10`), FULLTEXT KEY
+(`col11`), FULLTEXT KEY (`col12`), FULLTEXT KEY (`col13`), FULLTEXT KEY
+(`col14`), FULLTEXT KEY (`col15`), FULLTEXT KEY (`col16`), FULLTEXT KEY
+(`col17`), FULLTEXT KEY (`col18`), FULLTEXT KEY (`col19`), FULLTEXT KEY
+(`col20`), FULLTEXT KEY (`col21`), FULLTEXT KEY (`col22`), FULLTEXT KEY
+(`col23`), FULLTEXT KEY (`col24`), FULLTEXT KEY (`col25`), FULLTEXT KEY
+(`col26`), FULLTEXT KEY (`col27`), FULLTEXT KEY (`col28`), FULLTEXT KEY
+(`col29`), FULLTEXT KEY (`col30`)) engine=innodb;
+
+delimiter |;
+
+--echo #create procedure to inset into the table.
+CREATE  PROCEDURE `proc_insert`(IN tab_name VARCHAR(40))
+BEGIN
+	DECLARE i INT DEFAULT 1;
+	SET @insert_tbl =CONCAT('INSERT INTO ', tab_name, '( `col01`, `col02`,
+	`col03`, `col04`, `col05`, `col06`, `col07`, `col08`, `col09`, `col10`,
+	`col11`, `col12`, `col13`, `col14`, `col15`, `col16`, `col17`, `col18`,
+	`col19`, `col20`, `col21`, `col22`, `col23`, `col24`, `col25`, `col26`,
+	`col27`, `col28`, `col29`, `col30`)
+	VALUES ( MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()),
+	MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()),
+	MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()),
+	MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()),
+	MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()),
+	MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()),
+	MD5(RAND()))');
+	PREPARE ins_stmt FROM @insert_tbl;
+	while (i <= 2000) DO
+		EXECUTE ins_stmt;
+		SET i = i + 1;
+	END WHILE;
+	DEALLOCATE PREPARE ins_stmt;
+END |
+
+delimiter ;|
+
+connect (con1,localhost,root,,);
+connect (con2,localhost,root,,);
+connect (con3,localhost,root,,);
+connect (con4,localhost,root,,);
+connect (con5,localhost,root,,);
+connect (con6,localhost,root,,);
+connect (con7,localhost,root,,);
+connect (con8,localhost,root,,);
+
+connection con1;
+--send call proc_insert('t1');
+
+connection con2;
+--send call proc_insert('t1');
+
+connection con3;
+--send call proc_insert('t2');
+
+connection con4;
+--send call proc_insert('t2');
+
+connection con5;
+--send call proc_insert('t3');
+
+connection con6;
+--send call proc_insert('t3');
+
+connection con7;
+--send call proc_insert('t4');
+
+connection con8;
+--send call proc_insert('t4');
+
+connection default;
+
+# Check if number of SYNC requests are more than 1000.
+SET GLOBAL DEBUG="+d,fts_optimize_wq_count_check";
+
+# Wait for 1 minute to make sure INSERTs into FTS table will trigger
+# FTS_SYNC request
+let $loop=60;
+while($loop > 1)
+{
+  sleep 1;
+  dec $loop;
+}
+
+SET GLOBAL DEBUG="-d,fts_optimize_wq_count_check";
+
+connection con1;
+reap;
+disconnect con1;
+
+connection con2;
+reap;
+disconnect con2;
+
+connection con3;
+reap;
+disconnect con3;
+
+connection con4;
+reap;
+disconnect con4;
+
+connection con5;
+reap;
+disconnect con5;
+
+connection con6;
+reap;
+disconnect con6;
+
+connection con7;
+reap;
+disconnect con7;
+
+connection con8;
+reap;
+disconnect con8;
+
+connection default;
+--echo # clean up
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE t3;
+DROP TABLE t4;
+DROP PROCEDURE proc_insert;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/ddl.test mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/ddl.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/ddl.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/ddl.test	2021-09-28 11:46:34.000000000 +0000
@@ -49,6 +49,7 @@
 
 # Boolean search
 # Select rows contain "MySQL" but not "YourSQL"
+--sorted_result
 SELECT * FROM fts_test WHERE MATCH (title,body)
         AGAINST ('+MySQL -YourSQL' IN BOOLEAN MODE);
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/fic.test mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/fic.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/fic.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/fic.test	2021-09-28 11:46:34.000000000 +0000
@@ -42,6 +42,7 @@
 
 # Boolean search
 # Select rows contain "MySQL" but not "YourSQL"
+--sorted_result
 SELECT * FROM articles WHERE MATCH (title,body)
         AGAINST ('+MySQL -YourSQL' IN BOOLEAN MODE);
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/fulltext2.test mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/fulltext2.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/fulltext2.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/fulltext2.test	2021-09-28 11:46:34.000000000 +0000
@@ -259,5 +259,6 @@
 (16, 'Nelson', 'Muntz');
 
 analyze table t1;
+--sorted_result
 SELECT fts_doc_id, first_name, last_name, MATCH(first_name) AGAINST('Homer' IN BOOLEAN MODE) AS score FROM t1;
 DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/fulltext_misc.test mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/fulltext_misc.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/fulltext_misc.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/fulltext_misc.test	2021-09-28 11:46:34.000000000 +0000
@@ -212,3 +212,68 @@
 
 
 --echo End of 5.1 tests
+
+--echo #
+--echo # Bug#32979815: WL#14422: ASSERTION `!(USED_TABS & (~READ_TABLES & ~FILTER_FOR_TABLE))' FAILED
+--echo #
+
+CREATE TABLE t (x VARCHAR(10), FULLTEXT (x));
+
+SELECT 1 FROM t
+WHERE x IN
+ (SELECT MATCH (t2.x) AGAINST ('abc')
+  FROM t AS t1 JOIN t AS t2
+       ON t1.x = t2.x
+  GROUP BY t2.x
+  HAVING t2.x = '');
+
+DROP TABLE t;
+
+--echo #
+--echo # Bug#32980875: WL#14422: ASSERTION `FALSE' FAILED|SQL/BASIC_ROW_ITERATORS.H
+--echo #
+
+CREATE TABLE t (a VARCHAR(10), FULLTEXT (a));
+INSERT INTO t VALUES ('a'), ('b'), ('c');
+ANALYZE TABLE t;
+
+PREPARE prep_stmt FROM '
+
+ SELECT DISTINCT
+   MATCH (t1.a) AGAINST(''x''),
+   MIN(t2.a),
+   t1.a
+ FROM t AS t1 JOIN t AS t2 ON t1.a = t2.a
+ GROUP BY MATCH (t1.a) AGAINST(''x''), t1.a
+
+';
+
+# The second execution used to fail with the hypergraph optimizer.
+--sorted_result
+EXECUTE prep_stmt;
+--sorted_result
+EXECUTE prep_stmt;
+
+DEALLOCATE PREPARE prep_stmt;
+DROP TABLE t;
+
+--echo #
+--echo # Bug#32990422: WL#14422: RESULT MISMATCH WITH FTS FUNCTION
+--echo #
+
+CREATE TABLE t (i INTEGER, x VARCHAR(10), FULLTEXT (x));
+INSERT INTO t VALUES (0, 'a'), (1, 'b'), (0, 'c');
+--sorted_result
+SELECT i = 0 AS a, MATCH(x) AGAINST('d') AS b FROM t GROUP BY a, b;
+DROP TABLE t;
+
+--echo #
+--echo # Bug#32996515: WL#14422: RESULT MISMATCH WITH DISTINCT AND GROUP BY ON FTS FUNCTION
+--echo #
+
+CREATE TABLE t (a INTEGER, b VARCHAR(10), FULLTEXT(b));
+INSERT INTO t VALUES (1, 'a'), (2, 'b');
+--sorted_result
+SELECT DISTINCT MATCH (b) AGAINST ('x'), a
+FROM t GROUP BY MATCH (b) AGAINST ('x'), a;
+DROP TABLE t;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/fulltext.test mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/fulltext.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/fulltext.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/fulltext.test	2021-09-28 11:46:34.000000000 +0000
@@ -29,12 +29,16 @@
 
 # query expansion
 
+--sorted_result
 select * from t1 where MATCH(a,b) AGAINST ("collections" WITH QUERY EXPANSION);
+--sorted_result
 select * from t1 where MATCH(a,b) AGAINST ("indexes" WITH QUERY EXPANSION);
+--sorted_result
 select * from t1 where MATCH(a,b) AGAINST ("indexes collections" WITH QUERY EXPANSION);
 
 # IN NATURAL LANGUAGE MODE
 select * from t1 where MATCH(a,b) AGAINST ("indexes" IN NATURAL LANGUAGE MODE);
+--sorted_result
 select * from t1 where MATCH(a,b) AGAINST ("indexes" IN NATURAL LANGUAGE MODE WITH QUERY EXPANSION);
 --error 1064
 select * from t1 where MATCH(a,b) AGAINST ("indexes" IN BOOLEAN MODE WITH QUERY EXPANSION);
@@ -56,11 +60,14 @@
 
 select * from t1 where MATCH(a,b) AGAINST("support -collections" IN BOOLEAN MODE);
 explain select * from t1 where MATCH(a,b) AGAINST("support -collections" IN BOOLEAN MODE);
+--sorted_result
 select * from t1 where MATCH(a,b) AGAINST("support  collections" IN BOOLEAN MODE);
+--sorted_result
 select * from t1 where MATCH(a,b) AGAINST("support +collections" IN BOOLEAN MODE);
 select * from t1 where MATCH(a,b) AGAINST("sear*" IN BOOLEAN MODE);
 select * from t1 where MATCH(a,b) AGAINST("+support +collections" IN BOOLEAN MODE);
 select * from t1 where MATCH(a,b) AGAINST("+search" IN BOOLEAN MODE);
+--sorted_result
 select * from t1 where MATCH(a,b) AGAINST("+search +(support vector)" IN BOOLEAN MODE);
 select * from t1 where MATCH(a,b) AGAINST("+search -(support vector)" IN BOOLEAN MODE);
 select *, MATCH(a,b) AGAINST("support collections" IN BOOLEAN MODE) as x from t1;
@@ -330,7 +337,9 @@
 --character_set latin1
 CREATE TABLE t1 (s varchar(255), FULLTEXT (s)) ENGINE = InnoDB DEFAULT CHARSET=utf8;
 insert into t1 (s) values ('pära para para'),('para para para');
+--sorted_result
 select * from t1 where match(s) against('para' in boolean mode);
+--sorted_result
 select * from t1 where match(s) against('par*' in boolean mode);
 DROP TABLE t1;
 
@@ -423,7 +432,9 @@
 -- enable_result_log
 PREPARE stmt from "SELECT a, FORMAT(MATCH(a) AGAINST('test1 test'),6) FROM t1 WHERE MATCH(a) AGAINST('test1 test')";
 
+--sorted_result
 EXECUTE stmt;
+--sorted_result
 EXECUTE stmt;
 DEALLOCATE PREPARE stmt;
 DROP TABLE t1;
@@ -682,3 +693,19 @@
 DROP TABLE t1;
 
 --echo End of 5.1 tests
+
+--echo #
+--echo # Bug#33041720: REDUNDANT CALL TO INIT_FTFUNCS() IN MULTI-TABLE DELETE
+--echo #
+
+# This test case does not show a problem. It just adds test coverage
+# of multi-table DELETE statements that use full-text search.
+
+CREATE TABLE t1 (id INTEGER);
+CREATE TABLE t2 (id INTEGER, x VARCHAR(10), FULLTEXT(x));
+INSERT INTO t1 VALUES (1), (2), (3), (4), (5);
+INSERT INTO t2 VALUES (1, 'abc'), (2, 'xyz'), (3, 'abc def'), (4, NULL);
+DELETE t1 FROM t1, t2 WHERE t1.id = t2.id AND MATCH (t2.x) AGAINST ('abc');
+--sorted_result
+SELECT * FROM t1;
+DROP TABLE t1, t2;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/hypergraph_optimizer.test mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/hypergraph_optimizer.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/hypergraph_optimizer.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/hypergraph_optimizer.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,72 @@
+# Test cases for full-text search with the hypergraph optimizer
+# (WL#14422). FTS with the hypergraph optimizer is also tested by the
+# other tests in this suite. This test adds coverage for cases of
+# particular interest for the hypergraph optimizer, which are not
+# covered by the other tests.
+
+# Some of the queries give different (wrong) results when running with
+# the old optimizer, so this test only runs with the hypergraph
+# optimizer enabled.
+--source include/have_hypergraph.inc
+
+CREATE TABLE t(x VARCHAR(100), FULLTEXT KEY (x));
+INSERT INTO t VALUES ('abc'), ('xyz'), (NULL), ('abc abc'), ('abc xyz');
+ANALYZE TABLE t;
+
+# Hash joins don't work well with FTS and are currently disabled.
+# Below is a query which gives the wrong result when executed as a
+# hash join.
+--sorted_result
+SELECT a.x, MATCH (a.x) AGAINST ('abc') AS score_a,
+       b.x, MATCH (b.x) AGAINST ('xyz') AS score_b
+  FROM t a, t b WHERE a.x = b.x;
+
+# Compare MATCH to NULL.
+SELECT x, MATCH (x) AGAINST ('abc') AS score FROM t
+  WHERE MATCH (x) AGAINST ('abc') > NULL;
+
+# Use the same full-text search in multiple predicates in the same
+# query.
+SELECT x, MATCH (x) AGAINST ('abc') AS score FROM t
+  WHERE MATCH (x) AGAINST ('abc')
+    AND MATCH (x) AGAINST ('abc') > 0.05;
+SELECT x, MATCH (x) AGAINST ('abc') AS score FROM t
+  WHERE MATCH (x) AGAINST ('abc') > 0.05
+    AND MATCH (x) AGAINST ('abc');
+
+# Some extra coverage for aggregated queries which use FTS. The
+# hypergraph optimizer uses a different strategy than the old
+# optimizer in most cases (sorting before aggregation instead of
+# materialization).
+--sorted_result
+SELECT x, MATCH (x) AGAINST ('abc') AS score FROM t GROUP BY x;
+--sorted_result
+SELECT x, MATCH (x) AGAINST ('abc') AS score FROM t GROUP BY x, score;
+--sorted_result
+SELECT MATCH (x) AGAINST ('abc') AS score FROM t GROUP BY score;
+--sorted_result
+SELECT x, MATCH (x) AGAINST ('abc')+1 AS score FROM t GROUP BY x;
+--sorted_result
+SELECT x, CONCAT(MATCH (x) AGAINST ('abc'), MAX(x)) AS score FROM t GROUP BY x;
+--sorted_result
+SELECT x FROM t GROUP BY x HAVING MATCH (x) AGAINST ('abc');
+--sorted_result
+SELECT x FROM t GROUP BY x HAVING MATCH (x) AGAINST ('abc') > 0;
+--sorted_result
+SELECT MATCH (x) AGAINST ('abc') AS score FROM t
+  GROUP BY score WITH ROLLUP HAVING score > 0;
+--sorted_result
+SELECT MATCH (x) AGAINST ('abc') AS score FROM t
+  GROUP BY score WITH ROLLUP HAVING score > 0 OR score IS NULL;
+SELECT MATCH (x) AGAINST ('abc') AS score, x FROM t
+  GROUP BY x WITH ROLLUP ORDER BY score, x;
+# Check that ANY_VALUE picks a value from the correct group. The WHERE
+# clause picks rows with distinct scores, so that there is only one
+# row per group, in order to make the result deterministic.
+SELECT ANY_VALUE(x), MATCH (x) AGAINST ('abc') AS score
+  FROM t
+  WHERE x IN ('abc', 'abc abc', 'xyz')
+  GROUP BY score
+  ORDER BY score;
+
+DROP TABLE t;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/limit_union.test mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/limit_union.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/limit_union.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/limit_union.test	2021-09-28 11:46:34.000000000 +0000
@@ -18,11 +18,21 @@
 	('MySQL Security','When configured properly, MySQL ...');
 
 --echo # Query involves Ranking
+--skip_if_hypergraph  # Non-deterministic result (LIMIT without ORDER BY).
+                      # The old optimizer chooses an ordered index scan here,
+                      # and returns the highest-ranking match. (For legacy
+                      # reasons: The documentation used to promise ordering
+                      # if the WHERE clause contained a natural langugage
+                      # query. The promise wasn't always kept.) The hypergraph
+                      # optimizer does not request an ordered scan.
 SELECT * FROM articles
 	WHERE MATCH (title,body)
 	AGAINST ('MySQL' IN NATURAL LANGUAGE MODE) LIMIT 1;
 
 --echo # Without optimization
+# Disabling the fts_union_limit optimization means that InnoDB ignores
+# the no_ranking and limit hints, and returns the rows in order. So we
+# get the highest-ranking document.
 SET DEBUG = '+d,fts_union_limit_off';
 SELECT * FROM articles
 	WHERE MATCH (title,body)
@@ -30,11 +40,17 @@
 SET DEBUG = '-d,fts_union_limit_off';
 
 --echo # Query involves No Ranking and fts_union operations
+# The optimizer gives a hint that ranking of the results is not
+# necessary, and a random matching document, not necessarily the
+# highest-ranking one, is returned.
 SELECT * FROM articles
 	WHERE MATCH (title,body)
 	AGAINST ('MySQL' IN BOOLEAN MODE) limit 1;
 
 --echo # Without optimization
+# The no_ranking hint is ignored when the optimization is disabled, so
+# InnoDB performs ranking of the results and returns the
+# highest-ranking one.
 SET DEBUG = '+d,fts_union_limit_off';
 SELECT * FROM articles
 	WHERE MATCH (title,body)
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/mecab_utf8-master.opt mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/mecab_utf8-master.opt
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/mecab_utf8-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/mecab_utf8-master.opt	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-$MECAB_OPT
---innodb_ft_min_token_size=2
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/mecab_utf8mb3-master.opt mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/mecab_utf8mb3-master.opt
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/mecab_utf8mb3-master.opt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/mecab_utf8mb3-master.opt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,2 @@
+$MECAB_OPT
+--innodb_ft_min_token_size=2
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/mecab_utf8mb3.test mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/mecab_utf8mb3.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/mecab_utf8mb3.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/mecab_utf8mb3.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,11 @@
+--source include/have_mecab.inc
+
+#
+# WL#6607 : InnoDB FULLTEXT SEARCH: CJK support (mecab parser)
+# Test mecab charset utf8
+#------------------------------------------------------------------------------
+
+let $ipadic_charset=utf-8;
+let $mysql_charset=utf8mb3;
+
+--source suite/innodb_fts/include/mecab.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/mecab_utf8mb4-master.opt mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/mecab_utf8mb4-master.opt
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/mecab_utf8mb4-master.opt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/mecab_utf8mb4-master.opt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,2 @@
+$MECAB_OPT
+--innodb_ft_min_token_size=2
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/mecab_utf8mb4.test mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/mecab_utf8mb4.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/mecab_utf8mb4.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/mecab_utf8mb4.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,11 @@
+--source include/have_mecab.inc
+
+#
+# WL#6607 : InnoDB FULLTEXT SEARCH: CJK support (mecab parser)
+# Test mecab charset utf8
+#------------------------------------------------------------------------------
+
+let $ipadic_charset=utf-8;
+let $mysql_charset=utf8mb4;
+
+--source suite/innodb_fts/include/mecab.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/mecab_utf8.test mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/mecab_utf8.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/mecab_utf8.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/mecab_utf8.test	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
---source include/have_mecab.inc
-
-#
-# WL#6607 : InnoDB FULLTEXT SEARCH: CJK support (mecab parser)
-# Test mecab charset utf8
-#------------------------------------------------------------------------------
-
-let $ipadic_charset=utf-8;
-let $mysql_charset=utf8;
-
---source suite/innodb_fts/include/mecab.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/misc.test mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/misc.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/misc.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/misc.test	2021-09-28 11:46:34.000000000 +0000
@@ -370,8 +370,10 @@
      AGAINST ('null' IN NATURAL LANGUAGE MODE);
 # Boolean search
 # Select rows contain "MySQL" but not "YourSQL"
+--sorted_result
 SELECT id FROM t1 WHERE MATCH (a,b)
 AGAINST ('+MySQL -YourSQL' IN BOOLEAN MODE);
+--sorted_result
 SELECT id FROM t1 WHERE MATCH (a,b)
 AGAINST ('+MySQL -YourSQL' IN BOOLEAN MODE) AND (a IS NOT NULL OR b IS NOT NULL);
 SELECT id FROM t1 WHERE MATCH (a,b)
@@ -851,13 +853,17 @@
 SELECT *, MATCH(title, body) AGAINST ('+MySQL -database' IN BOOLEAN MODE) AS score  FROM articles;
 
 # With subquery
+--sorted_result
 SELECT * FROM articles where  MATCH(title, body) AGAINST ('MySQL - (database - tutorial)' IN BOOLEAN MODE);
 
+--sorted_result
 SELECT * FROM articles where MATCH(title, body) AGAINST ('MySQL - (- tutorial database)' IN BOOLEAN MODE);
 
 # More complex query
+--sorted_result
 SELECT * FROM articles where MATCH(title, body) AGAINST ('MySQL - (- tutorial database) -Tricks' IN BOOLEAN MODE);
 
+--sorted_result
 SELECT * FROM articles where MATCH(title, body) AGAINST ('-Tricks MySQL - (- tutorial database)' IN BOOLEAN MODE);
 
 DROP TABLE articles;
@@ -1120,6 +1126,7 @@
 
 COMMIT;
 
+--sorted_result
 SELECT id FROM t1 WHERE MATCH (a,b)
         AGAINST ('MySQL' IN NATURAL LANGUAGE MODE);
 
@@ -1226,9 +1233,12 @@
 INSERT INTO ift values (3, "--skip-networking");
 INSERT INTO ift values (4, "-donot--skip-networking");
 
+--sorted_result
 SELECT * FROM ift WHERE MATCH (b) AGAINST ('--skip-networking');
+--sorted_result
 SELECT * FROM ift WHERE MATCH (b) AGAINST ('skip-networking');
 SELECT * FROM ift WHERE MATCH (b) AGAINST ('----');
+--sorted_result
 SELECT * FROM ift WHERE MATCH (b) AGAINST ('-donot--skip-networking');
 
 DROP TABLE ift;
@@ -1294,12 +1304,16 @@
 
 SELECT * FROM t1 WHERE MATCH (a) AGAINST ('+("know mysql")' IN BOOLEAN MODE);
 
+--sorted_result
 SELECT * FROM t1 WHERE MATCH (a) AGAINST ('("know mysql" good)' IN BOOLEAN MODE);
 
+--sorted_result
 SELECT * FROM t1 WHERE MATCH (a) AGAINST ('+("know mysql" good)' IN BOOLEAN MODE);
 
+--sorted_result
 SELECT * FROM t1 WHERE MATCH (a) AGAINST ('(good "know mysql")' IN BOOLEAN MODE);
 
+--sorted_result
 SELECT * FROM t1 WHERE MATCH (a) AGAINST ('+(good "know mysql")' IN BOOLEAN MODE);
 
 SELECT * FROM t1 WHERE MATCH (a) AGAINST ('+("know mysql" "good database")' IN BOOLEAN MODE);
@@ -1399,10 +1413,14 @@
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '"'));
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '"'));
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT(0x00, '"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', 0x00, 0x00, 0x00, '"'));
+--sorted_result
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT(0x00, '"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00));
+--sorted_result
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', '@', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00));
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', '@', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00, '"'));
+--sorted_result
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', '(', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', ')'));
+--sorted_result
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', 'm', 'y', 'i', 's', 'a', 'm'));
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', 'm', 'y', 'i', 's', 'a', 'm', '"'));
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', '@', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00, '"','@', '2') IN BOOLEAN MODE);
@@ -1424,6 +1442,7 @@
 SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '"'));
 SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '"'));
 SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT(0x00, '"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', 0x00, 0x00, 0x00, '"'));
+--sorted_result
 SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT(0x00, '"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00));
 SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT('"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', '@', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00, '"','@', '2') IN BOOLEAN MODE);
 SELECT b FROM t1 WHERE MATCH (b) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', '$', 'm', 'y', 'i', 's', 'a', 'm', '"','@', '4') IN BOOLEAN MODE);
@@ -1443,10 +1462,14 @@
 SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '"'));
 SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '"'));
 SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT(0x00, '"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', 0x00, 0x00, 0x00, '"'));
+--sorted_result
 SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT(0x00, '"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00));
+--sorted_result
 SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', '@', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00));
 SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', '@', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00, '"'));
+--sorted_result
 SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', '(', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', ')'));
+--sorted_result
 SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', 'm', 'y', 'i', 's', 'a', 'm'));
 SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', 'm', 'y', 'i', 's', 'a', 'm', '"'));
 SELECT c FROM t1 WHERE MATCH (c) AGAINST (CONCAT('"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', '@', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00, '"','@', '2') IN BOOLEAN MODE);
@@ -1466,14 +1489,23 @@
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', '&', 0x00, '"'));
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 0x00, '&', '"'));
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', '%', '"'));
+--sorted_result
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '"'));
+--sorted_result
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '"'));
+--sorted_result
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT(0x00, '"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', 0x00, 0x00, 0x00, '"'));
+--sorted_result
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT(0x00, '"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', 0x00, '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00));
+--sorted_result
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', '@', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00));
+--sorted_result
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', '@', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00, '"'));
+--sorted_result
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', '(', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', ')'));
+--sorted_result
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', 'm', 'y', 'i', 's', 'a', 'm'));
+--sorted_result
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', 'm', 'y', 'i', 's', 'a', 'm', '"'));
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 0x00, 'i', 'n', 'n', 'o', 'd', 'b', '@', '$', 'm', 'y', 'i', 's', 'a', 'm', '%', 0x00, 0x00, '"','@', '2') IN BOOLEAN MODE);
 SELECT a FROM t1 WHERE MATCH (a) AGAINST (CONCAT('"', 'i', 'n', 'n', 'o', 'd', 'b', ' ', '$', 'm', 'y', 'i', 's', 'a', 'm', '"','@', '4') IN BOOLEAN MODE);
@@ -1493,20 +1525,28 @@
 
 SELECT * FROM t1 WHERE MATCH (a) AGAINST ('g *' IN NATURAL LANGUAGE MODE);
 
+--sorted_result
 SELECT * FROM t1 WHERE MATCH (a) AGAINST ('g *' IN NATURAL LANGUAGE MODE WITH QUERY EXPANSION);
 
+--sorted_result
 SELECT * FROM t1 WHERE MATCH (a) AGAINST ('g * k *' IN NATURAL LANGUAGE MODE WITH QUERY EXPANSION);
 
+--sorted_result
 SELECT * FROM t1 WHERE MATCH (a) AGAINST ('g * k * d *' IN NATURAL LANGUAGE MODE WITH QUERY EXPANSION);
 
+--sorted_result
 SELECT * FROM t1 WHERE MATCH (a) AGAINST ('g * go *' IN NATURAL LANGUAGE MODE WITH QUERY EXPANSION);
 
+--sorted_result
 SELECT * FROM t1 WHERE MATCH (a) AGAINST ('g * good' IN NATURAL LANGUAGE MODE WITH QUERY EXPANSION);
 
+--sorted_result
 SELECT * FROM t1 WHERE MATCH (a) AGAINST ('gm * go *' IN NATURAL LANGUAGE MODE WITH QUERY EXPANSION);
 
+--sorted_result
 SELECT * FROM t1 WHERE MATCH (a) AGAINST ('good *' IN NATURAL LANGUAGE MODE WITH QUERY EXPANSION);
 
+--sorted_result
 SELECT * FROM t1 WHERE MATCH (a) AGAINST ('g* database' IN NATURAL LANGUAGE MODE WITH QUERY EXPANSION);
 
 DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/ngram_debug.test mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/ngram_debug.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/ngram_debug.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/ngram_debug.test	2021-09-28 11:46:34.000000000 +0000
@@ -41,6 +41,7 @@
 SELECT * FROM articles WHERE
 	MATCH(title) AGAINST('+(mind thing) -idea' IN BOOLEAN MODE);
 
+--sorted_result
 SELECT * FROM articles WHERE
 	MATCH(title) AGAINST('mysql');
 
@@ -79,6 +80,7 @@
   ('�想将数�添加到数�库','或访问�处�计算机数�库中�存的数�'),
   ('数�库是数�的结构化集�','它�以是任何东西');
 
+--sorted_result
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('的* 或* 东西' IN BOOLEAN MODE);
 
@@ -139,6 +141,7 @@
 	MATCH(title, body) AGAINST('"ab"' );
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('数� +ab' IN BOOLEAN MODE);
+--sorted_result
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('数� (+xyz -bc)' IN BOOLEAN MODE);
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/ngram.test mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/ngram.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/ngram.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/ngram.test	2021-09-28 11:46:34.000000000 +0000
@@ -24,9 +24,11 @@
   ('�想将数�添加到数�库','或访问�处�计算机数�库中�存的数�'),
   ('需�使用数�库管�系统','计算机是处�大�数�的�想工具');
 
+--sorted_result
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('数�');
 
+--sorted_result
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('æ•°*' IN BOOLEAN MODE);
 
@@ -36,12 +38,15 @@
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('+(数�库 处�) -计算机' IN BOOLEAN MODE);
 
+--sorted_result
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('数�库');
 
+--sorted_result
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('数�库' IN BOOLEAN MODE);
 
+--sorted_result
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('"数�库"' IN BOOLEAN MODE);
 
@@ -64,9 +69,11 @@
   ('�想将数�添加到数�库','或访问�处�计算机数�库中�存的数�'),
   ('需�使用数�库管�系统','计算机是处�大�数�的�想工具');
 
+--sorted_result
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('数�');
 
+--sorted_result
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('æ•°*' IN BOOLEAN MODE);
 
@@ -76,12 +83,15 @@
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('+(数�库 处�) -计算机' IN BOOLEAN MODE);
 
+--sorted_result
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('数�库');
 
+--sorted_result
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('数�库' IN BOOLEAN MODE);
 
+--sorted_result
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('"数�库"' IN BOOLEAN MODE);
 
@@ -104,9 +114,11 @@
   ('�想将数�添加到数�库','或访问�处�计算机数�库中�存的数�'),
   ('需�使用数�库管�系统','计算机是处�大�数�的�想工具');
 
+--sorted_result
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('数�');
 
+--sorted_result
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('æ•°*' IN BOOLEAN MODE);
 
@@ -116,12 +128,15 @@
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('+(数�库 处�) -计算机' IN BOOLEAN MODE);
 
+--sorted_result
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('数�库');
 
+--sorted_result
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('数�库' IN BOOLEAN MODE);
 
+--sorted_result
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('"数�库"' IN BOOLEAN MODE);
 
@@ -145,9 +160,11 @@
   ('�想将数�添加到数�库','或访问�处�计算机数�库中�存的数�'),
   ('需�使用数�库管�系统','计算机是处�大�数�的�想工具');
 
+--sorted_result
 SELECT * FROM articles WHERE
         MATCH(title, body) AGAINST('数�');
 
+--sorted_result
 SELECT * FROM articles WHERE
         MATCH(title, body) AGAINST('æ•°*' IN BOOLEAN MODE);
 
@@ -157,15 +174,19 @@
 SELECT * FROM articles WHERE
         MATCH(title, body) AGAINST('+(数�库 处�) -计算机' IN BOOLEAN MODE);
 
+--sorted_result
 SELECT * FROM articles WHERE
         MATCH(title, body) AGAINST('数�库');
 
+--sorted_result
 SELECT * FROM articles WHERE
         MATCH(title, body) AGAINST('数�库' IN BOOLEAN MODE);
 
+--sorted_result
 SELECT * FROM articles WHERE
         MATCH(title, body) AGAINST('"数�库"' IN BOOLEAN MODE);
 
+--sorted_result
 SELECT * FROM articles WHERE
         MATCH(title, body) AGAINST('数�库' WITH QUERY EXPANSION);
 
@@ -191,9 +212,11 @@
   ('データベース�データを追加�る��','コンピュータ�データベース�格��れ��るアクセス��よ�プロセスデータ'),
   ('データベース管�システムを使用�る必��','コンピュータ��大��データを処��る����想的�ツール��る');
 
+--sorted_result
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('データ');
 
+--sorted_result
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('デ*' IN BOOLEAN MODE);
 
@@ -203,12 +226,15 @@
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('+(データベース 処�) -コンピュータ' IN BOOLEAN MODE);
 
+--sorted_result
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('データベース');
 
+--sorted_result
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('データベース' IN BOOLEAN MODE);
 
+--sorted_result
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('"データベース"' IN BOOLEAN MODE);
 
@@ -231,9 +257,11 @@
   ('��터베�스� ��터를 추가하려면','액세스, 프로세스 ��터를 컴퓨터 ��터베�스� 저장'),
   ('��터베�스 관리 시스템� 사용해야합니다','컴퓨터는 많� 양� ��터를 처리하기위한 ���� �구입니다');
 
+--sorted_result
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('��터');
 
+--sorted_result
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('�*' IN BOOLEAN MODE);
 
@@ -243,12 +271,15 @@
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('+(��터베�스 처리) -컴퓨터' IN BOOLEAN MODE);
 
+--sorted_result
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('��터베�스');
 
+--sorted_result
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('��터베�스' IN BOOLEAN MODE);
 
+--sorted_result
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('"��터베�스"' IN BOOLEAN MODE);
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/opt.test mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/opt.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/opt.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/opt.test	2021-09-28 11:46:34.000000000 +0000
@@ -1,5 +1,3 @@
---source include/not_hypergraph.inc   # Does not support FTS.
-
 #  
 # Tests for optimizations for InnoDB fulltext search (WL#6043)
 #
@@ -187,6 +185,7 @@
 --echo No ordinary handler accesses when only accessing FTS_DOC_ID and MATCH
 FLUSH STATUS;
 
+--sorted_result
 SELECT FTS_DOC_ID docid, MATCH(title, text) AGAINST ('database') AS score
 FROM wp
 WHERE MATCH(title, text) AGAINST ('database');
@@ -196,6 +195,7 @@
 --echo Still no handler accesses when adding FTS_DOC_ID to WHERE clause
 FLUSH STATUS;
 
+--sorted_result
 SELECT FTS_DOC_ID docid, MATCH(title, text) AGAINST ('database') AS score
 FROM wp
 WHERE MATCH(title, text) AGAINST ('database') AND FTS_DOC_ID > 2;
@@ -225,6 +225,7 @@
 --echo Optimization also work with several MATCH expressions
 FLUSH STATUS;
 
+--sorted_result
 SELECT FTS_DOC_ID docid, MATCH(title, text) AGAINST ('database') AS score1,
        MATCH(title, text) AGAINST ('mysql') AS score2
 FROM wp
@@ -248,11 +249,13 @@
 
 --echo Optimization does not apply for GROUP BY
 --source include/turn_off_only_full_group_by.inc
+--sorted_result
 SELECT FTS_DOC_ID, MATCH(title, text) AGAINST ('database') AS score
 FROM wp
 WHERE MATCH(title, text) AGAINST ('database')
 GROUP BY score;
 
+--skip_if_hypergraph  # Different handler calls.
 SHOW SESSION STATUS LIKE 'Handler_read%';
 --source include/restore_sql_mode_after_turn_off_only_full_group_by.inc
 
@@ -279,8 +282,8 @@
 WHERE MATCH(title,text) AGAINST ('database' IN NATURAL LANGUAGE MODE);
 
 --echo If count optimization applies, EXPLAIN shows
---echo "Select tables optimized away."
-eval EXPLAIN $query;
+--echo "Rows fetched before execution."
+eval EXPLAIN FORMAT=TREE $query;
 FLUSH STATUS;
 eval $query;
 --echo Verify that there was no table access
@@ -292,7 +295,7 @@
 WHERE MATCH(title,text) AGAINST ('database' IN NATURAL LANGUAGE MODE);
 
 --echo Optimization applies also to COUNT(expr) as long as expr is not nullable
-eval EXPLAIN $query;
+eval EXPLAIN FORMAT=TREE $query;
 eval $query;
 
 let $query = 
@@ -301,7 +304,9 @@
 WHERE MATCH(title, text) AGAINST ('database');
 
 --echo Optimization does not apply if not a single table query.
-eval EXPLAIN $query;
+--let SEARCH_EXPRESSION = query_get_value("EXPLAIN FORMAT=TREE $query", EXPLAIN, 1)
+--let SEARCH_PATTERN = -> Aggregate
+--source include/search_pattern_on_variable.inc
 eval $query;
 
 let $query = 
@@ -310,7 +315,9 @@
 WHERE MATCH(title,text) AGAINST ('database' IN NATURAL LANGUAGE MODE) > 0;
 
 --echo Optimization does not apply if MATCH is part of an expression
-eval EXPLAIN $query;
+--let SEARCH_EXPRESSION = query_get_value("EXPLAIN FORMAT=TREE $query", EXPLAIN, 1)
+--let SEARCH_PATTERN = -> Aggregate
+--source include/search_pattern_on_variable.inc
 eval $query;
 
 let $query = 
@@ -319,7 +326,9 @@
 WHERE MATCH(title,text) AGAINST ('database' IN NATURAL LANGUAGE MODE) > 0;
 
 --echo Optimization does not apply if MATCH is part of an expression
-eval EXPLAIN $query;
+--let SEARCH_EXPRESSION = query_get_value("EXPLAIN FORMAT=TREE $query", EXPLAIN, 1)
+--let SEARCH_PATTERN = -> Aggregate
+--source include/search_pattern_on_variable.inc
 eval $query;
 
 let $query = 
@@ -328,7 +337,9 @@
 WHERE MATCH(title,text) AGAINST ('database' IN NATURAL LANGUAGE MODE);
 
 --echo Optimization does not apply if COUNT expression is nullable
-eval EXPLAIN $query;
+--let SEARCH_EXPRESSION = query_get_value("EXPLAIN FORMAT=TREE $query", EXPLAIN, 1)
+--let SEARCH_PATTERN = -> Aggregate
+--source include/search_pattern_on_variable.inc
 eval $query;
 
 #
@@ -354,6 +365,7 @@
 
 # Check query where FTS result is "covering"
 FLUSH STATUS;
+--sorted_result
 SELECT FTS_DOC_ID docid,
        MATCH(title, text) AGAINST ('database' WITH QUERY EXPANSION) AS score
 FROM wp
@@ -402,6 +414,7 @@
 
 # Check query where FTS result is "covering"
 FLUSH STATUS;
+--sorted_result
 SELECT FTS_DOC_ID docid,
        MATCH(title, text) AGAINST ('+MySQL -database' IN BOOLEAN MODE) AS score
 FROM wp
@@ -521,6 +534,7 @@
 
 # Check query where FTS result is "covering"
 FLUSH STATUS;
+--sorted_result
 SELECT FTS_DOC_ID docid, MATCH(title, text) AGAINST ('database') AS score 
 FROM wp 
 WHERE MATCH(title, text) AGAINST ('database');
@@ -599,6 +613,7 @@
 
 EXPLAIN
 SELECT FTS_DOC_ID, title FROM t1 WHERE MATCH(title, text) AGAINST ('+very +fast' WITH QUERY EXPANSION);
+--sorted_result
 SELECT FTS_DOC_ID, title FROM t1 WHERE MATCH(title, text) AGAINST ('+very +fast' WITH QUERY EXPANSION);
 
 EXPLAIN
@@ -606,11 +621,14 @@
 SELECT FTS_DOC_ID, title FROM t1 WHERE MATCH(title, text) AGAINST ('"very fast"@3' IN BOOLEAN MODE);
 
 # check case with 'for' stopword
-EXPLAIN SELECT FTS_DOC_ID  FROM t1
-WHERE MATCH(title, text) AGAINST ('+for' IN BOOLEAN MODE);
+let $query =
 SELECT FTS_DOC_ID  FROM t1
 WHERE MATCH(title, text) AGAINST ('+for' IN BOOLEAN MODE);
-
+eval EXPLAIN $query;
+--let SEARCH_EXPRESSION = query_get_value("EXPLAIN FORMAT=TREE $query", EXPLAIN, 1)
+--let SEARCH_PATTERN = Full-text covering index search on t1 using ft_idx
+--source include/search_pattern_on_variable.inc
+eval $query;
 
 --echo # No sorting by rank
 
@@ -639,6 +657,7 @@
 EXPLAIN SELECT FTS_DOC_ID, TITLE FROM t1
 WHERE MATCH (title, text) AGAINST ('fast database' IN NATURAL LANGUAGE MODE)
 LIMIT 3;
+--sorted_result
 SELECT FTS_DOC_ID, TITLE FROM t1
 WHERE MATCH (title, text) AGAINST ('fast database' IN NATURAL LANGUAGE MODE)
 LIMIT 3;
@@ -673,6 +692,7 @@
 FROM t1 WHERE MATCH (title, text) AGAINST ('fast database' IN NATURAL LANGUAGE MODE)
 ORDER BY `rank`
 LIMIT 3;
+--sorted_result
 SELECT FTS_DOC_ID, MATCH (title, text) AGAINST ('fast database' IN NATURAL LANGUAGE MODE) as `rank`
 FROM t1 WHERE MATCH (title, text) AGAINST ('fast database' IN NATURAL LANGUAGE MODE)
 ORDER BY `rank`
@@ -706,19 +726,28 @@
 ORDER BY `rank` DESC, FTS_DOC_ID
 LIMIT 3;
 
-EXPLAIN SELECT FTS_DOC_ID,  MATCH(title, text) AGAINST ('+database' IN BOOLEAN MODE) as `rank`
-FROM t1 WHERE MATCH(title, text) AGAINST ('+database' IN BOOLEAN MODE)
-ORDER BY MATCH(title, text) AGAINST ('+database' IN BOOLEAN MODE)  DESC
-LIMIT 3;
+let $query =
 SELECT FTS_DOC_ID,  MATCH(title, text) AGAINST ('+database' IN BOOLEAN MODE) as `rank`
 FROM t1 WHERE MATCH(title, text) AGAINST ('+database' IN BOOLEAN MODE)
 ORDER BY MATCH(title, text) AGAINST ('+database' IN BOOLEAN MODE)  DESC
 LIMIT 3;
+eval EXPLAIN $query;
+--let SEARCH_EXPRESSION = query_get_value("EXPLAIN FORMAT=TREE $query", EXPLAIN, 1)
+--let SEARCH_PATTERN = Full-text covering index search on t1 using ft_idx
+--source include/search_pattern_on_variable.inc
+eval $query;
 
 EXPLAIN SELECT FTS_DOC_ID,  MATCH(title, text) AGAINST ('+database' IN BOOLEAN MODE) as `rank`
 FROM t1 WHERE MATCH(title, text) AGAINST ('+database' IN BOOLEAN MODE) and FTS_DOC_ID > 1
 ORDER BY MATCH(title, text) AGAINST ('+database' IN BOOLEAN MODE)  DESC
 LIMIT 3;
+# Cost differs between old optimizer and hypergraph optimizer. The filter differs too.
+--replace_regex / *\(cost=.*// /-> Filter:.*/-> Filter:/
+EXPLAIN FORMAT=TREE
+SELECT FTS_DOC_ID,  MATCH(title, text) AGAINST ('+database' IN BOOLEAN MODE) as `rank`
+FROM t1 WHERE MATCH(title, text) AGAINST ('+database' IN BOOLEAN MODE) and FTS_DOC_ID > 1
+ORDER BY MATCH(title, text) AGAINST ('+database' IN BOOLEAN MODE)  DESC
+LIMIT 3;
 SELECT FTS_DOC_ID,  MATCH(title, text) AGAINST ('+database' IN BOOLEAN MODE) as `rank`
 FROM t1 WHERE MATCH(title, text) AGAINST ('+database' IN BOOLEAN MODE) and FTS_DOC_ID > 1
 ORDER BY MATCH(title, text) AGAINST ('+database' IN BOOLEAN MODE)  DESC
@@ -761,6 +790,7 @@
 EXPLAIN SELECT FTS_DOC_ID FROM t1
 WHERE MATCH (title, text) AGAINST ('fast database' IN NATURAL LANGUAGE MODE) > 0.1;
 
+--sorted_result
 SELECT FTS_DOC_ID FROM t1
 WHERE MATCH (title, text) AGAINST ('fast database' IN NATURAL LANGUAGE MODE) > 0.1;
 
@@ -769,6 +799,7 @@
 
 EXPLAIN SELECT * FROM t1 ORDER BY MATCH (title, text) AGAINST ('fast database' IN NATURAL LANGUAGE MODE) DESC LIMIT 10;
 
+--sorted_result
 SELECT FTS_DOC_ID FROM t1
 WHERE MATCH (title, text) AGAINST ('fast database' IN NATURAL LANGUAGE MODE) AND
 MATCH (title, text) AGAINST ('mysql' IN NATURAL LANGUAGE MODE)
@@ -855,6 +886,7 @@
 ORDER BY `rank` DESC
 LIMIT 3;
 
+--sorted_result
 SELECT a.FTS_DOC_ID, b.FTS_DOC_ID
 FROM t1 a, t1 b
 WHERE MATCH(a.title, a.text) AGAINST ('+database' IN BOOLEAN MODE) and
@@ -866,6 +898,7 @@
       MATCH(b.title, b.text) AGAINST ('+mysql' IN BOOLEAN MODE)  and
       a.FTS_DOC_ID = b.FTS_DOC_ID;
 
+--sorted_result
 SELECT a.FTS_DOC_ID, MATCH(a.title, a.text) AGAINST ('+database' IN BOOLEAN MODE),
        b.FTS_DOC_ID, MATCH(b.title, b.text) AGAINST ('+database' IN BOOLEAN MODE)
 FROM t1 a, t1 b
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/plugin_1.test mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/plugin_1.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/plugin_1.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/plugin_1.test	2021-09-28 11:46:34.000000000 +0000
@@ -58,6 +58,7 @@
 # Simple term search
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('mysql');
+--sorted_result
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('dbms' WITH QUERY EXPANSION);
 SELECT * FROM articles WHERE
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/plugin_debug.test mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/plugin_debug.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/plugin_debug.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/plugin_debug.test	2021-09-28 11:46:34.000000000 +0000
@@ -74,9 +74,11 @@
 	MATCH(title, body) AGAINST('full text');
 
 # Test query expansion
+--sorted_result
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('full-text' WITH QUERY EXPANSION);
 
+--sorted_result
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('full text' WITH QUERY EXPANSION);
 
@@ -187,6 +189,7 @@
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('+mysql -database' IN BOOLEAN MODE);
 
+--sorted_result
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('>mysql <database ~search' IN BOOLEAN MODE);
 
@@ -220,9 +223,11 @@
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('+("dbms stands") -good' IN BOOLEAN MODE);
 
+--sorted_result
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('+("dbms stands" search) -good' IN BOOLEAN MODE);
 
+--sorted_result
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('+("dbms stands" "full text") -good' IN BOOLEAN MODE);
 
@@ -249,6 +254,7 @@
   ('� 想 将 数� 添加 到 数�库','或 访问�处� 计算机 数�库 中 �存 的 数�'),
   ('需� 使用 数�库 管�系统','计算机 是 处� 大� 数� 的 �想 工具');
 
+--sorted_result
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('数�库');
 
@@ -257,6 +263,7 @@
 	MATCH(title, body) AGAINST('数�');
 
 # Test wildcard
+--sorted_result
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('数�*');
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/plugin.test mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/plugin.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/plugin.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/plugin.test	2021-09-28 11:46:34.000000000 +0000
@@ -102,9 +102,11 @@
 	MATCH(title, body) AGAINST('full text');
 
 # Test query expansion
+--sorted_result
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('full-text' WITH QUERY EXPANSION);
 
+--sorted_result
 SELECT * FROM articles WHERE
 	MATCH(title, body) AGAINST('full text' WITH QUERY EXPANSION);
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/stopword.test mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/stopword.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/stopword.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/stopword.test	2021-09-28 11:46:34.000000000 +0000
@@ -260,6 +260,7 @@
 # (refer Behavior (at the top of the test) for explanation ) 
 SELECT * FROM articles WHERE MATCH(title,body) AGAINST ("where will");
 SELECT * FROM articles WHERE MATCH(title,body) AGAINST ("when");
+--sorted_result
 SELECT * FROM articles WHERE MATCH(title,body) AGAINST ("what" WITH QUERY EXPANSION);
 SELECT * FROM articles WHERE MATCH(title,body) AGAINST("whe*" IN BOOLEAN MODE);
 SELECT * FROM articles WHERE MATCH(title,body) AGAINST("+what +will" IN BOOLEAN MODE);
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/subexpr.test mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/subexpr.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/subexpr.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/subexpr.test	2021-09-28 11:46:34.000000000 +0000
@@ -44,13 +44,17 @@
 
 SELECT * FROM t1 WHERE MATCH(f2) AGAINST('+pumpkin' IN BOOLEAN MODE);
 SELECT * FROM t1 WHERE MATCH(f2) AGAINST('+cheese' IN BOOLEAN MODE);
+--sorted_result
 SELECT * FROM t1 WHERE MATCH(f2) AGAINST('+(pumpkin cheese)' IN BOOLEAN MODE);
 SELECT * FROM t1 WHERE MATCH(f2)
   AGAINST('+pumpkin +(souffle)' IN BOOLEAN MODE);
+--sorted_result
 SELECT * FROM t1 WHERE MATCH(f2)
   AGAINST('+pumpkin +(souffle tart)' IN BOOLEAN MODE);
+--sorted_result
 SELECT * FROM t1 WHERE MATCH(f2)
   AGAINST('+pumpkin +(>souffle <tart)' IN BOOLEAN MODE);
+--sorted_result
 SELECT * FROM t1 WHERE MATCH(f2)
   AGAINST('+pumpkin +(souffle tart)' IN BOOLEAN MODE);
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/sync_block.test mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/sync_block.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/sync_block.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/sync_block.test	2021-09-28 11:46:34.000000000 +0000
@@ -125,3 +125,5 @@
 SET GLOBAL slow_query_log = @old_slow_query_log;
 SET GLOBAL long_query_time = @old_long_query_time;
 SET GLOBAL binlog_order_commits = @old_binlog_order_commits;
+TRUNCATE TABLE mysql.general_log;
+TRUNCATE TABLE mysql.slow_log;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/transaction.test mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/transaction.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_fts/t/transaction.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_fts/t/transaction.test	2021-09-28 11:46:34.000000000 +0000
@@ -68,6 +68,7 @@
         AGAINST ('"stands Database"@11' IN BOOLEAN MODE) ORDER BY 1;
 
 # all records expected except with 'request' 
+--sorted_result
 SELECT * FROM t1
         WHERE MATCH (a,b)
         AGAINST ('tutorial' WITH QUERY EXPANSION);
@@ -81,10 +82,12 @@
         AGAINST ('tutorial' IN NATURAL LANGUAGE MODE);
 
 # records having tutorial and MySQL word
+--sorted_result
 SELECT * FROM t1
         WHERE MATCH (a,b)
         AGAINST ('request MySQL' IN BOOLEAN MODE);
 
+--sorted_result
 SELECT * FROM t1
         WHERE MATCH (a,b)
         AGAINST ('tutorial' WITH QUERY EXPANSION);
@@ -186,11 +189,13 @@
         AGAINST ('+MySQL -(Tutorial Optimizing)' IN BOOLEAN MODE);
 
 # query expansion mode 
+--sorted_result
 SELECT * FROM t1
         WHERE MATCH (a,b)
         AGAINST ('tutorial' WITH QUERY EXPANSION);
 
 # query expansion mode 
+--sorted_result
 SELECT * FROM t1
         WHERE MATCH (a,b)
         AGAINST ('tutorial' WITH QUERY EXPANSION);
@@ -206,6 +211,7 @@
         WHERE MATCH (a,b)
         AGAINST ('request MySQL' IN BOOLEAN MODE);
 
+--sorted_result
 SELECT * FROM t1
         WHERE MATCH (a,b)
         AGAINST ('tutorial' WITH QUERY EXPANSION);
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_gis/r/precise.result mysql-8.0-8.0.27/mysql-test/suite/innodb_gis/r/precise.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_gis/r/precise.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_gis/r/precise.result	2021-09-28 11:46:34.000000000 +0000
@@ -124,7 +124,7 @@
 POLYGON((21.951219512195124 27.4390243902439,26.470588235294116 23.823529411764707,29.28994082840237 26.36094674556213,23.85542168674699 29.819277108433734,21.951219512195124 27.4390243902439))
 select ST_astext(ST_Intersection(ST_GeomFromText('LINESTRING(0 0, 50 45, 40 50, 0 0)'), ST_GeomFromText('LINESTRING(50 5, 55 10, 0 45, 50 5)')));
 ST_astext(ST_Intersection(ST_GeomFromText('LINESTRING(0 0, 50 45, 40 50, 0 0)'), ST_GeomFromText('LINESTRING(50 5, 55 10, 0 45, 50 5)')))
-MULTIPOINT((21.951219512195124 27.4390243902439),(23.85542168674699 29.819277108433734),(26.470588235294116 23.823529411764707),(29.28994082840237 26.36094674556213))
+MULTIPOINT((26.470588235294116 23.823529411764707),(29.28994082840237 26.36094674556213),(23.85542168674699 29.819277108433734),(21.951219512195124 27.4390243902439))
 select ST_astext(ST_Intersection(ST_GeomFromText('LINESTRING(0 0, 50 45, 40 50)'), ST_GeomFromText('LINESTRING(50 5, 55 10, 0 45)')));
 ST_astext(ST_Intersection(ST_GeomFromText('LINESTRING(0 0, 50 45, 40 50)'), ST_GeomFromText('LINESTRING(50 5, 55 10, 0 45)')))
 POINT(29.28994082840237 26.36094674556213)
@@ -136,7 +136,7 @@
 LINESTRING(0 0,46.666666666666664 46.666666666666664)
 select ST_astext(ST_Intersection(ST_GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), ST_GeomFromText('LINESTRING(-10 -10, 200 200, 199 201, -11 -9)')));
 ST_astext(ST_Intersection(ST_GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), ST_GeomFromText('LINESTRING(-10 -10, 200 200, 199 201, -11 -9)')))
-MULTILINESTRING((0 0,46.666666666666664 46.666666666666664),(45.333333333333336 47.333333333333336,8 10))
+GEOMETRYCOLLECTION(LINESTRING(0 0,46.666666666666664 46.666666666666664),LINESTRING(45.333333333333336 47.333333333333336,8 10))
 select ST_astext(ST_UNION(ST_GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), ST_GeomFromText('LINESTRING(-10 -10, 200 200, 199 201, -11 -9)')));
 ST_astext(ST_UNION(ST_GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), ST_GeomFromText('LINESTRING(-10 -10, 200 200, 199 201, -11 -9)')))
 GEOMETRYCOLLECTION(POLYGON((0 0,50 45,40 50,0 0)),LINESTRING(-10 -10,0 0),LINESTRING(46.666666666666664 46.666666666666664,200 200,199 201,45.333333333333336 47.333333333333336),LINESTRING(8 10,-11 -9))
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_gis/r/rtree_create_inplace.result mysql-8.0-8.0.27/mysql-test/suite/innodb_gis/r/rtree_create_inplace.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_gis/r/rtree_create_inplace.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_gis/r/rtree_create_inplace.result	2021-09-28 11:46:34.000000000 +0000
@@ -30,6 +30,7 @@
 COUNT(*)
 0
 ALTER TABLE t1 DROP INDEX idx, ADD SPATIAL INDEX idx3(c2);
-SET SESSION debug="+d,row_merge_instrument_log_check_flush";
+SET SESSION debug="+d,ddl_instrument_log_check_flush";
 ALTER TABLE t1  DROP INDEX idx3, ADD SPATIAL INDEX idx4(c2), ADD SPATIAL INDEX idx5(c3);
+SET SESSION debug="-d,ddl_instrument_log_check_flush";
 DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_gis/r/rtree_debug.result mysql-8.0-8.0.27/mysql-test/suite/innodb_gis/r/rtree_debug.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_gis/r/rtree_debug.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_gis/r/rtree_debug.result	2021-09-28 11:46:34.000000000 +0000
@@ -38,10 +38,10 @@
   `c2` geometry NOT NULL /*!80003 SRID 0 */,
   SPATIAL KEY `idx` (`c2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
-SET DEBUG='+d,row_merge_ins_spatial_fail';
+SET DEBUG='+d,ddl_ins_spatial_fail';
 create spatial index idx2 on t1(c2);
 ERROR HY000: Got error 1000 - 'InnoDB error' from storage engine
-SET DEBUG='-d,row_merge_ins_spatial_fail';
+SET DEBUG='-d,ddl_ins_spatial_fail';
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_gis/t/1.test mysql-8.0-8.0.27/mysql-test/suite/innodb_gis/t/1.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_gis/t/1.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_gis/t/1.test	2021-09-28 11:46:34.000000000 +0000
@@ -510,7 +510,7 @@
 
 create table t1 (s1 geometry not null,s2 char(100));
 create trigger t1_bu before update on t1 for each row set new.s1 = null;
---error 1048
+--error ER_BAD_NULL_ERROR_NOT_IGNORED
 insert into t1 values (null,null);
 drop table t1;
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_gis/t/gis.test mysql-8.0-8.0.27/mysql-test/suite/innodb_gis/t/gis.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_gis/t/gis.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_gis/t/gis.test	2021-09-28 11:46:34.000000000 +0000
@@ -509,7 +509,7 @@
 
 create table t1 (s1 geometry not null,s2 char(100));
 create trigger t1_bu before update on t1 for each row set new.s1 = null;
---error 1048
+--error ER_BAD_NULL_ERROR_NOT_IGNORED
 insert into t1 values (null,null);
 drop table t1;
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_gis/t/rtree_create_inplace.test mysql-8.0-8.0.27/mysql-test/suite/innodb_gis/t/rtree_create_inplace.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_gis/t/rtree_create_inplace.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_gis/t/rtree_create_inplace.test	2021-09-28 11:46:34.000000000 +0000
@@ -41,8 +41,9 @@
 
 ALTER TABLE t1 DROP INDEX idx, ADD SPATIAL INDEX idx3(c2);
 
-SET SESSION debug="+d,row_merge_instrument_log_check_flush";
+SET SESSION debug="+d,ddl_instrument_log_check_flush";
 ALTER TABLE t1  DROP INDEX idx3, ADD SPATIAL INDEX idx4(c2), ADD SPATIAL INDEX idx5(c3);
+SET SESSION debug="-d,ddl_instrument_log_check_flush";
 
 # Clean up.
 DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_gis/t/rtree_debug.test mysql-8.0-8.0.27/mysql-test/suite/innodb_gis/t/rtree_debug.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_gis/t/rtree_debug.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_gis/t/rtree_debug.test	2021-09-28 11:46:34.000000000 +0000
@@ -48,10 +48,10 @@
 
 show create table t1;
 
-SET DEBUG='+d,row_merge_ins_spatial_fail';
+SET DEBUG='+d,ddl_ins_spatial_fail';
 --error ER_GET_ERRNO
 create spatial index idx2 on t1(c2);
-SET DEBUG='-d,row_merge_ins_spatial_fail';
+SET DEBUG='-d,ddl_ins_spatial_fail';
 show create table t1;
 
 # Check table.
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_zip/r/16k.result mysql-8.0-8.0.27/mysql-test/suite/innodb_zip/r/16k.result
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_zip/r/16k.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_zip/r/16k.result	2021-09-28 11:46:34.000000000 +0000
@@ -371,10 +371,10 @@
 66	65535	1	21120	1	adfdijn0loKNHJik
 SET SESSION sort_buffer_size = DEFAULT;
 ALTER TABLE t1 ADD PRIMARY KEY (a), ADD KEY (b(20));
-ERROR 23000: Duplicate entry '22' for key 't1.PRIMARY'
+ERROR 23000: Duplicate entry 'NN' for key 't1.PRIMARY'
 DELETE FROM t1 WHERE d='null';
 ALTER TABLE t1 ADD PRIMARY KEY (a), ADD KEY (b(20));
-ERROR 23000: Duplicate entry '22' for key 't1.PRIMARY'
+ERROR 23000: Duplicate entry 'NN' for key 't1.PRIMARY'
 DELETE FROM t1 WHERE a%2;
 CHECK TABLE t1;
 Table	Op	Msg_type	Msg_text
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/innodb_zip/t/16k.test mysql-8.0-8.0.27/mysql-test/suite/innodb_zip/t/16k.test
--- mysql-8.0-8.0.26/mysql-test/suite/innodb_zip/t/16k.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/innodb_zip/t/16k.test	2021-09-28 11:46:34.000000000 +0000
@@ -329,9 +329,11 @@
 ORDER BY 1, 2, 3, 4, 5, 6;
 SET SESSION sort_buffer_size = DEFAULT;
 # in-place alter table should trigger ER_PRIMARY_CANT_HAVE_NULL
+--replace_regex /'\d\d'/'NN'/
 --error ER_DUP_ENTRY
 ALTER TABLE t1 ADD PRIMARY KEY (a), ADD KEY (b(20));
 DELETE FROM t1 WHERE d='null';
+--replace_regex /'\d\d'/'NN'/
 --error ER_DUP_ENTRY
 ALTER TABLE t1 ADD PRIMARY KEY (a), ADD KEY (b(20));
 DELETE FROM t1 WHERE a%2;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/json/r/array_index_debug.result mysql-8.0-8.0.27/mysql-test/suite/json/r/array_index_debug.result
--- mysql-8.0-8.0.26/mysql-test/suite/json/r/array_index_debug.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/json/r/array_index_debug.result	2021-09-28 11:46:34.000000000 +0000
@@ -7,7 +7,7 @@
 INSERT INTO t VALUES ('[1,2,3]');
 SET debug = '+d,show_hidden_columns';
 SELECT * FROM t;
-j	28d61f7b1f07d88c18f1068410d140b5
+j	!hidden!k!0!0
 [1, 2, 3]	[1, 2, 3]
 CREATE TABLE t_copy AS SELECT * FROM t;
 ERROR 42000: This version of MySQL doesn't yet support 'Creating tables with array columns.'
@@ -24,8 +24,8 @@
 Table	Create Table
 t	CREATE TABLE `t` (
   `j` json DEFAULT NULL,
-  `3caa85db42b2089e2bb7c45a02715df8` bigint unsigned array GENERATED ALWAYS AS (cast(json_extract(`j`,_utf8mb4'$.b[*]') as unsigned array)) VIRTUAL,
-  `e2586f3a475714f9959f74986e64ee13` datetime(3) array GENERATED ALWAYS AS (cast(json_extract(`j`,_utf8mb4'$.a[*]') as datetime(3) array)) VIRTUAL,
+  `!hidden!k1!0!0` datetime(3) array GENERATED ALWAYS AS (cast(json_extract(`j`,_utf8mb4'$.a[*]') as datetime(3) array)) VIRTUAL,
+  `!hidden!k2!0!0` bigint unsigned array GENERATED ALWAYS AS (cast(json_extract(`j`,_utf8mb4'$.b[*]') as unsigned array)) VIRTUAL,
   KEY `k1` ((cast(json_extract(`j`,_utf8mb4'$.a[*]') as datetime(3) array))),
   KEY `k2` ((cast(json_extract(`j`,_utf8mb4'$.b[*]') as unsigned array)))
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/json/r/array_index.result mysql-8.0-8.0.27/mysql-test/suite/json/r/array_index.result
--- mysql-8.0-8.0.26/mysql-test/suite/json/r/array_index.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/json/r/array_index.result	2021-09-28 11:46:34.000000000 +0000
@@ -488,7 +488,7 @@
 18	[8, 4, 3, 5]
 explain select * from t1 where 5 member of (f1->"$[*]");
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ref	i1	i1	9	const	1	100.00	Using where
+1	SIMPLE	t1	NULL	ref	i1	i1	9	const	5	100.00	Using where
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`id` AS `id`,`test`.`t1`.`f1` AS `f1` from `test`.`t1` where json'5' member of (cast(json_extract(`f1`,_utf8mb4'$[*]') as unsigned array))
 select * from t1 where f1->"$[0]" member of ('[1,3,9]');
@@ -679,7 +679,7 @@
 8	[8, 5]
 explain select * from t1 where 5 member of (f1->"$");
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ref	i1	i1	9	const	1	100.00	Using where
+1	SIMPLE	t1	NULL	ref	i1	i1	9	const	2	100.00	Using where
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`id` AS `id`,`test`.`t1`.`f1` AS `f1` from `test`.`t1` where json'5' member of (cast(json_extract(`f1`,_utf8mb4'$') as signed array))
 select * from t1 force index(i1) where 99 member of (f1->"$[*]");
@@ -727,7 +727,7 @@
 ["gfd", "qwe"]
 explain select * from t1 where "qwe" member of (f1->"$[*]");
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ref	i1	i1	43	const	1	100.00	Using where
+1	SIMPLE	t1	NULL	ref	i1	i1	43	const	2	100.00	Using where
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1` from `test`.`t1` where json'"qwe"' member of (cast(json_extract(`f1`,_utf8mb4'$[*]') as char(10) array))
 select * from t1 force index(i1) where "bnm" member of  (f1->"$[*]");
@@ -775,7 +775,7 @@
 ["gfd", "qwe"]
 explain select * from t1 where "qwe" member of (f1->"$[*]");
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ref	i1	i1	13	const	1	100.00	Using where
+1	SIMPLE	t1	NULL	ref	i1	i1	13	const	2	100.00	Using where
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1` from `test`.`t1` where json'"base64:type15:cXdl"' member of (cast(json_extract(`f1`,_utf8mb4'$[*]') as binary(10) array))
 select * from t1 force index(i1) where "bnm" member of (f1->"$[*]");
@@ -840,7 +840,7 @@
 8	[-1.330, 5, 1.3300]
 explain select * from t1 where 1.33 member of (f1->"$");
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ref	i1	i1	6	const	1	100.00	Using where
+1	SIMPLE	t1	NULL	ref	i1	i1	6	const	2	100.00	Using where
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`id` AS `id`,`test`.`t1`.`f1` AS `f1` from `test`.`t1` where json'1.3300' member of (cast(json_extract(`f1`,_utf8mb4'$') as decimal(10, 4) array))
 select * from t1 force index(i1) where 99 member of (f1->"$[*]");
@@ -908,7 +908,7 @@
 7	["01-02-03", "22.11.17"]
 explain select * from t1 where cast('01-02-03' as date) member of (f1->"$");
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ref	i1	i1	4	const	1	100.00	Using where
+1	SIMPLE	t1	NULL	ref	i1	i1	4	const	4	100.00	Using where
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`id` AS `id`,`test`.`t1`.`f1` AS `f1` from `test`.`t1` where json'"2001-02-03"' member of (cast(json_extract(`f1`,_utf8mb4'$') as date array))
 select * from t1 force index(i1) where cast('01-01-12' as date) member of (f1->"$");
@@ -981,7 +981,7 @@
 7	["01:02:03", "22:11:17"]
 explain select * from t1 where cast('01:02:03' as time) member of (f1->"$");
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ref	i1	i1	4	const	1	100.00	Using where
+1	SIMPLE	t1	NULL	ref	i1	i1	4	const	4	100.00	Using where
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`id` AS `id`,`test`.`t1`.`f1` AS `f1` from `test`.`t1` where json'"01:02:03.000000"' member of (cast(json_extract(`f1`,_utf8mb4'$') as time array))
 select * from t1 force index(i1) where
@@ -1056,7 +1056,7 @@
 explain select * from t1 where cast('01-01-01 01:02:03' as datetime) member
 of (f1->"$");
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ref	i1	i1	6	const	1	100.00	Using where
+1	SIMPLE	t1	NULL	ref	i1	i1	6	const	4	100.00	Using where
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`id` AS `id`,`test`.`t1`.`f1` AS `f1` from `test`.`t1` where json'"2001-01-01 01:02:03.000000"' member of (cast(json_extract(`f1`,_utf8mb4'$') as datetime array))
 select * from t1 force index(i1) where
@@ -1955,7 +1955,7 @@
 EXPLAIN SELECT t1.col_int_key AS field1, t2.col_int AS field2 FROM t2 LEFT
 JOIN t1 ON 1 WHERE (CAST("1" AS JSON) MEMBER OF( t1.col_jsonn->'$[*]'));
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ref	mv_idx	mv_idx	163	const	1	100.00	Using where
+1	SIMPLE	t1	NULL	ref	mv_idx	mv_idx	163	const	2	100.00	Using where
 1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	5	100.00	Using join buffer (hash join)
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`col_int_key` AS `field1`,`test`.`t2`.`col_int` AS `field2` from `test`.`t2` join `test`.`t1` where json'"1"' member of (cast(json_extract(`col_jsonn`,_utf8mb4'$[*]') as char(40) array))
@@ -2416,8 +2416,8 @@
 [2,3,4]	[2, 3, 4]
 EXPLAIN FORMAT=TREE SELECT * FROM t WHERE 3 MEMBER OF (j);
 EXPLAIN
--> Filter: json'3' member of (cast(j as unsigned array))  (cost=0.35 rows=1)
-    -> Index lookup on t using j_idx (cast(j as unsigned array)=json'3')  (cost=0.35 rows=1)
+-> Filter: json'3' member of (cast(j as unsigned array))  (cost=0.80 rows=3)
+    -> Index lookup on t using j_idx (cast(j as unsigned array)=json'3')  (cost=0.80 rows=3)
 
 SELECT * FROM t WHERE 3 MEMBER OF (j);
 vc	j
@@ -2446,8 +2446,8 @@
 [2,3,4]	[2, 3, 4]
 EXPLAIN FORMAT=TREE SELECT * FROM t WHERE 3 MEMBER OF (vc);
 EXPLAIN
--> Filter: json'3' member of (cast(vc as unsigned array))  (cost=0.35 rows=1)
-    -> Index lookup on t using vc_idx (cast(vc as unsigned array)=json'3')  (cost=0.35 rows=1)
+-> Filter: json'3' member of (cast(vc as unsigned array))  (cost=0.80 rows=3)
+    -> Index lookup on t using vc_idx (cast(vc as unsigned array)=json'3')  (cost=0.80 rows=3)
 
 SELECT * FROM t WHERE 3 MEMBER OF (vc);
 vc	j
@@ -2455,4 +2455,792 @@
 [2,3,4]	[2, 3, 4]
 [3,4,5]	[3, 4, 5]
 DROP TABLE t;
+# Bug#33275457: Fix multi-valued index
+CREATE TABLE t1 (
+f1 VARCHAR(50) NOT NULL PRIMARY KEY,
+f2 JSON NOT NULL,
+INDEX idx2 ( (CAST(f2 AS CHAR(50) ARRAY)) )
+);
+CREATE VIEW v1 AS
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+PATH '$')) AS ids;
+INSERT INTO t1 VALUES ('foo', '["aa", "bb"]'), ('bar', '["xx", "yy"]');
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+EXPLAIN SELECT * FROM t1 WHERE 'xx' MEMBER OF (f2);
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	ref	idx2	idx2	203	const	1	100.00	Using where
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2` from `test`.`t1` where json'"xx"' member of (cast(`f2` as char(50) array))
+EXPLAIN SELECT * FROM t1 WHERE json_contains(f2, '"xx"');
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	idx2	idx2	203	NULL	1	100.00	Using where; Using MRR
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2` from `test`.`t1` where json_contains(cast(`f2` as char(50) array),json'["xx"]')
+EXPLAIN SELECT * FROM t1 WHERE json_overlaps(f2, '["xx", "zz"]');
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	idx2	idx2	203	NULL	2	100.00	Using where; Using MRR
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2` from `test`.`t1` where json_overlaps(cast(`f2` as char(50) array),json'["xx", "zz"]')
+EXPLAIN SELECT * FROM v1 WHERE 'xx' MEMBER OF (f2);
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	ref	idx2	idx2	203	const	1	100.00	Using where
+1	SIMPLE	ids	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Table function: json_table; Using temporary
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2`,`ids`.`i` AS `i`,`ids`.`id` AS `id` from `test`.`t1` join json_table(`test`.`t1`.`f2`, '$[*]' columns (`i` for ordinality, `id` varchar(50) character set utf8mb4 path '$')) `ids` where json'"xx"' member of (cast(`f2` as char(50) array))
+EXPLAIN SELECT * FROM v1 WHERE json_contains(f2, '"xx"');
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	idx2	idx2	203	NULL	1	100.00	Using where; Using MRR
+1	SIMPLE	ids	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Table function: json_table; Using temporary
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2`,`ids`.`i` AS `i`,`ids`.`id` AS `id` from `test`.`t1` join json_table(`test`.`t1`.`f2`, '$[*]' columns (`i` for ordinality, `id` varchar(50) character set utf8mb4 path '$')) `ids` where json_contains(cast(`f2` as char(50) array),json'["xx"]')
+EXPLAIN SELECT * FROM v1 WHERE json_overlaps(f2, '["xx", "zz"]');
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	idx2	idx2	203	NULL	2	100.00	Using where; Using MRR
+1	SIMPLE	ids	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Table function: json_table; Using temporary
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2`,`ids`.`i` AS `i`,`ids`.`id` AS `id` from `test`.`t1` join json_table(`test`.`t1`.`f2`, '$[*]' columns (`i` for ordinality, `id` varchar(50) character set utf8mb4 path '$')) `ids` where json_overlaps(cast(`f2` as char(50) array),json'["xx", "zz"]')
+EXPLAIN
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+PATH '$')) AS ids
+WHERE 'xx' MEMBER OF (f2);
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	ref	idx2	idx2	203	const	1	100.00	Using where
+1	SIMPLE	ids	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Table function: json_table; Using temporary
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2`,`ids`.`i` AS `i`,`ids`.`id` AS `id` from `test`.`t1` join json_table(`test`.`t1`.`f2`, '$[*]' columns (`i` for ordinality, `id` varchar(50) character set utf8mb4 path '$')) `ids` where json'"xx"' member of (cast(`f2` as char(50) array))
+EXPLAIN
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+PATH '$')) AS ids
+WHERE json_contains(f2, '"xx"');
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	idx2	idx2	203	NULL	1	100.00	Using where; Using MRR
+1	SIMPLE	ids	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Table function: json_table; Using temporary
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2`,`ids`.`i` AS `i`,`ids`.`id` AS `id` from `test`.`t1` join json_table(`test`.`t1`.`f2`, '$[*]' columns (`i` for ordinality, `id` varchar(50) character set utf8mb4 path '$')) `ids` where json_contains(cast(`f2` as char(50) array),json'["xx"]')
+EXPLAIN
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+PATH '$')) AS ids
+WHERE json_overlaps(f2, '["xx", "zz"]');
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	idx2	idx2	203	NULL	2	100.00	Using where; Using MRR
+1	SIMPLE	ids	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Table function: json_table; Using temporary
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2`,`ids`.`i` AS `i`,`ids`.`id` AS `id` from `test`.`t1` join json_table(`test`.`t1`.`f2`, '$[*]' columns (`i` for ordinality, `id` varchar(50) character set utf8mb4 path '$')) `ids` where json_overlaps(cast(`f2` as char(50) array),json'["xx", "zz"]')
+SELECT * FROM t1 WHERE 'xx' MEMBER OF (f2);
+f1	f2
+bar	["xx", "yy"]
+SELECT * FROM t1 WHERE json_contains(f2, '"xx"');
+f1	f2
+bar	["xx", "yy"]
+SELECT * FROM t1 WHERE json_overlaps(f2, '["xx", "zz"]');
+f1	f2
+bar	["xx", "yy"]
+SELECT * FROM v1 WHERE 'xx' MEMBER OF (f2);
+f1	f2	i	id
+bar	["xx", "yy"]	1	xx
+bar	["xx", "yy"]	2	yy
+SELECT * FROM v1 WHERE json_contains(f2, '"xx"');
+f1	f2	i	id
+bar	["xx", "yy"]	1	xx
+bar	["xx", "yy"]	2	yy
+SELECT * FROM v1 WHERE json_overlaps(f2, '["xx", "zz"]');
+f1	f2	i	id
+bar	["xx", "yy"]	1	xx
+bar	["xx", "yy"]	2	yy
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+PATH '$')) AS ids
+WHERE 'xx' MEMBER OF (f2);
+f1	f2	i	id
+bar	["xx", "yy"]	1	xx
+bar	["xx", "yy"]	2	yy
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+PATH '$')) AS ids
+WHERE json_contains(f2, '"xx"');
+f1	f2	i	id
+bar	["xx", "yy"]	1	xx
+bar	["xx", "yy"]	2	yy
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+PATH '$')) AS ids
+WHERE json_overlaps(f2, '["xx", "zz"]');
+f1	f2	i	id
+bar	["xx", "yy"]	1	xx
+bar	["xx", "yy"]	2	yy
+PREPARE stmt FROM 'EXPLAIN SELECT * FROM t1 WHERE ? MEMBER OF (f2)';
+SET @a='xx';
+EXECUTE stmt USING @a;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	ref	idx2	idx2	203	const	1	100.00	Using where
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2` from `test`.`t1` where json'"xx"' member of (cast(`f2` as char(50) array))
+PREPARE stmt FROM 'EXPLAIN SELECT * FROM t1 WHERE json_contains(f2, ?)';
+SET @a='"xx"';
+EXECUTE stmt USING @a;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	idx2	idx2	203	NULL	1	100.00	Using where; Using MRR
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2` from `test`.`t1` where json_contains(cast(`f2` as char(50) array),json'["xx"]')
+PREPARE stmt FROM 'EXPLAIN SELECT * FROM t1 WHERE json_overlaps(f2, ?)';
+SET @a='["xx", "cc"]';
+EXECUTE stmt USING @a;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	idx2	idx2	203	NULL	2	100.00	Using where; Using MRR
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2` from `test`.`t1` where json_overlaps(cast(`f2` as char(50) array),json'["xx", "cc"]')
+PREPARE stmt FROM 'EXPLAIN SELECT * FROM v1 WHERE ? MEMBER OF (f2)';
+SET @a='xx';
+EXECUTE stmt USING @a;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	ref	idx2	idx2	203	const	1	100.00	Using where
+1	SIMPLE	ids	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Table function: json_table; Using temporary
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2`,`ids`.`i` AS `i`,`ids`.`id` AS `id` from `test`.`t1` join json_table(`test`.`t1`.`f2`, '$[*]' columns (`i` for ordinality, `id` varchar(50) character set utf8mb4 path '$')) `ids` where json'"xx"' member of (cast(`f2` as char(50) array))
+PREPARE stmt FROM 'EXPLAIN SELECT * FROM v1 WHERE json_contains(f2, ?)';
+SET @a='"xx"';
+EXECUTE stmt USING @a;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	idx2	idx2	203	NULL	1	100.00	Using where; Using MRR
+1	SIMPLE	ids	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Table function: json_table; Using temporary
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2`,`ids`.`i` AS `i`,`ids`.`id` AS `id` from `test`.`t1` join json_table(`test`.`t1`.`f2`, '$[*]' columns (`i` for ordinality, `id` varchar(50) character set utf8mb4 path '$')) `ids` where json_contains(cast(`f2` as char(50) array),json'["xx"]')
+PREPARE stmt FROM 'EXPLAIN SELECT * FROM v1 WHERE json_overlaps(f2, ?)';
+SET @a='["xx", "cc"]';
+EXECUTE stmt USING @a;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	idx2	idx2	203	NULL	2	100.00	Using where; Using MRR
+1	SIMPLE	ids	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Table function: json_table; Using temporary
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2`,`ids`.`i` AS `i`,`ids`.`id` AS `id` from `test`.`t1` join json_table(`test`.`t1`.`f2`, '$[*]' columns (`i` for ordinality, `id` varchar(50) character set utf8mb4 path '$')) `ids` where json_overlaps(cast(`f2` as char(50) array),json'["xx", "cc"]')
+PREPARE stmt FROM '
+EXPLAIN
+SELECT *
+FROM t1, JSON_TABLE(f2, \'$[*]\'
+                    COLUMNS(i FOR ORDINALITY, id VARCHAR(50) PATH \'$\')) AS ids
+WHERE ? MEMBER OF (f2)';
+SET @a='xx';
+EXECUTE stmt USING @a;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	ref	idx2	idx2	203	const	1	100.00	Using where
+1	SIMPLE	ids	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Table function: json_table; Using temporary
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2`,`ids`.`i` AS `i`,`ids`.`id` AS `id` from `test`.`t1` join json_table(`test`.`t1`.`f2`, '$[*]' columns (`i` for ordinality, `id` varchar(50) character set utf8mb4 path '$')) `ids` where json'"xx"' member of (cast(`f2` as char(50) array))
+PREPARE stmt FROM '
+EXPLAIN
+SELECT *
+FROM t1, JSON_TABLE(f2, \'$[*]\'
+                    COLUMNS(i FOR ORDINALITY, id VARCHAR(50) PATH \'$\')) AS ids
+WHERE json_contains(f2, ?)';
+SET @a='"xx"';
+EXECUTE stmt USING @a;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	idx2	idx2	203	NULL	1	100.00	Using where; Using MRR
+1	SIMPLE	ids	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Table function: json_table; Using temporary
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2`,`ids`.`i` AS `i`,`ids`.`id` AS `id` from `test`.`t1` join json_table(`test`.`t1`.`f2`, '$[*]' columns (`i` for ordinality, `id` varchar(50) character set utf8mb4 path '$')) `ids` where json_contains(cast(`f2` as char(50) array),json'["xx"]')
+PREPARE stmt FROM '
+EXPLAIN
+SELECT *
+FROM t1, JSON_TABLE(f2, \'$[*]\'
+                    COLUMNS(i FOR ORDINALITY, id VARCHAR(50) PATH \'$\')) AS ids
+WHERE json_overlaps(f2, ?)';
+SET @a='["xx", "cc"]';
+EXECUTE stmt USING @a;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	idx2	idx2	203	NULL	2	100.00	Using where; Using MRR
+1	SIMPLE	ids	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Table function: json_table; Using temporary
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2`,`ids`.`i` AS `i`,`ids`.`id` AS `id` from `test`.`t1` join json_table(`test`.`t1`.`f2`, '$[*]' columns (`i` for ordinality, `id` varchar(50) character set utf8mb4 path '$')) `ids` where json_overlaps(cast(`f2` as char(50) array),json'["xx", "cc"]')
+PREPARE stmt FROM 'SELECT * FROM t1 WHERE ? MEMBER OF (f2)';
+SET @a='xx';
+EXECUTE stmt USING @a;
+f1	f2
+bar	["xx", "yy"]
+PREPARE stmt FROM 'SELECT * FROM t1 WHERE json_contains(f2, ?)';
+SET @a='"xx"';
+EXECUTE stmt USING @a;
+f1	f2
+bar	["xx", "yy"]
+PREPARE stmt FROM 'SELECT * FROM t1 WHERE json_overlaps(f2, ?)';
+SET @a='["xx", "cc"]';
+EXECUTE stmt USING @a;
+f1	f2
+bar	["xx", "yy"]
+PREPARE stmt FROM 'SELECT * FROM v1 WHERE ? MEMBER OF (f2)';
+SET @a='xx';
+EXECUTE stmt USING @a;
+f1	f2	i	id
+bar	["xx", "yy"]	1	xx
+bar	["xx", "yy"]	2	yy
+PREPARE stmt FROM 'SELECT * FROM v1 WHERE json_contains(f2, ?)';
+SET @a='"xx"';
+EXECUTE stmt USING @a;
+f1	f2	i	id
+bar	["xx", "yy"]	1	xx
+bar	["xx", "yy"]	2	yy
+PREPARE stmt FROM 'SELECT * FROM v1 WHERE json_overlaps(f2, ?)';
+SET @a='["xx", "cc"]';
+EXECUTE stmt USING @a;
+f1	f2	i	id
+bar	["xx", "yy"]	1	xx
+bar	["xx", "yy"]	2	yy
+PREPARE stmt FROM '
+SELECT *
+FROM t1, JSON_TABLE(f2, \'$[*]\'
+                    COLUMNS(i FOR ORDINALITY, id VARCHAR(50) PATH \'$\')) AS ids
+WHERE ? MEMBER OF (f2)';
+SET @a='xx';
+EXECUTE stmt USING @a;
+f1	f2	i	id
+bar	["xx", "yy"]	1	xx
+bar	["xx", "yy"]	2	yy
+PREPARE stmt FROM '
+SELECT *
+FROM t1, JSON_TABLE(f2, \'$[*]\'
+                    COLUMNS(i FOR ORDINALITY, id VARCHAR(50) PATH \'$\')) AS ids
+WHERE json_contains(f2, ?)';
+SET @a='"xx"';
+EXECUTE stmt USING @a;
+f1	f2	i	id
+bar	["xx", "yy"]	1	xx
+bar	["xx", "yy"]	2	yy
+PREPARE stmt FROM '
+SELECT *
+FROM t1, JSON_TABLE(f2, \'$[*]\'
+                    COLUMNS(i FOR ORDINALITY, id VARCHAR(50) PATH \'$\')) AS ids
+WHERE json_overlaps(f2, ?)';
+SET @a='["xx", "cc"]';
+EXECUTE stmt USING @a;
+f1	f2	i	id
+bar	["xx", "yy"]	1	xx
+bar	["xx", "yy"]	2	yy
+EXPLAIN SELECT * FROM t1 WHERE 'xx' MEMBER OF (f2) AND 'yy' MEMBER OF (f2);
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	ref	idx2	idx2	203	const	1	100.00	Using where
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2` from `test`.`t1` where (json'"xx"' member of (cast(`f2` as char(50) array)) and json'"yy"' member of (cast(`f2` as char(50) array)))
+EXPLAIN
+SELECT * FROM t1 WHERE json_contains(f2, '"xx"') AND json_contains(f2, '"yy"');
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	idx2	idx2	203	NULL	1	100.00	Using where; Using MRR
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2` from `test`.`t1` where (json_contains(cast(`f2` as char(50) array),json'["xx"]') and json_contains(cast(`f2` as char(50) array),json'["yy"]'))
+EXPLAIN
+SELECT *
+FROM t1
+WHERE json_overlaps(f2, '["xx", "zz"]') AND json_overlaps(f2, '["yy", "zz"]');
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	idx2	idx2	203	NULL	2	100.00	Using where; Using MRR
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2` from `test`.`t1` where (json_overlaps(cast(`f2` as char(50) array),json'["xx", "zz"]') and json_overlaps(cast(`f2` as char(50) array),json'["yy", "zz"]'))
+EXPLAIN SELECT * FROM v1 WHERE 'xx' MEMBER OF (f2) AND 'yy' MEMBER OF (f2);
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	ref	idx2	idx2	203	const	1	100.00	Using where
+1	SIMPLE	ids	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Table function: json_table; Using temporary
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2`,`ids`.`i` AS `i`,`ids`.`id` AS `id` from `test`.`t1` join json_table(`test`.`t1`.`f2`, '$[*]' columns (`i` for ordinality, `id` varchar(50) character set utf8mb4 path '$')) `ids` where (json'"xx"' member of (cast(`f2` as char(50) array)) and json'"yy"' member of (cast(`f2` as char(50) array)))
+EXPLAIN
+SELECT * FROM v1 WHERE json_contains(f2, '"xx"') AND json_contains(f2, '"yy"');
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	idx2	idx2	203	NULL	1	100.00	Using where; Using MRR
+1	SIMPLE	ids	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Table function: json_table; Using temporary
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2`,`ids`.`i` AS `i`,`ids`.`id` AS `id` from `test`.`t1` join json_table(`test`.`t1`.`f2`, '$[*]' columns (`i` for ordinality, `id` varchar(50) character set utf8mb4 path '$')) `ids` where (json_contains(cast(`f2` as char(50) array),json'["xx"]') and json_contains(cast(`f2` as char(50) array),json'["yy"]'))
+EXPLAIN
+SELECT *
+FROM v1
+WHERE json_overlaps(f2, '["xx", "zz"]') AND json_overlaps(f2, '["yy", "zz"]');
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	idx2	idx2	203	NULL	2	100.00	Using where; Using MRR
+1	SIMPLE	ids	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Table function: json_table; Using temporary
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2`,`ids`.`i` AS `i`,`ids`.`id` AS `id` from `test`.`t1` join json_table(`test`.`t1`.`f2`, '$[*]' columns (`i` for ordinality, `id` varchar(50) character set utf8mb4 path '$')) `ids` where (json_overlaps(cast(`f2` as char(50) array),json'["xx", "zz"]') and json_overlaps(cast(`f2` as char(50) array),json'["yy", "zz"]'))
+EXPLAIN
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+PATH '$')) AS ids
+WHERE 'xx' MEMBER OF (f2) AND 'yy' MEMBER OF (f2);
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	ref	idx2	idx2	203	const	1	100.00	Using where
+1	SIMPLE	ids	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Table function: json_table; Using temporary
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2`,`ids`.`i` AS `i`,`ids`.`id` AS `id` from `test`.`t1` join json_table(`test`.`t1`.`f2`, '$[*]' columns (`i` for ordinality, `id` varchar(50) character set utf8mb4 path '$')) `ids` where (json'"xx"' member of (cast(`f2` as char(50) array)) and json'"yy"' member of (cast(`f2` as char(50) array)))
+EXPLAIN
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+PATH '$')) AS ids
+WHERE json_contains(f2, '"xx"') AND json_contains(f2, '"yy"');
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	idx2	idx2	203	NULL	1	100.00	Using where; Using MRR
+1	SIMPLE	ids	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Table function: json_table; Using temporary
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2`,`ids`.`i` AS `i`,`ids`.`id` AS `id` from `test`.`t1` join json_table(`test`.`t1`.`f2`, '$[*]' columns (`i` for ordinality, `id` varchar(50) character set utf8mb4 path '$')) `ids` where (json_contains(cast(`f2` as char(50) array),json'["xx"]') and json_contains(cast(`f2` as char(50) array),json'["yy"]'))
+EXPLAIN
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+PATH '$')) AS ids
+WHERE json_overlaps(f2, '["xx", "zz"]') AND json_overlaps(f2, '["yy", "zz"]');
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	idx2	idx2	203	NULL	2	100.00	Using where; Using MRR
+1	SIMPLE	ids	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Table function: json_table; Using temporary
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2`,`ids`.`i` AS `i`,`ids`.`id` AS `id` from `test`.`t1` join json_table(`test`.`t1`.`f2`, '$[*]' columns (`i` for ordinality, `id` varchar(50) character set utf8mb4 path '$')) `ids` where (json_overlaps(cast(`f2` as char(50) array),json'["xx", "zz"]') and json_overlaps(cast(`f2` as char(50) array),json'["yy", "zz"]'))
+EXPLAIN
+SELECT *
+FROM t1
+WHERE 'xx' MEMBER OF (f2) AND 'yy' MEMBER OF(f2) AND f1 = 'bar';
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	const	PRIMARY,idx2	PRIMARY	202	const	1	100.00	NULL
+Warnings:
+Note	1003	/* select#1 */ select 'bar' AS `f1`,'["xx", "yy"]' AS `f2` from `test`.`t1` where true
+EXPLAIN
+SELECT *
+FROM t1
+WHERE json_contains(f2, '"xx"') AND json_contains(f2, '"yy"') AND f1 = 'bar';
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	const	PRIMARY,idx2	PRIMARY	202	const	1	100.00	NULL
+Warnings:
+Note	1003	/* select#1 */ select 'bar' AS `f1`,'["xx", "yy"]' AS `f2` from `test`.`t1` where true
+EXPLAIN
+SELECT *
+FROM t1
+WHERE json_overlaps(f2, '["xx", "zz"]') AND
+json_overlaps(f2, '["yy", "zz"]') AND
+f1 = 'bar';
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	const	PRIMARY,idx2	PRIMARY	202	const	1	100.00	NULL
+Warnings:
+Note	1003	/* select#1 */ select 'bar' AS `f1`,'["xx", "yy"]' AS `f2` from `test`.`t1` where true
+EXPLAIN
+SELECT *
+FROM v1
+WHERE 'xx' MEMBER OF (f2) AND 'yy' MEMBER OF(f2) AND f1 = 'bar';
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	const	PRIMARY,idx2	PRIMARY	202	const	1	100.00	NULL
+1	SIMPLE	ids	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Table function: json_table; Using temporary
+Warnings:
+Note	1003	/* select#1 */ select 'bar' AS `f1`,'["xx", "yy"]' AS `f2`,`ids`.`i` AS `i`,`ids`.`id` AS `id` from `test`.`t1` join json_table('["xx", "yy"]', '$[*]' columns (`i` for ordinality, `id` varchar(50) character set utf8mb4 path '$')) `ids` where (json'"xx"' member of (cast('["xx", "yy"]' as char(50) array)) and json'"yy"' member of (cast('["xx", "yy"]' as char(50) array)))
+EXPLAIN
+SELECT *
+FROM v1
+WHERE json_contains(f2, '"xx"') AND json_contains(f2, '"yy"') AND f1 = 'bar';
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	const	PRIMARY,idx2	PRIMARY	202	const	1	100.00	NULL
+1	SIMPLE	ids	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Table function: json_table; Using temporary
+Warnings:
+Note	1003	/* select#1 */ select 'bar' AS `f1`,'["xx", "yy"]' AS `f2`,`ids`.`i` AS `i`,`ids`.`id` AS `id` from `test`.`t1` join json_table('["xx", "yy"]', '$[*]' columns (`i` for ordinality, `id` varchar(50) character set utf8mb4 path '$')) `ids` where (json_contains(cast('["xx", "yy"]' as char(50) array),json'["xx"]') and json_contains(cast('["xx", "yy"]' as char(50) array),json'["yy"]'))
+EXPLAIN
+SELECT *
+FROM v1
+WHERE json_overlaps(f2, '["xx", "zz"]') AND
+json_overlaps(f2, '["yy", "zz"]') AND
+f1 = 'bar';
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	const	PRIMARY,idx2	PRIMARY	202	const	1	100.00	NULL
+1	SIMPLE	ids	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Table function: json_table; Using temporary
+Warnings:
+Note	1003	/* select#1 */ select 'bar' AS `f1`,'["xx", "yy"]' AS `f2`,`ids`.`i` AS `i`,`ids`.`id` AS `id` from `test`.`t1` join json_table('["xx", "yy"]', '$[*]' columns (`i` for ordinality, `id` varchar(50) character set utf8mb4 path '$')) `ids` where (json_overlaps(cast('["xx", "yy"]' as char(50) array),json'["xx", "zz"]') and json_overlaps(cast('["xx", "yy"]' as char(50) array),json'["yy", "zz"]'))
+EXPLAIN
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+PATH '$')) AS ids
+WHERE 'xx' MEMBER OF (f2) AND 'yy' MEMBER OF (f2) AND f1 = 'bar';
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	const	PRIMARY,idx2	PRIMARY	202	const	1	100.00	NULL
+1	SIMPLE	ids	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Table function: json_table; Using temporary
+Warnings:
+Note	1003	/* select#1 */ select 'bar' AS `f1`,'["xx", "yy"]' AS `f2`,`ids`.`i` AS `i`,`ids`.`id` AS `id` from `test`.`t1` join json_table('["xx", "yy"]', '$[*]' columns (`i` for ordinality, `id` varchar(50) character set utf8mb4 path '$')) `ids` where (json'"xx"' member of (cast('["xx", "yy"]' as char(50) array)) and json'"yy"' member of (cast('["xx", "yy"]' as char(50) array)))
+EXPLAIN
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+PATH '$')) AS ids
+WHERE json_contains(f2, '"xx"') AND json_contains(f2, '"yy"') AND f1 = 'bar';
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	const	PRIMARY,idx2	PRIMARY	202	const	1	100.00	NULL
+1	SIMPLE	ids	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Table function: json_table; Using temporary
+Warnings:
+Note	1003	/* select#1 */ select 'bar' AS `f1`,'["xx", "yy"]' AS `f2`,`ids`.`i` AS `i`,`ids`.`id` AS `id` from `test`.`t1` join json_table('["xx", "yy"]', '$[*]' columns (`i` for ordinality, `id` varchar(50) character set utf8mb4 path '$')) `ids` where (json_contains(cast('["xx", "yy"]' as char(50) array),json'["xx"]') and json_contains(cast('["xx", "yy"]' as char(50) array),json'["yy"]'))
+EXPLAIN
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+PATH '$')) AS ids
+WHERE json_overlaps(f2, '["xx", "zz"]') AND
+json_overlaps(f2, '["yy", "zz"]') AND
+f1 = 'bar';
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	const	PRIMARY,idx2	PRIMARY	202	const	1	100.00	NULL
+1	SIMPLE	ids	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Table function: json_table; Using temporary
+Warnings:
+Note	1003	/* select#1 */ select 'bar' AS `f1`,'["xx", "yy"]' AS `f2`,`ids`.`i` AS `i`,`ids`.`id` AS `id` from `test`.`t1` join json_table('["xx", "yy"]', '$[*]' columns (`i` for ordinality, `id` varchar(50) character set utf8mb4 path '$')) `ids` where (json_overlaps(cast('["xx", "yy"]' as char(50) array),json'["xx", "zz"]') and json_overlaps(cast('["xx", "yy"]' as char(50) array),json'["yy", "zz"]'))
+SELECT * FROM t1 WHERE 'xx' MEMBER OF (f2) AND 'yy' MEMBER OF (f2);
+f1	f2
+bar	["xx", "yy"]
+SELECT * FROM t1 WHERE json_contains(f2, '"xx"') AND json_contains(f2, '"yy"');
+f1	f2
+bar	["xx", "yy"]
+SELECT *
+FROM t1
+WHERE json_overlaps(f2, '["xx", "zz"]') AND json_overlaps(f2, '["yy", "zz"]');
+f1	f2
+bar	["xx", "yy"]
+SELECT * FROM v1 WHERE 'xx' MEMBER OF (f2) AND 'yy' MEMBER OF (f2);
+f1	f2	i	id
+bar	["xx", "yy"]	1	xx
+bar	["xx", "yy"]	2	yy
+SELECT * FROM v1 WHERE json_contains(f2, '"xx"') AND json_contains(f2, '"yy"');
+f1	f2	i	id
+bar	["xx", "yy"]	1	xx
+bar	["xx", "yy"]	2	yy
+SELECT *
+FROM v1
+WHERE json_overlaps(f2, '["xx", "zz"]') AND json_overlaps(f2, '["yy", "zz"]');
+f1	f2	i	id
+bar	["xx", "yy"]	1	xx
+bar	["xx", "yy"]	2	yy
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+PATH '$')) AS ids
+WHERE 'xx' MEMBER OF (f2) AND 'yy' MEMBER OF (f2);
+f1	f2	i	id
+bar	["xx", "yy"]	1	xx
+bar	["xx", "yy"]	2	yy
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+PATH '$')) AS ids
+WHERE json_contains(f2, '"xx"') AND json_contains(f2, '"yy"');
+f1	f2	i	id
+bar	["xx", "yy"]	1	xx
+bar	["xx", "yy"]	2	yy
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+PATH '$')) AS ids
+WHERE json_overlaps(f2, '["xx", "zz"]') AND json_overlaps(f2, '["yy", "zz"]');
+f1	f2	i	id
+bar	["xx", "yy"]	1	xx
+bar	["xx", "yy"]	2	yy
+SELECT *
+FROM t1
+WHERE 'xx' MEMBER OF (f2) AND 'yy' MEMBER OF (f2) AND f1 = 'bar';
+f1	f2
+bar	["xx", "yy"]
+SELECT *
+FROM t1
+WHERE json_contains(f2, '"xx"') AND json_contains(f2, '"yy"') AND f1 = 'bar';
+f1	f2
+bar	["xx", "yy"]
+SELECT *
+FROM t1
+WHERE json_overlaps(f2, '["xx", "zz"]') AND
+json_overlaps(f2, '["yy", "zz"]') AND
+f1 = 'bar';
+f1	f2
+bar	["xx", "yy"]
+SELECT *
+FROM v1
+WHERE 'xx' MEMBER OF (f2) AND 'yy' MEMBER OF (f2) AND f1 = 'bar';
+f1	f2	i	id
+bar	["xx", "yy"]	1	xx
+bar	["xx", "yy"]	2	yy
+SELECT *
+FROM v1
+WHERE json_contains(f2, '"xx"') AND json_contains(f2, '"yy"') AND f1 = 'bar';
+f1	f2	i	id
+bar	["xx", "yy"]	1	xx
+bar	["xx", "yy"]	2	yy
+SELECT *
+FROM v1
+WHERE json_overlaps(f2, '["xx", "zz"]') AND
+json_overlaps(f2, '["yy", "zz"]') AND
+f1 = 'bar';
+f1	f2	i	id
+bar	["xx", "yy"]	1	xx
+bar	["xx", "yy"]	2	yy
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+PATH '$')) AS ids
+WHERE 'xx' MEMBER OF (f2) AND 'yy' MEMBER OF(f2) AND f1 = 'bar';
+f1	f2	i	id
+bar	["xx", "yy"]	1	xx
+bar	["xx", "yy"]	2	yy
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+PATH '$')) AS ids
+WHERE json_contains(f2, '"xx"') AND json_contains(f2, '"yy"') AND f1 = 'bar';
+f1	f2	i	id
+bar	["xx", "yy"]	1	xx
+bar	["xx", "yy"]	2	yy
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+PATH '$')) AS ids
+WHERE json_overlaps(f2, '["xx", "zz"]') AND
+json_overlaps(f2, '["yy", "zz"]') AND
+f1 = 'bar';
+f1	f2	i	id
+bar	["xx", "yy"]	1	xx
+bar	["xx", "yy"]	2	yy
+EXPLAIN SELECT * FROM t1 WHERE 'xx' MEMBER OF (f2) OR 'zz' MEMBER OF (f2);
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	idx2	idx2	203	NULL	2	100.00	Using where; Using MRR
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2` from `test`.`t1` where (json'"xx"' member of (cast(`f2` as char(50) array)) or json'"zz"' member of (cast(`f2` as char(50) array)))
+EXPLAIN SELECT * FROM t1 WHERE json_contains(f2, '"xx"') OR json_contains(f2, '"zz"');
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	idx2	idx2	203	NULL	2	100.00	Using where; Using MRR
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2` from `test`.`t1` where (json_contains(cast(`f2` as char(50) array),json'["xx"]') or json_contains(cast(`f2` as char(50) array),json'["zz"]'))
+EXPLAIN SELECT * FROM t1 WHERE json_overlaps(f2, '["xx", "zz"]') OR json_overlaps(f2, '["zz"]');
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	idx2	idx2	203	NULL	3	100.00	Using where; Using MRR
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2` from `test`.`t1` where (json_overlaps(cast(`f2` as char(50) array),json'["xx", "zz"]') or json_overlaps(cast(`f2` as char(50) array),json'["zz"]'))
+EXPLAIN SELECT * FROM v1 WHERE 'xx' MEMBER OF (f2) OR 'zz' MEMBER OF (f2);
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	idx2	idx2	203	NULL	2	100.00	Using where; Using MRR
+1	SIMPLE	ids	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Table function: json_table; Using temporary
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2`,`ids`.`i` AS `i`,`ids`.`id` AS `id` from `test`.`t1` join json_table(`test`.`t1`.`f2`, '$[*]' columns (`i` for ordinality, `id` varchar(50) character set utf8mb4 path '$')) `ids` where (json'"xx"' member of (cast(`f2` as char(50) array)) or json'"zz"' member of (cast(`f2` as char(50) array)))
+EXPLAIN SELECT * FROM v1 WHERE json_contains(f2, '"xx"') OR json_contains(f2, '"zz"');
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	idx2	idx2	203	NULL	2	100.00	Using where; Using MRR
+1	SIMPLE	ids	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Table function: json_table; Using temporary
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2`,`ids`.`i` AS `i`,`ids`.`id` AS `id` from `test`.`t1` join json_table(`test`.`t1`.`f2`, '$[*]' columns (`i` for ordinality, `id` varchar(50) character set utf8mb4 path '$')) `ids` where (json_contains(cast(`f2` as char(50) array),json'["xx"]') or json_contains(cast(`f2` as char(50) array),json'["zz"]'))
+EXPLAIN
+SELECT *
+FROM v1
+WHERE json_overlaps(f2, '["xx", "zz"]') OR json_overlaps(f2, '["zz"]');
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	idx2	idx2	203	NULL	3	100.00	Using where; Using MRR
+1	SIMPLE	ids	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Table function: json_table; Using temporary
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2`,`ids`.`i` AS `i`,`ids`.`id` AS `id` from `test`.`t1` join json_table(`test`.`t1`.`f2`, '$[*]' columns (`i` for ordinality, `id` varchar(50) character set utf8mb4 path '$')) `ids` where (json_overlaps(cast(`f2` as char(50) array),json'["xx", "zz"]') or json_overlaps(cast(`f2` as char(50) array),json'["zz"]'))
+EXPLAIN
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+PATH '$')) AS ids
+WHERE 'xx' MEMBER OF (f2) OR 'zz' MEMBER OF (f2);
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	idx2	idx2	203	NULL	2	100.00	Using where; Using MRR
+1	SIMPLE	ids	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Table function: json_table; Using temporary
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2`,`ids`.`i` AS `i`,`ids`.`id` AS `id` from `test`.`t1` join json_table(`test`.`t1`.`f2`, '$[*]' columns (`i` for ordinality, `id` varchar(50) character set utf8mb4 path '$')) `ids` where (json'"xx"' member of (cast(`f2` as char(50) array)) or json'"zz"' member of (cast(`f2` as char(50) array)))
+EXPLAIN
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+PATH '$')) AS ids
+WHERE json_contains(f2, '"xx"') OR json_contains(f2, '"zz"');
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	idx2	idx2	203	NULL	2	100.00	Using where; Using MRR
+1	SIMPLE	ids	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Table function: json_table; Using temporary
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2`,`ids`.`i` AS `i`,`ids`.`id` AS `id` from `test`.`t1` join json_table(`test`.`t1`.`f2`, '$[*]' columns (`i` for ordinality, `id` varchar(50) character set utf8mb4 path '$')) `ids` where (json_contains(cast(`f2` as char(50) array),json'["xx"]') or json_contains(cast(`f2` as char(50) array),json'["zz"]'))
+EXPLAIN
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+PATH '$')) AS ids
+WHERE json_overlaps(f2, '["xx", "zz"]') OR json_overlaps(f2, '["zz"]');
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	range	idx2	idx2	203	NULL	3	100.00	Using where; Using MRR
+1	SIMPLE	ids	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Table function: json_table; Using temporary
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2`,`ids`.`i` AS `i`,`ids`.`id` AS `id` from `test`.`t1` join json_table(`test`.`t1`.`f2`, '$[*]' columns (`i` for ordinality, `id` varchar(50) character set utf8mb4 path '$')) `ids` where (json_overlaps(cast(`f2` as char(50) array),json'["xx", "zz"]') or json_overlaps(cast(`f2` as char(50) array),json'["zz"]'))
+INSERT INTO t1 VALUES
+('k1', '["v1"]'), ('k2', '["v2"]'), ('k3', '["v3"]'),
+('k4', '["v4"]'), ('k5', '["v5"]'), ('k6', '["v6"]'),
+('k7', '["v7"]'), ('k8', '["v8"]'), ('k9', '["v9"]');
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+EXPLAIN
+SELECT *
+FROM t1
+WHERE 'xx' MEMBER OF (f2) OR 'zz' MEMBER OF (f2) OR f1 = 'bar';
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	index_merge	PRIMARY,idx2	idx2,PRIMARY	203,202	NULL	3	100.00	Using sort_union(idx2,PRIMARY); Using where
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2` from `test`.`t1` where (json'"xx"' member of (cast(`f2` as char(50) array)) or json'"zz"' member of (cast(`f2` as char(50) array)) or (`test`.`t1`.`f1` = 'bar'))
+EXPLAIN
+SELECT *
+FROM t1
+WHERE json_contains(f2, '"xx"') OR json_contains(f2, '"zz"') OR f1 = 'bar';
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	index_merge	PRIMARY,idx2	idx2,PRIMARY	203,202	NULL	3	100.00	Using sort_union(idx2,PRIMARY); Using where
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2` from `test`.`t1` where (json_contains(cast(`f2` as char(50) array),json'["xx"]') or json_contains(cast(`f2` as char(50) array),json'["zz"]') or (`test`.`t1`.`f1` = 'bar'))
+EXPLAIN
+SELECT *
+FROM t1
+WHERE json_overlaps(f2, '["xx", "zz"]') OR json_overlaps(f2, '["zz"]') OR
+f1 = 'bar';
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	index_merge	PRIMARY,idx2	idx2,PRIMARY	203,202	NULL	4	100.00	Using sort_union(idx2,PRIMARY); Using where
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2` from `test`.`t1` where (json_overlaps(cast(`f2` as char(50) array),json'["xx", "zz"]') or json_overlaps(cast(`f2` as char(50) array),json'["zz"]') or (`test`.`t1`.`f1` = 'bar'))
+EXPLAIN
+SELECT *
+FROM v1
+WHERE 'xx' MEMBER OF (f2) OR 'zz' MEMBER OF(f2) OR f1 = 'bar';
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	index_merge	PRIMARY,idx2	idx2,PRIMARY	203,202	NULL	3	100.00	Using sort_union(idx2,PRIMARY); Using where
+1	SIMPLE	ids	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Table function: json_table; Using temporary
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2`,`ids`.`i` AS `i`,`ids`.`id` AS `id` from `test`.`t1` join json_table(`test`.`t1`.`f2`, '$[*]' columns (`i` for ordinality, `id` varchar(50) character set utf8mb4 path '$')) `ids` where (json'"xx"' member of (cast(`f2` as char(50) array)) or json'"zz"' member of (cast(`f2` as char(50) array)) or (`test`.`t1`.`f1` = 'bar'))
+EXPLAIN
+SELECT *
+FROM v1
+WHERE json_contains(f2, '"xx"') OR json_contains(f2, '"zz"') OR f1 = 'bar';
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	index_merge	PRIMARY,idx2	idx2,PRIMARY	203,202	NULL	3	100.00	Using sort_union(idx2,PRIMARY); Using where
+1	SIMPLE	ids	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Table function: json_table; Using temporary
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2`,`ids`.`i` AS `i`,`ids`.`id` AS `id` from `test`.`t1` join json_table(`test`.`t1`.`f2`, '$[*]' columns (`i` for ordinality, `id` varchar(50) character set utf8mb4 path '$')) `ids` where (json_contains(cast(`f2` as char(50) array),json'["xx"]') or json_contains(cast(`f2` as char(50) array),json'["zz"]') or (`test`.`t1`.`f1` = 'bar'))
+EXPLAIN
+SELECT *
+FROM v1
+WHERE json_overlaps(f2, '["xx", "zz"]') OR json_overlaps(f2, '["zz"]') OR
+f1 = 'bar';
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	index_merge	PRIMARY,idx2	idx2,PRIMARY	203,202	NULL	4	100.00	Using sort_union(idx2,PRIMARY); Using where
+1	SIMPLE	ids	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Table function: json_table; Using temporary
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2`,`ids`.`i` AS `i`,`ids`.`id` AS `id` from `test`.`t1` join json_table(`test`.`t1`.`f2`, '$[*]' columns (`i` for ordinality, `id` varchar(50) character set utf8mb4 path '$')) `ids` where (json_overlaps(cast(`f2` as char(50) array),json'["xx", "zz"]') or json_overlaps(cast(`f2` as char(50) array),json'["zz"]') or (`test`.`t1`.`f1` = 'bar'))
+EXPLAIN
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+PATH '$')) AS ids
+WHERE 'xx' MEMBER OF (f2) OR 'zz' MEMBER OF (f2) OR f1 = 'bar';
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	index_merge	PRIMARY,idx2	idx2,PRIMARY	203,202	NULL	3	100.00	Using sort_union(idx2,PRIMARY); Using where
+1	SIMPLE	ids	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Table function: json_table; Using temporary
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2`,`ids`.`i` AS `i`,`ids`.`id` AS `id` from `test`.`t1` join json_table(`test`.`t1`.`f2`, '$[*]' columns (`i` for ordinality, `id` varchar(50) character set utf8mb4 path '$')) `ids` where (json'"xx"' member of (cast(`f2` as char(50) array)) or json'"zz"' member of (cast(`f2` as char(50) array)) or (`test`.`t1`.`f1` = 'bar'))
+EXPLAIN
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+PATH '$')) AS ids
+WHERE json_contains(f2, '"xx"') OR json_contains(f2, '"zz"') OR f1 = 'bar';
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	index_merge	PRIMARY,idx2	idx2,PRIMARY	203,202	NULL	3	100.00	Using sort_union(idx2,PRIMARY); Using where
+1	SIMPLE	ids	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Table function: json_table; Using temporary
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2`,`ids`.`i` AS `i`,`ids`.`id` AS `id` from `test`.`t1` join json_table(`test`.`t1`.`f2`, '$[*]' columns (`i` for ordinality, `id` varchar(50) character set utf8mb4 path '$')) `ids` where (json_contains(cast(`f2` as char(50) array),json'["xx"]') or json_contains(cast(`f2` as char(50) array),json'["zz"]') or (`test`.`t1`.`f1` = 'bar'))
+EXPLAIN
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+PATH '$')) AS ids
+WHERE json_overlaps(f2, '["xx", "zz"]') OR json_overlaps(f2, '["zz"]') OR
+f1 = 'bar';
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	index_merge	PRIMARY,idx2	idx2,PRIMARY	203,202	NULL	4	100.00	Using sort_union(idx2,PRIMARY); Using where
+1	SIMPLE	ids	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Table function: json_table; Using temporary
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2`,`ids`.`i` AS `i`,`ids`.`id` AS `id` from `test`.`t1` join json_table(`test`.`t1`.`f2`, '$[*]' columns (`i` for ordinality, `id` varchar(50) character set utf8mb4 path '$')) `ids` where (json_overlaps(cast(`f2` as char(50) array),json'["xx", "zz"]') or json_overlaps(cast(`f2` as char(50) array),json'["zz"]') or (`test`.`t1`.`f1` = 'bar'))
+SELECT * FROM t1 WHERE 'xx' MEMBER OF (f2) OR 'zz' MEMBER OF (f2);
+f1	f2
+bar	["xx", "yy"]
+SELECT * FROM t1 WHERE json_contains(f2, '"xx"') OR json_contains(f2, '"zz"');
+f1	f2
+bar	["xx", "yy"]
+SELECT *
+FROM t1
+WHERE json_overlaps(f2, '["xx", "zz"]') OR json_overlaps(f2, '["zz"]');
+f1	f2
+bar	["xx", "yy"]
+SELECT * FROM v1 WHERE 'xx' MEMBER OF (f2) OR 'zz' MEMBER OF(f2);
+f1	f2	i	id
+bar	["xx", "yy"]	1	xx
+bar	["xx", "yy"]	2	yy
+SELECT * FROM v1 WHERE json_contains(f2, '"xx"') OR json_contains(f2, '"zz"');
+f1	f2	i	id
+bar	["xx", "yy"]	1	xx
+bar	["xx", "yy"]	2	yy
+SELECT *
+FROM v1
+WHERE json_overlaps(f2, '["xx", "zz"]') OR json_overlaps(f2, '["zz"]');
+f1	f2	i	id
+bar	["xx", "yy"]	1	xx
+bar	["xx", "yy"]	2	yy
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+PATH '$')) AS ids
+WHERE 'xx' MEMBER OF (f2) OR 'zz' MEMBER OF (f2);
+f1	f2	i	id
+bar	["xx", "yy"]	1	xx
+bar	["xx", "yy"]	2	yy
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+PATH '$')) AS ids
+WHERE json_contains(f2, '"xx"') OR json_contains(f2, '"zz"');
+f1	f2	i	id
+bar	["xx", "yy"]	1	xx
+bar	["xx", "yy"]	2	yy
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+PATH '$')) AS ids
+WHERE json_overlaps(f2, '["xx", "zz"]') OR json_overlaps(f2, '["zz"]');
+f1	f2	i	id
+bar	["xx", "yy"]	1	xx
+bar	["xx", "yy"]	2	yy
+SELECT * FROM t1 WHERE 'xx' MEMBER OF (f2) OR 'zz' MEMBER OF (f2) OR f1 = 'bar';
+f1	f2
+bar	["xx", "yy"]
+SELECT *
+FROM t1
+WHERE json_contains(f2, '"xx"') OR json_contains(f2, '"zz"') OR f1 = 'bar';
+f1	f2
+bar	["xx", "yy"]
+SELECT *
+FROM t1
+WHERE json_overlaps(f2, '["xx", "zz"]') OR json_overlaps(f2, '["zz"]') OR
+f1 = 'bar';
+f1	f2
+bar	["xx", "yy"]
+SELECT * FROM v1 WHERE 'xx' MEMBER OF (f2) OR 'zz' MEMBER OF (f2) OR f1 = 'bar';
+f1	f2	i	id
+bar	["xx", "yy"]	1	xx
+bar	["xx", "yy"]	2	yy
+SELECT *
+FROM v1
+WHERE json_contains(f2, '"xx"') OR json_contains(f2, '"zz"') OR f1 = 'bar';
+f1	f2	i	id
+bar	["xx", "yy"]	1	xx
+bar	["xx", "yy"]	2	yy
+SELECT *
+FROM v1
+WHERE json_overlaps(f2, '["xx", "zz"]') OR json_overlaps(f2, '["zz"]') OR
+f1 = 'bar';
+f1	f2	i	id
+bar	["xx", "yy"]	1	xx
+bar	["xx", "yy"]	2	yy
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+PATH '$')) AS ids
+WHERE 'xx' MEMBER OF (f2) OR 'zz' MEMBER OF (f2) OR f1 = 'bar';
+f1	f2	i	id
+bar	["xx", "yy"]	1	xx
+bar	["xx", "yy"]	2	yy
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+PATH '$')) AS ids
+WHERE json_contains(f2, '"xx"') OR json_contains(f2, '"zz"') OR f1 = 'bar';
+f1	f2	i	id
+bar	["xx", "yy"]	1	xx
+bar	["xx", "yy"]	2	yy
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+PATH '$')) AS ids
+WHERE json_overlaps(f2, '["xx", "zz"]') OR json_overlaps(f2, '["zz"]') OR
+f1 = 'bar';
+f1	f2	i	id
+bar	["xx", "yy"]	1	xx
+bar	["xx", "yy"]	2	yy
+DROP VIEW v1;
+DROP TABLE t1;
 # restart:
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/json/r/json_no_table.result mysql-8.0-8.0.27/mysql-test/suite/json/r/json_no_table.result
--- mysql-8.0-8.0.26/mysql-test/suite/json/r/json_no_table.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/json/r/json_no_table.result	2021-09-28 11:46:34.000000000 +0000
@@ -4288,3 +4288,9 @@
 interval(!json_arrayagg('')) second_microsecond,
 'axis-order=long-lat')), connection_id());
 ERROR 22023: Invalid GIS data provided to function st_astext.
+#
+# Bug#32942328: ITEM_FUNC_COALESCE::VAL_JSON:
+#               ASSERTION `!CURRENT_THD->IS_ERROR() && HAS_VALUE'
+#
+DO 1 IN (JSON_PRETTY(''), ANY_VALUE(JSON_ARRAYAGG('')));
+ERROR 22032: Invalid JSON text in argument 1 to function json_pretty: "The document is empty." at position 0.
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/json/r/json_table.result mysql-8.0-8.0.27/mysql-test/suite/json/r/json_table.result
--- mysql-8.0-8.0.26/mysql-test/suite/json/r/json_table.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/json/r/json_table.result	2021-09-28 11:46:34.000000000 +0000
@@ -2171,3 +2171,10 @@
 ) e;
 HEX(a)
 0000000000
+#
+# Bug#32591074: JSON_TABLE'S CHECK FOR DUPLICATE COLUMN NAMES IS
+#               CASE-SENSITIVE
+#
+SELECT * FROM
+JSON_TABLE('{}', '$' COLUMNS (o FOR ORDINALITY, O FOR ORDINALITY)) jt;
+ERROR 42S21: Duplicate column name 'o'
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/json/t/array_index.test mysql-8.0-8.0.27/mysql-test/suite/json/t/array_index.test
--- mysql-8.0-8.0.26/mysql-test/suite/json/t/array_index.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/json/t/array_index.test	2021-09-28 11:46:34.000000000 +0000
@@ -1137,6 +1137,7 @@
 CREATE TABLE t1 (pk INT primary key, col_jsonn JSON, INDEX
 mv_idx((CAST(col_jsonn->'$[0][*]' AS BINARY(10) ARRAY))));
 CREATE TABLE t2 (pk INT primary key, col_jsonn JSON);
+--skip_if_hypergraph  # Does not evaluate the condition during optimization.
 --error ER_INVALID_JSON_TEXT_IN_PARAM
 SELECT JSON_OVERLAPS( '0' , t1. col_jsonn-> '$[0][*]' ) FROM t1 LEFT JOIN t2
 ON t1.pk = JSON_OVERLAPS( 'OJNRaUr' , JSON_ARRAY( 'Q' , 'qX' ) ) WHERE t2 .
@@ -1375,6 +1376,497 @@
 
 DROP TABLE t;
 
+--echo # Bug#33275457: Fix multi-valued index
+
+CREATE TABLE t1 (
+  f1 VARCHAR(50) NOT NULL PRIMARY KEY,
+  f2 JSON NOT NULL,
+  INDEX idx2 ( (CAST(f2 AS CHAR(50) ARRAY)) )
+);
+
+CREATE VIEW v1 AS
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+                    PATH '$')) AS ids;
+
+INSERT INTO t1 VALUES ('foo', '["aa", "bb"]'), ('bar', '["xx", "yy"]');
+
+ANALYZE TABLE t1;
+
+EXPLAIN SELECT * FROM t1 WHERE 'xx' MEMBER OF (f2);
+EXPLAIN SELECT * FROM t1 WHERE json_contains(f2, '"xx"');
+EXPLAIN SELECT * FROM t1 WHERE json_overlaps(f2, '["xx", "zz"]');
+
+EXPLAIN SELECT * FROM v1 WHERE 'xx' MEMBER OF (f2);
+EXPLAIN SELECT * FROM v1 WHERE json_contains(f2, '"xx"');
+EXPLAIN SELECT * FROM v1 WHERE json_overlaps(f2, '["xx", "zz"]');
+
+EXPLAIN
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+                    PATH '$')) AS ids
+WHERE 'xx' MEMBER OF (f2);
+
+EXPLAIN
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+                    PATH '$')) AS ids
+WHERE json_contains(f2, '"xx"');
+
+EXPLAIN
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+                    PATH '$')) AS ids
+WHERE json_overlaps(f2, '["xx", "zz"]');
+
+SELECT * FROM t1 WHERE 'xx' MEMBER OF (f2);
+SELECT * FROM t1 WHERE json_contains(f2, '"xx"');
+SELECT * FROM t1 WHERE json_overlaps(f2, '["xx", "zz"]');
+
+SELECT * FROM v1 WHERE 'xx' MEMBER OF (f2);
+SELECT * FROM v1 WHERE json_contains(f2, '"xx"');
+SELECT * FROM v1 WHERE json_overlaps(f2, '["xx", "zz"]');
+
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+                    PATH '$')) AS ids
+WHERE 'xx' MEMBER OF (f2);
+
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+                    PATH '$')) AS ids
+WHERE json_contains(f2, '"xx"');
+
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+                    PATH '$')) AS ids
+WHERE json_overlaps(f2, '["xx", "zz"]');
+
+PREPARE stmt FROM 'EXPLAIN SELECT * FROM t1 WHERE ? MEMBER OF (f2)';
+SET @a='xx';
+EXECUTE stmt USING @a;
+
+PREPARE stmt FROM 'EXPLAIN SELECT * FROM t1 WHERE json_contains(f2, ?)';
+SET @a='"xx"';
+EXECUTE stmt USING @a;
+
+PREPARE stmt FROM 'EXPLAIN SELECT * FROM t1 WHERE json_overlaps(f2, ?)';
+SET @a='["xx", "cc"]';
+EXECUTE stmt USING @a;
+
+PREPARE stmt FROM 'EXPLAIN SELECT * FROM v1 WHERE ? MEMBER OF (f2)';
+SET @a='xx';
+EXECUTE stmt USING @a;
+
+PREPARE stmt FROM 'EXPLAIN SELECT * FROM v1 WHERE json_contains(f2, ?)';
+SET @a='"xx"';
+EXECUTE stmt USING @a;
+
+PREPARE stmt FROM 'EXPLAIN SELECT * FROM v1 WHERE json_overlaps(f2, ?)';
+SET @a='["xx", "cc"]';
+EXECUTE stmt USING @a;
+
+PREPARE stmt FROM '
+EXPLAIN
+SELECT *
+FROM t1, JSON_TABLE(f2, \'$[*]\'
+                    COLUMNS(i FOR ORDINALITY, id VARCHAR(50) PATH \'$\')) AS ids
+WHERE ? MEMBER OF (f2)';
+SET @a='xx';
+EXECUTE stmt USING @a;
+
+PREPARE stmt FROM '
+EXPLAIN
+SELECT *
+FROM t1, JSON_TABLE(f2, \'$[*]\'
+                    COLUMNS(i FOR ORDINALITY, id VARCHAR(50) PATH \'$\')) AS ids
+WHERE json_contains(f2, ?)';
+SET @a='"xx"';
+EXECUTE stmt USING @a;
+
+PREPARE stmt FROM '
+EXPLAIN
+SELECT *
+FROM t1, JSON_TABLE(f2, \'$[*]\'
+                    COLUMNS(i FOR ORDINALITY, id VARCHAR(50) PATH \'$\')) AS ids
+WHERE json_overlaps(f2, ?)';
+SET @a='["xx", "cc"]';
+EXECUTE stmt USING @a;
+
+PREPARE stmt FROM 'SELECT * FROM t1 WHERE ? MEMBER OF (f2)';
+SET @a='xx';
+EXECUTE stmt USING @a;
+
+PREPARE stmt FROM 'SELECT * FROM t1 WHERE json_contains(f2, ?)';
+SET @a='"xx"';
+EXECUTE stmt USING @a;
+
+PREPARE stmt FROM 'SELECT * FROM t1 WHERE json_overlaps(f2, ?)';
+SET @a='["xx", "cc"]';
+EXECUTE stmt USING @a;
+
+PREPARE stmt FROM 'SELECT * FROM v1 WHERE ? MEMBER OF (f2)';
+SET @a='xx';
+EXECUTE stmt USING @a;
+
+PREPARE stmt FROM 'SELECT * FROM v1 WHERE json_contains(f2, ?)';
+SET @a='"xx"';
+EXECUTE stmt USING @a;
+
+PREPARE stmt FROM 'SELECT * FROM v1 WHERE json_overlaps(f2, ?)';
+SET @a='["xx", "cc"]';
+EXECUTE stmt USING @a;
+
+PREPARE stmt FROM '
+SELECT *
+FROM t1, JSON_TABLE(f2, \'$[*]\'
+                    COLUMNS(i FOR ORDINALITY, id VARCHAR(50) PATH \'$\')) AS ids
+WHERE ? MEMBER OF (f2)';
+SET @a='xx';
+EXECUTE stmt USING @a;
+
+PREPARE stmt FROM '
+SELECT *
+FROM t1, JSON_TABLE(f2, \'$[*]\'
+                    COLUMNS(i FOR ORDINALITY, id VARCHAR(50) PATH \'$\')) AS ids
+WHERE json_contains(f2, ?)';
+SET @a='"xx"';
+EXECUTE stmt USING @a;
+
+PREPARE stmt FROM '
+SELECT *
+FROM t1, JSON_TABLE(f2, \'$[*]\'
+                    COLUMNS(i FOR ORDINALITY, id VARCHAR(50) PATH \'$\')) AS ids
+WHERE json_overlaps(f2, ?)';
+SET @a='["xx", "cc"]';
+EXECUTE stmt USING @a;
+
+EXPLAIN SELECT * FROM t1 WHERE 'xx' MEMBER OF (f2) AND 'yy' MEMBER OF (f2);
+
+EXPLAIN
+SELECT * FROM t1 WHERE json_contains(f2, '"xx"') AND json_contains(f2, '"yy"');
+
+EXPLAIN
+SELECT *
+FROM t1
+WHERE json_overlaps(f2, '["xx", "zz"]') AND json_overlaps(f2, '["yy", "zz"]');
+
+EXPLAIN SELECT * FROM v1 WHERE 'xx' MEMBER OF (f2) AND 'yy' MEMBER OF (f2);
+
+EXPLAIN
+SELECT * FROM v1 WHERE json_contains(f2, '"xx"') AND json_contains(f2, '"yy"');
+
+EXPLAIN
+SELECT *
+FROM v1
+WHERE json_overlaps(f2, '["xx", "zz"]') AND json_overlaps(f2, '["yy", "zz"]');
+
+EXPLAIN
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+                    PATH '$')) AS ids
+WHERE 'xx' MEMBER OF (f2) AND 'yy' MEMBER OF (f2);
+
+EXPLAIN
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+                    PATH '$')) AS ids
+WHERE json_contains(f2, '"xx"') AND json_contains(f2, '"yy"');
+
+EXPLAIN
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+                    PATH '$')) AS ids
+WHERE json_overlaps(f2, '["xx", "zz"]') AND json_overlaps(f2, '["yy", "zz"]');
+
+EXPLAIN
+SELECT *
+FROM t1
+WHERE 'xx' MEMBER OF (f2) AND 'yy' MEMBER OF(f2) AND f1 = 'bar';
+
+EXPLAIN
+SELECT *
+FROM t1
+WHERE json_contains(f2, '"xx"') AND json_contains(f2, '"yy"') AND f1 = 'bar';
+
+EXPLAIN
+SELECT *
+FROM t1
+WHERE json_overlaps(f2, '["xx", "zz"]') AND
+      json_overlaps(f2, '["yy", "zz"]') AND
+      f1 = 'bar';
+
+EXPLAIN
+SELECT *
+FROM v1
+WHERE 'xx' MEMBER OF (f2) AND 'yy' MEMBER OF(f2) AND f1 = 'bar';
+
+EXPLAIN
+SELECT *
+FROM v1
+WHERE json_contains(f2, '"xx"') AND json_contains(f2, '"yy"') AND f1 = 'bar';
+
+EXPLAIN
+SELECT *
+FROM v1
+WHERE json_overlaps(f2, '["xx", "zz"]') AND
+      json_overlaps(f2, '["yy", "zz"]') AND
+      f1 = 'bar';
+
+EXPLAIN
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+                    PATH '$')) AS ids
+WHERE 'xx' MEMBER OF (f2) AND 'yy' MEMBER OF (f2) AND f1 = 'bar';
+
+EXPLAIN
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+                    PATH '$')) AS ids
+WHERE json_contains(f2, '"xx"') AND json_contains(f2, '"yy"') AND f1 = 'bar';
+
+EXPLAIN
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+                    PATH '$')) AS ids
+WHERE json_overlaps(f2, '["xx", "zz"]') AND
+      json_overlaps(f2, '["yy", "zz"]') AND
+      f1 = 'bar';
+
+SELECT * FROM t1 WHERE 'xx' MEMBER OF (f2) AND 'yy' MEMBER OF (f2);
+
+SELECT * FROM t1 WHERE json_contains(f2, '"xx"') AND json_contains(f2, '"yy"');
+
+SELECT *
+FROM t1
+WHERE json_overlaps(f2, '["xx", "zz"]') AND json_overlaps(f2, '["yy", "zz"]');
+
+SELECT * FROM v1 WHERE 'xx' MEMBER OF (f2) AND 'yy' MEMBER OF (f2);
+
+SELECT * FROM v1 WHERE json_contains(f2, '"xx"') AND json_contains(f2, '"yy"');
+
+SELECT *
+FROM v1
+WHERE json_overlaps(f2, '["xx", "zz"]') AND json_overlaps(f2, '["yy", "zz"]');
+
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+                    PATH '$')) AS ids
+WHERE 'xx' MEMBER OF (f2) AND 'yy' MEMBER OF (f2);
+
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+                    PATH '$')) AS ids
+WHERE json_contains(f2, '"xx"') AND json_contains(f2, '"yy"');
+
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+                    PATH '$')) AS ids
+WHERE json_overlaps(f2, '["xx", "zz"]') AND json_overlaps(f2, '["yy", "zz"]');
+
+SELECT *
+FROM t1
+WHERE 'xx' MEMBER OF (f2) AND 'yy' MEMBER OF (f2) AND f1 = 'bar';
+
+SELECT *
+FROM t1
+WHERE json_contains(f2, '"xx"') AND json_contains(f2, '"yy"') AND f1 = 'bar';
+
+SELECT *
+FROM t1
+WHERE json_overlaps(f2, '["xx", "zz"]') AND
+      json_overlaps(f2, '["yy", "zz"]') AND
+      f1 = 'bar';
+
+SELECT *
+FROM v1
+WHERE 'xx' MEMBER OF (f2) AND 'yy' MEMBER OF (f2) AND f1 = 'bar';
+
+SELECT *
+FROM v1
+WHERE json_contains(f2, '"xx"') AND json_contains(f2, '"yy"') AND f1 = 'bar';
+
+SELECT *
+FROM v1
+WHERE json_overlaps(f2, '["xx", "zz"]') AND
+      json_overlaps(f2, '["yy", "zz"]') AND
+      f1 = 'bar';
+
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+                    PATH '$')) AS ids
+WHERE 'xx' MEMBER OF (f2) AND 'yy' MEMBER OF(f2) AND f1 = 'bar';
+
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+                    PATH '$')) AS ids
+WHERE json_contains(f2, '"xx"') AND json_contains(f2, '"yy"') AND f1 = 'bar';
+
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+                    PATH '$')) AS ids
+WHERE json_overlaps(f2, '["xx", "zz"]') AND
+      json_overlaps(f2, '["yy", "zz"]') AND
+      f1 = 'bar';
+
+EXPLAIN SELECT * FROM t1 WHERE 'xx' MEMBER OF (f2) OR 'zz' MEMBER OF (f2);
+EXPLAIN SELECT * FROM t1 WHERE json_contains(f2, '"xx"') OR json_contains(f2, '"zz"');
+EXPLAIN SELECT * FROM t1 WHERE json_overlaps(f2, '["xx", "zz"]') OR json_overlaps(f2, '["zz"]');
+EXPLAIN SELECT * FROM v1 WHERE 'xx' MEMBER OF (f2) OR 'zz' MEMBER OF (f2);
+EXPLAIN SELECT * FROM v1 WHERE json_contains(f2, '"xx"') OR json_contains(f2, '"zz"');
+
+EXPLAIN
+SELECT *
+FROM v1
+WHERE json_overlaps(f2, '["xx", "zz"]') OR json_overlaps(f2, '["zz"]');
+
+EXPLAIN
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+                    PATH '$')) AS ids
+WHERE 'xx' MEMBER OF (f2) OR 'zz' MEMBER OF (f2);
+
+EXPLAIN
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+                    PATH '$')) AS ids
+WHERE json_contains(f2, '"xx"') OR json_contains(f2, '"zz"');
+
+EXPLAIN
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+PATH '$')) AS ids
+WHERE json_overlaps(f2, '["xx", "zz"]') OR json_overlaps(f2, '["zz"]');
+
+# need more rows, or cost based optimizer chooses full table scan
+INSERT INTO t1 VALUES
+ ('k1', '["v1"]'), ('k2', '["v2"]'), ('k3', '["v3"]'),
+ ('k4', '["v4"]'), ('k5', '["v5"]'), ('k6', '["v6"]'),
+ ('k7', '["v7"]'), ('k8', '["v8"]'), ('k9', '["v9"]');
+
+ANALYZE TABLE t1;
+
+EXPLAIN
+SELECT *
+FROM t1
+WHERE 'xx' MEMBER OF (f2) OR 'zz' MEMBER OF (f2) OR f1 = 'bar';
+
+EXPLAIN
+SELECT *
+FROM t1
+WHERE json_contains(f2, '"xx"') OR json_contains(f2, '"zz"') OR f1 = 'bar';
+
+EXPLAIN
+SELECT *
+FROM t1
+WHERE json_overlaps(f2, '["xx", "zz"]') OR json_overlaps(f2, '["zz"]') OR
+      f1 = 'bar';
+
+EXPLAIN
+SELECT *
+FROM v1
+WHERE 'xx' MEMBER OF (f2) OR 'zz' MEMBER OF(f2) OR f1 = 'bar';
+
+EXPLAIN
+SELECT *
+FROM v1
+WHERE json_contains(f2, '"xx"') OR json_contains(f2, '"zz"') OR f1 = 'bar';
+
+EXPLAIN
+SELECT *
+FROM v1
+WHERE json_overlaps(f2, '["xx", "zz"]') OR json_overlaps(f2, '["zz"]') OR
+      f1 = 'bar';
+
+EXPLAIN
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+                    PATH '$')) AS ids
+WHERE 'xx' MEMBER OF (f2) OR 'zz' MEMBER OF (f2) OR f1 = 'bar';
+
+EXPLAIN
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+                    PATH '$')) AS ids
+WHERE json_contains(f2, '"xx"') OR json_contains(f2, '"zz"') OR f1 = 'bar';
+
+EXPLAIN
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+ PATH '$')) AS ids
+WHERE json_overlaps(f2, '["xx", "zz"]') OR json_overlaps(f2, '["zz"]') OR
+      f1 = 'bar';
+
+SELECT * FROM t1 WHERE 'xx' MEMBER OF (f2) OR 'zz' MEMBER OF (f2);
+SELECT * FROM t1 WHERE json_contains(f2, '"xx"') OR json_contains(f2, '"zz"');
+
+SELECT *
+FROM t1
+WHERE json_overlaps(f2, '["xx", "zz"]') OR json_overlaps(f2, '["zz"]');
+
+SELECT * FROM v1 WHERE 'xx' MEMBER OF (f2) OR 'zz' MEMBER OF(f2);
+SELECT * FROM v1 WHERE json_contains(f2, '"xx"') OR json_contains(f2, '"zz"');
+
+SELECT *
+FROM v1
+WHERE json_overlaps(f2, '["xx", "zz"]') OR json_overlaps(f2, '["zz"]');
+
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+                    PATH '$')) AS ids
+WHERE 'xx' MEMBER OF (f2) OR 'zz' MEMBER OF (f2);
+
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+ PATH '$')) AS ids
+WHERE json_contains(f2, '"xx"') OR json_contains(f2, '"zz"');
+
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+                    PATH '$')) AS ids
+WHERE json_overlaps(f2, '["xx", "zz"]') OR json_overlaps(f2, '["zz"]');
+
+SELECT * FROM t1 WHERE 'xx' MEMBER OF (f2) OR 'zz' MEMBER OF (f2) OR f1 = 'bar';
+
+SELECT *
+FROM t1
+WHERE json_contains(f2, '"xx"') OR json_contains(f2, '"zz"') OR f1 = 'bar';
+
+SELECT *
+FROM t1
+WHERE json_overlaps(f2, '["xx", "zz"]') OR json_overlaps(f2, '["zz"]') OR
+      f1 = 'bar';
+
+SELECT * FROM v1 WHERE 'xx' MEMBER OF (f2) OR 'zz' MEMBER OF (f2) OR f1 = 'bar';
+
+SELECT *
+FROM v1
+WHERE json_contains(f2, '"xx"') OR json_contains(f2, '"zz"') OR f1 = 'bar';
+
+SELECT *
+FROM v1
+WHERE json_overlaps(f2, '["xx", "zz"]') OR json_overlaps(f2, '["zz"]') OR
+      f1 = 'bar';
+
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+                    PATH '$')) AS ids
+WHERE 'xx' MEMBER OF (f2) OR 'zz' MEMBER OF (f2) OR f1 = 'bar';
+
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+                    PATH '$')) AS ids
+WHERE json_contains(f2, '"xx"') OR json_contains(f2, '"zz"') OR f1 = 'bar';
+
+SELECT *
+FROM t1, JSON_TABLE(f2, '$[*]' COLUMNS(i FOR ORDINALITY, id VARCHAR(50)
+                    PATH '$')) AS ids
+WHERE json_overlaps(f2, '["xx", "zz"]') OR json_overlaps(f2, '["zz"]') OR
+      f1 = 'bar';
+
+DROP VIEW v1;
+DROP TABLE t1;
+
 # If the unique record filter is not properly closed by any of queries above,
 # then the TempTable plugin will have ref_count > 0 on restart. This should be
 # at the very end of the test.
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/json/t/json_no_table.test mysql-8.0-8.0.27/mysql-test/suite/json/t/json_no_table.test
--- mysql-8.0-8.0.26/mysql-test/suite/json/t/json_no_table.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/json/t/json_no_table.test	2021-09-28 11:46:34.000000000 +0000
@@ -2972,3 +2972,10 @@
          st_aswkt('2031-05-29 01:40:44.878673' +
 	          interval(!json_arrayagg('')) second_microsecond,
 		  'axis-order=long-lat')), connection_id());
+
+--echo #
+--echo # Bug#32942328: ITEM_FUNC_COALESCE::VAL_JSON:
+--echo #               ASSERTION `!CURRENT_THD->IS_ERROR() && HAS_VALUE'
+--echo #
+--error ER_INVALID_JSON_TEXT_IN_PARAM
+DO 1 IN (JSON_PRETTY(''), ANY_VALUE(JSON_ARRAYAGG('')));
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/json/t/json_table.test mysql-8.0-8.0.27/mysql-test/suite/json/t/json_table.test
--- mysql-8.0-8.0.26/mysql-test/suite/json/t/json_table.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/json/t/json_table.test	2021-09-28 11:46:34.000000000 +0000
@@ -1505,3 +1505,12 @@
   '$'
   COLUMNS(a BINARY(5) PATH '$[1]' NULL ON EMPTY)
 ) e;
+
+--echo #
+--echo # Bug#32591074: JSON_TABLE'S CHECK FOR DUPLICATE COLUMN NAMES IS
+--echo #               CASE-SENSITIVE
+--echo #
+
+--error ER_DUP_FIELDNAME
+SELECT * FROM
+  JSON_TABLE('{}', '$' COLUMNS (o FOR ORDINALITY, O FOR ORDINALITY)) jt;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/large_tests/r/rpl_replica_net_timeout.result mysql-8.0-8.0.27/mysql-test/suite/large_tests/r/rpl_replica_net_timeout.result
--- mysql-8.0-8.0.26/mysql-test/suite/large_tests/r/rpl_replica_net_timeout.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/large_tests/r/rpl_replica_net_timeout.result	2021-09-28 11:46:34.000000000 +0000
@@ -19,5 +19,6 @@
 include/assert.inc [time between last reconnection and the reconnection before that should be >= replica_net_timeout]
 set @@global.general_log = @save_general_log;
 set @@global.log_output = @save_log_output;
+TRUNCATE TABLE mysql.general_log;
 set @@global.replica_net_timeout = @save_replica_net_timeout;
 include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/large_tests/t/rpl_replica_net_timeout.test mysql-8.0-8.0.27/mysql-test/suite/large_tests/t/rpl_replica_net_timeout.test
--- mysql-8.0-8.0.26/mysql-test/suite/large_tests/t/rpl_replica_net_timeout.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/large_tests/t/rpl_replica_net_timeout.test	2021-09-28 11:46:34.000000000 +0000
@@ -84,6 +84,7 @@
 connection master;
 set @@global.general_log = @save_general_log;
 set @@global.log_output = @save_log_output;
+TRUNCATE TABLE mysql.general_log;
 connection slave;
 set @@global.replica_net_timeout = @save_replica_net_timeout;
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/lock_order/r/cycle.result mysql-8.0-8.0.27/mysql-test/suite/lock_order/r/cycle.result
--- mysql-8.0-8.0.26/mysql-test/suite/lock_order/r/cycle.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/lock_order/r/cycle.result	2021-09-28 11:46:34.000000000 +0000
@@ -5,6 +5,9 @@
 INSTALL PLUGIN validate_password SONAME 'validate_password.xxx';;
 Warnings:
 Warning	1287	'validate password plugin' is deprecated and will be removed in a future release. Please use validate_password component instead
+INSTALL PLUGIN connection_control SONAME 'connection_control.xxx';;
+call mtr.add_suppression("Plugin Rewriter reported:");
+INSTALL PLUGIN rewriter SONAME 'rewriter.xxx';;
 INSTALL COMPONENT "file://component_pfs_example";
 INSTALL COMPONENT "file://component_validate_password";
 select "In SSL session";
@@ -16,6 +19,10 @@
 mysqladmin: [Warning] Using a password on the command line interface can be insecure.
 UNINSTALL COMPONENT "file://component_pfs_example";
 UNINSTALL COMPONENT "file://component_validate_password";
+UNINSTALL PLUGIN rewriter;
+Warnings:
+Warning	1620	Plugin is busy and will be uninstalled on shutdown
+UNINSTALL PLUGIN connection_control;
 UNINSTALL PLUGIN validate_password;
 Warnings:
 Warning	1287	'validate password plugin' is deprecated and will be removed in a future release. Please use validate_password component instead
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/lock_order/t/cycle-master.opt mysql-8.0-8.0.27/mysql-test/suite/lock_order/t/cycle-master.opt
--- mysql-8.0-8.0.26/mysql-test/suite/lock_order/t/cycle-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/lock_order/t/cycle-master.opt	2021-09-28 11:46:34.000000000 +0000
@@ -2,6 +2,8 @@
 --early-plugin-load=$KEYRING_PLUGIN
 --loose-keyring_file_data=keyring/lock-order
 --federated
+$CONNECTION_CONTROL_PLUGIN_OPT
+$REWRITER_OPT
 $PFS_EXAMPLE_OPT
 $PFS_EXAMPLE_PLUGIN_EMPLOYEE_OPT
 $SEMISYNC_SOURCE_PLUGIN_OPT
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/lock_order/t/cycle.test mysql-8.0-8.0.27/mysql-test/suite/lock_order/t/cycle.test
--- mysql-8.0-8.0.26/mysql-test/suite/lock_order/t/cycle.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/lock_order/t/cycle.test	2021-09-28 11:46:34.000000000 +0000
@@ -26,6 +26,14 @@
 --replace_regex /\.so|\.dll/.xxx/
 --eval INSTALL PLUGIN validate_password SONAME '$VALIDATE_PASSWORD';
 
+--replace_regex /\.so|\.dll/.xxx/
+--eval INSTALL PLUGIN connection_control SONAME '$CONNECTION_CONTROL_PLUGIN';
+
+call mtr.add_suppression("Plugin Rewriter reported:");
+
+--replace_regex /\.so|\.dll/.xxx/
+--eval INSTALL PLUGIN rewriter SONAME '$REWRITER';
+
 INSTALL COMPONENT "file://component_pfs_example";
 
 INSTALL COMPONENT "file://component_validate_password";
@@ -50,6 +58,10 @@
 
 UNINSTALL COMPONENT "file://component_validate_password";
 
+UNINSTALL PLUGIN rewriter;
+
+UNINSTALL PLUGIN connection_control;
+
 UNINSTALL PLUGIN validate_password;
 
 UNINSTALL PLUGIN version_tokens;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/memcached/r/memc270_rpl_1.result mysql-8.0-8.0.27/mysql-test/suite/memcached/r/memc270_rpl_1.result
--- mysql-8.0-8.0.26/mysql-test/suite/memcached/r/memc270_rpl_1.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/memcached/r/memc270_rpl_1.result	2021-09-28 11:46:34.000000000 +0000
@@ -185,41 +185,3 @@
 SET @@global.transaction_isolation= @transaction_isolation;
 connection slave;
 include/rpl_end.inc
-connection server_2;
-connection server_2;
-connection server_2;
-connection server_2;
-connection server_1;
-connection server_1;
-connection server_1;
-connection server_1;
-connection server_2;
-connection server_2;
-connection server_1;
-connection server_2;
-connection server_2;
-connection server_2;
-connection server_2;
-connection server_2;
-connection server_1;
-connection server_1;
-connection server_1;
-connection server_1;
-connection server_1;
-connection server_2;
-connection server_2;
-connection server_1;
-connection server_1;
-connection server_1;
-connection server_1;
-connection default;
-connection server_2;
-connection server_2;
-connection default;
-disconnect server_2;
-disconnect server_2_1;
-connection server_1;
-connection server_1;
-connection default;
-disconnect server_1;
-disconnect server_1_1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/memcached/r/memc271_rpl_2.result mysql-8.0-8.0.27/mysql-test/suite/memcached/r/memc271_rpl_2.result
--- mysql-8.0-8.0.26/mysql-test/suite/memcached/r/memc271_rpl_2.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/memcached/r/memc271_rpl_2.result	2021-09-28 11:46:34.000000000 +0000
@@ -209,44 +209,6 @@
 DROP TABLE t1;
 connection slave;
 include/rpl_end.inc
-connection server_2;
-connection server_2;
-connection server_2;
-connection server_2;
-connection server_1;
-connection server_1;
-connection server_1;
-connection server_1;
-connection server_2;
-connection server_2;
-connection server_1;
-connection server_2;
-connection server_2;
-connection server_2;
-connection server_2;
-connection server_2;
-connection server_1;
-connection server_1;
-connection server_1;
-connection server_1;
-connection server_1;
-connection server_2;
-connection server_2;
-connection server_1;
-connection server_1;
-connection server_1;
-connection server_1;
-connection default;
-connection server_2;
-connection server_2;
-connection default;
-disconnect server_2;
-disconnect server_2_1;
-connection server_1;
-connection server_1;
-connection default;
-disconnect server_1;
-disconnect server_1_1;
 connection default;
 UNINSTALL PLUGIN daemon_memcached;
 DROP DATABASE innodb_memcache;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/memcached/t/memc270_rpl_1.test mysql-8.0-8.0.27/mysql-test/suite/memcached/t/memc270_rpl_1.test
--- mysql-8.0-8.0.26/mysql-test/suite/memcached/t/memc270_rpl_1.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/memcached/t/memc270_rpl_1.test	2021-09-28 11:46:34.000000000 +0000
@@ -244,5 +244,6 @@
 
 SET @@global.transaction_isolation= @transaction_isolation;
 sync_slave_with_master;
+--disable_connect_log
 source include/rpl_end.inc;
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/memcached/t/memc271_rpl_2.test mysql-8.0-8.0.27/mysql-test/suite/memcached/t/memc271_rpl_2.test
--- mysql-8.0-8.0.26/mysql-test/suite/memcached/t/memc271_rpl_2.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/memcached/t/memc271_rpl_2.test	2021-09-28 11:46:34.000000000 +0000
@@ -242,11 +242,12 @@
 connection master;
 DROP TABLE t1;
 sync_slave_with_master;
+--disable_connect_log
 source include/rpl_end.inc;
 
 connection default;
+--echo connection default;
 
 UNINSTALL PLUGIN daemon_memcached;
 DROP DATABASE innodb_memcache;
 SET @@global.transaction_isolation= @transaction_isolation;
-
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/encrypted_backup.cnf mysql-8.0-8.0.27/mysql-test/suite/ndb/encrypted_backup.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/encrypted_backup.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/encrypted_backup.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,10 @@
+[ndb_restore]
+decrypt
+backup-password=TOPSECRET
+
+[ndb_mgm]
+encrypt-backup
+backup-password=TOPSECRET
+
+[ndb_print_backup_file]
+backup-password=TOPSECRET
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/ndb_config_mycnf1.cnf mysql-8.0-8.0.27/mysql-test/suite/ndb/ndb_config_mycnf1.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/ndb_config_mycnf1.cnf	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/ndb_config_mycnf1.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -76,3 +76,23 @@
 ndbd = localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost, localhost
 ndb_mgmd = localhost
 mysqld =
+
+[cluster_config.bug32339789]
+ndbd = localhost,localhost,localhost,localhost
+ndb_mgmd = localhost,localhost
+mysqld = ,,,,
+[cluster_config.mysqld.1.bug32339789]
+NodeId=11
+[cluster_config.ndb_mgmd.1.bug32339789]
+NodeId=1
+PortNumber = 6000
+[cluster_config.ndbd.1.bug32339789]
+NodeId=3
+
+[cluster_config.bug32871875]
+NoOfReplicas = 1
+AutomaticThreadConfig = true
+CompressedLCP = false
+ndbd = localhost
+ndb_mgmd = localhost
+mysqld =
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_alter_table_copy_check.result mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_alter_table_copy_check.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_alter_table_copy_check.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_alter_table_copy_check.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,543 @@
+Create an extra connection to server1
+Show that copying alter has some ability to detect when concurrent
+changes are occuring to a source table as part of an alter.
+This causes the alter to fail, avoiding silent data loss/corruption.
+Concurrent modifications are made on a separate MySQLD to avoid
+MDL effects.
+Also show that harmless read-only references to the base table 
+succeed and do not cause the ALTER to fail
+use test;
+create table cambridge (a int primary key, b int, c int, d int) engine=ndb;
+insert into cambridge values (1,1,1,1), (2,2,2,2), (3,3,3,3), (4,4,4,4), (5,5,5,5);
+create table oxford(a int primary key, b int, c text, d int) engine=ndb;
+insert into oxford values 
+(1,1,repeat('B', 1000), 1),
+(2,2,repeat('B', 1000), 2),
+(3,3,repeat('B', 1000), 3),
+(4,4,repeat('B', 1000), 4),
+(5,5,repeat('B', 1000), 5);
+-------------------------------------------------------
+Test various concurrent modifications that should cause
+copy failure for a copying alter drop column.
+-------------------------------------------------------
+Checking copying alter ALTER TABLE test.cambridge drop column d
+concurrent with UPDATE test.cambridge set c=c+1 
+has alter error ER_TABLE_DEF_CHANGED
+and statement error 0
+set DEBUG_SYNC= 'ndb.before_commit_count_check SIGNAL alter_waiting WAIT_FOR alter_go';
+ALTER TABLE test.cambridge drop column d;
+set DEBUG_SYNC= 'now WAIT_FOR alter_waiting';
+UPDATE test.cambridge set c=c+1;
+set DEBUG_SYNC= 'now SIGNAL alter_go';
+ERROR HY000: Detected change to data in source table during copying ALTER TABLE. Alter aborted to avoid inconsistency.
+set DEBUG_SYNC='RESET';
+Checking copying alter ALTER TABLE test.cambridge drop column d
+concurrent with UPDATE test.cambridge set c=20 where a=2 
+has alter error ER_TABLE_DEF_CHANGED
+and statement error 0
+set DEBUG_SYNC= 'ndb.before_commit_count_check SIGNAL alter_waiting WAIT_FOR alter_go';
+ALTER TABLE test.cambridge drop column d;
+set DEBUG_SYNC= 'now WAIT_FOR alter_waiting';
+UPDATE test.cambridge set c=20 where a=2;
+set DEBUG_SYNC= 'now SIGNAL alter_go';
+ERROR HY000: Detected change to data in source table during copying ALTER TABLE. Alter aborted to avoid inconsistency.
+set DEBUG_SYNC='RESET';
+Checking copying alter ALTER TABLE test.cambridge drop column d
+concurrent with INSERT into test.cambridge values (6,6,6,6) 
+has alter error ER_TABLE_DEF_CHANGED
+and statement error 0
+set DEBUG_SYNC= 'ndb.before_commit_count_check SIGNAL alter_waiting WAIT_FOR alter_go';
+ALTER TABLE test.cambridge drop column d;
+set DEBUG_SYNC= 'now WAIT_FOR alter_waiting';
+INSERT into test.cambridge values (6,6,6,6);
+set DEBUG_SYNC= 'now SIGNAL alter_go';
+ERROR HY000: Detected change to data in source table during copying ALTER TABLE. Alter aborted to avoid inconsistency.
+set DEBUG_SYNC='RESET';
+Checking copying alter ALTER TABLE test.cambridge drop column d
+concurrent with DELETE from test.cambridge where a=1 
+has alter error ER_TABLE_DEF_CHANGED
+and statement error 0
+set DEBUG_SYNC= 'ndb.before_commit_count_check SIGNAL alter_waiting WAIT_FOR alter_go';
+ALTER TABLE test.cambridge drop column d;
+set DEBUG_SYNC= 'now WAIT_FOR alter_waiting';
+DELETE from test.cambridge where a=1;
+set DEBUG_SYNC= 'now SIGNAL alter_go';
+ERROR HY000: Detected change to data in source table during copying ALTER TABLE. Alter aborted to avoid inconsistency.
+set DEBUG_SYNC='RESET';
+-------------------------------------------------------
+Test various concurrent modifications that should cause
+copy failure for a copying pk change
+-------------------------------------------------------
+Checking copying alter ALTER TABLE test.cambridge drop primary key
+concurrent with UPDATE test.cambridge set c=c+1 
+has alter error ER_TABLE_DEF_CHANGED
+and statement error 0
+set DEBUG_SYNC= 'ndb.before_commit_count_check SIGNAL alter_waiting WAIT_FOR alter_go';
+ALTER TABLE test.cambridge drop primary key;
+set DEBUG_SYNC= 'now WAIT_FOR alter_waiting';
+UPDATE test.cambridge set c=c+1;
+set DEBUG_SYNC= 'now SIGNAL alter_go';
+ERROR HY000: Detected change to data in source table during copying ALTER TABLE. Alter aborted to avoid inconsistency.
+set DEBUG_SYNC='RESET';
+--------------------------
+FK cascading modifications
+--------------------------
+Ndb maintains inter-table FKs in the kernel, so that
+changes in a different table can affect a table
+undergoing a copying alter
+update cambridge set b=a;
+alter table cambridge add unique(b);
+create table bristol
+(a int primary key, b int, c int, 
+foreign key (b) references cambridge (b) on update cascade on delete cascade)
+engine=ndb;
+insert into bristol values (2,2,2), (3,3,3), (4,4,4), (5,5,5);
+Checking copying alter ALTER TABLE test.bristol drop column c
+concurrent with UPDATE test.cambridge set b=50 where a=5 
+has alter error ER_TABLE_DEF_CHANGED
+and statement error 0
+set DEBUG_SYNC= 'ndb.before_commit_count_check SIGNAL alter_waiting WAIT_FOR alter_go';
+ALTER TABLE test.bristol drop column c;
+set DEBUG_SYNC= 'now WAIT_FOR alter_waiting';
+UPDATE test.cambridge set b=50 where a=5;
+set DEBUG_SYNC= 'now SIGNAL alter_go';
+ERROR HY000: Detected change to data in source table during copying ALTER TABLE. Alter aborted to avoid inconsistency.
+set DEBUG_SYNC='RESET';
+Checking copying alter ALTER TABLE test.bristol drop column c
+concurrent with DELETE from test.cambridge where a=5 
+has alter error ER_TABLE_DEF_CHANGED
+and statement error 0
+set DEBUG_SYNC= 'ndb.before_commit_count_check SIGNAL alter_waiting WAIT_FOR alter_go';
+ALTER TABLE test.bristol drop column c;
+set DEBUG_SYNC= 'now WAIT_FOR alter_waiting';
+DELETE from test.cambridge where a=5;
+set DEBUG_SYNC= 'now SIGNAL alter_go';
+ERROR HY000: Detected change to data in source table during copying ALTER TABLE. Alter aborted to avoid inconsistency.
+set DEBUG_SYNC='RESET';
+drop table bristol;
+-----
+Blobs
+-----
+Checking copying alter ALTER TABLE test.oxford drop column d
+concurrent with UPDATE test.oxford SET c=REPEAT('E',1000) 
+has alter error ER_TABLE_DEF_CHANGED
+and statement error 0
+set DEBUG_SYNC= 'ndb.before_commit_count_check SIGNAL alter_waiting WAIT_FOR alter_go';
+ALTER TABLE test.oxford drop column d;
+set DEBUG_SYNC= 'now WAIT_FOR alter_waiting';
+UPDATE test.oxford SET c=REPEAT('E',1000);
+set DEBUG_SYNC= 'now SIGNAL alter_go';
+ERROR HY000: Detected change to data in source table during copying ALTER TABLE. Alter aborted to avoid inconsistency.
+set DEBUG_SYNC='RESET';
+-------------------------------------------------------
+Test various concurrent operations that should not cause
+copy failure for a copying alter drop column.
+-------------------------------------------------------
+Scanning SELECTs
+Checking copying alter ALTER TABLE test.cambridge drop column d
+concurrent with SELECT a,b from test.cambridge order by a 
+has alter error 0
+and statement error 0
+set DEBUG_SYNC= 'ndb.before_commit_count_check SIGNAL alter_waiting WAIT_FOR alter_go';
+ALTER TABLE test.cambridge drop column d;
+set DEBUG_SYNC= 'now WAIT_FOR alter_waiting';
+SELECT a,b from test.cambridge order by a;
+a	b
+2	2
+3	3
+4	4
+6	6
+set DEBUG_SYNC= 'now SIGNAL alter_go';
+set DEBUG_SYNC='RESET';
+alter table test.cambridge add column d int;
+Warnings:
+Warning	1478	Converted FIXED field 'd' to DYNAMIC to enable online ADD COLUMN
+Checking copying alter ALTER TABLE test.cambridge drop column d
+concurrent with SELECT a,b from test.cambridge order by a lock in share mode 
+has alter error 0
+and statement error 0
+set DEBUG_SYNC= 'ndb.before_commit_count_check SIGNAL alter_waiting WAIT_FOR alter_go';
+ALTER TABLE test.cambridge drop column d;
+set DEBUG_SYNC= 'now WAIT_FOR alter_waiting';
+SELECT a,b from test.cambridge order by a lock in share mode;
+a	b
+2	2
+3	3
+4	4
+6	6
+set DEBUG_SYNC= 'now SIGNAL alter_go';
+set DEBUG_SYNC='RESET';
+alter table test.cambridge add column d int;
+Warnings:
+Warning	1478	Converted FIXED field 'd' to DYNAMIC to enable online ADD COLUMN
+Checking copying alter ALTER TABLE test.cambridge drop column d
+concurrent with SELECT a,b from test.cambridge order by a for update 
+has alter error 0
+and statement error 0
+set DEBUG_SYNC= 'ndb.before_commit_count_check SIGNAL alter_waiting WAIT_FOR alter_go';
+ALTER TABLE test.cambridge drop column d;
+set DEBUG_SYNC= 'now WAIT_FOR alter_waiting';
+SELECT a,b from test.cambridge order by a for update;
+a	b
+2	2
+3	3
+4	4
+6	6
+set DEBUG_SYNC= 'now SIGNAL alter_go';
+set DEBUG_SYNC='RESET';
+alter table test.cambridge add column d int;
+Warnings:
+Warning	1478	Converted FIXED field 'd' to DYNAMIC to enable online ADD COLUMN
+Checking copying alter ALTER TABLE test.oxford drop column d
+concurrent with SELECT a,length(c) from test.oxford order by a 
+has alter error 0
+and statement error 0
+set DEBUG_SYNC= 'ndb.before_commit_count_check SIGNAL alter_waiting WAIT_FOR alter_go';
+ALTER TABLE test.oxford drop column d;
+set DEBUG_SYNC= 'now WAIT_FOR alter_waiting';
+SELECT a,length(c) from test.oxford order by a;
+a	length(c)
+1	1000
+2	1000
+3	1000
+4	1000
+5	1000
+set DEBUG_SYNC= 'now SIGNAL alter_go';
+set DEBUG_SYNC='RESET';
+alter table test.oxford add column d int;
+Warnings:
+Warning	1478	Converted FIXED field 'd' to DYNAMIC to enable online ADD COLUMN
+Checking copying alter ALTER TABLE test.oxford drop column d
+concurrent with SELECT a,length(c) from test.oxford order by a lock in share mode 
+has alter error 0
+and statement error 0
+set DEBUG_SYNC= 'ndb.before_commit_count_check SIGNAL alter_waiting WAIT_FOR alter_go';
+ALTER TABLE test.oxford drop column d;
+set DEBUG_SYNC= 'now WAIT_FOR alter_waiting';
+SELECT a,length(c) from test.oxford order by a lock in share mode;
+a	length(c)
+1	1000
+2	1000
+3	1000
+4	1000
+5	1000
+set DEBUG_SYNC= 'now SIGNAL alter_go';
+set DEBUG_SYNC='RESET';
+alter table test.oxford add column d int;
+Warnings:
+Warning	1478	Converted FIXED field 'd' to DYNAMIC to enable online ADD COLUMN
+Checking copying alter ALTER TABLE test.oxford drop column d
+concurrent with SELECT a,length(c) from test.oxford order by a for update 
+has alter error 0
+and statement error 0
+set DEBUG_SYNC= 'ndb.before_commit_count_check SIGNAL alter_waiting WAIT_FOR alter_go';
+ALTER TABLE test.oxford drop column d;
+set DEBUG_SYNC= 'now WAIT_FOR alter_waiting';
+SELECT a,length(c) from test.oxford order by a for update;
+a	length(c)
+1	1000
+2	1000
+3	1000
+4	1000
+5	1000
+set DEBUG_SYNC= 'now SIGNAL alter_go';
+set DEBUG_SYNC='RESET';
+alter table test.oxford add column d int;
+Warnings:
+Warning	1478	Converted FIXED field 'd' to DYNAMIC to enable online ADD COLUMN
+SELECT by PK
+Checking copying alter ALTER TABLE test.cambridge drop column d
+concurrent with SELECT a,b from test.cambridge where a=3 
+has alter error 0
+and statement error 0
+set DEBUG_SYNC= 'ndb.before_commit_count_check SIGNAL alter_waiting WAIT_FOR alter_go';
+ALTER TABLE test.cambridge drop column d;
+set DEBUG_SYNC= 'now WAIT_FOR alter_waiting';
+SELECT a,b from test.cambridge where a=3;
+a	b
+3	3
+set DEBUG_SYNC= 'now SIGNAL alter_go';
+set DEBUG_SYNC='RESET';
+alter table test.cambridge add column d int;
+Warnings:
+Warning	1478	Converted FIXED field 'd' to DYNAMIC to enable online ADD COLUMN
+Checking copying alter ALTER TABLE test.cambridge drop column d
+concurrent with SELECT a,b from test.cambridge where a=3 lock in share mode 
+has alter error 0
+and statement error 0
+set DEBUG_SYNC= 'ndb.before_commit_count_check SIGNAL alter_waiting WAIT_FOR alter_go';
+ALTER TABLE test.cambridge drop column d;
+set DEBUG_SYNC= 'now WAIT_FOR alter_waiting';
+SELECT a,b from test.cambridge where a=3 lock in share mode;
+a	b
+3	3
+set DEBUG_SYNC= 'now SIGNAL alter_go';
+set DEBUG_SYNC='RESET';
+alter table test.cambridge add column d int;
+Warnings:
+Warning	1478	Converted FIXED field 'd' to DYNAMIC to enable online ADD COLUMN
+Checking copying alter ALTER TABLE test.cambridge drop column d
+concurrent with SELECT a,b from test.cambridge where a=3 for update 
+has alter error 0
+and statement error 0
+set DEBUG_SYNC= 'ndb.before_commit_count_check SIGNAL alter_waiting WAIT_FOR alter_go';
+ALTER TABLE test.cambridge drop column d;
+set DEBUG_SYNC= 'now WAIT_FOR alter_waiting';
+SELECT a,b from test.cambridge where a=3 for update;
+a	b
+3	3
+set DEBUG_SYNC= 'now SIGNAL alter_go';
+set DEBUG_SYNC='RESET';
+alter table test.cambridge add column d int;
+Warnings:
+Warning	1478	Converted FIXED field 'd' to DYNAMIC to enable online ADD COLUMN
+Checking copying alter ALTER TABLE test.oxford drop column d
+concurrent with SELECT a,length(c) from test.oxford where a=3 
+has alter error 0
+and statement error 0
+set DEBUG_SYNC= 'ndb.before_commit_count_check SIGNAL alter_waiting WAIT_FOR alter_go';
+ALTER TABLE test.oxford drop column d;
+set DEBUG_SYNC= 'now WAIT_FOR alter_waiting';
+SELECT a,length(c) from test.oxford where a=3;
+a	length(c)
+3	1000
+set DEBUG_SYNC= 'now SIGNAL alter_go';
+set DEBUG_SYNC='RESET';
+alter table test.oxford add column d int;
+Warnings:
+Warning	1478	Converted FIXED field 'd' to DYNAMIC to enable online ADD COLUMN
+Checking copying alter ALTER TABLE test.oxford drop column d
+concurrent with SELECT a,length(c) from test.oxford where a=3 lock in share mode 
+has alter error 0
+and statement error 0
+set DEBUG_SYNC= 'ndb.before_commit_count_check SIGNAL alter_waiting WAIT_FOR alter_go';
+ALTER TABLE test.oxford drop column d;
+set DEBUG_SYNC= 'now WAIT_FOR alter_waiting';
+SELECT a,length(c) from test.oxford where a=3 lock in share mode;
+a	length(c)
+3	1000
+set DEBUG_SYNC= 'now SIGNAL alter_go';
+set DEBUG_SYNC='RESET';
+alter table test.oxford add column d int;
+Warnings:
+Warning	1478	Converted FIXED field 'd' to DYNAMIC to enable online ADD COLUMN
+Checking copying alter ALTER TABLE test.oxford drop column d
+concurrent with SELECT a,length(c) from test.oxford where a=3 for update 
+has alter error 0
+and statement error 0
+set DEBUG_SYNC= 'ndb.before_commit_count_check SIGNAL alter_waiting WAIT_FOR alter_go';
+ALTER TABLE test.oxford drop column d;
+set DEBUG_SYNC= 'now WAIT_FOR alter_waiting';
+SELECT a,length(c) from test.oxford where a=3 for update;
+a	length(c)
+3	1000
+set DEBUG_SYNC= 'now SIGNAL alter_go';
+set DEBUG_SYNC='RESET';
+alter table test.oxford add column d int;
+Warnings:
+Warning	1478	Converted FIXED field 'd' to DYNAMIC to enable online ADD COLUMN
+NULL effect modifications
+Checking copying alter ALTER TABLE test.cambridge drop column d
+concurrent with INSERT into test.cambridge values (2,2,2,2) 
+has alter error 0
+and statement error ER_DUP_ENTRY
+set DEBUG_SYNC= 'ndb.before_commit_count_check SIGNAL alter_waiting WAIT_FOR alter_go';
+ALTER TABLE test.cambridge drop column d;
+set DEBUG_SYNC= 'now WAIT_FOR alter_waiting';
+INSERT into test.cambridge values (2,2,2,2);
+ERROR 23000: Duplicate entry '2' for key 'cambridge.PRIMARY'
+set DEBUG_SYNC= 'now SIGNAL alter_go';
+set DEBUG_SYNC='RESET';
+alter table test.cambridge add column d int;
+Warnings:
+Warning	1478	Converted FIXED field 'd' to DYNAMIC to enable online ADD COLUMN
+Checking copying alter ALTER TABLE test.cambridge drop column d
+concurrent with UPDATE test.cambridge set b=888 where a=888 
+has alter error 0
+and statement error 0
+set DEBUG_SYNC= 'ndb.before_commit_count_check SIGNAL alter_waiting WAIT_FOR alter_go';
+ALTER TABLE test.cambridge drop column d;
+set DEBUG_SYNC= 'now WAIT_FOR alter_waiting';
+UPDATE test.cambridge set b=888 where a=888;
+set DEBUG_SYNC= 'now SIGNAL alter_go';
+set DEBUG_SYNC='RESET';
+alter table test.cambridge add column d int;
+Warnings:
+Warning	1478	Converted FIXED field 'd' to DYNAMIC to enable online ADD COLUMN
+Checking copying alter ALTER TABLE test.cambridge drop column d
+concurrent with UPDATE test.cambridge set b=b 
+has alter error 0
+and statement error 0
+set DEBUG_SYNC= 'ndb.before_commit_count_check SIGNAL alter_waiting WAIT_FOR alter_go';
+ALTER TABLE test.cambridge drop column d;
+set DEBUG_SYNC= 'now WAIT_FOR alter_waiting';
+UPDATE test.cambridge set b=b;
+set DEBUG_SYNC= 'now SIGNAL alter_go';
+set DEBUG_SYNC='RESET';
+alter table test.cambridge add column d int;
+Warnings:
+Warning	1478	Converted FIXED field 'd' to DYNAMIC to enable online ADD COLUMN
+Checking copying alter ALTER TABLE test.cambridge drop column d
+concurrent with DELETE from test.cambridge where a=888 
+has alter error 0
+and statement error 0
+set DEBUG_SYNC= 'ndb.before_commit_count_check SIGNAL alter_waiting WAIT_FOR alter_go';
+ALTER TABLE test.cambridge drop column d;
+set DEBUG_SYNC= 'now WAIT_FOR alter_waiting';
+DELETE from test.cambridge where a=888;
+set DEBUG_SYNC= 'now SIGNAL alter_go';
+set DEBUG_SYNC='RESET';
+alter table test.cambridge add column d int;
+Warnings:
+Warning	1478	Converted FIXED field 'd' to DYNAMIC to enable online ADD COLUMN
+Checking copying alter ALTER TABLE test.oxford drop column d
+concurrent with INSERT into test.oxford values (2,2,repeat('A', 1000),2) 
+has alter error 0
+and statement error ER_DUP_ENTRY
+set DEBUG_SYNC= 'ndb.before_commit_count_check SIGNAL alter_waiting WAIT_FOR alter_go';
+ALTER TABLE test.oxford drop column d;
+set DEBUG_SYNC= 'now WAIT_FOR alter_waiting';
+INSERT into test.oxford values (2,2,repeat('A', 1000),2);
+ERROR 23000: Duplicate entry '2' for key 'oxford.PRIMARY'
+set DEBUG_SYNC= 'now SIGNAL alter_go';
+set DEBUG_SYNC='RESET';
+alter table test.oxford add column d int;
+Warnings:
+Warning	1478	Converted FIXED field 'd' to DYNAMIC to enable online ADD COLUMN
+Checking copying alter ALTER TABLE test.oxford drop column d
+concurrent with UPDATE test.oxford set b=888 where a=888 
+has alter error 0
+and statement error 0
+set DEBUG_SYNC= 'ndb.before_commit_count_check SIGNAL alter_waiting WAIT_FOR alter_go';
+ALTER TABLE test.oxford drop column d;
+set DEBUG_SYNC= 'now WAIT_FOR alter_waiting';
+UPDATE test.oxford set b=888 where a=888;
+set DEBUG_SYNC= 'now SIGNAL alter_go';
+set DEBUG_SYNC='RESET';
+alter table test.oxford add column d int;
+Warnings:
+Warning	1478	Converted FIXED field 'd' to DYNAMIC to enable online ADD COLUMN
+Checking copying alter ALTER TABLE test.oxford drop column d
+concurrent with UPDATE test.oxford set c=c 
+has alter error 0
+and statement error 0
+set DEBUG_SYNC= 'ndb.before_commit_count_check SIGNAL alter_waiting WAIT_FOR alter_go';
+ALTER TABLE test.oxford drop column d;
+set DEBUG_SYNC= 'now WAIT_FOR alter_waiting';
+UPDATE test.oxford set c=c;
+set DEBUG_SYNC= 'now SIGNAL alter_go';
+set DEBUG_SYNC='RESET';
+alter table test.oxford add column d int;
+Warnings:
+Warning	1478	Converted FIXED field 'd' to DYNAMIC to enable online ADD COLUMN
+Checking copying alter ALTER TABLE test.oxford drop column d
+concurrent with DELETE from test.oxford where a=888 
+has alter error 0
+and statement error 0
+set DEBUG_SYNC= 'ndb.before_commit_count_check SIGNAL alter_waiting WAIT_FOR alter_go';
+ALTER TABLE test.oxford drop column d;
+set DEBUG_SYNC= 'now WAIT_FOR alter_waiting';
+DELETE from test.oxford where a=888;
+set DEBUG_SYNC= 'now SIGNAL alter_go';
+set DEBUG_SYNC='RESET';
+alter table test.oxford add column d int;
+Warnings:
+Warning	1478	Converted FIXED field 'd' to DYNAMIC to enable online ADD COLUMN
+------------------------------------------------
+FK checks are unaffected by parent copying alter
+------------------------------------------------
+update cambridge set b=a;
+create table bristol
+(a int primary key, b int, c int, 
+foreign key (b) references cambridge (b) on update cascade on delete cascade)
+engine=ndb;
+select a from cambridge order by a;
+a
+2
+3
+4
+6
+insert into bristol select a,a,a from cambridge;
+Checking copying alter ALTER TABLE test.cambridge drop column d
+concurrent with INSERT INTO test.bristol values (40,4,40) 
+has alter error 0
+and statement error 0
+set DEBUG_SYNC= 'ndb.before_commit_count_check SIGNAL alter_waiting WAIT_FOR alter_go';
+ALTER TABLE test.cambridge drop column d;
+set DEBUG_SYNC= 'now WAIT_FOR alter_waiting';
+INSERT INTO test.bristol values (40,4,40);
+set DEBUG_SYNC= 'now SIGNAL alter_go';
+set DEBUG_SYNC='RESET';
+alter table test.cambridge add column d int;
+Warnings:
+Warning	1478	Converted FIXED field 'd' to DYNAMIC to enable online ADD COLUMN
+Checking copying alter ALTER TABLE test.cambridge drop column d
+concurrent with UPDATE test.bristol set b=4 where b=2 
+has alter error 0
+and statement error 0
+set DEBUG_SYNC= 'ndb.before_commit_count_check SIGNAL alter_waiting WAIT_FOR alter_go';
+ALTER TABLE test.cambridge drop column d;
+set DEBUG_SYNC= 'now WAIT_FOR alter_waiting';
+UPDATE test.bristol set b=4 where b=2;
+set DEBUG_SYNC= 'now SIGNAL alter_go';
+set DEBUG_SYNC='RESET';
+alter table test.cambridge add column d int;
+Warnings:
+Warning	1478	Converted FIXED field 'd' to DYNAMIC to enable online ADD COLUMN
+Checking copying alter ALTER TABLE test.cambridge drop column d
+concurrent with DELETE FROM test.bristol 
+has alter error 0
+and statement error 0
+set DEBUG_SYNC= 'ndb.before_commit_count_check SIGNAL alter_waiting WAIT_FOR alter_go';
+ALTER TABLE test.cambridge drop column d;
+set DEBUG_SYNC= 'now WAIT_FOR alter_waiting';
+DELETE FROM test.bristol;
+set DEBUG_SYNC= 'now SIGNAL alter_go';
+set DEBUG_SYNC='RESET';
+alter table test.cambridge add column d int;
+Warnings:
+Warning	1478	Converted FIXED field 'd' to DYNAMIC to enable online ADD COLUMN
+drop table bristol;
+---------------------------------------------------------
+Show post-check exposure in copying alter check mechanism
+---------------------------------------------------------
+Existing rows :
+update cambridge set c=a;
+select a,c from cambridge order by a;
+a	c
+2	2
+3	3
+4	4
+6	6
+set DEBUG_SYNC= 'ndb.after_commit_count_check SIGNAL alter_waiting WAIT_FOR alter_go';
+ALTER TABLE cambridge drop column d;;
+set DEBUG_SYNC= 'now WAIT_FOR alter_waiting';
+insert into test.cambridge values 
+(20,20,20,20),
+(21,21,21,21),
+(22,22,22,22),
+(23,23,23,23);
+update test.cambridge set c=1000;
+delete from test.cambridge where a=6;
+Committed table content :  
+select a,c from test.cambridge order by a;
+a	c
+2	1000
+3	1000
+4	1000
+20	1000
+21	1000
+22	1000
+23	1000
+set DEBUG_SYNC= 'now SIGNAL alter_go';
+Committed table content after ALTER
+Changes have been lost
+select a,c from test.cambridge order by a;
+a	c
+2	2
+3	3
+4	4
+6	6
+set DEBUG_SYNC='RESET';
+drop table oxford;
+drop table cambridge;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_backup_log.result mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_backup_log.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_backup_log.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_backup_log.result	2021-09-28 11:46:34.000000000 +0000
@@ -13,6 +13,8 @@
 bv varbinary(26920) not null,
 primary key(a,av)
 ) engine=ndb;
+Warnings:
+Warning	1296	Specified key 'PRIMARY' was too long (max = 3056 bytes); statistics will not be generated
 Add 100 rows
 Start a backup with completion stalled
 
@@ -40,6 +42,8 @@
 Waiting for backup to complete
 Backup completed
 truncate t1;
+Warnings:
+Warning	1296	Specified key 'PRIMARY' was too long (max = 3056 bytes); statistics will not be generated
 Now restore it and check the log content
 drop table t1;
 create table txt (a varbinary(36000));
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_basic_3rpl.result mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_basic_3rpl.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_basic_3rpl.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_basic_3rpl.result	2021-09-28 11:46:34.000000000 +0000
@@ -114,8 +114,10 @@
 Ndb_conflict_trans_row_reject_count	#
 Ndb_connect_count	#
 Ndb_execute_count	#
+Ndb_fetch_table_stats	#
 Ndb_index_stat_cache_clean	#
 Ndb_index_stat_cache_query	#
+Ndb_index_stat_event_count	#
 Ndb_index_stat_status	#
 Ndb_last_commit_epoch_server	#
 Ndb_last_commit_epoch_session	#
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_basic_4rpl.result mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_basic_4rpl.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_basic_4rpl.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_basic_4rpl.result	2021-09-28 11:46:34.000000000 +0000
@@ -114,8 +114,10 @@
 Ndb_conflict_trans_row_reject_count	#
 Ndb_connect_count	#
 Ndb_execute_count	#
+Ndb_fetch_table_stats	#
 Ndb_index_stat_cache_clean	#
 Ndb_index_stat_cache_query	#
+Ndb_index_stat_event_count	#
 Ndb_index_stat_status	#
 Ndb_last_commit_epoch_server	#
 Ndb_last_commit_epoch_session	#
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_basic_ndbd.result mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_basic_ndbd.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_basic_ndbd.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_basic_ndbd.result	2021-09-28 11:46:34.000000000 +0000
@@ -114,8 +114,10 @@
 Ndb_conflict_trans_row_reject_count	#
 Ndb_connect_count	#
 Ndb_execute_count	#
+Ndb_fetch_table_stats	#
 Ndb_index_stat_cache_clean	#
 Ndb_index_stat_cache_query	#
+Ndb_index_stat_event_count	#
 Ndb_index_stat_status	#
 Ndb_last_commit_epoch_server	#
 Ndb_last_commit_epoch_session	#
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_basic.result mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_basic.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_basic.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_basic.result	2021-09-28 11:46:34.000000000 +0000
@@ -114,8 +114,10 @@
 Ndb_conflict_trans_row_reject_count	#
 Ndb_connect_count	#
 Ndb_execute_count	#
+Ndb_fetch_table_stats	#
 Ndb_index_stat_cache_clean	#
 Ndb_index_stat_cache_query	#
+Ndb_index_stat_event_count	#
 Ndb_index_stat_status	#
 Ndb_last_commit_epoch_server	#
 Ndb_last_commit_epoch_session	#
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_config.result mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_config.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_config.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_config.result	2021-09-28 11:46:34.000000000 +0000
@@ -89,3 +89,5 @@
  ERROR    -- at line 0: Invalid nodegroup 75 for node 2, Max nodegroups allowed: 72
 == 28 == Bug32258207
  ERROR    -- at line 0: Too many Datanodes(84) for replicas=1, Max Nodes allowed: 72
+== 29 == Bug32871875
+1,localhost,1,0
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_connectstring.result mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_connectstring.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_connectstring.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_connectstring.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,4 @@
+NDB_MGM "1.2.3.4:2;bind-address=192.0.2.0,host=2.3.4.2;bind-address=192.0.2.2" -eshow --connect-retries=1
+ERROR: Unable to connect with connect string: nodeid=0,1.2.3.4:2;bind-address=192.0.2.0:0,2.3.4.2:1186;bind-address=192.0.2.2:0
+NDB_MGM "nodeid=17,bind-address=192.0.2.3:4444,[2001:db8::1]:2,host=ndb.example:2222;bind-address=192.0.2.2:1" -eshow --connect-retries=1
+ERROR: Unable to connect with connect string: nodeid=17,[2001:db8::1]:2;bind-address=192.0.2.3:4444,ndb.example:2222;bind-address=192.0.2.2:1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_create_stored_user.result mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_create_stored_user.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_create_stored_user.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_create_stored_user.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,7 @@
+call mtr.add_suppression("did not acquire snapshot lock");
+call mtr.add_suppression("did not acquire snapshot lock");
+CREATE USER IF NOT EXISTS "tx"@"localhost";
+GRANT NDB_STORED_USER ON *.* TO "tx"@"localhost";
+CREATE USER IF NOT EXISTS "tx"@"localhost";
+GRANT NDB_STORED_USER ON *.* TO "tx"@"localhost";
+DROP USER "tx"@"localhost";
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_fk_restore.result mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_fk_restore.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_fk_restore.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_fk_restore.result	2021-09-28 11:46:34.000000000 +0000
@@ -495,3 +495,50 @@
 # cleanup
 drop database db1;
 drop database db2;
+# Bug#26974491 FIXES DATA RESTORE WITH DISABLE INDEXES
+create database db3;
+use db3;
+create table t4 (
+id int primary key auto_increment
+) engine=ndb;
+create table t5 (
+id int primary key auto_increment,
+val int,
+constraint fkt3t2 foreign key (val) references t4 (id)
+)engine=ndb;
+insert into t4 values (1), (2), (3), (4), (5);
+insert into t5 values (1,1), (2,2), (3,3), (4,4), (5,5);
+# take backup and drop the tables
+drop table db3.t5, db3.t4;
+# Create more tables before restore in order to verify that ndb_restore restores foreign keys
+# appropriately even though the table ids of parent and child tables which make up the name
+# of the foreign key in the format, <parent_table_id>/<child_table_id>/fk_name are different
+# in backup files than the table ids restored.
+create table db3.t6 (
+id int primary key auto_increment
+) engine=ndb;
+create table db3.t7 (
+id int primary key auto_increment
+) engine=ndb;
+create table db3.t8 (
+id int primary key auto_increment
+) engine=ndb;
+create table db3.t9 (
+id int primary key auto_increment
+) engine=ndb;
+# Use case #1: Meta restore done with --disable-indexes (recommended)
+# Drop the tables to retore them again with a different use case
+drop table db3.t5, db3.t4;
+# Use case #2: Separate --disable-indexes step after metadata restore
+# Drop the tables to retore them again with a different use case
+drop table db3.t5, db3.t4;
+# Use case #3: Data restore with --disable-indexes
+# Drop the tables to retore them again with a different use case
+drop table db3.t5, db3.t4;
+# Use case #4: Data restore with --disable-indexes and Data restore with --rebuild-indexes
+# Drop the tables to retore them again with a different use case
+drop table db3.t5, db3.t4;
+# Use case #5: Both metadata and data restore with both --disable-indexes and --rebuild-indexes
+# cleanup
+drop table db3.t6, db3.t7, db3.t8, db3.t9;
+drop database db3;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_index_ordered.result mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_index_ordered.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_index_ordered.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_index_ordered.result	2021-09-28 11:46:34.000000000 +0000
@@ -734,6 +734,7 @@
 Warnings:
 Warning	3719	'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous.
 Warning	3778	'utf8_unicode_ci' is a collation of the deprecated character set UTF8MB3. Please consider using UTF8MB4 with an appropriate collation instead.
+Warning	1296	Specified key 'x1' was too long (max = 3056 bytes); statistics will not be generated
 insert into t1 values (1,'a'),(2,'y'),(3,'z');
 select * from t1 where b = 'b';
 a	b
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndbinfo.result mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndbinfo.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndbinfo.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndbinfo.result	2021-09-28 11:46:34.000000000 +0000
@@ -1359,7 +1359,7 @@
 tot_key_prog_bytes	0
 tot_key_inst_exec	0
 tot_key_bytes_returned	0
-tot_frag_scans	0
+tot_frag_scans	1
 tot_scan_rows_examined	0
 tot_scan_rows_returned	0
 tot_scan_bytes_returned	0
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_mgmd.result mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_mgmd.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_mgmd.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_mgmd.result	2021-09-28 11:46:34.000000000 +0000
@@ -14,3 +14,20 @@
 include/assert_grep.inc [Mgmd fails to start when --skip-config-file is specified.]
 # verify that mgmd fails when started with both -f and --mycnf.
 include/assert_grep.inc [Verify mgmd fails when started with both -f and --mycnf]
+#
+# Bug32554779 DO NOT ACCEPT -C OPTION WHEN STARTING WITH -F OR
+# BINARY CONFIG
+#
+# verify that mgmd throws warning when -c option is provided along with -f
+include/assert_grep.inc [Do not accept -c option when starting with -f]
+#
+# Bug32554492 NDB_MGMD SHOULD REPORT ERROR WHEN STARTED
+# WITHOUT -F AND BINARY CONFIG
+#
+# verify that mgmd throws error when -f is not specified
+include/assert_grep.inc [Mgmd gives error when -f is not specifed]
+#
+# Bug11755867 NDB_MGMD MISMATCH BETWEEN --CONFIGDIR AND DATADIR
+#
+# verify that mgmd throws error when --configdir=. is specified
+include/assert_grep.inc [Mgmd gives error when relative path is specified for configdir]
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_mt_encrypted_backup.result mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_mt_encrypted_backup.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_mt_encrypted_backup.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_mt_encrypted_backup.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,609 @@
+Case 1: multithreaded backup + multithreaded restore
+"Create tables for backup"
+Warnings:
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Specifying number of digits for floating point data types is deprecated and will be removed in a future release.
+Warning	1681	Specifying number of digits for floating point data types is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	The ZEROFILL attribute is deprecated and will be removed in a future release. Use the LPAD function to zero-pad numbers, or store the formatted numbers in a CHAR column.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+
+Starting backup
+Backup started
+"Update tables during backup"
+
+"Wait for backup to complete"
+Waiting for backup to complete
+Backup completed
+"Drop tables after backup completes"
+"Restoring metadata"
+"Restoring backup on node 1"
+"Restoring backup on node 2"
+"Print restored rows"
+use test;
+select * from t0 order by id;
+id	val
+1	1
+2	2
+3	3
+4	4
+5	5
+6	6
+7	7
+8	8
+9	9
+10	12345
+select * from t1 order by val;
+val
+NULL
+2
+3
+4
+5
+6
+7
+8
+9
+11
+select * from t2 order by id;
+id
+1
+3
+4
+5
+6
+7
+8
+9
+10
+22
+select * from t3 order by id;
+id	val
+1	9
+2	8
+3	33
+4	6
+5	5
+6	4
+7	3
+8	2
+9	1
+10	NULL
+select * from t4 order by id;
+id	val
+1	11001
+2	11001
+3	11001
+4	44
+5	11001
+6	11001
+7	11001
+8	11001
+9	11001
+10	11001
+select id, sha1(val) from t5 order by id;
+id	sha1(val)
+1	0b35a3e0949353117c55151be416c64481dc9778
+2	0f5f3d3783159438eff81e6b3c8911480daf7eac
+3	7b48e60fd747fc37363da73d3140ba0a41ae862a
+4	ea7dffff542a062f6e41c69afac9576d7e97634c
+5	266d8973914802f093f698a58224566ca2a664bc
+6	4a8284d4be6c4c063a910760610c8754ca1234a3
+7	c1bd312a4dd67884e66d15671d38c854e99c8021
+8	d8ff0788ec90b18f9d51ecad46274e75aaf4b99f
+9	139101d8480a9a68e4e1256ed300aad365725fbc
+10	NULL
+select * from t6 order by id;
+id	val
+1	1
+2	2
+3	3
+4	4
+5	5
+6	66
+7	7
+8	8
+9	9
+10	NULL
+select * from t7 order by id;
+id	val1	val2
+1	9	9
+2	8	8
+3	7	7
+4	6	6
+5	5	5
+6	4	4
+7	77	3
+8	2	2
+9	1	1
+10	10	NULL
+select id, sha1(val) from t8 order by id;
+id	sha1(val)
+1	025bd54db3f70cdac283a9653518c14f3d331602
+2	360252745cb517637959a9ba6cb7a789cf05fa98
+3	e315b8015984d48b3d1777787d8b629bd77454cf
+4	946a83f98e3f05c3d94f0c7f2e7131324245797c
+5	66f223928b25272f115396aa099fb38efbfe3885
+6	125d03fac5bb972ef45466e36d25fd219bf09b36
+7	cf47dcc87c1ca726f74a86a4aac57d453703facc
+8	61984ed58e8de9ab388e62b54ced499e7336e82e
+9	ac1bc0da10ddfceab57a04d09524ffde6eb83cf9
+10	NULL
+select * from t9 order by auto;
+auto	string	vstring	tiny	short	medium	long_int	longlong	real_float	real_double	real_decimal	utiny	ushort	umedium	ulong	ulonglong	bits	options	flags	date_field	year_field	time_field	date_time
+1	bbbb	bbbb	-22	-22	-22	-22	-22	22.2	22.2200	22.2200	22	00022	22	22	22		two	two	1922-02-22	1922	22:22:22	1922-02-22 22:22:22
+2	8888	8888	-8	-8	-8	-8	-8	8.8	8.8000	8.8000	8	00008	8	8	8	
	one	one	1988-08-08	1988	08:08:08	1988-08-08 08:08:08
+3	7777	7777	-7	-7	-7	-7	-7	7.7	7.7000	7.7000	7	00007	7	7	7	
	one	one	1977-07-07	1977	07:07:07	1977-07-07 07:07:07
+4	6666	6666	-6	-6	-6	-6	-6	6.6	6.6000	6.6000	6	00006	6	6	6	
	one	one	1966-06-06	1966	06:06:06	1966-06-06 06:06:06
+5	5555	5555	-5	-5	-5	-5	-5	5.5	5.5000	5.5000	5	00005	5	5	5	
	one	one	1955-05-05	1955	05:05:05	1955-05-05 05:05:05
+6	4444	4444	-4	-4	-4	-4	-4	4.4	4.4000	4.4000	4	00004	4	4	4	
	one	one	1944-04-04	1944	04:04:04	1944-04-04 04:04:04
+7	3333	3333	-3	-3	-3	-3	-3	3.3	3.3000	3.3000	3	00003	3	3	3	
	one	one	1933-03-03	1933	03:03:03	1933-03-03 03:03:03
+8	2222	2222	-2	-2	-2	-2	-2	2.2	2.2000	2.2000	2	00002	2	2	2	
	one	one	1922-02-02	1922	02:02:02	1922-02-02 02:02:02
+9	1111	1111	-1	-1	-1	-1	-1	1.1	1.1000	1.1000	1	00001	1	1	1	
	one	one	1911-01-01	1911	01:01:01	1911-01-01 01:01:01
+10	NULL	NULL	10	10	10	10	10	10.1	NULL	NULL	10	00010	10	10	10	NULL	two	two	NULL	NULL	NULL	NULL
+"Drop tables after backup completes"
+Case 2: multithreaded snapshotstart backup + multithreaded restore
+"Create tables for backup"
+Warnings:
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Specifying number of digits for floating point data types is deprecated and will be removed in a future release.
+Warning	1681	Specifying number of digits for floating point data types is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	The ZEROFILL attribute is deprecated and will be removed in a future release. Use the LPAD function to zero-pad numbers, or store the formatted numbers in a CHAR column.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+
+Starting SNAPSHOTSTART backup
+Backup started
+"Update tables during backup"
+
+"Wait for backup to complete"
+Waiting for backup to complete
+Backup completed
+"Drop tables after backup completes"
+"Restoring metadata"
+"Restoring backup on node 1"
+"Restoring backup on node 2"
+"Print restored rows"
+use test;
+select * from t0 order by id;
+id	val
+1	1
+2	2
+3	3
+4	4
+5	5
+6	6
+7	7
+8	8
+9	9
+10	NULL
+select * from t1 order by val;
+val
+NULL
+1
+2
+3
+4
+5
+6
+7
+8
+9
+select * from t2 order by id;
+id
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+select * from t3 order by id;
+id	val
+1	9
+2	8
+3	7
+4	6
+5	5
+6	4
+7	3
+8	2
+9	1
+10	NULL
+select * from t4 order by id;
+id	val
+1	11001
+2	11001
+3	11001
+4	11001
+5	11001
+6	11001
+7	11001
+8	11001
+9	11001
+10	11001
+select id, sha1(val) from t5 order by id;
+id	sha1(val)
+1	0b35a3e0949353117c55151be416c64481dc9778
+2	0f5f3d3783159438eff81e6b3c8911480daf7eac
+3	7b48e60fd747fc37363da73d3140ba0a41ae862a
+4	ea7dffff542a062f6e41c69afac9576d7e97634c
+5	8a96558c6361531c5f387582e5f6cd732332262b
+6	4a8284d4be6c4c063a910760610c8754ca1234a3
+7	c1bd312a4dd67884e66d15671d38c854e99c8021
+8	d8ff0788ec90b18f9d51ecad46274e75aaf4b99f
+9	139101d8480a9a68e4e1256ed300aad365725fbc
+10	NULL
+select * from t6 order by id;
+id	val
+1	1
+2	2
+3	3
+4	4
+5	5
+6	6
+7	7
+8	8
+9	9
+10	NULL
+select * from t7 order by id;
+id	val1	val2
+1	9	9
+2	8	8
+3	7	7
+4	6	6
+5	5	5
+6	4	4
+7	3	3
+8	2	2
+9	1	1
+10	10	NULL
+select id, sha1(val) from t8 order by id;
+id	sha1(val)
+1	025bd54db3f70cdac283a9653518c14f3d331602
+2	360252745cb517637959a9ba6cb7a789cf05fa98
+3	e315b8015984d48b3d1777787d8b629bd77454cf
+4	946a83f98e3f05c3d94f0c7f2e7131324245797c
+5	66f223928b25272f115396aa099fb38efbfe3885
+6	125d03fac5bb972ef45466e36d25fd219bf09b36
+7	cf47dcc87c1ca726f74a86a4aac57d453703facc
+8	f8f5538687ac9a4294a44de553d46dd798524504
+9	ac1bc0da10ddfceab57a04d09524ffde6eb83cf9
+10	NULL
+select * from t9 order by auto;
+auto	string	vstring	tiny	short	medium	long_int	longlong	real_float	real_double	real_decimal	utiny	ushort	umedium	ulong	ulonglong	bits	options	flags	date_field	year_field	time_field	date_time
+1	9999	9999	-9	-9	-9	-9	-9	9.9	9.9000	9.9000	9	00009	9	9	9	
	one	one	1999-09-09	1999	09:09:09	1999-09-09 09:09:09
+2	8888	8888	-8	-8	-8	-8	-8	8.8	8.8000	8.8000	8	00008	8	8	8	
	one	one	1988-08-08	1988	08:08:08	1988-08-08 08:08:08
+3	7777	7777	-7	-7	-7	-7	-7	7.7	7.7000	7.7000	7	00007	7	7	7	
	one	one	1977-07-07	1977	07:07:07	1977-07-07 07:07:07
+4	6666	6666	-6	-6	-6	-6	-6	6.6	6.6000	6.6000	6	00006	6	6	6	
	one	one	1966-06-06	1966	06:06:06	1966-06-06 06:06:06
+5	5555	5555	-5	-5	-5	-5	-5	5.5	5.5000	5.5000	5	00005	5	5	5	
	one	one	1955-05-05	1955	05:05:05	1955-05-05 05:05:05
+6	4444	4444	-4	-4	-4	-4	-4	4.4	4.4000	4.4000	4	00004	4	4	4	
	one	one	1944-04-04	1944	04:04:04	1944-04-04 04:04:04
+7	3333	3333	-3	-3	-3	-3	-3	3.3	3.3000	3.3000	3	00003	3	3	3	
	one	one	1933-03-03	1933	03:03:03	1933-03-03 03:03:03
+8	2222	2222	-2	-2	-2	-2	-2	2.2	2.2000	2.2000	2	00002	2	2	2	
	one	one	1922-02-02	1922	02:02:02	1922-02-02 02:02:02
+9	1111	1111	-1	-1	-1	-1	-1	1.1	1.1000	1.1000	1	00001	1	1	1	
	one	one	1911-01-01	1911	01:01:01	1911-01-01 01:01:01
+10	NULL	NULL	10	10	10	10	10	10.1	NULL	NULL	10	00010	10	10	10	NULL	two	two	NULL	NULL	NULL	NULL
+"Drop tables after backup completes"
+Case 3: multithreaded backup + single-threaded restore
+"Create tables for backup"
+Warnings:
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Specifying number of digits for floating point data types is deprecated and will be removed in a future release.
+Warning	1681	Specifying number of digits for floating point data types is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	The ZEROFILL attribute is deprecated and will be removed in a future release. Use the LPAD function to zero-pad numbers, or store the formatted numbers in a CHAR column.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+
+Starting backup
+Backup started
+"Update tables during backup"
+
+"Wait for backup to complete"
+Waiting for backup to complete
+Backup completed
+"Drop tables after backup completes"
+"Restoring metadata"
+"Restoring multithreaded backup parts serially on node 1"
+"Restoring multithreaded backup parts serially on node 2"
+"Print restored rows"
+use test;
+select * from t0 order by id;
+id	val
+1	1
+2	2
+3	3
+4	4
+5	5
+6	6
+7	7
+8	8
+9	9
+10	12345
+select * from t1 order by val;
+val
+NULL
+2
+3
+4
+5
+6
+7
+8
+9
+11
+select * from t2 order by id;
+id
+1
+3
+4
+5
+6
+7
+8
+9
+10
+22
+select * from t3 order by id;
+id	val
+1	9
+2	8
+3	33
+4	6
+5	5
+6	4
+7	3
+8	2
+9	1
+10	NULL
+select * from t4 order by id;
+id	val
+1	11001
+2	11001
+3	11001
+4	44
+5	11001
+6	11001
+7	11001
+8	11001
+9	11001
+10	11001
+select id, sha1(val) from t5 order by id;
+id	sha1(val)
+1	0b35a3e0949353117c55151be416c64481dc9778
+2	0f5f3d3783159438eff81e6b3c8911480daf7eac
+3	7b48e60fd747fc37363da73d3140ba0a41ae862a
+4	ea7dffff542a062f6e41c69afac9576d7e97634c
+5	266d8973914802f093f698a58224566ca2a664bc
+6	4a8284d4be6c4c063a910760610c8754ca1234a3
+7	c1bd312a4dd67884e66d15671d38c854e99c8021
+8	d8ff0788ec90b18f9d51ecad46274e75aaf4b99f
+9	139101d8480a9a68e4e1256ed300aad365725fbc
+10	NULL
+select * from t6 order by id;
+id	val
+1	1
+2	2
+3	3
+4	4
+5	5
+6	66
+7	7
+8	8
+9	9
+10	NULL
+select * from t7 order by id;
+id	val1	val2
+1	9	9
+2	8	8
+3	7	7
+4	6	6
+5	5	5
+6	4	4
+7	77	3
+8	2	2
+9	1	1
+10	10	NULL
+select id, sha1(val) from t8 order by id;
+id	sha1(val)
+1	025bd54db3f70cdac283a9653518c14f3d331602
+2	360252745cb517637959a9ba6cb7a789cf05fa98
+3	e315b8015984d48b3d1777787d8b629bd77454cf
+4	946a83f98e3f05c3d94f0c7f2e7131324245797c
+5	66f223928b25272f115396aa099fb38efbfe3885
+6	125d03fac5bb972ef45466e36d25fd219bf09b36
+7	cf47dcc87c1ca726f74a86a4aac57d453703facc
+8	61984ed58e8de9ab388e62b54ced499e7336e82e
+9	ac1bc0da10ddfceab57a04d09524ffde6eb83cf9
+10	NULL
+select * from t9 order by auto;
+auto	string	vstring	tiny	short	medium	long_int	longlong	real_float	real_double	real_decimal	utiny	ushort	umedium	ulong	ulonglong	bits	options	flags	date_field	year_field	time_field	date_time
+1	bbbb	bbbb	-22	-22	-22	-22	-22	22.2	22.2200	22.2200	22	00022	22	22	22		two	two	1922-02-22	1922	22:22:22	1922-02-22 22:22:22
+2	8888	8888	-8	-8	-8	-8	-8	8.8	8.8000	8.8000	8	00008	8	8	8	
	one	one	1988-08-08	1988	08:08:08	1988-08-08 08:08:08
+3	7777	7777	-7	-7	-7	-7	-7	7.7	7.7000	7.7000	7	00007	7	7	7	
	one	one	1977-07-07	1977	07:07:07	1977-07-07 07:07:07
+4	6666	6666	-6	-6	-6	-6	-6	6.6	6.6000	6.6000	6	00006	6	6	6	
	one	one	1966-06-06	1966	06:06:06	1966-06-06 06:06:06
+5	5555	5555	-5	-5	-5	-5	-5	5.5	5.5000	5.5000	5	00005	5	5	5	
	one	one	1955-05-05	1955	05:05:05	1955-05-05 05:05:05
+6	4444	4444	-4	-4	-4	-4	-4	4.4	4.4000	4.4000	4	00004	4	4	4	
	one	one	1944-04-04	1944	04:04:04	1944-04-04 04:04:04
+7	3333	3333	-3	-3	-3	-3	-3	3.3	3.3000	3.3000	3	00003	3	3	3	
	one	one	1933-03-03	1933	03:03:03	1933-03-03 03:03:03
+8	2222	2222	-2	-2	-2	-2	-2	2.2	2.2000	2.2000	2	00002	2	2	2	
	one	one	1922-02-02	1922	02:02:02	1922-02-02 02:02:02
+9	1111	1111	-1	-1	-1	-1	-1	1.1	1.1000	1.1000	1	00001	1	1	1	
	one	one	1911-01-01	1911	01:01:01	1911-01-01 01:01:01
+10	NULL	NULL	10	10	10	10	10	10.1	NULL	NULL	10	00010	10	10	10	NULL	two	two	NULL	NULL	NULL	NULL
+"Drop tables after backup completes"
+Case 4: multithreaded snapshotstart backup + single-threaded restore
+"Create tables for backup"
+Warnings:
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Specifying number of digits for floating point data types is deprecated and will be removed in a future release.
+Warning	1681	Specifying number of digits for floating point data types is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	The ZEROFILL attribute is deprecated and will be removed in a future release. Use the LPAD function to zero-pad numbers, or store the formatted numbers in a CHAR column.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+
+Starting SNAPSHOTSTART backup
+Backup started
+"Update tables during backup"
+
+"Wait for backup to complete"
+Waiting for backup to complete
+Backup completed
+"Drop tables after backup completes"
+"Restoring metadata"
+"Restoring multithreaded backup parts serially on node 1"
+"Restoring multithreaded backup parts serially on node 2"
+"Print restored rows"
+use test;
+select * from t0 order by id;
+id	val
+1	1
+2	2
+3	3
+4	4
+5	5
+6	6
+7	7
+8	8
+9	9
+10	NULL
+select * from t1 order by val;
+val
+NULL
+1
+2
+3
+4
+5
+6
+7
+8
+9
+select * from t2 order by id;
+id
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+select * from t3 order by id;
+id	val
+1	9
+2	8
+3	7
+4	6
+5	5
+6	4
+7	3
+8	2
+9	1
+10	NULL
+select * from t4 order by id;
+id	val
+1	11001
+2	11001
+3	11001
+4	11001
+5	11001
+6	11001
+7	11001
+8	11001
+9	11001
+10	11001
+select id, sha1(val) from t5 order by id;
+id	sha1(val)
+1	0b35a3e0949353117c55151be416c64481dc9778
+2	0f5f3d3783159438eff81e6b3c8911480daf7eac
+3	7b48e60fd747fc37363da73d3140ba0a41ae862a
+4	ea7dffff542a062f6e41c69afac9576d7e97634c
+5	8a96558c6361531c5f387582e5f6cd732332262b
+6	4a8284d4be6c4c063a910760610c8754ca1234a3
+7	c1bd312a4dd67884e66d15671d38c854e99c8021
+8	d8ff0788ec90b18f9d51ecad46274e75aaf4b99f
+9	139101d8480a9a68e4e1256ed300aad365725fbc
+10	NULL
+select * from t6 order by id;
+id	val
+1	1
+2	2
+3	3
+4	4
+5	5
+6	6
+7	7
+8	8
+9	9
+10	NULL
+select * from t7 order by id;
+id	val1	val2
+1	9	9
+2	8	8
+3	7	7
+4	6	6
+5	5	5
+6	4	4
+7	3	3
+8	2	2
+9	1	1
+10	10	NULL
+select id, sha1(val) from t8 order by id;
+id	sha1(val)
+1	025bd54db3f70cdac283a9653518c14f3d331602
+2	360252745cb517637959a9ba6cb7a789cf05fa98
+3	e315b8015984d48b3d1777787d8b629bd77454cf
+4	946a83f98e3f05c3d94f0c7f2e7131324245797c
+5	66f223928b25272f115396aa099fb38efbfe3885
+6	125d03fac5bb972ef45466e36d25fd219bf09b36
+7	cf47dcc87c1ca726f74a86a4aac57d453703facc
+8	f8f5538687ac9a4294a44de553d46dd798524504
+9	ac1bc0da10ddfceab57a04d09524ffde6eb83cf9
+10	NULL
+select * from t9 order by auto;
+auto	string	vstring	tiny	short	medium	long_int	longlong	real_float	real_double	real_decimal	utiny	ushort	umedium	ulong	ulonglong	bits	options	flags	date_field	year_field	time_field	date_time
+1	9999	9999	-9	-9	-9	-9	-9	9.9	9.9000	9.9000	9	00009	9	9	9	
	one	one	1999-09-09	1999	09:09:09	1999-09-09 09:09:09
+2	8888	8888	-8	-8	-8	-8	-8	8.8	8.8000	8.8000	8	00008	8	8	8	
	one	one	1988-08-08	1988	08:08:08	1988-08-08 08:08:08
+3	7777	7777	-7	-7	-7	-7	-7	7.7	7.7000	7.7000	7	00007	7	7	7	
	one	one	1977-07-07	1977	07:07:07	1977-07-07 07:07:07
+4	6666	6666	-6	-6	-6	-6	-6	6.6	6.6000	6.6000	6	00006	6	6	6	
	one	one	1966-06-06	1966	06:06:06	1966-06-06 06:06:06
+5	5555	5555	-5	-5	-5	-5	-5	5.5	5.5000	5.5000	5	00005	5	5	5	
	one	one	1955-05-05	1955	05:05:05	1955-05-05 05:05:05
+6	4444	4444	-4	-4	-4	-4	-4	4.4	4.4000	4.4000	4	00004	4	4	4	
	one	one	1944-04-04	1944	04:04:04	1944-04-04 04:04:04
+7	3333	3333	-3	-3	-3	-3	-3	3.3	3.3000	3.3000	3	00003	3	3	3	
	one	one	1933-03-03	1933	03:03:03	1933-03-03 03:03:03
+8	2222	2222	-2	-2	-2	-2	-2	2.2	2.2000	2.2000	2	00002	2	2	2	
	one	one	1922-02-02	1922	02:02:02	1922-02-02 02:02:02
+9	1111	1111	-1	-1	-1	-1	-1	1.1	1.1000	1.1000	1	00001	1	1	1	
	one	one	1911-01-01	1911	01:01:01	1911-01-01 01:01:01
+10	NULL	NULL	10	10	10	10	10	10.1	NULL	NULL	10	00010	10	10	10	NULL	two	two	NULL	NULL	NULL	NULL
+"Drop tables after backup completes"
+Case 5: restore backup with missing part
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_multi_mgmd.result mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_multi_mgmd.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_multi_mgmd.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_multi_mgmd.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,3 @@
+Bug32339789
+MySQL Cluster Management Server
+ INFO     -- Cluster configuration has multiple Management nodes. Please start the other mgmd nodes if not started yet.
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_partition_error.result mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_partition_error.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_partition_error.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_partition_error.result	2021-09-28 11:46:34.000000000 +0000
@@ -47,3 +47,49 @@
 drop table t1;
 create table `t1` (`a` int, b int, primary key (a,b)) engine=ndb partition by key(`a`,`b`,`a`);
 ERROR HY000: Duplicate partition field name 'a'
+#
+# Bug#32773358 CREATE TABLE PARTITION FUNCTION CLEANUP
+#  - test LIST and RANGE partition setup during CREATE TABLE
+#
+CREATE TABLE t1 ( id INT PRIMARY KEY) ENGINE=NDB
+PARTITION BY LIST(id)
+(PARTITION p0 VALUES IN (0),
+PARTITION p1 VALUES IN (NULL), -- Will not create partition
+PARTITION p2 VALUES IN (2147483647),
+PARTITION p3 VALUES IN (-2147483648));
+INSERT INTO t1 VALUES(0);
+INSERT INTO t1 VALUES(2147483647);
+INSERT INTO t1 VALUES(-2147483648);
+DROP TABLE t1;
+CREATE TABLE t1 ( id INT PRIMARY KEY) ENGINE=NDB
+PARTITION BY LIST(id)
+(PARTITION p0 VALUES IN (0),
+PARTITION p2 VALUES IN (2147483648));
+ERROR HY000: The NDB handler only supports 32 bit integers in VALUES
+CREATE TABLE t1 ( id INT PRIMARY KEY) ENGINE=NDB
+PARTITION BY LIST(id)
+(PARTITION p0 VALUES IN (0),
+PARTITION p2 VALUES IN (-2147483649));
+ERROR HY000: The NDB handler only supports 32 bit integers in VALUES
+CREATE TABLE t1 ( id INT PRIMARY KEY) ENGINE=NDB
+PARTITION BY RANGE(id)
+(PARTITION p1 VALUES LESS THAN (-2147483648),
+PARTITION p2 VALUES LESS THAN (0),
+PARTITION p3 VALUES LESS THAN (256),
+PARTITION p4 VALUES LESS THAN (2147483646),
+PARTITION p5 VALUES LESS THAN MAXVALUE);
+INSERT INTO t1 VALUES(-2147483648);
+INSERT INTO t1 VALUES(0);
+INSERT INTO t1 VALUES(256);
+INSERT INTO t1 VALUES(2147483647);
+DROP TABLE t1;
+CREATE TABLE t1 ( id INT PRIMARY KEY) ENGINE=NDB
+PARTITION BY RANGE(id)
+(PARTITION p1 VALUES LESS THAN (-2147483649),
+PARTITION p2 VALUES LESS THAN MAXVALUE);
+ERROR HY000: The NDB handler only supports 32 bit integers in VALUES
+CREATE TABLE t1 ( id INT PRIMARY KEY) ENGINE=NDB
+PARTITION BY RANGE(id)
+(PARTITION p1 VALUES LESS THAN (2147483647),
+PARTITION p2 VALUES LESS THAN MAXVALUE);
+ERROR HY000: The NDB handler only supports 32 bit integers in VALUES
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_print_backup_file.result mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_print_backup_file.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_print_backup_file.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_print_backup_file.result	2021-09-28 11:46:34.000000000 +0000
@@ -474,7 +474,7 @@
 FileType: 6
 BackupId: 0
 BackupKey: [ 0x00000000 0x00000000 ]
-ByteOrder: 0x12345678
+ByteOrder: 0xXXXXXXXX
 
 -- LCP Control file part:
 Checksum: 0x551e456a
@@ -507,7 +507,7 @@
 FileType: 4
 BackupId: 2
 BackupKey: [ 0x00000000 0x00000000 ]
-ByteOrder: 0x12345678
+ByteOrder: 0xXXXXXXXX
 
 -- Table List:
 SectionType: 4
@@ -544,7 +544,7 @@
 FileType: 6
 BackupId: 0
 BackupKey: [ 0x00000000 0x00000000 ]
-ByteOrder: 0x12345678
+ByteOrder: 0xXXXXXXXX
 
 -- LCP Control file part:
 Checksum: 0x551e456f
@@ -577,7 +577,7 @@
 FileType: 4
 BackupId: 7
 BackupKey: [ 0x00000000 0x00000000 ]
-ByteOrder: 0x12345678
+ByteOrder: 0xXXXXXXXX
 
 -- Table List:
 SectionType: 4
@@ -648,190 +648,3 @@
 NoOfRecords: 0
 Checksum: 0
 
-Verify that ndb_print_backup_file can be used to check
-a set of LCP CTL + DATA files that will be used to restore a fragment
-ndb_print_backup_file -c 0 -t 22 -f 0 --print-restored-rows
-Print restored rows for T22F0
-Processing 0/T22F0.Data
-Found 43 INSERT records
-Found 0 WRITE records
-Found 0 DELETE BY ROWID records
-Found 0 DELETE BY PAGEID records
-Found 0 IGNOREd records
-Found 43 records
-Number of all rows currently are: 43
-Processing 1/T22F0.Data
-Found 43 INSERT records
-Found 0 WRITE records
-Found 0 DELETE BY ROWID records
-Found 0 DELETE BY PAGEID records
-Found 0 IGNOREd records
-Found 43 records
-Number of all rows currently are: 86
-Processing 2/T22F0.Data
-Found 43 INSERT records
-Found 0 WRITE records
-Found 0 DELETE BY ROWID records
-Found 0 DELETE BY PAGEID records
-Found 0 IGNOREd records
-Found 43 records
-Number of all rows currently are: 129
-Processing 3/T22F0.Data
-Found 21 INSERT records
-Found 0 WRITE records
-Found 0 DELETE BY ROWID records
-Found 0 DELETE BY PAGEID records
-Found 0 IGNOREd records
-Found 21 records
-Number of all rows currently are: 150
-Found row(0,7896)
-Found row(0,7708)
-Found row(0,7520)
-Found row(0,7332)
-Found row(0,7144)
-Found row(0,6956)
-Found row(0,6768)
-Found row(0,6580)
-Found row(0,6392)
-Found row(0,6204)
-Found row(0,6016)
-Found row(0,5828)
-Found row(0,5640)
-Found row(0,5452)
-Found row(0,5264)
-Found row(0,5076)
-Found row(0,4888)
-Found row(0,4700)
-Found row(0,4512)
-Found row(0,4324)
-Found row(0,4136)
-Found row(0,3948)
-Found row(0,3760)
-Found row(0,3572)
-Found row(0,3384)
-Found row(0,3196)
-Found row(0,3008)
-Found row(0,2820)
-Found row(0,2632)
-Found row(0,2444)
-Found row(0,2256)
-Found row(0,2068)
-Found row(0,1880)
-Found row(0,1692)
-Found row(0,1504)
-Found row(0,1316)
-Found row(0,1128)
-Found row(0,940)
-Found row(0,752)
-Found row(0,564)
-Found row(0,376)
-Found row(0,188)
-Found row(0,0)
-Found row(1,7896)
-Found row(1,7708)
-Found row(1,7520)
-Found row(1,7332)
-Found row(1,7144)
-Found row(1,6956)
-Found row(1,6768)
-Found row(1,6580)
-Found row(1,6392)
-Found row(1,6204)
-Found row(1,6016)
-Found row(1,5828)
-Found row(1,5640)
-Found row(1,5452)
-Found row(1,5264)
-Found row(1,5076)
-Found row(1,4888)
-Found row(1,4700)
-Found row(1,4512)
-Found row(1,4324)
-Found row(1,4136)
-Found row(1,3948)
-Found row(1,3760)
-Found row(1,3572)
-Found row(1,3384)
-Found row(1,3196)
-Found row(1,3008)
-Found row(1,2820)
-Found row(1,2632)
-Found row(1,2444)
-Found row(1,2256)
-Found row(1,2068)
-Found row(1,1880)
-Found row(1,1692)
-Found row(1,1504)
-Found row(1,1316)
-Found row(1,1128)
-Found row(1,940)
-Found row(1,752)
-Found row(1,564)
-Found row(1,376)
-Found row(1,188)
-Found row(1,0)
-Found row(2,7896)
-Found row(2,7708)
-Found row(2,7520)
-Found row(2,7332)
-Found row(2,7144)
-Found row(2,6956)
-Found row(2,6768)
-Found row(2,6580)
-Found row(2,6392)
-Found row(2,6204)
-Found row(2,6016)
-Found row(2,5828)
-Found row(2,5640)
-Found row(2,5452)
-Found row(2,5264)
-Found row(2,5076)
-Found row(2,4888)
-Found row(2,4700)
-Found row(2,4512)
-Found row(2,4324)
-Found row(2,4136)
-Found row(2,3948)
-Found row(2,3760)
-Found row(2,3572)
-Found row(2,3384)
-Found row(2,3196)
-Found row(2,3008)
-Found row(2,2820)
-Found row(2,2632)
-Found row(2,2444)
-Found row(2,2256)
-Found row(2,2068)
-Found row(2,1880)
-Found row(2,1692)
-Found row(2,1504)
-Found row(2,1316)
-Found row(2,1128)
-Found row(2,940)
-Found row(2,752)
-Found row(2,564)
-Found row(2,376)
-Found row(2,188)
-Found row(2,0)
-Found row(3,3760)
-Found row(3,3572)
-Found row(3,3384)
-Found row(3,3196)
-Found row(3,3008)
-Found row(3,2820)
-Found row(3,2632)
-Found row(3,2444)
-Found row(3,2256)
-Found row(3,2068)
-Found row(3,1880)
-Found row(3,1692)
-Found row(3,1504)
-Found row(3,1316)
-Found row(3,1128)
-Found row(3,940)
-Found row(3,752)
-Found row(3,564)
-Found row(3,376)
-Found row(3,188)
-Found row(3,0)
-Found a total of 150 rows after restore
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_read_multi_range.result mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_read_multi_range.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_read_multi_range.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_read_multi_range.result	2021-09-28 11:46:34.000000000 +0000
@@ -574,6 +574,8 @@
 create table t1 (a varchar(1536) not null,
 b varchar(1532) not null,
 c int, primary key (a,b)) character set latin1 engine=ndb;
+Warnings:
+Warning	1296	Specified key 'PRIMARY' was too long (max = 3056 bytes); statistics will not be generated
 insert into t1 values ('a', 'a', 1), ('b', 'b', 2), ('c', 'c', 3),
 ('d', 'd', 4), ('e', 'e', 5), ('f', 'f', 6),
 ('g', 'g', 7), ('h', 'h', 8), ('i', 'i', 9),
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_restore_print.result mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_restore_print.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_restore_print.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_restore_print.result	2021-09-28 11:46:34.000000000 +0000
@@ -2468,4 +2468,5 @@
 11	'u1'@'a'	0	2	CREATE USER 'u1'@'a' IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 12	'u1'@'a'	0	\N	GRANT USAGE ON *.* TO `u1`@`a`
 12	'u1'@'a'	1	\N	GRANT NDB_STORED_USER ON *.* TO `u1`@`a`
+4	snapshot	0	\N	
 drop user u1@a;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_restore_schema_tolerance.result mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_restore_schema_tolerance.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_restore_schema_tolerance.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_restore_schema_tolerance.result	2021-09-28 11:46:34.000000000 +0000
@@ -178,7 +178,7 @@
 drop table t1;
 create table test.t1(id int primary key, val1 int unique, val2 char(20) unique) engine=ndb;
 drop table test.t1;
-Test ndb_restore of backup containing unique index, should warn only for data restore
+Test ndb_restore of backup containing unique index, should not warn since indexes are disabled
 # print metadata+data+log : should not warn
 row
 # print metadata : should not warn
@@ -191,25 +191,27 @@
 row
 # print log : should not warn
 row
-# restore data, but exclude indexed table : should not warn since unique indexes excluded
+# restore data, but exclude indexed table : should not warn since unique indexes excluded and indexes are disabled
 row
-# restore data, but exclude database containing indexed table : should not warn since unique indexes excluded
+# restore data, but exclude database containing indexed table : should not warn since unique indexes excluded and indexes are disabled
 row
-# restore data : should warn since unique indexes to be restored
+# restore data : should not warn since indexes are disabled in one of the previous steps
 row
-WARNING: Table test/def/t1 contains unique index val1$unique.This can cause ndb_restore failures with duplicate key errors while restoring data. To avoid duplicate key errors, use --disable-indexes before restoring data and --rebuild-indexes after data is restored.
-WARNING: Table test/def/t1 contains unique index val1$unique.This can cause ndb_restore failures with duplicate key errors while restoring data. To avoid duplicate key errors, use --disable-indexes before restoring data and --rebuild-indexes after data is restored.
-WARNING: Table test/def/t1 contains unique index val1$unique.This can cause ndb_restore failures with duplicate key errors while restoring data. To avoid duplicate key errors, use --disable-indexes before restoring data and --rebuild-indexes after data is restored.
-WARNING: Table test/def/t1 contains unique index val1$unique.This can cause ndb_restore failures with duplicate key errors while restoring data. To avoid duplicate key errors, use --disable-indexes before restoring data and --rebuild-indexes after data is restored.
-WARNING: Table test/def/t1 contains unique index val2$unique.This can cause ndb_restore failures with duplicate key errors while restoring data. To avoid duplicate key errors, use --disable-indexes before restoring data and --rebuild-indexes after data is restored.
-WARNING: Table test/def/t1 contains unique index val2$unique.This can cause ndb_restore failures with duplicate key errors while restoring data. To avoid duplicate key errors, use --disable-indexes before restoring data and --rebuild-indexes after data is restored.
-WARNING: Table test/def/t1 contains unique index val2$unique.This can cause ndb_restore failures with duplicate key errors while restoring data. To avoid duplicate key errors, use --disable-indexes before restoring data and --rebuild-indexes after data is restored.
-WARNING: Table test/def/t1 contains unique index val2$unique.This can cause ndb_restore failures with duplicate key errors while restoring data. To avoid duplicate key errors, use --disable-indexes before restoring data and --rebuild-indexes after data is restored.
 # restore epoch : should not warn
 row
 # rebuild-indexes : should not warn
 row
 drop table test.t1;
+Test ndb_restore of backup containing unique index, should warn since indexes are not disabled
+# metadata restore without --disable-indexes
+row
+# restore data : should warn since indexes aren't disabled in the previous step
+row
+WARNING: Table t1 contains unique indexes. This can cause ndb_restore failures with duplicate key errors while restoring data. To avoid duplicate key errors, use --disable-indexes before restoring data and --rebuild-indexes after data is restored.
+WARNING: Table t1 contains unique indexes. This can cause ndb_restore failures with duplicate key errors while restoring data. To avoid duplicate key errors, use --disable-indexes before restoring data and --rebuild-indexes after data is restored.
+WARNING: Table t1 contains unique indexes. This can cause ndb_restore failures with duplicate key errors while restoring data. To avoid duplicate key errors, use --disable-indexes before restoring data and --rebuild-indexes after data is restored.
+WARNING: Table t1 contains unique indexes. This can cause ndb_restore failures with duplicate key errors while restoring data. To avoid duplicate key errors, use --disable-indexes before restoring data and --rebuild-indexes after data is restored.
+drop table test.t1;
 Restore table with largest possible descriptor
 create table grp_hssesmusersstoredbytenant(t1 bigint primary key,
 t2 bigint unique default 65535,
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_st_encrypted_backup.result mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_st_encrypted_backup.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_st_encrypted_backup.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_st_encrypted_backup.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,305 @@
+Case 1: single-threaded backup + single-threaded restore
+"Create tables for backup"
+Warnings:
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Specifying number of digits for floating point data types is deprecated and will be removed in a future release.
+Warning	1681	Specifying number of digits for floating point data types is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	The ZEROFILL attribute is deprecated and will be removed in a future release. Use the LPAD function to zero-pad numbers, or store the formatted numbers in a CHAR column.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+
+Starting backup
+Backup started
+"Update tables during backup"
+
+"Wait for backup to complete"
+Waiting for backup to complete
+Backup completed
+"Drop tables after backup completes"
+"Restoring metadata"
+"Restoring backup on node 1"
+"Restoring backup on node 2"
+"Print restored rows"
+use test;
+select * from t0 order by id;
+id	val
+1	1
+2	2
+3	3
+4	4
+5	5
+6	6
+7	7
+8	8
+9	9
+10	12345
+select * from t1 order by val;
+val
+NULL
+2
+3
+4
+5
+6
+7
+8
+9
+11
+select * from t2 order by id;
+id
+1
+3
+4
+5
+6
+7
+8
+9
+10
+22
+select * from t3 order by id;
+id	val
+1	9
+2	8
+3	33
+4	6
+5	5
+6	4
+7	3
+8	2
+9	1
+10	NULL
+select * from t4 order by id;
+id	val
+1	11001
+2	11001
+3	11001
+4	44
+5	11001
+6	11001
+7	11001
+8	11001
+9	11001
+10	11001
+select id, sha1(val) from t5 order by id;
+id	sha1(val)
+1	0b35a3e0949353117c55151be416c64481dc9778
+2	0f5f3d3783159438eff81e6b3c8911480daf7eac
+3	7b48e60fd747fc37363da73d3140ba0a41ae862a
+4	ea7dffff542a062f6e41c69afac9576d7e97634c
+5	266d8973914802f093f698a58224566ca2a664bc
+6	4a8284d4be6c4c063a910760610c8754ca1234a3
+7	c1bd312a4dd67884e66d15671d38c854e99c8021
+8	d8ff0788ec90b18f9d51ecad46274e75aaf4b99f
+9	139101d8480a9a68e4e1256ed300aad365725fbc
+10	NULL
+select * from t6 order by id;
+id	val
+1	1
+2	2
+3	3
+4	4
+5	5
+6	66
+7	7
+8	8
+9	9
+10	NULL
+select * from t7 order by id;
+id	val1	val2
+1	9	9
+2	8	8
+3	7	7
+4	6	6
+5	5	5
+6	4	4
+7	77	3
+8	2	2
+9	1	1
+10	10	NULL
+select id, sha1(val) from t8 order by id;
+id	sha1(val)
+1	025bd54db3f70cdac283a9653518c14f3d331602
+2	360252745cb517637959a9ba6cb7a789cf05fa98
+3	e315b8015984d48b3d1777787d8b629bd77454cf
+4	946a83f98e3f05c3d94f0c7f2e7131324245797c
+5	66f223928b25272f115396aa099fb38efbfe3885
+6	125d03fac5bb972ef45466e36d25fd219bf09b36
+7	cf47dcc87c1ca726f74a86a4aac57d453703facc
+8	61984ed58e8de9ab388e62b54ced499e7336e82e
+9	ac1bc0da10ddfceab57a04d09524ffde6eb83cf9
+10	NULL
+select * from t9 order by auto;
+auto	string	vstring	tiny	short	medium	long_int	longlong	real_float	real_double	real_decimal	utiny	ushort	umedium	ulong	ulonglong	bits	options	flags	date_field	year_field	time_field	date_time
+1	bbbb	bbbb	-22	-22	-22	-22	-22	22.2	22.2200	22.2200	22	00022	22	22	22		two	two	1922-02-22	1922	22:22:22	1922-02-22 22:22:22
+2	8888	8888	-8	-8	-8	-8	-8	8.8	8.8000	8.8000	8	00008	8	8	8	
	one	one	1988-08-08	1988	08:08:08	1988-08-08 08:08:08
+3	7777	7777	-7	-7	-7	-7	-7	7.7	7.7000	7.7000	7	00007	7	7	7	
	one	one	1977-07-07	1977	07:07:07	1977-07-07 07:07:07
+4	6666	6666	-6	-6	-6	-6	-6	6.6	6.6000	6.6000	6	00006	6	6	6	
	one	one	1966-06-06	1966	06:06:06	1966-06-06 06:06:06
+5	5555	5555	-5	-5	-5	-5	-5	5.5	5.5000	5.5000	5	00005	5	5	5	
	one	one	1955-05-05	1955	05:05:05	1955-05-05 05:05:05
+6	4444	4444	-4	-4	-4	-4	-4	4.4	4.4000	4.4000	4	00004	4	4	4	
	one	one	1944-04-04	1944	04:04:04	1944-04-04 04:04:04
+7	3333	3333	-3	-3	-3	-3	-3	3.3	3.3000	3.3000	3	00003	3	3	3	
	one	one	1933-03-03	1933	03:03:03	1933-03-03 03:03:03
+8	2222	2222	-2	-2	-2	-2	-2	2.2	2.2000	2.2000	2	00002	2	2	2	
	one	one	1922-02-02	1922	02:02:02	1922-02-02 02:02:02
+9	1111	1111	-1	-1	-1	-1	-1	1.1	1.1000	1.1000	1	00001	1	1	1	
	one	one	1911-01-01	1911	01:01:01	1911-01-01 01:01:01
+10	NULL	NULL	10	10	10	10	10	10.1	NULL	NULL	10	00010	10	10	10	NULL	two	two	NULL	NULL	NULL	NULL
+"Drop tables after backup completes"
+Case 2: single-threaded snapshotstart backup + single-threaded restore
+"Create tables for backup"
+Warnings:
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Specifying number of digits for floating point data types is deprecated and will be removed in a future release.
+Warning	1681	Specifying number of digits for floating point data types is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	The ZEROFILL attribute is deprecated and will be removed in a future release. Use the LPAD function to zero-pad numbers, or store the formatted numbers in a CHAR column.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+Warning	1681	Integer display width is deprecated and will be removed in a future release.
+
+Starting SNAPSHOTSTART backup
+Backup started
+"Update tables during backup"
+
+"Wait for backup to complete"
+Waiting for backup to complete
+Backup completed
+"Drop tables after backup completes"
+"Restoring metadata"
+"Restoring backup on node 1"
+"Restoring backup on node 2"
+"Print restored rows"
+use test;
+select * from t0 order by id;
+id	val
+1	1
+2	2
+3	3
+4	4
+5	5
+6	6
+7	7
+8	8
+9	9
+10	NULL
+select * from t1 order by val;
+val
+NULL
+1
+2
+3
+4
+5
+6
+7
+8
+9
+select * from t2 order by id;
+id
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+select * from t3 order by id;
+id	val
+1	9
+2	8
+3	7
+4	6
+5	5
+6	4
+7	3
+8	2
+9	1
+10	NULL
+select * from t4 order by id;
+id	val
+1	11001
+2	11001
+3	11001
+4	11001
+5	11001
+6	11001
+7	11001
+8	11001
+9	11001
+10	11001
+select id, sha1(val) from t5 order by id;
+id	sha1(val)
+1	0b35a3e0949353117c55151be416c64481dc9778
+2	0f5f3d3783159438eff81e6b3c8911480daf7eac
+3	7b48e60fd747fc37363da73d3140ba0a41ae862a
+4	ea7dffff542a062f6e41c69afac9576d7e97634c
+5	8a96558c6361531c5f387582e5f6cd732332262b
+6	4a8284d4be6c4c063a910760610c8754ca1234a3
+7	c1bd312a4dd67884e66d15671d38c854e99c8021
+8	d8ff0788ec90b18f9d51ecad46274e75aaf4b99f
+9	139101d8480a9a68e4e1256ed300aad365725fbc
+10	NULL
+select * from t6 order by id;
+id	val
+1	1
+2	2
+3	3
+4	4
+5	5
+6	6
+7	7
+8	8
+9	9
+10	NULL
+select * from t7 order by id;
+id	val1	val2
+1	9	9
+2	8	8
+3	7	7
+4	6	6
+5	5	5
+6	4	4
+7	3	3
+8	2	2
+9	1	1
+10	10	NULL
+select id, sha1(val) from t8 order by id;
+id	sha1(val)
+1	025bd54db3f70cdac283a9653518c14f3d331602
+2	360252745cb517637959a9ba6cb7a789cf05fa98
+3	e315b8015984d48b3d1777787d8b629bd77454cf
+4	946a83f98e3f05c3d94f0c7f2e7131324245797c
+5	66f223928b25272f115396aa099fb38efbfe3885
+6	125d03fac5bb972ef45466e36d25fd219bf09b36
+7	cf47dcc87c1ca726f74a86a4aac57d453703facc
+8	f8f5538687ac9a4294a44de553d46dd798524504
+9	ac1bc0da10ddfceab57a04d09524ffde6eb83cf9
+10	NULL
+select * from t9 order by auto;
+auto	string	vstring	tiny	short	medium	long_int	longlong	real_float	real_double	real_decimal	utiny	ushort	umedium	ulong	ulonglong	bits	options	flags	date_field	year_field	time_field	date_time
+1	9999	9999	-9	-9	-9	-9	-9	9.9	9.9000	9.9000	9	00009	9	9	9	
	one	one	1999-09-09	1999	09:09:09	1999-09-09 09:09:09
+2	8888	8888	-8	-8	-8	-8	-8	8.8	8.8000	8.8000	8	00008	8	8	8	
	one	one	1988-08-08	1988	08:08:08	1988-08-08 08:08:08
+3	7777	7777	-7	-7	-7	-7	-7	7.7	7.7000	7.7000	7	00007	7	7	7	
	one	one	1977-07-07	1977	07:07:07	1977-07-07 07:07:07
+4	6666	6666	-6	-6	-6	-6	-6	6.6	6.6000	6.6000	6	00006	6	6	6	
	one	one	1966-06-06	1966	06:06:06	1966-06-06 06:06:06
+5	5555	5555	-5	-5	-5	-5	-5	5.5	5.5000	5.5000	5	00005	5	5	5	
	one	one	1955-05-05	1955	05:05:05	1955-05-05 05:05:05
+6	4444	4444	-4	-4	-4	-4	-4	4.4	4.4000	4.4000	4	00004	4	4	4	
	one	one	1944-04-04	1944	04:04:04	1944-04-04 04:04:04
+7	3333	3333	-3	-3	-3	-3	-3	3.3	3.3000	3.3000	3	00003	3	3	3	
	one	one	1933-03-03	1933	03:03:03	1933-03-03 03:03:03
+8	2222	2222	-2	-2	-2	-2	-2	2.2	2.2000	2.2000	2	00002	2	2	2	
	one	one	1922-02-02	1922	02:02:02	1922-02-02 02:02:02
+9	1111	1111	-1	-1	-1	-1	-1	1.1	1.1000	1.1000	1	00001	1	1	1	
	one	one	1911-01-01	1911	01:01:01	1911-01-01 01:01:01
+10	NULL	NULL	10	10	10	10	10	10.1	NULL	NULL	10	00010	10	10	10	NULL	two	two	NULL	NULL	NULL	NULL
+"Drop tables after backup completes"
+Case 3: start backup wait completed
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_transaction_memory_shortage_dbacc.result mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_transaction_memory_shortage_dbacc.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_transaction_memory_shortage_dbacc.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_transaction_memory_shortage_dbacc.result	2021-09-28 11:46:34.000000000 +0000
@@ -25,212 +25,12 @@
 show warnings;
 Level	Code	Message
 Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
 Error	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDBCLUSTER
 update t1 set b = d, d = d + c * 1000;
 mysql_errno 1297
 show warnings;
 Level	Code	Message
 Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
 Error	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDBCLUSTER
 mysql_errno 0
 delete from t1 where a = 2222 and b = 1;
@@ -238,666 +38,66 @@
 show warnings;
 Level	Code	Message
 Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
+Error	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDBCLUSTER
+mysql_errno 0
+delete from t1 where d = 3333;
+mysql_errno 1297
+show warnings;
+Level	Code	Message
 Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
+Error	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDBCLUSTER
+mysql_errno 0
+delete from t1 where c = 2;
+mysql_errno 1297
+show warnings;
+Level	Code	Message
 Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
+Error	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDBCLUSTER
+mysql_errno 0
+delete from t0 where c = 3;
+mysql_errno 0
+show warnings;
+Level	Code	Message
+mysql_errno 0
+delete from t0;
+mysql_errno 1297
+show warnings;
+Level	Code	Message
 Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
 Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Error	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDBCLUSTER
-mysql_errno 0
-delete from t1 where d = 3333;
-mysql_errno 1297
-show warnings;
-Level	Code	Message
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Error	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDBCLUSTER
-mysql_errno 0
-delete from t1 where c = 2;
-mysql_errno 1297
-show warnings;
-Level	Code	Message
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Error	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDBCLUSTER
-mysql_errno 0
-delete from t0 where c = 3;
-mysql_errno 0
-show warnings;
-Level	Code	Message
-mysql_errno 0
-delete from t0;
-mysql_errno 1297
-show warnings;
-Level	Code	Message
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDB
-Error	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDBCLUSTER
-mysql_errno 0
-Sending dump signal with data:
-0x00000968 0x00000001 
-Sending dump signal with data:
-0x00000968 0x00000001 
-
-delete from t0;
-set @pool = @pool - 1;
-insert into t0 (c) values (1),(2),(3),(4);
-=== Make DBACC pool 0 out of memory ===
-Sending dump signal with data:
-0x00000967 0x00000000 0x00000000 
-Sending dump signal with data:
-0x00000967 0x00000000 0x00000000 
-
-insert into t1 select x1.n+x2.n*10+x3.n*100, 1, 1+(x1.n+x2.n+x3.n) MOD 3, 1+x1.n+x2.n*10+x3.n*100 from num as x1, num as x2, num as x3;
-mysql_errno 1297
-show warnings;
-Level	Code	Message
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Error	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDBCLUSTER
-update t1 set b = d, d = d + c * 1000;
-mysql_errno 1297
-show warnings;
-Level	Code	Message
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Error	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDBCLUSTER
-mysql_errno 0
-delete from t1 where a = 2222 and b = 1;
-mysql_errno 1297
-show warnings;
-Level	Code	Message
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
+Error	1297	Got temporary error 1217 'Out of operation records in local data manager (increase SharedGlobalMemory)' from NDBCLUSTER
+mysql_errno 0
+Sending dump signal with data:
+0x00000968 0x00000001 
+Sending dump signal with data:
+0x00000968 0x00000001 
+
+delete from t0;
+set @pool = @pool - 1;
+insert into t0 (c) values (1),(2),(3),(4);
+=== Make DBACC pool 0 out of memory ===
+Sending dump signal with data:
+0x00000967 0x00000000 0x00000000 
+Sending dump signal with data:
+0x00000967 0x00000000 0x00000000 
+
+insert into t1 select x1.n+x2.n*10+x3.n*100, 1, 1+(x1.n+x2.n+x3.n) MOD 3, 1+x1.n+x2.n*10+x3.n*100 from num as x1, num as x2, num as x3;
+mysql_errno 1297
+show warnings;
+Level	Code	Message
 Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
+Error	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDBCLUSTER
+update t1 set b = d, d = d + c * 1000;
+mysql_errno 1297
+show warnings;
+Level	Code	Message
 Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
+Error	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDBCLUSTER
+mysql_errno 0
+delete from t1 where a = 2222 and b = 1;
+mysql_errno 1297
+show warnings;
+Level	Code	Message
 Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
 Error	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDBCLUSTER
 mysql_errno 0
@@ -906,106 +106,6 @@
 show warnings;
 Level	Code	Message
 Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
 Error	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDBCLUSTER
 mysql_errno 0
 delete from t1 where c = 2;
@@ -1013,106 +113,6 @@
 show warnings;
 Level	Code	Message
 Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
-Warning	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDB
 Error	1297	Got temporary error 926 'Out of transaction memory in local data manager, acc scan operation (increase SharedGlobalMemory)' from NDBCLUSTER
 mysql_errno 0
 delete from t0 where c = 3;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_update.result mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_update.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ndb_update.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ndb_update.result	2021-09-28 11:46:34.000000000 +0000
@@ -1,6 +1,3 @@
-DROP TABLE IF EXISTS t1;
-DROP TABLE IF EXISTS t2;
-DROP TABLE IF EXISTS t3;
 CREATE TABLE t1 (
 pk1 INT NOT NULL PRIMARY KEY,
 b INT NOT NULL,
@@ -125,3 +122,22 @@
 4	goodbye
 DROP TABLE IF EXISTS t1;
 End of 5.1 tests
+CREATE TABLE t1 (
+a INT PRIMARY KEY,
+b INT,
+UNIQUE (b)
+) ENGINE NDB;
+INSERT INTO t1 VALUES (1,1);
+INSERT INTO t1 SELECT a+1, b+1 FROM t1;
+INSERT INTO t1 SELECT a+2, b+2 FROM t1;
+INSERT INTO t1 SELECT a+4, b+4 FROM t1;
+INSERT INTO t1 SELECT a+8, b+8 FROM t1;
+INSERT INTO t1 SELECT a+16, b+16 FROM t1;
+INSERT INTO t1 SELECT a+32, b+32 FROM t1;
+BEGIN;
+UPDATE t1 SET b=b+10;
+ERROR 23000: Duplicate entry '<duplicate entry>' for key 't1.b'
+BEGIN;
+UPDATE t1 SET b=b+10 LIMIT 20;
+ERROR 23000: Duplicate entry '<duplicate entry>' for key 't1.b'
+DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ps_7ndb.result mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ps_7ndb.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/r/ps_7ndb.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/r/ps_7ndb.result	2021-09-28 11:46:34.000000000 +0000
@@ -782,8 +782,6 @@
     c13 = (select MAX(b) from t1 where a = ?) and c22 = ? ' ;
 execute stmt1 using @arg01, @arg02;
 c4
-Warnings:
-Warning	1292	Truncated incorrect DOUBLE value: 'two'
 prepare stmt1 from ' select a, b FROM t1 outer_table where
    a = (select a from t1 where b = outer_table.b ) order by a ';
 execute stmt1 ;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/t/concurrent_grants.test mysql-8.0-8.0.27/mysql-test/suite/ndb/t/concurrent_grants.test
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/t/concurrent_grants.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/t/concurrent_grants.test	2021-09-28 11:46:34.000000000 +0000
@@ -8,7 +8,7 @@
 # ACL changes are executed *without* holding the Global Schema lock,
 # but the locking inside Ndb_schema_dist_client::acl_notify() serializes
 # ACL changes on a single server, and each server has a distinct name that
-# is used part of the primary key in ndb_schema.
+# is used as part of the primary key in ndb_schema.
 #
 
 #
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_alter_table_copy_check.inc mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_alter_table_copy_check.inc
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_alter_table_copy_check.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_alter_table_copy_check.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,46 @@
+# Include file for testing that concurrent alter changes are/are not
+# detected.
+# Inputs :
+#   $alter_statement
+#   $expected_alter_error
+#   $other_statement
+#   $expected_other_error
+#
+--echo Checking copying alter $alter_statement
+--echo   concurrent with $other_statement 
+--echo   has alter error $expected_alter_error
+--echo   and statement error $expected_other_error
+
+--connection server1
+
+# See ha_ndbcluster.cc for definition of this sync point
+# Get sync point to signal 'alter_waiting' and wait for signal 'alter_go'
+set DEBUG_SYNC= 'ndb.before_commit_count_check SIGNAL alter_waiting WAIT_FOR alter_go';
+
+--send_eval $alter_statement
+
+--connection server1con2
+
+#--echo Waiting for ALTER to stall
+# wait for alter_waiting
+set DEBUG_SYNC= 'now WAIT_FOR alter_waiting';
+#--echo Alter stalled
+
+--connection server2
+#--echo Executing concurrent query
+--error $expected_other_error
+--eval $other_statement
+
+--connection server1con2
+#--echo Resuming alter
+# signal 'alter_go' to resume the alter
+set DEBUG_SYNC= 'now SIGNAL alter_go';
+
+--connection server1
+#--echo Checking result
+
+--error $expected_alter_error
+--reap
+
+set DEBUG_SYNC='RESET';
+
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_alter_table_copy_check.test mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_alter_table_copy_check.test
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_alter_table_copy_check.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_alter_table_copy_check.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,366 @@
+-- source include/have_multi_ndb.inc
+-- source include/have_debug_sync.inc
+
+--echo Create an extra connection to server1
+connect (server1con2,127.0.0.1,root,,test,$MASTER_MYPORT,);
+
+--connection server1
+
+--echo Show that copying alter has some ability to detect when concurrent
+--echo changes are occuring to a source table as part of an alter.
+--echo This causes the alter to fail, avoiding silent data loss/corruption.
+--echo Concurrent modifications are made on a separate MySQLD to avoid
+--echo MDL effects.
+--echo Also show that harmless read-only references to the base table 
+--echo succeed and do not cause the ALTER to fail
+
+use test;
+create table cambridge (a int primary key, b int, c int, d int) engine=ndb;
+insert into cambridge values (1,1,1,1), (2,2,2,2), (3,3,3,3), (4,4,4,4), (5,5,5,5);
+
+create table oxford(a int primary key, b int, c text, d int) engine=ndb;
+insert into oxford values 
+  (1,1,repeat('B', 1000), 1),
+  (2,2,repeat('B', 1000), 2),
+  (3,3,repeat('B', 1000), 3),
+  (4,4,repeat('B', 1000), 4),
+  (5,5,repeat('B', 1000), 5);
+
+
+--echo -------------------------------------------------------
+--echo Test various concurrent modifications that should cause
+--echo copy failure for a copying alter drop column.
+--echo -------------------------------------------------------
+
+
+let alter_statement=ALTER TABLE test.cambridge drop column d;
+let other_statement=UPDATE test.cambridge set c=c+1; # scanning
+let expected_alter_error=ER_TABLE_DEF_CHANGED;
+let expected_other_error=0;
+-- source suite/ndb/t/ndb_alter_table_copy_check.inc
+
+let alter_statement=ALTER TABLE test.cambridge drop column d;
+let other_statement=UPDATE test.cambridge set c=20 where a=2; # by pk
+let expected_alter_error=ER_TABLE_DEF_CHANGED;
+let expected_other_error=0;
+-- source suite/ndb/t/ndb_alter_table_copy_check.inc
+
+let alter_statement=ALTER TABLE test.cambridge drop column d;
+let other_statement=INSERT into test.cambridge values (6,6,6,6);
+let expected_alter_error=ER_TABLE_DEF_CHANGED;
+let expected_other_error=0;
+-- source suite/ndb/t/ndb_alter_table_copy_check.inc
+
+let alter_statement=ALTER TABLE test.cambridge drop column d;
+let other_statement=DELETE from test.cambridge where a=1;
+let expected_alter_error=ER_TABLE_DEF_CHANGED;
+let expected_other_error=0;
+-- source suite/ndb/t/ndb_alter_table_copy_check.inc
+
+--echo -------------------------------------------------------
+--echo Test various concurrent modifications that should cause
+--echo copy failure for a copying pk change
+--echo -------------------------------------------------------
+
+let alter_statement=ALTER TABLE test.cambridge drop primary key;
+let other_statement=UPDATE test.cambridge set c=c+1; # scanning
+let expected_alter_error=ER_TABLE_DEF_CHANGED;
+let expected_other_error=0;
+-- source suite/ndb/t/ndb_alter_table_copy_check.inc
+
+
+--echo --------------------------
+--echo FK cascading modifications
+--echo --------------------------
+--echo Ndb maintains inter-table FKs in the kernel, so that
+--echo changes in a different table can affect a table
+--echo undergoing a copying alter
+
+update cambridge set b=a;
+alter table cambridge add unique(b);
+
+# Setup FK via secondary keys allowing cascading update + delete...
+create table bristol
+  (a int primary key, b int, c int, 
+   foreign key (b) references cambridge (b) on update cascade on delete cascade)
+  engine=ndb;
+
+insert into bristol values (2,2,2), (3,3,3), (4,4,4), (5,5,5);
+
+# Check that cascading FK update op causes child alter to fail
+
+let alter_statement=ALTER TABLE test.bristol drop column c;
+let other_statement=UPDATE test.cambridge set b=50 where a=5; 
+let expected_alter_error=ER_TABLE_DEF_CHANGED;
+let expected_other_error=0;
+-- source suite/ndb/t/ndb_alter_table_copy_check.inc
+
+# Check that cascading FK delete op causes child alter to fail
+
+let alter_statement=ALTER TABLE test.bristol drop column c;
+let other_statement=DELETE from test.cambridge where a=5;
+let expected_alter_error=ER_TABLE_DEF_CHANGED;
+let expected_other_error=0;
+-- source suite/ndb/t/ndb_alter_table_copy_check.inc
+
+
+drop table bristol;
+
+
+# TODO : More copying alters...
+# Partitioning, 
+
+--echo -----
+--echo Blobs
+--echo -----
+
+# A more interesting test would use NdbApi to update only the
+# parts rows of a blob, and check that this is treated as
+# a main table update.
+# MySQLD currently always overwrites the whole value
+
+let alter_statement=ALTER TABLE test.oxford drop column d;
+let other_statement=UPDATE test.oxford SET c=REPEAT('E',1000);
+let expected_alter_error=ER_TABLE_DEF_CHANGED;
+let expected_other_error=0;
+-- source suite/ndb/t/ndb_alter_table_copy_check.inc
+
+
+--echo -------------------------------------------------------
+--echo Test various concurrent operations that should not cause
+--echo copy failure for a copying alter drop column.
+--echo -------------------------------------------------------
+
+--echo Scanning SELECTs
+
+let alter_statement=ALTER TABLE test.cambridge drop column d;
+let other_statement=SELECT a,b from test.cambridge order by a;
+let expected_alter_error=0;
+let expected_other_error=0;
+-- source suite/ndb/t/ndb_alter_table_copy_check.inc
+alter table test.cambridge add column d int;
+
+let alter_statement=ALTER TABLE test.cambridge drop column d;
+let other_statement=SELECT a,b from test.cambridge order by a lock in share mode;
+let expected_alter_error=0;
+let expected_other_error=0;
+-- source suite/ndb/t/ndb_alter_table_copy_check.inc
+alter table test.cambridge add column d int;
+
+let alter_statement=ALTER TABLE test.cambridge drop column d;
+let other_statement=SELECT a,b from test.cambridge order by a for update;
+let expected_alter_error=0;
+let expected_other_error=0;
+-- source suite/ndb/t/ndb_alter_table_copy_check.inc
+alter table test.cambridge add column d int;
+
+let alter_statement=ALTER TABLE test.oxford drop column d;
+let other_statement=SELECT a,length(c) from test.oxford order by a;
+let expected_alter_error=0;
+let expected_other_error=0;
+-- source suite/ndb/t/ndb_alter_table_copy_check.inc
+alter table test.oxford add column d int;
+
+let alter_statement=ALTER TABLE test.oxford drop column d;
+let other_statement=SELECT a,length(c) from test.oxford order by a lock in share mode;
+let expected_alter_error=0;
+let expected_other_error=0;
+-- source suite/ndb/t/ndb_alter_table_copy_check.inc
+alter table test.oxford add column d int;
+
+let alter_statement=ALTER TABLE test.oxford drop column d;
+let other_statement=SELECT a,length(c) from test.oxford order by a for update;
+let expected_alter_error=0;
+let expected_other_error=0;
+-- source suite/ndb/t/ndb_alter_table_copy_check.inc
+alter table test.oxford add column d int;
+
+--echo SELECT by PK
+
+let alter_statement=ALTER TABLE test.cambridge drop column d;
+let other_statement=SELECT a,b from test.cambridge where a=3;
+let expected_alter_error=0;
+let expected_other_error=0;
+-- source suite/ndb/t/ndb_alter_table_copy_check.inc
+alter table test.cambridge add column d int;
+
+let alter_statement=ALTER TABLE test.cambridge drop column d;
+let other_statement=SELECT a,b from test.cambridge where a=3 lock in share mode;
+let expected_alter_error=0;
+let expected_other_error=0;
+-- source suite/ndb/t/ndb_alter_table_copy_check.inc
+alter table test.cambridge add column d int;
+
+let alter_statement=ALTER TABLE test.cambridge drop column d;
+let other_statement=SELECT a,b from test.cambridge where a=3 for update;
+let expected_alter_error=0;
+let expected_other_error=0;
+-- source suite/ndb/t/ndb_alter_table_copy_check.inc
+alter table test.cambridge add column d int;
+
+let alter_statement=ALTER TABLE test.oxford drop column d;
+let other_statement=SELECT a,length(c) from test.oxford where a=3;
+let expected_alter_error=0;
+let expected_other_error=0;
+-- source suite/ndb/t/ndb_alter_table_copy_check.inc
+alter table test.oxford add column d int;
+
+let alter_statement=ALTER TABLE test.oxford drop column d;
+let other_statement=SELECT a,length(c) from test.oxford where a=3 lock in share mode;
+let expected_alter_error=0;
+let expected_other_error=0;
+-- source suite/ndb/t/ndb_alter_table_copy_check.inc
+alter table test.oxford add column d int;
+
+let alter_statement=ALTER TABLE test.oxford drop column d;
+let other_statement=SELECT a,length(c) from test.oxford where a=3 for update;
+let expected_alter_error=0;
+let expected_other_error=0;
+-- source suite/ndb/t/ndb_alter_table_copy_check.inc
+alter table test.oxford add column d int;
+
+
+--echo NULL effect modifications
+
+let alter_statement=ALTER TABLE test.cambridge drop column d;
+let other_statement=INSERT into test.cambridge values (2,2,2,2); # PK clash
+let expected_alter_error=0;
+let expected_other_error=ER_DUP_ENTRY;
+-- source suite/ndb/t/ndb_alter_table_copy_check.inc
+alter table test.cambridge add column d int;
+
+let alter_statement=ALTER TABLE test.cambridge drop column d;
+let other_statement=UPDATE test.cambridge set b=888 where a=888; # Null change
+let expected_alter_error=0;
+let expected_other_error=0;
+-- source suite/ndb/t/ndb_alter_table_copy_check.inc
+alter table test.cambridge add column d int;
+
+let alter_statement=ALTER TABLE test.cambridge drop column d;
+let other_statement=UPDATE test.cambridge set b=b; # Null change
+let expected_alter_error=0;
+let expected_other_error=0;
+-- source suite/ndb/t/ndb_alter_table_copy_check.inc
+alter table test.cambridge add column d int;
+
+let alter_statement=ALTER TABLE test.cambridge drop column d;
+let other_statement=DELETE from test.cambridge where a=888; # No such row
+let expected_alter_error=0;
+let expected_other_error=0;
+-- source suite/ndb/t/ndb_alter_table_copy_check.inc
+alter table test.cambridge add column d int;
+
+let alter_statement=ALTER TABLE test.oxford drop column d;
+let other_statement=INSERT into test.oxford values (2,2,repeat('A', 1000),2); # PK clash
+let expected_alter_error=0;
+let expected_other_error=ER_DUP_ENTRY;
+-- source suite/ndb/t/ndb_alter_table_copy_check.inc
+alter table test.oxford add column d int;
+
+let alter_statement=ALTER TABLE test.oxford drop column d;
+let other_statement=UPDATE test.oxford set b=888 where a=888; # Null change
+let expected_alter_error=0;
+let expected_other_error=0;
+-- source suite/ndb/t/ndb_alter_table_copy_check.inc
+alter table test.oxford add column d int;
+
+let alter_statement=ALTER TABLE test.oxford drop column d;
+let other_statement=UPDATE test.oxford set c=c; # Null change
+let expected_alter_error=0;
+let expected_other_error=0;
+-- source suite/ndb/t/ndb_alter_table_copy_check.inc
+alter table test.oxford add column d int;
+
+let alter_statement=ALTER TABLE test.oxford drop column d;
+let other_statement=DELETE from test.oxford where a=888; # No such row
+let expected_alter_error=0;
+let expected_other_error=0;
+-- source suite/ndb/t/ndb_alter_table_copy_check.inc
+alter table test.oxford add column d int;
+
+--echo ------------------------------------------------
+--echo FK checks are unaffected by parent copying alter
+--echo ------------------------------------------------
+
+update cambridge set b=a;
+# Setup FK via secondary keys allowing cascading update + delete...
+create table bristol
+  (a int primary key, b int, c int, 
+   foreign key (b) references cambridge (b) on update cascade on delete cascade)
+  engine=ndb;
+
+select a from cambridge order by a;
+
+insert into bristol select a,a,a from cambridge;
+
+# Add new child row
+let alter_statement=ALTER TABLE test.cambridge drop column d;
+let other_statement=INSERT INTO test.bristol values (40,4,40);
+let expected_alter_error=0;
+let expected_other_error=0;
+-- source suite/ndb/t/ndb_alter_table_copy_check.inc
+alter table test.cambridge add column d int;
+
+# Update child to refer to different parent row
+let alter_statement=ALTER TABLE test.cambridge drop column d;
+let other_statement=UPDATE test.bristol set b=4 where b=2;
+let expected_alter_error=0;
+let expected_other_error=0;
+-- source suite/ndb/t/ndb_alter_table_copy_check.inc
+alter table test.cambridge add column d int;
+
+# Delete child row(s)
+let alter_statement=ALTER TABLE test.cambridge drop column d;
+let other_statement=DELETE FROM test.bristol;
+let expected_alter_error=0;
+let expected_other_error=0;
+-- source suite/ndb/t/ndb_alter_table_copy_check.inc
+alter table test.cambridge add column d int;
+
+drop table bristol;
+
+--echo ---------------------------------------------------------
+--echo Show post-check exposure in copying alter check mechanism
+--echo ---------------------------------------------------------
+--echo Existing rows :
+update cambridge set c=a;
+select a,c from cambridge order by a;
+
+set DEBUG_SYNC= 'ndb.after_commit_count_check SIGNAL alter_waiting WAIT_FOR alter_go';
+
+--send ALTER TABLE cambridge drop column d;
+
+--connection server1con2
+set DEBUG_SYNC= 'now WAIT_FOR alter_waiting';
+
+--connection server2
+# Perform insert, update, delete
+insert into test.cambridge values 
+  (20,20,20,20),
+  (21,21,21,21),
+  (22,22,22,22),
+  (23,23,23,23);
+
+update test.cambridge set c=1000;
+delete from test.cambridge where a=6;
+
+--echo Committed table content :  
+select a,c from test.cambridge order by a;
+
+--connection server1con2
+set DEBUG_SYNC= 'now SIGNAL alter_go';
+
+--connection server1
+# Expect error-free ALTER table
+--reap
+
+--echo Committed table content after ALTER
+--echo Changes have been lost
+select a,c from test.cambridge order by a;
+
+set DEBUG_SYNC='RESET';
+
+# TODO NdbAPI
+
+drop table oxford;
+drop table cambridge;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_config.test mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_config.test
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_config.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_config.test	2021-09-28 11:46:34.000000000 +0000
@@ -126,3 +126,6 @@
 --replace_regex /.*\[ndb_config\]//
 --error 255
 --exec $NDB_CONFIG_EXE --defaults-group-suffix=.bug32258207 --defaults-file=$MYSQL_TEST_DIR/suite/ndb/ndb_config_mycnf1.cnf --mycnf 2>&1
+
+echo == 29 == Bug32871875;
+--exec $NDB_CONFIG_EXE --defaults-group-suffix=.bug32871875 --defaults-file=$MYSQL_TEST_DIR/suite/ndb/ndb_config_mycnf1.cnf --query=nodeid,host,AutomaticThreadConfig,CompressedLCP --type=ndbd --mycnf 2> /dev/null
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_connectstring.test mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_connectstring.test
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_connectstring.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_connectstring.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,9 @@
+source include/have_ndb.inc;
+
+echo NDB_MGM "1.2.3.4:2;bind-address=192.0.2.0,host=2.3.4.2;bind-address=192.0.2.2" -eshow --connect-retries=1;
+error 255;
+exec $NDB_MGM "1.2.3.4:2;bind-address=192.0.2.0,host=2.3.4.2;bind-address=192.0.2.2" -eshow --connect-retries=1;
+
+echo NDB_MGM "nodeid=17,bind-address=192.0.2.3:4444,[2001:db8::1]:2,host=ndb.example:2222;bind-address=192.0.2.2:1" -eshow --connect-retries=1;
+error 255;
+exec $NDB_MGM "nodeid=17,bind-address=192.0.2.3:4444,[2001:db8::1]:2,host=ndb.example:2222;bind-address=192.0.2.2:1" -eshow --connect-retries=1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_create_stored_user.test mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_create_stored_user.test
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_create_stored_user.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_create_stored_user.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,32 @@
+--source include/have_ndb.inc
+
+#
+# Bug#32424653 PARALLEL 'CREATE USER' HANGS ON BOTH MYSQLDS
+#
+--disable_result_log
+--connect(s1,127.0.0.1,root,,test,$MASTER_MYPORT,)
+--connect(s2,127.0.0.1,root,,test,$MASTER_MYPORT1,)
+
+--connection s2
+call mtr.add_suppression("did not acquire snapshot lock");
+
+--connection s1
+call mtr.add_suppression("did not acquire snapshot lock");
+
+--connection s1
+CREATE USER IF NOT EXISTS "tx"@"localhost";
+send GRANT NDB_STORED_USER ON *.* TO "tx"@"localhost";
+
+--connection s2
+CREATE USER IF NOT EXISTS "tx"@"localhost";
+GRANT NDB_STORED_USER ON *.* TO "tx"@"localhost";
+
+--connection s1
+--reap
+
+SLEEP 1;
+DROP USER "tx"@"localhost";
+
+--disconnect s1
+--disconnect s2
+--enable_result_log
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_err4012.cnf mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_err4012.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_err4012.cnf	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_err4012.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -3,3 +3,10 @@
 [mysqld]
 # Turn off auto sync so it doesn't interfere with the test
 ndb_metadata_check = false
+
+# Test causes transaction timeout using an error insert.
+# Auto index stats runs into this and thus causes the
+# test to hang
+[cluster_config]
+IndexStatAutoCreate=0
+IndexStatAutoUpdate=0
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_errinsert.cnf mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_errinsert.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_errinsert.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_errinsert.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,7 @@
+!include suite/ndb/my.cnf
+
+[cluster_config]
+# Disable auto create index stats. This is required to
+# ensure that the test checks that PREPARE_SEIZE_ERROR
+# is mapped to error 748
+IndexStatAutoCreate=0
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_fk_restore.test mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_fk_restore.test
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_fk_restore.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_fk_restore.test	2021-09-28 11:46:34.000000000 +0000
@@ -211,5 +211,84 @@
 drop database db1;
 drop database db2;
 
+--echo # Bug#26974491 FIXES DATA RESTORE WITH DISABLE INDEXES
+create database db3;
+use db3;
+create table t4 (
+  id int primary key auto_increment
+) engine=ndb;
+create table t5 (
+  id int primary key auto_increment,
+  val int,
+  constraint fkt3t2 foreign key (val) references t4 (id)
+)engine=ndb;
+insert into t4 values (1), (2), (3), (4), (5);
+insert into t5 values (1,1), (2,2), (3,3), (4,4), (5,5);
+
+-- echo # take backup and drop the tables
+-- source include/ndb_backup.inc
+drop table db3.t5, db3.t4;
+
+-- echo # Create more tables before restore in order to verify that ndb_restore restores foreign keys
+-- echo # appropriately even though the table ids of parent and child tables which make up the name
+-- echo # of the foreign key in the format, <parent_table_id>/<child_table_id>/fk_name are different
+-- echo # in backup files than the table ids restored.
+create table db3.t6 (
+  id int primary key auto_increment
+) engine=ndb;
+create table db3.t7 (
+  id int primary key auto_increment
+) engine=ndb;
+create table db3.t8 (
+  id int primary key auto_increment
+) engine=ndb;
+create table db3.t9 (
+  id int primary key auto_increment
+) engine=ndb;
+
+-- echo # Use case #1: Meta restore done with --disable-indexes (recommended)
+--exec $NDB_RESTORE --show-part-id -b $the_backup_id -n 1 --restore-meta --print_meta --disable-indexes $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT
+--exec $NDB_RESTORE --show-part-id -b $the_backup_id -n 1 --restore-data $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT
+--exec $NDB_RESTORE --show-part-id -b $the_backup_id -n 2 --restore-data $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT
+--exec $NDB_RESTORE --show-part-id -b $the_backup_id -n 2 --rebuild-indexes $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT
+
+-- echo # Drop the tables to retore them again with a different use case
+drop table db3.t5, db3.t4;
+
+-- echo # Use case #2: Separate --disable-indexes step after metadata restore
+--exec $NDB_RESTORE --show-part-id -b $the_backup_id -n 1 --restore-meta --print_meta $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT
+--exec $NDB_RESTORE --show-part-id -b $the_backup_id -n 1 --disable-indexes $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT
+--exec $NDB_RESTORE --show-part-id -b $the_backup_id -n 1 --restore-data --disable-indexes $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT
+--exec $NDB_RESTORE --show-part-id -b $the_backup_id -n 2 --restore-data --disable-indexes $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT
+--exec $NDB_RESTORE --show-part-id -b $the_backup_id -n 2 --rebuild-indexes $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT
+
+-- echo # Drop the tables to retore them again with a different use case
+drop table db3.t5, db3.t4;
+
+-- echo # Use case #3: Data restore with --disable-indexes
+--exec $NDB_RESTORE --show-part-id -b $the_backup_id -n 1 --restore-meta --print_meta $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT
+--exec $NDB_RESTORE --show-part-id -b $the_backup_id -n 1 --restore-data --disable-indexes $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT
+--exec $NDB_RESTORE --show-part-id -b $the_backup_id -n 2 --restore-data --disable-indexes $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT
+--exec $NDB_RESTORE --show-part-id -b $the_backup_id -n 2 --rebuild-indexes $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT
+
+-- echo # Drop the tables to retore them again with a different use case
+drop table db3.t5, db3.t4;
+
+-- echo # Use case #4: Data restore with --disable-indexes and Data restore with --rebuild-indexes
+--exec $NDB_RESTORE --show-part-id -b $the_backup_id -n 1 --restore-meta --print_meta $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT
+--exec $NDB_RESTORE --show-part-id -b $the_backup_id -n 1 --restore-data --disable-indexes $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT
+--exec $NDB_RESTORE --show-part-id -b $the_backup_id -n 2 --restore-data --rebuild-indexes $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT
+
+-- echo # Drop the tables to retore them again with a different use case
+drop table db3.t5, db3.t4;
+
+-- echo # Use case #5: Both metadata and data restore with both --disable-indexes and --rebuild-indexes
+--exec $NDB_RESTORE --show-part-id -b $the_backup_id -n 1 --restore-meta --restore-data --disable-indexes --rebuild-indexes $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT
+--exec $NDB_RESTORE --show-part-id -b $the_backup_id -n 2 --restore-data $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT
+
+--echo # cleanup
+drop table db3.t6, db3.t7, db3.t8, db3.t9;
+drop database db3;
+
 --source suite/ndb/include/backup_restore_cleanup.inc
 --remove_file $NDB_TOOLS_OUTPUT
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_fully_replicated_restart2.cnf mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_fully_replicated_restart2.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_fully_replicated_restart2.cnf	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_fully_replicated_restart2.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -1 +1,7 @@
 !include ndb_fully_replicated_restart.cnf
+
+# Test has a special error insert to check if reads are TC local.
+# Index stat system table reads aren't causing the test to fail
+[cluster_config]
+IndexStatAutoCreate=0
+IndexStatAutoUpdate=0
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_mgmd.test mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_mgmd.test
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_mgmd.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_mgmd.test	2021-09-28 11:46:34.000000000 +0000
@@ -53,4 +53,46 @@
 --let $assert_count= 1
 --source include/assert_grep.inc
 
+# To validate Mgmd throws warning when connectstring option is specified
+# when starting mgmd with -f or binary config.
+--echo #
+--echo # Bug32554779 DO NOT ACCEPT -C OPTION WHEN STARTING WITH -F OR
+--echo # BINARY CONFIG
+--echo #
+--error 1
+--exec $NDB_MGMD_EXE -f config.ini -c hostname --initial --nowait-nodes=0 > $dump_file 2>&1
+--echo # verify that mgmd throws warning when -c option is provided along with -f
+--let $assert_text= Do not accept -c option when starting with -f
+--let $assert_select= WARNING: --ndb-connectstring is ignored when mgmd is started with -f or config-file.
+--let $assert_file= $dump_file
+--let $assert_count= 1
+--source include/assert_grep.inc
+
+# To validate Mgmd gives error when -f is not specified
+--echo #
+--echo # Bug32554492 NDB_MGMD SHOULD REPORT ERROR WHEN STARTED
+--echo # WITHOUT -F AND BINARY CONFIG
+--echo #
+--error 1
+--exec $NDB_MGMD_EXE config.ini --initial > $dump_file 2>&1
+--echo # verify that mgmd throws error when -f is not specified
+--let $assert_text= Mgmd gives error when -f is not specifed
+--let $assert_select= ERROR: Unknown option - config.ini specified.
+--let $assert_file= $dump_file
+--let $assert_count= 1
+--source include/assert_grep.inc
+
+# Validates Mgmd gives error when relative path is specified for configdir
+--echo #
+--echo # Bug11755867 NDB_MGMD MISMATCH BETWEEN --CONFIGDIR AND DATADIR
+--echo #
+--error 1
+--exec $NDB_MGMD_EXE -f config.ini --initial --configdir=. > $dump_file 2>&1
+--echo # verify that mgmd throws error when --configdir=. is specified
+--let $assert_text= Mgmd gives error when relative path is specified for configdir
+--let $assert_select= ERROR: Relative path \('.'\) not supported for configdir, specify absolute path.
+--let $assert_file= $dump_file
+--let $assert_count= 1
+--source include/assert_grep.inc
+
 --remove_file $dump_file
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_mt_encrypted_backup.cnf mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_mt_encrypted_backup.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_mt_encrypted_backup.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_mt_encrypted_backup.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,2 @@
+!include ndb_mt_backup.cnf
+!include ../encrypted_backup.cnf
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_mt_encrypted_backup.test mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_mt_encrypted_backup.test
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_mt_encrypted_backup.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_mt_encrypted_backup.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1 @@
+source ndb_mt_backup.test;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_multi_mgmd.test mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_multi_mgmd.test
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_multi_mgmd.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_multi_mgmd.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,17 @@
+--source include/have_ndb.inc
+--source include/not_windows.inc
+
+##################################################################
+##
+## Test case for bug#32339789
+##  MESSAGE IS NOT PRINTED WHEN ONE MGMD IS WAITING FOR ANOTHER MGMD TO START
+##
+## This test case starts one mgmd node for a 2 mgmd cluster configuration to
+## check if proper message is displayed that all mgmd nodes should be started.
+## The started mgmd node is shutdown using mgm client.
+##
+
+--echo Bug32339789
+--replace_regex /MySQL Cluster Management Server.*/MySQL Cluster Management Server/ /.*\[MgmtSrvr\]//
+--exec $NDB_MGMD_EXE --defaults-group-suffix=.bug32339789 --defaults-file=$MYSQL_TEST_DIR/suite/ndb/ndb_config_mycnf1.cnf --configdir=$MYSQLTEST_VARDIR --ndb-nodeid=1 --mycnf 2>&1
+--exec $NDB_MGM -c localhost:6000 -e "shutdown" >/dev/null
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_partition_error.test mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_partition_error.test
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_partition_error.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_partition_error.test	2021-09-28 11:46:34.000000000 +0000
@@ -70,3 +70,58 @@
 --error ER_SAME_NAME_PARTITION_FIELD
 create table `t1` (`a` int, b int, primary key (a,b)) engine=ndb partition by key(`a`,`b`,`a`);
 
+--echo #
+--echo # Bug#32773358 CREATE TABLE PARTITION FUNCTION CLEANUP
+--echo #  - test LIST and RANGE partition setup during CREATE TABLE
+--echo #
+# LIST partition
+# Table with VALUES just within limits
+CREATE TABLE t1 ( id INT PRIMARY KEY) ENGINE=NDB
+  PARTITION BY LIST(id)
+    (PARTITION p0 VALUES IN (0),
+     PARTITION p1 VALUES IN (NULL), -- Will not create partition
+     PARTITION p2 VALUES IN (2147483647),
+     PARTITION p3 VALUES IN (-2147483648));
+INSERT INTO t1 VALUES(0);
+INSERT INTO t1 VALUES(2147483647);
+INSERT INTO t1 VALUES(-2147483648);
+DROP TABLE t1;
+# Exceed max limits
+--error ER_LIMITED_PART_RANGE
+CREATE TABLE t1 ( id INT PRIMARY KEY) ENGINE=NDB
+  PARTITION BY LIST(id)
+    (PARTITION p0 VALUES IN (0),
+     PARTITION p2 VALUES IN (2147483648));
+# Exceed min limits
+--error ER_LIMITED_PART_RANGE
+CREATE TABLE t1 ( id INT PRIMARY KEY) ENGINE=NDB
+  PARTITION BY LIST(id)
+    (PARTITION p0 VALUES IN (0),
+     PARTITION p2 VALUES IN (-2147483649));
+
+# RANGE partition
+# Table with VALUES just within limits
+CREATE TABLE t1 ( id INT PRIMARY KEY) ENGINE=NDB
+  PARTITION BY RANGE(id)
+    (PARTITION p1 VALUES LESS THAN (-2147483648),
+     PARTITION p2 VALUES LESS THAN (0),
+     PARTITION p3 VALUES LESS THAN (256),
+     PARTITION p4 VALUES LESS THAN (2147483646),
+     PARTITION p5 VALUES LESS THAN MAXVALUE);
+INSERT INTO t1 VALUES(-2147483648);
+INSERT INTO t1 VALUES(0);
+INSERT INTO t1 VALUES(256);
+INSERT INTO t1 VALUES(2147483647);
+DROP TABLE t1;
+# Exceed min limits
+--error ER_LIMITED_PART_RANGE
+CREATE TABLE t1 ( id INT PRIMARY KEY) ENGINE=NDB
+  PARTITION BY RANGE(id)
+    (PARTITION p1 VALUES LESS THAN (-2147483649),
+     PARTITION p2 VALUES LESS THAN MAXVALUE);
+# Exceed max limits
+--error ER_LIMITED_PART_RANGE
+CREATE TABLE t1 ( id INT PRIMARY KEY) ENGINE=NDB
+  PARTITION BY RANGE(id)
+    (PARTITION p1 VALUES LESS THAN (2147483647),
+     PARTITION p2 VALUES LESS THAN MAXVALUE);
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_print_backup_file.test mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_print_backup_file.test
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_print_backup_file.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_print_backup_file.test	2021-09-28 11:46:34.000000000 +0000
@@ -99,23 +99,32 @@
 --remove_file $dump_file
 
 --echo Verify that ndb_print_backup_file can be used to check LCP Data and CTL files individually
+# ByteOrder is masked until Bug#32470157 is fixed so that ndb_print_backup_file
+# tool works well with both little endian and big endian systems.
 
 --echo ndb_print_backup_file suite/ndb/backups/LCP/0/T22F0.ctl
+--replace_regex /ByteOrder: 0x\d{8}/ByteOrder: 0xXXXXXXXX/
 --exec $NDB_PRINT_BACKUP_FILE $NDB_SAVED_BACKUPS/LCP/0/T22F0.ctl
 
 --echo ndb_print_backup_file suite/ndb/backups/LCP/0/T10F0.Data
+--replace_regex /ByteOrder: 0x\d{8}/ByteOrder: 0xXXXXXXXX/
 --exec $NDB_PRINT_BACKUP_FILE $NDB_SAVED_BACKUPS/LCP/0/T10F0.Data
 
 --echo ndb_print_backup_file suite/ndb/backups/LCP/0/T19F0.ctl
+--replace_regex /ByteOrder: 0x\d{8}/ByteOrder: 0xXXXXXXXX/
 --exec $NDB_PRINT_BACKUP_FILE $NDB_SAVED_BACKUPS/LCP/0/T19F0.ctl
 
 --echo ndb_print_backup_file suite/ndb/backups/LCP/1/T22F0.Data
+--replace_regex /ByteOrder: 0x\d{8}/ByteOrder: 0xXXXXXXXX/
 --exec $NDB_PRINT_BACKUP_FILE $NDB_SAVED_BACKUPS/LCP/1/T22F0.Data
 
 
---echo Verify that ndb_print_backup_file can be used to check
---echo a set of LCP CTL + DATA files that will be used to restore a fragment
+# The following scenario is disabled until Bug#33053631 is fixed so that
+# ndb_print_backup_file fully handles backup or lcp files written on
+# systems with other byte order
 
---echo ndb_print_backup_file -c 0 -t 22 -f 0 --print-restored-rows
---exec cd $NDB_SAVED_BACKUPS/LCP && $NDB_PRINT_BACKUP_FILE -c 0 -t 22 -f 0 --print-restored-rows
+#--echo Verify that ndb_print_backup_file can be used to check
+#--echo a set of LCP CTL + DATA files that will be used to restore a fragment
 
+#--echo ndb_print_backup_file -c 0 -t 22 -f 0 --print-restored-rows
+#--exec cd $NDB_SAVED_BACKUPS/LCP && $NDB_PRINT_BACKUP_FILE -c 0 -t 22 -f 0 --print-restored-rows
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_read_local.cnf mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_read_local.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_read_local.cnf	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_read_local.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -7,6 +7,11 @@
 mysqld=,
 ndbapi=,,,,,,,,,,,
 
+# Test has a special error insert to check if reads are TC local.
+# Index stat system table reads aren't causing the test to fail
+IndexStatAutoCreate=0
+IndexStatAutoUpdate=0
+
 [cluster_config.ndbd.3.1]
 Nodegroup=65536
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_restore_indexbuild.cnf mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_restore_indexbuild.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_restore_indexbuild.cnf	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_restore_indexbuild.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -1,8 +1,7 @@
 !include suite/ndb/my.cnf
 
 [cluster_config.1]
-#DataMemory=300M
-#IndexMemory=30M
+DataMemory=100M
 NoOfFragmentLogFiles=16
 BuildIndexThreads=8
 TwoPassInitialNodeRestartCopy=1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_restore_schema_tolerance.test mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_restore_schema_tolerance.test
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_restore_schema_tolerance.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_restore_schema_tolerance.test	2021-09-28 11:46:34.000000000 +0000
@@ -215,7 +215,7 @@
 
 --let $dump_file= $MYSQLTEST_VARDIR/tmp/restore_out.txt
 
---echo Test ndb_restore of backup containing unique index, should warn only for data restore
+--echo Test ndb_restore of backup containing unique index, should not warn since indexes are disabled
 
 --echo # print metadata+data+log : should not warn
 --exec $NDB_RESTORE -b $the_backup_id -n 1 --print $NDB_BACKUPS-$the_backup_id > $dump_file 2>&1
@@ -241,15 +241,15 @@
 --exec $NDB_RESTORE -b $the_backup_id -n 1 --print-log $NDB_BACKUPS-$the_backup_id > $dump_file 2>&1
 --source suite/ndb/include/ndb_restore_check_warn.inc
 
---echo # restore data, but exclude indexed table : should not warn since unique indexes excluded
+--echo # restore data, but exclude indexed table : should not warn since unique indexes excluded and indexes are disabled
 --exec $NDB_RESTORE -b $the_backup_id -n 1 -r --exclude-tables=test.t1 $NDB_BACKUPS-$the_backup_id > $dump_file 2>&1
 --source suite/ndb/include/ndb_restore_check_warn.inc
 
---echo # restore data, but exclude database containing indexed table : should not warn since unique indexes excluded
+--echo # restore data, but exclude database containing indexed table : should not warn since unique indexes excluded and indexes are disabled
 --exec $NDB_RESTORE -b $the_backup_id -n 1 -r --exclude-databases=test $NDB_BACKUPS-$the_backup_id > $dump_file 2>&1
 --source suite/ndb/include/ndb_restore_check_warn.inc
 
---echo # restore data : should warn since unique indexes to be restored
+--echo # restore data : should not warn since indexes are disabled in one of the previous steps
 --exec $NDB_RESTORE -b $the_backup_id -n 1 -r $NDB_BACKUPS-$the_backup_id > $dump_file 2>&1
 --source suite/ndb/include/ndb_restore_check_warn.inc
 
@@ -260,9 +260,21 @@
 --echo # rebuild-indexes : should not warn
 --exec $NDB_RESTORE -b $the_backup_id -n 1 --rebuild-indexes $NDB_BACKUPS-$the_backup_id > $dump_file 2>&1
 --source suite/ndb/include/ndb_restore_check_warn.inc
+drop table test.t1;
+
+--echo Test ndb_restore of backup containing unique index, should warn since indexes are not disabled
+
+--echo # metadata restore without --disable-indexes
+--exec $NDB_RESTORE -b $the_backup_id -n 1 -m $NDB_BACKUPS-$the_backup_id > $dump_file 2>&1
+--source suite/ndb/include/ndb_restore_check_warn.inc
+
+--echo # restore data : should warn since indexes aren't disabled in the previous step
+--exec $NDB_RESTORE -b $the_backup_id -n 1 -r $NDB_BACKUPS-$the_backup_id > $dump_file 2>&1
+--source suite/ndb/include/ndb_restore_check_warn.inc
 
 --remove_file $dump_file
 drop table test.t1;
+
 --echo Restore table with largest possible descriptor
 
 create table grp_hssesmusersstoredbytenant(t1 bigint primary key,
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_st_encrypted_backup.cnf mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_st_encrypted_backup.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_st_encrypted_backup.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_st_encrypted_backup.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,2 @@
+!include ndb_st_backup.cnf
+!include ../encrypted_backup.cnf
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_st_encrypted_backup.test mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_st_encrypted_backup.test
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_st_encrypted_backup.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_st_encrypted_backup.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1 @@
+source ndb_st_backup.test;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_tctakeover.cnf mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_tctakeover.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_tctakeover.cnf	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_tctakeover.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -6,6 +6,13 @@
 #MaxDMLOperationsPerTransaction=4294967039
 MaxDMLOperationsPerTransaction=32
 MaxNoOfLocalOperations=1024
+# Disable auto create index stats. This ensures that
+# the error inserted in the test fails at the expected
+# place i.e. during TCCOMMITREQ and not TCKEYREQ as is
+# the case with auto index stats. The latter leads to a
+# small Result Content Mismatch with an additional NdbApi
+# message being written
+IndexStatAutoCreate=0
 
 [cluster_config.ndbd.1.1]
 NodeId=1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_update.test mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_update.test
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/t/ndb_update.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/t/ndb_update.test	2021-09-28 11:46:34.000000000 +0000
@@ -1,11 +1,5 @@
 -- source include/have_ndb.inc
 
---disable_warnings
-DROP TABLE IF EXISTS t1;
-DROP TABLE IF EXISTS t2;
-DROP TABLE IF EXISTS t3;
---enable_warnings
-
 #
 # Basic test of UPDATE in NDB 
 #
@@ -110,3 +104,36 @@
 
 --echo End of 5.1 tests
 
+# Bug#32495182 ERROR DURING EXECUTION OF BULK UPDATE WITH LIMITS LED TO
+# A DEBUG ASSERT FAILURE
+#
+
+CREATE TABLE t1 (
+  a INT PRIMARY KEY,
+  b INT,
+  UNIQUE (b)
+) ENGINE NDB;
+
+# Insert 64 rows
+INSERT INTO t1 VALUES (1,1);
+INSERT INTO t1 SELECT a+1, b+1 FROM t1;
+INSERT INTO t1 SELECT a+2, b+2 FROM t1;
+INSERT INTO t1 SELECT a+4, b+4 FROM t1;
+INSERT INTO t1 SELECT a+8, b+8 FROM t1;
+INSERT INTO t1 SELECT a+16, b+16 FROM t1;
+INSERT INTO t1 SELECT a+32, b+32 FROM t1;
+
+# Start a transaction and execute an update modifying the unique indexed
+# column such that it fails due to duplicate entries
+BEGIN;
+--replace_regex /Duplicate entry \'[0-9]+\'/Duplicate entry \'<duplicate entry>\'/
+--error ER_DUP_ENTRY
+UPDATE t1 SET b=b+10;
+
+# Repeat the above but this time with LIMIT
+BEGIN;
+--replace_regex /Duplicate entry \'[0-9]+\'/Duplicate entry \'<duplicate entry>\'/
+--error ER_DUP_ENTRY
+UPDATE t1 SET b=b+10 LIMIT 20;
+
+DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/t/test_mgmd.cnf mysql-8.0-8.0.27/mysql-test/suite/ndb/t/test_mgmd.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/t/test_mgmd.cnf	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/t/test_mgmd.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -9,6 +9,10 @@
 [mysqld]
 ndbcluster
 
+# Don't wait for connect to cluster since none will be started
+ndb-wait-connected=0
+ndb-wait-setup=0
+
 [ENV]
 # The started ndb_mgmd's will be started from base + 1
 NDBT_BASE_PORT= @mysqld.1.port
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb/t/test_mgmd.test mysql-8.0-8.0.27/mysql-test/suite/ndb/t/test_mgmd.test
--- mysql-8.0-8.0.26/mysql-test/suite/ndb/t/test_mgmd.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb/t/test_mgmd.test	2021-09-28 11:46:34.000000000 +0000
@@ -1,7 +1,5 @@
 --source include/have_ndb.inc
 
-# The testMgmd binary is not built on Windows
---source include/not_windows.inc
 
 # This test does not start ndb_mgmd as its not required. So, mysqld started by mtr.pl fails
 # to connect to NDB and gives below warnings.
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndbcluster/fetch_table_stats_count.result mysql-8.0-8.0.27/mysql-test/suite/ndbcluster/fetch_table_stats_count.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndbcluster/fetch_table_stats_count.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndbcluster/fetch_table_stats_count.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,29 @@
+#
+# Showing the "ndb_fetch_table_stats" counter
+#
+# Since fetching table stats incurs one roundtrip to NDB it should not
+# be done more than strictly required, the "ndb_fetch_table_stats"
+# counter provides a means to check when table stats are fetched.
+CREATE TABLE t1 (a int primary key) ENGINE = NDB;
+INSERT INTO t1 VALUES (1);
+SELECT * FROM t1;
+a
+1
+Table stats was fetched 1 time (expected 1)
+# Another query using an open handler instance should not cause
+# table stats to be fetched again
+SELECT * FROM t1;
+a
+1
+Table stats was fetched 0 times (expected 0)
+# Closing handler, should really not need to fetch
+# table stats again, but they seem to be
+FLUSH TABLES t1;
+Table stats was fetched 1 times (oops! expected 0)
+# Running query again, should cause
+# table stats to be fetched once again
+SELECT * FROM t1;
+a
+1
+Table stats was fetched 1 times (expected 1)
+DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndbcluster/fetch_table_stats_count.test mysql-8.0-8.0.27/mysql-test/suite/ndbcluster/fetch_table_stats_count.test
--- mysql-8.0-8.0.26/mysql-test/suite/ndbcluster/fetch_table_stats_count.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndbcluster/fetch_table_stats_count.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,56 @@
+--source include/have_ndb.inc
+
+--echo #
+--echo # Showing the "ndb_fetch_table_stats" counter
+--echo #
+--echo # Since fetching table stats incurs one roundtrip to NDB it should not
+--echo # be done more than strictly required, the "ndb_fetch_table_stats"
+--echo # counter provides a means to check when table stats are fetched.
+
+CREATE TABLE t1 (a int primary key) ENGINE = NDB;
+
+let $count =
+  `SELECT VARIABLE_VALUE
+     FROM performance_schema.session_status
+       WHERE variable_name = 'NDB_FETCH_TABLE_STATS'`;
+
+INSERT INTO t1 VALUES (1);
+SELECT * FROM t1;
+
+let $count =
+  `SELECT VARIABLE_VALUE-$count
+     FROM performance_schema.session_status
+       WHERE variable_name = 'NDB_FETCH_TABLE_STATS'`;
+echo Table stats was fetched $count time (expected 1);
+
+--echo # Another query using an open handler instance should not cause
+--echo # table stats to be fetched again
+SELECT * FROM t1;
+
+let $count =
+  `SELECT VARIABLE_VALUE-$count
+     FROM performance_schema.session_status
+       WHERE variable_name = 'NDB_FETCH_TABLE_STATS'`;
+echo Table stats was fetched $count times (expected 0);
+
+--echo # Closing handler, should really not need to fetch
+--echo # table stats again, but they seem to be
+FLUSH TABLES t1;
+
+let $count =
+  `SELECT VARIABLE_VALUE-$count
+     FROM performance_schema.session_status
+       WHERE variable_name = 'NDB_FETCH_TABLE_STATS'`;
+echo Table stats was fetched $count times (oops! expected 0);
+
+--echo # Running query again, should cause
+--echo # table stats to be fetched once again
+SELECT * FROM t1;
+
+let $count =
+  `SELECT VARIABLE_VALUE-$count
+     FROM performance_schema.session_status
+       WHERE variable_name = 'NDB_FETCH_TABLE_STATS'`;
+echo Table stats was fetched $count times (expected 1);
+
+DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndbcluster/table_stats.result mysql-8.0-8.0.27/mysql-test/suite/ndbcluster/table_stats.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndbcluster/table_stats.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndbcluster/table_stats.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,238 @@
+# ###################################################################
+# Show that local table stats are correctly reflecting number of
+# records in table at failure to insert, both with and without trans
+# - in particular this shows how the "uncomitted rows" value in Thd_ndb
+#   is handled
+CREATE TABLE t1 (
+a int PRIMARY KEY,
+b varchar(255)
+) ENGINE = NDB;
+INSERT INTO t1 VALUES (1, "this is in the way");
+SELECT COUNT(*) as "count should be 1" FROM t1;
+count should be 1
+1
+INSERT INTO t1 VALUES (1, "duplicate key");
+ERROR 23000: Duplicate entry '1' for key 't1.PRIMARY'
+SELECT COUNT(*) as "count should still be 1" FROM t1;
+count should still be 1
+1
+INSERT INTO t1 VALUES
+(2, "val2"), (3, "val3"), (4, "val4"),
+(1, "duplicate key, 3 uncommitted");
+ERROR 23000: Duplicate entry '1' for key 't1.PRIMARY'
+SELECT COUNT(*) as "count should still be 1" FROM t1;
+count should still be 1
+1
+BEGIN;
+INSERT INTO t1 VALUES (1, "duplicate key, inside transaction");
+ERROR 23000: Duplicate entry '1' for key 't1.PRIMARY'
+SELECT COUNT(*) as "count should still be 1" FROM t1;
+count should still be 1
+1
+COMMIT;
+SELECT COUNT(*) as "count should still be 1" FROM t1;
+count should still be 1
+1
+BEGIN;
+INSERT INTO t1 VALUES
+(2, "val2"), (3, "val3"), (4, "val4");
+SELECT COUNT(*) as "count should be 4" FROM t1;
+count should be 4
+4
+INSERT INTO t1 VALUES (1, "duplicate key, inside transaction, 3 uncommitted");
+ERROR 23000: Duplicate entry '1' for key 't1.PRIMARY'
+SELECT COUNT(*) as "count should still be 1, whole trans aborted" FROM t1;
+count should still be 1, whole trans aborted
+1
+COMMIT;
+SELECT COUNT(*) as "count should still be 1" FROM t1;
+count should still be 1
+1
+BEGIN;
+INSERT INTO t1 VALUES (1, "duplicate key, inside transaction");
+ERROR 23000: Duplicate entry '1' for key 't1.PRIMARY'
+SELECT COUNT(*) as "count should still be 1" FROM t1;
+count should still be 1
+1
+ROLLBACK;
+SELECT COUNT(*) as "count should still be 1" FROM t1;
+count should still be 1
+1
+BEGIN;
+INSERT INTO t1 VALUES
+(2, "val2"), (3, "val3"), (4, "val4");
+SELECT COUNT(*) as "count should be 4" FROM t1;
+count should be 4
+4
+INSERT INTO t1 VALUES (1, "duplicate key, inside transaction, 3 uncommitted");
+ERROR 23000: Duplicate entry '1' for key 't1.PRIMARY'
+SELECT COUNT(*) as "count should still be 1, whole trans aborted" FROM t1;
+count should still be 1, whole trans aborted
+1
+ROLLBACK;
+SELECT COUNT(*) as "count should still be 1" FROM t1;
+count should still be 1
+1
+CREATE TABLE t2 (
+a int PRIMARY KEY,
+b varchar(255)
+) ENGINE = NDB;
+INSERT INTO t2 VALUES
+(10, "val10"), (12, "val12"), (13, "val13"), (14, "val14"), (15, "val15");
+BEGIN;
+INSERT INTO t2 VALUES (1, "val1"), (2, "val2"), (3, "val3"), (4, "val4");
+SELECT COUNT(*) as "count should be 9" FROM t2;
+count should be 9
+9
+INSERT INTO t1 VALUES (1, "duplicate key, inside transaction");
+ERROR 23000: Duplicate entry '1' for key 't1.PRIMARY'
+SELECT COUNT(*) as "count should still be 1" FROM t1;
+count should still be 1
+1
+SELECT COUNT(*) as "count should be 5, trans aborted" FROM t2;
+count should be 5, trans aborted
+5
+COMMIT;
+SELECT COUNT(*) as "count should still be 1" FROM t1;
+count should still be 1
+1
+SELECT COUNT(*) as "count should be 5" FROM t2;
+count should be 5
+5
+DROP TABLE t2;
+DROP TABLE t1;
+# ###################################################################
+# Test I_S and SHOW commands that present table stats
+#
+# Test with 0, 1, 2 and 10 rows in the table since special case exists
+# for masking out 0 and 1 row for other queries.
+#
+# NOTE! This test shows that only SHOW INDEX and SHOW TABLE STATUS
+# bypass the "records = min(records, 2)" while all the I_S queries
+# never show less than 2 rows.
+#
+# Turn off "cached statistics" in INFORMATION_SCHEMA to always fetch
+# latest stats from storage engine
+set @save_information_schema_stats_expiry = @@information_schema_stats_expiry;
+set @@information_schema_stats_expiry=0;
+#
+# Create table with only one primary key index
+CREATE TABLE t1 (
+a int PRIMARY KEY,
+b varchar(255),
+c int NOT NULL
+) ENGINE = NDB;
+#### TEST LOOP 0 ####
+SELECT COUNT(*) as "rows in table" FROM t1;
+rows in table
+0
+# SELECT .. FROM INFORMATION_SCHEMA.TABLES
+SELECT TABLE_ROWS FROM INFORMATION_SCHEMA.TABLES
+WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME = 't1';
+TABLE_ROWS
+2
+# SHOW TABLE STATUS
+Rows: 0
+# SELECT ... FROM INFORMATION_SCHEMA.STATISTICS
+SELECT CARDINALITY FROM INFORMATION_SCHEMA.STATISTICS
+WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME = 't1';
+CARDINALITY
+2
+# SHOW INDEX (aka. SHOW INDEXES or SHOW KEYS)
+Cardinality: 0
+INSERT INTO t1 VALUES (0, "Row 0", 37+0);
+#### TEST LOOP 1 ####
+SELECT COUNT(*) as "rows in table" FROM t1;
+rows in table
+1
+# SELECT .. FROM INFORMATION_SCHEMA.TABLES
+SELECT TABLE_ROWS FROM INFORMATION_SCHEMA.TABLES
+WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME = 't1';
+TABLE_ROWS
+2
+# SHOW TABLE STATUS
+Rows: 1
+# SELECT ... FROM INFORMATION_SCHEMA.STATISTICS
+SELECT CARDINALITY FROM INFORMATION_SCHEMA.STATISTICS
+WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME = 't1';
+CARDINALITY
+2
+# SHOW INDEX (aka. SHOW INDEXES or SHOW KEYS)
+Cardinality: 1
+INSERT INTO t1 VALUES (1, "Row 1", 37+1);
+#### TEST LOOP 2 ####
+SELECT COUNT(*) as "rows in table" FROM t1;
+rows in table
+2
+# SELECT .. FROM INFORMATION_SCHEMA.TABLES
+SELECT TABLE_ROWS FROM INFORMATION_SCHEMA.TABLES
+WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME = 't1';
+TABLE_ROWS
+2
+# SHOW TABLE STATUS
+Rows: 2
+# SELECT ... FROM INFORMATION_SCHEMA.STATISTICS
+SELECT CARDINALITY FROM INFORMATION_SCHEMA.STATISTICS
+WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME = 't1';
+CARDINALITY
+2
+# SHOW INDEX (aka. SHOW INDEXES or SHOW KEYS)
+Cardinality: 2
+INSERT INTO t1 VALUES (2, "Row 2", 37+2);
+#### TEST LOOP 3 ####
+SELECT COUNT(*) as "rows in table" FROM t1;
+rows in table
+3
+# SELECT .. FROM INFORMATION_SCHEMA.TABLES
+SELECT TABLE_ROWS FROM INFORMATION_SCHEMA.TABLES
+WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME = 't1';
+TABLE_ROWS
+3
+# SHOW TABLE STATUS
+Rows: 3
+# SELECT ... FROM INFORMATION_SCHEMA.STATISTICS
+SELECT CARDINALITY FROM INFORMATION_SCHEMA.STATISTICS
+WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME = 't1';
+CARDINALITY
+3
+# SHOW INDEX (aka. SHOW INDEXES or SHOW KEYS)
+Cardinality: 3
+INSERT INTO t1 VALUES (3, "Row 3", 37+3);
+INSERT INTO t1 VALUES
+(14, "extra row 4", 44), (15, "extra row 5", 45), (16, "extra row 6", 46),
+(17, "extra row 7", 47), (18, "extra row 8", 48), (19, "extra row 9", 49);
+#### TEST LOOP 4 ####
+SELECT COUNT(*) as "rows in table" FROM t1;
+rows in table
+10
+# SELECT .. FROM INFORMATION_SCHEMA.TABLES
+SELECT TABLE_ROWS FROM INFORMATION_SCHEMA.TABLES
+WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME = 't1';
+TABLE_ROWS
+10
+# SHOW TABLE STATUS
+Rows: 10
+# SELECT ... FROM INFORMATION_SCHEMA.STATISTICS
+SELECT CARDINALITY FROM INFORMATION_SCHEMA.STATISTICS
+WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME = 't1';
+CARDINALITY
+10
+# SHOW INDEX (aka. SHOW INDEXES or SHOW KEYS)
+Cardinality: 10
+INSERT INTO t1 VALUES (4, "Row 4", 37+4);
+DROP TABLE t1;
+set @@information_schema_stats_expiry = @save_information_schema_stats_expiry;
+# ###################################################################
+#
+# Test table stats with several tables updated in transaction.
+# - when transaction is committed the "cached table stats" for all
+#   tables registered in the transaction will be updated with number
+#   of rows changed by transaction, nothing is updated during rollback.
+# - This test exercise the logic for maintaining "cached table stats"
+#   by using 32 different tables in same transaction, however
+#   it's not possible to check the value from SQL level
+#
+# Create tables and load data
+# Run transaction with update of all tables, commit
+# Run transaction with update of all tables, rollback
+# Drop tables
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndbcluster/table_stats.test mysql-8.0-8.0.27/mysql-test/suite/ndbcluster/table_stats.test
--- mysql-8.0-8.0.26/mysql-test/suite/ndbcluster/table_stats.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndbcluster/table_stats.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,226 @@
+--source include/have_ndb.inc
+
+--echo # ###################################################################
+--echo # Show that local table stats are correctly reflecting number of
+--echo # records in table at failure to insert, both with and without trans
+--echo # - in particular this shows how the "uncomitted rows" value in Thd_ndb
+--echo #   is handled
+CREATE TABLE t1 (
+  a int PRIMARY KEY,
+  b varchar(255)
+) ENGINE = NDB;
+INSERT INTO t1 VALUES (1, "this is in the way");
+SELECT COUNT(*) as "count should be 1" FROM t1;
+
+# Autocommit, one uncommitted row when failure occurs
+--error ER_DUP_ENTRY
+INSERT INTO t1 VALUES (1, "duplicate key");
+SELECT COUNT(*) as "count should still be 1" FROM t1;
+
+# Autocommit, three uncommitted rows when failure occurs
+--error ER_DUP_ENTRY
+INSERT INTO t1 VALUES
+  (2, "val2"), (3, "val3"), (4, "val4"),
+  (1, "duplicate key, 3 uncommitted");
+SELECT COUNT(*) as "count should still be 1" FROM t1;
+
+# Transaction, one uncommitted row when failure occurs
+BEGIN;
+  --error ER_DUP_ENTRY
+  INSERT INTO t1 VALUES (1, "duplicate key, inside transaction");
+  SELECT COUNT(*) as "count should still be 1" FROM t1;
+COMMIT;
+SELECT COUNT(*) as "count should still be 1" FROM t1;
+
+# Transaction, three uncommitted rows when failure occurs
+BEGIN;
+  # Add three uncommitted to trans
+  INSERT INTO t1 VALUES
+    (2, "val2"), (3, "val3"), (4, "val4");
+  SELECT COUNT(*) as "count should be 4" FROM t1;
+
+  --error ER_DUP_ENTRY
+  INSERT INTO t1 VALUES (1, "duplicate key, inside transaction, 3 uncommitted");
+  SELECT COUNT(*) as "count should still be 1, whole trans aborted" FROM t1;
+COMMIT;
+SELECT COUNT(*) as "count should still be 1" FROM t1;
+
+# Transaction, one uncommitted row when failure occurs, rollback
+BEGIN;
+  --error ER_DUP_ENTRY
+  INSERT INTO t1 VALUES (1, "duplicate key, inside transaction");
+  SELECT COUNT(*) as "count should still be 1" FROM t1;
+ROLLBACK;
+SELECT COUNT(*) as "count should still be 1" FROM t1;
+
+# Transaction, three uncommitted rows when failure occurs, rollback
+BEGIN;
+  # Add three uncommitted to trans
+  INSERT INTO t1 VALUES
+    (2, "val2"), (3, "val3"), (4, "val4");
+  SELECT COUNT(*) as "count should be 4" FROM t1;
+
+  --error ER_DUP_ENTRY
+  INSERT INTO t1 VALUES (1, "duplicate key, inside transaction, 3 uncommitted");
+  SELECT COUNT(*) as "count should still be 1, whole trans aborted" FROM t1;
+ROLLBACK;
+SELECT COUNT(*) as "count should still be 1" FROM t1;
+
+
+# Transaction, four uncommitted rows in other table when failure occurs
+CREATE TABLE t2 (
+  a int PRIMARY KEY,
+  b varchar(255)
+) ENGINE = NDB;
+INSERT INTO t2 VALUES
+  (10, "val10"), (12, "val12"), (13, "val13"), (14, "val14"), (15, "val15");
+BEGIN;
+  # Add four uncommitted to other table
+  INSERT INTO t2 VALUES (1, "val1"), (2, "val2"), (3, "val3"), (4, "val4");
+  SELECT COUNT(*) as "count should be 9" FROM t2;
+
+  --error ER_DUP_ENTRY
+  INSERT INTO t1 VALUES (1, "duplicate key, inside transaction");
+  SELECT COUNT(*) as "count should still be 1" FROM t1;
+
+  # Check count for other table
+  SELECT COUNT(*) as "count should be 5, trans aborted" FROM t2;
+COMMIT;
+SELECT COUNT(*) as "count should still be 1" FROM t1;
+SELECT COUNT(*) as "count should be 5" FROM t2;
+DROP TABLE t2;
+
+DROP TABLE t1;
+
+--echo # ###################################################################
+--echo # Test I_S and SHOW commands that present table stats
+--echo #
+--echo # Test with 0, 1, 2 and 10 rows in the table since special case exists
+--echo # for masking out 0 and 1 row for other queries.
+--echo #
+--echo # NOTE! This test shows that only SHOW INDEX and SHOW TABLE STATUS
+--echo # bypass the "records = min(records, 2)" while all the I_S queries
+--echo # never show less than 2 rows.
+--echo #
+--echo # Turn off "cached statistics" in INFORMATION_SCHEMA to always fetch
+--echo # latest stats from storage engine
+set @save_information_schema_stats_expiry = @@information_schema_stats_expiry;
+set @@information_schema_stats_expiry=0;
+
+--echo #
+--echo # Create table with only one primary key index
+CREATE TABLE t1 (
+  a int PRIMARY KEY,
+  b varchar(255),
+  c int NOT NULL
+) ENGINE = NDB;
+
+let $loop = 0;
+while ($loop <= 4)
+{
+  --echo #### TEST LOOP $loop ####
+  SELECT COUNT(*) as "rows in table" FROM t1;
+
+  --echo # SELECT .. FROM INFORMATION_SCHEMA.TABLES
+  # The stats.records value is visible as TABLE_ROWS
+  SELECT TABLE_ROWS FROM INFORMATION_SCHEMA.TABLES
+    WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME = 't1';
+
+  --echo # SHOW TABLE STATUS
+  # Implemented as query from SELECT ... FROM I_S.TABLES
+  # The stats.records value is visible as Rows
+  let $table_rows =
+    query_get_value(SHOW TABLE STATUS FROM test LIKE 't1', Rows, 1);
+  echo Rows: $table_rows;
+
+  --echo # SELECT ... FROM INFORMATION_SCHEMA.STATISTICS
+  # Cardinality is calculated by dividing stats.records with "records per key"
+  # (which is 1 for unique index) -> records
+  SELECT CARDINALITY FROM INFORMATION_SCHEMA.STATISTICS
+    WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME = 't1';
+
+  --echo # SHOW INDEX (aka. SHOW INDEXES or SHOW KEYS)
+  # Implemented as query from SELECT ... FROM I_S.STATISTICS
+  let $index_cardinality =
+    query_get_value(SHOW INDEX FROM test.t1, Cardinality, 1);
+  echo Cardinality: $index_cardinality;
+
+  # Insert more rows for next lap
+  eval INSERT INTO t1 VALUES ($loop, "Row $loop", 37+$loop);
+
+  if ($loop == 3)
+  {
+    # Insert extra rows for last lap
+    INSERT INTO t1 VALUES
+      (14, "extra row 4", 44), (15, "extra row 5", 45), (16, "extra row 6", 46),
+      (17, "extra row 7", 47), (18, "extra row 8", 48), (19, "extra row 9", 49);
+  }
+
+  inc $loop;
+}
+
+DROP TABLE t1;
+
+# Restore setting for "cached statistics" in information_schema
+set @@information_schema_stats_expiry = @save_information_schema_stats_expiry;
+
+--echo # ###################################################################
+--echo #
+--echo # Test table stats with several tables updated in transaction.
+--echo # - when transaction is committed the "cached table stats" for all
+--echo #   tables registered in the transaction will be updated with number
+--echo #   of rows changed by transaction, nothing is updated during rollback.
+--echo # - This test exercise the logic for maintaining "cached table stats"
+--echo #   by using 32 different tables in same transaction, however
+--echo #   it's not possible to check the value from SQL level
+--echo #
+
+# No need to fill up result file with anything but the printous of this test
+--disable_query_log
+--disable_result_log
+
+let $num_tables = 32;
+
+--echo # Create tables and load data
+let $i = $num_tables;
+while ($i) {
+  let $tab_name = t$i;
+  --error 0,1005
+  eval CREATE TABLE $tab_name (pk int PRIMARY KEY, b int) engine = ndbcluster;
+  if ($mysql_errno) {
+   SHOW WARNINGS;
+  }
+  eval INSERT INTO $tab_name VALUES
+    (1,2),(2,2),(3,2),(4,2),(5,2),(6,2),(7,2),(8,2),(9,2),(10,2);
+  dec $i;
+}
+
+--echo # Run transaction with update of all tables, commit
+let $i = $num_tables;
+BEGIN;
+  while ($i) {
+    let $tab_name = t$i;
+    eval UPDATE $tab_name SET b = 3 WHERE pk = 4;
+    dec $i;
+  }
+COMMIT;
+
+--echo # Run transaction with update of all tables, rollback
+let $i = $num_tables;
+BEGIN;
+  while ($i) {
+    let $tab_name = t$i;
+    eval UPDATE $tab_name SET b = 5 WHERE pk = 2;
+    dec $i;
+  }
+ROLLBACK;
+
+--echo # Drop tables
+let $i = $num_tables;
+while ($i) {
+  eval DROP TABLE t$i;
+  dec $i;
+}
+--enable_query_log
+--enable_result_log
+
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb_ddl/schema_dist_client_wait.cnf mysql-8.0-8.0.27/mysql-test/suite/ndb_ddl/schema_dist_client_wait.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/ndb_ddl/schema_dist_client_wait.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb_ddl/schema_dist_client_wait.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,6 @@
+!include suite/ndb_ddl/my.cnf
+
+[mysqld]
+# Set schema distribution timeout to low value
+ndb-schema-dist-timeout=5
+
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb_ddl/schema_dist_client_wait.result mysql-8.0-8.0.27/mysql-test/suite/ndb_ddl/schema_dist_client_wait.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb_ddl/schema_dist_client_wait.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb_ddl/schema_dist_client_wait.result	2021-09-28 11:46:34.000000000 +0000
@@ -12,3 +12,20 @@
 # Cleanup
 set global debug= @save_debug;
 DROP DATABASE IF EXISTS tmp_db;
+#
+# Test to check if the Client thread is hung, when the coordinator
+# did not receive the schema operation.
+#
+CREATE TABLE t1 (a INT) ENGINE NDB;
+# Now, make the coordinator ignore the schema operation
+set global debug="+d,ndb_schema_op_start_timeout";
+call mtr.add_suppression("Schema dist client detected timeout");
+call mtr.add_suppression("Failed to distribute");
+# Execute any DDL on table t1
+ALTER TABLE t1 ADD b INT;
+Warnings:
+Warning	1296	Schema distribution failed
+# Reset coordinator to handle all schema operations
+set global debug="-d,ndb_schema_op_start_timeout";
+include/assert_grep.inc [Verify if ndb_schema_dist_timeout triggered by schema distribution client.]
+DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb_ddl/schema_dist_client_wait.test mysql-8.0-8.0.27/mysql-test/suite/ndb_ddl/schema_dist_client_wait.test
--- mysql-8.0-8.0.26/mysql-test/suite/ndb_ddl/schema_dist_client_wait.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb_ddl/schema_dist_client_wait.test	2021-09-28 11:46:34.000000000 +0000
@@ -23,3 +23,33 @@
 --echo # Cleanup
 set global debug= @save_debug;
 DROP DATABASE IF EXISTS tmp_db;
+
+# Bug#32593352
+# The variable ndb-schema-dist-timeout can only be set when starting MySQL Server.
+# The ndb-schema-dist-timeout value is set low for this test to avoid
+# waiting on test to complete(the value is specified by <testname>.cnf file)
+--echo #
+--echo # Test to check if the Client thread is hung, when the coordinator
+--echo # did not receive the schema operation.
+--echo #
+CREATE TABLE t1 (a INT) ENGINE NDB;
+
+--echo # Now, make the coordinator ignore the schema operation
+set global debug="+d,ndb_schema_op_start_timeout";
+
+call mtr.add_suppression("Schema dist client detected timeout");
+call mtr.add_suppression("Failed to distribute");
+--echo # Execute any DDL on table t1
+ALTER TABLE t1 ADD b INT;
+
+--echo # Reset coordinator to handle all schema operations
+set global debug="-d,ndb_schema_op_start_timeout";
+
+--let $assert_text= Verify if ndb_schema_dist_timeout triggered by schema distribution client.
+--let $assert_select= Schema dist client detected timeout
+--let $assert_file= $MYSQLTEST_VARDIR/log/mysqld.1.1.err
+--let $assert_count= 1
+--source include/assert_grep.inc
+
+# Cleanup
+DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/check_index_stat_created.inc mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/check_index_stat_created.inc
--- mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/check_index_stat_created.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/check_index_stat_created.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,68 @@
+#
+# Check if index stats have been created for a table
+#
+# Usage:
+#
+# --let $index_stat_db=<db name>
+# --let $index_stat_table=<table name>
+# --source check_index_stats_created.inc
+#
+
+--disable_query_log
+if (`select LENGTH('$index_stat_db') = 0`)
+{
+  # Default is test
+  --let $index_stat_db=test
+}
+if (`select LENGTH('$index_stat_table') = 0`)
+{
+  # Default is t1
+  --let $index_stat_table=t1
+}
+
+# Retrieve the contents of the ndb_index_stat_head table
+--let $dump_file1 = $MYSQLTEST_VARDIR/tmp/index_stat_select_all1.txt
+--exec $NDB_SELECT_ALL -d mysql --delimiter=, ndb_index_stat_head > $dump_file1
+CREATE TEMPORARY TABLE tmp_table (
+  x char(255)
+) CHARSET latin1 ENGINE InnoDB;
+--eval LOAD DATA INFILE '$dump_file1' INTO TABLE tmp_table
+
+# Remove the column names
+DELETE FROM tmp_table WHERE x NOT REGEXP '^[0-9]*,';
+
+# Dump the contents so that it can be loaded into another table which
+# can be queried
+--let $dump_file2 = $MYSQLTEST_VARDIR/tmp/index_stat_select_all2.txt
+--eval SELECT x FROM tmp_table INTO OUTFILE '$dump_file2'
+CREATE TEMPORARY TABLE index_stats (
+  index_id INT UNSIGNED,
+  index_version INT UNSIGNED,
+  table_id INT UNSIGNED,
+  frag_count INT UNSIGNED,
+  value_format INT UNSIGNED,
+  sample_version INT UNSIGNED,
+  load_time INT UNSIGNED,
+  sample_count INT UNSIGNED,
+  key_bytes INT UNSIGNED
+) ENGINE InnoDB;
+--eval LOAD DATA INFILE '$dump_file2' INTO TABLE index_stats FIELDS TERMINATED BY ',' LINES TERMINATED BY '\n'
+
+--let $root_name = '$index_stat_db/def/$index_stat_table'
+# Get the id of an ordered index on the table
+--let $index_id = query_get_value(SELECT id FROM ndbinfo.dict_obj_tree WHERE root_name = $root_name AND type = 6, id, 1)
+
+# Filter out content about indexes on other tables
+--eval DELETE FROM index_stats WHERE index_id <> $index_id
+--enable_query_log
+
+# The presence of any row indicates that stats exist for the index (and table) specified
+SELECT CASE COUNT(*) WHEN 0 THEN 'NO' ELSE 'YES' END AS stats_created FROM index_stats;
+
+# Clean up
+--disable_query_log ONCE
+DROP TABLE tmp_table,index_stats;
+--remove_file $dump_file1
+--remove_file $dump_file2
+--let $index_stat_db=
+--let $index_stat_table=
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/condition_pushdown.result mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/condition_pushdown.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/condition_pushdown.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/condition_pushdown.result	2021-09-28 11:46:34.000000000 +0000
@@ -3640,18 +3640,18 @@
 Test combinations using the 'variant' columns.
 Even if the base type is the same for these conditions,
 different precision, length, scale etc. should prevent pushing:
-CALL test_query("SELECT pk INTO @res FROM t1 WHERE string1 = string3",false);
-CALL test_query("SELECT pk INTO @res FROM t1 WHERE string1 = string4",false);
-CALL test_query("SELECT pk INTO @res FROM t1 WHERE vstring1 = vstring3",false);
-CALL test_query("SELECT pk INTO @res FROM t1 WHERE bin1 = bin3",false);
-CALL test_query("SELECT pk INTO @res FROM t1 WHERE vbin1 = vbin3",false);
-CALL test_query("SELECT pk INTO @res FROM t1 WHERE real_decimal1 = real_decimal3",false);
-CALL test_query("SELECT pk INTO @res FROM t1 WHERE bits1 = bits3",false);
-CALL test_query("SELECT pk INTO @res FROM t1 WHERE options1 = options3",false);
-CALL test_query("SELECT pk INTO @res FROM t1 WHERE flags1 = flags3",false);
-CALL test_query("SELECT pk INTO @res FROM t1 WHERE time_field1 = time_field3",false);
-CALL test_query("SELECT pk INTO @res FROM t1 WHERE date_time1 = date_time3",false);
-CALL test_query("SELECT pk INTO @res FROM t1 WHERE time_stamp1 = time_stamp3",false);
+CALL test_query("SELECT k INTO @res FROM t1 WHERE string1 = string3",false);
+CALL test_query("SELECT k INTO @res FROM t1 WHERE string1 = string4",false);
+CALL test_query("SELECT k INTO @res FROM t1 WHERE vstring1 = vstring3",false);
+CALL test_query("SELECT k INTO @res FROM t1 WHERE bin1 = bin3",false);
+CALL test_query("SELECT k INTO @res FROM t1 WHERE vbin1 = vbin3",false);
+CALL test_query("SELECT k INTO @res FROM t1 WHERE real_decimal1 = real_decimal3",false);
+CALL test_query("SELECT k INTO @res FROM t1 WHERE bits1 = bits3",false);
+CALL test_query("SELECT k INTO @res FROM t1 WHERE options1 = options3",false);
+CALL test_query("SELECT k INTO @res FROM t1 WHERE flags1 = flags3",false);
+CALL test_query("SELECT k INTO @res FROM t1 WHERE time_field1 = time_field3",false);
+CALL test_query("SELECT k INTO @res FROM t1 WHERE date_time1 = date_time3",false);
+CALL test_query("SELECT k INTO @res FROM t1 WHERE time_stamp1 = time_stamp3",false);
 Test that <col1> like <col2> is not pushed, - even if types are comparable
 CALL test_query("SELECT count(*) INTO @res FROM t1 WHERE string1 LIKE string1",false);
 CALL test_query("SELECT count(*) INTO @res FROM t1 WHERE string1 NOT LIKE string1",false);
@@ -3727,3 +3727,36 @@
 Note	1003	Can't push table 't1' as child, 'type' must be a 'ref' access
 drop view v1;
 drop table t1;
+#########################################################
+# WL#14388 Push condition referring fields from an
+SPJ ancestor table
+#########################################################
+create table t1 (
+a int,
+b int,
+c int,
+d int,
+primary key(a,b)
+) engine=ndbcluster;
+insert into t1 values
+(1,1,1,1), (2,2,2,2), (3,3,3,3), (4,4,4,4),
+(1,2,5,1), (1,3,1,2), (1,4,2,3),
+(2,1,3,4), (2,3,4,5), (2,4,5,1),
+(3,1,1,2), (3,2,2,3), (3,4,3,4),
+(4,1,4,5), (4,2,5,1), (4,3,1,2);
+set optimizer_switch='block_nested_loop=off';
+explain
+select *
+from t1
+straight_join t1 as t2 on t2.d = t1.d
+straight_join t1 as t3 on t3.a = t2.a
+where t3.c >= t1.c and t3.c <= t2.c;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	p0,p1,p2,p3,p4,p5,p6,p7	ALL	NULL	NULL	NULL	NULL	16	100.00	NULL
+1	SIMPLE	t2	p0,p1,p2,p3,p4,p5,p6,p7	ALL	PRIMARY	NULL	NULL	NULL	16	10.00	Parent of 2 pushed join@1; Using pushed condition (`test`.`t2`.`d` = `test`.`t1`.`d`)
+1	SIMPLE	t3	p0,p1,p2,p3,p4,p5,p6,p7	ref	PRIMARY	PRIMARY	4	test.t2.a	1	11.11	Child of 't2' in pushed join@1; Using pushed condition ((`test`.`t3`.`c` >= `test`.`t1`.`c`) and (`test`.`t3`.`c` <= `test`.`t2`.`c`))
+Warnings:
+Note	1003	Can't push table 't2' as child, 'type' must be a 'ref' access
+Note	1003	Can't push table 't3' as child of 't1', column 't2.a' is outside scope of pushable join
+Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c`,`test`.`t1`.`d` AS `d`,`test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t2`.`c` AS `c`,`test`.`t2`.`d` AS `d`,`test`.`t3`.`a` AS `a`,`test`.`t3`.`b` AS `b`,`test`.`t3`.`c` AS `c`,`test`.`t3`.`d` AS `d` from `test`.`t1` straight_join `test`.`t1` `t2` straight_join `test`.`t1` `t3` where ((`test`.`t2`.`d` = `test`.`t1`.`d`) and (`test`.`t3`.`a` = `test`.`t2`.`a`) and (`test`.`t3`.`c` >= `test`.`t1`.`c`) and (`test`.`t3`.`c` <= `test`.`t2`.`c`))
+drop table t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/condition_pushdown.test mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/condition_pushdown.test
--- mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/condition_pushdown.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/condition_pushdown.test	2021-09-28 11:46:34.000000000 +0000
@@ -2574,22 +2574,20 @@
 
 create table t1
 (
-  a int,
-  b varchar(30),
-  primary key(a)
+  b varchar(30)
 ) engine = ndb ;
 
-insert into t1 values (1,'one');
-insert into t1 values (2,'two');
-insert into t1 values (3,'three');
-insert into t1 values (4,'four');
-insert into t1 values (5,'five');
-insert into t1 values(0,NULL);
-insert into t1 values(10,NULL);
-insert into t1 values(20,NULL);
-insert into t1 values(30,NULL);
-insert into t1 values(40,NULL);
-insert into t1 values(50,NULL);
+insert into t1 values ('one');
+insert into t1 values ('two');
+insert into t1 values ('three');
+insert into t1 values ('four');
+insert into t1 values ('five');
+insert into t1 values(NULL);
+insert into t1 values(NULL);
+insert into t1 values(NULL);
+insert into t1 values(NULL);
+insert into t1 values(NULL);
+insert into t1 values(NULL);
 
 let $prepare =
   select @read_cnt:=variable_value
@@ -2597,7 +2595,7 @@
     where variable_name = 'Ndb_api_read_row_count';
 
 # Verify that number of rows in result is same as
-# number of rows retuned by the ScanFilter.
+# number of rows returned by the ScanFilter.
 let $verify_row_count =
   select
     @count as result_rows,
@@ -3603,7 +3601,7 @@
 #   pushed when compared against the other similar columns.
 
 CREATE TABLE t1 (
-  pk int unsigned NOT NULL PRIMARY KEY,
+  k int unsigned NOT NULL,
 
   string1 char(10),
   vstring1 varchar(10),
@@ -3779,17 +3777,6 @@
 DELIMITER ;//
 
 
-# Construct a test query fetching a single rows pk.
-DELIMITER //;
-CREATE FUNCTION get_pk_query(col1 int, op varchar(4), col2 int) RETURNS TEXT DETERMINISTIC
-BEGIN
-  SET @column1 = CONCAT(get_column(col1),"1");
-  SET @column2 = CONCAT(get_column(col2),"2");
-  RETURN CONCAT("SELECT pk INTO @res FROM t1 WHERE ", @column1, op, @column2);
-END //
-DELIMITER ;//
-
-
 # Construct a test query fetching the count(*) of rows qualifying the condition
 DELIMITER //;
 CREATE FUNCTION get_count_query(col1 int, op varchar(4), col2 int) RETURNS TEXT DETERMINISTIC
@@ -3914,20 +3901,20 @@
 --echo Even if the base type is the same for these conditions,
 --echo different precision, length, scale etc. should prevent pushing:
 
-CALL test_query("SELECT pk INTO @res FROM t1 WHERE string1 = string3",false);
-CALL test_query("SELECT pk INTO @res FROM t1 WHERE string1 = string4",false);
-CALL test_query("SELECT pk INTO @res FROM t1 WHERE vstring1 = vstring3",false);
-CALL test_query("SELECT pk INTO @res FROM t1 WHERE bin1 = bin3",false);
-CALL test_query("SELECT pk INTO @res FROM t1 WHERE vbin1 = vbin3",false);
-
-CALL test_query("SELECT pk INTO @res FROM t1 WHERE real_decimal1 = real_decimal3",false);
-CALL test_query("SELECT pk INTO @res FROM t1 WHERE bits1 = bits3",false);
-CALL test_query("SELECT pk INTO @res FROM t1 WHERE options1 = options3",false);
-CALL test_query("SELECT pk INTO @res FROM t1 WHERE flags1 = flags3",false);
-
-CALL test_query("SELECT pk INTO @res FROM t1 WHERE time_field1 = time_field3",false);
-CALL test_query("SELECT pk INTO @res FROM t1 WHERE date_time1 = date_time3",false);
-CALL test_query("SELECT pk INTO @res FROM t1 WHERE time_stamp1 = time_stamp3",false);
+CALL test_query("SELECT k INTO @res FROM t1 WHERE string1 = string3",false);
+CALL test_query("SELECT k INTO @res FROM t1 WHERE string1 = string4",false);
+CALL test_query("SELECT k INTO @res FROM t1 WHERE vstring1 = vstring3",false);
+CALL test_query("SELECT k INTO @res FROM t1 WHERE bin1 = bin3",false);
+CALL test_query("SELECT k INTO @res FROM t1 WHERE vbin1 = vbin3",false);
+
+CALL test_query("SELECT k INTO @res FROM t1 WHERE real_decimal1 = real_decimal3",false);
+CALL test_query("SELECT k INTO @res FROM t1 WHERE bits1 = bits3",false);
+CALL test_query("SELECT k INTO @res FROM t1 WHERE options1 = options3",false);
+CALL test_query("SELECT k INTO @res FROM t1 WHERE flags1 = flags3",false);
+
+CALL test_query("SELECT k INTO @res FROM t1 WHERE time_field1 = time_field3",false);
+CALL test_query("SELECT k INTO @res FROM t1 WHERE date_time1 = date_time3",false);
+CALL test_query("SELECT k INTO @res FROM t1 WHERE time_stamp1 = time_stamp3",false);
 
 
 --echo Test that <col1> like <col2> is not pushed, - even if types are comparable
@@ -3943,7 +3930,6 @@
 --disable_query_log
 DROP PROCEDURE test_all;
 DROP PROCEDURE test_query;
-DROP FUNCTION get_pk_query;
 DROP FUNCTION get_count_query;
 DROP FUNCTION get_column;
 
@@ -4012,4 +3998,44 @@
   where v1.d < 5;
 
 drop view v1;
-drop table t1;
\ No newline at end of file
+drop table t1;
+
+
+--echo #########################################################
+--echo # WL#14388 Push condition referring fields from an
+--echo            SPJ ancestor table
+--echo #########################################################
+
+create table t1 (
+  a int,
+  b int,
+  c int,
+  d int,
+  primary key(a,b)
+) engine=ndbcluster;
+
+insert into t1 values
+(1,1,1,1), (2,2,2,2), (3,3,3,3), (4,4,4,4),
+(1,2,5,1), (1,3,1,2), (1,4,2,3),
+(2,1,3,4), (2,3,4,5), (2,4,5,1),
+(3,1,1,2), (3,2,2,3), (3,4,3,4),
+(4,1,4,5), (4,2,5,1), (4,3,1,2);
+
+# Turn of BNL, as it would prevent condition pushdown
+# referring 'other' tables.
+set optimizer_switch='block_nested_loop=off';
+
+# Below query can not push t1 join t2 as there are no index on column 'd'.
+# t2 join t3 will be pushed. Thus, t1 is a 'const_expr_table' with regard to
+# the pushed join of 't2 join t3'
+# 1) Thus the predicate 't3.c >= t1.c' should be pushed as t1 is a 'const'
+# 2) In predicate 't3.c <= t2.c, t2 may be a param when WL#14388 is complete.
+#
+explain
+select *
+from t1
+  straight_join t1 as t2 on t2.d = t1.d
+  straight_join t1 as t3 on t3.a = t2.a
+where t3.c >= t1.c and t3.c <= t2.c;
+
+drop table t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat_auto.cnf mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat_auto.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat_auto.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat_auto.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,5 @@
+!include suite/ndb_opt/my.cnf
+
+[cluster_config]
+# Reduce delay to ensure that the stats are updated quickly
+IndexStatUpdateDelay=1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat_auto.result mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat_auto.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat_auto.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat_auto.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,371 @@
+create table t1 (
+a1 int unsigned not null,
+b1 int unsigned not null,
+c1 int unsigned not null,
+primary key (a1),
+index b1x (b1),
+index c1x (c1)
+) engine=ndb comment="NDB_TABLE=PARTITION_BALANCE=FOR_RP_BY_LDM";
+create table t2 (
+a2 int unsigned not null,
+b2 int unsigned not null,
+c2 int unsigned not null,
+primary key (a2),
+index b2x (b2),
+index c2x (c2)
+) engine=ndb comment="NDB_TABLE=PARTITION_BALANCE=FOR_RP_BY_LDM";
+set @is_enable = 0;
+set @is_enable = NULL;
+# is_enable_on=0 is_enable_off=1
+# ndb_index_stat_enable - before
+show global variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	ON
+show local variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	ON
+set @@local.ndb_index_stat_enable = 0;
+set @@global.ndb_index_stat_enable = 0;
+# ndb_index_stat_enable - after
+show global variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	OFF
+show local variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	OFF
+# is_enable_on=1 is_enable_off=0
+# ndb_index_stat_enable - before
+Variable_name	Value
+ndb_index_stat_enable	OFF
+Variable_name	Value
+ndb_index_stat_enable	OFF
+# ndb_index_stat_enable - after
+Variable_name	Value
+ndb_index_stat_enable	ON
+Variable_name	Value
+ndb_index_stat_enable	ON
+Waiting for the index stats to be updated
+Index stats updated
+# is_enable_on=0 is_enable_off=1
+# ndb_index_stat_enable - before
+Variable_name	Value
+ndb_index_stat_enable	ON
+Variable_name	Value
+ndb_index_stat_enable	ON
+# ndb_index_stat_enable - after
+Variable_name	Value
+ndb_index_stat_enable	OFF
+Variable_name	Value
+ndb_index_stat_enable	OFF
+set @is_enable = 1;
+set @is_enable = NULL;
+# is_enable_on=1 is_enable_off=0
+# ndb_index_stat_enable - before
+show global variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	OFF
+show local variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	OFF
+set @@global.ndb_index_stat_enable = 1;
+set @@local.ndb_index_stat_enable = 1;
+# ndb_index_stat_enable - after
+show global variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	ON
+show local variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	ON
+Waiting for the index stats to be updated
+Index stats updated
+# must use b1x
+explain select * from t1
+where b1 = 5 and c1 = 5;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	p0,p1,p2,p3,p4,p5,p6,p7	ref	b1x,c1x	b1x	4	const	#	#	Using pushed condition (`test`.`t1`.`c1` = 5)
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`a1` AS `a1`,`test`.`t1`.`b1` AS `b1`,`test`.`t1`.`c1` AS `c1` from `test`.`t1` where ((`test`.`t1`.`c1` = 5) and (`test`.`t1`.`b1` = 5))
+# must use c2x
+explain select * from t2
+where b2 = 5 and c2 = 5;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t2	p0,p1,p2,p3,p4,p5,p6,p7	ref	b2x,c2x	c2x	4	const	#	#	Using pushed condition (`test`.`t2`.`b2` = 5)
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t2`.`a2` AS `a2`,`test`.`t2`.`b2` AS `b2`,`test`.`t2`.`c2` AS `c2` from `test`.`t2` where ((`test`.`t2`.`c2` = 5) and (`test`.`t2`.`b2` = 5))
+# must use b1x, c2x
+explain select * from t1, t2
+where c1 = c2 and b1 = 5 and b2 = 5;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	p0,p1,p2,p3,p4,p5,p6,p7	ref	b1x,c1x	b1x	4	const	#	#	Parent of 2 pushed join@1
+1	SIMPLE	t2	p0,p1,p2,p3,p4,p5,p6,p7	ref	b2x,c2x	c2x	4	test.t1.c1	#	#	Child of 't1' in pushed join@1; Using pushed condition (`test`.`t2`.`b2` = 5)
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`a1` AS `a1`,`test`.`t1`.`b1` AS `b1`,`test`.`t1`.`c1` AS `c1`,`test`.`t2`.`a2` AS `a2`,`test`.`t2`.`b2` AS `b2`,`test`.`t2`.`c2` AS `c2` from `test`.`t1` join `test`.`t2` where ((`test`.`t2`.`b2` = 5) and (`test`.`t1`.`b1` = 5) and (`test`.`t2`.`c2` = `test`.`t1`.`c1`))
+# must use c2x, b1x
+explain select * from t1, t2
+where b1 = b2 and c1 = 5 and c2 = 5;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t2	p0,p1,p2,p3,p4,p5,p6,p7	ref	b2x,c2x	c2x	4	const	#	#	Parent of 2 pushed join@1
+1	SIMPLE	t1	p0,p1,p2,p3,p4,p5,p6,p7	ref	b1x,c1x	b1x	4	test.t2.b2	#	#	Child of 't2' in pushed join@1; Using pushed condition (`test`.`t1`.`c1` = 5)
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`a1` AS `a1`,`test`.`t1`.`b1` AS `b1`,`test`.`t1`.`c1` AS `c1`,`test`.`t2`.`a2` AS `a2`,`test`.`t2`.`b2` AS `b2`,`test`.`t2`.`c2` AS `c2` from `test`.`t1` join `test`.`t2` where ((`test`.`t2`.`c2` = 5) and (`test`.`t1`.`c1` = 5) and (`test`.`t1`.`b1` = `test`.`t2`.`b2`))
+# must use t1, c2x
+explain select * from t1, t2
+where c1 = c2;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	p0,p1,p2,p3,p4,p5,p6,p7	ALL	c1x	NULL	NULL	NULL	#	#	Parent of 2 pushed join@1
+1	SIMPLE	t2	p0,p1,p2,p3,p4,p5,p6,p7	ref	c2x	c2x	4	test.t1.c1	#	#	Child of 't1' in pushed join@1
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`a1` AS `a1`,`test`.`t1`.`b1` AS `b1`,`test`.`t1`.`c1` AS `c1`,`test`.`t2`.`a2` AS `a2`,`test`.`t2`.`b2` AS `b2`,`test`.`t2`.`c2` AS `c2` from `test`.`t1` join `test`.`t2` where (`test`.`t2`.`c2` = `test`.`t1`.`c1`)
+# must use t2, b1x
+explain select * from t1, t2
+where b1 = b2;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t2	p0,p1,p2,p3,p4,p5,p6,p7	ALL	b2x	NULL	NULL	NULL	#	#	Parent of 2 pushed join@1
+1	SIMPLE	t1	p0,p1,p2,p3,p4,p5,p6,p7	ref	b1x	b1x	4	test.t2.b2	#	#	Child of 't2' in pushed join@1
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`a1` AS `a1`,`test`.`t1`.`b1` AS `b1`,`test`.`t1`.`c1` AS `c1`,`test`.`t2`.`a2` AS `a2`,`test`.`t2`.`b2` AS `b2`,`test`.`t2`.`c2` AS `c2` from `test`.`t1` join `test`.`t2` where (`test`.`t1`.`b1` = `test`.`t2`.`b2`)
+# should NOT say: Using index for group-by
+explain select distinct (a1) from t1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	p0,p1,p2,p3,p4,p5,p6,p7	ALL	PRIMARY	NULL	NULL	NULL	#	#	NULL
+Warnings:
+Note	1003	/* select#1 */ select distinct `test`.`t1`.`a1` AS `a1` from `test`.`t1`
+# must say: Using index for group by
+explain select distinct (b1) from t1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	p0,p1,p2,p3,p4,p5,p6,p7	index	b1x	b1x	4	NULL	#	#	NULL
+Warnings:
+Note	1003	/* select#1 */ select distinct `test`.`t1`.`b1` AS `b1` from `test`.`t1`
+# must say: Using index for group by
+explain select distinct (c1) from t1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	p0,p1,p2,p3,p4,p5,p6,p7	index	c1x	c1x	4	NULL	#	#	NULL
+Warnings:
+Note	1003	/* select#1 */ select distinct `test`.`t1`.`c1` AS `c1` from `test`.`t1`
+drop table t1, t2;
+create table t1 (a1 int, b1 int, primary key(b1), key(a1)) engine=ndbcluster partition by key() partitions 1;
+create table t2 (b2 int, c2 int, primary key(b2,c2)) engine=ndbcluster partition by key() partitions 1;
+set @is_enable = 0;
+set @is_enable = NULL;
+# is_enable_on=0 is_enable_off=1
+# ndb_index_stat_enable - before
+show global variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	ON
+show local variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	ON
+set @@local.ndb_index_stat_enable = 0;
+set @@global.ndb_index_stat_enable = 0;
+# ndb_index_stat_enable - after
+show global variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	OFF
+show local variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	OFF
+set @is_enable = 1;
+set @is_enable = NULL;
+# is_enable_on=1 is_enable_off=0
+# ndb_index_stat_enable - before
+show global variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	OFF
+show local variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	OFF
+set @@global.ndb_index_stat_enable = 1;
+set @@local.ndb_index_stat_enable = 1;
+# ndb_index_stat_enable - after
+show global variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	ON
+show local variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	ON
+Waiting for the index stats to be updated
+Index stats updated
+set @is_enable = 0;
+set @is_enable = NULL;
+# is_enable_on=0 is_enable_off=1
+# ndb_index_stat_enable - before
+show global variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	ON
+show local variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	ON
+set @@local.ndb_index_stat_enable = 0;
+set @@global.ndb_index_stat_enable = 0;
+# ndb_index_stat_enable - after
+show global variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	OFF
+show local variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	OFF
+# table t1 is only for forcing record by key count for table t2 that should be near 50 (not 1)
+set @is_enable = 1;
+set @is_enable = NULL;
+# is_enable_on=1 is_enable_off=0
+# ndb_index_stat_enable - before
+show global variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	OFF
+show local variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	OFF
+set @@global.ndb_index_stat_enable = 1;
+set @@local.ndb_index_stat_enable = 1;
+# ndb_index_stat_enable - after
+show global variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	ON
+show local variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	ON
+Waiting for the index stats to be updated
+Index stats updated
+explain select * from t1, t2 where b2 = b1 and a1 = 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	p0	ref	PRIMARY,a1	a1	5	const	#	100.00	Parent of 2 pushed join@1
+1	SIMPLE	t2	p0	ref	PRIMARY	PRIMARY	4	test.t1.b1	#	100.00	Child of 't1' in pushed join@1
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`a1` AS `a1`,`test`.`t1`.`b1` AS `b1`,`test`.`t2`.`b2` AS `b2`,`test`.`t2`.`c2` AS `c2` from `test`.`t1` join `test`.`t2` where ((`test`.`t1`.`a1` = 1) and (`test`.`t2`.`b2` = `test`.`t1`.`b1`))
+drop table t1, t2;
+CREATE TABLE t1(
+K INT NOT NULL AUTO_INCREMENT,
+I INT,
+J INT,
+L INT,
+PRIMARY KEY(K),
+KEY(I,J),
+KEY(L)
+) ENGINE=ndbcluster
+partition by key (K) partitions 1;
+set @is_enable = 0;
+set @is_enable = NULL;
+# is_enable_on=0 is_enable_off=1
+# ndb_index_stat_enable - before
+show global variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	ON
+show local variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	ON
+set @@local.ndb_index_stat_enable = 0;
+set @@global.ndb_index_stat_enable = 0;
+# ndb_index_stat_enable - after
+show global variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	OFF
+show local variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	OFF
+INSERT INTO t1(I,J,L) VALUES
+(1,1,1),(2,2,2),(3,3,3),(4,4,4),(5,5,5),
+(6,6,6),(7,7,7),(8,8,8),(9,9,9),(0,0,0);
+INSERT INTO t1(I,J,L) SELECT I,1,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,2,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,3,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,4,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,5,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,6,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,7,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,8,I FROM t1;
+set @is_enable = 1;
+set @is_enable = NULL;
+# is_enable_on=1 is_enable_off=0
+# ndb_index_stat_enable - before
+show global variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	OFF
+show local variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	OFF
+set @@global.ndb_index_stat_enable = 1;
+set @@local.ndb_index_stat_enable = 1;
+# ndb_index_stat_enable - after
+show global variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	ON
+show local variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	ON
+Waiting for the index stats to be updated
+Index stats updated
+select i, count(*) from t1 group by 1 order by 1;
+i	count(*)
+0	256
+1	256
+2	256
+3	256
+4	256
+5	256
+6	256
+7	256
+8	256
+9	256
+select l, count(*) from t1 group by 1 order by 1;
+l	count(*)
+0	256
+1	256
+2	256
+3	256
+4	256
+5	256
+6	256
+7	256
+8	256
+9	256
+explain SELECT count(*) as Count FROM t1 WHERE I = 5;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	p0	ref	I	I	5	const	256	100.00	NULL
+Warnings:
+Note	1003	/* select#1 */ select count(0) AS `Count` from `test`.`t1` where (`test`.`t1`.`I` = 5)
+SELECT count(*) as Count FROM t1 WHERE I = 5;
+Count
+256
+explain SELECT count(*) as Count FROM t1 WHERE L = 5;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	p0	ref	L	L	5	const	256	100.00	NULL
+Warnings:
+Note	1003	/* select#1 */ select count(0) AS `Count` from `test`.`t1` where (`test`.`t1`.`L` = 5)
+SELECT count(*) as Count FROM t1 WHERE L = 5;
+Count
+256
+drop table t1;
+#
+# Bug#28714864: Creating a table with unsupported index length crashes the data nodes
+#
+#setup
+create table t1(
+a int auto_increment primary key,
+b varchar(3053),
+c varchar(3056),
+d varchar(3072),
+col1 varchar(762) not null,
+col2 varchar(762) not null,
+col3 varchar(762) not null,
+col4 varchar(762) not null
+) engine ndb charset latin1;
+# populate enough rows to generate index stats
+# create index on b - it has the maximum key size supported by ndb index stat
+create index idxb on t1(b);
+drop index idxb on t1;
+# create index on c - it has a key size unsupported by ndb index stat
+# a warning should be returned
+create index idxc on t1(c);
+Warnings:
+Warning	1296	Specified key 'idxc' was too long (max = 3056 bytes); statistics will not be generated
+# create index on d - it has the maximum key size allowed by mysql(3072)
+# but the key size is unsupported by ndb index stat
+# a warning should be returned
+create index idxd on t1(d);
+Warnings:
+Warning	1296	Specified key 'idxd' was too long (max = 3056 bytes); statistics will not be generated
+# create index on col1..col4 - it has the maximum key size supported by ndb index stat
+create index idxcol on t1(col1, col2, col3, col4);
+drop index idxcol on t1;
+#cleanup
+drop table t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat_auto.test mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat_auto.test
--- mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat_auto.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat_auto.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,273 @@
+-- source include/have_ndb.inc
+
+#
+# This test is a subset of index_stat.test. All the ANALYZE TABLE
+# statements have been removed and we instead wait for the stats
+# to be automatically updated
+#
+
+create table t1 (
+  a1 int unsigned not null,
+  b1 int unsigned not null,
+  c1 int unsigned not null,
+  primary key (a1),
+  index b1x (b1),
+  index c1x (c1)
+) engine=ndb comment="NDB_TABLE=PARTITION_BALANCE=FOR_RP_BY_LDM";
+
+create table t2 (
+  a2 int unsigned not null,
+  b2 int unsigned not null,
+  c2 int unsigned not null,
+  primary key (a2),
+  index b2x (b2),
+  index c2x (c2)
+) engine=ndb comment="NDB_TABLE=PARTITION_BALANCE=FOR_RP_BY_LDM";
+
+# Disable index stats at the handler level so that it can be
+# reasonably ascertained that the latest stats are in the
+# cache later. This protects us from using stale stats and thus
+# leading to non-deterministic EXPLAIN output
+set @is_enable = 0;
+--source index_stat_enable.inc
+--let $old_event_count=query_get_value(SHOW STATUS LIKE 'Ndb_index_stat_event_count', Value, 1)
+
+# enough rows to make index stats more approximate
+
+--disable_query_log
+let $i = 1000;
+while ($i)
+{
+  dec $i;
+  eval insert into t1 values ($i, $i % 100, $i % 10);
+}
+
+set @is_enable = 1;
+--source index_stat_enable.inc
+--let $index_stat_db=test
+--let $index_stat_table=t1
+--source wait_index_stat_cache_updated.inc
+set @is_enable = 0;
+--source index_stat_enable.inc
+--let $old_event_count=query_get_value(SHOW STATUS LIKE 'Ndb_index_stat_event_count', Value, 1)
+
+let $i = 1000;
+while ($i)
+{
+  dec $i;
+  eval insert into t2 values ($i, $i % 10, $i % 100);
+}
+--enable_query_log
+
+set @is_enable = 1;
+--source index_stat_enable.inc
+--let $index_stat_db=test
+--let $index_stat_table=t2
+--source wait_index_stat_cache_updated.inc
+
+# TEST: key equal constant
+
+--echo # must use b1x
+--replace_column 10 # 11 #
+explain select * from t1
+  where b1 = 5 and c1 = 5;
+
+--echo # must use c2x
+--replace_column 10 # 11 #
+explain select * from t2
+  where b2 = 5 and c2 = 5;
+
+# TEST: keys equal constant in join
+
+--echo # must use b1x, c2x
+--replace_column 10 # 11 #
+explain select * from t1, t2
+  where c1 = c2 and b1 = 5 and b2 = 5;
+
+--echo # must use c2x, b1x
+--replace_column 10 # 11 #
+explain select * from t1, t2
+  where b1 = b2 and c1 = 5 and c2 = 5;
+
+# TEST: join via keys of different selectivity
+
+--echo # must use t1, c2x
+--replace_column 10 # 11 #
+explain select * from t1, t2
+  where c1 = c2;
+--echo # must use t2, b1x
+--replace_column 10 # 11 #
+explain select * from t1, t2
+  where b1 = b2;
+
+# TEST: bug#44760 quick distinct
+# QUICK_GROUP_MIN_MAX_SELECT says "Using index for group-by".
+# Should happen only for low cardinality index.
+# wl4124_todo: result is wrong until HA_KEYREAD_ONLY is set
+
+--echo # should NOT say: Using index for group-by
+--replace_column 10 # 11 #
+explain select distinct (a1) from t1;
+
+--echo # must say: Using index for group by
+--replace_column 10 # 11 #
+explain select distinct (b1) from t1;
+
+--echo # must say: Using index for group by
+--replace_column 10 # 11 #
+explain select distinct (c1) from t1;
+
+# TEST: end
+drop table t1, t2;
+
+#
+# Check estimates of records per key for partial keys using unique/primary ordered index
+#
+
+create table t1 (a1 int, b1 int, primary key(b1), key(a1)) engine=ndbcluster partition by key() partitions 1;
+create table t2 (b2 int, c2 int, primary key(b2,c2)) engine=ndbcluster partition by key() partitions 1;
+set @is_enable = 0;
+--source index_stat_enable.inc
+--let $old_event_count=query_get_value(SHOW STATUS LIKE 'Ndb_index_stat_event_count', Value, 1)
+--disable_query_log
+let $i = 100;
+while ($i)
+{
+  eval insert into t1 (a1,b1) values ($i,$i);
+  dec $i;
+}
+--enable_query_log
+
+set @is_enable = 1;
+--source index_stat_enable.inc
+--let $index_stat_db=test
+--let $index_stat_table=t1
+--source wait_index_stat_cache_updated.inc
+
+set @is_enable = 0;
+--source index_stat_enable.inc
+--let $old_event_count=query_get_value(SHOW STATUS LIKE 'Ndb_index_stat_event_count', Value, 1)
+--disable_query_log
+let $i = 100;
+while ($i)
+{
+  eval insert into t2 (b2,c2) values ($i mod 2, $i div 2);
+  dec $i;
+}
+--enable_query_log
+
+--echo # table t1 is only for forcing record by key count for table t2 that should be near 50 (not 1)
+set @is_enable = 1;
+--source index_stat_enable.inc
+--let $index_stat_db=test
+--let $index_stat_table=t2
+--source wait_index_stat_cache_updated.inc
+# Hide Extra column
+--replace_column 10 #
+explain select * from t1, t2 where b2 = b1 and a1 = 1;
+
+drop table t1, t2;
+
+# bugXXXXX rule b3.3 fix
+
+CREATE TABLE t1(
+  K INT NOT NULL AUTO_INCREMENT,
+  I INT,
+  J INT,
+  L INT,
+  PRIMARY KEY(K),
+  KEY(I,J),
+  KEY(L)
+) ENGINE=ndbcluster
+  partition by key (K) partitions 1;
+
+set @is_enable = 0;
+--source index_stat_enable.inc
+--let $old_event_count=query_get_value(SHOW STATUS LIKE 'Ndb_index_stat_event_count', Value, 1)
+
+INSERT INTO t1(I,J,L) VALUES
+(1,1,1),(2,2,2),(3,3,3),(4,4,4),(5,5,5),
+(6,6,6),(7,7,7),(8,8,8),(9,9,9),(0,0,0);
+
+INSERT INTO t1(I,J,L) SELECT I,1,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,2,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,3,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,4,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,5,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,6,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,7,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,8,I FROM t1;
+
+set @is_enable = 1;
+--source index_stat_enable.inc
+--let $index_stat_db=test
+--let $index_stat_table=t1
+--source wait_index_stat_cache_updated.inc
+
+select i, count(*) from t1 group by 1 order by 1;
+select l, count(*) from t1 group by 1 order by 1;
+
+explain SELECT count(*) as Count FROM t1 WHERE I = 5;
+SELECT count(*) as Count FROM t1 WHERE I = 5;
+
+# before fix rows was 128 instead of 256
+explain SELECT count(*) as Count FROM t1 WHERE L = 5;
+SELECT count(*) as Count FROM t1 WHERE L = 5;
+
+drop table t1;
+
+--echo #
+--echo # Bug#28714864: Creating a table with unsupported index length crashes the data nodes
+--echo #
+
+--echo #setup
+create table t1(
+  a int auto_increment primary key,
+  b varchar(3053),
+  c varchar(3056),
+  d varchar(3072),
+  col1 varchar(762) not null,
+  col2 varchar(762) not null,
+  col3 varchar(762) not null,
+  col4 varchar(762) not null
+) engine ndb charset latin1;
+
+--echo # populate enough rows to generate index stats
+--disable_query_log
+insert into t1 (b, c, d, col1, col2, col3, col4)
+  values (repeat('a', 3051), repeat('b', 3056), repeat('c', 3072),
+          repeat('d', 762), repeat('e', 762), repeat('f', 762), repeat('g', 762));
+insert into t1 (b, c, d, col1, col2, col3, col4)
+  values (repeat('h', 3051), repeat('i', 3056), repeat('j', 3072),
+          repeat('k', 762), repeat('l', 762), repeat('m', 762), repeat('n', 762));
+let $i = 5;
+while ($i)
+{
+  eval insert into t1 (b, c, d, col1, col2, col3, col4)
+    select b, c, d, col1, col2, col3, col4 from t1;
+  dec $i;
+}
+--enable_query_log
+
+--echo # create index on b - it has the maximum key size supported by ndb index stat
+create index idxb on t1(b); # max key size = 3056 (col size = 3053, length bytes = 2, nullmask = 1)
+
+drop index idxb on t1;
+
+--echo # create index on c - it has a key size unsupported by ndb index stat
+--echo # a warning should be returned
+create index idxc on t1(c); # max key size = 3059 (col size = 3056, length bytes = 2, nullmask = 1)
+
+--echo # create index on d - it has the maximum key size allowed by mysql(3072)
+--echo # but the key size is unsupported by ndb index stat
+--echo # a warning should be returned
+create index idxd on t1(d); # max key size = 3075 (col size = 3072, length bytes = 2, nullmask = 1)
+
+--echo # create index on col1..col4 - it has the maximum key size supported by ndb index stat
+# max key size = 3056 (total col size = 3048[762 * 4], length bytes = 8[2 * 4], nullmask = 0)
+create index idxcol on t1(col1, col2, col3, col4);
+
+drop index idxcol on t1;
+
+--echo #cleanup
+drop table t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat_index_size.cnf mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat_index_size.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat_index_size.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat_index_size.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,6 @@
+!include suite/ndb_opt/my.cnf
+
+[cluster_config]
+# Retain old default value to show how the behaviour has changed
+# without auto index stat enabled
+IndexStatAutoCreate=0
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat_index_size.result mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat_index_size.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat_index_size.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat_index_size.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,52 @@
+#
+# Bug#28714864: Running 'analyze' on table with unsupported index length crashes the data nodes
+#
+#setup
+create table t1(
+a int auto_increment primary key,
+b varchar(3053),
+c varchar(3056),
+d varchar(3072),
+col1 varchar(762) not null,
+col2 varchar(762) not null,
+col3 varchar(762) not null,
+col4 varchar(762) not null
+) engine ndb charset latin1;
+# populate enough rows to generate index stats
+# create index on b - it has the maximum key size supported by ndb index stat
+create index idxb on t1(b);
+# analyze should run fine and create statistics
+analyze table t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+drop index idxb on t1;
+# create index on c - it has a key size unsupported by ndb index stat
+# a warning should be returned
+create index idxc on t1(c);
+Warnings:
+Warning	1296	Specified key 'idxc' was too long (max = 3056 bytes); statistics will not be generated
+# analyze should run fine but statistics aren't created
+analyze table t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+drop index idxc on t1;
+# create index on d - it has the maximum key size allowed by mysql(3072)
+# but the key size is unsupported by ndb index stat
+# a warning should be returned
+create index idxd on t1(d);
+Warnings:
+Warning	1296	Specified key 'idxd' was too long (max = 3056 bytes); statistics will not be generated
+# analyze should run fine but statistics aren't created
+analyze table t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+drop index idxd on t1;
+# create index on col1..col4 - it has the maximum key size supported by ndb index stat
+create index idxcol on t1(col1, col2, col3, col4);
+# analyze should run fine
+analyze table t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+drop index idxcol on t1;
+#cleanup
+drop table t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat_index_size.test mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat_index_size.test
--- mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat_index_size.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat_index_size.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,69 @@
+--source include/have_ndb.inc
+
+--echo #
+--echo # Bug#28714864: Running 'analyze' on table with unsupported index length crashes the data nodes
+--echo #
+
+--echo #setup
+create table t1(
+  a int auto_increment primary key,
+  b varchar(3053),
+  c varchar(3056),
+  d varchar(3072),
+  col1 varchar(762) not null,
+  col2 varchar(762) not null,
+  col3 varchar(762) not null,
+  col4 varchar(762) not null
+) engine ndb charset latin1;
+
+--echo # populate enough rows to generate index stats
+--disable_query_log
+insert into t1 (b, c, d, col1, col2, col3, col4)
+  values (repeat('a', 3051), repeat('b', 3056), repeat('c', 3072),
+          repeat('d', 762), repeat('e', 762), repeat('f', 762), repeat('g', 762));
+insert into t1 (b, c, d, col1, col2, col3, col4)
+  values (repeat('h', 3051), repeat('i', 3056), repeat('j', 3072),
+          repeat('k', 762), repeat('l', 762), repeat('m', 762), repeat('n', 762));
+let $i = 5;
+while ($i)
+{
+  eval insert into t1 (b, c, d, col1, col2, col3, col4)
+    select b, c, d, col1, col2, col3, col4 from t1;
+  dec $i;
+}
+--enable_query_log
+
+--echo # create index on b - it has the maximum key size supported by ndb index stat
+create index idxb on t1(b); # max key size = 3056 (col size = 3053, length bytes = 2, nullmask = 1)
+
+--echo # analyze should run fine and create statistics
+analyze table t1;
+drop index idxb on t1;
+
+--echo # create index on c - it has a key size unsupported by ndb index stat
+--echo # a warning should be returned
+create index idxc on t1(c); # max key size = 3059 (col size = 3056, length bytes = 2, nullmask = 1)
+
+--echo # analyze should run fine but statistics aren't created
+analyze table t1;
+drop index idxc on t1;
+
+--echo # create index on d - it has the maximum key size allowed by mysql(3072)
+--echo # but the key size is unsupported by ndb index stat
+--echo # a warning should be returned
+create index idxd on t1(d); # max key size = 3075 (col size = 3072, length bytes = 2, nullmask = 1)
+
+--echo # analyze should run fine but statistics aren't created
+analyze table t1;
+drop index idxd on t1;
+
+--echo # create index on col1..col4 - it has the maximum key size supported by ndb index stat
+# max key size = 3056 (total col size = 3048[762 * 4], length bytes = 8[2 * 4], nullmask = 0)
+create index idxcol on t1(col1, col2, col3, col4);
+
+--echo # analyze should run fine
+analyze table t1;
+drop index idxcol on t1;
+
+--echo #cleanup
+drop table t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat_kernel.cnf mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat_kernel.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat_kernel.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat_kernel.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,5 @@
+!include suite/ndb_opt/my.cnf
+
+[cluster_config]
+# Reduce delay to ensure that the stats are updated frequently
+IndexStatUpdateDelay=1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat_kernel.result mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat_kernel.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat_kernel.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat_kernel.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,14 @@
+CREATE TABLE t1 (
+a INT NOT NULL,
+b INT NOT NULL,
+PRIMARY KEY USING HASH (a),
+INDEX (b)
+) ENGINE NDB;
+Check if the stats have been automatically created
+SELECT CASE COUNT(*) WHEN 0 THEN 'NO' ELSE 'YES' END AS stats_created FROM index_stats;
+stats_created
+YES
+Insert rows to trigger automatic update of stats
+Wait for stats update
+Stats automatically updated
+DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat_kernel.test mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat_kernel.test
--- mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat_kernel.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat_kernel.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,35 @@
+--source include/have_ndb.inc
+
+#
+# Basic test to verify the automatic creatiion and update of
+# index stats in the kernel
+#
+
+CREATE TABLE t1 (
+  a INT NOT NULL,
+  b INT NOT NULL,
+  PRIMARY KEY USING HASH (a),
+  INDEX (b)
+) ENGINE NDB;
+
+--echo Check if the stats have been automatically created
+--let $index_stat_db=test
+--let $index_stat_table=t1
+--source check_index_stat_created.inc
+
+--echo Insert rows to trigger automatic update of stats
+--disable_query_log
+--let $i = 1000
+while ($i)
+{
+  --dec $i
+  --eval INSERT INTO t1 VALUES ($i, $i % 10)
+}
+--enable_query_log
+
+--echo Wait for stats update
+--let $index_stat_db=test
+--let $index_stat_table=t1
+--source wait_index_stat_updated.inc
+
+DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat_partitions_auto.cnf mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat_partitions_auto.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat_partitions_auto.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat_partitions_auto.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,5 @@
+!include suite/ndb_opt/my.cnf
+
+[cluster_config]
+# Reduce delay to ensure that the stats are updated frequently
+IndexStatUpdateDelay=1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat_partitions_auto.result mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat_partitions_auto.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat_partitions_auto.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat_partitions_auto.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,158 @@
+create table record_in_range(no int primary key auto_increment,
+query varchar(256), part_count int,
+explain_rows int, count_rows int) engine = innodb;
+CREATE TABLE t1(
+K INT NOT NULL AUTO_INCREMENT,
+I INT,
+J INT,
+L INT,
+PRIMARY KEY(K),
+KEY(I,J),
+KEY(L)
+) ENGINE=ndbcluster
+partition by key (K) partitions 1;
+set @is_enable = 0;
+set @is_enable = NULL;
+# is_enable_on=0 is_enable_off=1
+# ndb_index_stat_enable - before
+show global variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	ON
+show local variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	ON
+set @@local.ndb_index_stat_enable = 0;
+set @@global.ndb_index_stat_enable = 0;
+# ndb_index_stat_enable - after
+show global variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	OFF
+show local variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	OFF
+INSERT INTO t1(I,J,L) VALUES
+(1,1,1),(2,2,2),(3,3,3),(4,4,4),(5,5,5),
+(6,6,6),(7,7,7),(8,8,8),(9,9,9),(0,0,0);
+INSERT INTO t1(I,J,L) SELECT I,1,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,2,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,3,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,4,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,5,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,6,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,7,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,8,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,9,I FROM t1;
+set @is_enable = 1;
+set @is_enable = NULL;
+# is_enable_on=1 is_enable_off=0
+# ndb_index_stat_enable - before
+show global variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	OFF
+show local variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	OFF
+set @@global.ndb_index_stat_enable = 1;
+set @@local.ndb_index_stat_enable = 1;
+# ndb_index_stat_enable - after
+show global variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	ON
+show local variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	ON
+Waiting for the index stats to be updated
+Index stats updated
+select i, count(*) from t1 group by 1 order by 1;
+i	count(*)
+0	512
+1	512
+2	512
+3	512
+4	512
+5	512
+6	512
+7	512
+8	512
+9	512
+select l, count(*) from t1 group by 1 order by 1;
+l	count(*)
+0	512
+1	512
+2	512
+3	512
+4	512
+5	512
+6	512
+7	512
+8	512
+9	512
+# is_enable_on=0 is_enable_off=1
+# ndb_index_stat_enable - before
+Variable_name	Value
+ndb_index_stat_enable	ON
+Variable_name	Value
+ndb_index_stat_enable	ON
+# ndb_index_stat_enable - after
+Variable_name	Value
+ndb_index_stat_enable	OFF
+Variable_name	Value
+ndb_index_stat_enable	OFF
+set @is_enable = 1;
+set @is_enable = NULL;
+# is_enable_on=1 is_enable_off=0
+# ndb_index_stat_enable - before
+show global variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	OFF
+show local variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	OFF
+set @@global.ndb_index_stat_enable = 1;
+set @@local.ndb_index_stat_enable = 1;
+# ndb_index_stat_enable - after
+show global variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	ON
+show local variables like 'ndb_index_stat_enable';
+Variable_name	Value
+ndb_index_stat_enable	ON
+Waiting for the index stats to be updated
+Index stats updated
+select distinct
+substring(rr.query from INSTR(rr.query, 'WHERE')) as 'WHERE',
+count_rows,
+p1.val as p1_val,
+if(p8.err_pct is not null and abs(p8.err_pct)<45,'-',p8.val) p8_val,
+case when p1.err_pct is null then '-' when abs(p1.err_pct)<45 then '<45' else p1.err_pct end p1_err_pct,
+case when p8.err_pct is null then '-' when abs(p8.err_pct)<45 then '<45' else p8.err_pct end p8_err_pct
+from record_in_range rr,
+(select query, explain_rows as val, if(count_rows>0,floor(100*(explain_rows - count_rows) / count_rows),NULL) err_pct
+from record_in_range p where part_count = 1) p1,
+(select query, explain_rows as val, if(count_rows>0,floor(100*(explain_rows - count_rows) / count_rows),NULL) err_pct
+from record_in_range p where part_count = 8) p8
+where rr.query = p1.query
+and rr.query = p8.query
+order by rr.no;
+WHERE	count_rows	p1_val	p8_val	p1_err_pct	p8_err_pct
+WHERE i = 10	0	2	2	-	-
+WHERE i = 9	512	512	-	<45	<45
+WHERE i = 8	512	512	-	<45	<45
+WHERE i = 7	512	512	-	<45	<45
+WHERE i = 6	512	512	-	<45	<45
+WHERE i = 5	512	512	-	<45	<45
+WHERE i = 4	512	512	-	<45	<45
+WHERE i = 3	512	512	-	<45	<45
+WHERE i = 2	512	512	-	<45	<45
+WHERE i = 1	512	512	-	<45	<45
+WHERE l = 10	0	2	2	-	-
+WHERE l = 9	512	512	-	<45	<45
+WHERE l = 8	512	512	-	<45	<45
+WHERE l = 7	512	512	-	<45	<45
+WHERE l = 6	512	512	-	<45	<45
+WHERE l = 5	512	512	-	<45	<45
+WHERE l = 4	512	512	-	<45	<45
+WHERE l = 3	512	512	-	<45	<45
+WHERE l = 2	512	512	-	<45	<45
+WHERE l = 1	512	512	-	<45	<45
+DROP TABLE t1, record_in_range;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat_partitions_auto.test mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat_partitions_auto.test
--- mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat_partitions_auto.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat_partitions_auto.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,141 @@
+-- source include/have_ndb.inc
+
+#
+# This is a duplicate of the index_stat_partitions.test. All the ANALYZE
+# TABLE statements have been removed and we instead wait for the stats
+# to be automatically updated
+#
+
+create table record_in_range(no int primary key auto_increment,
+query varchar(256), part_count int,
+explain_rows int, count_rows int) engine = innodb;
+
+CREATE TABLE t1(
+  K INT NOT NULL AUTO_INCREMENT,
+  I INT,
+  J INT,
+  L INT,
+  PRIMARY KEY(K),
+  KEY(I,J),
+  KEY(L)
+) ENGINE=ndbcluster
+  partition by key (K) partitions 1;
+
+--let $old_event_count=query_get_value(SHOW STATUS LIKE 'Ndb_index_stat_event_count', Value, 1)
+
+set @is_enable = 0;
+--source index_stat_enable.inc
+
+INSERT INTO t1(I,J,L) VALUES
+(1,1,1),(2,2,2),(3,3,3),(4,4,4),(5,5,5),
+(6,6,6),(7,7,7),(8,8,8),(9,9,9),(0,0,0);
+
+INSERT INTO t1(I,J,L) SELECT I,1,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,2,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,3,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,4,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,5,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,6,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,7,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,8,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,9,I FROM t1;
+
+set @is_enable = 1;
+--source index_stat_enable.inc
+--let $index_stat_db=test
+--let $index_stat_name=t1
+--source wait_index_stat_cache_updated.inc
+
+select i, count(*) from t1 group by 1 order by 1;
+select l, count(*) from t1 group by 1 order by 1;
+
+--disable_query_log
+let $i = 10;
+let $p = 1;
+while ($i)
+{
+  --let $q=SELECT count(*) as Count FROM t1 WHERE i = $i
+  --let $explain_type= query_get_value(EXPLAIN $q, type, 1)
+  --let $explain_rows= query_get_value(EXPLAIN $q, rows, 1)
+  --let $count_rows= query_get_value($q, Count, 1)
+  --eval insert into record_in_range(query,part_count,explain_rows,count_rows) values ('$q',$p,$explain_rows,$count_rows);
+  dec $i;
+}
+
+let $l = 10;
+while ($l)
+{
+  --let $q=SELECT count(*) as Count FROM t1 WHERE l = $l
+  --let $explain_type= query_get_value(EXPLAIN $q, type, 1)
+  --let $explain_rows= query_get_value(EXPLAIN $q, rows, 1)
+  --let $count_rows= query_get_value($q, Count, 1)
+  --eval insert into record_in_range(query,part_count,explain_rows,count_rows) values ('$q',$p,$explain_rows,$count_rows);
+  dec $l;
+}
+
+#--let $old_sample_version=$sample_version
+--let $old_event_count=query_get_value(SHOW STATUS LIKE 'Ndb_index_stat_event_count', Value, 1)
+set @is_enable = 0;
+--source index_stat_enable.inc
+
+alter table t1 partition by key() partitions 8;
+
+--enable_query_log
+
+set @is_enable = 1;
+--source index_stat_enable.inc
+--let $index_stat_db=test
+--let $index_stat_name=t1
+--source wait_index_stat_cache_updated.inc
+
+--disable_query_log
+
+let $p = 8;
+let $i = 10;
+while ($i)
+{
+  --let $q=SELECT count(*) as Count FROM t1 WHERE i = $i
+  --let $explain_type= query_get_value(EXPLAIN $q, type, 1)
+  --let $explain_rows= query_get_value(EXPLAIN $q, rows, 1)
+  --let $count_rows= query_get_value($q, Count, 1)
+  --eval insert into record_in_range(query,part_count,explain_rows,count_rows) values ('$q',$p,$explain_rows,$count_rows);
+  dec $i;
+}
+
+let $l = 10;
+while ($l)
+{
+  --let $q=SELECT count(*) as Count FROM t1 WHERE l = $l
+  --let $explain_type= query_get_value(EXPLAIN $q, type, 1)
+  --let $explain_rows= query_get_value(EXPLAIN $q, rows, 1)
+  --let $count_rows= query_get_value($q, Count, 1)
+  --eval insert into record_in_range(query,part_count,explain_rows,count_rows) values ('$q',$p,$explain_rows,$count_rows);
+  dec $l;
+}
+
+--enable_query_log
+
+# Change sql_mode to allow the reporting query below
+# which uses "DISTINCT with an ORDER BY on column which
+# is not in the select list"
+--source include/turn_off_only_full_group_by.inc
+
+select distinct
+       substring(rr.query from INSTR(rr.query, 'WHERE')) as 'WHERE',
+       count_rows,
+       p1.val as p1_val,
+       if(p8.err_pct is not null and abs(p8.err_pct)<45,'-',p8.val) p8_val,
+       case when p1.err_pct is null then '-' when abs(p1.err_pct)<45 then '<45' else p1.err_pct end p1_err_pct,
+       case when p8.err_pct is null then '-' when abs(p8.err_pct)<45 then '<45' else p8.err_pct end p8_err_pct
+from record_in_range rr,
+     (select query, explain_rows as val, if(count_rows>0,floor(100*(explain_rows - count_rows) / count_rows),NULL) err_pct
+      from record_in_range p where part_count = 1) p1,
+     (select query, explain_rows as val, if(count_rows>0,floor(100*(explain_rows - count_rows) / count_rows),NULL) err_pct
+      from record_in_range p where part_count = 8) p8
+where rr.query = p1.query
+  and rr.query = p8.query
+order by rr.no;
+
+--source include/restore_sql_mode_after_turn_off_only_full_group_by.inc
+
+DROP TABLE t1, record_in_range;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat_partitions.result mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat_partitions.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat_partitions.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat_partitions.result	2021-09-28 11:46:34.000000000 +0000
@@ -18,7 +18,7 @@
 ndb_index_stat_enable	ON
 create table record_in_range(no int primary key auto_increment,
 query varchar(256), part_count int, 
-explain_rows int, count_rows int) engine = myisam;
+explain_rows int, count_rows int) engine = innodb;
 CREATE TABLE t1(
 K INT NOT NULL AUTO_INCREMENT,
 I INT,
@@ -32,15 +32,15 @@
 INSERT INTO t1(I,J,L) VALUES
 (1,1,1),(2,2,2),(3,3,3),(4,4,4),(5,5,5),
 (6,6,6),(7,7,7),(8,8,8),(9,9,9),(0,0,0);
-INSERT INTO t1(I,J,L) SELECT I,1,I FROM t1 ORDER BY K;
-INSERT INTO t1(I,J,L) SELECT I,2,I FROM t1 ORDER BY K;
-INSERT INTO t1(I,J,L) SELECT I,3,I FROM t1 ORDER BY K;
-INSERT INTO t1(I,J,L) SELECT I,4,I FROM t1 ORDER BY K;
-INSERT INTO t1(I,J,L) SELECT I,5,I FROM t1 ORDER BY K;
-INSERT INTO t1(I,J,L) SELECT I,6,I FROM t1 ORDER BY K;
-INSERT INTO t1(I,J,L) SELECT I,7,I FROM t1 ORDER BY K;
-INSERT INTO t1(I,J,L) SELECT I,8,I FROM t1 ORDER BY K;
-INSERT INTO t1(I,J,L) SELECT I,9,I FROM t1 ORDER BY K;
+INSERT INTO t1(I,J,L) SELECT I,1,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,2,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,3,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,4,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,5,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,6,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,7,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,8,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,9,I FROM t1;
 select i, count(*) from t1 group by 1 order by 1;
 i	count(*)
 0	512
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat_partitions.test mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat_partitions.test
--- mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat_partitions.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat_partitions.test	2021-09-28 11:46:34.000000000 +0000
@@ -7,7 +7,7 @@
 
 create table record_in_range(no int primary key auto_increment,
 query varchar(256), part_count int, 
-explain_rows int, count_rows int) engine = myisam;
+explain_rows int, count_rows int) engine = innodb;
 
 CREATE TABLE t1(
   K INT NOT NULL AUTO_INCREMENT,
@@ -24,15 +24,15 @@
 (1,1,1),(2,2,2),(3,3,3),(4,4,4),(5,5,5),
 (6,6,6),(7,7,7),(8,8,8),(9,9,9),(0,0,0);
 
-INSERT INTO t1(I,J,L) SELECT I,1,I FROM t1 ORDER BY K;
-INSERT INTO t1(I,J,L) SELECT I,2,I FROM t1 ORDER BY K;
-INSERT INTO t1(I,J,L) SELECT I,3,I FROM t1 ORDER BY K;
-INSERT INTO t1(I,J,L) SELECT I,4,I FROM t1 ORDER BY K;
-INSERT INTO t1(I,J,L) SELECT I,5,I FROM t1 ORDER BY K;
-INSERT INTO t1(I,J,L) SELECT I,6,I FROM t1 ORDER BY K;
-INSERT INTO t1(I,J,L) SELECT I,7,I FROM t1 ORDER BY K;
-INSERT INTO t1(I,J,L) SELECT I,8,I FROM t1 ORDER BY K;
-INSERT INTO t1(I,J,L) SELECT I,9,I FROM t1 ORDER BY K;
+INSERT INTO t1(I,J,L) SELECT I,1,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,2,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,3,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,4,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,5,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,6,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,7,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,8,I FROM t1;
+INSERT INTO t1(I,J,L) SELECT I,9,I FROM t1;
 
 select i, count(*) from t1 group by 1 order by 1;
 select l, count(*) from t1 group by 1 order by 1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat_restart_auto.cnf mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat_restart_auto.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat_restart_auto.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat_restart_auto.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,11 @@
+!include suite/ndb_opt/my.cnf
+
+[cluster_config]
+# Reduce delay to ensure that the stats are updated frequently
+IndexStatUpdateDelay=1
+
+[mysqld.1.1]
+log-bin=mysqld-bin
+
+[mysqld.2.1]
+log-bin=mysqld-bin
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat_restart_auto.result mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat_restart_auto.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat_restart_auto.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat_restart_auto.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,52 @@
+create table t1 (
+a int primary key,
+b int,
+c int,
+key t1x1 (b),
+key t1x2 (c)
+) engine=ndb
+partition by key (a) partitions 1;
+insert into t1 values (1,1,1),(2,1,1),(3,2,1),(4,2,1);
+Waiting for the index stats to be updated
+Index stats updated
+select count(*) from t1 where b = 1;
+count(*)
+2
+select count(*) from t1 where c = 1;
+count(*)
+4
+show status like 'ndb_index_stat_cache%';
+Variable_name	Value
+Ndb_index_stat_cache_query	81
+Ndb_index_stat_cache_clean	0
+# restart cluster --initial
+# wait for mysqld
+set global ndb_dbg_check_shares=1;
+drop table if exists t1;
+Warnings:
+Note	1051	Unknown table 'test.t1'
+create table t1 (
+a int primary key,
+b int,
+c int,
+key t1x1 (b),
+key t1x2 (c)
+) engine=ndb
+partition by key (a) partitions 1;
+insert into t1 values (1,1,1),(2,1,1),(3,2,1),(4,2,1);
+Waiting for the index stats to be updated
+Index stats updated
+Check if events were detected in the other MySQL Server as well
+events_detected
+YES
+select count(*) from t1 where b = 1;
+count(*)
+2
+select count(*) from t1 where c = 1;
+count(*)
+4
+show status like 'ndb_index_stat_cache%';
+Variable_name	Value
+Ndb_index_stat_cache_query	81
+Ndb_index_stat_cache_clean	0
+drop table t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat_restart_auto.test mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat_restart_auto.test
--- mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat_restart_auto.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat_restart_auto.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,96 @@
+--source include/have_multi_ndb.inc
+--source include/have_log_bin.inc
+
+#
+# This is a duplicate of the index_stat_restart.test. All the ANALYZE
+# TABLE statements have been removed and we instead wait for the stats
+# to be automatically updated
+#
+
+create table t1 (
+  a int primary key,
+  b int,
+  c int,
+  key t1x1 (b),
+  key t1x2 (c)
+) engine=ndb
+  partition by key (a) partitions 1;
+
+--let $old_event_count=query_get_value(SHOW STATUS LIKE 'Ndb_index_stat_event_count', Value, 1)
+
+insert into t1 values (1,1,1),(2,1,1),(3,2,1),(4,2,1);
+--let $index_stat_db=test
+--let $index_stat_name=t1
+--source wait_index_stat_cache_updated.inc
+
+# put some entries into index stats cache
+select count(*) from t1 where b = 1;
+select count(*) from t1 where c = 1;
+show status like 'ndb_index_stat_cache%';
+
+--echo # restart cluster --initial
+--exec $NDB_MGM -e "all restart -i -n" >> $NDB_TOOLS_OUTPUT
+--exec $NDB_WAITER --not-started >> $NDB_TOOLS_OUTPUT
+--exec $NDB_MGM -e "all start" >> $NDB_TOOLS_OUTPUT
+--exec $NDB_WAITER >> $NDB_TOOLS_OUTPUT
+
+--echo # wait for mysqld
+--source include/ndb_not_readonly.inc
+# wait for stats thread to re-initialize
+--source suite/ndb/include/ndb_index_stat_wait.inc
+
+--error 0,1193
+set global ndb_dbg_check_shares=1;
+
+--error 0,1051
+drop table if exists t1;
+
+create table t1 (
+  a int primary key,
+  b int,
+  c int,
+  key t1x1 (b),
+  key t1x2 (c)
+) engine=ndb
+  partition by key (a) partitions 1;
+
+--let $old_event_count=query_get_value(SHOW STATUS LIKE 'Ndb_index_stat_event_count', Value, 1)
+connection server2;
+--let $old_event_count2=query_get_value(SHOW STATUS LIKE 'Ndb_index_stat_event_count', Value, 1)
+connection server1;
+
+insert into t1 values (1,1,1),(2,1,1),(3,2,1),(4,2,1);
+--let $index_stat_db=test
+--let $index_stat_name=t1
+--source wait_index_stat_cache_updated.inc
+
+connection server2;
+--echo Check if events were detected in the other MySQL Server as well
+# Disable query log since $old_event_count2 can be any value
+--disable_query_log
+eval SELECT CASE VARIABLE_VALUE > $old_event_count2
+     WHEN 1 THEN 'YES' ELSE 'NO' END
+     AS events_detected
+     FROM performance_schema.global_status
+     WHERE VARIABLE_NAME LIKE 'Ndb_index_stat_event_count';
+--enable_query_log
+connection server1;
+
+# put some entries into index stats cache
+select count(*) from t1 where b = 1;
+select count(*) from t1 where c = 1;
+show status like 'ndb_index_stat_cache%';
+
+drop table t1;
+
+# Ignore the warning generated by ndbcluster's binlog thread
+# when cluster is restarted
+--disable_query_log ONCE
+call mtr.add_suppression("cluster disconnect An incident event has been written");
+
+# Ignore the warning generated by ndbcluster's binlog thread
+# when cluster is restarted - also on the second mysqld
+connection server2;
+--disable_query_log ONCE
+call mtr.add_suppression("cluster disconnect An incident event has been written");
+--remove_file $NDB_TOOLS_OUTPUT
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat_restart.cnf mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat_restart.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat_restart.cnf	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat_restart.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -5,6 +5,3 @@
 
 [mysqld.2.1]
 log-bin=mysqld-bin
-
-[ENV]
-NDB_BACKUP_DIR=@cluster_config.ndbd.1.1.BackupDataDir
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat_restart.test mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat_restart.test
--- mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat_restart.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat_restart.test	2021-09-28 11:46:34.000000000 +0000
@@ -1,6 +1,5 @@
 --source include/have_ndb.inc
 --source include/have_log_bin.inc
---source suite/ndb/include/backup_restore_setup.inc
 
 set @is_enable_default = @@global.ndb_index_stat_enable;
 
@@ -24,19 +23,12 @@
 select count(*) from t1 where c = 1;
 show status like 'ndb_index_stat_cache%';
 
-# fetch current backup id to be able to restore it after initital restart
---source include/ndb_backup_id.inc
-
 --echo # restart cluster --initial
 --exec $NDB_MGM -e "all restart -i -n" >> $NDB_TOOLS_OUTPUT
 --exec $NDB_WAITER --not-started >> $NDB_TOOLS_OUTPUT
 --exec $NDB_MGM -e "all start" >> $NDB_TOOLS_OUTPUT
 --exec $NDB_WAITER >> $NDB_TOOLS_OUTPUT
 
-# now make a backup with explicit id to restore the backup id after initial start
---inc $the_backup_id
---exec $NDB_MGM -e "start backup $the_backup_id" >> $NDB_TOOLS_OUTPUT
-
 --echo # wait for mysqld
 --source include/ndb_not_readonly.inc
 # wait for stats thread to re-initialize
@@ -82,5 +74,4 @@
 connection mysqld2;
 --disable_query_log ONCE
 call mtr.add_suppression("cluster disconnect An incident event has been written");
---source suite/ndb/include/backup_restore_cleanup.inc
 --remove_file $NDB_TOOLS_OUTPUT
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat.result mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat.result	2021-09-28 11:46:34.000000000 +0000
@@ -592,54 +592,6 @@
 val int unsigned, UNIQUE (val)) ENGINE=NDBCluster;
 INSERT INTO test.t1 values (1,1), (2,2);
 DROP TABLE t1;
-#
-# Bug#28714864: Running 'analyze' on table with unsupported index length crashes the data nodes
-#
-#setup
-create table t1(
-a int auto_increment primary key,
-b varchar(3053),
-c varchar(3056),
-d varchar(3072),
-col1 varchar(762) not null,
-col2 varchar(762) not null,
-col3 varchar(762) not null,
-col4 varchar(762) not null
-) engine ndb charset latin1;
-# populate enough rows to generate index stats
-# create index on b - it has the maximum key size supported by ndb index stat
-create index idxb on t1(b);
-# analyze should run fine
-analyze table t1;
-Table	Op	Msg_type	Msg_text
-test.t1	analyze	status	OK
-drop index idxb on t1;
-# create index on c - it has a key size unsupported by ndb index stat
-create index idxc on t1(c);
-# analyze should fail with error 911
-analyze table t1;
-Table	Op	Msg_type	Msg_text
-test.t1	analyze	Error	Got error 911 'Index stat scan requested on index with unsupported key size' from NDB
-test.t1	analyze	status	Operation failed
-drop index idxc on t1;
-# create index on d - it has the maximum key size allowed by mysql(3072)
-# but the key size is unsupported by ndb index stat
-create index idxd on t1(d);
-# analyze should fail with error 911
-analyze table t1;
-Table	Op	Msg_type	Msg_text
-test.t1	analyze	Error	Got error 911 'Index stat scan requested on index with unsupported key size' from NDB
-test.t1	analyze	status	Operation failed
-drop index idxd on t1;
-# create index on col1..col4 - it has the maximum key size supported by ndb index stat
-create index idxcol on t1(col1, col2, col3, col4);
-# analyze should run fine
-analyze table t1;
-Table	Op	Msg_type	Msg_text
-test.t1	analyze	status	OK
-drop index idxcol on t1;
-#cleanup
-drop table t1;
 call mtr.add_suppression("Failed to acquire global schema lock");
 call mtr.add_suppression("Failed to release global schema lock");
 set @is_enable = @is_enable_default;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat.test mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat.test
--- mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/index_stat.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/index_stat.test	2021-09-28 11:46:34.000000000 +0000
@@ -398,72 +398,6 @@
 #clean up
 DROP TABLE t1;
 
---echo #
---echo # Bug#28714864: Running 'analyze' on table with unsupported index length crashes the data nodes
---echo #
-
---echo #setup
-create table t1(
-  a int auto_increment primary key,
-  b varchar(3053),
-  c varchar(3056),
-  d varchar(3072),
-  col1 varchar(762) not null,
-  col2 varchar(762) not null,
-  col3 varchar(762) not null,
-  col4 varchar(762) not null
-) engine ndb charset latin1;
-
---echo # populate enough rows to generate index stats
---disable_query_log
-insert into t1 (b, c, d, col1, col2, col3, col4)
-  values (repeat('a', 3051), repeat('b', 3056), repeat('c', 3072),
-          repeat('d', 762), repeat('e', 762), repeat('f', 762), repeat('g', 762));
-insert into t1 (b, c, d, col1, col2, col3, col4)
-  values (repeat('h', 3051), repeat('i', 3056), repeat('j', 3072),
-          repeat('k', 762), repeat('l', 762), repeat('m', 762), repeat('n', 762));
-let $i = 5;
-while ($i)
-{
-  eval insert into t1 (b, c, d, col1, col2, col3, col4)
-    select b, c, d, col1, col2, col3, col4 from t1;
-  dec $i;
-}
---enable_query_log
-
---echo # create index on b - it has the maximum key size supported by ndb index stat
-create index idxb on t1(b); # max key size = 3056 (col size = 3053, length bytes = 2, nullmask = 1)
-
---echo # analyze should run fine
-analyze table t1;
-drop index idxb on t1;
-
---echo # create index on c - it has a key size unsupported by ndb index stat
-create index idxc on t1(c); # max key size = 3059 (col size = 3056, length bytes = 2, nullmask = 1)
-
---echo # analyze should fail with error 911
-analyze table t1;
-drop index idxc on t1;
-
---echo # create index on d - it has the maximum key size allowed by mysql(3072)
---echo # but the key size is unsupported by ndb index stat
-create index idxd on t1(d); # max key size = 3075 (col size = 3072, length bytes = 2, nullmask = 1)
-
---echo # analyze should fail with error 911
-analyze table t1;
-drop index idxd on t1;
-
---echo # create index on col1..col4 - it has the maximum key size supported by ndb index stat
-# max key size = 3056 (total col size = 3048[762 * 4], length bytes = 8[2 * 4], nullmask = 0)
-create index idxcol on t1(col1, col2, col3, col4);
-
---echo # analyze should run fine
-analyze table t1;
-drop index idxcol on t1;
-
---echo #cleanup
-drop table t1;
-
 # Suppress errors which can occur when disconnecting + reconnecting
 call mtr.add_suppression("Failed to acquire global schema lock");
 call mtr.add_suppression("Failed to release global schema lock");
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/join_pushdown_bka.result mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/join_pushdown_bka.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/join_pushdown_bka.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/join_pushdown_bka.result	2021-09-28 11:46:34.000000000 +0000
@@ -4632,7 +4632,7 @@
 1	SIMPLE	y	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	b3	b3	9	test.x.b3,const	1	100.00	Using where; Using join buffer (Batched Key Access)
 Warnings:
 Note	1003	Cannot push table 'y' as child of table 'x'. Doing so would prevent using join buffer for table 'y'.
-Note	1003	/* select#1 */ select straight_join `test`.`x`.`a3` AS `a3`,`test`.`x`.`b3` AS `b3`,`test`.`x`.`c3` AS `c3`,`test`.`x`.`d3` AS `d3`,`test`.`y`.`a3` AS `a3`,`test`.`y`.`b3` AS `b3`,`test`.`y`.`c3` AS `c3`,`test`.`y`.`d3` AS `d3` from `test`.`t3` `x` join `test`.`t3` `y` where ((`test`.`y`.`b3` = `test`.`x`.`b3`) and (`test`.`y`.`d3` = <cache>(NULL)))
+Note	1003	/* select#1 */ select straight_join `test`.`x`.`a3` AS `a3`,`test`.`x`.`b3` AS `b3`,`test`.`x`.`c3` AS `c3`,`test`.`x`.`d3` AS `d3`,`test`.`y`.`a3` AS `a3`,`test`.`y`.`b3` AS `b3`,`test`.`y`.`c3` AS `c3`,`test`.`y`.`d3` AS `d3` from `test`.`t3` `x` join `test`.`t3` `y` where ((`test`.`y`.`b3` = `test`.`x`.`b3`) and (`test`.`y`.`d3` = NULL))
 prepare stmt1 from
 'select straight_join * 
   from t3 as x join t3 as y on x.b3 = y.b3
@@ -7240,7 +7240,7 @@
 on a.k is null and a.uq=b.uq;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	a	p0,p1,p2,p3,p4,p5,p6,p7	ALL	NULL	NULL	NULL	NULL	4	100.00	NULL
-1	SIMPLE	b	p0,p1,p2,p3,p4,p5,p6,p7	ALL	NULL	NULL	NULL	NULL	4	100.00	Using where; Using join buffer (hash join)
+1	SIMPLE	b	p0,p1,p2,p3,p4,p5,p6,p7	ALL	NULL	NULL	NULL	NULL	4	100.00	Using where; Using pushed condition <cache>((`test`.`a`.`k` is null)); Using join buffer (hash join)
 Warnings:
 Note	1003	Can't push table 'b' as child, 'type' must be a 'ref' access
 Note	1003	/* select#1 */ select `test`.`a`.`k` AS `k`,`test`.`a`.`uq` AS `uq`,`test`.`b`.`k` AS `k`,`test`.`b`.`uq` AS `uq` from `test`.`t` `a` left join `test`.`t` `b` on(((`test`.`b`.`uq` = `test`.`a`.`uq`) and (`test`.`a`.`k` is null))) where true
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/join_pushdown_default.result mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/join_pushdown_default.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/join_pushdown_default.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/join_pushdown_default.result	2021-09-28 11:46:34.000000000 +0000
@@ -1710,7 +1710,7 @@
 1	SIMPLE	x1	p0,p1,p2,p3,p4,p5,p6,p7	ALL	NULL	NULL	NULL	NULL	16	100.00	Parent of 5 pushed join@1
 1	SIMPLE	x2	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	8	test.x1.c,test.x1.c	1	100.00	Child of 'x1' in pushed join@1
 1	SIMPLE	x3	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	8	test.x2.c,test.x1.d	1	100.00	Child of 'x2' in pushed join@1
-1	SIMPLE	x4	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	8	test.x2.d,test.x3.b	1	100.00	Child of 'x3' in pushed join@1; Using where
+1	SIMPLE	x4	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	8	test.x2.d,test.x3.b	1	100.00	Child of 'x3' in pushed join@1; Using pushed condition (`test`.`x4`.`b` = `test`.`x1`.`d`)
 1	SIMPLE	x5	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	8	test.x3.d,test.x4.d	1	100.00	Child of 'x4' in pushed join@1
 Warnings:
 Note	1003	/* select#1 */ select straight_join `test`.`x1`.`a` AS `a`,`test`.`x1`.`b` AS `b`,`test`.`x1`.`c` AS `c`,`test`.`x1`.`d` AS `d`,`test`.`x2`.`a` AS `a`,`test`.`x2`.`b` AS `b`,`test`.`x2`.`c` AS `c`,`test`.`x2`.`d` AS `d`,`test`.`x3`.`a` AS `a`,`test`.`x3`.`b` AS `b`,`test`.`x3`.`c` AS `c`,`test`.`x3`.`d` AS `d`,`test`.`x4`.`a` AS `a`,`test`.`x4`.`b` AS `b`,`test`.`x4`.`c` AS `c`,`test`.`x4`.`d` AS `d`,`test`.`x5`.`a` AS `a`,`test`.`x5`.`b` AS `b`,`test`.`x5`.`c` AS `c`,`test`.`x5`.`d` AS `d` from `test`.`t1` `x1` left join (`test`.`t1` `x2` join `test`.`t1` `x3` join `test`.`t1` `x4` join `test`.`t1` `x5`) on(((`test`.`x3`.`a` = `test`.`x2`.`c`) and (`test`.`x4`.`a` = `test`.`x2`.`d`) and (`test`.`x5`.`b` = `test`.`x4`.`d`) and (`test`.`x5`.`a` = `test`.`x3`.`d`) and (`test`.`x3`.`b` = `test`.`x1`.`d`) and (`test`.`x4`.`b` = `test`.`x1`.`d`) and (`test`.`x2`.`a` = `test`.`x1`.`c`) and (`test`.`x2`.`b` = `test`.`x1`.`c`))) where true
@@ -2327,10 +2327,9 @@
 explain select count(*) from tx as x1 
 left join tx as x2 on x1.c=x2.a and x1.d=x2.d;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	x1	p0,p1,p2,p3,p4,p5,p6,p7	ALL	NULL	NULL	NULL	NULL	256	100.00	NULL
-1	SIMPLE	x2	p0,p1,p2,p3,p4,p5,p6,p7	ref	PRIMARY	PRIMARY	4	test.x1.c	2	100.00	Using pushed condition (`test`.`x2`.`d` = `test`.`x1`.`d`)
+1	SIMPLE	x1	p0,p1,p2,p3,p4,p5,p6,p7	ALL	NULL	NULL	NULL	NULL	256	100.00	Parent of 2 pushed join@1
+1	SIMPLE	x2	p0,p1,p2,p3,p4,p5,p6,p7	ref	PRIMARY	PRIMARY	4	test.x1.c	2	100.00	Child of 'x1' in pushed join@1; Using pushed condition (`test`.`x2`.`d` = `test`.`x1`.`d`)
 Warnings:
-Note	1003	Can't push outer joined table 'x2' as child of 'x1', table condition can not be fully evaluated by pushed join
 Note	1003	/* select#1 */ select count(0) AS `count(*)` from `test`.`tx` `x1` left join `test`.`tx` `x2` on(((`test`.`x2`.`d` = `test`.`x1`.`d`) and (`test`.`x2`.`a` = `test`.`x1`.`c`))) where true
 select count(*) from tx as x1 
 left join tx as x2 on x1.c=x2.a and x1.d=x2.d;
@@ -3004,7 +3003,7 @@
 and x.a3=0x2f and x.b3=0x3f;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	x	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	8	const,const	1	100.00	Parent of 2 pushed join@1; Using pushed condition (`test`.`x`.`d3` is not null)
-1	SIMPLE	y	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	8	const,test.x.d3	1	100.00	Child of 'x' in pushed join@1; Using where
+1	SIMPLE	y	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	8	const,test.x.d3	1	100.00	Child of 'x' in pushed join@1; Using pushed condition (`test`.`y`.`b3` = `test`.`x`.`b3`)
 Warnings:
 Note	1003	/* select#1 */ select `test`.`x`.`a3` AS `a3`,`test`.`x`.`b3` AS `b3`,`test`.`x`.`c3` AS `c3`,`test`.`x`.`d3` AS `d3`,`test`.`y`.`a3` AS `a3`,`test`.`y`.`b3` AS `b3`,`test`.`y`.`c3` AS `c3`,`test`.`y`.`d3` AS `d3` from `test`.`t3` `x` join `test`.`t3` `y` where ((`test`.`y`.`b3` = `test`.`x`.`b3`) and (`test`.`y`.`a3` = `test`.`x`.`d3`) and (`test`.`x`.`a3` = 0x2f) and (`test`.`x`.`b3` = 0x3f))
 select * from t3 x, t3 y where y.a3=x.d3 and y.b3=x.b3
@@ -3016,7 +3015,7 @@
 and x.a3=0x2f and x.b3=0x3f;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	x	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	8	const,const	1	100.00	Parent of 2 pushed join@1; Using pushed condition (`test`.`x`.`d3` is not null)
-1	SIMPLE	y	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	8	const,test.x.d3	1	100.00	Child of 'x' in pushed join@1; Using where
+1	SIMPLE	y	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	8	const,test.x.d3	1	100.00	Child of 'x' in pushed join@1; Using pushed condition (`test`.`y`.`b3` = `test`.`x`.`b3`)
 Warnings:
 Note	1003	/* select#1 */ select `test`.`x`.`a3` AS `a3`,`test`.`x`.`b3` AS `b3`,`test`.`x`.`c3` AS `c3`,`test`.`x`.`d3` AS `d3`,`test`.`y`.`a3` AS `a3`,`test`.`y`.`b3` AS `b3`,`test`.`y`.`c3` AS `c3`,`test`.`y`.`d3` AS `d3` from `test`.`t3_hash` `x` join `test`.`t3_hash` `y` where ((`test`.`y`.`b3` = `test`.`x`.`b3`) and (`test`.`y`.`a3` = `test`.`x`.`d3`) and (`test`.`x`.`a3` = 0x2f) and (`test`.`x`.`b3` = 0x3f))
 select * from t3_hash x, t3_hash y where y.a3=x.d3 and y.b3=x.b3
@@ -3028,7 +3027,7 @@
 and x.a3=0x2f and x.b3=0x3f;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	x	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	b3	b3	8	const,const	1	100.00	Parent of 2 pushed join@1; Using pushed condition (`test`.`x`.`d3` is not null)
-1	SIMPLE	y	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	b3	b3	8	const,test.x.d3	1	100.00	Child of 'x' in pushed join@1; Using where
+1	SIMPLE	y	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	b3	b3	8	const,test.x.d3	1	100.00	Child of 'x' in pushed join@1; Using pushed condition (`test`.`y`.`b3` = `test`.`x`.`b3`)
 Warnings:
 Note	1003	/* select#1 */ select `test`.`x`.`pk` AS `pk`,`test`.`x`.`a3` AS `a3`,`test`.`x`.`b3` AS `b3`,`test`.`x`.`c3` AS `c3`,`test`.`x`.`d3` AS `d3`,`test`.`y`.`pk` AS `pk`,`test`.`y`.`a3` AS `a3`,`test`.`y`.`b3` AS `b3`,`test`.`y`.`c3` AS `c3`,`test`.`y`.`d3` AS `d3` from `test`.`t3_unq` `x` join `test`.`t3_unq` `y` where ((`test`.`y`.`b3` = `test`.`x`.`b3`) and (`test`.`y`.`a3` = `test`.`x`.`d3`) and (`test`.`x`.`a3` = 0x2f) and (`test`.`x`.`b3` = 0x3f))
 select * from t3_unq x, t3_unq y where y.a3=x.d3 and y.b3=x.b3
@@ -3405,7 +3404,7 @@
 1	SIMPLE	x	p0,p1,p2,p3,p4,p5,p6,p7	ALL	b3	NULL	NULL	NULL	7	100.00	NULL
 1	SIMPLE	y	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	b3	b3	9	test.x.b3,const	1	100.00	Using where
 Warnings:
-Note	1003	/* select#1 */ select straight_join `test`.`x`.`a3` AS `a3`,`test`.`x`.`b3` AS `b3`,`test`.`x`.`c3` AS `c3`,`test`.`x`.`d3` AS `d3`,`test`.`y`.`a3` AS `a3`,`test`.`y`.`b3` AS `b3`,`test`.`y`.`c3` AS `c3`,`test`.`y`.`d3` AS `d3` from `test`.`t3` `x` join `test`.`t3` `y` where ((`test`.`y`.`b3` = `test`.`x`.`b3`) and (`test`.`y`.`d3` = <cache>(NULL)))
+Note	1003	/* select#1 */ select straight_join `test`.`x`.`a3` AS `a3`,`test`.`x`.`b3` AS `b3`,`test`.`x`.`c3` AS `c3`,`test`.`x`.`d3` AS `d3`,`test`.`y`.`a3` AS `a3`,`test`.`y`.`b3` AS `b3`,`test`.`y`.`c3` AS `c3`,`test`.`y`.`d3` AS `d3` from `test`.`t3` `x` join `test`.`t3` `y` where ((`test`.`y`.`b3` = `test`.`x`.`b3`) and (`test`.`y`.`d3` = NULL))
 prepare stmt1 from
 'select straight_join * 
   from t3 as x join t3 as y on x.b3 = y.b3
@@ -4971,8 +4970,8 @@
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	x1	p0,p1,p2,p3,p4,p5,p6,p7	ALL	NULL	NULL	NULL	NULL	#	#	Parent of 7 pushed join@1; Using pushed condition (`test`.`x1`.`a` is not null)
 1	SIMPLE	x2	p0,p1,p2,p3,p4,p5,p6,p7	ref	PRIMARY,ix1	ix1	5	test.x1.a	#	#	Child of 'x1' in pushed join@1
-1	SIMPLE	x3	p0,p1,p2,p3,p4,p5,p6,p7	ref	PRIMARY,ix1	ix1	5	test.x1.a	#	#	Child of 'x1' in pushed join@1; Using where
-1	SIMPLE	x4	p0,p1,p2,p3,p4,p5,p6,p7	ref	ix1	ix1	5	test.x1.a	#	#	Child of 'x1' in pushed join@1; Using where
+1	SIMPLE	x3	p0,p1,p2,p3,p4,p5,p6,p7	ref	PRIMARY,ix1	ix1	5	test.x1.a	#	#	Child of 'x2' in pushed join@1; Using pushed condition (`test`.`x3`.`a` < `test`.`x2`.`pk`)
+1	SIMPLE	x4	p0,p1,p2,p3,p4,p5,p6,p7	ref	ix1	ix1	5	test.x1.a	#	#	Child of 'x3' in pushed join@1; Using pushed condition (`test`.`x4`.`a` < `test`.`x3`.`pk`)
 1	SIMPLE	x5	p0,p1,p2,p3,p4,p5,p6,p7	ref	ix1	ix1	5	test.x1.a	#	#	Child of 'x1' in pushed join@1
 1	SIMPLE	x6	p0,p1,p2,p3,p4,p5,p6,p7	ref	ix1	ix1	5	test.x1.a	#	#	Child of 'x1' in pushed join@1
 1	SIMPLE	x7	p0,p1,p2,p3,p4,p5,p6,p7	ref	ix1	ix1	5	test.x1.a	#	#	Child of 'x1' in pushed join@1
@@ -5553,7 +5552,7 @@
 select straight_join * from t1 x, t1 y where y.a=x.d and y.b=x.e;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	x	p0,p1,p2,p3,p4,p5,p6,p7	ALL	PRIMARY	NULL	NULL	NULL	#	#	Parent of 2 pushed join@1; Using pushed condition (`test`.`x`.`e` is not null)
-1	SIMPLE	y	p0,p1,p2,p3,p4,p5,p6,p7	ref	ix1	ix1	4	test.x.e	#	#	Child of 'x' in pushed join@1; Using where
+1	SIMPLE	y	p0,p1,p2,p3,p4,p5,p6,p7	ref	ix1	ix1	4	test.x.e	#	#	Child of 'x' in pushed join@1; Using pushed condition (`test`.`y`.`a` = `test`.`x`.`d`)
 Warnings:
 Note	1003	/* select#1 */ select straight_join `test`.`x`.`d` AS `d`,`test`.`x`.`e` AS `e`,`test`.`x`.`f` AS `f`,`test`.`x`.`a` AS `a`,`test`.`x`.`b` AS `b`,`test`.`x`.`c` AS `c`,`test`.`y`.`d` AS `d`,`test`.`y`.`e` AS `e`,`test`.`y`.`f` AS `f`,`test`.`y`.`a` AS `a`,`test`.`y`.`b` AS `b`,`test`.`y`.`c` AS `c` from `test`.`t1` `x` join `test`.`t1` `y` where ((`test`.`y`.`b` = `test`.`x`.`e`) and (`test`.`y`.`a` = `test`.`x`.`d`))
 insert into t1(a,b,c,d,e,f) values
@@ -5795,7 +5794,7 @@
 on a.k is null and a.uq=b.uq;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	a	p0,p1,p2,p3,p4,p5,p6,p7	ALL	NULL	NULL	NULL	NULL	4	100.00	NULL
-1	SIMPLE	b	p0,p1,p2,p3,p4,p5,p6,p7	ALL	NULL	NULL	NULL	NULL	4	100.00	Using where; Using join buffer (hash join)
+1	SIMPLE	b	p0,p1,p2,p3,p4,p5,p6,p7	ALL	NULL	NULL	NULL	NULL	4	100.00	Using where; Using pushed condition <cache>((`test`.`a`.`k` is null)); Using join buffer (hash join)
 Warnings:
 Note	1003	Can't push table 'b' as child, 'type' must be a 'ref' access
 Note	1003	/* select#1 */ select `test`.`a`.`k` AS `k`,`test`.`a`.`uq` AS `uq`,`test`.`b`.`k` AS `k`,`test`.`b`.`uq` AS `uq` from `test`.`t` `a` left join `test`.`t` `b` on(((`test`.`b`.`uq` = `test`.`a`.`uq`) and (`test`.`a`.`k` is null))) where true
@@ -6495,7 +6494,7 @@
 1	SIMPLE	subq1	p0,p1,p2,p3,p4,p5,p6,p7	ref	c	c	4	test.t1.c	2	100.00	Child of 't1' in pushed join@1; FirstMatch(t1)
 1	SIMPLE	subq2	p0,p1,p2,p3,p4,p5,p6,p7	ref	d	d	4	test.t1.d	2	100.00	FirstMatch(subq1)
 Warnings:
-Note	1003	Can't push table 'subq2' as child of 't1', the FirstMatch-return 'subq1' can not be made the parent of sj-nest
+Note	1003	Can't push table 'subq2' as child of 't1', there is the scan 'subq1' in between the parent and sj-nest
 Note	1003	/* select#1 */ select count(0) AS `count(*)` from `test`.`t1` semi join (`test`.`t1` `subq1`) semi join (`test`.`t1` `subq2`) where ((`test`.`subq2`.`d` = `test`.`t1`.`d`) and (`test`.`subq1`.`c` = `test`.`t1`.`c`))
 select count(*) from t1 where 
 t1.c in (select c from t1 as subq1) and
@@ -6668,7 +6667,7 @@
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	table1	p0,p1,p2,p3,p4,p5,p6,p7	ALL	PRIMARY	NULL	NULL	NULL	16	100.00	Parent of 3 pushed join@1
 1	SIMPLE	table2	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	8	test.table1.a,test.table1.b	1	100.00	Child of 'table1' in pushed join@1
-1	SIMPLE	table1s	p0,p1,p2,p3,p4,p5,p6,p7	ref	c	c	4	test.table1.b	2	100.00	Child of 'table2' in pushed join@1; FirstMatch(table2)
+1	SIMPLE	table1s	p0,p1,p2,p3,p4,p5,p6,p7	ref	c	c	4	test.table1.b	2	100.00	Child of 'table1' in pushed join@1; FirstMatch(table2)
 Warnings:
 Note	1003	/* select#1 */ select /*+ SEMIJOIN(@`select#2` FIRSTMATCH) */ count(0) AS `count(*)` from `test`.`t1` `table1` join `test`.`t1` `table2` semi join (`test`.`t1` `table1s`) where ((`test`.`table2`.`a` = `test`.`table1`.`a`) and (`test`.`table2`.`b` = `test`.`table1`.`b`) and (`test`.`table1s`.`c` = `test`.`table1`.`b`))
 SELECT count(*)
@@ -7169,7 +7168,7 @@
 order by new.variable_name;
 variable_name	new.variable_value - old.variable_value
 Ndb_pruned_scan_count	8
-Ndb_pushed_queries_defined	502
+Ndb_pushed_queries_defined	504
 Ndb_pushed_queries_dropped	8
 Ndb_sorted_scan_count	31
 drop table server_counts_at_startup;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/join_pushdown_nobnl.result mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/join_pushdown_nobnl.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/join_pushdown_nobnl.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/join_pushdown_nobnl.result	2021-09-28 11:46:34.000000000 +0000
@@ -1707,7 +1707,7 @@
 1	SIMPLE	x1	p0,p1,p2,p3,p4,p5,p6,p7	ALL	NULL	NULL	NULL	NULL	16	100.00	Parent of 5 pushed join@1
 1	SIMPLE	x2	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	8	test.x1.c,test.x1.c	1	100.00	Child of 'x1' in pushed join@1
 1	SIMPLE	x3	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	8	test.x2.c,test.x1.d	1	100.00	Child of 'x2' in pushed join@1
-1	SIMPLE	x4	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	8	test.x2.d,test.x3.b	1	100.00	Child of 'x3' in pushed join@1; Using where
+1	SIMPLE	x4	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	8	test.x2.d,test.x3.b	1	100.00	Child of 'x3' in pushed join@1; Using pushed condition (`test`.`x4`.`b` = `test`.`x1`.`d`)
 1	SIMPLE	x5	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	8	test.x3.d,test.x4.d	1	100.00	Child of 'x4' in pushed join@1
 Warnings:
 Note	1003	/* select#1 */ select straight_join `test`.`x1`.`a` AS `a`,`test`.`x1`.`b` AS `b`,`test`.`x1`.`c` AS `c`,`test`.`x1`.`d` AS `d`,`test`.`x2`.`a` AS `a`,`test`.`x2`.`b` AS `b`,`test`.`x2`.`c` AS `c`,`test`.`x2`.`d` AS `d`,`test`.`x3`.`a` AS `a`,`test`.`x3`.`b` AS `b`,`test`.`x3`.`c` AS `c`,`test`.`x3`.`d` AS `d`,`test`.`x4`.`a` AS `a`,`test`.`x4`.`b` AS `b`,`test`.`x4`.`c` AS `c`,`test`.`x4`.`d` AS `d`,`test`.`x5`.`a` AS `a`,`test`.`x5`.`b` AS `b`,`test`.`x5`.`c` AS `c`,`test`.`x5`.`d` AS `d` from `test`.`t1` `x1` left join (`test`.`t1` `x2` join `test`.`t1` `x3` join `test`.`t1` `x4` join `test`.`t1` `x5`) on(((`test`.`x3`.`a` = `test`.`x2`.`c`) and (`test`.`x4`.`a` = `test`.`x2`.`d`) and (`test`.`x5`.`b` = `test`.`x4`.`d`) and (`test`.`x5`.`a` = `test`.`x3`.`d`) and (`test`.`x3`.`b` = `test`.`x1`.`d`) and (`test`.`x4`.`b` = `test`.`x1`.`d`) and (`test`.`x2`.`a` = `test`.`x1`.`c`) and (`test`.`x2`.`b` = `test`.`x1`.`c`))) where true
@@ -2324,10 +2324,9 @@
 explain select count(*) from tx as x1 
 left join tx as x2 on x1.c=x2.a and x1.d=x2.d;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	x1	p0,p1,p2,p3,p4,p5,p6,p7	ALL	NULL	NULL	NULL	NULL	256	100.00	NULL
-1	SIMPLE	x2	p0,p1,p2,p3,p4,p5,p6,p7	ref	PRIMARY	PRIMARY	4	test.x1.c	2	100.00	Using pushed condition (`test`.`x2`.`d` = `test`.`x1`.`d`)
+1	SIMPLE	x1	p0,p1,p2,p3,p4,p5,p6,p7	ALL	NULL	NULL	NULL	NULL	256	100.00	Parent of 2 pushed join@1
+1	SIMPLE	x2	p0,p1,p2,p3,p4,p5,p6,p7	ref	PRIMARY	PRIMARY	4	test.x1.c	2	100.00	Child of 'x1' in pushed join@1; Using pushed condition (`test`.`x2`.`d` = `test`.`x1`.`d`)
 Warnings:
-Note	1003	Can't push outer joined table 'x2' as child of 'x1', table condition can not be fully evaluated by pushed join
 Note	1003	/* select#1 */ select count(0) AS `count(*)` from `test`.`tx` `x1` left join `test`.`tx` `x2` on(((`test`.`x2`.`d` = `test`.`x1`.`d`) and (`test`.`x2`.`a` = `test`.`x1`.`c`))) where true
 select count(*) from tx as x1 
 left join tx as x2 on x1.c=x2.a and x1.d=x2.d;
@@ -3001,7 +3000,7 @@
 and x.a3=0x2f and x.b3=0x3f;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	x	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	8	const,const	1	100.00	Parent of 2 pushed join@1; Using pushed condition (`test`.`x`.`d3` is not null)
-1	SIMPLE	y	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	8	const,test.x.d3	1	100.00	Child of 'x' in pushed join@1; Using where
+1	SIMPLE	y	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	8	const,test.x.d3	1	100.00	Child of 'x' in pushed join@1; Using pushed condition (`test`.`y`.`b3` = `test`.`x`.`b3`)
 Warnings:
 Note	1003	/* select#1 */ select `test`.`x`.`a3` AS `a3`,`test`.`x`.`b3` AS `b3`,`test`.`x`.`c3` AS `c3`,`test`.`x`.`d3` AS `d3`,`test`.`y`.`a3` AS `a3`,`test`.`y`.`b3` AS `b3`,`test`.`y`.`c3` AS `c3`,`test`.`y`.`d3` AS `d3` from `test`.`t3` `x` join `test`.`t3` `y` where ((`test`.`y`.`b3` = `test`.`x`.`b3`) and (`test`.`y`.`a3` = `test`.`x`.`d3`) and (`test`.`x`.`a3` = 0x2f) and (`test`.`x`.`b3` = 0x3f))
 select * from t3 x, t3 y where y.a3=x.d3 and y.b3=x.b3
@@ -3013,7 +3012,7 @@
 and x.a3=0x2f and x.b3=0x3f;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	x	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	8	const,const	1	100.00	Parent of 2 pushed join@1; Using pushed condition (`test`.`x`.`d3` is not null)
-1	SIMPLE	y	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	8	const,test.x.d3	1	100.00	Child of 'x' in pushed join@1; Using where
+1	SIMPLE	y	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	8	const,test.x.d3	1	100.00	Child of 'x' in pushed join@1; Using pushed condition (`test`.`y`.`b3` = `test`.`x`.`b3`)
 Warnings:
 Note	1003	/* select#1 */ select `test`.`x`.`a3` AS `a3`,`test`.`x`.`b3` AS `b3`,`test`.`x`.`c3` AS `c3`,`test`.`x`.`d3` AS `d3`,`test`.`y`.`a3` AS `a3`,`test`.`y`.`b3` AS `b3`,`test`.`y`.`c3` AS `c3`,`test`.`y`.`d3` AS `d3` from `test`.`t3_hash` `x` join `test`.`t3_hash` `y` where ((`test`.`y`.`b3` = `test`.`x`.`b3`) and (`test`.`y`.`a3` = `test`.`x`.`d3`) and (`test`.`x`.`a3` = 0x2f) and (`test`.`x`.`b3` = 0x3f))
 select * from t3_hash x, t3_hash y where y.a3=x.d3 and y.b3=x.b3
@@ -3025,7 +3024,7 @@
 and x.a3=0x2f and x.b3=0x3f;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	x	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	b3	b3	8	const,const	1	100.00	Parent of 2 pushed join@1; Using pushed condition (`test`.`x`.`d3` is not null)
-1	SIMPLE	y	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	b3	b3	8	const,test.x.d3	1	100.00	Child of 'x' in pushed join@1; Using where
+1	SIMPLE	y	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	b3	b3	8	const,test.x.d3	1	100.00	Child of 'x' in pushed join@1; Using pushed condition (`test`.`y`.`b3` = `test`.`x`.`b3`)
 Warnings:
 Note	1003	/* select#1 */ select `test`.`x`.`pk` AS `pk`,`test`.`x`.`a3` AS `a3`,`test`.`x`.`b3` AS `b3`,`test`.`x`.`c3` AS `c3`,`test`.`x`.`d3` AS `d3`,`test`.`y`.`pk` AS `pk`,`test`.`y`.`a3` AS `a3`,`test`.`y`.`b3` AS `b3`,`test`.`y`.`c3` AS `c3`,`test`.`y`.`d3` AS `d3` from `test`.`t3_unq` `x` join `test`.`t3_unq` `y` where ((`test`.`y`.`b3` = `test`.`x`.`b3`) and (`test`.`y`.`a3` = `test`.`x`.`d3`) and (`test`.`x`.`a3` = 0x2f) and (`test`.`x`.`b3` = 0x3f))
 select * from t3_unq x, t3_unq y where y.a3=x.d3 and y.b3=x.b3
@@ -3402,7 +3401,7 @@
 1	SIMPLE	x	p0,p1,p2,p3,p4,p5,p6,p7	ALL	b3	NULL	NULL	NULL	7	100.00	NULL
 1	SIMPLE	y	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	b3	b3	9	test.x.b3,const	1	100.00	Using where
 Warnings:
-Note	1003	/* select#1 */ select straight_join `test`.`x`.`a3` AS `a3`,`test`.`x`.`b3` AS `b3`,`test`.`x`.`c3` AS `c3`,`test`.`x`.`d3` AS `d3`,`test`.`y`.`a3` AS `a3`,`test`.`y`.`b3` AS `b3`,`test`.`y`.`c3` AS `c3`,`test`.`y`.`d3` AS `d3` from `test`.`t3` `x` join `test`.`t3` `y` where ((`test`.`y`.`b3` = `test`.`x`.`b3`) and (`test`.`y`.`d3` = <cache>(NULL)))
+Note	1003	/* select#1 */ select straight_join `test`.`x`.`a3` AS `a3`,`test`.`x`.`b3` AS `b3`,`test`.`x`.`c3` AS `c3`,`test`.`x`.`d3` AS `d3`,`test`.`y`.`a3` AS `a3`,`test`.`y`.`b3` AS `b3`,`test`.`y`.`c3` AS `c3`,`test`.`y`.`d3` AS `d3` from `test`.`t3` `x` join `test`.`t3` `y` where ((`test`.`y`.`b3` = `test`.`x`.`b3`) and (`test`.`y`.`d3` = NULL))
 prepare stmt1 from
 'select straight_join * 
   from t3 as x join t3 as y on x.b3 = y.b3
@@ -4968,8 +4967,8 @@
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	x1	p0,p1,p2,p3,p4,p5,p6,p7	ALL	NULL	NULL	NULL	NULL	#	#	Parent of 7 pushed join@1; Using pushed condition (`test`.`x1`.`a` is not null)
 1	SIMPLE	x2	p0,p1,p2,p3,p4,p5,p6,p7	ref	PRIMARY,ix1	ix1	5	test.x1.a	#	#	Child of 'x1' in pushed join@1
-1	SIMPLE	x3	p0,p1,p2,p3,p4,p5,p6,p7	ref	PRIMARY,ix1	ix1	5	test.x1.a	#	#	Child of 'x1' in pushed join@1; Using where
-1	SIMPLE	x4	p0,p1,p2,p3,p4,p5,p6,p7	ref	ix1	ix1	5	test.x1.a	#	#	Child of 'x1' in pushed join@1; Using where
+1	SIMPLE	x3	p0,p1,p2,p3,p4,p5,p6,p7	ref	PRIMARY,ix1	ix1	5	test.x1.a	#	#	Child of 'x2' in pushed join@1; Using pushed condition (`test`.`x3`.`a` < `test`.`x2`.`pk`)
+1	SIMPLE	x4	p0,p1,p2,p3,p4,p5,p6,p7	ref	ix1	ix1	5	test.x1.a	#	#	Child of 'x3' in pushed join@1; Using pushed condition (`test`.`x4`.`a` < `test`.`x3`.`pk`)
 1	SIMPLE	x5	p0,p1,p2,p3,p4,p5,p6,p7	ref	ix1	ix1	5	test.x1.a	#	#	Child of 'x1' in pushed join@1
 1	SIMPLE	x6	p0,p1,p2,p3,p4,p5,p6,p7	ref	ix1	ix1	5	test.x1.a	#	#	Child of 'x1' in pushed join@1
 1	SIMPLE	x7	p0,p1,p2,p3,p4,p5,p6,p7	ref	ix1	ix1	5	test.x1.a	#	#	Child of 'x1' in pushed join@1
@@ -5550,7 +5549,7 @@
 select straight_join * from t1 x, t1 y where y.a=x.d and y.b=x.e;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	x	p0,p1,p2,p3,p4,p5,p6,p7	ALL	PRIMARY	NULL	NULL	NULL	#	#	Parent of 2 pushed join@1; Using pushed condition (`test`.`x`.`e` is not null)
-1	SIMPLE	y	p0,p1,p2,p3,p4,p5,p6,p7	ref	ix1	ix1	4	test.x.e	#	#	Child of 'x' in pushed join@1; Using where
+1	SIMPLE	y	p0,p1,p2,p3,p4,p5,p6,p7	ref	ix1	ix1	4	test.x.e	#	#	Child of 'x' in pushed join@1; Using pushed condition (`test`.`y`.`a` = `test`.`x`.`d`)
 Warnings:
 Note	1003	/* select#1 */ select straight_join `test`.`x`.`d` AS `d`,`test`.`x`.`e` AS `e`,`test`.`x`.`f` AS `f`,`test`.`x`.`a` AS `a`,`test`.`x`.`b` AS `b`,`test`.`x`.`c` AS `c`,`test`.`y`.`d` AS `d`,`test`.`y`.`e` AS `e`,`test`.`y`.`f` AS `f`,`test`.`y`.`a` AS `a`,`test`.`y`.`b` AS `b`,`test`.`y`.`c` AS `c` from `test`.`t1` `x` join `test`.`t1` `y` where ((`test`.`y`.`b` = `test`.`x`.`e`) and (`test`.`y`.`a` = `test`.`x`.`d`))
 insert into t1(a,b,c,d,e,f) values
@@ -5790,7 +5789,7 @@
 on a.k is null and a.uq=b.uq;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	a	p0,p1,p2,p3,p4,p5,p6,p7	ALL	NULL	NULL	NULL	NULL	4	100.00	NULL
-1	SIMPLE	b	p0,p1,p2,p3,p4,p5,p6,p7	ALL	NULL	NULL	NULL	NULL	4	100.00	Using where; Using pushed condition (`test`.`b`.`uq` = `test`.`a`.`uq`)
+1	SIMPLE	b	p0,p1,p2,p3,p4,p5,p6,p7	ALL	NULL	NULL	NULL	NULL	4	100.00	Using pushed condition (<if>(is_not_null_compl(b), <cache>((`test`.`a`.`k` is null)), true) and <if>(is_not_null_compl(b), (`test`.`b`.`uq` = `test`.`a`.`uq`), true))
 Warnings:
 Note	1003	Can't push table 'b' as child, 'type' must be a 'ref' access
 Note	1003	/* select#1 */ select `test`.`a`.`k` AS `k`,`test`.`a`.`uq` AS `uq`,`test`.`b`.`k` AS `k`,`test`.`b`.`uq` AS `uq` from `test`.`t` `a` left join `test`.`t` `b` on(((`test`.`b`.`uq` = `test`.`a`.`uq`) and (`test`.`a`.`k` is null))) where true
@@ -6490,7 +6489,7 @@
 1	SIMPLE	subq1	p0,p1,p2,p3,p4,p5,p6,p7	ref	c	c	4	test.t1.c	2	100.00	Child of 't1' in pushed join@1; FirstMatch(t1)
 1	SIMPLE	subq2	p0,p1,p2,p3,p4,p5,p6,p7	ref	d	d	4	test.t1.d	2	100.00	FirstMatch(subq1)
 Warnings:
-Note	1003	Can't push table 'subq2' as child of 't1', the FirstMatch-return 'subq1' can not be made the parent of sj-nest
+Note	1003	Can't push table 'subq2' as child of 't1', there is the scan 'subq1' in between the parent and sj-nest
 Note	1003	/* select#1 */ select count(0) AS `count(*)` from `test`.`t1` semi join (`test`.`t1` `subq1`) semi join (`test`.`t1` `subq2`) where ((`test`.`subq2`.`d` = `test`.`t1`.`d`) and (`test`.`subq1`.`c` = `test`.`t1`.`c`))
 select count(*) from t1 where 
 t1.c in (select c from t1 as subq1) and
@@ -6663,7 +6662,7 @@
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	table1	p0,p1,p2,p3,p4,p5,p6,p7	ALL	PRIMARY	NULL	NULL	NULL	16	100.00	Parent of 3 pushed join@1
 1	SIMPLE	table2	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	8	test.table1.a,test.table1.b	1	100.00	Child of 'table1' in pushed join@1
-1	SIMPLE	table1s	p0,p1,p2,p3,p4,p5,p6,p7	ref	c	c	4	test.table1.b	2	100.00	Child of 'table2' in pushed join@1; FirstMatch(table2)
+1	SIMPLE	table1s	p0,p1,p2,p3,p4,p5,p6,p7	ref	c	c	4	test.table1.b	2	100.00	Child of 'table1' in pushed join@1; FirstMatch(table2)
 Warnings:
 Note	1003	/* select#1 */ select /*+ SEMIJOIN(@`select#2` FIRSTMATCH) */ count(0) AS `count(*)` from `test`.`t1` `table1` join `test`.`t1` `table2` semi join (`test`.`t1` `table1s`) where ((`test`.`table2`.`a` = `test`.`table1`.`a`) and (`test`.`table2`.`b` = `test`.`table1`.`b`) and (`test`.`table1s`.`c` = `test`.`table1`.`b`))
 SELECT count(*)
@@ -7164,7 +7163,7 @@
 order by new.variable_name;
 variable_name	new.variable_value - old.variable_value
 Ndb_pruned_scan_count	8
-Ndb_pushed_queries_defined	510
+Ndb_pushed_queries_defined	512
 Ndb_pushed_queries_dropped	8
 Ndb_sorted_scan_count	31
 drop table server_counts_at_startup;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/join_pushdown_none.result mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/join_pushdown_none.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/join_pushdown_none.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/join_pushdown_none.result	2021-09-28 11:46:34.000000000 +0000
@@ -1710,7 +1710,7 @@
 1	SIMPLE	x1	p0,p1,p2,p3,p4,p5,p6,p7	ALL	NULL	NULL	NULL	NULL	16	100.00	Parent of 5 pushed join@1
 1	SIMPLE	x2	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	8	test.x1.c,test.x1.c	1	100.00	Child of 'x1' in pushed join@1
 1	SIMPLE	x3	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	8	test.x2.c,test.x1.d	1	100.00	Child of 'x2' in pushed join@1
-1	SIMPLE	x4	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	8	test.x2.d,test.x3.b	1	100.00	Child of 'x3' in pushed join@1; Using where
+1	SIMPLE	x4	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	8	test.x2.d,test.x3.b	1	100.00	Child of 'x3' in pushed join@1; Using pushed condition (`test`.`x4`.`b` = `test`.`x1`.`d`)
 1	SIMPLE	x5	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	8	test.x3.d,test.x4.d	1	100.00	Child of 'x4' in pushed join@1
 Warnings:
 Note	1003	/* select#1 */ select straight_join `test`.`x1`.`a` AS `a`,`test`.`x1`.`b` AS `b`,`test`.`x1`.`c` AS `c`,`test`.`x1`.`d` AS `d`,`test`.`x2`.`a` AS `a`,`test`.`x2`.`b` AS `b`,`test`.`x2`.`c` AS `c`,`test`.`x2`.`d` AS `d`,`test`.`x3`.`a` AS `a`,`test`.`x3`.`b` AS `b`,`test`.`x3`.`c` AS `c`,`test`.`x3`.`d` AS `d`,`test`.`x4`.`a` AS `a`,`test`.`x4`.`b` AS `b`,`test`.`x4`.`c` AS `c`,`test`.`x4`.`d` AS `d`,`test`.`x5`.`a` AS `a`,`test`.`x5`.`b` AS `b`,`test`.`x5`.`c` AS `c`,`test`.`x5`.`d` AS `d` from `test`.`t1` `x1` left join (`test`.`t1` `x2` join `test`.`t1` `x3` join `test`.`t1` `x4` join `test`.`t1` `x5`) on(((`test`.`x3`.`a` = `test`.`x2`.`c`) and (`test`.`x4`.`a` = `test`.`x2`.`d`) and (`test`.`x5`.`b` = `test`.`x4`.`d`) and (`test`.`x5`.`a` = `test`.`x3`.`d`) and (`test`.`x3`.`b` = `test`.`x1`.`d`) and (`test`.`x4`.`b` = `test`.`x1`.`d`) and (`test`.`x2`.`a` = `test`.`x1`.`c`) and (`test`.`x2`.`b` = `test`.`x1`.`c`))) where true
@@ -2327,10 +2327,9 @@
 explain select count(*) from tx as x1 
 left join tx as x2 on x1.c=x2.a and x1.d=x2.d;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	x1	p0,p1,p2,p3,p4,p5,p6,p7	ALL	NULL	NULL	NULL	NULL	256	100.00	NULL
-1	SIMPLE	x2	p0,p1,p2,p3,p4,p5,p6,p7	ref	PRIMARY	PRIMARY	4	test.x1.c	2	100.00	Using pushed condition (`test`.`x2`.`d` = `test`.`x1`.`d`)
+1	SIMPLE	x1	p0,p1,p2,p3,p4,p5,p6,p7	ALL	NULL	NULL	NULL	NULL	256	100.00	Parent of 2 pushed join@1
+1	SIMPLE	x2	p0,p1,p2,p3,p4,p5,p6,p7	ref	PRIMARY	PRIMARY	4	test.x1.c	2	100.00	Child of 'x1' in pushed join@1; Using pushed condition (`test`.`x2`.`d` = `test`.`x1`.`d`)
 Warnings:
-Note	1003	Can't push outer joined table 'x2' as child of 'x1', table condition can not be fully evaluated by pushed join
 Note	1003	/* select#1 */ select count(0) AS `count(*)` from `test`.`tx` `x1` left join `test`.`tx` `x2` on(((`test`.`x2`.`d` = `test`.`x1`.`d`) and (`test`.`x2`.`a` = `test`.`x1`.`c`))) where true
 select count(*) from tx as x1 
 left join tx as x2 on x1.c=x2.a and x1.d=x2.d;
@@ -3004,7 +3003,7 @@
 and x.a3=0x2f and x.b3=0x3f;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	x	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	8	const,const	1	100.00	Parent of 2 pushed join@1; Using pushed condition (`test`.`x`.`d3` is not null)
-1	SIMPLE	y	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	8	const,test.x.d3	1	100.00	Child of 'x' in pushed join@1; Using where
+1	SIMPLE	y	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	8	const,test.x.d3	1	100.00	Child of 'x' in pushed join@1; Using pushed condition (`test`.`y`.`b3` = `test`.`x`.`b3`)
 Warnings:
 Note	1003	/* select#1 */ select `test`.`x`.`a3` AS `a3`,`test`.`x`.`b3` AS `b3`,`test`.`x`.`c3` AS `c3`,`test`.`x`.`d3` AS `d3`,`test`.`y`.`a3` AS `a3`,`test`.`y`.`b3` AS `b3`,`test`.`y`.`c3` AS `c3`,`test`.`y`.`d3` AS `d3` from `test`.`t3` `x` join `test`.`t3` `y` where ((`test`.`y`.`b3` = `test`.`x`.`b3`) and (`test`.`y`.`a3` = `test`.`x`.`d3`) and (`test`.`x`.`a3` = 0x2f) and (`test`.`x`.`b3` = 0x3f))
 select * from t3 x, t3 y where y.a3=x.d3 and y.b3=x.b3
@@ -3016,7 +3015,7 @@
 and x.a3=0x2f and x.b3=0x3f;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	x	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	8	const,const	1	100.00	Parent of 2 pushed join@1; Using pushed condition (`test`.`x`.`d3` is not null)
-1	SIMPLE	y	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	8	const,test.x.d3	1	100.00	Child of 'x' in pushed join@1; Using where
+1	SIMPLE	y	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	8	const,test.x.d3	1	100.00	Child of 'x' in pushed join@1; Using pushed condition (`test`.`y`.`b3` = `test`.`x`.`b3`)
 Warnings:
 Note	1003	/* select#1 */ select `test`.`x`.`a3` AS `a3`,`test`.`x`.`b3` AS `b3`,`test`.`x`.`c3` AS `c3`,`test`.`x`.`d3` AS `d3`,`test`.`y`.`a3` AS `a3`,`test`.`y`.`b3` AS `b3`,`test`.`y`.`c3` AS `c3`,`test`.`y`.`d3` AS `d3` from `test`.`t3_hash` `x` join `test`.`t3_hash` `y` where ((`test`.`y`.`b3` = `test`.`x`.`b3`) and (`test`.`y`.`a3` = `test`.`x`.`d3`) and (`test`.`x`.`a3` = 0x2f) and (`test`.`x`.`b3` = 0x3f))
 select * from t3_hash x, t3_hash y where y.a3=x.d3 and y.b3=x.b3
@@ -3028,7 +3027,7 @@
 and x.a3=0x2f and x.b3=0x3f;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	x	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	b3	b3	8	const,const	1	100.00	Parent of 2 pushed join@1; Using pushed condition (`test`.`x`.`d3` is not null)
-1	SIMPLE	y	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	b3	b3	8	const,test.x.d3	1	100.00	Child of 'x' in pushed join@1; Using where
+1	SIMPLE	y	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	b3	b3	8	const,test.x.d3	1	100.00	Child of 'x' in pushed join@1; Using pushed condition (`test`.`y`.`b3` = `test`.`x`.`b3`)
 Warnings:
 Note	1003	/* select#1 */ select `test`.`x`.`pk` AS `pk`,`test`.`x`.`a3` AS `a3`,`test`.`x`.`b3` AS `b3`,`test`.`x`.`c3` AS `c3`,`test`.`x`.`d3` AS `d3`,`test`.`y`.`pk` AS `pk`,`test`.`y`.`a3` AS `a3`,`test`.`y`.`b3` AS `b3`,`test`.`y`.`c3` AS `c3`,`test`.`y`.`d3` AS `d3` from `test`.`t3_unq` `x` join `test`.`t3_unq` `y` where ((`test`.`y`.`b3` = `test`.`x`.`b3`) and (`test`.`y`.`a3` = `test`.`x`.`d3`) and (`test`.`x`.`a3` = 0x2f) and (`test`.`x`.`b3` = 0x3f))
 select * from t3_unq x, t3_unq y where y.a3=x.d3 and y.b3=x.b3
@@ -3405,7 +3404,7 @@
 1	SIMPLE	x	p0,p1,p2,p3,p4,p5,p6,p7	ALL	b3	NULL	NULL	NULL	7	100.00	NULL
 1	SIMPLE	y	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	b3	b3	9	test.x.b3,const	1	100.00	Using where
 Warnings:
-Note	1003	/* select#1 */ select straight_join `test`.`x`.`a3` AS `a3`,`test`.`x`.`b3` AS `b3`,`test`.`x`.`c3` AS `c3`,`test`.`x`.`d3` AS `d3`,`test`.`y`.`a3` AS `a3`,`test`.`y`.`b3` AS `b3`,`test`.`y`.`c3` AS `c3`,`test`.`y`.`d3` AS `d3` from `test`.`t3` `x` join `test`.`t3` `y` where ((`test`.`y`.`b3` = `test`.`x`.`b3`) and (`test`.`y`.`d3` = <cache>(NULL)))
+Note	1003	/* select#1 */ select straight_join `test`.`x`.`a3` AS `a3`,`test`.`x`.`b3` AS `b3`,`test`.`x`.`c3` AS `c3`,`test`.`x`.`d3` AS `d3`,`test`.`y`.`a3` AS `a3`,`test`.`y`.`b3` AS `b3`,`test`.`y`.`c3` AS `c3`,`test`.`y`.`d3` AS `d3` from `test`.`t3` `x` join `test`.`t3` `y` where ((`test`.`y`.`b3` = `test`.`x`.`b3`) and (`test`.`y`.`d3` = NULL))
 prepare stmt1 from
 'select straight_join * 
   from t3 as x join t3 as y on x.b3 = y.b3
@@ -4971,8 +4970,8 @@
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	x1	p0,p1,p2,p3,p4,p5,p6,p7	ALL	NULL	NULL	NULL	NULL	#	#	Parent of 7 pushed join@1; Using pushed condition (`test`.`x1`.`a` is not null)
 1	SIMPLE	x2	p0,p1,p2,p3,p4,p5,p6,p7	ref	PRIMARY,ix1	ix1	5	test.x1.a	#	#	Child of 'x1' in pushed join@1
-1	SIMPLE	x3	p0,p1,p2,p3,p4,p5,p6,p7	ref	PRIMARY,ix1	ix1	5	test.x1.a	#	#	Child of 'x1' in pushed join@1; Using where
-1	SIMPLE	x4	p0,p1,p2,p3,p4,p5,p6,p7	ref	ix1	ix1	5	test.x1.a	#	#	Child of 'x1' in pushed join@1; Using where
+1	SIMPLE	x3	p0,p1,p2,p3,p4,p5,p6,p7	ref	PRIMARY,ix1	ix1	5	test.x1.a	#	#	Child of 'x2' in pushed join@1; Using pushed condition (`test`.`x3`.`a` < `test`.`x2`.`pk`)
+1	SIMPLE	x4	p0,p1,p2,p3,p4,p5,p6,p7	ref	ix1	ix1	5	test.x1.a	#	#	Child of 'x3' in pushed join@1; Using pushed condition (`test`.`x4`.`a` < `test`.`x3`.`pk`)
 1	SIMPLE	x5	p0,p1,p2,p3,p4,p5,p6,p7	ref	ix1	ix1	5	test.x1.a	#	#	Child of 'x1' in pushed join@1
 1	SIMPLE	x6	p0,p1,p2,p3,p4,p5,p6,p7	ref	ix1	ix1	5	test.x1.a	#	#	Child of 'x1' in pushed join@1
 1	SIMPLE	x7	p0,p1,p2,p3,p4,p5,p6,p7	ref	ix1	ix1	5	test.x1.a	#	#	Child of 'x1' in pushed join@1
@@ -5553,7 +5552,7 @@
 select straight_join * from t1 x, t1 y where y.a=x.d and y.b=x.e;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	x	p0,p1,p2,p3,p4,p5,p6,p7	ALL	PRIMARY	NULL	NULL	NULL	#	#	Parent of 2 pushed join@1; Using pushed condition (`test`.`x`.`e` is not null)
-1	SIMPLE	y	p0,p1,p2,p3,p4,p5,p6,p7	ref	ix1	ix1	4	test.x.e	#	#	Child of 'x' in pushed join@1; Using where
+1	SIMPLE	y	p0,p1,p2,p3,p4,p5,p6,p7	ref	ix1	ix1	4	test.x.e	#	#	Child of 'x' in pushed join@1; Using pushed condition (`test`.`y`.`a` = `test`.`x`.`d`)
 Warnings:
 Note	1003	/* select#1 */ select straight_join `test`.`x`.`d` AS `d`,`test`.`x`.`e` AS `e`,`test`.`x`.`f` AS `f`,`test`.`x`.`a` AS `a`,`test`.`x`.`b` AS `b`,`test`.`x`.`c` AS `c`,`test`.`y`.`d` AS `d`,`test`.`y`.`e` AS `e`,`test`.`y`.`f` AS `f`,`test`.`y`.`a` AS `a`,`test`.`y`.`b` AS `b`,`test`.`y`.`c` AS `c` from `test`.`t1` `x` join `test`.`t1` `y` where ((`test`.`y`.`b` = `test`.`x`.`e`) and (`test`.`y`.`a` = `test`.`x`.`d`))
 insert into t1(a,b,c,d,e,f) values
@@ -5795,7 +5794,7 @@
 on a.k is null and a.uq=b.uq;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	a	p0,p1,p2,p3,p4,p5,p6,p7	ALL	NULL	NULL	NULL	NULL	4	100.00	NULL
-1	SIMPLE	b	p0,p1,p2,p3,p4,p5,p6,p7	ALL	NULL	NULL	NULL	NULL	4	100.00	Using where; Using join buffer (hash join)
+1	SIMPLE	b	p0,p1,p2,p3,p4,p5,p6,p7	ALL	NULL	NULL	NULL	NULL	4	100.00	Using where; Using pushed condition <cache>((`test`.`a`.`k` is null)); Using join buffer (hash join)
 Warnings:
 Note	1003	Can't push table 'b' as child, 'type' must be a 'ref' access
 Note	1003	/* select#1 */ select `test`.`a`.`k` AS `k`,`test`.`a`.`uq` AS `uq`,`test`.`b`.`k` AS `k`,`test`.`b`.`uq` AS `uq` from `test`.`t` `a` left join `test`.`t` `b` on(((`test`.`b`.`uq` = `test`.`a`.`uq`) and (`test`.`a`.`k` is null))) where true
@@ -6667,7 +6666,7 @@
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	table1	p0,p1,p2,p3,p4,p5,p6,p7	ALL	PRIMARY	NULL	NULL	NULL	16	100.00	Parent of 3 pushed join@1
 1	SIMPLE	table2	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	8	test.table1.a,test.table1.b	1	100.00	Child of 'table1' in pushed join@1
-1	SIMPLE	table1s	p0,p1,p2,p3,p4,p5,p6,p7	ref	c	c	4	test.table1.b	2	100.00	Child of 'table2' in pushed join@1; FirstMatch(table2)
+1	SIMPLE	table1s	p0,p1,p2,p3,p4,p5,p6,p7	ref	c	c	4	test.table1.b	2	100.00	Child of 'table1' in pushed join@1; FirstMatch(table2)
 Warnings:
 Note	1003	/* select#1 */ select /*+ SEMIJOIN(@`select#2` FIRSTMATCH) */ count(0) AS `count(*)` from `test`.`t1` `table1` join `test`.`t1` `table2` semi join (`test`.`t1` `table1s`) where ((`test`.`table2`.`a` = `test`.`table1`.`a`) and (`test`.`table2`.`b` = `test`.`table1`.`b`) and (`test`.`table1s`.`c` = `test`.`table1`.`b`))
 SELECT count(*)
@@ -7168,7 +7167,7 @@
 order by new.variable_name;
 variable_name	new.variable_value - old.variable_value
 Ndb_pruned_scan_count	11
-Ndb_pushed_queries_defined	496
+Ndb_pushed_queries_defined	498
 Ndb_pushed_queries_dropped	13
 Ndb_sorted_scan_count	31
 drop table server_counts_at_startup;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/spj_rqg.result mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/spj_rqg.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/spj_rqg.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/spj_rqg.result	2021-09-28 11:46:34.000000000 +0000
@@ -328,10 +328,9 @@
         -> Nested loop inner join  ()
             -> Table scan on table1, activating pushed join of 5 tables, with pushed condition: ((table1.pk between 3 and 3) and (table1.col_int_unique is not null))  ()
             -> Index lookup on table3 using col_int_key (col_int_key=table1.col_int_unique), child of table1 in pushed join  ()
-        -> Filter: (table4.col_int = table3.col_int)  ()
-            -> Index lookup on table4 using col_int_key (col_int_key=table1.col_int_unique), child of table3 in pushed join  ()
+        -> Index lookup on table4 using col_int_key (col_int_key=table1.col_int_unique), child of table3 in pushed join, with pushed condition: (table4.col_int = table3.col_int)  ()
     -> Nested loop inner join  ()
-        -> Index lookup on table2s using PRIMARY (col_int=table3.col_int), child of table4 in pushed join, with pushed condition: (table2s.col_varchar_256_unique is not null)  ()
+        -> Index lookup on table2s using PRIMARY (col_int=table3.col_int), child of table3 in pushed join, with pushed condition: (table2s.col_varchar_256_unique is not null)  ()
         -> Index lookup on table1s using col_varchar_256_key (col_varchar_256_key=table2s.col_varchar_256_unique), child of table2s in pushed join  ()
 
 SELECT
@@ -382,8 +381,7 @@
                     -> Nested loop inner join  ()
                         -> Table scan on table2s, activating pushed join of 3 tables, with pushed condition: (table2s.col_int_key is not null)  ()
                         -> Index lookup on table1s using ix1 (col_int=table2s.col_int_key), child of table2s in pushed join, with pushed condition: (table1s.col_int_unique is not null)  ()
-                    -> Filter: (table3s.col_int = table2s.col_int)  ()
-                        -> Single-row index lookup on table3s using ix1 (col_int_unique=table1s.col_int_unique), child of table1s in pushed join  ()
+                    -> Single-row index lookup on table3s using ix1 (col_int_unique=table1s.col_int_unique), child of table1s in pushed join, with pushed condition: (table3s.col_int = table2s.col_int)  ()
     -> Hash
         -> Table scan on table2  ()
 
@@ -549,8 +547,7 @@
         -> Table scan on table1, activating pushed join of 4 tables, with pushed condition: (table1.col_int_unique is not null)  ()
         -> Index lookup on table2 using PRIMARY (col_int=table1.col_int_unique), child of table1 in pushed join  ()
     -> Nested loop left join  ()
-        -> Filter: (table3.col_int_key = table2.col_int_key)  ()
-            -> Single-row index lookup on table3 using ix1 (col_int=table1.col_int, col_int_unique=table1.col_int_unique), child of table1 in pushed join  ()
+        -> Single-row index lookup on table3 using ix1 (col_int=table1.col_int, col_int_unique=table1.col_int_unique), child of table2 in pushed join, with pushed condition: (table3.col_int_key = table2.col_int_key)  ()
         -> Single-row index lookup on table4 using PRIMARY (col_int=table2.col_int_key, pk=table1.col_int_unique), child of table2 in pushed join  ()
 
 SELECT
@@ -626,10 +623,9 @@
     -> Nested loop inner join  ()
         -> Nested loop inner join  ()
             -> Table scan on table1, activating pushed join of 4 tables  ()
-            -> Filter: (table2.col_int_unique = table1.col_int_unique)  ()
-                -> Index lookup on table2 using PRIMARY (col_int=table1.col_int), child of table1 in pushed join  ()
+            -> Index lookup on table2 using PRIMARY (col_int=table1.col_int), child of table1 in pushed join, with pushed condition: (table2.col_int_unique = table1.col_int_unique)  ()
         -> Single-row index lookup on table1s using PRIMARY (pk=table1.pk), child of table1 in pushed join  ()
-    -> Index lookup on table2s using col_int_key (col_int_key=table1.pk), child of table1s in pushed join  ()
+    -> Index lookup on table2s using col_int_key (col_int_key=table1.pk), child of table1 in pushed join  ()
 
 SELECT
 table1.pk, table2.pk
@@ -2118,16 +2114,13 @@
         -> Nested loop left join  ()
             -> Nested loop inner join  ()
                 -> Table scan on table7, activating pushed join of 2 tables  ()
-                -> Filter: ((table6.col_int_unique = table2.col_int_unique) and (table6.col_int = table2.col_int))  ()
-                    -> Index lookup on table6 using col_int_key (col_int_key=table7.pk), child of table7 in pushed join  ()
+                -> Index lookup on table6 using col_int_key (col_int_key=table7.pk), child of table7 in pushed join, with pushed condition: ((table6.col_int_unique = table2.col_int_unique) and (table6.col_int = table2.col_int))  ()
             -> Nested loop left join  ()
                 -> Nested loop left join  ()
-                    -> Filter: (table8.col_int = table2.col_int)  ()
-                        -> Single-row index lookup on table8 using ix1 (col_int_unique=table2.col_int_unique), child of table2 in pushed join  ()
+                    -> Single-row index lookup on table8 using ix1 (col_int_unique=table2.col_int_unique), child of table2 in pushed join, with pushed condition: (table8.col_int = table2.col_int)  ()
                     -> Filter: (((table2.col_int = table9.col_int) and (table8.col_int_key = table9.col_int_key) and (table2.col_int_unique = table9.col_int_unique)) is true)  ()
                         -> Table scan on table9, activating pushed join of 2 tables  ()
-                -> Filter: (table10.col_int_key = table8.col_int_key)  ()
-                    -> Single-row index lookup on table10 using ix1 (col_int_unique=table9.col_int_unique), child of table9 in pushed join  ()
+                -> Single-row index lookup on table10 using ix1 (col_int_unique=table9.col_int_unique), child of table9 in pushed join, with pushed condition: (table10.col_int_key = table8.col_int_key)  ()
         -> Index lookup on table5 using PRIMARY (col_int=table2.col_int)  ()
 
 Warnings:
@@ -2184,4 +2177,465 @@
 NULL	NULL
 NULL	NULL
 NULL	NULL
+explain format=tree SELECT straight_join
+table1.pk, table2.pk, table3.pk,
+table1.col_int_unique AS field1, table1.col_varchar_256_unique AS field2
+FROM p AS table1
+JOIN m AS table2 ON table1.col_int_key = table2.pk
+LEFT JOIN h AS table3 ON table1.col_int = table3.col_int AND table2.col_int_unique = table3.col_int_unique
+ORDER BY field1,field2;
+EXPLAIN
+-> Nested loop left join  ()
+    -> Nested loop inner join  ()
+        -> Sort: table1.col_int_unique, table1.col_varchar_256_unique  ()
+            -> Table scan on table1, with pushed condition: (table1.col_int_key is not null)  ()
+        -> Single-row index lookup on table2 using PRIMARY (pk=table1.col_int_key), activating pushed join of 2 tables  ()
+    -> Filter: (table3.col_int = table1.col_int)  ()
+        -> Single-row index lookup on table3 using ix1 (col_int_unique=table2.col_int_unique), child of table2 in pushed join  ()
+
+Warnings:
+Note	1003	Table 'table1' is not pushable, need filesort before joining child tables
+SELECT straight_join
+table1.pk, table2.pk, table3.pk,
+table1.col_int_unique AS field1, table1.col_varchar_256_unique AS field2
+FROM p AS table1
+JOIN m AS table2 ON table1.col_int_key = table2.pk
+LEFT JOIN h AS table3 ON table1.col_int = table3.col_int AND table2.col_int_unique = table3.col_int_unique
+ORDER BY field1,field2;
+pk	pk	pk	field1	field2
+1	2	NULL	13	gsxtwkvtbqscgcbnjz
+10	1	NULL	14	a
+11	3	NULL	84	can
+13	2	NULL	87	xzkjxgrcyqi
+15	2	NULL	71	me
+16	3	NULL	7	you're
+18	1	NULL	8	mkcharcpqd
+2	3	NULL	2	we
+20	2	NULL	38	see
+21	3	NULL	20	gyusxngucicqcjhvtmfnumoxifzchbfu
+3	2	NULL	17	could
+4	3	NULL	99	you
+6	3	NULL	10	emywwmshhimsbq
+9	2	NULL	50	qljcfstzgruojzffwbhxogpkk
+explain format=tree SELECT
+table1.pk, table2.pk, table3.pk
+FROM k AS table1
+LEFT JOIN m AS table2 ON table1.col_int_unique = table2.col_int_unique
+JOIN q AS table3 ON table2.col_int = table3.col_int AND table1.col_int_unique = table3.col_int_unique;
+EXPLAIN
+-> Nested loop inner join  ()
+    -> Inner hash join (table2.col_int_unique = table1.col_int_unique)  ()
+        -> Index range scan on table2 using ix3, activating pushed join of 2 tables, with pushed condition: (table2.col_int is not null)  ()
+        -> Hash
+            -> Table scan on table1, with pushed condition: (table1.col_int_unique is not null)  ()
+    -> Single-row index lookup on table3 using ix1 (col_int=table2.col_int, col_int_unique=table1.col_int_unique), child of table2 in pushed join  ()
+
+Warnings:
+Note	1003	Can't push table 'table2' as child, 'type' must be a 'ref' access
+Note	1003	Cannot push table 'table3' as child of table 'table1'. Doing so would prevent using join buffer for table 'table2'.
+SELECT
+table1.pk, table2.pk, table3.pk
+FROM k AS table1
+LEFT JOIN m AS table2 ON table1.col_int_unique = table2.col_int_unique
+JOIN q AS table3 ON table2.col_int = table3.col_int AND table1.col_int_unique = table3.col_int_unique;
+pk	pk	pk
+explain format=tree SELECT
+DISTINCT table2.col_varchar_256_unique AS field1, table1.col_varchar_256_unique AS field2
+FROM d AS table1
+JOIN d AS table2
+JOIN h AS table3
+INNER JOIN e AS table4 ON table3.col_int_key = table4.col_int_key OR table3.col_int_unique = table4.col_int_unique
+ON table2.col_int_unique = table4.col_int_unique
+ON table1.col_int_unique = table2.col_int_unique;
+EXPLAIN
+-> Table scan on <temporary>  (cost=0.05..3.29 rows=63)
+    -> Temporary table with deduplication  (cost=7784.35..7787.59 rows=63)
+        -> Nested loop inner join  ()
+            -> Nested loop inner join  ()
+                -> Inner hash join (no condition)  ()
+                    -> Index range scan on table1 using ix1, with pushed condition: (table1.col_int_unique is not null)  ()
+                    -> Hash
+                        -> Table scan on table3  ()
+                -> Single-row index lookup on table2 using ix1 (col_int_unique=table1.col_int_unique), activating pushed join of 2 tables  ()
+            -> Limit: 1 row(s)  ()
+                -> Filter: ((table4.col_int_key = table3.col_int_key) or (table1.col_int_unique = table3.col_int_unique))  ()
+                    -> Single-row index lookup on table4 using ix1 (col_int_unique=table1.col_int_unique), child of table2 in pushed join  ()
+
+Warnings:
+Note	1003	Can't push table 'table1' as child, 'type' must be a 'ref' access
+Note	1003	Cannot push table 'table2' as child of table 'table3'. Doing so would prevent using join buffer for table 'table1'.
+Note	1003	Cannot push table 'table4' as child of table 'table3'. Doing so would prevent using join buffer for table 'table1'.
+Note	1003	Table 'table1' is not pushable, access type 'MULTI_UNIQUE_KEY' not implemented
+SELECT
+DISTINCT table2.col_varchar_256_unique AS field1, table1.col_varchar_256_unique AS field2
+FROM d AS table1
+JOIN d AS table2
+JOIN h AS table3
+INNER JOIN e AS table4 ON table3.col_int_key = table4.col_int_key OR table3.col_int_unique = table4.col_int_unique
+ON table2.col_int_unique = table4.col_int_unique
+ON table1.col_int_unique = table2.col_int_unique;
+field1	field2
+my	my
+explain format=tree SELECT
+table1.pk, table2.pk
+FROM j AS table1
+JOIN r AS table2 ON table1.col_int = table2.col_int AND table1.col_int_unique = table2.col_int_unique
+WHERE table1.col_int_key IN (SELECT table1s.col_int_key AS field6 FROM z AS table1s);
+EXPLAIN
+-> Nested loop inner join  ()
+    -> Nested loop semijoin  ()
+        -> Table scan on table1, activating pushed join of 3 tables, with pushed condition: ((table1.col_int_key is not null) and (table1.col_int_unique is not null))  ()
+        -> Index lookup on table1s using col_int_key (col_int_key=table1.col_int_key), child of table1 in pushed join  ()
+    -> Index lookup on table2 using ix1 (col_int=table1.col_int, col_int_unique=table1.col_int_unique), child of table1 in pushed join  ()
+
+SELECT
+table1.pk, table2.pk
+FROM j AS table1
+JOIN r AS table2 ON table1.col_int = table2.col_int AND table1.col_int_unique = table2.col_int_unique
+WHERE table1.col_int_key IN (SELECT table1s.col_int_key AS field6 FROM z AS table1s);
+pk	pk
+explain format=tree SELECT
+table2.col_int_unique AS field1, table1.col_int AS field
+FROM m AS table1
+JOIN x AS table2 ON  table1.col_int_key = table2.col_int_key AND table1.col_int_unique = table2.col_int_unique
+WHERE table2.col_int_key IN (
+SELECT table2s.col_int_key AS field3
+FROM z AS table1s
+LEFT JOIN t AS table2s
+JOIN l AS table3s ON table2s.col_int = table3s.col_int_key
+ON table1s.pk = table2s.col_int_unique
+WHERE table1.col_int_unique = 4 IS UNKNOWN)
+AND table2.col_varchar_10_key = table1.col_varchar_256;
+EXPLAIN
+-> Nested loop semijoin  ()
+    -> Nested loop inner join  ()
+        -> Filter: ((table1.col_int_unique = 4) is null)  ()
+            -> Table scan on table1, activating pushed join of 4 tables, with pushed condition: (table1.col_varchar_256 is not null)  ()
+        -> Filter: (table2.col_varchar_10_key = table1.col_varchar_256)  ()
+            -> Index lookup on table2 using col_varchar_10_key (col_varchar_10_key=table1.col_varchar_256), with pushed condition: ((table2.col_int_unique = table1.col_int_unique) and (table2.col_int_key = table1.col_int_key))  ()
+    -> Nested loop inner join  ()
+        -> Nested loop inner join  ()
+            -> Index lookup on table2s using col_int_key (col_int_key=table1.col_int_key), child of table1 in pushed join, with pushed condition: (table2s.col_int_unique is not null)  ()
+            -> Single-row index lookup on table1s using PRIMARY (pk=table2s.col_int_unique), child of table2s in pushed join  ()
+        -> Index lookup on table3s using col_int_key (col_int_key=table2s.col_int), child of table2s in pushed join  ()
+
+Warnings:
+Note	1276	Field or reference 'test.table1.col_int_unique' of SELECT #2 was resolved in SELECT #1
+Note	1003	Can't push table 'table2' as child, column 'col_varchar_10_key' does not have same datatype as ref'ed column 'table1.col_varchar_256'
+SELECT
+table2.col_int_unique AS field1, table1.col_int AS field
+FROM m AS table1
+JOIN x AS table2 ON  table1.col_int_key = table2.col_int_key AND table1.col_int_unique = table2.col_int_unique
+WHERE table2.col_int_key IN (
+SELECT table2s.col_int_key AS field3
+FROM z AS table1s
+LEFT JOIN t AS table2s
+JOIN l AS table3s ON table2s.col_int = table3s.col_int_key
+ON table1s.pk = table2s.col_int_unique
+WHERE table1.col_int_unique = 4 IS UNKNOWN)
+AND table2.col_varchar_10_key = table1.col_varchar_256;
+field1	field
+explain format=tree SELECT
+table5.pk, table1.pk, table2.pk, table3.pk, table4.pk
+FROM q AS table1
+STRAIGHT_JOIN h AS table2 ON table1.col_int_key = table2.col_int_key AND
+table1.col_int_unique = table2.col_int_unique
+LEFT JOIN u AS table3
+STRAIGHT_JOIN x AS table4 ON table3.col_int_key = table4.col_int_key
+ON table2.col_int_key = table3.col_int_key AND
+table2.col_int_unique = table4.col_int_unique
+JOIN f AS table5 ON table2.col_int_key = table5.pk;
+EXPLAIN
+-> Nested loop left join  ()
+    -> Nested loop inner join  ()
+        -> Nested loop inner join  ()
+            -> Table scan on table5, activating pushed join of 5 tables  ()
+            -> Index lookup on table1 using ix2 (col_int_key=table5.pk), child of table5 in pushed join, with pushed condition: (table1.col_int_unique is not null)  ()
+        -> Single-row index lookup on table2 using ix1 (col_int_unique=table1.col_int_unique), child of table1 in pushed join, with pushed condition: (table2.col_int_key = table5.pk)  ()
+    -> Nested loop inner join  ()
+        -> Index lookup on table3 using col_int_key (col_int_key=table5.pk), child of table1 in pushed join  ()
+        -> Index lookup on table4 using col_int_key (col_int_key=table5.pk), child of table1 in pushed join, with pushed condition: (table4.col_int_unique = table1.col_int_unique)  ()
+
+SELECT
+table5.pk, table1.pk, table2.pk, table3.pk, table4.pk
+FROM q AS table1
+STRAIGHT_JOIN h AS table2 ON table1.col_int_key = table2.col_int_key AND
+table1.col_int_unique = table2.col_int_unique
+LEFT JOIN u AS table3
+STRAIGHT_JOIN x AS table4 ON table3.col_int_key = table4.col_int_key
+ON table2.col_int_key = table3.col_int_key AND
+table2.col_int_unique = table4.col_int_unique
+JOIN f AS table5 ON table2.col_int_key = table5.pk;
+pk	pk	pk	pk	pk
+1	19	10	NULL	NULL
+explain format=tree SELECT
+table1.pk, table2.pk, table4.pk, table3.pk
+FROM n AS table1
+JOIN a AS table2 ON table1.col_int = table2.col_int AND table1.col_int_unique = table2.col_int_unique
+LEFT OUTER JOIN x AS table3
+INNER JOIN m AS table4 ON table3.col_int = table4.pk
+ON  table2.col_int_key = table3.col_int_unique AND table2.col_int_unique = table3.col_int;
+EXPLAIN
+-> Nested loop left join  ()
+    -> Nested loop inner join  ()
+        -> Table scan on table1, activating pushed join of 4 tables, with pushed condition: (table1.col_int_unique is not null)  ()
+        -> Single-row index lookup on table2 using ix1 (col_int_unique=table1.col_int_unique), child of table1 in pushed join, with pushed condition: (table2.col_int = table1.col_int)  ()
+    -> Nested loop inner join  ()
+        -> Single-row index lookup on table4 using PRIMARY (pk=table1.col_int_unique), child of table2 in pushed join  ()
+        -> Index lookup on table3 using PRIMARY (col_int=table1.col_int_unique), child of table2 in pushed join, with pushed condition: (table3.col_int_unique = table2.col_int_key)  ()
+
+SELECT
+table1.pk, table2.pk, table4.pk, table3.pk
+FROM n AS table1
+JOIN a AS table2 ON table1.col_int = table2.col_int AND table1.col_int_unique = table2.col_int_unique
+LEFT OUTER JOIN x AS table3
+INNER JOIN m AS table4 ON table3.col_int = table4.pk
+ON  table2.col_int_key = table3.col_int_unique AND table2.col_int_unique = table3.col_int;
+pk	pk	pk	pk
+explain format=tree SELECT
+table2.col_varchar_10_key AS field1
+FROM p AS table1
+INNER JOIN a AS table2
+JOIN v AS table3 ON table2.col_int = table3.col_int AND
+table2.col_int_unique = table3.col_int_unique
+ON  table1.col_int = table3.col_int AND
+table1.col_int_key = table2.col_int_key AND
+table1.col_int_unique = table3.col_int_unique
+WHERE
+table3.col_int_unique = 7 AND
+table3.col_int = 4  OR
+NOT table3.col_int_unique = 9  OR
+table1.col_varchar_10 = table1.col_varchar_256_unique;
+EXPLAIN
+-> Nested loop inner join  ()
+    -> Nested loop inner join  ()
+        -> Table scan on table3, activating pushed join of 3 tables, with pushed condition: ((table3.col_int_unique is not null) and (table3.col_int is not null))  ()
+        -> Single-row index lookup on table2 using ix1 (col_int_unique=table3.col_int_unique), child of table3 in pushed join, with pushed condition: (table2.col_int = table3.col_int)  ()
+    -> Filter: (((table3.col_int = 4) and (table3.col_int_unique = 7)) or (table3.col_int_unique <> 9) or (table1.col_varchar_10 = table1.col_varchar_256_unique))  ()
+        -> Single-row index lookup on table1 using ix1 (col_int=table3.col_int, col_int_unique=table3.col_int_unique), child of table2 in pushed join, with pushed condition: (table1.col_int_key = table2.col_int_key)  ()
+
+SELECT
+table2.col_varchar_10_key AS field1
+FROM p AS table1
+INNER JOIN a AS table2
+JOIN v AS table3 ON table2.col_int = table3.col_int AND
+table2.col_int_unique = table3.col_int_unique
+ON  table1.col_int = table3.col_int AND
+table1.col_int_key = table2.col_int_key AND
+table1.col_int_unique = table3.col_int_unique
+WHERE
+table3.col_int_unique = 7 AND
+table3.col_int = 4  OR
+NOT table3.col_int_unique = 9  OR
+table1.col_varchar_10 = table1.col_varchar_256_unique;
+field1
+explain format=tree SELECT
+table1.pk, table2.pk, table3.pk
+FROM i AS table1
+LEFT JOIN z AS table2 ON table1.col_int_key = table2.col_int_key AND
+table1.col_int_unique = table2.col_int_unique
+LEFT JOIN m AS table3 ON table2.col_int_key = table3.col_int_key;
+EXPLAIN
+-> Nested loop left join  ()
+    -> Nested loop left join  ()
+        -> Table scan on table1, activating pushed join of 3 tables  ()
+        -> Index lookup on table2 using col_int_key (col_int_key=table1.col_int_key), child of table1 in pushed join, with pushed condition: (table2.col_int_unique = table1.col_int_unique)  ()
+    -> Index lookup on table3 using col_int_key (col_int_key=table2.col_int_key), child of table2 in pushed join  ()
+
+SELECT
+table1.pk, table2.pk, table3.pk
+FROM i AS table1
+LEFT JOIN z AS table2 ON table1.col_int_key = table2.col_int_key AND
+table1.col_int_unique = table2.col_int_unique
+LEFT JOIN m AS table3 ON table2.col_int_key = table3.col_int_key;
+pk	pk	pk
+1	NULL	NULL
+10	72	10
+10	72	11
+10	72	13
+10	72	15
+10	72	18
+10	72	2
+10	72	3
+10	72	4
+11	NULL	NULL
+12	NULL	NULL
+13	NULL	NULL
+14	NULL	NULL
+2	NULL	NULL
+3	NULL	NULL
+4	60	1
+4	60	12
+4	60	20
+4	60	5
+4	60	6
+5	NULL	NULL
+6	NULL	NULL
+7	NULL	NULL
+8	NULL	NULL
+9	NULL	NULL
+SELECT
+table1.pk, table3.pk, table2.pk, table5.pk, table4.pk, table6.pk
+FROM f AS table1
+LEFT JOIN ( j AS table3
+straight_JOIN x AS table2 ON table2.col_int_key = table3.col_int_key AND
+table2.col_int_unique = table3.col_int_unique)
+LEFT JOIN ((d AS table4
+straight_JOIN b AS table5 ON table4.pk = table5.col_int_unique)
+LEFT JOIN x AS table6 ON table5.col_int_unique = table6.col_int)
+ON table2.col_int_key = table5.col_int_unique AND
+table2.col_int_unique = table5.col_int_key
+ON table1.pk = table3.col_int_unique;
+pk	pk	pk	pk	pk	pk
+1	NULL	NULL	NULL	NULL	NULL
+10	NULL	NULL	NULL	NULL	NULL
+11	NULL	NULL	NULL	NULL	NULL
+12	NULL	NULL	NULL	NULL	NULL
+13	NULL	NULL	NULL	NULL	NULL
+14	NULL	NULL	NULL	NULL	NULL
+15	NULL	NULL	NULL	NULL	NULL
+16	NULL	NULL	NULL	NULL	NULL
+17	NULL	NULL	NULL	NULL	NULL
+2	NULL	NULL	NULL	NULL	NULL
+3	NULL	NULL	NULL	NULL	NULL
+4	NULL	NULL	NULL	NULL	NULL
+5	NULL	NULL	NULL	NULL	NULL
+6	18	6	NULL	NULL	NULL
+7	NULL	NULL	NULL	NULL	NULL
+8	NULL	NULL	NULL	NULL	NULL
+9	NULL	NULL	NULL	NULL	NULL
+SELECT
+table1.pk, table3.pk, table2.pk, table5.pk, table4.pk, table6.pk
+FROM f AS table1
+LEFT JOIN ( j AS table3
+straight_JOIN x AS table2 ON table2.col_int_key = table3.col_int_key AND
+table2.col_int_unique = table3.col_int_unique)
+LEFT JOIN (b AS table5
+JOIN d AS table4 ON table4.pk = table5.col_int_unique)
+LEFT JOIN x AS table6 ON table5.col_int_unique = table6.col_int
+ON table2.col_int_key = table5.col_int_unique AND
+table2.col_int_unique = table5.col_int_key
+ON table1.pk = table3.col_int_unique;
+pk	pk	pk	pk	pk	pk
+1	NULL	NULL	NULL	NULL	NULL
+10	NULL	NULL	NULL	NULL	NULL
+11	NULL	NULL	NULL	NULL	NULL
+12	NULL	NULL	NULL	NULL	NULL
+13	NULL	NULL	NULL	NULL	NULL
+14	NULL	NULL	NULL	NULL	NULL
+15	NULL	NULL	NULL	NULL	NULL
+16	NULL	NULL	NULL	NULL	NULL
+17	NULL	NULL	NULL	NULL	NULL
+2	NULL	NULL	NULL	NULL	NULL
+3	NULL	NULL	NULL	NULL	NULL
+4	NULL	NULL	NULL	NULL	NULL
+5	NULL	NULL	NULL	NULL	NULL
+6	18	6	NULL	NULL	NULL
+7	NULL	NULL	NULL	NULL	NULL
+8	NULL	NULL	NULL	NULL	NULL
+9	NULL	NULL	NULL	NULL	NULL
+explain format=tree SELECT
+table1.pk, table2.pk, table3.pk, table4.pk, table5.pk
+FROM
+(b AS table1
+JOIN b AS table2 ON table1.col_int_key = table2.col_int_unique AND
+table1.col_int_unique = table2.col_int_key)
+LEFT JOIN
+((c AS table3 JOIN q AS table4 ON table3.col_int_key = table4.pk)
+JOIN i AS table5 ON table3.col_int_unique = table5.col_int_key
+)
+ON table2.col_int = table4.col_int AND
+table2.col_int_key = table5.col_int_key AND
+table1.col_int_unique = table3.col_int_unique;
+EXPLAIN
+-> Nested loop left join  ()
+    -> Nested loop inner join  ()
+        -> Table scan on table1, activating pushed join of 5 tables, with pushed condition: (table1.col_int_key is not null)  ()
+        -> Single-row index lookup on table2 using ix1 (col_int_unique=table1.col_int_key), child of table1 in pushed join, with pushed condition: (table2.col_int_key = table1.col_int_unique)  ()
+    -> Nested loop inner join  ()
+        -> Nested loop inner join  ()
+            -> Index lookup on table3 using ix1 (col_int_unique=table1.col_int_unique), child of table2 in pushed join  ()
+            -> Single-row index lookup on table4 using PRIMARY (pk=table3.col_int_key), child of table3 in pushed join, with pushed condition: (table4.col_int = table2.col_int)  ()
+        -> Index lookup on table5 using col_int_key (col_int_key=table1.col_int_unique), child of table2 in pushed join  ()
+
+SELECT
+table1.pk, table2.pk, table3.pk, table4.pk, table5.pk
+FROM
+(b AS table1
+JOIN b AS table2 ON table1.col_int_key = table2.col_int_unique AND
+table1.col_int_unique = table2.col_int_key)
+LEFT JOIN
+((c AS table3 JOIN q AS table4 ON table3.col_int_key = table4.pk)
+JOIN i AS table5 ON table3.col_int_unique = table5.col_int_key
+)
+ON table2.col_int = table4.col_int AND
+table2.col_int_key = table5.col_int_key AND
+table1.col_int_unique = table3.col_int_unique;
+pk	pk	pk	pk	pk
 DROP TABLE a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z;
+##################
+#
+# Bug #33181964 Incorrect result for pushed join
+#               w/ outer join inside an exists-subqry
+#
+##################
+create table t (
+pk int NOT NULL,
+col_int int NOT NULL,
+primary key(col_int,pk)
+) engine=ndbcluster;
+insert into t values
+(1, 0), (3, 0), (2, 0), (4, 0), (5, 0), (7, 0);
+create table x (
+col_int int
+) engine=ndbcluster ;
+insert into x select pk from t;
+insert into x select pk from t;
+######################################
+# Expect 'firstMatch' algorithm to be
+# used for pushed join over [t1..t3]
+######################################
+explain format=traditional select * from x
+where exists (
+select *
+from t as t1
+left join (
+t as t2 join t as t3 on
+t2.pk = 999   # 999 -> no t2 matches
+)
+on t1.col_int = t3.col_int and
+t1.col_int = t2.col_int
+);
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	p0,p1	ALL	NULL	NULL	NULL	NULL	6	100.00	Parent of 3 pushed join@1
+1	SIMPLE	t2	p0,p1	eq_ref	PRIMARY	PRIMARY	8	test.t1.col_int,const	1	100.00	Child of 't1' in pushed join@1
+1	SIMPLE	t3	p0,p1	ref	PRIMARY	PRIMARY	4	test.t1.col_int	1	100.00	Child of 't1' in pushed join@1; FirstMatch
+1	SIMPLE	x	p0,p1	ALL	NULL	NULL	NULL	NULL	12	100.00	Using join buffer (hash join)
+Warnings:
+Note	1003	Can't push table 'x' as child, 'type' must be a 'ref' access
+Note	1003	/* select#1 */ select `test`.`x`.`col_int` AS `col_int` from `test`.`x` semi join (`test`.`t` `t1` left join (`test`.`t` `t2` join `test`.`t` `t3`) on(((`test`.`t1`.`col_int` = `test`.`t3`.`col_int`) and (`test`.`t1`.`col_int` = `test`.`t2`.`col_int`) and (`test`.`t2`.`pk` = 999)))) where true
+select * from x
+where exists (
+select *
+from t as t1
+left join (
+t as t2 join t as t3 on
+t2.pk = 999   # 999 -> no t2 matches
+)
+on t1.col_int = t3.col_int and
+t1.col_int = t2.col_int
+);
+col_int
+1
+1
+2
+2
+3
+3
+4
+4
+5
+5
+7
+7
+drop table t,x;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/spj_rqg.test mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/spj_rqg.test
--- mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/spj_rqg.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/spj_rqg.test	2021-09-28 11:46:34.000000000 +0000
@@ -2105,5 +2105,297 @@
 eval $query;
 
 
+################################################
+#### Added as part of WL#14388 development #####
+
+# Due to ORDER BY on table1, only table2 join table2 is pushed.
+#  table2 is a eq-ref with table3 having the condition 'table1.col_int = table3.col_int'
+#  referring the 'const-at-exec' table1. Due to incomplete implementation of 'disable_cache'
+#  in the table2-EQRefIterator::Read() we cant push the table3 condition above.
+#
+let $query=
+SELECT straight_join
+  table1.pk, table2.pk, table3.pk,
+  table1.col_int_unique AS field1, table1.col_varchar_256_unique AS field2
+FROM p AS table1
+  JOIN m AS table2 ON table1.col_int_key = table2.pk
+  LEFT JOIN h AS table3 ON table1.col_int = table3.col_int AND table2.col_int_unique = table3.col_int_unique
+ORDER BY field1,field2;
+
+--replace_regex /cost=\d+\.\d+\ rows=\d+//
+eval explain format=tree $query;
+--sorted_result
+eval $query;
+
+
+# Query plan will be table1,table3,table2 with 'table3 join table2' pushed,
+# and hash joined with table1.
+# As table2 condition 'table1.col_int_unique = table2.col_int_unique' refer table1
+# 'across' the buffered hash join, that condition should not be pushed.
+#
+let $query=
+SELECT
+  table1.pk, table2.pk, table3.pk
+FROM k AS table1
+  LEFT JOIN m AS table2 ON table1.col_int_unique = table2.col_int_unique
+  JOIN q AS table3 ON table2.col_int = table3.col_int AND table1.col_int_unique = table3.col_int_unique;
+
+--replace_regex /cost=\d+\.\d+\ rows=\d+//
+eval explain format=tree $query;
+--sorted_result
+eval $query;
+
+
+# Another query with condition refering ancestor table prior to EQ-ref join root,
+let $query=
+SELECT
+  DISTINCT table2.col_varchar_256_unique AS field1, table1.col_varchar_256_unique AS field2
+FROM d AS table1
+  JOIN d AS table2
+    JOIN h AS table3
+      INNER JOIN e AS table4 ON table3.col_int_key = table4.col_int_key OR table3.col_int_unique = table4.col_int_unique
+    ON table2.col_int_unique = table4.col_int_unique
+  ON table1.col_int_unique = table2.col_int_unique;
+
+--replace_regex /cost=\d+\.\d+\ rows=\d+//
+eval explain format=tree $query;
+--sorted_result
+eval $query;
+
+
+let $query=
+SELECT
+  table1.pk, table2.pk
+FROM j AS table1
+  JOIN r AS table2 ON table1.col_int = table2.col_int AND table1.col_int_unique = table2.col_int_unique
+WHERE table1.col_int_key IN (SELECT table1s.col_int_key AS field6 FROM z AS table1s);
+
+--replace_regex /cost=\d+\.\d+\ rows=\d+//
+eval explain format=tree $query;
+--sorted_result
+eval $query;
+
+
+let $query=
+SELECT
+  table2.col_int_unique AS field1, table1.col_int AS field
+FROM m AS table1
+  JOIN x AS table2 ON  table1.col_int_key = table2.col_int_key AND table1.col_int_unique = table2.col_int_unique
+WHERE table2.col_int_key IN (
+  SELECT table2s.col_int_key AS field3
+  FROM z AS table1s
+    LEFT JOIN t AS table2s
+      JOIN l AS table3s ON table2s.col_int = table3s.col_int_key
+    ON table1s.pk = table2s.col_int_unique
+  WHERE table1.col_int_unique = 4 IS UNKNOWN)
+AND table2.col_varchar_10_key = table1.col_varchar_256;
+
+--replace_regex /cost=\d+\.\d+\ rows=\d+//
+eval explain format=tree $query;
+--sorted_result
+eval $query;
+
+
+# If the pushed condition has outer references, its referred ('used_tables')
+# need to be included in set of 'depend_parents' used to calculate and
+# check the set of 'm_tables[first_inner].m_ancestors'
+# Several such queries below.
+
+let $query=
+SELECT
+  table5.pk, table1.pk, table2.pk, table3.pk, table4.pk
+FROM q AS table1
+  STRAIGHT_JOIN h AS table2 ON table1.col_int_key = table2.col_int_key AND
+                               table1.col_int_unique = table2.col_int_unique
+  LEFT JOIN u AS table3
+    STRAIGHT_JOIN x AS table4 ON table3.col_int_key = table4.col_int_key
+    ON table2.col_int_key = table3.col_int_key AND
+       table2.col_int_unique = table4.col_int_unique
+  JOIN f AS table5 ON table2.col_int_key = table5.pk;
+
+--replace_regex /cost=\d+\.\d+\ rows=\d+//
+eval explain format=tree $query;
+--sorted_result
+eval $query;
+
+
+let $query=
+SELECT
+  table1.pk, table2.pk, table4.pk, table3.pk
+FROM n AS table1
+  JOIN a AS table2 ON table1.col_int = table2.col_int AND table1.col_int_unique = table2.col_int_unique
+  LEFT OUTER JOIN x AS table3
+    INNER JOIN m AS table4 ON table3.col_int = table4.pk
+    ON  table2.col_int_key = table3.col_int_unique AND table2.col_int_unique = table3.col_int;
+
+--replace_regex /cost=\d+\.\d+\ rows=\d+//
+eval explain format=tree $query;
+--sorted_result
+eval $query;
+
+
+let $query=
+SELECT
+  table2.col_varchar_10_key AS field1
+FROM p AS table1
+  INNER JOIN a AS table2
+    JOIN v AS table3 ON table2.col_int = table3.col_int AND
+                        table2.col_int_unique = table3.col_int_unique
+  ON  table1.col_int = table3.col_int AND
+      table1.col_int_key = table2.col_int_key AND
+      table1.col_int_unique = table3.col_int_unique
+WHERE
+       table3.col_int_unique = 7 AND
+       table3.col_int = 4  OR
+       NOT table3.col_int_unique = 9  OR
+       table1.col_varchar_10 = table1.col_varchar_256_unique;
+
+--replace_regex /cost=\d+\.\d+\ rows=\d+//
+eval explain format=tree $query;
+--sorted_result
+eval $query;
+
+#
+# Tests which at some stage during development failed with
+# an incorrect result in the RQG test.
+#
+
+let $query=
+SELECT
+  table1.pk, table2.pk, table3.pk
+FROM i AS table1
+  LEFT JOIN z AS table2 ON table1.col_int_key = table2.col_int_key AND
+                           table1.col_int_unique = table2.col_int_unique
+  LEFT JOIN m AS table3 ON table2.col_int_key = table3.col_int_key;
+
+--replace_regex /cost=\d+\.\d+\ rows=\d+//
+eval explain format=tree $query;
+--sorted_result
+eval $query;
+
+
+let $query=
+SELECT
+  table1.pk, table3.pk, table2.pk, table5.pk, table4.pk, table6.pk
+FROM f AS table1
+  LEFT JOIN ( j AS table3
+    straight_JOIN x AS table2 ON table2.col_int_key = table3.col_int_key AND
+                                 table2.col_int_unique = table3.col_int_unique)
+    LEFT JOIN ((d AS table4
+      straight_JOIN b AS table5 ON table4.pk = table5.col_int_unique)
+      LEFT JOIN x AS table6 ON table5.col_int_unique = table6.col_int)
+    ON table2.col_int_key = table5.col_int_unique AND
+       table2.col_int_unique = table5.col_int_key
+  ON table1.pk = table3.col_int_unique;
+
+# We do not explain this query as a slightly different query plan
+# might be generated on Windows and Mac.
+#--replace_regex /cost=\d+\.\d+\ rows=\d+//
+#eval explain format=tree $query;
+--sorted_result
+eval $query;
+
+
+let $query=
+SELECT
+  table1.pk, table3.pk, table2.pk, table5.pk, table4.pk, table6.pk
+FROM f AS table1
+  LEFT JOIN ( j AS table3
+    straight_JOIN x AS table2 ON table2.col_int_key = table3.col_int_key AND
+                       table2.col_int_unique = table3.col_int_unique)
+    LEFT JOIN (b AS table5
+      JOIN d AS table4 ON table4.pk = table5.col_int_unique)
+      LEFT JOIN x AS table6 ON table5.col_int_unique = table6.col_int
+    ON table2.col_int_key = table5.col_int_unique AND
+       table2.col_int_unique = table5.col_int_key
+  ON table1.pk = table3.col_int_unique;
+
+# We do not explain this query as a slightly different query plan
+# might be generated on Windows and Mac.
+#--replace_regex /cost=\d+\.\d+\ rows=\d+//
+#eval explain format=tree $query;
+--sorted_result
+eval $query;
+
+
+let $query=
+SELECT
+  table1.pk, table2.pk, table3.pk, table4.pk, table5.pk
+FROM
+  (b AS table1
+    JOIN b AS table2 ON table1.col_int_key = table2.col_int_unique AND
+                        table1.col_int_unique = table2.col_int_key)
+  LEFT JOIN
+    ((c AS table3 JOIN q AS table4 ON table3.col_int_key = table4.pk)
+      JOIN i AS table5 ON table3.col_int_unique = table5.col_int_key
+    )
+  ON table2.col_int = table4.col_int AND
+     table2.col_int_key = table5.col_int_key AND
+     table1.col_int_unique = table3.col_int_unique;
+
+--replace_regex /cost=\d+\.\d+\ rows=\d+//
+eval explain format=tree $query;
+--sorted_result
+eval $query;
+
+
 ######################################################
 DROP TABLE a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z;
+
+
+#####################################################
+# Some test cases not using the tables a..z (anymore).
+# These were originally found using the RQG test suite
+# and the above tables, but were simplified into smaller
+# test cases during bug fixing.
+# They also need the 'BatchSize=1' config to reproduce
+# the failure.
+
+--echo ##################
+--echo #
+--echo # Bug #33181964 Incorrect result for pushed join
+--echo #               w/ outer join inside an exists-subqry
+--echo #
+--echo ##################
+
+create table t (
+  pk int NOT NULL,
+  col_int int NOT NULL,
+  primary key(col_int,pk)
+) engine=ndbcluster;
+
+insert into t values
+ (1, 0), (3, 0), (2, 0), (4, 0), (5, 0), (7, 0);
+
+
+create table x (
+  col_int int
+) engine=ndbcluster ;
+
+# Make table 'x' larger than 't'
+insert into x select pk from t;
+insert into x select pk from t;
+
+let $query=
+select * from x
+where exists (
+  select *
+  from t as t1
+    left join (
+      t as t2 join t as t3 on
+        t2.pk = 999   # 999 -> no t2 matches
+    )
+    on t1.col_int = t3.col_int and
+       t1.col_int = t2.col_int
+  );
+
+--echo ######################################
+--echo # Expect 'firstMatch' algorithm to be
+--echo # used for pushed join over [t1..t3]
+--echo ######################################
+eval explain format=traditional $query;
+
+--sorted_result
+eval $query;
+
+drop table t,x;
\ No newline at end of file
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/statistics1.result mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/statistics1.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/statistics1.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/statistics1.result	2021-09-28 11:46:34.000000000 +0000
@@ -82,7 +82,7 @@
 ON y.i=x.i AND y.j = x.i;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	x	p0	ALL	I	NULL	NULL	NULL	10000	100.00	Parent of 2 pushed join@1; Using pushed condition (`test`.`x`.`I` is not null)
-1	SIMPLE	y	p0	ref	J,I	J	5	test.x.I	1	5.00	Child of 'x' in pushed join@1; Using where
+1	SIMPLE	y	p0	ref	J,I	J	5	test.x.I	1	5.00	Child of 'x' in pushed join@1; Using pushed condition (`test`.`y`.`I` = `test`.`x`.`I`)
 Warnings:
 Note	1003	/* select#1 */ select `test`.`x`.`K` AS `K`,`test`.`x`.`I` AS `I`,`test`.`x`.`J` AS `J`,`test`.`y`.`K` AS `K`,`test`.`y`.`I` AS `I`,`test`.`y`.`J` AS `J` from `test`.`t10000` `x` join `test`.`t10000` `y` where ((`test`.`y`.`I` = `test`.`x`.`I`) and (`test`.`y`.`J` = `test`.`x`.`I`))
 EXPLAIN
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/wait_index_stat_cache_updated.inc mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/wait_index_stat_cache_updated.inc
--- mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/wait_index_stat_cache_updated.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/wait_index_stat_cache_updated.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,41 @@
+#
+# Check if the index stat cache has been updated. This is done by keeping
+# track of the events on the ndb_index_stat_head table which is exposed by
+# the Ndb_index_stat_event_count status variable.
+#
+# Usage:
+#
+# --let $old_event_count=
+#     query_get_value(SHOW STATUS LIKE 'Ndb_index_stat_event_count', Value, 1)
+#  < Changes that are expected to cause an auto-update of index stats >
+# --let $index_stat_db=<db name>
+# --let $index_stat_table=<table name>
+# --source wait_index_stat_cache_updated.inc
+#
+
+if (`select LENGTH('$index_stat_db') = 0`)
+{
+  # Default is test
+  --let $index_stat_db=test
+}
+if (`select LENGTH('$index_stat_table') = 0`)
+{
+  # Default is t1
+  --let $index_stat_table=t1
+}
+
+#--echo Old event count = $old_event_count
+--let $root_name = $index_stat_db/def/$index_stat_table
+# Get index count
+--let $index_count = query_get_value(SELECT COUNT(*) FROM ndbinfo.dict_obj_tree WHERE root_name = '$root_name' AND type = 6, COUNT(*), 1)
+#--echo Index count = $index_count
+--expr $expected_event_count = $old_event_count + $index_count
+--echo Waiting for the index stats to be updated
+# Suppress the echo when the wait times out. It's likely that an event has
+# been handled earlier than expected. We are more concerned about scenarios
+# where the stats haven't been updated. This will be detected in the select
+# queries that follow the wait
+--let $silent_failure=1
+--let $wait_condition = SELECT VARIABLE_VALUE >= $expected_event_count FROM performance_schema.global_status WHERE VARIABLE_NAME LIKE 'Ndb_index_stat_event_count'
+--source include/wait_condition.inc
+--echo Index stats updated
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/wait_index_stat_updated.inc mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/wait_index_stat_updated.inc
--- mysql-8.0-8.0.26/mysql-test/suite/ndb_opt/wait_index_stat_updated.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb_opt/wait_index_stat_updated.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,91 @@
+#
+# Wait until index stats have been updated for a table.
+# Times out after waiting for 30 seconds
+#
+# Usage:
+#
+# --let $index_stat_db=<db name>
+# --let $index_stat_table=<table name>
+# --source wait_index_stats_updated.inc
+#
+
+--disable_query_log
+if (`select LENGTH('$index_stat_db') = 0`)
+{
+  # Default is test
+  --let $index_stat_db=test
+}
+if (`select LENGTH('$index_stat_table') = 0`)
+{
+  # Default is t1
+  --let $index_stat_table=t1
+}
+
+--let $root_name = '$index_stat_db/def/$index_stat_table'
+# Get the id of an ordered index on the table
+--let $index_id = query_get_value(SELECT id FROM ndbinfo.dict_obj_tree WHERE root_name = $root_name AND type = 6, id, 1)
+
+CREATE TEMPORARY TABLE tmp_table (
+    x char(255)
+  ) CHARSET latin1 ENGINE InnoDB;
+
+CREATE TEMPORARY TABLE index_stats (
+  index_id INT UNSIGNED,
+  index_version INT UNSIGNED,
+  table_id INT UNSIGNED,
+  frag_count INT UNSIGNED,
+  value_format INT UNSIGNED,
+  sample_version INT UNSIGNED,
+  load_time INT UNSIGNED,
+  sample_count INT UNSIGNED,
+  key_bytes INT UNSIGNED
+) ENGINE InnoDB;
+--enable_query_log
+
+--let $sample_version = 1
+# Set max intervals to 6 i.e. 6 waits of 5 seconds each
+--let $max_wait_intervals = 6
+while ($sample_version < 2)
+{
+  --sleep 5
+  --dec $max_wait_intervals
+  if ($max_wait_intervals == 0)
+  {
+    --die Timed out waiting for index stats to be updated
+  }
+  --disable_query_log
+  # Retrieve the contents of the ndb_index_stat_head table
+  --let $dump_file1 = $MYSQLTEST_VARDIR/tmp/index_stat_select_all1.txt
+  --exec $NDB_SELECT_ALL -d mysql --delimiter=, ndb_index_stat_head > $dump_file1
+  --eval LOAD DATA INFILE '$dump_file1' INTO TABLE tmp_table
+
+  # Remove the column names
+  DELETE FROM tmp_table WHERE x NOT REGEXP '^[0-9]*,';
+
+  # Dump the contents so that it can be loaded into another table which
+  # can be queried
+  --let $dump_file2 = $MYSQLTEST_VARDIR/tmp/index_stat_select_all2.txt
+  --eval SELECT x FROM tmp_table INTO OUTFILE '$dump_file2'
+  --eval LOAD DATA INFILE '$dump_file2' INTO TABLE index_stats FIELDS TERMINATED BY ',' LINES TERMINATED BY '\n'
+
+  # Filter out content about indexes on other tables
+  --eval DELETE FROM index_stats WHERE index_id <> $index_id
+
+  # Update sample_version with value retrieved from ndb_index_stat_head
+  --let $sample_version = query_get_value(SELECT sample_version FROM index_stats, sample_version, 1)
+
+  # Clean up
+  --remove_file $dump_file1
+  --remove_file $dump_file2
+  TRUNCATE TABLE tmp_table;
+  TRUNCATE TABLE index_stats;
+  --enable_query_log
+}
+
+--echo Stats automatically updated
+#--echo Sample version: $sample_version
+
+--disable_query_log ONCE
+DROP TABLE tmp_table,index_stats;
+--let $index_stat_db=
+--let $index_stat_table=
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb_rpl/r/ndb_rpl_rowsize14000.result mysql-8.0-8.0.27/mysql-test/suite/ndb_rpl/r/ndb_rpl_rowsize14000.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb_rpl/r/ndb_rpl_rowsize14000.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb_rpl/r/ndb_rpl_rowsize14000.result	2021-09-28 11:46:34.000000000 +0000
@@ -24,8 +24,11 @@
 data VARBINARY(10294) NOT NULL,
 PRIMARY KEY(pk01,pk02,pk03,pk04,pk05,pk06,pk07,pk08,pk09,pk10,pk11,pk12,pk13,pk14,pk15,pk16))
 ENGINE ndb;
+Warnings:
+Warning	1296	Specified key 'PRIMARY' was too long (max = 3056 bytes); statistics will not be generated
 SHOW WARNINGS;
 Level	Code	Message
+Warning	1296	Specified key 'PRIMARY' was too long (max = 3056 bytes); statistics will not be generated
 INSERT INTO t (pk01, data) VALUES (REPEAT(' ', 192), REPEAT('.', 10294));
 SELECT LENGTH(pk01), CRC32(pk01), LENGTH(data), CRC32(data) FROM t;
 LENGTH(pk01)	CRC32(pk01)	LENGTH(data)	CRC32(data)
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/ndb_rpl/r/ndb_rpl_rowsize30000.result mysql-8.0-8.0.27/mysql-test/suite/ndb_rpl/r/ndb_rpl_rowsize30000.result
--- mysql-8.0-8.0.26/mysql-test/suite/ndb_rpl/r/ndb_rpl_rowsize30000.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/ndb_rpl/r/ndb_rpl_rowsize30000.result	2021-09-28 11:46:34.000000000 +0000
@@ -24,8 +24,11 @@
 data VARBINARY(26924) NOT NULL,
 PRIMARY KEY(pk01,pk02,pk03,pk04,pk05,pk06,pk07,pk08,pk09,pk10,pk11,pk12,pk13,pk14,pk15,pk16))
 ENGINE ndb;
+Warnings:
+Warning	1296	Specified key 'PRIMARY' was too long (max = 3056 bytes); statistics will not be generated
 SHOW WARNINGS;
 Level	Code	Message
+Warning	1296	Specified key 'PRIMARY' was too long (max = 3056 bytes); statistics will not be generated
 INSERT INTO t (pk01, data) VALUES (REPEAT(' ', 192), REPEAT('.', 26924));
 SELECT LENGTH(pk01), CRC32(pk01), LENGTH(data), CRC32(data) FROM t;
 LENGTH(pk01)	CRC32(pk01)	LENGTH(data)	CRC32(data)
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/bugs_no_prot_all.result mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/bugs_no_prot_all.result
--- mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/bugs_no_prot_all.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/bugs_no_prot_all.result	2021-09-28 11:46:34.000000000 +0000
@@ -2207,6 +2207,7 @@
                             "rowid_ordered": false,
                             "using_mrr": false,
                             "index_only": true,
+                            "in_memory": -1,
                             "rows": 4,
                             "cost": 0.677442,
                             "chosen": false,
@@ -2570,6 +2571,7 @@
                                               "rowid_ordered": true,
                                               "using_mrr": true,
                                               "index_only": false,
+                                              "in_memory": 1,
                                               "rows": 1,
                                               "cost": 0.6,
                                               "chosen": false,
@@ -2584,6 +2586,7 @@
                                               "rowid_ordered": false,
                                               "using_mrr": false,
                                               "index_only": true,
+                                              "in_memory": 1,
                                               "rows": 1,
                                               "cost": 0.36,
                                               "chosen": false,
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/bugs_no_prot_none.result mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/bugs_no_prot_none.result
--- mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/bugs_no_prot_none.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/bugs_no_prot_none.result	2021-09-28 11:46:34.000000000 +0000
@@ -1793,6 +1793,7 @@
                                               "rowid_ordered": true,
                                               "using_mrr": false,
                                               "index_only": false,
+                                              "in_memory": 1,
                                               "rows": 1,
                                               "cost": 0.61,
                                               "chosen": false,
@@ -1807,6 +1808,7 @@
                                               "rowid_ordered": false,
                                               "using_mrr": false,
                                               "index_only": true,
+                                              "in_memory": 1,
                                               "rows": 1,
                                               "cost": 0.36,
                                               "chosen": false,
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/bugs_ps_prot_all.result mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/bugs_ps_prot_all.result
--- mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/bugs_ps_prot_all.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/bugs_ps_prot_all.result	2021-09-28 11:46:34.000000000 +0000
@@ -1965,6 +1965,7 @@
                             "rowid_ordered": false,
                             "using_mrr": false,
                             "index_only": true,
+                            "in_memory": -1,
                             "rows": 4,
                             "cost": 0.677442,
                             "chosen": false,
@@ -2303,6 +2304,7 @@
                                               "rowid_ordered": true,
                                               "using_mrr": true,
                                               "index_only": false,
+                                              "in_memory": 1,
                                               "rows": 1,
                                               "cost": 0.6,
                                               "chosen": false,
@@ -2317,6 +2319,7 @@
                                               "rowid_ordered": false,
                                               "using_mrr": false,
                                               "index_only": true,
+                                              "in_memory": 1,
                                               "rows": 1,
                                               "cost": 0.36,
                                               "chosen": false,
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result
--- mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result	2021-09-28 11:46:34.000000000 +0000
@@ -1571,6 +1571,7 @@
                                               "rowid_ordered": true,
                                               "using_mrr": false,
                                               "index_only": false,
+                                              "in_memory": 1,
                                               "rows": 1,
                                               "cost": 0.61,
                                               "chosen": false,
@@ -1585,6 +1586,7 @@
                                               "rowid_ordered": false,
                                               "using_mrr": false,
                                               "index_only": true,
+                                              "in_memory": 1,
                                               "rows": 1,
                                               "cost": 0.36,
                                               "chosen": false,
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/charset.result mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/charset.result
--- mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/charset.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/charset.result	2021-09-28 11:46:34.000000000 +0000
@@ -558,6 +558,7 @@
                         "rowid_ordered": true,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": 1,
                         "rows": 2,
                         "cost": 0.71,
                         "chosen": false,
@@ -791,6 +792,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": 1,
                         "rows": 2,
                         "cost": 0.460336,
                         "chosen": false,
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/derived_condition_pushdown.result mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/derived_condition_pushdown.result
--- mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/derived_condition_pushdown.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/derived_condition_pushdown.result	2021-09-28 11:46:34.000000000 +0000
@@ -198,6 +198,7 @@
                               "rowid_ordered": false,
                               "using_mrr": false,
                               "index_only": false,
+                              "in_memory": 1,
                               "rows": 1,
                               "cost": 0.61,
                               "chosen": true
@@ -211,6 +212,7 @@
                               "rowid_ordered": false,
                               "using_mrr": false,
                               "index_only": false,
+                              "in_memory": 1,
                               "rows": 1,
                               "cost": 0.61,
                               "chosen": false,
@@ -326,11 +328,17 @@
                       "write_method": "write_all_rows"
                     },
                     {
+                      "adding_tmp_table_in_plan_at_position": 2,
+                      "cause": "output_for_window_functions",
+                      "with_buffer": true,
+                      "write_method": "write_all_rows"
+                    },
+                    {
                       "creating_tmp_table": {
                         "tmp_table_info": {
                           "table": "intermediate_tmp_table",
                           "columns": 3,
-                          "row_length": 14,
+                          "row_length": 13,
                           "key_length": 0,
                           "unique_constraint": false,
                           "makes_grouped_rows": false,
@@ -340,14 +348,8 @@
                       }
                     },
                     {
-                      "adding_tmp_table_in_plan_at_position": 2,
-                      "cause": "output_for_window_functions",
-                      "with_buffer": true,
-                      "write_method": "write_all_rows",
-                      "adding_sort_to_previous_table": {
-                        "filesort": {
-                          "adding_sort_to_table": ""
-                        }
+                      "filesort": {
+                        "adding_sort_to_table": ""
                       }
                     }
                   ]
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/eq_range_statistics.result mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/eq_range_statistics.result
--- mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/eq_range_statistics.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/eq_range_statistics.result	2021-09-28 11:46:34.000000000 +0000
@@ -172,6 +172,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": 1,
                         "rows": 5,
                         "cost": 0.761949,
                         "chosen": true
@@ -392,6 +393,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": 1,
                         "rows": 4,
                         "cost": 0.661462,
                         "chosen": true
@@ -616,6 +618,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": 1,
                         "rows": 3,
                         "cost": 0.560975,
                         "chosen": true
@@ -845,6 +848,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": 1,
                         "rows": 3,
                         "cost": 0.560975,
                         "chosen": true
@@ -1073,6 +1077,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": 1,
                         "rows": 3,
                         "cost": 0.560975,
                         "chosen": true
@@ -1293,6 +1298,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": 1,
                         "rows": 1,
                         "cost": 0.36,
                         "chosen": true
@@ -1512,6 +1518,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": 1,
                         "rows": 3,
                         "cost": 0.560975,
                         "chosen": true
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/filesort_pq.result mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/filesort_pq.result
--- mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/filesort_pq.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/filesort_pq.result	2021-09-28 11:46:34.000000000 +0000
@@ -6059,7 +6059,7 @@
 EXPLAIN FORMAT=tree SELECT * FROM v1 ORDER BY f2, f0 LIMIT 30;
 EXPLAIN
 -> Limit: 30 row(s)  (cost=61.11..61.11 rows=30)
-    -> Sort: v1.f2, v1.f0, limit input to 30 row(s) per chunk
+    -> Sort: v1.f2, v1.f0, limit input to 30 row(s) per chunk  (cost=61.11..61.11 rows=100)
         -> Table scan on v1  (cost=13.75 rows=100)
             -> Materialize  (cost=61.11..61.11 rows=100)
                 -> Limit: 100 row(s)  (cost=51.11 rows=100)
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/fulltext.result mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/fulltext.result
--- mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/fulltext.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/fulltext.result	2021-09-28 11:46:34.000000000 +0000
@@ -77,9 +77,28 @@
             "rows_estimation": [
               {
                 "table": "`t1`",
-                "table_scan": {
-                  "rows": 3,
-                  "cost": 0.507324
+                "range_analysis": {
+                  "table_scan": {
+                    "rows": 3,
+                    "cost": 2.90732
+                  },
+                  "potential_range_indexes": [
+                    {
+                      "index": "a",
+                      "usable": false,
+                      "cause": "fulltext"
+                    }
+                  ],
+                  "setup_range_conditions": [
+                  ],
+                  "group_index_range": {
+                    "chosen": false,
+                    "cause": "not_group_by_or_distinct"
+                  },
+                  "skip_scan_range": {
+                    "chosen": false,
+                    "cause": "disjuntive_predicate_present"
+                  }
                 }
               }
             ]
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/general2_no_prot.result mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/general2_no_prot.result
--- mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/general2_no_prot.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/general2_no_prot.result	2021-09-28 11:46:34.000000000 +0000
@@ -346,6 +346,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": -1,
                         "rows": 2,
                         "cost": 0.464386,
                         "chosen": false,
@@ -4308,6 +4309,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": -1,
                         "rows": 1,
                         "cost": 0.36,
                         "chosen": true
@@ -4383,6 +4385,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": -1,
                         "rows": 1,
                         "cost": 0.36,
                         "chosen": true
@@ -4458,6 +4461,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": -1,
                         "rows": 1,
                         "cost": 0.36,
                         "chosen": true
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/general2_ps_prot.result mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/general2_ps_prot.result
--- mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/general2_ps_prot.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/general2_ps_prot.result	2021-09-28 11:46:34.000000000 +0000
@@ -344,6 +344,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": -1,
                         "rows": 2,
                         "cost": 0.464386,
                         "chosen": false,
@@ -4152,6 +4153,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": -1,
                         "rows": 1,
                         "cost": 0.36,
                         "chosen": true
@@ -4227,6 +4229,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": -1,
                         "rows": 1,
                         "cost": 0.36,
                         "chosen": true
@@ -4302,6 +4305,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": -1,
                         "rows": 1,
                         "cost": 0.36,
                         "chosen": true
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/general_no_prot_all.result mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/general_no_prot_all.result
--- mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/general_no_prot_all.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/general_no_prot_all.result	2021-09-28 11:46:34.000000000 +0000
@@ -1525,6 +1525,7 @@
                         "rowid_ordered": true,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": -1,
                         "rows": 1,
                         "cost": 0.36,
                         "chosen": true
@@ -7237,6 +7238,7 @@
               "rowid_ordered": true,
               "using_mrr": false,
               "index_only": false,
+              "in_memory": -1,
               "rows": 1,
               "cost": 0.61,
               "chosen": true
@@ -7338,6 +7340,7 @@
               "rowid_ordered": true,
               "using_mrr": false,
               "index_only": false,
+              "in_memory": -1,
               "rows": 1,
               "cost": 0.61,
               "chosen": true
@@ -7475,6 +7478,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": -1,
                         "rows": 2,
                         "cost": 0.465814,
                         "chosen": true
@@ -7708,6 +7712,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 1,
                         "cost": 0.61,
                         "chosen": true
@@ -7935,6 +7940,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": -1,
                         "rows": 1,
                         "cost": 0.36,
                         "chosen": true
@@ -10352,6 +10358,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": -1,
                         "rows": 4,
                         "cost": 0.677442,
                         "chosen": false,
@@ -11066,6 +11073,7 @@
 Warning	1292	Truncated incorrect INTEGER value: 'c'
 Warning	1292	Truncated incorrect INTEGER value: 'c'
 Warning	1292	Truncated incorrect INTEGER value: 'c'
+Warning	1292	Truncated incorrect INTEGER value: 'c'
 select count(*) from information_schema.OPTIMIZER_TRACE;
 count(*)
 1
@@ -11179,7 +11187,7 @@
               {
                 "table": "`t1`",
                 "original_table_condition": "(`t1`.`data` = 'c')",
-                "final_table_condition   ": "(`t1`.`data` = <cache>('c'))"
+                "final_table_condition   ": "(`t1`.`data` = 'c')"
               }
             ] /* finalizing_table_conditions */
           },
@@ -11214,6 +11222,7 @@
 Warning	1292	Truncated incorrect INTEGER value: 'c'
 Warning	1292	Truncated incorrect INTEGER value: 'c'
 Warning	1292	Truncated incorrect INTEGER value: 'c'
+Warning	1292	Truncated incorrect INTEGER value: 'c'
 select count(*) from information_schema.OPTIMIZER_TRACE;
 count(*)
 1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/general_no_prot_none.result mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/general_no_prot_none.result
--- mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/general_no_prot_none.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/general_no_prot_none.result	2021-09-28 11:46:34.000000000 +0000
@@ -5823,6 +5823,7 @@
               "rowid_ordered": true,
               "using_mrr": false,
               "index_only": false,
+              "in_memory": -1,
               "rows": 1,
               "cost": 0.61,
               "chosen": true
@@ -5924,6 +5925,7 @@
               "rowid_ordered": true,
               "using_mrr": false,
               "index_only": false,
+              "in_memory": -1,
               "rows": 1,
               "cost": 0.61,
               "chosen": true
@@ -6061,6 +6063,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": -1,
                         "rows": 2,
                         "cost": 0.465814,
                         "chosen": true
@@ -6294,6 +6297,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 1,
                         "cost": 0.61,
                         "chosen": true
@@ -6521,6 +6525,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": -1,
                         "rows": 1,
                         "cost": 0.36,
                         "chosen": true
@@ -9010,6 +9015,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": -1,
                         "rows": 4,
                         "cost": 0.677442,
                         "chosen": false,
@@ -9724,6 +9730,7 @@
 Warning	1292	Truncated incorrect INTEGER value: 'c'
 Warning	1292	Truncated incorrect INTEGER value: 'c'
 Warning	1292	Truncated incorrect INTEGER value: 'c'
+Warning	1292	Truncated incorrect INTEGER value: 'c'
 select count(*) from information_schema.OPTIMIZER_TRACE;
 count(*)
 1
@@ -9837,7 +9844,7 @@
               {
                 "table": "`t1`",
                 "original_table_condition": "(`t1`.`data` = 'c')",
-                "final_table_condition   ": "(`t1`.`data` = <cache>('c'))"
+                "final_table_condition   ": "(`t1`.`data` = 'c')"
               }
             ] /* finalizing_table_conditions */
           },
@@ -9872,6 +9879,7 @@
 Warning	1292	Truncated incorrect INTEGER value: 'c'
 Warning	1292	Truncated incorrect INTEGER value: 'c'
 Warning	1292	Truncated incorrect INTEGER value: 'c'
+Warning	1292	Truncated incorrect INTEGER value: 'c'
 select count(*) from information_schema.OPTIMIZER_TRACE;
 count(*)
 1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/general_ps_prot_all.result mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/general_ps_prot_all.result
--- mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/general_ps_prot_all.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/general_ps_prot_all.result	2021-09-28 11:46:34.000000000 +0000
@@ -1385,6 +1385,7 @@
                         "rowid_ordered": true,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": -1,
                         "rows": 1,
                         "cost": 0.36,
                         "chosen": true
@@ -6927,6 +6928,7 @@
               "rowid_ordered": true,
               "using_mrr": false,
               "index_only": false,
+              "in_memory": -1,
               "rows": 1,
               "cost": 0.61,
               "chosen": true
@@ -7020,6 +7022,7 @@
               "rowid_ordered": true,
               "using_mrr": false,
               "index_only": false,
+              "in_memory": -1,
               "rows": 1,
               "cost": 0.61,
               "chosen": true
@@ -7147,6 +7150,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": -1,
                         "rows": 2,
                         "cost": 0.465814,
                         "chosen": true
@@ -7372,6 +7376,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 1,
                         "cost": 0.61,
                         "chosen": true
@@ -7591,6 +7596,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": -1,
                         "rows": 1,
                         "cost": 0.36,
                         "chosen": true
@@ -9935,6 +9941,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": -1,
                         "rows": 4,
                         "cost": 0.677442,
                         "chosen": false,
@@ -10649,6 +10656,7 @@
 Warning	1292	Truncated incorrect INTEGER value: 'c'
 Warning	1292	Truncated incorrect INTEGER value: 'c'
 Warning	1292	Truncated incorrect INTEGER value: 'c'
+Warning	1292	Truncated incorrect INTEGER value: 'c'
 select count(*) from information_schema.OPTIMIZER_TRACE;
 count(*)
 1
@@ -10762,7 +10770,7 @@
               {
                 "table": "`t1`",
                 "original_table_condition": "(`t1`.`data` = 'c')",
-                "final_table_condition   ": "(`t1`.`data` = <cache>('c'))"
+                "final_table_condition   ": "(`t1`.`data` = 'c')"
               }
             ] /* finalizing_table_conditions */
           },
@@ -10797,6 +10805,7 @@
 Warning	1292	Truncated incorrect INTEGER value: 'c'
 Warning	1292	Truncated incorrect INTEGER value: 'c'
 Warning	1292	Truncated incorrect INTEGER value: 'c'
+Warning	1292	Truncated incorrect INTEGER value: 'c'
 select count(*) from information_schema.OPTIMIZER_TRACE;
 count(*)
 1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/general_ps_prot_none.result mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/general_ps_prot_none.result
--- mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/general_ps_prot_none.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/general_ps_prot_none.result	2021-09-28 11:46:34.000000000 +0000
@@ -5525,6 +5525,7 @@
               "rowid_ordered": true,
               "using_mrr": false,
               "index_only": false,
+              "in_memory": -1,
               "rows": 1,
               "cost": 0.61,
               "chosen": true
@@ -5618,6 +5619,7 @@
               "rowid_ordered": true,
               "using_mrr": false,
               "index_only": false,
+              "in_memory": -1,
               "rows": 1,
               "cost": 0.61,
               "chosen": true
@@ -5745,6 +5747,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": -1,
                         "rows": 2,
                         "cost": 0.465814,
                         "chosen": true
@@ -5970,6 +5973,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 1,
                         "cost": 0.61,
                         "chosen": true
@@ -6189,6 +6193,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": -1,
                         "rows": 1,
                         "cost": 0.36,
                         "chosen": true
@@ -8605,6 +8610,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": -1,
                         "rows": 4,
                         "cost": 0.677442,
                         "chosen": false,
@@ -9319,6 +9325,7 @@
 Warning	1292	Truncated incorrect INTEGER value: 'c'
 Warning	1292	Truncated incorrect INTEGER value: 'c'
 Warning	1292	Truncated incorrect INTEGER value: 'c'
+Warning	1292	Truncated incorrect INTEGER value: 'c'
 select count(*) from information_schema.OPTIMIZER_TRACE;
 count(*)
 1
@@ -9432,7 +9439,7 @@
               {
                 "table": "`t1`",
                 "original_table_condition": "(`t1`.`data` = 'c')",
-                "final_table_condition   ": "(`t1`.`data` = <cache>('c'))"
+                "final_table_condition   ": "(`t1`.`data` = 'c')"
               }
             ] /* finalizing_table_conditions */
           },
@@ -9467,6 +9474,7 @@
 Warning	1292	Truncated incorrect INTEGER value: 'c'
 Warning	1292	Truncated incorrect INTEGER value: 'c'
 Warning	1292	Truncated incorrect INTEGER value: 'c'
+Warning	1292	Truncated incorrect INTEGER value: 'c'
 select count(*) from information_schema.OPTIMIZER_TRACE;
 count(*)
 1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/opt_hints_index_merge.result mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/opt_hints_index_merge.result
--- mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/opt_hints_index_merge.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/opt_hints_index_merge.result	2021-09-28 11:46:34.000000000 +0000
@@ -167,6 +167,7 @@
                               "rowid_ordered": true,
                               "using_mrr": false,
                               "index_only": true,
+                              "in_memory": 1,
                               "rows": 8,
                               "cost": 1.06277,
                               "chosen": true
@@ -186,6 +187,7 @@
                               "rowid_ordered": true,
                               "using_mrr": false,
                               "index_only": true,
+                              "in_memory": 1,
                               "rows": 16,
                               "cost": 1.86594,
                               "chosen": true
@@ -443,6 +445,7 @@
                         "rowid_ordered": true,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": 1,
                         "rows": 128,
                         "cost": 45.06,
                         "chosen": false,
@@ -462,6 +465,7 @@
                         "rowid_ordered": true,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": 1,
                         "rows": 128,
                         "cost": 45.06,
                         "chosen": false,
@@ -756,6 +760,7 @@
                               "rowid_ordered": true,
                               "using_mrr": false,
                               "index_only": true,
+                              "in_memory": 1,
                               "rows": 8,
                               "cost": 1.06277,
                               "chosen": true
@@ -775,6 +780,7 @@
                               "rowid_ordered": true,
                               "using_mrr": false,
                               "index_only": true,
+                              "in_memory": 1,
                               "rows": 128,
                               "cost": 13.1103,
                               "chosen": true
@@ -830,6 +836,7 @@
                               "rowid_ordered": false,
                               "using_mrr": false,
                               "index_only": true,
+                              "in_memory": 1,
                               "rows": 1,
                               "cost": 0.36,
                               "chosen": true
@@ -849,6 +856,7 @@
                               "rowid_ordered": true,
                               "using_mrr": false,
                               "index_only": true,
+                              "in_memory": 1,
                               "rows": 1,
                               "cost": 0.36,
                               "chosen": true
@@ -1117,6 +1125,7 @@
                               "rowid_ordered": true,
                               "using_mrr": false,
                               "index_only": true,
+                              "in_memory": 1,
                               "rows": 8,
                               "cost": 1.06277,
                               "chosen": true
@@ -1136,6 +1145,7 @@
                               "rowid_ordered": true,
                               "using_mrr": false,
                               "index_only": true,
+                              "in_memory": 1,
                               "rows": 128,
                               "cost": 13.1103,
                               "chosen": true
@@ -1191,6 +1201,7 @@
                               "rowid_ordered": false,
                               "using_mrr": false,
                               "index_only": true,
+                              "in_memory": 1,
                               "rows": 288,
                               "cost": 29.1737,
                               "chosen": true
@@ -1210,6 +1221,7 @@
                               "rowid_ordered": true,
                               "using_mrr": false,
                               "index_only": true,
+                              "in_memory": 1,
                               "rows": 1,
                               "cost": 0.36,
                               "chosen": true
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/range_no_prot.result mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/range_no_prot.result
--- mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/range_no_prot.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/range_no_prot.result	2021-09-28 11:46:34.000000000 +0000
@@ -181,6 +181,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 47,
                         "cost": 16.96,
                         "chosen": true
@@ -615,6 +616,7 @@
                               "rowid_ordered": false,
                               "using_mrr": false,
                               "index_only": true,
+                              "in_memory": -1,
                               "rows": 3,
                               "cost": 0.57,
                               "chosen": true
@@ -634,6 +636,7 @@
                               "rowid_ordered": false,
                               "using_mrr": false,
                               "index_only": true,
+                              "in_memory": -1,
                               "rows": 42,
                               "cost": 4.68,
                               "chosen": true
@@ -1425,6 +1428,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": -1,
                         "rows": 47,
                         "cost": 5.29,
                         "chosen": true
@@ -1442,6 +1446,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": -1,
                         "rows": 47,
                         "cost": 5.29,
                         "chosen": false,
@@ -1724,6 +1729,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 10,
                         "cost": 3.76,
                         "chosen": true
@@ -1737,6 +1743,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 10,
                         "cost": 3.76,
                         "chosen": false,
@@ -2018,6 +2025,7 @@
                               "rowid_ordered": true,
                               "using_mrr": false,
                               "index_only": true,
+                              "in_memory": -1,
                               "rows": 1,
                               "cost": 0.36,
                               "chosen": true
@@ -2037,6 +2045,7 @@
                               "rowid_ordered": true,
                               "using_mrr": false,
                               "index_only": true,
+                              "in_memory": -1,
                               "rows": 1,
                               "cost": 0.36,
                               "chosen": true
@@ -2504,6 +2513,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 1,
                         "cost": 0.61,
                         "chosen": true
@@ -2517,6 +2527,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 9,
                         "cost": 3.41,
                         "chosen": false,
@@ -2760,6 +2771,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 2,
                         "cost": 1.21,
                         "chosen": true
@@ -2775,6 +2787,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 6,
                         "cost": 2.86,
                         "chosen": false,
@@ -3012,6 +3025,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 2,
                         "cost": 1.21,
                         "chosen": true
@@ -3025,6 +3039,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 2,
                         "cost": 0.96,
                         "chosen": true
@@ -3286,6 +3301,7 @@
                               "rowid_ordered": false,
                               "using_mrr": false,
                               "index_only": true,
+                              "in_memory": -1,
                               "rows": 1023,
                               "cost": 108,
                               "chosen": false,
@@ -3306,6 +3322,7 @@
                               "rowid_ordered": false,
                               "using_mrr": false,
                               "index_only": true,
+                              "in_memory": -1,
                               "rows": 1022,
                               "cost": 107.89,
                               "chosen": false,
@@ -3554,6 +3571,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 42,
                         "cost": 14.96,
                         "chosen": true
@@ -3852,6 +3870,7 @@
                         "rowid_ordered": true,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 504,
                         "cost": 176.66,
                         "chosen": true
@@ -3865,6 +3884,7 @@
                         "rowid_ordered": true,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 504,
                         "cost": 176.66,
                         "chosen": false,
@@ -4144,6 +4164,7 @@
                         "rowid_ordered": true,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 1,
                         "cost": 0.61,
                         "chosen": true
@@ -5052,6 +5073,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 2,
                         "cost": 0.96,
                         "chosen": true
@@ -5065,6 +5087,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 2,
                         "cost": 0.96,
                         "chosen": false,
@@ -5210,6 +5233,7 @@
                             "rowid_ordered": false,
                             "using_mrr": false,
                             "index_only": false,
+                            "in_memory": -1,
                             "rows": 2,
                             "cost": 0.96,
                             "chosen": true
@@ -5436,6 +5460,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": -1,
                         "rows": 2,
                         "cost": 0.465814,
                         "chosen": false,
@@ -5450,6 +5475,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": -1,
                         "rows": 2,
                         "cost": 0.468065,
                         "chosen": false,
@@ -5779,6 +5805,7 @@
                         "rowid_ordered": true,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": 1,
                         "rows": 2,
                         "cost": 0.71,
                         "chosen": true
@@ -5792,6 +5819,7 @@
                         "rowid_ordered": true,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": 1,
                         "rows": 1,
                         "cost": 0.61,
                         "chosen": true
@@ -5805,6 +5833,7 @@
                         "rowid_ordered": true,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": 1,
                         "rows": 1,
                         "cost": 0.36,
                         "chosen": true
@@ -6094,6 +6123,7 @@
                         "rowid_ordered": true,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": 1,
                         "rows": 2,
                         "cost": 0.71,
                         "chosen": true
@@ -6107,6 +6137,7 @@
                         "rowid_ordered": true,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": 1,
                         "rows": 1,
                         "cost": 0.61,
                         "chosen": true
@@ -6256,7 +6287,7 @@
 # ignore ref access on index with overly optimistic cost-estimate
 EXPLAIN SELECT MAX(b), a FROM t1 WHERE b < 2 AND a = 1 GROUP BY a;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	range	PRIMARY,b	b	4	NULL	2	25.00	Using where; Using index
+1	SIMPLE	t1	NULL	range	PRIMARY,b	PRIMARY	8	NULL	1	100.00	Using where; Using index for group-by
 Warnings:
 Note	1003	/* select#1 */ select max(`test`.`t1`.`b`) AS `MAX(b)`,`test`.`t1`.`a` AS `a` from `test`.`t1` where ((`test`.`t1`.`a` = 1) and (`test`.`t1`.`b` < 2)) group by `test`.`t1`.`a`
 
@@ -6366,8 +6397,8 @@
                         "ranges": [
                           "1 <= a <= 1 AND b < 2"
                         ] /* ranges */,
-                        "rows": 2,
-                        "cost": 0.55
+                        "rows": 1,
+                        "cost": 0.4
                       },
                       {
                         "index": "b",
@@ -6384,8 +6415,8 @@
                     "min_aggregate": false,
                     "max_aggregate": true,
                     "distinct_aggregate": false,
-                    "rows": 2,
-                    "cost": 0.55,
+                    "rows": 1,
+                    "cost": 0.4,
                     "key_parts_used_for_access": [
                       "a"
                     ] /* key_parts_used_for_access */,
@@ -6409,6 +6440,7 @@
                         "rowid_ordered": true,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": 1,
                         "rows": 2,
                         "cost": 0.71,
                         "chosen": false,
@@ -6423,9 +6455,11 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": 1,
                         "rows": 2,
                         "cost": 0.460366,
-                        "chosen": true
+                        "chosen": false,
+                        "cause": "cost"
                       }
                     ] /* range_scan_alternatives */,
                     "analyzing_roworder_intersect": {
@@ -6435,15 +6469,24 @@
                   } /* analyzing_range_alternatives */,
                   "chosen_range_access_summary": {
                     "range_access_plan": {
-                      "type": "range_scan",
-                      "index": "b",
-                      "rows": 2,
+                      "type": "index_group",
+                      "index": "PRIMARY",
+                      "group_attribute": "b",
+                      "min_aggregate": false,
+                      "max_aggregate": true,
+                      "distinct_aggregate": false,
+                      "rows": 1,
+                      "cost": 0.4,
+                      "key_parts_used_for_access": [
+                        "a",
+                        "b"
+                      ] /* key_parts_used_for_access */,
                       "ranges": [
-                        "b < 2"
+                        "1 <= a <= 1 AND b < 2"
                       ] /* ranges */
                     } /* range_access_plan */,
-                    "rows_for_plan": 2,
-                    "cost_for_plan": 0.460366,
+                    "rows_for_plan": 1,
+                    "cost_for_plan": 0.4,
                     "chosen": true
                   } /* chosen_range_access_summary */
                 } /* range_analysis */
@@ -6465,26 +6508,26 @@
                       "cause": "range_uses_more_keyparts"
                     },
                     {
-                      "rows_to_scan": 2,
+                      "rows_to_scan": 1,
                       "filtering_effect": [
                       ] /* filtering_effect */,
-                      "final_filtering_effect": 0.25,
+                      "final_filtering_effect": 1,
                       "access_type": "range",
                       "range_details": {
-                        "used_index": "b"
+                        "used_index": "index_for_group_by(PRIMARY)"
                       } /* range_details */,
-                      "resulting_rows": 0.5,
-                      "cost": 0.660366,
+                      "resulting_rows": 1,
+                      "cost": 0.5,
                       "chosen": true,
                       "use_tmp_table": true
                     }
                   ] /* considered_access_paths */
                 } /* best_access_path */,
                 "condition_filtering_pct": 100,
-                "rows_for_plan": 0.5,
-                "cost_for_plan": 0.660366,
-                "sort_cost": 0.5,
-                "new_cost_for_plan": 1.16037,
+                "rows_for_plan": 1,
+                "cost_for_plan": 0.5,
+                "sort_cost": 1,
+                "new_cost_for_plan": 1.5,
                 "chosen": true
               }
             ] /* considered_execution_plans */
@@ -6691,6 +6734,7 @@
                         "rowid_ordered": true,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 1,
                         "cost": 0.61,
                         "chosen": true
@@ -6704,6 +6748,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 1,
                         "cost": 0.61,
                         "chosen": false,
@@ -6851,6 +6896,7 @@
                               "rowid_ordered": false,
                               "using_mrr": false,
                               "index_only": false,
+                              "in_memory": -1,
                               "rows": 1,
                               "cost": 0.61,
                               "chosen": true
@@ -7057,6 +7103,7 @@
                         "rowid_ordered": true,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 1,
                         "cost": 0.61,
                         "chosen": true
@@ -7276,6 +7323,7 @@
                         "rowid_ordered": true,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 1,
                         "cost": 0.61,
                         "chosen": true
@@ -7411,6 +7459,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 1,
                         "cost": 0.61,
                         "chosen": true
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/range_ps_prot.result mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/range_ps_prot.result
--- mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/range_ps_prot.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/range_ps_prot.result	2021-09-28 11:46:34.000000000 +0000
@@ -181,6 +181,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 47,
                         "cost": 16.96,
                         "chosen": true
@@ -615,6 +616,7 @@
                               "rowid_ordered": false,
                               "using_mrr": false,
                               "index_only": true,
+                              "in_memory": -1,
                               "rows": 3,
                               "cost": 0.57,
                               "chosen": true
@@ -634,6 +636,7 @@
                               "rowid_ordered": false,
                               "using_mrr": false,
                               "index_only": true,
+                              "in_memory": -1,
                               "rows": 42,
                               "cost": 4.68,
                               "chosen": true
@@ -1425,6 +1428,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": -1,
                         "rows": 47,
                         "cost": 5.29,
                         "chosen": true
@@ -1442,6 +1446,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": -1,
                         "rows": 47,
                         "cost": 5.29,
                         "chosen": false,
@@ -1724,6 +1729,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 10,
                         "cost": 3.76,
                         "chosen": true
@@ -1737,6 +1743,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 10,
                         "cost": 3.76,
                         "chosen": false,
@@ -2018,6 +2025,7 @@
                               "rowid_ordered": true,
                               "using_mrr": false,
                               "index_only": true,
+                              "in_memory": -1,
                               "rows": 1,
                               "cost": 0.36,
                               "chosen": true
@@ -2037,6 +2045,7 @@
                               "rowid_ordered": true,
                               "using_mrr": false,
                               "index_only": true,
+                              "in_memory": -1,
                               "rows": 1,
                               "cost": 0.36,
                               "chosen": true
@@ -2504,6 +2513,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 1,
                         "cost": 0.61,
                         "chosen": true
@@ -2517,6 +2527,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 9,
                         "cost": 3.41,
                         "chosen": false,
@@ -2760,6 +2771,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 2,
                         "cost": 1.21,
                         "chosen": true
@@ -2775,6 +2787,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 6,
                         "cost": 2.86,
                         "chosen": false,
@@ -3012,6 +3025,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 2,
                         "cost": 1.21,
                         "chosen": true
@@ -3025,6 +3039,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 2,
                         "cost": 0.96,
                         "chosen": true
@@ -3286,6 +3301,7 @@
                               "rowid_ordered": false,
                               "using_mrr": false,
                               "index_only": true,
+                              "in_memory": -1,
                               "rows": 1023,
                               "cost": 108,
                               "chosen": false,
@@ -3306,6 +3322,7 @@
                               "rowid_ordered": false,
                               "using_mrr": false,
                               "index_only": true,
+                              "in_memory": -1,
                               "rows": 1022,
                               "cost": 107.89,
                               "chosen": false,
@@ -3554,6 +3571,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 42,
                         "cost": 14.96,
                         "chosen": true
@@ -3852,6 +3870,7 @@
                         "rowid_ordered": true,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 504,
                         "cost": 176.66,
                         "chosen": true
@@ -3865,6 +3884,7 @@
                         "rowid_ordered": true,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 504,
                         "cost": 176.66,
                         "chosen": false,
@@ -4144,6 +4164,7 @@
                         "rowid_ordered": true,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 1,
                         "cost": 0.61,
                         "chosen": true
@@ -5052,6 +5073,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 2,
                         "cost": 0.96,
                         "chosen": true
@@ -5065,6 +5087,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 2,
                         "cost": 0.96,
                         "chosen": false,
@@ -5210,6 +5233,7 @@
                             "rowid_ordered": false,
                             "using_mrr": false,
                             "index_only": false,
+                            "in_memory": -1,
                             "rows": 2,
                             "cost": 0.96,
                             "chosen": true
@@ -5436,6 +5460,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": -1,
                         "rows": 2,
                         "cost": 0.465814,
                         "chosen": false,
@@ -5450,6 +5475,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": -1,
                         "rows": 2,
                         "cost": 0.468065,
                         "chosen": false,
@@ -5779,6 +5805,7 @@
                         "rowid_ordered": true,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": 1,
                         "rows": 2,
                         "cost": 0.71,
                         "chosen": true
@@ -5792,6 +5819,7 @@
                         "rowid_ordered": true,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": 1,
                         "rows": 1,
                         "cost": 0.61,
                         "chosen": true
@@ -5805,6 +5833,7 @@
                         "rowid_ordered": true,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": 1,
                         "rows": 1,
                         "cost": 0.36,
                         "chosen": true
@@ -6094,6 +6123,7 @@
                         "rowid_ordered": true,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": 1,
                         "rows": 2,
                         "cost": 0.71,
                         "chosen": true
@@ -6107,6 +6137,7 @@
                         "rowid_ordered": true,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": 1,
                         "rows": 1,
                         "cost": 0.61,
                         "chosen": true
@@ -6256,7 +6287,7 @@
 # ignore ref access on index with overly optimistic cost-estimate
 EXPLAIN SELECT MAX(b), a FROM t1 WHERE b < 2 AND a = 1 GROUP BY a;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	range	PRIMARY,b	b	4	NULL	2	25.00	Using where; Using index
+1	SIMPLE	t1	NULL	range	PRIMARY,b	PRIMARY	8	NULL	1	100.00	Using where; Using index for group-by
 Warnings:
 Note	1003	/* select#1 */ select max(`test`.`t1`.`b`) AS `MAX(b)`,`test`.`t1`.`a` AS `a` from `test`.`t1` where ((`test`.`t1`.`a` = 1) and (`test`.`t1`.`b` < 2)) group by `test`.`t1`.`a`
 
@@ -6366,8 +6397,8 @@
                         "ranges": [
                           "1 <= a <= 1 AND b < 2"
                         ] /* ranges */,
-                        "rows": 2,
-                        "cost": 0.55
+                        "rows": 1,
+                        "cost": 0.4
                       },
                       {
                         "index": "b",
@@ -6384,8 +6415,8 @@
                     "min_aggregate": false,
                     "max_aggregate": true,
                     "distinct_aggregate": false,
-                    "rows": 2,
-                    "cost": 0.55,
+                    "rows": 1,
+                    "cost": 0.4,
                     "key_parts_used_for_access": [
                       "a"
                     ] /* key_parts_used_for_access */,
@@ -6409,6 +6440,7 @@
                         "rowid_ordered": true,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": 1,
                         "rows": 2,
                         "cost": 0.71,
                         "chosen": false,
@@ -6423,9 +6455,11 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": 1,
                         "rows": 2,
                         "cost": 0.460366,
-                        "chosen": true
+                        "chosen": false,
+                        "cause": "cost"
                       }
                     ] /* range_scan_alternatives */,
                     "analyzing_roworder_intersect": {
@@ -6435,15 +6469,24 @@
                   } /* analyzing_range_alternatives */,
                   "chosen_range_access_summary": {
                     "range_access_plan": {
-                      "type": "range_scan",
-                      "index": "b",
-                      "rows": 2,
+                      "type": "index_group",
+                      "index": "PRIMARY",
+                      "group_attribute": "b",
+                      "min_aggregate": false,
+                      "max_aggregate": true,
+                      "distinct_aggregate": false,
+                      "rows": 1,
+                      "cost": 0.4,
+                      "key_parts_used_for_access": [
+                        "a",
+                        "b"
+                      ] /* key_parts_used_for_access */,
                       "ranges": [
-                        "b < 2"
+                        "1 <= a <= 1 AND b < 2"
                       ] /* ranges */
                     } /* range_access_plan */,
-                    "rows_for_plan": 2,
-                    "cost_for_plan": 0.460366,
+                    "rows_for_plan": 1,
+                    "cost_for_plan": 0.4,
                     "chosen": true
                   } /* chosen_range_access_summary */
                 } /* range_analysis */
@@ -6465,26 +6508,26 @@
                       "cause": "range_uses_more_keyparts"
                     },
                     {
-                      "rows_to_scan": 2,
+                      "rows_to_scan": 1,
                       "filtering_effect": [
                       ] /* filtering_effect */,
-                      "final_filtering_effect": 0.25,
+                      "final_filtering_effect": 1,
                       "access_type": "range",
                       "range_details": {
-                        "used_index": "b"
+                        "used_index": "index_for_group_by(PRIMARY)"
                       } /* range_details */,
-                      "resulting_rows": 0.5,
-                      "cost": 0.660366,
+                      "resulting_rows": 1,
+                      "cost": 0.5,
                       "chosen": true,
                       "use_tmp_table": true
                     }
                   ] /* considered_access_paths */
                 } /* best_access_path */,
                 "condition_filtering_pct": 100,
-                "rows_for_plan": 0.5,
-                "cost_for_plan": 0.660366,
-                "sort_cost": 0.5,
-                "new_cost_for_plan": 1.16037,
+                "rows_for_plan": 1,
+                "cost_for_plan": 0.5,
+                "sort_cost": 1,
+                "new_cost_for_plan": 1.5,
                 "chosen": true
               }
             ] /* considered_execution_plans */
@@ -6691,6 +6734,7 @@
                         "rowid_ordered": true,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 1,
                         "cost": 0.61,
                         "chosen": true
@@ -6704,6 +6748,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 1,
                         "cost": 0.61,
                         "chosen": false,
@@ -6851,6 +6896,7 @@
                               "rowid_ordered": false,
                               "using_mrr": false,
                               "index_only": false,
+                              "in_memory": -1,
                               "rows": 1,
                               "cost": 0.61,
                               "chosen": true
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/security_no_prot.result mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/security_no_prot.result
--- mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/security_no_prot.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/security_no_prot.result	2021-09-28 11:46:34.000000000 +0000
@@ -45,7 +45,7 @@
 set optimizer_trace="enabled=on";
 show grants;
 Grants for user1@localhost
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `user1`@`localhost` WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `user1`@`localhost` WITH GRANT OPTION
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `user1`@`localhost` WITH GRANT OPTION
 
 # ==========================================================
@@ -110,7 +110,7 @@
 set optimizer_trace="enabled=on";
 show grants;
 Grants for user1@localhost
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `user1`@`localhost` WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `user1`@`localhost` WITH GRANT OPTION
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `user1`@`localhost` WITH GRANT OPTION
 set optimizer_trace_offset=0,optimizer_trace_limit=100;
 call p1();
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/security_ps_prot.result mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/security_ps_prot.result
--- mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/security_ps_prot.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/security_ps_prot.result	2021-09-28 11:46:34.000000000 +0000
@@ -45,7 +45,7 @@
 set optimizer_trace="enabled=on";
 show grants;
 Grants for user1@localhost
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `user1`@`localhost` WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `user1`@`localhost` WITH GRANT OPTION
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `user1`@`localhost` WITH GRANT OPTION
 
 # ==========================================================
@@ -114,7 +114,7 @@
 set optimizer_trace="enabled=on";
 show grants;
 Grants for user1@localhost
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `user1`@`localhost` WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `user1`@`localhost` WITH GRANT OPTION
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `user1`@`localhost` WITH GRANT OPTION
 set optimizer_trace_offset=0,optimizer_trace_limit=100;
 call p1();
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/skip_scan.result mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/skip_scan.result
--- mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/skip_scan.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/skip_scan.result	2021-09-28 11:46:34.000000000 +0000
@@ -263,6 +263,7 @@
                         "rowid_ordered": true,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": 1,
                         "rows": 750,
                         "cost": 79.0151,
                         "chosen": true
@@ -278,6 +279,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": 1,
                         "rows": 3,
                         "cost": 0.561462,
                         "chosen": true
@@ -533,6 +535,7 @@
                         "rowid_ordered": true,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": 1,
                         "rows": 250,
                         "cost": 25.345,
                         "chosen": false,
@@ -816,6 +819,7 @@
                         "rowid_ordered": true,
                         "using_mrr": false,
                         "index_only": true,
+                        "in_memory": 1,
                         "rows": 250,
                         "cost": 25.345,
                         "chosen": true
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/subquery_no_prot.result mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/subquery_no_prot.result
--- mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/subquery_no_prot.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/subquery_no_prot.result	2021-09-28 11:46:34.000000000 +0000
@@ -1429,6 +1429,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 2,
                         "cost": 1.21,
                         "chosen": true
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/subquery_ps_prot.result mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/subquery_ps_prot.result
--- mysql-8.0-8.0.26/mysql-test/suite/opt_trace/r/subquery_ps_prot.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/opt_trace/r/subquery_ps_prot.result	2021-09-28 11:46:34.000000000 +0000
@@ -1140,6 +1140,7 @@
                         "rowid_ordered": false,
                         "using_mrr": false,
                         "index_only": false,
+                        "in_memory": -1,
                         "rows": 2,
                         "cost": 1.21,
                         "chosen": true
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/column_privilege.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/column_privilege.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/column_privilege.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/column_privilege.result	2021-09-28 11:46:34.000000000 +0000
@@ -1,8 +1,8 @@
 show grants;
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 create user 'pfs_user_5'@localhost;
 grant usage on *.* to 'pfs_user_5'@localhost with GRANT OPTION;
 grant SELECT(thread_id, event_id) on performance_schema.events_waits_current
@@ -19,9 +19,9 @@
 from performance_schema.events_waits_current;
 ERROR 42000: SELECT command denied to user 'pfs_user_5'@'localhost' for column 'event_name' in table 'events_waits_current'
 update performance_schema.setup_instruments set name='illegal';
-ERROR 42000: UPDATE command denied to user 'pfs_user_5'@'localhost' for column 'NAME' in table 'setup_instruments'
+ERROR 42000: UPDATE command denied to user 'pfs_user_5'@'localhost' for column 'name' in table 'setup_instruments'
 update performance_schema.setup_instruments set timed='NO';
-ERROR 42000: UPDATE command denied to user 'pfs_user_5'@'localhost' for column 'TIMED' in table 'setup_instruments'
+ERROR 42000: UPDATE command denied to user 'pfs_user_5'@'localhost' for column 'timed' in table 'setup_instruments'
 REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'pfs_user_5'@localhost;
 DROP USER 'pfs_user_5'@localhost;
 flush privileges;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/connection_type_notwin.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/connection_type_notwin.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/connection_type_notwin.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/connection_type_notwin.result	2021-09-28 11:46:34.000000000 +0000
@@ -67,6 +67,7 @@
 SET GLOBAL general_log_file=  @old_general_log_file;
 SET GLOBAL general_log=       @old_general_log;
 SET GLOBAL log_output=        @old_log_output;
+TRUNCATE TABLE mysql.general_log;
 set global debug= default;
 revoke select on *.* from 'root'@'santa.claus.ipv4.example.com';
 drop user 'root'@'santa.claus.ipv4.example.com';
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/connection_type_win.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/connection_type_win.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/connection_type_win.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/connection_type_win.result	2021-09-28 11:46:34.000000000 +0000
@@ -67,6 +67,7 @@
 SET GLOBAL general_log_file=  @old_general_log_file;
 SET GLOBAL general_log=       @old_general_log;
 SET GLOBAL log_output=        @old_log_output;
+TRUNCATE TABLE mysql.general_log;
 set global debug= default;
 revoke select on *.* from 'root'@'santa.claus.ipv4.example.com';
 drop user 'root'@'santa.claus.ipv4.example.com';
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_accounts.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_accounts.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_accounts.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_accounts.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,3 +11,6 @@
 DROP INDEX `ACCOUNT`
   ON performance_schema.accounts;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.accounts;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_binary_log_transaction_compression_stats.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_binary_log_transaction_compression_stats.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_binary_log_transaction_compression_stats.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_binary_log_transaction_compression_stats.result	2021-09-28 11:46:34.000000000 +0000
@@ -7,3 +7,5 @@
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 DROP INDEX `PRIMARY` ON performance_schema.binary_log_transaction_compression_stats;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select AS SELECT * from performance_schema.binary_log_transaction_compression_stats;;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_cond_instances.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_cond_instances.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_cond_instances.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_cond_instances.result	2021-09-28 11:46:34.000000000 +0000
@@ -9,3 +9,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.cond_instances;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.cond_instances;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_data_locks.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_data_locks.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_data_locks.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_data_locks.result	2021-09-28 11:46:34.000000000 +0000
@@ -6,3 +6,6 @@
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 CREATE UNIQUE INDEX test_index ON performance_schema.data_locks(LOCK_DATA);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.data_locks;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_data_lock_waits.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_data_lock_waits.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_data_lock_waits.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_data_lock_waits.result	2021-09-28 11:46:34.000000000 +0000
@@ -6,3 +6,6 @@
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 CREATE UNIQUE INDEX test_index ON performance_schema.data_lock_waits(BLOCKING_THREAD_ID);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.data_lock_waits;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_ees_by_account_by_error.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_ees_by_account_by_error.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_ees_by_account_by_error.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_ees_by_account_by_error.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,3 +11,6 @@
 DROP INDEX `ACCOUNT`
   ON performance_schema.events_errors_summary_by_account_by_error;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_errors_summary_by_account_by_error;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_ees_by_host_by_error.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_ees_by_host_by_error.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_ees_by_host_by_error.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_ees_by_host_by_error.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,3 +11,6 @@
 DROP INDEX `HOST`
   ON performance_schema.events_errors_summary_by_host_by_error;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_errors_summary_by_host_by_error;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_ees_by_thread_by_error.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_ees_by_thread_by_error.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_ees_by_thread_by_error.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_ees_by_thread_by_error.result	2021-09-28 11:46:34.000000000 +0000
@@ -10,3 +10,6 @@
 DROP INDEX `THREAD_ID`
   ON performance_schema.events_errors_summary_by_thread_by_error;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_errors_summary_by_thread_by_error;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_ees_by_user_by_error.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_ees_by_user_by_error.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_ees_by_user_by_error.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_ees_by_user_by_error.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,3 +11,6 @@
 DROP INDEX `USER`
   ON performance_schema.events_errors_summary_by_user_by_error;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_errors_summary_by_user_by_error;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_ees_global_by_error.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_ees_global_by_error.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_ees_global_by_error.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_ees_global_by_error.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,3 +11,6 @@
 DROP INDEX `ERROR_NUMBER`
   ON performance_schema.events_errors_summary_global_by_error;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_errors_summary_global_by_error;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_error_log.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_error_log.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_error_log.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_error_log.result	2021-09-28 11:46:34.000000000 +0000
@@ -10,3 +10,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.error_log;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.error_log;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_esgs_by_account_by_event_name.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_esgs_by_account_by_event_name.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_esgs_by_account_by_event_name.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_esgs_by_account_by_event_name.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,3 +11,6 @@
 DROP INDEX `ACCOUNT`
   ON performance_schema.events_stages_summary_by_account_by_event_name;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_stages_summary_by_account_by_event_name;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_esgs_by_host_by_event_name.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_esgs_by_host_by_event_name.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_esgs_by_host_by_event_name.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_esgs_by_host_by_event_name.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,3 +11,6 @@
 DROP INDEX `HOST`
   ON performance_schema.events_stages_summary_by_host_by_event_name;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_stages_summary_by_host_by_event_name;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_esgs_by_thread_by_event_name.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_esgs_by_thread_by_event_name.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_esgs_by_thread_by_event_name.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_esgs_by_thread_by_event_name.result	2021-09-28 11:46:34.000000000 +0000
@@ -10,3 +10,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.events_stages_summary_by_thread_by_event_name;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_stages_summary_by_thread_by_event_name;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_esgs_by_user_by_event_name.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_esgs_by_user_by_event_name.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_esgs_by_user_by_event_name.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_esgs_by_user_by_event_name.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,3 +11,6 @@
 DROP INDEX `USER`
   ON performance_schema.events_stages_summary_by_user_by_event_name;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_stages_summary_by_user_by_event_name;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_esgs_global_by_event_name.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_esgs_global_by_event_name.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_esgs_global_by_event_name.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_esgs_global_by_event_name.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,3 +11,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.events_stages_summary_global_by_event_name;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_stages_summary_global_by_event_name;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_esmh_by_digest.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_esmh_by_digest.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_esmh_by_digest.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_esmh_by_digest.result	2021-09-28 11:46:34.000000000 +0000
@@ -10,3 +10,8 @@
 DROP INDEX `SCHEMA_NAME`
   ON performance_schema.events_statements_histogram_by_digest;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_statements_histogram_by_digest;
+Warnings:
+Warning	1681	Specifying number of digits for floating point data types is deprecated and will be removed in a future release.
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_esmh_global.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_esmh_global.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_esmh_global.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_esmh_global.result	2021-09-28 11:46:34.000000000 +0000
@@ -10,3 +10,8 @@
 DROP INDEX `SCHEMA_NAME`
   ON performance_schema.events_statements_histogram_global;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_statements_histogram_global;
+Warnings:
+Warning	1681	Specifying number of digits for floating point data types is deprecated and will be removed in a future release.
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_esms_by_account_by_event_name.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_esms_by_account_by_event_name.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_esms_by_account_by_event_name.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_esms_by_account_by_event_name.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,3 +11,6 @@
 DROP INDEX `ACCOUNT`
   ON performance_schema.events_statements_summary_by_account_by_event_name;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_statements_summary_by_account_by_event_name;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_esms_by_digest.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_esms_by_digest.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_esms_by_digest.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_esms_by_digest.result	2021-09-28 11:46:34.000000000 +0000
@@ -10,3 +10,6 @@
 DROP INDEX `SCHEMA_NAME`
   ON performance_schema.events_statements_summary_by_digest;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_statements_summary_by_digest;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_esms_by_host_by_event_name.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_esms_by_host_by_event_name.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_esms_by_host_by_event_name.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_esms_by_host_by_event_name.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,3 +11,6 @@
 DROP INDEX `HOST`
   ON performance_schema.events_statements_summary_by_host_by_event_name;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_statements_summary_by_host_by_event_name;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_esms_by_program.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_esms_by_program.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_esms_by_program.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_esms_by_program.result	2021-09-28 11:46:34.000000000 +0000
@@ -10,3 +10,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.events_statements_summary_by_program;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_statements_summary_by_program;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_esms_by_thread_by_event_name.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_esms_by_thread_by_event_name.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_esms_by_thread_by_event_name.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_esms_by_thread_by_event_name.result	2021-09-28 11:46:34.000000000 +0000
@@ -10,3 +10,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.events_statements_summary_by_thread_by_event_name;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_statements_summary_by_thread_by_event_name;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_esms_by_user_by_event_name.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_esms_by_user_by_event_name.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_esms_by_user_by_event_name.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_esms_by_user_by_event_name.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,3 +11,6 @@
 DROP INDEX `USER`
   ON performance_schema.events_statements_summary_by_user_by_event_name;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_statements_summary_by_user_by_event_name;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_esms_global_by_event_name.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_esms_global_by_event_name.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_esms_global_by_event_name.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_esms_global_by_event_name.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,3 +11,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.events_statements_summary_global_by_event_name;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_statements_summary_global_by_event_name;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_ets_by_account_by_event_name.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_ets_by_account_by_event_name.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_ets_by_account_by_event_name.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_ets_by_account_by_event_name.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,3 +11,6 @@
 DROP INDEX `ACCOUNT`
   ON performance_schema.events_transactions_summary_by_account_by_event_name;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_transactions_summary_by_account_by_event_name;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_ets_by_host_by_event_name.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_ets_by_host_by_event_name.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_ets_by_host_by_event_name.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_ets_by_host_by_event_name.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,3 +11,6 @@
 DROP INDEX `HOST`
   ON performance_schema.events_transactions_summary_by_host_by_event_name;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_transactions_summary_by_host_by_event_name;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_ets_by_thread_by_event_name.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_ets_by_thread_by_event_name.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_ets_by_thread_by_event_name.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_ets_by_thread_by_event_name.result	2021-09-28 11:46:34.000000000 +0000
@@ -10,3 +10,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.events_transactions_summary_by_thread_by_event_name;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_transactions_summary_by_thread_by_event_name;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_ets_by_user_by_event_name.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_ets_by_user_by_event_name.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_ets_by_user_by_event_name.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_ets_by_user_by_event_name.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,3 +11,6 @@
 DROP INDEX `USER`
   ON performance_schema.events_transactions_summary_by_user_by_event_name;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_transactions_summary_by_user_by_event_name;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_ets_global_by_event_name.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_ets_global_by_event_name.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_ets_global_by_event_name.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_ets_global_by_event_name.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,3 +11,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.events_transactions_summary_global_by_event_name;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_transactions_summary_global_by_event_name;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_events_stages_current.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_events_stages_current.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_events_stages_current.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_events_stages_current.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,3 +11,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.events_stages_current;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_stages_current;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_events_stages_history_long.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_events_stages_history_long.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_events_stages_history_long.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_events_stages_history_long.result	2021-09-28 11:46:34.000000000 +0000
@@ -8,3 +8,6 @@
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT	GENERATION_EXPRESSION	SRS_ID
 def	performance_schema	events_stages_history_long	WORK_COMPLETED	9	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint unsigned			select,insert,update,references			NULL
 def	performance_schema	events_stages_history_long	WORK_ESTIMATED	10	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint unsigned			select,insert,update,references			NULL
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_stages_history_long;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_events_stages_history.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_events_stages_history.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_events_stages_history.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_events_stages_history.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,3 +11,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.events_stages_history;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_stages_history;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_events_statements_current.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_events_statements_current.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_events_statements_current.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_events_statements_current.result	2021-09-28 11:46:34.000000000 +0000
@@ -8,3 +8,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.events_statements_current;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_statements_current;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_events_statements_history_long.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_events_statements_history_long.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_events_statements_history_long.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_events_statements_history_long.result	2021-09-28 11:46:34.000000000 +0000
@@ -5,3 +5,6 @@
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 CREATE UNIQUE INDEX test_index ON performance_schema.events_statements_history_long(EVENT_ID);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_statements_history_long;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_events_statements_history.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_events_statements_history.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_events_statements_history.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_events_statements_history.result	2021-09-28 11:46:34.000000000 +0000
@@ -8,3 +8,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.events_statements_history;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_statements_history;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_events_transactions_current.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_events_transactions_current.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_events_transactions_current.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_events_transactions_current.result	2021-09-28 11:46:34.000000000 +0000
@@ -8,3 +8,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.events_transactions_current;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_transactions_current;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_events_transactions_history_long.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_events_transactions_history_long.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_events_transactions_history_long.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_events_transactions_history_long.result	2021-09-28 11:46:34.000000000 +0000
@@ -5,3 +5,6 @@
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 CREATE UNIQUE INDEX test_index ON performance_schema.events_transactions_history_long(EVENT_ID);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_transactions_history_long;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_events_transactions_history.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_events_transactions_history.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_events_transactions_history.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_events_transactions_history.result	2021-09-28 11:46:34.000000000 +0000
@@ -8,3 +8,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.events_transactions_history;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_transactions_history;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_events_waits_current.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_events_waits_current.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_events_waits_current.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_events_waits_current.result	2021-09-28 11:46:34.000000000 +0000
@@ -8,3 +8,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.events_waits_current;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_waits_current;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_events_waits_history_long.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_events_waits_history_long.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_events_waits_history_long.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_events_waits_history_long.result	2021-09-28 11:46:34.000000000 +0000
@@ -5,3 +5,6 @@
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 CREATE UNIQUE INDEX test_index ON performance_schema.events_waits_history_long(EVENT_ID);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_waits_history_long;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_events_waits_history.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_events_waits_history.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_events_waits_history.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_events_waits_history.result	2021-09-28 11:46:34.000000000 +0000
@@ -8,3 +8,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.events_waits_history;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_waits_history;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_ews_by_account_by_event_name.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_ews_by_account_by_event_name.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_ews_by_account_by_event_name.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_ews_by_account_by_event_name.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,3 +11,6 @@
 DROP INDEX `ACCOUNT`
   ON performance_schema.events_waits_summary_by_account_by_event_name;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_waits_summary_by_account_by_event_name;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_ews_by_host_by_event_name.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_ews_by_host_by_event_name.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_ews_by_host_by_event_name.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_ews_by_host_by_event_name.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,3 +11,6 @@
 DROP INDEX `HOST`
   ON performance_schema.events_waits_summary_by_host_by_event_name;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_waits_summary_by_host_by_event_name;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_ews_by_instance.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_ews_by_instance.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_ews_by_instance.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_ews_by_instance.result	2021-09-28 11:46:34.000000000 +0000
@@ -8,3 +8,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.events_waits_summary_by_instance;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_waits_summary_by_instance;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_ews_by_thread_by_event_name.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_ews_by_thread_by_event_name.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_ews_by_thread_by_event_name.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_ews_by_thread_by_event_name.result	2021-09-28 11:46:34.000000000 +0000
@@ -10,3 +10,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.events_waits_summary_by_thread_by_event_name;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_waits_summary_by_thread_by_event_name;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_ews_by_user_by_event_name.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_ews_by_user_by_event_name.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_ews_by_user_by_event_name.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_ews_by_user_by_event_name.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,3 +11,6 @@
 DROP INDEX `USER`
   ON performance_schema.events_waits_summary_by_user_by_event_name;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_waits_summary_by_user_by_event_name;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_ews_global_by_event_name.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_ews_global_by_event_name.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_ews_global_by_event_name.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_ews_global_by_event_name.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,3 +11,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.events_waits_summary_global_by_event_name;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.events_waits_summary_global_by_event_name;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_file_instances.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_file_instances.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_file_instances.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_file_instances.result	2021-09-28 11:46:34.000000000 +0000
@@ -9,3 +9,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.file_instances;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.file_instances;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_fs_by_event_name.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_fs_by_event_name.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_fs_by_event_name.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_fs_by_event_name.result	2021-09-28 11:46:34.000000000 +0000
@@ -8,3 +8,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.file_summary_by_event_name;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.file_summary_by_event_name;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_fs_by_instance.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_fs_by_instance.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_fs_by_instance.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_fs_by_instance.result	2021-09-28 11:46:34.000000000 +0000
@@ -8,3 +8,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.file_summary_by_instance;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.file_summary_by_instance;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_global_status.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_global_status.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_global_status.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_global_status.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,3 +11,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.global_status;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.global_status;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_global_variables.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_global_variables.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_global_variables.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_global_variables.result	2021-09-28 11:46:34.000000000 +0000
@@ -12,3 +12,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.global_variables;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.global_variables;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_host_cache.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_host_cache.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_host_cache.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_host_cache.result	2021-09-28 11:46:34.000000000 +0000
@@ -8,3 +8,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.host_cache;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.host_cache;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_hosts.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_hosts.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_hosts.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_hosts.result	2021-09-28 11:46:34.000000000 +0000
@@ -9,3 +9,6 @@
 DROP INDEX `HOST`
   ON performance_schema.hosts;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.hosts;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_keyring_component_status.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_keyring_component_status.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_keyring_component_status.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_keyring_component_status.result	2021-09-28 11:46:34.000000000 +0000
@@ -10,3 +10,7 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.keyring_component_status;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+call mtr.add_suppression("No suitable 'keyring_component_metadata_query' service implementation found to fulfill the request");
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.keyring_component_status;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_keyring_keys.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_keyring_keys.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_keyring_keys.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_keyring_keys.result	2021-09-28 11:46:34.000000000 +0000
@@ -10,3 +10,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.keyring_keys;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.keyring_keys;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_log_status.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_log_status.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_log_status.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_log_status.result	2021-09-28 11:46:34.000000000 +0000
@@ -9,3 +9,6 @@
 CREATE UNIQUE INDEX test_index ON
 performance_schema.log_status(server_uuid);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.log_status;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_mems_by_account_by_event_name.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_mems_by_account_by_event_name.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_mems_by_account_by_event_name.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_mems_by_account_by_event_name.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,3 +11,6 @@
 DROP INDEX `ACCOUNT`
   ON performance_schema.memory_summary_by_account_by_event_name;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.memory_summary_by_account_by_event_name;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_mems_by_host_by_event_name.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_mems_by_host_by_event_name.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_mems_by_host_by_event_name.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_mems_by_host_by_event_name.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,3 +11,6 @@
 DROP INDEX `HOST`
   ON performance_schema.memory_summary_by_host_by_event_name;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.memory_summary_by_host_by_event_name;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_mems_by_thread_by_event_name.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_mems_by_thread_by_event_name.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_mems_by_thread_by_event_name.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_mems_by_thread_by_event_name.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,3 +11,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.memory_summary_by_thread_by_event_name;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.memory_summary_by_thread_by_event_name;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_mems_by_user_by_event_name.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_mems_by_user_by_event_name.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_mems_by_user_by_event_name.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_mems_by_user_by_event_name.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,3 +11,6 @@
 DROP INDEX `USER`
   ON performance_schema.memory_summary_by_user_by_event_name;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.memory_summary_by_user_by_event_name;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_mems_global_by_event_name.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_mems_global_by_event_name.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_mems_global_by_event_name.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_mems_global_by_event_name.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,3 +11,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.memory_summary_global_by_event_name;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.memory_summary_global_by_event_name;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_metadata_locks.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_metadata_locks.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_metadata_locks.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_metadata_locks.result	2021-09-28 11:46:34.000000000 +0000
@@ -9,3 +9,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.metadata_locks;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.metadata_locks;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_mutex_instances.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_mutex_instances.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_mutex_instances.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_mutex_instances.result	2021-09-28 11:46:34.000000000 +0000
@@ -9,3 +9,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.mutex_instances;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.mutex_instances;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_os_global_by_type.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_os_global_by_type.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_os_global_by_type.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_os_global_by_type.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,3 +11,6 @@
 DROP INDEX `OBJECT`
   ON performance_schema.objects_summary_global_by_type;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.objects_summary_global_by_type;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_performance_timers.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_performance_timers.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_performance_timers.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_performance_timers.result	2021-09-28 11:46:34.000000000 +0000
@@ -6,3 +6,6 @@
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 CREATE UNIQUE INDEX test_index ON performance_schema.performance_timers(TIMER_NAME);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.performance_timers;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_persisted_variables.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_persisted_variables.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_persisted_variables.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_persisted_variables.result	2021-09-28 11:46:34.000000000 +0000
@@ -9,3 +9,6 @@
 CREATE UNIQUE INDEX test_index
 ON performance_schema.persisted_variables(VARIABLE_NAME);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.persisted_variables;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_prepared_statements_instances.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_prepared_statements_instances.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_prepared_statements_instances.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_prepared_statements_instances.result	2021-09-28 11:46:34.000000000 +0000
@@ -10,3 +10,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.prepared_statements_instances;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.prepared_statements_instances;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_processlist.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_processlist.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_processlist.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_processlist.result	2021-09-28 11:46:34.000000000 +0000
@@ -14,4 +14,7 @@
 drop index `PRIMARY`
   on performance_schema.processlist;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.processlist;
+DROP TABLE test.create_select;
 set @@global.performance_schema_show_processlist = @save_processlist;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_replication_applier_configuration.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_replication_applier_configuration.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_replication_applier_configuration.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_replication_applier_configuration.result	2021-09-28 11:46:34.000000000 +0000
@@ -12,3 +12,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.replication_applier_configuration;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.replication_applier_configuration;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_replication_applier_filters.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_replication_applier_filters.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_replication_applier_filters.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_replication_applier_filters.result	2021-09-28 11:46:34.000000000 +0000
@@ -9,3 +9,6 @@
 CREATE UNIQUE INDEX test_index ON
 performance_schema.replication_applier_filters(filter_name);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.replication_applier_filters;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_replication_applier_global_filters.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_replication_applier_global_filters.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_replication_applier_global_filters.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_replication_applier_global_filters.result	2021-09-28 11:46:34.000000000 +0000
@@ -7,5 +7,8 @@
 ADD INDEX test_index(filter_name);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 CREATE UNIQUE INDEX test_index ON
-performance_schema.replication_global_applier_filters(filter_name);
+performance_schema.replication_applier_global_filters(filter_name);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.replication_applier_global_filters;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_replication_applier_status_by_coordinator.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_replication_applier_status_by_coordinator.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_replication_applier_status_by_coordinator.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_replication_applier_status_by_coordinator.result	2021-09-28 11:46:34.000000000 +0000
@@ -12,3 +12,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.replication_applier_status_by_coordinator;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.replication_applier_status_by_coordinator;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_replication_applier_status_by_worker.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_replication_applier_status_by_worker.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_replication_applier_status_by_worker.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_replication_applier_status_by_worker.result	2021-09-28 11:46:34.000000000 +0000
@@ -12,3 +12,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.replication_applier_status_by_worker;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.replication_applier_status_by_worker;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_replication_applier_status.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_replication_applier_status.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_replication_applier_status.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_replication_applier_status.result	2021-09-28 11:46:34.000000000 +0000
@@ -12,3 +12,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.replication_applier_status;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.replication_applier_status;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_replication_connection_configuration.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_replication_connection_configuration.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_replication_connection_configuration.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_replication_connection_configuration.result	2021-09-28 11:46:34.000000000 +0000
@@ -12,3 +12,8 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.replication_connection_configuration;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.replication_connection_configuration;
+Warnings:
+Warning	1681	Specifying number of digits for floating point data types is deprecated and will be removed in a future release.
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_replication_connection_status.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_replication_connection_status.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_replication_connection_status.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_replication_connection_status.result	2021-09-28 11:46:34.000000000 +0000
@@ -12,3 +12,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.replication_connection_status;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.replication_connection_status;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_replication_group_members.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_replication_group_members.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_replication_group_members.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_replication_group_members.result	2021-09-28 11:46:34.000000000 +0000
@@ -12,3 +12,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.replication_group_members;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.replication_group_members;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_replication_group_member_stats.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_replication_group_member_stats.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_replication_group_member_stats.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_replication_group_member_stats.result	2021-09-28 11:46:34.000000000 +0000
@@ -12,3 +12,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.replication_group_member_stats;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.replication_group_member_stats;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_rwlock_instances.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_rwlock_instances.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_rwlock_instances.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_rwlock_instances.result	2021-09-28 11:46:34.000000000 +0000
@@ -9,3 +9,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.rwlock_instances;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.rwlock_instances;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_session_account_connect_attrs.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_session_account_connect_attrs.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_session_account_connect_attrs.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_session_account_connect_attrs.result	2021-09-28 11:46:34.000000000 +0000
@@ -10,3 +10,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.session_account_connect_attrs;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.session_account_connect_attrs;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_session_connect_attrs.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_session_connect_attrs.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_session_connect_attrs.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_session_connect_attrs.result	2021-09-28 11:46:34.000000000 +0000
@@ -10,3 +10,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.session_connect_attrs;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.session_connect_attrs;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_session_status.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_session_status.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_session_status.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_session_status.result	2021-09-28 11:46:34.000000000 +0000
@@ -12,3 +12,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.session_status;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.session_status;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_session_variables.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_session_variables.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_session_variables.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_session_variables.result	2021-09-28 11:46:34.000000000 +0000
@@ -12,3 +12,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.session_variables;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.session_variables;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_setup_actors.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_setup_actors.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_setup_actors.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_setup_actors.result	2021-09-28 11:46:34.000000000 +0000
@@ -19,3 +19,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.setup_actors;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.setup_actors;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_setup_consumers.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_setup_consumers.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_setup_consumers.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_setup_consumers.result	2021-09-28 11:46:34.000000000 +0000
@@ -9,3 +9,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.setup_consumers;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.setup_consumers;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_setup_instruments.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_setup_instruments.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_setup_instruments.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_setup_instruments.result	2021-09-28 11:46:34.000000000 +0000
@@ -9,3 +9,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.setup_instruments;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.setup_instruments;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_setup_objects.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_setup_objects.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_setup_objects.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_setup_objects.result	2021-09-28 11:46:34.000000000 +0000
@@ -17,3 +17,6 @@
 DROP INDEX `OBJECT`
   ON performance_schema.setup_objects;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.setup_objects;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_setup_threads.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_setup_threads.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_setup_threads.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_setup_threads.result	2021-09-28 11:46:34.000000000 +0000
@@ -8,3 +8,6 @@
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 DROP INDEX `PRIMARY` ON performance_schema.setup_threads;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.setup_threads;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_socket_instances.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_socket_instances.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_socket_instances.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_socket_instances.result	2021-09-28 11:46:34.000000000 +0000
@@ -9,3 +9,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.socket_instances;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.socket_instances;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_socket_summary_by_event_name.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_socket_summary_by_event_name.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_socket_summary_by_event_name.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_socket_summary_by_event_name.result	2021-09-28 11:46:34.000000000 +0000
@@ -8,3 +8,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.socket_summary_by_event_name;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.socket_summary_by_event_name;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_socket_summary_by_instance.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_socket_summary_by_instance.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_socket_summary_by_instance.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_socket_summary_by_instance.result	2021-09-28 11:46:34.000000000 +0000
@@ -8,3 +8,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.socket_summary_by_instance;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.socket_summary_by_instance;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_status_by_account.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_status_by_account.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_status_by_account.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_status_by_account.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,3 +11,6 @@
 DROP INDEX `ACCOUNT`
   ON performance_schema.status_by_account;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.status_by_account;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_status_by_host.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_status_by_host.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_status_by_host.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_status_by_host.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,3 +11,6 @@
 DROP INDEX `HOST`
   ON performance_schema.status_by_host;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.status_by_host;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_status_by_thread.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_status_by_thread.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_status_by_thread.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_status_by_thread.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,3 +11,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.status_by_thread;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.status_by_thread;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_status_by_user.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_status_by_user.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_status_by_user.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_status_by_user.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,3 +11,6 @@
 DROP INDEX `USER`
   ON performance_schema.status_by_user;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.status_by_user;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_table_handles.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_table_handles.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_table_handles.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_table_handles.result	2021-09-28 11:46:34.000000000 +0000
@@ -9,3 +9,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.table_handles;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.table_handles;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_threads.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_threads.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_threads.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_threads.result	2021-09-28 11:46:34.000000000 +0000
@@ -9,3 +9,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.threads;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.threads;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_tiws_by_index_usage.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_tiws_by_index_usage.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_tiws_by_index_usage.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_tiws_by_index_usage.result	2021-09-28 11:46:34.000000000 +0000
@@ -9,3 +9,6 @@
 DROP INDEX `OBJECT`
   ON performance_schema.table_io_waits_summary_by_index_usage;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.table_io_waits_summary_by_index_usage;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_tiws_by_table.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_tiws_by_table.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_tiws_by_table.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_tiws_by_table.result	2021-09-28 11:46:34.000000000 +0000
@@ -9,3 +9,6 @@
 DROP INDEX `OBJECT`
   ON performance_schema.table_io_waits_summary_by_table;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.table_io_waits_summary_by_table;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_tls_channel_status.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_tls_channel_status.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_tls_channel_status.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_tls_channel_status.result	2021-09-28 11:46:34.000000000 +0000
@@ -10,3 +10,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.tls_channel_status;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.tls_channel_status;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_tlws_by_table.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_tlws_by_table.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_tlws_by_table.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_tlws_by_table.result	2021-09-28 11:46:34.000000000 +0000
@@ -9,3 +9,6 @@
 DROP INDEX `OBJECT`
   ON performance_schema.table_lock_waits_summary_by_table;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.table_lock_waits_summary_by_table;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_user_defined_functions.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_user_defined_functions.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_user_defined_functions.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_user_defined_functions.result	2021-09-28 11:46:34.000000000 +0000
@@ -12,3 +12,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.user_defined_functions;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.user_defined_functions;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_users.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_users.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_users.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_users.result	2021-09-28 11:46:34.000000000 +0000
@@ -9,3 +9,6 @@
 DROP INDEX `USER`
   ON performance_schema.users;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.users;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_uvar_by_thread.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_uvar_by_thread.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_uvar_by_thread.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_uvar_by_thread.result	2021-09-28 11:46:34.000000000 +0000
@@ -12,3 +12,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.user_variables_by_thread;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.user_variables_by_thread;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_variables_by_thread.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_variables_by_thread.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_variables_by_thread.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_variables_by_thread.result	2021-09-28 11:46:34.000000000 +0000
@@ -12,3 +12,6 @@
 DROP INDEX `PRIMARY`
   ON performance_schema.variables_by_thread;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.variables_by_thread;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_variables_info.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_variables_info.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ddl_variables_info.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ddl_variables_info.result	2021-09-28 11:46:34.000000000 +0000
@@ -9,3 +9,6 @@
 CREATE UNIQUE INDEX test_index
 ON performance_schema.variables_info(VARIABLE_NAME);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.variables_info;
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/dd_version_check.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/dd_version_check.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/dd_version_check.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/dd_version_check.result	2021-09-28 11:46:34.000000000 +0000
@@ -1,6 +1,6 @@
 "Checking the data dictionary properties ..."
 SUBSTRING_INDEX(SUBSTRING(properties, LOCATE('PS_VERSION', properties), 30), ';', 1)
-PS_VERSION=80024
+PS_VERSION=80027
 "Checking the performance schema database structure ..."
 CHECK STATUS
-The tables in the performance_schema were last changed in MySQL 8.0.24
+The tables in the performance_schema were last changed in MySQL 8.0.27
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/digest_view.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/digest_view.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/digest_view.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/digest_view.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,128 @@
+CREATE TABLE test.v1 (a int, b int);
+INSERT INTO test.v1 VALUES (1, 100), (2, 200), (3, 300);
+CREATE TABLE test.t1 (a int, b int);
+INSERT INTO test.t1 VALUES (1, 100), (2, 200), (3, 300);
+ANALYZE TABLE v1, t1;
+Table	Op	Msg_type	Msg_text
+test.v1	analyze	status	OK
+test.t1	analyze	status	OK
+TRUNCATE TABLE performance_schema.events_statements_summary_by_digest;
+EXPLAIN SELECT * from test.v1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	v1	NULL	ALL	NULL	NULL	NULL	NULL	3	100.00	NULL
+EXPLAIN SELECT * from test.v1 where a = 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	v1	NULL	ALL	NULL	NULL	NULL	NULL	3	33.33	Using where
+EXPLAIN SELECT * from test.v1 where b > 100;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	v1	NULL	ALL	NULL	NULL	NULL	NULL	3	33.33	Using where
+EXPLAIN SELECT a, b from test.v1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	v1	NULL	ALL	NULL	NULL	NULL	NULL	3	100.00	NULL
+EXPLAIN SELECT b, a from test.v1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	v1	NULL	ALL	NULL	NULL	NULL	NULL	3	100.00	NULL
+SELECT * from test.v1;
+a	b
+1	100
+2	200
+3	300
+SELECT * from test.v1 where a = 1;
+a	b
+1	100
+SELECT * from test.v1 where b > 100;
+a	b
+2	200
+3	300
+SELECT a, b from test.v1;
+a	b
+1	100
+2	200
+3	300
+SELECT b, a from test.v1;
+b	a
+100	1
+200	2
+300	3
+#
+# DIGESTS SEEN ON TABLE
+#
+SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR, QUERY_SAMPLE_TEXT
+FROM performance_schema.events_statements_summary_by_digest
+ORDER BY DIGEST_TEXT;
+SCHEMA_NAME	DIGEST	DIGEST_TEXT	COUNT_STAR	QUERY_SAMPLE_TEXT
+test	44defeaac80e345658f6eaf6a9cd5dfff624c4b84fc7c066d82eb24dc89e1dbe	EXPLAIN SELECT * FROM `test` . `v1`	1	EXPLAIN SELECT * from test.v1
+test	7cd6b2a1f8762c488dd5841fc26fe59cce592c59b278df1ce76ae274abf10f4e	EXPLAIN SELECT * FROM `test` . `v1` WHERE `a` = ?	1	EXPLAIN SELECT * from test.v1 where a = 1
+test	97cd4b3d096f36adbf995fd64e2d4bf2a8975910cc1eaf5f7a8e876fb28be512	EXPLAIN SELECT * FROM `test` . `v1` WHERE `b` > ?	1	EXPLAIN SELECT * from test.v1 where b > 100
+test	a3c66e6014d41d5428f4198e43087098355a61eeb039a595683f85a4cf8aaf42	EXPLAIN SELECT `a` , `b` FROM `test` . `v1`	1	EXPLAIN SELECT a, b from test.v1
+test	3c694431b761a9fbfc0f4f78fb031957b2ae9aec6fb1f4dc137451aceb1b6316	EXPLAIN SELECT `b` , `a` FROM `test` . `v1`	1	EXPLAIN SELECT b, a from test.v1
+test	8e0aabd64f6361bc3dbc913dcf873a5249d72a07e2b91a7bc8f043ba60436a31	SELECT * FROM `test` . `v1`	1	SELECT * from test.v1
+test	56336f6ce1f4057068812b9f97001aa394357558f3b94089281b4e5af5049cee	SELECT * FROM `test` . `v1` WHERE `a` = ?	1	SELECT * from test.v1 where a = 1
+test	631f182bba654d327aff6824fa46dcfd79b1f85a9ab9c12c1489411a6901a5b2	SELECT * FROM `test` . `v1` WHERE `b` > ?	1	SELECT * from test.v1 where b > 100
+test	75f26f170466d57f74d63f1548edcbd9c27a02bf7373f86ea7602535a38a5470	SELECT `a` , `b` FROM `test` . `v1`	1	SELECT a, b from test.v1
+test	1e4bf55234aec9d998764bfdd1cba42bf2e06a67d681b326f065bba4192a360f	SELECT `b` , `a` FROM `test` . `v1`	1	SELECT b, a from test.v1
+test	5e18b503343466373cc0ce1922b04a77902f0cce5386ce599cb95b682d29415e	TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest`	1	TRUNCATE TABLE performance_schema.events_statements_summary_by_digest
+DROP TABLE test.v1;
+CREATE VIEW test.v1 AS SELECT * FROM test.t1;
+EXPLAIN SELECT * from test.v1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	3	100.00	NULL
+EXPLAIN SELECT * from test.v1 where a = 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	3	33.33	Using where
+EXPLAIN SELECT * from test.v1 where b > 100;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	3	33.33	Using where
+EXPLAIN SELECT a, b from test.v1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	3	100.00	NULL
+EXPLAIN SELECT b, a from test.v1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	3	100.00	NULL
+SELECT * from test.v1;
+a	b
+1	100
+2	200
+3	300
+SELECT * from test.v1 where a = 1;
+a	b
+1	100
+SELECT * from test.v1 where b > 100;
+a	b
+2	200
+3	300
+SELECT a, b from test.v1;
+a	b
+1	100
+2	200
+3	300
+SELECT b, a from test.v1;
+b	a
+100	1
+200	2
+300	3
+#
+# DIGESTS SEEN ON VIEW
+#
+SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR, QUERY_SAMPLE_TEXT
+FROM performance_schema.events_statements_summary_by_digest
+ORDER BY DIGEST_TEXT;
+SCHEMA_NAME	DIGEST	DIGEST_TEXT	COUNT_STAR	QUERY_SAMPLE_TEXT
+test	5339225c923312b39bdd29d591b93e3fe8b609b2164553c62ca138cc93450f9e	CREATE VIEW `test` . `v1` AS SELECT * FROM `test` . `t1`	1	CREATE VIEW test.v1 AS SELECT * FROM test.t1
+test	130d4736dce856bc0f41b91ab6385c98539537fe1dbc6cf5b3b1640947633c0c	DROP TABLE `test` . `v1`	1	DROP TABLE test.v1
+test	44defeaac80e345658f6eaf6a9cd5dfff624c4b84fc7c066d82eb24dc89e1dbe	EXPLAIN SELECT * FROM `test` . `v1`	2	EXPLAIN SELECT * from test.v1
+test	7cd6b2a1f8762c488dd5841fc26fe59cce592c59b278df1ce76ae274abf10f4e	EXPLAIN SELECT * FROM `test` . `v1` WHERE `a` = ?	2	EXPLAIN SELECT * from test.v1 where a = 1
+test	97cd4b3d096f36adbf995fd64e2d4bf2a8975910cc1eaf5f7a8e876fb28be512	EXPLAIN SELECT * FROM `test` . `v1` WHERE `b` > ?	2	EXPLAIN SELECT * from test.v1 where b > 100
+test	a3c66e6014d41d5428f4198e43087098355a61eeb039a595683f85a4cf8aaf42	EXPLAIN SELECT `a` , `b` FROM `test` . `v1`	2	EXPLAIN SELECT a, b from test.v1
+test	3c694431b761a9fbfc0f4f78fb031957b2ae9aec6fb1f4dc137451aceb1b6316	EXPLAIN SELECT `b` , `a` FROM `test` . `v1`	2	EXPLAIN SELECT b, a from test.v1
+test	8e0aabd64f6361bc3dbc913dcf873a5249d72a07e2b91a7bc8f043ba60436a31	SELECT * FROM `test` . `v1`	2	SELECT * from test.v1
+test	56336f6ce1f4057068812b9f97001aa394357558f3b94089281b4e5af5049cee	SELECT * FROM `test` . `v1` WHERE `a` = ?	2	SELECT * from test.v1 where a = 1
+test	631f182bba654d327aff6824fa46dcfd79b1f85a9ab9c12c1489411a6901a5b2	SELECT * FROM `test` . `v1` WHERE `b` > ?	2	SELECT * from test.v1 where b > 100
+test	75f26f170466d57f74d63f1548edcbd9c27a02bf7373f86ea7602535a38a5470	SELECT `a` , `b` FROM `test` . `v1`	2	SELECT a, b from test.v1
+test	1e4bf55234aec9d998764bfdd1cba42bf2e06a67d681b326f065bba4192a360f	SELECT `b` , `a` FROM `test` . `v1`	2	SELECT b, a from test.v1
+test	04541f02221581a3ca19b1c4798def8a117e0a1ccaa6f8e93a8753c003dbada1	SELECT SCHEMA_NAME , `DIGEST` , `DIGEST_TEXT` , `COUNT_STAR` , `QUERY_SAMPLE_TEXT` FROM `performance_schema` . `events_statements_summary_by_digest` ORDER BY `DIGEST_TEXT`	1	SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR, QUERY_SAMPLE_TEXT
+FROM performance_schema.events_statements_summary_by_digest
+ORDER BY DIGEST_TEXT
+test	5e18b503343466373cc0ce1922b04a77902f0cce5386ce599cb95b682d29415e	TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest`	1	TRUNCATE TABLE performance_schema.events_statements_summary_by_digest
+DROP VIEW test.v1;
+DROP TABLE test.t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/dml_setup_threads.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/dml_setup_threads.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/dml_setup_threads.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/dml_setup_threads.result	2021-09-28 11:46:34.000000000 +0000
@@ -2,18 +2,18 @@
 select * from performance_schema.setup_threads
 order by name limit 12;
 NAME	ENABLED	HISTORY	PROPERTIES	VOLATILITY	DOCUMENTATION
-thread/innodb/buf_dump_thread	YES	YES		0	NULL
-thread/innodb/buf_resize_thread	YES	YES		0	NULL
-thread/innodb/clone_ddl_thread	YES	YES		0	NULL
-thread/innodb/clone_gtid_thread	YES	YES		0	NULL
-thread/innodb/dict_stats_thread	YES	YES		0	NULL
-thread/innodb/fts_optimize_thread	YES	YES		0	NULL
+thread/innodb/buf_dump_thread	YES	YES	singleton	0	NULL
+thread/innodb/buf_resize_thread	YES	YES	singleton	0	NULL
+thread/innodb/clone_ddl_thread	YES	YES	singleton	0	NULL
+thread/innodb/clone_gtid_thread	YES	YES	singleton	0	NULL
+thread/innodb/ddl_thread	YES	YES		0	NULL
+thread/innodb/dict_stats_thread	YES	YES	singleton	0	NULL
+thread/innodb/fts_optimize_thread	YES	YES	singleton	0	NULL
 thread/innodb/fts_parallel_merge_thread	YES	YES		0	NULL
 thread/innodb/fts_parallel_tokenization_thread	YES	YES		0	NULL
-thread/innodb/io_handler_thread	YES	YES		0	NULL
-thread/innodb/io_ibuf_thread	YES	YES		0	NULL
-thread/innodb/io_log_thread	YES	YES		0	NULL
-thread/innodb/io_read_thread	YES	YES		0	NULL
+thread/innodb/io_handler_thread	YES	YES	singleton	0	NULL
+thread/innodb/io_ibuf_thread	YES	YES	singleton	0	NULL
+thread/innodb/io_log_thread	YES	YES	singleton	0	NULL
 select * from performance_schema.setup_threads
 where enabled='YES';
 insert into performance_schema.setup_threads
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/error_log.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/error_log.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/error_log.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/error_log.result	2021-09-28 11:46:34.000000000 +0000
@@ -118,8 +118,8 @@
 Note	MY-013252	InnoDB
 Note	MY-012910	InnoDB
 Note	MY-011980	InnoDB
-Note	MY-011825	InnoDB
-Note	MY-011825	InnoDB
+Note	MY-013776	InnoDB
+Note	MY-013777	InnoDB
 Note	MY-012923	InnoDB
 Note	MY-012265	InnoDB
 Note	MY-012266	InnoDB
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/idx_replication_group_members.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/idx_replication_group_members.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/idx_replication_group_members.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/idx_replication_group_members.result	2021-09-28 11:46:34.000000000 +0000
@@ -7,7 +7,8 @@
   `MEMBER_PORT` int DEFAULT NULL,
   `MEMBER_STATE` char(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
   `MEMBER_ROLE` char(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
-  `MEMBER_VERSION` char(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL
+  `MEMBER_VERSION` char(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
+  `MEMBER_COMMUNICATION_STACK` char(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 select * from INFORMATION_SCHEMA.STATISTICS
 where TABLE_SCHEMA = "performance_schema"
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/index_schema.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/index_schema.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/index_schema.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/index_schema.result	2021-09-28 11:46:34.000000000 +0000
@@ -96,9 +96,6 @@
 replication_applier_status_by_coordinator	1	performance_schema	THREAD_ID	HASH	
 replication_applier_status_by_worker	0	performance_schema	PRIMARY	HASH	
 replication_applier_status_by_worker	1	performance_schema	THREAD_ID	HASH	
-replication_asynchronous_connection_failover	1	performance_schema	CHANNEL_NAME	HASH	
-replication_asynchronous_connection_failover	0	performance_schema	PRIMARY	HASH	
-replication_asynchronous_connection_failover_managed	0	performance_schema	PRIMARY	HASH	
 replication_connection_configuration	0	performance_schema	PRIMARY	HASH	
 replication_connection_status	0	performance_schema	PRIMARY	HASH	
 replication_connection_status	1	performance_schema	THREAD_ID	HASH	
@@ -307,15 +304,6 @@
 replication_applier_status_by_worker	0	performance_schema	PRIMARY	1	CHANNEL_NAME	NULL	
 replication_applier_status_by_worker	0	performance_schema	PRIMARY	2	WORKER_ID	NULL	
 replication_applier_status_by_worker	1	performance_schema	THREAD_ID	1	THREAD_ID	NULL	YES
-replication_asynchronous_connection_failover	1	performance_schema	CHANNEL_NAME	1	CHANNEL_NAME	NULL	
-replication_asynchronous_connection_failover	1	performance_schema	CHANNEL_NAME	2	MANAGED_NAME	NULL	
-replication_asynchronous_connection_failover	0	performance_schema	PRIMARY	1	CHANNEL_NAME	NULL	
-replication_asynchronous_connection_failover	0	performance_schema	PRIMARY	2	HOST	NULL	
-replication_asynchronous_connection_failover	0	performance_schema	PRIMARY	3	PORT	NULL	
-replication_asynchronous_connection_failover	0	performance_schema	PRIMARY	4	NETWORK_NAMESPACE	NULL	
-replication_asynchronous_connection_failover	0	performance_schema	PRIMARY	5	MANAGED_NAME	NULL	
-replication_asynchronous_connection_failover_managed	0	performance_schema	PRIMARY	1	CHANNEL_NAME	NULL	
-replication_asynchronous_connection_failover_managed	0	performance_schema	PRIMARY	2	MANAGED_NAME	NULL	
 replication_connection_configuration	0	performance_schema	PRIMARY	1	CHANNEL_NAME	NULL	
 replication_connection_status	0	performance_schema	PRIMARY	1	CHANNEL_NAME	NULL	
 replication_connection_status	1	performance_schema	THREAD_ID	1	THREAD_ID	NULL	YES
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ortho_iter.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ortho_iter.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/ortho_iter.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/ortho_iter.result	2021-09-28 11:46:34.000000000 +0000
@@ -30,7 +30,8 @@
 declare pfs_cursor CURSOR FOR
 select table_name from information_schema.tables
 where table_schema= 'performance_schema'
-      and table_name like "%_by_event_name%";
+      and table_name like "%_by_event_name%"
+      order by table_name;
 declare continue handler for sqlstate '02000'
     set done = 1;
 select (instr_name like "wait/%") or (instr_name like "idle") into is_wait;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/privilege.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/privilege.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/privilege.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/privilege.result	2021-09-28 11:46:34.000000000 +0000
@@ -1,8 +1,8 @@
 show grants;
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 create user 'pfs_user_1'@localhost;
 create user 'pfs_user_2'@localhost;
 create user 'pfs_user_3'@localhost;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/privilege_table_io.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/privilege_table_io.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/privilege_table_io.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/privilege_table_io.result	2021-09-28 11:46:34.000000000 +0000
@@ -98,6 +98,9 @@
 wait/io/table/sql/handler	handler.cc:	TABLE	mysql	global_grants	fetch	1
 wait/io/table/sql/handler	handler.cc:	TABLE	mysql	global_grants	fetch	1
 wait/io/table/sql/handler	handler.cc:	TABLE	mysql	global_grants	fetch	1
+wait/io/table/sql/handler	handler.cc:	TABLE	mysql	global_grants	fetch	1
+wait/io/table/sql/handler	handler.cc:	TABLE	mysql	global_grants	fetch	1
+wait/io/table/sql/handler	handler.cc:	TABLE	mysql	global_grants	fetch	1
 wait/io/table/sql/handler	handler.cc:	TABLE	mysql	role_edges	fetch	1
 wait/io/table/sql/handler	handler.cc:	TABLE	mysql	default_roles	fetch	1
 wait/io/table/sql/handler	handler.cc:	TABLE	mysql	tables_priv	fetch	1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/processlist_acl.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/processlist_acl.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/processlist_acl.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/processlist_acl.result	2021-09-28 11:46:34.000000000 +0000
@@ -30,7 +30,7 @@
 show grants for user_all@localhost;
 Grants for user_all@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `user_all`@`localhost`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `user_all`@`localhost`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `user_all`@`localhost`
 
 show grants for user_none@localhost;
 Grants for user_none@localhost
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/rpl_threads.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/rpl_threads.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/rpl_threads.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/rpl_threads.result	2021-09-28 11:46:34.000000000 +0000
@@ -88,7 +88,7 @@
   from performance_schema.variables_by_thread
 where VARIABLE_NAME = 'pseudo_thread_id' and THREAD_ID = @slave_sql_tid;
 VARIABLE_NAME	test
-pseudo_thread_id	different
+pseudo_thread_id	same
 select VARIABLE_NAME, VARIABLE_VALUE
 from performance_schema.status_by_thread
 where VARIABLE_NAME = 'Compression_level' and THREAD_ID = @slave_sql_tid;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/schema.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/schema.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/schema.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/schema.result	2021-09-28 11:46:34.000000000 +0000
@@ -414,13 +414,13 @@
   `SUM_SORT_SCAN` bigint unsigned NOT NULL,
   `SUM_NO_INDEX_USED` bigint unsigned NOT NULL,
   `SUM_NO_GOOD_INDEX_USED` bigint unsigned NOT NULL,
-  `FIRST_SEEN` timestamp(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000',
-  `LAST_SEEN` timestamp(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000',
+  `FIRST_SEEN` timestamp(6) NOT NULL,
+  `LAST_SEEN` timestamp(6) NOT NULL,
   `QUANTILE_95` bigint unsigned NOT NULL,
   `QUANTILE_99` bigint unsigned NOT NULL,
   `QUANTILE_999` bigint unsigned NOT NULL,
   `QUERY_SAMPLE_TEXT` longtext,
-  `QUERY_SAMPLE_SEEN` timestamp(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000',
+  `QUERY_SAMPLE_SEEN` timestamp(6) NOT NULL,
   `QUERY_SAMPLE_TIMER_WAIT` bigint unsigned NOT NULL,
   UNIQUE KEY `SCHEMA_NAME` (`SCHEMA_NAME`,`DIGEST`)
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
@@ -1119,10 +1119,10 @@
   `COUNT_INIT_CONNECT_ERRORS` bigint NOT NULL,
   `COUNT_LOCAL_ERRORS` bigint NOT NULL,
   `COUNT_UNKNOWN_ERRORS` bigint NOT NULL,
-  `FIRST_SEEN` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `LAST_SEEN` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `FIRST_ERROR_SEEN` timestamp NULL DEFAULT '0000-00-00 00:00:00',
-  `LAST_ERROR_SEEN` timestamp NULL DEFAULT '0000-00-00 00:00:00',
+  `FIRST_SEEN` timestamp NOT NULL,
+  `LAST_SEEN` timestamp NOT NULL,
+  `FIRST_ERROR_SEEN` timestamp NULL DEFAULT NULL,
+  `LAST_ERROR_SEEN` timestamp NULL DEFAULT NULL,
   PRIMARY KEY (`IP`),
   KEY `HOST` (`HOST`)
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result	2021-09-28 11:46:34.000000000 +0000
@@ -115,7 +115,7 @@
 show global status like "performance_schema%";
 show global variables like "performance_schema_max_cond_classes";
 Variable_name	Value
-performance_schema_max_cond_classes	100
+performance_schema_max_cond_classes	150
 select count(*) > 0 from performance_schema.setup_instruments
 where name like "wait/synch/cond/%";
 count(*) > 0
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result	2021-09-28 11:46:34.000000000 +0000
@@ -115,7 +115,7 @@
 show global status like "performance_schema%";
 show global variables like "performance_schema_max_mutex_classes";
 Variable_name	Value
-performance_schema_max_mutex_classes	300
+performance_schema_max_mutex_classes	350
 select count(*) > 0 from performance_schema.setup_instruments
 where name like "wait/synch/mutex/%";
 count(*) > 0
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/statement_program_lost_inst.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/statement_program_lost_inst.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/statement_program_lost_inst.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/statement_program_lost_inst.result	2021-09-28 11:46:34.000000000 +0000
@@ -299,3 +299,5 @@
 DROP TRIGGER trg;
 DROP TABLE t1,t2;
 DROP DATABASE nested_sp;
+# Restore default settings
+# restart:
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/table_schema.result mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/table_schema.result
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/r/table_schema.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/r/table_schema.result	2021-09-28 11:46:34.000000000 +0000
@@ -60,39 +60,39 @@
 def	performance_schema	events_errors_summary_by_account_by_error	SQL_STATE	5	NULL	YES	varchar	5	20	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	varchar(5)			select,insert,update,references			NULL
 def	performance_schema	events_errors_summary_by_account_by_error	SUM_ERROR_RAISED	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint unsigned			select,insert,update,references			NULL
 def	performance_schema	events_errors_summary_by_account_by_error	SUM_ERROR_HANDLED	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint unsigned			select,insert,update,references			NULL
-def	performance_schema	events_errors_summary_by_account_by_error	FIRST_SEEN	8	0000-00-00 00:00:00	YES	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references			NULL
-def	performance_schema	events_errors_summary_by_account_by_error	LAST_SEEN	9	0000-00-00 00:00:00	YES	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references			NULL
+def	performance_schema	events_errors_summary_by_account_by_error	FIRST_SEEN	8	NULL	YES	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references			NULL
+def	performance_schema	events_errors_summary_by_account_by_error	LAST_SEEN	9	NULL	YES	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references			NULL
 def	performance_schema	events_errors_summary_by_host_by_error	HOST	1	NULL	YES	char	255	255	NULL	NULL	NULL	ascii	ascii_general_ci	char(255)	MUL		select,insert,update,references			NULL
 def	performance_schema	events_errors_summary_by_host_by_error	ERROR_NUMBER	2	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int			select,insert,update,references			NULL
 def	performance_schema	events_errors_summary_by_host_by_error	ERROR_NAME	3	NULL	YES	varchar	64	256	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	varchar(64)			select,insert,update,references			NULL
 def	performance_schema	events_errors_summary_by_host_by_error	SQL_STATE	4	NULL	YES	varchar	5	20	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	varchar(5)			select,insert,update,references			NULL
 def	performance_schema	events_errors_summary_by_host_by_error	SUM_ERROR_RAISED	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint unsigned			select,insert,update,references			NULL
 def	performance_schema	events_errors_summary_by_host_by_error	SUM_ERROR_HANDLED	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint unsigned			select,insert,update,references			NULL
-def	performance_schema	events_errors_summary_by_host_by_error	FIRST_SEEN	7	0000-00-00 00:00:00	YES	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references			NULL
-def	performance_schema	events_errors_summary_by_host_by_error	LAST_SEEN	8	0000-00-00 00:00:00	YES	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references			NULL
+def	performance_schema	events_errors_summary_by_host_by_error	FIRST_SEEN	7	NULL	YES	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references			NULL
+def	performance_schema	events_errors_summary_by_host_by_error	LAST_SEEN	8	NULL	YES	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references			NULL
 def	performance_schema	events_errors_summary_by_thread_by_error	THREAD_ID	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint unsigned	MUL		select,insert,update,references			NULL
 def	performance_schema	events_errors_summary_by_thread_by_error	ERROR_NUMBER	2	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int			select,insert,update,references			NULL
 def	performance_schema	events_errors_summary_by_thread_by_error	ERROR_NAME	3	NULL	YES	varchar	64	256	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	varchar(64)			select,insert,update,references			NULL
 def	performance_schema	events_errors_summary_by_thread_by_error	SQL_STATE	4	NULL	YES	varchar	5	20	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	varchar(5)			select,insert,update,references			NULL
 def	performance_schema	events_errors_summary_by_thread_by_error	SUM_ERROR_RAISED	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint unsigned			select,insert,update,references			NULL
 def	performance_schema	events_errors_summary_by_thread_by_error	SUM_ERROR_HANDLED	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint unsigned			select,insert,update,references			NULL
-def	performance_schema	events_errors_summary_by_thread_by_error	FIRST_SEEN	7	0000-00-00 00:00:00	YES	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references			NULL
-def	performance_schema	events_errors_summary_by_thread_by_error	LAST_SEEN	8	0000-00-00 00:00:00	YES	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references			NULL
+def	performance_schema	events_errors_summary_by_thread_by_error	FIRST_SEEN	7	NULL	YES	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references			NULL
+def	performance_schema	events_errors_summary_by_thread_by_error	LAST_SEEN	8	NULL	YES	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references			NULL
 def	performance_schema	events_errors_summary_by_user_by_error	USER	1	NULL	YES	char	32	128	NULL	NULL	NULL	utf8mb4	utf8mb4_bin	char(32)	MUL		select,insert,update,references			NULL
 def	performance_schema	events_errors_summary_by_user_by_error	ERROR_NUMBER	2	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int			select,insert,update,references			NULL
 def	performance_schema	events_errors_summary_by_user_by_error	ERROR_NAME	3	NULL	YES	varchar	64	256	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	varchar(64)			select,insert,update,references			NULL
 def	performance_schema	events_errors_summary_by_user_by_error	SQL_STATE	4	NULL	YES	varchar	5	20	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	varchar(5)			select,insert,update,references			NULL
 def	performance_schema	events_errors_summary_by_user_by_error	SUM_ERROR_RAISED	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint unsigned			select,insert,update,references			NULL
 def	performance_schema	events_errors_summary_by_user_by_error	SUM_ERROR_HANDLED	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint unsigned			select,insert,update,references			NULL
-def	performance_schema	events_errors_summary_by_user_by_error	FIRST_SEEN	7	0000-00-00 00:00:00	YES	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references			NULL
-def	performance_schema	events_errors_summary_by_user_by_error	LAST_SEEN	8	0000-00-00 00:00:00	YES	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references			NULL
+def	performance_schema	events_errors_summary_by_user_by_error	FIRST_SEEN	7	NULL	YES	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references			NULL
+def	performance_schema	events_errors_summary_by_user_by_error	LAST_SEEN	8	NULL	YES	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references			NULL
 def	performance_schema	events_errors_summary_global_by_error	ERROR_NUMBER	1	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int	UNI		select,insert,update,references			NULL
 def	performance_schema	events_errors_summary_global_by_error	ERROR_NAME	2	NULL	YES	varchar	64	256	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	varchar(64)			select,insert,update,references			NULL
 def	performance_schema	events_errors_summary_global_by_error	SQL_STATE	3	NULL	YES	varchar	5	20	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	varchar(5)			select,insert,update,references			NULL
 def	performance_schema	events_errors_summary_global_by_error	SUM_ERROR_RAISED	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint unsigned			select,insert,update,references			NULL
 def	performance_schema	events_errors_summary_global_by_error	SUM_ERROR_HANDLED	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint unsigned			select,insert,update,references			NULL
-def	performance_schema	events_errors_summary_global_by_error	FIRST_SEEN	6	0000-00-00 00:00:00	YES	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references			NULL
-def	performance_schema	events_errors_summary_global_by_error	LAST_SEEN	7	0000-00-00 00:00:00	YES	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references			NULL
+def	performance_schema	events_errors_summary_global_by_error	FIRST_SEEN	6	NULL	YES	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references			NULL
+def	performance_schema	events_errors_summary_global_by_error	LAST_SEEN	7	NULL	YES	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references			NULL
 def	performance_schema	events_stages_current	THREAD_ID	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint unsigned	PRI		select,insert,update,references			NULL
 def	performance_schema	events_stages_current	EVENT_ID	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint unsigned	PRI		select,insert,update,references			NULL
 def	performance_schema	events_stages_current	END_EVENT_ID	3	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint unsigned			select,insert,update,references			NULL
@@ -358,13 +358,13 @@
 def	performance_schema	events_statements_summary_by_digest	SUM_SORT_SCAN	25	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint unsigned			select,insert,update,references			NULL
 def	performance_schema	events_statements_summary_by_digest	SUM_NO_INDEX_USED	26	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint unsigned			select,insert,update,references			NULL
 def	performance_schema	events_statements_summary_by_digest	SUM_NO_GOOD_INDEX_USED	27	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint unsigned			select,insert,update,references			NULL
-def	performance_schema	events_statements_summary_by_digest	FIRST_SEEN	28	0000-00-00 00:00:00.000000	NO	timestamp	NULL	NULL	NULL	NULL	6	NULL	NULL	timestamp(6)			select,insert,update,references			NULL
-def	performance_schema	events_statements_summary_by_digest	LAST_SEEN	29	0000-00-00 00:00:00.000000	NO	timestamp	NULL	NULL	NULL	NULL	6	NULL	NULL	timestamp(6)			select,insert,update,references			NULL
+def	performance_schema	events_statements_summary_by_digest	FIRST_SEEN	28	NULL	NO	timestamp	NULL	NULL	NULL	NULL	6	NULL	NULL	timestamp(6)			select,insert,update,references			NULL
+def	performance_schema	events_statements_summary_by_digest	LAST_SEEN	29	NULL	NO	timestamp	NULL	NULL	NULL	NULL	6	NULL	NULL	timestamp(6)			select,insert,update,references			NULL
 def	performance_schema	events_statements_summary_by_digest	QUANTILE_95	30	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint unsigned			select,insert,update,references			NULL
 def	performance_schema	events_statements_summary_by_digest	QUANTILE_99	31	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint unsigned			select,insert,update,references			NULL
 def	performance_schema	events_statements_summary_by_digest	QUANTILE_999	32	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint unsigned			select,insert,update,references			NULL
 def	performance_schema	events_statements_summary_by_digest	QUERY_SAMPLE_TEXT	33	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	longtext			select,insert,update,references			NULL
-def	performance_schema	events_statements_summary_by_digest	QUERY_SAMPLE_SEEN	34	0000-00-00 00:00:00.000000	NO	timestamp	NULL	NULL	NULL	NULL	6	NULL	NULL	timestamp(6)			select,insert,update,references			NULL
+def	performance_schema	events_statements_summary_by_digest	QUERY_SAMPLE_SEEN	34	NULL	NO	timestamp	NULL	NULL	NULL	NULL	6	NULL	NULL	timestamp(6)			select,insert,update,references			NULL
 def	performance_schema	events_statements_summary_by_digest	QUERY_SAMPLE_TIMER_WAIT	35	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint unsigned			select,insert,update,references			NULL
 def	performance_schema	events_statements_summary_by_host_by_event_name	HOST	1	NULL	YES	char	255	255	NULL	NULL	NULL	ascii	ascii_general_ci	char(255)	MUL		select,insert,update,references			NULL
 def	performance_schema	events_statements_summary_by_host_by_event_name	EVENT_NAME	2	NULL	NO	varchar	128	512	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	varchar(128)			select,insert,update,references			NULL
@@ -840,10 +840,10 @@
 def	performance_schema	host_cache	COUNT_INIT_CONNECT_ERRORS	23	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint			select,insert,update,references			NULL
 def	performance_schema	host_cache	COUNT_LOCAL_ERRORS	24	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint			select,insert,update,references			NULL
 def	performance_schema	host_cache	COUNT_UNKNOWN_ERRORS	25	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint			select,insert,update,references			NULL
-def	performance_schema	host_cache	FIRST_SEEN	26	0000-00-00 00:00:00	NO	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references			NULL
-def	performance_schema	host_cache	LAST_SEEN	27	0000-00-00 00:00:00	NO	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references			NULL
-def	performance_schema	host_cache	FIRST_ERROR_SEEN	28	0000-00-00 00:00:00	YES	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references			NULL
-def	performance_schema	host_cache	LAST_ERROR_SEEN	29	0000-00-00 00:00:00	YES	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references			NULL
+def	performance_schema	host_cache	FIRST_SEEN	26	NULL	NO	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references			NULL
+def	performance_schema	host_cache	LAST_SEEN	27	NULL	NO	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references			NULL
+def	performance_schema	host_cache	FIRST_ERROR_SEEN	28	NULL	YES	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references			NULL
+def	performance_schema	host_cache	LAST_ERROR_SEEN	29	NULL	YES	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references			NULL
 def	performance_schema	keyring_component_status	STATUS_KEY	1	NULL	NO	varchar	256	1024	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	varchar(256)			select,insert,update,references			NULL
 def	performance_schema	keyring_component_status	STATUS_VALUE	2	NULL	NO	varchar	1024	4096	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	varchar(1024)			select,insert,update,references			NULL
 def	performance_schema	keyring_keys	KEY_ID	1	NULL	NO	varchar	255	1020	NULL	NULL	NULL	utf8mb4	utf8mb4_bin	varchar(255)			select,insert,update,references			NULL
@@ -995,12 +995,12 @@
 def	performance_schema	replication_applier_filters	FILTER_NAME	2	NULL	NO	char	64	256	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	char(64)			select,insert,update,references			NULL
 def	performance_schema	replication_applier_filters	FILTER_RULE	3	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	longtext			select,insert,update,references			NULL
 def	performance_schema	replication_applier_filters	CONFIGURED_BY	4	NULL	NO	enum	37	148	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	enum('STARTUP_OPTIONS','CHANGE_REPLICATION_FILTER','STARTUP_OPTIONS_FOR_CHANNEL','CHANGE_REPLICATION_FILTER_FOR_CHANNEL')			select,insert,update,references			NULL
-def	performance_schema	replication_applier_filters	ACTIVE_SINCE	5	0000-00-00 00:00:00.000000	NO	timestamp	NULL	NULL	NULL	NULL	6	NULL	NULL	timestamp(6)			select,insert,update,references			NULL
+def	performance_schema	replication_applier_filters	ACTIVE_SINCE	5	NULL	NO	timestamp	NULL	NULL	NULL	NULL	6	NULL	NULL	timestamp(6)			select,insert,update,references			NULL
 def	performance_schema	replication_applier_filters	COUNTER	6	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint unsigned			select,insert,update,references			NULL
 def	performance_schema	replication_applier_global_filters	FILTER_NAME	1	NULL	NO	char	64	256	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	char(64)			select,insert,update,references			NULL
 def	performance_schema	replication_applier_global_filters	FILTER_RULE	2	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	longtext			select,insert,update,references			NULL
 def	performance_schema	replication_applier_global_filters	CONFIGURED_BY	3	NULL	NO	enum	25	100	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	enum('STARTUP_OPTIONS','CHANGE_REPLICATION_FILTER')			select,insert,update,references			NULL
-def	performance_schema	replication_applier_global_filters	ACTIVE_SINCE	4	0000-00-00 00:00:00.000000	NO	timestamp	NULL	NULL	NULL	NULL	6	NULL	NULL	timestamp(6)			select,insert,update,references			NULL
+def	performance_schema	replication_applier_global_filters	ACTIVE_SINCE	4	NULL	NO	timestamp	NULL	NULL	NULL	NULL	6	NULL	NULL	timestamp(6)			select,insert,update,references			NULL
 def	performance_schema	replication_applier_status	CHANNEL_NAME	1	NULL	NO	char	64	256	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	char(64)	PRI		select,insert,update,references			NULL
 def	performance_schema	replication_applier_status	SERVICE_STATE	2	NULL	NO	enum	3	12	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	enum('ON','OFF')			select,insert,update,references			NULL
 def	performance_schema	replication_applier_status	REMAINING_DELAY	3	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int unsigned			select,insert,update,references			NULL
@@ -1044,14 +1044,14 @@
 def	performance_schema	replication_applier_status_by_worker	APPLYING_TRANSACTION_LAST_TRANSIENT_ERROR_NUMBER	22	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int			select,insert,update,references			NULL
 def	performance_schema	replication_applier_status_by_worker	APPLYING_TRANSACTION_LAST_TRANSIENT_ERROR_MESSAGE	23	NULL	YES	varchar	1024	4096	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	varchar(1024)			select,insert,update,references			NULL
 def	performance_schema	replication_applier_status_by_worker	APPLYING_TRANSACTION_LAST_TRANSIENT_ERROR_TIMESTAMP	24	NULL	NO	timestamp	NULL	NULL	NULL	NULL	6	NULL	NULL	timestamp(6)			select,insert,update,references			NULL
-def	performance_schema	replication_asynchronous_connection_failover	CHANNEL_NAME	1	NULL	NO	char	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	The replication channel name that connects source and replica.		NULL
-def	performance_schema	replication_asynchronous_connection_failover	HOST	2	NULL	NO	char	255	255	NULL	NULL	NULL	ascii	ascii_general_ci	char(255)	PRI		select,insert,update,references	The source hostname that the replica will attempt to switch over the replication connection to in case of a failure.		NULL
-def	performance_schema	replication_asynchronous_connection_failover	PORT	3	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int	PRI		select,insert,update,references	The source port that the replica will attempt to switch over the replication connection to in case of a failure.		NULL
-def	performance_schema	replication_asynchronous_connection_failover	NETWORK_NAMESPACE	4	NULL	NO	char	64	256	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	char(64)	PRI		select,insert,update,references	The source network namespace that the replica will attempt to switch over the replication connection to in case of a failure. If its value is empty, connections use the default (global) namespace.		NULL
+def	performance_schema	replication_asynchronous_connection_failover	CHANNEL_NAME	1	NULL	NO	char	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	The replication channel name that connects source and replica.		NULL
+def	performance_schema	replication_asynchronous_connection_failover	HOST	2	NULL	NO	char	255	255	NULL	NULL	NULL	ascii	ascii_general_ci	char(255)			select,insert,update,references	The source hostname that the replica will attempt to switch over the replication connection to in case of a failure.		NULL
+def	performance_schema	replication_asynchronous_connection_failover	PORT	3	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int			select,insert,update,references	The source port that the replica will attempt to switch over the replication connection to in case of a failure.		NULL
+def	performance_schema	replication_asynchronous_connection_failover	NETWORK_NAMESPACE	4	NULL	YES	char	64	256	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	char(64)			select,insert,update,references	The source network namespace that the replica will attempt to switch over the replication connection to in case of a failure. If its value is empty, connections use the default (global) namespace.		NULL
 def	performance_schema	replication_asynchronous_connection_failover	WEIGHT	5	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int unsigned			select,insert,update,references	The order in which the replica shall try to switch the connection over to when there are failures. Weight can be set to a number between 1 and 100, where 100 is the highest weight and 1 the lowest.		NULL
-def	performance_schema	replication_asynchronous_connection_failover	MANAGED_NAME	6		NO	char	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	The name of the group which this server belongs to.		NULL
-def	performance_schema	replication_asynchronous_connection_failover_managed	CHANNEL_NAME	1	NULL	NO	char	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	The replication channel name that connects source and replica.		NULL
-def	performance_schema	replication_asynchronous_connection_failover_managed	MANAGED_NAME	2		NO	char	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	The name of the source which needs to be managed.		NULL
+def	performance_schema	replication_asynchronous_connection_failover	MANAGED_NAME	6		NO	char	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	The name of the group which this server belongs to.		NULL
+def	performance_schema	replication_asynchronous_connection_failover_managed	CHANNEL_NAME	1	NULL	NO	char	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	The replication channel name that connects source and replica.		NULL
+def	performance_schema	replication_asynchronous_connection_failover_managed	MANAGED_NAME	2		NO	char	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	The name of the source which needs to be managed.		NULL
 def	performance_schema	replication_asynchronous_connection_failover_managed	MANAGED_TYPE	3		NO	char	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	Determines the managed type.		NULL
 def	performance_schema	replication_asynchronous_connection_failover_managed	CONFIGURATION	4	NULL	YES	json	NULL	NULL	NULL	NULL	NULL	NULL	NULL	json			select,insert,update,references	The data to help manage group. For Managed_type = GroupReplication, Configuration value should contain {"Primary_weight": 80, "Secondary_weight": 60}, so that it assigns weight=80 to PRIMARY of the group, and weight=60 for rest of the members in mysql.replication_asynchronous_connection_failover table.		NULL
 def	performance_schema	replication_connection_configuration	CHANNEL_NAME	1	NULL	NO	char	64	256	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	char(64)	PRI		select,insert,update,references			NULL
@@ -1071,7 +1071,7 @@
 def	performance_schema	replication_connection_configuration	SSL_CRL_PATH	15	NULL	NO	varchar	255	1020	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	varchar(255)			select,insert,update,references			NULL
 def	performance_schema	replication_connection_configuration	CONNECTION_RETRY_INTERVAL	16	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int			select,insert,update,references			NULL
 def	performance_schema	replication_connection_configuration	CONNECTION_RETRY_COUNT	17	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint unsigned			select,insert,update,references			NULL
-def	performance_schema	replication_connection_configuration	HEARTBEAT_INTERVAL	18	NULL	NO	double	NULL	NULL	10	3	NULL	NULL	NULL	double(10,3) unsigned			select,insert,update,references	Number of seconds after which a heartbeat will be sent .		NULL
+def	performance_schema	replication_connection_configuration	HEARTBEAT_INTERVAL	18	NULL	NO	double	NULL	NULL	10	3	NULL	NULL	NULL	double(10,3)			select,insert,update,references	Number of seconds after which a heartbeat will be sent .		NULL
 def	performance_schema	replication_connection_configuration	TLS_VERSION	19	NULL	NO	varchar	255	1020	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	varchar(255)			select,insert,update,references			NULL
 def	performance_schema	replication_connection_configuration	PUBLIC_KEY_PATH	20	NULL	NO	varchar	512	2048	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	varchar(512)			select,insert,update,references			NULL
 def	performance_schema	replication_connection_configuration	GET_PUBLIC_KEY	21	NULL	NO	enum	3	12	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	enum('YES','NO')			select,insert,update,references			NULL
@@ -1080,6 +1080,7 @@
 def	performance_schema	replication_connection_configuration	ZSTD_COMPRESSION_LEVEL	24	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int			select,insert,update,references	Compression level associated with zstd compression algorithm.		NULL
 def	performance_schema	replication_connection_configuration	TLS_CIPHERSUITES	25	NULL	YES	text	65535	65535	NULL	NULL	NULL	utf8	utf8_bin	text			select,insert,update,references			NULL
 def	performance_schema	replication_connection_configuration	SOURCE_CONNECTION_AUTO_FAILOVER	26	NULL	NO	enum	1	4	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	enum('1','0')			select,insert,update,references			NULL
+def	performance_schema	replication_connection_configuration	GTID_ONLY	27	NULL	NO	enum	1	4	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	enum('1','0')			select,insert,update,references	Indicates if this channel only uses GTIDs and does not persist positions.		NULL
 def	performance_schema	replication_connection_status	CHANNEL_NAME	1	NULL	NO	char	64	256	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	char(64)	PRI		select,insert,update,references			NULL
 def	performance_schema	replication_connection_status	GROUP_NAME	2	NULL	NO	char	36	144	NULL	NULL	NULL	utf8mb4	utf8mb4_bin	char(36)			select,insert,update,references			NULL
 def	performance_schema	replication_connection_status	SOURCE_UUID	3	NULL	NO	char	36	144	NULL	NULL	NULL	utf8mb4	utf8mb4_bin	char(36)			select,insert,update,references			NULL
@@ -1107,6 +1108,7 @@
 def	performance_schema	replication_group_members	MEMBER_STATE	5	NULL	NO	char	64	256	NULL	NULL	NULL	utf8mb4	utf8mb4_bin	char(64)			select,insert,update,references			NULL
 def	performance_schema	replication_group_members	MEMBER_ROLE	6	NULL	NO	char	64	256	NULL	NULL	NULL	utf8mb4	utf8mb4_bin	char(64)			select,insert,update,references			NULL
 def	performance_schema	replication_group_members	MEMBER_VERSION	7	NULL	NO	char	64	256	NULL	NULL	NULL	utf8mb4	utf8mb4_bin	char(64)			select,insert,update,references			NULL
+def	performance_schema	replication_group_members	MEMBER_COMMUNICATION_STACK	8	NULL	NO	char	64	256	NULL	NULL	NULL	utf8mb4	utf8mb4_bin	char(64)			select,insert,update,references			NULL
 def	performance_schema	replication_group_member_stats	CHANNEL_NAME	1	NULL	NO	char	64	256	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	char(64)			select,insert,update,references			NULL
 def	performance_schema	replication_group_member_stats	VIEW_ID	2	NULL	NO	char	60	240	NULL	NULL	NULL	utf8mb4	utf8mb4_bin	char(60)			select,insert,update,references			NULL
 def	performance_schema	replication_group_member_stats	MEMBER_ID	3	NULL	NO	char	36	144	NULL	NULL	NULL	utf8mb4	utf8mb4_bin	char(36)			select,insert,update,references			NULL
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/all_tests.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/all_tests.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/all_tests.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/all_tests.test	2021-09-28 11:46:34.000000000 +0000
@@ -62,6 +62,7 @@
 
 # If this fails, the test listed in the output is missing from the test suite.
 # The way to fix the failure is to implement the missing test, not silence this select.
+--sorted_result
 select test_name as `MISSING DDL/DML TESTS` from t2;
 
 drop table t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/connection_type_notwin.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/connection_type_notwin.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/connection_type_notwin.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/connection_type_notwin.test	2021-09-28 11:46:34.000000000 +0000
@@ -84,6 +84,7 @@
 SET GLOBAL general_log_file=  @old_general_log_file;
 SET GLOBAL general_log=       @old_general_log;
 SET GLOBAL log_output=        @old_log_output;
+TRUNCATE TABLE mysql.general_log;
 
 --horizontal_results
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/connection_type_win.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/connection_type_win.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/connection_type_win.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/connection_type_win.test	2021-09-28 11:46:34.000000000 +0000
@@ -84,6 +84,7 @@
 SET GLOBAL general_log_file=  @old_general_log_file;
 SET GLOBAL general_log=       @old_general_log;
 SET GLOBAL log_output=        @old_log_output;
+TRUNCATE TABLE mysql.general_log;
 
 --horizontal_results
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_accounts.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_accounts.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_accounts.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_accounts.test	2021-09-28 11:46:34.000000000 +0000
@@ -18,3 +18,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `ACCOUNT`
   ON performance_schema.accounts;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.accounts;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_binary_log_transaction_compression_stats.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_binary_log_transaction_compression_stats.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_binary_log_transaction_compression_stats.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_binary_log_transaction_compression_stats.test	2021-09-28 11:46:34.000000000 +0000
@@ -23,3 +23,6 @@
 --error ER_DBACCESS_DENIED_ERROR
 --eval DROP INDEX `PRIMARY` ON $table
 
+--eval CREATE TABLE test.create_select AS SELECT * from $table;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_cond_instances.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_cond_instances.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_cond_instances.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_cond_instances.test	2021-09-28 11:46:34.000000000 +0000
@@ -15,3 +15,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.cond_instances;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.cond_instances;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_data_locks.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_data_locks.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_data_locks.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_data_locks.test	2021-09-28 11:46:34.000000000 +0000
@@ -12,3 +12,7 @@
 -- error ER_DBACCESS_DENIED_ERROR
 CREATE UNIQUE INDEX test_index ON performance_schema.data_locks(LOCK_DATA);
 
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.data_locks;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_data_lock_waits.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_data_lock_waits.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_data_lock_waits.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_data_lock_waits.test	2021-09-28 11:46:34.000000000 +0000
@@ -12,3 +12,7 @@
 -- error ER_DBACCESS_DENIED_ERROR
 CREATE UNIQUE INDEX test_index ON performance_schema.data_lock_waits(BLOCKING_THREAD_ID);
 
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.data_lock_waits;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_ees_by_account_by_error.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_ees_by_account_by_error.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_ees_by_account_by_error.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_ees_by_account_by_error.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,3 +17,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `ACCOUNT`
   ON performance_schema.events_errors_summary_by_account_by_error;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_errors_summary_by_account_by_error;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_ees_by_host_by_error.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_ees_by_host_by_error.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_ees_by_host_by_error.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_ees_by_host_by_error.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,3 +17,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `HOST`
   ON performance_schema.events_errors_summary_by_host_by_error;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_errors_summary_by_host_by_error;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_ees_by_thread_by_error.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_ees_by_thread_by_error.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_ees_by_thread_by_error.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_ees_by_thread_by_error.test	2021-09-28 11:46:34.000000000 +0000
@@ -16,3 +16,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `THREAD_ID`
   ON performance_schema.events_errors_summary_by_thread_by_error;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_errors_summary_by_thread_by_error;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_ees_by_user_by_error.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_ees_by_user_by_error.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_ees_by_user_by_error.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_ees_by_user_by_error.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,3 +17,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `USER`
   ON performance_schema.events_errors_summary_by_user_by_error;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_errors_summary_by_user_by_error;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_ees_global_by_error.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_ees_global_by_error.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_ees_global_by_error.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_ees_global_by_error.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,3 +17,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `ERROR_NUMBER`
   ON performance_schema.events_errors_summary_global_by_error;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_errors_summary_global_by_error;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_error_log.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_error_log.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_error_log.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_error_log.test	2021-09-28 11:46:34.000000000 +0000
@@ -10,6 +10,12 @@
 
 -- error ER_DBACCESS_DENIED_ERROR
 CREATE UNIQUE INDEX test_index ON performance_schema.error_log(KEY_ID);
+
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.error_log;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.error_log;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_esgs_by_account_by_event_name.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_esgs_by_account_by_event_name.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_esgs_by_account_by_event_name.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_esgs_by_account_by_event_name.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,3 +17,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `ACCOUNT`
   ON performance_schema.events_stages_summary_by_account_by_event_name;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_stages_summary_by_account_by_event_name;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_esgs_by_host_by_event_name.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_esgs_by_host_by_event_name.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_esgs_by_host_by_event_name.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_esgs_by_host_by_event_name.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,3 +17,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `HOST`
   ON performance_schema.events_stages_summary_by_host_by_event_name;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_stages_summary_by_host_by_event_name;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_esgs_by_thread_by_event_name.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_esgs_by_thread_by_event_name.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_esgs_by_thread_by_event_name.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_esgs_by_thread_by_event_name.test	2021-09-28 11:46:34.000000000 +0000
@@ -16,3 +16,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.events_stages_summary_by_thread_by_event_name;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_stages_summary_by_thread_by_event_name;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_esgs_by_user_by_event_name.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_esgs_by_user_by_event_name.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_esgs_by_user_by_event_name.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_esgs_by_user_by_event_name.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,3 +17,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `USER`
   ON performance_schema.events_stages_summary_by_user_by_event_name;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_stages_summary_by_user_by_event_name;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_esgs_global_by_event_name.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_esgs_global_by_event_name.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_esgs_global_by_event_name.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_esgs_global_by_event_name.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,3 +17,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.events_stages_summary_global_by_event_name;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_stages_summary_global_by_event_name;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_esmh_by_digest.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_esmh_by_digest.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_esmh_by_digest.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_esmh_by_digest.test	2021-09-28 11:46:34.000000000 +0000
@@ -16,3 +16,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `SCHEMA_NAME`
   ON performance_schema.events_statements_histogram_by_digest;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_statements_histogram_by_digest;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_esmh_global.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_esmh_global.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_esmh_global.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_esmh_global.test	2021-09-28 11:46:34.000000000 +0000
@@ -16,3 +16,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `SCHEMA_NAME`
   ON performance_schema.events_statements_histogram_global;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_statements_histogram_global;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_esms_by_account_by_event_name.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_esms_by_account_by_event_name.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_esms_by_account_by_event_name.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_esms_by_account_by_event_name.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,3 +17,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `ACCOUNT`
   ON performance_schema.events_statements_summary_by_account_by_event_name;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_statements_summary_by_account_by_event_name;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_esms_by_digest.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_esms_by_digest.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_esms_by_digest.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_esms_by_digest.test	2021-09-28 11:46:34.000000000 +0000
@@ -16,3 +16,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `SCHEMA_NAME`
   ON performance_schema.events_statements_summary_by_digest;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_statements_summary_by_digest;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_esms_by_host_by_event_name.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_esms_by_host_by_event_name.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_esms_by_host_by_event_name.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_esms_by_host_by_event_name.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,3 +17,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `HOST`
   ON performance_schema.events_statements_summary_by_host_by_event_name;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_statements_summary_by_host_by_event_name;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_esms_by_program.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_esms_by_program.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_esms_by_program.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_esms_by_program.test	2021-09-28 11:46:34.000000000 +0000
@@ -19,3 +19,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.events_statements_summary_by_program;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_statements_summary_by_program;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_esms_by_thread_by_event_name.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_esms_by_thread_by_event_name.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_esms_by_thread_by_event_name.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_esms_by_thread_by_event_name.test	2021-09-28 11:46:34.000000000 +0000
@@ -16,3 +16,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.events_statements_summary_by_thread_by_event_name;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_statements_summary_by_thread_by_event_name;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_esms_by_user_by_event_name.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_esms_by_user_by_event_name.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_esms_by_user_by_event_name.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_esms_by_user_by_event_name.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,3 +17,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `USER`
   ON performance_schema.events_statements_summary_by_user_by_event_name;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_statements_summary_by_user_by_event_name;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_esms_global_by_event_name.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_esms_global_by_event_name.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_esms_global_by_event_name.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_esms_global_by_event_name.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,3 +17,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.events_statements_summary_global_by_event_name;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_statements_summary_global_by_event_name;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_ets_by_account_by_event_name.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_ets_by_account_by_event_name.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_ets_by_account_by_event_name.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_ets_by_account_by_event_name.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,3 +17,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `ACCOUNT`
   ON performance_schema.events_transactions_summary_by_account_by_event_name;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_transactions_summary_by_account_by_event_name;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_ets_by_host_by_event_name.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_ets_by_host_by_event_name.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_ets_by_host_by_event_name.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_ets_by_host_by_event_name.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,3 +17,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `HOST`
   ON performance_schema.events_transactions_summary_by_host_by_event_name;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_transactions_summary_by_host_by_event_name;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_ets_by_thread_by_event_name.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_ets_by_thread_by_event_name.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_ets_by_thread_by_event_name.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_ets_by_thread_by_event_name.test	2021-09-28 11:46:34.000000000 +0000
@@ -16,3 +16,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.events_transactions_summary_by_thread_by_event_name;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_transactions_summary_by_thread_by_event_name;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_ets_by_user_by_event_name.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_ets_by_user_by_event_name.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_ets_by_user_by_event_name.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_ets_by_user_by_event_name.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,3 +17,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `USER`
   ON performance_schema.events_transactions_summary_by_user_by_event_name;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_transactions_summary_by_user_by_event_name;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_ets_global_by_event_name.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_ets_global_by_event_name.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_ets_global_by_event_name.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_ets_global_by_event_name.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,3 +17,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.events_transactions_summary_global_by_event_name;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_transactions_summary_global_by_event_name;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_events_stages_current.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_events_stages_current.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_events_stages_current.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_events_stages_current.test	2021-09-28 11:46:34.000000000 +0000
@@ -13,9 +13,15 @@
 
 --disable_query_log
 # Checking if the column WORK_COMPLETED and WORK_ESTIMATED exists
+--sorted_result
 select * from information_schema.columns where TABLE_NAME = 'events_stages_current' and column_name in ('WORK_COMPLETED','WORK_ESTIMATED')
 and table_schema='performance_schema';
 --enable_query_log
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.events_stages_current;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_stages_current;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_events_stages_history_long.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_events_stages_history_long.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_events_stages_history_long.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_events_stages_history_long.test	2021-09-28 11:46:34.000000000 +0000
@@ -13,6 +13,12 @@
 
 --disable_query_log
 # Checking if the column WORK_COMPLETED and WORK_ESTIMATED exists
+--sorted_result
 select * from information_schema.columns where TABLE_NAME ='events_stages_history_long' and column_name in ('WORK_COMPLETED','WORK_ESTIMATED')
 and table_schema='performance_schema';
 --enable_query_log
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_stages_history_long;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_events_stages_history.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_events_stages_history.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_events_stages_history.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_events_stages_history.test	2021-09-28 11:46:34.000000000 +0000
@@ -13,9 +13,15 @@
 
 --disable_query_log
 # Checking if the column WORK_COMPLETED and WORK_ESTIMATED exists
+--sorted_result
 select * from information_schema.columns where TABLE_NAME ='events_stages_history' and column_name in ('WORK_COMPLETED','WORK_ESTIMATED')
 and table_schema='performance_schema';
 --enable_query_log
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.events_stages_history;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_stages_history;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_events_statements_current.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_events_statements_current.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_events_statements_current.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_events_statements_current.test	2021-09-28 11:46:34.000000000 +0000
@@ -14,3 +14,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.events_statements_current;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_statements_current;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_events_statements_history_long.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_events_statements_history_long.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_events_statements_history_long.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_events_statements_history_long.test	2021-09-28 11:46:34.000000000 +0000
@@ -11,3 +11,7 @@
 -- error ER_DBACCESS_DENIED_ERROR
 CREATE UNIQUE INDEX test_index ON performance_schema.events_statements_history_long(EVENT_ID);
 
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_statements_history_long;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_events_statements_history.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_events_statements_history.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_events_statements_history.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_events_statements_history.test	2021-09-28 11:46:34.000000000 +0000
@@ -14,3 +14,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.events_statements_history;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_statements_history;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_events_transactions_current.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_events_transactions_current.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_events_transactions_current.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_events_transactions_current.test	2021-09-28 11:46:34.000000000 +0000
@@ -14,3 +14,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.events_transactions_current;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_transactions_current;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_events_transactions_history_long.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_events_transactions_history_long.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_events_transactions_history_long.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_events_transactions_history_long.test	2021-09-28 11:46:34.000000000 +0000
@@ -11,3 +11,7 @@
 -- error ER_DBACCESS_DENIED_ERROR
 CREATE UNIQUE INDEX test_index ON performance_schema.events_transactions_history_long(EVENT_ID);
 
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_transactions_history_long;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_events_transactions_history.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_events_transactions_history.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_events_transactions_history.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_events_transactions_history.test	2021-09-28 11:46:34.000000000 +0000
@@ -14,3 +14,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.events_transactions_history;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_transactions_history;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_events_waits_current.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_events_waits_current.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_events_waits_current.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_events_waits_current.test	2021-09-28 11:46:34.000000000 +0000
@@ -14,3 +14,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.events_waits_current;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_waits_current;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_events_waits_history_long.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_events_waits_history_long.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_events_waits_history_long.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_events_waits_history_long.test	2021-09-28 11:46:34.000000000 +0000
@@ -11,3 +11,7 @@
 -- error ER_DBACCESS_DENIED_ERROR
 CREATE UNIQUE INDEX test_index ON performance_schema.events_waits_history_long(EVENT_ID);
 
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_waits_history_long;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_events_waits_history.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_events_waits_history.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_events_waits_history.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_events_waits_history.test	2021-09-28 11:46:34.000000000 +0000
@@ -14,3 +14,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.events_waits_history;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_waits_history;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_ews_by_account_by_event_name.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_ews_by_account_by_event_name.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_ews_by_account_by_event_name.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_ews_by_account_by_event_name.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,3 +17,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `ACCOUNT`
   ON performance_schema.events_waits_summary_by_account_by_event_name;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_waits_summary_by_account_by_event_name;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_ews_by_host_by_event_name.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_ews_by_host_by_event_name.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_ews_by_host_by_event_name.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_ews_by_host_by_event_name.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,3 +17,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `HOST`
   ON performance_schema.events_waits_summary_by_host_by_event_name;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_waits_summary_by_host_by_event_name;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_ews_by_instance.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_ews_by_instance.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_ews_by_instance.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_ews_by_instance.test	2021-09-28 11:46:34.000000000 +0000
@@ -14,3 +14,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.events_waits_summary_by_instance;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_waits_summary_by_instance;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_ews_by_thread_by_event_name.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_ews_by_thread_by_event_name.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_ews_by_thread_by_event_name.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_ews_by_thread_by_event_name.test	2021-09-28 11:46:34.000000000 +0000
@@ -16,3 +16,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.events_waits_summary_by_thread_by_event_name;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_waits_summary_by_thread_by_event_name;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_ews_by_user_by_event_name.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_ews_by_user_by_event_name.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_ews_by_user_by_event_name.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_ews_by_user_by_event_name.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,3 +17,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `USER`
   ON performance_schema.events_waits_summary_by_user_by_event_name;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_waits_summary_by_user_by_event_name;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_ews_global_by_event_name.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_ews_global_by_event_name.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_ews_global_by_event_name.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_ews_global_by_event_name.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,3 +17,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.events_waits_summary_global_by_event_name;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.events_waits_summary_global_by_event_name;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_file_instances.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_file_instances.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_file_instances.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_file_instances.test	2021-09-28 11:46:34.000000000 +0000
@@ -15,3 +15,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.file_instances;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.file_instances;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_fs_by_event_name.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_fs_by_event_name.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_fs_by_event_name.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_fs_by_event_name.test	2021-09-28 11:46:34.000000000 +0000
@@ -14,3 +14,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.file_summary_by_event_name;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.file_summary_by_event_name;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_fs_by_instance.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_fs_by_instance.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_fs_by_instance.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_fs_by_instance.test	2021-09-28 11:46:34.000000000 +0000
@@ -14,3 +14,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.file_summary_by_instance;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.file_summary_by_instance;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_global_status.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_global_status.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_global_status.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_global_status.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,3 +17,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.global_status;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.global_status;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_global_variables.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_global_variables.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_global_variables.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_global_variables.test	2021-09-28 11:46:34.000000000 +0000
@@ -18,3 +18,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.global_variables;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.global_variables;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_host_cache.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_host_cache.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_host_cache.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_host_cache.test	2021-09-28 11:46:34.000000000 +0000
@@ -14,3 +14,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.host_cache;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.host_cache;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_hosts.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_hosts.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_hosts.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_hosts.test	2021-09-28 11:46:34.000000000 +0000
@@ -15,3 +15,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `HOST`
   ON performance_schema.hosts;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.hosts;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_keyring_component_status.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_keyring_component_status.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_keyring_component_status.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_keyring_component_status.test	2021-09-28 11:46:34.000000000 +0000
@@ -10,6 +10,14 @@
 
 -- error ER_DBACCESS_DENIED_ERROR
 CREATE UNIQUE INDEX test_index ON performance_schema.keyring_component_status(KEY_ID);
+
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.keyring_component_status;
+
+call mtr.add_suppression("No suitable 'keyring_component_metadata_query' service implementation found to fulfill the request");
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.keyring_component_status;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_keyring_keys.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_keyring_keys.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_keyring_keys.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_keyring_keys.test	2021-09-28 11:46:34.000000000 +0000
@@ -10,6 +10,12 @@
 
 -- error ER_DBACCESS_DENIED_ERROR
 CREATE UNIQUE INDEX test_index ON performance_schema.keyring_keys(KEY_ID);
+
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.keyring_keys;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.keyring_keys;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_log_status.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_log_status.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_log_status.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_log_status.test	2021-09-28 11:46:34.000000000 +0000
@@ -24,3 +24,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 CREATE UNIQUE INDEX test_index ON
   performance_schema.log_status(server_uuid);
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.log_status;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_mems_by_account_by_event_name.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_mems_by_account_by_event_name.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_mems_by_account_by_event_name.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_mems_by_account_by_event_name.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,3 +17,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `ACCOUNT`
   ON performance_schema.memory_summary_by_account_by_event_name;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.memory_summary_by_account_by_event_name;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_mems_by_host_by_event_name.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_mems_by_host_by_event_name.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_mems_by_host_by_event_name.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_mems_by_host_by_event_name.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,3 +17,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `HOST`
   ON performance_schema.memory_summary_by_host_by_event_name;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.memory_summary_by_host_by_event_name;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_mems_by_thread_by_event_name.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_mems_by_thread_by_event_name.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_mems_by_thread_by_event_name.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_mems_by_thread_by_event_name.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,3 +17,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.memory_summary_by_thread_by_event_name;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.memory_summary_by_thread_by_event_name;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_mems_by_user_by_event_name.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_mems_by_user_by_event_name.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_mems_by_user_by_event_name.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_mems_by_user_by_event_name.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,3 +17,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `USER`
   ON performance_schema.memory_summary_by_user_by_event_name;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.memory_summary_by_user_by_event_name;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_mems_global_by_event_name.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_mems_global_by_event_name.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_mems_global_by_event_name.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_mems_global_by_event_name.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,3 +17,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.memory_summary_global_by_event_name;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.memory_summary_global_by_event_name;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_metadata_locks.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_metadata_locks.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_metadata_locks.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_metadata_locks.test	2021-09-28 11:46:34.000000000 +0000
@@ -15,3 +15,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.metadata_locks;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.metadata_locks;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_mutex_instances.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_mutex_instances.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_mutex_instances.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_mutex_instances.test	2021-09-28 11:46:34.000000000 +0000
@@ -15,3 +15,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.mutex_instances;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.mutex_instances;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_os_global_by_type.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_os_global_by_type.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_os_global_by_type.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_os_global_by_type.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,3 +17,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `OBJECT`
   ON performance_schema.objects_summary_global_by_type;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.objects_summary_global_by_type;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_performance_timers.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_performance_timers.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_performance_timers.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_performance_timers.test	2021-09-28 11:46:34.000000000 +0000
@@ -12,3 +12,7 @@
 -- error ER_DBACCESS_DENIED_ERROR
 CREATE UNIQUE INDEX test_index ON performance_schema.performance_timers(TIMER_NAME);
 
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.performance_timers;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_persisted_variables.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_persisted_variables.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_persisted_variables.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_persisted_variables.test	2021-09-28 11:46:34.000000000 +0000
@@ -14,3 +14,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 CREATE UNIQUE INDEX test_index
   ON performance_schema.persisted_variables(VARIABLE_NAME);
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.persisted_variables;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_prepared_statements_instances.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_prepared_statements_instances.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_prepared_statements_instances.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_prepared_statements_instances.test	2021-09-28 11:46:34.000000000 +0000
@@ -19,3 +19,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.prepared_statements_instances;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.prepared_statements_instances;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_processlist.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_processlist.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_processlist.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_processlist.test	2021-09-28 11:46:34.000000000 +0000
@@ -22,4 +22,9 @@
 drop index `PRIMARY`
   on performance_schema.processlist;
 
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.processlist;
+
+DROP TABLE test.create_select;
+
 set @@global.performance_schema_show_processlist = @save_processlist;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_replication_applier_configuration.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_replication_applier_configuration.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_replication_applier_configuration.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_replication_applier_configuration.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,6 +17,12 @@
 -- error ER_DBACCESS_DENIED_ERROR
 CREATE UNIQUE INDEX test_index ON
   performance_schema.replication_applier_configuration(desired_delay);
+
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.replication_applier_configuration;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.replication_applier_configuration;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_replication_applier_filters.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_replication_applier_filters.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_replication_applier_filters.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_replication_applier_filters.test	2021-09-28 11:46:34.000000000 +0000
@@ -24,3 +24,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 CREATE UNIQUE INDEX test_index ON
   performance_schema.replication_applier_filters(filter_name);
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.replication_applier_filters;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_replication_applier_global_filters.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_replication_applier_global_filters.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_replication_applier_global_filters.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_replication_applier_global_filters.test	2021-09-28 11:46:34.000000000 +0000
@@ -23,4 +23,9 @@
 
 -- error ER_DBACCESS_DENIED_ERROR
 CREATE UNIQUE INDEX test_index ON
-  performance_schema.replication_global_applier_filters(filter_name);
+  performance_schema.replication_applier_global_filters(filter_name);
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.replication_applier_global_filters;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_replication_applier_status_by_coordinator.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_replication_applier_status_by_coordinator.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_replication_applier_status_by_coordinator.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_replication_applier_status_by_coordinator.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,6 +17,12 @@
 -- error ER_DBACCESS_DENIED_ERROR
 CREATE UNIQUE INDEX test_index ON
   performance_schema.replication_applier_status_by_coordinator(thread_id);
+
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.replication_applier_status_by_coordinator;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.replication_applier_status_by_coordinator;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_replication_applier_status_by_worker.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_replication_applier_status_by_worker.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_replication_applier_status_by_worker.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_replication_applier_status_by_worker.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,6 +17,12 @@
 -- error ER_DBACCESS_DENIED_ERROR
 CREATE UNIQUE INDEX test_index ON
   performance_schema.replication_applier_status_by_worker(worker_id);
+
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.replication_applier_status_by_worker;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.replication_applier_status_by_worker;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_replication_applier_status.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_replication_applier_status.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_replication_applier_status.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_replication_applier_status.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,6 +17,12 @@
 -- error ER_DBACCESS_DENIED_ERROR
 CREATE UNIQUE INDEX test_index ON
   performance_schema.replication_applier_status(remaining_delay);
+
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.replication_applier_status;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.replication_applier_status;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_replication_connection_configuration.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_replication_connection_configuration.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_replication_connection_configuration.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_replication_connection_configuration.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,6 +17,12 @@
 -- error ER_DBACCESS_DENIED_ERROR
 CREATE UNIQUE INDEX test_index
   ON performance_schema.replication_connection_configuration(HOST);
+
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.replication_connection_configuration;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.replication_connection_configuration;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_replication_connection_status.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_replication_connection_status.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_replication_connection_status.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_replication_connection_status.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,6 +17,12 @@
 -- error ER_DBACCESS_DENIED_ERROR
 CREATE UNIQUE INDEX test_index
   ON performance_schema.replication_connection_status(Thread_Id);
+
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.replication_connection_status;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.replication_connection_status;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_replication_group_member_stats.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_replication_group_member_stats.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_replication_group_member_stats.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_replication_group_member_stats.test	2021-09-28 11:46:34.000000000 +0000
@@ -16,6 +16,12 @@
 --error ER_DBACCESS_DENIED_ERROR
 CREATE UNIQUE INDEX test_index
   ON performance_schema.replication_group_member_stats(Member_Id);
+
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.replication_group_member_stats;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.replication_group_member_stats;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_replication_group_members.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_replication_group_members.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_replication_group_members.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_replication_group_members.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,6 +17,12 @@
 --error ER_DBACCESS_DENIED_ERROR
 CREATE UNIQUE INDEX test_index
   ON performance_schema.replication_group_members(Member_Id);
+
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.replication_group_members;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.replication_group_members;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_rwlock_instances.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_rwlock_instances.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_rwlock_instances.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_rwlock_instances.test	2021-09-28 11:46:34.000000000 +0000
@@ -15,3 +15,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.rwlock_instances;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.rwlock_instances;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_session_account_connect_attrs.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_session_account_connect_attrs.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_session_account_connect_attrs.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_session_account_connect_attrs.test	2021-09-28 11:46:34.000000000 +0000
@@ -10,6 +10,12 @@
 
 -- error ER_DBACCESS_DENIED_ERROR
 CREATE UNIQUE INDEX test_index ON performance_schema.session_account_connect_attrs(ATTR_NAME);
+
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.session_account_connect_attrs;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.session_account_connect_attrs;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_session_connect_attrs.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_session_connect_attrs.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_session_connect_attrs.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_session_connect_attrs.test	2021-09-28 11:46:34.000000000 +0000
@@ -10,6 +10,12 @@
 
 -- error ER_DBACCESS_DENIED_ERROR
 CREATE UNIQUE INDEX test_index ON performance_schema.session_connect_attrs(ATTR_NAME);
+
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.session_connect_attrs;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.session_connect_attrs;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_session_status.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_session_status.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_session_status.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_session_status.test	2021-09-28 11:46:34.000000000 +0000
@@ -18,3 +18,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.session_status;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.session_status;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_session_variables.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_session_variables.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_session_variables.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_session_variables.test	2021-09-28 11:46:34.000000000 +0000
@@ -18,3 +18,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.session_variables;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.session_variables;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_setup_actors.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_setup_actors.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_setup_actors.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_setup_actors.test	2021-09-28 11:46:34.000000000 +0000
@@ -30,3 +30,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.setup_actors;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.setup_actors;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_setup_consumers.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_setup_consumers.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_setup_consumers.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_setup_consumers.test	2021-09-28 11:46:34.000000000 +0000
@@ -15,3 +15,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.setup_consumers;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.setup_consumers;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_setup_instruments.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_setup_instruments.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_setup_instruments.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_setup_instruments.test	2021-09-28 11:46:34.000000000 +0000
@@ -15,3 +15,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.setup_instruments;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.setup_instruments;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_setup_objects.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_setup_objects.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_setup_objects.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_setup_objects.test	2021-09-28 11:46:34.000000000 +0000
@@ -27,3 +27,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `OBJECT`
   ON performance_schema.setup_objects;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.setup_objects;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_setup_threads.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_setup_threads.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_setup_threads.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_setup_threads.test	2021-09-28 11:46:34.000000000 +0000
@@ -14,3 +14,8 @@
 
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY` ON performance_schema.setup_threads;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.setup_threads;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_socket_instances.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_socket_instances.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_socket_instances.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_socket_instances.test	2021-09-28 11:46:34.000000000 +0000
@@ -15,3 +15,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.socket_instances;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.socket_instances;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_socket_summary_by_event_name.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_socket_summary_by_event_name.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_socket_summary_by_event_name.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_socket_summary_by_event_name.test	2021-09-28 11:46:34.000000000 +0000
@@ -14,3 +14,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.socket_summary_by_event_name;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.socket_summary_by_event_name;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_socket_summary_by_instance.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_socket_summary_by_instance.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_socket_summary_by_instance.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_socket_summary_by_instance.test	2021-09-28 11:46:34.000000000 +0000
@@ -14,3 +14,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.socket_summary_by_instance;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.socket_summary_by_instance;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_status_by_account.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_status_by_account.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_status_by_account.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_status_by_account.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,3 +17,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `ACCOUNT`
   ON performance_schema.status_by_account;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.status_by_account;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_status_by_host.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_status_by_host.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_status_by_host.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_status_by_host.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,3 +17,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `HOST`
   ON performance_schema.status_by_host;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.status_by_host;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_status_by_thread.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_status_by_thread.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_status_by_thread.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_status_by_thread.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,3 +17,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.status_by_thread;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.status_by_thread;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_status_by_user.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_status_by_user.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_status_by_user.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_status_by_user.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,3 +17,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `USER`
   ON performance_schema.status_by_user;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.status_by_user;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_table_handles.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_table_handles.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_table_handles.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_table_handles.test	2021-09-28 11:46:34.000000000 +0000
@@ -15,3 +15,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.table_handles;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.table_handles;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_threads.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_threads.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_threads.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_threads.test	2021-09-28 11:46:34.000000000 +0000
@@ -15,3 +15,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.threads;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.threads;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_tiws_by_index_usage.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_tiws_by_index_usage.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_tiws_by_index_usage.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_tiws_by_index_usage.test	2021-09-28 11:46:34.000000000 +0000
@@ -15,3 +15,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `OBJECT`
   ON performance_schema.table_io_waits_summary_by_index_usage;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.table_io_waits_summary_by_index_usage;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_tiws_by_table.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_tiws_by_table.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_tiws_by_table.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_tiws_by_table.test	2021-09-28 11:46:34.000000000 +0000
@@ -15,3 +15,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `OBJECT`
   ON performance_schema.table_io_waits_summary_by_table;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.table_io_waits_summary_by_table;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_tls_channel_status.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_tls_channel_status.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_tls_channel_status.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_tls_channel_status.test	2021-09-28 11:46:34.000000000 +0000
@@ -10,6 +10,12 @@
 
 -- error ER_DBACCESS_DENIED_ERROR
 CREATE UNIQUE INDEX test_index ON performance_schema.tls_channel_status(KEY_ID);
+
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.tls_channel_status;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.tls_channel_status;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_tlws_by_table.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_tlws_by_table.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_tlws_by_table.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_tlws_by_table.test	2021-09-28 11:46:34.000000000 +0000
@@ -15,3 +15,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `OBJECT`
   ON performance_schema.table_lock_waits_summary_by_table;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.table_lock_waits_summary_by_table;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_user_defined_functions.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_user_defined_functions.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_user_defined_functions.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_user_defined_functions.test	2021-09-28 11:46:34.000000000 +0000
@@ -18,3 +18,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.user_defined_functions;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.user_defined_functions;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_users.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_users.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_users.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_users.test	2021-09-28 11:46:34.000000000 +0000
@@ -15,3 +15,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `USER`
   ON performance_schema.users;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.users;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_uvar_by_thread.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_uvar_by_thread.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_uvar_by_thread.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_uvar_by_thread.test	2021-09-28 11:46:34.000000000 +0000
@@ -18,3 +18,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.user_variables_by_thread;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.user_variables_by_thread;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_variables_by_thread.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_variables_by_thread.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_variables_by_thread.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_variables_by_thread.test	2021-09-28 11:46:34.000000000 +0000
@@ -18,3 +18,8 @@
 -- error ER_DBACCESS_DENIED_ERROR
 DROP INDEX `PRIMARY`
   ON performance_schema.variables_by_thread;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.variables_by_thread;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_variables_info.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_variables_info.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ddl_variables_info.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ddl_variables_info.test	2021-09-28 11:46:34.000000000 +0000
@@ -15,3 +15,7 @@
 CREATE UNIQUE INDEX test_index
   ON performance_schema.variables_info(VARIABLE_NAME);
 
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.variables_info;
+
+DROP TABLE test.create_select;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/dd_version_check.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/dd_version_check.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/dd_version_check.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/dd_version_check.test	2021-09-28 11:46:34.000000000 +0000
@@ -97,6 +97,10 @@
  values("MySQL 8.0.24",
         "2db5b001fae56232df1c5fab4be6bbf10d47873a6ad55f36ad9d9be20632e973");
 
+insert into test.pfs_published_schema
+ values("MySQL 8.0.27",
+        "b229e37b78fcb1a522fb01991615e092888071981515ceca629030d7c9ae66c4");
+
 create table test.pfs_check_table
   (id int NOT NULL AUTO_INCREMENT,
    t text NOT NULL,
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/digest_view.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/digest_view.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/digest_view.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/digest_view.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,84 @@
+# ----------------------------------------------------
+# Tests for the performance schema statement Digests.
+# ----------------------------------------------------
+
+# Test case to show behavior of statements digest when
+# using a view
+
+# Test requires: sp-protocol/ps-protocol/view-protocol/cursor-protocol disabled
+--source include/no_protocol.inc
+
+CREATE TABLE test.v1 (a int, b int);
+INSERT INTO test.v1 VALUES (1, 100), (2, 200), (3, 300);
+
+CREATE TABLE test.t1 (a int, b int);
+INSERT INTO test.t1 VALUES (1, 100), (2, 200), (3, 300);
+
+ANALYZE TABLE v1, t1;
+
+TRUNCATE TABLE performance_schema.events_statements_summary_by_digest;
+
+#
+# test.v1 is a table.
+# Every query here is different, and should have a different digest.
+#
+
+# The hypergraph optimizer skips EXPLAIN with the traditional format.
+# Disable warnings so that the count of SHOW WARNINGS in
+# performance_schema.events_statements_summary_by_digest is the same
+# regardless of optimizer used.
+--disable_warnings
+EXPLAIN SELECT * from test.v1;
+EXPLAIN SELECT * from test.v1 where a = 1;
+EXPLAIN SELECT * from test.v1 where b > 100;
+EXPLAIN SELECT a, b from test.v1;
+EXPLAIN SELECT b, a from test.v1;
+--enable_warnings
+
+SELECT * from test.v1;
+SELECT * from test.v1 where a = 1;
+SELECT * from test.v1 where b > 100;
+SELECT a, b from test.v1;
+SELECT b, a from test.v1;
+
+--echo #
+--echo # DIGESTS SEEN ON TABLE
+--echo #
+
+SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR, QUERY_SAMPLE_TEXT
+  FROM performance_schema.events_statements_summary_by_digest
+  ORDER BY DIGEST_TEXT;
+
+DROP TABLE test.v1;
+CREATE VIEW test.v1 AS SELECT * FROM test.t1;
+
+#
+# test.v1 is now a view.
+# the query digests should be unchanged.
+#
+
+--disable_warnings
+EXPLAIN SELECT * from test.v1;
+EXPLAIN SELECT * from test.v1 where a = 1;
+EXPLAIN SELECT * from test.v1 where b > 100;
+EXPLAIN SELECT a, b from test.v1;
+EXPLAIN SELECT b, a from test.v1;
+--enable_warnings
+
+SELECT * from test.v1;
+SELECT * from test.v1 where a = 1;
+SELECT * from test.v1 where b > 100;
+SELECT a, b from test.v1;
+SELECT b, a from test.v1;
+
+--echo #
+--echo # DIGESTS SEEN ON VIEW
+--echo #
+
+SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR, QUERY_SAMPLE_TEXT
+  FROM performance_schema.events_statements_summary_by_digest
+  ORDER BY DIGEST_TEXT;
+
+DROP VIEW test.v1;
+DROP TABLE test.t1;
+
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/information_schema.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/information_schema.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/information_schema.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/information_schema.test	2021-09-28 11:46:34.000000000 +0000
@@ -6,14 +6,17 @@
 # and in lowercase in others.
 # Using lower(TABLE_NAME) to have consistent results.
 
+--sorted_result
 select TABLE_SCHEMA, lower(TABLE_NAME), TABLE_CATALOG
   from information_schema.tables
   where TABLE_SCHEMA='performance_schema';
 
+--sorted_result
 select lower(TABLE_NAME), TABLE_TYPE, ENGINE
   from information_schema.tables
   where TABLE_SCHEMA='performance_schema';
 
+--sorted_result
 select lower(TABLE_NAME), VERSION, ROW_FORMAT
   from information_schema.tables
   where TABLE_SCHEMA='performance_schema';
@@ -22,39 +25,47 @@
 # depends upon which plugins are loaded at the time of the query.
 #
 # TABLE_ROWS is unpredictable with autoscaling buffers
+--sorted_result
 select lower(TABLE_NAME), AVG_ROW_LENGTH
   from information_schema.tables
   where TABLE_SCHEMA='performance_schema' and
   lower(TABLE_NAME) not regexp '^variables|variables$|^status|session_status|global_status';
 
+--sorted_result
 --replace_column 2 table_rows 3 avg_row_len
 select lower(TABLE_NAME), TABLE_ROWS, AVG_ROW_LENGTH
   from information_schema.tables
   where TABLE_SCHEMA='performance_schema' and
   lower(TABLE_NAME) regexp '^variables|variables$|^status|session_status|global_status';
 
+--sorted_result
 select lower(TABLE_NAME), DATA_LENGTH, MAX_DATA_LENGTH
   from information_schema.tables
   where TABLE_SCHEMA='performance_schema';
 
+--sorted_result
 select lower(TABLE_NAME), INDEX_LENGTH, DATA_FREE, AUTO_INCREMENT
   from information_schema.tables
   where TABLE_SCHEMA='performance_schema';
 
+--sorted_result
 --replace_column 2 NULL
 select lower(TABLE_NAME), CREATE_TIME, UPDATE_TIME, CHECK_TIME
   from information_schema.tables
   where TABLE_SCHEMA='performance_schema';
 
+--sorted_result
 select lower(TABLE_NAME), TABLE_COLLATION, CHECKSUM
   from information_schema.tables
   where TABLE_SCHEMA='performance_schema';
 
 # TABLESPACE_NAME does not exist in 5.4
+--sorted_result
 select lower(TABLE_NAME), CREATE_OPTIONS
   from information_schema.tables
   where TABLE_SCHEMA='performance_schema';
 
+--sorted_result
 select lower(TABLE_NAME), TABLE_COMMENT
   from information_schema.tables
   where TABLE_SCHEMA='performance_schema';
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/max_program_zero-master.opt mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/max_program_zero-master.opt
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/max_program_zero-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/max_program_zero-master.opt	2021-09-28 11:46:34.000000000 +0000
@@ -1,3 +1,2 @@
 --loose-performance_schema_max_program_instances=0
 --loose-performance_schema_max_statement_stack=1
---thread_stack=655360
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ortho_iter.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ortho_iter.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/ortho_iter.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/ortho_iter.test	2021-09-28 11:46:34.000000000 +0000
@@ -52,7 +52,8 @@
   declare pfs_cursor CURSOR FOR
     select table_name from information_schema.tables
       where table_schema= 'performance_schema'
-      and table_name like "%_by_event_name%";
+      and table_name like "%_by_event_name%"
+      order by table_name;
 
   declare continue handler for sqlstate '02000'
     set done = 1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/rpl_statements-slave.opt mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/rpl_statements-slave.opt
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/rpl_statements-slave.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/rpl_statements-slave.opt	2021-09-28 11:46:34.000000000 +0000
@@ -1 +1,2 @@
 --binlog-format=mixed
+--replica-parallel-workers=0
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/start_server_low_digest_sql_length-master.opt mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/start_server_low_digest_sql_length-master.opt
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/start_server_low_digest_sql_length-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/start_server_low_digest_sql_length-master.opt	2021-09-28 11:46:34.000000000 +0000
@@ -1,3 +1,2 @@
---thread_stack=655360
 --max_digest_length=10
 --loose-performance_schema_max_sql_text_length=10
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/start_server_zero_digest_sql_length-master.opt mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/start_server_zero_digest_sql_length-master.opt
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/start_server_zero_digest_sql_length-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/start_server_zero_digest_sql_length-master.opt	2021-09-28 11:46:34.000000000 +0000
@@ -1,3 +1,2 @@
---thread_stack=655360
 --max_digest_length=0
 --loose-performance_schema_max_sql_text_length=0
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/statement_digest_long_query-master.opt mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/statement_digest_long_query-master.opt
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/statement_digest_long_query-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/statement_digest_long_query-master.opt	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
---thread_stack=655360
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/statement_program_concurrency-master.opt mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/statement_program_concurrency-master.opt
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/statement_program_concurrency-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/statement_program_concurrency-master.opt	2021-09-28 11:46:34.000000000 +0000
@@ -1 +1 @@
---innodb_lock_wait_timeout=1 --thread_stack=655360
+--innodb_lock_wait_timeout=1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/statement_program_lost_inst-master.opt mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/statement_program_lost_inst-master.opt
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/statement_program_lost_inst-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/statement_program_lost_inst-master.opt	2021-09-28 11:46:34.000000000 +0000
@@ -1,3 +1,2 @@
 --loose-performance_schema_max_program_instances=7
 --loose-performance_schema_max_statement_stack=2
---thread_stack=655360
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/statement_program_lost_inst.test mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/statement_program_lost_inst.test
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/statement_program_lost_inst.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/statement_program_lost_inst.test	2021-09-28 11:46:34.000000000 +0000
@@ -15,6 +15,11 @@
 # These additional stored programs which will be added might cause 
 # result content mismatch failure. 
 
+# clang/UBSAN needs to override the small thread stack in our -master.opt
+--disable_query_log
+call mtr.add_suppression("option 'thread_stack':");
+--enable_query_log
+
 let $restart_file= $MYSQLTEST_VARDIR/tmp/mysqld.1.expect;
 --exec echo "wait" > $restart_file
 --shutdown_server 
@@ -66,4 +71,7 @@
 --echo ##################### 
 --source suite/perfschema/include/program_nested_cleanup.inc 
 
+--echo # Restore default settings
+--let $restart_parameters = restart:
+--source include/restart_mysqld.inc
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/statement_program_nested-master.opt mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/statement_program_nested-master.opt
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/statement_program_nested-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/statement_program_nested-master.opt	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
---thread_stack=655360
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/statement_program_nesting_event_check-master.opt mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/statement_program_nesting_event_check-master.opt
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/statement_program_nesting_event_check-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/statement_program_nesting_event_check-master.opt	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
---thread_stack=655360
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/statement_program_non_nested-master.opt mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/statement_program_non_nested-master.opt
--- mysql-8.0-8.0.26/mysql-test/suite/perfschema/t/statement_program_non_nested-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/perfschema/t/statement_program_non_nested-master.opt	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
---thread_stack=655360
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/query_rewrite_plugins/include/basic.inc mysql-8.0-8.0.27/mysql-test/suite/query_rewrite_plugins/include/basic.inc
--- mysql-8.0-8.0.26/mysql-test/suite/query_rewrite_plugins/include/basic.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/query_rewrite_plugins/include/basic.inc	2021-09-28 11:46:34.000000000 +0000
@@ -40,8 +40,10 @@
        ( 'SELECT * FROM test.t1 WHERE a = ? OR b = ?',
          'SELECT * FROM test.t1 WHERE b = ? OR a = ?' );
 
+--sorted_result
 SELECT * FROM query_rewrite.rewrite_rules;
 CALL query_rewrite.flush_rewrite_rules();
+--sorted_result
 SELECT * FROM query_rewrite.rewrite_rules;
 
 --echo # Check a query that doesn't have a rewrite rule doesn't get rewritten.
@@ -96,8 +98,10 @@
        ( 'SELECT 2, ?', 'SELECT "rewritten w/rule 2"' ),
        ( 'SELECT "The_original_query"', 'SELECT "The_rewritten_query"');
 
+--sorted_result
 SELECT * FROM query_rewrite.rewrite_rules;
 CALL query_rewrite.flush_rewrite_rules();
+--sorted_result
 SELECT * FROM query_rewrite.rewrite_rules;
 
 SELECT 1, 1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/query_rewrite_plugins/include/restore_general_log.inc mysql-8.0-8.0.27/mysql-test/suite/query_rewrite_plugins/include/restore_general_log.inc
--- mysql-8.0-8.0.26/mysql-test/suite/query_rewrite_plugins/include/restore_general_log.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/query_rewrite_plugins/include/restore_general_log.inc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,4 @@
+SET @@global.log_output = @old_log_output;
+SET @@global.general_log = @old_general_log;
+SET @@global.general_log_file = @old_general_log_file;
+TRUNCATE TABLE mysql.general_log;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/query_rewrite_plugins/r/logging_general_raw.result mysql-8.0-8.0.27/mysql-test/suite/query_rewrite_plugins/r/logging_general_raw.result
--- mysql-8.0-8.0.26/mysql-test/suite/query_rewrite_plugins/r/logging_general_raw.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/query_rewrite_plugins/r/logging_general_raw.result	2021-09-28 11:46:34.000000000 +0000
@@ -33,3 +33,7 @@
 Warnings:
 Warning	1620	Plugin is busy and will be uninstalled on shutdown
 # Query rewrite plugin was queued for uninstalling.
+SET @@global.log_output = @old_log_output;
+SET @@global.general_log = @old_general_log;
+SET @@global.general_log_file = @old_general_log_file;
+TRUNCATE TABLE mysql.general_log;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/query_rewrite_plugins/r/logging_general.result mysql-8.0-8.0.27/mysql-test/suite/query_rewrite_plugins/r/logging_general.result
--- mysql-8.0-8.0.26/mysql-test/suite/query_rewrite_plugins/r/logging_general.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/query_rewrite_plugins/r/logging_general.result	2021-09-28 11:46:34.000000000 +0000
@@ -33,3 +33,7 @@
 Warnings:
 Warning	1620	Plugin is busy and will be uninstalled on shutdown
 # Query rewrite plugin was queued for uninstalling.
+SET @@global.log_output = @old_log_output;
+SET @@global.general_log = @old_general_log;
+SET @@global.general_log_file = @old_general_log_file;
+TRUNCATE TABLE mysql.general_log;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/query_rewrite_plugins/t/engines.test mysql-8.0-8.0.27/mysql-test/suite/query_rewrite_plugins/t/engines.test
--- mysql-8.0-8.0.26/mysql-test/suite/query_rewrite_plugins/t/engines.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/query_rewrite_plugins/t/engines.test	2021-09-28 11:46:34.000000000 +0000
@@ -2,16 +2,6 @@
 --echo # Tests that it works to have the rules table in different engines.
 --echo #
 
-# The test fails with log-bin enabled and binlog_format=ROW due to Bug#22654105.
-# Temporarily, overriding binlog_format to MIXED when log_bin is ON.
-if (`SELECT @@global.log_bin AND @@global.binlog_format = 'ROW'`)
-{
-  --disable_query_log
-  SET @saved_binlog_format= @@SESSION.binlog_format;
-  SET SESSION binlog_format= MIXED;
-  --enable_query_log
-}
-
 --source suite/query_rewrite_plugins/include/have_plugin_rewriter.inc
 --source suite/query_rewrite_plugins/include/install_rewriter_with_optional_columns.inc
 
@@ -29,10 +19,3 @@
 --source suite/query_rewrite_plugins/include/basic.inc
 
 --source suite/query_rewrite_plugins/include/uninstall_rewriter.inc
-
-if (`SELECT @@global.log_bin AND @@global.binlog_format = 'ROW'`)
-{
-  --disable_query_log
-  SET SESSION binlog_format= @saved_binlog_format;
-  --enable_query_log
-}
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/query_rewrite_plugins/t/logging_general_raw.test mysql-8.0-8.0.27/mysql-test/suite/query_rewrite_plugins/t/logging_general_raw.test
--- mysql-8.0-8.0.26/mysql-test/suite/query_rewrite_plugins/t/logging_general_raw.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/query_rewrite_plugins/t/logging_general_raw.test	2021-09-28 11:46:34.000000000 +0000
@@ -21,3 +21,5 @@
 
 --source suite/query_rewrite_plugins/include/uninstall_rewriter.inc
 --remove_file $MYSQLTEST_VARDIR/log/rewrite_general.log
+
+--source suite/query_rewrite_plugins/include/restore_general_log.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/query_rewrite_plugins/t/logging_general.test mysql-8.0-8.0.27/mysql-test/suite/query_rewrite_plugins/t/logging_general.test
--- mysql-8.0-8.0.26/mysql-test/suite/query_rewrite_plugins/t/logging_general.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/query_rewrite_plugins/t/logging_general.test	2021-09-28 11:46:34.000000000 +0000
@@ -19,3 +19,5 @@
 
 --source suite/query_rewrite_plugins/include/uninstall_rewriter.inc
 --remove_file $MYSQLTEST_VARDIR/log/rewrite_general.log
+
+--source suite/query_rewrite_plugins/include/restore_general_log.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_binlog_transaction_dependency_tracking_with_filters.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_binlog_transaction_dependency_tracking_with_filters.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_binlog_transaction_dependency_tracking_with_filters.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_binlog_transaction_dependency_tracking_with_filters.result	2021-09-28 11:46:34.000000000 +0000
@@ -12,6 +12,8 @@
 REPLICATE_IGNORE_DB=(nodb);
 include/start_slave.inc
 SET @save_binlog_transaction_dependency_tracking = @@GLOBAL.binlog_transaction_dependency_tracking;
+SET @save_replica_parallel_workers = @@GLOBAL.replica_parallel_workers;
+SET GLOBAL replica_parallel_workers = 0;
 SET GLOBAL binlog_transaction_dependency_tracking = COMMIT_ORDER;
 [connection master]
 #
@@ -99,6 +101,7 @@
 [On Slave]
 SET GLOBAL binlog_transaction_dependency_tracking = COMMIT_ORDER;
 SET @@GLOBAL.binlog_transaction_dependency_tracking= @save_binlog_transaction_dependency_tracking;
+SET @@GLOBAL.replica_parallel_workers = @save_replica_parallel_workers;
 include/stop_slave.inc
 CHANGE REPLICATION FILTER REPLICATE_REWRITE_DB=(), REPLICATE_IGNORE_DB=();
 include/start_slave.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_bug26395.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_bug26395.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_bug26395.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_bug26395.result	2021-09-28 11:46:34.000000000 +0000
@@ -12,7 +12,7 @@
   `a` int DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 set @old_debug= @@debug;
-set @@debug= 'd,do_not_write_xid';
+set @@debug= '+d,do_not_write_xid';
 ==== Test ====
 INSERT INTO tinnodb VALUES (1);
 SELECT * FROM tinnodb ORDER BY a;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_bug33931.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_bug33931.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_bug33931.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_bug33931.result	2021-09-28 11:46:34.000000000 +0000
@@ -9,7 +9,8 @@
 reset slave;
 Warnings:
 Warning	1287	'RESET SLAVE' is deprecated and will be removed in a future release. Please use RESET REPLICA instead
-SET GLOBAL debug="d,simulate_io_replica_error_on_init,simulate_sql_replica_error_on_init";
+# Adding debug point 'simulate_io_replica_error_on_init' to @@GLOBAL.debug
+# Adding debug point 'simulate_sql_replica_error_on_init' to @@GLOBAL.debug
 Warnings:
 Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
@@ -20,7 +21,8 @@
 Last_SQL_Error = 'Fatal error: Failed during slave thread initialization'
 include/wait_for_slave_io_error.inc [errno=13117]
 Last_IO_Error = 'Fatal error: Failed during slave I/O thread initialization '
-SET GLOBAL debug="";
+# Removing debug point 'simulate_io_replica_error_on_init' from @@GLOBAL.debug
+# Removing debug point 'simulate_sql_replica_error_on_init' from @@GLOBAL.debug
 RESET SLAVE;
 Warnings:
 Warning	1287	'RESET SLAVE' is deprecated and will be removed in a future release. Please use RESET REPLICA instead
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_bug41902.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_bug41902.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_bug41902.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_bug41902.result	2021-09-28 11:46:34.000000000 +0000
@@ -7,7 +7,7 @@
 stop slave;
 Warnings:
 Warning	1287	'STOP SLAVE' is deprecated and will be removed in a future release. Please use STOP REPLICA instead
-SET @@debug="d,simulate_find_log_pos_error";
+# Adding debug point 'simulate_find_log_pos_error' to @@GLOBAL.debug
 reset slave;
 ERROR HY000: Target log not found in binlog index
 show warnings;
@@ -15,28 +15,28 @@
 Warning	1287	'RESET SLAVE' is deprecated and will be removed in a future release. Please use RESET REPLICA instead
 Error	1373	Target log not found in binlog index
 Error	1371	Failed purging old relay logs: Failed during log reset
-SET @@debug="";
+# Removing debug point 'simulate_find_log_pos_error' from @@GLOBAL.debug
 reset slave;
 Warnings:
 Warning	1287	'RESET SLAVE' is deprecated and will be removed in a future release. Please use RESET REPLICA instead
 CHANGE REPLICATION SOURCE to SOURCE_HOST='dummy';
-SET @@debug="d,simulate_find_log_pos_error";
+# Adding debug point 'simulate_find_log_pos_error' to @@GLOBAL.debug
 CHANGE REPLICATION SOURCE to SOURCE_HOST='dummy';
 ERROR HY000: Target log not found in binlog index
-SET @@debug="";
+# Removing debug point 'simulate_find_log_pos_error' from @@GLOBAL.debug
 reset slave;
 Warnings:
 Warning	1287	'RESET SLAVE' is deprecated and will be removed in a future release. Please use RESET REPLICA instead
 CHANGE REPLICATION SOURCE to SOURCE_HOST='dummy';
-SET @@debug="d,simulate_find_log_pos_error";
+# Adding debug point 'simulate_find_log_pos_error' to @@GLOBAL.debug
 reset master;
 ERROR HY000: Target log not found in binlog index
-SET @@debug="";
+# Removing debug point 'simulate_find_log_pos_error' from @@GLOBAL.debug
 reset master;
-SET @@debug="d,simulate_find_log_pos_error";
+# Adding debug point 'simulate_find_log_pos_error' to @@GLOBAL.debug
 purge binary logs to 'master-bin.000001';
 ERROR HY000: Target log not found in binlog index
-SET @@debug="";
+# Removing debug point 'simulate_find_log_pos_error' from @@GLOBAL.debug
 purge binary logs to 'master-bin.000001';
 ==== clean up ====
 CHANGE REPLICATION SOURCE TO SOURCE_HOST = '127.0.0.1';
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_channel_creation_under_replica_load.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_channel_creation_under_replica_load.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_channel_creation_under_replica_load.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_channel_creation_under_replica_load.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,60 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+#
+# 1. Create a table on the source and use Slap to apply load on the server
+[connection master]
+CREATE TABLE test.t1 (a INT NOT NULL AUTO_INCREMENT PRIMARY KEY , b INT);
+#
+# 2. Create 20 channels, 1 per second in the replica
+[connection slave]
+CHANGE REPLICATION SOURCE TO SOURCE_HOST = 'h', SOURCE_PORT = 1 FOR CHANNEL 'channel_1' ;;
+CHANGE REPLICATION SOURCE TO SOURCE_HOST = 'h', SOURCE_PORT = 1 FOR CHANNEL 'channel_2' ;;
+CHANGE REPLICATION SOURCE TO SOURCE_HOST = 'h', SOURCE_PORT = 1 FOR CHANNEL 'channel_3' ;;
+CHANGE REPLICATION SOURCE TO SOURCE_HOST = 'h', SOURCE_PORT = 1 FOR CHANNEL 'channel_4' ;;
+CHANGE REPLICATION SOURCE TO SOURCE_HOST = 'h', SOURCE_PORT = 1 FOR CHANNEL 'channel_5' ;;
+CHANGE REPLICATION SOURCE TO SOURCE_HOST = 'h', SOURCE_PORT = 1 FOR CHANNEL 'channel_6' ;;
+CHANGE REPLICATION SOURCE TO SOURCE_HOST = 'h', SOURCE_PORT = 1 FOR CHANNEL 'channel_7' ;;
+CHANGE REPLICATION SOURCE TO SOURCE_HOST = 'h', SOURCE_PORT = 1 FOR CHANNEL 'channel_8' ;;
+CHANGE REPLICATION SOURCE TO SOURCE_HOST = 'h', SOURCE_PORT = 1 FOR CHANNEL 'channel_9' ;;
+CHANGE REPLICATION SOURCE TO SOURCE_HOST = 'h', SOURCE_PORT = 1 FOR CHANNEL 'channel_10' ;;
+CHANGE REPLICATION SOURCE TO SOURCE_HOST = 'h', SOURCE_PORT = 1 FOR CHANNEL 'channel_11' ;;
+CHANGE REPLICATION SOURCE TO SOURCE_HOST = 'h', SOURCE_PORT = 1 FOR CHANNEL 'channel_12' ;;
+CHANGE REPLICATION SOURCE TO SOURCE_HOST = 'h', SOURCE_PORT = 1 FOR CHANNEL 'channel_13' ;;
+CHANGE REPLICATION SOURCE TO SOURCE_HOST = 'h', SOURCE_PORT = 1 FOR CHANNEL 'channel_14' ;;
+CHANGE REPLICATION SOURCE TO SOURCE_HOST = 'h', SOURCE_PORT = 1 FOR CHANNEL 'channel_15' ;;
+CHANGE REPLICATION SOURCE TO SOURCE_HOST = 'h', SOURCE_PORT = 1 FOR CHANNEL 'channel_16' ;;
+CHANGE REPLICATION SOURCE TO SOURCE_HOST = 'h', SOURCE_PORT = 1 FOR CHANNEL 'channel_17' ;;
+CHANGE REPLICATION SOURCE TO SOURCE_HOST = 'h', SOURCE_PORT = 1 FOR CHANNEL 'channel_18' ;;
+CHANGE REPLICATION SOURCE TO SOURCE_HOST = 'h', SOURCE_PORT = 1 FOR CHANNEL 'channel_19' ;;
+CHANGE REPLICATION SOURCE TO SOURCE_HOST = 'h', SOURCE_PORT = 1 FOR CHANNEL 'channel_20' ;;
+#
+# 3. Check the data was replicated and 20 channel were created
+include/assert.inc ['There are 21 channels in the replica']
+#
+# 4. Cleanup
+RESET REPLICA ALL FOR CHANNEL 'channel_1' ;;
+RESET REPLICA ALL FOR CHANNEL 'channel_2' ;;
+RESET REPLICA ALL FOR CHANNEL 'channel_3' ;;
+RESET REPLICA ALL FOR CHANNEL 'channel_4' ;;
+RESET REPLICA ALL FOR CHANNEL 'channel_5' ;;
+RESET REPLICA ALL FOR CHANNEL 'channel_6' ;;
+RESET REPLICA ALL FOR CHANNEL 'channel_7' ;;
+RESET REPLICA ALL FOR CHANNEL 'channel_8' ;;
+RESET REPLICA ALL FOR CHANNEL 'channel_9' ;;
+RESET REPLICA ALL FOR CHANNEL 'channel_10' ;;
+RESET REPLICA ALL FOR CHANNEL 'channel_11' ;;
+RESET REPLICA ALL FOR CHANNEL 'channel_12' ;;
+RESET REPLICA ALL FOR CHANNEL 'channel_13' ;;
+RESET REPLICA ALL FOR CHANNEL 'channel_14' ;;
+RESET REPLICA ALL FOR CHANNEL 'channel_15' ;;
+RESET REPLICA ALL FOR CHANNEL 'channel_16' ;;
+RESET REPLICA ALL FOR CHANNEL 'channel_17' ;;
+RESET REPLICA ALL FOR CHANNEL 'channel_18' ;;
+RESET REPLICA ALL FOR CHANNEL 'channel_19' ;;
+RESET REPLICA ALL FOR CHANNEL 'channel_20' ;;
+[connection master]
+DROP TABLE test.t1;
+include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_check_net_interrupted_error.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_check_net_interrupted_error.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_check_net_interrupted_error.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_check_net_interrupted_error.result	2021-09-28 11:46:34.000000000 +0000
@@ -5,7 +5,6 @@
 [connection master]
 [connection slave]
 call mtr.add_suppression("Slave I/O .*: Master command COM_REGISTER_SLAVE failed: .*");
-SET @debug_saved=@@global.debug;
 include/stop_slave.inc
 [connection master]
 CREATE TABLE t1 (c1 INT);
@@ -14,7 +13,7 @@
 #
 # Active injected error during getting server id from master
 #
-SET GLOBAL DEBUG='d,get_source_server_id.ER_NET_READ_INTERRUPTED';
+# Adding debug point 'get_source_server_id.ER_NET_READ_INTERRUPTED' to @@GLOBAL.debug
 START SLAVE;
 Warnings:
 Warning	1287	'START SLAVE' is deprecated and will be removed in a future release. Please use START REPLICA instead
@@ -24,6 +23,6 @@
 include/assert_grep.inc [Make sure there is not the error "fatal error is encountered when it try to get the value of SERVER_ID variable from master" in slave's error log.]
 include/assert_grep.inc [Make sure there is the warning "Get master SERVER_ID failed with error" in slave's error log.]
 include/stop_slave.inc
-SET GLOBAL DEBUG= @save_debug;
+# Removing debug point 'get_source_server_id.ER_NET_READ_INTERRUPTED' from @@GLOBAL.debug
 include/start_slave.inc
 include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_checksum_undef.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_checksum_undef.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_checksum_undef.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_checksum_undef.result	2021-09-28 11:46:34.000000000 +0000
@@ -6,12 +6,12 @@
 [ON SLAVE]
 call mtr.add_suppression('The slave I/O thread was stopped because a fatal error is encountered');
 include/stop_slave.inc
-SET GLOBAL debug='+d,undefined_algorithm_on_replica';
+# Adding debug point 'undefined_algorithm_on_replica' to @@GLOBAL.debug
 START SLAVE;
 Warnings:
 Warning	1287	'START SLAVE' is deprecated and will be removed in a future release. Please use START REPLICA instead
 include/wait_for_slave_io_error.inc [errno=13117]
 include/stop_slave.inc
-SET GLOBAL debug = '';
+# Removing debug point 'undefined_algorithm_on_replica' from @@GLOBAL.debug
 include/start_slave.inc
 include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_corruption.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_corruption.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_corruption.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_corruption.result	2021-09-28 11:46:34.000000000 +0000
@@ -16,38 +16,37 @@
 include/sync_slave_sql_with_master.inc
 include/stop_slave.inc
 # 2. Corruption in master binlog and SHOW BINLOG EVENTS
-SET GLOBAL debug="d,corrupt_read_log_event";
+# Adding debug point 'corrupt_read_log_event' to @@GLOBAL.debug
 SHOW BINLOG EVENTS;
 ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Event crc check failed! Most likely there is event corruption.
 # 3. Master read a corrupted event from binlog and send the error to slave
-SET GLOBAL debug="d,corrupt_read_log_event";
 START SLAVE IO_THREAD;
 Warnings:
 Warning	1287	'START SLAVE' is deprecated and will be removed in a future release. Please use START REPLICA instead
 include/wait_for_slave_io_error.inc [errno=13114]
 # 4. Master read a corrupted event from binlog and send it to slave
 SET GLOBAL source_verify_checksum=0;
-SET GLOBAL debug="d,corrupt_read_log_event";
 START SLAVE IO_THREAD;
 Warnings:
 Warning	1287	'START SLAVE' is deprecated and will be removed in a future release. Please use START REPLICA instead
 include/wait_for_slave_io_error.inc [errno=13122,13115]
-SET GLOBAL debug="";
+# Removing debug point 'corrupt_read_log_event' from @@GLOBAL.debug
 SET GLOBAL source_verify_checksum=1;
 # 5. Slave. Corruption in network
-SET GLOBAL debug="d,corrupt_queue_event";
+# Adding debug point 'corrupt_queue_event' to @@GLOBAL.debug
 START SLAVE IO_THREAD;
 Warnings:
 Warning	1287	'START SLAVE' is deprecated and will be removed in a future release. Please use START REPLICA instead
 include/wait_for_slave_io_error.inc [errno=13122,13115]
 # 6. Slave. Corruption in relay log
-SET GLOBAL debug="d,corrupt_read_log_event";
+# Adding debug point 'corrupt_read_log_event' to @@GLOBAL.debug
 START SLAVE SQL_THREAD;
 Warnings:
 Warning	1287	'START SLAVE' is deprecated and will be removed in a future release. Please use START REPLICA instead
 include/wait_for_slave_sql_error.inc [errno=13117]
 # 7. Seek diff for tables on master and slave
-SET GLOBAL debug= "";
+# Removing debug point 'corrupt_read_log_event' from @@GLOBAL.debug
+# Removing debug point 'corrupt_queue_event' from @@GLOBAL.debug
 include/start_slave.inc
 include/sync_slave_sql_with_master.inc
 include/diff_tables.inc [master:t1, slave:t1]
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_create_select_replay.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_create_select_replay.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_create_select_replay.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_create_select_replay.result	2021-09-28 11:46:34.000000000 +0000
@@ -143,5 +143,4 @@
 # Recover the server.
 include/assert.inc [Verify that only table t0 is present in test database]
 DROP TABLE t0;
-SET global DEBUG='-d, crash_on_transactional_ddl_commit';
 RESET MASTER;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_encryption_master_key_generation_recovery.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_encryption_master_key_generation_recovery.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_encryption_master_key_generation_recovery.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_encryption_master_key_generation_recovery.result	2021-09-28 11:46:34.000000000 +0000
@@ -51,21 +51,26 @@
 SET GLOBAL binlog_encryption = ON;
 include/assert.inc [Binary log rotated]
 include/assert.inc [5th binary log is encrypted on slave]
+==== Cleanup ====
+* Disable encryption, cleanup database, and consume all encrypted logs.
+[connection slave]
 include/start_slave.inc
+SET GLOBAL binlog_encryption = OFF;
 [connection master]
 SET GLOBAL binlog_encryption = OFF;
 DROP TABLE t1;
 include/sync_slave_sql_with_master.inc
-include/stop_slave.inc
-[connection slave]
-SET GLOBAL binlog_encryption = OFF;
-UNINSTALL PLUGIN keyring_file;
+* Remove all encrypted logs.
+include/rpl_reset.inc
+* Uninstall the plugins and delete the keyrings.
 [connection master]
-SET GLOBAL binlog_encryption = OFF;
 UNINSTALL PLUGIN keyring_file;
-[connection master]
-RESET MASTER;
+[connection slave]
+UNINSTALL PLUGIN keyring_file;
+* Restart the servers with the same command lines as before the test.
 include/rpl_restart_server.inc [server_number=1]
-RESET REPLICA;
 include/rpl_restart_server.inc [server_number=2]
+* Clean up replication test framework
+[connection slave]
+include/start_slave.inc
 include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_encryption_master_key_rotation_at_startup.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_encryption_master_key_rotation_at_startup.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_encryption_master_key_rotation_at_startup.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_encryption_master_key_rotation_at_startup.result	2021-09-28 11:46:34.000000000 +0000
@@ -73,18 +73,24 @@
 include/assert.inc [Binary log rotated as expected]
 include/assert.inc [Binary log is encrypted with key #9]
 INSERT INTO t1 (c2) VALUES ("MySQL");
+==== Cleanup ====
+* Disable encryption, cleanup database, and consume all encrypted logs.
 [connection slave]
 include/start_slave.inc
+SET GLOBAL binlog_encryption = OFF;
 [connection master]
 SET GLOBAL binlog_encryption = OFF;
 DROP TABLE t1;
 include/sync_slave_sql_with_master.inc
-include/stop_slave.inc
+* Remove all encrypted logs.
+include/rpl_reset.inc
+* Uninstall the plugin and delete the keyring.
 [connection master]
 UNINSTALL PLUGIN keyring_file;
-[connection master]
-RESET MASTER;
+* Restart the servers with the same command lines as before the test.
 include/rpl_restart_server.inc [server_number=1]
-RESET REPLICA;
 include/rpl_restart_server.inc [server_number=2]
+* Clean up replication test framework
+[connection slave]
+include/start_slave.inc
 include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_filters_gcov.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_filters_gcov.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_filters_gcov.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_filters_gcov.result	2021-09-28 11:46:34.000000000 +0000
@@ -17,43 +17,49 @@
 # 1. Simulate an error on copying global replication filters
 #    when executing CHANGE MASTER TO.
 #
-SET GLOBAL debug='d,simulate_out_of_memory_on_copy_do_table';
+SET GLOBAL debug='+d,simulate_out_of_memory_on_copy_do_table';
 CHANGE REPLICATION SOURCE TO SOURCE_HOST="localhost", SOURCE_PORT=11 FOR CHANNEL "ch1";
 ERROR HY001: Out of memory; restart server and try again (needed 0 bytes)
 RESET SLAVE ALL FOR CHANNEL 'ch1';
 Warnings:
 Warning	1287	'RESET SLAVE' is deprecated and will be removed in a future release. Please use RESET REPLICA instead
-SET GLOBAL debug='d,simulate_out_of_memory_on_copy_ignore_table';
+SET GLOBAL debug='-d,simulate_out_of_memory_on_copy_do_table';
+SET GLOBAL debug='+d,simulate_out_of_memory_on_copy_ignore_table';
 CHANGE REPLICATION SOURCE TO SOURCE_HOST="localhost", SOURCE_PORT=11 FOR CHANNEL "ch1";
 ERROR HY001: Out of memory; restart server and try again (needed 0 bytes)
 RESET SLAVE ALL FOR CHANNEL 'ch1';
 Warnings:
 Warning	1287	'RESET SLAVE' is deprecated and will be removed in a future release. Please use RESET REPLICA instead
-SET GLOBAL debug='d,simulate_out_of_memory_on_copy_wild_do_table';
+SET GLOBAL debug='-d,simulate_out_of_memory_on_copy_ignore_table';
+SET GLOBAL debug='+d,simulate_out_of_memory_on_copy_wild_do_table';
 CHANGE REPLICATION SOURCE TO SOURCE_HOST="localhost", SOURCE_PORT=11 FOR CHANNEL "ch1";
 ERROR HY001: Out of memory; restart server and try again (needed 0 bytes)
 RESET SLAVE ALL FOR CHANNEL 'ch1';
 Warnings:
 Warning	1287	'RESET SLAVE' is deprecated and will be removed in a future release. Please use RESET REPLICA instead
-SET GLOBAL debug='d,simulate_out_of_memory_on_copy_wild_ignore_table';
+SET GLOBAL debug='-d,simulate_out_of_memory_on_copy_wild_do_table';
+SET GLOBAL debug='+d,simulate_out_of_memory_on_copy_wild_ignore_table';
 CHANGE REPLICATION SOURCE TO SOURCE_HOST="localhost", SOURCE_PORT=11 FOR CHANNEL "ch1";
 ERROR HY001: Out of memory; restart server and try again (needed 0 bytes)
 RESET SLAVE ALL FOR CHANNEL 'ch1';
 Warnings:
 Warning	1287	'RESET SLAVE' is deprecated and will be removed in a future release. Please use RESET REPLICA instead
-SET GLOBAL debug='d,simulate_out_of_memory_on_copy_ignore_db';
+SET GLOBAL debug='-d,simulate_out_of_memory_on_copy_wild_ignore_table';
+SET GLOBAL debug='+d,simulate_out_of_memory_on_copy_ignore_db';
 CHANGE REPLICATION SOURCE TO SOURCE_HOST="localhost", SOURCE_PORT=11 FOR CHANNEL "ch1";
 ERROR HY001: Out of memory; restart server and try again (needed 0 bytes)
 RESET SLAVE ALL FOR CHANNEL 'ch1';
 Warnings:
 Warning	1287	'RESET SLAVE' is deprecated and will be removed in a future release. Please use RESET REPLICA instead
-SET GLOBAL debug='d,simulate_out_of_memory_on_copy_do_db';
+SET GLOBAL debug='-d,simulate_out_of_memory_on_copy_ignore_db';
+SET GLOBAL debug='+d,simulate_out_of_memory_on_copy_do_db';
 CHANGE REPLICATION SOURCE TO SOURCE_HOST="localhost", SOURCE_PORT=11 FOR CHANNEL "ch1";
 ERROR HY001: Out of memory; restart server and try again (needed 0 bytes)
 RESET SLAVE ALL FOR CHANNEL 'ch1';
 Warnings:
 Warning	1287	'RESET SLAVE' is deprecated and will be removed in a future release. Please use RESET REPLICA instead
-SET GLOBAL debug='d,simulate_out_of_memory_on_copy_rewrite_db';
+SET GLOBAL debug='-d,simulate_out_of_memory_on_copy_do_db';
+SET GLOBAL debug='+d,simulate_out_of_memory_on_copy_rewrite_db';
 CHANGE REPLICATION SOURCE TO SOURCE_HOST="localhost", SOURCE_PORT=11 FOR CHANNEL "ch1";
 ERROR HY001: Out of memory; restart server and try again (needed 0 bytes)
 RESET SLAVE ALL FOR CHANNEL 'ch1';
@@ -63,7 +69,8 @@
 # 2. Simulate an error on creating channel's replication filters
 #    when executing CHANGE MASTER TO.
 #
-SET GLOBAL debug='d,simulate_out_of_memory_on_create_filter';
+SET GLOBAL debug='-d,simulate_out_of_memory_on_copy_rewrite_db';
+SET GLOBAL debug='+d,simulate_out_of_memory_on_create_filter';
 CHANGE REPLICATION SOURCE TO SOURCE_HOST="localhost", SOURCE_PORT=11 FOR CHANNEL "ch1";
 ERROR HY001: Out of memory; restart server and try again (needed 0 bytes)
 RESET SLAVE ALL FOR CHANNEL 'ch1';
@@ -72,17 +79,20 @@
 # 3. Simulate an error on executing CHANGE REPLICATION FILTER
 #    with no FOR CHANNEL clause.
 #
-SET GLOBAL debug='d,simulate_out_of_memory_on_CRF';
+SET GLOBAL debug='-d,simulate_out_of_memory_on_create_filter';
+SET GLOBAL debug='+d,simulate_out_of_memory_on_CRF';
 CHANGE REPLICATION FILTER REPLICATE_DO_DB=(db1);
 ERROR HY001: Out of memory; restart server and try again (needed 0 bytes)
-SET GLOBAL debug='d,simulate_out_of_memory_on_global_CRF';
+SET GLOBAL debug='-d,simulate_out_of_memory_on_CRF';
+SET GLOBAL debug='+d,simulate_out_of_memory_on_global_CRF';
 CHANGE REPLICATION FILTER REPLICATE_DO_DB=(db1);
 ERROR HY001: Out of memory; restart server and try again (needed 0 bytes)
 #
 # 4. Simulate an error on executing CHANGE REPLICATION FILTER
 #    with FOR CHANNEL clause.
 #
-SET GLOBAL debug='d,simulate_out_of_memory_on_CRF_FOR_CHA';
+SET GLOBAL debug='-d,simulate_out_of_memory_on_global_CRF';
+SET GLOBAL debug='+d,simulate_out_of_memory_on_CRF_FOR_CHA';
 CHANGE REPLICATION FILTER REPLICATE_DO_DB=(db1) FOR CHANNEL '' ;
 ERROR HY001: Out of memory; restart server and try again (needed 0 bytes)
 START SLAVE SQL_THREAD FOR CHANNEL '';
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_functional_index.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_functional_index.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_functional_index.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_functional_index.result	2021-09-28 11:46:34.000000000 +0000
@@ -9,7 +9,7 @@
 # Show the hidden columns so we can see the computed value.
 SET SESSION debug="+d,show_hidden_columns";
 SELECT * FROM t1;
-col1	3bb8c14d415110ac3b3c55ce9108ae2d
+col1	!hidden!functional_index!0!0
 -12	12
 SET SESSION debug="-d,show_hidden_columns";
 # Sync slave with master, and verify that the table exists on the slave.
@@ -18,7 +18,7 @@
 # reflected on the slave.
 SET SESSION debug="+d,show_hidden_columns";
 SELECT * FROM t1;
-col1	3bb8c14d415110ac3b3c55ce9108ae2d
+col1	!hidden!functional_index!0!0
 -12	12
 SET SESSION debug="-d,show_hidden_columns";
 EXPLAIN SELECT col1 FROM t1 WHERE ABS(col1) = 12;
@@ -31,7 +31,7 @@
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `col1` int DEFAULT NULL,
-  `3bb8c14d415110ac3b3c55ce9108ae2d` int GENERATED ALWAYS AS (abs(`col1`)) VIRTUAL,
+  `!hidden!functional_index!0!0` int GENERATED ALWAYS AS (abs(`col1`)) VIRTUAL,
   KEY `functional_index` ((abs(`col1`)))
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 SET SESSION debug="-d,show_hidden_columns";
@@ -46,7 +46,7 @@
 # reflected on the slave.
 SET SESSION debug="+d,show_hidden_columns";
 SELECT * FROM t1;
-col1	3bb8c14d415110ac3b3c55ce9108ae2d
+col1	!hidden!functional_index!0!0
 -12	12
 EXPLAIN SELECT col1 FROM t1 WHERE ABS(col1) = 12;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -57,7 +57,7 @@
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `col1` int DEFAULT NULL,
-  `3bb8c14d415110ac3b3c55ce9108ae2d` int GENERATED ALWAYS AS (abs(`col1`)) VIRTUAL,
+  `!hidden!functional_index!0!0` int GENERATED ALWAYS AS (abs(`col1`)) VIRTUAL,
   KEY `functional_index` ((abs(`col1`)))
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 SET SESSION debug="-d,show_hidden_columns";
@@ -70,7 +70,7 @@
 # reflected on the slave.
 SET SESSION debug="+d,show_hidden_columns";
 SELECT * FROM t1;
-col1	3bb8c14d415110ac3b3c55ce9108ae2d
+col1	!hidden!functional_index!0!0
 -12	12
 EXPLAIN SELECT col1 FROM t1 WHERE ABS(col1) = 12;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -81,7 +81,7 @@
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `col1` int DEFAULT NULL,
-  `3bb8c14d415110ac3b3c55ce9108ae2d` int GENERATED ALWAYS AS (abs(`col1`)) VIRTUAL,
+  `!hidden!functional_index!0!0` int GENERATED ALWAYS AS (abs(`col1`)) VIRTUAL,
   KEY `functional_index` ((abs(`col1`)))
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 SET SESSION debug="-d,show_hidden_columns";
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result	2021-09-28 11:46:34.000000000 +0000
@@ -44,7 +44,6 @@
 set @@global.debug = "-d,'dbug.before_get_SOURCE_UUID'";
 include/rpl_start_server.inc [server_number=1]
 include/wait_for_slave_param.inc [Slave_IO_Running]
-set global debug= '';
 reset master;
 include/stop_slave.inc
 CHANGE REPLICATION SOURCE to SOURCE_PORT=SLAVE_PORT;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_gtid_drop_mem_table.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_gtid_drop_mem_table.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_gtid_drop_mem_table.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_gtid_drop_mem_table.result	2021-09-28 11:46:34.000000000 +0000
@@ -29,17 +29,17 @@
 INSERT INTO mem_t1 VALUES (1), (2), (3), (4);
 include/sync_slave_sql_with_master.inc
 [connection master]
-include/assert_binlog_events.inc [#Gtid # !Begin # !Delete # !Commit #Gtid # !Begin # !Insert # !Commit]
+include/assert_binlog_events.inc [#Gtid # !Q(TRUNCATE.*) #Gtid # !Begin # !Insert # !Commit]
 include/save_binlog_position.inc
 ALTER TABLE mem_t2 ADD COLUMN (c2 INT);
 include/sync_slave_sql_with_master.inc
 [connection master]
-include/assert_binlog_events.inc [#Gtid # !Begin # !Delete # !Commit #Gtid # !Q(ALTER.*)]
+include/assert_binlog_events.inc [#Gtid # !Q(TRUNCATE.*) #Gtid # !Q(ALTER.*)]
 include/save_binlog_position.inc
 CREATE TABLE mem_t9 LIKE mem_t3;
 include/sync_slave_sql_with_master.inc
 [connection master]
-include/assert_binlog_events.inc [#Gtid # !Begin # !Delete # !Commit #Gtid # !Q(CREATE.*)]
+include/assert_binlog_events.inc [#Gtid # !Q(TRUNCATE.*) #Gtid # !Q(CREATE.*)]
 include/save_binlog_position.inc
 BEGIN;
 INSERT INTO mem_t4 VALUES (1), (2), (3), (4);
@@ -47,19 +47,19 @@
 COMMIT;
 include/sync_slave_sql_with_master.inc
 [connection master]
-include/assert_binlog_events.inc [#Gtid # !Begin # !Delete # !Commit #Gtid # !Begin # !Insert # !Commit #Gtid # !Begin # !Delete # !Commit #Gtid # !Begin # !Insert # !Commit]
+include/assert_binlog_events.inc [#Gtid # !Q(TRUNCATE.*) #Gtid # !Begin # !Insert # !Commit #Gtid # !Q(TRUNCATE.*) #Gtid # !Begin # !Insert # !Commit]
 include/save_binlog_position.inc
 UPDATE mem_t6, mem_t7 SET mem_t6.c1 = mem_t6.c1 + 1, mem_t7.c1 = mem_t7.c1 + 1;
 include/sync_slave_sql_with_master.inc
 [connection master]
-include/assert_binlog_events.inc [#Gtid # !Begin # !Delete # !Commit #Gtid # !Begin # !Delete # !Commit]
+include/assert_binlog_events.inc [#Gtid # !Q(TRUNCATE.*) #Gtid # !Q(TRUNCATE.*)]
 include/save_binlog_position.inc
 SET @@session.gtid_next = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1';
 INSERT INTO mem_t8 VALUES (1), (2), (3), (4);
 SET @@session.gtid_next = 'AUTOMATIC';
 include/sync_slave_sql_with_master.inc
 [connection master]
-include/assert_binlog_events.inc [#Gtid # !Begin # !Delete # !Commit #Gtid/(.*'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1')# !Begin # !Insert # !Commit]
+include/assert_binlog_events.inc [#Gtid # !Q(TRUNCATE.*) #Gtid/(.*'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1')# !Begin # !Insert # !Commit]
 DROP TABLE mem_t1, mem_t2, mem_t3, mem_t4, mem_t5, mem_t6, mem_t7, mem_t8, mem_t9;
 include/rpl_reset.inc
 [connection master]
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_init_replica_errors.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_init_replica_errors.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_init_replica_errors.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_init_replica_errors.result	2021-09-28 11:46:34.000000000 +0000
@@ -7,7 +7,8 @@
 reset slave;
 Warnings:
 Warning	1287	'RESET SLAVE' is deprecated and will be removed in a future release. Please use RESET REPLICA instead
-SET GLOBAL debug= "d,simulate_io_replica_error_on_init,simulate_sql_replica_error_on_init";
+# Adding debug point 'simulate_io_replica_error_on_init' to @@GLOBAL.debug
+# Adding debug point 'simulate_sql_replica_error_on_init' to @@GLOBAL.debug
 start slave;
 Warnings:
 Warning	1287	'START SLAVE' is deprecated and will be removed in a future release. Please use START REPLICA instead
@@ -18,7 +19,8 @@
 SET SESSION sql_log_bin= 1;
 include/wait_for_slave_io_error.inc [errno=13117]
 Last_IO_Error = 'Fatal error: Failed during slave I/O thread initialization '
-SET GLOBAL debug= "";
+# Removing debug point 'simulate_io_replica_error_on_init' from @@GLOBAL.debug
+# Removing debug point 'simulate_sql_replica_error_on_init' from @@GLOBAL.debug
 reset slave;
 Warnings:
 Warning	1287	'RESET SLAVE' is deprecated and will be removed in a future release. Please use RESET REPLICA instead
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_log_info_repository_persistence_assign_gtids_to_anonymous_transactions.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_log_info_repository_persistence_assign_gtids_to_anonymous_transactions.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_log_info_repository_persistence_assign_gtids_to_anonymous_transactions.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_log_info_repository_persistence_assign_gtids_to_anonymous_transactions.result	2021-09-28 11:46:34.000000000 +0000
@@ -99,6 +99,7 @@
 #       2. A group_replication channel (group_replication_recovery)
 #       3. A channel with a privileged user (default channel)
 #     ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS is set to OFF for all channels
+include/rpl_set_gtid_mode.inc [ON on servers 2]
 CHANGE REPLICATION SOURCE TO SOURCE_HOST="localhost", SOURCE_PORT=12 FOR CHANNEL "ch1" ;
 CHANGE REPLICATION SOURCE TO SOURCE_USER="root" FOR CHANNEL "group_replication_recovery";
 CHANGE REPLICATION SOURCE TO SOURCE_HOST="localhost", SOURCE_PORT=12, PRIVILEGE_CHECKS_USER = 'root'@'localhost' FOR CHANNEL "";
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_log_info_repository_persistence_require_row.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_log_info_repository_persistence_require_row.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_log_info_repository_persistence_require_row.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_log_info_repository_persistence_require_row.result	2021-09-28 11:46:34.000000000 +0000
@@ -72,6 +72,7 @@
 #       2. A group_replication channel (group_replication_recovery)
 #       3. A channel with a privileged user (default channel)
 #     REQUIRE_ROW_FORMAT must be 0 for 1) and 3). It must be 1 for 2)
+include/rpl_set_gtid_mode.inc
 CHANGE REPLICATION SOURCE TO SOURCE_HOST="localhost", SOURCE_PORT=12 FOR CHANNEL "ch1" ;
 CHANGE REPLICATION SOURCE TO SOURCE_USER="root" FOR CHANNEL "group_replication_recovery";
 CHANGE REPLICATION SOURCE TO SOURCE_HOST="localhost", SOURCE_PORT=12, PRIVILEGE_CHECKS_USER = 'replication_applier'@'localhost' FOR CHANNEL "";
@@ -92,6 +93,7 @@
 RESET SLAVE ALL FOR CHANNEL "group_replication_recovery";
 Warnings:
 Warning	1287	'RESET SLAVE' is deprecated and will be removed in a future release. Please use RESET REPLICA instead
+include/rpl_set_gtid_mode.inc
 include/rpl_end.inc
 Warnings:
 Note	3084	Replication thread(s) for channel '' are already stopped.
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_log_info_repository_persistence_require_table_primary_key_check.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_log_info_repository_persistence_require_table_primary_key_check.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_log_info_repository_persistence_require_table_primary_key_check.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_log_info_repository_persistence_require_table_primary_key_check.result	2021-09-28 11:46:34.000000000 +0000
@@ -90,6 +90,7 @@
 #       2. A group_replication channel (group_replication_recovery)
 #       3. A channel with a privileged user (default channel)
 #     REQUIRE_TABLE_PRIMARY_KEY_CHECK is set to STREAM for all channels
+include/rpl_set_gtid_mode.inc
 CHANGE REPLICATION SOURCE TO SOURCE_HOST="localhost", SOURCE_PORT=12 FOR CHANNEL "ch1" ;
 CHANGE REPLICATION SOURCE TO SOURCE_USER="root" FOR CHANNEL "group_replication_recovery";
 CHANGE REPLICATION SOURCE TO SOURCE_HOST="localhost", SOURCE_PORT=12, PRIVILEGE_CHECKS_USER = 'root'@'localhost' FOR CHANNEL "";
@@ -104,6 +105,7 @@
 RESET SLAVE ALL FOR CHANNEL "group_replication_recovery";
 Warnings:
 Warning	1287	'RESET SLAVE' is deprecated and will be removed in a future release. Please use RESET REPLICA instead
+include/rpl_set_gtid_mode.inc
 
 # 5.1. Change REQUIRE_TABLE_PRIMARY_KEY_CHECK to ON
 #      Execute a RESET SLAVE command.
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_lost_events_on_rotate.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_lost_events_on_rotate.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_lost_events_on_rotate.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_lost_events_on_rotate.result	2021-09-28 11:46:34.000000000 +0000
@@ -5,7 +5,7 @@
 [connection master]
 SET @debug_saved= @@GLOBAL.DEBUG;
 CREATE TABLE t (i INT);
-SET GLOBAL DEBUG= "d,wait_after_binlog_EOF";
+SET GLOBAL DEBUG= "+d,wait_after_binlog_EOF";
 INSERT INTO t VALUES (1);
 INSERT INTO t VALUES (2);
 FLUSH LOGS;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_mts_database_transaction_retry.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_mts_database_transaction_retry.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_mts_database_transaction_retry.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_mts_database_transaction_retry.result	2021-09-28 11:46:34.000000000 +0000
@@ -3,6 +3,12 @@
 Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
+[connection slave]
+include/stop_slave.inc
+SET @saved_replica_preserve_commit_order = @@GLOBAL.replica_preserve_commit_order;
+SET GLOBAL replica_preserve_commit_order = OFF;
+include/start_slave.inc
+[connection master]
 #
 # Initialization the test
 #
@@ -134,4 +140,8 @@
 [connection master]
 DROP DATABASE db1;
 DROP DATABASE db2;
+[connection slave]
+include/stop_slave.inc
+SET GLOBAL replica_preserve_commit_order = @saved_replica_preserve_commit_order;
+include/start_slave.inc
 include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_mts_logical_clock_assertion_failure.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_mts_logical_clock_assertion_failure.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_mts_logical_clock_assertion_failure.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_mts_logical_clock_assertion_failure.result	2021-09-28 11:46:34.000000000 +0000
@@ -1,3 +1,4 @@
+include/only_with_option.inc [GLOBAL.replica_parallel_workers = 4]
 include/master-slave.inc
 Warnings:
 Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_mts_logical_clock_crash.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_mts_logical_clock_crash.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_mts_logical_clock_crash.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_mts_logical_clock_crash.result	2021-09-28 11:46:34.000000000 +0000
@@ -9,7 +9,7 @@
 include/stop_slave_sql.inc
 [connection master]
 SET @save_debug = @@GLOBAL.debug;
-SET GLOBAL debug = "d,set_commit_parent_100";
+SET GLOBAL debug = "+d,set_commit_parent_100";
 INSERT INTO t2 VALUES(99);
 BEGIN;
 INSERT INTO t1 VALUES(1);
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_mts_logical_clock_recovery.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_mts_logical_clock_recovery.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_mts_logical_clock_recovery.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_mts_logical_clock_recovery.result	2021-09-28 11:46:34.000000000 +0000
@@ -1,3 +1,4 @@
+include/only_with_option.inc [GLOBAL.replica_parallel_workers > 2]
 include/master-slave.inc
 Warnings:
 Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_mts_relay_log_recovery_on_error.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_mts_relay_log_recovery_on_error.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_mts_relay_log_recovery_on_error.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_mts_relay_log_recovery_on_error.result	1970-01-01 00:00:00.000000000 +0000
@@ -1,60 +0,0 @@
-include/master-slave.inc
-Warnings:
-Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
-[connection master]
-[connection slave]
-call mtr.add_suppression("Duplicate entry*");
-call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
-call mtr.add_suppression("Failed to initialize the master info structure");
-call mtr.add_suppression("Slave failed to initialize relay log info*");
-call mtr.add_suppression("MTS recovery: automatic recovery failed.*");
-call mtr.add_suppression("Recovery from master pos");
-#### I. Initialize ####
-[connection slave]
-include/stop_slave.inc
-SET @save.innodb_lock_wait_timeout= @@global.innodb_lock_wait_timeout;
-set @@global.innodb_lock_wait_timeout=5 + 1000;
-include/start_slave.inc
-[connection master]
-CREATE DATABASE d1;
-CREATE DATABASE d2;
-CREATE TABLE d1.t (a INT PRIMARY KEY, name text) ENGINE=INNODB;
-CREATE TABLE d2.t (a INT PRIMARY KEY, name text) ENGINE=INNODB;
-#### II. Prepare test scenario ####
-include/sync_slave_sql_with_master.inc
-BEGIN;
-INSERT INTO d2.t VALUES (2, 'Slave local');
-INSERT INTO d1.t VALUES (3, 'Slave local');
-[connection master]
-INSERT INTO d1.t VALUES (1, 'T1');
-INSERT INTO d2.t VALUES (1, 'T2');
-INSERT INTO d2.t VALUES (2, 'T3');
-INSERT INTO d2.t VALUES (3, 'T4');
-INSERT INTO d1.t VALUES (2, 'T5');
-[connection slave1]
-# Now d1.t has two rows and d2.t has one row.
-[connection slave]
-COMMIT;
-include/wait_for_slave_sql_error.inc [errno=1062]
-include/rpl_restart_server.inc [server_number=2 parameters: --skip_replica_start=TRUE --sync_source_info=1 --relay-log-recovery=1]
-[connection slave]
-Relay log recovery should fail as MTS stopped due to an error
-START SLAVE;
-ERROR HY000: Slave failed to initialize relay log info structure from the repository
-Eliminate the cause of MTS error
-DELETE FROM d2.t WHERE a=2;
-DELETE FROM d1.t WHERE a=3;
-include/rpl_restart_server.inc [server_number=2 parameters: --skip_replica_start=TRUE --sync_source_info=1 --relay-log-recovery=1]
-MTS recovery should be successful. Check that gaps are filled.
-include/assert.inc [Table d1.t should contain 2 rows.]
-include/assert.inc [Table d2.t should contain 3 rows.]
-include/start_slave.inc
-[connection master]
-include/sync_slave_sql_with_master.inc
-include/diff_tables.inc [master:d1.t, slave:d1.t]
-include/diff_tables.inc [master:d2.t, slave:d2.t]
-[connection master]
-DROP DATABASE d1;
-DROP DATABASE d2;
-include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_mts_replica_preserve_commit_order_deadlock_error.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_mts_replica_preserve_commit_order_deadlock_error.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_mts_replica_preserve_commit_order_deadlock_error.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_mts_replica_preserve_commit_order_deadlock_error.result	2021-09-28 11:46:34.000000000 +0000
@@ -1,3 +1,4 @@
+include/only_with_option.inc [GLOBAL.replica_parallel_workers > 1]
 include/master-slave.inc
 Warnings:
 Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_mts_replica_preserve_commit_order_error_nobinlog.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_mts_replica_preserve_commit_order_error_nobinlog.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_mts_replica_preserve_commit_order_error_nobinlog.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_mts_replica_preserve_commit_order_error_nobinlog.result	2021-09-28 11:46:34.000000000 +0000
@@ -37,7 +37,7 @@
 INSERT INTO t_w3 VALUES(4);
 COMMIT;
 INSERT INTO t_w4 VALUES(1);
-SET GLOBAL debug = @save_debug;
+# Removing debug point 'set_commit_parent_100' from @@GLOBAL.debug
 include/save_master_pos.inc
 [connection slave]
 UNLOCK TABLES;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_mts_replica_preserve_commit_order_error.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_mts_replica_preserve_commit_order_error.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_mts_replica_preserve_commit_order_error.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_mts_replica_preserve_commit_order_error.result	2021-09-28 11:46:34.000000000 +0000
@@ -10,7 +10,7 @@
   previous worker(s) have encountered an error and replica-preserve-commit-order
   is enabled.*");
 SET @save_debug = @@GLOBAL.debug;
-SET GLOBAL debug = "d,set_commit_parent_100";
+SET GLOBAL debug = "+d,set_commit_parent_100";
 CREATE TABLE t_w1 (c1 int PRIMARY KEY) ENGINE = InnoDB;
 CREATE TABLE t_w2 (c1 int PRIMARY KEY) ENGINE = InnoDB;
 CREATE TABLE t_w3 (c1 int PRIMARY KEY) ENGINE = InnoDB;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_mts_replica_preserve_commit_order.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_mts_replica_preserve_commit_order.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_mts_replica_preserve_commit_order.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_mts_replica_preserve_commit_order.result	2021-09-28 11:46:34.000000000 +0000
@@ -13,7 +13,7 @@
 #
 [connection master]
 SET @save_debug = @@GLOBAL.debug;
-SET GLOBAL debug = "d,set_commit_parent_100";
+SET GLOBAL debug = "+d,set_commit_parent_100";
 [connection slave]
 LOCK TABLE t1 WRITE;
 [connection master]
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_mts_slave_hang_with_partial_trx.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_mts_slave_hang_with_partial_trx.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_mts_slave_hang_with_partial_trx.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_mts_slave_hang_with_partial_trx.result	2021-09-28 11:46:34.000000000 +0000
@@ -5,7 +5,7 @@
 [connection master]
 [connection slave]
 SET @save_debug=@@global.debug;
-SET GLOBAL DEBUG= "d,stop_io_after_reading_write_rows_log_event";
+SET GLOBAL DEBUG= "+d,stop_io_after_reading_write_rows_log_event";
 [connection master]
 CREATE TABLE t1 (c1 INT) ENGINE=InnoDB;
 BEGIN;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_mts_stop_slave_report_pos.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_mts_stop_slave_report_pos.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_mts_stop_slave_report_pos.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_mts_stop_slave_report_pos.result	2021-09-28 11:46:34.000000000 +0000
@@ -88,7 +88,7 @@
 INSERT INTO db1.t1 VALUES (50);
 COMMIT;
 [connection slave]
-SET global debug="d,simulate_stop_when_mta_in_group";
+SET global debug="+d,simulate_stop_when_mta_in_group";
 include/start_slave_io.inc
 include/wait_for_slave_sql_to_stop.inc
 include/assert_grep.inc [Assert that the expected entry is in the error log during STOP SLAVE]
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_mts_submode_switch_without_reset_slave_myisam.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_mts_submode_switch_without_reset_slave_myisam.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_mts_submode_switch_without_reset_slave_myisam.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_mts_submode_switch_without_reset_slave_myisam.result	2021-09-28 11:46:34.000000000 +0000
@@ -4,6 +4,7 @@
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
 SET GLOBAL DEBUG ='+d,set_commit_parent_150';
+SET @slave_preserver_commit_order_saved= @@GLOBAL.REPLICA_PRESERVE_COMMIT_ORDER;
 include/stop_slave.inc
 #setup the databases and tables
 CREATE DATABASE db2;
@@ -12,6 +13,7 @@
 SET GLOBAL DEBUG ='+d,set_commit_parent_100';
 INSERT INTO db2.t values (1),(2),(3);
 SET GLOBAL replica_parallel_type='DATABASE';
+SET GLOBAL replica_preserve_commit_order=0;
 include/start_slave.inc
 include/sync_slave_sql_with_master.inc
 include/diff_tables.inc [master:db2.t, slave:db2.t]
@@ -20,6 +22,7 @@
 SET GLOBAL DEBUG ='+d,set_commit_parent_150';
 INSERT INTO db2.t values (1),(2),(3);
 SET GLOBAL replica_parallel_type='LOGICAL_CLOCK';
+SET GLOBAL replica_preserve_commit_order=1;
 include/start_slave.inc
 include/sync_slave_sql_with_master.inc
 include/diff_tables.inc [master:db2.t, slave:db2.t]
@@ -28,6 +31,7 @@
 SET GLOBAL DEBUG ='+d,set_commit_parent_100';
 INSERT INTO db2.t values (1),(2),(3);
 SET GLOBAL replica_parallel_type='DATABASE';
+SET GLOBAL replica_preserve_commit_order=0;
 include/start_slave.inc
 include/sync_slave_sql_with_master.inc
 include/diff_tables.inc [master:db2.t, slave:db2.t]
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_mts_submode_switch_without_reset_slave.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_mts_submode_switch_without_reset_slave.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_mts_submode_switch_without_reset_slave.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_mts_submode_switch_without_reset_slave.result	2021-09-28 11:46:34.000000000 +0000
@@ -4,7 +4,9 @@
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
 SET GLOBAL DEBUG ='+d,set_commit_parent_150';
+SET @saved_rpco= @@GLOBAL.replica_preserve_commit_order;
 include/stop_slave.inc
+SET GLOBAL replica_preserve_commit_order=OFF;
 #setup the databases and tables
 CREATE DATABASE db1;
 CREATE TABLE db1.t (a int) engine=innodb;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_multi_source_cmd_errors.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_multi_source_cmd_errors.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_multi_source_cmd_errors.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_multi_source_cmd_errors.result	2021-09-28 11:46:34.000000000 +0000
@@ -57,10 +57,10 @@
 #
 #  3.b) Check that maximum channels permitted error is issued.
 #
-SET GLOBAL DEBUG = "+d, max_replication_channels_exceeded";
+# Adding debug point 'max_replication_channels_exceeded' to @@GLOBAL.debug
 CHANGE REPLICATION SOURCE TO SOURCE_LOG_POS = 4 FOR CHANNEL "257th_channel";
 ERROR HY000: Maximum number of replication channels allowed exceeded.
-SET GLOBAL DEBUG=@old_debug;
+# Removing debug point 'max_replication_channels_exceeded' from @@GLOBAL.debug
 #
 #  3.c) Check that restricted channel names cannot be used
 #
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_multi_source_mts_recovery.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_multi_source_mts_recovery.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_multi_source_mts_recovery.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_multi_source_mts_recovery.result	2021-09-28 11:46:34.000000000 +0000
@@ -8,9 +8,11 @@
 SET @@global.innodb_lock_wait_timeout=1;
 SET @save.replica_transaction_retries= @@global.replica_transaction_retries;
 SET @@global.replica_transaction_retries= 0;
+SET @save_replica_preserve_commit_order= @@global.replica_preserve_commit_order;
 SET @save.max_relay_log_size= @@global.max_relay_log_size;
 SET @@global.max_relay_log_size=4096;
 include/stop_slave_sql.inc
+SET GLOBAL replica_preserve_commit_order= OFF;
 include/start_slave_sql.inc
 include/assert.inc [the max size of relay log must be 4096]
 CREATE DATABASE db4;
@@ -49,5 +51,8 @@
 SET @@global.innodb_lock_wait_timeout=@save.innodb_lock_wait_timeout;
 SET @@global.replica_transaction_retries= @save.replica_transaction_retries;
 SET @@global.max_relay_log_size= @save.max_relay_log_size;
+include/stop_slave_sql.inc [FOR CHANNEL 'channel_1']
+SET @@global.replica_preserve_commit_order= @save_replica_preserve_commit_order;
+include/start_slave_sql.inc [FOR CHANNEL 'channel_1']
 include/rpl_end.inc
 RESET REPLICA ALL FOR CHANNEL 'channel_1';
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_multi_valued_index.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_multi_valued_index.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_multi_valued_index.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_multi_valued_index.result	2021-09-28 11:46:34.000000000 +0000
@@ -44,7 +44,7 @@
 18	[8, 4, 3, 5]
 explain select * from t1 where 5 member of (f1->"$[*]");
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ref	i1	i1	9	const	1	100.00	Using where
+1	SIMPLE	t1	NULL	ref	i1	i1	9	const	5	100.00	Using where
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`pl` AS `pl`,`test`.`t1`.`f1` AS `f1` from `test`.`t1` where json'5' member of (cast(json_extract(`f1`,_utf8mb4'$[*]') as unsigned array))
 select * from t1 force index(i1) where json_contains(f1->"$[*]", "[4,3]");
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_packet.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_packet.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_packet.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_packet.result	2021-09-28 11:46:34.000000000 +0000
@@ -10,6 +10,7 @@
 SET @@global.max_allowed_packet=10240;
 SET @@global.net_buffer_length=1024;
 include/sync_slave_sql_with_master.inc
+call mtr.add_suppression(".*The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state.*");
 include/stop_slave.inc
 include/start_slave.inc
 select @@net_buffer_length, @@max_allowed_packet;
@@ -34,10 +35,10 @@
 include/start_slave.inc
 CREATE TABLE `t1` (`f1` LONGTEXT);
 include/sync_slave_sql_with_master.inc
+include/stop_slave_sql.inc
 INSERT INTO t1 VALUES (REPEAT('a', @@global.max_allowed_packet));
 include/wait_for_slave_io_error.inc [errno=13125]
 Last_IO_Error = 'Got a packet bigger than 'replica_max_allowed_packet' bytes'
-include/stop_slave_sql.inc
 include/rpl_reset.inc
 DROP TABLE t1;
 include/sync_slave_sql_with_master.inc
@@ -96,7 +97,7 @@
 SET @@global.replica_max_allowed_packet= 4096;
 SET @@global.max_allowed_packet= 2048;
 DROP TABLE t1;
-include/stop_slave_sql.inc
+STOP REPLICA;
 RESET SLAVE;
 Warnings:
 Warning	1287	'RESET SLAVE' is deprecated and will be removed in a future release. Please use RESET REPLICA instead
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_parallel_recovery.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_parallel_recovery.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_parallel_recovery.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_parallel_recovery.result	2021-09-28 11:46:34.000000000 +0000
@@ -8,9 +8,11 @@
 SET @@global.innodb_lock_wait_timeout=1;
 SET @save.replica_transaction_retries= @@global.replica_transaction_retries;
 SET @@global.replica_transaction_retries= 0;
+SET @save_replica_preserve_commit_order= @@global.replica_preserve_commit_order;
 SET @save.max_relay_log_size= @@global.max_relay_log_size;
 SET @@global.max_relay_log_size=4096;
 include/stop_slave_sql.inc
+SET GLOBAL replica_preserve_commit_order= OFF;
 include/start_slave_sql.inc
 include/assert.inc [the max size of relay log must be 4096]
 CREATE DATABASE db4;
@@ -49,4 +51,7 @@
 SET @@global.innodb_lock_wait_timeout=@save.innodb_lock_wait_timeout;
 SET @@global.replica_transaction_retries= @save.replica_transaction_retries;
 SET @@global.max_relay_log_size= @save.max_relay_log_size;
+include/stop_slave_sql.inc
+SET @@global.replica_preserve_commit_order= @save_replica_preserve_commit_order;
+include/start_slave_sql.inc
 include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_partial_revokes_add_remove.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_partial_revokes_add_remove.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_partial_revokes_add_remove.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_partial_revokes_add_remove.result	2021-09-28 11:46:34.000000000 +0000
@@ -466,7 +466,7 @@
 SHOW GRANTS FOR baz;
 Grants for baz@%
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `baz`@`%`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `baz`@`%`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `baz`@`%`
 DROP USER baz;
 # Create partial_revokes for foo
 GRANT ALL ON *.* TO foo WITH GRANT OPTION;
@@ -476,13 +476,13 @@
 SHOW GRANTS FOR foo;
 Grants for foo@%
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `foo`@`%` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `foo`@`%` WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `foo`@`%` WITH GRANT OPTION
 # create partial revokes again
 REVOKE SELECT ON mysql.* FROM foo;
 SHOW GRANTS FOR foo;
 Grants for foo@%
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `foo`@`%` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `foo`@`%` WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `foo`@`%` WITH GRANT OPTION
 REVOKE SELECT ON `mysql`.* FROM `foo`@`%`
 GRANT ALL ON mysql.* TO bar;
 [connection foo_master]
@@ -495,12 +495,12 @@
 SHOW GRANTS FOR foo;
 Grants for foo@%
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `foo`@`%` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `foo`@`%` WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `foo`@`%` WITH GRANT OPTION
 REVOKE SELECT ON `mysql`.* FROM `foo`@`%`
 SHOW GRANTS FOR bar;
 Grants for bar@%
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `bar`@`%`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `bar`@`%`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `bar`@`%`
 REVOKE SELECT ON `mysql`.* FROM `bar`@`%`
 # grantor should be able to remove the privileges & partial revokes both
 REVOKE ALL ON *.* FROM bar;
@@ -522,21 +522,21 @@
 SHOW GRANTS FOR foo;
 Grants for foo@%
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `foo`@`%` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `foo`@`%` WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `foo`@`%` WITH GRANT OPTION
 REVOKE SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `mysql`.* FROM `foo`@`%`
 # restrictions must pass to bar as well
 GRANT ALL ON *.* TO bar;
 SHOW GRANTS FOR bar;
 Grants for bar@%
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `bar`@`%`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `bar`@`%`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `bar`@`%`
 REVOKE SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `mysql`.* FROM `bar`@`%`
 include/sync_slave_sql_with_master.inc
 [connection slave]
 SHOW GRANTS FOR bar;
 Grants for bar@%
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `bar`@`%`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `bar`@`%`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `bar`@`%`
 REVOKE SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `mysql`.* FROM `bar`@`%`
 [connection foo_master]
 REVOKE ALL ON *.* FROM foo,bar;
@@ -1400,14 +1400,14 @@
 SHOW GRANTS;
 Grants for bar@%
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `bar`@`%` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `bar`@`%` WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `bar`@`%` WITH GRANT OPTION
 GRANT `r1`@`%` TO `bar`@`%`
 # Grantor should be able to grant ALL global level privilege to grantee
 GRANT ALL ON *.* TO foo;
 SHOW GRANTS FOR foo;
 Grants for foo@%
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `foo`@`%`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `foo`@`%`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `foo`@`%`
 # Grantor should be able to revoke ALL global level privilege from
 # grantee
 REVOKE ALL ON *.* FROM foo;
@@ -1419,7 +1419,7 @@
 SHOW GRANTS;
 Grants for bar@%
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `bar`@`%` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `bar`@`%` WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `bar`@`%` WITH GRANT OPTION
 GRANT `r1`@`%` TO `bar`@`%`
 [connection default]
 # Since, user granted himself all DB level privileges therefore it's
@@ -1427,14 +1427,14 @@
 SHOW GRANTS FOR bar;
 Grants for bar@%
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `bar`@`%` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `bar`@`%` WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `bar`@`%` WITH GRANT OPTION
 GRANT `r1`@`%` TO `bar`@`%`
 include/sync_slave_sql_with_master.inc
 [connection slave]
 SHOW GRANTS FOR bar;
 Grants for bar@%
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `bar`@`%` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `bar`@`%` WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `bar`@`%` WITH GRANT OPTION
 GRANT `r1`@`%` TO `bar`@`%`
 [connection bar_master]
 DROP USER foo, bar;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_perfschema_log_status_blockage.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_perfschema_log_status_blockage.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_perfschema_log_status_blockage.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_perfschema_log_status_blockage.result	2021-09-28 11:46:34.000000000 +0000
@@ -3,6 +3,9 @@
 Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
+[connection slave]
+SET @@GLOBAL.replica_checkpoint_period= 1;
+[connection master]
 CREATE TABLE ils_copy (
 uuid VARCHAR(36) PRIMARY KEY,
 master JSON NOT NULL,
@@ -74,6 +77,7 @@
 include/assert.inc [Collected InnoDB LSN_checkpoint is in correct boundaries]
 [connection slave]
 # Removing debug point 'pause_collecting_instance_logs_info' from @@GLOBAL.debug
+SET @@GLOBAL.replica_checkpoint_period= REPLICA_CHECKPOINT_PERIOD;
 RESET SLAVE ALL FOR CHANNEL 'ch2';
 Warnings:
 Warning	1287	'RESET SLAVE' is deprecated and will be removed in a future release. Please use RESET REPLICA instead
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_removed_status_vars.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_removed_status_vars.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_removed_status_vars.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_removed_status_vars.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,10 @@
+SHOW STATUS LIKE 'Slave_running';
+Variable_name	Value
+SHOW STATUS LIKE 'Slave_retried_transactions';
+Variable_name	Value
+SHOW STATUS LIKE 'Slave_heartbeat_period';
+Variable_name	Value
+SHOW STATUS LIKE 'Slave_received_heartbeats';
+Variable_name	Value
+SHOW STATUS LIKE 'Slave_last_heartbeat';
+Variable_name	Value
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_replica_read_lock.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_replica_read_lock.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_replica_read_lock.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_replica_read_lock.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,239 @@
+include/only_with_option.inc [GLOBAL.replica_transaction_retries > 2]
+#
+# 1. Create source-replica topology
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+[connection slave]
+SET GLOBAL innodb_lock_wait_timeout = 2;
+SET GLOBAL slave_rows_search_algorithms = 'INDEX_SCAN,HASH_SCAN';
+CALL mtr.add_suppression("Slave SQL for channel.*Consider raising the value of the replica_transaction_retries variable.*");
+CALL mtr.add_suppression("Slave SQL for channel.*The slave coordinator and worker threads are stopped.*");
+# 2. For each slave_rows_search_algorithms[INDEX_SCAN, HASH_SCAN(with
+#    index), HASH_SCAN(with two non-unique index), HASH_SCAN(with out
+#    index), TABLE_SCAN]
+#
+# 2.0 Configure source and replica
+[connection master]
+CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=innodb;
+INSERT INTO t1 VALUES (10, 10), (20, 20);
+include/sync_slave_sql_with_master.inc
+#
+# 2.1 Stop replica
+include/stop_slave.inc
+#
+# 2.2 Execute DELETE transaction on source
+[connection master]
+BEGIN;
+DELETE FROM t1;
+COMMIT;
+#
+# 2.3 Begin SELECT ... FOR UPDATE on replica
+[connection slave]
+BEGIN;
+SELECT * FROM t1 WHERE b = 20 FOR UPDATE;
+a	b
+20	20
+#
+# 2.4 Start replica from another connection
+[connection slave1]
+include/start_slave.inc
+#
+# 2.5 Wait until the applier retries:'count_transactions_retries' will be
+#    incremented
+[connection slave]
+#
+# 2.6 Commit SELECT ... FOR UPDATE on replica
+COMMIT;
+SHOW STATUS LIKE 'Replica_rows_last_search_algorithm_used';
+Variable_name	Value
+Replica_rows_last_search_algorithm_used	INDEX_SCAN
+#
+# 2.7 Restart replica applier
+include/stop_slave_sql.inc
+include/start_slave_sql.inc
+[connection master]
+DROP TABLE t1;
+include/sync_slave_sql_with_master.inc
+#
+# 2.0 Configure source and replica
+[connection master]
+CREATE TABLE t1 (a INT, b INT, key(a)) ENGINE=innodb;
+INSERT INTO t1 VALUES (10, 10), (20, 20);
+include/sync_slave_sql_with_master.inc
+#
+# 2.1 Stop replica
+include/stop_slave.inc
+#
+# 2.2 Execute DELETE transaction on source
+[connection master]
+BEGIN;
+DELETE FROM t1;
+COMMIT;
+#
+# 2.3 Begin SELECT ... FOR UPDATE on replica
+[connection slave]
+BEGIN;
+SELECT * FROM t1 WHERE b = 20 FOR UPDATE;
+a	b
+20	20
+#
+# 2.4 Start replica from another connection
+[connection slave1]
+include/start_slave.inc
+#
+# 2.5 Wait until the applier retries:'count_transactions_retries' will be
+#    incremented
+[connection slave]
+#
+# 2.6 Commit SELECT ... FOR UPDATE on replica
+COMMIT;
+SHOW STATUS LIKE 'Replica_rows_last_search_algorithm_used';
+Variable_name	Value
+Replica_rows_last_search_algorithm_used	HASH_SCAN
+#
+# 2.7 Restart replica applier
+include/stop_slave_sql.inc
+include/start_slave_sql.inc
+[connection master]
+DROP TABLE t1;
+include/sync_slave_sql_with_master.inc
+#
+# 2.0 Configure source and replica
+[connection master]
+CREATE TABLE t1 (a INT, b INT, KEY(a), KEY(b)) ENGINE=innodb;
+INSERT INTO t1 VALUES (10, 10), (10, 20), (10, 30), (20, 10), (20, 20);
+include/sync_slave_sql_with_master.inc
+#
+# 2.1 Stop replica
+include/stop_slave.inc
+#
+# 2.2 Execute DELETE transaction on source
+[connection master]
+BEGIN;
+DELETE FROM t1;
+COMMIT;
+#
+# 2.3 Begin SELECT ... FOR UPDATE on replica
+[connection slave]
+BEGIN;
+SELECT * FROM t1 WHERE b = 20 FOR UPDATE;
+a	b
+10	20
+20	20
+#
+# 2.4 Start replica from another connection
+[connection slave1]
+include/start_slave.inc
+#
+# 2.5 Wait until the applier retries:'count_transactions_retries' will be
+#    incremented
+[connection slave]
+#
+# 2.6 Commit SELECT ... FOR UPDATE on replica
+COMMIT;
+SHOW STATUS LIKE 'Replica_rows_last_search_algorithm_used';
+Variable_name	Value
+Replica_rows_last_search_algorithm_used	HASH_SCAN
+#
+# 2.7 Restart replica applier
+include/stop_slave_sql.inc
+include/start_slave_sql.inc
+[connection master]
+DROP TABLE t1;
+include/sync_slave_sql_with_master.inc
+#
+# 2.0 Configure source and replica
+[connection master]
+CREATE TABLE t1 (a INT, b INT) ENGINE=innodb;
+INSERT INTO t1 VALUES (10, 10), (20, 20);
+include/sync_slave_sql_with_master.inc
+#
+# 2.1 Stop replica
+include/stop_slave.inc
+#
+# 2.2 Execute DELETE transaction on source
+[connection master]
+BEGIN;
+DELETE FROM t1;
+COMMIT;
+#
+# 2.3 Begin SELECT ... FOR UPDATE on replica
+[connection slave]
+BEGIN;
+SELECT * FROM t1 WHERE b = 20 FOR UPDATE;
+a	b
+20	20
+#
+# 2.4 Start replica from another connection
+[connection slave1]
+include/start_slave.inc
+#
+# 2.5 Wait until the applier retries:'count_transactions_retries' will be
+#    incremented
+[connection slave]
+#
+# 2.6 Commit SELECT ... FOR UPDATE on replica
+COMMIT;
+SHOW STATUS LIKE 'Replica_rows_last_search_algorithm_used';
+Variable_name	Value
+Replica_rows_last_search_algorithm_used	HASH_SCAN
+#
+# 2.7 Restart replica applier
+include/stop_slave_sql.inc
+include/start_slave_sql.inc
+[connection master]
+DROP TABLE t1;
+include/sync_slave_sql_with_master.inc
+#
+# 2.0 Configure source and replica
+[connection master]
+CREATE TABLE t1 (a INT, b INT) ENGINE=innodb;
+INSERT INTO t1 VALUES (10, 10), (20, 20);
+include/sync_slave_sql_with_master.inc
+#
+# 2.1 Stop replica
+include/stop_slave.inc
+#
+# 2.2 Execute DELETE transaction on source
+[connection master]
+BEGIN;
+DELETE FROM t1;
+COMMIT;
+#
+# 2.3 Begin SELECT ... FOR UPDATE on replica
+[connection slave]
+SET GLOBAL slave_rows_search_algorithms = 'TABLE_SCAN';
+BEGIN;
+SELECT * FROM t1 WHERE b = 20 FOR UPDATE;
+a	b
+20	20
+#
+# 2.4 Start replica from another connection
+[connection slave1]
+include/start_slave.inc
+#
+# 2.5 Wait until the applier retries:'count_transactions_retries' will be
+#    incremented
+[connection slave]
+#
+# 2.6 Commit SELECT ... FOR UPDATE on replica
+COMMIT;
+SHOW STATUS LIKE 'Replica_rows_last_search_algorithm_used';
+Variable_name	Value
+Replica_rows_last_search_algorithm_used	TABLE_SCAN
+#
+# 2.7 Restart replica applier
+include/stop_slave_sql.inc
+include/start_slave_sql.inc
+[connection master]
+DROP TABLE t1;
+include/sync_slave_sql_with_master.inc
+#
+# 3. Clean up
+[connection slave]
+SET GLOBAL innodb_lock_wait_timeout = INNODB_LOCK_WAIT_TIMEOUT;
+SET GLOBAL slave_rows_search_algorithms = "SLAVE_ROWS_SEARCH_ALGORITHMS";
+include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_replication_observers_example_plugin_ongoing_transaction.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_replication_observers_example_plugin_ongoing_transaction.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_replication_observers_example_plugin_ongoing_transaction.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_replication_observers_example_plugin_ongoing_transaction.result	2021-09-28 11:46:34.000000000 +0000
@@ -21,7 +21,6 @@
 
 # 5. Execute a DML query. A hook will count the transactions
 [connection con5]
-SET @debug_save= @@GLOBAL.DEBUG;
 SET @@GLOBAL.DEBUG='+d,group_replication_before_commit_hook_wait';
 INSERT INTO t2 VALUES (3);;
 [connection con1]
@@ -43,5 +42,5 @@
 [connection con1]
 DROP TABLE t1;
 DROP TABLE t2;
-SET @@GLOBAL.DEBUG= @debug_saved;
+SET @@GLOBAL.DEBUG= '-d,validate_replication_observers_plugin_counts_transactions';
 include/uninstall_replication_observers_example.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_roles.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_roles.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_roles.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_roles.result	2021-09-28 11:46:34.000000000 +0000
@@ -125,10 +125,10 @@
 
 SHOW CREATE USER u2@localhost;
 CREATE USER for u2@localhost
-CREATE USER 'u2'@'localhost' IDENTIFIED WITH 'caching_sha2_password' DEFAULT ROLE `r1`@`%`,`r2`@`%` REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u2`@`localhost` IDENTIFIED WITH 'caching_sha2_password' DEFAULT ROLE `r1`@`%`,`r2`@`%` REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 SHOW CREATE USER u3@localhost;
 CREATE USER for u3@localhost
-CREATE USER 'u3'@'localhost' IDENTIFIED WITH 'caching_sha2_password' DEFAULT ROLE `r1`@`%` REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u3`@`localhost` IDENTIFIED WITH 'caching_sha2_password' DEFAULT ROLE `r1`@`%` REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 [connection master]
 connection master;
 
@@ -169,10 +169,10 @@
 
 SHOW CREATE USER u2@localhost;
 CREATE USER for u2@localhost
-CREATE USER 'u2'@'localhost' IDENTIFIED WITH 'caching_sha2_password' DEFAULT ROLE `r1`@`%` REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u2`@`localhost` IDENTIFIED WITH 'caching_sha2_password' DEFAULT ROLE `r1`@`%` REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 SHOW CREATE USER u3@localhost;
 CREATE USER for u3@localhost
-CREATE USER 'u3'@'localhost' IDENTIFIED WITH 'caching_sha2_password' DEFAULT ROLE `r2`@`%` REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `u3`@`localhost` IDENTIFIED WITH 'caching_sha2_password' DEFAULT ROLE `r2`@`%` REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 
 # Cleanup Statement
 [connection master]
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_row_img_sanity.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_row_img_sanity.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_row_img_sanity.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_row_img_sanity.result	2021-09-28 11:46:34.000000000 +0000
@@ -744,6 +744,8 @@
 DROP TABLE t;
 include/wait_for_slave_sql_error.inc [errno=1032]
 DROP TABLE t;
+include/stop_slave_io.inc
+RESET REPLICA;
 include/rpl_reset.inc
 CON: 'master', IMG: 'FULL', RESTART SLAVE: 'N'
 SET SESSION binlog_row_image= 'FULL';
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_row_jsondiff_error.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_row_jsondiff_error.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_row_jsondiff_error.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_row_jsondiff_error.result	2021-09-28 11:46:34.000000000 +0000
@@ -174,9 +174,6 @@
 INSERT INTO test.t (i, j) VALUES (1, '{"id": 1, "value": "x"}');
 SET SQL_LOG_BIN = 1;
 ## Adding debug point 'binlog_corrupt_json_diff_bad_op' to @@SESSION.debug
-SELECT @@SESSION.DEBUG;
-@@SESSION.DEBUG
-d,binlog_corrupt_json_diff_bad_op
 UPDATE t SET j = JSON_SET(j, '$.id', '[1]') WHERE i = 1;
 ## Removing debug point 'binlog_corrupt_json_diff_bad_op' from @@SESSION.debug
 ### UPDATE `test`.`t`
@@ -206,9 +203,6 @@
 INSERT INTO test.t (i, j) VALUES (1, '{"id": 1, "value": "x"}');
 SET SQL_LOG_BIN = 1;
 ## Adding debug point 'binlog_corrupt_json_diff_truncate_before_path_length' to @@SESSION.debug
-SELECT @@SESSION.DEBUG;
-@@SESSION.DEBUG
-d,binlog_corrupt_json_diff_truncate_before_path_length
 UPDATE t SET j = JSON_SET(j, '$.id', '[1]') WHERE i = 1;
 ## Removing debug point 'binlog_corrupt_json_diff_truncate_before_path_length' from @@SESSION.debug
 ### UPDATE `test`.`t`
@@ -238,9 +232,6 @@
 INSERT INTO test.t (i, j) VALUES (1, '{"id": 1, "value": "x"}');
 SET SQL_LOG_BIN = 1;
 ## Adding debug point 'binlog_corrupt_json_diff_bad_path_length' to @@SESSION.debug
-SELECT @@SESSION.DEBUG;
-@@SESSION.DEBUG
-d,binlog_corrupt_json_diff_bad_path_length
 UPDATE t SET j = JSON_SET(j, '$.id', '[1]') WHERE i = 1;
 ## Removing debug point 'binlog_corrupt_json_diff_bad_path_length' from @@SESSION.debug
 ### UPDATE `test`.`t`
@@ -270,9 +261,6 @@
 INSERT INTO test.t (i, j) VALUES (1, '{"id": 1, "value": "x"}');
 SET SQL_LOG_BIN = 1;
 ## Adding debug point 'binlog_corrupt_json_diff_truncate_before_path' to @@SESSION.debug
-SELECT @@SESSION.DEBUG;
-@@SESSION.DEBUG
-d,binlog_corrupt_json_diff_truncate_before_path
 UPDATE t SET j = JSON_SET(j, '$.id', '[1]') WHERE i = 1;
 ## Removing debug point 'binlog_corrupt_json_diff_truncate_before_path' from @@SESSION.debug
 ### UPDATE `test`.`t`
@@ -302,9 +290,6 @@
 INSERT INTO test.t (i, j) VALUES (1, '{"id": 1, "value": "x"}');
 SET SQL_LOG_BIN = 1;
 ## Adding debug point 'binlog_corrupt_json_diff_bad_path_char' to @@SESSION.debug
-SELECT @@SESSION.DEBUG;
-@@SESSION.DEBUG
-d,binlog_corrupt_json_diff_bad_path_char
 UPDATE t SET j = JSON_SET(j, '$.id', '[1]') WHERE i = 1;
 ## Removing debug point 'binlog_corrupt_json_diff_bad_path_char' from @@SESSION.debug
 ### UPDATE `test`.`t`
@@ -334,9 +319,6 @@
 INSERT INTO test.t (i, j) VALUES (1, '{"id": 1, "value": "x"}');
 SET SQL_LOG_BIN = 1;
 ## Adding debug point 'binlog_corrupt_json_diff_truncate_before_doc_length' to @@SESSION.debug
-SELECT @@SESSION.DEBUG;
-@@SESSION.DEBUG
-d,binlog_corrupt_json_diff_truncate_before_doc_length
 UPDATE t SET j = JSON_SET(j, '$.id', '[1]') WHERE i = 1;
 ## Removing debug point 'binlog_corrupt_json_diff_truncate_before_doc_length' from @@SESSION.debug
 ### UPDATE `test`.`t`
@@ -366,9 +348,6 @@
 INSERT INTO test.t (i, j) VALUES (1, '{"id": 1, "value": "x"}');
 SET SQL_LOG_BIN = 1;
 ## Adding debug point 'binlog_corrupt_json_diff_bad_doc_length' to @@SESSION.debug
-SELECT @@SESSION.DEBUG;
-@@SESSION.DEBUG
-d,binlog_corrupt_json_diff_bad_doc_length
 UPDATE t SET j = JSON_SET(j, '$.id', '[1]') WHERE i = 1;
 ## Removing debug point 'binlog_corrupt_json_diff_bad_doc_length' from @@SESSION.debug
 ### UPDATE `test`.`t`
@@ -398,9 +377,6 @@
 INSERT INTO test.t (i, j) VALUES (1, '{"id": 1, "value": "x"}');
 SET SQL_LOG_BIN = 1;
 ## Adding debug point 'binlog_corrupt_json_diff_truncate_before_doc' to @@SESSION.debug
-SELECT @@SESSION.DEBUG;
-@@SESSION.DEBUG
-d,binlog_corrupt_json_diff_truncate_before_doc
 UPDATE t SET j = JSON_SET(j, '$.id', '[1]') WHERE i = 1;
 ## Removing debug point 'binlog_corrupt_json_diff_truncate_before_doc' from @@SESSION.debug
 ### UPDATE `test`.`t`
@@ -430,9 +406,6 @@
 INSERT INTO test.t (i, j) VALUES (1, '{"id": 1, "value": "x"}');
 SET SQL_LOG_BIN = 1;
 ## Adding debug point 'binlog_corrupt_json_diff_bad_doc_char' to @@SESSION.debug
-SELECT @@SESSION.DEBUG;
-@@SESSION.DEBUG
-d,binlog_corrupt_json_diff_bad_doc_char
 UPDATE t SET j = JSON_SET(j, '$.id', '[1]') WHERE i = 1;
 ## Removing debug point 'binlog_corrupt_json_diff_bad_doc_char' from @@SESSION.debug
 ### UPDATE `test`.`t`
@@ -462,9 +435,6 @@
 INSERT INTO test.t (i, j) VALUES (1, '{"id": 1, "value": "x"}');
 SET SQL_LOG_BIN = 1;
 ## Adding debug point 'binlog_omit_last_column_from_table_map_event' to @@SESSION.debug
-SELECT @@SESSION.DEBUG;
-@@SESSION.DEBUG
-d,binlog_omit_last_column_from_table_map_event
 UPDATE t SET j = JSON_SET(j, '$.id', '[1]') WHERE i = 1;
 ## Removing debug point 'binlog_omit_last_column_from_table_map_event' from @@SESSION.debug
 ### UPDATE `test`.`t`
@@ -625,9 +595,6 @@
 INSERT INTO test.t (i, j) VALUES (1, '{"id": 1, "value": "x"}');
 SET SQL_LOG_BIN = 1;
 ## Adding debug point 'binlog_corrupt_json_diff_bad_op' to @@SESSION.debug
-SELECT @@SESSION.DEBUG;
-@@SESSION.DEBUG
-d,binlog_corrupt_json_diff_bad_op
 UPDATE t SET j = JSON_SET(j, '$.id', '[1]') WHERE i = 1;
 ## Removing debug point 'binlog_corrupt_json_diff_bad_op' from @@SESSION.debug
 DROP TABLE test.t;
@@ -648,9 +615,6 @@
 INSERT INTO test.t (i, j) VALUES (1, '{"id": 1, "value": "x"}');
 SET SQL_LOG_BIN = 1;
 ## Adding debug point 'binlog_corrupt_json_diff_truncate_before_path_length' to @@SESSION.debug
-SELECT @@SESSION.DEBUG;
-@@SESSION.DEBUG
-d,binlog_corrupt_json_diff_truncate_before_path_length
 UPDATE t SET j = JSON_SET(j, '$.id', '[1]') WHERE i = 1;
 ## Removing debug point 'binlog_corrupt_json_diff_truncate_before_path_length' from @@SESSION.debug
 DROP TABLE test.t;
@@ -671,9 +635,6 @@
 INSERT INTO test.t (i, j) VALUES (1, '{"id": 1, "value": "x"}');
 SET SQL_LOG_BIN = 1;
 ## Adding debug point 'binlog_corrupt_json_diff_bad_path_length' to @@SESSION.debug
-SELECT @@SESSION.DEBUG;
-@@SESSION.DEBUG
-d,binlog_corrupt_json_diff_bad_path_length
 UPDATE t SET j = JSON_SET(j, '$.id', '[1]') WHERE i = 1;
 ## Removing debug point 'binlog_corrupt_json_diff_bad_path_length' from @@SESSION.debug
 DROP TABLE test.t;
@@ -694,9 +655,6 @@
 INSERT INTO test.t (i, j) VALUES (1, '{"id": 1, "value": "x"}');
 SET SQL_LOG_BIN = 1;
 ## Adding debug point 'binlog_corrupt_json_diff_truncate_before_path' to @@SESSION.debug
-SELECT @@SESSION.DEBUG;
-@@SESSION.DEBUG
-d,binlog_corrupt_json_diff_truncate_before_path
 UPDATE t SET j = JSON_SET(j, '$.id', '[1]') WHERE i = 1;
 ## Removing debug point 'binlog_corrupt_json_diff_truncate_before_path' from @@SESSION.debug
 DROP TABLE test.t;
@@ -717,9 +675,6 @@
 INSERT INTO test.t (i, j) VALUES (1, '{"id": 1, "value": "x"}');
 SET SQL_LOG_BIN = 1;
 ## Adding debug point 'binlog_corrupt_json_diff_bad_path_char' to @@SESSION.debug
-SELECT @@SESSION.DEBUG;
-@@SESSION.DEBUG
-d,binlog_corrupt_json_diff_bad_path_char
 UPDATE t SET j = JSON_SET(j, '$.id', '[1]') WHERE i = 1;
 ## Removing debug point 'binlog_corrupt_json_diff_bad_path_char' from @@SESSION.debug
 DROP TABLE test.t;
@@ -740,9 +695,6 @@
 INSERT INTO test.t (i, j) VALUES (1, '{"id": 1, "value": "x"}');
 SET SQL_LOG_BIN = 1;
 ## Adding debug point 'binlog_corrupt_json_diff_truncate_before_doc_length' to @@SESSION.debug
-SELECT @@SESSION.DEBUG;
-@@SESSION.DEBUG
-d,binlog_corrupt_json_diff_truncate_before_doc_length
 UPDATE t SET j = JSON_SET(j, '$.id', '[1]') WHERE i = 1;
 ## Removing debug point 'binlog_corrupt_json_diff_truncate_before_doc_length' from @@SESSION.debug
 DROP TABLE test.t;
@@ -763,9 +715,6 @@
 INSERT INTO test.t (i, j) VALUES (1, '{"id": 1, "value": "x"}');
 SET SQL_LOG_BIN = 1;
 ## Adding debug point 'binlog_corrupt_json_diff_bad_doc_length' to @@SESSION.debug
-SELECT @@SESSION.DEBUG;
-@@SESSION.DEBUG
-d,binlog_corrupt_json_diff_bad_doc_length
 UPDATE t SET j = JSON_SET(j, '$.id', '[1]') WHERE i = 1;
 ## Removing debug point 'binlog_corrupt_json_diff_bad_doc_length' from @@SESSION.debug
 DROP TABLE test.t;
@@ -786,9 +735,6 @@
 INSERT INTO test.t (i, j) VALUES (1, '{"id": 1, "value": "x"}');
 SET SQL_LOG_BIN = 1;
 ## Adding debug point 'binlog_corrupt_json_diff_truncate_before_doc' to @@SESSION.debug
-SELECT @@SESSION.DEBUG;
-@@SESSION.DEBUG
-d,binlog_corrupt_json_diff_truncate_before_doc
 UPDATE t SET j = JSON_SET(j, '$.id', '[1]') WHERE i = 1;
 ## Removing debug point 'binlog_corrupt_json_diff_truncate_before_doc' from @@SESSION.debug
 DROP TABLE test.t;
@@ -809,9 +755,6 @@
 INSERT INTO test.t (i, j) VALUES (1, '{"id": 1, "value": "x"}');
 SET SQL_LOG_BIN = 1;
 ## Adding debug point 'binlog_corrupt_json_diff_bad_doc_char' to @@SESSION.debug
-SELECT @@SESSION.DEBUG;
-@@SESSION.DEBUG
-d,binlog_corrupt_json_diff_bad_doc_char
 UPDATE t SET j = JSON_SET(j, '$.id', '[1]') WHERE i = 1;
 ## Removing debug point 'binlog_corrupt_json_diff_bad_doc_char' from @@SESSION.debug
 DROP TABLE test.t;
@@ -832,9 +775,6 @@
 INSERT INTO test.t (i, j) VALUES (1, '{"id": 1, "value": "x"}');
 SET SQL_LOG_BIN = 1;
 ## Adding debug point 'binlog_omit_last_column_from_table_map_event' to @@SESSION.debug
-SELECT @@SESSION.DEBUG;
-@@SESSION.DEBUG
-d,binlog_omit_last_column_from_table_map_event
 UPDATE t SET j = JSON_SET(j, '$.id', '[1]') WHERE i = 1;
 ## Removing debug point 'binlog_omit_last_column_from_table_map_event' from @@SESSION.debug
 DROP TABLE test.t;
@@ -992,9 +932,6 @@
 INSERT INTO test.t (i, j) VALUES (1, '{"id": 1, "value": "x"}');
 SET SQL_LOG_BIN = 1;
 ## Adding debug point 'binlog_corrupt_json_diff_bad_op' to @@SESSION.debug
-SELECT @@SESSION.DEBUG;
-@@SESSION.DEBUG
-d,binlog_corrupt_json_diff_bad_op
 UPDATE t SET j = JSON_SET(j, '$.id', '[1]') WHERE i = 1;
 ## Removing debug point 'binlog_corrupt_json_diff_bad_op' from @@SESSION.debug
 ### UPDATE `test`.`t`
@@ -1024,9 +961,6 @@
 INSERT INTO test.t (i, j) VALUES (1, '{"id": 1, "value": "x"}');
 SET SQL_LOG_BIN = 1;
 ## Adding debug point 'binlog_corrupt_json_diff_truncate_before_path_length' to @@SESSION.debug
-SELECT @@SESSION.DEBUG;
-@@SESSION.DEBUG
-d,binlog_corrupt_json_diff_truncate_before_path_length
 UPDATE t SET j = JSON_SET(j, '$.id', '[1]') WHERE i = 1;
 ## Removing debug point 'binlog_corrupt_json_diff_truncate_before_path_length' from @@SESSION.debug
 ### UPDATE `test`.`t`
@@ -1056,9 +990,6 @@
 INSERT INTO test.t (i, j) VALUES (1, '{"id": 1, "value": "x"}');
 SET SQL_LOG_BIN = 1;
 ## Adding debug point 'binlog_corrupt_json_diff_bad_path_length' to @@SESSION.debug
-SELECT @@SESSION.DEBUG;
-@@SESSION.DEBUG
-d,binlog_corrupt_json_diff_bad_path_length
 UPDATE t SET j = JSON_SET(j, '$.id', '[1]') WHERE i = 1;
 ## Removing debug point 'binlog_corrupt_json_diff_bad_path_length' from @@SESSION.debug
 ### UPDATE `test`.`t`
@@ -1088,9 +1019,6 @@
 INSERT INTO test.t (i, j) VALUES (1, '{"id": 1, "value": "x"}');
 SET SQL_LOG_BIN = 1;
 ## Adding debug point 'binlog_corrupt_json_diff_truncate_before_path' to @@SESSION.debug
-SELECT @@SESSION.DEBUG;
-@@SESSION.DEBUG
-d,binlog_corrupt_json_diff_truncate_before_path
 UPDATE t SET j = JSON_SET(j, '$.id', '[1]') WHERE i = 1;
 ## Removing debug point 'binlog_corrupt_json_diff_truncate_before_path' from @@SESSION.debug
 ### UPDATE `test`.`t`
@@ -1120,9 +1048,6 @@
 INSERT INTO test.t (i, j) VALUES (1, '{"id": 1, "value": "x"}');
 SET SQL_LOG_BIN = 1;
 ## Adding debug point 'binlog_corrupt_json_diff_bad_path_char' to @@SESSION.debug
-SELECT @@SESSION.DEBUG;
-@@SESSION.DEBUG
-d,binlog_corrupt_json_diff_bad_path_char
 UPDATE t SET j = JSON_SET(j, '$.id', '[1]') WHERE i = 1;
 ## Removing debug point 'binlog_corrupt_json_diff_bad_path_char' from @@SESSION.debug
 ### UPDATE `test`.`t`
@@ -1152,9 +1077,6 @@
 INSERT INTO test.t (i, j) VALUES (1, '{"id": 1, "value": "x"}');
 SET SQL_LOG_BIN = 1;
 ## Adding debug point 'binlog_corrupt_json_diff_truncate_before_doc_length' to @@SESSION.debug
-SELECT @@SESSION.DEBUG;
-@@SESSION.DEBUG
-d,binlog_corrupt_json_diff_truncate_before_doc_length
 UPDATE t SET j = JSON_SET(j, '$.id', '[1]') WHERE i = 1;
 ## Removing debug point 'binlog_corrupt_json_diff_truncate_before_doc_length' from @@SESSION.debug
 ### UPDATE `test`.`t`
@@ -1184,9 +1106,6 @@
 INSERT INTO test.t (i, j) VALUES (1, '{"id": 1, "value": "x"}');
 SET SQL_LOG_BIN = 1;
 ## Adding debug point 'binlog_corrupt_json_diff_bad_doc_length' to @@SESSION.debug
-SELECT @@SESSION.DEBUG;
-@@SESSION.DEBUG
-d,binlog_corrupt_json_diff_bad_doc_length
 UPDATE t SET j = JSON_SET(j, '$.id', '[1]') WHERE i = 1;
 ## Removing debug point 'binlog_corrupt_json_diff_bad_doc_length' from @@SESSION.debug
 ### UPDATE `test`.`t`
@@ -1216,9 +1135,6 @@
 INSERT INTO test.t (i, j) VALUES (1, '{"id": 1, "value": "x"}');
 SET SQL_LOG_BIN = 1;
 ## Adding debug point 'binlog_corrupt_json_diff_truncate_before_doc' to @@SESSION.debug
-SELECT @@SESSION.DEBUG;
-@@SESSION.DEBUG
-d,binlog_corrupt_json_diff_truncate_before_doc
 UPDATE t SET j = JSON_SET(j, '$.id', '[1]') WHERE i = 1;
 ## Removing debug point 'binlog_corrupt_json_diff_truncate_before_doc' from @@SESSION.debug
 ### UPDATE `test`.`t`
@@ -1248,9 +1164,6 @@
 INSERT INTO test.t (i, j) VALUES (1, '{"id": 1, "value": "x"}');
 SET SQL_LOG_BIN = 1;
 ## Adding debug point 'binlog_corrupt_json_diff_bad_doc_char' to @@SESSION.debug
-SELECT @@SESSION.DEBUG;
-@@SESSION.DEBUG
-d,binlog_corrupt_json_diff_bad_doc_char
 UPDATE t SET j = JSON_SET(j, '$.id', '[1]') WHERE i = 1;
 ## Removing debug point 'binlog_corrupt_json_diff_bad_doc_char' from @@SESSION.debug
 ### UPDATE `test`.`t`
@@ -1280,9 +1193,6 @@
 INSERT INTO test.t (i, j) VALUES (1, '{"id": 1, "value": "x"}');
 SET SQL_LOG_BIN = 1;
 ## Adding debug point 'binlog_omit_last_column_from_table_map_event' to @@SESSION.debug
-SELECT @@SESSION.DEBUG;
-@@SESSION.DEBUG
-d,binlog_omit_last_column_from_table_map_event
 UPDATE t SET j = JSON_SET(j, '$.id', '[1]') WHERE i = 1;
 ## Removing debug point 'binlog_omit_last_column_from_table_map_event' from @@SESSION.debug
 ### UPDATE `test`.`t`
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result	2021-09-28 11:46:34.000000000 +0000
@@ -356,6 +356,7 @@
   `Master_zstd_compression_level` int unsigned NOT NULL COMMENT 'Compression level associated with zstd compression algorithm.',
   `Tls_ciphersuites` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'Ciphersuites used for TLS 1.3 communication with the master server.',
   `Source_connection_auto_failover` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Indicates whether the channel connection failover is enabled.',
+  `Gtid_only` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Indicates if this channel only uses GTIDs and does not persist positions.',
   PRIMARY KEY (`Channel_name`)
 ) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='Master Information'
 SHOW CREATE TABLE mysql.slave_relay_log_info;
@@ -434,6 +435,7 @@
   `Master_zstd_compression_level` int unsigned NOT NULL COMMENT 'Compression level associated with zstd compression algorithm.',
   `Tls_ciphersuites` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'Ciphersuites used for TLS 1.3 communication with the master server.',
   `Source_connection_auto_failover` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Indicates whether the channel connection failover is enabled.',
+  `Gtid_only` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Indicates if this channel only uses GTIDs and does not persist positions.',
   PRIMARY KEY (`Channel_name`)
 ) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='Master Information'
 SHOW CREATE TABLE mysql.slave_relay_log_info;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_row_slave_skip_error_all.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_row_slave_skip_error_all.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_row_slave_skip_error_all.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_row_slave_skip_error_all.result	2021-09-28 11:46:34.000000000 +0000
@@ -24,7 +24,7 @@
 # as we have set slave_skip_error=all.
 include/sync_slave_sql_with_master.inc
 # Enable a debug point to simulate failure during rows event cleanup.
-SET @@GLOBAL.DEBUG= 'd,simulate_rows_event_cleanup_failure';
+# Adding debug point 'simulate_rows_event_cleanup_failure' to @@GLOBAL.debug
 [connection master]
 UPDATE t SET name='Old';
 [connection slave]
@@ -35,7 +35,7 @@
 include/wait_for_slave_sql_error.inc [errno=1180]
 include/assert_grep.inc [Found 2 warning in the error log]
 ==== Clean up ====
-SET @@GLOBAL.DEBUG= '$debug_saved';
+# Removing debug point 'simulate_rows_event_cleanup_failure' from @@GLOBAL.debug
 include/stop_slave_io.inc
 RESET MASTER;
 RESET SLAVE;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_seconds_behind_master_mts.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_seconds_behind_master_mts.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_seconds_behind_master_mts.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_seconds_behind_master_mts.result	2021-09-28 11:46:34.000000000 +0000
@@ -7,9 +7,11 @@
 SET @save_replica_parallel_type = @@GLOBAL.replica_parallel_type;
 SET @save.replica_parallel_workers= @@global.replica_parallel_workers;
 SET @save_replica_transaction_retries= @@global.replica_transaction_retries;
+SET @save_replica_preserve_commit_order= @@global.replica_preserve_commit_order;
 # Test for PARALLEL_DATABASE
 SET GLOBAL replica_parallel_type = 'DATABASE';
 SET @@global.replica_parallel_workers= 4;
+SET @@global.replica_preserve_commit_order=0;
 include/start_slave.inc
 # Scenario 1: With two workers, check if Seconds_Behind_Master is
 # calculated correctly when all the workers are waiting.
@@ -110,6 +112,7 @@
 # Test for LOGICAL_CLOCK
 SET GLOBAL replica_parallel_type = 'LOGICAL_CLOCK';
 SET GLOBAL replica_parallel_workers = 3;
+SET GLOBAL replica_preserve_commit_order=1;
 include/start_slave.inc
 # Scenario 1: With two workers, check if Seconds_Behind_Master is
 # calculated correctly when two statements are applied in parallel on
@@ -224,5 +227,6 @@
 SET @@GLOBAL.replica_parallel_type= @save_replica_parallel_type;
 SET @@global.replica_parallel_workers= @save.replica_parallel_workers;
 SET @@global.replica_transaction_retries= @save_replica_transaction_retries;
+SET @@global.replica_preserve_commit_order= @save_replica_preserve_commit_order;
 include/start_slave.inc
 include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_show_slave_running.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_show_slave_running.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_show_slave_running.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_show_slave_running.result	2021-09-28 11:46:34.000000000 +0000
@@ -5,7 +5,7 @@
 [connection master]
 SET DEBUG_SYNC= 'RESET';
 include/stop_slave.inc
-set global debug= 'd,dbug.before_get_running_status_yes';
+# Adding debug point 'dbug.before_get_running_status_yes' to @@GLOBAL.debug
 Slave_running, Slave_IO_Running, Slave_SQL_Running, must be OFF, NO, NO in three following queries
 select rcs.SERVICE_STATE as Slave_IO_Running, ras.SERVICE_STATE as Slave_SQL_Running from performance_schema.replication_applier_status ras, performance_schema.replication_connection_status rcs;
 Slave_IO_Running	Slave_SQL_Running
@@ -32,7 +32,7 @@
 Slave_IO_Running	Slave_SQL_Running
 ON	ON
 include/sync_slave_sql_with_master.inc
-set global debug= '';
+# Removing debug point 'dbug.before_get_running_status_yes' from @@GLOBAL.debug
 SET DEBUG_SYNC= 'RESET';
 End of tests
 include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_show_slave_status_deadlock.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_show_slave_status_deadlock.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_show_slave_status_deadlock.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_show_slave_status_deadlock.result	2021-09-28 11:46:34.000000000 +0000
@@ -8,7 +8,7 @@
 include/sync_slave_sql_with_master.inc
 # Setup GLOBAL.DEBUG at slave to reach commit
 [connection slave]
-SET @@GLOBAL.DEBUG= '+d,dbug.reached_commit';
+# Adding debug point 'dbug.reached_commit' to @@GLOBAL.debug
 # Do some DML operation on master so that it will be blocked on
 # slave as global read lock is in place.
 [connection master]
@@ -23,7 +23,7 @@
 [connection slave]
 SHOW SLAVE STATUS;
 UNLOCK TABLES;
-SET @@GLOBAL.DEBUG= '$debug_saved';
+# Removing debug point 'dbug.reached_commit' from @@GLOBAL.debug
 # Restart SQL thread so that it notices debug has changed
 include/restart_slave.inc
 [connection master]
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_skip_incident_error_cross.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_skip_incident_error_cross.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_skip_incident_error_cross.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_skip_incident_error_cross.result	2021-09-28 11:46:34.000000000 +0000
@@ -14,8 +14,7 @@
 Warnings:
 Warning	1745	Option binlog_stmt_cache_size (32768) is greater than max_binlog_stmt_cache_size (4096); setting binlog_stmt_cache_size equal to max_binlog_stmt_cache_size.
 SET GLOBAL binlog_stmt_cache_size = 4096;
-SET @save_debug=@@global.debug;
-SET GLOBAL DEBUG='d,simulate_write_incident_event_into_binlog_directly';
+# Adding debug point 'simulate_write_incident_event_into_binlog_directly' to @@GLOBAL.debug
 CREATE TABLE t1(c1 INT PRIMARY KEY, data TEXT(30000)) ENGINE=MyIsam;
 #
 # A single statement on non-transactional table causes to log an incident
@@ -34,7 +33,7 @@
 include/sync_slave_sql_with_master.inc
 [connection master]
 DROP TABLE t1;
-SET GLOBAL DEBUG= @save_debug;
+# Removing debug point 'simulate_write_incident_event_into_binlog_directly' from @@GLOBAL.debug
 SET GLOBAL max_binlog_stmt_cache_size= ORIGINAL_VALUE;
 SET GLOBAL binlog_stmt_cache_size= ORIGINAL_VALUE;
 include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result	2021-09-28 11:46:34.000000000 +0000
@@ -3,7 +3,7 @@
 Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
-SET @@GLOBAL.DEBUG = '+d,remove_replica_load_file_before_write';
+# Adding debug point 'remove_replica_load_file_before_write' to @@GLOBAL.debug
 create table t1(a int not null auto_increment, b int, primary key(a)) engine=innodb;
 start transaction;
 insert into t1(b) values (1);
@@ -25,5 +25,5 @@
 call mtr.add_suppression("Slave.*: File.* not found.*");
 call mtr.add_suppression("Slave.*: .*Error .File.* not found.* Error_code: MY-000029");
 call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
-SET @@GLOBAL.DEBUG = '';
+# Removing debug point 'remove_replica_load_file_before_write' from @@GLOBAL.debug
 include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_slave_start_after_clone.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_slave_start_after_clone.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_slave_start_after_clone.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_slave_start_after_clone.result	2021-09-28 11:46:34.000000000 +0000
@@ -1,11 +1,11 @@
-#
-# 1. Set up a replication connection from server 1 to server 2
 include/master-slave.inc
 Warnings:
 Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
 #
+# 1. Create connections to server3
+#
 # 2. Create a table for testing
 [connection server_1]
 CREATE TABLE test.t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
@@ -48,7 +48,7 @@
 SET SESSION sql_log_bin=0;
 call mtr.add_suppression("Clone removing all user data for provisioning: Started");
 call mtr.add_suppression("Clone removing all user data for provisioning: Finished");
-call mtr.add_suppression("Recovery from master pos [0-9]+ and file [a-zA-Z-]+\.[0-9]+ for channel ''*");
+call mtr.add_suppression("Recovery from master pos [0-9]+ and file [a-zA-Z-]*\.*[0-9]* for channel ''*");
 call mtr.add_suppression("Relay log information for channel '' was found after a clone operation. Relay log recovery");
 SET SESSION sql_log_bin=1;
 include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_slow_query_log.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_slow_query_log.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_slow_query_log.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_slow_query_log.result	2021-09-28 11:46:34.000000000 +0000
@@ -97,9 +97,12 @@
 include/sync_slave_sql_with_master.inc
 SET @@global.log_output= @old_log_output;
 SET @@global.long_query_time= @old_long_query_time;
+TRUNCATE TABLE mysql.slow_log;
+TRUNCATE TABLE mysql.general_log;
 DROP TABLE t1;
 include/sync_slave_sql_with_master.inc
 SET @@global.log_output= @old_log_output;
+TRUNCATE TABLE mysql.general_log;
 SET @@global.long_query_time= @old_long_query_time;
 SET @@global.log_slow_replica_statements= @old_log_slow_replica_statements;
 include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_sql_thread_error.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_sql_thread_error.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_sql_thread_error.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_sql_thread_error.result	2021-09-28 11:46:34.000000000 +0000
@@ -6,7 +6,7 @@
 [connection slave]
 CALL mtr.add_suppression("Relay log read failure");
 SET @save_debug=@@GLOBAL.debug;
-SET GLOBAL debug="d,force_sql_thread_error";
+SET GLOBAL debug="+d,force_sql_thread_error";
 START SLAVE SQL_THREAD;
 Warnings:
 Warning	1287	'START SLAVE' is deprecated and will be removed in a future release. Please use START REPLICA instead
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe_checksum.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe_checksum.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe_checksum.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe_checksum.result	2021-09-28 11:46:34.000000000 +0000
@@ -356,6 +356,7 @@
   `Master_zstd_compression_level` int unsigned NOT NULL COMMENT 'Compression level associated with zstd compression algorithm.',
   `Tls_ciphersuites` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'Ciphersuites used for TLS 1.3 communication with the master server.',
   `Source_connection_auto_failover` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Indicates whether the channel connection failover is enabled.',
+  `Gtid_only` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Indicates if this channel only uses GTIDs and does not persist positions.',
   PRIMARY KEY (`Channel_name`)
 ) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='Master Information'
 SHOW CREATE TABLE mysql.slave_relay_log_info;
@@ -434,6 +435,7 @@
   `Master_zstd_compression_level` int unsigned NOT NULL COMMENT 'Compression level associated with zstd compression algorithm.',
   `Tls_ciphersuites` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'Ciphersuites used for TLS 1.3 communication with the master server.',
   `Source_connection_auto_failover` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Indicates whether the channel connection failover is enabled.',
+  `Gtid_only` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Indicates if this channel only uses GTIDs and does not persist positions.',
   PRIMARY KEY (`Channel_name`)
 ) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='Master Information'
 SHOW CREATE TABLE mysql.slave_relay_log_info;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe.result	2021-09-28 11:46:34.000000000 +0000
@@ -356,6 +356,7 @@
   `Master_zstd_compression_level` int unsigned NOT NULL COMMENT 'Compression level associated with zstd compression algorithm.',
   `Tls_ciphersuites` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'Ciphersuites used for TLS 1.3 communication with the master server.',
   `Source_connection_auto_failover` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Indicates whether the channel connection failover is enabled.',
+  `Gtid_only` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Indicates if this channel only uses GTIDs and does not persist positions.',
   PRIMARY KEY (`Channel_name`)
 ) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='Master Information'
 SHOW CREATE TABLE mysql.slave_relay_log_info;
@@ -434,6 +435,7 @@
   `Master_zstd_compression_level` int unsigned NOT NULL COMMENT 'Compression level associated with zstd compression algorithm.',
   `Tls_ciphersuites` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'Ciphersuites used for TLS 1.3 communication with the master server.',
   `Source_connection_auto_failover` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Indicates whether the channel connection failover is enabled.',
+  `Gtid_only` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Indicates if this channel only uses GTIDs and does not persist positions.',
   PRIMARY KEY (`Channel_name`)
 ) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='Master Information'
 SHOW CREATE TABLE mysql.slave_relay_log_info;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe_small.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe_small.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe_small.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe_small.result	2021-09-28 11:46:34.000000000 +0000
@@ -463,6 +463,7 @@
   `Master_zstd_compression_level` int unsigned NOT NULL COMMENT 'Compression level associated with zstd compression algorithm.',
   `Tls_ciphersuites` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'Ciphersuites used for TLS 1.3 communication with the master server.',
   `Source_connection_auto_failover` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Indicates whether the channel connection failover is enabled.',
+  `Gtid_only` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Indicates if this channel only uses GTIDs and does not persist positions.',
   PRIMARY KEY (`Channel_name`)
 ) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='Master Information'
 SHOW CREATE TABLE mysql.slave_relay_log_info;
@@ -541,6 +542,7 @@
   `Master_zstd_compression_level` int unsigned NOT NULL COMMENT 'Compression level associated with zstd compression algorithm.',
   `Tls_ciphersuites` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'Ciphersuites used for TLS 1.3 communication with the master server.',
   `Source_connection_auto_failover` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Indicates whether the channel connection failover is enabled.',
+  `Gtid_only` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Indicates if this channel only uses GTIDs and does not persist positions.',
   PRIMARY KEY (`Channel_name`)
 ) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='Master Information'
 SHOW CREATE TABLE mysql.slave_relay_log_info;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_sync.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_sync.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_sync.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_sync.result	2021-09-28 11:46:34.000000000 +0000
@@ -5,7 +5,7 @@
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
 call mtr.add_suppression('Attempting backtrace');
-call mtr.add_suppression("Recovery from master pos .* and file master-bin.000001");
+call mtr.add_suppression("Recovery from master pos [0-9]+ and file [a-zA-Z-]*\.*[0-9]* for channel ''*");
 call mtr.add_suppression("Binlog has bad magic number;  It's not a binary log file that can be used by this version of MySQL");
 CREATE TABLE t1(a INT, PRIMARY KEY(a)) engine=innodb;
 insert into t1(a) values(1);
@@ -19,7 +19,7 @@
 insert into t1(a) values(6);
 =====Removing relay log files and crashing/recoverying the slave=======;
 include/stop_slave_io.inc
-SET SESSION debug="d,crash_before_rotate_relaylog";
+SET SESSION debug="+d,crash_before_rotate_relaylog";
 FLUSH LOGS;
 ERROR HY000: Lost connection to MySQL server during query
 include/rpl_reconnect.inc
@@ -33,7 +33,7 @@
 insert into t1(a) values(7);
 insert into t1(a) values(8);
 insert into t1(a) values(9);
-SET SESSION debug="d,crash_before_rotate_relaylog";
+SET SESSION debug="+d,crash_before_rotate_relaylog";
 FLUSH LOGS;
 ERROR HY000: Lost connection to MySQL server during query
 include/rpl_reconnect.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_temporary_error_table_repository.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_temporary_error_table_repository.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_temporary_error_table_repository.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_temporary_error_table_repository.result	2021-09-28 11:46:34.000000000 +0000
@@ -6,6 +6,8 @@
 [connection master]
 CREATE TABLE t1 (c1 INT PRIMARY KEY, c2 INT) ENGINE= InnoDB;
 include/stop_slave.inc
+call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
+call mtr.add_suppression(".*worker thread retried transaction.*time.*in vain, giving up.*");
 SET @saved_replica_transaction_retries = @@GLOBAL.replica_transaction_retries;
 SET @saved_innodb_lock_wait_timeout = @@GLOBAL.innodb_lock_wait_timeout;
 SET @saved_master_info_repository = @@GLOBAL.master_info_repository;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_terminology_use_previous_logs.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_terminology_use_previous_logs.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_terminology_use_previous_logs.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_terminology_use_previous_logs.result	2021-09-28 11:46:34.000000000 +0000
@@ -64,6 +64,8 @@
 #### Clean up ####
 [connection master]
 SET @@global.log_output = @save_log_output;
+TRUNCATE TABLE mysql.general_log;
+TRUNCATE TABLE mysql.slow_log;
 SET @@global.long_query_time = @save_long_query_time;
 SET @@global.terminology_use_previous = @save_terminology_use_previous;
 Warnings:
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_unknown_ignorable_event.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_unknown_ignorable_event.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_unknown_ignorable_event.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_unknown_ignorable_event.result	2021-09-28 11:46:34.000000000 +0000
@@ -7,7 +7,7 @@
 include/sync_slave_sql_with_master.inc
 # Set a debug point on slave to simulate unknown ignorable log events.
 SET @save_debug=@@global.debug;
-SET GLOBAL DEBUG='d,simulate_unknown_ignorable_log_event';
+SET GLOBAL DEBUG='+d,simulate_unknown_ignorable_log_event';
 [connection master]
 # Write a previous_gtids log event to binlog
 # on master if gtid mode is on.
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_worker_repository_conversion_with_relaylog_recovery.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_worker_repository_conversion_with_relaylog_recovery.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_worker_repository_conversion_with_relaylog_recovery.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_worker_repository_conversion_with_relaylog_recovery.result	2021-09-28 11:46:34.000000000 +0000
@@ -8,7 +8,8 @@
 # 1. Start by testing FILE to TABLE conversions
 #    Setup the replica to use FILE repositories and start it
 [connection slave]
-call mtr.add_suppression("Recovery from master pos [0-9]+ and file [a-zA-Z-]+\.[0-9]+ for channel ''*");
+call mtr.add_suppression("Recovery from master pos [0-9]+ and file [a-zA-Z-]*\.*[0-9]* for channel ''*");
+call mtr.add_suppression("It is not possible to change the type of the relay log repository because there are workers repositories with possible");
 SET @@GLOBAL.relay_log_info_repository= "FILE";
 Warnings:
 Warning	1287	'@@relay_log_info_repository' is deprecated and will be removed in a future release.
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_zombie_dump_threads.result mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_zombie_dump_threads.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/r/rpl_zombie_dump_threads.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/r/rpl_zombie_dump_threads.result	2021-09-28 11:46:34.000000000 +0000
@@ -6,7 +6,7 @@
 include/stop_dump_threads.inc
 [connection slave]
 SET @save_debug = @@GLOBAL.debug;
-SET GLOBAL debug="d,fake_5_5_version_replica";
+SET GLOBAL debug="+d,fake_5_5_version_replica";
 include/start_slave_io.inc
 include/stop_slave_io.inc
 include/start_slave_io.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_binlog_transaction_dependency_tracking_with_filters.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_binlog_transaction_dependency_tracking_with_filters.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_binlog_transaction_dependency_tracking_with_filters.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_binlog_transaction_dependency_tracking_with_filters.test	2021-09-28 11:46:34.000000000 +0000
@@ -39,7 +39,9 @@
 --source include/start_slave.inc
 # Take backup of variables.
 SET @save_binlog_transaction_dependency_tracking = @@GLOBAL.binlog_transaction_dependency_tracking;
+SET @save_replica_parallel_workers = @@GLOBAL.replica_parallel_workers;
 # Set variables.
+SET GLOBAL replica_parallel_workers = 0;
 SET GLOBAL binlog_transaction_dependency_tracking = COMMIT_ORDER;
 
 --source include/rpl_connection_master.inc
@@ -168,6 +170,7 @@
 --let $dont_print_logical_timestamps=
 SET GLOBAL binlog_transaction_dependency_tracking = COMMIT_ORDER;
 SET @@GLOBAL.binlog_transaction_dependency_tracking= @save_binlog_transaction_dependency_tracking;
+SET @@GLOBAL.replica_parallel_workers = @save_replica_parallel_workers;
 
 --source include/stop_slave.inc
 CHANGE REPLICATION FILTER REPLICATE_REWRITE_DB=(), REPLICATE_IGNORE_DB=();
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_bug26395.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_bug26395.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_bug26395.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_bug26395.test	2021-09-28 11:46:34.000000000 +0000
@@ -53,7 +53,7 @@
 
 # do_not_write_xid stops the master from writing an XID event.
 set @old_debug= @@debug;
-set @@debug= 'd,do_not_write_xid';
+set @@debug= '+d,do_not_write_xid';
 
 
 --echo ==== Test ====
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_bug33931.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_bug33931.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_bug33931.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_bug33931.test	2021-09-28 11:46:34.000000000 +0000
@@ -16,7 +16,10 @@
 reset slave;
 
 # Set debug flags on slave to force errors to occur
-SET GLOBAL debug="d,simulate_io_replica_error_on_init,simulate_sql_replica_error_on_init";
+--let $debug_point= simulate_io_replica_error_on_init
+--source include/add_debug_point.inc
+--let $debug_point= simulate_sql_replica_error_on_init
+--source include/add_debug_point.inc
 
 --disable_query_log
 --replace_regex /[0-9]{4}/####/
@@ -45,7 +48,10 @@
 #
 # Cleanup
 #
-SET GLOBAL debug="";
+--let $debug_point= simulate_io_replica_error_on_init
+--source include/remove_debug_point.inc
+--let $debug_point= simulate_sql_replica_error_on_init
+--source include/remove_debug_point.inc
 
 # Clear Last_SQL_Error and Last_IO_Error
 RESET SLAVE;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_bug41902-slave.opt mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_bug41902-slave.opt
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_bug41902-slave.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_bug41902-slave.opt	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
---loose-debug=-d,simulate_find_log_pos_error
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_bug41902.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_bug41902.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_bug41902.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_bug41902.test	2021-09-28 11:46:34.000000000 +0000
@@ -23,38 +23,53 @@
 connection slave;
 stop slave;
 
-SET @@debug="d,simulate_find_log_pos_error";
+--let $debug_point= simulate_find_log_pos_error
+--source include/add_debug_point.inc
 
 --error ER_UNKNOWN_TARGET_BINLOG
 reset slave;
 show warnings;
 
-SET @@debug="";
+--let $debug_point= simulate_find_log_pos_error
+--source include/remove_debug_point.inc
+
 reset slave;
 CHANGE REPLICATION SOURCE to SOURCE_HOST='dummy';
 
-SET @@debug="d,simulate_find_log_pos_error";
+--let $debug_point= simulate_find_log_pos_error
+--source include/add_debug_point.inc
 
 --error ER_UNKNOWN_TARGET_BINLOG
 CHANGE REPLICATION SOURCE to SOURCE_HOST='dummy';
 
-SET @@debug="";
+--let $debug_point= simulate_find_log_pos_error
+--source include/remove_debug_point.inc
+
 reset slave;
 CHANGE REPLICATION SOURCE to SOURCE_HOST='dummy';
 
 connection master;
-SET @@debug="d,simulate_find_log_pos_error";
+
+--let $debug_point= simulate_find_log_pos_error
+--source include/add_debug_point.inc
+
 --error ER_UNKNOWN_TARGET_BINLOG
 reset master;
 
-SET @@debug="";
+--let $debug_point= simulate_find_log_pos_error
+--source include/remove_debug_point.inc
+
 reset master;
 
-SET @@debug="d,simulate_find_log_pos_error";
+--let $debug_point= simulate_find_log_pos_error
+--source include/add_debug_point.inc
+
 --error ER_UNKNOWN_TARGET_BINLOG
 purge binary logs to 'master-bin.000001';
 
-SET @@debug="";
+--let $debug_point= simulate_find_log_pos_error
+--source include/remove_debug_point.inc
+
 purge binary logs to 'master-bin.000001';
 
 --echo ==== clean up ====
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_change_master_to_require_row_format_syntax_and_pfs.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_change_master_to_require_row_format_syntax_and_pfs.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_change_master_to_require_row_format_syntax_and_pfs.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_change_master_to_require_row_format_syntax_and_pfs.test	2021-09-28 11:46:34.000000000 +0000
@@ -45,6 +45,7 @@
 
 --source include/have_binlog_format_row.inc
 --source include/not_have_privilege_checks_user.inc
+--source include/not_rpl_gtid_only.inc
 
 # Procedure that checks if the PFS data regarding `REQUIRE_ROW_FORMAT` is
 # updated in a given server.
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_channel_creation_under_replica_load.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_channel_creation_under_replica_load.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_channel_creation_under_replica_load.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_channel_creation_under_replica_load.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,74 @@
+# ==== Purpose ====
+#
+# This test checks that channels can be created while load is put on the replica
+#
+# ==== Implementation ====
+#
+# 0. The test needs 2 servers, one with load, and a replica where channels are created
+# 1. Create a table on the source and use Slap to apply load on the server
+# 2. Create 20 channels, 1 per second in the replica
+# 3. Check the data was replicated and 20 channel were created
+# 4. Cleanup
+#
+# ==== References ====
+#
+# Bug#33090128 RANDOM ERROR 1201: COULD NOT INITIALIZE MASTER INFO STRUCTURE; ON CHANGE MASTER
+#
+
+--source include/have_binlog_format_row.inc
+--source include/have_slave_repository_type_table.inc
+--source include/master-slave.inc
+
+--echo #
+--echo # 1. Create a table on the source and use Slap to apply load on the server
+
+--source include/rpl_connection_master.inc
+
+CREATE TABLE test.t1 (a INT NOT NULL AUTO_INCREMENT PRIMARY KEY , b INT);
+
+--exec_in_background $MYSQL_SLAP --create-schema=test --delimiter=";" --iterations=1000 --query="INSERT INTO test.t1 (b) VALUES (1)" --concurrency=10 --silent 2>&1
+
+--echo #
+--echo # 2. Create 20 channels, 1 per second in the replica
+
+--source include/rpl_connection_slave.inc
+
+--let $limit=20
+
+--disable_result_log
+--let $iteration=1
+while ( $iteration <= $limit )
+{
+  --eval CHANGE REPLICATION SOURCE TO SOURCE_HOST = 'h', SOURCE_PORT = 1 FOR CHANNEL 'channel_$iteration' ;
+  --inc $iteration
+  --sleep 1
+}
+--enable_result_log
+
+--echo #
+--echo # 3. Check the data was replicated and 20 channel were created
+
+--let $wait_timeout= 200
+--let $wait_condition= SELECT COUNT(*)=10000 FROM test.t1
+--source include/wait_condition.inc
+
+# 21 channels: 20 created + default channel
+--let $assert_text= 'There are 21 channels in the replica'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM performance_schema.replication_connection_configuration, count, 1] = 21
+--source include/assert.inc
+
+--echo #
+--echo # 4. Cleanup
+
+--let $iteration=1
+while ( $iteration <= $limit )
+{
+  --eval RESET REPLICA ALL FOR CHANNEL 'channel_$iteration' ;
+  --inc $iteration
+}
+
+--source include/rpl_connection_master.inc
+
+DROP TABLE test.t1;
+
+--source include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_check_net_interrupted_error.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_check_net_interrupted_error.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_check_net_interrupted_error.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_check_net_interrupted_error.test	2021-09-28 11:46:34.000000000 +0000
@@ -28,7 +28,6 @@
 
 --source include/rpl_connection_slave.inc
 call mtr.add_suppression("Slave I/O .*: Master command COM_REGISTER_SLAVE failed: .*");
-SET @debug_saved=@@global.debug;
 --source include/stop_slave.inc
 
 --source include/rpl_connection_master.inc
@@ -39,7 +38,9 @@
 --echo #
 --echo # Active injected error during getting server id from master
 --echo #
-SET GLOBAL DEBUG='d,get_source_server_id.ER_NET_READ_INTERRUPTED';
+
+--let $debug_point= get_source_server_id.ER_NET_READ_INTERRUPTED
+--source include/add_debug_point.inc
 
 START SLAVE;
 # Crash if error happens during getting server id from master
@@ -61,7 +62,8 @@
 
 --source include/stop_slave.inc
 
-SET GLOBAL DEBUG= @save_debug;
+--let $debug_point= get_source_server_id.ER_NET_READ_INTERRUPTED
+--source include/remove_debug_point.inc
 
 # Cleanup
 --source include/start_slave.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_checksum_undef.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_checksum_undef.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_checksum_undef.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_checksum_undef.test	2021-09-28 11:46:34.000000000 +0000
@@ -26,15 +26,18 @@
 call mtr.add_suppression('The slave I/O thread was stopped because a fatal error is encountered');
 --source include/stop_slave.inc
 
---let $debug_save= `SELECT @@GLOBAL.debug`
-SET GLOBAL debug='+d,undefined_algorithm_on_replica';
+--let $debug_point= undefined_algorithm_on_replica
+--source include/add_debug_point.inc
 
 START SLAVE;
 --let $slave_io_errno= 13117
 --source include/wait_for_slave_io_error.inc
 
 --source include/stop_slave.inc
---eval SET GLOBAL debug = '$debug_save'
+
+--let $debug_point= undefined_algorithm_on_replica
+--source include/remove_debug_point.inc
+
 --source include/start_slave.inc
 
 --source include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_corruption.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_corruption.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_corruption.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_corruption.test	2021-09-28 11:46:34.000000000 +0000
@@ -68,7 +68,10 @@
 
 # Emulate corruption in binlog file when SHOW BINLOG EVENTS is executing
 --echo # 2. Corruption in master binlog and SHOW BINLOG EVENTS
-SET GLOBAL debug="d,corrupt_read_log_event";
+
+--let $debug_point= corrupt_read_log_event
+--source include/add_debug_point.inc
+
 --echo SHOW BINLOG EVENTS;
 --disable_query_log
 send_eval SHOW BINLOG EVENTS FROM $pos;
@@ -78,7 +81,6 @@
 
 # Emulate corruption on master with crc checking on master
 --echo # 3. Master read a corrupted event from binlog and send the error to slave
-SET GLOBAL debug="d,corrupt_read_log_event";
 --connection slave
 START SLAVE IO_THREAD;
 let $slave_io_errno= 13114; # ER_SERVER_MASTER_FATAL_ERROR_READING_BINLOG
@@ -89,26 +91,34 @@
 --echo # 4. Master read a corrupted event from binlog and send it to slave
 --connection master
 SET GLOBAL source_verify_checksum=0;
-SET GLOBAL debug="d,corrupt_read_log_event";
 --connection slave
 START SLAVE IO_THREAD;
 let $slave_io_errno= 13122,13115; # ER_SLAVE_RELAY_LOG_WRITE_FAILURE, ER_NETWORK_READ_EVENT_CHECKSUM_FAILURE
 --source include/wait_for_slave_io_error.inc
 --connection master
-SET GLOBAL debug="";
+
+--let $debug_point= corrupt_read_log_event
+--source include/remove_debug_point.inc
+
 SET GLOBAL source_verify_checksum=1;
 
 # Emulate corruption in network
 --echo # 5. Slave. Corruption in network
 --connection slave
-SET GLOBAL debug="d,corrupt_queue_event";
+
+--let $debug_point= corrupt_queue_event
+--source include/add_debug_point.inc
+
 START SLAVE IO_THREAD;
 let $slave_io_errno= 13122,13115; # ER_SLAVE_RELAY_LOG_WRITE_FAILURE, ER_NETWORK_READ_EVENT_CHECKSUM_FAILURE
 --source include/wait_for_slave_io_error.inc
 
 # Emulate corruption in relay log
 --echo # 6. Slave. Corruption in relay log
-SET GLOBAL debug="d,corrupt_read_log_event";
+
+--let $debug_point= corrupt_read_log_event
+--source include/add_debug_point.inc
+
 START SLAVE SQL_THREAD;
 let $slave_sql_errno= 13117; # ER_SLAVE_FATAL_ERROR
 --source include/wait_for_slave_sql_error.inc
@@ -117,13 +127,19 @@
 # and slave
 --echo # 7. Seek diff for tables on master and slave
 --connection slave
-SET GLOBAL debug= "";
+
+--let $debug_point= corrupt_read_log_event
+--source include/remove_debug_point.inc
+--let $debug_point= corrupt_queue_event
+--source include/remove_debug_point.inc
+
 --source include/start_slave.inc
+
 --connection master
 --source include/sync_slave_sql_with_master.inc
 --let $diff_tables= master:t1, slave:t1
 --source include/diff_tables.inc
-                                                               
+
 # Clean up
 --echo # 8. Clean up
 --connection master
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_crash_safe_master_myisam.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_crash_safe_master_myisam.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_crash_safe_master_myisam.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_crash_safe_master_myisam.test	2021-09-28 11:46:34.000000000 +0000
@@ -9,6 +9,7 @@
 #
 
 -- source include/not_group_replication_plugin.inc
+--source include/not_rpl_gtid_only.inc
 -- source include/not_have_privilege_checks_user.inc
 # Don't test this under valgrind, memory leaks will occur
 -- source include/not_valgrind.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_crash_safe_master.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_crash_safe_master.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_crash_safe_master.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_crash_safe_master.test	2021-09-28 11:46:34.000000000 +0000
@@ -25,6 +25,7 @@
 #
 
 -- source include/not_group_replication_plugin.inc
+-- source include/not_rpl_gtid_only.inc
 # Don't test this under valgrind, memory leaks will occur
 -- source include/not_valgrind.inc
 -- source include/have_debug.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_create_select_replay.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_create_select_replay.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_create_select_replay.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_create_select_replay.test	2021-09-28 11:46:34.000000000 +0000
@@ -352,6 +352,5 @@
 --source include/assert.inc
 
 DROP TABLE t0;
-SET global DEBUG='-d, crash_on_transactional_ddl_commit';
 --remove_file $MYSQLBINLOG_OUTFILE
 RESET MASTER;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_dual_pos_advance.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_dual_pos_advance.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_dual_pos_advance.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_dual_pos_advance.test	2021-09-28 11:46:34.000000000 +0000
@@ -6,8 +6,6 @@
 # of their server id).
 # It also will test BUG#13861.
 --source include/not_group_replication_plugin.inc
-# Until option of START SLAVE is not yet supported by  MTS
-source include/not_mts_replica_parallel_workers.inc;
 
 --let $rpl_topology= 1->2->1
 --source include/rpl_init.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_encryption_master_key_generation_recovery.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_encryption_master_key_generation_recovery.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_encryption_master_key_generation_recovery.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_encryption_master_key_generation_recovery.test	2021-09-28 11:46:34.000000000 +0000
@@ -177,33 +177,38 @@
 --let $assert_cond= "[SHOW BINARY LOGS, Encrypted, 3]" = "Yes"
 --source include/assert.inc
 
-# Cleanup
+--echo ==== Cleanup ====
+
+--echo * Disable encryption, cleanup database, and consume all encrypted logs.
+--source include/rpl_connection_slave.inc
 --source include/start_slave.inc
+SET GLOBAL binlog_encryption = OFF;
+
 --source include/rpl_connection_master.inc
 SET GLOBAL binlog_encryption = OFF;
 DROP TABLE t1;
 --source include/sync_slave_sql_with_master.inc
---source include/stop_slave.inc
---source include/rpl_connection_slave.inc
-SET GLOBAL binlog_encryption = OFF;
-UNINSTALL PLUGIN keyring_file;
---remove_file $keyring_slave
+
+--echo * Remove all encrypted logs.
+--source include/rpl_reset.inc
+
+--echo * Uninstall the plugins and delete the keyrings.
 --source include/rpl_connection_master.inc
-SET GLOBAL binlog_encryption = OFF;
 UNINSTALL PLUGIN keyring_file;
 --remove_file $keyring_master
+--source include/rpl_connection_slave.inc
+UNINSTALL PLUGIN keyring_file;
+--remove_file $keyring_slave
 
---let $rpl_start_with_gtids= $gtid_mode_on
---source include/rpl_connection_master.inc
-RESET MASTER;
---let $rpl_server_number= 1
---let $rpl_server_parameters=
+--echo * Restart the servers with the same command lines as before the test.
+--let $rpl_server_number = 1
+--let $rpl_server_parameters =
 --let $rpl_omit_print_server_parameters = 1
 --source include/rpl_restart_server.inc
---connection slave
-RESET REPLICA;
 --let $rpl_server_number= 2
---let $rpl_server_parameters=
 --source include/rpl_restart_server.inc
---let $rpl_only_running_threads= 1
+
+--echo * Clean up replication test framework
+--source include/rpl_connection_slave.inc
+--source include/start_slave.inc
 --source include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_encryption_master_key_rotation_at_startup.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_encryption_master_key_rotation_at_startup.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_encryption_master_key_rotation_at_startup.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_encryption_master_key_rotation_at_startup.test	2021-09-28 11:46:34.000000000 +0000
@@ -203,30 +203,35 @@
   INSERT INTO t1 (c2) VALUES ("MySQL");
 }
 
-# Cleanup
+--echo ==== Cleanup ====
+
+--echo * Disable encryption, cleanup database, and consume all encrypted logs.
 --source include/rpl_connection_slave.inc
 --source include/start_slave.inc
+SET GLOBAL binlog_encryption = OFF;
+
 --source include/rpl_connection_master.inc
 SET GLOBAL binlog_encryption = OFF;
 DROP TABLE t1;
-# Slave shall read from all encrypted binary log files
 --source include/sync_slave_sql_with_master.inc
---source include/stop_slave.inc
+
+--echo * Remove all encrypted logs.
+--source include/rpl_reset.inc
+
+--echo * Uninstall the plugin and delete the keyring.
 --source include/rpl_connection_master.inc
 UNINSTALL PLUGIN keyring_file;
 --remove_file $keyring_master
 
---let $rpl_start_with_gtids= $gtid_mode_on
---source include/rpl_connection_master.inc
-RESET MASTER;
---let $rpl_server_number= 1
---let $rpl_server_parameters=
---let $rpl_omit_print_server_parameters= 1
+--echo * Restart the servers with the same command lines as before the test.
+--let $rpl_server_number = 1
+--let $rpl_server_parameters =
+--let $rpl_omit_print_server_parameters = 1
 --source include/rpl_restart_server.inc
---connection slave
-RESET REPLICA;
 --let $rpl_server_number= 2
---let $rpl_server_parameters=
 --source include/rpl_restart_server.inc
---let $rpl_only_running_threads= 1
+
+--echo * Clean up replication test framework
+--source include/rpl_connection_slave.inc
+--source include/start_slave.inc
 --source include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_error_on_multiple_row_update.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_error_on_multiple_row_update.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_error_on_multiple_row_update.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_error_on_multiple_row_update.test	2021-09-28 11:46:34.000000000 +0000
@@ -22,7 +22,8 @@
 
 --source include/have_binlog_format_row.inc
 --source include/have_debug.inc
-
+--let $skip_configuration_privilege_checks_user= 'skip'
+--let $rpl_privilege_checks_user_grant_all= 1
 # 1. Create source-replica topology.
 --source include/master-slave.inc
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_filters_gcov.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_filters_gcov.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_filters_gcov.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_filters_gcov.test	2021-09-28 11:46:34.000000000 +0000
@@ -48,37 +48,43 @@
 --echo # 1. Simulate an error on copying global replication filters
 --echo #    when executing CHANGE MASTER TO.
 --echo #
-SET GLOBAL debug='d,simulate_out_of_memory_on_copy_do_table';
+SET GLOBAL debug='+d,simulate_out_of_memory_on_copy_do_table';
 --error ER_OUTOFMEMORY
 CHANGE REPLICATION SOURCE TO SOURCE_HOST="localhost", SOURCE_PORT=11 FOR CHANNEL "ch1";
 RESET SLAVE ALL FOR CHANNEL 'ch1';
 
-SET GLOBAL debug='d,simulate_out_of_memory_on_copy_ignore_table';
+SET GLOBAL debug='-d,simulate_out_of_memory_on_copy_do_table';
+SET GLOBAL debug='+d,simulate_out_of_memory_on_copy_ignore_table';
 --error ER_OUTOFMEMORY
 CHANGE REPLICATION SOURCE TO SOURCE_HOST="localhost", SOURCE_PORT=11 FOR CHANNEL "ch1";
 RESET SLAVE ALL FOR CHANNEL 'ch1';
 
-SET GLOBAL debug='d,simulate_out_of_memory_on_copy_wild_do_table';
+SET GLOBAL debug='-d,simulate_out_of_memory_on_copy_ignore_table';
+SET GLOBAL debug='+d,simulate_out_of_memory_on_copy_wild_do_table';
 --error ER_OUTOFMEMORY
 CHANGE REPLICATION SOURCE TO SOURCE_HOST="localhost", SOURCE_PORT=11 FOR CHANNEL "ch1";
 RESET SLAVE ALL FOR CHANNEL 'ch1';
 
-SET GLOBAL debug='d,simulate_out_of_memory_on_copy_wild_ignore_table';
+SET GLOBAL debug='-d,simulate_out_of_memory_on_copy_wild_do_table';
+SET GLOBAL debug='+d,simulate_out_of_memory_on_copy_wild_ignore_table';
 --error ER_OUTOFMEMORY
 CHANGE REPLICATION SOURCE TO SOURCE_HOST="localhost", SOURCE_PORT=11 FOR CHANNEL "ch1";
 RESET SLAVE ALL FOR CHANNEL 'ch1';
 
-SET GLOBAL debug='d,simulate_out_of_memory_on_copy_ignore_db';
+SET GLOBAL debug='-d,simulate_out_of_memory_on_copy_wild_ignore_table';
+SET GLOBAL debug='+d,simulate_out_of_memory_on_copy_ignore_db';
 --error ER_OUTOFMEMORY
 CHANGE REPLICATION SOURCE TO SOURCE_HOST="localhost", SOURCE_PORT=11 FOR CHANNEL "ch1";
 RESET SLAVE ALL FOR CHANNEL 'ch1';
 
-SET GLOBAL debug='d,simulate_out_of_memory_on_copy_do_db';
+SET GLOBAL debug='-d,simulate_out_of_memory_on_copy_ignore_db';
+SET GLOBAL debug='+d,simulate_out_of_memory_on_copy_do_db';
 --error ER_OUTOFMEMORY
 CHANGE REPLICATION SOURCE TO SOURCE_HOST="localhost", SOURCE_PORT=11 FOR CHANNEL "ch1";
 RESET SLAVE ALL FOR CHANNEL 'ch1';
 
-SET GLOBAL debug='d,simulate_out_of_memory_on_copy_rewrite_db';
+SET GLOBAL debug='-d,simulate_out_of_memory_on_copy_do_db';
+SET GLOBAL debug='+d,simulate_out_of_memory_on_copy_rewrite_db';
 --error ER_OUTOFMEMORY
 CHANGE REPLICATION SOURCE TO SOURCE_HOST="localhost", SOURCE_PORT=11 FOR CHANNEL "ch1";
 RESET SLAVE ALL FOR CHANNEL 'ch1';
@@ -87,7 +93,8 @@
 --echo # 2. Simulate an error on creating channel's replication filters
 --echo #    when executing CHANGE MASTER TO.
 --echo #
-SET GLOBAL debug='d,simulate_out_of_memory_on_create_filter';
+SET GLOBAL debug='-d,simulate_out_of_memory_on_copy_rewrite_db';
+SET GLOBAL debug='+d,simulate_out_of_memory_on_create_filter';
 --error ER_OUTOFMEMORY
 CHANGE REPLICATION SOURCE TO SOURCE_HOST="localhost", SOURCE_PORT=11 FOR CHANNEL "ch1";
 --error ER_SLAVE_CHANNEL_DOES_NOT_EXIST
@@ -97,11 +104,13 @@
 --echo # 3. Simulate an error on executing CHANGE REPLICATION FILTER
 --echo #    with no FOR CHANNEL clause.
 --echo #
-SET GLOBAL debug='d,simulate_out_of_memory_on_CRF';
+SET GLOBAL debug='-d,simulate_out_of_memory_on_create_filter';
+SET GLOBAL debug='+d,simulate_out_of_memory_on_CRF';
 --error ER_OUTOFMEMORY
 CHANGE REPLICATION FILTER REPLICATE_DO_DB=(db1);
 
-SET GLOBAL debug='d,simulate_out_of_memory_on_global_CRF';
+SET GLOBAL debug='-d,simulate_out_of_memory_on_CRF';
+SET GLOBAL debug='+d,simulate_out_of_memory_on_global_CRF';
 --error ER_OUTOFMEMORY
 CHANGE REPLICATION FILTER REPLICATE_DO_DB=(db1);
 
@@ -109,7 +118,8 @@
 --echo # 4. Simulate an error on executing CHANGE REPLICATION FILTER
 --echo #    with FOR CHANNEL clause.
 --echo #
-SET GLOBAL debug='d,simulate_out_of_memory_on_CRF_FOR_CHA';
+SET GLOBAL debug='-d,simulate_out_of_memory_on_global_CRF';
+SET GLOBAL debug='+d,simulate_out_of_memory_on_CRF_FOR_CHA';
 --error ER_OUTOFMEMORY
 CHANGE REPLICATION FILTER REPLICATE_DO_DB=(db1) FOR CHANNEL '' ;
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test	2021-09-28 11:46:34.000000000 +0000
@@ -30,7 +30,6 @@
 call mtr.add_suppression("Unknown system variable 'SERVER_UUID' on master");
 
 #Test case 1: Try to get the value of the UNIX_TIMESTAMP from master under network disconnection
-let $debug_saved= `select @@global.debug`;
 
 # set up two parameters to pass into extra/rpl_tests/rpl_get_master_version_and_clock
 let $dbug_sync_point= 'debug_lock.before_get_UNIX_TIMESTAMP';
@@ -51,13 +50,6 @@
 let $debug_sync_action= 'now SIGNAL signal.get_source_uuid';
 source extra/rpl_tests/rpl_get_master_version_and_clock.test;
 
-#
-# Note, due to # Bug#11765758 - 58754
-# make sure the slave threads stand still (SQL thread in this context)
-# while @@global.debug is being updated.
-#
-eval set global debug= '$debug_saved';
-
 #Test case 4: This test checks that the slave I/O thread refuses to start
 #if slave and master have the same server id.
 connection slave;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_gtid_drop_mem_table.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_gtid_drop_mem_table.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_gtid_drop_mem_table.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_gtid_drop_mem_table.test	2021-09-28 11:46:34.000000000 +0000
@@ -1,20 +1,20 @@
 #  ==== Purpose ====
 #
-# The purpose of this test is to verify that a DELETE statement is binary
+# The purpose of this test is to verify that a TRUNCATE statement is binary
 # logged with correct GTID when a replicated memory table is fisrt updated
 # after a server crash or a server restart.
 #
 #  ==== Requirements ====
 #
 # R1. When there is a replicated memory table, and the slave crashes, the next
-# transaction that updates the memory table shall generate a DELETE statement
+# transaction that updates the memory table shall generate a TRUNCATE statement
 # in the binary log. This test verifies that this works in the below cases:
 
 # R1.1. When the update is applied on a replication channel.
 # R1.2. When the update is applied in a client session having
 #       gtid_next=UUID:NUMBER.
 #
-# R2. The DELETE statement shall have a new GTID generated by the slave.
+# R2. The TRUNCATE statement shall have a new GTID generated by the slave.
 #
 # R3. There shall not be a crash.
 #
@@ -33,7 +33,7 @@
 #      gtid_next=UUID:NUMBER.
 #
 # In each of the above cases:
-# - Verify that DELETE statement is binary logged on the master.
+# - Verify that TRUNCATE statement is binary logged on the master.
 #
 # 2. Try to update the memory table on master after restarting the slave:
 #
@@ -48,13 +48,14 @@
 #      gtid_next=UUID:NUMBER.
 #
 # In each of the above cases:
-# - Verify that DELETE statement is binary logged on the slave.
+# - Verify that TRUNCATE statement is binary logged on the slave.
 #
 # ==== References ====
 #
 # Bug#30527929 - RESTART CREATES ANONYMOUS TRANSACTION FOR MEMORY TABLE
 #
 
+--source include/not_rpl_gtid_only.inc
 --source include/master-slave.inc
 
 #Scenario 1
@@ -89,8 +90,8 @@
 INSERT INTO mem_t1 VALUES (1), (2), (3), (4);
 --source include/sync_slave_sql_with_master.inc
 --source include/rpl_connection_master.inc
---let $limit= 0,9
---let $event_sequence= #Gtid # !Begin # !Delete # !Commit #Gtid # !Begin # !Insert # !Commit
+--let $limit= 0,7
+--let $event_sequence= #Gtid # !Q(TRUNCATE.*) #Gtid # !Begin # !Insert # !Commit
 --source include/assert_binlog_events.inc
 --source include/save_binlog_position.inc
 
@@ -98,8 +99,8 @@
 ALTER TABLE mem_t2 ADD COLUMN (c2 INT);
 --source include/sync_slave_sql_with_master.inc
 --source include/rpl_connection_master.inc
---let $limit= 0,6
---let $event_sequence= #Gtid # !Begin # !Delete # !Commit #Gtid # !Q(ALTER.*)
+--let $limit= 0,4
+--let $event_sequence= #Gtid # !Q(TRUNCATE.*) #Gtid # !Q(ALTER.*)
 --source include/assert_binlog_events.inc
 --source include/save_binlog_position.inc
 
@@ -107,8 +108,8 @@
 CREATE TABLE mem_t9 LIKE mem_t3;
 --source include/sync_slave_sql_with_master.inc
 --source include/rpl_connection_master.inc
---let $limit= 0,6
---let $event_sequence= #Gtid # !Begin # !Delete # !Commit #Gtid # !Q(CREATE.*)
+--let $limit= 0,4
+--let $event_sequence= #Gtid # !Q(TRUNCATE.*) #Gtid # !Q(CREATE.*)
 --source include/assert_binlog_events.inc
 --source include/save_binlog_position.inc
 
@@ -119,8 +120,8 @@
 COMMIT;
 --source include/sync_slave_sql_with_master.inc
 --source include/rpl_connection_master.inc
---let $limit= 0,18
---let $event_sequence= #Gtid # !Begin # !Delete # !Commit #Gtid # !Begin # !Insert # !Commit #Gtid # !Begin # !Delete # !Commit #Gtid # !Begin # !Insert # !Commit
+--let $limit= 0,14
+--let $event_sequence= #Gtid # !Q(TRUNCATE.*) #Gtid # !Begin # !Insert # !Commit #Gtid # !Q(TRUNCATE.*) #Gtid # !Begin # !Insert # !Commit
 --source include/assert_binlog_events.inc
 --source include/save_binlog_position.inc
 
@@ -128,8 +129,8 @@
 UPDATE mem_t6, mem_t7 SET mem_t6.c1 = mem_t6.c1 + 1, mem_t7.c1 = mem_t7.c1 + 1;
 --source include/sync_slave_sql_with_master.inc
 --source include/rpl_connection_master.inc
---let $limit= 0,8
---let $event_sequence= #Gtid # !Begin # !Delete # !Commit #Gtid # !Begin # !Delete # !Commit
+--let $limit= 0,4
+--let $event_sequence= #Gtid # !Q(TRUNCATE.*) #Gtid # !Q(TRUNCATE.*)
 --source include/assert_binlog_events.inc
 --source include/save_binlog_position.inc
 
@@ -140,8 +141,8 @@
 SET @@session.gtid_next = 'AUTOMATIC';
 --source include/sync_slave_sql_with_master.inc
 --source include/rpl_connection_master.inc
---let $limit= 0,9
---let $event_sequence= #Gtid # !Begin # !Delete # !Commit #Gtid/(.*'$explicit_gtid')# !Begin # !Insert # !Commit
+--let $limit= 0,7
+--let $event_sequence= #Gtid # !Q(TRUNCATE.*) #Gtid/(.*'$explicit_gtid')# !Begin # !Insert # !Commit
 --source include/assert_binlog_events.inc
 
 # Cleanup
@@ -186,8 +187,8 @@
 INSERT INTO mem_t1 VALUES (1), (2), (3), (4);
 --source include/sync_slave_sql_with_master.inc
 --source include/rpl_connection_slave.inc
---let $limit= 0,9
---let $event_sequence= #Gtid/(.*'$replica_uuid:1') # !Begin # !Delete # !Commit #Gtid/(.*'$master_uuid:17') # !Begin # !Insert # !Commit
+--let $limit= 0,7
+--let $event_sequence= #Gtid/(.*'$replica_uuid:1') # !Q(TRUNCATE.*) #Gtid/(.*'$master_uuid:17') # !Begin # !Insert # !Commit
 --source include/assert_binlog_events.inc
 --source include/save_binlog_position.inc
 
@@ -196,8 +197,8 @@
 ALTER TABLE mem_t2 ADD COLUMN (c2 INT);
 --source include/sync_slave_sql_with_master.inc
 --source include/rpl_connection_slave.inc
---let $limit= 0,6
---let $event_sequence= #Gtid/(.*'$replica_uuid:2') # !Begin # !Delete # !Commit #Gtid/(.*'$master_uuid:18') # !Q(ALTER.*)
+--let $limit= 0,4
+--let $event_sequence= #Gtid/(.*'$replica_uuid:2') # !Q(TRUNCATE.*) #Gtid/(.*'$master_uuid:18') # !Q(ALTER.*)
 --source include/assert_binlog_events.inc
 --source include/save_binlog_position.inc
 
@@ -206,8 +207,8 @@
 CREATE TABLE mem_t9 LIKE mem_t3;
 --source include/sync_slave_sql_with_master.inc
 --source include/rpl_connection_slave.inc
---let $limit= 0,6
---let $event_sequence= #Gtid/(.*'$replica_uuid:3') # !Begin # !Delete # !Commit #Gtid/(.*'$master_uuid:19') # !Q(CREATE.*)
+--let $limit= 0,4
+--let $event_sequence= #Gtid/(.*'$replica_uuid:3') # !Q(TRUNCATE.*) #Gtid/(.*'$master_uuid:19') # !Q(CREATE.*)
 --source include/assert_binlog_events.inc
 --source include/save_binlog_position.inc
 
@@ -219,8 +220,8 @@
 COMMIT;
 --source include/sync_slave_sql_with_master.inc
 --source include/rpl_connection_slave.inc
---let $limit= 0,18
---let $event_sequence= #Gtid/(.*'$replica_uuid:4') # !Begin # !Delete # !Commit #Gtid/(.*'$master_uuid:20') # !Begin # !Insert # !Commit #Gtid/(.*'$replica_uuid:5') # !Begin # !Delete # !Commit #Gtid/(.*'$master_uuid:21') # !Begin # !Insert # !Commit
+--let $limit= 0,14
+--let $event_sequence= #Gtid/(.*'$replica_uuid:4') # !Q(TRUNCATE.*) #Gtid/(.*'$master_uuid:20') # !Begin # !Insert # !Commit #Gtid/(.*'$replica_uuid:5') # !Q(TRUNCATE.*) #Gtid/(.*'$master_uuid:21') # !Begin # !Insert # !Commit
 --source include/assert_binlog_events.inc
 --source include/save_binlog_position.inc
 
@@ -235,8 +236,8 @@
 INSERT INTO mem_t7 VALUES (f());
 --source include/sync_slave_sql_with_master.inc
 --source include/rpl_connection_slave.inc
---let $limit= 2,16
---let $event_sequence= #Gtid/(.*'$replica_uuid:6') # !Begin # !Delete # !Commit #Gtid/(.*'$replica_uuid:7') # !Begin # !Delete # !Commit #Gtid/(.*'$master_uuid:23') # !Begin # !Multi_DML # !Commit
+--let $limit= 2,12
+--let $event_sequence= #Gtid/(.*'$replica_uuid:6') # !Q(TRUNCATE.*) #Gtid/(.*'$replica_uuid:7') # !Q(TRUNCATE.*) #Gtid/(.*'$master_uuid:23') # !Begin # !Multi_DML # !Commit
 --source include/assert_binlog_events.inc
 --source include/save_binlog_position.inc
 
@@ -247,8 +248,8 @@
 SET @@session.gtid_next = 'AUTOMATIC';
 --source include/sync_slave_sql_with_master.inc
 --source include/rpl_connection_slave.inc
---let $limit= 0,9
---let $event_sequence= #Gtid/(.*'$replica_uuid:8') # !Begin # !Delete # !Commit #Gtid/(.*'$explicit_gtid')# !Begin # !Insert # !Commit
+--let $limit= 0,7
+--let $event_sequence= #Gtid/(.*'$replica_uuid:8') # !Q(TRUNCATE.*) #Gtid/(.*'$explicit_gtid')# !Begin # !Insert # !Commit
 --source include/assert_binlog_events.inc
 
 # Cleanup
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_inconsistent_error.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_inconsistent_error.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_inconsistent_error.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_inconsistent_error.test	2021-09-28 11:46:34.000000000 +0000
@@ -28,7 +28,6 @@
 # Bug#24753281: REQUEST FOR REPLICA_SKIP_ERRORS = ER_INCONSISTENT_ERROR
 
 --source include/have_binlog_format_statement.inc
---source include/not_mts_replica_parallel_workers.inc
 --source include/force_myisam_default.inc
 --source include/have_myisam.inc
 --source include/master-slave.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_init_replica_errors.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_init_replica_errors.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_init_replica_errors.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_init_replica_errors.test	2021-09-28 11:46:34.000000000 +0000
@@ -44,7 +44,10 @@
 connection slave;
 
 # Set debug flags on slave to force errors to occur
-SET GLOBAL debug= "d,simulate_io_replica_error_on_init,simulate_sql_replica_error_on_init";
+--let $debug_point= simulate_io_replica_error_on_init
+--source include/add_debug_point.inc
+--let $debug_point= simulate_sql_replica_error_on_init
+--source include/add_debug_point.inc
 
 start slave;
 
@@ -67,7 +70,10 @@
 --let $show_slave_io_error= 1
 --source include/wait_for_slave_io_error.inc
 
-SET GLOBAL debug= "";
+--let $debug_point= simulate_io_replica_error_on_init
+--source include/remove_debug_point.inc
+--let $debug_point= simulate_sql_replica_error_on_init
+--source include/remove_debug_point.inc
 
 ######################################################################
 #             Injecting faults in the init_replica option
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_log_info_repository_persistence_assign_gtids_to_anonymous_transactions.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_log_info_repository_persistence_assign_gtids_to_anonymous_transactions.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_log_info_repository_persistence_assign_gtids_to_anonymous_transactions.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_log_info_repository_persistence_assign_gtids_to_anonymous_transactions.test	2021-09-28 11:46:34.000000000 +0000
@@ -68,8 +68,8 @@
 # WL#12819:GTIDs: Replicate from GTID disabled source to GTID enabled replica directly
 
 --source include/big_test.inc
---source include/have_debug.inc
 --source include/not_group_replication_plugin.inc
+--source include/not_rpl_gtid_only.inc
 # This test is unrelated to log format
 --source include/have_binlog_format_row.inc
 --source include/not_master_info_file.inc
@@ -285,6 +285,12 @@
 --echo #       3. A channel with a privileged user (default channel)
 --echo #     ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS is set to OFF for all channels
 
+# We must enable GTID_MODE so we can configure the group_replication recovery channel
+--let $rpl_gtid_mode= ON
+--let $rpl_server_numbers= 2
+--let $rpl_skip_sync= 1
+--source include/rpl_set_gtid_mode.inc
+
 CHANGE REPLICATION SOURCE TO SOURCE_HOST="localhost", SOURCE_PORT=12 FOR CHANNEL "ch1" ;
 --disable_warnings
 CHANGE REPLICATION SOURCE TO SOURCE_USER="root" FOR CHANNEL "group_replication_recovery";
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_log_info_repository_persistence_require_row.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_log_info_repository_persistence_require_row.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_log_info_repository_persistence_require_row.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_log_info_repository_persistence_require_row.test	2021-09-28 11:46:34.000000000 +0000
@@ -63,8 +63,8 @@
 --source include/not_group_replication_plugin.inc
 --source include/have_binlog_format_row.inc
 --source include/not_master_info_file.inc
---source include/not_mts_replica_parallel_workers.inc
 --source include/not_have_privilege_checks_user.inc
+--source include/not_rpl_gtid_only.inc
 --source include/master-slave.inc
 
 --echo
@@ -229,6 +229,14 @@
 --echo #       3. A channel with a privileged user (default channel)
 --echo #     REQUIRE_ROW_FORMAT must be 0 for 1) and 3). It must be 1 for 2)
 
+# For run where GTID mode is OFF we enable it so we can configure the GR recovery channel
+--let $rpl_gtid_mode= ON
+--let $rpl_server_numbers= 2
+--let $rpl_set_enforce_gtid_consistency= 1
+--let $rpl_skip_sync= 1
+--let $no_extra_info = 1
+--source include/rpl_set_gtid_mode.inc
+
 CHANGE REPLICATION SOURCE TO SOURCE_HOST="localhost", SOURCE_PORT=12 FOR CHANNEL "ch1" ;
 --disable_warnings
 CHANGE REPLICATION SOURCE TO SOURCE_USER="root" FOR CHANNEL "group_replication_recovery";
@@ -278,6 +286,13 @@
 RESET SLAVE ALL FOR CHANNEL "ch1";
 RESET SLAVE ALL FOR CHANNEL "group_replication_recovery";
 
+if ($gtid_mode_on == 0) {
+  --let $rpl_gtid_mode = 0
+  --let $rpl_set_enforce_gtid_consistency = 0
+}
+--let $no_extra_info = 1
+--source include/rpl_set_gtid_mode.inc
+
 --let $rpl_channel_name=
 --let $rpl_skip_sync= 1
 --source include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_log_info_repository_persistence_require_table_primary_key_check.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_log_info_repository_persistence_require_table_primary_key_check.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_log_info_repository_persistence_require_table_primary_key_check.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_log_info_repository_persistence_require_table_primary_key_check.test	2021-09-28 11:46:34.000000000 +0000
@@ -256,6 +256,14 @@
 --echo #       3. A channel with a privileged user (default channel)
 --echo #     REQUIRE_TABLE_PRIMARY_KEY_CHECK is set to STREAM for all channels
 
+# For runs where GTID mode is OFF we enable it so we can configure the GR recovery channel
+--let $rpl_gtid_mode= ON
+--let $rpl_server_numbers= 2
+--let $rpl_set_enforce_gtid_consistency= 1
+--let $rpl_skip_sync= 1
+--let $no_extra_info = 1
+--source include/rpl_set_gtid_mode.inc
+
 CHANGE REPLICATION SOURCE TO SOURCE_HOST="localhost", SOURCE_PORT=12 FOR CHANNEL "ch1" ;
 --disable_warnings
 CHANGE REPLICATION SOURCE TO SOURCE_USER="root" FOR CHANNEL "group_replication_recovery";
@@ -284,6 +292,13 @@
 RESET SLAVE ALL FOR CHANNEL "ch1";
 RESET SLAVE ALL FOR CHANNEL "group_replication_recovery";
 
+if ($gtid_mode_on == 0) {
+  --let $rpl_gtid_mode = 0
+  --let $rpl_set_enforce_gtid_consistency = 0
+}
+--let $no_extra_info = 1
+--source include/rpl_set_gtid_mode.inc
+
 # 5. RESET SLAVE tests
 
 --echo
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_lost_events_on_rotate.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_lost_events_on_rotate.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_lost_events_on_rotate.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_lost_events_on_rotate.test	2021-09-28 11:46:34.000000000 +0000
@@ -24,7 +24,7 @@
 
 # When reaching the EOF the dump thread will wait before deciding if
 # it should move to a new binlong file.
-SET GLOBAL DEBUG= "d,wait_after_binlog_EOF";
+SET GLOBAL DEBUG= "+d,wait_after_binlog_EOF";
 
 INSERT INTO t VALUES (1);
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_database_transaction_retry.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_database_transaction_retry.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_database_transaction_retry.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_database_transaction_retry.test	2021-09-28 11:46:34.000000000 +0000
@@ -6,8 +6,20 @@
 --source include/not_group_replication_plugin.inc
 --source include/master-slave.inc
 
+--source include/rpl_connection_slave.inc
+--source include/stop_slave.inc
+SET @saved_replica_preserve_commit_order = @@GLOBAL.replica_preserve_commit_order;
+SET GLOBAL replica_preserve_commit_order = OFF;
+--source include/start_slave.inc
+
+--source include/rpl_connection_master.inc
 --let $mts_parallel_type= "DATABASE"
 --source extra/rpl_tests/rpl_mts_transaction_retry.inc
 
+--source include/rpl_connection_slave.inc
+--source include/stop_slave.inc
+SET GLOBAL replica_preserve_commit_order = @saved_replica_preserve_commit_order;
+--source include/start_slave.inc
+
 --source include/rpl_end.inc
 --source include/force_restart.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_logical_clock_assertion_failure.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_logical_clock_assertion_failure.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_logical_clock_assertion_failure.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_logical_clock_assertion_failure.test	2021-09-28 11:46:34.000000000 +0000
@@ -1,4 +1,8 @@
 --source include/not_group_replication_plugin.inc
+# This test assumes 4 workers are used
+--let $option_name = replica_parallel_workers
+--let $option_value = 4
+--source include/only_with_option.inc
 --source include/only_mts_replica_parallel_type_logical_clock.inc
 --source include/have_debug.inc
 --source include/have_debug_sync.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_logical_clock_crash.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_logical_clock_crash.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_logical_clock_crash.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_logical_clock_crash.test	2021-09-28 11:46:34.000000000 +0000
@@ -20,7 +20,7 @@
 
 # make the following transactions to have a common commit parent
 # so be parallelizable on slave.
-SET GLOBAL debug = "d,set_commit_parent_100";
+SET GLOBAL debug = "+d,set_commit_parent_100";
 
 INSERT INTO t2 VALUES(99); # just a warmup load
 BEGIN;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_logical_clock_recovery-slave.opt mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_logical_clock_recovery-slave.opt
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_logical_clock_recovery-slave.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_logical_clock_recovery-slave.opt	2021-09-28 11:46:34.000000000 +0000
@@ -1,5 +1,3 @@
---replica-parallel-workers=4
---replica-parallel-type=logical_clock
 --replica-transaction-retries=0
 --relay-log-info-repository=FILE
 --master-info-repository=FILE
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_logical_clock_recovery.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_logical_clock_recovery.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_logical_clock_recovery.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_logical_clock_recovery.test	2021-09-28 11:46:34.000000000 +0000
@@ -3,6 +3,12 @@
 --source include/not_group_replication_plugin.inc
 -- source include/have_debug.inc
 -- source include/not_valgrind.inc
+# This test needs at least 3 MTA workers
+--let $option_name = replica_parallel_workers
+--let $option_operator = >
+--let $option_value = 2
+--source include/only_with_option.inc
+--source include/only_mts_replica_parallel_type_logical_clock.inc
 -- source include/master-slave.inc
 
 --let $debug_point=set_commit_parent_100
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_relay_log_recovery_on_error-slave.opt mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_relay_log_recovery_on_error-slave.opt
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_relay_log_recovery_on_error-slave.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_relay_log_recovery_on_error-slave.opt	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
---replica-transaction-retries=0 --sync_source_info=1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_relay_log_recovery_on_error.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_relay_log_recovery_on_error.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_relay_log_recovery_on_error.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_relay_log_recovery_on_error.test	1970-01-01 00:00:00.000000000 +0000
@@ -1,118 +0,0 @@
-###############################################################################
-# Bug#21507981: REPLICATION POSITION LOST AFTER CRASH ON MTS CONFIGURED SLAVE
-#
-# Problem:
-# ========
-# Enable MTS along with crash-safe replication tables. Make sure that the server
-# is busily inserting data with multiple threads in parallel. Shutdown mysqld
-# uncleanly (kill -9 or power off server without notice).
-#
-# Now users are restarting the server with --relay-log-recovery=1 to recover the
-# crashed slave.
-#
-# This results in following error:
-# ================================
-# 2015-06-24 13:49:03 3895 [ERROR] --relay-log-recovery cannot be executed when
-# the slave was stopped with an error or killed in MTS mode; consider using
-# RESET SLAVE or restart the server with --relay-log-recovery = 0 followed by
-# START SLAVE UNTIL SQL_AFTER_MTS_GAPS.
-#
-# i.e relay-log-recovery will not work in MTS mode.
-###############################################################################
-# Following test demonstrates that when a gap is generated because MTS has
-# stopped due to an error then attempting 'relay-log-recovery' will not be
-# successful. Once the route cause of the error is eliminated restarting the
-# recovery with relay-log-recovery=1 should fix the issue.
-#
-# Testing Method:
-# ===============
-# It first creates two databases (d1 and d2) and setup slave to use two parallel
-# workers. The test case then insert on the slave a tuple that will block
-# writes on d2 and generate gaps. Now COMMIT the blocking tuple on slave so
-# that workers will proceed and apply the pending transactions. This will
-# result in duplicate key error and slave will stop. Now crash the slave
-# server and initiate relay-log-recovery. It should fail as slave has stopped
-# due to an error. Eliminate the cause of duplicate key error by removing the
-# local changes on slave. Restart the recovery process it should be
-# successful.
---source include/force_restart.inc
---source include/have_binlog_format_statement.inc
-# Test requires master-info-repository=TABLE, relay-log-info-repository=TABLE
---source include/have_slave_repository_type_table.inc
---source include/only_mts_replica_parallel_workers.inc
---source include/only_mts_replica_parallel_type_database.inc
---source include/master-slave.inc
-
---source include/rpl_connection_slave.inc
-call mtr.add_suppression("Duplicate entry*");
-call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
-call mtr.add_suppression("Failed to initialize the master info structure");
-call mtr.add_suppression("Slave failed to initialize relay log info*");
-call mtr.add_suppression("MTS recovery: automatic recovery failed.*");
-call mtr.add_suppression("Recovery from master pos");
-
---source extra/rpl_tests/rpl_generate_mts_gap.test
-
---source include/rpl_connection_slave.inc
-COMMIT;
---let $slave_sql_errno= convert_error(ER_DUP_ENTRY)
-source include/wait_for_slave_sql_error.inc;
-
-# Restart the slave server - Recovery will fail as MTS has stopped due to an
-# error.
---let $rpl_server_number= 2
---let $rpl_server_parameters= --skip_replica_start=TRUE --sync_source_info=1 --relay-log-recovery=1
---source include/rpl_restart_server.inc
-
---source include/rpl_connection_slave.inc
---exec echo "Relay log recovery should fail as MTS stopped due to an error"
-
---error ER_SLAVE_RLI_INIT_REPOSITORY
-START SLAVE;
-
-# Remove the affending rows from slave.
---exec echo "Eliminate the cause of MTS error"
-DELETE FROM d2.t WHERE a=2;
-DELETE FROM d1.t WHERE a=3;
-
---let $table=d2.t
---let $count=1
---source include/wait_until_rows_count.inc
-
---let $table=d1.t
---let $count=2
---source include/wait_until_rows_count.inc
-
-# Restart the slave server this should fix the gaps.
---let $rpl_server_number= 2
---let $rpl_server_parameters= --skip_replica_start=TRUE --sync_source_info=1 --relay-log-recovery=1
---source include/rpl_restart_server.inc
-
---exec echo "MTS recovery should be successful. Check that gaps are filled."
-
---let $assert_text= Table d1.t should contain 2 rows.
---let $assert_cond= [select count(*) from d1.t] = 2
---source include/assert.inc
-
---let $assert_text= Table d2.t should contain 3 rows.
---let $assert_cond= [select count(*) from d2.t] = 3
---source include/assert.inc
-
---source include/start_slave.inc
-
-# Check consistency
---source include/rpl_connection_master.inc
---source include/sync_slave_sql_with_master.inc
---let $diff_tables= master:d1.t, slave:d1.t
---source include/diff_tables.inc
-
---let $diff_tables= master:d2.t, slave:d2.t
---source include/diff_tables.inc
-
-#
-# Cleanup
-#
---source include/rpl_connection_master.inc
-DROP DATABASE d1;
-DROP DATABASE d2;
---source include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_replica_preserve_commit_order_deadlock_error.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_replica_preserve_commit_order_deadlock_error.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_replica_preserve_commit_order_deadlock_error.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_replica_preserve_commit_order_deadlock_error.test	2021-09-28 11:46:34.000000000 +0000
@@ -24,7 +24,11 @@
 #
 # Commit order deadlock occurs only when MTS + LOGICAL CLOCK are enabled.
 --source include/only_mts_replica_parallel_type_logical_clock.inc
---source include/only_mts_replica_parallel_workers.inc
+# This test needs at least 2 MTA workers
+--let $option_name = replica_parallel_workers
+--let $option_operator = >
+--let $option_value = 1
+--source include/only_with_option.inc
 --source include/have_binlog_format_statement.inc
 --source include/have_debug.inc
 --source include/master-slave.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_replica_preserve_commit_order_deadlock.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_replica_preserve_commit_order_deadlock.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_replica_preserve_commit_order_deadlock.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_replica_preserve_commit_order_deadlock.test	2021-09-28 11:46:34.000000000 +0000
@@ -161,7 +161,6 @@
 --source include/rpl_connection_master.inc
 INSERT INTO t1 VALUES(30, NULL);
 
-# SET debug = "d,set_commit_parent_100";
 --let $debug_point= d,set_commit_parent_100
 --source include/add_debug_point.inc
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_replica_preserve_commit_order_error_nobinlog-slave.opt mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_replica_preserve_commit_order_error_nobinlog-slave.opt
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_replica_preserve_commit_order_error_nobinlog-slave.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_replica_preserve_commit_order_error_nobinlog-slave.opt	2021-09-28 11:46:34.000000000 +0000
@@ -1,3 +1,2 @@
---replica-parallel-workers=4 --replica-parallel-type='logical_clock'
---replica-transaction-retries=0 --replica-preserve-commit-order=1
+--replica-transaction-retries=0
 --skip-log-bin --log-replica-updates=0
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_replica_preserve_commit_order_error_nobinlog.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_replica_preserve_commit_order_error_nobinlog.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_replica_preserve_commit_order_error_nobinlog.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_replica_preserve_commit_order_error_nobinlog.test	2021-09-28 11:46:34.000000000 +0000
@@ -2,8 +2,9 @@
 # workers from committing if one of the older workers have errored out.
 --source include/have_debug.inc
 --source include/have_debug_sync.inc
-# TODO: The test can be converted to run with Logical-clock.
---source include/have_replica_parallel_type_database.inc
+--source include/only_mts_replica_parallel_workers.inc
+--source include/only_mts_replica_parallel_type_logical_clock.inc
+--source include/only_replica_preserve_commit_order.inc
 --source include/master-slave.inc
 
 CALL mtr.add_suppression(".*slave coordinator and worker threads are stopped.*");
@@ -13,7 +14,7 @@
   previous worker(s) have encountered an error and replica-preserve-commit-order
   is enabled.*");
 
---let $debug_point=set_commit_parent_100
+--let $debug_point= set_commit_parent_100
 --source include/add_debug_point.inc
 
 CREATE TABLE t_w1 (c1 int PRIMARY KEY) ENGINE = InnoDB;
@@ -52,13 +53,17 @@
 COMMIT;
 
 INSERT INTO t_w4 VALUES(1);
-SET GLOBAL debug = @save_debug;
+
+--let $debug_point= set_commit_parent_100
+--source include/remove_debug_point.inc
+
 --source include/save_master_pos.inc
 --source include/rpl_connection_slave.inc
 
 # Wait until all workers are blocked by LOCK TABLE t1 WRITE. It implies all
 # transactions are registered into the order commit queue.
-let $wait_condition= SELECT count(*) = 4 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'Waiting for table metadata lock';
+--let $number_workers =`SELECT @@GLOBAL.replica_parallel_workers`
+let $wait_condition= SELECT count(*) = $number_workers FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'Waiting for table metadata lock';
 --source include/wait_condition.inc
 
 UNLOCK TABLES;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_replica_preserve_commit_order_error-slave.opt mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_replica_preserve_commit_order_error-slave.opt
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_replica_preserve_commit_order_error-slave.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_replica_preserve_commit_order_error-slave.opt	2021-09-28 11:46:34.000000000 +0000
@@ -1,2 +1 @@
---replica-parallel-workers=4 --replica-parallel-type='logical_clock'
---replica-transaction-retries=0 --replica-preserve-commit-order=1
+--replica-transaction-retries=0
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_replica_preserve_commit_order_error.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_replica_preserve_commit_order_error.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_replica_preserve_commit_order_error.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_replica_preserve_commit_order_error.test	2021-09-28 11:46:34.000000000 +0000
@@ -3,8 +3,9 @@
 --source include/not_group_replication_plugin.inc
 --source include/have_debug.inc
 --source include/have_debug_sync.inc
-# TODO: The test can be converted to run with Logical-clock.
---source include/have_replica_parallel_type_database.inc
+--source include/only_mts_replica_parallel_workers.inc
+--source include/only_mts_replica_parallel_type_logical_clock.inc
+--source include/only_replica_preserve_commit_order.inc
 --source include/master-slave.inc
 
 CALL mtr.add_suppression(".*slave coordinator and worker threads are stopped.*");
@@ -15,7 +16,7 @@
   is enabled.*");
 
 SET @save_debug = @@GLOBAL.debug;
-SET GLOBAL debug = "d,set_commit_parent_100";
+SET GLOBAL debug = "+d,set_commit_parent_100";
 
 CREATE TABLE t_w1 (c1 int PRIMARY KEY) ENGINE = InnoDB;
 CREATE TABLE t_w2 (c1 int PRIMARY KEY) ENGINE = InnoDB;
@@ -57,7 +58,8 @@
 
 # Wait until all workers are blocked by LOCK TABLE t1 WRITE. It implies all
 # transactions are registered into the order commit queue.
-let $wait_condition= SELECT count(*) = 4 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'Waiting for table metadata lock';
+--let $number_workers =`SELECT @@GLOBAL.replica_parallel_workers`
+let $wait_condition= SELECT count(*) = $number_workers FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'Waiting for table metadata lock';
 --source include/wait_condition.inc
 
 UNLOCK TABLES;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_replica_preserve_commit_order_optimize_table-slave.opt mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_replica_preserve_commit_order_optimize_table-slave.opt
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_replica_preserve_commit_order_optimize_table-slave.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_replica_preserve_commit_order_optimize_table-slave.opt	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
---replica-preserve-commit-order=on --replica-parallel-type=LOGICAL_CLOCK --replica-parallel-workers=4
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_replica_preserve_commit_order-slave.opt mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_replica_preserve_commit_order-slave.opt
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_replica_preserve_commit_order-slave.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_replica_preserve_commit_order-slave.opt	2021-09-28 11:46:34.000000000 +0000
@@ -1,2 +1,2 @@
---replica-parallel-workers=6 --replica-parallel-type='logical_clock'
---replica-transaction-retries=0 --replica-preserve-commit-order=1
+--replica-parallel-workers=6
+--replica-transaction-retries=0
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_replica_preserve_commit_order.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_replica_preserve_commit_order.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_replica_preserve_commit_order.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_replica_preserve_commit_order.test	2021-09-28 11:46:34.000000000 +0000
@@ -3,6 +3,9 @@
 --source include/not_group_replication_plugin.inc
 --source include/have_debug.inc
 --source include/have_debug_sync.inc
+--source include/only_mts_replica_parallel_workers.inc
+--source include/only_mts_replica_parallel_type_logical_clock.inc
+--source include/only_replica_preserve_commit_order.inc
 --source include/master-slave.inc
 
 # METHOD: We will do some inserts of continious integers into a t1.a
@@ -36,7 +39,7 @@
 # Make the following INSERTs have same commit parent. So they can be applied
 # parallel on slave.
 SET @save_debug = @@GLOBAL.debug;
-SET GLOBAL debug = "d,set_commit_parent_100";
+SET GLOBAL debug = "+d,set_commit_parent_100";
 
 # In each iteration, the master generates some transactions which can be applied
 # parallel. Slave is running in MTS mode and has 6 workers. To guarantee all
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_slave_hang_with_partial_trx.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_slave_hang_with_partial_trx.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_slave_hang_with_partial_trx.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_slave_hang_with_partial_trx.test	2021-09-28 11:46:34.000000000 +0000
@@ -44,7 +44,7 @@
 --source include/rpl_connection_slave.inc
 # Prepare the slave IO thread to stop after queuing a WRITE_ROWS event
 SET @save_debug=@@global.debug;
-SET GLOBAL DEBUG= "d,stop_io_after_reading_write_rows_log_event";
+SET GLOBAL DEBUG= "+d,stop_io_after_reading_write_rows_log_event";
 
 # Put some data in to the master
 --source include/rpl_connection_master.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_stop_slave_report_pos.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_stop_slave_report_pos.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_stop_slave_report_pos.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_stop_slave_report_pos.test	2021-09-28 11:46:34.000000000 +0000
@@ -94,7 +94,7 @@
 # Debug simulation which will ensure that SLAVE STOPS as a regular exit
 # without an error. This ensures we have the same scenario as that of the bug
 # report.
-SET global debug="d,simulate_stop_when_mta_in_group";
+SET global debug="+d,simulate_stop_when_mta_in_group";
 --source include/start_slave_io.inc
 
 --source include/wait_for_slave_sql_to_stop.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_submode_switch_without_reset_slave_myisam.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_submode_switch_without_reset_slave_myisam.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_submode_switch_without_reset_slave_myisam.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_submode_switch_without_reset_slave_myisam.test	2021-09-28 11:46:34.000000000 +0000
@@ -15,6 +15,7 @@
 
 # save  MTS submode
 --let $saved_submode= `SELECT @@replica_parallel_type`
+SET @slave_preserver_commit_order_saved= @@GLOBAL.REPLICA_PRESERVE_COMMIT_ORDER;
 
 --source include/stop_slave.inc
 
@@ -36,6 +37,8 @@
 # DEFAULT  ========> DATABASE
 --connection slave
 SET GLOBAL replica_parallel_type='DATABASE';
+# Switching off replica-preserve-commit-order
+SET GLOBAL replica_preserve_commit_order=0;
 --source include/start_slave.inc
 --connection master
 --source include/sync_slave_sql_with_master.inc
@@ -53,6 +56,8 @@
 # DATABASE  ========> LOGICAL_CLOCK
 --connection slave
 SET GLOBAL replica_parallel_type='LOGICAL_CLOCK';
+# Switching on replica-preserve-commit-order
+SET GLOBAL replica_preserve_commit_order=1;
 --source include/start_slave.inc
 --connection master
 --source include/sync_slave_sql_with_master.inc
@@ -70,6 +75,8 @@
 # LOGICAL_CLOCK  ========> DATABASE
 --connection slave
 SET GLOBAL replica_parallel_type='DATABASE';
+# Switching off replica-preserve-commit-order
+SET GLOBAL replica_preserve_commit_order=0;
 --source include/start_slave.inc
 --connection master
 --source include/sync_slave_sql_with_master.inc
@@ -88,6 +95,7 @@
 --disable_query_log
 --disable_result_log
 --eval SET GLOBAL replica_parallel_type= '$saved_submode'
+SET GLOBAL replica_preserve_commit_order=@slave_preserver_commit_order_saved;
 --source include/start_slave.inc
 --connection master
 --eval SET GLOBAL DEBUG='$saved_debug'
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_submode_switch_without_reset_slave.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_submode_switch_without_reset_slave.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_mts_submode_switch_without_reset_slave.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_mts_submode_switch_without_reset_slave.test	2021-09-28 11:46:34.000000000 +0000
@@ -13,8 +13,9 @@
 
 # save  MTS submode
 --let $saved_submode= `SELECT @@replica_parallel_type`
-
+SET @saved_rpco= @@GLOBAL.replica_preserve_commit_order;
 --source include/stop_slave.inc
+SET GLOBAL replica_preserve_commit_order=OFF;
 
 #setup 2 connections to master
 --connect(m1, localhost,root,,,$MASTER_MYPORT)
@@ -87,6 +88,7 @@
 --disable_query_log
 --disable_result_log
 --eval SET GLOBAL replica_parallel_type= '$saved_submode'
+SET GLOBAL replica_preserve_commit_order=@saved_rpco;
 --source include/start_slave.inc
 --connection master
 --eval SET GLOBAL DEBUG='$saved_debug'
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_multi_source_cmd_errors.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_multi_source_cmd_errors.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_multi_source_cmd_errors.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_multi_source_cmd_errors.test	2021-09-28 11:46:34.000000000 +0000
@@ -86,12 +86,15 @@
 --echo #
 --echo #  3.b) Check that maximum channels permitted error is issued.
 --echo #
---let @old_debug = @@global.debug
-SET GLOBAL DEBUG = "+d, max_replication_channels_exceeded";
+
+--let $debug_point= max_replication_channels_exceeded
+--source include/add_debug_point.inc
+
 --error ER_SLAVE_MAX_CHANNELS_EXCEEDED
 CHANGE REPLICATION SOURCE TO SOURCE_LOG_POS = 4 FOR CHANNEL "257th_channel";
 
-SET GLOBAL DEBUG=@old_debug;
+--let $debug_point= max_replication_channels_exceeded
+--source include/remove_debug_point.inc
 
 --echo #
 --echo #  3.c) Check that restricted channel names cannot be used
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_multi_source_repo_info_errors.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_multi_source_repo_info_errors.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_multi_source_repo_info_errors.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_multi_source_repo_info_errors.test	2021-09-28 11:46:34.000000000 +0000
@@ -2,6 +2,7 @@
 --source include/master-slave.inc
 # Test requires master-info-repository=TABLE, relay-log-info-repository=TABLE
 --source include/have_slave_repository_type_table.inc
+--source include/only_mts_replica_parallel_workers.inc
 
 --let $save_replica_parallel_workers=`SELECT @@global.replica_parallel_workers`
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_operation_ignore_super_read_only.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_operation_ignore_super_read_only.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_operation_ignore_super_read_only.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_operation_ignore_super_read_only.test	2021-09-28 11:46:34.000000000 +0000
@@ -30,6 +30,7 @@
 --source include/have_binlog_format_row.inc
 # Test requires master-info-repository=TABLE, relay-log-info-repository=TABLE
 --source include/have_slave_repository_type_table.inc
+--source include/not_rpl_gtid_only.inc
 --source include/master-slave.inc
 
 --let $autocommit_opt= ON
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_packet.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_packet.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_packet.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_packet.test	2021-09-28 11:46:34.000000000 +0000
@@ -14,11 +14,6 @@
 --source include/not_group_replication_plugin.inc
 source include/have_binlog_format_row.inc;
 
-# TODO: Fixing is handed over to Sergei.
-# The test runs slow in MTS mode because of state of MTS at time of the graceful stop.
-# In this case MTS can't stop immediately if there is a Worker that received a BEGIN but never COMMIT.
--- source include/not_mts_replica_parallel_workers.inc
-
 source include/master-slave.inc;
 
 call mtr.add_suppression("Slave I/O for channel '': Got a packet bigger than 'replica_max_allowed_packet' bytes, Error_code: MY-013125");
@@ -39,6 +34,7 @@
 
 --source include/sync_slave_sql_with_master.inc
 # Restart slave for setting to take effect
+call mtr.add_suppression(".*The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state.*");
 source include/stop_slave.inc;
 source include/start_slave.inc;
 
@@ -106,6 +102,7 @@
 CREATE TABLE `t1` (`f1` LONGTEXT);
 
 --source include/sync_slave_sql_with_master.inc
+--source include/stop_slave_sql.inc
 
 connection master;
 
@@ -124,9 +121,6 @@
 --let $show_slave_io_error= 1
 --source include/wait_for_slave_io_error.inc
 
-# TODO: this is needed because of BUG#55790. Remove once that is fixed.
---source include/stop_slave_sql.inc
-
 #
 # Bug#42914: On the master, if a binary log event is larger than
 # max_allowed_packet, the error message ER_MASTER_FATAL_ERROR_READING_BINLOG
@@ -301,8 +295,9 @@
 
 # Clear Last_IO_Error
 
---source include/stop_slave_sql.inc
+STOP REPLICA;
 RESET SLAVE;
 
+--let $rpl_only_running_threads=1
 --source include/rpl_end.inc
 # End of tests
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_parallel_innodb.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_parallel_innodb.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_parallel_innodb.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_parallel_innodb.test	2021-09-28 11:46:34.000000000 +0000
@@ -2,6 +2,8 @@
 --source include/no_valgrind_without_big.inc
 --source include/not_group_replication_plugin.inc
 --source include/not_have_privilege_checks_user.inc
+--source include/not_rpl_gtid_only.inc
+
 #
 # WL#5569 MTS
 #
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_parallel_multi_db-master.opt mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_parallel_multi_db-master.opt
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_parallel_multi_db-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_parallel_multi_db-master.opt	2021-09-28 11:46:34.000000000 +0000
@@ -1 +1 @@
---thread_stack=512K --log-error-verbosity=1
+--log-error-verbosity=1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_parallel.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_parallel.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_parallel.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_parallel.test	2021-09-28 11:46:34.000000000 +0000
@@ -30,6 +30,7 @@
 # In the end there will be mysql-test/delta.{parallel,sequential}.log files.
 #
 --source include/not_group_replication_plugin.inc
+--source include/not_rpl_gtid_only.inc
 --source include/master-slave.inc
 
 connection master;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_perfschema_connection_applier_status_mts.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_perfschema_connection_applier_status_mts.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_perfschema_connection_applier_status_mts.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_perfschema_connection_applier_status_mts.test	2021-09-28 11:46:34.000000000 +0000
@@ -38,7 +38,7 @@
 # the test is binlog-format agnostic
 --source include/have_binlog_format_row.inc
 --source include/have_debug_sync.inc
-
+--source include/only_mts_replica_parallel_workers.inc
 --source include/master-slave.inc
 
 --let $is_mts= 1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_perfschema_disabled_connection_applier_status_mts.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_perfschema_disabled_connection_applier_status_mts.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_perfschema_disabled_connection_applier_status_mts.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_perfschema_disabled_connection_applier_status_mts.test	2021-09-28 11:46:34.000000000 +0000
@@ -40,7 +40,7 @@
 # the test is binlog-format agnostic
 --source include/have_binlog_format_row.inc
 --source include/have_debug_sync.inc
-
+--source include/only_mts_replica_parallel_workers.inc
 --source include/master-slave.inc
 
 --let $is_mts= 1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_perfschema_log_status_blockage.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_perfschema_log_status_blockage.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_perfschema_log_status_blockage.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_perfschema_log_status_blockage.test	2021-09-28 11:46:34.000000000 +0000
@@ -30,7 +30,11 @@
 --let $rpl_extra_connections_per_server= 6
 --source include/master-slave.inc
 
+--source include/rpl_connection_slave.inc
+--let $replica_checkpoint_period_value = `SELECT @@global.replica_checkpoint_period`
+SET @@GLOBAL.replica_checkpoint_period= 1;
 
+--source include/rpl_connection_master.inc
 # Create a table to store the data to be validated
 CREATE TABLE ils_copy (
   uuid VARCHAR(36) PRIMARY KEY,
@@ -43,6 +47,7 @@
 CREATE TABLE t2_myisam (c1 INT) ENGINE=MyISAM;
 
 --source include/sync_slave_sql_with_master.inc
+
 # Make server to pause when fully blocked
 --let $debug_point= pause_collecting_instance_logs_info
 --source include/add_debug_point.inc
@@ -245,6 +250,9 @@
 --let $assert_cond= $ils_relay_log_file = "$relay_log_file"
 --source include/assert.inc
 
+--let $wait_condition= SELECT JSON_EXTRACT(channels, "$.channels[0].relay_log_position")=$relay_log_pos FROM ils_copy
+--source include/wait_condition_or_abort.inc
+
 --let $assert_text= Collected default replication channel relay log file position is correct
 --let $ils_relay_log_pos= `SELECT JSON_EXTRACT(channels, "$.channels[0].relay_log_position") FROM ils_copy`
 --let $assert_cond= $ils_relay_log_pos = $relay_log_pos
@@ -279,6 +287,8 @@
 # Cleanup
 --source include/rpl_connection_slave.inc
 --source include/remove_debug_point.inc
+--replace_result $replica_checkpoint_period_value REPLICA_CHECKPOINT_PERIOD
+--eval SET @@GLOBAL.replica_checkpoint_period= $replica_checkpoint_period_value
 RESET SLAVE ALL FOR CHANNEL 'ch2';
 --remove_file $ils_dump
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_perfschema_log_status.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_perfschema_log_status.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_perfschema_log_status.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_perfschema_log_status.test	2021-09-28 11:46:34.000000000 +0000
@@ -58,6 +58,9 @@
 }
 --source include/save_master_pos.inc
 
+# Sleep before collecting positions
+--sleep 5
+
 # Save current slave relay log coordinates
 --let $relay_log_file= query_get_value(SHOW SLAVE STATUS, Relay_Log_File, 1)
 --let $relay_log_pos= query_get_value(SHOW SLAVE STATUS, Relay_Log_Pos, 1)
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_ps_worker_retry_transaction_mts.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_ps_worker_retry_transaction_mts.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_ps_worker_retry_transaction_mts.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_ps_worker_retry_transaction_mts.test	2021-09-28 11:46:34.000000000 +0000
@@ -15,5 +15,6 @@
 #
 # WL#9131 Add RETRIES field to replication_applier_status_by_worker P_S table
 
+--source include/only_mts_replica_parallel_workers.inc
 --let $is_mts = 1
 --source extra/rpl_tests/rpl_ps_table_worker_retry.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_ps_worker_stop_slave.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_ps_worker_stop_slave.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_ps_worker_stop_slave.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_ps_worker_stop_slave.test	2021-09-28 11:46:34.000000000 +0000
@@ -19,6 +19,7 @@
 
 # the test in binlog format agnostic
 --source include/have_binlog_format_row.inc
+--source include/not_rpl_gtid_only.inc
 --source include/master-slave.inc
 
 CREATE TABLE t1 (a INT);
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_recovery_replicate_same_server_id.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_recovery_replicate_same_server_id.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_recovery_replicate_same_server_id.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_recovery_replicate_same_server_id.test	2021-09-28 11:46:34.000000000 +0000
@@ -42,6 +42,7 @@
 --source include/not_group_replication_plugin.inc
 # Test requires master-info-repository=TABLE, relay-log-info-repository=TABLE
 --source include/have_slave_repository_type_table.inc
+--source include/not_rpl_gtid_only.inc
 --source include/master-slave.inc
 
 --source include/rpl_connection_slave.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_removed_status_vars.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_removed_status_vars.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_removed_status_vars.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_removed_status_vars.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,32 @@
+# ==== Purpose ====
+#
+# Verify that status variables removed in 8.0 are actually removed.
+#
+# ==== Requirements ====
+#
+# R1. The following status variables should not exist:
+#     Slave_running
+#     Slave_retried_transactions
+#     Slave_heartbeat_period
+#     Slave_received_heartbeats
+#     Slave_last_heartbeat
+#
+# ==== Implementation ====
+#
+# Show each of those variables.
+# Verify that the result file is empty.
+#
+# ==== References ====
+#
+# BUG#32709065: REMOVE DEAD CODE FOR REMOVED REPLICATION STATUS VARIABLES
+#
+# Note: the test passes before *and* after the bugfix. The test may be
+# executed without the bugfix to verify the correctness of the
+# assumption of the bugfix: that the code we remove actually was not
+# used.
+
+SHOW STATUS LIKE 'Slave_running';
+SHOW STATUS LIKE 'Slave_retried_transactions';
+SHOW STATUS LIKE 'Slave_heartbeat_period';
+SHOW STATUS LIKE 'Slave_received_heartbeats';
+SHOW STATUS LIKE 'Slave_last_heartbeat';
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_replica_read_lock.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_replica_read_lock.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_replica_read_lock.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_replica_read_lock.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,166 @@
+##############################################################################
+# ==== Purpose ====
+# The purpose of this test is to verify that during row lookup, applier thread
+# retries the transaction when storage engine reports retryable errors
+# (like 'HA_ERR_LOCK_WAIT_TIMEOUT' or 'HA_ERR_LOCK_DEADLOCK') instead of error
+# out and stop execution. This test checks for all three(HASH_SCAN, INDEX_SCAN
+# and TABLE_SCAN) row lookup algorithms.
+#
+# ==== Requirement ====
+# When storage engine reports retryable errors(like 'HA_ERR_LOCK_WAIT_TIMEOUT'
+# or 'HA_ERR_LOCK_DEADLOCK') back to applier thread, it should be retried as
+# per # 'replica_transaction_retries'.
+#
+# ==== Implementation ====
+# 1. Create source-replica topology
+# 2. For each slave_rows_search_algorithms[INDEX_SCAN, HASH_SCAN(with index),
+#    HASH_SCAN(with two non-unique index), HASH_SCAN(with out index),
+#    TABLE_SCAN],
+#    2.0 Configure source and replica
+#    2.1 Stop replica
+#    2.2 Execute DELETE transaction on source
+#    2.3 Begin SELECT ... FOR UPDATE on replica
+#    2:4 Start replica from another connection
+#    2.5 Wait until the applier retries
+#    2.6 Commit SELECT ... FOR UPDATE on replica
+#    2.7 Restart replica applier
+# 3. Clean up
+#
+# ==== References ====
+# BUG#33107663:LOCKING READS ON THE REPLICA: CAN'T FIND RECORD IN 'T',
+#              ERROR_CODE: 1032; HANDLER ERROR HA_ERR_KEY_NOT_FOUND
+###############################################################################
+
+# The status variable Replica_rows_last_search_algorithm_used is defined
+# only in Debug mode
+--source include/have_debug.inc
+--source include/have_binlog_format_row.inc
+--let $option_name = replica_transaction_retries
+--let $option_operator = >
+--let $option_value = 2
+--source include/only_with_option.inc
+
+--echo #
+--echo # 1. Create source-replica topology
+--source include/master-slave.inc
+
+--source include/rpl_connection_slave.inc
+--let $saved_innodb_lock_wait_timeout = `SELECT @@GLOBAL.innodb_lock_wait_timeout`
+--let $saved_slave_rows_search_algorithms = `SELECT @@GLOBAL.slave_rows_search_algorithms`
+SET GLOBAL innodb_lock_wait_timeout = 2;
+--disable_warnings
+SET GLOBAL slave_rows_search_algorithms = 'INDEX_SCAN,HASH_SCAN';
+--enable_warnings
+CALL mtr.add_suppression("Slave SQL for channel.*Consider raising the value of the replica_transaction_retries variable.*");
+CALL mtr.add_suppression("Slave SQL for channel.*The slave coordinator and worker threads are stopped.*");
+
+--echo # 2. For each slave_rows_search_algorithms[INDEX_SCAN, HASH_SCAN(with
+--echo #    index), HASH_SCAN(with two non-unique index), HASH_SCAN(with out
+--echo #    index), TABLE_SCAN]
+
+#0. INDEX_SCAN
+#1. HASH_SCAN(with index)
+#2. HASH_SCAN(with two non-unique index)
+#3. HASH_SCAN(with out index)
+#4. TABLE_SCAN
+--let $i = 0
+while ($i < 5) {
+
+  --echo #
+  --echo # 2.0 Configure source and replica
+  --source include/rpl_connection_master.inc
+  if ($i == 0){
+    CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=innodb;
+  }
+  if ($i == 1){
+    CREATE TABLE t1 (a INT, b INT, key(a)) ENGINE=innodb;
+  }
+  if ($i == 2){
+    CREATE TABLE t1 (a INT, b INT, KEY(a), KEY(b)) ENGINE=innodb;
+    INSERT INTO t1 VALUES (10, 10), (10, 20), (10, 30), (20, 10), (20, 20);
+  }
+  if ($i > 2){
+    CREATE TABLE t1 (a INT, b INT) ENGINE=innodb;
+  }
+  if ($i != 2){
+    INSERT INTO t1 VALUES (10, 10), (20, 20);
+  }
+  --source include/sync_slave_sql_with_master.inc
+
+  --echo #
+  --echo # 2.1 Stop replica
+  --source include/stop_slave.inc
+
+  --echo #
+  --echo # 2.2 Execute DELETE transaction on source
+  --source include/rpl_connection_master.inc
+  BEGIN;
+  DELETE FROM t1;
+  COMMIT;
+
+  --echo #
+  --echo # 2.3 Begin SELECT ... FOR UPDATE on replica
+  --source include/rpl_connection_slave.inc
+  if ($i == 4)
+  {
+    --disable_warnings
+    SET GLOBAL slave_rows_search_algorithms = 'TABLE_SCAN';
+    --enable_warnings
+  }
+
+  BEGIN;
+  SELECT * FROM t1 WHERE b = 20 FOR UPDATE;
+  # Save value of 'count_transactions_retries' before lock_wait_timeout
+  let $count_transactions_retries= query_get_value(
+  "select count_transactions_retries from
+  performance_schema.replication_applier_status",count_transactions_retries, 1);
+
+  --echo #
+  --echo # 2.4 Start replica from another connection
+  --source include/rpl_connection_slave1.inc
+  --source include/start_slave.inc
+  --echo #
+  --echo # 2.5 Wait until the applier retries:'count_transactions_retries' will be
+  --echo #    incremented
+  --source include/rpl_connection_slave.inc
+  let $status_col= count_transactions_retries;
+  let $status_col_value= $count_transactions_retries;
+  let $table=replication_applier_status;
+  let $status_col_comparsion= >;
+  --source include/wait_for_rpl_pfs_status.inc
+  --echo #
+  --echo # 2.6 Commit SELECT ... FOR UPDATE on replica
+  COMMIT;
+
+  SHOW STATUS LIKE 'Replica_rows_last_search_algorithm_used';
+
+  --echo #
+  --echo # 2.7 Restart replica applier
+  # This is required to avoid race condition. If the mysqltest process executes
+  # very slowly, the applier may retry multiple times, and eventually reach the
+  # maximum number of retries and will error out(#1205 ER_LOCK_WAIT_TIMEOUT) and
+  # stop.
+  --disable_warnings
+  --let $slave_sql_errno= 0,1205
+  --source include/stop_slave_sql.inc
+  --enable_warnings
+  --source include/start_slave_sql.inc
+
+  # Drop table for the next test
+  --source include/rpl_connection_master.inc
+  DROP TABLE t1;
+  --source include/sync_slave_sql_with_master.inc
+  --inc $i
+}
+
+--echo #
+--echo # 3. Clean up
+--source include/rpl_connection_slave.inc
+--replace_result $saved_innodb_lock_wait_timeout INNODB_LOCK_WAIT_TIMEOUT
+eval SET GLOBAL innodb_lock_wait_timeout = $saved_innodb_lock_wait_timeout;
+--replace_result $saved_slave_rows_search_algorithms SLAVE_ROWS_SEARCH_ALGORITHMS
+--disable_warnings
+eval SET GLOBAL slave_rows_search_algorithms = "$saved_slave_rows_search_algorithms";
+--enable_warnings
+
+--source include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_replication_observers_example_plugin_ongoing_transaction.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_replication_observers_example_plugin_ongoing_transaction.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_replication_observers_example_plugin_ongoing_transaction.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_replication_observers_example_plugin_ongoing_transaction.test	2021-09-28 11:46:34.000000000 +0000
@@ -64,7 +64,6 @@
 --let $rpl_connection_name= con5
 --source include/rpl_connection.inc
 
-SET @debug_save= @@GLOBAL.DEBUG;
 SET @@GLOBAL.DEBUG='+d,group_replication_before_commit_hook_wait';
 
 --send INSERT INTO t2 VALUES (3);
@@ -127,7 +126,7 @@
 DROP TABLE t1;
 DROP TABLE t2;
 
-SET @@GLOBAL.DEBUG= @debug_saved;
+SET @@GLOBAL.DEBUG= '-d,validate_replication_observers_plugin_counts_transactions';
 
 --disconnect con1
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_row_crash_safe.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_row_crash_safe.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_row_crash_safe.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_row_crash_safe.test	2021-09-28 11:46:34.000000000 +0000
@@ -8,8 +8,8 @@
 --source include/have_binlog_format_row.inc
 # Test requires relay-log-info-repository = TABLE
 --source include/not_relay_log_info_file.inc
---source include/not_mts_replica_parallel_workers.inc
 --source include/set_privilege_checks_user_as_system_user.inc
+--source include/not_rpl_gtid_only.inc
 --source include/master-slave.inc
 
 call mtr.add_suppression('Attempting backtrace');
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_row_img_sanity.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_row_img_sanity.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_row_img_sanity.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_row_img_sanity.test	2021-09-28 11:46:34.000000000 +0000
@@ -777,6 +777,11 @@
 # Bug#22510353: UNNECESSARY USING TEMPORARY FOR UPDATE
 #
 ###############################################################################
+# Execute RESET REPLICA before calling rpl_reset.inc
+# To avoid failure in MTS and rpl-priv_checks_user runs
+--source include/stop_slave_io.inc
+RESET REPLICA;
+
 -- source include/rpl_reset.inc
 -- connection master
 -- let $row_img_set=master:FULL:N,slave:FULL:Y
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_row_slave_skip_error_all.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_row_slave_skip_error_all.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_row_slave_skip_error_all.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_row_slave_skip_error_all.test	2021-09-28 11:46:34.000000000 +0000
@@ -53,8 +53,9 @@
 --source include/sync_slave_sql_with_master.inc
 
 --echo # Enable a debug point to simulate failure during rows event cleanup.
---let $debug_saved= `SELECT @@GLOBAL.DEBUG`
-SET @@GLOBAL.DEBUG= 'd,simulate_rows_event_cleanup_failure';
+
+--let $debug_point= simulate_rows_event_cleanup_failure
+--source include/add_debug_point.inc
 
 --source include/rpl_connection_master.inc
 UPDATE t SET name='Old';
@@ -76,7 +77,10 @@
 --source include/assert_grep.inc
 
 --echo ==== Clean up ====
-SET @@GLOBAL.DEBUG= '$debug_saved';
+
+--let $debug_point= simulate_rows_event_cleanup_failure
+--source include/remove_debug_point.inc
+
 --source include/stop_slave_io.inc
 RESET MASTER;
 RESET SLAVE;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_row_sp011-master.opt mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_row_sp011-master.opt
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_row_sp011-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_row_sp011-master.opt	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
---thread_stack=409600
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_seconds_behind_master_mts.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_seconds_behind_master_mts.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_seconds_behind_master_mts.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_seconds_behind_master_mts.test	2021-09-28 11:46:34.000000000 +0000
@@ -26,15 +26,18 @@
 SET @save_replica_parallel_type = @@GLOBAL.replica_parallel_type;
 SET @save.replica_parallel_workers= @@global.replica_parallel_workers;
 SET @save_replica_transaction_retries= @@global.replica_transaction_retries;
+SET @save_replica_preserve_commit_order= @@global.replica_preserve_commit_order;
 
 --echo # Test for PARALLEL_DATABASE
 SET GLOBAL replica_parallel_type = 'DATABASE';
 SET @@global.replica_parallel_workers= 4;
+SET @@global.replica_preserve_commit_order=0;
 --source extra/rpl_tests/rpl_seconds_behind_master_mts_type_database.test
 
 --echo # Test for LOGICAL_CLOCK
 SET GLOBAL replica_parallel_type = 'LOGICAL_CLOCK';
 SET GLOBAL replica_parallel_workers = 3;
+SET GLOBAL replica_preserve_commit_order=1;
 --source extra/rpl_tests/rpl_seconds_behind_master_mts_logical_clock.test
 
 #Cleanup
@@ -43,6 +46,7 @@
 SET @@GLOBAL.replica_parallel_type= @save_replica_parallel_type;
 SET @@global.replica_parallel_workers= @save.replica_parallel_workers;
 SET @@global.replica_transaction_retries= @save_replica_transaction_retries;
+SET @@global.replica_preserve_commit_order= @save_replica_preserve_commit_order;
 --source include/start_slave.inc
 
 --source include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_seconds_behind_master.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_seconds_behind_master.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_seconds_behind_master.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_seconds_behind_master.test	2021-09-28 11:46:34.000000000 +0000
@@ -4,10 +4,6 @@
 # on SHOW PROCESS LIST output in some of the tests)
 --source include/have_binlog_format_statement.inc
 
-# this test logics requires adaption to MTS policies for SBM
-# (see rpl_parallel_seconds_behind_master.test)
---source include/not_mts_replica_parallel_workers.inc
-
 --source include/master-slave.inc
 
 call mtr.add_suppression('Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT');
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_show_slave_running.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_show_slave_running.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_show_slave_running.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_show_slave_running.test	2021-09-28 11:46:34.000000000 +0000
@@ -12,8 +12,9 @@
 
 SET DEBUG_SYNC= 'RESET';
 source include/stop_slave.inc;
-let $debug_saved= `select @@global.debug`;
-set global debug= 'd,dbug.before_get_running_status_yes'; # to block due-started IO
+
+--let $debug_point= dbug.before_get_running_status_yes
+--source include/add_debug_point.inc
 
 # Test 1. Slave is stopped
 
@@ -70,7 +71,8 @@
 # sync and waiting.
 --source include/sync_slave_sql_with_master.inc
 
-eval set global debug= '$debug_saved';
+--let $debug_point= dbug.before_get_running_status_yes
+--source include/remove_debug_point.inc
 
 SET DEBUG_SYNC= 'RESET';
 --echo End of tests
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_show_slave_status_deadlock.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_show_slave_status_deadlock.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_show_slave_status_deadlock.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_show_slave_status_deadlock.test	2021-09-28 11:46:34.000000000 +0000
@@ -28,8 +28,9 @@
 
 --echo # Setup GLOBAL.DEBUG at slave to reach commit
 --source include/rpl_connection_slave.inc
---let $debug_saved= `SELECT @@GLOBAL.DEBUG`
-SET @@GLOBAL.DEBUG= '+d,dbug.reached_commit';
+
+--let $debug_point= dbug.reached_commit
+--source include/add_debug_point.inc
 
 --echo # Do some DML operation on master so that it will be blocked on
 --echo # slave as global read lock is in place.
@@ -53,7 +54,9 @@
 query_vertical SHOW SLAVE STATUS;
 --enable_result_log
 UNLOCK TABLES;
-SET @@GLOBAL.DEBUG= '$debug_saved';
+
+--let $debug_point= dbug.reached_commit
+--source include/remove_debug_point.inc
 
 --echo # Restart SQL thread so that it notices debug has changed
 --source include/restart_slave_sql.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_skip_incident_error_cross.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_skip_incident_error_cross.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_skip_incident_error_cross.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_skip_incident_error_cross.test	2021-09-28 11:46:34.000000000 +0000
@@ -38,8 +38,9 @@
 --let $old_binlog_stmt_cache_size= query_get_value(SHOW VARIABLES LIKE "binlog_stmt_cache_size", Value, 1)
 SET GLOBAL max_binlog_stmt_cache_size = 4096;
 SET GLOBAL binlog_stmt_cache_size = 4096;
-SET @save_debug=@@global.debug;
-SET GLOBAL DEBUG='d,simulate_write_incident_event_into_binlog_directly';
+
+--let $debug_point= simulate_write_incident_event_into_binlog_directly
+--source include/add_debug_point.inc
 
 --disconnect master
 --connect(master,127.0.0.1,root,,test,$MASTER_MYPORT,)
@@ -75,7 +76,9 @@
 --source include/rpl_connection_master.inc
 DROP TABLE t1;
 
-SET GLOBAL DEBUG= @save_debug;
+--let $debug_point= simulate_write_incident_event_into_binlog_directly
+--source include/remove_debug_point.inc
+
 --replace_result $old_max_binlog_stmt_cache_size ORIGINAL_VALUE
 --eval SET GLOBAL max_binlog_stmt_cache_size= $old_max_binlog_stmt_cache_size
 --replace_result $old_binlog_stmt_cache_size ORIGINAL_VALUE
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test	2021-09-28 11:46:34.000000000 +0000
@@ -27,8 +27,9 @@
 ##########################################################################
 
 connection slave;
---let $old_debug= `SELECT @@GLOBAL.DEBUG`
-SET @@GLOBAL.DEBUG = '+d,remove_replica_load_file_before_write';
+
+--let $debug_point= remove_replica_load_file_before_write
+--source include/add_debug_point.inc
 
 connection master;
 
@@ -80,7 +81,8 @@
 
 --let $rpl_only_running_threads= 1
 
-eval SET @@GLOBAL.DEBUG = '$old_debug';
+--let $debug_point= remove_replica_load_file_before_write
+--source include/remove_debug_point.inc
 
 --source include/rpl_end.inc
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_slave_start_after_clone.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_slave_start_after_clone.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_slave_start_after_clone.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_slave_start_after_clone.test	2021-09-28 11:46:34.000000000 +0000
@@ -22,107 +22,9 @@
 # Test requires master-info-repository=TABLE, relay-log-info-repository=TABLE
 --source include/have_slave_repository_type_table.inc
 
---echo #
---echo # 1. Set up a replication connection from server 1 to server 2
-
 --source include/master-slave.inc
---connect(server_3,127.0.0.1,root,,test,$SERVER_MYPORT_3,)
---connect(server_3_1,127.0.0.1,root,,test,$SERVER_MYPORT_3,)
-
---echo #
---echo # 2. Create a table for testing
-
---let $rpl_connection_name= server_1
---source include/rpl_connection.inc
-
-CREATE TABLE test.t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
-
---source include/sync_slave_sql_with_master.inc
-
---echo #
---echo # 3. Install clone on server 2
---echo #    Configure server 3 to invoke clone
-
---let $rpl_connection_name= server_2
---source include/rpl_connection.inc
-
---replace_result $CLONE_PLUGIN CLONE_PLUGIN
---eval INSTALL PLUGIN clone SONAME '$CLONE_PLUGIN'
-
---let $rpl_connection_name= server_3
---source include/rpl_connection.inc
-
-# Make server 3 run with mysqld_safe
---source include/spawn_monitoring_process.inc
-
-# Install clone
---replace_result $CLONE_PLUGIN CLONE_PLUGIN
---eval INSTALL PLUGIN clone SONAME '$CLONE_PLUGIN'
-
-# Set the clone valid donor list to include server 2
---replace_result $SERVER_MYPORT_2 SERVER2_PORT
---eval SET GLOBAL clone_valid_donor_list = 'localhost:$SERVER_MYPORT_2'
-
-# Clone server 3 from server 2
---replace_result $SERVER_MYPORT_2 SERVER2_PORT
---eval CLONE INSTANCE FROM root@localhost:$SERVER_MYPORT_2 IDENTIFIED BY ''
---source include/wait_until_disconnected.inc
-
---let $rpl_server_number= 3
---source include/rpl_reconnect.inc
-
---echo #
---echo # 4. Execute a transaction on server 1, check 3 received it
-
---let $rpl_connection_name= server_1
---source include/rpl_connection.inc
-
-INSERT INTO t1 VALUES (1);
-
---let $sync_slave_connection= server_3
---source include/sync_slave_sql_with_master.inc
-
---let $rpl_connection_name= server_3
---source include/rpl_connection.inc
-
---let $server_1_data = `SELECT COUNT(*) FROM test.t1`
---let $assert_text= All info from server 1 is present
---let $assert_cond= $server_1_data = 1
---source include/assert.inc
-
---echo #
---echo # 5. Cleanup
-
---let $rpl_connection_name= server_1
---source include/rpl_connection.inc
-
-DROP TABLE test.t1;
-
---source include/rpl_sync.inc
-
---let $rpl_connection_name= server_2
---source include/rpl_connection.inc
-
-UNINSTALL PLUGIN clone;
-
---let $rpl_connection_name= server_3
---source include/rpl_connection.inc
-
-STOP SLAVE;
-
-RESET SLAVE ALL;
-
-UNINSTALL PLUGIN clone;
-
---source include/rpl_clear_priv_checks_user_configuration.inc
-
---source include/clean_monitoring_process.inc
 
-SET SESSION sql_log_bin=0;
-call mtr.add_suppression("Clone removing all user data for provisioning: Started");
-call mtr.add_suppression("Clone removing all user data for provisioning: Finished");
-call mtr.add_suppression("Recovery from master pos [0-9]+ and file [a-zA-Z-]+\.[0-9]+ for channel ''*");
-call mtr.add_suppression("Relay log information for channel '' was found after a clone operation. Relay log recovery");
-SET SESSION sql_log_bin=1;
+--source extra/rpl_tests/rpl_replica_start_after_clone.inc
+--source extra/rpl_tests/rpl_replica_start_after_clone_cleanup.inc
 
 --source include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_slow_query_log.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_slow_query_log.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_slow_query_log.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_slow_query_log.test	2021-09-28 11:46:34.000000000 +0000
@@ -345,10 +345,13 @@
 -- connection master
 SET @@global.log_output= @old_log_output;
 SET @@global.long_query_time= @old_long_query_time;
+TRUNCATE TABLE mysql.slow_log;
+TRUNCATE TABLE mysql.general_log;
 DROP TABLE t1;
 
 --source include/sync_slave_sql_with_master.inc
 SET @@global.log_output= @old_log_output;
+TRUNCATE TABLE mysql.general_log;
 SET @@global.long_query_time= @old_long_query_time;
 SET @@global.log_slow_replica_statements= @old_log_slow_replica_statements;
 --source include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_sql_delay_old.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_sql_delay_old.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_sql_delay_old.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_sql_delay_old.test	2021-09-28 11:46:34.000000000 +0000
@@ -18,8 +18,6 @@
 # This test is very unstable when using windows because support for high
 # precision timestamps in this platform is not as good as in unix
 --source include/not_windows.inc
-# There is a specific test for mts
---source include/not_mts_replica_parallel_workers.inc
 --source include/have_debug.inc
 
 --let $rpl_skip_start_slave= 1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_sql_thread_error.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_sql_thread_error.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_sql_thread_error.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_sql_thread_error.test	2021-09-28 11:46:34.000000000 +0000
@@ -29,7 +29,7 @@
 --source include/rpl_connection_slave.inc
 CALL mtr.add_suppression("Relay log read failure");
 SET @save_debug=@@GLOBAL.debug;
-SET GLOBAL debug="d,force_sql_thread_error";
+SET GLOBAL debug="+d,force_sql_thread_error";
 
 # Start SQL thread
 START SLAVE SQL_THREAD;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_start_slave_after_restart_initialized_slave.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_start_slave_after_restart_initialized_slave.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_start_slave_after_restart_initialized_slave.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_start_slave_after_restart_initialized_slave.test	2021-09-28 11:46:34.000000000 +0000
@@ -27,6 +27,7 @@
 
 --source include/have_binlog_format_row.inc
 --source include/have_slave_repository_type_table.inc
+--source include/not_rpl_gtid_only.inc
 
 # 1. Initialize the slave by sourcing master-slave.inc without starting the
 #    slave threads.
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_stm_mixed_crash_safe.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_stm_mixed_crash_safe.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_stm_mixed_crash_safe.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_stm_mixed_crash_safe.test	2021-09-28 11:46:34.000000000 +0000
@@ -4,7 +4,6 @@
 --source include/have_binlog_format_mixed_or_statement.inc
 # Test requires relay-log-info-repository = TABLE
 --source include/not_relay_log_info_file.inc
---source include/not_mts_replica_parallel_workers.inc
 --source include/set_privilege_checks_user_as_system_user.inc
 --source include/master-slave.inc
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_stm_until.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_stm_until.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_stm_until.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_stm_until.test	2021-09-28 11:46:34.000000000 +0000
@@ -18,7 +18,6 @@
 # Bug in this test: BUG#37717: rpl.rpl_stm_until 'stmt' fails sporadically on pushbuild
 
 --source include/have_binlog_format_mixed_or_statement.inc
---source include/not_mts_replica_parallel_workers.inc
 --source include/master-slave.inc
 
 # Test is dependent on binlog positions
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_sync.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_sync.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_sync.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_sync.test	2021-09-28 11:46:34.000000000 +0000
@@ -35,7 +35,7 @@
 --source include/have_myisam.inc
 
 call mtr.add_suppression('Attempting backtrace');
-call mtr.add_suppression("Recovery from master pos .* and file master-bin.000001");
+call mtr.add_suppression("Recovery from master pos [0-9]+ and file [a-zA-Z-]*\.*[0-9]* for channel ''*");
 call mtr.add_suppression("Binlog has bad magic number;  It's not a binary log file that can be used by this version of MySQL");
 CREATE TABLE t1(a INT, PRIMARY KEY(a)) engine=innodb;
 
@@ -76,7 +76,7 @@
 EOF
 
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.2.expect
-SET SESSION debug="d,crash_before_rotate_relaylog";
+SET SESSION debug="+d,crash_before_rotate_relaylog";
 --error 2013
 FLUSH LOGS;
 
@@ -124,7 +124,7 @@
 EOF
 
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.2.expect
-SET SESSION debug="d,crash_before_rotate_relaylog";
+SET SESSION debug="+d,crash_before_rotate_relaylog";
 --error 2013
 FLUSH LOGS;
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_temporary_error_table_repository.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_temporary_error_table_repository.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_temporary_error_table_repository.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_temporary_error_table_repository.test	2021-09-28 11:46:34.000000000 +0000
@@ -15,7 +15,6 @@
 
 # This test case is binary log format agnostic though.
 --source include/have_binlog_format_row.inc
---source include/not_mts_replica_parallel_workers.inc
 --source include/not_group_replication_plugin.inc
 
 --source include/master-slave.inc
@@ -25,6 +24,8 @@
 
 --sync_slave_with_master
 --source include/stop_slave.inc
+call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
+call mtr.add_suppression(".*worker thread retried transaction.*time.*in vain, giving up.*");
 SET @saved_replica_transaction_retries = @@GLOBAL.replica_transaction_retries;
 SET @saved_innodb_lock_wait_timeout = @@GLOBAL.innodb_lock_wait_timeout;
 SET @saved_master_info_repository = @@GLOBAL.master_info_repository;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_terminology_use_previous_logs.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_terminology_use_previous_logs.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_terminology_use_previous_logs.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_terminology_use_previous_logs.test	2021-09-28 11:46:34.000000000 +0000
@@ -104,6 +104,8 @@
 
 --source include/rpl_connection_master.inc
 SET @@global.log_output = @save_log_output;
+TRUNCATE TABLE mysql.general_log;
+TRUNCATE TABLE mysql.slow_log;
 SET @@global.long_query_time = @save_long_query_time;
 SET @@global.terminology_use_previous = @save_terminology_use_previous;
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_unknown_ignorable_event.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_unknown_ignorable_event.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_unknown_ignorable_event.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_unknown_ignorable_event.test	2021-09-28 11:46:34.000000000 +0000
@@ -47,7 +47,7 @@
 --source include/sync_slave_sql_with_master.inc
 --echo # Set a debug point on slave to simulate unknown ignorable log events.
 SET @save_debug=@@global.debug;
-SET GLOBAL DEBUG='d,simulate_unknown_ignorable_log_event';
+SET GLOBAL DEBUG='+d,simulate_unknown_ignorable_log_event';
 
 --source include/rpl_connection_master.inc
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_worker_repository_conversion_with_relaylog_recovery.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_worker_repository_conversion_with_relaylog_recovery.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_worker_repository_conversion_with_relaylog_recovery.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_worker_repository_conversion_with_relaylog_recovery.test	2021-09-28 11:46:34.000000000 +0000
@@ -38,7 +38,8 @@
 
 --source include/rpl_connection_slave.inc
 
-call mtr.add_suppression("Recovery from master pos [0-9]+ and file [a-zA-Z-]+\.[0-9]+ for channel ''*");
+call mtr.add_suppression("Recovery from master pos [0-9]+ and file [a-zA-Z-]*\.*[0-9]* for channel ''*");
+call mtr.add_suppression("It is not possible to change the type of the relay log repository because there are workers repositories with possible");
 
 --let $save_rli_repo_type=`SELECT @@GLOBAL.relay_log_info_repository`
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_writeset_add_unique_key.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_writeset_add_unique_key.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_writeset_add_unique_key.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_writeset_add_unique_key.test	2021-09-28 11:46:34.000000000 +0000
@@ -34,7 +34,8 @@
 --let $option_operator = >
 --let $option_value = 2
 --source include/only_with_option.inc
-
+--let $skip_configuration_privilege_checks_user= 'skip'
+--let $rpl_privilege_checks_user_grant_all= 1
 --echo #
 --echo # 1. Create source-replica topology.
 --source include/master-slave.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_zombie_dump_threads.test mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_zombie_dump_threads.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl/t/rpl_zombie_dump_threads.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl/t/rpl_zombie_dump_threads.test	2021-09-28 11:46:34.000000000 +0000
@@ -35,7 +35,7 @@
 #         protocol).
 --source include/rpl_connection_slave.inc
 SET @save_debug = @@GLOBAL.debug;
-SET GLOBAL debug="d,fake_5_5_version_replica";
+SET GLOBAL debug="+d,fake_5_5_version_replica";
 
 # Step-2) Start IO thread on Slave which will start a dump thread on Master.
 --source include/start_slave_io.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_async_conn_failover_checks.result mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_async_conn_failover_checks.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_async_conn_failover_checks.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_async_conn_failover_checks.result	2021-09-28 11:46:34.000000000 +0000
@@ -12,10 +12,10 @@
 #
 # 2. Verify disabling AUTO_POSITION while enabling Asynchronous
 #    Replication Connection Failover results in
-#    ER_DISABLE_AUTO_POSITION_REQUIRES_ASYNC_RECONNECT_OFF error.
+#    ER_RPL_ASYNC_RECONNECT_AUTO_POSITION_OFF
 #
 CHANGE REPLICATION SOURCE TO SOURCE_AUTO_POSITION=0, SOURCE_CONNECTION_AUTO_FAILOVER=1;
-ERROR HY000: CHANGE MASTER TO MASTER_AUTO_POSITION = 0 cannot be executed because Asynchronous Replication Connection Failover is enabled i.e. CHANGE MASTER TO SOURCE_CONNECTION_AUTO_FAILOVER = 1.
+ERROR HY000: Failed to enable Asynchronous Replication Connection Failover feature. The CHANGE MASTER TO SOURCE_CONNECTION_AUTO_FAILOVER = 1 can only be set when MASTER_AUTO_POSITION option of CHANGE MASTER TO is enabled.
 #
 # 3. Verify Asynchronous Replication Connection Failover is disabled and
 #    Auto_position is enabled.
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_async_conn_failover_reset_udf.result mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_async_conn_failover_reset_udf.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_async_conn_failover_reset_udf.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_async_conn_failover_reset_udf.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,75 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+
+############################################################
+# 1. Create a replication channel ch1 to replicate from
+#    server2 to server1.
+[connection slave]
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_PORT=SERVER_1_PORT, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1, SOURCE_CONNECTION_AUTO_FAILOVER=1 FOR CHANNEL 'ch1';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+include/start_slave.inc [FOR CHANNEL 'ch1']
+
+############################################################
+# 2. Try to reset asynchronous reconnection configuration with
+#    invalid parameters.
+#    It will not be allowed.
+SELECT asynchronous_connection_failover_reset(1);
+ERROR HY000: Can't initialize function 'asynchronous_connection_failover_reset'; Wrong arguments: The function takes no arguments.
+SELECT asynchronous_connection_failover_reset("");
+ERROR HY000: Can't initialize function 'asynchronous_connection_failover_reset'; Wrong arguments: The function takes no arguments.
+
+############################################################
+# 3. Try to reset asynchronous reconnection configuration while
+#    channels are running.
+#    It will not be allowed.
+SELECT asynchronous_connection_failover_reset();
+ERROR HY000: Can't initialize function 'asynchronous_connection_failover_reset'; Can't execute the given operation while Replication channels configured with SOURCE_CONNECTION_AUTO_FAILOVER are running.
+include/stop_slave_sql.inc [FOR CHANNEL 'ch1']
+include/assert.inc [Verify replica_monitor thread is running]
+SELECT asynchronous_connection_failover_reset();
+ERROR HY000: Can't initialize function 'asynchronous_connection_failover_reset'; Can't execute the given operation while Replication channels configured with SOURCE_CONNECTION_AUTO_FAILOVER are running.
+
+############################################################
+# 4. Reset asynchronous reconnection configuration while
+#    channels are stopped.
+#    It will be allowed.
+include/stop_slave_io.inc [FOR CHANNEL 'ch1']
+include/assert.inc [Verify replica_monitor thread is not running]
+SELECT asynchronous_connection_failover_reset();
+asynchronous_connection_failover_reset()
+The UDF asynchronous_connection_failover_reset() executed successfully.
+SELECT asynchronous_connection_failover_add_source('ch1', '127.0.0.1', 3100);
+asynchronous_connection_failover_add_source('ch1', '127.0.0.1', 3100)
+The UDF asynchronous_connection_failover_add_source() executed successfully.
+include/assert.inc ['There is one row in performance_schema.replication_asynchronous_connection_failover']
+SELECT asynchronous_connection_failover_reset();
+asynchronous_connection_failover_reset()
+The UDF asynchronous_connection_failover_reset() executed successfully.
+include/assert.inc ['There are 0 rows in performance_schema.replication_asynchronous_connection_failover']
+
+############################################################
+# 5. Reset asynchronous reconnection configuration while
+#    channels are stopped for managed source.
+#    It will be allowed.
+SELECT asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', "UUID_VAL", '127.0.0.1', 3100, '', 80, 60);
+asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', "UUID_VAL", '127.0.0.1', 3100, '', 80, 60)
+The UDF asynchronous_connection_failover_add_managed() executed successfully.
+include/assert.inc ['There is one row in performance_schema.replication_asynchronous_connection_failover_managed']
+include/assert.inc ['There is one row in performance_schema.replication_asynchronous_connection_failover']
+SELECT asynchronous_connection_failover_reset();
+asynchronous_connection_failover_reset()
+The UDF asynchronous_connection_failover_reset() executed successfully.
+include/assert.inc ['There are 0 rows in performance_schema.replication_asynchronous_connection_failover_managed']
+include/assert.inc ['There are 0 rows in performance_schema.replication_asynchronous_connection_failover']
+
+############################################################
+# 6. Clean up.
+include/rpl_reset_slave.inc
+include/rpl_end.inc
+Warnings:
+Note	3084	Replication thread(s) for channel '' are already stopped.
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_async_conn_failover_restart.result mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_async_conn_failover_restart.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_async_conn_failover_restart.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_async_conn_failover_restart.result	2021-09-28 11:46:34.000000000 +0000
@@ -26,8 +26,7 @@
 #    count and retry time to 2 and verify its enabled in
 #    performance_schema.replication_connection_configuration.
 #
-SET @debug_saved= @@GLOBAL.DEBUG;
-SET GLOBAL debug = '+d,async_conn_failover_disable_weight_check';
+# Adding debug point 'async_conn_failover_disable_weight_check' to @@GLOBAL.debug
 include/stop_slave.inc
 CHANGE REPLICATION SOURCE TO SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=2, SOURCE_CONNECTION_AUTO_FAILOVER=1;
 include/start_slave.inc
@@ -47,7 +46,7 @@
 #    Reconnect to server 2 and start replica on it.
 #
 include/rpl_start_server.inc [server_number=2]
-SET GLOBAL debug = '+d,async_conn_failover_crash';
+# Adding debug point 'async_conn_failover_crash' to @@GLOBAL.debug
 include/rpl_stop_server.inc [server_number=1]
 include/rpl_reconnect.inc
 include/start_slave.inc
@@ -61,7 +60,6 @@
 # 7. Clean up
 #
 [connection server_2]
-SET @@GLOBAL.DEBUG= @debug_saved;
 include/stop_slave.inc
 include/rpl_reset_slave.inc
 SELECT asynchronous_connection_failover_delete_source('', '127.0.0.1', SERVER_MYPORT_3, '');;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_async_conn_failover_udf_check.result mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_async_conn_failover_udf_check.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_async_conn_failover_udf_check.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_async_conn_failover_udf_check.result	2021-09-28 11:46:34.000000000 +0000
@@ -140,6 +140,8 @@
 ERROR 42000: Access denied; you need (at least one of) the SUPER or REPLICATION_SLAVE_ADMIN privilege(s) for this operation
 SELECT * FROM mysql.replication_asynchronous_connection_failover;
 ERROR 42000: SELECT command denied to user 'async_user'@'localhost' for table 'replication_asynchronous_connection_failover'
+SELECT asynchronous_connection_failover_reset();
+ERROR 42000: Access denied; you need (at least one of) the SUPER or REPLICATION_SLAVE_ADMIN privilege(s) for this operation
 #
 # 15. Verify user with REPLICATION_SLAVE_ADMIN privilege can execute
 #     asynchronous_connection_failover_add_source and
@@ -154,6 +156,9 @@
 SELECT asynchronous_connection_failover_delete_source('', '127.0.0.1', 3100);
 asynchronous_connection_failover_delete_source('', '127.0.0.1', 3100)
 The UDF asynchronous_connection_failover_delete_source() executed successfully.
+SELECT asynchronous_connection_failover_reset();
+asynchronous_connection_failover_reset()
+The UDF asynchronous_connection_failover_reset() executed successfully.
 [connection master]
 DROP USER 'async_user';
 include/assert.inc ['There are 0 rows in performance_schema.replication_asynchronous_connection_failover']
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_change_rep_source_to_gtid_only_syntax_pfs.result mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_change_rep_source_to_gtid_only_syntax_pfs.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_change_rep_source_to_gtid_only_syntax_pfs.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_change_rep_source_to_gtid_only_syntax_pfs.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,124 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+[connection slave]
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT=0, SOURCE_AUTO_POSITION=0, GTID_ONLY=0;
+#
+# 1. Validate no other value except 1 or O are accept for GTID_ONLY
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 2;
+ERROR 42000: You have an error in your CHANGE REPLICATION SOURCE syntax; GTID_ONLY only accepts values 0 or 1 near '2' at line 1
+CHANGE REPLICATION SOURCE TO GTID_ONLY = '1';
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''1'' at line 1
+CHANGE REPLICATION SOURCE TO GTID_ONLY = ON;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ON' at line 1
+include/assert.inc ['GTID_ONLY is disabled']
+#
+# 2. Validate that enabling GTID_ONLY requires
+#      REQUIRE_ROW_FORMAT and SOURCE_AUTO_POSITION
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 1, REQUIRE_ROW_FORMAT=1;
+ERROR HY000: GTID_ONLY cannot be enabled for replication channel ''. You need GTID_MODE = ON, SOURCE_AUTO_POSITION = 1 and REQUIRE_ROW_FORMAT = 1.
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 1, SOURCE_AUTO_POSITION=1;
+ERROR HY000: GTID_ONLY cannot be enabled for replication channel ''. You need GTID_MODE = ON, SOURCE_AUTO_POSITION = 1 and REQUIRE_ROW_FORMAT = 1.
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 1, SOURCE_AUTO_POSITION=1;
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 1;
+include/assert.inc ['GTID_ONLY is enabled']
+#
+# 3. Validate if GTID_ONLY =1 you cant disable
+#      REQUIRE_ROW_FORMAT and SOURCE_AUTO_POSITION
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 0;
+ERROR HY000: REQUIRE_ROW_FORMAT cannot be disabled for replication channel '' when GTID_ONLY=1.
+include/assert.inc ['REQUIRE_ROW_FORMAT is enabled']
+CHANGE REPLICATION SOURCE TO SOURCE_AUTO_POSITION = 0;
+ERROR HY000: SOURCE_AUTO_POSITION cannot be disabled for replication channel '' when GTID_ONLY=1.
+include/assert.inc ['AUTO_POSITION is enabled']
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT=0, GTID_ONLY=0;
+include/assert.inc ['GTID_ONLY is disabled']
+include/assert.inc ['REQUIRE_ROW_FORMAT is disabled']
+#
+# 4. Validate if GTID_MODE != ON you can't enable GTID_ONLY
+#    Validate GTID_MODE cant be changed if GTID_ONLY = 1
+SET @@GLOBAL.GTID_MODE= ON_PERMISSIVE;
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 1, SOURCE_AUTO_POSITION=1;
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 1;
+ERROR HY000: GTID_ONLY cannot be enabled for replication channel ''. You need GTID_MODE = ON, SOURCE_AUTO_POSITION = 1 and REQUIRE_ROW_FORMAT = 1.
+include/assert.inc ['GTID_ONLY is disabled']
+SET @@GLOBAL.GTID_MODE= ON;
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 1;
+include/assert.inc ['GTID_ONLY is enabled']
+SET @@GLOBAL.GTID_MODE= ON_PERMISSIVE;
+ERROR HY000: SET @@GLOBAL.GTID_MODE = ON_PERMISSIVE is not allowed because replication channel '' is configured with GTID_ONLY = 1. Execute CHANGE REPLICATION SOURCE TO GTID_ONLY = 0 FOR CHANNEL '' before you set @@GLOBAL.GTID_MODE = 'ON_PERMISSIVE'.
+#
+# 5. Replication threads must be stopped to change GTID_ONLY
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 0;
+START REPLICA IO_THREAD;
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 1;
+ERROR HY000: This operation cannot be performed with running replication threads; run STOP SLAVE FOR CHANNEL '' first
+include/assert.inc ['GTID_ONLY is disabled']
+STOP REPLICA;
+START REPLICA SQL_THREAD;
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 1;
+ERROR HY000: This operation cannot be performed with running replication threads; run STOP SLAVE FOR CHANNEL '' first
+include/assert.inc ['GTID_ONLY is disabled']
+STOP REPLICA;
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 1;
+#
+# 6. When positions are valid, disabling GTID_ONLY does not requires SOURCE_LOG_FILE/POS
+CHANGE REPLICATION SOURCE TO SOURCE_AUTO_POSITION=0, GTID_ONLY=0;
+include/assert.inc ['GTID_ONLY is disabled']
+#
+# 7. When positions are invalid disabling SOURCE_AUTO_POSITION (with or without disabling GITD_ONLY) requires SOURCE_LOG_FILE/POS
+#    A warning is logged and given to the client when GITD_ONLY is disabled leaving SOURCE_AUTO_POSITION enabled
+CHANGE REPLICATION SOURCE TO GTID_ONLY=1, SOURCE_AUTO_POSITION=1;
+include/rpl_restart_server.inc [server_number=2 parameters: --skip_slave_start]
+CHANGE REPLICATION SOURCE TO GTID_ONLY=0, SOURCE_AUTO_POSITION=0;
+ERROR HY000: When disabling GTID_ONLY and SOURCE_AUTO_POSITION FOR CHANNEL '' you must provide SOURCE_LOG_FILE and SOURCE_LOG_POS as source positions are invalid.
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 0;
+Warnings:
+Warning	4072	The replication positions relative to the source may be out-of-date on channel '', due to the use of GTID_ONLY=1. The out-of-date positions can still be used in some cases so, in order to update them, we suggest that you start the replication to receive and apply at least one transaction, which will set the positions to valid values.
+include/assert_grep.inc [A warning is logged as some invalid positions were persisted]
+CHANGE REPLICATION SOURCE TO SOURCE_AUTO_POSITION=0;
+ERROR HY000: When disabling SOURCE_AUTO_POSITION FOR CHANNEL '' you must provide SOURCE_LOG_FILE and SOURCE_LOG_POS as source positions are invalid.
+CHANGE REPLICATION SOURCE TO SOURCE_AUTO_POSITION=0, SOURCE_LOG_FILE="", SOURCE_LOG_POS=4;;
+include/assert.inc [The source log file name is valid]
+CHANGE REPLICATION SOURCE TO SOURCE_AUTO_POSITION=1;
+CHANGE REPLICATION SOURCE TO SOURCE_AUTO_POSITION=0;
+#
+# 8. When disabling GTID ONLY with the usage of relay log position a warning is logged
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 1, SOURCE_AUTO_POSITION=1;
+include/rpl_restart_server.inc [server_number=2 parameters: --skip_slave_start]
+CHANGE REPLICATION SOURCE TO GTID_ONLY=0, SOURCE_AUTO_POSITION=0, SOURCE_LOG_FILE="", SOURCE_LOG_POS=4,RELAY_LOG_FILE='slave-relay-bin.000001', RELAY_LOG_POS=4;
+Warnings:
+Warning	4072	The replication positions relative to the source may be out-of-date on channel '', due to the use of GTID_ONLY=1. The out-of-date positions can still be used in some cases so, in order to update them, we suggest that you start the replication to receive and apply at least one transaction, which will set the positions to valid values.
+include/assert_grep.inc [A warning is logged as some invalid positions were persisted]
+#
+# 9. The RESET REPLICA command does not affect the option
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 1, SOURCE_AUTO_POSITION=1;
+RESET REPLICA;
+include/assert.inc ['GTID_ONLY is enabled']
+#
+# 10. The RESET REPLICA ALL command does affect the option
+RESET REPLICA ALL;
+include/assert.inc ['GTID_ONLY is disabled']
+#
+# 11. After a restart that disables the GTID mode, the channel cannot be started
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_PORT=SOURCE_PORT, SOURCE_USER='root', REQUIRE_ROW_FORMAT = 1, SOURCE_AUTO_POSITION=1, GTID_ONLY = 1;
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+include/rpl_restart_server.inc [server_number=2 parameters: --gtid-mode=on_permissive]
+include/assert_grep.inc [Replication channel '' could not be started as GTID_MODE was not ON.]
+include/check_slave_param.inc [Slave_IO_Running FOR CHANNEL '']
+START SLAVE;
+ERROR HY000: Replication cannot start for channel '' with GTID_ONLY = 1 as this server uses @@GLOBAL.GTID_MODE <> ON.
+#
+# 12 Cleanup
+SET @@GLOBAL.GTID_MODE = ON;
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 0, REQUIRE_ROW_FORMAT = 0;
+Warnings:
+Warning	4072	The replication positions relative to the source may be out-of-date on channel '', due to the use of GTID_ONLY=1. The out-of-date positions can still be used in some cases so, in order to update them, we suggest that you start the replication to receive and apply at least one transaction, which will set the positions to valid values.
+include/start_slave.inc [FOR CHANNEL '']
+call mtr.add_suppression("Replication channel '' is configured with GTID_ONLY=1, which is invalid when GTID_MODE <> ON. *");
+call mtr.add_suppression("The replication positions relative to the source may be out-of-date on channel '', due to the use of GTID_ONLY=1.*");
+include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_gitd_only_mta_configuration_check.result mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_gitd_only_mta_configuration_check.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_gitd_only_mta_configuration_check.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_gitd_only_mta_configuration_check.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,45 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+
+############################################################
+# 1. Configure the channel with GTID_ONLY = 1
+#    Add some data to populate repository tables
+[connection slave]
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 1, GTID_ONLY = 1;
+include/start_slave.inc
+[connection master]
+CREATE TABLE t1 (a INT PRIMARY KEY);
+INSERT INTO t1 VALUES(1);
+include/sync_slave_sql_with_master.inc
+
+############################################################
+# 2. Restart the replica.
+#    Check there is no worker info as it was purged after start
+include/rpl_restart_server.inc [server_number=2 parameters: --skip_replica_start=1]
+include/assert.inc [No info exists in the repository table]
+
+############################################################
+# 3. Set the number of applier workers to 0
+#    Check the channel still has one worker.
+SET @@GLOBAL.replica_parallel_workers = 0;
+include/start_slave.inc
+include/assert.inc [There is one worker runnning with id 1]
+
+############################################################
+# 4. Disable GTID_ONLY
+#    Check the channel has no workers.
+include/stop_slave.inc
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 0;
+include/start_slave.inc
+include/assert.inc [There is no worker with an ID]
+
+############################################################
+# 5. Cleanup
+[connection master]
+DROP TABLE t1;
+include/sync_slave_sql_with_master.inc
+SET @@GLOBAL.replica_parallel_workers = NUMBER_OF_WORKERS;
+include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_group_replication_channel_defaults_on_creation.result mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_group_replication_channel_defaults_on_creation.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_group_replication_channel_defaults_on_creation.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_group_replication_channel_defaults_on_creation.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,66 @@
+#
+# 1. Create a user so we can set a privileged user to create GR channels
+CREATE USER 'u1'@'localhost';
+#
+# 2. Create a group replication applier channel
+#    Verify SOURCE_AUTO_POSITION, REQUIRE_ROW_FORMAT and GTID_ONLY are enabled
+CHANGE REPLICATION SOURCE TO PRIVILEGE_CHECKS_USER = 'u1'@'localhost' FOR CHANNEL "group_replication_applier";
+include/assert.inc [Auto_position is set to 1 for GR applier channel]
+include/assert.inc [Require_row_format is set to 1 for GR applier channel]
+include/assert.inc [Gtid_only is set to 1 for GR applier channel]
+#
+# 3. For the group replication applier channel
+#    Verify SOURCE_AUTO_POSITION, REQUIRE_ROW_FORMAT and GTID_ONLY can't be modified
+CHANGE REPLICATION SOURCE TO SOURCE_AUTO_POSITION = 0 FOR CHANNEL "group_replication_applier";
+ERROR HY000: CHANGE MASTER with the given parameters cannot be performed on channel 'group_replication_applier'.
+CHANGE REPLICATION SOURCE TO SOURCE_AUTO_POSITION = 1 FOR CHANNEL "group_replication_applier";
+ERROR HY000: CHANGE MASTER with the given parameters cannot be performed on channel 'group_replication_applier'.
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 0 FOR CHANNEL "group_replication_applier";
+ERROR HY000: CHANGE MASTER with the given parameters cannot be performed on channel 'group_replication_applier'.
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 1 FOR CHANNEL "group_replication_applier";
+ERROR HY000: CHANGE MASTER with the given parameters cannot be performed on channel 'group_replication_applier'.
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 0 FOR CHANNEL "group_replication_applier";
+ERROR HY000: CHANGE MASTER with the given parameters cannot be performed on channel 'group_replication_applier'.
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 1 FOR CHANNEL "group_replication_applier";
+ERROR HY000: CHANGE MASTER with the given parameters cannot be performed on channel 'group_replication_applier'.
+include/assert.inc [Auto_position is set to 1 for GR applier channel]
+include/assert.inc [Require_row_format is set to 1 for GR applier channel]
+include/assert.inc [Gtid_only is set to 1 for GR applier channel]
+#
+# 4. Create a group replication recovery channel
+#    Verify SOURCE_AUTO_POSITION, REQUIRE_ROW_FORMAT and GTID_ONLY are enabled
+CHANGE REPLICATION SOURCE TO PRIVILEGE_CHECKS_USER = 'u1'@'localhost' FOR CHANNEL "group_replication_recovery";
+include/assert.inc [Auto_position is set to 1 for GR recovery channel]
+include/assert.inc [Require_row_format is set to 1 for GR recovery channel]
+include/assert.inc [Gtid_only is set to 1 for GR recovery channel]
+#
+# 5. For the group replication recovery channel
+#    Verify SOURCE_AUTO_POSITION, REQUIRE_ROW_FORMAT and GTID_ONLY can't be modified
+CHANGE REPLICATION SOURCE TO SOURCE_AUTO_POSITION = 0 FOR CHANNEL "group_replication_recovery";
+ERROR HY000: CHANGE MASTER with the given parameters cannot be performed on channel 'group_replication_recovery'.
+CHANGE REPLICATION SOURCE TO SOURCE_AUTO_POSITION = 1 FOR CHANNEL "group_replication_recovery";
+ERROR HY000: CHANGE MASTER with the given parameters cannot be performed on channel 'group_replication_recovery'.
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 0 FOR CHANNEL "group_replication_recovery";
+ERROR HY000: CHANGE MASTER with the given parameters cannot be performed on channel 'group_replication_recovery'.
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 1 FOR CHANNEL "group_replication_recovery";
+ERROR HY000: CHANGE MASTER with the given parameters cannot be performed on channel 'group_replication_recovery'.
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 0 FOR CHANNEL "group_replication_recovery";
+ERROR HY000: CHANGE MASTER with the given parameters cannot be performed on channel 'group_replication_recovery'.
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 1 FOR CHANNEL "group_replication_recovery";
+ERROR HY000: CHANGE MASTER with the given parameters cannot be performed on channel 'group_replication_recovery'.
+include/assert.inc [Auto_position is set to 1 for GR recovery channel]
+include/assert.inc [Require_row_format is set to 1 for GR recovery channel]
+include/assert.inc [Gtid_only is set to 1 for GR recovery channel]
+#
+# 6. Delete the channels
+#    Verify they cannot be created when GTID_MODE != ON
+RESET REPLICA ALL;
+SET GLOBAL GTID_MODE = ON_PERMISSIVE;
+CHANGE REPLICATION SOURCE TO PRIVILEGE_CHECKS_USER = 'u1'@'localhost' FOR CHANNEL "group_replication_applier";
+ERROR HY000: When configuring a group replication channel you must do it when GTID_MODE = ON.
+CHANGE REPLICATION SOURCE TO PRIVILEGE_CHECKS_USER = 'u1'@'localhost' FOR CHANNEL "group_replication_recovery";
+ERROR HY000: When configuring a group replication channel you must do it when GTID_MODE = ON.
+#
+# 7. Cleanup
+SET GLOBAL GTID_MODE = ON;
+DROP USER 'u1'@'localhost';
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_gtid_create_select.result mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_gtid_create_select.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_gtid_create_select.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_gtid_create_select.result	2021-09-28 11:46:34.000000000 +0000
@@ -33,7 +33,6 @@
 # Wait for server to stop
 # Restart the server.
 include/rpl_start_server.inc [server_number=2]
-SET global DEBUG='-d, crash_on_transactional_ddl_insert';
 include/assert.inc [Make sure there is only table 't0' in schema 'test'.]
 # Reset the master log position back to event that starts
 # CREATE TABLE ... SELECT and start the slave, without causing crash.
@@ -49,4 +48,19 @@
 # Cleanup
 [connection master]
 DROP TABLE t0,t1;
+include/sync_slave_sql_with_master.inc
+#
+# R3 Verify that executing CREATE TABLE ... SELECT with sql mode set
+#    to ANSI gets replicated to slave. This test is added for Bug#33064062.
+#
+[connection master]
+SET @orig_sql_mode_session= @@SESSION.sql_mode;
+SET SESSION sql_mode='ANSI';
+CREATE TABLE t1 AS SELECT 1;
+include/sync_slave_sql_with_master.inc
+include/diff_tables.inc [master:t1, slave:t1]
+[connection master]
+SET SESSION sql_mode= @orig_sql_mode_session;
+DROP TABLE t1;
+include/sync_slave_sql_with_master.inc
 include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_gtid_delete_memory_table_after_start_server.result mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_gtid_delete_memory_table_after_start_server.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_gtid_delete_memory_table_after_start_server.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_gtid_delete_memory_table_after_start_server.result	1970-01-01 00:00:00.000000000 +0000
@@ -1,129 +0,0 @@
-include/master-slave.inc
-Warnings:
-Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
-[connection master]
-CALL mtr.add_suppression("Found 1 prepared XA transactions");
-CALL mtr.add_suppression("Statement is unsafe because it is being used inside a XA transaction");
-CALL mtr.add_suppression("Statement accesses nontransactional table as well as transactional or temporary table");
-CREATE DATABASE db1;
-CREATE DATABASE db2;
-CREATE TABLE t1(c1 INT);
-CREATE TABLE t2(c1 INT);
-CREATE TABLE mem_t1(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-CREATE TABLE mem_t2(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-CREATE TABLE db1.mem_t1(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-CREATE TABLE db1.mem_t2(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-CREATE TABLE db2.mem_t1(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-CREATE TABLE db2.mem_t2(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-CREATE TABLE db2.mem_t3(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-CREATE TABLE db2.mem_t4(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-CREATE TABLE db2.mem_t5(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-CREATE TRIGGER tr1 AFTER INSERT ON t2 FOR EACH ROW
-BEGIN
-INSERT INTO t1 SELECT * FROM db2.mem_t3;
-END |
-INSERT INTO mem_t1 VALUES(1),(2),(3);
-INSERT INTO mem_t2 VALUES(1),(2),(3);
-INSERT INTO db1.mem_t1 VALUES(1),(2),(3);
-INSERT INTO db1.mem_t2 VALUES(1),(2),(3);
-INSERT INTO db2.mem_t1 VALUES(1),(2),(3);
-INSERT INTO db2.mem_t2 VALUES(1),(2),(3);
-INSERT INTO db2.mem_t3 VALUES(1),(2),(3);
-INSERT INTO db2.mem_t4 VALUES(1),(2),(3);
-INSERT INTO db2.mem_t5 VALUES(1),(2),(3);
-include/sync_slave_sql_with_master.inc
-include/stop_slave_io.inc
-[connection master]
-XA START 'xa1';
-INSERT INTO t1 VALUES(1);
-XA END 'xa1';
-XA PREPARE 'xa1';
-include/save_master_pos.inc
-include/rpl_restart_server.inc [server_number=1]
-[connection slave]
-include/start_slave_io.inc
-include/sync_slave_sql.inc
-#
-# Test case 1: verify XA COMMIT can be binlogged correctly.
-#
-[connection master]
-include/gtid_step_reset.inc
-include/save_binlog_position.inc
-include/gtid_step_assert.inc [count=3, only_count=0]
-include/assert_binlog_events.inc [Gtid # Query/.*BEGIN # Query/.*DELETE.* # Query/.*COMMIT # Gtid # Query/.*BEGIN # Query/.*DELETE.* # Query/.*COMMIT]
-include/sync_slave_sql_with_master.inc
-include/rpl_diff.inc
-#
-# Test case 2: verify COM_FIELD_LIST can binlog DELETE FROM mem_xx
-#              correctly
-#
-[connection master]
-include/gtid_step_reset.inc
-include/gtid_step_assert.inc [count=2, only_count=0]
-include/sync_slave_sql_with_master.inc
-SELECT * FROM mem_t1;
-c1
-SELECT * FROM mem_t2;
-c1
-#
-# Test case 3: verify DELETE FROM mem_xx can be binlogged correctly
-#              in CREATE TABLE ... LIKE
-[connection master]
-include/gtid_step_reset.inc
-include/save_binlog_position.inc
-CREATE TABLE t3 LIKE db2.mem_t1;
-include/gtid_step_assert.inc [count=2, only_count=0]
-include/assert_binlog_events.inc [Gtid # Query/.*BEGIN # Query/.*DELETE.* # Query/.*COMMIT]
-include/sync_slave_sql_with_master.inc
-SELECT * FROM db2.mem_t1;
-c1
-#
-# Test case 4: verify DELETE FROM mem_xx can be binlogged correctly
-#              in DML
-[connection master]
-include/gtid_step_reset.inc
-include/save_binlog_position.inc
-INSERT INTO t3 SELECT * FROM db2.mem_t2 UNION SELECT 10;
-include/gtid_step_assert.inc [count=2, only_count=0]
-include/assert_binlog_events.inc [Gtid # Query/.*BEGIN # Query/.*DELETE.* # Query/.*COMMIT]
-include/sync_slave_sql_with_master.inc
-SELECT * FROM db2.mem_t2;
-c1
-#
-# Test case 5: verify DELETE FROM mem_xx can be binlogged correctly
-#              in a trigger
-[connection master]
-include/gtid_step_reset.inc
-include/save_binlog_position.inc
-INSERT INTO t2 VALUES(11);
-include/gtid_step_assert.inc [count=2, only_count=0]
-include/assert_binlog_events.inc [Gtid # Query/.*BEGIN # Query/.*DELETE.* # Query/.*COMMIT]
-include/sync_slave_sql_with_master.inc
-SELECT * FROM db2.mem_t3;
-c1
-#
-# Test case 6: Verify DELETE FROM mem_xx can be binlog correctly
-#              when ALTER the memory table.
-[connection master]
-include/gtid_step_reset.inc
-include/save_binlog_position.inc
-ALTER TABLE db2.mem_t4 ADD COLUMN c2 INT;
-include/gtid_step_assert.inc [count=2, only_count=0]
-include/assert_binlog_events.inc [Gtid # Query/.*BEGIN # Query/.*DELETE.* # Query/.*COMMIT]
-include/sync_slave_sql_with_master.inc
-SELECT * FROM db2.mem_t4;
-c1	c2
-#
-# Test case 7: Verify DELETE FROM mem_xx can be binlog correctly
-#              when DROP the memory table.
-[connection master]
-include/gtid_step_reset.inc
-DROP TABLE db2.mem_t5;
-include/gtid_step_assert.inc [count=1, only_count=0]
-include/sync_slave_sql_with_master.inc
-[connection master]
-DROP TABLE t1, t2, t3, mem_t1, mem_t2;
-DROP DATABASE db1;
-DROP DATABASE db2;
-include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_gtid_only_no_applier_repo_persistency.result mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_gtid_only_no_applier_repo_persistency.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_gtid_only_no_applier_repo_persistency.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_gtid_only_no_applier_repo_persistency.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,110 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+#
+# 1. Create a table on the source and replicate it.
+#    Check the repo shows the same value as SHOW REPLICA STATUS
+[connection slave]
+SET @@GLOBAL.replica_checkpoint_period= 1;
+[connection master]
+CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY);
+INSERT INTO t1 VALUES (1);
+include/sync_slave_sql_with_master.inc
+include/assert.inc [The repository has the lastest position]
+include/assert.inc [The file name for the repository and the show replica status match]
+#
+# 2. Stop replication and make the channel use GTID_ONLY=1
+#    Start replication and add some values to the table.
+#    Check the repo shows the old values in relation to SHOW REPLICA STATUS
+include/stop_slave.inc
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 1, REQUIRE_ROW_FORMAT=1;
+include/start_slave.inc
+[connection master]
+INSERT INTO t1 VALUES (2);
+include/sync_slave_sql_with_master.inc
+include/assert.inc [The repository position is not the one shown on show replica status]
+include/assert.inc [The repository pos value is still the same]
+include/assert.inc [The repository name value is still the same]
+#
+# 3. Stop replication
+#    Check the repo still shows the old values in relation to SHOW REPLICA STATUS
+include/stop_slave.inc
+include/assert.inc [The repository position is not the one shown on show replica status]
+include/assert.inc [The repository pos value is still the same]
+include/assert.inc [The repository name value is still the same]
+#
+# 4. Start replication again
+#    Check the repo still shows the old values in relation to SHOW REPLICA STATUS
+include/start_slave.inc
+[connection master]
+INSERT INTO t1 VALUES (3);
+include/sync_slave_sql_with_master.inc
+include/assert.inc [The repository position is not the one shown on show replica status]
+include/assert.inc [The repository file name is not the one shown on show replica status]
+include/assert.inc [The repository pos value is still the same]
+include/assert.inc [The repository name value is still the same]
+#
+# 5. Kill the SQL thread
+#    Check the repo still shows the old values in relation to SHOW REPLICA STATUS
+include/wait_for_slave_sql_error.inc [errno=1756]
+include/assert.inc [The repository position is not the one shown on show replica status]
+include/assert.inc [The repository file name is not the one shown on show replica status]
+include/assert.inc [The repository pos value is still the same]
+include/assert.inc [The repository name value is still the same]
+#
+# 6. Change a replication connection setting with CHANGE REPLICATION SOURCE
+#    Check the repo now has the same value in relation to SHOW REPLICA STATUS
+include/stop_slave.inc
+CHANGE REPLICATION SOURCE TO SOURCE_CONNECT_RETRY = 10000;
+include/assert.inc [The repository has the lastest position]
+include/assert.inc [The file name for the repository and the show replica status match]
+#
+# 7.  Restart the replica server
+#    Check the repo still shows the old values
+include/start_slave.inc
+[connection master]
+INSERT INTO t1 VALUES (4);
+include/sync_slave_sql_with_master.inc
+include/assert.inc [The repository position is not the one shown on show replica status]
+include/rpl_restart_server.inc [server_number=2 parameters: --skip_replica_start=FALSE]
+include/assert.inc [The repository pos value is still the same]
+#
+# 8. Add some values and check the repo is again stale
+#    Execute a RESET REPLICA command
+#    Check the repo persisted the reset position
+[connection master]
+INSERT INTO t1 VALUES (5);
+include/sync_slave_sql_with_master.inc
+include/assert.inc [The repository position is not the one shown on show replica status]
+include/stop_slave.inc
+RESET REPLICA;
+SELECT Relay_log_pos FROM mysql.slave_relay_log_info;;
+Relay_log_pos	NULL
+0
+
+include/assert.inc [The position was reset as shown on show replica status]
+include/assert.inc [The repository reset the position]
+#
+# 9. Check RESET REPLICA ALL removes all the information
+include/start_slave.inc
+[connection master]
+INSERT INTO t1 VALUES (6);
+include/sync_slave_sql_with_master.inc
+include/assert.inc [The repository position was persisted when the channel was initialized after the reset]
+include/stop_slave.inc
+RESET REPLICA ALL;
+include/assert.inc [The repository info was deleted]
+#
+# 10. Cleanup
+SET @@GLOBAL.replica_checkpoint_period=CHECKPOINT_PERIOD;;
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_PORT=MASTER_PORT, SOURCE_USER='root';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+include/start_slave.inc
+call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
+[connection master]
+DROP TABLE t1;
+include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_gtid_only_no_connection_repo_persistency.result mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_gtid_only_no_connection_repo_persistency.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_gtid_only_no_connection_repo_persistency.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_gtid_only_no_connection_repo_persistency.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,107 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+#
+# 1. Create a table on the source and replicate it.
+#    Set the value of sync_source_info to 1 so the repo is always synced
+#    Check the repo shows the same value as SHOW REPLICA STATUS
+[connection slave]
+SET @@GLOBAL.sync_source_info=1;
+[connection master]
+CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY);
+INSERT INTO t1 VALUES (1);
+include/sync_slave_sql_with_master.inc
+include/assert.inc [The file position for the repository and the show replica status match]
+include/assert.inc [The file name for the repository and the show replica status match]
+#
+# 2. Stop replication and make the channel use GTID_ONLY=1
+#    Start replication and add some values to the table.
+#    Check the repo shows the old values in relation to SHOW REPLICA STATUS
+include/stop_slave.inc
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 1, REQUIRE_ROW_FORMAT=1;
+include/start_slave.inc
+[connection master]
+INSERT INTO t1 VALUES (2);
+include/sync_slave_sql_with_master.inc
+include/assert.inc [The repository position is not the one shown on show replica status]
+include/assert.inc [The repository pos value is still the same]
+include/assert.inc [The repository name value is still the same]
+#
+# 3. Stop replication
+#    Check the repo still shows the old values in relation to SHOW REPLICA STATUS
+include/stop_slave.inc
+include/assert.inc [The repository position is not the one shown on show replica status]
+include/assert.inc [The repository pos value is still the same]
+include/assert.inc [The repository name value is still the same]
+#
+# 4. Start replication again
+#    Check the repo still shows the old values in relation to SHOW REPLICA STATUS
+include/start_slave.inc
+[connection master]
+FLUSH LOGS;
+INSERT INTO t1 VALUES (3);
+include/sync_slave_sql_with_master.inc
+include/assert.inc [The repository position is not the one shown on show replica status]
+include/assert.inc [The repository file name is not the one shown on show replica status]
+include/assert.inc [The repository pos value is still the same]
+include/assert.inc [The repository name value is still the same]
+#
+# 5. Kill the IO thread
+#    Check the repo still shows the old values in relation to SHOW REPLICA STATUS
+include/wait_for_slave_io_to_stop.inc
+include/assert.inc [The repository position is not the one shown on show replica status]
+include/assert.inc [The repository file name is not the one shown on show replica status]
+include/assert.inc [The repository pos value is still the same]
+include/assert.inc [The repository name value is still the same]
+#
+# 6. Change a replication connection setting with CHANGE REPLICATION SOURCE
+#    Check the repo now has the same value in relation to SHOW REPLICA STATUS
+include/stop_slave.inc
+CHANGE REPLICATION SOURCE TO SOURCE_CONNECT_RETRY = 10000;
+include/assert.inc [The repository now has the lastest position]
+include/assert.inc [The file name for the repository and the show replica status match]
+#
+# 7. Restart the replica server
+#    Check the repo still shows the old values
+include/start_slave.inc
+[connection master]
+INSERT INTO t1 VALUES (4);
+include/sync_slave_sql_with_master.inc
+include/assert.inc [The repository position is not the one shown on show replica status]
+include/rpl_restart_server.inc [server_number=2 parameters: --skip_replica_start=FALSE]
+include/assert.inc [The repository pos value is still the same]
+#
+# 8. Add some values and check the repo is again stale
+#    Execute a RESET REPLICA command
+#    Check the repo persisted the reset position
+[connection master]
+INSERT INTO t1 VALUES (5);
+include/sync_slave_sql_with_master.inc
+include/assert.inc [The repository has not persisted]
+include/stop_slave.inc
+RESET REPLICA;
+include/assert.inc [The repository has the reset position]
+include/assert.inc [The repository has the reset position]
+#
+# 9. Check RESET REPLICA ALL removes all the information
+include/start_slave.inc
+[connection master]
+INSERT INTO t1 VALUES (6);
+include/sync_slave_sql_with_master.inc
+include/assert.inc [The repository still has the reset position]
+include/stop_slave.inc
+RESET REPLICA ALL;
+include/assert.inc [The repository info was deleted]
+#
+# 10. Cleanup
+CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_PORT=MASTER_PORT, SOURCE_USER='root';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+include/start_slave.inc
+SET @@GLOBAL.sync_source_info=SYNC_SOURCE_VAL;
+[connection master]
+DROP TABLE t1;
+include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_gtid_only_relay_log_recovery.result mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_gtid_only_relay_log_recovery.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_gtid_only_relay_log_recovery.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_gtid_only_relay_log_recovery.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,52 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+#
+# 1. Make the channel use GTID_ONLY=1
+#    Create a table on the source and replicate it.
+#    Add some data making the binlog and relay rotate so the info on the repos is stale
+[connection slave]
+include/gtid_utils.inc
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 1, REQUIRE_ROW_FORMAT=1;
+include/start_slave.inc
+[connection master]
+CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY);
+include/sync_slave_sql_with_master.inc
+[connection master]
+INSERT INTO t1 VALUES (3);
+FLUSH LOGS;
+include/sync_slave_sql_with_master.inc
+include/stop_slave.inc
+include/start_slave.inc
+[connection master]
+INSERT INTO t1 VALUES (2);
+FLUSH LOGS;
+include/sync_slave_sql_with_master.inc
+include/stop_slave.inc
+include/start_slave.inc
+[connection master]
+INSERT INTO t1 VALUES (1);
+FLUSH LOGS;
+include/sync_slave_sql_with_master.inc
+include/stop_slave.inc
+include/start_slave.inc
+#
+# 2. Restart the replica with relay log recovery
+#    Check that the replica wont replicate old transactions even if position are outdated
+include/rpl_restart_server.inc [server_number=2 parameters: --skip_replica_start=FALSE --relay_log_recovery=1]
+[connection master]
+INSERT INTO t1 VALUES(4);
+include/sync_slave_sql_with_master.inc
+include/assert.inc [Exactly 1 GTIDs should have been retrieved since last invocation]
+#
+# 3. Cleanup
+include/stop_slave.inc
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 0, REQUIRE_ROW_FORMAT=0;
+include/start_slave.inc
+CALL mtr.add_suppression("Recovery from master pos.* and file");
+include/gtid_utils_end.inc
+[connection master]
+DROP TABLE t1;
+include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_gtid_only_start_replica_after_clone.result mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_gtid_only_start_replica_after_clone.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_gtid_only_start_replica_after_clone.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_gtid_only_start_replica_after_clone.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,68 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+[connection slave]
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 1, REQUIRE_ROW_FORMAT=1;
+include/start_slave.inc
+[connection master]
+#
+# 1. Create connections to server3
+#
+# 2. Create a table for testing
+[connection server_1]
+CREATE TABLE test.t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
+include/sync_slave_sql_with_master.inc
+#
+# 3. Install clone on server 2
+#    Configure server 3 to invoke clone
+[connection server_2]
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+[connection server_3]
+include/spawn_monitoring_process.inc
+INSTALL PLUGIN clone SONAME 'CLONE_PLUGIN';
+SET GLOBAL clone_valid_donor_list = 'localhost:SERVER2_PORT';
+CLONE INSTANCE FROM root@localhost:SERVER2_PORT IDENTIFIED BY '';
+include/rpl_reconnect.inc
+#
+# 4. Execute a transaction on server 1, check 3 received it
+[connection server_1]
+INSERT INTO t1 VALUES (1);
+include/sync_slave_sql_with_master.inc
+[connection server_3]
+include/assert.inc [All info from server 1 is present]
+#
+# 4.1 Check that the replica only retrieves the missing transaction
+USE test;
+include/gtid_utils.inc
+include/assert.inc [Exactly 1 GTIDs should have been retrieved since last invocation]
+include/gtid_utils_end.inc
+#
+# 5. Cleanup
+[connection server_1]
+DROP TABLE test.t1;
+include/rpl_sync.inc
+[connection server_2]
+UNINSTALL PLUGIN clone;
+[connection server_3]
+STOP SLAVE;
+Warnings:
+Warning	1287	'STOP SLAVE' is deprecated and will be removed in a future release. Please use STOP REPLICA instead
+RESET SLAVE ALL;
+Warnings:
+Warning	1287	'RESET SLAVE' is deprecated and will be removed in a future release. Please use RESET REPLICA instead
+UNINSTALL PLUGIN clone;
+include/rpl_clear_priv_checks_user_configuration.inc
+include/clean_monitoring_process.inc
+SET SESSION sql_log_bin=0;
+call mtr.add_suppression("Clone removing all user data for provisioning: Started");
+call mtr.add_suppression("Clone removing all user data for provisioning: Finished");
+call mtr.add_suppression("Recovery from master pos [0-9]+ and file [a-zA-Z-]*\.*[0-9]* for channel ''*");
+call mtr.add_suppression("Relay log information for channel '' was found after a clone operation. Relay log recovery");
+SET SESSION sql_log_bin=1;
+[connection slave]
+include/stop_slave.inc
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 0, REQUIRE_ROW_FORMAT=0;
+include/start_slave.inc
+include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_gtid_replay_relaylog.result mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_gtid_replay_relaylog.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_gtid_replay_relaylog.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_gtid_replay_relaylog.result	2021-09-28 11:46:34.000000000 +0000
@@ -7,7 +7,7 @@
 INSERT INTO t1 VALUES (1);
 include/sync_slave_sql_with_master.inc
 SET @save_debug=@@global.debug;
-SET GLOBAL DEBUG='d,stop_io_after_reading_gtid_log_event';
+SET GLOBAL DEBUG='+d,stop_io_after_reading_gtid_log_event';
 [connection master]
 INSERT INTO t1 VALUES (2);
 [connection slave]
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_gtids_table_disable_log_replica_updates.result mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_gtids_table_disable_log_replica_updates.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_gtids_table_disable_log_replica_updates.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_gtids_table_disable_log_replica_updates.result	2021-09-28 11:46:34.000000000 +0000
@@ -3,7 +3,7 @@
 Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
-SET @@GLOBAL.DEBUG= '+d, dont_compress_gtid_table';
+# Adding debug point 'dont_compress_gtid_table' to @@GLOBAL.debug
 CREATE TABLE IF NOT EXISTS t1 (a INT) ENGINE=InnoDB;
 CREATE TABLE t2 (a INT) ENGINE=MyISAM;
 INSERT INTO t1 VALUES(1);
@@ -128,7 +128,7 @@
 INSERT INTO t1 VALUES (58);;
 INSERT INTO t1 VALUES (59);;
 COMMIT;
-SET GLOBAL DEBUG= @debug_save;
+# Removing debug point 'dont_compress_gtid_table' from @@GLOBAL.debug
 SET GLOBAL MAX_BINLOG_SIZE=@SIZE_DEFAULT;
 SELECT * FROM mysql.gtid_executed where source_uuid="MASTER_UUID";
 source_uuid	interval_start	interval_end
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_gtid_transaction_split_across_relay_logs.result mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_gtid_transaction_split_across_relay_logs.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_gtid_transaction_split_across_relay_logs.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_gtid_transaction_split_across_relay_logs.result	2021-09-28 11:46:34.000000000 +0000
@@ -10,7 +10,7 @@
 INSERT INTO t1 VALUES(repeat('a',8192)), (repeat('b', 8192));
 [connection server_2]
 SET @saved_debug=@@GLOBAL.debug;
-SET GLOBAL debug="d,stop_io_after_reading_write_rows_log_event";
+SET GLOBAL debug="+d,stop_io_after_reading_write_rows_log_event";
 START SLAVE IO_THREAD;
 Warnings:
 Warning	1287	'START SLAVE' is deprecated and will be removed in a future release. Please use START REPLICA instead
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_gtid_truncate_memory_table_after_start_server.result mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_gtid_truncate_memory_table_after_start_server.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_gtid_truncate_memory_table_after_start_server.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_gtid_truncate_memory_table_after_start_server.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,130 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+CALL mtr.add_suppression("Found 1 prepared XA transactions");
+CALL mtr.add_suppression("Statement is unsafe because it is being used inside a XA transaction");
+CALL mtr.add_suppression("Statement accesses nontransactional table as well as transactional or temporary table");
+CREATE DATABASE db1;
+CREATE DATABASE db2;
+CREATE TABLE t1(c1 INT);
+CREATE TABLE t2(c1 INT);
+CREATE TABLE mem_t1(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+CREATE TABLE mem_t2(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+CREATE TABLE db1.mem_t1(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+CREATE TABLE db1.mem_t2(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+CREATE TABLE db2.mem_t1(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+CREATE TABLE db2.mem_t2(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+CREATE TABLE db2.mem_t3(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+CREATE TABLE db2.mem_t4(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+CREATE TABLE db2.mem_t5(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+CREATE TRIGGER tr1 AFTER INSERT ON t2 FOR EACH ROW
+BEGIN
+INSERT INTO t1 SELECT * FROM db2.mem_t3;
+END |
+INSERT INTO mem_t1 VALUES(1),(2),(3);
+INSERT INTO mem_t2 VALUES(1),(2),(3);
+INSERT INTO db1.mem_t1 VALUES(1),(2),(3);
+INSERT INTO db1.mem_t2 VALUES(1),(2),(3);
+INSERT INTO db2.mem_t1 VALUES(1),(2),(3);
+INSERT INTO db2.mem_t2 VALUES(1),(2),(3);
+INSERT INTO db2.mem_t3 VALUES(1),(2),(3);
+INSERT INTO db2.mem_t4 VALUES(1),(2),(3);
+INSERT INTO db2.mem_t5 VALUES(1),(2),(3);
+include/sync_slave_sql_with_master.inc
+include/stop_slave_io.inc
+[connection master]
+XA START 'xa1';
+INSERT INTO t1 VALUES(1);
+XA END 'xa1';
+XA PREPARE 'xa1';
+include/save_master_pos.inc
+include/rpl_restart_server.inc [server_number=1]
+[connection slave]
+include/start_slave_io.inc
+include/sync_slave_sql.inc
+#
+# Test case 1: verify XA COMMIT can be binlogged correctly.
+#
+[connection master]
+include/gtid_step_reset.inc
+include/save_binlog_position.inc
+include/gtid_step_assert.inc [count=3, only_count=0]
+include/assert_binlog_events.inc [#Gtid # !Q(TRUNCATE.*) #Gtid # !Q(TRUNCATE.*)]
+include/sync_slave_sql_with_master.inc
+include/rpl_diff.inc
+#
+# Test case 2: verify COM_FIELD_LIST can binlog TRUNCATE TABLE mem_xx
+#              correctly
+#
+[connection master]
+include/gtid_step_reset.inc
+include/gtid_step_assert.inc [count=2, only_count=0]
+include/sync_slave_sql_with_master.inc
+SELECT * FROM mem_t1;
+c1
+SELECT * FROM mem_t2;
+c1
+#
+# Test case 3: verify TRUNCATE TABLE mem_xx can be binlogged correctly
+#              in CREATE TABLE ... LIKE
+[connection master]
+include/gtid_step_reset.inc
+include/save_binlog_position.inc
+CREATE TABLE t3 LIKE db2.mem_t1;
+include/gtid_step_assert.inc [count=2, only_count=0]
+include/assert_binlog_events.inc [#Gtid # !Q(TRUNCATE.*) #Gtid # !Q(CREATE.*)]
+include/sync_slave_sql_with_master.inc
+SELECT * FROM db2.mem_t1;
+c1
+#
+# Test case 4: verify TRUNCATE TABLE mem_xx can be binlogged correctly
+#              in DML
+[connection master]
+include/gtid_step_reset.inc
+include/save_binlog_position.inc
+INSERT INTO t3 SELECT * FROM db2.mem_t2 UNION SELECT 10;
+include/gtid_step_assert.inc [count=2, only_count=0]
+include/assert_binlog_events.inc [#Gtid # !Q(TRUNCATE.*) #Gtid # !Begin # !Insert # !Commit]
+include/save_binlog_position.inc
+include/sync_slave_sql_with_master.inc
+SELECT * FROM db2.mem_t2;
+c1
+#
+# Test case 5: verify TRUNCATE TABLE mem_xx can be binlogged correctly
+#              in a trigger
+[connection master]
+include/gtid_step_reset.inc
+include/save_binlog_position.inc
+INSERT INTO t2 VALUES(11);
+include/gtid_step_assert.inc [count=2, only_count=0]
+include/assert_binlog_events.inc [#Gtid # !Q(TRUNCATE.*) #Gtid # !Begin]
+include/sync_slave_sql_with_master.inc
+SELECT * FROM db2.mem_t3;
+c1
+#
+# Test case 6: Verify TRUNCATE TABLE mem_xx can be binlog correctly
+#              when ALTER the memory table.
+[connection master]
+include/gtid_step_reset.inc
+include/save_binlog_position.inc
+ALTER TABLE db2.mem_t4 ADD COLUMN c2 INT;
+include/gtid_step_assert.inc [count=2, only_count=0]
+include/assert_binlog_events.inc [#Gtid # !Q(TRUNCATE.*) #Gtid # !Q(ALTER.*)]
+include/sync_slave_sql_with_master.inc
+SELECT * FROM db2.mem_t4;
+c1	c2
+#
+# Test case 7: Verify TRUNCATE TABLE mem_xx can be binlog correctly
+#              when DROP the memory table.
+[connection master]
+include/gtid_step_reset.inc
+DROP TABLE db2.mem_t5;
+include/gtid_step_assert.inc [count=1, only_count=0]
+include/sync_slave_sql_with_master.inc
+[connection master]
+DROP TABLE t1, t2, t3, mem_t1, mem_t2;
+DROP DATABASE db1;
+DROP DATABASE db2;
+include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_invalid_position_with_gtid_only.result mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_invalid_position_with_gtid_only.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_invalid_position_with_gtid_only.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_invalid_position_with_gtid_only.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,56 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+#
+# 1. Setup:
+#     Start the replica channel with GTID_ONLY=1
+#     Add some data in the source and replicate it
+#     Restart the replica but don't start replication
+[connection slave]
+SET @@GLOBAL.replica_checkpoint_period= 1;
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 1, GTID_ONLY = 1;
+include/start_slave.inc
+include/assert.inc ['GTID_ONLY is enabled']
+[connection master]
+CREATE TABLE t(s INT);
+INSERT INTO t VALUES(1);
+include/sync_slave_sql_with_master.inc
+include/rpl_restart_server.inc [server_number=2 parameters: --skip_slave_start]
+#
+# 2 Assert all invalid positions in SHOW REPLICA STATUS are shown as such
+include/assert.inc [The source log file name is invalid]
+include/assert.inc [The source log file position is 0]
+include/assert.inc [The source log file name in the applier is invalid]
+include/assert.inc [The source log file position in the applier is 0]
+#
+# 3 Start the replica IO thread.
+#   Check receiver positions are now valid
+include/start_slave_io.inc
+include/assert.inc [The source log file name is back to the previous value]
+include/assert.inc [The source log file is back to the previous position]
+#
+# 4 Start the replica SQL thread and replicate a transaction
+#   Check applier positions in relation to the source are now valid
+SET @@GLOBAL.replica_checkpoint_period= 1;
+include/start_slave_sql.inc
+[connection master]
+INSERT INTO t VALUES(2);
+include/sync_slave_sql_with_master.inc
+[connection master]
+[connection slave]
+include/assert.inc [The source log file name for the applier is the one used on the source]
+include/assert.inc [The source log file position in the applier is last applied on the source]
+#
+# 5 Check the starting SQL thread message reports invalid positions
+include/assert_grep.inc [The SQL thread start will report the information in relation to the source as invalid]
+#
+# 6 Cleanup
+SET @@GLOBAL.replica_checkpoint_period= REPLICA_CHECKPOINT_PERIOD;
+include/stop_slave.inc
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 0, GTID_ONLY = 0;
+include/start_slave.inc
+[connection master]
+DROP TABLE t;
+include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_log_info_repository_persistence_gtid_only.result mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_log_info_repository_persistence_gtid_only.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_log_info_repository_persistence_gtid_only.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_log_info_repository_persistence_gtid_only.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,88 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+
+# 0.Create a test auxiliary include file to avoid step repetition.
+
+[connection slave]
+include/rpl_restart_server.inc [server_number=2 parameters: --master-info-repository=FILE]
+
+# 1.1. Check that by default GTID_ONLY is 0
+#      Check the performance_schema table and file repository are correct
+include/assert.inc [GTID_ONLY for default channel "" in performance_schema.replication_connection_configuration is 0]
+CREATE TABLE master_info_file_content (line_content TEXT);
+LOAD DATA INFILE 'REPO_FILENAME' INTO TABLE master_info_file_content;
+include/assert.inc [The table should have 33 lines]
+include/assert.inc [In the file the field is set to 0]
+DROP TABLE master_info_file_content;
+
+# 1.2. Set GTID_ONLY to 1
+#      Check the performance_schema table and file repository are correct
+include/stop_slave.inc
+Warnings:
+Note	3084	Replication thread(s) for channel '' are already stopped.
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 1, SOURCE_AUTO_POSITION = 1, GTID_ONLY = 1;
+include/assert.inc [GTID_ONLY for default channel "" in performance_schema.replication_connection_configuration is 1]
+CREATE TABLE master_info_file_content (line_content TEXT);
+LOAD DATA INFILE 'REPO_FILENAME' INTO TABLE master_info_file_content;
+include/assert.inc [The table should have 33 lines]
+include/assert.inc [In the file the field is set to 1]
+DROP TABLE master_info_file_content;
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 1, SOURCE_AUTO_POSITION = 1, GTID_ONLY = 0;
+
+# 2.1 Upgrade the server while using File repositories
+#     Start the server using a file repository that has no GTID_ONLY
+#     The starting value should be 0 in the file / table
+include/rpl_stop_server.inc [server_number=2]
+include/rpl_start_server.inc [server_number=2 parameters: --skip_slave_start --master-info-repository=FILE]
+include/assert.inc [GTID_ONLY for default channel "" in performance_schema.replication_connection_configuration is 0]
+CREATE TABLE master_info_file_content (line_content TEXT);
+LOAD DATA INFILE 'REPO_FILENAME' INTO TABLE master_info_file_content;
+include/assert.inc [The table should have 33 lines]
+include/assert.inc [In the file the field is set to 0]
+DROP TABLE master_info_file_content;
+
+# 3.1 Upgrade the server to Table repositories from File repositories
+#     Start the server using a file repository that has no GTID_ONLY
+ALTER TABLE mysql.slave_master_info DROP COLUMN Gtid_only;
+UPDATE mysql.slave_master_info SET Number_of_lines = 32;
+include/rpl_stop_server.inc [server_number=2]
+include/rpl_start_server.inc [server_number=2 parameters: --skip_slave_start --master-info-repository=TABLE --upgrade=FORCE]
+include/assert.inc ['GTID_ONLY is disabled']
+
+# 3.2 Check the table definiton is the same as when the server was bootstraped
+#
+include/assert.inc [The table definition should be equal on install and upgrades]
+
+# 4.1 Upgrade the server while using Table repositories
+#     Have 2 channels:
+#       1. The default channel
+#       2. A group_replication channel (group_replication_recovery)
+#     GTID_ONLY is set to 0 for the default channel, 1 for the group replication one
+CHANGE REPLICATION SOURCE TO SOURCE_USER="root" FOR CHANNEL "group_replication_recovery";
+CHANGE REPLICATION SOURCE TO SOURCE_HOST="localhost", SOURCE_PORT=12, PRIVILEGE_CHECKS_USER = 'root'@'localhost' FOR CHANNEL "";
+ALTER TABLE mysql.slave_master_info DROP COLUMN Gtid_only;
+UPDATE mysql.slave_master_info SET Number_of_lines = 32;
+include/rpl_restart_server.inc [server_number=2 parameters: --skip_slave_start --master-info-repository=TABLE --upgrade=FORCE]
+include/assert.inc ['GTID_ONLY is enabled for group replication']
+include/assert.inc ['GTID_ONLY is disabled for the default channel']
+RESET REPLICA ALL FOR CHANNEL "group_replication_recovery";
+
+# 5.1 Upgrade the server to File repositories from Table repositories
+#     Start the server using a file repository that has no GTID_ONLY
+ALTER TABLE mysql.slave_master_info DROP COLUMN Gtid_only;
+UPDATE mysql.slave_master_info SET Number_of_lines = 32;
+include/rpl_restart_server.inc [server_number=2 parameters: --skip_slave_start --master-info-repository=FILE --upgrade=FORCE]
+include/assert.inc [GTID_ONLY for default channel "" in performance_schema.replication_connection_configuration is 0]
+CREATE TABLE master_info_file_content (line_content TEXT);
+LOAD DATA INFILE 'REPO_FILENAME' INTO TABLE master_info_file_content;
+include/assert.inc [The table should have 33 lines]
+include/assert.inc [In the file the field is set to 0]
+DROP TABLE master_info_file_content;
+
+# Cleanup
+include/rpl_end.inc
+Warnings:
+Note	3084	Replication thread(s) for channel '' are already stopped.
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_master_errors.result mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_master_errors.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_master_errors.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_master_errors.result	2021-09-28 11:46:34.000000000 +0000
@@ -15,12 +15,13 @@
 #
 # Error: master doesn't set server_id
 #
-SET GLOBAL debug= 'd,simulate_no_server_id';
+# Adding debug point 'simulate_no_server_id' to @@GLOBAL.debug
 #
 # Error: Error while sending faked rotate event
 #
-SET GLOBAL debug= 'd,simulate_send_error';
-SET GLOBAL debug= '';
+# Adding debug point 'simulate_send_error' to @@GLOBAL.debug
+# Removing debug point 'simulate_no_server_id' from @@GLOBAL.debug
+# Removing debug point 'simulate_send_error' from @@GLOBAL.debug
 #
 # Error: Fail to open binlog file
 #
@@ -39,13 +40,13 @@
 #
 [connection slave]
 include/stop_slave.inc
-SET GLOBAL debug= 'd,request_source_log_pos_3';
+# Adding debug point 'request_source_log_pos_3' to @@GLOBAL.debug
 START SLAVE IO_THREAD;
 Warnings:
 Warning	1287	'START SLAVE' is deprecated and will be removed in a future release. Please use START REPLICA instead
 call mtr.add_suppression(".* Got fatal error 1236 from master when reading data from binary log");
 include/wait_for_slave_io_error.inc [errno=13114]
-SET GLOBAL debug= '$slave_debug';
+# Removing debug point 'request_source_log_pos_3' from @@GLOBAL.debug
 #
 # Error: Binary log is not open on master
 #
@@ -61,13 +62,14 @@
 [connection master]
 RESET MASTER;
 CREATE TABLE t1(c1 INT);
-SET GLOBAL debug= 'd,simulate_kill_dump';
+# Adding debug point 'simulate_kill_dump' to @@GLOBAL.debug
 #
 # Error: Fail to send heartbeat with an net error
 #
 INSERT INTO t1 VALUES(1);
-SET GLOBAL debug= 'd,simulate_flush_error';
-SET GLOBAL debug= '';
+# Adding debug point 'simulate_flush_error' to @@GLOBAL.debug
+# Removing debug point 'simulate_kill_dump' from @@GLOBAL.debug
+# Removing debug point 'simulate_flush_error' from @@GLOBAL.debug
 DROP TABLE t1;
 [connection slave]
 RESET MASTER;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_mts_until.result mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_mts_until.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_mts_until.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_mts_until.result	2021-09-28 11:46:34.000000000 +0000
@@ -14,12 +14,14 @@
 include/stop_slave_sql.inc
 SET @saved_replica_parallel_type = @@GLOBAL.replica_parallel_type;
 SET @saved_replica_parallel_workers = @@GLOBAL.replica_parallel_workers;
+SET @saved_replica_preserve_commit_order = @@GLOBAL.replica_preserve_commit_order;
 SET @saved_innodb_lock_wait_timeout = @@GLOBAL.innodb_lock_wait_timeout;
 SET @saved_relay_log_purge = @@GLOBAL.relay_log_purge;
 SET GLOBAL innodb_lock_wait_timeout = 1000;
 SET GLOBAL relay_log_purge = FALSE;
 SET GLOBAL replica_parallel_type = "LOGICAL_CLOCK";
 SET GLOBAL replica_parallel_workers = 4;
+SET GLOBAL replica_preserve_commit_order=0;
 [connection slave]
 include/stop_slave_sql.inc
 Warnings:
@@ -321,6 +323,7 @@
 include/stop_slave_sql.inc
 SET GLOBAL replica_parallel_type = @saved_replica_parallel_type;
 SET GLOBAL replica_parallel_workers = @saved_replica_parallel_workers;
+SET GLOBAL replica_preserve_commit_order= @saved_replica_preserve_commit_order;
 SET GLOBAL innodb_lock_wait_timeout = @saved_innodb_lock_wait_timeout;
 SET GLOBAL relay_log_purge = @saved_relay_log_purge;
 include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_mts_xa_retry.result mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_mts_xa_retry.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_mts_xa_retry.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_mts_xa_retry.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,6 +11,7 @@
 SET @@global.innodb_lock_wait_timeout= 5;
 SET @@global.binlog_transaction_compression = ON;
 SET @@global.replica_parallel_workers = 4;
+SET @@global.replica_preserve_commit_order = OFF;
 include/start_slave_sql.inc
 include/stop_slave_sql.inc
 SET @@global.replica_parallel_workers = 8;
@@ -195,6 +196,7 @@
 SET @@global.binlog_transaction_compression = SAVED;
 SET @@global.replica_parallel_workers = SAVED;
 SET @@global.replica_parallel_type = 'SAVED';
+SET @@global.replica_preserve_commit_order = SAVED;
 include/start_slave.inc
 [connection master]
 SET @@session.binlog_transaction_compression = SAVED;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_partial_transaction_timestamps.result mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_partial_transaction_timestamps.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_partial_transaction_timestamps.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_partial_transaction_timestamps.result	2021-09-28 11:46:34.000000000 +0000
@@ -6,7 +6,7 @@
 [connection slave]
 include/start_slave_io.inc
 SET @save_debug=@@global.debug;
-SET GLOBAL DEBUG= "d,stop_io_after_reading_write_rows_log_event";
+SET GLOBAL DEBUG= "+d,stop_io_after_reading_write_rows_log_event";
 [connection master]
 CREATE TABLE t1 (c1 INT) ENGINE=InnoDB;
 BEGIN;
@@ -16,7 +16,6 @@
 include/wait_for_slave_io_to_stop.inc
 # Kill and restart
 include/rpl_reconnect.inc
-SET GLOBAL DEBUG= @save_debug;
 include/start_slave.inc
 [connection master]
 include/sync_slave_io_with_master.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_ps_worker_start_slave.result mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_ps_worker_start_slave.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_ps_worker_start_slave.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_ps_worker_start_slave.result	2021-09-28 11:46:34.000000000 +0000
@@ -6,6 +6,7 @@
 [connection slave]
 call mtr.add_suppression(".*worker thread retried transaction 5 time.*");
 call mtr.add_suppression(".*The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state.*");
+SET @saved_replica_parallel_workers= @@GLOBAL.replica_parallel_workers;
 SET @saved_innodb_lock_wait_timeout = @@GLOBAL.innodb_lock_wait_timeout;
 SET @saved_replica_transaction_retries = @@GLOBAL.replica_transaction_retries;
 SET GLOBAL replica_transaction_retries = 5;
@@ -47,7 +48,7 @@
 DROP TABLE t1;
 include/sync_slave_sql_with_master.inc
 include/stop_slave.inc
-SET GLOBAL replica_parallel_workers = 0;
+SET GLOBAL replica_parallel_workers = @saved_replica_parallel_workers;
 include/start_slave.inc
 SET GLOBAL innodb_lock_wait_timeout = @saved_innodb_lock_wait_timeout;
 SET GLOBAL replica_transaction_retries = @saved_replica_transaction_retries;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_replica_invalid_time_zone.result mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_replica_invalid_time_zone.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_replica_invalid_time_zone.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_replica_invalid_time_zone.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,50 @@
+#
+# 1. Create source-replica topology
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+#
+# 2. Configure source with time_zone value to 'UTC'
+SET @save.time_zone= @@time_zone;
+SET time_zone='UTC';
+#
+# 3. Configure replica without time_zone table
+[connection slave]
+RENAME TABLE mysql.time_zone TO mysql.time_zone_bkup;
+[connection master]
+#
+# 4. Execute a transaction which doesn't use time_zone
+CREATE DATABASE IF NOT EXISTS db1;
+#
+# 5. Execute a transaction which does use time_zone
+CREATE USER u1 IDENTIFIED BY 'Root@123';
+#
+# 6. Start replica
+[connection slave]
+call mtr.add_suppression("Slave SQL for channel '': ... The slave coordinator and worker threads are stopped.*");
+call mtr.add_suppression("Slave SQL for channel '':.*failed executing transaction.*");
+call mtr.add_suppression("Slave SQL for channel '': Error 'Table 'mysql.time_zone' doesn't exist' on query.*");
+call mtr.add_suppression("Slave: Unknown or incorrect time zone: 'UTC'.*");
+include/start_slave_io.inc
+include/wait_for_slave_io_to_start.inc
+START REPLICA SQL_THREAD;
+#
+# 7. Verify that replica sql thread failed with error
+include/wait_for_slave_sql_error.inc [errno=1146]
+#
+# 8. Cleanup
+include/stop_slave_io.inc
+RESET REPLICA ALL;
+CHANGE REPLICATION SOURCE TO SOURCE_USER= 'root', SOURCE_HOST= "127.0.0.1", SOURCE_PORT= MASTER_MYPORT;;
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+RENAME TABLE mysql.time_zone_bkup TO mysql.time_zone;
+include/start_slave.inc
+[connection master]
+DROP USER u1;
+DROP DATABASE db1;
+set time_zone= @save.time_zone;
+include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_repo_conversion_with_invalid_positions.result mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_repo_conversion_with_invalid_positions.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_repo_conversion_with_invalid_positions.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_repo_conversion_with_invalid_positions.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,87 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+#
+# 1. Setup:
+#     Configure the replica channel with GTID_ONLY=1
+#     Restart the replica so it uses FILE repositories
+[connection slave]
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 1, GTID_ONLY = 1;
+include/rpl_restart_server.inc [server_number=2 parameters: --relay_log_info_repository=FILE --master_info_repository=FILE --skip_slave_start=0]
+SET @@GLOBAL.replica_checkpoint_period= 1;
+#
+# 2. Add some data to the source
+#    Logs are flushed to cause rotations in the replica making the applier repository point to a deleted file
+#    Collect the info about the binlog file and position at the end
+[connection master]
+CREATE TABLE t1(c1 INTEGER) ENGINE= Innodb;
+INSERT INTO t1 VALUES(1);
+FLUSH LOGS;
+INSERT INTO t1 VALUES(2);
+FLUSH LOGS;
+INSERT INTO t1 VALUES(3);
+FLUSH LOGS;
+include/sync_slave_sql_with_master.inc
+#
+# 3. Change the relay_log_info_repository type
+#    Check the lasted information is set in the new repository
+include/stop_slave.inc
+SET @@global.relay_log_info_repository="TABLE";
+Warnings:
+Warning	1287	'@@relay_log_info_repository' is deprecated and will be removed in a future release.
+include/assert.inc [The source log file name is up to date in the applier repo]
+include/assert.inc [The source log position is up to date in the applier repo]
+include/assert.inc [The source log file name is up to date in the applier repo]
+#
+# 4. Change the master_info_repository type
+#    Check the lasted information is set in the new repository
+SET @@global.master_info_repository="TABLE";
+Warnings:
+Warning	1287	'@@master_info_repository' is deprecated and will be removed in a future release.
+include/assert.inc [The source log file name is up to date in the connection repo]
+include/assert.inc [The source log position is up to date in the connection repo]
+#
+# 5. Start the replica, check that replication is working
+[connection slave]
+include/start_slave.inc
+[connection master]
+INSERT INTO t1 VALUES(4);
+include/sync_slave_sql_with_master.inc
+#
+# 6. Restart the replica again so it uses FILE repositories.
+#    Check that position related info is marked as invalid
+include/rpl_restart_server.inc [server_number=2 parameters: --relay_log_info_repository=FILE --master_info_repository=FILE --skip_slave_start=1]
+include/assert.inc [The source log file name is invalid]
+include/assert.inc [The source log file position is 0]
+include/assert.inc [The source log file name in the applier is invalid]
+include/assert.inc [The source log file position in the applier is 0]
+#
+# 7. Convert the repositories
+#    Check that position related info is still marked as invalid
+SET @@global.relay_log_info_repository="TABLE";
+Warnings:
+Warning	1287	'@@relay_log_info_repository' is deprecated and will be removed in a future release.
+SET @@global.master_info_repository="TABLE";
+Warnings:
+Warning	1287	'@@master_info_repository' is deprecated and will be removed in a future release.
+include/assert.inc [The source log file name is invalid]
+include/assert.inc [The source log file position is 0]
+include/assert.inc [The source log file name in the applier is invalid]
+include/assert.inc [The source log file position in the applier is 0]
+#
+# 8. Start the replica, check that replication is working
+include/start_slave.inc
+[connection master]
+INSERT INTO t1 VALUES(5);
+include/sync_slave_sql_with_master.inc
+#
+# 9. Cleanup
+include/stop_slave.inc
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 0, GTID_ONLY = 0;
+SET @@GLOBAL.replica_checkpoint_period= REPLICA_CHECKPOINT_PERIOD;
+include/start_slave.inc
+[connection master]
+DROP TABLE t1;
+include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_rotate_gtid.result mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_rotate_gtid.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_rotate_gtid.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_rotate_gtid.result	2021-09-28 11:46:34.000000000 +0000
@@ -9,7 +9,7 @@
 CHANGE REPLICATION SOURCE TO SOURCE_AUTO_POSITION=0;
 include/start_slave_io.inc
 SET @save_debug=@@global.debug;
-SET GLOBAL DEBUG='d,stop_io_after_reading_gtid_log_event';
+SET GLOBAL DEBUG='+d,stop_io_after_reading_gtid_log_event';
 # Create a transaction on the master
 # that will have it's GTID and other events in separated relay log files
 [connection master]
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_simulate_create_chunk_failure.result mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_simulate_create_chunk_failure.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_simulate_create_chunk_failure.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_simulate_create_chunk_failure.result	2021-09-28 11:46:34.000000000 +0000
@@ -5,8 +5,7 @@
 [connection master]
 [connection slave]
 call mtr.add_suppression("You need to use --log-bin to make --binlog-format work");
-SET @debug_save= @@GLOBAL.DEBUG;
-SET @@GLOBAL.DEBUG= '+d,rpl_gtid_update_on_commit_simulate_out_of_memory';
+# Adding debug point 'rpl_gtid_update_on_commit_simulate_out_of_memory' to @@GLOBAL.debug
 [connection master]
 #
 # Commit a transaction on master
@@ -24,7 +23,6 @@
 # added into @@GLOBAL.GTID_EXECUTED and 'gtid_executed'
 # table after slave server restarts.
 #
-SET @@GLOBAL.DEBUG= @debug_save;
 SELECT * FROM mysql.gtid_executed;
 source_uuid	interval_start	interval_end
 MASTER_UUID	1	1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_source_pos_wait_with_gtid_only.result mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_source_pos_wait_with_gtid_only.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_source_pos_wait_with_gtid_only.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_source_pos_wait_with_gtid_only.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,61 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+#
+# 1. Setup:
+#     Start the replica channel with GTID_ONLY=1
+#     Add some info in the source and replicate it
+#     Record the source positions to wait later on
+[connection slave]
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 1, GTID_ONLY = 1;
+[connection master]
+CREATE TABLE t(s INT);
+INSERT INTO t VALUES(1);
+INSERT INTO t VALUES(2);
+#
+# 2. Start replication
+#    Check SOURCE_POS_WAIT does not time out when giving it a valid positioning info
+[connection slave]
+include/start_slave.inc
+[connection master]
+include/sync_slave_sql_with_master.inc
+include/assert.inc [The function did not time out]
+#
+# 3. Restart the server so positions become invalid
+#    Use relay log recovery so the new relay log contains no source info when the applier starts
+include/rpl_restart_server.inc [server_number=2 parameters: --skip_slave_start=1 --relay-log-recovery=1]
+include/start_slave_sql.inc
+include/assert.inc [The source log file name in the applier is invalid]
+include/assert.inc [The source log file position in the applier is 0]
+#
+# 4. Test that the command times out cause positions are invalid
+[connection server_2]
+include/assert.inc [The function timed out]
+#
+# 5. Execute a wait with a large timeout
+#    Turn applier positions valid again
+#    Check the function does not time out when positions become valid
+CREATE TABLE query_result(res INT);
+INSERT INTO query_result SELECT SOURCE_POS_WAIT('LOG_FILE_ON_SOURCE', LOG_POS_ON_SOURCE, 100);;
+[connection slave]
+include/start_slave_io.inc
+[connection master]
+INSERT INTO t VALUES(3);
+[connection server_2]
+include/assert.inc [The function did not time out]
+#
+# 6. SOURCE_POS_WAIT does not timeout when invoked with valid positioning info
+[connection slave]
+include/assert.inc [The function did not time out]
+#
+# 7. Cleanup
+include/stop_slave.inc
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 0, GTID_ONLY = 0;
+include/start_slave.inc
+CALL mtr.add_suppression("Recovery from master pos.* and file");
+DROP TABLE query_result;
+[connection master]
+DROP TABLE t;
+include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_start_replica_until_pos_with_gtid_only.result mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_start_replica_until_pos_with_gtid_only.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_start_replica_until_pos_with_gtid_only.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_start_replica_until_pos_with_gtid_only.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,73 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+#
+# 1. Setup:
+#     Start the replica channel with GTID_ONLY=1
+#     Add some info in the source and replicate it
+#     Record the source positions to wait later on
+[connection slave]
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 1, GTID_ONLY = 1;
+[connection master]
+CREATE TABLE t(s INT);
+INSERT INTO t VALUES(1);
+INSERT INTO t VALUES(2);
+#
+# 2. Start replication
+#    Check START REPLICA UNTIL SOURCE_LOS_POS works as intended
+[connection slave]
+START REPLICA UNTIL SOURCE_LOG_FILE='SOURCE_LOG_FILE', SOURCE_LOG_POS=SOURCE_LOG_POS;
+include/wait_for_slave_sql_to_stop.inc
+include/assert.inc [The table only has 1 line]
+#
+# 3. Add some more data
+#    Retrieve the relay log position for the transaction we want
+#    Check START REPLICA UNTIL RELAY_LOG_POS works as intended
+[connection master]
+INSERT INTO t VALUES(3);
+INSERT INTO t VALUES(4);
+include/sync_slave_io_with_master.inc
+SET @@GLOBAL.local_infile= true;
+START REPLICA SQL_THREAD UNTIL RELAY_LOG_FILE='RELAY_LOG_FILE', RELAY_LOG_POS=RELAY_LOG_POS;
+include/wait_for_slave_sql_to_stop.inc
+include/assert.inc [The table only has 3 lines]
+#
+# 4. Restart the server so positions become invalid
+#    Add some more data on the source and record the positions
+#    Check START REPLICA UNTIL SOURCE_LOS_POS works as intended
+include/rpl_restart_server.inc [server_number=2 parameters: --skip_slave_start=1]
+include/assert.inc [The source log file name in the applier is invalid]
+[connection master]
+INSERT INTO t VALUES(5);
+INSERT INTO t VALUES(6);
+[connection slave]
+START REPLICA UNTIL SOURCE_LOG_FILE='SOURCE_LOG_FILE', SOURCE_LOG_POS=SOURCE_LOG_POS;
+include/wait_for_slave_sql_to_stop.inc
+include/assert.inc [The table only has 5 lines]
+#
+# 5. Insert data in the source and extract the relay log position
+#    Restart the server so positions become invalid
+#    Check START REPLICA UNTIL RELAY_LOG_POS works as intended
+[connection master]
+INSERT INTO t VALUES(7);
+INSERT INTO t VALUES(8);
+include/sync_slave_io_with_master.inc
+SET @@GLOBAL.local_infile= true;
+include/rpl_restart_server.inc [server_number=2 parameters: --skip_slave_start=1]
+include/assert.inc [The source log file name in the applier is invalid]
+START REPLICA SQL_THREAD UNTIL RELAY_LOG_FILE='RELAY_LOG_FILE', RELAY_LOG_POS=RELAY_LOG_POS;
+include/wait_for_slave_sql_to_stop.inc
+include/assert.inc [The table only has 7 lines]
+#
+# 6. Cleanup
+SET @@GLOBAL.local_infile= REPLICA_LOCAL_INFILE;
+include/stop_slave.inc
+Warnings:
+Note	3084	Replication thread(s) for channel '' are already stopped.
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 0, GTID_ONLY = 0;
+include/start_slave.inc
+[connection master]
+DROP TABLE t;
+include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_stop_on_rotate.result mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_stop_on_rotate.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_stop_on_rotate.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_stop_on_rotate.result	2021-09-28 11:46:34.000000000 +0000
@@ -13,8 +13,9 @@
 ############################################################
 # 2. Add a debug point so the replica stops at the first sent rotate
 #    Stop the replica IO thread so the auto positioning protocol runs
-# Adding debug point 'block_on_master_pos_4_rotate' to @@GLOBAL.debug
 include/stop_slave_io.inc
+# Adding debug point 'block_on_master_pos_4_rotate' to @@GLOBAL.debug
+# Adding debug point 'block_on_thread_stop_after_awake' to @@GLOBAL.debug
 include/start_slave_io.inc
 
 ############################################################
@@ -23,12 +24,15 @@
 SET DEBUG_SYNC= "now WAIT_FOR signal.reach_pos_4_rotate_event";
 STOP REPLICA;
 [connection server_2]
+SET DEBUG_SYNC= "now WAIT_FOR signal.stop_point_after_awake";
 SET DEBUG_SYNC= "now SIGNAL signal.rotate_event_continue";
 [connection slave]
 
 ############################################################
 # 4. Start the replica again and check all is good
 # Removing debug point 'block_on_master_pos_4_rotate' from @@GLOBAL.debug
+# Removing debug point 'block_on_thread_stop_after_awake' from @@GLOBAL.debug
+SET DEBUG_SYNC= "RESET";
 include/start_slave.inc
 [connection master]
 INSERT INTO t1 VALUES(2);
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_sync_relay_log_info.result mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_sync_relay_log_info.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_sync_relay_log_info.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_sync_relay_log_info.result	2021-09-28 11:46:34.000000000 +0000
@@ -5,6 +5,7 @@
 [connection master]
 CALL mtr.add_suppression('Duplicate entry');
 [connection slave]
+CALL mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
 SET @saved_sync_relay_log_info= @@GLOBAL.sync_relay_log_info;
 #
 # sync_relay_log_info= 0, transactional (InnoDB) storage engine
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_xa_prepare.result mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_xa_prepare.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/r/rpl_xa_prepare.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/r/rpl_xa_prepare.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,6 +11,8 @@
 CALL mtr.add_suppression("When @@SESSION.GTID_NEXT is set to a GTID, you must explicitly set it to a different value after a COMMIT or ROLLBACK");
 CALL mtr.add_suppression("Cannot execute the current event group");
 CALL mtr.add_suppression("The slave coordinator and worker threads are stopped");
+CALL mtr.add_suppression("Error writing relay log configuration.*");
+CALL mtr.add_suppression("Error reading relay log event for channel.*");
 include/stop_slave.inc
 [connection master]
 XA START 'trx1';
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_apply_binlog_with_anonymous_gtid_when_gtid_mode_on.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_apply_binlog_with_anonymous_gtid_when_gtid_mode_on.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_apply_binlog_with_anonymous_gtid_when_gtid_mode_on.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_apply_binlog_with_anonymous_gtid_when_gtid_mode_on.test	2021-09-28 11:46:34.000000000 +0000
@@ -18,10 +18,6 @@
 #     and wait for SQL thread error.
 ###############################################################################
 
-# We did not run the test with MTS, since the slave sql error
-# 'ER_CANT_SET_GTID_NEXT_TO_GTID_WHEN_GTID_MODE_IS_OFF' is
-# overwritten by 'ER_MTS_INCONSISTENT_DATA' in MTS.
---source include/not_mts_replica_parallel_workers.inc
 --source include/have_binlog_format_statement.inc
 --source include/master-slave.inc
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_async_conn_failover_checks.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_async_conn_failover_checks.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_async_conn_failover_checks.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_async_conn_failover_checks.test	2021-09-28 11:46:34.000000000 +0000
@@ -31,6 +31,7 @@
 
 --let $use_gtids= 1
 --let $rpl_skip_start_slave= 1
+--source include/not_rpl_gtid_only.inc
 --source include/master-slave.inc
 
 --source include/rpl_connection_slave.inc
@@ -46,13 +47,12 @@
 --echo #
 --echo # 2. Verify disabling AUTO_POSITION while enabling Asynchronous
 --echo #    Replication Connection Failover results in
---echo #    ER_DISABLE_AUTO_POSITION_REQUIRES_ASYNC_RECONNECT_OFF error.
+--echo #    ER_RPL_ASYNC_RECONNECT_AUTO_POSITION_OFF
 --echo #
 
---error ER_DISABLE_AUTO_POSITION_REQUIRES_ASYNC_RECONNECT_OFF
+--error ER_RPL_ASYNC_RECONNECT_AUTO_POSITION_OFF
 CHANGE REPLICATION SOURCE TO SOURCE_AUTO_POSITION=0, SOURCE_CONNECTION_AUTO_FAILOVER=1;
 
-
 --echo #
 --echo # 3. Verify Asynchronous Replication Connection Failover is disabled and
 --echo #    Auto_position is enabled.
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_async_conn_failover_reset_udf.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_async_conn_failover_reset_udf.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_async_conn_failover_reset_udf.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_async_conn_failover_reset_udf.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,145 @@
+###############################################################################
+# Validate several scenarios on the UDF:
+#   asynchronous_connection_failover_reset
+#
+# Test:
+#   0. This test requires two servers
+#   1. Create a replication channel ch1 to replicate from
+#      server2 to server1.
+#   2. Try to reset asynchronous reconnection configuration with
+#      invalid parameters.
+#      It will not be allowed.
+#   3. Try to reset asynchronous reconnection configuration while
+#      channels are running.
+#      It will not be allowed.
+#   4. Reset asynchronous reconnection configuration while
+#      channels are stopped.
+#      It will be allowed.
+#   5. Reset asynchronous reconnection configuration while
+#      channels are stopped for managed source.
+#      It will be allowed.
+#   6. Clean up.
+###############################################################################
+--source include/have_slave_repository_type_table.inc
+--let $rpl_skip_start_slave= 1
+--source include/master-slave.inc
+
+--echo
+--echo ############################################################
+--echo # 1. Create a replication channel ch1 to replicate from
+--echo #    server2 to server1.
+
+--let $rpl_connection_name= slave
+--source include/rpl_connection.inc
+
+--replace_result $SERVER_MYPORT_1 SERVER_1_PORT
+--eval CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_USER='root', SOURCE_AUTO_POSITION=1, SOURCE_PORT=$SERVER_MYPORT_1, SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=1, SOURCE_CONNECTION_AUTO_FAILOVER=1 FOR CHANNEL 'ch1'
+--let $rpl_channel_name='ch1'
+--source include/start_slave.inc
+
+
+
+--echo
+--echo ############################################################
+--echo # 2. Try to reset asynchronous reconnection configuration with
+--echo #    invalid parameters.
+--echo #    It will not be allowed.
+
+--error ER_CANT_INITIALIZE_UDF
+SELECT asynchronous_connection_failover_reset(1);
+
+
+--error ER_CANT_INITIALIZE_UDF
+SELECT asynchronous_connection_failover_reset("");
+
+
+--echo
+--echo ############################################################
+--echo # 3. Try to reset asynchronous reconnection configuration while
+--echo #    channels are running.
+--echo #    It will not be allowed.
+--error ER_CANT_INITIALIZE_UDF
+SELECT asynchronous_connection_failover_reset();
+
+--let $rpl_channel_name='ch1'
+--source include/stop_slave_sql.inc
+
+--let $assert_text= Verify replica_monitor thread is running
+--let $assert_cond= "[select count(*) FROM performance_schema.threads where NAME=\"thread/sql/replica_monitor\"]" = 1;
+--source include/assert.inc
+
+--error ER_CANT_INITIALIZE_UDF
+SELECT asynchronous_connection_failover_reset();
+
+
+--echo
+--echo ############################################################
+--echo # 4. Reset asynchronous reconnection configuration while
+--echo #    channels are stopped.
+--echo #    It will be allowed.
+--let $rpl_channel_name='ch1'
+--source include/stop_slave_io.inc
+
+--let $assert_text= Verify replica_monitor thread is not running
+--let $assert_cond= "[select count(*) FROM performance_schema.threads where NAME=\"thread/sql/replica_monitor\"]" = 0;
+--source include/assert.inc
+
+SELECT asynchronous_connection_failover_reset();
+
+# Add a source.
+SELECT asynchronous_connection_failover_add_source('ch1', '127.0.0.1', 3100);
+
+--let $assert_text= 'There is one row in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 1
+--source include/assert.inc
+
+SELECT asynchronous_connection_failover_reset();
+
+--let $assert_text= 'There are 0 rows in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 0
+--source include/assert.inc
+
+
+--echo
+--echo ############################################################
+--echo # 5. Reset asynchronous reconnection configuration while
+--echo #    channels are stopped for managed source.
+--echo #    It will be allowed.
+# Add a managed source.
+--let $uuid_val= `SELECT UUID()`
+--replace_result $uuid_val UUID_VAL
+--eval SELECT asynchronous_connection_failover_add_managed('ch1', 'GroupReplication', "$uuid_val", '127.0.0.1', 3100, '', 80, 60)
+
+--let $assert_text= 'There is one row in performance_schema.replication_asynchronous_connection_failover_managed'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover_managed, count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'There is one row in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 1
+--source include/assert.inc
+
+
+SELECT asynchronous_connection_failover_reset();
+
+--let $assert_text= 'There are 0 rows in performance_schema.replication_asynchronous_connection_failover_managed'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover_managed, count, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= 'There are 0 rows in performance_schema.replication_asynchronous_connection_failover'
+--let $assert_cond= [SELECT COUNT(*) count FROM performance_schema.replication_asynchronous_connection_failover, count, 1] = 0
+--source include/assert.inc
+
+
+--echo
+--echo ############################################################
+--echo # 6. Clean up.
+--let $rpl_channel_name='ch1'
+--let $rpl_reset_slave_all= 1
+--let $rpl_multi_source= 1
+--source include/rpl_reset_slave.inc
+--let $rpl_channel_name=
+--let $rpl_reset_slave_all=
+--let $rpl_multi_source=
+
+--let $rpl_skip_sync = 1
+--source include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_async_conn_failover_restart.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_async_conn_failover_restart.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_async_conn_failover_restart.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_async_conn_failover_restart.test	2021-09-28 11:46:34.000000000 +0000
@@ -75,8 +75,9 @@
 --echo #    count and retry time to 2 and verify its enabled in
 --echo #    performance_schema.replication_connection_configuration.
 --echo #
-SET @debug_saved= @@GLOBAL.DEBUG;
-SET GLOBAL debug = '+d,async_conn_failover_disable_weight_check';
+
+--let $debug_point= async_conn_failover_disable_weight_check
+--source include/add_debug_point.inc
 
 --source include/stop_slave.inc
 CHANGE REPLICATION SOURCE TO SOURCE_CONNECT_RETRY=1, SOURCE_RETRY_COUNT=2, SOURCE_CONNECTION_AUTO_FAILOVER=1;
@@ -111,7 +112,8 @@
 --let $rpl_server_number= 2
 --source include/rpl_start_server.inc
 
-SET GLOBAL debug = '+d,async_conn_failover_crash';
+--let $debug_point= async_conn_failover_crash
+--source include/add_debug_point.inc
 
 --let $rpl_server_number= 1
 --source include/rpl_stop_server.inc
@@ -149,7 +151,7 @@
 --let $rpl_connection_name= server_2
 --source include/rpl_connection.inc
 
-SET @@GLOBAL.DEBUG= @debug_saved;
+# Server crashed so debug points were cleaned
 
 --source include/stop_slave.inc
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_async_conn_failover_udf_check.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_async_conn_failover_udf_check.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_async_conn_failover_udf_check.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_async_conn_failover_udf_check.test	2021-09-28 11:46:34.000000000 +0000
@@ -311,6 +311,9 @@
 --error ER_TABLEACCESS_DENIED_ERROR
 SELECT * FROM mysql.replication_asynchronous_connection_failover;
 
+--error ER_SPECIFIC_ACCESS_DENIED_ERROR
+SELECT asynchronous_connection_failover_reset();
+
 --disconnect connect_async
 
 
@@ -331,6 +334,8 @@
 
 SELECT asynchronous_connection_failover_delete_source('', '127.0.0.1', 3100);
 
+SELECT asynchronous_connection_failover_reset();
+
 --disconnect connect_async
 
 --source include/rpl_connection_master.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_async_conn_failover_udf_register_error.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_async_conn_failover_udf_register_error.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_async_conn_failover_udf_register_error.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_async_conn_failover_udf_register_error.test	2021-09-28 11:46:34.000000000 +0000
@@ -44,7 +44,7 @@
 --let $assert_only_after = CURRENT_TEST: rpl_gtid.rpl_async_conn_failover_udf_register_error
 --let $assert_text = Server2 receive a message from itself when server1 was OFFLINE.
 --let $assert_select = Could not execute the installation of UDF functions. Check for other errors in the log
---let $assert_count = 4
+--let $assert_count = 5
 --source include/assert_grep.inc
 
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_change_rep_source_to_gtid_only_syntax_pfs.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_change_rep_source_to_gtid_only_syntax_pfs.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_change_rep_source_to_gtid_only_syntax_pfs.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_change_rep_source_to_gtid_only_syntax_pfs.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,306 @@
+# ==== Purpose ====
+#
+# This test validates how setting `GTID_ONLY` option on `CHANGE REPLICATION
+# SOURCE TO ...` is accepted or rejected and how it impacts PFS tables.
+#
+# ==== Requirements ====
+#
+# R1. After `CHANGE REPLICATION SOURCE TO GTID_ONLY=V` with a valid value
+#     column `gtid_only` on `performance_schema.replication_connection_configuration`
+#     should have its value equal to V.
+# R2. `CHANGE REPLICATION SOURCE TO GTID_ONLY=1` requires `GTID_MODE = ON`
+# R3. `CHANGE REPLICATION SOURCE TO GTID_ONLY=1` requires also the options
+#        `REQUIRE_ROW_FORMAT = 1`
+#        `SOURCE_AUTO_POSITION = 1`
+# R4. Replication threads must be stopped to set GTID_ONLY
+# R5  Disabling SOURCE_AUTO_POSITION if positions are invalid requires SOURCE_LOG_FILE/POS
+# R6  RESET SLAVE does not affect the GTID_ONLY
+# R6  RESET SLAVE ALL does affect the GTID_ONLY value
+#
+# ==== Implementation ====
+# 0.  Setup replication but make the channel have REQUIRE_ROW_FORMAT=0, SOURCE_AUTO_POSITION=0
+# 1.  Validate no other value except 1 or O are accept for GTID_ONLY
+# 2.  Validate that enabling GTID_ONLY requires REQUIRE_ROW_FORMAT and SOURCE_AUTO_POSITION
+# 3.  Validate if GTID_ONLY =1 you cant disable REQUIRE_ROW_FORMAT and SOURCE_AUTO_POSITION
+# 4.  Validate if GTID_MODE != ON you can't enable GTID_ONLY
+#     Validate GTID_MODE cant be changed if GTID_ONLY = 1
+# 5.  Replication threads must be stopped to change GTID_ONLY
+# 6.  When positions are valid, disabling GTID_ONLY does not requires SOURCE_LOG_FILE/POS
+# 7.  When positions are invalid disabling SOURCE_AUTO_POSITION (with or without disabling GITD_ONLY)
+#     requires SOURCE_LOG_FILE/POS
+#     A warning is logged and given to the client when GITD_ONLY is disabled
+#     leaving SOURCE_AUTO_POSITION enabled
+# 8.  When disabling GTID ONLY with the usage of relay log position a warning is logged
+# 9.  The RESET REPLICA command does not affect the option
+# 10. The RESET REPLICA ALL command does affect the option
+# 11. After a restart that disables the GTID mode, the channel cannot be started
+# 12. Cleanup
+#
+# ==== References ====
+#
+# WL#7491: GTID-based replication applier recovery and positioning
+#
+
+--source include/have_binlog_format_row.inc
+--let $rpl_skip_start_slave= 1
+--source include/master-slave.inc
+
+--source include/rpl_connection_slave.inc
+
+--let $source_log_file=query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Source_Log_File, 1)
+--let $source_log_pos=query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Read_Source_Log_Pos, 1)
+--let $applier_relaylog_file=query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Relay_Log_File, 1)
+--let $applier_relaylog_pos=query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Relay_Log_Pos, 1)
+
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT=0, SOURCE_AUTO_POSITION=0, GTID_ONLY=0;
+
+--echo #
+--echo # 1. Validate no other value except 1 or O are accept for GTID_ONLY
+
+--error ER_PARSE_ERROR
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 2;
+
+--error ER_PARSE_ERROR
+CHANGE REPLICATION SOURCE TO GTID_ONLY = '1';
+
+--error ER_PARSE_ERROR
+CHANGE REPLICATION SOURCE TO GTID_ONLY = ON;
+
+--let $assert_text= 'GTID_ONLY is disabled'
+--let $assert_cond= [SELECT GTID_ONLY FROM performance_schema.replication_connection_configuration, GTID_ONLY, 1] = 0
+--source include/assert.inc
+
+--echo #
+--echo # 2. Validate that enabling GTID_ONLY requires
+--echo #      REQUIRE_ROW_FORMAT and SOURCE_AUTO_POSITION
+
+--error ER_CHANGE_REPLICATION_SOURCE_NO_OPTIONS_FOR_GTID_ONLY
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 1, REQUIRE_ROW_FORMAT=1;
+
+--error ER_CHANGE_REPLICATION_SOURCE_NO_OPTIONS_FOR_GTID_ONLY
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 1, SOURCE_AUTO_POSITION=1;
+
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 1, SOURCE_AUTO_POSITION=1;
+
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 1;
+
+--let $assert_text= 'GTID_ONLY is enabled'
+--let $assert_cond= [SELECT GTID_ONLY FROM performance_schema.replication_connection_configuration, GTID_ONLY, 1] = 1
+--source include/assert.inc
+
+--echo #
+--echo # 3. Validate if GTID_ONLY =1 you cant disable
+--echo #      REQUIRE_ROW_FORMAT and SOURCE_AUTO_POSITION
+
+--error ER_CHANGE_REP_SOURCE_CANT_DISABLE_REQ_ROW_FORMAT_WITH_GTID_ONLY
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 0;
+
+--let $assert_text= 'REQUIRE_ROW_FORMAT is enabled'
+--let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_applier_configuration WHERE Require_row_format = "YES"] = 1
+--source include/assert.inc
+
+--error ER_CHANGE_REP_SOURCE_CANT_DISABLE_AUTO_POSITION_WITH_GTID_ONLY
+CHANGE REPLICATION SOURCE TO SOURCE_AUTO_POSITION = 0;
+
+--let $assert_text= 'AUTO_POSITION is enabled'
+--let $assert_cond= [SELECT AUTO_POSITION FROM performance_schema.replication_connection_configuration, AUTO_POSITION, 1] = 1
+--source include/assert.inc
+
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT=0, GTID_ONLY=0;
+
+--let $assert_text= 'GTID_ONLY is disabled'
+--let $assert_cond= [SELECT GTID_ONLY FROM performance_schema.replication_connection_configuration, GTID_ONLY, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= 'REQUIRE_ROW_FORMAT is disabled'
+--let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_applier_configuration WHERE Require_row_format = "YES"] = 0
+--source include/assert.inc
+
+--echo #
+--echo # 4. Validate if GTID_MODE != ON you can't enable GTID_ONLY
+--echo #    Validate GTID_MODE cant be changed if GTID_ONLY = 1
+
+
+SET @@GLOBAL.GTID_MODE= ON_PERMISSIVE;
+
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 1, SOURCE_AUTO_POSITION=1;
+
+--error ER_CHANGE_REPLICATION_SOURCE_NO_OPTIONS_FOR_GTID_ONLY
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 1;
+
+--let $assert_text= 'GTID_ONLY is disabled'
+--let $assert_cond= [SELECT GTID_ONLY FROM performance_schema.replication_connection_configuration, GTID_ONLY, 1] = 0
+--source include/assert.inc
+
+SET @@GLOBAL.GTID_MODE= ON;
+
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 1;
+
+--let $assert_text= 'GTID_ONLY is enabled'
+--let $assert_cond= [SELECT GTID_ONLY FROM performance_schema.replication_connection_configuration, GTID_ONLY, 1] = 1
+--source include/assert.inc
+
+--error ER_CANT_SET_GTID_MODE
+SET @@GLOBAL.GTID_MODE= ON_PERMISSIVE;
+
+
+--echo #
+--echo # 5. Replication threads must be stopped to change GTID_ONLY
+
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 0;
+
+START REPLICA IO_THREAD;
+
+--error ER_SLAVE_CHANNEL_MUST_STOP
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 1;
+
+--let $assert_text= 'GTID_ONLY is disabled'
+--let $assert_cond= [SELECT GTID_ONLY FROM performance_schema.replication_connection_configuration, GTID_ONLY, 1] = 0
+--source include/assert.inc
+
+STOP REPLICA;
+START REPLICA SQL_THREAD;
+
+--error ER_SLAVE_CHANNEL_MUST_STOP
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 1;
+
+--let $assert_text= 'GTID_ONLY is disabled'
+--let $assert_cond= [SELECT GTID_ONLY FROM performance_schema.replication_connection_configuration, GTID_ONLY, 1] = 0
+--source include/assert.inc
+
+STOP REPLICA;
+
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 1;
+
+--echo #
+--echo # 6. When positions are valid, disabling GTID_ONLY does not requires SOURCE_LOG_FILE/POS
+
+CHANGE REPLICATION SOURCE TO SOURCE_AUTO_POSITION=0, GTID_ONLY=0;
+
+--let $assert_text= 'GTID_ONLY is disabled'
+--let $assert_cond= [SELECT GTID_ONLY FROM performance_schema.replication_connection_configuration, GTID_ONLY, 1] = 0
+--source include/assert.inc
+
+--echo #
+--echo # 7. When positions are invalid disabling SOURCE_AUTO_POSITION (with or without disabling GITD_ONLY) requires SOURCE_LOG_FILE/POS
+--echo #    A warning is logged and given to the client when GITD_ONLY is disabled leaving SOURCE_AUTO_POSITION enabled
+
+CHANGE REPLICATION SOURCE TO GTID_ONLY=1, SOURCE_AUTO_POSITION=1;
+
+--let $rpl_server_number = 2
+--let $rpl_server_parameters = --skip_slave_start
+--let $explicit_default_wait_counter = 15000
+--source include/rpl_restart_server.inc
+
+#disabling both GITD_ONLY and SOURCE_AUTO_POSITION fails
+
+--error ER_CHANGE_REP_SOURCE_CANT_DISABLE_GTID_ONLY_WITHOUT_POSITIONS
+CHANGE REPLICATION SOURCE TO GTID_ONLY=0, SOURCE_AUTO_POSITION=0;
+
+#disabling SOURCE_AUTO_POSITION after GITD_ONLY fails
+
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 0;
+
+--let $assert_file= $MYSQLTEST_VARDIR/log/mysqld.2.err
+--let $assert_count = 1
+--let $assert_select = The replication positions relative to the source may be out-of-date on channel '', due to the use of GTID_ONLY=1.
+--let $assert_text = A warning is logged as some invalid positions were persisted
+--source include/assert_grep.inc
+
+
+--error ER_CHANGE_REP_SOURCE_CANT_DISABLE_AUTO_POS_WITHOUT_POSITIONS
+CHANGE REPLICATION SOURCE TO SOURCE_AUTO_POSITION=0;
+
+#command should be successful
+
+--eval CHANGE REPLICATION SOURCE TO SOURCE_AUTO_POSITION=0, SOURCE_LOG_FILE="$source_log_file", SOURCE_LOG_POS=$source_log_pos;
+
+# positions are now valid
+
+--let $source_log_file=query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Source_Log_File, 1)
+--let $assert_cond= [ SELECT "$source_log_file" != "INVALID" ]
+--let $assert_text= The source log file name is valid
+--source include/assert.inc
+
+# We can enable and disable SOURCE_AUTO_POSITION
+
+CHANGE REPLICATION SOURCE TO SOURCE_AUTO_POSITION=1;
+
+CHANGE REPLICATION SOURCE TO SOURCE_AUTO_POSITION=0;
+
+--echo #
+--echo # 8. When disabling GTID ONLY with the usage of relay log position a warning is logged
+
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 1, SOURCE_AUTO_POSITION=1;
+
+--let $rpl_server_number = 2
+--let $rpl_server_parameters = --skip_slave_start
+--let $explicit_default_wait_counter = 15000
+--source include/rpl_restart_server.inc
+
+--eval CHANGE REPLICATION SOURCE TO GTID_ONLY=0, SOURCE_AUTO_POSITION=0, SOURCE_LOG_FILE="$source_log_file", SOURCE_LOG_POS=$source_log_pos,RELAY_LOG_FILE='$applier_relaylog_file', RELAY_LOG_POS=$applier_relaylog_pos
+
+--let $assert_file= $MYSQLTEST_VARDIR/log/mysqld.2.err
+--let $assert_count = 2
+--let $assert_select = The replication positions relative to the source may be out-of-date on channel '', due to the use of GTID_ONLY=1.
+--let $assert_text = A warning is logged as some invalid positions were persisted
+--source include/assert_grep.inc
+
+--echo #
+--echo # 9. The RESET REPLICA command does not affect the option
+
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 1, SOURCE_AUTO_POSITION=1;
+
+RESET REPLICA;
+
+--let $assert_text= 'GTID_ONLY is enabled'
+--let $assert_cond= [SELECT GTID_ONLY FROM performance_schema.replication_connection_configuration, GTID_ONLY, 1] = 1
+--source include/assert.inc
+
+--echo #
+--echo # 10. The RESET REPLICA ALL command does affect the option
+
+RESET REPLICA ALL;
+
+--let $assert_text= 'GTID_ONLY is disabled'
+--let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_connection_configuration] = 0
+--source include/assert.inc
+
+--echo #
+--echo # 11. After a restart that disables the GTID mode, the channel cannot be started
+
+--replace_result $MASTER_MYPORT SOURCE_PORT
+--eval CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_PORT=$MASTER_MYPORT, SOURCE_USER='root', REQUIRE_ROW_FORMAT = 1, SOURCE_AUTO_POSITION=1, GTID_ONLY = 1
+
+--let $rpl_server_number = 2
+--let $rpl_skip_start_slave=
+--let $rpl_server_parameters = --gtid-mode=on_permissive
+--source include/rpl_restart_server.inc
+
+--let $assert_file= $MYSQLTEST_VARDIR/log/mysqld.2.err
+--let $assert_count = 1
+--let $assert_select = Replication channel '' is configured with GTID_ONLY=1, which is invalid when GTID_MODE <> ON. If you intend to disable GTIDs in the replication topology, change GTID_ONLY to 0.
+--let $assert_text = Replication channel '' could not be started as GTID_MODE was not ON.
+--source include/assert_grep.inc
+
+--let $rpl_channel_name= ''
+--let $slave_param= Slave_IO_Running
+--let $slave_param_value= No
+--source include/check_slave_param.inc
+
+--error ER_CANT_USE_GTID_ONLY_WITH_GTID_MODE_NOT_ON
+START SLAVE;
+
+--echo #
+--echo # 12 Cleanup
+
+SET @@GLOBAL.GTID_MODE = ON;
+
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 0, REQUIRE_ROW_FORMAT = 0;
+
+--source include/start_slave.inc
+
+call mtr.add_suppression("Replication channel '' is configured with GTID_ONLY=1, which is invalid when GTID_MODE <> ON. *");
+call mtr.add_suppression("The replication positions relative to the source may be out-of-date on channel '', due to the use of GTID_ONLY=1.*");
+
+--source include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_delayed_slave.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_delayed_slave.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_delayed_slave.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_delayed_slave.test	2021-09-28 11:46:34.000000000 +0000
@@ -38,7 +38,6 @@
 
 # Needed so that sleeps get executed in the slave SQL thread.
 --source include/have_binlog_format_statement.inc
---source include/not_mts_replica_parallel_workers.inc
 
 --source include/set_privilege_checks_user_as_system_user.inc
 --source include/master-slave.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gitd_only_mta_configuration_check.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gitd_only_mta_configuration_check.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gitd_only_mta_configuration_check.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gitd_only_mta_configuration_check.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,107 @@
+# ==== Purpose ====
+#
+# This test checks that:
+#  Channels with GTID_ONLY always use the parallel applier
+#  Channels with GTID_ONLY reset worker info on replica start
+#
+# ==== Requirements ====
+#
+# R1: A channel configured with GTID_ONLY always has at least
+#     one applier worker
+#
+# ==== Implementation ====
+#
+# 1. Configure the channel with GTID_ONLY = 1
+#    Add some data to populate repository tables
+# 2. Restart the replica.
+#    Check there is no worker info as it was purged after start
+# 3. Set the number of applier workers to 0
+#    Check the channel still has one worker.
+# 4. Disable GTID_ONLY
+#    Check the channel has no workers.
+# 5. Cleanup
+#
+# ==== References ====
+#
+# WL#7491: GTID-based replication applier recovery and positioning
+#
+
+--source include/have_slave_repository_type_table.inc
+--source include/have_binlog_format_row.inc
+--let $rpl_skip_start_slave= 1
+--source include/master-slave.inc
+
+--echo
+--echo ############################################################
+--echo # 1. Configure the channel with GTID_ONLY = 1
+--echo #    Add some data to populate repository tables
+
+--source include/rpl_connection_slave.inc
+
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 1, GTID_ONLY = 1;
+
+--source include/start_slave.inc
+
+--source include/rpl_connection_master.inc
+
+CREATE TABLE t1 (a INT PRIMARY KEY);
+INSERT INTO t1 VALUES(1);
+
+--source include/sync_slave_sql_with_master.inc
+
+--echo
+--echo ############################################################
+--echo # 2. Restart the replica.
+--echo #    Check there is no worker info as it was purged after start
+
+--let $rpl_server_number= 2
+--let $rpl_server_parameters=--skip_replica_start=1
+--source include/rpl_restart_server.inc
+
+--let $assert_text= No info exists in the repository table
+--let $assert_cond= `SELECT COUNT(*) = 0 FROM mysql.slave_worker_info`
+--source include/assert.inc
+
+--echo
+--echo ############################################################
+--echo # 3. Set the number of applier workers to 0
+--echo #    Check the channel still has one worker.
+
+--let $saved_replica_parallel_workers = `SELECT @@GLOBAL.replica_parallel_workers`
+SET @@GLOBAL.replica_parallel_workers = 0;
+
+ --source include/start_slave.inc
+
+--let $assert_text= There is one worker runnning with id 1
+--let $assert_cond= `SELECT COUNT(*) = 1 FROM performance_schema.replication_applier_status_by_worker WHERE worker_id=1`
+--source include/assert.inc
+
+--echo
+--echo ############################################################
+--echo # 4. Disable GTID_ONLY
+--echo #    Check the channel has no workers.
+
+--source include/stop_slave.inc
+
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 0;
+
+--source include/start_slave.inc
+
+--let $assert_text= There is no worker with an ID
+--let $assert_cond= `SELECT COUNT(*) = 0 FROM performance_schema.replication_applier_status_by_worker WHERE worker_id=1`
+--source include/assert.inc
+
+--echo
+--echo ############################################################
+--echo # 5. Cleanup
+
+--source include/rpl_connection_master.inc
+
+DROP TABLE t1;
+
+--source include/sync_slave_sql_with_master.inc
+
+--replace_result $saved_replica_parallel_workers NUMBER_OF_WORKERS
+--eval SET @@GLOBAL.replica_parallel_workers = $saved_replica_parallel_workers
+
+--source include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_group_replication_channel_defaults_on_creation.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_group_replication_channel_defaults_on_creation.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_group_replication_channel_defaults_on_creation.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_group_replication_channel_defaults_on_creation.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,177 @@
+# ==== Purpose ====
+#
+# This test validates that when a group replication channel is created
+# SOURCE_AUTO_POSITION, REQUIRE_ROW_FORMAT and GTID_ONLY are enabled by default
+#
+# ==== Requirements ====
+#
+# When group replication channel is created
+# R1. The channel must have SOURCE_AUTO_POSITION = 1
+# R2. The channel must have REQUIRE_ROW_FORMAT = 1
+# R3. The channel must have GTID_ONLY = 1
+# R4. The user can't change the value of SOURCE_AUTO_POSITION for the channel
+# R5. The user can't change the value of REQUIRE_ROW_FORMAT for the channel
+# R6. The user can't change the value of GTID_ONLY for the channel
+#
+# R7: Group replication channels can only be configured when GTID_MODE = ON
+#
+# ==== Implementation ====
+#
+# 1. Create a user so we can set a privileged user to create GR channels
+# 2. Create a group replication applier channel
+#    Verify SOURCE_AUTO_POSITION, REQUIRE_ROW_FORMAT and GTID_ONLY are enabled
+# 3. For the group replication applier channel
+#    Verify SOURCE_AUTO_POSITION, REQUIRE_ROW_FORMAT and GTID_ONLY can't be modified
+# 4. Create a group replication recovery channel
+#    Verify SOURCE_AUTO_POSITION, REQUIRE_ROW_FORMAT and GTID_ONLY are enabled
+# 5. For the group replication recovery channel
+#    Verify SOURCE_AUTO_POSITION, REQUIRE_ROW_FORMAT and GTID_ONLY can't be modified
+# 6. Delete the channels
+#    Verify they cannot be created when GTID_MODE != ON
+# 7. Cleanup
+#
+# ==== References ====
+#
+# WL#7491: GTID-based replication applier recovery and positioning
+# WL#12968: Configure replication applier to require row-based replication
+#
+
+--source include/have_binlog_format_row.inc
+--source include/have_slave_repository_type_table.inc
+
+--echo #
+--echo # 1. Create a user so we can set a privileged user to create GR channels
+
+CREATE USER 'u1'@'localhost';
+
+--echo #
+--echo # 2. Create a group replication applier channel
+--echo #    Verify SOURCE_AUTO_POSITION, REQUIRE_ROW_FORMAT and GTID_ONLY are enabled
+
+CHANGE REPLICATION SOURCE TO PRIVILEGE_CHECKS_USER = 'u1'@'localhost' FOR CHANNEL "group_replication_applier";
+
+--let $count = `SELECT COUNT(*) FROM mysql.slave_master_info WHERE Enabled_auto_position = 1 AND Channel_name = "group_replication_applier"`
+--let $assert_text = Auto_position is set to 1 for GR applier channel
+--let $assert_cond = 1 = $count
+--source include/assert.inc
+
+--let $count = `SELECT COUNT(*) FROM mysql.slave_relay_log_info WHERE Require_row_format = 1 AND Channel_name = "group_replication_applier"`
+--let $assert_text = Require_row_format is set to 1 for GR applier channel
+--let $assert_cond = 1 = $count
+--source include/assert.inc
+
+--let $count = `SELECT COUNT(*) FROM mysql.slave_master_info WHERE Gtid_only = 1 AND Channel_name = "group_replication_applier"`
+--let $assert_text = Gtid_only is set to 1 for GR applier channel
+--let $assert_cond = 1 = $count
+--source include/assert.inc
+
+--echo #
+--echo # 3. For the group replication applier channel
+--echo #    Verify SOURCE_AUTO_POSITION, REQUIRE_ROW_FORMAT and GTID_ONLY can't be modified
+
+--error ER_SLAVE_CHANNEL_OPERATION_NOT_ALLOWED
+CHANGE REPLICATION SOURCE TO SOURCE_AUTO_POSITION = 0 FOR CHANNEL "group_replication_applier";
+--error ER_SLAVE_CHANNEL_OPERATION_NOT_ALLOWED
+CHANGE REPLICATION SOURCE TO SOURCE_AUTO_POSITION = 1 FOR CHANNEL "group_replication_applier";
+
+--error ER_SLAVE_CHANNEL_OPERATION_NOT_ALLOWED
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 0 FOR CHANNEL "group_replication_applier";
+--error ER_SLAVE_CHANNEL_OPERATION_NOT_ALLOWED
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 1 FOR CHANNEL "group_replication_applier";
+
+--error ER_SLAVE_CHANNEL_OPERATION_NOT_ALLOWED
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 0 FOR CHANNEL "group_replication_applier";
+--error ER_SLAVE_CHANNEL_OPERATION_NOT_ALLOWED
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 1 FOR CHANNEL "group_replication_applier";
+
+--let $count = `SELECT COUNT(*) FROM mysql.slave_master_info WHERE Enabled_auto_position = 1 AND Channel_name = "group_replication_applier"`
+--let $assert_text = Auto_position is set to 1 for GR applier channel
+--let $assert_cond = 1 = $count
+--source include/assert.inc
+
+--let $count = `SELECT COUNT(*) FROM mysql.slave_relay_log_info WHERE Require_row_format = 1 AND Channel_name = "group_replication_applier"`
+--let $assert_text = Require_row_format is set to 1 for GR applier channel
+--let $assert_cond = 1 = $count
+--source include/assert.inc
+
+--let $count = `SELECT COUNT(*) FROM mysql.slave_master_info WHERE Gtid_only = 1 AND Channel_name = "group_replication_applier"`
+--let $assert_text = Gtid_only is set to 1 for GR applier channel
+--let $assert_cond = 1 = $count
+--source include/assert.inc
+
+--echo #
+--echo # 4. Create a group replication recovery channel
+--echo #    Verify SOURCE_AUTO_POSITION, REQUIRE_ROW_FORMAT and GTID_ONLY are enabled
+
+CHANGE REPLICATION SOURCE TO PRIVILEGE_CHECKS_USER = 'u1'@'localhost' FOR CHANNEL "group_replication_recovery";
+
+--let $count = `SELECT COUNT(*) FROM mysql.slave_master_info WHERE Enabled_auto_position = 1 AND Channel_name = "group_replication_recovery"`
+--let $assert_text = Auto_position is set to 1 for GR recovery channel
+--let $assert_cond = 1 = $count
+--source include/assert.inc
+
+--let $count = `SELECT COUNT(*) FROM mysql.slave_relay_log_info WHERE Require_row_format = 1 AND Channel_name = "group_replication_recovery"`
+--let $assert_text = Require_row_format is set to 1 for GR recovery channel
+--let $assert_cond = 1 = $count
+--source include/assert.inc
+
+--let $count = `SELECT COUNT(*) FROM mysql.slave_master_info WHERE Gtid_only = 1 AND Channel_name = "group_replication_recovery"`
+--let $assert_text = Gtid_only is set to 1 for GR recovery channel
+--let $assert_cond = 1 = $count
+--source include/assert.inc
+
+--echo #
+--echo # 5. For the group replication recovery channel
+--echo #    Verify SOURCE_AUTO_POSITION, REQUIRE_ROW_FORMAT and GTID_ONLY can't be modified
+
+--error ER_SLAVE_CHANNEL_OPERATION_NOT_ALLOWED
+CHANGE REPLICATION SOURCE TO SOURCE_AUTO_POSITION = 0 FOR CHANNEL "group_replication_recovery";
+--error ER_SLAVE_CHANNEL_OPERATION_NOT_ALLOWED
+CHANGE REPLICATION SOURCE TO SOURCE_AUTO_POSITION = 1 FOR CHANNEL "group_replication_recovery";
+
+--error ER_SLAVE_CHANNEL_OPERATION_NOT_ALLOWED
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 0 FOR CHANNEL "group_replication_recovery";
+--error ER_SLAVE_CHANNEL_OPERATION_NOT_ALLOWED
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 1 FOR CHANNEL "group_replication_recovery";
+
+--error ER_SLAVE_CHANNEL_OPERATION_NOT_ALLOWED
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 0 FOR CHANNEL "group_replication_recovery";
+--error ER_SLAVE_CHANNEL_OPERATION_NOT_ALLOWED
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 1 FOR CHANNEL "group_replication_recovery";
+
+--let $count = `SELECT COUNT(*) FROM mysql.slave_master_info WHERE Enabled_auto_position = 1 AND Channel_name = "group_replication_recovery"`
+--let $assert_text = Auto_position is set to 1 for GR recovery channel
+--let $assert_cond = 1 = $count
+--source include/assert.inc
+
+--let $count = `SELECT COUNT(*) FROM mysql.slave_relay_log_info WHERE Require_row_format = 1 AND Channel_name = "group_replication_recovery"`
+--let $assert_text = Require_row_format is set to 1 for GR recovery channel
+--let $assert_cond = 1 = $count
+--source include/assert.inc
+
+--let $count = `SELECT COUNT(*) FROM mysql.slave_master_info WHERE Gtid_only = 1 AND Channel_name = "group_replication_recovery"`
+--let $assert_text = Gtid_only is set to 1 for GR recovery channel
+--let $assert_cond = 1 = $count
+--source include/assert.inc
+
+
+--echo #
+--echo # 6. Delete the channels
+--echo #    Verify they cannot be created when GTID_MODE != ON
+
+RESET REPLICA ALL;
+
+SET GLOBAL GTID_MODE = ON_PERMISSIVE;
+
+--error ER_CHANGE_REP_SOURCE_GR_CHANNEL_WITH_GTID_MODE_NOT_ON
+CHANGE REPLICATION SOURCE TO PRIVILEGE_CHECKS_USER = 'u1'@'localhost' FOR CHANNEL "group_replication_applier";
+
+--error ER_CHANGE_REP_SOURCE_GR_CHANNEL_WITH_GTID_MODE_NOT_ON
+CHANGE REPLICATION SOURCE TO PRIVILEGE_CHECKS_USER = 'u1'@'localhost' FOR CHANNEL "group_replication_recovery";
+
+--echo #
+--echo # 7. Cleanup
+
+SET GLOBAL GTID_MODE = ON;
+
+DROP USER 'u1'@'localhost';
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtid_assign_gtid_to_anonymous_transactions_with_master_gtid_mode_on.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtid_assign_gtid_to_anonymous_transactions_with_master_gtid_mode_on.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtid_assign_gtid_to_anonymous_transactions_with_master_gtid_mode_on.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtid_assign_gtid_to_anonymous_transactions_with_master_gtid_mode_on.test	2021-09-28 11:46:34.000000000 +0000
@@ -27,6 +27,7 @@
 
 --let $rpl_gtid_utils= 1
 --let $rpl_skip_start_slave = 1
+--source include/not_rpl_gtid_only.inc
 --source include/master-slave.inc
 --source include/have_binlog_format_row.inc
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtid_deleted_binlog_fail_to_connect.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtid_deleted_binlog_fail_to_connect.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtid_deleted_binlog_fail_to_connect.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtid_deleted_binlog_fail_to_connect.test	2021-09-28 11:46:34.000000000 +0000
@@ -27,6 +27,7 @@
 
 # This test is binlog format agnostic
 --source include/have_binlog_format_row.inc
+--source include/not_rpl_gtid_only.inc
 --source include/have_debug.inc
 --let $rpl_gtid_utils= 1
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtid_delete_memory_table_after_start_server.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtid_delete_memory_table_after_start_server.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtid_delete_memory_table_after_start_server.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtid_delete_memory_table_after_start_server.test	1970-01-01 00:00:00.000000000 +0000
@@ -1,240 +0,0 @@
-################################################################################
-# BUG#21045848 XA+MEMORY TABLE: POST SERVER RESTART 'XA COMMIT'
-#              IS OVERRIDDEN BY 'DELETE' CMD
-#
-# Memory table's data will be lost after server restarts. To keep the data
-# consistency between master and slave, it just binlogs
-# 'DELETE FROM `db`.`table_name`' when the memory table is locked first time.
-# So DELETE statement could be binlogged in many statements.
-#
-# Because it was not handled correctly, it caused below problems:
-## - COM_FIELD_LIST
-#   it didn't flush binlog cache to binlog file. So the DELETEs were not
-#   binlogged in COM_FIELD_LIST, it was binlogged with next statement together.
-#
-# - CREATE TABLE ... LIKE memory_table
-# - CREATE TABLE ... SELECT memory_table
-#   They were binlogged like:
-#   GTID_log_event | Anonymous_gtid_log_event
-#   DELETE FROM memory_table
-#   CREATE TABLE ... LIKE memory_table | CREATE TABLE ... SELECT memory_table
-#
-#   Both statements shared the same gtid event. That was not correct.
-#
-# - DELETE was binlogged without BEGIN and COMMIT
-#   It caused some DML binlogged without BEGIN and COMMIT.  For example:
-#   INSERT INTO myisam_t1 SELECT * FROM memory_table
-#   it was binlogged as:
-#   GTID_log_event | Anonymous_gtid_log_event
-#   DELETE FROM memory_table
-#   INSERT INTO myisam_t1 SELECT * FROM memory_table
-#
-# The test cases verify above statements can binlog 'DELETE' statement
-# correctly. A few extra test cases were added to verify some special
-# situations that updating or modifying a memory table.
-#
-# The test cases in this file will verify only when gtid mode is on.
-#
-# See rpl_no_gtid_delete_memory_table_after_start_server.test for the tests with
-# gtid_mode=off.
-################################################################################
---source include/not_group_replication_plugin.inc
---source include/mysql_have_debug.inc
-
---let $rpl_gtid_utils= 1
---source include/master-slave.inc
-
-CALL mtr.add_suppression("Found 1 prepared XA transactions");
-CALL mtr.add_suppression("Statement is unsafe because it is being used inside a XA transaction");
-CALL mtr.add_suppression("Statement accesses nontransactional table as well as transactional or temporary table");
-CREATE DATABASE db1;
-CREATE DATABASE db2;
-CREATE TABLE t1(c1 INT);
-CREATE TABLE t2(c1 INT);
-CREATE TABLE mem_t1(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-CREATE TABLE mem_t2(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-CREATE TABLE db1.mem_t1(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-CREATE TABLE db1.mem_t2(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-CREATE TABLE db2.mem_t1(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-CREATE TABLE db2.mem_t2(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-CREATE TABLE db2.mem_t3(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-CREATE TABLE db2.mem_t4(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-CREATE TABLE db2.mem_t5(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-
---delimiter |
-CREATE TRIGGER tr1 AFTER INSERT ON t2 FOR EACH ROW
-BEGIN
-  INSERT INTO t1 SELECT * FROM db2.mem_t3;
-END |
---delimiter ;
-
-INSERT INTO mem_t1 VALUES(1),(2),(3);
-INSERT INTO mem_t2 VALUES(1),(2),(3);
-INSERT INTO db1.mem_t1 VALUES(1),(2),(3);
-INSERT INTO db1.mem_t2 VALUES(1),(2),(3);
-INSERT INTO db2.mem_t1 VALUES(1),(2),(3);
-INSERT INTO db2.mem_t2 VALUES(1),(2),(3);
-INSERT INTO db2.mem_t3 VALUES(1),(2),(3);
-INSERT INTO db2.mem_t4 VALUES(1),(2),(3);
-INSERT INTO db2.mem_t5 VALUES(1),(2),(3);
-
---source include/sync_slave_sql_with_master.inc
---source include/stop_slave_io.inc
---source include/rpl_connection_master.inc
-
-XA START 'xa1';
---disable_warnings
-INSERT INTO t1 VALUES(1);
---enable_warnings
-XA END 'xa1';
-XA PREPARE 'xa1';
---source include/save_master_pos.inc
-
---let $rpl_server_number=1
---source include/rpl_restart_server.inc
-
---source include/rpl_connection_slave.inc
---source include/start_slave_io.inc
---source include/sync_slave_sql.inc
-
---echo #
---echo # Test case 1: verify XA COMMIT can be binlogged correctly.
---echo #
---source include/rpl_connection_master.inc
---source include/gtid_step_reset.inc
---source include/save_binlog_position.inc
-
---exec echo "use test; XA COMMIT 'xa1';" > $MYSQLTEST_VARDIR/tmp/my.sql
-
-# When build-completion-hash is on, mysql client will fetch table name
-# and field name from mysql server automatically just after connecting
-# to the server correctly. it fetches the field by using COM_FIELD_LIST
-# which is expected by this test.
---exec $MYSQL --build-completion-hash  < $MYSQLTEST_VARDIR/tmp/my.sql 2>&1
---remove_file $MYSQLTEST_VARDIR/tmp/my.sql
-
---let $gtid_step_count= 3
---source include/gtid_step_assert.inc
-
---let $limit= 0,8
---let $event_sequence= Gtid # Query/.*BEGIN # Query/.*DELETE.* # Query/.*COMMIT
---let $event_sequence= $event_sequence # $event_sequence
---source include/assert_binlog_events.inc
-
---source include/sync_slave_sql_with_master.inc
---let $rpl_diff_statement= SELECT * FROM t1
---source include/rpl_diff.inc
-
---echo #
---echo # Test case 2: verify COM_FIELD_LIST can binlog DELETE FROM mem_xx
---echo #              correctly
---echo #
---source include/rpl_connection_master.inc
---source include/gtid_step_reset.inc
-
---exec echo "use db1;" > $MYSQLTEST_VARDIR/tmp/my.sql
---exec $MYSQL --build-completion-hash  < $MYSQLTEST_VARDIR/tmp/my.sql 2>&1
---remove_file $MYSQLTEST_VARDIR/tmp/my.sql
-
---let $gtid_step_count= 2
---source include/gtid_step_assert.inc
-
---source include/sync_slave_sql_with_master.inc
-# DELETE FROM mem_xx have been applied the tables should be empty.
-SELECT * FROM mem_t1;
-SELECT * FROM mem_t2;
-
---echo #
---echo # Test case 3: verify DELETE FROM mem_xx can be binlogged correctly
---echo #              in CREATE TABLE ... LIKE
---source include/rpl_connection_master.inc
---source include/gtid_step_reset.inc
---source include/save_binlog_position.inc
-
-CREATE TABLE t3 LIKE db2.mem_t1;
-
---let $gtid_step_count= 2
---source include/gtid_step_assert.inc
-
---let $limit= 0,4
---let $event_sequence= Gtid # Query/.*BEGIN # Query/.*DELETE.* # Query/.*COMMIT
---source include/assert_binlog_events.inc
-
---source include/sync_slave_sql_with_master.inc
-# DELETE FROM mem_xx have been applied the tables should be empty.
-SELECT * FROM db2.mem_t1;
-
---echo #
---echo # Test case 4: verify DELETE FROM mem_xx can be binlogged correctly
---echo #              in DML
---source include/rpl_connection_master.inc
---source include/gtid_step_reset.inc
---source include/save_binlog_position.inc
-
-# mem_t3 is empty, the UNION makes sure that a row event is binlogged.
-INSERT INTO t3 SELECT * FROM db2.mem_t2 UNION SELECT 10;
-
---let $gtid_step_count= 2
---source include/gtid_step_assert.inc
-
-#--let $limit= 0,4
-#--let $event_sequence= Gtid # Query/.*BEGIN # Query/.*DELETE.* # Query/.*COMMIT
---source include/assert_binlog_events.inc
-
---source include/sync_slave_sql_with_master.inc
-# DELETE FROM mem_xx have been applied the tables should be empty.
-SELECT * FROM db2.mem_t2;
-
---echo #
---echo # Test case 5: verify DELETE FROM mem_xx can be binlogged correctly
---echo #              in a trigger
-
---source include/rpl_connection_master.inc
---source include/gtid_step_reset.inc
---source include/save_binlog_position.inc
-
-INSERT INTO t2 VALUES(11);
-
---let $gtid_step_count= 2
---source include/gtid_step_assert.inc
-
---source include/assert_binlog_events.inc
-
---source include/sync_slave_sql_with_master.inc
-# DELETE FROM mem_xx have been applied the tables should be empty.
-SELECT * FROM db2.mem_t3;
-
---echo #
---echo # Test case 6: Verify DELETE FROM mem_xx can be binlog correctly
---echo #              when ALTER the memory table.
---source include/rpl_connection_master.inc
---source include/gtid_step_reset.inc
---source include/save_binlog_position.inc
-
-ALTER TABLE db2.mem_t4 ADD COLUMN c2 INT;
-
---let $gtid_step_count= 2
---source include/gtid_step_assert.inc
---source include/assert_binlog_events.inc
-
---source include/sync_slave_sql_with_master.inc
-# DELETE FROM mem_xx have been applied the tables should be empty.
-SELECT * FROM db2.mem_t4;
-
---echo #
---echo # Test case 7: Verify DELETE FROM mem_xx can be binlog correctly
---echo #              when DROP the memory table.
---source include/rpl_connection_master.inc
---source include/gtid_step_reset.inc
-DROP TABLE db2.mem_t5;
-
---let $gtid_step_count= 1
---source include/gtid_step_assert.inc
---source include/sync_slave_sql_with_master.inc
-
---source include/rpl_connection_master.inc
-DROP TABLE t1, t2, t3, mem_t1, mem_t2;
-DROP DATABASE db1;
-DROP DATABASE db2;
-
---source include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtid_deprecations.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtid_deprecations.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtid_deprecations.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtid_deprecations.test	2021-09-28 11:46:34.000000000 +0000
@@ -1,3 +1,4 @@
+--source include/not_rpl_gtid_only.inc
 --source include/master-slave.inc
 
 # Test has more than one channel, so cannot run with
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtid_mts_relay_log_recovery_auto_pos_on_off-slave.opt mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtid_mts_relay_log_recovery_auto_pos_on_off-slave.opt
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtid_mts_relay_log_recovery_auto_pos_on_off-slave.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtid_mts_relay_log_recovery_auto_pos_on_off-slave.opt	2021-09-28 11:46:34.000000000 +0000
@@ -1 +1,2 @@
 --sync_source_info=1 --relay-log-recovery=1 --replica-transaction-retries=0
+--skip-replica-preserve-commit-order
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtid_mts_replicate_same_server_id.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtid_mts_replicate_same_server_id.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtid_mts_replicate_same_server_id.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtid_mts_replicate_same_server_id.test	2021-09-28 11:46:34.000000000 +0000
@@ -21,6 +21,8 @@
 #   slave and has the slave's server_id.
 
 --source include/not_group_replication_plugin.inc
+--source include/only_mts_replica_parallel_workers.inc
+--source include/not_rpl_gtid_only.inc
 --let $use_gtids= 0
 --source include/master-slave.inc
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtid_only_no_applier_repo_persistency.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtid_only_no_applier_repo_persistency.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtid_only_no_applier_repo_persistency.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtid_only_no_applier_repo_persistency.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,349 @@
+# ==== Purpose ====
+#
+# This test validates that no info is persisted in the applier metadata repository
+#
+# ==== Requirements ====
+#
+# For the applier metadata repository:
+# R1. When CHANGE REPLICATION SOURCE is executed the repository fields are persisted
+# R2. Position information updated when a event is applied is not persisted in the repository
+# R3. Stop replication commands do not make the server persist information in the repository
+# R4. Start replication commands do not make the server persist information in the repository
+# R5. Killing the applier does not make the server persist information in the repository
+# R6: RESET REPLICA persists repository information after reseting it
+#
+# ==== Implementation ====
+#
+# 1. Create a table on the source and replicate it.
+#    Set the value of sync_source_info to 1 so the repo is always synced
+#    Check the repo shows the same value as SHOW REPLICA STATUS
+# 2. Stop replication and make the channel use GTID_ONLY=1
+#    Start replication and add some values to the table.
+#    Check the repo shows the old values in relation to SHOW REPLICA STATUS
+# 3. Stop replication
+#    Check the repo still shows the old values in relation to SHOW REPLICA STATUS
+# 4. Start replication again
+#    Check the repo still shows the old values in relation to SHOW REPLICA STATUS
+# 5. Kill the SQL thread
+#    Check the repo still shows the old values in relation to SHOW REPLICA STATUS
+# 6. Change a replication connection setting with CHANGE REPLICATION SOURCE
+#    Check the repo still now as the same value in relation to SHOW REPLICA STATUS
+# 7. Restart the replica server
+#    Check the repo still shows the old values
+# 8. Add some values and check the repo is again stale
+#    Execute a RESET REPLICA command
+#    Check the repo persisted the reset position
+# 9. Check RESET REPLICA ALL removes all the information
+# 10. Cleanup
+#
+# ==== References ====
+#
+# WL#7491: GTID-based replication applier recovery and positioning
+#
+
+--source include/have_binlog_format_row.inc
+--source include/have_slave_repository_type_table.inc
+--source include/not_rpl_gtid_only.inc
+
+# This test compares source log positions between source memory and replica
+# repositories. Ensure synchronization of the source log positions
+# between source and replica memory regardless of GTIDs.
+--let $ignore_gtids_on_sync= 1
+
+--source include/master-slave.inc
+
+--echo #
+--echo # 1. Create a table on the source and replicate it.
+--echo #    Check the repo shows the same value as SHOW REPLICA STATUS
+
+--source include/rpl_connection_slave.inc
+
+# Reduce this to a minimum
+--let $replica_checkpoint_period_value = `SELECT @@global.replica_checkpoint_period`
+SET @@GLOBAL.replica_checkpoint_period= 1;
+
+--source include/rpl_connection_master.inc
+
+CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY);
+
+INSERT INTO t1 VALUES (1);
+
+--source include/sync_slave_sql_with_master.inc
+
+--let $srs_relay_log_pos = query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Relay_Log_Pos, 1)
+--let $table_relay_log_pos = `SELECT Relay_log_pos FROM mysql.slave_relay_log_info`
+--let $assert_cond= [ SELECT $srs_relay_log_pos = $table_relay_log_pos ]
+--let $assert_text= The repository has the lastest position
+--source include/assert.inc
+
+--let $srs_relay_log_name = query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Relay_Log_File, 1)
+--let $table_relay_log_name = `SELECT Relay_log_name FROM mysql.slave_relay_log_info`
+
+# As the table string may contain path characters in it, we use the locate function
+--let $assert_cond= [ SELECT LOCATE("$srs_relay_log_name", "$table_relay_log_name") > 0]
+--let $assert_text= The file name for the repository and the show replica status match
+--source include/assert.inc
+
+--echo #
+--echo # 2. Stop replication and make the channel use GTID_ONLY=1
+--echo #    Start replication and add some values to the table.
+--echo #    Check the repo shows the old values in relation to SHOW REPLICA STATUS
+
+--source include/stop_slave.inc
+
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 1, REQUIRE_ROW_FORMAT=1;
+
+--let $table_relay_log_pos_orig = `SELECT Relay_log_pos FROM mysql.slave_relay_log_info`
+--let $table_relay_log_name_orig = `SELECT Relay_log_name FROM mysql.slave_relay_log_info`
+
+--source include/start_slave.inc
+
+--source include/rpl_connection_master.inc
+
+INSERT INTO t1 VALUES (2);
+
+--source include/sync_slave_sql_with_master.inc
+
+--let $srs_relay_log_pos = query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Relay_Log_Pos, 1)
+--let $table_relay_log_pos = `SELECT Relay_log_pos FROM mysql.slave_relay_log_info`
+
+--let $assert_cond= [ SELECT $srs_relay_log_pos != $table_relay_log_pos ]
+--let $assert_text= The repository position is not the one shown on show replica status
+--source include/assert.inc
+
+--let $assert_cond= [ SELECT $table_relay_log_pos = $table_relay_log_pos_orig ]
+--let $assert_text= The repository pos value is still the same
+--source include/assert.inc
+
+--let $table_relay_log_name = `SELECT Relay_log_name FROM mysql.slave_relay_log_info`
+--let $assert_cond= [ SELECT "$table_relay_log_name" = "$table_relay_log_name_orig" ]
+--let $assert_text= The repository name value is still the same
+--source include/assert.inc
+
+--echo #
+--echo # 3. Stop replication
+--echo #    Check the repo still shows the old values in relation to SHOW REPLICA STATUS
+
+--source include/stop_slave.inc
+
+--let $srs_relay_log_pos = query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Relay_Log_Pos, 1)
+--let $table_relay_log_pos = `SELECT Relay_log_pos FROM mysql.slave_relay_log_info`
+
+--let $assert_cond= [ SELECT $srs_relay_log_pos != $table_relay_log_pos ]
+--let $assert_text= The repository position is not the one shown on show replica status
+--source include/assert.inc
+
+--let $assert_cond= [ SELECT $table_relay_log_pos = $table_relay_log_pos_orig ]
+--let $assert_text= The repository pos value is still the same
+--source include/assert.inc
+
+--let $table_relay_log_name = `SELECT Relay_log_name FROM mysql.slave_relay_log_info`
+--let $assert_cond= [ SELECT "$table_relay_log_name" = "$table_relay_log_name_orig" ]
+--let $assert_text= The repository name value is still the same
+--source include/assert.inc
+
+--echo #
+--echo # 4. Start replication again
+--echo #    Check the repo still shows the old values in relation to SHOW REPLICA STATUS
+
+--source include/start_slave.inc
+
+--source include/rpl_connection_master.inc
+
+INSERT INTO t1 VALUES (3);
+
+--source include/sync_slave_sql_with_master.inc
+
+--let $srs_relay_log_pos = query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Relay_Log_Pos, 1)
+--let $table_relay_log_pos = `SELECT Relay_log_pos FROM mysql.slave_relay_log_info`
+
+--let $assert_cond= [ SELECT $srs_relay_log_pos != $table_relay_log_pos ]
+--let $assert_text= The repository position is not the one shown on show replica status
+--source include/assert.inc
+
+--let $srs_relay_log_name = query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Relay_Log_File, 1)
+# As the table string may contain path characters in it, we use the locate function
+--let $assert_cond= [ SELECT LOCATE("$srs_relay_log_name", "$table_relay_log_name") = 0 ]
+--let $assert_text= The repository file name is not the one shown on show replica status
+--source include/assert.inc
+
+--let $assert_cond= [ SELECT $table_relay_log_pos = $table_relay_log_pos_orig ]
+--let $assert_text= The repository pos value is still the same
+--source include/assert.inc
+
+--let $table_relay_log_name = `SELECT Relay_log_name FROM mysql.slave_relay_log_info`
+--let $assert_cond= [ SELECT "$table_relay_log_name" = "$table_relay_log_name_orig" ]
+--let $assert_text= The repository name value is still the same
+--source include/assert.inc
+
+--echo #
+--echo # 5. Kill the SQL thread
+--echo #    Check the repo still shows the old values in relation to SHOW REPLICA STATUS
+
+--let $sql_applier_process_id=`SELECT PROCESSLIST_ID FROM performance_schema.threads WHERE NAME = 'thread/sql/replica_sql'`
+
+--disable_query_log
+--eval KILL $sql_applier_process_id
+--enable_query_log
+
+--let $slave_sql_errno= convert_error(ER_MTS_INCONSISTENT_DATA)
+--source include/wait_for_slave_sql_error.inc
+
+--let $srs_relay_log_pos = query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Relay_Log_Pos, 1)
+--let $table_relay_log_pos = `SELECT Relay_log_pos FROM mysql.slave_relay_log_info`
+
+--let $assert_cond= [ SELECT $srs_relay_log_pos != $table_relay_log_pos ]
+--let $assert_text= The repository position is not the one shown on show replica status
+--source include/assert.inc
+
+--let $srs_relay_log_name = query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Relay_Log_File, 1)
+
+# As the table string may contain path characters in it, we use the locate function
+--let $assert_cond= [ SELECT LOCATE("$srs_relay_log_name", "$table_relay_log_name") = 0 ]
+--let $assert_text= The repository file name is not the one shown on show replica status
+--source include/assert.inc
+
+--let $assert_cond= [ SELECT $table_relay_log_pos = $table_relay_log_pos_orig ]
+--let $assert_text= The repository pos value is still the same
+--source include/assert.inc
+
+--let $table_relay_log_name = `SELECT Relay_log_name FROM mysql.slave_relay_log_info`
+--let $assert_cond= [ SELECT "$table_relay_log_name" = "$table_relay_log_name_orig" ]
+--let $assert_text= The repository name value is still the same
+--source include/assert.inc
+
+--echo #
+--echo # 6. Change a replication connection setting with CHANGE REPLICATION SOURCE
+--echo #    Check the repo now has the same value in relation to SHOW REPLICA STATUS
+
+--source include/stop_slave.inc
+
+CHANGE REPLICATION SOURCE TO SOURCE_CONNECT_RETRY = 10000;
+
+--let $srs_relay_log_pos = query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Relay_Log_Pos, 1)
+--let $table_relay_log_pos = `SELECT Relay_log_pos FROM mysql.slave_relay_log_info`
+--let $assert_cond= [ SELECT $srs_relay_log_pos = $table_relay_log_pos ]
+--let $assert_text= The repository has the lastest position
+--source include/assert.inc
+
+--let $srs_relay_log_name = query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Relay_Log_File, 1)
+--let $table_relay_log_name = `SELECT Relay_log_name FROM mysql.slave_relay_log_info`
+
+# As the table string may contain path characters in it, we use the locate function
+--let $assert_cond= [ SELECT LOCATE("$srs_relay_log_name", "$table_relay_log_name") > 0 ]
+--let $assert_text= The file name for the repository and the show replica status match
+--source include/assert.inc
+
+--echo #
+--echo # 7.  Restart the replica server
+--echo #    Check the repo still shows the old values
+
+--source include/start_slave.inc
+
+--source include/rpl_connection_master.inc
+
+INSERT INTO t1 VALUES (4);
+
+--source include/sync_slave_sql_with_master.inc
+
+--let $table_relay_log_pos_orig = `SELECT Relay_log_pos FROM mysql.slave_relay_log_info`
+--let $table_relay_log_name_orig = `SELECT Relay_log_name FROM mysql.slave_relay_log_info`
+
+--let $srs_relay_log_pos = query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Relay_Log_Pos, 1)
+--let $assert_cond= [ SELECT $srs_relay_log_pos != $table_relay_log_pos_orig ]
+--let $assert_text= The repository position is not the one shown on show replica status
+--source include/assert.inc
+
+--let $rpl_server_parameters= --skip_replica_start=FALSE
+--let $rpl_server_number = 2
+--source include/rpl_restart_server.inc
+
+--let $table_relay_log_pos = `SELECT Relay_log_pos FROM mysql.slave_relay_log_info`
+--let $table_relay_log_name = `SELECT Relay_log_name FROM mysql.slave_relay_log_info`
+
+--let $assert_cond= [ SELECT $table_relay_log_pos = $table_relay_log_pos_orig ]
+--let $assert_text= The repository pos value is still the same
+--source include/assert.inc
+
+--let $assert_cond= [ SELECT "$table_relay_log_name" = "$table_relay_log_name_orig" ]
+--let $assert_text= The repository name value is still the same
+
+--echo #
+--echo # 8. Add some values and check the repo is again stale
+--echo #    Execute a RESET REPLICA command
+--echo #    Check the repo persisted the reset position
+
+--source include/rpl_connection_master.inc
+
+INSERT INTO t1 VALUES (5);
+
+--source include/sync_slave_sql_with_master.inc
+
+--let $srs_relay_log_pos = query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Relay_Log_Pos, 1)
+--let $table_relay_log_pos = `SELECT Relay_log_pos FROM mysql.slave_relay_log_info`
+
+--let $assert_cond= [ SELECT $srs_relay_log_pos != $table_relay_log_pos ]
+--let $assert_text= The repository position is not the one shown on show replica status
+--source include/assert.inc
+
+--source include/stop_slave.inc
+
+RESET REPLICA;
+
+--let $srs_relay_log_pos = query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Relay_Log_Pos, 1)
+--let $table_relay_log_pos = `SELECT Relay_log_pos FROM mysql.slave_relay_log_info`
+
+--query_vertical SELECT Relay_log_pos FROM mysql.slave_relay_log_info;
+--echo $srs_relay_log_pos
+--echo $table_relay_log_pos
+
+--let $assert_cond= [ SELECT $srs_relay_log_pos = 0 ]
+--let $assert_text= The position was reset as shown on show replica status
+--source include/assert.inc
+
+--let $assert_cond= [ SELECT "$table_relay_log_pos" = "" ]
+--let $assert_text= The repository reset the position
+--source include/assert.inc
+
+--echo #
+--echo # 9. Check RESET REPLICA ALL removes all the information
+
+--source include/start_slave.inc
+
+--source include/rpl_connection_master.inc
+
+INSERT INTO t1 VALUES (6);
+
+--source include/sync_slave_sql_with_master.inc
+
+--let $table_relay_log_pos = `SELECT Relay_log_pos FROM mysql.slave_relay_log_info`
+--let $assert_cond= [ SELECT $table_relay_log_pos = 4 ]
+--let $assert_text= The repository position was persisted when the channel was initialized after the reset
+--source include/assert.inc
+
+--source include/stop_slave.inc
+
+RESET REPLICA ALL;
+
+--let $assert_cond= COUNT(*) = 0 FROM mysql.slave_relay_log_info
+--let $assert_text= The repository info was deleted
+--source include/assert.inc
+
+--echo #
+--echo # 10. Cleanup
+
+--replace_result $replica_checkpoint_period_value CHECKPOINT_PERIOD
+--eval SET @@GLOBAL.replica_checkpoint_period=$replica_checkpoint_period_value;
+
+--replace_result $MASTER_MYPORT MASTER_PORT
+--eval CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_PORT=$MASTER_MYPORT, SOURCE_USER='root'
+--source include/start_slave.inc
+
+call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
+
+--source include/rpl_connection_master.inc
+
+DROP TABLE t1;
+
+--source include/rpl_end.inc
+
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtid_only_no_connection_repo_persistency.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtid_only_no_connection_repo_persistency.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtid_only_no_connection_repo_persistency.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtid_only_no_connection_repo_persistency.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,333 @@
+# ==== Purpose ====
+#
+# This test validates that no info is persisted in the connection metadata repository
+#
+# ==== Requirements ====
+#
+# For the connection metadata repository:
+# R1. When CHANGE REPLICATION SOURCE is executed the repository fields are persisted
+# R2. Position information is updated when an event is queued but not persisted in the repository
+# R3. Stop replication commands do not make the server persist information in the repository
+# R4. Start replication commands do not make the server persist information in the repository
+# R5. Killing the receiver does not make the server persist information in the repository
+# R6: RESET REPLICA persists repository information after reseting it
+#
+# ==== Implementation ====
+#
+# 1. Create a table on the source and replicate it.
+#    Set the value of sync_source_info to 1 so the repo is always synced
+#    Check the repo shows the same value as SHOW REPLICA STATUS
+# 2. Stop replication and make the channel use GTID_ONLY=1
+#    Start replication and add some values to the table.
+#    Check the repo shows the old values in relation to SHOW REPLICA STATUS
+# 3. Stop replication
+#    Check the repo still shows the old values in relation to SHOW REPLICA STATUS
+# 4. Start replication again
+#    Check the repo still shows the old values in relation to SHOW REPLICA STATUS
+# 5. Kill the IO thread
+#    Check the repo still shows the old values in relation to SHOW REPLICA STATUS
+# 6. Change a replication connection setting with CHANGE REPLICATION SOURCE
+#    Check the repo now has the same value in relation to SHOW REPLICA STATUS
+# 7. Restart the replica server
+#    Check the repo still shows the old values
+# 8. Add some values and check the repo is again stale
+#    Execute a RESET REPLICA command
+#    Check the repo persisted the reset position
+# 9. Check RESET REPLICA ALL removes all the information
+# 10. Cleanup
+#
+# ==== References ====
+#
+# WL#7491: GTID-based replication applier recovery and positioning
+#
+
+--source include/have_binlog_format_row.inc
+--source include/have_slave_repository_type_table.inc
+--source include/skip_config_rpl_gtid_only.inc
+
+# This test compares source log positions between source memory and replica
+# repositories. Ensure synchronization of the source log positions
+# between source and replica memory regardless of GTIDs.
+--let $ignore_gtids_on_sync= 1
+
+--source include/master-slave.inc
+
+--echo #
+--echo # 1. Create a table on the source and replicate it.
+--echo #    Set the value of sync_source_info to 1 so the repo is always synced
+--echo #    Check the repo shows the same value as SHOW REPLICA STATUS
+
+--source include/rpl_connection_slave.inc
+
+# Make the info be synced at each event
+--let $sync_source_info_val = `SELECT @@GLOBAL.sync_source_info;`
+SET @@GLOBAL.sync_source_info=1;
+
+--source include/rpl_connection_master.inc
+
+CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY);
+
+INSERT INTO t1 VALUES (1);
+
+--source include/sync_slave_sql_with_master.inc
+
+--let $srs_source_log_pos = query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Read_Source_Log_Pos, 1)
+--let $table_source_log_pos = `SELECT Master_log_pos FROM mysql.slave_master_info`
+
+--let $assert_cond= [ SELECT $srs_source_log_pos = $table_source_log_pos ]
+--let $assert_text= The file position for the repository and the show replica status match
+--source include/assert.inc
+
+--let $srs_source_log_file = query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Source_Log_File, 1)
+--let $table_source_log_file = `SELECT Master_log_name FROM mysql.slave_master_info`
+
+--let $assert_cond= [ SELECT "$srs_source_log_file" = "$table_source_log_file" ]
+--let $assert_text= The file name for the repository and the show replica status match
+--source include/assert.inc
+
+--echo #
+--echo # 2. Stop replication and make the channel use GTID_ONLY=1
+--echo #    Start replication and add some values to the table.
+--echo #    Check the repo shows the old values in relation to SHOW REPLICA STATUS
+
+--source include/stop_slave.inc
+
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 1, REQUIRE_ROW_FORMAT=1;
+
+--let $table_source_log_pos_orig = `SELECT Master_log_pos FROM mysql.slave_master_info`
+--let $table_source_log_file_orig = `SELECT Master_log_name FROM mysql.slave_master_info`
+
+--source include/start_slave.inc
+
+--source include/rpl_connection_master.inc
+
+INSERT INTO t1 VALUES (2);
+
+--source include/sync_slave_sql_with_master.inc
+
+--let $srs_source_log_pos=query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Read_Source_Log_Pos, 1)
+--let $table_source_log_pos = `SELECT Master_log_pos FROM mysql.slave_master_info`
+--let $assert_cond= [ SELECT $srs_source_log_pos != $table_source_log_pos ]
+--let $assert_text= The repository position is not the one shown on show replica status
+--source include/assert.inc
+
+--let $assert_cond= [ SELECT $table_source_log_pos = $table_source_log_pos_orig ]
+--let $assert_text= The repository pos value is still the same
+--source include/assert.inc
+
+--let $table_source_log_file = `SELECT Master_log_name FROM mysql.slave_master_info`
+--let $assert_cond= [ SELECT "$table_source_log_file" = "$table_source_log_file_orig" ]
+--let $assert_text= The repository name value is still the same
+--source include/assert.inc
+
+--echo #
+--echo # 3. Stop replication
+--echo #    Check the repo still shows the old values in relation to SHOW REPLICA STATUS
+
+--source include/stop_slave.inc
+
+--let $srs_source_log_pos=query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Read_Source_Log_Pos, 1)
+--let $table_source_log_pos = `SELECT Master_log_pos FROM mysql.slave_master_info`
+--let $assert_cond= [ SELECT $srs_source_log_pos != $table_source_log_pos ]
+--let $assert_text= The repository position is not the one shown on show replica status
+--source include/assert.inc
+
+--let $assert_cond= [ SELECT $table_source_log_pos = $table_source_log_pos_orig ]
+--let $assert_text= The repository pos value is still the same
+--source include/assert.inc
+
+--let $table_source_log_file = `SELECT Master_log_name FROM mysql.slave_master_info`
+--let $assert_cond= [ SELECT "$table_source_log_file" = "$table_source_log_file_orig" ]
+--let $assert_text= The repository name value is still the same
+--source include/assert.inc
+
+--echo #
+--echo # 4. Start replication again
+--echo #    Check the repo still shows the old values in relation to SHOW REPLICA STATUS
+
+--source include/start_slave.inc
+
+--source include/rpl_connection_master.inc
+
+FLUSH LOGS;
+
+INSERT INTO t1 VALUES (3);
+
+--source include/sync_slave_sql_with_master.inc
+
+--let $srs_source_log_pos=query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Read_Source_Log_Pos, 1)
+--let $table_source_log_pos = `SELECT Master_log_pos FROM mysql.slave_master_info`
+--let $assert_cond= [ SELECT $srs_source_log_pos != $table_source_log_pos ]
+--let $assert_text= The repository position is not the one shown on show replica status
+--source include/assert.inc
+
+--let $srs_source_log_file = query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Source_Log_File, 1)
+--let $table_source_log_file = `SELECT Master_log_name FROM mysql.slave_master_info`
+--let $assert_cond= [ SELECT "$srs_source_log_file" != "$table_source_log_file" ]
+--let $assert_text= The repository file name is not the one shown on show replica status
+--source include/assert.inc
+
+--let $assert_cond= [ SELECT $table_source_log_pos = $table_source_log_pos_orig ]
+--let $assert_text= The repository pos value is still the same
+--source include/assert.inc
+
+--let $assert_cond= [ SELECT "$table_source_log_file" = "$table_source_log_file_orig" ]
+--let $assert_text= The repository name value is still the same
+--source include/assert.inc
+
+--echo #
+--echo # 5. Kill the IO thread
+--echo #    Check the repo still shows the old values in relation to SHOW REPLICA STATUS
+
+let $receiver_process_id= `SELECT Id FROM information_schema.processlist WHERE State= "Waiting for source to send event"`;
+
+--disable_query_log
+--eval KILL $receiver_process_id
+--enable_query_log
+
+--source include/wait_for_slave_io_to_stop.inc
+
+--let $srs_source_log_pos=query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Read_Source_Log_Pos, 1)
+--let $table_source_log_pos = `SELECT Master_log_pos FROM mysql.slave_master_info`
+--let $assert_cond= [ SELECT $srs_source_log_pos != $table_source_log_pos ]
+--let $assert_text= The repository position is not the one shown on show replica status
+--source include/assert.inc
+
+--let $srs_source_log_file = query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Source_Log_File, 1)
+--let $table_source_log_file = `SELECT Master_log_name FROM mysql.slave_master_info`
+--let $assert_cond= [ SELECT "$srs_source_log_file" != "$table_source_log_file" ]
+--let $assert_text= The repository file name is not the one shown on show replica status
+--source include/assert.inc
+
+--let $assert_cond= [ SELECT $table_source_log_pos = $table_source_log_pos_orig ]
+--let $assert_text= The repository pos value is still the same
+--source include/assert.inc
+
+--let $assert_cond= [ SELECT "$table_source_log_file" = "$table_source_log_file_orig" ]
+--let $assert_text= The repository name value is still the same
+--source include/assert.inc
+
+--echo #
+--echo # 6. Change a replication connection setting with CHANGE REPLICATION SOURCE
+--echo #    Check the repo now has the same value in relation to SHOW REPLICA STATUS
+
+--source include/stop_slave.inc
+
+CHANGE REPLICATION SOURCE TO SOURCE_CONNECT_RETRY = 10000;
+
+--let $srs_source_log_pos=query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Read_Source_Log_Pos, 1)
+--let $table_source_log_pos = `SELECT Master_log_pos FROM mysql.slave_master_info`
+--let $assert_cond= [ SELECT $srs_source_log_pos = $table_source_log_pos ]
+--let $assert_text= The repository now has the lastest position
+--source include/assert.inc
+
+--let $srs_source_log_file = query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Source_Log_File, 1)
+--let $table_source_log_file = `SELECT Master_log_name FROM mysql.slave_master_info`
+--let $assert_cond= [ SELECT "$srs_source_log_file" = "$table_source_log_file" ]
+--let $assert_text= The file name for the repository and the show replica status match
+--source include/assert.inc
+
+--echo #
+--echo # 7. Restart the replica server
+--echo #    Check the repo still shows the old values
+
+--source include/start_slave.inc
+
+--source include/rpl_connection_master.inc
+
+INSERT INTO t1 VALUES (4);
+
+--source include/sync_slave_sql_with_master.inc
+
+--let $table_source_log_pos_orig = `SELECT Master_log_pos FROM mysql.slave_master_info`
+--let $table_source_log_file_orig = `SELECT Master_log_name FROM mysql.slave_master_info`
+
+--let $srs_source_log_pos=query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Read_Source_Log_Pos, 1)
+--let $assert_cond= [ SELECT $srs_source_log_pos != $table_source_log_pos_orig ]
+--let $assert_text= The repository position is not the one shown on show replica status
+--source include/assert.inc
+
+--let $rpl_server_parameters= --skip_replica_start=FALSE
+--let $rpl_server_number = 2
+--source include/rpl_restart_server.inc
+
+--let $table_source_log_pos = `SELECT Master_log_pos FROM mysql.slave_master_info`
+--let $table_source_log_file = `SELECT Master_log_name FROM mysql.slave_master_info`
+
+--let $assert_cond= [ SELECT $table_source_log_pos_orig = $table_source_log_pos ]
+--let $assert_text= The repository pos value is still the same
+--source include/assert.inc
+
+--let $assert_cond= [ SELECT "$table_source_log_file" = "$table_source_log_file_orig" ]
+--let $assert_text= The repository name value is still the same
+
+--echo #
+--echo # 8. Add some values and check the repo is again stale
+--echo #    Execute a RESET REPLICA command
+--echo #    Check the repo persisted the reset position
+
+--source include/rpl_connection_master.inc
+
+INSERT INTO t1 VALUES (5);
+
+--source include/sync_slave_sql_with_master.inc
+
+--let $srs_source_log_pos=query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Read_Source_Log_Pos, 1)
+--let $table_source_log_pos = `SELECT Master_log_pos FROM mysql.slave_master_info`
+--let $assert_cond= [ SELECT $srs_source_log_pos != $table_source_log_pos ]
+--let $assert_text= The repository has not persisted
+--source include/assert.inc
+
+--source include/stop_slave.inc
+
+RESET REPLICA;
+
+--let $srs_source_log_pos=query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Read_Source_Log_Pos, 1)
+--let $table_source_log_pos = `SELECT Master_log_pos FROM mysql.slave_master_info`
+--let $assert_cond= [ SELECT $srs_source_log_pos = $table_source_log_pos ]
+--let $assert_text= The repository has the reset position
+--source include/assert.inc
+
+--let $assert_cond= [ SELECT $table_source_log_pos = 4 ]
+--let $assert_text= The repository has the reset position
+--source include/assert.inc
+
+--echo #
+--echo # 9. Check RESET REPLICA ALL removes all the information
+
+--source include/start_slave.inc
+
+--source include/rpl_connection_master.inc
+
+INSERT INTO t1 VALUES (6);
+
+--source include/sync_slave_sql_with_master.inc
+
+--let $table_source_log_pos = `SELECT Master_log_pos FROM mysql.slave_master_info`
+--let $assert_cond= [ SELECT $table_source_log_pos = 4 ]
+--let $assert_text= The repository still has the reset position
+--source include/assert.inc
+
+--source include/stop_slave.inc
+
+RESET REPLICA ALL;
+
+--let $assert_cond= COUNT(*) = 0 FROM mysql.slave_master_info
+--let $assert_text= The repository info was deleted
+--source include/assert.inc
+
+--echo #
+--echo # 10. Cleanup
+
+--replace_result $MASTER_MYPORT MASTER_PORT
+--eval CHANGE REPLICATION SOURCE TO SOURCE_HOST='127.0.0.1', SOURCE_PORT=$MASTER_MYPORT, SOURCE_USER='root'
+--source include/start_slave.inc
+
+--replace_result $sync_source_info_val SYNC_SOURCE_VAL
+--eval SET @@GLOBAL.sync_source_info=$sync_source_info_val
+
+--source include/rpl_connection_master.inc
+
+DROP TABLE t1;
+
+--source include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtid_only_relay_log_recovery.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtid_only_relay_log_recovery.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtid_only_relay_log_recovery.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtid_only_relay_log_recovery.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,101 @@
+# ==== Purpose ====
+#
+# This test validates that relay log recovery still works as expected for
+# channels that use GTID_ONLY and have outdated repository information.
+#
+# ==== Requirements ====
+#
+# R1. Relay log recovery works with GTID_ONLY = 1
+#
+# ==== Implementation ====
+#
+# 1. Make the channel use GTID_ONLY=1
+#    Create a table on the source and replicate it.
+#    Add some data making the binlog and relay rotate so the info on the repos is stale
+# 2. Restart the replica with relay log recovery
+#    Check that the replica wont replicate old transactions even if position are outdated
+# 3. Cleanup
+#
+# ==== References ====
+#
+# WL#7491: GTID-based replication applier recovery and positioning
+#
+
+--source include/have_binlog_format_row.inc
+--let $rpl_skip_start_slave= 1
+--source include/master-slave.inc
+
+--echo #
+--echo # 1. Make the channel use GTID_ONLY=1
+--echo #    Create a table on the source and replicate it.
+--echo #    Add some data making the binlog and relay rotate so the info on the repos is stale
+
+--source include/rpl_connection_slave.inc
+
+--source include/gtid_utils.inc
+
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 1, REQUIRE_ROW_FORMAT=1;
+
+--source include/start_slave.inc
+
+--source include/rpl_connection_master.inc
+
+CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY);
+
+--source include/sync_slave_sql_with_master.inc
+
+let $i=3;
+while($i)
+{
+  --source include/rpl_connection_master.inc
+
+   --eval INSERT INTO t1 VALUES ($i)
+
+   FLUSH LOGS;
+
+   --source include/sync_slave_sql_with_master.inc
+
+   --source include/stop_slave.inc
+
+   --source include/start_slave.inc
+
+  --dec $i
+}
+
+--echo #
+--echo # 2. Restart the replica with relay log recovery
+--echo #    Check that the replica wont replicate old transactions even if position are outdated
+
+--let $rpl_server_parameters= --skip_replica_start=FALSE --relay_log_recovery=1
+--let $rpl_server_number = 2
+--source include/rpl_restart_server.inc
+
+--source include/rpl_connection_master.inc
+
+INSERT INTO t1 VALUES(4);
+
+--source include/sync_slave_sql_with_master.inc
+
+--let $local_gtid_set= query_get_value(SHOW REPLICA STATUS, Retrieved_Gtid_Set, 1)
+
+--let $assert_text= Exactly 1 GTIDs should have been retrieved since last invocation
+--let $assert_cond= GTID_COUNT("$local_gtid_set") = 1
+--source include/assert.inc
+
+--echo #
+--echo # 3. Cleanup
+
+--source include/stop_slave.inc
+
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 0, REQUIRE_ROW_FORMAT=0;
+
+--source include/start_slave.inc
+
+CALL mtr.add_suppression("Recovery from master pos.* and file");
+--source include/gtid_utils_end.inc
+
+--source include/rpl_connection_master.inc
+
+DROP TABLE t1;
+
+--source include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtid_only_start_replica_after_clone.cnf mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtid_only_start_replica_after_clone.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtid_only_start_replica_after_clone.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtid_only_start_replica_after_clone.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,16 @@
+!include ../my.cnf
+
+# Set innodb-write-io-threads and innodb-read-io-threads to 2,
+# instead of the default value 4, so that the aio-max-nr limit
+# is not exceeded due to the increased number of concurrent mysqld
+# instances when MTR runs rpl tests with parallel 4 or more.
+
+[mysqld.1]
+
+[mysqld.2]
+
+[mysqld.3]
+
+[ENV]
+SERVER_MYPORT_3=		@mysqld.3.port
+SERVER_MYSOCK_3=		@mysqld.3.socket
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtid_only_start_replica_after_clone-master.opt mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtid_only_start_replica_after_clone-master.opt
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtid_only_start_replica_after_clone-master.opt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtid_only_start_replica_after_clone-master.opt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1 @@
+$CLONE_PLUGIN_OPT
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtid_only_start_replica_after_clone-slave.opt mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtid_only_start_replica_after_clone-slave.opt
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtid_only_start_replica_after_clone-slave.opt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtid_only_start_replica_after_clone-slave.opt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1 @@
+$CLONE_PLUGIN_OPT
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtid_only_start_replica_after_clone.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtid_only_start_replica_after_clone.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtid_only_start_replica_after_clone.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtid_only_start_replica_after_clone.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,72 @@
+# ==== Purpose ====
+#
+# The purpose of this script is to test that if correctly configured
+# we can clone a replica and it will start replicating on server start.
+# This is still true if the channel is configured with GTID_ONLY=1
+#
+# ==== Requirements ====
+#
+# R1. Cloning a server that has a channel with GTID_ONLY = 1 works correctly
+#
+# ==== Implementation ====
+#
+# 1.  Set up a replication connection from server 1 to server 2
+# 2.  Create a table for testing
+# 3.  Install clone on server 2
+#     Configure server 3 to invoke clone
+# 4.  Execute a transaction on server 1, check 3 received it
+# 4.1 Check that the replica only retrieves the missing transaction
+# 5.  Cleanup
+#
+# ==== References ====
+#
+# WL#7491: GTID-based replication applier recovery and positioning
+#
+
+--source include/have_binlog_format_row.inc
+--source include/have_mysqld_monitoring_process.inc
+--source include/have_clone_plugin.inc
+# Test requires master-info-repository=TABLE, relay-log-info-repository=TABLE
+--source include/have_slave_repository_type_table.inc
+--let $rpl_skip_start_slave= 1
+--source include/master-slave.inc
+
+
+# Configure the channel to use GTID_ONLY
+
+--source include/rpl_connection_slave.inc
+
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 1, REQUIRE_ROW_FORMAT=1;
+
+--source include/start_slave.inc
+
+--source include/rpl_connection_master.inc
+
+--source extra/rpl_tests/rpl_replica_start_after_clone.inc
+
+--echo #
+--echo # 4.1 Check that the replica only retrieves the missing transaction
+
+USE test;
+--source include/gtid_utils.inc
+
+--let $local_gtid_set= query_get_value(SHOW REPLICA STATUS, Retrieved_Gtid_Set, 1)
+--let $assert_text= Exactly 1 GTIDs should have been retrieved since last invocation
+--let $assert_cond= `SELECT GTID_COUNT("$local_gtid_set") = 1`
+--source include/assert.inc
+
+--source include/gtid_utils_end.inc
+
+# Cleanup
+
+--source extra/rpl_tests/rpl_replica_start_after_clone_cleanup.inc
+
+--source include/rpl_connection_slave.inc
+
+--source include/stop_slave.inc
+
+CHANGE REPLICATION SOURCE TO GTID_ONLY = 0, REQUIRE_ROW_FORMAT=0;
+
+--source include/start_slave.inc
+
+--source include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtid_parallel.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtid_parallel.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtid_parallel.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtid_parallel.test	2021-09-28 11:46:34.000000000 +0000
@@ -27,6 +27,7 @@
 # Implemented as part of WL#3584: Global Transaction Identifiers
 
 --source include/not_group_replication_plugin.inc
+--source include/not_rpl_gtid_only.inc
 --source include/big_test.inc
 --source include/not_windows.inc
 --source include/not_have_privilege_checks_user.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtid_purged_fail_to_connect.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtid_purged_fail_to_connect.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtid_purged_fail_to_connect.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtid_purged_fail_to_connect.test	2021-09-28 11:46:34.000000000 +0000
@@ -27,6 +27,7 @@
 #                GTID NOT LOGGED
 
 --source include/not_group_replication_plugin.inc
+--source include/not_rpl_gtid_only.inc
 --source include/have_debug.inc
 --let $rpl_gtid_utils= 1
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtid_replay_relaylog.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtid_replay_relaylog.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtid_replay_relaylog.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtid_replay_relaylog.test	2021-09-28 11:46:34.000000000 +0000
@@ -17,8 +17,6 @@
 #
 ############################################################################
 --source include/have_debug.inc
-# This test is not need against MTS setup
---source include/not_mts_replica_parallel_workers.inc
 --source include/have_binlog_format_statement.inc
 --source include/master-slave.inc
 
@@ -32,7 +30,7 @@
 # Step 1: Stop I/O thread after reading GTID_LOG_EVENT
 # This will leave the relaylog in incomplete state(i.e., it ends
 # with GTID_LOG_EVENT)
-SET GLOBAL DEBUG='d,stop_io_after_reading_gtid_log_event';
+SET GLOBAL DEBUG='+d,stop_io_after_reading_gtid_log_event';
 
 --source include/rpl_connection_master.inc
 INSERT INTO t1 VALUES (2);
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtid_skip_with_parser_error.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtid_skip_with_parser_error.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtid_skip_with_parser_error.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtid_skip_with_parser_error.test	2021-09-28 11:46:34.000000000 +0000
@@ -49,6 +49,7 @@
 --source include/have_binlog_format_mixed_or_row.inc
 --let $rpl_skip_start_slave = 1
 --source include/set_privilege_checks_user_as_system_user.inc
+--source include/not_rpl_gtid_only.inc
 --source include/master-slave.inc
 
 --let $MASTER_DATADIR= `select @@datadir`
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtids_table_disable_binlog_on_slave-slave.opt mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtids_table_disable_binlog_on_slave-slave.opt
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtids_table_disable_binlog_on_slave-slave.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtids_table_disable_binlog_on_slave-slave.opt	2021-09-28 11:46:34.000000000 +0000
@@ -1 +1,2 @@
 --disable-log-bin --log-replica-updates=false
+--replica-preserve-commit-order=OFF
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtids_table_disable_log_replica_updates.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtids_table_disable_log_replica_updates.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtids_table_disable_log_replica_updates.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtids_table_disable_log_replica_updates.test	2021-09-28 11:46:34.000000000 +0000
@@ -11,13 +11,17 @@
 --source include/force_myisam_default.inc
 --source include/have_myisam.inc
 --source include/not_group_replication_plugin.inc
+--source include/only_mts_replica_parallel_workers.inc
 --source include/have_debug.inc
 --source include/have_debug_sync.inc
 --let $rpl_gtid_utils= 1
 --source include/master-slave.inc
 
 --connection slave
-SET @@GLOBAL.DEBUG= '+d, dont_compress_gtid_table';
+
+--let $debug_point= dont_compress_gtid_table
+--source include/add_debug_point.inc
+
 --connection master
 
 --let $master_uuid= `SELECT @@GLOBAL.SERVER_UUID`
@@ -106,7 +110,10 @@
   --inc $i
 }
 COMMIT;
-SET GLOBAL DEBUG= @debug_save;
+
+--let $debug_point= dont_compress_gtid_table
+--source include/remove_debug_point.inc
+
 SET GLOBAL MAX_BINLOG_SIZE=@SIZE_DEFAULT;
 
 --replace_result $master_uuid MASTER_UUID
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtid_transaction_split_across_relay_logs.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtid_transaction_split_across_relay_logs.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtid_transaction_split_across_relay_logs.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtid_transaction_split_across_relay_logs.test	2021-09-28 11:46:34.000000000 +0000
@@ -25,6 +25,7 @@
 --source include/not_relay_log_info_file.inc
 --source include/force_myisam_default.inc
 --source include/have_myisam.inc
+--source include/not_rpl_gtid_only.inc
 
 # Disable auto position protocol
 --let use_gtids=0
@@ -46,7 +47,7 @@
 # Set simulation point to restart IO thread, so that the transaction
 #  is split across the relay logs.
 SET @saved_debug=@@GLOBAL.debug;
-SET GLOBAL debug="d,stop_io_after_reading_write_rows_log_event";
+SET GLOBAL debug="+d,stop_io_after_reading_write_rows_log_event";
 START SLAVE IO_THREAD;
 --source include/wait_for_slave_io_to_stop.inc
 SET GLOBAL debug=@saved_debug;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtid_truncate_memory_table_after_start_server.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtid_truncate_memory_table_after_start_server.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_gtid_truncate_memory_table_after_start_server.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_gtid_truncate_memory_table_after_start_server.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,246 @@
+################################################################################
+# BUG#21045848 XA+MEMORY TABLE: POST SERVER RESTART 'XA COMMIT'
+#              IS OVERRIDDEN BY 'TRUNCATE' CMD
+#
+# Memory table's data will be lost after server restarts. To keep the data
+# consistency between master and slave, it just binlogs
+# 'TRUNCATE TABLE `db`.`table_name`' when the memory table is locked first time.
+# So TRUNCATE statement could be binlogged in many statements.
+#
+# Because it was not handled correctly, it caused below problems:
+## - COM_FIELD_LIST
+#   it didn't flush binlog cache to binlog file. So the TRUNCATEs were not
+#   binlogged in COM_FIELD_LIST, it was binlogged with next statement together.
+#
+# - CREATE TABLE ... LIKE memory_table
+# - CREATE TABLE ... SELECT memory_table
+#   They were binlogged like:
+#   GTID_log_event | Anonymous_gtid_log_event
+#   TRUNCATE TABLE memory_table
+#   CREATE TABLE ... LIKE memory_table | CREATE TABLE ... SELECT memory_table
+#
+#   Both statements shared the same gtid event. That was not correct.
+#
+# - TRUNCATE was binlogged without BEGIN and COMMIT
+#   It caused some DML binlogged without BEGIN and COMMIT.  For example:
+#   INSERT INTO myisam_t1 SELECT * FROM memory_table
+#   it was binlogged as:
+#   GTID_log_event | Anonymous_gtid_log_event
+#   TRUNCATE TABLE memory_table
+#   INSERT INTO myisam_t1 SELECT * FROM memory_table
+#
+# The test cases verify above statements can binlog 'TRUNCATE' statement
+# correctly. A few extra test cases were added to verify some special
+# situations that updating or modifying a memory table.
+#
+# The test cases in this file will verify only when gtid mode is on.
+#
+# See rpl_no_gtid_truncate_memory_table_after_start_server.test for the tests with
+# gtid_mode=off.
+################################################################################
+--source include/not_group_replication_plugin.inc
+--source include/mysql_have_debug.inc
+
+--let $rpl_gtid_utils= 1
+--source include/master-slave.inc
+
+CALL mtr.add_suppression("Found 1 prepared XA transactions");
+CALL mtr.add_suppression("Statement is unsafe because it is being used inside a XA transaction");
+CALL mtr.add_suppression("Statement accesses nontransactional table as well as transactional or temporary table");
+CREATE DATABASE db1;
+CREATE DATABASE db2;
+CREATE TABLE t1(c1 INT);
+CREATE TABLE t2(c1 INT);
+CREATE TABLE mem_t1(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+CREATE TABLE mem_t2(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+CREATE TABLE db1.mem_t1(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+CREATE TABLE db1.mem_t2(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+CREATE TABLE db2.mem_t1(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+CREATE TABLE db2.mem_t2(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+CREATE TABLE db2.mem_t3(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+CREATE TABLE db2.mem_t4(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+CREATE TABLE db2.mem_t5(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+
+--delimiter |
+CREATE TRIGGER tr1 AFTER INSERT ON t2 FOR EACH ROW
+BEGIN
+  INSERT INTO t1 SELECT * FROM db2.mem_t3;
+END |
+--delimiter ;
+
+INSERT INTO mem_t1 VALUES(1),(2),(3);
+INSERT INTO mem_t2 VALUES(1),(2),(3);
+INSERT INTO db1.mem_t1 VALUES(1),(2),(3);
+INSERT INTO db1.mem_t2 VALUES(1),(2),(3);
+INSERT INTO db2.mem_t1 VALUES(1),(2),(3);
+INSERT INTO db2.mem_t2 VALUES(1),(2),(3);
+INSERT INTO db2.mem_t3 VALUES(1),(2),(3);
+INSERT INTO db2.mem_t4 VALUES(1),(2),(3);
+INSERT INTO db2.mem_t5 VALUES(1),(2),(3);
+
+--source include/sync_slave_sql_with_master.inc
+--source include/stop_slave_io.inc
+--source include/rpl_connection_master.inc
+
+XA START 'xa1';
+--disable_warnings
+INSERT INTO t1 VALUES(1);
+--enable_warnings
+XA END 'xa1';
+XA PREPARE 'xa1';
+--source include/save_master_pos.inc
+
+--let $rpl_server_number=1
+--source include/rpl_restart_server.inc
+
+--source include/rpl_connection_slave.inc
+--source include/start_slave_io.inc
+--source include/sync_slave_sql.inc
+
+--echo #
+--echo # Test case 1: verify XA COMMIT can be binlogged correctly.
+--echo #
+--source include/rpl_connection_master.inc
+--source include/gtid_step_reset.inc
+--source include/save_binlog_position.inc
+
+--exec echo "use test; XA COMMIT 'xa1';" > $MYSQLTEST_VARDIR/tmp/my.sql
+
+# When build-completion-hash is on, mysql client will fetch table name
+# and field name from mysql server automatically just after connecting
+# to the server correctly. it fetches the field by using COM_FIELD_LIST
+# which is expected by this test.
+--exec $MYSQL --build-completion-hash  < $MYSQLTEST_VARDIR/tmp/my.sql 2>&1
+--remove_file $MYSQLTEST_VARDIR/tmp/my.sql
+
+--let $gtid_step_count= 3
+--source include/gtid_step_assert.inc
+
+--let $limit= 0,4
+--let $event_sequence= #Gtid # !Q(TRUNCATE.*) #Gtid # !Q(TRUNCATE.*)
+--source include/assert_binlog_events.inc
+
+--source include/sync_slave_sql_with_master.inc
+--let $rpl_diff_statement= SELECT * FROM t1
+--source include/rpl_diff.inc
+
+--echo #
+--echo # Test case 2: verify COM_FIELD_LIST can binlog TRUNCATE TABLE mem_xx
+--echo #              correctly
+--echo #
+--source include/rpl_connection_master.inc
+--source include/gtid_step_reset.inc
+
+--exec echo "use db1;" > $MYSQLTEST_VARDIR/tmp/my.sql
+--exec $MYSQL --build-completion-hash  < $MYSQLTEST_VARDIR/tmp/my.sql 2>&1
+--remove_file $MYSQLTEST_VARDIR/tmp/my.sql
+
+--let $gtid_step_count= 2
+--source include/gtid_step_assert.inc
+
+--source include/sync_slave_sql_with_master.inc
+# TRUNCATE TABLE mem_xx have been applied the tables should be empty.
+SELECT * FROM mem_t1;
+SELECT * FROM mem_t2;
+
+--echo #
+--echo # Test case 3: verify TRUNCATE TABLE mem_xx can be binlogged correctly
+--echo #              in CREATE TABLE ... LIKE
+--source include/rpl_connection_master.inc
+--source include/gtid_step_reset.inc
+--source include/save_binlog_position.inc
+
+CREATE TABLE t3 LIKE db2.mem_t1;
+
+--let $gtid_step_count= 2
+--source include/gtid_step_assert.inc
+
+--let $limit= 0,4
+--let $event_sequence= #Gtid # !Q(TRUNCATE.*) #Gtid # !Q(CREATE.*)
+--source include/assert_binlog_events.inc
+
+--source include/sync_slave_sql_with_master.inc
+# TRUNCATE TABLE mem_xx have been applied the tables should be empty.
+SELECT * FROM db2.mem_t1;
+
+--echo #
+--echo # Test case 4: verify TRUNCATE TABLE mem_xx can be binlogged correctly
+--echo #              in DML
+--source include/rpl_connection_master.inc
+--source include/gtid_step_reset.inc
+--source include/save_binlog_position.inc
+
+# mem_t3 is empty, the UNION makes sure that a row event is binlogged.
+INSERT INTO t3 SELECT * FROM db2.mem_t2 UNION SELECT 10;
+
+--let $gtid_step_count= 2
+--source include/gtid_step_assert.inc
+
+--let $limit= 0,7
+--let $event_sequence= #Gtid # !Q(TRUNCATE.*) #Gtid # !Begin # !Insert # !Commit
+--source include/assert_binlog_events.inc
+--source include/save_binlog_position.inc
+
+--source include/sync_slave_sql_with_master.inc
+# TRUNCATE TABLE mem_xx have been applied the tables should be empty.
+SELECT * FROM db2.mem_t2;
+
+--echo #
+--echo # Test case 5: verify TRUNCATE TABLE mem_xx can be binlogged correctly
+--echo #              in a trigger
+
+--source include/rpl_connection_master.inc
+--source include/gtid_step_reset.inc
+--source include/save_binlog_position.inc
+
+INSERT INTO t2 VALUES(11);
+
+--let $gtid_step_count= 2
+--source include/gtid_step_assert.inc
+
+--let $limit= 0,4
+--let $event_sequence= #Gtid # !Q(TRUNCATE.*) #Gtid # !Begin
+
+--source include/assert_binlog_events.inc
+
+--source include/sync_slave_sql_with_master.inc
+# TRUNCATE TABLE mem_xx have been applied the tables should be empty.
+SELECT * FROM db2.mem_t3;
+
+--echo #
+--echo # Test case 6: Verify TRUNCATE TABLE mem_xx can be binlog correctly
+--echo #              when ALTER the memory table.
+--source include/rpl_connection_master.inc
+--source include/gtid_step_reset.inc
+--source include/save_binlog_position.inc
+
+ALTER TABLE db2.mem_t4 ADD COLUMN c2 INT;
+
+--let $gtid_step_count= 2
+--source include/gtid_step_assert.inc
+
+--let $limit= 0,4
+--let $event_sequence= #Gtid # !Q(TRUNCATE.*) #Gtid # !Q(ALTER.*)
+--source include/assert_binlog_events.inc
+
+--source include/sync_slave_sql_with_master.inc
+# TRUNCATE TABLE mem_xx have been applied the tables should be empty.
+SELECT * FROM db2.mem_t4;
+
+--echo #
+--echo # Test case 7: Verify TRUNCATE TABLE mem_xx can be binlog correctly
+--echo #              when DROP the memory table.
+--source include/rpl_connection_master.inc
+--source include/gtid_step_reset.inc
+DROP TABLE db2.mem_t5;
+
+--let $gtid_step_count= 1
+--source include/gtid_step_assert.inc
+--source include/sync_slave_sql_with_master.inc
+
+--source include/rpl_connection_master.inc
+DROP TABLE t1, t2, t3, mem_t1, mem_t2;
+DROP DATABASE db1;
+DROP DATABASE db2;
+
+--source include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_invalid_position_with_gtid_only.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_invalid_position_with_gtid_only.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_invalid_position_with_gtid_only.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_invalid_position_with_gtid_only.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,176 @@
+# ==== Purpose ====
+#
+# This test validates that when positions are invalid they are reported as such
+#
+# ==== Requirements ====
+#
+# R1. Verify that  positions as shown as invalid in `SHOW REPLICA STATUS`
+#
+# ==== Implementation ====
+#
+# 1. Setup:
+#     Start the replica channel with GTID_ONLY=1
+#     Add some info in the source and replicate it
+#     Restart the replica but don't start replication
+# 2 Assert all invalid positions in SHOW REPLICA STATUS are shown as such
+# 3 Start the replica IO thread.
+#   Check receiver positions are now valid
+# 4 Start the replica SQL thread and replicate a transaction
+#   Check applier positions in relation to the source are now valid
+# 5 Check the starting SQL thread message reports invalid positions
+# 6 Cleanup
+#
+# ==== References ====
+#
+# WL#7491: GTID-based replication applier recovery and positioning
+#
+
+--source include/have_binlog_format_row.inc
+--let $rpl_skip_start_slave= 1
+--source include/master-slave.inc
+
+--echo #
+--echo # 1. Setup:
+--echo #     Start the replica channel with GTID_ONLY=1
+--echo #     Add some data in the source and replicate it
+--echo #     Restart the replica but don't start replication
+
+--source include/rpl_connection_slave.inc
+
+# Reduce this to a minimum
+--let $replica_checkpoint_period_value = `SELECT @@global.replica_checkpoint_period`
+SET @@GLOBAL.replica_checkpoint_period= 1;
+
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 1, GTID_ONLY = 1;
+
+--source include/start_slave.inc
+
+--let $assert_text= 'GTID_ONLY is enabled'
+--let $assert_cond= [SELECT GTID_ONLY FROM performance_schema.replication_connection_configuration, GTID_ONLY, 1] = 1
+--source include/assert.inc
+
+--source include/rpl_connection_master.inc
+
+CREATE TABLE t(s INT);
+INSERT INTO t VALUES(1);
+
+--source include/sync_slave_sql_with_master.inc
+
+--let $source_log_file_orig=query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Source_Log_File, 1)
+--let $source_log_pos_orig=query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Read_Source_Log_Pos, 1)
+
+--let $rpl_server_number = 2
+--let $rpl_server_parameters = --skip_slave_start
+--let $explicit_default_wait_counter = 15000
+--source include/rpl_restart_server.inc
+
+--echo #
+--echo # 2 Assert all invalid positions in SHOW REPLICA STATUS are shown as such
+
+--let $source_log_file=query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Source_Log_File, 1)
+--let $assert_cond= [ SELECT "$source_log_file" = "INVALID" ]
+--let $assert_text= The source log file name is invalid
+--source include/assert.inc
+
+--let $source_log_pos=query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Read_Source_Log_Pos, 1)
+--let $assert_cond= [ SELECT "$source_log_pos" = "0" ]
+--let $assert_text= The source log file position is 0
+--source include/assert.inc
+
+--let $applier_source_log_file=query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Relay_Source_Log_File, 1)
+--let $assert_cond= [ SELECT "$applier_source_log_file" = "INVALID" ]
+--let $assert_text= The source log file name in the applier is invalid
+--source include/assert.inc
+
+--let $applier_source_log_pos=query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Exec_Source_Log_Pos, 1)
+--let $assert_cond= [ SELECT "$applier_source_log_pos" = "0" ]
+--let $assert_text= The source log file position in the applier is 0
+--source include/assert.inc
+
+--echo #
+--echo # 3 Start the replica IO thread.
+--echo #   Check receiver positions are now valid
+
+--source include/start_slave_io.inc
+
+--let $show_statement= SHOW REPLICA STATUS FOR CHANNEL ''
+--let $field= Source_Log_File
+--let $condition= != 'INVALID'
+--source include/wait_show_condition.inc
+
+--let $source_log_file=query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Source_Log_File, 1)
+--let $assert_cond= [ SELECT "$source_log_file" = "$source_log_file_orig" ]
+--let $assert_text= The source log file name is back to the previous value
+--source include/assert.inc
+
+--let $source_log_pos=query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Read_Source_Log_Pos, 1)
+--let $assert_cond= [ SELECT "$source_log_pos" = "$source_log_pos_orig" ]
+--let $assert_text= The source log file is back to the previous position
+--source include/assert.inc
+
+--echo #
+--echo # 4 Start the replica SQL thread and replicate a transaction
+--echo #   Check applier positions in relation to the source are now valid
+
+# Reduce this to a minimum again after the restart
+SET @@GLOBAL.replica_checkpoint_period= 1;
+
+--source include/start_slave_sql.inc
+
+--source include/rpl_connection_master.inc
+
+# In truth a simple rotate or already skipped transaction in the relay log
+# turns the positions valid again.
+INSERT INTO t VALUES(2);
+
+--source include/sync_slave_sql_with_master.inc
+
+--source include/rpl_connection_master.inc
+
+--let $log_file_on_source=query_get_value(SHOW MASTER STATUS, File, 1)
+--let $log_pos_on_source=query_get_value(SHOW MASTER STATUS, Position, 1)
+
+--source include/rpl_connection_slave.inc
+
+# Relay log is only updated on checkpoint points
+--let $show_statement= SHOW REPLICA STATUS FOR CHANNEL ''
+--let $field= Relay_Source_Log_File
+--let $condition= != 'INVALID'
+--source include/wait_show_condition.inc
+
+--let $applier_source_log_file=query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Relay_Source_Log_File, 1)
+--let $assert_cond= [ SELECT "$applier_source_log_file" = "$log_file_on_source" ]
+--let $assert_text= The source log file name for the applier is the one used on the source
+--source include/assert.inc
+
+--let $applier_source_log_pos=query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Exec_Source_Log_Pos, 1)
+--let $assert_cond= [ SELECT "$applier_source_log_pos" = "$log_pos_on_source" ]
+--let $assert_text= The source log file position in the applier is last applied on the source
+--source include/assert.inc
+
+--echo #
+--echo # 5 Check the starting SQL thread message reports invalid positions
+
+--let $assert_file= $MYSQLTEST_VARDIR/log/mysqld.2.err
+--let $assert_select= Slave SQL thread for channel '' initialized, starting replication in log 'INVALID' at position 0, relay log *
+--let $assert_count= 1
+--let $assert_text= The SQL thread start will report the information in relation to the source as invalid
+--source include/assert_grep.inc
+
+--echo #
+--echo # 6 Cleanup
+
+--replace_result $replica_checkpoint_period_value REPLICA_CHECKPOINT_PERIOD
+--eval SET @@GLOBAL.replica_checkpoint_period= $replica_checkpoint_period_value
+
+--source include/stop_slave.inc
+
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 0, GTID_ONLY = 0;
+
+--source include/start_slave.inc
+
+--source include/rpl_connection_master.inc
+
+DROP TABLE t;
+
+--source include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_log_info_repository_persistence_gtid_only.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_log_info_repository_persistence_gtid_only.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_log_info_repository_persistence_gtid_only.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_log_info_repository_persistence_gtid_only.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,251 @@
+# ==== Purpose ====
+#
+# This test checks that the replica parameter GTID_ONLY is persisted
+# and also upgraded correctly using either TABLE or FILE repository types.
+#
+# ==== Requirements ====
+#
+# TC1: Verify that the column is added when doing an upgrade
+# TC2: Verify that the column value is 0 for standard channels.
+# TC3: Verify that the column value is 1 for group replication channels.
+# TC4: Verify that TC1 to TC3 is true when upgrading the server version with Table repositories
+# TC5: Verify that TC1 is true when upgrading the server version with File repositories
+# TC6: Verify that TC1 is true when upgrading the server version and at the same time converting repository type from File to Table
+# TC7: Verify that TC1 is true when upgrading the server version and at the same time converting repository type from Table to File
+# TC8: Verify that the column definition is literally identical after an upgrade, compared to a new bootstrapped server.
+#
+# ==== Implementation ====
+#
+# 1. Basic operations with GTID_ONLY
+#
+# 1.1. Check that GTID_ONLY is 0 by default
+#      Check the performance_schema table and file repository are correct
+# 1.2. Set GTID_ONLY to 1
+#      Check the performance_schema table and file repository are correct
+#
+# 2. File to File upgrades
+#
+# 2.1 Upgrade the server while using File repositories
+#     Start the server using a file repository that has no GTID_ONLY
+#     The starting value should be 0 in the file / PFS table
+# 2.2 Check FILE repository corruptions
+#
+# 3. File to Table upgrades
+#
+# 3.1 Upgrade the server to Table repositories from File repositories
+#     Start the server using a file repository that has no GTID_ONLY
+# 3.2 Check the table definiton is the same as when the server was bootstraped
+#
+# 4. Table to Table upgrades
+#
+# 4.1 Upgrade the server while using Table repositories
+#     Have 2 channels:
+#       1. The default channel
+#       2. A group_replication channel (group_replication_recovery)
+#     GTID_ONLY is set to 0 for the default channel, 1 for the group replication one
+#
+# 5. Table to File upgrades
+#
+# 5.1 Upgrade the server to File repositories from Table repositories
+#     Start the server using a file repository that has no GTID_ONLY
+#
+# 6. Cleanup
+#
+# ==== References ====
+#
+# WL#7491: GTID-based replication applier recovery and positioning
+#
+
+--source include/big_test.inc
+--source include/have_binlog_format_row.inc
+--source include/have_slave_repository_type_table.inc
+--source include/skip_config_rpl_gtid_only.inc
+--source include/master-slave.inc
+
+--echo
+--echo # 0.Create a test auxiliary include file to avoid step repetition.
+--echo
+# The purpose of this is to verify the values of GTID_ONLY in the
+# master_info repository and replication_connection_configuration table.
+# This procedure expects the value for
+#
+#  $repo_info_file_path: the master info file name to check
+#
+#  $gtid_only_expected_value: the value for GTID_ONLY the file should contain
+#
+#  $expected_repo_number_lines: the number of lines expected for the repository
+#
+
+--source include/rpl_connection_slave.inc
+
+--write_file $MYSQL_TMP_DIR/check_gtid_only_in_file_repo.inc END_OF_PROCEDURE
+
+  if ($repo_info_file_path == '')
+  {
+    --die !!!ERROR IN TEST: you must set $repo_info_file_path
+  }
+  if ($gtid_only_expected_value == '')
+  {
+    --die !!!ERROR IN TEST: you must set $gtid_only_expected_value
+  }
+
+  --let $count = `SELECT COUNT(*) FROM performance_schema.replication_connection_configuration WHERE Gtid_only = '$gtid_only_expected_value'`
+  --let $assert_text = GTID_ONLY for default channel "" in performance_schema.replication_connection_configuration is $gtid_only_expected_value
+  --let $assert_cond = $count = 1
+  --source include/assert.inc
+
+  CREATE TABLE master_info_file_content (line_content TEXT);
+  --replace_result $repo_info_file_path REPO_FILENAME
+  --eval LOAD DATA INFILE '$repo_info_file_path' INTO TABLE master_info_file_content
+
+  --let $expected_value = `SELECT COUNT(*) FROM master_info_file_content`
+  --let $assert_text = The table should have $expected_repo_number_lines lines
+  --let $assert_cond = $expected_repo_number_lines = $expected_value
+  --source include/assert.inc
+
+  --let $expected_value = `SELECT * FROM master_info_file_content LIMIT 32,33`
+  --let $assert_text = In the file the field is set to $gtid_only_expected_value
+  --let $assert_cond = $gtid_only_expected_value = $expected_value
+  --source include/assert.inc
+  DROP TABLE master_info_file_content;
+
+END_OF_PROCEDURE
+
+# Extract some info the repository table before converting it to a table
+
+--let $expected_repo_number_lines = `SELECT Number_of_lines FROM mysql.slave_master_info`
+
+--let $original_repo_table_definition = `SHOW CREATE TABLE mysql.slave_master_info`
+
+--let $rpl_server_number = 2
+--let $rpl_server_parameters = --master-info-repository=FILE
+--let $explicit_default_counter = 15000
+--source include/rpl_restart_server.inc
+
+--let $repo_info_file_path= query_get_value(SHOW SLAVE STATUS, Master_Info_File, 1)
+
+--echo
+--echo # 1.1. Check that by default GTID_ONLY is 0
+--echo #      Check the performance_schema table and file repository are correct
+
+--let $gtid_only_expected_value = 0
+--source $MYSQL_TMP_DIR/check_gtid_only_in_file_repo.inc
+
+--echo
+--echo # 1.2. Set GTID_ONLY to 1
+--echo #      Check the performance_schema table and file repository are correct
+
+--source include/stop_slave.inc
+
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 1, SOURCE_AUTO_POSITION = 1, GTID_ONLY = 1;
+
+--let $gtid_only_expected_value = 1
+--source $MYSQL_TMP_DIR/check_gtid_only_in_file_repo.inc
+
+# Disable GTID_ONLY as all the repo conversions below assume GTID_ONLY being off
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 1, SOURCE_AUTO_POSITION = 1, GTID_ONLY = 0;
+
+ # 2. File to File upgrades
+
+--echo
+--echo # 2.1 Upgrade the server while using File repositories
+--echo #     Start the server using a file repository that has no GTID_ONLY
+--echo #     The starting value should be 0 in the file / table
+
+--let $sub_testcase = no_gtid_only
+--let $rpl_server_restart_parameters = --skip_slave_start --master-info-repository=FILE
+--let $slave_server_num = 2
+--source extra/rpl_tests/restart_slave_with_custom_connection_info_repo_file.inc
+
+--let $gtid_only_expected_value = 0
+--source $MYSQL_TMP_DIR/check_gtid_only_in_file_repo.inc
+
+# 3. File to Table upgrades
+
+--echo
+--echo # 3.1 Upgrade the server to Table repositories from File repositories
+--echo #     Start the server using a file repository that has no GTID_ONLY
+
+--let $lines_after_drop = `SELECT $expected_repo_number_lines -1`
+
+ALTER TABLE mysql.slave_master_info DROP COLUMN Gtid_only;
+--eval UPDATE mysql.slave_master_info SET Number_of_lines = $lines_after_drop
+
+--let $sub_testcase = no_gtid_only
+--let $rpl_server_restart_parameters = --skip_slave_start --master-info-repository=TABLE --upgrade=FORCE
+--let $slave_server_num = 2
+--source extra/rpl_tests/restart_slave_with_custom_connection_info_repo_file.inc
+
+--let $assert_text= 'GTID_ONLY is disabled'
+--let $assert_cond= [SELECT GTID_ONLY FROM performance_schema.replication_connection_configuration, GTID_ONLY, 1] = 0
+--source include/assert.inc
+
+--echo
+--echo # 3.2 Check the table definiton is the same as when the server was bootstraped
+--echo #
+
+--let $upgraded_repo_table_definition = `SHOW CREATE TABLE mysql.slave_master_info`
+--let $table_compare_result = `SELECT "$upgraded_repo_table_definition" = "$original_repo_table_definition"`
+
+--let $assert_text = The table definition should be equal on install and upgrades
+--let $assert_cond = $table_compare_result = 1
+--source include/assert.inc
+
+# 4. Table to Table upgrades
+
+--echo
+--echo # 4.1 Upgrade the server while using Table repositories
+--echo #     Have 2 channels:
+--echo #       1. The default channel
+--echo #       2. A group_replication channel (group_replication_recovery)
+--echo #     GTID_ONLY is set to 0 for the default channel, 1 for the group replication one
+
+--disable_warnings
+CHANGE REPLICATION SOURCE TO SOURCE_USER="root" FOR CHANNEL "group_replication_recovery";
+--enable_warnings
+CHANGE REPLICATION SOURCE TO SOURCE_HOST="localhost", SOURCE_PORT=12, PRIVILEGE_CHECKS_USER = 'root'@'localhost' FOR CHANNEL "";
+
+# Revert the table to 32 lines (pre upgrade)
+ALTER TABLE mysql.slave_master_info DROP COLUMN Gtid_only;
+--eval UPDATE mysql.slave_master_info SET Number_of_lines = $lines_after_drop
+
+--let $rpl_server_number = 2
+--let $rpl_server_parameters = --skip_slave_start --master-info-repository=TABLE --upgrade=FORCE
+--let $explicit_default_counter = 15000
+--source include/rpl_restart_server.inc
+
+# We cannot use performance schema to check this table
+--let $assert_text= 'GTID_ONLY is enabled for group replication'
+--let $assert_cond= [SELECT GTID_ONLY FROM mysql.slave_master_info where channel_name="group_replication_recovery", GTID_ONLY, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'GTID_ONLY is disabled for the default channel'
+--let $assert_cond= [SELECT GTID_ONLY FROM performance_schema.replication_connection_configuration where channel_name="", GTID_ONLY, 1] = 0
+--source include/assert.inc
+
+RESET REPLICA ALL FOR CHANNEL "group_replication_recovery";
+
+# 5. Table to File upgrades
+
+--echo
+--echo # 5.1 Upgrade the server to File repositories from Table repositories
+--echo #     Start the server using a file repository that has no GTID_ONLY
+
+# Revert the table to 32 lines (pre upgrade)
+ALTER TABLE mysql.slave_master_info DROP COLUMN Gtid_only;
+--eval UPDATE mysql.slave_master_info SET Number_of_lines = $lines_after_drop
+
+--let $rpl_server_number = 2
+--let $rpl_server_parameters = --skip_slave_start --master-info-repository=FILE --upgrade=FORCE
+--source include/rpl_restart_server.inc
+
+--let $gtid_only_expected_value = 0
+--source $MYSQL_TMP_DIR/check_gtid_only_in_file_repo.inc
+
+--echo
+--echo # Cleanup
+
+--remove_file $MYSQL_TMP_DIR/check_gtid_only_in_file_repo.inc
+
+--let $rpl_skip_sync= 1
+--source include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_master_errors.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_master_errors.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_master_errors.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_master_errors.test	2021-09-28 11:46:34.000000000 +0000
@@ -2,6 +2,7 @@
 # It tests the cases where the dump thread returns an error to the client.
 ################################################################################
 --source include/not_group_replication_plugin.inc
+--source include/not_rpl_gtid_only.inc
 --source include/have_debug.inc
 --source include/master-slave.inc
 
@@ -22,8 +23,9 @@
 --echo #
 --echo # Error: master doesn't set server_id
 --echo #
---let $master_debug= `SELECT @@GLOBAL.debug`
-SET GLOBAL debug= 'd,simulate_no_server_id';
+
+--let $debug_point= simulate_no_server_id
+--source include/add_debug_point.inc
 
 --error 1
 --exec $MYSQL_BINLOG -r $MYSQLTEST_VARDIR/tmp/output --read-from-remote-server not-exist.000001
@@ -31,12 +33,17 @@
 --echo #
 --echo # Error: Error while sending faked rotate event
 --echo #
-SET GLOBAL debug= 'd,simulate_send_error';
+
+--let $debug_point= simulate_send_error
+--source include/add_debug_point.inc
 
 --error 1
 --exec $MYSQL_BINLOG -r $MYSQLTEST_VARDIR/tmp/output --read-from-remote-server master-bin.000001
 
-eval SET GLOBAL debug= '$master_debug';
+--let $debug_point= simulate_no_server_id
+--source include/remove_debug_point.inc
+--let $debug_point= simulate_send_error
+--source include/remove_debug_point.inc
 
 --echo #
 --echo # Error: Fail to open binlog file
@@ -84,15 +91,17 @@
 --source include/rpl_connection_slave.inc
 --let $slave_io_errno= convert_error(ER_SERVER_MASTER_FATAL_ERROR_READING_BINLOG)
 --source include/stop_slave.inc
---let $slave_debug= `SELECT @@debug`
-SET GLOBAL debug= 'd,request_source_log_pos_3';
+
+--let $debug_point= request_source_log_pos_3
+--source include/add_debug_point.inc
 
 START SLAVE IO_THREAD;
 --let $slave_io_errno= 13114
 call mtr.add_suppression(".* Got fatal error 1236 from master when reading data from binary log");
 --source include/wait_for_slave_io_error.inc
 
-SET GLOBAL debug= '$slave_debug';
+--let $debug_point= request_source_log_pos_3
+--source include/remove_debug_point.inc
 
 --echo #
 --echo # Error: Binary log is not open on master
@@ -127,7 +136,8 @@
 RESET MASTER;
 CREATE TABLE t1(c1 INT);
 
-SET GLOBAL debug= 'd,simulate_kill_dump';
+--let $debug_point= simulate_kill_dump
+--source include/add_debug_point.inc
 
 # 'stop-never' will cause test timeout if 'kill dump thread' doesn't work well.
 --exec $MYSQL_BINLOG -r $MYSQLTEST_VARDIR/tmp/output --read-from-remote-server master-bin.000001 --stop-never
@@ -138,12 +148,17 @@
 --let $exclude_gtids= `SELECT @@GLOBAL.gtid_executed`
 INSERT INTO t1 VALUES(1);
 
-SET GLOBAL debug= 'd,simulate_flush_error';
+--let $debug_point= simulate_flush_error
+--source include/add_debug_point.inc
 
 --error 1
 --exec $MYSQL_BINLOG -r $MYSQLTEST_VARDIR/tmp/output --read-from-remote-source=BINLOG-DUMP-GTIDS --exclude-gtids=$exclude_gtids master-bin.000001
 
-eval SET GLOBAL debug= '$master_debug';
+--let $debug_point= simulate_kill_dump
+--source include/remove_debug_point.inc
+--let $debug_point= simulate_flush_error
+--source include/remove_debug_point.inc
+
 # Cleanup
 DROP TABLE t1;
 --remove_file $MYSQLTEST_VARDIR/tmp/output
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_mts_execute_partial_trx_with_auto_pos_off.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_mts_execute_partial_trx_with_auto_pos_off.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_mts_execute_partial_trx_with_auto_pos_off.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_mts_execute_partial_trx_with_auto_pos_off.test	2021-09-28 11:46:34.000000000 +0000
@@ -15,6 +15,7 @@
 --source include/not_binlog_transaction_compression_on.inc
 
 --source include/not_group_replication_plugin.inc
+--source include/not_rpl_gtid_only.inc
 --source include/have_binlog_format_row.inc
 --source include/have_debug.inc
 --source include/have_debug_sync.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_mts_gtids_restart_slave_io_lost_trx.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_mts_gtids_restart_slave_io_lost_trx.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_mts_gtids_restart_slave_io_lost_trx.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_mts_gtids_restart_slave_io_lost_trx.test	2021-09-28 11:46:34.000000000 +0000
@@ -10,5 +10,6 @@
 # using MTS slave configuration.
 #
 
+--source include/only_mts_replica_parallel_workers.inc
 --let $using_mts= 1
 --source extra/rpl_tests/rpl_gtids_restart_slave_io_lost_trx.test
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_mts_replica_preserve_commit_order_optimize_table_nobinlog-slave.opt mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_mts_replica_preserve_commit_order_optimize_table_nobinlog-slave.opt
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_mts_replica_preserve_commit_order_optimize_table_nobinlog-slave.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_mts_replica_preserve_commit_order_optimize_table_nobinlog-slave.opt	2021-09-28 11:46:34.000000000 +0000
@@ -1,3 +1,3 @@
---replica-parallel-workers=6 --replica-parallel-type='LOGICAL_CLOCK'
---replica-preserve-commit-order=1 --binlog_transaction_dependency_tracking='COMMIT_ORDER'
+--replica-parallel-workers=6
+--binlog_transaction_dependency_tracking='COMMIT_ORDER'
 --skip-log-bin --log-replica-updates=0
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_mts_replica_preserve_commit_order_optimize_table_nobinlog.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_mts_replica_preserve_commit_order_optimize_table_nobinlog.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_mts_replica_preserve_commit_order_optimize_table_nobinlog.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_mts_replica_preserve_commit_order_optimize_table_nobinlog.test	2021-09-28 11:46:34.000000000 +0000
@@ -32,7 +32,7 @@
 
 --source include/have_debug.inc
 --source include/have_debug_sync.inc
-
+--source include/only_mts_replica_parallel_workers.inc
 --let $rpl_gtid_utils = 1
 --let $rpl_skip_start_slave = 1
 --source include/master-slave.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_mts_spco_check_worker_states_binlog-slave.opt mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_mts_spco_check_worker_states_binlog-slave.opt
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_mts_spco_check_worker_states_binlog-slave.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_mts_spco_check_worker_states_binlog-slave.opt	2021-09-28 11:46:34.000000000 +0000
@@ -1,4 +1,2 @@
 --replica-parallel-workers=5
---replica-parallel-type=LOGICAL_CLOCK
---replica-preserve-commit-order=ON
 --replica-transaction-retries=10
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_mts_spco_check_worker_states_binlog.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_mts_spco_check_worker_states_binlog.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_mts_spco_check_worker_states_binlog.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_mts_spco_check_worker_states_binlog.test	2021-09-28 11:46:34.000000000 +0000
@@ -4,5 +4,6 @@
 --source include/big_test.inc
 --source include/have_debug.inc
 --source include/have_debug_sync.inc
-
+--source include/only_mts_replica_parallel_type_logical_clock.inc
+--source include/only_replica_preserve_commit_order.inc
 --source extra/rpl_tests/rpl_mts_spco_check_worker_states.test
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_mts_spco_check_worker_states_nobinlog-slave.opt mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_mts_spco_check_worker_states_nobinlog-slave.opt
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_mts_spco_check_worker_states_nobinlog-slave.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_mts_spco_check_worker_states_nobinlog-slave.opt	2021-09-28 11:46:34.000000000 +0000
@@ -1,6 +1,4 @@
 --replica-parallel-workers=5
---replica-parallel-type=LOGICAL_CLOCK
---replica-preserve-commit-order=ON
 --disable-log-bin
 --disable-log-replica-updates
 --replica-transaction-retries=10
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_mts_spco_check_worker_states_nobinlog.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_mts_spco_check_worker_states_nobinlog.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_mts_spco_check_worker_states_nobinlog.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_mts_spco_check_worker_states_nobinlog.test	2021-09-28 11:46:34.000000000 +0000
@@ -4,5 +4,6 @@
 --source include/big_test.inc
 --source include/have_debug.inc
 --source include/have_debug_sync.inc
-
+--source include/only_mts_replica_parallel_type_logical_clock.inc
+--source include/only_replica_preserve_commit_order.inc
 --source extra/rpl_tests/rpl_mts_spco_check_worker_states.test
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_mts_until.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_mts_until.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_mts_until.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_mts_until.test	2021-09-28 11:46:34.000000000 +0000
@@ -7,6 +7,8 @@
 ################################################################################
 --source include/have_debug.inc
 --source include/have_binlog_format_row.inc
+--source include/only_mts_replica_parallel_workers.inc
+--source include/only_mts_replica_parallel_type_logical_clock.inc
 --source include/set_privilege_checks_user_as_system_user.inc
 --source include/master-slave.inc
 
@@ -26,6 +28,7 @@
 --source include/stop_slave_sql.inc
 SET @saved_replica_parallel_type = @@GLOBAL.replica_parallel_type;
 SET @saved_replica_parallel_workers = @@GLOBAL.replica_parallel_workers;
+SET @saved_replica_preserve_commit_order = @@GLOBAL.replica_preserve_commit_order;
 SET @saved_innodb_lock_wait_timeout = @@GLOBAL.innodb_lock_wait_timeout;
 SET @saved_relay_log_purge = @@GLOBAL.relay_log_purge;
 
@@ -35,6 +38,7 @@
 
 SET GLOBAL replica_parallel_type = "LOGICAL_CLOCK";
 SET GLOBAL replica_parallel_workers = 4;
+SET GLOBAL replica_preserve_commit_order=0;
 
 --let $until_type= SOURCE_POS
 --source extra/rpl_tests/rpl_mts_until.inc
@@ -75,6 +79,7 @@
 --source include/stop_slave_sql.inc
 SET GLOBAL replica_parallel_type = @saved_replica_parallel_type;
 SET GLOBAL replica_parallel_workers = @saved_replica_parallel_workers;
+SET GLOBAL replica_preserve_commit_order= @saved_replica_preserve_commit_order;
 # Set it a long time to guarantee it doens't report an timeout error
 SET GLOBAL innodb_lock_wait_timeout = @saved_innodb_lock_wait_timeout;
 SET GLOBAL relay_log_purge = @saved_relay_log_purge;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_mts_xa_retry.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_mts_xa_retry.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_mts_xa_retry.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_mts_xa_retry.test	2021-09-28 11:46:34.000000000 +0000
@@ -3,7 +3,6 @@
 #
 
 --source include/have_binlog_format_row.inc
---source include/no_replica_preserve_commit_order.inc
 --source include/master-slave.inc
 
 --source include/rpl_connection_master.inc
@@ -16,12 +15,13 @@
 --let $saved_replica_parallel_workers = `SELECT @@global.replica_parallel_workers`
 --let $saved_replica_parallel_type = `SELECT @@global.replica_parallel_type`
 --let $saved_binlog_transaction_compression = `SELECT @@global.binlog_transaction_compression`
-
+--let $saved_replica_preserve_commit_order = `SELECT @@global.replica_preserve_commit_order`
 --source include/stop_slave_sql.inc
 SET @@global.replica_transaction_retries= 200;
 SET @@global.innodb_lock_wait_timeout= 5;
 SET @@global.binlog_transaction_compression = ON;
 SET @@global.replica_parallel_workers = 4;
+SET @@global.replica_preserve_commit_order = OFF;
 --source include/start_slave_sql.inc
 
 --let $j = 3
@@ -137,7 +137,8 @@
 --eval SET @@global.replica_parallel_workers = $saved_replica_parallel_workers
 --replace_result $saved_replica_parallel_type SAVED
 --eval SET @@global.replica_parallel_type = '$saved_replica_parallel_type'
-
+--replace_result $saved_replica_preserve_commit_order SAVED
+--eval SET @@global.replica_preserve_commit_order = $saved_replica_preserve_commit_order
 --source include/start_slave.inc
 
 --source include/rpl_connection_master.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_partial_gtid_trx_followed_by_anonymous_trx_by_receiver.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_partial_gtid_trx_followed_by_anonymous_trx_by_receiver.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_partial_gtid_trx_followed_by_anonymous_trx_by_receiver.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_partial_gtid_trx_followed_by_anonymous_trx_by_receiver.test	2021-09-28 11:46:34.000000000 +0000
@@ -24,6 +24,7 @@
 #
 
 --source include/not_group_replication_plugin.inc
+--source include/not_rpl_gtid_only.inc
 # This test should run only on debug build
 --source include/have_debug.inc
 # This test uses debug sync to stop the IO thread in the middle of a transaction
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_partial_gtid_trx_followed_by_trx_at_startup.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_partial_gtid_trx_followed_by_trx_at_startup.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_partial_gtid_trx_followed_by_trx_at_startup.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_partial_gtid_trx_followed_by_trx_at_startup.test	2021-09-28 11:46:34.000000000 +0000
@@ -24,6 +24,7 @@
 #
 
 --source include/not_group_replication_plugin.inc
+--source include/not_rpl_gtid_only.inc
 # This test should run only on debug build
 --source include/have_debug.inc
 # This test uses debug sync to stop the IO thread in the middle of a transaction
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_partial_transaction_timestamps.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_partial_transaction_timestamps.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_partial_transaction_timestamps.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_partial_transaction_timestamps.test	2021-09-28 11:46:34.000000000 +0000
@@ -22,7 +22,7 @@
 
 # Prepare the slave IO thread to stop after queuing a WRITE_ROWS event
 SET @save_debug=@@global.debug;
-SET GLOBAL DEBUG= "d,stop_io_after_reading_write_rows_log_event";
+SET GLOBAL DEBUG= "+d,stop_io_after_reading_write_rows_log_event";
 
 # Do some transactions on master
 --source include/rpl_connection_master.inc
@@ -44,10 +44,7 @@
 
 --let $restart_queue_timestamp= query_get_value(select QUEUEING_TRANSACTION_START_QUEUE_TIMESTAMP from performance_schema.replication_connection_status,QUEUEING_TRANSACTION_START_QUEUE_TIMESTAMP,1)
 
-# Remove the debug point, so the IO thread will not stop after
-# queuing a WRITE_ROWS event anymore
-
-SET GLOBAL DEBUG= @save_debug;
+# Debug point disappears on restart
 
 # Start slave
 --source include/start_slave.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_ps_worker_start_slave.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_ps_worker_start_slave.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_ps_worker_start_slave.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_ps_worker_start_slave.test	2021-09-28 11:46:34.000000000 +0000
@@ -24,15 +24,14 @@
 
 # the test is binlog format agnostic
 --source include/have_binlog_format_row.inc
-# the test must start with a single-threaded slave
---source include/not_mts_replica_parallel_workers.inc
-
+--source include/only_mts_replica_parallel_type_logical_clock.inc
 --source include/master-slave.inc
 
 --source include/rpl_connection_slave.inc
 call mtr.add_suppression(".*worker thread retried transaction 5 time.*");
 call mtr.add_suppression(".*The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state.*");
 
+SET @saved_replica_parallel_workers= @@GLOBAL.replica_parallel_workers;
 SET @saved_innodb_lock_wait_timeout = @@GLOBAL.innodb_lock_wait_timeout;
 SET @saved_replica_transaction_retries = @@GLOBAL.replica_transaction_retries;
 SET GLOBAL replica_transaction_retries = 5;
@@ -95,7 +94,7 @@
 DROP TABLE t1;
 --source include/sync_slave_sql_with_master.inc
 --source include/stop_slave.inc
-SET GLOBAL replica_parallel_workers = 0;
+SET GLOBAL replica_parallel_workers = @saved_replica_parallel_workers;
 --source include/start_slave.inc
 SET GLOBAL innodb_lock_wait_timeout = @saved_innodb_lock_wait_timeout;
 SET GLOBAL replica_transaction_retries = @saved_replica_transaction_retries;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_replica_invalid_time_zone.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_replica_invalid_time_zone.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_replica_invalid_time_zone.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_replica_invalid_time_zone.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,83 @@
+##############################################################################
+# ==== Purpose ====
+# The purpose of this test is to verify that when time_zone value is unknown
+# for the replica, an attempt to replicate a transaction which sets the value
+# of time_zone should not throw any assertion failure.
+#
+# ==== Requirement ====
+# When attempting to replicate a transaction that sets the session value of
+# time_zone which is unknown for the replica, replica should throw an error
+# and stop gracefully.
+#
+# ==== Implementation ====
+# 1. Create source-replica topology
+# 2. Configure source with time_zone value to 'UTC'
+# 3. Configure replica without time_zone table
+# 4. Execute a transaction which doesn't use time_zone
+# 5. Execute a transaction which does use time_zone
+# 6: Start replica
+# 7. Verify that replica sql thread failed with error
+# 8. Cleanup
+#
+# ==== References ====
+# Bug #32986721: REPLICA SERVER FAILS WITH ASSERTION `!IS_SET() ||
+#                M_CAN_OVERWRITE_STATUS
+###############################################################################
+
+--source include/have_binlog_format_row.inc
+
+--echo #
+--echo # 1. Create source-replica topology
+--let $rpl_skip_start_slave= 1
+--source include/master-slave.inc
+
+--echo #
+--echo # 2. Configure source with time_zone value to 'UTC'
+SET @save.time_zone= @@time_zone;
+SET time_zone='UTC';
+
+--echo #
+--echo # 3. Configure replica without time_zone table
+--source include/rpl_connection_slave.inc
+RENAME TABLE mysql.time_zone TO mysql.time_zone_bkup;
+
+--source include/rpl_connection_master.inc
+--echo #
+--echo # 4. Execute a transaction which doesn't use time_zone
+CREATE DATABASE IF NOT EXISTS db1;
+
+--echo #
+--echo # 5. Execute a transaction which does use time_zone
+CREATE USER u1 IDENTIFIED BY 'Root@123';
+
+--echo #
+--echo # 6. Start replica
+--source include/rpl_connection_slave.inc
+call mtr.add_suppression("Slave SQL for channel '': ... The slave coordinator and worker threads are stopped.*");
+call mtr.add_suppression("Slave SQL for channel '':.*failed executing transaction.*");
+call mtr.add_suppression("Slave SQL for channel '': Error 'Table 'mysql.time_zone' doesn't exist' on query.*");
+call mtr.add_suppression("Slave: Unknown or incorrect time zone: 'UTC'.*");
+--source include/start_slave_io.inc
+--source include/wait_for_slave_io_to_start.inc
+START REPLICA SQL_THREAD;
+
+--echo #
+--echo # 7. Verify that replica sql thread failed with error
+--let $slave_sql_errno= convert_error(ER_NO_SUCH_TABLE)
+--source include/wait_for_slave_sql_error.inc
+
+--echo #
+--echo # 8. Cleanup
+--source include/stop_slave_io.inc
+RESET REPLICA ALL;
+--replace_result $MASTER_MYPORT MASTER_MYPORT
+--eval CHANGE REPLICATION SOURCE TO SOURCE_USER= 'root', SOURCE_HOST= "127.0.0.1", SOURCE_PORT= $MASTER_MYPORT;
+RENAME TABLE mysql.time_zone_bkup TO mysql.time_zone;
+--source include/start_slave.inc
+
+--source include/rpl_connection_master.inc
+DROP USER u1;
+DROP DATABASE db1;
+set time_zone= @save.time_zone;
+
+--source include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_repo_conversion_with_invalid_positions.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_repo_conversion_with_invalid_positions.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_repo_conversion_with_invalid_positions.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_repo_conversion_with_invalid_positions.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,226 @@
+# ==== Purpose ====
+#
+# This test validates that repositories can be converted from one type to another.
+# The new repository will have up to date information
+#
+# ==== Requirements ====
+#
+# R1. When repositories are converted the info written in them is the latest data in memory
+# R2. If a repository is converted while holding invalid position data, that data stays invalid
+#
+# ==== Implementation ====
+#
+# 1. Setup:
+#     Configure the replica channel with GTID_ONLY=1
+#     Restart the replica so it uses FILE repositories
+# 2. Add some data to the source
+#    Logs are flushed to cause rotations in the replica making the applier repository point to a deleted file
+#    Collect the info about the binlog file and position at the end
+# 3. Change the relay_log_info_repository type
+#    Check the lasted information is set in the new repository
+# 4. Change the master_info_repository type
+#    Check the lasted information is set in the new repository
+# 5. Start the replica, check that replication is working
+# 6. Restart the replica again so it uses FILE repositories.
+#    Check that position related info is marked as invalid
+# 7. Convert the repositories
+#    Check that position related info is still marked as invalid
+# 8. Start the replica, check that replication is working
+# 9. Cleanup
+#
+# ==== References ====
+#
+# WL#7491: GTID-based replication applier recovery and positioning
+#
+
+--source include/have_binlog_format_row.inc
+--source include/have_slave_repository_type_table.inc
+
+# This test compares source log positions between source memory and replica
+# repositories. Ensure synchronization of the source log positions
+# between source and replica memory regardless of GTIDs.
+--let $ignore_gtids_on_sync= 1
+
+--let $rpl_skip_start_slave= 1
+--source include/master-slave.inc
+
+--echo #
+--echo # 1. Setup:
+--echo #     Configure the replica channel with GTID_ONLY=1
+--echo #     Restart the replica so it uses FILE repositories
+
+--source include/rpl_connection_slave.inc
+
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 1, GTID_ONLY = 1;
+
+--let $rpl_server_number= 2
+--let $rpl_server_parameters= --relay_log_info_repository=FILE --master_info_repository=FILE --skip_slave_start=0
+--source include/rpl_restart_server.inc
+
+# Make the collection of replica values more reliable
+--let $replica_checkpoint_period_value = `SELECT @@global.replica_checkpoint_period`
+SET @@GLOBAL.replica_checkpoint_period= 1;
+
+--echo #
+--echo # 2. Add some data to the source
+--echo #    Logs are flushed to cause rotations in the replica making the applier repository point to a deleted file
+--echo #    Collect the info about the binlog file and position at the end
+
+--source include/rpl_connection_master.inc
+
+CREATE TABLE t1(c1 INTEGER) ENGINE= Innodb;
+
+INSERT INTO t1 VALUES(1);
+
+FLUSH LOGS;
+
+INSERT INTO t1 VALUES(2);
+
+FLUSH LOGS;
+
+INSERT INTO t1 VALUES(3);
+
+FLUSH LOGS;
+
+--let $log_file_on_source=query_get_value(SHOW MASTER STATUS, File, 1)
+--let $log_pos_on_source=query_get_value(SHOW MASTER STATUS, Position, 1)
+
+--source include/sync_slave_sql_with_master.inc
+
+--echo #
+--echo # 3. Change the relay_log_info_repository type
+--echo #    Check the lasted information is set in the new repository
+
+--source include/stop_slave.inc
+
+--let $applier_relaylog_pos=query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Relay_Log_Pos, 1)
+
+SET @@global.relay_log_info_repository="TABLE";
+
+--let $repo_source_log_file=`SELECT Master_log_name FROM mysql.slave_relay_log_info`
+--let $assert_cond= [ SELECT "$repo_source_log_file" = "$log_file_on_source" ]
+--let $assert_text= The source log file name is up to date in the applier repo
+--source include/assert.inc
+
+--let $repo_source_log_pos=`SELECT Master_log_pos FROM mysql.slave_relay_log_info`
+--let $assert_cond= [ SELECT "$repo_source_log_pos" = "$log_pos_on_source" ]
+--let $assert_text= The source log position is up to date in the applier repo
+--source include/assert.inc
+
+--let $repo_relay_log_pos=`SELECT Relay_log_pos FROM mysql.slave_relay_log_info`
+--let $assert_cond= [ SELECT "$repo_relay_log_pos" = "$applier_relaylog_pos" ]
+--let $assert_text= The source log file name is up to date in the applier repo
+--source include/assert.inc
+
+--echo #
+--echo # 4. Change the master_info_repository type
+--echo #    Check the lasted information is set in the new repository
+
+SET @@global.master_info_repository="TABLE";
+
+--let $repo_source_log_file=`SELECT Master_log_name FROM mysql.slave_master_info`
+--let $assert_cond= [ SELECT "$repo_source_log_file" = "$log_file_on_source" ]
+--let $assert_text= The source log file name is up to date in the connection repo
+--source include/assert.inc
+
+--let $repo_source_log_pos=`SELECT Master_log_pos FROM mysql.slave_master_info`
+--let $assert_cond= [ SELECT "$repo_source_log_pos" = "$log_pos_on_source" ]
+--let $assert_text= The source log position is up to date in the connection repo
+--source include/assert.inc
+
+--echo #
+--echo # 5. Start the replica, check that replication is working
+
+--source include/rpl_connection_slave.inc
+
+--source include/start_slave.inc
+
+--source include/rpl_connection_master.inc
+
+INSERT INTO t1 VALUES(4);
+
+--source include/sync_slave_sql_with_master.inc
+
+--echo #
+--echo # 6. Restart the replica again so it uses FILE repositories.
+--echo #    Check that position related info is marked as invalid
+
+--let $rpl_server_number= 2
+--let $rpl_server_parameters= --relay_log_info_repository=FILE --master_info_repository=FILE --skip_slave_start=1
+--source include/rpl_restart_server.inc
+
+--let $source_log_file=query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Source_Log_File, 1)
+--let $assert_cond= [ SELECT "$source_log_file" = "INVALID" ]
+--let $assert_text= The source log file name is invalid
+--source include/assert.inc
+
+--let $source_log_pos=query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Read_Source_Log_Pos, 1)
+--let $assert_cond= [ SELECT "$source_log_pos" = "0" ]
+--let $assert_text= The source log file position is 0
+--source include/assert.inc
+
+--let $applier_source_log_file=query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Relay_Source_Log_File, 1)
+--let $assert_cond= [ SELECT "$applier_source_log_file" = "INVALID" ]
+--let $assert_text= The source log file name in the applier is invalid
+--source include/assert.inc
+
+--let $applier_source_log_pos=query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Exec_Source_Log_Pos, 1)
+--let $assert_cond= [ SELECT "$applier_source_log_pos" = "0" ]
+--let $assert_text= The source log file position in the applier is 0
+--source include/assert.inc
+
+--echo #
+--echo # 7. Convert the repositories
+--echo #    Check that position related info is still marked as invalid
+
+SET @@global.relay_log_info_repository="TABLE";
+SET @@global.master_info_repository="TABLE";
+
+--let $source_log_file=query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Source_Log_File, 1)
+--let $assert_cond= [ SELECT "$source_log_file" = "INVALID" ]
+--let $assert_text= The source log file name is invalid
+--source include/assert.inc
+
+--let $source_log_pos=query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Read_Source_Log_Pos, 1)
+--let $assert_cond= [ SELECT "$source_log_pos" = "0" ]
+--let $assert_text= The source log file position is 0
+--source include/assert.inc
+
+--let $applier_source_log_file=query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Relay_Source_Log_File, 1)
+--let $assert_cond= [ SELECT "$applier_source_log_file" = "INVALID" ]
+--let $assert_text= The source log file name in the applier is invalid
+--source include/assert.inc
+
+--let $applier_source_log_pos=query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Exec_Source_Log_Pos, 1)
+--let $assert_cond= [ SELECT "$applier_source_log_pos" = "0" ]
+--let $assert_text= The source log file position in the applier is 0
+--source include/assert.inc
+
+--echo #
+--echo # 8. Start the replica, check that replication is working
+
+--source include/start_slave.inc
+
+--source include/rpl_connection_master.inc
+
+INSERT INTO t1 VALUES(5);
+
+--source include/sync_slave_sql_with_master.inc
+
+--echo #
+--echo # 9. Cleanup
+
+--source include/stop_slave.inc
+
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 0, GTID_ONLY = 0;
+
+--replace_result $replica_checkpoint_period_value REPLICA_CHECKPOINT_PERIOD
+--eval SET @@GLOBAL.replica_checkpoint_period= $replica_checkpoint_period_value
+
+--source include/start_slave.inc
+
+--source include/rpl_connection_master.inc
+
+DROP TABLE t1;
+
+--source include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_rotate_gtid.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_rotate_gtid.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_rotate_gtid.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_rotate_gtid.test	2021-09-28 11:46:34.000000000 +0000
@@ -43,7 +43,7 @@
 
 # Setting the debug point to stop IO thread after queuing Gtid_log_event
 SET @save_debug=@@global.debug;
-SET GLOBAL DEBUG='d,stop_io_after_reading_gtid_log_event';
+SET GLOBAL DEBUG='+d,stop_io_after_reading_gtid_log_event';
 
 --echo # Create a transaction on the master
 --echo # that will have it's GTID and other events in separated relay log files
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_simulate_create_chunk_failure.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_simulate_create_chunk_failure.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_simulate_create_chunk_failure.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_simulate_create_chunk_failure.test	2021-09-28 11:46:34.000000000 +0000
@@ -29,9 +29,11 @@
 
 --source include/rpl_connection_slave.inc
 call mtr.add_suppression("You need to use --log-bin to make --binlog-format work");
-SET @debug_save= @@GLOBAL.DEBUG;
+
 --exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.2.expect
-SET @@GLOBAL.DEBUG= '+d,rpl_gtid_update_on_commit_simulate_out_of_memory';
+
+--let $debug_point= rpl_gtid_update_on_commit_simulate_out_of_memory
+--source include/add_debug_point.inc
 
 --source include/rpl_connection_master.inc
 --let $master_uuid= `SELECT @@GLOBAL.SERVER_UUID`
@@ -55,7 +57,9 @@
 --echo # added into @@GLOBAL.GTID_EXECUTED and 'gtid_executed'
 --echo # table after slave server restarts.
 --echo #
-SET @@GLOBAL.DEBUG= @debug_save;
+
+# No need to unset the debug point as the server restarted
+
 --replace_result $master_uuid MASTER_UUID
 --eval SELECT * FROM mysql.gtid_executed
 --let $assert_text= committed gtids MASTER_UUID:1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_source_pos_wait_with_gtid_only.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_source_pos_wait_with_gtid_only.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_source_pos_wait_with_gtid_only.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_source_pos_wait_with_gtid_only.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,164 @@
+# ==== Purpose ====
+#
+# This test validates SOURCE_POS_WAIT blocks when positions are invalid.
+# Unblocks when positions become valid again
+#
+# ==== Requirements ====
+#
+# R1. Verify that SOURCE_POS_WAIT blocks when applier positions are invalid
+#     and unblocks when positions are again valid
+#
+# ==== Implementation ====
+#
+# 1. Setup:
+#     Start the replica channel with GTID_ONLY=1
+#     Add some info in the source and replicate it
+#     Record the source positions to wait later on
+# 2. Start replication
+#    Check SOURCE_POS_WAIT does not time out when giving it a valid positioning info
+# 3. Restart the server so positions become invalid
+#    Use relay log recovery so the new relay log contains no source info when the applier starts
+# 4. Test that the command times out cause positions are invalid
+# 5. Execute a wait with a large timeout
+#    Turn applier positions valid again
+#    Check the function does not time out when positions become valid
+# 6. SOURCE_POS_WAIT does not timeout when invoked with valid positioning info
+# 7. Cleanup
+#
+# ==== References ====
+#
+# WL#7491: GTID-based replication applier recovery and positioning
+#
+
+--source include/have_binlog_format_row.inc
+--let $rpl_skip_start_slave= 1
+--source include/master-slave.inc
+
+--echo #
+--echo # 1. Setup:
+--echo #     Start the replica channel with GTID_ONLY=1
+--echo #     Add some info in the source and replicate it
+--echo #     Record the source positions to wait later on
+
+--source include/rpl_connection_slave.inc
+
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 1, GTID_ONLY = 1;
+
+--source include/rpl_connection_master.inc
+
+CREATE TABLE t(s INT);
+
+INSERT INTO t VALUES(1);
+
+--let $log_file_on_source=query_get_value(SHOW MASTER STATUS, File, 1)
+--let $log_pos_on_source=query_get_value(SHOW MASTER STATUS, Position, 1)
+
+INSERT INTO t VALUES(2);
+
+--echo #
+--echo # 2. Start replication
+--echo #    Check SOURCE_POS_WAIT does not time out when giving it a valid positioning info
+
+--source include/rpl_connection_slave.inc
+
+--source include/start_slave.inc
+
+--source include/rpl_connection_master.inc
+
+--source include/sync_slave_sql_with_master.inc
+
+--let $source_post_wait_res = `SELECT SOURCE_POS_WAIT('$log_file_on_source', $log_pos_on_source, 30)`
+
+--let $assert_cond= [ SELECT "$source_post_wait_res" != "-1" ]
+--let $assert_text= The function did not time out
+--source include/assert.inc
+
+--echo #
+--echo # 3. Restart the server so positions become invalid
+--echo #    Use relay log recovery so the new relay log contains no source info when the applier starts
+
+--let $rpl_server_number = 2
+--let $rpl_server_parameters = --skip_slave_start=1 --relay-log-recovery=1
+--let $explicit_default_wait_counter = 15000
+--source include/rpl_restart_server.inc
+
+--source include/start_slave_sql.inc
+
+--let $applier_source_log_file=query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Relay_Source_Log_File, 1)
+--let $assert_cond= [ SELECT "$applier_source_log_file" = "INVALID" ]
+--let $assert_text= The source log file name in the applier is invalid
+--source include/assert.inc
+
+--let $applier_source_log_pos=query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Exec_Source_Log_Pos, 1)
+--let $assert_cond= [ SELECT "$applier_source_log_pos" = "0" ]
+--let $assert_text= The source log file position in the applier is 0
+--source include/assert.inc
+
+--echo #
+--echo # 4. Test that the command times out cause positions are invalid
+
+--let $rpl_connection_name= server_2
+--source include/rpl_connection.inc
+
+--let $source_post_wait_res = `SELECT SOURCE_POS_WAIT('$log_file_on_source', $log_pos_on_source, 2)`
+
+--let $assert_cond= [ SELECT "$source_post_wait_res" = "-1" ]
+--let $assert_text= The function timed out
+--source include/assert.inc
+
+--echo #
+--echo # 5. Execute a wait with a large timeout
+--echo #    Turn applier positions valid again
+--echo #    Check the function does not time out when positions become valid
+
+CREATE TABLE query_result(res INT);
+--replace_result $log_file_on_source LOG_FILE_ON_SOURCE $log_pos_on_source LOG_POS_ON_SOURCE
+--send_eval INSERT INTO query_result SELECT SOURCE_POS_WAIT('$log_file_on_source', $log_pos_on_source, 100);
+
+--source include/rpl_connection_slave.inc
+
+--source include/start_slave_io.inc
+
+--source include/rpl_connection_master.inc
+
+INSERT INTO t VALUES(3);
+
+--let $rpl_connection_name= server_2
+--source include/rpl_connection.inc
+
+--reap
+
+--let $source_post_wait_res = `SELECT res FROM query_result`
+--let $assert_cond= [ SELECT "$source_post_wait_res" != "-1" ]
+--let $assert_text= The function did not time out
+--source include/assert.inc
+
+--echo #
+--echo # 6. SOURCE_POS_WAIT does not timeout when invoked with valid positioning info
+
+--source include/rpl_connection_slave.inc
+
+--let $source_post_wait_res = `SELECT SOURCE_POS_WAIT('$log_file_on_source', $log_pos_on_source, 30)`
+
+--let $assert_cond= [ SELECT "$source_post_wait_res" != "-1" ]
+--let $assert_text= The function did not time out
+--source include/assert.inc
+
+--echo #
+--echo # 7. Cleanup
+
+--source include/stop_slave.inc
+
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 0, GTID_ONLY = 0;
+
+--source include/start_slave.inc
+
+CALL mtr.add_suppression("Recovery from master pos.* and file");
+
+DROP TABLE query_result;
+
+--source include/rpl_connection_master.inc
+
+DROP TABLE t;
+
+--source include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_sql_delay.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_sql_delay.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_sql_delay.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_sql_delay.test	2021-09-28 11:46:34.000000000 +0000
@@ -15,9 +15,6 @@
 #
 # WL#7318 Delayed Replication: GTID based and relative to immediate master commit
 
-# there is a specific test for mts
---source include/not_mts_replica_parallel_workers.inc
-
 --let $rpl_skip_start_slave= 1
 --source include/master-slave.inc
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_start_replica_until_pos_with_gtid_only.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_start_replica_until_pos_with_gtid_only.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_start_replica_until_pos_with_gtid_only.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_start_replica_until_pos_with_gtid_only.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,200 @@
+# ==== Purpose ====
+#
+# This test validates START REPLICA UNTIL still works as expected,
+# when using positions even when they are invalid.
+#
+# ==== Requirements ====
+#
+# R1.START REPLICA UNTIL [SOURCE|RELAY]_LOG_[FILE|POS] is not affected
+#    by GTID_ONLY=1
+#
+# ==== Implementation ====
+#
+# 1. Setup:
+#     Start the replica channel with GTID_ONLY=1
+#     Add some info in the source and replicate it
+#     Record the source positions to wait later on
+# 2. Start replication
+#    Check START REPLICA UNTIL SOURCE_LOS_POS works as intended
+# 3. Add some more data
+#    Retrieve the relay log position for the transaction we want
+#    Check START REPLICA UNTIL RELAY_LOG_POS works as intended
+# 4. Restart the server so positions become invalid
+#    Add some more data on the source and record the positions
+#    Check START REPLICA UNTIL SOURCE_LOS_POS works as intended
+# 5. Insert data in the source and extract the relay log position
+#    Restart the server so positions become invalid
+#    Check START REPLICA UNTIL RELAY_LOG_POS works as intended
+# 6. Cleanup
+#
+# ==== References ====
+#
+# WL#7491: GTID-based replication applier recovery and positioning
+#
+
+--source include/have_binlog_format_row.inc
+--let $rpl_skip_start_slave= 1
+--source include/master-slave.inc
+
+--echo #
+--echo # 1. Setup:
+--echo #     Start the replica channel with GTID_ONLY=1
+--echo #     Add some info in the source and replicate it
+--echo #     Record the source positions to wait later on
+
+--source include/rpl_connection_slave.inc
+
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 1, GTID_ONLY = 1;
+
+--source include/rpl_connection_master.inc
+
+CREATE TABLE t(s INT);
+
+INSERT INTO t VALUES(1);
+
+--let $log_file_on_source=query_get_value(SHOW MASTER STATUS, File, 1)
+--let $log_pos_on_source=query_get_value(SHOW MASTER STATUS, Position, 1)
+
+INSERT INTO t VALUES(2);
+
+--echo #
+--echo # 2. Start replication
+--echo #    Check START REPLICA UNTIL SOURCE_LOS_POS works as intended
+
+--source include/rpl_connection_slave.inc
+
+--replace_result $log_file_on_source SOURCE_LOG_FILE $log_pos_on_source SOURCE_LOG_POS
+--eval START REPLICA UNTIL SOURCE_LOG_FILE='$log_file_on_source', SOURCE_LOG_POS=$log_pos_on_source
+
+--source include/wait_for_slave_sql_to_stop.inc
+
+--let $table_count=`SELECT COUNT(*) FROM t`
+--let $assert_cond= [ SELECT "$table_count" = "1" ]
+--let $assert_text= The table only has 1 line
+--source include/assert.inc
+
+--echo #
+--echo # 3. Add some more data
+--echo #    Retrieve the relay log position for the transaction we want
+--echo #    Check START REPLICA UNTIL RELAY_LOG_POS works as intended
+
+--source include/rpl_connection_master.inc
+
+INSERT INTO t VALUES(3);
+
+# used on get_relay_log_pos.inc
+--let $master_log_pos= query_get_value(SHOW MASTER STATUS, Position, 1)
+
+INSERT INTO t VALUES(4);
+
+--source include/sync_slave_io_with_master.inc
+
+--let $replica_local_infile_value = `SELECT @@global.local_infile`
+SET @@GLOBAL.local_infile= true;
+--let $relay_log_file= query_get_value(SHOW REPLICA STATUS, Relay_Log_File,1)
+--source include/get_relay_log_pos.inc
+
+--replace_result $relay_log_file RELAY_LOG_FILE $relay_log_pos RELAY_LOG_POS
+--eval START REPLICA SQL_THREAD UNTIL RELAY_LOG_FILE='$relay_log_file', RELAY_LOG_POS=$relay_log_pos
+
+--source include/wait_for_slave_sql_to_stop.inc
+
+--let $table_count=`SELECT COUNT(*) FROM t`
+--let $assert_cond= [ SELECT "$table_count" = "3" ]
+--let $assert_text= The table only has 3 lines
+--source include/assert.inc
+
+--echo #
+--echo # 4. Restart the server so positions become invalid
+--echo #    Add some more data on the source and record the positions
+--echo #    Check START REPLICA UNTIL SOURCE_LOS_POS works as intended
+
+--let $rpl_server_number = 2
+--let $rpl_server_parameters = --skip_slave_start=1
+--let $explicit_default_wait_counter = 15000
+--source include/rpl_restart_server.inc
+
+--let $applier_source_log_file=query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Relay_Source_Log_File, 1)
+--let $assert_cond= [ SELECT "$applier_source_log_file" = "INVALID" ]
+--let $assert_text= The source log file name in the applier is invalid
+--source include/assert.inc
+
+--source include/rpl_connection_master.inc
+
+INSERT INTO t VALUES(5);
+
+--let $log_file_on_source=query_get_value(SHOW MASTER STATUS, File, 1)
+--let $log_pos_on_source=query_get_value(SHOW MASTER STATUS, Position, 1)
+
+INSERT INTO t VALUES(6);
+
+--source include/rpl_connection_slave.inc
+
+--replace_result $log_file_on_source SOURCE_LOG_FILE $log_pos_on_source SOURCE_LOG_POS
+--eval START REPLICA UNTIL SOURCE_LOG_FILE='$log_file_on_source', SOURCE_LOG_POS=$log_pos_on_source
+
+--source include/wait_for_slave_sql_to_stop.inc
+
+--let $table_count=`SELECT COUNT(*) FROM t`
+--let $assert_cond= [ SELECT "$table_count" = "5" ]
+--let $assert_text= The table only has 5 lines
+--source include/assert.inc
+
+--echo #
+--echo # 5. Insert data in the source and extract the relay log position
+--echo #    Restart the server so positions become invalid
+--echo #    Check START REPLICA UNTIL RELAY_LOG_POS works as intended
+
+--source include/rpl_connection_master.inc
+
+INSERT INTO t VALUES(7);
+
+# used on get_relay_log_pos.inc
+--let $master_log_pos= query_get_value(SHOW MASTER STATUS, Position, 1)
+
+INSERT INTO t VALUES(8);
+
+--source include/sync_slave_io_with_master.inc
+
+--let $replica_local_infile_value = `SELECT @@global.local_infile`
+SET @@GLOBAL.local_infile= true;
+--let $relay_log_file= query_get_value(SHOW REPLICA STATUS, Relay_Log_File,1)
+--source include/get_relay_log_pos.inc
+
+--let $rpl_server_number = 2
+--let $rpl_server_parameters = --skip_slave_start=1
+--let $explicit_default_wait_counter = 15000
+--source include/rpl_restart_server.inc
+
+--let $applier_source_log_file=query_get_value(SHOW REPLICA STATUS FOR CHANNEL '', Relay_Source_Log_File, 1)
+--let $assert_cond= [ SELECT "$applier_source_log_file" = "INVALID" ]
+--let $assert_text= The source log file name in the applier is invalid
+--source include/assert.inc
+
+--replace_result $relay_log_file RELAY_LOG_FILE $relay_log_pos RELAY_LOG_POS
+--eval START REPLICA SQL_THREAD UNTIL RELAY_LOG_FILE='$relay_log_file', RELAY_LOG_POS=$relay_log_pos
+
+--source include/wait_for_slave_sql_to_stop.inc
+
+--let $table_count=`SELECT COUNT(*) FROM t`
+--let $assert_cond= [ SELECT "$table_count" = "7" ]
+--let $assert_text= The table only has 7 lines
+--source include/assert.inc
+
+--echo #
+--echo # 6. Cleanup
+
+--replace_result $replica_local_infile_value REPLICA_LOCAL_INFILE
+--eval SET @@GLOBAL.local_infile= $replica_local_infile_value
+
+--source include/stop_slave.inc
+
+CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 0, GTID_ONLY = 0;
+
+--source include/start_slave.inc
+
+--source include/rpl_connection_master.inc
+
+DROP TABLE t;
+
+--source include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_stop_on_rotate.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_stop_on_rotate.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_stop_on_rotate.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_stop_on_rotate.test	2021-09-28 11:46:34.000000000 +0000
@@ -44,10 +44,14 @@
 --echo # 2. Add a debug point so the replica stops at the first sent rotate
 --echo #    Stop the replica IO thread so the auto positioning protocol runs
 
+--source include/stop_slave_io.inc
+
 --let $debug_point=block_on_master_pos_4_rotate
 --source include/add_debug_point.inc
 
---source include/stop_slave_io.inc
+--let $debug_point=block_on_thread_stop_after_awake
+--source include/add_debug_point.inc
+
 --source include/start_slave_io.inc
 
 --echo
@@ -62,6 +66,13 @@
 --let $rpl_connection_name= server_2
 --source include/rpl_connection.inc
 
+# Wait on for the point where we already signaled the SQL thread to stop
+# This wait also prevents concurrency scenarios between the debug point setting
+# a thread stage, the SQL thread setting another stage while waiting for
+# workers to finish and the stop process issuing a awake request in the middle
+SET DEBUG_SYNC= "now WAIT_FOR signal.stop_point_after_awake";
+
+# Let the thread stop
 SET DEBUG_SYNC= "now SIGNAL signal.rotate_event_continue";
 
 --source include/rpl_connection_slave.inc
@@ -72,8 +83,14 @@
 --echo ############################################################
 --echo # 4. Start the replica again and check all is good
 
+--let $debug_point=block_on_master_pos_4_rotate
 --source include/remove_debug_point.inc
 
+--let $debug_point=block_on_thread_stop_after_awake
+--source include/remove_debug_point.inc
+
+SET DEBUG_SYNC= "RESET";
+
 --source include/start_slave.inc
 
 --source include/rpl_connection_master.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_sync_relay_log_info.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_sync_relay_log_info.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_sync_relay_log_info.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_sync_relay_log_info.test	2021-09-28 11:46:34.000000000 +0000
@@ -67,7 +67,6 @@
 --source include/have_debug_sync.inc
 # Test requires relay-log-info-repository = TABLE
 --source include/not_relay_log_info_file.inc
---source include/not_mts_replica_parallel_workers.inc
 --source include/have_binlog_format_statement.inc
 --let $rpl_gtid_utils= 1
 --source include/master-slave.inc
@@ -78,6 +77,7 @@
 
 # Save global variables that will be changed during the test
 --source include/rpl_connection_slave.inc
+CALL mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
 SET @saved_sync_relay_log_info= @@GLOBAL.sync_relay_log_info;
 
 --echo #
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_trx_boundary_parser_row_myisam.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_trx_boundary_parser_row_myisam.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_trx_boundary_parser_row_myisam.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_trx_boundary_parser_row_myisam.test	2021-09-28 11:46:34.000000000 +0000
@@ -26,6 +26,7 @@
 
 --let $rpl_gtid_utils= 1
 --source include/have_binlog_format_row.inc
+--source include/not_rpl_gtid_only.inc
 --source include/master-slave.inc
 
 --echo # Using MyISAM storage engine
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_trx_boundary_parser_row.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_trx_boundary_parser_row.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_trx_boundary_parser_row.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_trx_boundary_parser_row.test	2021-09-28 11:46:34.000000000 +0000
@@ -28,6 +28,7 @@
 
 --let $rpl_gtid_utils= 1
 --source include/have_binlog_format_row.inc
+--source include/not_rpl_gtid_only.inc
 --source include/master-slave.inc
 
 --echo # Using InnoDB storage engine
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_xa_prepare.test mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_xa_prepare.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_gtid/t/rpl_xa_prepare.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_gtid/t/rpl_xa_prepare.test	2021-09-28 11:46:34.000000000 +0000
@@ -25,6 +25,7 @@
 
 # The test cannot run in Valgrind since it generates an assert on the slave
 --source include/not_valgrind.inc
+--source include/not_rpl_gtid_only.inc
 --source include/have_debug.inc
 --source include/have_debug_sync.inc
 
@@ -51,6 +52,8 @@
 CALL mtr.add_suppression("When @@SESSION.GTID_NEXT is set to a GTID, you must explicitly set it to a different value after a COMMIT or ROLLBACK");
 CALL mtr.add_suppression("Cannot execute the current event group");
 CALL mtr.add_suppression("The slave coordinator and worker threads are stopped");
+CALL mtr.add_suppression("Error writing relay log configuration.*");
+CALL mtr.add_suppression("Error reading relay log event for channel.*");
 --source include/stop_slave.inc
 
 ###################################################
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_master.result mysql-8.0-8.0.27/mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_master.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_master.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_master.result	2021-09-28 11:46:34.000000000 +0000
@@ -610,6 +610,7 @@
 *** Drop t14  ***
 DROP TABLE t14;
 DROP TABLE t14;
+RESET REPLICA;
 include/rpl_reset.inc
 
 *************************************************
@@ -1494,6 +1495,7 @@
 *** Drop t14  ***
 DROP TABLE t14;
 DROP TABLE t14;
+RESET REPLICA;
 include/rpl_reset.inc
 
 *************************************************
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_alter_repository.result mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_alter_repository.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_alter_repository.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_alter_repository.result	2021-09-28 11:46:34.000000000 +0000
@@ -124,11 +124,11 @@
 Last_IO_Error = 'Fatal error: Failed to flush master info.'
 include/stop_slave_sql.inc
 START SLAVE SQL_THREAD;
-ERROR HY000: Column count of mysql.slave_master_info is wrong. Expected 32, found 31. The table is probably corrupted
+ERROR HY000: Column count of mysql.slave_master_info is wrong. Expected 33, found 32. The table is probably corrupted
 RESET SLAVE ALL;
-ERROR HY000: Column count of mysql.slave_master_info is wrong. Expected 32, found 31. The table is probably corrupted
+ERROR HY000: Column count of mysql.slave_master_info is wrong. Expected 33, found 32. The table is probably corrupted
 CHANGE REPLICATION SOURCE TO SOURCE_HOST= 'MASTER_HOST', SOURCE_USER= 'MASTER_USER', SOURCE_PORT= MASTER_PORT, SOURCE_LOG_FILE= 'MASTER_LOG_FILE', SOURCE_LOG_POS= MASTER_LOG_POS;
-ERROR HY000: Column count of mysql.slave_master_info is wrong. Expected 32, found 31. The table is probably corrupted
+ERROR HY000: Column count of mysql.slave_master_info is wrong. Expected 33, found 32. The table is probably corrupted
 ALTER TABLE mysql.slave_master_info ADD COLUMN Enabled_auto_position BOOLEAN NOT NULL COMMENT 'Indicates whether GTIDs will be used to retrieve events from the master.' AFTER Ssl_crlpath;
 UPDATE mysql.slave_master_info SET Enabled_auto_position= 0;
 RESET SLAVE ALL;
@@ -193,6 +193,7 @@
   `Master_zstd_compression_level` int unsigned NOT NULL COMMENT 'Compression level associated with zstd compression algorithm.',
   `Tls_ciphersuites` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'Ciphersuites used for TLS 1.3 communication with the master server.',
   `Source_connection_auto_failover` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Indicates whether the channel connection failover is enabled.',
+  `Gtid_only` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Indicates if this channel only uses GTIDs and does not persist positions.',
   PRIMARY KEY (`Channel_name`)
 ) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='Master Information'
 SHOW CREATE TABLE mysql.slave_relay_log_info;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_assign_gtids_to_anonymous_transactions.result mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_assign_gtids_to_anonymous_transactions.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_assign_gtids_to_anonymous_transactions.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_assign_gtids_to_anonymous_transactions.result	2021-09-28 11:46:34.000000000 +0000
@@ -55,7 +55,7 @@
 include/gtid_step_assert.inc [count=2, only_count=0]
 include/stop_slave.inc
 SET GLOBAL GTID_MODE=ON_PERMISSIVE;
-ERROR HY000: SET @@GLOBAL.GTID_MODE = OFF is not allowed because replication channel '' is configured with ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS set to LOCAL or to a UUID. Execute CHANGE MASTER TO ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS = OFF FOR CHANNEL '' before you set @@GLOBAL.GTID_MODE = 'ON_PERMISSIVE'..
+ERROR HY000: SET @@GLOBAL.GTID_MODE = ON_PERMISSIVE is not allowed because replication channel '' is configured with ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS set to LOCAL or to a UUID. Execute CHANGE MASTER TO ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS = OFF FOR CHANNEL '' before you set @@GLOBAL.GTID_MODE = 'ON_PERMISSIVE'.
 CHANGE REPLICATION SOURCE TO ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS = LOCAL, SOURCE_AUTO_POSITION = 1;
 ERROR HY000: The options ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS = LOCAL|<UUID> and MASTER_AUTO_POSITION = 1 cannot be used together.
 include/start_slave_io.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_async_conn_failover_gtid_auto_position_error.result mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_async_conn_failover_gtid_auto_position_error.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_async_conn_failover_gtid_auto_position_error.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_async_conn_failover_gtid_auto_position_error.result	2021-09-28 11:46:34.000000000 +0000
@@ -21,7 +21,6 @@
 #
 # 3. Enable gtid_mode.
 #
-include/stop_slave.inc
 SET GLOBAL ENFORCE_GTID_CONSISTENCY = WARN;
 SET GLOBAL ENFORCE_GTID_CONSISTENCY = ON;
 SET GLOBAL GTID_MODE = OFF_PERMISSIVE;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_begin_commit_rollback.result mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_begin_commit_rollback.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_begin_commit_rollback.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_begin_commit_rollback.result	2021-09-28 11:46:34.000000000 +0000
@@ -4,6 +4,7 @@
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
+call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
 SET @@session.binlog_direct_non_transactional_updates= FALSE;
 CREATE DATABASE replicate_do_db;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_bug58546.result mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_bug58546.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_bug58546.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_bug58546.result	2021-09-28 11:46:34.000000000 +0000
@@ -22,7 +22,7 @@
 include/stop_slave.inc
 [connection master]
 include/stop_dump_threads.inc
-SET GLOBAL debug= 'd,dump_thread_wait_before_send_xid';
+# Adding debug point 'dump_thread_wait_before_send_xid' to @@GLOBAL.debug
 [connection slave]
 include/start_slave.inc
 BEGIN;
@@ -46,7 +46,7 @@
 Warnings:
 Warning	1287	'STOP SLAVE' is deprecated and will be removed in a future release. Please use STOP REPLICA instead
 [connection master]
-SET GLOBAL debug= $debug_save;
+# Removing debug point 'dump_thread_wait_before_send_xid' from @@GLOBAL.debug
 include/stop_dump_threads.inc
 [connection slave1]
 include/start_slave.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_checksum.result mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_checksum.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_checksum.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_checksum.result	2021-09-28 11:46:34.000000000 +0000
@@ -64,7 +64,7 @@
 include/stop_slave.inc
 set @@global.binlog_checksum = CRC32;
 insert into t1 values (1) /* will not be applied on slave due to simulation */;
-set @@global.debug='d,simulate_replica_unaware_checksum';
+set @@global.debug='+d,simulate_replica_unaware_checksum';
 start slave;
 Warnings:
 Warning	1287	'START SLAVE' is deprecated and will be removed in a future release. Please use START REPLICA instead
@@ -74,35 +74,35 @@
 zero
 0
 include/stop_slave.inc
-set @@global.debug='';
+set @@global.debug='-d,simulate_replica_unaware_checksum';
 include/start_slave.inc
 set @@global.source_verify_checksum = 1;
-set @@session.debug='d,simulate_checksum_test_failure';
+set @@session.debug='+d,simulate_checksum_test_failure';
 show binlog events;
 ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Event crc check failed! Most likely there is event corruption.
-set @@session.debug='';
+set @@session.debug='-d,simulate_checksum_test_failure';
 set @@global.source_verify_checksum = default;
 include/stop_slave.inc
 create table t2 (a int);
-set @@global.debug='d,simulate_checksum_test_failure';
+set @@global.debug='+d,simulate_checksum_test_failure';
 start slave io_thread;
 Warnings:
 Warning	1287	'START SLAVE' is deprecated and will be removed in a future release. Please use START REPLICA instead
 include/wait_for_slave_io_error.inc [errno=13122, 13115]
-set @@global.debug='';
+set @@global.debug='-d,simulate_checksum_test_failure';
 start slave io_thread;
 Warnings:
 Warning	1287	'START SLAVE' is deprecated and will be removed in a future release. Please use START REPLICA instead
 include/sync_slave_io_with_master.inc
 set @@global.replica_sql_verify_checksum = 1;
-set @@global.debug='d,simulate_checksum_test_failure';
+set @@global.debug='+d,simulate_checksum_test_failure';
 start slave sql_thread;
 Warnings:
 Warning	1287	'START SLAVE' is deprecated and will be removed in a future release. Please use START REPLICA instead
 include/wait_for_slave_sql_error.inc [errno=13117]
 Last_SQL_Error = 'Event crc check failed! Most likely there is event corruption.'
 include/stop_slave.inc
-set @@global.debug='';
+set @@global.debug='-d,simulate_checksum_test_failure';
 include/start_slave.inc
 select count(*) as 'must be zero' from t2;
 must be zero
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_do_grant.result mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_do_grant.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_do_grant.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_do_grant.result	2021-09-28 11:46:34.000000000 +0000
@@ -203,8 +203,8 @@
 SHOW GRANTS FOR CURRENT_USER;
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 ##############################################################
 ##############################################################
 ### Showing grants for both users: root and user49119 (master)
@@ -215,8 +215,8 @@
 SHOW GRANTS FOR CURRENT_USER;
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 ##############################################################
 ## This statement will make the revoke fail because root has no
 ## execute grant. However, it will still revoke the grant for
@@ -233,8 +233,8 @@
 SHOW GRANTS FOR CURRENT_USER;
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 ##############################################################
 #############################################################
 ### Showing grants for both users: root and user49119 (slave)
@@ -246,8 +246,8 @@
 SHOW GRANTS FOR CURRENT_USER;
 Grants for root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
-GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `root`@`localhost` WITH GRANT OPTION
+GRANT PROXY ON ``@`` TO `root`@`localhost` WITH GRANT OPTION
 ##############################################################
 DROP TABLE t1;
 DROP PROCEDURE p1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_extra_col_master_innodb.result mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_extra_col_master_innodb.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_extra_col_master_innodb.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_extra_col_master_innodb.result	2021-09-28 11:46:34.000000000 +0000
@@ -609,6 +609,7 @@
 *** Drop t14  ***
 DROP TABLE t14;
 DROP TABLE t14;
+RESET REPLICA;
 include/rpl_reset.inc
 
 *************************************************
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_extra_col_master_myisam.result mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_extra_col_master_myisam.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_extra_col_master_myisam.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_extra_col_master_myisam.result	2021-09-28 11:46:34.000000000 +0000
@@ -609,6 +609,7 @@
 *** Drop t14  ***
 DROP TABLE t14;
 DROP TABLE t14;
+RESET REPLICA;
 include/rpl_reset.inc
 
 *************************************************
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_functional_index_cross_version_replication.result mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_functional_index_cross_version_replication.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_functional_index_cross_version_replication.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_functional_index_cross_version_replication.result	2021-09-28 11:46:34.000000000 +0000
@@ -7,6 +7,7 @@
 # TC1. Apply OLD-generated relay log on NEW server
 #
 [connection slave]
+call mtr.add_suppression("Slave SQL.*Error executing row event: .Table .test.t. doesn.t exist., Error_code: MY-001146");
 include/setup_fake_relay_log.inc
 Setting up fake replication from MYSQL_TEST_DIR/std_data/rpl_unfiltered_hidden_gcol.000001
 START SLAVE SQL_THREAD;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_gtid_mode.result mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_gtid_mode.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_gtid_mode.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_gtid_mode.result	2021-09-28 11:46:34.000000000 +0000
@@ -365,7 +365,7 @@
 #
 [connection master]
 SET @debug_saved= @@GLOBAL.DEBUG;
-SET GLOBAL DEBUG= "d,skip_sender_anon_autoposition_error";
+SET GLOBAL DEBUG= "+d,skip_sender_anon_autoposition_error";
 include/rpl_set_gtid_mode.inc [ON on servers 1,2]
 [connection master]
 CREATE TABLE t6(a int);
@@ -412,7 +412,7 @@
 include/sync_slave_sql_with_master.inc
 include/stop_slave.inc
 SET @debug_saved= @@GLOBAL.DEBUG;
-SET GLOBAL DEBUG= "d,fault_injection_new_file_rotate_event";
+SET GLOBAL DEBUG= "+d,fault_injection_new_file_rotate_event";
 SET GLOBAL binlog_error_action= IGNORE_ERROR;
 SET @@GLOBAL.GTID_MODE= OFF_PERMISSIVE;
 ERROR HY000: Error writing file 'slave-bin' (errno: 2 - No such file or directory)
@@ -445,7 +445,7 @@
 RESET SLAVE;
 Warnings:
 Warning	1287	'RESET SLAVE' is deprecated and will be removed in a future release. Please use RESET REPLICA instead
-SET @@GLOBAL.DEBUG= 'd,simulate_source_has_unknown_gtid_mode';
+SET @@GLOBAL.DEBUG= '+d,simulate_source_has_unknown_gtid_mode';
 START SLAVE IO_THREAD;
 Warnings:
 Warning	1287	'START SLAVE' is deprecated and will be removed in a future release. Please use START REPLICA instead
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_loaddata.result mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_loaddata.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_loaddata.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_loaddata.result	2021-09-28 11:46:34.000000000 +0000
@@ -101,6 +101,8 @@
 include/wait_for_slave_sql_error.inc [errno=13113]
 drop table t1, t2;
 drop table t1, t2;
+include/stop_slave_io.inc
+RESET REPLICA;
 include/rpl_reset.inc
 drop database if exists b48297_db1;
 drop database if exists b42897_db2;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_mts_debug.result mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_mts_debug.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_mts_debug.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_mts_debug.result	2021-09-28 11:46:34.000000000 +0000
@@ -17,7 +17,7 @@
 include/start_slave.inc
 INSERT INTO db_1.test_1 VALUES(0);
 include/sync_slave_sql_with_master.inc
-SET GLOBAL debug="d,mta_debug_concurrent_access";
+SET GLOBAL debug="+d,mta_debug_concurrent_access";
 BEGIN;
 INSERT INTO db_1.test_1 VALUES(1);
 BEGIN;
@@ -38,7 +38,7 @@
 set @save.replica_checkpoint_group= @@global.replica_checkpoint_group;
 set @save.replica_parallel_workers= @@global.replica_parallel_workers;
 set @save.debug= @@global.debug;
-SET @@global.debug= "d,mta_worker_thread_fails";
+SET @@global.debug= "+d,mta_worker_thread_fails";
 set @@global.replica_parallel_workers= 2;
 start slave sql_thread;
 Warnings:
@@ -66,7 +66,7 @@
 include/check_slave_is_running.inc
 include/rpl_reset.inc
 include/stop_slave.inc
-SET @@global.debug= "d,inject_init_worker_init_info_fault";
+SET @@global.debug= "+d,inject_init_worker_init_info_fault";
 START SLAVE SQL_THREAD;
 Warnings:
 Warning	1287	'START SLAVE' is deprecated and will be removed in a future release. Please use START REPLICA instead
@@ -82,10 +82,11 @@
 set @@global.replica_parallel_workers= 2;
 include/start_slave.inc
 include/stop_slave.inc
-set @@global.debug= "d,mta_debug_reset_workers_fails";
+set @@global.debug= "+d,mta_debug_reset_workers_fails";
 CHANGE REPLICATION SOURCE to RELAY_LOG_FILE=FILE,  RELAY_LOG_POS= POS;
 ERROR HY000: Cannot clean up worker info tables. Additional error messages can be found in the MySQL error log.
-set @@global.debug= "d,mta_debug_recovery_reset_fails";
+set @@global.debug= "-d,mta_debug_reset_workers_fails";
+set @@global.debug= "+d,mta_debug_recovery_reset_fails";
 start slave sql_thread;
 Warnings:
 Warning	1287	'START SLAVE' is deprecated and will be removed in a future release. Please use START REPLICA instead
@@ -95,10 +96,10 @@
 include/start_slave.inc
 include/stop_slave.inc
 call mtr.add_suppression("Error creating relay log info: Failed to initialize the worker info structure.");
-set @@global.debug= "d,mta_replica_worker_init_at_gaps_fails";
+set @@global.debug= "+d,mta_replica_worker_init_at_gaps_fails";
 start slave sql_thread;
 ERROR HY000: Could not initialize master info structure; more error messages can be found in the MySQL error log
-SET @@global.debug= "";
+set @@global.debug= "-d,mta_replica_worker_init_at_gaps_fails";
 set @@global.replica_parallel_workers= @save.replica_parallel_workers;
 include/start_slave.inc
 include/rpl_reset.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_mts_relay_log_recovery_on_error.result mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_mts_relay_log_recovery_on_error.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_mts_relay_log_recovery_on_error.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_mts_relay_log_recovery_on_error.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,60 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+[connection slave]
+call mtr.add_suppression("Duplicate entry*");
+call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
+call mtr.add_suppression("Failed to initialize the master info structure");
+call mtr.add_suppression("Slave failed to initialize relay log info*");
+call mtr.add_suppression("MTS recovery: automatic recovery failed.*");
+call mtr.add_suppression("Recovery from master pos");
+#### I. Initialize ####
+[connection slave]
+include/stop_slave.inc
+SET @save.innodb_lock_wait_timeout= @@global.innodb_lock_wait_timeout;
+set @@global.innodb_lock_wait_timeout=5 + 1000;
+include/start_slave.inc
+[connection master]
+CREATE DATABASE d1;
+CREATE DATABASE d2;
+CREATE TABLE d1.t (a INT PRIMARY KEY, name text) ENGINE=INNODB;
+CREATE TABLE d2.t (a INT PRIMARY KEY, name text) ENGINE=INNODB;
+#### II. Prepare test scenario ####
+include/sync_slave_sql_with_master.inc
+BEGIN;
+INSERT INTO d2.t VALUES (2, 'Slave local');
+INSERT INTO d1.t VALUES (3, 'Slave local');
+[connection master]
+INSERT INTO d1.t VALUES (1, 'T1');
+INSERT INTO d2.t VALUES (1, 'T2');
+INSERT INTO d2.t VALUES (2, 'T3');
+INSERT INTO d2.t VALUES (3, 'T4');
+INSERT INTO d1.t VALUES (2, 'T5');
+[connection slave1]
+# Now d1.t has two rows and d2.t has one row.
+[connection slave]
+COMMIT;
+include/wait_for_slave_sql_error.inc [errno=1062]
+include/rpl_restart_server.inc [server_number=2 parameters: --skip_replica_start=TRUE --sync_source_info=1 --relay-log-recovery=1]
+[connection slave]
+Relay log recovery should fail as MTS stopped due to an error
+START SLAVE;
+ERROR HY000: Slave failed to initialize relay log info structure from the repository
+Eliminate the cause of MTS error
+DELETE FROM d2.t WHERE a=2;
+DELETE FROM d1.t WHERE a=3;
+include/rpl_restart_server.inc [server_number=2 parameters: --skip_replica_start=TRUE --sync_source_info=1 --relay-log-recovery=1]
+MTS recovery should be successful. Check that gaps are filled.
+include/assert.inc [Table d1.t should contain 2 rows.]
+include/assert.inc [Table d2.t should contain 3 rows.]
+include/start_slave.inc
+[connection master]
+include/sync_slave_sql_with_master.inc
+include/diff_tables.inc [master:d1.t, slave:d1.t]
+include/diff_tables.inc [master:d2.t, slave:d2.t]
+[connection master]
+DROP DATABASE d1;
+DROP DATABASE d2;
+include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_nogtid_create_select.result mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_nogtid_create_select.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_nogtid_create_select.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_nogtid_create_select.result	2021-09-28 11:46:34.000000000 +0000
@@ -33,7 +33,6 @@
 # Wait for server to stop
 # Restart the server.
 include/rpl_start_server.inc [server_number=2]
-SET global DEBUG='-d, crash_on_transactional_ddl_insert';
 include/assert.inc [Make sure there is only table 't0' in schema 'test'.]
 # Reset the master log position back to event that starts
 # CREATE TABLE ... SELECT and start the slave, without causing crash.
@@ -50,4 +49,19 @@
 # Cleanup
 [connection master]
 DROP TABLE t0,t1;
+include/sync_slave_sql_with_master.inc
+#
+# R3 Verify that executing CREATE TABLE ... SELECT with sql mode set
+#    to ANSI gets replicated to slave. This test is added for Bug#33064062.
+#
+[connection master]
+SET @orig_sql_mode_session= @@SESSION.sql_mode;
+SET SESSION sql_mode='ANSI';
+CREATE TABLE t1 AS SELECT 1;
+include/sync_slave_sql_with_master.inc
+include/diff_tables.inc [master:t1, slave:t1]
+[connection master]
+SET SESSION sql_mode= @orig_sql_mode_session;
+DROP TABLE t1;
+include/sync_slave_sql_with_master.inc
 include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_no_gtid_delete_memory_table_after_start_server.result mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_no_gtid_delete_memory_table_after_start_server.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_no_gtid_delete_memory_table_after_start_server.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_no_gtid_delete_memory_table_after_start_server.result	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-include/master-slave.inc
-Warnings:
-Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
-[connection master]
-CALL mtr.add_suppression("Found 1 prepared XA transactions");
-CREATE TABLE t1(c1 INT);
-CREATE TABLE t2(c1 INT) ENGINE = MyISAM;
-CREATE TABLE mem_t1(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-CREATE TABLE mem_t2(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-INSERT INTO mem_t1 VALUES(1),(2),(3);
-INSERT INTO mem_t2 VALUES(1),(2),(3);
-include/sync_slave_sql_with_master.inc
-include/stop_slave.inc
-include/rpl_restart_server.inc [server_number=1]
-include/start_slave.inc
-# Test case 1: verify DELETE FROM mem_xx can be binlogged correctly
-#              in CREATE TABLE ... SELECT
-[connection master]
-include/save_binlog_position.inc
-CREATE TABLE t3 SELECT * FROM mem_t1 UNION SELECT 10;
-include/assert_binlog_events.inc [Anonymous_Gtid # Query/.*BEGIN # Query/.*DELETE.* # Query/.*COMMIT]
-include/sync_slave_sql_with_master.inc
-SELECT * FROM mem_t1;
-c1
-#
-# Test case 2: verify DELETE FROM mem_xx can be binlogged correctly
-#              in a DML on a MyISAM table
-[connection master]
-include/save_binlog_position.inc
-INSERT INTO t2 SELECT * FROM mem_t2 UNION SELECT 10;
-include/assert_binlog_events.inc [Anonymous_Gtid # Query/.*BEGIN # Query/.*DELETE.* # Query/.*COMMIT]
-include/sync_slave_sql_with_master.inc
-SELECT * FROM mem_t2;
-c1
-[connection master]
-DROP TABLE t1, t2, t3, mem_t1, mem_t2;
-include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_no_gtid_truncate_memory_table_after_start_server.result mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_no_gtid_truncate_memory_table_after_start_server.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_no_gtid_truncate_memory_table_after_start_server.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_no_gtid_truncate_memory_table_after_start_server.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,38 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+CALL mtr.add_suppression("Found 1 prepared XA transactions");
+CREATE TABLE t1(c1 INT);
+CREATE TABLE t2(c1 INT) ENGINE = MyISAM;
+CREATE TABLE mem_t1(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+CREATE TABLE mem_t2(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+INSERT INTO mem_t1 VALUES(1),(2),(3);
+INSERT INTO mem_t2 VALUES(1),(2),(3);
+include/sync_slave_sql_with_master.inc
+include/stop_slave.inc
+include/rpl_restart_server.inc [server_number=1]
+include/start_slave.inc
+# Test case 1: verify TRUNCATE TABLE mem_xx can be binlogged correctly
+#              in CREATE TABLE ... SELECT
+[connection master]
+include/save_binlog_position.inc
+CREATE TABLE t3 SELECT * FROM mem_t1 UNION SELECT 10;
+include/assert_binlog_events.inc [#Anonymous_Gtid # !Q(TRUNCATE.*) #Anonymous_Gtid # !Q(CREATE.*)]
+include/sync_slave_sql_with_master.inc
+SELECT * FROM mem_t1;
+c1
+#
+# Test case 2: verify TRUNCATE TABLE mem_xx can be binlogged correctly
+#              in a DML on a MyISAM table
+[connection master]
+include/save_binlog_position.inc
+INSERT INTO t2 SELECT * FROM mem_t2 UNION SELECT 10;
+include/assert_binlog_events.inc [#Anonymous_Gtid # !Q(TRUNCATE.*) #Anonymous_Gtid # !Begin]
+include/sync_slave_sql_with_master.inc
+SELECT * FROM mem_t2;
+c1
+[connection master]
+DROP TABLE t1, t2, t3, mem_t1, mem_t2;
+include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_rotate_row_trans.result mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_rotate_row_trans.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_rotate_row_trans.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_rotate_row_trans.result	2021-09-28 11:46:34.000000000 +0000
@@ -9,7 +9,7 @@
 # Sync slave with master and setup debug sync point
 include/sync_slave_sql_with_master.inc
 SET @save_debug=@@global.debug;
-SET GLOBAL DEBUG='d,stop_io_after_reading_write_rows_log_event';
+SET GLOBAL DEBUG='+d,stop_io_after_reading_write_rows_log_event';
 # Insert the data in the master
 [connection master]
 BEGIN;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_row_mts_crash_safe.result mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_row_mts_crash_safe.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_row_mts_crash_safe.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_row_mts_crash_safe.result	2021-09-28 11:46:34.000000000 +0000
@@ -356,6 +356,7 @@
   `Master_zstd_compression_level` int unsigned NOT NULL COMMENT 'Compression level associated with zstd compression algorithm.',
   `Tls_ciphersuites` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'Ciphersuites used for TLS 1.3 communication with the master server.',
   `Source_connection_auto_failover` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Indicates whether the channel connection failover is enabled.',
+  `Gtid_only` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Indicates if this channel only uses GTIDs and does not persist positions.',
   PRIMARY KEY (`Channel_name`)
 ) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='Master Information'
 SHOW CREATE TABLE mysql.slave_relay_log_info;
@@ -434,6 +435,7 @@
   `Master_zstd_compression_level` int unsigned NOT NULL COMMENT 'Compression level associated with zstd compression algorithm.',
   `Tls_ciphersuites` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'Ciphersuites used for TLS 1.3 communication with the master server.',
   `Source_connection_auto_failover` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Indicates whether the channel connection failover is enabled.',
+  `Gtid_only` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Indicates if this channel only uses GTIDs and does not persist positions.',
   PRIMARY KEY (`Channel_name`)
 ) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='Master Information'
 SHOW CREATE TABLE mysql.slave_relay_log_info;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_semi_sync_ack_thread.result mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_semi_sync_ack_thread.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_semi_sync_ack_thread.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_semi_sync_ack_thread.result	2021-09-28 11:46:34.000000000 +0000
@@ -136,7 +136,7 @@
 # It should print an error to log if select() function returns -1
 #
 SET @save_debug = @@GLOBAL.debug;
-SET GLOBAL debug = 'd,rpl_semisync_simulate_select_error';
+SET GLOBAL debug = '+d,rpl_semisync_simulate_select_error';
 INSERT INTO t1 VALUES(1);
 SET GLOBAL debug = @save_debug;
 #
@@ -170,7 +170,7 @@
 #
 # Failure on creating ack receiver thread
 #
-SET GLOBAL debug = 'd,rpl_semisync_simulate_create_thread_failure';
+SET GLOBAL debug = '+d,rpl_semisync_simulate_create_thread_failure';
 SET GLOBAL rpl_semi_sync_source_enabled= ON;
 include/assert.inc [ should be 0]
 include/assert.inc [ack receiver thread is destroied;]
@@ -179,20 +179,21 @@
 #
 SET GLOBAL debug= @save_debug;
 SET GLOBAL rpl_semi_sync_source_enabled= ON;
-SET GLOBAL debug = 'd,rpl_semisync_simulate_thread_join_failure';
+SET GLOBAL debug= '+d,rpl_semisync_simulate_thread_join_failure';
 SET GLOBAL rpl_semi_sync_source_enabled= OFF;
 include/assert.inc [ should be 0]
 include/assert.inc [ack receiver thread is destroied]
 #
 # Failure on registering semisync slave
 #
-SET GLOBAL debug= 'd,rpl_semisync_simulate_add_replica_failure';
+SET GLOBAL debug= '-d,rpl_semisync_simulate_thread_join_failure';
+SET GLOBAL debug= '+d,rpl_semisync_simulate_add_replica_failure';
 SET GLOBAL rpl_semi_sync_source_enabled= ON;
 [connection server_2]
 include/stop_slave.inc
 CHANGE REPLICATION SOURCE TO SOURCE_RETRY_COUNT = 1, SOURCE_CONNECT_RETRY = 5;
 SET @save_debug= @@GLOBAL.debug;
-SET GLOBAL debug= 'd,dbug.before_get_SOURCE_UUID';
+SET GLOBAL debug= '+d,dbug.before_get_SOURCE_UUID';
 include/install_semisync_replica.inc
 Warnings:
 Note	3084	Replication thread(s) for channel '' are already stopped.
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_semi_sync_after_sync.result mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_semi_sync_after_sync.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_semi_sync_after_sync.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_semi_sync_after_sync.result	2021-09-28 11:46:34.000000000 +0000
@@ -153,7 +153,7 @@
 # For coverage test, simulate after_sync hook error
 #
 SET @saved_debug= @@GLOBAL.debug;
-SET GLOBAL debug='d,simulate_after_sync_hook_error';
+SET GLOBAL debug='+d,simulate_after_sync_hook_error';
 INSERT INTO t1 VALUES(1);
 SELECT * FROM t1;
 c1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_semi_sync_deadlock.result mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_semi_sync_deadlock.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_semi_sync_deadlock.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_semi_sync_deadlock.result	2021-09-28 11:46:34.000000000 +0000
@@ -33,7 +33,7 @@
 # Cleanup
 SET GLOBAL rpl_semi_sync_source_timeout= 600000;
 include/sync_slave_sql_with_master.inc
-SET GLOBAL debug= 'd,semi_sync_3-way_deadlock';
+SET GLOBAL debug= '+d,semi_sync_3-way_deadlock';
 SET DEBUG_SYNC= "before_process_commit_stage_queue WAIT_FOR signal.rotate_finished";
 # Build 10 connections to master server
 # Execute INSERT statement on these 10 connections in parallel
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_semi_sync_wait_slave_count.result mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_semi_sync_wait_slave_count.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_semi_sync_wait_slave_count.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_semi_sync_wait_slave_count.result	2021-09-28 11:46:34.000000000 +0000
@@ -79,7 +79,7 @@
 ######################################################################
 [connection server_4]
 SET @original_debug = @@GLOBAL.debug;
-SET GLOBAL debug = 'd,rpl_semisync_before_send_ack';
+SET GLOBAL debug = '+d,rpl_semisync_before_send_ack';
 [connection default]
 INSERT INTO t1 VALUES(104);
 [connection server_2]
@@ -105,10 +105,10 @@
 INSERT INTO t1 VALUES(130);;
 [connection server_2]
 SET @original_debug = @@GLOBAL.debug;
-SET GLOBAL debug = 'd,rpl_semisync_before_send_ack';
+SET GLOBAL debug = '+d,rpl_semisync_before_send_ack';
 [connection server_3]
 SET @original_debug = @@GLOBAL.debug;
-SET GLOBAL debug = 'd,rpl_semisync_before_send_ack';
+SET GLOBAL debug = '+d,rpl_semisync_before_send_ack';
 [connection default]
 INSERT INTO t1 VALUES(131);;
 [connection server_5]
@@ -149,7 +149,7 @@
 # setting rpl_semi_sync_source_wait_for_replica_count fails
 ######################################################################
 SET @original_debug = @@GLOBAL.debug;
-SET GLOBAL debug = 'd,rpl_semisync_simulate_allocate_ack_container_failure';
+SET GLOBAL debug = '+d,rpl_semisync_simulate_allocate_ack_container_failure';
 SET GLOBAL rpl_semi_sync_source_wait_for_replica_count = 2;
 include/assert.inc [ should be 4]
 INSERT INTO t1 VALUES(110);
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_sql_thread_killed_waiting_commit_lock.result mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_sql_thread_killed_waiting_commit_lock.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_sql_thread_killed_waiting_commit_lock.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_sql_thread_killed_waiting_commit_lock.result	2021-09-28 11:46:34.000000000 +0000
@@ -32,7 +32,6 @@
 [connection master]
 include/sync_slave_sql_with_master.inc
 include/diff_tables.inc [master:t1, slave:t1]
-SET @@GLOBAL.DEBUG= '$debug_saved';
 [connection master]
 DROP TABLE t1;
 include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_stm_loaddata_concurrent.result mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_stm_loaddata_concurrent.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_stm_loaddata_concurrent.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_stm_loaddata_concurrent.result	2021-09-28 11:46:34.000000000 +0000
@@ -117,6 +117,8 @@
 include/wait_for_slave_sql_error.inc [errno=13113]
 drop table t1, t2;
 drop table t1, t2;
+include/stop_slave_io.inc
+RESET REPLICA;
 include/rpl_reset.inc
 drop database if exists b48297_db1;
 drop database if exists b42897_db2;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_stm_mixed_mts_crash_safe.result mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_stm_mixed_mts_crash_safe.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_stm_mixed_mts_crash_safe.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_stm_mixed_mts_crash_safe.result	2021-09-28 11:46:34.000000000 +0000
@@ -356,6 +356,7 @@
   `Master_zstd_compression_level` int unsigned NOT NULL COMMENT 'Compression level associated with zstd compression algorithm.',
   `Tls_ciphersuites` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'Ciphersuites used for TLS 1.3 communication with the master server.',
   `Source_connection_auto_failover` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Indicates whether the channel connection failover is enabled.',
+  `Gtid_only` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Indicates if this channel only uses GTIDs and does not persist positions.',
   PRIMARY KEY (`Channel_name`)
 ) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='Master Information'
 SHOW CREATE TABLE mysql.slave_relay_log_info;
@@ -434,6 +435,7 @@
   `Master_zstd_compression_level` int unsigned NOT NULL COMMENT 'Compression level associated with zstd compression algorithm.',
   `Tls_ciphersuites` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'Ciphersuites used for TLS 1.3 communication with the master server.',
   `Source_connection_auto_failover` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Indicates whether the channel connection failover is enabled.',
+  `Gtid_only` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Indicates if this channel only uses GTIDs and does not persist positions.',
   PRIMARY KEY (`Channel_name`)
 ) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='Master Information'
 SHOW CREATE TABLE mysql.slave_relay_log_info;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_stm_stop_middle_group.result mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_stm_stop_middle_group.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_stm_stop_middle_group.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_stm_stop_middle_group.result	2021-09-28 11:46:34.000000000 +0000
@@ -16,13 +16,14 @@
 commit;
 call mtr.add_suppression("Slave SQL.*Request to stop slave SQL Thread received while applying a group that has non-transactional changes; waiting for completion of the group");
 call mtr.add_suppression("Slave SQL.*Slave SQL Thread stopped with incomplete event group having non-transactional changes");
+call mtr.add_suppression("Slave SQL.*The slave coordinator and worker threads are stopped.*");
 include/wait_for_slave_sql_to_stop.inc
 include/check_slave_no_error.inc
 include/assert.inc [Everything that was read, was executed]
 include/assert.inc [There is one row in table tm]
 include/assert.inc [There is one row in table ti]
 include/stop_slave.inc
-set @@global.debug="-d";
+set @@global.debug="-d,stop_replica_middle_group";
 include/start_slave.inc
 truncate table tm;
 truncate table ti;
@@ -34,25 +35,25 @@
 Warnings:
 Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional table after accessing a transactional table within the same transaction.
 commit;
-include/wait_for_slave_sql_error.inc [errno=13117]
-Last_SQL_Error = 'Fatal error: ... Slave SQL Thread stopped with incomplete event group having non-transactional changes. If the group consists solely of row-based events, you can try to restart the slave with --replica-exec-mode=IDEMPOTENT, which ignores duplicate key, key not found, and similar errors (see documentation for details).'
+include/wait_for_slave_sql_error.inc [errno=13117,1756]
 include/assert.inc [Not everything that was read, was executed]
 include/assert.inc [There is one row in table tm]
 include/assert.inc [There is no row in table ti]
 include/stop_slave.inc
-set @@global.debug="-d";
+set @@global.debug="-d,stop_replica_middle_group";
+set @@global.debug="-d,incomplete_group_in_relay_log";
 truncate table tm;
 include/start_slave.inc
 set @@global.debug="+d,stop_replica_middle_group";
 set @@global.debug="+d,incomplete_group_in_relay_log";
 update tm as t1, ti as t2 set t1.a=t1.a * 2, t2.a=t2.a * 2;
-include/wait_for_slave_sql_error.inc [errno=13117]
-Last_SQL_Error = 'Fatal error: ... Slave SQL Thread stopped with incomplete event group having non-transactional changes. If the group consists solely of row-based events, you can try to restart the slave with --replica-exec-mode=IDEMPOTENT, which ignores duplicate key, key not found, and similar errors (see documentation for details).'
+include/wait_for_slave_sql_error.inc [errno=13117,1756]
 include/assert.inc [Not everything that was read, was executed]
 include/assert.inc [The max value for field 'a' is 2]
 include/assert.inc [The max value for field 'a' is 1]
 include/stop_slave.inc
-set @@global.debug="-d";
+set @@global.debug="-d,stop_replica_middle_group";
+set @@global.debug="-d,incomplete_group_in_relay_log";
 include/rpl_reset.inc
 drop table tm, ti;
 include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_stop_slave.result mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_stop_slave.result
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/r/rpl_stop_slave.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/r/rpl_stop_slave.result	2021-09-28 11:46:34.000000000 +0000
@@ -18,7 +18,7 @@
 # Suspend the INSERT statement in current transaction on SQL thread.
 # It guarantees that SQL thread is applying the transaction when
 # STOP SLAVE command launchs.
-SET GLOBAL debug= 'd,after_mysql_insert';
+SET GLOBAL debug= '+d,after_mysql_insert';
 include/start_slave.inc
 
 # CREATE TEMPORARY TABLE with InnoDB engine
@@ -85,7 +85,7 @@
 include/wait_for_slave_sql_to_start.inc
 
 # Test end
-SET GLOBAL debug= '$debug_save';
+SET GLOBAL debug= '-d,after_mysql_insert';
 include/restart_slave.inc
 call mtr.add_suppression("Slave SQL.*Request to stop slave SQL Thread received while applying a group that has non-transactional changes; waiting for completion of the group");
 call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_apply_binlog_with_gtid_when_gtid_mode_off.test mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_apply_binlog_with_gtid_when_gtid_mode_off.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_apply_binlog_with_gtid_when_gtid_mode_off.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_apply_binlog_with_gtid_when_gtid_mode_off.test	2021-09-28 11:46:34.000000000 +0000
@@ -12,10 +12,6 @@
 #     and wait for SQL thread error.
 ###############################################################################
 
-# We did not run the test with MTS, since the slave sql error
-# 'ER_CANT_SET_GTID_NEXT_TO_GTID_WHEN_GTID_MODE_IS_OFF' is
-# overwritten by 'ER_MTS_INCONSISTENT_DATA' in MTS.
---source include/not_mts_replica_parallel_workers.inc
 --source include/have_binlog_format_statement.inc
 --source include/master-slave.inc
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_async_conn_failover_gtid_auto_position_error.test mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_async_conn_failover_gtid_auto_position_error.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_async_conn_failover_gtid_auto_position_error.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_async_conn_failover_gtid_auto_position_error.test	2021-09-28 11:46:34.000000000 +0000
@@ -21,6 +21,7 @@
 # 6. Clean up
 #
 --source include/have_gtid_mode_off.inc
+--let $rpl_skip_start_slave= 1
 --source include/master-slave.inc
 
 --echo #
@@ -55,7 +56,6 @@
 --echo #
 --echo # 3. Enable gtid_mode.
 --echo #
---source include/stop_slave.inc
 SET GLOBAL ENFORCE_GTID_CONSISTENCY = WARN;
 SET GLOBAL ENFORCE_GTID_CONSISTENCY = ON;
 SET GLOBAL GTID_MODE = OFF_PERMISSIVE;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_begin_commit_rollback.test mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_begin_commit_rollback.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_begin_commit_rollback.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_begin_commit_rollback.test	2021-09-28 11:46:34.000000000 +0000
@@ -21,13 +21,12 @@
 source include/force_myisam_default.inc;
 source include/have_myisam.inc;
 source include/have_binlog_format_statement.inc;
-# UNTIL is not supported by MTS yet (TODO: support and remove the guard)
--- source include/not_mts_replica_parallel_workers.inc
 --source include/set_privilege_checks_user_as_system_user.inc
 source include/master-slave.inc;
 
 connection slave;
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
+call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
 
 connection master;
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_bug58546.test mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_bug58546.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_bug58546.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_bug58546.test	2021-09-28 11:46:34.000000000 +0000
@@ -29,8 +29,8 @@
 # make sure there are no zombie threads
 --source include/stop_dump_threads.inc
 
-let $debug_save= `SELECT @@GLOBAL.debug`;
-SET GLOBAL debug= 'd,dump_thread_wait_before_send_xid';
+--let $debug_point= dump_thread_wait_before_send_xid
+--source include/add_debug_point.inc
 
 --source include/rpl_connection_slave.inc
 --source include/start_slave.inc
@@ -79,7 +79,10 @@
 # sure that we disable the DBUG_EXECUTE_IF
 # that would set the dump thread to wait
 --source include/rpl_connection_master.inc
-SET GLOBAL debug= $debug_save;
+
+--let $debug_point= dump_thread_wait_before_send_xid
+--source include/remove_debug_point.inc
+
 # make sure that there are no zombie threads
 --source include/stop_dump_threads.inc
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_checksum.test mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_checksum.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_checksum.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_checksum.test	2021-09-28 11:46:34.000000000 +0000
@@ -99,7 +99,7 @@
 # instruction to the dump thread
 
 connection slave;
-set @@global.debug='d,simulate_replica_unaware_checksum';
+set @@global.debug='+d,simulate_replica_unaware_checksum';
 start slave;
 let $slave_io_errno= 13114; # ER_SERVER_MASTER_FATAL_ERROR_READING_BINLOG
 --let $show_slave_io_error= 1
@@ -115,7 +115,8 @@
 # or in waiting state before updating the global debug
 # variable (see BUG#11765758 for details).
 --source include/stop_slave.inc
-set @@global.debug='';
+set @@global.debug='-d,simulate_replica_unaware_checksum';
+
 
 connection slave;
 source include/start_slave.inc;
@@ -127,10 +128,10 @@
 # C1. Failure by a client thread
 connection master;
 set @@global.source_verify_checksum = 1;
-set @@session.debug='d,simulate_checksum_test_failure';
+set @@session.debug='+d,simulate_checksum_test_failure';
 --error ER_ERROR_WHEN_EXECUTING_COMMAND
 show binlog events;
-set @@session.debug='';
+set @@session.debug='-d,simulate_checksum_test_failure';
 set @@global.source_verify_checksum = default;
 
 #connection master;
@@ -146,15 +147,15 @@
 connection slave;
 
 # C2. Failure by IO thread
-# instruction to io thread
-set @@global.debug='d,simulate_checksum_test_failure';
+# instruction to io threadwait_for_slave_param.inc
+set @@global.debug='+d,simulate_checksum_test_failure';
 start slave io_thread;
 # ER_SLAVE_RELAY_LOG_WRITE_FAILURE, ER_NETWORK_READ_EVENT_CHECKSUM_FAILURE
 let $slave_io_errno= 13122, 13115;
 --let $show_slave_io_error= 0
 source include/wait_for_slave_io_error.inc;
 # no need to stop the IO thread, it is already stopped
-set @@global.debug='';
+set @@global.debug='-d,simulate_checksum_test_failure';
 
 # to make IO thread re-read it again w/o the failure
 start slave io_thread;
@@ -164,14 +165,14 @@
 # C3. Failure by SQL thread
 # instruction to sql thread;
 set @@global.replica_sql_verify_checksum = 1;
-set @@global.debug='d,simulate_checksum_test_failure';
+set @@global.debug='+d,simulate_checksum_test_failure';
 start slave sql_thread;
 let $slave_sql_errno= 13117; # ER_SLAVE_FATAL_ERROR
 --let $show_slave_sql_error= 1
 source include/wait_for_slave_sql_error.inc;
 --source include/stop_slave.inc
 # resuming SQL thread to parse out the event w/o the failure
-set @@global.debug=''; 
+set @@global.debug='-d,simulate_checksum_test_failure';
 source include/start_slave.inc;
 
 connection master;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_functional_index_cross_version_replication.test mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_functional_index_cross_version_replication.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_functional_index_cross_version_replication.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_functional_index_cross_version_replication.test	2021-09-28 11:46:34.000000000 +0000
@@ -34,7 +34,6 @@
 --source include/not_have_privilege_checks_user.inc
 --source include/master-slave.inc
 --source include/have_binlog_format_row.inc
---source include/not_mts_replica_parallel_workers.inc
 
 --echo #
 --echo # TC1. Apply OLD-generated relay log on NEW server
@@ -44,6 +43,7 @@
 # 1) Stop the slave.
 #
 --source include/rpl_connection_slave.inc
+call mtr.add_suppression("Slave SQL.*Error executing row event: .Table .test.t. doesn.t exist., Error_code: MY-001146");
 
 #
 # 2) Setup the previous saved log as the slave relay log which contains:
@@ -75,6 +75,11 @@
 # bipass _OLD_ relay-logs. Therefore, making the test fail if the table doesn't
 # exist.
 #
+
+--let $wait_timeout= 60
+--let $wait_condition= SELECT count(*) = 1 FROM t
+--source include/wait_condition_or_abort.inc
+
 --let $table_t = `SHOW TABLES LIKE "t"`
 --let $assert_text = Slave was able to apply the provided relay log.
 --let $assert_cond = "$table_t" = "t"
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_gtid_mode.test mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_gtid_mode.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_gtid_mode.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_gtid_mode.test	2021-09-28 11:46:34.000000000 +0000
@@ -518,7 +518,7 @@
 --source include/rpl_connection_master.inc
 SET @debug_saved= @@GLOBAL.DEBUG;
 
-SET GLOBAL DEBUG= "d,skip_sender_anon_autoposition_error";
+SET GLOBAL DEBUG= "+d,skip_sender_anon_autoposition_error";
 
 --let $rpl_server_numbers= 1,2
 --let $rpl_skip_sync= 1
@@ -603,7 +603,7 @@
 --source include/stop_slave.inc
 
 SET @debug_saved= @@GLOBAL.DEBUG;
-SET GLOBAL DEBUG= "d,fault_injection_new_file_rotate_event";
+SET GLOBAL DEBUG= "+d,fault_injection_new_file_rotate_event";
 
 SET GLOBAL binlog_error_action= IGNORE_ERROR;
 
@@ -659,7 +659,7 @@
 --connection slave
 --source include/stop_slave.inc
 RESET SLAVE;
-SET @@GLOBAL.DEBUG= 'd,simulate_source_has_unknown_gtid_mode';
+SET @@GLOBAL.DEBUG= '+d,simulate_source_has_unknown_gtid_mode';
 START SLAVE IO_THREAD;
 --let $slave_io_errno= convert_error(ER_SLAVE_FATAL_ERROR)
 --let $show_slave_io_error= 1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_mts_debug.test mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_mts_debug.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_mts_debug.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_mts_debug.test	2021-09-28 11:46:34.000000000 +0000
@@ -39,7 +39,7 @@
 # one in binlog as a warmup.
 INSERT INTO db_1.test_1 VALUES(0);
 --source include/sync_slave_sql_with_master.inc
-SET GLOBAL debug="d,mta_debug_concurrent_access";
+SET GLOBAL debug="+d,mta_debug_concurrent_access";
 
 --connection master
 BEGIN;
@@ -88,7 +88,7 @@
 # set @@global.replica_checkpoint_group= 524280 + 1;
 
 set @save.debug= @@global.debug;
-SET @@global.debug= "d,mta_worker_thread_fails";
+SET @@global.debug= "+d,mta_worker_thread_fails";
 set @@global.replica_parallel_workers= 2;
 
 start slave sql_thread;
@@ -155,7 +155,7 @@
 
 --source include/stop_slave.inc
 --let $saved_debug=`SELECT @global.debug`
-SET @@global.debug= "d,inject_init_worker_init_info_fault";
+SET @@global.debug= "+d,inject_init_worker_init_info_fault";
 START SLAVE SQL_THREAD;
 --let $slave_sql_errno=13117
 --source include/wait_for_slave_sql_error.inc
@@ -182,7 +182,7 @@
 --source include/start_slave.inc
 --source include/stop_slave.inc
 
-set @@global.debug= "d,mta_debug_reset_workers_fails";
+set @@global.debug= "+d,mta_debug_reset_workers_fails";
 
 let $relay_file = query_get_value( SHOW SLAVE STATUS, Relay_Log_File, 1 );
 let $relay_pos = query_get_value( SHOW SLAVE STATUS, Relay_Log_Pos, 1 );
@@ -192,7 +192,8 @@
 
 ## Relay_log_info::reset_workers_recovered() error branch
 
-set @@global.debug= "d,mta_debug_recovery_reset_fails";
+set @@global.debug= "-d,mta_debug_reset_workers_fails";
+set @@global.debug= "+d,mta_debug_recovery_reset_fails";
 start slave sql_thread;
 # ER_SLAVE_FATAL_ERROR
 --let $slave_sql_errno=13117
@@ -210,14 +211,14 @@
 
 call mtr.add_suppression("Error creating relay log info: Failed to initialize the worker info structure.");
 
-set @@global.debug= "d,mta_replica_worker_init_at_gaps_fails";
+set @@global.debug= "+d,mta_replica_worker_init_at_gaps_fails";
 --error ER_MASTER_INFO
 start slave sql_thread;
 
 #
 # clean up
 #
-SET @@global.debug= "";
+set @@global.debug= "-d,mta_replica_worker_init_at_gaps_fails";
 set @@global.replica_parallel_workers= @save.replica_parallel_workers;
 
 --source include/start_slave.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_mts_relay_log_recovery_on_error-slave.opt mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_mts_relay_log_recovery_on_error-slave.opt
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_mts_relay_log_recovery_on_error-slave.opt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_mts_relay_log_recovery_on_error-slave.opt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1 @@
+--replica-transaction-retries=0 --sync_source_info=1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_mts_relay_log_recovery_on_error.test mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_mts_relay_log_recovery_on_error.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_mts_relay_log_recovery_on_error.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_mts_relay_log_recovery_on_error.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,118 @@
+###############################################################################
+# Bug#21507981: REPLICATION POSITION LOST AFTER CRASH ON MTS CONFIGURED SLAVE
+#
+# Problem:
+# ========
+# Enable MTS along with crash-safe replication tables. Make sure that the server
+# is busily inserting data with multiple threads in parallel. Shutdown mysqld
+# uncleanly (kill -9 or power off server without notice).
+#
+# Now users are restarting the server with --relay-log-recovery=1 to recover the
+# crashed slave.
+#
+# This results in following error:
+# ================================
+# 2015-06-24 13:49:03 3895 [ERROR] --relay-log-recovery cannot be executed when
+# the slave was stopped with an error or killed in MTS mode; consider using
+# RESET SLAVE or restart the server with --relay-log-recovery = 0 followed by
+# START SLAVE UNTIL SQL_AFTER_MTS_GAPS.
+#
+# i.e relay-log-recovery will not work in MTS mode.
+###############################################################################
+# Following test demonstrates that when a gap is generated because MTS has
+# stopped due to an error then attempting 'relay-log-recovery' will not be
+# successful. Once the route cause of the error is eliminated restarting the
+# recovery with relay-log-recovery=1 should fix the issue.
+#
+# Testing Method:
+# ===============
+# It first creates two databases (d1 and d2) and setup slave to use two parallel
+# workers. The test case then insert on the slave a tuple that will block
+# writes on d2 and generate gaps. Now COMMIT the blocking tuple on slave so
+# that workers will proceed and apply the pending transactions. This will
+# result in duplicate key error and slave will stop. Now crash the slave
+# server and initiate relay-log-recovery. It should fail as slave has stopped
+# due to an error. Eliminate the cause of duplicate key error by removing the
+# local changes on slave. Restart the recovery process it should be
+# successful.
+--source include/force_restart.inc
+--source include/have_binlog_format_statement.inc
+# Test requires master-info-repository=TABLE, relay-log-info-repository=TABLE
+--source include/have_slave_repository_type_table.inc
+--source include/only_mts_replica_parallel_workers.inc
+--source include/only_mts_replica_parallel_type_database.inc
+--source include/master-slave.inc
+
+--source include/rpl_connection_slave.inc
+call mtr.add_suppression("Duplicate entry*");
+call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
+call mtr.add_suppression("Failed to initialize the master info structure");
+call mtr.add_suppression("Slave failed to initialize relay log info*");
+call mtr.add_suppression("MTS recovery: automatic recovery failed.*");
+call mtr.add_suppression("Recovery from master pos");
+
+--source extra/rpl_tests/rpl_generate_mts_gap.test
+
+--source include/rpl_connection_slave.inc
+COMMIT;
+--let $slave_sql_errno= convert_error(ER_DUP_ENTRY)
+source include/wait_for_slave_sql_error.inc;
+
+# Restart the slave server - Recovery will fail as MTS has stopped due to an
+# error.
+--let $rpl_server_number= 2
+--let $rpl_server_parameters= --skip_replica_start=TRUE --sync_source_info=1 --relay-log-recovery=1
+--source include/rpl_restart_server.inc
+
+--source include/rpl_connection_slave.inc
+--exec echo "Relay log recovery should fail as MTS stopped due to an error"
+
+--error ER_SLAVE_RLI_INIT_REPOSITORY
+START SLAVE;
+
+# Remove the affending rows from slave.
+--exec echo "Eliminate the cause of MTS error"
+DELETE FROM d2.t WHERE a=2;
+DELETE FROM d1.t WHERE a=3;
+
+--let $table=d2.t
+--let $count=1
+--source include/wait_until_rows_count.inc
+
+--let $table=d1.t
+--let $count=2
+--source include/wait_until_rows_count.inc
+
+# Restart the slave server this should fix the gaps.
+--let $rpl_server_number= 2
+--let $rpl_server_parameters= --skip_replica_start=TRUE --sync_source_info=1 --relay-log-recovery=1
+--source include/rpl_restart_server.inc
+
+--exec echo "MTS recovery should be successful. Check that gaps are filled."
+
+--let $assert_text= Table d1.t should contain 2 rows.
+--let $assert_cond= [select count(*) from d1.t] = 2
+--source include/assert.inc
+
+--let $assert_text= Table d2.t should contain 3 rows.
+--let $assert_cond= [select count(*) from d2.t] = 3
+--source include/assert.inc
+
+--source include/start_slave.inc
+
+# Check consistency
+--source include/rpl_connection_master.inc
+--source include/sync_slave_sql_with_master.inc
+--let $diff_tables= master:d1.t, slave:d1.t
+--source include/diff_tables.inc
+
+--let $diff_tables= master:d2.t, slave:d2.t
+--source include/diff_tables.inc
+
+#
+# Cleanup
+#
+--source include/rpl_connection_master.inc
+DROP DATABASE d1;
+DROP DATABASE d2;
+--source include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_mts_submode_switch-slave.opt mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_mts_submode_switch-slave.opt
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_mts_submode_switch-slave.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_mts_submode_switch-slave.opt	2021-09-28 11:46:34.000000000 +0000
@@ -1 +1,2 @@
---replica-parallel-workers=4 --replica-transaction-retries=0
+--replica-transaction-retries=0
+--replica-preserve-commit-order=OFF
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_mts_submode_switch.test mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_mts_submode_switch.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_mts_submode_switch.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_mts_submode_switch.test	2021-09-28 11:46:34.000000000 +0000
@@ -5,6 +5,7 @@
 -- source include/master-slave.inc
 -- source include/force_myisam_default.inc
 -- source include/have_myisam.inc
+-- source include/only_mts_replica_parallel_workers.inc
 call mtr.add_suppression("Statement is unsafe because it uses a system function that may return a different value on the slave");
 -- sync_slave_with_master
 -- connection master
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_no_gtid_delete_memory_table_after_start_server.test mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_no_gtid_delete_memory_table_after_start_server.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_no_gtid_delete_memory_table_after_start_server.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_no_gtid_delete_memory_table_after_start_server.test	1970-01-01 00:00:00.000000000 +0000
@@ -1,93 +0,0 @@
-################################################################################
-# BUG#21045848 XA+MEMORY TABLE: POST SERVER RESTART 'XA COMMIT'
-#              IS OVERRIDDEN BY 'DELETE' CMD
-#
-# Memory table's data will be lost after server restarts. To keep the data
-# consistency between master and slave, it just binlogs
-# 'DELETE FROM `db`.`table_name`' when the memory table is locked first time.
-# So DELETE statement could be binlogged in many statements.
-#
-# Because it was not handled correctly, it caused below problems:
-## - COM_FIELD_LIST
-#   it didn't flush binlog cache to binlog file. So the DELETEs were not
-#   binlogged in COM_FIELD_LIST, it was binlogged with next statement together.
-#
-# - CREATE TABLE ... LIKE memory_table
-# - CREATE TABLE ... SELECT memory_table
-#   They were binlogged like:
-#   GTID_log_event | Anonymous_gtid_log_event
-#   DELETE FROM memory_table
-#   CREATE TABLE ... LIKE memory_table | CREATE TABLE ... SELECT memory_table
-#
-#   Both statements shared the same gtid event. That was not correct.
-#
-# - DELETE was binlogged without BEGIN and COMMIT
-#   It caused some DML binlogged without BEGIN and COMMIT.  For example:
-#   INSERT INTO myisam_t1 SELECT * FROM memory_table
-#   it was binlogged as:
-#   GTID_log_event | Anonymous_gtid_log_event
-#   DELETE FROM memory_table
-#   INSERT INTO myisam_t1 SELECT * FROM memory_table
-#
-# The test cases verify some cases that cannot be run when gtid mode is on.
-#
-# See rpl_gtid_delete_memory_table_after_start_server.test for the tests with
-# gtid_mode=on.
-################################################################################
-
---source include/force_myisam_default.inc
---source include/have_myisam.inc
-
---source include/set_privilege_checks_user_as_system_user.inc
---source include/master-slave.inc
-
-CALL mtr.add_suppression("Found 1 prepared XA transactions");
-CREATE TABLE t1(c1 INT);
-CREATE TABLE t2(c1 INT) ENGINE = MyISAM;
-CREATE TABLE mem_t1(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-CREATE TABLE mem_t2(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-
-INSERT INTO mem_t1 VALUES(1),(2),(3);
-INSERT INTO mem_t2 VALUES(1),(2),(3);
-
---source include/sync_slave_sql_with_master.inc
---source include/stop_slave.inc
-
---let $rpl_server_number=1
---source include/rpl_restart_server.inc
-
---source include/start_slave.inc
-
---echo # Test case 1: verify DELETE FROM mem_xx can be binlogged correctly
---echo #              in CREATE TABLE ... SELECT
---source include/rpl_connection_master.inc
---source include/save_binlog_position.inc
-
-CREATE TABLE t3 SELECT * FROM mem_t1 UNION SELECT 10;
-
---let $limit= 0,4
---let $event_sequence= Anonymous_Gtid # Query/.*BEGIN # Query/.*DELETE.* # Query/.*COMMIT
---source include/assert_binlog_events.inc
-
---source include/sync_slave_sql_with_master.inc
-# DELETE FROM mem_t1 have been applied the tables should be empty.
-SELECT * FROM mem_t1;
-
---echo #
---echo # Test case 2: verify DELETE FROM mem_xx can be binlogged correctly
---echo #              in a DML on a MyISAM table
---source include/rpl_connection_master.inc
---source include/save_binlog_position.inc
-
-# mem_t2 is empty, the UNION makes sure that a row event is binlogged.
-INSERT INTO t2 SELECT * FROM mem_t2 UNION SELECT 10;
-
---source include/assert_binlog_events.inc
-
---source include/sync_slave_sql_with_master.inc
-# DELETE FROM mem_xx have been applied the tables should be empty.
-SELECT * FROM mem_t2;
-
---source include/rpl_connection_master.inc
-DROP TABLE t1, t2, t3, mem_t1, mem_t2;
---source include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_no_gtid_split_statements.test mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_no_gtid_split_statements.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_no_gtid_split_statements.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_no_gtid_split_statements.test	2021-09-28 11:46:34.000000000 +0000
@@ -1,3 +1,2 @@
 --source include/no_valgrind_without_big.inc
---source include/not_mts_replica_parallel_workers.inc
 --source extra/rpl_tests/rpl_split_statements.test
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_no_gtid_truncate_memory_table_after_start_server.test mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_no_gtid_truncate_memory_table_after_start_server.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_no_gtid_truncate_memory_table_after_start_server.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_no_gtid_truncate_memory_table_after_start_server.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,94 @@
+################################################################################
+# BUG#21045848 XA+MEMORY TABLE: POST SERVER RESTART 'XA COMMIT'
+#              IS OVERRIDDEN BY 'TRUNCATE' CMD
+#
+# Memory table's data will be lost after server restarts. To keep the data
+# consistency between master and slave, it just binlogs
+# 'TRUNCATE TABLE `db`.`table_name`' when the memory table is locked first time.
+# So TRUNCATE statement could be binlogged in many statements.
+#
+# Because it was not handled correctly, it caused below problems:
+## - COM_FIELD_LIST
+#   it didn't flush binlog cache to binlog file. So the TRUNCATEs were not
+#   binlogged in COM_FIELD_LIST, it was binlogged with next statement together.
+#
+# - CREATE TABLE ... LIKE memory_table
+# - CREATE TABLE ... SELECT memory_table
+#   They were binlogged like:
+#   GTID_log_event | Anonymous_gtid_log_event
+#   TRUNCATE TABLE memory_table
+#   CREATE TABLE ... LIKE memory_table | CREATE TABLE ... SELECT memory_table
+#
+#   Both statements shared the same gtid event. That was not correct.
+#
+# - TRUNCATE was binlogged without BEGIN and COMMIT
+#   It caused some DML binlogged without BEGIN and COMMIT.  For example:
+#   INSERT INTO myisam_t1 SELECT * FROM memory_table
+#   it was binlogged as:
+#   GTID_log_event | Anonymous_gtid_log_event
+#   TRUNCATE TABLE memory_table
+#   INSERT INTO myisam_t1 SELECT * FROM memory_table
+#
+# The test cases verify some cases that cannot be run when gtid mode is on.
+#
+# See rpl_gtid_truncate_memory_table_after_start_server.test for the tests with
+# gtid_mode=on.
+################################################################################
+
+--source include/force_myisam_default.inc
+--source include/have_myisam.inc
+
+--source include/set_privilege_checks_user_as_system_user.inc
+--source include/master-slave.inc
+
+CALL mtr.add_suppression("Found 1 prepared XA transactions");
+CREATE TABLE t1(c1 INT);
+CREATE TABLE t2(c1 INT) ENGINE = MyISAM;
+CREATE TABLE mem_t1(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+CREATE TABLE mem_t2(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+
+INSERT INTO mem_t1 VALUES(1),(2),(3);
+INSERT INTO mem_t2 VALUES(1),(2),(3);
+
+--source include/sync_slave_sql_with_master.inc
+--source include/stop_slave.inc
+
+--let $rpl_server_number=1
+--source include/rpl_restart_server.inc
+
+--source include/start_slave.inc
+
+--echo # Test case 1: verify TRUNCATE TABLE mem_xx can be binlogged correctly
+--echo #              in CREATE TABLE ... SELECT
+--source include/rpl_connection_master.inc
+--source include/save_binlog_position.inc
+CREATE TABLE t3 SELECT * FROM mem_t1 UNION SELECT 10;
+
+--let $limit= 0,4
+--let $event_sequence= #Anonymous_Gtid # !Q(TRUNCATE.*) #Anonymous_Gtid # !Q(CREATE.*)
+--source include/assert_binlog_events.inc
+
+--source include/sync_slave_sql_with_master.inc
+# TRUNCATE TABLE mem_t1 have been applied the tables should be empty.
+SELECT * FROM mem_t1;
+
+--echo #
+--echo # Test case 2: verify TRUNCATE TABLE mem_xx can be binlogged correctly
+--echo #              in a DML on a MyISAM table
+--source include/rpl_connection_master.inc
+--source include/save_binlog_position.inc
+
+# mem_t2 is empty, the UNION makes sure that a row event is binlogged.
+INSERT INTO t2 SELECT * FROM mem_t2 UNION SELECT 10;
+
+--let $limit= 0,4
+--let $event_sequence= #Anonymous_Gtid # !Q(TRUNCATE.*) #Anonymous_Gtid # !Begin
+--source include/assert_binlog_events.inc
+
+--source include/sync_slave_sql_with_master.inc
+# TRUNCATE TABLE mem_xx have been applied the tables should be empty.
+SELECT * FROM mem_t2;
+
+--source include/rpl_connection_master.inc
+DROP TABLE t1, t2, t3, mem_t1, mem_t2;
+--source include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_parallel_change_master-slave.opt mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_parallel_change_master-slave.opt
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_parallel_change_master-slave.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_parallel_change_master-slave.opt	2021-09-28 11:46:34.000000000 +0000
@@ -1 +1,2 @@
 --replica-transaction-retries=0
+--replica-preserve-commit-order=OFF
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_parallel_start_stop-slave.opt mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_parallel_start_stop-slave.opt
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_parallel_start_stop-slave.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_parallel_start_stop-slave.opt	2021-09-28 11:46:34.000000000 +0000
@@ -1 +1,2 @@
 --relay-log-info-repository=FILE --replica-transaction-retries=0 --innodb_lock_wait_timeout=10
+--replica-preserve-commit-order=OFF
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_perfschema_applier_status_by_worker_slave_skip_counter_mts.test mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_perfschema_applier_status_by_worker_slave_skip_counter_mts.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_perfschema_applier_status_by_worker_slave_skip_counter_mts.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_perfschema_applier_status_by_worker_slave_skip_counter_mts.test	2021-09-28 11:46:34.000000000 +0000
@@ -16,7 +16,7 @@
 
 # the test is binlog-format agnostic
 --source include/have_binlog_format_row.inc
-
+--source include/only_mts_replica_parallel_workers.inc
 --source include/master-slave.inc
 
 --let $is_mts= 1
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_rotate_row_trans.test mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_rotate_row_trans.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_rotate_row_trans.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_rotate_row_trans.test	2021-09-28 11:46:34.000000000 +0000
@@ -46,7 +46,7 @@
 --echo # Sync slave with master and setup debug sync point
 --source include/sync_slave_sql_with_master.inc
 SET @save_debug=@@global.debug;
-SET GLOBAL DEBUG='d,stop_io_after_reading_write_rows_log_event';
+SET GLOBAL DEBUG='+d,stop_io_after_reading_write_rows_log_event';
 
 --echo # Insert the data in the master
 --source include/rpl_connection_master.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_row_until.test mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_row_until.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_row_until.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_row_until.test	2021-09-28 11:46:34.000000000 +0000
@@ -1,7 +1,6 @@
 -- source include/not_ndb_default.inc
 --source include/not_group_replication_plugin.inc
 -- source include/have_binlog_format_row.inc
---source include/not_mts_replica_parallel_workers.inc
 --source include/master-slave.inc
 
 ##############################################################################
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_semi_sync_ack_thread.test mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_semi_sync_ack_thread.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_semi_sync_ack_thread.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_semi_sync_ack_thread.test	2021-09-28 11:46:34.000000000 +0000
@@ -133,7 +133,7 @@
 --echo #
 
 SET @save_debug = @@GLOBAL.debug;
-SET GLOBAL debug = 'd,rpl_semisync_simulate_select_error';
+SET GLOBAL debug = '+d,rpl_semisync_simulate_select_error';
 
 # wait enough time to guarantee that select() timeout happens
 --sleep 2
@@ -188,7 +188,7 @@
 --echo #
 --echo # Failure on creating ack receiver thread
 --echo #
-SET GLOBAL debug = 'd,rpl_semisync_simulate_create_thread_failure';
+SET GLOBAL debug = '+d,rpl_semisync_simulate_create_thread_failure';
 SET GLOBAL rpl_semi_sync_source_enabled= ON;
 
 --let $assert_variable_name= rpl_semi_sync_source_enabled
@@ -206,7 +206,7 @@
 SET GLOBAL debug= @save_debug;
 SET GLOBAL rpl_semi_sync_source_enabled= ON;
 
-SET GLOBAL debug = 'd,rpl_semisync_simulate_thread_join_failure';
+SET GLOBAL debug= '+d,rpl_semisync_simulate_thread_join_failure';
 SET GLOBAL rpl_semi_sync_source_enabled= OFF;
 
 --let $assert_variable_name= rpl_semi_sync_source_enabled
@@ -220,7 +220,8 @@
 --echo #
 --echo # Failure on registering semisync slave
 --echo #
-SET GLOBAL debug= 'd,rpl_semisync_simulate_add_replica_failure';
+SET GLOBAL debug= '-d,rpl_semisync_simulate_thread_join_failure';
+SET GLOBAL debug= '+d,rpl_semisync_simulate_add_replica_failure';
 SET GLOBAL rpl_semi_sync_source_enabled= ON;
 
 --let $rpl_connection_name= server_2
@@ -233,7 +234,7 @@
 # Make IO thread hungs after connecting to master. So we can make sure it is
 # stopped by add_slave_failure
 SET @save_debug= @@GLOBAL.debug;
-SET GLOBAL debug= 'd,dbug.before_get_SOURCE_UUID';
+SET GLOBAL debug= '+d,dbug.before_get_SOURCE_UUID';
 --source include/install_semisync_replica.inc
 
 # Clear the debug point and signal IO thread to resume
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_semi_sync_after_sync.test mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_semi_sync_after_sync.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_semi_sync_after_sync.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_semi_sync_after_sync.test	2021-09-28 11:46:34.000000000 +0000
@@ -33,7 +33,7 @@
 --echo # For coverage test, simulate after_sync hook error
 --echo #
 SET @saved_debug= @@GLOBAL.debug;
-SET GLOBAL debug='d,simulate_after_sync_hook_error';
+SET GLOBAL debug='+d,simulate_after_sync_hook_error';
 INSERT INTO t1 VALUES(1);
 SELECT * FROM t1;
 SET GLOBAL debug= @saved_debug;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_semi_sync_deadlock.test mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_semi_sync_deadlock.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_semi_sync_deadlock.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_semi_sync_deadlock.test	2021-09-28 11:46:34.000000000 +0000
@@ -42,7 +42,7 @@
 --source include/sync_slave_sql_with_master.inc
 
 --connection master
-SET GLOBAL debug= 'd,semi_sync_3-way_deadlock';
+SET GLOBAL debug= '+d,semi_sync_3-way_deadlock';
 SET DEBUG_SYNC= "before_process_commit_stage_queue WAIT_FOR signal.rotate_finished";
 
 --echo # Build 10 connections to master server
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_semi_sync_wait_slave_count.test mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_semi_sync_wait_slave_count.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_semi_sync_wait_slave_count.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_semi_sync_wait_slave_count.test	2021-09-28 11:46:34.000000000 +0000
@@ -124,7 +124,7 @@
 --let $rpl_connection_name= server_4
 --source include/rpl_connection.inc
 SET @original_debug = @@GLOBAL.debug;
-SET GLOBAL debug = 'd,rpl_semisync_before_send_ack';
+SET GLOBAL debug = '+d,rpl_semisync_before_send_ack';
 
 --let $rpl_connection_name= default
 --source include/rpl_connection.inc
@@ -194,7 +194,7 @@
 --let $wait_condition= SELECT count(*) FROM t1 WHERE c1 = 130;
 --source include/wait_condition.inc
 SET @original_debug = @@GLOBAL.debug;
-SET GLOBAL debug = 'd,rpl_semisync_before_send_ack';
+SET GLOBAL debug = '+d,rpl_semisync_before_send_ack';
 
 --let $rpl_connection_name= server_3
 --source include/rpl_connection.inc
@@ -203,7 +203,7 @@
 --let $wait_condition= SELECT count(*) FROM t1 WHERE c1 = 130;
 --source include/wait_condition.inc
 SET @original_debug = @@GLOBAL.debug;
-SET GLOBAL debug = 'd,rpl_semisync_before_send_ack';
+SET GLOBAL debug = '+d,rpl_semisync_before_send_ack';
 
 --let $rpl_connection_name= default
 --source include/rpl_connection.inc
@@ -274,7 +274,7 @@
 --echo # setting rpl_semi_sync_source_wait_for_replica_count fails
 --echo ######################################################################
 SET @original_debug = @@GLOBAL.debug;
-SET GLOBAL debug = 'd,rpl_semisync_simulate_allocate_ack_container_failure';
+SET GLOBAL debug = '+d,rpl_semisync_simulate_allocate_ack_container_failure';
 
 SET GLOBAL rpl_semi_sync_source_wait_for_replica_count = 2;
 --let $assert_variable_name= rpl_semi_sync_source_wait_for_replica_count
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_server_uuid.cnf mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_server_uuid.cnf
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_server_uuid.cnf	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_server_uuid.cnf	2021-09-28 11:46:34.000000000 +0000
@@ -6,12 +6,14 @@
 # instances when MTR runs rpl tests with parallel 4 or more.
 
 [mysqld.2]
+replica-parallel-workers=0
 
 [mysqld.3]
 replicate-same-server-id=1
 loose-innodb_write_io_threads=    2
 loose-innodb_read_io_threads=     2
 log-replica-updates=OFF
+replica-parallel-workers=0
 
 [ENV]
 SERVER_MYPORT_3=		@mysqld.3.port
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_slave_skip_myisam.test mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_slave_skip_myisam.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_slave_skip_myisam.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_slave_skip_myisam.test	2021-09-28 11:46:34.000000000 +0000
@@ -5,8 +5,6 @@
 # Skip in valgrind because of bug#20952953
 --source include/not_valgrind.inc
 source include/have_binlog_format_mixed.inc;
-# UNTIL is not supported yet (TODO: support and remove the guard)
--- source include/not_mts_replica_parallel_workers.inc
 
 --source include/set_privilege_checks_user_as_system_user.inc
 source include/master-slave.inc;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_slave_skip.test mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_slave_skip.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_slave_skip.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_slave_skip.test	2021-09-28 11:46:34.000000000 +0000
@@ -5,8 +5,6 @@
 # Skip in valgrind because of bug#20952953
 --source include/not_valgrind.inc
 source include/have_binlog_format_mixed.inc;
-# UNTIL is not supported yet (TODO: support and remove the guard)
--- source include/not_mts_replica_parallel_workers.inc
 
 source include/master-slave.inc;
 source include/have_myisam.inc;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_sql_thread_killed_waiting_commit_lock.test mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_sql_thread_killed_waiting_commit_lock.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_sql_thread_killed_waiting_commit_lock.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_sql_thread_killed_waiting_commit_lock.test	2021-09-28 11:46:34.000000000 +0000
@@ -112,7 +112,6 @@
 --source include/diff_tables.inc
 
 # Cleanup
-SET @@GLOBAL.DEBUG= '$debug_saved';
 --source include/rpl_connection_master.inc
 DROP TABLE t1;
 --source include/rpl_end.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_stop_slave.test mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_stop_slave.test
--- mysql-8.0-8.0.26/mysql-test/suite/rpl_nogtid/t/rpl_stop_slave.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/rpl_nogtid/t/rpl_stop_slave.test	2021-09-28 11:46:34.000000000 +0000
@@ -27,8 +27,7 @@
 --echo # Suspend the INSERT statement in current transaction on SQL thread.
 --echo # It guarantees that SQL thread is applying the transaction when
 --echo # STOP SLAVE command launchs.
-let $debug_save= `SELECT @@GLOBAL.debug`;
-SET GLOBAL debug= 'd,after_mysql_insert';
+SET GLOBAL debug= '+d,after_mysql_insert';
 source include/start_slave.inc;
 
 --echo
@@ -49,7 +48,7 @@
 
 --echo
 --echo # Test end
-SET GLOBAL debug= '$debug_save';
+SET GLOBAL debug= '-d,after_mysql_insert';
 source include/restart_slave_sql.inc;
 
 connection slave;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/secondary_engine/r/load_debug.result mysql-8.0-8.0.27/mysql-test/suite/secondary_engine/r/load_debug.result
--- mysql-8.0-8.0.26/mysql-test/suite/secondary_engine/r/load_debug.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/secondary_engine/r/load_debug.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,45 @@
+#
+# Bug#32508608: MDLS FOR ALTER TABLE SECONDARY_LOAD ARE TOO STRICT
+#
+CREATE TABLE t1 (a INT) SECONDARY_ENGINE MOCK;
+INSERT INTO t1 VALUES (1),(2),(3);
+SELECT * FROM t1;
+a
+1
+2
+3
+# Starting reader connection
+# Run query which will block while holding shared MDL
+SET DEBUG_SYNC="after_open_table_mdl_shared SIGNAL holding_shared_mdl WAIT_FOR finish_select";
+SELECT * FROM t1;
+# Switch to default connection
+# Wait until reader has acquired shared MDL
+SET DEBUG_SYNC="now WAIT_FOR holding_shared_mdl";
+# Verify that load can proceed to the point where it needs to
+# upgrade to X-MDL, and then signal the reader con to proceed
+SET DEBUG_SYNC="secload_upgrade_mdl_x SIGNAL finish_select";
+ALTER TABLE t1 SECONDARY_LOAD;
+SET DEBUG_SYNC="RESET";
+# Switch to reader con and wait for query to complete
+a
+# Switch to default connection
+# Test error handling in secondary unload
+SET DEBUG="+d,sim_secunload_fail";
+ALTER TABLE t1 SECONDARY_UNLOAD;
+ERROR HY000: Secondary engine operation failed. Simulated failure of secondary_unload().
+SET DEBUG="-d,sim_secunload_fail";
+SELECT * FROM t1;
+a
+ALTER TABLE t1 SECONDARY_UNLOAD;
+# Test error handling in secondary unload
+SET DEBUG="+d,sim_secload_fail";
+ALTER TABLE t1 SECONDARY_LOAD;
+ERROR HY000: Secondary engine operation failed. Simulated failure of secondary_load().
+SET DEBUG="-d,sim_secload_fail";
+SELECT * FROM t1;
+a
+1
+2
+3
+# Cleanup
+DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/secondary_engine/t/load_debug.test mysql-8.0-8.0.27/mysql-test/suite/secondary_engine/t/load_debug.test
--- mysql-8.0-8.0.26/mysql-test/suite/secondary_engine/t/load_debug.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/secondary_engine/t/load_debug.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,64 @@
+--source include/have_debug.inc
+--disable_query_log
+eval INSTALL PLUGIN mock SONAME '$MOCK_PLUGIN';
+--enable_query_log
+
+--echo #
+--echo # Bug#32508608: MDLS FOR ALTER TABLE SECONDARY_LOAD ARE TOO STRICT
+--echo #
+
+CREATE TABLE t1 (a INT) SECONDARY_ENGINE MOCK;
+INSERT INTO t1 VALUES (1),(2),(3);
+SELECT * FROM t1;
+
+--echo # Starting reader connection
+connect(reader,localhost,root,,);
+--echo # Run query which will block while holding shared MDL
+SET DEBUG_SYNC="after_open_table_mdl_shared SIGNAL holding_shared_mdl WAIT_FOR finish_select";
+--send SELECT * FROM t1
+
+--echo # Switch to default connection
+connection default;
+
+--echo # Wait until reader has acquired shared MDL
+SET DEBUG_SYNC="now WAIT_FOR holding_shared_mdl";
+
+--echo # Verify that load can proceed to the point where it needs to
+--echo # upgrade to X-MDL, and then signal the reader con to proceed
+SET DEBUG_SYNC="secload_upgrade_mdl_x SIGNAL finish_select";
+ALTER TABLE t1 SECONDARY_LOAD;
+
+SET DEBUG_SYNC="RESET";
+
+--echo # Switch to reader con and wait for query to complete
+connection reader;
+--reap
+disconnect reader;
+--source include/wait_until_disconnected.inc
+
+--echo # Switch to default connection
+connection default;
+
+--echo # Test error handling in secondary unload
+SET DEBUG="+d,sim_secunload_fail";
+--error ER_SECONDARY_ENGINE
+ALTER TABLE t1 SECONDARY_UNLOAD;
+SET DEBUG="-d,sim_secunload_fail";
+
+SELECT * FROM t1;
+ALTER TABLE t1 SECONDARY_UNLOAD;
+
+--echo # Test error handling in secondary unload
+SET DEBUG="+d,sim_secload_fail";
+--error ER_SECONDARY_ENGINE
+ALTER TABLE t1 SECONDARY_LOAD;
+SET DEBUG="-d,sim_secload_fail";
+
+SELECT * FROM t1;
+
+--echo # Cleanup
+DROP TABLE t1;
+
+--disable_query_log
+UNINSTALL PLUGIN mock;
+--enable_query_log
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/service_udf_registration/r/udf_log_reg_3_func.result mysql-8.0-8.0.27/mysql-test/suite/service_udf_registration/r/udf_log_reg_3_func.result
--- mysql-8.0-8.0.26/mysql-test/suite/service_udf_registration/r/udf_log_reg_3_func.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/service_udf_registration/r/udf_log_reg_3_func.result	2021-09-28 11:46:34.000000000 +0000
@@ -80,3 +80,4 @@
 Query	SELECT myfunc_int(5)
 Query	SELECT myfunc_double(78654)
 Query	SELECT myfunc_int(5)
+TRUNCATE TABLE mysql.general_log;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/service_udf_registration/t/udf_log_reg_3_func.test mysql-8.0-8.0.27/mysql-test/suite/service_udf_registration/t/udf_log_reg_3_func.test
--- mysql-8.0-8.0.26/mysql-test/suite/service_udf_registration/t/udf_log_reg_3_func.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/service_udf_registration/t/udf_log_reg_3_func.test	2021-09-28 11:46:34.000000000 +0000
@@ -76,3 +76,6 @@
 
 # Show general log for UDFs.
 select command_type,argument from mysql.general_log WHERE argument LIKE '%myfunc%';
+
+# Clear general log
+TRUNCATE TABLE mysql.general_log;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sysschema/r/pr_ps_setup_show_disabled_instruments.result mysql-8.0-8.0.27/mysql-test/suite/sysschema/r/pr_ps_setup_show_disabled_instruments.result
--- mysql-8.0-8.0.26/mysql-test/suite/sysschema/r/pr_ps_setup_show_disabled_instruments.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sysschema/r/pr_ps_setup_show_disabled_instruments.result	2021-09-28 11:46:34.000000000 +0000
@@ -33,6 +33,7 @@
 statement/com/Execute	YES
 statement/com/Fetch	YES
 statement/com/Field List	YES
+statement/com/Group Replication Data Stream subscription	YES
 statement/com/Init DB	YES
 statement/com/Kill	YES
 statement/com/Long Data	YES
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sysschema/r/pr_ps_setup_show_disabled.result mysql-8.0-8.0.27/mysql-test/suite/sysschema/r/pr_ps_setup_show_disabled.result
--- mysql-8.0-8.0.26/mysql-test/suite/sysschema/r/pr_ps_setup_show_disabled.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sysschema/r/pr_ps_setup_show_disabled.result	2021-09-28 11:46:34.000000000 +0000
@@ -91,6 +91,7 @@
 statement/com/Execute	YES
 statement/com/Fetch	YES
 statement/com/Field List	YES
+statement/com/Group Replication Data Stream subscription	YES
 statement/com/Init DB	YES
 statement/com/Kill	YES
 statement/com/Long Data	YES
@@ -140,10 +141,6 @@
 innodb/srv_master_thread	BACKGROUND
 innodb/srv_monitor_thread	BACKGROUND
 innodb/srv_purge_thread	BACKGROUND
-innodb/srv_purge_thread	BACKGROUND
-innodb/srv_worker_thread	BACKGROUND
-innodb/srv_worker_thread	BACKGROUND
-innodb/srv_worker_thread	BACKGROUND
 innodb/srv_worker_thread	BACKGROUND
 innodb/srv_worker_thread	BACKGROUND
 innodb/srv_worker_thread	BACKGROUND
@@ -179,10 +176,6 @@
 innodb/srv_master_thread	BACKGROUND
 innodb/srv_monitor_thread	BACKGROUND
 innodb/srv_purge_thread	BACKGROUND
-innodb/srv_purge_thread	BACKGROUND
-innodb/srv_worker_thread	BACKGROUND
-innodb/srv_worker_thread	BACKGROUND
-innodb/srv_worker_thread	BACKGROUND
 innodb/srv_worker_thread	BACKGROUND
 innodb/srv_worker_thread	BACKGROUND
 innodb/srv_worker_thread	BACKGROUND
@@ -215,6 +208,7 @@
 statement/com/Execute	YES
 statement/com/Fetch	YES
 statement/com/Field List	YES
+statement/com/Group Replication Data Stream subscription	YES
 statement/com/Init DB	YES
 statement/com/Kill	YES
 statement/com/Long Data	YES
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sysschema/r/pr_ps_setup_show_enabled_instruments.result mysql-8.0-8.0.27/mysql-test/suite/sysschema/r/pr_ps_setup_show_enabled_instruments.result
--- mysql-8.0-8.0.26/mysql-test/suite/sysschema/r/pr_ps_setup_show_enabled_instruments.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sysschema/r/pr_ps_setup_show_enabled_instruments.result	2021-09-28 11:46:34.000000000 +0000
@@ -109,6 +109,7 @@
 statement/com/Execute	YES
 statement/com/Fetch	YES
 statement/com/Field List	YES
+statement/com/Group Replication Data Stream subscription	YES
 statement/com/Init DB	YES
 statement/com/Kill	YES
 statement/com/Long Data	YES
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sysschema/r/pr_ps_setup_show_enabled.result mysql-8.0-8.0.27/mysql-test/suite/sysschema/r/pr_ps_setup_show_enabled.result
--- mysql-8.0-8.0.26/mysql-test/suite/sysschema/r/pr_ps_setup_show_enabled.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sysschema/r/pr_ps_setup_show_enabled.result	2021-09-28 11:46:34.000000000 +0000
@@ -169,6 +169,7 @@
 statement/com/Execute	YES
 statement/com/Fetch	YES
 statement/com/Field List	YES
+statement/com/Group Replication Data Stream subscription	YES
 statement/com/Init DB	YES
 statement/com/Kill	YES
 statement/com/Long Data	YES
@@ -390,6 +391,7 @@
 statement/com/Execute	YES
 statement/com/Fetch	YES
 statement/com/Field List	YES
+statement/com/Group Replication Data Stream subscription	YES
 statement/com/Init DB	YES
 statement/com/Kill	YES
 statement/com/Long Data	YES
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sysschema/r/v_schema_auto_increment_columns_ci.result mysql-8.0-8.0.27/mysql-test/suite/sysschema/r/v_schema_auto_increment_columns_ci.result
--- mysql-8.0-8.0.26/mysql-test/suite/sysschema/r/v_schema_auto_increment_columns_ci.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sysschema/r/v_schema_auto_increment_columns_ci.result	2021-09-28 11:46:34.000000000 +0000
@@ -5,8 +5,8 @@
 column_name	varchar(64)	YES		NULL	
 data_type	longtext	YES		NULL	
 column_type	mediumtext	NO		NULL	
-is_signed	int	NO		0	
-is_unsigned	int	NO		0	
+is_signed	int unsigned	NO		0	
+is_unsigned	int unsigned	NO		0	
 max_value	bigint unsigned	YES		NULL	
 auto_increment	bigint unsigned	YES		NULL	
 auto_increment_ratio	decimal(25,4) unsigned	YES		NULL	
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sysschema/r/v_schema_auto_increment_columns_cs.result mysql-8.0-8.0.27/mysql-test/suite/sysschema/r/v_schema_auto_increment_columns_cs.result
--- mysql-8.0-8.0.26/mysql-test/suite/sysschema/r/v_schema_auto_increment_columns_cs.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sysschema/r/v_schema_auto_increment_columns_cs.result	2021-09-28 11:46:34.000000000 +0000
@@ -5,8 +5,8 @@
 column_name	varchar(64)	YES		NULL	
 data_type	longtext	YES		NULL	
 column_type	mediumtext	NO		NULL	
-is_signed	int	NO		0	
-is_unsigned	int	NO		0	
+is_signed	int unsigned	NO		0	
+is_unsigned	int unsigned	NO		0	
 max_value	bigint unsigned	YES		NULL	
 auto_increment	bigint unsigned	YES		NULL	
 auto_increment_ratio	decimal(25,4) unsigned	YES		NULL	
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sysschema/r/v_statement_analysis.result mysql-8.0-8.0.27/mysql-test/suite/sysschema/r/v_statement_analysis.result
--- mysql-8.0-8.0.26/mysql-test/suite/sysschema/r/v_statement_analysis.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sysschema/r/v_statement_analysis.result	2021-09-28 11:46:34.000000000 +0000
@@ -21,8 +21,8 @@
 rows_sorted	bigint unsigned	NO		NULL	
 sort_merge_passes	bigint unsigned	NO		NULL	
 digest	varchar(64)	YES		NULL	
-first_seen	timestamp(6)	NO		0000-00-00 00:00:00.000000	
-last_seen	timestamp(6)	NO		0000-00-00 00:00:00.000000	
+first_seen	timestamp(6)	NO		NULL	
+last_seen	timestamp(6)	NO		NULL	
 SELECT * FROM sys.statement_analysis;
 DESC sys.x$statement_analysis;
 Field	Type	Null	Key	Default	Extra
@@ -47,6 +47,6 @@
 rows_sorted	bigint unsigned	NO		NULL	
 sort_merge_passes	bigint unsigned	NO		NULL	
 digest	varchar(64)	YES		NULL	
-first_seen	timestamp(6)	NO		0000-00-00 00:00:00.000000	
-last_seen	timestamp(6)	NO		0000-00-00 00:00:00.000000	
+first_seen	timestamp(6)	NO		NULL	
+last_seen	timestamp(6)	NO		NULL	
 SELECT * FROM sys.x$statement_analysis;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sysschema/r/v_statements_with_errors_or_warnings.result mysql-8.0-8.0.27/mysql-test/suite/sysschema/r/v_statements_with_errors_or_warnings.result
--- mysql-8.0-8.0.26/mysql-test/suite/sysschema/r/v_statements_with_errors_or_warnings.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sysschema/r/v_statements_with_errors_or_warnings.result	2021-09-28 11:46:34.000000000 +0000
@@ -7,8 +7,8 @@
 error_pct	decimal(27,4)	NO		0.0000	
 warnings	bigint unsigned	NO		NULL	
 warning_pct	decimal(27,4)	NO		0.0000	
-first_seen	timestamp(6)	NO		0000-00-00 00:00:00.000000	
-last_seen	timestamp(6)	NO		0000-00-00 00:00:00.000000	
+first_seen	timestamp(6)	NO		NULL	
+last_seen	timestamp(6)	NO		NULL	
 digest	varchar(64)	YES		NULL	
 SELECT * FROM sys.statements_with_errors_or_warnings;
 DESC sys.x$statements_with_errors_or_warnings;
@@ -20,7 +20,7 @@
 error_pct	decimal(27,4)	NO		0.0000	
 warnings	bigint unsigned	NO		NULL	
 warning_pct	decimal(27,4)	NO		0.0000	
-first_seen	timestamp(6)	NO		0000-00-00 00:00:00.000000	
-last_seen	timestamp(6)	NO		0000-00-00 00:00:00.000000	
+first_seen	timestamp(6)	NO		NULL	
+last_seen	timestamp(6)	NO		NULL	
 digest	varchar(64)	YES		NULL	
 SELECT * FROM sys.x$statements_with_errors_or_warnings;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sysschema/r/v_statements_with_full_table_scans.result mysql-8.0-8.0.27/mysql-test/suite/sysschema/r/v_statements_with_full_table_scans.result
--- mysql-8.0-8.0.26/mysql-test/suite/sysschema/r/v_statements_with_full_table_scans.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sysschema/r/v_statements_with_full_table_scans.result	2021-09-28 11:46:34.000000000 +0000
@@ -11,8 +11,8 @@
 rows_examined	bigint unsigned	NO		NULL	
 rows_sent_avg	decimal(21,0)	YES		NULL	
 rows_examined_avg	decimal(21,0)	YES		NULL	
-first_seen	timestamp(6)	NO		0000-00-00 00:00:00.000000	
-last_seen	timestamp(6)	NO		0000-00-00 00:00:00.000000	
+first_seen	timestamp(6)	NO		NULL	
+last_seen	timestamp(6)	NO		NULL	
 digest	varchar(64)	YES		NULL	
 SELECT * FROM sys.statements_with_full_table_scans;
 DESC sys.x$statements_with_full_table_scans;
@@ -28,8 +28,8 @@
 rows_examined	bigint unsigned	NO		NULL	
 rows_sent_avg	decimal(21,0)	YES		NULL	
 rows_examined_avg	decimal(21,0)	YES		NULL	
-first_seen	timestamp(6)	NO		0000-00-00 00:00:00.000000	
-last_seen	timestamp(6)	NO		0000-00-00 00:00:00.000000	
+first_seen	timestamp(6)	NO		NULL	
+last_seen	timestamp(6)	NO		NULL	
 digest	varchar(64)	YES		NULL	
 SELECT * FROM sys.x$statements_with_full_table_scans;
 CREATE DATABASE v_statements_with_full_table_scans;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sysschema/r/v_statements_with_runtimes_in_95th_percentile.result mysql-8.0-8.0.27/mysql-test/suite/sysschema/r/v_statements_with_runtimes_in_95th_percentile.result
--- mysql-8.0-8.0.26/mysql-test/suite/sysschema/r/v_statements_with_runtimes_in_95th_percentile.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sysschema/r/v_statements_with_runtimes_in_95th_percentile.result	2021-09-28 11:46:34.000000000 +0000
@@ -13,8 +13,8 @@
 rows_sent_avg	decimal(21,0)	NO		0	
 rows_examined	bigint unsigned	NO		NULL	
 rows_examined_avg	decimal(21,0)	NO		0	
-first_seen	timestamp(6)	NO		0000-00-00 00:00:00.000000	
-last_seen	timestamp(6)	NO		0000-00-00 00:00:00.000000	
+first_seen	timestamp(6)	NO		NULL	
+last_seen	timestamp(6)	NO		NULL	
 digest	varchar(64)	YES		NULL	
 SELECT * FROM sys.statements_with_runtimes_in_95th_percentile;
 DESC sys.x$statements_with_runtimes_in_95th_percentile;
@@ -32,7 +32,7 @@
 rows_sent_avg	decimal(21,0)	NO		0	
 rows_examined	bigint unsigned	NO		NULL	
 rows_examined_avg	decimal(21,0)	NO		0	
-first_seen	timestamp(6)	NO		0000-00-00 00:00:00.000000	
-last_seen	timestamp(6)	NO		0000-00-00 00:00:00.000000	
+first_seen	timestamp(6)	NO		NULL	
+last_seen	timestamp(6)	NO		NULL	
 digest	varchar(64)	YES		NULL	
 SELECT * FROM sys.x$statements_with_runtimes_in_95th_percentile;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sysschema/r/v_statements_with_sorting.result mysql-8.0-8.0.27/mysql-test/suite/sysschema/r/v_statements_with_sorting.result
--- mysql-8.0-8.0.26/mysql-test/suite/sysschema/r/v_statements_with_sorting.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sysschema/r/v_statements_with_sorting.result	2021-09-28 11:46:34.000000000 +0000
@@ -10,8 +10,8 @@
 sort_using_range	bigint unsigned	NO		NULL	
 rows_sorted	bigint unsigned	NO		NULL	
 avg_rows_sorted	decimal(21,0)	NO		0	
-first_seen	timestamp(6)	NO		0000-00-00 00:00:00.000000	
-last_seen	timestamp(6)	NO		0000-00-00 00:00:00.000000	
+first_seen	timestamp(6)	NO		NULL	
+last_seen	timestamp(6)	NO		NULL	
 digest	varchar(64)	YES		NULL	
 SELECT * FROM sys.statements_with_sorting;
 DESC sys.x$statements_with_sorting;
@@ -26,7 +26,7 @@
 sort_using_range	bigint unsigned	NO		NULL	
 rows_sorted	bigint unsigned	NO		NULL	
 avg_rows_sorted	decimal(21,0)	NO		0	
-first_seen	timestamp(6)	NO		0000-00-00 00:00:00.000000	
-last_seen	timestamp(6)	NO		0000-00-00 00:00:00.000000	
+first_seen	timestamp(6)	NO		NULL	
+last_seen	timestamp(6)	NO		NULL	
 digest	varchar(64)	YES		NULL	
 SELECT * FROM sys.x$statements_with_sorting;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sysschema/r/v_statements_with_temp_tables.result mysql-8.0-8.0.27/mysql-test/suite/sysschema/r/v_statements_with_temp_tables.result
--- mysql-8.0-8.0.26/mysql-test/suite/sysschema/r/v_statements_with_temp_tables.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sysschema/r/v_statements_with_temp_tables.result	2021-09-28 11:46:34.000000000 +0000
@@ -8,8 +8,8 @@
 disk_tmp_tables	bigint unsigned	NO		NULL	
 avg_tmp_tables_per_query	decimal(21,0)	NO		0	
 tmp_tables_to_disk_pct	decimal(24,0)	NO		0	
-first_seen	timestamp(6)	NO		0000-00-00 00:00:00.000000	
-last_seen	timestamp(6)	NO		0000-00-00 00:00:00.000000	
+first_seen	timestamp(6)	NO		NULL	
+last_seen	timestamp(6)	NO		NULL	
 digest	varchar(64)	YES		NULL	
 SELECT * FROM sys.statements_with_temp_tables;
 DESC sys.x$statements_with_temp_tables;
@@ -22,7 +22,7 @@
 disk_tmp_tables	bigint unsigned	NO		NULL	
 avg_tmp_tables_per_query	decimal(21,0)	NO		0	
 tmp_tables_to_disk_pct	decimal(24,0)	NO		0	
-first_seen	timestamp(6)	NO		0000-00-00 00:00:00.000000	
-last_seen	timestamp(6)	NO		0000-00-00 00:00:00.000000	
+first_seen	timestamp(6)	NO		NULL	
+last_seen	timestamp(6)	NO		NULL	
 digest	varchar(64)	YES		NULL	
 SELECT * FROM sys.x$statements_with_temp_tables;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sysschema/t/pr_diagnostics-master.opt mysql-8.0-8.0.27/mysql-test/suite/sysschema/t/pr_diagnostics-master.opt
--- mysql-8.0-8.0.26/mysql-test/suite/sysschema/t/pr_diagnostics-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sysschema/t/pr_diagnostics-master.opt	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
---thread-stack=524288
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/inc/json_sysvar_spec.inc mysql-8.0-8.0.27/mysql-test/suite/sys_vars/inc/json_sysvar_spec.inc
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/inc/json_sysvar_spec.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/inc/json_sysvar_spec.inc	2021-09-28 11:46:34.000000000 +0000
@@ -324,7 +324,7 @@
     "name": "replica_parallel_type",
     "alias": "slave_parallel_type",
     $persist_as_readonly,
-    "default": "DATABASE",
+    "default": "LOGICAL_CLOCK",
     "values": ["LOGICAL_CLOCK", "'DATABASE'", "'LOGICAL_CLOCK'", 0, 1],
     "invalid": [$enum_invalid, -1, 2],
     "value_map": {"'LOGICAL_CLOCK'": "LOGICAL_CLOCK", "'DATABASE'": "DATABASE", "0": "DATABASE", "1": "LOGICAL_CLOCK"},
@@ -334,7 +334,7 @@
     "name": "replica_parallel_workers",
     "alias": "slave_parallel_workers",
     $persist_as_readonly,
-    "default": 0,
+    "default": 4,
     "values": [1, 2, 100],
     "min": 0,
     "max": 1024,
@@ -354,7 +354,7 @@
     "name": "replica_preserve_commit_order",
     "alias": "slave_preserve_commit_order",
     $persist_as_readonly,
-    "default": 0,
+    "default": 1,
     $bool
   },
   {
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/inc/min_examined_row_limit_basic.inc mysql-8.0-8.0.27/mysql-test/suite/sys_vars/inc/min_examined_row_limit_basic.inc
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/inc/min_examined_row_limit_basic.inc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/inc/min_examined_row_limit_basic.inc	2021-09-28 11:46:34.000000000 +0000
@@ -260,6 +260,27 @@
 --Error ER_BAD_FIELD_ERROR
 SELECT min_examined_row_limit = @@session.min_examined_row_limit;
 
+--echo '#---------------------FN_DYNVARS_089_12----------------------#'
+######################################################################################
+#   Check if changing session variable throws error without sufficient privileges    #
+######################################################################################
+CREATE USER foo, bar;
+GRANT SESSION_VARIABLES_ADMIN ON *.*  TO bar;
+--let $conn_name = foo_connection
+--connect($conn_name, localhost, foo,,,)
+SELECT @@session.min_examined_row_limit;
+--error ER_SPECIFIC_ACCESS_DENIED_ERROR
+SET @@session.min_examined_row_limit = 1;
+--connection default
+disconnect $conn_name;
+--let $conn_name = bar_connection
+--connect($conn_name, localhost, bar,,,)
+SELECT @@session.min_examined_row_limit;
+SET @@session.min_examined_row_limit = 1;
+SELECT @@session.min_examined_row_limit;
+--connection default
+disconnect $conn_name;
+DROP USER foo, bar;
 
 ####################################
 #     Restore initial value        #
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/all_vars.result mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/all_vars.result
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/all_vars.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/all_vars.result	2021-09-28 11:46:34.000000000 +0000
@@ -16,6 +16,8 @@
 There should be *no* variables listed below:
 activate_all_roles_on_login
 activate_all_roles_on_login
+authentication_policy
+authentication_policy
 binlog_encryption
 binlog_encryption
 binlog_rotate_encryption_master_key_at_startup
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/character_set_connection_func.result mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/character_set_connection_func.result
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/character_set_connection_func.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/character_set_connection_func.result	2021-09-28 11:46:34.000000000 +0000
@@ -32,7 +32,7 @@
 utf_text
 ????
 Warnings:
-Warning	1300	Cannot convert string '\xD0\x81\xD0\x82\xD0\x83...' from utf8 to latin1
+Warning	1300	Cannot convert string '\xD0\x81\xD0\x82\xD0\x83...' from utf8mb3 to latin1
 SET @@session.character_set_connection = utf8;
 Warnings:
 Warning	3719	'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous.
@@ -43,7 +43,7 @@
 SET @@session.character_set_connection = ascii;
 INSERT INTO t1 VALUES('�ЂЃЄ');
 Warnings:
-Warning	1300	Cannot convert string '\xD0\x81\xD0\x82\xD0\x83...' from utf8 to ascii
+Warning	1300	Cannot convert string '\xD0\x81\xD0\x82\xD0\x83...' from utf8mb3 to ascii
 SELECT * FROM t1;
 b
 ????
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/default_authentication_plugin_basic.result mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/default_authentication_plugin_basic.result
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/default_authentication_plugin_basic.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/default_authentication_plugin_basic.result	2021-09-28 11:46:34.000000000 +0000
@@ -1,9 +1,13 @@
 SELECT  @@GLOBAL.default_authentication_plugin;
 @@GLOBAL.default_authentication_plugin
 caching_sha2_password
+Warnings:
+Warning	1287	'@@default_authentication_plugin' is deprecated and will be removed in a future release. Please use authentication_policy instead.
 SELECT COUNT(@@GLOBAL.default_authentication_plugin);
 COUNT(@@GLOBAL.default_authentication_plugin)
 1
+Warnings:
+Warning	1287	'@@default_authentication_plugin' is deprecated and will be removed in a future release. Please use authentication_policy instead.
 1 Expected
 SET @@GLOBAL.default_authentication_plugin=1;
 ERROR HY000: Variable 'default_authentication_plugin' is a read only variable
@@ -11,6 +15,8 @@
 SELECT COUNT(@@GLOBAL.default_authentication_plugin);
 COUNT(@@GLOBAL.default_authentication_plugin)
 1
+Warnings:
+Warning	1287	'@@default_authentication_plugin' is deprecated and will be removed in a future release. Please use authentication_policy instead.
 1 Expected
 SELECT @@GLOBAL.default_authentication_plugin = VARIABLE_VALUE
 FROM performance_schema.global_variables
@@ -21,6 +27,8 @@
 SELECT COUNT(@@GLOBAL.default_authentication_plugin);
 COUNT(@@GLOBAL.default_authentication_plugin)
 1
+Warnings:
+Warning	1287	'@@default_authentication_plugin' is deprecated and will be removed in a future release. Please use authentication_policy instead.
 1 Expected
 SELECT COUNT(VARIABLE_VALUE)
 FROM performance_schema.global_variables
@@ -31,10 +39,15 @@
 SELECT @@default_authentication_plugin = @@GLOBAL.default_authentication_plugin;
 @@default_authentication_plugin = @@GLOBAL.default_authentication_plugin
 1
+Warnings:
+Warning	1287	'@@default_authentication_plugin' is deprecated and will be removed in a future release. Please use authentication_policy instead.
+Warning	1287	'@@default_authentication_plugin' is deprecated and will be removed in a future release. Please use authentication_policy instead.
 1 Expected
 SELECT COUNT(@@default_authentication_plugin);
 COUNT(@@default_authentication_plugin)
 1
+Warnings:
+Warning	1287	'@@default_authentication_plugin' is deprecated and will be removed in a future release. Please use authentication_policy instead.
 1 Expected
 SELECT COUNT(@@local.default_authentication_plugin);
 ERROR HY000: Variable 'default_authentication_plugin' is a GLOBAL variable
@@ -45,6 +58,8 @@
 SELECT COUNT(@@GLOBAL.default_authentication_plugin);
 COUNT(@@GLOBAL.default_authentication_plugin)
 1
+Warnings:
+Warning	1287	'@@default_authentication_plugin' is deprecated and will be removed in a future release. Please use authentication_policy instead.
 1 Expected
 SELECT default_authentication_plugin = @@SESSION.default_authentication_plugin;
 ERROR 42S22: Unknown column 'default_authentication_plugin' in 'field list'
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/innodb_ddl_buffer_size_basic.result mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/innodb_ddl_buffer_size_basic.result
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/innodb_ddl_buffer_size_basic.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/innodb_ddl_buffer_size_basic.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,62 @@
+SELECT @@global.innodb_ddl_buffer_size;
+@@global.innodb_ddl_buffer_size
+1048576
+SELECT @@session.innodb_ddl_buffer_size;
+@@session.innodb_ddl_buffer_size
+1048576
+SHOW GLOBAL VARIABLES LIKE  'innodb_ddl_buffer_size';
+Variable_name	Value
+innodb_ddl_buffer_size	1048576
+SHOW SESSION VARIABLES LIKE 'innodb_ddl_buffer_size';
+Variable_name	Value
+innodb_ddl_buffer_size	1048576
+SELECT * FROM performance_schema.global_variables
+WHERE variable_name='innodb_ddl_buffer_size';
+VARIABLE_NAME	VARIABLE_VALUE
+innodb_ddl_buffer_size	1048576
+SELECT * FROM performance_schema.session_variables
+WHERE variable_name='innodb_ddl_buffer_size';
+VARIABLE_NAME	VARIABLE_VALUE
+innodb_ddl_buffer_size	1048576
+set global innodb_ddl_buffer_size=65535;
+Warnings:
+Warning	1292	Truncated incorrect innodb_ddl_buffer_size value: '65535'
+set session innodb_ddl_buffer_size=65535;
+Warnings:
+Warning	1292	Truncated incorrect innodb_ddl_buffer_size value: '65535'
+set global innodb_ddl_buffer_size=65536;
+set session innodb_ddl_buffer_size=65536;
+SELECT * FROM performance_schema.global_variables
+WHERE variable_name='innodb_ddl_buffer_size';
+VARIABLE_NAME	VARIABLE_VALUE
+innodb_ddl_buffer_size	65536
+SELECT * FROM performance_schema.session_variables
+WHERE variable_name='innodb_ddl_buffer_size';
+VARIABLE_NAME	VARIABLE_VALUE
+innodb_ddl_buffer_size	65536
+set global innodb_ddl_buffer_size=4294967297;
+Warnings:
+Warning	1292	Truncated incorrect innodb_ddl_buffer_size value: '4294967297'
+set session innodb_ddl_buffer_size=4294967297;
+Warnings:
+Warning	1292	Truncated incorrect innodb_ddl_buffer_size value: '4294967297'
+set global innodb_ddl_buffer_size=4294967295;
+set session innodb_ddl_buffer_size=4294967295;
+SELECT * FROM performance_schema.global_variables
+WHERE variable_name='innodb_ddl_buffer_size';
+VARIABLE_NAME	VARIABLE_VALUE
+innodb_ddl_buffer_size	4294967295
+SELECT * FROM performance_schema.session_variables
+WHERE variable_name='innodb_ddl_buffer_size';
+VARIABLE_NAME	VARIABLE_VALUE
+innodb_ddl_buffer_size	4294967295
+set global innodb_ddl_buffer_size=1048576;
+set session innodb_ddl_buffer_size=1048576;
+SELECT * FROM performance_schema.global_variables
+WHERE variable_name='innodb_ddl_buffer_size';
+VARIABLE_NAME	VARIABLE_VALUE
+innodb_ddl_buffer_size	1048576
+SELECT * FROM performance_schema.session_variables
+WHERE variable_name='innodb_ddl_buffer_size';
+VARIABLE_NAME	VARIABLE_VALUE
+innodb_ddl_buffer_size	1048576
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/innodb_ddl_threads_basic.result mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/innodb_ddl_threads_basic.result
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/innodb_ddl_threads_basic.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/innodb_ddl_threads_basic.result	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,24 @@
+SELECT @@global.innodb_ddl_threads;
+@@global.innodb_ddl_threads
+4
+SELECT @@session.innodb_ddl_threads;
+@@session.innodb_ddl_threads
+4
+SHOW GLOBAL VARIABLES LIKE  'innodb_ddl_threads';
+Variable_name	Value
+innodb_ddl_threads	4
+SHOW SESSION VARIABLES LIKE 'innodb_ddl_threads';
+Variable_name	Value
+innodb_ddl_threads	4
+SELECT * FROM performance_schema.global_variables
+WHERE variable_name='innodb_ddl_threads';
+VARIABLE_NAME	VARIABLE_VALUE
+innodb_ddl_threads	4
+SELECT * FROM performance_schema.session_variables
+WHERE variable_name='innodb_ddl_threads';
+VARIABLE_NAME	VARIABLE_VALUE
+innodb_ddl_threads	4
+set global innodb_ddl_threads=8;
+set session innodb_ddl_threads=8;
+set global innodb_ddl_threads=4;
+set session innodb_ddl_threads=4;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/internal_tmp_mem_storage_engine_basic.result mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/internal_tmp_mem_storage_engine_basic.result
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/internal_tmp_mem_storage_engine_basic.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/internal_tmp_mem_storage_engine_basic.result	2021-09-28 11:46:34.000000000 +0000
@@ -37,3 +37,26 @@
 TempTable
 SET @@global.internal_tmp_mem_storage_engine = default;
 SET @@session.internal_tmp_mem_storage_engine = default;
+#
+# WL#14728: internal_tmp_mem_storage_engine should
+#   require SESSION_VARIABLES_ADMIN
+#
+CREATE USER foo@localhost, bar@localhost;
+GRANT SESSION_VARIABLES_ADMIN ON *.* TO foo@localhost;
+SET @@global.internal_tmp_mem_storage_engine = 123;
+ERROR 42000: Access denied; you need (at least one of) the SUPER or SYSTEM_VARIABLES_ADMIN privilege(s) for this operation
+SET @@session.internal_tmp_mem_storage_engine = 'memory';
+SET @@global.internal_tmp_mem_storage_engine = default;
+ERROR 42000: Access denied; you need (at least one of) the SUPER or SYSTEM_VARIABLES_ADMIN privilege(s) for this operation
+SET @@session.internal_tmp_mem_storage_engine = default;
+SET @@global.internal_tmp_mem_storage_engine = 123;
+ERROR 42000: Access denied; you need (at least one of) the SUPER or SYSTEM_VARIABLES_ADMIN privilege(s) for this operation
+SET @@session.internal_tmp_mem_storage_engine = 'memory';
+ERROR 42000: Access denied; you need (at least one of) the SYSTEM_VARIABLES_ADMIN or SESSION_VARIABLES_ADMIN privilege(s) for this operation
+SET @@global.internal_tmp_mem_storage_engine = default;
+ERROR 42000: Access denied; you need (at least one of) the SUPER or SYSTEM_VARIABLES_ADMIN privilege(s) for this operation
+SET @@session.internal_tmp_mem_storage_engine = default;
+ERROR 42000: Access denied; you need (at least one of) the SYSTEM_VARIABLES_ADMIN or SESSION_VARIABLES_ADMIN privilege(s) for this operation
+REVOKE SESSION_VARIABLES_ADMIN ON *.* FROM foo@localhost;
+DROP USER foo@localhost, bar@localhost;
+# End of 8.0 tests
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/log_output_basic.result mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/log_output_basic.result
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/log_output_basic.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/log_output_basic.result	2021-09-28 11:46:34.000000000 +0000
@@ -145,3 +145,4 @@
 SELECT @@global.log_output;
 @@global.log_output
 FILE
+TRUNCATE TABLE mysql.general_log;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/log_slow_admin_statements_func.result mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/log_slow_admin_statements_func.result
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/log_slow_admin_statements_func.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/log_slow_admin_statements_func.result	2021-09-28 11:46:34.000000000 +0000
@@ -68,3 +68,4 @@
 DROP PROCEDURE add_rows;
 DROP TABLE log_slow_admin_statements;
 TRUNCATE TABLE mysql.slow_log;
+TRUNCATE TABLE mysql.general_log;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/log_slow_extra_basic.result mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/log_slow_extra_basic.result
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/log_slow_extra_basic.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/log_slow_extra_basic.result	2021-09-28 11:46:34.000000000 +0000
@@ -73,5 +73,7 @@
 Warning	3795	slow query log file format changed as requested, but setting will have no effect when not actually logging to a file.
 SET GLOBAL log_output=@old_lo;
 SET GLOBAL slow_query_log=@old_sql;
+TRUNCATE TABLE mysql.general_log;
+TRUNCATE TABLE mysql.slow_log;
 
 # READY
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/max_delayed_threads_basic.result mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/max_delayed_threads_basic.result
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/max_delayed_threads_basic.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/max_delayed_threads_basic.result	2021-09-28 11:46:34.000000000 +0000
@@ -328,6 +328,30 @@
 ERROR 42S02: Unknown table 'session' in field list
 SELECT max_delayed_threads = @@session.max_delayed_threads;
 ERROR 42S22: Unknown column 'max_delayed_threads' in 'field list'
+'#---------------------FN_DYNVARS_001_12----------------------#'
+CREATE USER foo, bar;
+GRANT SESSION_VARIABLES_ADMIN ON *.*  TO bar;
+SELECT @@session.max_delayed_threads;
+@@session.max_delayed_threads
+2048
+Warnings:
+Warning	1287	'@@max_delayed_threads' is deprecated and will be removed in a future release.
+SET @@session.max_delayed_threads = 2048;
+ERROR 42000: Access denied; you need (at least one of) the SYSTEM_VARIABLES_ADMIN or SESSION_VARIABLES_ADMIN privilege(s) for this operation
+SELECT @@session.max_delayed_threads;
+@@session.max_delayed_threads
+2048
+Warnings:
+Warning	1287	'@@max_delayed_threads' is deprecated and will be removed in a future release.
+SET @@session.max_delayed_threads = 2048;
+Warnings:
+Warning	1287	'@@max_delayed_threads' is deprecated and will be removed in a future release.
+SELECT @@session.max_delayed_threads;
+@@session.max_delayed_threads
+2048
+Warnings:
+Warning	1287	'@@max_delayed_threads' is deprecated and will be removed in a future release.
+DROP USER foo, bar;
 SET @@global.max_delayed_threads = @start_global_value;
 Warnings:
 Warning	1287	'@@max_delayed_threads' is deprecated and will be removed in a future release.
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/max_error_count_basic.result mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/max_error_count_basic.result
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/max_error_count_basic.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/max_error_count_basic.result	2021-09-28 11:46:34.000000000 +0000
@@ -181,6 +181,22 @@
 ERROR 42S02: Unknown table 'session' in field list
 SELECT max_error_count = @@session.max_error_count;
 ERROR 42S22: Unknown column 'max_error_count' in 'field list'
+'#---------------------FN_DYNVARS_001_12----------------------#'
+CREATE USER foo, bar;
+GRANT SESSION_VARIABLES_ADMIN ON *.*  TO bar;
+SELECT @@session.max_error_count;
+@@session.max_error_count
+2048
+SET @@session.max_error_count = 2048;
+ERROR 42000: Access denied; you need (at least one of) the SYSTEM_VARIABLES_ADMIN or SESSION_VARIABLES_ADMIN privilege(s) for this operation
+SELECT @@session.max_error_count;
+@@session.max_error_count
+2048
+SET @@session.max_error_count = 2048;
+SELECT @@session.max_error_count;
+@@session.max_error_count
+2048
+DROP USER foo, bar;
 SET @@global.max_error_count = @start_global_value;
 SELECT @@global.max_error_count;
 @@global.max_error_count
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_32.result mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_32.result
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_32.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_32.result	2021-09-28 11:46:34.000000000 +0000
@@ -175,6 +175,22 @@
 ERROR 42S02: Unknown table 'session' in field list
 SELECT min_examined_row_limit = @@session.min_examined_row_limit;
 ERROR 42S22: Unknown column 'min_examined_row_limit' in 'field list'
+'#---------------------FN_DYNVARS_089_12----------------------#'
+CREATE USER foo, bar;
+GRANT SESSION_VARIABLES_ADMIN ON *.*  TO bar;
+SELECT @@session.min_examined_row_limit;
+@@session.min_examined_row_limit
+10
+SET @@session.min_examined_row_limit = 1;
+ERROR 42000: Access denied; you need (at least one of) the SYSTEM_VARIABLES_ADMIN or SESSION_VARIABLES_ADMIN privilege(s) for this operation
+SELECT @@session.min_examined_row_limit;
+@@session.min_examined_row_limit
+10
+SET @@session.min_examined_row_limit = 1;
+SELECT @@session.min_examined_row_limit;
+@@session.min_examined_row_limit
+1
+DROP USER foo, bar;
 SET @@global.min_examined_row_limit = @start_global_value;
 SELECT @@global.min_examined_row_limit;
 @@global.min_examined_row_limit
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_64.result mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_64.result
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_64.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_64.result	2021-09-28 11:46:34.000000000 +0000
@@ -169,6 +169,22 @@
 ERROR 42S02: Unknown table 'session' in field list
 SELECT min_examined_row_limit = @@session.min_examined_row_limit;
 ERROR 42S22: Unknown column 'min_examined_row_limit' in 'field list'
+'#---------------------FN_DYNVARS_089_12----------------------#'
+CREATE USER foo, bar;
+GRANT SESSION_VARIABLES_ADMIN ON *.*  TO bar;
+SELECT @@session.min_examined_row_limit;
+@@session.min_examined_row_limit
+10
+SET @@session.min_examined_row_limit = 1;
+ERROR 42000: Access denied; you need (at least one of) the SYSTEM_VARIABLES_ADMIN or SESSION_VARIABLES_ADMIN privilege(s) for this operation
+SELECT @@session.min_examined_row_limit;
+@@session.min_examined_row_limit
+10
+SET @@session.min_examined_row_limit = 1;
+SELECT @@session.min_examined_row_limit;
+@@session.min_examined_row_limit
+1
+DROP USER foo, bar;
 SET @@global.min_examined_row_limit = @start_global_value;
 SELECT @@global.min_examined_row_limit;
 @@global.min_examined_row_limit
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/mysql_native_password_proxy_users_func.result mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/mysql_native_password_proxy_users_func.result
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/mysql_native_password_proxy_users_func.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/mysql_native_password_proxy_users_func.result	2021-09-28 11:46:34.000000000 +0000
@@ -60,7 +60,7 @@
 SHOW GRANTS;
 Grants for proxy_native@localhost
 GRANT CREATE ON *.* TO `proxy_native`@`localhost`
-GRANT PROXY ON 'proxy_base'@'localhost' TO 'proxy_native'@'localhost'
+GRANT PROXY ON `proxy_base`@`localhost` TO `proxy_native`@`localhost`
 ** Connection default **
 SET PASSWORD FOR 'proxy_native'@'localhost' = 'testpw';
 ** Connecting as proxy_native,password with proxy mapping disabled **
@@ -70,7 +70,7 @@
 SHOW GRANTS;
 Grants for proxy_native@localhost
 GRANT CREATE ON *.* TO `proxy_native`@`localhost`
-GRANT PROXY ON 'proxy_base'@'localhost' TO 'proxy_native'@'localhost'
+GRANT PROXY ON `proxy_base`@`localhost` TO `proxy_native`@`localhost`
 ** Connection default **
 SET PASSWORD FOR 'proxy_native'@'localhost' = '';
 ** Connecting as proxy_none with proxy mapping disabled **
@@ -80,7 +80,7 @@
 SHOW GRANTS;
 Grants for proxy_none@localhost
 GRANT USAGE ON *.* TO `proxy_none`@`localhost`
-GRANT PROXY ON 'proxy_blah'@'localhost' TO 'proxy_none'@'localhost'
+GRANT PROXY ON `proxy_blah`@`localhost` TO `proxy_none`@`localhost`
 ** Connecting as proxy_native_1 with proxy mapping disabled **
 SELECT CURRENT_USER(), USER(), @@session.proxy_user;
 CURRENT_USER()	USER()	@@session.proxy_user
@@ -88,7 +88,7 @@
 SHOW GRANTS;
 Grants for proxy_native_1@localhost
 GRANT DELETE ON *.* TO `proxy_native_1`@`localhost`
-GRANT PROXY ON 'proxy_base_multi'@'localhost' TO 'proxy_native_1'@'localhost'
+GRANT PROXY ON `proxy_base_multi`@`localhost` TO `proxy_native_1`@`localhost`
 ** Connecting as proxy_native_2 with proxy mapping disabled **
 SELECT CURRENT_USER(), USER(), @@session.proxy_user;
 CURRENT_USER()	USER()	@@session.proxy_user
@@ -96,7 +96,7 @@
 SHOW GRANTS;
 Grants for proxy_native_2@localhost
 GRANT INSERT, DELETE ON *.* TO `proxy_native_2`@`localhost`
-GRANT PROXY ON 'proxy_base_multi'@'localhost' TO 'proxy_native_2'@'localhost'
+GRANT PROXY ON `proxy_base_multi`@`localhost` TO `proxy_native_2`@`localhost`
 ** Connecting as proxy_native_4 with proxy mapping disabled **
 SELECT CURRENT_USER(), USER(), @@session.proxy_user;
 CURRENT_USER()	USER()	@@session.proxy_user
@@ -104,8 +104,8 @@
 SHOW GRANTS;
 Grants for proxy_native_4@localhost
 GRANT INSERT ON *.* TO `proxy_native_4`@`localhost`
-GRANT PROXY ON 'proxy_base'@'localhost' TO 'proxy_native_4'@'localhost'
-GRANT PROXY ON 'proxy_base_multi'@'localhost' TO 'proxy_native_4'@'localhost'
+GRANT PROXY ON `proxy_base`@`localhost` TO `proxy_native_4`@`localhost`
+GRANT PROXY ON `proxy_base_multi`@`localhost` TO `proxy_native_4`@`localhost`
 ** Connection default **
 ** Disconnecting connections **
 '#----- 2.2.2.1 ON assignment of proxy user ------------------#'
@@ -118,7 +118,7 @@
 SHOW GRANTS;
 Grants for proxy_native@localhost
 GRANT CREATE ON *.* TO `proxy_native`@`localhost`
-GRANT PROXY ON 'proxy_base'@'localhost' TO 'proxy_native'@'localhost'
+GRANT PROXY ON `proxy_base`@`localhost` TO `proxy_native`@`localhost`
 ** Connection default **
 SET PASSWORD FOR 'proxy_native'@'localhost' = 'testpw';
 ** Connecting as proxy_native,password with proxy mapping disabled (native mapping on) **
@@ -128,7 +128,7 @@
 SHOW GRANTS;
 Grants for proxy_native@localhost
 GRANT CREATE ON *.* TO `proxy_native`@`localhost`
-GRANT PROXY ON 'proxy_base'@'localhost' TO 'proxy_native'@'localhost'
+GRANT PROXY ON `proxy_base`@`localhost` TO `proxy_native`@`localhost`
 ** Connection default **
 SET PASSWORD FOR 'proxy_native'@'localhost' = '';
 ** Connecting as proxy_none with proxy mapping disabled (native mapping on) **
@@ -138,7 +138,7 @@
 SHOW GRANTS;
 Grants for proxy_none@localhost
 GRANT USAGE ON *.* TO `proxy_none`@`localhost`
-GRANT PROXY ON 'proxy_blah'@'localhost' TO 'proxy_none'@'localhost'
+GRANT PROXY ON `proxy_blah`@`localhost` TO `proxy_none`@`localhost`
 ** Connecting as proxy_native_1 with proxy mapping disabled (native mapping on)**
 SELECT CURRENT_USER(), USER(), @@session.proxy_user;
 CURRENT_USER()	USER()	@@session.proxy_user
@@ -146,7 +146,7 @@
 SHOW GRANTS;
 Grants for proxy_native_1@localhost
 GRANT DELETE ON *.* TO `proxy_native_1`@`localhost`
-GRANT PROXY ON 'proxy_base_multi'@'localhost' TO 'proxy_native_1'@'localhost'
+GRANT PROXY ON `proxy_base_multi`@`localhost` TO `proxy_native_1`@`localhost`
 ** Connecting as proxy_native_2 with proxy mapping disabled (native mapping on) **
 SELECT CURRENT_USER(), USER(), @@session.proxy_user;
 CURRENT_USER()	USER()	@@session.proxy_user
@@ -154,7 +154,7 @@
 SHOW GRANTS;
 Grants for proxy_native_2@localhost
 GRANT INSERT, DELETE ON *.* TO `proxy_native_2`@`localhost`
-GRANT PROXY ON 'proxy_base_multi'@'localhost' TO 'proxy_native_2'@'localhost'
+GRANT PROXY ON `proxy_base_multi`@`localhost` TO `proxy_native_2`@`localhost`
 ** Connecting as proxy_native_4 with proxy mapping disabled (native mapping on) **
 SELECT CURRENT_USER(), USER(), @@session.proxy_user;
 CURRENT_USER()	USER()	@@session.proxy_user
@@ -162,8 +162,8 @@
 SHOW GRANTS;
 Grants for proxy_native_4@localhost
 GRANT INSERT ON *.* TO `proxy_native_4`@`localhost`
-GRANT PROXY ON 'proxy_base'@'localhost' TO 'proxy_native_4'@'localhost'
-GRANT PROXY ON 'proxy_base_multi'@'localhost' TO 'proxy_native_4'@'localhost'
+GRANT PROXY ON `proxy_base`@`localhost` TO `proxy_native_4`@`localhost`
+GRANT PROXY ON `proxy_base_multi`@`localhost` TO `proxy_native_4`@`localhost`
 ** Connecting as chained proxy_native_41 with proxy mapping disabled (native mapping on) **
 SELECT CURRENT_USER(), USER(), @@session.proxy_user;
 CURRENT_USER()	USER()	@@session.proxy_user
@@ -171,7 +171,7 @@
 SHOW GRANTS;
 Grants for proxy_native_41@localhost
 GRANT UPDATE ON *.* TO `proxy_native_41`@`localhost`
-GRANT PROXY ON 'proxy_native_4'@'localhost' TO 'proxy_native_41'@'localhost'
+GRANT PROXY ON `proxy_native_4`@`localhost` TO `proxy_native_41`@`localhost`
 ** Connection default **
 GRANT PROXY ON ''@localhost TO proxy_native_1@localhost;
 ** Connecting as Anonymus with proxy mapping disabled (native mapping on) **
@@ -210,7 +210,7 @@
 SHOW GRANTS;
 Grants for proxy_none@localhost
 GRANT USAGE ON *.* TO `proxy_none`@`localhost`
-GRANT PROXY ON 'proxy_blah'@'localhost' TO 'proxy_none'@'localhost'
+GRANT PROXY ON `proxy_blah`@`localhost` TO `proxy_none`@`localhost`
 ** Connecting as proxy_native_1 with proxy mapping enabled **
 SELECT CURRENT_USER(), USER(), @@session.proxy_user;
 CURRENT_USER()	USER()	@@session.proxy_user
@@ -248,8 +248,8 @@
 SHOW GRANTS;
 Grants for proxy_native_4@localhost
 GRANT INSERT ON *.* TO `proxy_native_4`@`localhost`
-GRANT PROXY ON 'proxy_base'@'localhost' TO 'proxy_native_4'@'localhost'
-GRANT PROXY ON 'proxy_base_multi'@'localhost' TO 'proxy_native_4'@'localhost'
+GRANT PROXY ON `proxy_base`@`localhost` TO `proxy_native_4`@`localhost`
+GRANT PROXY ON `proxy_base_multi`@`localhost` TO `proxy_native_4`@`localhost`
 ** Connection default **
 GRANT PROXY ON ''@localhost TO proxy_native_1@localhost;
 ** Connecting as Anonymus with proxy mapping enabled **
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/mysql_native_password_proxy_users_log.result mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/mysql_native_password_proxy_users_log.result
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/mysql_native_password_proxy_users_log.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/mysql_native_password_proxy_users_log.result	2021-09-28 11:46:34.000000000 +0000
@@ -25,7 +25,7 @@
 SHOW GRANTS;
 Grants for proxy_native@localhost
 GRANT CREATE ON *.* TO `proxy_native`@`localhost`
-GRANT PROXY ON 'proxy_base'@'localhost' TO 'proxy_native'@'localhost'
+GRANT PROXY ON `proxy_base`@`localhost` TO `proxy_native`@`localhost`
 ** Connection default **
 ** Disconnecting connections **
 SET Global check_proxy_users=ON;
@@ -57,3 +57,4 @@
 SET GLOBAL general_log_file=  @old_general_log_file;
 SET GLOBAL general_log=       @old_general_log;
 SET GLOBAL log_output=        @old_log_output;
+TRUNCATE TABLE mysql.general_log;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/persisted_sysvars_with_aliases.result mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/persisted_sysvars_with_aliases.result
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/persisted_sysvars_with_aliases.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/persisted_sysvars_with_aliases.result	2021-09-28 11:46:34.000000000 +0000
@@ -1895,25 +1895,25 @@
 SET @@PERSIST.slave_parallel_type = DEFAULT;
 Warnings:
 Warning	1287	'@@slave_parallel_type' is deprecated and will be removed in a future release. Please use replica_parallel_type instead.
-include/assert.inc [@@global.replica_parallel_type should be DATABASE]
-include/assert.inc [replica_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [replica_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 include/assert.inc [replica_parallel_type should have source DYNAMIC in P_S.variables_info]
-include/assert.inc [replica_parallel_type should be DATABASE in P_S.persisted_variables]
-include/assert.inc [replica_parallel_type should have value DATABASE in the persist file]
-include/assert.inc [@@global.slave_parallel_type should be DATABASE]
-include/assert.inc [slave_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [replica_parallel_type should be LOGICAL_CLOCK in P_S.persisted_variables]
+include/assert.inc [replica_parallel_type should have value LOGICAL_CLOCK in the persist file]
+include/assert.inc [@@global.slave_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 include/assert.inc [slave_parallel_type should have source DYNAMIC in P_S.variables_info]
-include/assert.inc [slave_parallel_type should be DATABASE in P_S.persisted_variables]
-include/assert.inc [slave_parallel_type should have value DATABASE in the persist file]
+include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.persisted_variables]
+include/assert.inc [slave_parallel_type should have value LOGICAL_CLOCK in the persist file]
 # R1. RESET <old>
 RESET PERSIST slave_parallel_type;
-include/assert.inc [@@global.replica_parallel_type should be DATABASE]
-include/assert.inc [replica_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [replica_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 include/assert.inc [replica_parallel_type should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [replica_parallel_type should not exist in P_S.persisted_variables]
 include/assert.inc [replica_parallel_type should not exist in the persist file]
-include/assert.inc [@@global.slave_parallel_type should be DATABASE]
-include/assert.inc [slave_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 include/assert.inc [slave_parallel_type should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [slave_parallel_type should not exist in P_S.persisted_variables]
 include/assert.inc [slave_parallel_type should not exist in the persist file]
@@ -1958,13 +1958,13 @@
 SET GLOBAL replica_parallel_type = DEFAULT;
 # R1. SET <new> when variable was previously unset
 SET @@PERSIST_ONLY.replica_parallel_type = LOGICAL_CLOCK;
-include/assert.inc [@@global.replica_parallel_type should be DATABASE]
-include/assert.inc [replica_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [replica_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 include/assert.inc [replica_parallel_type should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [replica_parallel_type should be LOGICAL_CLOCK in P_S.persisted_variables]
 include/assert.inc [replica_parallel_type should have value LOGICAL_CLOCK in the persist file]
-include/assert.inc [@@global.slave_parallel_type should be DATABASE]
-include/assert.inc [slave_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 include/assert.inc [slave_parallel_type should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.persisted_variables]
 include/assert.inc [slave_parallel_type should have value LOGICAL_CLOCK in the persist file]
@@ -1972,26 +1972,26 @@
 SET @@PERSIST_ONLY.slave_parallel_type = 'DATABASE';
 Warnings:
 Warning	1287	'@@slave_parallel_type' is deprecated and will be removed in a future release. Please use replica_parallel_type instead.
-include/assert.inc [@@global.replica_parallel_type should be DATABASE]
-include/assert.inc [replica_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [replica_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 include/assert.inc [replica_parallel_type should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [replica_parallel_type should be DATABASE in P_S.persisted_variables]
 include/assert.inc [replica_parallel_type should have value DATABASE in the persist file]
-include/assert.inc [@@global.slave_parallel_type should be DATABASE]
-include/assert.inc [slave_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 include/assert.inc [slave_parallel_type should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [slave_parallel_type should be DATABASE in P_S.persisted_variables]
 include/assert.inc [slave_parallel_type should have value DATABASE in the persist file]
 # R1. SET <old>  = DEFAULT
 # R1. RESET <old>
 RESET PERSIST slave_parallel_type;
-include/assert.inc [@@global.replica_parallel_type should be DATABASE]
-include/assert.inc [replica_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [replica_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 include/assert.inc [replica_parallel_type should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [replica_parallel_type should not exist in P_S.persisted_variables]
 include/assert.inc [replica_parallel_type should not exist in the persist file]
-include/assert.inc [@@global.slave_parallel_type should be DATABASE]
-include/assert.inc [slave_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 include/assert.inc [slave_parallel_type should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [slave_parallel_type should not exist in P_S.persisted_variables]
 include/assert.inc [slave_parallel_type should not exist in the persist file]
@@ -1999,37 +1999,37 @@
 SET PERSIST_ONLY slave_parallel_type = 'DATABASE';
 Warnings:
 Warning	1287	'@@slave_parallel_type' is deprecated and will be removed in a future release. Please use replica_parallel_type instead.
-include/assert.inc [@@global.replica_parallel_type should be DATABASE]
-include/assert.inc [replica_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [replica_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 include/assert.inc [replica_parallel_type should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [replica_parallel_type should be DATABASE in P_S.persisted_variables]
 include/assert.inc [replica_parallel_type should have value DATABASE in the persist file]
-include/assert.inc [@@global.slave_parallel_type should be DATABASE]
-include/assert.inc [slave_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 include/assert.inc [slave_parallel_type should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [slave_parallel_type should be DATABASE in P_S.persisted_variables]
 include/assert.inc [slave_parallel_type should have value DATABASE in the persist file]
 # R1. SET <new> when variable was previously set through <old>
 SET PERSIST_ONLY replica_parallel_type = 'LOGICAL_CLOCK';
-include/assert.inc [@@global.replica_parallel_type should be DATABASE]
-include/assert.inc [replica_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [replica_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 include/assert.inc [replica_parallel_type should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [replica_parallel_type should be LOGICAL_CLOCK in P_S.persisted_variables]
 include/assert.inc [replica_parallel_type should have value LOGICAL_CLOCK in the persist file]
-include/assert.inc [@@global.slave_parallel_type should be DATABASE]
-include/assert.inc [slave_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 include/assert.inc [slave_parallel_type should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.persisted_variables]
 include/assert.inc [slave_parallel_type should have value LOGICAL_CLOCK in the persist file]
 # R1. RESET <new>
 RESET PERSIST replica_parallel_type;
-include/assert.inc [@@global.replica_parallel_type should be DATABASE]
-include/assert.inc [replica_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [replica_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 include/assert.inc [replica_parallel_type should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [replica_parallel_type should not exist in P_S.persisted_variables]
 include/assert.inc [replica_parallel_type should not exist in the persist file]
-include/assert.inc [@@global.slave_parallel_type should be DATABASE]
-include/assert.inc [slave_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 include/assert.inc [slave_parallel_type should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [slave_parallel_type should not exist in P_S.persisted_variables]
 include/assert.inc [slave_parallel_type should not exist in the persist file]
@@ -2076,25 +2076,25 @@
 SET @@PERSIST.slave_parallel_workers = DEFAULT;
 Warnings:
 Warning	1287	'@@slave_parallel_workers' is deprecated and will be removed in a future release. Please use replica_parallel_workers instead.
-include/assert.inc [@@global.replica_parallel_workers should be 0]
-include/assert.inc [replica_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_workers should be 4]
+include/assert.inc [replica_parallel_workers should be 4 in P_S.global_variables]
 include/assert.inc [replica_parallel_workers should have source DYNAMIC in P_S.variables_info]
-include/assert.inc [replica_parallel_workers should be 0 in P_S.persisted_variables]
-include/assert.inc [replica_parallel_workers should have value 0 in the persist file]
-include/assert.inc [@@global.slave_parallel_workers should be 0]
-include/assert.inc [slave_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [replica_parallel_workers should be 4 in P_S.persisted_variables]
+include/assert.inc [replica_parallel_workers should have value 4 in the persist file]
+include/assert.inc [@@global.slave_parallel_workers should be 4]
+include/assert.inc [slave_parallel_workers should be 4 in P_S.global_variables]
 include/assert.inc [slave_parallel_workers should have source DYNAMIC in P_S.variables_info]
-include/assert.inc [slave_parallel_workers should be 0 in P_S.persisted_variables]
-include/assert.inc [slave_parallel_workers should have value 0 in the persist file]
+include/assert.inc [slave_parallel_workers should be 4 in P_S.persisted_variables]
+include/assert.inc [slave_parallel_workers should have value 4 in the persist file]
 # R1. RESET <old>
 RESET PERSIST slave_parallel_workers;
-include/assert.inc [@@global.replica_parallel_workers should be 0]
-include/assert.inc [replica_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_workers should be 4]
+include/assert.inc [replica_parallel_workers should be 4 in P_S.global_variables]
 include/assert.inc [replica_parallel_workers should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [replica_parallel_workers should not exist in P_S.persisted_variables]
 include/assert.inc [replica_parallel_workers should not exist in the persist file]
-include/assert.inc [@@global.slave_parallel_workers should be 0]
-include/assert.inc [slave_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_workers should be 4]
+include/assert.inc [slave_parallel_workers should be 4 in P_S.global_variables]
 include/assert.inc [slave_parallel_workers should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [slave_parallel_workers should not exist in P_S.persisted_variables]
 include/assert.inc [slave_parallel_workers should not exist in the persist file]
@@ -2139,13 +2139,13 @@
 SET GLOBAL replica_parallel_workers = DEFAULT;
 # R1. SET <new> when variable was previously unset
 SET @@PERSIST_ONLY.replica_parallel_workers = 1;
-include/assert.inc [@@global.replica_parallel_workers should be 0]
-include/assert.inc [replica_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_workers should be 4]
+include/assert.inc [replica_parallel_workers should be 4 in P_S.global_variables]
 include/assert.inc [replica_parallel_workers should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [replica_parallel_workers should be 1 in P_S.persisted_variables]
 include/assert.inc [replica_parallel_workers should have value 1 in the persist file]
-include/assert.inc [@@global.slave_parallel_workers should be 0]
-include/assert.inc [slave_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_workers should be 4]
+include/assert.inc [slave_parallel_workers should be 4 in P_S.global_variables]
 include/assert.inc [slave_parallel_workers should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [slave_parallel_workers should be 1 in P_S.persisted_variables]
 include/assert.inc [slave_parallel_workers should have value 1 in the persist file]
@@ -2153,13 +2153,13 @@
 SET @@PERSIST_ONLY.slave_parallel_workers = 2;
 Warnings:
 Warning	1287	'@@slave_parallel_workers' is deprecated and will be removed in a future release. Please use replica_parallel_workers instead.
-include/assert.inc [@@global.replica_parallel_workers should be 0]
-include/assert.inc [replica_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_workers should be 4]
+include/assert.inc [replica_parallel_workers should be 4 in P_S.global_variables]
 include/assert.inc [replica_parallel_workers should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [replica_parallel_workers should be 2 in P_S.persisted_variables]
 include/assert.inc [replica_parallel_workers should have value 2 in the persist file]
-include/assert.inc [@@global.slave_parallel_workers should be 0]
-include/assert.inc [slave_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_workers should be 4]
+include/assert.inc [slave_parallel_workers should be 4 in P_S.global_variables]
 include/assert.inc [slave_parallel_workers should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [slave_parallel_workers should be 2 in P_S.persisted_variables]
 include/assert.inc [slave_parallel_workers should have value 2 in the persist file]
@@ -2167,25 +2167,25 @@
 SET @@PERSIST_ONLY.slave_parallel_workers = DEFAULT;
 Warnings:
 Warning	1287	'@@slave_parallel_workers' is deprecated and will be removed in a future release. Please use replica_parallel_workers instead.
-include/assert.inc [@@global.replica_parallel_workers should be 0]
-include/assert.inc [replica_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_workers should be 4]
+include/assert.inc [replica_parallel_workers should be 4 in P_S.global_variables]
 include/assert.inc [replica_parallel_workers should have source DYNAMIC in P_S.variables_info]
-include/assert.inc [replica_parallel_workers should be 0 in P_S.persisted_variables]
-include/assert.inc [replica_parallel_workers should have value 0 in the persist file]
-include/assert.inc [@@global.slave_parallel_workers should be 0]
-include/assert.inc [slave_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [replica_parallel_workers should be 4 in P_S.persisted_variables]
+include/assert.inc [replica_parallel_workers should have value 4 in the persist file]
+include/assert.inc [@@global.slave_parallel_workers should be 4]
+include/assert.inc [slave_parallel_workers should be 4 in P_S.global_variables]
 include/assert.inc [slave_parallel_workers should have source DYNAMIC in P_S.variables_info]
-include/assert.inc [slave_parallel_workers should be 0 in P_S.persisted_variables]
-include/assert.inc [slave_parallel_workers should have value 0 in the persist file]
+include/assert.inc [slave_parallel_workers should be 4 in P_S.persisted_variables]
+include/assert.inc [slave_parallel_workers should have value 4 in the persist file]
 # R1. RESET <old>
 RESET PERSIST slave_parallel_workers;
-include/assert.inc [@@global.replica_parallel_workers should be 0]
-include/assert.inc [replica_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_workers should be 4]
+include/assert.inc [replica_parallel_workers should be 4 in P_S.global_variables]
 include/assert.inc [replica_parallel_workers should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [replica_parallel_workers should not exist in P_S.persisted_variables]
 include/assert.inc [replica_parallel_workers should not exist in the persist file]
-include/assert.inc [@@global.slave_parallel_workers should be 0]
-include/assert.inc [slave_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_workers should be 4]
+include/assert.inc [slave_parallel_workers should be 4 in P_S.global_variables]
 include/assert.inc [slave_parallel_workers should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [slave_parallel_workers should not exist in P_S.persisted_variables]
 include/assert.inc [slave_parallel_workers should not exist in the persist file]
@@ -2193,37 +2193,37 @@
 SET PERSIST_ONLY slave_parallel_workers = 2;
 Warnings:
 Warning	1287	'@@slave_parallel_workers' is deprecated and will be removed in a future release. Please use replica_parallel_workers instead.
-include/assert.inc [@@global.replica_parallel_workers should be 0]
-include/assert.inc [replica_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_workers should be 4]
+include/assert.inc [replica_parallel_workers should be 4 in P_S.global_variables]
 include/assert.inc [replica_parallel_workers should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [replica_parallel_workers should be 2 in P_S.persisted_variables]
 include/assert.inc [replica_parallel_workers should have value 2 in the persist file]
-include/assert.inc [@@global.slave_parallel_workers should be 0]
-include/assert.inc [slave_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_workers should be 4]
+include/assert.inc [slave_parallel_workers should be 4 in P_S.global_variables]
 include/assert.inc [slave_parallel_workers should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [slave_parallel_workers should be 2 in P_S.persisted_variables]
 include/assert.inc [slave_parallel_workers should have value 2 in the persist file]
 # R1. SET <new> when variable was previously set through <old>
 SET PERSIST_ONLY replica_parallel_workers = 100;
-include/assert.inc [@@global.replica_parallel_workers should be 0]
-include/assert.inc [replica_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_workers should be 4]
+include/assert.inc [replica_parallel_workers should be 4 in P_S.global_variables]
 include/assert.inc [replica_parallel_workers should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [replica_parallel_workers should be 100 in P_S.persisted_variables]
 include/assert.inc [replica_parallel_workers should have value 100 in the persist file]
-include/assert.inc [@@global.slave_parallel_workers should be 0]
-include/assert.inc [slave_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_workers should be 4]
+include/assert.inc [slave_parallel_workers should be 4 in P_S.global_variables]
 include/assert.inc [slave_parallel_workers should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [slave_parallel_workers should be 100 in P_S.persisted_variables]
 include/assert.inc [slave_parallel_workers should have value 100 in the persist file]
 # R1. RESET <new>
 RESET PERSIST replica_parallel_workers;
-include/assert.inc [@@global.replica_parallel_workers should be 0]
-include/assert.inc [replica_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_workers should be 4]
+include/assert.inc [replica_parallel_workers should be 4 in P_S.global_variables]
 include/assert.inc [replica_parallel_workers should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [replica_parallel_workers should not exist in P_S.persisted_variables]
 include/assert.inc [replica_parallel_workers should not exist in the persist file]
-include/assert.inc [@@global.slave_parallel_workers should be 0]
-include/assert.inc [slave_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_workers should be 4]
+include/assert.inc [slave_parallel_workers should be 4 in P_S.global_variables]
 include/assert.inc [slave_parallel_workers should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [slave_parallel_workers should not exist in P_S.persisted_variables]
 include/assert.inc [slave_parallel_workers should not exist in the persist file]
@@ -2464,25 +2464,25 @@
 SET @@PERSIST.slave_preserve_commit_order = DEFAULT;
 Warnings:
 Warning	1287	'@@slave_preserve_commit_order' is deprecated and will be removed in a future release. Please use replica_preserve_commit_order instead.
-include/assert.inc [@@global.replica_preserve_commit_order should be 0]
-include/assert.inc [replica_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_preserve_commit_order should be 1]
+include/assert.inc [replica_preserve_commit_order should be 1 in P_S.global_variables]
 include/assert.inc [replica_preserve_commit_order should have source DYNAMIC in P_S.variables_info]
-include/assert.inc [replica_preserve_commit_order should be OFF in P_S.persisted_variables]
-include/assert.inc [replica_preserve_commit_order should have value OFF in the persist file]
-include/assert.inc [@@global.slave_preserve_commit_order should be 0]
-include/assert.inc [slave_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [replica_preserve_commit_order should be ON in P_S.persisted_variables]
+include/assert.inc [replica_preserve_commit_order should have value ON in the persist file]
+include/assert.inc [@@global.slave_preserve_commit_order should be 1]
+include/assert.inc [slave_preserve_commit_order should be 1 in P_S.global_variables]
 include/assert.inc [slave_preserve_commit_order should have source DYNAMIC in P_S.variables_info]
-include/assert.inc [slave_preserve_commit_order should be OFF in P_S.persisted_variables]
-include/assert.inc [slave_preserve_commit_order should have value OFF in the persist file]
+include/assert.inc [slave_preserve_commit_order should be ON in P_S.persisted_variables]
+include/assert.inc [slave_preserve_commit_order should have value ON in the persist file]
 # R1. RESET <old>
 RESET PERSIST slave_preserve_commit_order;
-include/assert.inc [@@global.replica_preserve_commit_order should be 0]
-include/assert.inc [replica_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_preserve_commit_order should be 1]
+include/assert.inc [replica_preserve_commit_order should be 1 in P_S.global_variables]
 include/assert.inc [replica_preserve_commit_order should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [replica_preserve_commit_order should not exist in P_S.persisted_variables]
 include/assert.inc [replica_preserve_commit_order should not exist in the persist file]
-include/assert.inc [@@global.slave_preserve_commit_order should be 0]
-include/assert.inc [slave_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.slave_preserve_commit_order should be 1]
+include/assert.inc [slave_preserve_commit_order should be 1 in P_S.global_variables]
 include/assert.inc [slave_preserve_commit_order should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [slave_preserve_commit_order should not exist in P_S.persisted_variables]
 include/assert.inc [slave_preserve_commit_order should not exist in the persist file]
@@ -2527,13 +2527,13 @@
 SET GLOBAL replica_preserve_commit_order = DEFAULT;
 # R1. SET <new> when variable was previously unset
 SET @@PERSIST_ONLY.replica_preserve_commit_order = ON;
-include/assert.inc [@@global.replica_preserve_commit_order should be 0]
-include/assert.inc [replica_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_preserve_commit_order should be 1]
+include/assert.inc [replica_preserve_commit_order should be 1 in P_S.global_variables]
 include/assert.inc [replica_preserve_commit_order should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [replica_preserve_commit_order should be ON in P_S.persisted_variables]
 include/assert.inc [replica_preserve_commit_order should have value ON in the persist file]
-include/assert.inc [@@global.slave_preserve_commit_order should be 0]
-include/assert.inc [slave_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.slave_preserve_commit_order should be 1]
+include/assert.inc [slave_preserve_commit_order should be 1 in P_S.global_variables]
 include/assert.inc [slave_preserve_commit_order should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [slave_preserve_commit_order should be ON in P_S.persisted_variables]
 include/assert.inc [slave_preserve_commit_order should have value ON in the persist file]
@@ -2541,13 +2541,13 @@
 SET @@PERSIST_ONLY.slave_preserve_commit_order = OFF;
 Warnings:
 Warning	1287	'@@slave_preserve_commit_order' is deprecated and will be removed in a future release. Please use replica_preserve_commit_order instead.
-include/assert.inc [@@global.replica_preserve_commit_order should be 0]
-include/assert.inc [replica_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_preserve_commit_order should be 1]
+include/assert.inc [replica_preserve_commit_order should be 1 in P_S.global_variables]
 include/assert.inc [replica_preserve_commit_order should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [replica_preserve_commit_order should be OFF in P_S.persisted_variables]
 include/assert.inc [replica_preserve_commit_order should have value OFF in the persist file]
-include/assert.inc [@@global.slave_preserve_commit_order should be 0]
-include/assert.inc [slave_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.slave_preserve_commit_order should be 1]
+include/assert.inc [slave_preserve_commit_order should be 1 in P_S.global_variables]
 include/assert.inc [slave_preserve_commit_order should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [slave_preserve_commit_order should be OFF in P_S.persisted_variables]
 include/assert.inc [slave_preserve_commit_order should have value OFF in the persist file]
@@ -2555,25 +2555,25 @@
 SET @@PERSIST_ONLY.slave_preserve_commit_order = DEFAULT;
 Warnings:
 Warning	1287	'@@slave_preserve_commit_order' is deprecated and will be removed in a future release. Please use replica_preserve_commit_order instead.
-include/assert.inc [@@global.replica_preserve_commit_order should be 0]
-include/assert.inc [replica_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_preserve_commit_order should be 1]
+include/assert.inc [replica_preserve_commit_order should be 1 in P_S.global_variables]
 include/assert.inc [replica_preserve_commit_order should have source DYNAMIC in P_S.variables_info]
-include/assert.inc [replica_preserve_commit_order should be OFF in P_S.persisted_variables]
-include/assert.inc [replica_preserve_commit_order should have value OFF in the persist file]
-include/assert.inc [@@global.slave_preserve_commit_order should be 0]
-include/assert.inc [slave_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [replica_preserve_commit_order should be ON in P_S.persisted_variables]
+include/assert.inc [replica_preserve_commit_order should have value ON in the persist file]
+include/assert.inc [@@global.slave_preserve_commit_order should be 1]
+include/assert.inc [slave_preserve_commit_order should be 1 in P_S.global_variables]
 include/assert.inc [slave_preserve_commit_order should have source DYNAMIC in P_S.variables_info]
-include/assert.inc [slave_preserve_commit_order should be OFF in P_S.persisted_variables]
-include/assert.inc [slave_preserve_commit_order should have value OFF in the persist file]
+include/assert.inc [slave_preserve_commit_order should be ON in P_S.persisted_variables]
+include/assert.inc [slave_preserve_commit_order should have value ON in the persist file]
 # R1. RESET <old>
 RESET PERSIST slave_preserve_commit_order;
-include/assert.inc [@@global.replica_preserve_commit_order should be 0]
-include/assert.inc [replica_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_preserve_commit_order should be 1]
+include/assert.inc [replica_preserve_commit_order should be 1 in P_S.global_variables]
 include/assert.inc [replica_preserve_commit_order should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [replica_preserve_commit_order should not exist in P_S.persisted_variables]
 include/assert.inc [replica_preserve_commit_order should not exist in the persist file]
-include/assert.inc [@@global.slave_preserve_commit_order should be 0]
-include/assert.inc [slave_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.slave_preserve_commit_order should be 1]
+include/assert.inc [slave_preserve_commit_order should be 1 in P_S.global_variables]
 include/assert.inc [slave_preserve_commit_order should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [slave_preserve_commit_order should not exist in P_S.persisted_variables]
 include/assert.inc [slave_preserve_commit_order should not exist in the persist file]
@@ -2581,37 +2581,37 @@
 SET PERSIST_ONLY slave_preserve_commit_order = OFF;
 Warnings:
 Warning	1287	'@@slave_preserve_commit_order' is deprecated and will be removed in a future release. Please use replica_preserve_commit_order instead.
-include/assert.inc [@@global.replica_preserve_commit_order should be 0]
-include/assert.inc [replica_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_preserve_commit_order should be 1]
+include/assert.inc [replica_preserve_commit_order should be 1 in P_S.global_variables]
 include/assert.inc [replica_preserve_commit_order should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [replica_preserve_commit_order should be OFF in P_S.persisted_variables]
 include/assert.inc [replica_preserve_commit_order should have value OFF in the persist file]
-include/assert.inc [@@global.slave_preserve_commit_order should be 0]
-include/assert.inc [slave_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.slave_preserve_commit_order should be 1]
+include/assert.inc [slave_preserve_commit_order should be 1 in P_S.global_variables]
 include/assert.inc [slave_preserve_commit_order should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [slave_preserve_commit_order should be OFF in P_S.persisted_variables]
 include/assert.inc [slave_preserve_commit_order should have value OFF in the persist file]
 # R1. SET <new> when variable was previously set through <old>
 SET PERSIST_ONLY replica_preserve_commit_order = 1;
-include/assert.inc [@@global.replica_preserve_commit_order should be 0]
-include/assert.inc [replica_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_preserve_commit_order should be 1]
+include/assert.inc [replica_preserve_commit_order should be 1 in P_S.global_variables]
 include/assert.inc [replica_preserve_commit_order should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [replica_preserve_commit_order should be ON in P_S.persisted_variables]
 include/assert.inc [replica_preserve_commit_order should have value ON in the persist file]
-include/assert.inc [@@global.slave_preserve_commit_order should be 0]
-include/assert.inc [slave_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.slave_preserve_commit_order should be 1]
+include/assert.inc [slave_preserve_commit_order should be 1 in P_S.global_variables]
 include/assert.inc [slave_preserve_commit_order should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [slave_preserve_commit_order should be ON in P_S.persisted_variables]
 include/assert.inc [slave_preserve_commit_order should have value ON in the persist file]
 # R1. RESET <new>
 RESET PERSIST replica_preserve_commit_order;
-include/assert.inc [@@global.replica_preserve_commit_order should be 0]
-include/assert.inc [replica_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_preserve_commit_order should be 1]
+include/assert.inc [replica_preserve_commit_order should be 1 in P_S.global_variables]
 include/assert.inc [replica_preserve_commit_order should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [replica_preserve_commit_order should not exist in P_S.persisted_variables]
 include/assert.inc [replica_preserve_commit_order should not exist in the persist file]
-include/assert.inc [@@global.slave_preserve_commit_order should be 0]
-include/assert.inc [slave_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.slave_preserve_commit_order should be 1]
+include/assert.inc [slave_preserve_commit_order should be 1 in P_S.global_variables]
 include/assert.inc [slave_preserve_commit_order should have source DYNAMIC in P_S.variables_info]
 include/assert.inc [slave_preserve_commit_order should not exist in P_S.persisted_variables]
 include/assert.inc [slave_preserve_commit_order should not exist in the persist file]
@@ -7481,3 +7481,4 @@
 include/assert.inc [sync_master_info should not exist in P_S.persisted_variables]
 include/assert.inc [sync_master_info should not exist in the persist file]
 #### Clean up ####
+# restart
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/persist_only_admin_x509_subject_basic_fr2.result mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/persist_only_admin_x509_subject_basic_fr2.result
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/persist_only_admin_x509_subject_basic_fr2.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/persist_only_admin_x509_subject_basic_fr2.result	2021-09-28 11:46:34.000000000 +0000
@@ -12,6 +12,8 @@
 SET PERSIST_ONLY character_sets_dir = DEFAULT;
 SET PERSIST_ONLY datadir = DEFAULT;
 SET PERSIST_ONLY default_authentication_plugin = DEFAULT;
+Warnings:
+Warning	1287	'@@default_authentication_plugin' is deprecated and will be removed in a future release. Please use authentication_policy instead.
 SET PERSIST_ONLY ft_stopword_file = DEFAULT;
 SET PERSIST_ONLY init_file = DEFAULT;
 SET PERSIST_ONLY keyring_operations = DEFAULT;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/preload_buffer_size_basic.result mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/preload_buffer_size_basic.result
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/preload_buffer_size_basic.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/preload_buffer_size_basic.result	2021-09-28 11:46:34.000000000 +0000
@@ -183,6 +183,24 @@
 ERROR 42S02: Unknown table 'session' in field list
 SELECT preload_buffer_size = @@session.preload_buffer_size;
 ERROR 42S22: Unknown column 'preload_buffer_size' in 'field list'
+'#---------------------FN_DYNVARS_129_12----------------------#'
+CREATE USER foo, bar;
+GRANT SESSION_VARIABLES_ADMIN ON *.*  TO bar;
+SELECT @@session.preload_buffer_size;
+@@session.preload_buffer_size
+2048
+SET @@session.preload_buffer_size = 2048;
+ERROR 42000: Access denied; you need (at least one of) the SYSTEM_VARIABLES_ADMIN or SESSION_VARIABLES_ADMIN privilege(s) for this operation
+SELECT @@session.preload_buffer_size;
+@@session.preload_buffer_size
+2048
+SET @@session.preload_buffer_size = 2048;
+SELECT @@session.preload_buffer_size;
+@@session.preload_buffer_size
+2048
+SET @@global.preload_buffer_size = 2048;
+ERROR 42000: Access denied; you need (at least one of) the SUPER or SYSTEM_VARIABLES_ADMIN privilege(s) for this operation
+DROP USER foo, bar;
 SET @@global.preload_buffer_size = @start_global_value;
 SELECT @@global.preload_buffer_size;
 @@global.preload_buffer_size
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/print_identified_with_as_hex_basic.result mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/print_identified_with_as_hex_basic.result
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/print_identified_with_as_hex_basic.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/print_identified_with_as_hex_basic.result	2021-09-28 11:46:34.000000000 +0000
@@ -17,20 +17,20 @@
 # Should display hex: unprintable symbols
 SHOW CREATE USER foo@localhost;
 CREATE USER for foo@localhost
-CREATE USER 'foo'@'localhost' IDENTIFIED WITH 'caching_sha2_password' AS 0x244124303035240C4D7A6D25436F2C0A08515310644615383E2A123961484C6276734178425A446172436B58446A582F6178544A692E6F644E4F2F4E596E666276454B563336 REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `foo`@`localhost` IDENTIFIED WITH 'caching_sha2_password' AS 0x244124303035240C4D7A6D25436F2C0A08515310644615383E2A123961484C6276734178425A446172436B58446A582F6178544A692E6F644E4F2F4E596E666276454B563336 REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 # Should not display hex: native passwords not having non-printable bytes
 SHOW CREATE USER oldfoo@localhost;
 CREATE USER for oldfoo@localhost
-CREATE USER 'oldfoo'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*E8D46CE25265E545D225A8A6F1BAF642FEBEE5CB' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `oldfoo`@`localhost` IDENTIFIED WITH 'mysql_native_password' AS '*E8D46CE25265E545D225A8A6F1BAF642FEBEE5CB' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 SET SESSION print_identified_with_as_hex=0;
 # Should not display hex: turned off
 SHOW CREATE USER foo@localhost;
 CREATE USER for foo@localhost
-CREATE USER 'foo'@'localhost' IDENTIFIED WITH 'caching_sha2_password' AS '$A$005$Mzm%Co,\nQSdF8>*9aHLbvsAxBZDarCkXDjX/axTJi.odNO/NYnfbvEKV36' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `foo`@`localhost` IDENTIFIED WITH 'caching_sha2_password' AS '$A$005$Mzm%Co,\nQSdF8>*9aHLbvsAxBZDarCkXDjX/axTJi.odNO/NYnfbvEKV36' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 # Should not display hex: turned off
 SHOW CREATE USER oldfoo@localhost;
 CREATE USER for oldfoo@localhost
-CREATE USER 'oldfoo'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*E8D46CE25265E545D225A8A6F1BAF642FEBEE5CB' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
+CREATE USER `oldfoo`@`localhost` IDENTIFIED WITH 'mysql_native_password' AS '*E8D46CE25265E545D225A8A6F1BAF642FEBEE5CB' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT
 # Now try to reply the statement produced by SHOW CREATE
 DROP USER foo@localhost;
 # Replaying the collected statement
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/select_into_buffer_size.result mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/select_into_buffer_size.result
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/select_into_buffer_size.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/select_into_buffer_size.result	2021-09-28 11:46:34.000000000 +0000
@@ -179,6 +179,26 @@
 ERROR 42S02: Unknown table 'session' in field list
 SELECT select_into_buffer_size = @@session.select_into_buffer_size;
 ERROR 42S22: Unknown column 'select_into_buffer_size' in 'field list'
+'#---------------------FN_DYNVARS_001_12----------------------#'
+CREATE USER foo, bar;
+GRANT SESSION_VARIABLES_ADMIN ON *.*  TO bar;
+SELECT @@session.select_into_buffer_size;
+@@session.select_into_buffer_size
+16384
+SET @@session.select_into_buffer_size = 15000;
+ERROR 42000: Access denied; you need (at least one of) the SYSTEM_VARIABLES_ADMIN or SESSION_VARIABLES_ADMIN privilege(s) for this operation
+SELECT @@session.select_into_buffer_size;
+@@session.select_into_buffer_size
+16384
+SET @@session.select_into_buffer_size = 15000;
+Warnings:
+Warning	1292	Truncated incorrect select_into_buffer_size value: '15000'
+SELECT @@session.select_into_buffer_size;
+@@session.select_into_buffer_size
+12288
+SET @@global.select_into_buffer_size = 15000;
+ERROR 42000: Access denied; you need (at least one of) the SUPER or SYSTEM_VARIABLES_ADMIN privilege(s) for this operation
+DROP USER foo, bar;
 SET @@global.select_into_buffer_size = @start_global_value;
 SELECT @@global.select_into_buffer_size;
 @@global.select_into_buffer_size
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/select_into_disk_sync_delay.result mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/select_into_disk_sync_delay.result
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/select_into_disk_sync_delay.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/select_into_disk_sync_delay.result	2021-09-28 11:46:34.000000000 +0000
@@ -155,6 +155,24 @@
 ERROR 42S02: Unknown table 'session' in field list
 SELECT select_into_disk_sync_delay = @@session.select_into_disk_sync_delay;
 ERROR 42S22: Unknown column 'select_into_disk_sync_delay' in 'field list'
+'#---------------------FN_DYNVARS_001_12----------------------#'
+CREATE USER foo, bar;
+GRANT SESSION_VARIABLES_ADMIN ON *.*  TO bar;
+SELECT @@session.select_into_disk_sync_delay;
+@@session.select_into_disk_sync_delay
+10
+SET @@session.select_into_disk_sync_delay = 2000;
+ERROR 42000: Access denied; you need (at least one of) the SYSTEM_VARIABLES_ADMIN or SESSION_VARIABLES_ADMIN privilege(s) for this operation
+SELECT @@session.select_into_disk_sync_delay;
+@@session.select_into_disk_sync_delay
+10
+SET @@session.select_into_disk_sync_delay = 2000;
+SET @@global.select_into_disk_sync_delay = 2000;
+ERROR 42000: Access denied; you need (at least one of) the SUPER or SYSTEM_VARIABLES_ADMIN privilege(s) for this operation
+SELECT @@session.select_into_disk_sync_delay;
+@@session.select_into_disk_sync_delay
+2000
+DROP USER foo, bar;
 SET @@global.select_into_disk_sync_delay = @start_global_value;
 SELECT @@global.select_into_disk_sync_delay;
 @@global.select_into_disk_sync_delay
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/sha256_password_proxy_users_func.result mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/sha256_password_proxy_users_func.result
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/sha256_password_proxy_users_func.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/sha256_password_proxy_users_func.result	2021-09-28 11:46:34.000000000 +0000
@@ -60,7 +60,7 @@
 SHOW GRANTS;
 Grants for proxy_sha256@localhost
 GRANT USAGE ON *.* TO `proxy_sha256`@`localhost`
-GRANT PROXY ON 'proxy_base'@'localhost' TO 'proxy_sha256'@'localhost'
+GRANT PROXY ON `proxy_base`@`localhost` TO `proxy_sha256`@`localhost`
 ** Connection default **
 ALTER USER 'proxy_sha256'@'localhost' IDENTIFIED BY 'testpw';
 ** Connecting as proxy_sha256, password with proxy mapping disabled **
@@ -70,7 +70,7 @@
 SHOW GRANTS;
 Grants for proxy_sha256@localhost
 GRANT USAGE ON *.* TO `proxy_sha256`@`localhost`
-GRANT PROXY ON 'proxy_base'@'localhost' TO 'proxy_sha256'@'localhost'
+GRANT PROXY ON `proxy_base`@`localhost` TO `proxy_sha256`@`localhost`
 ** Connection default **
 ALTER USER 'proxy_sha256'@'localhost' IDENTIFIED BY '';
 ** Connecting as proxy_none with proxy mapping disabled **
@@ -80,7 +80,7 @@
 SHOW GRANTS;
 Grants for proxy_none@localhost
 GRANT USAGE ON *.* TO `proxy_none`@`localhost`
-GRANT PROXY ON 'proxy_blah'@'localhost' TO 'proxy_none'@'localhost'
+GRANT PROXY ON `proxy_blah`@`localhost` TO `proxy_none`@`localhost`
 ** Connecting as proxy_sha256_1 with proxy mapping disabled **
 SELECT CURRENT_USER(), USER(), @@session.proxy_user;
 CURRENT_USER()	USER()	@@session.proxy_user
@@ -88,7 +88,7 @@
 SHOW GRANTS;
 Grants for proxy_sha256_1@localhost
 GRANT DELETE ON *.* TO `proxy_sha256_1`@`localhost`
-GRANT PROXY ON 'proxy_base_multi'@'localhost' TO 'proxy_sha256_1'@'localhost'
+GRANT PROXY ON `proxy_base_multi`@`localhost` TO `proxy_sha256_1`@`localhost`
 ** Connecting as proxy_sha256_2 with proxy mapping disabled **
 SELECT CURRENT_USER(), USER(), @@session.proxy_user;
 CURRENT_USER()	USER()	@@session.proxy_user
@@ -96,7 +96,7 @@
 SHOW GRANTS;
 Grants for proxy_sha256_2@localhost
 GRANT INSERT, DELETE ON *.* TO `proxy_sha256_2`@`localhost`
-GRANT PROXY ON 'proxy_base_multi'@'localhost' TO 'proxy_sha256_2'@'localhost'
+GRANT PROXY ON `proxy_base_multi`@`localhost` TO `proxy_sha256_2`@`localhost`
 ** Connecting as proxy_sha256_4 with proxy mapping disabled **
 SELECT CURRENT_USER(), USER(), @@session.proxy_user;
 CURRENT_USER()	USER()	@@session.proxy_user
@@ -104,8 +104,8 @@
 SHOW GRANTS;
 Grants for proxy_sha256_4@localhost
 GRANT INSERT ON *.* TO `proxy_sha256_4`@`localhost`
-GRANT PROXY ON 'proxy_base'@'localhost' TO 'proxy_sha256_4'@'localhost'
-GRANT PROXY ON 'proxy_base_multi'@'localhost' TO 'proxy_sha256_4'@'localhost'
+GRANT PROXY ON `proxy_base`@`localhost` TO `proxy_sha256_4`@`localhost`
+GRANT PROXY ON `proxy_base_multi`@`localhost` TO `proxy_sha256_4`@`localhost`
 ** Connection default **
 ** Disconnecting connections **
 '#----- 3.2.2.1 check OFF and sha256 ON ----------------------#'
@@ -118,7 +118,7 @@
 SHOW GRANTS;
 Grants for proxy_sha256@localhost
 GRANT USAGE ON *.* TO `proxy_sha256`@`localhost`
-GRANT PROXY ON 'proxy_base'@'localhost' TO 'proxy_sha256'@'localhost'
+GRANT PROXY ON `proxy_base`@`localhost` TO `proxy_sha256`@`localhost`
 ** Connection default **
 ALTER USER 'proxy_sha256'@'localhost' IDENTIFIED BY 'testpw';
 ** Connecting as proxy_sha256, password with proxy mapping disabled (sha256 mapping on) **
@@ -128,7 +128,7 @@
 SHOW GRANTS;
 Grants for proxy_sha256@localhost
 GRANT USAGE ON *.* TO `proxy_sha256`@`localhost`
-GRANT PROXY ON 'proxy_base'@'localhost' TO 'proxy_sha256'@'localhost'
+GRANT PROXY ON `proxy_base`@`localhost` TO `proxy_sha256`@`localhost`
 ** Connection default **
 ALTER USER 'proxy_sha256'@'localhost' IDENTIFIED BY '';
 ** Connecting as proxy_none with proxy mapping disabled (sha256 mapping on) **
@@ -138,7 +138,7 @@
 SHOW GRANTS;
 Grants for proxy_none@localhost
 GRANT USAGE ON *.* TO `proxy_none`@`localhost`
-GRANT PROXY ON 'proxy_blah'@'localhost' TO 'proxy_none'@'localhost'
+GRANT PROXY ON `proxy_blah`@`localhost` TO `proxy_none`@`localhost`
 ** Connecting as proxy_sha256_1 with proxy mapping disabled (sha256 mapping on)**
 SELECT CURRENT_USER(), USER(), @@session.proxy_user;
 CURRENT_USER()	USER()	@@session.proxy_user
@@ -146,7 +146,7 @@
 SHOW GRANTS;
 Grants for proxy_sha256_1@localhost
 GRANT DELETE ON *.* TO `proxy_sha256_1`@`localhost`
-GRANT PROXY ON 'proxy_base_multi'@'localhost' TO 'proxy_sha256_1'@'localhost'
+GRANT PROXY ON `proxy_base_multi`@`localhost` TO `proxy_sha256_1`@`localhost`
 ** Connecting as proxy_sha256_2 with proxy mapping disabled (sha256 mapping on) **
 SELECT CURRENT_USER(), USER(), @@session.proxy_user;
 CURRENT_USER()	USER()	@@session.proxy_user
@@ -154,7 +154,7 @@
 SHOW GRANTS;
 Grants for proxy_sha256_2@localhost
 GRANT INSERT, DELETE ON *.* TO `proxy_sha256_2`@`localhost`
-GRANT PROXY ON 'proxy_base_multi'@'localhost' TO 'proxy_sha256_2'@'localhost'
+GRANT PROXY ON `proxy_base_multi`@`localhost` TO `proxy_sha256_2`@`localhost`
 ** Connecting as proxy_sha256_4 with proxy mapping disabled (sha256 mapping on) **
 SELECT CURRENT_USER(), USER(), @@session.proxy_user;
 CURRENT_USER()	USER()	@@session.proxy_user
@@ -162,8 +162,8 @@
 SHOW GRANTS;
 Grants for proxy_sha256_4@localhost
 GRANT INSERT ON *.* TO `proxy_sha256_4`@`localhost`
-GRANT PROXY ON 'proxy_base'@'localhost' TO 'proxy_sha256_4'@'localhost'
-GRANT PROXY ON 'proxy_base_multi'@'localhost' TO 'proxy_sha256_4'@'localhost'
+GRANT PROXY ON `proxy_base`@`localhost` TO `proxy_sha256_4`@`localhost`
+GRANT PROXY ON `proxy_base_multi`@`localhost` TO `proxy_sha256_4`@`localhost`
 ** Connecting as chained proxy_sha256_41 with proxy mapping disabled (sha256 mapping on) **
 SELECT CURRENT_USER(), USER(), @@session.proxy_user;
 CURRENT_USER()	USER()	@@session.proxy_user
@@ -171,7 +171,7 @@
 SHOW GRANTS;
 Grants for proxy_sha256_41@localhost
 GRANT UPDATE ON *.* TO `proxy_sha256_41`@`localhost`
-GRANT PROXY ON 'proxy_sha256_4'@'localhost' TO 'proxy_sha256_41'@'localhost'
+GRANT PROXY ON `proxy_sha256_4`@`localhost` TO `proxy_sha256_41`@`localhost`
 ** Connection default **
 GRANT PROXY ON ''@localhost TO proxy_sha256_1@localhost;
 ** Connecting as Anonymus with proxy mapping disabled (sha256 mapping on) **
@@ -210,7 +210,7 @@
 SHOW GRANTS;
 Grants for proxy_none@localhost
 GRANT USAGE ON *.* TO `proxy_none`@`localhost`
-GRANT PROXY ON 'proxy_blah'@'localhost' TO 'proxy_none'@'localhost'
+GRANT PROXY ON `proxy_blah`@`localhost` TO `proxy_none`@`localhost`
 ** Connecting as proxy_sha256_1 with proxy mapping enabled **
 SELECT CURRENT_USER(), USER(), @@session.proxy_user;
 CURRENT_USER()	USER()	@@session.proxy_user
@@ -248,8 +248,8 @@
 SHOW GRANTS;
 Grants for proxy_sha256_4@localhost
 GRANT INSERT ON *.* TO `proxy_sha256_4`@`localhost`
-GRANT PROXY ON 'proxy_base'@'localhost' TO 'proxy_sha256_4'@'localhost'
-GRANT PROXY ON 'proxy_base_multi'@'localhost' TO 'proxy_sha256_4'@'localhost'
+GRANT PROXY ON `proxy_base`@`localhost` TO `proxy_sha256_4`@`localhost`
+GRANT PROXY ON `proxy_base_multi`@`localhost` TO `proxy_sha256_4`@`localhost`
 ** Connection default **
 GRANT PROXY ON ''@localhost TO proxy_sha256_1@localhost;
 ** Connecting as Anonymus with proxy mapping enabled **
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/sha256_password_proxy_users_log.result mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/sha256_password_proxy_users_log.result
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/sha256_password_proxy_users_log.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/sha256_password_proxy_users_log.result	2021-09-28 11:46:34.000000000 +0000
@@ -25,7 +25,7 @@
 SHOW GRANTS;
 Grants for proxy_sha256@localhost
 GRANT CREATE ON *.* TO `proxy_sha256`@`localhost`
-GRANT PROXY ON 'proxy_base'@'localhost' TO 'proxy_sha256'@'localhost'
+GRANT PROXY ON `proxy_base`@`localhost` TO `proxy_sha256`@`localhost`
 ** Connection default **
 ** Disconnecting connections **
 SET Global check_proxy_users=ON;
@@ -57,3 +57,4 @@
 SET GLOBAL general_log_file=  @old_general_log_file;
 SET GLOBAL general_log=       @old_general_log;
 SET GLOBAL log_output=        @old_log_output;
+TRUNCATE TABLE mysql.general_log;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/show_old_temporals_basic.result mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/show_old_temporals_basic.result
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/show_old_temporals_basic.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/show_old_temporals_basic.result	2021-09-28 11:46:34.000000000 +0000
@@ -128,3 +128,28 @@
 #Test for invalid value.
 SET GLOBAL show_old_temporals= 2;
 ERROR 42000: Variable 'show_old_temporals' can't be set to the value of '2'
+CREATE USER foo, bar;
+GRANT SESSION_VARIABLES_ADMIN ON *.*  TO bar;
+SELECT @@session.show_old_temporals;
+@@session.show_old_temporals
+0
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+SET @@session.show_old_temporals = 0;
+ERROR 42000: Access denied; you need (at least one of) the SYSTEM_VARIABLES_ADMIN or SESSION_VARIABLES_ADMIN privilege(s) for this operation
+SELECT @@session.show_old_temporals;
+@@session.show_old_temporals
+0
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+SET @@session.show_old_temporals = 0;
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+SELECT @@session.show_old_temporals;
+@@session.show_old_temporals
+0
+Warnings:
+Warning	1287	'@@show_old_temporals' is deprecated and will be removed in a future release.
+SET @@global.show_old_temporals = 0;
+ERROR 42000: Access denied; you need (at least one of) the SUPER or SYSTEM_VARIABLES_ADMIN privilege(s) for this operation
+DROP USER foo, bar;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/slow_query_log_func_myisam.result mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/slow_query_log_func_myisam.result
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/slow_query_log_func_myisam.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/slow_query_log_func_myisam.result	2021-09-28 11:46:34.000000000 +0000
@@ -79,4 +79,5 @@
 SET sql_mode = default;
 SET @@global.log_output = @global_log_output;
 SET @global.slow_query_log = @global_slow_query_log;
+TRUNCATE TABLE mysql.general_log;
 TRUNCATE TABLE mysql.slow_log;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/slow_query_log_func.result mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/slow_query_log_func.result
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/slow_query_log_func.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/slow_query_log_func.result	2021-09-28 11:46:34.000000000 +0000
@@ -44,4 +44,5 @@
 SET sql_mode = default;
 SET @@global.log_output = @global_log_output;
 SET @global.slow_query_log = @global_slow_query_log;
+TRUNCATE TABLE mysql.general_log;
 TRUNCATE TABLE mysql.slow_log;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/sql_low_priority_updates_func.result mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/sql_low_priority_updates_func.result
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/sql_low_priority_updates_func.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/sql_low_priority_updates_func.result	2021-09-28 11:46:34.000000000 +0000
@@ -110,5 +110,20 @@
 Disconnecting Connections con0, con1
 drop view v1;
 DROP TABLE t1;
+CREATE USER foo, bar;
+GRANT SESSION_VARIABLES_ADMIN ON *.*  TO bar;
+SELECT @@session.low_priority_updates;
+@@session.low_priority_updates
+0
+SET @@session.low_priority_updates = TRUE;
+ERROR 42000: Access denied; you need (at least one of) the SYSTEM_VARIABLES_ADMIN or SESSION_VARIABLES_ADMIN privilege(s) for this operation
+SELECT @@session.low_priority_updates;
+@@session.low_priority_updates
+0
+SET @@session.low_priority_updates = TRUE;
+SELECT @@session.low_priority_updates;
+@@session.low_priority_updates
+1
+DROP USER foo, bar;
 SET @@GLOBAL.low_priority_updates = @global_low_priority_updates;
 SET @@SESSION.low_priority_updates = @session_low_priority_updates;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/sysvars_with_aliases_32bit_debug.result mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/sysvars_with_aliases_32bit_debug.result
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/sysvars_with_aliases_32bit_debug.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/sysvars_with_aliases_32bit_debug.result	2021-09-28 11:46:34.000000000 +0000
@@ -2499,14 +2499,14 @@
 - min=
 - max=
 - block_size=1
-- default=DATABASE
+- default=LOGICAL_CLOCK
 - values=["LOGICAL_CLOCK", "'DATABASE'", "'LOGICAL_CLOCK'", 0, 1]
 ==== Testing SET @@global.replica_parallel_type [allowed values, range, invalid values] ====
 # Initial value is default
-include/assert.inc [@@global.replica_parallel_type should be DATABASE]
-include/assert.inc [replica_parallel_type should be DATABASE in P_S.global_variables]
-include/assert.inc [@@global.slave_parallel_type should be DATABASE]
-include/assert.inc [slave_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [replica_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 # Valid values for variable
 SET @@global.replica_parallel_type=LOGICAL_CLOCK;
 include/assert.inc [@@global.replica_parallel_type should be LOGICAL_CLOCK]
@@ -2535,10 +2535,10 @@
 include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 # Setting default value for variable
 SET @@global.replica_parallel_type = DEFAULT;
-include/assert.inc [@@global.replica_parallel_type should be DATABASE]
-include/assert.inc [replica_parallel_type should be DATABASE in P_S.global_variables]
-include/assert.inc [@@global.slave_parallel_type should be DATABASE]
-include/assert.inc [slave_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [replica_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 # Invalid values
 SET @@global.replica_parallel_type = 1.5;
 Got one of the listed errors
@@ -2556,10 +2556,10 @@
 Got one of the listed errors
 # Restore default
 SET @@global.replica_parallel_type = DEFAULT;
-include/assert.inc [@@global.replica_parallel_type should be DATABASE]
-include/assert.inc [replica_parallel_type should be DATABASE in P_S.global_variables]
-include/assert.inc [@@global.slave_parallel_type should be DATABASE]
-include/assert.inc [slave_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [replica_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 ==== Testing SET @@session.replica_parallel_type [invalid scope] ====
 SET @@session.replica_parallel_type = DEFAULT;
 ERROR HY000: Variable 'replica_parallel_type' is a GLOBAL variable and should be set with SET GLOBAL
@@ -2589,14 +2589,14 @@
 ERROR HY000: Variable 'replica_parallel_type' is a GLOBAL variable
 SELECT @@replica_parallel_type;
 @@replica_parallel_type
-DATABASE
+LOGICAL_CLOCK
 include/assert.inc [Variable replica_parallel_type should exist in performance_schema.session_variables]
 ==== Testing SET @@global.slave_parallel_type [allowed values, range, invalid values] ====
 # Initial value is default
-include/assert.inc [@@global.slave_parallel_type should be DATABASE]
-include/assert.inc [slave_parallel_type should be DATABASE in P_S.global_variables]
-include/assert.inc [@@global.replica_parallel_type should be DATABASE]
-include/assert.inc [replica_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [replica_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 # Valid values for variable
 SET @@global.slave_parallel_type=LOGICAL_CLOCK;
 Warnings:
@@ -2637,10 +2637,10 @@
 SET @@global.slave_parallel_type = DEFAULT;
 Warnings:
 Warning	1287	'@@slave_parallel_type' is deprecated and will be removed in a future release. Please use replica_parallel_type instead.
-include/assert.inc [@@global.slave_parallel_type should be DATABASE]
-include/assert.inc [slave_parallel_type should be DATABASE in P_S.global_variables]
-include/assert.inc [@@global.replica_parallel_type should be DATABASE]
-include/assert.inc [replica_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [replica_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 # Invalid values
 SET @@global.slave_parallel_type = 1.5;
 Got one of the listed errors
@@ -2660,10 +2660,10 @@
 SET @@global.slave_parallel_type = DEFAULT;
 Warnings:
 Warning	1287	'@@slave_parallel_type' is deprecated and will be removed in a future release. Please use replica_parallel_type instead.
-include/assert.inc [@@global.slave_parallel_type should be DATABASE]
-include/assert.inc [slave_parallel_type should be DATABASE in P_S.global_variables]
-include/assert.inc [@@global.replica_parallel_type should be DATABASE]
-include/assert.inc [replica_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [replica_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 ==== Testing SET @@session.slave_parallel_type [invalid scope] ====
 SET @@session.slave_parallel_type = DEFAULT;
 ERROR HY000: Variable 'slave_parallel_type' is a GLOBAL variable and should be set with SET GLOBAL
@@ -2693,7 +2693,7 @@
 ERROR HY000: Variable 'slave_parallel_type' is a GLOBAL variable
 SELECT @@slave_parallel_type;
 @@slave_parallel_type
-DATABASE
+LOGICAL_CLOCK
 Warnings:
 Warning	1287	'@@slave_parallel_type' is deprecated and will be removed in a future release. Please use replica_parallel_type instead.
 include/assert.inc [Variable slave_parallel_type should exist in performance_schema.session_variables]
@@ -2710,14 +2710,14 @@
 - min=0
 - max=1024
 - block_size=1
-- default=0
+- default=4
 - values=[1, 2, 100]
 ==== Testing SET @@global.replica_parallel_workers [allowed values, range, invalid values] ====
 # Initial value is default
-include/assert.inc [@@global.replica_parallel_workers should be 0]
-include/assert.inc [replica_parallel_workers should be 0 in P_S.global_variables]
-include/assert.inc [@@global.slave_parallel_workers should be 0]
-include/assert.inc [slave_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_workers should be 4]
+include/assert.inc [replica_parallel_workers should be 4 in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_workers should be 4]
+include/assert.inc [slave_parallel_workers should be 4 in P_S.global_variables]
 # Valid values for variable
 SET @@global.replica_parallel_workers=1;
 include/assert.inc [@@global.replica_parallel_workers should be 1]
@@ -2736,10 +2736,10 @@
 include/assert.inc [slave_parallel_workers should be 100 in P_S.global_variables]
 # Setting default value for variable
 SET @@global.replica_parallel_workers = DEFAULT;
-include/assert.inc [@@global.replica_parallel_workers should be 0]
-include/assert.inc [replica_parallel_workers should be 0 in P_S.global_variables]
-include/assert.inc [@@global.slave_parallel_workers should be 0]
-include/assert.inc [slave_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_workers should be 4]
+include/assert.inc [replica_parallel_workers should be 4 in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_workers should be 4]
+include/assert.inc [slave_parallel_workers should be 4 in P_S.global_variables]
 # Minimum value
 SET @@global.replica_parallel_workers = 0;
 include/assert.inc [@@global.replica_parallel_workers should be 0]
@@ -2781,10 +2781,10 @@
 Got one of the listed errors
 # Restore default
 SET @@global.replica_parallel_workers = DEFAULT;
-include/assert.inc [@@global.replica_parallel_workers should be 0]
-include/assert.inc [replica_parallel_workers should be 0 in P_S.global_variables]
-include/assert.inc [@@global.slave_parallel_workers should be 0]
-include/assert.inc [slave_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_workers should be 4]
+include/assert.inc [replica_parallel_workers should be 4 in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_workers should be 4]
+include/assert.inc [slave_parallel_workers should be 4 in P_S.global_variables]
 ==== Testing SET @@session.replica_parallel_workers [invalid scope] ====
 SET @@session.replica_parallel_workers = DEFAULT;
 ERROR HY000: Variable 'replica_parallel_workers' is a GLOBAL variable and should be set with SET GLOBAL
@@ -2806,14 +2806,14 @@
 ERROR HY000: Variable 'replica_parallel_workers' is a GLOBAL variable
 SELECT @@replica_parallel_workers;
 @@replica_parallel_workers
-0
+4
 include/assert.inc [Variable replica_parallel_workers should exist in performance_schema.session_variables]
 ==== Testing SET @@global.slave_parallel_workers [allowed values, range, invalid values] ====
 # Initial value is default
-include/assert.inc [@@global.slave_parallel_workers should be 0]
-include/assert.inc [slave_parallel_workers should be 0 in P_S.global_variables]
-include/assert.inc [@@global.replica_parallel_workers should be 0]
-include/assert.inc [replica_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_workers should be 4]
+include/assert.inc [slave_parallel_workers should be 4 in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_workers should be 4]
+include/assert.inc [replica_parallel_workers should be 4 in P_S.global_variables]
 # Valid values for variable
 SET @@global.slave_parallel_workers=1;
 Warnings:
@@ -2840,10 +2840,10 @@
 SET @@global.slave_parallel_workers = DEFAULT;
 Warnings:
 Warning	1287	'@@slave_parallel_workers' is deprecated and will be removed in a future release. Please use replica_parallel_workers instead.
-include/assert.inc [@@global.slave_parallel_workers should be 0]
-include/assert.inc [slave_parallel_workers should be 0 in P_S.global_variables]
-include/assert.inc [@@global.replica_parallel_workers should be 0]
-include/assert.inc [replica_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_workers should be 4]
+include/assert.inc [slave_parallel_workers should be 4 in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_workers should be 4]
+include/assert.inc [replica_parallel_workers should be 4 in P_S.global_variables]
 # Minimum value
 SET @@global.slave_parallel_workers = 0;
 Warnings:
@@ -2893,10 +2893,10 @@
 SET @@global.slave_parallel_workers = DEFAULT;
 Warnings:
 Warning	1287	'@@slave_parallel_workers' is deprecated and will be removed in a future release. Please use replica_parallel_workers instead.
-include/assert.inc [@@global.slave_parallel_workers should be 0]
-include/assert.inc [slave_parallel_workers should be 0 in P_S.global_variables]
-include/assert.inc [@@global.replica_parallel_workers should be 0]
-include/assert.inc [replica_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_workers should be 4]
+include/assert.inc [slave_parallel_workers should be 4 in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_workers should be 4]
+include/assert.inc [replica_parallel_workers should be 4 in P_S.global_variables]
 ==== Testing SET @@session.slave_parallel_workers [invalid scope] ====
 SET @@session.slave_parallel_workers = DEFAULT;
 ERROR HY000: Variable 'slave_parallel_workers' is a GLOBAL variable and should be set with SET GLOBAL
@@ -2918,7 +2918,7 @@
 ERROR HY000: Variable 'slave_parallel_workers' is a GLOBAL variable
 SELECT @@slave_parallel_workers;
 @@slave_parallel_workers
-0
+4
 Warnings:
 Warning	1287	'@@slave_parallel_workers' is deprecated and will be removed in a future release. Please use replica_parallel_workers instead.
 include/assert.inc [Variable slave_parallel_workers should exist in performance_schema.session_variables]
@@ -3207,14 +3207,14 @@
 - min=
 - max=
 - block_size=1
-- default=0
+- default=1
 - values=["ON", "OFF", 1, 0, "TRUE", "FALSE", "'ON'", "'OFF'"]
 ==== Testing SET @@global.replica_preserve_commit_order [allowed values, range, invalid values] ====
 # Initial value is default
-include/assert.inc [@@global.replica_preserve_commit_order should be 0]
-include/assert.inc [replica_preserve_commit_order should be 0 in P_S.global_variables]
-include/assert.inc [@@global.slave_preserve_commit_order should be 0]
-include/assert.inc [slave_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_preserve_commit_order should be 1]
+include/assert.inc [replica_preserve_commit_order should be 1 in P_S.global_variables]
+include/assert.inc [@@global.slave_preserve_commit_order should be 1]
+include/assert.inc [slave_preserve_commit_order should be 1 in P_S.global_variables]
 # Valid values for variable
 SET @@global.replica_preserve_commit_order=ON;
 include/assert.inc [@@global.replica_preserve_commit_order should be 1]
@@ -3258,10 +3258,10 @@
 include/assert.inc [slave_preserve_commit_order should be 0 in P_S.global_variables]
 # Setting default value for variable
 SET @@global.replica_preserve_commit_order = DEFAULT;
-include/assert.inc [@@global.replica_preserve_commit_order should be 0]
-include/assert.inc [replica_preserve_commit_order should be 0 in P_S.global_variables]
-include/assert.inc [@@global.slave_preserve_commit_order should be 0]
-include/assert.inc [slave_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_preserve_commit_order should be 1]
+include/assert.inc [replica_preserve_commit_order should be 1 in P_S.global_variables]
+include/assert.inc [@@global.slave_preserve_commit_order should be 1]
+include/assert.inc [slave_preserve_commit_order should be 1 in P_S.global_variables]
 # Invalid values
 SET @@global.replica_preserve_commit_order = 0.1;
 Got one of the listed errors
@@ -3281,10 +3281,10 @@
 Got one of the listed errors
 # Restore default
 SET @@global.replica_preserve_commit_order = DEFAULT;
-include/assert.inc [@@global.replica_preserve_commit_order should be 0]
-include/assert.inc [replica_preserve_commit_order should be 0 in P_S.global_variables]
-include/assert.inc [@@global.slave_preserve_commit_order should be 0]
-include/assert.inc [slave_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_preserve_commit_order should be 1]
+include/assert.inc [replica_preserve_commit_order should be 1 in P_S.global_variables]
+include/assert.inc [@@global.slave_preserve_commit_order should be 1]
+include/assert.inc [slave_preserve_commit_order should be 1 in P_S.global_variables]
 ==== Testing SET @@session.replica_preserve_commit_order [invalid scope] ====
 SET @@session.replica_preserve_commit_order = DEFAULT;
 ERROR HY000: Variable 'replica_preserve_commit_order' is a GLOBAL variable and should be set with SET GLOBAL
@@ -3326,14 +3326,14 @@
 ERROR HY000: Variable 'replica_preserve_commit_order' is a GLOBAL variable
 SELECT @@replica_preserve_commit_order;
 @@replica_preserve_commit_order
-0
+1
 include/assert.inc [Variable replica_preserve_commit_order should exist in performance_schema.session_variables]
 ==== Testing SET @@global.slave_preserve_commit_order [allowed values, range, invalid values] ====
 # Initial value is default
-include/assert.inc [@@global.slave_preserve_commit_order should be 0]
-include/assert.inc [slave_preserve_commit_order should be 0 in P_S.global_variables]
-include/assert.inc [@@global.replica_preserve_commit_order should be 0]
-include/assert.inc [replica_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.slave_preserve_commit_order should be 1]
+include/assert.inc [slave_preserve_commit_order should be 1 in P_S.global_variables]
+include/assert.inc [@@global.replica_preserve_commit_order should be 1]
+include/assert.inc [replica_preserve_commit_order should be 1 in P_S.global_variables]
 # Valid values for variable
 SET @@global.slave_preserve_commit_order=ON;
 Warnings:
@@ -3395,10 +3395,10 @@
 SET @@global.slave_preserve_commit_order = DEFAULT;
 Warnings:
 Warning	1287	'@@slave_preserve_commit_order' is deprecated and will be removed in a future release. Please use replica_preserve_commit_order instead.
-include/assert.inc [@@global.slave_preserve_commit_order should be 0]
-include/assert.inc [slave_preserve_commit_order should be 0 in P_S.global_variables]
-include/assert.inc [@@global.replica_preserve_commit_order should be 0]
-include/assert.inc [replica_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.slave_preserve_commit_order should be 1]
+include/assert.inc [slave_preserve_commit_order should be 1 in P_S.global_variables]
+include/assert.inc [@@global.replica_preserve_commit_order should be 1]
+include/assert.inc [replica_preserve_commit_order should be 1 in P_S.global_variables]
 # Invalid values
 SET @@global.slave_preserve_commit_order = 0.1;
 Got one of the listed errors
@@ -3420,10 +3420,10 @@
 SET @@global.slave_preserve_commit_order = DEFAULT;
 Warnings:
 Warning	1287	'@@slave_preserve_commit_order' is deprecated and will be removed in a future release. Please use replica_preserve_commit_order instead.
-include/assert.inc [@@global.slave_preserve_commit_order should be 0]
-include/assert.inc [slave_preserve_commit_order should be 0 in P_S.global_variables]
-include/assert.inc [@@global.replica_preserve_commit_order should be 0]
-include/assert.inc [replica_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.slave_preserve_commit_order should be 1]
+include/assert.inc [slave_preserve_commit_order should be 1 in P_S.global_variables]
+include/assert.inc [@@global.replica_preserve_commit_order should be 1]
+include/assert.inc [replica_preserve_commit_order should be 1 in P_S.global_variables]
 ==== Testing SET @@session.slave_preserve_commit_order [invalid scope] ====
 SET @@session.slave_preserve_commit_order = DEFAULT;
 ERROR HY000: Variable 'slave_preserve_commit_order' is a GLOBAL variable and should be set with SET GLOBAL
@@ -3465,7 +3465,7 @@
 ERROR HY000: Variable 'slave_preserve_commit_order' is a GLOBAL variable
 SELECT @@slave_preserve_commit_order;
 @@slave_preserve_commit_order
-0
+1
 Warnings:
 Warning	1287	'@@slave_preserve_commit_order' is deprecated and will be removed in a future release. Please use replica_preserve_commit_order instead.
 include/assert.inc [Variable slave_preserve_commit_order should exist in performance_schema.session_variables]
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/sysvars_with_aliases_32bit_nodebug.result mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/sysvars_with_aliases_32bit_nodebug.result
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/sysvars_with_aliases_32bit_nodebug.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/sysvars_with_aliases_32bit_nodebug.result	2021-09-28 11:46:34.000000000 +0000
@@ -2546,14 +2546,14 @@
 - min=
 - max=
 - block_size=1
-- default=DATABASE
+- default=LOGICAL_CLOCK
 - values=["LOGICAL_CLOCK", "'DATABASE'", "'LOGICAL_CLOCK'", 0, 1]
 ==== Testing SET @@global.replica_parallel_type [allowed values, range, invalid values] ====
 # Initial value is default
-include/assert.inc [@@global.replica_parallel_type should be DATABASE]
-include/assert.inc [replica_parallel_type should be DATABASE in P_S.global_variables]
-include/assert.inc [@@global.slave_parallel_type should be DATABASE]
-include/assert.inc [slave_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [replica_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 # Valid values for variable
 SET @@global.replica_parallel_type=LOGICAL_CLOCK;
 include/assert.inc [@@global.replica_parallel_type should be LOGICAL_CLOCK]
@@ -2582,10 +2582,10 @@
 include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 # Setting default value for variable
 SET @@global.replica_parallel_type = DEFAULT;
-include/assert.inc [@@global.replica_parallel_type should be DATABASE]
-include/assert.inc [replica_parallel_type should be DATABASE in P_S.global_variables]
-include/assert.inc [@@global.slave_parallel_type should be DATABASE]
-include/assert.inc [slave_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [replica_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 # Invalid values
 SET @@global.replica_parallel_type = 1.5;
 Got one of the listed errors
@@ -2603,10 +2603,10 @@
 Got one of the listed errors
 # Restore default
 SET @@global.replica_parallel_type = DEFAULT;
-include/assert.inc [@@global.replica_parallel_type should be DATABASE]
-include/assert.inc [replica_parallel_type should be DATABASE in P_S.global_variables]
-include/assert.inc [@@global.slave_parallel_type should be DATABASE]
-include/assert.inc [slave_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [replica_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 ==== Testing SET @@session.replica_parallel_type [invalid scope] ====
 SET @@session.replica_parallel_type = DEFAULT;
 ERROR HY000: Variable 'replica_parallel_type' is a GLOBAL variable and should be set with SET GLOBAL
@@ -2636,14 +2636,14 @@
 ERROR HY000: Variable 'replica_parallel_type' is a GLOBAL variable
 SELECT @@replica_parallel_type;
 @@replica_parallel_type
-DATABASE
+LOGICAL_CLOCK
 include/assert.inc [Variable replica_parallel_type should exist in performance_schema.session_variables]
 ==== Testing SET @@global.slave_parallel_type [allowed values, range, invalid values] ====
 # Initial value is default
-include/assert.inc [@@global.slave_parallel_type should be DATABASE]
-include/assert.inc [slave_parallel_type should be DATABASE in P_S.global_variables]
-include/assert.inc [@@global.replica_parallel_type should be DATABASE]
-include/assert.inc [replica_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [replica_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 # Valid values for variable
 SET @@global.slave_parallel_type=LOGICAL_CLOCK;
 Warnings:
@@ -2684,10 +2684,10 @@
 SET @@global.slave_parallel_type = DEFAULT;
 Warnings:
 Warning	1287	'@@slave_parallel_type' is deprecated and will be removed in a future release. Please use replica_parallel_type instead.
-include/assert.inc [@@global.slave_parallel_type should be DATABASE]
-include/assert.inc [slave_parallel_type should be DATABASE in P_S.global_variables]
-include/assert.inc [@@global.replica_parallel_type should be DATABASE]
-include/assert.inc [replica_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [replica_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 # Invalid values
 SET @@global.slave_parallel_type = 1.5;
 Got one of the listed errors
@@ -2707,10 +2707,10 @@
 SET @@global.slave_parallel_type = DEFAULT;
 Warnings:
 Warning	1287	'@@slave_parallel_type' is deprecated and will be removed in a future release. Please use replica_parallel_type instead.
-include/assert.inc [@@global.slave_parallel_type should be DATABASE]
-include/assert.inc [slave_parallel_type should be DATABASE in P_S.global_variables]
-include/assert.inc [@@global.replica_parallel_type should be DATABASE]
-include/assert.inc [replica_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [replica_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 ==== Testing SET @@session.slave_parallel_type [invalid scope] ====
 SET @@session.slave_parallel_type = DEFAULT;
 ERROR HY000: Variable 'slave_parallel_type' is a GLOBAL variable and should be set with SET GLOBAL
@@ -2740,7 +2740,7 @@
 ERROR HY000: Variable 'slave_parallel_type' is a GLOBAL variable
 SELECT @@slave_parallel_type;
 @@slave_parallel_type
-DATABASE
+LOGICAL_CLOCK
 Warnings:
 Warning	1287	'@@slave_parallel_type' is deprecated and will be removed in a future release. Please use replica_parallel_type instead.
 include/assert.inc [Variable slave_parallel_type should exist in performance_schema.session_variables]
@@ -2757,14 +2757,14 @@
 - min=0
 - max=1024
 - block_size=1
-- default=0
+- default=4
 - values=[1, 2, 100]
 ==== Testing SET @@global.replica_parallel_workers [allowed values, range, invalid values] ====
 # Initial value is default
-include/assert.inc [@@global.replica_parallel_workers should be 0]
-include/assert.inc [replica_parallel_workers should be 0 in P_S.global_variables]
-include/assert.inc [@@global.slave_parallel_workers should be 0]
-include/assert.inc [slave_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_workers should be 4]
+include/assert.inc [replica_parallel_workers should be 4 in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_workers should be 4]
+include/assert.inc [slave_parallel_workers should be 4 in P_S.global_variables]
 # Valid values for variable
 SET @@global.replica_parallel_workers=1;
 include/assert.inc [@@global.replica_parallel_workers should be 1]
@@ -2783,10 +2783,10 @@
 include/assert.inc [slave_parallel_workers should be 100 in P_S.global_variables]
 # Setting default value for variable
 SET @@global.replica_parallel_workers = DEFAULT;
-include/assert.inc [@@global.replica_parallel_workers should be 0]
-include/assert.inc [replica_parallel_workers should be 0 in P_S.global_variables]
-include/assert.inc [@@global.slave_parallel_workers should be 0]
-include/assert.inc [slave_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_workers should be 4]
+include/assert.inc [replica_parallel_workers should be 4 in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_workers should be 4]
+include/assert.inc [slave_parallel_workers should be 4 in P_S.global_variables]
 # Minimum value
 SET @@global.replica_parallel_workers = 0;
 include/assert.inc [@@global.replica_parallel_workers should be 0]
@@ -2828,10 +2828,10 @@
 Got one of the listed errors
 # Restore default
 SET @@global.replica_parallel_workers = DEFAULT;
-include/assert.inc [@@global.replica_parallel_workers should be 0]
-include/assert.inc [replica_parallel_workers should be 0 in P_S.global_variables]
-include/assert.inc [@@global.slave_parallel_workers should be 0]
-include/assert.inc [slave_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_workers should be 4]
+include/assert.inc [replica_parallel_workers should be 4 in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_workers should be 4]
+include/assert.inc [slave_parallel_workers should be 4 in P_S.global_variables]
 ==== Testing SET @@session.replica_parallel_workers [invalid scope] ====
 SET @@session.replica_parallel_workers = DEFAULT;
 ERROR HY000: Variable 'replica_parallel_workers' is a GLOBAL variable and should be set with SET GLOBAL
@@ -2853,14 +2853,14 @@
 ERROR HY000: Variable 'replica_parallel_workers' is a GLOBAL variable
 SELECT @@replica_parallel_workers;
 @@replica_parallel_workers
-0
+4
 include/assert.inc [Variable replica_parallel_workers should exist in performance_schema.session_variables]
 ==== Testing SET @@global.slave_parallel_workers [allowed values, range, invalid values] ====
 # Initial value is default
-include/assert.inc [@@global.slave_parallel_workers should be 0]
-include/assert.inc [slave_parallel_workers should be 0 in P_S.global_variables]
-include/assert.inc [@@global.replica_parallel_workers should be 0]
-include/assert.inc [replica_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_workers should be 4]
+include/assert.inc [slave_parallel_workers should be 4 in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_workers should be 4]
+include/assert.inc [replica_parallel_workers should be 4 in P_S.global_variables]
 # Valid values for variable
 SET @@global.slave_parallel_workers=1;
 Warnings:
@@ -2887,10 +2887,10 @@
 SET @@global.slave_parallel_workers = DEFAULT;
 Warnings:
 Warning	1287	'@@slave_parallel_workers' is deprecated and will be removed in a future release. Please use replica_parallel_workers instead.
-include/assert.inc [@@global.slave_parallel_workers should be 0]
-include/assert.inc [slave_parallel_workers should be 0 in P_S.global_variables]
-include/assert.inc [@@global.replica_parallel_workers should be 0]
-include/assert.inc [replica_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_workers should be 4]
+include/assert.inc [slave_parallel_workers should be 4 in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_workers should be 4]
+include/assert.inc [replica_parallel_workers should be 4 in P_S.global_variables]
 # Minimum value
 SET @@global.slave_parallel_workers = 0;
 Warnings:
@@ -2940,10 +2940,10 @@
 SET @@global.slave_parallel_workers = DEFAULT;
 Warnings:
 Warning	1287	'@@slave_parallel_workers' is deprecated and will be removed in a future release. Please use replica_parallel_workers instead.
-include/assert.inc [@@global.slave_parallel_workers should be 0]
-include/assert.inc [slave_parallel_workers should be 0 in P_S.global_variables]
-include/assert.inc [@@global.replica_parallel_workers should be 0]
-include/assert.inc [replica_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_workers should be 4]
+include/assert.inc [slave_parallel_workers should be 4 in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_workers should be 4]
+include/assert.inc [replica_parallel_workers should be 4 in P_S.global_variables]
 ==== Testing SET @@session.slave_parallel_workers [invalid scope] ====
 SET @@session.slave_parallel_workers = DEFAULT;
 ERROR HY000: Variable 'slave_parallel_workers' is a GLOBAL variable and should be set with SET GLOBAL
@@ -2965,7 +2965,7 @@
 ERROR HY000: Variable 'slave_parallel_workers' is a GLOBAL variable
 SELECT @@slave_parallel_workers;
 @@slave_parallel_workers
-0
+4
 Warnings:
 Warning	1287	'@@slave_parallel_workers' is deprecated and will be removed in a future release. Please use replica_parallel_workers instead.
 include/assert.inc [Variable slave_parallel_workers should exist in performance_schema.session_variables]
@@ -3254,14 +3254,14 @@
 - min=
 - max=
 - block_size=1
-- default=0
+- default=1
 - values=["ON", "OFF", 1, 0, "TRUE", "FALSE", "'ON'", "'OFF'"]
 ==== Testing SET @@global.replica_preserve_commit_order [allowed values, range, invalid values] ====
 # Initial value is default
-include/assert.inc [@@global.replica_preserve_commit_order should be 0]
-include/assert.inc [replica_preserve_commit_order should be 0 in P_S.global_variables]
-include/assert.inc [@@global.slave_preserve_commit_order should be 0]
-include/assert.inc [slave_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_preserve_commit_order should be 1]
+include/assert.inc [replica_preserve_commit_order should be 1 in P_S.global_variables]
+include/assert.inc [@@global.slave_preserve_commit_order should be 1]
+include/assert.inc [slave_preserve_commit_order should be 1 in P_S.global_variables]
 # Valid values for variable
 SET @@global.replica_preserve_commit_order=ON;
 include/assert.inc [@@global.replica_preserve_commit_order should be 1]
@@ -3305,10 +3305,10 @@
 include/assert.inc [slave_preserve_commit_order should be 0 in P_S.global_variables]
 # Setting default value for variable
 SET @@global.replica_preserve_commit_order = DEFAULT;
-include/assert.inc [@@global.replica_preserve_commit_order should be 0]
-include/assert.inc [replica_preserve_commit_order should be 0 in P_S.global_variables]
-include/assert.inc [@@global.slave_preserve_commit_order should be 0]
-include/assert.inc [slave_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_preserve_commit_order should be 1]
+include/assert.inc [replica_preserve_commit_order should be 1 in P_S.global_variables]
+include/assert.inc [@@global.slave_preserve_commit_order should be 1]
+include/assert.inc [slave_preserve_commit_order should be 1 in P_S.global_variables]
 # Invalid values
 SET @@global.replica_preserve_commit_order = 0.1;
 Got one of the listed errors
@@ -3328,10 +3328,10 @@
 Got one of the listed errors
 # Restore default
 SET @@global.replica_preserve_commit_order = DEFAULT;
-include/assert.inc [@@global.replica_preserve_commit_order should be 0]
-include/assert.inc [replica_preserve_commit_order should be 0 in P_S.global_variables]
-include/assert.inc [@@global.slave_preserve_commit_order should be 0]
-include/assert.inc [slave_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_preserve_commit_order should be 1]
+include/assert.inc [replica_preserve_commit_order should be 1 in P_S.global_variables]
+include/assert.inc [@@global.slave_preserve_commit_order should be 1]
+include/assert.inc [slave_preserve_commit_order should be 1 in P_S.global_variables]
 ==== Testing SET @@session.replica_preserve_commit_order [invalid scope] ====
 SET @@session.replica_preserve_commit_order = DEFAULT;
 ERROR HY000: Variable 'replica_preserve_commit_order' is a GLOBAL variable and should be set with SET GLOBAL
@@ -3373,14 +3373,14 @@
 ERROR HY000: Variable 'replica_preserve_commit_order' is a GLOBAL variable
 SELECT @@replica_preserve_commit_order;
 @@replica_preserve_commit_order
-0
+1
 include/assert.inc [Variable replica_preserve_commit_order should exist in performance_schema.session_variables]
 ==== Testing SET @@global.slave_preserve_commit_order [allowed values, range, invalid values] ====
 # Initial value is default
-include/assert.inc [@@global.slave_preserve_commit_order should be 0]
-include/assert.inc [slave_preserve_commit_order should be 0 in P_S.global_variables]
-include/assert.inc [@@global.replica_preserve_commit_order should be 0]
-include/assert.inc [replica_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.slave_preserve_commit_order should be 1]
+include/assert.inc [slave_preserve_commit_order should be 1 in P_S.global_variables]
+include/assert.inc [@@global.replica_preserve_commit_order should be 1]
+include/assert.inc [replica_preserve_commit_order should be 1 in P_S.global_variables]
 # Valid values for variable
 SET @@global.slave_preserve_commit_order=ON;
 Warnings:
@@ -3442,10 +3442,10 @@
 SET @@global.slave_preserve_commit_order = DEFAULT;
 Warnings:
 Warning	1287	'@@slave_preserve_commit_order' is deprecated and will be removed in a future release. Please use replica_preserve_commit_order instead.
-include/assert.inc [@@global.slave_preserve_commit_order should be 0]
-include/assert.inc [slave_preserve_commit_order should be 0 in P_S.global_variables]
-include/assert.inc [@@global.replica_preserve_commit_order should be 0]
-include/assert.inc [replica_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.slave_preserve_commit_order should be 1]
+include/assert.inc [slave_preserve_commit_order should be 1 in P_S.global_variables]
+include/assert.inc [@@global.replica_preserve_commit_order should be 1]
+include/assert.inc [replica_preserve_commit_order should be 1 in P_S.global_variables]
 # Invalid values
 SET @@global.slave_preserve_commit_order = 0.1;
 Got one of the listed errors
@@ -3467,10 +3467,10 @@
 SET @@global.slave_preserve_commit_order = DEFAULT;
 Warnings:
 Warning	1287	'@@slave_preserve_commit_order' is deprecated and will be removed in a future release. Please use replica_preserve_commit_order instead.
-include/assert.inc [@@global.slave_preserve_commit_order should be 0]
-include/assert.inc [slave_preserve_commit_order should be 0 in P_S.global_variables]
-include/assert.inc [@@global.replica_preserve_commit_order should be 0]
-include/assert.inc [replica_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.slave_preserve_commit_order should be 1]
+include/assert.inc [slave_preserve_commit_order should be 1 in P_S.global_variables]
+include/assert.inc [@@global.replica_preserve_commit_order should be 1]
+include/assert.inc [replica_preserve_commit_order should be 1 in P_S.global_variables]
 ==== Testing SET @@session.slave_preserve_commit_order [invalid scope] ====
 SET @@session.slave_preserve_commit_order = DEFAULT;
 ERROR HY000: Variable 'slave_preserve_commit_order' is a GLOBAL variable and should be set with SET GLOBAL
@@ -3512,7 +3512,7 @@
 ERROR HY000: Variable 'slave_preserve_commit_order' is a GLOBAL variable
 SELECT @@slave_preserve_commit_order;
 @@slave_preserve_commit_order
-0
+1
 Warnings:
 Warning	1287	'@@slave_preserve_commit_order' is deprecated and will be removed in a future release. Please use replica_preserve_commit_order instead.
 include/assert.inc [Variable slave_preserve_commit_order should exist in performance_schema.session_variables]
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/sysvars_with_aliases_64bit_debug.result mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/sysvars_with_aliases_64bit_debug.result
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/sysvars_with_aliases_64bit_debug.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/sysvars_with_aliases_64bit_debug.result	2021-09-28 11:46:34.000000000 +0000
@@ -2499,14 +2499,14 @@
 - min=
 - max=
 - block_size=1
-- default=DATABASE
+- default=LOGICAL_CLOCK
 - values=["LOGICAL_CLOCK", "'DATABASE'", "'LOGICAL_CLOCK'", 0, 1]
 ==== Testing SET @@global.replica_parallel_type [allowed values, range, invalid values] ====
 # Initial value is default
-include/assert.inc [@@global.replica_parallel_type should be DATABASE]
-include/assert.inc [replica_parallel_type should be DATABASE in P_S.global_variables]
-include/assert.inc [@@global.slave_parallel_type should be DATABASE]
-include/assert.inc [slave_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [replica_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 # Valid values for variable
 SET @@global.replica_parallel_type=LOGICAL_CLOCK;
 include/assert.inc [@@global.replica_parallel_type should be LOGICAL_CLOCK]
@@ -2535,10 +2535,10 @@
 include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 # Setting default value for variable
 SET @@global.replica_parallel_type = DEFAULT;
-include/assert.inc [@@global.replica_parallel_type should be DATABASE]
-include/assert.inc [replica_parallel_type should be DATABASE in P_S.global_variables]
-include/assert.inc [@@global.slave_parallel_type should be DATABASE]
-include/assert.inc [slave_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [replica_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 # Invalid values
 SET @@global.replica_parallel_type = 1.5;
 Got one of the listed errors
@@ -2556,10 +2556,10 @@
 Got one of the listed errors
 # Restore default
 SET @@global.replica_parallel_type = DEFAULT;
-include/assert.inc [@@global.replica_parallel_type should be DATABASE]
-include/assert.inc [replica_parallel_type should be DATABASE in P_S.global_variables]
-include/assert.inc [@@global.slave_parallel_type should be DATABASE]
-include/assert.inc [slave_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [replica_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 ==== Testing SET @@session.replica_parallel_type [invalid scope] ====
 SET @@session.replica_parallel_type = DEFAULT;
 ERROR HY000: Variable 'replica_parallel_type' is a GLOBAL variable and should be set with SET GLOBAL
@@ -2589,14 +2589,14 @@
 ERROR HY000: Variable 'replica_parallel_type' is a GLOBAL variable
 SELECT @@replica_parallel_type;
 @@replica_parallel_type
-DATABASE
+LOGICAL_CLOCK
 include/assert.inc [Variable replica_parallel_type should exist in performance_schema.session_variables]
 ==== Testing SET @@global.slave_parallel_type [allowed values, range, invalid values] ====
 # Initial value is default
-include/assert.inc [@@global.slave_parallel_type should be DATABASE]
-include/assert.inc [slave_parallel_type should be DATABASE in P_S.global_variables]
-include/assert.inc [@@global.replica_parallel_type should be DATABASE]
-include/assert.inc [replica_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [replica_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 # Valid values for variable
 SET @@global.slave_parallel_type=LOGICAL_CLOCK;
 Warnings:
@@ -2637,10 +2637,10 @@
 SET @@global.slave_parallel_type = DEFAULT;
 Warnings:
 Warning	1287	'@@slave_parallel_type' is deprecated and will be removed in a future release. Please use replica_parallel_type instead.
-include/assert.inc [@@global.slave_parallel_type should be DATABASE]
-include/assert.inc [slave_parallel_type should be DATABASE in P_S.global_variables]
-include/assert.inc [@@global.replica_parallel_type should be DATABASE]
-include/assert.inc [replica_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [replica_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 # Invalid values
 SET @@global.slave_parallel_type = 1.5;
 Got one of the listed errors
@@ -2660,10 +2660,10 @@
 SET @@global.slave_parallel_type = DEFAULT;
 Warnings:
 Warning	1287	'@@slave_parallel_type' is deprecated and will be removed in a future release. Please use replica_parallel_type instead.
-include/assert.inc [@@global.slave_parallel_type should be DATABASE]
-include/assert.inc [slave_parallel_type should be DATABASE in P_S.global_variables]
-include/assert.inc [@@global.replica_parallel_type should be DATABASE]
-include/assert.inc [replica_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [replica_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 ==== Testing SET @@session.slave_parallel_type [invalid scope] ====
 SET @@session.slave_parallel_type = DEFAULT;
 ERROR HY000: Variable 'slave_parallel_type' is a GLOBAL variable and should be set with SET GLOBAL
@@ -2693,7 +2693,7 @@
 ERROR HY000: Variable 'slave_parallel_type' is a GLOBAL variable
 SELECT @@slave_parallel_type;
 @@slave_parallel_type
-DATABASE
+LOGICAL_CLOCK
 Warnings:
 Warning	1287	'@@slave_parallel_type' is deprecated and will be removed in a future release. Please use replica_parallel_type instead.
 include/assert.inc [Variable slave_parallel_type should exist in performance_schema.session_variables]
@@ -2710,14 +2710,14 @@
 - min=0
 - max=1024
 - block_size=1
-- default=0
+- default=4
 - values=[1, 2, 100]
 ==== Testing SET @@global.replica_parallel_workers [allowed values, range, invalid values] ====
 # Initial value is default
-include/assert.inc [@@global.replica_parallel_workers should be 0]
-include/assert.inc [replica_parallel_workers should be 0 in P_S.global_variables]
-include/assert.inc [@@global.slave_parallel_workers should be 0]
-include/assert.inc [slave_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_workers should be 4]
+include/assert.inc [replica_parallel_workers should be 4 in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_workers should be 4]
+include/assert.inc [slave_parallel_workers should be 4 in P_S.global_variables]
 # Valid values for variable
 SET @@global.replica_parallel_workers=1;
 include/assert.inc [@@global.replica_parallel_workers should be 1]
@@ -2736,10 +2736,10 @@
 include/assert.inc [slave_parallel_workers should be 100 in P_S.global_variables]
 # Setting default value for variable
 SET @@global.replica_parallel_workers = DEFAULT;
-include/assert.inc [@@global.replica_parallel_workers should be 0]
-include/assert.inc [replica_parallel_workers should be 0 in P_S.global_variables]
-include/assert.inc [@@global.slave_parallel_workers should be 0]
-include/assert.inc [slave_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_workers should be 4]
+include/assert.inc [replica_parallel_workers should be 4 in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_workers should be 4]
+include/assert.inc [slave_parallel_workers should be 4 in P_S.global_variables]
 # Minimum value
 SET @@global.replica_parallel_workers = 0;
 include/assert.inc [@@global.replica_parallel_workers should be 0]
@@ -2781,10 +2781,10 @@
 Got one of the listed errors
 # Restore default
 SET @@global.replica_parallel_workers = DEFAULT;
-include/assert.inc [@@global.replica_parallel_workers should be 0]
-include/assert.inc [replica_parallel_workers should be 0 in P_S.global_variables]
-include/assert.inc [@@global.slave_parallel_workers should be 0]
-include/assert.inc [slave_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_workers should be 4]
+include/assert.inc [replica_parallel_workers should be 4 in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_workers should be 4]
+include/assert.inc [slave_parallel_workers should be 4 in P_S.global_variables]
 ==== Testing SET @@session.replica_parallel_workers [invalid scope] ====
 SET @@session.replica_parallel_workers = DEFAULT;
 ERROR HY000: Variable 'replica_parallel_workers' is a GLOBAL variable and should be set with SET GLOBAL
@@ -2806,14 +2806,14 @@
 ERROR HY000: Variable 'replica_parallel_workers' is a GLOBAL variable
 SELECT @@replica_parallel_workers;
 @@replica_parallel_workers
-0
+4
 include/assert.inc [Variable replica_parallel_workers should exist in performance_schema.session_variables]
 ==== Testing SET @@global.slave_parallel_workers [allowed values, range, invalid values] ====
 # Initial value is default
-include/assert.inc [@@global.slave_parallel_workers should be 0]
-include/assert.inc [slave_parallel_workers should be 0 in P_S.global_variables]
-include/assert.inc [@@global.replica_parallel_workers should be 0]
-include/assert.inc [replica_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_workers should be 4]
+include/assert.inc [slave_parallel_workers should be 4 in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_workers should be 4]
+include/assert.inc [replica_parallel_workers should be 4 in P_S.global_variables]
 # Valid values for variable
 SET @@global.slave_parallel_workers=1;
 Warnings:
@@ -2840,10 +2840,10 @@
 SET @@global.slave_parallel_workers = DEFAULT;
 Warnings:
 Warning	1287	'@@slave_parallel_workers' is deprecated and will be removed in a future release. Please use replica_parallel_workers instead.
-include/assert.inc [@@global.slave_parallel_workers should be 0]
-include/assert.inc [slave_parallel_workers should be 0 in P_S.global_variables]
-include/assert.inc [@@global.replica_parallel_workers should be 0]
-include/assert.inc [replica_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_workers should be 4]
+include/assert.inc [slave_parallel_workers should be 4 in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_workers should be 4]
+include/assert.inc [replica_parallel_workers should be 4 in P_S.global_variables]
 # Minimum value
 SET @@global.slave_parallel_workers = 0;
 Warnings:
@@ -2893,10 +2893,10 @@
 SET @@global.slave_parallel_workers = DEFAULT;
 Warnings:
 Warning	1287	'@@slave_parallel_workers' is deprecated and will be removed in a future release. Please use replica_parallel_workers instead.
-include/assert.inc [@@global.slave_parallel_workers should be 0]
-include/assert.inc [slave_parallel_workers should be 0 in P_S.global_variables]
-include/assert.inc [@@global.replica_parallel_workers should be 0]
-include/assert.inc [replica_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_workers should be 4]
+include/assert.inc [slave_parallel_workers should be 4 in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_workers should be 4]
+include/assert.inc [replica_parallel_workers should be 4 in P_S.global_variables]
 ==== Testing SET @@session.slave_parallel_workers [invalid scope] ====
 SET @@session.slave_parallel_workers = DEFAULT;
 ERROR HY000: Variable 'slave_parallel_workers' is a GLOBAL variable and should be set with SET GLOBAL
@@ -2918,7 +2918,7 @@
 ERROR HY000: Variable 'slave_parallel_workers' is a GLOBAL variable
 SELECT @@slave_parallel_workers;
 @@slave_parallel_workers
-0
+4
 Warnings:
 Warning	1287	'@@slave_parallel_workers' is deprecated and will be removed in a future release. Please use replica_parallel_workers instead.
 include/assert.inc [Variable slave_parallel_workers should exist in performance_schema.session_variables]
@@ -3207,14 +3207,14 @@
 - min=
 - max=
 - block_size=1
-- default=0
+- default=1
 - values=["ON", "OFF", 1, 0, "TRUE", "FALSE", "'ON'", "'OFF'"]
 ==== Testing SET @@global.replica_preserve_commit_order [allowed values, range, invalid values] ====
 # Initial value is default
-include/assert.inc [@@global.replica_preserve_commit_order should be 0]
-include/assert.inc [replica_preserve_commit_order should be 0 in P_S.global_variables]
-include/assert.inc [@@global.slave_preserve_commit_order should be 0]
-include/assert.inc [slave_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_preserve_commit_order should be 1]
+include/assert.inc [replica_preserve_commit_order should be 1 in P_S.global_variables]
+include/assert.inc [@@global.slave_preserve_commit_order should be 1]
+include/assert.inc [slave_preserve_commit_order should be 1 in P_S.global_variables]
 # Valid values for variable
 SET @@global.replica_preserve_commit_order=ON;
 include/assert.inc [@@global.replica_preserve_commit_order should be 1]
@@ -3258,10 +3258,10 @@
 include/assert.inc [slave_preserve_commit_order should be 0 in P_S.global_variables]
 # Setting default value for variable
 SET @@global.replica_preserve_commit_order = DEFAULT;
-include/assert.inc [@@global.replica_preserve_commit_order should be 0]
-include/assert.inc [replica_preserve_commit_order should be 0 in P_S.global_variables]
-include/assert.inc [@@global.slave_preserve_commit_order should be 0]
-include/assert.inc [slave_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_preserve_commit_order should be 1]
+include/assert.inc [replica_preserve_commit_order should be 1 in P_S.global_variables]
+include/assert.inc [@@global.slave_preserve_commit_order should be 1]
+include/assert.inc [slave_preserve_commit_order should be 1 in P_S.global_variables]
 # Invalid values
 SET @@global.replica_preserve_commit_order = 0.1;
 Got one of the listed errors
@@ -3281,10 +3281,10 @@
 Got one of the listed errors
 # Restore default
 SET @@global.replica_preserve_commit_order = DEFAULT;
-include/assert.inc [@@global.replica_preserve_commit_order should be 0]
-include/assert.inc [replica_preserve_commit_order should be 0 in P_S.global_variables]
-include/assert.inc [@@global.slave_preserve_commit_order should be 0]
-include/assert.inc [slave_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_preserve_commit_order should be 1]
+include/assert.inc [replica_preserve_commit_order should be 1 in P_S.global_variables]
+include/assert.inc [@@global.slave_preserve_commit_order should be 1]
+include/assert.inc [slave_preserve_commit_order should be 1 in P_S.global_variables]
 ==== Testing SET @@session.replica_preserve_commit_order [invalid scope] ====
 SET @@session.replica_preserve_commit_order = DEFAULT;
 ERROR HY000: Variable 'replica_preserve_commit_order' is a GLOBAL variable and should be set with SET GLOBAL
@@ -3326,14 +3326,14 @@
 ERROR HY000: Variable 'replica_preserve_commit_order' is a GLOBAL variable
 SELECT @@replica_preserve_commit_order;
 @@replica_preserve_commit_order
-0
+1
 include/assert.inc [Variable replica_preserve_commit_order should exist in performance_schema.session_variables]
 ==== Testing SET @@global.slave_preserve_commit_order [allowed values, range, invalid values] ====
 # Initial value is default
-include/assert.inc [@@global.slave_preserve_commit_order should be 0]
-include/assert.inc [slave_preserve_commit_order should be 0 in P_S.global_variables]
-include/assert.inc [@@global.replica_preserve_commit_order should be 0]
-include/assert.inc [replica_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.slave_preserve_commit_order should be 1]
+include/assert.inc [slave_preserve_commit_order should be 1 in P_S.global_variables]
+include/assert.inc [@@global.replica_preserve_commit_order should be 1]
+include/assert.inc [replica_preserve_commit_order should be 1 in P_S.global_variables]
 # Valid values for variable
 SET @@global.slave_preserve_commit_order=ON;
 Warnings:
@@ -3395,10 +3395,10 @@
 SET @@global.slave_preserve_commit_order = DEFAULT;
 Warnings:
 Warning	1287	'@@slave_preserve_commit_order' is deprecated and will be removed in a future release. Please use replica_preserve_commit_order instead.
-include/assert.inc [@@global.slave_preserve_commit_order should be 0]
-include/assert.inc [slave_preserve_commit_order should be 0 in P_S.global_variables]
-include/assert.inc [@@global.replica_preserve_commit_order should be 0]
-include/assert.inc [replica_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.slave_preserve_commit_order should be 1]
+include/assert.inc [slave_preserve_commit_order should be 1 in P_S.global_variables]
+include/assert.inc [@@global.replica_preserve_commit_order should be 1]
+include/assert.inc [replica_preserve_commit_order should be 1 in P_S.global_variables]
 # Invalid values
 SET @@global.slave_preserve_commit_order = 0.1;
 Got one of the listed errors
@@ -3420,10 +3420,10 @@
 SET @@global.slave_preserve_commit_order = DEFAULT;
 Warnings:
 Warning	1287	'@@slave_preserve_commit_order' is deprecated and will be removed in a future release. Please use replica_preserve_commit_order instead.
-include/assert.inc [@@global.slave_preserve_commit_order should be 0]
-include/assert.inc [slave_preserve_commit_order should be 0 in P_S.global_variables]
-include/assert.inc [@@global.replica_preserve_commit_order should be 0]
-include/assert.inc [replica_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.slave_preserve_commit_order should be 1]
+include/assert.inc [slave_preserve_commit_order should be 1 in P_S.global_variables]
+include/assert.inc [@@global.replica_preserve_commit_order should be 1]
+include/assert.inc [replica_preserve_commit_order should be 1 in P_S.global_variables]
 ==== Testing SET @@session.slave_preserve_commit_order [invalid scope] ====
 SET @@session.slave_preserve_commit_order = DEFAULT;
 ERROR HY000: Variable 'slave_preserve_commit_order' is a GLOBAL variable and should be set with SET GLOBAL
@@ -3465,7 +3465,7 @@
 ERROR HY000: Variable 'slave_preserve_commit_order' is a GLOBAL variable
 SELECT @@slave_preserve_commit_order;
 @@slave_preserve_commit_order
-0
+1
 Warnings:
 Warning	1287	'@@slave_preserve_commit_order' is deprecated and will be removed in a future release. Please use replica_preserve_commit_order instead.
 include/assert.inc [Variable slave_preserve_commit_order should exist in performance_schema.session_variables]
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/sysvars_with_aliases_64bit_nodebug.result mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/sysvars_with_aliases_64bit_nodebug.result
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/sysvars_with_aliases_64bit_nodebug.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/sysvars_with_aliases_64bit_nodebug.result	2021-09-28 11:46:34.000000000 +0000
@@ -2546,14 +2546,14 @@
 - min=
 - max=
 - block_size=1
-- default=DATABASE
+- default=LOGICAL_CLOCK
 - values=["LOGICAL_CLOCK", "'DATABASE'", "'LOGICAL_CLOCK'", 0, 1]
 ==== Testing SET @@global.replica_parallel_type [allowed values, range, invalid values] ====
 # Initial value is default
-include/assert.inc [@@global.replica_parallel_type should be DATABASE]
-include/assert.inc [replica_parallel_type should be DATABASE in P_S.global_variables]
-include/assert.inc [@@global.slave_parallel_type should be DATABASE]
-include/assert.inc [slave_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [replica_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 # Valid values for variable
 SET @@global.replica_parallel_type=LOGICAL_CLOCK;
 include/assert.inc [@@global.replica_parallel_type should be LOGICAL_CLOCK]
@@ -2582,10 +2582,10 @@
 include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 # Setting default value for variable
 SET @@global.replica_parallel_type = DEFAULT;
-include/assert.inc [@@global.replica_parallel_type should be DATABASE]
-include/assert.inc [replica_parallel_type should be DATABASE in P_S.global_variables]
-include/assert.inc [@@global.slave_parallel_type should be DATABASE]
-include/assert.inc [slave_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [replica_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 # Invalid values
 SET @@global.replica_parallel_type = 1.5;
 Got one of the listed errors
@@ -2603,10 +2603,10 @@
 Got one of the listed errors
 # Restore default
 SET @@global.replica_parallel_type = DEFAULT;
-include/assert.inc [@@global.replica_parallel_type should be DATABASE]
-include/assert.inc [replica_parallel_type should be DATABASE in P_S.global_variables]
-include/assert.inc [@@global.slave_parallel_type should be DATABASE]
-include/assert.inc [slave_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [replica_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 ==== Testing SET @@session.replica_parallel_type [invalid scope] ====
 SET @@session.replica_parallel_type = DEFAULT;
 ERROR HY000: Variable 'replica_parallel_type' is a GLOBAL variable and should be set with SET GLOBAL
@@ -2636,14 +2636,14 @@
 ERROR HY000: Variable 'replica_parallel_type' is a GLOBAL variable
 SELECT @@replica_parallel_type;
 @@replica_parallel_type
-DATABASE
+LOGICAL_CLOCK
 include/assert.inc [Variable replica_parallel_type should exist in performance_schema.session_variables]
 ==== Testing SET @@global.slave_parallel_type [allowed values, range, invalid values] ====
 # Initial value is default
-include/assert.inc [@@global.slave_parallel_type should be DATABASE]
-include/assert.inc [slave_parallel_type should be DATABASE in P_S.global_variables]
-include/assert.inc [@@global.replica_parallel_type should be DATABASE]
-include/assert.inc [replica_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [replica_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 # Valid values for variable
 SET @@global.slave_parallel_type=LOGICAL_CLOCK;
 Warnings:
@@ -2684,10 +2684,10 @@
 SET @@global.slave_parallel_type = DEFAULT;
 Warnings:
 Warning	1287	'@@slave_parallel_type' is deprecated and will be removed in a future release. Please use replica_parallel_type instead.
-include/assert.inc [@@global.slave_parallel_type should be DATABASE]
-include/assert.inc [slave_parallel_type should be DATABASE in P_S.global_variables]
-include/assert.inc [@@global.replica_parallel_type should be DATABASE]
-include/assert.inc [replica_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [replica_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 # Invalid values
 SET @@global.slave_parallel_type = 1.5;
 Got one of the listed errors
@@ -2707,10 +2707,10 @@
 SET @@global.slave_parallel_type = DEFAULT;
 Warnings:
 Warning	1287	'@@slave_parallel_type' is deprecated and will be removed in a future release. Please use replica_parallel_type instead.
-include/assert.inc [@@global.slave_parallel_type should be DATABASE]
-include/assert.inc [slave_parallel_type should be DATABASE in P_S.global_variables]
-include/assert.inc [@@global.replica_parallel_type should be DATABASE]
-include/assert.inc [replica_parallel_type should be DATABASE in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [slave_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_type should be LOGICAL_CLOCK]
+include/assert.inc [replica_parallel_type should be LOGICAL_CLOCK in P_S.global_variables]
 ==== Testing SET @@session.slave_parallel_type [invalid scope] ====
 SET @@session.slave_parallel_type = DEFAULT;
 ERROR HY000: Variable 'slave_parallel_type' is a GLOBAL variable and should be set with SET GLOBAL
@@ -2740,7 +2740,7 @@
 ERROR HY000: Variable 'slave_parallel_type' is a GLOBAL variable
 SELECT @@slave_parallel_type;
 @@slave_parallel_type
-DATABASE
+LOGICAL_CLOCK
 Warnings:
 Warning	1287	'@@slave_parallel_type' is deprecated and will be removed in a future release. Please use replica_parallel_type instead.
 include/assert.inc [Variable slave_parallel_type should exist in performance_schema.session_variables]
@@ -2757,14 +2757,14 @@
 - min=0
 - max=1024
 - block_size=1
-- default=0
+- default=4
 - values=[1, 2, 100]
 ==== Testing SET @@global.replica_parallel_workers [allowed values, range, invalid values] ====
 # Initial value is default
-include/assert.inc [@@global.replica_parallel_workers should be 0]
-include/assert.inc [replica_parallel_workers should be 0 in P_S.global_variables]
-include/assert.inc [@@global.slave_parallel_workers should be 0]
-include/assert.inc [slave_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_workers should be 4]
+include/assert.inc [replica_parallel_workers should be 4 in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_workers should be 4]
+include/assert.inc [slave_parallel_workers should be 4 in P_S.global_variables]
 # Valid values for variable
 SET @@global.replica_parallel_workers=1;
 include/assert.inc [@@global.replica_parallel_workers should be 1]
@@ -2783,10 +2783,10 @@
 include/assert.inc [slave_parallel_workers should be 100 in P_S.global_variables]
 # Setting default value for variable
 SET @@global.replica_parallel_workers = DEFAULT;
-include/assert.inc [@@global.replica_parallel_workers should be 0]
-include/assert.inc [replica_parallel_workers should be 0 in P_S.global_variables]
-include/assert.inc [@@global.slave_parallel_workers should be 0]
-include/assert.inc [slave_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_workers should be 4]
+include/assert.inc [replica_parallel_workers should be 4 in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_workers should be 4]
+include/assert.inc [slave_parallel_workers should be 4 in P_S.global_variables]
 # Minimum value
 SET @@global.replica_parallel_workers = 0;
 include/assert.inc [@@global.replica_parallel_workers should be 0]
@@ -2828,10 +2828,10 @@
 Got one of the listed errors
 # Restore default
 SET @@global.replica_parallel_workers = DEFAULT;
-include/assert.inc [@@global.replica_parallel_workers should be 0]
-include/assert.inc [replica_parallel_workers should be 0 in P_S.global_variables]
-include/assert.inc [@@global.slave_parallel_workers should be 0]
-include/assert.inc [slave_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_workers should be 4]
+include/assert.inc [replica_parallel_workers should be 4 in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_workers should be 4]
+include/assert.inc [slave_parallel_workers should be 4 in P_S.global_variables]
 ==== Testing SET @@session.replica_parallel_workers [invalid scope] ====
 SET @@session.replica_parallel_workers = DEFAULT;
 ERROR HY000: Variable 'replica_parallel_workers' is a GLOBAL variable and should be set with SET GLOBAL
@@ -2853,14 +2853,14 @@
 ERROR HY000: Variable 'replica_parallel_workers' is a GLOBAL variable
 SELECT @@replica_parallel_workers;
 @@replica_parallel_workers
-0
+4
 include/assert.inc [Variable replica_parallel_workers should exist in performance_schema.session_variables]
 ==== Testing SET @@global.slave_parallel_workers [allowed values, range, invalid values] ====
 # Initial value is default
-include/assert.inc [@@global.slave_parallel_workers should be 0]
-include/assert.inc [slave_parallel_workers should be 0 in P_S.global_variables]
-include/assert.inc [@@global.replica_parallel_workers should be 0]
-include/assert.inc [replica_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_workers should be 4]
+include/assert.inc [slave_parallel_workers should be 4 in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_workers should be 4]
+include/assert.inc [replica_parallel_workers should be 4 in P_S.global_variables]
 # Valid values for variable
 SET @@global.slave_parallel_workers=1;
 Warnings:
@@ -2887,10 +2887,10 @@
 SET @@global.slave_parallel_workers = DEFAULT;
 Warnings:
 Warning	1287	'@@slave_parallel_workers' is deprecated and will be removed in a future release. Please use replica_parallel_workers instead.
-include/assert.inc [@@global.slave_parallel_workers should be 0]
-include/assert.inc [slave_parallel_workers should be 0 in P_S.global_variables]
-include/assert.inc [@@global.replica_parallel_workers should be 0]
-include/assert.inc [replica_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_workers should be 4]
+include/assert.inc [slave_parallel_workers should be 4 in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_workers should be 4]
+include/assert.inc [replica_parallel_workers should be 4 in P_S.global_variables]
 # Minimum value
 SET @@global.slave_parallel_workers = 0;
 Warnings:
@@ -2940,10 +2940,10 @@
 SET @@global.slave_parallel_workers = DEFAULT;
 Warnings:
 Warning	1287	'@@slave_parallel_workers' is deprecated and will be removed in a future release. Please use replica_parallel_workers instead.
-include/assert.inc [@@global.slave_parallel_workers should be 0]
-include/assert.inc [slave_parallel_workers should be 0 in P_S.global_variables]
-include/assert.inc [@@global.replica_parallel_workers should be 0]
-include/assert.inc [replica_parallel_workers should be 0 in P_S.global_variables]
+include/assert.inc [@@global.slave_parallel_workers should be 4]
+include/assert.inc [slave_parallel_workers should be 4 in P_S.global_variables]
+include/assert.inc [@@global.replica_parallel_workers should be 4]
+include/assert.inc [replica_parallel_workers should be 4 in P_S.global_variables]
 ==== Testing SET @@session.slave_parallel_workers [invalid scope] ====
 SET @@session.slave_parallel_workers = DEFAULT;
 ERROR HY000: Variable 'slave_parallel_workers' is a GLOBAL variable and should be set with SET GLOBAL
@@ -2965,7 +2965,7 @@
 ERROR HY000: Variable 'slave_parallel_workers' is a GLOBAL variable
 SELECT @@slave_parallel_workers;
 @@slave_parallel_workers
-0
+4
 Warnings:
 Warning	1287	'@@slave_parallel_workers' is deprecated and will be removed in a future release. Please use replica_parallel_workers instead.
 include/assert.inc [Variable slave_parallel_workers should exist in performance_schema.session_variables]
@@ -3254,14 +3254,14 @@
 - min=
 - max=
 - block_size=1
-- default=0
+- default=1
 - values=["ON", "OFF", 1, 0, "TRUE", "FALSE", "'ON'", "'OFF'"]
 ==== Testing SET @@global.replica_preserve_commit_order [allowed values, range, invalid values] ====
 # Initial value is default
-include/assert.inc [@@global.replica_preserve_commit_order should be 0]
-include/assert.inc [replica_preserve_commit_order should be 0 in P_S.global_variables]
-include/assert.inc [@@global.slave_preserve_commit_order should be 0]
-include/assert.inc [slave_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_preserve_commit_order should be 1]
+include/assert.inc [replica_preserve_commit_order should be 1 in P_S.global_variables]
+include/assert.inc [@@global.slave_preserve_commit_order should be 1]
+include/assert.inc [slave_preserve_commit_order should be 1 in P_S.global_variables]
 # Valid values for variable
 SET @@global.replica_preserve_commit_order=ON;
 include/assert.inc [@@global.replica_preserve_commit_order should be 1]
@@ -3305,10 +3305,10 @@
 include/assert.inc [slave_preserve_commit_order should be 0 in P_S.global_variables]
 # Setting default value for variable
 SET @@global.replica_preserve_commit_order = DEFAULT;
-include/assert.inc [@@global.replica_preserve_commit_order should be 0]
-include/assert.inc [replica_preserve_commit_order should be 0 in P_S.global_variables]
-include/assert.inc [@@global.slave_preserve_commit_order should be 0]
-include/assert.inc [slave_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_preserve_commit_order should be 1]
+include/assert.inc [replica_preserve_commit_order should be 1 in P_S.global_variables]
+include/assert.inc [@@global.slave_preserve_commit_order should be 1]
+include/assert.inc [slave_preserve_commit_order should be 1 in P_S.global_variables]
 # Invalid values
 SET @@global.replica_preserve_commit_order = 0.1;
 Got one of the listed errors
@@ -3328,10 +3328,10 @@
 Got one of the listed errors
 # Restore default
 SET @@global.replica_preserve_commit_order = DEFAULT;
-include/assert.inc [@@global.replica_preserve_commit_order should be 0]
-include/assert.inc [replica_preserve_commit_order should be 0 in P_S.global_variables]
-include/assert.inc [@@global.slave_preserve_commit_order should be 0]
-include/assert.inc [slave_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.replica_preserve_commit_order should be 1]
+include/assert.inc [replica_preserve_commit_order should be 1 in P_S.global_variables]
+include/assert.inc [@@global.slave_preserve_commit_order should be 1]
+include/assert.inc [slave_preserve_commit_order should be 1 in P_S.global_variables]
 ==== Testing SET @@session.replica_preserve_commit_order [invalid scope] ====
 SET @@session.replica_preserve_commit_order = DEFAULT;
 ERROR HY000: Variable 'replica_preserve_commit_order' is a GLOBAL variable and should be set with SET GLOBAL
@@ -3373,14 +3373,14 @@
 ERROR HY000: Variable 'replica_preserve_commit_order' is a GLOBAL variable
 SELECT @@replica_preserve_commit_order;
 @@replica_preserve_commit_order
-0
+1
 include/assert.inc [Variable replica_preserve_commit_order should exist in performance_schema.session_variables]
 ==== Testing SET @@global.slave_preserve_commit_order [allowed values, range, invalid values] ====
 # Initial value is default
-include/assert.inc [@@global.slave_preserve_commit_order should be 0]
-include/assert.inc [slave_preserve_commit_order should be 0 in P_S.global_variables]
-include/assert.inc [@@global.replica_preserve_commit_order should be 0]
-include/assert.inc [replica_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.slave_preserve_commit_order should be 1]
+include/assert.inc [slave_preserve_commit_order should be 1 in P_S.global_variables]
+include/assert.inc [@@global.replica_preserve_commit_order should be 1]
+include/assert.inc [replica_preserve_commit_order should be 1 in P_S.global_variables]
 # Valid values for variable
 SET @@global.slave_preserve_commit_order=ON;
 Warnings:
@@ -3442,10 +3442,10 @@
 SET @@global.slave_preserve_commit_order = DEFAULT;
 Warnings:
 Warning	1287	'@@slave_preserve_commit_order' is deprecated and will be removed in a future release. Please use replica_preserve_commit_order instead.
-include/assert.inc [@@global.slave_preserve_commit_order should be 0]
-include/assert.inc [slave_preserve_commit_order should be 0 in P_S.global_variables]
-include/assert.inc [@@global.replica_preserve_commit_order should be 0]
-include/assert.inc [replica_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.slave_preserve_commit_order should be 1]
+include/assert.inc [slave_preserve_commit_order should be 1 in P_S.global_variables]
+include/assert.inc [@@global.replica_preserve_commit_order should be 1]
+include/assert.inc [replica_preserve_commit_order should be 1 in P_S.global_variables]
 # Invalid values
 SET @@global.slave_preserve_commit_order = 0.1;
 Got one of the listed errors
@@ -3467,10 +3467,10 @@
 SET @@global.slave_preserve_commit_order = DEFAULT;
 Warnings:
 Warning	1287	'@@slave_preserve_commit_order' is deprecated and will be removed in a future release. Please use replica_preserve_commit_order instead.
-include/assert.inc [@@global.slave_preserve_commit_order should be 0]
-include/assert.inc [slave_preserve_commit_order should be 0 in P_S.global_variables]
-include/assert.inc [@@global.replica_preserve_commit_order should be 0]
-include/assert.inc [replica_preserve_commit_order should be 0 in P_S.global_variables]
+include/assert.inc [@@global.slave_preserve_commit_order should be 1]
+include/assert.inc [slave_preserve_commit_order should be 1 in P_S.global_variables]
+include/assert.inc [@@global.replica_preserve_commit_order should be 1]
+include/assert.inc [replica_preserve_commit_order should be 1 in P_S.global_variables]
 ==== Testing SET @@session.slave_preserve_commit_order [invalid scope] ====
 SET @@session.slave_preserve_commit_order = DEFAULT;
 ERROR HY000: Variable 'slave_preserve_commit_order' is a GLOBAL variable and should be set with SET GLOBAL
@@ -3512,7 +3512,7 @@
 ERROR HY000: Variable 'slave_preserve_commit_order' is a GLOBAL variable
 SELECT @@slave_preserve_commit_order;
 @@slave_preserve_commit_order
-0
+1
 Warnings:
 Warning	1287	'@@slave_preserve_commit_order' is deprecated and will be removed in a future release. Please use replica_preserve_commit_order instead.
 include/assert.inc [Variable slave_preserve_commit_order should exist in performance_schema.session_variables]
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/thread_stack_basic.result mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/thread_stack_basic.result
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/r/thread_stack_basic.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/r/thread_stack_basic.result	2021-09-28 11:46:34.000000000 +0000
@@ -1,20 +1,20 @@
 select @@global.thread_stack;
 @@global.thread_stack
-262144
+1048576
 select @@session.thread_stack;
 ERROR HY000: Variable 'thread_stack' is a GLOBAL variable
 show global variables like 'thread_stack';
 Variable_name	Value
-thread_stack	262144
+thread_stack	1048576
 show session variables like 'thread_stack';
 Variable_name	Value
-thread_stack	262144
+thread_stack	1048576
 select * from performance_schema.global_variables where variable_name='thread_stack';
 VARIABLE_NAME	VARIABLE_VALUE
-thread_stack	262144
+thread_stack	1048576
 select * from performance_schema.session_variables where variable_name='thread_stack';
 VARIABLE_NAME	VARIABLE_VALUE
-thread_stack	262144
+thread_stack	1048576
 set global thread_stack=1;
 ERROR HY000: Variable 'thread_stack' is a read only variable
 set session thread_stack=1;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/innodb_ddl_buffer_size_basic.test mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/innodb_ddl_buffer_size_basic.test
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/innodb_ddl_buffer_size_basic.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/innodb_ddl_buffer_size_basic.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,56 @@
+#
+# Show the global and session values.
+#
+SELECT @@global.innodb_ddl_buffer_size;
+SELECT @@session.innodb_ddl_buffer_size;
+
+SHOW GLOBAL VARIABLES LIKE  'innodb_ddl_buffer_size';
+SHOW SESSION VARIABLES LIKE 'innodb_ddl_buffer_size';
+
+SELECT * FROM performance_schema.global_variables
+  WHERE variable_name='innodb_ddl_buffer_size';
+
+SELECT * FROM performance_schema.session_variables
+  WHERE variable_name='innodb_ddl_buffer_size';
+
+#
+# Set min value - 1
+#
+set global innodb_ddl_buffer_size=65535;
+set session innodb_ddl_buffer_size=65535;
+
+# Set the minimum value.
+set global innodb_ddl_buffer_size=65536;
+set session innodb_ddl_buffer_size=65536;
+
+SELECT * FROM performance_schema.global_variables
+  WHERE variable_name='innodb_ddl_buffer_size';
+
+SELECT * FROM performance_schema.session_variables
+  WHERE variable_name='innodb_ddl_buffer_size';
+
+# Set max value + 1.
+set global innodb_ddl_buffer_size=4294967297;
+set session innodb_ddl_buffer_size=4294967297;
+
+# Set the max value
+set global innodb_ddl_buffer_size=4294967295;
+set session innodb_ddl_buffer_size=4294967295;
+
+SELECT * FROM performance_schema.global_variables
+  WHERE variable_name='innodb_ddl_buffer_size';
+
+SELECT * FROM performance_schema.session_variables
+  WHERE variable_name='innodb_ddl_buffer_size';
+
+# Set to the default value
+set global innodb_ddl_buffer_size=1048576;
+set session innodb_ddl_buffer_size=1048576;
+
+SELECT * FROM performance_schema.global_variables
+  WHERE variable_name='innodb_ddl_buffer_size';
+
+SELECT * FROM performance_schema.session_variables
+  WHERE variable_name='innodb_ddl_buffer_size';
+
+
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/innodb_ddl_threads_basic.test mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/innodb_ddl_threads_basic.test
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/innodb_ddl_threads_basic.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/innodb_ddl_threads_basic.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,25 @@
+#
+# Show the global and session values. Default is ON.
+#
+SELECT @@global.innodb_ddl_threads;
+SELECT @@session.innodb_ddl_threads;
+
+SHOW GLOBAL VARIABLES LIKE  'innodb_ddl_threads';
+SHOW SESSION VARIABLES LIKE 'innodb_ddl_threads';
+
+SELECT * FROM performance_schema.global_variables
+  WHERE variable_name='innodb_ddl_threads';
+
+SELECT * FROM performance_schema.session_variables
+  WHERE variable_name='innodb_ddl_threads';
+
+#
+# Test that it's not read-only.
+#
+set global innodb_ddl_threads=8;
+set session innodb_ddl_threads=8;
+
+# Set back to default.
+set global innodb_ddl_threads=4;
+set session innodb_ddl_threads=4;
+
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/internal_tmp_mem_storage_engine_basic.test mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/internal_tmp_mem_storage_engine_basic.test
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/internal_tmp_mem_storage_engine_basic.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/internal_tmp_mem_storage_engine_basic.test	2021-09-28 11:46:34.000000000 +0000
@@ -29,3 +29,47 @@
 
 SET @@global.internal_tmp_mem_storage_engine = default;
 SET @@session.internal_tmp_mem_storage_engine = default;
+
+
+--echo #
+--echo # WL#14728: internal_tmp_mem_storage_engine should
+--echo #   require SESSION_VARIABLES_ADMIN
+--echo #
+
+# Save the initial number of concurrent sessions
+--source include/count_sessions.inc
+
+CREATE USER foo@localhost, bar@localhost;
+GRANT SESSION_VARIABLES_ADMIN ON *.* TO foo@localhost;
+
+connect(foo_con,localhost,foo,,);
+#success criteria: global should fail, session should pass
+--error ER_SPECIFIC_ACCESS_DENIED_ERROR
+SET @@global.internal_tmp_mem_storage_engine = 123;
+SET @@session.internal_tmp_mem_storage_engine = 'memory';
+--error ER_SPECIFIC_ACCESS_DENIED_ERROR
+SET @@global.internal_tmp_mem_storage_engine = default;
+SET @@session.internal_tmp_mem_storage_engine = default;
+
+connect(bar_con,localhost,bar,,);
+#success criteria: all of the 4 statements below should fail
+--error ER_SPECIFIC_ACCESS_DENIED_ERROR
+SET @@global.internal_tmp_mem_storage_engine = 123;
+--error ER_SPECIFIC_ACCESS_DENIED_ERROR
+SET @@session.internal_tmp_mem_storage_engine = 'memory';
+--error ER_SPECIFIC_ACCESS_DENIED_ERROR
+SET @@global.internal_tmp_mem_storage_engine = default;
+--error ER_SPECIFIC_ACCESS_DENIED_ERROR
+SET @@session.internal_tmp_mem_storage_engine = default;
+
+connection default;
+disconnect foo_con;
+disconnect bar_con;
+REVOKE SESSION_VARIABLES_ADMIN ON *.* FROM foo@localhost;
+DROP USER foo@localhost, bar@localhost;
+# Wait till we reached the initial number of concurrent sessions
+--source include/wait_until_count_sessions.inc
+
+
+--echo # End of 8.0 tests
+
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/log_output_basic.test mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/log_output_basic.test
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/log_output_basic.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/log_output_basic.test	2021-09-28 11:46:34.000000000 +0000
@@ -214,6 +214,7 @@
 SET @@global.log_output = @start_value;
 SELECT @@global.log_output;
 
+TRUNCATE TABLE mysql.general_log;
 ################################################################### 
 #                    END OF log_output TESTS                      #
 ################################################################### 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/log_slow_admin_statements_func.test mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/log_slow_admin_statements_func.test
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/log_slow_admin_statements_func.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/log_slow_admin_statements_func.test	2021-09-28 11:46:34.000000000 +0000
@@ -75,3 +75,4 @@
 DROP PROCEDURE add_rows;
 DROP TABLE log_slow_admin_statements;
 TRUNCATE TABLE mysql.slow_log;
+TRUNCATE TABLE mysql.general_log;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/log_slow_extra_basic.test mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/log_slow_extra_basic.test
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/log_slow_extra_basic.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/log_slow_extra_basic.test	2021-09-28 11:46:34.000000000 +0000
@@ -72,6 +72,8 @@
 SET GLOBAL log_slow_extra=@old_lse;
 SET GLOBAL log_output=@old_lo;
 SET GLOBAL slow_query_log=@old_sql;
+TRUNCATE TABLE mysql.general_log;
+TRUNCATE TABLE mysql.slow_log;
 
 --echo
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/max_delayed_threads_basic.test mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/max_delayed_threads_basic.test
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/max_delayed_threads_basic.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/max_delayed_threads_basic.test	2021-09-28 11:46:34.000000000 +0000
@@ -226,6 +226,27 @@
 --Error ER_BAD_FIELD_ERROR
 SELECT max_delayed_threads = @@session.max_delayed_threads;
 
+--echo '#---------------------FN_DYNVARS_001_12----------------------#'
+######################################################################################
+#   Check if changing session variable throws error without sufficient privileges    #
+######################################################################################
+CREATE USER foo, bar;
+GRANT SESSION_VARIABLES_ADMIN ON *.*  TO bar;
+--let $conn_name = foo_connection
+--connect($conn_name, localhost, foo,,,)
+SELECT @@session.max_delayed_threads;
+--error ER_SPECIFIC_ACCESS_DENIED_ERROR
+SET @@session.max_delayed_threads = 2048;
+--connection default
+disconnect $conn_name;
+--let $conn_name = bar_connection
+--connect($conn_name, localhost, bar,,,)
+SELECT @@session.max_delayed_threads;
+SET @@session.max_delayed_threads = 2048;
+SELECT @@session.max_delayed_threads;
+--connection default
+disconnect $conn_name;
+DROP USER foo, bar;
 
 ####################################
 #     Restore initial value        #
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/max_error_count_basic.test mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/max_error_count_basic.test
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/max_error_count_basic.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/max_error_count_basic.test	2021-09-28 11:46:34.000000000 +0000
@@ -209,6 +209,28 @@
 --Error ER_BAD_FIELD_ERROR
 SELECT max_error_count = @@session.max_error_count;
 
+--echo '#---------------------FN_DYNVARS_001_12----------------------#'
+######################################################################################
+#   Check if changing session variable throws error without sufficient privileges    #
+######################################################################################
+CREATE USER foo, bar;
+GRANT SESSION_VARIABLES_ADMIN ON *.*  TO bar;
+--let $conn_name = foo_connection
+--connect($conn_name, localhost, foo,,,)
+SELECT @@session.max_error_count;
+--error ER_SPECIFIC_ACCESS_DENIED_ERROR
+SET @@session.max_error_count = 2048;
+--connection default
+disconnect $conn_name;
+--let $conn_name = bar_connection
+--connect($conn_name, localhost, bar,,,)
+SELECT @@session.max_error_count;
+SET @@session.max_error_count = 2048;
+SELECT @@session.max_error_count;
+--connection default
+disconnect $conn_name;
+DROP USER foo, bar;
+
 
 ####################################
 #     Restore initial value        #
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/max_sp_recursion_depth_func-master.opt mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/max_sp_recursion_depth_func-master.opt
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/max_sp_recursion_depth_func-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/max_sp_recursion_depth_func-master.opt	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
---thread_stack=655360
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/mysql_native_password_proxy_users_log.test mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/mysql_native_password_proxy_users_log.test
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/mysql_native_password_proxy_users_log.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/mysql_native_password_proxy_users_log.test	2021-09-28 11:46:34.000000000 +0000
@@ -122,4 +122,5 @@
 SET GLOBAL general_log_file=  @old_general_log_file;
 SET GLOBAL general_log=       @old_general_log;
 SET GLOBAL log_output=        @old_log_output;
+TRUNCATE TABLE mysql.general_log;
 --remove_file '$MYSQLTEST_VARDIR/log/proxy_general.log'
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/persisted_sysvars_with_aliases.test mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/persisted_sysvars_with_aliases.test
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/persisted_sysvars_with_aliases.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/persisted_sysvars_with_aliases.test	2021-09-28 11:46:34.000000000 +0000
@@ -614,3 +614,5 @@
 --echo #### Clean up ####
 
 --source include/destroy_json_functions.inc
+--let $restart_parameters = restart:
+--source include/restart_mysqld.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/preload_buffer_size_basic.test mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/preload_buffer_size_basic.test
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/preload_buffer_size_basic.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/preload_buffer_size_basic.test	2021-09-28 11:46:34.000000000 +0000
@@ -203,6 +203,29 @@
 --Error ER_BAD_FIELD_ERROR
 SELECT preload_buffer_size = @@session.preload_buffer_size;
 
+--echo '#---------------------FN_DYNVARS_129_12----------------------#'
+######################################################################################
+#   Check if changing session variable throws error without sufficient privileges    #
+######################################################################################
+CREATE USER foo, bar;
+GRANT SESSION_VARIABLES_ADMIN ON *.*  TO bar;
+--let $conn_name = foo_connection
+--connect($conn_name, localhost, foo,,,)
+SELECT @@session.preload_buffer_size;
+--error ER_SPECIFIC_ACCESS_DENIED_ERROR
+SET @@session.preload_buffer_size = 2048;
+--connection default
+disconnect $conn_name;
+--let $conn_name = bar_connection
+--connect($conn_name, localhost, bar,,,)
+SELECT @@session.preload_buffer_size;
+SET @@session.preload_buffer_size = 2048;
+SELECT @@session.preload_buffer_size;
+--error ER_SPECIFIC_ACCESS_DENIED_ERROR
+SET @@global.preload_buffer_size = 2048;
+--connection default
+disconnect $conn_name;
+DROP USER foo, bar;
 
 ####################################
 #     Restore initial value        #
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/select_into_buffer_size.test mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/select_into_buffer_size.test
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/select_into_buffer_size.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/select_into_buffer_size.test	2021-09-28 11:46:34.000000000 +0000
@@ -171,6 +171,30 @@
 --Error ER_BAD_FIELD_ERROR
 SELECT select_into_buffer_size = @@session.select_into_buffer_size;
 
+--echo '#---------------------FN_DYNVARS_001_12----------------------#'
+######################################################################################
+#   Check if changing session variable throws error without sufficient privileges    #
+######################################################################################
+CREATE USER foo, bar;
+GRANT SESSION_VARIABLES_ADMIN ON *.*  TO bar;
+--let $conn_name = foo_connection
+--connect($conn_name, localhost, foo,,,)
+SELECT @@session.select_into_buffer_size;
+--error ER_SPECIFIC_ACCESS_DENIED_ERROR
+SET @@session.select_into_buffer_size = 15000;
+--connection default
+disconnect $conn_name;
+--let $conn_name = bar_connection
+--connect($conn_name, localhost, bar,,,)
+SELECT @@session.select_into_buffer_size;
+SET @@session.select_into_buffer_size = 15000;
+SELECT @@session.select_into_buffer_size;
+--error ER_SPECIFIC_ACCESS_DENIED_ERROR
+SET @@global.select_into_buffer_size = 15000;
+--connection default
+disconnect $conn_name;
+DROP USER foo, bar;
+
 
 ####################################
 #     Restore initial value        #
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/select_into_disk_sync_delay.test mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/select_into_disk_sync_delay.test
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/select_into_disk_sync_delay.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/select_into_disk_sync_delay.test	2021-09-28 11:46:34.000000000 +0000
@@ -168,6 +168,30 @@
 --Error ER_BAD_FIELD_ERROR
 SELECT select_into_disk_sync_delay = @@session.select_into_disk_sync_delay;
 
+--echo '#---------------------FN_DYNVARS_001_12----------------------#'
+######################################################################################
+#   Check if changing session variable throws error without sufficient privileges    #
+######################################################################################
+CREATE USER foo, bar;
+GRANT SESSION_VARIABLES_ADMIN ON *.*  TO bar;
+--let $conn_name = foo_connection
+--connect($conn_name, localhost, foo,,,)
+SELECT @@session.select_into_disk_sync_delay;
+--error ER_SPECIFIC_ACCESS_DENIED_ERROR
+SET @@session.select_into_disk_sync_delay = 2000;
+--connection default
+disconnect $conn_name;
+--let $conn_name = bar_connection
+--connect($conn_name, localhost, bar,,,)
+SELECT @@session.select_into_disk_sync_delay;
+SET @@session.select_into_disk_sync_delay = 2000;
+--error ER_SPECIFIC_ACCESS_DENIED_ERROR
+SET @@global.select_into_disk_sync_delay = 2000;
+SELECT @@session.select_into_disk_sync_delay;
+--connection default
+disconnect $conn_name;
+DROP USER foo, bar;
+
 
 ####################################
 #     Restore initial value        #
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/sha256_password_proxy_users_log.test mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/sha256_password_proxy_users_log.test
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/sha256_password_proxy_users_log.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/sha256_password_proxy_users_log.test	2021-09-28 11:46:34.000000000 +0000
@@ -119,4 +119,5 @@
 SET GLOBAL general_log_file=  @old_general_log_file;
 SET GLOBAL general_log=       @old_general_log;
 SET GLOBAL log_output=        @old_log_output;
+TRUNCATE TABLE mysql.general_log;
 --remove_file '$MYSQLTEST_VARDIR/log/proxy_general.log'
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/show_old_temporals_basic.test mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/show_old_temporals_basic.test
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/show_old_temporals_basic.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/show_old_temporals_basic.test	2021-09-28 11:46:34.000000000 +0000
@@ -67,3 +67,26 @@
 --echo #Test for invalid value.
 --error ER_WRONG_VALUE_FOR_VAR
 SET GLOBAL show_old_temporals= 2;
+
+######################################################################################
+#   Check if changing session variable throws error without sufficient privileges    #
+######################################################################################
+CREATE USER foo, bar;
+GRANT SESSION_VARIABLES_ADMIN ON *.*  TO bar;
+--let $conn_name = foo_connection
+--connect($conn_name, localhost, foo,,,)
+SELECT @@session.show_old_temporals;
+--error ER_SPECIFIC_ACCESS_DENIED_ERROR
+SET @@session.show_old_temporals = 0;
+--connection default
+disconnect $conn_name;
+--let $conn_name = bar_connection
+--connect($conn_name, localhost, bar,,,)
+SELECT @@session.show_old_temporals;
+SET @@session.show_old_temporals = 0;
+SELECT @@session.show_old_temporals;
+--error ER_SPECIFIC_ACCESS_DENIED_ERROR
+SET @@global.show_old_temporals = 0;
+--connection default
+disconnect $conn_name;
+DROP USER foo, bar;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/slow_query_log_func_myisam.test mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/slow_query_log_func_myisam.test
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/slow_query_log_func_myisam.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/slow_query_log_func_myisam.test	2021-09-28 11:46:34.000000000 +0000
@@ -104,6 +104,7 @@
 #==================================================================   Restore
 SET @@global.log_output = @global_log_output;
 SET @global.slow_query_log = @global_slow_query_log;
+TRUNCATE TABLE mysql.general_log;
 TRUNCATE TABLE mysql.slow_log;
 ###############################################################################
 # End of the functionality test for slow_query_log                            #
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/slow_query_log_func.test mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/slow_query_log_func.test
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/slow_query_log_func.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/slow_query_log_func.test	2021-09-28 11:46:34.000000000 +0000
@@ -59,6 +59,7 @@
 #==================================================================   Restore
 SET @@global.log_output = @global_log_output;
 SET @global.slow_query_log = @global_slow_query_log;
+TRUNCATE TABLE mysql.general_log;
 TRUNCATE TABLE mysql.slow_log;
 ###############################################################################
 # End of the functionality test for slow_query_log                            #
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/sql_low_priority_updates_func.test mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/sql_low_priority_updates_func.test
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/sql_low_priority_updates_func.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/sql_low_priority_updates_func.test	2021-09-28 11:46:34.000000000 +0000
@@ -251,5 +251,27 @@
 drop view v1;
 DROP TABLE t1;
 
+######################################################################################
+#   Check if changing session variable throws error without sufficient privileges    #
+######################################################################################
+CREATE USER foo, bar;
+GRANT SESSION_VARIABLES_ADMIN ON *.*  TO bar;
+--let $conn_name = foo_connection
+--connect($conn_name, localhost, foo,,,)
+SELECT @@session.low_priority_updates;
+--error ER_SPECIFIC_ACCESS_DENIED_ERROR
+SET @@session.low_priority_updates = TRUE;
+--connection default
+disconnect $conn_name;
+--let $conn_name = bar_connection
+--connect($conn_name, localhost, bar,,,)
+SELECT @@session.low_priority_updates;
+SET @@session.low_priority_updates = TRUE;
+SELECT @@session.low_priority_updates;
+--connection default
+disconnect $conn_name;
+DROP USER foo, bar;
+
+
 SET @@GLOBAL.low_priority_updates = @global_low_priority_updates;
 SET @@SESSION.low_priority_updates = @session_low_priority_updates;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/thread_stack_basic.test mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/thread_stack_basic.test
--- mysql-8.0-8.0.26/mysql-test/suite/sys_vars/t/thread_stack_basic.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/sys_vars/t/thread_stack_basic.test	2021-09-28 11:46:34.000000000 +0000
@@ -1,18 +1,13 @@
 #
 # only global
 #
---replace_result 196608 262144 393216 262144 524288 262144 286720 262144 573440 262144 221184 262144 860160 262144 1146880 262144
 select @@global.thread_stack;
 --error ER_INCORRECT_GLOBAL_LOCAL_VAR
 select @@session.thread_stack;
---replace_result 196608 262144 393216 262144 524288 262144 286720 262144 573440 262144 221184 262144 860160 262144 1146880 262144
 show global variables like 'thread_stack';
---replace_result 196608 262144 393216 262144 524288 262144 286720 262144 573440 262144 221184 262144 860160 262144 1146880 262144
 show session variables like 'thread_stack';
 --disable_warnings
---replace_result 196608 262144 393216 262144 524288 262144 286720 262144 573440 262144 221184 262144 860160 262144 1146880 262144
 select * from performance_schema.global_variables where variable_name='thread_stack';
---replace_result 196608 262144 393216 262144 524288 262144 286720 262144 573440 262144 221184 262144 860160 262144 1146880 262144
 select * from performance_schema.session_variables where variable_name='thread_stack';
 --enable_warnings
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/test_services/r/test_table_access_utf8.result mysql-8.0-8.0.27/mysql-test/suite/test_services/r/test_table_access_utf8.result
--- mysql-8.0-8.0.26/mysql-test/suite/test_services/r/test_table_access_utf8.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/test_services/r/test_table_access_utf8.result	2021-09-28 11:46:34.000000000 +0000
@@ -25,7 +25,7 @@
 CREATE TABLE `∀p∊ℙ`.`∃s∊ℚ`(`s(p)≎⊤` VARCHAR(255) CHARACTER SET `utf8mb4`);
 CREATE TABLE `∀p∊ℙ`.`∃s∊�`(`s(p)≎⊤` VARCHAR(255) CHARACTER SET `utf8mb4`);
 Warnings:
-Warning	1300	Cannot convert string '\xE2\x88\x83s\xE2\x88...' from utf8mb4 to utf8
+Warning	1300	Cannot convert string '\xE2\x88\x83s\xE2\x88...' from utf8mb4 to utf8mb3
 use `∀p∊ℙ`;
 show tables;
 Tables_in_∀p∊ℙ
@@ -42,13 +42,13 @@
   `s(p)≎⊤` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 Warnings:
-Warning	1300	Cannot convert string '\xE2\x88\x83s\xE2\x88...' from utf8mb4 to utf8
+Warning	1300	Cannot convert string '\xE2\x88\x83s\xE2\x88...' from utf8mb4 to utf8mb3
 SELECT * FROM `∀p∊ℙ`.`∃s∊ℚ`;
 s(p)≎⊤
 SELECT * FROM `∀p∊ℙ`.`∃s∊�`;
 s(p)≎⊤
 Warnings:
-Warning	1300	Cannot convert string '\xE2\x88\x83s\xE2\x88...' from utf8mb4 to utf8
+Warning	1300	Cannot convert string '\xE2\x88\x83s\xE2\x88...' from utf8mb4 to utf8mb3
 SELECT test_table_access_driver("MATH-INSERT-UTF8MB3");
 test_table_access_driver("MATH-INSERT-UTF8MB3")
 OK
@@ -65,14 +65,14 @@
 s(p)≎⊤
 ∀p∊ℙ ∃s∊� s(p)≎⊤
 Warnings:
-Warning	1300	Cannot convert string '\xE2\x88\x83s\xE2\x88...' from utf8mb4 to utf8
+Warning	1300	Cannot convert string '\xE2\x88\x83s\xE2\x88...' from utf8mb4 to utf8mb3
 TRUNCATE TABLE `∀p∊ℙ`.`∃s∊�`;
 Warnings:
-Warning	1300	Cannot convert string '\xE2\x88\x83s\xE2\x88...' from utf8mb4 to utf8
+Warning	1300	Cannot convert string '\xE2\x88\x83s\xE2\x88...' from utf8mb4 to utf8mb3
 SELECT * FROM `∀p∊ℙ`.`∃s∊�`;
 s(p)≎⊤
 Warnings:
-Warning	1300	Cannot convert string '\xE2\x88\x83s\xE2\x88...' from utf8mb4 to utf8
+Warning	1300	Cannot convert string '\xE2\x88\x83s\xE2\x88...' from utf8mb4 to utf8mb3
 ##################
 # SERVER RESTART #
 ##################
@@ -84,10 +84,10 @@
 s(p)≎⊤
 ∀p∊ℙ ∃s∊� s(p)≎⊤
 Warnings:
-Warning	1300	Cannot convert string '\xE2\x88\x83s\xE2\x88...' from utf8mb4 to utf8
+Warning	1300	Cannot convert string '\xE2\x88\x83s\xE2\x88...' from utf8mb4 to utf8mb3
 DROP TABLE `∀p∊ℙ`.`∃s∊ℚ`;
 DROP TABLE `∀p∊ℙ`.`∃s∊�`;
 Warnings:
-Warning	1300	Cannot convert string '\xE2\x88\x83s\xE2\x88...' from utf8mb4 to utf8
+Warning	1300	Cannot convert string '\xE2\x88\x83s\xE2\x88...' from utf8mb4 to utf8mb3
 DROP SCHEMA `∀p∊ℙ`;
 UNINSTALL COMPONENT 'file://component_test_table_access';
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/test_service_sql_api/r/test_sql_complex.result mysql-8.0-8.0.27/mysql-test/suite/test_service_sql_api/r/test_sql_complex.result
--- mysql-8.0-8.0.26/mysql-test/suite/test_service_sql_api/r/test_sql_complex.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/test_service_sql_api/r/test_sql_complex.result	2021-09-28 11:46:34.000000000 +0000
@@ -2884,7 +2884,7 @@
 			[meta][field] org col name: 
 			[meta][field] length: 21
 			[meta][field] charsetnr: 33
-			[meta][field] flags: 128 (BINARY )
+			[meta][field] flags: 160 (UNSIGNED BINARY )
 			[meta][field] decimals: 0
 			[meta][field] type: LONGLONG (8)
 
@@ -2916,7 +2916,7 @@
 			[meta][field] org col name: 
 			[meta][field] length: 21
 			[meta][field] charsetnr: 33
-			[meta][field] flags: 128 (BINARY )
+			[meta][field] flags: 160 (UNSIGNED BINARY )
 			[meta][field] decimals: 0
 			[meta][field] type: LONGLONG (8)
 
@@ -6093,7 +6093,7 @@
 			[meta][field] org col name: 
 			[meta][field] length: 21
 			[meta][field] charsetnr: 33
-			[meta][field] flags: 128 (BINARY )
+			[meta][field] flags: 160 (UNSIGNED BINARY )
 			[meta][field] decimals: 0
 			[meta][field] type: LONGLONG (8)
 
@@ -6125,7 +6125,7 @@
 			[meta][field] org col name: 
 			[meta][field] length: 21
 			[meta][field] charsetnr: 33
-			[meta][field] flags: 128 (BINARY )
+			[meta][field] flags: 160 (UNSIGNED BINARY )
 			[meta][field] decimals: 0
 			[meta][field] type: LONGLONG (8)
 
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/test_service_sql_api/r/test_sql_general_log.result mysql-8.0-8.0.27/mysql-test/suite/test_service_sql_api/r/test_sql_general_log.result
--- mysql-8.0-8.0.26/mysql-test/suite/test_service_sql_api/r/test_sql_general_log.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/test_service_sql_api/r/test_sql_general_log.result	2021-09-28 11:46:34.000000000 +0000
@@ -278,3 +278,4 @@
 SET GLOBAL log_output = @old_log_output;
 SET GLOBAL general_log = @old_general_log;
 SET GLOBAL general_log_file = @old_general_log_file;
+TRUNCATE TABLE mysql.general_log;
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/test_service_sql_api/t/test_sql_general_log.test mysql-8.0-8.0.27/mysql-test/suite/test_service_sql_api/t/test_sql_general_log.test
--- mysql-8.0-8.0.26/mysql-test/suite/test_service_sql_api/t/test_sql_general_log.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/test_service_sql_api/t/test_sql_general_log.test	2021-09-28 11:46:34.000000000 +0000
@@ -119,4 +119,6 @@
 SET GLOBAL log_output = @old_log_output;
 SET GLOBAL general_log = @old_general_log;
 SET GLOBAL general_log_file = @old_general_log_file;
+TRUNCATE TABLE mysql.general_log;
+
 --enable_ps_protocol
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/x/r/admin_xkill.result mysql-8.0-8.0.27/mysql-test/suite/x/r/admin_xkill.result
--- mysql-8.0-8.0.26/mysql-test/suite/x/r/admin_xkill.result	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/x/r/admin_xkill.result	2021-09-28 11:46:34.000000000 +0000
@@ -133,7 +133,7 @@
 RUN show grants
 Grants for x_root@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `x_root`@`localhost` WITH GRANT OPTION
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `x_root`@`localhost` WITH GRANT OPTION
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `x_root`@`localhost` WITH GRANT OPTION
 0 rows affected
 open process only privileged user seession and kill x_root user session,expect error "You are not owner of thread"
 connecting...
@@ -193,7 +193,7 @@
 RUN show grants
 Grants for xplugin@localhost
 GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `xplugin`@`localhost`
-GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `xplugin`@`localhost`
+GRANT APPLICATION_PASSWORD_ADMIN,AUDIT_ADMIN,AUTHENTICATION_POLICY_ADMIN,BACKUP_ADMIN,BINLOG_ADMIN,BINLOG_ENCRYPTION_ADMIN,CLONE_ADMIN,CONNECTION_ADMIN,ENCRYPTION_KEY_ADMIN,FLUSH_OPTIMIZER_COSTS,FLUSH_STATUS,FLUSH_TABLES,FLUSH_USER_RESOURCES,GROUP_REPLICATION_ADMIN,GROUP_REPLICATION_STREAM,INNODB_REDO_LOG_ARCHIVE,INNODB_REDO_LOG_ENABLE,PASSWORDLESS_USER_ADMIN,PERSIST_RO_VARIABLES_ADMIN,REPLICATION_APPLIER,REPLICATION_SLAVE_ADMIN,RESOURCE_GROUP_ADMIN,RESOURCE_GROUP_USER,ROLE_ADMIN,SERVICE_CONNECTION_ADMIN,SESSION_VARIABLES_ADMIN,SET_USER_ID,SHOW_ROUTINE,SYSTEM_USER,SYSTEM_VARIABLES_ADMIN,TABLE_ENCRYPTION_ADMIN,XA_RECOVER_ADMIN ON *.* TO `xplugin`@`localhost`
 0 rows affected
 Cleanup
 RUN drop schema if exists xtest
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/x/t/notices_disable-master.opt mysql-8.0-8.0.27/mysql-test/suite/x/t/notices_disable-master.opt
--- mysql-8.0-8.0.26/mysql-test/suite/x/t/notices_disable-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/x/t/notices_disable-master.opt	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
---thread_stack=458752
diff -Nru mysql-8.0-8.0.26/mysql-test/suite/x/t/notices_enable-master.opt mysql-8.0-8.0.27/mysql-test/suite/x/t/notices_enable-master.opt
--- mysql-8.0-8.0.26/mysql-test/suite/x/t/notices_enable-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/suite/x/t/notices_enable-master.opt	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
---thread_stack=655360
diff -Nru mysql-8.0-8.0.26/mysql-test/t/all_persisted_variables.test mysql-8.0-8.0.27/mysql-test/t/all_persisted_variables.test
--- mysql-8.0-8.0.26/mysql-test/t/all_persisted_variables.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/all_persisted_variables.test	2021-09-28 11:46:34.000000000 +0000
@@ -41,7 +41,7 @@
 call mtr.add_suppression("Failed to initialize TLS for channel: mysql_main");
 
 let $total_global_vars=`SELECT COUNT(*) FROM performance_schema.global_variables where variable_name NOT LIKE 'ndb_%'`;
-let $total_persistent_vars=435;
+let $total_persistent_vars=438;
 
 --echo ***************************************************************
 --echo * 0. Verify that variables present in performance_schema.global
diff -Nru mysql-8.0-8.0.26/mysql-test/t/analyze.test mysql-8.0-8.0.27/mysql-test/t/analyze.test
--- mysql-8.0-8.0.26/mysql-test/t/analyze.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/analyze.test	2021-09-28 11:46:34.000000000 +0000
@@ -75,3 +75,15 @@
 drop table t1;
 
 --echo End of 5.0 tests
+
+--echo #
+--echo # Bug#33079073 - sql_cmd_call::execute_inner(thd*): assertion
+--echo #                `thd->is_error() || thd->killed' failed.
+--echo # Assertion to check if error state is set in the diagnostics area
+--echo # on ANALYZE TABLE to UPDATE HISTOGRAM non-success in SP is failed.
+--echo #
+CREATE PROCEDURE p() ANALYZE TABLE v UPDATE HISTOGRAM ON w;
+--echo # Without fix, assert condition fails for following statement in the debug
+--echo # build. Statement executes successfully in the non-debug build.
+CALL p();
+DROP PROCEDURE p;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/binary_to_hex.test mysql-8.0-8.0.27/mysql-test/t/binary_to_hex.test
--- mysql-8.0-8.0.26/mysql-test/t/binary_to_hex.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/binary_to_hex.test	2021-09-28 11:46:34.000000000 +0000
@@ -71,5 +71,23 @@
 #Cleanup
 DROP TABLE t1, t2;
 
+--echo #
+--echo # Bug #32961656: MYSQL CLIENT RETURNS NULL FOR EMPTY STRING WHEN --BINARY-AS-HEX=1
+--echo #
+
+--echo
+--echo # "SELECT _binary''"
+--exec $MYSQL test --binary-as-hex -e "SELECT _binary'';"
+--echo 
+--echo # "SELECT _binary''" XML
+--exec $MYSQL test --binary-as-hex --xml -e "SELECT _binary'';"
+--echo
+--echo # "SELECT _binary''" HTML
+--exec $MYSQL test --binary-as-hex --html -e "SELECT _binary'';"
+--echo
+--echo
+--echo # "SELECT _binary''" VERTICAL
+--exec $MYSQL test --binary-as-hex --vertical -e "SELECT _binary'';"
+
 # Wait till all disconnects are completed
  --source include/wait_until_count_sessions.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/t/cast.test mysql-8.0-8.0.27/mysql-test/t/cast.test
--- mysql-8.0-8.0.26/mysql-test/t/cast.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/cast.test	2021-09-28 11:46:34.000000000 +0000
@@ -1064,3 +1064,16 @@
 SHOW CREATE TABLE t;
 SELECT * FROM t;
 DROP TABLE t;
+
+--echo #
+--echo # Bug#32942327: CAST: ITEM_TYPECAST_UNSIGNED:
+--echo #               ASSERTION `!NULL_VALUE || IS_NULLABLE()' FAILED
+--echo #
+
+CREATE TABLE t (x VARCHAR(10) NOT NULL);
+INSERT INTO t VALUES ('');
+--error ER_CANNOT_CONVERT_STRING
+SELECT CAST(x <= 0x4891f642 AS UNSIGNED) FROM t;
+--error ER_CANNOT_CONVERT_STRING
+SELECT CAST(STRCMP(x, 0x4891f642) AS UNSIGNED) FROM t;
+DROP TABLE t;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/comment_column.test mysql-8.0-8.0.27/mysql-test/t/comment_column.test
--- mysql-8.0-8.0.26/mysql-test/t/comment_column.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/comment_column.test	2021-09-28 11:46:34.000000000 +0000
@@ -6,6 +6,7 @@
 ) COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd';
 SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1';
 SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1' ORDER BY column_comment;
+--sorted_result
 SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1';
 let $ENGINE=`select variable_value from performance_schema.global_variables where variable_name='DEFAULT_STORAGE_ENGINE'`;
 --replace_result $ENGINE ENGINE
@@ -14,6 +15,7 @@
 ALTER TABLE t1 ADD COLUMN c8 INTEGER COMMENT 'ABCdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd';
 SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1';
 SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1' ORDER BY column_comment;
+--sorted_result
 SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1';
 let $ENGINE=`select variable_value from performance_schema.global_variables where variable_name='DEFAULT_STORAGE_ENGINE'`;
 --replace_result $ENGINE ENGINE
@@ -23,6 +25,7 @@
 ALTER TABLE t1 ADD COLUMN c9 INTEGER COMMENT 'ABCDefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd';
 SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1';
 SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1' ORDER BY column_comment;
+--sorted_result
 SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1';
 let $ENGINE=`select variable_value from performance_schema.global_variables where variable_name='DEFAULT_STORAGE_ENGINE'`;
 --replace_result $ENGINE ENGINE
@@ -32,6 +35,7 @@
 ALTER TABLE t1 ADD COLUMN c10 INTEGER COMMENT 'ABCDEfghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd';
 SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1';
 SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1' ORDER BY column_comment;
+--sorted_result
 SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1';
 let $ENGINE=`select variable_value from performance_schema.global_variables where variable_name='DEFAULT_STORAGE_ENGINE'`;
 --replace_result $ENGINE ENGINE
@@ -41,6 +45,7 @@
 ALTER TABLE t1 MODIFY COLUMN c8 CHAR(10);
 SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1';
 SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1' ORDER BY column_comment;
+--sorted_result
 SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1';
 let $ENGINE=`select variable_value from performance_schema.global_variables where variable_name='DEFAULT_STORAGE_ENGINE'`;
 --replace_result $ENGINE ENGINE
@@ -48,6 +53,7 @@
 ALTER TABLE t1 CHANGE COLUMN c9 c9_1 INTEGER COMMENT '1234567890';
 SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1';
 SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1' ORDER BY column_comment;
+--sorted_result
 SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1';
 let $ENGINE=`select variable_value from performance_schema.global_variables where variable_name='DEFAULT_STORAGE_ENGINE'`;
 --replace_result $ENGINE ENGINE
@@ -56,6 +62,7 @@
 ALTER TABLE t1 DROP COLUMN c1;
 SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1';
 SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1' ORDER BY column_comment;
+--sorted_result
 SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1';
 let $ENGINE=`select variable_value from performance_schema.global_variables where variable_name='DEFAULT_STORAGE_ENGINE'`;
 --replace_result $ENGINE ENGINE
@@ -66,6 +73,7 @@
 ALTER TABLE t1 ADD COLUMN c11 INTEGER COMMENT 'ABCDEfghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdABCDEfghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdABCDEfghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd';
 SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1';
 SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1' ORDER BY column_comment;
+--sorted_result
 SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1';
 let $ENGINE=`select variable_value from performance_schema.global_variables where variable_name='DEFAULT_STORAGE_ENGINE'`;
 --replace_result $ENGINE ENGINE
@@ -77,6 +85,7 @@
 ALTER TABLE t1 ADD COLUMN c12 INTEGER COMMENT 'ABCDEfghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdABCDEfghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdABCDEfghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd';
 SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1';
 SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1' ORDER BY column_comment;
+--sorted_result
 SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1';
 let $ENGINE=`select variable_value from performance_schema.global_variables where variable_name='DEFAULT_STORAGE_ENGINE'`;
 --replace_result $ENGINE ENGINE
@@ -86,6 +95,7 @@
 ALTER TABLE t1 ADD COLUMN c12 CHAR(100) COMMENT 'ABCDefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd';
 SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1';
 SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1' ORDER BY column_comment;
+--sorted_result
 SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1';
 let $ENGINE=`select variable_value from performance_schema.global_variables where variable_name='DEFAULT_STORAGE_ENGINE'`;
 --replace_result $ENGINE ENGINE
@@ -98,6 +108,7 @@
 ) COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd';
 SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1';
 SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1' ORDER BY column_comment;
+--sorted_result
 SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1';
 let $ENGINE=`select variable_value from performance_schema.global_variables where variable_name='DEFAULT_STORAGE_ENGINE'`;
 --replace_result $ENGINE ENGINE
@@ -111,6 +122,7 @@
 ) COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd';
 SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1';
 SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1' ORDER BY column_comment;
+--sorted_result
 SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1';
 
 # bug#48077
diff -Nru mysql-8.0-8.0.26/mysql-test/t/component_backup_lock_service.test mysql-8.0-8.0.27/mysql-test/t/component_backup_lock_service.test
--- mysql-8.0-8.0.26/mysql-test/t/component_backup_lock_service.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/component_backup_lock_service.test	2021-09-28 11:46:34.000000000 +0000
@@ -12,3 +12,35 @@
 --echo # during its unloading. Check that BACKUP LOCK has been really released.
 SELECT object_schema, object_name, lock_type, lock_duration, lock_status
 FROM performance_schema.metadata_locks WHERE object_type = 'BACKUP LOCK';
+
+--echo #
+--echo # Bug#33087212: COMPONENT COMPONENT_TEST_BACKUP_LOCK_SERVICE CAUSES
+--echo # CRASH AT SHUTDOWN.
+--echo #
+
+--echo # Verify that it is possible to shut down the server while the
+--echo # component is installed.
+INSTALL COMPONENT 'file://component_test_backup_lock_service';
+
+--echo # shutdown the server from mtr.
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server
+--source include/wait_until_disconnected.inc
+
+--echo # restart the server.
+--exec echo "restart:" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+
+--error ER_COMPONENTS_CANT_LOAD
+INSTALL COMPONENT 'file://component_test_backup_lock_service';
+
+--echo # Check for the presence of BACKUP LOCK. There should not be one
+--echo # since the lock is not re-acquired when the component is reloaded
+--echo # as part of boot.
+SELECT object_schema, object_name, lock_type, lock_duration, lock_status
+FROM performance_schema.metadata_locks WHERE object_type = 'BACKUP LOCK';
+
+--echo # But the component is registered and can be unloaded.
+UNINSTALL COMPONENT 'file://component_test_backup_lock_service';
+
diff -Nru mysql-8.0-8.0.26/mysql-test/t/condition_filter.test mysql-8.0-8.0.27/mysql-test/t/condition_filter.test
--- mysql-8.0-8.0.26/mysql-test/t/condition_filter.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/condition_filter.test	2021-09-28 11:46:34.000000000 +0000
@@ -51,7 +51,7 @@
 eval $query;
 
 --echo # Status from execution should show that filesort was used
---skip_if_hypergraph  # The hypergraph optimizer sorts the entire join currently, not just t1 (no support for interesting orders).
+--skip_if_hypergraph  # The hypergraph optimizer avoids the sort completely.
 SHOW STATUS LIKE 'Sort%';
 
 DROP TABLE t0, t1, t2;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/create.test mysql-8.0-8.0.27/mysql-test/t/create.test
--- mysql-8.0-8.0.26/mysql-test/t/create.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/create.test	2021-09-28 11:46:34.000000000 +0000
@@ -2270,28 +2270,46 @@
 --echo #
 --echo # Bug#32227101: CREATE TABLE PRODUCES CORE
 --echo #
+--echo # Bug#33114368: 'SHOW TABLE STATUS' WITH HUGE AVG_ROW_LENGTH:
+--echo # DD::PROPERTIES::GET: ASSERTION `FALSE' FAILED.
+--echo #
+--echo # These issues are related and arise from insufficient input checking
+--echo # of numeric table options.
+--echo # From bug#33114368 we see that even if no overflow occurs on CREATE,
+--echo # there can be a risk of overflow when the option value is used
+--echo # elsewhere.
+--echo # The safest thing to do is to constrain values to the largest
+--echo # value permitted by the frm-file format (unless the range of the option
+--echo # value has been explicitly changed in 8.0).
+--echo #
+--echo # key_block_size, parser type: signed_num (int)
+--echo # std::uint32_t HA_CREATE_INFO::key_block_size
+--echo # 2 bytes in frm
+--echo # Only settable for myisam, but also used in Innodb
 
---echo # key_block_size = 2^31-1 - rejected by Innodb
---error ER_ILLEGAL_HA
+--echo # key_block_size = 2^31-1 - rejected by explicit check 
+--error ER_PARSE_ERROR
 CREATE TABLE t1(i INT PRIMARY KEY) KEY_BLOCK_SIZE = 2147483647;
 
---echo # key_block_size = -(2^31)+1 - rejected by Innodb
---error ER_ILLEGAL_HA
+--echo # key_block_size = -(2^31)+1 - rejected by parser (parser switched
+--echo # back to using ulong_num now that there is an explicit check).
+--error ER_PARSE_ERROR
 CREATE TABLE t1(i INT PRIMARY KEY) KEY_BLOCK_SIZE = -2147483647;
 
---echo # key_block_size = 2^31 - now rejected by parser
+--echo # key_block_size = 2^31 - rejected by explicit check
 --error ER_PARSE_ERROR
 CREATE TABLE t1(i INT PRIMARY KEY) KEY_BLOCK_SIZE = 2147483648;
 
---echo # key_block_size = -2^31 - now rejected by parser
+--echo # key_block_size = -2^31 - rejected by parser (parser switched
+--echo # back to using ulong_num now that there is an explicit check).
 --error ER_PARSE_ERROR
 CREATE TABLE t1(i INT PRIMARY KEY) KEY_BLOCK_SIZE = -2147483648;
 
---echo # key_block_size = 2^32-1 - now rejected by parser
+--echo # key_block_size = 2^32-1 - rejected by explicit check
 --error ER_PARSE_ERROR
 CREATE TABLE t2(i INT PRIMARY KEY) KEY_BLOCK_SIZE = 4294967295;
 
---echo # key_block_size = 2^32 - now rejected by parser
+--echo # key_block_size = 2^32 - rejected by explicit check
 --error ER_PARSE_ERROR
 CREATE TABLE t3(i INT PRIMARY KEY) KEY_BLOCK_SIZE = 4294967296;
 
@@ -2304,3 +2322,50 @@
 c3 TINYINT(120) ZEROFILL   STORAGE DISK UNIQUE KEY NULL COMMENT 'asdf'
 ) CHECKSUM = 1, AUTO_INCREMENT = 1093400439, KEY_BLOCK_SIZE = 3927749503218772669, COMPRESSION = 'NONE';
 
+--echo # Only values which will fit in the two bytes allocated in the frm file
+--echo # format are accepted.
+CREATE TABLE t1(a INT) ENGINE=myisam key_block_size=65535;
+--replace_column 12 @ts@ 13 @ts@
+SHOW TABLE STATUS LIKE 't1';
+DROP TABLE t1;
+
+
+--echo #
+--echo # Bug #33114368	'SHOW TABLE STATUS' WITH HUGE AVG_ROW_LENGTH:
+--echo # DD::PROPERTIES::GET: ASSERTION `FALSE' FAILED.
+--echo #
+
+--echo # avg_row_length, parser type: ulong_num (ulong) 
+--echo # ulong HA_CREATE_INFO::avg_row_length
+--echo # 4 bytes in frm
+--error ER_PARSE_ERROR
+CREATE TABLE t1(a INT) avg_row_length=18446744073709551615;
+
+--error ER_PARSE_ERROR
+CREATE TABLE t1(a INT) avg_row_length=4294967296;
+
+--echo # Only values which will fit in the four bytes allocated in the frm file
+--echo # format are accepted.
+CREATE TABLE t1(a INT) avg_row_length=4294967295;
+--replace_column 12 @ts@ 13 @ts@
+SHOW TABLE STATUS LIKE 't1';
+DROP TABLE t1;
+
+--echo # max_rows, parser type: ulonglong_num (ulonglong)
+--echo # ulonglong HA_CREATE_INFO::max_rows
+--echo # 4 bytes in frm
+--echo # max_rows is capped and a warning produced
+CREATE TABLE t1(a INT) max_rows=18446744073709551615;
+--replace_column 12 @ts@ 13 @ts@
+SHOW TABLE STATUS LIKE 't1';
+DROP TABLE t1;
+
+--echo # min_rows, parser type: ulonglong_num (ulonglong)
+--echo # ulonglong HA_CREATE_INFO::min_rows
+--echo # 4 bytes in frm
+--echo # min_rows is capped and a warning produced
+CREATE TABLE t1(a INT) min_rows=18446744073709551615;
+--replace_column 12 @ts@ 13 @ts@
+SHOW TABLE STATUS LIKE 't1';
+DROP TABLE t1;
+
diff -Nru mysql-8.0-8.0.26/mysql-test/t/ctype_many.test mysql-8.0-8.0.27/mysql-test/t/ctype_many.test
--- mysql-8.0-8.0.26/mysql-test/t/ctype_many.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/ctype_many.test	2021-09-28 11:46:34.000000000 +0000
@@ -333,7 +333,7 @@
 CREATE TABLE t1 (a CHAR(1) CHARSET UTF8);
 INSERT INTO t1 VALUES ('a'), ('b');
 CREATE TABLE t2 (a BINARY(1));
-INSERT INTO t2 VALUES ('z');
+INSERT INTO t2 VALUES ('x'),('z');
 --error ER_SUBQUERY_NO_1_ROW
 SELECT * FROM t2 WHERE a=(SELECT a FROM t1) AND a=_LATIN1'x';
 DROP TABLE t2;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/ctype_unicode900_casetable.test mysql-8.0-8.0.27/mysql-test/t/ctype_unicode900_casetable.test
--- mysql-8.0-8.0.26/mysql-test/t/ctype_unicode900_casetable.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/ctype_unicode900_casetable.test	2021-09-28 11:46:34.000000000 +0000
@@ -1,5 +1,6 @@
 # This test takes long time, so only run it with the --big-test mtr-flag.
 --source include/big_test.inc
+--source include/not_valgrind.inc
 
 --disable_warnings
 DROP TABLE IF EXISTS t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/dd_upgrade_lctn_cs_lin.test mysql-8.0-8.0.27/mysql-test/t/dd_upgrade_lctn_cs_lin.test
--- mysql-8.0-8.0.26/mysql-test/t/dd_upgrade_lctn_cs_lin.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/dd_upgrade_lctn_cs_lin.test	2021-09-28 11:46:34.000000000 +0000
@@ -166,6 +166,7 @@
 ###############################################################################
 
 --source include/big_test.inc
+--source include/not_valgrind.inc
 --source include/have_case_sensitive_file_system.inc
 
 --echo # This is on a case sensitive file system, so we will support only l_c_t_n = 0 or 1.
diff -Nru mysql-8.0-8.0.26/mysql-test/t/dd_view_columns.test mysql-8.0-8.0.27/mysql-test/t/dd_view_columns.test
--- mysql-8.0-8.0.26/mysql-test/t/dd_view_columns.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/dd_view_columns.test	2021-09-28 11:46:34.000000000 +0000
@@ -16,7 +16,7 @@
 
 PREPARE check_view_columns FROM
   'SELECT table_name, column_name, column_type FROM information_schema.columns
-   WHERE table_name= ?';
+   WHERE table_name= ? ORDER BY table_name, column_name';
 PREPARE check_view_status FROM
   'SELECT table_name, table_comment FROM information_schema.tables WHERE
    table_name= ?';
diff -Nru mysql-8.0-8.0.26/mysql-test/t/derived_condition_pushdown.test mysql-8.0-8.0.27/mysql-test/t/derived_condition_pushdown.test
--- mysql-8.0-8.0.26/mysql-test/t/derived_condition_pushdown.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/derived_condition_pushdown.test	2021-09-28 11:46:34.000000000 +0000
@@ -724,14 +724,17 @@
 
 #Check that condition f1=2 is pushed down to "v"
 --replace_regex /  \(cost=.*//
+--skip_if_hypergraph  # Depends on the query plan.
 EXPLAIN format=tree INSERT INTO t2 SELECT * FROM v WHERE f1=2;
 INSERT INTO t2 SELECT * FROM v WHERE f1=2;
 #Check that condition f1=2 is pushed down to "v"
 --replace_regex /  \(cost=.*//
+--skip_if_hypergraph  # Depends on the query plan.
 EXPLAIN format=tree UPDATE t2 SET f1=3 WHERE f1 IN (SELECT f1 FROM v WHERE f1=2);
 UPDATE t2 SET f1=3 WHERE f1 IN (SELECT f1 FROM v WHERE f1=2);
 #Check that condition f1=3 is pushed down to "v"
 --replace_regex /  \(cost=.*//
+--skip_if_hypergraph  # Depends on the query plan.
 EXPLAIN format=tree DELETE FROM t2 WHERE f1 IN (SELECT f1 FROM v WHERE f1=3);
 DELETE FROM t2 WHERE f1 IN (SELECT f1 FROM v WHERE f1=3);
 
diff -Nru mysql-8.0-8.0.26/mysql-test/t/derived_correlated.test mysql-8.0-8.0.27/mysql-test/t/derived_correlated.test
--- mysql-8.0-8.0.26/mysql-test/t/derived_correlated.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/derived_correlated.test	2021-09-28 11:46:34.000000000 +0000
@@ -1050,3 +1050,46 @@
 set optimizer_switch=DEFAULT;
 
 DROP TABLE t1, t2, t3;
+
+--echo #
+--echo # Bug #32729739: ASSERTION `PATH != NULLPTR' FAILED|SQL/SQL_EXECUTOR.CC
+--echo #
+
+CREATE TABLE t1 ( a INTEGER );
+
+SELECT *
+  FROM
+    t1
+    LEFT JOIN (
+      t1 AS t2
+      LEFT JOIN t1 AS t3 ON TRUE
+    ) ON TRUE,
+    LATERAL (
+      SELECT SUM(t1.a), t2.a FROM t1
+    ) AS d1;
+
+DROP TABLE t1;
+
+--echo #
+--echo # Bug 32407774 - MANY INFORMATION_SCHEMA.TABLE_CONSTRAINTS
+--echo #                RELATED QUERIES ARE BROKEN
+--echo #
+
+CREATE TABLE t1(id int NOT NULL);
+INSERT into t1 VALUES (364), (365);
+
+CREATE TABLE t2 (id int NOT NULL);
+INSERT into t2 VALUES (365);
+
+SELECT * FROM t1 AS tbl1
+       LEFT JOIN t1 AS tbl3 ON FALSE WHERE tbl1.id NOT IN
+            (SELECT id FROM t1 AS tbl2 JOIN LATERAL
+                    (SELECT 1 FROM t2 WHERE id = tbl2.id LIMIT 10) AS d1);
+
+# Expect same result with a join prefix hint
+SELECT /*+ JOIN_PREFIX(tbl1, tbl2) */ * FROM t1 AS tbl1
+       LEFT JOIN t1 AS tbl3 ON FALSE WHERE tbl1.id NOT IN
+            (SELECT id FROM t1 AS tbl2 JOIN LATERAL
+                    (SELECT 1 FROM t2 WHERE id = tbl2.id LIMIT 10) AS d1);
+
+DROP TABLE t1, t2;
\ No newline at end of file
diff -Nru mysql-8.0-8.0.26/mysql-test/t/events_logs_tests-master.opt mysql-8.0-8.0.27/mysql-test/t/events_logs_tests-master.opt
--- mysql-8.0-8.0.26/mysql-test/t/events_logs_tests-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/events_logs_tests-master.opt	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
---log-output=table,file --slow-query-log
diff -Nru mysql-8.0-8.0.26/mysql-test/t/events_logs_tests.test mysql-8.0-8.0.27/mysql-test/t/events_logs_tests.test
--- mysql-8.0-8.0.26/mysql-test/t/events_logs_tests.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/events_logs_tests.test	2021-09-28 11:46:34.000000000 +0000
@@ -1,4 +1,5 @@
-
+SET @old_log_output = @@global.log_output;
+SET GLOBAL log_output="FILE,TABLE";
 --disable_warnings
 drop database if exists events_test;
 --enable_warnings
@@ -87,3 +88,6 @@
   select count(*) = 0 from information_schema.processlist
   where db='events_test' and command = 'Connect' and user=current_user();
 --source include/wait_condition.inc
+SET GLOBAL log_output = @old_log_output;
+truncate table mysql.general_log;
+truncate table mysql.slow_log;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/examined_rows.test mysql-8.0-8.0.27/mysql-test/t/examined_rows.test
--- mysql-8.0-8.0.26/mysql-test/t/examined_rows.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/examined_rows.test	2021-09-28 11:46:34.000000000 +0000
@@ -102,3 +102,5 @@
 SET @@global.slow_query_log=@old_slow_query_log;
 SET @@global.log_output=@old_log_output;
 SET @@session.long_query_time=@old_long_query_time;
+truncate table mysql.general_log;
+truncate table mysql.slow_log;
\ No newline at end of file
diff -Nru mysql-8.0-8.0.26/mysql-test/t/explain_tree.test mysql-8.0-8.0.27/mysql-test/t/explain_tree.test
--- mysql-8.0-8.0.26/mysql-test/t/explain_tree.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/explain_tree.test	2021-09-28 11:46:34.000000000 +0000
@@ -268,10 +268,8 @@
 ) ON t1.a = t4d.a;
 DROP TABLE t1, t2, t3, t4;
 
-# Demonstrate a shortcoming in printing table iterators on MaterializeIterator;
-# we're not showing the sub-iterator for the WHERE subquery, just marking it as
-# “other sub-iterators not shown�. See MaterializeIterator::DebugString() for
-# more information.
+# Demontrate that we can print the sub-iterator for the WHERE subquery
+# that originally came from a table path.
 CREATE TABLE t1 ( f1 INTEGER );
 EXPLAIN FORMAT=TREE SELECT * FROM ( SELECT * FROM t1 LIMIT 2 OFFSET 1 ) AS alias1
   WHERE f1 <= ANY ( SELECT f1 FROM t1 ) ORDER BY f1;
@@ -490,6 +488,31 @@
 # one of them. The LIMIT is to avoid temporary table merging.
 CREATE TABLE t1 (a INTEGER);
 INSERT INTO t1 VALUES (1), (2), (3), (4), (5);
+ANALYZE TABLE t1;
 --replace_regex /time=\d+\.\d+\.\.\d+\.\d+/time=N.NNN..N.NNN/
 EXPLAIN ANALYZE SELECT * FROM t1 LEFT JOIN ( SELECT * FROM t1 ORDER BY t1.a LIMIT 3 ) d1 ON TRUE;
 DROP TABLE t1;
+
+--echo #
+--echo # Bug #32915233: RECENT REGRESSION:ASSERTION `EXPLAIN.CHILDREN.SIZE() <= 1' FAILED.
+--echo #
+
+# Sets up an AlternativeIterator in the table access path.
+CREATE TABLE t1 (a int);
+SET sql_mode='';
+EXPLAIN FORMAT=tree SELECT a IN (SELECT a FROM (table t1) AS d) FROM t1 GROUP BY (@b:=5);
+SET sql_mode=DEFAULT;
+DROP TABLE t1;
+
+--echo #
+--echo # Bug #33030136: EXPLAIN: ASSERTION `CURRENT_THD->LEX->USING_HYPERGRAPH_OPTIMIZER' FAILED.
+--echo #
+
+CREATE TABLE t1 (a INTEGER);
+
+EXPLAIN FORMAT=tree
+  (SELECT 1 FROM t1)
+  UNION ALL
+  SELECT 1 IN (SELECT 1 FROM t1) FROM t1 WHERE 1=2;
+
+DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/filesort_debug.test mysql-8.0-8.0.27/mysql-test/t/filesort_debug.test
--- mysql-8.0-8.0.26/mysql-test/t/filesort_debug.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/filesort_debug.test	2021-09-28 11:46:34.000000000 +0000
@@ -16,7 +16,6 @@
 (6,"6"),(7,"7"),(8,"8"),(9,"9"),(10,"10");
 
 set debug= '+d,bounded_queue_init_fail';
---skip_if_hypergraph   # Does not support priority queue, so also does not get the error.
 --replace_regex /Needed [0-9]* bytes/Needed NN bytes/
 --error 5
 SELECT * FROM t1 ORDER BY f1 ASC, f0 LIMIT 1;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/filesort.test mysql-8.0-8.0.27/mysql-test/t/filesort.test
--- mysql-8.0-8.0.26/mysql-test/t/filesort.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/filesort.test	2021-09-28 11:46:34.000000000 +0000
@@ -174,3 +174,18 @@
 INSERT INTO t1 VALUES ('8');
 SELECT 'a' AS f1 FROM t1 WHERE a='8' GROUP BY f1 ORDER BY CONCAT(f1);
 DROP TABLE t1;
+
+--echo #
+--echo # Bug #33030289 REGRESSION: ASSERTION `REC_SZ <= M_ELEMENT_SIZE' FAILED.
+--echo #
+
+CREATE TABLE t(a DECIMAL(55,19) NOT NULL);
+INSERT INTO t VALUES(0),(1),(2),(3),(4),(5);
+--error ER_GIS_INVALID_DATA
+SELECT
+(
+  SELECT 1 FROM t
+  ORDER BY ST_HAUSDORFFDISTANCE(a, ST_ASTEXT(1,'axis-order=lat-long')), a
+  LIMIT 1
+);
+DROP TABLE t;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/foreign_key.test mysql-8.0-8.0.27/mysql-test/t/foreign_key.test
--- mysql-8.0-8.0.26/mysql-test/t/foreign_key.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/foreign_key.test	2021-09-28 11:46:34.000000000 +0000
@@ -4705,3 +4705,19 @@
 /*! ALTER TABLE child ADD FOREIGN KEY (fk) REFERENCES parent(pk) */;
 SHOW CREATE TABLE child;
 DROP TABLES child, parent;
+
+
+--echo #
+--echo # Bug#33114045 - TRANSFER_PREEXISTING_FOREIGN_KEYS: ASSERTION `!FIND->IS_VIRTUAL_GCOL()'
+--echo #                FAILED.
+--echo # Assertion to make sure foreign key is referencing non-virtual column failed.
+--echo #
+CREATE TABLE t (a INT KEY, b INT NOT NULL UNIQUE KEY,
+                CONSTRAINT FOREIGN KEY (a) REFERENCES t(b));
+--echo # Without fix, assertion fails for the following ALTER TABLE statements in
+--echo # the debug build. Statements executes successfully in the non-debug build.
+--error ER_DUP_FIELDNAME
+ALTER TABLE t ADD COLUMN a INT GENERATED ALWAYS AS (1) FIRST;
+--error ER_DUP_FIELDNAME
+ALTER TABLE t ADD COLUMN b INT GENERATED ALWAYS AS (1) FIRST;
+DROP TABLE t;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/fulltext.test mysql-8.0-8.0.27/mysql-test/t/fulltext.test
--- mysql-8.0-8.0.26/mysql-test/t/fulltext.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/fulltext.test	2021-09-28 11:46:34.000000000 +0000
@@ -26,7 +26,9 @@
 # nl search
 # Also tests FORMAT=tree printing of full-text search iterators.
 
+--skip_if_hypergraph  # Does not add a redundant filter on top.
 EXPLAIN FORMAT=tree select * from t1 where MATCH(a,b) AGAINST ("collections");
+--sorted_result
 select * from t1 where MATCH(a,b) AGAINST ("collections");
 explain select * from t1 where MATCH(a,b) AGAINST ("collections");
 select * from t1 where MATCH(a,b) AGAINST ("indexes");
@@ -35,8 +37,10 @@
 
 # query expansion
 
+--sorted_result
 select * from t1 where MATCH(a,b) AGAINST ("collections" WITH QUERY EXPANSION);
 select * from t1 where MATCH(a,b) AGAINST ("indexes" WITH QUERY EXPANSION);
+--sorted_result
 select * from t1 where MATCH(a,b) AGAINST ("indexes collections" WITH QUERY EXPANSION);
 
 # IN NATURAL LANGUAGE MODE
@@ -97,6 +101,7 @@
 select * from t1 where MATCH b AGAINST ("sear*" IN BOOLEAN MODE);
 
 # UNION of fulltext's
+--sorted_result
 select * from t1 where MATCH(a,b) AGAINST ("collections") UNION ALL select * from t1 where MATCH(a,b) AGAINST ("indexes");
 
 #update/delete with fulltext index
@@ -112,11 +117,15 @@
 #
 create table t1 (a varchar(200) not null, fulltext (a));
 insert t1 values ("aaa10 bbb20"), ("aaa20 bbb15"), ("aaa30 bbb10");
+--sorted_result
 select * from t1 where match a against ("+aaa* +bbb*" in boolean mode);
+--sorted_result
 select * from t1 where match a against ("+aaa* +bbb1*" in boolean mode);
 select * from t1 where match a against ("+aaa* +ccc*" in boolean mode);
 select * from t1 where match a against ("+aaa10 +(bbb*)" in boolean mode);
+--sorted_result
 select * from t1 where match a against ("+(+aaa* +bbb1*)" in boolean mode);
+--sorted_result
 select * from t1 where match a against ("(+aaa* +bbb1*)" in boolean mode);
 drop table t1;
 
@@ -225,6 +234,7 @@
 SELECT * from t1 where MATCH (b) AGAINST ('apples');
 
 insert into t1 values (2,"fullaaa fullzzz");
+--sorted_result
 select * from t1 where match b against ('full*' in boolean mode);
 
 drop table t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/func_group.test mysql-8.0-8.0.27/mysql-test/t/func_group.test
--- mysql-8.0-8.0.26/mysql-test/t/func_group.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/func_group.test	2021-09-28 11:46:34.000000000 +0000
@@ -1430,3 +1430,38 @@
 EXECUTE evc USING @vc;
 
 DROP TABLE t1;
+
+--echo #
+--echo # Bug#32552332 - CAN'T WRITE; DUPLICATE KEY IN TABLE '/TMP/#SQL...'
+--echo #
+
+CREATE TABLE tr (c1 INT);
+INSERT INTO tr VALUES (1);
+
+# Generates a integer sequence from 1 to 2 and repeats
+DELIMITER |;
+CREATE FUNCTION seq_1_to_2() RETURNS INT
+BEGIN
+  DECLARE limit_value, return_value INT;
+  SET limit_value = 2;
+  SELECT c1 INTO return_value FROM tr;
+  IF (return_value < limit_value) THEN
+     UPDATE tr SET c1 = c1 + 1;
+  ELSE
+     UPDATE tr SET c1 = 1;
+  END IF;
+  RETURN (return_value);
+END|
+DELIMITER ;|
+
+CREATE TABLE t1 (c1 INT);
+INSERT INTO t1 VALUES (10);
+INSERT INTO t1 VALUES (11);
+
+SELECT seq_1_to_2() as seq, COUNT(*) FROM t1 GROUP BY seq;
+SELECT FLOOR(seq_1_to_2() * 2) AS val, COUNT(*) FROM t1 GROUP BY val;
+SELECT val, COUNT(*) FROM (SELECT FLOOR(seq_1_to_2())+1 val FROM t1) x
+  GROUP BY x.val;
+
+DROP TABLE t1, tr;
+DROP FUNCTION seq_1_to_2;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/func_if.test mysql-8.0-8.0.27/mysql-test/t/func_if.test
--- mysql-8.0-8.0.26/mysql-test/t/func_if.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/func_if.test	2021-09-28 11:46:34.000000000 +0000
@@ -283,3 +283,11 @@
 
 DO GROUP_CONCAT(NULLIF(ELT(1, @e), POINT(250,41)) ORDER BY 1);
 
+--echo # Bug#32816305: Prepare type checking error
+
+CREATE TABLE t (t_date DATETIME NULL);
+PREPARE ps FROM 'INSERT INTO t SET t_date = NULLIF(?, '''')';
+SET @t_date = NOW();
+EXECUTE ps USING @t_date;
+DEALLOCATE PREPARE ps;
+DROP TABLE t;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/func_math.test mysql-8.0-8.0.27/mysql-test/t/func_math.test
--- mysql-8.0-8.0.26/mysql-test/t/func_math.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/func_math.test	2021-09-28 11:46:34.000000000 +0000
@@ -1246,3 +1246,26 @@
 SELECT a, 1-a FROM t1;
 
 DROP TABLE t1;
+
+--echo # Bug#31641064: Decimal returned function value overflow with GROUP BY
+
+CREATE TABLE t1(c1 INTEGER, c2 INTEGER);
+INSERT INTO t1 VALUES(97, 1);
+SET SQL_MODE='';
+SELECT 27 DIV (c2/c1) / 17 AS c1 FROM t1 GROUP BY c1;
+SELECT 27 DIV CAST(c2/c1 AS CHAR) / 17 AS c1 FROM t1 GROUP BY c1;
+SELECT 27 DIV CAST(c2/c1 AS DOUBLE) / 17 AS c1 FROM t1 GROUP BY c1;
+SET SQL_MODE=DEFAULT;
+DROP TABLE t1;
+
+--echo # Bug#32863037: Assertion `scale >= 0 && precision > 0 &&
+--echo #               scale <= precision' failed
+
+SELECT * FROM (SELECT -TRUE AS a, --TRUE AS b) AS dt;
+
+--echo # Bug#33142010: Failure on complex const argument to string functions
+
+CREATE VIEW v AS SELECT -(1 NOT IN (0)) AS c;
+SHOW CREATE TABLE v;
+SELECT * FROM v;
+DROP VIEW v;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/func_regexp.test mysql-8.0-8.0.27/mysql-test/t/func_regexp.test
--- mysql-8.0-8.0.26/mysql-test/t/func_regexp.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/func_regexp.test	2021-09-28 11:46:34.000000000 +0000
@@ -132,3 +132,48 @@
 --error ER_REGEXP_INTERNAL_ERROR
 SELECT '1' RLIKE RPAD('1', 10000, '(');
 --enable_result_log
+
+--echo # Bug#33089668: Calling regexp_instr() with NULL causes all
+--echo #               further calls of it to return NULL
+
+SELECT REGEXP_INSTR(e, 'pattern')
+FROM (VALUES ROW('Find pattern'), ROW(NULL), ROW('Find pattern')) AS v(e);
+
+SELECT REGEXP_LIKE(e, 'pattern')
+FROM (VALUES ROW('Find pattern'), ROW(NULL), ROW('Find pattern')) AS v(e);
+
+SELECT REGEXP_REPLACE(e, 'pattern', 'xyz')
+FROM (VALUES ROW('Find pattern'), ROW(NULL), ROW('Find pattern')) AS v(e);
+
+SELECT REGEXP_SUBSTR(e, 'pattern')
+FROM (VALUES ROW('Find pattern'), ROW(NULL), ROW('Find pattern')) AS v(e);
+
+CREATE FUNCTION r_instr(input_text VARCHAR(255)) RETURNS INT DETERMINISTIC
+    RETURN REGEXP_INSTR(input_text, 'pattern');
+SELECT r_instr('Find pattern');
+SELECT r_instr(NULL);
+SELECT r_instr('Find pattern');
+DROP FUNCTION r_instr;
+
+CREATE FUNCTION r_like(input_text VARCHAR(255)) RETURNS BOOLEAN DETERMINISTIC
+    RETURN REGEXP_LIKE(input_text, 'pattern');
+SELECT r_like('Find pattern');
+SELECT r_like(NULL);
+SELECT r_like('Find pattern');
+DROP FUNCTION r_like;
+
+CREATE FUNCTION r_replace(input_text VARCHAR(255))
+RETURNS VARCHAR(255) DETERMINISTIC
+    RETURN REGEXP_REPLACE(input_text, 'pattern', 'xyz');
+SELECT r_replace('Find pattern');
+SELECT r_replace(NULL);
+SELECT r_replace('Find pattern');
+DROP FUNCTION r_replace;
+
+CREATE FUNCTION r_substr(input_text VARCHAR(255))
+RETURNS VARCHAR(255) DETERMINISTIC
+    RETURN REGEXP_SUBSTR(input_text, 'pattern');
+SELECT r_substr('Find pattern');
+SELECT r_substr(NULL);
+SELECT r_substr('Find pattern');
+DROP FUNCTION r_substr;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/func_str.test mysql-8.0-8.0.27/mysql-test/t/func_str.test
--- mysql-8.0-8.0.26/mysql-test/t/func_str.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/func_str.test	2021-09-28 11:46:34.000000000 +0000
@@ -2257,3 +2257,102 @@
 
 --error ER_CANNOT_CONVERT_STRING
 DO ST_SRID(LOCATE(0x58ed0b8e,8,135));
+
+--echo #
+--echo # Bug #32864958 ITEM_STR_FUNC::PUSH_PACKET_OVERFLOW_WARNING:
+--echo #               ASSERTION `IS_NULLABLE()' FAILED.
+
+--source include/turn_off_strict_mode.inc
+
+--error ER_DATA_OUT_OF_RANGE
+DO NOT CAST(UTC_TIME AS CHAR(2877246026) CHARACTER SET ujis);
+
+DO REPEAT(LAST_INSERT_ID(''), 4294967295);
+
+DO REPEAT(LAST_INSERT_ID(''), 0x96e4ed7e70a7fec7f11572c8980a);
+
+--source include/restore_strict_mode.inc
+
+--echo # Bug#33142010: Failure on complex const argument to string functions
+
+CREATE VIEW v AS SELECT LPAD('x', 1 NOT IN (0), 1) AS c;
+SHOW CREATE TABLE v;
+SELECT * FROM v;
+DROP VIEW v;
+
+CREATE VIEW v AS SELECT RPAD('x', 1 NOT IN (0), 1) AS c;
+SHOW CREATE TABLE v;
+SELECT * FROM v;
+DROP VIEW v;
+
+CREATE VIEW v AS SELECT SHA2('x', 1 NOT IN (0)) AS c;
+SHOW CREATE TABLE v;
+SELECT * FROM v;
+DROP VIEW v;
+
+CREATE VIEW v AS SELECT SUBSTR('x', 1 NOT IN (0)) AS c;
+SHOW CREATE TABLE v;
+SELECT * FROM v;
+DROP VIEW v;
+
+CREATE VIEW v AS SELECT SUBSTR('x', 1, 1 NOT IN (0)) AS c;
+SHOW CREATE TABLE v;
+SELECT * FROM v;
+DROP VIEW v;
+
+CREATE VIEW v AS SELECT REPEAT('x', 1 NOT IN (0)) AS c;
+SHOW CREATE TABLE v;
+SELECT * FROM v;
+DROP VIEW v;
+
+CREATE VIEW v AS SELECT SPACE(1 NOT IN (0)) AS c;
+SHOW CREATE TABLE v;
+SELECT * FROM v;
+DROP VIEW v;
+
+CREATE VIEW v AS SELECT LEFT('x', 1 NOT IN (0)) AS c;
+SHOW CREATE TABLE v;
+SELECT * FROM v;
+DROP VIEW v;
+
+CREATE VIEW v AS SELECT RIGHT('x', 1 NOT IN (0)) AS c;
+SHOW CREATE TABLE v;
+SELECT * FROM v;
+DROP VIEW v;
+
+CREATE TABLE t(s SET('0', '1'));
+CREATE VIEW v AS SELECT FIND_IN_SET(1 NOT IN (0), s) AS c FROM t;
+SHOW CREATE TABLE v;
+SELECT * FROM v;
+DROP VIEW v;
+DROP TABLE t;
+
+CREATE VIEW v AS SELECT STR_TO_DATE('2020', 1 NOT IN (0)) AS c;
+SHOW CREATE TABLE v;
+SELECT * FROM v;
+DROP VIEW v;
+
+--echo #
+--echo # Bug #33180446 SPACE(): Item_str_func::push_packet_overflow_warning:
+--echo #               Assertion `is_nullable()' failed.
+
+# set_nullable(is_nullable() || thd->is_strict_mode());
+--source include/turn_off_strict_mode.inc
+
+SELECT space(9223372036854775808);
+SELECT length(space(9223372036854775809));
+
+CREATE TABLE t(i BIGINT UNSIGNED);
+INSERT INTO t values(9223372036854775808);
+
+SELECT space(i) FROM t;
+
+DROP TABLE t;
+
+SET @@collation_connection = 'utf32_bin';
+
+SELECT space(1073741824);
+
+SET @@collation_connection = default;
+
+--source include/restore_strict_mode.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/t/functional_index_debug.test mysql-8.0-8.0.27/mysql-test/t/functional_index_debug.test
--- mysql-8.0-8.0.26/mysql-test/t/functional_index_debug.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/functional_index_debug.test	2021-09-28 11:46:34.000000000 +0000
@@ -65,11 +65,24 @@
 SET SESSION debug="+d,show_hidden_columns";
 CREATE TABLE t1(j json, INDEX mv_idx((CAST(j AS UNSIGNED ARRAY))));
 SHOW CREATE TABLE t1;
-SELECT 680963a1f6dcb151c3e713b46b4c3452 FROM t1 ;
-EXPLAIN SELECT 680963a1f6dcb151c3e713b46b4c3452 FROM t1 ;
+SELECT `!hidden!mv_idx!0!0` FROM t1;
+EXPLAIN SELECT `!hidden!mv_idx!0!0` FROM t1 ;
 SET SESSION debug="-d,show_hidden_columns";
 DROP TABLE t1;
 
+# Ensure that we are allowed to create a functional index with a name
+# as long as the maximum column name length (64). The index name will
+# be truncated in the hidden column names in that case.
+CREATE TABLE t(
+  x INT,
+  KEY this_is_a_very_long_index_name_in_fact_it_is_64_characters_long_
+  ((x+1), (x+2), (x+3))
+);
+SET SESSION debug='+d,show_hidden_columns';
+SHOW CREATE TABLE t;
+SET SESSION debug='-d,show_hidden_columns';
+DROP TABLE t;
+
 --echo #
 --echo # Bug#28037195 ASSERTION `FALSE' IN IN
 --echo #              ITEM_FIELD::REPLACE_FIELD_PROCESSOR AT SQL_TABLE.CC:5850
@@ -142,16 +155,13 @@
   col1 INT
 , INDEX myKey ((ABS(col1))));
 
---echo # Get the expected name of the hidden generated column.
-SELECT MD5(CONCAT("myKey", "0"));
-
 SET SESSION debug="+d,show_hidden_columns";
 
 --echo # Column names aren't case sensitive, so this DDL should find the column
 --echo # and give an error saying that the column cannot be removed due to
 --echo # functional index.
 --error ER_CANNOT_DROP_COLUMN_FUNCTIONAL_INDEX
-ALTER TABLE t1 DROP COLUMN 84A85350b439e4a8875061c9b8a13f70;
+ALTER TABLE t1 DROP COLUMN `!HIdDEN!MYkEY!0!0`;
 SHOW CREATE TABLE t1;
 
 --echo # Index names aren't case sensitive, so this DDL should rename the index
diff -Nru mysql-8.0-8.0.26/mysql-test/t/functional_index.test mysql-8.0-8.0.27/mysql-test/t/functional_index.test
--- mysql-8.0-8.0.26/mysql-test/t/functional_index.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/functional_index.test	2021-09-28 11:46:34.000000000 +0000
@@ -95,17 +95,26 @@
 CREATE INDEX idx1 ON t1 (col1, (col1 + col2));
 SHOW KEYS FROM t1;
 
---echo # Create a funtional index with many functional key parts
-# NOTE: Enable when bug#27168185 is fixed
-# CREATE INDEX idx2 ON t1 (col1 + 1, col1 + 2, col1 + 3, col1 + 4, col1 + 5);
+--echo # Create a functional index with many functional key parts. Bug#27168185.
+CREATE INDEX idx2
+  ON t1 ((col1 + 1), (col1 + 2), (col1 + 3), (col1 + 4), (col1 + 5));
 
 --echo # Check that if we try to add a column with the same name as a hidden
 --echo # column, we get an internal error. The column name of the generated
---echo # column is calculated as MD5(index_name + key_part_number).
-SELECT MD5(CONCAT("idx1", "1"));
+--echo # column is `!hidden!index_name!key_part!counter`.
 
 --error ER_INTERNAL_ERROR
-ALTER TABLE t1 ADD COLUMN `56fb28970273a50c6f31dec0fe3b175b` INT NOT NULL;
+ALTER TABLE t1 ADD COLUMN `!hidden!idx1!1!0` INT NOT NULL;
+
+# Conversely, adding a column which the same name that a future
+# functional index will pick, does not prevent the index from being
+# added.
+ALTER TABLE t1 ADD COLUMN `!hidden!idx3!0!0` INT NOT NULL;
+CREATE INDEX idx3 ON t1 ((col1-col2));
+# The index will just have incremented the counter at the end of the name.
+# Thus, this will fail:
+--error ER_INTERNAL_ERROR
+ALTER TABLE t1 ADD COLUMN `!hidden!idx3!0!1` INT NOT NULL;
 
 DROP TABLE t1;
 
@@ -224,11 +233,9 @@
 
 CREATE TABLE t1 (col1 INT, INDEX idx1 ((col1 + col1)));
 
---echo # Get the expected name of the hidden generated column.
-SELECT MD5(CONCAT("idx1", "0"));
-
+--echo # Update the hidden generated column.
 --error ER_BAD_FIELD_ERROR
-UPDATE t1 SET 45197ac678c1210c4a64bf22351853e7 = 123;
+UPDATE t1 SET `!hidden!idx1!0!0` = 123;
 DROP TABLE t1;
 
 --echo #
@@ -238,11 +245,8 @@
 CREATE TABLE t3 (c1 INT);
 CREATE INDEX int_func_index ON t3 ((ABS(c1)));
 
---echo # Get the expected column name of the functional index
-SELECT MD5(CONCAT('int_func_index', '0'));
-
 --error ER_BAD_FIELD_ERROR
-SELECT * FROM t3 WHERE 7cf759b4f03e729c90aa40cc68dd8780=1;
+SELECT * FROM t3 WHERE `!hidden!int_func_index!0!0`=1;
 DROP TABLE t3;
 
 --echo #
diff -Nru mysql-8.0-8.0.26/mysql-test/t/func_weight_string.test mysql-8.0-8.0.27/mysql-test/t/func_weight_string.test
--- mysql-8.0-8.0.26/mysql-test/t/func_weight_string.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/func_weight_string.test	2021-09-28 11:46:34.000000000 +0000
@@ -95,8 +95,19 @@
 --echo #
 --echo # BUG#11898467 - SERVER CRASHES ON SELECT HEX(WEIGHT_STRING(STR AS [CHAR|BINARY](N))) IF N IS BIG 
 --echo #
-SELECT HEX(WEIGHT_STRING('ab' AS CHAR(1000000000000000000))); 
-SELECT HEX(WEIGHT_STRING('ab' AS BINARY(1000000000000000000))); 
+
+--source include/count_sessions.inc
+SET GLOBAL max_allowed_packet=1024;
+
+connect (con1,localhost,root,,);
+
+SELECT HEX(WEIGHT_STRING('ab' AS CHAR(1000000))); 
+SELECT HEX(WEIGHT_STRING('ab' AS BINARY(1000000))); 
+
+connection default;
+disconnect con1;
+
+SET GLOBAL max_allowed_packet=default;
 
 --echo #
 --echo # BUG#21974321: WEIGHT_STRING RESULT IS WRONG IF USED IN A
diff -Nru mysql-8.0-8.0.26/mysql-test/t/gis-precise.test mysql-8.0-8.0.27/mysql-test/t/gis-precise.test
--- mysql-8.0-8.0.26/mysql-test/t/gis-precise.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/gis-precise.test	2021-09-28 11:46:34.000000000 +0000
@@ -672,11 +672,12 @@
 --echo # Bug #19784515  ASSERTION `DIM1 >= 0 && DIM1 <= 2 && DIM2 >= 0 && DIM2 <= 2' FAILED
 --echo #
 --echo # Invalid geometry in input
+#--error ER_GIS_INVALID_DATA
 set @centroid_point = ST_CENTROID(ST_UNION(ST_UNION(ST_GEOMFROMTEXT('MULTILINESTRING((-556 966,-721 -210),(-202 390,-954 804,682 504,-394 -254,832 371,907 -369,827 126,-567 -337,-304 -555,-957 -483,-660 792),(-965 -940,814 -804,-477 -909,-128 57,-819 880,761 497,-559 40,-431 427,179 -291,-707 315,137 -781,-416 -371,-5 -156),(-600 -570,-481 -191,991 -361,768 888,-647 566,795 -861,-82 -575,-593 539))'), ST_GEOMFROMTEXT('MULTIPOLYGON(((805 69,249 708,147 455,546 -672,-218 843,458 24,-630 -420,-83 -69, 805 69)),((196 -219,-201 663,-867 521,-910 -315,-749 801,-402 820,-167 -817,-526 -163,744 -988,-588 -370,573 695,-597 513,-246 439, 196 -219)),((32 -903,189 -871,-778 -741,784 340,403 -555,607 -540,-513 -982,700 -124,344 732,714 151,-812 -252,-440 -895,-426 231,-819 -357, 32 -903)),((-395 830,454 -143,788 -279,618 -843,-490 -507,-224 17, -395 830)))')), ST_INTERSECTION(ST_UNION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(-169 -570),MULTIPOINT(384 290,-601 123,408 86,-616 -300,160 -474,-979 -4,-63 -824,-689 -765,-219 802,-54 -93,191 -982,-723 -449),MULTILINESTRING((683 4,864 -634,548 -891,727 -691,-570 32,-334 -438,127 -317,241 -12,-807 947,-987 693,-345 -867,854 -106)),MULTIPOINT(384 290,-601 123,408 86,-616 -300,160 -474,-979 -4,-63 -824,-689 -765,-219 802,-54 -93,191 -982,-723 -449),MULTIPOLYGON(((266 51,851 523,-781 366,-607 -581, 266 51)),((416 -450,-973 880,103 226,-896 -857,-369 761, 416 -450)),((168 171,26 -99,-606 -490,-174 -138,-325 -218,-833 -652,-255 -445,-882 -762,-202 -560, 168 171)),((-423 -216,-531 -190,-147 821,362 441,645 -128,-997 708,134 -426,714 -9,147 842,-887 -870,688 -330,689 17,-314 -262,401 -112,-606 761, -423 -216)),((-582 -373,-360 -84,-727 -171,412 -660,750 -846,-464 718,163 -11,489 -659,586 -324,-741 -198,144 -165,644 -80,930 -487,-504 -205, -582 -373))),MULTIPOLYGON(((266 51,851 523,-781 366,-607 -581, 266 51)),((416 -450,-973 880,103 226,-896 -857,-369 761, 416 -450)),((168 171,26 -99,-606 -490,-174 -138,-325 -218,-833 -652,-255 -445,-882 -762,-202 -560, 168 171)),((-423 -216,-531 -190,-147 821,362 441,645 -128,-997 708,134 -426,714 -9,147 842,-887 -870,688 -330,689 17,-314 -262,401 -112,-606 761, -423 -216)),((-582 -373,-360 -84,-727 -171,412 -660,750 -846,-464 718,163 -11,489 -659,586 -324,-741 -198,144 -165,644 -80,930 -487,-504 -205, -582 -373))),GEOMETRYCOLLECTION(),MULTIPOINT(384 290,-601 123,408 86,-616 -300,160 -474,-979 -4,-63 -824,-689 -765,-219 802,-54 -93,191 -982,-723 -449),MULTILINESTRING((683 4,864 -634,548 -891,727 -691,-570 32,-334 -438,127 -317,241 -12,-807 947,-987 693,-345 -867,854 -106)))'), ST_GEOMFROMTEXT('MULTIPOINT(157 69,-725 -189,-176 -41,676 375,33 -672,-76 47)')), ST_UNION(ST_ENVELOPE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(-896 100,-793 810,243 -525,650 -373,599 170,-554 -890),POINT(945 -828),POINT(945 -828),LINESTRING(-896 100,-793 810,243 -525,650 -373,599 170,-554 -890),POINT(945 -828),MULTIPOINT(-47 307,-768 -425,-3 167,-170 30,-784 721,951 146,407 790,37 850,-466 738),GEOMETRYCOLLECTION(),MULTIPOINT(-47 307,-768 -425,-3 167,-170 30,-784 721,951 146,407 790,37 850,-466 738),MULTIPOLYGON(((104 113,688 423,-859 602,272 978, 104 113)),((981 -394,189 -400,649 -325,-977 371,30 859,590 318,329 -894,-51 262,197 952,-846 -139,-920 399, 981 -394)),((-236 -759,834 757,857 747,437 -146,194 913,316 862,976 -491,-745 933,610 687,-149 -164,-803 -565,451 -275, -236 -759)),((572 96,-160 -607,529 930,-544 -132,458 294, 572 96))))')), ST_CENTROID(ST_GEOMFROMTEXT('POINT(-939 -921)'))))));
 
-SELECT ST_AsText(@centroid_point) as centroid;
+DO ST_AsText(@centroid_point) as centroid;
 
-SELECT MBRWITHIN(@centroid_point, ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((541 -927,-414 316,-429 -444,212 260,-125 104,445 563,-713 -975,-976 514),(-830 882,-377 914,-915 919,-535 -23,-508 979),(806 347,-87 220,226 -22,-12 468,707 598,83 951,-592 701,833 964,270 -932,743 -514,231 469,-575 -122,-99 -245,416 465,801 -587))'), ST_GEOMFROMTEXT('LINESTRING(-96 -182,-373 75,697 687,-881 -463,-557 -959,-493 810)'))) as result;
+DO MBRWITHIN(@centroid_point, ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((541 -927,-414 316,-429 -444,212 260,-125 104,445 563,-713 -975,-976 514),(-830 882,-377 914,-915 919,-535 -23,-508 979),(806 347,-87 220,226 -22,-12 468,707 598,83 951,-592 701,833 964,270 -932,743 -514,231 469,-575 -122,-99 -245,416 465,801 -587))'), ST_GEOMFROMTEXT('LINESTRING(-96 -182,-373 75,697 687,-881 -463,-557 -959,-493 810)'))) as result;
 
 --echo # 
 --echo # Bug #19566186  ST_Length RETURNS NON-INF VALUE ON 32BIT PLATFORMS FOR LINESTRING OF INF LENGTH
@@ -899,12 +900,13 @@
 --echo # Bug #20073238  WL7541: MEMORY ISSUE FOUND BY VALGRIND AND MANUAL INSPECTION
 --echo #
 --echo # Invalid geometry in input
+#--error ER_GIS_INVALID_DATA
 set @centroid_point = ST_CENTROID(ST_UNION(ST_UNION(ST_GEOMFROMTEXT('MULTILINESTRING((-556 966,-721 -210),(-202 390,-954 804,682 504,-394 -254,832 371,907 -369,827 126,-567 -337,-304 -555,-957 -483,-660 792),(-965 -940,814 -804,-477 -909,-128 57,-819 880,761 497,-559 40,-431 427,179 -291,-707 315,137 -781,-416 -371,-5 -156),(-600 -570,-481 -191,991 -361,768 888,-647 566,795 -861,-82 -575,-593 539))'), ST_GEOMFROMTEXT('MULTIPOLYGON(((805 69,249 708,147 455,546 -672,-218 843,458 24,-630 -420,-83 -69, 805 69)),((196 -219,-201 663,-867 521,-910 -315,-749 801,-402 820,-167 -817,-526 -163,744 -988,-588 -370,573 695,-597 513,-246 439, 196 -219)),((32 -903,189 -871,-778 -741,784 340,403 -555,607 -540,-513 -982,700 -124,344 732,714 151,-812 -252,-440 -895,-426 231,-819 -357, 32 -903)),((-395 830,454 -143,788 -279,618 -843,-490 -507,-224 17, -395 830)))')), ST_INTERSECTION(ST_UNION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(-169 -570),MULTIPOINT(384 290,-601 123,408 86,-616 -300,160 -474,-979 -4,-63 -824,-689 -765,-219 802,-54 -93,191 -982,-723 -449),MULTILINESTRING((683 4,864 -634,548 -891,727 -691,-570 32,-334 -438,127 -317,241 -12,-807 947,-987 693,-345 -867,854 -106)),MULTIPOINT(384 290,-601 123,408 86,-616 -300,160 -474,-979 -4,-63 -824,-689 -765,-219 802,-54 -93,191 -982,-723 -449),MULTIPOLYGON(((266 51,851 523,-781 366,-607 -581, 266 51)),((416 -450,-973 880,103 226,-896 -857,-369 761, 416 -450)),((168 171,26 -99,-606 -490,-174 -138,-325 -218,-833 -652,-255 -445,-882 -762,-202 -560, 168 171)),((-423 -216,-531 -190,-147 821,362 441,645 -128,-997 708,134 -426,714 -9,147 842,-887 -870,688 -330,689 17,-314 -262,401 -112,-606 761, -423 -216)),((-582 -373,-360 -84,-727 -171,412 -660,750 -846,-464 718,163 -11,489 -659,586 -324,-741 -198,144 -165,644 -80,930 -487,-504 -205, -582 -373))),MULTIPOLYGON(((266 51,851 523,-781 366,-607 -581, 266 51)),((416 -450,-973 880,103 226,-896 -857,-369 761, 416 -450)),((168 171,26 -99,-606 -490,-174 -138,-325 -218,-833 -652,-255 -445,-882 -762,-202 -560, 168 171)),((-423 -216,-531 -190,-147 821,362 441,645 -128,-997 708,134 -426,714 -9,147 842,-887 -870,688 -330,689 17,-314 -262,401 -112,-606 761, -423 -216)),((-582 -373,-360 -84,-727 -171,412 -660,750 -846,-464 718,163 -11,489 -659,586 -324,-741 -198,144 -165,644 -80,930 -487,-504 -205, -582 -373))),GEOMETRYCOLLECTION(),MULTIPOINT(384 290,-601 123,408 86,-616 -300,160 -474,-979 -4,-63 -824,-689 -765,-219 802,-54 -93,191 -982,-723 -449),MULTILINESTRING((683 4,864 -634,548 -891,727 -691,-570 32,-334 -438,127 -317,241 -12,-807 947,-987 693,-345 -867,854 -106)))'), ST_GEOMFROMTEXT('MULTIPOINT(157 69,-725 -189,-176 -41,676 375,33 -672,-76 47)')), ST_UNION(ST_ENVELOPE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(-896 100,-793 810,243 -525,650 -373,599 170,-554 -890),POINT(945 -828),POINT(945 -828),LINESTRING(-896 100,-793 810,243 -525,650 -373,599 170,-554 -890),POINT(945 -828),MULTIPOINT(-47 307,-768 -425,-3 167,-170 30,-784 721,951 146,407 790,37 850,-466 738),GEOMETRYCOLLECTION(),MULTIPOINT(-47 307,-768 -425,-3 167,-170 30,-784 721,951 146,407 790,37 850,-466 738),MULTIPOLYGON(((104 113,688 423,-859 602,272 978, 104 113)),((981 -394,189 -400,649 -325,-977 371,30 859,590 318,329 -894,-51 262,197 952,-846 -139,-920 399, 981 -394)),((-236 -759,834 757,857 747,437 -146,194 913,316 862,976 -491,-745 933,610 687,-149 -164,-803 -565,451 -275, -236 -759)),((572 96,-160 -607,529 930,-544 -132,458 294, 572 96))))')), ST_CENTROID(ST_GEOMFROMTEXT('POINT(-939 -921)'))))));
 
 
-SELECT ST_AsText(@centroid_point) as centroid;
+DO ST_AsText(@centroid_point) as centroid;
 
-SELECT MBRWITHIN(@centroid_point, ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((541 -927,-414 316,-429 -444,212 260,-125 104,445 563,-713 -975,-976 514),(-830 882,-377 914,-915 919,-535 -23,-508 979),(806 347,-87 220,226 -22,-12 468,707 598,83 951,-592 701,833 964,270 -932,743 -514,231 469,-575 -122,-99 -245,416 465,801 -587))'), ST_GEOMFROMTEXT('LINESTRING(-96 -182,-373 75,697 687,-881 -463,-557 -959,-493 810)'))) as result;
+DO MBRWITHIN(@centroid_point, ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((541 -927,-414 316,-429 -444,212 260,-125 104,445 563,-713 -975,-976 514),(-830 882,-377 914,-915 919,-535 -23,-508 979),(806 347,-87 220,226 -22,-12 468,707 598,83 951,-592 701,833 964,270 -932,743 -514,231 469,-575 -122,-99 -245,416 465,801 -587))'), ST_GEOMFROMTEXT('LINESTRING(-96 -182,-373 75,697 687,-881 -463,-557 -959,-493 810)'))) as result;
 
 --echo #
 --echo # Bug #20179082  ST_TOUCHES() RETURNS INCORRECT RESULT WITH GEOMRTRYCOLLECTION GEOMETRY
diff -Nru mysql-8.0-8.0.26/mysql-test/t/gis.test mysql-8.0-8.0.27/mysql-test/t/gis.test
--- mysql-8.0-8.0.26/mysql-test/t/gis.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/gis.test	2021-09-28 11:46:34.000000000 +0000
@@ -504,7 +504,7 @@
 
 create table t1 (s1 geometry not null,s2 char(100));
 create trigger t1_bu before update on t1 for each row set new.s1 = null;
---error 1048
+--error ER_BAD_NULL_ERROR_NOT_IGNORED
 insert into t1 values (null,null);
 drop table t1;
 
diff -Nru mysql-8.0-8.0.26/mysql-test/t/grant_alter_user_qa.test mysql-8.0-8.0.27/mysql-test/t/grant_alter_user_qa.test
--- mysql-8.0-8.0.26/mysql-test/t/grant_alter_user_qa.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/grant_alter_user_qa.test	2021-09-28 11:46:34.000000000 +0000
@@ -1110,7 +1110,7 @@
 SET GLOBAL general_log_file=  @old_general_log_file;
 SET GLOBAL general_log=       @old_general_log;
 SET GLOBAL log_output=        @old_log_output;
-
+TRUNCATE TABLE mysql.general_log;
 
 --echo
 --echo Bug #20602525 ALTER USER DOES NOT VERIFY AUTH PLUGIN
diff -Nru mysql-8.0-8.0.26/mysql-test/t/grant_user_lock.test mysql-8.0-8.0.27/mysql-test/t/grant_user_lock.test
--- mysql-8.0-8.0.26/mysql-test/t/grant_user_lock.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/grant_user_lock.test	2021-09-28 11:46:34.000000000 +0000
@@ -438,6 +438,7 @@
 SET GLOBAL general_log_file=  @old_general_log_file;
 SET GLOBAL general_log=       @old_general_log;
 SET GLOBAL log_output=        @old_log_output;
+TRUNCATE TABLE mysql.general_log;
 
 # Wait till all disconnects are completed
 --source include/wait_until_count_sessions.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/t/group_by_hypergraph.test mysql-8.0-8.0.27/mysql-test/t/group_by_hypergraph.test
--- mysql-8.0-8.0.26/mysql-test/t/group_by_hypergraph.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/group_by_hypergraph.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,58 @@
+--source include/have_hypergraph.inc
+
+--echo #
+--echo # Bug#32980875: WL#14422: ASSERTION `FALSE' FAILED|SQL/BASIC_ROW_ITERATORS.H
+--echo #
+
+# This should have been a unit test in hypergraph_optimizer-t.cc, but
+# the unit test framework does not currently allow creating temporary
+# tables.
+#
+# We want to test that the hypergraph optimizer doesn't try to do
+# sort-ahead on an aggregate.
+#
+# We expect the hypergraph optimizer to set up a plan like this:
+#
+# -> Remove duplicates from input grouped on t.x, `MIN(t2.x)`
+#   -> Stream results
+#       -> Group aggregate: min(t2.x)
+#           -> Sort: t2.x
+#               -> Inner hash join (t1.x = t2.x)
+#                   -> Table scan on t1
+#                   -> Hash
+#                       -> Table scan on t2
+#
+# Before, it would set up this plan, which tried to sort on MIN(t2.x)
+# before the aggregation had happened:
+#
+# -> Remove duplicates from input grouped on t1.x, min(t2.x)
+#   -> Stream results
+#       -> Group aggregate: min(t2.x)
+#           -> Sort: t1.x, min(t2.x)
+#               -> Inner hash join (t1.x = t2.x)
+#                   -> Table scan on t1
+#                   -> Hash
+#                       -> Table scan on t2
+#
+# Note that because MIN(t2.x) is functionally dependent on the GROUP BY
+# expression (which happens to be t2.x as well here), we avoid a sort
+# in the final DISTINCT pass. We further shuffle the SELECT expressions
+# around a bit (putting the MIN() first) to demonstrate that our sorting of
+# expressions in an interesting grouping is robust.
+#
+# Of course, we should have been able to remove the entire DISTINCT operation,
+# and if we wrote t2.x instead of t1.x, we would be able to do that. However,
+# the interesting order framework does not track uniqueness (so can not do it),
+# and the hard-coded DISTINCT removal, which runs before the join optimizer,
+# does not take functional dependencies into account, so it does not know that
+# t1.x (in the SELECT list) = t2.x (in the GROUP BY list).
+
+CREATE TABLE t (x INTEGER);
+INSERT INTO t VALUES (1), (2), (3);
+ANALYZE TABLE t;
+--replace_regex / *\(cost=.*//
+EXPLAIN FORMAT=TREE
+ SELECT DISTINCT MIN(t2.x), t1.x
+ FROM t t1 JOIN t t2 USING (x)
+ GROUP BY t2.x;
+DROP TABLE t;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/group_by.test mysql-8.0-8.0.27/mysql-test/t/group_by.test
--- mysql-8.0-8.0.26/mysql-test/t/group_by.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/group_by.test	2021-09-28 11:46:34.000000000 +0000
@@ -246,8 +246,10 @@
 select value,description,COUNT(bug_id) from t2 left join t1 on t2.program=t1.product and t2.value=t1.component where program="AAAAA" group by value;
 --sorted_result
 select value,description,COUNT(bug_id) from t2 left join t1 on t2.program=t1.product and t2.value=t1.component where program="AAAAA" group by value having COUNT(bug_id) IN (0,2);
+# NOTE: The DISTINCT is to force sort-based aggregation, making the query somewhat
+# more deterministic between the hypergraph and non-hypergraph optimizers.
 --sorted_result
-select row_number() over (), value,description,COUNT(bug_id) from t2 left join t1 on t2.program=t1.product and t2.value=t1.component where program="AAAAA" group by value having COUNT(bug_id) IN (0,2);
+select row_number() over (), value,description,COUNT(DISTINCT bug_id) from t2 left join t1 on t2.program=t1.product and t2.value=t1.component where program="AAAAA" group by value having COUNT(DISTINCT bug_id) IN (0,2);
 
 --source include/restore_sql_mode_after_turn_off_only_full_group_by.inc
 drop table t1,t2;
@@ -597,7 +599,8 @@
 order by x3.a, x4.a, C.a, D.a;
 
 delete from t2  where a = 2 and b = 'val-2' order by a,b,c,d limit 30;
-
+ANALYZE TABLE t1, t2;
+--replace_column 10 6
 explain select c from t2 where a = 2 and b = 'val-2' group by c;
 select c from t2 where a = 2 and b = 'val-2' group by c;
 drop table t1,t2;
@@ -3215,3 +3218,23 @@
 set @a=32767;
 EXECUTE stmt USING @a;
 DROP TABLE t1;
+
+--echo #
+--echo # Verify that ROLLUP and DISTINCT on nullable GROUP BY expressions
+--echo # work as expected (the sort is not elided).
+--echo #
+
+CREATE TABLE t1 (a INTEGER);
+INSERT INTO t1 VALUES (NULL), (1), (2);
+
+--sorted_result
+SELECT DISTINCT a, COUNT(*) FROM t1 GROUP BY a WITH ROLLUP;
+
+DROP TABLE t1;
+
+--echo #
+--echo # Bug #33007298: RECENT REGRESSION: CRASH IN QEP_SHARED_OWNER::TABLE
+--echo #
+
+--error ER_INVALID_JSON_TEXT_IN_PARAM
+select is_uuid(avg(distinct json_storage_free('$b*<*#]E')));
diff -Nru mysql-8.0-8.0.26/mysql-test/t/group_min_max.test mysql-8.0-8.0.27/mysql-test/t/group_min_max.test
--- mysql-8.0-8.0.26/mysql-test/t/group_min_max.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/group_min_max.test	2021-09-28 11:46:34.000000000 +0000
@@ -1909,3 +1909,49 @@
 DROP TABLE t1, t2;
 
 --echo # End of test for Bug#30242457
+
+--echo #
+--echo # Bug #32769369: SIG11 IN ITEM_FIELD::ITEM_FIELD|SQL/ITEM.CC WITH HYPERGRAPH
+--echo #
+
+CREATE TABLE t1 (a INTEGER, KEY (a));
+INSERT INTO t1 VALUES (1);
+SELECT SQL_BUFFER_RESULT MIN(t1.a) FROM t1, t1 AS t2;
+DROP TABLE t1;
+
+--echo # Bug#32266286 : ADDING GROUP BY SLOWS DOWN A QUERY.
+--echo #
+
+CREATE TABLE t0 (i0 INTEGER);
+INSERT INTO t0 VALUES (1), (2), (3), (4), (5);
+INSERT INTO t0 VALUES (6), (7), (8), (9);
+CREATE TABLE t1 (f1 INTEGER, f2 INTEGER, KEY (f1,f2));
+INSERT INTO t1 SELECT 1, i0 from t0;
+INSERT INTO t1 SELECT i0+1, i0*rand()*10 from t0;
+INSERT INTO t1 VALUES (1,0);
+ANALYZE TABLE t1;
+
+--skip_if_hypergraph  # Different plan.
+# Should pick loose index scan to do the aggregation. Rows
+# looked at should be 1 as the group by attribute is a constant.
+--replace_regex /  \(cost=.*//
+EXPLAIN FORMAT=tree SELECT MIN(f2) FROM t1 WHERE f1=1 GROUP BY f1;
+SELECT MIN(f2) FROM t1 WHERE f1=1 GROUP BY f1;
+INSERT INTO t1 VALUES (NULL, 1);
+INSERT INTO t1 VALUES (NULL, 2);
+--skip_if_hypergraph  # Different plan.
+--replace_regex /  \(cost=.*//
+EXPLAIN FORMAT=tree SELECT MIN(f2) FROM t1 WHERE f1 IS NULL GROUP BY f1;
+SELECT MIN(f2) FROM t1 WHERE f1 IS NULL GROUP BY f1;
+
+DROP TABLE t0,t1;
+
+--echo #
+--echo # Bug#33139598: REGRESSION: CRASH IN GET_BEST_GROUP_MIN_MAX
+--echo #
+
+CREATE TABLE t1 (f1 ENUM(''), KEY(f1));
+INSERT INTO t1 VALUES(''),('');
+# Should not crash.
+SELECT 1 FROM t1 WHERE f1=UUID() GROUP BY f1 LIMIT 1;
+DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/hash_join.test mysql-8.0-8.0.27/mysql-test/t/hash_join.test
--- mysql-8.0-8.0.26/mysql-test/t/hash_join.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/hash_join.test	2021-09-28 11:46:34.000000000 +0000
@@ -2507,3 +2507,19 @@
 eval explain $query;
 eval $query;
 DROP TABLE t;
+
+--echo # Bug#33204161: Strings with ASCII charset and UCS2 don't match in join
+
+CREATE TABLE t1(wstr_name VARCHAR(64) COLLATE ucs2_general_ci);
+CREATE TABLE t2(str_name VARCHAR(64) COLLATE ascii_general_ci);
+
+INSERT INTO t1 VALUES('9337a53f-cfd6-4a68-a1fc-e2d84eba8079');
+INSERT INTO t2 VALUES('9337a53f-cfd6-4a68-a1fc-e2d84eba8079');
+
+let $query =
+SELECT wstr_name, str_name
+FROM t1 INNER JOIN t2 ON t1.wstr_name = t2.str_name;
+eval explain $query;
+eval $query;
+
+DROP TABLE t1, t2;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/having.test mysql-8.0-8.0.27/mysql-test/t/having.test
--- mysql-8.0-8.0.26/mysql-test/t/having.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/having.test	2021-09-28 11:46:34.000000000 +0000
@@ -948,3 +948,19 @@
 SELECT 1 WHERE FALSE HAVING COUNT(*) = 0;
 SELECT 1 HAVING json_objectagg(utc_date(), 1416) <> 0;
 
+--echo #
+--echo # Bug #33152269: No result set returned when using HAVING COUNT(DISTINCT ...)
+--echo #
+
+CREATE TABLE t1 (a INTEGER);
+INSERT INTO t1 VALUES (1), (2);
+
+SELECT DISTINCT
+  COUNT(DISTINCT t1.a) AS da
+FROM
+  t1
+  JOIN t1 AS t2 ON t1.a = t2.a
+GROUP BY t1.a
+HAVING COUNT(DISTINCT t1.a) = 1;
+
+DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/heap_btree.test mysql-8.0-8.0.27/mysql-test/t/heap_btree.test
--- mysql-8.0-8.0.26/mysql-test/t/heap_btree.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/heap_btree.test	2021-09-28 11:46:34.000000000 +0000
@@ -31,6 +31,7 @@
 insert into t1 values (1,1),(2,2),(1,3),(2,4),(2,5),(2,6);
 explain select * from t1 where x=1;
 select * from t1 where x=1;
+--sorted_result
 select * from t1,t1 as t2 where t1.x=t2.y;
 explain select * from t1,t1 as t2 where t1.x=t2.y;
 drop table t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/information_schema_inno.test mysql-8.0-8.0.27/mysql-test/t/information_schema_inno.test
--- mysql-8.0-8.0.26/mysql-test/t/information_schema_inno.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/information_schema_inno.test	2021-09-28 11:46:34.000000000 +0000
@@ -44,6 +44,7 @@
                 FOREIGN KEY (b1, b2) REFERENCES t4(b1, b2)
                 ON UPDATE RESTRICT ON DELETE CASCADE) ENGINE=INNODB;
 
+--sorted_result
 select a.CONSTRAINT_SCHEMA, b.TABLE_NAME, CONSTRAINT_TYPE,
        b.CONSTRAINT_NAME, UNIQUE_CONSTRAINT_SCHEMA, UNIQUE_CONSTRAINT_NAME,
        MATCH_OPTION, UPDATE_RULE, DELETE_RULE, b.REFERENCED_TABLE_NAME
diff -Nru mysql-8.0-8.0.26/mysql-test/t/innodb_recovery_with_upper_case_names.test mysql-8.0-8.0.27/mysql-test/t/innodb_recovery_with_upper_case_names.test
--- mysql-8.0-8.0.26/mysql-test/t/innodb_recovery_with_upper_case_names.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/innodb_recovery_with_upper_case_names.test	2021-09-28 11:46:34.000000000 +0000
@@ -62,3 +62,7 @@
 --disable_query_log
 call mtr.add_suppression("\\[Warning\\] .*MY-\\d+.* Tablespace .*, name '.*', file '.*' is missing");
 --enable_query_log
+
+# Clean up
+let $restart_parameters = restart:;
+--source include/restart_mysqld_no_echo.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/t/insert.test mysql-8.0-8.0.27/mysql-test/t/insert.test
--- mysql-8.0-8.0.26/mysql-test/t/insert.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/insert.test	2021-09-28 11:46:34.000000000 +0000
@@ -991,3 +991,45 @@
 DROP VIEW v1;
 DROP TABLE t1, t2;
 
+--echo #
+--echo # Bug #32169656: MYSQL GIVING QUERY RESULT FOR WRONG COLUMN
+--echo #
+
+CREATE TABLE t1 (
+  Ñ INTEGER,
+  N INTEGER,
+  a INTEGER,
+  b INTEGER,
+  c INTEGER,
+  d INTEGER,
+  e INTEGER,
+  f INTEGER,
+  g INTEGER,
+  h INTEGER,
+  i INTEGER,
+  j INTEGER,
+  k INTEGER,
+  l INTEGER,
+  m INTEGER,
+  na INTEGER,
+  o INTEGER,
+  p INTEGER,
+  q INTEGER,
+  r INTEGER,
+  s INTEGER,
+  t INTEGER,
+  u INTEGER,
+  v INTEGER,
+  w INTEGER,
+  x INTEGER,
+  y INTEGER,
+  z INTEGER,
+  aa INTEGER,
+  ab INTEGER,
+  ac INTEGER,
+  ad INTEGER
+);
+
+INSERT INTO t1 (Ñ, N) VALUES (1, 2);
+
+DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/join.test mysql-8.0-8.0.27/mysql-test/t/join.test
--- mysql-8.0-8.0.26/mysql-test/t/join.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/join.test	2021-09-28 11:46:34.000000000 +0000
@@ -464,6 +464,7 @@
 --sorted_result
 select * from  ((t1 natural join t2) cross join (t3 natural join t4)) natural join t5;
 
+--sorted_result
 select * from (t1 join t2 using (b)) join (t3 join t4 using (c)) using (c);
 --sorted_result
 select * from (t1 join t2 using (b)) natural join (t3 join t4 using (c));
@@ -608,6 +609,7 @@
 #
 # Omit columns.ORDINAL_POSITION and statistics.CARDINALITY as it may vary with hostname='localhost'.
 ANALYZE TABLE mysql.user;
+--sorted_result
 select 
  statistics.TABLE_NAME, statistics.COLUMN_NAME, statistics.TABLE_CATALOG, statistics.TABLE_SCHEMA, statistics.NON_UNIQUE, statistics.INDEX_SCHEMA, statistics.INDEX_NAME, statistics.SEQ_IN_INDEX, statistics.COLLATION, statistics.SUB_PART, statistics.PACKED, statistics.NULLABLE, statistics.INDEX_TYPE, statistics.COMMENT, 
  columns.TABLE_CATALOG, columns.TABLE_SCHEMA, columns.COLUMN_DEFAULT, columns.IS_NULLABLE, columns.DATA_TYPE, columns.CHARACTER_MAXIMUM_LENGTH, columns.CHARACTER_OCTET_LENGTH, columns.NUMERIC_PRECISION, columns.NUMERIC_SCALE, columns.CHARACTER_SET_NAME, columns.COLLATION_NAME, columns.COLUMN_TYPE, columns.COLUMN_KEY, columns.EXTRA, columns.PRIVILEGES, columns.COLUMN_COMMENT
@@ -1617,6 +1619,127 @@
 DROP TABLE t1;
 
 --echo #
+--echo # Bug #32663072: WL#14418: ASSERTION `PATH->TYPE == ACCESSPATH::FILTER' FAILED|JOIN_OPTIMIZER.CC
+--echo #
+
+# The number of columns is carefully balanced so that the join predicates
+# arising from the NATURAL JOIN and other predicates below come to
+# exactly 64 in all.
+CREATE TABLE t1 (c1 INTEGER, c2 INTEGER, c3 INTEGER, c4 INTEGER, c5 INTEGER, c6 INTEGER, c7 INTEGER, c8 INTEGER, c9 INTEGER, c10 INTEGER, c11 INTEGER, c12 INTEGER, c13 INTEGER, c14 INTEGER, c15 INTEGER, c16 INTEGER, c17 INTEGER, c18 INTEGER, c19 INTEGER, c20 INTEGER, c21 INTEGER, c22 INTEGER, c23 INTEGER, c24 INTEGER, c25 INTEGER, c26 INTEGER, c27 INTEGER, c28 INTEGER, c29 INTEGER, c30 INTEGER, c31 INTEGER, c32 INTEGER, c33 INTEGER, c34 INTEGER, c35 INTEGER, c36 INTEGER, c37 INTEGER, c38 INTEGER, c39 INTEGER, c40 INTEGER, c41 INTEGER, c42 INTEGER, c43 INTEGER, c44 INTEGER, c45 INTEGER, c46 INTEGER, c47 INTEGER, c48 INTEGER, c49 INTEGER, c50 INTEGER, c51 INTEGER, c52 INTEGER, c53 INTEGER, c54 INTEGER, c55 INTEGER, c56 INTEGER, c57 INTEGER, c58 INTEGER, c59 INTEGER, c60 INTEGER, c61 INTEGER);
+
+SELECT *
+FROM t1
+NATURAL JOIN (
+  SELECT t2.*
+  FROM t1 AS t2 JOIN t1 AS t3 ON t3.c1 = t2.c1
+  WHERE t2.c3 <> ANY (SELECT c3 FROM t1)
+) AS d1;
+
+DROP TABLE t1;
+
+--echo #
+--echo # Bug #32672275: WL#14418: ASSERTION `ISSINGLEBITSET(PRED.TOTAL_ELIGIBILITY_SET)' FAILED.
+--echo #
+
+CREATE TABLE t1 ( a INTEGER );
+
+SELECT *
+FROM t1 AS outer_t1
+WHERE EXISTS (
+  SELECT t2.a
+  FROM t1
+  LEFT JOIN t1 AS t2 ON t2.a = outer_t1.a
+);
+
+DROP TABLE t1;
+
+--echo #
+--echo # Bug #32643386: WL#14418: ASSERTION `FD_SET == IT_AND_INSERTED.FIRST->SECOND.ACTIVE_FUNCTIONAL_D
+--echo #
+
+CREATE TABLE t1 ( a INTEGER );
+
+# t1 and t2 cannot be part of the same companion set, or we'd add mesh
+# around non-simple edges.
+SELECT *
+FROM (t1 STRAIGHT_JOIN t1 AS t2) JOIN t1 AS t3 ON t1.a = t3.a
+WHERE t2.a = t3.a
+ORDER BY t1.a;
+
+DROP TABLE t1;
+
+CREATE TABLE t1 (a INTEGER, b INTEGER);
+
+# Similar; the t1/t3 edge must not be allowed to create a cycle.
+SELECT *
+FROM (t1 STRAIGHT_JOIN t1 AS t2 ON t1.b = t2.b) JOIN t1 AS t3 ON t1.a = t3.b
+WHERE t1.a < t2.b AND t2.a < t3.b
+ORDER BY t1.b;
+
+DROP TABLE t1;
+
+--echo #
+--echo # Bug #32642893: WL#14418: ASSERTION `!ISMULTIPLEEQUALS(ITEM)' FAILED|MAKE_JOIN_HYPERGRAPH.CC
+--echo #
+
+CREATE TABLE t1 ( a INTEGER );
+
+# Sets up a case where a multiple equality is left in the WHERE condition
+# (because it is unpushable). The t2.a <> t2.a is to avoid the LEFT JOIN
+# being converted into an inner join, but gets removed later.
+SELECT *
+FROM t1
+LEFT JOIN t1 AS t2 ON t1.a = t2.a
+LEFT JOIN t1 AS t3 ON t2.a = t3.a
+WHERE t2.a = t3.a OR t2.a <> t2.a;
+
+DROP TABLE t1;
+
+--echo #
+--echo # Bug #32707348: WL#14418: RESULT MISMATCHES SEEN WITH HYPERGRAPH
+--echo #
+
+CREATE TABLE t1 ( a INTEGER, b INTEGER );
+INSERT INTO t1 VALUES (1,2);
+ANALYZE TABLE t1;
+
+# A multiple equality that refers to two fields from t3. We must make sure
+# to not forget the t3.a = t3.b equality.
+SELECT * FROM t1, t1 AS t2, t1 AS t3 WHERE t1.a = t2.a AND t1.a = t3.b AND t1.a = t3.a;
+
+DROP TABLE t1;
+
+--echo #
+--echo # Bug #32751315: WL#14418: ASSERTION `RIGHT != NULLPTR' FAILED|MAKE_JOIN_HYPERGRAPH.CC
+--echo #
+
+CREATE TABLE t1 ( pk INTEGER );
+SELECT * FROM
+  t1
+  JOIN t1 AS t2 ON t1.pk = t2.pk
+  JOIN t1 AS t3
+  LEFT JOIN t1 AS t4 ON t2.pk = t3.pk AND t4.pk = 135;
+DROP TABLE t1;
+
+--echo #
+--echo # Bug #32757178: WL#14418: ASSERTION `!EQ_ITEMS.IS_EMPTY()' FAILED|MAKE_JOIN_HYPERGRAPH.CC
+--echo #
+
+CREATE TABLE t1 ( a INTEGER, b INTEGER );
+
+SELECT *
+  FROM
+    t1
+    JOIN t1 AS t2 ON t1.a = t2.b
+    LEFT JOIN t1 AS t3 ON t2.b = t3.b
+    LEFT JOIN (
+      t1 AS t4
+      JOIN t1 AS t5 ON t4.b = t5.b
+    ) ON t2.b = t4.a
+  WHERE t1.b >= 6 OR t3.b <> t4.b;
+
+DROP TABLE t1;
+
 --echo # Bug#32508878 - MYSQL SERVER CRASH - ASSERTION FAILURE IN
 --echo # DEPS_OF_REMAINING_LATERAL_DERIVED_TABLES::RECALCULATE
 --echo #
@@ -1633,6 +1756,42 @@
 DROP TABLE t1;
 
 --echo #
+--echo # Bug #32917482: SIG11 IN FLATTENINNERJOINS|MAKE_JOIN_HYPERGRAPH.CC
+--echo #
+
+CREATE TABLE t1 (
+  a VARCHAR(1),
+  b INTEGER
+);
+
+SELECT *
+FROM
+  t1
+  JOIN t1 AS t2 ON t1.b = t2.b
+  JOIN t1 AS t3
+  JOIN (
+    t1 AS t4 STRAIGHT_JOIN t1 AS t5 ON t4.a = t5.b
+  ) ON t1.b = t4.b
+WHERE t1.a = t5.b;
+
+DROP TABLE t1;
+
+--echo #
+--echo # Bug #32939191: HYPERGRAPH: DIFFERENT RESULTS WHEN HYPERGRAPH_OPTIMIZER IS ON/OFF
+--echo #
+
+CREATE TABLE t1 (a INTEGER);
+INSERT INTO t1 VALUES (1), (2), (3), (4);
+SELECT *
+  FROM
+    t1
+    LEFT JOIN (
+      t1 AS t2
+      LEFT JOIN t1 AS t3 ON FALSE
+    ) ON t1.a <=> t3.a
+  WHERE t1.a <=> t3.a;
+DROP TABLE t1;
+
 --echo # Bug#32915307- RECENT REGRESSION: ASSERTION
 --echo # `JOIN->DEPS_OF_REMAINING_LATERAL_DERIVED_TABLES
 --echo # == CALCULATE_LATERAL_DEPS_OF_FINAL_PLAN(FIRST_TAB_NO)' FAILED.
@@ -1689,3 +1848,80 @@
 eval explain $query;
 
 DROP TABLE t1, t2, t3;
+
+--echo #
+--echo # Bug #32976194: HYPERGRAPH: ASSERTION `!OVERLAPS(EXPR->LEFT->TABLES_IN_SUBTREE, EXPR->RIGHT->TAB
+--echo #
+
+CREATE TABLE t1 ( a INTEGER );
+
+SELECT *
+FROM t1, t1 AS t2, t1 AS t3
+WHERE rand() > 0.5 OR (t1.a = 1 AND t2.a = 1);
+
+DROP TABLE t1;
+
+--echo #
+--echo # Bug #33003335: HYPERGRAPH: ASSERTION `FD_SET == IT_AND_INSERTED.FIRST->SECOND.ACTIVE_FUNCTIONAL
+--echo #
+
+CREATE TABLE t1 ( a INTEGER, b INTEGER );
+
+SELECT * FROM
+  t1
+  STRAIGHT_JOIN t1 AS t2 ON t1.b = t2.b
+  JOIN (t1 AS t3 JOIN t1 AS t4 ON t3.a = t4.a AND t3.b = t4.b) ON t2.b = t3.b AND t2.a < t3.a
+ORDER BY t2.b;
+
+DROP TABLE t1;
+
+--echo #
+--echo # Bug #33003581: HYPERGRAPH: ASSERTION `FALSE' FAILED|SQL/ITEM_CMPFUNC.CC
+--echo #
+
+CREATE TABLE t1 ( i INTEGER );
+INSERT INTO t1 VALUES (1), (2);
+
+--sorted_result
+SELECT * FROM
+  t1 LEFT JOIN (SELECT i FROM t1 WHERE FALSE) AS d1 ON t1.i = d1.i
+WHERE NOT EXISTS (SELECT 1 FROM t1 AS inner_t1 WHERE i = d1.i);
+
+DROP TABLE t1;
+
+# Test that more than 64 predicates work well together with
+# sargable predicates _and_ materialized subqueries.
+
+CREATE TABLE t1 ( a INTEGER, b INTEGER, c INTEGER, d INTEGER, e INTEGER, f INTEGER, g INTEGER, h INTEGER, i INTEGER, j INTEGER, k INTEGER, l INTEGER, m INTEGER, n INTEGER, o INTEGER, p INTEGER, q INTEGER, r INTEGER, s INTEGER, t INTEGER, u INTEGER, v INTEGER, w INTEGER, KEY (a) );
+
+SELECT 1
+FROM t1 NATURAL JOIN t1 AS t2 NATURAL JOIN t1 AS t3
+WHERE
+  t1.a <> ( SELECT SUM(a) FROM t1 );
+
+DROP TABLE t1;
+
+--echo #
+--echo # Bug #32366946: USE-AFTER-FREE WITH HYPERGRAPH OPTIMIZER + SORT + REMATERIALIZATION
+--echo #
+
+CREATE TABLE t1 (
+  f1 INTEGER
+);
+INSERT INTO t1 VALUES (1), (2), (3);
+
+CREATE TABLE t2 (
+  pk INTEGER,
+  blobfield LONGTEXT
+);
+INSERT INTO t2 VALUES (4, '');
+
+--partially_sorted_result 2
+SELECT *
+FROM t1, t2, LATERAL (
+  SELECT pk, blobfield
+  GROUP BY pk, blobfield WITH ROLLUP
+) AS d1
+ORDER BY t1.f1, t2.pk;
+
+DROP TABLE t1, t2;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/lead_lag.test mysql-8.0-8.0.27/mysql-test/t/lead_lag.test
--- mysql-8.0-8.0.26/mysql-test/t/lead_lag.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/lead_lag.test	2021-09-28 11:46:34.000000000 +0000
@@ -1,7 +1,3 @@
-# The hypergraph optimizer does not yet support windowing functions, and the binary
-# noise in the .result file confuses diff enough that the skipping doesn't work.
---source include/not_hypergraph.inc
-
 --echo # Test of SQL window functions LEAD/LAG
 --echo # ----------------------------------------------------------------------
 
diff -Nru mysql-8.0-8.0.26/mysql-test/t/log_components_eventlog.test mysql-8.0-8.0.27/mysql-test/t/log_components_eventlog.test
--- mysql-8.0-8.0.26/mysql-test/t/log_components_eventlog.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/log_components_eventlog.test	2021-09-28 11:46:34.000000000 +0000
@@ -113,7 +113,6 @@
 --echo
 
 --echo # cleanup
-# UNINSTALL COMPONENT "file://component_log_syseventlog";
 
 SET @@session.debug="-d,parser_stmt_to_error_log_with_system_prio";
 SET @@session.debug="-d,parser_stmt_to_error_log";
@@ -123,6 +122,12 @@
 
 FLUSH ERROR LOGS;
 
+UNINSTALL COMPONENT "file://component_log_sink_syseventlog";
+
+let $restart_parameters = restart:;
+--source include/restart_mysqld_no_echo.inc
+
+
 --echo
 --echo ###
 --echo ### done
diff -Nru mysql-8.0-8.0.26/mysql-test/t/log_state.test mysql-8.0-8.0.27/mysql-test/t/log_state.test
--- mysql-8.0-8.0.26/mysql-test/t/log_state.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/log_state.test	2021-09-28 11:46:34.000000000 +0000
@@ -341,6 +341,8 @@
 SET global general_log_file = @old_general_log_file;
 SET global slow_query_log = @old_slow_query_log;
 SET global slow_query_log_file = @old_slow_query_log_file;
+TRUNCATE TABLE mysql.slow_log;
+TRUNCATE TABLE mysql.general_log;
 
 # Remove the log file that was created in the "default location"
 # i.e var/run
diff -Nru mysql-8.0-8.0.26/mysql-test/t/log_tables-big.test mysql-8.0-8.0.27/mysql-test/t/log_tables-big.test
--- mysql-8.0-8.0.26/mysql-test/t/log_tables-big.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/log_tables-big.test	2021-09-28 11:46:34.000000000 +0000
@@ -32,6 +32,7 @@
 disconnect con1;
 disconnect con2;
 
-TRUNCATE mysql.slow_log;
-
 set @@global.log_output=default;
+
+TRUNCATE mysql.general_log;
+TRUNCATE mysql.slow_log;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/log_tables_debug-master.opt mysql-8.0-8.0.27/mysql-test/t/log_tables_debug-master.opt
--- mysql-8.0-8.0.26/mysql-test/t/log_tables_debug-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/log_tables_debug-master.opt	2021-09-28 11:46:34.000000000 +0000
@@ -1 +1 @@
---log-output=table,file --slow-query-log
+--slow-query-log
diff -Nru mysql-8.0-8.0.26/mysql-test/t/log_tables_debug.test mysql-8.0-8.0.27/mysql-test/t/log_tables_debug.test
--- mysql-8.0-8.0.26/mysql-test/t/log_tables_debug.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/log_tables_debug.test	2021-09-28 11:46:34.000000000 +0000
@@ -11,6 +11,7 @@
 
 # Several subtests modify global variables. Save the initial values only here,
 # but reset to the initial values per subtest.
+SET @old_log_output= @@global.log_output;
 SET @old_general_log= @@global.general_log;
 SET @old_general_log_file= @@global.general_log_file;
 SET @old_slow_query_log= @@global.slow_query_log;
@@ -25,6 +26,7 @@
 let MYSQLD_DATADIR= `SELECT @@datadir`;
 
 # set logging to our specific bug log to control the entries added
+SET @@global.log_output = 'FILE,TABLE';
 SET @@global.general_log = ON;
 SET @@global.general_log_file = 'bug45387_general.log';
 
@@ -102,6 +104,7 @@
 --echo #
 
 # Reset global system variables to initial values if forgotten somewhere above.
+SET global log_output = @old_log_output;
 SET global general_log = @old_general_log;
 SET global general_log_file = @old_general_log_file;
 SET global slow_query_log = @old_slow_query_log;
@@ -115,3 +118,5 @@
    eval SET @@global.slow_query_log_file = '$my_var';
    --enable_query_log
 }
+TRUNCATE TABLE mysql.general_log;
+TRUNCATE TABLE mysql.slow_log;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/log_tables-master.opt mysql-8.0-8.0.27/mysql-test/t/log_tables-master.opt
--- mysql-8.0-8.0.26/mysql-test/t/log_tables-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/log_tables-master.opt	2021-09-28 11:46:34.000000000 +0000
@@ -1 +1 @@
---log-output=table,file --slow-query-log
+--slow-query-log
diff -Nru mysql-8.0-8.0.26/mysql-test/t/log_tables_myisam-master.opt mysql-8.0-8.0.27/mysql-test/t/log_tables_myisam-master.opt
--- mysql-8.0-8.0.26/mysql-test/t/log_tables_myisam-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/log_tables_myisam-master.opt	2021-09-28 11:46:34.000000000 +0000
@@ -1 +1 @@
---log-output=table,file --slow-query-log
+--slow-query-log
diff -Nru mysql-8.0-8.0.26/mysql-test/t/log_tables_myisam.test mysql-8.0-8.0.27/mysql-test/t/log_tables_myisam.test
--- mysql-8.0-8.0.26/mysql-test/t/log_tables_myisam.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/log_tables_myisam.test	2021-09-28 11:46:34.000000000 +0000
@@ -13,7 +13,8 @@
 # Check that log tables work and we can do basic selects. This also
 # tests truncate, which works in a special mode with the log tables
 #
-
+SET @old_log_output = @@global.log_output;
+SET GLOBAL log_output="FILE,TABLE";
 truncate table general_log;
 --replace_column 1 TIMESTAMP 2 USER_HOST 3 THREAD_ID
 select * from general_log;
@@ -140,6 +141,8 @@
 
 set global general_log='ON';
 set global slow_query_log='ON';
+SET GLOBAL log_output=@old_log_output;
+TRUNCATE TABLE mysql.general_log;
 
 --enable_ps_protocol
 use test;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/log_tables.test mysql-8.0-8.0.27/mysql-test/t/log_tables.test
--- mysql-8.0-8.0.26/mysql-test/t/log_tables.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/log_tables.test	2021-09-28 11:46:34.000000000 +0000
@@ -8,6 +8,7 @@
 SET @old_slow_query_log=   @@global.slow_query_log;
 SET @old_general_log=      @@global.general_log;
 SET @old_long_query_time=  @@session.long_query_time;
+SET GLOBAL log_output="FILE,TABLE";
 
 --disable_ps_protocol
 use mysql;
@@ -868,3 +869,5 @@
 SET @@global.log_output=       @old_log_output;
 SET @@global.slow_query_log=   @old_slow_query_log;
 SET @@global.general_log=      @old_general_log;
+TRUNCATE TABLE mysql.slow_log;
+TRUNCATE TABLE mysql.general_log;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/lowercase_table.test mysql-8.0-8.0.27/mysql-test/t/lowercase_table.test
--- mysql-8.0-8.0.26/mysql-test/t/lowercase_table.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/lowercase_table.test	2021-09-28 11:46:34.000000000 +0000
@@ -146,3 +146,4 @@
 --error ER_BAD_LOG_STATEMENT
 ALTER TABLE mysql.GENERAL_LOG DISCARD TABLESPACE;
 SET GLOBAL log_output= DEFAULT;
+TRUNCATE TABLE MYSQL.general_log;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/mdl_sync.test mysql-8.0-8.0.27/mysql-test/t/mdl_sync.test
--- mysql-8.0-8.0.26/mysql-test/t/mdl_sync.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/mdl_sync.test	2021-09-28 11:46:34.000000000 +0000
@@ -5226,7 +5226,7 @@
 SET @@global.general_log= @old_general_log;
 SET @@global.log_output= @old_log_output;
 SET @@session.sql_log_off= @old_sql_log_off;
-
+TRUNCATE TABLE mysql.general_log;
 
 --echo #
 --echo # Additional coverage for bug #50913 "Deadlock between
diff -Nru mysql-8.0-8.0.26/mysql-test/t/mysqladmin.test mysql-8.0-8.0.27/mysql-test/t/mysqladmin.test
--- mysql-8.0-8.0.26/mysql-test/t/mysqladmin.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/mysqladmin.test	2021-09-28 11:46:34.000000000 +0000
@@ -141,4 +141,29 @@
 --echo # cleanup
 --remove_file $admin_outfile
 
+
+--echo #
+--echo # Bug #32798288: MORE MEANINFUL MESSAGE FOR MISSING INCLUDE DIRECTORY
+--echo #
+let $file = $MYSQLTEST_VARDIR/tmp/b32092739.out;
+write_file $file;
+!includedir /nonexistent
+EOF
+let $file2 = $MYSQLTEST_VARDIR/tmp/b32092739_file.out;
+write_file $file2;
+!include /nonexistent
+EOF
+--replace_regex /OS errno.*/OS error/
+--replace_result $file file
+--error 1
+exec $MYSQLADMIN --defaults-file=$file -uroot -h localhost --password="" -S $MASTER_MYSOCK -P $MASTER_MYPORT --show-warnings ping 2>&1 ;
+# On windows we skip permission check for configs. Hence (on unix) we need to
+# replace the my_stat error with a simulated my_open (on windows) error.
+--replace_regex /OS errno.*/OS error/ /Can.t get stat of ..nonexistent./File '\\nonexistent' not found/
+--replace_result $file2 file2
+exec $MYSQLADMIN --defaults-file=$file2 -uroot -h localhost --password="" -S $MASTER_MYSOCK -P $MASTER_MYPORT --show-warnings ping 2>&1 ;
+remove_file $file;
+remove_file $file2;
+
+
 --echo End of tests
diff -Nru mysql-8.0-8.0.26/mysql-test/t/mysql_client_test-master.opt mysql-8.0-8.0.27/mysql-test/t/mysql_client_test-master.opt
--- mysql-8.0-8.0.26/mysql-test/t/mysql_client_test-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/mysql_client_test-master.opt	2021-09-28 11:46:34.000000000 +0000
@@ -1,5 +1,2 @@
---general-log=1 
---general-log-file=$MYSQLTEST_VARDIR/log/master.log 
---log-output=FILE,TABLE
 $PLUGIN_AUTH_OPT
 $PLUGIN_AUTH_LOAD
diff -Nru mysql-8.0-8.0.26/mysql-test/t/mysql_client_test.test mysql-8.0-8.0.27/mysql-test/t/mysql_client_test.test
--- mysql-8.0-8.0.26/mysql-test/t/mysql_client_test.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/mysql_client_test.test	2021-09-28 11:46:34.000000000 +0000
@@ -7,6 +7,15 @@
 
 SET @old_general_log= @@global.general_log;
 SET @old_slow_query_log= @@global.slow_query_log;
+SET @old_log_output = @@global.log_output;
+SET @old_general_log_file = @@global.general_log_file;
+
+--let $LOG_DIR= $MYSQLTEST_VARDIR/log
+
+SET GLOBAL log_output="FILE,TABLE";
+--replace_result $LOG_DIR LOG_DIR
+eval SET GLOBAL general_log_file = '$LOG_DIR/master.log';
+SET GLOBAL general_log= 'ON';
 
 #
 # If this test fails with "command "$MYSQL_CLIENT_TEST" failed",
@@ -14,12 +23,13 @@
 # server or run mysql-test-run --debug mysql_client_test and check
 # var/log/mysql_client_test.trace
 
---exec echo "$MYSQL_CLIENT_TEST" > $MYSQLTEST_VARDIR/log/mysql_client_test.out.log 2>&1
---exec $MYSQL_CLIENT_TEST --getopt-ll-test=25600M $PLUGIN_AUTH_CLIENT_OPT >> $MYSQLTEST_VARDIR/log/mysql_client_test.out.log 2>&1
+--exec echo "$MYSQL_CLIENT_TEST" > $LOG_DIR/mysql_client_test.out.log 2>&1
+--exec $MYSQL_CLIENT_TEST --getopt-ll-test=25600M $PLUGIN_AUTH_CLIENT_OPT >> $LOG_DIR/mysql_client_test.out.log 2>&1
 
 # End of 4.1 tests
 echo ok;
 
+# File 'test_wl4435.out.log' is created by mysql_client_test.cc
 --echo
 --echo # cat MYSQL_TMP_DIR/test_wl4435.out.log
 --echo # ------------------------------------
@@ -29,6 +39,10 @@
 
 SET @@global.general_log= @old_general_log;
 SET @@global.slow_query_log= @old_slow_query_log;
+SET @@global.log_output= @old_log_output;
+SET @@global.general_log_file = @old_general_log_file;
+TRUNCATE TABLE mysql.general_log;
+TRUNCATE TABLE mysql.slow_log;
 
 --echo #
 --echo # Bug#24963580 INFORMATION_SCHEMA:MDL_REQUEST::
diff -Nru mysql-8.0-8.0.26/mysql-test/t/mysqlpump_bugs.test mysql-8.0-8.0.27/mysql-test/t/mysqlpump_bugs.test
--- mysql-8.0-8.0.26/mysql-test/t/mysqlpump_bugs.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/mysqlpump_bugs.test	2021-09-28 11:46:34.000000000 +0000
@@ -3,10 +3,10 @@
 --echo #
 
 --echo # testing a failed connection: must not crash
---replace_regex /\([0-9]*\) while connecting/(errno) while connecting/
+--replace_regex /\([-0-9]*\) while connecting/(errno) while connecting/
 --exec $MYSQL_PUMP --host=non_existent_ghost --add-locks 2>&1
 --echo # testing an invalid option: must not crash
---replace_regex /\([0-9]*\) while connecting/(errno) while connecting/
+--replace_regex /\([-0-9]*\) while connecting/(errno) while connecting/
 --exec $MYSQL_PUMP --host=non_existent_ghost --parallelism=3 2>&1
 
 --echo #
diff -Nru mysql-8.0-8.0.26/mysql-test/t/mysql.test mysql-8.0-8.0.27/mysql-test/t/mysql.test
--- mysql-8.0-8.0.26/mysql-test/t/mysql.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/mysql.test	2021-09-28 11:46:34.000000000 +0000
@@ -211,19 +211,19 @@
 
 --echo Test connect with dbname + _invalid_ hostname
 # Mask the errno of the error message
---replace_regex /\([0-9]*\)/(errno)/
+--replace_regex /\([-0-9]*\)/(errno)/
 --error 1
 --exec $MYSQL test -e "\r test invalid_hostname" 2>&1
---replace_regex /\([0-9]*\)/(errno)/
+--replace_regex /\([-0-9]*\)/(errno)/
 --error 1
 --exec $MYSQL test -e "connect test invalid_hostname" 2>&1
 
 --echo The commands reported in the bug report
---replace_regex /\([0-9]*\)/(errno)/
+--replace_regex /\([-0-9]*\)/(errno)/
 --error 1
 --exec $MYSQL test -e "\r\r\n\r\n cyril\ has\ found\ a\ bug\ :)XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" 2>&1
 
-#--replace_regex /\([0-9]*\)/(errno)/
+#--replace_regex /\([-0-9]*\)/(errno)/
 #--error 1
 #--exec echo '\r\r\n\r\n cyril\ has\ found\ a\ bug\ :)XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' | $MYSQL 2>&1
 
@@ -232,7 +232,7 @@
 --exec $MYSQL test -e "\r test_really_long_dbnamexxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx localhost" 2>&1
 
 --echo Too long hostname
---replace_regex /\([0-9]*\)/(errno)/
+--replace_regex /\([-0-9]*\)/(errno)/
 --error 1
 --exec $MYSQL test -e "\r  test cyrils_superlonghostnameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" 2>&1
 
@@ -348,7 +348,7 @@
 #
 # Bug#37268 'binary' character set makes CLI-internal commands case sensitive
 #
---replace_regex /\([0-9]*\)/(errno)/
+--replace_regex /\([-0-9]*\)/(errno)/
 --error 1
 --exec $MYSQL --default-character-set=binary test -e "CONNECT test invalid_hostname" 2>&1
 --exec $MYSQL --default-character-set=binary test -e "DELIMITER //" 2>&1
diff -Nru mysql-8.0-8.0.26/mysql-test/t/mysqltest.test mysql-8.0-8.0.27/mysql-test/t/mysqltest.test
--- mysql-8.0-8.0.26/mysql-test/t/mysqltest.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/mysqltest.test	2021-09-28 11:46:34.000000000 +0000
@@ -4289,7 +4289,7 @@
   PRIMARY KEY (c1)
 );
 
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 1, -500, "aaa");
 DELETE FROM t1;
 
 # disable_warnings should disable all the warnings
@@ -4299,101 +4299,101 @@
 
 # enable_warning should enable all the disable warnings
 --enable_warnings
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 3, -500, "aaa");
 DELETE FROM t1;
 
 # disable_warnings with warning list argument, should suppress only
 # the specified warnings.
 --disable_warnings ER_WARN_DATA_OUT_OF_RANGE
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 4, -500, "aaa");
 DELETE FROM t1;
 
 # If there exist disabled warnings, new disabled warnings specified
 # will get appended to the existing list of disabled_warnings.
 # All three warnings should be disabled now.
 --disable_warnings ER_TRUNCATED_WRONG_VALUE,ER_TRUNCATED_WRONG_VALUE_FOR_FIELD
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 5, -500, "aaa");
 DELETE FROM t1;
 
 # enable_warnings with warning list argument, should enable only
 # the specified warnings.
 --enable_warnings ER_TRUNCATED_WRONG_VALUE
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 6, -500, "aaa");
 DELETE FROM t1;
 
 --enable_warnings ER_WARN_DATA_OUT_OF_RANGE
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 7, -500, "aaa");
 DELETE FROM t1;
 
 # Enable all the warnings
 --enable_warnings ER_TRUNCATED_WRONG_VALUE_FOR_FIELD
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 8, -500, "aaa");
 DELETE FROM t1;
 
 # Disable all the warnings
 --disable_warnings
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 9, -500, "aaa");
 DELETE FROM t1;
 
 # enable_warnings with warning list argument
 --enable_warnings ER_TRUNCATED_WRONG_VALUE_FOR_FIELD
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 10, -500, "aaa");
 DELETE FROM t1;
 
 # If there exist enabled warnings, new enabled warnings specified
 # will get appended to the existing list of enabled_warnings.
 # All three warnings should be enabled now.
 --enable_warnings ER_WARN_DATA_OUT_OF_RANGE,ER_TRUNCATED_WRONG_VALUE
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 11, -500, "aaa");
 DELETE FROM t1;
 --enable_warnings
 
 # disable_warnings with "ONCE" argument
 --disable_warnings ER_WARN_DATA_OUT_OF_RANGE,ER_TRUNCATED_WRONG_VALUE ONCE
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 12, -500, "aaa");
 DELETE FROM t1;
 
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 13, -500, "aaa");
 DELETE FROM t1;
 
 --disable_warnings ER_WARN_DATA_OUT_OF_RANGE,ER_TRUNCATED_WRONG_VALUE,ER_TRUNCATED_WRONG_VALUE_FOR_FIELD ONCE
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 14, -500, "aaa");
 DELETE FROM t1;
 
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 15, -500, "aaa");
 DELETE FROM t1;
 
 # enable_warnings with "ONCE" argument
 --disable_warnings
 --enable_warnings ER_TRUNCATED_WRONG_VALUE ONCE
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 16, -500, "aaa");
 DELETE FROM t1;
 
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 17, -500, "aaa");
 DELETE FROM t1;
 
 --enable_warnings ER_WARN_DATA_OUT_OF_RANGE,ER_TRUNCATED_WRONG_VALUE,ER_TRUNCATED_WRONG_VALUE_FOR_FIELD ONCE
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 18, -500, "aaa");
 DELETE FROM t1;
 
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 19, -500, "aaa");
 DELETE FROM t1;
 --enable_warnings
 
 # Disabling a warning more than once WILL NOT have any effect, attempts
 # to disable it after the first one WILL be ignored.
 --disable_warnings ER_WARN_DATA_OUT_OF_RANGE,ER_TRUNCATED_WRONG_VALUE
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 20, -500, "aaa");
 DELETE FROM t1;
 
 --disable_warnings ER_WARN_DATA_OUT_OF_RANGE
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 21, -500, "aaa");
 DELETE FROM t1;
 
 # ER_WARN_DATA_OUT_OF_RANGE is disaled twice, enabling it ONLY ONCE is
 # enough since disabling of the same warning again will be ignored.
 --enable_warnings ER_WARN_DATA_OUT_OF_RANGE,ER_TRUNCATED_WRONG_VALUE
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 22, -500, "aaa");
 DELETE FROM t1;
 
 # $DISABLED_WARNINGS_LIST contains list of currently disabled warnings.
@@ -4402,7 +4402,7 @@
 
 # Disable ER_WARN_DATA_OUT_OF_RANGE and ER_TRUNCATED_WRONG_VALUE warnings
 --disable_warnings ER_WARN_DATA_OUT_OF_RANGE,ER_TRUNCATED_WRONG_VALUE
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 23, -500, "aaa");
 DELETE FROM t1;
 
 # $DISABLED_WARNINGS_LIST should contains 2 warnings
@@ -4410,7 +4410,7 @@
 
 # Disable ER_TRUNCATED_WRONG_VALUE_FOR_FIELD warning
 --disable_warnings ER_TRUNCATED_WRONG_VALUE_FOR_FIELD
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 24, -500, "aaa");
 DELETE FROM t1;
 
 # $DISABLED_WARNINGS_LIST should contains 3 warnings now
@@ -4432,12 +4432,12 @@
 # updated after the execution of the next statement.
 --disable_warnings ER_WARN_DATA_OUT_OF_RANGE,ER_TRUNCATED_WRONG_VALUE ONCE
 --echo $DISABLED_WARNINGS_LIST
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 25, -500, "aaa");
 DELETE FROM t1;
 
 # $DISABLED_WARNINGS_LIST should be empty now
 --echo $DISABLED_WARNINGS_LIST
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 26, -500, "aaa");
 DELETE FROM t1;
 
 # $ENABLED_WARNINGS_LIST contains list of currently enabled warnings.
@@ -4445,12 +4445,12 @@
 --echo $ENABLED_WARNINGS_LIST
 
 --disable_warnings
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 27, -500, "aaa");
 DELETE FROM t1;
 
 # Enable ER_WARN_DATA_OUT_OF_RANGE warning
 --enable_warnings ER_WARN_DATA_OUT_OF_RANGE
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 28, -500, "aaa");
 DELETE FROM t1;
 
 # $ENABLED_WARNINGS_LIST should contain ER_WARN_DATA_OUT_OF_RANGE
@@ -4458,7 +4458,7 @@
 
 # Enable ER_TRUNCATED_WRONG_VALUE,ER_TRUNCATED_WRONG_VALUE_FOR_FIELD
 --enable_warnings ER_TRUNCATED_WRONG_VALUE,ER_TRUNCATED_WRONG_VALUE_FOR_FIELD
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 29, -500, "aaa");
 DELETE FROM t1;
 
 # $ENABLED_WARNINGS_LIST should contain 3 warnings
@@ -4476,12 +4476,12 @@
 --disable_warnings
 --enable_warnings ER_WARN_DATA_OUT_OF_RANGE,ER_TRUNCATED_WRONG_VALUE ONCE
 --echo $ENABLED_WARNINGS_LIST
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 30, -500, "aaa");
 DELETE FROM t1;
 
 # $ENABLED_WARNINGS_LIST should be empty now
 --echo $ENABLED_WARNINGS_LIST
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 31, -500, "aaa");
 DELETE FROM t1;
 --enable_warnings
 
@@ -4490,15 +4490,15 @@
 --let $warning_1 = ER_WARN_DATA_OUT_OF_RANGE
 --let $warning_2 = ER_TRUNCATED_WRONG_VALUE
 --disable_warnings $warning_1,$warning_2
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 32, -500, "aaa");
 DELETE FROM t1;
 
 --enable_warnings $warning_1
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 33, -500, "aaa");
 DELETE FROM t1;
 
 --enable_warnings $warning_2
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 34, -500, "aaa");
 
 # Cleanup
 SET @@sql_mode = @old_sql_mode;
@@ -4665,21 +4665,21 @@
 # Only ER_TRUNCATED_WRONG_VALUE should be disabled ONCE.
 --disable_warnings ER_WARN_DATA_OUT_OF_RANGE ONCE
 --disable_warnings ER_TRUNCATED_WRONG_VALUE ONCE
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 35, -500, "aaa");
 DELETE FROM t1;
 
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 36, -500, "aaa");
 DELETE FROM t1;
 
 # ER_WARN_DATA_OUT_OF_RANGE and ER_TRUNCATED_WRONG_VALUE should be
 # disabled for the first INSERT statement.
 --disable_warnings ER_WARN_DATA_OUT_OF_RANGE
 --disable_warnings ER_TRUNCATED_WRONG_VALUE ONCE
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 37, -500, "aaa");
 DELETE FROM t1;
 
 # Only ER_WARN_DATA_OUT_OF_RANGE should be disabled.
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 38, -500, "aaa");
 DELETE FROM t1;
 --enable_warnings
 
@@ -4687,21 +4687,21 @@
 --disable_warnings
 --enable_warnings ER_WARN_DATA_OUT_OF_RANGE ONCE
 --enable_warnings ER_TRUNCATED_WRONG_VALUE ONCE
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 39, -500, "aaa");
 DELETE FROM t1;
 
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 40, -500, "aaa");
 DELETE FROM t1;
 
 # ER_WARN_DATA_OUT_OF_RANGE and ER_TRUNCATED_WRONG_VALUE should be
 # enabled for the first INSERT statement.
 --enable_warnings ER_WARN_DATA_OUT_OF_RANGE
 --enable_warnings ER_TRUNCATED_WRONG_VALUE ONCE
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 41, -500, "aaa");
 DELETE FROM t1;
 
 # Only ER_WARN_DATA_OUT_OF_RANGE should be enabled.
-INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 2, -500, "aaa");
+INSERT INTO t1 VALUES (0x7FFFFFFFFFFFFFFD, 42, -500, "aaa");
 DELETE FROM t1;
 
 --enable_warnings
@@ -4949,3 +4949,115 @@
 }
 
 --assert(4)
+
+
+--echo #
+--echo # Bug#33068833 MISSING END OF BLOCK ERROR WITH `--ASSERT` MYSQLTEST COMMAND
+--echo #
+
+while(0)
+{
+  --assert(0)
+}
+
+if ($myvar)
+{
+  assert(0);
+}
+
+while ($myvar)
+{
+  assert(0);
+}
+
+--let $myvar=0
+if ($myvar)
+{
+  assert(0);
+}
+
+while ($myvar)
+{
+  assert(0);
+}
+
+--let $myvar=1
+if ($myvar)
+{
+  --assert(1)
+}
+
+while ($myvar)
+{
+  --assert(1)
+  --dec $myvar
+}
+
+--error 1
+--exec echo "--assert(abcd)" | $MYSQL_TEST 2>&1
+
+--let $true_var=1
+--assert(`SELECT $true_var`)
+
+--error 1
+--exec echo "--assert(0)" | $MYSQL_TEST 2>&1
+
+--error 1
+--exec echo "--assert(\$undef_var)" | $MYSQL_TEST 2>&1
+
+--error 1
+--exec echo "let \$false_var=0; assert(\$false_var);" | $MYSQL_TEST 2>&1
+
+--write_file $MYSQLTEST_VARDIR/tmp/myt_assert1.test
+--let $false_var=0
+--assert(`SELECT $false_var`)
+EOF
+--error 1
+--exec $MYSQL_TEST < $MYSQLTEST_VARDIR/tmp/myt_assert1.test 2>&1
+--remove_file $MYSQLTEST_VARDIR/tmp/myt_assert1.test
+
+--write_file $MYSQLTEST_VARDIR/tmp/myt_assert2.test
+--let $myvar=1
+if($myvar)
+{
+  --assert(`SELECT 0`)
+}
+EOF
+--error 1
+--exec $MYSQL_TEST < $MYSQLTEST_VARDIR/tmp/myt_assert2.test 2>&1
+--remove_file $MYSQLTEST_VARDIR/tmp/myt_assert2.test
+
+--write_file $MYSQLTEST_VARDIR/tmp/myt_assert3.test
+--let $myvar=1
+while($myvar)
+{
+  --assert($myvar)
+  --dec $myvar
+  --assert($myvar)
+}
+EOF
+--error 1
+--exec $MYSQL_TEST < $MYSQLTEST_VARDIR/tmp/myt_assert3.test 2>&1
+--remove_file $MYSQLTEST_VARDIR/tmp/myt_assert3.test
+
+--write_file $MYSQLTEST_VARDIR/tmp/myt_assert4.test
+--let $counter= 2
+while ($counter)
+{
+  --assert($counter)
+  --dec $counter
+  if ($counter)
+  {
+    # Should not assert
+    --assert($counter)
+  }
+  if (!$counter)
+  {
+    # Asserts here
+    --assert($counter)
+  }
+}
+EOF
+--error 1
+--exec $MYSQL_TEST -x $MYSQLTEST_VARDIR/tmp/myt_assert4.test 2>&1
+--remove_file $MYSQLTEST_VARDIR/tmp/myt_assert4.test
diff -Nru mysql-8.0-8.0.26/mysql-test/t/mysql_upgrade.test mysql-8.0-8.0.27/mysql-test/t/mysql_upgrade.test
--- mysql-8.0-8.0.26/mysql-test/t/mysql_upgrade.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/mysql_upgrade.test	2021-09-28 11:46:34.000000000 +0000
@@ -99,5 +99,33 @@
 
 --source include/mysql_upgrade_cleanup.inc
 
+--echo #
+--echo # Bug #33165861: WL#14183 new privileges not taken into account for upgrades
+--echo #
+
+CREATE USER u1,u2;
+GRANT CREATE USER ON *.* TO u1;
+GRANT SYSTEM_VARIABLES_ADMIN ON *.* TO u2;
+--echo # There should be no PASSWORDLESS_USER_ADMIN privilege
+SHOW GRANTS FOR u1;
+--echo # There should be no AUTHENTICATION_POLICY_ADMIN privilege
+SHOW GRANTS FOR u2;
+
+# remove these privielges
+REVOKE PASSWORDLESS_USER_ADMIN, AUTHENTICATION_POLICY_ADMIN ON *.* FROM root@localhost;
+
+--let $restart_parameters = restart:--upgrade=FORCE
+--let $wait_counter= 10000
+--source include/restart_mysqld.inc
+
+--echo # Must have PASSWORDLESS_USER_ADMIN privilege
+SHOW GRANTS FOR u1;
+--echo # Must have AUTHENTICATION_POLICY_ADMIN privilege
+SHOW GRANTS FOR u2;
+--echo # Must have AUTHENTICATION_POLICY_ADMIN, PASSWORDLESS_USER_ADMIN privilegea
+SHOW GRANTS FOR root@localhost;
+# Cleanup
+DROP USER u1,u2;
+
 --echo
 --echo End of tests
diff -Nru mysql-8.0-8.0.26/mysql-test/t/no_binlog.test mysql-8.0-8.0.27/mysql-test/t/no_binlog.test
--- mysql-8.0-8.0.26/mysql-test/t/no_binlog.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/no_binlog.test	2021-09-28 11:46:34.000000000 +0000
@@ -7,12 +7,11 @@
 SHOW BINARY LOGS;
 
 --echo #
---echo # Verify that The log-replica-updates and replica-preserve-commit-order
---echo # are disabled if binary log is disabled.
+--echo # Verify that The log-replica-updates
+--echo # is disabled if binary log is disabled.
 --echo #
 SELECT @@GLOBAL.log_bin;
 SELECT @@GLOBAL.log_replica_updates;
-SELECT @@GLOBAL.replica_preserve_commit_order;
 
 --echo #
 --echo # Bug#32234194: DDL: DIAGNOSTICS_AREA::SET_OK_STATUS: ASSERTION `!IS_SET()'
diff -Nru mysql-8.0-8.0.26/mysql-test/t/olap.test mysql-8.0-8.0.27/mysql-test/t/olap.test
--- mysql-8.0-8.0.26/mysql-test/t/olap.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/olap.test	2021-09-28 11:46:34.000000000 +0000
@@ -881,6 +881,7 @@
 
 #Bug#31073133 - The plan below should not have sorting on "i" before rollup
 #is processed.
+--skip_if_hypergraph  # Has fewer temporary tables in the plan.
 EXPLAIN FORMAT=tree SELECT i, j, i+j, AVG(j) over () from t1 GROUP BY i,j
 WITH ROLLUP HAVING i+j is NULL ORDER BY i;
 SELECT i, j, i+j, AVG(j) over () from t1 GROUP BY i,j WITH ROLLUP
@@ -1048,6 +1049,10 @@
 CREATE TABLE t(a INT,b BLOB);
 INSERT INTO t VALUES (1,'a'),(1,'b'),(2,'c'),(3,'d');
 
+# This query is pretty nonsensical, and the query output itself doesn't matter much;
+# we just don't want it to crash. The result will depend on the point of which
+# we evaluate the variable assignments, so it's not stable with respect to the query plan.
+--replace_regex /^NULL$/1/
 SELECT (((@e:=`b`)) NOT BETWEEN 0x0b5f09 AND (CHAR(md5(@pub1),
   (CONNECTION_ID()+LEAD(5225.750000,110) RESPECT NULLS OVER(ORDER BY b, a)))))
   FROM t GROUP BY b,a WITH ROLLUP;
@@ -1171,3 +1176,56 @@
 INSERT INTO t1 VALUES (1), (2), (3);
 SELECT DISTINCT i FROM t1 WHERE i = 1 GROUP BY i WITH ROLLUP;
 DROP TABLE t1;
+
+--echo #
+--echo # Bug #32918927: ASSERTION `!THD->IS_ERROR()' FAILED|SQL/SQL_EXECUTOR.CC
+--echo #
+
+CREATE TABLE t1 ( a TIME );
+
+--skip_if_hypergraph  # Adds a warning (on every row) instead of an error.
+--error ER_CANT_AGGREGATE_NCOLLATIONS
+SELECT
+  t1.a
+FROM
+  t1, t1 AS t2
+GROUP BY t1.a WITH ROLLUP
+HAVING COUNT(*) = 0 AND t1.a = '刔';
+
+DROP TABLE t1;
+
+--echo #
+--echo # Bug#33036184: GROUP BY WITH ROLLUP AND CONCAT OVER GROUP BY KEY DOES NOT PRODUCE NULL
+--echo #
+
+CREATE TABLE t1 (f1 INTEGER PRIMARY KEY);
+INSERT INTO t1 values (1);
+
+# Result should have a NULL for the super-aggregate row
+SELECT CONCAT(INSTR(f1,'w')) FROM t1 GROUP BY f1 WITH ROLLUP;
+
+DROP TABLE t1;
+
+--echo #
+--echo # Bug #33041336: WL#14419: ASSERTION `THD->CHANGE_LIST.IS_EMPTY()' FAILED
+--echo #
+
+CREATE TABLE t1 ( a INTEGER );
+PREPARE ps FROM "SELECT RANK() OVER (ORDER BY a) FROM t1 GROUP BY a WITH ROLLUP";
+DROP TABLE t1;
+
+--echo #
+--echo # Bug #33123934: QUERY WITH ROLLUP - SEGFAULT IN CHANGE_TO_USE_TMP_FIELDS_EXCEPT_SUMS
+--echo #
+
+CREATE TABLE t1 ( a VARCHAR(10), b TIMESTAMP );
+
+SELECT
+  REPLACE( IF( t2.a = t2.b, _latin1 'a', 'e'), 'd', 'b' )
+FROM
+  t1, t1 AS t2
+GROUP BY
+  REPLACE( IF( t2.a = t2.b, _latin1 'a', 'e'), 'd', 'b' )
+WITH ROLLUP;
+
+DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/order_by_sortkey.test mysql-8.0-8.0.27/mysql-test/t/order_by_sortkey.test
--- mysql-8.0-8.0.26/mysql-test/t/order_by_sortkey.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/order_by_sortkey.test	2021-09-28 11:46:34.000000000 +0000
@@ -60,7 +60,6 @@
 SELECT * FROM t1 ORDER BY f2,f0 LIMIT 101;
 
 # 32-bit has smaller pointers and thus can do with fewer merge passes.
---skip_if_hypergraph  # LIMIT optimization in filesort not supported yet.
 --replace_result 100 102
 SHOW SESSION STATUS LIKE 'Sort%';
 
@@ -70,7 +69,6 @@
 SELECT * FROM t2 where f1 =
 (SELECT f2 from t1 where t1.f1 = t2.f1 ORDER BY f1 LIMIT 1);
 
---skip_if_hypergraph  # LIMIT optimization in filesort not supported yet.
 SHOW SESSION STATUS LIKE 'Sort%';
 
 DROP TABLE t1, t2, tmp;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/partition-master.opt mysql-8.0-8.0.27/mysql-test/t/partition-master.opt
--- mysql-8.0-8.0.26/mysql-test/t/partition-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/partition-master.opt	2021-09-28 11:46:34.000000000 +0000
@@ -1,2 +1 @@
---thread-stack=524288
---innodb-directories=$MYSQL_TMP_DIR
\ No newline at end of file
+--innodb-directories=$MYSQL_TMP_DIR
diff -Nru mysql-8.0-8.0.26/mysql-test/t/persisted_variables_bugs_debug.test mysql-8.0-8.0.27/mysql-test/t/persisted_variables_bugs_debug.test
--- mysql-8.0-8.0.26/mysql-test/t/persisted_variables_bugs_debug.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/persisted_variables_bugs_debug.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,16 @@
+--source include/have_debug.inc
+
+--echo #
+--echo # Bug#33038262: VARIOUS RACES IN PERSISTEN SYSTEM VARIABLE IMPLEMENTATION
+--echo #
+
+SET @@debug='+d,check_intern_find_sys_var_lock';
+# Success criteria: should not crash.
+SET PERSIST_ONLY sql_mode=DEFAULT;
+SET PERSIST sql_mode=DEFAULT;
+RESET PERSIST sql_mode;
+RESET PERSIST;
+SET @@debug='-d,check_intern_find_sys_var_lock';
+
+--echo # cleanup
+--source include/restart_mysqld.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/t/persisted_variables_bugs.test mysql-8.0-8.0.27/mysql-test/t/persisted_variables_bugs.test
--- mysql-8.0-8.0.26/mysql-test/t/persisted_variables_bugs.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/persisted_variables_bugs.test	2021-09-28 11:46:34.000000000 +0000
@@ -453,4 +453,24 @@
 
 RESET PERSIST;
 
+
+--echo #
+--echo # Bug #32640588: SOURCE FOR SKIP_SLAVE_START DISPLAYED AS COMPILED
+--echo #   WHEN IT IS PERSISTED
+--echo #
+
+--echo # Should both be "COMPILED"
+SELECT VARIABLE_NAME, VARIABLE_SOURCE FROM performance_schema.variables_info
+  WHERE variable_name LIKE 'skip_%_start' ORDER BY 1;
+SET PERSIST_ONLY skip_replica_start = ON;
+--echo # Should still be "COMPILED" pre-restart
+SELECT VARIABLE_NAME, VARIABLE_SOURCE FROM performance_schema.variables_info
+  WHERE variable_name LIKE 'skip_%_start' ORDER BY 1;
+--source include/restart_mysqld.inc
+--echo # Success criteria: Should be "PERSISTED" post-restart
+SELECT VARIABLE_NAME, VARIABLE_SOURCE FROM performance_schema.variables_info
+  WHERE variable_name LIKE 'skip_%_start' ORDER BY 1;
+RESET PERSIST;
+--source include/restart_mysqld.inc
+
 --echo # End of the 8.0 tests
diff -Nru mysql-8.0-8.0.26/mysql-test/t/persisted_variables_extended.test mysql-8.0-8.0.27/mysql-test/t/persisted_variables_extended.test
--- mysql-8.0-8.0.26/mysql-test/t/persisted_variables_extended.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/persisted_variables_extended.test	2021-09-28 11:46:34.000000000 +0000
@@ -276,6 +276,7 @@
 SET GLOBAL general_log_file=  @old_general_log_file;
 SET GLOBAL general_log=       @old_general_log;
 SET GLOBAL log_output=        @old_log_output;
+TRUNCATE TABLE mysql.general_log;
 
 # UNSET PERSIST variables by setting variables values to DEFAULT.
 SET PERSIST block_encryption_mode=DEFAULT, PERSIST ft_boolean_syntax=DEFAULT,
diff -Nru mysql-8.0-8.0.26/mysql-test/t/point_select_hypergraph.test mysql-8.0-8.0.27/mysql-test/t/point_select_hypergraph.test
--- mysql-8.0-8.0.26/mysql-test/t/point_select_hypergraph.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/point_select_hypergraph.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,17 @@
+--source include/have_hypergraph.inc
+
+--echo #
+--echo # Bug #32808908: MAKE PREPARED STATEMENT PLACEHOLDERS SARGABLE IN THE HYPERGRAPH OPTIMIZER
+--echo #
+
+CREATE TABLE t1 ( pk INTEGER NOT NULL, a INTEGER, PRIMARY KEY ( pk ) );
+INSERT INTO t1 VALUES (1,10), (2,20), (3,30), (4,40), (5,50), (6,60), (7,70), (8,80), (9,90), (10,100);
+ANALYZE TABLE t1;
+
+PREPARE q FROM 'EXPLAIN FORMAT=tree SELECT * FROM t1 WHERE pk = ?';
+SET @v = 2;
+EXECUTE q USING @v;
+
+DROP TABLE t1;
+
+SET optimizer_switch=DEFAULT;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/ps_ddl-master.opt mysql-8.0-8.0.27/mysql-test/t/ps_ddl-master.opt
--- mysql-8.0-8.0.26/mysql-test/t/ps_ddl-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/ps_ddl-master.opt	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
---thread_stack=655360
diff -Nru mysql-8.0-8.0.26/mysql-test/t/ps_ddl_myisam-master.opt mysql-8.0-8.0.27/mysql-test/t/ps_ddl_myisam-master.opt
--- mysql-8.0-8.0.26/mysql-test/t/ps_ddl_myisam-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/ps_ddl_myisam-master.opt	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
---thread_stack=655360
diff -Nru mysql-8.0-8.0.26/mysql-test/t/ps-master.opt mysql-8.0-8.0.27/mysql-test/t/ps-master.opt
--- mysql-8.0-8.0.26/mysql-test/t/ps-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/ps-master.opt	2021-09-28 11:46:34.000000000 +0000
@@ -1,4 +1,3 @@
---log-output=table,file
 --slow-query-log
 --log-queries-not-using-indexes
 --innodb_directories=$MYSQLTEST_VARDIR/tmp
\ No newline at end of file
diff -Nru mysql-8.0-8.0.26/mysql-test/t/ps.test mysql-8.0-8.0.27/mysql-test/t/ps.test
--- mysql-8.0-8.0.26/mysql-test/t/ps.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/ps.test	2021-09-28 11:46:34.000000000 +0000
@@ -1,6 +1,9 @@
 -- source include/have_log_bin.inc
 
-call mtr.add_suppression('Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT.'); 
+call mtr.add_suppression('Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT.');
+
+SET @old_log_output=@@global.log_output;
+SET GLOBAL log_output="FILE,TABLE";
 #
 # SQL Syntax for Prepared Statements test
 #
@@ -3504,3 +3507,21 @@
 PREPARE s FROM 'SELECT 1 FROM t1 WHERE TRUE OR ( SELECT 1 FROM (SELECT a) q ) = 1';
 EXECUTE s;
 DROP TABLE t1;
+
+--echo #
+--echo # Bug #32808790: DON'T ADD CACHES AROUND PREPARED STATEMENT PARAMETERS
+--echo #
+
+CREATE TABLE t1 ( pk INTEGER NOT NULL, a INTEGER );
+
+# Verify there's no <cache> around the 2.
+PREPARE q FROM 'EXPLAIN FORMAT=tree SELECT * FROM t1 WHERE pk = ?';
+SET @v = 2;
+--replace_regex /  \(cost=.*//
+EXECUTE q USING @v;
+
+DROP TABLE t1;
+
+SET GLOBAL log_output=@old_log_output;
+TRUNCATE TABLE mysql.general_log;
+TRUNCATE TABLE mysql.slow_log;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/ps_type_deduction.test mysql-8.0-8.0.27/mysql-test/t/ps_type_deduction.test
--- mysql-8.0-8.0.26/mysql-test/t/ps_type_deduction.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/ps_type_deduction.test	2021-09-28 11:46:34.000000000 +0000
@@ -1926,6 +1926,21 @@
 prepare s from 'select NULLIF(?,?)';
 eval $show_trace;
 
+prepare s from 'select NULLIF(100,?)';
+eval $show_trace;
+
+prepare s from 'select NULLIF(?,100)';
+eval $show_trace;
+
+prepare s from 'select 200 + NULLIF(?,?)';
+eval $show_trace;
+
+prepare s from 'select 200 + NULLIF("100",?)';
+eval $show_trace;
+
+prepare s from 'select 200 + NULLIF(?,"100")';
+eval $show_trace;
+
 # OCT
 
 prepare s from 'select OCT(?)';
diff -Nru mysql-8.0-8.0.26/mysql-test/t/range_with_memory_limit.test mysql-8.0-8.0.27/mysql-test/t/range_with_memory_limit.test
--- mysql-8.0-8.0.26/mysql-test/t/range_with_memory_limit.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/range_with_memory_limit.test	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
---source include/not_hypergraph.inc  # Hypergraph optimizer does not call range optimizer.
-
---echo # Bug#17769777 EXCESSIVE MEMORY CONSUMPTION WITH MANY AND / BETWEEN
---echo #              ITEMS
---echo # Bug#17413040 USING MANY WHERE CONDITIONS MAKES RANGE SCAN DISABLED
-
-CREATE TABLE t1 (
-a INT,
-b INT,
-KEY (a)
-)ENGINE=INNODB;
-
-INSERT INTO t1 VALUES (0, 0), (1, 1), (2, 2), (3, 3), (4, 4), (5, 5), (6, 6),
-(7, 7), (8, 8), (9, 9);
-
-ANALYZE TABLE t1;
-SET RANGE_OPTIMIZER_MAX_MEM_SIZE= 100;
-EXPLAIN SELECT DISTINCT a FROM t1 WHERE (a, b) IN ((0, 0), (1, 1));
-SET RANGE_OPTIMIZER_MAX_MEM_SIZE= DEFAULT;
-EXPLAIN SELECT DISTINCT a FROM t1 WHERE (a, b) IN ((0, 0), (1, 1));
-
-DROP TABLE t1;
-
-#Running the entire test suite for range queries to increase the test
-#coverage
-SET RANGE_OPTIMIZER_MAX_MEM_SIZE= 10;
---source include/range.inc
-SET RANGE_OPTIMIZER_MAX_MEM_SIZE= DEFAULT;
-
---echo # End of test for Bug#17769777 and Bug#17413040
diff -Nru mysql-8.0-8.0.26/mysql-test/t/regular_expressions_utf-8.test mysql-8.0-8.0.27/mysql-test/t/regular_expressions_utf-8.test
--- mysql-8.0-8.0.26/mysql-test/t/regular_expressions_utf-8.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/regular_expressions_utf-8.test	2021-09-28 11:46:34.000000000 +0000
@@ -975,3 +975,16 @@
 SET NAMES DEFAULT;
 
 SET SQL_MODE=DEFAULT;
+
+--echo #
+--echo # Bug #33290245 Item_func_st_distance_sphere::val_real():
+--echo #               Assertion `is_nullable()' failed.
+
+--error ER_CANNOT_CONVERT_STRING
+select ( _utf32', ,*') regexp 13946;
+--error ER_CANNOT_CONVERT_STRING
+select regexp_instr( ( _utf32', ,*'), 13946);
+--error ER_CANNOT_CONVERT_STRING
+select regexp_replace( ( _utf32', ,*'), 13946, 42);
+--error ER_CANNOT_CONVERT_STRING
+select regexp_substr( ( _utf32', ,*'), 13946);
diff -Nru mysql-8.0-8.0.26/mysql-test/t/rewrite_general_log.test mysql-8.0-8.0.27/mysql-test/t/rewrite_general_log.test
--- mysql-8.0-8.0.26/mysql-test/t/rewrite_general_log.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/rewrite_general_log.test	2021-09-28 11:46:34.000000000 +0000
@@ -224,6 +224,7 @@
 eval SET GLOBAL general_log_file =  '$old_general_log_file';
 eval SET GLOBAL log_output=        '$old_log_output';
 eval SET GLOBAL general_log=       $old_general_log;
+TRUNCATE TABLE mysql.general_log;
 
 --echo
 --echo End of 5.7 tests!
diff -Nru mysql-8.0-8.0.26/mysql-test/t/rewrite_slow_log.test mysql-8.0-8.0.27/mysql-test/t/rewrite_slow_log.test
--- mysql-8.0-8.0.26/mysql-test/t/rewrite_slow_log.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/rewrite_slow_log.test	2021-09-28 11:46:34.000000000 +0000
@@ -143,6 +143,8 @@
 SET GLOBAL  slow_query_log_file=@old_slow_query_log_file;
 SET GLOBAL  slow_query_log=     @old_slow_query_log;
 SET GLOBAL  log_output=         @old_log_output;
+TRUNCATE TABLE mysql.slow_log;
+TRUNCATE TABLE mysql.general_log;
 --disable_warnings
 SET GLOBAL  master_info_repository= @old_master_info_repository;
 SET GLOBAL  relay_log_info_repository= @old_relay_log_info_repository;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/schema.test mysql-8.0-8.0.27/mysql-test/t/schema.test
--- mysql-8.0-8.0.26/mysql-test/t/schema.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/schema.test	2021-09-28 11:46:34.000000000 +0000
@@ -731,3 +731,11 @@
 ALTER SCHEMA s1 READ ONLY DEFAULT;
 DROP table t1;
 DROP SCHEMA s1;
+
+--echo #
+--echo # Bug #33183590: COLLATE maybe overwritten by charset if both specified in create database stmt
+--echo #
+
+CREATE DATABASE test1 COLLATE utf8mb4_bin CHARACTER SET utf8mb4;
+SHOW CREATE DATABASE test1;
+DROP DATABASE test1;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/session_tracker_trx_state.test mysql-8.0-8.0.27/mysql-test/t/session_tracker_trx_state.test
--- mysql-8.0-8.0.26/mysql-test/t/session_tracker_trx_state.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/session_tracker_trx_state.test	2021-09-28 11:46:34.000000000 +0000
@@ -428,12 +428,12 @@
 SELECT " -> ", argument FROM mysql.general_log WHERE argument LIKE '% DUAL' AND (command_type!='Prepare');
 ROLLBACK;
 
-TRUNCATE TABLE mysql.general_log;
-
 SET GLOBAL general_log_file=  @old_general_log_file;
 SET GLOBAL general_log=       @old_general_log;
 SET GLOBAL log_output=        @old_log_output;
 
+TRUNCATE TABLE mysql.general_log;
+
 
 --echo ########################################################################
 --echo #
diff -Nru mysql-8.0-8.0.26/mysql-test/t/show_check_ci-master.opt mysql-8.0-8.0.27/mysql-test/t/show_check_ci-master.opt
--- mysql-8.0-8.0.26/mysql-test/t/show_check_ci-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/show_check_ci-master.opt	2021-09-28 11:46:34.000000000 +0000
@@ -1 +1 @@
---log-output=table,file --slow-query-log --log-queries-not-using-indexes --myisam-recover-options=""
+--slow-query-log --log-queries-not-using-indexes --myisam-recover-options=""
diff -Nru mysql-8.0-8.0.26/mysql-test/t/show_check_ci_myisam-master.opt mysql-8.0-8.0.27/mysql-test/t/show_check_ci_myisam-master.opt
--- mysql-8.0-8.0.26/mysql-test/t/show_check_ci_myisam-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/show_check_ci_myisam-master.opt	2021-09-28 11:46:34.000000000 +0000
@@ -1 +1 @@
---log-output=table,file --slow-query-log --log-queries-not-using-indexes --myisam-recover-options=""
+--slow-query-log --log-queries-not-using-indexes --myisam-recover-options=""
diff -Nru mysql-8.0-8.0.26/mysql-test/t/show_check_cs-master.opt mysql-8.0-8.0.27/mysql-test/t/show_check_cs-master.opt
--- mysql-8.0-8.0.26/mysql-test/t/show_check_cs-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/show_check_cs-master.opt	2021-09-28 11:46:34.000000000 +0000
@@ -1 +1 @@
---log-output=table,file --slow-query-log --log-queries-not-using-indexes --myisam-recover-options=""
+--slow-query-log --log-queries-not-using-indexes --myisam-recover-options=""
diff -Nru mysql-8.0-8.0.26/mysql-test/t/show_check_cs_myisam-master.opt mysql-8.0-8.0.27/mysql-test/t/show_check_cs_myisam-master.opt
--- mysql-8.0-8.0.26/mysql-test/t/show_check_cs_myisam-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/show_check_cs_myisam-master.opt	2021-09-28 11:46:34.000000000 +0000
@@ -1 +1 @@
---log-output=table,file --slow-query-log --log-queries-not-using-indexes --myisam-recover-options=""
+--slow-query-log --log-queries-not-using-indexes --myisam-recover-options=""
diff -Nru mysql-8.0-8.0.26/mysql-test/t/show_check_cs.test mysql-8.0-8.0.27/mysql-test/t/show_check_cs.test
--- mysql-8.0-8.0.26/mysql-test/t/show_check_cs.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/show_check_cs.test	2021-09-28 11:46:34.000000000 +0000
@@ -19,6 +19,9 @@
 # Test of some show commands
 #
 
+SET @old_log_output= @@global.log_output;
+SET GLOBAL log_output="FILE,TABLE";
+
 --disable_warnings
 drop table if exists t1,t2;
 drop table if exists t1aa,t2aa;
@@ -1388,3 +1391,7 @@
 
 # Wait till all disconnects are completed
 --source include/wait_until_count_sessions.inc
+
+SET @@global.log_output = @old_log_output;
+TRUNCATE TABLE mysql.general_log;
+TRUNCATE TABLE mysql.slow_log;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/signal_demo3-master.opt mysql-8.0-8.0.27/mysql-test/t/signal_demo3-master.opt
--- mysql-8.0-8.0.26/mysql-test/t/signal_demo3-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/signal_demo3-master.opt	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
---thread_stack=655360
diff -Nru mysql-8.0-8.0.26/mysql-test/t/sigusr1.test mysql-8.0-8.0.27/mysql-test/t/sigusr1.test
--- mysql-8.0-8.0.26/mysql-test/t/sigusr1.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/sigusr1.test	2021-09-28 11:46:34.000000000 +0000
@@ -218,6 +218,8 @@
 
 --echo # CLEAN UP
 SET @@global.general_log=0;
+TRUNCATE TABLE mysql.general_log;
+TRUNCATE TABLE mysql.slow_log;
 
 --echo # Restore default settings
 --let $restart_parameters = restart:
diff -Nru mysql-8.0-8.0.26/mysql-test/t/slow_log.test mysql-8.0-8.0.27/mysql-test/t/slow_log.test
--- mysql-8.0-8.0.26/mysql-test/t/slow_log.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/slow_log.test	2021-09-28 11:46:34.000000000 +0000
@@ -154,6 +154,9 @@
 
 SET @@global.slow_query_log_file= @old_slow_query_log_file;
 SET @@global.log_output         = @old_log_output;
+TRUNCATE TABLE mysql.general_log;
+TRUNCATE TABLE mysql.slow_log;
+
 
 --remove_file $MYSQL_TMP_DIR/my_slow.log
 
diff -Nru mysql-8.0-8.0.26/mysql-test/t/sp-bugs.test mysql-8.0-8.0.27/mysql-test/t/sp-bugs.test
--- mysql-8.0-8.0.26/mysql-test/t/sp-bugs.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/sp-bugs.test	2021-09-28 11:46:34.000000000 +0000
@@ -540,3 +540,28 @@
 
 DROP FUNCTION func1;
 DROP FUNCTION func2;
+
+
+--echo #
+--echo # Bug#33079184 - sp_lex_instr::reset_lex_and_exec_core: assertion
+--echo #                `error || m_lex->is_exec_started()' failed.
+--echo # Assertion to make sure sp instruction execution is started unless
+--echo # there is an error, failed.
+--echo #
+DELIMITER $;
+CREATE PROCEDURE p()
+BEGIN
+  DECLARE CONTINUE HANDLER FOR SQLEXCEPTION BEGIN END;
+
+  SET @x = 0;
+  WHILE @x < 2 DO
+    CASE((SELECT q > 1)) WHEN 1 THEN SELECT 1; END CASE;
+    SET @x = @x + 1;
+  END WHILE;
+END$
+DELIMITER ;$
+
+--echo # Without fix, assertion fails for following statement in debug build.
+--echo # In non-debug build, statement executes successfully.
+CALL p();
+DROP PROCEDURE p;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/sp-master.opt mysql-8.0-8.0.27/mysql-test/t/sp-master.opt
--- mysql-8.0-8.0.26/mysql-test/t/sp-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/sp-master.opt	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
---thread_stack=524288
diff -Nru mysql-8.0-8.0.26/mysql-test/t/sp.test mysql-8.0-8.0.27/mysql-test/t/sp.test
--- mysql-8.0-8.0.26/mysql-test/t/sp.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/sp.test	2021-09-28 11:46:34.000000000 +0000
@@ -10001,3 +10001,78 @@
 SELECT f1(1);
 DROP FUNCTION f1;
 DROP FUNCTION f2;
+
+--echo # Bug#32855634: Assert(m_deque == other.m_deque) in mem_root_deque.h
+
+DELIMITER //;
+CREATE PROCEDURE p1()
+BEGIN
+  DROP TEMPORARY TABLE IF EXISTS tmp;
+  CREATE TEMPORARY TABLE tmp(name VARCHAR(64), value VARCHAR(64));
+
+  IF EXISTS(SELECT 1
+            FROM tmp d
+                 LEFT JOIN information_schema.columns c
+                 ON c.table_schema = 'test' AND
+                    upper(c.column_name) = upper(d.name)
+            WHERE c.table_schema IS NULL
+           )
+  THEN
+    SELECT 'then';
+  ELSE
+    SELECT 'else';
+  END IF;
+
+  CASE EXISTS(SELECT 1
+              FROM tmp d
+                   LEFT JOIN information_schema.columns c
+                   ON c.table_schema = 'test' AND
+                      upper(c.column_name) = upper(d.name)
+              WHERE c.table_schema IS NULL
+             )
+  WHEN TRUE THEN SELECT 'true';
+  WHEN FALSE THEN SELECT 'false';
+  END CASE;
+
+  CASE
+  WHEN EXISTS(SELECT 1
+              FROM tmp d
+                   LEFT JOIN information_schema.columns c
+                   ON c.table_schema = 'test' AND
+                      upper(c.column_name) = upper(d.name)
+              WHERE c.table_schema IS NULL
+             )
+  THEN SELECT 'true';
+  ELSE SELECT 'false';
+  END CASE;
+
+  WHILE EXISTS(SELECT 1
+               FROM tmp d
+                    LEFT JOIN information_schema.columns c
+                    ON c.table_schema = 'test' AND
+                       upper(c.column_name) = upper(d.name)
+               WHERE c.table_schema IS NULL
+              )
+  DO
+    SELECT 'while';
+  END WHILE;
+
+  REPEAT
+    SELECT 'repeat';
+  UNTIL NOT
+        EXISTS(SELECT 1
+               FROM tmp d
+                    LEFT JOIN information_schema.columns c
+                    ON c.table_schema = 'test' AND
+                       upper(c.column_name) = upper(d.name)
+               WHERE c.table_schema IS NULL
+              )
+  END REPEAT;
+  DROP TEMPORARY TABLE tmp;
+END;
+//
+DELIMITER ;//
+CALL p1();
+CALL p1();
+
+DROP PROCEDURE p1;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/status-master.opt mysql-8.0-8.0.27/mysql-test/t/status-master.opt
--- mysql-8.0-8.0.26/mysql-test/t/status-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/status-master.opt	2021-09-28 11:46:34.000000000 +0000
@@ -1,3 +1,2 @@
---log-output=table,file
 --table-open-cache-instances=1
 --loose-mysqlx=off
diff -Nru mysql-8.0-8.0.26/mysql-test/t/status.test mysql-8.0-8.0.27/mysql-test/t/status.test
--- mysql-8.0-8.0.26/mysql-test/t/status.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/status.test	2021-09-28 11:46:34.000000000 +0000
@@ -488,7 +488,7 @@
 # Restore global concurrent_insert value. Keep in the end of the test file.
 --connection default
 set @@global.concurrent_insert= @old_concurrent_insert;
-SET GLOBAL log_output = @old_log_output;
+SET GLOBAL log_output = 'FILE,TABLE';
 
 # Wait till we reached the initial number of concurrent sessions
 --source include/wait_until_count_sessions.inc
@@ -591,3 +591,8 @@
 SHOW STATUS LIKE 'Last_query_cost';
 
 DROP TABLE t1, t2;
+
+# Restore default
+SET @@global.log_output = @old_log_output;
+SET @@global.general_log = @old_general_log;
+TRUNCATE TABLE mysql.general_log;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/subquery_bugs.test mysql-8.0-8.0.27/mysql-test/t/subquery_bugs.test
--- mysql-8.0-8.0.26/mysql-test/t/subquery_bugs.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/subquery_bugs.test	2021-09-28 11:46:34.000000000 +0000
@@ -1562,3 +1562,147 @@
 );
 
 DROP TABLE t1;
+
+--echo #
+--echo # Bug #32937950 - HYPERGRAPH: CACHED_ITEM* NEW_CACHED_ITEM: ASSERTION `0' FAILED.
+--echo #
+
+CREATE TABLE t1 (
+  a INTEGER,
+  PRIMARY KEY (a)
+) PARTITION BY LINEAR KEY () PARTITIONS 4;
+
+# Sets up a semijoin on ROW(a) = ROW(a) for some reason,
+# and the WHERE happens to make it cheapest to execute
+# by means of deduplication and inverting the join.
+SELECT 1 FROM t1 WHERE
+  ( SELECT a FROM ( SELECT 1 ) AS q )
+   IN ( SELECT a FROM t1 WHERE a > 0 GROUP BY a );
+
+DROP TABLE t1;
+
+--echo #
+--echo # Bug #32934187: HYPERGRAPH: CRASHING IN ITEM_IN_SUBSELECT::EXEC
+--echo #
+
+CREATE TABLE t1 (a DATETIME);
+INSERT INTO t1 VALUES ('2000-01-01 00:00:00');
+INSERT INTO t1 VALUES ('2000-01-01 00:00:00');
+
+SET @b := _latin1 'a';
+--disable_result_log
+# The hypergraph optimizer errors out, the old optimizer does not.
+--error 0,ER_WRONG_VALUE
+SELECT 1 FROM t1 WHERE (@b IN ( SELECT a FROM t1 )) = a;
+--enable_result_log
+
+DROP TABLE t1;
+
+--echo #
+--echo # Bug#32895824: SIGNAL 6 ASSERTION`!NULL_VALUE || IS_NULLABLE()'
+--echo #               FAILED IN ../SQL/ITEM_FUNC.CC
+--echo #
+CREATE TABLE t(pk INT PRIMARY KEY);
+SELECT 1 FROM t
+WHERE CAST(pk AS UNSIGNED INTEGER) = 1
+      AND pk = (SELECT 1 FROM t);
+DROP TABLE t;
+
+--echo #
+--echo # Bug #32932969: ASSERTION `ITEM->IS_NULLABLE()' FAILED.
+--echo #
+
+CREATE TABLE t1 (a INTEGER);
+INSERT INTO t1 VALUES (1);
+--error ER_GIS_INVALID_DATA
+SELECT 1 FROM t1 GROUP BY (
+  SELECT COALESCE(18446744073709551614, COUNT(ST_AREA(ST_ASWKT(a))))
+) WITH ROLLUP;
+DROP TABLE t1;
+
+--echo #
+--echo # Bug #33076462: PB2: FAILURE IN RQG_MULTI_UPDATE_DELETE TEST
+--echo #
+
+CREATE TABLE t1 ( c INTEGER, KEY (c) );
+
+CREATE TABLE t2 ( pk INTEGER );
+INSERT INTO t2 VALUES (7);
+
+CREATE TABLE t3 (
+  a INTEGER,
+  b INTEGER,
+  c INTEGER,
+  KEY (a)
+);
+INSERT INTO t3 VALUES (3,4,NULL);
+
+ANALYZE TABLE t1, t2, t3;
+
+UPDATE t1, t2
+  SET t1.c = 0
+  WHERE t1.c <> (
+    SELECT
+      t3.c
+    FROM
+      t3
+      JOIN t3 AS t3_b ON t3_b.a > t3.a
+    WHERE t3.b <= t3.b XOR t2.pk = 3
+  );
+
+DROP TABLE t1, t2, t3;
+
+--echo #
+--echo # Bug #33030793: WL#14419: ASSERTION `NEW_PATH->COST >= NEW_PATH->INIT_COST' FAILED
+--echo #
+
+CREATE TABLE t1 ( a BLOB );
+
+SELECT t1.a
+FROM
+  t1,
+  LATERAL ( SELECT t1.a FROM t1 AS inner_t1 LIMIT 1 ) AS d1
+WHERE 1 IN ( SELECT a FROM t1 )
+ORDER BY a;
+
+DROP TABLE t1;
+
+--echo #
+--echo # Bug #33045256: WL#14419: ASSERTION `NULLPTR != DYNAMIC_CAST<TARGET>(ARG)' FAILED
+--echo #
+
+CREATE TABLE t1 (a INTEGER);
+INSERT INTO t1 VALUES (1);
+
+# Disable the output, since only the hypergraph optimizer can actually run this query.
+--disable_result_log
+--error 0,ER_NOT_SUPPORTED_YET
+SELECT * FROM (
+  SELECT a, JSON_ARRAYAGG(a) OVER () AS b FROM t1
+) AS d1
+WHERE (a,b) IN (
+  SELECT a, JSON_ARRAYAGG(a) OVER () AS b FROM t1
+);
+--enable_result_log
+
+DROP TABLE t1;
+
+--echo #
+--echo # Bug #33075707: HYPERGRAPH: ASSERTION `COND->REAL_ITEM()->IS_BOOL_FUNC()' FAILED
+--echo #
+
+CREATE TABLE t1 ( a VARCHAR(1) );
+INSERT INTO t1 VALUES ('0');
+
+# NOTE: The regexp_like() contains an error (the empty pattern is
+# not allowed), but it will never be evaluated.
+SELECT 1
+FROM t1
+WHERE a NOT IN (
+  SELECT 1
+  FROM
+    t1 AS t2
+    LEFT JOIN t1 AS t3 ON (t2.a = t3.a OR 0 IN ( SELECT REGEXP_LIKE(a, '') FROM t1 ))
+);
+
+DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/subquery_scalar_to_derived_correlated.test mysql-8.0-8.0.27/mysql-test/t/subquery_scalar_to_derived_correlated.test
--- mysql-8.0-8.0.26/mysql-test/t/subquery_scalar_to_derived_correlated.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/subquery_scalar_to_derived_correlated.test	2021-09-28 11:46:34.000000000 +0000
@@ -643,6 +643,19 @@
 
 DROP TABLE t1;
 
+--echo #
+--echo # Bug#32998733: SERVER ABORT FROM JOIN::CREATE_INTERMEDIATE_TABLE
+--echo #
+
+CREATE TABLE t1 (a INTEGER);
+CREATE TABLE t2 (b INTEGER);
+# As the predicate in the subquery has only correlated operands, we should
+# not be transforming this subquery into a derived table.
+EXPLAIN SELECT 1 FROM t1 WHERE ( SELECT DISTINCT b FROM t2 WHERE t1.a = t1.a );
+SELECT 1 FROM t1 WHERE ( SELECT DISTINCT b FROM t2 WHERE t1.a = t1.a );
+
+DROP TABLE t1,t2;
+
 SET optimizer_switch = 'subquery_to_derived=default';
 # Local Variables:
 # mode: sql
diff -Nru mysql-8.0-8.0.26/mysql-test/t/subquery_scalar_to_derived.test mysql-8.0-8.0.27/mysql-test/t/subquery_scalar_to_derived.test
--- mysql-8.0-8.0.26/mysql-test/t/subquery_scalar_to_derived.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/subquery_scalar_to_derived.test	2021-09-28 11:46:34.000000000 +0000
@@ -2200,6 +2200,9 @@
 
 CREATE TABLE t1 ( pk INTEGER );
 
+# The old optimizer calls both queries COUNT(*); the hypergraph optimizer
+# gets the names f1 and f2 right. We only really care that it doesn't crash,
+# so accept both.
 SELECT
   (SELECT COUNT(*) FROM t1) AS f1,
   (SELECT COUNT(*) FROM t1) AS f2
@@ -2208,4 +2211,82 @@
 
 DROP TABLE t1;
 
+--echo #
+--echo # Bug#33057397: FIELD NAMES ARE DISPLAYED INCORRECTLY WITH ROLLUP AND
+--echo #               SUBQUERY_TO_DERIVED
+
+CREATE TABLE t1 ( f1 INTEGER);
+INSERT INTO t1 VALUES (0);
+
+# Name of the expression should be displayed as "field1".
+# Used to be "min".
+SELECT (SELECT MIN(f1) AS min FROM t1 ) AS field1 FROM t1 GROUP BY
+field1 WITH ROLLUP;
+
+DROP TABLE t1;
+
+--echo #
+--echo # Bug#33104036: ASSERTION FAILURE IN FIND_SUBQUERY_IN_SELECT_LIST AT
+--echo #               ../SQL/ITEM_SUBSELECT.CC
+
+CREATE TABLE t1 (f1 INTEGER);
+# Should not crash
+SELECT (SELECT SUM(f1) AS SQ1_field1 FROM t1) as field1
+ FROM t1 GROUP BY f1 WITH ROLLUP ORDER BY f1;
+DROP TABLE t1;
+
+--echo Original repro case
+CREATE TABLE t1 (pk integer auto_increment,
+                 col_int int ,
+                 col_datetime datetime ,
+                 col_char_255 char(255) ,
+                 col_smallint smallint ,
+                 col_decimal_10_8 decimal(10,8),
+                 primary key(pk)) ;
+
+set sql_mode='';
+
+let $query =
+SELECT alias1.col_decimal_10_8 AS field1 ,
+       ( SELECT SUM(table1.col_smallint ) AS SQ1_field1
+         FROM ( t1 as table1 RIGHT JOIN t1 as table2 ON 1 )
+       ) AS field2 ,
+       GROUPING( LOG(alias1.col_int) ) AS field3
+FROM ( t1 AS alias1
+       JOIN
+       t1 AS alias2 ON 1  )
+WHERE alias2.pk IN ( SELECT col_char_255 FROM t1 )
+GROUP BY field1, field2, LOG(alias1.col_int)
+WITH ROLLUP
+ORDER BY alias1.col_datetime, field1, field2, LOG(alias1.col_int) ;
+
+eval $query;
+eval EXPLAIN $query;
+set sql_mode=default;
+
+DROP TABLE t1;
+
+--echo #
+--echo # Bug#33079592: ASSERTION `SELECT->BASE_REF_ITEMS[ITEM_IDX] == ITEM' FAILED
+--echo #
+
+CREATE TABLE t1 (f1 INTEGER);
+SET optimizer_switch='subquery_to_derived=default';
+# This will throw error
+--error ER_MIX_OF_GROUP_FUNC_AND_FIELDS
+SELECT SUM(f1), ROW_NUMBER() OVER (PARTITION BY f1), (SELECT MIN(f1) FROM t1) FROM t1;
+# This should throw error. But does not because before the full group by verification
+# happens, order by elements are removed (not correct for this case).
+SELECT SUM(f1), ROW_NUMBER() OVER (), (SELECT MIN(f1) FROM t1) FROM t1 ORDER BY f1;
+SET optimizer_switch='subquery_to_derived=on';
+# This will throw error (not as precise as when the transformation is off)
+--error ER_MIX_OF_GROUP_FUNC_AND_FIELDS
+SELECT SUM(f1), ROW_NUMBER() OVER (PARTITION BY f1), (SELECT MIN(f1) FROM t1) FROM t1;
+# This will throw error. Since the order by field is now visible in the derived
+# table.
+--error ER_MIX_OF_GROUP_FUNC_AND_FIELDS
+SELECT SUM(f1), ROW_NUMBER() OVER (), (SELECT MIN(f1) FROM t1) FROM t1 ORDER BY f1;
+--error ER_MIX_OF_GROUP_FUNC_AND_FIELDS
+SELECT SUM(f1), SUM(f1) OVER (), f1, (SELECT MIN(f1) FROM t1) sq FROM t1 ORDER BY f1;
+DROP TABLE t1;
 SET optimizer_switch='subquery_to_derived=default';
diff -Nru mysql-8.0-8.0.26/mysql-test/t/subquery_sj_all_bka-master.opt mysql-8.0-8.0.27/mysql-test/t/subquery_sj_all_bka-master.opt
--- mysql-8.0-8.0.26/mysql-test/t/subquery_sj_all_bka-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/subquery_sj_all_bka-master.opt	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
---thread-stack=524288
diff -Nru mysql-8.0-8.0.26/mysql-test/t/subquery_sj_all_bka_nobnl-master.opt mysql-8.0-8.0.27/mysql-test/t/subquery_sj_all_bka_nobnl-master.opt
--- mysql-8.0-8.0.26/mysql-test/t/subquery_sj_all_bka_nobnl-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/subquery_sj_all_bka_nobnl-master.opt	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
---thread-stack=524288
diff -Nru mysql-8.0-8.0.26/mysql-test/t/subquery_sj_all-master.opt mysql-8.0-8.0.27/mysql-test/t/subquery_sj_all-master.opt
--- mysql-8.0-8.0.26/mysql-test/t/subquery_sj_all-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/subquery_sj_all-master.opt	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
---thread-stack=524288
diff -Nru mysql-8.0-8.0.26/mysql-test/t/subquery_sj_dupsweed_bka-master.opt mysql-8.0-8.0.27/mysql-test/t/subquery_sj_dupsweed_bka-master.opt
--- mysql-8.0-8.0.26/mysql-test/t/subquery_sj_dupsweed_bka-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/subquery_sj_dupsweed_bka-master.opt	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
---thread-stack=524288
diff -Nru mysql-8.0-8.0.26/mysql-test/t/subquery_sj_dupsweed_bka_nobnl-master.opt mysql-8.0-8.0.27/mysql-test/t/subquery_sj_dupsweed_bka_nobnl-master.opt
--- mysql-8.0-8.0.26/mysql-test/t/subquery_sj_dupsweed_bka_nobnl-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/subquery_sj_dupsweed_bka_nobnl-master.opt	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
---thread-stack=524288
diff -Nru mysql-8.0-8.0.26/mysql-test/t/subquery_sj_dupsweed-master.opt mysql-8.0-8.0.27/mysql-test/t/subquery_sj_dupsweed-master.opt
--- mysql-8.0-8.0.26/mysql-test/t/subquery_sj_dupsweed-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/subquery_sj_dupsweed-master.opt	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
---thread-stack=524288
diff -Nru mysql-8.0-8.0.26/mysql-test/t/subquery_sj_firstmatch_bka-master.opt mysql-8.0-8.0.27/mysql-test/t/subquery_sj_firstmatch_bka-master.opt
--- mysql-8.0-8.0.26/mysql-test/t/subquery_sj_firstmatch_bka-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/subquery_sj_firstmatch_bka-master.opt	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
---thread-stack=524288
diff -Nru mysql-8.0-8.0.26/mysql-test/t/subquery_sj_firstmatch-master.opt mysql-8.0-8.0.27/mysql-test/t/subquery_sj_firstmatch-master.opt
--- mysql-8.0-8.0.26/mysql-test/t/subquery_sj_firstmatch-master.opt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/subquery_sj_firstmatch-master.opt	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
---thread-stack=524288
diff -Nru mysql-8.0-8.0.26/mysql-test/t/subselect_debug.test mysql-8.0-8.0.27/mysql-test/t/subselect_debug.test
--- mysql-8.0-8.0.26/mysql-test/t/subselect_debug.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/subselect_debug.test	2021-09-28 11:46:34.000000000 +0000
@@ -69,3 +69,26 @@
 SET DEBUG='-d,create_duplicate_weedout_tmp_table_error';
 DROP TABLE t;
 SET optimizer_switch = DEFAULT;
+
+--echo #
+--echo # Bug#31117893 - GROUP BY WILL THROW TABLE IS
+--echo #   FULL WHEN TEMPTABLE MEMORY ALLOCATION EXCEED LIMIT
+--echo #
+
+CREATE TABLE t1(
+  id INT,
+  pad VARCHAR(60),
+  pad1 VARCHAR(513)
+);
+
+INSERT INTO t1 VALUES (1, REPEAT('a',59), REPEAT('a',512));
+INSERT INTO t1 VALUES (2, REPEAT('a',59), REPEAT('a',512));
+
+SET SESSION debug = '+d, simulate_temp_storage_engine_full';
+SELECT COUNT(*), pad FROM t1 GROUP BY pad;
+# Group-by a bigger column forces the temp-table to use a
+# hash based unique constraint.
+SELECT COUNT(*), pad1 FROM t1 GROUP BY pad1;
+SET SESSION debug = '-d, simulate_temp_storage_engine_full';
+
+DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/table_value_constructor.test mysql-8.0-8.0.27/mysql-test/t/table_value_constructor.test
--- mysql-8.0-8.0.26/mysql-test/t/table_value_constructor.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/table_value_constructor.test	2021-09-28 11:46:34.000000000 +0000
@@ -454,3 +454,11 @@
 VALUES ROW(1,9),ROW(2,4) ORDER BY (SELECT column_1) DESC;
 (VALUES ROW(1,9),ROW(2,4)) ORDER BY (SELECT column_1);
 (VALUES ROW(1,9),ROW(2,4)) ORDER BY (SELECT column_1) DESC;
+
+--echo # Bug#32783943: Item_field::fix_outer_field: assertion `cur_query_block
+
+CREATE TABLE t (w INTEGER);
+--error ER_BAD_FIELD_ERROR
+SELECT (VALUES ROW(1) ORDER BY t) AS a FROM t;
+SELECT (VALUES ROW(1) ORDER BY w) AS a FROM t;
+DROP TABLE t;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/type_blob.test mysql-8.0-8.0.27/mysql-test/t/type_blob.test
--- mysql-8.0-8.0.26/mysql-test/t/type_blob.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/type_blob.test	2021-09-28 11:46:34.000000000 +0000
@@ -540,7 +540,7 @@
 CREATE TABLE b15776 (a year(-2));
 
 
-# We've already tested the case, but this should visually show that 
+# We have already tested the case, but this should visually show that 
 # widths that are too large to be interpreted cause DISPLAYWIDTH errors.
 --error ER_TOO_BIG_DISPLAYWIDTH
 CREATE TABLE b15776 (a int(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999));
@@ -550,17 +550,19 @@
 CREATE TABLE b15776 (a year(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999));
 
 ## Do not select, too much memory needed.
+--error ER_DATA_OUT_OF_RANGE
 CREATE TABLE b15776 select cast(null as char(4294967295));
-show columns from b15776;
-drop table b15776;
+
+--error ER_DATA_OUT_OF_RANGE
 CREATE TABLE b15776 select cast(null as nchar(4294967295));
-show columns from b15776;
-drop table b15776;
+
 CREATE TABLE b15776 select cast(null as binary(4294967295));
 show columns from b15776;
 drop table b15776;
 
+--error ER_DATA_OUT_OF_RANGE
 explain select cast(1 as char(4294967295));
+--error ER_DATA_OUT_OF_RANGE
 explain select cast(1 as nchar(4294967295));
 explain select cast(1 as binary(4294967295));
 
@@ -586,11 +588,13 @@
 --error ER_TOO_BIG_PRECISION,ER_PARSE_ERROR
 explain select cast(1 as decimal(999999999999999999999999999999999999));
 
+--error ER_DATA_OUT_OF_RANGE
 explain select convert(1, char(4294967295));
 --error ER_TOO_BIG_DISPLAYWIDTH
 explain select convert(1, char(4294967296));
 --error ER_TOO_BIG_DISPLAYWIDTH
 explain select convert(1, char(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999));
+--error ER_DATA_OUT_OF_RANGE
 explain select convert(1, nchar(4294967295));
 --error ER_TOO_BIG_DISPLAYWIDTH
 explain select convert(1, nchar(4294967296));
diff -Nru mysql-8.0-8.0.26/mysql-test/t/type_newdecimal.test mysql-8.0-8.0.27/mysql-test/t/type_newdecimal.test
--- mysql-8.0-8.0.26/mysql-test/t/type_newdecimal.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/type_newdecimal.test	2021-09-28 11:46:34.000000000 +0000
@@ -1874,3 +1874,95 @@
 INSERT INTO t1 VALUES(0);
 SELECT * FROM t1 AS alias1 NATURAL JOIN t1 AS alias2;
 DROP TABLE t1;
+
+--echo # Bug#32785804: Failure in decimal_intg
+
+CREATE TABLE t(a DECIMAL(10,4));
+INSERT INTO t VALUES(-1),(1),(100);
+SET @d:=' ';
+--error ER_CANNOT_CONVERT_STRING
+WITH RECURSIVE cte1 AS (
+  SELECT a AS a1 FROM  t
+),
+cte2 AS (
+  SELECT (0xfa > @d) AS a2 FROM t
+)
+SELECT cte1.a1
+FROM cte1,cte2
+WHERE cte1.a1 >= cte2.a2;
+DROP TABLE t;
+
+--echo # Bug#32802251: decimal_bin_size_inline: assertion `scale >= 0 &&
+--echo #               precision > 0 && scale <= precision' failed
+
+CREATE TABLE t(a DECIMAL(14,14) DEFAULT NULL);
+INSERT INTO t VALUES
+ (-0.99999999999999), (-0.99999999999999), (0.15610000000000);
+SELECT WEIGHT_STRING(TRUNCATE((SELECT a FROM t), -17410));
+DROP TABLE t;
+
+--echo #
+--echo # Bug#32345941 SELECT RESULT IS MISMATCH WHEN USE COALESCE AND NOT
+--echo #
+
+SET sql_mode=default;
+
+SELECT 1.0 div (@a:='xx');
+
+SELECT 1.0 div (@a:='1xx');
+
+CREATE TABLE t1 (a DECIMAL(10,0), b DECIMAL(10,0), KEY(a)) ENGINE=INNODB;
+INSERT INTO t1 VALUES (0,0),(1,1);
+
+SELECT a FROM t1 FORCE INDEX(a) WHERE a='m';
+
+SELECT a FROM t1 FORCE INDEX(a) WHERE a=CONCAT('m');
+
+SELECT a FROM t1 FORCE INDEX(a) WHERE a=COALESCE('m');
+
+SELECT * FROM t1 WHERE b='m';
+
+SELECT * FROM t1 WHERE b=CONCAT('m');
+
+SELECT * FROM t1 WHERE b=COALESCE('m');
+
+SELECT a FROM t1 FORCE INDEX(a) WHERE a='';
+
+SELECT a FROM t1 FORCE INDEX(a) WHERE a=CONCAT('');
+
+SELECT a FROM t1 FORCE INDEX(a) WHERE a=COALESCE('');
+
+SELECT * FROM t1 WHERE b='';
+
+SELECT * FROM t1 WHERE b=CONCAT('');
+
+SELECT * FROM t1 WHERE b=COALESCE('');
+
+--error ER_TRUNCATED_WRONG_VALUE
+CREATE TEMPORARY TABLE tt1 AS SELECT * FROM t1 FORCE INDEX(a) WHERE a='m';
+
+--error ER_TRUNCATED_WRONG_VALUE_FOR_FIELD
+CREATE TEMPORARY TABLE tt1 AS SELECT * FROM t1 FORCE INDEX(a) WHERE a=CONCAT('m');
+
+--error ER_TRUNCATED_WRONG_VALUE_FOR_FIELD
+CREATE TEMPORARY TABLE tt1 AS SELECT * FROM t1 FORCE INDEX(a) WHERE a=COALESCE('m');
+
+--error ER_TRUNCATED_WRONG_VALUE
+CREATE TEMPORARY TABLE tt1 AS SELECT * FROM t1 WHERE b='m';
+
+--error ER_TRUNCATED_WRONG_VALUE_FOR_FIELD
+CREATE TEMPORARY TABLE tt1 AS SELECT * FROM t1 WHERE b=CONCAT('m');
+
+--error ER_TRUNCATED_WRONG_VALUE_FOR_FIELD
+CREATE TEMPORARY TABLE tt1 AS SELECT * FROM t1 WHERE b=COALESCE('m');
+
+CREATE TABLE t2 (a char(10), b varchar(10));
+INSERT INTO t2 VALUES('x1 y ', 'x1 y ');
+
+# Just 'x1 y' in warning, since 'a' is CHAR.
+SELECT maketime(1, 2, a) FROM t2;
+
+# Traling space in warning, since 'b' is VARCHAR.
+SELECT maketime(1, 2, b) FROM t2;
+
+DROP TABLE t1, t2;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/type_temporal_fractional.test mysql-8.0-8.0.27/mysql-test/t/type_temporal_fractional.test
--- mysql-8.0-8.0.26/mysql-test/t/type_temporal_fractional.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/type_temporal_fractional.test	2021-09-28 11:46:34.000000000 +0000
@@ -6955,6 +6955,7 @@
   CURRENT_TIME(1),
   CURRENT_TIMESTAMP(),
   CURRENT_TIMESTAMP(4));
+--skip_if_hypergraph  # Different warnings.
 SELECT col_datetime_5_not_null AS c1, col_time_1_not_null_key AS c2 
 FROM t1 
 WHERE
diff -Nru mysql-8.0-8.0.26/mysql-test/t/user_var.test mysql-8.0-8.0.27/mysql-test/t/user_var.test
--- mysql-8.0-8.0.26/mysql-test/t/user_var.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/user_var.test	2021-09-28 11:46:34.000000000 +0000
@@ -744,3 +744,11 @@
 SELECT AVG((@e:= a)) FROM t GROUP BY b;
 DROP TABLE t;
 
+--echo #
+--echo # Bug #32802216: RECENT REGRESSION: PROTOCOL_TEXT::STORE_LONGLONG: ASSERTION `SEND_METADATA || FIELD_TYPES == NULLPTR || FIELD_TYPES[FIELD_POS] == MYSQL_TYPE_LONGLONG' FAILED.
+--echo #
+
+CREATE TABLE t1 (a TINYINT);
+INSERT INTO t1 VALUES (1);
+SELECT (@a:=a) FROM t1 GROUP BY 1;
+DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/variables.test mysql-8.0-8.0.27/mysql-test/t/variables.test
--- mysql-8.0-8.0.26/mysql-test/t/variables.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/variables.test	2021-09-28 11:46:34.000000000 +0000
@@ -1834,7 +1834,8 @@
 LEFT JOIN performance_schema.global_variables b
 ON a.variable_name=b.variable_name
 WHERE b.variable_name IS NULL
-AND a.variable_name NOT IN ('debug_sync');
+AND a.variable_name NOT IN ('debug_sync')
+ORDER BY a.variable_name;
 
 --let $count_vars= `SELECT COUNT(*) FROM all_vars;`
 --let $var_id=1
diff -Nru mysql-8.0-8.0.26/mysql-test/t/view.test mysql-8.0-8.0.27/mysql-test/t/view.test
--- mysql-8.0-8.0.26/mysql-test/t/view.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/view.test	2021-09-28 11:46:34.000000000 +0000
@@ -6281,3 +6281,32 @@
 SHOW CREATE VIEW v1;
 
 DROP VIEW v1, v2;
+
+--echo #
+--echo # BUG#30909064 Explain neglects db part of identifier after create view
+--echo #
+
+CREATE TABLE t1 (
+  pk INT,
+  col_int_key INT,
+  col_int_nokey INT,
+  col_varchar_key VARCHAR(10),
+  col_varchar_nokey VARCHAR(10),
+  KEY col_int_key (col_int_key),
+  KEY col_varchar_key (col_varchar_key)
+);
+INSERT INTO t1 VALUES (), ();
+
+CREATE VIEW v1 AS
+SELECT alias1.col_int_nokey AS field1,
+  (SELECT alias2.col_int_key
+   FROM t1 AS alias2
+   WHERE alias1.col_varchar_key <= alias1.col_varchar_nokey
+  ) AS field2
+FROM t1 AS alias1;
+
+DROP VIEW v1;
+
+EXPLAIN SELECT pk AS foo, col_int_key AS bar FROM t1;
+
+DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/window_functions_big.test mysql-8.0-8.0.27/mysql-test/t/window_functions_big.test
--- mysql-8.0-8.0.26/mysql-test/t/window_functions_big.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/window_functions_big.test	2021-09-28 11:46:34.000000000 +0000
@@ -1,7 +1,6 @@
 --source include/not_valgrind.inc
 --source include/not_sparc_debug.inc
 --source include/big_test.inc
---source include/not_hypergraph.inc
 
 --echo # ----------------------------------------------------------------------
 --echo # Time consuming tests of window functions.
diff -Nru mysql-8.0-8.0.26/mysql-test/t/window_functions_bugs.test mysql-8.0-8.0.27/mysql-test/t/window_functions_bugs.test
--- mysql-8.0-8.0.26/mysql-test/t/window_functions_bugs.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/window_functions_bugs.test	2021-09-28 11:46:34.000000000 +0000
@@ -619,3 +619,192 @@
 SELECT JSON_ARRAY(LEAD(CAST('true' AS JSON), 2, CAST('' AS JSON)) OVER (), '');
 --error ER_INVALID_JSON_TEXT_IN_PARAM
 SELECT JSON_ARRAY(JSON_ARRAYAGG(CAST('' AS JSON)) OVER (), '');
+
+--echo #
+--echo # Bug #32802301: REGRESSION: TYPE_CONVERSION_STATUS FIELD_VARSTRING::STORE: ASSERTION `!TABLE || (!TABLE->WRITE_SET || BITMAP_IS_SET(TABLE->WRITE_SET, FIELD_INDEX()))' FAILED.
+--echo #
+
+CREATE TABLE t1 (a TIMESTAMP NOT NULL);
+INSERT INTO t1 VALUES ('2000-01-01 00:00:00');
+SELECT a + INTERVAL(LAST_VALUE(1) OVER ()) SECOND FROM (SELECT a FROM t1) q;
+DROP TABLE t1;
+
+--echo #
+--echo # Bug#32820802: WRONG RESULT WITH WINDOW FUNCTION AS PART OF EXPRESSION
+--echo #
+
+CREATE TABLE t1 (
+  f1 INTEGER,
+  t1_partkey INTEGER
+);
+
+CREATE TABLE t2 (
+  t2_partkey INTEGER PRIMARY KEY
+);
+
+INSERT INTO t1 VALUES (34, 1), (10, 1), (4, 1), (6, 1),
+                      (9, 2), (64, 2), (31,2);
+INSERT INTO t2 VALUES (1), (2), (3), (4), (5), (6), (7);
+
+ANALYZE TABLE t1, t2;
+
+SELECT 0.2 * AVG(f1) OVER w AS avg, f1
+ FROM t1 JOIN t2 ON t1_partkey = t2_partkey
+ WINDOW w AS (PARTITION BY t1_partkey);
+
+DROP TABLE t1, t2;
+
+--echo #
+--echo # Bug#32328576: BOOL PROCESS_BUFFERED_WINDOWING_RECORD: ASSERTION `!ROW_ADDED
+--echo #               && !FOUND_FIRST' FAILED.
+--echo #
+
+CREATE TABLE t(f1 SET('a','b'), f2 INTEGER);
+INSERT INTO t VALUES ('b',1), ('a',2), ('a,b',3), ('b',0), ('a',1);
+SELECT FIRST_VALUE(f2) OVER(ORDER BY f1 RANGE CURRENT ROW) FROM t;
+DROP TABLE t;
+
+--echo #
+--echo # Bug #33012642: WL#14419: ASSERTION `*TO_LEN >= 2 + FROM->SIGN' FAILED
+--echo #
+
+CREATE TABLE t1 ( a INTEGER NOT NULL );
+INSERT INTO t1 VALUES (4);
+
+# Make sure we don't try to sort-ahead on a, SUM(a) before the grouping.
+SELECT a, SUM(a) OVER () AS s
+FROM t1
+GROUP BY a
+ORDER BY a, s;
+
+DROP TABLE t1;
+
+--echo #
+--echo # Bug #33014346: WL#14419: ASSERTION `RECEIVER.HASSECONDARYENGINECOSTHOOK()' FAILED
+--echo #
+
+CREATE TABLE t1 ( a INTEGER, b INTEGER );
+
+# The (a,b,m) ordering is pre-reduced and combined with (a,b),
+# so we can't ignore it for GROUP BY on the grounds that it
+# used to contain an aggregate.
+SELECT ROW_NUMBER() OVER (ORDER BY a), COUNT(*) AS m
+FROM t1
+GROUP BY a, b
+ORDER BY a, b, m;
+
+DROP TABLE t1;
+
+--echo #
+--echo # Bug #33041041: WL#14419: SIG 11 IN WINDOW::APPLY_TEMP_TABLE|SQL/WINDOW.CC
+--echo #
+
+CREATE TABLE t1 ( a INTEGER );
+PREPARE stmt FROM "SELECT RANK() OVER (ORDER BY a) FROM t1 GROUP BY a";
+EXECUTE stmt;
+EXECUTE stmt;
+DROP TABLE t1;
+
+--echo #
+--echo # Bug #33067989: WL#14419: RESULT MISMATCH SEEN WITH WINDOW FUNCTION IN SUBQUERY
+--echo #
+
+CREATE TABLE t1 ( a INTEGER );
+INSERT INTO t1 VALUES (0), (1);
+
+SELECT a
+  FROM t1 AS outer_t1
+  WHERE (a,a) IN (
+    SELECT MAX(a) OVER (), a FROM t1
+  );
+
+DROP TABLE t1;
+
+--echo #
+--echo # Bug #33072114: WL#14419: ASSERTION `STATIC_CAST<SIZE_T>(END_BIT_NUM) <= CAPACITY()' FAILED
+--echo #
+
+CREATE TABLE t1 ( a INTEGER, b INTEGER, c INTEGER, d INTEGER, e INTEGER, f INTEGER, g INTEGER, h INTEGER, i INTEGER, j INTEGER, k INTEGER );
+
+SELECT
+  CUME_DIST() OVER (ORDER BY t1.a)
+FROM
+  t1
+  NATURAL JOIN t1 AS t2
+  NATURAL JOIN t1 AS t3
+  NATURAL JOIN t1 AS t4
+GROUP BY t1.a
+WITH ROLLUP;
+
+DROP TABLE t1;
+
+--echo #
+--echo # Bug #33028408: WL#14419: ASSERTION `M_COUNT >= M_FRAME_NULL_COUNT && M_FRAME_NULL_COUNT > 0' FA
+--echo #
+
+CREATE TABLE t1 ( pk INTEGER );
+INSERT INTO t1 VALUES (2);
+ANALYZE TABLE t1;
+
+SELECT SUM(pk) OVER (ROWS BETWEEN CURRENT ROW AND 1 FOLLOWING) FROM t1 GROUP BY pk WITH ROLLUP;
+
+DROP TABLE t1;
+
+--echo #
+--echo # Bug #33036143: WL#14419: ASSERTION `M_INDEX_CURSOR.IS_POSITIONED()' FAILED.
+--echo #
+
+CREATE TABLE t1 ( a LONGTEXT, b INTEGER );
+INSERT INTO t1 VALUES ('1', 0);
+
+SELECT
+  a,
+  SUM(1) OVER (ORDER BY b),
+  SUM(1) OVER (ORDER BY b DESC)
+FROM t1;
+
+DROP TABLE t1;
+
+--echo #
+--echo # Bug #33067260: WL#14419: SIG11 IN MY_FILL_8BIT|STRINGS/CTYPE-SIMPLE.CC
+--echo #
+
+CREATE TABLE t1 (a INTEGER, b VARCHAR(255));
+INSERT INTO t1 VALUES (1,'x');
+INSERT INTO t1 VALUES (-3,'y');
+
+CREATE TABLE t2 ( a INTEGER );
+
+SET sql_mode='';
+
+SELECT MIN(a) AS field1 FROM t1 WHERE b IN ( SELECT a FROM t2 ) ORDER BY LEAD(a, 5, 7) OVER (ORDER BY b);
+SELECT MIN(a), LEAD(a, 5, 7) OVER (ORDER BY b) AS field1 FROM t1 WHERE b IN ( SELECT a FROM t2 ) ORDER BY b;
+
+SET sql_mode=DEFAULT;
+DROP TABLE t1, t2;
+
+--echo #
+--echo # Bug #33075752: WL#14419: ASSERTION `N < SIZE()' FAILED|INCLUDE/PREALLOCED_ARRAY.H
+--echo #
+
+CREATE TABLE t1 ( a INTEGER );
+
+SELECT DISTINCT
+  0 AS field1,
+  RANK() OVER (ORDER BY a) AS field2,
+  LAST_VALUE(a) OVER (ORDER BY a + 1) AS field3
+FROM t1
+GROUP BY a, field1 WITH ROLLUP
+ORDER BY field1, field2, field3;
+
+DROP TABLE t1;
+
+--echo #
+--echo # Bug #33181670: Recent regression: Memory leak with window functions and user variables
+--echo #
+
+CREATE TABLE t1 (a INTEGER);
+INSERT INTO t1 VALUES (1);
+SELECT LAST_VALUE(0) OVER (ORDER BY (@f:='x')) FROM t1;
+# NOTE: To actually show the bug in MTR, a shutdown; needs to be inserted here.
+DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/window_functions_in2exists_hypergraph.test mysql-8.0-8.0.27/mysql-test/t/window_functions_in2exists_hypergraph.test
--- mysql-8.0-8.0.26/mysql-test/t/window_functions_in2exists_hypergraph.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/window_functions_in2exists_hypergraph.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,4 @@
+# Non-hypergraph results are tested in window_functions_in2exists.test.
+--source include/have_hypergraph.inc
+--source include/window_functions_in2exists.inc
+
diff -Nru mysql-8.0-8.0.26/mysql-test/t/window_functions_in2exists.test mysql-8.0-8.0.27/mysql-test/t/window_functions_in2exists.test
--- mysql-8.0-8.0.26/mysql-test/t/window_functions_in2exists.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/window_functions_in2exists.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,3 @@
+# Hypergraph results are tested in window_functions_in2exists_hypergraph.test.
+--source include/not_hypergraph.inc
+--source include/window_functions_in2exists.inc
diff -Nru mysql-8.0-8.0.26/mysql-test/t/window_functions_interesting_orders.test mysql-8.0-8.0.27/mysql-test/t/window_functions_interesting_orders.test
--- mysql-8.0-8.0.26/mysql-test/t/window_functions_interesting_orders.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/window_functions_interesting_orders.test	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,78 @@
+# These should have been unit tests (in hypergraph_optimizer-t),
+# but cannot easily be, as our window function implementation
+# is intimately linked to temporary tables, and our plugin system makes it
+# very hard to use temporary tables from unit tests (without pulling in
+# basically the entire server, which makes it no longer a unit test).
+
+--source include/have_hypergraph.inc  # Only supported by the hypergraph join optimizer.
+
+CREATE TABLE t1 ( a INTEGER, b INTEGER, c INTEGER );
+
+# Fill in some data, so we have nonzero costs.
+INSERT INTO t1 (a,b,c) VALUES (1,2,3);
+INSERT INTO t1 SELECT * FROM t1;
+INSERT INTO t1 SELECT * FROM t1;
+INSERT INTO t1 SELECT * FROM t1;
+ANALYZE TABLE t1;
+
+# Simple partition by and order.
+--replace_regex /  \(cost=.*//
+EXPLAIN FORMAT=tree SELECT SUM(c) OVER (PARTITION BY a ORDER BY b) FROM t1;
+
+# Add a second, compatible window. It should be handled using the same sort.
+--replace_regex /  \(cost=.*//
+EXPLAIN FORMAT=tree SELECT SUM(c) OVER (PARTITION BY a ORDER BY b), SUM(c) OVER (ORDER BY a,b) FROM t1;
+
+# Swap orderings of two windows to get by with one sort.
+--replace_regex /  \(cost=.*//
+EXPLAIN FORMAT=tree SELECT SUM(b) OVER (PARTITION BY a), SUM(c) OVER (ORDER BY a,b) FROM t1;
+
+# Two incompatible windows; should get a sort each.
+--replace_regex /  \(cost=.*//
+EXPLAIN FORMAT=tree SELECT SUM(c) OVER (PARTITION BY a ORDER BY b), SUM(c) OVER (ORDER BY b,a) FROM t1;
+
+# Create an index. It should be usable for eliding the sort.
+CREATE INDEX idx ON t1 (a, b);
+ANALYZE TABLE t1;
+--replace_regex /  \(cost=.*//
+EXPLAIN FORMAT=tree SELECT SUM(c) OVER (PARTITION BY a) FROM t1;
+--replace_regex /  \(cost=.*//
+EXPLAIN FORMAT=tree SELECT SUM(c) OVER (PARTITION BY a ORDER BY b) FROM t1;
+ALTER TABLE t1 DROP INDEX idx;
+ANALYZE TABLE t1;
+
+# Window sorts should also be usable for final ORDER BY (sortahead).
+--replace_regex /  \(cost=.*//
+EXPLAIN FORMAT=tree SELECT a, SUM(c) OVER (PARTITION BY a) FROM t1 ORDER BY a;
+
+# We can even sortahead by a window function, as long as it's processed
+# before the final sort. Check that we move the window to be sorted on
+# earlier in the list.
+--replace_regex /  \(cost=.*//
+EXPLAIN FORMAT=tree SELECT a, SUM(c) OVER (ORDER BY b), AVG(c) OVER (ORDER BY a), SUM(c) OVER (PARTITION BY a) AS x FROM t1 ORDER BY b, x;
+
+# DISTINCT cannot normally remove anything...
+--replace_regex /  \(cost=.*//
+EXPLAIN FORMAT=tree SELECT DISTINCT a, SUM(c) OVER (ORDER BY b) FROM t1;
+
+# ...but if the window frame is static, we can use sortahead
+# (or an index).
+EXPLAIN FORMAT=tree SELECT DISTINCT a, b, SUM(b) OVER (PARTITION BY a) FROM t1 ORDER BY a;
+
+# DISTINCT and ORDER BY together. This one is incompatible with window ordering,
+# but DISTINCT and ORDER BY should be collapsed into one (duplicate-removing) sort.
+--replace_regex /  \(cost=.*//
+EXPLAIN FORMAT=tree SELECT DISTINCT a, SUM(c) OVER (ORDER BY b) FROM t1 ORDER BY a;
+
+# Demonstrate elision by functional dependencies from WHERE.
+--replace_regex /  \(cost=.*//
+EXPLAIN FORMAT=tree SELECT SUM(a) OVER (ORDER BY b) FROM t1 WHERE b=3;
+
+# Finally, demonstrate elision by functional dependencies from joins.
+# Both windows should be satisfied by an index scan over a.
+CREATE INDEX idx ON t1 (a);
+ANALYZE TABLE t1;
+--replace_regex /  \(cost=.*//
+EXPLAIN FORMAT=tree SELECT t1.a, SUM(t1.a) OVER (ORDER BY t1.a), SUM(t2.b) OVER (ORDER BY t2.b) FROM t1 JOIN t1 AS t2 ON t1.a = t2.b;
+
+DROP TABLE t1;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/window_functions.test mysql-8.0-8.0.27/mysql-test/t/window_functions.test
--- mysql-8.0-8.0.26/mysql-test/t/window_functions.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/window_functions.test	2021-09-28 11:46:34.000000000 +0000
@@ -1,7 +1,6 @@
 --echo # Test of SQL window functions.
 --echo # ----------------------------------------------------------------------
 --source include/have_innodb_16k.inc
---source include/not_hypergraph.inc   # Windowing functions are not supported yet.
 SET NAMES utf8;
 
 --echo
@@ -31,6 +30,7 @@
 SELECT i, j, SUM(i+j) OVER (ROWS UNBOUNDED PRECEDING) foo FROM t ORDER BY NULL DESC;
 FLUSH STATUS;
 eval $query;
+--skip_if_hypergraph  # Creates a temporary table, even though it does not materialize into it.
 SHOW STATUS LIKE 'Created_tmp_tables';
 eval EXPLAIN FORMAT=JSON $query;
 
@@ -49,6 +49,7 @@
 DROP TABLE t1;
 
 --echo Single ordered partition
+# NOTE: V... means queries that are deterministic and have been verified against Oracle.
 #V...
 SELECT i, j, SUM(i+j) OVER (ORDER BY j ROWS UNBOUNDED PRECEDING) foo FROM t;
 SELECT i, j, SUM(i+j) OVER (ORDER BY j ROWS UNBOUNDED PRECEDING) foo FROM t ORDER BY foo;
@@ -476,13 +477,16 @@
 SELECT id, sex, CUME_DIST() OVER (ORDER BY sex DESC) FROM t1 ORDER BY id;
 #...V
 
+# NOTE: The LEFT JOIN is to force the join order,
+# which helps in making the query somewhat more deterministic.
+# (It still is nondeterministic, though.)
 SELECT id value,
        SUM(id) OVER (ROWS UNBOUNDED PRECEDING)
-       FROM t1 u, t2 WHERE t2.user_id = u.id;
+       FROM t1 u LEFT JOIN t2 ON t2.user_id = u.id;
 
 --echo Aggregate with GROUP BY arguments to window function
 SELECT AVG(id) average,
-       SUM(AVG(id)) OVER (ROWS UNBOUNDED PRECEDING)
+       SUM(AVG(id)) OVER (ORDER BY sex DESC ROWS UNBOUNDED PRECEDING)
        FROM t1 u, t2 WHERE t2.user_id = u.id GROUP BY sex;
 
 --echo Aggregate with GROUP BY in window's ORDER BY clause, with aggregate present in
@@ -707,11 +711,13 @@
 SELECT * from (SELECT t1.*, SUM(id) OVER (ROWS UNBOUNDED PRECEDING), PERCENT_RANK() OVER (ORDER BY sex) FROM t1) alias ORDER BY id;
 SELECT * from (SELECT t1.*, SUM(id) OVER (ROWS UNBOUNDED PRECEDING), CUME_DIST() OVER (ORDER BY sex) FROM t1) alias ORDER BY id;
 
+--sorted_result
 SELECT t1.*, SUM(id) OVER (ORDER BY id ROWS UNBOUNDED PRECEDING),
              RANK() OVER (ORDER BY sex,id),
              ROW_NUMBER() OVER (ORDER BY sex,id)
              FROM t1;
 
+--sorted_result
 SELECT t1.*, SUM(id) OVER (ORDER BY id ROWS UNBOUNDED PRECEDING),
              PERCENT_RANK() OVER (ORDER BY sex,id),
              CUME_DIST() OVER (ORDER BY sex,id),
@@ -842,6 +848,7 @@
 
 FLUSH STATUS;
 eval $query;
+--skip_if_hypergraph  # Creates two extra temporary tables that are not used.
 SHOW STATUS LIKE 'Created_tmp_tables';
 
 --echo Show sort elimination for the above
@@ -1233,6 +1240,7 @@
 SELECT t, FIRST_VALUE(t) OVER w FROM t_time WINDOW w AS (ORDER BY t ROWS  BETWEEN 2 FOLLOWING AND 3 FOLLOWING);
 SELECT t, FIRST_VALUE(t) OVER w FROM t_time WINDOW w AS (ORDER BY t RANGE BETWEEN INTERVAL 2 HOUR FOLLOWING AND INTERVAL 3 HOUR FOLLOWING);
 
+--sorted_result
 SELECT p, t, FIRST_VALUE(t) OVER w FROM t_time2 WINDOW w AS (PARTITION by p );
 SELECT p, t, FIRST_VALUE(t) OVER w FROM t_time2 WINDOW w AS (PARTITION by p ORDER BY t);
 SELECT p, t, FIRST_VALUE(t) OVER w FROM t_time2 WINDOW w AS (PARTITION by p ORDER BY t DESC);
@@ -1353,11 +1361,15 @@
 UPDATE tj2 SET i=MOD(i,3);
 SELECT * FROM tj2;
 --echo With GROUP BY
+--sorted_result
 SELECT          COUNT(*) OVER (), MOD(SUM(i),2) FROM tj2 GROUP BY i;
+--sorted_result
 SELECT DISTINCT COUNT(*) OVER (), MOD(SUM(i),2) FROM tj2 GROUP BY i;
 
 --echo Bug fix GROUP BY with window function referring column used in grouping expression
+--sorted_result
 SELECT i, SUM(i) OVER (), MOD(SUM(i),2) FROM tj2 GROUP BY i;
+--sorted_result
 SELECT i, SUM(SUM(i)) OVER (), SUM(i) OVER (ORDER BY i), MOD(SUM(i),2), SUM(i) FROM tj2 GROUP BY i;
 
 DROP TABLE tj2;
@@ -1372,7 +1384,9 @@
 SELECT i, LAST_VALUE((CAST(j AS UNSIGNED))) OVER w, FIRST_VALUE(CAST(j AS UNSIGNED)) OVER w FROM tj
     WINDOW w AS (PARTITION BY i ORDER BY CAST(j AS UNSIGNED) RANGE UNBOUNDED PRECEDING);
 --echo Fix for lineno in warnings buffered and unbuffered windows
+--skip_if_hypergraph  # Different line numbers in warnings in hypergraph optimizer, since it applies the windows in different order.
 SELECT j,CAST(SUM(j) OVER (PARTITION BY i) AS JSON), CAST(SUM(j) OVER () AS JSON) FROM tj;
+--skip_if_hypergraph  # Different line numbers in warnings in hypergraph optimizer, since it does not use a temporary table here.
 SELECT j,CAST(SUM(j) OVER (PARTITION BY i ROWS UNBOUNDED PRECEDING) AS JSON), CAST(SUM(j) OVER (PARTITION BY i ROWS UNBOUNDED PRECEDING) AS JSON) FROM tj;
 
 --echo Bug fix for UNION
@@ -1889,6 +1903,7 @@
 SELECT t1_id, ROW_NUMBER() OVER () FROM t1;
 FLUSH STATUS;
 eval $query;
+--skip_if_hypergraph  # Creates an extra temporary table that is not used.
 SHOW STATUS LIKE 'Created_tmp_tables';
 eval EXPLAIN FORMAT=JSON $query;
 
@@ -2023,6 +2038,7 @@
 SELECT a,b, RANK() OVER (ORDER BY a), RANK() OVER (ORDER BY b) FROM t1;
 FLUSH STATUS;
 eval $query;
+--skip_if_hypergraph  # Creates an extra temporary table that is not used.
 SHOW STATUS LIKE 'Created_tmp_tables';
 eval EXPLAIN FORMAT=JSON $query;
 
@@ -2031,6 +2047,9 @@
 --echo
 --echo  Test of SOME/ANY/ALL subqueries.
 --echo
+
+# See also window_functions_in2exists.inc.
+
 CREATE TABLE t(a INT);
 INSERT INTO t VALUES (1),(2),(3);
 ANALYZE TABLE t;
@@ -2040,14 +2059,6 @@
 EXPLAIN FORMAT=JSON SELECT * FROM t WHERE a IN (SELECT ROW_NUMBER() OVER () FROM t);
 SELECT * FROM t WHERE a = SOME(SELECT ROW_NUMBER() OVER () + 1 FROM t);
 SELECT * FROM t WHERE a = ANY(SELECT ROW_NUMBER() OVER () + 1 FROM t);
---echo =ALL => NOT EXISTS (select non-equal rows)
---error ER_NOT_SUPPORTED_YET
-SELECT * FROM t WHERE a = ALL(SELECT ROW_NUMBER() OVER () + 1 FROM t);
---echo <>SOME => EXISTS (select non-equal rows)
---error ER_NOT_SUPPORTED_YET
-SELECT * FROM t WHERE a <> SOME(SELECT ROW_NUMBER() OVER () + 1 FROM t);
---error ER_NOT_SUPPORTED_YET
-SELECT * FROM t WHERE a <> ANY(SELECT ROW_NUMBER() OVER () + 1 FROM t);
 SELECT * FROM t WHERE a <> ALL(SELECT ROW_NUMBER() OVER () + 1 FROM t);
 SELECT * FROM t WHERE a >= ALL(SELECT ROW_NUMBER() OVER () + 1 FROM t);
 SELECT * FROM t WHERE a >= SOME(SELECT ROW_NUMBER() OVER () + 1 FROM t);
@@ -2061,42 +2072,13 @@
                  WHERE rn > upper.a);
 FLUSH STATUS;
 eval $query;
+--skip_if_hypergraph  # Creates an extra temporary table that is not used.
 SHOW STATUS LIKE 'Created_tmp_tables';
 eval EXPLAIN FORMAT=JSON $query;
 
---echo # Correlated => no subquery materialization.
---echo # IN => EXISTS, error
---error ER_NOT_SUPPORTED_YET
-SELECT * FROM t upper
-    WHERE upper.a IN (SELECT ROW_NUMBER() OVER () FROM t
-                      WHERE t.a > upper.a);
-
---echo # Correlated => no subquery materialization.
---echo # >ANY => EXISTS(select smaller rows), error
---error ER_NOT_SUPPORTED_YET
-SELECT * FROM t upper
-    WHERE upper.a > ANY (SELECT ROW_NUMBER() OVER () FROM t
-                         WHERE t.a > upper.a);
---error ER_NOT_SUPPORTED_YET
-SELECT * FROM t upper
-    WHERE upper.a > ALL (SELECT ROW_NUMBER() OVER () FROM t
-                         WHERE t.a > upper.a);
-
 DROP TABLE t;
 
 --echo #
---echo # Bug#25601138 WINDOW FUNCTION IN CORRELATED SUBQUERY GIVES WRONG RESULT
---echo #
-
-CREATE TABLE t1(i INT, j INT, k INT);
-INSERT INTO t1 VALUES (1,1,1),(2,2,2);
---echo # When we support this, expected result is 1,1,1 and 2,2,2
---error ER_NOT_SUPPORTED_YET
-select * from t1 AS upper where i+1
- IN (select row_number() over () + upper.i from t1 );
-DROP TABLE t1;
-
---echo #
 --echo # Check window aggregate referencing columns from an outside query
 --echo # All results checked against Postgresql which also allows this.
 
@@ -2878,6 +2860,7 @@
 CREATE TABLE b (pk int PRIMARY KEY,  c varchar(255));
 INSERT INTO b VALUES (9,'s');
 
+--skip_if_hypergraph  # Does not currently push the sort, so gets a different plan.
 EXPLAIN FORMAT=tree SELECT ROW_NUMBER() OVER (ORDER BY a.c)
 FROM  a LEFT JOIN b
       ON a.c = b.c
@@ -3352,8 +3335,13 @@
   RETURN ret;
 END!
 DELIMITER ;!
+# Dropping the decimals is bug #32831386, which the hypergraph optimizer is not affected by.
+# Adjust its output, so that the test passes. Remove the replacements when #32831386 is fixed.
+--replace_result 1351614464.0000 1351614464
 SELECT f1();
+--replace_result 1351614464.0000 1351614464
 SELECT f1();
+--replace_result 1351614464.0000 1351614464
 SELECT f1();
 
 DROP FUNCTION f1;
diff -Nru mysql-8.0-8.0.26/mysql-test/t/window_jsonaggs.test mysql-8.0-8.0.27/mysql-test/t/window_jsonaggs.test
--- mysql-8.0-8.0.26/mysql-test/t/window_jsonaggs.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/window_jsonaggs.test	2021-09-28 11:46:34.000000000 +0000
@@ -51,6 +51,9 @@
 
 --echo # With ROLLUP
 
+# The order here is undefined and implementation-dependent.
+--sorted_result
+--replace_regex /9, 10, 8, 11, 5, 4, 3, 13, 2, 1, 15, null, null/null, 1, 2, 3, 4, 5, 8, 9, 10, 11, 13, 15, null/
 SELECT i, f, JSON_ARRAYAGG(i) OVER w jarray_i, JSON_ARRAYAGG(f)
   OVER w jarray_f FROM t1 GROUP BY i,f WITH ROLLUP HAVING GROUPING(f)=1
   WINDOW w AS (ORDER BY f);
@@ -220,7 +223,10 @@
 DROP TABLE t1;
 
 # Coverage tests for Item_sum_json::val_*
+# Different warnings in the hypergraph optimizer.
+--disable_warnings
 SELECT 0 & (JSON_ARRAYAGG(1) OVER w) FROM (select 1) as dt  WINDOW w as ();
+--enable_warnings
 SELECT MAKETIME(((1)<=> (JSON_OBJECTAGG('1',1)OVER())),'1',1);
 SELECT MAKETIME(((1)<=> (2*JSON_OBJECTAGG('1',1)OVER())),'1',1);
 SELECT (1 + CAST(JSON_OBJECTAGG(1,2) OVER () AS DECIMAL));
diff -Nru mysql-8.0-8.0.26/mysql-test/t/window_min_max.test mysql-8.0-8.0.27/mysql-test/t/window_min_max.test
--- mysql-8.0-8.0.26/mysql-test/t/window_min_max.test	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysql-test/t/window_min_max.test	2021-09-28 11:46:34.000000000 +0000
@@ -14,9 +14,13 @@
       MAX(j) OVER (ROWS UNBOUNDED PRECEDING) max FROM t;
 SELECT i, j, MIN(i) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) min,
        MAX(j) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) max FROM t;
+--skip_if_hypergraph  # Nondeterministic query, hypergraph optimizer gives different result.
 SELECT i, j, MIN(i+j) OVER (ROWS UNBOUNDED PRECEDING) min FROM t ORDER BY j;
+--skip_if_hypergraph  # Nondeterministic query, hypergraph optimizer gives different result.
 SELECT i, j, MAX(i+j) OVER (ROWS UNBOUNDED PRECEDING) max FROM t ORDER BY j;
+--skip_if_hypergraph  # Nondeterministic query, hypergraph optimizer gives different result.
 SELECT i, j, MIN(i+j) OVER (ROWS UNBOUNDED PRECEDING) min FROM t ORDER BY j DESC;
+--skip_if_hypergraph  # Nondeterministic query, hypergraph optimizer gives different result.
 SELECT i, j, MAX(i+j) OVER (ROWS UNBOUNDED PRECEDING) max FROM t ORDER BY j DESC;
 --echo Single ordered partition
 SELECT i, j, MIN(i) OVER (ORDER BY j ROWS UNBOUNDED PRECEDING) min,
@@ -32,6 +36,7 @@
 SELECT i, j, MIN(i+j) OVER (ROWS UNBOUNDED PRECEDING) min FROM t ORDER BY NULL DESC;
 EXPLAIN FORMAT=JSON SELECT i, j, MIN(i+j) OVER (ROWS UNBOUNDED PRECEDING) min FROM t ORDER BY NULL DESC;
 --echo With LIMIT
+--skip_if_hypergraph  # Nondeterministic query, hypergraph optimizer gives different result.
 SELECT i, j, MIN(i+j) OVER (ROWS UNBOUNDED PRECEDING) min FROM t ORDER BY j DESC LIMIT 3;
 
 --echo Min/Max with View
@@ -144,11 +149,12 @@
 DROP TABLE t1,ss;
 
 --echo Tests with ROLLUP
+# Note: These are not deterministic.
 SELECT k, MIN(i), SUM(j), MIN(k) OVER (ROWS UNBOUNDED PRECEDING) min_wf FROM t
 GROUP BY (k) WITH ROLLUP;
 SELECT k, MIN(i), SUM(j), MAX(k) OVER (ROWS UNBOUNDED PRECEDING) max_wf FROM t
 GROUP BY (k) WITH ROLLUP;
-SELECT k, MIN(i), SUM(j), MIN(k) OVER (ROWS UNBOUNDED PRECEDING) min_wf FROM t
+SELECT k, MIN(i), SUM(j), MIN(k) OVER (ORDER BY k DESC ROWS UNBOUNDED PRECEDING) min_wf FROM t
 GROUP BY (k) WITH ROLLUP ORDER BY k DESC;
 SELECT k, MIN(i), SUM(j), MIN(k) OVER (ROWS UNBOUNDED PRECEDING) min_wf FROM t
 GROUP BY k,j WITH ROLLUP;
@@ -503,14 +509,21 @@
 UPDATE tj2 SET i=MOD(i,3);
 SELECT * FROM tj2;
 --echo With GROUP BY
+--sorted_result
 SELECT          COUNT(*) OVER (), MOD(MIN(i),2) FROM tj2 GROUP BY i ;
+--sorted_result
 SELECT DISTINCT COUNT(*) OVER (), MOD(MAX(i),2) FROM tj2 GROUP BY i ;
 
 --echo Bug fix GROUP BY with window function referring column used in grouping expression
+--sorted_result
 SELECT i, MIN(i) OVER (), MOD(MIN(i),2) FROM tj2 GROUP BY i ;
+--sorted_result
 SELECT i, MAX(MAX(i)) OVER (), MAX(i) OVER (ORDER BY i), MOD(MAX(i),2), MAX(i) FROM tj2 GROUP BY i ;
+--sorted_result
 SELECT i, MIN(i) OVER (ORDER BY i) FROM tj UNION ALL SELECT i, MIN(i) OVER (ORDER BY i) FROM tj;
+--sorted_result
 SELECT j,CAST(MIN(j) OVER (PARTITION BY i) AS JSON), CAST(MAX(j) OVER () AS JSON) FROM tj;
+--sorted_result
 SELECT j,CAST(MIN(j) OVER (PARTITION BY i ROWS UNBOUNDED PRECEDING) AS JSON), CAST(MAX(j) OVER (PARTITION BY i ROWS UNBOUNDED PRECEDING) AS JSON) FROM tj;
 
 DROP TABLE tj,tj2;
diff -Nru mysql-8.0-8.0.26/MYSQL_VERSION mysql-8.0-8.0.27/MYSQL_VERSION
--- mysql-8.0-8.0.26/MYSQL_VERSION	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/MYSQL_VERSION	2021-09-28 11:46:34.000000000 +0000
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=8
 MYSQL_VERSION_MINOR=0
-MYSQL_VERSION_PATCH=26
+MYSQL_VERSION_PATCH=27
 MYSQL_VERSION_EXTRA=
diff -Nru mysql-8.0-8.0.26/mysys/base64.cc mysql-8.0-8.0.27/mysys/base64.cc
--- mysql-8.0-8.0.26/mysys/base64.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysys/base64.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,442 +0,0 @@
-/* Copyright (c) 2003, 2021, Oracle 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,
-   as published by the Free Software Foundation.
-
-   This program is also distributed with certain software (including
-   but not limited to OpenSSL) that is licensed under separate terms,
-   as designated in a particular file or component or in included license
-   documentation.  The authors of MySQL hereby grant you an additional
-   permission to link the program and your derivative works with the
-   separately licensed software that they have included with MySQL.
-
-   Without limiting anything contained in the foregoing, this file,
-   which is part of C Driver for MySQL (Connector/C), is also subject to the
-   Universal FOSS Exception, version 1.0, a copy of which can be found at
-   http://oss.oracle.com/licenses/universal-foss-exception.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License, version 2.0, for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
-
-#include "base64.h"
-
-#include <assert.h>
-#include <math.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-
-#include "my_config.h"
-
-/**
-  @file mysys/base64.cc
-*/
-
-#ifndef MAIN
-
-static char base64_table[] =
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-    "abcdefghijklmnopqrstuvwxyz"
-    "0123456789+/";
-
-/**
- * Maximum length base64_needed_encoded_length()
- * can handle without overflow.
- */
-uint64 base64_encode_max_arg_length() {
-#if (SIZEOF_VOIDP == 8)
-  /*
-    6827690988321067803 ->   9223372036854775805
-    6827690988321067804 ->  -9223372036854775807
-  */
-  return 0x5EC0D4C77B03531BLL;
-#else
-  /*
-    1589695686 ->  2147483646
-    1589695687 -> -2147483645
-  */
-  return 0x5EC0D4C6;
-#endif
-}
-
-uint64 base64_needed_encoded_length(uint64 length_of_data) {
-  uint64 nb_base64_chars;
-  if (length_of_data == 0) return 1;
-  nb_base64_chars = (length_of_data + 2) / 3 * 4;
-
-  return nb_base64_chars +            /* base64 char incl padding */
-         (nb_base64_chars - 1) / 76 + /* newlines */
-         1;                           /* NUL termination of string */
-}
-
-/**
- * Maximum length base64_needed_decoded_length()
- * can handle without overflow.
- */
-uint64 base64_decode_max_arg_length() {
-#if (SIZEOF_VOIDP == 8)
-  return 0x2AAAAAAAAAAAAAAALL;
-#else
-  return 0x2AAAAAAA;
-#endif
-}
-
-uint64 base64_needed_decoded_length(uint64 length_of_encoded_data) {
-  return static_cast<uint64>(
-      ceil(static_cast<double>(length_of_encoded_data * 3 / 4)));
-}
-
-/*
-  Encode a data as base64.
-
-  Note: We require that dst is pre-allocated to correct size.
-        See base64_needed_encoded_length().
-*/
-
-int base64_encode(const void *src, size_t src_len, char *dst) {
-  const unsigned char *s = (const unsigned char *)src;
-  size_t i = 0;
-  size_t len = 0;
-
-  for (; i < src_len; len += 4) {
-    unsigned c;
-
-    if (len == 76) {
-      len = 0;
-      *dst++ = '\n';
-    }
-
-    c = s[i++];
-    c <<= 8;
-
-    if (i < src_len) c += s[i];
-    c <<= 8;
-    i++;
-
-    if (i < src_len) c += s[i];
-    i++;
-
-    *dst++ = base64_table[(c >> 18) & 0x3f];
-    *dst++ = base64_table[(c >> 12) & 0x3f];
-
-    if (i > (src_len + 1))
-      *dst++ = '=';
-    else
-      *dst++ = base64_table[(c >> 6) & 0x3f];
-
-    if (i > src_len)
-      *dst++ = '=';
-    else
-      *dst++ = base64_table[(c >> 0) & 0x3f];
-  }
-  *dst = '\0';
-
-  return 0;
-}
-
-/*
-  Base64 decoder stream
-*/
-typedef struct my_base64_decoder_t {
-  const char *src; /* Pointer to the current input position        */
-  const char *end; /* Pointer to the end of input buffer           */
-  uint c;          /* Collect bits into this number                */
-  int error;       /* Error code                                   */
-  uchar state;     /* Character number in the current group of 4   */
-  uchar mark;      /* Number of padding marks in the current group */
-} MY_BASE64_DECODER;
-
-/*
-  Helper table for decoder.
-  -2 means "space character"
-  -1 means "bad character"
-  Non-negative values mean valid base64 encoding character.
-*/
-static int8 from_base64_table[] = {
-    /*00*/ -1, -1, -1, -1, -1, -1, -1, -1,
-    -1,        -2, -2, -2, -2, -2, -1, -1,
-    /*10*/ -1, -1, -1, -1, -1, -1, -1, -1,
-    -1,        -1, -1, -1, -1, -1, -1, -1,
-    /*20*/ -2, -1, -1, -1, -1, -1, -1, -1,
-    -1,        -1, -1, 62, -1, -1, -1, 63, /*  !"#$%&'()*+,-./ */
-    /*30*/ 52, 53, 54, 55, 56, 57, 58, 59,
-    60,        61, -1, -1, -1, -1, -1, -1, /* 0123456789:;<=>? */
-    /*40*/ -1, 0,  1,  2,  3,  4,  5,  6,
-    7,         8,  9,  10, 11, 12, 13, 14, /* @ABCDEFGHIJKLMNO */
-    /*50*/ 15, 16, 17, 18, 19, 20, 21, 22,
-    23,        24, 25, -1, -1, -1, -1, -1, /* PQRSTUVWXYZ[\]^_ */
-    /*60*/ -1, 26, 27, 28, 29, 30, 31, 32,
-    33,        34, 35, 36, 37, 38, 39, 40, /* `abcdefghijklmno */
-    /*70*/ 41, 42, 43, 44, 45, 46, 47, 48,
-    49,        50, 51, -1, -1, -1, -1, -1, /* pqrstuvwxyz{|}~  */
-    /*80*/ -1, -1, -1, -1, -1, -1, -1, -1,
-    -1,        -1, -1, -1, -1, -1, -1, -1,
-    /*90*/ -1, -1, -1, -1, -1, -1, -1, -1,
-    -1,        -1, -1, -1, -1, -1, -1, -1,
-    /*A0*/ -2, -1, -1, -1, -1, -1, -1, -1,
-    -1,        -1, -1, -1, -1, -1, -1, -1,
-    /*B0*/ -1, -1, -1, -1, -1, -1, -1, -1,
-    -1,        -1, -1, -1, -1, -1, -1, -1,
-    /*C0*/ -1, -1, -1, -1, -1, -1, -1, -1,
-    -1,        -1, -1, -1, -1, -1, -1, -1,
-    /*D0*/ -1, -1, -1, -1, -1, -1, -1, -1,
-    -1,        -1, -1, -1, -1, -1, -1, -1,
-    /*E0*/ -1, -1, -1, -1, -1, -1, -1, -1,
-    -1,        -1, -1, -1, -1, -1, -1, -1,
-    /*F0*/ -1, -1, -1, -1, -1, -1, -1, -1,
-    -1,        -1, -1, -1, -1, -1, -1, -1};
-
-/**
- * Skip leading spaces in a base64 encoded stream
- * and stop on the first non-space character.
- * decoder->src will point to the first non-space character,
- * or to the end of the input string.
- * In case when end-of-input met on unexpected position,
- * decoder->error is also set to 1.
- *
- * @param  decoder  Pointer to MY_BASE64_DECODER
- *
- * @return
- *   false on success (there are some more non-space input characters)
- *   true  on error (end-of-input found)
- */
-static inline bool my_base64_decoder_skip_spaces(MY_BASE64_DECODER *decoder) {
-  for (; decoder->src < decoder->end; decoder->src++) {
-    if (from_base64_table[(uchar)*decoder->src] != -2) return false;
-  }
-  if (decoder->state > 0)
-    decoder->error = 1; /* Unexpected end-of-input found */
-  return true;
-}
-
-/**
- * Convert the next character in a base64 encoded stream
- * to a number in the range [0..63]
- * and mix it with the previously collected value in decoder->c.
- *
- * @param decoder base64 decoding stream
- *
- * @return
- *   false on success
- *   true  on error (invalid base64 character found)
- */
-static inline bool my_base64_add(MY_BASE64_DECODER *decoder) {
-  int res;
-  decoder->c <<= 6;
-  if ((res = from_base64_table[(uchar)*decoder->src++]) < 0)
-    return (decoder->error = true);
-  decoder->c += (uint)res;
-  return false;
-}
-
-/**
- * Get the next character from a base64 encoded stream.
- * Skip spaces, then scan the next base64 character or a pad character
- * and collect bits into decoder->c.
- *
- * @param  decoder  Pointer to MY_BASE64_DECODER
- * @return
- *  false on success (a valid base64 encoding character found)
- *  true  on error (unexpected character or unexpected end-of-input found)
- */
-static inline bool my_base64_decoder_getch(MY_BASE64_DECODER *decoder) {
-  if (my_base64_decoder_skip_spaces(decoder)) return true; /* End-of-input */
-
-  if (!my_base64_add(decoder)) /* Valid base64 character found */
-  {
-    if (decoder->mark) {
-      /* If we have scanned '=' already, then only '=' is valid */
-      assert(decoder->state == 3);
-      decoder->error = 1;
-      decoder->src--;
-      return true; /* expected '=', but encoding character found */
-    }
-    decoder->state++;
-    return false;
-  }
-
-  /* Process error */
-  switch (decoder->state) {
-    case 0:
-    case 1:
-      decoder->src--;
-      return true; /* base64 character expected */
-
-    case 2:
-    case 3:
-      if (decoder->src[-1] == '=') {
-        decoder->error = 0; /* Not an error - it's a pad character */
-        decoder->mark++;
-      } else {
-        decoder->src--;
-        return true; /* base64 character or '=' expected */
-      }
-      break;
-
-    default:
-      assert(0);
-      return true; /* Wrong state, should not happen */
-  }
-
-  decoder->state++;
-  return false;
-}
-
-/**
- * Decode a base64 string
- * The base64-encoded data in the range ['src','*end_ptr') will be
- * decoded and stored starting at 'dst'.  The decoding will stop
- * after 'len' characters have been read from 'src', or when padding
- * occurs in the base64-encoded data. In either case: if 'end_ptr' is
- * non-null, '*end_ptr' will be set to point to the character after
- * the last read character, even in the presence of error.
- *
- * Note: We require that 'dst' is pre-allocated to correct size.
- *
- * @param src_base Pointer to base64-encoded string
- * @param len     Length of string at 'src'
- * @param dst     Pointer to location where decoded data will be stored
- * @param end_ptr Pointer to variable that will refer to the character
- *                after the end of the encoded data that were decoded.
- *                Can be NULL.
- * @param flags   flags e.g. allow multiple chunks
- * @return Number of bytes written at 'dst', or -1 in case of failure
- */
-int64 base64_decode(const char *src_base, size_t len, void *dst,
-                    const char **end_ptr, int flags) {
-  char *d = (char *)dst;
-  MY_BASE64_DECODER decoder;
-
-  decoder.src = src_base;
-  decoder.end = src_base + len;
-  decoder.error = 0;
-  decoder.mark = 0;
-
-  for (;;) {
-    decoder.c = 0;
-    decoder.state = 0;
-
-    if (my_base64_decoder_getch(&decoder) ||
-        my_base64_decoder_getch(&decoder) ||
-        my_base64_decoder_getch(&decoder) || my_base64_decoder_getch(&decoder))
-      break;
-
-    *d++ = (decoder.c >> 16) & 0xff;
-    *d++ = (decoder.c >> 8) & 0xff;
-    *d++ = (decoder.c >> 0) & 0xff;
-
-    if (decoder.mark) {
-      d -= decoder.mark;
-      if (!(flags & MY_BASE64_DECODE_ALLOW_MULTIPLE_CHUNKS)) break;
-      decoder.mark = 0;
-    }
-  }
-
-  /* Return error if there are more non-space characters */
-  decoder.state = 0;
-  if (!my_base64_decoder_skip_spaces(&decoder)) decoder.error = 1;
-
-  if (end_ptr != nullptr) *end_ptr = decoder.src;
-
-  return decoder.error ? -1 : (int)(d - (char *)dst);
-}
-
-#else /* MAIN */
-
-#define require(b)                                             \
-  {                                                            \
-    if (!(b)) {                                                \
-      printf("Require failed at %s:%d\n", __FILE__, __LINE__); \
-      abort();                                                 \
-    }                                                          \
-  }
-
-int main(void) {
-  int i;
-  size_t j;
-  size_t k, l;
-  size_t dst_len;
-  size_t needed_length;
-  char *src;
-  char *s;
-  char *str;
-  char *dst;
-  const char *end_ptr;
-  size_t src_len;
-
-  for (i = 0; i <= 500; i++) {
-    /* Create source data */
-    if (i == 500) {
-#if (SIZEOF_VOIDP == 8)
-      printf("Test case for base64 max event length: 2119594243\n");
-      src_len = 2119594243;
-#else
-      printf("Test case for base64 max event length: 536870912\n");
-      src_len = 536870912;
-#endif
-    } else
-      src_len = rand() % 1000 + 1;
-
-    src = (char *)malloc(src_len);
-    s = src;
-
-    require(src);
-    for (j = 0; j < src_len; j++) {
-      char c = rand();
-      *s++ = c;
-    }
-
-    /* Encode */
-    needed_length = base64_needed_encoded_length(src_len);
-    str = (char *)malloc(needed_length);
-    require(str);
-    for (k = 0; k < needed_length; k++)
-      str[k] = 0xff; /* Fill memory to check correct NUL termination */
-    require(base64_encode(src, src_len, str) == 0);
-    require(needed_length == strlen(str) + 1);
-
-    /* Decode */
-    dst = (char *)malloc(base64_needed_decoded_length(strlen(str)));
-    require(dst);
-    dst_len = base64_decode(str, strlen(str), dst, &end_ptr, 0);
-    require(dst_len == src_len);
-
-    if (memcmp(src, dst, src_len) != 0) {
-      printf("       --------- src ---------   --------- dst ---------\n");
-      for (k = 0; k < src_len; k += 8) {
-        printf("%.4x   ", (uint)k);
-        for (l = 0; l < 8 && k + l < src_len; l++) {
-          unsigned char c = src[k + l];
-          printf("%.2x ", (unsigned)c);
-        }
-
-        printf("  ");
-
-        for (l = 0; l < 8 && k + l < dst_len; l++) {
-          unsigned char c = dst[k + l];
-          printf("%.2x ", (unsigned)c);
-        }
-        printf("\n");
-      }
-      printf("src length: %.8x, dst length: %.8x\n", (uint)src_len,
-             (uint)dst_len);
-      require(0);
-    }
-    free(src);
-    free(str);
-    free(dst);
-  }
-  printf("Test succeeded.\n");
-  return 0;
-}
-
-#endif
diff -Nru mysql-8.0-8.0.26/mysys/charset.cc mysql-8.0-8.0.27/mysys/charset.cc
--- mysql-8.0-8.0.26/mysys/charset.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysys/charset.cc	2021-09-28 11:46:34.000000000 +0000
@@ -325,8 +325,8 @@
   Report character set initialization errors and warnings.
   Be silent by default: no warnings on the client side.
 */
-static void default_reporter(enum loglevel level MY_ATTRIBUTE((unused)),
-                             uint ecode MY_ATTRIBUTE((unused)), ...) {}
+static void default_reporter(enum loglevel level [[maybe_unused]],
+                             uint ecode [[maybe_unused]], ...) {}
 my_error_reporter my_charset_error_reporter = default_reporter;
 
 /**
diff -Nru mysql-8.0-8.0.26/mysys/charset-def.cc mysql-8.0-8.0.27/mysys/charset-def.cc
--- mysql-8.0-8.0.26/mysys/charset-def.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysys/charset-def.cc	2021-09-28 11:46:34.000000000 +0000
@@ -253,7 +253,7 @@
 
 extern CHARSET_INFO my_charset_gb18030_unicode_520_ci;
 
-bool init_compiled_charsets(myf flags MY_ATTRIBUTE((unused))) {
+bool init_compiled_charsets(myf flags [[maybe_unused]]) {
   CHARSET_INFO *cs;
 
   add_compiled_collation(&my_charset_bin);
diff -Nru mysql-8.0-8.0.26/mysys/CMakeLists.txt mysql-8.0-8.0.27/mysys/CMakeLists.txt
--- mysql-8.0-8.0.26/mysys/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysys/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -25,14 +25,9 @@
 SET(MY_TIME_SOURCES my_time.cc my_systime.cc)
 
 ADD_CONVENIENCE_LIBRARY(mytime ${MY_TIME_SOURCES})
-IF(SOLARIS_INTEL AND MY_COMPILER_IS_SUNPRO)
-  # Sun Studio 12.6 generates code that segfaults for std::chrono stuff.
-  TARGET_COMPILE_OPTIONS(mytime_objlib PRIVATE $<$<CONFIG:RelWithDebInfo>:-xO1>)
-ENDIF()
 
 SET(MYSYS_SOURCES
   array.cc
-  base64.cc
   charset.cc
   charset-def.cc
   dbug.cc
@@ -127,6 +122,27 @@
 )
 LIST(APPEND MYSYS_SOURCES my_aes_openssl.cc)
 
+IF(BUILD_IS_SINGLE_CONFIG)
+  GET_PROPERTY(CWD_DEFINITIONS DIRECTORY PROPERTY COMPILE_DEFINITIONS)
+  IF(NOT CMAKE_CXX_FLAGS MATCHES "DSAFE_MUTEX" AND
+      NOT CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE_UPPER} MATCHES "DSAFE_MUTEX" AND
+      NOT CWD_DEFINITIONS MATCHES "SAFE_MUTEX")
+    # Both have ifdef SAFE_MUTEX
+    LIST(REMOVE_ITEM MYSYS_SOURCES
+      thr_cond.cc
+      thr_mutex.cc
+      )
+  ENDIF()
+  IF(CMAKE_CXX_FLAGS MATCHES "DNDEBUG" OR
+      CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE_UPPER} MATCHES "DNDEBUG" OR
+      CWD_DEFINITIONS MATCHES "NDEBUG")
+    # ifndef NDEBUG
+    LIST(REMOVE_ITEM MYSYS_SOURCES
+      dbug.cc
+      )
+  ENDIF()
+ENDIF()
+
 IF (WIN32)
   LIST(APPEND MYSYS_SOURCES
     my_conio.cc
@@ -149,12 +165,6 @@
   SET(MYSYS_SOURCES ${MYSYS_SOURCES} my_getpwnam.cc)
 ENDIF()
 
-IF(SOLARIS AND CMAKE_C_COMPILER_ID MATCHES "SunPro")
-  # Inline assembly template for rdtsc
-  SET_SOURCE_FILES_PROPERTIES(my_rdtsc.cc
-    PROPERTIES COMPILE_FLAGS "${CMAKE_CURRENT_SOURCE_DIR}/my_timer_cycles.il")
-ENDIF()
-
 IF(HAVE_LINUX_LARGE_PAGES)
   LIST(APPEND MYSYS_SOURCES my_largepage.cc)
 ENDIF()
@@ -212,11 +222,3 @@
   SKIP_INSTALL
   )
 SET_TARGET_PROPERTIES(mf_iocache_test PROPERTIES COMPILE_FLAGS "-DMAIN")
-
-MYSQL_ADD_EXECUTABLE(base64_test
-  base64.cc
-  DEPENDENCIES GenError
-  LINK_LIBRARIES mysys
-  SKIP_INSTALL
-  )
-SET_TARGET_PROPERTIES(base64_test PROPERTIES COMPILE_FLAGS "-DMAIN")
diff -Nru mysql-8.0-8.0.26/mysys/crypt_genhash_impl.cc mysql-8.0-8.0.27/mysys/crypt_genhash_impl.cc
--- mysql-8.0-8.0.26/mysys/crypt_genhash_impl.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysys/crypt_genhash_impl.cc	2021-09-28 11:46:34.000000000 +0000
@@ -32,6 +32,8 @@
 // First include (the generated) my_config.h, to get correct platform defines.
 #include "my_config.h"
 
+#include <memory>
+
 #include <sys/types.h>
 
 #include <openssl/evp.h>
@@ -46,16 +48,8 @@
 #include "crypt_genhash_impl.h"
 #include "m_string.h"
 
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-
 #include <errno.h>
 
-#ifdef _WIN32
-#include <malloc.h>
-#endif
-
 #define DIGEST_CTX EVP_MD_CTX
 #define DIGEST_LEN SHA256_DIGEST_LENGTH
 
@@ -327,7 +321,8 @@
   DIGESTFinal(DP, ctxDP);
 
   /* 16. */
-  Pp = P = (char *)alloca(plaintext_len);
+  std::unique_ptr<char[]> PPbuf(new char[plaintext_len]);
+  Pp = P = PPbuf.get();
   for (i = plaintext_len; i >= MIXCHARS; i -= MIXCHARS) {
     Pp = (char *)(memcpy(Pp, DP, MIXCHARS)) + MIXCHARS;
   }
@@ -339,7 +334,8 @@
   DIGESTFinal(DS, ctxDS);
 
   /* 20. */
-  Sp = S = (char *)alloca(salt_len);
+  std::unique_ptr<char[]> SSbuf(new char[salt_len]);
+  Sp = S = SSbuf.get();
   for (i = salt_len; i >= MIXCHARS; i -= MIXCHARS) {
     Sp = (char *)(memcpy(Sp, DS, MIXCHARS)) + MIXCHARS;
   }
diff -Nru mysql-8.0-8.0.26/mysys/dbug.cc mysql-8.0-8.0.27/mysys/dbug.cc
--- mysql-8.0-8.0.26/mysys/dbug.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysys/dbug.cc	2021-09-28 11:46:34.000000000 +0000
@@ -594,7 +594,7 @@
       case 'A':
       case 'O':
         stack->flags |= FLUSH_ON_WRITE;
-        /* fall through */
+        [[fallthrough]];
       case 'a':
       case 'o':
         /* In case we already have an open file. */
@@ -1145,7 +1145,7 @@
     case ENABLE_TRACE:
       cs->framep->level |= TRACE_ON;
       if (!TRACING) break;
-      /* fall through */
+      [[fallthrough]];
     case DO_TRACE:
       if (TRACING) {
         if (!cs->locked) native_mutex_lock(&THR_LOCK_dbug);
@@ -1157,7 +1157,7 @@
       break;
     case DISABLE_TRACE:
       cs->framep->level &= ~TRACE_ON;
-      /* fall through */
+      [[fallthrough]];
     case DONT_TRACE:
       break;
   }
diff -Nru mysql-8.0-8.0.26/mysys/errors.cc mysql-8.0-8.0.27/mysys/errors.cc
--- mysql-8.0-8.0.26/mysys/errors.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysys/errors.cc	2021-09-28 11:46:34.000000000 +0000
@@ -138,7 +138,8 @@
     "Shift character out of range: %s.",
     "Reset character out of range: %s.",
     "Unknown LDML tag: '%.*s'.",
-    "Failed to reset before a secondary ignorable character %s."};
+    "Failed to reset before a secondary ignorable character %s.",
+    "Stopped processing the '%s' directive in file %s at line %d."};
 
 /*
  We cannot call my_error/my_printf_error here in this function.
diff -Nru mysql-8.0-8.0.26/mysys/kqueue_timers.cc mysql-8.0-8.0.27/mysys/kqueue_timers.cc
--- mysql-8.0-8.0.26/mysys/kqueue_timers.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysys/kqueue_timers.cc	2021-09-28 11:46:34.000000000 +0000
@@ -52,7 +52,7 @@
   @param  arg   Unused.
 */
 
-static void *timer_notify_thread_func(void *arg MY_ATTRIBUTE((unused))) {
+static void *timer_notify_thread_func(void *arg [[maybe_unused]]) {
   my_timer_t *timer;
   struct kevent kev;
 
diff -Nru mysql-8.0-8.0.26/mysys/mf_iocache.cc mysql-8.0-8.0.27/mysys/mf_iocache.cc
--- mysql-8.0-8.0.26/mysys/mf_iocache.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysys/mf_iocache.cc	2021-09-28 11:46:34.000000000 +0000
@@ -326,8 +326,7 @@
 */
 
 bool reinit_io_cache(IO_CACHE *info, enum cache_type type, my_off_t seek_offset,
-                     bool use_async_io MY_ATTRIBUTE((unused)),
-                     bool clear_cache) {
+                     bool use_async_io [[maybe_unused]], bool clear_cache) {
   DBUG_TRACE;
   DBUG_PRINT("enter", ("cache: %p type: %d  seek_offset: %lu  clear_cache: %d",
                        info, type, (ulong)seek_offset, (int)clear_cache));
@@ -1049,7 +1048,7 @@
   */
   while (write_length) {
     size_t copy_length = std::min(write_length, write_cache->buffer_length);
-    int MY_ATTRIBUTE((unused)) rc;
+    [[maybe_unused]] int rc;
 
     rc = lock_io_cache(write_cache, write_cache->pos_in_file);
     /* The writing thread does always have the lock when it awakes. */
diff -Nru mysql-8.0-8.0.26/mysys/mf_keycache.cc mysql-8.0-8.0.27/mysys/mf_keycache.cc
--- mysql-8.0-8.0.26/mysys/mf_keycache.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysys/mf_keycache.cc	2021-09-28 11:46:34.000000000 +0000
@@ -38,11 +38,11 @@
   When a new block is required it is first tried to pop one from the stack.
   If the stack is empty, it is tried to get a never-used block from the pool.
   If this is empty too, then a block is taken from the LRU ring, flushing it
-  to disk, if neccessary. This is handled in find_key_block().
+  to disk, if necessary. This is handled in find_key_block().
   With the new free list, the blocks can have three temperatures:
   hot, warm and cold (which is free). This is remembered in the block header
   by the enum BLOCK_TEMPERATURE temperature variable. Remembering the
-  temperature is neccessary to correctly count the number of warm blocks,
+  temperature is necessary to correctly count the number of warm blocks,
   which is required to decide when blocks are allowed to become hot. Whenever
   a block is inserted to another (sub-)chain, we take the old and new
   temperature into account to decide if we got one more or less warm block.
@@ -2110,7 +2110,7 @@
 uchar *key_cache_read(KEY_CACHE *keycache, st_keycache_thread_var *thread_var,
                       File file, my_off_t filepos, int level, uchar *buff,
                       uint length, uint block_length,
-                      int return_buffer MY_ATTRIBUTE((unused))) {
+                      int return_buffer [[maybe_unused]]) {
   bool locked_and_incremented = false;
   int error = 0;
   uchar *start = buff;
@@ -2521,7 +2521,7 @@
 
 int key_cache_write(KEY_CACHE *keycache, st_keycache_thread_var *thread_var,
                     File file, my_off_t filepos, int level, uchar *buff,
-                    uint length, uint block_length MY_ATTRIBUTE((unused)),
+                    uint length, uint block_length [[maybe_unused]],
                     int dont_write) {
   bool locked_and_incremented = false;
   int error = 0;
@@ -3598,7 +3598,7 @@
     0 on success (always because it can't fail)
 */
 
-int reset_key_cache_counters(const char *name MY_ATTRIBUTE((unused)),
+int reset_key_cache_counters(const char *name [[maybe_unused]],
                              KEY_CACHE *key_cache) {
   DBUG_TRACE;
   if (!key_cache->key_cache_inited) {
diff -Nru mysql-8.0-8.0.26/mysys/mf_tempfile.cc mysql-8.0-8.0.27/mysys/mf_tempfile.cc
--- mysql-8.0-8.0.26/mysys/mf_tempfile.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysys/mf_tempfile.cc	2021-09-28 11:46:34.000000000 +0000
@@ -216,9 +216,9 @@
 */
 
 File create_temp_file(char *to, const char *dir, const char *prefix,
-                      int mode MY_ATTRIBUTE((unused)),
+                      int mode [[maybe_unused]],
                       UnlinkOrKeepFile unlink_or_keep,
-                      myf MyFlags MY_ATTRIBUTE((unused))) {
+                      myf MyFlags [[maybe_unused]]) {
   File file = -1;
 #ifdef _WIN32
   TCHAR path_buf[MAX_PATH + 1];
diff -Nru mysql-8.0-8.0.26/mysys/mf_unixpath.cc mysql-8.0-8.0.27/mysys/mf_unixpath.cc
--- mysql-8.0-8.0.26/mysys/mf_unixpath.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysys/mf_unixpath.cc	2021-09-28 11:46:34.000000000 +0000
@@ -40,7 +40,7 @@
 #include "my_compiler.h"
 #include "my_io.h"
 
-void to_unix_path(char *to MY_ATTRIBUTE((unused))) {
+void to_unix_path(char *to [[maybe_unused]]) {
 #if FN_LIBCHAR != '/'
   {
     to--;
diff -Nru mysql-8.0-8.0.26/mysys/my_access.cc mysql-8.0-8.0.27/mysys/my_access.cc
--- mysql-8.0-8.0.26/mysys/my_access.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysys/my_access.cc	2021-09-28 11:46:34.000000000 +0000
@@ -192,9 +192,9 @@
 
   @return true if the file name is allowed, false otherwise.
 */
-bool is_filename_allowed(const char *name MY_ATTRIBUTE((unused)),
-                         size_t length MY_ATTRIBUTE((unused)),
-                         bool allow_current_dir MY_ATTRIBUTE((unused))) {
+bool is_filename_allowed(const char *name [[maybe_unused]],
+                         size_t length [[maybe_unused]],
+                         bool allow_current_dir [[maybe_unused]]) {
   /*
     For Windows, check if the file name contains : character.
     Start from end of path and search if the file name contains :
diff -Nru mysql-8.0-8.0.26/mysys/my_aes_openssl.cc mysql-8.0-8.0.27/mysys/my_aes_openssl.cc
--- mysql-8.0-8.0.26/mysys/my_aes_openssl.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysys/my_aes_openssl.cc	2021-09-28 11:46:34.000000000 +0000
@@ -204,14 +204,15 @@
   return MY_AES_BAD_DATA;
 }
 
-int my_aes_get_size(uint32 source_length, my_aes_opmode opmode) {
+longlong my_aes_get_size(uint32 source_length, my_aes_opmode opmode) {
   const EVP_CIPHER *cipher = aes_evp_type(opmode);
   size_t block_size;
 
   block_size = EVP_CIPHER_block_size(cipher);
 
-  return block_size > 1 ? block_size * (source_length / block_size) + block_size
-                        : source_length;
+  if (block_size <= 1) return source_length;
+  return block_size * (static_cast<ulonglong>(source_length) / block_size) +
+         block_size;
 }
 
 bool my_aes_needs_iv(my_aes_opmode opmode) {
diff -Nru mysql-8.0-8.0.26/mysys/my_alloc.cc mysql-8.0-8.0.27/mysys/my_alloc.cc
--- mysql-8.0-8.0.26/mysys/my_alloc.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysys/my_alloc.cc	2021-09-28 11:46:34.000000000 +0000
@@ -275,15 +275,6 @@
   return str ? strdup_root(root, str) : nullptr;
 }
 
-void free_root(MEM_ROOT *root, myf flags) {
-  if (root != nullptr) {
-    if ((flags & MY_MARK_BLOCKS_FREE) || (flags & MY_KEEP_PREALLOC))
-      root->ClearForReuse();
-    else
-      root->Clear();
-  }
-}
-
 char *strmake_root(MEM_ROOT *root, const char *str, size_t len) {
   char *pos;
   if ((pos = static_cast<char *>(root->Alloc(len + 1)))) {
diff -Nru mysql-8.0-8.0.26/mysys/my_default.cc mysql-8.0-8.0.27/mysys/my_default.cc
--- mysql-8.0-8.0.26/mysys/my_default.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysys/my_default.cc	2021-09-28 11:46:34.000000000 +0000
@@ -236,9 +236,12 @@
 static int search_default_file(Process_option_func func, void *func_ctx,
                                const char *dir, const char *config_file,
                                bool is_login_file);
-static int search_default_file_with_ext(
-    Process_option_func func, void *func_ctx, const char *dir, const char *ext,
-    const char *config_file, int recursion_level, bool is_login_file);
+static int search_default_file_with_ext(Process_option_func func,
+                                        void *func_ctx, const char *dir,
+                                        const char *ext,
+                                        const char *config_file,
+                                        int recursion_level, bool is_login_file,
+                                        bool report_os_error_on_open);
 using mysql_file_getline_ret = std::unique_ptr<char, decltype(std::free) *>;
 static mysql_file_getline_ret mysql_file_getline(char *str, int size,
                                                  MYSQL_FILE *file,
@@ -458,8 +461,9 @@
   // If my defaults file is set (from a previous run), we read it
   else if (my_defaults_file) {
     int error;
-    if ((error = search_default_file_with_ext(
-             func, func_ctx, "", "", my_defaults_file, 0, is_login_file)) < 0)
+    if ((error = search_default_file_with_ext(func, func_ctx, "", "",
+                                              my_defaults_file, 0,
+                                              is_login_file, false)) < 0)
       goto err;
     if (error > 0) {
       my_message_local(ERROR_LEVEL, EE_FAILED_TO_OPEN_DEFAULTS_FILE,
@@ -476,7 +480,7 @@
         int error;
         if ((error = search_default_file_with_ext(func, func_ctx, "", "",
                                                   my_defaults_extra_file, 0,
-                                                  is_login_file)) < 0)
+                                                  is_login_file, false)) < 0)
           goto err; /* Fatal error */
         if (error > 0) {
           my_message_local(ERROR_LEVEL, EE_FAILED_TO_OPEN_DEFAULTS_FILE,
@@ -715,7 +719,7 @@
         (error = my_search_option_files(my_login_file, argc, argv, &args_used,
                                         handle_default_option, (void *)&ctx,
                                         dirs, true, found_no_defaults))) {
-      free_root(alloc, MYF(0));
+      alloc->Clear();
       return error;
     }
   }
@@ -799,9 +803,9 @@
 
   for (ext = exts_to_use; *ext; ext++) {
     int error;
-    if ((error =
-             search_default_file_with_ext(opt_handler, handler_ctx, dir, *ext,
-                                          config_file, 0, is_login_file)) < 0)
+    if ((error = search_default_file_with_ext(opt_handler, handler_ctx, dir,
+                                              *ext, config_file, 0,
+                                              is_login_file, false)) < 0)
       return error;
   }
   return 0;
@@ -866,6 +870,7 @@
     recursion_level             the level of recursion, got while processing
                                 "!include" or "!includedir"
     is_login_file               TRUE, when login file is being processed.
+    report_os_error_on_open     true when OS error is to be reported
 
   RETURN
     0   Success
@@ -877,8 +882,8 @@
                                         void *handler_ctx, const char *dir,
                                         const char *ext,
                                         const char *config_file,
-                                        int recursion_level,
-                                        bool is_login_file) {
+                                        int recursion_level, bool is_login_file,
+                                        bool report_os_error_on_open) {
   char name[FN_REFLEN + 10], buff[4096], curr_gr[4096], *ptr, *end;
   const char **tmp_ext;
   char *value, tmp[FN_REFLEN];
@@ -891,6 +896,7 @@
   uint i, rc;
   MY_DIR *search_dir;
   FILEINFO *search_file;
+  myf flags = MYF(report_os_error_on_open ? MY_WME : 0);
 
   if ((dir ? strlen(dir) : 0) + strlen(config_file) >= FN_REFLEN - 3)
     return 0; /* Ignore wrong paths */
@@ -904,14 +910,15 @@
   }
   fn_format(name, name, "", "", MY_UNPACK_FILENAME);
 
-  if ((rc = check_file_permissions(name, is_login_file)) < 2) return (int)rc;
+  if ((rc = check_file_permissions(name, is_login_file, flags)) < 2)
+    return (int)rc;
 
   if (is_login_file) {
     if (!(fp = mysql_file_fopen(key_file_cnf, name, O_RDONLY | MY_FOPEN_BINARY,
-                                MYF(0))))
+                                flags)))
       return 1; /* Ignore wrong files. */
   } else {
-    if (!(fp = mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0))))
+    if (!(fp = mysql_file_fopen(key_file_cnf, name, O_RDONLY, flags)))
       return 1; /* Ignore wrong files */
   }
 
@@ -950,7 +957,11 @@
                                  ptr, name, line)))
           goto err;
 
-        if (!(search_dir = my_dir(ptr, MYF(MY_WME)))) goto err;
+        if (!(search_dir = my_dir(ptr, MYF(MY_WME)))) {
+          my_message_local(ERROR_LEVEL, EE_FAILED_PROCESSING_DIRECTIVE,
+                           includedir_keyword, name, line);
+          goto err;
+        }
 
         for (i = 0; i < search_dir->number_off_files; i++) {
           search_file = search_dir->dir_entry + i;
@@ -977,9 +988,11 @@
             */
             if (it != default_paths.end()) default_paths[tmp] = it->second;
 
-            search_default_file_with_ext(opt_handler, handler_ctx, nullptr,
-                                         nullptr, tmp, recursion_level + 1,
-                                         is_login_file);
+            if (search_default_file_with_ext(opt_handler, handler_ctx, nullptr,
+                                             nullptr, tmp, recursion_level + 1,
+                                             is_login_file, true))
+              my_message_local(ERROR_LEVEL, EE_FAILED_PROCESSING_DIRECTIVE,
+                               includedir_keyword, name, line);
           }
         }
 
@@ -1006,8 +1019,11 @@
             fn_format(tmp, ptr, "", "", MY_UNPACK_FILENAME | MY_SAFE_PATH))
           default_paths[tmp] = it->second;
 
-        search_default_file_with_ext(opt_handler, handler_ctx, nullptr, nullptr,
-                                     ptr, recursion_level + 1, is_login_file);
+        if (search_default_file_with_ext(opt_handler, handler_ctx, nullptr,
+                                         nullptr, ptr, recursion_level + 1,
+                                         is_login_file, true))
+          my_message_local(ERROR_LEVEL, EE_FAILED_PROCESSING_DIRECTIVE,
+                           include_keyword, name, line);
       }
 
       continue;
@@ -1180,7 +1196,7 @@
 
   /* If the supplied buff/size is enough to store the line, then we return the
    * buff itself. In this case, we use this noop deleter */
-  static auto noop_free = [](void *) {};
+  static auto noop_free = [](void *) noexcept {};
 
   if (is_login_file) {
     if (mysql_file_ftell(file) == 0) {
@@ -1276,8 +1292,7 @@
     fputs(conf_file, stdout);
   else {
     const char **dirs;
-    MEM_ROOT alloc;
-    init_alloc_root(key_memory_defaults, &alloc, 512, 0);
+    MEM_ROOT alloc(key_memory_defaults, 512);
 
     if ((dirs = init_default_directories(&alloc)) == nullptr) {
       fputs("Internal error initializing default directories list", stdout);
@@ -1305,7 +1320,7 @@
       }
     }
 
-    free_root(&alloc, MYF(0));
+    alloc.Clear();
   }
   puts("");
 }
@@ -1469,9 +1484,9 @@
       /* check if variables are prefixed with skip_ */
       if (id == 4) {
         bool skip_variable = false;
-        string skip_variables[] = {"skip_name_resolve", "skip_networking",
-                                   "skip_show_database",
-                                   "skip_external_locking"};
+        string skip_variables[] = {
+            "skip_name_resolve",     "skip_networking",  "skip_show_database",
+            "skip_external_locking", "skip_slave_start", "skip_replica_start"};
         for (uint skip_index = 0;
              skip_index < sizeof(skip_variables) / sizeof(skip_variables[0]);
              ++skip_index) {
@@ -1545,7 +1560,7 @@
   char buf[FN_REFLEN];
   size_t len;
   char *p;
-  bool err MY_ATTRIBUTE((unused));
+  bool err [[maybe_unused]];
 
   len = normalize_dirname(buf, dir);
   if (!(p = strmake_root(alloc, buf, len))) return 1; /* Failure */
@@ -1701,16 +1716,18 @@
 
   @param [in] file_name        Name of the option file.
   @param [in] is_login_file    TRUE, when login file is being processed.
+  @param [in] flags            error handling flags
 
   @return  0 - Non-allowable file permissions.
            1 - Failed to stat.
            2 - Success.
 */
-int check_file_permissions(const char *file_name, bool is_login_file) {
+int check_file_permissions(const char *file_name, bool is_login_file,
+                           myf flags) {
 #if !defined(_WIN32)
   MY_STAT stat_info;
 
-  if (!my_stat(file_name, &stat_info, MYF(0))) return 1;
+  if (!my_stat(file_name, &stat_info, flags)) return 1;
   /*
     Ignore .mylogin.cnf file if not exclusively readable/writable
     by current user.
diff -Nru mysql-8.0-8.0.26/mysys/my_gethwaddr.cc mysql-8.0-8.0.27/mysys/my_gethwaddr.cc
--- mysql-8.0-8.0.26/mysys/my_gethwaddr.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysys/my_gethwaddr.cc	2021-09-28 11:46:34.000000000 +0000
@@ -234,11 +234,11 @@
 
 #else /* __FreeBSD__ || __linux__ || _WIN32 */
 /* just fail */
-bool my_gethwaddr(uchar *to MY_ATTRIBUTE((unused))) { return 1; }
+bool my_gethwaddr(uchar *to [[maybe_unused]]) { return 1; }
 #endif
 
 #else /* MAIN */
-int main(int argc MY_ATTRIBUTE((unused)), char **argv) {
+int main(int argc [[maybe_unused]], char **argv) {
   uchar mac[6];
   uint i;
   MY_INIT(argv[0]);
diff -Nru mysql-8.0-8.0.26/mysys/my_getopt.cc mysql-8.0-8.0.27/mysys/my_getopt.cc
--- mysql-8.0-8.0.26/mysys/my_getopt.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysys/my_getopt.cc	2021-09-28 11:46:34.000000000 +0000
@@ -395,7 +395,7 @@
                 if ((opt_found = findopt(opt_str, length, &optp))) {
                   switch (i) {
                     case OPT_SKIP:
-                    case OPT_DISABLE: /* fall through */
+                    case OPT_DISABLE:
                       /*
                         double negation is actually enable again,
                         for example: --skip-option=0 -> option = true
@@ -1353,7 +1353,7 @@
 */
 
 static void fini_one_value(const struct my_option *option, void *variable,
-                           longlong value MY_ATTRIBUTE((unused))) {
+                           longlong value [[maybe_unused]]) {
   DBUG_TRACE;
   switch ((option->var_type & GET_TYPE_MASK)) {
     case GET_STR_ALLOC:
@@ -1554,7 +1554,7 @@
           break;
         case GET_STR:
         case GET_PASSWORD:
-        case GET_STR_ALLOC: /* fall through */
+        case GET_STR_ALLOC:
           fprintf(file, "%s\n",
                   *((char **)value) ? *((char **)value) : "(No default value)");
           break;
diff -Nru mysql-8.0-8.0.26/mysys/my_getpwnam.cc mysql-8.0-8.0.27/mysys/my_getpwnam.cc
--- mysql-8.0-8.0.26/mysys/my_getpwnam.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysys/my_getpwnam.cc	2021-09-28 11:46:34.000000000 +0000
@@ -57,7 +57,7 @@
       case ERANGE:
         bufsz *= 2;
         buf.resize(bufsz);
-        // fallthrough
+        [[fallthrough]];
       case EINTR:
         continue;
       default:
diff -Nru mysql-8.0-8.0.26/mysys/my_init.cc mysql-8.0-8.0.27/mysys/my_init.cc
--- mysql-8.0-8.0.26/mysys/my_init.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysys/my_init.cc	2021-09-28 11:46:34.000000000 +0000
@@ -549,14 +549,14 @@
 
 #ifdef HAVE_PSI_THREAD_INTERFACE
 static PSI_thread_info all_mysys_thread[] = {
-    {&key_thread_timer_notifier, "thread_timer_notifier", PSI_FLAG_SINGLETON, 0,
-     PSI_DOCUMENT_ME}};
+    {&key_thread_timer_notifier, "thread_timer_notifier", "timer_notifier",
+     PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME}};
 #endif /* HAVE_PSI_THREAD_INTERFACE */
 
 #ifdef HAVE_PSI_INTERFACE
 void my_init_mysys_psi_keys() {
-  const char *category MY_ATTRIBUTE((unused)) = "mysys";
-  int count MY_ATTRIBUTE((unused));
+  const char *category [[maybe_unused]] = "mysys";
+  int count [[maybe_unused]];
 
 #ifdef HAVE_PSI_MUTEX_INTERFACE
   count = sizeof(all_mysys_mutexes) / sizeof(all_mysys_mutexes[0]);
diff -Nru mysql-8.0-8.0.26/mysys/my_lib.cc mysql-8.0-8.0.27/mysys/my_lib.cc
--- mysql-8.0-8.0.26/mysys/my_lib.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysys/my_lib.cc	2021-09-28 11:46:34.000000000 +0000
@@ -71,9 +71,8 @@
     Entries_array *array = pointer_cast<Entries_array *>(
         (char *)buffer + ALIGN_SIZE(sizeof(MY_DIR)));
     array->~Entries_array();
-    free_root((MEM_ROOT *)((char *)buffer + ALIGN_SIZE(sizeof(MY_DIR)) +
-                           ALIGN_SIZE(sizeof(Entries_array))),
-              MYF(0));
+    destroy((MEM_ROOT *)((char *)buffer + ALIGN_SIZE(sizeof(MY_DIR)) +
+                         ALIGN_SIZE(sizeof(Entries_array))));
     my_free(buffer);
   }
 } /* my_dirend */
@@ -106,12 +105,10 @@
 
   rawmem = pointer_cast<Entries_array *>(buffer + ALIGN_SIZE(sizeof(MY_DIR)));
   dir_entries_storage = new (rawmem) Entries_array(key_memory_MY_DIR);
-  names_storage = (MEM_ROOT *)(buffer + ALIGN_SIZE(sizeof(MY_DIR)) +
-                               ALIGN_SIZE(sizeof(Entries_array)));
-
-  init_alloc_root(key_memory_MY_DIR, names_storage, NAMES_START_SIZE,
-                  NAMES_START_SIZE);
-
+  names_storage = new (buffer + ALIGN_SIZE(sizeof(MY_DIR)) +
+                       ALIGN_SIZE(sizeof(Entries_array)))
+      MEM_ROOT(key_memory_MY_DIR, NAMES_START_SIZE);
+  ;
   /* MY_DIR structure is allocated and completly initialized at this point */
   result = (MY_DIR *)buffer;
 
@@ -220,11 +217,9 @@
 
   rawmem = buffer + ALIGN_SIZE(sizeof(MY_DIR));
   dir_entries_storage = new (rawmem) Entries_array(key_memory_MY_DIR);
-  names_storage = pointer_cast<MEM_ROOT *>(buffer + ALIGN_SIZE(sizeof(MY_DIR)) +
-                                           ALIGN_SIZE(sizeof(Entries_array)));
-
-  init_alloc_root(key_memory_MY_DIR, names_storage, NAMES_START_SIZE,
-                  NAMES_START_SIZE);
+  names_storage = new (buffer + ALIGN_SIZE(sizeof(MY_DIR)) +
+                       ALIGN_SIZE(sizeof(Entries_array)))
+      MEM_ROOT(key_memory_MY_DIR, NAMES_START_SIZE);
 
   /* MY_DIR structure is allocated and completly initialized at this point */
   result = (MY_DIR *)buffer;
diff -Nru mysql-8.0-8.0.26/mysys/my_malloc.cc mysql-8.0-8.0.27/mysys/my_malloc.cc
--- mysql-8.0-8.0.26/mysys/my_malloc.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysys/my_malloc.cc	2021-09-28 11:46:34.000000000 +0000
@@ -153,20 +153,20 @@
 
 #else
 
-void *my_malloc(PSI_memory_key key MY_ATTRIBUTE((unused)), size_t size,
+void *my_malloc(PSI_memory_key key [[maybe_unused]], size_t size,
                 myf my_flags) {
   return my_raw_malloc(size, my_flags);
 }
 
 static void *my_raw_realloc(void *oldpoint, size_t size, myf my_flags);
 
-void *my_realloc(PSI_memory_key key MY_ATTRIBUTE((unused)), void *ptr,
-                 size_t size, myf flags) {
+void *my_realloc(PSI_memory_key key [[maybe_unused]], void *ptr, size_t size,
+                 myf flags) {
   return my_raw_realloc(ptr, size, flags);
 }
 
-void my_claim(const void *ptr MY_ATTRIBUTE((unused)),
-              bool claim MY_ATTRIBUTE((unused))) { /* Empty */
+void my_claim(const void *ptr [[maybe_unused]],
+              bool claim [[maybe_unused]]) { /* Empty */
 }
 
 void my_free(void *ptr) { my_raw_free(ptr); }
diff -Nru mysql-8.0-8.0.26/mysys/my_mess.cc mysql-8.0-8.0.27/mysys/my_mess.cc
--- mysql-8.0-8.0.26/mysys/my_mess.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysys/my_mess.cc	2021-09-28 11:46:34.000000000 +0000
@@ -56,7 +56,7 @@
   @param str      The message to print. Not trailing \n needed.
   @param MyFlags  ME_BELL to beep, or 0.
 */
-void my_message_stderr(uint error MY_ATTRIBUTE((unused)), const char *str,
+void my_message_stderr(uint error [[maybe_unused]], const char *str,
                        myf MyFlags) {
   DBUG_TRACE;
   DBUG_PRINT("enter", ("message: %s", str));
diff -Nru mysql-8.0-8.0.26/mysys/my_murmur3.cc mysql-8.0-8.0.27/mysys/my_murmur3.cc
--- mysql-8.0-8.0.26/mysys/my_murmur3.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysys/my_murmur3.cc	2021-09-28 11:46:34.000000000 +0000
@@ -112,10 +112,10 @@
   switch (len % 4) {
     case 3:
       k1 ^= static_cast<uint32>(tail[2]) << 16;
-      /* Fall through. */
+      [[fallthrough]];
     case 2:
       k1 ^= static_cast<uint32>(tail[1]) << 8;
-      /* Fall through. */
+      [[fallthrough]];
     case 1:
       k1 ^= tail[0];
       k1 *= c1;
diff -Nru mysql-8.0-8.0.26/mysys/my_rdtsc.cc mysql-8.0-8.0.27/mysys/my_rdtsc.cc
--- mysql-8.0-8.0.26/mysys/my_rdtsc.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysys/my_rdtsc.cc	2021-09-28 11:46:34.000000000 +0000
@@ -84,25 +84,6 @@
 #include <mach/mach_time.h>
 #endif
 
-#if (defined(__SUNPRO_CC) || defined(__clang__)) && defined(__sparcv9) && \
-    defined(_LP64)
-extern "C" ulonglong my_timer_cycles_il_sparc64();
-#elif defined(__SUNPRO_CC) && defined(_ILP32)
-extern "C" ulonglong my_timer_cycles_il_sparc32();
-#elif defined(__SUNPRO_CC) && defined(__i386) && defined(_ILP32)
-extern "C" ulonglong my_timer_cycles_il_i386();
-#elif defined(__SUNPRO_CC) && defined(__x86_64) && defined(_LP64)
-extern "C" ulonglong my_timer_cycles_il_x86_64();
-#elif defined(__SUNPRO_C) && defined(__sparcv9) && defined(_LP64)
-ulonglong my_timer_cycles_il_sparc64();
-#elif defined(__SUNPRO_C) && defined(_ILP32)
-ulonglong my_timer_cycles_il_sparc32();
-#elif defined(__SUNPRO_C) && defined(__i386) && defined(_ILP32)
-ulonglong my_timer_cycles_il_i386();
-#elif defined(__SUNPRO_C) && defined(__x86_64) && defined(_LP64)
-ulonglong my_timer_cycles_il_x86_64();
-#endif
-
 /*
   For cycles, we depend on RDTSC for x86 platforms,
   or on time buffer (which is not really a cycle count
@@ -117,8 +98,6 @@
   ulonglong result;
   __asm__ __volatile__("rdtsc" : "=A"(result));
   return result;
-#elif defined(__SUNPRO_C) && defined(__i386)
-  __asm("rdtsc");
 #elif defined(__GNUC__) && defined(__x86_64__)
   ulonglong result;
   __asm__ __volatile__(
@@ -162,18 +141,6 @@
     result = x1;
     return (result << 32) | x2;
   }
-#elif (defined(__SUNPRO_CC) || defined(__SUNPRO_C)) && defined(__sparcv9) && \
-    defined(_LP64)
-  return (my_timer_cycles_il_sparc64());
-#elif (defined(__SUNPRO_CC) || defined(__SUNPRO_C)) && defined(_ILP32)
-  return (my_timer_cycles_il_sparc32());
-#elif (defined(__SUNPRO_CC) || defined(__SUNPRO_C)) && defined(__i386) && \
-    defined(_ILP32)
-  /* This is probably redundant for __SUNPRO_C. */
-  return (my_timer_cycles_il_i386());
-#elif (defined(__SUNPRO_CC) || defined(__SUNPRO_C)) && defined(__x86_64) && \
-    defined(_LP64)
-  return (my_timer_cycles_il_x86_64());
 #elif defined(__GNUC__) && (defined(__sparcv9) || defined(__sparc_v9__)) && \
     defined(_LP64) && !defined(__clang__)
   {
@@ -469,8 +436,6 @@
   mti->cycles.frequency = 1000000000;
 #if defined(__GNUC__) && defined(__i386__)
   mti->cycles.routine = MY_TIMER_ROUTINE_ASM_X86;
-#elif defined(__SUNPRO_C) && defined(__i386)
-  mti->cycles.routine = MY_TIMER_ROUTINE_ASM_X86;
 #elif defined(__GNUC__) && defined(__x86_64__)
   mti->cycles.routine = MY_TIMER_ROUTINE_ASM_X86_64;
 #elif defined(_WIN64) && defined(_M_X64)
@@ -483,22 +448,9 @@
 #elif defined(__GNUC__) && (defined(__powerpc__) || defined(__POWERPC__)) && \
     (!defined(__64BIT__) && !defined(_ARCH_PPC64))
   mti->cycles.routine = MY_TIMER_ROUTINE_ASM_PPC;
-#elif (defined(__SUNPRO_CC) || defined(__SUNPRO_C)) && defined(__sparcv9) && \
-    defined(_LP64)
-  mti->cycles.routine = MY_TIMER_ROUTINE_ASM_SUNPRO_SPARC64;
-#elif (defined(__SUNPRO_CC) || defined(__SUNPRO_C)) && defined(_ILP32)
-  mti->cycles.routine = MY_TIMER_ROUTINE_ASM_SUNPRO_SPARC32;
-#elif (defined(__SUNPRO_CC) || defined(__SUNPRO_C)) && defined(__i386) && \
-    defined(_ILP32)
-  mti->cycles.routine = MY_TIMER_ROUTINE_ASM_SUNPRO_I386;
-#elif (defined(__SUNPRO_CC) || defined(__SUNPRO_C)) && defined(__x86_64) && \
-    defined(_LP64)
-  mti->cycles.routine = MY_TIMER_ROUTINE_ASM_SUNPRO_X86_64;
 #elif defined(__GNUC__) && (defined(__sparcv9) || defined(__sparc_v9__)) && \
     defined(_LP64)
   mti->cycles.routine = MY_TIMER_ROUTINE_ASM_GCC_SPARC64;
-#elif defined(__GNUC__) && defined(__sparc__) && !defined(_LP64)
-  mti->cycles.routine = MY_TIMER_ROUTINE_ASM_GCC_SPARC32;
 #elif defined(__GNUC__) && defined(__aarch64__)
   mti->cycles.routine = MY_TIMER_ROUTINE_ASM_AARCH64;
 #elif defined(HAVE_SYS_TIMES_H) && defined(HAVE_GETHRTIME)
diff -Nru mysql-8.0-8.0.26/mysys/my_static.cc mysql-8.0-8.0.27/mysys/my_static.cc
--- mysql-8.0-8.0.26/mysys/my_static.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysys/my_static.cc	2021-09-28 11:46:34.000000000 +0000
@@ -120,7 +120,7 @@
         assert(my_file_opened + my_stream_opened == my_file_total_opened);
         return;
       }
-      // Fallthrough
+      [[fallthrough]];
     case OpenType::STREAM_BY_FOPEN:
       ++my_stream_opened;
       break;
@@ -170,32 +170,29 @@
 void (*local_message_hook)(enum loglevel ll, uint ecode,
                            va_list args) = my_message_local_stderr;
 
-static void enter_cond_dummy(void *a MY_ATTRIBUTE((unused)),
-                             mysql_cond_t *b MY_ATTRIBUTE((unused)),
-                             mysql_mutex_t *c MY_ATTRIBUTE((unused)),
-                             const PSI_stage_info *d MY_ATTRIBUTE((unused)),
-                             PSI_stage_info *e MY_ATTRIBUTE((unused)),
-                             const char *f MY_ATTRIBUTE((unused)),
-                             const char *g MY_ATTRIBUTE((unused)),
-                             int h MY_ATTRIBUTE((unused))) {}
-
-static void exit_cond_dummy(void *a MY_ATTRIBUTE((unused)),
-                            const PSI_stage_info *b MY_ATTRIBUTE((unused)),
-                            const char *c MY_ATTRIBUTE((unused)),
-                            const char *d MY_ATTRIBUTE((unused)),
-                            int e MY_ATTRIBUTE((unused))) {}
-
-static void enter_stage_dummy(void *a MY_ATTRIBUTE((unused)),
-                              const PSI_stage_info *b MY_ATTRIBUTE((unused)),
-                              PSI_stage_info *c MY_ATTRIBUTE((unused)),
-                              const char *d MY_ATTRIBUTE((unused)),
-                              const char *e MY_ATTRIBUTE((unused)),
-                              int f MY_ATTRIBUTE((unused))) {}
+static void enter_cond_dummy(
+    void *a [[maybe_unused]], mysql_cond_t *b [[maybe_unused]],
+    mysql_mutex_t *c [[maybe_unused]], const PSI_stage_info *d [[maybe_unused]],
+    PSI_stage_info *e [[maybe_unused]], const char *f [[maybe_unused]],
+    const char *g [[maybe_unused]], int h [[maybe_unused]]) {}
+
+static void exit_cond_dummy(void *a [[maybe_unused]],
+                            const PSI_stage_info *b [[maybe_unused]],
+                            const char *c [[maybe_unused]],
+                            const char *d [[maybe_unused]],
+                            int e [[maybe_unused]]) {}
+
+static void enter_stage_dummy(void *a [[maybe_unused]],
+                              const PSI_stage_info *b [[maybe_unused]],
+                              PSI_stage_info *c [[maybe_unused]],
+                              const char *d [[maybe_unused]],
+                              const char *e [[maybe_unused]],
+                              int f [[maybe_unused]]) {}
 
-static void set_waiting_for_disk_space_dummy(void *a MY_ATTRIBUTE((unused)),
-                                             bool b MY_ATTRIBUTE((unused))) {}
+static void set_waiting_for_disk_space_dummy(void *a [[maybe_unused]],
+                                             bool b [[maybe_unused]]) {}
 
-static int is_killed_dummy(const void *a MY_ATTRIBUTE((unused))) { return 0; }
+static int is_killed_dummy(const void *a [[maybe_unused]]) { return 0; }
 
 /*
   Initialize these hooks to dummy implementations. The real server
diff -Nru mysql-8.0-8.0.26/mysys/my_syslog.cc mysql-8.0-8.0.27/mysys/my_syslog.cc
--- mysql-8.0-8.0.26/mysys/my_syslog.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysys/my_syslog.cc	2021-09-28 11:46:34.000000000 +0000
@@ -93,8 +93,8 @@
      0 Success
     -1 Error
 */
-int my_syslog(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-              enum loglevel level, const char *msg) {
+int my_syslog(const CHARSET_INFO *cs [[maybe_unused]], enum loglevel level,
+              const char *msg) {
 #ifdef _WIN32
   int _level = EVENTLOG_INFORMATION_TYPE;
   wchar_t buff[MAX_SYSLOG_MESSAGE_SIZE];
diff -Nru mysql-8.0-8.0.26/mysys/my_thread.cc mysql-8.0-8.0.27/mysys/my_thread.cc
--- mysql-8.0-8.0.26/mysys/my_thread.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysys/my_thread.cc	2021-09-28 11:46:34.000000000 +0000
@@ -29,6 +29,27 @@
   @file mysys/my_thread.cc
 */
 
+#include "my_config.h"
+
+#ifdef HAVE_PTHREAD_SETNAME_NP_LINUX
+#include <cstring>
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+#include <pthread.h>
+#endif /* HAVE_PTHREAD_SETNAME_NP_LINUX */
+
+#ifdef HAVE_PTHREAD_SETNAME_NP_MACOS
+#include <pthread.h>
+#endif /* HAVE_PTHREAD_SETNAME_NP_MACOS */
+
+#ifdef _WIN32
+#include <windows.h>
+
+#include <processthreadsapi.h>
+
+#include <stringapiset.h>
+#endif /* _WIN32 */
 #include "my_thread.h"
 #include "mysql/components/services/my_thread_bits.h"
 
@@ -138,3 +159,103 @@
   _endthreadex(0);
 #endif
 }
+
+/**
+  Maximum name length used for my_thread_self_setname(),
+  including the terminating NUL character.
+  Linux pthread_setname_np(3) is restricted to 15+1 chars,
+  so we use the same limit on all platforms.
+*/
+#define SETNAME_MAX_LENGTH 16
+
+#ifdef _WIN32
+template <class TMethod>
+class Win32_library_procedure {
+ public:
+  Win32_library_procedure(std::string module, std::string func_name)
+      : m_module(LoadLibrary(module.c_str())), m_func(nullptr) {
+    if (m_module != nullptr) {
+      m_func = reinterpret_cast<TMethod *>(
+          GetProcAddress(m_module, func_name.c_str()));
+    }
+  }
+  ~Win32_library_procedure() {
+    if (m_module != nullptr) {
+      FreeLibrary(m_module);
+    }
+  }
+  bool is_valid() { return m_func != nullptr; }
+  template <typename... TArgs>
+  auto operator()(TArgs... args) {
+    return m_func(std::forward<TArgs>(args)...);
+  }
+
+ private:
+  HMODULE m_module;
+  TMethod *m_func;
+};
+
+static Win32_library_procedure<decltype(SetThreadDescription)>
+    set_thread_name_proc("kernel32.dll", "SetThreadDescription");
+#endif
+
+void my_thread_self_setname(const char *name [[maybe_unused]]) {
+#ifdef HAVE_PTHREAD_SETNAME_NP_LINUX
+  /*
+    GNU extension, see pthread_setname_np(3)
+  */
+  char truncated_name[SETNAME_MAX_LENGTH];
+  strncpy(truncated_name, name, sizeof(truncated_name) - 1);
+  truncated_name[sizeof(truncated_name) - 1] = '\0';
+  pthread_setname_np(pthread_self(), truncated_name);
+#elif HAVE_PTHREAD_SETNAME_NP_MACOS
+  pthread_setname_np(name);
+#elif _WIN32
+  /* Check if we can use the new Windows 10 API. */
+  if (set_thread_name_proc.is_valid()) {
+    wchar_t w_name[SETNAME_MAX_LENGTH];
+    int size;
+
+    size =
+        MultiByteToWideChar(CP_UTF8, 0, name, -1, w_name, SETNAME_MAX_LENGTH);
+    if (size > 0 && size <= SETNAME_MAX_LENGTH) {
+      /* Make sure w_name is NUL terminated when truncated. */
+      w_name[SETNAME_MAX_LENGTH - 1] = 0;
+      set_thread_name_proc(GetCurrentThread(), w_name);
+    }
+  }
+
+  /* According to Microsoft documentation there is a "secret handshake" between
+  debuggee & debugger using the special values used below. We use it always in
+  case there is a debugger attached, even if the new Win10 API for thread names
+  is available. */
+  constexpr DWORD MS_VC_EXCEPTION = 0x406D1388;
+#pragma pack(push, 8)
+  struct THREADNAME_INFO {
+    DWORD dwType;
+    LPCSTR szName;
+    DWORD dwThreadID;
+    DWORD dwFlags;
+  };
+#pragma pack(pop)
+
+  THREADNAME_INFO info;
+  info.dwType = 0x1000;
+  info.szName = name;
+  info.dwThreadID = GetCurrentThreadId();
+  info.dwFlags = 0;
+
+#pragma warning(push)
+#pragma warning(disable : 6320 6322)
+  __try {
+    RaiseException(MS_VC_EXCEPTION, 0, sizeof(info) / sizeof(ULONG_PTR),
+                   (ULONG_PTR *)&info);
+  } __except (EXCEPTION_EXECUTE_HANDLER) {
+  }
+#pragma warning(pop)
+
+#else
+  /* Do nothing for this platform. */
+  return;
+#endif
+}
diff -Nru mysql-8.0-8.0.26/mysys/my_timer_cycles.il mysql-8.0-8.0.27/mysys/my_timer_cycles.il
--- mysql-8.0-8.0.26/mysys/my_timer_cycles.il	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysys/my_timer_cycles.il	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
-   Use is subject to license terms.
-
-  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,
-  as published by the Free Software Foundation.
-
-  This program is also distributed with certain software (including
-  but not limited to OpenSSL) that is licensed under separate terms,
-  as designated in a particular file or component or in included license
-  documentation.  The authors of MySQL hereby grant you an additional
-  permission to link the program and your derivative works with the
-  separately licensed software that they have included with MySQL.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License, version 2.0, for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
-
-/* Sun Studio SPARC inline templates for cycle timer */
-/* Sun Studio i386 and x86_64 inline templates for cycle timer */
-/* I didn't say ".volatile" or ".nonvolatile". */
-
-.inline my_timer_cycles_il_sparc64,0
-rd %tick,%o0
-.end
-
-.inline my_timer_cycles_il_sparc32,0
-rd %tick,%o2
-srlx %o2,32,%o0
-sra %o2,0,%o1
-.end
-
-.inline my_timer_cycles_il_i386,0
-rdtsc
-.end
-
-.inline my_timer_cycles_il_x86_64,0
-rdtsc
-shlq $32,%rdx
-orq %rdx,%rax
-.end
diff -Nru mysql-8.0-8.0.26/mysys/psi_noop.cc mysql-8.0-8.0.27/mysys/psi_noop.cc
--- mysql-8.0-8.0.26/mysys/psi_noop.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysys/psi_noop.cc	2021-09-28 11:46:34.000000000 +0000
@@ -91,13 +91,15 @@
   return;
 }
 
-static int spawn_thread_noop(PSI_thread_key, my_thread_handle *thread,
+static int spawn_thread_noop(PSI_thread_key, unsigned int,
+                             my_thread_handle *thread,
                              const my_thread_attr_t *attr,
                              my_start_routine start_routine, void *arg) {
   return my_thread_create(thread, attr, start_routine, arg);
 }
 
-static PSI_thread *new_thread_noop(PSI_thread_key, const void *, ulonglong) {
+static PSI_thread *new_thread_noop(PSI_thread_key, unsigned int, const void *,
+                                   ulonglong) {
   return nullptr;
 }
 
@@ -150,10 +152,9 @@
 
 static void delete_thread_noop(PSI_thread *) { return; }
 
-static int set_thread_connect_attrs_noop(
-    const char *buffer MY_ATTRIBUTE((unused)),
-    uint length MY_ATTRIBUTE((unused)),
-    const void *from_cs MY_ATTRIBUTE((unused))) {
+static int set_thread_connect_attrs_noop(const char *buffer [[maybe_unused]],
+                                         uint length [[maybe_unused]],
+                                         const void *from_cs [[maybe_unused]]) {
   return 0;
 }
 
diff -Nru mysql-8.0-8.0.26/mysys/stacktrace.cc mysql-8.0-8.0.27/mysys/stacktrace.cc
--- mysql-8.0-8.0.26/mysys/stacktrace.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysys/stacktrace.cc	2021-09-28 11:46:34.000000000 +0000
@@ -79,8 +79,8 @@
 extern char *__bss_start;
 #endif /* __linux */
 
-static inline bool ptr_sane(const char *p MY_ATTRIBUTE((unused)),
-                            const char *heap_end MY_ATTRIBUTE((unused))) {
+static inline bool ptr_sane(const char *p [[maybe_unused]],
+                            const char *heap_end [[maybe_unused]]) {
 #ifdef __linux__
   return p && p >= heap_start && p <= heap_end;
 #else
@@ -216,21 +216,7 @@
     }
   }
   if (demangled) my_safe_printf_stderr("%s %s %s\n", line, demangled, end + 1);
-#elif defined(__SUNPRO_CC)  // Solaris has different formatting .....
-  char *begin = strchr(line, '\'');
-  char *end = begin ? strchr(begin, '+') : NULL;
-  if (begin && end) {
-    *begin++ = *end++ = '\0';
-    int status = 0;
-    demangled = my_demangle(begin, &status);
-    if (!demangled || status) {
-      demangled = NULL;
-      begin[-1] = ' ';
-      end[-1] = '+';
-    }
-  }
-  if (demangled) my_safe_printf_stderr("%s %s+%s\n", line, demangled, end);
-#else                       // !__APPLE__ and !__SUNPRO_CC
+#else  // !__APPLE__
   char *begin = strchr(line, '(');
   char *end = begin ? strchr(begin, '+') : nullptr;
 
diff -Nru mysql-8.0-8.0.26/mysys/thr_lock.cc mysql-8.0-8.0.27/mysys/thr_lock.cc
--- mysql-8.0-8.0.26/mysys/thr_lock.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysys/thr_lock.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1174,17 +1174,15 @@
 
 /* The following functions is for WRITE_CONCURRENT_INSERT */
 
-static void test_get_status(void *param MY_ATTRIBUTE((unused)),
-                            int concurrent_insert MY_ATTRIBUTE((unused))) {}
+static void test_get_status(void *param [[maybe_unused]],
+                            int concurrent_insert [[maybe_unused]]) {}
 
-static void test_update_status(void *param MY_ATTRIBUTE((unused))) {}
+static void test_update_status(void *param [[maybe_unused]]) {}
 
-static void test_copy_status(void *to MY_ATTRIBUTE((unused)),
-                             void *from MY_ATTRIBUTE((unused))) {}
+static void test_copy_status(void *to [[maybe_unused]],
+                             void *from [[maybe_unused]]) {}
 
-static bool test_check_status(void *param MY_ATTRIBUTE((unused))) {
-  return false;
-}
+static bool test_check_status(void *param [[maybe_unused]]) { return false; }
 
 static void *test_thread(void *arg) {
   int i, j, param = *((int *)arg);
diff -Nru mysql-8.0-8.0.26/mysys/tree.cc mysql-8.0-8.0.27/mysys/tree.cc
--- mysql-8.0-8.0.26/mysys/tree.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysys/tree.cc	2021-09-28 11:46:34.000000000 +0000
@@ -133,11 +133,12 @@
     tree->size_of_element += sizeof(void *);
   }
   if (!(tree->with_delete = with_delete)) {
-    init_alloc_root(key_memory_TREE, &tree->mem_root, DEFAULT_ALLOC_SIZE, 0);
+    ::new ((void *)&tree->mem_root)
+        MEM_ROOT(key_memory_TREE, DEFAULT_ALLOC_SIZE);
   }
 }
 
-static void free_tree(TREE *tree, myf free_flags) {
+static void free_tree(TREE *tree, bool reuse) {
   DBUG_TRACE;
   DBUG_PRINT("enter", ("tree: %p", tree));
 
@@ -153,7 +154,11 @@
         if (tree->memory_limit)
           (*tree->free)(nullptr, free_end, tree->custom_arg);
       }
-      free_root(&tree->mem_root, free_flags);
+      if (reuse) {
+        tree->mem_root.ClearForReuse();
+      } else {
+        tree->mem_root.Clear();
+      }
     }
   }
   tree->root = &tree->null_element;
@@ -162,12 +167,12 @@
 }
 
 void delete_tree(TREE *tree) {
-  free_tree(tree, MYF(0)); /* my_free() mem_root if applicable */
+  free_tree(tree, /*reuse=*/false); /* my_free() mem_root if applicable */
 }
 
 void reset_tree(TREE *tree) {
   /* do not free mem_root, just mark blocks as free */
-  free_tree(tree, MYF(MY_MARK_BLOCKS_FREE));
+  free_tree(tree, /*reuse=*/true);
 }
 
 static void delete_tree_element(TREE *tree, TREE_ELEMENT *element) {
diff -Nru mysql-8.0-8.0.26/mysys/win_timers.cc mysql-8.0-8.0.27/mysys/win_timers.cc
--- mysql-8.0-8.0.26/mysys/win_timers.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/mysys/win_timers.cc	2021-09-28 11:46:34.000000000 +0000
@@ -56,8 +56,9 @@
   @remark this function is executed in timer owner thread when timer
           expires.
 */
-static void CALLBACK timer_callback_function(
-    PVOID timer_data, BOOLEAN timer_or_wait_fired MY_ATTRIBUTE((unused))) {
+static void CALLBACK timer_callback_function(PVOID timer_data,
+                                             BOOLEAN timer_or_wait_fired
+                                             [[maybe_unused]]) {
   my_timer_t *timer = (my_timer_t *)timer_data;
   assert(timer != NULL);
   timer->id.timer_state = TIMER_EXPIRED;
@@ -69,7 +70,7 @@
 
   @param arg  Unused.
 */
-static void *timer_notify_thread_func(void *arg MY_ATTRIBUTE((unused))) {
+static void *timer_notify_thread_func(void *arg [[maybe_unused]]) {
   DWORD bytes_transferred;
   ULONG_PTR compl_key;
   LPOVERLAPPED overlapped;
diff -Nru mysql-8.0-8.0.26/packaging/deb-in/CMakeLists.txt mysql-8.0-8.0.27/packaging/deb-in/CMakeLists.txt
--- mysql-8.0-8.0.26/packaging/deb-in/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/packaging/deb-in/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -108,6 +108,7 @@
 usr/lib/mysql/plugin/thread_pool.so
 usr/lib/mysql/plugin/firewall.so
 usr/lib/mysql/plugin/component_test_page_track_component.so
+usr/lib/mysql/plugin/authentication_fido.so
 usr/lib/mysql/plugin/component_keyring_encrypted_file.so
 ")
 
diff -Nru mysql-8.0-8.0.26/packaging/deb-in/deb_debug.cmake mysql-8.0-8.0.27/packaging/deb-in/deb_debug.cmake
--- mysql-8.0-8.0.26/packaging/deb-in/deb_debug.cmake	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/packaging/deb-in/deb_debug.cmake	2021-09-28 11:46:34.000000000 +0000
@@ -101,7 +101,9 @@
 usr/lib/mysql/plugin/debug/auth.so
 usr/lib/mysql/plugin/debug/auth_test_plugin.so
 usr/lib/mysql/plugin/debug/authentication_ldap_sasl_client.so
+usr/lib/mysql/plugin/debug/authentication_fido_client.so
 usr/lib/mysql/plugin/debug/authentication_kerberos_client.so
+usr/lib/mysql/plugin/debug/authentication_oci_client.so
 usr/lib/mysql/plugin/debug/component_example_component1.so
 usr/lib/mysql/plugin/debug/component_example_component2.so
 usr/lib/mysql/plugin/debug/component_example_component3.so
@@ -203,6 +205,7 @@
 usr/lib/mysql/plugin/debug/thread_pool.so
 usr/lib/mysql/plugin/debug/firewall.so
 usr/lib/mysql/plugin/debug/component_test_page_track_component.so
+usr/lib/mysql/plugin/debug/authentication_fido.so
 usr/lib/mysql/plugin/debug/component_keyring_encrypted_file.so
 ")
   ENDIF()
diff -Nru mysql-8.0-8.0.26/packaging/deb-in/mysql-packagesource-client-plugins.install.in mysql-8.0-8.0.27/packaging/deb-in/mysql-packagesource-client-plugins.install.in
--- mysql-8.0-8.0.26/packaging/deb-in/mysql-packagesource-client-plugins.install.in	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/packaging/deb-in/mysql-packagesource-client-plugins.install.in	2021-09-28 11:46:34.000000000 +0000
@@ -22,7 +22,10 @@
 
 # plugins
 usr/lib/mysql/plugin/authentication_ldap_sasl_client.so
+usr/lib/mysql/plugin/authentication_fido_client.so
 usr/lib/mysql/plugin/authentication_kerberos_client.so
+usr/lib/mysql/plugin/authentication_oci_client.so
+usr/lib/mysql/private/libfido2.*
 # legal
 usr/share/mysql-@MYSQL_BASE_VERSION@/LICENSE usr/share/doc/mysql-@DEB_PRODUCTNAME@-client-plugins/
 usr/share/mysql-@MYSQL_BASE_VERSION@/README usr/share/doc/mysql-@DEB_PRODUCTNAME@-client-plugins/
diff -Nru mysql-8.0-8.0.26/packaging/rpm-docker/mysql.spec.in mysql-8.0-8.0.27/packaging/rpm-docker/mysql.spec.in
--- mysql-8.0-8.0.26/packaging/rpm-docker/mysql.spec.in	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/packaging/rpm-docker/mysql.spec.in	2021-09-28 11:46:34.000000000 +0000
@@ -72,7 +72,7 @@
 Packager:       MySQL Release Engineering <mysql-build@oss.oracle.com>
 Vendor:         %{mysql_vendor}
 Source0:        https://cdn.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/%{src_dir}.tar.gz
-Source1:        https://downloads.sourceforge.net/boost/@BOOST_PACKAGE_NAME@.tar.bz2
+Source1:        @BOOST_DOWNLOAD_URL@
 %if 0%{?rhel} >= 8
 BuildRequires:  cmake >= 3.6.1
 BuildRequires:  libtirpc-devel
@@ -102,7 +102,7 @@
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 # For rpm => 4.9 only: https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering
-%global _privatelibs libprotobuf.*
+%global _privatelibs libprotobuf.*|libfido2.*
 %global _privateperl perl\\((GD|hostnames|lib::mtr|lib::v1|mtr_|My::)
 %global __requires_exclude ^((%{_privatelibs})|(%{_privateperl}))
 %global __provides_exclude_from ^(/usr/share/(mysql|mysql-test)/.*|%{_libdir}/mysql/plugin/.*\\.so|%{_libdir}/mysql/private/.*|%{_libdir}/mysqlrouter/.*)$
@@ -404,12 +404,15 @@
 %dir %{_libdir}/mysql/private
 %attr(755, root, root) %{_libdir}/mysql/private/libprotobuf-lite.so.3.11.4
 %attr(755, root, root) %{_libdir}/mysql/private/libprotobuf.so.3.11.4
+%attr(755, root, root) %{_libdir}/mysql/private/libfido2.*
 
 %dir %{_libdir}/mysql/plugin
 %attr(755, root, root) %{_libdir}/mysql/plugin/adt_null.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/auth_socket.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/authentication_ldap_sasl_client.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/authentication_fido_client.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/authentication_kerberos_client.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/authentication_oci_client.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/group_replication.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/component_log_sink_syseventlog.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/component_log_sink_json.so
@@ -493,6 +496,7 @@
 %attr(755, root, root) %{_libdir}/mysql/plugin/thread_pool.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/openssl_udf.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/firewall.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/authentication_fido.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/component_keyring_encrypted_file.so
 %if 0%{?aws_sdk}
 %attr(755, root, root) %{_libdir}/mysql/plugin/keyring_aws.so
@@ -507,6 +511,9 @@
 %dir %attr(750, mysql, mysql) /var/lib/mysql-keyring
 
 %changelog
+* Tue Aug 31 2021 Harin Vadodaria <harin.vadodaria@oracle.com> - 8.0.27-1
+- Added authentication_oci_client
+
 * Mon Sep 21 2020 Murthy Sidagam <venkata.sidagam@oracle.com> - 8.0.23-1
 - Added component_reference_cache.so component
 
diff -Nru mysql-8.0-8.0.26/packaging/rpm-fedora/mysql.spec.in mysql-8.0-8.0.27/packaging/rpm-fedora/mysql.spec.in
--- mysql-8.0-8.0.26/packaging/rpm-fedora/mysql.spec.in	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/packaging/rpm-fedora/mysql.spec.in	2021-09-28 11:46:34.000000000 +0000
@@ -64,7 +64,7 @@
 Release:        10@MYSQL_VERSION_EXTRA_DOT@%{?dist}
 License:        Copyright (c) 2000, @MYSQL_COPYRIGHT_YEAR@, %{mysql_vendor}. Under %{?license_type} license as shown in the Description field.
 Source0:        https://cdn.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/%{src_dir}.tar.gz
-Source1:        https://downloads.sourceforge.net/boost/@BOOST_PACKAGE_NAME@.tar.bz2
+Source1:        @BOOST_DOWNLOAD_URL@
 URL:            http://www.mysql.com/
 Packager:       MySQL Release Engineering <mysql-build@oss.oracle.com>
 Vendor:         %{mysql_vendor}
@@ -122,7 +122,7 @@
 BuildRequires: /usr/bin/pathfix.py
 %endif
 # For rpm => 4.9 only: https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering
-%global _privatelibs libprotobuf.*|libmysqlharness\.so.*|libmysqlharness_stdx\.so.*|libmysqlharness_tls\.so.*|libmysqlrouter\.so\..*|libmysqlrouter_.*\.so\..*
+%global _privatelibs libprotobuf.*|libmysqlharness\.so.*|libmysqlharness_stdx\.so.*|libmysqlharness_tls\.so.*|libmysqlrouter\.so\..*|libmysqlrouter_.*\.so\..*|libfido2.*
 %global _privateperl perl\\((GD|hostnames|lib::mtr|lib::v1|mtr_|My::)
 %global __requires_exclude ^((%{_privatelibs})|(%{_privateperl}))
 %global __provides_exclude_from ^(/usr/share/(mysql|mysql-test)/.*|%{_libdir}/mysql/plugin/.*\\.so|%{_libdir}/mysql/private/.*|%{_libdir}/mysqlrouter/.*|%{_libdir}/mysqlrouter/private/.*)$
@@ -936,7 +936,10 @@
 %defattr(-, root, root, -)
 %doc %{?license_files_server}
 %attr(755, root, root) %{_libdir}/mysql/plugin/authentication_ldap_sasl_client.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/authentication_fido_client.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/authentication_kerberos_client.so
+%attr(755, root, root) %{_libdir}/mysql/private/libfido2.*
+%attr(755, root, root) %{_libdir}/mysql/plugin/authentication_oci_client.so
 
 %files test
 %doc %{?license_files_server}
@@ -1033,7 +1036,9 @@
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_test_plugin.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/authentication_ldap_sasl_client.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/authentication_fido_client.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/authentication_kerberos_client.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/authentication_oci_client.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/component_example_component1.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/component_example_component2.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/component_example_component3.so
@@ -1180,6 +1185,9 @@
 %endif # with_router
 
 %changelog
+* Tue Aug 31 2021 Harin Vadodaria <harin.vadodaria@oracle.com> - 8.0.27-1
+- Added authentication_oci_client
+
 * Mon Sep 21 2020 Murthy Sidagam <venkata.sidagam@oracle.com> - 8.0.23-1
 - Added component_reference_cache.so component
 
diff -Nru mysql-8.0-8.0.26/packaging/rpm-oel/mysql.spec.in mysql-8.0-8.0.27/packaging/rpm-oel/mysql.spec.in
--- mysql-8.0-8.0.26/packaging/rpm-oel/mysql.spec.in	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/packaging/rpm-oel/mysql.spec.in	2021-09-28 11:46:34.000000000 +0000
@@ -119,7 +119,7 @@
 %if 0%{?compatlib}
 Source7:        %{compatsrc}
 %endif
-Source10:       https://downloads.sourceforge.net/boost/@BOOST_PACKAGE_NAME@.tar.bz2
+Source10:       @BOOST_DOWNLOAD_URL@
 Source90:       filter-provides.sh
 Source91:       filter-requires.sh
 %if 0%{?rhel} >= 8
@@ -131,10 +131,13 @@
 %endif
 %{?el6:BuildRequires:  devtoolset-8-gcc}
 %{?el6:BuildRequires:  devtoolset-8-gcc-c++}
+%{?el6:BuildRequires:  devtoolset-8-binutils}
 %{?el7:BuildRequires:  devtoolset-10-gcc}
 %{?el7:BuildRequires:  devtoolset-10-gcc-c++}
+%{?el7:BuildRequires:  devtoolset-10-binutils}
 %{?el8:BuildRequires:  gcc-toolset-10-gcc}
 %{?el8:BuildRequires:  gcc-toolset-10-gcc-c++}
+%{?el8:BuildRequires:  gcc-toolset-10-binutils}
 BuildRequires:  bison >= 2.1
 BuildRequires:  perl
 %{?el7:BuildRequires: perl(Env)}
@@ -190,7 +193,7 @@
 
 %if 0%{?rhel} > 6
 # For rpm => 4.9 only: https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering
-%global _privatelibs libprotobuf.*|libmysqlharness\.so.*|libmysqlharness_stdx\.so.*|libmysqlharness_tls\.so.*|libmysqlrouter\.so\..*|libmysqlrouter_.*\.so\..*%{?ssl_bundled:|libssl\.so\..*|libcrypto\.so\..*}
+%global _privatelibs libprotobuf.*|libmysqlharness\.so.*|libmysqlharness_stdx\.so.*|libmysqlharness_tls\.so.*|libmysqlrouter\.so\..*|libmysqlrouter_.*\.so\..*%{?ssl_bundled:|libssl\.so\..*|libcrypto\.so\..*}|libfido2.*
 %global _privateperl perl\\((GD|hostnames|lib::mtr|lib::v1|mtr_|My::)
 %global __requires_exclude ^((%{_privatelibs})|(%{_privateperl}))
 %global __provides_exclude_from ^(/usr/share/(mysql|mysql-test)/.*|%{_libdir}/mysql/plugin/.*\\.so|%{_libdir}/mysql/private/.*|%{_libdir}/mysqlrouter/.*|%{_libdir}/mysqlrouter/private/.*)$
@@ -1152,6 +1155,7 @@
 %attr(755, root, root) %{_libdir}/mysql/plugin/thread_pool.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/openssl_udf.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/firewall.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/authentication_fido.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/component_keyring_encrypted_file.so
 %attr(644, root, root) %{_datadir}/mysql-*/linux_install_firewall.sql
 %attr(644, root, root) %{_datadir}/mysql-*/firewall_profile_migration.sql
@@ -1234,6 +1238,7 @@
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/thread_pool.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/openssl_udf.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/firewall.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/authentication_fido.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/component_keyring_encrypted_file.so
 %if 0%{?aws_sdk}
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/keyring_aws.so
@@ -1391,7 +1396,11 @@
 %defattr(-, root, root, -)
 %doc %{?license_files_server}
 %attr(755, root, root) %{_libdir}/mysql/plugin/authentication_ldap_sasl_client.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/authentication_fido_client.so
+%attr(755, root, root) %{_libdir}/mysql/private/libfido2.so.1
+%attr(755, root, root) %{_libdir}/mysql/private/libfido2.so.1.5.0
 %attr(755, root, root) %{_libdir}/mysql/plugin/authentication_kerberos_client.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/authentication_oci_client.so
 
 %if 0%{?compatlib}
 %files libs-compat
@@ -1506,7 +1515,9 @@
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_test_plugin.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/authentication_ldap_sasl_client.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/authentication_fido_client.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/authentication_kerberos_client.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/authentication_oci_client.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/component_example_component1.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/component_example_component2.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/component_example_component3.so
@@ -1709,6 +1720,9 @@
 %endif # with_router
 
 %changelog
+* Tue Aug 31 2021 Harin Vadodaria <harin.vadodaria@oracle.com> - 8.0.27-1
+- Added authentication_oci_client
+
 * Mon Sep 21 2020 Murthy Sidagam <venkata.sidagam@oracle.com> - 8.0.23-1
 - Added component_reference_cache.so component
 
diff -Nru mysql-8.0-8.0.26/packaging/rpm-sles/mysql.spec.in mysql-8.0-8.0.27/packaging/rpm-sles/mysql.spec.in
--- mysql-8.0-8.0.26/packaging/rpm-sles/mysql.spec.in	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/packaging/rpm-sles/mysql.spec.in	2021-09-28 11:46:34.000000000 +0000
@@ -107,7 +107,7 @@
 URL:            http://www.mysql.com/
 Packager:       MySQL Release Engineering <mysql-build@oss.oracle.com>
 Vendor:         %{mysql_vendor}
-Source10:       https://downloads.sourceforge.net/boost/@BOOST_PACKAGE_NAME@.tar.bz2
+Source10:       @BOOST_DOWNLOAD_URL@
 BuildRequires:  cmake >= 2.8.2
 BuildRequires:  bison >= 2.1
 BuildRequires:  perl
@@ -148,7 +148,7 @@
 BuildRequires:  openldap2-devel
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-%global _privatelibs libprotobuf.*|libmysqlharness\.so.*|libmysqlharness_stdx\.so.*|libmysqlharness_tls\.so.*|libmysqlrouter\.so\..*|libmysqlrouter_.*\.so\..*
+%global _privatelibs libprotobuf.*|libmysqlharness\.so.*|libmysqlharness_stdx\.so.*|libmysqlharness_tls\.so.*|libmysqlrouter\.so\..*|libmysqlrouter_.*\.so\..*|libfido2.*
 %global _privateperl perl\\((GD|hostnames|lib::mtr|lib::v1|mtr_|My::)
 %global __requires_exclude ^((%{_privatelibs})|(%{_privateperl}))
 %global __provides_exclude_from ^(/usr/share/(mysql|mysql-test)/.*|%{_libdir}/mysql/plugin/.*\\.so|%{_libdir}/mysql/private/.*|%{_libdir}/mysqlrouter/%{?sles12:libprotobuf-lite}.*|%{_libdir}/mysqlrouter/private/.*)$
@@ -912,6 +912,7 @@
 %attr(755, root, root) %{_libdir}/mysql/plugin/thread_pool.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/openssl_udf.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/firewall.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/authentication_fido.so
 %attr(644, root, root) %{_datadir}/mysql-*/linux_install_firewall.sql
 %attr(644, root, root) %{_datadir}/mysql-*/firewall_profile_migration.sql
 %attr(755, root, root) %{_libdir}/mysql/plugin/component_keyring_encrypted_file.so
@@ -928,6 +929,7 @@
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/thread_pool.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/openssl_udf.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/firewall.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/authentication_fido.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/component_keyring_encrypted_file.so
 %if 0%{?aws_sdk}
 %attr(755, root, root) %{_libdir}/mysql/plugin/keyring_aws.so
@@ -1091,7 +1093,11 @@
 %defattr(-, root, root, -)
 %doc %{?license_files_server}
 %attr(755, root, root) %{_libdir}/mysql/plugin/authentication_ldap_sasl_client.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/authentication_fido_client.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/authentication_kerberos_client.so
+%attr(755, root, root) %{_libdir}/mysql/private/libfido2.so.1
+%attr(755, root, root) %{_libdir}/mysql/private/libfido2.so.1.5.0
+%attr(755, root, root) %{_libdir}/mysql/plugin/authentication_oci_client.so
 
 %if 0%{?compatlib}
 %files libs-compat
@@ -1204,7 +1210,9 @@
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_test_plugin.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/authentication_ldap_sasl_client.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/authentication_fido_client.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/authentication_kerberos_client.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/authentication_oci_client.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/component_example_component1.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/component_example_component2.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/component_example_component3.so
@@ -1367,6 +1375,9 @@
 %endif # with_router
 
 %changelog
+* Tue Aug 31 2021 Harin Vadodaria <harin.vadodaria@oracle.com> - 8.0.27-1
+- Added authentication_oci_client
+
 * Mon Sep 21 2020 Murthy Sidagam <venkata.sidagam@oracle.com> - 8.0.23-1
 - Added component_reference_cache.so component
 
diff -Nru mysql-8.0-8.0.26/plugin/audit_null/audit_null.cc mysql-8.0-8.0.27/plugin/audit_null/audit_null.cc
--- mysql-8.0-8.0.26/plugin/audit_null/audit_null.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/audit_null/audit_null.cc	2021-09-28 11:46:34.000000000 +0000
@@ -210,7 +210,7 @@
     1                    failure (cannot happen)
 */
 
-static int audit_null_plugin_init(void *arg MY_ATTRIBUTE((unused))) {
+static int audit_null_plugin_init(void *arg [[maybe_unused]]) {
   SHOW_VAR *var;
 
   for (var = simple_status; var->value != nullptr; var++) {
@@ -239,7 +239,7 @@
 
 */
 
-static int audit_null_plugin_deinit(void *arg MY_ATTRIBUTE((unused))) {
+static int audit_null_plugin_deinit(void *arg [[maybe_unused]]) {
   if (g_plugin_installed == true) {
     my_free((void *)(g_record_buffer));
 
diff -Nru mysql-8.0-8.0.26/plugin/auth/auth_socket.cc mysql-8.0-8.0.27/plugin/auth/auth_socket.cc
--- mysql-8.0-8.0.26/plugin/auth/auth_socket.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/auth/auth_socket.cc	2021-09-28 11:46:34.000000000 +0000
@@ -80,23 +80,22 @@
     return CR_ERROR;
 }
 
-static int generate_auth_string_hash(
-    char *outbuf MY_ATTRIBUTE((unused)), unsigned int *buflen,
-    const char *inbuf MY_ATTRIBUTE((unused)),
-    unsigned int inbuflen MY_ATTRIBUTE((unused))) {
+static int generate_auth_string_hash(char *outbuf [[maybe_unused]],
+                                     unsigned int *buflen,
+                                     const char *inbuf [[maybe_unused]],
+                                     unsigned int inbuflen [[maybe_unused]]) {
   *buflen = 0;
   return 0;
 }
 
-static int validate_auth_string_hash(char *const inbuf MY_ATTRIBUTE((unused)),
-                                     unsigned int buflen
-                                         MY_ATTRIBUTE((unused))) {
+static int validate_auth_string_hash(char *const inbuf [[maybe_unused]],
+                                     unsigned int buflen [[maybe_unused]]) {
   return 0;
 }
 
-static int set_salt(const char *password MY_ATTRIBUTE((unused)),
-                    unsigned int password_len MY_ATTRIBUTE((unused)),
-                    unsigned char *salt MY_ATTRIBUTE((unused)),
+static int set_salt(const char *password [[maybe_unused]],
+                    unsigned int password_len [[maybe_unused]],
+                    unsigned char *salt [[maybe_unused]],
                     unsigned char *salt_len) {
   *salt_len = 0;
   return 0;
diff -Nru mysql-8.0-8.0.26/plugin/auth/dialog.cc mysql-8.0-8.0.27/plugin/auth/dialog.cc
--- mysql-8.0-8.0.26/plugin/auth/dialog.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/auth/dialog.cc	2021-09-28 11:46:34.000000000 +0000
@@ -121,15 +121,14 @@
   return 0;
 }
 
-static int validate_auth_string_hash(char *const inbuf MY_ATTRIBUTE((unused)),
-                                     unsigned int buflen
-                                         MY_ATTRIBUTE((unused))) {
+static int validate_auth_string_hash(char *const inbuf [[maybe_unused]],
+                                     unsigned int buflen [[maybe_unused]]) {
   return 0;
 }
 
-static int set_salt(const char *password MY_ATTRIBUTE((unused)),
-                    unsigned int password_len MY_ATTRIBUTE((unused)),
-                    unsigned char *salt MY_ATTRIBUTE((unused)),
+static int set_salt(const char *password [[maybe_unused]],
+                    unsigned int password_len [[maybe_unused]],
+                    unsigned char *salt [[maybe_unused]],
                     unsigned char *salt_len) {
   *salt_len = 0;
   return 0;
@@ -250,8 +249,8 @@
 
 static mysql_authentication_dialog_ask_t ask;
 
-static char *builtin_ask(MYSQL *mysql MY_ATTRIBUTE((unused)),
-                         int type MY_ATTRIBUTE((unused)), const char *prompt,
+static char *builtin_ask(MYSQL *mysql [[maybe_unused]],
+                         int type [[maybe_unused]], const char *prompt,
                          char *buf, int buf_len) {
   char *ptr;
   fputs(prompt, stdout);
@@ -339,10 +338,10 @@
   or fall back to the default implementation.
 */
 
-static int init_dialog(char *unused1 MY_ATTRIBUTE((unused)),
-                       size_t unused2 MY_ATTRIBUTE((unused)),
-                       int unused3 MY_ATTRIBUTE((unused)),
-                       va_list unused4 MY_ATTRIBUTE((unused))) {
+static int init_dialog(char *unused1 [[maybe_unused]],
+                       size_t unused2 [[maybe_unused]],
+                       int unused3 [[maybe_unused]],
+                       va_list unused4 [[maybe_unused]]) {
   void *sym = dlsym(RTLD_DEFAULT, "mysql_authentication_dialog_ask");
   ask = sym ? (mysql_authentication_dialog_ask_t)sym : builtin_ask;
   return 0;
@@ -350,5 +349,5 @@
 
 mysql_declare_client_plugin(AUTHENTICATION) "dialog",
     MYSQL_CLIENT_PLUGIN_AUTHOR_ORACLE, "Dialog Client Authentication Plugin",
-    {0, 1, 0}, "GPL", nullptr, init_dialog, nullptr, nullptr, perform_dialog,
-    nullptr mysql_end_client_plugin;
+    {0, 1, 0}, "GPL", nullptr, init_dialog, nullptr, nullptr,
+    nullptr, perform_dialog, nullptr, mysql_end_client_plugin;
diff -Nru mysql-8.0-8.0.26/plugin/auth/mysql_no_login.cc mysql-8.0-8.0.27/plugin/auth/mysql_no_login.cc
--- mysql-8.0-8.0.26/plugin/auth/mysql_no_login.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/auth/mysql_no_login.cc	2021-09-28 11:46:34.000000000 +0000
@@ -38,28 +38,27 @@
 
 #include "my_compiler.h"
 
-static int mysql_no_login(MYSQL_PLUGIN_VIO *vio MY_ATTRIBUTE((unused)),
-                          MYSQL_SERVER_AUTH_INFO *info MY_ATTRIBUTE((unused))) {
+static int mysql_no_login(MYSQL_PLUGIN_VIO *vio [[maybe_unused]],
+                          MYSQL_SERVER_AUTH_INFO *info [[maybe_unused]]) {
   return CR_ERROR;
 }
 
-static int generate_auth_string_hash(
-    char *outbuf MY_ATTRIBUTE((unused)), unsigned int *buflen,
-    const char *inbuf MY_ATTRIBUTE((unused)),
-    unsigned int inbuflen MY_ATTRIBUTE((unused))) {
+static int generate_auth_string_hash(char *outbuf [[maybe_unused]],
+                                     unsigned int *buflen,
+                                     const char *inbuf [[maybe_unused]],
+                                     unsigned int inbuflen [[maybe_unused]]) {
   *buflen = 0;
   return 0;
 }
 
-static int validate_auth_string_hash(char *const inbuf MY_ATTRIBUTE((unused)),
-                                     unsigned int buflen
-                                         MY_ATTRIBUTE((unused))) {
+static int validate_auth_string_hash(char *const inbuf [[maybe_unused]],
+                                     unsigned int buflen [[maybe_unused]]) {
   return 0;
 }
 
-static int set_salt(const char *password MY_ATTRIBUTE((unused)),
-                    unsigned int password_len MY_ATTRIBUTE((unused)),
-                    unsigned char *salt MY_ATTRIBUTE((unused)),
+static int set_salt(const char *password [[maybe_unused]],
+                    unsigned int password_len [[maybe_unused]],
+                    unsigned char *salt [[maybe_unused]],
                     unsigned char *salt_len) {
   *salt_len = 0;
   return 0;
diff -Nru mysql-8.0-8.0.26/plugin/auth/qa_auth_client.cc mysql-8.0-8.0.27/plugin/auth/qa_auth_client.cc
--- mysql-8.0-8.0.26/plugin/auth/qa_auth_client.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/auth/qa_auth_client.cc	2021-09-28 11:46:34.000000000 +0000
@@ -119,5 +119,5 @@
 
 mysql_declare_client_plugin(AUTHENTICATION) "qa_auth_client",
     MYSQL_CLIENT_PLUGIN_AUTHOR_ORACLE, "Dialog Client Authentication Plugin",
-    {0, 1, 0}, "GPL", nullptr, nullptr, nullptr, nullptr, test_plugin_client,
-    nullptr mysql_end_client_plugin;
+    {0, 1, 0}, "GPL", nullptr, nullptr, nullptr, nullptr,
+    nullptr, test_plugin_client, nullptr, mysql_end_client_plugin;
diff -Nru mysql-8.0-8.0.26/plugin/auth/qa_auth_interface.cc mysql-8.0-8.0.27/plugin/auth/qa_auth_interface.cc
--- mysql-8.0-8.0.26/plugin/auth/qa_auth_interface.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/auth/qa_auth_interface.cc	2021-09-28 11:46:34.000000000 +0000
@@ -153,15 +153,14 @@
   return 0;
 }
 
-static int validate_auth_string_hash(char *const inbuf MY_ATTRIBUTE((unused)),
-                                     unsigned int buflen
-                                         MY_ATTRIBUTE((unused))) {
+static int validate_auth_string_hash(char *const inbuf [[maybe_unused]],
+                                     unsigned int buflen [[maybe_unused]]) {
   return 0;
 }
 
-static int set_salt(const char *password MY_ATTRIBUTE((unused)),
-                    unsigned int password_len MY_ATTRIBUTE((unused)),
-                    unsigned char *salt MY_ATTRIBUTE((unused)),
+static int set_salt(const char *password [[maybe_unused]],
+                    unsigned int password_len [[maybe_unused]],
+                    unsigned char *salt [[maybe_unused]],
                     unsigned char *salt_len) {
   *salt_len = 0;
   return 0;
@@ -278,5 +277,5 @@
 
 mysql_declare_client_plugin(AUTHENTICATION) "qa_auth_interface",
     MYSQL_CLIENT_PLUGIN_AUTHOR_ORACLE, "Dialog Client Authentication Plugin",
-    {0, 1, 0}, "GPL", nullptr, nullptr, nullptr, nullptr, test_plugin_client,
-    nullptr mysql_end_client_plugin;
+    {0, 1, 0}, "GPL", nullptr, nullptr, nullptr, nullptr,
+    nullptr, test_plugin_client, nullptr, mysql_end_client_plugin;
diff -Nru mysql-8.0-8.0.26/plugin/auth/qa_auth_server.cc mysql-8.0-8.0.27/plugin/auth/qa_auth_server.cc
--- mysql-8.0-8.0.26/plugin/auth/qa_auth_server.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/auth/qa_auth_server.cc	2021-09-28 11:46:34.000000000 +0000
@@ -77,15 +77,14 @@
   return 0;
 }
 
-static int validate_auth_string_hash(char *const inbuf MY_ATTRIBUTE((unused)),
-                                     unsigned int buflen
-                                         MY_ATTRIBUTE((unused))) {
+static int validate_auth_string_hash(char *const inbuf [[maybe_unused]],
+                                     unsigned int buflen [[maybe_unused]]) {
   return 0;
 }
 
-static int set_salt(const char *password MY_ATTRIBUTE((unused)),
-                    unsigned int password_len MY_ATTRIBUTE((unused)),
-                    unsigned char *salt MY_ATTRIBUTE((unused)),
+static int set_salt(const char *password [[maybe_unused]],
+                    unsigned int password_len [[maybe_unused]],
+                    unsigned char *salt [[maybe_unused]],
                     unsigned char *salt_len) {
   *salt_len = 0;
   return 0;
diff -Nru mysql-8.0-8.0.26/plugin/auth/test_plugin.cc mysql-8.0-8.0.27/plugin/auth/test_plugin.cc
--- mysql-8.0-8.0.26/plugin/auth/test_plugin.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/auth/test_plugin.cc	2021-09-28 11:46:34.000000000 +0000
@@ -130,15 +130,14 @@
   return 0;
 }
 
-static int validate_auth_string_hash(char *const inbuf MY_ATTRIBUTE((unused)),
-                                     unsigned int buflen
-                                         MY_ATTRIBUTE((unused))) {
+static int validate_auth_string_hash(char *const inbuf [[maybe_unused]],
+                                     unsigned int buflen [[maybe_unused]]) {
   return 0;
 }
 
-static int set_salt(const char *password MY_ATTRIBUTE((unused)),
-                    unsigned int password_len MY_ATTRIBUTE((unused)),
-                    unsigned char *salt MY_ATTRIBUTE((unused)),
+static int set_salt(const char *password [[maybe_unused]],
+                    unsigned int password_len [[maybe_unused]],
+                    unsigned char *salt [[maybe_unused]],
                     unsigned char *salt_len) {
   *salt_len = 0;
   return 0;
@@ -301,5 +300,5 @@
 
 mysql_declare_client_plugin(AUTHENTICATION) "auth_test_plugin",
     MYSQL_CLIENT_PLUGIN_AUTHOR_ORACLE, "Dialog Client Authentication Plugin",
-    {0, 1, 0}, "GPL", nullptr, nullptr, nullptr, nullptr, test_plugin_client,
-    nullptr mysql_end_client_plugin;
+    {0, 1, 0}, "GPL", nullptr, nullptr, nullptr, nullptr,
+    nullptr, test_plugin_client, nullptr, mysql_end_client_plugin;
diff -Nru mysql-8.0-8.0.26/plugin/clone/include/clone.h mysql-8.0-8.0.27/plugin/clone/include/clone.h
--- mysql-8.0-8.0.26/plugin/clone/include/clone.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/clone/include/clone.h	2021-09-28 11:46:34.000000000 +0000
@@ -69,6 +69,9 @@
 file to network or destination file. */
 extern uint clone_buffer_size;
 
+/** Clone system variable: If clone should block concurrent DDL */
+extern bool clone_block_ddl;
+
 /** Clone system variable: timeout for DDL lock */
 extern uint clone_ddl_timeout;
 
@@ -123,6 +126,10 @@
 /**  Clone protocol latest version */
 const uint32_t CLONE_PROTOCOL_VERSION = CLONE_PROTOCOL_VERSION_V3;
 
+/** Flag to indicate no backup lock for DDL. This is multiplexed with
+clone_ddl_timeout and sent to donor server. */
+const uint32_t NO_BACKUP_LOCK_FLAG = 1ULL << 31;
+
 /** Clone protocol commands. Please bump the protocol version before adding
 new command. */
 typedef enum Type_Cmmand_RPC : uchar {
diff -Nru mysql-8.0-8.0.26/plugin/clone/include/clone_server.h mysql-8.0-8.0.27/plugin/clone/include/clone_server.h
--- mysql-8.0-8.0.26/plugin/clone/include/clone_server.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/clone/include/clone_server.h	2021-09-28 11:46:34.000000000 +0000
@@ -127,6 +127,16 @@
   }
 
  private:
+  /** Extract client ddl timeout and backup lock flag.
+  @param[in]	client_timeout	timeout value received from client */
+  void set_client_timeout(uint32_t client_timeout) {
+    m_backup_lock = ((client_timeout & NO_BACKUP_LOCK_FLAG) == 0);
+    m_client_ddl_timeout = client_timeout & ~NO_BACKUP_LOCK_FLAG;
+  }
+
+  /** @return true if clone needs to block concurrent DDL. */
+  bool block_ddl() const { return (m_is_master && m_backup_lock); }
+
   /** Check if network error
   @param[in]	err	error code
   @return true if network error */
@@ -228,6 +238,9 @@
 
   /** DDL timeout from client */
   uint32_t m_client_ddl_timeout;
+
+  /** If backup lock should be acquired */
+  bool m_backup_lock;
 };
 
 /** Clone server interface to handle callback from Storage Engine */
diff -Nru mysql-8.0-8.0.26/plugin/clone/src/clone_client.cc mysql-8.0-8.0.27/plugin/clone/src/clone_client.cc
--- mysql-8.0-8.0.26/plugin/clone/src/clone_client.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/clone/src/clone_client.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1170,7 +1170,7 @@
       try {
         int timeout_minutes = std::stoi(key_val.second);
         s_reconnect_timeout = Time_Min(timeout_minutes);
-      } catch (const std::exception &e) {
+      } catch (...) {
         assert(false);
       }
     }
@@ -1279,7 +1279,7 @@
       break;
 
     case COM_MAX:
-      /* Fall through */
+      [[fallthrough]];
 
     default:
       assert(false);
@@ -1355,8 +1355,14 @@
   int4store(buf_ptr, m_share->m_protocol_version);
   buf_ptr += 4;
 
-  /* Store DDL timeout */
-  int4store(buf_ptr, clone_ddl_timeout);
+  /* Store DDL timeout value. Default is no lock. */
+  uint32_t timeout_value = clone_ddl_timeout;
+
+  if (!clone_block_ddl) {
+    timeout_value |= NO_BACKUP_LOCK_FLAG;
+  }
+
+  int4store(buf_ptr, timeout_value);
   buf_ptr += 4;
 
   /* Store SE information and Locators */
@@ -1382,9 +1388,11 @@
   uint32_t timeout_sec = 0;
 
   /* Need to wait a little more than DDL lock timeout during INIT
-  to avoid network timeout */
+  to avoid network timeout. Other than DDL lock, we currently would
+  need to load the tablespaces [clone_init_tablespaces] and check
+  through all tables for compression in donor[clone_init_compression]. */
   if (com == COM_INIT) {
-    timeout_sec = clone_ddl_timeout + 5;
+    timeout_sec = clone_ddl_timeout + 300;
   }
 
   while (!last_packet) {
@@ -1532,6 +1540,7 @@
 
       /* COM_RES_DATA must follow COM_RES_DATA_DESC and is handled
       in apply_file_cbk(). Fall through to return error. */
+      [[fallthrough]];
     default:
       assert(false);
       err = ER_CLONE_PROTOCOL;
@@ -1725,14 +1734,13 @@
   return (err);
 }
 
-int Client_Cbk::file_cbk(Ha_clone_file from_file MY_ATTRIBUTE((unused)),
-                         uint len MY_ATTRIBUTE((unused))) {
+int Client_Cbk::file_cbk(Ha_clone_file from_file [[maybe_unused]],
+                         uint len [[maybe_unused]]) {
   my_error(ER_NOT_SUPPORTED_YET, MYF(0), "Remote Clone Client");
   return (ER_NOT_SUPPORTED_YET);
 }
 
-int Client_Cbk::buffer_cbk(uchar *from_buffer MY_ATTRIBUTE((unused)),
-                           uint buf_len) {
+int Client_Cbk::buffer_cbk(uchar *from_buffer [[maybe_unused]], uint buf_len) {
   auto client = get_clone_client();
 
   uint64_t data_estimate = 0;
diff -Nru mysql-8.0-8.0.26/plugin/clone/src/clone_hton.cc mysql-8.0-8.0.27/plugin/clone/src/clone_hton.cc
--- mysql-8.0-8.0.26/plugin/clone/src/clone_hton.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/clone/src/clone_hton.cc	2021-09-28 11:46:34.000000000 +0000
@@ -226,7 +226,7 @@
     clone_args.m_task_vec = &task_vec;
     clone_args.m_cur_index = 0;
     clone_args.m_err = 0;
-    clone_args.m_type = HA_CLONE_BLOCKING;
+    clone_args.m_type = HA_CLONE_HYBRID;
     clone_args.m_mode = clone_mode;
     clone_args.m_data_dir = clone_data_dir;
 
diff -Nru mysql-8.0-8.0.26/plugin/clone/src/clone_local.cc mysql-8.0-8.0.27/plugin/clone/src/clone_local.cc
--- mysql-8.0-8.0.26/plugin/clone/src/clone_local.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/clone/src/clone_local.cc	2021-09-28 11:46:34.000000000 +0000
@@ -87,7 +87,7 @@
   auto thd = m_clone_client.get_thd();
   auto dir_name = m_clone_client.get_data_dir();
   auto is_master = m_clone_client.is_master();
-  auto acquire_backup_lock = (is_master && clone_ddl_timeout != 0);
+  auto acquire_backup_lock = (is_master && clone_block_ddl);
   auto num_workers = m_clone_client.get_max_concurrency() - 1;
 
   auto &client_vector = m_clone_client.get_storage_vector();
diff -Nru mysql-8.0-8.0.26/plugin/clone/src/clone_os.cc mysql-8.0-8.0.27/plugin/clone/src/clone_os.cc
--- mysql-8.0-8.0.26/plugin/clone/src/clone_os.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/clone/src/clone_os.cc	2021-09-28 11:46:34.000000000 +0000
@@ -298,36 +298,36 @@
   return (0);
 }
 
-int clone_os_send_from_buf(uchar *from_buffer MY_ATTRIBUTE((unused)),
-                           uint length MY_ATTRIBUTE((unused)),
-                           my_socket socket MY_ATTRIBUTE((unused)),
-                           const char *src_name MY_ATTRIBUTE((unused))) {
+int clone_os_send_from_buf(uchar *from_buffer [[maybe_unused]],
+                           uint length [[maybe_unused]],
+                           my_socket socket [[maybe_unused]],
+                           const char *src_name [[maybe_unused]]) {
   my_error(ER_NOT_SUPPORTED_YET, MYF(0), "Remote Clone Send");
   return (ER_NOT_SUPPORTED_YET);
 }
 
-int clone_os_send_from_file(Ha_clone_file from_file MY_ATTRIBUTE((unused)),
-                            uint length MY_ATTRIBUTE((unused)),
-                            my_socket socket MY_ATTRIBUTE((unused)),
-                            const char *src_name MY_ATTRIBUTE((unused))) {
+int clone_os_send_from_file(Ha_clone_file from_file [[maybe_unused]],
+                            uint length [[maybe_unused]],
+                            my_socket socket [[maybe_unused]],
+                            const char *src_name [[maybe_unused]]) {
   CLONE_OS_CHECK_FILE(from_file);
 
   my_error(ER_NOT_SUPPORTED_YET, MYF(0), "Remote Clone Send");
   return (ER_NOT_SUPPORTED_YET);
 }
 
-int clone_os_recv_to_buf(uchar *to_buffer MY_ATTRIBUTE((unused)),
-                         uint length MY_ATTRIBUTE((unused)),
-                         my_socket socket MY_ATTRIBUTE((unused)),
-                         const char *dest_name MY_ATTRIBUTE((unused))) {
+int clone_os_recv_to_buf(uchar *to_buffer [[maybe_unused]],
+                         uint length [[maybe_unused]],
+                         my_socket socket [[maybe_unused]],
+                         const char *dest_name [[maybe_unused]]) {
   my_error(ER_NOT_SUPPORTED_YET, MYF(0), "Remote Clone Receive");
   return (ER_NOT_SUPPORTED_YET);
 }
 
-int clone_os_recv_to_file(Ha_clone_file to_file MY_ATTRIBUTE((unused)),
-                          uint length MY_ATTRIBUTE((unused)),
-                          my_socket socket MY_ATTRIBUTE((unused)),
-                          const char *dest_name MY_ATTRIBUTE((unused))) {
+int clone_os_recv_to_file(Ha_clone_file to_file [[maybe_unused]],
+                          uint length [[maybe_unused]],
+                          my_socket socket [[maybe_unused]],
+                          const char *dest_name [[maybe_unused]]) {
   CLONE_OS_CHECK_FILE(to_file);
 
   my_error(ER_NOT_SUPPORTED_YET, MYF(0), "Remote Clone Receive");
diff -Nru mysql-8.0-8.0.26/plugin/clone/src/clone_plugin.cc mysql-8.0-8.0.27/plugin/clone/src/clone_plugin.cc
--- mysql-8.0-8.0.26/plugin/clone/src/clone_plugin.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/clone/src/clone_plugin.cc	2021-09-28 11:46:34.000000000 +0000
@@ -46,6 +46,9 @@
 /** Clone system variable: buffer size for data transfer */
 uint clone_buffer_size;
 
+/** Clone system variable: If clone should block concurrent DDL */
+bool clone_block_ddl;
+
 /** Clone system variable: timeout for DDL lock */
 uint clone_ddl_timeout;
 
@@ -105,8 +108,9 @@
 
 /** Clone thread key for performance schema */
 static PSI_thread_info clone_threads[] = {
-    {&clone_local_thd_key, "local-task", 0, 0, PSI_DOCUMENT_ME},
-    {&clone_client_thd_key, "client-task", 0, 0, PSI_DOCUMENT_ME}};
+    {&clone_local_thd_key, "local-task", "clone_local", 0, 0, PSI_DOCUMENT_ME},
+    {&clone_client_thd_key, "client-task", "clone_client", 0, 0,
+     PSI_DOCUMENT_ME}};
 
 static PSI_statement_info clone_stmts[] = {{0, "local", 0, PSI_DOCUMENT_ME},
                                            {0, "client", 0, PSI_DOCUMENT_ME},
@@ -288,8 +292,7 @@
 @param[out]	save	possibly updated variable value
 @param[in]	value	current variable value
 @return error code */
-static int check_donor_addr_format(MYSQL_THD thd,
-                                   SYS_VAR *var MY_ATTRIBUTE((unused)),
+static int check_donor_addr_format(MYSQL_THD thd, SYS_VAR *var [[maybe_unused]],
                                    void *save, struct st_mysql_value *value) {
   char temp_buffer[STRING_BUFFER_USUAL_SIZE];
   auto buf_len = static_cast<int>(sizeof(temp_buffer));
@@ -325,10 +328,17 @@
   return (0);
 }
 
+/** Check if it is safe to uninstall plugin.
+@param[in]	plugin_info	server plugin handle
+@return error code */
+static int plugin_clone_check(MYSQL_PLUGIN plugin_info) {
+  return clone_handle_check_drop(plugin_info);
+}
+
 /** Initialize clone plugin
 @param[in]	plugin_info	server plugin handle
 @return error code */
-static int plugin_clone_init(MYSQL_PLUGIN plugin_info MY_ATTRIBUTE((unused))) {
+static int plugin_clone_init(MYSQL_PLUGIN plugin_info [[maybe_unused]]) {
   /* Acquire registry and log service handles. */
   if (init_logging_service_for_plugin(&mysql_service_registry, &log_bi,
                                       &log_bs)) {
@@ -397,8 +407,7 @@
 /** Uninitialize clone plugin
 @param[in]	plugin_info	server plugin handle
 @return error code */
-static int plugin_clone_deinit(
-    MYSQL_PLUGIN plugin_info MY_ATTRIBUTE((unused))) {
+static int plugin_clone_deinit(MYSQL_PLUGIN plugin_info [[maybe_unused]]) {
   /* If service registry is uninitialized, return. */
   if (mysql_service_registry == nullptr) {
     return (0);
@@ -509,13 +518,19 @@
                          CLONE_MIN_BLOCK * 256,        /* Maximum = 256M */
                          CLONE_MIN_BLOCK);             /* Block   =   1M */
 
-/** Time in seconds to wait for DDL lock */
+/** If clone should block concurrent DDL */
+static MYSQL_SYSVAR_BOOL(block_ddl, clone_block_ddl, PLUGIN_VAR_NOCMDARG,
+                         "If clone should block concurrent DDL", nullptr,
+                         nullptr, false); /* Allow concurrent ddl by default */
+
+/** Time in seconds to wait for DDL lock. Relevant for donor only when
+clone_block_ddl is set to true. */
 static MYSQL_SYSVAR_UINT(ddl_timeout, clone_ddl_timeout, PLUGIN_VAR_RQCMDARG,
                          "Time in seconds to wait for DDL lock", nullptr,
-                         nullptr, 60 * 5,   /* Default =   5 min */
-                         0,                 /* Minimum =   0 skip lock */
-                         60 * 60 * 24 * 30, /* Maximum =   1 month */
-                         1);                /* Step    =   1 sec */
+                         nullptr, 60 * 5,   /* Default =  5 min */
+                         0,                 /* Minimum =  0 no wait */
+                         60 * 60 * 24 * 30, /* Maximum =  1 month */
+                         1);                /* Step    =  1 sec */
 
 /** If concurrency is automatically tuned */
 static MYSQL_SYSVAR_BOOL(autotune_concurrency, clone_autotune_concurrency,
@@ -599,6 +614,7 @@
 /** Clone system variables */
 static SYS_VAR *clone_system_variables[] = {
     MYSQL_SYSVAR(buffer_size),
+    MYSQL_SYSVAR(block_ddl),
     MYSQL_SYSVAR(ddl_timeout),
     MYSQL_SYSVAR(max_concurrency),
     MYSQL_SYSVAR(max_network_bandwidth),
@@ -624,7 +640,7 @@
     PLUGIN_LICENSE_GPL,
 
     plugin_clone_init,   /* Plugin Init */
-    nullptr,             /* Plugin check uninstall */
+    plugin_clone_check,  /* Plugin check uninstall */
     plugin_clone_deinit, /* Plugin Deinit */
 
     CLONE_PLUGIN_VERSION,   /* Plugin Version */
diff -Nru mysql-8.0-8.0.26/plugin/clone/src/clone_server.cc mysql-8.0-8.0.27/plugin/clone/src/clone_server.cc
--- mysql-8.0-8.0.26/plugin/clone/src/clone_server.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/clone/src/clone_server.cc	2021-09-28 11:46:34.000000000 +0000
@@ -41,7 +41,8 @@
       m_pfs_initialized(false),
       m_acquired_backup_lock(false),
       m_protocol_version(CLONE_PROTOCOL_VERSION),
-      m_client_ddl_timeout() {
+      m_client_ddl_timeout(),
+      m_backup_lock(true) {
   m_ext_link.set_socket(socket);
   m_storage_vec.reserve(MAX_CLONE_STORAGE_ENGINE);
 
@@ -150,7 +151,7 @@
         thd, PSI_NOT_INSTRUMENTED, clone_stmt_server_key);
 
     /* Acquire backup lock */
-    if (m_client_ddl_timeout != 0) {
+    if (block_ddl()) {
       auto failed = mysql_service_mysql_backup_lock->acquire(
           thd, BACKUP_LOCK_SERVICE_DEFAULT, m_client_ddl_timeout);
 
@@ -163,13 +164,20 @@
   }
   m_pfs_initialized = true;
 
+  /* Work around to use client DDL timeout while waiting for backup
+  lock in clone_init_tablespaces if required. */
+  auto saved_donor_timeout = clone_ddl_timeout;
+  clone_ddl_timeout = m_client_ddl_timeout;
+
   /* Get server locators */
   err = hton_clone_begin(get_thd(), get_storage_vector(), m_tasks,
                          HA_CLONE_HYBRID, mode);
   if (err != 0) {
+    clone_ddl_timeout = saved_donor_timeout;
     return (err);
   }
   m_storage_initialized = true;
+  clone_ddl_timeout = saved_donor_timeout;
 
   if (m_is_master && mode == HA_CLONE_MODE_START) {
     /* Validate local configurations. */
@@ -267,7 +275,7 @@
       break;
 
     case COM_MAX:
-      /* Fall through */
+      [[fallthrough]];
     default:
       /* purecov: begin deadcode */
       err = ER_CLONE_PROTOCOL;
@@ -347,9 +355,13 @@
   init_len -= 4;
 
   /* Extract DDL timeout */
-  m_client_ddl_timeout = uint4korr(init_buf);
-  init_buf += 4;
-  init_len -= 4;
+  {
+    uint32_t client_ddl_timeout = uint4korr(init_buf);
+    init_buf += 4;
+    init_len -= 4;
+
+    set_client_timeout(client_ddl_timeout);
+  }
 
   /* Initialize locators */
   while (init_len > 0) {
@@ -711,14 +723,14 @@
 }
 
 /* purecov: begin deadcode */
-int Server_Cbk::apply_file_cbk(Ha_clone_file to_file MY_ATTRIBUTE((unused))) {
+int Server_Cbk::apply_file_cbk(Ha_clone_file to_file [[maybe_unused]]) {
   assert(false);
   my_error(ER_INTERNAL_ERROR, MYF(0), "Apply callback from Clone Server");
   return (ER_INTERNAL_ERROR);
 }
 
-int Server_Cbk::apply_buffer_cbk(uchar *&to_buffer MY_ATTRIBUTE((unused)),
-                                 uint &len MY_ATTRIBUTE((unused))) {
+int Server_Cbk::apply_buffer_cbk(uchar *&to_buffer [[maybe_unused]],
+                                 uint &len [[maybe_unused]]) {
   assert(false);
   my_error(ER_INTERNAL_ERROR, MYF(0), "Apply callback from Clone Server");
   return (ER_INTERNAL_ERROR);
diff -Nru mysql-8.0-8.0.26/plugin/connection_control/connection_control.cc mysql-8.0-8.0.27/plugin/connection_control/connection_control.cc
--- mysql-8.0-8.0.26/plugin/connection_control/connection_control.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/connection_control/connection_control.cc	2021-09-28 11:46:34.000000000 +0000
@@ -186,7 +186,7 @@
   @returns success
 */
 
-static int connection_control_deinit(void *arg MY_ATTRIBUTE((unused))) {
+static int connection_control_deinit(void *arg [[maybe_unused]]) {
   delete g_connection_event_coordinator;
   g_connection_event_coordinator = nullptr;
   connection_control::deinit_connection_delay_event();
@@ -233,9 +233,10 @@
     @retval 1 Value is not within valid bounds
 */
 
-static int check_failed_connections_threshold(
-    MYSQL_THD thd MY_ATTRIBUTE((unused)), SYS_VAR *var MY_ATTRIBUTE((unused)),
-    void *save MY_ATTRIBUTE((unused)), struct st_mysql_value *value) {
+static int check_failed_connections_threshold(MYSQL_THD thd [[maybe_unused]],
+                                              SYS_VAR *var [[maybe_unused]],
+                                              void *save [[maybe_unused]],
+                                              struct st_mysql_value *value) {
   longlong new_value;
   if (value->val_int(value, &new_value)) return 1; /* NULL value */
 
@@ -261,9 +262,10 @@
   connection_control_failed_connections_threshold
 */
 
-static void update_failed_connections_threshold(
-    MYSQL_THD thd MY_ATTRIBUTE((unused)), SYS_VAR *var MY_ATTRIBUTE((unused)),
-    void *var_ptr MY_ATTRIBUTE((unused)), const void *save) {
+static void update_failed_connections_threshold(MYSQL_THD thd [[maybe_unused]],
+                                                SYS_VAR *var [[maybe_unused]],
+                                                void *var_ptr [[maybe_unused]],
+                                                const void *save) {
   /*
     This won't result in overflow because we have already checked that this is
     within valid bounds.
@@ -300,9 +302,9 @@
     @retval 1 Value is not within valid bounds
 */
 
-static int check_min_connection_delay(MYSQL_THD thd MY_ATTRIBUTE((unused)),
-                                      SYS_VAR *var MY_ATTRIBUTE((unused)),
-                                      void *save MY_ATTRIBUTE((unused)),
+static int check_min_connection_delay(MYSQL_THD thd [[maybe_unused]],
+                                      SYS_VAR *var [[maybe_unused]],
+                                      void *save [[maybe_unused]],
                                       struct st_mysql_value *value) {
   long long new_value;
   int64 existing_value = g_variables.max_connection_delay;
@@ -329,9 +331,9 @@
   @param save       New value for connection_control_min_connection_delay
 */
 
-static void update_min_connection_delay(MYSQL_THD thd MY_ATTRIBUTE((unused)),
-                                        SYS_VAR *var MY_ATTRIBUTE((unused)),
-                                        void *var_ptr MY_ATTRIBUTE((unused)),
+static void update_min_connection_delay(MYSQL_THD thd [[maybe_unused]],
+                                        SYS_VAR *var [[maybe_unused]],
+                                        void *var_ptr [[maybe_unused]],
                                         const void *save) {
   longlong new_value = *(reinterpret_cast<const longlong *>(save));
   g_variables.min_connection_delay = (int64)new_value;
@@ -364,9 +366,9 @@
     @retval 1 Value is not within valid bounds
 */
 
-static int check_max_connection_delay(MYSQL_THD thd MY_ATTRIBUTE((unused)),
-                                      SYS_VAR *var MY_ATTRIBUTE((unused)),
-                                      void *save MY_ATTRIBUTE((unused)),
+static int check_max_connection_delay(MYSQL_THD thd [[maybe_unused]],
+                                      SYS_VAR *var [[maybe_unused]],
+                                      void *save [[maybe_unused]],
                                       struct st_mysql_value *value) {
   long long new_value;
   int64 existing_value = g_variables.min_connection_delay;
@@ -393,9 +395,9 @@
   @param save       New value for connection_control_max_connection_delay
 */
 
-static void update_max_connection_delay(MYSQL_THD thd MY_ATTRIBUTE((unused)),
-                                        SYS_VAR *var MY_ATTRIBUTE((unused)),
-                                        void *var_ptr MY_ATTRIBUTE((unused)),
+static void update_max_connection_delay(MYSQL_THD thd [[maybe_unused]],
+                                        SYS_VAR *var [[maybe_unused]],
+                                        void *var_ptr [[maybe_unused]],
                                         const void *save) {
   longlong new_value = *(reinterpret_cast<const longlong *>(save));
   g_variables.max_connection_delay = (int64)new_value;
@@ -430,8 +432,8 @@
   @returns Always returns success.
 */
 
-static int show_delay_generated(MYSQL_THD thd MY_ATTRIBUTE((unused)),
-                                SHOW_VAR *var, char *buff) {
+static int show_delay_generated(MYSQL_THD thd [[maybe_unused]], SHOW_VAR *var,
+                                char *buff) {
   var->type = SHOW_LONGLONG;
   var->value = buff;
   longlong *value = reinterpret_cast<longlong *>(buff);
diff -Nru mysql-8.0-8.0.26/plugin/ddl_rewriter/CMakeLists.txt mysql-8.0-8.0.27/plugin/ddl_rewriter/CMakeLists.txt
--- mysql-8.0-8.0.26/plugin/ddl_rewriter/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/ddl_rewriter/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -20,6 +20,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
+DISABLE_MISSING_PROFILE_WARNING()
+
 MYSQL_ADD_PLUGIN(ddl_rewriter
   ddl_rewriter_plugin.cc
   ddl_rewriter.cc
diff -Nru mysql-8.0-8.0.26/plugin/fulltext/CMakeLists.txt mysql-8.0-8.0.27/plugin/fulltext/CMakeLists.txt
--- mysql-8.0-8.0.26/plugin/fulltext/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/fulltext/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -36,11 +36,17 @@
   MODULE_OUTPUT_NAME "libpluginngram"
   )
 
-# Mecab parser
+# Mecab parser, OFF by default.
 LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
 INCLUDE(mecab)
 MYSQL_CHECK_MECAB()
 
+SET(MECAB_WARN_GIVEN)
+WARN_MISSING_SYSTEM_MECAB(MECAB_WARN_GIVEN)
+IF(MECAB_WARN_GIVEN)
+  MESSAGE(FATAL_ERROR "-DWITH_MECAB=system, but missing system libraries")
+ENDIF()
+
 IF(WITH_DEBUG)
   ADD_DEFINITIONS(-DDEBUG)
 ENDIF()
diff -Nru mysql-8.0-8.0.26/plugin/fulltext/example/plugin_example.cc mysql-8.0-8.0.27/plugin/fulltext/example/plugin_example.cc
--- mysql-8.0-8.0.26/plugin/fulltext/example/plugin_example.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/fulltext/example/plugin_example.cc	2021-09-28 11:46:34.000000000 +0000
@@ -69,9 +69,7 @@
     1                    failure (cannot happen)
 */
 
-static int simple_parser_plugin_init(void *arg MY_ATTRIBUTE((unused))) {
-  return (0);
-}
+static int simple_parser_plugin_init(void *arg [[maybe_unused]]) { return (0); }
 
 /*
   Terminate the parser plugin at server shutdown or plugin deinstallation.
@@ -86,7 +84,7 @@
 
 */
 
-static int simple_parser_plugin_deinit(void *arg MY_ATTRIBUTE((unused))) {
+static int simple_parser_plugin_deinit(void *arg [[maybe_unused]]) {
   return (0);
 }
 
@@ -104,8 +102,7 @@
     1                    failure (cannot happen)
 */
 
-static int simple_parser_init(
-    MYSQL_FTPARSER_PARAM *param MY_ATTRIBUTE((unused))) {
+static int simple_parser_init(MYSQL_FTPARSER_PARAM *param [[maybe_unused]]) {
   return (0);
 }
 
@@ -123,8 +120,7 @@
     1                    failure (cannot happen)
 */
 
-static int simple_parser_deinit(
-    MYSQL_FTPARSER_PARAM *param MY_ATTRIBUTE((unused))) {
+static int simple_parser_deinit(MYSQL_FTPARSER_PARAM *param [[maybe_unused]]) {
   return (0);
 }
 
diff -Nru mysql-8.0-8.0.26/plugin/fulltext/mecab.cmake mysql-8.0-8.0.27/plugin/fulltext/mecab.cmake
--- mysql-8.0-8.0.26/plugin/fulltext/mecab.cmake	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/fulltext/mecab.cmake	2021-09-28 11:46:34.000000000 +0000
@@ -40,6 +40,19 @@
   "${WITH_MECAB_DOC} | </path/to/custom/installation> (use custom version)")
 
 
+FUNCTION(WARN_MISSING_SYSTEM_MECAB OUTPUT_WARNING)
+  IF(NOT MECAB_FOUND AND WITH_MECAB STREQUAL "system")
+    SET(DEBIAN_PKGS "libmecab-dev mecab-ipadic mecab-ipadic-utf8 ")
+    SET(REDHAT_PKGS "mecab-devel mecab-ipadic mecab-ipadic-EUCJP")
+
+    MESSAGE(WARNING "Cannot find MECAB system libraries. "
+      "  Debian/Ubuntu: apt install ${DEBIAN_PKGS}\n"
+      "  Fedora:        yum install ${REDHAT_PKGS}\n"
+      )
+    SET(${OUTPUT_WARNING} 1 PARENT_SCOPE)
+  ENDIF()
+ENDFUNCTION()
+
 # Off by default, can be overridden on command line.
 SET(WITH_MECAB CACHE STRING "${WITH_MECAB_DOC}")
 
@@ -109,6 +122,7 @@
        MECAB_LIBRARY
       )
       SET(MECAB_FOUND TRUE)
+      SET(MECAB_FOUND TRUE PARENT_SCOPE)
     ELSE()
       SET(MECAB_FOUND FALSE)
     ENDIF()
@@ -149,6 +163,8 @@
             COMPONENT "Server"
           )
           MESSAGE(STATUS "INSTALL ${MECAB_LIBRARY_LOCATION}/mecab")
+          SET(MECAB_IPADIC_PARENT "${MECAB_LIBRARY_LOCATION}/mecab" CACHE FILEPATH
+            "Location of mecab ipadic dictionary")
         ELSE()
           MESSAGE(STATUS
             "Could not find ${MECAB_LIBRARY_LOCATION}/mecab/dic")
@@ -175,7 +191,7 @@
         "WITH_MECAB option are : ${WITH_MECAB_DOC}")
     ENDIF()
   ELSE()
-    MESSAGE(SEND_ERROR
+    MESSAGE(FATAL_ERROR
       "Wrong option or path for WITH_MECAB. "
       "Valid WITH_MECAB options are : ${WITH_MECAB_DOC}")
   ENDIF()
diff -Nru mysql-8.0-8.0.26/plugin/fulltext/mecab_parser/plugin_mecab.cc mysql-8.0-8.0.27/plugin/fulltext/mecab_parser/plugin_mecab.cc
--- mysql-8.0-8.0.26/plugin/fulltext/mecab_parser/plugin_mecab.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/fulltext/mecab_parser/plugin_mecab.cc	2021-09-28 11:46:34.000000000 +0000
@@ -68,8 +68,8 @@
   static const char *mecab_charset_values[mecab_charset_count][2] = {
       {"euc-jp", "ujis"},
       {"sjis", "sjis"},
-      {"utf-8", "utf8"},
-      {"utf8", "utf8"}};
+      {"utf-8", "utf8mb4"},
+      {"utf8", "utf8mb4"}};
 
   for (int i = 0; i < mecab_charset_count; i++) {
     if (native_strcasecmp(charset, mecab_charset_values[i][0]) == 0) {
@@ -249,27 +249,27 @@
   MYSQL_FTPARSER_BOOLEAN_INFO bool_info = {FT_TOKEN_WORD, 0, 0, 0, 0, 0,
                                            ' ',           0};
   int ret = 0;
-  const char *csname = NULL;
 
-  /* Mecab supports utf8mb4(utf8), eucjpms(ujis) and cp932(sjis). */
-  if (strcmp(param->cs->csname, MY_UTF8MB4) == 0) {
-    csname = "utf8";
-  } else if (strcmp(param->cs->csname, "eucjpms") == 0) {
-    csname = "ujis";
-  } else if (strcmp(param->cs->csname, "cp932") == 0) {
-    csname = "sjis";
-  } else {
-    csname = param->cs->csname;
+  /* Mecab supports utf8mb4/utf8mb3, eucjpms(ujis) and cp932(sjis). */
+  std::string param_csname = replace_utf8_utf8mb3(param->cs->csname);
+  if (param_csname == "eucjpms") {
+    param_csname = "ujis";
+  } else if (param_csname == "cp932") {
+    param_csname = "sjis";
   }
 
   /* Check charset */
-  if (strcmp(mecab_charset, csname) != 0) {
+  bool matching_charset =
+      (mecab_charset == param_csname) ||
+      (std::string(mecab_charset) == "utf8mb4" && param_csname == "utf8mb3");
+
+  if (!matching_charset) {
     char error_msg[128];
 
     snprintf(error_msg, 127,
              "Fulltext index charset '%s'"
              " doesn't match mecab charset '%s'.",
-             param->cs->csname, mecab_charset);
+             param_csname.c_str(), mecab_charset);
     my_message(ER_ERROR_ON_WRITE, error_msg, MYF(0));
 
     return (1);
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/CMakeLists.txt mysql-8.0-8.0.27/plugin/group_replication/CMakeLists.txt
--- mysql-8.0-8.0.26/plugin/group_replication/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -28,6 +28,8 @@
   ADD_DEFINITIONS(-DPROTOBUF_USE_DLLS)
 ENDIF()
 
+DISABLE_MISSING_PROFILE_WARNING()
+
 ADD_SUBDIRECTORY(libmysqlgcs)
 ADD_SUBDIRECTORY(protobuf)
 
@@ -43,6 +45,7 @@
   src/delayed_plugin_initialization.cc
   src/gcs_event_handlers.cc
   src/gcs_logger.cc
+  src/gcs_mysql_network_provider.cc
   src/gcs_operations.cc
   src/gcs_plugin_messages.cc
   src/gcs_view_modification_notifier.cc
@@ -66,9 +69,11 @@
   src/perfschema/pfs.cc
   src/perfschema/table_replication_group_configuration_version.cc
   src/perfschema/table_replication_group_member_actions.cc
+  src/perfschema/table_communication_information.cc
   src/pipeline_factory.cc
   src/pipeline_stats.cc
   src/plugin.cc
+  src/plugin_handlers/consensus_leaders_handler.cc
   src/plugin_handlers/group_partition_handling.cc
   src/plugin_handlers/member_actions_handler.cc
   src/plugin_handlers/member_actions_handler_configuration.cc
@@ -103,8 +108,10 @@
   src/recovery_channel_state_observer.cc
   src/recovery_state_transfer.cc
   src/replication_threads_api.cc
+  src/services/get_system_variable/get_system_variable.cc
   src/services/message_service/message_service.cc
   src/services/notification/notification.cc
+  src/services/status_service/status_service.cc
   src/services/registry.cc
   src/sql_service/sql_command_test.cc
   src/sql_service/sql_resultset.cc
@@ -137,10 +144,14 @@
     src/member_version.cc
     src/compatibility_module.cc
     src/mysql_version_gcs_protocol_map.cc
+    src/gcs_mysql_network_provider.cc
+    src/replication_threads_api.cc
+    src/plugin_psi.cc
   )
   SET_TARGET_PROPERTIES(gr_unit_test_resource
     PROPERTIES COMPILE_DEFINITIONS "DISABLE_PSI_MUTEX"
     )
+  ADD_DEPENDENCIES(gr_unit_test_resource GenError)
 ENDIF()
 
 ADD_COMPILE_FLAGS(${GROUP_REPLICATION_SOURCES}
@@ -149,6 +160,10 @@
 
 ### Configuration ###
 
+IF(WIN32)
+  ADD_DEFINITIONS(-DIMPORT_UNKNOWN_SQLSTATE)
+ENDIF()
+
 # declare the plugin itself
 MYSQL_ADD_PLUGIN(group_replication
   ${GROUP_REPLICATION_SOURCES}
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/include/applier.h mysql-8.0-8.0.27/plugin/group_replication/include/applier.h
--- mysql-8.0-8.0.26/plugin/group_replication/include/applier.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/include/applier.h	2021-09-28 11:46:34.000000000 +0000
@@ -314,7 +314,7 @@
       @retval !=0    yes
   */
   bool is_applier_thread_aborted() {
-    return (applier_aborted || applier_thd->killed);
+    return (applier_aborted || applier_thd == nullptr || applier_thd->killed);
   }
 
   /**
@@ -546,8 +546,8 @@
   void awake_applier_module() override {
     mysql_mutex_lock(&suspend_lock);
     suspended = false;
-    mysql_mutex_unlock(&suspend_lock);
     mysql_cond_broadcast(&suspend_cond);
+    mysql_mutex_unlock(&suspend_lock);
   }
 
   /**
@@ -878,8 +878,6 @@
   mysql_cond_t suspend_cond;
   /* Suspend flag that informs if the applier is suspended */
   bool suspended;
-  /* Suspend wait flag used when waiting for the applier to suspend */
-  bool waiting_for_applier_suspension;
 
   /* The condition for signaling the applier suspension*/
   mysql_cond_t suspension_waiting_condition;
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/include/certifier.h mysql-8.0-8.0.27/plugin/group_replication/include/certifier.h
--- mysql-8.0-8.0.26/plugin/group_replication/include/certifier.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/include/certifier.h	2021-09-28 11:46:34.000000000 +0000
@@ -183,11 +183,13 @@
       std::map<std::string, std::string> *cert_info) = 0;
   virtual int set_certification_info(
       std::map<std::string, std::string> *cert_info) = 0;
+  virtual int stable_set_handle() = 0;
   virtual bool set_group_stable_transactions_set(
       Gtid_set *executed_gtid_set) = 0;
   virtual void enable_conflict_detection() = 0;
   virtual void disable_conflict_detection() = 0;
   virtual bool is_conflict_detection_enable() = 0;
+  virtual ulonglong get_certification_info_size() override = 0;
 };
 
 class Certifier : public Certifier_interface {
@@ -369,6 +371,16 @@
                                                 bool local);
 
   /**
+    Computes intersection between all sets received, so that we
+    have the already applied transactions on all servers.
+
+    @return the operation status
+      @retval 0      OK
+      @retval !=0    Error
+  */
+  int stable_set_handle() override;
+
+  /**
     This member function shall add transactions to the stable set
 
     @param executed_gtid_set  The GTID set of the transactions to be added
@@ -721,16 +733,6 @@
   Gtid_set *get_certified_write_set_snapshot_version(const char *item);
 
   /**
-    Computes intersection between all sets received, so that we
-    have the already applied transactions on all servers.
-
-    @return the operation status
-      @retval 0      OK
-      @retval !=0    Error
-  */
-  int stable_set_handle();
-
-  /**
     Removes the intersection of the received transactions stable
     sets from certification database.
    */
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/include/gcs_mysql_network_provider.h mysql-8.0-8.0.27/plugin/group_replication/include/gcs_mysql_network_provider.h
--- mysql-8.0-8.0.26/plugin/group_replication/include/gcs_mysql_network_provider.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/include/gcs_mysql_network_provider.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,438 @@
+/* Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+
+   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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef GCS_MYSQL_NETWORK_PROVIDER_INCLUDED
+#define GCS_MYSQL_NETWORK_PROVIDER_INCLUDED
+
+#include <map>
+
+#include "include/mysql.h"
+
+#include <mysql.h>
+
+#include "plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_communication_interface.h"
+
+#include "plugin/group_replication/include/plugin_psi.h"
+#include "plugin/group_replication/include/replication_threads_api.h"
+#include "sql/sql_class.h"
+
+/**
+ * @brief IoC interface to allow abstraction of the retrieval of Security
+ * Credentials
+ *
+ */
+class Gcs_mysql_network_provider_auth_interface {
+ public:
+  virtual ~Gcs_mysql_network_provider_auth_interface() {}
+
+  /**
+   * @brief Get the user credentials needed to establish MySQL connections.
+   *
+   * This interface is used either as a proxy for @see Replication_thread_api
+   * or to be injected by unit tests.
+   *
+   * @param username username for the mysql connection
+   * @param password password for the mysql connection
+   *
+   * @return the operation status
+   *  @retval false   OK
+   *  @retval true    Error, channel not found
+   */
+  virtual bool get_credentials(std::string &username,
+                               std::string &password) = 0;
+};
+
+/**
+ * @brief Implementation of Gcs_mysql_network_provider_auth_interface
+ * that retrieves auth data from MySQL.
+ */
+class Gcs_mysql_network_provider_auth_interface_impl
+    : public Gcs_mysql_network_provider_auth_interface {
+ public:
+  Gcs_mysql_network_provider_auth_interface_impl()
+      : m_recovery_channel("group_replication_recovery") {}
+  virtual ~Gcs_mysql_network_provider_auth_interface_impl() override {}
+
+  /**
+   * @brief @see Gcs_mysql_network_provider_auth_interface#get_credentials
+   */
+  bool get_credentials(std::string &username, std::string &password) override;
+
+ private:
+  Replication_thread_api m_recovery_channel;
+};
+
+/**
+ * @brief IoC interface to allow abstraction of MySQL Client API
+ *
+ */
+class Gcs_mysql_network_provider_native_interface {
+ public:
+  virtual ~Gcs_mysql_network_provider_native_interface() {}
+
+  /**
+   * @brief Proxy method to mysql_real_connect from the MySQL client API
+   *
+   * @param mysql       mysql client connection reference. Must have been
+   *                     initializaed with mysql_init
+   * @param host        hostname to connect
+   * @param user        username for the connection
+   * @param passwd      password for the connection
+   * @param db          database/schema to use
+   * @param port        remote port to connect
+   * @param unix_socket unix socket file (if applicable)
+   * @param clientflag  client flags
+   * @return MYSQL* a mysql client connection.
+   */
+  virtual MYSQL *mysql_real_connect(MYSQL *mysql, const char *host,
+                                    const char *user, const char *passwd,
+                                    const char *db, unsigned int port,
+                                    const char *unix_socket,
+                                    unsigned long clientflag) = 0;
+  /**
+   * @brief Proxy method to simple_command from the MySQL client API
+   *
+   * @param mysql an active MySQL connection
+   * @param command the command to send
+   * @param arg command arguments
+   * @param length lenght of the arguments
+   * @param skip_check skip checking the command
+   *
+   * @return true in case of error. false, otherwise
+   *
+   */
+  virtual bool send_command(MYSQL *mysql, enum enum_server_command command,
+                            const unsigned char *arg, size_t length,
+                            bool skip_check) = 0;
+
+  /**
+   * @brief Proxy method to mysql_init from the MySQL Client API
+   *
+   * @param sock the connection to initialize
+   */
+  virtual MYSQL *mysql_init(MYSQL *sock) = 0;
+
+  /**
+   * @brief Proxy method to mysql_close from the MySQL Client API
+   *
+   * @param sock the connection to close
+   */
+  virtual void mysql_close(MYSQL *sock) = 0;
+
+  /**
+    Method to get the network namespace configured for a channel
+
+    @param[out] net_ns   The network namespace to extract
+
+    @return the operation status
+      @retval false   OK
+      @retval true    Error, channel not found
+  */
+  virtual int channel_get_network_namespace(std::string &net_ns) = 0;
+
+  /**
+    Set active network namespace specified by a name.
+
+    @param network_namespace  the name of a network namespace to be set active
+
+    @return false on success, true on error
+    @note all opened descriptors used during function run are closed on error
+  */
+  virtual bool set_network_namespace(const std::string &network_namespace) = 0;
+
+  /**
+    Restore original network namespace used to be active before a new network
+    namespace has been set.
+
+    @return false on success, true on failure
+  */
+  virtual bool restore_original_network_namespace() = 0;
+
+  /**
+   * @brief Proxy method to mysql_free from the MySQL Memory API
+   *
+   * @param ptr the pointer to free
+   */
+  virtual void mysql_free(void *ptr) = 0;
+
+  /**
+   * @brief Proxy method to mysql_options from the MySQL Memory API
+   *
+   * @param mysql  connection to set an option
+   * @param option option to set
+   * @param arg    value of the option to set
+   *
+   * @return int > 0 in case of error.
+   */
+  virtual int mysql_options(MYSQL *mysql, enum mysql_option option,
+                            const void *arg) = 0;
+
+  /**
+   * @brief Proxy method to mysql_ssl_set from the MySQL Memory API
+   *
+   * @param mysql connection to set SSL options
+   * @param key connection key
+   * @param cert connection certificate
+   * @param ca connection CA
+   * @param capath the CA path
+   * @param cipher cipher to use
+   *
+   * @return true in case of error;
+   * @return false otherwise.
+   */
+  virtual bool mysql_ssl_set(MYSQL *mysql, const char *key, const char *cert,
+                             const char *ca, const char *capath,
+                             const char *cipher) = 0;
+};
+
+/**
+ * @brief Internal implementation of
+ * Gcs_mysql_network_provider_native_interface_impl that serves as a proxy
+ * for MySQL Client API functions.
+ *
+ */
+class Gcs_mysql_network_provider_native_interface_impl
+    : public Gcs_mysql_network_provider_native_interface,
+      public Network_namespace_manager {
+ public:
+  Gcs_mysql_network_provider_native_interface_impl()
+      : m_recovery_channel("group_replication_recovery") {}
+  virtual ~Gcs_mysql_network_provider_native_interface_impl() override {}
+
+  /**
+   * @brief Implementation of @see
+   * Gcs_mysql_network_provider_native_interface#mysql_real_connect
+   */
+  MYSQL *mysql_real_connect(MYSQL *mysql, const char *host, const char *user,
+                            const char *passwd, const char *db,
+                            unsigned int port, const char *unix_socket,
+                            unsigned long clientflag) override;
+  /**
+   * @brief Implementation of @see
+   * Gcs_mysql_network_provider_native_interface#send_command
+   */
+  bool send_command(MYSQL *mysql, enum enum_server_command command,
+                    const unsigned char *arg, size_t length,
+                    bool skip_check) override;
+
+  /**
+   * @brief Implementation of @see
+   * Gcs_mysql_network_provider_native_interface#mysql_init
+   */
+  MYSQL *mysql_init(MYSQL *sock) override;
+
+  /**
+   * @brief Implementation of @see
+   * Gcs_mysql_network_provider_native_interface#mysql_close
+   */
+  void mysql_close(MYSQL *sock) override;
+
+  /**
+   * @brief Implementation of @see
+   * Gcs_mysql_network_provider_native_interface#channel_get_network_namespace
+   */
+  int channel_get_network_namespace(std::string &net_ns) override;
+
+  /**
+   * @brief Implementation of @see
+   * Gcs_mysql_network_provider_native_interface#set_network_namespace
+   */
+  bool set_network_namespace(const std::string &network_namespace) override;
+
+  /**
+   * @brief Implementation of @see
+   * Gcs_mysql_network_provider_native_interface#restore_original_network_namespace
+   */
+  bool restore_original_network_namespace() override;
+
+  /**
+   * @brief Implementation of @see
+   * Gcs_mysql_network_provider_native_interface#my_free
+   */
+  void mysql_free(void *ptr) override;
+
+  /**
+   * @brief Implementation of @see
+   * Gcs_mysql_network_provider_native_interface#mysql_options
+   */
+  int mysql_options(MYSQL *mysql, enum mysql_option option,
+                    const void *arg) override;
+
+  /**
+   * @brief Implementation of @see
+   * Gcs_mysql_network_provider_native_interface#mysql_ssl_set
+   */
+  bool mysql_ssl_set(MYSQL *mysql, const char *key, const char *cert,
+                     const char *ca, const char *capath,
+                     const char *cipher) override;
+
+ private:
+  Replication_thread_api m_recovery_channel;
+};
+
+/**
+ * @brief Implementation of a \see Network_provider that will manage MySQL
+ * protocol connection for GCS/XCOM.
+ */
+class Gcs_mysql_network_provider : public Network_provider {
+ private:
+  /**
+   * @brief A map that holds all open MySQL client connections.
+   *
+   * Since the public interface of Network Managers only knows about File
+   * Descriptors, this is the repository for all MySQL client connections. This
+   * object is required when using mysql_close.
+   *
+   * The map's index is the open connection's file descriptor.
+   */
+  std::map<int, MYSQL *> m_connection_map;
+
+  /**
+   * @brief A map that holds THD's for all open MySQL Server connections.
+   *
+   * We need to maintain this reference in order to call the apropriate closing
+   * mechanisms when destroying an incoming connection.
+   *
+   * The map's index is the open connection's file descriptor.
+   */
+  std::map<int, THD *> m_incoming_connection_map;
+
+  // Locking for the connection map
+  mysql_mutex_t m_GR_LOCK_connection_map_mutex;
+
+  // Configuration parameters for this Provider
+  Network_configuration_parameters m_config_parameters;
+
+  /**
+   * External IoC dependencies.
+   * - A provider for authentication parameters
+   * - A provider for all mysql native methods
+   */
+  Gcs_mysql_network_provider_auth_interface *m_auth_provider;
+  Gcs_mysql_network_provider_native_interface *m_native_interface;
+
+ public:
+  /**
+   * @brief Construct a new Gcs_mysql_network_provider
+   *
+   * @param auth_provider A provider interface implementation for authentication
+   * parameters.
+   *
+   * @param native_interface  A provider interface for all mysql native methods.
+   */
+  Gcs_mysql_network_provider(
+      Gcs_mysql_network_provider_auth_interface *auth_provider,
+      Gcs_mysql_network_provider_native_interface *native_interface)
+      : m_connection_map(),
+        m_incoming_connection_map(),
+        m_GR_LOCK_connection_map_mutex(),
+        m_config_parameters(),
+        m_auth_provider(nullptr),
+        m_native_interface(nullptr) {
+    m_config_parameters.ssl_params.ssl_mode = SSL_DISABLED;
+
+    m_auth_provider = auth_provider;
+    m_native_interface = native_interface;
+    mysql_mutex_init(key_GR_LOCK_connection_map,
+                     &m_GR_LOCK_connection_map_mutex, MY_MUTEX_INIT_FAST);
+  }
+
+  virtual ~Gcs_mysql_network_provider() override {
+    /*Close all client connections*/
+    if (!m_connection_map.empty()) {
+      std::for_each(m_connection_map.begin(), m_connection_map.end(),
+                    [this](const auto &client_connection) {
+                      m_native_interface->mysql_close(client_connection.second);
+                      m_native_interface->mysql_free(client_connection.second);
+                    });
+      m_connection_map.clear();
+    }
+    mysql_mutex_destroy(&m_GR_LOCK_connection_map_mutex);
+  }
+
+  /**
+   * @brief See @see Network_provider#start
+   */
+  int start() override;
+
+  /**
+   * @brief See @see Network_provider#stop
+   */
+  int stop() override;
+
+  /**
+   * @brief Get the communication stack implemented by this class
+   *
+   * @return a CommunicationStack enum value. In this case -> MYSQL_PROTOCOL
+   */
+  enum_transport_protocol get_communication_stack() const override {
+    return MYSQL_PROTOCOL;
+  }
+
+  /**
+   * @brief See @see Network_provider#configure
+   */
+  bool configure(const Network_configuration_parameters &params) override;
+
+  /**
+   * @brief See @see Network_provider#configure_secure_connections
+   */
+  bool configure_secure_connections(
+      const Network_configuration_parameters &params) override;
+
+  /**
+   * @brief
+   *
+   * @return true
+   * @return false
+   */
+  bool cleanup_secure_connections_context() override;
+
+  /**
+   * @brief
+   *
+   * @return true
+   * @return false
+   */
+  bool finalize_secure_connections_context() override;
+
+  /**
+   * @brief See @see Network_provider#open_connection
+   */
+  std::unique_ptr<Network_connection> open_connection(
+      const std::string &address, const unsigned short port,
+      const Network_security_credentials &security_credentials,
+      int connection_timeout =
+          Network_provider::default_connection_timeout()) override;
+
+  int close_connection(const Network_connection &connection) override;
+
+  /**
+   * @brief Set the new connection coming form MySQL server
+   *
+   * @param thd the THD to which the connection belongs to.
+   * @param connection the connection data itself.
+   */
+  void set_new_connection(THD *thd, Network_connection *connection);
+};
+
+#endif /* GCS_MYSQL_NETWORK_PROVIDER_INCLUDED */
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/include/gcs_operations.h mysql-8.0-8.0.27/plugin/group_replication/include/gcs_operations.h
--- mysql-8.0-8.0.26/plugin/group_replication/include/gcs_operations.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/include/gcs_operations.h	2021-09-28 11:46:34.000000000 +0000
@@ -30,12 +30,16 @@
 #include <utility>
 
 #include "plugin/group_replication/include/gcs_logger.h"
+#include "plugin/group_replication/include/gcs_mysql_network_provider.h"
 #include "plugin/group_replication/include/gcs_plugin_messages.h"
 #include "plugin/group_replication/include/gcs_view_modification_notifier.h"
 #include "plugin/group_replication/include/mysql_version_gcs_protocol_map.h"
 #include "plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_interface.h"
+// TODO::change this for something more elegant
+#include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/include/network_provider.h"
 
 class Transaction_message_interface;
+#include "plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_member_identifier.h"
 
 /**
   @class Gcs_operations
@@ -288,6 +292,52 @@
   enum enum_gcs_error set_write_concurrency(uint32_t new_write_concurrency);
 
   /**
+   * @brief Reconfigures the group's "consensus leaders."
+   *
+   * Instructs the underlying GCS to use @c leader as the single preferred
+   * consensus leader.
+   *
+   * The method is non-blocking, meaning that it shall only send the
+   * request to an underlying GCS. The final result can be polled via @c
+   * get_leaders.
+   *
+   * @param leader The member you desire to act as a consensus leader.
+   *
+   * @retval GCS_OK if successful
+   * @retval GCS_NOK if unsuccessful
+   */
+  enum enum_gcs_error set_leader(Gcs_member_identifier const &leader);
+
+  /**
+   * @brief Reconfigures the group's "consensus leaders."
+   *
+   * Instructs the underlying GCS to use every member as a consensus leader.
+   *
+   * The method is non-blocking, meaning that it shall only send the
+   * request to an underlying GCS. The final result can be polled via @c
+   * get_leaders.
+   *
+   * @retval GCS_OK if successful
+   * @retval GCS_NOK if unsuccessful
+   */
+  enum enum_gcs_error set_everyone_leader();
+
+  /**
+   * @brief Inspect the group's "consensus leader" configuration.
+   *
+   * @param[out] preferred_leaders The members specified as preferred leaders.
+   * @param[out] actual_leaders The members actually carrying out the leader
+   * role at this moment.
+   *
+   * @retval GCS_OK if successful, @c preferred_leaders and @c actual_leaders
+   * contain the result
+   * @retval GCS_NOK if unsuccessful
+   */
+  enum enum_gcs_error get_leaders(
+      std::vector<Gcs_member_identifier> &preferred_leaders,
+      std::vector<Gcs_member_identifier> &actual_leaders);
+
+  /**
     Retrieves the group's "group communication protocol" value.
 
     @retval the protocol version
@@ -326,6 +376,21 @@
   enum enum_gcs_error set_xcom_cache_size(uint64_t new_size);
 
   /**
+   * @brief Get the current incoming connections protocol stack configured in
+   * GCS
+   *
+   * @return GcsRunningProtocol
+   */
+  enum_transport_protocol get_current_incoming_connections_protocol();
+
+  /**
+   * @brief Get the mysql network provider owned by GCS operations
+   *
+   * @return a Network_provider if initialized and running. nullptr, otherwise.
+   */
+  Gcs_mysql_network_provider *get_mysql_network_provider();
+
+  /**
    * @return the communication engine being used
    */
   static const std::string &get_gcs_engine();
@@ -349,6 +414,16 @@
 
   static const std::string gcs_engine;
   Gcs_gr_logger_impl gcs_logger;
+
+  /**
+   * External IoC dependencies for gcs_mysql_net_provider.
+   * - A provider for authentication parameters
+   * - A provider for all mysql native methods
+   */
+  Gcs_mysql_network_provider_auth_interface_impl auth_provider;
+  Gcs_mysql_network_provider_native_interface_impl native_interface;
+  std::shared_ptr<Gcs_mysql_network_provider> gcs_mysql_net_provider;
+
   Gcs_interface *gcs_interface;
 
   /** Was this view change injected */
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/include/group_actions/communication_protocol_action.h mysql-8.0-8.0.27/plugin/group_replication/include/group_actions/communication_protocol_action.h
--- mysql-8.0-8.0.26/plugin/group_replication/include/group_actions/communication_protocol_action.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/include/group_actions/communication_protocol_action.h	2021-09-28 11:46:34.000000000 +0000
@@ -56,6 +56,8 @@
   Group_action_diagnostics *get_execution_info() final;
 
  private:
+  int set_consensus_leaders() const;
+
   /** Stores textual information about the action's execution. */
   Group_action_diagnostics m_diagnostics;
 
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/include/member_info.h mysql-8.0-8.0.27/plugin/group_replication/include/member_info.h
--- mysql-8.0-8.0.26/plugin/group_replication/include/member_info.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/include/member_info.h	2021-09-28 11:46:34.000000000 +0000
@@ -144,8 +144,11 @@
     // Length of the payload item: variable
     PIT_VIEW_CHANGE_UUID = 21,
 
+    // Length of the paylod item: 1 byte
+    PIT_ALLOW_SINGLE_LEADER = 22,
+
     // No valid type codes can appear after this one.
-    PIT_MAX = 22
+    PIT_MAX = 23
   };
 
   /*
@@ -200,6 +203,8 @@
     @param[in] recovery_endpoints_arg                 recovery endpoints
     @param[in] view_change_uuid_arg                   view change uuid
     advertised
+    @param[in] allow_single_leader                    flag indicating whether or
+    not to use single-leader behavior
    */
   Group_member_info(const char *hostname_arg, uint port_arg,
                     const char *uuid_arg, int write_set_extraction_algorithm,
@@ -213,7 +218,7 @@
                     uint member_weight_arg, uint lower_case_table_names_arg,
                     bool default_table_encryption_arg,
                     const char *recovery_endpoints_arg,
-                    const char *view_change_uuid_arg,
+                    const char *view_change_uuid_arg, bool allow_single_leader,
                     PSI_mutex_key psi_mutex_key_arg =
                         key_GR_LOCK_group_member_info_update_lock);
 
@@ -265,6 +270,8 @@
     @param[in] recovery_endpoints_arg                 recovery endpoints
     advertised
     @param[in] view_change_uuid_arg                   view change uuid
+    @param[in] allow_single_leader                    flag indicating whether or
+    not to use single-leader behavior
    */
   void update(const char *hostname_arg, uint port_arg, const char *uuid_arg,
               int write_set_extraction_algorithm,
@@ -278,7 +285,7 @@
               uint member_weight_arg, uint lower_case_table_names_arg,
               bool default_table_encryption_arg,
               const char *recovery_endpoints_arg,
-              const char *view_change_uuid_arg);
+              const char *view_change_uuid_arg, bool allow_single_leader);
 
   /**
     Update Group_member_info.
@@ -556,6 +563,8 @@
    */
   std::string get_view_change_uuid();
 
+  bool get_allow_single_leader();
+
   /**
     Save member view change uuid
     @param view_change_cnf uuid to be used on change views or "AUTOMATIC"
@@ -605,6 +614,7 @@
   bool primary_election_running;
   std::string recovery_endpoints;
   std::string m_view_change_uuid;
+  bool m_allow_single_leader;
 #ifndef NDEBUG
  public:
   bool skip_encode_default_table_encryption;
@@ -1040,11 +1050,17 @@
   | payload_item_len  |   8 bytes | size of PIT_MEMBER_ACTIONS data      |
   | payload_item      |   X bytes | PIT_MEMBER_ACTIONS data              |
   +-------------------+-----------+--------------------------------------+
+  | payload_item_type |   2 bytes | PIT_RPL_FAILOVER_CONFIGURATION       |
+  | payload_item_len  |   8 bytes | size of                              |
+  |                   |           | PIT_RPL_FAILOVER_CONFIGURATION data  |
+  | payload_item      |   X bytes | PIT_RPL_FAILOVER_CONFIGURATION data  |
+  +-------------------+-----------+--------------------------------------+
 
  The PIT_MEMBER_DATA lines occur the number of times specified on
  PIT_MEMBERS_NUMBER.
- The PIT_MEMBER_ACTIONS line will exist if the member that sent the
- Group_member_info_manager message is not joining.
+ The PIT_MEMBER_ACTIONS and PIT_RPL_FAILOVER_CONFIGURATION lines will
+ exist if the member that sent the Group_member_info_manager message
+ is not joining.
 */
 class Group_member_info_manager_message : public Plugin_gcs_message {
  public:
@@ -1061,8 +1077,11 @@
     // Length of the payload item: variable
     PIT_MEMBER_ACTIONS = 3,
 
+    // Length of the payload item: variable
+    PIT_RPL_FAILOVER_CONFIGURATION = 4,
+
     // No valid type codes can appear after this one.
-    PIT_MAX = 4
+    PIT_MAX = 5
   };
 
   /**
@@ -1109,23 +1128,36 @@
       const std::string &member_actions_serialized_configuration) const;
 
   /**
-    Gets the serialized member actions configuration.
+    Gets the data that belongs to payload_item_type pit.
 
+    @param[in]  pit     the payload_item_type to which the data belongs
     @param[in]  buffer  message buffer
     @param[in]  length  message buffer length
-    @param[out] member_actions_serialized_configuration
-                       serialized member actions configuration
-    @param[out] member_actions_serialized_configuration_length
-                       serialized member actions configuration length
+    @param[out] pit_data
+                       the data from payload_item_type pit
+    @param[out] pit_length
+                       the length of the data from payload_item_type pit
 
     @return the operation status
       @retval false  OK
       @retval true   member actions do not exist on the message
    */
-  bool get_member_actions_serialized_configuration(
-      const unsigned char *buffer, size_t length,
-      const unsigned char **member_actions_serialized_configuration,
-      size_t *member_actions_serialized_configuration_length);
+  bool get_pit_data(const enum_payload_item_type pit,
+                    const unsigned char *buffer, size_t length,
+                    const unsigned char **pit_data, size_t *pit_length);
+
+  /**
+    Adds a already serialized replication failover channels
+    configuration to the Group_member_info_manager_message content.
+
+    @param[in] buffer  message buffer
+    @param[in] replication_failover_channels_serialized_configuration
+                       serialized failover channels configuration
+   */
+  void add_replication_failover_channels_serialized_configuration(
+      std::vector<unsigned char> *buffer,
+      const std::string &replication_failover_channels_serialized_configuration)
+      const;
 
  protected:
   void encode_payload(std::vector<unsigned char> *buffer) const override;
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/include/member_version.h mysql-8.0-8.0.27/plugin/group_replication/include/member_version.h
--- mysql-8.0-8.0.26/plugin/group_replication/include/member_version.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/include/member_version.h	2021-09-28 11:46:34.000000000 +0000
@@ -27,6 +27,10 @@
 
 #include "my_inttypes.h"
 
+/**
+ * @brief represent the MySQL version of a Member within the Group Replication
+ * group.
+ */
 class Member_version {
  public:
   Member_version(unsigned int version);
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/include/perfschema/table_communication_information.h mysql-8.0-8.0.27/plugin/group_replication/include/perfschema/table_communication_information.h
--- mysql-8.0-8.0.26/plugin/group_replication/include/perfschema/table_communication_information.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/include/perfschema/table_communication_information.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,39 @@
+/* Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+
+#include "plugin/group_replication/include/perfschema/pfs.h"
+#include "plugin/group_replication/include/services/registry.h"
+
+#ifndef GROUP_REPLICATION_TABLE_COMMUNICATION_INFORMATION_H
+#define GROUP_REPLICATION_TABLE_COMMUNICATION_INFORMATION_H
+
+extern Registry_module *registry_module;
+
+namespace gr {
+namespace perfschema {
+
+class Pfs_table_communication_information : public Abstract_Pfs_table {
+ public:
+  Pfs_table_communication_information() = default;
+  ~Pfs_table_communication_information() override = default;
+
+  bool init() override;
+  bool deinit() override;
+};
+
+}  // namespace perfschema
+}  // namespace gr
+
+#endif /* GROUP_REPLICATION_TABLE_COMMUNICATION_INFORMATION_H */
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/include/perfschema/utilities.h mysql-8.0-8.0.27/plugin/group_replication/include/perfschema/utilities.h
--- mysql-8.0-8.0.26/plugin/group_replication/include/perfschema/utilities.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/include/perfschema/utilities.h	2021-09-28 11:46:34.000000000 +0000
@@ -19,6 +19,9 @@
 #include <mysql/components/services/registry.h>
 #include <mysql/service_plugin_registry.h>
 
+#include <vector>
+#include "mysql/components/services/pfs_plugin_table_service.h"
+
 namespace gr {
 namespace perfschema {
 
@@ -36,6 +39,22 @@
   SERVICE_TYPE(registry) * get_registry() { return m_registry; }
 };
 
+class Position {
+ private:
+  unsigned int m_index{0};
+  unsigned int m_max{0};
+
+ public:
+  void set_max(unsigned int max) { m_max = max; }
+  bool has_more() { return m_index < m_max; }
+  void next() { m_index++; }
+  void reset() { m_index = 0; }
+  unsigned int get_index() { return m_index; }
+  void set_at(unsigned int index) { m_index = index; }
+  void set_at(Position *pos) { m_index = pos->get_index(); }
+  void set_after(Position *pos) { m_index = pos->get_index() + 1; }
+};
+
 }  // namespace perfschema
 }  // namespace gr
 
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/include/plugin_constants.h mysql-8.0-8.0.27/plugin/group_replication/include/plugin_constants.h
--- mysql-8.0-8.0.26/plugin/group_replication/include/plugin_constants.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/include/plugin_constants.h	2021-09-28 11:46:34.000000000 +0000
@@ -48,6 +48,9 @@
 /* View timeout (seconds) */
 #define VIEW_MODIFICATION_TIMEOUT 60
 
+/* View timeout for Force Members (seconds) */
+#define FORCE_MEMBERS_VIEW_MODIFICATION_TIMEOUT 120
+
 /*
   Transaction wait timeout before kill (seconds)
   This value comes from innodb_lock_wait_timeout that can make some of the
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/include/plugin.h mysql-8.0-8.0.27/plugin/group_replication/include/plugin.h
--- mysql-8.0-8.0.26/plugin/group_replication/include/plugin.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/include/plugin.h	2021-09-28 11:46:34.000000000 +0000
@@ -55,6 +55,8 @@
 class Autorejoin_thread;
 class Transaction_consistency_manager;
 class Member_actions_handler;
+class Consensus_leaders_handler;
+class Mysql_thread;
 
 // Definition of system var structures
 
@@ -114,6 +116,7 @@
     MESSAGE_SERVICE_HANDLER,
     BINLOG_DUMP_THREAD_KILL,
     MEMBER_ACTIONS_HANDLER,
+    MYSQL_THREAD_HANDLER,
     NUM_MODULES
   };
   using mask = std::bitset<NUM_MODULES>;
@@ -131,6 +134,17 @@
 };
 
 /**
+  @enum enum_wait_on_start_process_result
+  @brief Reasons why asynchronous channels start wait for Group
+  Replication status can be aborted.
+*/
+enum enum_wait_on_start_process_result {
+  WAIT_ON_START_PROCESS_SUCCESS = 0,
+  WAIT_ON_START_PROCESS_ABORT_ON_CLONE,
+  WAIT_ON_START_PROCESS_ABORT_SECONDARY_MEMBER
+};
+
+/**
   The plugin modules.
 
   @note Whenever you want to create a new plugin module, be sure to add it to
@@ -158,6 +172,7 @@
 extern Autorejoin_thread *autorejoin_module;
 extern Message_service_handler *message_service_handler;
 extern Member_actions_handler *member_actions_handler;
+extern Mysql_thread *mysql_thread_handler;
 
 // Auxiliary Functionality
 extern Plugin_gcs_events_handler *events_handler;
@@ -166,6 +181,7 @@
 extern Group_partition_handling *group_partition_handler;
 extern Blocked_transaction_handler *blocked_transaction_handler;
 extern Remote_clone_handler *remote_clone_handler;
+extern Consensus_leaders_handler *consensus_leaders_handler;
 // Latch used as the control point of the event driven
 // management of the transactions.
 extern Wait_ticket<my_thread_id> *transactions_latch;
@@ -198,7 +214,7 @@
 uint get_number_of_autorejoin_tries();
 ulonglong get_rejoin_timeout();
 void declare_plugin_cloning(bool is_running);
-
+bool get_allow_single_leader();
 /**
   Encapsulates the logic necessary to attempt a rejoin, i.e. gracefully leave
   the group, terminate GCS infrastructure, terminate auto-rejoin relevant plugin
@@ -230,6 +246,7 @@
 int get_flow_control_hold_percent_var();
 int get_flow_control_release_percent_var();
 ulong get_components_stop_timeout_var();
+ulong get_communication_stack_var();
 void set_error_state_due_to_error_during_autorejoin();
 bool get_error_state_due_to_error_during_autorejoin();
 
@@ -242,8 +259,9 @@
 bool plugin_is_group_replication_cloning();
 bool is_plugin_auto_starting_on_non_bootstrap_member();
 bool is_plugin_configured_and_starting();
-bool initiate_wait_on_start_process();
-void terminate_wait_on_start_process(bool abort = false);
+enum_wait_on_start_process_result initiate_wait_on_start_process();
+void terminate_wait_on_start_process(
+    enum_wait_on_start_process_result abort = WAIT_ON_START_PROCESS_SUCCESS);
 void set_wait_on_start_process(bool cond);
 bool plugin_get_connection_status(
     const GROUP_REPLICATION_CONNECTION_STATUS_CALLBACKS &callbacks);
@@ -253,6 +271,7 @@
     uint index,
     const GROUP_REPLICATION_GROUP_MEMBER_STATS_CALLBACKS &callbacks);
 uint plugin_get_group_members_number();
+int plugin_group_replication_leave_group();
 
 /**
   Method to set retrieved certification info from a recovery channel extracted
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/include/plugin_handlers/consensus_leaders_handler.h mysql-8.0-8.0.27/plugin/group_replication/include/plugin_handlers/consensus_leaders_handler.h
--- mysql-8.0-8.0.26/plugin/group_replication/include/plugin_handlers/consensus_leaders_handler.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/include/plugin_handlers/consensus_leaders_handler.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,109 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef CONSENSUS_LEADERS_HANDLER_INCLUDED
+#define CONSENSUS_LEADERS_HANDLER_INCLUDED
+
+#include "plugin/group_replication/include/member_info.h"
+#include "plugin/group_replication/include/member_version.h"
+#include "plugin/group_replication/include/plugin_observers/group_event_observer.h"
+#include "plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_member_identifier.h"
+
+/**
+ * @brief Deals with the orchestration necessary to set the appropriate
+ * "consensus leaders" on GCS.
+ *
+ * Reacts to successful primary elections by setting the newly elected primary
+ * as the single preferred "consensus leader" in GCS.
+ */
+class Consensus_leaders_handler : public Group_event_observer {
+ public:
+  /**
+   * Register as a group event observer in @c group_events_manager.
+   *
+   * @param group_events_manager
+   */
+  Consensus_leaders_handler(
+      Group_events_observation_manager &group_events_manager);
+
+  /**
+   * Unregister as a group event observer from @c m_group_events_manager.
+   */
+  ~Consensus_leaders_handler() override;
+
+  int after_view_change(const std::vector<Gcs_member_identifier> &joining,
+                        const std::vector<Gcs_member_identifier> &leaving,
+                        const std::vector<Gcs_member_identifier> &group,
+                        bool is_leaving, bool *skip_election,
+                        enum_primary_election_mode *election_mode,
+                        std::string &suggested_primary) override;
+
+  /**
+   * @brief Sets the newly elected primary as the single preferred "consensus
+   * leader" in GCS.
+   *
+   * @param primary_uuid
+   * @param primary_changed
+   * @param election_mode
+   * @param error
+   * @return int
+   */
+  int after_primary_election(std::string primary_uuid, bool primary_changed,
+                             enum_primary_election_mode election_mode,
+                             int error) override;
+
+  int before_message_handling(const Plugin_gcs_message &message,
+                              const std::string &message_origin,
+                              bool *skip_message) override;
+
+  /**
+   * @brief Set the appropriate "consensus leaders" in GCS.
+   *
+   * The "consensus leaders" are set according to the following rules:
+   * a) @c communication_protocol is < 8.0.27: do nothing
+   * b) @c communication_protocol is >= 8.0.27:
+   *    b1) @c primary_mode is SINGLE and @c my_role is PRIMARY: set myself,
+   *        @c my_gcs_id, as the single preferred "consensus leader"
+   *    b2) @c primary_mode is SINGLE and @c my_role is SECONDARY: do nothing
+   *    b3) @c primary_mode is MULTI: set everyone as "consensus leader"
+   *
+   * @param communication_protocol
+   * @param is_single_primary_mode
+   * @param role
+   * @param my_gcs_id
+   */
+  void set_consensus_leaders(Member_version const &communication_protocol,
+                             bool is_single_primary_mode,
+                             Group_member_info::Group_member_role role,
+                             Gcs_member_identifier const &my_gcs_id);
+
+ private:
+  void set_as_single_consensus_leader(
+      Gcs_member_identifier const &leader) const;
+  void set_everyone_as_consensus_leader() const;
+
+  static Member_version const
+      s_first_protocol_with_support_for_consensus_leaders;
+  Group_events_observation_manager &m_group_events_manager;
+};
+
+#endif /* CONSENSUS_LEADERS_HANDLER_INCLUDED */
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/include/plugin_psi.h mysql-8.0-8.0.27/plugin/group_replication/include/plugin_psi.h
--- mysql-8.0-8.0.26/plugin/group_replication/include/plugin_psi.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/include/plugin_psi.h	2021-09-28 11:46:34.000000000 +0000
@@ -126,7 +126,10 @@
     key_GR_LOCK_write_lock_protection,
     key_GR_LOCK_primary_promotion_policy,
     key_GR_LOCK_mysql_thread_run,
-    key_GR_LOCK_mysql_thread_dispatcher_run;
+    key_GR_LOCK_mysql_thread_dispatcher_run,
+    key_GR_LOCK_connection_map,
+    key_GR_LOCK_mysql_thread_handler_run,
+    key_GR_LOCK_mysql_thread_handler_dispatcher_run;
 
 extern PSI_cond_key key_GR_COND_applier_module_run,
     key_GR_COND_applier_module_suspend,
@@ -162,7 +165,9 @@
     key_GR_COND_write_lock_protection,
     key_GR_COND_primary_promotion_policy,
     key_GR_COND_mysql_thread_run,
-    key_GR_COND_mysql_thread_dispatcher_run;
+    key_GR_COND_mysql_thread_dispatcher_run,
+    key_GR_COND_mysql_thread_handler_run,
+    key_GR_COND_mysql_thread_handler_dispatcher_run;
 
 extern PSI_thread_key key_GR_THD_applier_module_receiver,
     key_GR_THD_autorejoin,
@@ -176,7 +181,8 @@
     key_GR_THD_group_partition_handler,
     key_GR_THD_recovery,
     key_GR_THD_message_service_handler,
-    key_GR_THD_mysql_thread;
+    key_GR_THD_mysql_thread,
+    key_GR_THD_mysql_thread_handler;
 
 extern PSI_rwlock_key key_GR_RWLOCK_cert_stable_gtid_set,
     key_GR_RWLOCK_channel_observation_list,
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/include/plugin_variables.h mysql-8.0-8.0.27/plugin/group_replication/include/plugin_variables.h
--- mysql-8.0-8.0.26/plugin/group_replication/include/plugin_variables.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/include/plugin_variables.h	2021-09-28 11:46:34.000000000 +0000
@@ -63,8 +63,12 @@
   bool server_shutdown_status;
   bool wait_on_engine_initialization;
   int write_set_extraction_algorithm;
-  bool abort_wait_on_start_process;
+  enum_wait_on_start_process_result wait_on_start_process;
   bool recovery_timeout_issue_on_stop;
+  // The first argument indicates whether or not to use the value stored in this
+  // pair's second argument for the group_replication_paxos_single_leader sysvar
+  // or the actual value that's stored on the sysvar
+  std::pair<bool, bool> allow_single_leader_latch{false, true};
 
   // (60min / 5min) * 24 * 7, i.e. a week.
   const uint MAX_AUTOREJOIN_TRIES = 2016;
@@ -102,7 +106,8 @@
     server_shutdown_status = false;
     wait_on_engine_initialization = false;
     write_set_extraction_algorithm = HASH_ALGORITHM_OFF;
-    abort_wait_on_start_process = false;
+    wait_on_start_process = WAIT_ON_START_PROCESS_SUCCESS;
+    allow_single_leader_latch.first = false;
     recovery_timeout_issue_on_stop = false;
     // the default is 5 minutes (300 secs).
     rejoin_timeout = 300ULL;
@@ -281,6 +286,15 @@
   ulong tls_source_var;
 
   char *view_change_uuid_var;
+
+  const char *communication_stack_source_values[3] = {"XCOM", "MYSQL",
+                                                      (char *)nullptr};
+  TYPELIB communication_stack_values_typelib_t = {
+      2, "communication_stack_typelib_t", communication_stack_source_values,
+      nullptr};
+  ulong communication_stack_var;
+
+  bool allow_single_leader_var{false};
 };
 
 #endif /* PLUGIN_VARIABLES_INCLUDE */
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/include/ps_information.h mysql-8.0-8.0.27/plugin/group_replication/include/ps_information.h
--- mysql-8.0-8.0.26/plugin/group_replication/include/ps_information.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/include/ps_information.h	2021-09-28 11:46:34.000000000 +0000
@@ -33,7 +33,7 @@
 bool get_group_members_info(
     uint index, const GROUP_REPLICATION_GROUP_MEMBERS_CALLBACKS &callbacks,
     Group_member_info_manager_interface *group_member_manager,
-    char *channel_name);
+    Gcs_operations *gcs_module, char *channel_name);
 
 bool get_group_member_stats(
     uint index, const GROUP_REPLICATION_GROUP_MEMBER_STATS_CALLBACKS &callbacks,
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/include/replication_threads_api.h mysql-8.0-8.0.27/plugin/group_replication/include/replication_threads_api.h
--- mysql-8.0-8.0.26/plugin/group_replication/include/replication_threads_api.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/include/replication_threads_api.h	2021-09-28 11:46:34.000000000 +0000
@@ -356,6 +356,19 @@
                                const char *channel_name = nullptr);
 
   /**
+      Method to get the network namespace configured for a channel
+
+      @param[out] net_ns      The network namespace to extract
+      @param[in]  channel_name  The name of the channel to get the information.
+
+      @return the operation status
+        @retval false   OK
+        @retval true    Error, channel not found
+    */
+  bool get_channel_network_namespace(std::string &net_ns,
+                                     const char *channel_name = nullptr);
+
+  /**
     Checks if any channel uses the same UUID for
     assign_gtids_to_anonymous_transactions as the given uuid
 
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/include/services/get_system_variable/get_system_variable.h mysql-8.0-8.0.27/plugin/group_replication/include/services/get_system_variable/get_system_variable.h
--- mysql-8.0-8.0.26/plugin/group_replication/include/services/get_system_variable/get_system_variable.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/include/services/get_system_variable/get_system_variable.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,125 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef GR_GET_SYSTEM_VARIABLE
+#define GR_GET_SYSTEM_VARIABLE
+
+#include <mysql/components/services/component_sys_var_service.h>
+#include <mysql/components/services/registry.h>
+#include <string>
+#include "plugin/group_replication/include/thread/mysql_thread.h"
+
+class Get_system_variable_parameters : public Mysql_thread_body_parameters {
+ public:
+  enum System_variable_service { VAR_GTID_EXECUTED, VAR_GTID_PURGED };
+
+  Get_system_variable_parameters(System_variable_service service)
+      : m_result(""), m_service(service), m_error(1){};
+  virtual ~Get_system_variable_parameters(){};
+
+  /**
+    Get value for class private member error.
+
+    @return the error value returned
+    @retval 0      OK
+    @retval !=0    Error
+    */
+  int get_error();
+
+  /**
+    Set value for class private member error.
+
+    @param [in] error Set value of error
+    */
+  void set_error(int error);
+
+  /**
+    Set value for class private member service.
+
+    @return System defined to run
+    */
+  Get_system_variable_parameters::System_variable_service get_service();
+
+  // to avoid multiple copies on get and set methods we define it as public
+  std::string m_result{""};
+
+ private:
+  System_variable_service m_service{System_variable_service::VAR_GTID_EXECUTED};
+  // error returned by service executed
+  int m_error{1};
+};
+
+class Get_system_variable : Mysql_thread_body {
+ public:
+  Get_system_variable();
+
+  virtual ~Get_system_variable();
+
+  /**
+    Method to return the server gtid_executed by executing the get_variables
+    component service.
+
+    @param [out] gtid_executed The string where the result will be appended
+
+    @return the error value returned
+    @retval 0      OK
+    @retval !=0    Error
+    */
+  int get_server_gtid_executed(std::string &gtid_executed);
+
+  /**
+    Method to return the server gtid_purged by executing the get_variables
+    component service.
+
+    @param [out] gtid_purged The string where the result will be appended
+
+    @return the error value returned
+    @retval 0      OK
+    @retval !=0    Error
+    */
+  int get_server_gtid_purged(std::string &gtid_purged);
+
+  /**
+    Method that will be run on mysql_thread.
+
+    @param [in, out] parameters Values used by method to get service variable.
+
+    */
+  void run(Mysql_thread_body_parameters *parameters);
+
+ private:
+  /**
+    Method to return the server system variable specified on variable.
+
+    @param [in]  variable The system variable name to be retrieved
+    @param [out] value    The string where the result will be set
+
+    @return the error value returned
+    @retval 0      OK
+    @retval !=0    Error
+    */
+  int internal_get_system_variable(std::string variable, std::string &value);
+
+  my_h_service component_sys_variable_register_service_handler{nullptr};
+};
+
+#endif  // GR_GET_SYSTEM_VARIABLE
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/include/services/status_service/status_service.h mysql-8.0-8.0.27/plugin/group_replication/include/services/status_service/status_service.h
--- mysql-8.0-8.0.26/plugin/group_replication/include/services/status_service/status_service.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/include/services/status_service/status_service.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,42 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef GR_STATUS_SERVICE_H
+#define GR_STATUS_SERVICE_H
+
+namespace gr {
+namespace status_service {
+
+/**
+  Register status service.
+*/
+bool register_gr_status_service();
+
+/**
+  Unregister status service.
+*/
+bool unregister_gr_status_service();
+
+}  // namespace status_service
+}  // namespace gr
+
+#endif /* GR_STATUS_SERVICE_H */
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/include/sql_service/sql_service_command.h mysql-8.0-8.0.27/plugin/group_replication/include/sql_service/sql_service_command.h
--- mysql-8.0-8.0.26/plugin/group_replication/include/sql_service/sql_service_command.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/include/sql_service/sql_service_command.h	2021-09-28 11:46:34.000000000 +0000
@@ -108,34 +108,6 @@
                                      void *arg = nullptr);
 
   /**
-    Method to return the server gtid_executed by executing the corresponding
-    sql query.
-
-    @param sql_interface        the server session interface for query execution
-    @param [out] gtid_executed  The string where the result will be appended
-
-    @return the error value returned
-      @retval 0      OK
-      @retval !=0    Error
-  */
-  long internal_get_server_gtid_executed(Sql_service_interface *sql_interface,
-                                         void *gtid_executed);
-
-  /**
-    Method to return the server gtid_purged by executing the corresponding
-    sql query.
-
-    @param sql_interface        the server session interface for query execution
-    @param [out] gtid_purged    The string where the result will be appended
-
-    @return the error value returned
-      @retval 0      OK
-      @retval !=0    Error
-  */
-  long internal_get_server_gtid_purged(Sql_service_interface *sql_interface,
-                                       void *gtid_purged);
-
-  /**
     Method to wait for the server gtid_executed to match the given GTID string
 
     @param sql_interface the server session interface for query execution
@@ -442,30 +414,6 @@
   long reset_read_only();
 
   /**
-    Method to return the server gtid_executed by executing the corresponding
-    sql query.
-
-    @param [out] gtid_executed The string where the result will be appended
-
-    @return the error value returned
-      @retval 0      OK
-      @retval !=0    Error
-  */
-  int get_server_gtid_executed(std::string &gtid_executed);
-
-  /**
-    Method to return the server gtid_purged by executing the corresponding
-    sql query.
-
-    @param [out] gtid_purged The string where the result will be appended
-
-    @return the error value returned
-      @retval 0      OK
-      @retval !=0    Error
-  */
-  int get_server_gtid_purged(std::string &gtid_purged);
-
-  /**
     Method to wait for the server gtid_executed to match the given GTID string
 
     @param [in] gtid_executed  The GTID string to check
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/include/thread/mysql_thread.h mysql-8.0-8.0.27/plugin/group_replication/include/thread/mysql_thread.h
--- mysql-8.0-8.0.26/plugin/group_replication/include/thread/mysql_thread.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/include/thread/mysql_thread.h	2021-09-28 11:46:34.000000000 +0000
@@ -50,6 +50,27 @@
   virtual void run(Mysql_thread_body_parameters *parameters) = 0;
 };
 
+class Mysql_thread_task {
+ public:
+  Mysql_thread_task(Mysql_thread_body *body,
+                    Mysql_thread_body_parameters *parameters)
+      : m_body(body), m_parameters(parameters){};
+  virtual ~Mysql_thread_task() {
+    delete m_parameters;
+    m_parameters = nullptr;
+  };
+
+  /**
+    Execute task, calling body function with parameters
+    */
+  void execute();
+
+ private:
+  // cannot be deleted, represent class where method will run
+  Mysql_thread_body *m_body{nullptr};
+  Mysql_thread_body_parameters *m_parameters{nullptr};
+};
+
 /**
   @class Mysql_thread
 
@@ -60,7 +81,9 @@
   /**
     Mysql_thread constructor
   */
-  Mysql_thread(Mysql_thread_body *body);
+  Mysql_thread(PSI_thread_key thread_key, PSI_mutex_key run_mutex_key,
+               PSI_cond_key run_cond_key, PSI_mutex_key dispatcher_mutex_key,
+               PSI_cond_key dispatcher_cond_key);
   virtual ~Mysql_thread();
 
   /**
@@ -95,9 +118,15 @@
       @retval false  Successful
       @retval true   Error
   */
-  bool trigger(Mysql_thread_body_parameters *parameters);
+  bool trigger(Mysql_thread_task *task);
 
  private:
+  PSI_thread_key m_thread_key;
+  PSI_mutex_key m_mutex_key;
+  PSI_cond_key m_cond_key;
+  PSI_mutex_key m_dispatcher_mutex_key;
+  PSI_cond_key m_dispatcher_cond_key;
+
   THD *m_thd{nullptr};
   my_thread_handle m_pthd;
   mysql_mutex_t m_run_lock;
@@ -109,9 +138,7 @@
   mysql_cond_t m_dispatcher_cond;
   bool m_trigger_run_complete{false};
 
-  Mysql_thread_body *m_body{nullptr};
-  Abortable_synchronized_queue<Mysql_thread_body_parameters *> *m_trigger_queue{
-      nullptr};
+  Abortable_synchronized_queue<Mysql_thread_task *> *m_trigger_queue{nullptr};
 };
 
 #endif /* MYSQL_THREAD_INCLUDE */
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/cmake/add_version_suffix.cmake mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/cmake/add_version_suffix.cmake
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/cmake/add_version_suffix.cmake	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/cmake/add_version_suffix.cmake	2021-09-28 11:46:34.000000000 +0000
@@ -91,7 +91,7 @@
 	ENDIF()
   ELSE()
 	# Output saved lines when we see "return TRUE"
-	STRING(REGEX MATCH "return TRUE" xxx "${line}")
+	STRING(REGEX MATCH "return \\(*TRUE" xxx "${line}")
 	IF(xxx)
 	  IF(code)
 		FILE(APPEND ${x_gen_c} "/* BEGIN protocol conversion code */${code}\n/* END protocol conversion code */\n")
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/cmake/gcs_profile.in mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/cmake/gcs_profile.in
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/cmake/gcs_profile.in	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/cmake/gcs_profile.in	2021-09-28 11:46:34.000000000 +0000
@@ -63,8 +63,9 @@
   MAX_BATCH_SIZE = 0x3fffffff, /* Limit batch size to sensible ? amount */
   MAX_BATCH_APP_DATA = 5000,   /* Limit nr. of batched elements */
   MAX_DEAD = 10,
-  PROPOSERS = 10,         /* The number of proposers on one node */
-  MIN_CACHE_SIZE = 250000 /* Minimum cache size */
+  PROPOSERS = 10,              /* The number of proposers on one node */
+  MIN_CACHE_SIZE = 250000,     /* Minimum cache size */
+  DEFAULT_CACHE_LIMIT = 1000000000UL /* Reasonable initial cache limit */
 };
 
 /* How long to wait for snapshots when trying to find the best node to recover
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/cmake/rpcgen.cmake mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/cmake/rpcgen.cmake
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/cmake/rpcgen.cmake	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/cmake/rpcgen.cmake	2021-09-28 11:46:34.000000000 +0000
@@ -86,7 +86,7 @@
   SET(x_vanilla_h ${XCOM_BASEDIR}/${X}.h.gen)
   SET(x_vanilla_c ${XCOM_BASEDIR}/${X}_xdr.c.gen)
 
-  IF(WIN32)
+  IF(NOT LINUX)
     # on windows system's there is no rpcgen, thence copy
     # the files in the source directory
     ADD_CUSTOM_COMMAND(OUTPUT ${x_gen_h} ${x_gen_c}
@@ -124,7 +124,7 @@
       #
       COMMAND ${CMAKE_COMMAND} -E remove -f ${x_gen_h}
       COMMAND ${CMAKE_COMMAND} -E remove -f ${x_tmp_h}
-      COMMAND ${CMAKE_COMMAND} -DRPCGEN_EXECUTABLE=${RPCGEN_EXECUTABLE} -DXCOM_PROTO_VERS=108 -Dversion="" -Drpcgen_output=${x_tmp_h} -Dx_gen_h=${x_gen_h} -Dx_tmp_x_canonical_name=${x_tmp_x_canonical_name} -P ${enumfix}
+      COMMAND ${CMAKE_COMMAND} -DRPCGEN_EXECUTABLE=${RPCGEN_EXECUTABLE} -DXCOM_PROTO_VERS=109 -Dversion="" -Drpcgen_output=${x_tmp_h} -Dx_gen_h=${x_gen_h} -Dx_tmp_x_canonical_name=${x_tmp_x_canonical_name} -P ${enumfix}
 
       #
       # Generate xdr functions for all versions of the xdr protocol
@@ -145,14 +145,15 @@
       COMMAND ${CMAKE_COMMAND} -DRPCGEN_EXECUTABLE=${RPCGEN_EXECUTABLE} -DXCOM_PROTO_VERS=105 -Dversion="_1_5" -Drpcgen_output=${x_tmp_c} -Dx_gen_c=${x_gen_c} -Dx_tmp_x_canonical_name=${x_tmp_x_canonical_name} -P ${versionfix}
       COMMAND ${CMAKE_COMMAND} -DRPCGEN_EXECUTABLE=${RPCGEN_EXECUTABLE} -DXCOM_PROTO_VERS=106 -Dversion="_1_6" -Drpcgen_output=${x_tmp_c} -Dx_gen_c=${x_gen_c} -Dx_tmp_x_canonical_name=${x_tmp_x_canonical_name} -P ${versionfix}
       COMMAND ${CMAKE_COMMAND} -DRPCGEN_EXECUTABLE=${RPCGEN_EXECUTABLE} -DXCOM_PROTO_VERS=107 -Dversion="_1_7" -Drpcgen_output=${x_tmp_c} -Dx_gen_c=${x_gen_c} -Dx_tmp_x_canonical_name=${x_tmp_x_canonical_name} -P ${versionfix}
+      COMMAND ${CMAKE_COMMAND} -DRPCGEN_EXECUTABLE=${RPCGEN_EXECUTABLE} -DXCOM_PROTO_VERS=108 -Dversion="_1_8" -Drpcgen_output=${x_tmp_c} -Dx_gen_c=${x_gen_c} -Dx_tmp_x_canonical_name=${x_tmp_x_canonical_name} -P ${versionfix}
       #
       # The latest version is generated twice, once with the version suffix, and once without the suffix
       # To add a new version, change the two next lines so they correspond
       # to the latest version, and add a line for the previous version above
       # this comment block.
       #
-      COMMAND ${CMAKE_COMMAND} -DRPCGEN_EXECUTABLE=${RPCGEN_EXECUTABLE} -DXCOM_PROTO_VERS=108 -Dversion="_1_8" -Drpcgen_output=${x_tmp_c} -Dx_gen_c=${x_gen_c} -Dx_tmp_x_canonical_name=${x_tmp_x_canonical_name} -P ${versionfix}
-      COMMAND ${CMAKE_COMMAND} -DRPCGEN_EXECUTABLE=${RPCGEN_EXECUTABLE} -DXCOM_PROTO_VERS=108 -Dversion="" -Drpcgen_output=${x_tmp_c} -Dx_gen_c=${x_gen_c} -Dx_tmp_x_canonical_name=${x_tmp_x_canonical_name} -P ${versionfix}
+      COMMAND ${CMAKE_COMMAND} -DRPCGEN_EXECUTABLE=${RPCGEN_EXECUTABLE} -DXCOM_PROTO_VERS=109 -Dversion="_1_9" -Drpcgen_output=${x_tmp_c} -Dx_gen_c=${x_gen_c} -Dx_tmp_x_canonical_name=${x_tmp_x_canonical_name} -P ${versionfix}
+      COMMAND ${CMAKE_COMMAND} -DRPCGEN_EXECUTABLE=${RPCGEN_EXECUTABLE} -DXCOM_PROTO_VERS=109 -Dversion="" -Drpcgen_output=${x_tmp_c} -Dx_gen_c=${x_gen_c} -Dx_tmp_x_canonical_name=${x_tmp_x_canonical_name} -P ${versionfix}
       WORKING_DIRECTORY ${gen_xdr_dir}
 
       DEPENDS
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/CMakeLists.txt mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/CMakeLists.txt
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -76,7 +76,6 @@
   src/bindings/xcom/xcom/xcom_statistics.cc
   src/bindings/xcom/xcom/app_data.cc
   src/bindings/xcom/xcom/site_def.cc
-  src/bindings/xcom/xcom/xcom_ssl_transport.cc
   src/bindings/xcom/xcom/xcom_recover.cc
   src/bindings/xcom/xcom/task.cc
   src/bindings/xcom/xcom/bitset.cc
@@ -93,6 +92,11 @@
   src/bindings/xcom/xcom/get_synode_app_data.cc
   src/bindings/xcom/xcom/checked_data.cc
   src/bindings/xcom/xcom/xdr_checked_data.c
+  src/bindings/xcom/xcom/network/network_provider_manager.cc
+  src/bindings/xcom/xcom/network/xcom_network_provider.cc
+  src/bindings/xcom/xcom/network/xcom_network_provider_native_lib.cc
+  src/bindings/xcom/xcom/network/xcom_network_provider_ssl_native_lib.cc
+  src/bindings/xcom/xcom/leader_info_data.cc
   ${XCOM_SUNRPC_SOURCES}
   ${XCOM_RPCGEN_SOURCES})
 
@@ -188,14 +192,14 @@
   ENDIF()
 ENDIF()
 
-ADD_COMPILE_DEFINITIONS(
+MY_ADD_COMPILE_DEFINITIONS(
   ${XCOM_SOURCES}
   ${GCS_SOURCES}
   COMPILE_DEFINITIONS MYSQL_DYNAMIC_PLUGIN)
 
 INCLUDE_DIRECTORIES(${BUNDLED_LZ4_PATH})
 
-ADD_COMPILE_DEFINITIONS(${BUNDLED_LZ4_PATH}/xxhash.c
+MY_ADD_COMPILE_DEFINITIONS(${BUNDLED_LZ4_PATH}/xxhash.c
   COMPILE_DEFINITIONS "XXH_NAMESPACE=GCS_")
 
 # Warn about variable shadowing
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_communication_interface.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_communication_interface.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_communication_interface.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_communication_interface.h	2021-09-28 11:46:34.000000000 +0000
@@ -29,6 +29,8 @@
 #include "plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_message.h"
 #include "plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_types.h"
 
+#include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/include/network_provider.h"
+
 /**
   @class Gcs_communication_interface
 
@@ -169,6 +171,20 @@
   virtual Gcs_protocol_version get_maximum_supported_protocol_version()
       const = 0;
 
+  /**
+   * @brief Sets the communication protocol to use
+   *
+   * @param protocol the protocol to use
+   */
+  virtual void set_communication_protocol(enum_transport_protocol protocol) = 0;
+
+  /**
+   * @brief Get the incoming connections protocol which is currently active
+   *
+   * @return GcsRunningProtocol
+   */
+  virtual enum_transport_protocol get_incoming_connections_protocol() = 0;
+
   virtual ~Gcs_communication_interface() = default;
 };
 
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_group_management_interface.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_group_management_interface.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_group_management_interface.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_group_management_interface.h	2021-09-28 11:46:34.000000000 +0000
@@ -23,6 +23,7 @@
 #ifndef GCS_GROUP_MANAGEMENT_INTERFACE_INCLUDED
 #define GCS_GROUP_MANAGEMENT_INTERFACE_INCLUDED
 
+#include "plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_member_identifier.h"
 #include "plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_types.h"
 
 class Gcs_group_management_interface {
@@ -85,6 +86,45 @@
   virtual enum_gcs_error set_write_concurrency(uint32_t write_concurrency) = 0;
 
   virtual ~Gcs_group_management_interface() = default;
+
+  /**
+   * @brief Reconfigures the group's "consensus leaders."
+   *
+   * Instructs the underlying GCS to use @c leader as the single preferred
+   * consensus leader.
+   *
+   * @param leader The member you desire to act as a consensus leader.
+   *
+   * @retval GCS_OK if successful
+   * @retval GCS_NOK if unsuccessful
+   */
+  virtual enum_gcs_error set_single_leader(
+      Gcs_member_identifier const &leader) = 0;
+
+  /**
+   * @brief Reconfigures the group's "consensus leaders."
+   *
+   * Instructs the underlying GCS to use every member as a consensus leader.
+   *
+   * @retval GCS_OK if successful
+   * @retval GCS_NOK if unsuccessful
+   */
+  virtual enum_gcs_error set_everyone_leader() = 0;
+
+  /**
+   * @brief Inspect the group's "consensus leader" configuration.
+   *
+   * @param[out] preferred_leaders The members specified as preferred leaders.
+   * @param[out] actual_leaders The members actually carrying out the leader
+   * role at this moment.
+   *
+   * @retval GCS_OK if successful, @c preferred_leaders and @c actual_leaders
+   * contain the result
+   * @retval GCS_NOK if unsuccessful
+   */
+  virtual enum_gcs_error get_leaders(
+      std::vector<Gcs_member_identifier> &preferred_leaders,
+      std::vector<Gcs_member_identifier> &actual_leaders) = 0;
 };
 
 #endif  // GCS_GROUP_MANAGEMENT_INTERFACE_INCLUDED
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_interface.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_interface.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_interface.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_interface.h	2021-09-28 11:46:34.000000000 +0000
@@ -33,6 +33,25 @@
 #include "plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_statistics_interface.h"
 
 /**
+ * @brief Runtime external resources that should be provided to an instance of
+ * Gcs_interface
+ *
+ */
+struct Gcs_interface_runtime_requirements {
+  /**
+   * @brief External network provider, if needed.
+   *
+   */
+  std::shared_ptr<Network_provider> provider;
+
+  /**
+   * @brief Provider of Network Namespace services
+   *
+   */
+  Network_namespace_manager *namespace_manager;
+};
+
+/**
   @class Gcs_interface
 
   This interface must be implemented by all specific binding implementations
@@ -189,6 +208,24 @@
   */
   virtual enum_gcs_error set_logger(Logger_interface *logger) = 0;
 
+  /**
+   * @brief Set the up runtime resources
+   *
+   * @param reqs a Gcs_interface_runtime_requirements filled with all the
+   * requirements
+   */
+  virtual enum_gcs_error setup_runtime_resources(
+      Gcs_interface_runtime_requirements &reqs) = 0;
+
+  /**
+   * @brief Does the necessary cleanup for runtime resources
+   *
+   * @param reqs a Gcs_interface_runtime_requirements filled with all the
+   * requirements and their references
+   */
+  virtual enum_gcs_error cleanup_runtime_resources(
+      Gcs_interface_runtime_requirements &reqs) = 0;
+
   virtual ~Gcs_interface() = default;
 };
 
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_psi.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_psi.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_psi.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_psi.h	2021-09-28 11:46:34.000000000 +0000
@@ -54,7 +54,8 @@
 extern PSI_thread_key key_GCS_THD_Gcs_ext_logger_impl_m_consumer,
     key_GCS_THD_Gcs_xcom_engine_m_engine_thread,
     key_GCS_THD_Gcs_xcom_control_m_xcom_thread,
-    key_GCS_THD_Gcs_xcom_control_m_suspicions_processing_thread;
+    key_GCS_THD_Gcs_xcom_control_m_suspicions_processing_thread,
+    key_GCS_THD_Gcs_xcom_network_provider_m_network_provider_tcp_server;
 
 extern PSI_memory_key key_MEM_XCOM_xcom_cache;
 
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_types.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_types.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_types.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_types.h	2021-09-28 11:46:34.000000000 +0000
@@ -129,10 +129,10 @@
   UNKNOWN = 0,
   V1 = 1,
   V2 = 2,
+  V3 = 3,
   /* Define the highest known version. */
-  HIGHEST_KNOWN = V2,
+  HIGHEST_KNOWN = V3,
   /* Currently used in test cases. */
-  V3 = 3,
   V4 = 4,
   V5 = 5,
   /*
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_internal_message.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_internal_message.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_internal_message.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_internal_message.cc	2021-09-28 11:46:34.000000000 +0000
@@ -36,7 +36,8 @@
       m_serialized_payload_offset(0),
       m_serialized_payload_size(0),
       m_serialized_stage_metadata_size(0),
-      m_delivery_synode() {}
+      m_delivery_synode(),
+      m_origin_synode() {}
 
 std::pair<bool, Gcs_packet> Gcs_packet::make_outgoing_packet(
     Cargo_type const &cargo, Gcs_protocol_version const &current_version,
@@ -75,7 +76,8 @@
       m_serialized_payload_offset(0),
       m_serialized_payload_size(0),
       m_serialized_stage_metadata_size(0),
-      m_delivery_synode() {
+      m_delivery_synode(),
+      m_origin_synode() {
   auto const nr_stages = m_dynamic_headers.size();
   assert(nr_stages == m_stage_metadata.size());
 
@@ -124,7 +126,8 @@
       m_serialized_payload_offset(0),
       m_serialized_payload_size(new_payload_size),
       m_serialized_stage_metadata_size(0),
-      m_delivery_synode(original_packet.get_delivery_synode()) {
+      m_delivery_synode(original_packet.get_delivery_synode()),
+      m_origin_synode(original_packet.get_origin_synode()) {
   /* Copy the stage metadata. */
   for (auto const &original_metadata : original_packet.get_stage_metadata()) {
     auto metadata = original_metadata->clone();
@@ -138,15 +141,17 @@
 
 Gcs_packet Gcs_packet::make_incoming_packet(
     buffer_ptr &&buffer, unsigned long long buffer_size,
-    synode_no const &synode, Gcs_message_pipeline const &pipeline) {
-  Gcs_packet packet(synode);
+    synode_no const &delivery_synode, synode_no const &origin_synode,
+    Gcs_message_pipeline const &pipeline) {
+  Gcs_packet packet(delivery_synode, origin_synode);
 
   packet.deserialize(std::move(buffer), buffer_size, pipeline);
 
   return packet;
 }
 
-Gcs_packet::Gcs_packet(synode_no const &synode)
+Gcs_packet::Gcs_packet(synode_no const &delivery_synode,
+                       synode_no const &origin_synode)
     : m_fixed_header(),
       m_dynamic_headers(),
       m_stage_metadata(),
@@ -156,7 +161,8 @@
       m_serialized_payload_offset(0),
       m_serialized_payload_size(0),
       m_serialized_stage_metadata_size(0),
-      m_delivery_synode(synode) {}
+      m_delivery_synode(delivery_synode),
+      m_origin_synode(origin_synode) {}
 
 Gcs_packet::Gcs_packet(Gcs_packet &&packet) noexcept
     : m_fixed_header(std::move(packet.m_fixed_header)),
@@ -170,7 +176,8 @@
       m_serialized_payload_size(std::move(packet.m_serialized_payload_size)),
       m_serialized_stage_metadata_size(
           std::move(packet.m_serialized_stage_metadata_size)),
-      m_delivery_synode(std::move(packet.m_delivery_synode)) {
+      m_delivery_synode(std::move(packet.m_delivery_synode)),
+      m_origin_synode(std::move(packet.m_origin_synode)) {
   packet.m_fixed_header = Gcs_internal_message_header();
   packet.m_next_stage_index = 0;
   packet.m_serialized_packet_size = 0;
@@ -191,6 +198,7 @@
   m_serialized_stage_metadata_size =
       std::move(packet.m_serialized_stage_metadata_size);
   m_delivery_synode = std::move(packet.m_delivery_synode);
+  m_origin_synode = std::move(packet.m_origin_synode);
 
   packet.m_fixed_header = Gcs_internal_message_header();
   packet.m_next_stage_index = 0;
@@ -378,3 +386,7 @@
 Gcs_xcom_synode const &Gcs_packet::get_delivery_synode() const {
   return m_delivery_synode;
 }
+
+Gcs_xcom_synode const &Gcs_packet::get_origin_synode() const {
+  return m_origin_synode;
+}
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_internal_message.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_internal_message.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_internal_message.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_internal_message.h	2021-09-28 11:46:34.000000000 +0000
@@ -118,6 +118,11 @@
    */
   Gcs_xcom_synode m_delivery_synode;
 
+  /**
+   The XCom synode in which this packet was delivered.
+   */
+  Gcs_xcom_synode m_origin_synode;
+
  public:
   /**
    This factory method is to be used when sending a packet.
@@ -162,13 +167,15 @@
 
    @param buffer Buffer with a serialized packet
    @param buffer_size Size of the buffer
-   @param synode The XCom synode where the packet was decided on
+   @param delivery_synode The XCom synode where the packet was decided on
+   @param origin_synode The XCom synode that identifies the origin of the packet
    @param pipeline The message pipeline
    @returns A packet initialized from the buffer
    */
   static Gcs_packet make_incoming_packet(buffer_ptr &&buffer,
                                          unsigned long long buffer_size,
-                                         synode_no const &synode,
+                                         synode_no const &delivery_synode,
+                                         synode_no const &origin_synode,
                                          Gcs_message_pipeline const &pipeline);
 
   Gcs_packet() noexcept;
@@ -261,6 +268,8 @@
 
   Gcs_xcom_synode const &get_delivery_synode() const;
 
+  Gcs_xcom_synode const &get_origin_synode() const;
+
  private:
   /**
    Constructor called by @c make_to_send.
@@ -291,9 +300,12 @@
   /**
    Constructor called by @c make_from_serialized_buffer.
 
-   @param synode The XCom synode where the packet was decided on
+   @param delivery_synode The XCom synode where the packet was decided on
+   @param origin_synode The XCom synode that identifieis the origin of this
+                        packet
    */
-  explicit Gcs_packet(synode_no const &synode);
+  explicit Gcs_packet(synode_no const &delivery_synode,
+                      synode_no const &origin_synode);
 
   /**
    Allocates the underlying buffer where the packet will be serialized to using
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_internal_message_headers.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_internal_message_headers.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_internal_message_headers.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_internal_message_headers.h	2021-09-28 11:46:34.000000000 +0000
@@ -91,11 +91,21 @@
   ST_SPLIT_V2 = 3,
 
   /*
+   This type represents the compression stage v2.
+   */
+  ST_LZ4_V3 = 4,
+
+  /*
+     This type represents the split stage v2.
+   */
+  ST_SPLIT_V3 = 5,
+
+  /*
    No valid state codes can appear after this one. If a stage code is to
    be added, this value needs to be incremented and the lowest type code
    available be assigned to the new stage.
    */
-  ST_MAX_STAGES = 4
+  ST_MAX_STAGES = 6
 };
 
 /**
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_lz4.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_lz4.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_lz4.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_lz4.h	2021-09-28 11:46:34.000000000 +0000
@@ -137,4 +137,31 @@
    */
   Stage_code get_stage_code() const override { return Stage_code::ST_LZ4_V2; }
 };
+
+class Gcs_message_stage_lz4_v3 : public Gcs_message_stage_lz4 {
+ public:
+  /**
+   Creates an instance of the stage with the default threshold in bytes.
+   */
+  explicit Gcs_message_stage_lz4_v3() : Gcs_message_stage_lz4() {}
+
+  /**
+   Creates an instance of the stage with the given threshold in bytes.
+
+   @param enabled enables this message stage
+   @param compress_threshold messages with the payload larger
+   than compress_threshold in bytes are compressed.
+   */
+  explicit Gcs_message_stage_lz4_v3(bool enabled,
+                                    unsigned long long compress_threshold)
+      : Gcs_message_stage_lz4(enabled, compress_threshold) {}
+
+  ~Gcs_message_stage_lz4_v3() override {}
+
+  /*
+   Return the stage code.
+   */
+  Stage_code get_stage_code() const override { return Stage_code::ST_LZ4_V3; }
+};
+
 #endif /* GCS_MESSAGE_STAGE_LZ4_H */
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.h	2021-09-28 11:46:34.000000000 +0000
@@ -418,4 +418,25 @@
       Gcs_packets_list &fragments) const;
 };
 
+class Gcs_message_stage_split_v3 : public Gcs_message_stage_split_v2 {
+ public:
+  /**
+   Creates an instance of the stage.
+
+   @param enabled enables this message stage
+   @param split_threshold messages with the payload larger
+                          than split_threshold in bytes are split.
+   */
+  explicit Gcs_message_stage_split_v3(bool enabled,
+                                      unsigned long long split_threshold)
+      : Gcs_message_stage_split_v2(enabled, split_threshold) {}
+
+  ~Gcs_message_stage_split_v3() override {}
+
+  /**
+   Return the stage code.
+   */
+  Stage_code get_stage_code() const override { return Stage_code::ST_SPLIT_V3; }
+};
+
 #endif /* GCS_MESSAGE_STAGE_SPLIT_H */
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_communication_interface.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_communication_interface.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_communication_interface.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_communication_interface.cc	2021-09-28 11:46:34.000000000 +0000
@@ -58,7 +58,8 @@
 Gcs_xcom_communication::Gcs_xcom_communication(
     Gcs_xcom_statistics_updater *stats, Gcs_xcom_proxy *proxy,
     Gcs_xcom_view_change_control_interface *view_control,
-    Gcs_xcom_engine *gcs_engine, Gcs_group_identifier const &group_id)
+    Gcs_xcom_engine *gcs_engine, Gcs_group_identifier const &group_id,
+    std::unique_ptr<Network_provider_management_interface> comms_mgmt)
     : event_listeners(),
       stats(stats),
       m_xcom_proxy(proxy),
@@ -67,7 +68,8 @@
       m_buffered_packets(),
       m_xcom_nodes(),
       m_gid_hash(),
-      m_protocol_changer(*gcs_engine, m_msg_pipeline) {
+      m_protocol_changer(*gcs_engine, m_msg_pipeline),
+      m_comms_mgmt_interface(std::move(comms_mgmt)) {
   const void *id_str = group_id.get_group_id().c_str();
   m_gid_hash = Gcs_xcom_utils::mhash(static_cast<const unsigned char *>(id_str),
                                      group_id.get_group_id().size());
@@ -307,7 +309,8 @@
   std::memcpy(data.get(), recovered_data.data.data_val, data_len);
   // Create the packet.
   packet = Gcs_packet::make_incoming_packet(
-      std::move(data), data_len, recovered_data.synode, m_msg_pipeline);
+      std::move(data), data_len, recovered_data.synode, recovered_data.origin,
+      m_msg_pipeline);
 
   /*
    The packet should always be a user data packet, but rather than asserting
@@ -526,7 +529,7 @@
     /* purecov: end */
   }
   // Get packet origin.
-  packet_synode = packet_in.get_delivery_synode();
+  packet_synode = packet_in.get_origin_synode();
   node = xcom_nodes->get_node(packet_synode.get_synod().node);
   origin = Gcs_member_identifier(node->get_member_id());
   intf = static_cast<Gcs_xcom_interface *>(Gcs_xcom_interface::get_interface());
@@ -632,3 +635,13 @@
     Gcs_protocol_version version) {
   return m_protocol_changer.set_maximum_supported_protocol_version(version);
 }
+
+void Gcs_xcom_communication::set_communication_protocol(
+    enum_transport_protocol protocol) {
+  m_comms_mgmt_interface->set_running_protocol(protocol);
+}
+
+enum_transport_protocol
+Gcs_xcom_communication::get_incoming_connections_protocol() {
+  return m_comms_mgmt_interface->get_incoming_connections_protocol();
+}
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_communication_interface.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_communication_interface.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_communication_interface.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_communication_interface.h	2021-09-28 11:46:34.000000000 +0000
@@ -40,6 +40,8 @@
 #include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_state_exchange.h"
 #include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_statistics_interface.h"
 
+#include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/include/network_management_interface.h"
+
 /**
   @class Gcs_xcom_communication_interface
 
@@ -212,12 +214,15 @@
     gcs_xcom_view_change_control_interface implementation
     @param[in] gcs_engine Pointer to gcs engine
     @param[in] group_id reference to the group identifier
+    @param[in] comms_mgmt an unique_ptr to a
+                          Network_provider_management_interface
   */
 
   explicit Gcs_xcom_communication(
       Gcs_xcom_statistics_updater *stats, Gcs_xcom_proxy *proxy,
       Gcs_xcom_view_change_control_interface *view_control,
-      Gcs_xcom_engine *gcs_engine, Gcs_group_identifier const &group_id);
+      Gcs_xcom_engine *gcs_engine, Gcs_group_identifier const &group_id,
+      std::unique_ptr<Network_provider_management_interface> comms_mgmt);
 
   ~Gcs_xcom_communication() override;
 
@@ -289,6 +294,10 @@
 
   void set_maximum_supported_protocol_version(Gcs_protocol_version version);
 
+  void set_communication_protocol(enum_transport_protocol protocol) override;
+
+  enum_transport_protocol get_incoming_connections_protocol() override;
+
  private:
   // Registered event listeners
   std::map<int, const Gcs_communication_event_listener &> event_listeners;
@@ -324,6 +333,9 @@
   /** Protocol changer. */
   Gcs_xcom_communication_protocol_changer m_protocol_changer;
 
+  /***/
+  std::unique_ptr<Network_provider_management_interface> m_comms_mgmt_interface;
+
   /** Notify upper layers that a message has been received. */
   void notify_received_message(std::unique_ptr<Gcs_message> &&message);
 
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_communication_protocol_changer.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_communication_protocol_changer.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_communication_protocol_changer.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_communication_protocol_changer.cc	2021-09-28 11:46:34.000000000 +0000
@@ -298,7 +298,7 @@
   assert(packet.get_cargo_type() != Cargo_type::CT_INTERNAL_STATE_EXCHANGE);
 
   /* Get the packet's origin. */
-  auto node_id = packet.get_delivery_synode().get_synod().node;
+  auto node_id = packet.get_origin_synode().get_synod().node;
   auto const *node = xcom_nodes.get_node(node_id);
   Gcs_member_identifier origin(node->get_member_id());
 
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_control_interface.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_control_interface.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_control_interface.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_control_interface.cc	2021-09-28 11:46:34.000000000 +0000
@@ -123,7 +123,9 @@
     Gcs_xcom_engine *gcs_engine,
     Gcs_xcom_state_exchange_interface *state_exchange,
     Gcs_xcom_view_change_control_interface *view_control, bool boot,
-    My_xp_socket_util *socket_util)
+    My_xp_socket_util *socket_util,
+    std::unique_ptr<Network_provider_operations_interface>
+        comms_operation_interface)
     : m_gid(nullptr),
       m_gid_hash(0),
       m_xcom_proxy(xcom_proxy),
@@ -139,6 +141,7 @@
       m_suspicions_manager(new Gcs_suspicions_manager(xcom_proxy, this)),
       m_suspicions_processing_thread(),
       m_sock_probe_interface(nullptr),
+      m_comms_operation_interface(std::move(comms_operation_interface)),
       m_xcom_running(false),
       m_leave_view_requested(false),
       m_leave_view_delivered(false),
@@ -287,7 +290,7 @@
     return GCS_NOK;
   }
 
-  while (ret == GCS_NOK) {
+  while (ret == GCS_NOK && !m_view_control->is_finalized()) {
     ret = retry_do_join();
 
     retry_join_count--;
@@ -358,7 +361,6 @@
     MYSQL_GCS_LOG_ERROR("Error initializing the group communication engine.")
     goto err;
   }
-
   // Wait for XCom comms to become ready
   m_xcom_proxy->xcom_wait_for_xcom_comms_status_change(comm_status);
 
@@ -400,8 +402,11 @@
       m_local_node_address->get_member_ip(),
       m_local_node_address->get_member_port());
   if (!could_connect_to_local_xcom) {
-    MYSQL_GCS_LOG_ERROR("Error connecting to the local group communication"
+    MYSQL_GCS_LOG_ERROR("Error testing to the local group communication"
                         << " engine instance.")
+    MYSQL_GCS_LOG_DEBUG(
+        "Error testing the connection to the local group communication engine "
+        "instance.")
     goto err;
   }
 
@@ -550,6 +555,8 @@
       */
       if (xcom_will_process) add_node_accepted = true;
     }
+
+    if (con != nullptr) free(con);
   }
 
   return add_node_accepted;
@@ -575,7 +582,7 @@
       m_local_node_address->get_member_port(), addr.c_str(), port);
 
   con = m_xcom_proxy->xcom_client_open_connection(addr, port);
-  if (con == nullptr) {
+  if (con->fd == -1) {
     // Could not connect to the peer.
     MYSQL_GCS_LOG_ERROR("Error on opening a connection to "
                         << addr << ":" << port << " on local port: "
@@ -748,8 +755,8 @@
         "get_connection_to_node: xcom_client_open_connection to %s:%d", addr,
         port)
 
-    if ((con = m_xcom_proxy->xcom_client_open_connection(addr, port)) ==
-        nullptr) {
+    con = m_xcom_proxy->xcom_client_open_connection(addr, port);
+    if (con->fd == -1) {
       MYSQL_GCS_LOG_DEBUG(
           "get_connection_to_node: Error while opening a connection to %s:%d",
           addr, port)
@@ -813,17 +820,21 @@
     delete current_view;
   }
 
-  if (!con) {
+  if (con->fd == -1) {
     // GET INITIAL PEERS
     MYSQL_GCS_LOG_DEBUG(
         "do_remove_node_from_group: (%d) Couldn't get a connection from view! "
         "Using initial peers...",
         local_port)
 
+    free(con);
+    con = nullptr;
+
     con = get_connection_to_node(&m_initial_peers);
   }
 
-  if (con && !m_leave_view_delivered && m_view_control->belongs_to_group()) {
+  if (con->fd != -1 && !m_leave_view_delivered &&
+      m_view_control->belongs_to_group()) {
     MYSQL_GCS_LOG_TRACE(
         "do_remove_node_from_group: (%d) got a connection! "
         "m_leave_view_delivered=%d belongs=%d",
@@ -841,10 +852,12 @@
         local_port);
   }
 
-  if (con) {
-    xcom_close_client_connection(con);
+  if (con->fd != -1) {
+    m_xcom_proxy->xcom_client_close_connection(con);
   }
 
+  if (con != nullptr) free(con);
+
   /*
     Destroy this node's stored suspicions to avoid them from unnecessary
     processing by the manager.
@@ -1311,7 +1324,7 @@
 bool Gcs_xcom_control::xcom_receive_global_view(synode_no const config_id,
                                                 synode_no message_id,
                                                 Gcs_xcom_nodes *xcom_nodes,
-                                                bool same_view,
+                                                bool do_not_deliver_to_client,
                                                 synode_no max_synode) {
   bool ret = false;
   bool free_built_members = false;
@@ -1341,7 +1354,7 @@
     current_members = const_cast<std::vector<Gcs_member_identifier> *>(
         &current_view->get_members());
   MYSQL_GCS_LOG_TRACE("::xcom_receive_global_view():: My node_id is %d",
-                      xcom_nodes->get_node_no())
+                      xcom_nodes->get_node_no());
 
   /*
     Identify which nodes are alive and which are considered faulty.
@@ -1452,10 +1465,10 @@
 
   /*
     If nobody has joined or left the group, there is no need to install any
-    view. This fact is denoted by the same_view flag and the execution only
-    gets so far because we may have to kill some faulty members. Note that
-    the code could be optimized but we are focused on correctness for now
-    and any possible optimization will be handled in the future.
+    view. This fact is denoted by the do_not_deliver_to_client flag and the
+    execution only gets so far because we may have to kill some faulty members.
+    Note that the code could be optimized but we are focused on correctness for
+    now and any possible optimization will be handled in the future.
 
     Views that contain a node marked as faulty are also ignored. This is
     done because XCOM does not deliver messages to or accept messages from
@@ -1471,13 +1484,13 @@
     If the execution has managed to pass these steps, the node is alive and
     it is time to start building the view.
   */
-  if (same_view || failed_members.size() != 0) {
+  if (do_not_deliver_to_client || failed_members.size() != 0) {
     MYSQL_GCS_LOG_TRACE(
         "(My node_id is %d) ::xcom_receive_global_view():: "
         "Discarding view because nothing has changed. "
-        "Same view flag is %d, number of failed nodes is %llu"
+        "Do not deliver to client flag is %d, number of failed nodes is %llu"
         ", number of joined nodes is %llu, number of left nodes is %llu",
-        xcom_nodes->get_node_no(), same_view,
+        xcom_nodes->get_node_no(), do_not_deliver_to_client,
         static_cast<long long unsigned>(failed_members.size()),
         static_cast<long long unsigned>(joined_members.size()),
         static_cast<long long unsigned>(left_members.size()));
@@ -1572,6 +1585,8 @@
   return ret;
 }
 
+extern uint32_t get_my_xcom_id();
+
 void Gcs_xcom_control::process_control_message(
     Gcs_message *msg, Gcs_protocol_version maximum_supported_protocol_version,
     Gcs_protocol_version used_protocol_version) {
@@ -1588,8 +1603,9 @@
           msg->get_message_data().get_payload_length()));
 
   MYSQL_GCS_LOG_TRACE(
-      "::process_control_message():: From: %s regarding view_id: %s in %s",
-      msg->get_origin().get_member_id().c_str(),
+      "xcom_id %x ::process_control_message():: From: %s regarding view_id: %s "
+      "in %s",
+      get_my_xcom_id(), msg->get_origin().get_member_id().c_str(),
       ms_info->get_view_id()->get_representation().c_str(),
       get_node_address()->get_member_address().c_str())
 
@@ -1601,18 +1617,21 @@
   MYSQL_GCS_DEBUG_EXECUTE(
       synode_no configuration_id = ms_info->get_configuration_id();
       if (!m_view_control->is_view_changing()){MYSQL_GCS_LOG_DEBUG(
-          "There is no state exchange going on. Ignoring exchangeable data "
+          "xcom_id %x There is no state exchange going on. Ignoring "
+          "exchangeable data "
           "because its from a previous state exchange phase. Message is "
           "from group_id (%u), msg_no(%llu), node_no(%llu)",
-          configuration_id.group_id,
+          get_my_xcom_id(), configuration_id.group_id,
           static_cast<long long unsigned>(configuration_id.msgno),
           static_cast<long long unsigned>(
               configuration_id
-                  .node))} MYSQL_GCS_LOG_DEBUG("There is a state exchange "
+                  .node))} MYSQL_GCS_LOG_DEBUG("xcom_id %x There is a state "
+                                               "exchange "
                                                "going on. Message is "
                                                "from group_id (%u), "
                                                "msg_no(%llu), "
                                                "node_no(%llu)",
+                                               get_my_xcom_id(),
                                                configuration_id.group_id,
                                                static_cast<long long unsigned>(
                                                    configuration_id.msgno),
@@ -1812,6 +1831,10 @@
     init_me() method.
   */
   m_local_node_info = new Gcs_xcom_node_information(address);
+
+  Network_configuration_parameters params;
+  params.port = xcom_node_address->get_member_port();
+  m_comms_operation_interface->configure_active_provider(params);
 }
 
 void Gcs_xcom_control::set_peer_nodes(
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_control_interface.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_control_interface.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_control_interface.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_control_interface.h	2021-09-28 11:46:34.000000000 +0000
@@ -42,6 +42,7 @@
 #include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_networking.h"
 #include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_notification.h"
 #include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_state_exchange.h"
+#include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/include/network_management_interface.h"
 #include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_list.h"
 #include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_set.h"
 #include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/server_struct.h"
@@ -384,6 +385,8 @@
     @param[in] view_control View change control interface reference
     @param[in] boot Whether the node will be used to bootstrap the group
     @param[in] socket_util Reference to a socket utility
+    @param[in] comms_operation_interface an unique_ptr to a
+                                          Network_provider_operations_interface
   */
 
   explicit Gcs_xcom_control(
@@ -394,7 +397,9 @@
       Gcs_xcom_engine *gcs_engine,
       Gcs_xcom_state_exchange_interface *state_exchange,
       Gcs_xcom_view_change_control_interface *view_control, bool boot,
-      My_xp_socket_util *socket_util);
+      My_xp_socket_util *socket_util,
+      std::unique_ptr<Network_provider_operations_interface>
+          comms_operation_interface);
 
   ~Gcs_xcom_control() override;
 
@@ -452,12 +457,14 @@
     @param[in] message_id the message that conveys the View Change
     @param[in] xcom_nodes Set of nodes that participated in the consensus
                             to deliver the message
-    @param[in] same_view  Whether this global view was already delivered.
+    @param[in] do_not_deliver_to_client  Whether to filter this view from being
+                                         delivered to the client
     @param[in] max_synode XCom max synode
   */
 
   bool xcom_receive_global_view(synode_no const config_id, synode_no message_id,
-                                Gcs_xcom_nodes *xcom_nodes, bool same_view,
+                                Gcs_xcom_nodes *xcom_nodes,
+                                bool do_not_deliver_to_client,
                                 synode_no max_synode);
 
   /*
@@ -775,6 +782,9 @@
   // Proxy to GCS Sock Probe
   Gcs_sock_probe_interface *m_sock_probe_interface;
 
+  std::unique_ptr<Network_provider_operations_interface>
+      m_comms_operation_interface;
+
  protected:
   /*
     Whether the XCOM was left running or not meaning that the join
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_group_management.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_group_management.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_group_management.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_group_management.cc	2021-09-28 11:46:34.000000000 +0000
@@ -25,8 +25,10 @@
 #include "plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_logging_system.h"
 #include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_group_member_information.h"
 #include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_utils.h"
+#include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/site_struct.h"
 
 #include <algorithm>
+#include <cstring>
 #include <iterator>
 
 Gcs_xcom_group_management::Gcs_xcom_group_management(
@@ -89,6 +91,23 @@
   m_nodes_mutex.unlock();
 }
 
+/*
+  Returns the nodes in a string formatted as:
+
+    "host1:port1,host2:port2,...,hostN:portN"
+*/
+static std::string nodes_to_str(
+    std::vector<Gcs_xcom_node_information> const &nodes) {
+  std::stringstream ss;
+  for (size_t i = 0; i < nodes.size(); i++) {
+    ss << nodes.at(i).get_member_id().get_member_id();
+    if (i < nodes.size() - 1) {
+      ss << ',';
+    }
+  }
+  return ss.str();
+}
+
 enum_gcs_error Gcs_xcom_group_management::modify_configuration(
     const Gcs_interface_parameters &reconfigured_group) {
   // Retrieve peers_nodes parameter
@@ -144,6 +163,25 @@
     /* purecov: end */
   }
 
+  /* Copy from m_xcom_nodes. We can release the lock and use the copy safely
+   * afterwards. */
+  m_nodes_mutex.lock();
+  std::vector<Gcs_xcom_node_information> const current_nodes =
+      m_xcom_nodes.get_nodes();
+  m_nodes_mutex.unlock();
+
+  if (new_xcom_nodes.get_size() == current_nodes.size()) {
+    std::vector<Gcs_xcom_node_information> const &forced_nodes =
+        new_xcom_nodes.get_nodes();
+
+    MYSQL_GCS_LOG_ERROR("The requested membership to forcefully set ("
+                        << nodes_to_str(forced_nodes)
+                        << ") is the same as the "
+                           "current membership ("
+                        << nodes_to_str(current_nodes) << ").")
+    return GCS_NOK;
+  }
+
   bool const sent_to_xcom =
       m_xcom_proxy->xcom_force_nodes(new_xcom_nodes, m_gid_hash);
   if (!sent_to_xcom) {
@@ -181,3 +219,72 @@
       m_xcom_proxy->xcom_set_event_horizon(m_gid_hash, event_horizon);
   return success ? GCS_OK : GCS_NOK;
 }
+
+enum_gcs_error Gcs_xcom_group_management::set_single_leader(
+    Gcs_member_identifier const &leader) {
+  u_int constexpr one_preferred_leader = 1;
+  char const *preferred_leader[one_preferred_leader] = {
+      leader.get_member_id().c_str()};
+  node_no constexpr one_active_leader = 1;
+
+  MYSQL_GCS_LOG_DEBUG(
+      "The member is attempting to reconfigure XCom to use %s as the single "
+      "leader.",
+      leader.get_member_id().c_str());
+
+  bool success = m_xcom_proxy->xcom_set_leaders(
+      m_gid_hash, one_preferred_leader, preferred_leader, one_active_leader);
+  return success ? GCS_OK : GCS_NOK;
+}
+
+enum_gcs_error Gcs_xcom_group_management::set_everyone_leader() {
+  u_int constexpr zero_preferred_leaders = 0;
+  char const **empty_preferred_leaders{nullptr};
+  node_no constexpr everyone_active_leader = active_leaders_all;
+
+  MYSQL_GCS_LOG_DEBUG(
+      "The member is attempting to reconfigure XCom to use everyone as "
+      "leader.");
+
+  bool success = m_xcom_proxy->xcom_set_leaders(
+      m_gid_hash, zero_preferred_leaders, empty_preferred_leaders,
+      everyone_active_leader);
+  return success ? GCS_OK : GCS_NOK;
+}
+
+enum_gcs_error Gcs_xcom_group_management::get_leaders(
+    std::vector<Gcs_member_identifier> &preferred_leaders,
+    std::vector<Gcs_member_identifier> &actual_leaders) {
+  MYSQL_GCS_LOG_DEBUG(
+      "The member is attempting to retrieve the leader information.");
+  leader_info_data leaders;
+
+  bool const success = m_xcom_proxy->xcom_get_leaders(m_gid_hash, leaders);
+  if (!success) return GCS_NOK;
+
+  /* Translate the preferred leaders representation. */
+  if (leaders.max_nr_leaders == active_leaders_all) {
+    // Everyone as leader, so the preferred leaders match the actual leaders.
+    for (u_int i = 0; i < leaders.actual_leaders.leader_array_len; i++) {
+      preferred_leaders.emplace_back(
+          std::string{leaders.actual_leaders.leader_array_val[i].address});
+    }
+  } else {
+    // Translate the reply data into the std::vector<Gcs_member_identifier>.
+    for (u_int i = 0; i < leaders.preferred_leaders.leader_array_len; i++) {
+      preferred_leaders.emplace_back(
+          std::string{leaders.preferred_leaders.leader_array_val[i].address});
+    }
+  }
+
+  /* Translate the actual leaders representation. */
+  for (u_int i = 0; i < leaders.actual_leaders.leader_array_len; i++) {
+    actual_leaders.emplace_back(
+        std::string{leaders.actual_leaders.leader_array_val[i].address});
+  }
+
+  ::xdr_free(reinterpret_cast<xdrproc_t>(xdr_leader_info_data),
+             reinterpret_cast<char *>(&leaders));
+
+  return GCS_OK;
+}
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_group_management.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_group_management.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_group_management.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_group_management.h	2021-09-28 11:46:34.000000000 +0000
@@ -24,6 +24,7 @@
 #define GCS_XCOM_GROUP_MANAGEMENT_INCLUDED
 
 #include "plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_group_management_interface.h"  // Base class: Gcs_group_management_interface
+#include "plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_member_identifier.h"
 #include "plugin/group_replication/libmysqlgcs/include/mysql/gcs/xplatform/my_xp_mutex.h"
 #include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_group_member_information.h"
 #include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_proxy.h"
@@ -45,6 +46,13 @@
 
   enum_gcs_error set_write_concurrency(uint32_t event_horizon) override;
 
+  enum_gcs_error set_single_leader(
+      Gcs_member_identifier const &leader) override;
+  enum_gcs_error set_everyone_leader() override;
+  enum_gcs_error get_leaders(
+      std::vector<Gcs_member_identifier> &preferred_leaders,
+      std::vector<Gcs_member_identifier> &actual_leaders) override;
+
   uint32_t get_minimum_write_concurrency() const override;
 
   uint32_t get_maximum_write_concurrency() const override;
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_group_member_information.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_group_member_information.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_group_member_information.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_group_member_information.cc	2021-09-28 11:46:34.000000000 +0000
@@ -136,7 +136,7 @@
   /* Get our unique XCom identifier to pass it along to XCom. */
   // Address.
   const std::string &address_str = get_member_id().get_member_id();
-  char *address[] = {const_cast<char *>(address_str.c_str())};
+  char const *address[]{address_str.c_str()};
   // Incarnation.
   bool error_creating_blob;
   blob incarnation_blob;
@@ -378,7 +378,7 @@
   m_size = 0;
 }
 
-bool Gcs_xcom_nodes::encode(unsigned int *ptr_size, char ***ptr_addrs,
+bool Gcs_xcom_nodes::encode(unsigned int *ptr_size, char const ***ptr_addrs,
                             blob **ptr_uuids) {
   /*
     If there is information already encoded, free it first.
@@ -389,7 +389,7 @@
     /* purecov: end */
   }
 
-  m_addrs = static_cast<char **>(std::calloc(m_size, sizeof(char *)));
+  m_addrs = static_cast<char const **>(std::calloc(m_size, sizeof(char *)));
   m_uuids = static_cast<blob *>(std::calloc(m_size, sizeof(blob)));
 
   /*
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_group_member_information.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_group_member_information.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_group_member_information.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_group_member_information.h	2021-09-28 11:46:34.000000000 +0000
@@ -515,7 +515,8 @@
     interpreted by XCOM to boot, add or remove nodes.
   */
 
-  bool encode(unsigned int *ptr_size, char ***ptr_addrs, blob **ptr_uuids);
+  bool encode(unsigned int *ptr_size, char const ***ptr_addrs,
+              blob **ptr_uuids);
 
  private:
   /*
@@ -543,7 +544,7 @@
   /*
     Memory allocated to encode addresses.
   */
-  char **m_addrs;
+  char const **m_addrs;
 
   /*
     Memory allocated to encode uuids.
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_interface.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_interface.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_interface.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_interface.cc	2021-09-28 11:46:34.000000000 +0000
@@ -42,15 +42,18 @@
 #include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_networking.h"
 #include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_notification.h"
 #include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_utils.h"
+#include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/include/network_management_interface.h"
 #include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/site_struct.h"
 #include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe.h"
 #include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/synode_no.h"
-#include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.h"
+#include "xdr_gen/xcom_vp.h"
 
 using std::map;
 using std::string;
 using std::vector;
 
+extern uint32_t get_my_xcom_id();
+
 Gcs_interface *Gcs_xcom_interface::interface_reference_singleton = nullptr;
 
 Gcs_xcom_config::Gcs_xcom_config()
@@ -95,6 +98,36 @@
   return (event_horizon == event_horizon_);
 }
 
+bool Gcs_xcom_config::same_xcom_nodes_v3(
+    Gcs_xcom_nodes const &xcom_nodes) const {
+  bool are_same_nodes = (xcom_nodes.get_size() == xcom_nodes_.get_size());
+  if (are_same_nodes) {
+    for (auto const &node : xcom_nodes.get_nodes()) {
+      Gcs_xcom_node_information const *existing_node =
+          xcom_nodes_.get_node(node.get_member_id());
+      /* Take UUID into account to distinguish between reincarnations of the
+         same node. */
+      bool const node_already_existed =
+          (existing_node != nullptr &&
+           existing_node->get_member_uuid().actual_value ==
+               node.get_member_uuid().actual_value);
+      are_same_nodes = are_same_nodes && node_already_existed;
+    }
+  }
+  MYSQL_GCS_TRACE_EXECUTE(
+      MYSQL_GCS_LOG_TRACE(
+          "Received global view: previous node set: (same_xcom_nodes=%d)",
+          are_same_nodes);
+      for (auto const &node
+           : xcom_nodes.get_nodes()) {
+        MYSQL_GCS_LOG_TRACE("My node_id is %d peer_ %d address: %s flag: %s",
+                            xcom_nodes.get_node_no(), node.get_node_no(),
+                            node.get_member_id().get_member_id().c_str(),
+                            node.is_alive() ? "Active" : "Failed");
+      });
+  return are_same_nodes;
+}
+
 static Gcs_xcom_config last_accepted_xcom_config;
 
 int xcom_local_port = 0;
@@ -109,10 +142,12 @@
 */
 static Gcs_xcom_engine *gcs_engine;
 
-void cb_xcom_receive_data(synode_no message_id, node_set nodes, u_int size,
+void cb_xcom_receive_data(synode_no message_id, synode_no origin,
+                          site_def const *site, node_set nodes, u_int size,
                           synode_no last_removed, char *data);
-void do_cb_xcom_receive_data(synode_no message_id, Gcs_xcom_nodes *xcom_nodes,
-                             synode_no last_removed, u_int size, char *data);
+void do_cb_xcom_receive_data(synode_no message_id, synode_no origin,
+                             Gcs_xcom_nodes *xcom_nodes, synode_no last_removed,
+                             u_int size, char *data);
 void cb_xcom_receive_local_view(synode_no config_id, node_set nodes);
 void do_cb_xcom_receive_local_view(synode_no config_id,
                                    Gcs_xcom_nodes *xcom_nodes,
@@ -132,9 +167,9 @@
 
 synode_no cb_xcom_get_app_snap(blob *gcs_snap);
 int cb_xcom_get_should_exit();
-void cb_xcom_handle_app_snap(blob *store_snap MY_ATTRIBUTE((unused)),
-                             synode_no start MY_ATTRIBUTE((unused)),
-                             synode_no end MY_ATTRIBUTE((unused)));
+void cb_xcom_handle_app_snap(blob *store_snap [[maybe_unused]],
+                             synode_no start [[maybe_unused]],
+                             synode_no end [[maybe_unused]]);
 int cb_xcom_socket_accept(int fd, site_def const *xcom_config);
 
 xcom_input_request_ptr cb_xcom_input_try_pop();
@@ -172,7 +207,7 @@
 }
 
 void Gcs_xcom_interface::cleanup_thread_ssl_resources() {
-  ::xcom_cleanup_ssl();
+  ::get_network_management_interface()->cleanup_secure_connections_context();
 }
 
 Gcs_xcom_interface::Gcs_xcom_interface()
@@ -191,7 +226,8 @@
       m_ip_allowlist(),
       m_ssl_init_state(-1),
       m_wait_for_ssl_init_cond(),
-      m_wait_for_ssl_init_mutex() {
+      m_wait_for_ssl_init_mutex(),
+      m_netns_manager(nullptr) {
   // Initialize random seed
   srand(static_cast<unsigned int>(time(nullptr)));
 }
@@ -208,7 +244,7 @@
         new Gcs_async_buffer(new Gcs_file_sink(*debug_file, *debug_path));
   else
 #endif /* XCOM_STANDALONE */
-       /* purecov: begin inspected */
+    /* purecov: begin inspected */
     m_default_sink = new Gcs_async_buffer(new Gcs_output_sink());
   /* purecov: end */
 
@@ -330,7 +366,8 @@
     Perform syntax checks
     ---------------------------------------------------------------
   */
-  if (!is_parameters_syntax_correct(validated_params)) goto err;
+  if (!is_parameters_syntax_correct(validated_params, m_netns_manager))
+    goto err;
 
   /*
     ---------------------------------------------------------------
@@ -357,6 +394,7 @@
   // initialize xcom's data structures to pass configuration
   // from the application
   m_gcs_xcom_app_cfg.init();
+  m_gcs_xcom_app_cfg.set_network_namespace_manager(m_netns_manager);
   this->clean_group_interfaces();
   m_socket_util = new My_xp_socket_util_impl();
 
@@ -419,7 +457,8 @@
     Perform syntax checks
     ---------------------------------------------------------------
    */
-  if (!is_parameters_syntax_correct(validated_params)) return GCS_NOK;
+  if (!is_parameters_syntax_correct(validated_params, m_netns_manager))
+    return GCS_NOK;
 
   // validate allowlist
   std::string *ip_allowlist_reconfigure_str = const_cast<std::string *>(
@@ -567,6 +606,7 @@
   s_xcom_proxy->xcom_destroy_ssl();
   s_xcom_proxy->xcom_set_ssl_mode(0 /* SSL_DISABLED */);
   s_xcom_proxy->xcom_set_ssl_fips_mode(0 /* SSL_FIPS_MODE_OFF */);
+  s_xcom_proxy->finalize_network_manager();
 }
 
 void Gcs_xcom_interface::finalize_xcom() {
@@ -607,9 +647,18 @@
   }
 }
 
+void Gcs_xcom_interface::announce_finalize_to_view_control() {
+  for (const auto &group : m_group_interfaces) {
+    group.second->vce->finalize();
+  }
+}
+
 enum_gcs_error Gcs_xcom_interface::finalize() {
   if (!is_initialized()) return GCS_NOK;
 
+  // Announces finalize() to all Control interfaces
+  announce_finalize_to_view_control();
+
   // Finalize and delete the engine
   gcs_engine->finalize(cleanup_xcom);
   delete gcs_engine;
@@ -634,6 +683,7 @@
   delete m_socket_util;
   m_socket_util = nullptr;
 
+  ::get_network_management_interface()->remove_all_network_provider();
   Gcs_xcom_utils::deinit_net();
 
   // de-initialize data structures to pass configs to xcom
@@ -687,7 +737,8 @@
     const Gcs_group_identifier &group_identifier) {
   if (!is_initialized()) return nullptr;
 
-  // Try and retrieve already instantiated group interfaces for a certain group
+  // Try and retrieve already instantiated group interfaces for a certain
+  // group
   map<std::string, gcs_xcom_group_interfaces *>::const_iterator
       registered_group;
   registered_group = m_group_interfaces.find(group_identifier.get_group_id());
@@ -716,8 +767,12 @@
     Gcs_xcom_view_change_control_interface *vce =
         new Gcs_xcom_view_change_control();
 
+    std::unique_ptr<Network_provider_management_interface>
+        net_manager_for_communication = ::get_network_management_interface();
+
     auto *xcom_communication = new Gcs_xcom_communication(
-        stats, s_xcom_proxy, vce, gcs_engine, group_identifier);
+        stats, s_xcom_proxy, vce, gcs_engine, group_identifier,
+        std::move(net_manager_for_communication));
     group_interface->communication_interface = xcom_communication;
 
     Gcs_xcom_state_exchange_interface *se =
@@ -727,9 +782,12 @@
         new Gcs_xcom_group_management(s_xcom_proxy, group_identifier);
     group_interface->management_interface = xcom_group_management;
 
+    std::unique_ptr<Network_provider_operations_interface>
+        net_manager_for_control = ::get_network_operations_interface();
     Gcs_xcom_control *xcom_control = new Gcs_xcom_control(
         m_node_address, m_xcom_peers, group_identifier, s_xcom_proxy,
-        xcom_group_management, gcs_engine, se, vce, m_boot, m_socket_util);
+        xcom_group_management, gcs_engine, se, vce, m_boot, m_socket_util,
+        std::move(net_manager_for_control));
     group_interface->control_interface = xcom_control;
 
     xcom_control->set_join_behavior(
@@ -758,6 +816,30 @@
   return Gcs_log_manager::initialize(logger);
 }
 
+enum_gcs_error Gcs_xcom_interface::setup_runtime_resources(
+    Gcs_interface_runtime_requirements &reqs) {
+  std::unique_ptr<Network_provider_management_interface> mgmtn_if =
+      ::get_network_management_interface();
+
+  if (reqs.provider != nullptr) mgmtn_if->add_network_provider(reqs.provider);
+
+  if (reqs.namespace_manager != nullptr)
+    m_netns_manager = reqs.namespace_manager;
+
+  return GCS_OK;
+}
+
+enum_gcs_error Gcs_xcom_interface::cleanup_runtime_resources(
+    Gcs_interface_runtime_requirements &reqs) {
+  std::unique_ptr<Network_provider_management_interface> mgmtn_if =
+      ::get_network_management_interface();
+
+  if (reqs.provider != nullptr)
+    mgmtn_if->remove_network_provider(reqs.provider->get_communication_stack());
+
+  return GCS_OK;
+}
+
 void Gcs_xcom_interface::clean_group_interfaces() {
   map<string, gcs_xcom_group_interfaces *>::iterator group_if;
   for (group_if = m_group_interfaces.begin();
@@ -795,7 +877,7 @@
 
 void Gcs_xcom_interface::initialize_ssl() {
   m_wait_for_ssl_init_mutex.lock();
-  m_ssl_init_state = (s_xcom_proxy->xcom_init_ssl() ? 1 : 0);
+  m_ssl_init_state = s_xcom_proxy->xcom_init_ssl();
   m_wait_for_ssl_init_cond.broadcast();
   m_wait_for_ssl_init_mutex.unlock();
 }
@@ -852,6 +934,8 @@
       interface_params.get_parameter("ip_allowlist");
   const std::string *xcom_cache_size_str =
       interface_params.get_parameter("xcom_cache_size");
+  const std::string *comm_stack_str =
+      interface_params.get_parameter("communication_stack");
 
   set_xcom_group_information(*group_name);
 
@@ -899,7 +983,6 @@
   ::set_xcom_expel_cb(cb_xcom_expel);
   ::set_xcom_socket_accept_cb(cb_xcom_socket_accept);
   ::set_xcom_input_try_pop_cb(cb_xcom_input_try_pop);
-
   const std::string *wait_time_str =
       interface_params.get_parameter("wait_time");
 
@@ -917,11 +1000,20 @@
   gcs_engine = new Gcs_xcom_engine();
   gcs_engine->initialize(nullptr);
 
+  /*Setup Network and SSL related*/
+  // Initialize XCom's Network Provider Manager
+  enum_transport_protocol comm_stack =
+      static_cast<enum_transport_protocol>(std::atoi(comm_stack_str->c_str()));
+  s_xcom_proxy->initialize_network_manager();
+  s_xcom_proxy->set_network_manager_active_provider(comm_stack);
+
+  // Initialize SSL related data
   const std::string *ssl_mode_str = interface_params.get_parameter("ssl_mode");
   const std::string *ssl_fips_mode_str =
       interface_params.get_parameter("ssl_fips_mode");
+  int ssl_mode_int = 0;
   if (ssl_mode_str) {
-    int ssl_mode_int = s_xcom_proxy->xcom_get_ssl_mode(ssl_mode_str->c_str());
+    ssl_mode_int = s_xcom_proxy->xcom_get_ssl_mode(ssl_mode_str->c_str());
     if (ssl_mode_int == -1) /* INVALID_SSL_MODE */
     {
       MYSQL_GCS_LOG_ERROR(
@@ -964,7 +1056,8 @@
     const std::string *tls_ciphersuites =
         interface_params.get_parameter("tls_ciphersuites");
 
-    Gcs_xcom_proxy::ssl_parameters ssl_configuration = {
+    ssl_parameters ssl_configuration = {
+        ssl_mode_int,
         server_key_file ? server_key_file->c_str() : nullptr,
         server_cert_file ? server_cert_file->c_str() : nullptr,
         client_key_file ? client_key_file->c_str() : nullptr,
@@ -973,13 +1066,13 @@
         ca_path ? ca_path->c_str() : nullptr,
         crl_file ? crl_file->c_str() : nullptr,
         crl_path ? crl_path->c_str() : nullptr,
-        cipher ? cipher->c_str() : nullptr,
-    };
-    Gcs_xcom_proxy::tls_parameters tls_configuration = {
+        cipher ? cipher->c_str() : nullptr};
+    tls_parameters tls_configuration = {
         tls_version ? tls_version->c_str() : nullptr,
         tls_ciphersuites ? tls_ciphersuites->c_str() : nullptr};
-    s_xcom_proxy->xcom_set_ssl_parameters(ssl_configuration, tls_configuration);
 
+    s_xcom_proxy->xcom_set_ssl_parameters(ssl_configuration, tls_configuration);
+    /*s_xcom_proxy->xcom_init_ssl();*/
     m_wait_for_ssl_init_mutex.lock();
     gcs_engine->push(new Initialize_notification(start_ssl));
     while (m_ssl_init_state < 0) {
@@ -988,12 +1081,13 @@
     }
     m_wait_for_ssl_init_mutex.unlock();
 
-    if (!m_ssl_init_state) {
+    if (m_ssl_init_state) {
       MYSQL_GCS_LOG_ERROR("Error starting SSL in the group communication"
                           << " engine.")
       m_ssl_init_state = -1;
       goto error;
     }
+
     m_ssl_init_state = -1;
   } else {
     MYSQL_GCS_LOG_INFO("SSL was not enabled");
@@ -1015,6 +1109,9 @@
 
   clean_group_references();
 
+  // Finalize Network Manager
+  s_xcom_proxy->finalize_network_manager();
+
   /*
     If this method created the proxy object it should also
     delete it.
@@ -1158,6 +1255,8 @@
   pipeline.register_stage<Gcs_message_stage_lz4>(compression_enabled, compression_threshold);
   pipeline.register_stage<Gcs_message_stage_lz4_v2>(compression_enabled, compression_threshold);
   pipeline.register_stage<Gcs_message_stage_split_v2>(fragmentation_enabled, fragmentation_threshold);
+  pipeline.register_stage<Gcs_message_stage_lz4_v3>(compression_enabled, compression_threshold);
+  pipeline.register_stage<Gcs_message_stage_split_v3>(fragmentation_enabled, fragmentation_threshold);
 
   error = pipeline.register_pipeline({
     {
@@ -1172,6 +1271,13 @@
         Stage_code::ST_LZ4_V2,
         Stage_code::ST_SPLIT_V2
       }
+    },
+    {
+      Gcs_protocol_version::V3,
+      {
+        Stage_code::ST_LZ4_V3,
+        Stage_code::ST_SPLIT_V3
+      }
     }
   });
   // clang-format on
@@ -1213,7 +1319,8 @@
         atoi(suspicions_processing_period_ptr->c_str())));
     ret = GCS_OK;
     MYSQL_GCS_LOG_TRACE(
-        "::configure_suspicions_mgr():: Set suspicions processing period to %s "
+        "::configure_suspicions_mgr():: Set suspicions processing period to "
+        "%s "
         "seconds",
         suspicions_processing_period_ptr->c_str());
   }
@@ -1227,10 +1334,9 @@
   return m_ip_allowlist;
 }
 
-void cb_xcom_receive_data(synode_no message_id, node_set nodes, u_int size,
+void cb_xcom_receive_data(synode_no message_id, synode_no origin,
+                          site_def const *site, node_set nodes, u_int size,
                           synode_no last_removed, char *data) {
-  const site_def *site = find_site_def(message_id);
-
   if (site->nodeno == VOID_NODE_NO) {
     free_node_set(&nodes);
     free(data);
@@ -1242,17 +1348,20 @@
   free_node_set(&nodes);
 
   Gcs_xcom_notification *notification =
-      new Data_notification(do_cb_xcom_receive_data, message_id, xcom_nodes,
-                            last_removed, size, data);
+      new Data_notification(do_cb_xcom_receive_data, message_id, origin,
+                            xcom_nodes, last_removed, size, data);
   bool scheduled = gcs_engine->push(notification);
   if (!scheduled) {
     MYSQL_GCS_LOG_DEBUG(
-        "Tried to enqueue a message but the member is about to stop.")
+        "xcom_id %x Tried to enqueue a message but the member is about to "
+        "stop.",
+        get_my_xcom_id())
     free(data);
     delete xcom_nodes;
     delete notification;
   } else {
-    MYSQL_GCS_LOG_TRACE("Scheduled message notification: %p", notification)
+    MYSQL_GCS_LOG_TRACE("xcom_id %x Scheduled message notification: %p",
+                        get_my_xcom_id(), notification)
   }
 }
 
@@ -1280,7 +1389,7 @@
                                               std::move(xcom_nodes));
 }
 
-void do_cb_xcom_receive_data(synode_no message_id,
+void do_cb_xcom_receive_data(synode_no message_id, synode_no origin,
                              Gcs_xcom_nodes *xcom_nodes_raw_ptr,
                              synode_no cache_last_removed, u_int size,
                              char *data_raw_ptr) {
@@ -1339,8 +1448,8 @@
     after that it can start receiving data messages.
 
     It is important to clean up last_accepted_xcom_config when the node leaves
-    or joins the cluster otherwise, it may receive messages before a global view
-    message is delivered.
+    or joins the cluster otherwise, it may receive messages before a global
+    view message is delivered.
   */
   bool const received_initial_global_view =
       last_accepted_xcom_config.has_view();
@@ -1351,9 +1460,10 @@
   }
 
   MYSQL_GCS_LOG_TRACE(
-      "xcom_receive_data_internal:: xcom_receive_data My node_id is %d "
+      "xcom_id %x xcom_receive_data_internal:: xcom_receive_data My node_id is "
+      "%d "
       "message_id.group= %u message_id.msgno= %llu message_id.node= %d",
-      xcom_nodes->get_node_no(), message_id.group_id,
+      get_my_xcom_id(), xcom_nodes->get_node_no(), message_id.group_id,
       static_cast<long long unsigned>(message_id.msgno), message_id.node);
 
   Gcs_xcom_communication *xcom_communication =
@@ -1361,9 +1471,9 @@
           intf->get_communication_session(*destination));
   assert(xcom_communication != nullptr);
 
-  auto packet =
-      Gcs_packet::make_incoming_packet(std::move(data), size, message_id,
-                                       xcom_communication->get_msg_pipeline());
+  auto packet = Gcs_packet::make_incoming_packet(
+      std::move(data), size, message_id, origin,
+      xcom_communication->get_msg_pipeline());
 
   switch (packet.get_cargo_type()) {
     case Cargo_type::CT_INTERNAL_STATE_EXCHANGE:
@@ -1382,6 +1492,71 @@
   }
 }
 
+static bool must_filter_xcom_view_v1(synode_no config_id,
+                                     Gcs_xcom_nodes const &xcom_nodes,
+                                     xcom_event_horizon event_horizon) {
+  bool const already_processed =
+      (last_accepted_xcom_config.has_view() &&
+       last_accepted_xcom_config.same_view(config_id));
+  bool const same_xcom_nodes =
+      last_accepted_xcom_config.same_xcom_nodes(xcom_nodes);
+  bool const different_event_horizons =
+      !last_accepted_xcom_config.same_event_horizon(event_horizon);
+  bool const event_horizon_reconfiguration =
+      (same_xcom_nodes && different_event_horizons);
+
+  bool filter_xcom_view = already_processed || event_horizon_reconfiguration;
+
+  MYSQL_GCS_TRACE_EXECUTE(if (filter_xcom_view) {
+    if (filter_xcom_view) {
+      MYSQL_GCS_LOG_TRACE(
+          "Received a global view we already processed: { group=%" PRIu32
+          " msgno=%" PRIu64 " node=%" PRIu32 " }",
+          config_id.group_id, config_id.msgno, config_id.node);
+    } else {
+      MYSQL_GCS_LOG_TRACE(
+          "Received a global view due to an event horizon reconfiguration: { "
+          "same_xcom_nodes=%d different_event_horizons=%d }",
+          same_xcom_nodes, different_event_horizons);
+    }
+  });
+
+  return filter_xcom_view;
+}
+
+static bool must_filter_xcom_view_v3(Gcs_xcom_nodes const &xcom_nodes) {
+  bool filter_xcom_view =
+      last_accepted_xcom_config.same_xcom_nodes_v3(xcom_nodes);
+
+  MYSQL_GCS_TRACE_EXECUTE(if (filter_xcom_view) {
+    MYSQL_GCS_LOG_TRACE(
+        "Received a global view with no membership changes: { "
+        "filter_xcom_view=%d }",
+        filter_xcom_view);
+  });
+
+  return filter_xcom_view;
+}
+
+static bool must_filter_xcom_view(synode_no config_id,
+                                  Gcs_xcom_nodes const &xcom_nodes,
+                                  xcom_event_horizon event_horizon,
+                                  Gcs_protocol_version protocol) {
+  switch (protocol) {
+    case Gcs_protocol_version::V1:
+    case Gcs_protocol_version::V2:
+      return must_filter_xcom_view_v1(config_id, xcom_nodes, event_horizon);
+    case Gcs_protocol_version::HIGHEST_KNOWN:
+      return must_filter_xcom_view_v3(xcom_nodes);
+    case Gcs_protocol_version::UNKNOWN:
+    case Gcs_protocol_version::V4:
+    case Gcs_protocol_version::V5:
+      assert(false && "supposedly unreachable code");
+  }
+  assert(false && "supposedly unreachable code");
+  return true;
+}
+
 void cb_xcom_receive_global_view(synode_no config_id, synode_no message_id,
                                  node_set nodes,
                                  xcom_event_horizon event_horizon) {
@@ -1450,20 +1625,21 @@
           xcom_nodes->get_nodes();
       std::vector<Gcs_xcom_node_information>::const_iterator nodes_it;
       MYSQL_GCS_LOG_TRACE(
-          "Received global view: My node_id is %d "
+          "xcom_id %x Received global view: My node_id is %d "
           "config_id.group= %u config_id.msgno= %llu config_id.node=%d "
           "message_id.group= %u message_id.msgno= %llu message_id.node= %d",
-          node_no, config_id.group_id,
+          get_my_xcom_id(), node_no, config_id.group_id,
           static_cast<long long unsigned>(config_id.msgno), config_id.node,
           message_id.group_id,
           static_cast<long long unsigned>(message_id.msgno), message_id.node)
 
-          MYSQL_GCS_LOG_TRACE("Received global view: node set:")
+          MYSQL_GCS_LOG_TRACE("xcom_id %x Received global view: node set:",
+                              get_my_xcom_id())
 
               for (nodes_it = nodes.begin(); nodes_it != nodes.end();
                    ++nodes_it){MYSQL_GCS_LOG_TRACE(
-                  "My node_id is %d peer_ %d address: %s flag: %s", node_no,
-                  (*nodes_it).get_node_no(),
+                  "xcom_id %x My node_id is %d peer_ %d address: %s flag: %s",
+                  get_my_xcom_id(), node_no, (*nodes_it).get_node_no(),
                   (*nodes_it).get_member_id().get_member_id().c_str(),
                   ((*nodes_it).is_alive() ? "Active" : "Failed"))})
 
@@ -1480,50 +1656,49 @@
     must be called because it is responsible for removing from the system
     those members that are faulty.
 
-    same_view = true prevents
-    control_if->xcom_receive_global_view(message_id, xcom_nodes, same_view)
+    do_not_deliver_to_client = true prevents
+    control_if->xcom_receive_global_view(message_id, xcom_nodes,
+                                         do_not_deliver_to_client)
     from firing a new view upwards.
-    We want to filter out a view if:
+    The logic to filter out a view depends on the GCS protocol version:
 
-    a) we have already processed it, or
-    b) it is due to an event horizon reconfiguration.
+    GCS PROTOCOL <= V2
+    ------------------
+    We want to filter out a view if:
+      a) we have already processed it, or
+      b) it is due to an event horizon reconfiguration.
 
     We identify situation (a) by comparing the incoming XCom view's config
     synod against the config synod of the last XCom view scheduled for
-    delivery. We identify situation (b) if the incoming XCom view's membership
-    is the same as the last XCom view scheduled for delivery *and* their event
-    horizons are different.
+    delivery. We conclude we're in situation (b) if the incoming XCom view's
+    membership is the same as the last XCom view scheduled for delivery *and*
+    their event horizons are different.
+
+    This approach is, unfortunately, insufficient. If we reconfigure the XCom's
+    event horizon to the same value it currently has, we get an XCom view where
+    the membership is the same as the last XCom view scheduled for delivery
+    *but* their event horizons are the same. We do not filter such a view, but
+    we want to. The next GCS protocol version fixes this.
+
+    GCS PROTOCOL >= V3
+    ------------------
+    We want to filter out a view if the view is *not* about a membership change.
+    In other words, we only want to let a view bubble upwards if it's about a
+    new member joining, or an existing member leaving.
+    So we filter an incoming XCom view if the incoming XCom view's membership is
+    the same as the last XCom view scheduled for delivery.
   */
-  // Situation (a).
-  bool const already_processed =
-      (last_accepted_xcom_config.has_view() &&
-       last_accepted_xcom_config.same_view(config_id));
-  // Situation (b).
-  bool const same_xcom_nodes =
-      last_accepted_xcom_config.same_xcom_nodes(*xcom_nodes);
-  bool const different_event_horizons =
-      !last_accepted_xcom_config.same_event_horizon(event_horizon);
-  bool const event_horizon_reconfiguration =
-      (same_xcom_nodes && different_event_horizons);
+  auto *xcom_communication_if = static_cast<Gcs_xcom_communication *>(
+      intf->get_communication_session(*destination));
+  Gcs_protocol_version const protocol =
+      xcom_communication_if->get_protocol_version();
 
-  bool const same_view = already_processed || event_horizon_reconfiguration;
-
-  MYSQL_GCS_TRACE_EXECUTE(if (same_view) {
-    if (already_processed) {
-      MYSQL_GCS_LOG_TRACE(
-          "Received a global view we already processed: { group=%" PRIu32
-          " msgno=%" PRIu64 " node=%" PRIu32 " }",
-          config_id.group_id, config_id.msgno, config_id.node);
-    } else {
-      MYSQL_GCS_LOG_TRACE(
-          "Received a global view due to an event horizon reconfiguration: { "
-          "same_xcom_nodes=%d different_event_horizons=%d }",
-          same_xcom_nodes, different_event_horizons);
-    }
-  });
+  bool do_not_deliver_to_client =
+      must_filter_xcom_view(config_id, *xcom_nodes, event_horizon, protocol);
 
   if (!(xcom_control_if->xcom_receive_global_view(
-          config_id, message_id, xcom_nodes, same_view, max_synode))) {
+          config_id, message_id, xcom_nodes, do_not_deliver_to_client,
+          max_synode))) {
     // Copy node set and config id if the view is not rejected...
     last_accepted_xcom_config.update(config_id, *xcom_nodes, event_horizon);
   } else {
@@ -1596,11 +1771,11 @@
   delete xcom_nodes;
 }
 
-void cb_xcom_handle_app_snap(blob *store_snap MY_ATTRIBUTE((unused)),
-                             synode_no start MY_ATTRIBUTE((unused)),
-                             synode_no end MY_ATTRIBUTE((unused))) {}
+void cb_xcom_handle_app_snap(blob *store_snap [[maybe_unused]],
+                             synode_no start [[maybe_unused]],
+                             synode_no end [[maybe_unused]]) {}
 
-synode_no cb_xcom_get_app_snap(blob *gcs_snap MY_ATTRIBUTE((unused))) {
+synode_no cb_xcom_get_app_snap(blob *gcs_snap [[maybe_unused]]) {
   return null_synode;
 }
 
@@ -1611,7 +1786,7 @@
     return 0;
 }
 
-void cb_xcom_ready(int status MY_ATTRIBUTE((unused))) {
+void cb_xcom_ready(int status [[maybe_unused]]) {
   if (s_xcom_proxy) s_xcom_proxy->xcom_signal_ready();
 }
 
@@ -1619,7 +1794,7 @@
   if (s_xcom_proxy) s_xcom_proxy->xcom_signal_comms_status_changed(status);
 }
 
-void cb_xcom_exit(int status MY_ATTRIBUTE((unused))) {
+void cb_xcom_exit(int status [[maybe_unused]]) {
   last_accepted_xcom_config.reset();
   if (s_xcom_proxy) s_xcom_proxy->xcom_signal_exit();
 }
@@ -1628,7 +1803,7 @@
   Callback function used by XCom to signal that a node has left the group
   because of a `die_op` or a view where the node does not belong to.
  */
-void cb_xcom_expel(int status MY_ATTRIBUTE((unused))) {
+void cb_xcom_expel(int status [[maybe_unused]]) {
   Gcs_xcom_notification *notification =
       new Expel_notification(do_cb_xcom_expel);
   bool scheduled = gcs_engine->push(notification);
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_interface.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_interface.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_interface.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_interface.h	2021-09-28 11:46:34.000000000 +0000
@@ -98,6 +98,14 @@
    * @returns true if the event horizons are the same, false otherwise
    */
   bool same_event_horizon(xcom_event_horizon const &event_horizon) const;
+  /**
+   * Checks whether this configuration's membership matches the given
+   * membership.
+   *
+   * @param xcom_nodes the membership to compare against
+   * @returns true if the memberships are the same, false otherwise
+   */
+  bool same_xcom_nodes_v3(Gcs_xcom_nodes const &xcom_nodes) const;
   /*
    * This class will have a singleton object, so we delete the {copy,move}
    * {constructor,assignment}. This way the compiler slaps us on the wrist if we
@@ -217,6 +225,18 @@
   void set_node_address(std::string const &address);
 
   /**
+   * @see Gcs_interface#setup_runtime_resources
+   */
+  enum_gcs_error setup_runtime_resources(
+      Gcs_interface_runtime_requirements &reqs) override;
+
+  /**
+   * @see Gcs_interface#cleanup_runtime_resources
+   */
+  enum_gcs_error cleanup_runtime_resources(
+      Gcs_interface_runtime_requirements &reqs) override;
+
+  /**
    This member function shall return the set of parameters that configure
    the interface at the time its initialization was done. The parameters
    returned already contain default values set as well as values that may
@@ -348,6 +368,13 @@
 
   void clear_peer_nodes();
 
+  /**
+   * @brief Announces that a finalize was called to all group instances that
+   *        use a Gcs_xcom_view_change_control_interface. The purpose of this
+   *        is to end any ongoing tasks, like pending joins.
+   */
+  void announce_finalize_to_view_control();
+
   // Holder to the created group interfaces, in which the key is the group
   std::map<std::string, gcs_xcom_group_interfaces *> m_group_interfaces;
 
@@ -411,6 +438,11 @@
   My_xp_cond_impl m_wait_for_ssl_init_cond;
   My_xp_mutex_impl m_wait_for_ssl_init_mutex;
 
+  /**
+   Network namespace service provider
+   */
+  Network_namespace_manager *m_netns_manager;
+
  private:
   /*
     Disabling the copy constructor and assignment operator.
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_networking.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_networking.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_networking.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_networking.cc	2021-09-28 11:46:34.000000000 +0000
@@ -38,9 +38,9 @@
 #include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe.h"
 
 #if defined(_WIN32)
-#include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe_win32.cc"
+#include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe_win32.h"
 #else
-#include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe_ix.cc"
+#include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe_ix.h"
 #endif
 
 /**
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_notification.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_notification.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_notification.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_notification.cc	2021-09-28 11:46:34.000000000 +0000
@@ -62,13 +62,14 @@
 }
 
 Data_notification::Data_notification(xcom_receive_data_functor *functor,
-                                     synode_no message_id,
+                                     synode_no message_id, synode_no origin,
                                      Gcs_xcom_nodes *xcom_nodes,
 
                                      synode_no last_removed, u_int size,
                                      char *data)
     : m_functor(functor),
       m_message_id(message_id),
+      m_origin(origin),
       m_xcom_nodes(xcom_nodes),
       m_last_removed(last_removed),
       m_size(size),
@@ -77,7 +78,8 @@
 Data_notification::~Data_notification() = default;
 
 void Data_notification::do_execute() {
-  (*m_functor)(m_message_id, m_xcom_nodes, m_last_removed, m_size, m_data);
+  (*m_functor)(m_message_id, m_origin, m_xcom_nodes, m_last_removed, m_size,
+               m_data);
 }
 
 Status_notification::Status_notification(xcom_status_functor *functor,
@@ -177,8 +179,8 @@
   m_wait_for_notification_mutex.destroy();
 }
 
-void Gcs_xcom_engine::initialize(
-    xcom_initialize_functor *functor MY_ATTRIBUTE((unused))) {
+void Gcs_xcom_engine::initialize(xcom_initialize_functor *functor
+                                 [[maybe_unused]]) {
   MYSQL_GCS_LOG_DEBUG("Gcs_xcom_engine::initialize invoked!");
   assert(m_notification_queue.empty());
   assert(m_schedule);
@@ -214,11 +216,11 @@
     m_notification_queue.pop();
     m_wait_for_notification_mutex.unlock();
 
-    MYSQL_GCS_LOG_TRACE("Started executing during regular phase: %p",
-                        notification)
+    MYSQL_GCS_LOG_TRACE("xcom_id %x Started executing during regular phase: %p",
+                        get_my_xcom_id(), notification)
     stop = (*notification)();
-    MYSQL_GCS_LOG_TRACE("Finish executing during regular phase: %p",
-                        notification)
+    MYSQL_GCS_LOG_TRACE("xcom_id %x Finish executing during regular phase: %p",
+                        get_my_xcom_id(), notification)
     delete notification;
   }
 }
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_notification.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_notification.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_notification.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_notification.h	2021-09-28 11:46:34.000000000 +0000
@@ -326,8 +326,8 @@
   Initialize_notification &operator=(Initialize_notification const &);
 };
 
-typedef void(xcom_receive_data_functor)(synode_no, Gcs_xcom_nodes *, synode_no,
-                                        u_int, char *);
+typedef void(xcom_receive_data_functor)(synode_no, synode_no, Gcs_xcom_nodes *,
+                                        synode_no, u_int, char *);
 /**
   Notification used to inform that data has been totally ordered.
 */
@@ -339,6 +339,7 @@
     @param functor Pointer to a function that contains that actual
                     core of the execution.
     @param message_id Messaged Id.
+    @param origin XCom synod of origin.
     @param xcom_nodes Set of nodes that participated in the consensus
                   to deliver the message.
     @param size Size of the message's content.
@@ -348,8 +349,9 @@
   */
 
   explicit Data_notification(xcom_receive_data_functor *functor,
-                             synode_no message_id, Gcs_xcom_nodes *xcom_nodes,
-                             synode_no last_removed, u_int size, char *data);
+                             synode_no message_id, synode_no origin,
+                             Gcs_xcom_nodes *xcom_nodes, synode_no last_removed,
+                             u_int size, char *data);
 
   /**
     Destructor for Data_notification
@@ -377,6 +379,11 @@
   synode_no m_message_id;
 
   /*
+    XCom synode of origin.
+  */
+  synode_no m_origin;
+
+  /*
     Set of nodes that participated in the consensus to deliver the
     message.
   */
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_proxy.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_proxy.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_proxy.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_proxy.cc	2021-09-28 11:46:34.000000000 +0000
@@ -25,9 +25,12 @@
 #include "plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_psi.h"
 #include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_utils.h"
 #include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/app_data.h"
+#include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/leader_info_data.h"
 #include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/synode_no.h"
 #include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_cfg.h"
-#include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.h"
+
+#include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/include/network_management_interface.h"
+#include "xdr_gen/xcom_vp.h"
 
 /*
   Time is defined in seconds.
@@ -41,14 +44,13 @@
 
 bool Gcs_xcom_proxy_impl::xcom_client_close_connection(
     connection_descriptor *fd) {
-  bool const successful = (::xcom_close_client_connection(fd) == 0);
-  return successful;
+  return !static_cast<bool>(::close_open_connection(fd));
 }
 
 connection_descriptor *Gcs_xcom_proxy_impl::xcom_client_open_connection(
     std::string saddr, xcom_port port) {
   const char *addr = saddr.c_str();
-  return ::xcom_open_client_connection(addr, port);
+  return ::open_new_connection(addr, port);
 }
 
 bool Gcs_xcom_proxy_impl::xcom_client_add_node(connection_descriptor *fd,
@@ -61,9 +63,11 @@
   app_data_ptr data = new_app_data();
   data = init_config_with_group(data, nl, remove_node_type, gid);
   /* Takes ownership of data. */
+  MYSQL_GCS_LOG_INFO(
+      "xcom_client_remove_node: Try to push xcom_client_remove_node to XCom");
   bool const successful = xcom_input_try_push(data);
   if (!successful) {
-    MYSQL_GCS_LOG_DEBUG("xcom_client_remove_node: Failed to push into XCom.");
+    MYSQL_GCS_LOG_INFO("xcom_client_remove_node: Failed to push into XCom.");
   }
   return successful;
 }
@@ -117,6 +121,60 @@
   return successful;
 }
 
+bool Gcs_xcom_proxy_impl::xcom_client_set_leaders(
+    uint32_t gid, u_int nr_preferred_leaders, char const *preferred_leaders[],
+    node_no max_nr_leaders) {
+  app_data_ptr data = new_app_data();
+  init_set_leaders(gid, data, nr_preferred_leaders, preferred_leaders,
+                   new_app_data(), max_nr_leaders);
+  /* Takes ownership of data. */
+  Gcs_xcom_input_queue::future_reply future =
+      xcom_input_try_push_and_get_reply(data);
+  std::unique_ptr<Gcs_xcom_input_queue::Reply> reply = future.get();
+  bool const processable_reply =
+      (reply.get() != nullptr && reply->get_payload() != nullptr);
+
+  bool successful = false;
+  if (processable_reply) {
+    successful = (reply->get_payload()->cli_err == REQUEST_OK);
+  }
+
+  if (!successful) {
+    MYSQL_GCS_LOG_DEBUG("%s: Failed to push into XCom.", __func__);
+  }
+
+  return successful;
+}
+
+bool Gcs_xcom_proxy_impl::xcom_client_get_leaders(uint32_t gid,
+                                                  leader_info_data &leaders) {
+  bool successful = false;
+  app_data_ptr data = new_app_data();
+  data = init_get_leaders_msg(data, gid);
+  /* Takes ownership of data. */
+  Gcs_xcom_input_queue::future_reply future =
+      xcom_input_try_push_and_get_reply(data);
+  std::unique_ptr<Gcs_xcom_input_queue::Reply> reply = future.get();
+  bool const processable_reply =
+      (reply.get() != nullptr && reply->get_payload() != nullptr);
+  if (processable_reply) {
+    bool const reply_ok = (reply->get_payload()->cli_err == REQUEST_OK);
+    if (reply_ok) {
+      leaders = steal_leader_info_data(
+          reply->get_payload()->rd->reply_data_u.leaders);
+      successful = true;
+    } else {
+      MYSQL_GCS_LOG_DEBUG(
+          "xcom_client_get_leaders: Couldn't fetch the leader info. "
+          "(cli_err=%d)",
+          reply->get_payload()->cli_err);
+    }
+  } else {
+    MYSQL_GCS_LOG_DEBUG("xcom_client_get_leaders: Failed to push into XCom.");
+  }
+  return successful;
+}
+
 bool Gcs_xcom_proxy_impl::xcom_client_get_synode_app_data(
     connection_descriptor *fd, uint32_t gid, synode_no_array &synodes,
     synode_app_data_array &reply) {
@@ -194,39 +252,58 @@
 }
 
 int Gcs_xcom_proxy_impl::xcom_get_ssl_mode(const char *mode) {
-  return ::xcom_get_ssl_mode(mode);
+  return ::get_network_management_interface()->xcom_get_ssl_mode(mode);
 }
 
 int Gcs_xcom_proxy_impl::xcom_get_ssl_fips_mode(const char *ssl_fips_mode) {
-  return ::xcom_get_ssl_fips_mode(ssl_fips_mode);
+  return ::get_network_management_interface()->xcom_get_ssl_fips_mode(
+      ssl_fips_mode);
 }
 
 int Gcs_xcom_proxy_impl::xcom_set_ssl_mode(int mode) {
-  return ::xcom_set_ssl_mode(mode);
+  return ::get_network_management_interface()->xcom_set_ssl_mode(mode);
 }
 
 int Gcs_xcom_proxy_impl::xcom_set_ssl_fips_mode(int mode) {
-  return ::xcom_set_ssl_fips_mode(mode);
+  return ::get_network_management_interface()->xcom_set_ssl_fips_mode(mode);
 }
 
 bool Gcs_xcom_proxy_impl::xcom_init_ssl() {
+  Network_configuration_parameters security_params;
+
+  security_params.ssl_params.ssl_mode = m_ssl_mode;
+  security_params.ssl_params.server_key_file = m_server_key_file;
+  security_params.ssl_params.server_cert_file = m_server_cert_file;
+  security_params.ssl_params.client_key_file = m_client_key_file;
+  security_params.ssl_params.client_cert_file = m_client_cert_file;
+  security_params.ssl_params.ca_file = m_ca_file;
+  security_params.ssl_params.ca_path = m_ca_path;
+  security_params.ssl_params.crl_file = m_crl_file;
+  security_params.ssl_params.crl_path = m_crl_path;
+  security_params.ssl_params.cipher = m_cipher;
+  security_params.tls_params.tls_version = m_tls_version;
+  security_params.tls_params.tls_ciphersuites = m_tls_ciphersuites;
+
   bool const successful =
-      (::xcom_init_ssl(m_server_key_file, m_server_cert_file, m_client_key_file,
-                       m_client_cert_file, m_ca_file, m_ca_path, m_crl_file,
-                       m_crl_path, m_cipher, m_tls_version,
-                       m_tls_ciphersuites) == 1);
+      get_network_operations_interface()
+          ->configure_active_provider_secure_connections(security_params);
+
   return successful;
 }
 
-void Gcs_xcom_proxy_impl::xcom_destroy_ssl() { ::xcom_destroy_ssl(); }
+void Gcs_xcom_proxy_impl::xcom_destroy_ssl() {
+  ::get_network_management_interface()->finalize_secure_connections_context();
+}
 
 bool Gcs_xcom_proxy_impl::xcom_use_ssl() {
-  bool const will_use = (::xcom_use_ssl() == 1);
+  bool const will_use =
+      (get_network_management_interface()->is_xcom_using_ssl() == 1);
   return will_use;
 }
 
 void Gcs_xcom_proxy_impl::xcom_set_ssl_parameters(ssl_parameters ssl,
                                                   tls_parameters tls) {
+  m_ssl_mode = ssl.ssl_mode;
   m_server_key_file = ssl.server_key_file;
   m_server_cert_file = ssl.server_cert_file;
   m_client_key_file = ssl.client_key_file;
@@ -253,17 +330,18 @@
       m_cond_xcom_exit(),
       m_is_xcom_exit(false),
       m_socket_util(nullptr),
-      m_server_key_file(),
-      m_server_cert_file(),
-      m_client_key_file(),
-      m_client_cert_file(),
-      m_ca_file(),
-      m_ca_path(),
-      m_crl_file(),
-      m_crl_path(),
-      m_cipher(),
-      m_tls_version(),
-      m_tls_ciphersuites(),
+      m_ssl_mode(SSL_DISABLED),
+      m_server_key_file(nullptr),
+      m_server_cert_file(nullptr),
+      m_client_key_file(nullptr),
+      m_client_cert_file(nullptr),
+      m_ca_file(nullptr),
+      m_ca_path(nullptr),
+      m_crl_file(nullptr),
+      m_crl_path(nullptr),
+      m_cipher(nullptr),
+      m_tls_version(nullptr),
+      m_tls_ciphersuites(nullptr),
       m_should_exit(false) {
   m_lock_xcom_ready.init(key_GCS_MUTEX_Gcs_xcom_proxy_impl_m_lock_xcom_ready,
                          nullptr);
@@ -292,17 +370,17 @@
       m_cond_xcom_exit(),
       m_is_xcom_exit(false),
       m_socket_util(nullptr),
-      m_server_key_file(),
-      m_server_cert_file(),
-      m_client_key_file(),
-      m_client_cert_file(),
-      m_ca_file(),
-      m_ca_path(),
-      m_crl_file(),
-      m_crl_path(),
-      m_cipher(),
-      m_tls_version(),
-      m_tls_ciphersuites(),
+      m_server_key_file(nullptr),
+      m_server_cert_file(nullptr),
+      m_client_key_file(nullptr),
+      m_client_cert_file(nullptr),
+      m_ca_file(nullptr),
+      m_ca_path(nullptr),
+      m_crl_file(nullptr),
+      m_crl_path(nullptr),
+      m_cipher(nullptr),
+      m_tls_version(nullptr),
+      m_tls_ciphersuites(nullptr),
       m_should_exit(false) {
   m_lock_xcom_ready.init(key_GCS_MUTEX_Gcs_xcom_proxy_impl_m_lock_xcom_ready,
                          nullptr);
@@ -336,7 +414,7 @@
 }
 
 node_address *Gcs_xcom_proxy_impl::new_node_address_uuid(unsigned int n,
-                                                         char *names[],
+                                                         char const *names[],
                                                          blob uuids[]) {
   return ::new_node_address_uuid(n, names, uuids);
 }
@@ -380,7 +458,7 @@
 }
 
 enum_gcs_error Gcs_xcom_proxy_impl::xcom_wait_ready() {
-  auto event_string = [](MY_ATTRIBUTE((unused)) int res) {
+  auto event_string = []([[maybe_unused]] int res) {
     return "the group communication engine to be ready";
   };
   return xcom_wait_for_condition(
@@ -451,7 +529,7 @@
   auto wait_cond = [this]() {
     return m_xcom_comms_status == XCOM_COMM_STATUS_UNDEFINED;
   };
-  auto event_string = [](MY_ATTRIBUTE((unused)) int res) {
+  auto event_string = []([[maybe_unused]] int res) {
     return "the group communication engine's communications status to change";
   };
 
@@ -505,6 +583,7 @@
   xcom_input_disconnect();
   bool const successful =
       ::xcom_input_new_signal_connection(address.c_str(), port);
+
   return successful;
 }
 
@@ -547,6 +626,11 @@
   if (the_app_xcom_cfg) the_app_xcom_cfg->m_cache_limit = size;
 }
 
+void Gcs_xcom_app_cfg::set_network_namespace_manager(
+    Network_namespace_manager *ns_mgr) {
+  if (the_app_xcom_cfg) the_app_xcom_cfg->network_ns_manager = ns_mgr;
+}
+
 bool Gcs_xcom_app_cfg::set_identity(node_address *identity) {
   bool constexpr kError = true;
   bool constexpr kSuccess = false;
@@ -638,6 +722,25 @@
   return xcom_client_set_event_horizon(group_id_hash, event_horizon);
 }
 
+bool Gcs_xcom_proxy_base::xcom_set_leaders(uint32_t group_id_hash,
+                                           u_int nr_preferred_leaders,
+                                           char const *preferred_leaders[],
+                                           node_no max_nr_leaders) {
+  MYSQL_GCS_LOG_DEBUG(
+      "Reconfiguring XCom's preferred leaders to nr_preferred_leaders=%" PRIu32
+      " preferred_leaders[0]=%s max_nr_leaders=%" PRIu32,
+      nr_preferred_leaders,
+      nr_preferred_leaders > 0 ? preferred_leaders[0] : "n/a", max_nr_leaders);
+  return xcom_client_set_leaders(group_id_hash, nr_preferred_leaders,
+                                 preferred_leaders, max_nr_leaders);
+}
+
+bool Gcs_xcom_proxy_base::xcom_get_leaders(uint32_t group_id_hash,
+                                           leader_info_data &leaders) {
+  MYSQL_GCS_LOG_DEBUG("Retrieving leader information");
+  return xcom_client_get_leaders(group_id_hash, leaders);
+}
+
 static bool convert_synode_set_to_synode_array(
     synode_no_array &to,
     std::unordered_set<Gcs_xcom_synode> const &synode_set) {
@@ -718,7 +821,7 @@
 bool Gcs_xcom_proxy_base::serialize_nodes_information(Gcs_xcom_nodes &nodes,
                                                       node_list &nl) {
   unsigned int len = 0;
-  char **addrs = nullptr;
+  char const **addrs = nullptr;
   blob *uuids = nullptr;
   nl = {0, nullptr};
 
@@ -793,11 +896,28 @@
                                                    xcom_port port) {
   connection_descriptor *con = xcom_client_open_connection(host, port);
 
-  bool const could_connect_to_local_xcom = (con != nullptr);
+  bool const could_connect_to_local_xcom = (con->fd != -1);
   bool could_disconnect_from_local_xcom = false;
   if (could_connect_to_local_xcom) {
     could_disconnect_from_local_xcom = xcom_client_close_connection(con);
   }
 
+  free(con);
+
   return could_connect_to_local_xcom && could_disconnect_from_local_xcom;
 }
+
+bool Gcs_xcom_proxy_base::initialize_network_manager() {
+  return get_network_management_interface()->initialize();
+}
+
+bool Gcs_xcom_proxy_base::finalize_network_manager() {
+  return get_network_management_interface()->finalize();
+}
+
+bool Gcs_xcom_proxy_base::set_network_manager_active_provider(
+    enum_transport_protocol new_value) {
+  get_network_management_interface()->set_running_protocol(new_value);
+
+  return false;
+}
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_proxy.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_proxy.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_proxy.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_proxy.h	2021-09-28 11:46:34.000000000 +0000
@@ -25,6 +25,8 @@
 
 #include <string>
 #include <unordered_set>  // std::unordered_set
+#include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/include/network_provider.h"
+
 #include "plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_types.h"
 #include "plugin/group_replication/libmysqlgcs/include/mysql/gcs/xplatform/my_xp_cond.h"
 #include "plugin/group_replication/libmysqlgcs/include/mysql/gcs/xplatform/my_xp_mutex.h"
@@ -68,7 +70,8 @@
     @c delete_node_address
   */
 
-  virtual node_address *new_node_address_uuid(unsigned int n, char *names[],
+  virtual node_address *new_node_address_uuid(unsigned int n,
+                                              char const *names[],
                                               blob uuids[]) = 0;
 
   /**
@@ -195,6 +198,42 @@
       uint32_t group_id, xcom_event_horizon event_horizon) = 0;
 
   /**
+    This member function is responsible for triggering the reconfiguration of
+    the leaders of the XCom configuration. This function is asynchronous, so you
+    need to poll @c xcom_get_leaders to actually validate that the
+    reconfiguration was successful.
+
+    @param group_id The identifier of the group
+    @param nr_preferred_leaders Number of preferred leaders, i.e. elements in
+                                @c preferred_leaders
+    @param preferred_leaders The "host:port" of the preferred leaders
+    @param max_nr_leaders Maximum number of active leaders
+    @returns true (false) on success (failure). Success means that XCom will
+             process our request, failure means it wont. There could be errors
+             later in the process of setting the leaders. Since this is
+             basically an asynchronous function, one needs to busy-wait on
+             @c xcom_client_get_leaders to validate that the leaders were
+             modified.
+  */
+  virtual bool xcom_client_set_leaders(uint32_t group_id,
+                                       u_int nr_preferred_leaders,
+                                       char const *preferred_leaders[],
+                                       node_no max_nr_leaders) = 0;
+
+  /**
+    This member function is responsible for retrieving the leaders of the
+    XCom configuration.
+
+    @param[in] group_id The identifier of the group
+    @param[out] leaders A reference to where the group's leaders will be written
+                        to
+    @retval true if successful and @c leaders was written to
+    @retval false otherwise
+ */
+  virtual bool xcom_client_get_leaders(uint32_t group_id,
+                                       leader_info_data &leaders) = 0;
+
+  /**
    This member function is responsible for retrieving the application payloads
    decided in the synodes in @c synodes, from the XCom instance connected to
    via @c fd.
@@ -341,7 +380,7 @@
   /**
     Initialize the SSL.
 
-    @returns true (false) on success (failure)
+    @returns true on error. False otherwise.
   */
 
   virtual bool xcom_init_ssl() = 0;
@@ -360,52 +399,6 @@
 
   virtual bool xcom_use_ssl() = 0;
 
-  /*
-    Set the necessary SSL parameters before initialization.
-
-    server_key_file  - Path of file that contains the server's X509 key in PEM
-                       format.
-    server_cert_file - Path of file that contains the server's X509 certificate
-                       in PEM format.
-    client_key_file  - Path of file that contains the client's X509 key in PEM
-                       format.
-    client_cert_file - Path of file that contains the client's X509 certificate
-                       in PEM format.
-    ca_file          - Path of file that contains list of trusted SSL CAs.
-    ca_path          - Path of directory that contains trusted SSL CA
-                       certificates in PEM format.
-    crl_file         - Path of file that contains certificate revocation lists.
-    crl_path         - Path of directory that contains certificate revocation
-                       list files.
-    cipher           - List of permitted ciphers to use for connection
-                       encryption.
-    tls_version      - Protocols permitted for secure connections.
-    tls_ciphersuites - List of permitted ciphersuites to use for TLS 1.3
-                       connection encryption.
-
-    Note that only the server_key_file/server_cert_file and the client_key_file/
-    client_cert_file are required and the rest of the pointers can be NULL.
-    If the key is provided along with the certificate, either the key file or
-    the other can be ommited.
-
-    The caller can free the parameters after the SSL is started
-    if this is necessary.
-  */
-  struct ssl_parameters {
-    const char *server_key_file;
-    const char *server_cert_file;
-    const char *client_key_file;
-    const char *client_cert_file;
-    const char *ca_file;
-    const char *ca_path;
-    const char *crl_file;
-    const char *crl_path;
-    const char *cipher;
-  };
-  struct tls_parameters {
-    const char *tls_version;
-    const char *tls_ciphersuites;
-  };
   virtual void xcom_set_ssl_parameters(ssl_parameters ssl,
                                        tls_parameters tls) = 0;
 
@@ -696,6 +689,14 @@
   */
   virtual bool xcom_set_event_horizon(uint32_t group_id_hash,
                                       xcom_event_horizon event_horizon) = 0;
+
+  virtual bool xcom_set_leaders(uint32_t group_id_hash,
+                                u_int nr_preferred_leaders,
+                                char const *preferred_leaders[],
+                                node_no max_nr_leaders) = 0;
+  virtual bool xcom_get_leaders(uint32_t group_id_hash,
+                                leader_info_data &leaders) = 0;
+
   /**
     Function to reconfigure the maximum size of the XCom cache.
 
@@ -794,6 +795,32 @@
    * @returns true if we were able to successfully connect, false otherwise.
    */
   virtual bool test_xcom_tcp_connection(std::string &host, xcom_port port) = 0;
+
+  /**
+   * @brief Initializes XCom's Network Manager. This must be called to ensure
+   *        that we have client connection abilities since the start of GCS.
+   *
+   * @return true in case of error, false otherwise.
+   */
+  virtual bool initialize_network_manager() = 0;
+
+  /**
+   * @brief Finalizes XCom's Network Manager. This cleans up everythins
+   *        regarding network.
+   *
+   * @return true in case of error, false otherwise.
+   */
+  virtual bool finalize_network_manager() = 0;
+
+  /**
+   * @brief Set XCom's network manager active provider
+   *
+   * @param new_value the value of the Communication Stack to use.
+   *
+   * @return true in case of error, false otherwise.
+   */
+  virtual bool set_network_manager_active_provider(
+      enum_transport_protocol new_value) = 0;
 };
 
 /*
@@ -826,6 +853,11 @@
                               xcom_event_horizon &event_horizon) override;
   bool xcom_set_event_horizon(uint32_t group_id_hash,
                               xcom_event_horizon event_horizon) override;
+  bool xcom_set_leaders(uint32_t group_id_hash, u_int nr_preferred_leaders,
+                        char const *preferred_leaders[],
+                        node_no max_nr_leaders) override;
+  bool xcom_get_leaders(uint32_t group_id_hash,
+                        leader_info_data &leaders) override;
   bool xcom_get_synode_app_data(
       Gcs_xcom_node_information const &xcom_instance, uint32_t group_id_hash,
       const std::unordered_set<Gcs_xcom_synode> &synode_set,
@@ -833,6 +865,11 @@
   bool xcom_set_cache_size(uint64_t size) override;
   bool xcom_force_nodes(Gcs_xcom_nodes &nodes, uint32_t group_id_hash) override;
 
+  bool initialize_network_manager() override;
+  bool finalize_network_manager() override;
+  bool set_network_manager_active_provider(
+      enum_transport_protocol new_value) override;
+
  private:
   /* Serialize information on nodes to be sent to XCOM */
   bool serialize_nodes_information(Gcs_xcom_nodes &nodes, node_list &nl);
@@ -855,7 +892,7 @@
   Gcs_xcom_proxy_impl(unsigned int wt);
   ~Gcs_xcom_proxy_impl() override;
 
-  node_address *new_node_address_uuid(unsigned int n, char *names[],
+  node_address *new_node_address_uuid(unsigned int n, char const *names[],
                                       blob uuids[]) override;
   void delete_node_address(unsigned int n, node_address *na) override;
   bool xcom_client_add_node(connection_descriptor *fd, node_list *nl,
@@ -867,6 +904,12 @@
       uint32_t group_id, xcom_event_horizon &event_horizon) override;
   bool xcom_client_set_event_horizon(uint32_t group_id,
                                      xcom_event_horizon event_horizon) override;
+  bool xcom_client_set_leaders(uint32_t gid, u_int nr_preferred_leaders,
+                               char const *preferred_leaders[],
+                               node_no max_nr_leaders) override;
+  bool xcom_client_get_leaders(uint32_t gid,
+                               leader_info_data &leaders) override;
+
   bool xcom_client_get_synode_app_data(connection_descriptor *con,
                                        uint32_t group_id_hash,
                                        synode_no_array &synodes,
@@ -941,6 +984,7 @@
   My_xp_socket_util *m_socket_util;
 
   // Stores SSL parameters
+  int m_ssl_mode;
   const char *m_server_key_file;
   const char *m_server_cert_file;
   const char *m_client_key_file;
@@ -1035,6 +1079,13 @@
   bool set_identity(node_address *identity);
 
   /**
+   * @brief Sets the network namespace manager
+   *
+   * @param ns_mgr a reference to a Network_namespace_manager implementation
+   */
+  void set_network_namespace_manager(Network_namespace_manager *ns_mgr);
+
+  /**
     Must be called when XCom is not engaged anymore.
    */
   void deinit();
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_state_exchange.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_state_exchange.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_state_exchange.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_state_exchange.cc	2021-09-28 11:46:34.000000000 +0000
@@ -86,6 +86,7 @@
 
   return snapshot_size;
 }
+extern uint32_t get_my_xcom_id();
 
 bool Xcom_member_state::encode_header(uchar *buffer,
                                       uint64_t *buffer_len) const {
@@ -97,7 +98,8 @@
   uint64_t encoded_size = get_encode_header_size();
   unsigned char *slider = buffer;
 
-  MYSQL_GCS_LOG_TRACE("Encoding header for exchangeable data.")
+  MYSQL_GCS_LOG_TRACE("xcom_id %x Encoding header for exchangeable data.",
+                      get_my_xcom_id())
 
   if (buffer == nullptr || buffer_len == nullptr) {
     MYSQL_GCS_LOG_ERROR(
@@ -145,8 +147,9 @@
   assert(static_cast<uint64_t>(slider - buffer) == encoded_size);
 
   MYSQL_GCS_LOG_TRACE(
-      "Encoded header for exchangeable data: (header)=%llu view_id %s",
-      static_cast<long long unsigned>(encoded_size),
+      "xcom_id %x Encoded header for exchangeable data: (header)=%llu view_id "
+      "%s",
+      get_my_xcom_id(), static_cast<long long unsigned>(encoded_size),
       m_view_id->get_representation().c_str());
 
   return false;
@@ -161,7 +164,8 @@
   /* There is no snapshot information on protocol V1. */
   if (m_version == Gcs_protocol_version::V1) goto end;
 
-  MYSQL_GCS_LOG_TRACE("Encoding snapshot for exchangeable data.")
+  MYSQL_GCS_LOG_TRACE("xcom_id %x Encoding snapshot for exchangeable data.",
+                      get_my_xcom_id())
 
   if (buffer == nullptr || buffer_len == nullptr) {
     MYSQL_GCS_LOG_ERROR(
@@ -1082,7 +1086,8 @@
       m_joining_leaving_mutex(),
       m_current_view(nullptr),
       m_current_view_mutex(),
-      m_belongs_to_group(false) {
+      m_belongs_to_group(false),
+      m_finalized(false) {
   m_wait_for_view_cond.init(
       key_GCS_COND_Gcs_xcom_view_change_control_m_wait_for_view_cond);
   m_wait_for_view_mutex.init(
@@ -1222,3 +1227,7 @@
 
   return retval;
 }
+
+void Gcs_xcom_view_change_control::finalize() { m_finalized.store(true); }
+
+bool Gcs_xcom_view_change_control::is_finalized() { return m_finalized.load(); }
\ No newline at end of file
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_state_exchange.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_state_exchange.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_state_exchange.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_state_exchange.h	2021-09-28 11:46:34.000000000 +0000
@@ -738,6 +738,10 @@
   virtual void set_belongs_to_group(bool belong) = 0;
   virtual void set_unsafe_current_view(Gcs_view *current_view) = 0;
   virtual Gcs_view *get_unsafe_current_view() = 0;
+
+  // Keep track if GCS as a whole has been ordered to finalize;
+  virtual void finalize() = 0;
+  virtual bool is_finalized() = 0;
 };
 
 /*
@@ -771,6 +775,9 @@
   void set_unsafe_current_view(Gcs_view *current_view) override;
   Gcs_view *get_unsafe_current_view() override;
 
+  void finalize() override;
+  bool is_finalized() override;
+
  private:
   bool m_view_changing;
   bool m_leaving;
@@ -797,6 +804,10 @@
   bool m_belongs_to_group;
 
   /*
+   */
+  std::atomic<bool> m_finalized;
+
+  /*
     Disabling the copy constructor and assignment operator.
   */
   Gcs_xcom_view_change_control(Gcs_xcom_view_change_control const &);
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_utils.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_utils.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_utils.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_utils.cc	2021-09-28 11:46:34.000000000 +0000
@@ -167,6 +167,14 @@
       interface_params.get_parameter("fragmentation_threshold"));
   std::string *xcom_cache_size_str = const_cast<std::string *>(
       interface_params.get_parameter("xcom_cache_size"));
+  std::string *communication_stack_str = const_cast<std::string *>(
+      interface_params.get_parameter("communication_stack"));
+
+  // Sets the default value for the communication stack to use
+  if (!communication_stack_str) {  // Default is XCom...
+    interface_params.add_parameter("communication_stack",
+                                   std::to_string(XCOM_PROTOCOL));
+  }
 
   // sets the default value for compression (ON by default)
   if (!compression_str) {
@@ -309,7 +317,8 @@
 }
 
 bool is_parameters_syntax_correct(
-    const Gcs_interface_parameters &interface_params) {
+    const Gcs_interface_parameters &interface_params,
+    Network_namespace_manager *netns_manager) {
   enum_gcs_error error = GCS_OK;
   Gcs_sock_probe_interface *sock_probe_interface =
       new Gcs_sock_probe_interface_impl();
@@ -349,6 +358,8 @@
       interface_params.get_parameter("fragmentation");
   const std::string *xcom_cache_size_str =
       interface_params.get_parameter("xcom_cache_size");
+  const std::string *communication_stack_str =
+      interface_params.get_parameter("communication_stack");
 
   /*
     -----------------------------------------------------
@@ -405,10 +416,19 @@
     }
   }
 
+  // Communication Stack
+  if (communication_stack_str && (communication_stack_str->size() == 0 ||
+                                  !is_number(*communication_stack_str))) {
+    MYSQL_GCS_LOG_ERROR("The Commmunication Stack parameter ("
+                        << communication_stack_str << ") is not valid.")
+    error = GCS_NOK;
+    goto end;
+  }
+
   // local peer address
   if (local_node_str != nullptr) {
     bool matches_local_ip = false;
-    std::map<std::string, int> ips;
+    std::map<std::string, int> ips, namespace_ips;
     std::map<std::string, int>::iterator it;
 
     char host_str[IP_MAX_SIZE];
@@ -424,7 +444,8 @@
 
     std::string host(host_str);
     std::vector<std::string> ip;
-
+    int configured_protocol;
+    std::string net_namespace;
     // first validate hostname
     if (!is_valid_hostname(*local_node_str)) {
       MYSQL_GCS_LOG_ERROR("Invalid hostname or IP address ("
@@ -458,7 +479,7 @@
       goto end;
     }
 
-    // see if any IP matches
+    // see if any IP matches fromt he root namespace
     for (it = ips.begin(); it != ips.end() && !matches_local_ip; it++) {
       for (auto &ip_entry : ip) {
         matches_local_ip = (*it).first.compare(ip_entry) == 0;
@@ -467,6 +488,42 @@
       }
     }
 
+    // If this server is configured to use a MySQL connection, we must check
+    //  if we have a network namespace configured. If so, we must also check
+    //  if the address exists in the network namespace
+    configured_protocol = std::stoi(*communication_stack_str);
+    /* purecov: begin deadcode */
+    if (!matches_local_ip && netns_manager &&
+        configured_protocol > XCOM_PROTOCOL) {
+      // Check if we have a namespace configured
+      netns_manager->channel_get_network_namespace(net_namespace);
+      if (!net_namespace.empty()) {  // If the namespace is configured
+        netns_manager->set_network_namespace(net_namespace);
+
+        // second check that this host has that IP assigned in a namespace
+        //  Use all interfaces, active or not, that contain an IP address
+        if (get_local_addresses(*sock_probe_interface, namespace_ips)) {
+          MYSQL_GCS_LOG_ERROR(
+              "Unable to get the list of local IP addresses for "
+              "the server!");
+          error = GCS_NOK;
+          netns_manager->restore_original_network_namespace();
+          goto end;
+        }
+
+        // see if any IP matches fromt he root namespace
+        for (it = namespace_ips.begin();
+             it != namespace_ips.end() && !matches_local_ip; it++) {
+          for (auto &ip_entry : ip) {
+            matches_local_ip = (*it).first.compare(ip_entry) == 0;
+
+            if (matches_local_ip) break;
+          }
+        }
+        netns_manager->restore_original_network_namespace();
+      }
+    }
+    /* purecov: end */
     if (!matches_local_ip) {
       MYSQL_GCS_LOG_ERROR(
           "There is no local IP address matching the one "
@@ -587,8 +644,9 @@
            MIN_XCOM_MAX_CACHE_SIZE ||
        // Check that it is not higher than the max value allowed
        strtoull(xcom_cache_size_str->c_str(), nullptr, 10) > ULONG_MAX ||
-       // Check that it is within the range of values allowed for the var type.
-       // This is need in addition to the check above because of overflows.
+       // Check that it is within the range of values allowed for the var
+       // type. This is need in addition to the check above because of
+       // overflows.
        errno == ERANGE)) {
     MYSQL_GCS_LOG_ERROR("The xcom_cache_size parameter ("
                         << xcom_cache_size_str->c_str() << ") is not valid.")
@@ -610,8 +668,10 @@
     case Gcs_protocol_version::V2:
       version = "8.0.16";
       break;
+    case Gcs_protocol_version::HIGHEST_KNOWN:
+      version = "8.0.27";
+      break;
     case Gcs_protocol_version::UNKNOWN:
-    case Gcs_protocol_version::V3:
     case Gcs_protocol_version::V4:
     case Gcs_protocol_version::V5:
       /* This should not happen... */
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_utils.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_utils.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_utils.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_utils.h	2021-09-28 11:46:34.000000000 +0000
@@ -26,6 +26,7 @@
 #include <vector>
 #include "plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_group_identifier.h"
 #include "plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_types.h"
+#include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/include/network_provider.h"
 #include "plugin/group_replication/libmysqlgcs/xdr_gen/xcom_vp.h"
 
 #define XCOM_PREFIX "[XCOM] "
@@ -111,10 +112,12 @@
 }
 
 /**
- Parses the string "host:port" and checks if it is correct.
-
- @param server_and_port the server hostname and port in the form hostname:port.
- @return true if it is a valid URL, false otherwise.
+ * @brief Parses the string "host:port" and checks if it is correct.
+ *
+ * @param server_and_port the server hostname and port in the form
+ * hostname:port.
+ *
+ * @return true if it is a valid URL, false otherwise.
  */
 bool is_valid_hostname(const std::string &server_and_port);
 
@@ -134,8 +137,13 @@
 /**
  Checks that parameters are syntactically valid.
 
- @param params The parameters to validate syntactically.
+ @param params        The parameters to validate syntactically.
+ @param netns_manager A reference to a Network Namespace Manager.
+                      This is needed because of the allowlist configuration and
+                      local address validation.
+
  @returns false if there is a syntax error, true otherwise.
  */
-bool is_parameters_syntax_correct(const Gcs_interface_parameters &params);
+bool is_parameters_syntax_correct(const Gcs_interface_parameters &params,
+                                  Network_namespace_manager *netns_manager);
 #endif /* GCS_XCOM_UTILS_INCLUDED */
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/app_data.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/app_data.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/app_data.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/app_data.cc	2021-09-28 11:46:34.000000000 +0000
@@ -32,6 +32,7 @@
 #include "xcom/node_list.h"
 #include "xcom/node_set.h"
 #include "xcom/simset.h"
+#include "xcom/site_def.h"
 #include "xcom/synode_no.h"
 #include "xcom/task.h"
 #include "xcom/task_debug.h"
@@ -108,6 +109,17 @@
       case set_event_horizon_type:
         NDBG(a->body.app_u_u.event_horizon, u);
         break;
+      case set_max_leaders:
+        NDBG(a->body.app_u_u.max_leaders, u);
+        break;
+      case set_leaders_type:
+        for (u_int i = 0; i < a->body.app_u_u.leaders.leader_array_len; i++) {
+          STREXP(a->body.app_u_u.leaders.leader_array_val[i].address);
+          STREXP(" ");
+        }
+        break;
+      case get_leaders_type:
+        break;
       default:
         STRLIT("unknown type ");
         break;
@@ -199,6 +211,12 @@
       case set_event_horizon_type:
         p->body.app_u_u.event_horizon = a->body.app_u_u.event_horizon;
         break;
+      case set_max_leaders:
+        p->body.app_u_u.max_leaders = a->body.app_u_u.max_leaders;
+        break;
+      case set_leaders_type:
+        p->body.app_u_u.leaders = clone_leader_array(a->body.app_u_u.leaders);
+        break;
       default: /* Should not happen */
         str = dbg_app_data(a);
         G_ERROR("%s", str);
@@ -220,6 +238,10 @@
 
 /**
    Return size of an app_data.
+   Used both for keeping track of the size of cached data, which is OK, as long
+   as no one steals the payload, and to control the xcom automatic
+   batching, which is more dubious, since there we should use the length of
+   serialized data.
  */
 size_t app_data_size(app_data const *a) {
   size_t size = sizeof(*a);
@@ -250,6 +272,10 @@
     case x_terminate_and_exit:
     case get_event_horizon_type:
     case set_event_horizon_type:
+    case get_synode_app_data_type:
+    case convert_into_local_server_type:
+    case set_max_leaders:
+    case set_leaders_type:
       break;
     default: /* Should not happen */
       DBGOUT_ASSERT(FALSE, STRLIT("No such cargo type "); NDBG(a->body.c_t, d));
@@ -277,7 +303,7 @@
    Constructor for app_data
  */
 app_data_ptr new_app_data() {
-  app_data_ptr retval = (app_data_ptr)calloc((size_t)1, sizeof(app_data));
+  app_data_ptr retval = (app_data_ptr)xcom_calloc((size_t)1, sizeof(app_data));
   retval->expiry_time = 13.0;
   return retval;
 }
@@ -347,6 +373,7 @@
   return n;
 }
 
+#ifdef XCOM_STANDALONE
 /* Create a new app_data message from list of node:port */
 
 app_data_ptr new_nodes(u_int n, node_address *names, cargo_type cargo) {
@@ -365,7 +392,8 @@
   app_data_ptr retval = new_app_data();
   retval->body.c_t = app_type;
   retval->body.app_u_u.data.data_len = n;
-  retval->body.app_u_u.data.data_val = (char *)calloc((size_t)n, sizeof(char));
+  retval->body.app_u_u.data.data_val =
+      (char *)xcom_calloc((size_t)n, sizeof(char));
   for (i = 0; i < n; i++) {
     retval->body.app_u_u.data.data_val[i] = val[i];
   }
@@ -394,3 +422,4 @@
 }
 
 /* purecov: end */
+#endif
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/bitset.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/bitset.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/bitset.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/bitset.cc	2021-09-28 11:46:34.000000000 +0000
@@ -27,14 +27,15 @@
 #endif
 
 #include "xcom/task_debug.h"
+#include "xcom/xcom_memory.h"
 #include "xcom/xcom_profile.h"
 #include "xdr_gen/xcom_vp.h"
 
 bit_set *new_bit_set(uint32_t bits) {
-  bit_set *bs = (bit_set *)malloc(sizeof(*bs));
+  bit_set *bs = (bit_set *)xcom_malloc(sizeof(*bs));
   bs->bits.bits_len = howmany_words(bits, MASK_BITS);
   bs->bits.bits_val =
-      (bit_mask *)malloc(bs->bits.bits_len * sizeof(*bs->bits.bits_val));
+      (bit_mask *)xcom_malloc(bs->bits.bits_len * sizeof(*bs->bits.bits_val));
   BIT_ZERO(bs);
   return bs;
 }
@@ -42,10 +43,10 @@
 bit_set *clone_bit_set(bit_set *orig) {
   if (!orig) return orig;
   {
-    bit_set *bs = (bit_set *)malloc(sizeof(*bs));
+    bit_set *bs = (bit_set *)xcom_malloc(sizeof(*bs));
     bs->bits.bits_len = orig->bits.bits_len;
     bs->bits.bits_val =
-        (bit_mask *)malloc(bs->bits.bits_len * sizeof(*bs->bits.bits_val));
+        (bit_mask *)xcom_malloc(bs->bits.bits_len * sizeof(*bs->bits.bits_val));
     memcpy(bs->bits.bits_val, orig->bits.bits_val,
            bs->bits.bits_len * sizeof(*bs->bits.bits_val));
     return bs;
@@ -56,6 +57,8 @@
   free(bs->bits.bits_val);
   free(bs);
 }
+
+#ifdef XCOM_STANDALONE
 /* purecov: begin deadcode */
 
 void bit_set_or(bit_set *x, bit_set const *y) {
@@ -65,6 +68,7 @@
     x->bits.bits_val[i] |= y->bits.bits_val[i];
   }
 }
+#endif
 
 #if 0
 void bit_set_and(bit_set *x, bit_set const *y)
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/checked_data.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/checked_data.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/checked_data.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/checked_data.cc	2021-09-28 11:46:34.000000000 +0000
@@ -20,17 +20,17 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
-#include <stdlib.h> /* malloc */
 #include <string.h> /* memcpy */
 
 #include "xcom/checked_data.h"
+#include "xcom/xcom_memory.h"
 
 bool_t copy_checked_data(checked_data *const to,
                          checked_data const *const from) {
   bool_t copied = FALSE;
 
   to->data_len = 0;
-  to->data_val = (char *)malloc(from->data_len * sizeof(char));
+  to->data_val = (char *)xcom_malloc(from->data_len * sizeof(char));
   if (to->data_val != NULL) {
     to->data_len = from->data_len;
     memcpy(to->data_val, from->data_val, from->data_len);
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/get_synode_app_data.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/get_synode_app_data.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/get_synode_app_data.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/get_synode_app_data.cc	2021-09-28 11:46:34.000000000 +0000
@@ -30,6 +30,7 @@
 #include "xcom/synode_no.h"  /* synode_eq */
 #include "xcom/xcom_base.h"  /* pm_finished */
 #include "xcom/xcom_cache.h" /* pax_machine, hash_get */
+#include "xcom/xcom_memory.h"
 
 static xcom_get_synode_app_data_result can_satisfy_request(
     synode_no_array const *const synodes);
@@ -135,7 +136,7 @@
   u_int const nr_synodes = synodes->synode_no_array_len;
 
   reply->synode_app_data_array_val =
-      (synode_app_data *)calloc(nr_synodes, sizeof(synode_app_data));
+      (synode_app_data *)xcom_calloc(nr_synodes, sizeof(synode_app_data));
   if (reply->synode_app_data_array_val == NULL) {
     /* purecov: begin inspected */
     error_code = XCOM_GET_SYNODE_APP_DATA_NO_MEMORY;
@@ -185,6 +186,7 @@
   checked_data const *cached_data = &p->a->body.app_u_u.data;
 
   reply->synode = *synode;
+  reply->origin = p->a->unique_id;
 
   /*
    We need to copy because by the time the reply is sent, the cache may have
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/leader_info_data.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/leader_info_data.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/leader_info_data.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/leader_info_data.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,40 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include "xcom/leader_info_data.h" /* leader_info_data */
+
+// Essentially a move constructor, implemented before we switched to C++
+// This purely an optimization. Instead of first cloning the contents of from,
+// and then deallocate from by calling xdr_free, and then return the contents of
+// from, we simply steal the contents and reset from so it can be deallocated
+// without touching the contents.
+leader_info_data steal_leader_info_data(leader_info_data &from) {
+  leader_info_data new_owner = from;
+
+  from.max_nr_leaders = 0;
+  from.actual_leaders.leader_array_len = 0;
+  from.actual_leaders.leader_array_val = nullptr;
+  from.preferred_leaders.leader_array_len = 0;
+  from.preferred_leaders.leader_array_val = nullptr;
+
+  return new_owner;
+}
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/leader_info_data.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/leader_info_data.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/leader_info_data.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/leader_info_data.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,30 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef LEADER_INFO_DATA_H
+#define LEADER_INFO_DATA_H
+
+#include "xdr_gen/xcom_vp.h" /* leader_info_data */
+
+leader_info_data steal_leader_info_data(leader_info_data &from);
+
+#endif /* LEADER_INFO_DATA_H */
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/include/network_management_interface.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/include/network_management_interface.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/include/network_management_interface.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/include/network_management_interface.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,259 @@
+/* Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+
+   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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef NETWORK_MANAGEMENT_INTERFACE_H
+#define NETWORK_MANAGEMENT_INTERFACE_H
+
+#include "xcom/network/include/network_provider.h"
+
+#include <functional>
+
+/**
+ * @brief Inversion of Control interface to manage Network providers
+ */
+class Network_provider_management_interface {
+ public:
+  explicit Network_provider_management_interface() {}
+  virtual ~Network_provider_management_interface() {}
+
+  Network_provider_management_interface(
+      Network_provider_management_interface const &) =
+      delete;  // Copy construct
+  Network_provider_management_interface &operator=(
+      Network_provider_management_interface const &) = delete;  // Copy assign
+
+  Network_provider_management_interface(
+      Network_provider_management_interface &&) = default;  // Move construct
+  Network_provider_management_interface &operator=(
+      Network_provider_management_interface &&) = default;  // Move assign
+
+  /**
+   * @brief Initialize the network manager. It also creates the default XCom
+   *        provider and adds it to the manager.
+   *
+   * @return true in case of error. false otherwise.
+   */
+  virtual bool initialize() = 0;
+
+  /**
+   * @brief Finalize the network manager. It removes the default XCom
+   *        provider,
+   *
+   * @return true in case of error. false otherwise.
+   */
+  virtual bool finalize() = 0;
+
+  /**
+   * @brief Sets the running Communication Stack, thus defining the active
+   * provider.
+   *
+   * In runtime, this is will change the way we establish connections.
+   *
+   * @param new_value value of the Communication Stack
+   */
+  virtual void set_running_protocol(enum_transport_protocol new_value) = 0;
+
+  /**
+   * @brief Gets the configured running protocol
+   *
+   * It returns the value that is currently configured in the Running
+   * Communication Stack
+   *
+   * Since this value is dynamic, it can cause a mismatch from the provider
+   * that we are actively receiving connections and the provider that we use
+   * to establish new connections
+   *
+   * @return CommunicationStack value.
+   */
+  virtual enum_transport_protocol get_running_protocol() const = 0;
+
+  /**
+   * @brief Get the incoming connections Communication Stack
+   *
+   * This is the value that is used to report upwards the protocol in * which
+   * we are currently accepting connections.
+   *
+   * @return CommunicationStack
+   */
+  virtual enum_transport_protocol get_incoming_connections_protocol() const = 0;
+
+  /**
+   * @brief Add a new Gcs_network_provider instance
+   *
+   * @param provider an already instantiated shared_ptr object of a
+   *                 Gcs_network_provider
+   */
+  virtual void add_network_provider(
+      std::shared_ptr<Network_provider> provider) = 0;
+
+  virtual void remove_all_network_provider() = 0;
+
+  virtual void remove_network_provider(
+      enum_transport_protocol provider_key) = 0;
+
+  // SSL RELATED OPERATIONS
+  /**
+   Return whether the SSL will be used to encrypt data or not.
+
+   Return 1 if it is enabled 0 otherwise.
+*/
+  virtual int is_xcom_using_ssl() const = 0;
+
+  /**
+  Set the operation mode which might be the following:
+
+  . SSL_DISABLED (1): The SSL mode will be disabled and this is the default
+    value.
+
+  . SSL_PREFERRED (2): The SSL mode will be always disabled if this value is
+    provided and is only allowed to keep the solution compatibility with
+    MySQL server.
+
+  . SSL_REQUIRED (4): The SSL mode will be enabled but the verifications
+    described in the next modes are not performed.
+
+  . SSL_VERIFY_CA (4) - Verify the server TLS certificate against the
+  configured Certificate Authority (CA) certificates. The connection attempt
+  fails if no valid matching CA certificates are found.
+
+  . SSL_VERIFY_IDENTITY (5): Like VERIFY_CA, but additionally verify that the
+    server certificate matches the host to which the connection is attempted.
+
+  If a different value is provide, INVALID_SSL_MODE (-1) is returned.
+*/
+  virtual int xcom_set_ssl_mode(int mode) = 0;
+
+  /**
+    Return the operation mode as an integer from an operation mode provided
+    as a string. Note that the string must be provided in upper case letters
+    and the possible values are: "DISABLED", "PREFERRED", "REQUIRED",
+    "VERIFY_CA" or "VERIFY_IDENTITY".
+
+    If a different value is provide, INVALID_SSL_MODE (-1) is returned.
+  */
+  virtual int xcom_get_ssl_mode(const char *mode) = 0;
+
+  /**
+  Return the configured value into SSL mode
+  */
+  virtual int xcom_get_ssl_mode() = 0;
+
+  /**
+  Set the operation fips mode which might be the following:
+
+  . SSL_FIPS_MODE_OFF (0): This will set openssl fips mode value to 0
+
+  . SSL_FIPS_MODE_ON (1): This will set openssl fips mode value to 1
+
+  . SSL_FIPS_MODE_STRICT (2): This will set openssl fips mode value to 2
+
+  If a different value is provide, INVALID_SSL_FIPS_MODE (-1) is returned.
+  */
+  virtual int xcom_set_ssl_fips_mode(int mode) = 0;
+
+  /**
+   Return the operation fips mode as an integer from an operation fips mode
+   provided as a string. Note that the string must be provided in upper case
+   letters and the possible values are: "OFF", "ON", "STRICT",
+
+   If a different value is provide, INVALID_SSL_MODE (-1) is returned.
+  */
+  virtual int xcom_get_ssl_fips_mode(const char *mode) = 0;
+
+  /**
+  Returns the configured FIPS mode
+  */
+  virtual int xcom_get_ssl_fips_mode() = 0;
+
+  /**
+   * @brief Cleans up SSL context.
+   */
+  virtual void cleanup_secure_connections_context() = 0;
+
+  /**
+   * @brief Destroys all things SSL related
+   */
+  virtual void finalize_secure_connections_context() = 0;
+};
+
+/**
+ * @brief Inversion of Control proxy interface to operate Network providers
+ *
+ * For full documentation @see Network_provider_manager
+ */
+class Network_provider_operations_interface {
+ public:
+  Network_provider_operations_interface() {}
+  virtual ~Network_provider_operations_interface() {}
+
+  Network_provider_operations_interface(
+      Network_provider_operations_interface const &) =
+      delete;  // Copy construct
+  Network_provider_operations_interface &operator=(
+      Network_provider_operations_interface const &) = delete;  // Copy assign
+  /**
+   * @brief Start the active provider.
+   *
+   * @return true  In case of success.
+   * @return false In case of failure.
+   */
+  virtual bool start_active_network_provider() = 0;
+
+  /**
+   * @brief Stops all network providers.
+   *
+   * @return true In case of success stopping ALL network providers
+   * @return false In case of failure in stopping AT LEAST ONE network provider
+   */
+  virtual bool stop_all_network_providers() = 0;
+
+  /**
+   * @brief Stops the active provider.
+   *
+   * @return true  In case of success.
+   * @return false In case of failure.
+   */
+  virtual bool stop_active_network_provider() = 0;
+
+  /**
+   * @brief Configures the active provider
+   *
+   * @param params configuration parameters.
+   *
+   * @return true  In case of success.
+   * @return false In case of failure.
+   */
+  virtual bool configure_active_provider(
+      Network_configuration_parameters &params) = 0;
+
+  /**
+   * @brief COnfigures the active provider SSL parameters
+   *
+   * @param params the security parameters.
+   *
+   * @return true in case of error. false otherwise.
+   */
+  virtual bool configure_active_provider_secure_connections(
+      Network_configuration_parameters &params) = 0;
+};
+
+#endif  // NETWORK_MANAGEMENT_INTERFACE_H
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/include/network_provider.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/include/network_provider.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/include/network_provider.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/include/network_provider.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,426 @@
+/* Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+
+   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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef NETWORK_PROVIDER_H
+#define NETWORK_PROVIDER_H
+
+#ifndef XCOM_WITHOUT_OPENSSL
+#ifdef _WIN32
+/* In OpenSSL before 1.1.0, we need this first. */
+#include <winsock2.h>
+#endif
+#include <openssl/ssl.h>
+#endif
+
+#include <atomic>
+#include <memory>
+#include <string>
+#include <vector>
+
+/**
+ * @brief Enum that describes the available XCom Communication Stacks
+ */
+enum enum_transport_protocol {
+  INVALID_PROTOCOL = -1,
+  XCOM_PROTOCOL = 0,
+  MYSQL_PROTOCOL
+};
+
+/*
+  Possible operation modes as explained further down. If you
+  want to add a new mode, do it before the LAST_SSL_MODE.
+*/
+enum ssl_enum_mode_options {
+  INVALID_SSL_MODE = -1,
+  SSL_DISABLED = 1,
+  SSL_PREFERRED,
+  SSL_REQUIRED,
+  SSL_VERIFY_CA,
+  SSL_VERIFY_IDENTITY,
+  LAST_SSL_MODE
+};
+
+/*
+  Possible operation fips modes as explained further down. If you
+  want to add a new ssl fips mode, do it before the LAST_SSL_FIPS_MODE.
+*/
+enum ssl_enum_fips_mode_options {
+  INVALID_SSL_FIPS_MODE = -1,
+  FIPS_MODE_OFF = 0,
+  FIPS_MODE_ON,
+  FIPS_MODE_STRICT,
+  LAST_SSL_FIPS_MODE
+};
+
+/**
+ * @brief This class is a helper to translate a Communication Stack to a
+ string
+ *
+ */
+class Communication_stack_to_string {
+ public:
+  static const char *to_string(enum_transport_protocol protocol) {
+    static std::vector<const char *> m_running_protocol_to_string = {"XCom",
+                                                                     "MySQL"};
+
+    return protocol > INVALID_PROTOCOL && protocol <= MYSQL_PROTOCOL
+               ? m_running_protocol_to_string[protocol]
+               : "Invalid Protocol";
+  }
+};
+
+/**
+ * @brief Security credentials to establish a connection
+ */
+struct Network_security_credentials {
+  std::string user;
+  std::string pass;
+  bool use_ssl;
+};
+
+/*
+  Set the necessary SSL parameters before initialization.
+
+  server_key_file  - Path of file that contains the server's X509 key in PEM
+                     format.
+  server_cert_file - Path of file that contains the server's X509 certificate
+                     in PEM format.
+  client_key_file  - Path of file that contains the client's X509 key in PEM
+                     format.
+  client_cert_file - Path of file that contains the client's X509 certificate
+                     in PEM format.
+  ca_file          - Path of file that contains list of trusted SSL CAs.
+  ca_path          - Path of directory that contains trusted SSL CA
+                     certificates in PEM format.
+  crl_file         - Path of file that contains certificate revocation lists.
+  crl_path         - Path of directory that contains certificate revocation
+                     list files.
+  cipher           - List of permitted ciphers to use for connection
+                     encryption.
+  tls_version      - Protocols permitted for secure connections.
+  tls_ciphersuites - List of permitted ciphersuites to use for TLS 1.3
+                     connection encryption.
+
+  Note that only the server_key_file/server_cert_file and the client_key_file/
+  client_cert_file are required and the rest of the pointers can be NULL.
+  If the key is provided along with the certificate, either the key file or
+  the other can be ommited.
+
+  The caller can free the parameters after the SSL is started
+  if this is necessary.
+*/
+struct ssl_parameters {
+  int ssl_mode;
+  const char *server_key_file;
+  const char *server_cert_file;
+  const char *client_key_file;
+  const char *client_cert_file;
+  const char *ca_file;
+  const char *ca_path;
+  const char *crl_file;
+  const char *crl_path;
+  const char *cipher;
+};
+struct tls_parameters {
+  const char *tls_version;
+  const char *tls_ciphersuites;
+};
+
+/**
+ * @brief Possible configuration parameters
+ */
+struct Network_configuration_parameters {
+  unsigned short port;
+
+  struct ssl_parameters ssl_params;
+  struct tls_parameters tls_params;
+};
+
+/**
+ * @brief Represents an open connection.
+ */
+struct Network_connection {
+  Network_connection(int parameter_fd)
+      : fd(parameter_fd)
+#ifndef XCOM_WITHOUT_OPENSSL
+        ,
+        ssl_fd(nullptr)
+#endif
+        ,
+        has_error(false) {
+  }
+
+  Network_connection(int parameter_fd
+#ifndef XCOM_WITHOUT_OPENSSL
+                     ,
+                     SSL *parameter_ssl_fd
+#endif
+                     )
+      : fd(parameter_fd)
+#ifndef XCOM_WITHOUT_OPENSSL
+        ,
+        ssl_fd(parameter_ssl_fd)
+#endif
+        ,
+        has_error(false) {
+  }
+
+  Network_connection(int parameter_fd
+#ifndef XCOM_WITHOUT_OPENSSL
+                     ,
+                     SSL *parameter_ssl_fd
+#endif
+                     ,
+                     bool parameter_has_error)
+      : fd(parameter_fd)
+#ifndef XCOM_WITHOUT_OPENSSL
+        ,
+        ssl_fd(parameter_ssl_fd)
+#endif
+        ,
+        has_error(parameter_has_error) {
+  }
+
+  int fd;
+#ifndef XCOM_WITHOUT_OPENSSL
+  SSL *ssl_fd;
+#endif
+  bool has_error;
+};
+
+/**
+ * @brief Class that provides Network Namespace services
+ */
+class Network_namespace_manager {
+ public:
+  virtual ~Network_namespace_manager() {}
+
+  /**
+  Method to get the network namespace configured for a channel
+
+  @param[out] net_ns   The network namespace to extract
+
+  @return the operation status
+    @retval false   OK
+    @retval true    Error, channel not found
+*/
+  virtual int channel_get_network_namespace(std::string &net_ns) = 0;
+
+  /**
+    Set active network namespace specified by a name.
+
+    @param network_namespace  the name of a network namespace to be set active
+
+    @return false on success, true on error
+    @note all opened descriptors used during function run are closed on error
+  */
+  virtual bool set_network_namespace(const std::string &network_namespace) = 0;
+
+  /**
+    Restore original network namespace used to be active before a new network
+    namespace has been set.
+
+    @return false on success, true on failure
+  */
+  virtual bool restore_original_network_namespace() = 0;
+};
+
+/**
+ * @brief Base class for External Network Providers
+ *
+ * This virtual class will serve as base class for any external entity that
+ * whishes to provide network connections to XCom.
+ *
+ * It will have to implement the following methods:
+ * - start();
+ * - stop();
+ * - get_Ä©d();
+ * - configure();
+ * - open_connection();
+ * - close_connection();
+ *
+ * If provides a lock free implementation of (set)\(get)_connection() for
+ * multithreaded usage.
+ *
+ *
+ */
+class Network_provider {
+ public:
+  Network_provider() : m_shared_connection() {
+    m_shared_connection.store(nullptr);
+  }
+  Network_provider(Network_provider &&param)
+      : m_shared_connection(param.m_shared_connection.load()) {}
+
+  Network_provider &operator=(Network_provider &param) = delete;
+  Network_provider(Network_provider &param) = delete;
+
+  virtual ~Network_provider() {}
+
+  /**
+   * @brief Starts the network provider.
+   *
+   * Each implementation will place here any code that it needs to start a
+   * network provider.
+   *
+   * start() is synchronous. After start() succeeded, it is assumed that XCom
+   * is ready to receive new connections.
+   *
+   * @return int return error code in case of error. 0, if success.
+   */
+  virtual int start() = 0;
+
+  /**
+   * @brief Stops the network provider.
+   *
+   * Each implementation will place here any code that it needs to stop a
+   * network provider.
+   *
+   * stop() is synchronous. After stop() succeeded, it is assumed that XCom
+   * shall not receive any new connection.
+   *
+   * @return int return error code in case of error. 0, if success.
+   */
+  virtual int stop() = 0;
+
+  /**
+   * @brief Get the communcation stack implmeneted by this provider
+   *
+   * Return a valid value withint the range of RunningProtocol enum.
+   *
+   * @return RunningProtocol valid value
+   */
+  virtual enum_transport_protocol get_communication_stack() const = 0;
+
+  /**
+   * @brief Configures a network provider
+   *
+   * @param params a sensible list of possibly configurable network parameters
+   *
+   * @return true in case of a successful configuration.
+   * @return false in case of a unsuccessful configuration.
+   */
+  virtual bool configure(const Network_configuration_parameters &params) = 0;
+
+  /**
+   * @brief Configures the active provider with all things needed to establish
+   * SSL connections
+   *
+   * @param params configuration parameters for SSL.
+   *
+   * @return true  In case of success.
+   * @return false In case of failure.
+   */
+  virtual bool configure_secure_connections(
+      const Network_configuration_parameters &params) = 0;
+
+  /**
+   * @brief
+   *
+   * @return true
+   * @return false
+   */
+  virtual bool cleanup_secure_connections_context() = 0;
+
+  /**
+   * @brief
+   *
+   * @return true
+   * @return false
+   */
+  virtual bool finalize_secure_connections_context() = 0;
+
+  /**
+   * @brief Opens a new connection to another XCom endpoint served by the same
+   *        Network provider.
+   *
+   * @param address address of the remote endpoint
+   * @param port port of the remote endpoint
+   * @param security_credentials security credentials to connect to the remote
+   *                             endpoint
+   * @param connection_timeout
+   * @return std::unique_ptr<Network_connection> an established connection.
+   *                                                 nullptr in case of failure.
+   */
+  virtual std::unique_ptr<Network_connection> open_connection(
+      const std::string &address, const unsigned short port,
+      const Network_security_credentials &security_credentials,
+      int connection_timeout = default_connection_timeout()) = 0;
+
+  /**
+   * @brief Closes an open connection to another XCom endpoint served by the
+   *        same Network provider.
+   *
+   * @param connection an open and valid connection
+   * @return int an error code in case of error. 0, otherwise.
+   */
+  virtual int close_connection(const Network_connection &connection) = 0;
+
+  /**
+   * @brief Lock-free Set connection
+   *
+   * Sets a new connection received by this provider. It will be consumed
+   * internally by get_new_connection().
+   *
+   * @param connection a newly created connection.
+   */
+  void set_new_connection(Network_connection *connection) {
+    Network_connection *null_desired_value;
+    do {
+      null_desired_value = nullptr;
+    } while (!m_shared_connection.compare_exchange_weak(null_desired_value,
+                                                        connection));
+  }
+
+  /**
+   * @brief Get the new connection object
+   *
+   * @return Network_connection* a new connection coming from this network
+   *                                 provider
+   */
+  Network_connection *get_new_connection() {
+    Network_connection *new_connection = nullptr;
+
+    new_connection = m_shared_connection.load();
+
+    if (new_connection != nullptr) m_shared_connection.store(nullptr);
+
+    return new_connection;
+  }
+
+  void reset_new_connection() {
+    Network_connection *to_purge = get_new_connection();
+
+    if (to_purge) {
+      close_connection(*to_purge);
+    }
+
+    delete to_purge;
+  }
+
+  static constexpr int default_connection_timeout() { return 3000; }
+
+ private:
+  std::atomic<Network_connection *> m_shared_connection;
+};
+
+#endif  // NETWORK_PROVIDER_H
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/network_provider_manager.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/network_provider_manager.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/network_provider_manager.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/network_provider_manager.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,378 @@
+/* Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+
+   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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include "xcom/task_debug.h"
+
+#ifndef XCOM_WITHOUT_OPENSSL
+#ifdef _WIN32
+/* In OpenSSL before 1.1.0, we need this first. */
+#include <winsock2.h>
+#endif /* _WIN32 */
+
+#include <openssl/err.h>
+#include <openssl/ssl.h>
+#endif /*! XCOM_WITHOUT_OPENSSL*/
+
+#include "xcom/network/network_provider_manager.h"
+
+static const char *ssl_mode_options[] = {"DISABLED", "PREFERRED", "REQUIRED",
+                                         "VERIFY_CA", "VERIFY_IDENTITY"};
+
+static const char *ssl_fips_mode_options[] = {"OFF", "ON", "STRICT"};
+
+#define SSL_MODE_OPTIONS_COUNT \
+  (sizeof(ssl_mode_options) / sizeof(*ssl_mode_options))
+
+#define SSL_MODE_FIPS_OPTIONS_COUNT \
+  (sizeof(ssl_fips_mode_options) / sizeof(*ssl_fips_mode_options))
+
+bool Network_provider_manager::initialize() {
+  // Add the default provider, which is XCom
+  m_xcom_network_provider = std::make_shared<Xcom_network_provider>();
+  this->add_network_provider(m_xcom_network_provider);
+
+  return false;
+}
+
+bool Network_provider_manager::finalize() {
+  this->cleanup_secure_connections_context();
+  this->finalize_secure_connections_context();
+
+  // Remove the defaul provider, which is XCom
+  this->remove_network_provider(XCOM_PROTOCOL);
+
+  return false;
+}
+
+void Network_provider_manager::add_network_provider(
+    std::shared_ptr<Network_provider> provider) {
+  if (m_network_providers.find(provider->get_communication_stack()) !=
+      m_network_providers.end()) {
+    this->stop_network_provider(provider->get_communication_stack());
+    this->remove_network_provider(provider->get_communication_stack());
+  }
+
+  m_network_providers.emplace(provider->get_communication_stack(), provider);
+}
+
+void Network_provider_manager::add_and_start_network_provider(
+    std::shared_ptr<Network_provider> provider) {
+  enum_transport_protocol key = provider->get_communication_stack();
+
+  this->add_network_provider(provider);
+  this->start_network_provider(key);
+}
+
+void Network_provider_manager::remove_network_provider(
+    enum_transport_protocol provider_key) {
+  m_network_providers.erase(provider_key);
+}
+
+void Network_provider_manager::remove_all_network_provider() {
+  m_network_providers.clear();
+}
+
+bool Network_provider_manager::start_all_network_providers() {
+  bool retval = false;
+
+  for (auto &&provider : m_network_providers) {
+    retval &= provider.second->start();
+  }
+
+  return retval;
+}
+
+bool Network_provider_manager::start_network_provider(
+    enum_transport_protocol provider_key) {
+  auto net_provider = this->get_provider(provider_key);
+
+  return net_provider ? net_provider->start() : true;
+}
+
+bool Network_provider_manager::stop_all_network_providers() {
+  bool retval = false;
+  for (auto &&i : m_network_providers) {
+    retval &= i.second->stop();
+  }
+
+  set_incoming_connections_protocol(get_running_protocol());
+
+  return retval;
+}
+
+bool Network_provider_manager::stop_network_provider(
+    enum_transport_protocol provider_key) {
+  auto net_provider = this->get_provider(provider_key);
+
+  return net_provider ? net_provider->stop() : true;
+}
+
+const std::shared_ptr<Network_provider>
+Network_provider_manager::get_active_provider() {
+  return this->get_provider(get_running_protocol());
+}
+
+const std::shared_ptr<Network_provider>
+Network_provider_manager::get_incoming_connections_provider() {
+  return this->get_provider(get_incoming_connections_protocol());
+}
+
+bool Network_provider_manager::start_active_network_provider() {
+  auto net_provider = this->get_active_provider();
+
+  if (!net_provider) return true;
+
+  set_incoming_connections_protocol(get_running_protocol());
+
+  bool config_ok = net_provider->configure(m_active_provider_configuration);
+
+  G_MESSAGE("Using %s as Communication Stack for XCom",
+            Communication_stack_to_string::to_string(
+                net_provider->get_communication_stack()))
+
+  return config_ok ? net_provider->start() : true;
+}
+
+bool Network_provider_manager::stop_active_network_provider() {
+  auto net_provider = this->get_active_provider();
+
+  if (!net_provider) return true;
+
+  set_incoming_connections_protocol(get_running_protocol());
+
+  return net_provider ? net_provider->stop() : true;
+}
+
+bool Network_provider_manager::configure_active_provider(
+    Network_configuration_parameters &params) {
+  m_active_provider_configuration = params;
+
+  return false;
+}
+
+#define DEEP_COPY_NET_PARAMS_FIELD(field)                    \
+  m_active_provider_secure_connections_configuration.field = \
+      params.field ? strdup(params.field) : nullptr;         \
+  G_DEBUG("SSL " #field " %s",                               \
+          m_active_provider_secure_connections_configuration.field)
+
+#define CLEANUP_NET_PARAMS_FIELD(field)                           \
+  free(const_cast<char *>(                                        \
+      m_active_provider_secure_connections_configuration.field)); \
+  m_active_provider_secure_connections_configuration.field = nullptr;
+
+bool Network_provider_manager::configure_active_provider_secure_connections(
+    Network_configuration_parameters &params) {
+  m_active_provider_secure_connections_configuration.ssl_params.ssl_mode =
+      params.ssl_params.ssl_mode;
+
+  G_DEBUG("Network Provider Manager SSL Parameters:");
+  DEEP_COPY_NET_PARAMS_FIELD(ssl_params.server_key_file);
+  DEEP_COPY_NET_PARAMS_FIELD(ssl_params.server_cert_file);
+  DEEP_COPY_NET_PARAMS_FIELD(ssl_params.client_key_file);
+  DEEP_COPY_NET_PARAMS_FIELD(ssl_params.client_cert_file);
+  DEEP_COPY_NET_PARAMS_FIELD(ssl_params.ca_file);
+  DEEP_COPY_NET_PARAMS_FIELD(ssl_params.ca_path);
+  DEEP_COPY_NET_PARAMS_FIELD(ssl_params.crl_file);
+  DEEP_COPY_NET_PARAMS_FIELD(ssl_params.crl_path);
+  DEEP_COPY_NET_PARAMS_FIELD(ssl_params.cipher);
+  DEEP_COPY_NET_PARAMS_FIELD(tls_params.tls_version);
+  DEEP_COPY_NET_PARAMS_FIELD(tls_params.tls_ciphersuites);
+
+  bool config_ssl_ok = true;
+  auto net_provider = get_active_provider();
+  if (net_provider && is_xcom_using_ssl()) {
+    config_ssl_ok = net_provider->configure_secure_connections(
+        m_active_provider_secure_connections_configuration);
+  }
+
+  return config_ssl_ok;
+}
+
+const std::shared_ptr<Network_provider> Network_provider_manager::get_provider(
+    enum_transport_protocol provider) {
+  auto net_provider = m_network_providers.find(provider);
+
+  if (net_provider == m_network_providers.end()) return nullptr;
+
+  return net_provider->second;
+}
+
+connection_descriptor *Network_provider_manager::open_xcom_connection(
+    const char *server, xcom_port port, bool use_ssl, int connection_timeout) {
+  auto provider = Network_provider_manager::getInstance().get_active_provider();
+  connection_descriptor *xcom_connection = nullptr;
+
+  if (provider) {
+    Network_security_credentials credentials{"", "", use_ssl};
+
+    auto connection = provider.get()->open_connection(server, port, credentials,
+                                                      connection_timeout);
+
+    xcom_connection = new_connection(connection->fd
+#ifndef XCOM_WITHOUT_OPENSSL
+                                     ,
+                                     connection->ssl_fd
+#endif
+    );
+
+    if (xcom_connection) {
+      set_protocol_stack(xcom_connection, provider->get_communication_stack());
+    }
+  } else {
+    xcom_connection = new_connection(-1
+#ifndef XCOM_WITHOUT_OPENSSL
+                                     ,
+                                     nullptr
+#endif
+    );
+  }
+  return xcom_connection;
+}
+
+int Network_provider_manager::close_xcom_connection(
+    connection_descriptor *connection_handle) {
+  auto provider = Network_provider_manager::getInstance().get_provider(
+      connection_handle->protocol_stack);
+
+  int retval = -1;
+  if (provider)
+    retval = provider->close_connection({connection_handle->fd
+#ifndef XCOM_WITHOUT_OPENSSL
+                                         ,
+                                         connection_handle->ssl_fd
+#endif
+    });
+
+  return retval;
+}
+
+connection_descriptor *Network_provider_manager::incoming_connection() {
+  connection_descriptor *xcom_connection = nullptr;
+
+  auto provider = Network_provider_manager::getInstance()
+                      .get_incoming_connections_provider();
+  if (provider) {
+    auto incoming_new_connection = provider->get_new_connection();
+
+    if (incoming_new_connection != nullptr) {
+      xcom_connection = new_connection(incoming_new_connection->fd
+#ifndef XCOM_WITHOUT_OPENSSL
+                                       ,
+                                       incoming_new_connection->ssl_fd
+#endif
+      );
+      set_connected(xcom_connection, CON_FD);
+      set_protocol_stack(xcom_connection, provider->get_communication_stack());
+
+      delete incoming_new_connection;
+    }
+  }
+  return xcom_connection;
+}
+
+int Network_provider_manager::is_xcom_using_ssl() const {
+  return m_ssl_mode != SSL_DISABLED;
+}
+
+int Network_provider_manager::xcom_set_ssl_fips_mode(int mode) {
+  int retval = INVALID_SSL_FIPS_MODE;
+
+  if (mode >= FIPS_MODE_OFF && mode < LAST_SSL_FIPS_MODE) {
+    retval = m_ssl_fips_mode = mode;
+  }
+
+  return retval;
+}
+
+int Network_provider_manager::xcom_get_ssl_fips_mode(const char *mode) {
+  int retval = INVALID_SSL_FIPS_MODE;
+  int idx = 0;
+
+  for (; idx < (int)SSL_MODE_FIPS_OPTIONS_COUNT; ++idx) {
+    if (strcmp(mode, ssl_fips_mode_options[idx]) == 0) {
+      retval = idx;
+      break;
+    }
+  }
+
+  return retval;
+}
+
+int Network_provider_manager::xcom_get_ssl_fips_mode() {
+  return m_ssl_fips_mode;
+}
+
+int Network_provider_manager::xcom_get_ssl_mode(const char *mode) {
+  int retval = INVALID_SSL_MODE;
+  int idx = 0;
+
+  for (; idx < (int)SSL_MODE_OPTIONS_COUNT; ++idx) {
+    if (strcmp(mode, ssl_mode_options[idx]) == 0) {
+      retval = idx + 1; /* The enumeration is shifted. */
+      break;
+    }
+  }
+
+  return retval;
+}
+
+int Network_provider_manager::xcom_set_ssl_mode(int mode) {
+  int retval = INVALID_SSL_MODE;
+
+  mode = (mode == SSL_PREFERRED ? SSL_DISABLED : mode);
+  if (mode >= SSL_DISABLED && mode < LAST_SSL_MODE) retval = m_ssl_mode = mode;
+
+  return retval;
+}
+
+int Network_provider_manager::xcom_get_ssl_mode() { return m_ssl_mode; }
+
+void Network_provider_manager::cleanup_secure_connections_context() {
+  if (!Network_provider_manager::getInstance().is_xcom_using_ssl()) return;
+
+  auto active_provider = get_active_provider();
+  if (active_provider) {
+    active_provider->cleanup_secure_connections_context();
+  }
+}
+
+void Network_provider_manager::finalize_secure_connections_context() {
+  if (!Network_provider_manager::getInstance().is_xcom_using_ssl()) return;
+
+  auto active_provider = get_active_provider();
+  if (active_provider) {
+    active_provider->finalize_secure_connections_context();
+  }
+
+  CLEANUP_NET_PARAMS_FIELD(ssl_params.server_key_file);
+  CLEANUP_NET_PARAMS_FIELD(ssl_params.server_cert_file);
+  CLEANUP_NET_PARAMS_FIELD(ssl_params.client_key_file);
+  CLEANUP_NET_PARAMS_FIELD(ssl_params.client_cert_file);
+  CLEANUP_NET_PARAMS_FIELD(ssl_params.ca_file);
+  CLEANUP_NET_PARAMS_FIELD(ssl_params.ca_path);
+  CLEANUP_NET_PARAMS_FIELD(ssl_params.crl_file);
+  CLEANUP_NET_PARAMS_FIELD(ssl_params.crl_path);
+  CLEANUP_NET_PARAMS_FIELD(ssl_params.cipher);
+  CLEANUP_NET_PARAMS_FIELD(tls_params.tls_version);
+  CLEANUP_NET_PARAMS_FIELD(tls_params.tls_ciphersuites);
+}
\ No newline at end of file
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/network_provider_manager.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/network_provider_manager.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/network_provider_manager.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/network_provider_manager.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,508 @@
+/* Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+
+   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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef NETWORK_PROVIDER_MANAGER_H
+#define NETWORK_PROVIDER_MANAGER_H
+
+#include <functional>
+#include <string>
+#include <unordered_map>
+
+#include "xcom/network/include/network_management_interface.h"
+#include "xcom/network/include/network_provider.h"
+#include "xcom/network/xcom_network_provider.h"
+
+#include "xcom/node_connection.h"
+#include "xcom/result.h"
+#include "xcom/xcom_common.h"
+
+/**
+ * @brief Manages all running instances of a network provider.
+ */
+class Network_provider_manager : public Network_provider_management_interface,
+                                 public Network_provider_operations_interface {
+ public:
+  static Network_provider_manager &getInstance() {
+    static Network_provider_manager instance;
+    return instance;
+  }
+
+  Network_provider_manager(Network_provider_manager const &) =
+      delete;  // Copy construct
+  Network_provider_manager(Network_provider_manager &&) =
+      delete;  // Move construct
+  Network_provider_manager &operator=(Network_provider_manager const &) =
+      delete;  // Copy assign
+  Network_provider_manager &operator=(Network_provider_manager &&) =
+      delete;  // Move assign
+
+  /**
+   * @brief Initialize the network manager. It also creates the default XCom
+   *        provider and adds it to the manager.
+   *
+   * @return true in case of error. false otherwise.
+   */
+  bool initialize() override;
+
+  /**
+   * @brief Finalize the network manager. It removes the default XCom
+   *        provider,
+   *
+   * @return true in case of error. false otherwise.
+   */
+  bool finalize() override;
+
+  /**
+   * @brief Add a new Gcs_network_provider instance
+   *
+   * @param provider an already instantiated shared_ptr object of a
+   *                 Gcs_network_provider
+   */
+  void add_network_provider(
+      std::shared_ptr<Network_provider> provider) override;
+
+  /**
+   * @brief Add a new Gcs_network_provider instance and start it.
+   *
+   * @param provider an already instantiated shared_ptr object of a
+   *                 Gcs_network_provider
+   */
+  void add_and_start_network_provider(
+      std::shared_ptr<Network_provider> provider);
+
+  /**
+   * @brief Remove an active network provider
+   *
+   * @param provider_key a valid value of CommunicationStack of the provider
+   *                     that you want to remove.
+   */
+  void remove_network_provider(enum_transport_protocol provider_key) override;
+
+  /**
+   * @brief Removes all configured network providers
+   *
+   */
+  void remove_all_network_provider() override;
+
+  /**
+   * @brief Starts all network providers.
+   *
+   * @return true In case of success starting ALL network providers
+   * @return false In case of failure in starting AT LEAST ONE network provider
+   */
+  bool start_all_network_providers();
+
+  /**
+   * @brief Starts an already added network provider
+   *
+   * @param provider_key a valid value of CommunicationStack of the provider
+   *                     that you want to start.
+   *
+   * @return true  In case of success.
+   * @return false In case of failure.
+   */
+  bool start_network_provider(enum_transport_protocol provider_key);
+
+  /**
+   * @brief Stops all network providers.
+   *
+   * @return true In case of success stopping ALL network providers
+   * @return false In case of failure in stopping AT LEAST ONE network provider
+   */
+  bool stop_all_network_providers() override;
+
+  /**
+   * @brief Stops a running network provider
+   *
+   * @param provider_key a valid value of CommunicationStack of the provider
+   *                     that you want to stop.
+   *
+   * @return true  In case of success.
+   * @return false In case of failure.
+   */
+  bool stop_network_provider(enum_transport_protocol provider_key);
+
+  /**
+   * @brief Sets the running Communication Stack, thus defining the active
+   * provider.
+   *
+   * In runtime, this is will change the way we establish connections.
+   *
+   * @param new_value value of the Communication Stack
+   */
+  void set_running_protocol(enum_transport_protocol new_value) override {
+    m_running_protocol = new_value;
+  }
+
+  /**
+   * @brief Gets the configured running protocol
+   *
+   * It returns the value that is currently configured in the Running
+   * Communication Stack
+   *
+   * Since this value is dynamic, it can cause a mismatch from the provider
+   * that we are actively receiving connections and the provider that we use
+   * to establish new connections
+   *
+   * @return CommunicationStack value.
+   */
+  enum_transport_protocol get_running_protocol() const override {
+    return m_running_protocol;
+  }
+
+  /**
+   * @brief Get the incoming connections Communication Stack
+   *
+   * This is the value that is used to report upwards the protocol in * which
+   * we are currently accepting connections.
+   *
+   * @return CommunicationStack
+   */
+  enum_transport_protocol get_incoming_connections_protocol() const override {
+    return m_incoming_connections_protocol;
+  }
+
+  /**
+   * @brief Gets a configured provider
+   *
+   * @param provider const std::shared_ptr<Gcs_network_provider> a shared_ptr to
+   * the active provider.
+   * @return const std::shared_ptr<Network_provider>
+   */
+  const std::shared_ptr<Network_provider> get_provider(
+      enum_transport_protocol provider);
+
+  /**
+   * @brief Retrieves the active provider. This is determined by the value set
+   * in set_running_protocol.
+   *
+   * @return const std::shared_ptr<Gcs_network_provider> a shared_ptr to the
+   * active provider.
+   */
+  const std::shared_ptr<Network_provider> get_active_provider();
+
+  /**
+   * @brief Retrieves the active provider for incoming connections.
+   * This is determined by the value set in set_running_protocol when the active
+   * provider is started.
+   *
+   * @return const std::shared_ptr<Gcs_network_provider> a shared_ptr to the
+   * active provider for incoming connections.
+   */
+  const std::shared_ptr<Network_provider> get_incoming_connections_provider();
+
+  /**
+   * @brief Start the active provider.
+   *
+   * @return true  In case of success.
+   * @return false In case of failure.
+   */
+  bool start_active_network_provider() override;
+
+  /**
+   * @brief Stops the active provider.
+   *
+   * @return true  In case of success.
+   * @return false In case of failure.
+   */
+  bool stop_active_network_provider() override;
+
+  /**
+   * @brief Configures the active provider
+   *
+   * @param params configuration parameters.
+   *
+   * @return true  In case of success.
+   * @return false In case of failure.
+   */
+  bool configure_active_provider(
+      Network_configuration_parameters &params) override;
+
+  /**
+   * @brief Configures the active provider with all things needed to establish
+   * SSL connections
+   *
+   * @param params configuration parameters for SSL.
+   *
+   * @return true  In case of success.
+   * @return false In case of failure.
+   */
+  bool configure_active_provider_secure_connections(
+      Network_configuration_parameters &params) override;
+
+  // Interface methods...
+  /**
+   * @brief Method to call to get Server Connections that are waiting to be
+   *        accepted.
+   *
+   * Loop over this method to accept connections. They will be accepted from
+   * the provider that is configured in the Incoming Connection protocol.
+   *
+   * @return connection_descriptor* a pointer to a connection_descriptor. If the
+   *                                pointer is nullptr, no new connections are
+   *                                available.
+   */
+  connection_descriptor *incoming_connection();
+
+  /**
+   * @brief Closes an open connection to another XCom endpoint served by the
+   *        a Network provider.
+   *
+   * @param connection_handle an open and valid connection
+   * @return int an error code in case of error. 0, otherwise.
+   */
+  int close_xcom_connection(connection_descriptor *connection_handle);
+
+  /**
+   * @brief Opens a new connection to another XCom endpoint served by the same
+   *        Network provider.
+   *
+   * @param server  address of the remote endpoint
+   * @param port    port of the remote endpoint
+   * @param use_ssl if this connection should use SSL
+   * @param connection_timeout optional connection timeout.
+   *
+   * @return connection_descriptor an established connection.
+   *                                                 nullptr in case of failure.
+   */
+  connection_descriptor *open_xcom_connection(
+      const char *server, xcom_port port, bool use_ssl,
+      int connection_timeout = Network_provider::default_connection_timeout());
+
+  // SSL RELATED OPERATIONS
+
+  /*
+    Return whether the SSL will be used to encrypt data or not.
+
+    Return 1 if it is enabled 0 otherwise.
+  */
+  int is_xcom_using_ssl() const override;
+
+  /*
+  Set the operation mode which might be the following:
+
+  . SSL_DISABLED (1): The SSL mode will be disabled and this is the default
+    value.
+
+  . SSL_PREFERRED (2): The SSL mode will be always disabled if this value is
+    provided and is only allowed to keep the solution compatibility with
+    MySQL server.
+
+  . SSL_REQUIRED (4): The SSL mode will be enabled but the verifications
+    described in the next modes are not performed.
+
+  . SSL_VERIFY_CA (4) - Verify the server TLS certificate against the
+  configured Certificate Authority (CA) certificates. The connection attempt
+  fails if no valid matching CA certificates are found.
+
+  . SSL_VERIFY_IDENTITY (5): Like VERIFY_CA, but additionally verify that the
+    server certificate matches the host to which the connection is attempted.
+
+  If a different value is provide, INVALID_SSL_MODE (-1) is returned.
+*/
+  int xcom_set_ssl_mode(int mode) override;
+
+  /*
+    Return the operation mode as an integer from an operation mode provided
+    as a string. Note that the string must be provided in upper case letters
+    and the possible values are: "DISABLED", "PREFERRED", "REQUIRED",
+    "VERIFY_CA" or "VERIFY_IDENTITY".
+
+    If a different value is provide, INVALID_SSL_MODE (-1) is returned.
+  */
+  int xcom_get_ssl_mode(const char *mode) override;
+
+  /*
+  Return the configured value into SSL mode
+  */
+  int xcom_get_ssl_mode() override;
+
+  /*
+  Set the operation fips mode which might be the following:
+
+  . SSL_FIPS_MODE_OFF (0): This will set openssl fips mode value to 0
+
+  . SSL_FIPS_MODE_ON (1): This will set openssl fips mode value to 1
+
+  . SSL_FIPS_MODE_STRICT (2): This will set openssl fips mode value to 2
+
+  If a different value is provide, INVALID_SSL_FIPS_MODE (-1) is returned.
+  */
+  int xcom_set_ssl_fips_mode(int mode) override;
+
+  /*
+   Return the operation fips mode as an integer from an operation fips mode
+   provided as a string. Note that the string must be provided in upper case
+   letters and the possible values are: "OFF", "ON", "STRICT",
+
+   If a different value is provide, INVALID_SSL_MODE (-1) is returned.
+  */
+  int xcom_get_ssl_fips_mode(const char *mode) override;
+
+  /*
+  Returns the configured FIPS mode
+  */
+  int xcom_get_ssl_fips_mode() override;
+
+  /**
+   * @brief Cleans up SSL context.
+   */
+  void cleanup_secure_connections_context() override;
+  void finalize_secure_connections_context() override;
+
+ private:
+  Network_provider_manager()
+      : m_running_protocol(XCOM_PROTOCOL),
+        m_incoming_connections_protocol(XCOM_PROTOCOL),
+        m_ssl_mode(SSL_DISABLED),
+        m_ssl_fips_mode(FIPS_MODE_OFF) {}
+  virtual ~Network_provider_manager() override { m_network_providers.clear(); }
+
+  void set_incoming_connections_protocol(enum_transport_protocol value) {
+    m_incoming_connections_protocol = value;
+  }
+
+  std::unordered_map<enum_transport_protocol, std::shared_ptr<Network_provider>,
+                     std::hash<int>>
+      m_network_providers;
+
+  enum_transport_protocol m_running_protocol;
+  enum_transport_protocol m_incoming_connections_protocol;
+
+  int m_ssl_mode;
+  int m_ssl_fips_mode;
+
+  Network_configuration_parameters m_active_provider_configuration;
+  Network_configuration_parameters
+      m_active_provider_secure_connections_configuration;
+
+  // Default provider. It is encapsulated in the Network Manager.
+  std::shared_ptr<Xcom_network_provider> m_xcom_network_provider;
+};
+
+/**
+ * @brief Proxy class to access funcionality in Network_provider_manager
+ *
+ * This way, we avoid spreading singleton calls in all the code, thus
+ * encapsulting all calls.
+ *
+ */
+class Network_Management_Interface
+    : public Network_provider_management_interface,
+      public Network_provider_operations_interface {
+ public:
+  Network_Management_Interface() {
+    m_get_manager = Network_provider_manager::getInstance;
+  }
+
+  virtual ~Network_Management_Interface() override = default;
+
+  Network_Management_Interface(Network_Management_Interface const &) =
+      delete;  // Copy construct
+  Network_Management_Interface &operator=(
+      Network_Management_Interface const &) = delete;  // Copy assign
+
+  bool initialize() override { return m_get_manager().initialize(); }
+
+  bool finalize() override { return m_get_manager().finalize(); }
+
+  void set_running_protocol(enum_transport_protocol new_value) override {
+    m_get_manager().set_running_protocol(new_value);
+  }
+
+  enum_transport_protocol get_running_protocol() const override {
+    return m_get_manager().get_running_protocol();
+  }
+
+  enum_transport_protocol get_incoming_connections_protocol() const override {
+    return m_get_manager().get_incoming_connections_protocol();
+  }
+  void add_network_provider(
+      std::shared_ptr<Network_provider> provider) override {
+    m_get_manager().add_network_provider(provider);
+  }
+
+  bool start_active_network_provider() override {
+    return m_get_manager().start_active_network_provider();
+  }
+
+  bool stop_all_network_providers() override {
+    return m_get_manager().stop_all_network_providers();
+  }
+
+  bool stop_active_network_provider() override {
+    return m_get_manager().stop_active_network_provider();
+  }
+
+  void remove_network_provider(enum_transport_protocol provider_key) override {
+    return m_get_manager().remove_network_provider(provider_key);
+  }
+
+  void remove_all_network_provider() override {
+    return m_get_manager().remove_all_network_provider();
+  }
+
+  bool configure_active_provider(
+      Network_configuration_parameters &params) override {
+    return m_get_manager().configure_active_provider(params);
+  }
+
+  bool configure_active_provider_secure_connections(
+      Network_configuration_parameters &params) override {
+    return m_get_manager().configure_active_provider_secure_connections(params);
+  }
+
+  int is_xcom_using_ssl() const override {
+    return m_get_manager().is_xcom_using_ssl();
+  }
+
+  int xcom_set_ssl_mode(int mode) override {
+    return m_get_manager().xcom_set_ssl_mode(mode);
+  }
+  int xcom_get_ssl_mode(const char *mode) override {
+    return m_get_manager().xcom_get_ssl_mode(mode);
+  }
+  int xcom_get_ssl_mode() override {
+    return m_get_manager().xcom_get_ssl_mode();
+  }
+  int xcom_set_ssl_fips_mode(int mode) override {
+    return m_get_manager().xcom_set_ssl_fips_mode(mode);
+  }
+  int xcom_get_ssl_fips_mode(const char *mode) override {
+    return m_get_manager().xcom_get_ssl_fips_mode(mode);
+  }
+  int xcom_get_ssl_fips_mode() override {
+    return m_get_manager().xcom_get_ssl_fips_mode();
+  }
+  void cleanup_secure_connections_context() override {
+    return m_get_manager().cleanup_secure_connections_context();
+  }
+
+  void finalize_secure_connections_context() override {
+    return m_get_manager().finalize_secure_connections_context();
+  }
+
+ private:
+  std::function<Network_provider_manager &()> m_get_manager;
+};
+
+#endif  // GCS_XCOM_NETWORK_PROVIDER_MANAGER_H
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,449 @@
+/* Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+
+   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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef _WIN32
+#include <poll.h>
+#endif
+
+#ifdef WIN32
+// In OpenSSL before 1.1.0, we need this first.
+#include <winsock2.h>
+#endif  // WIN32
+
+#include "xcom/network/xcom_network_provider.h"
+#include "xcom/network/xcom_network_provider_native_lib.h"
+
+#include "xcom/task_net.h"
+#include "xcom/task_os.h"
+#include "xcom/xcom_base.h"
+#include "xcom/xcom_transport.h"
+
+void xcom_tcp_server_startup(Xcom_network_provider *net_provider) {
+  xcom_port port = net_provider->get_port();
+
+  result tcp_fd = {0, 0};
+  if ((tcp_fd = Xcom_network_provider_library::announce_tcp(port)).val < 0) {
+    g_critical("Unable to announce tcp port %d. Port already in use?", port);
+    net_provider->notify_provider_ready(true);
+    return;
+  }
+
+  net_provider->notify_provider_ready();
+  net_provider->set_open_server_socket(tcp_fd);
+
+  G_INFO("XCom initialized and ready to accept incoming connections on port %d",
+         port);
+
+  int accept_fd = -1;
+  struct sockaddr_storage sock_addr;
+  socklen_t size = sizeof(struct sockaddr_storage);
+  int funerr = 0;
+  do {
+    SET_OS_ERR(0);
+    accept_fd = 0;
+    funerr = 0;
+
+    accept_fd = (int)accept(tcp_fd.val, (struct sockaddr *)&sock_addr, &size);
+    funerr = to_errno(GET_OS_ERR);
+
+    G_DEBUG("Accepting socket funerr=%d shutdown_tcp_server=%d", funerr,
+            net_provider->should_shutdown_tcp_server());
+
+    if (accept_fd < 0) {
+      G_DEBUG("Error accepting socket funerr=%d shutdown_tcp_server=%d", funerr,
+              net_provider->should_shutdown_tcp_server());
+
+      continue;
+    }
+
+    /* Callback to check that the file descriptor is accepted. */
+    if (!Xcom_network_provider_library::allowlist_socket_accept(
+            accept_fd, get_site_def())) {
+      net_provider->close_connection({accept_fd, nullptr});
+      accept_fd = -1;
+    }
+
+    if (accept_fd == -1) {
+      G_DEBUG("accept failed");
+    } else {
+      auto new_incoming_connection = new Network_connection(accept_fd);
+
+#ifndef XCOM_WITHOUT_OPENSSL
+      new_incoming_connection->ssl_fd = nullptr;
+      if (::get_network_management_interface()->is_xcom_using_ssl()) {
+        new_incoming_connection->ssl_fd = SSL_new(server_ctx);
+        SSL_set_fd(new_incoming_connection->ssl_fd,
+                   new_incoming_connection->fd);
+
+        {
+          int ret_ssl;
+          int err;
+          ERR_clear_error();
+          ret_ssl = SSL_accept(new_incoming_connection->ssl_fd);
+          err = SSL_get_error(new_incoming_connection->ssl_fd, ret_ssl);
+
+          while (ret_ssl != SSL_SUCCESS) {
+            /* Some other error, give up */
+            if (err != SSL_ERROR_WANT_READ && err != SSL_ERROR_WANT_WRITE) {
+              break;
+            }
+
+            SET_OS_ERR(0);
+            G_DEBUG("acceptor learner accept SSL retry fd %d",
+                    new_incoming_connection->fd);
+            ERR_clear_error();
+            ret_ssl = SSL_accept(new_incoming_connection->ssl_fd);
+            err = SSL_get_error(new_incoming_connection->ssl_fd, ret_ssl);
+          }
+
+          if (ret_ssl != SSL_SUCCESS) {
+            G_DEBUG("acceptor learner accept SSL failed");
+            net_provider->close_connection(*new_incoming_connection);
+            accept_fd = -1;
+          }
+        }
+      }
+#endif
+      if (accept_fd != -1) {
+        new_incoming_connection->has_error = false;
+        net_provider->set_new_connection(new_incoming_connection);
+      } else {
+        delete new_incoming_connection;
+      }
+    }
+  } while (!net_provider->should_shutdown_tcp_server());
+
+  net_provider->cleanup_secure_connections_context();
+
+  return;
+}
+
+void ssl_shutdown_con(connection_descriptor *con) {
+  if (con->fd >= 0 && con->ssl_fd != nullptr) {
+    SSL_shutdown(con->ssl_fd);
+    ssl_free_con(con);
+  }
+}
+
+bool Xcom_network_provider::cleanup_secure_connections_context() {
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+  ERR_remove_thread_state(0);
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+
+  return false;
+}
+
+bool Xcom_network_provider::finalize_secure_connections_context() {
+  Xcom_network_provider_ssl_library::xcom_destroy_ssl();
+
+  return false;
+}
+
+int Xcom_network_provider::close_connection(
+    const Network_connection &connection) {
+#ifndef XCOM_WITHOUT_OPENSSL
+  connection_descriptor temp_con;
+  temp_con.fd = connection.fd;
+  temp_con.ssl_fd = connection.ssl_fd;
+  if (connection.has_error && temp_con.fd >= 0 && temp_con.ssl_fd != nullptr) {
+    ssl_free_con(&temp_con);
+  } else {
+    ssl_shutdown_con(&temp_con);
+  }
+#endif
+
+  int fd = connection.fd;
+  result shut_close_result = xcom_shut_close_socket(&fd);
+
+  return shut_close_result.val;
+}
+
+std::unique_ptr<Network_connection> Xcom_network_provider::open_connection(
+    const std::string &address, const unsigned short port,
+    const Network_security_credentials &security_credentials,
+    int connection_timeout) {
+  result fd = {0, 0};
+  result ret = {0, 0};
+
+  (void)security_credentials;
+
+  auto cd = std::make_unique<Network_connection>(-1);
+  cd->has_error = true;
+
+  char buf[SYS_STRERROR_SIZE];
+
+  G_DEBUG("connecting to %s %d", address.c_str(), port);
+
+  struct addrinfo *addr = nullptr, *from_ns = nullptr;
+
+  char buffer[20];
+  sprintf(buffer, "%d", port);
+
+  checked_getaddrinfo(address.c_str(), buffer, 0, &from_ns);
+
+  if (from_ns == nullptr) {
+    /* purecov: begin inspected */
+    G_ERROR("Error retrieving server information.");
+    goto end;
+    /* purecov: end */
+  }
+
+  addr = Xcom_network_provider_library::does_node_have_v4_address(from_ns);
+
+  /* Create socket after knowing the family that we are dealing with
+     getaddrinfo returns a list of possible addresses. We will alays
+     default to the first one in the list, which is V4 if applicable.
+   */
+  if ((fd = Xcom_network_provider_library::checked_create_socket(
+           addr->ai_family, SOCK_STREAM, IPPROTO_TCP))
+          .val < 0) {
+    /* purecov: begin inspected */
+    G_ERROR("Error creating socket in local GR->GCS connection to address %s",
+            address.c_str());
+    goto end;
+    /* purecov: end */
+  }
+
+  /* Connect socket to address */
+
+  SET_OS_ERR(0);
+
+  if (Xcom_network_provider_library::timed_connect_msec(
+          fd.val, addr->ai_addr, addr->ai_addrlen, connection_timeout) == -1) {
+    fd.funerr = to_errno(GET_OS_ERR);
+    G_DEBUG(
+        "Connecting socket to address %s in port %d failed with error "
+        "%d-%s.",
+        address.c_str(), port, fd.funerr,
+        strerr_msg(buf, sizeof(buf), fd.funerr));
+    xcom_close_socket(&fd.val);
+    goto end;
+  }
+  {
+    int peer = 0;
+    /* Sanity check before return */
+    SET_OS_ERR(0);
+
+    socklen_t addr_size =
+        static_cast<socklen_t>(sizeof(struct sockaddr_storage));
+    struct sockaddr_storage another_addr;
+    ret.val = peer =
+        xcom_getpeername(fd.val, (struct sockaddr *)&another_addr, &addr_size);
+    ret.funerr = to_errno(GET_OS_ERR);
+    if (peer >= 0) {
+      ret = set_nodelay(fd.val);
+      if (ret.val < 0) {
+        this->close_connection({fd.val
+#ifndef XCOM_WITHOUT_OPENSSL
+                                ,
+                                nullptr
+#endif
+        });
+#if defined(_WIN32)
+        G_DEBUG(
+            "Setting node delay failed  while connecting to %s with error "
+            "%d.",
+            address.c_str(), ret.funerr);
+#else
+        G_DEBUG(
+            "Setting node delay failed  while connecting to %s with error %d "
+            "- "
+            "%s.",
+            address.c_str(), ret.funerr, strerror(ret.funerr));
+#endif
+        goto end;
+      }
+      G_DEBUG("client connected to %s %d fd %d", address.c_str(), port, fd.val);
+    } else {
+      /* Something is wrong */
+      socklen_t errlen = sizeof(ret.funerr);
+
+      getsockopt(fd.val, SOL_SOCKET, SO_ERROR, (char *)&ret.funerr, &errlen);
+      if (ret.funerr == 0) {
+        ret.funerr = to_errno(SOCK_ECONNREFUSED);
+      }
+      this->close_connection({fd.val
+#ifndef XCOM_WITHOUT_OPENSSL
+                              ,
+                              nullptr
+#endif
+      });
+      goto end;
+#if defined(_WIN32)
+      G_DEBUG(
+          "Getting the peer name failed while connecting to server %s with  "
+          "error %d.",
+          address.c_str(), ret.funerr);
+#else
+      G_DEBUG(
+          "Getting the peer name failed while connecting to server %s with "
+          "error % d - %s.",
+          address.c_str(), ret.funerr, strerror(ret.funerr));
+#endif
+      goto end;
+    }
+
+#ifndef XCOM_WITHOUT_OPENSSL
+    if (::get_network_management_interface()->is_xcom_using_ssl()) {
+      SSL *ssl = SSL_new(client_ctx);
+      G_DEBUG("Trying to connect using SSL.")
+      SSL_set_fd(ssl, fd.val);
+
+      ERR_clear_error();
+      ret.val = SSL_connect(ssl);
+      ret.funerr = to_ssl_err(SSL_get_error(ssl, ret.val));
+
+      if (ret.val != SSL_SUCCESS) {
+        G_INFO("Error connecting using SSL %d %d", ret.funerr,
+               SSL_get_error(ssl, ret.val));
+        task_dump_err(ret.funerr);
+
+        this->close_connection({fd.val
+#ifndef XCOM_WITHOUT_OPENSSL
+                                ,
+                                ssl
+#endif
+                                ,
+                                true});
+        goto end;
+      }
+
+      if (Xcom_network_provider_ssl_library::ssl_verify_server_cert(
+              ssl, address.c_str())) {
+        G_MESSAGE("Error validating certificate and peer.");
+        task_dump_err(ret.funerr);
+        this->close_connection({fd.val
+#ifndef XCOM_WITHOUT_OPENSSL
+                                ,
+                                ssl
+#endif
+                                ,
+                                true});
+        goto end;
+      }
+
+      cd->fd = fd.val;
+      cd->ssl_fd = ssl;
+      cd->has_error = false;
+
+      G_DEBUG("Success connecting using SSL.")
+
+      goto end;
+    } else {
+      cd->fd = fd.val;
+      cd->ssl_fd = nullptr;
+      cd->has_error = false;
+
+      goto end;
+    }
+#else
+    {
+      cd->fd = fd.val;
+      cd->has_error = false;
+
+      goto end;
+    }
+#endif
+  }
+
+end:
+  if (from_ns) freeaddrinfo(from_ns);
+
+  return cd;
+}
+
+/**
+ * @brief
+ *
+ * @return true
+ * @return false
+ */
+
+bool Xcom_network_provider::wait_for_provider_ready() {
+  std::unique_lock<std::mutex> lck(m_init_lock);
+
+  bool left_wait_ok = m_init_cond_var.wait_for(
+      lck, std::chrono::seconds(10), [this] { return m_initialized; });
+
+  if (!left_wait_ok) {
+    G_DEBUG("wait_for_provider_ready is leaving with a timeout!")
+    m_init_error = true;
+  }
+
+  return m_init_error;
+}
+
+void Xcom_network_provider::notify_provider_ready(bool init_error) {
+  std::lock_guard<std::mutex> lck(m_init_lock);
+  m_initialized = true;
+  m_init_error = init_error;
+  m_init_cond_var.notify_one();
+}
+
+int Xcom_network_provider::start() {
+  if (is_provider_initialized()) {
+    return true;
+  }
+
+  set_shutdown_tcp_server(false);
+
+  bool init_error = false;
+  if (!(init_error = (m_port == 0))) {
+    m_network_provider_tcp_server = std::thread(xcom_tcp_server_startup, this);
+
+    init_error = wait_for_provider_ready();
+  }
+
+  if (init_error) {
+    G_ERROR("Error initializing the group communication engine.")
+    set_shutdown_tcp_server(true);
+    if (m_network_provider_tcp_server.joinable())
+      m_network_provider_tcp_server.join();
+
+    std::unique_lock<std::mutex> lck(m_init_lock);
+    m_initialized = false;
+    lck.unlock();
+  }
+
+  return init_error;
+}
+
+int Xcom_network_provider::stop() {
+  if (!is_provider_initialized()) {
+    return true;
+  }
+
+  set_shutdown_tcp_server(true);
+
+  Xcom_network_provider_library::gcs_shut_close_socket(
+      &m_open_server_socket.val);
+
+  std::lock_guard<std::mutex> lck(m_init_lock);
+  m_initialized = false;
+
+  if (m_network_provider_tcp_server.joinable())
+    m_network_provider_tcp_server.join();
+
+  this->reset_new_connection();
+
+  return 0;
+}
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,167 @@
+/* Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+
+   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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef XCOM_NETWORK_PROVIDER_H
+#define XCOM_NETWORK_PROVIDER_H
+
+//#include
+//"plugin/group_replication/libmysqlgcs/include/mysql/gcs/xplatform/my_xp_thread.h"
+
+#include <condition_variable>
+#include <mutex>
+#include <thread>
+
+#include "xcom/network/include/network_provider.h"
+
+#include "xcom/network/xcom_network_provider_native_lib.h"
+#include "xcom/result.h"
+#include "xcom/xcom_common.h"
+
+class Xcom_network_provider : public Network_provider {
+ public:
+  Xcom_network_provider(Xcom_network_provider &param) = delete;
+  Xcom_network_provider(Xcom_network_provider &&param)
+      : Network_provider(std::move(param)) {}
+
+  /**
+   * @brief Construct a new Xcom_network_provider object
+   */
+  Xcom_network_provider()
+      : m_port(0),
+        m_initialized(false),
+        m_init_error(false),
+        m_shutdown_tcp_server(false),
+        m_open_server_socket{0, 0} {}
+
+  virtual ~Xcom_network_provider() override {}
+
+  /**
+   * Inherited methods from Gcs_network_provider
+   */
+  int start() override;
+  int stop() override;
+  enum_transport_protocol get_communication_stack() const override {
+    return XCOM_PROTOCOL;
+  }
+
+  /**
+   * @brief Configures this network provider. It is mandatory to be called in
+   *        This provider, else we won't know which listen port to use.
+   *
+   * @param params Network_configuration_parameters with the listen port
+   *               configured
+   * @return true if configure went well. False otherwise.
+   */
+  bool configure(const Network_configuration_parameters &params) override {
+    m_port = params.port;
+
+    return true;
+  }
+
+  bool configure_secure_connections(
+      const Network_configuration_parameters &params) override {
+    bool const successful =
+        (Xcom_network_provider_ssl_library::xcom_init_ssl(
+             params.ssl_params.server_key_file,
+             params.ssl_params.server_cert_file,
+             params.ssl_params.client_key_file,
+             params.ssl_params.client_cert_file, params.ssl_params.ca_file,
+             params.ssl_params.ca_path, params.ssl_params.crl_file,
+             params.ssl_params.crl_path, params.ssl_params.cipher,
+             params.tls_params.tls_version,
+             params.tls_params.tls_ciphersuites) == 1);
+    return successful;
+  }
+
+  /**
+   * @brief
+   *
+   * @return true
+   * @return false
+   */
+  bool cleanup_secure_connections_context() override;
+
+  /**
+   * @brief
+   *
+   * @return true
+   * @return false
+   */
+  bool finalize_secure_connections_context() override;
+
+  std::unique_ptr<Network_connection> open_connection(
+      const std::string &address, const unsigned short port,
+      const Network_security_credentials &security_credentials,
+      int connection_timeout =
+          Network_provider::default_connection_timeout()) override;
+
+  int close_connection(const Network_connection &connection) override;
+
+  /**
+   * @brief Waits for the provider to become ready. This call is blocking.
+   *
+   * @return true in case of error or timeout
+   * @return false in case of success
+   */
+  bool wait_for_provider_ready();
+
+  /**
+   * @brief Notify that the provider is ready. It unblocks
+   * wait_for_provider_ready()
+   *
+   * @param init_error sets the error state of this notifier
+   */
+  void notify_provider_ready(bool init_error = false);
+
+  xcom_port get_port() const { return m_port; }
+  void set_port(xcom_port port) { m_port = port; }
+
+  bool is_provider_initialized() const {
+    std::lock_guard<std::mutex> lck(m_init_lock);
+    return m_initialized;
+  }
+
+  bool should_shutdown_tcp_server() const { return m_shutdown_tcp_server; }
+  void set_shutdown_tcp_server(bool shutdown_tcp_server) {
+    m_shutdown_tcp_server = shutdown_tcp_server;
+  }
+
+  result get_open_server_socket() const { return m_open_server_socket; }
+  void set_open_server_socket(result open_socket) {
+    m_open_server_socket = open_socket;
+  }
+
+ private:
+  xcom_port m_port;
+  std::thread m_network_provider_tcp_server;
+
+  bool m_initialized;
+  bool m_init_error;
+  mutable std::mutex m_init_lock;
+  mutable std::condition_variable m_init_cond_var;
+
+  bool m_shutdown_tcp_server;
+
+  result m_open_server_socket;
+};
+
+#endif  // XCOM_NETWORK_PROVIDER_H
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider_native_lib.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider_native_lib.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider_native_lib.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider_native_lib.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,529 @@
+/* Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights
+reserved.
+
+   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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "xcom/network/xcom_network_provider_native_lib.h"
+
+#include "xcom/site_def.h"
+#include "xcom/task.h"
+#include "xcom/task_debug.h"
+#include "xcom/task_net.h"
+#include "xcom/task_os.h"
+#include "xcom/x_platform.h"
+#include "xcom/xcom_base.h"
+#include "xcom/xcom_transport.h"
+
+#ifdef WIN32
+// In OpenSSL before 1.1.0, we need this first.
+#include <winsock2.h>
+#endif  // WIN32
+
+#ifndef _WIN32
+#include <poll.h>
+#endif
+
+static inline void dump_error(int err) {
+  if (err) {
+#ifndef XCOM_WITHOUT_OPENSSL
+    if (is_ssl_err(err)) {
+      IFDBG(D_BUG, FN; NDBG(from_ssl_err(err), d));
+    } else {
+#endif
+      IFDBG(D_BUG, FN; NDBG(from_errno(err), d); STREXP(strerror(err)));
+#ifndef XCOM_WITHOUT_OPENSSL
+    }
+#endif
+  }
+}
+
+static xcom_socket_accept_cb xcom_socket_accept_callback = nullptr;
+int set_xcom_socket_accept_cb(xcom_socket_accept_cb x) {
+  xcom_socket_accept_callback = x;
+  return 1;
+}
+
+/**
+ * @brief Initializes a sockaddr prepared to be used in bind()
+ *
+ * @param sock_addr struct sockaddr out parameter. You will need to free
+ it
+ *                  after being used.
+ * @param sock_len socklen_t out parameter. It will contain the length of
+ *                 sock_addr
+ * @param port the port to bind.
+ * @param family the address family
+ */
+void Xcom_network_provider_library::init_server_addr(
+    struct sockaddr **sock_addr, socklen_t *sock_len, xcom_port port,
+    int family) {
+  struct addrinfo *address_info = NULL, hints, *address_info_loop;
+  memset(&hints, 0, sizeof(hints));
+
+  hints.ai_flags = AI_PASSIVE;
+  hints.ai_protocol = IPPROTO_TCP;
+  hints.ai_family = AF_UNSPEC;
+  hints.ai_socktype = SOCK_STREAM;  // TCP stream sockets
+  checked_getaddrinfo_port(nullptr, port, &hints, &address_info);
+
+  address_info_loop = address_info;
+  while (address_info_loop) {
+    if (address_info_loop->ai_family == family) {
+      if (*sock_addr == nullptr) {
+        *sock_addr = (struct sockaddr *)malloc(address_info_loop->ai_addrlen);
+      }
+      memcpy(*sock_addr, address_info_loop->ai_addr,
+             address_info_loop->ai_addrlen);
+
+      *sock_len = address_info_loop->ai_addrlen;
+
+      break;
+    }
+    address_info_loop = address_info_loop->ai_next;
+  }
+
+  if (address_info) freeaddrinfo(address_info);
+}
+
+/**
+ * Wrapper function which retries and checks errors from socket
+ */
+result Xcom_network_provider_library::xcom_checked_socket(int domain, int type,
+                                                          int protocol) {
+  result ret = {0, 0};
+  int retry = 1000;
+  do {
+    SET_OS_ERR(0);
+    ret.val = (int)socket(domain, type, protocol);
+    ret.funerr = to_errno(GET_OS_ERR);
+  } while (--retry && ret.val == -1 && (from_errno(ret.funerr) == SOCK_EAGAIN));
+  if (ret.val == -1) {
+    task_dump_err(ret.funerr);
+  }
+  return ret;
+}
+
+result Xcom_network_provider_library::create_server_socket() {
+  result fd = {0, 0};
+  /* Create socket */
+  if ((fd = xcom_checked_socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP)).val < 0) {
+    G_MESSAGE(
+        "Unable to create socket v6"
+        "(socket=%d, errno=%d)!",
+        fd.val, to_errno(GET_OS_ERR));
+    return fd;
+  }
+  {
+    int reuse = 1;
+    SET_OS_ERR(0);
+    if (setsockopt(fd.val, SOL_SOCKET, SOCK_OPT_REUSEADDR, (xcom_buf *)&reuse,
+                   sizeof(reuse)) < 0) {
+      fd.funerr = to_errno(GET_OS_ERR);
+      G_MESSAGE(
+          "Unable to set socket options "
+          "(socket=%d, errno=%d)!",
+          fd.val, to_errno(GET_OS_ERR));
+
+      connection_descriptor cd;
+      cd.fd = fd.val;
+      close_open_connection(&cd);
+      return fd;
+    }
+    /*
+     This code sets the acceptor socket as dual-stacked. What happens is
+     that we expose the XCom server socket as V6 only, and it will accept
+     V4 requests. V4 requests are then represented as IPV4-mapped
+     addresses.
+    */
+    int mode = 0;
+    SET_OS_ERR(0);
+    if (setsockopt(fd.val, IPPROTO_IPV6, IPV6_V6ONLY, (xcom_buf *)&mode,
+                   sizeof(mode)) < 0) {
+      fd.funerr = to_errno(GET_OS_ERR);
+      G_MESSAGE(
+          "Unable to set socket options "
+          "(socket=%d, errno=%d)!",
+          fd.val, to_errno(GET_OS_ERR));
+      connection_descriptor cd;
+      cd.fd = fd.val;
+      close_open_connection(&cd);
+      return fd;
+    }
+  }
+  return fd;
+}
+
+/* purecov: begin deadcode */
+result Xcom_network_provider_library::create_server_socket_v4() {
+  result fd = {0, 0};
+  /* Create socket */
+  if ((fd = xcom_checked_socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)).val < 0) {
+    G_MESSAGE(
+        "Unable to create socket v4"
+        "(socket=%d, errno=%d)!",
+        fd.val, to_errno(GET_OS_ERR));
+    return fd;
+  }
+  {
+    int reuse = 1;
+    SET_OS_ERR(0);
+    if (setsockopt(fd.val, SOL_SOCKET, SOCK_OPT_REUSEADDR, (xcom_buf *)&reuse,
+                   sizeof(reuse)) < 0) {
+      fd.funerr = to_errno(GET_OS_ERR);
+      G_MESSAGE(
+          "Unable to set socket options "
+          "(socket=%d, errno=%d)!",
+          fd.val, to_errno(GET_OS_ERR));
+      connection_descriptor cd;
+      cd.fd = fd.val;
+      close_open_connection(&cd);
+      return fd;
+    }
+  }
+  return fd;
+}
+/* purecov: end */
+
+result Xcom_network_provider_library::announce_tcp(xcom_port port) {
+  result fd;
+  struct sockaddr *sock_addr = nullptr;
+  socklen_t sock_addr_len;
+  int server_socket_v6_ok = 0;
+
+  // Try and create a V6 server socket. It should succeed if the OS
+  // supports IPv6, and fail otherwise.
+#ifndef FORCE_IPV4
+  fd = create_server_socket();
+#else
+  /* Force ipv4 for now */
+  fd.val = -1;
+#endif
+  if (fd.val < 0) {
+    /* purecov: begin deadcode */
+    // If the OS does not support IPv6, we fall back to IPv4.
+    fd = create_server_socket_v4();
+    if (fd.val < 0) {
+      return fd;
+    }
+    /* purecov: end */
+  } else {
+    server_socket_v6_ok = 1;
+  }
+  init_server_addr(&sock_addr, &sock_addr_len, port,
+                   server_socket_v6_ok ? AF_INET6 : AF_INET);
+  if (sock_addr == nullptr || (bind(fd.val, sock_addr, sock_addr_len) < 0)) {
+    // If we fail to bind to the desired address, we fall back to an
+    // IPv4 socket.
+    /* purecov: begin deadcode */
+    fd = create_server_socket_v4();
+    if (fd.val < 0) {
+      return fd;
+    }
+
+    free(sock_addr);
+    sock_addr = nullptr;
+    init_server_addr(&sock_addr, &sock_addr_len, port, AF_INET);
+    if (bind(fd.val, sock_addr, sock_addr_len) < 0) {
+      int err = to_errno(GET_OS_ERR);
+      G_MESSAGE("Unable to bind to INADDR_ANY:%d (socket=%d, errno=%d)!", port,
+                fd.val, err);
+      fd.val = -1;
+      goto err;
+    }
+    /* purecov: end */
+  }
+
+  G_DEBUG("Successfully bound to %s:%d (socket=%d).", "INADDR_ANY", port,
+          fd.val);
+  if (listen(fd.val, 32) < 0) {
+    G_MESSAGE(
+        "Unable to listen backlog to 32. "
+        "(socket=%d, errno=%d)!",
+        fd.val, to_errno(GET_OS_ERR));
+    goto err;
+  }
+  G_DEBUG("Successfully set listen backlog to 32 (socket=%d)!", fd.val);
+
+  free(sock_addr);
+  return fd;
+
+err:
+  fd.funerr = to_errno(GET_OS_ERR);
+  dump_error(fd.funerr);
+
+  if (fd.val > 0) {
+    connection_descriptor cd;
+    cd.fd = fd.val;
+    close_open_connection(&cd);
+  }
+
+  free(sock_addr);
+
+  return fd;
+}
+
+int Xcom_network_provider_library::allowlist_socket_accept(
+    int fd, site_def const *xcom_config) {
+  return xcom_socket_accept_callback != nullptr
+             ? xcom_socket_accept_callback(fd, xcom_config)
+             : 0;
+}
+
+#if defined(_WIN32)
+void Xcom_network_provider_library::gcs_shutdown_socket(int *sock) {
+  static LPFN_DISCONNECTEX DisconnectEx = nullptr;
+  if (DisconnectEx == nullptr) {
+    DWORD dwBytesReturned;
+    GUID guidDisconnectEx = WSAID_DISCONNECTEX;
+    WSAIoctl(*sock, SIO_GET_EXTENSION_FUNCTION_POINTER, &guidDisconnectEx,
+             sizeof(GUID), &DisconnectEx, sizeof(DisconnectEx),
+             &dwBytesReturned, nullptr, nullptr);
+  }
+  if (DisconnectEx != nullptr) {
+    (DisconnectEx(*sock, (LPOVERLAPPED) nullptr, (DWORD)0, (DWORD)0) == TRUE)
+        ? 0
+        : -1;
+  } else {
+    shutdown(*sock, SOCK_SHUT_RDWR);
+  }
+}
+
+#else
+
+void Xcom_network_provider_library::gcs_shutdown_socket(int *sock) {
+  shutdown(*sock, SOCK_SHUT_RD);
+  shutdown(*sock, SOCK_SHUT_RW);
+}
+#endif
+
+result Xcom_network_provider_library::gcs_close_socket(int *sock) {
+  result res = {0, 0};
+  if (*sock != -1) {
+    SET_OS_ERR(0);
+    res.val = CLOSESOCKET(*sock);
+    res.funerr = to_errno(GET_OS_ERR);
+    *sock = -1;
+  }
+  return res;
+}
+
+result Xcom_network_provider_library::gcs_shut_close_socket(int *sock) {
+  result res = {0, 0};
+  if (*sock >= 0) {
+    gcs_shutdown_socket(sock);
+    res = gcs_close_socket(sock);
+  }
+  return res;
+}
+
+#define CONNECT_FAIL \
+  ret_fd = -1;       \
+  goto end
+
+int Xcom_network_provider_library::timed_connect_msec(
+    int fd, struct sockaddr *sock_addr, socklen_t sock_size, int timeout) {
+  int ret_fd = fd;
+  int syserr;
+  int sysret;
+  struct pollfd fds;
+
+  fds.fd = fd;
+  fds.events = POLLOUT;
+  fds.revents = 0;
+
+  /* Set non-blocking */
+  if (unblock_fd(fd) < 0) return -1;
+
+  /* Trying to connect with timeout */
+  SET_OS_ERR(0);
+  sysret = connect(fd, sock_addr, sock_size);
+
+  if (is_socket_error(sysret)) {
+    syserr = GET_OS_ERR;
+    /* If the error is SOCK_EWOULDBLOCK or SOCK_EINPROGRESS or SOCK_EALREADY,
+     * wait. */
+    switch (syserr) {
+      case SOCK_EWOULDBLOCK:
+      case SOCK_EINPROGRESS:
+      case SOCK_EALREADY:
+        break;
+      default:
+        G_DEBUG(
+            "connect - Error connecting "
+            "(socket=%d, error=%d).",
+            fd, GET_OS_ERR);
+        CONNECT_FAIL;
+    }
+
+    SET_OS_ERR(0);
+
+    int poll_timeout = timeout;
+#if defined(_WIN32)
+    // Windows does not detect connect failures on connect
+    // It needs to go to poll, that also does not detect them.
+    // Lets add a very shot timeout on Windows to make it easier
+    // to detect these situations
+    constexpr int first_poll_timeout = 50;
+    poll_timeout = first_poll_timeout;
+#endif
+    while ((sysret = poll(&fds, 1, poll_timeout)) < 0) {
+      syserr = GET_OS_ERR;
+      if (syserr != SOCK_EINTR && syserr != SOCK_EINPROGRESS) break;
+#if defined(_WIN32)
+      else
+        poll_timeout = timeout;
+#endif
+
+      SET_OS_ERR(0);
+    }
+
+    if (sysret == 0) {
+      G_DEBUG(
+          "Timed out while waiting for connection to be established! "
+          "Cancelling connection attempt. (socket= %d, error=%d)",
+          fd, sysret);
+      /* G_WARNING("poll - Timeout! Cancelling connection..."); */
+      CONNECT_FAIL;
+    }
+
+    if (is_socket_error(sysret)) {
+      G_DEBUG(
+          "poll - Error while connecting! "
+          "(socket= %d, error=%d)",
+          fd, GET_OS_ERR);
+      CONNECT_FAIL;
+    }
+
+    {
+      int socket_errno = 0;
+      socklen_t socket_errno_len = sizeof(socket_errno);
+
+      if ((fds.revents & POLLOUT) == 0) {
+        ret_fd = -1;
+      }
+
+      if (fds.revents & (POLLERR | POLLHUP | POLLNVAL)) {
+        ret_fd = -1;
+      }
+      if (getsockopt(fd, SOL_SOCKET, SO_ERROR, (xcom_buf *)&socket_errno,
+                     &socket_errno_len) != 0) {
+        G_DEBUG("getsockopt socket %d failed.", fd);
+        ret_fd = -1;
+      } else {
+        if (socket_errno != 0) {
+          G_DEBUG("Connection to socket %d failed with error %d.", fd,
+                  socket_errno);
+          ret_fd = -1;
+        }
+      }
+    }
+  }
+
+end:
+  /* Set blocking */
+  SET_OS_ERR(0);
+  if (block_fd(fd) < 0) {
+    G_DEBUG(
+        "Unable to set socket back to blocking state. "
+        "(socket=%d, error=%d).",
+        fd, GET_OS_ERR);
+    return -1;
+  }
+  return ret_fd;
+}
+
+int Xcom_network_provider_library::timed_connect(int fd,
+                                                 struct sockaddr *sock_addr,
+                                                 socklen_t sock_size) {
+  return timed_connect_msec(fd, sock_addr, sock_size, 10000);
+}
+
+/* purecov: begin deadcode */
+int Xcom_network_provider_library::timed_connect_sec(int fd,
+                                                     struct sockaddr *sock_addr,
+                                                     socklen_t sock_size,
+                                                     int timeout) {
+  return timed_connect_msec(fd, sock_addr, sock_size, timeout * 1000);
+}
+/* purecov: end */
+
+result Xcom_network_provider_library::checked_create_socket(int domain,
+                                                            int type,
+                                                            int protocol) {
+  result retval = {0, 0};
+  int nr_attempts = 1005;
+
+  do {
+    SET_OS_ERR(0);
+    retval.val = (int)socket(domain, type, protocol);
+    retval.funerr = to_errno(GET_OS_ERR);
+    if (nr_attempts % 10 == 0) xcom_sleep(1);
+  } while (--nr_attempts && retval.val == -1 &&
+           (from_errno(retval.funerr) == SOCK_EAGAIN));
+
+  if (retval.val == -1) {
+    task_dump_err(retval.funerr);
+#if defined(_WIN32)
+    G_MESSAGE("Socket creation failed with error: %d", retval.funerr);
+#else
+    G_MESSAGE("Socket creation failed with error %d - %s", retval.funerr,
+              strerror(retval.funerr));
+#endif
+  }
+  return retval;
+}
+
+/**
+  @brief Retreives a node IPv4 address, if it exists.
+
+  If a node is v4 reachable, means one of two:
+  - The raw address is V4
+  - a name was resolved to a V4/V6 address
+
+  If the later is the case, we are going to prefer the first v4
+  address in the list, since it is the common language between
+  old and new version. If you want exclusive V6, please configure your
+  DNS server to serve V6 names
+
+  @param retrieved a previously retrieved struct addrinfo
+  @return struct addrinfo* An addrinfo of the first IPv4 address. Else it will
+                           return the entry parameter.
+ */
+struct addrinfo *Xcom_network_provider_library::does_node_have_v4_address(
+    struct addrinfo *retrieved) {
+  struct addrinfo *cycle = nullptr;
+
+  int v4_reachable = is_node_v4_reachable_with_info(retrieved);
+
+  if (v4_reachable) {
+    cycle = retrieved;
+    while (cycle) {
+      if (cycle->ai_family == AF_INET) {
+        return cycle;
+      }
+      cycle = cycle->ai_next;
+    }
+  }
+
+  /* If something goes really wrong... we fallback to avoid crashes */
+  return retrieved;
+}
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider_native_lib.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider_native_lib.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider_native_lib.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider_native_lib.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,134 @@
+/* Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+
+   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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef XCOM_NETWORK_PROVIDER_NATIVE_LIB_H
+#define XCOM_NETWORK_PROVIDER_NATIVE_LIB_H
+
+#include "xcom/result.h"
+#include "xcom/site_def.h"
+
+#ifndef XCOM_WITHOUT_OPENSSL
+#ifdef _WIN32
+/* In OpenSSL before 1.1.0, we need this first. */
+#include <Ws2tcpip.h>
+#include <winsock2.h>
+#endif /* _WIN32 */
+
+#include <openssl/err.h>
+#include <openssl/ssl.h>
+#endif /*! XCOM_WITHOUT_OPENSSL*/
+
+#define SYS_STRERROR_SIZE 512
+
+class Xcom_network_provider_library {
+ public:
+  static result checked_create_socket(int domain, int type, int protocol);
+  static struct addrinfo *does_node_have_v4_address(struct addrinfo *retrieved);
+  static int timed_connect(int fd, struct sockaddr *sock_addr,
+                           socklen_t sock_size);
+  static int timed_connect_sec(int fd, struct sockaddr *sock_addr,
+                               socklen_t sock_size, int timeout);
+  static int timed_connect_msec(int fd, struct sockaddr *sock_addr,
+                                socklen_t sock_size, int timeout);
+  static int allowlist_socket_accept(int fd, site_def const *xcom_config);
+  static result gcs_shut_close_socket(int *sock);
+  static result announce_tcp(xcom_port port);
+
+ private:
+  static void init_server_addr(struct sockaddr **sock_addr, socklen_t *sock_len,
+                               xcom_port port, int family);
+  static result xcom_checked_socket(int domain, int type, int protocol);
+  static result create_server_socket();
+  static result create_server_socket_v4();
+  static void gcs_shutdown_socket(int *sock);
+  static result gcs_close_socket(int *sock);
+};
+
+#ifndef XCOM_WITHOUT_OPENSSL
+
+#ifndef SSL_SUCCESS
+#define SSL_SUCCESS 1
+#define SSL_ERROR 0
+#endif
+
+class Xcom_network_provider_ssl_library {
+ public:
+  /*
+    Initialize the SSL.
+
+    server_key_file  - Path of file that contains the server's X509 key in PEM
+                       format.
+    server_cert_file - Path of file that contains the server's X509 certificate
+    in PEM format. client_key_file  - Path of file that contains the client's
+    X509 key in PEM format. client_cert_file - Path of file that contains the
+    client's X509 certificate in PEM format. ca_file          - Path of file
+    that contains list of trusted SSL CAs. ca_path          - Path of directory
+    that contains trusted SSL CA certificates in PEM format. crl_file         -
+    Path of file that contains certificate revocation lists. crl_path         -
+    Path of directory that contains certificate revocation list files. cipher -
+    List of permitted ciphers to use for connection encryption. tls_version -
+    Protocols permitted for secure connections.
+
+    Note that only the server_key_file/server_cert_file and the client_key_file/
+    client_cert_file are required and the rest of the pointers can be NULL.
+    If the key is provided along with the certificate, either the key file or
+    the other can be ommited.
+
+    The caller can free the parameters after the call if this is necessary.
+
+    Return 0 if success 1 otherwise.
+  */
+  static int xcom_init_ssl(const char *server_key_file,
+                           const char *server_cert_file,
+                           const char *client_key_file,
+                           const char *client_cert_file, const char *ca_file,
+                           const char *ca_path, const char *crl_file,
+                           const char *crl_path, const char *cipher,
+                           const char *tls_version,
+                           const char *tls_ciphersuites);
+
+  /*
+   Cleans Up the SSL Configuration freeing allocated memory.
+   */
+  static void xcom_cleanup_ssl();
+
+  /*
+    Destroy the SSL Configuration freeing allocated memory.
+  */
+  static void xcom_destroy_ssl();
+
+  /*
+    Verify whether the server certificate matches the host to which
+    the connection is attempted.
+  */
+  static int ssl_verify_server_cert(SSL *ssl, const char *server_hostname);
+};
+
+/*
+  Pointers to the SSL Context for the server and client
+  contexts respectively.
+*/
+extern SSL_CTX *server_ctx;
+extern SSL_CTX *client_ctx;
+
+#endif  /* !XCOM_WITHOUT_OPENSSL */
+#endif  // XCOM_NETWORK_PROVIDER_H
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider_ssl_native_lib.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider_ssl_native_lib.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider_ssl_native_lib.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider_ssl_native_lib.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,697 @@
+/* Copyright (c) 2012, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "xcom/network/xcom_network_provider_native_lib.h"
+
+#include "xcom/network/include/network_provider.h"
+#include "xcom/network/network_provider_manager.h"
+
+#ifndef XCOM_WITHOUT_OPENSSL
+#include <assert.h>
+#include <stdlib.h>
+
+#include <openssl/dh.h>
+#include <openssl/opensslv.h>
+#include <openssl/x509v3.h>
+
+#ifndef XCOM_STANDALONE
+#include "my_compiler.h"
+#endif
+
+#include "openssl/engine.h"
+
+#include "xcom/task_debug.h"
+#include "xcom/x_platform.h"
+
+#define TLS_VERSION_OPTION_SIZE 256
+#define SSL_CIPHER_LIST_SIZE 4096
+
+static const char *tls_ciphers_list =
+    "ECDHE-ECDSA-AES128-GCM-SHA256:"
+    "ECDHE-ECDSA-AES256-GCM-SHA384:"
+    "ECDHE-RSA-AES128-GCM-SHA256:"
+    "ECDHE-RSA-AES256-GCM-SHA384:"
+    "ECDHE-ECDSA-AES128-SHA256:"
+    "ECDHE-RSA-AES128-SHA256:"
+    "ECDHE-ECDSA-AES256-SHA384:"
+    "ECDHE-RSA-AES256-SHA384:"
+    "DHE-RSA-AES128-GCM-SHA256:"
+    "DHE-DSS-AES128-GCM-SHA256:"
+    "DHE-RSA-AES128-SHA256:"
+    "DHE-DSS-AES128-SHA256:"
+    "DHE-DSS-AES256-GCM-SHA384:"
+    "DHE-RSA-AES256-SHA256:"
+    "DHE-DSS-AES256-SHA256:"
+    "ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:"
+    "ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:"
+    "DHE-DSS-AES128-SHA:DHE-RSA-AES128-SHA:"
+    "TLS_DHE_DSS_WITH_AES_256_CBC_SHA:DHE-RSA-AES256-SHA:"
+    "AES128-GCM-SHA256:DH-DSS-AES128-GCM-SHA256:"
+    "ECDH-ECDSA-AES128-GCM-SHA256:AES256-GCM-SHA384:"
+    "DH-DSS-AES256-GCM-SHA384:ECDH-ECDSA-AES256-GCM-SHA384:"
+    "AES128-SHA256:DH-DSS-AES128-SHA256:ECDH-ECDSA-AES128-SHA256:AES256-SHA256:"
+    "DH-DSS-AES256-SHA256:ECDH-ECDSA-AES256-SHA384:AES128-SHA:"
+    "DH-DSS-AES128-SHA:ECDH-ECDSA-AES128-SHA:AES256-SHA:"
+    "DH-DSS-AES256-SHA:ECDH-ECDSA-AES256-SHA:DHE-RSA-AES256-GCM-SHA384:"
+    "DH-RSA-AES128-GCM-SHA256:ECDH-RSA-AES128-GCM-SHA256:DH-RSA-AES256-GCM-"
+    "SHA384:"
+    "ECDH-RSA-AES256-GCM-SHA384:DH-RSA-AES128-SHA256:"
+    "ECDH-RSA-AES128-SHA256:DH-RSA-AES256-SHA256:"
+    "ECDH-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:"
+    "ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA:"
+    "ECDHE-ECDSA-AES256-SHA:DHE-DSS-AES128-SHA:DHE-RSA-AES128-SHA:"
+    "TLS_DHE_DSS_WITH_AES_256_CBC_SHA:DHE-RSA-AES256-SHA:"
+    "AES128-SHA:DH-DSS-AES128-SHA:ECDH-ECDSA-AES128-SHA:AES256-SHA:"
+    "DH-DSS-AES256-SHA:ECDH-ECDSA-AES256-SHA:DH-RSA-AES128-SHA:"
+    "ECDH-RSA-AES128-SHA:DH-RSA-AES256-SHA:ECDH-RSA-AES256-SHA:DES-CBC3-SHA";
+static const char *tls_cipher_blocked =
+    "!aNULL:!eNULL:!EXPORT:!LOW:!MD5:!DES:!RC2:!RC4:!PSK:"
+    "!DHE-DSS-DES-CBC3-SHA:!DHE-RSA-DES-CBC3-SHA:"
+    "!ECDH-RSA-DES-CBC3-SHA:!ECDH-ECDSA-DES-CBC3-SHA:"
+    "!ECDHE-RSA-DES-CBC3-SHA:!ECDHE-ECDSA-DES-CBC3-SHA:";
+
+/*
+  Diffie-Hellman key.
+  Generated using: >openssl dhparam -5 -C 2048
+
+  -----BEGIN DH PARAMETERS-----
+  MIIBCAKCAQEAil36wGZ2TmH6ysA3V1xtP4MKofXx5n88xq/aiybmGnReZMviCPEJ
+  46+7VCktl/RZ5iaDH1XNG1dVQmznt9pu2G3usU+k1/VB4bQL4ZgW4u0Wzxh9PyXD
+  glm99I9Xyj4Z5PVE4MyAsxCRGA1kWQpD9/zKAegUBPLNqSo886Uqg9hmn8ksyU9E
+  BV5eAEciCuawh6V0O+Sj/C3cSfLhgA0GcXp3OqlmcDu6jS5gWjn3LdP1U0duVxMB
+  h/neTSCSvtce4CAMYMjKNVh9P1nu+2d9ZH2Od2xhRIqMTfAS1KTqF3VmSWzPFCjG
+  mjxx/bg6bOOjpgZapvB6ABWlWmRmAAWFtwIBBQ==
+  -----END DH PARAMETERS-----
+ */
+static unsigned char dh2048_p[] = {
+    0x8A, 0x5D, 0xFA, 0xC0, 0x66, 0x76, 0x4E, 0x61, 0xFA, 0xCA, 0xC0, 0x37,
+    0x57, 0x5C, 0x6D, 0x3F, 0x83, 0x0A, 0xA1, 0xF5, 0xF1, 0xE6, 0x7F, 0x3C,
+    0xC6, 0xAF, 0xDA, 0x8B, 0x26, 0xE6, 0x1A, 0x74, 0x5E, 0x64, 0xCB, 0xE2,
+    0x08, 0xF1, 0x09, 0xE3, 0xAF, 0xBB, 0x54, 0x29, 0x2D, 0x97, 0xF4, 0x59,
+    0xE6, 0x26, 0x83, 0x1F, 0x55, 0xCD, 0x1B, 0x57, 0x55, 0x42, 0x6C, 0xE7,
+    0xB7, 0xDA, 0x6E, 0xD8, 0x6D, 0xEE, 0xB1, 0x4F, 0xA4, 0xD7, 0xF5, 0x41,
+    0xE1, 0xB4, 0x0B, 0xE1, 0x98, 0x16, 0xE2, 0xED, 0x16, 0xCF, 0x18, 0x7D,
+    0x3F, 0x25, 0xC3, 0x82, 0x59, 0xBD, 0xF4, 0x8F, 0x57, 0xCA, 0x3E, 0x19,
+    0xE4, 0xF5, 0x44, 0xE0, 0xCC, 0x80, 0xB3, 0x10, 0x91, 0x18, 0x0D, 0x64,
+    0x59, 0x0A, 0x43, 0xF7, 0xFC, 0xCA, 0x01, 0xE8, 0x14, 0x04, 0xF2, 0xCD,
+    0xA9, 0x2A, 0x3C, 0xF3, 0xA5, 0x2A, 0x83, 0xD8, 0x66, 0x9F, 0xC9, 0x2C,
+    0xC9, 0x4F, 0x44, 0x05, 0x5E, 0x5E, 0x00, 0x47, 0x22, 0x0A, 0xE6, 0xB0,
+    0x87, 0xA5, 0x74, 0x3B, 0xE4, 0xA3, 0xFC, 0x2D, 0xDC, 0x49, 0xF2, 0xE1,
+    0x80, 0x0D, 0x06, 0x71, 0x7A, 0x77, 0x3A, 0xA9, 0x66, 0x70, 0x3B, 0xBA,
+    0x8D, 0x2E, 0x60, 0x5A, 0x39, 0xF7, 0x2D, 0xD3, 0xF5, 0x53, 0x47, 0x6E,
+    0x57, 0x13, 0x01, 0x87, 0xF9, 0xDE, 0x4D, 0x20, 0x92, 0xBE, 0xD7, 0x1E,
+    0xE0, 0x20, 0x0C, 0x60, 0xC8, 0xCA, 0x35, 0x58, 0x7D, 0x3F, 0x59, 0xEE,
+    0xFB, 0x67, 0x7D, 0x64, 0x7D, 0x8E, 0x77, 0x6C, 0x61, 0x44, 0x8A, 0x8C,
+    0x4D, 0xF0, 0x12, 0xD4, 0xA4, 0xEA, 0x17, 0x75, 0x66, 0x49, 0x6C, 0xCF,
+    0x14, 0x28, 0xC6, 0x9A, 0x3C, 0x71, 0xFD, 0xB8, 0x3A, 0x6C, 0xE3, 0xA3,
+    0xA6, 0x06, 0x5A, 0xA6, 0xF0, 0x7A, 0x00, 0x15, 0xA5, 0x5A, 0x64, 0x66,
+    0x00, 0x05, 0x85, 0xB7};
+
+static unsigned char dh2048_g[] = {0x05};
+
+static DH *get_dh2048(void) {
+  DH *dh;
+  if ((dh = DH_new())) {
+    BIGNUM *p = BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL);
+    BIGNUM *g = BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL);
+    if (!p || !g
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+        || !DH_set0_pqg(dh, p, NULL, g)
+#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
+    ) {
+      /* DH_free() will free 'p' and 'g' at once. */
+      DH_free(dh);
+      return NULL;
+    }
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+    dh->p = p;
+    dh->g = g;
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+  }
+  return (dh);
+}
+
+static char *ssl_pw = NULL;
+static int ssl_init_done = 0;
+
+SSL_CTX *server_ctx = NULL;
+SSL_CTX *client_ctx = NULL;
+
+/*
+  Note that the functions, i.e. strtok and strcasecmp, are not
+  considering multiple-byte characters as the original server
+  code does.
+*/
+static long process_tls_version(const char *tls_version) {
+  const char *separator = ", ";
+  char *token = NULL;
+#ifdef HAVE_TLSv13
+  const char *tls_version_name_list[] = {"TLSv1", "TLSv1.1", "TLSv1.2",
+                                         "TLSv1.3"};
+#else
+  const char *tls_version_name_list[] = {"TLSv1", "TLSv1.1", "TLSv1.2"};
+#endif /* HAVE_TLSv13 */
+#define TLS_VERSIONS_COUNTS \
+  (sizeof(tls_version_name_list) / sizeof(*tls_version_name_list))
+  unsigned int tls_versions_count = TLS_VERSIONS_COUNTS;
+#ifdef HAVE_TLSv13
+  const long tls_ctx_list[TLS_VERSIONS_COUNTS] = {
+      SSL_OP_NO_TLSv1, SSL_OP_NO_TLSv1_1, SSL_OP_NO_TLSv1_2, SSL_OP_NO_TLSv1_3};
+  const char *ctx_flag_default = "TLSv1,TLSv1.1,TLSv1.2,TLSv1.3";
+  long tls_ctx_flag = SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2 |
+                      SSL_OP_NO_TLSv1_3;
+#else
+  const long tls_ctx_list[TLS_VERSIONS_COUNTS] = {
+      SSL_OP_NO_TLSv1, SSL_OP_NO_TLSv1_1, SSL_OP_NO_TLSv1_2};
+  const char *ctx_flag_default = "TLSv1,TLSv1.1,TLSv1.2";
+  long tls_ctx_flag = SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2;
+#endif /* HAVE_TLSv13 */
+  unsigned int index = 0;
+  char tls_version_option[TLS_VERSION_OPTION_SIZE] = "";
+  int tls_found = 0;
+  char *saved_ctx = NULL;
+
+  if (!tls_version || !xcom_strcasecmp(tls_version, ctx_flag_default)) return 0;
+
+  if (strlen(tls_version) - 1 > sizeof(tls_version_option)) return -1;
+
+  strncpy(tls_version_option, tls_version, sizeof(tls_version_option));
+  token = xcom_strtok(tls_version_option, separator, &saved_ctx);
+  while (token) {
+    for (index = 0; index < tls_versions_count; index++) {
+      if (!xcom_strcasecmp(tls_version_name_list[index], token)) {
+        tls_found = 1;
+        tls_ctx_flag = tls_ctx_flag & (~tls_ctx_list[index]);
+        break;
+      }
+    }
+    token = xcom_strtok(NULL, separator, &saved_ctx);
+  }
+
+  if (!tls_found)
+    return -1;
+  else
+    return tls_ctx_flag;
+}
+
+/* purecov: begin deadcode */
+static int PasswordCallBack(char *passwd, int sz, int rw [[maybe_unused]],
+                            void *userdata [[maybe_unused]]) {
+  const char *pw = ssl_pw ? ssl_pw : "yassl123";
+  strncpy(passwd, pw, (size_t)sz);
+  return (int)strlen(pw);
+}
+/* purecov: end */
+
+static int configure_ssl_algorithms(SSL_CTX *ssl_ctx, const char *cipher,
+                                    const char *tls_version,
+                                    const char *tls_ciphersuites
+                                    [[maybe_unused]]) {
+  DH *dh = NULL;
+  long ssl_ctx_options = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
+  char cipher_list[SSL_CIPHER_LIST_SIZE] = {0};
+  long ssl_ctx_flags = -1;
+#ifdef HAVE_TLSv13
+  int tlsv1_3_enabled = 0;
+#endif /* HAVE_TLSv13 */
+
+  SSL_CTX_set_default_passwd_cb(ssl_ctx, PasswordCallBack);
+  SSL_CTX_set_session_cache_mode(ssl_ctx, SSL_SESS_CACHE_OFF);
+
+  ssl_ctx_flags = process_tls_version(tls_version);
+  if (ssl_ctx_flags < 0) {
+    G_ERROR("TLS version is invalid: %s", tls_version);
+    goto error;
+  }
+
+#ifdef HAVE_TLSv13
+  ssl_ctx_options = (ssl_ctx_options | ssl_ctx_flags) &
+                    (SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 |
+                     SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2 | SSL_OP_NO_TLSv1_3);
+#else
+  ssl_ctx_options = (ssl_ctx_options | ssl_ctx_flags) &
+                    (SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 |
+                     SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2);
+#endif /* HAVE_TLSv13 */
+
+  SSL_CTX_set_options(ssl_ctx, ssl_ctx_options);
+
+#ifdef HAVE_TLSv13
+  tlsv1_3_enabled = ((ssl_ctx_options & SSL_OP_NO_TLSv1_3) == 0);
+  if (tlsv1_3_enabled) {
+    /* Set OpenSSL TLS v1.3 ciphersuites.
+       If the ciphersuites are unspecified, i.e. tls_ciphersuites == NULL, then
+       we use whatever OpenSSL uses by default. Note that an empty list is
+       permissible; it disallows all ciphersuites. */
+    if (tls_ciphersuites != NULL) {
+      /*
+        Note: if TLSv1.3 is enabled but TLSv1.3 ciphersuite list is empty
+        (that's permissible and mentioned in the documentation),
+        the connection will fail with "no ciphers available" error.
+      */
+      if (SSL_CTX_set_ciphersuites(ssl_ctx, tls_ciphersuites) == 0) {
+        G_ERROR(
+            "Failed to set the list of ciphersuites. Check if the values "
+            "configured for ciphersuites are correct and valid and if the list "
+            "is not empty");
+        goto error;
+      }
+    }
+  } else {
+    /* Disable OpenSSL TLS v1.3 ciphersuites. */
+    if (SSL_CTX_set_ciphersuites(ssl_ctx, "") == 0) {
+      G_DEBUG("Failed to set empty ciphersuites with TLS v1.3 disabled.");
+      goto error;
+    }
+  }
+#endif /* HAVE_TLSv13 */
+
+  /*
+    Set the ciphers that can be used. Note, howerver, that the
+    SSL_CTX_set_cipher_list will return 0 if none of the provided
+    ciphers could be selected
+  */
+  strncat(cipher_list, tls_cipher_blocked, SSL_CIPHER_LIST_SIZE - 1);
+  if (cipher && strlen(cipher) != 0)
+    strncat(cipher_list, cipher, SSL_CIPHER_LIST_SIZE - 1);
+  else
+    strncat(cipher_list, tls_ciphers_list, SSL_CIPHER_LIST_SIZE - 1);
+
+  if (SSL_CTX_set_cipher_list(ssl_ctx, cipher_list) == 0) {
+    G_ERROR("Failed to set the list of chipers.");
+    goto error;
+  }
+
+  dh = get_dh2048();
+  if (SSL_CTX_set_tmp_dh(ssl_ctx, dh) == 0) {
+    G_ERROR("Error setting up Diffie-Hellman key exchange");
+    goto error;
+  }
+  DH_free(dh);
+
+  return 0;
+
+error:
+  if (dh) DH_free(dh);
+  return 1;
+}
+
+#define OPENSSL_ERROR_LENGTH 512
+static int configure_ssl_fips_mode(const int fips_mode) {
+  int rc = -1;
+  int fips_mode_old = -1;
+  char err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
+  unsigned long err_library = 0;
+  if (fips_mode > 2) {
+    goto EXIT;
+  }
+  fips_mode_old = FIPS_mode();
+  if (fips_mode_old == fips_mode) {
+    rc = 1;
+    goto EXIT;
+  }
+  if (!(rc = FIPS_mode_set(fips_mode))) {
+    err_library = ERR_get_error();
+    ERR_error_string_n(err_library, err_string, sizeof(err_string) - 1);
+    err_string[sizeof(err_string) - 1] = '\0';
+    G_ERROR("openssl fips mode set failed: %s", err_string);
+  }
+EXIT:
+  return rc;
+}
+
+static int configure_ssl_ca(SSL_CTX *ssl_ctx, const char *ca_file,
+                            const char *ca_path) {
+  /* Load certs from the trusted ca. */
+  if (SSL_CTX_load_verify_locations(ssl_ctx, ca_file, ca_path) == 0) {
+    std::string out_ca_file(ca_file ? ca_file : "NULL");
+    std::string out_ca_path(ca_path ? ca_path : "NULL");
+    G_WARNING("Failed to locate and verify ca_file: %s ca_path: %s",
+              out_ca_file.c_str(), out_ca_path.c_str());
+    if (ca_file || ca_path) {
+      G_ERROR(
+          "Cannot use default locations because ca_file or "
+          "ca_path has been specified");
+      goto error;
+    }
+
+    /* Otherwise go use the defaults. */
+    if (SSL_CTX_set_default_verify_paths(ssl_ctx) == 0) {
+      G_ERROR("Failed to use defaults for ca_file and ca_path");
+      goto error;
+    }
+  }
+
+  return 0;
+
+error:
+  return 1;
+}
+
+static int configure_ssl_revocation(SSL_CTX *ssl_ctx [[maybe_unused]],
+                                    const char *crl_file,
+                                    const char *crl_path) {
+  int retval = 0;
+  if (crl_file || crl_path) {
+    X509_STORE *store = SSL_CTX_get_cert_store(ssl_ctx);
+    /* Load crls from the trusted ca */
+    if (X509_STORE_load_locations(store, crl_file, crl_path) == 0 ||
+        X509_STORE_set_flags(
+            store, X509_V_FLAG_CRL_CHECK | X509_V_FLAG_CRL_CHECK_ALL) == 0) {
+      G_ERROR("X509_STORE_load_locations for CRL error");
+      retval = 1;
+    }
+  }
+  return retval;
+}
+
+static int configure_ssl_keys(SSL_CTX *ssl_ctx, const char *key_file,
+                              const char *cert_file) {
+  if (!cert_file && !key_file) {
+    G_ERROR("Both the certification file and the key file cannot be None");
+    goto error;
+  }
+
+  if (!cert_file && key_file) {
+    G_WARNING("Using the key file also as a certification file: %s", key_file);
+    cert_file = key_file;
+  }
+
+  if (!key_file && cert_file) {
+    G_WARNING("Using the certification file also as a key file: %s", cert_file);
+    key_file = cert_file;
+  }
+
+  if (cert_file &&
+      SSL_CTX_use_certificate_file(ssl_ctx, cert_file, SSL_FILETYPE_PEM) <= 0) {
+    G_ERROR("Error loading certification file %s", cert_file);
+    goto error;
+  }
+
+  if (key_file &&
+      SSL_CTX_use_PrivateKey_file(ssl_ctx, key_file, SSL_FILETYPE_PEM) <= 0) {
+    G_ERROR("Error loading key file %s", key_file);
+    goto error;
+  }
+
+  /*
+    If we are using DSA, we can copy the parameters from the private key
+    Now we know that a key and cert have been set against the SSL context
+  */
+  if (cert_file && !SSL_CTX_check_private_key(ssl_ctx)) {
+    G_ERROR("Private key is not properly loaded");
+    goto error;
+  }
+
+  return 0;
+
+error:
+  return 1;
+}
+
+/* Initialize SSL. Return 1 f success, 0 if error */
+static int init_ssl(const char *key_file, const char *cert_file,
+                    const char *ca_file, const char *ca_path,
+                    const char *crl_file, const char *crl_path,
+                    const char *cipher, const char *tls_version,
+                    const char *tls_ciphersuites, SSL_CTX *ssl_ctx) {
+  G_DEBUG(
+      "Initializing SSL with key_file: '%s'  cert_file: '%s'  "
+      "ca_file: '%s'  ca_path: '%s'",
+      key_file ? key_file : "NULL", cert_file ? cert_file : "NULL",
+      ca_file ? ca_file : "NULL", ca_path ? ca_path : "NULL");
+
+  G_DEBUG(
+      "Additional SSL configuration is "
+      "cipher: '%s' crl_file: '%s' crl_path: '%s'",
+      cipher ? cipher : "NULL", crl_file ? crl_file : "NULL",
+      crl_path ? crl_path : "NULL");
+
+  G_DEBUG("TLS configuration is version: '%s', ciphersuites: '%s'",
+          tls_version ? tls_version : "NULL",
+          tls_ciphersuites ? tls_ciphersuites : "NULL");
+
+  if (configure_ssl_algorithms(ssl_ctx, cipher, tls_version, tls_ciphersuites))
+    goto error;
+
+  if (configure_ssl_ca(ssl_ctx, ca_file, ca_path)) goto error;
+
+  if (configure_ssl_revocation(ssl_ctx, crl_file, crl_path)) goto error;
+
+  if (configure_ssl_keys(ssl_ctx, key_file, cert_file)) goto error;
+
+  G_DEBUG("Success initializing SSL");
+
+  return 0;
+
+error:
+  G_MESSAGE("Error initializing SSL");
+  return 1;
+}
+
+int Xcom_network_provider_ssl_library::xcom_init_ssl(
+    const char *server_key_file, const char *server_cert_file,
+    const char *client_key_file, const char *client_cert_file,
+    const char *ca_file, const char *ca_path, const char *crl_file,
+    const char *crl_path, const char *cipher, const char *tls_version,
+    const char *tls_ciphersuites) {
+  int verify_server = SSL_VERIFY_NONE;
+  int verify_client = SSL_VERIFY_NONE;
+
+  if (configure_ssl_fips_mode(
+          Network_provider_manager::getInstance().xcom_get_ssl_fips_mode()) !=
+      1) {
+    G_ERROR("Error setting the ssl fips mode");
+    goto error;
+  }
+
+  SSL_library_init();
+  SSL_load_error_strings();
+
+  if (!Network_provider_manager::getInstance().is_xcom_using_ssl()) {
+    G_WARNING("SSL is not enabled");
+    return !ssl_init_done;
+  }
+
+  if (ssl_init_done) {
+    G_DEBUG("SSL already initialized");
+    return !ssl_init_done;
+  }
+
+  G_DEBUG("Configuring SSL for the server")
+#ifdef HAVE_TLSv13
+  server_ctx = SSL_CTX_new(TLS_server_method());
+#else
+  server_ctx = SSL_CTX_new(SSLv23_server_method());
+#endif /* HAVE_TLSv13 */
+
+  if (!server_ctx) {
+    G_ERROR("Error allocating SSL Context object for the server");
+    goto error;
+  }
+  if (init_ssl(server_key_file, server_cert_file, ca_file, ca_path, crl_file,
+               crl_path, cipher, tls_version, tls_ciphersuites, server_ctx))
+    goto error;
+
+  if (Network_provider_manager::getInstance().xcom_get_ssl_mode() !=
+      SSL_REQUIRED)
+    verify_server = SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE;
+  SSL_CTX_set_verify(server_ctx, verify_server, NULL);
+
+  G_DEBUG("Configuring SSL for the client")
+#ifdef HAVE_TLSv13
+  client_ctx = SSL_CTX_new(TLS_client_method());
+#else
+  client_ctx = SSL_CTX_new(SSLv23_client_method());
+#endif /* HAVE_TLSv13 */
+  if (!client_ctx) {
+    G_ERROR("Error allocating SSL Context object for the client");
+    goto error;
+  }
+  if (init_ssl(client_key_file, client_cert_file, ca_file, ca_path, crl_file,
+               crl_path, cipher, tls_version, tls_ciphersuites, client_ctx))
+    goto error;
+
+  if (Network_provider_manager::getInstance().xcom_get_ssl_mode() !=
+      SSL_REQUIRED) {
+    verify_client = SSL_VERIFY_PEER;
+  }
+  SSL_CTX_set_verify(client_ctx, verify_client, NULL);
+
+  ssl_init_done = 1;
+
+  return !ssl_init_done;
+
+error:
+  xcom_destroy_ssl();
+
+  return !ssl_init_done;
+}
+
+void Xcom_network_provider_ssl_library::xcom_cleanup_ssl() {
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+  ERR_remove_thread_state(0);
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+}
+
+void Xcom_network_provider_ssl_library::xcom_destroy_ssl() {
+  G_DEBUG("Destroying SSL");
+
+  ssl_init_done = 0;
+
+  if (server_ctx) {
+    SSL_CTX_free(server_ctx);
+    server_ctx = nullptr;
+  }
+
+  if (client_ctx) {
+    SSL_CTX_free(client_ctx);
+    client_ctx = nullptr;
+  }
+
+#if defined(WITH_SSL_STANDALONE)
+  ENGINE_cleanup();
+  EVP_cleanup();
+  CRYPTO_cleanup_all_ex_data();
+  ERR_free_strings();
+#endif
+
+  Xcom_network_provider_ssl_library::xcom_cleanup_ssl();
+
+  G_DEBUG("Success destroying SSL");
+}
+
+int Xcom_network_provider_ssl_library::ssl_verify_server_cert(
+    SSL *ssl, const char *server_hostname) {
+  X509 *server_cert = NULL;
+  int ret_validation = 1;
+
+#if !(OPENSSL_VERSION_NUMBER >= 0x10002000L || defined(HAVE_WOLFSSL))
+  int cn_loc = -1;
+  char *cn = NULL;
+  ASN1_STRING *cn_asn1 = NULL;
+  X509_NAME_ENTRY *cn_entry = NULL;
+  X509_NAME *subject = NULL;
+#endif
+
+  G_DEBUG("Verifying server certificate and expected host name: %s",
+          server_hostname);
+
+  if (Network_provider_manager::getInstance().xcom_get_ssl_mode() !=
+      SSL_VERIFY_IDENTITY)
+    return 0;
+
+  if (!server_hostname) {
+    G_ERROR("No server hostname supplied to verify server certificate");
+    goto error;
+  }
+
+  if (!(server_cert = SSL_get_peer_certificate(ssl))) {
+    G_ERROR("Could not get server certificate to be verified");
+    goto error;
+  }
+
+  if (X509_V_OK != SSL_get_verify_result(ssl)) {
+    G_ERROR("Failed to verify the server certificate");
+    goto error;
+  }
+  /*
+    We already know that the certificate exchanged was valid; the SSL library
+    handled that. Now we need to verify that the contents of the certificate
+    are what we expect.
+  */
+
+  /* Use OpenSSL certificate matching functions instead of our own if we
+     have OpenSSL. The X509_check_* functions return 1 on success.
+  */
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L || defined(HAVE_WOLFSSL)
+  if ((X509_check_host(server_cert, server_hostname, strlen(server_hostname), 0,
+                       0) != 1) &&
+      (X509_check_ip_asc(server_cert, server_hostname, 0) != 1)) {
+    G_ERROR(
+        "Failed to verify the server certificate via X509 certificate "
+        "matching functions");
+    goto error;
+
+  } else {
+    /* Success */
+    ret_validation = 0;
+  }
+#else  /* OPENSSL_VERSION_NUMBER < 0x10002000L */
+  /*
+     OpenSSL prior to 1.0.2 do not support X509_check_host() function.
+     Use deprecated X509_get_subject_name() instead.
+  */
+  subject = X509_get_subject_name((X509 *)server_cert);
+  /* Find the CN location in the subject */
+  cn_loc = X509_NAME_get_index_by_NID(subject, NID_commonName, -1);
+  if (cn_loc < 0) {
+    G_ERROR("Failed to get CN location in the server certificate subject");
+    goto error;
+  }
+
+  /* Get the CN entry for given location */
+  cn_entry = X509_NAME_get_entry(subject, cn_loc);
+  if (cn_entry == NULL) {
+    G_ERROR(
+        "Failed to get CN entry using CN location in the server "
+        "certificate");
+    goto error;
+  }
+
+  /* Get CN from common name entry */
+  cn_asn1 = X509_NAME_ENTRY_get_data(cn_entry);
+  if (cn_asn1 == NULL) {
+    G_ERROR("Failed to get CN from CN entry in the server certificate");
+    goto error;
+  }
+
+  cn = (char *)ASN1_STRING_data(cn_asn1);
+
+  /* There should not be any NULL embedded in the CN */
+  if ((size_t)ASN1_STRING_length(cn_asn1) != strlen(cn)) {
+    G_ERROR("NULL embedded in the server certificate CN");
+    goto error;
+  }
+
+  G_DEBUG("Server hostname in cert: %s", cn);
+
+  if (!strcmp(cn, server_hostname)) {
+    /* Success */
+    ret_validation = 0;
+  } else {
+    G_ERROR(
+        "Expected hostname is '%s' but found the name '%s' in the "
+        "server certificate",
+        cn, server_hostname);
+  }
+#endif /* OPENSSL_VERSION_NUMBER >= 0x10002000L */
+
+error:
+  if (server_cert) X509_free(server_cert);
+
+  return ret_validation;
+}
+#else
+int avoid_compile_warning = 1;
+#endif
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_connection.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_connection.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_connection.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_connection.h	2021-09-28 11:46:34.000000000 +0000
@@ -35,6 +35,8 @@
 
 #endif
 
+#include "xcom/network/include/network_provider.h"
+#include "xcom/xcom_memory.h"
 #include "xcom/xcom_proto.h"
 #include "xdr_gen/xcom_vp.h"
 
@@ -49,14 +51,15 @@
   con_state connected_;
   unsigned int snd_tag;
   xcom_proto x_proto;
+  enum_transport_protocol protocol_stack;
 };
 
 typedef struct connection_descriptor connection_descriptor;
 
 #ifndef XCOM_WITHOUT_OPENSSL
 static inline connection_descriptor *new_connection(int fd, SSL *ssl_fd) {
-  connection_descriptor *c =
-      (connection_descriptor *)calloc((size_t)1, sizeof(connection_descriptor));
+  connection_descriptor *c = (connection_descriptor *)xcom_calloc(
+      (size_t)1, sizeof(connection_descriptor));
   c->fd = fd;
   c->ssl_fd = ssl_fd;
   c->connected_ = CON_NULL;
@@ -64,8 +67,8 @@
 }
 #else
 static inline connection_descriptor *new_connection(int fd) {
-  connection_descriptor *c =
-      (connection_descriptor *)calloc((size_t)1, sizeof(connection_descriptor));
+  connection_descriptor *c = (connection_descriptor *)xcom_calloc(
+      (size_t)1, sizeof(connection_descriptor));
   c->fd = fd;
   c->connected_ = CON_NULL;
   return c;
@@ -83,4 +86,9 @@
   con->connected_ = val;
 }
 
+static inline void set_protocol_stack(connection_descriptor *con,
+                                      enum_transport_protocol val) {
+  con->protocol_stack = val;
+}
+
 #endif /* NODE_CONNECTION_H */
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_list.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_list.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_list.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_list.cc	2021-09-28 11:46:34.000000000 +0000
@@ -39,6 +39,7 @@
 #include "xcom/site_def.h"
 #include "xcom/task_debug.h"
 #include "xcom/xcom_common.h"
+#include "xcom/xcom_memory.h"
 #include "xcom/xcom_profile.h"
 #include "xcom/xcom_transport.h"
 #include "xdr_gen/xcom_vp.h"
@@ -68,7 +69,7 @@
   return retval;
 }
 
-int match_node(node_address *n1, node_address *n2, u_int with_uid) {
+int match_node(node_address const *n1, node_address const *n2, u_int with_uid) {
   char n1_ip[IP_MAX_SIZE], n2_ip[IP_MAX_SIZE];
   xcom_port n1_port, n2_port;
   int error_ipandport1, error_ipandport2;
@@ -92,7 +93,7 @@
   return retval;
 }
 
-int match_node_list(node_address *n1, node_address *n2, u_int len2,
+int match_node_list(node_address const *n1, node_address const *n2, u_int len2,
                     u_int with_uid) {
   u_int i;
   for (i = 0; i < len2; i++) {
@@ -143,6 +144,7 @@
   }
   return retval;
 }
+
 /* purecov: begin deadcode */
 blob *clone_blob_ptr(blob const *b) {
   blob *retval = (blob *)calloc((size_t)1, sizeof(blob));
@@ -151,6 +153,14 @@
 }
 /* purecov: end */
 
+static void clone_node_address(node_address *target,
+                               node_address const *source) {
+  *target = *source; /* Copy everything */
+  /* Now clone what should not be shared */
+  target->address = strdup(source->address);
+  target->uuid = clone_blob(source->uuid);
+}
+
 /* Add nodes to node list, avoid duplicate entries */
 void add_node_list(u_int n, node_address *names, node_list *nodes) {
   /* Find new nodes */
@@ -169,9 +179,7 @@
       for (i = 0; i < n; i++) {
         /* 			IFDBG(D_NONE, FN; STREXP(names[i])); */
         if (!exists(&names[i], nodes, FALSE)) {
-          np->address = strdup(names[i].address);
-          np->uuid = clone_blob(names[i].uuid);
-          np->proto = names[i].proto;
+          clone_node_address(np, &names[i]);
           np++;
           /* Update length here so next iteration will check for duplicates
              against newly added node */
@@ -226,27 +234,22 @@
   add_node_list(n, names, nodes);
 }
 
-/* purecov: begin deadcode */
-node_list null_node_list() {
-  node_list nl;
-  nl.node_list_len = 0;
-  nl.node_list_val = 0;
-  return nl;
-}
-
 node_list *empty_node_list() {
-  return (node_list *)calloc((size_t)1, sizeof(node_list));
+  return (node_list *)xcom_calloc((size_t)1, sizeof(node_list));
 }
 /* purecov: end */
 
-node_address *init_single_node_address(node_address *na, char *name) {
+node_address *init_single_node_address(node_address *na, char const *name,
+                                       uint32_t services) {
   na->address = strdup(name);
   init_proto_range(&(na->proto));
+  na->services = services;
   assert(na->uuid.data.data_len == 0 && na->uuid.data.data_val == 0);
   return na;
 }
 
-node_address *init_node_address(node_address *na, u_int n, char *names[]) {
+node_address *init_node_address(node_address *na, u_int n,
+                                char const *names[]) {
   u_int i;
   for (i = 0; i < n; i++) {
     init_single_node_address(&na[i], names[i]);
@@ -254,23 +257,27 @@
   return na;
 }
 
-node_address *new_node_address(u_int n, char *names[]) {
-  node_address *na = (node_address *)calloc((size_t)n, sizeof(node_address));
+/* Create node addresses with default roles from array of names */
+node_address *new_node_address(u_int n, char const *names[]) {
+  node_address *na =
+      (node_address *)xcom_calloc((size_t)n, sizeof(node_address));
   return init_node_address(na, n, names);
 }
 
-node_address *new_node_address_uuid(u_int n, char *names[], blob uuids[]) {
-  u_int i = 0;
+/* Create node addresses with default roles from array of names and uuids */
+node_address *new_node_address_uuid(u_int n, char const *names[], blob uuid[]) {
+  u_int i;
 
-  node_address *na = (node_address *)calloc((size_t)n, sizeof(node_address));
+  node_address *na =
+      (node_address *)xcom_calloc((size_t)n, sizeof(node_address));
   init_node_address(na, n, names);
 
-  for (; i < n; i++) {
-    na[i].uuid.data.data_len = uuids[i].data.data_len;
+  for (i = 0; i < n; i++) {
+    na[i].uuid.data.data_len = uuid[i].data.data_len;
     na[i].uuid.data.data_val =
-        (char *)calloc(uuids[i].data.data_len, sizeof(char));
-    memcpy(na[i].uuid.data.data_val, uuids[i].data.data_val,
-           uuids[i].data.data_len);
+        (char *)calloc(uuid[i].data.data_len, sizeof(char));
+    memcpy(na[i].uuid.data.data_val, uuid[i].data.data_val,
+           uuid[i].data.data_len);
   }
 
   return na;
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_list.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_list.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_list.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_list.h	2021-09-28 11:46:34.000000000 +0000
@@ -28,20 +28,25 @@
 node_list clone_node_list(node_list list);
 char *dbg_list(node_list const *nodes);
 void init_node_list(u_int n, node_address *names, node_list *nodes);
-int match_node(node_address *n1, node_address *n2, u_int with_uid);
+int match_node(node_address const *n1, node_address const *n2, u_int with_uid);
 void add_node_list(u_int n, node_address *names, node_list *nodes);
 int node_exists(node_address *name, node_list const *nodes);
 int node_exists_with_uid(node_address *name, node_list const *nodes);
-node_address *new_node_address(u_int n, char *names[]);
-node_address *new_node_address_uuid(u_int n, char *names[], blob uuid[]);
+node_address *new_node_address(u_int n, char const *names[]);
+node_address *new_node_address_uuid(u_int n, char const *names[], blob uuid[]);
 void delete_node_address(u_int n, node_address *na);
 void remove_node_list(u_int n, node_address *names, node_list *nodes);
-node_address *init_single_node_address(node_address *na, char *name);
-node_address *init_node_address(node_address *na, u_int n, char *names[]);
+
+/* Enable all services by default */
+node_address *init_single_node_address(node_address *na, char const *name,
+                                       uint32_t services = P_PROP | P_ACC |
+                                                           P_LEARN);
+node_address *init_node_address(node_address *na, u_int n, char const *names[]);
 node_list *empty_node_list();
 node_list null_node_list();
 blob clone_blob(blob const b);
 blob *clone_blob_ptr(blob const *b);
 uint32_t chksum_node_list(node_list const *nodes);
+size_t node_list_size(node_list const *nodes);
 
 #endif
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_set.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_set.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_set.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_set.cc	2021-09-28 11:46:34.000000000 +0000
@@ -57,7 +57,7 @@
 /* purecov: end */
 
 node_set *alloc_node_set(node_set *set, u_int n) {
-  set->node_set_val = (int *)calloc((size_t)n, sizeof(bool_t));
+  set->node_set_val = (int *)xcom_calloc((size_t)n, sizeof(bool_t));
   set->node_set_len = n;
   return set;
 }
@@ -155,12 +155,13 @@
   return set;
 }
 
+#ifdef XCOM_STANDALONE
 /**
    Debug a node set with G_MESSAGE.
  */
-void _g_dbg_node_set(node_set set, const char *name MY_ATTRIBUTE((unused))) {
+void _g_dbg_node_set(node_set set, const char *name [[maybe_unused]]) {
   u_int n = 2 * set.node_set_len + 1;
-  char *s = (char *)calloc((size_t)n, (size_t)1);
+  char *s = (char *)xcom_calloc((size_t)n, (size_t)1);
   u_int i;
   for (i = 0; i < set.node_set_len; i++) {
     s[i * 2] = set.node_set_val[i] ? '1' : '0';
@@ -201,6 +202,7 @@
   }
   return TRUE;
 }
+#endif
 
 /* Return true if equal node sets */
 
@@ -214,6 +216,14 @@
 }
 /* purecov: end */
 
+// Test for equality
+bool equal_node_set(node_set const *x, node_set const *y) {
+  if (x->node_set_len != y->node_set_len) return false;
+  for (u_int i = 0; i < x->node_set_len; i++) {
+    if (x->node_set_val[i] != y->node_set_val[i]) return false;
+  }
+  return true;
+}
 /* Return true if node i is in set */
 
 bool_t is_set(node_set set, node_no i) {
@@ -232,6 +242,7 @@
   }
 }
 
+#ifdef XCOM_STANDALONE
 /* Remove node from set */
 
 void remove_node(node_set set, node_no node) {
@@ -273,4 +284,6 @@
     x->node_set_val[i] = (y->node_set_val[i] == TRUE ? FALSE : TRUE);
   }
 }
+
 /* purecov: end */
+#endif
\ No newline at end of file
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_set.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_set.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_set.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_set.h	2021-09-28 11:46:34.000000000 +0000
@@ -23,6 +23,8 @@
 #ifndef NODE_SET_H
 #define NODE_SET_H
 
+#include "xdr_gen/xcom_vp.h"
+
 #define dbg_node_set(s) _dbg_node_set(s, #s)
 #define g_dbg_node_set(s) _g_dbg_node_set(s, #s)
 bool_t equal_node_set(node_set x, node_set y);
@@ -48,5 +50,5 @@
 void remove_node(node_set set, node_no node);
 void xor_node_set(node_set *x, node_set const *y);
 node_set *realloc_node_set(node_set *set, u_int n);
-
+bool equal_node_set(node_set const *x, node_set const *y);
 #endif
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/pax_msg.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/pax_msg.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/pax_msg.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/pax_msg.cc	2021-09-28 11:46:34.000000000 +0000
@@ -76,19 +76,19 @@
 }
 
 pax_msg *pax_msg_new(synode_no synode, site_def const *site) {
-  pax_msg *p = (pax_msg *)calloc((size_t)1, sizeof(pax_msg));
+  pax_msg *p = (pax_msg *)xcom_calloc((size_t)1, sizeof(pax_msg));
   IFDBG(D_NONE, FN; PTREXP(p));
   return init_pax_msg(p, 0, synode, site);
 }
 
 pax_msg *pax_msg_new_0(synode_no synode) {
-  pax_msg *p = (pax_msg *)calloc((size_t)1, sizeof(pax_msg));
+  pax_msg *p = (pax_msg *)xcom_calloc((size_t)1, sizeof(pax_msg));
   IFDBG(D_NONE, FN; PTREXP(p));
   return init_pax_msg(p, 0, synode, 0);
 }
 
 pax_msg *clone_pax_msg_no_app(pax_msg *msg) {
-  pax_msg *p = (pax_msg *)calloc((size_t)1, sizeof(pax_msg));
+  pax_msg *p = (pax_msg *)xcom_calloc((size_t)1, sizeof(pax_msg));
   IFDBG(D_NONE, FN; STRLIT("clone_pax_msg"); PTREXP(p));
   *p = *msg;
   p->refcnt = 0;
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/server_struct.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/server_struct.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/server_struct.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/server_struct.h	2021-09-28 11:46:34.000000000 +0000
@@ -38,18 +38,21 @@
 struct server {
   int garbage;
   int refcnt;
-  char *srv;                 /* Server name */
-  xcom_port port;            /* Port */
-  connection_descriptor con; /* Descriptor for open connection */
-  double active;             /* Last activity */
-  double detected;           /* Last incoming */
-  channel outgoing;          /* Outbound messages */
-  task_env *sender;          /* The sender task */
-  task_env *reply_handler;   /* The reply task */
+  char *srv;                  /* Server name */
+  xcom_port port;             /* Port */
+  connection_descriptor *con; /* Descriptor for open connection */
+  double active;              /* Last activity */
+  double detected;            /* Last incoming */
+  channel outgoing;           /* Outbound messages */
+  task_env *sender;           /* The sender task */
+  task_env *reply_handler;    /* The reply task */
   srv_buf out_buf;
   int invalid;
   int number_of_pings_received; /* Number of pings received from this server */
   double last_ping_received;    /* Last received ping timestamp */
+#if defined(_WIN32)
+  bool reconnect; /*States if the server should be reconnected*/
+#endif
 };
 
 typedef struct server server;
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/simset.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/simset.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/simset.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/simset.cc	2021-09-28 11:46:34.000000000 +0000
@@ -42,4 +42,3 @@
            PTREXP(link_iter->suc); PTREXP(link_iter->pred));
   RET_GOUT;
 }
-/* purecov: end */
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/site_def.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/site_def.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/site_def.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/site_def.cc	2021-09-28 11:46:34.000000000 +0000
@@ -27,6 +27,8 @@
 
 #include <assert.h>
 #include <stdlib.h>
+#include <algorithm>
+#include <iterator>
 
 #include "xcom/bitset.h"
 #include "xcom/node_list.h"
@@ -80,12 +82,22 @@
  the servers that it points to, since servers are shared by multiple
  site_defs, and will eventually be deallocated by garbage_collect_servers
 */
-void free_site_def(site_def *s) {
+
+void free_site_def_body(site_def *s) {
   if (s) {
     invalidate_detector_sites(s);
     xdr_free((xdrproc_t)xdr_node_list, (char *)(&s->nodes));
     free_node_set(&s->global_node_set);
     free_node_set(&s->local_node_set);
+    xdr_free((xdrproc_t)xdr_leader_array, (char *)(&s->leaders));
+    IFDBG(D_BUG, FN; STRLIT("free "); PTREXP(s); PTREXP(s->dispatch_table));
+    free(s->dispatch_table);
+  }
+}
+
+void free_site_def(site_def *s) {
+  if (s) {
+    free_site_def_body(s);
     free(s);
   }
 }
@@ -281,11 +293,32 @@
 
 /* Create a new empty site_def */
 site_def *new_site_def() {
-  site_def *retval = (site_def *)calloc((size_t)1, sizeof(site_def));
+  site_def *retval = (site_def *)xcom_calloc((size_t)1, sizeof(site_def));
   retval->nodeno = VOID_NODE_NO;
   return retval;
 }
 
+static void clone_leader(leader *l, leader const *x) {
+  l->address = strdup(x->address);
+}
+
+leader_array alloc_leader_array(u_int n) {
+  leader_array a{};
+  a.leader_array_val =
+      static_cast<leader *>(xcom_calloc((size_t)n, sizeof(leader)));
+  if (a.leader_array_val) a.leader_array_len = n;
+  return a;
+}
+
+leader_array clone_leader_array(leader_array const x) {
+  u_int i;
+  leader_array a = alloc_leader_array(x.leader_array_len);
+  for (i = 0; i < a.leader_array_len; i++) {
+    clone_leader(&a.leader_array_val[i], &x.leader_array_val[i]);
+  }
+  return a;
+}
+
 /* Clone a site definition */
 
 site_def *clone_site_def(site_def const *site) {
@@ -296,6 +329,9 @@
                  &retval->nodes);
   retval->global_node_set = clone_node_set(site->global_node_set);
   retval->local_node_set = clone_node_set(site->local_node_set);
+  retval->leaders = clone_leader_array(site->leaders);
+  retval->cached_leaders = false;  // Invalidate cached leaders
+  retval->dispatch_table = NULL;   // Invalidate dispatch table
   assert(retval->global_node_set.node_set_len == _get_maxnodes(retval));
   IFDBG(D_NONE, FN; PTREXP(site); PTREXP(retval));
   return retval;
@@ -344,10 +380,9 @@
 void remove_site_def(u_int n, node_address *names, site_def *site) {
   if (n > 0) {
     remove_node_list(n, names, &site->nodes);
+    realloc_node_set(&site->global_node_set, _get_maxnodes(site));
+    realloc_node_set(&site->local_node_set, _get_maxnodes(site));
   }
-  init_detector(site->detected); /* Zero all unused timestamps */
-  realloc_node_set(&site->global_node_set, _get_maxnodes(site));
-  realloc_node_set(&site->local_node_set, _get_maxnodes(site));
 }
 
 /* Return group id of site */
@@ -439,6 +474,8 @@
         assert(cp->event_horizon);
         site->event_horizon = cp->event_horizon;
         copy_node_set(&cp->global_node_set, &site->global_node_set);
+        site->max_active_leaders = cp->max_active_leaders;
+        site->leaders = clone_leader_array(cp->leaders);
         site_install_action(site, app_type);
       }
     }
@@ -463,15 +500,15 @@
 gcs_snapshot *export_config() {
   u_int i;
   gcs_snapshot *gcs_snap =
-      (gcs_snapshot *)calloc((size_t)1, sizeof(gcs_snapshot));
+      (gcs_snapshot *)xcom_calloc((size_t)1, sizeof(gcs_snapshot));
   gcs_snap->cfg.configs_val =
-      (config_ptr *)calloc((size_t)site_defs.count, sizeof(config_ptr));
+      (config_ptr *)xcom_calloc((size_t)site_defs.count, sizeof(config_ptr));
   gcs_snap->cfg.configs_len = site_defs.count;
 
   for (i = 0; i < site_defs.count; i++) {
     site_def *site = site_defs.site_def_ptr_array_val[i];
     if (site) {
-      config_ptr cp = (config_ptr)calloc((size_t)1, sizeof(config));
+      config_ptr cp = (config_ptr)xcom_calloc((size_t)1, sizeof(config));
       init_node_list(site->nodes.node_list_len, site->nodes.node_list_val,
                      &cp->nodes);
       cp->start = site->start;
@@ -479,6 +516,8 @@
       cp->event_horizon = site->event_horizon;
       assert(cp->event_horizon);
       cp->global_node_set = clone_node_set(site->global_node_set);
+      cp->max_active_leaders = site->max_active_leaders;
+      cp->leaders = clone_leader_array(site->leaders);
       IFDBG(D_BUG, FN; SYCEXP(cp->start); SYCEXP(cp->boot_key));
       gcs_snap->cfg.configs_val[i] = cp;
     }
@@ -544,21 +583,3 @@
   assert(!synode_eq(retval, null_synode));
   return retval;
 }
-
-/* Return boot_key of lowest numbered  config in snapshot */
-/* purecov: begin deadcode */
-synode_no get_lowest_boot_key(gcs_snapshot *gcs_snap) {
-  int i;
-  synode_no retval = null_synode;
-  IFDBG(D_NONE, FN; SYCEXP(gcs_snap->log_start); SYCEXP(gcs_snap->log_end));
-  for (i = (int)gcs_snap->cfg.configs_len - 1; i >= 0; i--) {
-    config_ptr cp = gcs_snap->cfg.configs_val[i];
-    if (cp) {
-      IFDBG(D_NONE, FN; SYCEXP(cp->start); SYCEXP(cp->boot_key));
-      retval = cp->boot_key;
-      break;
-    }
-  }
-  return retval;
-}
-/* purecov: end */
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/site_def.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/site_def.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/site_def.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/site_def.h	2021-09-28 11:46:34.000000000 +0000
@@ -33,6 +33,7 @@
 void remove_site_def(u_int n, node_address *names, site_def *nodes);
 char *dbg_site_def(site_def const *site);
 void init_site_vars();
+void free_site_def_body(site_def *s);
 void free_site_def(site_def *s);
 void free_site_defs();
 site_def *push_site_def(site_def *s);
@@ -58,6 +59,8 @@
 synode_no get_min_delivered_msg(site_def const *s);
 void update_delivered(site_def *s, node_no node, synode_no msgno);
 synode_no config_max_boot_key(gcs_snapshot const *gcs_snap);
+leader_array alloc_leader_array(u_int n);
+leader_array clone_leader_array(leader_array const x);
 synode_no get_highest_boot_key(gcs_snapshot *gcs_snap);
 synode_no get_lowest_boot_key(gcs_snapshot *gcs_snap);
 
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/site_struct.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/site_struct.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/site_struct.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/site_struct.h	2021-09-28 11:46:34.000000000 +0000
@@ -23,25 +23,45 @@
 #ifndef SITE_STRUCT_H
 #define SITE_STRUCT_H
 
+#include "xcom/node_no.h"
 #include "xcom/server_struct.h"
+#include "xcom/synode_no.h"
 #include "xcom/xcom_detector.h"
+#include "xdr_gen/xcom_vp.h"
+
+/* Reserved value to signal that all nodes should be leaders */
+enum { active_leaders_all = 0 };
 
-struct site_def {
-  synode_no start;    /* Config is active from this message number */
-  synode_no boot_key; /* The message number of the original unified_boot */
-  node_no nodeno;     /* Node number of this node */
-  node_list nodes;    /* Set of nodes in this config */
-  server *servers[NSERVERS]; /* Connections to other nodes */
-  detector_state detected;   /* Time of last incoming message for each node */
-  node_no global_node_count; /* Number of live nodes in global_node_set */
-  node_set global_node_set;  /* The global view */
-  node_set local_node_set;   /* The local view */
-  int detector_updated;      /* Has detector state been updated? */
-  xcom_proto x_proto;
-  synode_no delivered_msg[NSERVERS];
-  double install_time;
-  xcom_event_horizon event_horizon;
-};
 typedef struct site_def site_def;
+typedef struct pax_msg pax_msg;
+typedef struct linkage linkage;
 
+typedef void (*msg_handler)(site_def const *site, pax_msg *p,
+                            linkage *reply_queue);
+
+struct site_def {
+  synode_no start NULL_SYNODE; /* Config is active from this message number */
+  synode_no boot_key
+      NULL_SYNODE; /* The message number of the original unified_boot */
+  node_no nodeno{VOID_NODE_NO}; /* Node number of this node */
+  node_list nodes{0, nullptr};  /* Set of nodes in this config */
+  server *servers[NSERVERS]{0}; /* Connections to other nodes */
+  detector_state detected{
+      0.0}; /* Time of last incoming message for each node */
+  node_no global_node_count{0}; /* Number of live nodes in global_node_set */
+  node_set global_node_set{0, nullptr}; /* The global view */
+  node_set local_node_set{0, nullptr};  /* The local view */
+  int detector_updated{0};              /* Has detector state been updated? */
+  xcom_proto x_proto{x_unknown_proto};
+  synode_no delivered_msg[NSERVERS]{NULL_SYNODE};
+  double install_time{0.0};
+  xcom_event_horizon event_horizon{EVENT_HORIZON_MIN};
+  node_no max_active_leaders{active_leaders_all}; /* How many leaders can there
+                                 be? >= 1 and <= number of nodes */
+  leader_array leaders{0, nullptr};     /* Leaders as defined by client */
+  msg_handler *dispatch_table{nullptr}; /* Per-config dispatch table */
+  bool cached_leaders{false};           /* Initialized leader cache ? */
+  bool active_leader[NSERVERS]{0};      /* Leader cache */
+  node_no found_leaders{0};             /* Number of leaders found */
+};
 #endif
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe.cc	2021-09-28 11:46:34.000000000 +0000
@@ -34,18 +34,20 @@
 #include "xcom/site_struct.h"
 #include "xcom/task.h"
 #include "xcom/x_platform.h"
+#include "xcom/xcom_cfg.h"
 #include "xcom/xcom_detector.h"
+#include "xcom/xcom_memory.h"
 #include "xcom/xcom_profile.h"
 #include "xdr_gen/xcom_vp.h"
 
 #ifdef _WIN32
-#include "xcom/sock_probe_win32.cc"
+#include "xcom/sock_probe_win32.h"
 #else
-#include "xcom/sock_probe_ix.cc"
+#include "xcom/sock_probe_ix.h"
 #endif
 
 /* compare two sockaddr */
-static bool_t sockaddr_default_eq(struct sockaddr *x, struct sockaddr *y) {
+bool_t sockaddr_default_eq(struct sockaddr *x, struct sockaddr *y) {
   size_t size_to_compare;
   if (x->sa_family != y->sa_family) return 0;
 
@@ -87,14 +89,22 @@
   node_no retval = VOID_NODE_NO;
   char name[IP_MAX_SIZE];
   xcom_port port = 0;
-  struct addrinfo *addr = 0;
-  struct addrinfo *saved_addr = 0;
-
-  sock_probe *s = (sock_probe *)calloc((size_t)1, sizeof(sock_probe));
+  struct addrinfo *addr = nullptr;
+  struct addrinfo *saved_addr = nullptr;
+  std::string net_namespace;
+
+  sock_probe *s = (sock_probe *)xcom_calloc((size_t)1, sizeof(sock_probe));
+
+  Network_namespace_manager *ns_mgr = cfg_app_get_network_namespace_manager();
+  if (ns_mgr) ns_mgr->channel_get_network_namespace(net_namespace);
+  if (!net_namespace.empty()) {  // If the namespace is configured
+                                 /* purecov: begin deadcode */
+    ns_mgr->set_network_namespace(net_namespace);
+    /* purecov: end */
+  }
 
   if (init_sock_probe(s) < 0) {
-    free(s);
-    return retval;
+    goto end_loop;
   }
 
   /* For each node in list */
@@ -116,16 +126,19 @@
       saved_addr = addr = probe_get_addrinfo(name);
       IFDBG(D_NONE, FN; STRLIT("name "); STRLIT(name); PTREXP(addr));
       /* getaddrinfo returns linked list of addrinfo */
+      bool using_net_ns = !net_namespace.empty();
       while (addr) {
         int j;
-        /* Match sockaddr of host with list of interfaces on this machine. Skip
-         * disabled interfaces */
+        /* Match sockaddr of host with list of interfaces on this machine.
+         * Skip disabled interfaces when using root namespace. Don't skip it
+         * otherwise*/
         for (j = 0; j < number_of_interfaces(s); j++) {
           struct sockaddr *tmp_sockaddr = NULL;
           get_sockaddr_address(s, j, &tmp_sockaddr);
+          bool should_skip_active = using_net_ns ? true : is_if_running(s, j);
           if (tmp_sockaddr != NULL &&
               sockaddr_default_eq(addr->ai_addr, tmp_sockaddr) &&
-              is_if_running(s, j)) {
+              should_skip_active) {
             retval = i;
             goto end_loop;
           }
@@ -138,28 +151,46 @@
   }
 /* Free resources and return result */
 end_loop:
-  probe_free_addrinfo(saved_addr);
+  if (!net_namespace.empty()) {  // If the namespace is configured
+    ns_mgr->restore_original_network_namespace();
+  }
+
+  if (saved_addr) {
+    probe_free_addrinfo(saved_addr);
+  }
+
   close_sock_probe(s);
   return retval;
 }
 
 node_no xcom_mynode_match(char *name, xcom_port port) {
   node_no retval = 0;
-  struct addrinfo *addr = 0;
-  struct addrinfo *saved_addr = 0;
+  struct addrinfo *addr = nullptr;
+  struct addrinfo *saved_addr = nullptr;
+  std::string net_namespace;
+  bool using_net_ns;
 
   if (match_port && !match_port(port)) return 0;
 
   {
-    sock_probe *s = (sock_probe *)calloc((size_t)1, sizeof(sock_probe));
+    sock_probe *s = (sock_probe *)xcom_calloc((size_t)1, sizeof(sock_probe));
+
+    Network_namespace_manager *ns_mgr = cfg_app_get_network_namespace_manager();
+    if (ns_mgr) ns_mgr->channel_get_network_namespace(net_namespace);
+    if (!net_namespace.empty()) {  // If the namespace is configured
+                                   /* purecov: begin deadcode */
+      ns_mgr->set_network_namespace(net_namespace);
+      /* purecov: end */
+    }
+
     if (init_sock_probe(s) < 0) {
-      free(s);
-      return retval;
+      goto end_loop;
     }
 
     saved_addr = addr = probe_get_addrinfo(name);
     IFDBG(D_NONE, FN; STREXP(name); PTREXP(addr));
     /* getaddrinfo returns linked list of addrinfo */
+    using_net_ns = !net_namespace.empty();
     while (addr) {
       int j;
       /* Match sockaddr of host with list of interfaces on this machine.
@@ -167,9 +198,10 @@
       for (j = 0; j < number_of_interfaces(s); j++) {
         struct sockaddr *tmp_sockaddr = NULL;
         get_sockaddr_address(s, j, &tmp_sockaddr);
+        bool should_skip_active = using_net_ns ? true : is_if_running(s, j);
         if (tmp_sockaddr != NULL &&
             sockaddr_default_eq(addr->ai_addr, tmp_sockaddr) &&
-            is_if_running(s, j)) {
+            should_skip_active) {
           retval = 1;
           goto end_loop;
         }
@@ -178,7 +210,14 @@
     }
   /* Free resources and return result */
   end_loop:
-    probe_free_addrinfo(saved_addr);
+    if (!net_namespace.empty()) {  // If the namespace is configured
+      ns_mgr->restore_original_network_namespace();
+    }
+
+    if (saved_addr) {
+      probe_free_addrinfo(saved_addr);
+    }
+
     close_sock_probe(s);
   }
   return retval;
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe_ix.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe_ix.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe_ix.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe_ix.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,192 +0,0 @@
-/* Copyright (c) 2015, 2021, Oracle 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,
-   as published by the Free Software Foundation.
-
-   This program is also distributed with certain software (including
-   but not limited to OpenSSL) that is licensed under separate terms,
-   as designated in a particular file or component or in included license
-   documentation.  The authors of MySQL hereby grant you an additional
-   permission to link the program and your derivative works with the
-   separately licensed software that they have included with MySQL.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License, version 2.0, for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
-
-#include <net/if.h>
-#include <sys/ioctl.h>
-#ifndef __linux__
-#include <sys/sockio.h>
-#endif
-#include <arpa/inet.h>
-#include <assert.h>
-#include <errno.h>
-#include <ifaddrs.h>
-#include <net/if.h>
-#include <netdb.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define BSD_COMP
-
-#include "xcom/simset.h"
-#include "xcom/sock_probe.h"
-#include "xcom/task.h"
-#include "xcom/task_debug.h"
-#include "xcom/task_net.h"
-#include "xcom/task_os.h"
-#include "xcom/x_platform.h"
-#include "xcom/xcom_base.h"
-#include "xcom/xcom_common.h"
-#include "xcom/xcom_memory.h"
-#include "xcom/xcom_profile.h"
-#include "xcom/xcom_transport.h"
-#include "xdr_gen/xcom_vp.h"
-
-struct sock_probe {
-  int nbr_ifs; /* number of valid pointers in ifrp */
-  struct ifaddrs *interfaces;
-};
-
-static int number_of_interfaces(sock_probe *s);
-
-static void get_sockaddr_address(sock_probe *s, int count,
-                                 struct sockaddr **out);
-
-static void get_sockaddr_netmask(sock_probe *s, int count,
-                                 struct sockaddr **out);
-
-typedef enum SockaddrOp {
-  kSockaddrOpAddress = 0,
-  kSockaddrOpNetmask
-} SockaddrOp;
-
-static void get_sockaddr(sock_probe *s, int count, struct sockaddr **out,
-                         SockaddrOp addr_operation);
-static bool_t is_if_running(sock_probe *s, int count);
-static char *get_if_name(sock_probe *s, int count);
-
-/* Initialize socket probe */
-static int init_sock_probe(sock_probe *s) {
-  struct ifaddrs *ifa_tmp;
-
-  if (s == NULL) {
-    goto err;
-  }
-
-  if (getifaddrs(&s->interfaces) == -1) {
-    goto err;
-  }
-
-  ifa_tmp = s->interfaces;
-
-  while (ifa_tmp) {
-    if ((ifa_tmp->ifa_addr) && ((ifa_tmp->ifa_addr->sa_family == AF_INET) ||
-                                (ifa_tmp->ifa_addr->sa_family == AF_INET6))) {
-      s->nbr_ifs++;
-    }
-    ifa_tmp = ifa_tmp->ifa_next;
-  }
-
-  return 0;
-err:
-  return -1;
-}
-
-/* Close socket of sock_probe */
-static void close_sock_probe(sock_probe *s) {
-  if (s->interfaces) freeifaddrs(s->interfaces);
-  free(s);
-}
-
-/* Return the number of IP interfaces on this machine.*/
-static int number_of_interfaces(sock_probe *s) {
-  if (s == NULL) {
-    return 0;
-  }
-
-  return s->nbr_ifs; /* Number of interfaces */
-}
-
-static struct ifaddrs *get_interface(sock_probe *s, int count) {
-  struct ifaddrs *net_if = NULL;
-  int i = 0;
-
-  if (s == NULL) {
-    return NULL;
-  }
-
-  net_if = s->interfaces;
-  idx_check_ret(count, number_of_interfaces(s), 0) {
-    while (net_if != NULL) {
-      if ((net_if->ifa_addr) && ((net_if->ifa_addr->sa_family == AF_INET) ||
-                                 (net_if->ifa_addr->sa_family == AF_INET6))) {
-        if (i >= count)
-          return net_if;
-        else
-          i++;
-      }
-
-      net_if = net_if->ifa_next;
-    }
-  }
-
-  return NULL;
-}
-
-static bool_t is_if_running(sock_probe *s, int count) {
-  struct ifaddrs *net_if = NULL;
-
-  if (s == NULL) {
-    return 0;
-  }
-
-  net_if = get_interface(s, count);
-  return net_if != NULL && (net_if->ifa_flags & IFF_UP) &&
-         (net_if->ifa_flags & IFF_RUNNING);
-}
-
-static void get_sockaddr_address(sock_probe *s, int count,
-                                 struct sockaddr **out) {
-  get_sockaddr(s, count, out, kSockaddrOpAddress);
-}
-
-static void get_sockaddr_netmask(sock_probe *s, int count,
-                                 struct sockaddr **out) {
-  get_sockaddr(s, count, out, kSockaddrOpNetmask);
-}
-
-/* Return the sockaddr of interface #count. */
-static void get_sockaddr(sock_probe *s, int count, struct sockaddr **out,
-                         SockaddrOp addr_operation) {
-  struct ifaddrs *net_if = get_interface(s, count);
-
-  if (net_if == NULL) {
-    *out = NULL;
-    return;
-  }
-
-  switch (addr_operation) {
-    case kSockaddrOpAddress:
-      *out = (struct sockaddr *)net_if->ifa_addr;
-      break;
-    case kSockaddrOpNetmask:
-      *out = (struct sockaddr *)net_if->ifa_netmask;
-      break;
-    default:
-      break;
-  }
-}
-
-static char *get_if_name(sock_probe *s, int count) {
-  struct ifaddrs *net_if = get_interface(s, count);
-
-  return net_if != NULL ? net_if->ifa_name : NULL;
-}
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe_ix.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe_ix.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe_ix.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe_ix.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,193 @@
+/* Copyright (c) 2015, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include <net/if.h>
+#include <sys/ioctl.h>
+#ifndef __linux__
+#include <sys/sockio.h>
+#endif
+#include <arpa/inet.h>
+#include <assert.h>
+#include <errno.h>
+#include <ifaddrs.h>
+#include <net/if.h>
+#include <netdb.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define BSD_COMP
+
+#include "xcom/simset.h"
+#include "xcom/sock_probe.h"
+#include "xcom/task.h"
+#include "xcom/task_debug.h"
+#include "xcom/task_net.h"
+#include "xcom/task_os.h"
+#include "xcom/x_platform.h"
+#include "xcom/xcom_base.h"
+#include "xcom/xcom_common.h"
+#include "xcom/xcom_memory.h"
+#include "xcom/xcom_profile.h"
+#include "xcom/xcom_transport.h"
+#include "xdr_gen/xcom_vp.h"
+
+struct sock_probe {
+  int nbr_ifs; /* number of valid pointers in ifrp */
+  struct ifaddrs *interfaces;
+};
+
+static int number_of_interfaces(sock_probe *s);
+
+static void get_sockaddr_address(sock_probe *s, int count,
+                                 struct sockaddr **out);
+
+static void get_sockaddr_netmask(sock_probe *s, int count,
+                                 struct sockaddr **out);
+
+typedef enum SockaddrOp {
+  kSockaddrOpAddress = 0,
+  kSockaddrOpNetmask
+} SockaddrOp;
+
+static void get_sockaddr(sock_probe *s, int count, struct sockaddr **out,
+                         SockaddrOp addr_operation);
+static bool_t is_if_running(sock_probe *s, int count);
+static char *get_if_name(sock_probe *s, int count);
+
+/* Initialize socket probe */
+static int init_sock_probe(sock_probe *s) {
+  struct ifaddrs *ifa_tmp;
+
+  if (s == NULL) {
+    goto err;
+  }
+
+  s->interfaces = nullptr;
+  if (getifaddrs(&s->interfaces) == -1) {
+    goto err;
+  }
+
+  ifa_tmp = s->interfaces;
+
+  while (ifa_tmp) {
+    if ((ifa_tmp->ifa_addr) && ((ifa_tmp->ifa_addr->sa_family == AF_INET) ||
+                                (ifa_tmp->ifa_addr->sa_family == AF_INET6))) {
+      s->nbr_ifs++;
+    }
+    ifa_tmp = ifa_tmp->ifa_next;
+  }
+
+  return 0;
+err:
+  return -1;
+}
+
+/* Close socket of sock_probe */
+static void close_sock_probe(sock_probe *s) {
+  if (s->interfaces) freeifaddrs(s->interfaces);
+  free(s);
+}
+
+/* Return the number of IP interfaces on this machine.*/
+static int number_of_interfaces(sock_probe *s) {
+  if (s == NULL) {
+    return 0;
+  }
+
+  return s->nbr_ifs; /* Number of interfaces */
+}
+
+static struct ifaddrs *get_interface(sock_probe *s, int count) {
+  struct ifaddrs *net_if = NULL;
+  int i = 0;
+
+  if (s == NULL) {
+    return NULL;
+  }
+
+  net_if = s->interfaces;
+  idx_check_ret(count, number_of_interfaces(s), 0) {
+    while (net_if != NULL) {
+      if ((net_if->ifa_addr) && ((net_if->ifa_addr->sa_family == AF_INET) ||
+                                 (net_if->ifa_addr->sa_family == AF_INET6))) {
+        if (i >= count)
+          return net_if;
+        else
+          i++;
+      }
+
+      net_if = net_if->ifa_next;
+    }
+  }
+
+  return NULL;
+}
+
+static bool_t is_if_running(sock_probe *s, int count) {
+  struct ifaddrs *net_if = NULL;
+
+  if (s == NULL) {
+    return 0;
+  }
+
+  net_if = get_interface(s, count);
+  return net_if != NULL && (net_if->ifa_flags & IFF_UP) &&
+         (net_if->ifa_flags & IFF_RUNNING);
+}
+
+static void get_sockaddr_address(sock_probe *s, int count,
+                                 struct sockaddr **out) {
+  get_sockaddr(s, count, out, kSockaddrOpAddress);
+}
+
+static void get_sockaddr_netmask(sock_probe *s, int count,
+                                 struct sockaddr **out) {
+  get_sockaddr(s, count, out, kSockaddrOpNetmask);
+}
+
+/* Return the sockaddr of interface #count. */
+static void get_sockaddr(sock_probe *s, int count, struct sockaddr **out,
+                         SockaddrOp addr_operation) {
+  struct ifaddrs *net_if = get_interface(s, count);
+
+  if (net_if == NULL) {
+    *out = NULL;
+    return;
+  }
+
+  switch (addr_operation) {
+    case kSockaddrOpAddress:
+      *out = (struct sockaddr *)net_if->ifa_addr;
+      break;
+    case kSockaddrOpNetmask:
+      *out = (struct sockaddr *)net_if->ifa_netmask;
+      break;
+    default:
+      break;
+  }
+}
+
+static char *get_if_name(sock_probe *s, int count) {
+  struct ifaddrs *net_if = get_interface(s, count);
+
+  return net_if != NULL ? net_if->ifa_name : NULL;
+}
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe_win32.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe_win32.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe_win32.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe_win32.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,271 +0,0 @@
-/* Copyright (c) 2010, 2021, Oracle 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,
-   as published by the Free Software Foundation.
-
-   This program is also distributed with certain software (including
-   but not limited to OpenSSL) that is licensed under separate terms,
-   as designated in a particular file or component or in included license
-   documentation.  The authors of MySQL hereby grant you an additional
-   permission to link the program and your derivative works with the
-   separately licensed software that they have included with MySQL.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License, version 2.0, for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
-
-/**
-  @file sock_probe_win32.cc
-  Utility functions to check if a network address or name matches an
-  interface on the machine we are running on. This is useful to deduce
-  the node number from a list of network addresses or names. The node
-  number is the index of the list element which matches.
-*/
-
-#include <windows.h>
-
-#undef FD_SETSIZE
-#define FD_SETSIZE 256
-#include <assert.h>
-#include <errno.h>
-#include <iphlpapi.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <winsock2.h>
-#include <ws2tcpip.h>
-
-#define BSD_COMP
-
-#include "xcom/node_no.h"
-#include "xcom/simset.h"
-#include "xcom/sock_probe.h"
-#include "xcom/task.h"
-#include "xcom/task_debug.h"
-#include "xcom/task_net.h"
-#include "xcom/task_os.h"
-#include "xcom/xcom_base.h"
-#include "xcom/xcom_common.h"
-#include "xcom/xcom_memory.h"
-#include "xcom/xcom_profile.h"
-#include "xcom/xcom_transport.h"
-#include "xdr_gen/xcom_vp.h"
-
-#define WORKING_BUFFER_SIZE 1024 * 1024
-
-typedef struct sockaddr_in SOCKADDR_IN;
-typedef struct sockaddr sockaddr;
-
-typedef struct in_addr in_addr;
-
-/*
-  The sock_probe class provides utillity functions for
-  accessing the (set of) IP addresses on the current machine and
-  checking if one of these addresses matches a host.
-*/
-struct sock_probe {
-  PIP_ADAPTER_ADDRESSES addresses;
-  int number_of_interfaces;
-};
-
-typedef struct sock_probe sock_probe;
-
-typedef enum SockaddrOp {
-  kSockaddrOpAddress = 0,
-  kSockaddrOpNetmask
-} SockaddrOp;
-
-/* Initialize socket probe */
-static int init_sock_probe(sock_probe *s) {
-  ULONG flags = GAA_FLAG_INCLUDE_PREFIX, family = AF_UNSPEC, out_buflen = 0;
-  DWORD retval = 0;
-  PIP_ADAPTER_ADDRESSES curr_addresses;
-
-  if (s == NULL) {
-    return 1;
-  }
-
-  out_buflen = WORKING_BUFFER_SIZE;
-
-  s->addresses = (IP_ADAPTER_ADDRESSES *)malloc(out_buflen);
-  if (s->addresses == NULL) return 1;
-
-  retval = GetAdaptersAddresses(family, flags, NULL, s->addresses, &out_buflen);
-
-  curr_addresses = s->addresses;
-  while (curr_addresses) {
-    PIP_ADAPTER_UNICAST_ADDRESS_LH curr_unicast_address;
-
-    IFDBG(D_TRANSPORT, STRLIT("Adapter status: ");
-          if (curr_addresses->OperStatus == IfOperStatusUp) STRLIT("UP");
-          else STRLIT("DOWN"););
-
-    curr_unicast_address = curr_addresses->FirstUnicastAddress;
-    while (curr_unicast_address) {
-      if (curr_unicast_address->Address.lpSockaddr->sa_family == AF_INET ||
-          curr_unicast_address->Address.lpSockaddr->sa_family == AF_INET6) {
-        s->number_of_interfaces++;
-      }
-      curr_unicast_address = curr_unicast_address->Next;
-    }
-
-    curr_addresses = curr_addresses->Next;
-  }
-
-  return retval != NO_ERROR;
-}
-
-/* Close socket of sock_probe */
-static void close_sock_probe(sock_probe *s) {
-  if (s && s->addresses) free(s->addresses);
-  free(s);
-}
-
-/* Return the number of IP interfaces on this machine.*/
-static int number_of_interfaces(sock_probe *s) {
-  if (s == NULL) {
-    return 0;
-  }
-  return s->number_of_interfaces;
-}
-
-/* Return TRUE if interface #count is running. */
-static bool_t is_if_running(sock_probe *s, int count) {
-  if (s == NULL) {
-    return 0;
-  }
-  return 1; /* We will always report active because GetAdaptersAddresses */
-            /* always returns active interfaces. */
-}
-
-struct interface_info {
-  PIP_ADAPTER_ADDRESSES network_interface;
-  PIP_ADAPTER_UNICAST_ADDRESS_LH network_address;
-};
-typedef struct interface_info interface_info;
-
-static interface_info get_interface(sock_probe *s, int count) {
-  int i = 0;
-  interface_info retval;
-  retval.network_address = NULL;
-  retval.network_interface = NULL;
-
-  idx_check_fail(count, number_of_interfaces(s)) {
-    PIP_ADAPTER_ADDRESSES curr_addresses = s->addresses;
-    while (curr_addresses && (i <= count)) {
-      PIP_ADAPTER_UNICAST_ADDRESS_LH curr_unicast_address =
-          curr_addresses->FirstUnicastAddress;
-      while (curr_unicast_address && (i <= count)) {
-        if (curr_unicast_address->Address.lpSockaddr->sa_family == AF_INET ||
-            curr_unicast_address->Address.lpSockaddr->sa_family == AF_INET6) {
-          if (i == count) {
-            retval.network_address = curr_unicast_address;
-            retval.network_interface = curr_addresses;
-          }
-          i++;
-        }
-        curr_unicast_address = curr_unicast_address->Next;
-      }
-
-      curr_addresses = curr_addresses->Next;
-    }
-  }
-
-  return retval;
-}
-
-/* Return the sockaddr of interface #count. */
-/**
- * @brief Get the sockaddr object that pertains to a certain interface index
- * Depending of the addr_operation parameter value, it can be from:
- * - Netmask
- * - Physical Address
- *
- * @param s an initialized sock_probe structure
- * @param count the interface index to return
- * @param out the return value sockaddr. NULL in case of error.
- * @param addr_operation either request the sockaddr for the physical address or
- * for a netmask
- */
-static void get_sockaddr(sock_probe *s, int count, struct sockaddr **out,
-                         SockaddrOp addr_operation) {
-  int i = 0;
-  interface_info interface_info;
-
-  if (s == NULL) {
-    *out = NULL;
-  }
-
-  interface_info = get_interface(s, count);
-  if (interface_info.network_interface == NULL) {
-    *out = NULL;
-    return;
-  }
-
-  /* Let see what the function caller wants... */
-  switch (addr_operation) {
-    /* Return the interface address sockaddr */
-    case kSockaddrOpAddress:
-      *out = interface_info.network_address->Address.lpSockaddr;
-      break;
-    /* Return the interface address netmask */
-    case kSockaddrOpNetmask:
-      /* Windows is the opposite of Nix.
-         While Nix has a sockaddr that contains the netmask,
-         and then you need to count the bits to see how many are
-         set, in case of Windows, you already have the number of bits that
-         are set in OnLinkPrefixLength field.
-         The issue with that is that then you need to convert them to a network
-         format. In case of IPv4, you have a method called
-         ConvertLengthToIpv4Mask. In case of V6 you need to do it by hand
-         setting the bits in the correct place of sin6_addr.s6_addr. */
-      if (interface_info.network_address->Address.lpSockaddr->sa_family ==
-          AF_INET) {
-        struct sockaddr_in *out_value =
-            (struct sockaddr_in *)malloc(sizeof(struct sockaddr_in));
-        ConvertLengthToIpv4Mask(
-            interface_info.network_address->OnLinkPrefixLength,
-            &out_value->sin_addr.s_addr);
-        *out = (struct sockaddr *)out_value;
-      } else {
-        long i, j;
-        struct sockaddr_in6 *out_value =
-            (struct sockaddr_in6 *)calloc(1, sizeof(struct sockaddr_in6));
-        for (i = interface_info.network_address->OnLinkPrefixLength, j = 0;
-             i > 0; i -= 8, ++j) {
-          out_value->sin6_addr.s6_addr[j] =
-              i >= 8 ? 0xff : (ULONG)((0xffU << (8 - i)));
-        }
-        *out = (struct sockaddr *)out_value;
-      }
-      break;
-    default:
-      break;
-  }
-}
-
-static void get_sockaddr_address(sock_probe *s, int count,
-                                 struct sockaddr **out) {
-  get_sockaddr(s, count, out, kSockaddrOpAddress);
-}
-
-static void get_sockaddr_netmask(sock_probe *s, int count,
-                                 struct sockaddr **out) {
-  get_sockaddr(s, count, out, kSockaddrOpNetmask);
-}
-
-static char *get_if_name(sock_probe *s, int count) {
-  interface_info interface_info = get_interface(s, count);
-
-  if (interface_info.network_address == NULL) {
-    return NULL;
-  }
-
-  return interface_info.network_interface->AdapterName;
-}
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe_win32.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe_win32.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe_win32.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe_win32.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,270 @@
+/* Copyright (c) 2010, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+/**
+  Utility functions to check if a network address or name matches an
+  interface on the machine we are running on. This is useful to deduce
+  the node number from a list of network addresses or names. The node
+  number is the index of the list element which matches.
+*/
+
+#include <windows.h>
+
+#undef FD_SETSIZE
+#define FD_SETSIZE 256
+#include <assert.h>
+#include <errno.h>
+#include <iphlpapi.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
+
+#define BSD_COMP
+
+#include "xcom/node_no.h"
+#include "xcom/simset.h"
+#include "xcom/sock_probe.h"
+#include "xcom/task.h"
+#include "xcom/task_debug.h"
+#include "xcom/task_net.h"
+#include "xcom/task_os.h"
+#include "xcom/xcom_base.h"
+#include "xcom/xcom_common.h"
+#include "xcom/xcom_memory.h"
+#include "xcom/xcom_profile.h"
+#include "xcom/xcom_transport.h"
+#include "xdr_gen/xcom_vp.h"
+
+#define WORKING_BUFFER_SIZE 1024 * 1024
+
+typedef struct sockaddr_in SOCKADDR_IN;
+typedef struct sockaddr sockaddr;
+
+typedef struct in_addr in_addr;
+
+/*
+  The sock_probe class provides utillity functions for
+  accessing the (set of) IP addresses on the current machine and
+  checking if one of these addresses matches a host.
+*/
+struct sock_probe {
+  PIP_ADAPTER_ADDRESSES addresses;
+  int number_of_interfaces;
+};
+
+typedef struct sock_probe sock_probe;
+
+typedef enum SockaddrOp {
+  kSockaddrOpAddress = 0,
+  kSockaddrOpNetmask
+} SockaddrOp;
+
+/* Initialize socket probe */
+static int init_sock_probe(sock_probe *s) {
+  ULONG flags = GAA_FLAG_INCLUDE_PREFIX, family = AF_UNSPEC, out_buflen = 0;
+  DWORD retval = 0;
+  PIP_ADAPTER_ADDRESSES curr_addresses;
+
+  if (s == NULL) {
+    return 1;
+  }
+
+  out_buflen = WORKING_BUFFER_SIZE;
+
+  s->addresses = (IP_ADAPTER_ADDRESSES *)xcom_malloc(out_buflen);
+  if (s->addresses == NULL) return 1;
+
+  retval = GetAdaptersAddresses(family, flags, NULL, s->addresses, &out_buflen);
+
+  curr_addresses = s->addresses;
+  while (curr_addresses) {
+    PIP_ADAPTER_UNICAST_ADDRESS_LH curr_unicast_address;
+
+    IFDBG(D_TRANSPORT, STRLIT("Adapter status: ");
+          if (curr_addresses->OperStatus == IfOperStatusUp) STRLIT("UP");
+          else STRLIT("DOWN"););
+
+    curr_unicast_address = curr_addresses->FirstUnicastAddress;
+    while (curr_unicast_address) {
+      if (curr_unicast_address->Address.lpSockaddr->sa_family == AF_INET ||
+          curr_unicast_address->Address.lpSockaddr->sa_family == AF_INET6) {
+        s->number_of_interfaces++;
+      }
+      curr_unicast_address = curr_unicast_address->Next;
+    }
+
+    curr_addresses = curr_addresses->Next;
+  }
+
+  return retval != NO_ERROR;
+}
+
+/* Close socket of sock_probe */
+static void close_sock_probe(sock_probe *s) {
+  if (s && s->addresses) free(s->addresses);
+  free(s);
+}
+
+/* Return the number of IP interfaces on this machine.*/
+static int number_of_interfaces(sock_probe *s) {
+  if (s == NULL) {
+    return 0;
+  }
+  return s->number_of_interfaces;
+}
+
+/* Return TRUE if interface #count is running. */
+static bool_t is_if_running(sock_probe *s, int count) {
+  if (s == NULL) {
+    return 0;
+  }
+  return 1; /* We will always report active because GetAdaptersAddresses */
+            /* always returns active interfaces. */
+}
+
+struct interface_info {
+  PIP_ADAPTER_ADDRESSES network_interface;
+  PIP_ADAPTER_UNICAST_ADDRESS_LH network_address;
+};
+typedef struct interface_info interface_info;
+
+static interface_info get_interface(sock_probe *s, int count) {
+  int i = 0;
+  interface_info retval;
+  retval.network_address = NULL;
+  retval.network_interface = NULL;
+
+  idx_check_fail(count, number_of_interfaces(s)) {
+    PIP_ADAPTER_ADDRESSES curr_addresses = s->addresses;
+    while (curr_addresses && (i <= count)) {
+      PIP_ADAPTER_UNICAST_ADDRESS_LH curr_unicast_address =
+          curr_addresses->FirstUnicastAddress;
+      while (curr_unicast_address && (i <= count)) {
+        if (curr_unicast_address->Address.lpSockaddr->sa_family == AF_INET ||
+            curr_unicast_address->Address.lpSockaddr->sa_family == AF_INET6) {
+          if (i == count) {
+            retval.network_address = curr_unicast_address;
+            retval.network_interface = curr_addresses;
+          }
+          i++;
+        }
+        curr_unicast_address = curr_unicast_address->Next;
+      }
+
+      curr_addresses = curr_addresses->Next;
+    }
+  }
+
+  return retval;
+}
+
+/* Return the sockaddr of interface #count. */
+/**
+ * @brief Get the sockaddr object that pertains to a certain interface index
+ * Depending of the addr_operation parameter value, it can be from:
+ * - Netmask
+ * - Physical Address
+ *
+ * @param s an initialized sock_probe structure
+ * @param count the interface index to return
+ * @param out the return value sockaddr. NULL in case of error.
+ * @param addr_operation either request the sockaddr for the physical address or
+ * for a netmask
+ */
+static void get_sockaddr(sock_probe *s, int count, struct sockaddr **out,
+                         SockaddrOp addr_operation) {
+  int i = 0;
+  interface_info interface_info;
+
+  if (s == NULL) {
+    *out = NULL;
+  }
+
+  interface_info = get_interface(s, count);
+  if (interface_info.network_interface == NULL) {
+    *out = NULL;
+    return;
+  }
+
+  /* Let see what the function caller wants... */
+  switch (addr_operation) {
+    /* Return the interface address sockaddr */
+    case kSockaddrOpAddress:
+      *out = interface_info.network_address->Address.lpSockaddr;
+      break;
+    /* Return the interface address netmask */
+    case kSockaddrOpNetmask:
+      /* Windows is the opposite of Nix.
+         While Nix has a sockaddr that contains the netmask,
+         and then you need to count the bits to see how many are
+         set, in case of Windows, you already have the number of bits that
+         are set in OnLinkPrefixLength field.
+         The issue with that is that then you need to convert them to a network
+         format. In case of IPv4, you have a method called
+         ConvertLengthToIpv4Mask. In case of V6 you need to do it by hand
+         setting the bits in the correct place of sin6_addr.s6_addr. */
+      if (interface_info.network_address->Address.lpSockaddr->sa_family ==
+          AF_INET) {
+        struct sockaddr_in *out_value =
+            (struct sockaddr_in *)xcom_malloc(sizeof(struct sockaddr_in));
+        ConvertLengthToIpv4Mask(
+            interface_info.network_address->OnLinkPrefixLength,
+            &out_value->sin_addr.s_addr);
+        *out = (struct sockaddr *)out_value;
+      } else {
+        long i, j;
+        struct sockaddr_in6 *out_value =
+            (struct sockaddr_in6 *)xcom_calloc(1, sizeof(struct sockaddr_in6));
+        for (i = interface_info.network_address->OnLinkPrefixLength, j = 0;
+             i > 0; i -= 8, ++j) {
+          out_value->sin6_addr.s6_addr[j] =
+              i >= 8 ? 0xff : (ULONG)((0xffU << (8 - i)));
+        }
+        *out = (struct sockaddr *)out_value;
+      }
+      break;
+    default:
+      break;
+  }
+}
+
+static void get_sockaddr_address(sock_probe *s, int count,
+                                 struct sockaddr **out) {
+  get_sockaddr(s, count, out, kSockaddrOpAddress);
+}
+
+static void get_sockaddr_netmask(sock_probe *s, int count,
+                                 struct sockaddr **out) {
+  get_sockaddr(s, count, out, kSockaddrOpNetmask);
+}
+
+static char *get_if_name(sock_probe *s, int count) {
+  interface_info interface_info = get_interface(s, count);
+
+  if (interface_info.network_address == NULL) {
+    return NULL;
+  }
+
+  return interface_info.network_interface->AdapterName;
+}
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task.cc	2021-09-28 11:46:34.000000000 +0000
@@ -42,6 +42,7 @@
 #include <stdint.h>
 #endif
 #include "xcom/x_platform.h"
+#include "xcom/xcom_memory.h"
 #include "xcom/xcom_profile.h"
 
 #ifndef XCOM_WITHOUT_OPENSSL
@@ -71,6 +72,8 @@
 #include <sys/types.h>
 #include <time.h>
 
+#include <memory>
+
 #include "xcom/node_connection.h"
 #include "xdr_gen/xcom_vp.h"
 
@@ -82,6 +85,7 @@
 #include "xcom/task_os.h"
 #include "xcom/xcom_base.h"
 #include "xcom/xcom_cfg.h"
+#include "xcom/xcom_transport.h"
 
 #ifndef _WIN32
 #include <poll.h>
@@ -97,6 +101,7 @@
 #endif
 
 extern const char *pax_op_to_str(int x);
+extern uint32_t get_my_xcom_id();
 
 task_arg null_arg = {a_end, {0}};
 
@@ -600,7 +605,7 @@
 task_env *task_new(task_func func, task_arg arg, const char *name, int debug) {
   task_env *t;
   if (link_empty(&free_tasks))
-    t = (task_env *)malloc(sizeof(task_env));
+    t = (task_env *)xcom_malloc(sizeof(task_env));
   else
     t = container_of(link_extract_first(&free_tasks), task_env, l);
   IFDBG(D_NONE, FN; PTREXP(t); STREXP(name); NDBG(active_tasks, d););
@@ -876,13 +881,6 @@
   return t;
 }
 
-static task_env *timed_wait_io(task_env *t, int fd, int op, double timeout) {
-  t->time = task_now() + timeout;
-  t->interrupt = 0;
-  add_fd(deactivate(t), fd, op);
-  return t;
-}
-
 static uint64_t send_count;
 static uint64_t receive_count;
 static uint64_t send_bytes;
@@ -915,6 +913,16 @@
 }
 #endif
 
+result con_pipe_read(connection_descriptor const *rfd, void *buf, int n) {
+  result ret = {0, 0};
+
+  SET_OS_ERR(0);
+  ret.val = (int)read(rfd->fd, (xcom_buf *)buf, (size_t)n);
+  ret.funerr = to_errno(GET_OS_ERR);
+
+  return ret;
+}
+
 /*
   It just reads no more than INT_MAX bytes. Caller should call it again for
   read more than INT_MAX bytes.
@@ -922,8 +930,8 @@
   Either the bytes written or an error number is returned to the caller through
   'ret' argument. Error number is always negative integers.
 */
-int task_read(connection_descriptor const *con, void *buf, int n,
-              int64_t *ret) {
+int task_read(connection_descriptor const *con, void *buf, int n, int64_t *ret,
+              connnection_read_method read_function) {
   DECL_ENV
   int dummy;
   END_ENV;
@@ -938,7 +946,9 @@
 
   for (;;) {
     if (con->fd <= 0) TASK_FAIL;
-    sock_ret = con_read(con, buf, n);
+
+    sock_ret = read_function(con, buf, n);
+
     *ret = sock_ret.val;
     IFDBG(D_TRANSPORT, FN; NDBG(con->fd, d); NDBG(n, d); NDBG(sock_ret.val, d);
           NDBG(sock_ret.funerr, d););
@@ -990,6 +1000,16 @@
   return ret;
 }
 #endif
+result con_pipe_write(connection_descriptor const *wfd, void *buf, int n) {
+  result ret = {0, 0};
+
+  assert(n > 0);
+
+  SET_OS_ERR(0);
+  ret.val = (int)write(wfd->fd, (xcom_buf *)buf, (size_t)n);
+  ret.funerr = to_errno(GET_OS_ERR);
+  return ret;
+}
 
 /*
   It writes no more than UINT_MAX bytes which is the biggest size of
@@ -1088,9 +1108,11 @@
   return x;
 }
 
+#ifndef AGGRESSIVE_SWEEP
 /* purecov: begin deadcode */
 int is_only_task() { return link_first(&tasks) == link_last(&tasks); }
 /* purecov: end */
+#endif
 
 static task_env *first_runnable() { return (task_env *)link_first(&tasks); }
 
@@ -1191,361 +1213,6 @@
   task_sys_deinit();
 }
 
-int connect_tcp(char *server, xcom_port port, int *ret) {
-  DECL_ENV
-  int fd;
-  struct addrinfo *addr, *from_ns;
-  END_ENV;
-  TASK_BEGIN;
-
-  IFDBG(D_TRANSPORT, FN; STREXP(server); NDBG(port, d));
-
-  ep->addr = NULL;
-  ep->from_ns = NULL;
-
-  checked_getaddrinfo_port(server, port, NULL, &ep->from_ns);
-
-  if (ep->from_ns == NULL) {
-    TASK_FAIL;
-  }
-
-  ep->addr = does_node_have_v4_address(ep->from_ns);
-
-  /* Create socket */
-  if ((ep->fd =
-           xcom_checked_socket(ep->addr->ai_family, SOCK_STREAM, IPPROTO_TCP)
-               .val) < 0) {
-    IFDBG(D_TRANSPORT, FN; NDBG(ep->fd, d));
-    TASK_FAIL;
-  }
-  /* Make it non-blocking */
-  unblock_fd(ep->fd);
-
-  /* Connect socket to address */
-  {
-    result sock = {0, 0};
-    SET_OS_ERR(0);
-    sock.val =
-        connect(ep->fd, ep->addr->ai_addr, (socklen_t)ep->addr->ai_addrlen);
-    sock.funerr = to_errno(GET_OS_ERR);
-
-    if (sock.val < 0) {
-      if (hard_connect_err(sock.funerr)) {
-        /* purecov: begin inspected */
-        task_dump_err(sock.funerr);
-        IFDBG(D_TRANSPORT, FN; NDBG(ep->fd, d););
-        close_socket(&ep->fd);
-        TASK_FAIL;
-        /* purecov: end */
-      }
-    }
-  }
-
-/* Wait until connect has finished */
-retry:
-  timed_wait_io(stack, ep->fd, 'w', 10.0);
-  TASK_YIELD;
-  /* See if we timed out here. If we did, connect may or may not be active.
-     If closing fails with EINPROGRESS, we need to retry the select.
-     If close does not fail, we know that connect has indeed failed, and
-     we exit from here and return -1 as socket fd */
-  if (stack->interrupt) {
-    result shut = {0, 0};
-    stack->interrupt = 0;
-
-    /* Try to close socket on timeout */
-    shut = shut_close_socket(&ep->fd);
-    IFDBG(D_TRANSPORT, FN; NDBG(ep->fd, d););
-    task_dump_err(shut.funerr);
-    if (from_errno(shut.funerr) == SOCK_EINPROGRESS)
-      goto retry; /* Connect is still active */
-    TASK_FAIL;    /* Connect has failed */
-  }
-
-  {
-    int peer = 0;
-    result sock = {0, 0};
-    struct sockaddr_storage sock_addr;
-    socklen_t sock_size = sizeof(sock_addr);
-    memset((void *)&sock_addr, 0, sizeof(sock_addr));
-
-    /* Sanity check before return */
-    SET_OS_ERR(0);
-    sock.val = peer =
-        xcom_getpeername(ep->fd, (struct sockaddr *)&sock_addr, &sock_size);
-    sock.funerr = to_errno(GET_OS_ERR);
-    if (peer >= 0) {
-      TASK_RETURN(ep->fd);
-    } else {
-      /* Something is wrong */
-      socklen_t errlen = sizeof(sock.funerr);
-
-      IFDBG(D_TRANSPORT, FN; CONSTPTREXP(&sock_addr);
-            STRLIT("Something is wrong "); NDBG(ep->fd, d); NDBG(sock.val, d);
-            NDBG(sock.funerr, d));
-      if (sock.funerr == 0) { /* Try to extract error code another way */
-        /* purecov: begin inspected */
-        getsockopt(ep->fd, SOL_SOCKET, SO_ERROR, (xcom_buf *)&sock.funerr,
-                   &errlen);
-        IFDBG(D_TRANSPORT, FN; CONSTPTREXP(&sock_addr);
-              STRLIT("Something is wrong "); NDBG(ep->fd, d); NDBG(sock.val, d);
-              NDBG(sock.funerr, d));
-        /* purecov: end */
-      }
-      if (sock.funerr == 0) { /* Still 0? Assign generic "connection refused */
-        /* purecov: begin inspected */
-        sock.funerr = to_errno(SOCK_ECONNREFUSED);
-        /* purecov: end */
-      }
-
-      shut_close_socket(&ep->fd);
-      TASK_FAIL;
-    }
-  }
-
-  FINALLY
-  if (ep->from_ns) freeaddrinfo(ep->from_ns);
-  TASK_END;
-}
-
-result set_nodelay(int fd) {
-  int n = 1;
-  result ret = {0, 0};
-
-  do {
-    SET_OS_ERR(0);
-    ret.val =
-        setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (xcom_buf *)&n, sizeof n);
-    ret.funerr = to_errno(GET_OS_ERR);
-    IFDBG(D_NONE, FN; NDBG(from_errno(ret.funerr), d));
-  } while (ret.val < 0 && can_retry(ret.funerr));
-  return ret;
-}
-
-static result create_server_socket() {
-  result fd = {0, 0};
-  /* Create socket */
-  if ((fd = xcom_checked_socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP)).val < 0) {
-    G_MESSAGE(
-        "Unable to create socket v6"
-        "(socket=%d, errno=%d)!",
-        fd.val, to_errno(GET_OS_ERR));
-    return fd;
-  }
-  {
-    int reuse = 1;
-    int mode = 0;
-    SET_OS_ERR(0);
-    if (setsockopt(fd.val, SOL_SOCKET, SOCK_OPT_REUSEADDR, (xcom_buf *)&reuse,
-                   sizeof(reuse)) < 0) {
-      fd.funerr = to_errno(GET_OS_ERR);
-      G_MESSAGE(
-          "Unable to set socket options "
-          "(socket=%d, errno=%d)!",
-          fd.val, to_errno(GET_OS_ERR));
-      close_socket(&fd.val);
-      return fd;
-    }
-    /*
-     This code sets the acceptor socket as dual-stacked. What happens is that
-     we expose the XCom server socket as V6 only, and it will accept V4
-     requests. V4 requests are then represented as IPV4-mapped addresses.
-    */
-    SET_OS_ERR(0);
-    if (setsockopt(fd.val, IPPROTO_IPV6, IPV6_V6ONLY, (xcom_buf *)&mode,
-                   sizeof(mode)) < 0) {
-      fd.funerr = to_errno(GET_OS_ERR);
-      G_MESSAGE(
-          "Unable to set socket options "
-          "(socket=%d, errno=%d)!",
-          fd.val, to_errno(GET_OS_ERR));
-      close_socket(&fd.val);
-      return fd;
-    }
-  }
-  return fd;
-}
-
-static result create_server_socket_v4() {
-  result fd = {0, 0};
-  /* Create socket */
-  if ((fd = xcom_checked_socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)).val < 0) {
-    G_MESSAGE(
-        "Unable to create socket v4"
-        "(socket=%d, errno=%d)!",
-        fd.val, to_errno(GET_OS_ERR));
-    return fd;
-  }
-  {
-    int reuse = 1;
-    SET_OS_ERR(0);
-    if (setsockopt(fd.val, SOL_SOCKET, SOCK_OPT_REUSEADDR, (xcom_buf *)&reuse,
-                   sizeof(reuse)) < 0) {
-      /* purecov: begin inspected */
-      fd.funerr = to_errno(GET_OS_ERR);
-      G_MESSAGE(
-          "Unable to set socket options "
-          "(socket=%d, errno=%d)!",
-          fd.val, to_errno(GET_OS_ERR));
-      close_socket(&fd.val);
-      return fd;
-      /* purecov: end */
-    }
-  }
-  return fd;
-}
-
-/**
- * @brief Initializes a sockaddr prepared to be used in bind()
- *
- * @param sock_addr struct sockaddr out parameter. You will need to free it
- *                  after being used.
- * @param sock_len socklen_t out parameter. It will contain the length of
- *                 sock_addr
- * @param port the port to bind.
- * @param family the address family
- */
-static void init_server_addr(struct sockaddr **sock_addr, socklen_t *sock_len,
-                             xcom_port port, int family) {
-  struct addrinfo *address_info = NULL, hints, *address_info_loop;
-  memset(&hints, 0, sizeof(hints));
-
-  hints.ai_flags = AI_PASSIVE;
-  hints.ai_protocol = IPPROTO_TCP;
-  hints.ai_family = AF_UNSPEC;
-  hints.ai_socktype = SOCK_STREAM; /* TCP stream sockets */
-  checked_getaddrinfo_port(NULL, port, &hints, &address_info);
-
-  address_info_loop = address_info;
-  while (address_info_loop) {
-    if (address_info_loop->ai_family == family) {
-      if (*sock_addr == NULL) {
-        *sock_addr = (struct sockaddr *)malloc(address_info_loop->ai_addrlen);
-      }
-      memcpy(*sock_addr, address_info_loop->ai_addr,
-             address_info_loop->ai_addrlen);
-
-      *sock_len = (socklen_t)address_info_loop->ai_addrlen;
-
-      break;
-    }
-    address_info_loop = address_info_loop->ai_next;
-  }
-
-  if (address_info) freeaddrinfo(address_info);
-}
-
-result announce_tcp(xcom_port port) {
-  result fd = {0, 0};
-  struct sockaddr *sock_addr = NULL;
-  socklen_t sock_addr_len = 0;
-  int server_socket_v6_ok = 0;
-
-  /* Try and create a V6 server socket. It should succeed if the OS */
-  /* supports IPv6, and fail otherwise. */
-#ifndef FORCE_IPV4
-  fd = create_server_socket();
-#else
-  /* Force ipv4 for now */
-  fd.val = -1;
-#endif
-  if (fd.val < 0) {
-    /* If the OS does not support IPv6, we fall back to IPv4. */
-    fd = create_server_socket_v4();
-    if (fd.val < 0) {
-      return fd;
-    }
-  } else {
-    server_socket_v6_ok = 1;
-  }
-  init_server_addr(&sock_addr, &sock_addr_len, port,
-                   server_socket_v6_ok ? AF_INET6 : AF_INET);
-  if (sock_addr == NULL || (bind(fd.val, sock_addr, sock_addr_len) < 0)) {
-    /* If we fail to bind to the desired address, we fall back to an */
-    /* IPv4 socket. */
-    fd = create_server_socket_v4();
-    if (fd.val < 0) {
-      return fd;
-    }
-
-    free(sock_addr);
-    sock_addr = NULL;
-    init_server_addr(&sock_addr, &sock_addr_len, port, AF_INET);
-    if (bind(fd.val, sock_addr, sock_addr_len) < 0) {
-      int err = to_errno(GET_OS_ERR);
-      G_ERROR("Unable to bind to %s:%d (socket=%d, errno=%d)!", "INADDR_ANY",
-              port, fd.val, err);
-      goto err;
-    }
-  }
-
-  G_DEBUG("Successfully bound to %s:%d (socket=%d).", "INADDR_ANY", port,
-          fd.val);
-  if (listen(fd.val, 32) < 0) {
-    int err = to_errno(GET_OS_ERR);
-    G_MESSAGE(
-        "Unable to listen backlog to 32. "
-        "(socket=%d, errno=%d)!",
-        fd.val, err);
-    goto err;
-  }
-  G_DEBUG(
-      "Successfully set listen backlog to 32 "
-      "(socket=%d)!",
-      fd.val);
-  /* Make socket non-blocking */
-  unblock_fd(fd.val);
-  if (fd.val < 0) {
-    int err = to_errno(GET_OS_ERR);
-    G_MESSAGE("Unable to unblock socket (socket=%d, errno=%d)!", fd.val, err);
-  } else {
-    G_DEBUG("Successfully unblocked socket (socket=%d)!", fd.val);
-  }
-
-  free(sock_addr);
-  return fd;
-
-err:
-  fd.funerr = to_errno(GET_OS_ERR);
-  task_dump_err(fd.funerr);
-  close_socket(&fd.val);
-
-  free(sock_addr);
-
-  return fd;
-}
-
-int accept_tcp(int fd, int *ret) {
-  struct sockaddr_storage sock_addr;
-  DECL_ENV
-  int connection;
-  END_ENV;
-  TASK_BEGIN;
-  /* Wait for connection attempt */
-
-  wait_io(stack, fd, 'r');
-  TASK_YIELD;
-  /* Spin on benign error code */
-  {
-    socklen_t size = sizeof(struct sockaddr_storage);
-
-    result res = {0, 0};
-    do {
-      SET_OS_ERR(0);
-      res.val = ep->connection =
-          (int)accept(fd, (struct sockaddr *)&sock_addr, &size);
-      res.funerr = to_errno(GET_OS_ERR);
-    } while (res.val < 0 && from_errno(res.funerr) == SOCK_EINTR);
-
-    if (ep->connection < 0) {
-      TASK_FAIL;
-    }
-  }
-  TASK_RETURN(ep->connection);
-  FINALLY
-  TASK_END;
-}
-
 #define STAT_INTERVAL 1.0
 
 #if 0
@@ -1664,8 +1331,6 @@
 #endif
 
 /* purecov: begin deadcode */
-extern uint32_t get_my_xcom_id();
-
 void ev_print(task_event te) {
   enum { bufsize = 10000 };
   static char buf[bufsize];
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task.h	2021-09-28 11:46:34.000000000 +0000
@@ -301,18 +301,6 @@
 
 #define TERMINATE goto task_cleanup
 
-#define TASK_STACK_DEBUG                                          \
-  if (stack->debug) {                                             \
-    char *fnpos = strrchr(__FILE__, DIR_SEP);                     \
-    if (fnpos)                                                    \
-      fnpos++;                                                    \
-    else                                                          \
-      fnpos = __FILE__;                                           \
-    IFDBG(D_NONE, FN; STRLIT("TASK_BEGIN "); STREXP(stack->name); \
-          STRLIT(fnpos); STRLIT(":"); NPUT(stack->sp->state, d);  \
-          NDBG(stack->terminate, d));                             \
-  }
-
 /* Switch on task state. The first time, allocate a new stack frame and check
  * for termination */
 #define TASK_BEGIN                                            \
@@ -502,7 +490,7 @@
 #define END_ENV \
   }             \
   ;             \
-  struct env MY_ATTRIBUTE((unused)) * ep
+  [[maybe_unused]] struct env *ep
 
 /* Try to lock a fd for read or write.
    Yield and spin until it succeeds.
@@ -553,12 +541,22 @@
 
 extern int unblock_fd(int fd);
 extern int block_fd(int fd);
-extern int connect_tcp(char *server, xcom_port port, int *ret);
-extern result announce_tcp(xcom_port port);
-extern int accept_tcp(int fd, int *ret);
+
+typedef result (*connnection_read_method)(connection_descriptor const *rfd,
+                                          void *buf, int n);
+
+extern result con_read(connection_descriptor const *rfd, void *buf, int n);
+extern result con_pipe_read(connection_descriptor const *rfd, void *buf, int n);
 
 extern int task_read(connection_descriptor const *con, void *buf, int n,
-                     int64_t *ret);
+                     int64_t *ret,
+                     connnection_read_method read_function = con_read);
+
+typedef result (*connnection_write_method)(connection_descriptor const *rfd,
+                                           void *buf, int n);
+result con_write(connection_descriptor const *wfd, void *buf, int n);
+result con_pipe_write(connection_descriptor const *wfd, void *buf, int n);
+
 extern int task_write(connection_descriptor const *con, void *buf, uint32_t n,
                       int64_t *ret);
 extern int is_locked(int fd);
@@ -585,17 +583,14 @@
 extern const char *task_name();
 extern task_env *wait_io(task_env *t, int fd, int op);
 
-extern result con_read(connection_descriptor const *rfd, void *buf, int n);
 extern result con_write(connection_descriptor const *wfd, void *buf, int n);
 extern result set_nodelay(int fd);
 
+extern task_env *timed_wait_io(task_env *t, int fd, int op, double timeout);
+
 extern xcom_proto const my_min_xcom_version; /* The minimum protocol version I
                                                 am able to understand */
 extern xcom_proto const
     my_xcom_version; /* The maximum protocol version I am able to understand */
 
-/* Use SSL ? */
-void xcom_enable_ssl();
-void xcom_disable_ssl();
-
 #endif
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task_net.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task_net.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task_net.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task_net.cc	2021-09-28 11:46:34.000000000 +0000
@@ -47,30 +47,13 @@
 #include "xcom/task_debug.h"
 #include "xcom/task_os.h"
 #include "xcom/x_platform.h"
+#include "xcom/xcom_memory.h"
 #include "xdr_gen/xcom_vp.h"
 
 #define STRING_PORT_SIZE 6
 #define NR_GETADDRINFO_ATTEMPTS 10
 
 /**
- * Wrapper function which retries and checks errors from socket
- */
-result xcom_checked_socket(int domain, int type, int protocol) {
-  result ret = {0, 0};
-  int retry = 1000;
-  do {
-    SET_OS_ERR(0);
-    ret.val = (int)socket(domain, type, protocol);
-    ret.funerr = to_errno(GET_OS_ERR);
-  } while (--retry && ret.val == -1 && (from_errno(ret.funerr) == SOCK_EAGAIN));
-  if (ret.val == -1) {
-    task_dump_err(ret.funerr);
-    /* abort(); */
-  }
-  return ret;
-}
-
-/**
  * Wrapper function which retries and checks errors from getaddrinfo
  *
  * We have observed that getaddrinfo returns EAI_AGAIN when called with an
@@ -143,6 +126,7 @@
   infonode *right;
 };
 
+#ifdef XCOM_STANDALONE
 static infonode *addrinfomap;
 
 static infonode *insert_server(infonode **top, char const *server,
@@ -151,7 +135,7 @@
     return 0;
   else {
     if (*top == 0) { /* Insert here */
-      infonode *n = (infonode *)calloc((size_t)1, sizeof(infonode));
+      infonode *n = (infonode *)xcom_calloc((size_t)1, sizeof(infonode));
       n->server = strdup(server);
       n->addr = addr;
       *top = n;
@@ -208,14 +192,17 @@
     if (left) free_getaddrinfo_cache(left);
   }
 }
+#endif
 
 void deinit_network_cache() {
+#ifdef XCOM_STANDALONE
   if (addrinfomap) {
     /* purecov: begin deadcode */
     free_getaddrinfo_cache(addrinfomap);
     addrinfomap = NULL;
     /* purecov: end */
   }
+#endif
 }
 
 #ifdef _WIN32
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task_os.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task_os.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task_os.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task_os.h	2021-09-28 11:46:34.000000000 +0000
@@ -65,7 +65,7 @@
 typedef ULONG nfds_t;
 typedef struct pollfd pollfd;
 static inline int poll(pollfd *fds, nfds_t nfds, int timeout) {
-  return WSAPoll(fds, nfds, timeout);
+  return nfds == 0 ? 0 : WSAPoll(fds, nfds, timeout);
 }
 
 static inline int is_socket_error(int x) { return x == SOCKET_ERROR || x < 0; }
@@ -99,6 +99,8 @@
 #define SET_OS_ERR(x) errno = (x)
 #define CLOSESOCKET(x) close(x)
 #define SOCK_SHUT_RDWR (SHUT_RD | SHUT_WR)
+#define SOCK_SHUT_RW SHUT_WR
+#define SOCK_SHUT_RD SHUT_RD
 
 static inline int hard_connect_err(int err) {
   return err != 0 && from_errno(err) != EINTR && from_errno(err) != EINPROGRESS;
@@ -116,23 +118,6 @@
 
 extern void remove_and_wakeup(int fd);
 
-static inline result close_socket(int *sock) {
-  result res = {0, 0};
-  if (*sock != -1) {
-    IFDBG(D_FILEOP, FN; STRLIT("closing socket "); NDBG(*sock, d));
-    do {
-      SET_OS_ERR(0);
-      res.val = CLOSESOCKET(*sock);
-      res.funerr = to_errno(GET_OS_ERR);
-    } while (res.val == -1 && from_errno(res.funerr) == SOCK_EINTR);
-    IFDBG(D_FILEOP, FN; STRLIT("closed socket "); NDBG(*sock, d);
-          NDBG(from_errno(res.funerr), d));
-    remove_and_wakeup(*sock);
-    *sock = -1;
-  }
-  return res;
-}
-
 #if defined(_WIN32)
 
 static inline void shutdown_socket(int *sock) {
@@ -173,12 +158,24 @@
 
 #endif
 
-static inline result shut_close_socket(int *sock) {
+static inline result xcom_close_socket(int *sock) {
+  result res = {0, 0};
+  if (*sock != -1) {
+    IFDBG(D_FILEOP, FN; STRLIT("closing socket "); NDBG(*sock, d));
+    do {
+      SET_OS_ERR(0);
+      res.val = CLOSESOCKET(*sock);
+      res.funerr = to_errno(GET_OS_ERR);
+    } while (res.val == -1 && from_errno(res.funerr) == SOCK_EINTR);
+  }
+  return res;
+}
+
+static inline result xcom_shut_close_socket(int *sock) {
   result res = {0, 0};
   if (*sock >= 0) {
     shutdown_socket(sock);
-    res = close_socket(sock);
-    *sock = -1;
+    res = xcom_close_socket(sock);
   }
   return res;
 }
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_base.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_base.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_base.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_base.cc	2021-09-28 11:46:34.000000000 +0000
@@ -43,12 +43,6 @@
 #include <poll.h>
 #endif
 
-#ifdef _WIN32
-#define xcom_buf char
-#else
-#define xcom_buf void
-#endif
-
 /**
   @file
   xcom/xcom_base.c
@@ -276,6 +270,8 @@
 #include <windows.h>
 #endif
 
+#include <memory>
+
 #include "xcom/app_data.h"
 #include "xcom/get_synode_app_data.h"
 #include "xcom/node_no.h"
@@ -292,11 +288,8 @@
 #include "xcom/xdr_utils.h"
 #include "xdr_gen/xcom_vp.h"
 
-#ifndef XCOM_WITHOUT_OPENSSL
-#include "xcom/xcom_ssl_transport.h"
-#endif
-
 #include "xcom/bitset.h"
+#include "xcom/leader_info_data.h"
 #include "xcom/node_list.h"
 #include "xcom/node_set.h"
 #include "xcom/pax_msg.h"
@@ -314,6 +307,8 @@
 #include "xcom/xcom_statistics.h"
 #include "xcom/xcom_vp_str.h"
 
+#include "xcom/network/xcom_network_provider.h"
+
 #ifndef XCOM_WITHOUT_OPENSSL
 #ifdef _WIN32
 /* In OpenSSL before 1.1.0, we need this first. */
@@ -324,6 +319,9 @@
 
 #endif
 
+#include <queue>
+#include <tuple>
+
 /* Defines and constants */
 
 #define SYS_STRERROR_SIZE 512
@@ -354,10 +352,13 @@
 static int use_buffered_read = 1;
 
 /* Used to handle OOM errors */
-static unsigned short oom_abort = 0;
+int oom_abort = 0;
 
 /* Forward declarations */
 long xcom_unique_long(void);
+static int64_t socket_write(
+    connection_descriptor *wfd, void *_buf, uint32_t n,
+    connnection_write_method write_function = con_write);
 
 static double wakeup_delay(double old);
 static void note_snapshot(node_no node);
@@ -373,14 +374,26 @@
 static int finished(pax_machine *p);
 static int accepted(pax_machine *p);
 static int started(pax_machine *p);
-static synode_no first_free_synode(synode_no msgno);
+static synode_no first_free_synode_local(synode_no msgno);
 static void free_forced_config_site_def();
 static void activate_sweeper();
 static void force_pax_machine(pax_machine *p, int enforcer);
+static void propose_noop_2p(synode_no find, pax_machine *p);
 static void handle_need_snapshot(linkage *reply_queue, pax_msg *pm);
 static void handle_skip(site_def const *site, pax_machine *p, pax_msg *m);
-
-extern void bit_set_or(bit_set *x, bit_set const *y);
+static void paxos_fsm(pax_machine *paxos, site_def const *site,
+                      paxos_event event, pax_msg *mess);
+static inline bool is_leader(site_def *site);
+int is_active_leader(node_no x, site_def *site);
+static msg_handler *primary_dispatch_table();
+static msg_handler *secondary_dispatch_table();
+static void recompute_node_sets(site_def const *old_site, site_def *new_site);
+void recompute_timestamps(detector_state const old_timestamp,
+                          node_list const *old_nodes,
+                          detector_state new_timestamp,
+                          node_list const *new_nodes);
+void analyze_leaders(site_def *site);
+static inline int ignore_message(synode_no x, site_def *site, char const *dbg);
 
 /* Global variables */
 
@@ -432,6 +445,53 @@
 
 static channel prop_input_queue; /* Proposer task input queue */
 
+enum class synode_allocation_type { todo = 0, local, remote, global };
+enum class synode_reservation_status : int {
+  number_ok,
+  no_nodes,
+  delivery_timeout
+};
+
+#if 0
+static char const *synode_allocation_type_to_str(synode_allocation_type x) {
+  switch (x) {
+    case synode_allocation_type::todo:
+      return "todo";
+    case synode_allocation_type::local:
+      return "local";
+    case synode_allocation_type::remote:
+      return "remote";
+    case synode_allocation_type::global:
+      return "global";
+    default:
+      return "";
+  }
+}
+#endif
+
+// A pool of synode numbers implemented as a queue
+struct synode_pool {
+  std::queue<std::pair<synode_no, synode_allocation_type>> data;
+  linkage queue;
+
+  synode_pool() { link_init(&queue, TYPE_HASH("task_env")); }
+
+  void put(synode_no synode, synode_allocation_type allocation) {
+    data.push({synode, allocation});
+    task_wakeup(&queue);
+  }
+
+  auto get() {
+    auto retval = data.front();
+    data.pop();
+    return retval;
+  }
+
+  bool empty() { return data.empty(); }
+};
+
+synode_pool synode_number_pool;
+
 extern int client_boot_done;
 extern int netboot_ok;
 
@@ -522,12 +582,14 @@
  *
  *   start(R) + event_horizon(R) + 1
  */
+#ifdef PERMISSIVE_EH_ACTIVE_CONFIG
 /* purecov: begin deadcode */
 static synode_no add_default_event_horizon(synode_no s) {
   s.msgno += EVENT_HORIZON_MIN + 1;
   return s;
 }
 /* purecov: end */
+#endif
 
 static synode_no add_event_horizon(synode_no s) {
   site_def const *active_config = find_site_def(executed_msg);
@@ -548,7 +610,7 @@
     /* purecov: begin deadcode */
     assert(active_config != NULL);
     return null_synode;
-    /* purecov: end */
+/* purecov: end */
 #endif
   }
 }
@@ -617,6 +679,7 @@
   return ret; /* Change this if we change message number type */
 }
 
+#if 0
 synode_no decr_synode(synode_no synode) {
   synode_no ret = synode;
   if (ret.node == 0) {
@@ -626,6 +689,7 @@
   ret.node--;
   return ret; /* Change this if we change message number type */
 }
+#endif
 
 static void skip_value(pax_msg *p) {
   IFDBG(D_NONE, FN; SYCEXP(p->synode));
@@ -710,7 +774,7 @@
 
 /* Definition of majority */
 static inline int majority(bit_set const *nodeset, site_def const *s, int all,
-                           int delay MY_ATTRIBUTE((unused)), int force) {
+                           int delay [[maybe_unused]], int force) {
   node_no ok = 0;
   node_no i = 0;
   int retval = 0;
@@ -772,7 +836,7 @@
   ((p)->proposer.msg->a ? (p)->proposer.msg->a->consensus == cons_all : 0)
 
 /* See if a majority of acceptors have answered our prepare */
-static int prep_majority(site_def const *site, pax_machine *p) {
+static int prep_majority(site_def const *site, pax_machine const *p) {
   int ok = 0;
 
   assert(p);
@@ -780,13 +844,13 @@
   assert(p->proposer.msg);
   /* IFDBG(D_NONE, FN; BALCEXP(p->proposer.bal)); */
   ok = majority(p->proposer.prep_nodeset, site, IS_CONS_ALL(p),
-                p->proposer.bal.cnt == 1,
+                p->proposer.bal.cnt <= 1,
                 p->proposer.msg->force_delivery || p->force_delivery);
   return ok;
 }
 
 /* See if a majority of acceptors have answered our propose */
-static int prop_majority(site_def const *site, pax_machine *p) {
+static int prop_majority(site_def const *site, pax_machine const *p) {
   int ok = 0;
 
   assert(p);
@@ -794,7 +858,7 @@
   assert(p->proposer.msg);
   /* IFDBG(D_NONE, FN; BALCEXP(p->proposer.bal)); */
   ok = majority(p->proposer.prop_nodeset, site, IS_CONS_ALL(p),
-                p->proposer.bal.cnt == 1,
+                p->proposer.bal.cnt <= 1,
                 p->proposer.msg->force_delivery || p->force_delivery);
   return ok;
 }
@@ -891,10 +955,18 @@
   IFDBG(D_NONE, FN; STRLIT("prop_input_queue empty"));
 }
 
+static void empty_synode_number_pool() {
+  while (!synode_number_pool.data.empty()) {
+    synode_number_pool.data.pop();
+  }
+}
+
 /* De-initialize the xcom thread */
 void xcom_thread_deinit() {
   IFDBG(D_BUG, FN; STRLIT("Empty proposer input queue"));
   empty_prop_input_queue();
+  IFDBG(D_BUG, FN; STRLIT("Empty synode number pool"));
+  empty_synode_number_pool();
   IFDBG(D_BUG, FN; STRLIT("Empty link free list"));
   empty_link_free_list();
   IFDBG(D_BUG, FN; STRLIT("De-initialize cache"));
@@ -921,6 +993,38 @@
   }
 }
 
+static synode_no *proposer_synodes[PROPOSERS];
+
+static void add_proposer_synode(int i, synode_no *syn_ptr) {
+  if (i >= 0 && i < PROPOSERS) {
+    proposer_synodes[i] = syn_ptr;
+  }
+}
+
+static void remove_proposer_synode(int i) { add_proposer_synode(i, NULL); }
+
+static synode_no get_proposer_synode(int i) {
+  if (i >= 0 && i < PROPOSERS && proposer_synodes[i]) {
+    return *proposer_synodes[i];
+  } else {
+    return null_synode;
+  }
+}
+
+static synode_no min_proposer_synode() {
+  synode_no s_min;
+  int i;
+  for (i = 0; i < PROPOSERS; i++) {
+    s_min = get_proposer_synode(i);
+    if (!synode_eq(null_synode, s_min)) break;  // Initial value
+  }
+  for (; i < PROPOSERS; i++) {
+    if (synode_lt(get_proposer_synode(i), s_min))
+      s_min = get_proposer_synode(i);
+  }
+  return s_min;
+}
+
 static void terminate_proposers() {
   PROP_ITER { task_terminate(proposer[i]); }
 }
@@ -931,7 +1035,7 @@
 }
 
 #if TASK_DBUG_ON
-static void dbg_proposers() MY_ATTRIBUTE((unused));
+[[maybe_unused]] static void dbg_proposers();
 static void dbg_proposers() {
   GET_GOUT;
   if (!IS_XCOM_DEBUG_WITH(XCOM_DEBUG_TRACE)) return;
@@ -948,12 +1052,12 @@
   IFDBG(D_NONE, FN; STRLIT("changing current message"));
   if (synode_gt(max_synode, get_current_message())) {
     if (max_synode.msgno <= 1)
-      set_current_message(first_free_synode(max_synode));
+      set_current_message(first_free_synode_local(max_synode));
     else
-      set_current_message(incr_msgno(first_free_synode(max_synode)));
+      set_current_message(incr_msgno(first_free_synode_local(max_synode)));
   }
   if (synode_gt(executed_msg, get_current_message())) {
-    set_current_message(first_free_synode(executed_msg));
+    set_current_message(first_free_synode_local(executed_msg));
   }
 }
 
@@ -965,44 +1069,67 @@
 static xcom_state_change_cb xcom_exit_cb = 0;
 static xcom_state_change_cb xcom_expel_cb = 0;
 static xcom_input_try_pop_cb xcom_try_pop_from_input_cb = NULL;
+static xcom_recovery_cb MY_ATTRIBUTE((unused)) recovery_begin_cb = NULL;
+static xcom_recovery_cb MY_ATTRIBUTE((unused)) recovery_restart_cb = NULL;
+static xcom_recovery_cb MY_ATTRIBUTE((unused)) recovery_init_cb = NULL;
+static xcom_recovery_cb MY_ATTRIBUTE((unused)) recovery_end_cb = NULL;
 
 void set_xcom_run_cb(xcom_state_change_cb x) { xcom_run_cb = x; }
-
+void set_xcom_exit_cb(xcom_state_change_cb x) { xcom_exit_cb = x; }
 void set_xcom_comms_cb(xcom_state_change_cb x) { xcom_comms_cb = x; }
+void set_xcom_expel_cb(xcom_state_change_cb x) { xcom_expel_cb = x; }
+
+void set_xcom_input_try_pop_cb(xcom_input_try_pop_cb pop) {
+  xcom_try_pop_from_input_cb = pop;
+}
+
+#ifdef XCOM_STANDALONE
 /* purecov: begin deadcode */
 void set_xcom_terminate_cb(xcom_state_change_cb x) { xcom_terminate_cb = x; }
 /* purecov: end */
-void set_xcom_exit_cb(xcom_state_change_cb x) { xcom_exit_cb = x; }
 
-static xcom_recovery_cb recovery_begin_cb = NULL;
 /* purecov: begin deadcode */
 void set_xcom_recovery_begin_cb(xcom_recovery_cb x) { recovery_begin_cb = x; }
 /* purecov: end */
 
-static xcom_recovery_cb recovery_restart_cb = NULL;
 /* purecov: begin deadcode */
 void set_xcom_recovery_restart_cb(xcom_recovery_cb x) {
   recovery_restart_cb = x;
 }
 /* purecov: end */
 
-static xcom_recovery_cb recovery_init_cb = NULL;
 /* purecov: begin deadcode */
 void set_xcom_recovery_init_cb(xcom_recovery_cb x) { recovery_init_cb = x; }
 /* purecov: end */
 
-static xcom_recovery_cb recovery_end_cb = NULL;
 /* purecov: begin deadcode */
 void set_xcom_recovery_end_cb(xcom_recovery_cb x) { recovery_end_cb = x; }
 /* purecov: end */
+#endif
 
-void set_xcom_expel_cb(xcom_state_change_cb x) { xcom_expel_cb = x; }
+/**
+ * These fields are used to signal XCom's request queue. After a request
+ * is added, one will write 1 byte to warn local_server_task that it has work to
+ * do.
+ *
+ * We use two types of signalling connection:
+ * - An anonymous pipe, when possible, in POSIX compatible systems
+ * - A regular socket connection, in Windows
+ *
+ * input_signal_connection is the connection_descriptor returned when one opens
+ * a local signalling connection. It will contain either:
+ * - The write side of a connection, in case of using a pipe OR;
+ * - A bidirectional connection, when using a regular socket connection;
+ *
+ * input_signal_connection_pipe is the connection_descriptor that holds the read
+ * side of a pipe connection. It is only allocated when we are able to have
+ * a pipe connection.
+ */
 
-void set_xcom_input_try_pop_cb(xcom_input_try_pop_cb pop) {
-  xcom_try_pop_from_input_cb = pop;
-}
+static connection_descriptor *input_signal_connection{nullptr};
 
-static connection_descriptor *input_signal_connection = NULL;
+connection_descriptor *input_signal_connection_pipe{nullptr};
+int pipe_signal_connections[2] = {-1, -1};
 
 #ifndef XCOM_WITHOUT_OPENSSL
 static bool_t xcom_input_signal_connection_shutdown_ssl_wait_for_peer() {
@@ -1012,11 +1139,14 @@
     ssl_error_code = SSL_read(input_signal_connection->ssl_fd, buf, 1024);
   } while (ssl_error_code > 0);
 
-  bool_t const successful =
-      (SSL_get_error(input_signal_connection->ssl_fd, ssl_error_code) ==
-       SSL_ERROR_ZERO_RETURN);
-  return successful;
+  {
+    bool_t const successful =
+        (SSL_get_error(input_signal_connection->ssl_fd, ssl_error_code) ==
+         SSL_ERROR_ZERO_RETURN);
+    return successful;
+  }
 }
+
 static bool_t xcom_input_signal_connection_shutdown_ssl() {
   bool_t successful = FALSE;
 
@@ -1044,55 +1174,90 @@
   bool_t const UNSUCCESSFUL = FALSE;
   assert(input_signal_connection == NULL);
 
-  /* Try to connect. */
-  input_signal_connection = xcom_open_client_connection(address, port);
-  if (input_signal_connection == NULL) return UNSUCCESSFUL;
-
-  /* Have the server handle the rest of this connection using a local_server
-     task. */
-  if (xcom_client_convert_into_local_server(input_signal_connection) == 1) {
-    G_TRACE(
-        "Converted the signalling connection handler into a local_server "
-        "task on the client side.");
+  if (input_signal_connection_pipe != nullptr) {
+    input_signal_connection =
+        (connection_descriptor *)malloc(sizeof(connection_descriptor));
+    input_signal_connection->fd = pipe_signal_connections[1];
 #ifndef XCOM_WITHOUT_OPENSSL
-    /* No more SSL in this connection. */
-    {
-      bool_t const using_ssl = (input_signal_connection->ssl_fd != NULL);
-      if (using_ssl) {
-        bool_t successful = xcom_input_signal_connection_shutdown_ssl();
-        if (!successful) {
-          G_ERROR(
-              "Error shutting down SSL on XCom's signalling connection on the "
-              "client side.");
-          xcom_input_free_signal_connection();
-          return UNSUCCESSFUL;
-        }
-      }
-    }
+    input_signal_connection->ssl_fd = nullptr;
 #endif
+    set_connected(input_signal_connection, CON_FD);
+
     return SUCCESSFUL;
   } else {
-    G_DEBUG(
-        "Error converting the signalling connection handler into a "
-        "local_server task on the client side.");
-    xcom_input_free_signal_connection();
-    return UNSUCCESSFUL;
+    /* purecov: begin deadcode */
+    /* Try to connect. */
+    input_signal_connection = open_new_local_connection(address, port);
+    if (input_signal_connection->fd == -1) {
+      return UNSUCCESSFUL;
+    }
+
+    /* Have the server handle the rest of this connection using a local_server
+       task. */
+    if (xcom_client_convert_into_local_server(input_signal_connection) == 1) {
+      G_TRACE(
+          "Converted the signalling connection handler into a local_server "
+          "task on the client side.");
+
+#ifndef XCOM_WITHOUT_OPENSSL
+      /* No more SSL in this connection. */
+      if (Network_provider_manager::getInstance().get_running_protocol() ==
+          XCOM_PROTOCOL) {
+        bool_t const using_ssl = (input_signal_connection->ssl_fd != NULL);
+        if (using_ssl) {
+          bool_t successful = xcom_input_signal_connection_shutdown_ssl();
+          if (!successful) {
+            G_ERROR(
+                "Error shutting down SSL on XCom's signalling connection on "
+                "the "
+                "client side.");
+            xcom_input_free_signal_connection();
+            return UNSUCCESSFUL;
+          }
+        }
+      }
+#endif
+
+      return SUCCESSFUL;
+    } else {
+      G_DEBUG(
+          "Error converting the signalling connection handler into a "
+          "local_server task on the client side.");
+      xcom_input_free_signal_connection();
+      return UNSUCCESSFUL;
+    }
+    /* purecov: end */
   }
 }
-static int64_t socket_write(connection_descriptor *wfd, void *_buf, uint32_t n);
+
 bool_t xcom_input_signal() {
   bool_t successful = FALSE;
   if (input_signal_connection != NULL) {
     unsigned char tiny_buf[1] = {0};
-    int64_t error_code = socket_write(input_signal_connection, tiny_buf, 1);
+    int64_t error_code;
+    connnection_write_method to_write_function =
+        input_signal_connection_pipe != nullptr ? con_pipe_write : con_write;
+
+    error_code =
+        socket_write(input_signal_connection, tiny_buf, 1, to_write_function);
+
     successful = (error_code == 1);
   }
   return successful;
 }
+
 void xcom_input_free_signal_connection() {
-  if (input_signal_connection != NULL) {
-    xcom_close_client_connection(input_signal_connection);
-    input_signal_connection = NULL;
+  if (input_signal_connection != nullptr) {
+    if (input_signal_connection_pipe != nullptr) {
+      close(input_signal_connection->fd);
+    } else {
+      /* purecov: begin deadcode */
+      close_open_connection(input_signal_connection);
+      /* purecov: end */
+    }
+
+    free(input_signal_connection);
+    input_signal_connection = nullptr;
   }
 }
 
@@ -1114,7 +1279,8 @@
     do {
       TASK_CALL(task_read(con, buf, n, &ep->nr_read));
     } while (ep->nr_read > 0);
-    ep->ssl_error_code = SSL_get_error(con->ssl_fd, ep->nr_read);
+    ep->ssl_error_code =
+        SSL_get_error(con->ssl_fd, static_cast<int>(ep->nr_read));
     ep->something_went_wrong = (ep->ssl_error_code != SSL_ERROR_ZERO_RETURN);
   }
   if (ep->something_went_wrong) TERMINATE;
@@ -1137,13 +1303,15 @@
   pax_msg *reply_payload;
   linkage internal_reply_queue;
   msg_link *internal_reply;
+  bool signaling_connection_error;
+  connnection_read_method signal_read;
   END_ENV;
   TASK_BEGIN
   assert(xcom_try_pop_from_input_cb != NULL);
   {
     connection_descriptor *arg_rfd = (connection_descriptor *)get_void_arg(arg);
     ep->rfd = *arg_rfd;
-    free(arg_rfd);
+    if (input_signal_connection_pipe == nullptr) free(arg_rfd);
   }
   ep->ssl_shutdown_ret = 0;
   memset(ep->buf, 0, 1024);
@@ -1154,10 +1322,18 @@
   ep->reply_payload = NULL;
   link_init(&ep->internal_reply_queue, TYPE_HASH("msg_link"));
   ep->internal_reply = NULL;
+  ep->signaling_connection_error = false;
+
+  // We will check if we have a pipe open or if we use a classic signalling
+  // connection.
+  ep->signal_read =
+      input_signal_connection_pipe != nullptr ? con_pipe_read : con_read;
 
 #ifndef XCOM_WITHOUT_OPENSSL
   /* No more SSL in this connection. */
-  if (ep->rfd.ssl_fd) {
+  if (Network_provider_manager::getInstance().get_running_protocol() ==
+          XCOM_PROTOCOL &&
+      ep->rfd.ssl_fd) {
     TASK_CALL(local_server_shutdown_ssl(&ep->rfd, ep->buf, 1024,
                                         &ep->ssl_shutdown_ret));
     if (ep->ssl_shutdown_ret != 1) {
@@ -1171,19 +1347,33 @@
 
   while (!xcom_shutdown) {
     /* Wait for signal that there is work to consume from the queue. */
-    TASK_CALL(task_read(&ep->rfd, ep->buf, 1024, &ep->nr_read));
-    if (ep->nr_read == 0) {
-      /* purecov: begin inspected */
-      G_WARNING("local_server: client closed the signalling connection?");
-      break;
-      /* purecov: end */
-    } else if (ep->nr_read < 0) {
-      /* purecov: begin inspected */
-      IFDBG(D_NONE, FN; NDBG64(ep->nr_read));
-      G_WARNING("local_server: error reading from the signalling connection?");
-      break;
-      /* purecov: end */
+    if (!ep->signaling_connection_error) {
+      TASK_CALL(
+          task_read(&ep->rfd, ep->buf, 1024, &ep->nr_read, ep->signal_read));
+      if (ep->nr_read == 0) {
+        /* purecov: begin inspected */
+        G_WARNING("local_server: client closed the signalling connection?");
+        ep->signaling_connection_error = true;
+        /* purecov: end */
+      } else if (ep->nr_read < 0) {
+        /* purecov: begin inspected */
+        IFDBG(D_NONE, FN; NDBG64(ep->nr_read));
+        G_WARNING(
+            "local_server: error reading from the signalling connection?");
+        ep->signaling_connection_error = true;
+        /* purecov: end */
+      }
     }
+
+    /**
+     * If an error occurs or if the client connection for the local server is
+     * forcefully shutdown, we continue processing the queue until the end
+     * resorting to time-based waits.
+     */
+    if (ep->signaling_connection_error) {
+      TASK_DELAY(0.1);
+    }
+
     /* Pop, dispatch, and reply. */
     ep->request = xcom_try_pop_from_input_cb();
     while (ep->request != NULL) {
@@ -1194,6 +1384,7 @@
                                 pax_msg_new_0(null_synode));
       assert(ep->request_pax_msg->refcnt == 1);
       ep->request_pax_msg->op = client_msg;
+
       /* Take ownership of the request's app_data, otherwise the app_data is
          freed with ep->request. */
       ep->request_pax_msg->a = xcom_input_request_extract_app_data(ep->request);
@@ -1227,7 +1418,15 @@
   IFDBG(D_BUG, FN; STRLIT(" shutdown "); NDBG(ep->rfd.fd, d);
         NDBG(task_now(), f));
   /* Close the signalling connection. */
-  shutdown_connection(&ep->rfd);
+  if (!ep->signaling_connection_error) {
+    if (input_signal_connection_pipe != nullptr) {
+      close(ep->rfd.fd);
+      remove_and_wakeup(ep->rfd.fd);
+    } else {
+      shutdown_connection(&ep->rfd);
+    }
+  }
+
   unchecked_replace_pax_msg(&ep->request_pax_msg, NULL);
   IFDBG(D_NONE, FN; NDBG(xcom_shutdown, d));
   TASK_END;
@@ -1237,6 +1436,9 @@
   return xcom_try_pop_from_input_cb != NULL;
 }
 
+static void init_time_queue();
+static int paxos_timer_task(task_arg arg MY_ATTRIBUTE((unused)));
+
 int xcom_taskmain2(xcom_port listen_port) {
   init_xcom_transport(listen_port);
 
@@ -1244,15 +1446,19 @@
   ignoresig(SIGPIPE);
 
   {
-    /* Setup tcp_server socket */
     result tcp_fd = {0, 0};
 
-    if ((tcp_fd = announce_tcp(listen_port)).val < 0) {
+    /*
+    Setup networking
+    */
+    auto &net_manager = Network_provider_manager::getInstance();
+    bool error_starting_network_provider =
+        net_manager.start_active_network_provider();
+    if (error_starting_network_provider) {
       /* purecov: begin inspected */
-      IFDBG(D_BUG, FN; STRLIT("cannot annonunce tcp "); NDBG(listen_port, d));
-      task_dump_err(tcp_fd.funerr);
-      g_critical("Unable to announce tcp port %d. Port already in use?",
-                 listen_port);
+      g_critical("Unable to start %s Network Provider",
+                 Communication_stack_to_string::to_string(
+                     net_manager.get_running_protocol()));
       if (xcom_comms_cb) {
         xcom_comms_cb(XCOM_COMMS_ERROR);
       }
@@ -1263,41 +1469,99 @@
       /* purecov: end */
     }
 
+// We will use POSIX pipes for local queue signaling if we are not using WIN32
+#if !defined(_WIN32)
+    if (local_server_is_setup()) {
+      /* Launch local_server task to handle this connection. */
+      {
+        if (pipe(pipe_signal_connections) == -1) {
+          /* purecov: begin inspected */
+          g_critical("Unable to start local signaling mechanism");
+          if (xcom_comms_cb) {
+            xcom_comms_cb(XCOM_COMMS_ERROR);
+          }
+          if (xcom_terminate_cb) {
+            xcom_terminate_cb(0);
+          }
+          goto cleanup;
+          /* purecov: end */
+        }
+        unblock_fd(pipe_signal_connections[0]);
+
+        /*
+         Create the read side of input_signal_connection_pipe and create the
+         local_server.
+
+         If one would to use regular sockets, this code is not executed and
+         the local_server is created in the dispatch_op function.
+        */
+        input_signal_connection_pipe =
+            (connection_descriptor *)malloc(sizeof(connection_descriptor));
+        input_signal_connection_pipe->fd = pipe_signal_connections[0];
+#ifndef XCOM_WITHOUT_OPENSSL
+        input_signal_connection_pipe->ssl_fd = nullptr;
+#endif
+        set_connected(input_signal_connection_pipe, CON_FD);
+        task_new(local_server, void_arg(input_signal_connection_pipe),
+                 "local_server", XCOM_THREAD_DEBUG);
+      }
+    }
+#endif
+
     if (xcom_comms_cb) {
       xcom_comms_cb(XCOM_COMMS_OK);
     }
 
     IFDBG(D_NONE, FN; STRLIT("Creating tasks"));
-    /* task_new(generator_task, null_arg, "generator_task", XCOM_THREAD_DEBUG);
-     */
-    task_new(tcp_server, int_arg(tcp_fd.val), "tcp_server", XCOM_THREAD_DEBUG);
+
+    task_new(incoming_connection_task, int_arg(tcp_fd.val), "tcp_server",
+             XCOM_THREAD_DEBUG);
     task_new(tcp_reaper_task, null_arg, "tcp_reaper_task", XCOM_THREAD_DEBUG);
+#if defined(_WIN32)
+    task_new(tcp_reconnection_task, null_arg, "tcp_reconnection_task",
+             XCOM_THREAD_DEBUG);
+#endif
+
+    init_time_queue();
+    task_new(paxos_timer_task, null_arg, "paxos_timer_task", XCOM_THREAD_DEBUG);
     IFDBG(D_BUG, FN; STRLIT("XCOM is listening on "); NPUT(listen_port, d));
   }
 
+#ifdef XCOM_STANDALONE
   if (recovery_init_cb) recovery_init_cb();
 
   if (recovery_begin_cb) recovery_begin_cb();
+#endif
 
   task_loop();
-
 cleanup:
 
 #ifdef TASK_EVENT_TRACE
   dump_task_events();
 #endif
-#ifndef XCOM_WITHOUT_OPENSSL
-  xcom_cleanup_ssl();
-#endif
+  // STOP NETWORK PROVIDERS
+  Network_provider_manager::getInstance().stop_all_network_providers();
 
   xcom_thread_deinit();
-  if (xcom_exit_cb) {
-    xcom_exit_cb(0);
-  }
+
   IFDBG(D_BUG, FN; STRLIT(" exit "); NDBG(xcom_dbg_stack_top, d);
         NDBG((unsigned)xcom_debug_mask, x));
   xcom_debug_mask = 0;
   xcom_dbg_stack_top = 0;
+  if (input_signal_connection_pipe != nullptr) {
+    ::xcom_input_free_signal_connection();
+
+    free(input_signal_connection_pipe);
+    input_signal_connection_pipe = nullptr;
+
+    pipe_signal_connections[0] = -1;
+    pipe_signal_connections[1] = -1;
+  }
+
+  if (xcom_exit_cb) {
+    xcom_exit_cb(0);
+  }
+
   return 1;
 }
 
@@ -1341,18 +1605,22 @@
 }
 
 static void brand_app_data(pax_msg *p) {
-  if (p->a) {
-    p->a->app_key.msgno = p->synode.msgno;
-    p->a->app_key.node = p->synode.node;
-    p->a->app_key.group_id = p->a->group_id = p->synode.group_id;
+  app_data_ptr a = p->a;
+  while (a) {
+    a->app_key = p->synode;
+    a->group_id = p->synode.group_id;
+    IFDBG(D_NONE, FN; PTREXP(a); SYCEXP(p->synode); SYCEXP(a->app_key));
+    a = a->next;
   }
 }
 
 static synode_no my_unique_id(synode_no synode) {
   assert(my_id != 0);
+  site_def const *site = find_site_def(synode);
   /* Random number derived from node number and timestamp which uniquely defines
    * this instance */
   synode.group_id = my_id;
+  synode.node = get_nodeno(site);
   return synode;
 }
 
@@ -1389,7 +1657,6 @@
 static void init_learn_msg(pax_msg *p) {
   set_learn_type(p);
   p->reply_to = p->proposal;
-  brand_app_data(p);
 }
 
 static int send_learn_msg(site_def const *site, pax_msg *p) {
@@ -1405,7 +1672,6 @@
   tiny_learn_msg->msg_type = p->a ? normal : no_op;
   tiny_learn_msg->op = tiny_learn_op;
   tiny_learn_msg->reply_to = pm->proposer.bal;
-  brand_app_data(tiny_learn_msg);
 
   return tiny_learn_msg;
 }
@@ -1516,7 +1782,7 @@
   if (a && a->group_id == null_id) {
     /* purecov: begin deadcode */
     a->group_id = a->app_key.group_id; /* app_key may have valid group */
-    /* purecov: end */
+                                       /* purecov: end */
   }
   G_DEBUG("pid %d getstart group_id %x", xpid(), a->group_id);
   if (!a || a->group_id == null_id) {
@@ -1533,6 +1799,7 @@
   return retval;
 }
 
+#ifdef PERMISSIVE_EH_ACTIVE_CONFIG
 /* purecov: begin deadcode */
 synode_no get_default_start(app_data_ptr a) {
   synode_no retval = null_synode;
@@ -1541,7 +1808,7 @@
   if (a && a->group_id == null_id) {
     a->group_id = a->app_key.group_id; /* app_key may have valid group */
   }
-  G_DEBUG("pid %d getstart group_id %x", xpid(), a->group_id);
+  G_DEBUG("pid %d getstart group_id %x", xpid(), a ? a->group_id : 0);
   if (!a || a->group_id == null_id) {
     retval.group_id = new_id();
   } else {
@@ -1555,11 +1822,14 @@
   return retval;
 }
 /* purecov: end */
+#endif
 
+#if TASK_DBUG_ON
 /* purecov: begin deadcode */
 static void dump_xcom_node_names(site_def const *site) {
   u_int i;
-  char buf[NSERVERS * 256]; /* Big enough */
+  constexpr const size_t bufsize = NSERVERS * 256;
+  char buf[bufsize]; /* Big enough */
   char *p = buf;
   if (!site) {
     G_INFO("pid %d no site", xpid());
@@ -1567,12 +1837,14 @@
   }
   *p = 0;
   for (i = 0; i < site->nodes.node_list_len; i++) {
-    p = strcat(p, site->nodes.node_list_val[i].address);
-    p = strcat(p, " ");
+    p = strncat(p, site->nodes.node_list_val[i].address, bufsize - 1);
+    p = strncat(p, " ", bufsize - 1);
   }
+  buf[bufsize - 1] = 0;
   G_INFO("pid %d node names %s", xpid(), buf);
 }
 /* purecov: end */
+#endif
 
 void site_install_action(site_def *site, cargo_type operation) {
   IFDBG(D_NONE, FN; NDBG(get_nodeno(get_site_def()), u));
@@ -1583,7 +1855,8 @@
   site->nodeno = xcom_find_node_index(&site->nodes);
   push_site_def(site);
   IFDBG(D_NONE, dump_xcom_node_names(site));
-  IFDBG(D_BUG, FN; SYCEXP(site->start); SYCEXP(site->boot_key));
+  IFDBG(D_BUG, FN; SYCEXP(site->start); SYCEXP(site->boot_key);
+        NUMEXP(site->max_active_leaders));
   IFDBG(D_BUG, FN; COPY_AND_FREE_GOUT(dbg_site_def(site)));
   set_group(get_group_id(site));
   if (get_maxnodes(get_site_def())) {
@@ -1608,6 +1881,38 @@
   );
 }
 
+static void active_leaders(site_def *site, leader_array *leaders) {
+  u_int i;
+  u_int n;
+  /* Synthesize leaders by copying all node names of active leaders */
+  for (i = 0, n = 0; i < site->nodes.node_list_len; i++) {
+    if (is_active_leader(i, site)) n++;
+  }
+  leaders->leader_array_len = n;
+  if (n) {
+    leaders->leader_array_val = static_cast<leader *>(
+        xcom_calloc((size_t)leaders->leader_array_len, sizeof(leader)));
+    for (i = 0, n = 0; i < site->nodes.node_list_len; i++) {
+      if (is_active_leader(i, site)) {
+        leaders->leader_array_val[n++].address =
+            strdup(site->nodes.node_list_val[i].address);
+      }
+    }
+  } else {
+    leaders->leader_array_val = nullptr;
+  }
+}
+
+extern "C" void synthesize_leaders(leader_array *leaders) {
+  // Default value meaning 'not set by client '
+  leaders->leader_array_len = 0;
+  leaders->leader_array_val = nullptr;
+}
+
+static bool leaders_set_by_client(site_def const *site) {
+  return site->leaders.leader_array_len != 0;
+}
+
 static site_def *create_site_def_with_start(app_data_ptr a, synode_no start) {
   site_def *site = new_site_def();
   IFDBG(D_NONE, FN; COPY_AND_FREE_GOUT(dbg_list(&a->body.app_u_u.nodes)););
@@ -1615,12 +1920,37 @@
                 a->body.app_u_u.nodes.node_list_val, site);
   site->start = start;
   site->boot_key = a->app_key;
+
+// If SINGLE_WRITER_ONLY is defined, ALL configs will be single writer. Used for
+// running all tests in single writer mode
+#ifdef SINGLE_WRITER_ONLY
+  site->max_active_leaders = 1; /*Single writer */
+#else
+  site->max_active_leaders = active_leaders_all; /* Set to all nodes*/
+#endif
+
   return site;
 }
 
+static xcom_proto constexpr single_writer_support = x_1_9;
+
 static site_def *install_ng_with_start(app_data_ptr a, synode_no start) {
   if (a) {
     site_def *site = create_site_def_with_start(a, start);
+    site_def const *old_site = get_site_def();
+
+    // The reason why we need to recompute node sets and time stamps, is that
+    // node sets and time stamps are stored in the site_def indexed by node
+    // number, but they really are related to a specific node, not a specific
+    // node number. When the site_def changes, the node number of a node may
+    // change, thus invalidating the mapping from node numbers to node sets and
+    // timestamps. But given the old and new definition, it is possible to
+    // remap.
+    if (old_site && old_site->x_proto >= single_writer_support) {
+      recompute_node_sets(old_site, site);
+      recompute_timestamps(old_site->detected, &old_site->nodes, site->detected,
+                           &site->nodes);
+    }
     site_install_action(site, a->body.c_t);
     return site;
   }
@@ -1638,7 +1968,7 @@
 
 void set_max_synode(synode_no synode) {
   max_synode = synode; /* Track max synode number */
-  IFDBG(D_NONE, FN; STRLIT("new "); SYCEXP(max_synode));
+  IFDBG(D_BASE, FN; STRLIT("new "); SYCEXP(max_synode));
   activate_sweeper();
 }
 
@@ -1687,6 +2017,7 @@
   return lsn;
 }
 
+#if TASK_DBUG_ON
 /* purecov: begin deadcode */
 static int check_lsn(app_data_ptr a) {
   while (a) {
@@ -1696,6 +2027,7 @@
   return 1;
 }
 /* purecov: end */
+#endif
 
 static void propose_noop(synode_no find, pax_machine *p);
 
@@ -1808,13 +2140,190 @@
 static inline int is_config(cargo_type x) {
   return x == unified_boot_type || x == add_node_type ||
          x == remove_node_type || x == set_event_horizon_type ||
-         x == force_config_type;
+         x == force_config_type || x == set_max_leaders ||
+         x == set_leaders_type;
 }
 
 static int wait_for_cache(pax_machine **pm, synode_no synode, double timeout);
 static int prop_started = 0;
 static int prop_finished = 0;
 
+/* Find a free slot locally.
+   Note that we will happily increment past the event horizon.
+   The caller is thus responsible for checking the validity of the
+   returned value by calling too_far() and ignore_message(). */
+static synode_no local_synode_allocator(synode_no synode) {
+  assert(!synode_eq(synode, null_synode));
+
+  // Ensure node number of synode is ours, whilst also ensuring that the synode
+  // is monotonically increasing
+  node_no const my_nodeno = get_nodeno(find_site_def(synode));
+  if (my_nodeno >= synode.node) {
+    synode.node = my_nodeno;
+  } else {
+    synode = incr_msgno(synode);
+  }
+
+  while (is_busy(synode)) {
+    synode = incr_msgno(synode);
+  }
+  assert(!synode_eq(synode, null_synode));
+  return synode;
+}
+
+/* Find a likely free slot globally.
+   Note that we will happily increment past the event horizon.
+   The caller is thus responsible for checking the validity of the
+   returned value by calling too_far() and ignore_message().
+   The test for ignore_message() here is only valid until the
+   event horizon. */
+static synode_no global_synode_allocator(site_def *site, synode_no synode) {
+  assert(!synode_eq(synode, null_synode));
+
+  while (ignore_message(synode, site, "global_synode_allocator")) {
+    synode = incr_synode(synode);
+  }
+  assert(!synode_eq(synode, null_synode));
+  return synode;
+}
+
+/* Find a free slot on remote leader */
+static node_no remote_synode_allocator(site_def *site, app_data const &a) {
+  static node_no distributor = 0;  // Distribute requests equally among leaders
+  node_no maxnodes = get_maxnodes(site);
+  distributor = distributor % maxnodes;  // Rescale in case site has changed
+  node_no i = distributor;
+  // Ensure that current_message is associated with site
+  if (synode_lt(current_message, site->start)) {
+    current_message = site->start;
+  }
+  for (;;) {
+    if (is_active_leader(i, site) &&
+        !may_be_dead(site->detected, i,
+                     task_now())) {  // Found leader, send request
+      pax_msg *p =
+          pax_msg_new(current_message, site);  // Message number does not matter
+      IFDBG(D_CONS, FN; STRLIT("sending request "); NUMEXP(i);
+            SYCEXP(current_message));
+      p->op = synode_request;
+      send_server_msg(site, i, p);
+      distributor = (i + 1) % maxnodes;
+      return i;
+    }
+    i = (i + 1) % maxnodes;
+    if (i == distributor) {
+      /* There are no leaders, see if we should become leader. Note the special
+         case for `force_config_type`. If we are in a network partition
+         situation that must be healed using `force_config_type`, the leader
+         might not be available and we might not be `iamthegreatest`. If we are
+         the one tasked with `force_config_type` the entire system is relying on
+         us to get consensus on `force_config_type` to unblock the group.
+         Therefore, we self-allocate a synod for `force_config_type` to ensure
+         the system makes progress. */
+      if (iamthegreatest(site) || a.body.c_t == force_config_type) {
+        // Grab message number and answer to self
+        synode_no synode = global_synode_allocator(site, current_message);
+        if (!too_far(synode)) {
+          // We will grab this number, advance current_message
+          set_current_message(incr_synode(synode));
+          IFDBG(D_CONS, FN; STRLIT("grab message "); SYCEXP(synode);
+                SYCEXP(current_message));
+          synode_number_pool.put(synode, synode_allocation_type::global);
+        }
+      }
+      return get_nodeno(site);
+    }
+  }
+}
+
+#ifdef DELIVERY_TIMEOUT
+static bool check_delivery_timeout(site_def *site, double start_propose,
+                                   app_data *a) {
+  bool retval =
+      (start_propose + a->expiry_time) < task_now() && !enough_live_nodes(site);
+  if (retval) {
+    DBGOUT_ASSERT(check_lsn(a), STRLIT("NULL lsn"));
+    IFDBG(D_NONE, FN; STRLIT("timeout -> delivery_failure"));
+    deliver_to_app(NULL, a, delivery_failure);
+  }
+  return retval;
+}
+#endif
+
+static int reserve_synode_number(synode_allocation_type *synode_allocation,
+                                 site_def **site, synode_no *msgno,
+                                 int *remote_retry, app_data *a,
+                                 synode_reservation_status *ret) {
+  *ret = synode_reservation_status::number_ok;  // Optimistic, will be reset if
+                                                // necessary
+  DECL_ENV
+  int dummy;
+  END_ENV;
+
+  TASK_BEGIN
+  do {
+    *synode_allocation = synode_allocation_type::todo;
+    IFDBG(D_CONS, FN; SYCEXP(current_message));
+    *site = find_site_def_rw(current_message);
+    if (is_leader(*site)) {  // Use local synode allocator
+      *msgno = local_synode_allocator(current_message);
+      IFDBG(D_CONS, FN; SYCEXP(outer_ep->msgno));
+      *synode_allocation = synode_allocation_type::local;
+    } else {  // Cannot use local, try remote
+              // Get synode number from another leader
+      *remote_retry = 0;
+      while (synode_number_pool.empty()) {
+        // get_maxnodes(get_site_def()) > 0 is a precondition for
+        // `remote_synode_allocator`.
+        if (get_maxnodes(get_site_def()) == 0) {
+          TASK_DELAY(0.1);
+          TASK_RETURN(synode_reservation_status::no_nodes);
+        }
+#if TASK_DBUG_ON
+        node_no allocator_node =
+#endif
+            remote_synode_allocator(get_site_def_rw(),
+                                    *a);  // Send request for synode, use
+                                          // latest config
+        if (*remote_retry > 10) {
+          IFDBG(D_BUG, FN; NUMEXP(outer_ep->self); NUMEXP(allocator_node);
+                SYCEXP(executed_msg); SYCEXP(current_message);
+                SYCEXP(outer_ep->msgno); SYCEXP(get_site_def_rw()->start));
+        }
+        if (synode_number_pool.empty()) {  // Only wait if still empty
+          TIMED_TASK_WAIT(&synode_number_pool.queue,
+                          0.1);  // Wait for incoming synode
+        }
+        (*remote_retry)++;
+      }
+      std::tie(*msgno, *synode_allocation) = synode_number_pool.get();
+      IFDBG(D_CONS, FN; SYCEXP(outer_ep->msgno));
+    }
+
+    // Update site to match synode
+    *site = proposer_site = find_site_def_rw(*msgno);
+
+    // Set the global current message for all number allocators
+    set_current_message(incr_synode(*msgno));
+
+    while (too_far(*msgno)) { /* Too far ahead of executor */
+      TIMED_TASK_WAIT(&exec_wait, 0.2);
+      IFDBG(D_NONE, FN; SYCEXP(ep->msgno); TIMECEXP(ep->start_propose);
+            TIMECEXP(outer_ep->client_msg->p->a->expiry_time);
+            TIMECEXP(task_now()); NDBG(enough_live_nodes(outer_ep->site), d));
+#ifdef DELIVERY_TIMEOUT
+      if (check_delivery_timeout(outer_ep->site, outer_ep->start_propose,
+                                 outer_ep->client_msg->p->a)) {
+        TASK_RETURN(delivery_timeout);
+      }
+#endif
+    }
+    // Filter out busy or ignored message numbers
+  } while (is_busy(*msgno) || ignore_message(*msgno, *site, "proposer_task"));
+  FINALLY
+  TASK_END;
+}
+
 /* Send messages by fetching from the input queue and trying to get it accepted
    by a Paxos instance */
 static int proposer_task(task_arg arg) {
@@ -1827,11 +2336,16 @@
   double start_propose;
   double start_push;
   double delay;
-  site_def const *site;
+  site_def *site;
   size_t size;
   size_t nr_batched_app_data;
+  int remote_retry;
+  synode_allocation_type synode_allocation;
   END_ENV;
 
+  synode_reservation_status reservation_status{
+      synode_reservation_status::number_ok};
+
   TASK_BEGIN
 
   ep->self = get_int_arg(arg);
@@ -1845,7 +2359,9 @@
   ep->site = 0;
   ep->size = 0;
   ep->nr_batched_app_data = 0;
-
+  ep->remote_retry = 0;
+  ep->synode_allocation = synode_allocation_type::todo;
+  add_proposer_synode(ep->self, &ep->msgno);
   IFDBG(D_NONE, FN; NDBG(ep->self, d); NDBG(task_now(), f));
 
   while (!xcom_shutdown) { /* Loop until no more work to do */
@@ -1921,37 +2437,18 @@
     DBGOUT_ASSERT(check_lsn(ep->client_msg->p->a), STRLIT("NULL lsn"));
   retry_new:
     /* Find a free slot */
-
-    assert(!synode_eq(current_message, null_synode));
-    ep->msgno = current_message;
-    proposer_site = find_site_def_rw(ep->msgno);
-    ep->site = proposer_site;
-
-    while (is_busy(ep->msgno)) {
-      while (/* ! ep->client_msg->p->force_delivery &&  */ too_far(
-          incr_msgno(ep->msgno))) { /* Too far ahead of executor */
-        TIMED_TASK_WAIT(&exec_wait, 1.0);
-        IFDBG(D_NONE, FN; SYCEXP(ep->msgno); TIMECEXP(ep->start_propose);
-              TIMECEXP(ep->client_msg->p->a->expiry_time); TIMECEXP(task_now());
-
-              NDBG(enough_live_nodes(ep->site), d));
-#ifdef DELIVERY_TIMEOUT
-        if ((ep->start_propose + ep->client_msg->p->a->expiry_time) <
-                task_now() &&
-            !enough_live_nodes(ep->site)) {
-          /* Give up */
-          DBGOUT_ASSERT(check_lsn(ep->client_msg->p->a), STRLIT("NULL lsn"));
-          IFDBG(D_NONE, FN; STRLIT("timeout -> delivery_failure"));
-          deliver_to_app(NULL, ep->client_msg->p->a, delivery_failure);
-          GOTO(next);
-        }
-#endif
-      }
-      ep->msgno = incr_msgno(ep->msgno);
-      /* Refresh site to next msgno */
-      proposer_site = find_site_def_rw(ep->msgno);
-      ep->site = proposer_site;
+    TASK_CALL(reserve_synode_number(&ep->synode_allocation, &ep->site,
+                                    &ep->msgno, &ep->remote_retry,
+                                    ep->client_msg->p->a, &reservation_status));
+
+    // Check result of reservation
+    if (reservation_status == synode_reservation_status::no_nodes) {
+      GOTO(retry_new);
+    } else if (reservation_status ==
+               synode_reservation_status::delivery_timeout) {
+      GOTO(next);
     }
+    // If we get here, we have a valid synode number
     assert(!synode_eq(ep->msgno, null_synode));
 
     /* See if we can do anything with this message */
@@ -1963,9 +2460,6 @@
       deliver_to_app(NULL, ep->client_msg->p->a, delivery_failure);
       GOTO(next);
     }
-    IFDBG(D_NONE, FN; STRLIT("changing current message to ");
-          SYCEXP(ep->msgno));
-    set_current_message(ep->msgno);
 
     brand_client_msg(ep->client_msg->p, ep->msgno);
 
@@ -1983,7 +2477,7 @@
       if (ep->client_msg->p->force_delivery)
         ep->p->force_delivery = ep->client_msg->p->force_delivery;
       {
-        int MY_ATTRIBUTE((unused)) lock = lock_pax_machine(ep->p);
+        [[maybe_unused]] int lock = lock_pax_machine(ep->p);
         assert(!lock);
       }
 
@@ -2011,8 +2505,15 @@
       /* Use 3 phase algorithm if threephase is set or we are forcing or we have
          already accepted something, which may happen if another node has timed
          out waiting for this node and proposed a no_op, which we have accepted.
+
+         We *must* use 3 phase algorithm if the synode was allocated by
+         ourselves using `global_synode_allocator`. This is last resort synode
+         allocation that does not guarantee we will be the only Proposer using
+         it. Therefore, for correctness we must use regular 3 phase Paxos,
+         because we may have dueling Proposers.
        */
-      if (threephase || ep->p->force_delivery || ep->p->acceptor.promise.cnt) {
+      if (threephase || ep->p->force_delivery || ep->p->acceptor.promise.cnt ||
+          ep->synode_allocation == synode_allocation_type::global) {
         push_msg_3p(ep->site, ep->p, ep->prepare_msg, ep->msgno, normal);
       } else {
         push_msg_2p(ep->site, ep->p);
@@ -2109,13 +2610,14 @@
   }
   replace_pax_msg(&ep->prepare_msg, NULL);
   if (ep->client_msg) { /* If we get here with a client message, we have
-                           failed to deliver */
+                                             failed to deliver */
     DBGOUT_ASSERT(check_lsn(ep->client_msg->p->a), STRLIT("NULL lsn"));
     IFDBG(D_NONE, FN;
           STRLIT("undelivered message at task end -> delivery_failure"));
     deliver_to_app(ep->p, ep->client_msg->p->a, delivery_failure);
     msg_link_delete(&ep->client_msg);
   }
+  remove_proposer_synode(ep->self);
   TASK_END;
 }
 
@@ -2128,15 +2630,45 @@
          first_protocol_that_ignores_intermediate_forced_configs_or_views;
 }
 
-static node_no leader(site_def const *s) {
-  node_no leader = 0;
-  for (leader = 0; leader < get_maxnodes(s); leader++) {
-    if (!may_be_dead(s->detected, leader, task_now())) return leader;
+static node_no get_leader(site_def const *s) {
+  if (s) {
+    node_no leader = 0;
+    for (leader = 0; leader < get_maxnodes(s); leader++) {
+      if (!may_be_dead(s->detected, leader, task_now())) return leader;
+    }
   }
   return 0;
 }
 
-int iamthegreatest(site_def const *s) { return leader(s) == s->nodeno; }
+int iamthegreatest(site_def const *s) {
+  if (!s)
+    return 0;
+  else
+    return get_leader(s) == s->nodeno;
+}
+
+// Update site based on incoming global node set
+static site_def *update_site(site_def *site, node_set const *ns,
+                             synode_no boot_key, synode_no start) {
+  // If it has not changed, no action is necessary.
+  // If it has changed, we need to create and install
+  // a new site def, since the changed node set will influence which
+  // messages will be ignored.
+  // This change needs to be effective after the current pipeline
+  // of messages has been emptied, just as if we had
+  // changed the config (site_def) itself.
+
+  if (!equal_node_set(ns, &site->global_node_set)) {
+    site_def *new_config = clone_site_def(get_site_def());
+    assert(new_config);
+    new_config->start = start;
+    new_config->boot_key = boot_key;
+    // Update node set of site
+    copy_node_set(ns, &new_config->global_node_set);
+    return new_config;
+  }
+  return NULL;
+}
 
 void execute_msg(site_def *site, pax_machine *pma, pax_msg *p) {
   app_data_ptr a = p->a;
@@ -2155,7 +2687,11 @@
         /* DBGOUT_ASSERT(check_lsn(a), STRLIT("NULL lsn")); */
         deliver_to_app(pma, a, delivery_ok);
         break;
-      case view_msg:
+      case view_msg: {
+        /* Deliver view like we used to when every member was always a leader.
+         * This ensures deterministic behaviour in groups with some members
+         * running previous XCom instances.
+         */
         IFDBG(D_EXEC, FN; STRLIT(" global view ");
               COPY_AND_FREE_GOUT(dbg_pax_msg(pma->learner.msg)););
         if (site && site->global_node_set.node_set_len ==
@@ -2168,15 +2704,65 @@
           } else {
             assert(site->global_node_set.node_set_len ==
                    a->body.app_u_u.present.node_set_len);
-            copy_node_set(&a->body.app_u_u.present, &site->global_node_set);
-            deliver_global_view_msg(site, p->synode);
+            // Can only mutate site->global_node_set if everyone is a leader and
+            // has its own channel.
+            if (site->max_active_leaders == active_leaders_all) {
+              copy_node_set(&a->body.app_u_u.present, &site->global_node_set);
+            }
+            deliver_global_view_msg(site, a->body.app_u_u.present, p->synode);
             ADD_DBG(D_BASE,
                     add_event(EVENT_DUMP_PAD,
                               string_arg("deliver_global_view_msg p->synode"));
                     add_synode_event(p->synode););
           }
         }
-        break;
+
+        /* If this view_msg is:
+         *
+         * (1) about the latest site, and
+         * (2) only some member(s) is (are) leader(s) in the latest site,
+         *
+         * create a new site to deterministically ignore the channel of leaders
+         * that may be dead. */
+        site_def *latest_site = get_site_def_rw();
+        IFDBG(
+            D_EXEC, FN; PTREXP(latest_site); if (latest_site) {
+              NUMEXP(latest_site->nodes.node_list_len);
+              NUMEXP(latest_site->global_node_set.node_set_len);
+              NUMEXP(a->body.app_u_u.present.node_set_len);
+              SYCEXP(a->app_key);
+              SYCEXP(latest_site->start);
+            });
+        /*
+         * You'll want to install the new site if xcom is operating as
+         * single-leader and there were no changes in the configuration. The
+         * reason for this is so that you have the latest information about
+         * who is the preferred and actual leader.
+         */
+        bool const is_latest_view = synode_gt(a->app_key, latest_site->start);
+        bool const everyone_leader_in_latest_site =
+            (latest_site->max_active_leaders == active_leaders_all);
+        bool const view_node_set_matches_latest_site =
+            (latest_site->global_node_set.node_set_len ==
+             a->body.app_u_u.present.node_set_len);
+        const bool can_install_site = is_latest_view &&
+                                      !everyone_leader_in_latest_site &&
+                                      view_node_set_matches_latest_site;
+
+        if (can_install_site) {
+          a->app_key = p->synode;  // Patch app_key to avoid fixing getstart()
+          site_def *new_config = update_site(
+              latest_site, &a->body.app_u_u.present, a->app_key, getstart(a));
+          if (new_config) {
+            IFDBG(D_EXEC, FN; PTREXP(new_config);
+                  NUMEXP(new_config->nodes.node_list_len);
+                  NUMEXP(new_config->global_node_set.node_set_len);
+                  SYCEXP(a->app_key); SYCEXP(new_config->start););
+            site_install_action(new_config, a->body.c_t);
+            analyze_leaders(new_config);
+          }
+        }
+      } break;
       default:
         break;
     }
@@ -2191,9 +2777,9 @@
 /* With many nodes sending read_ops on instances that are not decided yet, it
  * may take a very long time until someone finally decides to start a new
  * consensus round. As the cost of a new proposal is not that great, it's
- * acceptable to go directly to proposing a no-op instead of first trying to get
- * the value with a read_op. An added benefit of this is that if more than one
- * node needs the result, they will get it all when the consensus round
+ * acceptable to go directly to proposing a no-op instead of first trying to
+ * get the value with a read_op. An added benefit of this is that if more than
+ * one node needs the result, they will get it all when the consensus round
  * finishes. */
 static void find_value(site_def const *site, unsigned int *wait, int n) {
   IFDBG(D_NONE, FN; NDBG(*wait, d));
@@ -2336,7 +2922,7 @@
   if (group_mismatch(msgno, current_message) ||
       synode_gt(msgno, current_message)) {
     IFDBG(D_EXEC, FN; STRLIT("changing current message"));
-    set_current_message(first_free_synode(msgno));
+    set_current_message(first_free_synode_local(msgno));
   }
 
   if (msgno.msgno > executed_msg.msgno) task_wakeup(&exec_wait);
@@ -2346,7 +2932,7 @@
   return executed_msg;
 }
 
-static synode_no first_free_synode(synode_no msgno) {
+static synode_no first_free_synode_local(synode_no msgno) {
   site_def const *site = find_site_def(msgno);
   synode_no retval = msgno;
   if (!site) {
@@ -2354,7 +2940,6 @@
     site = get_site_def();
     IFDBG(D_NONE, FN; PTREXP(site); SYCEXP(msgno));
     assert(get_group_id(site) != 0);
-    return site->start;
     /* purecov: end */
   }
   if (get_group_id(site) == 0) {
@@ -2383,8 +2968,7 @@
 static void update_max_synode(pax_msg *p);
 
 #if TASK_DBUG_ON
-static void perf_dbg(int *_n, int *_old_n, double *_old_t)
-    MY_ATTRIBUTE((unused));
+static void perf_dbg(int *_n, int *_old_n, double *_old_t) [[maybe_unused]];
 static void perf_dbg(int *_n, int *_old_n, double *_old_t) {
   int n = *_n;
   int old_n = *_old_n;
@@ -2418,19 +3002,143 @@
 }
 #endif
 
-#ifdef IGNORE_LOSERS
+/* Does address match any current leader? */
+static inline int match_leader(char const *addr, leader_array const leaders) {
+  u_int i;
+  for (i = 0; i < leaders.leader_array_len; i++) {
+    IFDBG(D_BASE, FN; NUMEXP(i); NUMEXP(leaders.leader_array_len); STREXP(addr);
+          STREXP(leaders.leader_array_val[i].address));
+    if (strcmp(addr, leaders.leader_array_val[i].address) == 0) return 1;
+  }
+  return 0;
+}
 
-static inline int LOSER(synode_no x, site_def const *site) {
-  IFDBG(D_NONE, NEXP(x.node, u);
-        NEXP(site->global_node_set.node_set_val[(x).node], d));
-  return (!(site)->global_node_set.node_set_val[(x).node]);
+static inline bool alive_node(site_def const *site, u_int i) {
+  return is_set(site->global_node_set, i);
 }
 
-#else
-#define LOSER(x, site) 0
+// Find up to site->max_active_leaders leaders.
+// If leaders are set by the client, and none of those are alive, revert
+// to using the set of addresses in the config.
+
+void analyze_leaders(site_def *site) {
+  assert(site);
+  // No analysis if all nodes are leaders
+  if (active_leaders_all == site->max_active_leaders) return;
+
+  // Use leaders from config if forced or not set by client
+  bool use_client_leaders = leaders_set_by_client(site);
+  site->cached_leaders = true;
+  site->found_leaders = 0;  // Number of active leaders found
+  // Reset everything
+  for (u_int i = 0; i < get_maxnodes(site); i++) {
+    site->active_leader[i] = 0;
+  }
+  // If candidate leaders set by client, check those first
+  for (u_int i = 0; use_client_leaders && i < get_maxnodes(site); i++) {
+    if (site->found_leaders <
+            site->max_active_leaders &&  // Found enough?
+                                         // Must be alive according to global
+                                         // node set of site
+        alive_node(site, i) &&
+        // Must match a node in the list of leaders
+        match_leader(site->nodes.node_list_val[i].address, site->leaders)) {
+      site->active_leader[i] = 1;
+      site->found_leaders++;
+    }
+  }
+  // Check rest of nodes
+  for (u_int i = 0; i < get_maxnodes(site); i++) {
+    if (!site->active_leader[i] &&                         // Avoid duplicates
+        site->found_leaders < site->max_active_leaders &&  // Found enough?
+        // Must be alive according to global
+        // node set of site
+        alive_node(site, i)) {
+      site->active_leader[i] = 1;
+      site->found_leaders++;
+    }
+  }
+  // We need at least one channel otherwise the group grinds to a halt.
+  if (site->found_leaders == 0) {
+    site->active_leader[0] = 1;
+    site->found_leaders = 1;
+  }
+  free(site->dispatch_table);
+
+  IFDBG(D_BUG, FN; STRLIT("free "); PTREXP(site); PTREXP(site->dispatch_table));
+  // Do not work as synode allocator if not active leader. ???
+  if (get_nodeno(site) != VOID_NODE_NO &&
+      site->active_leader[get_nodeno(site)]) {
+    site->dispatch_table = primary_dispatch_table();
+  } else {
+    site->dispatch_table = secondary_dispatch_table();
+  }
+  IFDBG(D_BUG, FN; STRLIT("allocate "); PTREXP(site);
+        PTREXP(site->dispatch_table));
+
+  for (u_int i = 0; i < get_maxnodes(site); i++) {
+    IFDBG(D_BUG, FN; NUMEXP(i); PTREXP(site); NUMEXP(site->found_leaders);
+          NUMEXP(site->max_active_leaders); NUMEXP(alive_node(site, i));
+          SYCEXP(site->start); STREXP(site->nodes.node_list_val[i].address);
+          if (site->active_leader[i]) STRLIT(" says YES");
+          else STRLIT(" says NO"));
+  }
+}
+
+/* Is node number an active leader? */
+int is_active_leader(node_no x, site_def *site) {
+  /* No site, no active leaders */
+  if (!site) return 0;
+
+  /* Node number out of bound, not an active leader */
+  if (x >= get_maxnodes(site)) return 0;
+
+  /* All are leaders, no need for further tests */
+  if (active_leaders_all == site->max_active_leaders) return 1;
+  /* See if cached values are valid */
+  if (!site->cached_leaders) {
+    analyze_leaders(site);
+  }
+#if 0
+  if (site->active_leader == NULL || x > site->nodes.node_list_len - 1)
+    IFDBG(D_BUG, FN; PTREXP(site->active_leader); NUMEXP(x);
+          NUMEXP(site->nodeno); NUMEXP(site->nodes.node_list_len););
 #endif
+  return site->active_leader[x];
+}
 
-static void debug_loser(synode_no x) MY_ATTRIBUTE((unused));
+node_no found_active_leaders(site_def *site) {
+  /* No site, no active leaders */
+  if (!site) return 0;
+
+  /* All are leaders, no need for further tests */
+  if (active_leaders_all == site->max_active_leaders)
+    return site->nodes.node_list_len;
+
+  /* See if cached values are valid */
+  if (!site->cached_leaders) {
+    analyze_leaders(site);
+  }
+  return site->found_leaders;
+}
+
+/* Check if this message belongs to a channel that should be ignored */
+static inline int ignore_message(synode_no x, site_def *site,
+                                 char const *dbg MY_ATTRIBUTE((unused))) {
+  int retval = !is_active_leader(x.node, site);
+  IFDBG(D_BASE, STRLIT(dbg); STRLIT(" "); FN; SYCEXP(x); NUMEXP(retval));
+  return retval;
+}
+
+/* Check if this node is a leader */
+static inline bool is_leader(site_def *site) {
+  bool retval = site && is_active_leader(site->nodeno, site);
+  IFDBG(D_BASE, FN; PTREXP(site); if (site) NUMEXP(site->nodeno);
+        NUMEXP(retval));
+  return retval;
+}
+
+[[maybe_unused]] static void debug_loser(synode_no x);
 #if defined(TASK_DBUG_ON) && TASK_DBUG_ON
 static void debug_loser(synode_no x) {
   if (!IS_XCOM_DEBUG_WITH(XCOM_DEBUG_TRACE)) return;
@@ -2446,7 +3154,7 @@
 }
 #else
 /* purecov: begin deadcode */
-static void debug_loser(synode_no x MY_ATTRIBUTE((unused))) {}
+static void debug_loser(synode_no x [[maybe_unused]]) {}
 /* purecov: end */
 #endif
 
@@ -2555,18 +3263,34 @@
 }
 
 /**
+ * @brief This will test if we are receiving a boot request that contains
+ *        ourselves. This could happed in case of a misconfiguration of a
+ *        local_address, that causes an add_node request to be erroneous
+ *        delivered.
+ *
+ * @param a app_data with an add node request
+ * @return bool_t TRUE in case of error, meaning that my address is in the
+ *                     add_node list
+ */
+static bool_t add_node_adding_own_address(app_data_ptr a) {
+  assert(a->body.c_t == add_node_type);
+
+  return node_exists(cfg_app_xcom_get_identity(), &a->body.app_u_u.nodes);
+}
+
+/**
  * Check if a node is compatible with the group's event horizon.
  *
  * A node is compatible with the group's configuration if:
  *
  *    a) The node supports event horizon reconfigurations, or
- *    b) The group's event horizon is, or is scheduled to be, the default event
- *       horizon.
+ *    b) The group's event horizon is, or is scheduled to be, the default
+ * event horizon.
  */
-static bool_t unsafe_against_event_horizon(node_address const *node) {
+static bool unsafe_against_event_horizon(node_address const *node) {
   site_def const *latest_config = get_site_def();
   xcom_proto node_max_protocol_version = node->proto.max_proto;
-  bool_t const compatible =
+  bool const compatible =
       reconfigurable_event_horizon(node_max_protocol_version) ||
       backwards_compatible(latest_config->event_horizon);
 
@@ -2578,33 +3302,152 @@
      * The node can not safely join the group so we deny its attempt to join.
      */
     G_INFO(
-        "%s's request to join the group was rejected because the group's event "
+        "%s's request to join the group was rejected because the group's "
+        "event "
         "horizon is, or will be %" PRIu32 " and %s only supports %" PRIu32,
-        node->address, get_site_def()->event_horizon, node->address,
+        node->address, latest_config->event_horizon, node->address,
         EVENT_HORIZON_MIN);
-    return TRUE;
+    return true;
   }
-  return FALSE;
+  return false;
 }
 
-static bool_t add_node_unsafe_against_event_horizon(app_data_ptr a) {
+typedef bool (*unsafe_node_check)(node_address const *node);
+
+static bool check_if_add_node_is_unsafe(app_data_ptr a,
+                                        unsafe_node_check unsafe) {
   assert(a->body.c_t == add_node_type);
   {
     u_int nodes_len = a->body.app_u_u.nodes.node_list_len;
     node_address *nodes_to_add = a->body.app_u_u.nodes.node_list_val;
     u_int i;
     for (i = 0; i < nodes_len; i++) {
-      if (unsafe_against_event_horizon(&nodes_to_add[i])) return TRUE;
+      if (unsafe(&nodes_to_add[i])) return true;
     }
   }
-  return FALSE;
+  return false;
+}
+
+static bool check_if_add_node_is_unsafe_against_event_horizon(app_data_ptr a) {
+  return check_if_add_node_is_unsafe(a, unsafe_against_event_horizon);
+}
+
+// Map values of old node set to new node set by matching on
+// node addresses
+void recompute_node_set(node_set const *old_set, node_list const *old_nodes,
+                        node_set *new_set, node_list const *new_nodes) {
+  // Return value of node set matching node_address na
+  auto value{[&](node_address const *na) {
+    assert(old_set->node_set_len == old_nodes->node_list_len);
+    for (u_int i = 0; i < old_nodes->node_list_len; i++) {
+      if (match_node(&old_nodes->node_list_val[i], na, true)) {
+        return old_set->node_set_val[i];
+      }
+    }
+    return 0;
+  }};
+
+  for (u_int i = 0; i < new_nodes->node_list_len; i++) {
+    new_set->node_set_val[i] = value(&new_nodes->node_list_val[i]);
+  }
+}
+
+// Remap old global and local node set of site to new
+static void recompute_node_sets(site_def const *old_site, site_def *new_site) {
+  recompute_node_set(&old_site->global_node_set, &old_site->nodes,
+                     &new_site->global_node_set, &new_site->nodes);
+  recompute_node_set(&old_site->local_node_set, &old_site->nodes,
+                     &new_site->local_node_set, &new_site->nodes);
+}
+
+static bool incompatible_proto_and_max_leaders(xcom_proto x_proto,
+                                               node_no max_leaders) {
+  return x_proto < single_writer_support && max_leaders != active_leaders_all;
+}
+
+static bool incompatible_proto_and_leaders(xcom_proto x_proto) {
+  return x_proto < single_writer_support;
+}
+
+static bool incompatible_proto_and_max_leaders(node_address const *node) {
+  site_def const *latest_config = get_site_def();
+
+  if (incompatible_proto_and_max_leaders(node->proto.max_proto,
+                                         latest_config->max_active_leaders)) {
+    /*
+     * The node that wants to join does not allow setting of max number of
+     * leaders
+     * and the max number of leaders in the group is not all.
+     * The node can not safely join the group so we deny its attempt to join.
+     */
+    G_INFO(
+        "%s's request to join the group was rejected because the group's max "
+        "number of active leaders is, or will be %" PRIu32
+        " and %s only supports "
+        "all nodes as leaders",
+        node->address, latest_config->max_active_leaders, node->address);
+    return true;
+  }
+  return false;
+}
+
+static bool incompatible_proto_and_leaders(node_address const *node) {
+  site_def const *latest_config = get_site_def();
+
+  if (incompatible_proto_and_leaders(node->proto.max_proto) &&
+      leaders_set_by_client(latest_config)) {
+    /*
+     * The node that wants to join does not allow changing the set of
+     * leaders
+     * and the set of leaders in the group is not empty.
+     * The node can not safely join the group so we deny its attempt to join.
+     */
+    G_INFO(
+        "%s's request to join the group was rejected because the group "
+        "has a non-empty set of leaders specified by the client, "
+        "and %s does not support changing the set of leaders",
+        node->address, node->address);
+    return true;
+  }
+  return false;
+}
+
+bool unsafe_leaders(app_data *a) {
+  return check_if_add_node_is_unsafe(a, incompatible_proto_and_max_leaders) ||
+         check_if_add_node_is_unsafe(a, incompatible_proto_and_leaders);
+}
+
+static void set_start_and_boot(site_def *new_config, app_data_ptr a) {
+  new_config->start = getstart(a);
+  new_config->boot_key = a->app_key;
+}
+
+// Map values of old timestamps to new timestamps by matching on
+// node addresses
+void recompute_timestamps(detector_state const old_timestamp,
+                          node_list const *old_nodes,
+                          detector_state new_timestamp,
+                          node_list const *new_nodes) {
+  // Return value of timestamp matching node_address na
+  auto value{[&](node_address const *na) {
+    for (u_int i = 0; i < old_nodes->node_list_len; i++) {
+      if (match_node(&old_nodes->node_list_val[i], na, true)) {
+        return old_timestamp[i];
+      }
+    }
+    return 0.0;
+  }};
+
+  for (u_int i = 0; i < new_nodes->node_list_len; i++) {
+    new_timestamp[i] = value(&new_nodes->node_list_val[i]);
+  }
 }
 
 /**
  * Reconfigure the group membership: add new member(s).
  *
- * It is possible that concurrent reconfigurations take effect between the time
- * this reconfiguration was proposed and now.
+ * It is possible that concurrent reconfigurations take effect between the
+ * time this reconfiguration was proposed and now.
  *
  * Particularly, it is possible that any of the concurrent reconfigurations
  * modified the event horizon and that the new member(s) do not support event
@@ -2617,7 +3460,7 @@
  * configuration is installed.
  */
 site_def *handle_add_node(app_data_ptr a) {
-  if (add_node_unsafe_against_event_horizon(a)) {
+  if (check_if_add_node_is_unsafe_against_event_horizon(a)) {
     /*
      * Note that the result of this function is only applicable to
      * unused and not-fully-implemented code paths where add_node_type is used
@@ -2626,18 +3469,27 @@
      */
     return NULL;
   }
+
+  if (unsafe_leaders(a)) {
+    return NULL;
+  }
   {
-    site_def *site = clone_site_def(get_site_def());
+    site_def const *old_site = get_site_def();
+    site_def *site = clone_site_def(old_site);
     IFDBG(D_NONE, FN; COPY_AND_FREE_GOUT(dbg_list(&a->body.app_u_u.nodes)););
     IFDBG(D_NONE, FN; COPY_AND_FREE_GOUT(dbg_list(&a->body.app_u_u.nodes)););
     ADD_DBG(D_BASE, add_event(EVENT_DUMP_PAD, string_arg("a->app_key"));
             add_synode_event(a->app_key););
-    assert(get_site_def());
+    assert(old_site);
     assert(site);
     add_site_def(a->body.app_u_u.nodes.node_list_len,
                  a->body.app_u_u.nodes.node_list_val, site);
-    site->start = getstart(a);
-    site->boot_key = a->app_key;
+    set_start_and_boot(site, a);
+    if (site->x_proto >= single_writer_support) {
+      recompute_node_sets(old_site, site);
+      recompute_timestamps(old_site->detected, &old_site->nodes, site->detected,
+                           &site->nodes);
+    }
     site_install_action(site, a->body.c_t);
     return site;
   }
@@ -2702,7 +3554,7 @@
   return EVENT_HORIZON_ALLOWED;
 }
 
-static bool_t unsafe_event_horizon_reconfiguration(app_data_ptr a) {
+static bool_t is_unsafe_event_horizon_reconfiguration(app_data_ptr a) {
   assert(a->body.c_t == set_event_horizon_type);
   {
     xcom_event_horizon new_event_horizon = a->body.app_u_u.event_horizon;
@@ -2723,6 +3575,61 @@
   }
 }
 
+// Predicate that checks IF the reconfiguration will be unsafe
+static bool_t is_unsafe_max_leaders_reconfiguration(app_data_ptr a) {
+  assert(a->body.c_t == set_max_leaders);
+  const site_def *latest_config = get_site_def();
+  node_no new_max_leaders = a->body.app_u_u.max_leaders;
+  if (new_max_leaders > get_maxnodes(latest_config)) {
+    G_WARNING("The max number of leaders was not reconfigured to %" PRIu32
+              " because its domain is [%" PRIu32 ", %" PRIu32 "]",
+              new_max_leaders, 0, get_maxnodes(latest_config));
+    return TRUE;
+  } else if (incompatible_proto_and_max_leaders(latest_config->x_proto,
+                                                new_max_leaders)) {
+    G_WARNING(
+        "The max number of leaders was not reconfigured "
+        " because some of the group's members do not support "
+        "reconfiguring the max number of leaders to %" PRIu32,
+        new_max_leaders);
+    return TRUE;
+  } else {
+    return FALSE;
+  }
+}
+
+static bool_t is_unsafe_set_leaders_reconfiguration(app_data_ptr a
+                                                    [[maybe_unused]]) {
+  assert(a->body.c_t == set_leaders_type);
+  const site_def *latest_config = get_site_def();
+  if (incompatible_proto_and_leaders(latest_config->x_proto)) {
+    G_WARNING(
+        "The set of leaders was not reconfigured "
+        " because some of the group's members do not support "
+        "reconfiguring leaders");
+    return TRUE;
+  } else {
+    return FALSE;
+  }
+}
+
+static bool_t is_unsafe_leaders_reconfiguration(app_data_ptr a) {
+  while (a) {
+    switch (a->body.c_t) {
+      case set_max_leaders:
+        if (is_unsafe_max_leaders_reconfiguration(a)) return TRUE;
+        break;
+      case set_leaders_type:
+        if (is_unsafe_set_leaders_reconfiguration(a)) return TRUE;
+        break;
+      default:
+        break;
+    }
+    a = a->next;
+  }
+  return FALSE;
+}
+
 static bool_t are_there_dead_nodes_in_new_config(app_data_ptr a) {
   assert(a->body.c_t == force_config_type);
 
@@ -2749,7 +3656,8 @@
       if (may_be_dead(get_site_def()->detected, node, task_now())) {
         G_ERROR(
             "%s is suspected to be failed."
-            "Only alive members in the current configuration should be present"
+            "Only alive members in the current configuration should be "
+            "present"
             " in a forced configuration list",
             nodes_to_change[i].address)
         return TRUE;
@@ -2777,7 +3685,7 @@
  * new configuration is installed.
  */
 bool_t handle_event_horizon(app_data_ptr a) {
-  if (unsafe_event_horizon_reconfiguration(a)) return FALSE;
+  if (is_unsafe_event_horizon_reconfiguration(a)) return FALSE;
 
   {
     xcom_event_horizon new_event_horizon = a->body.app_u_u.event_horizon;
@@ -2790,14 +3698,94 @@
     assert(get_site_def());
     assert(new_config);
     new_config->event_horizon = new_event_horizon;
-    new_config->start = getstart(a);
-    new_config->boot_key = a->app_key;
+    set_start_and_boot(new_config, a);
     site_install_action(new_config, a->body.c_t);
     G_INFO("The event horizon was reconfigured to %" PRIu32, new_event_horizon);
   }
   return TRUE;
 }
 
+static bool_t handle_max_leaders(site_def *new_config, app_data_ptr a) {
+  IFDBG(D_BASE, FN; NUMEXP(a->body.app_u_u.max_leaders));
+  assert(new_config);
+  new_config->max_active_leaders = a->body.app_u_u.max_leaders;
+  set_start_and_boot(new_config, a);
+  G_INFO("Maximum number of leaders was reconfigured to %" PRIu32,
+         a->body.app_u_u.max_leaders);
+  return TRUE;
+}
+
+bool_t handle_max_leaders(app_data_ptr a) {
+  if (is_unsafe_max_leaders_reconfiguration(a)) return FALSE;
+
+  site_def *new_config = clone_site_def(get_site_def());
+  handle_max_leaders(new_config, a);
+  site_install_action(new_config, a->body.c_t);
+  return TRUE;
+}
+
+static void zero_leader_array(leader_array *l) {
+  l->leader_array_len = 0;
+  l->leader_array_val = 0;
+}
+
+static void move_leader_array(leader_array *target, leader_array *source) {
+  /* Deallocate leader_array from target */
+  xdr_free((xdrproc_t)xdr_leader_array, (char *)target);
+  *target = *source;
+  /* Zero the source */
+  zero_leader_array(source);
+}
+
+static bool_t handle_set_leaders(site_def *new_config, app_data_ptr a) {
+  IFDBG(D_BASE, FN; NUMEXP(a->body.app_u_u.leaders.leader_array_len);
+        NUMEXP(new_config->max_active_leaders));
+  assert(new_config);
+  /* Steal the leaders from a */
+  move_leader_array(&new_config->leaders, &a->body.app_u_u.leaders);
+  set_start_and_boot(new_config, a);
+  return TRUE;
+}
+
+bool_t handle_set_leaders(app_data_ptr a) {
+  if (is_unsafe_set_leaders_reconfiguration(a)) return FALSE;
+
+  site_def *new_config = clone_site_def(get_site_def());
+  handle_set_leaders(new_config, a);
+  site_install_action(new_config, a->body.c_t);
+  G_INFO("Preferred leaders were reconfigured to leaders[0]=%s",
+         new_config->leaders.leader_array_len > 0
+             ? new_config->leaders.leader_array_val[0].address
+             : "n/a");
+  return TRUE;
+}
+
+bool_t handle_leaders(app_data_ptr a) {
+  if (is_unsafe_leaders_reconfiguration(a)) return FALSE;
+  site_def *new_config = clone_site_def(get_site_def());
+  cargo_type operation{a->body.c_t};  // Deallocate on scope exit if failure
+  bool_t retval = TRUE;
+  while (a && retval) {
+    switch (a->body.c_t) {
+      case set_max_leaders:
+        if (!handle_max_leaders(new_config, a)) retval = FALSE;
+        break;
+      case set_leaders_type:
+        if (!handle_set_leaders(new_config, a)) retval = FALSE;
+        break;
+      default:
+        break;
+    }
+    a = a->next;
+  }
+  if (retval) {
+    site_install_action(new_config, operation);
+  } else {
+    free_site_def(new_config);
+  }
+  return retval;
+}
+
 void terminate_and_exit() {
   IFDBG(D_NONE, FN;);
   ADD_DBG(D_FSM, add_event(EVENT_DUMP_PAD, string_arg("terminating"));)
@@ -2811,7 +3799,8 @@
 }
 
 site_def *handle_remove_node(app_data_ptr a) {
-  site_def *site = clone_site_def(get_site_def());
+  site_def const *old_site = get_site_def();
+  site_def *site = clone_site_def(old_site);
   IFDBG(D_NONE, FN; COPY_AND_FREE_GOUT(dbg_list(&a->body.app_u_u.nodes)));
   ADD_DBG(D_BASE, add_event(EVENT_DUMP_PAD, string_arg("a->app_key"));
           add_synode_event(a->app_key);
@@ -2820,8 +3809,12 @@
 
   remove_site_def(a->body.app_u_u.nodes.node_list_len,
                   a->body.app_u_u.nodes.node_list_val, site);
-  site->start = getstart(a);
-  site->boot_key = a->app_key;
+  set_start_and_boot(site, a);
+  if (site->x_proto >= single_writer_support) {
+    recompute_node_sets(old_site, site);
+    recompute_timestamps(old_site->detected, &old_site->nodes, site->detected,
+                         &site->nodes);
+  }
   site_install_action(site, a->body.c_t);
   return site;
 }
@@ -2851,6 +3844,16 @@
       G_DEBUG("%s: Ignoring a forced intermediate, pending force_config",
               caller_name);
       break;
+    case set_max_leaders:
+      G_DEBUG(
+          "%s: Ignoring a forced intermediate, pending set_max_leaders for "
+          "%" PRIu32,
+          caller_name, a->body.app_u_u.max_leaders);
+      break;
+    case set_leaders_type:
+      G_DEBUG("%s: Ignoring a forced intermediate, pending set_leaders_type",
+              caller_name);
+      break;
     case abort_trans:
     case app_type:
     case begin_trans:
@@ -2868,13 +3871,15 @@
     case x_terminate_and_exit:
     case xcom_boot_type:
     case xcom_set_group:
+    case get_leaders_type:
       // Meaningless for any other `cargo_type`s. Ignore.
       break;
   }
 }
 
 bool_t handle_config(app_data_ptr a, bool const forced) {
-  assert(a->body.c_t == unified_boot_type ||
+  assert(a->body.c_t == unified_boot_type || a->body.c_t == set_max_leaders ||
+         a->body.c_t == set_leaders_type ||
          a->next == NULL); /* Reconfiguration commands are not batched. */
   {
     bool_t success = FALSE;
@@ -2909,6 +3914,11 @@
         success = (install_node_group(a) != NULL);
         assert(success);
         break;
+      case set_max_leaders:
+      case set_leaders_type:
+        success = handle_leaders(a);
+        assert(success);
+        break;
       default:
         assert(FALSE); /* Boy oh boy, something is really wrong... */
         break;
@@ -3073,7 +4083,8 @@
   int inform_index;
 };
 
-static void dump_exec_state(execute_context *xc, long dbg);
+static void dump_exec_state(execute_context *xc [[maybe_unused]],
+                            long dbg [[maybe_unused]]);
 static int x_check_exit(execute_context *xc);
 static int x_check_execute_inform(execute_context *xc);
 static void x_fetch(execute_context *xc);
@@ -3091,10 +4102,11 @@
   { f, #f }
 
 /* List of fp, name pairs */
-static struct fp_name oblist[] = {
+static struct fp_name MY_ATTRIBUTE((unused)) oblist[] = {
     NAME(x_fetch), NAME(x_execute), NAME(x_terminate), {0, 0}};
 #undef NAME
 
+#if TASK_DBUG_ON
 /* purecov: begin deadcode */
 char const *get_fp_name(exec_fp fp) {
   struct fp_name *list = oblist;
@@ -3105,18 +4117,19 @@
   return "no such fp";
 }
 /* purecov: end */
+#endif
 
 static void setup_exit_handling(execute_context *xc, site_def *site) {
   synode_no delay_until;
   if (is_member(site)) {
     delay_until = compute_delay(site->start, site->event_horizon);
   } else { /* Not in this site */
-    /* See if site will be empty when we leave. If the new site
-     * is empty, we should exit after having delivered the last
-     * message from the old site. */
+           /* See if site will be empty when we leave. If the new site
+            * is empty, we should exit after having delivered the last
+            * message from the old site. */
 
-    /* Note limit of delivery. We should never deliver anything after the start
-     * of the next site. */
+    /* Note limit of delivery. We should never deliver anything after the
+     * start of the next site. */
     xc->delivery_limit = site->start;
 
     /* If we are not a member of the new site, we should exit
@@ -3128,14 +4141,15 @@
     if (is_empty_site(site)) {
       /* If site is empty, increase start to allow nodes to terminate before
        * start. This works as if there was a non-empty group after the
-       * exit_synode, effectively allowing the majority of the current group to
-       * agree on all messages up to exit_synode.
+       * exit_synode, effectively allowing the majority of the current group
+       * to agree on all messages up to exit_synode.
        */
       site->start = compute_delay(
           compute_delay(site->start, site->event_horizon), site->event_horizon);
     }
     if (!synode_lt(xc->exit_synode, max_synode)) {
-      /* We need messages from the next site, so set max_synode accordingly. */
+      /* We need messages from the next site, so set max_synode accordingly.
+       */
       set_max_synode(incr_synode(xc->exit_synode));
     }
     /* Note where we switch to execute and inform removed nodes */
@@ -3183,7 +4197,11 @@
        * effect. What follows only makes sense if the reconfiguration
        * took effect. */
       set_last_received_config(executed_msg);
-      garbage_collect_site_defs(delivered_msg);
+      synode_no min_synode = min_proposer_synode();
+      if (synode_eq(null_synode, min_synode) ||
+          synode_lt(delivered_msg, min_synode))
+        min_synode = get_last_delivered_msg();
+      garbage_collect_site_defs(min_synode);
       site = get_site_def_rw();
       if (site == 0) {
         xc->state = x_terminate;
@@ -3232,8 +4250,8 @@
           !synode_lt(delivered_msg, xc->delivery_limit));
 }
 
-/* Terminate if we should exit, else increment executed_msg and see if we should
- * switch to execute */
+/* Terminate if we should exit, else increment executed_msg and see if we
+ * should switch to execute */
 static void x_check_increment_fetch(execute_context *xc) {
   if (x_check_exit(xc)) {
     xc->state = x_terminate;
@@ -3263,32 +4281,29 @@
 /* Deliver one message if it should be delivered. Switch state to see if
    we should exit */
 static void x_execute(execute_context *xc) {
-  site_def const *x_site = find_site_def(delivered_msg);
+  site_def *x_site = find_site_def_rw(delivered_msg);
 
   IFDBG(D_EXEC, FN; SYCEXP(delivered_msg); SYCEXP(delivered_msg);
         SYCEXP(executed_msg); SYCEXP(xc->exit_synode); NDBG(xc->exit_flag, d));
   if (!is_cached(delivered_msg)) {
-    /* purecov: begin deadcode */
+/* purecov: begin deadcode */
 #ifdef TASK_EVENT_TRACE
     dump_task_events();
 #endif
     /* purecov: end */
   }
-  assert(is_cached(delivered_msg) && "delivered_msg should have been cached");
-  xc->p = get_cache(delivered_msg);
-  if (LOSER(delivered_msg, x_site)) {
-#ifdef IGNORE_LOSERS
-    IFDBG(D_EXEC, FN; debug_loser(delivered_msg); PTREXP(x_site);
-          dbg_node_set(x_site->global_node_set));
-#endif
-  } else if (xc->p->learner.msg->msg_type != no_op) {
-    /* Avoid delivery after start if we should exit */
-    if (xc->exit_flag == 0 || synode_lt(delivered_msg, xc->delivery_limit)) {
-      /* IFDBG(D_EXEC, FN; NDBG(ep->state, d); STRLIT("executing ");
-         SYCEXP(delivered_msg); SYCEXP(executed_msg);
-              SYCEXP(xc->delivery_limit); NDBG(xc->exit_flag, d)); */
-      last_delivered_msg = delivered_msg;
-      execute_msg(find_site_def_rw(delivered_msg), xc->p, xc->p->learner.msg);
+  if (!ignore_message(delivered_msg, x_site, "x_execute")) {
+    assert(is_cached(delivered_msg) && "delivered_msg should have been cached");
+    xc->p = get_cache(delivered_msg);
+    if ((xc->p)->learner.msg->msg_type != no_op) {
+      /* Avoid delivery after start if we should exit */
+      if (xc->exit_flag == 0 || synode_lt(delivered_msg, xc->delivery_limit)) {
+        IFDBG(D_EXEC, FN; STRLIT("executing "); SYCEXP(delivered_msg);
+              SYCEXP(executed_msg); SYCEXP(xc->delivery_limit);
+              NDBG(xc->exit_flag, d));
+        last_delivered_msg = delivered_msg;
+        execute_msg(find_site_def_rw(delivered_msg), xc->p, xc->p->learner.msg);
+      }
     }
   }
   /* Garbage collect old servers */
@@ -3304,8 +4319,8 @@
 
 static execute_context *debug_xc;
 
-static void dump_exec_state(execute_context *xc MY_ATTRIBUTE((unused)),
-                            long dbg MY_ATTRIBUTE((unused))) {
+static void dump_exec_state(execute_context *xc [[maybe_unused]],
+                            long dbg [[maybe_unused]]) {
   IFDBG(dbg, FN; SYCEXP(executed_msg); SYCEXP(delivered_msg);
         SYCEXP(max_synode); SYCEXP(last_delivered_msg); NDBG(delay_fifo.n, d);
         NDBG(delay_fifo.front, d); NDBG(delay_fifo.rear, d);
@@ -3325,7 +4340,7 @@
   xc->state = 0;
 }
 
-static int executor_task(task_arg arg MY_ATTRIBUTE((unused))) {
+static int executor_task(task_arg arg [[maybe_unused]]) {
   DECL_ENV
   execute_context xc;
   END_ENV;
@@ -3353,15 +4368,17 @@
   /* The following loop implements a state machine based on function pointers,
      effectively acting as non-local gotos.
      The functions all operate on data in the execution context xc, and
-     switch state by setting xc->state to the function corresponding to the new
-     state.
+     switch state by setting xc->state to the function corresponding to the
+     new state.
   */
   while (!xcom_shutdown && ep->xc.state != 0) {
     IFDBG(D_EXEC, FN; STRLIT(get_fp_name(ep->xc.state)););
     if (ep->xc.state == x_fetch) { /* Special case because of task macros */
-      if (LOSER(executed_msg, executor_site)) {
+      if (ignore_message(executed_msg, executor_site, "executor_task")) {
+        IFDBG(D_EXEC, FN; STRLIT("ignoring message "); SYCEXP(executed_msg));
         x_check_increment_fetch(&ep->xc); /* Just increment past losers */
       } else {
+        IFDBG(D_EXEC, FN; STRLIT("fetching message "); SYCEXP(executed_msg));
         TASK_CALL(get_xcom_message(&ep->xc.p, executed_msg, FIND_MAX));
         IFDBG(D_EXEC, FN; STRLIT("got message "); SYCEXP(ep->xc.p->synode);
               COPY_AND_FREE_GOUT(dbg_app_data(ep->xc.p->learner.msg->a)));
@@ -3375,7 +4392,7 @@
   /* Inform all removed nodes before we exit */
   ADD_DBG(D_FSM, add_event(EVENT_DUMP_PAD, string_arg("terminating"));)
   inform_removed(ep->xc.inform_index, 1);
-  dump_exec_state(&ep->xc, D_BUG);
+  dump_exec_state(&ep->xc, D_EXEC);
 
 #ifndef NO_DELAYED_TERMINATION
   IFDBG(D_EXEC, FN; STRLIT("delayed terminate and exit"));
@@ -3388,7 +4405,7 @@
 #endif
 
   FINALLY
-  dump_exec_state(&ep->xc, D_BUG);
+  dump_exec_state(&ep->xc, D_EXEC);
   IFDBG(D_BUG, FN; STRLIT(" shutdown "); SYCEXP(executed_msg);
         NDBG(task_now(), f));
   TASK_END;
@@ -3403,7 +4420,45 @@
   return find;
 }
 
-static int sweeper_task(task_arg arg MY_ATTRIBUTE((unused))) {
+/* Allow takeover of channel if not all are leaders. We may need to adjust
+ * this if we allow any subset of the nodes as leaders */
+static bool allow_channel_takeover(site_def const *site) {
+  return site->max_active_leaders != active_leaders_all;
+}
+
+static void broadcast_noop(synode_no find, pax_machine *p) {
+  site_def const *site = find_site_def(find);
+
+  /*
+   If we allow channel hijacking, we cannot send skip_op, but need consensus.
+   There are two options here:
+
+   a) We unconditionally propose a `no_op` using the regular 3-phase Paxos
+      protocol, or
+   b) We propose a `no_op` using the 2-phase Paxos protocol *if* we
+      are sure that no other Proposer will try to run the 2-phase Paxos
+   protocol on `find`. If we are not sure, we propose using the 3-phase Paxos
+      protocol.
+
+   Option (a) is always safe, but we pay the cost of 3-phase Paxos.
+   Option (b) can be implemented by having the leaders keep track of the
+   synods they allocate to non-leaders. If we are the leader for `find` and we
+   allocated it to a non-leader, we must use 3-phase Paxos here to be safe
+   against the non-leader using 2-phase Paxos. If we never allocated `find` to
+   a non-leader, we can use 2-phase Paxos here if we ensure we don't allocate
+   `find` to a non-leader afterwards.
+
+   We go with option (a) because there is no evidence that the additional
+   complexity that option (b) requires is worthwhile.
+   */
+  if (allow_channel_takeover(site)) {
+    propose_noop(find, p);  // Single leader
+  } else {
+    skip_msg(pax_msg_new(find, site));  // Multiple leaders
+  }
+}
+
+static int sweeper_task(task_arg arg [[maybe_unused]]) {
   DECL_ENV
   synode_no find;
   END_ENV;
@@ -3426,60 +4481,64 @@
     /*			SYCEXP(executed_msg); SYCEXP(max_synode);
      * SYCEXP(ep->find));
      */
-    {
-      while (synode_lt(ep->find, max_synode) && !too_far(ep->find)) {
-        /* pax_machine * pm = hash_get(ep->find); */
-        pax_machine *pm = 0;
-        ADD_DBG(D_NONE,
-                add_event(EVENT_DUMP_PAD, string_arg("sweeper examining"));
-                add_synode_event(ep->find););
-        if (ep->find.node == VOID_NODE_NO) {
-          if (synode_gt(executed_msg, ep->find)) {
-            ep->find = get_sweep_start();
-          }
-          if (ep->find.node == VOID_NODE_NO) goto deactivate;
+    while (synode_lt(ep->find, max_synode) && !too_far(ep->find)) {
+      /* pax_machine * pm = hash_get(ep->find); */
+      pax_machine *pm = 0;
+      ADD_DBG(D_NONE,
+              add_event(EVENT_DUMP_PAD, string_arg("sweeper examining"));
+              add_synode_event(ep->find););
+      if (ep->find.node == VOID_NODE_NO) {
+        if (synode_gt(executed_msg, ep->find)) {
+          ep->find = get_sweep_start();
         }
-        pm = get_cache(ep->find);
-        ADD_DBG(D_CONS,
-                add_event(EVENT_DUMP_PAD, string_arg("sweeper checking"));
-                add_synode_event(ep->find);
-                add_event(EVENT_DUMP_PAD, string_arg(pax_op_to_str(pm->op)));
-                add_event(EVENT_DUMP_PAD, string_arg("pm"));
-                add_event(EVENT_DUMP_PAD, void_arg(pm)););
-        if (pm && !pm->force_delivery) { /* We want full 3 phase Paxos for
-                                            forced messages */
-          ADD_DBG(
-              D_CONS, add_event(EVENT_DUMP_PAD, string_arg("sweeper checking"));
+        if (ep->find.node == VOID_NODE_NO) goto deactivate;
+      }
+      pm = get_cache(ep->find);
+      ADD_DBG(D_CONS, add_event(EVENT_DUMP_PAD, string_arg("sweeper checking"));
               add_synode_event(ep->find);
               add_event(EVENT_DUMP_PAD, string_arg(pax_op_to_str(pm->op)));
-              add_event(EVENT_DUMP_PAD, string_arg("is_busy_machine"));
-              add_event(EVENT_DUMP_PAD, int_arg(is_busy_machine(pm)));
-              add_event(EVENT_DUMP_PAD, string_arg("pm->acceptor.promise.cnt"));
-              add_event(EVENT_DUMP_PAD, int_arg(pm->acceptor.promise.cnt));
-              add_event(EVENT_DUMP_PAD, string_arg("finished(pm)"));
-              add_event(EVENT_DUMP_PAD, int_arg(finished(pm)));
-              add_event(EVENT_DUMP_PAD, string_arg("pm->acceptor.msg"));
-              add_event(EVENT_DUMP_PAD, void_arg(pm->acceptor.msg)););
-          /* IFDBG(D_NONE, FN; dbg_pax_machine(pm)); */
-          if (!is_busy_machine(pm) && pm->acceptor.promise.cnt == 0 &&
-              !pm->acceptor.msg && !finished(pm)) {
-            pm->op = skip_op;
-            ADD_DBG(D_CONS,
-                    add_event(EVENT_DUMP_PAD, string_arg("sweeper skipping"));
-                    add_synode_event(ep->find); add_event(
-                        EVENT_DUMP_PAD, string_arg(pax_op_to_str(pm->op))););
-            skip_msg(pax_msg_new(ep->find, find_site_def(ep->find)));
-            IFDBG(D_NONE, FN; STRLIT("skipping "); SYCEXP(ep->find));
-            /* 						IFDBG(D_NONE, FN;
-             * dbg_pax_machine(pm));
-             */
+              add_event(EVENT_DUMP_PAD, string_arg("pm"));
+              add_event(EVENT_DUMP_PAD, void_arg(pm)););
+      if (pm && !pm->force_delivery) { /* We want full 3 phase Paxos for
+                                          forced messages */
+        ADD_DBG(
+            D_CONS, add_event(EVENT_DUMP_PAD, string_arg("sweeper checking"));
+            add_synode_event(ep->find);
+            add_event(EVENT_DUMP_PAD, string_arg(pax_op_to_str(pm->op)));
+            add_event(EVENT_DUMP_PAD, string_arg("is_busy_machine"));
+            add_event(EVENT_DUMP_PAD, int_arg(is_busy_machine(pm)));
+            add_event(EVENT_DUMP_PAD, string_arg("pm->acceptor.promise.cnt"));
+            add_event(EVENT_DUMP_PAD, int_arg(pm->acceptor.promise.cnt));
+            add_event(EVENT_DUMP_PAD, string_arg("finished(pm)"));
+            add_event(EVENT_DUMP_PAD, int_arg(finished(pm)));
+            add_event(EVENT_DUMP_PAD, string_arg("pm->acceptor.msg"));
+            add_event(EVENT_DUMP_PAD, void_arg(pm->acceptor.msg)););
+        /* IFDBG(D_NONE, FN; dbg_pax_machine(pm)); */
+        if (!is_busy_machine(pm) && pm->acceptor.promise.cnt == 0 &&
+            !pm->acceptor.msg && !finished(pm)) {
+          ADD_DBG(
+              D_CONS, add_event(EVENT_DUMP_PAD, string_arg("sweeper skipping"));
+              add_synode_event(ep->find);
+              add_event(EVENT_DUMP_PAD, string_arg(pax_op_to_str(pm->op))););
+          site_def *config = find_site_def_rw(ep->find);
+          // Do not send noop if single writer, since there normally will be
+          // no holes in the message sequence, and it may interfere with
+          // messages delegated to secondary nodes.
+          if (config->max_active_leaders != 1 &&
+              !ignore_message(ep->find, config, "sweeper_task")) {
+            broadcast_noop(ep->find, pm);
           }
+          IFDBG(D_NONE, FN; STRLIT("skipping "); SYCEXP(ep->find));
         }
-        ep->find = incr_msgno(ep->find);
       }
+      ep->find = incr_msgno(ep->find);
     }
   deactivate:
-    TASK_DEACTIVATE;
+    if (!synode_lt(ep->find, max_synode)) {
+      TASK_DEACTIVATE;
+    } else {
+      TASK_DELAY(0.010); /* Let poll_wait check for IO */
+    }
   }
   FINALLY
   IFDBG(D_BUG, FN; STRLIT(" shutdown sweeper "); SYCEXP(executed_msg);
@@ -3488,27 +4547,34 @@
 }
 
 static double wakeup_delay(double old) {
+  double const minimum_threshold = 0.1;
+#ifdef EXECUTOR_TASK_AGGRESSIVE_NO_OP
+  double const maximum_threshold = 1.0;
+#else
+  double const maximum_threshold = 20.0;
+#endif /* EXECUTOR_TASK_AGGRESSIVE_NO_OP */
   double retval = 0.0;
   if (0.0 == old) {
     double m = median_time();
-    if (m == 0.0 || m > 0.3) m = 0.1;
-    retval = 0.1 + 5.0 * m + m * xcom_drand48();
+    double const fuzz = 5.0;
+    IFDBG(D_BUG, FN; NDBG(m, f));
+    // Guard against unreasonable estimates of median consensus time
+    if (m <= 0.0) m = minimum_threshold;
+    if (m > maximum_threshold / fuzz) m = (maximum_threshold / fuzz) / 2.0;
+    retval = minimum_threshold + fuzz * m + m * xcom_drand48();
   } else {
     retval = old * 1.4142136; /* Exponential backoff */
   }
-  {
-#ifdef EXECUTOR_TASK_AGGRESSIVE_NO_OP
-    double const maximum_threshold = 1.0;
-#else
-    double const maximum_threshold = 3.0;
-#endif /* EXECUTOR_TASK_AGGRESSIVE_NO_OP */
-    while (retval > maximum_threshold) retval /= 1.31415926;
+  /* If we exceed maximum, choose a random value in the max/2..max interval */
+  if (retval > maximum_threshold) {
+    double const low = maximum_threshold / 2.0;
+    retval = low + xcom_drand48() * (maximum_threshold - low);
   }
-  /* IFDBG(D_NONE, FN; NDBG(retval,d)); */
+  IFDBG(D_BUG, FN; NDBG(retval, f));
   return retval;
 }
 
-static void propose_noop(synode_no find, pax_machine *p) {
+static site_def const *init_noop(synode_no find, pax_machine *p) {
   /* Prepare to send a noop */
   site_def const *site = find_site_def(find);
   IFDBG(D_NONE, FN; SYCEXP(find); SYCEXP(executed_msg));
@@ -3516,18 +4582,30 @@
   replace_pax_msg(&p->proposer.msg, pax_msg_new(find, site));
   assert(p->proposer.msg);
   create_noop(p->proposer.msg);
-  {
-    pax_msg *clone = clone_pax_msg(p->proposer.msg);
-    if (clone != NULL) {
-      push_msg_3p(site, p, clone, find, no_op);
-    } else {
-      /* purecov: begin inspected */
-      G_DEBUG("Unable to propose NoOp due to an OOM error.");
-      /* purecov: end */
-    }
+  return site;
+}
+
+static void propose_noop(synode_no find, pax_machine *p) {
+  site_def const *site = init_noop(find, p);
+  pax_msg *clone = clone_pax_msg(p->proposer.msg);
+  if (clone != NULL) {
+    IFDBG(D_CONS, FN; SYCEXP(find));
+    push_msg_3p(site, p, clone, find, no_op);
+  } else {
+    /* purecov: begin inspected */
+    G_DEBUG("Unable to propose NoOp due to an OOM error.");
+    /* purecov: end */
   }
 }
 
+#if 0
+static void propose_noop_2p(synode_no find, pax_machine *p) {
+  site_def const *site = init_noop(find, p);
+  IFDBG(D_CONS, FN; SYCEXP(find));
+  push_msg_2p(site, p);
+}
+#endif
+
 static void send_read(synode_no find) {
   /* Prepare to send a read_op */
   site_def const *site = find_site_def(find);
@@ -3630,8 +4708,10 @@
     }
     IFDBG(D_NONE, FN; NDBG(ok_to_propose(p), d); TIMECEXP(task_now());
           TIMECEXP(p->last_modified); SYCEXP(find));
-    if (get_nodeno(find_site_def(find)) == VOID_NODE_NO) break;
-    if (ok_to_propose(p)) {
+    site_def *site = find_site_def_rw(find);
+    if (get_nodeno(site) == VOID_NODE_NO) break;
+    if (!ignore_message(find, site, "propose_missing_values") &&
+        ok_to_propose(p)) {
       propose_noop(find, p);
     }
     find = incr_synode(find);
@@ -3639,33 +4719,13 @@
   }
 }
 
-/* Propose a noop for the range find..end */
-void request_values(synode_no find, synode_no end) {
-  IFDBG(D_NONE, FN; SYCEXP(find); SYCEXP(end););
-  while (!synode_gt(find, end) && !too_far(find)) {
-    pax_machine *p = get_cache(find);
-    site_def const *site = find_site_def(find);
-    if (get_nodeno(site) == VOID_NODE_NO) break;
-    if (!finished(p) && !is_busy_machine(p)) {
-      /* Prepare to send a noop */
-      replace_pax_msg(&p->proposer.msg, pax_msg_new(find, site));
-      assert(p->proposer.msg);
-      create_noop(p->proposer.msg);
-
-      IFDBG(D_NONE, FN; STRLIT("propose "); SYCEXP(find););
-      push_msg_3p(site, p, pax_msg_new(find, site), find, no_op);
-    }
-    find = incr_synode(find);
-  }
-}
-
 /* Message handlers */
 
 /*
 Reply to the sender of a message.
 Avoid using the outbound TCP connection to the node that sent the message, since
 it is simpler and safer to always use the same TCP connection as the one the
-message arrived on. We then know that the answever will always go to the same
+message arrived on. We then know that the answer will always go to the same
 client (and the same instance of that client) that sent the request.
 */
 #define reply_msg(m)                                              \
@@ -3805,13 +4865,17 @@
   }
 }
 
+static bool learn_ok(site_def const *site, pax_machine const *p) {
+  return get_nodeno(site) != VOID_NODE_NO && prop_majority(site, p);
+}
+
 static pax_msg *check_learn(site_def const *site, pax_machine *p) {
   IFDBG(D_NONE, FN; SYCEXP(p->synode);
         COPY_AND_FREE_GOUT(dbg_machine_nodeset(p, get_maxnodes(site))););
   PAX_MSG_SANITY_CHECK(p->proposer.msg);
   {
     pax_msg *learn_msg = NULL;
-    if (get_nodeno(site) != VOID_NODE_NO && prop_majority(site, p)) {
+    if (learn_ok(site, p)) {
       p->proposer.msg->synode = p->synode;
       if (p->proposer.msg->receivers) free_bit_set(p->proposer.msg->receivers);
       p->proposer.msg->receivers = clone_bit_set(p->proposer.prep_nodeset);
@@ -3830,8 +4894,8 @@
   }
 }
 
-static void do_learn(site_def const *site MY_ATTRIBUTE((unused)),
-                     pax_machine *p, pax_msg *m) {
+static void do_learn(site_def const *site [[maybe_unused]], pax_machine *p,
+                     pax_msg *m) {
   ADD_DBG(D_CONS, add_synode_event(p->synode);
           add_event(EVENT_DUMP_PAD, string_arg("m->from"));
           add_event(EVENT_DUMP_PAD, uint_arg(m->from));
@@ -3946,7 +5010,12 @@
 
   {
     pax_msg *reply = handle_simple_accept(p, m, m->synode);
-    if (reply != NULL) SEND_REPLY;
+    if (reply != NULL) {
+      SEND_REPLY;
+      IFDBG(D_CONS, FN; STRLIT("activating sweeper on accept of ");
+            SYCEXP(m->synode));
+      activate_sweeper();
+    }
   }
 }
 
@@ -4001,6 +5070,7 @@
       pm->acceptor.msg->op = learn_op;
       pm->last_modified = task_now();
       update_max_synode(p);
+      paxos_fsm(pm, site, paxos_learn, p);
       handle_learn(site, pm, pm->acceptor.msg);
     } else {
       send_read(p->synode);
@@ -4099,7 +5169,8 @@
                   find_site_def(p->synode)->x_proto)) {
             log_ignored_forced_config(m->a, "handle_learn");
           } else {
-            start_force_config(clone_site_def(handle_add_node(m->a)), 0);
+            site_def *new_def = handle_add_node(m->a);
+            if (new_def) start_force_config(clone_site_def(new_def), 0);
           }
           break;
         /* purecov: end */
@@ -4204,7 +5275,8 @@
   /* This should never be TRUE, but validate it instead of asserting. */
   if (site == NULL || site->nodes.node_list_len < 1) {
     G_DEBUG(
-        "handle_boot: Received an unexpected need_boot_op when site == NULL or "
+        "handle_boot: Received an unexpected need_boot_op when site == NULL "
+        "or "
         "site->nodes.node_list_len < 1");
     return;
   }
@@ -4238,16 +5310,16 @@
    If it is due to reason (b), we do not want to boot the sender because XCom
    only implements a simple fail-stop model. Allowing the sender to rejoin the
    group without going through the full remove+add node path could violate
-   safety because the sender does not remember any previous Paxos acceptances it
-   acknowledged before crashing.
-   Since the pre-crash incarnation may have accepted a value for a given synod
-   but the post-crash incarnation has forgotten that fact, the post-crash
-   incarnation will fail to propagate the previously accepted value to a higher
-   ballot. Since majorities can overlap on a single node, if the overlap node
-   is the post-crash incarnation which has forgotten about the previously
-   accepted value, a higher ballot proposer may get a different value accepted,
-   leading to conflicting values to be accepted for different proposers, which
-   is a violation of the safety properties of the Paxos protocol.
+   safety because the sender does not remember any previous Paxos acceptances
+   it acknowledged before crashing. Since the pre-crash incarnation may have
+   accepted a value for a given synod but the post-crash incarnation has
+   forgotten that fact, the post-crash incarnation will fail to propagate the
+   previously accepted value to a higher ballot. Since majorities can overlap
+   on a single node, if the overlap node is the post-crash incarnation which
+   has forgotten about the previously accepted value, a higher ballot proposer
+   may get a different value accepted, leading to conflicting values to be
+   accepted for different proposers, which is a violation of the safety
+   properties of the Paxos protocol.
 
    If the sender does not advertise its identity, we boot it unconditionally.
    This is for backwards compatibility.
@@ -4291,7 +5363,8 @@
   if ((pm->from != get_nodeno(site)) && has_client_already_booted &&
       (pm->op == are_you_alive_op)) {
     G_DEBUG(
-        "Received a ping to myself. This means that something must be wrong in "
+        "Received a ping to myself. This means that something must be wrong "
+        "in "
         "a bi-directional connection")
     // Going to kill the connection for that node...
     if (site && (pm->from < site->nodes.node_list_len)) {
@@ -4306,10 +5379,10 @@
       site->servers[pm->from]->last_ping_received = current_time;
 
       // If we keep on receiving periodical pings... lets kill the connection
-      if (is_connected(&site->servers[pm->from]->con) &&
+      if (is_connected(site->servers[pm->from]->con) &&
           site->servers[pm->from]->number_of_pings_received ==
               PINGS_GATHERED_BEFORE_CONNECTION_SHUTDOWN) {
-        shutdown_connection(&site->servers[pm->from]->con);
+        shutdown_connection(site->servers[pm->from]->con);
         G_WARNING(
             "Shutting down an outgoing connection. This happens because "
             "something might be wrong on a bi-directional connection to node "
@@ -4422,12 +5495,18 @@
   u_int nr_nodes_to_add = a->body.app_u_u.nodes.node_list_len;
   node_address *nodes_to_change = a->body.app_u_u.nodes.node_list_val;
 
-  if (add_node_unsafe_against_event_horizon(a)) return 0;
+  if (check_if_add_node_is_unsafe_against_event_horizon(a)) return 0;
+
+  if (unsafe_leaders(a)) {
+    return 0;
+  }
 
   if (add_node_unsafe_against_ipv4_old_nodes(a)) {
     G_MESSAGE(
-        "This server is unable to join the group as the NIC used is configured "
-        "with IPv6 only and there are members in the group that are unable to "
+        "This server is unable to join the group as the NIC used is "
+        "configured "
+        "with IPv6 only and there are members in the group that are unable "
+        "to "
         "communicate using IPv6, only IPv4.Please configure this server to "
         "join the group using an IPv4 address instead.");
     return 0;
@@ -4544,7 +5623,13 @@
 static client_reply_code can_execute_cfgchange(pax_msg *p) {
   app_data_ptr a = p->a;
 
-  if (executed_msg.msgno <= 2) return REQUEST_RETRY;
+  if (executed_msg.msgno <= 2) {
+    // If we have not booted and we receive an add_node that contains us...
+    if (add_node_adding_own_address(a))
+      return REQUEST_FAIL;
+    else
+      return REQUEST_RETRY;
+  }
 
   if (a && a->group_id != 0 && a->group_id != executed_msg.group_id) {
     switch (a->body.c_t) {
@@ -4555,20 +5640,32 @@
             "is aimed at another group");
         break;
       case remove_node_type:
-        log_cfgchange_wrong_group(
-            a,
-            "The request to remove %s from the group has been rejected because "
-            "it is aimed at another group");
+        log_cfgchange_wrong_group(a,
+                                  "The request to remove %s from the group "
+                                  "has been rejected because "
+                                  "it is aimed at another group");
         break;
       case force_config_type:
         G_WARNING(
             "The request to force the group membership has been rejected "
             "because it is aimed at another group");
         break;
+      case set_max_leaders:
+        G_WARNING(
+            "The request to change max number of leaders has been rejected "
+            "because it is aimed at another group");
+        break;
+      case set_leaders_type:
+        G_WARNING(
+            "The request to change leaders has been rejected "
+            "because it is aimed at another group");
+        break;
       default:
         assert(0 &&
                "A cargo_type different from {add_node_type, remove_node_type, "
-               "force_config_type} should not have hit this code path");
+               "force_config_type, set_max_leaders, set_leaders_type} should "
+               "not "
+               "have hit this code path");
     }
     return REQUEST_FAIL;
   }
@@ -4580,13 +5677,18 @@
     return REQUEST_FAIL;
 
   if (a && a->body.c_t == set_event_horizon_type &&
-      unsafe_event_horizon_reconfiguration(a))
+      is_unsafe_event_horizon_reconfiguration(a))
     return REQUEST_FAIL;
 
   if (a && a->body.c_t == force_config_type &&
       are_there_dead_nodes_in_new_config(a))
     return REQUEST_FAIL;
 
+  if (a &&
+      (a->body.c_t == set_max_leaders || a->body.c_t == set_leaders_type) &&
+      is_unsafe_leaders_reconfiguration(a))
+    return REQUEST_FAIL;
+
   return REQUEST_OK;
 }
 
@@ -4611,6 +5713,32 @@
   SEND_REPLY;
 }
 
+static reply_data *new_leader_info(site_def *site) {
+  if (site) {
+    reply_data *data =
+        static_cast<reply_data *>(xcom_calloc((size_t)1, sizeof(reply_data)));
+    data->rt = leader_info;
+    data->reply_data_u.leaders.max_nr_leaders = site->max_active_leaders;
+    if (leaders_set_by_client(site)) {
+      data->reply_data_u.leaders.preferred_leaders =
+          clone_leader_array(site->leaders);
+    }
+    active_leaders(site, &data->reply_data_u.leaders.actual_leaders);
+    return data;
+  } else {
+    return 0;
+  }
+}
+
+void dispatch_get_leaders(site_def *site, pax_msg *p, linkage *reply_queue) {
+  CREATE_REPLY(p);
+  IFDBG(D_NONE, FN; STRLIT("Got get_leaders from client"); SYCEXP(p->synode););
+  reply->op = xcom_client_reply;
+  reply->rd = new_leader_info(site);
+  reply->cli_err = reply->rd ? REQUEST_OK : REQUEST_FAIL;
+  SEND_REPLY;
+}
+
 /*
  * Log the result of the get_synode_app_data command.
  */
@@ -4673,15 +5801,519 @@
 
 static int can_send_snapshot();
 
-pax_msg *dispatch_op(site_def const *site, pax_msg *p, linkage *reply_queue) {
-  pax_machine *pm = NULL;
-  site_def *dsite = find_site_def_rw(p->synode);
-  int in_front = too_far(p->synode);
+static void process_client_msg(site_def const *site, pax_msg *p,
+                               linkage *reply_queue) {
+  clicnt++;
+  if (p->a && (p->a->body.c_t == exit_type)) {
+    /* purecov: begin deadcode */
+    IFDBG(D_NONE, FN; STRLIT("Got exit from client"); SYCEXP(p->synode););
+    bury_site(get_group_id(get_site_def()));
+    ADD_DBG(D_FSM, add_event(EVENT_DUMP_PAD, string_arg("terminating"));)
+    terminate_and_exit();
+    return;
+    /* purecov: end */
+  }
+
+  if (p->a && (p->a->body.c_t == reset_type)) {
+    /* purecov: begin deadcode */
+    IFDBG(D_NONE, FN; STRLIT("Got reset from client"); SYCEXP(p->synode););
+    bury_site(get_group_id(get_site_def()));
+    ADD_DBG(D_FSM, add_event(EVENT_DUMP_PAD, string_arg("terminating"));)
+    XCOM_FSM(x_fsm_terminate, int_arg(0));
+    return;
+    /* purecov: end */
+  }
+  if (p->a && (p->a->body.c_t == remove_reset_type)) {
+    /* purecov: begin deadcode */
+    IFDBG(D_NONE, FN; STRLIT("Got remove_reset from client");
+          SYCEXP(p->synode););
+    ADD_DBG(D_FSM, add_event(EVENT_DUMP_PAD, string_arg("terminating"));)
+    XCOM_FSM(x_fsm_terminate, int_arg(0));
+    return;
+    /* purecov: end */
+  }
+  if (p->a && (p->a->body.c_t == enable_arbitrator)) {
+    CREATE_REPLY(p);
+    IFDBG(D_NONE, FN; STRLIT("Got enable_arbitrator from client");
+          SYCEXP(p->synode););
+    ARBITRATOR_HACK = 1;
+    reply->op = xcom_client_reply;
+    reply->cli_err = REQUEST_OK;
+    SEND_REPLY;
+    return;
+  }
+  if (p->a && (p->a->body.c_t == disable_arbitrator)) {
+    CREATE_REPLY(p);
+    IFDBG(D_NONE, FN; STRLIT("Got disable_arbitrator from client");
+          SYCEXP(p->synode););
+    ARBITRATOR_HACK = 0;
+    reply->op = xcom_client_reply;
+    reply->cli_err = REQUEST_OK;
+    SEND_REPLY;
+    return;
+  }
+  if (p->a && (p->a->body.c_t == set_cache_limit)) {
+    CREATE_REPLY(p);
+    IFDBG(D_NONE, FN; STRLIT("Got set_cache_limit from client");
+          SYCEXP(p->synode););
+    if (the_app_xcom_cfg) {
+      set_max_cache_size(p->a->body.app_u_u.cache_limit);
+      reply->cli_err = REQUEST_OK;
+    } else {
+      reply->cli_err = REQUEST_FAIL;
+    }
+    reply->op = xcom_client_reply;
+    SEND_REPLY;
+    return;
+  }
+  if (p->a && (p->a->body.c_t == x_terminate_and_exit)) {
+    /* purecov: begin deadcode */
+    CREATE_REPLY(p);
+    IFDBG(D_NONE, FN; STRLIT("Got terminate_and_exit from client");
+          SYCEXP(p->synode););
+    reply->op = xcom_client_reply;
+    reply->cli_err = REQUEST_OK;
+    SEND_REPLY;
+    /*
+      The function frees sites which is used by SEND_REPLY,
+      so it should be called after SEND_REPLY.
+    */
+    IFDBG(D_NONE, FN; STRLIT("terminate_and_exit"));
+    ADD_DBG(D_FSM, add_event(EVENT_DUMP_PAD, string_arg("terminating"));)
+    terminate_and_exit();
+    return;
+    /* purecov: end */
+  }
+  if (p->a && (p->a->body.c_t == get_event_horizon_type)) {
+    dispatch_get_event_horizon(get_site_def(), p, reply_queue);
+    return;
+  }
+  if (p->a && (p->a->body.c_t == get_synode_app_data_type)) {
+    dispatch_get_synode_app_data(get_site_def(), p, reply_queue);
+    return;
+  }
+  if (p->a && (p->a->body.c_t == get_leaders_type)) {
+    dispatch_get_leaders(get_site_def_rw(), p, reply_queue);
+    return;
+  }
+  if (p->a &&
+      (p->a->body.c_t == add_node_type || p->a->body.c_t == remove_node_type ||
+       p->a->body.c_t == force_config_type ||
+       p->a->body.c_t == set_event_horizon_type ||
+       p->a->body.c_t == set_max_leaders ||
+       p->a->body.c_t == set_leaders_type)) {
+    client_reply_code cli_err;
+    CREATE_REPLY(p);
+    reply->op = xcom_client_reply;
+    reply->cli_err = cli_err = can_execute_cfgchange(p);
+    SEND_REPLY;
+    if (cli_err != REQUEST_OK) {
+      return;
+    }
+  }
+  if (p->a && p->a->body.c_t == unified_boot_type) {
+    IFDBG(D_NONE, FN; STRLIT("Got unified_boot from client");
+          SYCEXP(p->synode););
+    IFDBG(D_NONE, FN; COPY_AND_FREE_GOUT(dbg_list(&p->a->body.app_u_u.nodes)););
+    IFDBG(D_NONE, STRLIT("handle_client_msg "); NDBG(p->a->group_id, x));
+    XCOM_FSM(x_fsm_net_boot, void_arg(p->a));
+  }
+  if (p->a && p->a->body.c_t == add_node_type) {
+    IFDBG(D_NONE, FN; STRLIT("Got add_node from client"); SYCEXP(p->synode););
+    IFDBG(D_NONE, FN; COPY_AND_FREE_GOUT(dbg_list(&p->a->body.app_u_u.nodes)););
+    IFDBG(D_NONE, STRLIT("handle_client_msg "); NDBG(p->a->group_id, x));
+    assert(get_site_def());
+  }
+  if (p->a && p->a->body.c_t == remove_node_type) {
+    IFDBG(D_NONE, FN; STRLIT("Got remove_node from client");
+          SYCEXP(p->synode););
+    IFDBG(D_NONE, FN; COPY_AND_FREE_GOUT(dbg_list(&p->a->body.app_u_u.nodes)););
+    IFDBG(D_NONE, STRLIT("handle_client_msg "); NDBG(p->a->group_id, x));
+    assert(get_site_def());
+  }
+  if (p->a && p->a->body.c_t == set_event_horizon_type) {
+    IFDBG(D_NONE, FN; STRLIT("Got set_event_horizon from client");
+          SYCEXP(p->synode););
+    IFDBG(D_NONE, FN; NDBG(p->a->body.app_u_u.event_horizon, u));
+    IFDBG(D_NONE, STRLIT("handle_client_msg "); NDBG(p->a->group_id, x));
+    assert(get_site_def());
+  }
+  if (p->a && p->a->body.c_t == force_config_type) {
+    IFDBG(D_NONE, FN; STRLIT("Got new force config from client");
+          SYCEXP(p->synode););
+    IFDBG(D_NONE, FN; COPY_AND_FREE_GOUT(dbg_list(&p->a->body.app_u_u.nodes)););
+    IFDBG(D_NONE, STRLIT("handle_client_msg "); NDBG(p->a->group_id, x));
+    assert(get_site_def());
+    XCOM_FSM(x_fsm_force_config, void_arg(p->a));
+  }
+  if (p->a && p->a->body.c_t == set_max_leaders) {
+    IFDBG(D_NONE, FN; STRLIT("Got set_max_leaders from client");
+          SYCEXP(p->synode););
+    IFDBG(D_NONE, FN; NDBG(p->a->body.app_u_u.max_leaders, u));
+    IFDBG(D_NONE, STRLIT("handle_client_msg "); NDBG(p->a->group_id, x));
+    assert(get_site_def());
+  }
+  if (p->a && p->a->body.c_t == set_leaders_type) {
+    IFDBG(D_NONE, FN; STRLIT("Got set_leaders_type from client");
+          SYCEXP(p->synode););
+    IFDBG(D_NONE, STRLIT("handle_client_msg "); NDBG(p->a->group_id, x));
+    assert(get_site_def());
+  }
+  handle_client_msg(p);
+}
+
+static void process_prepare_op(site_def const *site, pax_msg *p,
+                               linkage *reply_queue) {
+  pax_machine *pm = get_cache(p->synode);
+  assert(pm);
+  if (p->force_delivery) pm->force_delivery = 1;
+  IFDBG(D_NONE, FN; dbg_pax_msg(p));
+
+  /*
+   We can only be a productive Paxos Acceptor if we have been booted, i.e.
+   added to the group and received an up-to-date snapshot from some member.
+
+   We do not allow non-booted members to participate in Paxos because they
+   might be a reincarnation of a member that crashed and was then brought up
+   without having gone through the remove+add node path.
+   Since the pre-crash incarnation may have accepted a value for a given
+   synod but the post-crash incarnation has forgotten that fact, the
+   post-crash incarnation will fail to propagate the previously accepted
+   value to a higher ballot. Since majorities can overlap on a single node,
+   if the overlap node is the post-crash incarnation which has forgotten
+   about the previously accepted value, the higher ballot proposer may get
+   a different value accepted, leading to conflicting values to be accepted
+   for different proposers, which is a violation of the safety requirements
+   of the Paxos protocol.
+  */
+  if (ALWAYS_HANDLE_CONSENSUS || client_boot_done) {
+    paxos_fsm(pm, site, paxos_prepare, p);
+    handle_prepare(site, pm, reply_queue, p);
+  }
+}
+
+static inline int abort_processing(pax_msg *p) {
+  /* Ensure that forced message can be processed */
+  return (!p->force_delivery && too_far(p->synode)) || !is_cached(p->synode);
+}
+
+static void process_ack_prepare_op(site_def const *site, pax_msg *p,
+                                   linkage *reply_queue) {
+  (void)reply_queue;
+  if (abort_processing(p))
+    return;
+  else {
+    pax_machine *pm = get_cache(p->synode);
+    if (p->force_delivery) pm->force_delivery = 1;
+    if (!pm->proposer.msg) return;
+    assert(pm && pm->proposer.msg);
+    handle_ack_prepare(site, pm, p);
+    paxos_fsm(pm, site, paxos_ack_prepare, p);
+  }
+}
+
+static void process_accept_op(site_def const *site, pax_msg *p,
+                              linkage *reply_queue) {
+  pax_machine *pm = get_cache(p->synode);
+  assert(pm);
+  if (p->force_delivery) pm->force_delivery = 1;
+  IFDBG(D_NONE, FN; dbg_pax_msg(p));
+
+  /*
+   We can only be a productive Paxos Acceptor if we have been booted, i.e.
+   added to the group and received an up-to-date snapshot from some member.
+
+   We do not allow non-booted members to participate in Paxos because they
+   might be a reincarnation of a member that crashed and was then brought up
+   without having gone through the remove+add node path.
+   Since the pre-crash incarnation may have accepted a value for a given
+   synod but the post-crash incarnation has forgotten that fact, the
+   post-crash incarnation will fail to propagate the previously accepted
+   value to a higher ballot. Since majorities can overlap on a single node,
+   if the overlap node is the post-crash incarnation which has forgotten
+   about the previously accepted value, the higher ballot proposer may get
+   a different value accepted, leading to conflicting values to be accepted
+   for different proposers, which is a violation of the safety requirements
+   of the Paxos protocol.
+  */
+  if (ALWAYS_HANDLE_CONSENSUS || client_boot_done) {
+    handle_alive(site, reply_queue, p);
+
+    paxos_fsm(pm, site, paxos_accept, p);
+    handle_accept(site, pm, reply_queue, p);
+  }
+}
+
+static void process_ack_accept_op(site_def const *site, pax_msg *p,
+                                  linkage *reply_queue) {
+  (void)reply_queue;
+  if (too_far(p->synode))
+    return;
+  else {
+    pax_machine *pm = get_cache(p->synode);
+    if (p->force_delivery) pm->force_delivery = 1;
+    if (!pm->proposer.msg) return;
+    assert(pm && pm->proposer.msg);
+    handle_ack_accept(site, pm, p);
+    paxos_fsm(pm, site, paxos_ack_accept, p);
+  }
+}
+
+static void process_learn_op(site_def const *site, pax_msg *p,
+                             linkage *reply_queue) {
+  pax_machine *pm = get_cache(p->synode);
+  assert(pm);
+  (void)reply_queue;
+  if (p->force_delivery) pm->force_delivery = 1;
+  update_max_synode(p);
+  paxos_fsm(pm, site, paxos_learn, p);
+  handle_learn(site, pm, p);
+}
+
+static void process_recover_learn_op(site_def const *site, pax_msg *p,
+                                     linkage *reply_queue) {
+  pax_machine *pm = get_cache(p->synode);
+  assert(pm);
+  (void)reply_queue;
+  IFDBG(D_NONE, FN; STRLIT("recover_learn_op receive "); SYCEXP(p->synode));
+  if (p->force_delivery) pm->force_delivery = 1;
+  update_max_synode(p);
+  {
+    IFDBG(D_NONE, FN; STRLIT("recover_learn_op learn "); SYCEXP(p->synode));
+    p->op = learn_op;
+    paxos_fsm(pm, site, paxos_learn, p);
+    handle_learn(site, pm, p);
+  }
+}
+
+static void process_skip_op(site_def const *site, pax_msg *p,
+                            linkage *reply_queue) {
+  (void)reply_queue;
+  pax_machine *pm = get_cache(p->synode);
+  assert(pm);
+  if (p->force_delivery) pm->force_delivery = 1;
+  paxos_fsm(pm, site, paxos_learn, p);
+  handle_skip(site, pm, p);
+}
+
+static void process_i_am_alive_op(site_def const *site, pax_msg *p,
+                                  linkage *reply_queue) {
+  /* Update max_synode, but use only p->max_synode, ignore p->synode */
+  if (!is_dead_site(p->group_id)) {
+    if (max_synode.group_id == p->synode.group_id &&
+        synode_gt(p->max_synode, max_synode)) {
+      set_max_synode(p->max_synode);
+    }
+  }
+  handle_alive(site, reply_queue, p);
+}
+
+static void process_are_you_alive_op(site_def const *site, pax_msg *p,
+                                     linkage *reply_queue) {
+  handle_alive(site, reply_queue, p);
+}
+
+static void process_need_boot_op(site_def const *site, pax_msg *p,
+                                 linkage *reply_queue) {
+  /* purecov: begin deadcode */
+  /* Only in run state. Test state and do it here because we need to use
+   * reply queue */
+  if (can_send_snapshot() &&
+      !synode_eq(get_site_def()->boot_key, null_synode)) {
+    handle_boot(site, reply_queue, p);
+  }
+  /* Wake senders waiting to connect, since new node has appeared */
+  wakeup_sender();
+  /* purecov: end */
+}
+
+static void process_die_op(site_def const *site, pax_msg *p,
+                           linkage *reply_queue) {
+  (void)reply_queue;
+  /* assert("die horribly" == "need coredump"); */
+  {
+    GET_GOUT;
+    FN;
+    STRLIT("die_op ");
+    SYCEXP(executed_msg);
+    SYCEXP(delivered_msg);
+    SYCEXP(p->synode);
+    SYCEXP(p->delivered_msg);
+    SYCEXP(p->max_synode);
+    PRINT_GOUT;
+    FREE_GOUT;
+  }
+  /*
+  If the message with the number in  the  incoming  die_op  message
+  already  has  been  executed  (delivered),  then it means that we
+  actually got consensus on it, since otherwise we would  not  have
+  delivered it.Such a situation could arise if one of the nodes has
+  expelled the message from its cache, but others have not. So when
+  sending  out  a  request, we might get two different answers, one
+  indicating that we are too far behind  and  should  restart,  and
+  another  with  the  actual  consensus value. If the value arrives
+  first, we will deliver it, and then the die_op may arrive  later.
+  But  it this case it does not matter, since we got what we needed
+  anyway. It is only a partial guard against exiting without really
+  needing  it  of course, since the die_op may arrive first, and we
+  do not wait for a die_op from all the other nodes.  We  could  do
+  that  with  some extra housekeeping in the pax_machine (a new bit
+  vector), but I am not convinced that it is worth the effort.
+  */
+  if (!synode_lt(p->synode, executed_msg)) {
+    ADD_DBG(D_FSM, add_event(EVENT_DUMP_PAD, string_arg("terminating"));)
+    g_critical("Node %u is unable to get message {%x %" PRIu64
+               " %u}, since the group is too far "
+               "ahead. Node will now exit.",
+               get_nodeno(site), SY_MEM(p->synode));
+    terminate_and_exit();
+  }
+}
+
+static void process_read_op(site_def const *site, pax_msg *p,
+                            linkage *reply_queue) {
+  pax_machine *pm = get_cache(p->synode);
+  assert(pm);
+
+  handle_read(site, pm, reply_queue, p);
+}
+
+static void process_gcs_snapshot_op(site_def const *site, pax_msg *p,
+                                    linkage *reply_queue) {
+  (void)site;
+  (void)reply_queue;
+  /* Avoid duplicate snapshots and snapshots from zombies */
+  IFDBG(D_BASE, FN; SYCEXP(executed_msg););
+  IFDBG(D_BASE, FN; SYCEXP(start_config););
+  if (!synode_eq(start_config, get_highest_boot_key(p->gcs_snap)) &&
+      !is_dead_site(p->group_id)) {
+    update_max_synode(p);
+    /* For incoming messages, note delivery of snapshot from sender node */
+    note_snapshot(p->from);
+    XCOM_FSM(x_fsm_snapshot, void_arg(p->gcs_snap));
+  }
+}
+
+static void process_tiny_learn_op(site_def const *site, pax_msg *p,
+                                  linkage *reply_queue) {
+  if (p->msg_type == no_op) {
+    process_learn_op(site, p, reply_queue);
+  } else {
+    pax_machine *pm = get_cache(p->synode);
+    assert(pm);
+    if (p->force_delivery) pm->force_delivery = 1;
+    handle_tiny_learn(site, pm, p);
+  }
+}
+
+/* If this node is leader, grant a synode number for use by secondary.
+ Send reply as synode_allocated. */
+static void process_synode_request(site_def const *site, pax_msg *p,
+                                   linkage *reply_queue) {
+  (void)site;
+
+  /* Find a free slot */
+  assert(!synode_eq(current_message, null_synode));
+  IFDBG(D_CONS, FN; SYCEXP(executed_msg); SYCEXP(current_message));
+  site_def *tmp_site = find_site_def_rw(current_message);
+  /* See if we can do anything with this message */
+  if (tmp_site && get_nodeno(tmp_site) != VOID_NODE_NO && is_leader(tmp_site)) {
+    /* Send reply with msgno */
+    synode_no msgno = local_synode_allocator(current_message);
+    /* Ensure that reply is sane. Note that we only allocate `msgno` *if* next
+       synod is still within the event horizon. This effectively means that
+       the leader always reserves at least one synod to himself, the last
+       synod of the event horizon. The point is to ensure that the leader does
+       not allocate all the possible synods to a non-leader that then doesn't
+       act on them, e.g. by crashing. The last synod of the event horizon will
+       always be up for grabs either by the leader, or if the leader is
+       suspected, by some non-leader that will self-allocate that synod to
+       himself. */
+    if (!(too_far(incr_msgno(msgno)) ||
+          ignore_message(msgno, find_site_def_rw(msgno),
+                         "process_synode_request"))) {
+      // We will grab this number, advance current_message
+      set_current_message(incr_synode(msgno));
+      IFDBG(D_CONS, FN; STRLIT("sending reply "); SYCEXP(executed_msg);
+            SYCEXP(current_message); SYCEXP(msgno));
+      CREATE_REPLY(p);
+      reply->synode = msgno;
+      reply->op = synode_allocated;
+      IFDBG(D_CONS, FN; SYCEXP(msgno));
+      SEND_REPLY;
+    } else {
+      IFDBG(D_CONS, FN; STRLIT("not sending reply "); SYCEXP(executed_msg);
+            SYCEXP(msgno));
+    }
+  } else {
+    IFDBG(D_CONS, FN; STRLIT("not leader ");
+          if (tmp_site) SYCEXP(tmp_site->start));
+  }
+}
+
+/* If this node is secondary, add synode to set of available synodes */
+static void process_synode_allocated(site_def const *site, pax_msg *p,
+                                     linkage *reply_queue) {
+  (void)site;
+  (void)p;
+  (void)reply_queue;
+
+  IFDBG(D_BASE, FN; SYCEXP(p->synode));
+  synode_number_pool.put(p->synode, synode_allocation_type::remote);
+}
+
+static msg_handler dispatch_table[LAST_OP] = {process_client_msg,
+                                              NULL,
+                                              process_prepare_op,
+                                              process_ack_prepare_op,
+                                              process_ack_prepare_op,
+                                              process_accept_op,
+                                              process_ack_accept_op,
+                                              process_learn_op,
+                                              process_recover_learn_op,
+                                              NULL,
+                                              NULL,
+                                              NULL,
+                                              NULL,
+                                              NULL,
+                                              process_skip_op,
+                                              process_i_am_alive_op,
+                                              process_are_you_alive_op,
+                                              process_need_boot_op,
+                                              NULL,
+                                              process_die_op,
+                                              process_read_op,
+                                              process_gcs_snapshot_op,
+                                              NULL,
+                                              process_tiny_learn_op,
+                                              process_synode_request,
+                                              process_synode_allocated};
+
+static msg_handler *clone_dispatch_table(msg_handler const *proto) {
+  msg_handler *clone =
+      static_cast<msg_handler *>(xcom_calloc(1, sizeof(dispatch_table)));
+  if (clone)
+    memcpy(clone, proto, sizeof(dispatch_table));
+  else
+    oom_abort = 1;
+  return clone;
+}
+
+static msg_handler *primary_dispatch_table() {
+  msg_handler *clone = clone_dispatch_table(dispatch_table);
+  return clone;
+}
 
-  if (p->force_delivery) {
-    /* Ensure that forced message can be processed */
-    in_front = 0;
+static msg_handler *secondary_dispatch_table() {
+  msg_handler *clone = clone_dispatch_table(dispatch_table);
+  if (clone) {
+    clone[synode_request] = NULL;
   }
+  return clone;
+}
+
+pax_msg *dispatch_op(site_def const *site, pax_msg *p, linkage *reply_queue) {
+  site_def *dsite = find_site_def_rw(p->synode);
 
   if (dsite && p->op != client_msg && is_server_connected(dsite, p->from)) {
     /* Wake up the detector task if this node was previously marked as
@@ -4690,353 +6322,27 @@
     update_delivered(dsite, p->from, p->delivered_msg);
   }
 
-  IFDBG(D_NONE, FN; STRLIT("incoming message ");
+  IFDBG(D_BASE, FN; STRLIT("incoming message ");
         COPY_AND_FREE_GOUT(dbg_pax_msg(p)););
-  ADD_DBG(D_NONE, add_synode_event(p->synode);
+  ADD_DBG(D_DISPATCH, add_synode_event(p->synode);
           add_event(EVENT_DUMP_PAD, string_arg("p->from"));
           add_event(EVENT_DUMP_PAD, uint_arg(p->from));
-          add_event(EVENT_DUMP_PAD, string_arg("in_front"));
-          add_event(EVENT_DUMP_PAD, int_arg(in_front));
+          add_event(EVENT_DUMP_PAD, string_arg("too_far(p->synode)"));
+          add_event(EVENT_DUMP_PAD, int_arg(too_far(p->synode)));
           add_event(EVENT_DUMP_PAD, string_arg(pax_op_to_str(p->op))););
 
-  switch (p->op) {
-    case client_msg:
-      clicnt++;
-      if (p->a && (p->a->body.c_t == exit_type)) {
-        /* purecov: begin deadcode */
-        IFDBG(D_NONE, FN; STRLIT("Got exit from client"); SYCEXP(p->synode););
-        bury_site(get_group_id(get_site_def()));
-        ADD_DBG(D_FSM, add_event(EVENT_DUMP_PAD, string_arg("terminating"));)
-        terminate_and_exit();
-        break;
-        /* purecov: end */
-      }
-      if (p->a && (p->a->body.c_t == reset_type)) {
-        /* purecov: begin deadcode */
-        IFDBG(D_NONE, FN; STRLIT("Got reset from client"); SYCEXP(p->synode););
-        bury_site(get_group_id(get_site_def()));
-        ADD_DBG(D_FSM, add_event(EVENT_DUMP_PAD, string_arg("terminating"));)
-        XCOM_FSM(x_fsm_terminate, int_arg(0));
-        break;
-        /* purecov: end */
-      }
-      if (p->a && (p->a->body.c_t == remove_reset_type)) {
-        /* purecov: begin deadcode */
-        IFDBG(D_NONE, FN; STRLIT("Got remove_reset from client");
-              SYCEXP(p->synode););
-        ADD_DBG(D_FSM, add_event(EVENT_DUMP_PAD, string_arg("terminating"));)
-        XCOM_FSM(x_fsm_terminate, int_arg(0));
-        break;
-        /* purecov: end */
-      }
-      if (p->a && (p->a->body.c_t == enable_arbitrator)) {
-        CREATE_REPLY(p);
-        IFDBG(D_NONE, FN; STRLIT("Got enable_arbitrator from client");
-              SYCEXP(p->synode););
-        ARBITRATOR_HACK = 1;
-        reply->op = xcom_client_reply;
-        reply->cli_err = REQUEST_OK;
-        SEND_REPLY;
-        break;
-      }
-      if (p->a && (p->a->body.c_t == disable_arbitrator)) {
-        CREATE_REPLY(p);
-        IFDBG(D_NONE, FN; STRLIT("Got disable_arbitrator from client");
-              SYCEXP(p->synode););
-        ARBITRATOR_HACK = 0;
-        reply->op = xcom_client_reply;
-        reply->cli_err = REQUEST_OK;
-        SEND_REPLY;
-        break;
-      }
-      if (p->a && (p->a->body.c_t == set_cache_limit)) {
-        CREATE_REPLY(p);
-        IFDBG(D_NONE, FN; STRLIT("Got set_cache_limit from client");
-              SYCEXP(p->synode););
-        if (the_app_xcom_cfg) {
-          set_max_cache_size(p->a->body.app_u_u.cache_limit);
-          reply->cli_err = REQUEST_OK;
-        } else {
-          reply->cli_err = REQUEST_FAIL;
-        }
-        reply->op = xcom_client_reply;
-        SEND_REPLY;
-        break;
-      }
-      if (p->a && (p->a->body.c_t == x_terminate_and_exit)) {
-        /* purecov: begin deadcode */
-        CREATE_REPLY(p);
-        IFDBG(D_NONE, FN; STRLIT("Got terminate_and_exit from client");
-              SYCEXP(p->synode););
-        reply->op = xcom_client_reply;
-        reply->cli_err = REQUEST_OK;
-        SEND_REPLY;
-        /*
-          The function frees sites which is used by SEND_REPLY,
-          so it should be called after SEND_REPLY.
-        */
-        IFDBG(D_NONE, FN; STRLIT("terminate_and_exit"));
-        ADD_DBG(D_FSM, add_event(EVENT_DUMP_PAD, string_arg("terminating"));)
-        terminate_and_exit();
-        break;
-        /* purecov: end */
-      }
-      if (p->a && (p->a->body.c_t == get_event_horizon_type)) {
-        dispatch_get_event_horizon(site, p, reply_queue);
-        break;
-      }
-      if (p->a && (p->a->body.c_t == get_synode_app_data_type)) {
-        dispatch_get_synode_app_data(site, p, reply_queue);
-        break;
-      }
-      if (p->a && (p->a->body.c_t == add_node_type ||
-                   p->a->body.c_t == remove_node_type ||
-                   p->a->body.c_t == force_config_type ||
-                   p->a->body.c_t == set_event_horizon_type)) {
-        client_reply_code cli_err;
-        CREATE_REPLY(p);
-        reply->op = xcom_client_reply;
-        reply->cli_err = cli_err = can_execute_cfgchange(p);
-        SEND_REPLY;
-        if (cli_err != REQUEST_OK) {
-          break;
-        }
-      }
-      if (p->a && p->a->body.c_t == unified_boot_type) {
-        IFDBG(D_NONE, FN; STRLIT("Got unified_boot from client");
-              SYCEXP(p->synode););
-        IFDBG(D_NONE, FN;
-              COPY_AND_FREE_GOUT(dbg_list(&p->a->body.app_u_u.nodes)););
-        IFDBG(D_NONE, STRLIT("handle_client_msg "); NDBG(p->a->group_id, x));
-        XCOM_FSM(x_fsm_net_boot, void_arg(p->a));
-      }
-      if (p->a && p->a->body.c_t == add_node_type) {
-        IFDBG(D_NONE, FN; STRLIT("Got add_node from client");
-              SYCEXP(p->synode););
-        IFDBG(D_NONE, FN;
-              COPY_AND_FREE_GOUT(dbg_list(&p->a->body.app_u_u.nodes)););
-        IFDBG(D_NONE, STRLIT("handle_client_msg "); NDBG(p->a->group_id, x));
-        assert(get_site_def());
-      }
-      if (p->a && p->a->body.c_t == remove_node_type) {
-        IFDBG(D_NONE, FN; STRLIT("Got remove_node from client");
-              SYCEXP(p->synode););
-        IFDBG(D_NONE, FN;
-              COPY_AND_FREE_GOUT(dbg_list(&p->a->body.app_u_u.nodes)););
-        IFDBG(D_NONE, STRLIT("handle_client_msg "); NDBG(p->a->group_id, x));
-        assert(get_site_def());
-      }
-      if (p->a && p->a->body.c_t == set_event_horizon_type) {
-        IFDBG(D_NONE, FN; STRLIT("Got set_event_horizon from client");
-              SYCEXP(p->synode););
-        IFDBG(D_NONE, FN; NDBG(p->a->body.app_u_u.event_horizon, u));
-        IFDBG(D_NONE, STRLIT("handle_client_msg "); NDBG(p->a->group_id, x));
-        assert(get_site_def());
-      }
-      if (p->a && p->a->body.c_t == force_config_type) {
-        IFDBG(D_NONE, FN; STRLIT("Got new force config from client");
-              SYCEXP(p->synode););
-        IFDBG(D_NONE, FN;
-              COPY_AND_FREE_GOUT(dbg_list(&p->a->body.app_u_u.nodes)););
-        IFDBG(D_NONE, STRLIT("handle_client_msg "); NDBG(p->a->group_id, x));
-        assert(get_site_def());
-        XCOM_FSM(x_fsm_force_config, void_arg(p->a));
-      }
-      handle_client_msg(p);
-      break;
-    case initial_op:
-      break;
-    case read_op:
-      pm = get_cache(p->synode);
-      assert(pm);
-
-      handle_read(site, pm, reply_queue, p);
-      break;
-    case prepare_op:
-      pm = get_cache(p->synode);
-      assert(pm);
-      if (p->force_delivery) pm->force_delivery = 1;
-      IFDBG(D_NONE, FN; dbg_pax_msg(p));
-
-      /*
-       We can only be a productive Paxos Acceptor if we have been booted, i.e.
-       added to the group and received an up-to-date snapshot from some member.
-
-       We do not allow non-booted members to participate in Paxos because they
-       might be a reincarnation of a member that crashed and was then brought up
-       without having gone through the remove+add node path.
-       Since the pre-crash incarnation may have accepted a value for a given
-       synod but the post-crash incarnation has forgotten that fact, the
-       post-crash incarnation will fail to propagate the previously accepted
-       value to a higher ballot. Since majorities can overlap on a single node,
-       if the overlap node is the post-crash incarnation which has forgotten
-       about the previously accepted value, the higher ballot proposer may get
-       a different value accepted, leading to conflicting values to be accepted
-       for different proposers, which is a violation of the safety requirements
-       of the Paxos protocol.
-      */
-      if (ALWAYS_HANDLE_CONSENSUS || client_boot_done) {
-        handle_prepare(site, pm, reply_queue, p);
-      }
-      break;
-    case ack_prepare_op:
-    case ack_prepare_empty_op:
-      if (in_front || !is_cached(p->synode)) break;
-      pm = get_cache(p->synode);
-      if (p->force_delivery) pm->force_delivery = 1;
-      if (!pm->proposer.msg) break;
-      assert(pm && pm->proposer.msg);
-      handle_ack_prepare(site, pm, p);
-      break;
-    case accept_op:
-      pm = get_cache(p->synode);
-      assert(pm);
-      if (p->force_delivery) pm->force_delivery = 1;
-      IFDBG(D_NONE, FN; dbg_pax_msg(p));
-
-      /*
-       We can only be a productive Paxos Acceptor if we have been booted, i.e.
-       added to the group and received an up-to-date snapshot from some member.
-
-       We do not allow non-booted members to participate in Paxos because they
-       might be a reincarnation of a member that crashed and was then brought up
-       without having gone through the remove+add node path.
-       Since the pre-crash incarnation may have accepted a value for a given
-       synod but the post-crash incarnation has forgotten that fact, the
-       post-crash incarnation will fail to propagate the previously accepted
-       value to a higher ballot. Since majorities can overlap on a single node,
-       if the overlap node is the post-crash incarnation which has forgotten
-       about the previously accepted value, the higher ballot proposer may get
-       a different value accepted, leading to conflicting values to be accepted
-       for different proposers, which is a violation of the safety requirements
-       of the Paxos protocol.
-      */
-      if (ALWAYS_HANDLE_CONSENSUS || client_boot_done) {
-        handle_alive(site, reply_queue, p);
-
-        handle_accept(site, pm, reply_queue, p);
-      }
-      break;
-    case ack_accept_op:
-      if (in_front || !is_cached(p->synode)) break;
-      pm = get_cache(p->synode);
-      if (p->force_delivery) pm->force_delivery = 1;
-      if (!pm->proposer.msg) break;
-      assert(pm && pm->proposer.msg);
-      handle_ack_accept(site, pm, p);
-      break;
-    case recover_learn_op:
-      IFDBG(D_NONE, FN; STRLIT("recover_learn_op receive "); SYCEXP(p->synode));
-      pm = get_cache(p->synode);
-      assert(pm);
-      if (p->force_delivery) pm->force_delivery = 1;
-      update_max_synode(p);
-      {
-        IFDBG(D_NONE, FN; STRLIT("recover_learn_op learn "); SYCEXP(p->synode));
-        p->op = learn_op;
-        handle_learn(site, pm, p);
-      }
-      break;
-    case learn_op:
-    learnop:
-      pm = get_cache(p->synode);
-      assert(pm);
-      if (p->force_delivery) pm->force_delivery = 1;
-      update_max_synode(p);
-      handle_learn(site, pm, p);
-      break;
-    case tiny_learn_op:
-      if (p->msg_type == no_op) goto learnop;
-      pm = get_cache(p->synode);
-      assert(pm);
-      if (p->force_delivery) pm->force_delivery = 1;
-      handle_tiny_learn(site, pm, p);
-      break;
-    case skip_op:
-      pm = get_cache(p->synode);
-      assert(pm);
-      if (p->force_delivery) pm->force_delivery = 1;
-      handle_skip(site, pm, p);
-      break;
-    case i_am_alive_op:
-      /* Update max_synode, but use only p->max_synode, ignore p->synode */
-      if (!is_dead_site(p->group_id)) {
-        if (max_synode.group_id == p->synode.group_id &&
-            synode_gt(p->max_synode, max_synode)) {
-          set_max_synode(p->max_synode);
-        }
-      }
-      handle_alive(site, reply_queue, p);
-      break;
-    case are_you_alive_op:
-      handle_alive(site, reply_queue, p);
-      break;
-    case need_boot_op:
-      /* purecov: begin deadcode */
-      /* Only in run state. Test state and do it here because we need to use
-       * reply queue */
-      if (can_send_snapshot() &&
-          !synode_eq(get_site_def()->boot_key, null_synode)) {
-        handle_boot(site, reply_queue, p);
-      }
-      /* Wake senders waiting to connect, since new node has appeared */
-      wakeup_sender();
-      break;
-    /* purecov: end */
-    case gcs_snapshot_op:
-      /* Avoid duplicate snapshots and snapshots from zombies */
-      IFDBG(D_BUG, FN; SYCEXP(executed_msg););
-      IFDBG(D_BUG, FN; SYCEXP(start_config););
-      if (!synode_eq(start_config, get_highest_boot_key(p->gcs_snap)) &&
-          !is_dead_site(p->group_id)) {
-        update_max_synode(p);
-        /* For incoming messages, note delivery of snapshot from sender node */
-        note_snapshot(p->from);
-        XCOM_FSM(x_fsm_snapshot, void_arg(p->gcs_snap));
-      }
-      break;
-    case die_op:
-      /* assert("die horribly" == "need coredump"); */
-      {
-        GET_GOUT;
-        FN;
-        STRLIT("die_op ");
-        SYCEXP(executed_msg);
-        SYCEXP(delivered_msg);
-        SYCEXP(p->synode);
-        SYCEXP(p->delivered_msg);
-        SYCEXP(p->max_synode);
-        PRINT_GOUT;
-        FREE_GOUT;
-      }
-      /*
-      If the message with the number in  the  incoming  die_op  message
-      already  has  been  executed  (delivered),  then it means that we
-      actually got consensus on it, since otherwise we would  not  have
-      delivered it.Such a situation could arise if one of the nodes has
-      expelled the message from its cache, but others have not. So when
-      sending  out  a  request, we might get two different answers, one
-      indicating that we are too far behind  and  should  restart,  and
-      another  with  the  actual  consensus value. If the value arrives
-      first, we will deliver it, and then the die_op may arrive  later.
-      But  it this case it does not matter, since we got what we needed
-      anyway. It is only a partial guard against exiting without really
-      needing  it  of course, since the die_op may arrive first, and we
-      do not wait for a die_op from all the other nodes.  We  could  do
-      that  with  some extra housekeeping in the pax_machine (a new bit
-      vector), but I am not convinced that it is worth the effort.
-      */
-      if (!synode_lt(p->synode, executed_msg)) {
-        ADD_DBG(D_FSM, add_event(EVENT_DUMP_PAD, string_arg("terminating"));)
-        g_critical("Node %u is unable to get message {%x %" PRIu64
-                   " %u}, since the group is too far "
-                   "ahead. Node will now exit.",
-                   get_nodeno(site), SY_MEM(p->synode));
-        terminate_and_exit();
-      }
-    default:
-      break;
+  if (p->op >= 0 && p->op < LAST_OP) {
+    if (site && site->dispatch_table) { /* Use site-specific dispatch if any */
+      if (site->dispatch_table[p->op])
+        site->dispatch_table[p->op](site, p, reply_queue);
+    } else {
+      if (dispatch_table[p->op]) dispatch_table[p->op](site, p, reply_queue);
+    }
+  } else {
+    G_WARNING("No possible handler for message %d %s", p->op,
+              pax_op_to_str(p->op));
   }
+
   if (oom_abort) {
     g_critical("Node %u has run out of memory and will now exit.",
                get_nodeno(site));
@@ -5051,14 +6357,14 @@
   msg->from = ep->p->to;                    \
   msg->delivered_msg = get_delivered_msg(); \
   msg->max_synode = get_max_synode();       \
-  serialize_msg(msg, ep->rfd.x_proto, &ep->buflen, &ep->buf);
+  serialize_msg(msg, ep->rfd->x_proto, &ep->buflen, &ep->buf);
 
 #define WRITE_REPLY                                                    \
   if (ep->buflen) {                                                    \
     int64_t sent;                                                      \
     IFDBG(D_TRANSPORT, FN; STRLIT("task_write "); NDBG(ep->rfd.fd, d); \
           NDBG(ep->buflen, u));                                        \
-    TASK_CALL(task_write(&ep->rfd, ep->buf, ep->buflen, &sent));       \
+    TASK_CALL(task_write(ep->rfd, ep->buf, ep->buflen, &sent));        \
     send_count[ep->p->op]++;                                           \
     send_bytes[ep->p->op] += ep->buflen;                               \
     X_FREE(ep->buf);                                                   \
@@ -5121,7 +6427,7 @@
 
 int acceptor_learner_task(task_arg arg) {
   DECL_ENV
-  connection_descriptor rfd;
+  connection_descriptor *rfd;
   srv_buf *in_buf;
 
   pax_msg *p;
@@ -5134,14 +6440,12 @@
   int behind;
   END_ENV;
 
+  int64_t n{0};
+  pax_machine *pm{nullptr};
   TASK_BEGIN
 
-  ep->in_buf = (srv_buf *)calloc(1, sizeof(srv_buf));
-
-  ep->rfd.fd = get_int_arg(arg);
-#ifndef XCOM_WITHOUT_OPENSSL
-  ep->rfd.ssl_fd = 0;
-#endif
+  ep->rfd = (connection_descriptor *)get_void_arg(arg);
+  ep->in_buf = (srv_buf *)xcom_calloc(1, sizeof(srv_buf));
   ep->p = NULL;
   ep->buflen = 0;
   ep->buf = NULL;
@@ -5150,63 +6454,25 @@
   ep->behind = FALSE;
 
   /* We have a connection, make socket non-blocking and wait for request */
-  unblock_fd(ep->rfd.fd);
-  set_nodelay(ep->rfd.fd);
-  wait_io(stack, ep->rfd.fd, 'r');
+  unblock_fd(ep->rfd->fd);
+  set_nodelay(ep->rfd->fd);
+  wait_io(stack, ep->rfd->fd, 'r');
   TASK_YIELD;
 
-#ifndef XCOM_WITHOUT_OPENSSL
-  if (xcom_use_ssl()) {
-    ep->rfd.ssl_fd = SSL_new(server_ctx);
-    SSL_set_fd(ep->rfd.ssl_fd, ep->rfd.fd);
-
-    {
-      int ret_ssl;
-      int err;
-      ERR_clear_error();
-      ret_ssl = SSL_accept(ep->rfd.ssl_fd);
-      err = SSL_get_error(ep->rfd.ssl_fd, ret_ssl);
-
-      while (ret_ssl != SSL_SUCCESS) {
-        if (err == SSL_ERROR_WANT_READ) {
-          wait_io(stack, ep->rfd.fd, 'r');
-        } else if (err == SSL_ERROR_WANT_WRITE) {
-          wait_io(stack, ep->rfd.fd, 'w');
-        } else { /* Some other error, give up */
-          break;
-        }
-        TASK_YIELD;
-        SET_OS_ERR(0);
-        G_DEBUG("acceptor learner accept retry fd %d", ep->rfd.fd);
-        ERR_clear_error();
-        ret_ssl = SSL_accept(ep->rfd.ssl_fd);
-        err = SSL_get_error(ep->rfd.ssl_fd, ret_ssl);
-      }
-
-      if (ret_ssl != SSL_SUCCESS) {
-        ssl_free_con(&ep->rfd);
-        close_connection(&ep->rfd);
-        TERMINATE;
-      }
-    }
-
-  } else {
-    ep->rfd.ssl_fd = 0;
-  }
-#endif
-  set_connected(&ep->rfd, CON_FD);
+  set_connected(ep->rfd, CON_FD);
   link_init(&ep->reply_queue, TYPE_HASH("msg_link"));
 
 again:
   while (!xcom_shutdown) {
-    int64_t n;
     ep->site = 0;
     unchecked_replace_pax_msg(&ep->p, pax_msg_new_0(null_synode));
 
     if (use_buffered_read) {
-      TASK_CALL(buffered_read_msg(&ep->rfd, ep->in_buf, ep->p, ep->srv, &n));
+      TASK_CALL(buffered_read_msg(ep->rfd, ep->in_buf, ep->p, ep->srv, &n));
     } else {
-      TASK_CALL(read_msg(&ep->rfd, ep->p, ep->srv, &n));
+      /* purecov: begin deadcode */
+      TASK_CALL(read_msg(ep->rfd, ep->p, ep->srv, &n));
+      /* purecov: end */
     }
     ADD_DBG(D_NONE, add_synode_event(ep->p->synode);
             add_event(EVENT_DUMP_PAD, string_arg("ep->p->from"));
@@ -5214,7 +6480,7 @@
             add_event(EVENT_DUMP_PAD, string_arg(pax_op_to_str(ep->p->op))););
 
     if (ep->srv && !ep->srv->invalid && ((int)ep->p->op != (int)client_msg) &&
-        is_connected(&ep->srv->con))
+        is_connected(ep->srv->con))
       server_detected(ep->srv);
 
     if (((int)ep->p->op < (int)client_msg || ep->p->op > LAST_OP)) {
@@ -5227,18 +6493,21 @@
     if (n <= 0) {
       break;
     }
-    ep->site = find_site_def(ep->p->synode);
+    if (ep->p->op != client_msg) {  // Clients have no site
+      ep->site = find_site_def(ep->p->synode);
+    }
 
     /* Handle this connection on a local_server task instead of this
        acceptor_learner_task task. */
+    /* purecov: begin deadcode */
     if (ep->p->op == client_msg && ep->p->a &&
         ep->p->a->body.c_t == convert_into_local_server_type) {
       if (local_server_is_setup()) {
         /* Launch local_server task to handle this connection. */
         {
-          connection_descriptor *con =
-              (connection_descriptor *)malloc(sizeof(connection_descriptor));
-          *con = ep->rfd;
+          connection_descriptor *con = (connection_descriptor *)xcom_malloc(
+              sizeof(connection_descriptor));
+          *con = *ep->rfd;
           task_new(local_server, void_arg(con), "local_server",
                    XCOM_THREAD_DEBUG);
         }
@@ -5259,11 +6528,12 @@
       if (local_server_is_setup()) {
         /* Relinquish ownership of the connection. It is now onwed by the
            launched local_server task. */
-        reset_connection(&ep->rfd);
+        reset_connection(ep->rfd);
       }
       /* Terminate this task. */
       TERMINATE;
     }
+    /* purecov: end */
 
     /*
       Getting a pointer to the server needs to be done after we have
@@ -5326,14 +6596,15 @@
         }
       }
       /* Reject any message that might compromise the integrity of a consensus
-       * instance. We do this by not processing any message which may change the
+       * instance. We do this by not processing any message which may change
+       * the
        * outcome if the consensus instance has been evicted from the cache */
       if (harmless(ep->p) ||          /* Harmless message */
           is_cached(ep->p->synode) || /* Already in cache */
-          (!ep->behind)) { /* Guard against cache pollution from other nodes */
+          (!ep->behind)) { /* Guard against cache pollution from other nodes
+                            */
 
         if (should_poll_cache(ep->p->op)) {
-          pax_machine *pm;
           TASK_CALL(wait_for_cache(&pm, ep->p->synode, 10));
           if (!pm) continue; /* Could not get a machine, discarding message. */
         }
@@ -5397,7 +6668,8 @@
   if (ep->reply_queue.suc && !link_empty(&ep->reply_queue))
     empty_msg_list(&ep->reply_queue);
   unchecked_replace_pax_msg(&ep->p, NULL);
-  shutdown_connection(&ep->rfd);
+  shutdown_connection(ep->rfd);
+  free(ep->rfd);
   IFDBG(D_NONE, FN; NDBG(xcom_shutdown, d));
   if (ep->buf) X_FREE(ep->buf);
   free(ep->in_buf);
@@ -5422,6 +6694,7 @@
   double dtime;
   END_ENV;
 
+  int64_t n{0};
   TASK_BEGIN
 
   ep->dtime = INITIAL_CONNECT_WAIT; /* Initial wait is short, to avoid
@@ -5431,30 +6704,29 @@
   ep->reply = NULL;
 
   while (!xcom_shutdown) {
-    while (!is_connected(&ep->s->con)) {
+    while (!is_connected(ep->s->con)) {
       IFDBG(D_NONE, FN; STRLIT("waiting for connection"));
       TASK_DELAY(ep->dtime);
       if (xcom_shutdown) {
         TERMINATE;
       }
-      ep->dtime *= CONNECT_WAIT_INCREASE; /* Increase wait time for next try */
+      ep->dtime += CONNECT_WAIT_INCREASE; /* Increase wait time for next try */
       if (ep->dtime > MAX_CONNECT_WAIT) {
         ep->dtime = MAX_CONNECT_WAIT;
       }
     }
     ep->dtime = INITIAL_CONNECT_WAIT;
     {
-      int64_t n;
       unchecked_replace_pax_msg(&ep->reply, pax_msg_new_0(null_synode));
 
       ADD_DBG(D_NONE, add_event(EVENT_DUMP_PAD, string_arg("ep->s->con.fd"));
               add_event(EVENT_DUMP_PAD, int_arg(ep->s->con.fd)););
-      TASK_CALL(read_msg(&ep->s->con, ep->reply, ep->s, &n));
+      TASK_CALL(read_msg(ep->s->con, ep->reply, ep->s, &n));
       ADD_DBG(D_NONE, add_event(EVENT_DUMP_PAD, string_arg("ep->s->con.fd"));
               add_event(EVENT_DUMP_PAD, int_arg(ep->s->con.fd)););
       ep->reply->refcnt = 1; /* Refcnt from other end is void here */
       if (n <= 0) {
-        shutdown_connection(&ep->s->con);
+        shutdown_connection(ep->s->con);
         continue;
       }
       receive_bytes[ep->reply->op] += (uint64_t)n + MSG_HDR_SIZE;
@@ -5469,7 +6741,8 @@
             add_event(EVENT_DUMP_PAD, string_arg(pax_op_to_str(ep->reply->op)));
             add_event(EVENT_DUMP_PAD, string_arg("get_site_def()->boot_key"));
             add_synode_event(get_site_def()->boot_key););
-    /* Special test for need_snapshot, since node and site may not be consistent
+    /* Special test for need_snapshot, since node and site may not be
+     * consistent
      */
     if (ep->reply->op == need_boot_op &&
         !synode_eq(get_site_def()->boot_key, null_synode)) {
@@ -5486,7 +6759,8 @@
         ep->s->invalid = 1;
       }
     } else {
-      /* We only handle messages from this connection if the server is valid. */
+      /* We only handle messages from this connection if the server is valid.
+       */
       if (ep->s->invalid == 0)
         dispatch_op(find_site_def(ep->reply->synode), ep->reply, NULL);
     }
@@ -5496,7 +6770,7 @@
   FINALLY
   replace_pax_msg(&ep->reply, NULL);
 
-  shutdown_connection(&ep->s->con);
+  shutdown_connection(ep->s->con);
   ep->s->reply_handler = NULL;
   IFDBG(D_BUG, FN; STRLIT(" shutdown "); NDBG(ep->s->con.fd, d);
         NDBG(task_now(), f));
@@ -5506,7 +6780,7 @@
 }
 
 /* purecov: begin deadcode */
-static inline void xcom_sleep(unsigned int seconds) {
+void xcom_sleep(unsigned int seconds) {
 #if defined(_WIN32)
   Sleep((DWORD)seconds * 1000); /* windows sleep takes milliseconds */
 #else
@@ -5522,6 +6796,11 @@
  * As there is no gethostid() on win, we use seconds since epoch instead,
  * so it might fail if you try simultaneous create sites at the same second.
  */
+
+#ifndef _WIN32
+#include <sys/utsname.h>
+#endif
+
 long xcom_unique_long(void) {
 #if defined(_WIN32)
   __time64_t ltime;
@@ -5529,7 +6808,10 @@
   _time64(&ltime);
   return (long)(ltime ^ GetCurrentProcessId());
 #else
-  return gethostid() ^ getpid();
+  struct utsname buf;
+  uname(&buf);
+  long id = (long)fnv_hash((unsigned char *)&buf, sizeof(buf), 0);
+  return id ^ getpid();
 #endif
 }
 
@@ -5551,13 +6833,21 @@
   return a;
 }
 
-app_data_ptr init_get_event_horizon_msg(app_data *a, uint32_t group_id) {
+app_data_ptr init_get_msg(app_data *a, uint32_t group_id, cargo_type const t) {
   init_app_data(a);
   a->app_key.group_id = a->group_id = group_id;
-  a->body.c_t = get_event_horizon_type;
+  a->body.c_t = t;
   return a;
 }
 
+app_data_ptr init_get_leaders_msg(app_data *a, uint32_t group_id) {
+  return init_get_msg(a, group_id, get_leaders_type);
+}
+
+app_data_ptr init_get_event_horizon_msg(app_data *a, uint32_t group_id) {
+  return init_get_msg(a, group_id, get_event_horizon_type);
+}
+
 app_data_ptr init_app_msg(app_data *a, char *payload, u_int payload_size) {
   init_app_data(a);
   a->body.c_t = app_type;
@@ -5566,17 +6856,9 @@
   return a;
 }
 
-app_data_ptr init_terminate_command(app_data *a) {
-  init_app_data(a);
-  a->body.c_t = x_terminate_and_exit;
-  return a;
-}
-
 static app_data_ptr init_get_synode_app_data_msg(
     app_data *a, uint32_t group_id, synode_no_array *const synodes) {
-  init_app_data(a);
-  a->app_key.group_id = a->group_id = group_id;
-  a->body.c_t = get_synode_app_data_type;
+  init_get_msg(a, group_id, get_synode_app_data_type);
   /* Move synodes (as in C++ move semantics) into a->body.app_u_u.synodes. */
   synode_array_move(&a->body.app_u_u.synodes, synodes);
   return a;
@@ -5680,8 +6962,8 @@
           SYCEXP(gs->log_end));
 
     /* Set starting point of log to match the snapshot */
-    /* If we have a valid synode from application snapshot, see if it should be
-     * used */
+    /* If we have a valid synode from application snapshot, see if it should
+     * be used */
     if (!synode_eq(null_synode, app_lsn)) {
       /* If log_start is null_synode, always use valid synode from application
        * snapshot */
@@ -5752,7 +7034,7 @@
   XCOM_FSM(x_fsm_timeout, double_arg(ep->t));
   FINALLY
   if (stack == x_timer) set_task(&x_timer, NULL);
-  IFDBG(D_BUG, FN; STRLIT(" timeout "));
+  IFDBG(D_CONS, FN; STRLIT(" timeout "));
   TASK_END;
 }
 
@@ -5784,15 +7066,15 @@
   arg;
   XCOM_FSM(x_fsm_complete, null_arg);
   FINALLY
-  IFDBG(D_BUG, FN; STRLIT(" delivered "));
+  IFDBG(D_FSM, FN; STRLIT(" delivered "));
   TASK_END;
 }
 /* purecov: end */
 
 /* Send x_fsm_complete to xcom FSM in the context of the xcom thread. The
  * calling thread and the xcom thread must be in a rendezvous. Using a task to
- * deliver a message is an abstraction inversion, but it's the simplest solution
- * until we get a proper queue-based communication system going. */
+ * deliver a message is an abstraction inversion, but it's the simplest
+ * solution until we get a proper queue-based communication system going. */
 /* purecov: begin deadcode */
 void send_x_fsm_complete() {
   task_new(x_fsm_completion_task, null_arg, "x_fsm_completion_task",
@@ -5867,11 +7149,12 @@
 static void handle_x_snapshot(gcs_snapshot *gcs) {
   import_config(gcs);
   if (get_nodeno(get_site_def()) == VOID_NODE_NO) {
-    IFDBG(D_BUG, FN; STRLIT("Not member of site, not executing log"));
+    IFDBG(D_BASE, FN; STRLIT("Not member of site, not executing log"));
     gcs->log_end =
         gcs->log_start; /* Avoid executing log if not member of site */
   }
-  handle_app_snap_cb(&gcs->app_snap, gcs->log_start, gcs->log_end);
+  if (handle_app_snap_cb)
+    handle_app_snap_cb(&gcs->app_snap, gcs->log_start, gcs->log_end);
   set_max_synode(gcs->log_end);
   set_executed_msg(incr_synode(gcs->log_start));
   log_start_max = gcs->log_start;
@@ -5977,6 +7260,7 @@
   push_dbg(D_FSM);
   IFDBG(D_NONE, FN; STRLIT("state x_start"););
   empty_prop_input_queue();
+  empty_synode_number_pool();
   reset_snapshot_mask();
   set_last_received_config(null_synode);
 
@@ -5990,10 +7274,16 @@
   install_node_group(a);
   if (is_member(get_site_def())) {
     empty_prop_input_queue();
+    empty_synode_number_pool();
     {
       synode_no start = get_site_def()->start;
       if (start.msgno == 0) { /* May happen during initial boot */
-        start.msgno = 1;
+        start.msgno = 1;      /* Start with first xcom message */
+        /* If msgno is 0, it means that this node installed a unified_boot
+        which came from the client, thus this node is the one that will send
+        the unified_boot on xcom, so set the node number of start accordingly
+      */
+        start.node = get_nodeno(get_site_def());
       }
       set_executed_msg(start);
     }
@@ -6007,6 +7297,7 @@
 static int handle_fsm_snapshot(task_arg fsmargs, xcom_fsm_state *ctxt) {
   gcs_snapshot *gcs = (gcs_snapshot *)get_void_arg(fsmargs);
   empty_prop_input_queue();
+  empty_synode_number_pool();
   set_log_end(gcs);
   handle_x_snapshot(gcs);
 
@@ -6033,6 +7324,7 @@
 /* purecov: begin deadcode */
 static int handle_fsm_snapshot_wait(xcom_fsm_state *ctxt) {
   empty_prop_input_queue();
+  empty_synode_number_pool();
   start_x_timer(SNAPSHOT_WAIT_TIME);
   pop_dbg();
   SET_X_FSM_STATE(xcom_fsm_snapshot_wait_enter);
@@ -6153,8 +7445,8 @@
 static int xcom_fsm_snapshot_wait(xcom_actions action, task_arg fsmargs,
                                   xcom_fsm_state *ctxt) {
   switch (action) {
-      /* If we get x_fsm_local_snapshot, we are called from the recovery
-       * manager thread */
+    /* If we get x_fsm_local_snapshot, we are called from the recovery
+     * manager thread */
     case x_fsm_local_snapshot:
       return handle_local_snapshot(fsmargs, ctxt);
 
@@ -6322,8 +7614,8 @@
   return 0;
 }
 
-/* Trampoline which loops calling thunks pointed to by ctxt.state_fp until 0 is
- * returned. Return pointer to ctxt. */
+/* Trampoline which loops calling thunks pointed to by ctxt.state_fp until 0
+ * is returned. Return pointer to ctxt. */
 xcom_fsm_state *xcom_fsm_impl(xcom_actions action, task_arg fsmargs) {
   static xcom_fsm_state ctxt = X_FSM_STATE(xcom_fsm_init);
 
@@ -6367,30 +7659,6 @@
 void set_app_snap_getter(app_snap_getter x) { get_app_snap_cb = x; }
 /* purecov: end */
 
-static result checked_create_socket(int domain, int type, int protocol) {
-  result retval = {0, 0};
-  int nr_attempts = 1005;
-
-  do {
-    SET_OS_ERR(0);
-    retval.val = (int)socket(domain, type, protocol);
-    retval.funerr = to_errno(GET_OS_ERR);
-    if (nr_attempts % 10 == 0) xcom_sleep(1);
-  } while (--nr_attempts && retval.val == -1 &&
-           (from_errno(retval.funerr) == SOCK_EAGAIN));
-
-  if (retval.val == -1) {
-    task_dump_err(retval.funerr);
-#if defined(_WIN32)
-    G_MESSAGE("Socket creation failed with error %d.", retval.funerr);
-#else
-    G_MESSAGE("Socket creation failed with error %d - %s.", retval.funerr,
-              strerror(retval.funerr));
-#endif
-  }
-  return retval;
-}
-
 /* Read max n bytes from socket fd into buffer buf */
 static result socket_read(connection_descriptor *rfd, void *buf, int n) {
   result ret = {0, 0};
@@ -6422,420 +7690,53 @@
     nread = socket_read(rfd, bytes, r);
     if (nread.val == 0) {
       return 0;
-    } else if (nread.val < 0) {
-      return -1;
-    } else {
-      bytes += nread.val;
-      left -= (uint32_t)nread.val;
-    }
-  }
-  assert(left == 0);
-  return n;
-}
-
-/* Write n bytes from buffer buf to socket fd */
-static int64_t socket_write(connection_descriptor *wfd, void *_buf,
-                            uint32_t n) {
-  char *buf = (char *)_buf;
-  result ret = {0, 0};
-
-  uint32_t total; /* Keeps track of number of bytes written so far */
-
-  total = 0;
-  while (total < n) {
-    int w = (int)MIN(n - total, INT_MAX);
-
-    while ((ret = con_write(wfd, buf + total, w)).val < 0 &&
-           can_retry_write(ret.funerr)) {
-      task_dump_err(ret.funerr);
-      IFDBG(D_NONE, FN; STRLIT("retry "); NEXP(total, d); NEXP(n, d));
-    }
-    if (ret.val <= 0) { /* Something went wrong */
-      task_dump_err(ret.funerr);
-      return -1;
-    } else {
-      total += (uint32_t)ret.val; /* Add number of bytes written to total */
-    }
-  }
-  IFDBG(D_TRANSPORT, FN; NEXP(total, u); NEXP(n, u));
-  assert(total == n);
-  return (total);
-}
-
-static inline result xcom_close_socket(int *sock) {
-  result res = {0, 0};
-  if (*sock != -1) {
-    IFDBG(D_FILEOP, FN; STRLIT("closing socket "); NDBG(*sock, d));
-    do {
-      SET_OS_ERR(0);
-      res.val = CLOSESOCKET(*sock);
-      res.funerr = to_errno(GET_OS_ERR);
-    } while (res.val == -1 && from_errno(res.funerr) == SOCK_EINTR);
-    *sock = -1;
-  }
-  return res;
-}
-
-static inline result xcom_shut_close_socket(int *sock) {
-  result res = {0, 0};
-  if (*sock >= 0) {
-    shutdown_socket(sock);
-    res = xcom_close_socket(sock);
-  }
-  return res;
-}
-
-#define CONNECT_FAIL \
-  ret_fd = -1;       \
-  goto end
-
-/*
-
-*/
-
-/**
-  @brief Retreives a node IPv4 address, if it exists.
-
-  If a node is v4 reachable, means one of two:
-  - The raw address is V4
-  - a name was resolved to a V4/V6 address
-
-  If the later is the case, we are going to prefer the first v4
-  address in the list, since it is the common language between
-  old and new version. If you want exclusive V6, please configure your
-  DNS server to serve V6 names
-
-  @param retrieved a previously retrieved struct addrinfo
-  @return struct addrinfo* An addrinfo of the first IPv4 address. Else it will
-                           return the entry parameter.
- */
-struct addrinfo *does_node_have_v4_address(struct addrinfo *retrieved) {
-  struct addrinfo *cycle = NULL;
-
-  int v4_reachable = is_node_v4_reachable_with_info(retrieved);
-
-  if (v4_reachable) {
-    cycle = retrieved;
-    while (cycle) {
-      if (cycle->ai_family == AF_INET) {
-        return cycle;
-      }
-      cycle = cycle->ai_next;
-    }
-  }
-
-  /* If something goes really wrong... we fallback to avoid crashes */
-  return retrieved;
-}
-
-static int timed_connect_msec(int fd, struct sockaddr *sock_addr,
-                              socklen_t sock_size, int timeout) {
-  int ret_fd = fd;
-  int syserr;
-  int sysret;
-  struct pollfd fds;
-
-  fds.fd = fd;
-  fds.events = POLLOUT;
-  fds.revents = 0;
-
-  /* Set non-blocking */
-  if (unblock_fd(fd) < 0) return -1;
-
-  /* Trying to connect with timeout */
-  SET_OS_ERR(0);
-  sysret = connect(fd, sock_addr, sock_size);
-
-  if (is_socket_error(sysret)) {
-    syserr = GET_OS_ERR;
-    /* If the error is SOCK_EWOULDBLOCK or SOCK_EINPROGRESS or SOCK_EALREADY,
-     * wait. */
-    switch (syserr) {
-      case SOCK_EWOULDBLOCK:
-      case SOCK_EINPROGRESS:
-      case SOCK_EALREADY:
-        break;
-      default:
-        G_DEBUG(
-            "connect - Error connecting "
-            "(socket=%d, error=%d).",
-            fd, GET_OS_ERR);
-        CONNECT_FAIL;
-    }
-
-    SET_OS_ERR(0);
-    IFDBG(D_TRANSPORT, FN; STRLIT("poll - Starting. "); NEXP(timeout, d);
-          NEXP(sysret, d));
-    while ((sysret = poll(&fds, 1, timeout)) < 0) {
-      syserr = GET_OS_ERR;
-      if (syserr != SOCK_EINTR && syserr != SOCK_EINPROGRESS) break;
-      SET_OS_ERR(0);
-    }
-    IFDBG(D_TRANSPORT, FN; STRLIT("poll - Finished. "); NEXP(timeout, d);
-          NEXP(sysret, d));
-
-    if (sysret == 0) {
-      G_DEBUG(
-          "Timed out while waiting for connection to be established! "
-          "Cancelling connection attempt. (socket= %d, error=%d)",
-          fd, sysret);
-      /* G_WARNING("poll - Timeout! Cancelling connection..."); */
-      CONNECT_FAIL;
-    }
-
-    if (is_socket_error(sysret)) {
-      G_DEBUG(
-          "poll - Error while connecting! "
-          "(socket= %d, error=%d)",
-          fd, GET_OS_ERR);
-      CONNECT_FAIL;
-    }
-
-    {
-      int socket_errno = 0;
-      socklen_t socket_errno_len = sizeof(socket_errno);
-
-      if ((fds.revents & POLLOUT) == 0) {
-        IFDBG(D_NONE, FN; STRLIT("POLLOUT not set - Socket failure!"););
-        ret_fd = -1;
-      }
-
-      if (fds.revents & (POLLERR | POLLHUP | POLLNVAL)) {
-        IFDBG(D_NONE, FN;
-              STRLIT("POLLERR | POLLHUP | POLLNVAL set - Socket failure!"););
-        ret_fd = -1;
-      }
-      if (getsockopt(fd, SOL_SOCKET, SO_ERROR, (xcom_buf *)&socket_errno,
-                     &socket_errno_len) != 0) {
-        G_DEBUG("getsockopt socket %d failed.", fd);
-        ret_fd = -1;
-      } else {
-        if (socket_errno != 0) {
-          G_DEBUG("Connection to socket %d failed with error %d.", fd,
-                  socket_errno);
-          ret_fd = -1;
-        }
-      }
-    }
-  }
-
-end:
-  /* Set blocking */
-  SET_OS_ERR(0);
-  if (block_fd(fd) < 0) {
-    G_DEBUG(
-        "Unable to set socket back to blocking state. "
-        "(socket=%d, error=%d).",
-        fd, GET_OS_ERR);
-    return -1;
-  }
-  return ret_fd;
-}
-
-static int timed_connect(int fd, struct sockaddr *sock_addr,
-                         socklen_t sock_size) {
-  return timed_connect_msec(fd, sock_addr, sock_size, 10000);
-}
-
-/* purecov: begin deadcode */
-int timed_connect_sec(int fd, struct sockaddr *sock_addr, socklen_t sock_size,
-                      int timeout) {
-  return timed_connect_msec(fd, sock_addr, sock_size, timeout * 1000);
-}
-/* purecov: end */
-
-/* Connect to server on given port */
-#ifndef XCOM_WITHOUT_OPENSSL
-static connection_descriptor *connect_xcom(char const *server, xcom_port port,
-                                           int use_ssl) {
-#else
-static connection_descriptor *connect_xcom(char const *server, xcom_port port) {
-#endif
-  result fd = {0, 0};
-  result ret = {0, 0};
-  connection_descriptor *cd = NULL;
-  char buf[SYS_STRERROR_SIZE];
-
-  IFDBG(D_NONE, FN; STREXP(server); NEXP(port, d));
-  G_DEBUG("connecting to %s %d", server, port);
-
-  {
-    struct addrinfo *addr = NULL, *from_ns = NULL;
-
-    char buffer[20];
-    sprintf(buffer, "%d", port);
-
-    checked_getaddrinfo(server, buffer, 0, &from_ns);
-
-    if (from_ns == NULL) {
-      /* purecov: begin inspected */
-      G_ERROR("Error retrieving server information.");
-      goto end;
-      /* purecov: end */
-    }
-
-    addr = does_node_have_v4_address(from_ns);
-
-    /* Create socket after knowing the family that we are dealing with
-       getaddrinfo returns a list of possible addresses. We will alays default
-       to the first one in the list, which is V4 if applicable.
-     */
-    if ((fd = checked_create_socket(addr->ai_family, SOCK_STREAM, IPPROTO_TCP))
-            .val < 0) {
-      /* purecov: begin inspected */
-      G_ERROR(
-          "Error creating socket in local GR->GCS connection to address %s.",
-          server);
-      goto end;
-      /* purecov: end */
-    }
-
-    /* Connect socket to address */
-
-    SET_OS_ERR(0);
-
-    if (timed_connect(fd.val, addr->ai_addr, (socklen_t)addr->ai_addrlen) ==
-        -1) {
-      fd.funerr = to_errno(GET_OS_ERR);
-      G_DEBUG(
-          "Connecting socket to address %s in port %d failed with error %d - "
-          "%s.",
-          server, port, fd.funerr, strerr_msg(buf, sizeof(buf), fd.funerr));
-      xcom_close_socket(&fd.val);
-      goto end;
-    }
-    {
-      int peer = 0;
-      /* Sanity check before return */
-      SET_OS_ERR(0);
-      {
-        socklen_t ai_addrlen = (socklen_t)addr->ai_addrlen;
-        ret.val = peer = xcom_getpeername(fd.val, addr->ai_addr, &ai_addrlen);
-      }
-      ret.funerr = to_errno(GET_OS_ERR);
-      if (peer >= 0) {
-        ret = set_nodelay(fd.val);
-        if (ret.val < 0) {
-          /* purecov: begin inspected */
-          task_dump_err(ret.funerr);
-          xcom_shut_close_socket(&fd.val);
-#if defined(_WIN32)
-          G_DEBUG(
-              "Setting node delay failed  while connecting to %s with error "
-              "%d.",
-              server, ret.funerr);
-#else
-          G_DEBUG(
-              "Setting node delay failed  while connecting to %s with error %d "
-              "- "
-              "%s.",
-              server, ret.funerr, strerror(ret.funerr));
-#endif
-          goto end;
-          /* purecov: end */
-        }
-        G_DEBUG("client connected to %s %d fd %d", server, port, fd.val);
-      } else {
-        /* Something is wrong */
-        /* purecov: begin inspected */
-        socklen_t errlen = sizeof(ret.funerr);
-        IFDBG(D_NONE, FN; STRLIT("xcom_getpeername failed"););
-        if (ret.funerr) {
-          IFDBG(D_NONE, FN; NEXP(from_errno(ret.funerr), d);
-                STRLIT(strerror(from_errno(ret.funerr))));
-        }
-        getsockopt(fd.val, SOL_SOCKET, SO_ERROR, (xcom_buf *)&ret.funerr,
-                   &errlen);
-        if (ret.funerr == 0) {
-          ret.funerr = to_errno(SOCK_ECONNREFUSED);
-        }
-        xcom_shut_close_socket(&fd.val);
-#if defined(_WIN32)
-        G_DEBUG(
-            "Getting the peer name failed while connecting to server %s with "
-            "error %d.",
-            server, ret.funerr);
-#else
-        G_DEBUG(
-            "Getting the peer name failed while connecting to server %s with "
-            "error %d -%s.",
-            server, ret.funerr, strerror(ret.funerr));
-#endif
-        goto end;
-        /* purecov: end */
-      }
-
-#ifndef XCOM_WITHOUT_OPENSSL
-      if (use_ssl && xcom_use_ssl()) {
-        SSL *ssl = SSL_new(client_ctx);
-        G_DEBUG("Trying to connect using SSL.")
-        SSL_set_fd(ssl, fd.val);
-
-        ERR_clear_error();
-        ret.val = SSL_connect(ssl);
-        ret.funerr = to_ssl_err(SSL_get_error(ssl, ret.val));
-
-        if (ret.val != SSL_SUCCESS) {
-          /* purecov: begin inspected */
-          G_MESSAGE("Error connecting using SSL %d %d.", ret.funerr,
-                    SSL_get_error(ssl, ret.val));
-          task_dump_err(ret.funerr);
-          SSL_shutdown(ssl);
-          SSL_free(ssl);
-          xcom_shut_close_socket(&fd.val);
-
-          goto end;
-          /* purecov: end */
-        }
-        IFDBG(D_NONE, FN; STRLIT("ssl connected to "); STRLIT(server);
-              NDBG(port, d); NDBG(fd.val, d); PTREXP(ssl));
-
-        if (ssl_verify_server_cert(ssl, server)) {
-          /* purecov: begin inspected */
-          G_MESSAGE("Error validating certificate and peer.");
-          task_dump_err(ret.funerr);
-          SSL_shutdown(ssl);
-          SSL_free(ssl);
-          xcom_shut_close_socket(&fd.val);
-
-          goto end;
-          /* purecov: end */
-        }
+    } else if (nread.val < 0) {
+      return -1;
+    } else {
+      bytes += nread.val;
+      left -= (uint32_t)nread.val;
+    }
+  }
+  assert(left == 0);
+  return n;
+}
 
-        cd = new_connection(fd.val, ssl);
-        set_connected(cd, CON_FD);
-        G_DEBUG("Success connecting using SSL.")
+/* Write n bytes from buffer buf to socket fd */
+static int64_t socket_write(connection_descriptor *wfd, void *_buf, uint32_t n,
+                            connnection_write_method write_function) {
+  char *buf = (char *)_buf;
+  result ret = {0, 0};
 
-        goto end;
-      } else {
-        cd = new_connection(fd.val, 0);
-        set_connected(cd, CON_FD);
+  uint32_t total; /* Keeps track of number of bytes written so far */
 
-        goto end;
-      }
-#else
-      {
-        cd = new_connection(fd.val);
-        set_connected(cd, CON_FD);
+  total = 0;
+  while (total < n) {
+    int w = (int)MIN(n - total, INT_MAX);
 
-        goto end;
-      }
-#endif
+    while ((ret = write_function(wfd, buf + total, w)).val < 0 &&
+           can_retry_write(ret.funerr)) {
+      task_dump_err(ret.funerr);
+      IFDBG(D_NONE, FN; STRLIT("retry "); NEXP(total, d); NEXP(n, d));
+    }
+    if (ret.val <= 0) { /* Something went wrong */
+      task_dump_err(ret.funerr);
+      return -1;
+    } else {
+      total += (uint32_t)ret.val; /* Add number of bytes written to total */
     }
-
-  end:
-    if (from_ns) freeaddrinfo(from_ns);
   }
-  return cd;
+  IFDBG(D_TRANSPORT, FN; NEXP(total, u); NEXP(n, u));
+  assert(total == n);
+  return (total);
 }
 
+#define CONNECT_FAIL \
+  ret_fd = -1;       \
+  goto end
+
 connection_descriptor *xcom_open_client_connection(char const *server,
                                                    xcom_port port) {
-#ifndef XCOM_WITHOUT_OPENSSL
-  return connect_xcom(server, port, TRUE);
-#else
-  return connect_xcom(server, port);
-#endif
+  return open_new_connection(server, port);
 }
 
 /* Send a protocol negotiation message on connection con */
@@ -7021,8 +7922,8 @@
     /* This code will check if, in case of an upgrade if:
        - We are a node able to speak IPv6.
        - If we are connecting to a group that does not speak IPv6.
-       - If our address is IPv4-compatible in order for the old group to be able
-       to contact us back. */
+       - If our address is IPv4-compatible in order for the old group to be
+       able to contact us back. */
     if (is_cargo_type(a, add_node_type) && x_proto < minimum_ipv6_version() &&
         !are_we_allowed_to_upgrade_to_v6(a)) {
       retval = -1;
@@ -7061,9 +7962,11 @@
 /* purecov: begin tested */
 /*
  * Tested by TEST_F(XComMultinodeSmokeTest,
- * 3_nodes_member_crashes_with_dieop_and_joins_again_immediately) GCS smoke test
+ * 3_nodes_member_crashes_with_dieop_and_joins_again_immediately) GCS smoke
+ * test
  */
 int64_t xcom_client_send_die(connection_descriptor *fd) {
+  if (!fd) return 0;
   uint32_t buflen = 0;
   char *buf = 0;
   int64_t retval = 0;
@@ -7127,9 +8030,11 @@
 }
 /* purecov: end */
 
+#ifdef XCOM_STANDALONE
 /* purecov: begin deadcode */
 int64_t xcom_client_send_data(uint32_t size, char *data,
                               connection_descriptor *fd) {
+  if (!fd) return 0;
   app_data a;
   int64_t retval = 0;
   init_app_data(&a);
@@ -7140,7 +8045,21 @@
   xdr_free((xdrproc_t)xdr_app_data, (char *)&a);
   return retval;
 }
+
+int64_t xcom_client_send_data_no_free(uint32_t size, char *data,
+                                      connection_descriptor *fd) {
+  if (!fd) return 0;
+  app_data a;
+  int64_t retval = 0;
+  init_app_data(&a);
+  a.body.c_t = app_type;
+  a.body.app_u_u.data.data_len = size;
+  a.body.app_u_u.data.data_val = data;
+  retval = xcom_send_client_app_data(fd, &a, 0);
+  return retval;
+}
 /* purecov: end */
+#endif
 
 #ifndef _WIN32
 #include <arpa/inet.h>
@@ -7174,10 +8093,9 @@
       if (ok) {
         G_WARNING(
             "Detected incorrect xcom protocol version in connection from %s "
-            "indicates "
-            "missing cleanup of, or incorrect, xcom group definition on remote "
-            "host. Please upgrade the process running on %s to a compatible "
-            "version or stop it.",
+            "indicates  missing cleanup of, or incorrect, xcom group "
+            "definition on remote host. Please upgrade the process running on "
+            "%s to a compatible version or stop it.",
             buf, buf);
         protoversion_warning_time = task_now();
       }
@@ -7225,7 +8143,7 @@
   get_header_1_0(header_buf, &msgsize, &x_type, &tag);
 
   /* Allocate buffer space for message */
-  bytes = (char *)calloc(1, msgsize);
+  bytes = (char *)xcom_calloc(1, msgsize);
 
   /* Read message */
   n = socket_read_bytes(rfd, bytes, msgsize);
@@ -7244,23 +8162,11 @@
   return (p);
 }
 
-int xcom_close_client_connection(connection_descriptor *connection) {
-  int retval = 0;
-
-#ifndef XCOM_WITHOUT_OPENSSL
-  if (connection->ssl_fd) {
-    SSL_shutdown(connection->ssl_fd);
-    ssl_free_con(connection);
-  }
-#endif
-  retval = xcom_shut_close_socket(&connection->fd).val;
-  free(connection);
-  return retval;
-}
-
+#ifdef XCOM_STANDALONE
 /* purecov: begin deadcode */
 int xcom_client_boot(connection_descriptor *fd, node_list *nl,
                      uint32_t group_id) {
+  if (!fd) return 0;
   app_data a;
   int retval = 0;
   retval = (int)xcom_send_client_app_data(
@@ -7269,6 +8175,7 @@
   return retval;
 }
 /* purecov: end */
+#endif
 
 enum xcom_send_app_wait_result {
   SEND_REQUEST_FAILED = 0,
@@ -7276,7 +8183,8 @@
   REQUEST_BOTCHED,
   RETRIES_EXCEEDED,
   REQUEST_OK_RECEIVED,
-  REQUEST_FAIL_RECEIVED
+  REQUEST_FAIL_RECEIVED,
+  REQUEST_OK_REDIRECT
 };
 typedef enum xcom_send_app_wait_result xcom_send_app_wait_result;
 
@@ -7287,7 +8195,8 @@
  * i.e. xdr_free((xdrproc_t)xdr_pax_msg, (char *)p)
  */
 static xcom_send_app_wait_result xcom_send_app_wait_and_get(
-    connection_descriptor *fd, app_data *a, int force, pax_msg *p) {
+    connection_descriptor *fd, app_data *a, int force, pax_msg *p,
+    leader_info_data *leaders) {
   int retval = 0;
   int retry_count = 10; /* Same as 'connection_attempts' */
   pax_msg *rp = 0;
@@ -7295,7 +8204,9 @@
   do {
     retval = (int)xcom_send_client_app_data(fd, a, force);
     memset(p, 0, sizeof(*p)); /* before return so caller can free p */
-    if (retval < 0) return SEND_REQUEST_FAILED;
+    if (retval < 0) {
+      return SEND_REQUEST_FAILED;
+    }
     rp = socket_read_msg(fd, p);
     if (rp) {
       client_reply_code cli_err = rp->cli_err;
@@ -7303,14 +8214,18 @@
         case REQUEST_OK:
           return REQUEST_OK_RECEIVED;
         case REQUEST_FAIL:
-
-          G_DEBUG("cli_err %d", cli_err);
           return REQUEST_FAIL_RECEIVED;
         case REQUEST_RETRY:
-          G_DEBUG("cli_err %d", cli_err);
           if (retry_count > 1) xdr_free((xdrproc_t)xdr_pax_msg, (char *)p);
           xcom_sleep(1);
           break;
+        case REQUEST_REDIRECT:
+          G_DEBUG("cli_err %d", cli_err);
+          if (leaders && rp->rd && rp->rd->rt == leader_info) {
+            *leaders = steal_leader_info_data(rp->rd->reply_data_u.leaders);
+          }
+          xdr_free((xdrproc_t)xdr_pax_msg, (char *)p);
+          return REQUEST_OK_REDIRECT;
         default:
           G_WARNING("client protocol botched");
           return REQUEST_BOTCHED;
@@ -7326,16 +8241,20 @@
   return RETRIES_EXCEEDED;
 }
 
-int xcom_send_app_wait(connection_descriptor *fd, app_data *a, int force) {
+static int xcom_send_app_wait(connection_descriptor *fd, app_data *a, int force,
+                              leader_info_data *leaders) {
   pax_msg p;
   int result = 0;
-  xcom_send_app_wait_result res = xcom_send_app_wait_and_get(fd, a, force, &p);
+  memset(&p, 0, sizeof(p));
+  xcom_send_app_wait_result res =
+      xcom_send_app_wait_and_get(fd, a, force, &p, leaders);
   switch (res) {
     case SEND_REQUEST_FAILED:
     case RECEIVE_REQUEST_FAILED:
     case REQUEST_BOTCHED:
     case RETRIES_EXCEEDED:
     case REQUEST_FAIL_RECEIVED:
+    case REQUEST_OK_REDIRECT:
       result = 0;
       break;
     case REQUEST_OK_RECEIVED:
@@ -7352,13 +8271,14 @@
   int retval = 0;
   IFDBG(D_NONE, FN; COPY_AND_FREE_GOUT(dbg_list(nl)););
   retval = xcom_send_app_wait(fd, init_config_with_group(&a, nl, ct, group_id),
-                              force);
+                              force, 0);
   xdr_free((xdrproc_t)xdr_app_data, (char *)&a);
   return retval;
 }
 
 int xcom_client_add_node(connection_descriptor *fd, node_list *nl,
                          uint32_t group_id) {
+  if (!fd) return 0;
   u_int i;
   for (i = 0; i < nl->node_list_len; i++) {
     assert(nl->node_list_val[i].proto.max_proto > x_unknown_proto);
@@ -7368,31 +8288,30 @@
 
 int xcom_client_remove_node(connection_descriptor *fd, node_list *nl,
                             uint32_t group_id) {
+  if (!fd) return 0;
   return xcom_send_cfg_wait(fd, nl, group_id, remove_node_type, 0);
 }
 
+static int xcom_check_reply(int const res) {
+  return res == REQUEST_OK_RECEIVED;
+}
+
+#if 0
 /* purecov: begin deadcode */
 int xcom_client_get_event_horizon(connection_descriptor *fd, uint32_t group_id,
                                   xcom_event_horizon *event_horizon) {
+  if (!fd) return 0;
   pax_msg p;
   app_data a;
   int result = 0;
 
-  xcom_send_app_wait_result res = xcom_send_app_wait_and_get(
-      fd, init_get_event_horizon_msg(&a, group_id), 0, &p);
+  memset(&p, 0, sizeof(p));
 
-  switch (res) {
-    case RECEIVE_REQUEST_FAILED:
-    case REQUEST_BOTCHED:
-    case RETRIES_EXCEEDED:
-    case SEND_REQUEST_FAILED:
-    case REQUEST_FAIL_RECEIVED:
-      result = 0;
-      break;
-    case REQUEST_OK_RECEIVED:
-      *event_horizon = p.event_horizon;
-      result = 1;
-      break;
+  xcom_send_app_wait_result res = xcom_send_app_wait_and_get(
+      fd, init_get_event_horizon_msg(&a, group_id), 0, &p, 0);
+  result = xcom_check_reply(res);
+  if (result) {
+    *event_horizon = p.event_horizon;
   }
 
   xdr_free((xdrproc_t)xdr_pax_msg, (char *)&p);
@@ -7405,19 +8324,22 @@
 /* purecov: begin deadcode */
 int xcom_client_set_event_horizon(connection_descriptor *fd, uint32_t group_id,
                                   xcom_event_horizon event_horizon) {
+  if (!fd) return 0;
   app_data a;
   int retval = 0;
   retval = xcom_send_app_wait(
-      fd, init_set_event_horizon_msg(&a, group_id, event_horizon), 0);
+      fd, init_set_event_horizon_msg(&a, group_id, event_horizon), 0, 0);
   xdr_free((xdrproc_t)xdr_app_data, (char *)&a);
   return retval;
 }
 /* purecov: end */
+#endif
 
 int xcom_client_get_synode_app_data(connection_descriptor *const fd,
                                     uint32_t group_id,
                                     synode_no_array *const synodes,
                                     synode_app_data_array *const reply) {
+  if (!fd) return 0;
   bool_t const success = TRUE;
   bool_t const failure = FALSE;
   bool_t result = failure;
@@ -7429,13 +8351,15 @@
   init_get_synode_app_data_msg(&a, group_id, synodes);
 
   {
-    xcom_send_app_wait_result res = xcom_send_app_wait_and_get(fd, &a, 0, &p);
+    xcom_send_app_wait_result res =
+        xcom_send_app_wait_and_get(fd, &a, 0, &p, 0);
     switch (res) {
       case RECEIVE_REQUEST_FAILED:
       case REQUEST_BOTCHED:
       case RETRIES_EXCEEDED:
       case SEND_REQUEST_FAILED:
-      case REQUEST_FAIL_RECEIVED: {
+      case REQUEST_FAIL_RECEIVED:
+      case REQUEST_OK_REDIRECT: {
         G_TRACE(
             "xcom_client_get_synode_app_data: XCom did not have the required "
             "%u "
@@ -7447,7 +8371,8 @@
         u_int const nr_synodes_received =
             p.requested_synode_app_data.synode_app_data_array_len;
         G_TRACE(
-            "xcom_client_get_synode_app_data: Got %u synode payloads, we asked "
+            "xcom_client_get_synode_app_data: Got %u synode payloads, we "
+            "asked "
             "for %u.",
             nr_synodes_received, nr_synodes_requested);
 
@@ -7475,29 +8400,27 @@
    when received as a client message in dispatch_op.
    Should have separate opcode from normal add/remove,
    like force config_type */
-int xcom_client_force_add_node(connection_descriptor *, node_list *nl,
+int xcom_client_force_add_node(connection_descriptor *fd, node_list *nl,
                                uint32_t group_id) {
+  if (!fd) return 0;
   return xcom_send_cfg_wait(fd, nl, group_id, add_node_type, 1);
 }
 
-int xcom_client_force_remove_node(connection_descriptor *, node_list *nl,
+int xcom_client_force_remove_node(connection_descriptor *fd, node_list *nl,
                                   uint32_t group_id) {
+  if (!fd) return 0;
   return xcom_send_cfg_wait(fd, nl, group_id, remove_node_type, 1);
 }
 #endif
 
-int xcom_client_force_config(connection_descriptor *fd, node_list *nl,
-                             uint32_t group_id) {
-  return xcom_send_cfg_wait(fd, nl, group_id, force_config_type, 1);
-}
-
 /* purecov: begin deadcode */
 int xcom_client_enable_arbitrator(connection_descriptor *fd) {
+  if (!fd) return 0;
   app_data a;
   int retval = 0;
   init_app_data(&a);
   a.body.c_t = enable_arbitrator;
-  retval = xcom_send_app_wait(fd, &a, 0);
+  retval = xcom_send_app_wait(fd, &a, 0, 0);
   xdr_free((xdrproc_t)xdr_app_data, (char *)&a);
   return retval;
 }
@@ -7505,46 +8428,599 @@
 
 /* purecov: begin deadcode */
 int xcom_client_disable_arbitrator(connection_descriptor *fd) {
+  if (!fd) return 0;
   app_data a;
   int retval = 0;
   init_app_data(&a);
   a.body.c_t = disable_arbitrator;
-  retval = xcom_send_app_wait(fd, &a, 0);
+  retval = xcom_send_app_wait(fd, &a, 0, 0);
   xdr_free((xdrproc_t)xdr_app_data, (char *)&a);
   return retval;
 }
 /* purecov: end */
 
 /* purecov: begin deadcode */
-int xcom_client_terminate_and_exit(connection_descriptor *fd) {
+int xcom_client_set_cache_limit(connection_descriptor *fd,
+                                uint64_t cache_limit) {
+  if (!fd) return 0;
   app_data a;
   int retval = 0;
   init_app_data(&a);
-  a.body.c_t = x_terminate_and_exit;
-  retval = xcom_send_app_wait(fd, &a, 0);
+  a.body.c_t = set_cache_limit;
+  a.body.app_u_u.cache_limit = cache_limit;
+  retval = xcom_send_app_wait(fd, &a, 0, 0);
   xdr_free((xdrproc_t)xdr_app_data, (char *)&a);
   return retval;
 }
 /* purecov: end */
 
-/* purecov: begin deadcode */
-int xcom_client_set_cache_limit(connection_descriptor *fd,
-                                uint64_t cache_limit) {
+int xcom_client_convert_into_local_server(connection_descriptor *const fd) {
+  if (!fd) return 0;
   app_data a;
   int retval = 0;
-  init_app_data(&a);
-  a.body.c_t = set_cache_limit;
-  a.body.app_u_u.cache_limit = cache_limit;
-  retval = xcom_send_app_wait(fd, &a, 0);
+  retval = xcom_send_app_wait(fd, init_convert_into_local_server_msg(&a), 0, 0);
   xdr_free((xdrproc_t)xdr_app_data, (char *)&a);
   return retval;
 }
-/* purecov: end */
 
-int xcom_client_convert_into_local_server(connection_descriptor *const fd) {
+/* Set max number of leaders */
+void init_set_max_leaders(uint32_t group_id, app_data *a, node_no max_leaders) {
+  init_app_data(a);
+  a->app_key.group_id = a->group_id = group_id;
+  a->body.c_t = set_max_leaders;
+  a->body.app_u_u.max_leaders = max_leaders;
+}
+
+/* Set max number of leaders */
+int xcom_client_set_max_leaders(connection_descriptor *fd, node_no max_leaders,
+                                uint32_t group_id) {
+  if (!fd) return 0;
   app_data a;
   int retval = 0;
-  retval = xcom_send_app_wait(fd, init_convert_into_local_server_msg(&a), 0);
+  init_set_max_leaders(group_id, &a, max_leaders);
+  retval = xcom_send_app_wait(fd, &a, 0, 0);
+  xdr_free((xdrproc_t)xdr_app_data, (char *)&a);
+  return retval;
+}
+
+leader_array new_leader_array(u_int n, char const *names[]) {
+  leader_array leaders = alloc_leader_array(n);
+  for (u_int i = 0; i < n; i++) {
+    leaders.leader_array_val[i].address = strdup(names[i]);
+  }
+  return leaders;
+}
+
+/* Set new set of active leaders. Does not deallocate leaders. */
+void init_set_leaders(uint32_t group_id, app_data *a,
+                      leader_array const leaders) {
+  init_app_data(a);
+  a->app_key.group_id = a->group_id = group_id;
+  a->body.c_t = set_leaders_type;
+  // We could have avoided this copy, but having leaders as const
+  // makes it easier to reason about sharing
+  a->body.app_u_u.leaders = clone_leader_array(leaders);
+}
+
+/* Set new set of active leaders. */
+void init_set_leaders(uint32_t group_id, app_data *a, u_int n,
+                      char const *names[]) {
+  leader_array leaders = new_leader_array(n, names);
+  init_set_leaders(group_id, a, leaders);
+  // leaders have been copied, so deallocate
+  xdr_free((xdrproc_t)xdr_leader_array, (char *)(&leaders));
+}
+
+void init_set_leaders(uint32_t group_id, app_data *leader_app,
+                      leader_array const leaders, app_data *max_app,
+                      node_no max_leaders) {
+  init_set_leaders(group_id, leader_app, leaders);
+  init_set_max_leaders(group_id, max_app, max_leaders);
+  leader_app->next = max_app;
+}
+
+void init_set_leaders(uint32_t group_id, app_data *leader_app, u_int n,
+                      char const *names[], app_data *max_app,
+                      node_no max_leaders) {
+  leader_array leaders = new_leader_array(n, names);
+  init_set_leaders(group_id, leader_app, leaders, max_app, max_leaders);
+  // leaders have been copied, so deallocate
+  xdr_free((xdrproc_t)xdr_leader_array, (char *)(&leaders));
+}
+
+/* Set new set of active leaders. */
+int xcom_client_set_leaders(connection_descriptor *fd, u_int n,
+                            char const *names[], uint32_t group_id) {
+  if (!fd) return 0;
+  app_data a;
+  init_set_leaders(group_id, &a, n, names);
+  int retval = xcom_send_app_wait(fd, &a, 0, 0);
   xdr_free((xdrproc_t)xdr_app_data, (char *)&a);
   return retval;
 }
+
+std::unique_ptr<Network_provider_management_interface>
+get_network_management_interface() {
+  return std::make_unique<Network_Management_Interface>();
+}
+
+std::unique_ptr<Network_provider_operations_interface>
+get_network_operations_interface() {
+  return std::make_unique<Network_Management_Interface>();
+}
+
+/* Set new set of active leaders and number of leaders. */
+int xcom_client_set_leaders(connection_descriptor *fd, u_int n,
+                            char const *names[], node_no max_leaders,
+                            uint32_t group_id) {
+  if (!fd) return 0;
+  app_data leader_app;
+  app_data max_app;
+  int retval = 0;
+  init_set_leaders(group_id, &leader_app, n, names, &max_app, max_leaders);
+  retval = xcom_send_app_wait(fd, &leader_app, 0, 0);
+  // leader_app and max_app have been linked, so unlink
+  // to avoid deallocating the stack objects.
+  leader_app.next = nullptr;
+  max_app.next = nullptr;
+  xdr_free((xdrproc_t)xdr_app_data, (char *)&leader_app);
+  xdr_free((xdrproc_t)xdr_app_data, (char *)&max_app);
+  return retval;
+}
+
+int xcom_client_get_leaders(connection_descriptor *fd, uint32_t group_id,
+                            leader_info_data *leaders) {
+  if (!fd) return 0;
+  pax_msg p;
+  app_data a;
+  int result = 0;
+
+  memset(&p, 0, sizeof(p));
+
+  xcom_send_app_wait_result res = xcom_send_app_wait_and_get(
+      fd, init_get_msg(&a, group_id, get_leaders_type), 0, &p, 0);
+  result = xcom_check_reply(res);
+  if (result) {
+    // Steal the returned data
+    *leaders = steal_leader_info_data(p.rd->reply_data_u.leaders);
+  }
+
+  xdr_free((xdrproc_t)xdr_pax_msg, (char *)&p);
+  xdr_free((xdrproc_t)xdr_app_data, (char *)&a);
+
+  return result;
+}
+
+#if 0
+/* Called when leader changes */
+static MY_ATTRIBUTE((unused)) xcom_election_cb election_cb = NULL;
+
+void set_xcom_election_cb(xcom_election_cb x) { election_cb = x; }
+#endif
+
+// The timer code and the associated Paxos FSM stuff is only used for
+// tracking/debugging Paxos state transitions at the moment, but I believe the
+// FSM is correct, and if used for actually handling the incoming messages,
+// would make the code simpler, and easier to understand and reason about by
+// making lots of tests scattered around in the code unnecessary. I have had
+// this on the backburner for a long time, and used the single writer worklog
+// to test it, but did not dare to actually replace the existing logic in the
+// scope of this worklog.Take it as a hint for future improvement of the code
+// base...
+
+// The time queue as configured now will allow up to 10 seconds delay with
+// TICK_PERIOD (0.01) seconds granularity. All machines which map to the same
+// time slot will wake up simultaneously. The complexity when inserting or
+// removing a pax_machine is O(1), but this is somewhat offset by the need to
+// advance the current tick for every TICK_PERIOD. Not a problem in practice,
+// and the code is dead simple.
+
+/* Max number of ticks before wrapping. With 10 ms per step, this will give a
+ * max delay of 10 seconds, which is plenty for the Paxos timers */
+
+enum { paxos_timer_range = 1000 };
+/* Ten milliseconds granularity is sufficient */
+#define TICK_PERIOD 0.01
+
+/* The index into the time queue */
+static unsigned int current_tick = 0;
+
+/* The time queue is an array of timers. Each timer is the head of
+a possibly empty list of timers */
+
+static linkage time_queue[paxos_timer_range];
+
+static void init_time_queue() {
+  unsigned int i;
+  for (i = 0; i < paxos_timer_range; i++) {
+    link_init(&time_queue[i], TYPE_HASH("time_queue"));
+  }
+}
+
+/* Put pax_machine into the time queue at the correct place */
+static void paxos_twait(pax_machine *p, unsigned int t) {
+  /* Guard aginst 0 delay, which would become max delay */
+  if (0 == t) t = 1;
+  unsigned int pos = (current_tick + t) % paxos_timer_range;
+  link_into(&p->watchdog, &time_queue[pos]);
+  assert(!link_empty(&time_queue[pos]));
+}
+
+/* Remove pax_machine from timer queue */
+static void paxos_twait_cancel(pax_machine *p) { link_out(&p->watchdog); }
+
+/* Wake all pax_machines waiting at time slot t */
+static void paxos_wakeup(unsigned int t) {
+  linkage *head = &time_queue[t];
+  linkage *p;
+  if (!link_empty(head)) {
+    IFDBG(D_CONS, FN; NUMEXP(t); NUMEXP(link_empty(head)));
+  }
+  while (!link_empty(head)) {
+    p = link_first(head);
+    paxos_timeout(container_of(p, pax_machine, watchdog));
+    link_out(p);
+  }
+}
+
+/* Advance current_tick to next slot and wake all pax_machines there */
+static void paxos_timer_advance() {
+  current_tick = (current_tick + 1) % paxos_timer_range;
+  paxos_wakeup(current_tick);
+}
+
+/* Fire any expired timer for a Paxos machine */
+static int paxos_timer_task(task_arg arg MY_ATTRIBUTE((unused))) {
+  DECL_ENV
+  double start;
+  END_ENV;
+  TASK_BEGIN
+  ep->start = task_now();
+  while (!xcom_shutdown) {
+    ep->start += TICK_PERIOD;
+    TASK_DELAY_UNTIL(ep->start);
+    paxos_timer_advance();
+  }
+  FINALLY
+  IFDBG(D_CONS, FN; STRLIT(" shutdown "));
+  TASK_END;
+}
+
+/* The state functions/thunks */
+static int paxos_fsm_p1_master_enter(pax_machine *paxos, site_def const *site,
+                                     paxos_event event, pax_msg *mess);
+
+static int paxos_fsm_p1_master_wait(pax_machine *paxos, site_def const *site,
+                                    paxos_event event, pax_msg *mess);
+
+static int paxos_fsm_p2_master_enter(pax_machine *paxos, site_def const *site,
+                                     paxos_event event, pax_msg *mess);
+
+static int paxos_fsm_p2_master_wait(pax_machine *paxos, site_def const *site,
+                                    paxos_event event, pax_msg *mess);
+
+static int paxos_fsm_p2_slave_enter(pax_machine *paxos, site_def const *site,
+                                    paxos_event event, pax_msg *mess);
+
+static int paxos_fsm_p2_slave_wait(pax_machine *paxos, site_def const *site,
+                                   paxos_event event, pax_msg *mess);
+
+static int paxos_fsm_p3_master_wait(pax_machine *paxos, site_def const *site,
+                                    paxos_event event, pax_msg *mess);
+
+static int paxos_fsm_p3_slave_enter(pax_machine *paxos, site_def const *site,
+                                    paxos_event event, pax_msg *mess);
+
+static int paxos_fsm_p3_slave_wait(pax_machine *paxos, site_def const *site,
+                                   paxos_event event, pax_msg *mess);
+
+static int paxos_fsm_finished(pax_machine *paxos, site_def const *site,
+                              paxos_event event, pax_msg *mess);
+
+typedef void (*paxos_state_action)(pax_machine *paxos, site_def const *site,
+                                   pax_msg *mess);
+
+static int accept_new_prepare(pax_machine *paxos, pax_msg *mess) {
+  return noop_match(paxos, mess) ||
+         gt_ballot(mess->proposal, paxos->acceptor.promise);
+}
+
+static int accept_new_accept(pax_machine *paxos, pax_msg *mess) {
+  return noop_match(paxos, mess) ||
+         !gt_ballot(paxos->acceptor.promise, mess->proposal);
+}
+
+static int own_message(pax_msg *mess, site_def const *site) {
+  return is_local_node(mess->from, site);
+}
+
+// Default paxos timeout in ticks
+// Change this if the FSM is used for anything else than debugging
+unsigned int constexpr const paxos_default_timeout = 100;
+
+/* You are in a maze of little twisting functions ... */
+
+static void action_paxos_prepare(pax_machine *paxos, site_def const *site,
+                                 pax_msg *mess) {
+  if (own_message(mess, site)) {
+    /* Wait for ack_prepare */
+    SET_PAXOS_FSM_STATE(paxos, paxos_fsm_p1_master_wait);
+  } else {
+    /* Wait for accept */
+    SET_PAXOS_FSM_STATE(paxos, paxos_fsm_p2_slave_enter);
+  }
+  paxos_twait(paxos, paxos_default_timeout);
+}
+
+static void action_paxos_accept(pax_machine *paxos, site_def const *site,
+                                pax_msg *mess) {
+  if (own_message(mess, site)) {
+    /* Wait for ack_accept */
+    SET_PAXOS_FSM_STATE(paxos, paxos_fsm_p2_master_wait);
+  } else {
+    /* Wait for learn */
+    SET_PAXOS_FSM_STATE(paxos, paxos_fsm_p3_slave_enter);
+  }
+  paxos_twait(paxos, paxos_default_timeout);
+}
+
+static void action_paxos_learn(pax_machine *paxos, site_def const *site,
+                               pax_msg *mess) {
+  (void)site;
+  (void)mess;
+  /* We are finished */
+  SET_PAXOS_FSM_STATE(paxos, paxos_fsm_finished);
+  paxos_twait_cancel(paxos);
+}
+
+static void action_paxos_start(pax_machine *paxos, site_def const *site,
+                               pax_msg *mess) {
+  (void)site;
+  (void)mess;
+  /* Find value of this instance */
+  SET_PAXOS_FSM_STATE(paxos, paxos_fsm_p1_master_enter);
+  paxos_twait(paxos, paxos_default_timeout);
+}
+
+static void action_new_prepare(pax_machine *paxos, site_def const *site,
+                               pax_msg *mess) {
+  (void)site;
+  if (accept_new_prepare(paxos, mess)) {
+    /* Wait for accept */
+    if (own_message(mess, site)) {
+      /* Wait for ack_prepare */
+      SET_PAXOS_FSM_STATE(paxos, paxos_fsm_p1_master_enter);
+    } else {
+      /* Wait for accept */
+      SET_PAXOS_FSM_STATE(paxos, paxos_fsm_p2_slave_enter);
+    }
+    paxos_twait(paxos, paxos_default_timeout);
+  }
+}
+
+static void action_ack_prepare(pax_machine *paxos, site_def const *site,
+                               pax_msg *mess) {
+  (void)mess;
+  if (check_propose(site, paxos)) {
+    /* Wait for accept */
+    SET_PAXOS_FSM_STATE(paxos, paxos_fsm_p2_master_enter);
+  }
+}
+
+static void action_new_accept(pax_machine *paxos, site_def const *site,
+                              pax_msg *mess) {
+  if (accept_new_accept(paxos, mess)) {
+    /* Wait for accept */
+    if (own_message(mess, site)) {
+      /* Wait for ack_accept */
+      SET_PAXOS_FSM_STATE(paxos, paxos_fsm_p2_master_enter);
+    } else {
+      /* Wait for learn */
+      SET_PAXOS_FSM_STATE(paxos, paxos_fsm_p3_slave_enter);
+    }
+    paxos_twait(paxos, paxos_default_timeout);
+  }
+}
+
+static void action_ack_accept(pax_machine *paxos, site_def const *site,
+                              pax_msg *mess) {
+  (void)mess;
+  if (learn_ok(site, paxos)) {
+    /* Wait for learn message */
+    SET_PAXOS_FSM_STATE(paxos, paxos_fsm_p3_master_wait);
+  }
+}
+
+static void action_ignorant(pax_machine *paxos, site_def const *site,
+                            pax_msg *mess) {
+  (void)paxos;
+  (void)site;
+  (void)mess;
+}
+
+/* Dispatch tables for each state */
+paxos_state_action p1_idle_vtbl[last_p_event] = {
+    action_paxos_prepare, NULL, action_paxos_accept, NULL, action_paxos_learn,
+    action_paxos_start,   NULL};
+paxos_state_action p1_master_enter_vtbl[last_p_event] = {action_new_prepare,
+                                                         action_ack_prepare,
+                                                         action_new_accept,
+                                                         NULL,
+                                                         action_paxos_learn,
+                                                         NULL,
+                                                         NULL};
+paxos_state_action p1_master_wait_vtbl[last_p_event] = {action_new_prepare,
+                                                        action_ack_prepare,
+                                                        action_new_accept,
+                                                        NULL,
+                                                        action_paxos_learn,
+                                                        NULL,
+                                                        NULL};
+paxos_state_action p2_master_enter_vtbl[last_p_event] = {action_new_accept,
+                                                         NULL,
+                                                         action_new_accept,
+                                                         action_ack_accept,
+                                                         action_paxos_learn,
+                                                         NULL,
+                                                         NULL};
+paxos_state_action p2_master_wait_vtbl[last_p_event] = {action_new_prepare,
+                                                        NULL,
+                                                        action_new_accept,
+                                                        action_ack_accept,
+                                                        action_paxos_learn,
+                                                        NULL,
+                                                        NULL};
+paxos_state_action p2_slave_wait_vtbl[last_p_event] = {action_new_prepare,
+                                                       NULL,
+                                                       action_new_accept,
+                                                       NULL,
+                                                       action_paxos_learn,
+                                                       NULL,
+                                                       NULL};
+paxos_state_action p3_master_wait_vtbl[last_p_event] = {action_new_prepare,
+                                                        NULL,
+                                                        action_new_accept,
+                                                        NULL,
+                                                        action_paxos_learn,
+                                                        NULL,
+                                                        NULL};
+paxos_state_action p3_slave_wait_vtbl[last_p_event] = {action_new_prepare,
+                                                       NULL,
+                                                       action_new_accept,
+                                                       NULL,
+                                                       action_paxos_learn,
+                                                       NULL,
+                                                       NULL};
+paxos_state_action p_finished_vtbl[last_p_event] = {
+    action_ignorant, NULL, action_ignorant, NULL, NULL, NULL, NULL};
+
+static inline void dispatch_p_event(paxos_state_action *vtbl,
+                                    pax_machine *paxos, site_def const *site,
+                                    paxos_event event, pax_msg *mess) {
+  if (vtbl[event]) {
+    vtbl[event](paxos, site, mess);
+  }
+}
+
+/* init state */
+int paxos_fsm_idle(pax_machine *paxos, site_def const *site, paxos_event event,
+                   pax_msg *mess) {
+  IFDBG(D_CONS, FN;);
+  dispatch_p_event(p1_idle_vtbl, paxos, site, event, mess);
+  return 0;
+}
+
+/* Phase 1 master enter */
+static int paxos_fsm_p1_master_enter(pax_machine *paxos, site_def const *site,
+                                     paxos_event event, pax_msg *mess) {
+  (void)site;
+  (void)event;
+  (void)mess;
+  IFDBG(D_CONS, FN;);
+  /* Send prepare and start timer */
+  SET_PAXOS_FSM_STATE(paxos, paxos_fsm_p1_master_wait);
+  return 0;
+}
+
+/* Phase 1 master wait */
+static int paxos_fsm_p1_master_wait(pax_machine *paxos, site_def const *site,
+                                    paxos_event event, pax_msg *mess) {
+  IFDBG(D_CONS, FN;);
+  dispatch_p_event(p1_master_wait_vtbl, paxos, site, event, mess);
+  return 0;
+}
+
+/* Phase 2 master enter */
+static int paxos_fsm_p2_master_enter(pax_machine *paxos, site_def const *site,
+                                     paxos_event event, pax_msg *mess) {
+  (void)site;
+  (void)event;
+  (void)mess;
+  IFDBG(D_CONS, FN;);
+  /* Send prepare and start timer */
+  SET_PAXOS_FSM_STATE(paxos, paxos_fsm_p2_master_wait);
+  return 0;
+}
+
+/* Phase 2 master wait */
+static int paxos_fsm_p2_master_wait(pax_machine *paxos, site_def const *site,
+                                    paxos_event event, pax_msg *mess) {
+  IFDBG(D_CONS, FN;);
+  dispatch_p_event(p2_master_wait_vtbl, paxos, site, event, mess);
+  return 0;
+}
+
+/* Phase 2 slave enter */
+static int paxos_fsm_p2_slave_enter(pax_machine *paxos, site_def const *site,
+                                    paxos_event event, pax_msg *mess) {
+  (void)site;
+  (void)event;
+  (void)mess;
+  IFDBG(D_CONS, FN;);
+  /* Start timer */
+  SET_PAXOS_FSM_STATE(paxos, paxos_fsm_p2_slave_wait);
+  return 1;
+}
+
+/* Phase 2 slave wait */
+static int paxos_fsm_p2_slave_wait(pax_machine *paxos, site_def const *site,
+                                   paxos_event event, pax_msg *mess) {
+  IFDBG(D_CONS, FN;);
+  dispatch_p_event(p2_slave_wait_vtbl, paxos, site, event, mess);
+  return 0;
+}
+
+/* Phase 3 master wait */
+static int paxos_fsm_p3_master_wait(pax_machine *paxos, site_def const *site,
+                                    paxos_event event, pax_msg *mess) {
+  IFDBG(D_CONS, FN;);
+  dispatch_p_event(p3_master_wait_vtbl, paxos, site, event, mess);
+  return 0;
+}
+
+/* Phase 3 slave enter */
+static int paxos_fsm_p3_slave_enter(pax_machine *paxos, site_def const *site,
+                                    paxos_event event, pax_msg *mess) {
+  (void)site;
+  (void)event;
+  (void)mess;
+  IFDBG(D_CONS, FN;);
+  /* Start timer */
+  SET_PAXOS_FSM_STATE(paxos, paxos_fsm_p3_slave_wait);
+  return 1;
+}
+
+/* Phase 3 slave wait */
+static int paxos_fsm_p3_slave_wait(pax_machine *paxos, site_def const *site,
+                                   paxos_event event, pax_msg *mess) {
+  IFDBG(D_CONS, FN;);
+  dispatch_p_event(p3_slave_wait_vtbl, paxos, site, event, mess);
+  return 0;
+}
+
+/* Finished */
+static int paxos_fsm_finished(pax_machine *paxos, site_def const *site,
+                              paxos_event event, pax_msg *mess) {
+  IFDBG(D_CONS, FN;);
+  dispatch_p_event(p_finished_vtbl, paxos, site, event, mess);
+  return 0;
+}
+
+#define X(b) #b
+const char *paxos_event_name[] = {p_events};
+#undef X
+
+/* Trampoline which loops calling thunks pointed to by paxos->state.state_fp
+ * until 0 is returned. */
+static void paxos_fsm(pax_machine *paxos, site_def const *site,
+                      paxos_event event, pax_msg *mess) {
+  /* Crank the state machine until it stops */
+  IFDBG(D_CONS, FN; PTREXP(paxos); SYCEXP(paxos->synode);
+        BALCEXP(mess->proposal); STRLIT(paxos->state.state_name); STRLIT(" : ");
+        STRLIT(paxos_event_name[event]));
+  while (paxos->state.state_fp(paxos, site, event, mess)) {
+    IFDBG(D_CONS, FN; PTREXP(paxos); SYCEXP(paxos->synode);
+          BALCEXP(mess->proposal); STRLIT(paxos->state.state_name);
+          STRLIT(" : "); STRLIT(paxos_event_name[event]));
+  }
+}
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_base.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_base.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_base.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_base.h	2021-09-28 11:46:34.000000000 +0000
@@ -32,6 +32,10 @@
 #include <netdb.h>
 #endif
 
+#include <memory>
+
+#include "xcom/network/include/network_management_interface.h"
+#include "xcom/network/network_provider_manager.h"
 #include "xcom/site_struct.h"
 #include "xcom/task_arg.h"
 #include "xcom/task_debug.h"
@@ -101,7 +105,6 @@
 int is_node_v4_reachable(char *node_address);
 int is_node_v4_reachable_with_info(struct addrinfo *retrieved_addr_info);
 int are_we_allowed_to_upgrade_to_v6(app_data_ptr a);
-struct addrinfo *does_node_have_v4_address(struct addrinfo *retrieved);
 
 /**
  * @brief Process incoming are_you_alive (i.e.: ping) messages and act
@@ -197,7 +200,8 @@
                                                node_set nodes);
 void set_xcom_full_global_view_receiver(xcom_full_global_view_receiver x);
 
-typedef void (*xcom_data_receiver)(synode_no message_id, node_set nodes,
+typedef void (*xcom_data_receiver)(synode_no message_id, synode_no origin,
+                                   site_def const *site, node_set nodes,
                                    u_int size, synode_no last_removed,
                                    char *data);
 void set_xcom_data_receiver(xcom_data_receiver x);
@@ -248,6 +252,7 @@
                                     uint32_t group_id);
 app_data_ptr init_set_event_horizon_msg(app_data *a, uint32_t group_id,
                                         xcom_event_horizon event_horizon);
+app_data_ptr init_get_leaders_msg(app_data *a, uint32_t group_id);
 app_data_ptr init_set_cache_size_msg(app_data *a, uint64_t cache_limit);
 app_data_ptr init_get_event_horizon_msg(app_data *a, uint32_t group_id);
 app_data_ptr init_app_msg(app_data *a, char *payload, u_int payload_size);
@@ -272,10 +277,6 @@
 typedef int (*xcom_socket_accept_cb)(int fd, site_def const *config);
 int set_xcom_socket_accept_cb(xcom_socket_accept_cb x);
 
-connection_descriptor *xcom_open_client_connection(char const *server,
-                                                   xcom_port port);
-int xcom_close_client_connection(connection_descriptor *connection);
-
 int xcom_client_disable_arbitrator(connection_descriptor *fd);
 int xcom_client_enable_arbitrator(connection_descriptor *fd);
 int xcom_client_add_node(connection_descriptor *fd, node_list *nl,
@@ -310,6 +311,12 @@
 int64_t xcom_send_client_app_data(connection_descriptor *fd, app_data_ptr a,
                                   int force);
 
+std::unique_ptr<Network_provider_management_interface>
+get_network_management_interface();
+
+std::unique_ptr<Network_provider_operations_interface>
+get_network_operations_interface();
+
 /**
   Copies app data @c source into @c target and checks if the copy
   succeeded. Sets *target to NULL if the copy fails.
@@ -455,6 +462,38 @@
  */
 void init_need_boot_op(pax_msg *p, node_address *identity);
 
+int xcom_client_set_max_leaders(connection_descriptor *fd, node_no max_leaders,
+                                uint32_t group_id);
+
+void init_set_max_leaders(uint32_t group_id, app_data *a, node_no max_leaders);
+void init_set_leaders(uint32_t group_id, app_data *a,
+                      leader_array const leaders);
+void init_set_leaders(uint32_t group_id, app_data *a, u_int n,
+                      char const *names[]);
+void init_set_leaders(uint32_t group_id, app_data *leader_app,
+                      leader_array const leaders, app_data *max_app,
+                      node_no max_leaders);
+void init_set_leaders(uint32_t group_id, app_data *leader_app, u_int n,
+                      char const *names[], app_data *max_app,
+                      node_no max_leaders);
+
+int xcom_client_set_leaders(connection_descriptor *fd,
+                            leader_array const leaders, uint32_t group_id);
+int xcom_client_set_leaders(connection_descriptor *fd, u_int n,
+                            char const *names[], uint32_t group_id);
+int xcom_client_set_leaders(connection_descriptor *fd,
+                            leader_array const leaders, node_no max_leaders,
+                            uint32_t group_id);
+int xcom_client_set_leaders(connection_descriptor *fd, u_int n,
+                            char const *names[], node_no max_leaders,
+                            uint32_t group_id);
+
+int xcom_client_get_leaders(connection_descriptor *fd, uint32_t group_id,
+                            leader_info_data *leaders);
+
+typedef void (*xcom_election_cb)(leader_array leaders);
+void set_xcom_election_cb(xcom_election_cb x);
+
 static inline char *strerr_msg(char *buf, size_t len, int nr) {
 #if defined(_WIN32)
   strerror_s(buf, len, nr);
@@ -464,6 +503,8 @@
   return buf;
 }
 
+void xcom_sleep(unsigned int seconds);
+
 #define XCOM_COMMS_ERROR 1
 #define XCOM_COMMS_OTHER 2
 #define XCOM_COMMS_OK 0
@@ -476,6 +517,8 @@
 synode_no get_last_delivered_msg();
 void set_log_end(gcs_snapshot *gcs);
 
+extern "C" void synthesize_leaders(leader_array *leaders);
+
 #define XCOM_FSM(action, arg)                           \
   do {                                                  \
     const char *s = xcom_fsm(action, arg);              \
@@ -484,5 +527,6 @@
   } while (0)
 
 int pm_finished(pax_machine *p);
+bool_t handle_max_leaders(app_data_ptr a);
 
 #endif
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_cache.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_cache.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_cache.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_cache.cc	2021-09-28 11:46:34.000000000 +0000
@@ -44,6 +44,7 @@
 #include "xcom/xcom_cfg.h"
 #include "xcom/xcom_common.h"
 #include "xcom/xcom_detector.h"
+#include "xcom/xcom_memory.h"
 #include "xcom/xcom_profile.h"
 #include "xcom/xcom_transport.h"
 #include "xcom/xcom_vp_str.h"
@@ -101,7 +102,7 @@
 
 static void hash_init(stack_machine *hash_bucket) {
   size_t i;
-  hash_bucket->pax_hash = (linkage *)malloc(sizeof(linkage) * BUCKETS);
+  hash_bucket->pax_hash = (linkage *)xcom_malloc(sizeof(linkage) * BUCKETS);
   for (i = 0; i < BUCKETS; i++) {
     link_init(&hash_bucket->pax_hash[i], TYPE_HASH("pax_machine"));
   }
@@ -263,6 +264,7 @@
     free_bit_set(p->proposer.prop_nodeset);
     p->proposer.prop_nodeset = NULL;
   }
+  link_out(&p->watchdog);
 }
 
 static void free_lru_machine(lru_machine *link_iter) {
@@ -396,6 +398,7 @@
   p->synode = synode;
   p->last_modified = 0.0;
   link_init(&p->rv, TYPE_HASH("task_env"));
+  link_init(&p->watchdog, TYPE_HASH("time_queue"));
   init_ballot(&p->proposer.bal, -1, 0);
   init_ballot(&p->proposer.sent_prop, 0, 0);
   init_ballot(&p->proposer.sent_learn, -1, 0);
@@ -413,6 +416,7 @@
   p->op = initial_op;
   p->force_delivery = 0;
   p->enforcer = 0;
+  SET_PAXOS_FSM_STATE(p, paxos_fsm_idle);
   return p;
 }
 
@@ -550,7 +554,7 @@
 static void expand_lru() {
   uint64_t i;
   for (i = 0; i < BUCKETS; i++) {
-    lru_machine *l = (lru_machine *)calloc(1, sizeof(lru_machine));
+    lru_machine *l = (lru_machine *)xcom_calloc(1, sizeof(lru_machine));
     link_init(&l->lru_link, TYPE_HASH("lru_machine"));
     link_into(&l->lru_link, &probation_lru);
     init_pax_machine(&l->pax, l, null_synode);
@@ -559,7 +563,8 @@
 }
 
 static void add_stack_machine(uint64_t start_msgno) {
-  stack_machine *hash_bucket = (stack_machine *)malloc(sizeof(stack_machine));
+  stack_machine *hash_bucket =
+      (stack_machine *)xcom_malloc(sizeof(stack_machine));
   link_init(&hash_bucket->stack_link, TYPE_HASH("stack_machine"));
   hash_bucket->occupation = 0;
   hash_bucket->start_msgno = start_msgno;
@@ -579,9 +584,11 @@
     if (++count == BUCKETS) break;
   })
 
-  free(((stack_machine *)link_last(&hash_stack))->pax_hash);
-  free(link_out(link_last(&hash_stack)));
+  linkage *tmp = link_last(&hash_stack);
+  free(((stack_machine *)tmp)->pax_hash);
+  link_out(tmp);
   ((stack_machine *)link_last(&hash_stack))->start_msgno = 0;
+  free(tmp);
 }
 
 /* Use vars instead of defines for unit testing */
@@ -622,7 +629,7 @@
   }
 }
 
-int cache_manager_task(task_arg arg MY_ATTRIBUTE((unused))) {
+int cache_manager_task(task_arg arg [[maybe_unused]]) {
   DECL_ENV
   int dummy;
   END_ENV;
@@ -648,9 +655,11 @@
 
 void set_size_decrement(size_t decrement) { size_decrement = decrement; }
 
+#if 0
 void set_dec_threshold_length(uint64_t threshold) {
   dec_threshold_length = threshold;
 }
+#endif
 
 void set_min_target_occupation(float threshold) {
   min_target_occupation = threshold;
@@ -662,3 +671,8 @@
   min_length_threshold = threshold;
 }
 /* purecov: end */
+
+void paxos_timeout(pax_machine *p) {
+  (void)p;
+  IFDBG(D_BUG, FN; SYCEXP(p->synode));
+}
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_cache.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_cache.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_cache.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_cache.h	2021-09-28 11:46:34.000000000 +0000
@@ -26,6 +26,7 @@
 #include <stddef.h>
 
 #include "xcom/simset.h"
+#include "xcom/site_struct.h"
 #include "xcom/xcom_profile.h"
 #include "xdr_gen/xcom_vp.h"
 
@@ -55,6 +56,40 @@
 struct pax_machine;
 typedef struct pax_machine pax_machine;
 
+#define p_events                                                          \
+  X(paxos_prepare), X(paxos_ack_prepare), X(paxos_accept),                \
+      X(paxos_ack_accept), X(paxos_learn), X(paxos_start), X(paxos_tout), \
+      X(last_p_event)
+
+#define X(a) a
+enum paxos_event { p_events };
+typedef enum paxos_event paxos_event;
+#undef X
+
+struct paxos_fsm_state;
+typedef struct paxos_fsm_state paxos_fsm_state;
+
+/* Function pointer corresponding to a state. Return 1 if execution should
+ * continue, 0 otherwise */
+typedef int (*paxos_fsm_fp)(pax_machine *paxos, site_def const *site,
+                            paxos_event event, pax_msg *mess);
+
+/* Function pointer and name */
+struct paxos_fsm_state {
+  paxos_fsm_fp state_fp;
+  char const *state_name;
+};
+
+extern int paxos_fsm_idle(pax_machine *paxos, site_def const *site,
+                          paxos_event event, pax_msg *mess);
+
+// Set current Paxos state and name of state (for tracing) in pax_machine object
+#define SET_PAXOS_FSM_STATE(obj, s) \
+  do {                              \
+    (obj)->state.state_fp = s;      \
+    (obj)->state.state_name = #s;   \
+  } while (0)
+
 /* Definition of a Paxos instance */
 struct pax_machine {
   linkage hash_link;
@@ -63,6 +98,7 @@
   synode_no synode;
   double last_modified; /* Start time */
   linkage rv; /* Tasks may sleep on this until something interesting happens */
+  linkage watchdog; /* Used for timeouts in Paxos */
 
   struct {
     ballot bal;            /* The current ballot we are working on */
@@ -89,6 +125,7 @@
 #ifndef XCOM_STANDALONE
   char is_instrumented;
 #endif
+  paxos_fsm_state state;
 };
 
 pax_machine *init_pax_machine(pax_machine *p, lru_machine *lru,
@@ -133,6 +170,7 @@
 void set_min_target_occupation(float threshold);
 void set_dec_threshold_size(float threshold);
 void set_min_length_threshold(float threshold);
+void paxos_timeout(pax_machine *p);
 
 #ifndef XCOM_STANDALONE
 void psi_set_cache_resetting(int is_resetting);
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_cfg.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_cfg.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_cfg.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_cfg.cc	2021-09-28 11:46:34.000000000 +0000
@@ -25,16 +25,14 @@
 #include "xcom/xcom_cfg.h"
 
 #include "xcom/node_list.h"
+#include "xcom/xcom_memory.h"
 #include "xcom/xcom_profile.h"
 
-/* Reasonable initial cache limit */
-#define DEFAULT_CACHE_LIMIT 1000000000ULL
-
 cfg_app_xcom_st *the_app_xcom_cfg = NULL;
 
 void init_cfg_app_xcom() {
   if (!the_app_xcom_cfg)
-    the_app_xcom_cfg = (cfg_app_xcom_st *)malloc(sizeof(cfg_app_xcom_st));
+    the_app_xcom_cfg = (cfg_app_xcom_st *)xcom_malloc(sizeof(cfg_app_xcom_st));
 
   the_app_xcom_cfg->m_poll_spin_loops = 0;
   the_app_xcom_cfg->m_cache_limit = DEFAULT_CACHE_LIMIT;
@@ -50,6 +48,12 @@
   the_app_xcom_cfg = NULL;
 }
 
+Network_namespace_manager *cfg_app_get_network_namespace_manager() {
+  Network_namespace_manager *mgr = nullptr;
+  if (the_app_xcom_cfg != NULL) mgr = the_app_xcom_cfg->network_ns_manager;
+  return mgr;
+}
+
 node_address *cfg_app_xcom_get_identity() {
   node_address *identity = NULL;
   if (the_app_xcom_cfg != NULL) identity = the_app_xcom_cfg->identity;
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_cfg.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_cfg.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_cfg.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_cfg.h	2021-09-28 11:46:34.000000000 +0000
@@ -25,6 +25,7 @@
 
 #include <stdint.h>
 #include <stdlib.h>
+#include "xcom/network/include/network_provider.h"
 #include "xdr_gen/xcom_vp.h"
 
 typedef struct cfg_app_xcom {
@@ -43,6 +44,12 @@
    The (address, incarnation) pair that uniquely identifies this XCom instance.
   */
   node_address *identity;
+
+  /**
+   This is a network namespace manager to deal with network namespace
+   operations
+   */
+  Network_namespace_manager *network_ns_manager;
 } cfg_app_xcom_st;
 
 /*
@@ -56,6 +63,8 @@
 
 node_address *cfg_app_xcom_get_identity();
 
+Network_namespace_manager *cfg_app_get_network_namespace_manager();
+
 /*
  Takes ownership of @c identity.
 
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_detector.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_detector.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_detector.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_detector.cc	2021-09-28 11:46:34.000000000 +0000
@@ -105,7 +105,7 @@
     if (get_nodeno(site) == node) {  // Me to myself... i'm always connected
       retval = 1;
     } else if (node < site->nodes.node_list_len) {
-      retval = is_connected(&site->servers[node]->con);
+      retval = is_connected(site->servers[node]->con);
     }
   }
 
@@ -229,7 +229,7 @@
   u_int i;
   u_int nodes = get_maxnodes(site);
 
-  for (i = 0; i < nodes && i < site->global_node_set.node_set_len; i++) {
+  for (i = 0; i < nodes && i < site->local_node_set.node_set_len; i++) {
     int detect = DETECT(site, i);
     if (site->local_node_set.node_set_val[i] != detect) {
       site->local_node_set.node_set_val[i] = detect;
@@ -239,7 +239,7 @@
   }
 }
 
-static node_no leader(site_def const *s) {
+static node_no get_leader(site_def const *s) {
   if (s) {
     node_no leader = 0;
     for (leader = 0; leader < get_maxnodes(s); leader++) {
@@ -255,34 +255,28 @@
   if (!s)
     return 0;
   else
-    return leader(s) == s->nodeno;
+    return get_leader(s) == s->nodeno;
 }
 
 extern synode_no executed_msg;
 extern synode_no max_synode;
 
-static site_def *last_p_site = 0;
 static site_def *last_x_site = 0;
 
 void invalidate_detector_sites(site_def *site) {
-  if (last_p_site == site) {
-    last_p_site = NULL;
-  }
-
   if (last_x_site == site) {
     last_x_site = NULL;
   }
 }
 
 /* Notify others about our current view */
-int detector_task(task_arg arg MY_ATTRIBUTE((unused))) {
+int detector_task(task_arg arg [[maybe_unused]]) {
   DECL_ENV
   int notify;
   int local_notify;
   END_ENV;
 
   TASK_BEGIN
-  last_p_site = 0;
   last_x_site = 0;
   ep->notify = 1;
   ep->local_notify = 1;
@@ -290,13 +284,8 @@
   while (!xcom_shutdown) {
     {
       site_def *x_site = get_executor_site_rw();
-#if TASK_DBUG_ON
-      site_def const *p_site = get_proposer_site();
-      if (!p_site) p_site = get_site_def();
-#endif
 
       IFDBG(D_DETECT, FN; SYCEXP(executed_msg); SYCEXP(max_synode));
-      IFDBG(D_DETECT, FN; PTREXP(p_site); NDBG(get_nodeno(p_site), u));
       IFDBG(D_DETECT, FN; PTREXP(x_site); NDBG(get_nodeno(x_site), u));
 
       if (x_site && get_nodeno(x_site) != VOID_NODE_NO) {
@@ -373,6 +362,7 @@
   IFDBG(D_DETECT, FN;);
   a->body.c_t = view_msg;
   a->body.app_u_u.present = detector_node_set(site);
+  a->app_key = site->start;
   xcom_send(a, msg);
 }
 
@@ -405,7 +395,7 @@
 static unsigned int dump = 0;
 #endif
 
-int alive_task(task_arg arg MY_ATTRIBUTE((unused))) {
+int alive_task(task_arg arg [[maybe_unused]]) {
   DECL_ENV
   pax_msg *i_p;
   pax_msg *you_p;
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_detector.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_detector.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_detector.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_detector.h	2021-09-28 11:46:34.000000000 +0000
@@ -24,6 +24,7 @@
 #define XCOM_DETECTOR_H
 
 #include "xcom/xcom_limits.h"
+#include "xdr_gen/xcom_vp.h"
 
 #define DETECTOR_LIVE_TIMEOUT 5.0
 
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_input_request.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_input_request.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_input_request.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_input_request.cc	2021-09-28 11:46:34.000000000 +0000
@@ -37,8 +37,8 @@
 xcom_input_request_ptr xcom_input_request_new(
     app_data_ptr a, xcom_input_reply_function_ptr reply_function,
     void *reply_arg) {
-  xcom_input_request_ptr request =
-      (xcom_input_request_ptr)calloc((size_t)1, sizeof(xcom_input_request));
+  xcom_input_request_ptr request = (xcom_input_request_ptr)xcom_calloc(
+      (size_t)1, sizeof(xcom_input_request));
   if (request != NULL) {
     request->a = a;
     request->reply_function = reply_function;
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_interface.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_interface.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_interface.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_interface.cc	2021-09-28 11:46:34.000000000 +0000
@@ -45,6 +45,7 @@
 #include "xcom/xcom_cache.h"
 #include "xcom/xcom_common.h"
 #include "xcom/xcom_detector.h"
+#include "xcom/xcom_memory.h"
 #include "xcom/xcom_profile.h"
 #include "xcom/xcom_transport.h"
 #include "xcom/xcom_vp_str.h"
@@ -58,6 +59,7 @@
 static xcom_local_view_receiver xcom_receive_local_view;
 static xcom_global_view_receiver xcom_receive_global_view;
 
+#ifdef XCOM_STANDALONE
 /* purecov: begin deadcode */
 void set_xcom_full_data_receiver(xcom_full_data_receiver x) {
   xcom_full_receive_data = x;
@@ -75,6 +77,7 @@
   xcom_full_receive_global_view = x;
 }
 /* purecov: end */
+#endif
 
 void set_xcom_data_receiver(xcom_data_receiver x) { xcom_receive_data = x; }
 
@@ -134,6 +137,11 @@
 
   while (app) {
     if (app->body.c_t == app_type) { /* Decode application data */
+      if (!(app->unique_id.node == app->app_key.node &&
+            app->unique_id.msgno == app->app_key.msgno)) {
+        IFDBG(D_BASE, FN; if (pma) SYCEXP(pma->synode); SYCEXP(app->unique_id);
+              SYCEXP(app->app_key));
+      }
       if (full_doit) {
         /* purecov: begin deadcode */
         xcom_full_receive_data(site, pma, app, app_status);
@@ -141,7 +149,7 @@
       } else {
         if (doit) {
           u_int copy_len = 0;
-          char *copy = (char *)malloc(app->body.app_u_u.data.data_len);
+          char *copy = (char *)xcom_malloc(app->body.app_u_u.data.data_len);
           if (copy == NULL) {
             /* purecov: begin inspected */
             G_ERROR("Unable to allocate memory for the received message.");
@@ -152,9 +160,10 @@
             copy_len = app->body.app_u_u.data.data_len;
           }
           ADD_DBG(D_EXEC, add_synode_event(pma->synode););
-
-          xcom_receive_data(pma->synode, detector_node_set(site), copy_len,
-                            cache_get_last_removed(), copy);
+          synode_no origin = pma->synode;
+          origin.node = app->unique_id.node;
+          xcom_receive_data(pma->synode, origin, site, detector_node_set(site),
+                            copy_len, cache_get_last_removed(), copy);
         } else {
           /* purecov: begin deadcode */
           G_TRACE("Data message was not delivered.");
@@ -189,29 +198,27 @@
 static node_set delivered_node_set;
 static site_def const *delivered_site;
 
-static int not_duplicate_view(site_def const *site) {
+static int not_duplicate_view(site_def const *site, node_set const ns) {
   int retval;
-  retval = !(site == delivered_site &&
-             equal_node_set(delivered_node_set, site->global_node_set));
+  retval = !(site == delivered_site && equal_node_set(delivered_node_set, ns));
   delivered_site = site;
-  copy_node_set(&site->global_node_set, &delivered_node_set);
+  copy_node_set(&ns, &delivered_node_set);
   return retval;
 }
 #endif
 
-void deliver_global_view_msg(site_def const *site, synode_no message_id) {
+void deliver_global_view_msg(site_def const *site, node_set const ns,
+                             synode_no message_id) {
   if (site) {
 #ifdef SUPPRESS_DUPLICATE_VIEWS
-    if (not_duplicate_view(site)) {
+    if (not_duplicate_view(site, ns)) {
 #endif
       if (xcom_full_receive_global_view) {
         /* purecov: begin deadcode */
-        xcom_full_receive_global_view(site, message_id,
-                                      clone_node_set(site->global_node_set));
+        xcom_full_receive_global_view(site, message_id, clone_node_set(ns));
         /* purecov: end */
       } else if (xcom_receive_global_view) {
-        xcom_receive_global_view(site->start, message_id,
-                                 clone_node_set(site->global_node_set),
+        xcom_receive_global_view(site->start, message_id, clone_node_set(ns),
                                  site->event_horizon);
       }
 #ifdef SUPPRESS_DUPLICATE_VIEWS
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_interface.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_interface.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_interface.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_interface.h	2021-09-28 11:46:34.000000000 +0000
@@ -27,7 +27,8 @@
 #include "xcom/xcom_cache.h"
 
 void deliver_view_msg(site_def const *site);
-void deliver_global_view_msg(site_def const *site, synode_no message_id);
+void deliver_global_view_msg(site_def const *site, node_set const ns,
+                             synode_no message_id);
 
 /**
   Delivers the @c app payload to XCom's upper layer, e.g. GCS.
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_memory.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_memory.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_memory.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_memory.h	2021-09-28 11:46:34.000000000 +0000
@@ -25,6 +25,7 @@
 
 #include <rpc/types.h>
 #include <rpc/xdr.h>
+#include <stdlib.h>
 
 #define X_FREE(x) \
   {               \
@@ -39,4 +40,22 @@
 
 void xcom_xdr_free(xdrproc_t f, char *p);
 
+extern int oom_abort;
+
+static inline void *xcom_malloc(size_t size) {
+  void *retval = malloc(size);
+  if (retval == NULL) {
+    oom_abort = 1;
+  }
+  return retval;
+}
+
+static inline void *xcom_calloc(size_t nmemb, size_t size) {
+  void *retval = calloc(nmemb, size);
+  if (retval == NULL) {
+    oom_abort = 1;
+  }
+  return retval;
+}
+
 #endif
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_msg_queue.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_msg_queue.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_msg_queue.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_msg_queue.cc	2021-09-28 11:46:34.000000000 +0000
@@ -36,6 +36,7 @@
 #include "xcom/task_debug.h"
 #include "xcom/xcom_common.h"
 #include "xcom/xcom_detector.h"
+#include "xcom/xcom_memory.h"
 #include "xcom/xcom_profile.h"
 #include "xdr_gen/xcom_vp.h"
 
@@ -72,7 +73,7 @@
 msg_link *msg_link_new(pax_msg *p, node_no to) {
   msg_link *ret;
   if (link_empty(&msg_link_list)) {
-    ret = (msg_link *)calloc((size_t)1, sizeof(msg_link));
+    ret = (msg_link *)xcom_calloc((size_t)1, sizeof(msg_link));
     msg_link_init(ret, p, to);
     /* IFDBG(D_NONE, FN; STRLIT(" allocate "); PTREXP(ret);
     dbg_linkage(&ret->l)); */
@@ -117,6 +118,7 @@
   }
 }
 
+#if 0
 /* purecov: begin deadcode */
 void shrink_msg_list(linkage *l, int n) {
   int count = cardinal(l);
@@ -127,6 +129,7 @@
   }
 }
 /* purecov: end */
+#endif
 
 void empty_msg_channel(channel *c) {
   IFDBG(D_NONE, FN;);
@@ -134,6 +137,7 @@
   empty_msg_list(&c->data); /* Empty the queue */
 }
 
+#if 0
 /* purecov: begin deadcode */
 void shrink_msg_channel(channel *c, int n) {
   IFDBG(D_NONE, FN;);
@@ -141,6 +145,7 @@
   shrink_msg_list(&c->data, n); /* Empty the queue */
 }
 /* purecov: end */
+#endif
 
 /* Empty the free list */
 void empty_link_free_list() {
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,758 +0,0 @@
-/* Copyright (c) 2012, 2021, Oracle 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,
-   as published by the Free Software Foundation.
-
-   This program is also distributed with certain software (including
-   but not limited to OpenSSL) that is licensed under separate terms,
-   as designated in a particular file or component or in included license
-   documentation.  The authors of MySQL hereby grant you an additional
-   permission to link the program and your derivative works with the
-   separately licensed software that they have included with MySQL.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License, version 2.0, for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-*/
-
-#ifndef XCOM_WITHOUT_OPENSSL
-#include <assert.h>
-#include <stdlib.h>
-
-#include <openssl/dh.h>
-#include <openssl/opensslv.h>
-#include <openssl/x509v3.h>
-
-#include "xcom/xcom_profile.h"
-#ifndef XCOM_STANDALONE
-#include "my_compiler.h"
-#endif
-
-#include "openssl/engine.h"
-
-#include "xcom/task_debug.h"
-#include "xcom/x_platform.h"
-#include "xcom/xcom_ssl_transport.h"
-
-static const char *ssl_mode_options[] = {"DISABLED", "PREFERRED", "REQUIRED",
-                                         "VERIFY_CA", "VERIFY_IDENTITY"};
-
-static const char *ssl_fips_mode_options[] = {"OFF", "ON", "STRICT"};
-
-#define SSL_MODE_OPTIONS_COUNT \
-  (sizeof(ssl_mode_options) / sizeof(*ssl_mode_options))
-
-#define SSL_MODE_FIPS_OPTIONS_COUNT \
-  (sizeof(ssl_fips_mode_options) / sizeof(*ssl_fips_mode_options))
-
-#define TLS_VERSION_OPTION_SIZE 256
-#define SSL_CIPHER_LIST_SIZE 4096
-
-static const char *tls_ciphers_list =
-    "ECDHE-ECDSA-AES128-GCM-SHA256:"
-    "ECDHE-ECDSA-AES256-GCM-SHA384:"
-    "ECDHE-RSA-AES128-GCM-SHA256:"
-    "ECDHE-RSA-AES256-GCM-SHA384:"
-    "ECDHE-ECDSA-AES128-SHA256:"
-    "ECDHE-RSA-AES128-SHA256:"
-    "ECDHE-ECDSA-AES256-SHA384:"
-    "ECDHE-RSA-AES256-SHA384:"
-    "DHE-RSA-AES128-GCM-SHA256:"
-    "DHE-DSS-AES128-GCM-SHA256:"
-    "DHE-RSA-AES128-SHA256:"
-    "DHE-DSS-AES128-SHA256:"
-    "DHE-DSS-AES256-GCM-SHA384:"
-    "DHE-RSA-AES256-SHA256:"
-    "DHE-DSS-AES256-SHA256:"
-    "ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:"
-    "ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:"
-    "DHE-DSS-AES128-SHA:DHE-RSA-AES128-SHA:"
-    "TLS_DHE_DSS_WITH_AES_256_CBC_SHA:DHE-RSA-AES256-SHA:"
-    "AES128-GCM-SHA256:DH-DSS-AES128-GCM-SHA256:"
-    "ECDH-ECDSA-AES128-GCM-SHA256:AES256-GCM-SHA384:"
-    "DH-DSS-AES256-GCM-SHA384:ECDH-ECDSA-AES256-GCM-SHA384:"
-    "AES128-SHA256:DH-DSS-AES128-SHA256:ECDH-ECDSA-AES128-SHA256:AES256-SHA256:"
-    "DH-DSS-AES256-SHA256:ECDH-ECDSA-AES256-SHA384:AES128-SHA:"
-    "DH-DSS-AES128-SHA:ECDH-ECDSA-AES128-SHA:AES256-SHA:"
-    "DH-DSS-AES256-SHA:ECDH-ECDSA-AES256-SHA:DHE-RSA-AES256-GCM-SHA384:"
-    "DH-RSA-AES128-GCM-SHA256:ECDH-RSA-AES128-GCM-SHA256:DH-RSA-AES256-GCM-"
-    "SHA384:"
-    "ECDH-RSA-AES256-GCM-SHA384:DH-RSA-AES128-SHA256:"
-    "ECDH-RSA-AES128-SHA256:DH-RSA-AES256-SHA256:"
-    "ECDH-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:"
-    "ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA:"
-    "ECDHE-ECDSA-AES256-SHA:DHE-DSS-AES128-SHA:DHE-RSA-AES128-SHA:"
-    "TLS_DHE_DSS_WITH_AES_256_CBC_SHA:DHE-RSA-AES256-SHA:"
-    "AES128-SHA:DH-DSS-AES128-SHA:ECDH-ECDSA-AES128-SHA:AES256-SHA:"
-    "DH-DSS-AES256-SHA:ECDH-ECDSA-AES256-SHA:DH-RSA-AES128-SHA:"
-    "ECDH-RSA-AES128-SHA:DH-RSA-AES256-SHA:ECDH-RSA-AES256-SHA:DES-CBC3-SHA";
-static const char *tls_cipher_blocked =
-    "!aNULL:!eNULL:!EXPORT:!LOW:!MD5:!DES:!RC2:!RC4:!PSK:"
-    "!DHE-DSS-DES-CBC3-SHA:!DHE-RSA-DES-CBC3-SHA:"
-    "!ECDH-RSA-DES-CBC3-SHA:!ECDH-ECDSA-DES-CBC3-SHA:"
-    "!ECDHE-RSA-DES-CBC3-SHA:!ECDHE-ECDSA-DES-CBC3-SHA:";
-
-/*
-  Diffie-Hellman key.
-  Generated using: >openssl dhparam -5 -C 2048
-
-  -----BEGIN DH PARAMETERS-----
-  MIIBCAKCAQEAil36wGZ2TmH6ysA3V1xtP4MKofXx5n88xq/aiybmGnReZMviCPEJ
-  46+7VCktl/RZ5iaDH1XNG1dVQmznt9pu2G3usU+k1/VB4bQL4ZgW4u0Wzxh9PyXD
-  glm99I9Xyj4Z5PVE4MyAsxCRGA1kWQpD9/zKAegUBPLNqSo886Uqg9hmn8ksyU9E
-  BV5eAEciCuawh6V0O+Sj/C3cSfLhgA0GcXp3OqlmcDu6jS5gWjn3LdP1U0duVxMB
-  h/neTSCSvtce4CAMYMjKNVh9P1nu+2d9ZH2Od2xhRIqMTfAS1KTqF3VmSWzPFCjG
-  mjxx/bg6bOOjpgZapvB6ABWlWmRmAAWFtwIBBQ==
-  -----END DH PARAMETERS-----
- */
-static unsigned char dh2048_p[] = {
-    0x8A, 0x5D, 0xFA, 0xC0, 0x66, 0x76, 0x4E, 0x61, 0xFA, 0xCA, 0xC0, 0x37,
-    0x57, 0x5C, 0x6D, 0x3F, 0x83, 0x0A, 0xA1, 0xF5, 0xF1, 0xE6, 0x7F, 0x3C,
-    0xC6, 0xAF, 0xDA, 0x8B, 0x26, 0xE6, 0x1A, 0x74, 0x5E, 0x64, 0xCB, 0xE2,
-    0x08, 0xF1, 0x09, 0xE3, 0xAF, 0xBB, 0x54, 0x29, 0x2D, 0x97, 0xF4, 0x59,
-    0xE6, 0x26, 0x83, 0x1F, 0x55, 0xCD, 0x1B, 0x57, 0x55, 0x42, 0x6C, 0xE7,
-    0xB7, 0xDA, 0x6E, 0xD8, 0x6D, 0xEE, 0xB1, 0x4F, 0xA4, 0xD7, 0xF5, 0x41,
-    0xE1, 0xB4, 0x0B, 0xE1, 0x98, 0x16, 0xE2, 0xED, 0x16, 0xCF, 0x18, 0x7D,
-    0x3F, 0x25, 0xC3, 0x82, 0x59, 0xBD, 0xF4, 0x8F, 0x57, 0xCA, 0x3E, 0x19,
-    0xE4, 0xF5, 0x44, 0xE0, 0xCC, 0x80, 0xB3, 0x10, 0x91, 0x18, 0x0D, 0x64,
-    0x59, 0x0A, 0x43, 0xF7, 0xFC, 0xCA, 0x01, 0xE8, 0x14, 0x04, 0xF2, 0xCD,
-    0xA9, 0x2A, 0x3C, 0xF3, 0xA5, 0x2A, 0x83, 0xD8, 0x66, 0x9F, 0xC9, 0x2C,
-    0xC9, 0x4F, 0x44, 0x05, 0x5E, 0x5E, 0x00, 0x47, 0x22, 0x0A, 0xE6, 0xB0,
-    0x87, 0xA5, 0x74, 0x3B, 0xE4, 0xA3, 0xFC, 0x2D, 0xDC, 0x49, 0xF2, 0xE1,
-    0x80, 0x0D, 0x06, 0x71, 0x7A, 0x77, 0x3A, 0xA9, 0x66, 0x70, 0x3B, 0xBA,
-    0x8D, 0x2E, 0x60, 0x5A, 0x39, 0xF7, 0x2D, 0xD3, 0xF5, 0x53, 0x47, 0x6E,
-    0x57, 0x13, 0x01, 0x87, 0xF9, 0xDE, 0x4D, 0x20, 0x92, 0xBE, 0xD7, 0x1E,
-    0xE0, 0x20, 0x0C, 0x60, 0xC8, 0xCA, 0x35, 0x58, 0x7D, 0x3F, 0x59, 0xEE,
-    0xFB, 0x67, 0x7D, 0x64, 0x7D, 0x8E, 0x77, 0x6C, 0x61, 0x44, 0x8A, 0x8C,
-    0x4D, 0xF0, 0x12, 0xD4, 0xA4, 0xEA, 0x17, 0x75, 0x66, 0x49, 0x6C, 0xCF,
-    0x14, 0x28, 0xC6, 0x9A, 0x3C, 0x71, 0xFD, 0xB8, 0x3A, 0x6C, 0xE3, 0xA3,
-    0xA6, 0x06, 0x5A, 0xA6, 0xF0, 0x7A, 0x00, 0x15, 0xA5, 0x5A, 0x64, 0x66,
-    0x00, 0x05, 0x85, 0xB7};
-
-static unsigned char dh2048_g[] = {0x05};
-
-static DH *get_dh2048(void) {
-  DH *dh;
-  if ((dh = DH_new())) {
-    BIGNUM *p = BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL);
-    BIGNUM *g = BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL);
-    if (!p || !g
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-        || !DH_set0_pqg(dh, p, NULL, g)
-#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
-    ) {
-      /* DH_free() will free 'p' and 'g' at once. */
-      DH_free(dh);
-      return NULL;
-    }
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-    dh->p = p;
-    dh->g = g;
-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-  }
-  return (dh);
-}
-
-static char *ssl_pw = NULL;
-static int ssl_mode = SSL_DISABLED;
-static int ssl_fips_mode = SSL_FIPS_MODE_OFF;
-static int ssl_init_done = 0;
-
-SSL_CTX *server_ctx = NULL;
-SSL_CTX *client_ctx = NULL;
-
-/*
-  Note that the functions, i.e. strtok and strcasecmp, are not
-  considering multiple-byte characters as the original server
-  code does.
-*/
-static long process_tls_version(const char *tls_version) {
-  const char *separator = ", ";
-  char *token = NULL;
-#ifdef HAVE_TLSv13
-  const char *tls_version_name_list[] = {"TLSv1", "TLSv1.1", "TLSv1.2",
-                                         "TLSv1.3"};
-#else
-  const char *tls_version_name_list[] = {"TLSv1", "TLSv1.1", "TLSv1.2"};
-#endif /* HAVE_TLSv13 */
-#define TLS_VERSIONS_COUNTS \
-  (sizeof(tls_version_name_list) / sizeof(*tls_version_name_list))
-  unsigned int tls_versions_count = TLS_VERSIONS_COUNTS;
-#ifdef HAVE_TLSv13
-  const long tls_ctx_list[TLS_VERSIONS_COUNTS] = {
-      SSL_OP_NO_TLSv1, SSL_OP_NO_TLSv1_1, SSL_OP_NO_TLSv1_2, SSL_OP_NO_TLSv1_3};
-  const char *ctx_flag_default = "TLSv1,TLSv1.1,TLSv1.2,TLSv1.3";
-  long tls_ctx_flag = SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2 |
-                      SSL_OP_NO_TLSv1_3;
-#else
-  const long tls_ctx_list[TLS_VERSIONS_COUNTS] = {
-      SSL_OP_NO_TLSv1, SSL_OP_NO_TLSv1_1, SSL_OP_NO_TLSv1_2};
-  const char *ctx_flag_default = "TLSv1,TLSv1.1,TLSv1.2";
-  long tls_ctx_flag = SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2;
-#endif /* HAVE_TLSv13 */
-  unsigned int index = 0;
-  char tls_version_option[TLS_VERSION_OPTION_SIZE] = "";
-  int tls_found = 0;
-  char *saved_ctx = NULL;
-
-  if (!tls_version || !xcom_strcasecmp(tls_version, ctx_flag_default)) return 0;
-
-  if (strlen(tls_version) - 1 > sizeof(tls_version_option)) return -1;
-
-  strncpy(tls_version_option, tls_version, sizeof(tls_version_option));
-  token = xcom_strtok(tls_version_option, separator, &saved_ctx);
-  while (token) {
-    for (index = 0; index < tls_versions_count; index++) {
-      if (!xcom_strcasecmp(tls_version_name_list[index], token)) {
-        tls_found = 1;
-        tls_ctx_flag = tls_ctx_flag & (~tls_ctx_list[index]);
-        break;
-      }
-    }
-    token = xcom_strtok(NULL, separator, &saved_ctx);
-  }
-
-  if (!tls_found)
-    return -1;
-  else
-    return tls_ctx_flag;
-}
-
-/* purecov: begin deadcode */
-static int PasswordCallBack(char *passwd, int sz, int rw MY_ATTRIBUTE((unused)),
-                            void *userdata MY_ATTRIBUTE((unused))) {
-  const char *pw = ssl_pw ? ssl_pw : "yassl123";
-  strncpy(passwd, pw, (size_t)sz);
-  return (int)strlen(pw);
-}
-/* purecov: end */
-
-static int configure_ssl_algorithms(
-    SSL_CTX *ssl_ctx, const char *cipher, const char *tls_version,
-    const char *tls_ciphersuites MY_ATTRIBUTE((unused))) {
-  DH *dh = NULL;
-  long ssl_ctx_options = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
-  char cipher_list[SSL_CIPHER_LIST_SIZE] = {0};
-  long ssl_ctx_flags = -1;
-#ifdef HAVE_TLSv13
-  int tlsv1_3_enabled = 0;
-#endif /* HAVE_TLSv13 */
-
-  SSL_CTX_set_default_passwd_cb(ssl_ctx, PasswordCallBack);
-  SSL_CTX_set_session_cache_mode(ssl_ctx, SSL_SESS_CACHE_OFF);
-
-  ssl_ctx_flags = process_tls_version(tls_version);
-  if (ssl_ctx_flags < 0) {
-    G_ERROR("TLS version is invalid: %s", tls_version);
-    goto error;
-  }
-
-#ifdef HAVE_TLSv13
-  ssl_ctx_options = (ssl_ctx_options | ssl_ctx_flags) &
-                    (SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 |
-                     SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2 | SSL_OP_NO_TLSv1_3);
-#else
-  ssl_ctx_options = (ssl_ctx_options | ssl_ctx_flags) &
-                    (SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 |
-                     SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2);
-#endif /* HAVE_TLSv13 */
-
-  SSL_CTX_set_options(ssl_ctx, ssl_ctx_options);
-
-#ifdef HAVE_TLSv13
-  tlsv1_3_enabled = ((ssl_ctx_options & SSL_OP_NO_TLSv1_3) == 0);
-  if (tlsv1_3_enabled) {
-    /* Set OpenSSL TLS v1.3 ciphersuites.
-       If the ciphersuites are unspecified, i.e. tls_ciphersuites == NULL, then
-       we use whatever OpenSSL uses by default. Note that an empty list is
-       permissible; it disallows all ciphersuites. */
-    if (tls_ciphersuites != NULL) {
-      /*
-        Note: if TLSv1.3 is enabled but TLSv1.3 ciphersuite list is empty
-        (that's permissible and mentioned in the documentation),
-        the connection will fail with "no ciphers available" error.
-      */
-      if (SSL_CTX_set_ciphersuites(ssl_ctx, tls_ciphersuites) == 0) {
-        G_ERROR(
-            "Failed to set the list of ciphersuites. Check if the values "
-            "configured for ciphersuites are correct and valid and if the list "
-            "is not empty");
-        goto error;
-      }
-    }
-  } else {
-    /* Disable OpenSSL TLS v1.3 ciphersuites. */
-    if (SSL_CTX_set_ciphersuites(ssl_ctx, "") == 0) {
-      G_DEBUG("Failed to set empty ciphersuites with TLS v1.3 disabled.");
-      goto error;
-    }
-  }
-#endif /* HAVE_TLSv13 */
-
-  /*
-    Set the ciphers that can be used. Note, howerver, that the
-    SSL_CTX_set_cipher_list will return 0 if none of the provided
-    ciphers could be selected
-  */
-  strncat(cipher_list, tls_cipher_blocked, SSL_CIPHER_LIST_SIZE - 1);
-  if (cipher && strlen(cipher) != 0)
-    strncat(cipher_list, cipher, SSL_CIPHER_LIST_SIZE - 1);
-  else
-    strncat(cipher_list, tls_ciphers_list, SSL_CIPHER_LIST_SIZE - 1);
-
-  if (SSL_CTX_set_cipher_list(ssl_ctx, cipher_list) == 0) {
-    G_ERROR("Failed to set the list of chipers.");
-    goto error;
-  }
-
-  dh = get_dh2048();
-  if (SSL_CTX_set_tmp_dh(ssl_ctx, dh) == 0) {
-    G_ERROR("Error setting up Diffie-Hellman key exchange");
-    goto error;
-  }
-  DH_free(dh);
-
-  return 0;
-
-error:
-  if (dh) DH_free(dh);
-  return 1;
-}
-
-#define OPENSSL_ERROR_LENGTH 512
-static int configure_ssl_fips_mode(const uint fips_mode) {
-  int rc = -1;
-  unsigned int fips_mode_old = -1;
-  char err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
-  unsigned long err_library = 0;
-  if (fips_mode > 2) {
-    goto EXIT;
-  }
-  fips_mode_old = FIPS_mode();
-  if (fips_mode_old == fips_mode) {
-    rc = 1;
-    goto EXIT;
-  }
-  if (!(rc = FIPS_mode_set(fips_mode))) {
-    err_library = ERR_get_error();
-    ERR_error_string_n(err_library, err_string, sizeof(err_string) - 1);
-    err_string[sizeof(err_string) - 1] = '\0';
-    G_ERROR("openssl fips mode set failed: %s", err_string);
-  }
-EXIT:
-  return rc;
-}
-
-static int configure_ssl_ca(SSL_CTX *ssl_ctx, const char *ca_file,
-                            const char *ca_path) {
-  /* Load certs from the trusted ca. */
-  if (SSL_CTX_load_verify_locations(ssl_ctx, ca_file, ca_path) == 0) {
-    G_WARNING("Failed to locate and verify ca_file: %s, ca_path: %s", ca_file,
-              ca_path);
-    if (ca_file || ca_path) {
-      G_ERROR(
-          "Cannot use default locations because ca_file or "
-          "ca_path has been specified");
-      goto error;
-    }
-
-    /* Otherwise go use the defaults. */
-    if (SSL_CTX_set_default_verify_paths(ssl_ctx) == 0) {
-      G_ERROR("Failed to use defaults for ca_file and ca_path");
-      goto error;
-    }
-  }
-
-  return 0;
-
-error:
-  return 1;
-}
-
-static int configure_ssl_revocation(SSL_CTX *ssl_ctx MY_ATTRIBUTE((unused)),
-                                    const char *crl_file,
-                                    const char *crl_path) {
-  int retval = 0;
-  if (crl_file || crl_path) {
-    X509_STORE *store = SSL_CTX_get_cert_store(ssl_ctx);
-    /* Load crls from the trusted ca */
-    if (X509_STORE_load_locations(store, crl_file, crl_path) == 0 ||
-        X509_STORE_set_flags(
-            store, X509_V_FLAG_CRL_CHECK | X509_V_FLAG_CRL_CHECK_ALL) == 0) {
-      G_ERROR("X509_STORE_load_locations for CRL error");
-      retval = 1;
-    }
-  }
-  return retval;
-}
-
-static int configure_ssl_keys(SSL_CTX *ssl_ctx, const char *key_file,
-                              const char *cert_file) {
-  if (!cert_file && !key_file) {
-    G_ERROR("Both the certification file and the key file cannot be None");
-    goto error;
-  }
-
-  if (!cert_file && key_file) {
-    G_WARNING("Using the key file also as a certification file: %s.", key_file);
-    cert_file = key_file;
-  }
-
-  if (!key_file && cert_file) {
-    G_WARNING("Using the certification file also as a key file: %s.",
-              cert_file);
-    key_file = cert_file;
-  }
-
-  if (cert_file &&
-      SSL_CTX_use_certificate_file(ssl_ctx, cert_file, SSL_FILETYPE_PEM) <= 0) {
-    G_ERROR("Error loading certification file %s", cert_file);
-    goto error;
-  }
-
-  if (key_file &&
-      SSL_CTX_use_PrivateKey_file(ssl_ctx, key_file, SSL_FILETYPE_PEM) <= 0) {
-    G_ERROR("Error loading key file %s", key_file);
-    goto error;
-  }
-
-  /*
-    If we are using DSA, we can copy the parameters from the private key
-    Now we know that a key and cert have been set against the SSL context
-  */
-  if (cert_file && !SSL_CTX_check_private_key(ssl_ctx)) {
-    G_ERROR("Private key is not properly loaded");
-    goto error;
-  }
-
-  return 0;
-
-error:
-  return 1;
-}
-
-/* Initialize SSL. Return 1 f success, 0 if error */
-static int init_ssl(const char *key_file, const char *cert_file,
-                    const char *ca_file, const char *ca_path,
-                    const char *crl_file, const char *crl_path,
-                    const char *cipher, const char *tls_version,
-                    const char *tls_ciphersuites, SSL_CTX *ssl_ctx) {
-  G_DEBUG(
-      "Initializing SSL with key_file: '%s'  cert_file: '%s'  "
-      "ca_file: '%s'  ca_path: '%s'",
-      key_file ? key_file : "NULL", cert_file ? cert_file : "NULL",
-      ca_file ? ca_file : "NULL", ca_path ? ca_path : "NULL");
-
-  G_DEBUG(
-      "Additional SSL configuration is "
-      "cipher: '%s' crl_file: '%s' crl_path: '%s'",
-      cipher ? cipher : "NULL", crl_file ? crl_file : "NULL",
-      crl_path ? crl_path : "NULL");
-
-  G_DEBUG("TLS configuration is version: '%s', ciphersuites: '%s'",
-          tls_version ? tls_version : "NULL",
-          tls_ciphersuites ? tls_ciphersuites : "NULL");
-
-  if (configure_ssl_algorithms(ssl_ctx, cipher, tls_version, tls_ciphersuites))
-    goto error;
-
-  if (configure_ssl_ca(ssl_ctx, ca_file, ca_path)) goto error;
-
-  if (configure_ssl_revocation(ssl_ctx, crl_file, crl_path)) goto error;
-
-  if (configure_ssl_keys(ssl_ctx, key_file, cert_file)) goto error;
-
-  G_DEBUG("Success initializing SSL");
-
-  return 0;
-
-error:
-  G_MESSAGE("Error initializing SSL");
-  return 1;
-}
-
-int xcom_use_ssl() {
-  assert(ssl_mode >= SSL_DISABLED && ssl_mode < LAST_SSL_MODE);
-  return ssl_mode != SSL_DISABLED;
-}
-
-int xcom_get_ssl_mode(const char *mode) {
-  int retval = INVALID_SSL_MODE;
-  int idx = 0;
-
-  for (; idx < (int)SSL_MODE_OPTIONS_COUNT; ++idx) {
-    if (strcmp(mode, ssl_mode_options[idx]) == 0) {
-      retval = idx + 1; /* The enumeration is shifted. */
-      break;
-    }
-  }
-  assert(retval >= INVALID_SSL_MODE && retval <= LAST_SSL_MODE);
-
-  return retval;
-}
-
-int xcom_set_ssl_mode(int mode) {
-  int retval = INVALID_SSL_MODE;
-
-  mode = (mode == SSL_PREFERRED ? SSL_DISABLED : mode);
-  if (mode >= SSL_DISABLED && mode < LAST_SSL_MODE) retval = ssl_mode = mode;
-
-  assert(retval >= INVALID_SSL_MODE && retval < LAST_SSL_MODE);
-  assert(ssl_mode >= SSL_DISABLED && ssl_mode < LAST_SSL_MODE);
-
-  return retval;
-}
-
-int xcom_get_ssl_fips_mode(const char *mode) {
-  int retval = INVALID_SSL_FIPS_MODE;
-  int idx = 0;
-
-  for (; idx < (int)SSL_MODE_FIPS_OPTIONS_COUNT; ++idx) {
-    if (strcmp(mode, ssl_fips_mode_options[idx]) == 0) {
-      retval = idx;
-      break;
-    }
-  }
-  assert(retval > INVALID_SSL_FIPS_MODE && retval < LAST_SSL_FIPS_MODE);
-
-  return retval;
-}
-
-int xcom_set_ssl_fips_mode(int mode) {
-  int retval = INVALID_SSL_FIPS_MODE;
-
-  if (mode >= SSL_FIPS_MODE_OFF && mode < LAST_SSL_FIPS_MODE) {
-    retval = ssl_fips_mode = mode;
-  }
-
-  assert(retval > INVALID_SSL_FIPS_MODE && retval < LAST_SSL_FIPS_MODE);
-  return retval;
-}
-
-int xcom_init_ssl(const char *server_key_file, const char *server_cert_file,
-                  const char *client_key_file, const char *client_cert_file,
-                  const char *ca_file, const char *ca_path,
-                  const char *crl_file, const char *crl_path,
-                  const char *cipher, const char *tls_version,
-                  const char *tls_ciphersuites) {
-  int verify_server = SSL_VERIFY_NONE;
-  int verify_client = SSL_VERIFY_NONE;
-
-  if (configure_ssl_fips_mode(ssl_fips_mode) != 1) {
-    G_ERROR("Error setting the ssl fips mode");
-    goto error;
-  }
-
-  SSL_library_init();
-  SSL_load_error_strings();
-
-  if (ssl_mode == SSL_DISABLED) {
-    G_WARNING("SSL is not enabled");
-    return ssl_init_done;
-  }
-
-  if (ssl_init_done) {
-    G_WARNING("SSL already initialized");
-    return ssl_init_done;
-  }
-
-  G_DEBUG("Configuring SSL for the server")
-#ifdef HAVE_TLSv13
-  server_ctx = SSL_CTX_new(TLS_server_method());
-#else
-  server_ctx = SSL_CTX_new(SSLv23_server_method());
-#endif /* HAVE_TLSv13 */
-
-  if (!server_ctx) {
-    G_ERROR("Error allocating SSL Context object for the server");
-    goto error;
-  }
-  if (init_ssl(server_key_file, server_cert_file, ca_file, ca_path, crl_file,
-               crl_path, cipher, tls_version, tls_ciphersuites, server_ctx))
-    goto error;
-
-  if (ssl_mode != SSL_REQUIRED)
-    verify_server = SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE;
-  SSL_CTX_set_verify(server_ctx, verify_server, NULL);
-
-  G_DEBUG("Configuring SSL for the client")
-#ifdef HAVE_TLSv13
-  client_ctx = SSL_CTX_new(TLS_client_method());
-#else
-  client_ctx = SSL_CTX_new(SSLv23_client_method());
-#endif /* HAVE_TLSv13 */
-  if (!client_ctx) {
-    G_ERROR("Error allocating SSL Context object for the client");
-    goto error;
-  }
-  if (init_ssl(client_key_file, client_cert_file, ca_file, ca_path, crl_file,
-               crl_path, cipher, tls_version, tls_ciphersuites, client_ctx))
-    goto error;
-
-  if (ssl_mode != SSL_REQUIRED) verify_client = SSL_VERIFY_PEER;
-  SSL_CTX_set_verify(client_ctx, verify_client, NULL);
-
-  ssl_init_done = 1;
-
-  return ssl_init_done;
-
-error:
-  xcom_destroy_ssl();
-
-  return ssl_init_done;
-}
-
-void xcom_cleanup_ssl() {
-  if (!xcom_use_ssl()) return;
-
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-  ERR_remove_thread_state(0);
-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-}
-
-void xcom_destroy_ssl() {
-  if (!xcom_use_ssl()) return;
-
-  G_DEBUG("Destroying SSL");
-
-  ssl_init_done = 0;
-
-  if (server_ctx) {
-    SSL_CTX_free(server_ctx);
-    server_ctx = NULL;
-  }
-
-  if (client_ctx) {
-    SSL_CTX_free(client_ctx);
-    client_ctx = NULL;
-  }
-
-#if defined(WITH_SSL_STANDALONE)
-  ENGINE_cleanup();
-  EVP_cleanup();
-  CRYPTO_cleanup_all_ex_data();
-  ERR_free_strings();
-#endif
-
-  xcom_cleanup_ssl();
-
-  G_DEBUG("Success destroying SSL");
-}
-
-int ssl_verify_server_cert(SSL *ssl, const char *server_hostname) {
-  X509 *server_cert = NULL;
-  int ret_validation = 1;
-
-#if !(OPENSSL_VERSION_NUMBER >= 0x10002000L || defined(HAVE_WOLFSSL))
-  int cn_loc = -1;
-  char *cn = NULL;
-  ASN1_STRING *cn_asn1 = NULL;
-  X509_NAME_ENTRY *cn_entry = NULL;
-  X509_NAME *subject = NULL;
-#endif
-
-  G_DEBUG("Verifying server certificate and expected host name: %s",
-          server_hostname);
-
-  if (ssl_mode != SSL_VERIFY_IDENTITY) return 0;
-
-  if (!server_hostname) {
-    G_ERROR("No server hostname supplied to verify server certificate");
-    goto error;
-  }
-
-  if (!(server_cert = SSL_get_peer_certificate(ssl))) {
-    G_ERROR("Could not get server certificate to be verified");
-    goto error;
-  }
-
-  if (X509_V_OK != SSL_get_verify_result(ssl)) {
-    G_ERROR("Failed to verify the server certificate");
-    goto error;
-  }
-  /*
-    We already know that the certificate exchanged was valid; the SSL library
-    handled that. Now we need to verify that the contents of the certificate
-    are what we expect.
-  */
-
-  /* Use OpenSSL certificate matching functions instead of our own if we
-     have OpenSSL. The X509_check_* functions return 1 on success.
-  */
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L || defined(HAVE_WOLFSSL)
-  if ((X509_check_host(server_cert, server_hostname, strlen(server_hostname), 0,
-                       0) != 1) &&
-      (X509_check_ip_asc(server_cert, server_hostname, 0) != 1)) {
-    G_ERROR(
-        "Failed to verify the server certificate via X509 certificate "
-        "matching functions");
-    goto error;
-
-  } else {
-    /* Success */
-    ret_validation = 0;
-  }
-#else  /* OPENSSL_VERSION_NUMBER < 0x10002000L */
-  /*
-     OpenSSL prior to 1.0.2 do not support X509_check_host() function.
-     Use deprecated X509_get_subject_name() instead.
-  */
-  subject = X509_get_subject_name((X509 *)server_cert);
-  /* Find the CN location in the subject */
-  cn_loc = X509_NAME_get_index_by_NID(subject, NID_commonName, -1);
-  if (cn_loc < 0) {
-    G_ERROR("Failed to get CN location in the server certificate subject");
-    goto error;
-  }
-
-  /* Get the CN entry for given location */
-  cn_entry = X509_NAME_get_entry(subject, cn_loc);
-  if (cn_entry == NULL) {
-    G_ERROR(
-        "Failed to get CN entry using CN location in the server "
-        "certificate");
-    goto error;
-  }
-
-  /* Get CN from common name entry */
-  cn_asn1 = X509_NAME_ENTRY_get_data(cn_entry);
-  if (cn_asn1 == NULL) {
-    G_ERROR("Failed to get CN from CN entry in the server certificate");
-    goto error;
-  }
-
-  cn = (char *)ASN1_STRING_data(cn_asn1);
-
-  /* There should not be any NULL embedded in the CN */
-  if ((size_t)ASN1_STRING_length(cn_asn1) != strlen(cn)) {
-    G_ERROR("NULL embedded in the server certificate CN");
-    goto error;
-  }
-
-  G_DEBUG("Server hostname in cert: %s", cn);
-
-  if (!strcmp(cn, server_hostname)) {
-    /* Success */
-    ret_validation = 0;
-  } else {
-    G_ERROR(
-        "Expected hostname is '%s' but found the name '%s' in the "
-        "server certificate",
-        cn, server_hostname);
-  }
-#endif /* OPENSSL_VERSION_NUMBER >= 0x10002000L */
-
-error:
-  if (server_cert) X509_free(server_cert);
-
-  return ret_validation;
-}
-#else
-int avoid_compile_warning = 1;
-#endif
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_transport.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_transport.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_transport.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_transport.cc	2021-09-28 11:46:34.000000000 +0000
@@ -62,6 +62,7 @@
 #include "xcom/xdr_utils.h"
 #include "xdr_gen/xcom_vp.h"
 
+#include "xcom/network/network_provider_manager.h"
 #ifndef XCOM_WITHOUT_OPENSSL
 #ifdef _WIN32
 /* In OpenSSL before 1.1.0, we need this first. */
@@ -72,11 +73,8 @@
 #include <openssl/ssl.h>
 
 #endif
-#ifndef XCOM_WITHOUT_OPENSSL
-#include "xcom/xcom_ssl_transport.h"
-#endif
 
-#define MY_XCOM_PROTO x_1_8
+#define MY_XCOM_PROTO x_1_9
 
 xcom_proto const my_min_xcom_version =
     x_1_0; /* The minimum protocol version I am able to understand */
@@ -96,15 +94,53 @@
 
 static xcom_port xcom_listen_port = 0; /* Port used by xcom */
 
-static xcom_socket_accept_cb xcom_socket_accept_callback = NULL;
-
 /* purecov: begin deadcode */
 static int pm(xcom_port port) { return port == xcom_listen_port; }
 /* purecov: end */
 
-int set_xcom_socket_accept_cb(xcom_socket_accept_cb x) {
-  xcom_socket_accept_callback = x;
-  return 1;
+int close_open_connection(connection_descriptor *conn) {
+  return Network_provider_manager::getInstance().close_xcom_connection(conn);
+}
+
+connection_descriptor *open_new_connection(const char *server, xcom_port port,
+                                           int connection_timeout) {
+  return Network_provider_manager::getInstance().open_xcom_connection(
+      server, port, Network_provider_manager::getInstance().is_xcom_using_ssl(),
+      connection_timeout);
+}
+
+/* purecov: begin deadcode */
+connection_descriptor *open_new_local_connection(const char *server,
+                                                 xcom_port port) {
+  // Local connection must avoid SSL at all costs.
+  // Neverthless, we will keep the service running with local signalling,
+  // trying to make a connection without SSL, and afterwards, with SSL.
+  connection_descriptor *retval = nullptr;
+  retval = Network_provider_manager::getInstance().open_xcom_connection(
+      server, port, false);
+
+  if (retval->fd == -1) {
+    free(retval);
+    retval = nullptr;
+    retval = open_new_connection(server, port);
+  }
+
+  return retval;
+}
+/* purecov: end */
+
+result set_nodelay(int fd) {
+  int n = 1;
+  result ret = {0, 0};
+
+  do {
+    SET_OS_ERR(0);
+    ret.val =
+        setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (xcom_buf *)&n, sizeof n);
+    ret.funerr = to_errno(GET_OS_ERR);
+    IFDBG(D_NONE, FN; NDBG(from_errno(ret.funerr), d));
+  } while (ret.val < 0 && can_retry(ret.funerr));
+  return ret;
 }
 
 void init_xcom_transport(xcom_port listen_port) {
@@ -166,18 +202,18 @@
   u_int buflen;
   END_ENV;
 
+  int64_t sent{0};
   TASK_BEGIN
   ep->buflen = s->out_buf.n;
   reset_srv_buf(&s->out_buf);
-  if (s->con.fd >= 0) {
+  if (s->con->fd >= 0) {
     if (ep->buflen) {
-      int64_t sent;
       IFDBG(D_TRANSPORT, FN; PTREXP(stack); NDBG(ep->buflen, u));
       /* LOCK_FD(s->con.fd, 'w'); */
-      TASK_CALL(task_write(&s->con, s->out_buf.buf, ep->buflen, &sent));
+      TASK_CALL(task_write(s->con, s->out_buf.buf, ep->buflen, &sent));
       /* UNLOCK_FD(s->fd, 'w'); */
       if (sent <= 0) {
-        shutdown_connection(&s->con);
+        shutdown_connection(s->con);
       }
       TASK_RETURN(sent);
     }
@@ -259,6 +295,7 @@
   char *buf;
   END_ENV;
 
+  int64_t sent{0};
   TASK_BEGIN
   p->to = to;
   IFDBG(D_NONE, FN; PTREXP(stack); PTREXP(s); PTREXP(p); NDBG(s->con.fd, d));
@@ -270,23 +307,22 @@
     TASK_RETURN(sizeof(*p));
   } else {
     p->max_synode = get_max_synode();
-    if (s->con.fd >= 0) {
+    if (s->con->fd >= 0) {
       /* LOCK_FD(s->con.fd, 'w'); */
-      serialize_msg(p, s->con.x_proto, &ep->buflen, &ep->buf);
+      serialize_msg(p, s->con->x_proto, &ep->buflen, &ep->buf);
       IFDBG(D_TRANSPORT, FN; NDBG(ep->buflen, u));
       if (ep->buflen) {
-        int64_t sent;
         /* Not enough space? Flush the buffer */
         if (ep->buflen > srv_buf_free_space(&s->out_buf)) {
           TASK_CALL(flush_srv_buf(s, ret));
-          if (s->con.fd < 0) {
+          if (s->con->fd < 0) {
             TASK_FAIL;
           }
           /* Still not enough? Message must be huge, send without buffering */
           if (ep->buflen > srv_buf_free_space(&s->out_buf)) {
             IFDBG(D_TRANSPORT, FN; STRLIT("task_write "); NDBG(ep->buflen, u));
-            TASK_CALL(task_write(&s->con, ep->buf, ep->buflen, &sent));
-            if (s->con.fd < 0) {
+            TASK_CALL(task_write(s->con, ep->buf, ep->buflen, &sent));
+            if (s->con->fd < 0) {
               TASK_FAIL;
             }
           } else { /* Buffer the write */
@@ -308,7 +344,7 @@
         X_FREE(ep->buf);
         /* UNLOCK_FD(s->con.fd, 'w'); */
         if (sent <= 0) {
-          shutdown_connection(&s->con);
+          shutdown_connection(s->con);
         }
         TASK_RETURN(sent);
       }
@@ -344,24 +380,20 @@
   char buf[MSG_HDR_SIZE];
   END_ENV;
 
+  int64_t sent{0};
   TASK_BEGIN
   if (con->fd >= 0) {
     con->snd_tag = tag;
     write_protoversion(VERS_PTR((unsigned char *)ep->buf), x_proto);
     put_header_1_0((unsigned char *)ep->buf, 0, x_type, tag);
-
-    {
-      int64_t sent;
-
-      TASK_CALL(task_write(con, ep->buf, MSG_HDR_SIZE, &sent));
-      if (con->fd < 0) {
-        TASK_FAIL;
-      }
-      if (sent <= 0) {
-        shutdown_connection(con);
-      }
-      TASK_RETURN(sent);
+    TASK_CALL(task_write(con, ep->buf, MSG_HDR_SIZE, &sent));
+    if (con->fd < 0) {
+      TASK_FAIL;
+    }
+    if (sent <= 0) {
+      shutdown_connection(con);
     }
+    TASK_RETURN(sent);
   } else {
     TASK_FAIL;
   }
@@ -382,7 +414,7 @@
 int apply_xdr(void *buff, uint32_t bufflen, xdrproc_t xdrfunc, void *xdrdata,
               enum xdr_op op) {
   XDR xdr;
-  int MY_ATTRIBUTE((unused)) s = 0;
+  [[maybe_unused]] int s = 0;
 
   xdr.x_ops = NULL;
   xdrmem_create(&xdr, (char *)buff, bufflen, op);
@@ -400,8 +432,8 @@
   */
   if (xdr.x_ops) {
     s = XDRFUNC(&xdr, xdrdata);
+    xdr_destroy(&xdr);
   }
-  xdr_destroy(&xdr);
   return s;
 }
 
@@ -452,7 +484,7 @@
     Allocate space for version number, length field, type, tag, and serialized
     message. Explicit type case suppress the warnings on 32bits.
   */
-  buf = (unsigned char *)calloc((size_t)1, (size_t)tot_buflen);
+  buf = (unsigned char *)xcom_calloc((size_t)1, (size_t)tot_buflen);
   if (buf) {
     /* Write protocol version */
     write_protoversion(buf, x_proto);
@@ -474,22 +506,11 @@
 }
 
 /* Version 1 has no new messages, only modified, so all should be sent */
-static inline int old_proto_knows(xcom_proto x_proto MY_ATTRIBUTE((unused)),
-                                  pax_op op MY_ATTRIBUTE((unused))) {
+static inline int old_proto_knows(xcom_proto x_proto [[maybe_unused]],
+                                  pax_op op [[maybe_unused]]) {
   return 1;
 }
 
-/* must match enum x_proto */
-extern "C" bool_t xdr_pax_msg_1_0(XDR *, pax_msg *);
-extern "C" bool_t xdr_pax_msg_1_1(XDR *, pax_msg *);
-extern "C" bool_t xdr_pax_msg_1_2(XDR *, pax_msg *);
-extern "C" bool_t xdr_pax_msg_1_3(XDR *, pax_msg *);
-extern "C" bool_t xdr_pax_msg_1_4(XDR *, pax_msg *);
-extern "C" bool_t xdr_pax_msg_1_5(XDR *, pax_msg *);
-extern "C" bool_t xdr_pax_msg_1_6(XDR *, pax_msg *);
-extern "C" bool_t xdr_pax_msg_1_7(XDR *, pax_msg *);
-extern "C" bool_t xdr_pax_msg_1_8(XDR *, pax_msg *);
-
 static xdrproc_t pax_msg_func[] = {
     reinterpret_cast<xdrproc_t>(0),
     reinterpret_cast<xdrproc_t>(xdr_pax_msg_1_0),
@@ -500,7 +521,8 @@
     reinterpret_cast<xdrproc_t>(xdr_pax_msg_1_5),
     reinterpret_cast<xdrproc_t>(xdr_pax_msg_1_6),
     reinterpret_cast<xdrproc_t>(xdr_pax_msg_1_7),
-    reinterpret_cast<xdrproc_t>(xdr_pax_msg_1_8)};
+    reinterpret_cast<xdrproc_t>(xdr_pax_msg_1_8),
+    reinterpret_cast<xdrproc_t>(xdr_pax_msg_1_9)};
 
 int serialize_msg(pax_msg *p, xcom_proto x_proto, uint32_t *buflen,
                   char **buf) {
@@ -552,7 +574,7 @@
 static server *mksrv(char *srv, xcom_port port) {
   server *s;
 
-  s = (server *)calloc((size_t)1, sizeof(*s));
+  s = (server *)xcom_calloc((size_t)1, sizeof(*s));
 
   IFDBG(D_NONE, FN; PTREXP(s); STREXP(srv));
   if (s == 0) {
@@ -564,11 +586,15 @@
   s->refcnt = 0;
   s->srv = srv;
   s->port = port;
-  reset_connection(&s->con);
+  s->con = new_connection(-1, nullptr);
   s->active = 0.0;
   s->detected = 0.0;
   s->last_ping_received = 0.0;
   s->number_of_pings_received = 0;
+#if defined(_WIN32)
+  s->reconnect = false;
+#endif
+
   channel_init(&s->outgoing, TYPE_HASH("msg_link"));
   IFDBG(D_NONE, FN; STREXP(srv); NDBG(port, d));
 
@@ -681,6 +707,7 @@
 
 /* Free a server */
 static void freesrv(server *s) {
+  X_FREE(s->con);
   X_FREE(s->srv);
   X_FREE(s);
 }
@@ -697,7 +724,7 @@
   if (!s) return;
   IFDBG(D_NONE, FN; PTREXP(s); STREXP(s->srv));
 
-  shutdown_connection(&s->con);
+  shutdown_connection(s->con);
 
   /* Tasks will free the server object when they terminate */
   if (s->sender) task_terminate(s->sender);
@@ -721,93 +748,35 @@
 }
 
 /* Listen for connections on socket and create a handler task */
-int tcp_server(task_arg arg) {
+int incoming_connection_task(task_arg arg [[maybe_unused]]) {
   DECL_ENV
-  int fd;
-  int cfd;
-  int refused;
+  connection_descriptor *new_conn;
   END_ENV;
   TASK_BEGIN
-  ep->fd = get_int_arg(arg);
-  ep->refused = 0;
-  unblock_fd(ep->fd);
-  IFDBG(D_TRANSPORT, FN; NDBG(ep->fd, d););
-  G_MESSAGE("XCom protocol version: %d", my_xcom_version);
-  G_MESSAGE(
-      "XCom initialized and ready to accept incoming connections on port %d",
-      xcom_listen_port);
+
   do {
-    TASK_CALL(accept_tcp(ep->fd, &ep->cfd));
-    /* Callback to check that the file descriptor is accepted. */
-    if (xcom_socket_accept_callback &&
-        !xcom_socket_accept_callback(ep->cfd, get_site_def())) {
-      /* purecov: begin inspected */
-      shut_close_socket(&ep->cfd); /* Will set cfd to -1 */
-      /* purecov: end */
-    }
-    if (ep->cfd < 0) {
-      G_DEBUG("accept failed");
-      ep->refused = 1;
+    ep->new_conn =
+        Network_provider_manager::getInstance().incoming_connection();
+    if (ep->new_conn == nullptr) {
       TASK_DELAY(0.1);
     } else {
-      ep->refused = 0;
-      IFDBG(D_TRANSPORT, FN; NDBG(ep->cfd, d););
-      task_new(acceptor_learner_task, int_arg(ep->cfd), "acceptor_learner_task",
-               XCOM_THREAD_DEBUG);
+      task_new(acceptor_learner_task, void_arg(ep->new_conn),
+               "acceptor_learner_task", XCOM_THREAD_DEBUG);
     }
-  } while (!xcom_shutdown && (ep->cfd >= 0 || ep->refused));
+  } while (!xcom_shutdown);
   FINALLY
-  assert(ep->fd >= 0);
-  shut_close_socket(&ep->fd);
+  // Cleanup connection if this is stuck
+  connection_descriptor *clean_conn =
+      Network_provider_manager::getInstance().incoming_connection();
+  if (clean_conn) {
+    close_connection(clean_conn);
+  }
+  free(clean_conn);
+
   IFDBG(D_BUG, FN; STRLIT(" shutdown "));
   TASK_END;
 }
 
-#ifndef XCOM_WITHOUT_OPENSSL
-#define SSL_CONNECT(con, hostname)                                   \
-  {                                                                  \
-    result ret;                                                      \
-    con.ssl_fd = SSL_new(client_ctx);                                \
-    SSL_set_fd(con.ssl_fd, con.fd);                                  \
-    ERR_clear_error();                                               \
-    ret.val = SSL_connect(con.ssl_fd);                               \
-    ret.funerr = to_ssl_err(SSL_get_error(con.ssl_fd, ret.val));     \
-    while (ret.val != SSL_SUCCESS && can_retry(ret.funerr)) {        \
-      if (from_ssl_err(ret.funerr) == SSL_ERROR_WANT_READ) {         \
-        wait_io(stack, con.fd, 'r');                                 \
-      } else if (from_ssl_err(ret.funerr) == SSL_ERROR_WANT_WRITE) { \
-        wait_io(stack, con.fd, 'w');                                 \
-      } else {                                                       \
-        break;                                                       \
-      }                                                              \
-      TASK_YIELD;                                                    \
-      SET_OS_ERR(0);                                                 \
-      if (con.fd < 0) {                                              \
-        ssl_free_con(&con);                                          \
-        close_connection(&con);                                      \
-        TERMINATE;                                                   \
-      }                                                              \
-                                                                     \
-      ERR_clear_error();                                             \
-      ret.val = SSL_connect(con.ssl_fd);                             \
-      ret.funerr = to_ssl_err(SSL_get_error(con.ssl_fd, ret.val));   \
-    }                                                                \
-                                                                     \
-    if (ret.val != SSL_SUCCESS) {                                    \
-      ssl_free_con(&con);                                            \
-      close_connection(&con);                                        \
-      TERMINATE;                                                     \
-    } else {                                                         \
-      if (ssl_verify_server_cert(con.ssl_fd, hostname)) {            \
-        ssl_free_con(&con);                                          \
-        close_connection(&con);                                      \
-        TERMINATE;                                                   \
-      }                                                              \
-      set_connected(&con, CON_FD);                                   \
-    }                                                                \
-  }
-#endif
-
 void server_detected(server *s) { s->detected = task_now(); }
 
 /* Try to connect to another node */
@@ -817,25 +786,32 @@
   END_ENV;
 
   TASK_BEGIN
-  IFDBG(D_NONE, FN; STRLIT(" dial "); NPUT(get_nodeno(get_site_def()), u);
+  IFDBG(D_BUG, FN; STRLIT(" dial "); NPUT(get_nodeno(get_site_def()), u);
         STRLIT(s->srv); NDBG(s->port, u));
-  reset_connection(&s->con);
-  TASK_CALL(connect_tcp(s->srv, s->port, &s->con.fd));
-  if (s->con.fd < 0) {
+
+  // Delete old connection
+  reset_connection(s->con);
+  X_FREE(s->con);
+  s->con = nullptr;
+
+  s->con = open_new_connection(s->srv, s->port, 1000);
+  if (!s->con) {
+    s->con = new_connection(-1, nullptr);
+  }
+
+  if (s->con->fd < 0) {
     IFDBG(D_NONE, FN; STRLIT("could not dial "); STRLIT(s->srv);
           NDBG(s->port, u););
   } else {
     if (NAGLE == 0) {
-      set_nodelay(s->con.fd);
+      set_nodelay(s->con->fd);
     }
 
-    unblock_fd(s->con.fd);
-#ifndef XCOM_WITHOUT_OPENSSL
-    if (xcom_use_ssl()) {
-      SSL_CONNECT(s->con, s->srv);
-    }
-#endif
-    set_connected(&s->con, CON_FD);
+    unblock_fd(s->con->fd);
+    IFDBG(D_BUG, FN; STRLIT(" dial connected ");
+          NPUT(get_nodeno(get_site_def()), u); STRLIT(s->srv);
+          NDBG(s->port, u));
+    set_connected(s->con, CON_FD);
     alive(s);
     update_detected(get_site_def_rw());
   }
@@ -894,7 +870,7 @@
 /* Send message to set of nodes determined by test_func */
 static inline int send_to_node_set(site_def const *s, node_no max, pax_msg *p,
                                    node_set_selector test_func,
-                                   const char *dbg MY_ATTRIBUTE((unused))) {
+                                   const char *dbg [[maybe_unused]]) {
   int retval = 0;
   assert(s);
   if (s) {
@@ -926,18 +902,13 @@
 }
 /* purecov: end */
 
-/* Send to self in site */
-int send_to_self_site(site_def const *s, pax_msg *p) {
-  return _send_server_msg(s, get_nodeno(s), p);
-}
-
 /* Send to all servers */
 int send_to_all(pax_msg *p, const char *dbg) {
   return send_to_all_site(find_site_def(p->synode), p, dbg);
 }
 
 static inline int send_other_loop(site_def const *s, pax_msg *p,
-                                  const char *dbg MY_ATTRIBUTE((unused))) {
+                                  const char *dbg [[maybe_unused]]) {
   int retval = 0;
   node_no i = 0;
 #ifdef MAXACCEPT
@@ -966,7 +937,7 @@
 
 /* Send to some other live server, round robin */
 int send_to_someone(site_def const *s, pax_msg *p,
-                    const char *dbg MY_ATTRIBUTE((unused))) {
+                    const char *dbg [[maybe_unused]]) {
   int retval = 0;
   static node_no i = 0;
   node_no prev = 0;
@@ -1085,10 +1056,8 @@
 
   IFDBG(D_TRANSPORT, FN; NDBG(rfd->fd, d); PTREXP(s); NDBG(n, u));
 
-  TASK_BEGIN
-
-      (void)
-  s;
+  int64_t nread{0};
+  TASK_BEGIN(void) s;
   ep->left = n;
   ep->bytes = (char *)p;
 
@@ -1108,7 +1077,6 @@
   } else {
     /* Buffered read makes sense */
     while (ep->left > 0) {
-      int64_t nread;
       /* Buffer is empty, reset and read */
       reset_srv_buf(buf);
 
@@ -1174,7 +1142,8 @@
     TASK_CALL(read_bytes(rfd, (char *)ep->header_buf, MSG_HDR_SIZE, s, &ep->n));
 
     if (ep->n != MSG_HDR_SIZE) {
-      G_INFO("Failure reading from fd=%d n=%" PRIu64, rfd->fd, ep->n);
+      G_INFO("Failure reading from fd=%d n=%" PRIu64 " from %s:%d", rfd->fd,
+             ep->n, s->srv, s->port);
       IFDBG(D_TRANSPORT, FN; NDBG(rfd->fd, d); NDBG64(ep->n));
       TASK_FAIL;
     }
@@ -1237,7 +1206,7 @@
   /* OK, we can grok this version */
 
   /* Allocate buffer space for message */
-  ep->bytes = (char *)calloc((size_t)1, (size_t)ep->msgsize);
+  ep->bytes = (char *)xcom_calloc((size_t)1, (size_t)ep->msgsize);
   if (!ep->bytes) {
     TASK_FAIL;
   }
@@ -1350,7 +1319,7 @@
   /* OK, we can grok this version */
 
   /* Allocate buffer space for message */
-  ep->bytes = (char *)calloc((size_t)1, (size_t)ep->msgsize);
+  ep->bytes = (char *)xcom_calloc((size_t)1, (size_t)ep->msgsize);
   if (!ep->bytes) {
     TASK_FAIL;
   }
@@ -1375,6 +1344,7 @@
   TASK_END;
 }
 
+#if 0
 int recv_proto(connection_descriptor const *rfd, xcom_proto *x_proto,
                x_msg_type *x_type, unsigned int *tag, int64_t *ret) {
   DECL_ENV
@@ -1401,6 +1371,7 @@
   FINALLY
   TASK_END;
 }
+#endif
 
 /* Sender task */
 
@@ -1433,13 +1404,20 @@
   unsigned int tag;
   double dtime;
   double channel_empty_time;
+#if defined(_WIN32)
+  bool was_connected;
+#endif
   END_ENV;
 
+  int64_t ret_code{0};
   TASK_BEGIN
 
   ep->channel_empty_time = task_now();
   ep->dtime = INITIAL_CONNECT_WAIT; /* Initial wait is short, to avoid
                                        unnecessary waiting */
+#if defined(_WIN32)
+  ep->was_connected = false;
+#endif
   ep->s = (server *)get_void_arg(arg);
   ep->link = NULL;
   ep->tag = TAG_START;
@@ -1447,10 +1425,23 @@
 
   while (!xcom_shutdown) {
     /* Loop until connected */
-    G_DEBUG("Connecting to %s:%d", ep->s->srv, ep->s->port);
+    G_MESSAGE("Connecting to %s:%d", ep->s->srv, ep->s->port);
     for (;;) {
-      TASK_CALL(dial(ep->s));
-      if (is_connected(&ep->s->con)) break;
+#if defined(_WIN32)
+      if (!ep->was_connected) {
+#endif
+        TASK_CALL(dial(ep->s));
+#if defined(_WIN32)
+      } else {
+        ep->s->reconnect = true;
+      }
+#endif
+      if (is_connected(ep->s->con)) break;
+
+      if (ep->dtime < MAX_CONNECT_WAIT) {
+        G_MESSAGE("Connection to %s:%d failed", ep->s->srv, ep->s->port);
+      }
+
       TIMED_TASK_WAIT(&connect_wait, ep->dtime);
       if (xcom_shutdown) TERMINATE;
       /* Delay cleanup of messages to avoid unnecessary loss when connecting */
@@ -1458,22 +1449,26 @@
         empty_msg_channel(&ep->s->outgoing);
         ep->channel_empty_time = task_now();
       }
-      ep->dtime *= CONNECT_WAIT_INCREASE; /* Increase wait time for next try */
+
+      ep->dtime += CONNECT_WAIT_INCREASE; /* Increase wait time for next try */
       if (ep->dtime > MAX_CONNECT_WAIT) {
         ep->dtime = MAX_CONNECT_WAIT;
       }
     }
 
-    G_DEBUG("Connected to %s:%d on fd=%d", ep->s->srv, ep->s->port,
-            ep->s->con.fd);
+    G_MESSAGE("Connected to %s:%d", ep->s->srv, ep->s->port);
     ep->dtime = INITIAL_CONNECT_WAIT;
+#if defined(_WIN32)
+    ep->was_connected = true;
+    ep->s->reconnect = false;
+#endif
     reset_srv_buf(&ep->s->out_buf);
 
     /* We are ready to start sending messages.
        Insert a message in the input queue to negotiate the protocol.
     */
     start_protocol_negotiation(&ep->s->outgoing);
-    while (is_connected(&ep->s->con)) {
+    while (is_connected(ep->s->con)) {
       int64_t ret;
       assert(!ep->link);
       if (false && link_empty(&ep->s->outgoing.data)) {
@@ -1486,7 +1481,6 @@
       }
       CHANNEL_GET(&ep->s->outgoing, &ep->link, msg_link);
       {
-        int64_t ret_code;
         /* IFDBG(D_NONE, FN; PTREXP(stack); PTREXP(ep->link));
         IFDBG(D_NONE, FN; PTREXP(&ep->s->outgoing);
                COPY_AND_FREE_GOUT(dbg_msg_link(ep->link)););
@@ -1521,18 +1515,18 @@
               add_event(EVENT_DUMP_PAD, uint_arg(ep->link->p->to)); add_event(
                   EVENT_DUMP_PAD, string_arg(pax_op_to_str(ep->link->p->op))););
         } else {
-          set_connected(&ep->s->con, CON_FD);
+          set_connected(ep->s->con, CON_FD);
           /* Send protocol negotiation request */
           do {
-            TASK_CALL(send_proto(&ep->s->con, my_xcom_version, x_version_req,
+            TASK_CALL(send_proto(ep->s->con, my_xcom_version, x_version_req,
                                  ep->tag, &ret_code));
-            if (!is_connected(&ep->s->con)) {
+            if (!is_connected(ep->s->con)) {
               goto next;
             }
             ep->tag = incr_tag(ep->tag);
           } while (ret_code < 0);
           G_DEBUG("sent negotiation request for protocol %d fd %d",
-                  my_xcom_version, ep->s->con.fd);
+                  my_xcom_version, ep->s->con->fd);
           ADD_DBG(
               D_TRANSPORT,
               add_event(EVENT_DUMP_PAD,
@@ -1542,9 +1536,9 @@
 
           /* Wait until negotiation done.
              reply_handler_task will catch reply and change state */
-          while (!proto_done(&ep->s->con)) {
+          while (!proto_done(ep->s->con)) {
             TASK_DELAY(0.1);
-            if (!is_connected(&ep->s->con)) {
+            if (!is_connected(ep->s->con)) {
               goto next;
             }
           }
@@ -1569,6 +1563,41 @@
   TASK_END;
 }
 
+#if defined(_WIN32)
+/* Reconnect tcp connections on windows to avoid task starvation */
+int tcp_reconnection_task(task_arg arg [[maybe_unused]]) {
+  DECL_ENV
+  int dummy;
+  server *s;
+  int i;
+  END_ENV;
+  TASK_BEGIN
+
+  ep->s = nullptr;
+  ep->i = 0;
+
+  while (!xcom_shutdown) {
+    {
+      ep->s = nullptr;
+      for (ep->i = 0; ep->i < maxservers; ep->i++) {
+        ep->s = all_servers[ep->i];
+        if (ep->s && ep->s->reconnect && !is_connected(ep->s->con)) {
+          TASK_CALL(dial(ep->s));
+          if (is_connected(ep->s->con)) {
+            ep->s->reconnect = false;
+          }
+          TASK_DELAY(2.0)
+        }
+      }
+    }
+    TASK_DELAY(2.0);
+  }
+  FINALLY
+  IFDBG(D_BUG, FN; STRLIT(" shutdown "));
+  TASK_END;
+}
+#endif
+
 /* Fetch messages from queue and send to self.
    Having a separate mechanism for internal communication
    avoids SSL blocking when trying to connect to same thread. */
@@ -1635,9 +1664,9 @@
       char *name = NULL;
       xcom_port port = 0;
 
-      name = (char *)malloc(IP_MAX_SIZE);
+      name = (char *)xcom_malloc(IP_MAX_SIZE);
 
-      /* In this specific place, addr mut have been validated elsewhere,
+      /* In this specific place, addr must have been validated elsewhere,
          specifically when the node is added. */
       if (get_ip_and_port(addr, name, &port)) {
         G_INFO("Error parsing ip:port for new server. Incorrect value is %s",
@@ -1650,7 +1679,7 @@
         server *sp = find_server(all_servers, maxservers, name, port);
 
         if (sp) {
-          G_INFO("Re-using server node %d host %s", i, name);
+          G_INFO("Re-using server node %d host %s:%d", i, name, port);
           s->servers[i] = sp;
 
           /*
@@ -1664,7 +1693,7 @@
           free(name);
           if (sp->invalid) sp->invalid = 0;
         } else { /* No server? Create one */
-          G_INFO("Creating new server node %d host %s", i, name);
+          G_INFO("Creating new server node %d host %s:%d", i, name, port);
           if (port > 0) {
             s->servers[i] = addsrv(name, port);
           } else {
@@ -1673,6 +1702,7 @@
             /* purecov: end */
           }
         }
+        IFDBG(D_BUG, FN; PTREXP(s->servers[i]));
       }
     }
     /* Zero the rest */
@@ -1724,7 +1754,7 @@
 }
 
 /* Remove tcp connections which seem to be idle */
-int tcp_reaper_task(task_arg arg MY_ATTRIBUTE((unused))) {
+int tcp_reaper_task(task_arg arg [[maybe_unused]]) {
   DECL_ENV
   int dummy;
   END_ENV;
@@ -1735,8 +1765,8 @@
       double now = task_now();
       for (i = 0; i < maxservers; i++) {
         server *s = all_servers[i];
-        if (s && s->con.fd != -1 && (s->active + 10.0) < now) {
-          shutdown_connection(&s->con);
+        if (s && s->con->fd != -1 && (s->active + 10.0) < now) {
+          shutdown_connection(s->con);
         }
       }
     }
@@ -1759,16 +1789,10 @@
   con->ssl_fd = NULL;
 }
 
-void ssl_shutdown_con(connection_descriptor *con) {
-  if (con->fd >= 0 && con->ssl_fd != NULL) {
-    SSL_shutdown(con->ssl_fd);
-    ssl_free_con(con);
-  }
-}
 #endif
 
 void close_connection(connection_descriptor *con) {
-  shut_close_socket(&con->fd);
+  close_open_connection(con);
   set_connected(con, CON_NULL);
 }
 
@@ -1776,18 +1800,20 @@
   /* printstack(1); */
   ADD_DBG(D_TRANSPORT, add_event(EVENT_DUMP_PAD, string_arg("con->fd"));
           add_event(EVENT_DUMP_PAD, int_arg(con->fd)););
-#ifndef XCOM_WITHOUT_OPENSSL
-  ssl_shutdown_con(con);
-#endif
   close_connection(con);
+
+  remove_and_wakeup(con->fd);
+  con->fd = -1;
 }
 
 void reset_connection(connection_descriptor *con) {
-  con->fd = -1;
+  if (con) {
+    con->fd = -1;
 #ifndef XCOM_WITHOUT_OPENSSL
-  con->ssl_fd = 0;
+    con->ssl_fd = 0;
 #endif
-  set_connected(con, CON_NULL);
+    set_connected(con, CON_NULL);
+  }
 }
 
 /* The protocol version used by the group as a whole is the minimum of the
@@ -1890,6 +1916,9 @@
         G_DEBUG("Malformed IPv6 address '%s'", p->address);
         return 0;
       }
+    } else if (!isxdigit(*(p->in))) {
+      G_DEBUG("Malformed IPv6 address '%s'", p->address);
+      return 0;
     }
     p->in++;
   }
@@ -1922,15 +1951,24 @@
 static int match_ip_and_port(char const *address, char ip[IP_MAX_SIZE],
                              xcom_port *port) {
   parse_buf p;
+  // Sanity check before return
+  auto ok_ip = [&ip]() { return ip[0] != 0; };
 
   /* Sanity checks */
-  if (address == NULL || (strlen(address) == 0) || ip == NULL) {
+  if (address == NULL || (strlen(address) == 0)) {
     return 0;
   }
 
   /* Zero the output buffer and port */
-  memset(ip, 0, IP_MAX_SIZE);
-  *port = 0;
+  if (ip)
+    memset(ip, 0, IP_MAX_SIZE);
+  else
+    return 0;
+
+  if (port)
+    *port = 0;
+  else
+    return 0;
 
   p.in = p.address = address;
   p.out = ip;
@@ -1945,11 +1983,12 @@
   p.in++;
   if (*(p.in) == ':') { /* We have a port */
     p.in++;
-    return match_port(&p, port);
+    return ok_ip() && match_port(&p, port);
   }
-  return NO_PORT_IN_ADDRESS; /* No :port, but that may be OK */
+  return ok_ip() && NO_PORT_IN_ADDRESS; /* No :port, but that may be OK */
 }
 
-int get_ip_and_port(char *address, char ip[IP_MAX_SIZE], xcom_port *port) {
+int get_ip_and_port(char const *address, char ip[IP_MAX_SIZE],
+                    xcom_port *port) {
   return !match_ip_and_port(address, ip, port);
 }
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_transport.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_transport.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_transport.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_transport.h	2021-09-28 11:46:34.000000000 +0000
@@ -23,7 +23,10 @@
 #ifndef XCOM_TRANSPORT_H
 #define XCOM_TRANSPORT_H
 
+#include "xcom/server_struct.h"
+#include "xcom/site_struct.h"
 #include "xcom/xcom_common.h"
+#include "xdr_gen/xcom_vp.h"
 
 #define XDR_INT_SIZE 4
 #define MSG_HDR_SIZE (3 * XDR_INT_SIZE)
@@ -128,7 +131,8 @@
 int srv_ref(server *s);
 int srv_unref(server *s);
 int tcp_reaper_task(task_arg arg);
-int tcp_server(task_arg arg);
+int tcp_reconnection_task(task_arg arg);
+int incoming_connection_task(task_arg arg);
 uint32_t crc32c_hash(char *buf, char *end);
 int apply_xdr(void *buff, uint32_t bufflen, xdrproc_t xdrfunc, void *xdrdata,
               enum xdr_op op);
@@ -157,9 +161,15 @@
 void reset_connection(connection_descriptor *con);
 void close_connection(connection_descriptor *con);
 
+int close_open_connection(connection_descriptor *conn);
+connection_descriptor *open_new_connection(
+    const char *server, xcom_port port,
+    int connection_timeout = Network_provider::default_connection_timeout());
+connection_descriptor *open_new_local_connection(const char *server,
+                                                 xcom_port port);
+
 #ifndef XCOM_WITHOUT_OPENSSL
 void ssl_free_con(connection_descriptor *con);
-void ssl_shutdown_con(connection_descriptor *con);
 #endif
 
 char const *xcom_proto_name(xcom_proto proto_vers);
@@ -183,6 +193,7 @@
 xcom_proto get_latest_common_proto();
 xcom_proto set_latest_common_proto(xcom_proto x_proto);
 extern linkage connect_wait;
+extern int connect_tcp(char *server, xcom_port port, int *ret);
 
 /**
  * @brief Returns the version from which nodes are able to speak IPv6
@@ -203,7 +214,7 @@
  * @param port the resulting port
  * @return int true (1) in case of parse error
  */
-int get_ip_and_port(char *address, char ip[IP_MAX_SIZE], xcom_port *port);
+int get_ip_and_port(char const *address, char ip[IP_MAX_SIZE], xcom_port *port);
 
 /**
  * @brief Checks if an incoming node is eligible to enter the group
@@ -225,7 +236,7 @@
                                   const site_def *current_site_def);
 
 #define INITIAL_CONNECT_WAIT 0.1
-#define MAX_CONNECT_WAIT 1.0
-#define CONNECT_WAIT_INCREASE 1.1
+#define MAX_CONNECT_WAIT 10.0
+#define CONNECT_WAIT_INCREASE 1.0
 
 #endif
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp.h.gen mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp.h.gen
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp.h.gen	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp.h.gen	2021-09-28 11:46:34.000000000 +0000
@@ -49,7 +49,8 @@
 	x_1_5 = 6,
 	x_1_6 = 7,
 	x_1_7 = 8,
-	x_1_8 = 9
+	x_1_8 = 9,
+	x_1_9 = 10
 };
 typedef enum xcom_proto xcom_proto;
 
@@ -87,7 +88,10 @@
 	get_event_horizon_type = 21,
 	set_event_horizon_type = 22,
 	get_synode_app_data_type = 23,
-	convert_into_local_server_type = 24
+	convert_into_local_server_type = 24,
+	set_max_leaders = 25,
+	set_leaders_type = 26,
+	get_leaders_type = 27
 };
 typedef enum cargo_type cargo_type;
 
@@ -123,7 +127,9 @@
 	gcs_snapshot_op = 21,
 	xcom_client_reply = 22,
 	tiny_learn_op = 23,
-	LAST_OP = 23 + 1
+	synode_request = 24,
+	synode_allocated = 25,
+	LAST_OP = 25 + 1
 };
 typedef enum pax_op pax_op;
 
@@ -137,7 +143,8 @@
 enum client_reply_code {
 	REQUEST_OK = 0,
 	REQUEST_FAIL = 1,
-	REQUEST_RETRY = 2
+	REQUEST_RETRY = 2,
+	REQUEST_REDIRECT = 3
 };
 typedef enum client_reply_code client_reply_code;
 
@@ -215,10 +222,18 @@
 };
 typedef struct trans_id trans_id;
 
+enum paxos_role {
+	P_PROP = 1,
+	P_ACC = 2,
+	P_LEARN = 4
+};
+typedef enum paxos_role paxos_role;
+
 struct node_address {
 	char *address;
 	blob uuid;
 	x_proto_range proto;
+	uint32_t services;
 };
 typedef struct node_address node_address;
 
@@ -265,6 +280,16 @@
 };
 typedef struct trans_data trans_data;
 
+struct leader {
+	char *address;
+};
+typedef struct leader leader;
+
+typedef struct {
+	u_int leader_array_len;
+	leader *leader_array_val;
+} leader_array;
+
 struct app_u {
 	cargo_type c_t;
 	union {
@@ -275,6 +300,8 @@
 		uint64_t cache_limit;
 		xcom_event_horizon event_horizon;
 		synode_no_array synodes;
+		node_no max_leaders;
+		leader_array leaders;
 	} app_u_u;
 };
 typedef struct app_u app_u;
@@ -329,6 +356,8 @@
 	node_list nodes;
 	node_set global_node_set;
 	xcom_event_horizon event_horizon;
+	node_no max_active_leaders;
+	leader_array leaders;
 };
 typedef struct config config;
 
@@ -350,6 +379,7 @@
 struct synode_app_data {
 	synode_no synode;
 	checked_data data;
+	synode_no origin;
 };
 typedef struct synode_app_data synode_app_data;
 
@@ -358,6 +388,26 @@
 	synode_app_data *synode_app_data_array_val;
 } synode_app_data_array;
 
+enum reply_type {
+	leader_info = 0
+};
+typedef enum reply_type reply_type;
+
+struct leader_info_data {
+	node_no max_nr_leaders;
+	leader_array preferred_leaders;
+	leader_array actual_leaders;
+};
+typedef struct leader_info_data leader_info_data;
+
+struct reply_data {
+	reply_type rt;
+	union {
+		leader_info_data leaders;
+	} reply_data_u;
+};
+typedef struct reply_data reply_data;
+
 struct pax_msg {
 	node_no to;
 	node_no from;
@@ -379,8 +429,26 @@
 	synode_no delivered_msg;
 	xcom_event_horizon event_horizon;
 	synode_app_data_array requested_synode_app_data;
+	reply_data *rd;
 };
 typedef struct pax_msg pax_msg;
+bool_t xdr_pax_msg_1_0(XDR *, pax_msg *);
+bool_t xdr_pax_msg_1_1(XDR *, pax_msg *);
+bool_t xdr_pax_msg_1_2(XDR *, pax_msg *);
+bool_t xdr_pax_msg_1_3(XDR *, pax_msg *);
+bool_t xdr_pax_msg_1_4(XDR *, pax_msg *);
+bool_t xdr_pax_msg_1_5(XDR *, pax_msg *);
+bool_t xdr_pax_msg_1_6(XDR *, pax_msg *);
+bool_t xdr_pax_msg_1_7(XDR *, pax_msg *);
+bool_t xdr_pax_msg_1_8(XDR *, pax_msg *);
+bool_t xdr_pax_msg_1_9(XDR *, pax_msg *);
+#ifdef __cplusplus
+extern "C" void synthesize_leaders(leader_array *leaders);
+extern "C" synode_no get_delivered_msg();
+#else
+extern void synthesize_leaders(leader_array *leaders);
+extern synode_no get_delivered_msg();
+#endif
 
 /* the xdr functions */
 
@@ -403,6 +471,7 @@
 extern  bool_t xdr_x_proto_range (XDR *, x_proto_range*);
 extern  bool_t xdr_synode_no (XDR *, synode_no*);
 extern  bool_t xdr_trans_id (XDR *, trans_id*);
+extern  bool_t xdr_paxos_role (XDR *, paxos_role*);
 extern  bool_t xdr_node_address (XDR *, node_address*);
 extern  bool_t xdr_node_list (XDR *, node_list*);
 extern  bool_t xdr_node_no_array (XDR *, node_no_array*);
@@ -411,6 +480,8 @@
 extern  bool_t xdr_repository (XDR *, repository*);
 extern  bool_t xdr_x_error (XDR *, x_error*);
 extern  bool_t xdr_trans_data (XDR *, trans_data*);
+extern  bool_t xdr_leader (XDR *, leader*);
+extern  bool_t xdr_leader_array (XDR *, leader_array*);
 extern  bool_t xdr_app_u (XDR *, app_u*);
 extern  bool_t xdr_app_data (XDR *, app_data*);
 extern  bool_t xdr_app_data_ptr (XDR *, app_data_ptr*);
@@ -425,6 +496,9 @@
 extern  bool_t xdr_gcs_snapshot (XDR *, gcs_snapshot*);
 extern  bool_t xdr_synode_app_data (XDR *, synode_app_data*);
 extern  bool_t xdr_synode_app_data_array (XDR *, synode_app_data_array*);
+extern  bool_t xdr_reply_type (XDR *, reply_type*);
+extern  bool_t xdr_leader_info_data (XDR *, leader_info_data*);
+extern  bool_t xdr_reply_data (XDR *, reply_data*);
 extern  bool_t xdr_pax_msg (XDR *, pax_msg*);
 
 #else /* K&R C */
@@ -446,6 +520,7 @@
 extern bool_t xdr_x_proto_range ();
 extern bool_t xdr_synode_no ();
 extern bool_t xdr_trans_id ();
+extern bool_t xdr_paxos_role ();
 extern bool_t xdr_node_address ();
 extern bool_t xdr_node_list ();
 extern bool_t xdr_node_no_array ();
@@ -454,6 +529,8 @@
 extern bool_t xdr_repository ();
 extern bool_t xdr_x_error ();
 extern bool_t xdr_trans_data ();
+extern bool_t xdr_leader ();
+extern bool_t xdr_leader_array ();
 extern bool_t xdr_app_u ();
 extern bool_t xdr_app_data ();
 extern bool_t xdr_app_data_ptr ();
@@ -468,6 +545,9 @@
 extern bool_t xdr_gcs_snapshot ();
 extern bool_t xdr_synode_app_data ();
 extern bool_t xdr_synode_app_data_array ();
+extern bool_t xdr_reply_type ();
+extern bool_t xdr_leader_info_data ();
+extern bool_t xdr_reply_data ();
 extern bool_t xdr_pax_msg ();
 
 #endif /* K&R C */
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp_str.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp_str.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp_str.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp_str.cc	2021-09-28 11:46:34.000000000 +0000
@@ -92,6 +92,12 @@
       return "get_synode_app_data_type";
     case convert_into_local_server_type:
       return "convert_into_local_server_type";
+    case set_max_leaders:
+      return "set_max_leaders";
+    case set_leaders_type:
+      return "set_leaders_type";
+    case get_leaders_type:
+      return "get_leaders_type";
     default:
       return "???";
   }
@@ -160,6 +166,10 @@
       return "xcom_client_reply";
     case tiny_learn_op:
       return "tiny_learn_op";
+    case synode_request:
+      return "synode_request";
+    case synode_allocated:
+      return "synode_allocated";
     case LAST_OP:
       return "LAST_OP";
     default:
@@ -188,6 +198,8 @@
       return "REQUEST_FAIL";
     case REQUEST_RETRY:
       return "REQUEST_RETRY";
+    case REQUEST_REDIRECT:
+      return "REQUEST_REDIRECT";
     default:
       return "???";
   }
@@ -215,6 +227,8 @@
       return "x_1_7";
     case x_1_8:
       return "x_1_8";
+    case x_1_9:
+      return "x_1_9";
     default:
       return "???";
   }
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp.x mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp.x
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp.x	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp.x	2021-09-28 11:46:34.000000000 +0000
@@ -29,6 +29,9 @@
 #ifdef RPC_XDR
 %extern synode_no const null_synode;
 %extern synode_no get_delivered_msg();
+%#ifndef _WIN32
+%#include <strings.h> /* For bzero */
+%#endif
 #endif
 
 /*
@@ -36,16 +39,16 @@
 
 Zero is not used, so a zero protocol version indicates an error.
 To add a new protocol version, add a new value to this enum.
-To change an existing struct, add the new member with an #ifdef 
+To change an existing struct, add the new member with an #ifdef
 guard corresponding to the protocol version.
 For example, to add a member corresponding to protocol version
 x_1_7, the definition would look like this:
-	
-#if (XCOM_PROTO_VERS > 107) 
-	new_member_t new_member; 
+
+#if (XCOM_PROTO_VERS > 107)
+	new_member_t new_member;
 #else
-#ifdef RPC_XDR 
-%BEGIN 
+#ifdef RPC_XDR
+%BEGIN
 %  if (xdrs->x_op == XDR_DECODE) {
 %	 new_member = suitable_default_value;
 %  }
@@ -54,12 +57,12 @@
 #endif
 
 In this example, 107 corresponds to x_1_7.
-The code in the BEGIN..END block will be inserted immediately before the 
-final return in the generated xdr function. Members which are not in 
-earlier protocol versions are not serialized, since they are excluded 
-by the #if guard. When deserializing, the code in the BEGIN..END block 
-takes care of insering a suitable value instead of actually reading 
-the value from the serialized struct, since the earlier protocol 
+The code in the BEGIN..END block will be inserted immediately before the
+final return in the generated xdr function. Members which are not in
+earlier protocol versions are not serialized, since they are excluded
+by the #if guard. When deserializing, the code in the BEGIN..END block
+takes care of insering a suitable value instead of actually reading
+the value from the serialized struct, since the earlier protocol
 version does not contain the new member.
 
 After adding a new protocol version, set MY_XCOM_PROTO to this version in xcom_transport.cc (xcom_transport.cc:/MY_XCOM_PROTO)
@@ -80,7 +83,8 @@
   x_1_5 = 6,
   x_1_6 = 7,
   x_1_7 = 8,
-  x_1_8 = 9
+  x_1_8 = 9,
+  x_1_9 = 10
 };
 
 enum delivery_status {
@@ -120,7 +124,10 @@
   get_event_horizon_type = 21,
   set_event_horizon_type = 22,
   get_synode_app_data_type = 23,
-  convert_into_local_server_type = 24
+  convert_into_local_server_type = 24,
+  set_max_leaders = 25,
+  set_leaders_type = 26,
+  get_leaders_type = 27
 };
 
 enum recover_action {
@@ -154,6 +161,8 @@
   gcs_snapshot_op = 21,
   xcom_client_reply = 22,
   tiny_learn_op = 23,
+  synode_request = 24,
+  synode_allocated = 25,
   LAST_OP
 };
 
@@ -164,9 +173,10 @@
 };
 
 enum client_reply_code {
-     REQUEST_OK = 0,
-     REQUEST_FAIL = 1,
-     REQUEST_RETRY = 2
+  REQUEST_OK = 0,      /* Everything OK */
+  REQUEST_FAIL = 1,    /* Definitely a failure */
+  REQUEST_RETRY = 2,   /* Retry */
+  REQUEST_REDIRECT = 3 /* Try another xcom node */
 };
 
 enum start_t {
@@ -189,6 +199,7 @@
   bit_mask bits<NSERVERS>;
 };
 
+#ifdef RPC_HDR
 %#define	BITS_PER_BYTE 8
 %#define	MASK_BITS	((bit_mask)(sizeof (bit_mask) * BITS_PER_BYTE))	/* bits per mask */
 %#define	howmany_words(x, y)	(((x)+((y)-1))/(y))
@@ -214,6 +225,8 @@
 %extern  bool_t xdr_checked_data (XDR *, checked_data*);
 %#endif
 
+#endif
+
 struct blob {
 	opaque data<MAXBLOB>;
 };
@@ -237,6 +250,8 @@
   uint32_t pc;
 };
 
+enum paxos_role { P_PROP = 1, P_ACC = 2, P_LEARN = 4 };
+
 struct node_address{
 	string address<MAXNAME>;
 	blob  uuid;
@@ -249,7 +264,18 @@
 %	 objp->proto.min_proto = x_1_0;
 %	 objp->proto.max_proto = x_1_0;
 %  }
-%END 
+%END
+#endif
+#endif
+#if (XCOM_PROTO_VERS > 108)
+	uint32_t services; /* Services provided by this node */
+#else
+#ifdef RPC_XDR
+%BEGIN
+%  if (xdrs->x_op == XDR_DECODE) {
+%	 objp->services = P_PROP | P_ACC | P_LEARN;
+%  }
+%END
 #endif
 #endif
 };
@@ -284,6 +310,12 @@
   x_error errmsg;
 };
 
+struct leader{
+	string address<MAXNAME>;
+};
+
+typedef leader leader_array<NSERVERS>;
+
 /* Application-specific data */
 union app_u switch(cargo_type c_t){
  case unified_boot_type:
@@ -317,6 +349,10 @@
    synode_no_array synodes;
  case convert_into_local_server_type:
    void;
+ case set_max_leaders:
+   node_no max_leaders;
+ case set_leaders_type:
+   leader_array leaders;
  default:
    void;
 };
@@ -370,7 +406,7 @@
 %    objp->global_node_set.node_set_len = 0;
 %    objp->global_node_set.node_set_val = 0;
 %  }
-%END 
+%END
 #endif
 #endif
 #if (XCOM_PROTO_VERS > 103)
@@ -381,7 +417,20 @@
 %      if (xdrs->x_op == XDR_DECODE) {
 %        objp->event_horizon = EVENT_HORIZON_MIN;
 %      }
-%END 
+%END
+#endif
+#endif
+#if (XCOM_PROTO_VERS > 108)
+    node_no max_active_leaders; /* How many leaders can there be? >= 1 and <= number of nodes */
+    leader_array leaders;
+#else
+#ifdef RPC_XDR
+%BEGIN
+%      if (xdrs->x_op == XDR_DECODE) {
+%        objp->max_active_leaders = 0;  /* Set active leaders to all as default */
+%        synthesize_leaders(&objp->leaders); /* Install all nodes as leaders */
+%      }
+%END
 #endif
 #endif
 };
@@ -399,7 +448,7 @@
 %  if (xdrs->x_op == XDR_DECODE) {
 %    objp->log_end = null_synode;
 %  }
-%END 
+%END
 #endif
 #endif
   configs cfg;
@@ -409,21 +458,50 @@
 struct synode_app_data {
    synode_no synode;
    checked_data data;
+#if (XCOM_PROTO_VERS > 108)
+	 synode_no origin; /* node that actually sent the message. */
+#else
+#ifdef RPC_XDR
+%BEGIN
+%  if (xdrs->x_op == XDR_DECODE) {
+%	   objp->origin = objp->synode;
+%  }
+%END
+#endif
+#endif
 };
 typedef synode_app_data synode_app_data_array<MAX_SYNODE_ARRAY>;
 
 /*
-  protocol x_1_2 and x_1_3 differ only in the definition of gcs_snapshot, 
+  protocol x_1_2 and x_1_3 differ only in the definition of gcs_snapshot,
   which is taken care of by xdr_gcs_snapshot
 */
 
 /*
-  pax_msg_1_5 is identical to pax_msg_1_4, 
+  pax_msg_1_5 is identical to pax_msg_1_4,
   but nodes running protocol version 1_5 or greater support IPv6.
   xdr_pax_msg for protocol x_1_6 and greater must grok the incompatible
   gcs_snapshot and config versions of x_1_3 and x_1_4.
 */
 
+enum reply_type {
+  leader_info
+};
+
+struct leader_info_data {
+  node_no max_nr_leaders;
+  leader_array preferred_leaders;
+  leader_array actual_leaders;
+};
+
+union reply_data switch(reply_type rt){
+ case leader_info:
+   leader_info_data leaders;
+ default:
+   void;
+};
+
+
 struct pax_msg{
   node_no to;             /* To node */
   node_no from;           /* From node */
@@ -450,7 +528,7 @@
 %  if (xdrs->x_op == XDR_DECODE) {
 %    objp->delivered_msg = get_delivered_msg(); /* Use our own minimum */
 %  }
-%END 
+%END
 #endif
 #endif
 #if (XCOM_PROTO_VERS > 103)
@@ -461,7 +539,7 @@
 %  if (xdrs->x_op == XDR_DECODE) {
 %    objp->event_horizon = 0;
 %  }
-%END 
+%END
 #endif
 #endif
 #if (XCOM_PROTO_VERS > 105)
@@ -473,7 +551,42 @@
 %        objp->requested_synode_app_data.synode_app_data_array_len = 0;
 %        objp->requested_synode_app_data.synode_app_data_array_val = NULL;
 %  }
-%END 
+%END
+#endif
+#endif
+#if (XCOM_PROTO_VERS > 108)
+  reply_data *rd; /* Reply from xcom to client */
+#else
+#ifdef RPC_XDR
+%BEGIN
+%  if (xdrs->x_op == XDR_DECODE) {
+%        objp->rd = NULL;
+%  }
+%END
 #endif
 #endif
 };
+
+#ifdef RPC_HDR
+/* xdr functions for old protocol versions, must match enum xcom_proto */
+%bool_t xdr_pax_msg_1_0(XDR *, pax_msg *);
+%bool_t xdr_pax_msg_1_1(XDR *, pax_msg *);
+%bool_t xdr_pax_msg_1_2(XDR *, pax_msg *);
+%bool_t xdr_pax_msg_1_3(XDR *, pax_msg *);
+%bool_t xdr_pax_msg_1_4(XDR *, pax_msg *);
+%bool_t xdr_pax_msg_1_5(XDR *, pax_msg *);
+%bool_t xdr_pax_msg_1_6(XDR *, pax_msg *);
+%bool_t xdr_pax_msg_1_7(XDR *, pax_msg *);
+%bool_t xdr_pax_msg_1_8(XDR *, pax_msg *);
+%bool_t xdr_pax_msg_1_9(XDR *, pax_msg *);
+
+/* Extern function for default initialization of leaders */
+%#ifdef __cplusplus
+%extern "C" void synthesize_leaders(leader_array *leaders);
+%extern "C" synode_no get_delivered_msg();
+%#else
+%extern void synthesize_leaders(leader_array *leaders);
+%extern synode_no get_delivered_msg();
+%#endif
+#endif
+
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp_xdr.c.gen mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp_xdr.c.gen
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp_xdr.c.gen	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp_xdr.c.gen	2021-09-28 11:46:34.000000000 +0000
@@ -25,6 +25,9 @@
 #include "xcom/xcom_profile.h"
 extern synode_no const null_synode;
 extern synode_no get_delivered_msg();
+#ifndef _WIN32
+#include <strings.h> /* For bzero */
+#endif
 bool_t
 xdr_xcom_proto_1_0 (XDR *xdrs, xcom_proto *objp)
 {
@@ -139,26 +142,6 @@
 		 return FALSE;
 	return TRUE;
 }
-#define BITS_PER_BYTE 8
-#define MASK_BITS ((bit_mask)(sizeof (bit_mask) * BITS_PER_BYTE)) /* bits per mask */
-#define howmany_words(x, y) (((x)+((y)-1))/(y))
-#define BIT_OP(__n, __p, __op, __inv) ((__p)->bits.bits_val[(__n)/MASK_BITS] __op __inv (1u << ((__n) % MASK_BITS)))
-#define BIT_XOR(__n, __p) BIT_OP(__n, __p, ^=,(bit_mask))
-#define BIT_SET(__n, __p) BIT_OP(__n, __p, |=,(bit_mask))
-#define BIT_CLR(__n, __p) BIT_OP(__n, __p, &=,(bit_mask) ~)
-#define BIT_ISSET(__n, __p) (BIT_OP(__n, __p, &,(bit_mask)) != 0ul)
-#define BIT_ZERO(__p) memset((__p)->bits.bits_val, 0, (__p)->bits.bits_len * sizeof(*(__p)->bits.bits_val))
-extern bit_set *new_bit_set(uint32_t bits);
-extern bit_set *clone_bit_set(bit_set *orig);
-extern void free_bit_set(bit_set *bs);
-#ifndef CHECKED_DATA
-#define CHECKED_DATA
-typedef struct {
- u_int data_len;
- char *data_val;
-} checked_data;
-extern bool_t xdr_checked_data (XDR *, checked_data*);
-#endif
 bool_t
 xdr_blob_1_0 (XDR *xdrs, blob *objp)
 {
@@ -200,6 +183,14 @@
 	return TRUE;
 }
 bool_t
+xdr_paxos_role_1_0 (XDR *xdrs, paxos_role *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_enum (xdrs, (enum_t *) objp))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
 xdr_node_address_1_0 (XDR *xdrs, node_address *objp)
 {
 	register int32_t *buf;
@@ -212,6 +203,9 @@
  objp->proto.min_proto = x_1_0;
  objp->proto.max_proto = x_1_0;
  }
+ if (xdrs->x_op == XDR_DECODE) {
+ objp->services = P_PROP | P_ACC | P_LEARN;
+ }
 /* END protocol conversion code */
 	return TRUE;
 }
@@ -291,6 +285,23 @@
 	return TRUE;
 }
 bool_t
+xdr_leader_1_0 (XDR *xdrs, leader *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_string (xdrs, &objp->address, MAXNAME))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_leader_array_1_0 (XDR *xdrs, leader_array *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_array (xdrs, (char **)&objp->leader_array_val, (u_int *) &objp->leader_array_len, NSERVERS,
+		sizeof (leader), (xdrproc_t) xdr_leader_1_0))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
 xdr_app_u_1_0 (XDR *xdrs, app_u *objp)
 {
 	register int32_t *buf;
@@ -342,6 +353,14 @@
 		break;
 	case convert_into_local_server_type:
 		break;
+	case set_max_leaders:
+		 if (!xdr_node_no_1_0 (xdrs, &objp->app_u_u.max_leaders))
+			 return FALSE;
+		break;
+	case set_leaders_type:
+		 if (!xdr_leader_array_1_0 (xdrs, &objp->app_u_u.leaders))
+			 return FALSE;
+		break;
 	default:
 		break;
 	}
@@ -519,6 +538,10 @@
  if (xdrs->x_op == XDR_DECODE) {
  objp->event_horizon = EVENT_HORIZON_MIN;
  }
+ if (xdrs->x_op == XDR_DECODE) {
+ objp->max_active_leaders = 0; /* Set active leaders to all as default */
+ synthesize_leaders(&objp->leaders); /* Install all nodes as leaders */
+ }
 /* END protocol conversion code */
 	return TRUE;
 }
@@ -564,6 +587,11 @@
 		 return FALSE;
 	 if (!xdr_checked_data (xdrs, &objp->data))
 		 return FALSE;
+/* BEGIN protocol conversion code */
+ if (xdrs->x_op == XDR_DECODE) {
+ objp->origin = objp->synode;
+ }
+/* END protocol conversion code */
 	return TRUE;
 }
 bool_t
@@ -576,6 +604,42 @@
 	return TRUE;
 }
 bool_t
+xdr_reply_type_1_0 (XDR *xdrs, reply_type *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_enum (xdrs, (enum_t *) objp))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_leader_info_data_1_0 (XDR *xdrs, leader_info_data *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_node_no_1_0 (xdrs, &objp->max_nr_leaders))
+		 return FALSE;
+	 if (!xdr_leader_array_1_0 (xdrs, &objp->preferred_leaders))
+		 return FALSE;
+	 if (!xdr_leader_array_1_0 (xdrs, &objp->actual_leaders))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_reply_data_1_0 (XDR *xdrs, reply_data *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_reply_type_1_0 (xdrs, &objp->rt))
+		 return FALSE;
+	switch (objp->rt) {
+	case leader_info:
+		 if (!xdr_leader_info_data_1_0 (xdrs, &objp->reply_data_u.leaders))
+			 return FALSE;
+		break;
+	default:
+		break;
+	}
+	return TRUE;
+}
+bool_t
 xdr_pax_msg_1_0 (XDR *xdrs, pax_msg *objp)
 {
 	register int32_t *buf;
@@ -624,6 +688,9 @@
  objp->requested_synode_app_data.synode_app_data_array_len = 0;
  objp->requested_synode_app_data.synode_app_data_array_val = NULL;
  }
+ if (xdrs->x_op == XDR_DECODE) {
+ objp->rd = NULL;
+ }
 /* END protocol conversion code */
 	return TRUE;
 }
@@ -654,6 +721,9 @@
 #include "xcom/xcom_profile.h"
 extern synode_no const null_synode;
 extern synode_no get_delivered_msg();
+#ifndef _WIN32
+#include <strings.h> /* For bzero */
+#endif
 bool_t
 xdr_xcom_proto_1_1 (XDR *xdrs, xcom_proto *objp)
 {
@@ -768,26 +838,6 @@
 		 return FALSE;
 	return TRUE;
 }
-#define BITS_PER_BYTE 8
-#define MASK_BITS ((bit_mask)(sizeof (bit_mask) * BITS_PER_BYTE)) /* bits per mask */
-#define howmany_words(x, y) (((x)+((y)-1))/(y))
-#define BIT_OP(__n, __p, __op, __inv) ((__p)->bits.bits_val[(__n)/MASK_BITS] __op __inv (1u << ((__n) % MASK_BITS)))
-#define BIT_XOR(__n, __p) BIT_OP(__n, __p, ^=,(bit_mask))
-#define BIT_SET(__n, __p) BIT_OP(__n, __p, |=,(bit_mask))
-#define BIT_CLR(__n, __p) BIT_OP(__n, __p, &=,(bit_mask) ~)
-#define BIT_ISSET(__n, __p) (BIT_OP(__n, __p, &,(bit_mask)) != 0ul)
-#define BIT_ZERO(__p) memset((__p)->bits.bits_val, 0, (__p)->bits.bits_len * sizeof(*(__p)->bits.bits_val))
-extern bit_set *new_bit_set(uint32_t bits);
-extern bit_set *clone_bit_set(bit_set *orig);
-extern void free_bit_set(bit_set *bs);
-#ifndef CHECKED_DATA
-#define CHECKED_DATA
-typedef struct {
- u_int data_len;
- char *data_val;
-} checked_data;
-extern bool_t xdr_checked_data (XDR *, checked_data*);
-#endif
 bool_t
 xdr_blob_1_1 (XDR *xdrs, blob *objp)
 {
@@ -829,6 +879,14 @@
 	return TRUE;
 }
 bool_t
+xdr_paxos_role_1_1 (XDR *xdrs, paxos_role *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_enum (xdrs, (enum_t *) objp))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
 xdr_node_address_1_1 (XDR *xdrs, node_address *objp)
 {
 	register int32_t *buf;
@@ -838,6 +896,11 @@
 		 return FALSE;
 	 if (!xdr_x_proto_range_1_1 (xdrs, &objp->proto))
 		 return FALSE;
+/* BEGIN protocol conversion code */
+ if (xdrs->x_op == XDR_DECODE) {
+ objp->services = P_PROP | P_ACC | P_LEARN;
+ }
+/* END protocol conversion code */
 	return TRUE;
 }
 bool_t
@@ -916,6 +979,23 @@
 	return TRUE;
 }
 bool_t
+xdr_leader_1_1 (XDR *xdrs, leader *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_string (xdrs, &objp->address, MAXNAME))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_leader_array_1_1 (XDR *xdrs, leader_array *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_array (xdrs, (char **)&objp->leader_array_val, (u_int *) &objp->leader_array_len, NSERVERS,
+		sizeof (leader), (xdrproc_t) xdr_leader_1_1))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
 xdr_app_u_1_1 (XDR *xdrs, app_u *objp)
 {
 	register int32_t *buf;
@@ -967,6 +1047,14 @@
 		break;
 	case convert_into_local_server_type:
 		break;
+	case set_max_leaders:
+		 if (!xdr_node_no_1_1 (xdrs, &objp->app_u_u.max_leaders))
+			 return FALSE;
+		break;
+	case set_leaders_type:
+		 if (!xdr_leader_array_1_1 (xdrs, &objp->app_u_u.leaders))
+			 return FALSE;
+		break;
 	default:
 		break;
 	}
@@ -1144,6 +1232,10 @@
  if (xdrs->x_op == XDR_DECODE) {
  objp->event_horizon = EVENT_HORIZON_MIN;
  }
+ if (xdrs->x_op == XDR_DECODE) {
+ objp->max_active_leaders = 0; /* Set active leaders to all as default */
+ synthesize_leaders(&objp->leaders); /* Install all nodes as leaders */
+ }
 /* END protocol conversion code */
 	return TRUE;
 }
@@ -1189,6 +1281,11 @@
 		 return FALSE;
 	 if (!xdr_checked_data (xdrs, &objp->data))
 		 return FALSE;
+/* BEGIN protocol conversion code */
+ if (xdrs->x_op == XDR_DECODE) {
+ objp->origin = objp->synode;
+ }
+/* END protocol conversion code */
 	return TRUE;
 }
 bool_t
@@ -1201,6 +1298,42 @@
 	return TRUE;
 }
 bool_t
+xdr_reply_type_1_1 (XDR *xdrs, reply_type *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_enum (xdrs, (enum_t *) objp))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_leader_info_data_1_1 (XDR *xdrs, leader_info_data *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_node_no_1_1 (xdrs, &objp->max_nr_leaders))
+		 return FALSE;
+	 if (!xdr_leader_array_1_1 (xdrs, &objp->preferred_leaders))
+		 return FALSE;
+	 if (!xdr_leader_array_1_1 (xdrs, &objp->actual_leaders))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_reply_data_1_1 (XDR *xdrs, reply_data *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_reply_type_1_1 (xdrs, &objp->rt))
+		 return FALSE;
+	switch (objp->rt) {
+	case leader_info:
+		 if (!xdr_leader_info_data_1_1 (xdrs, &objp->reply_data_u.leaders))
+			 return FALSE;
+		break;
+	default:
+		break;
+	}
+	return TRUE;
+}
+bool_t
 xdr_pax_msg_1_1 (XDR *xdrs, pax_msg *objp)
 {
 	register int32_t *buf;
@@ -1249,6 +1382,9 @@
  objp->requested_synode_app_data.synode_app_data_array_len = 0;
  objp->requested_synode_app_data.synode_app_data_array_val = NULL;
  }
+ if (xdrs->x_op == XDR_DECODE) {
+ objp->rd = NULL;
+ }
 /* END protocol conversion code */
 	return TRUE;
 }
@@ -1279,6 +1415,9 @@
 #include "xcom/xcom_profile.h"
 extern synode_no const null_synode;
 extern synode_no get_delivered_msg();
+#ifndef _WIN32
+#include <strings.h> /* For bzero */
+#endif
 bool_t
 xdr_xcom_proto_1_2 (XDR *xdrs, xcom_proto *objp)
 {
@@ -1393,26 +1532,6 @@
 		 return FALSE;
 	return TRUE;
 }
-#define BITS_PER_BYTE 8
-#define MASK_BITS ((bit_mask)(sizeof (bit_mask) * BITS_PER_BYTE)) /* bits per mask */
-#define howmany_words(x, y) (((x)+((y)-1))/(y))
-#define BIT_OP(__n, __p, __op, __inv) ((__p)->bits.bits_val[(__n)/MASK_BITS] __op __inv (1u << ((__n) % MASK_BITS)))
-#define BIT_XOR(__n, __p) BIT_OP(__n, __p, ^=,(bit_mask))
-#define BIT_SET(__n, __p) BIT_OP(__n, __p, |=,(bit_mask))
-#define BIT_CLR(__n, __p) BIT_OP(__n, __p, &=,(bit_mask) ~)
-#define BIT_ISSET(__n, __p) (BIT_OP(__n, __p, &,(bit_mask)) != 0ul)
-#define BIT_ZERO(__p) memset((__p)->bits.bits_val, 0, (__p)->bits.bits_len * sizeof(*(__p)->bits.bits_val))
-extern bit_set *new_bit_set(uint32_t bits);
-extern bit_set *clone_bit_set(bit_set *orig);
-extern void free_bit_set(bit_set *bs);
-#ifndef CHECKED_DATA
-#define CHECKED_DATA
-typedef struct {
- u_int data_len;
- char *data_val;
-} checked_data;
-extern bool_t xdr_checked_data (XDR *, checked_data*);
-#endif
 bool_t
 xdr_blob_1_2 (XDR *xdrs, blob *objp)
 {
@@ -1454,6 +1573,14 @@
 	return TRUE;
 }
 bool_t
+xdr_paxos_role_1_2 (XDR *xdrs, paxos_role *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_enum (xdrs, (enum_t *) objp))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
 xdr_node_address_1_2 (XDR *xdrs, node_address *objp)
 {
 	register int32_t *buf;
@@ -1463,6 +1590,11 @@
 		 return FALSE;
 	 if (!xdr_x_proto_range_1_2 (xdrs, &objp->proto))
 		 return FALSE;
+/* BEGIN protocol conversion code */
+ if (xdrs->x_op == XDR_DECODE) {
+ objp->services = P_PROP | P_ACC | P_LEARN;
+ }
+/* END protocol conversion code */
 	return TRUE;
 }
 bool_t
@@ -1541,6 +1673,23 @@
 	return TRUE;
 }
 bool_t
+xdr_leader_1_2 (XDR *xdrs, leader *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_string (xdrs, &objp->address, MAXNAME))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_leader_array_1_2 (XDR *xdrs, leader_array *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_array (xdrs, (char **)&objp->leader_array_val, (u_int *) &objp->leader_array_len, NSERVERS,
+		sizeof (leader), (xdrproc_t) xdr_leader_1_2))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
 xdr_app_u_1_2 (XDR *xdrs, app_u *objp)
 {
 	register int32_t *buf;
@@ -1592,6 +1741,14 @@
 		break;
 	case convert_into_local_server_type:
 		break;
+	case set_max_leaders:
+		 if (!xdr_node_no_1_2 (xdrs, &objp->app_u_u.max_leaders))
+			 return FALSE;
+		break;
+	case set_leaders_type:
+		 if (!xdr_leader_array_1_2 (xdrs, &objp->app_u_u.leaders))
+			 return FALSE;
+		break;
 	default:
 		break;
 	}
@@ -1769,6 +1926,10 @@
  if (xdrs->x_op == XDR_DECODE) {
  objp->event_horizon = EVENT_HORIZON_MIN;
  }
+ if (xdrs->x_op == XDR_DECODE) {
+ objp->max_active_leaders = 0; /* Set active leaders to all as default */
+ synthesize_leaders(&objp->leaders); /* Install all nodes as leaders */
+ }
 /* END protocol conversion code */
 	return TRUE;
 }
@@ -1814,6 +1975,11 @@
 		 return FALSE;
 	 if (!xdr_checked_data (xdrs, &objp->data))
 		 return FALSE;
+/* BEGIN protocol conversion code */
+ if (xdrs->x_op == XDR_DECODE) {
+ objp->origin = objp->synode;
+ }
+/* END protocol conversion code */
 	return TRUE;
 }
 bool_t
@@ -1826,6 +1992,42 @@
 	return TRUE;
 }
 bool_t
+xdr_reply_type_1_2 (XDR *xdrs, reply_type *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_enum (xdrs, (enum_t *) objp))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_leader_info_data_1_2 (XDR *xdrs, leader_info_data *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_node_no_1_2 (xdrs, &objp->max_nr_leaders))
+		 return FALSE;
+	 if (!xdr_leader_array_1_2 (xdrs, &objp->preferred_leaders))
+		 return FALSE;
+	 if (!xdr_leader_array_1_2 (xdrs, &objp->actual_leaders))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_reply_data_1_2 (XDR *xdrs, reply_data *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_reply_type_1_2 (xdrs, &objp->rt))
+		 return FALSE;
+	switch (objp->rt) {
+	case leader_info:
+		 if (!xdr_leader_info_data_1_2 (xdrs, &objp->reply_data_u.leaders))
+			 return FALSE;
+		break;
+	default:
+		break;
+	}
+	return TRUE;
+}
+bool_t
 xdr_pax_msg_1_2 (XDR *xdrs, pax_msg *objp)
 {
 	register int32_t *buf;
@@ -1873,6 +2075,9 @@
  objp->requested_synode_app_data.synode_app_data_array_len = 0;
  objp->requested_synode_app_data.synode_app_data_array_val = NULL;
  }
+ if (xdrs->x_op == XDR_DECODE) {
+ objp->rd = NULL;
+ }
 /* END protocol conversion code */
 	return TRUE;
 }
@@ -1903,6 +2108,9 @@
 #include "xcom/xcom_profile.h"
 extern synode_no const null_synode;
 extern synode_no get_delivered_msg();
+#ifndef _WIN32
+#include <strings.h> /* For bzero */
+#endif
 bool_t
 xdr_xcom_proto_1_3 (XDR *xdrs, xcom_proto *objp)
 {
@@ -2017,26 +2225,6 @@
 		 return FALSE;
 	return TRUE;
 }
-#define BITS_PER_BYTE 8
-#define MASK_BITS ((bit_mask)(sizeof (bit_mask) * BITS_PER_BYTE)) /* bits per mask */
-#define howmany_words(x, y) (((x)+((y)-1))/(y))
-#define BIT_OP(__n, __p, __op, __inv) ((__p)->bits.bits_val[(__n)/MASK_BITS] __op __inv (1u << ((__n) % MASK_BITS)))
-#define BIT_XOR(__n, __p) BIT_OP(__n, __p, ^=,(bit_mask))
-#define BIT_SET(__n, __p) BIT_OP(__n, __p, |=,(bit_mask))
-#define BIT_CLR(__n, __p) BIT_OP(__n, __p, &=,(bit_mask) ~)
-#define BIT_ISSET(__n, __p) (BIT_OP(__n, __p, &,(bit_mask)) != 0ul)
-#define BIT_ZERO(__p) memset((__p)->bits.bits_val, 0, (__p)->bits.bits_len * sizeof(*(__p)->bits.bits_val))
-extern bit_set *new_bit_set(uint32_t bits);
-extern bit_set *clone_bit_set(bit_set *orig);
-extern void free_bit_set(bit_set *bs);
-#ifndef CHECKED_DATA
-#define CHECKED_DATA
-typedef struct {
- u_int data_len;
- char *data_val;
-} checked_data;
-extern bool_t xdr_checked_data (XDR *, checked_data*);
-#endif
 bool_t
 xdr_blob_1_3 (XDR *xdrs, blob *objp)
 {
@@ -2078,6 +2266,14 @@
 	return TRUE;
 }
 bool_t
+xdr_paxos_role_1_3 (XDR *xdrs, paxos_role *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_enum (xdrs, (enum_t *) objp))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
 xdr_node_address_1_3 (XDR *xdrs, node_address *objp)
 {
 	register int32_t *buf;
@@ -2087,6 +2283,11 @@
 		 return FALSE;
 	 if (!xdr_x_proto_range_1_3 (xdrs, &objp->proto))
 		 return FALSE;
+/* BEGIN protocol conversion code */
+ if (xdrs->x_op == XDR_DECODE) {
+ objp->services = P_PROP | P_ACC | P_LEARN;
+ }
+/* END protocol conversion code */
 	return TRUE;
 }
 bool_t
@@ -2165,6 +2366,23 @@
 	return TRUE;
 }
 bool_t
+xdr_leader_1_3 (XDR *xdrs, leader *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_string (xdrs, &objp->address, MAXNAME))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_leader_array_1_3 (XDR *xdrs, leader_array *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_array (xdrs, (char **)&objp->leader_array_val, (u_int *) &objp->leader_array_len, NSERVERS,
+		sizeof (leader), (xdrproc_t) xdr_leader_1_3))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
 xdr_app_u_1_3 (XDR *xdrs, app_u *objp)
 {
 	register int32_t *buf;
@@ -2216,6 +2434,14 @@
 		break;
 	case convert_into_local_server_type:
 		break;
+	case set_max_leaders:
+		 if (!xdr_node_no_1_3 (xdrs, &objp->app_u_u.max_leaders))
+			 return FALSE;
+		break;
+	case set_leaders_type:
+		 if (!xdr_leader_array_1_3 (xdrs, &objp->app_u_u.leaders))
+			 return FALSE;
+		break;
 	default:
 		break;
 	}
@@ -2391,6 +2617,10 @@
  if (xdrs->x_op == XDR_DECODE) {
  objp->event_horizon = EVENT_HORIZON_MIN;
  }
+ if (xdrs->x_op == XDR_DECODE) {
+ objp->max_active_leaders = 0; /* Set active leaders to all as default */
+ synthesize_leaders(&objp->leaders); /* Install all nodes as leaders */
+ }
 /* END protocol conversion code */
 	return TRUE;
 }
@@ -2433,6 +2663,11 @@
 		 return FALSE;
 	 if (!xdr_checked_data (xdrs, &objp->data))
 		 return FALSE;
+/* BEGIN protocol conversion code */
+ if (xdrs->x_op == XDR_DECODE) {
+ objp->origin = objp->synode;
+ }
+/* END protocol conversion code */
 	return TRUE;
 }
 bool_t
@@ -2445,6 +2680,42 @@
 	return TRUE;
 }
 bool_t
+xdr_reply_type_1_3 (XDR *xdrs, reply_type *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_enum (xdrs, (enum_t *) objp))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_leader_info_data_1_3 (XDR *xdrs, leader_info_data *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_node_no_1_3 (xdrs, &objp->max_nr_leaders))
+		 return FALSE;
+	 if (!xdr_leader_array_1_3 (xdrs, &objp->preferred_leaders))
+		 return FALSE;
+	 if (!xdr_leader_array_1_3 (xdrs, &objp->actual_leaders))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_reply_data_1_3 (XDR *xdrs, reply_data *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_reply_type_1_3 (xdrs, &objp->rt))
+		 return FALSE;
+	switch (objp->rt) {
+	case leader_info:
+		 if (!xdr_leader_info_data_1_3 (xdrs, &objp->reply_data_u.leaders))
+			 return FALSE;
+		break;
+	default:
+		break;
+	}
+	return TRUE;
+}
+bool_t
 xdr_pax_msg_1_3 (XDR *xdrs, pax_msg *objp)
 {
 	register int32_t *buf;
@@ -2492,6 +2763,9 @@
  objp->requested_synode_app_data.synode_app_data_array_len = 0;
  objp->requested_synode_app_data.synode_app_data_array_val = NULL;
  }
+ if (xdrs->x_op == XDR_DECODE) {
+ objp->rd = NULL;
+ }
 /* END protocol conversion code */
 	return TRUE;
 }
@@ -2522,6 +2796,9 @@
 #include "xcom/xcom_profile.h"
 extern synode_no const null_synode;
 extern synode_no get_delivered_msg();
+#ifndef _WIN32
+#include <strings.h> /* For bzero */
+#endif
 bool_t
 xdr_xcom_proto_1_4 (XDR *xdrs, xcom_proto *objp)
 {
@@ -2636,26 +2913,6 @@
 		 return FALSE;
 	return TRUE;
 }
-#define BITS_PER_BYTE 8
-#define MASK_BITS ((bit_mask)(sizeof (bit_mask) * BITS_PER_BYTE)) /* bits per mask */
-#define howmany_words(x, y) (((x)+((y)-1))/(y))
-#define BIT_OP(__n, __p, __op, __inv) ((__p)->bits.bits_val[(__n)/MASK_BITS] __op __inv (1u << ((__n) % MASK_BITS)))
-#define BIT_XOR(__n, __p) BIT_OP(__n, __p, ^=,(bit_mask))
-#define BIT_SET(__n, __p) BIT_OP(__n, __p, |=,(bit_mask))
-#define BIT_CLR(__n, __p) BIT_OP(__n, __p, &=,(bit_mask) ~)
-#define BIT_ISSET(__n, __p) (BIT_OP(__n, __p, &,(bit_mask)) != 0ul)
-#define BIT_ZERO(__p) memset((__p)->bits.bits_val, 0, (__p)->bits.bits_len * sizeof(*(__p)->bits.bits_val))
-extern bit_set *new_bit_set(uint32_t bits);
-extern bit_set *clone_bit_set(bit_set *orig);
-extern void free_bit_set(bit_set *bs);
-#ifndef CHECKED_DATA
-#define CHECKED_DATA
-typedef struct {
- u_int data_len;
- char *data_val;
-} checked_data;
-extern bool_t xdr_checked_data (XDR *, checked_data*);
-#endif
 bool_t
 xdr_blob_1_4 (XDR *xdrs, blob *objp)
 {
@@ -2697,6 +2954,14 @@
 	return TRUE;
 }
 bool_t
+xdr_paxos_role_1_4 (XDR *xdrs, paxos_role *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_enum (xdrs, (enum_t *) objp))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
 xdr_node_address_1_4 (XDR *xdrs, node_address *objp)
 {
 	register int32_t *buf;
@@ -2706,6 +2971,11 @@
 		 return FALSE;
 	 if (!xdr_x_proto_range_1_4 (xdrs, &objp->proto))
 		 return FALSE;
+/* BEGIN protocol conversion code */
+ if (xdrs->x_op == XDR_DECODE) {
+ objp->services = P_PROP | P_ACC | P_LEARN;
+ }
+/* END protocol conversion code */
 	return TRUE;
 }
 bool_t
@@ -2784,6 +3054,23 @@
 	return TRUE;
 }
 bool_t
+xdr_leader_1_4 (XDR *xdrs, leader *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_string (xdrs, &objp->address, MAXNAME))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_leader_array_1_4 (XDR *xdrs, leader_array *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_array (xdrs, (char **)&objp->leader_array_val, (u_int *) &objp->leader_array_len, NSERVERS,
+		sizeof (leader), (xdrproc_t) xdr_leader_1_4))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
 xdr_app_u_1_4 (XDR *xdrs, app_u *objp)
 {
 	register int32_t *buf;
@@ -2835,6 +3122,14 @@
 		break;
 	case convert_into_local_server_type:
 		break;
+	case set_max_leaders:
+		 if (!xdr_node_no_1_4 (xdrs, &objp->app_u_u.max_leaders))
+			 return FALSE;
+		break;
+	case set_leaders_type:
+		 if (!xdr_leader_array_1_4 (xdrs, &objp->app_u_u.leaders))
+			 return FALSE;
+		break;
 	default:
 		break;
 	}
@@ -3011,6 +3306,10 @@
  objp->global_node_set.node_set_len = 0;
  objp->global_node_set.node_set_val = 0;
  }
+ if (xdrs->x_op == XDR_DECODE) {
+ objp->max_active_leaders = 0; /* Set active leaders to all as default */
+ synthesize_leaders(&objp->leaders); /* Install all nodes as leaders */
+ }
 /* END protocol conversion code */
 	return TRUE;
 }
@@ -3056,6 +3355,11 @@
 		 return FALSE;
 	 if (!xdr_checked_data (xdrs, &objp->data))
 		 return FALSE;
+/* BEGIN protocol conversion code */
+ if (xdrs->x_op == XDR_DECODE) {
+ objp->origin = objp->synode;
+ }
+/* END protocol conversion code */
 	return TRUE;
 }
 bool_t
@@ -3068,6 +3372,42 @@
 	return TRUE;
 }
 bool_t
+xdr_reply_type_1_4 (XDR *xdrs, reply_type *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_enum (xdrs, (enum_t *) objp))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_leader_info_data_1_4 (XDR *xdrs, leader_info_data *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_node_no_1_4 (xdrs, &objp->max_nr_leaders))
+		 return FALSE;
+	 if (!xdr_leader_array_1_4 (xdrs, &objp->preferred_leaders))
+		 return FALSE;
+	 if (!xdr_leader_array_1_4 (xdrs, &objp->actual_leaders))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_reply_data_1_4 (XDR *xdrs, reply_data *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_reply_type_1_4 (xdrs, &objp->rt))
+		 return FALSE;
+	switch (objp->rt) {
+	case leader_info:
+		 if (!xdr_leader_info_data_1_4 (xdrs, &objp->reply_data_u.leaders))
+			 return FALSE;
+		break;
+	default:
+		break;
+	}
+	return TRUE;
+}
+bool_t
 xdr_pax_msg_1_4 (XDR *xdrs, pax_msg *objp)
 {
 	register int32_t *buf;
@@ -3114,6 +3454,9 @@
  objp->requested_synode_app_data.synode_app_data_array_len = 0;
  objp->requested_synode_app_data.synode_app_data_array_val = NULL;
  }
+ if (xdrs->x_op == XDR_DECODE) {
+ objp->rd = NULL;
+ }
 /* END protocol conversion code */
 	return TRUE;
 }
@@ -3144,6 +3487,9 @@
 #include "xcom/xcom_profile.h"
 extern synode_no const null_synode;
 extern synode_no get_delivered_msg();
+#ifndef _WIN32
+#include <strings.h> /* For bzero */
+#endif
 bool_t
 xdr_xcom_proto_1_5 (XDR *xdrs, xcom_proto *objp)
 {
@@ -3258,26 +3604,6 @@
 		 return FALSE;
 	return TRUE;
 }
-#define BITS_PER_BYTE 8
-#define MASK_BITS ((bit_mask)(sizeof (bit_mask) * BITS_PER_BYTE)) /* bits per mask */
-#define howmany_words(x, y) (((x)+((y)-1))/(y))
-#define BIT_OP(__n, __p, __op, __inv) ((__p)->bits.bits_val[(__n)/MASK_BITS] __op __inv (1u << ((__n) % MASK_BITS)))
-#define BIT_XOR(__n, __p) BIT_OP(__n, __p, ^=,(bit_mask))
-#define BIT_SET(__n, __p) BIT_OP(__n, __p, |=,(bit_mask))
-#define BIT_CLR(__n, __p) BIT_OP(__n, __p, &=,(bit_mask) ~)
-#define BIT_ISSET(__n, __p) (BIT_OP(__n, __p, &,(bit_mask)) != 0ul)
-#define BIT_ZERO(__p) memset((__p)->bits.bits_val, 0, (__p)->bits.bits_len * sizeof(*(__p)->bits.bits_val))
-extern bit_set *new_bit_set(uint32_t bits);
-extern bit_set *clone_bit_set(bit_set *orig);
-extern void free_bit_set(bit_set *bs);
-#ifndef CHECKED_DATA
-#define CHECKED_DATA
-typedef struct {
- u_int data_len;
- char *data_val;
-} checked_data;
-extern bool_t xdr_checked_data (XDR *, checked_data*);
-#endif
 bool_t
 xdr_blob_1_5 (XDR *xdrs, blob *objp)
 {
@@ -3319,6 +3645,14 @@
 	return TRUE;
 }
 bool_t
+xdr_paxos_role_1_5 (XDR *xdrs, paxos_role *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_enum (xdrs, (enum_t *) objp))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
 xdr_node_address_1_5 (XDR *xdrs, node_address *objp)
 {
 	register int32_t *buf;
@@ -3328,6 +3662,11 @@
 		 return FALSE;
 	 if (!xdr_x_proto_range_1_5 (xdrs, &objp->proto))
 		 return FALSE;
+/* BEGIN protocol conversion code */
+ if (xdrs->x_op == XDR_DECODE) {
+ objp->services = P_PROP | P_ACC | P_LEARN;
+ }
+/* END protocol conversion code */
 	return TRUE;
 }
 bool_t
@@ -3406,6 +3745,23 @@
 	return TRUE;
 }
 bool_t
+xdr_leader_1_5 (XDR *xdrs, leader *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_string (xdrs, &objp->address, MAXNAME))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_leader_array_1_5 (XDR *xdrs, leader_array *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_array (xdrs, (char **)&objp->leader_array_val, (u_int *) &objp->leader_array_len, NSERVERS,
+		sizeof (leader), (xdrproc_t) xdr_leader_1_5))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
 xdr_app_u_1_5 (XDR *xdrs, app_u *objp)
 {
 	register int32_t *buf;
@@ -3457,6 +3813,14 @@
 		break;
 	case convert_into_local_server_type:
 		break;
+	case set_max_leaders:
+		 if (!xdr_node_no_1_5 (xdrs, &objp->app_u_u.max_leaders))
+			 return FALSE;
+		break;
+	case set_leaders_type:
+		 if (!xdr_leader_array_1_5 (xdrs, &objp->app_u_u.leaders))
+			 return FALSE;
+		break;
 	default:
 		break;
 	}
@@ -3633,6 +3997,10 @@
  objp->global_node_set.node_set_len = 0;
  objp->global_node_set.node_set_val = 0;
  }
+ if (xdrs->x_op == XDR_DECODE) {
+ objp->max_active_leaders = 0; /* Set active leaders to all as default */
+ synthesize_leaders(&objp->leaders); /* Install all nodes as leaders */
+ }
 /* END protocol conversion code */
 	return TRUE;
 }
@@ -3678,6 +4046,11 @@
 		 return FALSE;
 	 if (!xdr_checked_data (xdrs, &objp->data))
 		 return FALSE;
+/* BEGIN protocol conversion code */
+ if (xdrs->x_op == XDR_DECODE) {
+ objp->origin = objp->synode;
+ }
+/* END protocol conversion code */
 	return TRUE;
 }
 bool_t
@@ -3690,6 +4063,42 @@
 	return TRUE;
 }
 bool_t
+xdr_reply_type_1_5 (XDR *xdrs, reply_type *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_enum (xdrs, (enum_t *) objp))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_leader_info_data_1_5 (XDR *xdrs, leader_info_data *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_node_no_1_5 (xdrs, &objp->max_nr_leaders))
+		 return FALSE;
+	 if (!xdr_leader_array_1_5 (xdrs, &objp->preferred_leaders))
+		 return FALSE;
+	 if (!xdr_leader_array_1_5 (xdrs, &objp->actual_leaders))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_reply_data_1_5 (XDR *xdrs, reply_data *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_reply_type_1_5 (xdrs, &objp->rt))
+		 return FALSE;
+	switch (objp->rt) {
+	case leader_info:
+		 if (!xdr_leader_info_data_1_5 (xdrs, &objp->reply_data_u.leaders))
+			 return FALSE;
+		break;
+	default:
+		break;
+	}
+	return TRUE;
+}
+bool_t
 xdr_pax_msg_1_5 (XDR *xdrs, pax_msg *objp)
 {
 	register int32_t *buf;
@@ -3736,6 +4145,9 @@
  objp->requested_synode_app_data.synode_app_data_array_len = 0;
  objp->requested_synode_app_data.synode_app_data_array_val = NULL;
  }
+ if (xdrs->x_op == XDR_DECODE) {
+ objp->rd = NULL;
+ }
 /* END protocol conversion code */
 	return TRUE;
 }
@@ -3766,6 +4178,9 @@
 #include "xcom/xcom_profile.h"
 extern synode_no const null_synode;
 extern synode_no get_delivered_msg();
+#ifndef _WIN32
+#include <strings.h> /* For bzero */
+#endif
 bool_t
 xdr_xcom_proto_1_6 (XDR *xdrs, xcom_proto *objp)
 {
@@ -3880,26 +4295,6 @@
 		 return FALSE;
 	return TRUE;
 }
-#define BITS_PER_BYTE 8
-#define MASK_BITS ((bit_mask)(sizeof (bit_mask) * BITS_PER_BYTE)) /* bits per mask */
-#define howmany_words(x, y) (((x)+((y)-1))/(y))
-#define BIT_OP(__n, __p, __op, __inv) ((__p)->bits.bits_val[(__n)/MASK_BITS] __op __inv (1u << ((__n) % MASK_BITS)))
-#define BIT_XOR(__n, __p) BIT_OP(__n, __p, ^=,(bit_mask))
-#define BIT_SET(__n, __p) BIT_OP(__n, __p, |=,(bit_mask))
-#define BIT_CLR(__n, __p) BIT_OP(__n, __p, &=,(bit_mask) ~)
-#define BIT_ISSET(__n, __p) (BIT_OP(__n, __p, &,(bit_mask)) != 0ul)
-#define BIT_ZERO(__p) memset((__p)->bits.bits_val, 0, (__p)->bits.bits_len * sizeof(*(__p)->bits.bits_val))
-extern bit_set *new_bit_set(uint32_t bits);
-extern bit_set *clone_bit_set(bit_set *orig);
-extern void free_bit_set(bit_set *bs);
-#ifndef CHECKED_DATA
-#define CHECKED_DATA
-typedef struct {
- u_int data_len;
- char *data_val;
-} checked_data;
-extern bool_t xdr_checked_data (XDR *, checked_data*);
-#endif
 bool_t
 xdr_blob_1_6 (XDR *xdrs, blob *objp)
 {
@@ -3941,6 +4336,14 @@
 	return TRUE;
 }
 bool_t
+xdr_paxos_role_1_6 (XDR *xdrs, paxos_role *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_enum (xdrs, (enum_t *) objp))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
 xdr_node_address_1_6 (XDR *xdrs, node_address *objp)
 {
 	register int32_t *buf;
@@ -3950,6 +4353,11 @@
 		 return FALSE;
 	 if (!xdr_x_proto_range_1_6 (xdrs, &objp->proto))
 		 return FALSE;
+/* BEGIN protocol conversion code */
+ if (xdrs->x_op == XDR_DECODE) {
+ objp->services = P_PROP | P_ACC | P_LEARN;
+ }
+/* END protocol conversion code */
 	return TRUE;
 }
 bool_t
@@ -4028,6 +4436,23 @@
 	return TRUE;
 }
 bool_t
+xdr_leader_1_6 (XDR *xdrs, leader *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_string (xdrs, &objp->address, MAXNAME))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_leader_array_1_6 (XDR *xdrs, leader_array *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_array (xdrs, (char **)&objp->leader_array_val, (u_int *) &objp->leader_array_len, NSERVERS,
+		sizeof (leader), (xdrproc_t) xdr_leader_1_6))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
 xdr_app_u_1_6 (XDR *xdrs, app_u *objp)
 {
 	register int32_t *buf;
@@ -4079,6 +4504,14 @@
 		break;
 	case convert_into_local_server_type:
 		break;
+	case set_max_leaders:
+		 if (!xdr_node_no_1_6 (xdrs, &objp->app_u_u.max_leaders))
+			 return FALSE;
+		break;
+	case set_leaders_type:
+		 if (!xdr_leader_array_1_6 (xdrs, &objp->app_u_u.leaders))
+			 return FALSE;
+		break;
 	default:
 		break;
 	}
@@ -4255,6 +4688,10 @@
  objp->global_node_set.node_set_len = 0;
  objp->global_node_set.node_set_val = 0;
  }
+ if (xdrs->x_op == XDR_DECODE) {
+ objp->max_active_leaders = 0; /* Set active leaders to all as default */
+ synthesize_leaders(&objp->leaders); /* Install all nodes as leaders */
+ }
 /* END protocol conversion code */
 	return TRUE;
 }
@@ -4300,6 +4737,11 @@
 		 return FALSE;
 	 if (!xdr_checked_data (xdrs, &objp->data))
 		 return FALSE;
+/* BEGIN protocol conversion code */
+ if (xdrs->x_op == XDR_DECODE) {
+ objp->origin = objp->synode;
+ }
+/* END protocol conversion code */
 	return TRUE;
 }
 bool_t
@@ -4312,6 +4754,42 @@
 	return TRUE;
 }
 bool_t
+xdr_reply_type_1_6 (XDR *xdrs, reply_type *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_enum (xdrs, (enum_t *) objp))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_leader_info_data_1_6 (XDR *xdrs, leader_info_data *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_node_no_1_6 (xdrs, &objp->max_nr_leaders))
+		 return FALSE;
+	 if (!xdr_leader_array_1_6 (xdrs, &objp->preferred_leaders))
+		 return FALSE;
+	 if (!xdr_leader_array_1_6 (xdrs, &objp->actual_leaders))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_reply_data_1_6 (XDR *xdrs, reply_data *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_reply_type_1_6 (xdrs, &objp->rt))
+		 return FALSE;
+	switch (objp->rt) {
+	case leader_info:
+		 if (!xdr_leader_info_data_1_6 (xdrs, &objp->reply_data_u.leaders))
+			 return FALSE;
+		break;
+	default:
+		break;
+	}
+	return TRUE;
+}
+bool_t
 xdr_pax_msg_1_6 (XDR *xdrs, pax_msg *objp)
 {
 	register int32_t *buf;
@@ -4355,6 +4833,11 @@
 		 return FALSE;
 	 if (!xdr_synode_app_data_array_1_6 (xdrs, &objp->requested_synode_app_data))
 		 return FALSE;
+/* BEGIN protocol conversion code */
+ if (xdrs->x_op == XDR_DECODE) {
+ objp->rd = NULL;
+ }
+/* END protocol conversion code */
 	return TRUE;
 }
 /*
@@ -4384,6 +4867,9 @@
 #include "xcom/xcom_profile.h"
 extern synode_no const null_synode;
 extern synode_no get_delivered_msg();
+#ifndef _WIN32
+#include <strings.h> /* For bzero */
+#endif
 bool_t
 xdr_xcom_proto_1_7 (XDR *xdrs, xcom_proto *objp)
 {
@@ -4498,26 +4984,6 @@
 		 return FALSE;
 	return TRUE;
 }
-#define BITS_PER_BYTE 8
-#define MASK_BITS ((bit_mask)(sizeof (bit_mask) * BITS_PER_BYTE)) /* bits per mask */
-#define howmany_words(x, y) (((x)+((y)-1))/(y))
-#define BIT_OP(__n, __p, __op, __inv) ((__p)->bits.bits_val[(__n)/MASK_BITS] __op __inv (1u << ((__n) % MASK_BITS)))
-#define BIT_XOR(__n, __p) BIT_OP(__n, __p, ^=,(bit_mask))
-#define BIT_SET(__n, __p) BIT_OP(__n, __p, |=,(bit_mask))
-#define BIT_CLR(__n, __p) BIT_OP(__n, __p, &=,(bit_mask) ~)
-#define BIT_ISSET(__n, __p) (BIT_OP(__n, __p, &,(bit_mask)) != 0ul)
-#define BIT_ZERO(__p) memset((__p)->bits.bits_val, 0, (__p)->bits.bits_len * sizeof(*(__p)->bits.bits_val))
-extern bit_set *new_bit_set(uint32_t bits);
-extern bit_set *clone_bit_set(bit_set *orig);
-extern void free_bit_set(bit_set *bs);
-#ifndef CHECKED_DATA
-#define CHECKED_DATA
-typedef struct {
- u_int data_len;
- char *data_val;
-} checked_data;
-extern bool_t xdr_checked_data (XDR *, checked_data*);
-#endif
 bool_t
 xdr_blob_1_7 (XDR *xdrs, blob *objp)
 {
@@ -4559,6 +5025,14 @@
 	return TRUE;
 }
 bool_t
+xdr_paxos_role_1_7 (XDR *xdrs, paxos_role *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_enum (xdrs, (enum_t *) objp))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
 xdr_node_address_1_7 (XDR *xdrs, node_address *objp)
 {
 	register int32_t *buf;
@@ -4568,6 +5042,11 @@
 		 return FALSE;
 	 if (!xdr_x_proto_range_1_7 (xdrs, &objp->proto))
 		 return FALSE;
+/* BEGIN protocol conversion code */
+ if (xdrs->x_op == XDR_DECODE) {
+ objp->services = P_PROP | P_ACC | P_LEARN;
+ }
+/* END protocol conversion code */
 	return TRUE;
 }
 bool_t
@@ -4646,6 +5125,23 @@
 	return TRUE;
 }
 bool_t
+xdr_leader_1_7 (XDR *xdrs, leader *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_string (xdrs, &objp->address, MAXNAME))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_leader_array_1_7 (XDR *xdrs, leader_array *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_array (xdrs, (char **)&objp->leader_array_val, (u_int *) &objp->leader_array_len, NSERVERS,
+		sizeof (leader), (xdrproc_t) xdr_leader_1_7))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
 xdr_app_u_1_7 (XDR *xdrs, app_u *objp)
 {
 	register int32_t *buf;
@@ -4697,6 +5193,14 @@
 		break;
 	case convert_into_local_server_type:
 		break;
+	case set_max_leaders:
+		 if (!xdr_node_no_1_7 (xdrs, &objp->app_u_u.max_leaders))
+			 return FALSE;
+		break;
+	case set_leaders_type:
+		 if (!xdr_leader_array_1_7 (xdrs, &objp->app_u_u.leaders))
+			 return FALSE;
+		break;
 	default:
 		break;
 	}
@@ -4870,6 +5374,12 @@
 		 return FALSE;
 	 if (!xdr_xcom_event_horizon_1_7 (xdrs, &objp->event_horizon))
 		 return FALSE;
+/* BEGIN protocol conversion code */
+ if (xdrs->x_op == XDR_DECODE) {
+ objp->max_active_leaders = 0; /* Set active leaders to all as default */
+ synthesize_leaders(&objp->leaders); /* Install all nodes as leaders */
+ }
+/* END protocol conversion code */
 	return TRUE;
 }
 bool_t
@@ -4911,6 +5421,11 @@
 		 return FALSE;
 	 if (!xdr_checked_data (xdrs, &objp->data))
 		 return FALSE;
+/* BEGIN protocol conversion code */
+ if (xdrs->x_op == XDR_DECODE) {
+ objp->origin = objp->synode;
+ }
+/* END protocol conversion code */
 	return TRUE;
 }
 bool_t
@@ -4923,6 +5438,42 @@
 	return TRUE;
 }
 bool_t
+xdr_reply_type_1_7 (XDR *xdrs, reply_type *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_enum (xdrs, (enum_t *) objp))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_leader_info_data_1_7 (XDR *xdrs, leader_info_data *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_node_no_1_7 (xdrs, &objp->max_nr_leaders))
+		 return FALSE;
+	 if (!xdr_leader_array_1_7 (xdrs, &objp->preferred_leaders))
+		 return FALSE;
+	 if (!xdr_leader_array_1_7 (xdrs, &objp->actual_leaders))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_reply_data_1_7 (XDR *xdrs, reply_data *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_reply_type_1_7 (xdrs, &objp->rt))
+		 return FALSE;
+	switch (objp->rt) {
+	case leader_info:
+		 if (!xdr_leader_info_data_1_7 (xdrs, &objp->reply_data_u.leaders))
+			 return FALSE;
+		break;
+	default:
+		break;
+	}
+	return TRUE;
+}
+bool_t
 xdr_pax_msg_1_7 (XDR *xdrs, pax_msg *objp)
 {
 	register int32_t *buf;
@@ -4966,6 +5517,695 @@
 		 return FALSE;
 	 if (!xdr_synode_app_data_array_1_7 (xdrs, &objp->requested_synode_app_data))
 		 return FALSE;
+/* BEGIN protocol conversion code */
+ if (xdrs->x_op == XDR_DECODE) {
+ objp->rd = NULL;
+ }
+/* END protocol conversion code */
+	return TRUE;
+}
+/*
+ * Please do not edit this file.
+ * It was generated using rpcgen.
+ */
+#include "xcom_vp.h"
+/* Copyright (c) 2010, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+#include "xcom/xcom_vp_platform.h"
+#include "xcom/xcom_limits.h"
+#include "xcom/xcom_profile.h"
+extern synode_no const null_synode;
+extern synode_no get_delivered_msg();
+#ifndef _WIN32
+#include <strings.h> /* For bzero */
+#endif
+bool_t
+xdr_xcom_proto_1_8 (XDR *xdrs, xcom_proto *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_enum (xdrs, (enum_t *) objp))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_delivery_status_1_8 (XDR *xdrs, delivery_status *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_enum (xdrs, (enum_t *) objp))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_cons_type_1_8 (XDR *xdrs, cons_type *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_enum (xdrs, (enum_t *) objp))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_cargo_type_1_8 (XDR *xdrs, cargo_type *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_enum (xdrs, (enum_t *) objp))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_recover_action_1_8 (XDR *xdrs, recover_action *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_enum (xdrs, (enum_t *) objp))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_pax_op_1_8 (XDR *xdrs, pax_op *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_enum (xdrs, (enum_t *) objp))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_pax_msg_type_1_8 (XDR *xdrs, pax_msg_type *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_enum (xdrs, (enum_t *) objp))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_client_reply_code_1_8 (XDR *xdrs, client_reply_code *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_enum (xdrs, (enum_t *) objp))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_start_t_1_8 (XDR *xdrs, start_t *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_enum (xdrs, (enum_t *) objp))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_xcom_event_horizon_1_8 (XDR *xdrs, xcom_event_horizon *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_uint32_t (xdrs, objp))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_node_no_1_8 (XDR *xdrs, node_no *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_uint32_t (xdrs, objp))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_node_set_1_8 (XDR *xdrs, node_set *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_array (xdrs, (char **)&objp->node_set_val, (u_int *) &objp->node_set_len, NSERVERS,
+		sizeof (bool_t), (xdrproc_t) xdr_bool))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_bit_mask_1_8 (XDR *xdrs, bit_mask *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_uint32_t (xdrs, objp))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_bit_set_1_8 (XDR *xdrs, bit_set *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_array (xdrs, (char **)&objp->bits.bits_val, (u_int *) &objp->bits.bits_len, NSERVERS,
+		sizeof (bit_mask), (xdrproc_t) xdr_bit_mask_1_8))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_blob_1_8 (XDR *xdrs, blob *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_bytes (xdrs, (char **)&objp->data.data_val, (u_int *) &objp->data.data_len, MAXBLOB))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_x_proto_range_1_8 (XDR *xdrs, x_proto_range *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_xcom_proto_1_8 (xdrs, &objp->min_proto))
+		 return FALSE;
+	 if (!xdr_xcom_proto_1_8 (xdrs, &objp->max_proto))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_synode_no_1_8 (XDR *xdrs, synode_no *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_uint32_t (xdrs, &objp->group_id))
+		 return FALSE;
+	 if (!xdr_uint64_t (xdrs, &objp->msgno))
+		 return FALSE;
+	 if (!xdr_node_no_1_8 (xdrs, &objp->node))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_trans_id_1_8 (XDR *xdrs, trans_id *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_synode_no_1_8 (xdrs, &objp->cfg))
+		 return FALSE;
+	 if (!xdr_uint32_t (xdrs, &objp->pc))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_paxos_role_1_8 (XDR *xdrs, paxos_role *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_enum (xdrs, (enum_t *) objp))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_node_address_1_8 (XDR *xdrs, node_address *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_string (xdrs, &objp->address, MAXNAME))
+		 return FALSE;
+	 if (!xdr_blob_1_8 (xdrs, &objp->uuid))
+		 return FALSE;
+	 if (!xdr_x_proto_range_1_8 (xdrs, &objp->proto))
+		 return FALSE;
+/* BEGIN protocol conversion code */
+ if (xdrs->x_op == XDR_DECODE) {
+ objp->services = P_PROP | P_ACC | P_LEARN;
+ }
+/* END protocol conversion code */
+	return TRUE;
+}
+bool_t
+xdr_node_list_1_8 (XDR *xdrs, node_list *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_array (xdrs, (char **)&objp->node_list_val, (u_int *) &objp->node_list_len, NSERVERS,
+		sizeof (node_address), (xdrproc_t) xdr_node_address_1_8))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_node_no_array_1_8 (XDR *xdrs, node_no_array *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_array (xdrs, (char **)&objp->node_no_array_val, (u_int *) &objp->node_no_array_len, NSERVERS,
+		sizeof (node_no), (xdrproc_t) xdr_node_no_1_8))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_synode_no_array_1_8 (XDR *xdrs, synode_no_array *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_array (xdrs, (char **)&objp->synode_no_array_val, (u_int *) &objp->synode_no_array_len, MAX_SYNODE_ARRAY,
+		sizeof (synode_no), (xdrproc_t) xdr_synode_no_1_8))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_uncommitted_list_1_8 (XDR *xdrs, uncommitted_list *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_uint32_t (xdrs, &objp->active))
+		 return FALSE;
+	 if (!xdr_synode_no_array_1_8 (xdrs, &objp->vers))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_repository_1_8 (XDR *xdrs, repository *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_synode_no_1_8 (xdrs, &objp->vers))
+		 return FALSE;
+	 if (!xdr_synode_no_array_1_8 (xdrs, &objp->msg_list))
+		 return FALSE;
+	 if (!xdr_uncommitted_list_1_8 (xdrs, &objp->u_list))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_x_error_1_8 (XDR *xdrs, x_error *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_int32_t (xdrs, &objp->nodeid))
+		 return FALSE;
+	 if (!xdr_int32_t (xdrs, &objp->code))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->message, MAXERROR))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_trans_data_1_8 (XDR *xdrs, trans_data *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_trans_id_1_8 (xdrs, &objp->tid))
+		 return FALSE;
+	 if (!xdr_int32_t (xdrs, &objp->pc))
+		 return FALSE;
+	 if (!xdr_string (xdrs, &objp->cluster_name, MAXNAME))
+		 return FALSE;
+	 if (!xdr_x_error_1_8 (xdrs, &objp->errmsg))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_leader_1_8 (XDR *xdrs, leader *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_string (xdrs, &objp->address, MAXNAME))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_leader_array_1_8 (XDR *xdrs, leader_array *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_array (xdrs, (char **)&objp->leader_array_val, (u_int *) &objp->leader_array_len, NSERVERS,
+		sizeof (leader), (xdrproc_t) xdr_leader_1_8))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_app_u_1_8 (XDR *xdrs, app_u *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_cargo_type_1_8 (xdrs, &objp->c_t))
+		 return FALSE;
+	switch (objp->c_t) {
+	case unified_boot_type:
+	case add_node_type:
+	case remove_node_type:
+	case force_config_type:
+	case xcom_boot_type:
+	case xcom_set_group:
+		 if (!xdr_node_list_1_8 (xdrs, &objp->app_u_u.nodes))
+			 return FALSE;
+		break;
+	case app_type:
+		 if (!xdr_checked_data (xdrs, &objp->app_u_u.data))
+			 return FALSE;
+		break;
+	case exit_type:
+	case reset_type:
+		break;
+	case remove_reset_type:
+		break;
+	case begin_trans:
+		break;
+	case prepared_trans:
+	case abort_trans:
+		 if (!xdr_trans_data_1_8 (xdrs, &objp->app_u_u.td))
+			 return FALSE;
+		break;
+	case view_msg:
+		 if (!xdr_node_set_1_8 (xdrs, &objp->app_u_u.present))
+			 return FALSE;
+		break;
+	case set_cache_limit:
+		 if (!xdr_uint64_t (xdrs, &objp->app_u_u.cache_limit))
+			 return FALSE;
+		break;
+	case get_event_horizon_type:
+		break;
+	case set_event_horizon_type:
+		 if (!xdr_xcom_event_horizon_1_8 (xdrs, &objp->app_u_u.event_horizon))
+			 return FALSE;
+		break;
+	case get_synode_app_data_type:
+		 if (!xdr_synode_no_array_1_8 (xdrs, &objp->app_u_u.synodes))
+			 return FALSE;
+		break;
+	case convert_into_local_server_type:
+		break;
+	case set_max_leaders:
+		 if (!xdr_node_no_1_8 (xdrs, &objp->app_u_u.max_leaders))
+			 return FALSE;
+		break;
+	case set_leaders_type:
+		 if (!xdr_leader_array_1_8 (xdrs, &objp->app_u_u.leaders))
+			 return FALSE;
+		break;
+	default:
+		break;
+	}
+	return TRUE;
+}
+bool_t
+xdr_app_data_1_8 (XDR *xdrs, app_data *objp)
+{
+	register int32_t *buf;
+	if (xdrs->x_op == XDR_ENCODE) {
+		 if (!xdr_synode_no_1_8 (xdrs, &objp->unique_id))
+			 return FALSE;
+		 if (!xdr_uint32_t (xdrs, &objp->group_id))
+			 return FALSE;
+		 if (!xdr_uint64_t (xdrs, &objp->lsn))
+			 return FALSE;
+		 if (!xdr_synode_no_1_8 (xdrs, &objp->app_key))
+			 return FALSE;
+		 if (!xdr_cons_type_1_8 (xdrs, &objp->consensus))
+			 return FALSE;
+		 if (!xdr_double (xdrs, &objp->expiry_time))
+			 return FALSE;
+		buf = XDR_INLINE (xdrs, 3 * BYTES_PER_XDR_UNIT);
+		if (buf == NULL) {
+			 if (!xdr_bool (xdrs, &objp->notused))
+				 return FALSE;
+			 if (!xdr_bool (xdrs, &objp->log_it))
+				 return FALSE;
+			 if (!xdr_bool (xdrs, &objp->chosen))
+				 return FALSE;
+		} else {
+		IXDR_PUT_BOOL(buf, objp->notused);
+		IXDR_PUT_BOOL(buf, objp->log_it);
+		IXDR_PUT_BOOL(buf, objp->chosen);
+		}
+		 if (!xdr_recover_action_1_8 (xdrs, &objp->recover))
+			 return FALSE;
+		 if (!xdr_app_u_1_8 (xdrs, &objp->body))
+			 return FALSE;
+		 if (!xdr_pointer (xdrs, (char **)&objp->next, sizeof (app_data), (xdrproc_t) xdr_app_data_1_8))
+			 return FALSE;
+		return TRUE;
+	} else if (xdrs->x_op == XDR_DECODE) {
+		 if (!xdr_synode_no_1_8 (xdrs, &objp->unique_id))
+			 return FALSE;
+		 if (!xdr_uint32_t (xdrs, &objp->group_id))
+			 return FALSE;
+		 if (!xdr_uint64_t (xdrs, &objp->lsn))
+			 return FALSE;
+		 if (!xdr_synode_no_1_8 (xdrs, &objp->app_key))
+			 return FALSE;
+		 if (!xdr_cons_type_1_8 (xdrs, &objp->consensus))
+			 return FALSE;
+		 if (!xdr_double (xdrs, &objp->expiry_time))
+			 return FALSE;
+		buf = XDR_INLINE (xdrs, 3 * BYTES_PER_XDR_UNIT);
+		if (buf == NULL) {
+			 if (!xdr_bool (xdrs, &objp->notused))
+				 return FALSE;
+			 if (!xdr_bool (xdrs, &objp->log_it))
+				 return FALSE;
+			 if (!xdr_bool (xdrs, &objp->chosen))
+				 return FALSE;
+		} else {
+		objp->notused = IXDR_GET_BOOL(buf);
+		objp->log_it = IXDR_GET_BOOL(buf);
+		objp->chosen = IXDR_GET_BOOL(buf);
+		}
+		 if (!xdr_recover_action_1_8 (xdrs, &objp->recover))
+			 return FALSE;
+		 if (!xdr_app_u_1_8 (xdrs, &objp->body))
+			 return FALSE;
+		 if (!xdr_pointer (xdrs, (char **)&objp->next, sizeof (app_data), (xdrproc_t) xdr_app_data_1_8))
+			 return FALSE;
+	 return TRUE;
+	}
+	 if (!xdr_synode_no_1_8 (xdrs, &objp->unique_id))
+		 return FALSE;
+	 if (!xdr_uint32_t (xdrs, &objp->group_id))
+		 return FALSE;
+	 if (!xdr_uint64_t (xdrs, &objp->lsn))
+		 return FALSE;
+	 if (!xdr_synode_no_1_8 (xdrs, &objp->app_key))
+		 return FALSE;
+	 if (!xdr_cons_type_1_8 (xdrs, &objp->consensus))
+		 return FALSE;
+	 if (!xdr_double (xdrs, &objp->expiry_time))
+		 return FALSE;
+	 if (!xdr_bool (xdrs, &objp->notused))
+		 return FALSE;
+	 if (!xdr_bool (xdrs, &objp->log_it))
+		 return FALSE;
+	 if (!xdr_bool (xdrs, &objp->chosen))
+		 return FALSE;
+	 if (!xdr_recover_action_1_8 (xdrs, &objp->recover))
+		 return FALSE;
+	 if (!xdr_app_u_1_8 (xdrs, &objp->body))
+		 return FALSE;
+	 if (!xdr_pointer (xdrs, (char **)&objp->next, sizeof (app_data), (xdrproc_t) xdr_app_data_1_8))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_app_data_ptr_1_8 (XDR *xdrs, app_data_ptr *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_pointer (xdrs, (char **)objp, sizeof (app_data), (xdrproc_t) xdr_app_data_1_8))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_app_data_ptr_array_1_8 (XDR *xdrs, app_data_ptr_array *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_array (xdrs, (char **)&objp->app_data_ptr_array_val, (u_int *) &objp->app_data_ptr_array_len, MAX_APP_PTR_ARRAY,
+		sizeof (app_data_ptr), (xdrproc_t) xdr_app_data_ptr_1_8))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_app_data_list_1_8 (XDR *xdrs, app_data_list *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_pointer (xdrs, (char **)objp, sizeof (app_data_ptr), (xdrproc_t) xdr_app_data_ptr_1_8))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_key_range_1_8 (XDR *xdrs, key_range *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_synode_no_1_8 (xdrs, &objp->k1))
+		 return FALSE;
+	 if (!xdr_synode_no_1_8 (xdrs, &objp->k2))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_ballot_1_8 (XDR *xdrs, ballot *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_int32_t (xdrs, &objp->cnt))
+		 return FALSE;
+	 if (!xdr_node_no_1_8 (xdrs, &objp->node))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_snapshot_1_8 (XDR *xdrs, snapshot *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_synode_no_1_8 (xdrs, &objp->vers))
+		 return FALSE;
+	 if (!xdr_app_data_ptr_array_1_8 (xdrs, &objp->snap))
+		 return FALSE;
+	 if (!xdr_uncommitted_list_1_8 (xdrs, &objp->u_list))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_config_1_8 (XDR *xdrs, config *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_synode_no_1_8 (xdrs, &objp->start))
+		 return FALSE;
+	 if (!xdr_synode_no_1_8 (xdrs, &objp->boot_key))
+		 return FALSE;
+	 if (!xdr_node_list_1_8 (xdrs, &objp->nodes))
+		 return FALSE;
+	 if (!xdr_node_set_1_8 (xdrs, &objp->global_node_set))
+		 return FALSE;
+	 if (!xdr_xcom_event_horizon_1_8 (xdrs, &objp->event_horizon))
+		 return FALSE;
+/* BEGIN protocol conversion code */
+ if (xdrs->x_op == XDR_DECODE) {
+ objp->max_active_leaders = 0; /* Set active leaders to all as default */
+ synthesize_leaders(&objp->leaders); /* Install all nodes as leaders */
+ }
+/* END protocol conversion code */
+	return TRUE;
+}
+bool_t
+xdr_config_ptr_1_8 (XDR *xdrs, config_ptr *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_pointer (xdrs, (char **)objp, sizeof (config), (xdrproc_t) xdr_config_1_8))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_configs_1_8 (XDR *xdrs, configs *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_array (xdrs, (char **)&objp->configs_val, (u_int *) &objp->configs_len, MAX_SITE_DEFS,
+		sizeof (config_ptr), (xdrproc_t) xdr_config_ptr_1_8))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_gcs_snapshot_1_8 (XDR *xdrs, gcs_snapshot *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_synode_no_1_8 (xdrs, &objp->log_start))
+		 return FALSE;
+	 if (!xdr_synode_no_1_8 (xdrs, &objp->log_end))
+		 return FALSE;
+	 if (!xdr_configs_1_8 (xdrs, &objp->cfg))
+		 return FALSE;
+	 if (!xdr_blob_1_8 (xdrs, &objp->app_snap))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_synode_app_data_1_8 (XDR *xdrs, synode_app_data *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_synode_no_1_8 (xdrs, &objp->synode))
+		 return FALSE;
+	 if (!xdr_checked_data (xdrs, &objp->data))
+		 return FALSE;
+/* BEGIN protocol conversion code */
+ if (xdrs->x_op == XDR_DECODE) {
+ objp->origin = objp->synode;
+ }
+/* END protocol conversion code */
+	return TRUE;
+}
+bool_t
+xdr_synode_app_data_array_1_8 (XDR *xdrs, synode_app_data_array *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_array (xdrs, (char **)&objp->synode_app_data_array_val, (u_int *) &objp->synode_app_data_array_len, MAX_SYNODE_ARRAY,
+		sizeof (synode_app_data), (xdrproc_t) xdr_synode_app_data_1_8))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_reply_type_1_8 (XDR *xdrs, reply_type *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_enum (xdrs, (enum_t *) objp))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_leader_info_data_1_8 (XDR *xdrs, leader_info_data *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_node_no_1_8 (xdrs, &objp->max_nr_leaders))
+		 return FALSE;
+	 if (!xdr_leader_array_1_8 (xdrs, &objp->preferred_leaders))
+		 return FALSE;
+	 if (!xdr_leader_array_1_8 (xdrs, &objp->actual_leaders))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_reply_data_1_8 (XDR *xdrs, reply_data *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_reply_type_1_8 (xdrs, &objp->rt))
+		 return FALSE;
+	switch (objp->rt) {
+	case leader_info:
+		 if (!xdr_leader_info_data_1_8 (xdrs, &objp->reply_data_u.leaders))
+			 return FALSE;
+		break;
+	default:
+		break;
+	}
+	return TRUE;
+}
+bool_t
+xdr_pax_msg_1_8 (XDR *xdrs, pax_msg *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_node_no_1_8 (xdrs, &objp->to))
+		 return FALSE;
+	 if (!xdr_node_no_1_8 (xdrs, &objp->from))
+		 return FALSE;
+	 if (!xdr_uint32_t (xdrs, &objp->group_id))
+		 return FALSE;
+	 if (!xdr_synode_no_1_8 (xdrs, &objp->max_synode))
+		 return FALSE;
+	 if (!xdr_start_t_1_8 (xdrs, &objp->start_type))
+		 return FALSE;
+	 if (!xdr_ballot_1_8 (xdrs, &objp->reply_to))
+		 return FALSE;
+	 if (!xdr_ballot_1_8 (xdrs, &objp->proposal))
+		 return FALSE;
+	 if (!xdr_pax_op_1_8 (xdrs, &objp->op))
+		 return FALSE;
+	 if (!xdr_synode_no_1_8 (xdrs, &objp->synode))
+		 return FALSE;
+	 if (!xdr_pax_msg_type_1_8 (xdrs, &objp->msg_type))
+		 return FALSE;
+	 if (!xdr_pointer (xdrs, (char **)&objp->receivers, sizeof (bit_set), (xdrproc_t) xdr_bit_set_1_8))
+		 return FALSE;
+	 if (!xdr_pointer (xdrs, (char **)&objp->a, sizeof (app_data), (xdrproc_t) xdr_app_data_1_8))
+		 return FALSE;
+	 if (!xdr_pointer (xdrs, (char **)&objp->snap, sizeof (snapshot), (xdrproc_t) xdr_snapshot_1_8))
+		 return FALSE;
+	 if (!xdr_pointer (xdrs, (char **)&objp->gcs_snap, sizeof (gcs_snapshot), (xdrproc_t) xdr_gcs_snapshot_1_8))
+		 return FALSE;
+	 if (!xdr_client_reply_code_1_8 (xdrs, &objp->cli_err))
+		 return FALSE;
+	 if (!xdr_bool (xdrs, &objp->force_delivery))
+		 return FALSE;
+	 if (!xdr_int32_t (xdrs, &objp->refcnt))
+		 return FALSE;
+	 if (!xdr_synode_no_1_8 (xdrs, &objp->delivered_msg))
+		 return FALSE;
+	 if (!xdr_xcom_event_horizon_1_8 (xdrs, &objp->event_horizon))
+		 return FALSE;
+	 if (!xdr_synode_app_data_array_1_8 (xdrs, &objp->requested_synode_app_data))
+		 return FALSE;
+/* BEGIN protocol conversion code */
+ if (xdrs->x_op == XDR_DECODE) {
+ objp->rd = NULL;
+ }
+/* END protocol conversion code */
 	return TRUE;
 }
 /*
@@ -4995,8 +6235,11 @@
 #include "xcom/xcom_profile.h"
 extern synode_no const null_synode;
 extern synode_no get_delivered_msg();
+#ifndef _WIN32
+#include <strings.h> /* For bzero */
+#endif
 bool_t
-xdr_xcom_proto_1_8 (XDR *xdrs, xcom_proto *objp)
+xdr_xcom_proto_1_9 (XDR *xdrs, xcom_proto *objp)
 {
 	register int32_t *buf;
 	 if (!xdr_enum (xdrs, (enum_t *) objp))
@@ -5004,7 +6247,7 @@
 	return TRUE;
 }
 bool_t
-xdr_delivery_status_1_8 (XDR *xdrs, delivery_status *objp)
+xdr_delivery_status_1_9 (XDR *xdrs, delivery_status *objp)
 {
 	register int32_t *buf;
 	 if (!xdr_enum (xdrs, (enum_t *) objp))
@@ -5012,7 +6255,7 @@
 	return TRUE;
 }
 bool_t
-xdr_cons_type_1_8 (XDR *xdrs, cons_type *objp)
+xdr_cons_type_1_9 (XDR *xdrs, cons_type *objp)
 {
 	register int32_t *buf;
 	 if (!xdr_enum (xdrs, (enum_t *) objp))
@@ -5020,7 +6263,7 @@
 	return TRUE;
 }
 bool_t
-xdr_cargo_type_1_8 (XDR *xdrs, cargo_type *objp)
+xdr_cargo_type_1_9 (XDR *xdrs, cargo_type *objp)
 {
 	register int32_t *buf;
 	 if (!xdr_enum (xdrs, (enum_t *) objp))
@@ -5028,7 +6271,7 @@
 	return TRUE;
 }
 bool_t
-xdr_recover_action_1_8 (XDR *xdrs, recover_action *objp)
+xdr_recover_action_1_9 (XDR *xdrs, recover_action *objp)
 {
 	register int32_t *buf;
 	 if (!xdr_enum (xdrs, (enum_t *) objp))
@@ -5036,7 +6279,7 @@
 	return TRUE;
 }
 bool_t
-xdr_pax_op_1_8 (XDR *xdrs, pax_op *objp)
+xdr_pax_op_1_9 (XDR *xdrs, pax_op *objp)
 {
 	register int32_t *buf;
 	 if (!xdr_enum (xdrs, (enum_t *) objp))
@@ -5044,7 +6287,7 @@
 	return TRUE;
 }
 bool_t
-xdr_pax_msg_type_1_8 (XDR *xdrs, pax_msg_type *objp)
+xdr_pax_msg_type_1_9 (XDR *xdrs, pax_msg_type *objp)
 {
 	register int32_t *buf;
 	 if (!xdr_enum (xdrs, (enum_t *) objp))
@@ -5052,7 +6295,7 @@
 	return TRUE;
 }
 bool_t
-xdr_client_reply_code_1_8 (XDR *xdrs, client_reply_code *objp)
+xdr_client_reply_code_1_9 (XDR *xdrs, client_reply_code *objp)
 {
 	register int32_t *buf;
 	 if (!xdr_enum (xdrs, (enum_t *) objp))
@@ -5060,7 +6303,7 @@
 	return TRUE;
 }
 bool_t
-xdr_start_t_1_8 (XDR *xdrs, start_t *objp)
+xdr_start_t_1_9 (XDR *xdrs, start_t *objp)
 {
 	register int32_t *buf;
 	 if (!xdr_enum (xdrs, (enum_t *) objp))
@@ -5068,7 +6311,7 @@
 	return TRUE;
 }
 bool_t
-xdr_xcom_event_horizon_1_8 (XDR *xdrs, xcom_event_horizon *objp)
+xdr_xcom_event_horizon_1_9 (XDR *xdrs, xcom_event_horizon *objp)
 {
 	register int32_t *buf;
 	 if (!xdr_uint32_t (xdrs, objp))
@@ -5076,7 +6319,7 @@
 	return TRUE;
 }
 bool_t
-xdr_node_no_1_8 (XDR *xdrs, node_no *objp)
+xdr_node_no_1_9 (XDR *xdrs, node_no *objp)
 {
 	register int32_t *buf;
 	 if (!xdr_uint32_t (xdrs, objp))
@@ -5084,7 +6327,7 @@
 	return TRUE;
 }
 bool_t
-xdr_node_set_1_8 (XDR *xdrs, node_set *objp)
+xdr_node_set_1_9 (XDR *xdrs, node_set *objp)
 {
 	register int32_t *buf;
 	 if (!xdr_array (xdrs, (char **)&objp->node_set_val, (u_int *) &objp->node_set_len, NSERVERS,
@@ -5093,7 +6336,7 @@
 	return TRUE;
 }
 bool_t
-xdr_bit_mask_1_8 (XDR *xdrs, bit_mask *objp)
+xdr_bit_mask_1_9 (XDR *xdrs, bit_mask *objp)
 {
 	register int32_t *buf;
 	 if (!xdr_uint32_t (xdrs, objp))
@@ -5101,36 +6344,16 @@
 	return TRUE;
 }
 bool_t
-xdr_bit_set_1_8 (XDR *xdrs, bit_set *objp)
+xdr_bit_set_1_9 (XDR *xdrs, bit_set *objp)
 {
 	register int32_t *buf;
 	 if (!xdr_array (xdrs, (char **)&objp->bits.bits_val, (u_int *) &objp->bits.bits_len, NSERVERS,
-		sizeof (bit_mask), (xdrproc_t) xdr_bit_mask_1_8))
+		sizeof (bit_mask), (xdrproc_t) xdr_bit_mask_1_9))
 		 return FALSE;
 	return TRUE;
 }
-#define BITS_PER_BYTE 8
-#define MASK_BITS ((bit_mask)(sizeof (bit_mask) * BITS_PER_BYTE)) /* bits per mask */
-#define howmany_words(x, y) (((x)+((y)-1))/(y))
-#define BIT_OP(__n, __p, __op, __inv) ((__p)->bits.bits_val[(__n)/MASK_BITS] __op __inv (1u << ((__n) % MASK_BITS)))
-#define BIT_XOR(__n, __p) BIT_OP(__n, __p, ^=,(bit_mask))
-#define BIT_SET(__n, __p) BIT_OP(__n, __p, |=,(bit_mask))
-#define BIT_CLR(__n, __p) BIT_OP(__n, __p, &=,(bit_mask) ~)
-#define BIT_ISSET(__n, __p) (BIT_OP(__n, __p, &,(bit_mask)) != 0ul)
-#define BIT_ZERO(__p) memset((__p)->bits.bits_val, 0, (__p)->bits.bits_len * sizeof(*(__p)->bits.bits_val))
-extern bit_set *new_bit_set(uint32_t bits);
-extern bit_set *clone_bit_set(bit_set *orig);
-extern void free_bit_set(bit_set *bs);
-#ifndef CHECKED_DATA
-#define CHECKED_DATA
-typedef struct {
- u_int data_len;
- char *data_val;
-} checked_data;
-extern bool_t xdr_checked_data (XDR *, checked_data*);
-#endif
 bool_t
-xdr_blob_1_8 (XDR *xdrs, blob *objp)
+xdr_blob_1_9 (XDR *xdrs, blob *objp)
 {
 	register int32_t *buf;
 	 if (!xdr_bytes (xdrs, (char **)&objp->data.data_val, (u_int *) &objp->data.data_len, MAXBLOB))
@@ -5138,100 +6361,110 @@
 	return TRUE;
 }
 bool_t
-xdr_x_proto_range_1_8 (XDR *xdrs, x_proto_range *objp)
+xdr_x_proto_range_1_9 (XDR *xdrs, x_proto_range *objp)
 {
 	register int32_t *buf;
-	 if (!xdr_xcom_proto_1_8 (xdrs, &objp->min_proto))
+	 if (!xdr_xcom_proto_1_9 (xdrs, &objp->min_proto))
 		 return FALSE;
-	 if (!xdr_xcom_proto_1_8 (xdrs, &objp->max_proto))
+	 if (!xdr_xcom_proto_1_9 (xdrs, &objp->max_proto))
 		 return FALSE;
 	return TRUE;
 }
 bool_t
-xdr_synode_no_1_8 (XDR *xdrs, synode_no *objp)
+xdr_synode_no_1_9 (XDR *xdrs, synode_no *objp)
 {
 	register int32_t *buf;
 	 if (!xdr_uint32_t (xdrs, &objp->group_id))
 		 return FALSE;
 	 if (!xdr_uint64_t (xdrs, &objp->msgno))
 		 return FALSE;
-	 if (!xdr_node_no_1_8 (xdrs, &objp->node))
+	 if (!xdr_node_no_1_9 (xdrs, &objp->node))
 		 return FALSE;
 	return TRUE;
 }
 bool_t
-xdr_trans_id_1_8 (XDR *xdrs, trans_id *objp)
+xdr_trans_id_1_9 (XDR *xdrs, trans_id *objp)
 {
 	register int32_t *buf;
-	 if (!xdr_synode_no_1_8 (xdrs, &objp->cfg))
+	 if (!xdr_synode_no_1_9 (xdrs, &objp->cfg))
 		 return FALSE;
 	 if (!xdr_uint32_t (xdrs, &objp->pc))
 		 return FALSE;
 	return TRUE;
 }
 bool_t
-xdr_node_address_1_8 (XDR *xdrs, node_address *objp)
+xdr_paxos_role_1_9 (XDR *xdrs, paxos_role *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_enum (xdrs, (enum_t *) objp))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_node_address_1_9 (XDR *xdrs, node_address *objp)
 {
 	register int32_t *buf;
 	 if (!xdr_string (xdrs, &objp->address, MAXNAME))
 		 return FALSE;
-	 if (!xdr_blob_1_8 (xdrs, &objp->uuid))
+	 if (!xdr_blob_1_9 (xdrs, &objp->uuid))
 		 return FALSE;
-	 if (!xdr_x_proto_range_1_8 (xdrs, &objp->proto))
+	 if (!xdr_x_proto_range_1_9 (xdrs, &objp->proto))
+		 return FALSE;
+	 if (!xdr_uint32_t (xdrs, &objp->services))
 		 return FALSE;
 	return TRUE;
 }
 bool_t
-xdr_node_list_1_8 (XDR *xdrs, node_list *objp)
+xdr_node_list_1_9 (XDR *xdrs, node_list *objp)
 {
 	register int32_t *buf;
 	 if (!xdr_array (xdrs, (char **)&objp->node_list_val, (u_int *) &objp->node_list_len, NSERVERS,
-		sizeof (node_address), (xdrproc_t) xdr_node_address_1_8))
+		sizeof (node_address), (xdrproc_t) xdr_node_address_1_9))
 		 return FALSE;
 	return TRUE;
 }
 bool_t
-xdr_node_no_array_1_8 (XDR *xdrs, node_no_array *objp)
+xdr_node_no_array_1_9 (XDR *xdrs, node_no_array *objp)
 {
 	register int32_t *buf;
 	 if (!xdr_array (xdrs, (char **)&objp->node_no_array_val, (u_int *) &objp->node_no_array_len, NSERVERS,
-		sizeof (node_no), (xdrproc_t) xdr_node_no_1_8))
+		sizeof (node_no), (xdrproc_t) xdr_node_no_1_9))
 		 return FALSE;
 	return TRUE;
 }
 bool_t
-xdr_synode_no_array_1_8 (XDR *xdrs, synode_no_array *objp)
+xdr_synode_no_array_1_9 (XDR *xdrs, synode_no_array *objp)
 {
 	register int32_t *buf;
 	 if (!xdr_array (xdrs, (char **)&objp->synode_no_array_val, (u_int *) &objp->synode_no_array_len, MAX_SYNODE_ARRAY,
-		sizeof (synode_no), (xdrproc_t) xdr_synode_no_1_8))
+		sizeof (synode_no), (xdrproc_t) xdr_synode_no_1_9))
 		 return FALSE;
 	return TRUE;
 }
 bool_t
-xdr_uncommitted_list_1_8 (XDR *xdrs, uncommitted_list *objp)
+xdr_uncommitted_list_1_9 (XDR *xdrs, uncommitted_list *objp)
 {
 	register int32_t *buf;
 	 if (!xdr_uint32_t (xdrs, &objp->active))
 		 return FALSE;
-	 if (!xdr_synode_no_array_1_8 (xdrs, &objp->vers))
+	 if (!xdr_synode_no_array_1_9 (xdrs, &objp->vers))
 		 return FALSE;
 	return TRUE;
 }
 bool_t
-xdr_repository_1_8 (XDR *xdrs, repository *objp)
+xdr_repository_1_9 (XDR *xdrs, repository *objp)
 {
 	register int32_t *buf;
-	 if (!xdr_synode_no_1_8 (xdrs, &objp->vers))
+	 if (!xdr_synode_no_1_9 (xdrs, &objp->vers))
 		 return FALSE;
-	 if (!xdr_synode_no_array_1_8 (xdrs, &objp->msg_list))
+	 if (!xdr_synode_no_array_1_9 (xdrs, &objp->msg_list))
 		 return FALSE;
-	 if (!xdr_uncommitted_list_1_8 (xdrs, &objp->u_list))
+	 if (!xdr_uncommitted_list_1_9 (xdrs, &objp->u_list))
 		 return FALSE;
 	return TRUE;
 }
 bool_t
-xdr_x_error_1_8 (XDR *xdrs, x_error *objp)
+xdr_x_error_1_9 (XDR *xdrs, x_error *objp)
 {
 	register int32_t *buf;
 	 if (!xdr_int32_t (xdrs, &objp->nodeid))
@@ -5243,24 +6476,41 @@
 	return TRUE;
 }
 bool_t
-xdr_trans_data_1_8 (XDR *xdrs, trans_data *objp)
+xdr_trans_data_1_9 (XDR *xdrs, trans_data *objp)
 {
 	register int32_t *buf;
-	 if (!xdr_trans_id_1_8 (xdrs, &objp->tid))
+	 if (!xdr_trans_id_1_9 (xdrs, &objp->tid))
 		 return FALSE;
 	 if (!xdr_int32_t (xdrs, &objp->pc))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->cluster_name, MAXNAME))
 		 return FALSE;
-	 if (!xdr_x_error_1_8 (xdrs, &objp->errmsg))
+	 if (!xdr_x_error_1_9 (xdrs, &objp->errmsg))
 		 return FALSE;
 	return TRUE;
 }
 bool_t
-xdr_app_u_1_8 (XDR *xdrs, app_u *objp)
+xdr_leader_1_9 (XDR *xdrs, leader *objp)
 {
 	register int32_t *buf;
-	 if (!xdr_cargo_type_1_8 (xdrs, &objp->c_t))
+	 if (!xdr_string (xdrs, &objp->address, MAXNAME))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_leader_array_1_9 (XDR *xdrs, leader_array *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_array (xdrs, (char **)&objp->leader_array_val, (u_int *) &objp->leader_array_len, NSERVERS,
+		sizeof (leader), (xdrproc_t) xdr_leader_1_9))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_app_u_1_9 (XDR *xdrs, app_u *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_cargo_type_1_9 (xdrs, &objp->c_t))
 		 return FALSE;
 	switch (objp->c_t) {
 	case unified_boot_type:
@@ -5269,7 +6519,7 @@
 	case force_config_type:
 	case xcom_boot_type:
 	case xcom_set_group:
-		 if (!xdr_node_list_1_8 (xdrs, &objp->app_u_u.nodes))
+		 if (!xdr_node_list_1_9 (xdrs, &objp->app_u_u.nodes))
 			 return FALSE;
 		break;
 	case app_type:
@@ -5285,11 +6535,11 @@
 		break;
 	case prepared_trans:
 	case abort_trans:
-		 if (!xdr_trans_data_1_8 (xdrs, &objp->app_u_u.td))
+		 if (!xdr_trans_data_1_9 (xdrs, &objp->app_u_u.td))
 			 return FALSE;
 		break;
 	case view_msg:
-		 if (!xdr_node_set_1_8 (xdrs, &objp->app_u_u.present))
+		 if (!xdr_node_set_1_9 (xdrs, &objp->app_u_u.present))
 			 return FALSE;
 		break;
 	case set_cache_limit:
@@ -5299,34 +6549,42 @@
 	case get_event_horizon_type:
 		break;
 	case set_event_horizon_type:
-		 if (!xdr_xcom_event_horizon_1_8 (xdrs, &objp->app_u_u.event_horizon))
+		 if (!xdr_xcom_event_horizon_1_9 (xdrs, &objp->app_u_u.event_horizon))
 			 return FALSE;
 		break;
 	case get_synode_app_data_type:
-		 if (!xdr_synode_no_array_1_8 (xdrs, &objp->app_u_u.synodes))
+		 if (!xdr_synode_no_array_1_9 (xdrs, &objp->app_u_u.synodes))
 			 return FALSE;
 		break;
 	case convert_into_local_server_type:
 		break;
+	case set_max_leaders:
+		 if (!xdr_node_no_1_9 (xdrs, &objp->app_u_u.max_leaders))
+			 return FALSE;
+		break;
+	case set_leaders_type:
+		 if (!xdr_leader_array_1_9 (xdrs, &objp->app_u_u.leaders))
+			 return FALSE;
+		break;
 	default:
 		break;
 	}
 	return TRUE;
 }
 bool_t
-xdr_app_data_1_8 (XDR *xdrs, app_data *objp)
+xdr_app_data_1_9 (XDR *xdrs, app_data *objp)
 {
 	register int32_t *buf;
 	if (xdrs->x_op == XDR_ENCODE) {
-		 if (!xdr_synode_no_1_8 (xdrs, &objp->unique_id))
+		 if (!xdr_synode_no_1_9 (xdrs, &objp->unique_id))
 			 return FALSE;
 		 if (!xdr_uint32_t (xdrs, &objp->group_id))
 			 return FALSE;
 		 if (!xdr_uint64_t (xdrs, &objp->lsn))
 			 return FALSE;
-		 if (!xdr_synode_no_1_8 (xdrs, &objp->app_key))
+		 if (!xdr_synode_no_1_9 (xdrs, &objp->app_key))
 			 return FALSE;
-		 if (!xdr_cons_type_1_8 (xdrs, &objp->consensus))
+		 if (!xdr_cons_type_1_9 (xdrs, &objp->consensus))
 			 return FALSE;
 		 if (!xdr_double (xdrs, &objp->expiry_time))
 			 return FALSE;
@@ -5343,23 +6601,23 @@
 		IXDR_PUT_BOOL(buf, objp->log_it);
 		IXDR_PUT_BOOL(buf, objp->chosen);
 		}
-		 if (!xdr_recover_action_1_8 (xdrs, &objp->recover))
+		 if (!xdr_recover_action_1_9 (xdrs, &objp->recover))
 			 return FALSE;
-		 if (!xdr_app_u_1_8 (xdrs, &objp->body))
+		 if (!xdr_app_u_1_9 (xdrs, &objp->body))
 			 return FALSE;
-		 if (!xdr_pointer (xdrs, (char **)&objp->next, sizeof (app_data), (xdrproc_t) xdr_app_data_1_8))
+		 if (!xdr_pointer (xdrs, (char **)&objp->next, sizeof (app_data), (xdrproc_t) xdr_app_data_1_9))
 			 return FALSE;
 		return TRUE;
 	} else if (xdrs->x_op == XDR_DECODE) {
-		 if (!xdr_synode_no_1_8 (xdrs, &objp->unique_id))
+		 if (!xdr_synode_no_1_9 (xdrs, &objp->unique_id))
 			 return FALSE;
 		 if (!xdr_uint32_t (xdrs, &objp->group_id))
 			 return FALSE;
 		 if (!xdr_uint64_t (xdrs, &objp->lsn))
 			 return FALSE;
-		 if (!xdr_synode_no_1_8 (xdrs, &objp->app_key))
+		 if (!xdr_synode_no_1_9 (xdrs, &objp->app_key))
 			 return FALSE;
-		 if (!xdr_cons_type_1_8 (xdrs, &objp->consensus))
+		 if (!xdr_cons_type_1_9 (xdrs, &objp->consensus))
 			 return FALSE;
 		 if (!xdr_double (xdrs, &objp->expiry_time))
 			 return FALSE;
@@ -5376,23 +6634,23 @@
 		objp->log_it = IXDR_GET_BOOL(buf);
 		objp->chosen = IXDR_GET_BOOL(buf);
 		}
-		 if (!xdr_recover_action_1_8 (xdrs, &objp->recover))
+		 if (!xdr_recover_action_1_9 (xdrs, &objp->recover))
 			 return FALSE;
-		 if (!xdr_app_u_1_8 (xdrs, &objp->body))
+		 if (!xdr_app_u_1_9 (xdrs, &objp->body))
 			 return FALSE;
-		 if (!xdr_pointer (xdrs, (char **)&objp->next, sizeof (app_data), (xdrproc_t) xdr_app_data_1_8))
+		 if (!xdr_pointer (xdrs, (char **)&objp->next, sizeof (app_data), (xdrproc_t) xdr_app_data_1_9))
 			 return FALSE;
 	 return TRUE;
 	}
-	 if (!xdr_synode_no_1_8 (xdrs, &objp->unique_id))
+	 if (!xdr_synode_no_1_9 (xdrs, &objp->unique_id))
 		 return FALSE;
 	 if (!xdr_uint32_t (xdrs, &objp->group_id))
 		 return FALSE;
 	 if (!xdr_uint64_t (xdrs, &objp->lsn))
 		 return FALSE;
-	 if (!xdr_synode_no_1_8 (xdrs, &objp->app_key))
+	 if (!xdr_synode_no_1_9 (xdrs, &objp->app_key))
 		 return FALSE;
-	 if (!xdr_cons_type_1_8 (xdrs, &objp->consensus))
+	 if (!xdr_cons_type_1_9 (xdrs, &objp->consensus))
 		 return FALSE;
 	 if (!xdr_double (xdrs, &objp->expiry_time))
 		 return FALSE;
@@ -5402,180 +6660,224 @@
 		 return FALSE;
 	 if (!xdr_bool (xdrs, &objp->chosen))
 		 return FALSE;
-	 if (!xdr_recover_action_1_8 (xdrs, &objp->recover))
+	 if (!xdr_recover_action_1_9 (xdrs, &objp->recover))
 		 return FALSE;
-	 if (!xdr_app_u_1_8 (xdrs, &objp->body))
+	 if (!xdr_app_u_1_9 (xdrs, &objp->body))
 		 return FALSE;
-	 if (!xdr_pointer (xdrs, (char **)&objp->next, sizeof (app_data), (xdrproc_t) xdr_app_data_1_8))
+	 if (!xdr_pointer (xdrs, (char **)&objp->next, sizeof (app_data), (xdrproc_t) xdr_app_data_1_9))
 		 return FALSE;
 	return TRUE;
 }
 bool_t
-xdr_app_data_ptr_1_8 (XDR *xdrs, app_data_ptr *objp)
+xdr_app_data_ptr_1_9 (XDR *xdrs, app_data_ptr *objp)
 {
 	register int32_t *buf;
-	 if (!xdr_pointer (xdrs, (char **)objp, sizeof (app_data), (xdrproc_t) xdr_app_data_1_8))
+	 if (!xdr_pointer (xdrs, (char **)objp, sizeof (app_data), (xdrproc_t) xdr_app_data_1_9))
 		 return FALSE;
 	return TRUE;
 }
 bool_t
-xdr_app_data_ptr_array_1_8 (XDR *xdrs, app_data_ptr_array *objp)
+xdr_app_data_ptr_array_1_9 (XDR *xdrs, app_data_ptr_array *objp)
 {
 	register int32_t *buf;
 	 if (!xdr_array (xdrs, (char **)&objp->app_data_ptr_array_val, (u_int *) &objp->app_data_ptr_array_len, MAX_APP_PTR_ARRAY,
-		sizeof (app_data_ptr), (xdrproc_t) xdr_app_data_ptr_1_8))
+		sizeof (app_data_ptr), (xdrproc_t) xdr_app_data_ptr_1_9))
 		 return FALSE;
 	return TRUE;
 }
 bool_t
-xdr_app_data_list_1_8 (XDR *xdrs, app_data_list *objp)
+xdr_app_data_list_1_9 (XDR *xdrs, app_data_list *objp)
 {
 	register int32_t *buf;
-	 if (!xdr_pointer (xdrs, (char **)objp, sizeof (app_data_ptr), (xdrproc_t) xdr_app_data_ptr_1_8))
+	 if (!xdr_pointer (xdrs, (char **)objp, sizeof (app_data_ptr), (xdrproc_t) xdr_app_data_ptr_1_9))
 		 return FALSE;
 	return TRUE;
 }
 bool_t
-xdr_key_range_1_8 (XDR *xdrs, key_range *objp)
+xdr_key_range_1_9 (XDR *xdrs, key_range *objp)
 {
 	register int32_t *buf;
-	 if (!xdr_synode_no_1_8 (xdrs, &objp->k1))
+	 if (!xdr_synode_no_1_9 (xdrs, &objp->k1))
 		 return FALSE;
-	 if (!xdr_synode_no_1_8 (xdrs, &objp->k2))
+	 if (!xdr_synode_no_1_9 (xdrs, &objp->k2))
 		 return FALSE;
 	return TRUE;
 }
 bool_t
-xdr_ballot_1_8 (XDR *xdrs, ballot *objp)
+xdr_ballot_1_9 (XDR *xdrs, ballot *objp)
 {
 	register int32_t *buf;
 	 if (!xdr_int32_t (xdrs, &objp->cnt))
 		 return FALSE;
-	 if (!xdr_node_no_1_8 (xdrs, &objp->node))
+	 if (!xdr_node_no_1_9 (xdrs, &objp->node))
 		 return FALSE;
 	return TRUE;
 }
 bool_t
-xdr_snapshot_1_8 (XDR *xdrs, snapshot *objp)
+xdr_snapshot_1_9 (XDR *xdrs, snapshot *objp)
 {
 	register int32_t *buf;
-	 if (!xdr_synode_no_1_8 (xdrs, &objp->vers))
+	 if (!xdr_synode_no_1_9 (xdrs, &objp->vers))
 		 return FALSE;
-	 if (!xdr_app_data_ptr_array_1_8 (xdrs, &objp->snap))
+	 if (!xdr_app_data_ptr_array_1_9 (xdrs, &objp->snap))
 		 return FALSE;
-	 if (!xdr_uncommitted_list_1_8 (xdrs, &objp->u_list))
+	 if (!xdr_uncommitted_list_1_9 (xdrs, &objp->u_list))
 		 return FALSE;
 	return TRUE;
 }
 bool_t
-xdr_config_1_8 (XDR *xdrs, config *objp)
+xdr_config_1_9 (XDR *xdrs, config *objp)
 {
 	register int32_t *buf;
-	 if (!xdr_synode_no_1_8 (xdrs, &objp->start))
+	 if (!xdr_synode_no_1_9 (xdrs, &objp->start))
 		 return FALSE;
-	 if (!xdr_synode_no_1_8 (xdrs, &objp->boot_key))
+	 if (!xdr_synode_no_1_9 (xdrs, &objp->boot_key))
 		 return FALSE;
-	 if (!xdr_node_list_1_8 (xdrs, &objp->nodes))
+	 if (!xdr_node_list_1_9 (xdrs, &objp->nodes))
 		 return FALSE;
-	 if (!xdr_node_set_1_8 (xdrs, &objp->global_node_set))
+	 if (!xdr_node_set_1_9 (xdrs, &objp->global_node_set))
 		 return FALSE;
-	 if (!xdr_xcom_event_horizon_1_8 (xdrs, &objp->event_horizon))
+	 if (!xdr_xcom_event_horizon_1_9 (xdrs, &objp->event_horizon))
+		 return FALSE;
+	 if (!xdr_node_no_1_9 (xdrs, &objp->max_active_leaders))
+		 return FALSE;
+	 if (!xdr_leader_array_1_9 (xdrs, &objp->leaders))
 		 return FALSE;
 	return TRUE;
 }
 bool_t
-xdr_config_ptr_1_8 (XDR *xdrs, config_ptr *objp)
+xdr_config_ptr_1_9 (XDR *xdrs, config_ptr *objp)
 {
 	register int32_t *buf;
-	 if (!xdr_pointer (xdrs, (char **)objp, sizeof (config), (xdrproc_t) xdr_config_1_8))
+	 if (!xdr_pointer (xdrs, (char **)objp, sizeof (config), (xdrproc_t) xdr_config_1_9))
 		 return FALSE;
 	return TRUE;
 }
 bool_t
-xdr_configs_1_8 (XDR *xdrs, configs *objp)
+xdr_configs_1_9 (XDR *xdrs, configs *objp)
 {
 	register int32_t *buf;
 	 if (!xdr_array (xdrs, (char **)&objp->configs_val, (u_int *) &objp->configs_len, MAX_SITE_DEFS,
-		sizeof (config_ptr), (xdrproc_t) xdr_config_ptr_1_8))
+		sizeof (config_ptr), (xdrproc_t) xdr_config_ptr_1_9))
 		 return FALSE;
 	return TRUE;
 }
 bool_t
-xdr_gcs_snapshot_1_8 (XDR *xdrs, gcs_snapshot *objp)
+xdr_gcs_snapshot_1_9 (XDR *xdrs, gcs_snapshot *objp)
 {
 	register int32_t *buf;
-	 if (!xdr_synode_no_1_8 (xdrs, &objp->log_start))
+	 if (!xdr_synode_no_1_9 (xdrs, &objp->log_start))
 		 return FALSE;
-	 if (!xdr_synode_no_1_8 (xdrs, &objp->log_end))
+	 if (!xdr_synode_no_1_9 (xdrs, &objp->log_end))
 		 return FALSE;
-	 if (!xdr_configs_1_8 (xdrs, &objp->cfg))
+	 if (!xdr_configs_1_9 (xdrs, &objp->cfg))
 		 return FALSE;
-	 if (!xdr_blob_1_8 (xdrs, &objp->app_snap))
+	 if (!xdr_blob_1_9 (xdrs, &objp->app_snap))
 		 return FALSE;
 	return TRUE;
 }
 bool_t
-xdr_synode_app_data_1_8 (XDR *xdrs, synode_app_data *objp)
+xdr_synode_app_data_1_9 (XDR *xdrs, synode_app_data *objp)
 {
 	register int32_t *buf;
-	 if (!xdr_synode_no_1_8 (xdrs, &objp->synode))
+	 if (!xdr_synode_no_1_9 (xdrs, &objp->synode))
 		 return FALSE;
 	 if (!xdr_checked_data (xdrs, &objp->data))
 		 return FALSE;
+	 if (!xdr_synode_no_1_9 (xdrs, &objp->origin))
+		 return FALSE;
 	return TRUE;
 }
 bool_t
-xdr_synode_app_data_array_1_8 (XDR *xdrs, synode_app_data_array *objp)
+xdr_synode_app_data_array_1_9 (XDR *xdrs, synode_app_data_array *objp)
 {
 	register int32_t *buf;
 	 if (!xdr_array (xdrs, (char **)&objp->synode_app_data_array_val, (u_int *) &objp->synode_app_data_array_len, MAX_SYNODE_ARRAY,
-		sizeof (synode_app_data), (xdrproc_t) xdr_synode_app_data_1_8))
+		sizeof (synode_app_data), (xdrproc_t) xdr_synode_app_data_1_9))
 		 return FALSE;
 	return TRUE;
 }
 bool_t
-xdr_pax_msg_1_8 (XDR *xdrs, pax_msg *objp)
+xdr_reply_type_1_9 (XDR *xdrs, reply_type *objp)
 {
 	register int32_t *buf;
-	 if (!xdr_node_no_1_8 (xdrs, &objp->to))
+	 if (!xdr_enum (xdrs, (enum_t *) objp))
 		 return FALSE;
-	 if (!xdr_node_no_1_8 (xdrs, &objp->from))
+	return TRUE;
+}
+bool_t
+xdr_leader_info_data_1_9 (XDR *xdrs, leader_info_data *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_node_no_1_9 (xdrs, &objp->max_nr_leaders))
+		 return FALSE;
+	 if (!xdr_leader_array_1_9 (xdrs, &objp->preferred_leaders))
+		 return FALSE;
+	 if (!xdr_leader_array_1_9 (xdrs, &objp->actual_leaders))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_reply_data_1_9 (XDR *xdrs, reply_data *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_reply_type_1_9 (xdrs, &objp->rt))
+		 return FALSE;
+	switch (objp->rt) {
+	case leader_info:
+		 if (!xdr_leader_info_data_1_9 (xdrs, &objp->reply_data_u.leaders))
+			 return FALSE;
+		break;
+	default:
+		break;
+	}
+	return TRUE;
+}
+bool_t
+xdr_pax_msg_1_9 (XDR *xdrs, pax_msg *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_node_no_1_9 (xdrs, &objp->to))
+		 return FALSE;
+	 if (!xdr_node_no_1_9 (xdrs, &objp->from))
 		 return FALSE;
 	 if (!xdr_uint32_t (xdrs, &objp->group_id))
 		 return FALSE;
-	 if (!xdr_synode_no_1_8 (xdrs, &objp->max_synode))
+	 if (!xdr_synode_no_1_9 (xdrs, &objp->max_synode))
 		 return FALSE;
-	 if (!xdr_start_t_1_8 (xdrs, &objp->start_type))
+	 if (!xdr_start_t_1_9 (xdrs, &objp->start_type))
 		 return FALSE;
-	 if (!xdr_ballot_1_8 (xdrs, &objp->reply_to))
+	 if (!xdr_ballot_1_9 (xdrs, &objp->reply_to))
 		 return FALSE;
-	 if (!xdr_ballot_1_8 (xdrs, &objp->proposal))
+	 if (!xdr_ballot_1_9 (xdrs, &objp->proposal))
 		 return FALSE;
-	 if (!xdr_pax_op_1_8 (xdrs, &objp->op))
+	 if (!xdr_pax_op_1_9 (xdrs, &objp->op))
 		 return FALSE;
-	 if (!xdr_synode_no_1_8 (xdrs, &objp->synode))
+	 if (!xdr_synode_no_1_9 (xdrs, &objp->synode))
 		 return FALSE;
-	 if (!xdr_pax_msg_type_1_8 (xdrs, &objp->msg_type))
+	 if (!xdr_pax_msg_type_1_9 (xdrs, &objp->msg_type))
 		 return FALSE;
-	 if (!xdr_pointer (xdrs, (char **)&objp->receivers, sizeof (bit_set), (xdrproc_t) xdr_bit_set_1_8))
+	 if (!xdr_pointer (xdrs, (char **)&objp->receivers, sizeof (bit_set), (xdrproc_t) xdr_bit_set_1_9))
 		 return FALSE;
-	 if (!xdr_pointer (xdrs, (char **)&objp->a, sizeof (app_data), (xdrproc_t) xdr_app_data_1_8))
+	 if (!xdr_pointer (xdrs, (char **)&objp->a, sizeof (app_data), (xdrproc_t) xdr_app_data_1_9))
 		 return FALSE;
-	 if (!xdr_pointer (xdrs, (char **)&objp->snap, sizeof (snapshot), (xdrproc_t) xdr_snapshot_1_8))
+	 if (!xdr_pointer (xdrs, (char **)&objp->snap, sizeof (snapshot), (xdrproc_t) xdr_snapshot_1_9))
 		 return FALSE;
-	 if (!xdr_pointer (xdrs, (char **)&objp->gcs_snap, sizeof (gcs_snapshot), (xdrproc_t) xdr_gcs_snapshot_1_8))
+	 if (!xdr_pointer (xdrs, (char **)&objp->gcs_snap, sizeof (gcs_snapshot), (xdrproc_t) xdr_gcs_snapshot_1_9))
 		 return FALSE;
-	 if (!xdr_client_reply_code_1_8 (xdrs, &objp->cli_err))
+	 if (!xdr_client_reply_code_1_9 (xdrs, &objp->cli_err))
 		 return FALSE;
 	 if (!xdr_bool (xdrs, &objp->force_delivery))
 		 return FALSE;
 	 if (!xdr_int32_t (xdrs, &objp->refcnt))
 		 return FALSE;
-	 if (!xdr_synode_no_1_8 (xdrs, &objp->delivered_msg))
+	 if (!xdr_synode_no_1_9 (xdrs, &objp->delivered_msg))
 		 return FALSE;
-	 if (!xdr_xcom_event_horizon_1_8 (xdrs, &objp->event_horizon))
+	 if (!xdr_xcom_event_horizon_1_9 (xdrs, &objp->event_horizon))
 		 return FALSE;
-	 if (!xdr_synode_app_data_array_1_8 (xdrs, &objp->requested_synode_app_data))
+	 if (!xdr_synode_app_data_array_1_9 (xdrs, &objp->requested_synode_app_data))
+		 return FALSE;
+	 if (!xdr_pointer (xdrs, (char **)&objp->rd, sizeof (reply_data), (xdrproc_t) xdr_reply_data_1_9))
 		 return FALSE;
 	return TRUE;
 }
@@ -5606,6 +6908,9 @@
 #include "xcom/xcom_profile.h"
 extern synode_no const null_synode;
 extern synode_no get_delivered_msg();
+#ifndef _WIN32
+#include <strings.h> /* For bzero */
+#endif
 bool_t
 xdr_xcom_proto (XDR *xdrs, xcom_proto *objp)
 {
@@ -5720,26 +7025,6 @@
 		 return FALSE;
 	return TRUE;
 }
-#define BITS_PER_BYTE 8
-#define MASK_BITS ((bit_mask)(sizeof (bit_mask) * BITS_PER_BYTE)) /* bits per mask */
-#define howmany_words(x, y) (((x)+((y)-1))/(y))
-#define BIT_OP(__n, __p, __op, __inv) ((__p)->bits.bits_val[(__n)/MASK_BITS] __op __inv (1u << ((__n) % MASK_BITS)))
-#define BIT_XOR(__n, __p) BIT_OP(__n, __p, ^=,(bit_mask))
-#define BIT_SET(__n, __p) BIT_OP(__n, __p, |=,(bit_mask))
-#define BIT_CLR(__n, __p) BIT_OP(__n, __p, &=,(bit_mask) ~)
-#define BIT_ISSET(__n, __p) (BIT_OP(__n, __p, &,(bit_mask)) != 0ul)
-#define BIT_ZERO(__p) memset((__p)->bits.bits_val, 0, (__p)->bits.bits_len * sizeof(*(__p)->bits.bits_val))
-extern bit_set *new_bit_set(uint32_t bits);
-extern bit_set *clone_bit_set(bit_set *orig);
-extern void free_bit_set(bit_set *bs);
-#ifndef CHECKED_DATA
-#define CHECKED_DATA
-typedef struct {
- u_int data_len;
- char *data_val;
-} checked_data;
-extern bool_t xdr_checked_data (XDR *, checked_data*);
-#endif
 bool_t
 xdr_blob (XDR *xdrs, blob *objp)
 {
@@ -5781,6 +7066,14 @@
 	return TRUE;
 }
 bool_t
+xdr_paxos_role (XDR *xdrs, paxos_role *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_enum (xdrs, (enum_t *) objp))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
 xdr_node_address (XDR *xdrs, node_address *objp)
 {
 	register int32_t *buf;
@@ -5790,6 +7083,8 @@
 		 return FALSE;
 	 if (!xdr_x_proto_range (xdrs, &objp->proto))
 		 return FALSE;
+	 if (!xdr_uint32_t (xdrs, &objp->services))
+		 return FALSE;
 	return TRUE;
 }
 bool_t
@@ -5868,6 +7163,23 @@
 	return TRUE;
 }
 bool_t
+xdr_leader (XDR *xdrs, leader *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_string (xdrs, &objp->address, MAXNAME))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_leader_array (XDR *xdrs, leader_array *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_array (xdrs, (char **)&objp->leader_array_val, (u_int *) &objp->leader_array_len, NSERVERS,
+		sizeof (leader), (xdrproc_t) xdr_leader))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
 xdr_app_u (XDR *xdrs, app_u *objp)
 {
 	register int32_t *buf;
@@ -5919,6 +7231,14 @@
 		break;
 	case convert_into_local_server_type:
 		break;
+	case set_max_leaders:
+		 if (!xdr_node_no (xdrs, &objp->app_u_u.max_leaders))
+			 return FALSE;
+		break;
+	case set_leaders_type:
+		 if (!xdr_leader_array (xdrs, &objp->app_u_u.leaders))
+			 return FALSE;
+		break;
 	default:
 		break;
 	}
@@ -6092,6 +7412,10 @@
 		 return FALSE;
 	 if (!xdr_xcom_event_horizon (xdrs, &objp->event_horizon))
 		 return FALSE;
+	 if (!xdr_node_no (xdrs, &objp->max_active_leaders))
+		 return FALSE;
+	 if (!xdr_leader_array (xdrs, &objp->leaders))
+		 return FALSE;
 	return TRUE;
 }
 bool_t
@@ -6133,6 +7457,8 @@
 		 return FALSE;
 	 if (!xdr_checked_data (xdrs, &objp->data))
 		 return FALSE;
+	 if (!xdr_synode_no (xdrs, &objp->origin))
+		 return FALSE;
 	return TRUE;
 }
 bool_t
@@ -6145,6 +7471,42 @@
 	return TRUE;
 }
 bool_t
+xdr_reply_type (XDR *xdrs, reply_type *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_enum (xdrs, (enum_t *) objp))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_leader_info_data (XDR *xdrs, leader_info_data *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_node_no (xdrs, &objp->max_nr_leaders))
+		 return FALSE;
+	 if (!xdr_leader_array (xdrs, &objp->preferred_leaders))
+		 return FALSE;
+	 if (!xdr_leader_array (xdrs, &objp->actual_leaders))
+		 return FALSE;
+	return TRUE;
+}
+bool_t
+xdr_reply_data (XDR *xdrs, reply_data *objp)
+{
+	register int32_t *buf;
+	 if (!xdr_reply_type (xdrs, &objp->rt))
+		 return FALSE;
+	switch (objp->rt) {
+	case leader_info:
+		 if (!xdr_leader_info_data (xdrs, &objp->reply_data_u.leaders))
+			 return FALSE;
+		break;
+	default:
+		break;
+	}
+	return TRUE;
+}
+bool_t
 xdr_pax_msg (XDR *xdrs, pax_msg *objp)
 {
 	register int32_t *buf;
@@ -6188,5 +7550,7 @@
 		 return FALSE;
 	 if (!xdr_synode_app_data_array (xdrs, &objp->requested_synode_app_data))
 		 return FALSE;
+	 if (!xdr_pointer (xdrs, (char **)&objp->rd, sizeof (reply_data), (xdrproc_t) xdr_reply_data))
+		 return FALSE;
 	return TRUE;
 }
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xdr_utils.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xdr_utils.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xdr_utils.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xdr_utils.h	2021-09-28 11:46:34.000000000 +0000
@@ -23,15 +23,12 @@
 #ifndef XDR_UTILS_H
 #define XDR_UTILS_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <assert.h>
+#include "xcom/xcom_memory.h"
 
 #ifdef __APPLE__
 /* OSX missing xdr_sizeof() */
-extern u_long xdr_sizeof(xdrproc_t, void *);
+extern "C" u_long xdr_sizeof(xdrproc_t, void *);
 #endif
 
 /**
@@ -39,11 +36,11 @@
  */
 #define def_init_xdr_array(name) \
   static inline void init_##name##_array(name##_array *x)
-#define init_xdr_array(name)                                       \
-  def_init_xdr_array(name) {                                       \
-    x->name##_array_len = 2;                                       \
-    x->name##_array_val =                                          \
-        (name *)calloc((size_t)x->name##_array_len, sizeof(name)); \
+#define init_xdr_array(name)                                            \
+  def_init_xdr_array(name) {                                            \
+    x->name##_array_len = 2;                                            \
+    x->name##_array_val =                                               \
+        (name *)xcom_calloc((size_t)x->name##_array_len, sizeof(name)); \
   }
 
 /**
@@ -106,23 +103,23 @@
  */
 #define def_clone_xdr_array(name) \
   static inline name##_array clone_##name##_array(name##_array x)
-#define clone_xdr_array(name)                                       \
-  def_clone_xdr_array(name) {                                       \
-    name##_array retval = x;                                        \
-    u_int i;                                                        \
-    retval.name##_array_len = x.name##_array_len;                   \
-    IFDBG(D_XDR, FN; NDBG(retval.name##_array_len, u));             \
-    if (retval.name##_array_len > 0) {                              \
-      retval.name##_array_val =                                     \
-          (name *)calloc((size_t)x.name##_array_len, sizeof(name)); \
-      for (i = 0; i < retval.name##_array_len; i++) {               \
-        retval.name##_array_val[i] = x.name##_array_val[i];         \
-        IFDBG(D_XDR, FN; STRLIT("clone_xdr_array"); NDBG(i, u));    \
-      }                                                             \
-    } else {                                                        \
-      retval.name##_array_val = 0;                                  \
-    }                                                               \
-    return retval;                                                  \
+#define clone_xdr_array(name)                                            \
+  def_clone_xdr_array(name) {                                            \
+    name##_array retval = x;                                             \
+    u_int i;                                                             \
+    retval.name##_array_len = x.name##_array_len;                        \
+    IFDBG(D_XDR, FN; NDBG(retval.name##_array_len, u));                  \
+    if (retval.name##_array_len > 0) {                                   \
+      retval.name##_array_val =                                          \
+          (name *)xcom_calloc((size_t)x.name##_array_len, sizeof(name)); \
+      for (i = 0; i < retval.name##_array_len; i++) {                    \
+        retval.name##_array_val[i] = x.name##_array_val[i];              \
+        IFDBG(D_XDR, FN; STRLIT("clone_xdr_array"); NDBG(i, u));         \
+      }                                                                  \
+    } else {                                                             \
+      retval.name##_array_val = 0;                                       \
+    }                                                                    \
+    return retval;                                                       \
   }
 
 /**
@@ -303,8 +300,4 @@
     }                                         \
   }
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/x_platform.h mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/x_platform.h
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/x_platform.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/x_platform.h	2021-09-28 11:46:34.000000000 +0000
@@ -300,4 +300,10 @@
 #define NEWLINE "\n"
 #endif
 
+#ifdef _WIN32
+#define xcom_buf char
+#else
+#define xcom_buf void
+#endif
+
 #endif
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/interface/gcs_message.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/interface/gcs_message.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/interface/gcs_message.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/interface/gcs_message.cc	2021-09-28 11:46:34.000000000 +0000
@@ -227,8 +227,7 @@
   assert(static_cast<uint64_t>(slider - buffer) <= *buffer_len);
 
   MYSQL_GCS_DEBUG_EXECUTE(
-      uint64_t MY_ATTRIBUTE((unused)) encoded_header_size =
-          get_encode_header_size();
+      [[maybe_unused]] uint64_t encoded_header_size = get_encode_header_size();
       MYSQL_GCS_LOG_TRACE(
           "Encoded message: (header)= %llu (payload)= %llu",
           static_cast<unsigned long long>(encoded_header_size),
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/interface/gcs_psi.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/interface/gcs_psi.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/interface/gcs_psi.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/interface/gcs_psi.cc	2021-09-28 11:46:34.000000000 +0000
@@ -30,22 +30,25 @@
 PSI_thread_key key_GCS_THD_Gcs_ext_logger_impl_m_consumer,
     key_GCS_THD_Gcs_xcom_engine_m_engine_thread,
     key_GCS_THD_Gcs_xcom_control_m_xcom_thread,
-    key_GCS_THD_Gcs_xcom_control_m_suspicions_processing_thread;
+    key_GCS_THD_Gcs_xcom_control_m_suspicions_processing_thread,
+    key_GCS_THD_Gcs_xcom_network_provider_m_network_provider_tcp_server;
 
 static PSI_thread_info all_gcs_psi_thread_keys_info[] = {
     {&key_GCS_THD_Gcs_ext_logger_impl_m_consumer,
-     "THD_Gcs_ext_logger_impl::m_consumer", PSI_FLAG_SINGLETON, 0,
-     PSI_DOCUMENT_ME},
+     "THD_Gcs_ext_logger_impl::m_consumer", "gcs_ext_log", PSI_FLAG_SINGLETON,
+     0, PSI_DOCUMENT_ME},
     {&key_GCS_THD_Gcs_xcom_engine_m_engine_thread,
-     "THD_Gcs_xcom_engine::m_engine_thread", PSI_FLAG_SINGLETON, 0,
-     PSI_DOCUMENT_ME},
+     "THD_Gcs_xcom_engine::m_engine_thread", "gcs_engine", PSI_FLAG_SINGLETON,
+     0, PSI_DOCUMENT_ME},
     {&key_GCS_THD_Gcs_xcom_control_m_xcom_thread,
-     "THD_Gcs_xcom_control::m_xcom_thread", PSI_FLAG_SINGLETON, 0,
+     "THD_Gcs_xcom_control::m_xcom_thread", "gcs_xcom", PSI_FLAG_SINGLETON, 0,
      PSI_DOCUMENT_ME},
     {&key_GCS_THD_Gcs_xcom_control_m_suspicions_processing_thread,
-     "THD_Gcs_xcom_control::m_suspicions_processing_thread", PSI_FLAG_SINGLETON,
-     0, PSI_DOCUMENT_ME},
-};
+     "THD_Gcs_xcom_control::m_suspicions_processing_thread", "gcs_suspect",
+     PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME},
+    {&key_GCS_THD_Gcs_xcom_network_provider_m_network_provider_tcp_server,
+     "THD_Gcs_xcom_network_provider::m_network_provider_tcp_server",
+     "gcs_xcom_comm", PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME}};
 
 PSI_mutex_key key_GCS_MUTEX_Gcs_async_buffer_m_free_buffer_mutex,
     key_GCS_MUTEX_Gcs_suspicions_manager_m_suspicions_mutex,
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/interface/xplatform/my_xp_thread.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/interface/xplatform/my_xp_thread.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/interface/xplatform/my_xp_thread.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/interface/xplatform/my_xp_thread.cc	2021-09-28 11:46:34.000000000 +0000
@@ -38,15 +38,15 @@
   return &m_thread_handle->thread;
 }
 
-int My_xp_thread_server::create(PSI_thread_key key MY_ATTRIBUTE((unused)),
+int My_xp_thread_server::create(PSI_thread_key key [[maybe_unused]],
                                 const native_thread_attr_t *attr,
                                 native_start_routine func, void *arg) {
   return mysql_thread_create(key, m_thread_handle, attr, func, arg);
 }
 
-int My_xp_thread_server::create_detached(
-    PSI_thread_key key MY_ATTRIBUTE((unused)), native_thread_attr_t *attr,
-    native_start_routine func, void *arg) {
+int My_xp_thread_server::create_detached(PSI_thread_key key [[maybe_unused]],
+                                         native_thread_attr_t *attr,
+                                         native_start_routine func, void *arg) {
   native_thread_attr_t my_attr;
   bool using_my_attr = false;
 
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/interface/xplatform/my_xp_util.cc mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/interface/xplatform/my_xp_util.cc
--- mysql-8.0-8.0.26/plugin/group_replication/libmysqlgcs/src/interface/xplatform/my_xp_util.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/libmysqlgcs/src/interface/xplatform/my_xp_util.cc	2021-09-28 11:46:34.000000000 +0000
@@ -40,13 +40,28 @@
 int My_xp_socket_util_impl::disable_nagle_in_socket(int fd) {
   int ret = -1;
   if (fd != -1) {
-    int optval = 1;
-    /* Casting optval to char * so Windows does not complain. */
-    ret = setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (char *)&optval,
-                     static_cast<socklen_t>(sizeof(int)));
+    int optval;
+    socklen_t optval_size = static_cast<socklen_t>(sizeof(int));
+    ret =
+        getsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (char *)&optval, &optval_size);
+
+    if (ret < 0) goto err;
+
+    if (optval == 0) {
+      optval = 1;
+      ret = setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (char *)&optval,
+                       static_cast<socklen_t>(sizeof(int)));
+    } else {
+      MYSQL_GCS_LOG_INFO("TCP_NODELAY already set");
+      ret = 0;
+    }
+  }
+
+err:
+  if (ret < 0) {
+    MYSQL_GCS_LOG_ERROR("Error manipulating a connection's socket. FD= "
+                        << fd << " Ret = " << ret << " Error: " << errno)
+    assert(0);
   }
-  if (ret < 0)
-    MYSQL_GCS_LOG_ERROR(
-        "Error manipulating a connection's socket. Error: " << errno)
   return ret;
 }
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/applier.cc mysql-8.0-8.0.27/plugin/group_replication/src/applier.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/applier.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/applier.cc	2021-09-28 11:46:34.000000000 +0000
@@ -56,7 +56,6 @@
       applier_aborted(false),
       applier_error(0),
       suspended(false),
-      waiting_for_applier_suspension(false),
       incoming(nullptr),
       pipeline(nullptr),
       stop_wait_timeout(LONG_TIMEOUT),
@@ -514,6 +513,23 @@
         packet_application_error = apply_leaving_members_action_packet(
             static_cast<Leaving_members_action_packet *>(packet));
         this->incoming->pop();
+        /**
+         @ref group_replication_wait_for_current_events_execution_fail
+         Member leave has been received. Primary change has started in
+         separate thread. Primary change will go to error and try to suspend
+         the applier by adding suspension packet. But we want to kill the
+         applier via shutdown before suspension packet is processed. So block
+         here till SHUTDOWN forwards the KILL signal.
+
+         @note If we do not block here, even if KILL is forwarded suspension
+         packet is processed and kill is seen post processing of suspend
+         packet, hence the DEBUG here
+        */
+        DBUG_EXECUTE_IF(
+            "group_replication_wait_for_current_events_execution_fail", {
+              while (!is_applier_thread_aborted()) my_sleep(1 * 1000 * 1000);
+            };);
+
         break;
       default:
         assert(0); /* purecov: inspected */
@@ -521,6 +537,7 @@
 
     delete packet;
   }
+
   if (packet_application_error) applier_error = packet_application_error;
   delete fde_evt;
   delete cont;
@@ -533,7 +550,9 @@
       ->unregister_channel_observer(applier_channel_observer);
 
   // only try to leave if the applier managed to start
-  if (applier_error && applier_thd_state.is_running()) {
+  // or if the applier_thd was killed by the DBA.
+  if ((applier_error && applier_thd_state.is_running()) ||
+      applier_thd->killed) {
     const char *exit_state_action_abort_log_message =
         "Fatal error during execution on the Applier module of Group "
         "Replication.";
@@ -595,11 +614,15 @@
 #endif
 
   delete applier_thd;
+  applier_thd = nullptr;
+  my_thread_end();
   applier_thd_state.set_terminated();
   mysql_cond_broadcast(&run_cond);
+  mysql_mutex_lock(&suspend_lock);
+  mysql_cond_broadcast(&suspension_waiting_condition);
+  mysql_mutex_unlock(&suspend_lock);
   mysql_mutex_unlock(&run_lock);
 
-  my_thread_end();
   applier_thread_is_exiting = true;
   my_thread_exit(nullptr);
 
@@ -776,13 +799,14 @@
       we_are_waiting = true;
       wait();
   */
-  while (!suspended && !(*abort_flag) && !applier_aborted && !applier_error) {
+  while (!suspended && !(*abort_flag) && !is_applier_thread_aborted() &&
+         !applier_error) {
     mysql_cond_wait(&suspension_waiting_condition, &suspend_lock);
   }
 
   mysql_mutex_unlock(&suspend_lock);
 
-  if (applier_aborted || applier_error)
+  if (is_applier_thread_aborted() || applier_error)
     return APPLIER_THREAD_ABORTED; /* purecov: inspected */
 
   /**
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/asynchronous_channels_state_observer.cc mysql-8.0-8.0.27/plugin/group_replication/src/asynchronous_channels_state_observer.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/asynchronous_channels_state_observer.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/asynchronous_channels_state_observer.cc	2021-09-28 11:46:34.000000000 +0000
@@ -38,10 +38,20 @@
   if (is_plugin_auto_starting_on_non_bootstrap_member() &&
       strcmp(param->channel_name, "group_replication_recovery") != 0 &&
       strcmp(param->channel_name, "group_replication_applier") != 0) {
-    if (initiate_wait_on_start_process()) {
-      LogPluginErr(ERROR_LEVEL, ER_GRP_RPL_SLAVE_THREAD_ERROR_ON_CLONE,
-                   "slave IO", param->channel_name);
-      return 1;
+    const enum_wait_on_start_process_result abort =
+        initiate_wait_on_start_process();
+    switch (abort) {
+      case WAIT_ON_START_PROCESS_SUCCESS:
+        break;
+      case WAIT_ON_START_PROCESS_ABORT_ON_CLONE:
+        LogPluginErr(ERROR_LEVEL, ER_GRP_RPL_SLAVE_THREAD_ERROR_ON_CLONE,
+                     "slave IO", param->channel_name);
+        return 1;
+      case WAIT_ON_START_PROCESS_ABORT_SECONDARY_MEMBER:
+        LogPluginErr(ERROR_LEVEL,
+                     ER_GRP_RPL_SLAVE_THREAD_ERROR_ON_SECONDARY_MEMBER,
+                     "slave IO", param->channel_name);
+        return 1;
     }
 
     if (group_member_mgr && local_member_info->get_recovery_status() ==
@@ -81,7 +91,9 @@
   }
 
   if (plugin_is_group_replication_running() &&
-      group_action_coordinator->is_group_action_running()) {
+      group_action_coordinator->is_group_action_running() &&
+      !param->source_connection_auto_failover &&
+      !primary_election_handler->is_an_election_running()) {
     LogPluginErr(ERROR_LEVEL,
                  ER_GRP_RPL_CHANNEL_THREAD_WHEN_GROUP_ACTION_RUNNING,
                  "IO THREAD");
@@ -104,10 +116,20 @@
   if (is_plugin_auto_starting_on_non_bootstrap_member() &&
       strcmp(param->channel_name, "group_replication_recovery") != 0 &&
       strcmp(param->channel_name, "group_replication_applier") != 0) {
-    if (initiate_wait_on_start_process()) {
-      LogPluginErr(ERROR_LEVEL, ER_GRP_RPL_SLAVE_THREAD_ERROR_ON_CLONE,
-                   "slave applier", param->channel_name);
-      return 1;
+    const enum_wait_on_start_process_result abort =
+        initiate_wait_on_start_process();
+    switch (abort) {
+      case WAIT_ON_START_PROCESS_SUCCESS:
+        break;
+      case WAIT_ON_START_PROCESS_ABORT_ON_CLONE:
+        LogPluginErr(ERROR_LEVEL, ER_GRP_RPL_SLAVE_THREAD_ERROR_ON_CLONE,
+                     "slave applier", param->channel_name);
+        return 1;
+      case WAIT_ON_START_PROCESS_ABORT_SECONDARY_MEMBER:
+        LogPluginErr(ERROR_LEVEL,
+                     ER_GRP_RPL_SLAVE_THREAD_ERROR_ON_SECONDARY_MEMBER,
+                     "slave applier", param->channel_name);
+        return 1;
     }
 
     if (group_member_mgr && local_member_info->get_recovery_status() ==
@@ -147,7 +169,9 @@
   }
 
   if (plugin_is_group_replication_running() &&
-      group_action_coordinator->is_group_action_running()) {
+      group_action_coordinator->is_group_action_running() &&
+      !param->source_connection_auto_failover &&
+      !primary_election_handler->is_an_election_running()) {
     LogPluginErr(ERROR_LEVEL,
                  ER_GRP_RPL_CHANNEL_THREAD_WHEN_GROUP_ACTION_RUNNING,
                  "SQL THREAD");
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/autorejoin.cc mysql-8.0-8.0.27/plugin/group_replication/src/autorejoin.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/autorejoin.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/autorejoin.cc	2021-09-28 11:46:34.000000000 +0000
@@ -273,11 +273,10 @@
   global_thd_manager_remove_thd(m_thd);
   delete m_thd;
   m_thd = nullptr;
+  my_thread_end();
   m_autorejoin_thd_state.set_terminated();
   mysql_cond_broadcast(&m_run_cond);
   mysql_mutex_unlock(&m_run_lock);
 
-  // And finally, terminate the thread.
-  my_thread_end();
   my_thread_exit(nullptr);
 }
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/certifier.cc mysql-8.0-8.0.27/plugin/group_replication/src/certifier.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/certifier.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/certifier.cc	2021-09-28 11:46:34.000000000 +0000
@@ -31,7 +31,7 @@
 #include "plugin/group_replication/include/certifier.h"
 #include "plugin/group_replication/include/observer_trans.h"
 #include "plugin/group_replication/include/plugin.h"
-#include "plugin/group_replication/include/sql_service/sql_service_command.h"
+#include "plugin/group_replication/include/services/get_system_variable/get_system_variable.h"
 
 const std::string Certifier::GTID_EXTRACTED_NAME = "gtid_extracted";
 const std::string Certifier::CERTIFICATION_INFO_ERROR_NAME =
@@ -149,8 +149,18 @@
 
     applier_module->run_flow_control_step();
 
-    if (broadcast_counter % broadcast_gtid_executed_period == 0)
+    if (broadcast_counter % broadcast_gtid_executed_period == 0) {
       broadcast_gtid_executed();
+    }
+
+    Certification_handler *cert = applier_module->get_certification_handler();
+    Certifier_interface *cert_module = (cert ? cert->get_certifier() : nullptr);
+
+    // stable_set_handle() is capable to identify if all information required
+    // for it to run is already delivered to this member.
+    if (cert_module) {
+      cert_module->stable_set_handle();
+    }
 
     mysql_mutex_lock(&broadcast_dispatcher_lock);
     if (aborted) {
@@ -172,13 +182,13 @@
   thd->release_resources();
   global_thd_manager_remove_thd(thd);
   delete thd;
+  my_thread_end();
 
   mysql_mutex_lock(&broadcast_run_lock);
   broadcast_thd_state.set_terminated();
   mysql_cond_broadcast(&broadcast_run_cond);
   mysql_mutex_unlock(&broadcast_run_lock);
 
-  my_thread_end();
   my_thread_exit(nullptr);
 }
 
@@ -296,10 +306,12 @@
   delete group_gtid_extracted;
   delete group_gtid_sid_map;
 
+  mysql_mutex_lock(&LOCK_members);
+  clear_members();
   clear_incoming();
+  mysql_mutex_unlock(&LOCK_members);
   delete incoming;
 
-  clear_members();
   mysql_mutex_destroy(&LOCK_certification_info);
   mysql_mutex_destroy(&LOCK_members);
 }
@@ -308,7 +320,7 @@
   DBUG_TRACE;
   mysql_mutex_assert_owner(&LOCK_certification_info);
   int error = 0;
-  Sql_service_command_interface *sql_command_interface = nullptr;
+  Get_system_variable *get_system_variable = nullptr;
   std::string gtid_executed;
   std::string applier_retrieved_gtids;
 
@@ -393,16 +405,9 @@
     }
   }
 
-  sql_command_interface = new Sql_service_command_interface();
-  if (sql_command_interface->establish_session_connection(PSESSION_USE_THREAD,
-                                                          GROUPREPL_USER)) {
-    LogPluginErr(ERROR_LEVEL,
-                 ER_GRP_RPL_SERVER_CONN_ERROR); /* purecov: inspected */
-    error = 1;                                  /* purecov: inspected */
-    goto end;                                   /* purecov: inspected */
-  }
+  get_system_variable = new Get_system_variable();
 
-  error = sql_command_interface->get_server_gtid_executed(gtid_executed);
+  error = get_system_variable->get_server_gtid_executed(gtid_executed);
   DBUG_EXECUTE_IF("gr_server_gtid_executed_extraction_error", error = 1;);
   if (error) {
     LogPluginErr(WARNING_LEVEL, ER_GRP_RPL_ERROR_FETCHING_GTID_EXECUTED_SET);
@@ -442,7 +447,7 @@
   compute_group_available_gtid_intervals();
 
 end:
-  delete sql_command_interface;
+  delete get_system_variable;
 
   return error;
 }
@@ -571,6 +576,7 @@
 
 void Certifier::clear_incoming() {
   DBUG_TRACE;
+  mysql_mutex_assert_owner(&LOCK_members);
   while (!this->incoming->empty()) {
     Data_packet *packet = nullptr;
     this->incoming->pop(&packet);
@@ -580,9 +586,8 @@
 
 void Certifier::clear_members() {
   DBUG_TRACE;
-  mysql_mutex_lock(&LOCK_members);
+  mysql_mutex_assert_owner(&LOCK_members);
   members.clear();
-  mysql_mutex_unlock(&LOCK_members);
 }
 
 int Certifier::initialize(ulonglong gtid_assignment_block_size) {
@@ -1296,28 +1301,6 @@
       this->incoming->push(new Data_packet(data, len));
     }
     // else: ignore the message, no point in alerting the user about this.
-
-    mysql_mutex_unlock(&LOCK_members);
-
-    /*
-      If the incoming message queue size is equal to the number of the ONLINE
-      members in the group, we are sure that each ONLINE member has sent
-      their gtid_executed. So we can go ahead with the stable set handling.
-    */
-    if (this->incoming->size() == number_of_members_online) {
-      int error = stable_set_handle();
-      /*
-        Clearing the members to proceed with the next round of garbage
-        collection.
-      */
-      clear_members();
-      return error;
-    }
-  } else {
-    LogPluginErr(
-        WARNING_LEVEL,
-        ER_GRP_RPL_SKIP_COMPUTATION_TRANS_COMMITTED); /* purecov: inspected */
-    mysql_mutex_unlock(&LOCK_members);                /* purecov: inspected */
   }
 
 #if !defined(NDEBUG)
@@ -1330,12 +1313,32 @@
   }
 #endif
 
+  mysql_mutex_unlock(&LOCK_members);
   return 0;
 }
 
 int Certifier::stable_set_handle() {
   DBUG_TRACE;
 
+  if (!is_initialized() || nullptr == group_member_mgr) {
+    return 0;
+  }
+
+  /*
+    If the incoming message queue size is equal to the number of the ONLINE
+    members in the group, we are sure that each ONLINE member has sent
+    their gtid_executed. So we can go ahead with the stable set handling.
+  */
+  mysql_mutex_lock(&LOCK_members);
+  const size_t incoming_size = this->incoming->size();
+  const size_t number_of_members_online =
+      group_member_mgr->get_number_of_members_online();
+  if (incoming_size < 1 || number_of_members_online < 1 ||
+      incoming_size != number_of_members_online) {
+    mysql_mutex_unlock(&LOCK_members);
+    return 0;
+  }
+
   Data_packet *packet = nullptr;
   int error = 0;
 
@@ -1409,10 +1412,14 @@
     delete packet;
   }
 
-  if (!error && set_group_stable_transactions_set(&executed_set)) {
-    LogPluginErr(ERROR_LEVEL,
-                 ER_GRP_RPL_SET_STABLE_TRANS_ERROR); /* purecov: inspected */
-    error = 1;                                       /* purecov: inspected */
+  if (!error) {
+    stable_gtid_set_lock->wrlock();
+    if (stable_gtid_set->add_gtid_set(&executed_set) != RETURN_STATUS_OK) {
+      LogPluginErr(ERROR_LEVEL,
+                   ER_GRP_RPL_SET_STABLE_TRANS_ERROR); /* purecov: inspected */
+      error = 1;                                       /* purecov: inspected */
+    }
+    stable_gtid_set_lock->unlock();
   }
 
 #if !defined(NDEBUG)
@@ -1423,13 +1430,26 @@
   my_free(executed_set_string);
 #endif
 
+  /*
+    Clearing the members to proceed with the next round of garbage
+    collection.
+  */
+  clear_members();
+  mysql_mutex_unlock(&LOCK_members);
+
+  if (!error) {
+    garbage_collect();
+  }
+
   return error;
 }
 
 void Certifier::handle_view_change() {
   DBUG_TRACE;
+  mysql_mutex_lock(&LOCK_members);
   clear_incoming();
   clear_members();
+  mysql_mutex_unlock(&LOCK_members);
 }
 
 void Certifier::get_certification_info(
@@ -1569,6 +1589,8 @@
 
 void Certifier::update_certified_transaction_count(bool result,
                                                    bool local_transaction) {
+  mysql_mutex_assert_owner(&LOCK_certification_info);
+
   if (result)
     positive_cert++;
   else
@@ -1576,19 +1598,22 @@
 
   const Group_member_info::Group_member_status member_status =
       local_member_info->get_recovery_status();
-  if (member_status == Group_member_info::MEMBER_ONLINE) {
+  assert(member_status == Group_member_info::MEMBER_ONLINE ||
+         member_status == Group_member_info::MEMBER_IN_RECOVERY);
+
+  applier_module->get_pipeline_stats_member_collector()
+      ->increment_transactions_certified();
+
+  /*
+    If transaction is local and rolledback
+    increment local negative certifier count
+  */
+  if (local_transaction && !result) {
     applier_module->get_pipeline_stats_member_collector()
-        ->increment_transactions_certified();
+        ->increment_transactions_local_rollback();
+  }
 
-    /*
-      If transaction is local and rolledback
-      increment local negative certifier count
-    */
-    if (local_transaction && !result) {
-      applier_module->get_pipeline_stats_member_collector()
-          ->increment_transactions_local_rollback();
-    }
-  } else if (member_status == Group_member_info::MEMBER_IN_RECOVERY) {
+  if (member_status == Group_member_info::MEMBER_IN_RECOVERY) {
     applier_module->get_pipeline_stats_member_collector()
         ->increment_transactions_certified_during_recovery();
 
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/consistency_manager.cc mysql-8.0-8.0.27/plugin/group_replication/src/consistency_manager.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/consistency_manager.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/consistency_manager.cc	2021-09-28 11:46:34.000000000 +0000
@@ -623,8 +623,7 @@
 
 int Transaction_consistency_manager::transaction_begin_sync_before_execution(
     my_thread_id thread_id,
-    enum_group_replication_consistency_level consistency_level
-        MY_ATTRIBUTE((unused)),
+    enum_group_replication_consistency_level consistency_level [[maybe_unused]],
     ulong timeout) const {
   DBUG_TRACE;
   assert(GROUP_REPLICATION_CONSISTENCY_BEFORE == consistency_level ||
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/delayed_plugin_initialization.cc mysql-8.0-8.0.27/plugin/group_replication/src/delayed_plugin_initialization.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/delayed_plugin_initialization.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/delayed_plugin_initialization.cc	2021-09-28 11:46:34.000000000 +0000
@@ -163,11 +163,10 @@
   thd->release_resources();
   global_thd_manager_remove_thd(thd);
   delete thd;
+  my_thread_end();
   delayed_thd_state.set_terminated();
   mysql_cond_broadcast(&run_cond);
   mysql_mutex_unlock(&run_lock);
 
-  my_thread_end();
-
   return error;
 }
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/gcs_event_handlers.cc mysql-8.0-8.0.27/plugin/group_replication/src/gcs_event_handlers.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/gcs_event_handlers.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/gcs_event_handlers.cc	2021-09-28 11:46:34.000000000 +0000
@@ -46,6 +46,7 @@
 #include "plugin/group_replication/include/plugin_messages/sync_before_execution_message.h"
 #include "plugin/group_replication/include/plugin_messages/transaction_prepared_message.h"
 #include "plugin/group_replication/include/plugin_messages/transaction_with_guarantee_message.h"
+#include "plugin/group_replication/include/services/get_system_variable/get_system_variable.h"
 
 using std::vector;
 
@@ -1113,6 +1114,8 @@
   int error = 0;
   uint local_uuid_found = 0;
   std::vector<std::string> exchanged_members_actions_serialized_configuration;
+  std::vector<std::string>
+      exchanged_replication_failover_channels_serialized_configuration;
 
   /*
   For now, we are only carrying Group Member Info on Exchangeable data
@@ -1193,13 +1196,15 @@
       Group wide configuration.
     */
     if (is_joining && local_member_info->in_primary_mode()) {
+      Group_member_info_manager_message message;
+
+      /* member actions */
       const unsigned char *member_actions_serialized_configuration = nullptr;
       size_t member_actions_serialized_configuration_length = 0;
-      Group_member_info_manager_message message;
-      bool error_get_member_actions =
-          message.get_member_actions_serialized_configuration(
-              data, length, &member_actions_serialized_configuration,
-              &member_actions_serialized_configuration_length);
+      bool error_get_member_actions = message.get_pit_data(
+          Group_member_info_manager_message::PIT_MEMBER_ACTIONS, data, length,
+          &member_actions_serialized_configuration,
+          &member_actions_serialized_configuration_length);
 
       /*
         Members from versions lower than 8.0.25 do not support member
@@ -1212,6 +1217,23 @@
                             member_actions_serialized_configuration),
                         member_actions_serialized_configuration_length));
       }
+
+      /* replication failover configuration */
+      const unsigned char
+          *replication_failover_channels_serialized_configuration = nullptr;
+      size_t replication_failover_channels_serialized_configuration_length = 0;
+      bool error_get_replication_failover_channels = message.get_pit_data(
+          Group_member_info_manager_message::PIT_RPL_FAILOVER_CONFIGURATION,
+          data, length, &replication_failover_channels_serialized_configuration,
+          &replication_failover_channels_serialized_configuration_length);
+
+      if (!error_get_replication_failover_channels) {
+        exchanged_replication_failover_channels_serialized_configuration
+            .push_back(std::string(
+                pointer_cast<const char *>(
+                    replication_failover_channels_serialized_configuration),
+                replication_failover_channels_serialized_configuration_length));
+      }
     }
   }
 
@@ -1225,9 +1247,18 @@
       members will add their configuration on the state exchange.
     */
     if (exchanged_data.size() > 1) {
+      /*
+         We already know that this member will be a SECONDARY,
+         thence we can stop existing channels trying to start.
+      */
+      terminate_wait_on_start_process(
+          WAIT_ON_START_PROCESS_ABORT_SECONDARY_MEMBER);
+
       my_thread_init();
       error = member_actions_handler->replace_all_actions(
           exchanged_members_actions_serialized_configuration);
+      error |= set_replication_failover_channels_configuration(
+          exchanged_replication_failover_channels_serialized_configuration);
       my_thread_end();
     }
   }
@@ -1241,24 +1272,15 @@
   std::string applier_retrieved_gtids;
   Replication_thread_api applier_channel("group_replication_applier");
 
-  Sql_service_command_interface *sql_command_interface =
-      new Sql_service_command_interface();
-
-  if (sql_command_interface->establish_session_connection(
-          PSESSION_DEDICATED_THREAD, GROUPREPL_USER, get_plugin_pointer())) {
-    /* purecov: begin inspected */
-    LogPluginErr(WARNING_LEVEL, ER_GRP_RPL_GRP_CHANGE_INFO_EXTRACT_ERROR);
-    goto sending;
-    /* purecov: end */
-  }
+  Get_system_variable *get_system_variable = new Get_system_variable();
 
-  if (sql_command_interface->get_server_gtid_executed(server_executed_gtids)) {
+  if (get_system_variable->get_server_gtid_executed(server_executed_gtids)) {
     /* purecov: begin inspected */
     LogPluginErr(WARNING_LEVEL, ER_GRP_RPL_GTID_EXECUTED_EXTRACT_ERROR);
     goto sending;
     /* purecov: inspected */
   }
-  if (sql_command_interface->get_server_gtid_purged(server_purged_gtids)) {
+  if (get_system_variable->get_server_gtid_purged(server_purged_gtids)) {
     /* purecov: begin inspected */
     LogPluginErr(WARNING_LEVEL, ER_GRP_RPL_GTID_PURGED_EXTRACT_ERROR);
     goto sending;
@@ -1274,7 +1296,7 @@
                                      applier_retrieved_gtids);
 sending:
 
-  delete sql_command_interface;
+  delete get_system_variable;
 
   std::vector<uchar> data;
 
@@ -1332,15 +1354,22 @@
 
   if (!joining && local_member_info->in_primary_mode()) {
     std::string member_actions_serialized_configuration;
+    std::string replication_failover_channels_serialized_configuration;
 
     my_thread_init();
     bool error_reading_member_actions = member_actions_handler->get_all_actions(
         member_actions_serialized_configuration);
+    bool error_reading_failover_channels_configuration =
+        get_replication_failover_channels_configuration(
+            replication_failover_channels_serialized_configuration);
     my_thread_end();
 
     if (error_reading_member_actions) {
       LogPluginErr(ERROR_LEVEL, ER_GRP_RPL_MEMBER_ACTION_GET_EXCHANGEABLE_DATA);
     }
+    if (error_reading_failover_channels_configuration) {
+      LogPluginErr(ERROR_LEVEL, ER_GRP_RPL_FAILOVER_CONF_GET_EXCHANGEABLE_DATA);
+    }
 
     /*
       Even if there was a error reading the member actions, we send
@@ -1350,6 +1379,9 @@
     */
     group_info_message->add_member_actions_serialized_configuration(
         &data, member_actions_serialized_configuration);
+    group_info_message
+        ->add_replication_failover_channels_serialized_configuration(
+            &data, replication_failover_channels_serialized_configuration);
   }
 
   delete group_info_message;
@@ -1719,6 +1751,15 @@
                    (*all_members_it)->get_view_change_uuid().c_str());
       goto cleaning;
     }
+
+    if (local_member_info->get_allow_single_leader() !=
+        (*all_members_it)->get_allow_single_leader()) {
+      result = 1;
+      LogPluginErr(ERROR_LEVEL, ER_GRP_RPL_PAXOS_SINGLE_LEADER_DIFF_FROM_GRP,
+                   local_member_info->get_allow_single_leader(),
+                   (*all_members_it)->get_allow_single_leader());
+      goto cleaning;
+    }
   }
 
 cleaning:
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/gcs_mysql_network_provider.cc mysql-8.0-8.0.27/plugin/group_replication/src/gcs_mysql_network_provider.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/gcs_mysql_network_provider.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/gcs_mysql_network_provider.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,368 @@
+/* Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+
+   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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include "plugin/group_replication/include/gcs_mysql_network_provider.h"
+
+#include "include/sql_common.h"
+
+#include <mysql.h>
+#include <mysql/components/services/log_builtins.h>
+#include <mysqld_error.h>
+#include <sql-common/net_ns.h>
+#include <sql/sql_class.h>
+#include "my_dbug.h"
+#include "plugin/group_replication/include/plugin.h"
+#include "sql/rpl_group_replication.h"
+
+// Forward declaration of Group Replication callback...
+void handle_group_replication_incoming_connection(THD *thd, int fd,
+                                                  SSL *ssl_ctx);
+
+bool Gcs_mysql_network_provider_auth_interface_impl::get_credentials(
+    std::string &username, std::string &password) {
+  return m_recovery_channel.get_channel_credentials(username, password);
+}
+
+MYSQL *Gcs_mysql_network_provider_native_interface_impl::mysql_real_connect(
+    MYSQL *mysql, const char *host, const char *user, const char *passwd,
+    const char *db, unsigned int port, const char *unix_socket,
+    unsigned long clientflag) {
+  return ::mysql_real_connect(mysql, host, user, passwd, db, port, unix_socket,
+                              clientflag);
+}
+
+bool Gcs_mysql_network_provider_native_interface_impl::send_command(
+    MYSQL *mysql, enum enum_server_command command, const unsigned char *arg,
+    size_t length, bool skip_check) {
+  return simple_command(mysql, command, arg, length, skip_check);
+}
+
+MYSQL *Gcs_mysql_network_provider_native_interface_impl::mysql_init(
+    MYSQL *sock) {
+  return ::mysql_init(sock);
+}
+
+void Gcs_mysql_network_provider_native_interface_impl::mysql_close(
+    MYSQL *sock) {
+  if (sock && sock->net.vio) {
+    vio_set_blocking_flag(sock->net.vio, false);
+  }
+
+  return ::mysql_close(sock);
+}
+
+void Gcs_mysql_network_provider_native_interface_impl::mysql_free(void *ptr) {
+  ::my_free(ptr);
+}
+
+int Gcs_mysql_network_provider_native_interface_impl::mysql_options(
+    MYSQL *mysql, enum mysql_option option, const void *arg) {
+  return ::mysql_options(mysql, option, arg);
+}
+
+bool Gcs_mysql_network_provider_native_interface_impl::mysql_ssl_set(
+    MYSQL *mysql, const char *key, const char *cert, const char *ca,
+    const char *capath, const char *cipher) {
+  return ::mysql_ssl_set(mysql, key, cert, ca, capath, cipher);
+}
+
+int Gcs_mysql_network_provider_native_interface_impl::
+    channel_get_network_namespace(std::string &net_ns
+#ifndef HAVE_SETNS
+                                  [[maybe_unused]]
+#endif
+    ) {
+#ifdef HAVE_SETNS
+  return m_recovery_channel.get_channel_network_namespace(net_ns);
+#else
+  net_ns.assign("");
+  return 0;
+#endif
+}
+/* purecov: begin deadcode */
+bool Gcs_mysql_network_provider_native_interface_impl::set_network_namespace(
+    const std::string &network_namespace
+#ifndef HAVE_SETNS
+    [[maybe_unused]]
+#endif
+) {
+#ifdef HAVE_SETNS
+  return ::set_network_namespace(network_namespace);
+#else
+  return 0;
+#endif
+}
+/* purecov: end */
+
+bool Gcs_mysql_network_provider_native_interface_impl::
+    restore_original_network_namespace() {
+#ifdef HAVE_SETNS
+  return ::restore_original_network_namespace();
+#else
+  return 0;
+#endif
+}
+
+int Gcs_mysql_network_provider::start() {
+  set_gr_incoming_connection(handle_group_replication_incoming_connection);
+
+  return 0;
+}
+
+int Gcs_mysql_network_provider::stop() {
+  set_gr_incoming_connection(nullptr);
+
+  mysql_mutex_lock(&m_GR_LOCK_connection_map_mutex);
+
+  /*Close all server connections*/
+  std::for_each(m_incoming_connection_map.begin(),
+                m_incoming_connection_map.end(),
+                [](const auto &server_connection) {
+                  THD *to_close_thd = server_connection.second;
+                  assert(to_close_thd);
+                  mysql_mutex_lock(&to_close_thd->LOCK_thd_data);
+                  to_close_thd->awake(THD::KILL_CONNECTION);
+                  mysql_mutex_unlock(&to_close_thd->LOCK_thd_data);
+                });
+  m_incoming_connection_map.clear();
+  mysql_mutex_unlock(&m_GR_LOCK_connection_map_mutex);
+
+  this->reset_new_connection();
+
+  return 0;
+}
+
+bool Gcs_mysql_network_provider::configure(
+    const Network_configuration_parameters &params [[maybe_unused]]) {
+  return true;
+}
+
+bool Gcs_mysql_network_provider::configure_secure_connections(
+    const Network_configuration_parameters &params) {
+  m_config_parameters.ssl_params.ssl_mode = params.ssl_params.ssl_mode;
+  m_config_parameters.ssl_params.server_key_file =
+      params.ssl_params.server_key_file;
+  m_config_parameters.ssl_params.server_cert_file =
+      params.ssl_params.server_cert_file;
+  m_config_parameters.ssl_params.client_key_file =
+      params.ssl_params.client_key_file;
+  m_config_parameters.ssl_params.client_cert_file =
+      params.ssl_params.client_cert_file;
+  m_config_parameters.ssl_params.ca_file = params.ssl_params.ca_file;
+  m_config_parameters.ssl_params.ca_path = params.ssl_params.ca_path;
+  m_config_parameters.ssl_params.crl_file = params.ssl_params.crl_file;
+  m_config_parameters.ssl_params.crl_path = params.ssl_params.crl_path;
+  m_config_parameters.ssl_params.cipher = params.ssl_params.cipher;
+  m_config_parameters.tls_params.tls_version = params.tls_params.tls_version;
+  m_config_parameters.tls_params.tls_ciphersuites =
+      params.tls_params.tls_ciphersuites;
+
+  return false;
+}
+
+bool Gcs_mysql_network_provider::cleanup_secure_connections_context() {
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+  ERR_remove_thread_state(0);
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+
+  return false;
+}
+
+bool Gcs_mysql_network_provider::finalize_secure_connections_context() {
+  return false;
+}
+
+std::unique_ptr<Network_connection> Gcs_mysql_network_provider::open_connection(
+    const std::string &address, const unsigned short port,
+    const Network_security_credentials &security_credentials [[maybe_unused]],
+    int connection_timeout) {
+  MYSQL *mysql_connection = nullptr;
+  ulong client_flag = CLIENT_REMEMBER_OPTIONS;
+  auto retval = std::make_unique<Network_connection>(-1, nullptr);
+  retval->has_error = true;
+
+  mysql_connection = m_native_interface->mysql_init(mysql_connection);
+
+  /* Get server public key for RSA key pair-based password exchange.*/
+  bool get_key = true;
+  m_native_interface->mysql_options(mysql_connection,
+                                    MYSQL_OPT_GET_SERVER_PUBLIC_KEY, &get_key);
+
+  auto client_ssl_mode = security_credentials.use_ssl
+                             ? static_cast<enum mysql_ssl_mode>(
+                                   m_config_parameters.ssl_params.ssl_mode)
+                             : SSL_MODE_DISABLED;
+
+  if (client_ssl_mode > SSL_MODE_DISABLED) {
+    m_native_interface->mysql_ssl_set(
+        mysql_connection,
+        m_config_parameters.ssl_params.client_key_file &&
+                m_config_parameters.ssl_params.client_key_file[0]
+            ? m_config_parameters.ssl_params.client_key_file
+            : nullptr,
+        m_config_parameters.ssl_params.client_cert_file &&
+                m_config_parameters.ssl_params.client_cert_file[0]
+            ? m_config_parameters.ssl_params.client_cert_file
+            : nullptr,
+        m_config_parameters.ssl_params.ca_file &&
+                m_config_parameters.ssl_params.ca_file[0]
+            ? m_config_parameters.ssl_params.ca_file
+            : nullptr,
+        m_config_parameters.ssl_params.ca_path &&
+                m_config_parameters.ssl_params.ca_path[0]
+            ? m_config_parameters.ssl_params.ca_path
+            : nullptr,
+        m_config_parameters.ssl_params.cipher &&
+                m_config_parameters.ssl_params.cipher[0]
+            ? m_config_parameters.ssl_params.cipher
+            : nullptr);
+
+    m_native_interface->mysql_options(mysql_connection, MYSQL_OPT_SSL_CRL,
+                                      m_config_parameters.ssl_params.crl_file);
+    m_native_interface->mysql_options(mysql_connection, MYSQL_OPT_SSL_CRLPATH,
+                                      m_config_parameters.ssl_params.crl_path);
+    m_native_interface->mysql_options(
+        mysql_connection, MYSQL_OPT_TLS_VERSION,
+        m_config_parameters.tls_params.tls_version &&
+                m_config_parameters.tls_params.tls_version[0]
+            ? m_config_parameters.tls_params.tls_version
+            : nullptr);
+    if (m_config_parameters.tls_params.tls_ciphersuites) {
+      m_native_interface->mysql_options(
+          mysql_connection, MYSQL_OPT_TLS_CIPHERSUITES,
+          m_config_parameters.tls_params.tls_ciphersuites);
+    }
+  }
+
+  m_native_interface->mysql_options(mysql_connection, MYSQL_OPT_SSL_MODE,
+                                    &client_ssl_mode);
+  m_native_interface->mysql_options(mysql_connection, MYSQL_OPT_LOCAL_INFILE,
+                                    0);
+  m_native_interface->mysql_options(mysql_connection, MYSQL_PLUGIN_DIR, 0);
+
+  m_native_interface->mysql_options(mysql_connection, MYSQL_DEFAULT_AUTH, 0);
+
+  uint connect_timeout = (connection_timeout / 1000)
+                             ? connection_timeout / 1000
+                             : 1;  // connection_timeout is a msec parameter
+
+  m_native_interface->mysql_options(mysql_connection, MYSQL_OPT_CONNECT_TIMEOUT,
+                                    &connect_timeout);
+
+  std::string recovery_username, recovery_password, network_namespace;
+
+  Replication_thread_api recovery_channel("group_replication_recovery");
+
+  /* purecov: begin deadcode */
+  m_native_interface->channel_get_network_namespace(network_namespace);
+
+  if (!network_namespace.empty()) {
+    m_native_interface->set_network_namespace(network_namespace);
+  }
+  /* purecov: end */
+
+  if (m_auth_provider->get_credentials(recovery_username, recovery_password)) {
+    LogPluginErr(
+        ERROR_LEVEL, ER_GRP_RPL_CONFIGURATION_ACTION_ERROR,
+        "Could not extract the access credentials for XCom connections");
+    goto err;
+  }
+
+  if (!m_native_interface->mysql_real_connect(
+          mysql_connection, address.c_str(), recovery_username.c_str(),
+          recovery_password.c_str(), 0, port, 0, client_flag)) {
+    LogPluginErr(ERROR_LEVEL,
+                 ER_GRP_RPL_MYSQL_NETWORK_PROVIDER_CLIENT_ERROR_CONN_ERR);
+    goto err;
+  }
+
+  if (m_native_interface->send_command(
+          mysql_connection, COM_SUBSCRIBE_GROUP_REPLICATION_STREAM, 0, 0, 0)) {
+    LogPluginErr(ERROR_LEVEL,
+                 ER_GRP_RPL_MYSQL_NETWORK_PROVIDER_CLIENT_ERROR_COMMAND_ERR);
+    goto err;
+  }
+
+  mysql_mutex_lock(&m_GR_LOCK_connection_map_mutex);
+  mysql_connection->free_me = false;
+  m_connection_map.emplace(mysql_connection->net.fd, mysql_connection);
+  mysql_mutex_unlock(&m_GR_LOCK_connection_map_mutex);
+
+  retval->fd = mysql_connection->net.fd;
+  if (client_ssl_mode > SSL_MODE_DISABLED) {
+    retval->ssl_fd = static_cast<SSL *>(mysql_connection->net.vio->ssl_arg);
+  }
+  retval->has_error = false;
+err:
+  /* purecov: begin deadcode */
+  if (!network_namespace.empty()) {
+    m_native_interface->restore_original_network_namespace();
+  }
+  /* purecov: end */
+  if (retval->has_error) {
+    m_native_interface->mysql_close(mysql_connection);
+  }
+
+  return retval;
+}
+
+int Gcs_mysql_network_provider::close_connection(
+    const Network_connection &connection) {
+  int retval = 1;
+
+  mysql_mutex_lock(&m_GR_LOCK_connection_map_mutex);
+
+  if (m_connection_map.find(connection.fd) != m_connection_map.end()) {
+    MYSQL *connection_to_close = m_connection_map.at(connection.fd);
+
+    m_native_interface->mysql_close(connection_to_close);
+    m_native_interface->mysql_free(connection_to_close);
+
+    m_connection_map.erase(connection.fd);
+
+    retval = 0;
+
+  } else if (m_incoming_connection_map.find(connection.fd) !=
+             m_incoming_connection_map.end()) {
+    THD *to_close_thd = m_incoming_connection_map.at(connection.fd);
+    assert(to_close_thd);
+    mysql_mutex_lock(&to_close_thd->LOCK_thd_data);
+    to_close_thd->awake(THD::KILL_CONNECTION);
+    mysql_mutex_unlock(&to_close_thd->LOCK_thd_data);
+
+    m_incoming_connection_map.erase(connection.fd);
+
+    retval = 0;
+  }
+  mysql_mutex_unlock(&m_GR_LOCK_connection_map_mutex);
+
+  return retval;
+}
+
+void Gcs_mysql_network_provider::set_new_connection(
+    THD *thd, Network_connection *connection) {
+  mysql_mutex_lock(&m_GR_LOCK_connection_map_mutex);
+  m_incoming_connection_map.emplace(thd->active_vio->mysql_socket.fd, thd);
+  mysql_mutex_unlock(&m_GR_LOCK_connection_map_mutex);
+
+  Network_provider::set_new_connection(connection);
+}
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/gcs_operations.cc mysql-8.0-8.0.27/plugin/group_replication/src/gcs_operations.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/gcs_operations.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/gcs_operations.cc	2021-09-28 11:46:34.000000000 +0000
@@ -33,7 +33,10 @@
 const std::string Gcs_operations::gcs_engine = "xcom";
 
 Gcs_operations::Gcs_operations()
-    : gcs_interface(nullptr),
+    : auth_provider(),
+      native_interface(),
+      gcs_mysql_net_provider(nullptr),
+      gcs_interface(nullptr),
       injected_view_modification(false),
       leave_coordination_leaving(false),
       leave_coordination_left(false) {
@@ -57,6 +60,7 @@
 int Gcs_operations::initialize() {
   DBUG_TRACE;
   int error = 0;
+  Gcs_interface_runtime_requirements reqs;
 
   gcs_operations_lock->wrlock();
 
@@ -83,6 +87,17 @@
     /* purecov: end */
   }
 
+  // Setup resources and pass them to GCS. In the future, refactor to also pass
+  // the logger.
+  if (gcs_mysql_net_provider ==
+      nullptr) {  // finalize might have not been called.
+    gcs_mysql_net_provider = std::make_shared<Gcs_mysql_network_provider>(
+        &auth_provider, &native_interface);
+  }
+
+  reqs.provider = gcs_mysql_net_provider;
+  reqs.namespace_manager = &native_interface;
+  gcs_interface->setup_runtime_resources(reqs);
 end:
   gcs_operations_lock->unlock();
   return error;
@@ -93,9 +108,20 @@
   gcs_operations_lock->wrlock();
 
   if (gcs_interface != nullptr) gcs_interface->finalize();
+
+  // Remove the provider since it is owned by the plugin.
+  if (gcs_interface != nullptr) {
+    Gcs_interface_runtime_requirements reqs;
+    reqs.provider = gcs_mysql_net_provider;
+    gcs_interface->cleanup_runtime_resources(reqs);
+  }
+
   Gcs_interface_factory::cleanup(gcs_engine);
   gcs_interface = nullptr;
 
+  // Will destroy gcs_mysql_net_provider if it is still alive after finalize
+  gcs_mysql_net_provider = nullptr;
+
   gcs_operations_lock->unlock();
 }
 
@@ -105,7 +131,16 @@
   enum enum_gcs_error error = GCS_NOK;
   gcs_operations_lock->wrlock();
 
-  if (gcs_interface != nullptr) error = gcs_interface->initialize(parameters);
+  if (gcs_interface != nullptr) {
+    error = gcs_interface->initialize(parameters);
+
+    // This forces GCS to create group interfaces under a RW lock.
+    if (gcs_interface->is_initialized()) {
+      std::string group_name(get_group_name_var());
+      Gcs_group_identifier group_id(group_name);
+      gcs_interface->get_communication_session(group_id);
+    }
+  }
 
   gcs_operations_lock->unlock();
   return error;
@@ -271,6 +306,12 @@
       goto end;
       /* purecov: end */
     }
+  } else {  // This is the "something went wrong branch". We will avoid
+            // incoming connections to ensure that we do not end in a deadlock,
+            // thus de-registering the incoming connection callback
+    if (gcs_mysql_net_provider != nullptr) {
+      gcs_mysql_net_provider->stop();
+    }
   }
 
 end:
@@ -507,7 +548,8 @@
       /* purecov: end */
     }
     LogPluginErr(SYSTEM_LEVEL, ER_GRP_RPL_FORCE_MEMBER_VALUE_SET, members);
-    if (view_change_notifier.wait_for_view_modification()) {
+    if (view_change_notifier.wait_for_view_modification(
+            FORCE_MEMBERS_VIEW_MODIFICATION_TIMEOUT)) {
       /* purecov: begin inspected */
       LogPluginErr(ERROR_LEVEL, ER_GRP_RPL_FORCE_MEMBER_VALUE_TIME_OUT,
                    members);
@@ -580,6 +622,48 @@
   return result;
 }
 
+enum enum_gcs_error Gcs_operations::set_leader(
+    Gcs_member_identifier const &leader) {
+  DBUG_TRACE;
+  enum enum_gcs_error result = GCS_NOK;
+  gcs_operations_lock->wrlock();
+  Gcs_group_management_interface *gcs_group_manager = get_gcs_group_manager();
+  if (gcs_group_manager != nullptr) {
+    result = gcs_group_manager->set_single_leader(leader);
+  }
+
+  gcs_operations_lock->unlock();
+  return result;
+}
+
+enum enum_gcs_error Gcs_operations::set_everyone_leader() {
+  DBUG_TRACE;
+  enum enum_gcs_error result = GCS_NOK;
+  gcs_operations_lock->wrlock();
+  Gcs_group_management_interface *gcs_group_manager = get_gcs_group_manager();
+  if (gcs_group_manager != nullptr) {
+    result = gcs_group_manager->set_everyone_leader();
+  }
+
+  gcs_operations_lock->unlock();
+  return result;
+}
+
+enum enum_gcs_error Gcs_operations::get_leaders(
+    std::vector<Gcs_member_identifier> &preferred_leaders,
+    std::vector<Gcs_member_identifier> &actual_leaders) {
+  DBUG_TRACE;
+  enum enum_gcs_error result = GCS_NOK;
+  gcs_operations_lock->rdlock();
+  Gcs_group_management_interface *gcs_group_manager = get_gcs_group_manager();
+  if (gcs_group_manager != nullptr) {
+    result = gcs_group_manager->get_leaders(preferred_leaders, actual_leaders);
+  }
+
+  gcs_operations_lock->unlock();
+  return result;
+}
+
 uint32_t Gcs_operations::get_minimum_write_concurrency() const {
   DBUG_TRACE;
   uint32_t result = 0;
@@ -691,6 +775,39 @@
   return result;
 }
 
+enum_transport_protocol
+Gcs_operations::get_current_incoming_connections_protocol() {
+  DBUG_TRACE;
+  enum_transport_protocol result = INVALID_PROTOCOL;
+  gcs_operations_lock->rdlock();
+  if (gcs_interface != nullptr && gcs_interface->is_initialized()) {
+    std::string group_name(get_group_name_var());
+    Gcs_group_identifier group_id(group_name);
+    Gcs_communication_interface *gcs_comms =
+        gcs_interface->get_communication_session(group_id);
+
+    if (gcs_comms != nullptr) {
+      result = gcs_comms->get_incoming_connections_protocol();
+    }
+  }
+  gcs_operations_lock->unlock();
+  return result;
+}
+
+Gcs_mysql_network_provider *Gcs_operations::get_mysql_network_provider() {
+  DBUG_TRACE;
+  Gcs_mysql_network_provider *result = nullptr;
+
+  gcs_operations_lock->rdlock();
+  if (gcs_interface != nullptr && gcs_mysql_net_provider != nullptr &&
+      gcs_interface->is_initialized()) {
+    result = gcs_mysql_net_provider.get();
+  }
+  gcs_operations_lock->unlock();
+
+  return result;
+}
+
 const std::string &Gcs_operations::get_gcs_engine() { return gcs_engine; }
 
 bool Gcs_operations::is_initialized() {
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/group_actions/communication_protocol_action.cc mysql-8.0-8.0.27/plugin/group_replication/src/group_actions/communication_protocol_action.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/group_actions/communication_protocol_action.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/group_actions/communication_protocol_action.cc	2021-09-28 11:46:34.000000000 +0000
@@ -22,7 +22,12 @@
 
 #include "plugin/group_replication/include/group_actions/communication_protocol_action.h"
 #include <tuple>
+#include "plugin/group_replication/include/member_info.h"
+#include "plugin/group_replication/include/member_version.h"
+#include "plugin/group_replication/include/mysql_version_gcs_protocol_map.h"
 #include "plugin/group_replication/include/plugin.h"
+#include "plugin/group_replication/include/plugin_handlers/consensus_leaders_handler.h"
+#include "plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_types.h"
 
 Communication_protocol_action::Communication_protocol_action()
     : m_diagnostics(),
@@ -42,15 +47,41 @@
   *message = new Group_action_message(m_gcs_protocol);
 }
 
+int Communication_protocol_action::set_consensus_leaders() const {
+  bool is_single_primary_mode = local_member_info->in_primary_mode();
+  auto my_role = Group_member_info::MEMBER_ROLE_PRIMARY;
+  Gcs_member_identifier const my_gcs_id =
+      local_member_info->get_gcs_member_id();
+  if (is_single_primary_mode) {
+    Group_member_info *primary_info =
+        group_member_mgr->get_primary_member_info();
+    if (primary_info == nullptr) {
+      return 1;
+    }
+
+    Gcs_member_identifier const primary_gcs_id =
+        primary_info->get_gcs_member_id();
+    delete primary_info;
+    bool const am_i_the_primary = (my_gcs_id == primary_gcs_id);
+    my_role = (am_i_the_primary ? Group_member_info::MEMBER_ROLE_PRIMARY
+                                : Group_member_info::MEMBER_ROLE_SECONDARY);
+  }
+
+  Member_version const communication_protocol =
+      convert_to_mysql_version(m_gcs_protocol);
+  consensus_leaders_handler->set_consensus_leaders(
+      communication_protocol, is_single_primary_mode, my_role, my_gcs_id);
+
+  return 0;
+}
+
 int Communication_protocol_action::process_action_message(
     Group_action_message &message, const std::string &) {
   assert(m_gcs_protocol == Gcs_protocol_version::UNKNOWN ||
          m_gcs_protocol == message.get_gcs_protocol());
   assert(!m_protocol_change_done.valid());
 
-  int constexpr SUCCESS = 0;
-  int constexpr FAILURE = 1;
-  int result = FAILURE;
+  int result = 1;
 
   m_gcs_protocol = message.get_gcs_protocol();
 
@@ -60,17 +91,20 @@
       gcs_module->set_protocol_version(m_gcs_protocol);
 
   /* Check if the protocol will be changed. */
-  if (will_change_protocol) result = SUCCESS;
+  if (will_change_protocol) {
+    result = set_consensus_leaders();
+  }
 
   /* Inform action caller of error. */
-  if (result == FAILURE) {
+  if (result == 1) {
     std::string error_message;
     auto const max_supported_protocol =
         gcs_module->get_maximum_protocol_version();
     Member_version const &max_supported_version =
         convert_to_mysql_version(max_supported_protocol);
     error_message =
-        "Aborting the communication protocol change because some older members "
+        "Aborting the communication protocol change because some older "
+        "members "
         "of the group only support up to protocol version " +
         max_supported_version.get_version_string() +
         ". To upgrade the protocol first remove the older members from the "
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/group_actions/group_action_coordinator.cc mysql-8.0-8.0.27/plugin/group_replication/src/group_actions/group_action_coordinator.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/group_actions/group_action_coordinator.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/group_actions/group_action_coordinator.cc	2021-09-28 11:46:34.000000000 +0000
@@ -915,6 +915,7 @@
   thd->release_resources();
   global_thd_manager_remove_thd(thd);
   delete thd;
+  my_thread_end();
 
   mysql_mutex_lock(&group_thread_run_lock);
   action_handler_thd_state.set_terminated();
@@ -924,8 +925,6 @@
   Gcs_interface_factory::cleanup_thread_communication_resources(
       Gcs_operations::get_gcs_engine());
 
-  my_thread_end();
-
   return error;
 }
 
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/group_actions/multi_primary_migration_action.cc mysql-8.0-8.0.27/plugin/group_replication/src/group_actions/multi_primary_migration_action.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/group_actions/multi_primary_migration_action.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/group_actions/multi_primary_migration_action.cc	2021-09-28 11:46:34.000000000 +0000
@@ -22,7 +22,9 @@
 
 #include "plugin/group_replication/include/group_actions/multi_primary_migration_action.h"
 #include <plugin/group_replication/include/plugin_handlers/persistent_variables_handler.h>
+#include "plugin/group_replication/include/mysql_version_gcs_protocol_map.h"
 #include "plugin/group_replication/include/plugin.h"
+#include "plugin/group_replication/include/plugin_handlers/consensus_leaders_handler.h"
 #include "plugin/group_replication/include/plugin_handlers/server_ongoing_transactions_handler.h"
 
 bool send_multi_primary_action_message(Plugin_gcs_message *message) {
@@ -236,8 +238,18 @@
     log_result_execution(multi_primary_switch_aborted && !action_terminated,
                          mode_is_set);
 
-  if ((!multi_primary_switch_aborted && !error) || action_terminated)
+  if ((!multi_primary_switch_aborted && !error) || action_terminated) {
+    Member_version const communication_protocol =
+        convert_to_mysql_version(gcs_module->get_protocol_version());
+    Gcs_member_identifier const my_gcs_id =
+        local_member_info->get_gcs_member_id();
+
+    consensus_leaders_handler->set_consensus_leaders(
+        communication_protocol, false, Group_member_info::MEMBER_ROLE_PRIMARY,
+        my_gcs_id);
+
     return Group_action::GROUP_ACTION_RESULT_TERMINATED;
+  }
 
   if (action_killed) {
     return Group_action::GROUP_ACTION_RESULT_KILLED;
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/handlers/applier_handler.cc mysql-8.0-8.0.27/plugin/group_replication/src/handlers/applier_handler.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/handlers/applier_handler.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/handlers/applier_handler.cc	2021-09-28 11:46:34.000000000 +0000
@@ -127,9 +127,7 @@
   if (event->get_event_type() != binary_log::TRANSACTION_CONTEXT_EVENT) {
     error = channel_interface.queue_packet((const char *)p->payload, p->len);
 
-    if (event->get_event_type() == binary_log::GTID_LOG_EVENT &&
-        local_member_info->get_recovery_status() ==
-            Group_member_info::MEMBER_ONLINE) {
+    if (event->get_event_type() == binary_log::GTID_LOG_EVENT) {
       applier_module->get_pipeline_stats_member_collector()
           ->increment_transactions_waiting_apply();
     }
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/leave_group_on_failure.cc mysql-8.0-8.0.27/plugin/group_replication/src/leave_group_on_failure.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/leave_group_on_failure.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/leave_group_on_failure.cc	2021-09-28 11:46:34.000000000 +0000
@@ -135,6 +135,20 @@
   */
   if (actions[leave_group_on_failure::STOP_APPLIER]) {
     bool aborted = false;
+    DBUG_EXECUTE_IF(
+        "group_replication_wait_for_current_events_execution_fail", {
+          /*
+           Inform the test to execute SHUTDOWN and block for shutdown to send
+           kill For blocking sleep has been used, hopefully in 10 seconds
+           shutdown will send kill to the thread
+           */
+          const char act[] =
+              "now signal "
+              "signal.group_replication_wait_for_current_events_execution_fail_"
+              "applier_add_suspension_packet";
+          assert(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
+          my_sleep(10 * 1000 * 1000);
+        };);
     applier_module->add_suspension_packet();
     applier_module->wait_for_applier_complete_suspension(&aborted, false);
   }
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/member_info.cc mysql-8.0-8.0.27/plugin/group_replication/src/member_info.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/member_info.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/member_info.cc	2021-09-28 11:46:34.000000000 +0000
@@ -45,7 +45,7 @@
     bool has_enforces_update_everywhere_checks, uint member_weight_arg,
     uint lower_case_table_names_arg, bool default_table_encryption_arg,
     const char *recovery_endpoints_arg, const char *view_change_uuid_arg,
-    PSI_mutex_key psi_mutex_key_arg)
+    bool allow_single_leader, PSI_mutex_key psi_mutex_key_arg)
     : Plugin_gcs_message(CT_MEMBER_INFO_MESSAGE),
       hostname(hostname_arg),
       port(port_arg),
@@ -66,6 +66,7 @@
                                                 : "DEFAULT"),
       m_view_change_uuid(view_change_uuid_arg ? view_change_uuid_arg
                                               : "AUTOMATIC"),
+      m_allow_single_leader(allow_single_leader),
 #ifndef NDEBUG
       skip_encode_default_table_encryption(false),
       m_skip_encode_view_change_uuid(false),
@@ -106,6 +107,7 @@
       primary_election_running(other.is_primary_election_running()),
       recovery_endpoints(other.get_recovery_endpoints()),
       m_view_change_uuid(other.get_view_change_uuid()),
+      m_allow_single_leader(other.get_allow_single_leader()),
 #ifndef NDEBUG
       skip_encode_default_table_encryption(false),
       m_skip_encode_view_change_uuid(false),
@@ -129,6 +131,7 @@
       primary_election_running(false),
       recovery_endpoints("DEFAULT"),
       m_view_change_uuid("AUTOMATIC"),
+      m_allow_single_leader(false),
 #ifndef NDEBUG
       skip_encode_default_table_encryption(false),
       m_skip_encode_view_change_uuid(false),
@@ -154,7 +157,8 @@
     Group_member_info::Group_member_role role_arg, bool in_single_primary_mode,
     bool has_enforces_update_everywhere_checks, uint member_weight_arg,
     uint lower_case_table_names_arg, bool default_table_encryption_arg,
-    const char *recovery_endpoints_arg, const char *view_change_uuid_arg) {
+    const char *recovery_endpoints_arg, const char *view_change_uuid_arg,
+    bool allow_single_leader) {
   MUTEX_LOCK(lock, &update_lock);
 
   hostname.assign(hostname_arg);
@@ -191,6 +195,7 @@
   recovery_endpoints.assign(recovery_endpoints_arg);
 
   m_view_change_uuid.assign(view_change_uuid_arg);
+  m_allow_single_leader = allow_single_leader;
 }
 
 void Group_member_info::update(Group_member_info &other) {
@@ -207,7 +212,7 @@
       other.get_member_weight(), other.get_lower_case_table_names(),
       other.get_default_table_encryption(),
       other.get_recovery_endpoints().c_str(),
-      other.get_view_change_uuid().c_str());
+      other.get_view_change_uuid().c_str(), other.get_allow_single_leader());
 }
 
 /*
@@ -310,6 +315,10 @@
     encode_payload_item_string(buffer, PIT_VIEW_CHANGE_UUID,
                                m_view_change_uuid.c_str(),
                                m_view_change_uuid.length());
+
+  char allow_single_leader_aux = m_allow_single_leader ? '1' : '0';
+  encode_payload_item_char(buffer, PIT_ALLOW_SINGLE_LEADER,
+                           allow_single_leader_aux);
 }
 
 void Group_member_info::decode_payload(const unsigned char *buffer,
@@ -457,6 +466,15 @@
           slider += payload_item_length;
         }
         break;
+
+      case PIT_ALLOW_SINGLE_LEADER:
+        if (slider + payload_item_length <= end) {
+          unsigned char allow_single_leader_aux = *slider;
+          slider += payload_item_length;
+          m_allow_single_leader =
+              (allow_single_leader_aux == '1') ? true : false;
+        }
+        break;
     }
   }
 }
@@ -747,6 +765,11 @@
   return m_view_change_uuid;
 }
 
+bool Group_member_info::get_allow_single_leader() {
+  MUTEX_LOCK(lock, &update_lock);
+  return m_allow_single_leader;
+}
+
 void Group_member_info::set_view_change_uuid(const char *view_change_cnf) {
   MUTEX_LOCK(lock, &update_lock);
   m_view_change_uuid.assign(view_change_cnf);
@@ -1446,11 +1469,9 @@
                  member_actions_serialized_configuration.end());
 }
 
-bool Group_member_info_manager_message::
-    get_member_actions_serialized_configuration(
-        const unsigned char *buffer, size_t length,
-        const unsigned char **member_actions_serialized_configuration,
-        size_t *member_actions_serialized_configuration_length) {
+bool Group_member_info_manager_message::get_pit_data(
+    const enum_payload_item_type pit, const unsigned char *buffer,
+    size_t length, const unsigned char **pit_data, size_t *pit_length) {
   DBUG_TRACE;
   const unsigned char *slider = buffer;
   const unsigned char *end = buffer + length;
@@ -1473,20 +1494,32 @@
     decode_payload_item_type_and_length(&slider, &payload_item_type,
                                         &payload_item_length);
 
-    switch (payload_item_type) {
-      case PIT_MEMBER_ACTIONS:
-        if (slider + payload_item_length <= end) {
-          *member_actions_serialized_configuration = slider;
-          *member_actions_serialized_configuration_length = payload_item_length;
-          return false;
-        }
-        slider += payload_item_length;
-        break;
-      default:
-        slider += payload_item_length;
-        break;
+    if (pit == payload_item_type) {
+      if (slider + payload_item_length <= end) {
+        *pit_data = slider;
+        *pit_length = payload_item_length;
+        return false;
+      }
+      slider += payload_item_length;
+    } else {
+      slider += payload_item_length;
     }
   }
 
   return true;
 }
+
+void Group_member_info_manager_message::
+    add_replication_failover_channels_serialized_configuration(
+        std::vector<unsigned char> *buffer,
+        const std::string
+            &replication_failover_channels_serialized_configuration) const {
+  DBUG_TRACE;
+
+  encode_payload_item_type_and_length(
+      buffer, PIT_RPL_FAILOVER_CONFIGURATION,
+      replication_failover_channels_serialized_configuration.size());
+  buffer->insert(buffer->end(),
+                 replication_failover_channels_serialized_configuration.begin(),
+                 replication_failover_channels_serialized_configuration.end());
+}
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/mysql_version_gcs_protocol_map.cc mysql-8.0-8.0.27/plugin/group_replication/src/mysql_version_gcs_protocol_map.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/mysql_version_gcs_protocol_map.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/mysql_version_gcs_protocol_map.cc	2021-09-28 11:46:34.000000000 +0000
@@ -33,15 +33,18 @@
  * +======================================+
  * | 5.7.14        | 1                    |
  * | 8.0.16        | 2                    |
+ * | 8.0.27        | 3                    |
  * +--------------------------------------+
  */
 
 static Member_version const version_5_7_14(0x050714);
 static Member_version const version_8_0_16(0x080016);
+static Member_version const version_8_0_27(0x080027);
 
 /*
  * Protocol 1 maps to version 5.7.14.
  * Protocol 2 maps to version 8.0.16.
+ * Protocol 3 maps to version 8.0.27.
  *
  * When you update this function, remember to update the convert_to_gcs_protocol
  * function accordingly.
@@ -53,12 +56,13 @@
       return version_5_7_14;
     case Gcs_protocol_version::V2:
       return version_8_0_16;
-    case Gcs_protocol_version::UNKNOWN:
     case Gcs_protocol_version::V3:
+      return version_8_0_27;
+    case Gcs_protocol_version::UNKNOWN:
     case Gcs_protocol_version::V4:
     case Gcs_protocol_version::V5:
       /* This should not happen... */
-      assert(false && "GCS protocol should have been V1 or V2");
+      assert(false && "GCS protocol should have been V1 or V2, or V3");
       break;
   }
   return Member_version(0x000000);
@@ -66,7 +70,8 @@
 
 /*
  * Versions in the domain [5.7.14; 8.0.16[ map to protocol 1.
- * Versions in the domain [8.0.16; my-version] map to protocol 2.
+ * Versions in the domain [8.0.16; 8.0.22[ map to protocol 2.
+ * Versions in the domain [8.0.27; my-version] map to protocol 3.
  *
  * When you update this function, remember to update the
  * convert_to_mysql_version function accordingly.
@@ -75,8 +80,11 @@
     Member_version const &mysql_version, Member_version const &my_version) {
   if (version_5_7_14 <= mysql_version && mysql_version < version_8_0_16) {
     return Gcs_protocol_version::V1;
-  } else if (version_8_0_16 <= mysql_version && mysql_version <= my_version) {
+  } else if (version_8_0_16 <= mysql_version &&
+             mysql_version < version_8_0_27) {
     return Gcs_protocol_version::V2;
+  } else if (version_8_0_27 <= mysql_version && mysql_version <= my_version) {
+    return Gcs_protocol_version::V3;
   } else {
     return Gcs_protocol_version::UNKNOWN;
   }
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/observer_server_state.cc mysql-8.0-8.0.27/plugin/group_replication/src/observer_server_state.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/observer_server_state.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/observer_server_state.cc	2021-09-28 11:46:34.000000000 +0000
@@ -44,7 +44,12 @@
 
 int group_replication_after_recovery(Server_state_param *) { return 0; }
 
-int group_replication_before_server_shutdown(Server_state_param *) { return 0; }
+int group_replication_before_server_shutdown(Server_state_param *) {
+  enable_server_shutdown_status();
+  plugin_group_replication_leave_group();
+
+  return 0;
+}
 
 int group_replication_after_dd_upgrade(Server_state_param *) { return 0; }
 
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/observer_trans.cc mysql-8.0-8.0.27/plugin/group_replication/src/observer_trans.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/observer_trans.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/observer_trans.cc	2021-09-28 11:46:34.000000000 +0000
@@ -177,6 +177,12 @@
     assert(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
   });
 
+  DBUG_EXECUTE_IF("group_replication_pause_on_before_commit_hook", {
+    // DBUG_SYNC are hold by same MDL lock test is using
+    const uint sleep_time_seconds = VIEW_MODIFICATION_TIMEOUT * 1.5;
+    my_sleep(sleep_time_seconds * 1000000);
+  });
+
   /*
     If the originating id belongs to a thread in the plugin, the transaction
     was already certified. Channel operations can deadlock against
@@ -195,12 +201,14 @@
     if (!fail_to_lock) {
       const Group_member_info::Group_member_status member_status =
           local_member_info->get_recovery_status();
-      if (Group_member_info::MEMBER_ONLINE == member_status) {
+      if (Group_member_info::MEMBER_ONLINE == member_status ||
+          Group_member_info::MEMBER_IN_RECOVERY == member_status) {
         applier_module->get_pipeline_stats_member_collector()
             ->decrement_transactions_waiting_apply();
         applier_module->get_pipeline_stats_member_collector()
             ->increment_transactions_applied();
-      } else if (Group_member_info::MEMBER_IN_RECOVERY == member_status) {
+      }
+      if (Group_member_info::MEMBER_IN_RECOVERY == member_status) {
         applier_module->get_pipeline_stats_member_collector()
             ->increment_transactions_applied_during_recovery();
       }
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/perfschema/pfs.cc mysql-8.0-8.0.27/plugin/group_replication/src/perfschema/pfs.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/perfschema/pfs.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/perfschema/pfs.cc	2021-09-28 11:46:34.000000000 +0000
@@ -15,6 +15,7 @@
 
 #include "plugin/group_replication/include/perfschema/pfs.h"
 #include "mysql/components/my_service.h"
+#include "plugin/group_replication/include/perfschema/table_communication_information.h"
 #include "plugin/group_replication/include/perfschema/table_replication_group_configuration_version.h"
 #include "plugin/group_replication/include/perfschema/table_replication_group_member_actions.h"
 #include "plugin/group_replication/include/perfschema/utilities.h"
@@ -65,6 +66,11 @@
   table_replication_group_member_actions->init();
   m_tables.push_back(std::move(table_replication_group_member_actions));
 
+  auto table_replication_communication_information =
+      std::make_unique<Pfs_table_communication_information>();
+  table_replication_communication_information->init();
+  m_tables.push_back(std::move(table_replication_communication_information));
+
   // Register all tables in one go.
   if (register_pfs_tables(m_tables)) {
     /* purecov: begin inspected */
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/perfschema/table_communication_information.cc mysql-8.0-8.0.27/plugin/group_replication/src/perfschema/table_communication_information.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/perfschema/table_communication_information.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/perfschema/table_communication_information.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,228 @@
+/* Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+
+#include <mysql/psi/mysql_mutex.h>
+#include "my_time.h"
+
+#include <iterator>
+#include <tuple>
+#include <vector>
+
+#include "mysql/components/my_service.h"
+
+#include "mysql/components/services/log_builtins.h"
+#include "mysql/components/services/pfs_plugin_table_service.h"
+#include "plugin/group_replication/include/gcs_operations.h"
+#include "plugin/group_replication/include/member_info.h"
+#include "plugin/group_replication/include/mysql_version_gcs_protocol_map.h"
+#include "plugin/group_replication/include/perfschema/table_communication_information.h"
+#include "plugin/group_replication/include/perfschema/utilities.h"
+#include "plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_member_identifier.h"
+#include "plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_types.h"
+
+extern Gcs_operations *gcs_module;
+extern Group_member_info_manager_interface *group_member_mgr;
+
+namespace gr {
+namespace perfschema {
+namespace pfs_table_communication_information {
+
+static constexpr int SUCCESS = 0;
+
+struct dummy_table_handle_type {};
+static dummy_table_handle_type dummy_table_handle{};
+
+static constexpr unsigned long long NR_ROWS{1};
+static unsigned long long s_current_pos{0};
+static uint32_t s_write_concurrency{0};
+static Member_version s_mysql_version{0x00000};
+static std::vector<Group_member_info *> s_preferred_leaders;
+static std::vector<Group_member_info *> s_actual_leaders;
+
+static bool fetch_row_data() {
+  bool constexpr ERROR = true;
+  bool constexpr OK = false;
+
+  if (gcs_module == nullptr || group_member_mgr == nullptr) {
+    return ERROR;
+  }
+
+  enum enum_gcs_error error_code =
+      gcs_module->get_write_concurrency(s_write_concurrency);
+  if (error_code != GCS_OK) {
+    return ERROR;
+  }
+
+  Gcs_protocol_version const gcs_version = gcs_module->get_protocol_version();
+  if (gcs_version == Gcs_protocol_version::UNKNOWN) {
+    return ERROR;
+  }
+  s_mysql_version = convert_to_mysql_version(gcs_version);
+
+  std::vector<Gcs_member_identifier> preferred_leaders;
+  std::vector<Gcs_member_identifier> actual_leaders;
+  error_code = gcs_module->get_leaders(preferred_leaders, actual_leaders);
+  if (error_code != GCS_OK) {
+    return ERROR;
+  }
+
+  std::vector<Group_member_info *> found_preferred_leaders;
+  for (const auto &preferred_leader : preferred_leaders) {
+    auto member_id =
+        group_member_mgr->get_group_member_info_by_member_id(preferred_leader);
+    if (member_id) found_preferred_leaders.emplace_back(member_id);
+  }
+  s_preferred_leaders = found_preferred_leaders;
+
+  std::vector<Group_member_info *> found_actual_leaders;
+  for (const auto &actual_leader : actual_leaders) {
+    auto member_id =
+        group_member_mgr->get_group_member_info_by_member_id(actual_leader);
+    if (member_id) found_actual_leaders.emplace_back(member_id);
+  }
+  s_actual_leaders = found_actual_leaders;
+
+  return OK;
+}
+
+static unsigned long long get_row_count() { return NR_ROWS; }
+
+static int rnd_next(PSI_table_handle *handle MY_ATTRIBUTE((unused))) {
+  if (s_current_pos >= NR_ROWS) {
+    return PFS_HA_ERR_END_OF_FILE;
+  }
+
+  bool const error = fetch_row_data();
+  if (error) {
+    // Is there a more suitable error code?
+    return PFS_HA_ERR_END_OF_FILE;
+  }
+
+  s_current_pos++;
+
+  return SUCCESS;
+}
+
+static int rnd_init(PSI_table_handle *handle MY_ATTRIBUTE((unused)),
+                    bool scan MY_ATTRIBUTE((unused))) {
+  return SUCCESS;
+}
+
+static int rnd_pos(PSI_table_handle *handle MY_ATTRIBUTE((unused))) {
+  return SUCCESS;
+}
+
+static void reset_position(PSI_table_handle *handle MY_ATTRIBUTE((unused))) {
+  s_current_pos = 0;
+}
+
+static int read_column_value(PSI_table_handle *handle MY_ATTRIBUTE((unused)),
+                             PSI_field *field,
+                             unsigned int index MY_ATTRIBUTE((unused))) {
+  Registry_guard guard;
+  my_service<SERVICE_TYPE(pfs_plugin_table)> table_service{
+      "pfs_plugin_table", guard.get_registry()};
+
+  switch (index) {
+    case 0: {  // WRITE_CONCURRENCY
+      table_service->set_field_bigint(field, {s_write_concurrency, false});
+      break;
+    }
+    case 1: {  // PROTOCOL_VERSION
+      table_service->set_field_blob(
+          field, s_mysql_version.get_version_string().c_str(),
+          s_mysql_version.get_version_string().size());
+      break;
+    }
+    case 2: {  // WRITE_CONSENSUS_LEADERS_PREFERRED
+      std::stringstream ss;
+      for (std::size_t i = 0; i < s_preferred_leaders.size(); i++) {
+        ss << s_preferred_leaders.at(i)->get_uuid();
+        if (i < s_preferred_leaders.size() - 1) {
+          ss << ',';
+        }
+      }
+      table_service->set_field_blob(field, ss.str().c_str(), ss.str().size());
+      break;
+    }
+    case 3: {  // WRITE_CONSENSUS_LEADERS_ACTUAL
+      std::stringstream ss;
+      for (std::size_t i = 0; i < s_actual_leaders.size(); i++) {
+        ss << s_actual_leaders.at(i)->get_uuid();
+        if (i < s_actual_leaders.size() - 1) {
+          ss << ',';
+        }
+      }
+      table_service->set_field_blob(field, ss.str().c_str(), ss.str().size());
+      break;
+    }
+  }
+  return 0;
+}
+
+static PSI_table_handle *open_table(PSI_pos **pos MY_ATTRIBUTE((unused))) {
+  auto *dummy = reinterpret_cast<PSI_table_handle *>(&dummy_table_handle);
+  reset_position(dummy);
+  *pos = reinterpret_cast<PSI_pos *>(&s_current_pos);
+  return dummy;
+}
+
+static void close_table(PSI_table_handle *handle MY_ATTRIBUTE((unused))) {
+  for (auto &it : s_preferred_leaders) delete it;
+  s_preferred_leaders.clear();
+
+  for (auto &it : s_actual_leaders) delete it;
+  s_actual_leaders.clear();
+}
+
+}  // namespace pfs_table_communication_information
+
+bool Pfs_table_communication_information::deinit() { return false; }
+
+bool Pfs_table_communication_information::init() {
+  m_share.m_table_name = "replication_group_communication_information";
+  m_share.m_table_name_length = ::strlen(m_share.m_table_name);
+  m_share.m_table_definition =
+      "WRITE_CONCURRENCY BIGINT unsigned not null, "
+      "PROTOCOL_VERSION LONGTEXT not null, "
+      "WRITE_CONSENSUS_LEADERS_PREFERRED LONGTEXT not null, "
+      "WRITE_CONSENSUS_LEADERS_ACTUAL LONGTEXT not null";
+  m_share.m_ref_length =
+      sizeof pfs_table_communication_information::s_current_pos;
+  m_share.m_acl = READONLY;
+  m_share.get_row_count = pfs_table_communication_information::get_row_count;
+
+  /* Initialize PFS_engine_table_proxy */
+  m_share.m_proxy_engine_table = {
+      pfs_table_communication_information::rnd_next,
+      pfs_table_communication_information::rnd_init,
+      pfs_table_communication_information::rnd_pos,
+      nullptr,  // index_init,
+      nullptr,  // index_read,
+      nullptr,  // index_next,
+      pfs_table_communication_information::read_column_value,
+      pfs_table_communication_information::reset_position,
+      nullptr,  // write_column_value,
+      nullptr,  // write_row_values,
+      nullptr,  // update_column_value,
+      nullptr,  // update_row_values,
+      nullptr,  // delete_row_values,
+      pfs_table_communication_information::open_table,
+      pfs_table_communication_information::close_table};
+  return false;
+}
+
+}  // namespace perfschema
+}  // namespace gr
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/perfschema/table_replication_group_configuration_version.cc mysql-8.0-8.0.27/plugin/group_replication/src/perfschema/table_replication_group_configuration_version.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/perfschema/table_replication_group_configuration_version.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/perfschema/table_replication_group_configuration_version.cc	2021-09-28 11:46:34.000000000 +0000
@@ -41,12 +41,12 @@
 
 static unsigned long long get_row_count() { return s_rows.size(); }
 
-static int rnd_init(PSI_table_handle *handle MY_ATTRIBUTE((unused)),
-                    bool scan MY_ATTRIBUTE((unused))) {
+static int rnd_init(PSI_table_handle *handle [[maybe_unused]],
+                    bool scan [[maybe_unused]]) {
   return 0;
 }
 
-static int rnd_next(PSI_table_handle *handle MY_ATTRIBUTE((unused))) {
+static int rnd_next(PSI_table_handle *handle [[maybe_unused]]) {
   s_current_row_pos = s_next_row_pos;
   if (s_current_row_pos < get_row_count()) {
     s_next_row_pos++;
@@ -56,7 +56,7 @@
   return PFS_HA_ERR_END_OF_FILE;
 }
 
-static int rnd_pos(PSI_table_handle *handle MY_ATTRIBUTE((unused))) {
+static int rnd_pos(PSI_table_handle *handle [[maybe_unused]]) {
   if (s_current_row_pos >= get_row_count()) {
     return PFS_HA_ERR_END_OF_FILE;
   }
@@ -64,12 +64,12 @@
   return 0;
 }
 
-static void reset_position(PSI_table_handle *handle MY_ATTRIBUTE((unused))) {
+static void reset_position(PSI_table_handle *handle [[maybe_unused]]) {
   s_current_row_pos = 0;
   s_next_row_pos = 0;
 }
 
-static int read_column_value(PSI_table_handle *handle MY_ATTRIBUTE((unused)),
+static int read_column_value(PSI_table_handle *handle [[maybe_unused]],
                              PSI_field *field, unsigned int index) {
   Registry_guard guard;
   my_service<SERVICE_TYPE(pfs_plugin_table)> table_service{
@@ -97,7 +97,7 @@
   return 0;
 }
 
-static PSI_table_handle *open_table(PSI_pos **pos MY_ATTRIBUTE((unused))) {
+static PSI_table_handle *open_table(PSI_pos **pos [[maybe_unused]]) {
   s_rows.clear();
   s_current_row_pos = 0;
   s_next_row_pos = 0;
@@ -136,7 +136,7 @@
   }
 
   key_access.deinit();
-  table_op.close(true);
+  table_op.close(false);
 
   auto *dummy = reinterpret_cast<PSI_table_handle *>(&dummy_table_handle);
   reset_position(dummy);
@@ -144,7 +144,7 @@
   return dummy;
 }
 
-static void close_table(PSI_table_handle *handle MY_ATTRIBUTE((unused))) {
+static void close_table(PSI_table_handle *handle [[maybe_unused]]) {
   s_rows.clear();
 }
 
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/perfschema/table_replication_group_member_actions.cc mysql-8.0-8.0.27/plugin/group_replication/src/perfschema/table_replication_group_member_actions.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/perfschema/table_replication_group_member_actions.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/perfschema/table_replication_group_member_actions.cc	2021-09-28 11:46:34.000000000 +0000
@@ -45,12 +45,12 @@
 
 static unsigned long long get_row_count() { return s_rows.size(); }
 
-static int rnd_init(PSI_table_handle *handle MY_ATTRIBUTE((unused)),
-                    bool scan MY_ATTRIBUTE((unused))) {
+static int rnd_init(PSI_table_handle *handle [[maybe_unused]],
+                    bool scan [[maybe_unused]]) {
   return 0;
 }
 
-static int rnd_next(PSI_table_handle *handle MY_ATTRIBUTE((unused))) {
+static int rnd_next(PSI_table_handle *handle [[maybe_unused]]) {
   s_current_row_pos = s_next_row_pos;
   if (s_current_row_pos < get_row_count()) {
     s_next_row_pos++;
@@ -60,7 +60,7 @@
   return PFS_HA_ERR_END_OF_FILE;
 }
 
-static int rnd_pos(PSI_table_handle *handle MY_ATTRIBUTE((unused))) {
+static int rnd_pos(PSI_table_handle *handle [[maybe_unused]]) {
   if (s_current_row_pos >= get_row_count()) {
     return PFS_HA_ERR_END_OF_FILE;
   }
@@ -68,12 +68,12 @@
   return 0;
 }
 
-static void reset_position(PSI_table_handle *handle MY_ATTRIBUTE((unused))) {
+static void reset_position(PSI_table_handle *handle [[maybe_unused]]) {
   s_current_row_pos = 0;
   s_next_row_pos = 0;
 }
 
-static int read_column_value(PSI_table_handle *handle MY_ATTRIBUTE((unused)),
+static int read_column_value(PSI_table_handle *handle [[maybe_unused]],
                              PSI_field *field, unsigned int index) {
   Registry_guard guard;
   my_service<SERVICE_TYPE(pfs_plugin_table)> table_service{
@@ -124,7 +124,7 @@
   return 0;
 }
 
-static PSI_table_handle *open_table(PSI_pos **pos MY_ATTRIBUTE((unused))) {
+static PSI_table_handle *open_table(PSI_pos **pos [[maybe_unused]]) {
   s_rows.clear();
   s_current_row_pos = 0;
   s_next_row_pos = 0;
@@ -173,7 +173,7 @@
   }
 
   key_access.deinit();
-  table_op.close(true);
+  table_op.close(false);
 
   auto *dummy = reinterpret_cast<PSI_table_handle *>(&dummy_table_handle);
   reset_position(dummy);
@@ -181,7 +181,7 @@
   return dummy;
 }
 
-static void close_table(PSI_table_handle *handle MY_ATTRIBUTE((unused))) {
+static void close_table(PSI_table_handle *handle [[maybe_unused]]) {
   s_rows.clear();
 }
 
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/plugin.cc mysql-8.0-8.0.27/plugin/group_replication/src/plugin.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/plugin.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/plugin.cc	2021-09-28 11:46:34.000000000 +0000
@@ -31,6 +31,7 @@
 #include "my_io.h"
 #include "plugin/group_replication/include/autorejoin.h"
 #include "plugin/group_replication/include/consistency_manager.h"
+#include "plugin/group_replication/include/gcs_mysql_network_provider.h"
 #include "plugin/group_replication/include/mysql_version_gcs_protocol_map.h"
 #include "plugin/group_replication/include/observer_server_actions.h"
 #include "plugin/group_replication/include/observer_server_state.h"
@@ -38,11 +39,14 @@
 #include "plugin/group_replication/include/perfschema/pfs.h"
 #include "plugin/group_replication/include/pipeline_stats.h"
 #include "plugin/group_replication/include/plugin.h"
+#include "plugin/group_replication/include/plugin_handlers/consensus_leaders_handler.h"
 #include "plugin/group_replication/include/plugin_handlers/member_actions_handler.h"
 #include "plugin/group_replication/include/plugin_variables.h"
 #include "plugin/group_replication/include/plugin_variables/recovery_endpoints.h"
 #include "plugin/group_replication/include/services/message_service/message_service.h"
+#include "plugin/group_replication/include/services/status_service/status_service.h"
 #include "plugin/group_replication/include/sql_service/sql_service_interface.h"
+#include "plugin/group_replication/include/thread/mysql_thread.h"
 #include "plugin/group_replication/include/udf/udf_registration.h"
 #include "plugin/group_replication/include/udf/udf_utils.h"
 
@@ -120,6 +124,8 @@
 /** Handle validation of advertised recovery endpoints */
 Advertised_recovery_endpoints *advertised_recovery_endpoints = nullptr;
 Member_actions_handler *member_actions_handler = nullptr;
+/** Handle tasks on mysql_thread */
+Mysql_thread *mysql_thread_handler = nullptr;
 
 Plugin_gcs_events_handler *events_handler = nullptr;
 Plugin_gcs_view_modification_notifier *view_change_notifier = nullptr;
@@ -135,6 +141,8 @@
 SERVICE_TYPE_NO_CONST(mysql_runtime_error) *mysql_runtime_error_service =
     nullptr;
 
+Consensus_leaders_handler *consensus_leaders_handler = nullptr;
+
 /* Performance schema module */
 static gr::perfschema::Perfschema_module *perfschema_module = nullptr;
 static bool initialize_perfschema_module();
@@ -315,6 +323,8 @@
   return ov.components_stop_timeout_var;
 }
 
+ulong get_communication_stack_var() { return ov.communication_stack_var; }
+
 void set_error_state_due_to_error_during_autorejoin() {
   lv.error_state_due_to_error_during_autorejoin = true;
 }
@@ -329,6 +339,35 @@
 
 ulonglong get_rejoin_timeout() { return lv.rejoin_timeout; }
 
+bool get_allow_single_leader() {
+  if (lv.allow_single_leader_latch.first)
+    return lv.allow_single_leader_latch.second;
+  else
+    return ov.allow_single_leader_var;
+}
+
+/**
+ * @brief Callback implementation of
+ * handle_group_replication_incoming_connection. This is the entry point for
+ * new MySQL connections that are directed to GCS
+ *
+ * @param thd     THD object of the connection
+ * @param fd      File descriptor of the connections
+ * @param ssl_ctx SSL data of the connection
+ */
+void handle_group_replication_incoming_connection(THD *thd, int fd,
+                                                  SSL *ssl_ctx) {
+  auto *new_connection = new Network_connection(fd, ssl_ctx);
+  new_connection->has_error = false;
+
+  Gcs_mysql_network_provider *mysql_provider =
+      gcs_module->get_mysql_network_provider();
+
+  if (mysql_provider) {
+    mysql_provider->set_new_connection(thd, new_connection);
+  }
+}
+
 /**
   Set condition to block or unblock the calling threads
 
@@ -341,7 +380,7 @@
 /**
   Blocks the calling thread
 */
-bool initiate_wait_on_start_process() {
+enum_wait_on_start_process_result initiate_wait_on_start_process() {
   // block the thread
   lv.online_wait_mutex->start_waitlock();
 
@@ -352,15 +391,16 @@
     assert(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
   });
 #endif
-  return lv.abort_wait_on_start_process;
+  return lv.wait_on_start_process;
 }
 
 /**
   Release all the blocked threads
 */
-void terminate_wait_on_start_process(bool abort) {
+void terminate_wait_on_start_process(enum_wait_on_start_process_result abort) {
   lv.plugin_is_auto_starting_on_boot = false;
-  lv.abort_wait_on_start_process = abort;
+  lv.wait_on_start_process = abort;
+
   // unblocked waiting threads
   lv.online_wait_mutex->end_wait_lock();
 }
@@ -436,7 +476,7 @@
     uint index, const GROUP_REPLICATION_GROUP_MEMBERS_CALLBACKS &callbacks) {
   char *channel_name = applier_module_channel_name;
 
-  return get_group_members_info(index, callbacks, group_member_mgr,
+  return get_group_members_info(index, callbacks, group_member_mgr, gcs_module,
                                 channel_name);
 }
 
@@ -595,6 +635,9 @@
   // Reset previous ERROR state causes.
   lv.error_state_due_to_error_during_autorejoin = false;
 
+  // Reset the single-leader latch flag
+  lv.allow_single_leader_latch.first = false;
+
   // Reset the coordinator in case there was a previous stop.
   group_action_coordinator->reset_coordinator_process();
 
@@ -902,7 +945,8 @@
         Group_member_info::MEMBER_ROLE_SECONDARY, ov.single_primary_mode_var,
         ov.enforce_update_everywhere_checks_var, ov.member_weight_var,
         lv.gr_lower_case_table_names, lv.gr_default_table_encryption,
-        ov.advertise_recovery_endpoints_var, ov.view_change_uuid_var);
+        ov.advertise_recovery_endpoints_var, ov.view_change_uuid_var,
+        get_allow_single_leader());
   } else {
     local_member_info = new Group_member_info(
         hostname, port, uuid, lv.write_set_extraction_algorithm,
@@ -911,7 +955,8 @@
         Group_member_info::MEMBER_ROLE_SECONDARY, ov.single_primary_mode_var,
         ov.enforce_update_everywhere_checks_var, ov.member_weight_var,
         lv.gr_lower_case_table_names, lv.gr_default_table_encryption,
-        ov.advertise_recovery_endpoints_var, ov.view_change_uuid_var);
+        ov.advertise_recovery_endpoints_var, ov.view_change_uuid_var,
+        get_allow_single_leader());
   }
 
 #ifndef NDEBUG
@@ -1022,22 +1067,23 @@
 int leave_group_and_terminate_plugin_modules(
     gr_modules::mask modules_to_terminate, char **error_message) {
   /*
-    We acquire the plugin_modules_termination_mutex lock at this point in time,
-    before attempting to leave the group or terminate the plugin modules.
+    We acquire the plugin_modules_termination_mutex lock at this point in
+    time, before attempting to leave the group or terminate the plugin
+    modules.
 
     This warrants a more in-depth explanation of the life-cycle of
     plugin_modules_termination_mutex.
 
-    By calling terminate_plugin_modules() with gr_modules::all_modules, you will
-    terminate all plugin modules. One of those modules happens to be the
+    By calling terminate_plugin_modules() with gr_modules::all_modules, you
+    will terminate all plugin modules. One of those modules happens to be the
     Autorejoin_thread. The termination of the Autorejoin_thread plugin module
     will first terminate the thread.
-    The auto-rejoin process could already be undergoing. During the auto-rejoin
-    process, in attempt_rejoin(), there will be a call to
-    terminate_plugin_modules() as well (albeit with a different bitmask). Since
-    we can't terminate the thread during attempt_rejoin(), only after it, we
-    could have concurrent calls to terminate_plugin_modules(). Thus the need for
-    a critical section around it.
+    The auto-rejoin process could already be undergoing. During the
+    auto-rejoin process, in attempt_rejoin(), there will be a call to
+    terminate_plugin_modules() as well (albeit with a different bitmask).
+    Since we can't terminate the thread during attempt_rejoin(), only after
+    it, we could have concurrent calls to terminate_plugin_modules(). Thus the
+    need for a critical section around it.
 
     Also note that we are locking even before we call leave_group(). This is
     just to make sure that we don't start an auto-rejoin just before we
@@ -1055,6 +1101,8 @@
   return error;
 }
 
+int plugin_group_replication_leave_group() { return leave_group(); }
+
 int leave_group() {
   if (gcs_module->belongs_to_group()) {
     view_change_notifier->start_view_modification();
@@ -1102,10 +1150,17 @@
       If we do not leave preemptively, the server will only leave
       the group when the communication layer failure detector
       detects that it left.
+
+      If we leave the group due to a server shutdown, we will end up in this
+      code branch. Since we already left the group, we should not execute this
+      leave() instruction. Hence, we check if we are currently in a server
+      shutdown process.
     */
-    LogPluginErr(INFORMATION_LEVEL,
-                 ER_GRP_RPL_REQUESTING_NON_MEMBER_SERVER_TO_LEAVE);
-    gcs_module->leave(nullptr);
+    if (!get_server_shutdown_status()) {
+      LogPluginErr(INFORMATION_LEVEL,
+                   ER_GRP_RPL_REQUESTING_NON_MEMBER_SERVER_TO_LEAVE);
+      gcs_module->leave(nullptr);
+    }
   }
 
   // Finalize GCS.
@@ -1249,6 +1304,20 @@
                   { lv.rejoin_timeout = 60ULL; };);
 
   /*
+    Mysql thread handler.
+  */
+  if (modules_to_init[gr_modules::MYSQL_THREAD_HANDLER]) {
+    mysql_thread_handler = new Mysql_thread(
+        key_GR_THD_mysql_thread_handler, key_GR_LOCK_mysql_thread_handler_run,
+        key_GR_COND_mysql_thread_handler_run,
+        key_GR_LOCK_mysql_thread_handler_dispatcher_run,
+        key_GR_COND_mysql_thread_handler_dispatcher_run);
+    if (mysql_thread_handler->initialize()) {
+      return GROUP_REPLICATION_CONFIGURATION_ERROR;
+    }
+  }
+
+  /*
     Registry module.
   */
   if (modules_to_init[gr_modules::REGISTRY_MODULE]) {
@@ -1266,11 +1335,15 @@
     Asynchronous Replication Channels.
   */
   if (modules_to_init[gr_modules::ASYNC_REPL_CHANNELS]) {
+    lv.wait_on_start_process = WAIT_ON_START_PROCESS_SUCCESS;
+
     if (check_async_channel_running_on_secondary()) {
       LogPluginErr(ERROR_LEVEL,
                    ER_GRP_RPL_FAILED_TO_START_ON_SECONDARY_WITH_ASYNC_CHANNELS);
       return 1;
     }
+
+    reload_failover_channels_status();
   }
 
   /*
@@ -1599,6 +1672,17 @@
     }
   }
 
+  /*
+    Mysql thread handler.
+  */
+  if (modules_to_terminate[gr_modules::MYSQL_THREAD_HANDLER]) {
+    if (nullptr != mysql_thread_handler) {
+      mysql_thread_handler->terminate();
+      delete mysql_thread_handler;
+      mysql_thread_handler = nullptr;
+    }
+  }
+
   return error;
 }
 
@@ -1619,6 +1703,7 @@
   modules_mask.set(gr_modules::GCS_EVENTS_HANDLER, true);
   modules_mask.set(gr_modules::REMOTE_CLONE_HANDLER, true);
   modules_mask.set(gr_modules::MEMBER_ACTIONS_HANDLER, true);
+  modules_mask.set(gr_modules::MYSQL_THREAD_HANDLER, true);
   modules_mask.set(gr_modules::MESSAGE_SERVICE_HANDLER, true);
   modules_mask.set(gr_modules::BINLOG_DUMP_THREAD_KILL, true);
   modules_mask.set(gr_modules::RECOVERY_MODULE, true);
@@ -1633,9 +1718,9 @@
   /*
     The first step is to issue a GCS leave() operation. This is done because
     the join() operation will assume that the GCS layer is not initiated and
-    will try to reinitialize everything. Thus, we will simply teardown and setup
-    both the GCS layer and the group membership dependent components on the GR
-    side between each retry.
+    will try to reinitialize everything. Thus, we will simply teardown and
+    setup both the GCS layer and the group membership dependent components on
+    the GR side between each retry.
   */
   Plugin_gcs_view_modification_notifier vc_notifier;
   vc_notifier.start_view_modification();
@@ -1685,6 +1770,7 @@
     LogPluginErr(ERROR_LEVEL, ER_GRP_RPL_UNABLE_TO_INIT_COMMUNICATION_ENGINE);
     goto end;
   }
+
   gcs_params.add_parameter("bootstrap_group", "false");
   if (gcs_module->configure(gcs_params) != GCS_OK) {
     LogPluginErr(ERROR_LEVEL, ER_GRP_RPL_UNABLE_TO_INIT_COMMUNICATION_ENGINE);
@@ -1728,6 +1814,14 @@
       } else {
         // Only log a error when a view modification was not cancelled.
         LogPluginErr(WARNING_LEVEL, ER_GRP_RPL_TIMEOUT_RECEIVED_VC_ON_REJOIN);
+        DBUG_EXECUTE_IF(
+            "group_replication_autorejoin_allow_join_to_change_state", {
+              const char act[] =
+                  "now wait_for "
+                  "signal.group_replication_autorejoin_allow_join_to_change_"
+                  "state_resume";
+              assert(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
+            });
       }
     } else {
       /*
@@ -1774,6 +1868,10 @@
     */
     gcs_module->leave(nullptr);
     gcs_module->finalize();
+    Notification_context ctx;
+    group_member_mgr->update_member_status(
+        local_member_info->get_uuid(), Group_member_info::MEMBER_ERROR, ctx);
+    notify_and_reset_ctx(ctx);
   }
 
   gcs_module->remove_view_notifer(view_change_notifier);
@@ -1884,12 +1982,21 @@
       new Group_action_coordinator(ov.components_stop_timeout_var);
   group_action_coordinator->register_coordinator_observers();
   member_actions_handler = new Member_actions_handler();
+  consensus_leaders_handler =
+      new Consensus_leaders_handler{*group_events_observation_manager};
 
   bool const error = register_udfs();
   if (error) return 1;
 
   if (sql_service_interface_init()) return 1;
 
+  if (gr::status_service::register_gr_status_service()) {
+    LogPluginErr(ERROR_LEVEL, ER_GRP_RPL_ERROR_MSG,
+                 "Failed to initialize Group Replication status (role and "
+                 "mode) service.");
+    return 1;
+  }
+
   // Initialize the recovery SSL option map
   initialize_ssl_option_map();
 
@@ -1947,6 +2054,8 @@
   */
   finalize_perfschema_module();
 
+  gr::status_service::unregister_gr_status_service();
+
   if (plugin_group_replication_stop())
     LogPluginErr(ERROR_LEVEL, ER_GRP_RPL_FAILED_TO_STOP_ON_PLUGIN_UNINSTALL);
 
@@ -1970,6 +2079,11 @@
     autorejoin_module = nullptr;
   }
 
+  if (consensus_leaders_handler) {
+    delete consensus_leaders_handler;
+    consensus_leaders_handler = nullptr;
+  }
+
   if (group_action_coordinator) {
     group_action_coordinator->stop_coordinator_process(true, true);
     group_action_coordinator->unregister_coordinator_observers();
@@ -2260,6 +2374,9 @@
   gcs_module_parameters.add_parameter(
       "xcom_cache_size", std::to_string(ov.message_cache_size_var));
 
+  gcs_module_parameters.add_parameter(
+      "communication_stack", std::to_string(ov.communication_stack_var));
+
   /*
    We will add GCS-level join retries for those scenarios where a node
    crashes and comes back immediately, but it still has a reencarnation
@@ -2302,18 +2419,47 @@
   // SSL parameters.
   std::string ssl_mode(ov.ssl_mode_values[ov.ssl_mode_var]);
   if (ov.ssl_mode_var > 0) {
-    std::string ssl_key(sv.ssl_key ? sv.ssl_key : "");
-    std::string ssl_cert(sv.ssl_cert ? sv.ssl_cert : "");
-    std::string ssl_ca(sv.ssl_ca ? sv.ssl_ca : "");
-    std::string ssl_capath(sv.ssl_capath ? sv.ssl_capath : "");
-    std::string ssl_cipher(sv.ssl_cipher ? sv.ssl_cipher : "");
-    std::string ssl_crl(sv.ssl_crl ? sv.ssl_crl : "");
-    std::string ssl_crlpath(sv.ssl_crlpath ? sv.ssl_crlpath : "");
-    std::string tls_version(sv.tls_version ? sv.tls_version : "");
-    std::string ssl_fips_mode(ov.ssl_fips_mode_values[sv.ssl_fips_mode]);
+    enum_transport_protocol xcom_comm_protocol =
+        static_cast<enum_transport_protocol>(ov.communication_stack_var);
+
+    std::string ssl_key("");
+    std::string ssl_cert("");
+    std::string ssl_ca("");
+    std::string ssl_capath("");
+    std::string ssl_cipher("");
+    std::string ssl_crl("");
+    std::string ssl_crlpath("");
+    std::string tls_version("");
+    std::string ssl_fips_mode("");
+    if (xcom_comm_protocol == XCOM_PROTOCOL) {
+      ssl_key.append(sv.ssl_key ? sv.ssl_key : "");
+      ssl_cert.append(sv.ssl_cert ? sv.ssl_cert : "");
+      ssl_ca.append(sv.ssl_ca ? sv.ssl_ca : "");
+      ssl_capath.append(sv.ssl_capath ? sv.ssl_capath : "");
+      ssl_cipher.append(sv.ssl_cipher ? sv.ssl_cipher : "");
+      ssl_crl.append(sv.ssl_crl ? sv.ssl_crl : "");
+      ssl_crlpath.append(sv.ssl_crlpath ? sv.ssl_crlpath : "");
+      tls_version.append(sv.tls_version ? sv.tls_version : "");
+      ssl_fips_mode.append(ov.ssl_fips_mode_values[sv.ssl_fips_mode]);
+    } else if (xcom_comm_protocol == MYSQL_PROTOCOL) {
+      ssl_key.append(ov.recovery_ssl_key_var ? ov.recovery_ssl_key_var : "");
+      ssl_cert.append(ov.recovery_ssl_cert_var ? ov.recovery_ssl_cert_var : "");
+      ssl_ca.append(ov.recovery_ssl_ca_var ? ov.recovery_ssl_ca_var : "");
+      ssl_capath.append(ov.recovery_ssl_capath_var ? ov.recovery_ssl_capath_var
+                                                   : "");
+      ssl_cipher.append(ov.recovery_ssl_cipher_var ? ov.recovery_ssl_cipher_var
+                                                   : "");
+      ssl_crl.append(ov.recovery_ssl_crl_var ? ov.recovery_ssl_crl_var : "");
+      ssl_crlpath.append(
+          ov.recovery_ssl_crlpath_var ? ov.recovery_ssl_crlpath_var : "");
+      tls_version.append(
+          ov.recovery_tls_version_var ? ov.recovery_tls_version_var : "");
+    }
 
     // SSL support on server.
-    gcs_module_parameters.add_parameter("ssl_mode", ssl_mode);
+    gcs_module_parameters.add_parameter("ssl_mode",
+                                        ov.ssl_mode_values[ov.ssl_mode_var]);
+
     gcs_module_parameters.add_parameter("server_key_file", ssl_key);
     gcs_module_parameters.add_parameter("server_cert_file", ssl_cert);
     gcs_module_parameters.add_parameter("client_key_file", ssl_key);
@@ -2324,11 +2470,18 @@
                                           ssl_capath); /* purecov: inspected */
     gcs_module_parameters.add_parameter("cipher", ssl_cipher);
     gcs_module_parameters.add_parameter("tls_version", tls_version);
-    if (sv.tls_ciphersuites != nullptr) {
+
+    bool is_ciphersuites_null =
+        xcom_comm_protocol == XCOM_PROTOCOL
+            ? sv.tls_ciphersuites == nullptr
+            : ov.recovery_tls_ciphersuites_var == nullptr;
+    if (!is_ciphersuites_null) {
       /* Not specifying the ciphersuites means "use the OpenSSL default."
          Specifying an empty string means "disallow all ciphersuites." */
-      gcs_module_parameters.add_parameter("tls_ciphersuites",
-                                          sv.tls_ciphersuites);
+      gcs_module_parameters.add_parameter(
+          "tls_ciphersuites", xcom_comm_protocol == XCOM_PROTOCOL
+                                  ? sv.tls_ciphersuites
+                                  : ov.recovery_tls_ciphersuites_var);
     }
 
     if (!ssl_crl.empty())
@@ -2399,13 +2552,15 @@
     LogPluginErr(ERROR_LEVEL, ER_GRP_RPL_UNABLE_TO_INIT_COMMUNICATION_ENGINE);
     return GROUP_REPLICATION_COMMUNICATION_LAYER_SESSION_ERROR;
   }
-  LogPluginErr(
-      INFORMATION_LEVEL, ER_GRP_RPL_GRP_COMMUNICATION_INIT_WITH_CONF,
-      ov.group_name_var, ov.local_address_var, ov.group_seeds_var,
-      ov.bootstrap_group_var ? "true" : "false", ov.poll_spin_loops_var,
-      ov.compression_threshold_var, get_ip_allowlist(),
-      ov.communication_debug_options_var, ov.member_expel_timeout_var,
-      ov.communication_max_message_size_var, ov.message_cache_size_var);
+
+  LogPluginErr(INFORMATION_LEVEL, ER_GRP_RPL_GRP_COMMUNICATION_INIT_WITH_CONF,
+               ov.group_name_var, ov.local_address_var, ov.group_seeds_var,
+               ov.bootstrap_group_var ? "true" : "false",
+               ov.poll_spin_loops_var, ov.compression_threshold_var,
+               get_ip_allowlist(), ov.communication_debug_options_var,
+               ov.member_expel_timeout_var,
+               ov.communication_max_message_size_var, ov.message_cache_size_var,
+               ov.communication_stack_var);
 
 end:
   return err;
@@ -2423,10 +2578,10 @@
 }
 
 bool check_async_channel_running_on_secondary() {
-  /* To stop group replication to start on secondary member with single primary-
-     mode, when any async channels are running, we verify whether member is not
-    bootstrapping. As only when the member is bootstrapping, it can be the
-    primary leader on a single primary member context.
+  /* To stop group replication to start on secondary member with single
+    primary- mode, when any async channels are running, we verify whether
+    member is not bootstrapping. As only when the member is bootstrapping, it
+    can be the primary leader on a single primary member context.
   */
   if (ov.single_primary_mode_var && !ov.bootstrap_group_var &&
       !lv.plugin_is_auto_starting_on_boot) {
@@ -2484,8 +2639,8 @@
   recovery_module->set_recovery_zstd_compression_level(
       ov.recovery_zstd_compression_level_var);
 
-  // on case of the threads is locked and not able to terminate, change timeout
-  // to fail faster
+  // on case of the threads is locked and not able to terminate, change
+  // timeout to fail faster
   recovery_module->set_stop_wait_timeout(1);
   int error = recovery_module->check_recovery_thread_status();
   recovery_module->set_stop_wait_timeout(get_components_stop_timeout_var());
@@ -2724,7 +2879,8 @@
           mysql_runtime_error_service,
           ER_WRONG_VALUE_FOR_VAR_PLUS_ACTIONABLE_PART, 0,
           "group_replication_group_name", str,
-          "The value is the same as group_replication_view_change_uuid. Please "
+          "The value is the same as group_replication_view_change_uuid. "
+          "Please "
           "change group_replication_view_change_uuid to AUTOMATIC");
     }
     return 1;
@@ -3337,11 +3493,11 @@
 
   if (plugin_is_group_replication_running()) {
     mysql_mutex_unlock(&lv.plugin_running_mutex);
-    my_message(
-        ER_GROUP_REPLICATION_RUNNING,
-        "The group_replication_communication_max_message_size option cannot be "
-        "set while Group Replication is running",
-        MYF(0));
+    my_message(ER_GROUP_REPLICATION_RUNNING,
+               "The group_replication_communication_max_message_size option "
+               "cannot be "
+               "set while Group Replication is running",
+               MYF(0));
     return 1;
   }
 
@@ -3432,11 +3588,11 @@
   value->val_int(value, &in_val);
 
   if (plugin_is_group_replication_running()) {
-    my_message(
-        ER_GROUP_REPLICATION_RUNNING,
-        "The group_replication_gtid_assignment_block size cannot be set while "
-        "Group Replication is running",
-        MYF(0));
+    my_message(ER_GROUP_REPLICATION_RUNNING,
+               "The group_replication_gtid_assignment_block size cannot be "
+               "set while "
+               "Group Replication is running",
+               MYF(0));
     return 1;
   }
 
@@ -3522,7 +3678,8 @@
     my_message(
         ER_GROUP_REPLICATION_RUNNING,
         "Cannot modify group replication mode by changing "
-        "group_replication_single_primary_mode system variable. Please use the "
+        "group_replication_single_primary_mode system variable. Please use "
+        "the "
         "group_replication_switch_to_single_primary_mode([member_uuid]) OR "
         "group_replication_switch_to_multi_primary_mode() UDF.",
         MYF(0));
@@ -3984,6 +4141,22 @@
   mysql_mutex_unlock(&lv.plugin_running_mutex);
 }
 
+static void update_allow_single_leader(MYSQL_THD, SYS_VAR *, void *var_ptr,
+                                       const void *save) {
+  DBUG_TRACE;
+
+  if (plugin_is_group_replication_running()) {
+    lv.allow_single_leader_latch.first = true;
+  } else {
+    lv.allow_single_leader_latch.first = false;
+  }
+
+  lv.allow_single_leader_latch.second = ov.allow_single_leader_var;
+  bool allow_single_leader = *static_cast<const bool *>(save);
+  *static_cast<bool *>(var_ptr) = allow_single_leader;
+  ov.allow_single_leader_var = allow_single_leader;
+}
+
 // Base plugin variables
 
 static MYSQL_SYSVAR_STR(group_name,        /* name */
@@ -4022,7 +4195,8 @@
     ov.group_seeds_var, /* var */
     PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_MEMALLOC |
         PLUGIN_VAR_PERSIST_AS_READ_ONLY, /* optional var | malloc string*/
-    "The list of group seeds, comma separated. E.g., host1:port1,host2:port2.",
+    "The list of group seeds, comma separated. E.g., "
+    "host1:port1,host2:port2.",
     nullptr, /* check func*/
     nullptr, /* update func*/
     "");     /* default*/
@@ -4184,7 +4358,8 @@
     ov.recovery_ssl_key_var, /* var */
     PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_MEMALLOC |
         PLUGIN_VAR_PERSIST_AS_READ_ONLY, /* optional var | malloc string*/
-    "The name of the SSL key file to use for establishing a secure connection.",
+    "The name of the SSL key file to use for establishing a secure "
+    "connection.",
     check_recovery_ssl_option,  /* check func*/
     update_recovery_ssl_option, /* update func*/
     "");                        /* default*/
@@ -4310,11 +4485,12 @@
     components_stop_timeout,                               /* name */
     ov.components_stop_timeout_var,                        /* var */
     PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_PERSIST_AS_READ_ONLY, /* optional var */
-    "Timeout in seconds that the plugin waits for each of the components when "
+    "Timeout in seconds that the plugin waits for each of the components "
+    "when "
     "shutting down.",
     check_sysvar_ulong_timeout, /* check func. */
     update_component_timeout,   /* update func. */
-    LONG_TIMEOUT,               /* default */
+    300,                        /* default */
     2,                          /* min */
     LONG_TIMEOUT,               /* max */
     0                           /* block */
@@ -4529,7 +4705,8 @@
     ov.communication_debug_options_var, /* var */
     PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_MEMALLOC |
         PLUGIN_VAR_PERSIST_AS_READ_ONLY, /* optional var | malloc string */
-    "The set of debug options, comma separated. E.g., DEBUG_BASIC, DEBUG_ALL.",
+    "The set of debug options, comma separated. E.g., DEBUG_BASIC, "
+    "DEBUG_ALL.",
     check_communication_debug_options, /* check func */
     nullptr,                           /* update func */
     "GCS_DEBUG_NONE"                   /* default */
@@ -4565,7 +4742,8 @@
     unreachable_majority_timeout,                          /* name */
     ov.timeout_on_unreachable_var,                         /* var */
     PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_PERSIST_AS_READ_ONLY, /* optional var */
-    "The number of seconds before going into error when a majority of members "
+    "The number of seconds before going into error when a majority of "
+    "members "
     "is unreachable."
     "If 0 there is no action taken.",
     check_sysvar_ulong_timeout, /* check func. */
@@ -4694,7 +4872,8 @@
     clone_threshold,                                       /* name */
     ov.clone_threshold_var,                                /* var */
     PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_PERSIST_AS_READ_ONLY, /* optional var */
-    "The number of missing transactions in a joining member needed to execute "
+    "The number of missing transactions in a joining member needed to "
+    "execute "
     "the clone procedure.",
     check_clone_threshold,  /* check func. */
     update_clone_threshold, /* update func. */
@@ -4728,6 +4907,17 @@
     0                                       /* block */
 );
 
+static MYSQL_SYSVAR_BOOL(
+    paxos_single_leader,                                   /* name */
+    ov.allow_single_leader_var,                            /* var */
+    PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_PERSIST_AS_READ_ONLY, /* optional var */
+    "Enables or disables the usage of a single consensus leader when running "
+    "the group in Single-Primary mode.",
+    nullptr,                    /* check func. */
+    update_allow_single_leader, /* update func*/
+    0                           /* default */
+);
+
 static int check_advertise_recovery_endpoints(MYSQL_THD thd, SYS_VAR *,
                                               void *save,
                                               struct st_mysql_value *value) {
@@ -4831,7 +5021,8 @@
           mysql_runtime_error_service,
           ER_WRONG_VALUE_FOR_VAR_PLUS_ACTIONABLE_PART, 0,
           "group_replication_view_change_uuid", str,
-          "The value is already used for ASSIGN_GTIDS_TO_ANOYMOUS_TRANSACTIONS "
+          "The value is already used for "
+          "ASSIGN_GTIDS_TO_ANOYMOUS_TRANSACTIONS "
           "in a server channel");
     }
     return 1;
@@ -4895,6 +5086,19 @@
     nullptr,                /* update func*/
     "AUTOMATIC");           /* default*/
 
+static MYSQL_SYSVAR_ENUM(
+    communication_stack,                                   /* name */
+    ov.communication_stack_var,                            /* var */
+    PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_PERSIST_AS_READ_ONLY, /* optional var */
+    "Selects the group replication protocol stack to "
+    "use : Legacy XCom or MySQL.This option only takes effect after a group "
+    "replication restart. Default: XCom",
+    nullptr,                                 /* check func. */
+    nullptr,                                 /* update func. */
+    XCOM_PROTOCOL,                           /* default */
+    &ov.communication_stack_values_typelib_t /* type lib */
+);
+
 static SYS_VAR *group_replication_system_vars[] = {
     MYSQL_SYSVAR(group_name),
     MYSQL_SYSVAR(start_on_boot),
@@ -4954,6 +5158,8 @@
     MYSQL_SYSVAR(advertise_recovery_endpoints),
     MYSQL_SYSVAR(tls_source),
     MYSQL_SYSVAR(view_change_uuid),
+    MYSQL_SYSVAR(communication_stack),
+    MYSQL_SYSVAR(paxos_single_leader),
     nullptr,
 };
 
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/plugin_handlers/consensus_leaders_handler.cc mysql-8.0-8.0.27/plugin/group_replication/src/plugin_handlers/consensus_leaders_handler.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/plugin_handlers/consensus_leaders_handler.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/plugin_handlers/consensus_leaders_handler.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,136 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include "plugin/group_replication/include/plugin_handlers/consensus_leaders_handler.h"
+#include "plugin/group_replication/include/member_info.h"
+#include "plugin/group_replication/include/member_version.h"
+#include "plugin/group_replication/include/mysql_version_gcs_protocol_map.h"
+#include "plugin/group_replication/include/plugin.h"
+#include "plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_member_identifier.h"
+
+/**
+ * @brief First member version where we have XCom's single leader
+ */
+/// @cond
+Member_version const Consensus_leaders_handler::
+    s_first_protocol_with_support_for_consensus_leaders{0x080027};
+/// @endcond
+
+Consensus_leaders_handler::Consensus_leaders_handler(
+    Group_events_observation_manager &group_events_manager)
+    : m_group_events_manager(group_events_manager) {
+  m_group_events_manager.register_group_event_observer(this);
+}
+
+Consensus_leaders_handler::~Consensus_leaders_handler() {
+  m_group_events_manager.unregister_group_event_observer(this);
+}
+
+int Consensus_leaders_handler::after_view_change(
+    const std::vector<Gcs_member_identifier> & /*joining*/,
+    const std::vector<Gcs_member_identifier> & /*leaving*/,
+    const std::vector<Gcs_member_identifier> & /*group*/, bool /*is_leaving*/,
+    bool * /*skip_election*/, enum_primary_election_mode * /*election_mode*/,
+    std::string & /*suggested_primary*/) {
+  return 0;
+}
+
+int Consensus_leaders_handler::after_primary_election(
+    std::string primary_uuid, bool primary_changed,
+    enum_primary_election_mode /*election_mode*/, int error) {
+  bool const successful_election =
+      (error == 0 && primary_changed && !primary_uuid.empty() &&
+       group_member_mgr->is_member_info_present(primary_uuid));
+
+  if (successful_election) {
+    Member_version const communication_protocol =
+        convert_to_mysql_version(gcs_module->get_protocol_version());
+
+    Group_member_info *new_primary_info =
+        group_member_mgr->get_group_member_info(primary_uuid);
+    Gcs_member_identifier const new_primary_gcs_id =
+        new_primary_info->get_gcs_member_id();
+    Gcs_member_identifier const my_gcs_id =
+        local_member_info->get_gcs_member_id();
+    bool const i_am_the_new_primary = (new_primary_gcs_id == my_gcs_id);
+    auto role = i_am_the_new_primary ? Group_member_info::MEMBER_ROLE_PRIMARY
+                                     : Group_member_info::MEMBER_ROLE_SECONDARY;
+    set_consensus_leaders(communication_protocol, true, role, my_gcs_id);
+
+    delete new_primary_info;
+  }
+
+  return 0;
+}
+
+int Consensus_leaders_handler::before_message_handling(
+    const Plugin_gcs_message & /*message*/,
+    const std::string & /*message_origin*/, bool * /*skip_message*/) {
+  return 0;
+}
+
+void Consensus_leaders_handler::set_consensus_leaders(
+    Member_version const &communication_protocol, bool is_single_primary_mode,
+    Group_member_info::Group_member_role role,
+    Gcs_member_identifier const &my_gcs_id) {
+  if (!get_allow_single_leader()) return;
+
+  bool const support_single_consensus_leader =
+      (communication_protocol >=
+       s_first_protocol_with_support_for_consensus_leaders);
+
+  if (support_single_consensus_leader && is_single_primary_mode) {
+    if (role == Group_member_info::MEMBER_ROLE_PRIMARY) {
+      set_as_single_consensus_leader(my_gcs_id);
+    }
+  } else {
+    set_everyone_as_consensus_leader();
+  }
+}
+
+void Consensus_leaders_handler::set_as_single_consensus_leader(
+    Gcs_member_identifier const &leader) const {
+  Group_member_info *leader_info =
+      group_member_mgr->get_group_member_info_by_member_id(leader);
+
+  enum enum_gcs_error error_code = gcs_module->set_leader(leader);
+  if (error_code == GCS_OK) {
+    LogPluginErr(SYSTEM_LEVEL, ER_GRP_RPL_SET_SINGLE_CONSENSUS_LEADER,
+                 leader_info->get_hostname().c_str(), leader_info->get_port(),
+                 leader_info->get_uuid().c_str());
+  } else {
+    LogPluginErr(ERROR_LEVEL, ER_GRP_RPL_ERROR_SET_SINGLE_CONSENSUS_LEADER,
+                 leader_info->get_hostname().c_str(), leader_info->get_port(),
+                 leader_info->get_uuid().c_str());
+  }
+
+  if (leader_info) delete leader_info;
+}
+
+void Consensus_leaders_handler::set_everyone_as_consensus_leader() const {
+  enum enum_gcs_error error_code = gcs_module->set_everyone_leader();
+  if (error_code == GCS_OK) {
+    LogPluginErr(SYSTEM_LEVEL, ER_GRP_RPL_SET_MULTI_CONSENSUS_LEADER);
+  } else {
+    LogPluginErr(ERROR_LEVEL, ER_GRP_RPL_ERROR_SET_MULTI_CONSENSUS_LEADER);
+  }
+}
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/plugin_handlers/group_partition_handling.cc mysql-8.0-8.0.27/plugin/group_replication/src/plugin_handlers/group_partition_handling.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/plugin_handlers/group_partition_handling.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/plugin_handlers/group_partition_handling.cc	2021-09-28 11:46:34.000000000 +0000
@@ -232,11 +232,11 @@
   ph_thd->release_resources();
   global_thd_manager_remove_thd(ph_thd);
   delete ph_thd;
+  my_thread_end();
   group_partition_thd_state.set_terminated();
   mysql_cond_broadcast(&run_cond);
   mysql_mutex_unlock(&run_lock);
 
-  my_thread_end();
   my_thread_exit(nullptr);
 
   return 0;
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/plugin_handlers/member_actions_handler.cc mysql-8.0-8.0.27/plugin/group_replication/src/plugin_handlers/member_actions_handler.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/plugin_handlers/member_actions_handler.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/plugin_handlers/member_actions_handler.cc	2021-09-28 11:46:34.000000000 +0000
@@ -52,7 +52,10 @@
 
   // Create worker thread.
   assert(nullptr == m_mysql_thread);
-  m_mysql_thread = new Mysql_thread(this);
+  m_mysql_thread = new Mysql_thread(
+      key_GR_THD_mysql_thread, key_GR_LOCK_mysql_thread_run,
+      key_GR_COND_mysql_thread_run, key_GR_LOCK_mysql_thread_dispatcher_run,
+      key_GR_COND_mysql_thread_dispatcher_run);
   if (m_mysql_thread->initialize()) {
     return true; /* purecov: inspected */
   }
@@ -293,9 +296,10 @@
   DBUG_TRACE;
   assert(local_member_info->in_primary_mode());
 
-  Member_actions_trigger_parameters *parameters =
-      new Member_actions_trigger_parameters(event);
-  m_mysql_thread->trigger(parameters);
+  Mysql_thread_task *task =
+      new Mysql_thread_task(this, new Member_actions_trigger_parameters(event));
+  m_mysql_thread->trigger(task);
+  delete task;
 }
 
 void Member_actions_handler::run(Mysql_thread_body_parameters *parameters) {
@@ -309,7 +313,6 @@
          trigger_parameters->get_event());
   const std::string event =
       Member_actions::get_event_name(trigger_parameters->get_event());
-  delete trigger_parameters;
 
   // Get the actions for the event.
   protobuf_replication_group_member_actions::ActionList action_list;
@@ -385,5 +388,11 @@
     }
   }
 
+  if (action.name() == "mysql_start_failover_channels_if_primary") {
+    if (im_the_primary) {
+      return start_failover_channels();
+    }
+  }
+
   return error;
 }
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/plugin_handlers/member_actions_handler_configuration.cc mysql-8.0-8.0.27/plugin/group_replication/src/plugin_handlers/member_actions_handler_configuration.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/plugin_handlers/member_actions_handler_configuration.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/plugin_handlers/member_actions_handler_configuration.cc	2021-09-28 11:46:34.000000000 +0000
@@ -423,5 +423,14 @@
   action1->set_priority(1);
   action1->set_error_handling("IGNORE");
 
+  protobuf_replication_group_member_actions::Action *action2 =
+      action_list.add_action();
+  action2->set_name("mysql_start_failover_channels_if_primary");
+  action2->set_event("AFTER_PRIMARY_ELECTION");
+  action2->set_enabled(1);
+  action2->set_type("INTERNAL");
+  action2->set_priority(10);
+  action2->set_error_handling("CRITICAL");
+
   return replace_all_actions(action_list);
 }
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/plugin_handlers/primary_election_invocation_handler.cc mysql-8.0-8.0.27/plugin/group_replication/src/plugin_handlers/primary_election_invocation_handler.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/plugin_handlers/primary_election_invocation_handler.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/plugin_handlers/primary_election_invocation_handler.cc	2021-09-28 11:46:34.000000000 +0000
@@ -24,6 +24,7 @@
 #include "plugin/group_replication/include/plugin.h"
 #include "plugin/group_replication/include/plugin_handlers/member_actions_handler.h"
 #include "plugin/group_replication/include/plugin_handlers/primary_election_utils.h"
+#include "plugin/group_replication/include/services/get_system_variable/get_system_variable.h"
 
 Primary_election_handler::Primary_election_handler(
     ulong components_stop_timeout)
@@ -213,16 +214,9 @@
   Replication_thread_api applier_channel("group_replication_applier");
   std::string applier_retrieved_gtids;
   std::string server_executed_gtids;
-  Sql_service_command_interface *sql_command_interface =
-      new Sql_service_command_interface();
-  if (sql_command_interface->establish_session_connection(
-          PSESSION_DEDICATED_THREAD, GROUPREPL_USER, get_plugin_pointer())) {
-    /* purecov: begin inspected */
-    LogPluginErr(WARNING_LEVEL, ER_GRP_RPL_CONN_INTERNAL_PLUGIN_FAIL);
-    goto err;
-    /* purecov: end */
-  }
-  if (sql_command_interface->get_server_gtid_executed(server_executed_gtids)) {
+  Get_system_variable *get_system_variable = new Get_system_variable();
+
+  if (get_system_variable->get_server_gtid_executed(server_executed_gtids)) {
     /* purecov: begin inspected */
     LogPluginErr(WARNING_LEVEL, ER_GRP_RPL_GTID_EXECUTED_EXTRACT_ERROR);
     goto err;
@@ -241,7 +235,7 @@
                "applier channel received_transaction_set",
                applier_retrieved_gtids.c_str());
 err:
-  delete sql_command_interface;
+  delete get_system_variable;
 }
 
 int Primary_election_handler::internal_primary_election(
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/plugin_handlers/primary_election_primary_process.cc mysql-8.0-8.0.27/plugin/group_replication/src/plugin_handlers/primary_election_primary_process.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/plugin_handlers/primary_election_primary_process.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/plugin_handlers/primary_election_primary_process.cc	2021-09-28 11:46:34.000000000 +0000
@@ -160,8 +160,16 @@
   stage_handler->set_stage(
       info_GR_STAGE_primary_election_buffered_transactions.m_key, __FILE__,
       __LINE__, 1, 0);
+  /*
+   Force primary_change to fail.
+   This is needed so that we move to applier suspension.
+   Maybe this fail will automatically happen during shutdown in real scenario
+  */
+  DBUG_EXECUTE_IF("group_replication_wait_for_current_events_execution_fail",
+                  { error = 1; };);
   if (election_mode != SAFE_OLD_PRIMARY) {
-    if (applier_module->wait_for_current_events_execution(
+    if (error ||
+        applier_module->wait_for_current_events_execution(
             applier_checkpoint_condition, &election_process_aborted, false)) {
       error = 1;
       err_msg.assign("Could not wait for the execution of local transactions.");
@@ -196,6 +204,8 @@
       Group changed from multi to single-primary mode, the elected primary
       member actions configuration will override all other members
       configuration.
+      Replication failover channels configuration will also override all
+      other members configuration.
     */
     if (SAFE_OLD_PRIMARY == election_mode) {
       if (member_actions_handler
@@ -208,6 +218,17 @@
             "'mysql.replication_group_configuration_version'.");
         goto end;
       }
+      if (force_my_replication_failover_channels_configuration_on_all_members()) {
+        error = 7;
+        err_msg.assign(
+            "Unable to read or send the replication failover channels "
+            "configuration during group change from multi to single-primary "
+            "mode. Please check the tables "
+            "'mysql.replication_asynchronous_connection_failover', "
+            "'mysql.replication_asynchronous_connection_failover_managed' and "
+            "'mysql.replication_group_configuration_version'.");
+        goto end;
+      }
     }
 
     /*
@@ -344,17 +365,17 @@
   global_thd_manager_remove_thd(thd);
   delete thd;
 
+  Gcs_interface_factory::cleanup_thread_communication_resources(
+      Gcs_operations::get_gcs_engine());
+
+  my_thread_end();
+
   mysql_mutex_lock(&election_lock);
   election_process_thd_state.set_terminated();
   election_process_ending = false;
   mysql_cond_broadcast(&election_cond);
   mysql_mutex_unlock(&election_lock);
 
-  Gcs_interface_factory::cleanup_thread_communication_resources(
-      Gcs_operations::get_gcs_engine());
-
-  my_thread_end();
-
   return error;
 }
 
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/plugin_handlers/primary_election_secondary_process.cc mysql-8.0-8.0.27/plugin/group_replication/src/plugin_handlers/primary_election_secondary_process.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/plugin_handlers/primary_election_secondary_process.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/plugin_handlers/primary_election_secondary_process.cc	2021-09-28 11:46:34.000000000 +0000
@@ -244,16 +244,16 @@
   global_thd_manager_remove_thd(thd);
   delete thd;
 
-  mysql_mutex_lock(&election_lock);
-  election_process_thd_state.set_terminated();
-  mysql_cond_broadcast(&election_cond);
-  mysql_mutex_unlock(&election_lock);
-
   Gcs_interface_factory::cleanup_thread_communication_resources(
       Gcs_operations::get_gcs_engine());
 
   my_thread_end();
 
+  mysql_mutex_lock(&election_lock);
+  election_process_thd_state.set_terminated();
+  mysql_cond_broadcast(&election_cond);
+  mysql_mutex_unlock(&election_lock);
+
   return error;
 }
 
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/plugin_handlers/remote_clone_handler.cc mysql-8.0-8.0.27/plugin/group_replication/src/plugin_handlers/remote_clone_handler.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/plugin_handlers/remote_clone_handler.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/plugin_handlers/remote_clone_handler.cc	2021-09-28 11:46:34.000000000 +0000
@@ -836,7 +836,7 @@
 
       if (m_being_terminated) goto thd_end;
 
-      terminate_wait_on_start_process(true);
+      terminate_wait_on_start_process(WAIT_ON_START_PROCESS_ABORT_ON_CLONE);
 
       error = run_clone_query(sql_command_interface, hostname, port, username,
                               password, use_ssl);
@@ -896,10 +896,10 @@
   delete thd;
   m_clone_thd = nullptr;
   thd = nullptr;
+  my_thread_end();
   m_clone_process_thd_state.set_terminated();
   mysql_cond_broadcast(&m_run_cond);
   mysql_mutex_unlock(&m_run_lock);
 
-  my_thread_end();
   my_thread_exit(nullptr);
 }
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/plugin_observers/group_event_observer.cc mysql-8.0-8.0.27/plugin/group_replication/src/plugin_observers/group_event_observer.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/plugin_observers/group_event_observer.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/plugin_observers/group_event_observer.cc	2021-09-28 11:46:34.000000000 +0000
@@ -126,4 +126,4 @@
   unlock_observer_list();
 
   return error;
-}
\ No newline at end of file
+}
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/plugin_psi.cc mysql-8.0-8.0.27/plugin/group_replication/src/plugin_psi.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/plugin_psi.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/plugin_psi.cc	2021-09-28 11:46:34.000000000 +0000
@@ -79,7 +79,10 @@
     key_GR_LOCK_wait_ticket,
     key_GR_LOCK_write_lock_protection,
     key_GR_LOCK_mysql_thread_run,
-    key_GR_LOCK_mysql_thread_dispatcher_run;
+    key_GR_LOCK_mysql_thread_dispatcher_run,
+    key_GR_LOCK_connection_map,
+    key_GR_LOCK_mysql_thread_handler_run,
+    key_GR_LOCK_mysql_thread_handler_dispatcher_run;
 
 PSI_cond_key key_GR_COND_applier_module_run,
     key_GR_COND_applier_module_suspend,
@@ -115,7 +118,9 @@
     key_GR_COND_wait_ticket,
     key_GR_COND_write_lock_protection,
     key_GR_COND_mysql_thread_run,
-    key_GR_COND_mysql_thread_dispatcher_run;
+    key_GR_COND_mysql_thread_dispatcher_run,
+    key_GR_COND_mysql_thread_handler_run,
+    key_GR_COND_mysql_thread_handler_dispatcher_run;
 
 PSI_thread_key key_GR_THD_applier_module_receiver,
     key_GR_THD_autorejoin,
@@ -129,7 +134,8 @@
     key_GR_THD_group_partition_handler,
     key_GR_THD_recovery,
     key_GR_THD_message_service_handler,
-    key_GR_THD_mysql_thread;
+    key_GR_THD_mysql_thread,
+    key_GR_THD_mysql_thread_handler;
 
 PSI_rwlock_key key_GR_RWLOCK_cert_stable_gtid_set,
     key_GR_RWLOCK_channel_observation_list,
@@ -343,6 +349,13 @@
      0, PSI_DOCUMENT_ME},
     {&key_GR_LOCK_mysql_thread_dispatcher_run,
      "LOCK_mysql_thread_dispatcher_run", PSI_FLAG_SINGLETON, 0,
+     PSI_DOCUMENT_ME},
+    {&key_GR_LOCK_connection_map, "LOCK_connection_map", PSI_FLAG_SINGLETON, 0,
+     PSI_DOCUMENT_ME},
+    {&key_GR_LOCK_mysql_thread_handler_run, "LOCK_mysql_handler_thread_run",
+     PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME},
+    {&key_GR_LOCK_mysql_thread_handler_dispatcher_run,
+     "LOCK_mysql_thread_handler_dispatcher_run", PSI_FLAG_SINGLETON, 0,
      PSI_DOCUMENT_ME}};
 
 static PSI_cond_info all_group_replication_psi_condition_keys[] = {
@@ -430,32 +443,37 @@
 
 static PSI_thread_info all_group_replication_psi_thread_keys[] = {
     {&key_GR_THD_applier_module_receiver, "THD_applier_module_receiver",
+     "gr_apply", PSI_FLAG_SINGLETON | PSI_FLAG_THREAD_SYSTEM, 0,
+     PSI_DOCUMENT_ME},
+    {&key_GR_THD_cert_broadcast, "THD_certifier_broadcast", "gr_certif",
      PSI_FLAG_SINGLETON | PSI_FLAG_THREAD_SYSTEM, 0, PSI_DOCUMENT_ME},
-    {&key_GR_THD_cert_broadcast, "THD_certifier_broadcast",
-     PSI_FLAG_SINGLETON | PSI_FLAG_THREAD_SYSTEM, 0, PSI_DOCUMENT_ME},
-    {&key_GR_THD_clone_thd, "THD_clone_process",
+    {&key_GR_THD_clone_thd, "THD_clone_process", "gr_clone",
      PSI_FLAG_SINGLETON | PSI_FLAG_THREAD_SYSTEM, 0, PSI_DOCUMENT_ME},
-    {&key_GR_THD_delayed_init, "THD_delayed_initialization",
+    {&key_GR_THD_delayed_init, "THD_delayed_initialization", "gr_delayed",
      PSI_FLAG_SINGLETON | PSI_FLAG_THREAD_SYSTEM, 0, PSI_DOCUMENT_ME},
     {&key_GR_THD_group_action_coordinator, "THD_group_action_coordinator",
-     PSI_FLAG_SINGLETON | PSI_FLAG_THREAD_SYSTEM, 0, PSI_DOCUMENT_ME},
-    {&key_GR_THD_plugin_session, "THD_plugin_server_session",
-     PSI_FLAG_SINGLETON | PSI_FLAG_THREAD_SYSTEM, 0, PSI_DOCUMENT_ME},
+     "gr_coord", PSI_FLAG_SINGLETON | PSI_FLAG_THREAD_SYSTEM, 0,
+     PSI_DOCUMENT_ME},
+    {&key_GR_THD_plugin_session, "THD_plugin_server_session", "gr_version",
+     PSI_FLAG_THREAD_SYSTEM, 0, PSI_DOCUMENT_ME},
     {&key_GR_THD_primary_election_primary_process,
-     "THD_primary_election_primary_process",
+     "THD_primary_election_primary_process", "gr_pri_elect",
      PSI_FLAG_SINGLETON | PSI_FLAG_THREAD_SYSTEM, 0, PSI_DOCUMENT_ME},
     {&key_GR_THD_primary_election_secondary_process,
-     "THD_primary_election_secondary_process",
+     "THD_primary_election_secondary_process", "gr_sec_elect",
      PSI_FLAG_SINGLETON | PSI_FLAG_THREAD_SYSTEM, 0, PSI_DOCUMENT_ME},
     {&key_GR_THD_group_partition_handler, "THD_group_partition_handler",
+     "gr_partition", PSI_FLAG_SINGLETON | PSI_FLAG_THREAD_SYSTEM, 0,
+     PSI_DOCUMENT_ME},
+    {&key_GR_THD_recovery, "THD_recovery", "gr_recover",
      PSI_FLAG_SINGLETON | PSI_FLAG_THREAD_SYSTEM, 0, PSI_DOCUMENT_ME},
-    {&key_GR_THD_recovery, "THD_recovery",
-     PSI_FLAG_SINGLETON | PSI_FLAG_THREAD_SYSTEM, 0, PSI_DOCUMENT_ME},
-    {&key_GR_THD_autorejoin, "THD_autorejoin",
+    {&key_GR_THD_autorejoin, "THD_autorejoin", "gr_rejoin",
      PSI_FLAG_SINGLETON | PSI_FLAG_THREAD_SYSTEM, 0, PSI_DOCUMENT_ME},
     {&key_GR_THD_message_service_handler, "THD_message_service_handler",
+     "gr_msg", PSI_FLAG_SINGLETON | PSI_FLAG_THREAD_SYSTEM, 0, PSI_DOCUMENT_ME},
+    {&key_GR_THD_mysql_thread, "THD_mysql_thread", "gr_mysql",
      PSI_FLAG_SINGLETON | PSI_FLAG_THREAD_SYSTEM, 0, PSI_DOCUMENT_ME},
-    {&key_GR_THD_mysql_thread, "THD_mysql_thread",
+    {&key_GR_THD_mysql_thread_handler, "THD_mysql_thread_handler", "gr_handler",
      PSI_FLAG_SINGLETON | PSI_FLAG_THREAD_SYSTEM, 0, PSI_DOCUMENT_ME}};
 
 static PSI_rwlock_info all_group_replication_psi_rwlock_keys[] = {
@@ -543,9 +561,9 @@
   mysql_rwlock_register(category, keys, static_cast<int>(count));
 }
 
-void register_group_replication_stage_psi_keys(
-    PSI_stage_info **keys MY_ATTRIBUTE((unused)),
-    size_t count MY_ATTRIBUTE((unused))) {
+void register_group_replication_stage_psi_keys(PSI_stage_info **keys
+                                               [[maybe_unused]],
+                                               size_t count [[maybe_unused]]) {
 #ifdef HAVE_PSI_STAGE_INTERFACE
   const char *category = "group_rpl";
   mysql_stage_register(category, keys, static_cast<int>(count));
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/ps_information.cc mysql-8.0-8.0.27/plugin/group_replication/src/ps_information.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/ps_information.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/ps_information.cc	2021-09-28 11:46:34.000000000 +0000
@@ -32,7 +32,7 @@
 bool get_group_members_info(
     uint index, const GROUP_REPLICATION_GROUP_MEMBERS_CALLBACKS &callbacks,
     Group_member_info_manager_interface *group_member_manager,
-    char *channel_name) {
+    Gcs_operations *gcs_module, char *channel_name) {
   if (channel_name != nullptr) {
     callbacks.set_channel_name(callbacks.context, *channel_name,
                                strlen(channel_name));
@@ -114,6 +114,24 @@
   callbacks.set_member_version(callbacks.context, *member_version.c_str(),
                                member_version.length());
 
+  enum_transport_protocol incoming_connection_protocol_value = INVALID_PROTOCOL;
+  if (gcs_module == nullptr || (local_member_info->get_recovery_status() ==
+                                Group_member_info::MEMBER_OFFLINE)) {
+    // use the value that is present in the variable
+    incoming_connection_protocol_value =
+        static_cast<enum_transport_protocol>(get_communication_stack_var());
+  } else {
+    incoming_connection_protocol_value =
+        gcs_module->get_current_incoming_connections_protocol();
+  }
+
+  const char *incoming_connection_protocol =
+      Communication_stack_to_string::to_string(
+          incoming_connection_protocol_value);
+  callbacks.set_member_incoming_communication_protocol(
+      callbacks.context, *incoming_connection_protocol,
+      strlen(incoming_connection_protocol));
+
   delete member_info;
 
   return false;
@@ -160,6 +178,13 @@
   std::string uuid(member_info->get_uuid());
   callbacks.set_member_id(callbacks.context, *uuid.c_str(), uuid.length());
 
+  if (nullptr == local_member_info ||
+      local_member_info->get_recovery_status() ==
+          Group_member_info::MEMBER_OFFLINE) {
+    delete member_info;
+    return false;
+  }
+
   // Retrieve view information
   Gcs_view *view = gcs_module->get_current_view();
   if (view != nullptr) {
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/recovery.cc mysql-8.0-8.0.27/plugin/group_replication/src/recovery.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/recovery.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/recovery.cc	2021-09-28 11:46:34.000000000 +0000
@@ -309,6 +309,20 @@
   */
   if (!recovery_aborted) applier_module->awake_applier_module();
 
+#ifndef NDEBUG
+  DBUG_EXECUTE_IF(
+      "recovery_thread_wait_before_wait_for_applier_module_recovery", {
+        const char act[] =
+            "now signal "
+            "signal.recovery_thread_wait_before_wait_for_applier_module_"
+            "recovery "
+            "wait_for "
+            "signal.recovery_thread_resume_before_wait_for_applier_module_"
+            "recovery";
+        assert(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
+      });
+#endif  // NDEBUG
+
   error = wait_for_applier_module_recovery();
 
 cleanup:
@@ -347,14 +361,14 @@
 
   recovery_aborted = true;  // to avoid the start missing signals
   delete recovery_thd;
-  recovery_thd_state.set_terminated();
-  mysql_cond_broadcast(&run_cond);
-  mysql_mutex_unlock(&run_lock);
 
   Gcs_interface_factory::cleanup_thread_communication_resources(
       Gcs_operations::get_gcs_engine());
 
   my_thread_end();
+  recovery_thd_state.set_terminated();
+  mysql_cond_broadcast(&run_cond);
+  mysql_mutex_unlock(&run_lock);
   my_thread_exit(nullptr);
 
   return error; /* purecov: inspected */
@@ -527,6 +541,13 @@
       !recovery_aborted)
     return 1; /* purecov: inspected */
 
+  /*
+    Take View_change_log_event transaction into account, that
+    despite being queued on applier channel was applied through
+    recovery channel.
+  */
+  pipeline_stats->decrement_transactions_waiting_apply();
+
   return 0;
 }
 
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/recovery_state_transfer.cc mysql-8.0-8.0.27/plugin/group_replication/src/recovery_state_transfer.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/recovery_state_transfer.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/recovery_state_transfer.cc	2021-09-28 11:46:34.000000000 +0000
@@ -30,7 +30,6 @@
 #include "plugin/group_replication/include/plugin.h"
 #include "plugin/group_replication/include/plugin_psi.h"
 #include "plugin/group_replication/include/plugin_server_include.h"
-#include "plugin/group_replication/include/plugin_variables.h"
 #include "plugin/group_replication/include/plugin_variables/recovery_endpoints.h"
 #include "plugin/group_replication/include/recovery_channel_state_observer.h"
 #include "plugin/group_replication/include/recovery_state_transfer.h"
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/replication_threads_api.cc mysql-8.0-8.0.27/plugin/group_replication/src/replication_threads_api.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/replication_threads_api.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/replication_threads_api.cc	2021-09-28 11:46:34.000000000 +0000
@@ -137,8 +137,8 @@
     thread_mask |= CHANNEL_RECEIVER_THREAD;
   }
 
-  int error =
-      channel_start(interface_channel, &info, thread_mask, wait_for_connection);
+  int error = channel_start(interface_channel, &info, thread_mask,
+                            wait_for_connection, true);
 
   if (view_id) {
     delete[] cview_id;
@@ -338,6 +338,20 @@
   }
 
   return (error != 0);
+}
+
+bool Replication_thread_api::get_channel_network_namespace(
+    std::string &net_ns, const char *channel_name) {
+  DBUG_TRACE;
+  const char *name = channel_name ? channel_name : interface_channel;
+
+  int error;
+  error = channel_get_network_namespace(name, net_ns);
+  if (error) {
+    net_ns.clear();
+  }
+
+  return (error != 0);
 }
 
 bool Replication_thread_api::is_partial_transaction_on_relay_log() {
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/services/get_system_variable/get_system_variable.cc mysql-8.0-8.0.27/plugin/group_replication/src/services/get_system_variable/get_system_variable.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/services/get_system_variable/get_system_variable.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/services/get_system_variable/get_system_variable.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,148 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include "plugin/group_replication/include/services/get_system_variable/get_system_variable.h"
+#include "plugin/group_replication/include/plugin.h"
+
+#include "sql/sql_class.h"
+
+// safeguard due unknown gtid_executed or gtid_purged length
+#define GTID_VALUES_FETCH_BUFFER_SIZE 500000
+
+int Get_system_variable_parameters::get_error() { return m_error; }
+
+void Get_system_variable_parameters::set_error(int error) { m_error = error; }
+
+Get_system_variable_parameters::System_variable_service
+Get_system_variable_parameters::get_service() {
+  return m_service;
+}
+
+Get_system_variable::Get_system_variable() {
+  get_plugin_registry()->acquire(
+      "component_sys_variable_register",
+      &component_sys_variable_register_service_handler);
+}
+
+Get_system_variable::~Get_system_variable() {
+  if (component_sys_variable_register_service_handler != nullptr) {
+    get_plugin_registry()->release(
+        component_sys_variable_register_service_handler);
+  }
+}
+
+int Get_system_variable::get_server_gtid_executed(std::string &gtid_executed) {
+  int error = 1;
+
+  if (nullptr == mysql_thread_handler) {
+    return 1;
+  }
+
+  Get_system_variable_parameters *parameter =
+      new Get_system_variable_parameters(
+          Get_system_variable_parameters::VAR_GTID_EXECUTED);
+  Mysql_thread_task *task = new Mysql_thread_task(this, parameter);
+  error = mysql_thread_handler->trigger(task);
+  error |= parameter->get_error();
+
+  if (!error) {
+    gtid_executed.assign(parameter->m_result);
+  }
+
+  delete task;
+  return error;
+}
+
+int Get_system_variable::get_server_gtid_purged(std::string &gtid_purged) {
+  int error = 1;
+
+  if (nullptr == mysql_thread_handler) {
+    return 1;
+  }
+
+  Get_system_variable_parameters *parameter =
+      new Get_system_variable_parameters(
+          Get_system_variable_parameters::VAR_GTID_PURGED);
+  Mysql_thread_task *task = new Mysql_thread_task(this, parameter);
+  error = mysql_thread_handler->trigger(task);
+  error |= parameter->get_error();
+
+  if (!error) {
+    gtid_purged.assign(parameter->m_result);
+  }
+
+  delete task;
+  return error;
+}
+
+void Get_system_variable::run(Mysql_thread_body_parameters *parameters) {
+  Get_system_variable_parameters *param =
+      (Get_system_variable_parameters *)parameters;
+  switch (param->get_service()) {
+    case Get_system_variable_parameters::VAR_GTID_EXECUTED:
+      param->set_error(internal_get_system_variable(
+          std::string("gtid_executed"), param->m_result));
+      break;
+    case Get_system_variable_parameters::VAR_GTID_PURGED:
+      param->set_error(internal_get_system_variable(std::string("gtid_purged"),
+                                                    param->m_result));
+      break;
+    default:
+      param->set_error(1);
+  }
+}
+
+int Get_system_variable::internal_get_system_variable(std::string variable,
+                                                      std::string &value) {
+  SERVICE_TYPE(component_sys_variable_register)
+  *component_sys_variable_register_service{nullptr};
+  char *var_value = nullptr;
+  size_t var_len = GTID_VALUES_FETCH_BUFFER_SIZE;
+  bool error = false;
+
+  if (nullptr == component_sys_variable_register_service_handler) {
+    error = true; /* purecov: inspected */
+    goto end;     /* purecov: inspected */
+  }
+
+  component_sys_variable_register_service =
+      reinterpret_cast<SERVICE_TYPE(component_sys_variable_register) *>(
+          component_sys_variable_register_service_handler);
+
+  if ((var_value = new (std::nothrow) char[var_len + 1]) == nullptr) {
+    error = true; /* purecov: inspected */
+    goto end;     /* purecov: inspected */
+  }
+
+  if (component_sys_variable_register_service->get_variable(
+          "mysql_server", variable.c_str(),
+          reinterpret_cast<void **>(&var_value), &var_len)) {
+    error = true; /* purecov: inspected */
+    goto end;     /* purecov: inspected */
+  }
+
+  value.assign(var_value, var_len);
+
+end:
+  delete[] var_value;
+  return error;
+}
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/services/message_service/message_service.cc mysql-8.0-8.0.27/plugin/group_replication/src/services/message_service/message_service.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/services/message_service/message_service.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/services/message_service/message_service.cc	2021-09-28 11:46:34.000000000 +0000
@@ -154,6 +154,7 @@
   thd->set_new_thread_id();
   thd->thread_stack = (char *)&thd;
   thd->store_globals();
+  thd->set_skip_readonly_check();
   global_thd_manager_add_thd(thd);
 
   mysql_mutex_lock(&m_message_service_run_lock);
@@ -195,13 +196,13 @@
   thd->release_resources();
   global_thd_manager_remove_thd(thd);
   delete thd;
+  my_thread_end();
 
   mysql_mutex_lock(&m_message_service_run_lock);
   m_message_service_thd_state.set_terminated();
   mysql_cond_broadcast(&m_message_service_run_cond);
   mysql_mutex_unlock(&m_message_service_run_lock);
 
-  my_thread_end();
   my_thread_exit(nullptr);
 }
 
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/services/status_service/status_service.cc mysql-8.0-8.0.27/plugin/group_replication/src/services/status_service/status_service.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/services/status_service/status_service.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/services/status_service/status_service.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,114 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include "plugin/group_replication/include/services/status_service/status_service.h"
+#include <mysql/components/my_service.h>
+#include <mysql/components/services/group_replication_status_service.h>
+#include <mysql/components/services/registry.h>
+#include "plugin/group_replication/include/plugin.h"
+#include "plugin/group_replication/include/udf/udf_utils.h"
+
+namespace gr {
+namespace status_service {
+
+bool is_group_in_single_primary_mode_internal() {
+  DBUG_TRACE;
+
+  if (!plugin_is_group_replication_running()) return false;
+
+  if (nullptr == local_member_info) return false;
+
+  const Group_member_info::Group_member_status member_status =
+      local_member_info->get_recovery_status();
+  if (member_status != Group_member_info::MEMBER_ONLINE &&
+      member_status != Group_member_info::MEMBER_IN_RECOVERY) {
+    return false;
+  }
+
+  return local_member_info->in_primary_mode();
+}
+
+/*
+ Service implementation.
+*/
+DEFINE_BOOL_METHOD(gr_status_service_is_group_in_single_primary_mode, ()) {
+  DBUG_TRACE;
+  return is_group_in_single_primary_mode_internal();
+}
+
+DEFINE_BOOL_METHOD(
+    gr_status_service_is_group_in_single_primary_mode_and_im_the_primary, ()) {
+  DBUG_TRACE;
+  return (is_group_in_single_primary_mode_internal() &&
+          local_member_info->get_role() ==
+              Group_member_info::MEMBER_ROLE_PRIMARY);
+}
+
+DEFINE_BOOL_METHOD(
+    gr_status_service_is_group_in_single_primary_mode_and_im_a_secondary, ()) {
+  DBUG_TRACE;
+  return (is_group_in_single_primary_mode_internal() &&
+          local_member_info->get_role() ==
+              Group_member_info::MEMBER_ROLE_SECONDARY);
+}
+
+DEFINE_BOOL_METHOD(gr_status_service_is_member_online_with_group_majority, ()) {
+  DBUG_TRACE;
+  return member_online_with_majority();
+}
+
+BEGIN_SERVICE_IMPLEMENTATION(group_replication,
+                             group_replication_status_service_v1)
+gr_status_service_is_group_in_single_primary_mode,
+    gr_status_service_is_group_in_single_primary_mode_and_im_the_primary,
+    gr_status_service_is_group_in_single_primary_mode_and_im_a_secondary,
+    gr_status_service_is_member_online_with_group_majority,
+    END_SERVICE_IMPLEMENTATION();
+
+/*
+ Service registration.
+*/
+bool register_gr_status_service() {
+  DBUG_TRACE;
+
+  my_service<SERVICE_TYPE(registry_registration)> reg("registry_registration",
+                                                      get_plugin_registry());
+  using group_replication_status_service_v1_t =
+      SERVICE_TYPE_NO_CONST(group_replication_status_service_v1);
+  return reg->register_service(
+      "group_replication_status_service_v1.group_replication",
+      reinterpret_cast<my_h_service>(
+          const_cast<group_replication_status_service_v1_t *>(
+              &SERVICE_IMPLEMENTATION(group_replication,
+                                      group_replication_status_service_v1))));
+}
+
+bool unregister_gr_status_service() {
+  DBUG_TRACE;
+  my_service<SERVICE_TYPE(registry_registration)> reg("registry_registration",
+                                                      get_plugin_registry());
+  return reg->unregister(
+      "group_replication_status_service_v1.group_replication");
+}
+
+}  // namespace status_service
+}  // namespace gr
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/sql_service/sql_service_command.cc mysql-8.0-8.0.27/plugin/group_replication/src/sql_service/sql_service_command.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/sql_service/sql_service_command.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/sql_service/sql_service_command.cc	2021-09-28 11:46:34.000000000 +0000
@@ -358,79 +358,6 @@
   return server_read_only;
 }
 
-int Sql_service_command_interface::get_server_gtid_executed(
-    string &gtid_executed) {
-  DBUG_TRACE;
-  long error = 0;
-
-  if (connection_thread_isolation != PSESSION_DEDICATED_THREAD) {
-    error = sql_service_commands.internal_get_server_gtid_executed(
-        m_server_interface, static_cast<void *>(&gtid_executed));
-  } else {
-    m_plugin_session_thread->set_return_pointer(
-        static_cast<void *>(&gtid_executed));
-    m_plugin_session_thread->queue_new_method_for_application(
-        &Sql_service_commands::internal_get_server_gtid_executed);
-    error = m_plugin_session_thread->wait_for_method_execution();
-  }
-
-  return error;
-}
-
-long Sql_service_commands::internal_get_server_gtid_executed(
-    Sql_service_interface *sql_interface, void *gtid_executed_arg) {
-  DBUG_TRACE;
-
-  assert(sql_interface != nullptr);
-
-  std::string *gtid_executed = static_cast<std::string *>(gtid_executed_arg);
-
-  Sql_resultset rset;
-  long srv_err =
-      sql_interface->execute_query("SELECT @@GLOBAL.gtid_executed", &rset);
-  if (srv_err == 0 && rset.get_rows() > 0) {
-    gtid_executed->assign(rset.getString(0));
-    return 0;
-  }
-  return 1;
-}
-
-int Sql_service_command_interface::get_server_gtid_purged(string &gtid_purged) {
-  DBUG_TRACE;
-  long error = 0;
-
-  if (connection_thread_isolation != PSESSION_DEDICATED_THREAD) {
-    error = sql_service_commands.internal_get_server_gtid_purged(
-        m_server_interface, static_cast<void *>(&gtid_purged));
-  } else {
-    m_plugin_session_thread->set_return_pointer(
-        static_cast<void *>(&gtid_purged));
-    m_plugin_session_thread->queue_new_method_for_application(
-        &Sql_service_commands::internal_get_server_gtid_purged);
-    error = m_plugin_session_thread->wait_for_method_execution();
-  }
-
-  return error;
-}
-
-long Sql_service_commands::internal_get_server_gtid_purged(
-    Sql_service_interface *sql_interface, void *gtid_purged_arg) {
-  DBUG_TRACE;
-
-  assert(sql_interface != nullptr);
-
-  std::string *gtid_purged = static_cast<std::string *>(gtid_purged_arg);
-
-  Sql_resultset rset;
-  long srv_err =
-      sql_interface->execute_query("SELECT @@GLOBAL.GTID_PURGED", &rset);
-  if (srv_err == 0 && rset.get_rows() > 0) {
-    gtid_purged->assign(rset.getString(0));
-    return 0;
-  }
-  return 1;
-}
-
 long Sql_service_command_interface::wait_for_server_gtid_executed(
     std::string &gtid_executed, int timeout) {
   DBUG_TRACE;
diff -Nru mysql-8.0-8.0.26/plugin/group_replication/src/thread/mysql_thread.cc mysql-8.0-8.0.27/plugin/group_replication/src/thread/mysql_thread.cc
--- mysql-8.0-8.0.26/plugin/group_replication/src/thread/mysql_thread.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/group_replication/src/thread/mysql_thread.cc	2021-09-28 11:46:34.000000000 +0000
@@ -32,18 +32,28 @@
   return nullptr;
 }
 
-Mysql_thread::Mysql_thread(Mysql_thread_body *body)
-    : m_state(), m_aborted(false), m_trigger_run_complete(false), m_body(body) {
-  mysql_mutex_init(key_GR_LOCK_mysql_thread_run, &m_run_lock,
-                   MY_MUTEX_INIT_FAST);
-  mysql_cond_init(key_GR_COND_mysql_thread_run, &m_run_cond);
-  mysql_mutex_init(key_GR_LOCK_mysql_thread_dispatcher_run, &m_dispatcher_lock,
+void Mysql_thread_task::execute() { m_body->run(m_parameters); }
+
+Mysql_thread::Mysql_thread(PSI_thread_key thread_key,
+                           PSI_mutex_key run_mutex_key,
+                           PSI_cond_key run_cond_key,
+                           PSI_mutex_key dispatcher_mutex_key,
+                           PSI_cond_key dispatcher_cond_key)
+    : m_thread_key(thread_key),
+      m_mutex_key(run_mutex_key),
+      m_cond_key(run_cond_key),
+      m_dispatcher_mutex_key(dispatcher_mutex_key),
+      m_dispatcher_cond_key(dispatcher_cond_key),
+      m_state(),
+      m_aborted(false),
+      m_trigger_run_complete(false) {
+  mysql_mutex_init(m_mutex_key, &m_run_lock, MY_MUTEX_INIT_FAST);
+  mysql_cond_init(m_cond_key, &m_run_cond);
+  mysql_mutex_init(m_dispatcher_mutex_key, &m_dispatcher_lock,
                    MY_MUTEX_INIT_FAST);
-  mysql_cond_init(key_GR_COND_mysql_thread_dispatcher_run, &m_dispatcher_cond);
-  m_trigger_queue =
-      new Abortable_synchronized_queue<Mysql_thread_body_parameters *>();
+  mysql_cond_init(m_dispatcher_cond_key, &m_dispatcher_cond);
+  m_trigger_queue = new Abortable_synchronized_queue<Mysql_thread_task *>();
 }
-
 Mysql_thread::~Mysql_thread() {
   mysql_mutex_destroy(&m_run_lock);
   mysql_cond_destroy(&m_run_cond);
@@ -53,9 +63,9 @@
   if (nullptr != m_trigger_queue) {
     while (m_trigger_queue->size() > 0) {
       /* purecov: begin inspected */
-      Mysql_thread_body_parameters *parameters = nullptr;
-      m_trigger_queue->pop(&parameters);
-      delete parameters;
+      Mysql_thread_task *task = nullptr;
+      m_trigger_queue->pop(&task);
+      delete task;
       /* purecov: end */
     }
   }
@@ -75,9 +85,8 @@
 
   m_aborted = false;
 
-  if ((mysql_thread_create(key_GR_THD_mysql_thread, &m_pthd,
-                           get_connection_attrib(), launch_thread,
-                           (void *)this))) {
+  if ((mysql_thread_create(m_thread_key, &m_pthd, get_connection_attrib(),
+                           launch_thread, (void *)this))) {
     /* purecov: begin inspected */
     mysql_mutex_unlock(&m_run_lock);
     return true;
@@ -135,6 +144,8 @@
   thd->set_new_thread_id();
   thd->thread_stack = (char *)&thd;
   thd->store_globals();
+  // Needed to start replication threads
+  thd->security_context()->skip_grants();
   global_thd_manager_add_thd(thd);
   m_thd = thd;
 
@@ -148,12 +159,12 @@
       break;
     }
 
-    Mysql_thread_body_parameters *parameters = nullptr;
-    if (m_trigger_queue->pop(&parameters)) {
+    Mysql_thread_task *task = nullptr;
+    if (m_trigger_queue->pop(&task)) {
       break;
     }
 
-    m_body->run(parameters);
+    task->execute();
 
     mysql_mutex_lock(&m_dispatcher_lock);
     m_trigger_run_complete = true;
@@ -175,24 +186,23 @@
   global_thd_manager_remove_thd(thd);
   delete thd;
   m_thd = nullptr;
+  my_thread_end();
 
   mysql_mutex_lock(&m_run_lock);
   m_state.set_terminated();
   mysql_cond_broadcast(&m_run_cond);
   mysql_mutex_unlock(&m_run_lock);
 
-  my_thread_end();
   my_thread_exit(nullptr);
 }
 
-bool Mysql_thread::trigger(Mysql_thread_body_parameters *parameters) {
+bool Mysql_thread::trigger(Mysql_thread_task *task) {
   DBUG_TRACE;
 
   mysql_mutex_lock(&m_dispatcher_lock);
-  if (m_trigger_queue->push(parameters)) {
+  if (m_trigger_queue->push(task)) {
     /* purecov: begin inspected */
     mysql_mutex_unlock(&m_dispatcher_lock);
-    delete parameters;
     return true;
     /* purecov: end */
   }
diff -Nru mysql-8.0-8.0.26/plugin/innodb_memcached/CMakeLists.txt mysql-8.0-8.0.27/plugin/innodb_memcached/CMakeLists.txt
--- mysql-8.0-8.0.26/plugin/innodb_memcached/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/innodb_memcached/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -79,6 +79,8 @@
   REMOVE_CMAKE_COMPILER_FLAGS(CMAKE_C_FLAGS "${MY_COMPILER_FLAG_FLTO}")
   REMOVE_CMAKE_COMPILER_FLAGS(CMAKE_CXX_FLAGS "${MY_COMPILER_FLAG_FLTO}")
 
+  DISABLE_MISSING_PROFILE_WARNING()
+
   ADD_SUBDIRECTORY(innodb_memcache)
 
   # MYSQL_ADD_PLUGIN may have decided not to build it.
diff -Nru mysql-8.0-8.0.26/plugin/innodb_memcached/innodb_memcache/src/innodb_config.cc mysql-8.0-8.0.27/plugin/innodb_memcached/innodb_memcache/src/innodb_config.cc
--- mysql-8.0-8.0.26/plugin/innodb_memcached/innodb_memcache/src/innodb_config.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/innodb_memcached/innodb_memcache/src/innodb_config.cc	2021-09-28 11:46:34.000000000 +0000
@@ -165,7 +165,7 @@
   ib_crsr_t idx_crsr = NULL;
   ib_tpl_t tpl = NULL;
   ib_err_t err = DB_SUCCESS;
-  int n_cols MY_ATTRIBUTE((unused));
+  int n_cols [[maybe_unused]];
   int i;
   ib_ulint_t data_len;
   ib_col_meta_t col_meta;
@@ -279,7 +279,7 @@
   ib_crsr_t idx_crsr = NULL;
   ib_tpl_t tpl = NULL;
   ib_err_t err = DB_SUCCESS;
-  int n_cols MY_ATTRIBUTE((unused));
+  int n_cols [[maybe_unused]];
   int i;
   ib_ulint_t data_len;
   ib_col_meta_t col_meta;
diff -Nru mysql-8.0-8.0.26/plugin/innodb_memcached/innodb_memcache/src/innodb_engine.cc mysql-8.0-8.0.27/plugin/innodb_memcached/innodb_memcache/src/innodb_engine.cc
--- mysql-8.0-8.0.26/plugin/innodb_memcached/innodb_memcache/src/innodb_engine.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/innodb_memcached/innodb_memcache/src/innodb_engine.cc	2021-09-28 11:46:34.000000000 +0000
@@ -74,7 +74,7 @@
 /** The SDI buffer length for storing list of SDI keys. Example output
 looks like "1:2|2:2|3:4|..". So SDI list of key retrieval has this limit of
 characters from memcached plugin. This is sufficent for testing. */
-const uint32_t SDI_LIST_BUF_MAX_LEN MY_ATTRIBUTE((unused)) = 10000;
+const uint32_t SDI_LIST_BUF_MAX_LEN [[maybe_unused]] = 10000;
 
 /** Tells whether all connections need to release MDL locks */
 bool release_mdl_lock = false;
@@ -303,7 +303,7 @@
   assert(!conn_data->mysql_tbl);
   innodb_close_cursors(conn_data);
   innodb_cb_trx_commit(conn_data->crsr_trx);
-  auto err MY_ATTRIBUTE((unused)) = ib_cb_trx_release(conn_data->crsr_trx);
+  auto err [[maybe_unused]] = ib_cb_trx_release(conn_data->crsr_trx);
   assert(err == DB_SUCCESS);
   conn_data->crsr_trx = nullptr;
 }
@@ -532,7 +532,7 @@
   innodb_close_cursors(conn_data);
 
   if (conn_data->crsr_trx) {
-    ib_err_t err MY_ATTRIBUTE((unused));
+    ib_err_t err [[maybe_unused]];
     innodb_cb_trx_commit(conn_data->crsr_trx);
     err = ib_cb_trx_release(conn_data->crsr_trx);
     assert(err == DB_SUCCESS);
@@ -1933,7 +1933,7 @@
   if (result->extra_col_value) {
     int i;
     char *c_value;
-    char *value_end MY_ATTRIBUTE((unused));
+    char *value_end [[maybe_unused]];
     unsigned int total_len = 0;
     char int_buf[MAX_INT_CHAR_LEN];
     GET_OPTION(meta_info, OPTION_ID_COL_SEP, option_delimiter, option_length);
diff -Nru mysql-8.0-8.0.26/plugin/keyring/common/keyring.h mysql-8.0-8.0.27/plugin/keyring/common/keyring.h
--- mysql-8.0-8.0.26/plugin/keyring/common/keyring.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/keyring/common/keyring.h	2021-09-28 11:46:34.000000000 +0000
@@ -60,9 +60,9 @@
 bool init_keyring_locks();
 bool create_keyring_dir_if_does_not_exist(const char *keyring_file_path);
 
-void update_keyring_file_data(MYSQL_THD thd MY_ATTRIBUTE((unused)),
-                              SYS_VAR *var MY_ATTRIBUTE((unused)),
-                              void *var_ptr MY_ATTRIBUTE((unused)),
+void update_keyring_file_data(MYSQL_THD thd [[maybe_unused]],
+                              SYS_VAR *var [[maybe_unused]],
+                              void *var_ptr [[maybe_unused]],
                               const void *save_ptr);
 
 bool mysql_key_fetch(std::unique_ptr<IKey> key_to_fetch, char **key_type,
diff -Nru mysql-8.0-8.0.26/plugin/keyring/common/keyring_impl.cc mysql-8.0-8.0.27/plugin/keyring/common/keyring_impl.cc
--- mysql-8.0-8.0.26/plugin/keyring/common/keyring_impl.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/keyring/common/keyring_impl.cc	2021-09-28 11:46:34.000000000 +0000
@@ -139,9 +139,9 @@
   }
 }
 
-void update_keyring_file_data(MYSQL_THD thd MY_ATTRIBUTE((unused)),
-                              SYS_VAR *var MY_ATTRIBUTE((unused)),
-                              void *var_ptr MY_ATTRIBUTE((unused)),
+void update_keyring_file_data(MYSQL_THD thd [[maybe_unused]],
+                              SYS_VAR *var [[maybe_unused]],
+                              void *var_ptr [[maybe_unused]],
                               const void *save_ptr) {
   mysql_rwlock_wrlock(&LOCK_keyring);
   IKeys_container *new_keys =
diff -Nru mysql-8.0-8.0.26/plugin/keyring/file_io.cc mysql-8.0-8.0.27/plugin/keyring/file_io.cc
--- mysql-8.0-8.0.26/plugin/keyring/file_io.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/keyring/file_io.cc	2021-09-28 11:46:34.000000000 +0000
@@ -55,7 +55,7 @@
   return has_super_privilege;
 }
 
-File File_io::open(PSI_file_key file_data_key MY_ATTRIBUTE((unused)),
+File File_io::open(PSI_file_key file_data_key [[maybe_unused]],
                    const char *filename, int flags, myf myFlags) {
   File file = mysql_file_open(file_data_key, filename, flags, MYF(0));
   if (file < 0 && (myFlags & MY_WME)) {
diff -Nru mysql-8.0-8.0.26/plugin/keyring/keyring.cc mysql-8.0-8.0.27/plugin/keyring/keyring.cc
--- mysql-8.0-8.0.26/plugin/keyring/keyring.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/keyring/keyring.cc	2021-09-28 11:46:34.000000000 +0000
@@ -51,8 +51,8 @@
 
 mysql_rwlock_t LOCK_keyring;
 
-int check_keyring_file_data(MYSQL_THD thd MY_ATTRIBUTE((unused)),
-                            SYS_VAR *var MY_ATTRIBUTE((unused)), void *save,
+int check_keyring_file_data(MYSQL_THD thd [[maybe_unused]],
+                            SYS_VAR *var [[maybe_unused]], void *save,
                             st_mysql_value *value) {
   char buff[FN_REFLEN + 1];
   const char *keyring_filename;
@@ -106,7 +106,7 @@
 SERVICE_TYPE(log_builtins) *log_bi = nullptr;
 SERVICE_TYPE(log_builtins_string) *log_bs = nullptr;
 
-static int keyring_init(MYSQL_PLUGIN plugin_info MY_ATTRIBUTE((unused))) {
+static int keyring_init(MYSQL_PLUGIN plugin_info [[maybe_unused]]) {
   if (init_logging_service_for_plugin(&reg_srv, &log_bi, &log_bs)) return true;
 
   try {
@@ -150,7 +150,7 @@
   }
 }
 
-static int keyring_deinit(void *arg MY_ATTRIBUTE((unused))) {
+static int keyring_deinit(void *arg [[maybe_unused]]) {
 // not taking a lock here as the calls to keyring_deinit are serialized by
 // the plugin framework
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
diff -Nru mysql-8.0-8.0.26/plugin/password_validation/validate_password.cc mysql-8.0-8.0.27/plugin/password_validation/validate_password.cc
--- mysql-8.0-8.0.26/plugin/password_validation/validate_password.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/password_validation/validate_password.cc	2021-09-28 11:46:34.000000000 +0000
@@ -494,7 +494,7 @@
   It empty the std::set and returns 0
 */
 
-static int validate_password_deinit(void *arg MY_ATTRIBUTE((unused))) {
+static int validate_password_deinit(void *arg [[maybe_unused]]) {
   push_deprecated_warn(thd_get_current_thd(), "validate password plugin",
                        "validate_password component");
   free_dictionary_file();
@@ -510,9 +510,9 @@
   If dictionary file is changed, this function will flush
   the cache and re-load the new dictionary file.
 */
-static void dictionary_update(MYSQL_THD thd MY_ATTRIBUTE((unused)),
-                              SYS_VAR *var MY_ATTRIBUTE((unused)),
-                              void *var_ptr, const void *save) {
+static void dictionary_update(MYSQL_THD thd [[maybe_unused]],
+                              SYS_VAR *var [[maybe_unused]], void *var_ptr,
+                              const void *save) {
   *static_cast<const char **>(var_ptr) =
       *static_cast<const char **>(const_cast<void *>(save));
   read_dictionary_file();
@@ -525,8 +525,8 @@
   3. validate_password_mixed_case_count
   4. validate_password_special_char_count
 */
-static void length_update(MYSQL_THD thd MY_ATTRIBUTE((unused)),
-                          SYS_VAR *var MY_ATTRIBUTE((unused)), void *var_ptr,
+static void length_update(MYSQL_THD thd [[maybe_unused]],
+                          SYS_VAR *var [[maybe_unused]], void *var_ptr,
                           const void *save) {
   /* check if there is an actual change */
   if (*static_cast<int *>(var_ptr) == *static_cast<const int *>(save)) return;
diff -Nru mysql-8.0-8.0.26/plugin/pfs_table_plugin/pfs_example_employee_name.cc mysql-8.0-8.0.27/plugin/pfs_table_plugin/pfs_example_employee_name.cc
--- mysql-8.0-8.0.26/plugin/pfs_table_plugin/pfs_example_employee_name.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/pfs_table_plugin/pfs_example_employee_name.cc	2021-09-28 11:46:34.000000000 +0000
@@ -107,8 +107,8 @@
   return PFS_HA_ERR_END_OF_FILE;
 }
 
-int ename_rnd_init(PSI_table_handle *h MY_ATTRIBUTE((unused)),
-                   bool scan MY_ATTRIBUTE((unused))) {
+int ename_rnd_init(PSI_table_handle *h [[maybe_unused]],
+                   bool scan [[maybe_unused]]) {
   return 0;
 }
 
@@ -127,8 +127,7 @@
 
 /* Initialize the table index */
 int ename_index_init(PSI_table_handle *handle, uint idx,
-                     bool sorted MY_ATTRIBUTE((unused)),
-                     PSI_index_handle **index) {
+                     bool sorted [[maybe_unused]], PSI_index_handle **index) {
   Ename_Table_Handle *h = (Ename_Table_Handle *)handle;
 
   /* If there are multiple indexes, initialize based on the idx provided */
diff -Nru mysql-8.0-8.0.26/plugin/pfs_table_plugin/pfs_example_employee_salary.cc mysql-8.0-8.0.27/plugin/pfs_table_plugin/pfs_example_employee_salary.cc
--- mysql-8.0-8.0.26/plugin/pfs_table_plugin/pfs_example_employee_salary.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/pfs_table_plugin/pfs_example_employee_salary.cc	2021-09-28 11:46:34.000000000 +0000
@@ -83,8 +83,8 @@
   return PFS_HA_ERR_END_OF_FILE;
 }
 
-int esalary_rnd_init(PSI_table_handle *h MY_ATTRIBUTE((unused)),
-                     bool scan MY_ATTRIBUTE((unused))) {
+int esalary_rnd_init(PSI_table_handle *h [[maybe_unused]],
+                     bool scan [[maybe_unused]]) {
   return 0;
 }
 
@@ -101,25 +101,24 @@
 }
 
 /* Initialize the table index */
-int esalary_index_init(PSI_table_handle *handle MY_ATTRIBUTE((unused)),
-                       uint idx MY_ATTRIBUTE((unused)),
-                       bool sorted MY_ATTRIBUTE((unused)),
-                       PSI_index_handle **index MY_ATTRIBUTE((unused))) {
+int esalary_index_init(PSI_table_handle *handle [[maybe_unused]],
+                       uint idx [[maybe_unused]], bool sorted [[maybe_unused]],
+                       PSI_index_handle **index [[maybe_unused]]) {
   /* Do nothing as there are no index */
   return 0;
 }
 
 /* For each key in index, read value specified in query */
-int esalary_index_read(PSI_index_handle *index MY_ATTRIBUTE((unused)),
-                       PSI_key_reader *reader MY_ATTRIBUTE((unused)),
-                       unsigned int idx MY_ATTRIBUTE((unused)),
-                       int find_flag MY_ATTRIBUTE((unused))) {
+int esalary_index_read(PSI_index_handle *index [[maybe_unused]],
+                       PSI_key_reader *reader [[maybe_unused]],
+                       unsigned int idx [[maybe_unused]],
+                       int find_flag [[maybe_unused]]) {
   /* Do nothing as there are no index */
   return 0;
 }
 
 /* Read the next indexed value */
-int esalary_index_next(PSI_table_handle *handle MY_ATTRIBUTE((unused))) {
+int esalary_index_next(PSI_table_handle *handle [[maybe_unused]]) {
   /* Do nothing as there are no index */
   return PFS_HA_ERR_END_OF_FILE;
 }
diff -Nru mysql-8.0-8.0.26/plugin/pfs_table_plugin/pfs_example_machine.cc mysql-8.0-8.0.27/plugin/pfs_table_plugin/pfs_example_machine.cc
--- mysql-8.0-8.0.26/plugin/pfs_table_plugin/pfs_example_machine.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/pfs_table_plugin/pfs_example_machine.cc	2021-09-28 11:46:34.000000000 +0000
@@ -83,8 +83,8 @@
   return PFS_HA_ERR_END_OF_FILE;
 }
 
-int machine_rnd_init(PSI_table_handle *h MY_ATTRIBUTE((unused)),
-                     bool scan MY_ATTRIBUTE((unused))) {
+int machine_rnd_init(PSI_table_handle *h [[maybe_unused]],
+                     bool scan [[maybe_unused]]) {
   return 0;
 }
 
@@ -101,25 +101,24 @@
 }
 
 /* Initialize the table index */
-int machine_index_init(PSI_table_handle *handle MY_ATTRIBUTE((unused)),
-                       uint idx MY_ATTRIBUTE((unused)),
-                       bool sorted MY_ATTRIBUTE((unused)),
-                       PSI_index_handle **index MY_ATTRIBUTE((unused))) {
+int machine_index_init(PSI_table_handle *handle [[maybe_unused]],
+                       uint idx [[maybe_unused]], bool sorted [[maybe_unused]],
+                       PSI_index_handle **index [[maybe_unused]]) {
   /* Do nothing as there are no index */
   return 0;
 }
 
 /* For each key in index, read value specified in query */
-int machine_index_read(PSI_index_handle *index MY_ATTRIBUTE((unused)),
-                       PSI_key_reader *reader MY_ATTRIBUTE((unused)),
-                       unsigned int idx MY_ATTRIBUTE((unused)),
-                       int find_flag MY_ATTRIBUTE((unused))) {
+int machine_index_read(PSI_index_handle *index [[maybe_unused]],
+                       PSI_key_reader *reader [[maybe_unused]],
+                       unsigned int idx [[maybe_unused]],
+                       int find_flag [[maybe_unused]]) {
   /* Do nothing as there are no index */
   return 0;
 }
 
 /* Read the next indexed value */
-int machine_index_next(PSI_table_handle *handle MY_ATTRIBUTE((unused))) {
+int machine_index_next(PSI_table_handle *handle [[maybe_unused]]) {
   /* Do nothing as there are no index */
   return PFS_HA_ERR_END_OF_FILE;
 }
diff -Nru mysql-8.0-8.0.26/plugin/pfs_table_plugin/pfs_example_machines_by_emp_by_mtype.cc mysql-8.0-8.0.27/plugin/pfs_table_plugin/pfs_example_machines_by_emp_by_mtype.cc
--- mysql-8.0-8.0.26/plugin/pfs_table_plugin/pfs_example_machines_by_emp_by_mtype.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/pfs_table_plugin/pfs_example_machines_by_emp_by_mtype.cc	2021-09-28 11:46:34.000000000 +0000
@@ -114,8 +114,8 @@
   return PFS_HA_ERR_END_OF_FILE;
 }
 
-int m_by_emp_by_mtype_rnd_init(PSI_table_handle *h MY_ATTRIBUTE((unused)),
-                               bool scan MY_ATTRIBUTE((unused))) {
+int m_by_emp_by_mtype_rnd_init(PSI_table_handle *h [[maybe_unused]],
+                               bool scan [[maybe_unused]]) {
   return 0;
 }
 
@@ -133,26 +133,25 @@
 }
 
 /* Initialize the table index */
-int m_by_emp_by_mtype_index_init(
-    PSI_table_handle *handle MY_ATTRIBUTE((unused)),
-    uint idx MY_ATTRIBUTE((unused)), bool sorted MY_ATTRIBUTE((unused)),
-    PSI_index_handle **index MY_ATTRIBUTE((unused))) {
+int m_by_emp_by_mtype_index_init(PSI_table_handle *handle [[maybe_unused]],
+                                 uint idx [[maybe_unused]],
+                                 bool sorted [[maybe_unused]],
+                                 PSI_index_handle **index [[maybe_unused]]) {
   /* No Index */
   return 0;
 }
 
 /* For each key in index, read value specified in query */
-int m_by_emp_by_mtype_index_read(PSI_index_handle *index MY_ATTRIBUTE((unused)),
-                                 PSI_key_reader *reader MY_ATTRIBUTE((unused)),
-                                 unsigned int idx MY_ATTRIBUTE((unused)),
-                                 int find_flag MY_ATTRIBUTE((unused))) {
+int m_by_emp_by_mtype_index_read(PSI_index_handle *index [[maybe_unused]],
+                                 PSI_key_reader *reader [[maybe_unused]],
+                                 unsigned int idx [[maybe_unused]],
+                                 int find_flag [[maybe_unused]]) {
   /* No Index */
   return 0;
 }
 
 /* Read the next indexed value */
-int m_by_emp_by_mtype_index_next(
-    PSI_table_handle *handle MY_ATTRIBUTE((unused))) {
+int m_by_emp_by_mtype_index_next(PSI_table_handle *handle [[maybe_unused]]) {
   /* No Index */
   return 0;
 }
diff -Nru mysql-8.0-8.0.26/plugin/pfs_table_plugin/pfs_example_plugin_employee.cc mysql-8.0-8.0.27/plugin/pfs_table_plugin/pfs_example_plugin_employee.cc
--- mysql-8.0-8.0.26/plugin/pfs_table_plugin/pfs_example_plugin_employee.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/pfs_table_plugin/pfs_example_plugin_employee.cc	2021-09-28 11:46:34.000000000 +0000
@@ -115,7 +115,7 @@
 *   - Acquire pfs_plugin_table service implementation.
 */
 bool
-acquire_service_handles(MYSQL_PLUGIN p MY_ATTRIBUTE((unused)))
+acquire_service_handles(MYSQL_PLUGIN p [[maybe_unused]])
 {
   bool result = false;
 
@@ -394,7 +394,7 @@
 *   - Release pfs_plugin_table service handle.
 */
 static int
-pfs_example_plugin_employee_deinit(void *p  MY_ATTRIBUTE((unused)))
+pfs_example_plugin_employee_deinit(void *p  [[maybe_unused]])
 {
   DBUG_TRACE;
 
diff -Nru mysql-8.0-8.0.26/plugin/replication_observers_example/replication_observers_example.cc mysql-8.0-8.0.27/plugin/replication_observers_example/replication_observers_example.cc
--- mysql-8.0-8.0.26/plugin/replication_observers_example/replication_observers_example.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/replication_observers_example/replication_observers_example.cc	2021-09-28 11:46:34.000000000 +0000
@@ -200,8 +200,7 @@
 /*
   Transaction lifecycle events observers.
 */
-static int trans_before_dml(Trans_param *,
-                            int &out_val MY_ATTRIBUTE((unused))) {
+static int trans_before_dml(Trans_param *, int &out_val [[maybe_unused]]) {
   trans_before_dml_call++;
 
   DBUG_EXECUTE_IF("cause_failure_in_before_dml_hook", out_val = 1;);
@@ -293,7 +292,7 @@
 }
 #endif
 
-static int trans_before_commit(Trans_param *param MY_ATTRIBUTE((unused))) {
+static int trans_before_commit(Trans_param *param [[maybe_unused]]) {
   trans_before_commit_call++;
 
   DBUG_EXECUTE_IF("force_error_on_before_commit_listener", return 1;);
@@ -333,7 +332,7 @@
   return 0;
 }
 
-static int trans_after_rollback(Trans_param *param MY_ATTRIBUTE((unused))) {
+static int trans_after_rollback(Trans_param *param [[maybe_unused]]) {
   trans_after_rollback_call++;
 
   DBUG_EXECUTE_IF("validate_replication_observers_plugin_server_requirements",
@@ -342,8 +341,8 @@
   return 0;
 }
 
-static int trans_begin(Trans_param *param MY_ATTRIBUTE((unused)),
-                       int &out_val MY_ATTRIBUTE((unused))) {
+static int trans_begin(Trans_param *param [[maybe_unused]],
+                       int &out_val [[maybe_unused]]) {
   trans_begin_call++;
 
   return 0;
diff -Nru mysql-8.0-8.0.26/plugin/rewriter/persisted_rule.h mysql-8.0-8.0.27/plugin/rewriter/persisted_rule.h
--- mysql-8.0-8.0.26/plugin/rewriter/persisted_rule.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/rewriter/persisted_rule.h	2021-09-28 11:46:34.000000000 +0000
@@ -23,10 +23,10 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
 #include <memory>
+#include <optional>
 #include <string>
 #include "my_config.h"
 #include "mysql/service_rules_table.h"
-#include "nullable.h"
 
 namespace rts = rules_table_service;
 
@@ -41,25 +41,25 @@
 class Persisted_rule {
  public:
   /// The rewrite rule's pattern string.
-  Mysql::Nullable<std::string> pattern;
+  std::optional<std::string> pattern;
 
   /// The pattern's current database.
-  Mysql::Nullable<std::string> pattern_db;
+  std::optional<std::string> pattern_db;
 
   /// The rewrite rule's replacement string.
-  Mysql::Nullable<std::string> replacement;
+  std::optional<std::string> replacement;
 
   /// True if the rule is enabled.
   bool is_enabled;
 
   /// The plugin's message, write-only.
-  Mysql::Nullable<std::string> message;
+  std::optional<std::string> message;
 
   /// The pattern's digest, write-only.
-  Mysql::Nullable<std::string> pattern_digest;
+  std::optional<std::string> pattern_digest;
 
   /// The normalized pattern, write-only.
-  Mysql::Nullable<std::string> normalized_pattern;
+  std::optional<std::string> normalized_pattern;
 
   /**
     Constructs a Persisted_rule object that copies all data into the current
@@ -81,17 +81,17 @@
 
   /// Convenience function, may be called with a const char*.
   void set_message(const std::string &message_arg) {
-    message = Mysql::Nullable<std::string>(message_arg);
+    message = std::optional<std::string>(message_arg);
   }
 
   /// Convenience function, may be called with a const char*.
   void set_pattern_digest(const std::string &s) {
-    pattern_digest = Mysql::Nullable<std::string>(s);
+    pattern_digest = std::optional<std::string>(s);
   }
 
   /// Convenience function, may be called with a const char*.
   void set_normalized_pattern(const std::string &s) {
-    normalized_pattern = Mysql::Nullable<std::string>(s);
+    normalized_pattern = std::optional<std::string>(s);
   }
 
   /**
@@ -111,11 +111,11 @@
 
  private:
   /**
-    Reads from a Cursor and writes to a property of type Nullable<string>
+    Reads from a Cursor and writes to a property of type std::optional<string>
     after forcing a copy of the string buffer. The function calls a member
     function in Cursor that is located in the server's dynamic library.
   */
-  void copy_and_set(Mysql::Nullable<std::string> *property, rts::Cursor *c,
+  void copy_and_set(std::optional<std::string> *property, rts::Cursor *c,
                     int colno) {
     const char *value = c->fetch_string(colno);
     if (value != nullptr) {
@@ -128,7 +128,7 @@
 
   /// Writes a string value to the cursor's column if it exists.
   void set_if_present(rts::Cursor *cursor, rts::Cursor::column_id column,
-                      Mysql::Nullable<std::string> value) {
+                      std::optional<std::string> value) {
     if (column == rts::Cursor::ILLEGAL_COLUMN_ID) return;
     if (!value.has_value()) {
       cursor->set(column, nullptr, 0);
diff -Nru mysql-8.0-8.0.26/plugin/rewriter/rewriter.cc mysql-8.0-8.0.27/plugin/rewriter/rewriter.cc
--- mysql-8.0-8.0.26/plugin/rewriter/rewriter.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/rewriter/rewriter.cc	2021-09-28 11:46:34.000000000 +0000
@@ -28,20 +28,19 @@
 #include <mysql/service_rules_table.h>
 #include <stddef.h>
 #include <memory>
+#include <optional>
 #include <string>
 
 #include "m_string.h"  // Needed because debug_sync.h is not self-sufficient.
 #include "my_dbug.h"
 #include "mysql/components/services/my_thread_bits.h"
 #include "mysqld_error.h"
-#include "nullable.h"
 #include "plugin/rewriter/messages.h"
 #include "plugin/rewriter/persisted_rule.h"
 #include "plugin/rewriter/rule.h"
 #include "sql/debug_sync.h"
 #include "template_utils.h"
 
-using Mysql::Nullable;
 using rules_table_service::Cursor;
 using std::string;
 namespace messages = rewriter_messages;
@@ -73,7 +72,7 @@
     case Rule::OK:
       m_digests.emplace(hash_key_from_digest(memrule_ptr->digest_buffer()),
                         std::move(memrule_ptr));
-      diskrule->message = Nullable<string>();
+      diskrule->message = std::optional<string>();
       diskrule->pattern_digest =
           services::print_digest(memrule->digest_buffer());
       diskrule->normalized_pattern = memrule->normalized_pattern();
diff -Nru mysql-8.0-8.0.26/plugin/rewriter/rewriter_plugin.cc mysql-8.0-8.0.27/plugin/rewriter/rewriter_plugin.cc
--- mysql-8.0-8.0.26/plugin/rewriter/rewriter_plugin.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/rewriter/rewriter_plugin.cc	2021-09-28 11:46:34.000000000 +0000
@@ -316,9 +316,10 @@
   query when the plugin is active. The function extracts the digest of the
   query. If the digest matches an existing rewrite rule, it is executed.
 */
-static int rewrite_query_notify(
-    MYSQL_THD thd, mysql_event_class_t event_class MY_ATTRIBUTE((unused)),
-    const void *event) {
+static int rewrite_query_notify(MYSQL_THD thd,
+                                mysql_event_class_t event_class
+                                [[maybe_unused]],
+                                const void *event) {
   assert(event_class == MYSQL_AUDIT_PARSE_CLASS);
 
   const struct mysql_event_parse *event_parse =
diff -Nru mysql-8.0-8.0.26/plugin/semisync/CMakeLists.txt mysql-8.0-8.0.27/plugin/semisync/CMakeLists.txt
--- mysql-8.0-8.0.26/plugin/semisync/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/semisync/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -24,6 +24,8 @@
 ADD_DEFINITIONS(-DLOG_SUBSYSTEM_TAG="Repl")
 ADD_DEFINITIONS(-DLOG_COMPONENT_TAG="semisync")
 
+DISABLE_MISSING_PROFILE_WARNING()
+
 MYSQL_ADD_PLUGIN(semisync_source
   semisync.cc
   semisync_source.cc
@@ -31,6 +33,7 @@
   semisync_source_plugin.cc
   MODULE_ONLY
   MODULE_OUTPUT_NAME "semisync_source"
+  VISIBILITY_HIDDEN
   )
 
 MYSQL_ADD_PLUGIN(semisync_replica
@@ -39,6 +42,7 @@
   semisync_replica_plugin.cc
   MODULE_ONLY
   MODULE_OUTPUT_NAME "semisync_replica"
+  VISIBILITY_HIDDEN
   )
 
 MYSQL_ADD_PLUGIN(semisync_master
@@ -48,6 +52,7 @@
   semisync_source_plugin_old.cc
   MODULE_ONLY
   MODULE_OUTPUT_NAME "semisync_master"
+  VISIBILITY_HIDDEN
   )
 
 MYSQL_ADD_PLUGIN(semisync_slave
@@ -56,4 +61,5 @@
   semisync_replica_plugin_old.cc
   MODULE_ONLY
   MODULE_OUTPUT_NAME "semisync_slave"
+  VISIBILITY_HIDDEN
   )
diff -Nru mysql-8.0-8.0.26/plugin/semisync/semisync_source_ack_receiver.cc mysql-8.0-8.0.27/plugin/semisync/semisync_source_ack_receiver.cc
--- mysql-8.0-8.0.26/plugin/semisync/semisync_source_ack_receiver.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/semisync/semisync_source_ack_receiver.cc	2021-09-28 11:46:34.000000000 +0000
@@ -219,8 +219,8 @@
   function_exit(kWho);
 }
 
-inline void Ack_receiver::set_stage_info(
-    const PSI_stage_info &stage MY_ATTRIBUTE((unused))) {
+inline void Ack_receiver::set_stage_info(const PSI_stage_info &stage
+                                         [[maybe_unused]]) {
 #ifdef HAVE_PSI_STAGE_INTERFACE
   MYSQL_SET_STAGE(stage.m_key, __FILE__, __LINE__);
 #endif /* HAVE_PSI_STAGE_INTERFACE */
diff -Nru mysql-8.0-8.0.26/plugin/semisync/semisync_source_plugin.cc mysql-8.0-8.0.27/plugin/semisync/semisync_source_plugin.cc
--- mysql-8.0-8.0.26/plugin/semisync/semisync_source_plugin.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/semisync/semisync_source_plugin.cc	2021-09-28 11:46:34.000000000 +0000
@@ -505,7 +505,7 @@
 PSI_thread_key key_ss_thread_Ack_receiver_thread;
 
 static PSI_thread_info all_semisync_threads[] = {
-    {&key_ss_thread_Ack_receiver_thread, "Ack_receiver",
+    {&key_ss_thread_Ack_receiver_thread, "Ack_receiver", "ss_ack",
      PSI_FLAG_SINGLETON | PSI_FLAG_THREAD_SYSTEM, 0, PSI_DOCUMENT_ME}};
 #endif /* HAVE_PSI_INTERFACE */
 
diff -Nru mysql-8.0-8.0.26/plugin/test_services/test_services.cc mysql-8.0-8.0.27/plugin/test_services/test_services.cc
--- mysql-8.0-8.0.26/plugin/test_services/test_services.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/test_services/test_services.cc	2021-09-28 11:46:34.000000000 +0000
@@ -76,7 +76,7 @@
                                            nullptr};
 
 /* The test cases for the log_message service. */
-static int test_log_plugin_error(void *p MY_ATTRIBUTE((unused))) {
+static int test_log_plugin_error(void *p [[maybe_unused]]) {
   DBUG_TRACE;
   /* Writes to mysqld.1.err: Plugin test_services reports an info text */
   LogPluginErr(
diff -Nru mysql-8.0-8.0.26/plugin/test_services/test_services_plugin_registry.cc mysql-8.0-8.0.27/plugin/test_services/test_services_plugin_registry.cc
--- mysql-8.0-8.0.26/plugin/test_services/test_services_plugin_registry.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/test_services/test_services_plugin_registry.cc	2021-09-28 11:46:34.000000000 +0000
@@ -92,7 +92,7 @@
   @retval false  success
   @retval true   failure
 */
-static bool test_plugin_registry(MYSQL_PLUGIN p MY_ATTRIBUTE((unused))) {
+static bool test_plugin_registry(MYSQL_PLUGIN p [[maybe_unused]]) {
   bool result = false;
   SERVICE_TYPE(registry) *r = mysql_plugin_registry_acquire();
   my_h_service h_reg = nullptr;
@@ -222,13 +222,13 @@
   switch (state) {
     case MY_SVC_ACQUIRED:
       r->release(h_ret_svc);
-      /* fall through */
+      [[fallthrough]];
     case MY_SVC_REGISTERED:
       reg->unregister("test_services_plugin_registry_service.mysql_server");
-      /* fall through */
+      [[fallthrough]];
     case REG_ACQUIRED:
       r->release(h_reg);
-      /* fall through */
+      [[fallthrough]];
     case IDLE:
     default:
       mysql_plugin_registry_release(r);
diff -Nru mysql-8.0-8.0.26/plugin/test_services/test_services_threaded.cc mysql-8.0-8.0.27/plugin/test_services/test_services_threaded.cc
--- mysql-8.0-8.0.26/plugin/test_services/test_services_threaded.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/test_services/test_services_threaded.cc	2021-09-28 11:46:34.000000000 +0000
@@ -90,7 +90,7 @@
 }
 
 /* This fucntion is needed to be called in a thread. */
-static void *test_services(void *p MY_ATTRIBUTE((unused))) {
+static void *test_services(void *p [[maybe_unused]]) {
   DBUG_TRACE;
 
   int ret = 0;
diff -Nru mysql-8.0-8.0.26/plugin/test_service_sql_api/test_session_attach.cc mysql-8.0-8.0.27/plugin/test_service_sql_api/test_session_attach.cc
--- mysql-8.0-8.0.26/plugin/test_service_sql_api/test_session_attach.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/test_service_sql_api/test_session_attach.cc	2021-09-28 11:46:34.000000000 +0000
@@ -301,7 +301,7 @@
 /*
   Plugin deinitialization function
 */
-static int test_sql_service_plugin_deinit(void *p MY_ATTRIBUTE((unused))) {
+static int test_sql_service_plugin_deinit(void *p [[maybe_unused]]) {
   DBUG_TRACE;
   LogPluginErr(INFORMATION_LEVEL, ER_LOG_PRINTF_MSG, "Uninstallation.");
 
diff -Nru mysql-8.0-8.0.26/plugin/test_service_sql_api/test_session_detach.cc mysql-8.0-8.0.27/plugin/test_service_sql_api/test_session_detach.cc
--- mysql-8.0-8.0.26/plugin/test_service_sql_api/test_session_detach.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/test_service_sql_api/test_session_detach.cc	2021-09-28 11:46:34.000000000 +0000
@@ -579,7 +579,7 @@
 }
 
 static void exec_test_cmd(MYSQL_SESSION session, const char *test_cmd,
-                          void *p MY_ATTRIBUTE((unused)), void *ctx) {
+                          void *p [[maybe_unused]], void *ctx) {
   char buffer[STRING_BUFFER_SIZE];
   COM_DATA cmd;
   struct st_plugin_ctx *pctx = (struct st_plugin_ctx *)ctx;
@@ -710,7 +710,7 @@
   return 0;
 }
 
-static int test_sql_service_plugin_deinit(void *p MY_ATTRIBUTE((unused))) {
+static int test_sql_service_plugin_deinit(void *p [[maybe_unused]]) {
   DBUG_TRACE;
   LogPluginErr(INFORMATION_LEVEL, ER_LOG_PRINTF_MSG, "Uninstallation.");
   deinit_logging_service_for_plugin(&reg_srv, &log_bi, &log_bs);
diff -Nru mysql-8.0-8.0.26/plugin/test_service_sql_api/test_session_info.cc mysql-8.0-8.0.27/plugin/test_service_sql_api/test_session_info.cc
--- mysql-8.0-8.0.26/plugin/test_service_sql_api/test_session_info.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/test_service_sql_api/test_session_info.cc	2021-09-28 11:46:34.000000000 +0000
@@ -536,7 +536,7 @@
   exec_test_cmd((s), (q), (p), (ctx), (err), __FUNCTION__, __LINE__)
 
 static void exec_test_cmd(MYSQL_SESSION session, const char *query,
-                          void *p MY_ATTRIBUTE((unused)), void *ctx,
+                          void *p [[maybe_unused]], void *ctx,
                           bool expect_error, const char *func, uint line) {
   char buffer[STRING_BUFFER_SIZE];
   struct st_plugin_ctx *pctx = (struct st_plugin_ctx *)ctx;
@@ -570,8 +570,8 @@
   WRITE_STR("\n");
 }
 
-static void test_com_init_db(void *p MY_ATTRIBUTE((unused)),
-                             MYSQL_SESSION st_session, const char *db_name) {
+static void test_com_init_db(void *p [[maybe_unused]], MYSQL_SESSION st_session,
+                             const char *db_name) {
   char buffer[STRING_BUFFER_SIZE];
   DBUG_TRACE;
 
@@ -1053,7 +1053,8 @@
 #ifdef HAVE_PSI_INTERFACE
 static PSI_thread_key key_thread_session_info = PSI_NOT_INSTRUMENTED;
 static PSI_thread_info session_info_threads[] = {
-    {&key_thread_session_info, "session_info", 0, 0, PSI_DOCUMENT_ME}};
+    {&key_thread_session_info, "session_info", "session_info", 0, 0,
+     PSI_DOCUMENT_ME}};
 #endif  // HAVE_PSI_INTERFACE
 
 static void test_in_spawned_thread(void *p, void (*test_function)(void *)) {
@@ -1104,7 +1105,7 @@
   return 0;
 }
 
-static int test_sql_service_plugin_deinit(void *p MY_ATTRIBUTE((unused))) {
+static int test_sql_service_plugin_deinit(void *p [[maybe_unused]]) {
   DBUG_TRACE;
   LogPluginErr(INFORMATION_LEVEL, ER_LOG_PRINTF_MSG, "Uninstallation.");
   deinit_logging_service_for_plugin(&reg_srv, &log_bi, &log_bs);
diff -Nru mysql-8.0-8.0.26/plugin/test_service_sql_api/test_sql_2_sessions.cc mysql-8.0-8.0.27/plugin/test_service_sql_api/test_sql_2_sessions.cc
--- mysql-8.0-8.0.26/plugin/test_service_sql_api/test_sql_2_sessions.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/test_service_sql_api/test_sql_2_sessions.cc	2021-09-28 11:46:34.000000000 +0000
@@ -633,7 +633,7 @@
 }
 
 static void exec_test_cmd(MYSQL_SESSION session, const char *test_cmd,
-                          void *p MY_ATTRIBUTE((unused)), void *ctx) {
+                          void *p [[maybe_unused]], void *ctx) {
   WRITE_VAL("%s\n", test_cmd);
   struct st_plugin_ctx *pctx = (struct st_plugin_ctx *)ctx;
   COM_DATA cmd;
@@ -796,7 +796,7 @@
   return 0;
 }
 
-static int test_sql_service_plugin_deinit(void *p MY_ATTRIBUTE((unused))) {
+static int test_sql_service_plugin_deinit(void *p [[maybe_unused]]) {
   DBUG_TRACE;
   LogPluginErr(INFORMATION_LEVEL, ER_LOG_PRINTF_MSG, "Uninstallation.");
   deinit_logging_service_for_plugin(&reg_srv, &log_bi, &log_bs);
diff -Nru mysql-8.0-8.0.26/plugin/test_service_sql_api/test_sql_9_sessions.cc mysql-8.0-8.0.27/plugin/test_service_sql_api/test_sql_9_sessions.cc
--- mysql-8.0-8.0.26/plugin/test_service_sql_api/test_sql_9_sessions.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/test_service_sql_api/test_sql_9_sessions.cc	2021-09-28 11:46:34.000000000 +0000
@@ -551,7 +551,7 @@
   return 0;
 }
 
-static int test_sql_service_plugin_deinit(void *p MY_ATTRIBUTE((unused))) {
+static int test_sql_service_plugin_deinit(void *p [[maybe_unused]]) {
   DBUG_TRACE;
   LogPluginErr(INFORMATION_LEVEL, ER_LOG_PRINTF_MSG, "Uninstallation.");
   deinit_logging_service_for_plugin(&reg_srv, &log_bi, &log_bs);
diff -Nru mysql-8.0-8.0.26/plugin/test_service_sql_api/test_sql_all_col_types.cc mysql-8.0-8.0.27/plugin/test_service_sql_api/test_sql_all_col_types.cc
--- mysql-8.0-8.0.26/plugin/test_service_sql_api/test_sql_all_col_types.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/test_service_sql_api/test_sql_all_col_types.cc	2021-09-28 11:46:34.000000000 +0000
@@ -764,7 +764,7 @@
 }
 
 static void exec_test_cmd(MYSQL_SESSION session, const char *test_cmd,
-                          void *p MY_ATTRIBUTE((unused)), void *ctx,
+                          void *p [[maybe_unused]], void *ctx,
                           enum cs_text_or_binary text_or_binary) {
   char buffer[STRING_BUFFER_SIZE];
   COM_DATA cmd;
@@ -979,7 +979,7 @@
   return 0;
 }
 
-static int test_sql_service_plugin_deinit(void *p MY_ATTRIBUTE((unused))) {
+static int test_sql_service_plugin_deinit(void *p [[maybe_unused]]) {
   DBUG_TRACE;
   LogPluginErr(INFORMATION_LEVEL, ER_LOG_PRINTF_MSG, "Uninstallation.");
   deinit_logging_service_for_plugin(&reg_srv, &log_bi, &log_bs);
diff -Nru mysql-8.0-8.0.26/plugin/test_service_sql_api/test_sql_cmds_1.cc mysql-8.0-8.0.27/plugin/test_service_sql_api/test_sql_cmds_1.cc
--- mysql-8.0-8.0.26/plugin/test_service_sql_api/test_sql_cmds_1.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/test_service_sql_api/test_sql_cmds_1.cc	2021-09-28 11:46:34.000000000 +0000
@@ -331,7 +331,7 @@
 
 /****************************************************************************************/
 
-static void test_com_query(void *p MY_ATTRIBUTE((unused))) {
+static void test_com_query(void *p [[maybe_unused]]) {
   DBUG_TRACE;
 
   /* Session declarations */
@@ -747,7 +747,7 @@
   return 0;
 }
 
-static void test_sql(void *p MY_ATTRIBUTE((unused))) {
+static void test_sql(void *p [[maybe_unused]]) {
   DBUG_TRACE;
   LogPluginErr(INFORMATION_LEVEL, ER_LOG_PRINTF_MSG, "Installation.");
 
@@ -790,7 +790,7 @@
   return 0;
 }
 
-static int test_sql_service_plugin_deinit(void *p MY_ATTRIBUTE((unused))) {
+static int test_sql_service_plugin_deinit(void *p [[maybe_unused]]) {
   DBUG_TRACE;
   LogPluginErr(INFORMATION_LEVEL, ER_LOG_PRINTF_MSG, "Uninstallation.");
   deinit_logging_service_for_plugin(&reg_srv, &log_bi, &log_bs);
diff -Nru mysql-8.0-8.0.26/plugin/test_service_sql_api/test_sql_commit.cc mysql-8.0-8.0.27/plugin/test_service_sql_api/test_sql_commit.cc
--- mysql-8.0-8.0.26/plugin/test_service_sql_api/test_sql_commit.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/test_service_sql_api/test_sql_commit.cc	2021-09-28 11:46:34.000000000 +0000
@@ -674,7 +674,7 @@
 
 static void run_statement(MYSQL_SESSION session, const char *query,
                           struct st_plugin_ctx *ctx, bool generates_result_set,
-                          void *p MY_ATTRIBUTE((unused))) {
+                          void *p [[maybe_unused]]) {
   char buffer[STRING_BUFFER_SIZE];
   COM_DATA cmd;
 
@@ -713,7 +713,7 @@
 
 void static change_current_db(MYSQL_SESSION session, const char *db,
                               struct st_plugin_ctx *ctx,
-                              void *p MY_ATTRIBUTE((unused))) {
+                              void *p [[maybe_unused]]) {
   char buffer[STRING_BUFFER_SIZE];
   COM_DATA cmd;
   cmd.com_init_db.db_name = db;
@@ -850,7 +850,7 @@
   return 0;
 }
 
-static int test_sql_service_plugin_deinit(void *p MY_ATTRIBUTE((unused))) {
+static int test_sql_service_plugin_deinit(void *p [[maybe_unused]]) {
   DBUG_TRACE;
   LogPluginErr(INFORMATION_LEVEL, ER_LOG_PRINTF_MSG, "Uninstallation.");
   deinit_logging_service_for_plugin(&reg_srv, &log_bi, &log_bs);
diff -Nru mysql-8.0-8.0.26/plugin/test_service_sql_api/test_sql_complex.cc mysql-8.0-8.0.27/plugin/test_service_sql_api/test_sql_complex.cc
--- mysql-8.0-8.0.26/plugin/test_service_sql_api/test_sql_complex.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/test_service_sql_api/test_sql_complex.cc	2021-09-28 11:46:34.000000000 +0000
@@ -782,7 +782,7 @@
 
 static void run_statement(MYSQL_SESSION session, const char *query,
                           struct st_plugin_ctx *ctx, bool generates_result_set,
-                          void *p MY_ATTRIBUTE((unused))) {
+                          void *p [[maybe_unused]]) {
   char buffer[STRING_BUFFER_SIZE];
   COM_DATA cmd;
 
@@ -820,7 +820,7 @@
 
 void static change_current_db(MYSQL_SESSION session, const char *db,
                               struct st_plugin_ctx *ctx,
-                              void *p MY_ATTRIBUTE((unused))) {
+                              void *p [[maybe_unused]]) {
   COM_DATA cmd;
   cmd.com_init_db.db_name = db;
   cmd.com_init_db.length = strlen(db);
@@ -981,7 +981,7 @@
   return 0;
 }
 
-static int test_sql_service_plugin_deinit(void *p MY_ATTRIBUTE((unused))) {
+static int test_sql_service_plugin_deinit(void *p [[maybe_unused]]) {
   DBUG_TRACE;
   LogPluginErr(INFORMATION_LEVEL, ER_LOG_PRINTF_MSG, "Uninstallation.");
   deinit_logging_service_for_plugin(&reg_srv, &log_bi, &log_bs);
diff -Nru mysql-8.0-8.0.26/plugin/test_service_sql_api/test_sql_errors.cc mysql-8.0-8.0.27/plugin/test_service_sql_api/test_sql_errors.cc
--- mysql-8.0-8.0.26/plugin/test_service_sql_api/test_sql_errors.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/test_service_sql_api/test_sql_errors.cc	2021-09-28 11:46:34.000000000 +0000
@@ -635,7 +635,7 @@
 }
 
 static void exec_test_cmd(MYSQL_SESSION session, const char *test_cmd,
-                          void *p MY_ATTRIBUTE((unused)), void *ctx) {
+                          void *p [[maybe_unused]], void *ctx) {
   WRITE_VAL("%s\n", test_cmd);
   struct st_plugin_ctx *pctx = (struct st_plugin_ctx *)ctx;
   COM_DATA cmd;
@@ -743,7 +743,7 @@
   delete plugin_ctx;
 }
 
-static void test_session_only_open(void *p MY_ATTRIBUTE((unused))) {
+static void test_session_only_open(void *p [[maybe_unused]]) {
   DBUG_TRACE;
 
   MYSQL_SESSION sessions[MAX_SESSIONS];
@@ -840,7 +840,7 @@
   return 0;
 }
 
-static int test_session_service_plugin_deinit(void *p MY_ATTRIBUTE((unused))) {
+static int test_session_service_plugin_deinit(void *p [[maybe_unused]]) {
   DBUG_TRACE;
   LogPluginErr(INFORMATION_LEVEL, ER_LOG_PRINTF_MSG, "Uninstallation.");
   deinit_logging_service_for_plugin(&reg_srv, &log_bi, &log_bs);
diff -Nru mysql-8.0-8.0.26/plugin/test_service_sql_api/test_sql_lock.cc mysql-8.0-8.0.27/plugin/test_service_sql_api/test_sql_lock.cc
--- mysql-8.0-8.0.26/plugin/test_service_sql_api/test_sql_lock.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/test_service_sql_api/test_sql_lock.cc	2021-09-28 11:46:34.000000000 +0000
@@ -508,8 +508,7 @@
 }
 
 static void exec_test_cmd(MYSQL_SESSION session, const char *test_cmd,
-                          void *p MY_ATTRIBUTE((unused)),
-                          struct st_plugin_ctx *ctx) {
+                          void *p [[maybe_unused]], struct st_plugin_ctx *ctx) {
   char buffer[STRING_BUFFER_SIZE];
   COM_DATA cmd;
 
@@ -981,7 +980,7 @@
   return 0;
 }
 
-static int test_sql_service_plugin_deinit(void *p MY_ATTRIBUTE((unused))) {
+static int test_sql_service_plugin_deinit(void *p [[maybe_unused]]) {
   DBUG_TRACE;
   LogPluginErr(INFORMATION_LEVEL, ER_LOG_PRINTF_MSG, "Uninstallation.");
   deinit_logging_service_for_plugin(&reg_srv, &log_bi, &log_bs);
diff -Nru mysql-8.0-8.0.26/plugin/test_service_sql_api/test_sql_processlist.cc mysql-8.0-8.0.27/plugin/test_service_sql_api/test_sql_processlist.cc
--- mysql-8.0-8.0.26/plugin/test_service_sql_api/test_sql_processlist.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/test_service_sql_api/test_sql_processlist.cc	2021-09-28 11:46:34.000000000 +0000
@@ -591,7 +591,7 @@
 }
 
 static void exec_test_cmd(MYSQL_SESSION session, const char *test_cmd,
-                          void *p MY_ATTRIBUTE((unused)), void *ctx) {
+                          void *p [[maybe_unused]], void *ctx) {
   char buffer[STRING_BUFFER_SIZE];
   struct st_plugin_ctx *pctx = (struct st_plugin_ctx *)ctx;
 
@@ -771,7 +771,7 @@
   return 0;
 }
 
-static int test_sql_service_plugin_deinit(void *p MY_ATTRIBUTE((unused))) {
+static int test_sql_service_plugin_deinit(void *p [[maybe_unused]]) {
   DBUG_TRACE;
   LogPluginErr(INFORMATION_LEVEL, ER_LOG_PRINTF_MSG, "Uninstallation.");
   deinit_logging_service_for_plugin(&reg_srv, &log_bi, &log_bs);
diff -Nru mysql-8.0-8.0.26/plugin/test_service_sql_api/test_sql_replication.cc mysql-8.0-8.0.27/plugin/test_service_sql_api/test_sql_replication.cc
--- mysql-8.0-8.0.26/plugin/test_service_sql_api/test_sql_replication.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/test_service_sql_api/test_sql_replication.cc	2021-09-28 11:46:34.000000000 +0000
@@ -682,7 +682,7 @@
 
 static void run_statement(MYSQL_SESSION session, const char *query,
                           struct st_plugin_ctx *ctx, bool generates_result_set,
-                          void *p MY_ATTRIBUTE((unused))) {
+                          void *p [[maybe_unused]]) {
   char buffer[STRING_BUFFER_SIZE];
   COM_DATA cmd;
 
@@ -720,7 +720,7 @@
 
 void static change_current_db(MYSQL_SESSION session, const char *db,
                               struct st_plugin_ctx *ctx,
-                              void *p MY_ATTRIBUTE((unused))) {
+                              void *p [[maybe_unused]]) {
   char buffer[STRING_BUFFER_SIZE];
   COM_DATA cmd;
   cmd.com_init_db.db_name = db;
@@ -857,7 +857,7 @@
   return 0;
 }
 
-static int test_sql_service_plugin_deinit(void *p MY_ATTRIBUTE((unused))) {
+static int test_sql_service_plugin_deinit(void *p [[maybe_unused]]) {
   DBUG_TRACE;
   LogPluginErr(INFORMATION_LEVEL, ER_LOG_PRINTF_MSG, "Uninstallation.");
   deinit_logging_service_for_plugin(&reg_srv, &log_bi, &log_bs);
diff -Nru mysql-8.0-8.0.26/plugin/test_service_sql_api/test_sql_reset_connection.cc mysql-8.0-8.0.27/plugin/test_service_sql_api/test_sql_reset_connection.cc
--- mysql-8.0-8.0.26/plugin/test_service_sql_api/test_sql_reset_connection.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/test_service_sql_api/test_sql_reset_connection.cc	2021-09-28 11:46:34.000000000 +0000
@@ -706,7 +706,7 @@
   return 0;
 }
 
-static int test_sql_service_plugin_deinit(void *p MY_ATTRIBUTE((unused))) {
+static int test_sql_service_plugin_deinit(void *p [[maybe_unused]]) {
   DBUG_TRACE;
   LogPluginErr(INFORMATION_LEVEL, ER_LOG_PRINTF_MSG, "Uninstallation.");
 
diff -Nru mysql-8.0-8.0.26/plugin/test_service_sql_api/test_sql_shutdown.cc mysql-8.0-8.0.27/plugin/test_service_sql_api/test_sql_shutdown.cc
--- mysql-8.0-8.0.26/plugin/test_service_sql_api/test_sql_shutdown.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/test_service_sql_api/test_sql_shutdown.cc	2021-09-28 11:46:34.000000000 +0000
@@ -532,7 +532,7 @@
 }
 
 static void exec_test_cmd(MYSQL_SESSION session, const char *test_cmd,
-                          void *p MY_ATTRIBUTE((unused)), void *ctx) {
+                          void *p [[maybe_unused]], void *ctx) {
   WRITE_VAL("%s\n", test_cmd);
   struct st_plugin_ctx *pctx = (struct st_plugin_ctx *)ctx;
   COM_DATA cmd;
@@ -626,7 +626,7 @@
   outfile = my_open(filename, O_CREAT | O_RDWR, MYF(0));
 }
 
-static int test_sql_service_plugin_init(void *p MY_ATTRIBUTE((unused))) {
+static int test_sql_service_plugin_init(void *p [[maybe_unused]]) {
   DBUG_TRACE;
   if (init_logging_service_for_plugin(&reg_srv, &log_bi, &log_bs)) return 1;
   LogPluginErr(INFORMATION_LEVEL, ER_LOG_PRINTF_MSG, "Installation.");
diff -Nru mysql-8.0-8.0.26/plugin/test_service_sql_api/test_sql_sqlmode.cc mysql-8.0-8.0.27/plugin/test_service_sql_api/test_sql_sqlmode.cc
--- mysql-8.0-8.0.26/plugin/test_service_sql_api/test_sql_sqlmode.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/test_service_sql_api/test_sql_sqlmode.cc	2021-09-28 11:46:34.000000000 +0000
@@ -761,7 +761,7 @@
 
 static void run_statement(MYSQL_SESSION session, const char *query,
                           struct st_plugin_ctx *ctx, bool generates_result_set,
-                          void *p MY_ATTRIBUTE((unused))) {
+                          void *p [[maybe_unused]]) {
   char buffer[STRING_BUFFER_SIZE];
   COM_DATA cmd;
 
@@ -799,7 +799,7 @@
 
 void static change_current_db(MYSQL_SESSION session, const char *db,
                               struct st_plugin_ctx *ctx,
-                              void *p MY_ATTRIBUTE((unused))) {
+                              void *p [[maybe_unused]]) {
   char buffer[STRING_BUFFER_SIZE];
   COM_DATA cmd;
   cmd.com_init_db.db_name = db;
@@ -939,7 +939,7 @@
   return 0;
 }
 
-static int test_sql_service_plugin_deinit(void *p MY_ATTRIBUTE((unused))) {
+static int test_sql_service_plugin_deinit(void *p [[maybe_unused]]) {
   DBUG_TRACE;
   LogPluginErr(INFORMATION_LEVEL, ER_LOG_PRINTF_MSG, "Uninstallation.");
   deinit_logging_service_for_plugin(&reg_srv, &log_bi, &log_bs);
diff -Nru mysql-8.0-8.0.26/plugin/test_service_sql_api/test_sql_stmt.cc mysql-8.0-8.0.27/plugin/test_service_sql_api/test_sql_stmt.cc
--- mysql-8.0-8.0.26/plugin/test_service_sql_api/test_sql_stmt.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/test_service_sql_api/test_sql_stmt.cc	2021-09-28 11:46:34.000000000 +0000
@@ -728,7 +728,7 @@
 
 static void run_cmd(MYSQL_SESSION session, enum_server_command cmd,
                     COM_DATA *data, Server_context *ctx,
-                    bool generates_result_set, void *p MY_ATTRIBUTE((unused))) {
+                    bool generates_result_set, void *p [[maybe_unused]]) {
   char buffer[STRING_BUFFER_SIZE];
   WRITE_DASHED_LINE();
 
@@ -1956,7 +1956,7 @@
   return 0;
 }
 
-static int test_sql_service_plugin_deinit(void *p MY_ATTRIBUTE((unused))) {
+static int test_sql_service_plugin_deinit(void *p [[maybe_unused]]) {
   DBUG_TRACE;
   LogPluginErr(INFORMATION_LEVEL, ER_LOG_PRINTF_MSG, "Uninstallation.");
   deinit_logging_service_for_plugin(&reg_srv, &log_bi, &log_bs);
diff -Nru mysql-8.0-8.0.26/plugin/test_service_sql_api/test_sql_stored_procedures_functions.cc mysql-8.0-8.0.27/plugin/test_service_sql_api/test_sql_stored_procedures_functions.cc
--- mysql-8.0-8.0.26/plugin/test_service_sql_api/test_sql_stored_procedures_functions.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/test_service_sql_api/test_sql_stored_procedures_functions.cc	2021-09-28 11:46:34.000000000 +0000
@@ -714,7 +714,7 @@
 
 static void run_statement(MYSQL_SESSION session, const char *query,
                           struct st_plugin_ctx *ctx, bool generates_result_set,
-                          void *p MY_ATTRIBUTE((unused))) {
+                          void *p [[maybe_unused]]) {
   char buffer[STRING_BUFFER_SIZE];
   COM_DATA cmd;
 
@@ -752,7 +752,7 @@
 
 void static change_current_db(MYSQL_SESSION session, const char *db,
                               struct st_plugin_ctx *ctx,
-                              void *p MY_ATTRIBUTE((unused))) {
+                              void *p [[maybe_unused]]) {
   char buffer[STRING_BUFFER_SIZE];
   COM_DATA cmd;
   cmd.com_init_db.db_name = db;
@@ -893,7 +893,7 @@
   return 0;
 }
 
-static int test_sql_service_plugin_deinit(void *p MY_ATTRIBUTE((unused))) {
+static int test_sql_service_plugin_deinit(void *p [[maybe_unused]]) {
   DBUG_TRACE;
   LogPluginErr(INFORMATION_LEVEL, ER_LOG_PRINTF_MSG, "Uninstallation.");
   deinit_logging_service_for_plugin(&reg_srv, &log_bi, &log_bs);
diff -Nru mysql-8.0-8.0.26/plugin/test_service_sql_api/test_sql_views_triggers.cc mysql-8.0-8.0.27/plugin/test_service_sql_api/test_sql_views_triggers.cc
--- mysql-8.0-8.0.26/plugin/test_service_sql_api/test_sql_views_triggers.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/test_service_sql_api/test_sql_views_triggers.cc	2021-09-28 11:46:34.000000000 +0000
@@ -714,7 +714,7 @@
 
 static void run_statement(MYSQL_SESSION session, const char *query,
                           struct st_plugin_ctx *ctx, bool generates_result_set,
-                          void *p MY_ATTRIBUTE((unused))) {
+                          void *p [[maybe_unused]]) {
   char buffer[STRING_BUFFER_SIZE];
   COM_DATA cmd;
 
@@ -752,7 +752,7 @@
 
 void static change_current_db(MYSQL_SESSION session, const char *db,
                               struct st_plugin_ctx *ctx,
-                              void *p MY_ATTRIBUTE((unused))) {
+                              void *p [[maybe_unused]]) {
   char buffer[STRING_BUFFER_SIZE];
   COM_DATA cmd;
   cmd.com_init_db.db_name = db;
@@ -892,7 +892,7 @@
   return 0;
 }
 
-static int test_sql_service_plugin_deinit(void *p MY_ATTRIBUTE((unused))) {
+static int test_sql_service_plugin_deinit(void *p [[maybe_unused]]) {
   DBUG_TRACE;
   LogPluginErr(INFORMATION_LEVEL, ER_LOG_PRINTF_MSG, "Uninstallation.");
   deinit_logging_service_for_plugin(&reg_srv, &log_bi, &log_bs);
diff -Nru mysql-8.0-8.0.26/plugin/test_service_sql_api/test_x_sessions_deinit.cc mysql-8.0-8.0.27/plugin/test_service_sql_api/test_x_sessions_deinit.cc
--- mysql-8.0-8.0.26/plugin/test_service_sql_api/test_x_sessions_deinit.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/test_service_sql_api/test_x_sessions_deinit.cc	2021-09-28 11:46:34.000000000 +0000
@@ -191,7 +191,7 @@
     my_thread_join(&context.thread, nullptr);
 }
 
-static int test_session_service_plugin_init(void *p MY_ATTRIBUTE((unused))) {
+static int test_session_service_plugin_init(void *p [[maybe_unused]]) {
   DBUG_TRACE;
   if (init_logging_service_for_plugin(&reg_srv, &log_bi, &log_bs)) return 1;
   LogPluginErr(INFORMATION_LEVEL, ER_LOG_PRINTF_MSG, "Installation.");
diff -Nru mysql-8.0-8.0.26/plugin/test_service_sql_api/test_x_sessions_init.cc mysql-8.0-8.0.27/plugin/test_service_sql_api/test_x_sessions_init.cc
--- mysql-8.0-8.0.26/plugin/test_service_sql_api/test_x_sessions_init.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/test_service_sql_api/test_x_sessions_init.cc	2021-09-28 11:46:34.000000000 +0000
@@ -140,7 +140,7 @@
   }
 }
 
-static void test_session_non_reverse(void *p MY_ATTRIBUTE((unused))) {
+static void test_session_non_reverse(void *p [[maybe_unused]]) {
   char buffer[STRING_BUFFER_SIZE];
   DBUG_TRACE;
 
@@ -172,7 +172,7 @@
   WRITE_VAL("Number of open sessions: %d\n", session_count);
 }
 
-static void test_session_only_open(void *p MY_ATTRIBUTE((unused))) {
+static void test_session_only_open(void *p [[maybe_unused]]) {
   char buffer[STRING_BUFFER_SIZE];
   DBUG_TRACE;
 
@@ -282,7 +282,7 @@
   return 0;
 }
 
-static int test_session_service_plugin_deinit(void *p MY_ATTRIBUTE((unused))) {
+static int test_session_service_plugin_deinit(void *p [[maybe_unused]]) {
   DBUG_TRACE;
   LogPluginErr(INFORMATION_LEVEL, ER_LOG_PRINTF_MSG, "Uninstallation.");
   deinit_logging_service_for_plugin(&reg_srv, &log_bi, &log_bs);
diff -Nru mysql-8.0-8.0.26/plugin/udf_services/test_udf_services.cc mysql-8.0-8.0.27/plugin/udf_services/test_udf_services.cc
--- mysql-8.0-8.0.26/plugin/udf_services/test_udf_services.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/udf_services/test_udf_services.cc	2021-09-28 11:46:34.000000000 +0000
@@ -124,10 +124,9 @@
   @retval     false     success
   @retval     true      Failure. Error in the message argument
 */
-PLUGIN_EXPORT bool test_udf_services_udf_init(
-    UDF_INIT *initid MY_ATTRIBUTE((unused)),
-    UDF_ARGS *args MY_ATTRIBUTE((unused)),
-    char *message MY_ATTRIBUTE((unused))) {
+PLUGIN_EXPORT bool test_udf_services_udf_init(UDF_INIT *initid [[maybe_unused]],
+                                              UDF_ARGS *args [[maybe_unused]],
+                                              char *message [[maybe_unused]]) {
   return false;
 }
 
@@ -139,11 +138,12 @@
   @param[out] is_null   If the result is null, store 1 here
   @param[out] error     On error store 1 here
 */
-PLUGIN_EXPORT longlong
-test_udf_services_udf(UDF_INIT *initid MY_ATTRIBUTE((unused)),
-                      UDF_ARGS *args MY_ATTRIBUTE((unused)),
-                      unsigned char *is_null MY_ATTRIBUTE((unused)),
-                      unsigned char *error MY_ATTRIBUTE((unused))) {
+PLUGIN_EXPORT longlong test_udf_services_udf(UDF_INIT *initid [[maybe_unused]],
+                                             UDF_ARGS *args [[maybe_unused]],
+                                             unsigned char *is_null
+                                             [[maybe_unused]],
+                                             unsigned char *error
+                                             [[maybe_unused]]) {
   char buffer[10];
   *is_null = 0;
   *error = 0;
diff -Nru mysql-8.0-8.0.26/plugin/version_token/version_token.cc mysql-8.0-8.0.27/plugin/version_token/version_token.cc
--- mysql-8.0-8.0.26/plugin/version_token/version_token.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/version_token/version_token.cc	2021-09-28 11:46:34.000000000 +0000
@@ -437,9 +437,9 @@
   @param event_class  audit API event class
   @param event        pointer to the audit API event data
 */
-static int version_token_check(
-    MYSQL_THD thd, mysql_event_class_t event_class MY_ATTRIBUTE((unused)),
-    const void *event) {
+static int version_token_check(MYSQL_THD thd,
+                               mysql_event_class_t event_class [[maybe_unused]],
+                               const void *event) {
   char *sess_var;
 
   const struct mysql_event_general *event_general =
@@ -537,7 +537,7 @@
 };
 
 /** Plugin init. */
-static int version_tokens_init(void *arg MY_ATTRIBUTE((unused))) {
+static int version_tokens_init(void *arg [[maybe_unused]]) {
 #ifdef HAVE_PSI_INTERFACE
   // Initialize psi keys.
   vtoken_init_psi_keys();
@@ -568,7 +568,7 @@
 }
 
 /** Plugin deinit. */
-static int version_tokens_deinit(void *arg MY_ATTRIBUTE((unused))) {
+static int version_tokens_deinit(void *arg [[maybe_unused]]) {
   SERVICE_TYPE(registry) *r = mysql_plugin_registry_acquire();
   {
     my_service<SERVICE_TYPE(dynamic_privilege_register)> service(
diff -Nru mysql-8.0-8.0.26/plugin/x/client/CMakeLists.txt mysql-8.0-8.0.27/plugin/x/client/CMakeLists.txt
--- mysql-8.0-8.0.26/plugin/x/client/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/x/client/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -26,7 +26,9 @@
 SET(CLIENT_LITE_LIB_NAME mysqlxclient_lite)
 
 INCLUDE(source_files.cmake)
-LIST(APPEND CLIENT_SRC "${CMAKE_SOURCE_DIR}/sql-common/net_ns.cc")
+IF(HAVE_SETNS)
+  LIST(APPEND CLIENT_SRC "${CMAKE_SOURCE_DIR}/sql-common/net_ns.cc")
+ENDIF()
 
 INCLUDE_DIRECTORIES(
   ${MYSQLX_GENERATE_DIR}
diff -Nru mysql-8.0-8.0.26/plugin/x/client/xconnection_impl.cc mysql-8.0-8.0.27/plugin/x/client/xconnection_impl.cc
--- mysql-8.0-8.0.26/plugin/x/client/xconnection_impl.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/x/client/xconnection_impl.cc	2021-09-28 11:46:34.000000000 +0000
@@ -692,7 +692,7 @@
 
   // When mode it set to Ssl_config::Mode_ssl_verify_ca
   // then lower layers are going to verify it
-  unsigned long error;  // NOLINT
+  unsigned long error{false};  // NOLINT
   if (0 != sslconnect(m_vioSslFd, m_vio, 60, &error, nullptr)) {
     return get_ssl_error(error);
   }
diff -Nru mysql-8.0-8.0.26/plugin/x/client/xprotocol_impl.cc mysql-8.0-8.0.27/plugin/x/client/xprotocol_impl.cc
--- mysql-8.0-8.0.26/plugin/x/client/xprotocol_impl.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/x/client/xprotocol_impl.cc	2021-09-28 11:46:34.000000000 +0000
@@ -437,7 +437,7 @@
   };
   /*
     Use dummy, otherwise g++ 4.4 reports: unused variable 'dummy'
-    MY_ATTRIBUTE((unused)) did not work, so we must use it.
+    [[maybe_unused]] did not work, so we must use it.
   */
   dummy = 0;
 
diff -Nru mysql-8.0-8.0.26/plugin/x/client/xquery_result_impl.cc mysql-8.0-8.0.27/plugin/x/client/xquery_result_impl.cc
--- mysql-8.0-8.0.26/plugin/x/client/xquery_result_impl.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/x/client/xquery_result_impl.cc	2021-09-28 11:46:34.000000000 +0000
@@ -138,7 +138,7 @@
       m_instance_id(m_query_instances->instances_fetch_begin()),
       m_context(context) {
   m_notice_handler_id = m_protocol->add_notice_handler(
-      [this](XProtocol *protocol MY_ATTRIBUTE((unused)), const bool is_global,
+      [this](XProtocol *protocol [[maybe_unused]], const bool is_global,
              const Mysqlx::Notice::Frame::Type type, const char *payload,
              const uint32_t payload_size) -> Handler_result {
         if (is_global) return Handler_result::Continue;
diff -Nru mysql-8.0-8.0.26/plugin/x/client/xrow_impl.cc mysql-8.0-8.0.27/plugin/x/client/xrow_impl.cc
--- mysql-8.0-8.0.26/plugin/x/client/xrow_impl.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/x/client/xrow_impl.cc	2021-09-28 11:46:34.000000000 +0000
@@ -33,7 +33,7 @@
 namespace xcl {
 namespace details {
 
-std::string as_string(const Column_metadata &m MY_ATTRIBUTE((unused)),
+std::string as_string(const Column_metadata &m [[maybe_unused]],
                       const std::set<std::string> &values) {
   std::string result;
   bool first = true;
@@ -49,22 +49,22 @@
   return result;
 }
 
-std::string as_string(const Column_metadata &m MY_ATTRIBUTE((unused)),
+std::string as_string(const Column_metadata &m [[maybe_unused]],
                       const std::string &value) {
   return value;
 }
 
-std::string as_string(const Column_metadata &m MY_ATTRIBUTE((unused)),
+std::string as_string(const Column_metadata &m [[maybe_unused]],
                       const Time &value) {
   return value.to_string();
 }
 
-std::string as_string(const Column_metadata &m MY_ATTRIBUTE((unused)),
+std::string as_string(const Column_metadata &m [[maybe_unused]],
                       const DateTime &value) {
   return value.to_string();
 }
 
-std::string as_string(const Column_metadata &m MY_ATTRIBUTE((unused)),
+std::string as_string(const Column_metadata &m [[maybe_unused]],
                       const Decimal &value) {
   return value.to_string();
 }
@@ -97,7 +97,7 @@
 }
 
 template <typename Value_type>
-std::string as_string(const Column_metadata &m MY_ATTRIBUTE((unused)),
+std::string as_string(const Column_metadata &m [[maybe_unused]],
                       const Value_type &value) {
   return std::to_string(value);
 }
diff -Nru mysql-8.0-8.0.26/plugin/x/client/xsession_impl.cc mysql-8.0-8.0.27/plugin/x/client/xsession_impl.cc
--- mysql-8.0-8.0.26/plugin/x/client/xsession_impl.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/x/client/xsession_impl.cc	2021-09-28 11:46:34.000000000 +0000
@@ -700,10 +700,10 @@
   auto context = m_context;
 
   m_protocol->add_notice_handler(
-      [context](XProtocol *p MY_ATTRIBUTE((unused)),
-                const bool is_global MY_ATTRIBUTE((unused)),
-                const Mysqlx::Notice::Frame::Type type MY_ATTRIBUTE((unused)),
-                const char *payload MY_ATTRIBUTE((unused)),
+      [context](XProtocol *p [[maybe_unused]],
+                const bool is_global [[maybe_unused]],
+                const Mysqlx::Notice::Frame::Type type [[maybe_unused]],
+                const char *payload [[maybe_unused]],
                 const uint32_t payload_size MY_ATTRIBUTE(
                     (unused))) -> Handler_result {
         return context->m_consume_all_notices ? Handler_result::Consumed
@@ -717,8 +717,8 @@
   auto context = m_context;
 
   m_protocol->add_notice_handler(
-      [context](XProtocol *p MY_ATTRIBUTE((unused)),
-                const bool is_global MY_ATTRIBUTE((unused)),
+      [context](XProtocol *p [[maybe_unused]],
+                const bool is_global [[maybe_unused]],
                 const Mysqlx::Notice::Frame::Type type, const char *payload,
                 const uint32_t payload_size) -> Handler_result {
         return handle_notices(context, type, payload, payload_size);
diff -Nru mysql-8.0-8.0.26/plugin/x/CMakeLists.txt mysql-8.0-8.0.27/plugin/x/CMakeLists.txt
--- mysql-8.0-8.0.26/plugin/x/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/x/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -27,9 +27,6 @@
 SET(MYSQLX_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
 SET(MYSQLX_PLUGIN_NAME "mysqlx")
 
-# Protobuf 3 will generate #if PROTOBUF_INLINE_NOT_IN_HEADERS
-# which may fail with -Werror=undef
-ADD_DEFINITIONS(-DPROTOBUF_INLINE_NOT_IN_HEADERS=0)
 IF(WIN32)
   # Activate necessary dllexport/dllimport declarations.
   ADD_DEFINITIONS(-DPROTOBUF_USE_DLLS)
@@ -89,13 +86,6 @@
   COMPILE_FLAGS "${MYSQLX_PROTOCOL_FLAGS}"
 )
 
-# assertion failed in function assert_with_dumps() @ ssa.c:621 when using -xO3
-IF(MY_COMPILER_IS_SUNPRO)
-  ADD_COMPILE_FLAGS(${MYSQLX_PROJECT_DIR}/src/client.cc
-    COMPILE_FLAGS "-xO2"
-  )
-ENDIF()
-
 # MYSQL_ADD_PLUGIN may have disabled the plugin.
 IF(WITH_MYSQLX)
   MYSQL_ADD_PLUGIN(${MYSQLX_PLUGIN_NAME}
diff -Nru mysql-8.0-8.0.26/plugin/x/protocol/stream/compression/compression_algorithm_zstd.h mysql-8.0-8.0.27/plugin/x/protocol/stream/compression/compression_algorithm_zstd.h
--- mysql-8.0-8.0.26/plugin/x/protocol/stream/compression/compression_algorithm_zstd.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/x/protocol/stream/compression/compression_algorithm_zstd.h	2021-09-28 11:46:34.000000000 +0000
@@ -53,8 +53,7 @@
 
   ~Compression_algorithm_zstd() override { ZSTD_freeCStream(m_stream); }
 
-  void set_pledged_source_size(
-      const int src_size MY_ATTRIBUTE((unused))) override {
+  void set_pledged_source_size(const int src_size [[maybe_unused]]) override {
     DBUG_TRACE;
     DBUG_LOG("debug", "set_pledged_source_size(" << src_size << ")");
 #if ZSTD_VERSION_NUMBER < 10400
diff -Nru mysql-8.0-8.0.26/plugin/x/src/client.cc mysql-8.0-8.0.27/plugin/x/src/client.cc
--- mysql-8.0-8.0.26/plugin/x/src/client.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/x/src/client.cc	2021-09-28 11:46:34.000000000 +0000
@@ -320,7 +320,8 @@
           s->handle_message(*request);
         }
         break;
-      }  // Fall through.
+      }
+      [[fallthrough]];
 
     default:
       // invalid message at this time
@@ -420,7 +421,7 @@
     } break;
 
     case xpl::Connection_namedpipe:
-    case xpl::Connection_unixsocket:  // fall through
+    case xpl::Connection_unixsocket:
       m_client_host = "localhost";
       return;
 
@@ -511,7 +512,7 @@
   }
 }
 
-void Client::on_session_close(xpl::iface::Session *s MY_ATTRIBUTE((unused))) {
+void Client::on_session_close(xpl::iface::Session *s [[maybe_unused]]) {
   log_debug("%s: Session %i removed", client_id(), s->session_id());
 
   // no more open sessions, disconnect
@@ -519,7 +520,7 @@
   remove_client_from_server();
 }
 
-void Client::on_session_reset(xpl::iface::Session *s MY_ATTRIBUTE((unused))) {
+void Client::on_session_reset(xpl::iface::Session *s [[maybe_unused]]) {
   log_debug("%s: Resetting session %i", client_id(), s->session_id());
 
   if (!create_session()) {
diff -Nru mysql-8.0-8.0.26/plugin/x/src/expect/expect_stack.cc mysql-8.0-8.0.27/plugin/x/src/expect/expect_stack.cc
--- mysql-8.0-8.0.26/plugin/x/src/expect/expect_stack.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/x/src/expect/expect_stack.cc	2021-09-28 11:46:34.000000000 +0000
@@ -113,7 +113,8 @@
     // if a block open or close arrives in a failed state, we let it through
     // so that they can be pushed/popped on the stack and properly accounted
     switch (msgid) {
-      case Mysqlx::ClientMessages::EXPECT_OPEN:  // fall through
+      case Mysqlx::ClientMessages::EXPECT_OPEN:
+        [[fallthrough]];
       case Mysqlx::ClientMessages::EXPECT_CLOSE:
         break;
 
diff -Nru mysql-8.0-8.0.26/plugin/x/src/expr_generator.cc mysql-8.0-8.0.27/plugin/x/src/expr_generator.cc
--- mysql-8.0-8.0.26/plugin/x/src/expr_generator.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/x/src/expr_generator.cc	2021-09-28 11:46:34.000000000 +0000
@@ -447,7 +447,7 @@
         m_qb->put(")");
         break;
       }
-      // Fall through.
+      [[fallthrough]];
 
     default:
       m_qb->put("(");
diff -Nru mysql-8.0-8.0.26/plugin/x/src/ngs/client.cc mysql-8.0-8.0.27/plugin/x/src/ngs/client.cc
--- mysql-8.0-8.0.26/plugin/x/src/ngs/client.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/x/src/ngs/client.cc	2021-09-28 11:46:34.000000000 +0000
@@ -298,7 +298,8 @@
           s->handle_message(*request);
         }
         break;
-      }  // Fall through.
+      }
+      [[fallthrough]];
 
     default:
       // invalid message at this time
@@ -398,7 +399,8 @@
     } break;
 
     case xpl::Connection_namedpipe:
-    case xpl::Connection_unixsocket:  // fall through
+    case xpl::Connection_unixsocket:
+      [[fallthrough]];
       m_client_host = "localhost";
       return;
 
@@ -489,7 +491,7 @@
   }
 }
 
-void Client::on_session_close(xpl::iface::Session *s MY_ATTRIBUTE((unused))) {
+void Client::on_session_close(xpl::iface::Session *s [[maybe_unused]]) {
   log_debug("%s: Session %i removed", client_id(), s->session_id());
 
   // no more open sessions, disconnect
@@ -497,7 +499,7 @@
   remove_client_from_server();
 }
 
-void Client::on_session_reset(xpl::iface::Session *s MY_ATTRIBUTE((unused))) {
+void Client::on_session_reset(xpl::iface::Session *s [[maybe_unused]]) {
   log_debug("%s: Resetting session %i", client_id(), s->session_id());
 
   if (!create_session()) {
diff -Nru mysql-8.0-8.0.26/plugin/x/src/ngs/command_delegate.h mysql-8.0-8.0.27/plugin/x/src/ngs/command_delegate.h
--- mysql-8.0-8.0.26/plugin/x/src/ngs/command_delegate.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/x/src/ngs/command_delegate.h	2021-09-28 11:46:34.000000000 +0000
@@ -140,9 +140,10 @@
     true  an error occurred, server will abort the command
     false ok
   */
-  virtual int start_result_metadata(
-      uint32_t num_cols, uint32_t flags MY_ATTRIBUTE((unused)),
-      const CHARSET_INFO *resultcs MY_ATTRIBUTE((unused))) {
+  virtual int start_result_metadata(uint32_t num_cols,
+                                    uint32_t flags [[maybe_unused]],
+                                    const CHARSET_INFO *resultcs
+                                    [[maybe_unused]]) {
     m_field_types.clear();
 
     /*
@@ -184,8 +185,7 @@
     false ok
   */
   virtual int field_metadata(struct st_send_field *field,
-                             const CHARSET_INFO *charset
-                                 MY_ATTRIBUTE((unused))) {
+                             const CHARSET_INFO *charset [[maybe_unused]]) {
     Field_type type = {field->type, field->flags};
     m_field_types.push_back(type);
 
@@ -199,8 +199,8 @@
     true  an error occurred, server will abort the command
     false ok
   */
-  virtual int end_result_metadata(uint server_status MY_ATTRIBUTE((unused)),
-                                  uint warn_count MY_ATTRIBUTE((unused))) {
+  virtual int end_result_metadata(uint server_status [[maybe_unused]],
+                                  uint warn_count [[maybe_unused]]) {
     return false;
   }
 
@@ -264,9 +264,7 @@
     true  an error occurred, server will abort the command
     false ok
   */
-  virtual int get_integer(longlong value MY_ATTRIBUTE((unused))) {
-    return false;
-  }
+  virtual int get_integer(longlong value [[maybe_unused]]) { return false; }
 
   /*
     Get LONGLONG value from server
@@ -278,8 +276,8 @@
     true  an error occurred, server will abort the command
     false ok
   */
-  virtual int get_longlong(longlong value MY_ATTRIBUTE((unused)),
-                           uint unsigned_flag MY_ATTRIBUTE((unused))) {
+  virtual int get_longlong(longlong value [[maybe_unused]],
+                           uint unsigned_flag [[maybe_unused]]) {
     return false;
   }
 
@@ -292,7 +290,7 @@
     true  an error occurred, server will abort the command
     false ok
   */
-  virtual int get_decimal(const decimal_t *value MY_ATTRIBUTE((unused))) {
+  virtual int get_decimal(const decimal_t *value [[maybe_unused]]) {
     return false;
   }
 
@@ -309,8 +307,8 @@
     true  an error occurred, server will abort the command
     false ok
   */
-  virtual int get_double(double value MY_ATTRIBUTE((unused)),
-                         uint32 decimals MY_ATTRIBUTE((unused))) {
+  virtual int get_double(double value [[maybe_unused]],
+                         uint32 decimals [[maybe_unused]]) {
     return false;
   }
 
@@ -323,7 +321,7 @@
     true  an error occurred during storing, server will abort the command
     false ok
   */
-  virtual int get_date(const MYSQL_TIME *value MY_ATTRIBUTE((unused))) {
+  virtual int get_date(const MYSQL_TIME *value [[maybe_unused]]) {
     return false;
   }
 
@@ -337,8 +335,8 @@
     true  an error occurred during storing, server will abort the command
     false ok
   */
-  virtual int get_time(const MYSQL_TIME *value MY_ATTRIBUTE((unused)),
-                       uint decimals MY_ATTRIBUTE((unused))) {
+  virtual int get_time(const MYSQL_TIME *value [[maybe_unused]],
+                       uint decimals [[maybe_unused]]) {
     return false;
   }
 
@@ -352,8 +350,8 @@
     true  an error occurred during storing, server will abort the command
     false ok
   */
-  virtual int get_datetime(const MYSQL_TIME *value MY_ATTRIBUTE((unused)),
-                           uint decimals MY_ATTRIBUTE((unused))) {
+  virtual int get_datetime(const MYSQL_TIME *value [[maybe_unused]],
+                           uint decimals [[maybe_unused]]) {
     return false;
   }
 
@@ -368,10 +366,9 @@
     true  an error occurred, server will abort the command
     false ok
   */
-  virtual int get_string(const char *const value MY_ATTRIBUTE((unused)),
-                         size_t length MY_ATTRIBUTE((unused)),
-                         const CHARSET_INFO *const valuecs
-                             MY_ATTRIBUTE((unused))) {
+  virtual int get_string(const char *const value [[maybe_unused]],
+                         size_t length [[maybe_unused]],
+                         const CHARSET_INFO *const valuecs [[maybe_unused]]) {
     return false;
   }
 
@@ -414,7 +411,7 @@
    Session was shutdown while command was running
 
   */
-  virtual void shutdown(int flag MY_ATTRIBUTE((unused))) { m_killed = true; }
+  virtual void shutdown(int flag [[maybe_unused]]) { m_killed = true; }
 
   /*
    Check if connection bound to this srv_session is alive
diff -Nru mysql-8.0-8.0.26/plugin/x/src/ngs/memory.h mysql-8.0-8.0.27/plugin/x/src/ngs/memory.h
--- mysql-8.0-8.0.26/plugin/x/src/ngs/memory.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/x/src/ngs/memory.h	2021-09-28 11:46:34.000000000 +0000
@@ -52,7 +52,7 @@
     typedef PFS_allocator<U> other;
   };
 
-  T *allocate(size_t n, const void *hint MY_ATTRIBUTE((unused)) = nullptr) {
+  T *allocate(size_t n, const void *hint [[maybe_unused]] = nullptr) {
     return reinterpret_cast<T *>(my_malloc(
         IS_PSI_AVAILABLE(KEY_memory_x_objects, 0), sizeof(T) * n, MYF(MY_WME)));
   }
diff -Nru mysql-8.0-8.0.26/plugin/x/src/ngs/protocol_encoder.cc mysql-8.0-8.0.27/plugin/x/src/ngs/protocol_encoder.cc
--- mysql-8.0-8.0.26/plugin/x/src/ngs/protocol_encoder.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/x/src/ngs/protocol_encoder.cc	2021-09-28 11:46:34.000000000 +0000
@@ -235,9 +235,9 @@
   log_protobuf(id, direction_name, msg);
 }
 
-void Protocol_encoder::log_protobuf(
-    const unsigned id, const char *direction_name MY_ATTRIBUTE((unused)),
-    const Message *message MY_ATTRIBUTE((unused))) {
+void Protocol_encoder::log_protobuf(const unsigned id,
+                                    const char *direction_name [[maybe_unused]],
+                                    const Message *message [[maybe_unused]]) {
 #ifdef USE_MYSQLX_FULL_PROTO
   std::string text_message;
 
@@ -296,7 +296,7 @@
 
 // for message sent as raw buffer only logging its type tag now
 void Protocol_encoder::log_protobuf(const unsigned id,
-                                    uint8_t type MY_ATTRIBUTE((unused))) {
+                                    uint8_t type [[maybe_unused]]) {
   log_debug("%u: SEND RAW- Type: %s", id, message_type_to_string(type).c_str());
 }
 
diff -Nru mysql-8.0-8.0.26/plugin/x/src/ngs/thread.cc mysql-8.0-8.0.27/plugin/x/src/ngs/thread.cc
--- mysql-8.0-8.0.26/plugin/x/src/ngs/thread.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/x/src/ngs/thread.cc	2021-09-28 11:46:34.000000000 +0000
@@ -29,8 +29,8 @@
 #include "my_sys.h"     // my_thread_stack_size NOLINT(build/include_subdir)
 #include "my_thread.h"  // NOLINT(build/include_subdir)
 
-void ngs::thread_create(PSI_thread_key key MY_ATTRIBUTE((unused)),
-                        Thread_t *thread, Start_routine_t func, void *arg) {
+void ngs::thread_create(PSI_thread_key key [[maybe_unused]], Thread_t *thread,
+                        Start_routine_t func, void *arg) {
   my_thread_attr_t connection_attrib;
 
   (void)my_thread_attr_init(&connection_attrib);
diff -Nru mysql-8.0-8.0.26/plugin/x/src/operations_factory.cc mysql-8.0-8.0.27/plugin/x/src/operations_factory.cc
--- mysql-8.0-8.0.26/plugin/x/src/operations_factory.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/x/src/operations_factory.cc	2021-09-28 11:46:34.000000000 +0000
@@ -53,7 +53,7 @@
  public:
   explicit Socket(MYSQL_SOCKET mysql_socket) : m_mysql_socket(mysql_socket) {}
 
-  Socket(PSI_socket_key key MY_ATTRIBUTE((unused)), int domain, int type,
+  Socket(PSI_socket_key key [[maybe_unused]], int domain, int type,
          int protocol)
       : m_mysql_socket(mysql_socket_socket(key, domain, type, protocol)) {}
 
@@ -63,7 +63,7 @@
     return mysql_socket_bind(m_mysql_socket, addr, len);
   }
 
-  MYSQL_SOCKET accept(PSI_socket_key key MY_ATTRIBUTE((unused)),
+  MYSQL_SOCKET accept(PSI_socket_key key [[maybe_unused]],
                       struct sockaddr *addr, socklen_t *addr_len) override {
     return mysql_socket_accept(key, m_mysql_socket, addr, addr_len);
   }
diff -Nru mysql-8.0-8.0.26/plugin/x/src/server/session_scheduler.cc mysql-8.0-8.0.27/plugin/x/src/server/session_scheduler.cc
--- mysql-8.0-8.0.26/plugin/x/src/server/session_scheduler.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/x/src/server/session_scheduler.cc	2021-09-28 11:46:34.000000000 +0000
@@ -57,18 +57,6 @@
 
   ngs::Scheduler_dynamic::thread_init();
 
-#if defined(__APPLE__) || defined(HAVE_PTHREAD_SETNAME_NP)
-  char thread_name[16];
-  static std::atomic<int> worker{0};
-  int worker_num = worker++;
-  snprintf(thread_name, sizeof(thread_name), "xpl_worker%i", worker_num);
-#ifdef __APPLE__
-  pthread_setname_np(thread_name);
-#else
-  pthread_setname_np(pthread_self(), thread_name);
-#endif
-#endif
-
   return true;
 }
 
diff -Nru mysql-8.0-8.0.26/plugin/x/src/sql_data_context.cc mysql-8.0-8.0.27/plugin/x/src/sql_data_context.cc
--- mysql-8.0-8.0.26/plugin/x/src/sql_data_context.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/x/src/sql_data_context.cc	2021-09-28 11:46:34.000000000 +0000
@@ -155,7 +155,7 @@
   PSI_THREAD_CALL(delete_current_thread)();
 
   PSI_thread *psi =
-      PSI_THREAD_CALL(new_thread)(KEY_thread_x_worker, nullptr, 0);
+      PSI_THREAD_CALL(new_thread)(KEY_thread_x_worker, 0, nullptr, 0);
   PSI_THREAD_CALL(set_thread_os_id)(psi);
   PSI_THREAD_CALL(set_thread)(psi);
 #endif /* HAVE_PSI_THREAD_INTERFACE */
diff -Nru mysql-8.0-8.0.26/plugin/x/src/streaming_command_delegate.cc mysql-8.0-8.0.27/plugin/x/src/streaming_command_delegate.cc
--- mysql-8.0-8.0.26/plugin/x/src/streaming_command_delegate.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/x/src/streaming_command_delegate.cc	2021-09-28 11:46:34.000000000 +0000
@@ -486,7 +486,7 @@
         m_proto->row_builder()->field_set(conv.get_ptr(), conv.get_length());
         break;
       }
-      /* fall through */
+      [[fallthrough]];
     default: {
       Convert_if_necessary conv(m_resultcs, value, length, valuecs);
       m_proto->row_builder()->field_string(conv.get_ptr(), conv.get_length());
diff -Nru mysql-8.0-8.0.26/plugin/x/src/udf/mysqlx_generate_document_id.cc mysql-8.0-8.0.27/plugin/x/src/udf/mysqlx_generate_document_id.cc
--- mysql-8.0-8.0.26/plugin/x/src/udf/mysqlx_generate_document_id.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/x/src/udf/mysqlx_generate_document_id.cc	2021-09-28 11:46:34.000000000 +0000
@@ -97,10 +97,10 @@
         *is_null = 1;
         return nullptr;
       }
-      // fallthrough
+      [[fallthrough]];
     case 2:
       increment = *reinterpret_cast<long long *>(args->args[1]);
-      // fallthrough
+      [[fallthrough]];
     case 1:
       offset = *reinterpret_cast<long long *>(args->args[0]);
   }
diff -Nru mysql-8.0-8.0.26/plugin/x/src/xpl_performance_schema.cc mysql-8.0-8.0.27/plugin/x/src/xpl_performance_schema.cc
--- mysql-8.0-8.0.26/plugin/x/src/xpl_performance_schema.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/x/src/xpl_performance_schema.cc	2021-09-28 11:46:34.000000000 +0000
@@ -32,8 +32,10 @@
 PSI_thread_key KEY_thread_x_worker;
 
 static PSI_thread_info all_x_threads[] = {
-    {&KEY_thread_x_acceptor, "acceptor_network", 0, 0, PSI_DOCUMENT_ME},
-    {&KEY_thread_x_worker, "worker", PSI_FLAG_USER, 0, PSI_DOCUMENT_ME},
+    {&KEY_thread_x_acceptor, "acceptor_network", "xpl_accept",
+     PSI_FLAG_AUTO_SEQNUM, 0, PSI_DOCUMENT_ME},
+    {&KEY_thread_x_worker, "worker", "xpl_worker",
+     PSI_FLAG_USER | PSI_FLAG_AUTO_SEQNUM, 0, PSI_DOCUMENT_ME},
 };
 
 PSI_mutex_key KEY_mutex_x_lock_list_access;
diff -Nru mysql-8.0-8.0.26/plugin/x/tests/driver/CMakeLists.txt mysql-8.0-8.0.27/plugin/x/tests/driver/CMakeLists.txt
--- mysql-8.0-8.0.26/plugin/x/tests/driver/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/plugin/x/tests/driver/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -22,8 +22,9 @@
 
 
 INCLUDE(source_files.cmake)
-LIST(APPEND XTEST_SRC "${CMAKE_SOURCE_DIR}/sql-common/net_ns.cc")
-
+IF(HAVE_SETNS)
+  LIST(APPEND XTEST_SRC "${CMAKE_SOURCE_DIR}/sql-common/net_ns.cc")
+ENDIF()
 
 INCLUDE_DIRECTORIES(
   ${MYSQLX_GENERATE_DIR}
diff -Nru mysql-8.0-8.0.26/router/cmake/packaging.cmake mysql-8.0-8.0.27/router/cmake/packaging.cmake
--- mysql-8.0-8.0.26/router/cmake/packaging.cmake	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/cmake/packaging.cmake	2021-09-28 11:46:34.000000000 +0000
@@ -21,10 +21,10 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
-IF(NOT WIN32)
-  SET(CPACK_ROUTER_PACKAGE_NAME "mysql-router")
-ELSE()
+IF(WIN32)
   SET(CPACK_ROUTER_PACKAGE_NAME "MySQL Router")
+ELSE()
+  SET(CPACK_ROUTER_PACKAGE_NAME "mysql-router")
 ENDIF()
 
 SET(CPACK_ROUTER_PACKAGE_VERSION ${PROJECT_VERSION_TEXT})
diff -Nru mysql-8.0-8.0.26/router/cmake/testing.cmake mysql-8.0-8.0.27/router/cmake/testing.cmake
--- mysql-8.0-8.0.26/router/cmake/testing.cmake	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/cmake/testing.cmake	2021-09-28 11:46:34.000000000 +0000
@@ -174,7 +174,18 @@
 FUNCTION(CONFIGURE_TEST_FILE_TEMPLATES SOURCE_PATH _templates)
   SET(OUT_DIR ${PROJECT_BINARY_DIR}/tests/data/)
 
-  IF(NOT BUILD_IS_SINGLE_CONFIG)
+  IF(BUILD_IS_SINGLE_CONFIG)
+    SET(ORIG_HARNESS_PLUGIN_OUTPUT_DIRECTORY ${HARNESS_PLUGIN_OUTPUT_DIRECTORY})
+    SET(HARNESS_PLUGIN_OUTPUT_DIRECTORY
+      ${CMAKE_BINARY_DIR}/plugin_output_directory)
+    SET(ROUTER_RUNTIME_DIR ${OUT_DIR})
+    FOREACH(_template ${_templates})
+      STRING(REGEX REPLACE ".in$" "" _output ${_template})
+      #MESSAGE(STATUS "Generating ${_output} from ${_template}")
+      CONFIGURE_FILE(${SOURCE_PATH}/${_template} ${OUT_DIR}/${_output})
+    ENDFOREACH()
+    SET(HARNESS_PLUGIN_OUTPUT_DIRECTORY ${OLD_HARNESS_PLUGIN_OUTPUT_DIRECTORY})
+  ELSE()
     SET(ORIG_HARNESS_PLUGIN_OUTPUT_DIRECTORY ${HARNESS_PLUGIN_OUTPUT_DIRECTORY})
     SET(PLUGIN_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/plugin_output_directory)
     FOREACH(config ${CMAKE_CONFIGURATION_TYPES})
@@ -188,53 +199,42 @@
       ENDFOREACH()
     ENDFOREACH()
     SET(HARNESS_PLUGIN_OUTPUT_DIRECTORY ${OLD_HARNESS_PLUGIN_OUTPUT_DIRECTORY})
-  ELSE()
-    SET(ORIG_HARNESS_PLUGIN_OUTPUT_DIRECTORY ${HARNESS_PLUGIN_OUTPUT_DIRECTORY})
-    SET(HARNESS_PLUGIN_OUTPUT_DIRECTORY
-      ${CMAKE_BINARY_DIR}/plugin_output_directory)
-    SET(ROUTER_RUNTIME_DIR ${OUT_DIR})
-    FOREACH(_template ${_templates})
-      STRING(REGEX REPLACE ".in$" "" _output ${_template})
-      #MESSAGE(STATUS "Generating ${_output} from ${_template}")
-      CONFIGURE_FILE(${SOURCE_PATH}/${_template} ${OUT_DIR}/${_output})
-    ENDFOREACH()
-    SET(HARNESS_PLUGIN_OUTPUT_DIRECTORY ${OLD_HARNESS_PLUGIN_OUTPUT_DIRECTORY})
   ENDIF()
 ENDFUNCTION()
 
 # Copy plain configuration files to common place in tests/data
 FUNCTION(COPY_TEST_FILES SOURCE_PATH _files)
   SET(OUT_DIR ${PROJECT_BINARY_DIR}/tests/data/)
-  IF(NOT BUILD_IS_SINGLE_CONFIG)
+  IF(BUILD_IS_SINGLE_CONFIG)
+    # Copy plain configuration files
+    FOREACH(_file ${_files})
+      CONFIGURE_FILE(${SOURCE_PATH}/${_file} ${OUT_DIR}/${_file} COPYONLY)
+    ENDFOREACH()
+    SET(HARNESS_PLUGIN_OUTPUT_DIRECTORY ${OLD_HARNESS_PLUGIN_OUTPUT_DIRECTORY})
+  ELSE()
     FOREACH(config ${CMAKE_CONFIGURATION_TYPES})
       FOREACH(_file ${_files})
         CONFIGURE_FILE(${SOURCE_PATH}/${_file}
           ${OUT_DIR}/${config}/${_file} COPYONLY)
       ENDFOREACH()
     ENDFOREACH()
-  ELSE()
-    # Copy plain configuration files
-    FOREACH(_file ${_files})
-      CONFIGURE_FILE(${SOURCE_PATH}/${_file} ${OUT_DIR}/${_file} COPYONLY)
-    ENDFOREACH()
-    SET(HARNESS_PLUGIN_OUTPUT_DIRECTORY ${OLD_HARNESS_PLUGIN_OUTPUT_DIRECTORY})
   ENDIF()
 ENDFUNCTION()
 
 # Create a directory structure inside of tests/data/${DIRECTORY_NAME}
 # (needed by some harness tests)
 FUNCTION(CREATE_HARNESS_TEST_DIRECTORY_POST_BUILD TARGET DIRECTORY_NAME)
-  IF(NOT BUILD_IS_SINGLE_CONFIG)
+  IF(BUILD_IS_SINGLE_CONFIG)
+    SET(OUT_DIR "${PROJECT_BINARY_DIR}/tests/data")
+    ADD_CUSTOM_COMMAND(TARGET ${TARGET} POST_BUILD
+      COMMAND ${CMAKE_COMMAND}
+      -E make_directory "${OUT_DIR}/var/log/${DIRECTORY_NAME}")
+  ELSE()
     SET(OUT_DIR ${PROJECT_BINARY_DIR}/tests/data/)
     FOREACH(config_ ${CMAKE_CONFIGURATION_TYPES})
       ADD_CUSTOM_COMMAND(TARGET ${TARGET} POST_BUILD
         COMMAND ${CMAKE_COMMAND}
         -E make_directory ${OUT_DIR}/${config_}/var/log/${DIRECTORY_NAME})
     ENDFOREACH()
-  ELSE()
-      SET(OUT_DIR "${PROJECT_BINARY_DIR}/tests/data")
-      ADD_CUSTOM_COMMAND(TARGET ${TARGET} POST_BUILD
-        COMMAND ${CMAKE_COMMAND}
-        -E make_directory "${OUT_DIR}/var/log/${DIRECTORY_NAME}")
   ENDIF()
 ENDFUNCTION()
diff -Nru mysql-8.0-8.0.26/router/CMakeLists.txt mysql-8.0-8.0.27/router/CMakeLists.txt
--- mysql-8.0-8.0.26/router/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -55,14 +55,6 @@
   # shared objects that build with -fPIC
   ADD_DEFINITIONS(-DRAPIDJSON_48BITPOINTER_OPTIMIZATION=0)
 
-  # Sun Studio 12.6 creates a bogus code when -x02 is used
-  # that crashes whenever std::condition_variable::wait_for() is used
-  IF(SOLARIS_INTEL AND MY_COMPILER_IS_SUNPRO)
-    STRING_APPEND(CMAKE_CXX_FLAGS_RELWITHDEBINFO " -xO1")
-    STRING_APPEND(CMAKE_CXX_FLAGS_RELEASE " -xO1")
-    STRING_APPEND(CMAKE_CXX_FLAGS_MINSIZEREL " -xO1")
-  ENDIF()
-
   # MD5_Init() and others are deprecated.
   IF(MY_COMPILER_IS_GNU_OR_CLANG)
     ADD_COMPILE_OPTIONS("-Wno-deprecated-declarations")
diff -Nru mysql-8.0-8.0.26/router/LICENSE.router mysql-8.0-8.0.27/router/LICENSE.router
--- mysql-8.0-8.0.26/router/LICENSE.router	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/LICENSE.router	2021-09-28 11:46:34.000000000 +0000
@@ -10,7 +10,7 @@
    third-party software which may be included in this distribution of
    MySQL Router 8.0.
 
-   Last updated: April 2021
+   Last updated: July 2021
 
 Licensing Information
 
diff -Nru mysql-8.0-8.0.26/router/src/harness/include/common.h mysql-8.0-8.0.27/router/src/harness/include/common.h
--- mysql-8.0-8.0.26/router/src/harness/include/common.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/include/common.h	2021-09-28 11:46:34.000000000 +0000
@@ -27,6 +27,7 @@
 
 #include <cstdlib>
 #include <functional>
+#include <map>
 #include <sstream>
 #include <string>
 #include "harness_export.h"
@@ -231,6 +232,18 @@
   std::function<void()> undo_func_;
 };
 
+/**
+ * Gets a Value from std::map for given Key. Returns provided default if the Key
+ * is not in the map.
+ */
+template <class Key, class Value>
+Value get_from_map(const std::map<Key, Value> &map, const Key &key,
+                   const Value &default_value) {
+  auto iter = map.find(key);
+  if (iter == map.end()) return default_value;
+  return iter->second;
+}
+
 }  // namespace mysql_harness
 
 #endif /* MYSQL_HARNESS_COMMON_INCLUDED */
diff -Nru mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/config_option.h mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/config_option.h
--- mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/config_option.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/config_option.h	2021-09-28 11:46:34.000000000 +0000
@@ -31,8 +31,8 @@
 #include <system_error>
 
 #include "mysql/harness/config_parser.h"
+#include "mysql/harness/stdx/attribute.h"  // STDX_NONNULL
 #include "mysql/harness/stdx/expected.h"
-#include "mysql/harness/stdx/string_view.h"
 
 namespace mysql_harness {
 enum class option_errc {
@@ -74,7 +74,7 @@
 
 class ConfigOption {
  public:
-  ConfigOption(stdx::string_view name, stdx::string_view default_value)
+  ConfigOption(std::string_view name, std::string_view default_value)
       : name_{std::move(name)},
         is_required_{false},
         default_value_{std::move(default_value)} {
@@ -83,8 +83,8 @@
     }
   }
 
-  explicit ConfigOption(::stdx::string_view name)
-      : name_{name}, is_required_{true} {
+  explicit ConfigOption(std::string_view name)
+      : name_{std::move(name)}, is_required_{true} {
     if (name.empty()) {
       throw std::invalid_argument("expected 'name' to be non-empty");
     }
diff -Nru mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/default_init_allocator.h mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/default_init_allocator.h
--- mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/default_init_allocator.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/default_init_allocator.h	2021-09-28 11:46:34.000000000 +0000
@@ -27,16 +27,6 @@
 
 #include <memory>
 
-#ifdef __SUNPRO_CC
-// workaround sun-cc's error
-//
-//    Error: A is not a member of A.
-//
-// for 'using A::A' by disabling the default-init adaptor and go directly to the
-// allocator itself.
-template <class T>
-using default_init_allocator = std::allocator<T>;
-#else
 /**
  * allocator which leaves newly constructed fields "default initialized".
  *
@@ -69,6 +59,5 @@
     a_t::construct(static_cast<A &>(*this), ptr, std::forward<Args>(args)...);
   }
 };
-#endif
 
 #endif
diff -Nru mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/dynamic_state.h mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/dynamic_state.h
--- mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/dynamic_state.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/dynamic_state.h	2021-09-28 11:46:34.000000000 +0000
@@ -39,8 +39,6 @@
 #include "harness_export.h"
 
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 
@@ -90,6 +88,8 @@
    * @brief Saves the json state object to the associated file, overwrites the
    * the file content.
    *
+   * @param is_clusterset true if the metadata is configured to work with a
+   * ClusterSet, false if a single Cluster
    * @param pretty if true the json data is written in a human readable json
    * format
    *
@@ -97,13 +97,15 @@
    * @retval true operation succeeded
    * @retval false operation failed
    */
-  bool save(bool pretty = true);
+  bool save(bool is_clusterset, bool pretty = true);
 
   /**
    * @brief Saves the json state object to the output stream given as a
    * parameter, overwrites the stream content.
    *
    * @param output_stream stream where json content should be written to
+   * @param is_clusterset true if the metadata is configured to work with a
+   * ClusterSet, false if a single Cluster
    * @param pretty if true the json data is written in a human readable json
    * format
    *
@@ -111,7 +113,8 @@
    * @retval true operation succeeded
    * @retval false operation failed
    */
-  bool save_to_stream(std::ostream &output_stream, bool pretty = true);
+  bool save_to_stream(std::ostream &output_stream, bool is_clusterset,
+                      bool pretty = true);
 
   /**
    * @brief Returns selected state object section by its name.
diff -Nru mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/event_state_tracker.h mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/event_state_tracker.h
--- mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/event_state_tracker.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/event_state_tracker.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,105 @@
+/*
+  Copyright (c) 2021, Oracle 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,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef MYSQL_HARNESS_EVENT_STATE_TRACKER_INCLUDED
+#define MYSQL_HARNESS_EVENT_STATE_TRACKER_INCLUDED
+
+#include "harness_export.h"
+
+#include <map>
+#include <mutex>
+#include <string>
+
+namespace mysql_harness {
+
+/**
+ * @brief EventStateTracker singleton object keeps track of the current known
+ * state of selected event. Can be used to track the changes of the state of
+ * selected event (for conditional logging etc.)
+ *
+ */
+class HARNESS_EXPORT EventStateTracker {
+ public:
+  /**
+   * @brief List of the events that can currently be tracked
+   *
+   */
+  enum class EventId : size_t {
+    MetadataServerConnectedOk,
+    MetadataRefreshOk,
+    GRMemberConnectedOk,
+    MetadataNodeInGR,
+    GRNodeInMetadata,
+    TargetClusterPresentInOptions,
+    ClusterWasBootstrappedAgainstClusterset
+  };
+
+  /**
+   * @brief Returns information about the selected event state change (and sets
+   * the new state of event if changed).
+   *
+   * @param state current state of the event
+   * @param event_id id of the event
+   * @param additional_tag optional tag
+   *
+   * @return information about the event state change
+   * @retval true the event state has changed since the last call
+   * @retval false the event state has NOT changed since the last call
+   */
+  bool state_changed(const int state, const EventId event_id,
+                     const std::string &additional_tag = "");
+
+  /**
+   * @brief Get the singleton object of EventStateTracker
+   *
+   */
+  static EventStateTracker &instance();
+
+  /**
+   * @brief Remove the state for a given tag for all event_id that it has
+   * registered
+   *
+   * @param tag tag of the events being removed
+   *
+   */
+  void remove_tag(const std::string &tag);
+
+  /**
+   * @brief Remove stored state for all events
+   *
+   */
+  void clear();
+
+ private:
+  EventStateTracker() = default;
+  EventStateTracker(const EventStateTracker &) = delete;
+  EventStateTracker operator=(const EventStateTracker &) = delete;
+  using Key = std::pair<size_t, size_t>;
+  std::map<Key, int> events_;
+  std::mutex events_mtx_;
+};
+
+}  // namespace mysql_harness
+
+#endif /* MYSQL_HARNESS_EVENT_STATE_TRACKER_INCLUDED */
diff -Nru mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/logging/eventlog_plugin.h mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/logging/eventlog_plugin.h
--- mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/logging/eventlog_plugin.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/logging/eventlog_plugin.h	2021-09-28 11:46:34.000000000 +0000
@@ -64,7 +64,7 @@
   ~EventlogHandler() override;
 
   // does nothing for the eventlog handler
-  void reopen(const std::string dst MY_ATTRIBUTE((unused)) = "") override {}
+  void reopen(const std::string dst [[maybe_unused]] = "") override {}
 
  private:
   void do_log(const mysql_harness::logging::Record &record) noexcept override;
diff -Nru mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/logging/logging.h mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/logging/logging.h
--- mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/logging/logging.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/logging/logging.h	2021-09-28 11:46:34.000000000 +0000
@@ -231,6 +231,8 @@
     ATTRIBUTE_GCC_FORMAT(printf, 1, 2);
 static inline void log_debug(const char *fmt, ...)
     ATTRIBUTE_GCC_FORMAT(printf, 1, 2);
+static inline void log_custom(const LogLevel log_level, const char *fmt, ...)
+    ATTRIBUTE_GCC_FORMAT(printf, 2, 3);
 
 /*
  * Define inline functions that pick up the log domain defined for the module.
@@ -290,6 +292,15 @@
   va_end(ap);
 }
 
+static inline void log_custom(const LogLevel log_level, const char *fmt, ...) {
+  extern void HARNESS_EXPORT log_message(LogLevel level, const char *module,
+                                         const char *fmt, va_list ap);
+  va_list ap;
+  va_start(ap, fmt);
+  log_message(log_level, MYSQL_ROUTER_LOG_DOMAIN, fmt, ap);
+  va_end(ap);
+}
+
 /** @} */
 
 #ifdef __cplusplus
@@ -315,6 +326,7 @@
   using mysql_harness::logging::log_warning; \
   using mysql_harness::logging::log_info;    \
   using mysql_harness::logging::log_note;    \
-  using mysql_harness::logging::log_debug;
+  using mysql_harness::logging::log_debug;   \
+  using mysql_harness::logging::log_custom;
 
 #endif  // MYSQL_HARNESS_LOGGING_INCLUDED
diff -Nru mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/logging/registry.h mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/logging/registry.h
--- mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/logging/registry.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/logging/registry.h	2021-09-28 11:46:34.000000000 +0000
@@ -262,6 +262,15 @@
 void set_log_level_for_all_loggers(Registry &registry, LogLevel level);
 
 /**
+ * Set log levels for all handlers to specified value
+ *
+ * @param registry Registry object, typically managed by DIM
+ * @param level Log level for logger
+ */
+HARNESS_EXPORT
+void set_log_level_for_all_handlers(const Registry &registry, LogLevel level);
+
+/**
  * Converts string with log timestamp precision description to
  * LogTimestampPrecision type.
  *
@@ -383,6 +392,10 @@
 HARNESS_EXPORT
 void set_log_level_for_all_loggers(LogLevel level);
 
+/** Set log level for all registered handlers. */
+HARNESS_EXPORT
+void set_log_level_for_all_handlers(LogLevel level);
+
 /** Set timestamp precision for all registered loggers. */
 HARNESS_EXPORT
 void set_timestamp_precison_for_all_loggers(LogTimestampPrecision precision);
diff -Nru mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/net_ts/buffer.h mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/net_ts/buffer.h
--- mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/net_ts/buffer.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/net_ts/buffer.h	2021-09-28 11:46:34.000000000 +0000
@@ -198,7 +198,7 @@
               std::declval<typename std::add_lvalue_reference<T>::type>()))>
 using buffer_sequence_requirements = std::integral_constant<
     bool,
-    stdx::conjunction<
+    std::conjunction<
         // check if buffer_sequence_begin(T &) and buffer_sequence_end(T &)
         // exist and return the same type
         std::is_same<Begin, End>,
@@ -212,7 +212,7 @@
 
 template <class T, class BufferType>
 struct is_buffer_sequence<
-    T, BufferType, stdx::void_t<buffer_sequence_requirements<T, BufferType>>>
+    T, BufferType, std::void_t<buffer_sequence_requirements<T, BufferType>>>
     : std::true_type {};
 
 template <class T>
@@ -246,7 +246,7 @@
 template <class T, class U = std::remove_const_t<T>>
 auto dynamic_buffer_requirements(U *__x = nullptr, const U *__const_x = nullptr,
                                  size_t __n = 0)
-    -> std::enable_if_t<stdx::conjunction<
+    -> std::enable_if_t<std::conjunction<
         // is copy constructible
         std::is_copy_constructible<U>,
         // has a const_buffers_type that's a const_buffer_sequence
diff -Nru mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/net_ts/executor.h mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/net_ts/executor.h
--- mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/net_ts/executor.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/net_ts/executor.h	2021-09-28 11:46:34.000000000 +0000
@@ -37,8 +37,8 @@
 #include <type_traits>  // decay_t, enable_if
 #include <unordered_map>
 
+#include "my_compiler.h"
 #include "mysql/harness/net_ts/netfwd.h"
-#include "mysql/harness/stdx/type_traits.h"  // conjunction, void_t
 
 namespace net {
 enum class fork_event { prepare, parent, child };
@@ -89,6 +89,9 @@
 
 // 13.5 [async.assoc.alloc]
 
+MY_COMPILER_DIAGNOSTIC_PUSH()
+MY_COMPILER_CLANG_DIAGNOSTIC_IGNORE("-Wdeprecated-declarations")
+
 template <class T, class ProtoAllocator = std::allocator<void>>
 struct associated_allocator;
 
@@ -96,7 +99,9 @@
 using associated_allocator_t =
     typename associated_allocator<T, ProtoAllocator>::type;
 
-template <class T, class ProtoAllocator, typename = stdx::void_t<>>
+MY_COMPILER_DIAGNOSTIC_POP()
+
+template <class T, class ProtoAllocator, typename = std::void_t<>>
 struct associated_allocator_impl {
   using type = ProtoAllocator;
 
@@ -107,7 +112,7 @@
 
 template <class T, class ProtoAllocator>
 struct associated_allocator_impl<T, ProtoAllocator,
-                                 stdx::void_t<typename T::allocator_type>> {
+                                 std::void_t<typename T::allocator_type>> {
   using type = typename T::allocator_type;
 
   static type __get(const T &t, const ProtoAllocator & /* a */) noexcept {
@@ -318,7 +323,7 @@
 //
 namespace impl {
 
-template <class T, class = stdx::void_t<>>
+template <class T, class = std::void_t<>>
 struct is_executor : std::false_type {};
 
 // checker for the requirements of a executor
@@ -341,7 +346,7 @@
                            void (*f)() = nullptr,
                            const std::allocator<int> &a = {})
     -> std::enable_if_t<
-        stdx::conjunction<
+        std::conjunction<
             std::is_copy_constructible<T>,
             // methods/operators must exist
             std::is_same<decltype(*__const_x == *__const_x), bool>,
@@ -353,7 +358,7 @@
             std::is_void<decltype(__x->defer(std::move(f), a))>>::value,
 
         // context() may either return execution_context & or E&
-        stdx::void_t<decltype(__x->context()), void()>>;
+        std::void_t<decltype(__x->context()), void()>>;
 
 template <class T>
 struct is_executor<T, decltype(executor_requirements<T>())> : std::true_type {};
@@ -374,11 +379,11 @@
 
 namespace impl {
 
-template <class T, class Executor, typename = stdx::void_t<>>
+template <class T, class Executor, typename = std::void_t<>>
 struct uses_executor : std::false_type {};
 
 template <class T, class Executor>
-struct uses_executor<T, Executor, stdx::void_t<typename T::executor_type>>
+struct uses_executor<T, Executor, std::void_t<typename T::executor_type>>
     : std::is_convertible<Executor, typename T::executor_type> {};
 
 }  // namespace impl
@@ -390,7 +395,7 @@
 constexpr bool uses_executor_v = uses_executor<T, Executor>::value;
 
 // 13.12 [async.assoc.exec]
-template <class T, class Executor, typename = stdx::void_t<>>
+template <class T, class Executor, typename = std::void_t<>>
 struct associated_executor_impl {
   using type = Executor;
 
@@ -401,7 +406,7 @@
 
 template <class T, class Executor>
 struct associated_executor_impl<T, Executor,
-                                stdx::void_t<typename T::executor_type>> {
+                                std::void_t<typename T::executor_type>> {
   using type = typename T::executor_type;
 
   static type __get(const T &t, const Executor & /* a */) noexcept {
diff -Nru mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/net_ts/impl/linux_epoll_io_service.h mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/net_ts/impl/linux_epoll_io_service.h
--- mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/net_ts/impl/linux_epoll_io_service.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/net_ts/impl/linux_epoll_io_service.h	2021-09-28 11:46:34.000000000 +0000
@@ -328,7 +328,7 @@
       // check the interest we remove is actually part of the requested set
       auto const ev_mask = EPOLLIN | EPOLLOUT | EPOLLERR;
       if (((it->second & ev_mask) & (revent & ev_mask)) == 0) {
-        std::cerr << "after_event_fired(" << fd << ",  "
+        std::cerr << "after_event_fired(" << fd << ", "
                   << std::bitset<32>(revent) << ") not in "
                   << std::bitset<32>(it->second) << std::endl;
         return stdx::make_unexpected(
@@ -479,7 +479,27 @@
 
     ::epoll_event ev = fd_events_[ndx];
 
-    fd_events_processed_++;
+    // if there are multiple events: get OUT before IN.
+    short revent{};
+    if (ev.events & EPOLLOUT) {
+      fd_events_[ndx].events &= ~EPOLLOUT;
+      revent = EPOLLOUT;
+    } else if (ev.events & EPOLLIN) {
+      fd_events_[ndx].events &= ~EPOLLIN;
+      revent = EPOLLIN;
+    }
+
+    // all interesting events processed, go the next one.
+    //
+    // there may be other events set like:
+    //
+    // EPOLLHUP
+    // EPOLLERR
+    //
+    // ... ignore them.
+    if ((fd_events_[ndx].events & (EPOLLIN | EPOLLOUT)) == 0) {
+      fd_events_processed_++;
+    }
 
     if ((notify_fd_ != impl::file::kInvalidHandle)
             ? (ev.data.fd == notify_fd_)
@@ -494,7 +514,7 @@
       return stdx::make_unexpected(make_error_code(std::errc::interrupted));
     }
 
-    return fd_event{ev.data.fd, static_cast<short>(ev.events)};
+    return fd_event{ev.data.fd, revent};
   }
 
  private:
diff -Nru mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/net_ts/impl/netif.h mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/net_ts/impl/netif.h
--- mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/net_ts/impl/netif.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/net_ts/impl/netif.h	2021-09-28 11:46:34.000000000 +0000
@@ -29,6 +29,7 @@
 #include <forward_list>
 #include <list>
 #include <string>
+#include <string_view>
 
 #if defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__) || \
     defined(__sun__)
@@ -55,7 +56,6 @@
 
 #include "mysql/harness/net_ts/internet.h"
 #include "mysql/harness/stdx/expected.h"
-#include "mysql/harness/stdx/string_view.h"
 
 namespace net {
 
@@ -331,7 +331,7 @@
 
 #elif defined(_WIN32)
   static stdx::expected<std::string, std::error_code> convert_wstring_to_utf8(
-      const stdx::wstring_view &ws) {
+      const std::wstring_view &ws) {
     std::string out;
 
     // first, call it with 0 to get the buffer length
diff -Nru mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/net_ts/impl/resolver.h mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/net_ts/impl/resolver.h
--- mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/net_ts/impl/resolver.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/net_ts/impl/resolver.h	2021-09-28 11:46:34.000000000 +0000
@@ -41,7 +41,6 @@
 
 #include "mysql/harness/net_ts/impl/socket_error.h"  // socket::last_error_code
 #include "mysql/harness/stdx/expected.h"
-#include "mysql/harness/stdx/type_traits.h"  // stdx::in_place
 
 namespace net {
 namespace ip {
@@ -262,7 +261,7 @@
 #endif
   }
 
-  return {stdx::in_place, ainfo, &::freeaddrinfo};
+  return {std::in_place, ainfo, &::freeaddrinfo};
 }
 
 inline stdx::expected<const char *, std::error_code> inetntop(int af,
diff -Nru mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/net_ts/internet.h mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/net_ts/internet.h
--- mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/net_ts/internet.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/net_ts/internet.h	2021-09-28 11:46:34.000000000 +0000
@@ -412,7 +412,7 @@
     inet_pton_res = ::inet_pton(AF_INET6, str, &ipv6_addr);
   }
   if (inet_pton_res == 1) {
-    return {stdx::in_place_t(), ipv6_addr, scope_id};
+    return {std::in_place, ipv6_addr, scope_id};
   } else if (inet_pton_res == 0) {
     // parse failed
     return stdx::make_unexpected(make_error_code(std::errc::invalid_argument));
diff -Nru mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/net_ts/local.h mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/net_ts/local.h
--- mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/net_ts/local.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/net_ts/local.h	2021-09-28 11:46:34.000000000 +0000
@@ -55,7 +55,6 @@
 #include "mysql/harness/net_ts/internet.h"
 #include "mysql/harness/net_ts/socket.h"
 #include "mysql/harness/stdx/expected.h"
-#include "mysql/harness/stdx/string_view.h"
 
 namespace local {
 
@@ -82,7 +81,7 @@
   // namespace' (starting with \0)
   //
   // note: can be 'constexpr' with C++2a's http://wg21.link/P0202 applied
-  basic_endpoint(stdx::string_view path) : data_{} {
+  basic_endpoint(std::string_view path) : data_{} {
     data_.sun_family = protocol_type().family();
 
     const auto truncated_path =
diff -Nru mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/net_ts/socket.h mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/net_ts/socket.h
--- mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/net_ts/socket.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/net_ts/socket.h	2021-09-28 11:46:34.000000000 +0000
@@ -143,7 +143,7 @@
   using debug = socket_option::boolean<SOL_SOCKET, SO_DEBUG>;
   using do_not_route = socket_option::boolean<SOL_SOCKET, SO_DONTROUTE>;
   using error =
-      socket_option::boolean<SOL_SOCKET, SO_ERROR>;  // not part of std
+      socket_option::integer<SOL_SOCKET, SO_ERROR>;  // not part of std
   using keep_alive = socket_option::boolean<SOL_SOCKET, SO_KEEPALIVE>;
 
   class linger;
@@ -550,7 +550,7 @@
                                                  endpoint_size);
     if (!res) return stdx::make_unexpected(res.error());
 
-    return {stdx::in_place, io_ctx, protocol_, std::move(res.value())};
+    return {std::in_place, io_ctx, protocol_, std::move(res.value())};
   }
 
   stdx::expected<socket_type, error_type> accept(io_context &io_ctx,
diff -Nru mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/net_ts/timer.h mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/net_ts/timer.h
--- mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/net_ts/timer.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/net_ts/timer.h	2021-09-28 11:46:34.000000000 +0000
@@ -28,6 +28,7 @@
 #include <chrono>
 #include <thread>  // this_thread
 
+#include "my_compiler.h"
 #include "mysql/harness/net_ts/io_context.h"
 #include "mysql/harness/net_ts/netfwd.h"
 #include "mysql/harness/stdx/expected.h"
@@ -113,6 +114,8 @@
     return expires_at(clock_type::now() + d);
   }
 
+  MY_COMPILER_DIAGNOSTIC_PUSH()
+  MY_COMPILER_CLANG_DIAGNOSTIC_IGNORE("-Wdeprecated-declarations")
   stdx::expected<void, std::error_code> wait() {
     executor_.dispatch(
         [this] {
@@ -124,6 +127,7 @@
 
     return {};
   }
+  MY_COMPILER_DIAGNOSTIC_POP()
 
   template <class CompletionToken>
   auto async_wait(CompletionToken &&token) {
diff -Nru mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/net_ts/win32_named_pipe.h mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/net_ts/win32_named_pipe.h
--- mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/net_ts/win32_named_pipe.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/net_ts/win32_named_pipe.h	2021-09-28 11:46:34.000000000 +0000
@@ -598,14 +598,14 @@
       // ERROR_NO_DATA too, it just meands the pipe is already closed, but quite
       // likely readable.
       if (last_ec == ec_pipe_connected || last_ec == ec_no_data) {
-        return {stdx::in_place, get_executor().context(), protocol,
+        return {std::in_place, get_executor().context(), protocol,
                 release().value()};
       }
 
       return stdx::make_unexpected(last_ec);
     }
 
-    return {stdx::in_place, get_executor().context(), protocol,
+    return {std::in_place, get_executor().context(), protocol,
             release().value()};
   }
 
diff -Nru mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/stdx/attribute.h mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/stdx/attribute.h
--- mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/stdx/attribute.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/stdx/attribute.h	2021-09-28 11:46:34.000000000 +0000
@@ -45,13 +45,4 @@
 #define STDX_NONNULL
 #endif
 
-// STDX_NODISCARD
-#if __has_cpp_attribute(nodiscard)
-#define STDX_NODISCARD [[nodiscard]]
-#elif __has_cpp_attribute(gnu::warn_unused_result)
-#define STDX_NODISCARD [[gnu::warn_unused_result]]
-#else
-#define STDX_NODISCARD
-#endif
-
 #endif
diff -Nru mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/stdx/bit.h mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/stdx/bit.h
--- mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/stdx/bit.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/stdx/bit.h	2021-09-28 11:46:34.000000000 +0000
@@ -57,65 +57,6 @@
 //    selects impl::bswap_N() with an 'if'
 // 2. impl::bswap() is automatically selected with std::if_enable_t<>
 //
-#if defined(__SUNPRO_CC)
-// Implementation works with all compilers, but is only used with devstudio.
-//
-// - gcc [
-//   2 byte: 1x rol
-//   4 byte: 1x bswap
-//   8 byte: 1x bswap
-//   ]
-// - clang [
-//   2 byte: 1x rol
-//   4 byte: 1x bswap
-//   8 byte: 1x bswap
-//   ]
-// - msvc (bad) [
-//   2 byte: 1x rol
-//   4 byte: 2x shl, 2x, shr, 3x or, 2x and
-//   8 byte: lots of shifts, or and ands
-//   ]
-// - devstudio [
-//   2 byte: 2x shift, 1 and, 1 or
-//   4 byte: 2x shl, 2x, shr, 3x or, 2x and
-//   8 byte:  lots of shifts, or and ands
-//
-
-constexpr uint8_t bswap_1(uint8_t t) noexcept { return t; }
-
-constexpr uint16_t bswap_2(uint16_t t) noexcept {
-  return (t & UINT16_C(0x00ff)) << (1 * 8) | (t & UINT16_C(0xff00)) >> (1 * 8);
-}
-
-constexpr uint32_t bswap_4(uint32_t t) noexcept {
-  return (t & UINT32_C(0x0000'00ff)) << (3 * 8) |
-         (t & UINT32_C(0x0000'ff00)) << (1 * 8) |
-         (t & UINT32_C(0x00ff'0000)) >> (1 * 8) |
-         (t & UINT32_C(0xff00'0000)) >> (3 * 8);
-}
-
-constexpr uint64_t bswap_8(uint64_t t) noexcept {
-  return (t & UINT64_C(0x0000'0000'0000'00ff)) << (7 * 8) |
-         (t & UINT64_C(0x0000'0000'0000'ff00)) << (5 * 8) |
-         (t & UINT64_C(0x0000'0000'00ff'0000)) << (3 * 8) |
-         (t & UINT64_C(0x0000'0000'ff00'0000)) << (1 * 8) |
-         (t & UINT64_C(0x0000'00ff'0000'0000)) >> (1 * 8) |
-         (t & UINT64_C(0x0000'ff00'0000'0000)) >> (3 * 8) |
-         (t & UINT64_C(0x00ff'0000'0000'0000)) >> (5 * 8) |
-         (t & UINT64_C(0xff00'0000'0000'0000)) >> (7 * 8);
-}
-
-template <class T>
-constexpr std::enable_if_t<
-    sizeof(T) == 1 || sizeof(T) == 2 || sizeof(T) == 4 || sizeof(T) == 8, T>
-bswap(T t) noexcept {
-  if (1 == sizeof(t)) return bswap_1(t);
-  if (2 == sizeof(t)) return bswap_2(t);
-  if (4 == sizeof(t)) return bswap_4(t);
-  if (8 == sizeof(t)) return bswap_8(t);
-}
-
-#else  // __SUNPRO_CC
 // implementation for
 //
 // - gcc [
@@ -143,11 +84,6 @@
 // MSVC provides _byteswap_uint64() and friends as instrincts, but they aren't
 // marked as constexpr.
 //
-// with devstudio it fails with:
-//
-//   Error: std::enable_if_t<sizeof((T))==1, T> stdx::impl::bswap<T>(T) already
-//   had a body defined.
-//
 template <class T>
 constexpr std::enable_if_t<sizeof(T) == 1, T> bswap(T t) noexcept {
   return t;
@@ -197,7 +133,6 @@
          (t & UINT64_C(0xff00'0000'0000'0000)) >> (7 * 8);
 #endif
 }
-#endif  // __SUNPRO_CC
 
 }  // namespace impl
 
diff -Nru mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/stdx/expected.h mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/stdx/expected.h
--- mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/stdx/expected.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/stdx/expected.h	2021-09-28 11:46:34.000000000 +0000
@@ -32,8 +32,7 @@
 #include <new>      // ::operator new
 #include <utility>  // std::forward
 
-#include "mysql/harness/stdx/type_traits.h"
-#if defined(__GNUC__) || defined(__clang__) || defined(__SUNPRO_CC)
+#if defined(__GNUC__) || defined(__clang__)
 #define RESO_ASSUME(x) \
   if (!(x)) __builtin_unreachable();
 #elif defined(_MSC_VER)
@@ -133,7 +132,7 @@
   template <class... Args,
             typename std::enable_if_t<
                 std::is_constructible<T, Args &&...>::value, void *> = nullptr>
-  void construct_value(in_place_t, Args &&... args) {
+  void construct_value(std::in_place_t, Args &&... args) {
     new (&value_) value_type(std::forward<Args>(args)...);
   }
 
@@ -147,7 +146,7 @@
   // enable inplace construction of error, if the E supports it
   template <class... Args, typename std::enable_if_t<std::is_constructible<
                                E, Args &&...>::value> * = nullptr>
-  void construct_error(in_place_t, Args &&... args) {
+  void construct_error(std::in_place_t, Args &&... args) {
     new (&error_) error_type(std::forward<Args>(args)...);
   }
 
@@ -201,7 +200,7 @@
   template <class... Args,
             typename std::enable_if_t<
                 std::is_constructible<T, Args &&...>::value, void *> = nullptr>
-  void construct_value(in_place_t, Args &&... args) {
+  void construct_value(std::in_place_t, Args &&... args) {
     new (&value_) value_type(std::forward<Args>(args)...);
   }
 
@@ -243,7 +242,7 @@
   template <
       class... Args,
       std::enable_if_t<std::is_constructible<E, Args &&...>::value> * = nullptr>
-  void construct_error(in_place_t, Args &&... args) {
+  void construct_error(std::in_place_t, Args &&... args) {
     new (&error_) error_type(std::forward<Args>(args)...);
   }
 
@@ -392,13 +391,13 @@
 };
 
 template <class B>
-using not_ = stdx::negation<B>;
+using not_ = std::negation<B>;
 
 template <class... B>
-using and_ = stdx::conjunction<B...>;
+using and_ = std::conjunction<B...>;
 
 template <class... B>
-using or_ = stdx::disjunction<B...>;
+using or_ = std::disjunction<B...>;
 
 // enable copy constructor if T and E are copy-constructible or void
 // enable move constructor if T and E are move-constructible or void
@@ -472,38 +471,11 @@
   }
 
   // enable inplace construction of value_type, if the T supports it
-  template <
-      class... Args
-#if !defined(__SUNPRO_CC)
-      // disabled the 'is_constructible' check as it triggers:
-      //
-      //  >> Assertion:   (../lnk/substitute.cc, line 1131)
-      //	      while processing ./test_expected.cc at line 4.
-      //
-      // with devstudio-12.6's CC
-      //
-      // That means:
-      //
-      // stdx::expected<std::string, void> res(stdx::in_place, 1.0); will report
-      // the error for:
-      //
-      //   Could not find a match for stdx::base::storage_t<std::string,
-      //   double>::construct_value(const stdx::in_place_t, double)
-      //
-      // Instead for
-      //
-      //   Could not find a match for stdx::base::ExpectedImpl<std::string,
-      //   double>::ExpectedImpl(const stdx::in_place_t, double)
-      //
-      // as the same check is done in construct_value() and does not trigger
-      // the assertion.
-      ,
-      typename std::enable_if_t<std::is_constructible<T, Args &&...>::value> * =
-          nullptr
-#endif
-      >
-  constexpr ExpectedImpl(in_place_t, Args &&... args) : ExpectedImplBase{true} {
-    storage_.construct_value(stdx::in_place, std::forward<Args>(args)...);
+  template <class... Args, typename std::enable_if_t<std::is_constructible<
+                               T, Args &&...>::value> * = nullptr>
+  constexpr ExpectedImpl(std::in_place_t, Args &&... args)
+      : ExpectedImplBase{true} {
+    storage_.construct_value(std::in_place, std::forward<Args>(args)...);
   }
 
   constexpr ExpectedImpl(const ExpectedImpl &other)
@@ -798,17 +770,11 @@
   }
 
   // enable inplace construction of value_type, if the T supports it
-  template <class... Args
-#if !defined(__SUNPRO_CC)
-            // see the generic ExpectedImpl(in_place_t, ...) why this check is
-            // disabled.
-            ,
-            typename std::enable_if_t<
-                std::is_constructible<T, Args &&...>::value> * = nullptr
-#endif
-            >
-  constexpr ExpectedImpl(in_place_t, Args &&... args) : ExpectedImplBase{true} {
-    storage_.construct_value(stdx::in_place, std::forward<Args>(args)...);
+  template <class... Args, typename std::enable_if_t<std::is_constructible<
+                               T, Args &&...>::value> * = nullptr>
+  constexpr ExpectedImpl(std::in_place_t, Args &&... args)
+      : ExpectedImplBase{true} {
+    storage_.construct_value(std::in_place, std::forward<Args>(args)...);
   }
 
   constexpr ExpectedImpl(const ExpectedImpl &other)
@@ -993,74 +959,12 @@
                  private base::select_ctor_base<T, E> {
  public:
   static_assert(!std::is_reference<T>::value, "T must not be a reference");
-  static_assert(!std::is_same<T, std::remove_cv<in_place_t>>::value,
-                "T must not be in_place_t");
+  static_assert(!std::is_same<T, std::remove_cv<std::in_place_t>>::value,
+                "T must not be std::in_place_t");
   static_assert(!std::is_same<T, std::remove_cv<unexpected<E>>>::value,
                 "T must not be unexpected<E>");
   static_assert(!std::is_reference<E>::value, "E must not be a reference");
 
-#if defined(__SUNPRO_CC)
-  // sunpro generates a wrong default assign-move which forces use
-  // to declare all the implicit constructors/assign-ops explicitly
-  // as default which leads to slightly worse error-messages:
-  //
-  // clang:
-  //
-  //  call to implicitly-deleted default constructor of
-  //  'stdx::expected<no_default_construct, void>'
-  //
-  //  note: default constructor of
-  //  'expected<no_default_construct, void>' is implicitly deleted
-  //    because base class 'ExpectedImpl<no_default_construct, void>' has no
-  //    default constructor
-  //
-  // vs.
-  //
-  //  call to implicitly-deleted default constructor of
-  //  'stdx::expected<no_default_construct, void>'
-  //
-  //  explicitly defaulted function was implicitly deleted here
-  //  expected() = default;
-  //
-  //  note: default constructor of
-  //  'expected<no_default_construct, void>' is implicitly deleted
-  //    because base class 'ExpectedImpl<no_default_construct, void>' has no
-  //    default constructor
-  //
-  expected() = default;
-
-  expected(const expected &) = default;
-  expected &operator=(const expected &) = default;
-
-  // sunpro generates the default move-assign, move-construct which:
-  //
-  // 1. ExpectedImpl<T, E>::operator=(std::move(other))
-  // 2. memmove(this, &other, sizeof(other));
-  //
-  // where the memmove trashes the just moved value
-
-#if 0
-  // this constructor should be only visible if T and E and move-constructible
-  // but with sunpro it leads to
-  //
-  //    CC: Fatal error in .../developerstudio12.6/lib/compilers/bin/ccfe : Signal number = 139
-  //
-  // Therefore, it is left unconditionally enabled which makes this type
-  // look move-constructible even though it may not be.
-  template <
-      bool B = std::is_move_constructible<base::select_ctor_base<T, E>>::value,
-      std::enable_if_t<B> * = nullptr>
-#endif
-  expected(expected &&other) : ExpectedImpl<T, E>{std::move(other)} {}
-
-  template <bool B = std::is_move_assignable<T>::value,
-            std::enable_if_t<B> * = nullptr>
-  expected &operator=(expected &&other) {
-    ExpectedImpl<T, E>::operator=(std::move(other));
-    return *this;
-  }
-#endif
-
   // inherit all the constructors of our base
   using ExpectedImpl<T, E>::ExpectedImpl;
 };
diff -Nru mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/stdx/expected_ostream.h mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/stdx/expected_ostream.h
--- mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/stdx/expected_ostream.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/stdx/expected_ostream.h	2021-09-28 11:46:34.000000000 +0000
@@ -30,8 +30,6 @@
 #include <ostream>
 #include <type_traits>
 
-#include "mysql/harness/stdx/type_traits.h"
-
 // operator<< for std::expected
 //
 // the functions are kept in a separate header as it
@@ -46,7 +44,7 @@
 
 template <typename S, typename T>
 struct is_to_stream_writable<
-    S, T, stdx::void_t<decltype(std::declval<S &>() << std::declval<T>())>>
+    S, T, std::void_t<decltype(std::declval<S &>() << std::declval<T>())>>
     : std::true_type {};
 
 }  // namespace impl
diff -Nru mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/stdx/string_view.h mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/stdx/string_view.h
--- mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/stdx/string_view.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/stdx/string_view.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,594 +0,0 @@
-/*
-  Copyright (c) 2019, 2021, Oracle 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,
-  as published by the Free Software Foundation.
-
-  This program is also distributed with certain software (including
-  but not limited to OpenSSL) that is licensed under separate terms,
-  as designated in a particular file or component or in included license
-  documentation.  The authors of MySQL hereby grant you an additional
-  permission to link the program and your derivative works with the
-  separately licensed software that they have included with MySQL.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-#ifndef MYSQL_HARNESS_STDX_STRING_VIEW_INCLUDED
-#define MYSQL_HARNESS_STDX_STRING_VIEW_INCLUDED
-
-#include <algorithm>   // copy_n
-#include <cstddef>     // ptrdiff_t
-#include <functional>  // hash
-#include <ostream>
-#include <stdexcept>  // out_of_range
-#include <string>
-
-#include "mysql/harness/stdx/attribute.h"
-
-namespace stdx {
-
-// implementation of C++17's std::string_view on C++11:
-//
-// see http://wg21.link/N3762
-//
-// missing features:
-//
-// - most of the find_xxx() methods
-// - padding support for ostream
-
-namespace impl {
-// constexpr variant of std::char_traits<charT>::length()
-template <class charT>
-constexpr size_t char_traits_length(const charT *s) noexcept;
-
-template <class charT>
-constexpr size_t char_traits_length(const charT *s) noexcept {
-  size_t len{};
-  for (; *s; ++s, ++len)
-    ;
-  return len;
-}
-
-#if __has_builtin(__builtin_strlen) || defined(__GNUC__)
-// strlen() isn't constexpr, but __builtin_strlen() is with GCC and clang.
-// MSVC has __builtin_strlen() too ... but how to detect that?
-template <>
-constexpr size_t char_traits_length(const char *s) noexcept {
-  return __builtin_strlen(s);
-}
-#endif
-
-#if __has_builtin(__builtin_wcslen)
-// wcslen() isn't constexpr, but __builtin_wcslen() is with clang.
-template <>
-constexpr size_t char_traits_length(const wchar_t *s) noexcept {
-  return __builtin_wcslen(s);
-}
-#endif
-
-// constexpr variant of c::std::char_traits<charT>::compare()
-template <class charT, class traits = std::char_traits<charT>>
-constexpr int char_traits_compare(const charT *a, const charT *b,
-                                  size_t len) noexcept;
-
-template <class charT, class traits>
-STDX_NONNULL constexpr int char_traits_compare(const charT *a, const charT *b,
-                                               size_t len) noexcept {
-  for (size_t ndx{}; ndx < len; ++ndx) {
-    if (traits::lt(a[ndx], b[ndx])) return -1;
-    if (traits::lt(b[ndx], a[ndx])) return 1;
-  }
-
-  return 0;
-}
-
-#if __has_builtin(__builtin_memcmp) || defined(__GNUC__)
-// in case of charT == char and and traits std::char_traits<char> we can
-// optimize by falling back to __builtin_memcmp() if it exists
-//
-// compare() isn't constexpr, but __builtin_memcmp() is with GCC and clang.
-// MSVC has __builtin_memcmp() too ... but how to detect that?
-template <>
-STDX_NONNULL constexpr int char_traits_compare<char, std::char_traits<char>>(
-    const char *a, const char *b, size_t len) noexcept {
-  if (len == 0) return 0;
-
-  return __builtin_memcmp(a, b, len);
-}
-#endif
-
-#if __has_builtin(__builtin_wmemcmp)
-// in case of charT == wchar_t and and traits std::char_traits<wchar_t> we can
-// optimize by falling back to __builtin_wmemcmp() if it exists
-//
-// compare() isn't constexpr, but __builtin_wmemcmp() is with clang.
-template <>
-STDX_NONNULL constexpr int
-char_traits_compare<wchar_t, std::char_traits<wchar_t>>(const wchar_t *a,
-                                                        const wchar_t *b,
-                                                        size_t len) noexcept {
-  if (len == 0) return 0;
-
-  return __builtin_wmemcmp(a, b, len);
-}
-#endif
-
-/**
- * find first occurence of needle in a haystack.
- *
- * @param haystack string of character to search needle in
- * @param haystack_len length of haystack in characters
- * @param needle string of characters for find in haystack
- * @param needle_len length of needle in characters
- * @returns pointer to the position where needle is found in the haystack
- * @retval nullptr if needle wasn't found
- */
-template <class charT, class traits = std::char_traits<charT>>
-STDX_NONNULL const charT *memmatch(const charT *haystack, size_t haystack_len,
-                                   const charT *needle, size_t needle_len) {
-  // a empty needle
-  if (needle_len == 0) return haystack;
-
-  const charT *haystack_end = haystack + haystack_len;
-  const charT *needle_start = needle;
-  const charT *needle_end = needle + needle_len;
-
-  for (; haystack < haystack_end; ++haystack) {
-    if (traits::eq(*haystack, *needle)) {
-      if (++needle == needle_end) {
-        // end of needle reached, all characters matched.
-        return haystack + 1 - needle_len;
-      }
-    } else if (needle != needle_start) {
-      // rewind haystack to before the needle which started the match
-      haystack -= needle - needle_start;
-
-      // reset the needle to its initial value
-      needle = needle_start;
-    }
-  }
-
-  return nullptr;
-}
-
-template <class T>
-using identity = std::decay_t<T>;
-
-}  // namespace impl
-
-template <class charT, class traits = std::char_traits<charT>>
-class basic_string_view {
- public:
-  using traits_type = traits;
-  using value_type = charT;
-  using pointer = const value_type *;
-  using const_pointer = const value_type *;
-  using reference = const value_type &;
-  using const_reference = const value_type &;
-  using const_iterator = const value_type *;
-  using iterator = const_iterator;
-  using const_reverse_iterator = std::reverse_iterator<const_iterator>;
-  using reverse_iterator = const_reverse_iterator;
-
-  using size_type = size_t;
-  using difference_type = ptrdiff_t;
-  // in C++17 we can do:
-  //
-  // static constexpr size_t npos = size_type(-1);
-  //
-  // which needs a definition in a .cc file. Using a enum should do the trick
-  // too in C++11 without a .cc file.
-  enum : size_type { npos = size_type(-1) };
-
-  constexpr basic_string_view() noexcept : ptr_(nullptr), length_(0) {}
-  constexpr basic_string_view(const basic_string_view &rhs) noexcept = default;
-  constexpr basic_string_view &operator=(const basic_string_view &) noexcept =
-      default;
-
-  template <typename Allocator>
-  constexpr basic_string_view(
-      const std::basic_string<value_type, traits_type, Allocator> &str) noexcept
-      : ptr_{str.data()}, length_{str.size()} {}
-
-  STDX_NONNULL constexpr basic_string_view(const_pointer data)
-      : ptr_{data}, length_{impl::char_traits_length(data)} {}
-
-  STDX_NONNULL constexpr basic_string_view(const_pointer data, size_type len)
-      : ptr_{data}, length_{len} {}
-
-  // [string.view.iterators]
-  constexpr const_iterator begin() const noexcept { return ptr_; }
-  constexpr const_iterator end() const noexcept { return ptr_ + length_; }
-  constexpr const_iterator cbegin() const noexcept { return begin(); }
-  constexpr const_iterator cend() const noexcept { return end(); }
-
-  constexpr const_reverse_iterator rbegin() const noexcept {
-    return const_reverse_iterator(end());
-  }
-  constexpr const_reverse_iterator rend() const noexcept {
-    return const_reverse_iterator(begin());
-  }
-  constexpr const_reverse_iterator crbegin() const noexcept {
-    return const_reverse_iterator(end());
-  }
-  constexpr const_reverse_iterator crend() const noexcept {
-    return const_reverse_iterator(begin());
-  }
-
-  // [string.view.capacity]
-  constexpr size_type size() const noexcept { return length_; }
-  constexpr size_type length() const noexcept { return length_; }
-  constexpr size_type max_size() const noexcept {
-    return (npos - sizeof(size_type)) / sizeof(value_type);
-  }
-  constexpr bool empty() const noexcept { return length_ == 0; }
-
-  // [string.view.access]
-  constexpr const_reference operator[](size_type pos) const noexcept {
-    return ptr_[pos];
-  }
-  constexpr const_reference at(size_type pos) const {
-    // we may throw if pos > length
-    return ptr_[pos];
-  }
-
-  /**
-   * first element.
-   *
-   * - Requires: !empty()
-   *
-   * @returns ref to first element
-   */
-  constexpr const_reference front() const noexcept { return ptr_[0]; }
-
-  /**
-   * last element.
-   *
-   * - Requires: !empty()
-   *
-   * @returns ref to last element
-   */
-  constexpr const_reference back() const noexcept { return ptr_[length_ - 1]; }
-
-  /**
-   * pointer to underlaying data.
-   *
-   * may not be null-terminated.
-   */
-  constexpr const_pointer data() const noexcept { return ptr_; }
-
-  // [string.view.modifiers]
-  void clear() noexcept { *this = basic_string_view(); }
-
-  // requires: n <= size()
-  void remove_prefix(size_type n) { *this = substr(n, npos); }
-
-  // requires: n <= size()
-  void remove_suffix(size_type n) { *this = substr(0, size() - n); }
-
-  void swap(basic_string_view &s) noexcept {
-    auto tmp = *this;
-    *this = s;
-    s = tmp;
-  }
-
-  // [string.view.ops]
-  template <class Allocator>
-  explicit operator std::basic_string<charT, traits, Allocator>() const {
-    return {begin(), end()};
-  }
-
-  /**
-   * copy into external buffer.
-   *
-   * if n > characters available: rest of string
-   *
-   * @param s   pointer to start of destination
-   * @param n   character-length of s
-   * @param pos start position
-   * @throws std::out_of_range if pos > size()
-   */
-  size_type copy(charT *s, size_type n, size_type pos = 0) const {
-    if (pos > size()) throw std::out_of_range("...");
-
-    size_t rlen = std::min(n, size() - pos);
-
-    std::copy_n(begin() + pos, rlen, s);
-
-    return rlen;
-  }
-
-  /**
-   * get substring of a string_view.
-   *
-   * if n > characters available: rest of string
-   *
-   * @param pos start position
-   * @param n   length of substring from start position
-   * @throws std::out_of_range if pos > size()
-   */
-  constexpr basic_string_view substr(size_type pos = 0,
-                                     size_type n = npos) const {
-    if (pos > size()) throw std::out_of_range("...");
-
-    size_t rlen = std::min(n, size() - pos);
-
-    return {data() + pos, rlen};
-  }
-
-  constexpr int compare(basic_string_view s) const noexcept {
-    size_t rlen = std::min(size(), s.size());
-
-    if (rlen > 0) {
-      int res =
-          impl::char_traits_compare<charT, traits_type>(data(), s.data(), rlen);
-      if (res != 0) return res;
-    }
-
-    return size() - s.size();
-  }
-
-  constexpr int compare(size_t pos1, size_type n1, basic_string_view s) const {
-    return substr(pos1, n1).compare(s);
-  }
-
-  constexpr int compare(size_t pos1, size_type n1, basic_string_view s,
-                        size_type pos2, size_type n2) const {
-    return substr(pos1, n1).compare(s.substr(pos2, n2));
-  }
-
-  constexpr int compare(const value_type *s) const {
-    return compare(basic_string_view(s));
-  }
-  constexpr int compare(size_t pos1, size_type n1, const value_type *s) const {
-    return compare(pos1, n1, basic_string_view(s));
-  }
-  constexpr int compare(size_t pos1, size_type n1, const value_type *s,
-                        size_type pos2, size_type n2) const {
-    return compare(pos1, n1, basic_string_view(s), pos2, n2);
-  }
-
-  // [string.view.find]
-
-  size_type find(basic_string_view str, size_type pos = 0) const noexcept {
-    if (empty() || pos > length()) {
-      if (empty() && pos == 0 && str.empty()) return 0;
-
-      return npos;
-    }
-
-    if (const charT *result = impl::memmatch<charT, traits_type>(
-            ptr_ + pos, length_ - pos, str.data(), str.size())) {
-      return result - ptr_;
-    }
-
-    return npos;
-  }
-
- private:
-  const value_type *ptr_;
-  size_type length_;
-};
-
-// ==
-template <class charT, class traits>
-constexpr bool operator==(basic_string_view<charT, traits> a,
-                          basic_string_view<charT, traits> b) noexcept {
-  return a.compare(b) == 0;
-}
-
-#if defined(_MSC_VER)
-// workaround a limitation in the MSVC name mangling which results in:
-//
-// definition with same mangled name
-// '??$?8_WU?$char_traits@_W@std@@@stdx@@YA_NV?$basic_string_view@_WU?$char_traits@_W@std@@@0@0@Z'
-// as another definition
-//
-// msvc CRT marks the operators with: TRANSITION, VSO#409326
-#define MSVC_ORDER(x) , int = x
-#else
-#define MSVC_ORDER(x) /*, int = x */
-#endif
-
-template <class charT, class traits MSVC_ORDER(1)>
-constexpr bool operator==(
-    basic_string_view<charT, traits> a,
-    impl::identity<basic_string_view<charT, traits>> b) noexcept {
-  return a.compare(b) == 0;
-}
-
-template <class charT, class traits MSVC_ORDER(2)>
-constexpr bool operator==(impl::identity<basic_string_view<charT, traits>> a,
-                          basic_string_view<charT, traits> b) noexcept {
-  return a.compare(b) == 0;
-}
-
-// !=
-template <class charT, class traits>
-constexpr bool operator!=(basic_string_view<charT, traits> a,
-                          basic_string_view<charT, traits> b) noexcept {
-  return a.compare(b) != 0;
-}
-
-template <class charT, class traits MSVC_ORDER(1)>
-constexpr bool operator!=(
-    basic_string_view<charT, traits> a,
-    impl::identity<basic_string_view<charT, traits>> b) noexcept {
-  return a.compare(b) != 0;
-}
-
-template <class charT, class traits MSVC_ORDER(2)>
-constexpr bool operator!=(impl::identity<basic_string_view<charT, traits>> a,
-                          basic_string_view<charT, traits> b) noexcept {
-  return a.compare(b) != 0;
-}
-
-// >
-template <class charT, class traits>
-constexpr bool operator>(basic_string_view<charT, traits> a,
-                         basic_string_view<charT, traits> b) noexcept {
-  return a.compare(b) > 0;
-}
-
-template <class charT, class traits MSVC_ORDER(1)>
-constexpr bool operator>(
-    basic_string_view<charT, traits> a,
-    impl::identity<basic_string_view<charT, traits>> b) noexcept {
-  return a.compare(b) > 0;
-}
-
-template <class charT, class traits MSVC_ORDER(2)>
-constexpr bool operator>(impl::identity<basic_string_view<charT, traits>> a,
-                         basic_string_view<charT, traits> b) noexcept {
-  return a.compare(b) > 0;
-}
-
-// <
-template <class charT, class traits>
-constexpr bool operator<(basic_string_view<charT, traits> a,
-                         basic_string_view<charT, traits> b) noexcept {
-  return a.compare(b) < 0;
-}
-
-template <class charT, class traits MSVC_ORDER(1)>
-constexpr bool operator<(
-    basic_string_view<charT, traits> a,
-    impl::identity<basic_string_view<charT, traits>> b) noexcept {
-  return a.compare(b) < 0;
-}
-
-template <class charT, class traits MSVC_ORDER(2)>
-constexpr bool operator<(impl::identity<basic_string_view<charT, traits>> a,
-                         basic_string_view<charT, traits> b) noexcept {
-  return a.compare(b) < 0;
-}
-
-// <=
-template <class charT, class traits>
-constexpr bool operator<=(basic_string_view<charT, traits> a,
-                          basic_string_view<charT, traits> b) noexcept {
-  return a.compare(b) <= 0;
-}
-
-template <class charT, class traits MSVC_ORDER(1)>
-constexpr bool operator<=(
-    basic_string_view<charT, traits> a,
-    impl::identity<basic_string_view<charT, traits>> b) noexcept {
-  return a.compare(b) <= 0;
-}
-
-template <class charT, class traits MSVC_ORDER(2)>
-constexpr bool operator<=(impl::identity<basic_string_view<charT, traits>> a,
-                          basic_string_view<charT, traits> b) noexcept {
-  return a.compare(b) <= 0;
-}
-
-// =>
-template <class charT, class traits>
-constexpr bool operator>=(basic_string_view<charT, traits> a,
-                          basic_string_view<charT, traits> b) noexcept {
-  return a.compare(b) >= 0;
-}
-
-template <class charT, class traits MSVC_ORDER(1)>
-constexpr bool operator>=(
-    basic_string_view<charT, traits> a,
-    impl::identity<basic_string_view<charT, traits>> b) noexcept {
-  return a.compare(b) >= 0;
-}
-
-template <class charT, class traits MSVC_ORDER(2)>
-constexpr bool operator>=(impl::identity<basic_string_view<charT, traits>> a,
-                          basic_string_view<charT, traits> b) noexcept {
-  return a.compare(b) >= 0;
-}
-
-#undef MSVC_ORDER
-
-template <class charT, class traits = std::char_traits<charT>,
-          class Allocator = std::allocator<charT>>
-std::basic_string<charT, traits, Allocator> to_string(
-    basic_string_view<charT, traits> str, const Allocator &a = Allocator()) {
-  return {str.begin(), str.end(), a};
-}
-
-template <class charT, class traits>
-std::basic_ostream<charT, traits> &operator<<(
-    std::basic_ostream<charT, traits> &o, basic_string_view<charT, traits> sv) {
-  typename std::basic_ostream<charT, traits>::sentry sentry(o);
-
-  if (sentry) {
-    o.write(sv.data(), sv.size());
-    o.width(0);
-  }
-
-  return o;
-}
-
-inline namespace literals {
-inline namespace string_view_literals {
-inline constexpr basic_string_view<char> operator""_sv(const char *str,
-                                                       size_t len) noexcept {
-  return basic_string_view<char>{str, len};
-}
-inline constexpr basic_string_view<wchar_t> operator""_sv(const wchar_t *str,
-                                                          size_t len) noexcept {
-  return basic_string_view<wchar_t>{str, len};
-}
-inline constexpr basic_string_view<char16_t> operator""_sv(
-    const char16_t *str, size_t len) noexcept {
-  return basic_string_view<char16_t>{str, len};
-}
-inline constexpr basic_string_view<char32_t> operator""_sv(
-    const char32_t *str, size_t len) noexcept {
-  return basic_string_view<char32_t>{str, len};
-}
-}  // namespace string_view_literals
-}  // namespace literals
-
-using string_view = basic_string_view<char>;
-using wstring_view = basic_string_view<wchar_t>;
-using u16string_view = basic_string_view<char16_t>;
-using u32string_view = basic_string_view<char32_t>;
-
-}  // namespace stdx
-
-namespace std {
-// [string.view.hash]
-template <>
-struct hash<stdx::string_view> {
-  size_t operator()(stdx::string_view s) const noexcept {
-    return std::hash<std::string>()(std::string{s.data(), s.size()});
-  }
-};
-template <>
-struct hash<stdx::wstring_view> {
-  size_t operator()(stdx::wstring_view s) const noexcept {
-    return std::hash<std::wstring>()(std::wstring{s.data(), s.size()});
-  }
-};
-
-template <>
-struct hash<stdx::u16string_view> {
-  size_t operator()(stdx::u16string_view s) const noexcept {
-    return std::hash<std::u16string>()(std::u16string{s.data(), s.size()});
-  }
-};
-template <>
-struct hash<stdx::u32string_view> {
-  size_t operator()(stdx::u32string_view s) const noexcept {
-    return std::hash<std::u32string>()(std::u32string{s.data(), s.size()});
-  }
-};
-}  // namespace std
-
-#endif
diff -Nru mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/stdx/type_traits.h mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/stdx/type_traits.h
--- mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/stdx/type_traits.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/stdx/type_traits.h	2021-09-28 11:46:34.000000000 +0000
@@ -42,62 +42,6 @@
 #endif
 };
 
-// from http://wg21.link/p0504r0
-#if __cplusplus >= 201703L
-using in_place_t = std::in_place_t;
-inline constexpr in_place_t in_place{};
-#else
-struct in_place_t {
-  explicit in_place_t() = default;
-};
-static constexpr in_place_t in_place{};
-#endif
-
-// std::negation from C++17
-template <class B>
-struct negation : std::integral_constant<bool, !bool(B::value)> {};
-
-// std::conjuntion from C++17
-template <class...>
-struct conjunction;
-
-template <>
-struct conjunction<> : std::true_type {};
-
-template <class P1, class... Pn>
-struct conjunction<P1, Pn...>
-    : std::conditional_t<P1::value, conjunction<Pn...>, std::false_type> {};
-
-// std::disjunction from C++17
-template <class...>
-struct disjunction : std::false_type {};
-
-template <class P1>
-struct disjunction<P1> : P1 {};
-
-template <class P1, class... Pn>
-struct disjunction<P1, Pn...>
-    : std::conditional_t<P1::value, P1, disjunction<Pn...>> {};
-
-// void_t from C++17
-//
-// see: https://en.cppreference.com/w/cpp/types/void_t
-// see: http::/wg21.link/n3911
-// seealso: http::/wg21.link/n4436
-
-#if defined(__GNUC__) && __GNUC__ < 5
-// GCC 4.x needs this verbose form, GCC 5.0 has the fix applied
-template <typename... Ts>
-struct make_void {
-  using type = void;
-};
-template <typename... Ts>
-using void_t = typename make_void<Ts...>::type;
-#else
-template <class...>
-using void_t = void;
-#endif
-
 }  // namespace stdx
 
 #endif
diff -Nru mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/tls_context.h mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/tls_context.h
--- mysql-8.0-8.0.26/router/src/harness/include/mysql/harness/tls_context.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/include/mysql/harness/tls_context.h	2021-09-28 11:46:34.000000000 +0000
@@ -63,6 +63,11 @@
 class HARNESS_TLS_EXPORT TlsLibraryContext {
  public:
   TlsLibraryContext();
+  TlsLibraryContext(const TlsLibraryContext &) = delete;
+  TlsLibraryContext(TlsLibraryContext &&) = delete;
+  TlsLibraryContext &operator=(const TlsLibraryContext &) = delete;
+  TlsLibraryContext &operator=(TlsLibraryContext &&) = delete;
+  ~TlsLibraryContext();
 };
 
 /**
diff -Nru mysql-8.0-8.0.26/router/src/harness/src/CMakeLists.txt mysql-8.0-8.0.27/router/src/harness/src/CMakeLists.txt
--- mysql-8.0-8.0.26/router/src/harness/src/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/src/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -68,6 +68,7 @@
   config_parser.cc
   designator.cc
   dynamic_state.cc
+  event_state_tracker.cc
   loader_config.cc
   common.cc
   filesystem.cc
@@ -83,7 +84,7 @@
   logging/handler.cc
   logging/logger.cc
   logging/logger_plugin.cc
-  logging/logging.cc
+# logging/logging.cc       empty file
   logging/registry.cc
   random_generator.cc
   sd_notify.cc
@@ -174,14 +175,14 @@
   TARGET_LINK_LIBRARIES(harness-archive -lnsl -lsocket)
 ENDIF()
 
-IF(NOT WIN32)
-  SET_TARGET_PROPERTIES(harness-archive harness-library PROPERTIES
-    OUTPUT_NAME "mysqlharness"
+IF(WIN32)
+  SET_TARGET_PROPERTIES(harness-archive PROPERTIES
+    OUTPUT_NAME "mysqlharness_a"
     PREFIX "lib"
     SOVERSION 1)
 ELSE()
-  SET_TARGET_PROPERTIES(harness-archive PROPERTIES
-    OUTPUT_NAME "mysqlharness_a"
+  SET_TARGET_PROPERTIES(harness-archive harness-library PROPERTIES
+    OUTPUT_NAME "mysqlharness"
     PREFIX "lib"
     SOVERSION 1)
 ENDIF()
@@ -201,16 +202,16 @@
 ADD_INSTALL_RPATH_FOR_OPENSSL(harness-library)
 SET_PATH_TO_CUSTOM_SSL_FOR_APPLE(harness-library)
 
-IF(NOT WIN32)
+IF(WIN32)
+  INSTALL(TARGETS harness-library
+    RUNTIME DESTINATION "${ROUTER_INSTALL_BINDIR}"
+    COMPONENT Router)
+ELSE()
   INSTALL(TARGETS harness-library
     LIBRARY
     DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
     NAMELINK_SKIP
     )
-ELSE()
-  INSTALL(TARGETS harness-library
-    RUNTIME DESTINATION "${ROUTER_INSTALL_BINDIR}"
-    COMPONENT Router)
 ENDIF()
 
 ADD_LIBRARY(harness_stdx SHARED
diff -Nru mysql-8.0-8.0.26/router/src/harness/src/common.cc mysql-8.0-8.0.27/router/src/harness/src/common.cc
--- mysql-8.0-8.0.26/router/src/harness/src/common.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/src/common.cc	2021-09-28 11:46:34.000000000 +0000
@@ -33,10 +33,9 @@
 #include "common.h"
 #include "harness_assert.h"
 
-#ifdef _WIN32
-#include <aclapi.h>
-#include <windows.h>
-#else
+#include "my_thread.h"
+
+#ifndef _WIN32
 #include <pthread.h>
 #include <sys/stat.h>
 #endif
@@ -84,54 +83,8 @@
   return result;
 }
 
-#if defined(_WIN32) && defined(_DEBUG)
-const DWORD MS_VC_EXCEPTION = 0x406D1388;
-#pragma pack(push, 8)
-typedef struct tagTHREADNAME_INFO {
-  DWORD dwType;
-  LPCSTR szName;
-  DWORD dwThreadID;
-  DWORD dwFlags;
-} THREADNAME_INFO;
-#pragma pack(pop)
-#endif
-
 void rename_thread(const char thread_name[16]) {
-// linux
-#ifdef __linux__
-  assert(strnlen(thread_name, 16) < 16);  // max allowed len for thread_name
-  pthread_setname_np(pthread_self(), thread_name);
-
-// windows
-#elif defined(_WIN32)
-#ifdef _DEBUG
-  // In Win32 API there is no API for setting thread name, but according to
-  // Microsoft documentation, there is a "secret handshake" between debuggee
-  // & debugger using the special values used here.
-  THREADNAME_INFO info;
-  info.dwType = 0x1000;
-  info.szName = thread_name;
-  info.dwThreadID = GetCurrentThreadId();
-  info.dwFlags = 0;
-#pragma warning(push)
-#pragma warning(disable : 6320 6322)
-  __try {
-    RaiseException(MS_VC_EXCEPTION, 0, sizeof(info) / sizeof(ULONG_PTR),
-                   (ULONG_PTR *)&info);
-  } __except (EXCEPTION_EXECUTE_HANDLER) {
-  }
-#pragma warning(pop)
-#else
-  UNREFERENCED_PARAMETER(thread_name);
-#endif  // #ifdef _DEBUG
-
-// other
-#else
-  // TODO: on BSD/OSX, this should build but does not:
-  // pthread_setname_np(thread_name);
-  (void)thread_name;
-
-#endif
+  my_thread_self_setname(thread_name);
 }
 
 static inline const std::string &truncate_string_backend(
diff -Nru mysql-8.0-8.0.26/router/src/harness/src/config_parser.cc mysql-8.0-8.0.27/router/src/harness/src/config_parser.cc
--- mysql-8.0-8.0.26/router/src/harness/src/config_parser.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/src/config_parser.cc	2021-09-28 11:46:34.000000000 +0000
@@ -157,7 +157,7 @@
 }
 
 std::string ConfigSection::get(const std::string &option) const {
-  check_option(option);  // throws bad::option (std::runtime_error)
+  check_option(option);  // throws bad_option (std::runtime_error)
   auto result = do_locate(option);
   if (std::get<1>(result)) return do_replace(std::get<0>(result)->second);
   throw bad_option("Value for '" + option + "' not found");
diff -Nru mysql-8.0-8.0.26/router/src/harness/src/dynamic_state.cc mysql-8.0-8.0.27/router/src/harness/src/dynamic_state.cc
--- mysql-8.0-8.0.26/router/src/harness/src/dynamic_state.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/src/dynamic_state.cc	2021-09-28 11:46:34.000000000 +0000
@@ -51,14 +51,28 @@
     rapidjson::GenericSchemaValidator<JsonSchemaDocument>;
 
 constexpr const char *kVersionFieldName = "version";
-constexpr unsigned kVersionMajor = 1;
-constexpr unsigned kVersionMinor = 0;
-constexpr unsigned kVersionPatch = 0;
-
-std::string to_string(unsigned major, unsigned minor, unsigned patch) {
-  return std::to_string(major) + "." + std::to_string(minor) + "." +
-         std::to_string(patch);
-}
+
+struct SchemaVersion {
+  unsigned major;
+  unsigned minor;
+  unsigned patch;
+
+  std::string str() const {
+    return std::to_string(major) + "." + std::to_string(minor) + "." +
+           std::to_string(patch);
+  }
+
+  // the major should match exactly the expected value
+  // the minor has to be more or equal than expected
+  // different patch version is ok
+  bool is_compatible(const SchemaVersion &file_version) const {
+    return file_version.major == major && file_version.minor <= minor;
+  }
+};
+
+const SchemaVersion kVersionCluster{1, 0, 0};
+const SchemaVersion kVersionClusterSet{1, 1, 0};
+const SchemaVersion kCurrentVersion = kVersionClusterSet;
 
 }  // namespace
 
@@ -183,22 +197,24 @@
   }
 
   // the format od the string should be MAJOR.MINOR.PATCH
-  std::string version = version_field.GetString();
-  unsigned major{0}, minor{0}, patch{0};
-  int res = sscanf(version.c_str(), "%u.%u.%u", &major, &minor, &patch);
+  std::string version_str = version_field.GetString();
+  SchemaVersion version;
+  int res = sscanf(version_str.c_str(), "%u.%u.%u", &version.major,
+                   &version.minor, &version.patch);
   if (res != 3) {
     throw std::runtime_error(
         std::string("Invalid version field format, expected MAJOR.MINOR.PATCH, "
                     "found: ") +
-        version);
+        version_str);
   }
 
-  // the major and minor should match match exactly, different patch is fine
-  if (major != kVersionMajor || minor != kVersionMinor) {
+  // the major should match match exactly the expected value
+  // the minor has to be more or equal than expected
+  // different patch is fine
+  if (!kCurrentVersion.is_compatible(version)) {
     throw std::runtime_error(
         std::string("Unsupported state file version, expected: ") +
-        to_string(kVersionMajor, kVersionMinor, kVersionPatch) +
-        ", found: " + to_string(major, minor, patch));
+        kCurrentVersion.str() + ", found: " + version.str());
   }
 
   // all good, version matches, go back to the caller with no exception
@@ -224,21 +240,24 @@
   return true;
 }
 
-bool DynamicState::save(bool pretty) {
+bool DynamicState::save(bool is_clusterset, bool pretty) {
   std::unique_lock<std::mutex> lock(pimpl_->json_file_lock_);
 
   auto output_file = open_for_write();
 
-  return save_to_stream(output_file, pretty);
+  return save_to_stream(output_file, is_clusterset, pretty);
 }
 
-bool DynamicState::save_to_stream(std::ostream &output_stream, bool pretty) {
+bool DynamicState::save_to_stream(std::ostream &output_stream,
+                                  bool is_clusterset, bool pretty) {
   JsonStringBuffer out_buffer;
 
   // save/update the version
-  std::string ver_str = to_string(kVersionMajor, kVersionMinor, kVersionPatch);
+  const std::string ver_str =
+      is_clusterset ? kVersionClusterSet.str() : kVersionCluster.str();
   JsonValue version(rapidjson::kStringType);
   version.SetString(ver_str.c_str(), ver_str.length());
+
   update_section(kVersionFieldName, std::move(version));
 
   std::unique_lock<std::mutex> lock(pimpl_->json_state_doc_lock_);
diff -Nru mysql-8.0-8.0.26/router/src/harness/src/dynamic_state_schema.js mysql-8.0-8.0.27/router/src/harness/src/dynamic_state_schema.js
--- mysql-8.0-8.0.26/router/src/harness/src/dynamic_state_schema.js	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/src/dynamic_state_schema.js	2021-09-28 11:46:34.000000000 +0000
@@ -35,13 +35,24 @@
           "description": "metadata-cache section definition",
           "type": "object",
           "additionalProperties": false,
-          "required": ["group-replication-id", "cluster-metadata-servers"],
+          "required": ["cluster-metadata-servers"],
           "properties": {
             "group-replication-id": {
               "description":
                   "In case of the Group Replication ID the metadata cache module was bootstrapped against, in case of Async Replicaset cluster ID the metadata cache module was bootstrapped against",
               "type": "string"
             },
+            "clusterset-id": {
+              "description":
+                  "Id of the ClusterSet the metadata cache module was bootstrapped against",
+              "type": "string"
+            },
+            "oneOf":
+                [
+                  {"required": ["group-replication-id"]},
+                  {"required": ["clusterset-id"]}
+                ],
+
             "cluster-metadata-servers": {
               "description":
                   "List of the metadata servers that metadata cache module uses for fetching metadata",
@@ -57,7 +68,7 @@
             },
             "view-id": {
               "description":
-                  "Last seen view_id of the AsyncReplicaset cluster metadata",
+                  "Last seen view_id of the Replicaset Cluster or ClusterSet metadata",
               "type": "number"
             }
           }
diff -Nru mysql-8.0-8.0.26/router/src/harness/src/event_state_tracker.cc mysql-8.0-8.0.27/router/src/harness/src/event_state_tracker.cc
--- mysql-8.0-8.0.26/router/src/harness/src/event_state_tracker.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/src/event_state_tracker.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,76 @@
+/*
+  Copyright (c) 2021, Oracle 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,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "mysql/harness/event_state_tracker.h"
+
+#include <algorithm>
+
+namespace mysql_harness {
+
+/*static*/ EventStateTracker &EventStateTracker::instance() {
+  static EventStateTracker instance_;
+  return instance_;
+}
+
+bool EventStateTracker::state_changed(
+    const int state, const EventId event_id,
+    const std::string &additional_tag /*= ""*/) {
+  const Key key{static_cast<size_t>(event_id),
+                std::hash<std::string>{}(additional_tag)};
+
+  std::unique_lock<std::mutex> lock(events_mtx_);
+
+  auto it = events_.find(key);
+  if (it == events_.end()) {
+    events_.emplace(key, state);
+    return true;
+  } else {
+    if (it->second != state) {
+      it->second = state;
+      return true;
+    } else {
+      return false;
+    }
+  }
+}
+
+void EventStateTracker::remove_tag(const std::string &tag) {
+  std::unique_lock<std::mutex> lock(events_mtx_);
+
+  const auto hashed_tag = std::hash<std::string>{}(tag);
+  for (auto it = events_.begin(); it != events_.end();) {
+    if (hashed_tag == it->first.second) {
+      it = events_.erase(it);
+    } else {
+      ++it;
+    }
+  }
+}
+
+void EventStateTracker::clear() {
+  std::unique_lock<std::mutex> lock(events_mtx_);
+  events_.clear();
+}
+
+}  // namespace mysql_harness
diff -Nru mysql-8.0-8.0.26/router/src/harness/src/loader.cc mysql-8.0-8.0.27/router/src/harness/src/loader.cc
--- mysql-8.0-8.0.26/router/src/harness/src/loader.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/src/loader.cc	2021-09-28 11:46:34.000000000 +0000
@@ -86,7 +86,9 @@
 static std::atomic<size_t> num_of_non_ready_services{0};
 
 static const char kLogReopenServiceName[] = "log_reopen";
+#if defined(USE_POSIX_SIGNALS)
 static const char kSignalHandlerServiceName[] = "signal_handler";
+#endif
 
 /**
  * @defgroup Loader Plugin loader
diff -Nru mysql-8.0-8.0.26/router/src/harness/src/logging/registry.cc mysql-8.0-8.0.27/router/src/harness/src/logging/registry.cc
--- mysql-8.0-8.0.26/router/src/harness/src/logging/registry.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/src/logging/registry.cc	2021-09-28 11:46:34.000000000 +0000
@@ -245,6 +245,13 @@
   }
 }
 
+void set_log_level_for_all_handlers(const Registry &registry, LogLevel level) {
+  for (const std::string &handler_name : registry.get_handler_names()) {
+    std::shared_ptr<Handler> handler = registry.get_handler(handler_name);
+    handler->set_level(level);
+  }
+}
+
 void set_timestamp_precision_for_all_loggers(Registry &registry,
                                              LogTimestampPrecision precision) {
   for (const std::string &logger_name : registry.get_logger_names()) {
@@ -462,6 +469,12 @@
   set_log_level_for_all_loggers(registry, level);
 }
 
+void set_log_level_for_all_handlers(LogLevel level) {
+  mysql_harness::logging::Registry &registry =
+      mysql_harness::DIM::instance().get_LoggingRegistry();
+  set_log_level_for_all_handlers(registry, level);
+}
+
 bool log_level_is_handled(LogLevel level, const char *module) {
   mysql_harness::logging::Registry &registry =
       mysql_harness::DIM::instance().get_LoggingRegistry();
diff -Nru mysql-8.0-8.0.26/router/src/harness/src/sd_notify.cc mysql-8.0-8.0.27/router/src/harness/src/sd_notify.cc
--- mysql-8.0-8.0.26/router/src/harness/src/sd_notify.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/src/sd_notify.cc	2021-09-28 11:46:34.000000000 +0000
@@ -115,13 +115,7 @@
 
       // stay in the loop in case we got interrupted.
     } else {
-#if defined(__SUNPRO_CC)
-      // suncc needs a std::move(), while gcc complains about redundant
-      // std::move().
-      return std::move(sock);
-#else
       return sock;
-#endif
     }
   } while (true);
 }
diff -Nru mysql-8.0-8.0.26/router/src/harness/src/stdx/io/file_handle.cc mysql-8.0-8.0.27/router/src/harness/src/stdx/io/file_handle.cc
--- mysql-8.0-8.0.26/router/src/harness/src/stdx/io/file_handle.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/src/stdx/io/file_handle.cc	2021-09-28 11:46:34.000000000 +0000
@@ -402,7 +402,7 @@
 
   auto st = stat_res.value();
 
-  return {stdx::in_place, handle, st.st_dev, st.st_ino, _caching, flags};
+  return {std::in_place, handle, st.st_dev, st.st_ino, _caching, flags};
 }
 
 /**
diff -Nru mysql-8.0-8.0.26/router/src/harness/src/tcp_address.cc mysql-8.0-8.0.27/router/src/harness/src/tcp_address.cc
--- mysql-8.0-8.0.26/router/src/harness/src/tcp_address.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/src/tcp_address.cc	2021-09-28 11:46:34.000000000 +0000
@@ -117,7 +117,7 @@
   ++pos;
   if (pos == endpoint.size()) {
     // ] was last character,  no port
-    return {stdx::in_place, addr, 0};
+    return {std::in_place, addr, 0};
   }
 
   if (endpoint[pos] != ':') {
@@ -133,13 +133,13 @@
 
   auto port = port_res.value();
 
-  return {stdx::in_place, addr, port};
+  return {std::in_place, addr, port};
 }
 
 stdx::expected<TCPAddress, std::error_code> make_tcp_address(
     const std::string &endpoint) {
   if (endpoint.empty()) {
-    return {stdx::in_place, "", 0};
+    return {std::in_place, "", 0};
   }
 
   if (endpoint[0] == '[') {
@@ -151,13 +151,13 @@
       return addr_res.get_unexpected();
     }
 
-    return {stdx::in_place, endpoint, 0};
+    return {std::in_place, endpoint, 0};
   } else {
     // IPv4 or address
     const auto pos = endpoint.find(":");
     if (pos == std::string::npos) {
       // no port
-      return {stdx::in_place, endpoint, 0};
+      return {std::in_place, endpoint, 0};
     }
 
     auto addr = endpoint.substr(0, pos);
@@ -167,7 +167,7 @@
       return port_res.get_unexpected();
     }
 
-    return {stdx::in_place, addr, port_res.value()};
+    return {std::in_place, addr, port_res.value()};
   }
 }
 
diff -Nru mysql-8.0-8.0.26/router/src/harness/src/tls_context.cc mysql-8.0-8.0.27/router/src/harness/src/tls_context.cc
--- mysql-8.0-8.0.26/router/src/harness/src/tls_context.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/src/tls_context.cc	2021-09-28 11:46:34.000000000 +0000
@@ -25,26 +25,152 @@
 #include "mysql/harness/tls_context.h"
 
 #include <array>
+#include <shared_mutex>
 #include <string>
 #include <vector>
 
 #include <openssl/err.h>
 #include <openssl/ssl.h>
 
+#include "my_thread.h"
 #include "mysql/harness/stdx/expected.h"
 #include "mysql/harness/tls_error.h"
 #include "openssl_version.h"
 
+/*
+  OpenSSL 1.1 supports native platform threads,
+  so we don't need the following callback functions.
+*/
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+using shared_lock_t = std::shared_mutex;
+
+typedef struct CRYPTO_dynlock_value {
+  shared_lock_t lock;
+} openssl_lock_t;
+
+/* Array of locks used by openssl internally for thread synchronization.
+   The number of locks is equal to CRYPTO_num_locks.
+*/
+static openssl_lock_t *openssl_stdlocks;
+
+/*OpenSSL callback functions for multithreading. We implement all the functions
+  as we are using our own locking mechanism.
+*/
+static void openssl_lock(int mode, openssl_lock_t *lock,
+                         const char *file [[maybe_unused]],
+                         int line [[maybe_unused]]) {
+  switch (mode) {
+    case CRYPTO_LOCK | CRYPTO_READ:
+      lock->lock.lock_shared();
+      break;
+    case CRYPTO_LOCK | CRYPTO_WRITE:
+      lock->lock.lock();
+      break;
+    case CRYPTO_UNLOCK | CRYPTO_READ:
+      lock->lock.unlock_shared();
+      break;
+    case CRYPTO_UNLOCK | CRYPTO_WRITE:
+      lock->lock.unlock();
+      break;
+    default:
+      fprintf(stderr, "Fatal: OpenSSL interface problem (mode=0x%x)", mode);
+      fflush(stderr);
+      abort();
+  }
+}
+
+static void openssl_lock_function(int mode, int n,
+
+                                  const char *file [[maybe_unused]],
+                                  int line [[maybe_unused]]) {
+  if (n < 0 || n > CRYPTO_num_locks()) {
+    fprintf(stderr, "Fatal: OpenSSL interface problem (n = %d)", n);
+    fflush(stderr);
+    abort();
+  }
+  openssl_lock(mode, &openssl_stdlocks[n], file, line);
+}
+
+static openssl_lock_t *openssl_dynlock_create(const char *file [[maybe_unused]],
+                                              int line [[maybe_unused]]) {
+  openssl_lock_t *lock;
+  lock = new openssl_lock_t{};
+  return lock;
+}
+
+static void openssl_dynlock_destroy(openssl_lock_t *lock,
+                                    const char *file [[maybe_unused]],
+                                    int line [[maybe_unused]]) {
+  delete lock;
+}
+
+static unsigned long openssl_id_function() {
+  return (unsigned long)my_thread_self();
+}
+
+static void init_ssl_locks() {
+  openssl_stdlocks = new openssl_lock_t[CRYPTO_num_locks()];
+}
+
+static void deinit_ssl_locks() { delete[] openssl_stdlocks; }
+
+static void set_lock_callback_functions(bool init) {
+  CRYPTO_set_locking_callback(init ? openssl_lock_function : NULL);
+  CRYPTO_set_id_callback(init ? openssl_id_function : NULL);
+  CRYPTO_set_dynlock_create_callback(init ? openssl_dynlock_create : NULL);
+  CRYPTO_set_dynlock_destroy_callback(init ? openssl_dynlock_destroy : NULL);
+  CRYPTO_set_dynlock_lock_callback(init ? openssl_lock : NULL);
+}
+
+static void init_lock_callback_functions() {
+  set_lock_callback_functions(true);
+}
+
+static void deinit_lock_callback_functions() {
+  set_lock_callback_functions(false);
+}
+
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+
 TlsLibraryContext::TlsLibraryContext() {
-#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0)
-  OPENSSL_init_ssl(0, nullptr);
-#else
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
   SSL_library_init();
+  init_ssl_locks();
+  init_lock_callback_functions();
+#else
+  OPENSSL_init_ssl(0, nullptr);
 #endif
   SSL_load_error_strings();
   ERR_load_crypto_strings();
 }
 
+TlsLibraryContext::~TlsLibraryContext() {
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+  CRYPTO_set_locking_callback(nullptr);
+  CRYPTO_set_id_callback(nullptr);
+  deinit_lock_callback_functions();
+  deinit_ssl_locks();
+#endif
+// in case any of this is needed for cleanup
+#if 0
+  FIPS_mode_set(0);
+
+  SSL_COMP_free_compression_methods();
+
+  ENGINE_cleanup();
+
+  CONF_modules_free();
+  CONF_modules_unload(1);
+
+  COMP_zlib_cleanup();
+
+  ERR_free_strings();
+  EVP_cleanup();
+
+  CRYPTO_cleanup_all_ex_data();
+#endif
+}
+
 TlsContext::TlsContext(const SSL_METHOD *method)
     : ssl_ctx_{SSL_CTX_new(const_cast<SSL_METHOD *>(method)), &SSL_CTX_free} {
   // SSL_CTX_new may fail if ciphers aren't loaded.
@@ -145,19 +271,19 @@
   switch (min_version) {
     default:
       // unknown, leave all disabled
-      // fallthrough
+      [[fallthrough]];
     case TlsVersion::TLS_1_3:
       opts |= SSL_OP_NO_TLSv1_2;
-      // fallthrough
+      [[fallthrough]];
     case TlsVersion::TLS_1_2:
       opts |= SSL_OP_NO_TLSv1_1;
-      // fallthrough
+      [[fallthrough]];
     case TlsVersion::TLS_1_1:
       opts |= SSL_OP_NO_TLSv1;
-      // fallthrough
+      [[fallthrough]];
     case TlsVersion::TLS_1_0:
       opts |= SSL_OP_NO_SSLv3;
-      // fallthrough
+      [[fallthrough]];
     case TlsVersion::AUTO:
     case TlsVersion::SSL_3:
       opts |= SSL_OP_NO_SSLv2;
@@ -165,16 +291,15 @@
   }
 
   switch (max_version) {
-      // fallthrough
     case TlsVersion::SSL_3:
       opts |= SSL_OP_NO_TLSv1;
-      // fallthrough
+      [[fallthrough]];
     case TlsVersion::TLS_1_0:
       opts |= SSL_OP_NO_TLSv1_1;
-      // fallthrough
+      [[fallthrough]];
     case TlsVersion::TLS_1_1:
       opts |= SSL_OP_NO_TLSv1_2;
-      // fallthrough
+      [[fallthrough]];
     default:
       break;
   }
diff -Nru mysql-8.0-8.0.26/router/src/harness/src/utilities.h mysql-8.0-8.0.27/router/src/harness/src/utilities.h
--- mysql-8.0-8.0.26/router/src/harness/src/utilities.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/src/utilities.h	2021-09-28 11:46:34.000000000 +0000
@@ -195,8 +195,6 @@
  */
 bool regex_pattern_matches(const std::string &s, const std::string &pattern);
 
-bool notify(const std::string &msg);
-
 }  // namespace utility
 
 }  // namespace mysql_harness
diff -Nru mysql-8.0-8.0.26/router/src/harness/tests/CMakeLists.txt mysql-8.0-8.0.27/router/src/harness/tests/CMakeLists.txt
--- mysql-8.0-8.0.26/router/src/harness/tests/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/tests/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -25,7 +25,16 @@
 # TODO(sgunders): Remove when all GMock tests use MOCK_METHOD().
 STRING(REPLACE "-Wsuggest-override" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 
-IF(NOT BUILD_IS_SINGLE_CONFIG)
+IF(BUILD_IS_SINGLE_CONFIG)
+  EXECUTE_PROCESS(
+    COMMAND ${CMAKE_COMMAND} -E
+    make_directory ${CMAKE_CURRENT_BINARY_DIR}/var
+    COMMAND ${CMAKE_COMMAND} -E
+    make_directory ${CMAKE_CURRENT_BINARY_DIR}/var/log
+    COMMAND ${CMAKE_COMMAND} -E
+    make_directory ${CMAKE_CURRENT_BINARY_DIR}/var/log/harness
+    )
+ELSE()
   FOREACH(config ${CMAKE_CONFIGURATION_TYPES})
     EXECUTE_PROCESS(
       COMMAND ${CMAKE_COMMAND} -E
@@ -36,15 +45,6 @@
       make_directory ${CMAKE_CURRENT_BINARY_DIR}/${config}/var/log/harness
     )
   ENDFOREACH()
-ELSE()
-  EXECUTE_PROCESS(
-    COMMAND ${CMAKE_COMMAND} -E
-    make_directory ${CMAKE_CURRENT_BINARY_DIR}/var
-    COMMAND ${CMAKE_COMMAND} -E
-    make_directory ${CMAKE_CURRENT_BINARY_DIR}/var/log
-    COMMAND ${CMAKE_COMMAND} -E
-    make_directory ${CMAKE_CURRENT_BINARY_DIR}/var/log/harness
-  )
 ENDIF()
 
 ADD_SUBDIRECTORY(plugins)
@@ -74,6 +74,7 @@
   test_process_launcher.cc
   test_tcp_address.cc
   test_config_builder.cc
+  test_event_state_tracker.cc
 )
 
 FOREACH(TEST ${TESTS})
@@ -127,7 +128,6 @@
 SET(TESTS
   test_stdx_bit.cc
   test_stdx_expected.cc
-  test_stdx_string_view.cc
   test_stdx_monitor.cc
   test_stdx_io_file_handle.cc
 )
diff -Nru mysql-8.0-8.0.26/router/src/harness/tests/test_dynamic_state.cc mysql-8.0-8.0.27/router/src/harness/tests/test_dynamic_state.cc
--- mysql-8.0-8.0.26/router/src/harness/tests/test_dynamic_state.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/tests/test_dynamic_state.cc	2021-09-28 11:46:34.000000000 +0000
@@ -51,7 +51,7 @@
 
 std::string conf_to_str(DynamicState &conf, bool pretty = false) {
   std::stringstream ss;
-  conf.save_to_stream(ss, pretty);
+  conf.save_to_stream(ss, false, pretty);
   return ss.str();
 }
 
diff -Nru mysql-8.0-8.0.26/router/src/harness/tests/test_event_state_tracker.cc mysql-8.0-8.0.27/router/src/harness/tests/test_event_state_tracker.cc
--- mysql-8.0-8.0.26/router/src/harness/tests/test_event_state_tracker.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/tests/test_event_state_tracker.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,138 @@
+/*
+  Copyright (c) 2021, Oracle 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,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "mysql/harness/event_state_tracker.h"
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+using mysql_harness::EventStateTracker;
+
+class EventStateTrackerTest : public ::testing::Test {
+ protected:
+  void SetUp() override { EventStateTracker::instance().clear(); }
+};
+
+TEST_F(EventStateTrackerTest, NoTagEventBool) {
+  // first call is always returns true as the initial state is not known
+  EXPECT_TRUE(EventStateTracker::instance().state_changed(
+      true, EventStateTracker::EventId::MetadataRefreshOk));
+
+  // second call with the same state
+  EXPECT_FALSE(EventStateTracker::instance().state_changed(
+      true, EventStateTracker::EventId::MetadataRefreshOk));
+
+  // another call, state changes now
+  EXPECT_TRUE(EventStateTracker::instance().state_changed(
+      false, EventStateTracker::EventId::MetadataRefreshOk));
+}
+
+TEST_F(EventStateTrackerTest, NoTagEventInt) {
+  // first call is always returns true as the initial state is not known
+  EXPECT_TRUE(EventStateTracker::instance().state_changed(
+      0, EventStateTracker::EventId::MetadataRefreshOk));
+
+  // second call with a different state
+  EXPECT_TRUE(EventStateTracker::instance().state_changed(
+      1, EventStateTracker::EventId::MetadataRefreshOk));
+
+  // another call, yet another state
+  EXPECT_TRUE(EventStateTracker::instance().state_changed(
+      2, EventStateTracker::EventId::MetadataRefreshOk));
+
+  // no change now
+  EXPECT_FALSE(EventStateTracker::instance().state_changed(
+      2, EventStateTracker::EventId::MetadataRefreshOk));
+}
+
+TEST_F(EventStateTrackerTest, NoTagIndependentEvents) {
+  // first call is always returns true as the initial state is not known
+  EXPECT_TRUE(EventStateTracker::instance().state_changed(
+      0, EventStateTracker::EventId::MetadataRefreshOk));
+
+  EXPECT_TRUE(EventStateTracker::instance().state_changed(
+      0, EventStateTracker::EventId::GRMemberConnectedOk));
+
+  // both change independently
+  EXPECT_TRUE(EventStateTracker::instance().state_changed(
+      1, EventStateTracker::EventId::MetadataRefreshOk));
+
+  EXPECT_TRUE(EventStateTracker::instance().state_changed(
+      1, EventStateTracker::EventId::GRMemberConnectedOk));
+}
+
+TEST_F(EventStateTrackerTest, TagEvent) {
+  // the same eventId but 2 different tags, each is a separate event so both
+  // should return true
+  EXPECT_TRUE(EventStateTracker::instance().state_changed(
+      true, EventStateTracker::EventId::MetadataServerConnectedOk,
+      "localhost:3306"));
+
+  EXPECT_TRUE(EventStateTracker::instance().state_changed(
+      true, EventStateTracker::EventId::MetadataServerConnectedOk,
+      "localhost:33060"));
+
+  // second call with the same state for each
+  EXPECT_FALSE(EventStateTracker::instance().state_changed(
+      true, EventStateTracker::EventId::MetadataServerConnectedOk,
+      "localhost:3306"));
+
+  EXPECT_FALSE(EventStateTracker::instance().state_changed(
+      true, EventStateTracker::EventId::MetadataServerConnectedOk,
+      "localhost:33060"));
+
+  // another call, state changes now
+  EXPECT_TRUE(EventStateTracker::instance().state_changed(
+      false, EventStateTracker::EventId::MetadataServerConnectedOk,
+      "localhost:33060"));
+
+  // new tag, should return true
+  EXPECT_TRUE(EventStateTracker::instance().state_changed(
+      false, EventStateTracker::EventId::MetadataServerConnectedOk,
+      "localhost:6446"));
+}
+
+TEST_F(EventStateTrackerTest, RemoveTag) {
+  EXPECT_TRUE(EventStateTracker::instance().state_changed(
+      true, EventStateTracker::EventId::MetadataServerConnectedOk,
+      "localhost:3306"));
+  EXPECT_TRUE(EventStateTracker::instance().state_changed(
+      true, EventStateTracker::EventId::MetadataServerConnectedOk,
+      "localhost:33060"));
+
+  EventStateTracker::instance().remove_tag("localhost:3306");
+
+  // after removing we expect the change to be reported for removed tag
+  EXPECT_TRUE(EventStateTracker::instance().state_changed(
+      true, EventStateTracker::EventId::MetadataServerConnectedOk,
+      "localhost:3306"));
+  EXPECT_FALSE(EventStateTracker::instance().state_changed(
+      true, EventStateTracker::EventId::MetadataServerConnectedOk,
+      "localhost:33060"));
+}
+
+int main(int argc, char *argv[]) {
+  ::testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}
diff -Nru mysql-8.0-8.0.26/router/src/harness/tests/test_logging.cc mysql-8.0-8.0.27/router/src/harness/tests/test_logging.cc
--- mysql-8.0-8.0.26/router/src/harness/tests/test_logging.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/tests/test_logging.cc	2021-09-28 11:46:34.000000000 +0000
@@ -849,7 +849,64 @@
   EXPECT_THAT(log, HasSubstr(MYSQL_ROUTER_LOG_DOMAIN));
 }
 
-TEST(FunctionalTest, Handlers) {
+// Macros for log expectance at different log levels
+#define EXPECT_LOG_LEVEL_DEBUG(buffer)        \
+  expect_log(log_system, buffer, "SYSTEM");   \
+  expect_log(log_error, buffer, "ERROR");     \
+  expect_log(log_warning, buffer, "WARNING"); \
+  expect_log(log_info, buffer, "INFO");       \
+  expect_log(log_note, buffer, "NOTE");       \
+  expect_log(log_debug, buffer, "DEBUG");
+
+#define EXPECT_LOG_LEVEL_NOTE(buffer)         \
+  expect_log(log_system, buffer, "SYSTEM");   \
+  expect_log(log_error, buffer, "ERROR");     \
+  expect_log(log_warning, buffer, "WARNING"); \
+  expect_log(log_info, buffer, "INFO");       \
+  expect_log(log_note, buffer, "NOTE");       \
+  expect_no_log(log_debug, buffer);
+
+#define EXPECT_LOG_LEVEL_INFO(buffer)         \
+  expect_log(log_system, buffer, "SYSTEM");   \
+  expect_log(log_error, buffer, "ERROR");     \
+  expect_log(log_warning, buffer, "WARNING"); \
+  expect_log(log_info, buffer, "INFO");       \
+  expect_no_log(log_note, buffer);            \
+  expect_no_log(log_debug, buffer);
+
+#define EXPECT_LOG_LEVEL_WARNING(buffer)      \
+  expect_log(log_system, buffer, "SYSTEM");   \
+  expect_log(log_error, buffer, "ERROR");     \
+  expect_log(log_warning, buffer, "WARNING"); \
+  expect_no_log(log_info, buffer);            \
+  expect_no_log(log_note, buffer);            \
+  expect_no_log(log_debug, buffer);
+
+#define EXPECT_LOG_LEVEL_ERROR(buffer)      \
+  expect_log(log_system, buffer, "SYSTEM"); \
+  expect_log(log_error, buffer, "ERROR");   \
+  expect_no_log(log_warning, buffer);       \
+  expect_no_log(log_info, buffer);          \
+  expect_no_log(log_note, buffer);          \
+  expect_no_log(log_debug, buffer);
+
+#define EXPECT_LOG_LEVEL_SYSTEM(buffer)     \
+  expect_log(log_system, buffer, "SYSTEM"); \
+  expect_no_log(log_error, buffer);         \
+  expect_no_log(log_warning, buffer);       \
+  expect_no_log(log_info, buffer);          \
+  expect_no_log(log_note, buffer);          \
+  expect_no_log(log_debug, buffer);
+
+#define EXPECT_LOG_LEVEL_NOT_SET(buffer) \
+  expect_no_log(log_system, buffer);     \
+  expect_no_log(log_error, buffer);      \
+  expect_no_log(log_warning, buffer);    \
+  expect_no_log(log_info, buffer);       \
+  expect_no_log(log_note, buffer);       \
+  expect_no_log(log_debug, buffer);
+
+TEST(FunctionalTest, Loggers) {
   // The loader creates these modules during start, so tests of the
   // logger that involves the loader are inside the loader unit
   // test. Here we instead call these functions directly.
@@ -861,54 +918,71 @@
   attach_handler_to_all_loggers(*g_registry, StreamHandler::kDefaultName);
 
   set_log_level_for_all_loggers(*g_registry, LogLevel::kDebug);
-  expect_log(log_system, buffer, "SYSTEM");
-  expect_log(log_error, buffer, "ERROR");
-  expect_log(log_warning, buffer, "WARNING");
-  expect_log(log_info, buffer, "INFO");
-  expect_log(log_note, buffer, "NOTE");
-  expect_log(log_debug, buffer, "DEBUG");
+  EXPECT_LOG_LEVEL_DEBUG(buffer);
 
   set_log_level_for_all_loggers(*g_registry, LogLevel::kNote);
-  expect_log(log_system, buffer, "SYSTEM");
-  expect_log(log_error, buffer, "ERROR");
-  expect_log(log_warning, buffer, "WARNING");
-  expect_log(log_info, buffer, "INFO");
-  expect_log(log_note, buffer, "NOTE");
-  expect_no_log(log_debug, buffer);
+  EXPECT_LOG_LEVEL_NOTE(buffer);
 
   set_log_level_for_all_loggers(*g_registry, LogLevel::kError);
-  expect_log(log_system, buffer, "SYSTEM");
-  expect_log(log_error, buffer, "ERROR");
-  expect_no_log(log_warning, buffer);
-  expect_no_log(log_info, buffer);
-  expect_no_log(log_note, buffer);
-  expect_no_log(log_debug, buffer);
+  EXPECT_LOG_LEVEL_ERROR(buffer);
 
   set_log_level_for_all_loggers(*g_registry, LogLevel::kWarning);
-  expect_log(log_system, buffer, "SYSTEM");
-  expect_log(log_error, buffer, "ERROR");
-  expect_log(log_warning, buffer, "WARNING");
-  expect_no_log(log_info, buffer);
-  expect_no_log(log_note, buffer);
-  expect_no_log(log_debug, buffer);
+  EXPECT_LOG_LEVEL_WARNING(buffer);
 
   set_log_level_for_all_loggers(*g_registry, LogLevel::kSystem);
-  expect_log(log_system, buffer, "SYSTEM");
-  expect_no_log(log_error, buffer);
-  expect_no_log(log_warning, buffer);
-  expect_no_log(log_info, buffer);
-  expect_no_log(log_note, buffer);
-  expect_no_log(log_debug, buffer);
+  EXPECT_LOG_LEVEL_SYSTEM(buffer);
 
   // Check that nothing is logged when the handler is unregistered.
   g_registry->remove_handler(StreamHandler::kDefaultName);
   set_log_level_for_all_loggers(*g_registry, LogLevel::kNotSet);
-  expect_no_log(log_system, buffer);
-  expect_no_log(log_error, buffer);
-  expect_no_log(log_warning, buffer);
-  expect_no_log(log_info, buffer);
-  expect_no_log(log_note, buffer);
-  expect_no_log(log_debug, buffer);
+  EXPECT_LOG_LEVEL_NOT_SET(buffer);
+
+  ASSERT_NO_THROW(g_registry->remove_logger(MYSQL_ROUTER_LOG_DOMAIN));
+}
+
+TEST(FunctionalTest, Handlers) {
+  // The loader creates these modules during start, so tests of the
+  // logger that involves the loader are inside the loader unit
+  // test. Here we instead call these functions directly.
+  ASSERT_NO_THROW(g_registry->create_logger(MYSQL_ROUTER_LOG_DOMAIN));
+
+  std::stringstream buffer;
+  std::stringstream buffer2;
+  auto handler = std::make_shared<StreamHandler>(buffer);
+  auto handler2 = std::make_shared<StreamHandler>(buffer2);
+  g_registry->add_handler("stream1", handler);
+  g_registry->add_handler("stream2", handler2);
+  attach_handler_to_all_loggers(*g_registry, "stream1");
+  attach_handler_to_all_loggers(*g_registry, "stream2");
+
+  set_log_level_for_all_handlers(*g_registry, LogLevel::kDebug);
+  EXPECT_LOG_LEVEL_DEBUG(buffer);
+  EXPECT_LOG_LEVEL_DEBUG(buffer2);
+
+  set_log_level_for_all_handlers(*g_registry, LogLevel::kNote);
+  EXPECT_LOG_LEVEL_NOTE(buffer);
+  EXPECT_LOG_LEVEL_NOTE(buffer2);
+
+  set_log_level_for_all_handlers(*g_registry, LogLevel::kError);
+  EXPECT_LOG_LEVEL_ERROR(buffer);
+  EXPECT_LOG_LEVEL_ERROR(buffer2);
+
+  set_log_level_for_all_handlers(*g_registry, LogLevel::kWarning);
+  EXPECT_LOG_LEVEL_WARNING(buffer);
+  EXPECT_LOG_LEVEL_WARNING(buffer2);
+
+  set_log_level_for_all_handlers(*g_registry, LogLevel::kSystem);
+  EXPECT_LOG_LEVEL_SYSTEM(buffer);
+  EXPECT_LOG_LEVEL_SYSTEM(buffer2);
+
+  // Check that nothing is logged when the handlers are unregistered.
+  g_registry->remove_handler("stream1");
+  g_registry->remove_handler("stream2");
+  set_log_level_for_all_handlers(*g_registry, LogLevel::kNotSet);
+  EXPECT_LOG_LEVEL_NOT_SET(buffer);
+  EXPECT_LOG_LEVEL_NOT_SET(buffer2);
+
+  ASSERT_NO_THROW(g_registry->remove_logger(MYSQL_ROUTER_LOG_DOMAIN));
 }
 
 int main(int argc, char *argv[]) {
diff -Nru mysql-8.0-8.0.26/router/src/harness/tests/test_net_ts_impl_file.cc mysql-8.0-8.0.27/router/src/harness/tests/test_net_ts_impl_file.cc
--- mysql-8.0-8.0.26/router/src/harness/tests/test_net_ts_impl_file.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/tests/test_net_ts_impl_file.cc	2021-09-28 11:46:34.000000000 +0000
@@ -32,6 +32,10 @@
  * @test closing an invalid file-descriptor should result in bad_file_desc.
  */
 TEST(NetTS_impl_file, close_invalid_handle) {
+#if !defined(_WIN32)
+  // TODO(jkneschk) investigate why windows returns 'true' in this case
+  // according to the docs it shouldn't
+
   const auto expected_ec =
 #ifdef _WIN32
       std::error_code(ERROR_INVALID_HANDLE, std::system_category())
@@ -40,9 +44,6 @@
 #endif
       ;
 
-#if !defined(_WIN32)
-  // TODO(jkneschk) investigate why windows returns 'true' in this case
-  // according to the docs it shouldn't
   EXPECT_EQ(net::impl::file::close(net::impl::file::kInvalidHandle),
             stdx::make_unexpected(expected_ec));
 #endif
diff -Nru mysql-8.0-8.0.26/router/src/harness/tests/test_net_ts_impl_linux_epoll_io_service.cc mysql-8.0-8.0.27/router/src/harness/tests/test_net_ts_impl_linux_epoll_io_service.cc
--- mysql-8.0-8.0.26/router/src/harness/tests/test_net_ts_impl_linux_epoll_io_service.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/tests/test_net_ts_impl_linux_epoll_io_service.cc	2021-09-28 11:46:34.000000000 +0000
@@ -308,6 +308,53 @@
   net::impl::socket::close(fds.first);
   net::impl::socket::close(fds.second);
 }
+
+/**
+ * one FD with multiple events ready at the same time.
+ */
+TEST(LinuxEpollIoService, one_fd_many_events) {
+  auto res = net::impl::socket::socketpair(AF_UNIX, SOCK_STREAM, 0);
+
+  ASSERT_TRUE(res);
+
+  auto fds = res.value();
+
+  net::linux_epoll_io_service io_svc;
+
+  ASSERT_TRUE(io_svc.open());
+
+  SCOPED_TRACE("// add write interest");
+  EXPECT_TRUE(io_svc.add_fd_interest(fds.first, net::socket_base::wait_write));
+  SCOPED_TRACE("// add read interest");
+  EXPECT_TRUE(io_svc.add_fd_interest(fds.first, net::socket_base::wait_read));
+
+  SCOPED_TRACE("// check fd-interest after add-write");
+  auto interest_res = io_svc.interest(fds.first);
+  ASSERT_TRUE(interest_res);
+  EXPECT_EQ(interest_res.value(), EPOLLIN | EPOLLOUT | EPOLLET | EPOLLONESHOT);
+
+  // make sure the 'wait_read' fires too.
+  EXPECT_EQ(::write(fds.second, ".", 1), 1);
+
+  using namespace std::chrono_literals;
+
+  SCOPED_TRACE("// poll_one() should fire for the 1st event.");
+  auto poll_res = io_svc.poll_one(100ms);
+  ASSERT_TRUE(poll_res) << poll_res.error();
+
+  SCOPED_TRACE("// poll_one() should fire a 2nd time for the other event.");
+  poll_res = io_svc.poll_one(100ms);
+  ASSERT_TRUE(poll_res) << poll_res.error();
+
+  SCOPED_TRACE("// all events fired.");
+  poll_res = io_svc.poll_one(100ms);
+  ASSERT_EQ(poll_res,
+            stdx::make_unexpected(make_error_code(std::errc::timed_out)));
+
+  net::impl::socket::close(fds.first);
+  net::impl::socket::close(fds.second);
+}
+
 #endif
 
 int main(int argc, char *argv[]) {
diff -Nru mysql-8.0-8.0.26/router/src/harness/tests/test_net_ts_io_context.cc mysql-8.0-8.0.27/router/src/harness/tests/test_net_ts_io_context.cc
--- mysql-8.0-8.0.26/router/src/harness/tests/test_net_ts_io_context.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/tests/test_net_ts_io_context.cc	2021-09-28 11:46:34.000000000 +0000
@@ -576,9 +576,6 @@
   ASSERT_EQ(global_called, 1);
 }
 
-#if !defined(__SUNPRO_CC)
-// sunproc can't generate move-only lambda's
-
 /**
  * test that net::defer() compiles with move only lambdas.
  */
@@ -604,7 +601,6 @@
   ASSERT_EQ(0, io_ctx.run_one());
   ASSERT_EQ(called, 1);
 }
-#endif
 
 // net::is_executor_v<> chokes with solaris-ld on
 //
diff -Nru mysql-8.0-8.0.26/router/src/harness/tests/test_net_ts_win32_named_pipe.cc mysql-8.0-8.0.27/router/src/harness/tests/test_net_ts_win32_named_pipe.cc
--- mysql-8.0-8.0.26/router/src/harness/tests/test_net_ts_win32_named_pipe.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/tests/test_net_ts_win32_named_pipe.cc	2021-09-28 11:46:34.000000000 +0000
@@ -29,7 +29,6 @@
 #include "mysql/harness/net_ts/impl/socket.h"  // net::impl::socket::init
 
 #include "mysql/harness/stdx/expected_ostream.h"
-#include "mysql/harness/stdx/string_view.h"
 
 #if defined(_WIN32)
 
diff -Nru mysql-8.0-8.0.26/router/src/harness/tests/test_stdx_expected.cc mysql-8.0-8.0.27/router/src/harness/tests/test_stdx_expected.cc
--- mysql-8.0-8.0.26/router/src/harness/tests/test_stdx_expected.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/tests/test_stdx_expected.cc	2021-09-28 11:46:34.000000000 +0000
@@ -547,7 +547,7 @@
           make_error_code(std::errc::already_connected));
     }
 
-    return {stdx::in_place, "from_func"s};
+    return {std::in_place, "from_func"s};
   };
 
   // std::string in libstdc++
@@ -559,7 +559,7 @@
 
   // instantiation
   auto res =
-      stdx::expected<std::string, std::error_code>(stdx::in_place, "initial"s);
+      stdx::expected<std::string, std::error_code>(std::in_place, "initial"s);
 
   static_assert(std::is_move_assignable<std::string>::value, "");
 
diff -Nru mysql-8.0-8.0.26/router/src/harness/tests/test_stdx_string_view.cc mysql-8.0-8.0.27/router/src/harness/tests/test_stdx_string_view.cc
--- mysql-8.0-8.0.26/router/src/harness/tests/test_stdx_string_view.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/harness/tests/test_stdx_string_view.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,627 +0,0 @@
-/*
-  Copyright (c) 2019, 2021, Oracle 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,
-  as published by the Free Software Foundation.
-
-  This program is also distributed with certain software (including
-  but not limited to OpenSSL) that is licensed under separate terms,
-  as designated in a particular file or component or in included license
-  documentation.  The authors of MySQL hereby grant you an additional
-  permission to link the program and your derivative works with the
-  separately licensed software that they have included with MySQL.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-#include "mysql/harness/stdx/string_view.h"
-
-#include <cctype>  // toupper
-
-#include <gmock/gmock.h>
-
-template <class RetT>
-RetT get_string_abc();
-
-template <>
-const char *get_string_abc() {
-  return "abc";
-}
-
-template <>
-const wchar_t *get_string_abc() {
-  return L"abc";
-}
-
-template <>
-const char16_t *get_string_abc() {
-  return u"abc";
-}
-
-template <>
-const char32_t *get_string_abc() {
-  return U"abc";
-}
-
-template <>
-stdx::wstring_view get_string_abc() {
-  using namespace stdx::string_view_literals;
-  return L"abc"_sv;
-}
-
-template <>
-stdx::string_view get_string_abc() {
-  using namespace stdx::string_view_literals;
-  return "abc"_sv;
-}
-template <>
-stdx::u16string_view get_string_abc() {
-  using namespace stdx::string_view_literals;
-  return u"abc"_sv;
-}
-template <>
-stdx::u32string_view get_string_abc() {
-  using namespace stdx::string_view_literals;
-  return U"abc"_sv;
-}
-
-template <class RetT>
-RetT get_string_empty();
-
-template <>
-const char *get_string_empty() {
-  return "";
-}
-
-template <>
-const wchar_t *get_string_empty() {
-  return L"";
-}
-
-template <>
-const char16_t *get_string_empty() {
-  return u"";
-}
-
-template <>
-const char32_t *get_string_empty() {
-  return U"";
-}
-
-template <>
-stdx::wstring_view get_string_empty() {
-  using namespace stdx::string_view_literals;
-  return L""_sv;
-}
-
-template <>
-stdx::string_view get_string_empty() {
-  using namespace stdx::string_view_literals;
-  return ""_sv;
-}
-
-template <>
-stdx::u16string_view get_string_empty() {
-  using namespace stdx::string_view_literals;
-  return u""_sv;
-}
-
-template <>
-stdx::u32string_view get_string_empty() {
-  using namespace stdx::string_view_literals;
-  return U""_sv;
-}
-
-template <class RetT>
-RetT get_string_aab();
-
-template <>
-const char *get_string_aab() {
-  return "aab";
-}
-
-template <>
-const wchar_t *get_string_aab() {
-  return L"aab";
-}
-
-template <>
-const char16_t *get_string_aab() {
-  return u"aab";
-}
-
-template <>
-const char32_t *get_string_aab() {
-  return U"aab";
-}
-
-template <class RetT>
-RetT get_string_aaab();
-
-template <>
-const char *get_string_aaab() {
-  return "aaab";
-}
-
-template <>
-const wchar_t *get_string_aaab() {
-  return L"aaab";
-}
-
-template <>
-const char16_t *get_string_aaab() {
-  return u"aaab";
-}
-
-template <>
-const char32_t *get_string_aaab() {
-  return U"aaab";
-}
-
-template <class RetT>
-RetT get_string_ba();
-
-template <>
-const char *get_string_ba() {
-  return "ba";
-}
-
-template <>
-const wchar_t *get_string_ba() {
-  return L"ba";
-}
-
-template <>
-const char16_t *get_string_ba() {
-  return u"ba";
-}
-
-template <>
-const char32_t *get_string_ba() {
-  return U"ba";
-}
-
-template <class T>
-class StringViewTest : public ::testing::Test {
- public:
-  using value_type = typename T::value_type;
-  using pointer = typename T::pointer;
-  using string_type = std::basic_string<value_type>;
-  using string_view_type = stdx::basic_string_view<value_type>;
-
-  string_type empty_std_string() { return get_string_empty<pointer>(); }
-  pointer empty_cstring() { return get_string_empty<pointer>(); }
-  string_view_type empty_string_view() {
-    return get_string_empty<string_view_type>();
-  }
-
-  string_type abc_std_string() { return get_string_abc<pointer>(); }
-  pointer abc_cstring() { return get_string_abc<pointer>(); }
-  string_view_type abc_string_view() {
-    return get_string_abc<string_view_type>();
-  }
-
-  pointer aab() { return get_string_aab<pointer>(); }
-  pointer aaab() { return get_string_aaab<pointer>(); }
-  pointer ba() { return get_string_ba<pointer>(); }
-};
-
-using StringViewTestTypes =
-    ::testing::Types<stdx::string_view, stdx::wstring_view,
-                     stdx::u16string_view, stdx::u32string_view>;
-
-TYPED_TEST_SUITE(StringViewTest, StringViewTestTypes);
-
-TYPED_TEST(StringViewTest, construct_default) {
-  TypeParam sv;
-
-  EXPECT_TRUE(sv.empty());
-  EXPECT_EQ(sv.size(), 0);
-  EXPECT_EQ(sv.data(), nullptr);
-}
-
-TYPED_TEST(StringViewTest, construct_from_empty_std_string) {
-  typename TestFixture::string_type s;
-
-  TypeParam sv(s);
-
-  EXPECT_TRUE(sv.empty());
-  EXPECT_EQ(sv.size(), 0);
-  EXPECT_NE(sv.data(), nullptr);
-}
-
-TYPED_TEST(StringViewTest, construct_from_std_string) {
-  using string_type = typename TestFixture::string_type;
-
-  auto abc = this->abc_std_string();
-  string_type s(abc);
-
-  // .size()
-  TypeParam sv(s);
-
-  EXPECT_FALSE(sv.empty());
-  EXPECT_EQ(sv.size(), 3);
-  EXPECT_EQ(sv.data(), abc);
-}
-
-TYPED_TEST(StringViewTest, construct_cstring) {
-  auto abc = this->abc_cstring();
-  // strlen
-  TypeParam sv(abc);
-
-  EXPECT_FALSE(sv.empty());
-  EXPECT_EQ(sv.size(), 3);
-  EXPECT_THAT(sv, ::testing::ElementsAre(abc[0], abc[1], abc[2]));
-}
-
-TYPED_TEST(StringViewTest, construct_from_string_view_literal) {
-  auto abc = this->abc_cstring();
-  // knows the size, no strlen()
-  TypeParam sv(this->abc_string_view());
-
-  EXPECT_FALSE(sv.empty());
-  EXPECT_EQ(sv.size(), 3);
-  EXPECT_THAT(sv, ::testing::ElementsAre(abc[0], abc[1], abc[2]));
-}
-
-TYPED_TEST(StringViewTest, op_ndx) {
-  auto abc = this->abc_std_string();
-
-  TypeParam sv(abc);
-
-  EXPECT_EQ(sv[0], abc[0]);
-  EXPECT_EQ(sv[1], abc[1]);
-  EXPECT_EQ(sv[2], abc[2]);
-}
-
-TYPED_TEST(StringViewTest, at) {
-  auto abc = this->abc_std_string();
-
-  TypeParam sv(abc);
-
-  EXPECT_EQ(sv.at(0), abc[0]);
-  EXPECT_EQ(sv.at(1), abc[1]);
-  EXPECT_EQ(sv.at(2), abc[2]);
-}
-
-TYPED_TEST(StringViewTest, front) {
-  auto abc = this->abc_std_string();
-
-  TypeParam sv(abc);
-
-  EXPECT_EQ(sv.front(), abc[0]);
-}
-
-TYPED_TEST(StringViewTest, back) {
-  auto abc = this->abc_std_string();
-
-  TypeParam sv(abc);
-
-  EXPECT_EQ(sv.back(), abc[2]);
-}
-
-TYPED_TEST(StringViewTest, clear) {
-  auto abc = this->abc_std_string();
-
-  TypeParam sv(abc);
-
-  EXPECT_FALSE(sv.empty());
-
-  sv.clear();
-  EXPECT_TRUE(sv.empty());
-}
-
-TYPED_TEST(StringViewTest, length) {
-  auto abc = this->abc_std_string();
-
-  TypeParam sv(abc);
-
-  EXPECT_FALSE(sv.empty());
-  EXPECT_EQ(sv.size(), 3);
-  EXPECT_EQ(sv.length(), 3);
-
-  sv.clear();
-  EXPECT_TRUE(sv.empty());
-  EXPECT_EQ(sv.size(), 0);
-  EXPECT_EQ(sv.length(), 0);
-}
-
-TYPED_TEST(StringViewTest, remove_prefix) {
-  auto abc = this->abc_std_string();
-
-  TypeParam sv(abc);
-
-  sv.remove_prefix(1);
-
-  EXPECT_EQ(sv.size(), 2);
-  EXPECT_THAT(sv, ::testing::ElementsAre(abc[1], abc[2]));
-}
-
-TYPED_TEST(StringViewTest, remove_suffix) {
-  auto abc = this->abc_std_string();
-
-  TypeParam sv(abc);
-
-  sv.remove_suffix(1);
-
-  EXPECT_EQ(sv.size(), 2);
-  EXPECT_THAT(sv, ::testing::ElementsAre(abc[0], abc[1]));
-}
-
-TYPED_TEST(StringViewTest, substr_all) {
-  auto abc = this->abc_std_string();
-
-  TypeParam sv(abc);
-
-  auto sub = sv.substr();
-
-  // input is unchanged
-  EXPECT_EQ(sv.size(), 3);
-  EXPECT_THAT(sv, ::testing::ElementsAre(abc[0], abc[1], abc[2]));
-
-  // substr
-  EXPECT_EQ(sub.size(), 3);
-  EXPECT_THAT(sub, ::testing::ElementsAre(abc[0], abc[1], abc[2]));
-}
-
-TYPED_TEST(StringViewTest, substr_pos_all) {
-  auto abc = this->abc_std_string();
-
-  TypeParam sv(abc);
-
-  auto sub = sv.substr(1);
-
-  // input is unchanged
-  EXPECT_EQ(sv.size(), 3);
-  EXPECT_THAT(sv, ::testing::ElementsAre(abc[0], abc[1], abc[2]));
-
-  // substr
-  EXPECT_EQ(sub.size(), 2);
-  EXPECT_THAT(sub, ::testing::ElementsAre(abc[1], abc[2]));
-}
-
-TYPED_TEST(StringViewTest, substr) {
-  auto abc = this->abc_std_string();
-
-  TypeParam sv(abc);
-
-  auto sub = sv.substr(1, 1);
-
-  // input is unchanged
-  EXPECT_EQ(sv.size(), 3);
-  EXPECT_THAT(sv, ::testing::ElementsAre(abc[0], abc[1], abc[2]));
-
-  // substr
-  EXPECT_EQ(sub.size(), 1);
-  EXPECT_THAT(sub, ::testing::ElementsAre(abc[1]));
-}
-
-TYPED_TEST(StringViewTest, iter) {
-  auto abc = this->abc_std_string();
-
-  TypeParam sv(abc);
-
-  size_t ndx{};
-  for (auto c : sv) {
-    EXPECT_EQ(c, abc[ndx++]);
-  }
-}
-
-// reverse iterator adaptor for range-for-loops
-template <class T>
-struct reverser {
-  T &iterable;
-};
-
-template <class T>
-constexpr auto begin(reverser<T> w) {
-  return std::rbegin(w.iterable);
-}
-
-template <class T>
-constexpr auto end(reverser<T> w) {
-  return std::rend(w.iterable);
-}
-
-template <class T>
-constexpr reverser<T> reverse(T &&iterable) noexcept {
-  return {iterable};
-}
-
-TYPED_TEST(StringViewTest, reverse_iter) {
-  auto abc = this->abc_cstring();
-
-  TypeParam sv(abc);
-
-  size_t ndx{TypeParam::traits_type::length(abc) - 1};
-  for (auto c : reverse(sv)) {
-    EXPECT_EQ(c, abc[ndx--]);
-  }
-}
-
-TYPED_TEST(StringViewTest, find_found_overlap) {
-  TypeParam sv(this->aaab());
-
-  EXPECT_EQ(sv.find(this->aab()), 1);
-}
-
-TYPED_TEST(StringViewTest, find_found_full_match) {
-  TypeParam sv(this->aaab());
-
-  EXPECT_EQ(sv.find(this->aaab()), 0);
-}
-
-TYPED_TEST(StringViewTest, find_no_match) {
-  TypeParam sv(this->aaab());
-
-  EXPECT_EQ(sv.find(this->ba()), stdx::string_view::npos);
-}
-
-TYPED_TEST(StringViewTest, find_empty) {
-  TypeParam sv(this->aaab());
-
-  EXPECT_EQ(sv.find(this->empty_string_view()), 0);
-}
-
-TYPED_TEST(StringViewTest, find_empty_in_empty) {
-  TypeParam sv(this->empty_string_view());
-
-  EXPECT_EQ(sv.find(get_string_empty<TypeParam>()), 0);
-}
-
-TYPED_TEST(StringViewTest, find_empty_in_empty_out_of_range) {
-  TypeParam sv(this->empty_string_view());
-
-  EXPECT_EQ(sv.find(this->empty_string_view(), 25), TypeParam::npos);
-}
-
-TYPED_TEST(StringViewTest, find_pos_out_of_range) {
-  TypeParam sv(this->abc_string_view());
-
-  EXPECT_EQ(sv.find(this->empty_string_view(), 25), TypeParam::npos);
-}
-
-TYPED_TEST(StringViewTest, to_string) {
-  auto abc = this->abc_cstring();
-
-  TypeParam sv(abc);
-
-  EXPECT_EQ(typename TestFixture::string_type(sv), abc);
-}
-
-TYPED_TEST(StringViewTest, to_ostream) {
-  std::basic_ostringstream<typename TypeParam::value_type> os;
-  auto abc = this->abc_std_string();
-
-  TypeParam sv(abc);
-
-  os << sv;
-
-  EXPECT_EQ(os.str(), abc);
-}
-
-template <class A, class B>
-void compare_string_view(A a, B b, int comp_res) {
-  EXPECT_EQ(a == b, comp_res == 0);
-  EXPECT_EQ(a != b, comp_res != 0);
-  EXPECT_EQ(a > b, comp_res == 1);
-  EXPECT_EQ(a <= b, comp_res != 1);
-  EXPECT_EQ(a < b, comp_res == -1);
-  EXPECT_EQ(a >= b, comp_res != -1);
-}
-
-TYPED_TEST(StringViewTest, comp_sv_sv) {
-  using string_view_type = typename TestFixture::string_view_type;
-  using other_type = string_view_type;
-
-  compare_string_view<string_view_type, other_type>(this->aab(), this->aab(),
-                                                    0);
-
-  compare_string_view<string_view_type, other_type>(this->abc_cstring(),
-                                                    this->aab(), 1);
-
-  compare_string_view<other_type, string_view_type>(this->aab(),
-                                                    this->abc_cstring(), -1);
-}
-
-TYPED_TEST(StringViewTest, comp_s_sv) {
-  using string_view_type = typename TestFixture::string_view_type;
-  using other_type = typename TestFixture::pointer;
-
-  compare_string_view<string_view_type, other_type>(this->aab(), this->aab(),
-                                                    0);
-
-  compare_string_view<string_view_type, other_type>(this->abc_cstring(),
-                                                    this->aab(), 1);
-
-  compare_string_view<other_type, string_view_type>(this->aab(),
-                                                    this->abc_cstring(), -1);
-}
-
-TYPED_TEST(StringViewTest, comp_cstring_sv) {
-  using string_view_type = typename TestFixture::string_view_type;
-  using other_type = typename TestFixture::pointer;
-
-  compare_string_view<string_view_type, other_type>(this->aab(), this->aab(),
-                                                    0);
-
-  compare_string_view<string_view_type, other_type>(this->abc_cstring(),
-                                                    this->aab(), 1);
-
-  compare_string_view<other_type, string_view_type>(this->aab(),
-                                                    this->abc_cstring(), -1);
-}
-
-TYPED_TEST(StringViewTest, impl_length) {
-  EXPECT_EQ(stdx::impl::char_traits_length(this->aab()), 3);
-  EXPECT_EQ(stdx::impl::char_traits_length(this->aaab()), 4);
-  EXPECT_EQ(stdx::impl::char_traits_length(this->ba()), 2);
-}
-
-TYPED_TEST(StringViewTest, impl_compare_aab_aaab_0) {
-  EXPECT_EQ(stdx::impl::char_traits_compare(this->aab(), this->aaab(), 0), 0);
-}
-
-TYPED_TEST(StringViewTest, impl_compare_aab_aaab_1) {
-  EXPECT_EQ(stdx::impl::char_traits_compare(this->aab(), this->aaab(), 1), 0);
-}
-
-TYPED_TEST(StringViewTest, impl_compare_aab_aaab_2) {
-  EXPECT_EQ(stdx::impl::char_traits_compare(this->aab(), this->aaab(), 2), 0);
-}
-
-TYPED_TEST(StringViewTest, impl_compare_aab_aaab_3) {
-  EXPECT_EQ(stdx::impl::char_traits_compare(this->aab(), this->aaab(), 3), 1);
-}
-
-TYPED_TEST(StringViewTest, impl_compare_aaab_aab_3) {
-  EXPECT_EQ(stdx::impl::char_traits_compare(this->aaab(), this->aab(), 3), -1);
-}
-
-TYPED_TEST(StringViewTest, impl_memmatch) {
-  auto aab = this->aab();
-  auto aaab = this->aaab();
-
-  EXPECT_EQ(stdx::impl::memmatch(aaab, 4, aaab, 4), aaab);
-  EXPECT_EQ(stdx::impl::memmatch(aaab, 4, aab, 3), aaab + 1);
-  EXPECT_EQ(stdx::impl::memmatch(aab, 3, aaab, 4), nullptr);
-}
-
-TYPED_TEST(StringViewTest, hash) {
-  std::map<TypeParam, int> a_map{{this->abc_string_view(), 1}};
-}
-
-struct ci_char_traits : public std::char_traits<char> {
-  static char to_upper(char ch) { return std::toupper((unsigned char)ch); }
-
-  // is used by impl::find
-  static bool eq(char c1, char c2) { return to_upper(c1) == to_upper(c2); }
-
-  // is used by impl::compare
-  static bool lt(char c1, char c2) { return to_upper(c1) < to_upper(c2); }
-};
-
-TEST(CaseInsensitiveStringViewTest, find) {
-  using ci_string_view = stdx::basic_string_view<char, ci_char_traits>;
-
-  EXPECT_EQ(ci_string_view("abc", 3).find("BC"), 1);
-}
-
-TEST(CaseInsensitiveStringViewTest, compare) {
-  using ci_string_view = stdx::basic_string_view<char, ci_char_traits>;
-
-  EXPECT_EQ(ci_string_view("abc", 3).compare("ABC"), 0);
-}
-
-int main(int argc, char *argv[]) {
-  ::testing::InitGoogleTest(&argc, argv);
-  return RUN_ALL_TESTS();
-}
diff -Nru mysql-8.0-8.0.26/router/src/http/include/mysqlrouter/http_auth_backend_component.h mysql-8.0-8.0.27/router/src/http/include/mysqlrouter/http_auth_backend_component.h
--- mysql-8.0-8.0.26/router/src/http/include/mysqlrouter/http_auth_backend_component.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/http/include/mysqlrouter/http_auth_backend_component.h	2021-09-28 11:46:34.000000000 +0000
@@ -48,9 +48,15 @@
   static HttpAuthBackendComponent &get_instance();
 
   /**
-   * initialize component from backends.
+   * register an authentication backend.
    */
-  void init(std::shared_ptr<value_type> backends);
+  void add_backend(const std::string &name,
+                   std::shared_ptr<HttpAuthBackend> backend);
+
+  /**
+   * unregister an authentication backend.
+   */
+  void remove_backend(const std::string &name);
 
   /**
    * authenticate user against auth-backend.
@@ -67,8 +73,8 @@
   HttpAuthBackendComponent(HttpAuthBackendComponent const &) = delete;
   void operator=(HttpAuthBackendComponent const &) = delete;
 
-  std::mutex mu;  // request handler mutex
-  std::weak_ptr<value_type> auth_backends_;
+  std::mutex backends_m_;
+  value_type auth_backends_;
 
   HttpAuthBackendComponent() = default;
 };
diff -Nru mysql-8.0-8.0.26/router/src/http/include/mysqlrouter/http_auth_realm_component.h mysql-8.0-8.0.27/router/src/http/include/mysqlrouter/http_auth_realm_component.h
--- mysql-8.0-8.0.26/router/src/http/include/mysqlrouter/http_auth_realm_component.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/http/include/mysqlrouter/http_auth_realm_component.h	2021-09-28 11:46:34.000000000 +0000
@@ -27,6 +27,7 @@
 
 #include <map>
 #include <memory>
+#include <mutex>
 #include <string>
 #include <system_error>
 
@@ -47,9 +48,14 @@
   static HttpAuthRealmComponent &get_instance();
 
   /**
-   * init component from realms.
+   * register a realm with a handler.
    */
-  void init(std::shared_ptr<value_type> realms);
+  void add_realm(const std::string &name, std::shared_ptr<HttpAuthRealm> realm);
+
+  /**
+   * unregister a realm.
+   */
+  void remove_realm(const std::string &name);
 
   /**
    * authenticate user with authdata against realm.
@@ -74,7 +80,8 @@
   HttpAuthRealmComponent(HttpAuthRealmComponent const &) = delete;
   void operator=(HttpAuthRealmComponent const &) = delete;
 
-  std::weak_ptr<value_type> auth_realms_;
+  std::mutex realms_m_;
+  value_type auth_realms_;
 
   HttpAuthRealmComponent() = default;
 };
diff -Nru mysql-8.0-8.0.26/router/src/http/src/digest.h mysql-8.0-8.0.27/router/src/http/src/digest.h
--- mysql-8.0-8.0.26/router/src/http/src/digest.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/http/src/digest.h	2021-09-28 11:46:34.000000000 +0000
@@ -66,19 +66,14 @@
     EVP_MD_CTX_create(), &EVP_MD_CTX_destroy
 #endif
   }
-  { init(type_); }
+  { reinit(); }
 
   /**
-   * initialize the message digest functions.
+   * initialize or reinitialize the message digest functions.
    *
-   * Allows reused of the Digest function without reallocating memory
-   *
-   * @pre Digest is not initialized or is finalized.
+   * Allows reused of the Digest function without reallocating memory.
    */
-  void init(Type type) {
-    type_ = type;
-    EVP_DigestInit(ctx_.get(), Digest::get_evp_md(type));
-  }
+  void reinit() { EVP_DigestInit(ctx_.get(), Digest::get_evp_md(type_)); }
 
   /**
    * update Digest.
@@ -103,16 +98,14 @@
    *
    * @param out vector to place the digest value in
    */
-  void finalize(std::vector<uint8_t> &out) {
-    // if cap is too large, limit it to uint::max and let narrowing handle the
-    // rest
-    unsigned int out_len{static_cast<unsigned int>(std::min(
-        out.capacity(),
-        static_cast<size_t>(std::numeric_limits<unsigned int>::max())))};
+  void finalize(std::vector<uint8_t> &out) { finalize_impl(out); }
 
-    EVP_DigestFinal_ex(ctx_.get(), out.data(), &out_len);
-    out.resize(out_len);
-  }
+  /**
+   * finalize the digest and get digest value.
+   *
+   * @param out string to place the digest value in
+   */
+  void finalize(std::string &out) { finalize_impl(out); }
 
   /**
    * get size of the digest value.
@@ -130,6 +123,19 @@
   }
 
  private:
+  template <typename Container>
+  void finalize_impl(Container &out) {
+    // if cap is too large, limit it to uint::max and let narrowing handle the
+    // rest
+    unsigned int out_len{static_cast<unsigned int>(std::min(
+        out.capacity(),
+        static_cast<size_t>(std::numeric_limits<unsigned int>::max())))};
+
+    EVP_DigestFinal_ex(ctx_.get(), reinterpret_cast<uint8_t *>(&out[0]),
+                       &out_len);
+    out.resize(out_len);
+  }
+
   static const EVP_MD *get_evp_md(Type type) noexcept {
     switch (type) {
       case Type::Md5:
diff -Nru mysql-8.0-8.0.26/router/src/http/src/http_auth_backend.cc mysql-8.0-8.0.27/router/src/http/src/http_auth_backend.cc
--- mysql-8.0-8.0.26/router/src/http/src/http_auth_backend.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/http/src/http_auth_backend.cc	2021-09-28 11:46:34.000000000 +0000
@@ -34,6 +34,7 @@
 #include <sys/types.h>
 #include <cerrno>
 
+#include "digest.h"
 #include "http_auth_error.h"
 #include "kdf_pbkdf2.h"
 #include "kdf_sha_crypt.h"
@@ -135,6 +136,7 @@
 
   // assign creds only after no parse-error
   credentials_ = creds;
+  credentials_cache_.clear();
 
   return {};
 }
@@ -160,11 +162,12 @@
     }
   }
 
-  if (credentials_.count(username) == 0) {
+  const auto it = credentials_.find(username);
+  if (it == credentials_.end()) {
     return make_error_code(McfErrc::kUserNotFound);
   }
 
-  auto mcf_line = credentials_.at(username);
+  auto mcf_line = it->second;
 
   if (mcf_line.size() < 1) return make_error_code(McfErrc::kParseError);
   if (mcf_line[0] != '$') return make_error_code(McfErrc::kParseError);
@@ -176,18 +179,44 @@
 
   try {
     std::string derived;
+    std::string hash = hash_password(password);
+    std::error_code validate_error;
 
-    if (ShaCryptMcfAdaptor::supports_mcf_id(mcf_id)) {
-      return ShaCryptMcfAdaptor::validate(mcf_line, password);
+    const auto cacheIt = credentials_cache_.find(username);
+
+    if (cacheIt != credentials_cache_.end() && cacheIt->second == hash) {
+      return {};
+    } else if (ShaCryptMcfAdaptor::supports_mcf_id(mcf_id)) {
+      validate_error = ShaCryptMcfAdaptor::validate(mcf_line, password);
     } else if (Pbkdf2McfAdaptor::supports_mcf_id(mcf_id)) {
-      return Pbkdf2McfAdaptor::validate(mcf_line, password);
-    }
+      validate_error = Pbkdf2McfAdaptor::validate(mcf_line, password);
+    } else
+      return make_error_code(McfErrc::kUnknownScheme);
 
-    return make_error_code(McfErrc::kUnknownScheme);
+    if (!validate_error) credentials_cache_[username] = hash;
+
+    return validate_error;
   } catch (const std::exception &) {
     // treat all exceptions as parse-errors
     return make_error_code(McfErrc::kParseError);
   }
 }
 
+std::string HttpAuthBackendHtpasswd::hash_password(
+    const std::string &password) {
+  static const uint32_t digest_size = Digest::digest_size(Digest::Type::Sha256);
+  std::string result(digest_size, '\0');
+  Digest sha256(Digest::Type::Sha256);
+
+  sha256.update(password);
+  sha256.finalize(result);
+
+  sha256.reinit();
+
+  sha256.update(result);
+  sha256.finalize(result);
+
+  return result;
+}
+
 HttpAuthBackend::~HttpAuthBackend() = default;
diff -Nru mysql-8.0-8.0.26/router/src/http/src/http_auth_backend_component.cc mysql-8.0-8.0.27/router/src/http/src/http_auth_backend_component.cc
--- mysql-8.0-8.0.26/router/src/http/src/http_auth_backend_component.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/http/src/http_auth_backend_component.cc	2021-09-28 11:46:34.000000000 +0000
@@ -32,23 +32,32 @@
 #include "http_auth_backend.h"
 #include "http_auth_error.h"
 
-void HttpAuthBackendComponent::init(std::shared_ptr<value_type> auth_backends) {
-  auth_backends_ = auth_backends;
-}
-
 std::error_code HttpAuthBackendComponent::authenticate(
     const std::string &inst, const std::string &username,
     const std::string &authdata) {
-  if (auto backends = auth_backends_.lock()) {
-    auto it = backends->find(inst);
-    if (it == backends->end()) {
-      return make_error_code(HttpAuthErrc::kBackendNotFound);
-    }
-
-    return it->second->authenticate(username, authdata);
-  } else {
-    // backends couldn't get locked
-    return std::make_error_code(std::errc::invalid_argument);
+  std::lock_guard<std::mutex> lk(backends_m_);
+
+  auto it = auth_backends_.find(inst);
+  if (it == auth_backends_.end()) {
+    return make_error_code(HttpAuthErrc::kBackendNotFound);
+  }
+
+  return it->second->authenticate(username, authdata);
+}
+
+void HttpAuthBackendComponent::add_backend(
+    const std::string &name, std::shared_ptr<HttpAuthBackend> backend) {
+  std::lock_guard<std::mutex> lk(backends_m_);
+
+  auth_backends_[name] = std::move(backend);
+}
+
+void HttpAuthBackendComponent::remove_backend(const std::string &name) {
+  std::lock_guard<std::mutex> lk(backends_m_);
+
+  const auto it = auth_backends_.find(name);
+  if (it != auth_backends_.end()) {
+    auth_backends_.erase(it);
   }
 }
 
diff -Nru mysql-8.0-8.0.26/router/src/http/src/http_auth_backend.h mysql-8.0-8.0.27/router/src/http/src/http_auth_backend.h
--- mysql-8.0-8.0.26/router/src/http/src/http_auth_backend.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/http/src/http_auth_backend.h	2021-09-28 11:46:34.000000000 +0000
@@ -123,6 +123,7 @@
  public:
   using key_type = std::string;
   using value_type = std::string;
+  using cache_type = std::string;
 
   /**
    * iterator
@@ -156,6 +157,7 @@
    * remove username from credential cache.
    */
   size_t erase(const key_type &username) {
+    credentials_cache_.erase(username);
     return credentials_.erase(username);
   }
 
@@ -218,12 +220,24 @@
                                const value_type &authdata) override;
 
  private:
+  /**
+   * Calculate hash of plain-text password
+   *
+   * The hash generated by this function should be used at http basic
+   * authentication to speedup verification of the transfered credentials
+   * against account informations stored in `passwd` file. There are no direct
+   * requirement how the hash should be calculated. Currently it uses following
+   * formula: HASH=SHA256(SHA256(plain-text-password)).
+   */
+  static std::string hash_password(const std::string &password);
   std::error_code from_stream_(std::istream &is);
+
   bool is_file_{false};
   std::string filename_;
   FileModified file_meta_;
 
   std::map<key_type, value_type> credentials_;
+  std::map<key_type, cache_type> credentials_cache_;
 };
 
 #endif
diff -Nru mysql-8.0-8.0.26/router/src/http/src/http_auth_backend_plugin.cc mysql-8.0-8.0.27/router/src/http/src/http_auth_backend_plugin.cc
--- mysql-8.0-8.0.26/router/src/http/src/http_auth_backend_plugin.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/http/src/http_auth_backend_plugin.cc	2021-09-28 11:46:34.000000000 +0000
@@ -53,6 +53,7 @@
 IMPORT_LOG_FUNCTIONS()
 
 static constexpr const char kSectionName[]{"http_auth_backend"};
+static std::vector<std::string> registered_backends;
 
 namespace {
 class HtpasswdPluginConfig : public mysqlrouter::BasePluginConfig {
@@ -129,7 +130,8 @@
   }
 
   try {
-    auth_backends = std::make_shared<HttpAuthBackendComponent::value_type>();
+    auto &auth_backend_component = HttpAuthBackendComponent::get_instance();
+
     for (const mysql_harness::ConfigSection *section :
          info->config->sections()) {
       if (section->name != kSectionName) {
@@ -144,11 +146,13 @@
       }
 
       PluginConfig config(section);
+      const std::string backend_name = section->key;
+      auth_backend_component.add_backend(
+          backend_name,
+          HttpAuthBackendFactory::create(config.backend, section));
 
-      auth_backends->insert({section->key, HttpAuthBackendFactory::create(
-                                               config.backend, section)});
+      registered_backends.push_back(backend_name);
     }
-    HttpAuthBackendComponent::get_instance().init(auth_backends);
   } catch (const std::invalid_argument &exc) {
     set_error(env, mysql_harness::kConfigInvalidArgument, "%s", exc.what());
   } catch (const std::exception &exc) {
@@ -189,6 +193,16 @@
   }
 }
 
+static void deinit(mysql_harness::PluginFuncEnv *) {
+  auto &auth_backend_component = HttpAuthBackendComponent::get_instance();
+
+  for (const auto &backend : registered_backends) {
+    auth_backend_component.remove_backend(backend);
+  }
+
+  registered_backends.clear();
+}
+
 static const std::array<const char *, 2> required = {{
     "logger",
     "router_protobuf",
@@ -206,7 +220,7 @@
         // conflicts
         0, nullptr,
         init,     // init
-        nullptr,  // deinit
+        deinit,   // deinit
         start,    // start
         nullptr,  // stop
         false,    // declares_readiness
diff -Nru mysql-8.0-8.0.26/router/src/http/src/http_auth_realm_component.cc mysql-8.0-8.0.27/router/src/http/src/http_auth_realm_component.cc
--- mysql-8.0-8.0.26/router/src/http/src/http_auth_realm_component.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/http/src/http_auth_realm_component.cc	2021-09-28 11:46:34.000000000 +0000
@@ -30,22 +30,32 @@
 #include "http_auth_realm.h"
 #include "mysqlrouter/http_auth_realm_component.h"
 
-void HttpAuthRealmComponent::init(std::shared_ptr<value_type> auth_realms) {
-  auth_realms_ = auth_realms;
+void HttpAuthRealmComponent::add_realm(const std::string &name,
+                                       std::shared_ptr<HttpAuthRealm> realm) {
+  std::lock_guard<std::mutex> lk(realms_m_);
+
+  auth_realms_[name] = std::move(realm);
+}
+
+void HttpAuthRealmComponent::remove_realm(const std::string &name) {
+  std::lock_guard<std::mutex> lk(realms_m_);
+
+  const auto it = auth_realms_.find(name);
+  if (it != auth_realms_.end()) {
+    auth_realms_.erase(it);
+  }
 }
 
 std::shared_ptr<HttpAuthRealm> HttpAuthRealmComponent::get(
     const std::string &inst) {
-  if (auto realms = auth_realms_.lock()) {
-    auto it = realms->find(inst);
-    if (it == realms->end()) {
-      return nullptr;
-    }
+  std::lock_guard<std::mutex> lk(realms_m_);
 
-    return it->second;
-  } else {
+  auto it = auth_realms_.find(inst);
+  if (it == auth_realms_.end()) {
     return nullptr;
   }
+
+  return it->second;
 }
 
 std::error_code HttpAuthRealmComponent::authenticate(
diff -Nru mysql-8.0-8.0.26/router/src/http/src/http_auth_realm_plugin.cc mysql-8.0-8.0.27/router/src/http/src/http_auth_realm_plugin.cc
--- mysql-8.0-8.0.26/router/src/http/src/http_auth_realm_plugin.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/http/src/http_auth_realm_plugin.cc	2021-09-28 11:46:34.000000000 +0000
@@ -62,6 +62,7 @@
 using namespace std::string_literals;
 
 static constexpr const char kSectionName[]{"http_auth_realm"};
+static std::vector<std::string> registered_realms;
 
 class HttpAuthRealmPluginConfig : public mysqlrouter::BasePluginConfig {
  public:
@@ -118,7 +119,8 @@
       }
     }
 
-    auth_realms = std::make_shared<HttpAuthRealmComponent::value_type>();
+    auto &auth_realm_component = HttpAuthRealmComponent::get_instance();
+
     for (const mysql_harness::ConfigSection *section :
          info->config->sections()) {
       if (section->name != kSectionName) {
@@ -158,11 +160,13 @@
             "] does not match any http_auth_backend. " + backend_msg);
       }
 
-      auth_realms->insert({section->key, std::make_shared<HttpAuthRealm>(
-                                             config.name, config.require,
-                                             config.method, config.backend)});
+      const std::string realm_name = section->key;
+      auth_realm_component.add_realm(
+          realm_name,
+          std::make_shared<HttpAuthRealm>(config.name, config.require,
+                                          config.method, config.backend));
+      registered_realms.push_back(realm_name);
     }
-    HttpAuthRealmComponent::get_instance().init(auth_realms);
   } catch (const std::invalid_argument &exc) {
     set_error(env, mysql_harness::kConfigInvalidArgument, "%s", exc.what());
   } catch (const std::exception &exc) {
@@ -172,6 +176,16 @@
   }
 }
 
+static void deinit(mysql_harness::PluginFuncEnv *) {
+  auto &auth_realm_component = HttpAuthRealmComponent::get_instance();
+
+  for (const auto &realm : registered_realms) {
+    auth_realm_component.remove_realm(realm);
+  }
+
+  registered_realms.clear();
+}
+
 static const std::array<const char *, 1> required = {{
     "logger",
 }};
@@ -187,7 +201,7 @@
     // conflicts
     0, nullptr,
     init,     // init
-    nullptr,  // deinit
+    deinit,   // deinit
     nullptr,  // start
     nullptr,  // stop
     false,    // declares_readiness
diff -Nru mysql-8.0-8.0.26/router/src/http/src/http_server_plugin.cc mysql-8.0-8.0.27/router/src/http/src/http_server_plugin.cc
--- mysql-8.0-8.0.26/router/src/http/src/http_server_plugin.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/http/src/http_server_plugin.cc	2021-09-28 11:46:34.000000000 +0000
@@ -276,6 +276,7 @@
         throw std::system_error(sock_release_res.error(), "release() failed");
       }
 
+      accept_fd_ = sock_release_res.value();
       auto handle =
           event_http_.accept_socket_with_handle(sock_release_res.value());
       if (!handle.is_valid()) {
diff -Nru mysql-8.0-8.0.26/router/src/http/src/passwd.cc mysql-8.0-8.0.27/router/src/http/src/passwd.cc
--- mysql-8.0-8.0.26/router/src/http/src/passwd.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/http/src/passwd.cc	2021-09-28 11:46:34.000000000 +0000
@@ -190,7 +190,7 @@
 
           break;
         }
-        /* Falls through. */
+        [[fallthrough]];
       default:
         if (config_.cmd == PasswdFrontend::Cmd::List) {
           throw UsageError("expected at least one extra argument: <filename>");
diff -Nru mysql-8.0-8.0.26/router/src/io/src/thread_affinity.cc mysql-8.0-8.0.27/router/src/io/src/thread_affinity.cc
--- mysql-8.0-8.0.26/router/src/io/src/thread_affinity.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/io/src/thread_affinity.cc	2021-09-28 11:46:34.000000000 +0000
@@ -107,15 +107,20 @@
   SetThreadAffinityMask(thread_id_, cur_mask);
 
   // create bitmask from old_mask.
-  return {stdx::in_place, cur_mask};
+  return {std::in_place, cur_mask};
 #else
   return stdx::make_unexpected(make_error_code(std::errc::not_supported));
 #endif
 }
 
+// Doxygen gets confused by [[maybe_unused]]
+
+/**
+ @cond
+*/
 stdx::expected<void, std::error_code> ThreadAffinity::affinity(
     std::bitset<ThreadAffinity::max_cpus> cpus
-        MY_ATTRIBUTE((unused))) const noexcept {
+    [[maybe_unused]]) const noexcept {
 #if defined(__linux__) || defined(__FreeBSD__)
   thread_affinity_cpu_set_type cpuset;
 
@@ -170,3 +175,7 @@
   return stdx::make_unexpected(make_error_code(std::errc::not_supported));
 #endif
 }
+
+/**
+ @endcond
+*/
diff -Nru mysql-8.0-8.0.26/router/src/metadata_cache/include/mysqlrouter/metadata_cache.h mysql-8.0-8.0.27/router/src/metadata_cache/include/mysqlrouter/metadata_cache.h
--- mysql-8.0-8.0.26/router/src/metadata_cache/include/mysqlrouter/metadata_cache.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/metadata_cache/include/mysqlrouter/metadata_cache.h	2021-09-28 11:46:34.000000000 +0000
@@ -60,6 +60,67 @@
 
 namespace metadata_cache {
 
+enum class metadata_errc {
+  ok,
+  no_rw_node_found,
+  no_rw_node_needed,
+  no_metadata_server_reached,
+  no_metadata_read_successful,
+  cluster_marked_as_invalid,
+  metadata_refresh_terminated,
+  cluster_not_found,
+  invalid_cluster_type,
+  outdated_view_id
+};
+}  // namespace metadata_cache
+
+namespace std {
+template <>
+struct is_error_code_enum<metadata_cache::metadata_errc>
+    : public std::true_type {};
+}  // namespace std
+
+namespace metadata_cache {
+inline const std::error_category &metadata_cache_category() noexcept {
+  class metadata_category_impl : public std::error_category {
+   public:
+    const char *name() const noexcept override { return "metadata cache"; }
+    std::string message(int ev) const override {
+      switch (static_cast<metadata_errc>(ev)) {
+        case metadata_errc::ok:
+          return "ok";
+        case metadata_errc::no_rw_node_found:
+          return "no RW node found";
+        case metadata_errc::no_rw_node_needed:
+          return "RW node not requested";
+        case metadata_errc::no_metadata_server_reached:
+          return "no metadata server accessible";
+        case metadata_errc::no_metadata_read_successful:
+          return "did not successfully read metadata from any metadata server";
+        case metadata_errc::cluster_marked_as_invalid:
+          return "cluster marked as invalid in the metadata";
+        case metadata_errc::metadata_refresh_terminated:
+          return "metadata refresh terminated";
+        case metadata_errc::cluster_not_found:
+          return "cluster not found in the metadata";
+        case metadata_errc::invalid_cluster_type:
+          return "unexpected cluster type";
+        case metadata_errc::outdated_view_id:
+          return "highier view_id seen";
+        default:
+          return "unknown";
+      }
+    }
+  };
+
+  static metadata_category_impl instance;
+  return instance;
+}
+
+inline std::error_code make_error_code(metadata_errc e) noexcept {
+  return std::error_code(static_cast<int>(e), metadata_cache_category());
+}
+
 extern const uint16_t kDefaultMetadataPort;
 extern const std::string kDefaultMetadataAddress;
 extern const std::string kDefaultMetadataUser;
@@ -76,7 +137,7 @@
 extern const bool kNodeTagHiddenDefault;
 extern const bool kNodeTagDisconnectWhenHiddenDefault;
 
-enum class ReplicasetStatus {
+enum class ClusterStatus {
   AvailableWritable,
   AvailableReadOnly,
   UnavailableRecovering,
@@ -99,8 +160,7 @@
 class METADATA_API ManagedInstance {
  public:
   ManagedInstance() = default;
-  ManagedInstance(const std::string &p_replicaset_name,
-                  const std::string &p_mysql_server_uuid,
+  ManagedInstance(const std::string &p_mysql_server_uuid,
                   const ServerMode p_mode, const std::string &p_host,
                   const uint16_t p_port, const uint16_t p_xport);
 
@@ -109,8 +169,6 @@
   operator TCPAddress() const;
   bool operator==(const ManagedInstance &other) const;
 
-  /** @brief The name of the replicaset to which the server belongs */
-  std::string replicaset_name;
   /** @brief The uuid of the MySQL server */
   std::string mysql_server_uuid;
   /** @brief The mode of the server */
@@ -129,24 +187,46 @@
       kNodeTagDisconnectWhenHiddenDefault};
 };
 
-/** @class ManagedReplicaSet
- * Represents a replicaset (a GR group or AR members)
+using cluster_nodes_list_t = std::vector<ManagedInstance>;
+
+using metadata_server_t = mysql_harness::TCPAddress;
+
+using metadata_servers_list_t = std::vector<metadata_server_t>;
+
+/** @class ManagedCluster
+ * Represents a cluster (a GR group or AR members)
  */
-class METADATA_API ManagedReplicaSet {
+class METADATA_API ManagedCluster {
  public:
-  /** @brief The name of the replica set */
-  std::string name;
-  /** @brief List of the members that belong to the replicaset */
-  std::vector<metadata_cache::ManagedInstance> members;
-  /** @brief Whether replicaset is in single_primary_mode (from PFS in case of
+  /** @brief List of the members that belong to the cluster */
+  cluster_nodes_list_t members;
+  /** @brief Whether the cluster is in single_primary_mode (from PFS in case of
    * GR) */
   bool single_primary_mode;
   /** @brief Id of the view this metadata represents (only used for AR now)*/
-  unsigned view_id{0};
-  /** @brief Metadata for the replicaset is not consistent (only applicable for
+  uint64_t view_id{0};
+  /** @brief Metadata for the cluster is not consistent (only applicable for
    * the GR cluster when the data in the GR metadata is not consistent with the
    * cluster metadata)*/
   bool md_discrepancy{false};
+
+  // address of the writable metadata server that can be used for updating the
+  // metadata (router version, last_check_in), error code if not found
+  stdx::expected<metadata_cache::metadata_server_t, std::error_code>
+      writable_server{stdx::make_unexpected(
+          make_error_code(metadata_cache::metadata_errc::no_rw_node_found))};
+
+  bool empty() const noexcept { return members.empty(); }
+
+  void clear() noexcept { members.clear(); }
+};
+
+/** @class ManagedCluster
+ * Represents a cluster (a GR group or AR members) and its metadata servers
+ */
+struct METADATA_API ClusterTopology {
+  ManagedCluster cluster_data;
+  metadata_servers_list_t metadata_servers;
 };
 
 /** @class connection_error
@@ -179,42 +259,52 @@
 class METADATA_API LookupResult {
  public:
   /** @brief Constructor */
-  LookupResult(const std::vector<ManagedInstance> &instance_vector_)
+  LookupResult(const cluster_nodes_list_t &instance_vector_)
       : instance_vector(instance_vector_) {}
 
   /** @brief List of ManagedInstance objects */
-  const std::vector<metadata_cache::ManagedInstance> instance_vector;
+  const cluster_nodes_list_t instance_vector;
+};
+
+struct RouterAttributes {
+  std::string metadata_user_name;
+  std::string rw_classic_port;
+  std::string ro_classic_port;
+  std::string rw_x_port;
+  std::string ro_x_port;
 };
 
 /**
  * @brief Abstract class that provides interface for listener on
- *        replicaset status changes.
+ *        cluster status changes.
  *
- *        When state of replicaset is changed, notify function is called.
+ *        When state of cluster is changed, notify function is called.
  */
-class METADATA_API ReplicasetStateListenerInterface {
+class METADATA_API ClusterStateListenerInterface {
  public:
   /**
-   * @brief Callback function that is called when state of replicaset is
+   * @brief Callback function that is called when state of cluster is
    * changed.
    *
    * @param instances allowed nodes
+   * @param metadata_servers list of the Cluster metadata servers
    * @param md_servers_reachable true if metadata changed, false if metadata
    * unavailable
    * @param view_id current metadata view_id in case of ReplicaSet cluster
    */
-  virtual void notify_instances_changed(const LookupResult &instances,
-                                        const bool md_servers_reachable,
-                                        const unsigned view_id) = 0;
+  virtual void notify_instances_changed(
+      const LookupResult &instances,
+      const metadata_cache::metadata_servers_list_t &metadata_servers,
+      const bool md_servers_reachable, const uint64_t view_id) = 0;
 
-  ReplicasetStateListenerInterface() = default;
+  ClusterStateListenerInterface() = default;
   // disable copy as it isn't needed right now. Feel free to enable
   // must be explicitly defined though.
-  explicit ReplicasetStateListenerInterface(
-      const ReplicasetStateListenerInterface &) = delete;
-  ReplicasetStateListenerInterface &operator=(
-      const ReplicasetStateListenerInterface &) = delete;
-  virtual ~ReplicasetStateListenerInterface();
+  explicit ClusterStateListenerInterface(
+      const ClusterStateListenerInterface &) = delete;
+  ClusterStateListenerInterface &operator=(
+      const ClusterStateListenerInterface &) = delete;
+  virtual ~ClusterStateListenerInterface();
 };
 
 /**
@@ -247,52 +337,80 @@
 
 /**
  * @brief Abstract class that provides interface for adding and removing
- *        observers on replicaset status changes.
+ *        observers on cluster status changes.
  *
- *        When state of replicaset is changed, then
- * ReplicasetStateListenerInterface::notify_instances_changed function is called
+ * When state of cluster is changed, then
+ * ClusterStateListenerInterface::notify function is called
  * for every registered observer.
  */
-class METADATA_API ReplicasetStateNotifierInterface {
+class METADATA_API ClusterStateNotifierInterface {
  public:
   /**
    * @brief Register observer that is notified when there is a change in the
-   * replicaset nodes setup/state discovered.
+   * cluster nodes setup/state discovered.
    *
-   * @param replicaset_name name of the replicaset
-   * @param listener Observer object that is notified when replicaset nodes
+   * @param listener Observer object that is notified when cluster nodes
    * state is changed.
    *
    * @throw std::runtime_error if metadata cache not initialized
    */
-  virtual void add_state_listener(
-      const std::string &replicaset_name,
-      ReplicasetStateListenerInterface *listener) = 0;
+  virtual void add_state_listener(ClusterStateListenerInterface *listener) = 0;
 
   /**
    * @brief Unregister observer previously registered with add_state_listener()
    *
-   * @param replicaset_name name of the replicaset
    * @param listener Observer object that should be unregistered.
    *
    * @throw std::runtime_error if metadata cache not initialized
    */
   virtual void remove_state_listener(
-      const std::string &replicaset_name,
-      ReplicasetStateListenerInterface *listener) = 0;
+      ClusterStateListenerInterface *listener) = 0;
 
-  ReplicasetStateNotifierInterface() = default;
+  ClusterStateNotifierInterface() = default;
   // disable copy as it isn't needed right now. Feel free to enable
   // must be explicitly defined though.
-  explicit ReplicasetStateNotifierInterface(
-      const ReplicasetStateNotifierInterface &) = delete;
-  ReplicasetStateNotifierInterface &operator=(
-      const ReplicasetStateNotifierInterface &) = delete;
-  virtual ~ReplicasetStateNotifierInterface();
+  explicit ClusterStateNotifierInterface(
+      const ClusterStateNotifierInterface &) = delete;
+  ClusterStateNotifierInterface &operator=(
+      const ClusterStateNotifierInterface &) = delete;
+  virtual ~ClusterStateNotifierInterface();
 };
 
-class METADATA_API MetadataCacheAPIBase
-    : public ReplicasetStateNotifierInterface {
+/**
+ * @brief Metadata TTL configuration
+ */
+struct METADATA_API MetadataCacheTTLConfig {
+  // The time to live for the cached data
+  std::chrono::milliseconds ttl;
+
+  // auth_cache_ttl TTL of the rest user authentication data
+  std::chrono::milliseconds auth_cache_ttl;
+
+  // auth_cache_refresh_interval Refresh rate of the rest user authentication
+  // data
+  std::chrono::milliseconds auth_cache_refresh_interval;
+};
+
+/**
+ * @brief Metadata MySQL session configuration
+ */
+struct METADATA_API MetadataCacheMySQLSessionConfig {
+  // User credentials used for the connecting to the metadata server.
+  mysqlrouter::UserCredentials user_credentials;
+
+  // The time in seconds after which trying to connect to metadata server should
+  // time out.
+  int connect_timeout;
+
+  // The time in seconds after which read from metadata server should time out.
+  int read_timeout;
+
+  // Numbers of retries used before giving up the attempt to connect to the
+  // metadata server (not used atm).
+  int connection_attempts;
+};
+
+class METADATA_API MetadataCacheAPIBase : public ClusterStateNotifierInterface {
  public:
   /** @brief Initialize a MetadataCache object and start caching
    *
@@ -314,20 +432,18 @@
    * @param cluster_type type of the cluster the metadata cache object will
    *                     represent (GR or ReplicaSet)
    * @param router_id id of the router in the cluster metadata
-   * @param cluster_type_specific_id (id of the replication group for GR,
-   *                                 cluster_id for ReplicaSet)
+   * @param cluster_type_specific_id id of the ReplicaSet in case of the
+   * ReplicaSet, Replication Group name for GR Cluster (if bootstrapped as a
+   * single Cluster, empty otherwise)
+   * @param clusterset_id UUID of the ClusterSet the Cluster belongs to (if
+   * bootstrapped as a ClusterSet, empty otherwise)
    * @param metadata_servers The list of cluster metadata servers
-   * @param user_credentials MySQL Metadata username and password
-   * @param ttl The time to live for the cached data
-   * @param auth_cache_ttl TTL of the rest user authentication data
-   * @param auth_cache_refresh_interval Refresh rate of the rest user
-   *                                    authentication data
+   * @param ttl_config metadata TTL configuration
    * @param ssl_options SSL relatd options for connection
-   * @param cluster_name The name of the cluster to be used.
-   * @param connect_timeout The time in seconds after which trying to connect
-   *                        to metadata server should time out.
-   * @param read_timeout The time in seconds after which read from metadata
-   *                     server should time out.
+   * @param target_cluster object identifying the Cluster this operation refers
+   * to
+   * @param session_config Metadata MySQL session configuration
+   * @param router_attributes Router attributes to be registered in the metadata
    * @param thread_stack_size memory in kilobytes allocated for thread's stack
    * @param use_cluster_notifications Flag indicating if the metadata cache
    *                                  should use cluster notifications as an
@@ -340,15 +456,15 @@
   virtual void cache_init(
       const mysqlrouter::ClusterType cluster_type, const unsigned router_id,
       const std::string &cluster_type_specific_id,
-      const std::vector<mysql_harness::TCPAddress> &metadata_servers,
-      const mysqlrouter::UserCredentials &user_credentials,
-      const std::chrono::milliseconds ttl,
-      const std::chrono::milliseconds auth_cache_ttl,
-      const std::chrono::milliseconds auth_cache_refresh_interval,
+      const std::string &clusterset_id,
+      const metadata_servers_list_t &metadata_servers,
+      const MetadataCacheTTLConfig &ttl_config,
       const mysqlrouter::SSLOptions &ssl_options,
-      const std::string &cluster_name, int connect_timeout, int read_timeout,
+      const mysqlrouter::TargetCluster &target_cluster,
+      const MetadataCacheMySQLSessionConfig &session_config,
+      const RouterAttributes &router_attributes,
       size_t thread_stack_size = mysql_harness::kDefaultStackSizeInKiloBytes,
-      bool use_cluster_notifications = false, const unsigned view_id = 0) = 0;
+      bool use_cluster_notifications = false, const uint64_t view_id = 0) = 0;
 
   virtual void instance_name(const std::string &inst_name) = 0;
   virtual std::string instance_name() const = 0;
@@ -367,19 +483,17 @@
    */
   virtual void cache_stop() noexcept = 0;
 
-  /** @brief Returns list of managed server in a HA replicaset
+  /** @brief Returns list of managed server in a HA cluster
    * * Returns a list of MySQL servers managed by the topology for the given
-   * HA replicaset.
+   * HA cluster.
    *
-   * @param replicaset_name ID of the HA replicaset
    * @return List of ManagedInstance objects
    */
-  virtual LookupResult lookup_replicaset(
-      const std::string &replicaset_name) = 0;
+  virtual LookupResult get_cluster_nodes() = 0;
 
   /** @brief Update the status of the instance
    *
-   * Called when an instance from a replicaset cannot be reached for one reason
+   * Called when an instance from a cluster cannot be reached for one reason
    * or another. When an instance becomes unreachable, an emergency mode is set
    * (the rate of refresh of the metadata cache increases to once per second)
    * and lasts until disabled after a suitable change in the metadata cache is
@@ -392,64 +506,53 @@
   virtual void mark_instance_reachability(const std::string &instance_id,
                                           InstanceStatus status) = 0;
 
-  /** @brief Wait until there's a primary member in the replicaset
+  /** @brief Wait until there's a primary member in the cluster
    *
-   * To be called when the primary member of a single-primary replicaset is down
+   * To be called when the primary member of a single-primary cluster is down
    * and we want to wait until one becomes elected.
    *
-   * @param replicaset_name - the name of the replicaset
    * @param primary_server_uuid - server_uuid of the PRIMARY that shall be
    * failover from.
    * @param timeout - amount of time to wait for a failover, in seconds
    * @return true if a primary member exists
    */
-  virtual bool wait_primary_failover(const std::string &replicaset_name,
-                                     const std::string &primary_server_uuid,
+  virtual bool wait_primary_failover(const std::string &primary_server_uuid,
                                      const std::chrono::seconds &timeout) = 0;
 
   /**
    * @brief Register observer that is notified when there is a change in the
-   * replicaset nodes setup/state discovered.
+   * cluster nodes setup/state discovered.
    *
-   * @param replicaset_name name of the replicaset
-   * @param listener Observer object that is notified when replicaset nodes
+   * @param listener Observer object that is notified when cluster nodes
    * state is changed.
    */
-  void add_state_listener(const std::string &replicaset_name,
-                          ReplicasetStateListenerInterface *listener) override =
-      0;
+  void add_state_listener(ClusterStateListenerInterface *listener) override = 0;
 
   /**
    * @brief Unregister observer previously registered with add_state_listener()
    *
-   * @param replicaset_name name of the replicaset
    * @param listener Observer object that should be unregistered.
    */
-  void remove_state_listener(
-      const std::string &replicaset_name,
-      ReplicasetStateListenerInterface *listener) override = 0;
+  void remove_state_listener(ClusterStateListenerInterface *listener) override =
+      0;
 
   /**
    * @brief Register observer that is notified when the state of listening
    * socket acceptors should be updated on the next metadata refresh.
    *
-   * @param replicaset_name name of the replicaset
    * @param listener Observer object that is notified when replicaset nodes
    * state is changed.
    */
   virtual void add_acceptor_handler_listener(
-      const std::string &replicaset_name,
       AcceptorUpdateHandlerInterface *listener) = 0;
 
   /**
    * @brief Unregister observer previously registered with
    * add_acceptor_handler_listener()
    *
-   * @param replicaset_name name of the replicaset
    * @param listener Observer object that should be unregistered.
    */
   virtual void remove_acceptor_handler_listener(
-      const std::string &replicaset_name,
       AcceptorUpdateHandlerInterface *listener) = 0;
 
   /** @brief Get authentication data (password hash and privileges) for the
@@ -510,7 +613,8 @@
 
   virtual RefreshStatus get_refresh_status() = 0;
   virtual std::string cluster_type_specific_id() const = 0;
-  virtual std::string cluster_name() const = 0;
+  virtual mysqlrouter::TargetCluster target_cluster() const = 0;
+
   virtual std::chrono::milliseconds ttl() const = 0;
 };
 
@@ -518,18 +622,18 @@
  public:
   static MetadataCacheAPIBase *instance();
 
-  void cache_init(
-      const mysqlrouter::ClusterType cluster_type, const unsigned router_id,
-      const std::string &cluster_type_specific_id,
-      const std::vector<mysql_harness::TCPAddress> &metadata_servers,
-      const mysqlrouter::UserCredentials &user_credentials,
-      const std::chrono::milliseconds ttl,
-      const std::chrono::milliseconds auth_cache_ttl,
-      const std::chrono::milliseconds auth_cache_refresh_interval,
-      const mysqlrouter::SSLOptions &ssl_options,
-      const std::string &cluster_name, int connect_timeout, int read_timeout,
-      size_t thread_stack_size, bool use_cluster_notifications,
-      unsigned view_id) override;
+  void cache_init(const mysqlrouter::ClusterType cluster_type,
+                  const unsigned router_id,
+                  const std::string &cluster_type_specific_id,
+                  const std::string &clusterset_id,
+                  const metadata_servers_list_t &metadata_servers,
+                  const MetadataCacheTTLConfig &ttl_config,
+                  const mysqlrouter::SSLOptions &ssl_options,
+                  const mysqlrouter::TargetCluster &target_cluster,
+                  const MetadataCacheMySQLSessionConfig &session_config,
+                  const RouterAttributes &router_attributes,
+                  size_t thread_stack_size, bool use_cluster_notifications,
+                  const uint64_t view_id) override;
 
   mysqlrouter::ClusterType cluster_type() const override;
 
@@ -537,7 +641,7 @@
   std::string instance_name() const override;
 
   std::string cluster_type_specific_id() const override;
-  std::string cluster_name() const override;
+  mysqlrouter::TargetCluster target_cluster() const override;
   std::chrono::milliseconds ttl() const override;
 
   bool is_initialized() noexcept override { return is_initialized_; }
@@ -545,28 +649,22 @@
 
   void cache_stop() noexcept override;
 
-  LookupResult lookup_replicaset(const std::string &replicaset_name) override;
+  LookupResult get_cluster_nodes() override;
 
   void mark_instance_reachability(const std::string &instance_id,
                                   InstanceStatus status) override;
 
-  bool wait_primary_failover(const std::string &replicaset_name,
-                             const std::string &primary_server_uuid,
+  bool wait_primary_failover(const std::string &primary_server_uuid,
                              const std::chrono::seconds &timeout) override;
 
-  void add_state_listener(const std::string &replicaset_name,
-                          ReplicasetStateListenerInterface *listener) override;
+  void add_state_listener(ClusterStateListenerInterface *listener) override;
 
-  void remove_state_listener(
-      const std::string &replicaset_name,
-      ReplicasetStateListenerInterface *listener) override;
+  void remove_state_listener(ClusterStateListenerInterface *listener) override;
 
   void add_acceptor_handler_listener(
-      const std::string &replicaset_name,
       AcceptorUpdateHandlerInterface *listener) override;
 
   void remove_acceptor_handler_listener(
-      const std::string &replicaset_name,
       AcceptorUpdateHandlerInterface *listener) override;
 
   RefreshStatus get_refresh_status() override;
diff -Nru mysql-8.0-8.0.26/router/src/metadata_cache/src/cache_api.cc mysql-8.0-8.0.27/router/src/metadata_cache/src/cache_api.cc
--- mysql-8.0-8.0.26/router/src/metadata_cache/src/cache_api.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/metadata_cache/src/cache_api.cc	2021-09-28 11:46:34.000000000 +0000
@@ -61,8 +61,8 @@
 const bool kNodeTagHiddenDefault{false};
 const bool kNodeTagDisconnectWhenHiddenDefault{true};
 
-ReplicasetStateListenerInterface::~ReplicasetStateListenerInterface() = default;
-ReplicasetStateNotifierInterface::~ReplicasetStateNotifierInterface() = default;
+ClusterStateListenerInterface::~ClusterStateListenerInterface() = default;
+ClusterStateNotifierInterface::~ClusterStateNotifierInterface() = default;
 
 MetadataCacheAPIBase *MetadataCacheAPI::instance() {
   static MetadataCacheAPI instance_;
@@ -83,19 +83,14 @@
  * @param router_id id of the router in the cluster metadata
  * @param cluster_type_specific_id (id of the replication group for GR,
  * cluster_id for ReplicaSet)
+ * @param clusterset_id UUID of the ClusterSet the Cluster belongs to (if
+ * bootstrapped as a ClusterSet, empty otherwise)
  * @param metadata_servers The list of cluster metadata servers
- * @param user_credentials The user name and password used to connect to the
- * metadata servers.
- * @param ttl The ttl for the contents of the cache
- * @param auth_cache_ttl TTL of the rest user authentication data
- * @param auth_cache_refresh_interval Refresh rate of the rest user
- *                                    authentication data
+ * @param ttl_config metadata TTL configuration
  * @param ssl_options SSL related options for connections
- * @param cluster_name The name of the cluster from the metadata schema
- * @param connect_timeout The time in seconds after which trying to connect
- *                        to metadata server timeouts
- * @param read_timeout The time in seconds after which read from metadata
- *                     server should timeout.
+ * @param target_cluster object identifying the Cluster this operation refers to
+ * @param session_config Metadata MySQL session configuration
+ * @param router_attributes Router attributes to be registered in the metadata
  * @param thread_stack_size memory in kilobytes allocated for thread's stack
  * @param use_cluster_notifications Flag indicating if the metadata cache should
  *                             use cluster notifications as an additional
@@ -107,32 +102,33 @@
 void MetadataCacheAPI::cache_init(
     const mysqlrouter::ClusterType cluster_type, const unsigned router_id,
     const std::string &cluster_type_specific_id,
-    const std::vector<mysql_harness::TCPAddress> &metadata_servers,
-    const mysqlrouter::UserCredentials &user_credentials,
-    const std::chrono::milliseconds ttl,
-    const std::chrono::milliseconds auth_cache_ttl,
-    const std::chrono::milliseconds auth_cache_refresh_interval,
-    const mysqlrouter::SSLOptions &ssl_options, const std::string &cluster_name,
-    int connect_timeout, int read_timeout, size_t thread_stack_size,
-    bool use_cluster_notifications, const unsigned view_id) {
+    const std::string &clusterset_id,
+    const metadata_servers_list_t &metadata_servers,
+    const MetadataCacheTTLConfig &ttl_config,
+    const mysqlrouter::SSLOptions &ssl_options,
+    const mysqlrouter::TargetCluster &target_cluster,
+    const MetadataCacheMySQLSessionConfig &session_config,
+    const metadata_cache::RouterAttributes &router_attributes,
+    size_t thread_stack_size, bool use_cluster_notifications,
+    const uint64_t view_id) {
   std::lock_guard<std::mutex> lock(g_metadata_cache_m);
 
-  if (cluster_type == mysqlrouter::ClusterType::RS_V2) {
-    g_metadata_cache.reset(new ARMetadataCache(
-        router_id, cluster_type_specific_id, metadata_servers,
-        get_instance(cluster_type, user_credentials.username,
-                     user_credentials.password, connect_timeout, read_timeout,
-                     1, ssl_options, use_cluster_notifications, view_id),
-        ttl, auth_cache_ttl, auth_cache_refresh_interval, ssl_options,
-        cluster_name, thread_stack_size));
-  } else {
-    g_metadata_cache.reset(new GRMetadataCache(
-        router_id, cluster_type_specific_id, metadata_servers,
-        get_instance(cluster_type, user_credentials.username,
-                     user_credentials.password, connect_timeout, read_timeout,
-                     1, ssl_options, use_cluster_notifications, view_id),
-        ttl, auth_cache_ttl, auth_cache_refresh_interval, ssl_options,
-        cluster_name, thread_stack_size, use_cluster_notifications));
+  switch (cluster_type) {
+    case mysqlrouter::ClusterType::RS_V2:
+      g_metadata_cache.reset(new ARMetadataCache(
+          router_id, cluster_type_specific_id, metadata_servers,
+          get_instance(cluster_type, session_config, ssl_options,
+                       use_cluster_notifications, view_id),
+          ttl_config, ssl_options, target_cluster, router_attributes,
+          thread_stack_size));
+      break;
+    default:
+      g_metadata_cache.reset(new GRMetadataCache(
+          router_id, cluster_type_specific_id, clusterset_id, metadata_servers,
+          get_instance(cluster_type, session_config, ssl_options,
+                       use_cluster_notifications, view_id),
+          ttl_config, ssl_options, target_cluster, router_attributes,
+          thread_stack_size, use_cluster_notifications));
   }
 
   is_initialized_ = true;
@@ -152,8 +148,8 @@
   return g_metadata_cache->cluster_type_specific_id();
 }
 
-std::string MetadataCacheAPI::cluster_name() const {
-  return g_metadata_cache->cluster_name();
+mysqlrouter::TargetCluster MetadataCacheAPI::target_cluster() const {
+  return g_metadata_cache->target_cluster();
 }
 
 std::chrono::milliseconds MetadataCacheAPI::ttl() const {
@@ -184,22 +180,19 @@
 }
 
 /**
- * Lookup the servers that belong to the given replicaset.
+ * Lookup the servers that belong to the cluster.
  *
- * @param replicaset_name The name of the replicaset whose servers need
- *                      to be looked up.
  *
  * @return An object that encapsulates a list of managed MySQL servers.
  *
  */
-LookupResult MetadataCacheAPI::lookup_replicaset(
-    const std::string &replicaset_name) {
+LookupResult MetadataCacheAPI::get_cluster_nodes() {
   // We only want to keep the lock when checking if the metadata cache global is
   // initialized. The object itself protects its shared state in its
   // replicaset_lookup.
   { LOCK_METADATA_AND_CHECK_INITIALIZED(); }
 
-  return LookupResult(g_metadata_cache->replicaset_lookup(replicaset_name));
+  return LookupResult(g_metadata_cache->get_cluster_nodes());
 }
 
 void MetadataCacheAPI::mark_instance_reachability(
@@ -210,51 +203,47 @@
 }
 
 bool MetadataCacheAPI::wait_primary_failover(
-    const std::string &replicaset_name, const std::string &primary_server_uuid,
+    const std::string &primary_server_uuid,
     const std::chrono::seconds &timeout) {
   { LOCK_METADATA_AND_CHECK_INITIALIZED(); }
 
-  return g_metadata_cache->wait_primary_failover(replicaset_name,
-                                                 primary_server_uuid, timeout);
+  return g_metadata_cache->wait_primary_failover(primary_server_uuid, timeout);
 }
 
 void MetadataCacheAPI::add_state_listener(
-    const std::string &replicaset_name,
-    ReplicasetStateListenerInterface *listener) {
+    ClusterStateListenerInterface *listener) {
   // We only want to keep the lock when checking if the metadata cache global is
   // initialized. The object itself protects its shared state in its
   // add_state_listener.
   { LOCK_METADATA_AND_CHECK_INITIALIZED(); }
-  g_metadata_cache->add_state_listener(replicaset_name, listener);
+  g_metadata_cache->add_state_listener(listener);
 }
+
 void MetadataCacheAPI::remove_state_listener(
-    const std::string &replicaset_name,
-    ReplicasetStateListenerInterface *listener) {
+    ClusterStateListenerInterface *listener) {
   // We only want to keep the lock when checking if the metadata cache global is
   // initialized. The object itself protects its shared state in its
   // remove_state_listener.
   { LOCK_METADATA_AND_CHECK_INITIALIZED(); }
-  g_metadata_cache->remove_state_listener(replicaset_name, listener);
+  g_metadata_cache->remove_state_listener(listener);
 }
 
 void MetadataCacheAPI::add_acceptor_handler_listener(
-    const std::string &replicaset_name,
     AcceptorUpdateHandlerInterface *listener) {
   // We only want to keep the lock when checking if the metadata cache global is
   // initialized. The object itself protects its shared state in its
   // add_acceptor_handler_listener.
   { LOCK_METADATA_AND_CHECK_INITIALIZED(); }
-  g_metadata_cache->add_acceptor_handler_listener(replicaset_name, listener);
+  g_metadata_cache->add_acceptor_handler_listener(listener);
 }
 
 void MetadataCacheAPI::remove_acceptor_handler_listener(
-    const std::string &replicaset_name,
     AcceptorUpdateHandlerInterface *listener) {
   // We only want to keep the lock when checking if the metadata cache global is
   // initialized. The object itself protects its shared state in its
   // remove_acceptor_handler_listener.
   { LOCK_METADATA_AND_CHECK_INITIALIZED(); }
-  g_metadata_cache->remove_acceptor_handler_listener(replicaset_name, listener);
+  g_metadata_cache->remove_acceptor_handler_listener(listener);
 }
 
 MetadataCacheAPI::RefreshStatus MetadataCacheAPI::get_refresh_status() {
diff -Nru mysql-8.0-8.0.26/router/src/metadata_cache/src/cluster_metadata_ar.cc mysql-8.0-8.0.27/router/src/metadata_cache/src/cluster_metadata_ar.cc
--- mysql-8.0-8.0.26/router/src/metadata_cache/src/cluster_metadata_ar.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/metadata_cache/src/cluster_metadata_ar.cc	2021-09-28 11:46:34.000000000 +0000
@@ -31,26 +31,31 @@
 
 using mysqlrouter::MySQLSession;
 using mysqlrouter::sqlstring;
-using mysqlrouter::strtoi_checked;
-using mysqlrouter::strtoui_checked;
+using mysqlrouter::strtoull_checked;
 IMPORT_LOG_FUNCTIONS()
 
 ARClusterMetadata::~ARClusterMetadata() = default;
 
-ClusterMetadata::ReplicaSetsByName ARClusterMetadata::fetch_instances(
-    const std::vector<metadata_cache::ManagedInstance> &instances,
-    const std::string &cluster_type_specific_id, std::size_t &instance_id) {
+stdx::expected<metadata_cache::ClusterTopology, std::error_code>
+ARClusterMetadata::fetch_cluster_topology(
+    const std::atomic<bool> &terminated,
+    mysqlrouter::TargetCluster & /*target_cluster*/,
+    const unsigned /*router_id*/,
+    const metadata_cache::metadata_servers_list_t &metadata_servers,
+    bool /* needs_writable_node */, const std::string &cluster_type_specific_id,
+    const std::string & /*clusterset_id*/, std::size_t &instance_id) {
   std::vector<metadata_cache::ManagedInstance> new_instances;
 
   bool metadata_read = false;
 
-  for (size_t i = 0; i < instances.size(); ++i) {
-    const auto &instance = instances[i];
+  for (size_t i = 0; i < metadata_servers.size(); ++i) {
+    if (terminated) {
+      return stdx::make_unexpected(make_error_code(
+          metadata_cache::metadata_errc::metadata_refresh_terminated));
+    }
+    const auto &metadata_server = metadata_servers[i];
     try {
-      if (!connect_and_setup_session(instance)) {
-        log_warning("Could not connect to the instance: %s on %s:%d",
-                    instance.mysql_server_uuid.c_str(), instance.host.c_str(),
-                    instance.port);
+      if (!connect_and_setup_session(metadata_server)) {
         continue;
       }
 
@@ -72,11 +77,11 @@
         continue;
       }
 
-      unsigned view_id{0};
+      uint64_t view_id{0};
       if (!get_member_view_id(*metadata_connection_, cluster_type_specific_id,
                               view_id)) {
-        log_warning("Failed fetching view_id from the instance: %s",
-                    instance.mysql_server_uuid.c_str());
+        log_warning("Failed fetching view_id from the metadata server on %s:%d",
+                    metadata_server.address().c_str(), metadata_server.port());
         continue;
       }
 
@@ -97,33 +102,35 @@
     } catch (const mysqlrouter::MetadataUpgradeInProgressException &) {
       throw;
     } catch (const std::exception &e) {
-      log_warning("Failed fetching metadata from instance: %s on %s:%d - %s",
-                  instance.mysql_server_uuid.c_str(), instance.host.c_str(),
-                  instance.port, e.what());
+      log_warning("Failed fetching metadata from metadata server on %s:%d - %s",
+                  metadata_server.address().c_str(), metadata_server.port(),
+                  e.what());
     }
   }
 
   if (new_instances.empty()) {
-    return {};
+    return stdx::make_unexpected(make_error_code(
+        metadata_cache::metadata_errc::no_metadata_read_successful));
   }
 
-  // pack the result into ManagedReplicaSet to satisfy the API
-  metadata_cache::ManagedReplicaSet replicaset;
-  ClusterMetadata::ReplicaSetsByName result;
-
-  replicaset.name = "default";
-  replicaset.single_primary_mode = true;
-  replicaset.members = std::move(new_instances);
-  replicaset.view_id = this->view_id_;
-
-  result["default"] = replicaset;
+  metadata_cache::ClusterTopology result;
+  result.cluster_data.single_primary_mode = true;
+  result.cluster_data.members = std::move(new_instances);
+  result.cluster_data.writable_server =
+      find_rw_server(result.cluster_data.members);
+  result.cluster_data.view_id = this->view_id_;
+
+  // for ReplicaSet Cluster we assume metadata servers are just Cluster nodes
+  for (const auto &cluster_node : result.cluster_data.members) {
+    result.metadata_servers.push_back({cluster_node.host, cluster_node.port});
+  }
 
   return result;
 }
 
 bool ARClusterMetadata::get_member_view_id(mysqlrouter::MySQLSession &session,
                                            const std::string &cluster_id,
-                                           unsigned &result) {
+                                           uint64_t &result) {
   std::string query =
       "select view_id from mysql_innodb_cluster_metadata.v2_ar_members where "
       "CAST(member_id AS char ascii) = CAST(@@server_uuid AS char ascii)";
@@ -136,7 +143,7 @@
     return false;
   }
 
-  result = strtoui_checked((*row)[0]);
+  result = strtoull_checked((*row)[0]);
 
   return true;
 }
@@ -194,10 +201,6 @@
 
     set_instance_attributes(instance, get_string(row[4]));
 
-    // remainig fields are for compatibility with existing interface so we go
-    // with defaults
-    instance.replicaset_name = "default";
-
     result.push_back(instance);
     return true;  // get next row if available
   };
diff -Nru mysql-8.0-8.0.26/router/src/metadata_cache/src/cluster_metadata_ar.h mysql-8.0-8.0.27/router/src/metadata_cache/src/cluster_metadata_ar.h
--- mysql-8.0-8.0.26/router/src/metadata_cache/src/cluster_metadata_ar.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/metadata_cache/src/cluster_metadata_ar.h	2021-09-28 11:46:34.000000000 +0000
@@ -38,26 +38,14 @@
  public:
   /** @brief Constructor
    *
-   * @param user The user name used to authenticate to the metadata server.
-   * @param password The password used to authenticate to the metadata server.
-   * @param connect_timeout The time after which trying to connect to the
-   *                        metadata server should timeout (in seconds).
-   * @param read_timeout The time after which read from metadata server should
-   *                     timeout (in seconds).
-   * @param connection_attempts The number of times a connection to metadata
-   *                            must be attempted, when a connection attempt
-   *                            fails.  NOTE: not used so far
+   * @param session_config Metadata MySQL session configuration
    * @param ssl_options SSL related options to use for MySQL connections
    * @param view_id last known view_id of the cluster metadata
    */
-  ARClusterMetadata(const std::string &user, const std::string &password,
-                    int connect_timeout, int read_timeout,
-                    int connection_attempts,
-                    const mysqlrouter::SSLOptions &ssl_options,
-                    unsigned view_id)
-      : ClusterMetadata(user, password, connect_timeout, read_timeout,
-                        connection_attempts, ssl_options),
-        view_id_(view_id) {}
+  ARClusterMetadata(
+      const metadata_cache::MetadataCacheMySQLSessionConfig &session_config,
+      const mysqlrouter::SSLOptions &ssl_options, uint64_t view_id)
+      : ClusterMetadata(session_config, ssl_options), view_id_(view_id) {}
 
   explicit ARClusterMetadata(const ARClusterMetadata &) = delete;
   ARClusterMetadata &operator=(const ARClusterMetadata &) = delete;
@@ -68,32 +56,32 @@
    */
   ~ARClusterMetadata() override;
 
-  /** @brief Returns replicasets defined in the metadata server
-   *
-   * Only to satisfy the API, not used for the ReplicaSet cluster
-   *
-   * @throws logic_error
-   */
-  ReplicaSetsByName fetch_instances(
-      const std::string & /*cluster_name*/,
-      const std::string & /*cluster_type_specific_id*/) override {
-    throw std::logic_error("Call to unexpected fetch_instances overload");
-  }
-
-  /** @brief Returns replicasets defined in the metadata given set of the
+  /** @brief Returns cluster defined in the metadata given set of the
    *         metadata servers (cluster members)
    *
-   * @param instances  set of the metadata servers to use to fetch the metadata
+   * @param terminated flag indicating that the process is cterminating,
+   * allowing the function to leave earlier if possible
+   * @param [in,out] target_cluster object identifying the Cluster this
+   * operation refers to
+   * @param router_id id of the router in the cluster metadata
+   * @param metadata_servers  set of the metadata servers to use to fetch the
+   * metadata
+   * @param needs_writable_node flag indicating if the caller needs us to query
+   * for writable node
    * @param cluster_type_specific_id  (GR ID for GR cluster, cluster_id for AR
    * cluster)
    * @param [out] instance_id of the server the metadata was fetched from
-   * @return Map of replicaset ID, server list pairs.
+   * @return object containing cluster topology information in case of success,
+   * or error code in case of failure
    * @throws metadata_cache::metadata_error
    */
-  ReplicaSetsByName fetch_instances(
-      const std::vector<metadata_cache::ManagedInstance> &instances,
-      const std::string &cluster_type_specific_id,
-      std::size_t &instance_id) override;
+  stdx::expected<metadata_cache::ClusterTopology, std::error_code>
+  fetch_cluster_topology(
+      const std::atomic<bool> &terminated,
+      mysqlrouter::TargetCluster &target_cluster, const unsigned router_id,
+      const metadata_cache::metadata_servers_list_t &metadata_servers,
+      bool needs_writable_node, const std::string &cluster_type_specific_id,
+      const std::string & /*clusterset_id*/, std::size_t &instance_id) override;
 
   /** @brief Returns cluster type this object is suppsed to handle
    */
@@ -103,6 +91,7 @@
 
   void setup_notifications_listener(
       const std::vector<metadata_cache::ManagedInstance> & /*instances*/,
+      const mysqlrouter::TargetCluster & /*target_cluster*/,
       const GRNotificationListener::NotificationClb & /*callback*/) override {}
 
   /** @brief Deinitializes the notifications listener thread
@@ -130,9 +119,9 @@
    * @return True on success, false otherwise.
    */
   bool get_member_view_id(mysqlrouter::MySQLSession &session,
-                          const std::string &cluster_id, unsigned &result);
+                          const std::string &cluster_id, uint64_t &result);
 
-  unsigned view_id_;
+  uint64_t view_id_;
 };
 
 #endif  // METADATA_CACHE_CLUSTER_METADATA_AR_INCLUDED
diff -Nru mysql-8.0-8.0.26/router/src/metadata_cache/src/cluster_metadata.cc mysql-8.0-8.0.27/router/src/metadata_cache/src/cluster_metadata.cc
--- mysql-8.0-8.0.26/router/src/metadata_cache/src/cluster_metadata.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/metadata_cache/src/cluster_metadata.cc	2021-09-28 11:46:34.000000000 +0000
@@ -38,6 +38,7 @@
 
 #include "dim.h"
 #include "group_replication_metadata.h"
+#include "mysql/harness/event_state_tracker.h"
 #include "mysql/harness/logging/logging.h"
 #include "mysqld_error.h"
 #include "mysqlrouter/mysql_session.h"
@@ -45,11 +46,14 @@
 #include "mysqlrouter/utils_sqlstring.h"
 #include "tcp_address.h"
 
+using mysql_harness::EventStateTracker;
+using mysql_harness::logging::LogLevel;
 using mysqlrouter::ClusterType;
 using mysqlrouter::MySQLSession;
 using mysqlrouter::sqlstring;
 using mysqlrouter::strtoi_checked;
 using mysqlrouter::strtoui_checked;
+using namespace std::string_literals;
 IMPORT_LOG_FUNCTIONS()
 
 /**
@@ -67,15 +71,10 @@
   return std::string(input_str);
 }
 
-ClusterMetadata::ClusterMetadata(const std::string &user,
-                                 const std::string &password,
-                                 int connect_timeout, int read_timeout,
-                                 int /*connection_attempts*/,
-                                 const mysqlrouter::SSLOptions &ssl_options)
-    : user_(user),
-      password_(password),
-      connect_timeout_(connect_timeout),
-      read_timeout_(read_timeout) {
+ClusterMetadata::ClusterMetadata(
+    const metadata_cache::MetadataCacheMySQLSessionConfig &session_config,
+    const mysqlrouter::SSLOptions &ssl_options)
+    : session_config_(session_config) {
   if (ssl_options.mode.empty()) {
     ssl_mode_ = SSL_MODE_PREFERRED;  // default mode
   } else {
@@ -100,16 +99,18 @@
 ClusterMetadata::~ClusterMetadata() = default;
 
 bool ClusterMetadata::do_connect(MySQLSession &connection,
-                                 const metadata_cache::ManagedInstance &mi) {
-  std::string host = (mi.host == "localhost" ? "127.0.0.1" : mi.host);
+                                 const metadata_cache::metadata_server_t &mi) {
   try {
     connection.set_ssl_options(ssl_mode_, ssl_options_.tls_version,
                                ssl_options_.cipher, ssl_options_.ca,
                                ssl_options_.capath, ssl_options_.crl,
                                ssl_options_.crlpath);
-    connection.connect(host, static_cast<unsigned int>(mi.port), user_,
-                       password_, "" /* unix-socket */, "" /* default-schema */,
-                       connect_timeout_, read_timeout_);
+    connection.connect(mi.address(), static_cast<unsigned int>(mi.port()),
+                       session_config_.user_credentials.username,
+                       session_config_.user_credentials.password,
+                       "" /* unix-socket */, "" /* default-schema */,
+                       session_config_.connect_timeout,
+                       session_config_.read_timeout);
     return true;
   } catch (const MySQLSession::Error & /*e*/) {
     return false;  // error is logged in calling function
@@ -117,7 +118,7 @@
 }
 
 bool ClusterMetadata::connect_and_setup_session(
-    const metadata_cache::ManagedInstance &metadata_server) noexcept {
+    const metadata_cache::metadata_server_t &metadata_server) noexcept {
   // Get a clean metadata server connection object
   // (RAII will close the old one if needed).
   try {
@@ -128,24 +129,37 @@
     return false;
   }
 
-  if (do_connect(*metadata_connection_, metadata_server)) {
+  const bool connect_res = do_connect(*metadata_connection_, metadata_server);
+  const auto connect_state =
+      connect_res ? 0 : metadata_connection_->last_errno();
+  const bool connect_res_changed = EventStateTracker::instance().state_changed(
+      connect_state, EventStateTracker::EventId::MetadataServerConnectedOk,
+      metadata_server.str());
+  if (connect_res) {
     const auto result =
         mysqlrouter::setup_metadata_session(*metadata_connection_);
     if (result) {
-      log_debug("Connected with metadata server running on %s:%i",
-                metadata_server.host.c_str(), metadata_server.port);
+      const auto log_level =
+          connect_res_changed ? LogLevel::kInfo : LogLevel::kDebug;
+
+      log_custom(log_level, "Connected with metadata server running on %s:%i",
+                 metadata_server.address().c_str(), metadata_server.port());
       return true;
     } else {
       log_warning("Failed setting up the session on Metadata Server %s:%d: %s",
-                  metadata_server.host.c_str(), metadata_server.port,
+                  metadata_server.address().c_str(), metadata_server.port(),
                   result.error().c_str());
     }
+
   } else {
     // connection attempt failed
-    log_warning("Failed connecting with Metadata Server %s:%d: %s (%i)",
-                metadata_server.host.c_str(), metadata_server.port,
-                metadata_connection_->last_error(),
-                metadata_connection_->last_errno());
+    const auto log_level =
+        connect_res_changed ? LogLevel::kWarning : LogLevel::kDebug;
+
+    log_custom(
+        log_level, "Failed connecting with Metadata Server %s:%d: %s (%i)",
+        metadata_server.address().c_str(), metadata_server.port(),
+        metadata_connection_->last_error(), metadata_connection_->last_errno());
   }
 
   metadata_connection_.reset();
@@ -220,14 +234,15 @@
   return true;
 }
 
-bool ClusterMetadata::update_router_version(
-    const metadata_cache::ManagedInstance &rw_instance,
-    const unsigned router_id) {
+bool ClusterMetadata::update_router_attributes(
+    const metadata_cache::metadata_server_t &rw_server,
+    const unsigned router_id,
+    const metadata_cache::RouterAttributes &router_attributes) {
   auto connection = mysql_harness::DIM::instance().new_MySQLSession();
-  if (!do_connect(*connection, rw_instance)) {
+  if (!do_connect(*connection, rw_server)) {
     log_warning(
-        "Updating the router version in metadata failed: Could not connect to "
-        "the writable cluster member");
+        "Updating the router attributes in metadata failed: Could not connect "
+        "to the writable cluster member");
 
     return false;
   }
@@ -235,8 +250,8 @@
   const auto result = mysqlrouter::setup_metadata_session(*connection);
   if (!result) {
     log_warning(
-        "Updating the router version in metadata failed: could not set up the "
-        "metadata session (%s)",
+        "Updating the router attributes in metadata failed: could not set up "
+        "the metadata session (%s)",
         result.error().c_str());
 
     return false;
@@ -250,29 +265,50 @@
   sqlstring query;
   if (get_cluster_type() == ClusterType::GR_V1) {
     query =
-        "UPDATE mysql_innodb_cluster_metadata.routers"
-        " SET attributes = JSON_SET(IF(attributes IS NULL, '{}', attributes), "
-        "'$.version', ?) WHERE router_id = ?";
+        "UPDATE mysql_innodb_cluster_metadata.routers "
+        "SET attributes = "
+        "JSON_SET(JSON_SET(JSON_SET(JSON_SET(JSON_SET(JSON_SET( "
+        "IF(attributes IS NULL, '{}', attributes), "
+        "'$.version', ?), "
+        "'$.RWEndpoint', ?), "
+        "'$.ROEndpoint', ?), "
+        "'$.RWXEndpoint', ?), "
+        "'$.ROXEndpoint', ?), "
+        "'$.MetadataUser', ?) "
+        "WHERE router_id = ?";
   } else {
     query =
-        "UPDATE mysql_innodb_cluster_metadata.v2_routers set version = ? "
-        "where router_id = ?";
-  }
+        "UPDATE mysql_innodb_cluster_metadata.v2_routers "
+        "SET version = ?, attributes = "
+        "JSON_SET(JSON_SET(JSON_SET(JSON_SET(JSON_SET( "
+        "IF(attributes IS NULL, '{}', attributes), "
+        "'$.RWEndpoint', ?), "
+        "'$.ROEndpoint', ?), "
+        "'$.RWXEndpoint', ?), "
+        "'$.ROXEndpoint', ?), "
+        "'$.MetadataUser', ?) "
+        "WHERE router_id = ?";
+  }
+
+  const auto &ra{router_attributes};
+  query << MYSQL_ROUTER_VERSION << ra.rw_classic_port << ra.ro_classic_port
+        << ra.rw_x_port << ra.ro_x_port << ra.metadata_user_name << router_id
+        << sqlstring::end;
 
-  query << MYSQL_ROUTER_VERSION << router_id << sqlstring::end;
   try {
     connection->execute(query);
   } catch (const MySQLSession::Error &e) {
     if (e.code() == ER_TABLEACCESS_DENIED_ERROR) {
       log_warning(
-          "Updating the router version in metadata failed: %s (%u)\n"
+          "Updating the router attributes in metadata failed: %s (%u)\n"
           "Make sure to follow the correct steps to upgrade your metadata.\n"
           "Run the dba.upgradeMetadata() then launch the new Router version "
           "when prompted",
           e.message().c_str(), e.code());
     }
   } catch (const std::exception &e) {
-    log_warning("Updating the router version in metadata failed: %s", e.what());
+    log_warning("Updating the router attributes in metadata failed: %s",
+                e.what());
   }
 
   transaction.commit();
@@ -281,13 +317,13 @@
 }
 
 bool ClusterMetadata::update_router_last_check_in(
-    const metadata_cache::ManagedInstance &rw_instance,
+    const metadata_cache::metadata_server_t &rw_server,
     const unsigned router_id) {
   // only relevant to for metadata V2
   if (get_cluster_type() == ClusterType::GR_V1) return true;
 
   auto connection = mysql_harness::DIM::instance().new_MySQLSession();
-  if (!do_connect(*connection, rw_instance)) {
+  if (!do_connect(*connection, rw_server)) {
     log_warning(
         "Updating the router last_check_in in metadata failed: Could not "
         "connect to the writable cluster member");
@@ -326,15 +362,46 @@
   return true;
 }
 
+static std::string get_limit_target_cluster_clause(
+    const mysqlrouter::TargetCluster &target_cluster,
+    const std::string &cluster_type_specific_id,
+    mysqlrouter::MySQLSession &session) {
+  switch (target_cluster.target_type()) {
+    case mysqlrouter::TargetCluster::TargetType::ByUUID:
+      return "(SELECT cluster_id FROM "
+             "mysql_innodb_cluster_metadata.v2_gr_clusters C WHERE "
+             "C.attributes->>'$.group_replication_group_name' = " +
+             session.quote(target_cluster.to_string()) + ")";
+    case mysqlrouter::TargetCluster::TargetType::ByName:
+      return "(SELECT cluster_id FROM "
+             "mysql_innodb_cluster_metadata.v2_clusters WHERE cluster_name=" +
+             session.quote(target_cluster.to_string()) + ")";
+    default:
+      assert(mysqlrouter::TargetCluster::TargetType::ByPrimaryRole ==
+             target_cluster.target_type());
+      return "(SELECT C.cluster_id FROM "
+             "mysql_innodb_cluster_metadata.v2_gr_clusters C left join "
+             "mysql_innodb_cluster_metadata.v2_cs_members CSM on "
+             "CSM.cluster_id = "
+             "C.cluster_id WHERE CSM.member_role = 'PRIMARY' and "
+             "CSM.clusterset_id = " +
+             session.quote(cluster_type_specific_id) + ")";
+  }
+}
+
 ClusterMetadata::auth_credentials_t ClusterMetadata::fetch_auth_credentials(
-    const std::string &cluster_name) {
+    const mysqlrouter::TargetCluster &target_cluster,
+    const std::string &cluster_type_specific_id) {
   ClusterMetadata::auth_credentials_t auth_credentials;
-  sqlstring query =
+  if (!metadata_connection_) {
+    return auth_credentials;
+  }
+  const std::string query =
       "SELECT user, authentication_string, privileges, authentication_method "
       "FROM mysql_innodb_cluster_metadata.v2_router_rest_accounts WHERE "
-      "cluster_id=(SELECT cluster_id FROM "
-      "mysql_innodb_cluster_metadata.v2_clusters WHERE cluster_name=?)";
-  query << cluster_name << sqlstring::end;
+      "cluster_id="s +
+      get_limit_target_cluster_clause(target_cluster, cluster_type_specific_id,
+                                      *metadata_connection_);
 
   auto result_processor =
       [&auth_credentials](const MySQLSession::Row &row) -> bool {
@@ -359,11 +426,23 @@
     return true;
   };
 
-  if (metadata_connection_)
-    metadata_connection_->query(query, result_processor);
+  metadata_connection_->query(query, result_processor);
   return auth_credentials;
 }
 
+stdx::expected<metadata_cache::metadata_server_t, std::error_code>
+ClusterMetadata::find_rw_server(
+    const std::vector<metadata_cache::ManagedInstance> &instances) {
+  for (auto &instance : instances) {
+    if (instance.mode == metadata_cache::ServerMode::ReadWrite) {
+      return metadata_cache::metadata_server_t{instance};
+    }
+  }
+
+  return stdx::make_unexpected(
+      make_error_code(metadata_cache::metadata_errc::no_rw_node_found));
+}
+
 /**
  * @brief Returns value fo the bool tag set in the attributes
  *
diff -Nru mysql-8.0-8.0.26/router/src/metadata_cache/src/cluster_metadata_gr.cc mysql-8.0-8.0.27/router/src/metadata_cache/src/cluster_metadata_gr.cc
--- mysql-8.0-8.0.26/router/src/metadata_cache/src/cluster_metadata_gr.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/metadata_cache/src/cluster_metadata_gr.cc	2021-09-28 11:46:34.000000000 +0000
@@ -28,39 +28,72 @@
 
 #include "dim.h"
 #include "group_replication_metadata.h"
+#include "mysql/harness/event_state_tracker.h"
 #include "mysql/harness/logging/logging.h"
 #include "mysqlrouter/mysql_session.h"
+#include "mysqlrouter/uri.h"
 
+using mysql_harness::EventStateTracker;
+using mysql_harness::logging::LogLevel;
 using mysqlrouter::ClusterType;
 using mysqlrouter::MySQLSession;
 using mysqlrouter::strtoi_checked;
 using mysqlrouter::strtoui_checked;
+using mysqlrouter::strtoull_checked;
 IMPORT_LOG_FUNCTIONS()
 
 using ConnectCallback =
     std::function<bool(mysqlrouter::MySQLSession &connection,
                        const metadata_cache::ManagedInstance &mi)>;
 
+std::vector<metadata_cache::metadata_servers_list_t> get_all_metadata_servers(
+    const metadata_cache::metadata_servers_list_t &metadata_servers) {
+  // by default use them all, that's what works for non-clusterset backends
+  std::vector<metadata_cache::metadata_servers_list_t> result;
+  for (const auto &server : metadata_servers) {
+    result.push_back({server});
+  }
+
+  return result;
+}
+
 /* Abstract class for the GR metadata connection to hide the diffences between
  * the metadata versions. */
 class GRMetadataBackend {
  public:
-  GRMetadataBackend(MetaData *metadata, ConnectCallback &connect_clb)
+  GRMetadataBackend(GRClusterMetadata *metadata, ConnectCallback &connect_clb)
       : metadata_(metadata), connect_clb_(connect_clb) {}
 
   virtual ~GRMetadataBackend();
 
-  /** @brief Queries the metadata server for the list of instances and
-   * replicasets that belong to the desired cluster.
+  /** @brief Queries the metadata server for the list of instances that belong
+   * to the desired cluster.
    */
-  virtual MetaData::ReplicaSetsByName fetch_instances_from_metadata_server(
-      const std::string &cluster_name,
-      const std::string &cluster_type_specific_id) = 0;
+  virtual metadata_cache::ManagedCluster fetch_instances_from_metadata_server(
+      const mysqlrouter::TargetCluster &target_cluster,
+      const std::string &group_name, const std::string &clusterset_id = "") = 0;
 
   virtual mysqlrouter::ClusterType get_cluster_type() = 0;
 
+  virtual stdx::expected<metadata_cache::ClusterTopology, std::error_code>
+  fetch_cluster_topology(
+      MySQLSession::Transaction &transaction,
+      mysqlrouter::TargetCluster &target_cluster, const unsigned router_id,
+      const metadata_cache::metadata_server_t &metadata_server,
+      bool needs_writable_node, const std::string &group_name,
+      const std::string &clusterset_id);
+
+  virtual std::vector<metadata_cache::metadata_servers_list_t>
+  get_metadata_servers(
+      const metadata_cache::metadata_servers_list_t &metadata_servers) {
+    // by default use them all, that's what works for non-clusterset backends
+    return get_all_metadata_servers(metadata_servers);
+  }
+
+  virtual void reset() {}
+
  protected:
-  MetaData *metadata_;
+  GRClusterMetadata *metadata_;
   ConnectCallback connect_clb_;
 };
 
@@ -69,15 +102,16 @@
 /* Connection to the GR metadata version 1.x */
 class GRMetadataBackendV1 : public GRMetadataBackend {
  public:
-  GRMetadataBackendV1(MetaData *metadata, ConnectCallback &connect_clb)
+  GRMetadataBackendV1(GRClusterMetadata *metadata, ConnectCallback &connect_clb)
       : GRMetadataBackend(metadata, connect_clb) {}
 
-  /** @brief Queries the metadata server for the list of instances and
-   * replicasets that belong to the desired cluster.
+  /** @brief Queries the metadata server for the list of instances that belong
+   * to the desired cluster.
    */
-  MetaData::ReplicaSetsByName fetch_instances_from_metadata_server(
-      const std::string &cluster_name,
-      const std::string &cluster_type_specific_id) override;
+  metadata_cache::ManagedCluster fetch_instances_from_metadata_server(
+      const mysqlrouter::TargetCluster &target_cluster,
+      const std::string &group_name,
+      const std::string &clusterset_id = "") override;
 
   mysqlrouter::ClusterType get_cluster_type() override {
     return mysqlrouter::ClusterType::GR_V1;
@@ -87,49 +121,190 @@
 /* Connection to the GR metadata version 2.x */
 class GRMetadataBackendV2 : public GRMetadataBackend {
  public:
-  GRMetadataBackendV2(MetaData *metadata, ConnectCallback &connect_clb)
+  GRMetadataBackendV2(GRClusterMetadata *metadata, ConnectCallback &connect_clb)
       : GRMetadataBackend(metadata, connect_clb) {}
 
-  /** @brief Queries the metadata server for the list of instances and
-   * replicasets that belong to the desired cluster.
+  /** @brief Queries the metadata server for the list of instances that belong
+   * to the desired cluster.
    */
-  MetaData::ReplicaSetsByName fetch_instances_from_metadata_server(
-      const std::string &cluster_name,
-      const std::string &cluster_type_specific_id) override;
+  metadata_cache::ManagedCluster fetch_instances_from_metadata_server(
+      const mysqlrouter::TargetCluster &target_cluster,
+      const std::string &group_name,
+      const std::string &clusterset_id = "") override;
 
   mysqlrouter::ClusterType get_cluster_type() override {
     return mysqlrouter::ClusterType::GR_V2;
   }
+
+ protected:
+  virtual std::string get_cluster_type_specific_id_limit_sql(
+      const std::string &group_name,
+      const std::string & /*clusterset_id*/ = "");
 };
 
-GRClusterMetadata::GRClusterMetadata(const std::string &user,
-                                     const std::string &password,
-                                     int connect_timeout, int read_timeout,
-                                     int connection_attempts,
-                                     const mysqlrouter::SSLOptions &ssl_options,
-                                     const bool use_cluster_notifications)
-    : ClusterMetadata(user, password, connect_timeout, read_timeout,
-                      connection_attempts, ssl_options) {
+/* Connection to the GR metadata clusterset */
+class GRClusterSetMetadataBackend : public GRMetadataBackendV2 {
+ public:
+  GRClusterSetMetadataBackend(GRClusterMetadata *metadata,
+                              ConnectCallback &connect_clb)
+      : GRMetadataBackendV2(metadata, connect_clb) {}
+
+  mysqlrouter::ClusterType get_cluster_type() override {
+    return mysqlrouter::ClusterType::GR_CS;
+  }
+
+  /** @brief Returns cluster defined in the metadata given set of the
+   *         metadata servers (cluster members)
+   *
+   * @param transaction transaction to be used for SQL queries required by this
+   * function
+   * @param [in,out] target_cluster object identifying the Cluster this
+   * operation refers to
+   * @param router_id id of the router in the cluster metadata
+   * @param metadata_server info about the metadata server we are querying
+   * @param needs_writable_node flag indicating if the caller needs us to query
+   * for writable node
+   * @param group_name Cluster Replication Group name (if bootstrapped as a
+   * single Cluster)
+   * @param clusterset_id UUID of the ClusterSet the Cluster belongs to (if
+   * bootstrapped as a ClusterSet)
+   * @return object containing cluster topology information in case of success,
+   * or error code in case of failure
+   * @throws metadata_cache::metadata_error
+   */
+  stdx::expected<metadata_cache::ClusterTopology, std::error_code>
+  fetch_cluster_topology(
+      MySQLSession::Transaction &transaction,
+      mysqlrouter::TargetCluster &target_cluster, const unsigned router_id,
+      const metadata_cache::metadata_server_t &metadata_server,
+      bool needs_writable_node, const std::string &group_name,
+      const std::string &clusterset_id = "") override;
+
+  void reset() override { metadata_read_ = false; }
+
+  std::vector<metadata_cache::metadata_servers_list_t> get_metadata_servers(
+      const metadata_cache::metadata_servers_list_t &metadata_servers)
+      override {
+    return clusterset_topology_.get_metadata_servers(metadata_servers);
+  }
+
+ private:
+  // Depending whether the bootstrap happened when the Cluster was already a
+  // part of a ClusterSet or not we will have either GR name or clusterset_id
+  // from the state file
+  std::string get_cluster_type_specific_id_limit_sql(
+      const std::string &group_name,
+      const std::string &clusterset_id = "") override;
+
+  uint64_t view_id_{0};
+  bool metadata_read_{false};
+
+  /** @brief Returns vector of the cluster members according to the metadata of
+   * the selected server.
+   *
+   * @param session active connection to the member that is checked for the
+   * metadata
+   * @param cluster_id ID of the cluster this operation refers to
+   * @return vector of the cluster members
+   */
+  metadata_cache::cluster_nodes_list_t
+  fetch_target_cluster_instances_from_metadata_server(
+      mysqlrouter::MySQLSession &session, const std::string &cluster_id);
+
+  // returns cluster_id
+  std::string get_target_cluster_info_from_metadata_server(
+      mysqlrouter::MySQLSession &session,
+      mysqlrouter::TargetCluster &target_cluster,
+      const std::string &clusterset_id);
+
+  /** @brief Queries the metada for the current ClusterSet topology. Stores the
+   * topology in the class state. Returns the set of the metadata server for the
+   * ClusterSet.
+   *
+   * @param session active connection to the member that is checked for the
+   * metadata
+   * @param clusterset_id ID of the ClusterSet this operation refers to
+   * @return set of the servers that contains metadata for the ClusterSet
+   */
+  metadata_cache::metadata_servers_list_t
+  update_clusterset_topology_from_metadata_server(
+      mysqlrouter::MySQLSession &session, const std::string &clusterset_id);
+
+  struct ClusterSetTopology {
+    // we at least once successfully read the metadata from one of the metadata
+    // servers we had stored in the state file; if true we have the
+    // clusters-nodes assignement, we know which cluster is the primary etc. so
+    // when refreshing the metadata we can only check one node per cluster for
+    // highiest view_id
+    bool is_set{false};
+
+    struct ClusterTopology {
+      std::vector<metadata_cache::ManagedInstance> nodes;
+      bool is_primary;  // it this Cluster is a PRIMARY in the ClusterSet
+    };
+
+    // the key is Cluster UUID
+    std::map<std::string, ClusterTopology> clusters;
+
+    std::vector<metadata_cache::metadata_servers_list_t> get_metadata_servers(
+        const metadata_cache::metadata_servers_list_t &metadata_servers) const {
+      std::vector<metadata_cache::metadata_servers_list_t> result;
+
+      if (is_set) {
+        // We already know the latest ClusterSet topology so we return the
+        // servers grouped by the Cluster they belong to
+        for (const auto &cluster : clusters) {
+          metadata_cache::metadata_servers_list_t nodes;
+          for (const auto &node : cluster.second.nodes) {
+            nodes.push_back({node.host, node.port});
+          }
+          if (!nodes.empty()) {
+            result.push_back(nodes);
+          }
+        }
+      }
+
+      // if did not read the metadata yet we have the list from the state file
+      // we don't know which server belongs to which Cluster at this point so we
+      // have to assume the safest scenario: each is from different Cluster, we
+      // have to check metadata on each of them
+      if (result.empty()) {
+        for (const auto &server : metadata_servers) {
+          result.push_back({server});
+        }
+      }
+
+      return result;
+    }
+  };
+
+  ClusterSetTopology clusterset_topology_;
+};
+
+GRClusterMetadata::GRClusterMetadata(
+    const metadata_cache::MetadataCacheMySQLSessionConfig &session_config,
+    const mysqlrouter::SSLOptions &ssl_options,
+    const bool use_cluster_notifications)
+    : ClusterMetadata(session_config, ssl_options) {
   if (use_cluster_notifications) {
     gr_notifications_listener_.reset(
-        new GRNotificationListener(user, password));
+        new GRNotificationListener(session_config.user_credentials));
   }
 }
 
-void GRClusterMetadata::update_replicaset_status(
-    const std::string &name,
-    metadata_cache::ManagedReplicaSet
-        &replicaset) {  // throws metadata_cache::metadata_error
+void GRClusterMetadata::update_cluster_status(
+    const mysqlrouter::TargetCluster &target_cluster,
+    metadata_cache::ManagedCluster
+        &cluster) {  // throws metadata_cache::metadata_error
 
-  log_debug("Updating replicaset status from GR for '%s'", name.c_str());
+  log_debug("Updating cluster status from GR for '%s'", target_cluster.c_str());
 
   // iterate over all cadidate nodes until we find the node that is part of
   // quorum
   bool found_quorum = false;
   std::shared_ptr<MySQLSession> gr_member_connection;
-  for (const metadata_cache::ManagedInstance &mi : replicaset.members) {
-    std::string mi_addr = (mi.host == "localhost" ? "127.0.0.1" : mi.host) +
-                          ":" + std::to_string(mi.port);
+  for (const metadata_cache::ManagedInstance &mi : cluster.members) {
+    const std::string mi_addr = mi.host + ":" + std::to_string(mi.port);
 
     auto connection = get_connection();
 
@@ -151,16 +326,24 @@
         throw metadata_cache::metadata_error(e.what());
       }
 
-      if (!do_connect(*gr_member_connection, mi)) {
-        log_warning(
+      const bool connect_res = do_connect(*gr_member_connection, mi);
+      const bool connect_res_changed =
+          EventStateTracker::instance().state_changed(
+              connect_res, EventStateTracker::EventId::GRMemberConnectedOk,
+              mi_addr);
+      if (!connect_res) {
+        const auto log_level =
+            connect_res_changed ? LogLevel::kWarning : LogLevel::kDebug;
+        log_custom(
+            log_level,
             "While updating metadata, could not establish a connection to "
-            "replicaset '%s' through %s",
-            name.c_str(), mi_addr.c_str());
+            "cluster '%s' through %s",
+            target_cluster.c_str(), mi_addr.c_str());
         continue;  // server down, next!
       }
     }
 
-    log_debug("Connected to replicaset '%s' through %s", name.c_str(),
+    log_debug("Connected to cluster '%s' through %s", target_cluster.c_str(),
               mi_addr.c_str());
 
     try {
@@ -171,79 +354,79 @@
           fetch_group_replication_members(
               *gr_member_connection,
               single_primary_mode);  // throws metadata_cache::metadata_error
-      log_debug(
-          "Replicaset '%s' has %zu members in metadata, %zu in status table",
-          name.c_str(), replicaset.members.size(), member_status.size());
+      log_debug("Cluster '%s' has %zu members in metadata, %zu in status table",
+                target_cluster.c_str(), cluster.members.size(),
+                member_status.size());
 
       // check status of all nodes; updates instances
       // ------------------vvvvvvvvvvvvvvvvvv
       bool metadata_gr_discrepancy{false};
-      metadata_cache::ReplicasetStatus status = check_replicaset_status(
-          replicaset.members, member_status, metadata_gr_discrepancy);
+      metadata_cache::ClusterStatus status = check_cluster_status(
+          cluster.members, member_status, metadata_gr_discrepancy);
       switch (status) {
-        case metadata_cache::ReplicasetStatus::AvailableWritable:  // we have
-                                                                   // quorum,
-                                                                   // good!
+        case metadata_cache::ClusterStatus::AvailableWritable:  // we have
+                                                                // quorum,
+                                                                // good!
           found_quorum = true;
           break;
-        case metadata_cache::ReplicasetStatus::AvailableReadOnly:  // have
-                                                                   // quorum,
-                                                                   // but only
-                                                                   // RO
+        case metadata_cache::ClusterStatus::AvailableReadOnly:  // have
+                                                                // quorum,
+                                                                // but only
+                                                                // RO
           found_quorum = true;
           break;
-        case metadata_cache::ReplicasetStatus::
+        case metadata_cache::ClusterStatus::
             UnavailableRecovering:  // have quorum, but only with recovering
                                     // nodes (cornercase)
           log_warning(
-              "quorum for replicaset '%s' consists only of recovering nodes!",
-              name.c_str());
+              "quorum for cluster '%s' consists only of recovering nodes!",
+              target_cluster.c_str());
           found_quorum = true;  // no point in futher search
           break;
-        case metadata_cache::ReplicasetStatus::Unavailable:  // we have nothing
-          log_warning("%s is not part of quorum for replicaset '%s'",
-                      mi_addr.c_str(), name.c_str());
+        case metadata_cache::ClusterStatus::Unavailable:  // we have nothing
+          log_warning("%s is not part of quorum for cluster '%s'",
+                      mi_addr.c_str(), target_cluster.c_str());
           continue;  // this server is no good, next!
       }
 
       if (found_quorum) {
-        replicaset.single_primary_mode = single_primary_mode;
-        replicaset.md_discrepancy = metadata_gr_discrepancy;
+        cluster.single_primary_mode = single_primary_mode;
+        cluster.md_discrepancy = metadata_gr_discrepancy;
         break;  // break out of the member iteration loop
       }
 
     } catch (const metadata_cache::metadata_error &e) {
       log_warning(
           "Unable to fetch live group_replication member data from %s from "
-          "replicaset '%s': %s",
-          mi_addr.c_str(), name.c_str(), e.what());
+          "cluster '%s': %s",
+          mi_addr.c_str(), target_cluster.c_str(), e.what());
       continue;  // faulty server, next!
     } catch (const std::exception &e) {
       log_warning(
           "Unable to fetch live group_replication member data from %s from "
-          "replicaset '%s': %s",
-          mi_addr.c_str(), name.c_str(), e.what());
+          "cluster '%s': %s",
+          mi_addr.c_str(), target_cluster.c_str(), e.what());
       continue;  // faulty server, next!
     }
 
   }  // for (const metadata_cache::ManagedInstance& mi : instances)
-  log_debug("End updating replicaset for '%s'", name.c_str());
+  log_debug("End updating cluster for '%s'", target_cluster.c_str());
 
   if (!found_quorum) {
     std::string msg(
         "Unable to fetch live group_replication member data from any server in "
-        "replicaset '");
-    msg += name + "'";
+        "cluster '");
+    msg += target_cluster.to_string() + "'";
     log_error("%s", msg.c_str());
 
     // if we don't have a quorum, we want to give "nothing" to the Routing
     // plugin, so it doesn't route anything. Routing plugin is dumb, it has no
     // idea what a quorum is, etc.
-    replicaset.members.clear();
+    cluster.members.clear();
   }
 }
 
-metadata_cache::ReplicasetStatus GRClusterMetadata::check_replicaset_status(
+metadata_cache::ClusterStatus GRClusterMetadata::check_cluster_status(
     std::vector<metadata_cache::ManagedInstance> &instances,
     const std::map<std::string, GroupReplicationMember> &member_status,
     bool &metadata_gr_discrepancy) const noexcept {
@@ -256,14 +439,14 @@
 
   // Therefore, this code will work well only under one assumption:
   // All nodes in `member_status` are present in `instances`. This assumption
-  // should hold unless a user "manually" adds new nodes to the replicaset
+  // should hold unless a user "manually" adds new nodes to the cluster
   // without adding them to metadata (and the user is not allowed to do that).
 
   // Detect violation of above assumption (alarm if there's a node in
   // `member_status` not present in `instances`). It's O(n*m), but the CPU time
   // is negligible while keeping code simple.
 
-  using metadata_cache::ReplicasetStatus;
+  using metadata_cache::ClusterStatus;
   using metadata_cache::ServerMode;
   using GR_State = GroupReplicationMember::State;
   using GR_Role = GroupReplicationMember::Role;
@@ -277,13 +460,20 @@
                                 return status_node.first ==
                                        metadata_node.mysql_server_uuid;
                               });
-    if (found == instances.end()) {
+    const bool node_in_metadata = found != instances.end();
+    const bool node_in_metadata_changed =
+        EventStateTracker::instance().state_changed(
+            node_in_metadata, EventStateTracker::EventId::GRNodeInMetadata,
+            status_node.first);
+    if (!node_in_metadata) {
       if (status_node.second.state == GR_State::Recovering) {
-        log_info(
-            "GR member %s:%d (%s) Recovering, missing in the metadata, "
-            "ignoring",
-            status_node.second.host.c_str(), status_node.second.port,
-            status_node.first.c_str());
+        const auto log_level =
+            node_in_metadata_changed ? LogLevel::kInfo : LogLevel::kDebug;
+        log_custom(log_level,
+                   "GR member %s:%d (%s) Recovering, missing in the metadata, "
+                   "ignoring",
+                   status_node.second.host.c_str(), status_node.second.port,
+                   status_node.first.c_str());
         // if the node is Recovering and it is missing in the metadata it can't
         // increase the pool used for quorum calculations. This is for example
         // important when we have single node cluster and we add another node
@@ -291,10 +481,12 @@
         // tables but missing in the metadata.
         --number_of_all_members;
       } else {
-        log_warning("GR member %s:%d (%s) %s, missing in the metadata",
-                    status_node.second.host.c_str(), status_node.second.port,
-                    status_node.first.c_str(),
-                    to_string(status_node.second.state));
+        const auto log_level =
+            node_in_metadata_changed ? LogLevel::kWarning : LogLevel::kDebug;
+        log_custom(
+            log_level, "GR member %s:%d (%s) %s, missing in the metadata",
+            status_node.second.host.c_str(), status_node.second.port,
+            status_node.first.c_str(), to_string(status_node.second.state));
       }
 
       // we want to set this in both cases as it increases the metadata refresh
@@ -312,7 +504,12 @@
   bool have_secondary_instance = false;
   for (auto &member : instances) {
     auto status = member_status.find(member.mysql_server_uuid);
-    if (status != member_status.end()) {
+    const bool node_in_gr = status != member_status.end();
+    const bool node_in_gr_changed = EventStateTracker::instance().state_changed(
+        node_in_gr, EventStateTracker::EventId::MetadataNodeInGR,
+        member.mysql_server_uuid);
+
+    if (node_in_gr) {
       switch (status->second.state) {
         case GR_State::Online:
           switch (status->second.role) {
@@ -343,10 +540,13 @@
     } else {
       member.mode = ServerMode::Unavailable;
       metadata_gr_discrepancy = true;
-      log_warning(
-          "Member %s:%d (%s) defined in metadata not found in actual "
-          "replicaset",
-          member.host.c_str(), member.port, member.mysql_server_uuid.c_str());
+      const auto log_level =
+          node_in_gr_changed ? LogLevel::kWarning : LogLevel::kDebug;
+      log_custom(log_level,
+                 "Member %s:%d (%s) defined in metadata not found in actual "
+                 "Group Replication",
+                 member.host.c_str(), member.port,
+                 member.mysql_server_uuid.c_str());
     }
   }
 
@@ -357,19 +557,19 @@
 
   // if we don't have quorum, we don't allow any access. Some configurations
   // might allow RO access in this case, but we don't support it at the momemnt
-  if (!have_quorum) return ReplicasetStatus::Unavailable;
+  if (!have_quorum) return ClusterStatus::Unavailable;
 
   // if we have quorum but no primary/secondary instances, it means the quorum
   // is composed purely of recovering nodes (this is an unlikey cornercase)
   if (!(have_primary_instance || have_secondary_instance))
-    return ReplicasetStatus::UnavailableRecovering;
+    return ClusterStatus::UnavailableRecovering;
 
   // if primary node was not elected yet, we can only allow reads (typically
   // this is a temporary state shortly after a node failure, but could also be
   // more permanent)
   return have_primary_instance
-             ? ReplicasetStatus::AvailableWritable   // typical case
-             : ReplicasetStatus::AvailableReadOnly;  // primary not elected yet
+             ? ClusterStatus::AvailableWritable   // typical case
+             : ClusterStatus::AvailableReadOnly;  // primary not elected yet
 }
 
 void GRClusterMetadata::reset_metadata_backend(const ClusterType type) {
@@ -388,6 +588,10 @@
       metadata_backend_ =
           std::make_unique<GRMetadataBackendV2>(this, connect_clb);
       break;
+    case ClusterType::GR_CS:
+      metadata_backend_ =
+          std::make_unique<GRClusterSetMetadataBackend>(this, connect_clb);
+      break;
     default:
       throw std::runtime_error(
           "Invalid cluster type '" + mysqlrouter::to_string(type) +
@@ -401,7 +605,8 @@
 }
 
 GRClusterMetadata::auth_credentials_t GRClusterMetadata::fetch_auth_credentials(
-    const std::string &cluster_name) {
+    const mysqlrouter::TargetCluster &target_cluster,
+    const std::string &cluster_type_specific_id) {
   if (!metadata_backend_) return {};
   switch (metadata_backend_->get_cluster_type()) {
     case mysqlrouter::ClusterType::GR_V1:
@@ -410,28 +615,40 @@
           "version 1.0");
       return {};
     default:
-      return ClusterMetadata::fetch_auth_credentials(cluster_name);
+      return ClusterMetadata::fetch_auth_credentials(target_cluster,
+                                                     cluster_type_specific_id);
   }
 }
 
-GRClusterMetadata::ReplicaSetsByName
+metadata_cache::ManagedCluster
 GRClusterMetadata::fetch_instances_from_metadata_server(
-    const std::string &cluster_name,
+    const mysqlrouter::TargetCluster &target_cluster,
     const std::string &cluster_type_specific_id) {
   return metadata_backend_->fetch_instances_from_metadata_server(
-      cluster_name, cluster_type_specific_id);
+      target_cluster, cluster_type_specific_id);
 }
 
+namespace {
+// returns true if the backends can be changed in the runtime
+bool backends_compatible(const ClusterType a, const ClusterType b) {
+  return a != ClusterType::GR_CS && b != ClusterType::GR_CS;
+}
+}  // namespace
+
 void GRClusterMetadata::update_backend(
-    const mysqlrouter::MetadataSchemaVersion &version) {
-  const auto cluster_type =
-      mysqlrouter::get_cluster_type(version, metadata_connection_.get());
+    const mysqlrouter::MetadataSchemaVersion &version, unsigned int router_id) {
+  const auto cluster_type = mysqlrouter::get_cluster_type(
+      version, metadata_connection_.get(), router_id);
 
   // if the current backend does not fit the metadata version that we just
   // discovered, we need to recreate it
   if (!metadata_backend_ ||
       cluster_type != metadata_backend_->get_cluster_type()) {
     if (metadata_backend_) {
+      if (!backends_compatible(cluster_type,
+                               metadata_backend_->get_cluster_type())) {
+        return;
+      }
       log_info(
           "Metadata version change was discovered. New metadata version is "
           "%d.%d.%d",
@@ -441,65 +658,184 @@
   }
 }
 
-ClusterMetadata::ReplicaSetsByName GRClusterMetadata::fetch_instances(
-    const std::string &cluster_name,
-    const std::string &cluster_type_specific_id) {
-  log_debug("Updating metadata information for cluster '%s'",
-            cluster_name.c_str());
-
-  MySQLSession::Transaction transaction(metadata_connection_.get());
-  auto version =
-      get_and_check_metadata_schema_version(*metadata_connection_.get());
-  update_backend(version);
-
-  // fetch existing replicasets in the cluster from the metadata server (this is
-  // the topology that was configured, it will be compared later against current
-  // topology reported by (a server in) replicaset)
-  ReplicaSetsByName replicasets(fetch_instances_from_metadata_server(
-      cluster_name,
-      cluster_type_specific_id));  // throws metadata_cache::metadata_error
+stdx::expected<metadata_cache::ClusterTopology, std::error_code>
+GRMetadataBackend::fetch_cluster_topology(
+    MySQLSession::Transaction &transaction,
+    mysqlrouter::TargetCluster &target_cluster, const unsigned /*router_id*/,
+    const metadata_cache::metadata_server_t & /*metadata_server*/,
+    bool needs_writable_node, const std::string &group_name,
+    const std::string &clusterset_id = "") {
+  metadata_cache::ClusterTopology result;
+
+  // fetch cluster topology from the metadata server (this is
+  // the topology that was configured, it will be compared later against
+  // current topology reported by (a server in) Group Replication)
+  result.cluster_data = fetch_instances_from_metadata_server(
+      target_cluster, group_name,
+      clusterset_id);  // throws metadata_cache::metadata_error
 
   // we are done with querying metadata
   transaction.commit();
 
-  if (replicasets.empty())
-    log_warning("No replicasets defined for cluster '%s'",
-                cluster_name.c_str());
-
-  // now connect to each replicaset and query it for the list and status of its
-  // members. (more precisely, foreach replicaset: search and connect to a
+  // now connect to the cluster and query it for the list and status of its
+  // members. (more precisely: search and connect to a
   // member which is part of quorum to retrieve this data)
-  for (auto &&rs : replicasets) {
-    update_replicaset_status(
-        rs.first, rs.second);  // throws metadata_cache::metadata_error
+  metadata_->update_cluster_status(
+      target_cluster,
+      result.cluster_data);  // throws metadata_cache::metadata_error
+
+  // for Cluster that is not part of the ClusterSet we assume metadata
+  // servers are just Cluster nodes
+  for (const auto &cluster_node : result.cluster_data.members) {
+    result.metadata_servers.push_back({cluster_node.host, cluster_node.port});
+  }
+
+  if (needs_writable_node) {
+    result.cluster_data.writable_server =
+        metadata_->find_rw_server(result.cluster_data.members);
+  } else {
+    result.cluster_data.writable_server = stdx::make_unexpected(
+        make_error_code(metadata_cache::metadata_errc::no_rw_node_needed));
+  }
+
+  return result;
+}
+
+stdx::expected<metadata_cache::ClusterTopology, std::error_code>
+GRClusterMetadata::fetch_cluster_topology(
+    const std::atomic<bool> &terminated,
+    mysqlrouter::TargetCluster &target_cluster, const unsigned router_id,
+    const metadata_cache::metadata_servers_list_t &metadata_servers,
+    bool needs_writable_node, const std::string &group_name,
+    const std::string &clusterset_id, std::size_t &instance_id) {
+  log_debug("Updating metadata information for cluster '%s'",
+            target_cluster.c_str());
+  stdx::expected<metadata_cache::ClusterTopology, std::error_code> result{
+      stdx::make_unexpected(make_error_code(
+          metadata_cache::metadata_errc::no_metadata_server_reached))},
+      result_tmp;
+  instance_id = 0;
+  bool backend_reset{false};
+
+  const auto servers_by_cluster =
+      metadata_backend_
+          ? metadata_backend_->get_metadata_servers(metadata_servers)
+          : get_all_metadata_servers(metadata_servers);
+
+  size_t last_fetch_cluster_id{std::numeric_limits<size_t>::max()};
+
+  for (size_t i = 0; i < servers_by_cluster.size(); ++i) {
+    const auto &cluster_servers = servers_by_cluster[i];
+    for (const auto &metadata_server : cluster_servers) {
+      // if this is a ClusterSet and we already read metadata from one of the
+      // nodes of this Cluster we skip, we only check the metadata on one node
+      // of a Cluster
+      if (metadata_backend_ &&
+          metadata_backend_->get_cluster_type() ==
+              mysqlrouter::ClusterType::GR_CS &&
+          last_fetch_cluster_id == i)
+        continue;
+
+      result_tmp = stdx::make_unexpected(make_error_code(
+          metadata_cache::metadata_errc::no_metadata_read_successful));
+
+      if (terminated) {
+        return stdx::make_unexpected(make_error_code(
+            metadata_cache::metadata_errc::metadata_refresh_terminated));
+      }
+
+      try {
+        if (!connect_and_setup_session(metadata_server)) {
+          continue;
+        }
+
+        MySQLSession::Transaction transaction(metadata_connection_.get());
+
+        // throws metadata_cache::metadata_error and
+        // MetadataUpgradeInProgressException
+        const auto version =
+            get_and_check_metadata_schema_version(*metadata_connection_);
+
+        update_backend(version, router_id);
+
+        if (!backend_reset) {
+          metadata_backend_->reset();
+          backend_reset = true;
+        }
+
+        result_tmp = metadata_backend_->fetch_cluster_topology(
+            transaction, target_cluster, router_id, metadata_server,
+            needs_writable_node, group_name, clusterset_id);
+
+        last_fetch_cluster_id = i;
+      } catch (const mysqlrouter::MetadataUpgradeInProgressException &) {
+        throw;
+      } catch (const std::exception &e) {
+        log_warning(
+            "Failed fetching metadata from metadata server on %s:%d - %s",
+            metadata_server.address().c_str(), metadata_server.port(),
+            e.what());
+      }
+
+      if (result_tmp) {
+        const auto metadata_server_it = std::find(
+            metadata_servers.begin(), metadata_servers.end(), metadata_server);
+        if (metadata_server_it != metadata_servers.end()) {
+          instance_id = metadata_server_it - metadata_servers.begin();
+        }
+
+        // for a standalone Cluster which is not part of a ClusterSet we are ok
+        // with first successfull read for a ClusterSet we need to go over all
+        // of them to find highiest view_id
+        result = std::move(result_tmp);
+        if (metadata_backend_->get_cluster_type() !=
+            mysqlrouter::ClusterType::GR_CS) {
+          return result;
+        }
+      } else {
+        if (!result) {
+          result = std::move(result_tmp);
+        }
+      }
+    }
   }
 
-  return replicasets;
+  return result;
 }
 
 // throws metadata_cache::metadata_error
-ClusterMetadata::ReplicaSetsByName
+metadata_cache::ManagedCluster
 GRMetadataBackendV1::fetch_instances_from_metadata_server(
-    const std::string &cluster_name,
-    const std::string &cluster_type_specific_id) {
-  // If we have group replication id we also want to limit the results only for
-  // that group replication. For backward compatibility we need to check if it
-  // is not empty, we didn't store that information before introducing dynamic
-  // state file.
-  std::string limit_group_replication;
+    const mysqlrouter::TargetCluster &target_cluster,
+    const std::string &group_name, const std::string & /*clusterset_id*/) {
   auto connection = metadata_->get_connection();
-  if (!cluster_type_specific_id.empty()) {
+
+  std::string limit_cluster;
+  if (target_cluster.target_type() ==
+      mysqlrouter::TargetCluster::TargetType::ByName) {
+    limit_cluster = "F.cluster_name = ";
+  } else {
+    limit_cluster = "F.cluster_id = ";
+  }
+  limit_cluster += connection->quote(target_cluster.to_string());
+
+  // If we have group replication id we also want to limit the results only
+  // for that group replication. For backward compatibility we need to check
+  // if it is not empty, we didn't store that information before introducing
+  // dynamic state file.
+  std::string limit_group_replication;
+  if (!group_name.empty()) {
     limit_group_replication =
         " AND R.attributes->>'$.group_replication_group_name' = " +
-        connection->quote(cluster_type_specific_id);
+        connection->quote(group_name);
   }
 
-  // Get expected topology (what was configured) from metadata server. This will
-  // later be compared against current topology (what exists NOW) obtained from
-  // one of the nodes belonging to a quorum. Note that this topology will also
-  // be successfully returned when a particular metadata server is not part of
-  // GR, as serving metadata and being part of replicaset are two orthogonal
-  // ideas.
+  // Get expected topology (what was configured) from metadata server. This
+  // will later be compared against current topology (what exists NOW)
+  // obtained from one of the nodes belonging to a quorum. Note that this
+  // topology will also be successfully returned when a particular metadata
+  // server is not part of GR, as serving metadata and being part of
+  // replicaset are two orthogonal ideas.
   std::string query(
       "SELECT "
       "R.replicaset_name, "
@@ -512,8 +848,8 @@
       "ON F.cluster_id = R.cluster_id "
       "JOIN mysql_innodb_cluster_metadata.instances AS I "
       "ON R.replicaset_id = I.replicaset_id "
-      "WHERE F.cluster_name = " +
-      connection->quote(cluster_name) + limit_group_replication);
+      "WHERE " +
+      limit_cluster + limit_group_replication);
 
   // example response
   // clang-format off
@@ -526,20 +862,9 @@
   // +-----------------+--------------------------------------+--------------------------------+--------------------------+
   // clang-format on
   //
-  // The following instance map stores a list of servers mapped to every
-  // replicaset name.
-  // {
-  //   {replicaset_1:[host1:port1, host2:port2, host3:port3]},
-  //   {replicaset_2:[host4:port4, host5:port5, host6:port6]},
-  //   ...
-  //   {replicaset_n:[hostj:portj, hostk:portk, hostl:portl]}
-  // }
-  MetaData::ReplicaSetsByName replicaset_map;
 
-  // Deserialize the resultset into a map that stores a list of server
-  // instance objects mapped to each replicaset.
-  auto result_processor =
-      [&replicaset_map](const MySQLSession::Row &row) -> bool {
+  metadata_cache::ManagedCluster result;
+  auto result_processor = [&result](const MySQLSession::Row &row) -> bool {
     if (row.size() != 4) {
       throw metadata_cache::metadata_error(
           "Unexpected number of fields in the resultset. "
@@ -548,16 +873,13 @@
     }
 
     metadata_cache::ManagedInstance s;
-    s.replicaset_name = get_string(row[0]);
     s.mysql_server_uuid = get_string(row[1]);
     if (!set_instance_ports(s, row, 2, 3)) {
       return true;  // next row
     }
 
-    auto &rset(replicaset_map[s.replicaset_name]);
-    rset.members.push_back(s);
-    rset.name = s.replicaset_name;
-    rset.single_primary_mode =
+    result.members.push_back(s);
+    result.single_primary_mode =
         true;  // actual value set elsewhere from GR metadata
 
     return true;  // false = I don't want more rows
@@ -571,34 +893,53 @@
     throw metadata_cache::metadata_error(e.what());
   }
 
-  return replicaset_map;
+  return result;
+}
+
+std::string GRMetadataBackendV2::get_cluster_type_specific_id_limit_sql(
+    const std::string &group_name, const std::string & /*clusterset_id*/) {
+  auto connection = metadata_->get_connection();
+
+  std::string result;
+  if (!group_name.empty()) {
+    result = " AND C.group_name = " + connection->quote(group_name);
+  }
+
+  return result;
 }
 
 // throws metadata_cache::metadata_error
-ClusterMetadata::ReplicaSetsByName
+metadata_cache::ManagedCluster
 GRMetadataBackendV2::fetch_instances_from_metadata_server(
-    const std::string &cluster_name,
-    const std::string &cluster_type_specific_id) {
+    const mysqlrouter::TargetCluster &target_cluster,
+    const std::string &group_name, const std::string &clusterset_id) {
   auto connection = metadata_->get_connection();
 
-  std::string limit_group_replication;
-  if (!cluster_type_specific_id.empty()) {
-    limit_group_replication =
-        " AND C.group_name = " + connection->quote(cluster_type_specific_id);
+  std::string limit_cluster;
+  if (target_cluster.target_type() ==
+      mysqlrouter::TargetCluster::TargetType::ByName) {
+    limit_cluster = "C.cluster_name = ";
+  } else {
+    limit_cluster = "C.cluster_id = ";
   }
+  limit_cluster += connection->quote(target_cluster.to_string());
+
+  std::string limit_group_replication =
+      get_cluster_type_specific_id_limit_sql(group_name, clusterset_id);
 
-  // Get expected topology (what was configured) from metadata server. This will
-  // later be compared against current topology (what exists NOW) obtained from
-  // one of the nodes belonging to a quorum. Note that this topology will also
-  // be successfully returned when a particular metadata server is not part of
-  // GR, as serving metadata and being part of replicaset are two orthogonal
-  // ideas.
+  // Get expected topology (what was configured) from metadata server. This
+  // will later be compared against current topology (what exists NOW)
+  // obtained from one of the nodes belonging to a quorum. Note that this
+  // topology will also be successfully returned when a particular metadata
+  // server is not part of GR, as serving metadata and being part of
+  // replicaset are two orthogonal ideas.
   std::string query(
-      "select I.mysql_server_uuid, I.endpoint, I.xendpoint, I.attributes from "
+      "select I.mysql_server_uuid, I.endpoint, I.xendpoint, I.attributes "
+      "from "
       "mysql_innodb_cluster_metadata.v2_instances I join "
       "mysql_innodb_cluster_metadata.v2_gr_clusters C on I.cluster_id = "
-      "C.cluster_id where C.cluster_name = " +
-      connection->quote(cluster_name) + limit_group_replication);
+      "C.cluster_id where " +
+      limit_cluster + limit_group_replication);
 
   // example response
   // clang-format off
@@ -611,20 +952,8 @@
   //  +--------------------------------------+----------------+-----------------+--------------------------------------------------------------------+
   // clang-format on
   //
-  // The following instance map stores a list of servers mapped to every
-  // replicaset name.
-  // {
-  //   {replicaset_1:[host1:port1, host2:port2, host3:port3]},
-  //   {replicaset_2:[host4:port4, host5:port5, host6:port6]},
-  //   ...
-  //   {replicaset_n:[hostj:portj, hostk:portk, hostl:portl]}
-  // }
-  MetaData::ReplicaSetsByName replicaset_map;
-
-  // Deserialize the resultset into a map that stores a list of server
-  // instance objects mapped to each replicaset.
-  auto result_processor =
-      [&replicaset_map](const MySQLSession::Row &row) -> bool {
+  metadata_cache::ManagedCluster result;
+  auto result_processor = [&result](const MySQLSession::Row &row) -> bool {
     if (row.size() != 4) {
       throw metadata_cache::metadata_error(
           "Unexpected number of fields in the resultset. "
@@ -639,12 +968,8 @@
     }
     set_instance_attributes(instance, get_string(row[3]));
 
-    instance.replicaset_name = "default";
-
-    auto &rset(replicaset_map[instance.replicaset_name]);
-    rset.members.push_back(instance);
-    rset.name = instance.replicaset_name;
-    rset.single_primary_mode =
+    result.members.push_back(instance);
+    result.single_primary_mode =
         true;  // actual value set elsewhere from GR metadata
 
     return true;  // false = I don't want more rows
@@ -656,7 +981,528 @@
     throw metadata_cache::metadata_error(e.what());
   }
 
-  return replicaset_map;
+  return result;
 }
 
 GRClusterMetadata::~GRClusterMetadata() = default;
+
+//////////////////////////////////////
+// class GRClusterSetMetadataBackend
+//////////////////////////////////////
+
+std::string GRClusterSetMetadataBackend::get_cluster_type_specific_id_limit_sql(
+    const std::string &group_name, const std::string &clusterset_id) {
+  auto connection = metadata_->get_connection();
+
+  std::string result;
+  if (!clusterset_id.empty()) {
+    result =
+        " AND C.cluster_id IN (select CSM.cluster_id from "
+        "mysql_innodb_cluster_metadata.v2_cs_members CSM "
+        "where CSM.clusterset_id=" +
+        connection->quote(clusterset_id) + ")";
+  }
+
+  if (!group_name.empty()) {
+    result = " AND C.group_name = " + connection->quote(group_name);
+  }
+
+  return result;
+}
+
+static stdx::expected<uint64_t, std::error_code> get_member_view_id(
+    mysqlrouter::MySQLSession &session, const std::string &clusterset_id) {
+  const std::string query =
+      "select view_id from mysql_innodb_cluster_metadata.v2_cs_clustersets "
+      "where clusterset_id = " +
+      session.quote(clusterset_id);
+
+  std::unique_ptr<MySQLSession::ResultRow> row(session.query_one(query));
+  if (!row) {
+    return stdx::make_unexpected(
+        make_error_code(metadata_cache::metadata_errc::cluster_not_found));
+  }
+
+  return strtoull_checked((*row)[0]);
+}
+
+static stdx::expected<std::string, std::error_code> get_clusterset_id(
+    mysqlrouter::MySQLSession &session, const std::string &group_name) {
+  const std::string query =
+      "select CSM.clusterset_id from "
+      "mysql_innodb_cluster_metadata.v2_cs_members CSM join "
+      "mysql_innodb_cluster_metadata.v2_gr_clusters C on CSM.cluster_id = "
+      "C.cluster_id where C.group_name = " +
+      session.quote(group_name);
+
+  std::unique_ptr<MySQLSession::ResultRow> row(session.query_one(query));
+  if (!row) {
+    return stdx::make_unexpected(
+        make_error_code(metadata_cache::metadata_errc::cluster_not_found));
+  }
+
+  return get_string((*row)[0]);
+}
+
+static std::string get_router_option_str(const std::string &options,
+                                         const std::string &name,
+                                         const std::string &default_value,
+                                         std::string &out_error) {
+  out_error = "";
+  if (options.empty()) return default_value;
+
+  rapidjson::Document json_doc;
+  json_doc.Parse(options.c_str(), options.length());
+
+  if (!json_doc.IsObject()) {
+    out_error = "not a valid JSON object";
+    return default_value;
+  }
+
+  if (!json_doc.HasMember(name.c_str())) {
+    return default_value;
+  }
+
+  if (!json_doc[name.c_str()].IsString()) {
+    out_error = "options." + name + " not a string";
+    return default_value;
+  }
+
+  return json_doc[name.c_str()].GetString();
+}
+
+static bool update_router_options_from_metadata(
+    mysqlrouter::MySQLSession &session, const unsigned router_id,
+    mysqlrouter::TargetCluster &target_cluster) {
+  // check if we have a target cluster assigned in the metadata
+  const std::string query =
+      "SELECT router_options FROM "
+      "mysql_innodb_cluster_metadata.v2_cs_router_options where router_id = " +
+      std::to_string(router_id);
+
+  std::unique_ptr<MySQLSession::ResultRow> row(session.query_one(query));
+  if (!row) {
+    log_error(
+        "Error reading target_cluster from the router.options: did not find "
+        "router entry for router_id '%u'",
+        router_id);
+    return false;
+  }
+
+  const std::string options_str = get_string((*row)[0]);
+  target_cluster.options_string(options_str);
+
+  std::string out_error;
+  std::string target_cluster_str =
+      get_router_option_str(options_str, "target_cluster", "", out_error);
+
+  if (!out_error.empty()) {
+    log_error("Error reading target_cluster from the router.options: %s",
+              out_error.c_str());
+    return false;
+  }
+
+  const std::string invalidated_cluster_routing_policy_str =
+      get_router_option_str(options_str, "invalidated_cluster_policy", "",
+                            out_error);
+
+  if (invalidated_cluster_routing_policy_str == "accept_ro") {
+    target_cluster.invalidated_cluster_routing_policy(
+        mysqlrouter::TargetCluster::InvalidatedClusterRoutingPolicy::AcceptRO);
+  } else {
+    // this is the default strategy
+    target_cluster.invalidated_cluster_routing_policy(
+        mysqlrouter::TargetCluster::InvalidatedClusterRoutingPolicy::DropAll);
+  }
+
+  const bool target_cluster_in_options = !target_cluster_str.empty();
+  const bool target_cluster_in_options_changed =
+      EventStateTracker::instance().state_changed(
+          target_cluster_in_options,
+          EventStateTracker::EventId::TargetClusterPresentInOptions);
+
+  if (!target_cluster_in_options) {
+    const auto log_level = target_cluster_in_options_changed
+                               ? LogLevel::kWarning
+                               : LogLevel::kDebug;
+    log_custom(
+        log_level,
+        "Target cluster for router_id=%d not set, using 'primary' as a target "
+        "cluster",
+        router_id);
+    target_cluster_str = "primary";
+  }
+
+  if (target_cluster_str == "primary") {
+    target_cluster.target_type(
+        mysqlrouter::TargetCluster::TargetType::ByPrimaryRole);
+    target_cluster.target_value("");
+  } else {
+    target_cluster.target_type(mysqlrouter::TargetCluster::TargetType::ByUUID);
+    target_cluster.target_value(target_cluster_str);
+  }
+
+  return true;
+}
+
+static std::string get_limit_target_cluster_clause(
+    const mysqlrouter::TargetCluster &target_cluster,
+    mysqlrouter::MySQLSession &session) {
+  switch (target_cluster.target_type()) {
+    case mysqlrouter::TargetCluster::TargetType::ByUUID:
+      return "C.attributes->>'$.group_replication_group_name' = " +
+             session.quote(target_cluster.to_string());
+    case mysqlrouter::TargetCluster::TargetType::ByName:
+      return "C.cluster_name = " + session.quote(target_cluster.to_string());
+    default:
+      // case mysqlrouter::TargetCluster::TargetType::ByPrimaryRole:
+      return "CSM.member_role = 'PRIMARY'";
+  }
+}
+
+metadata_cache::cluster_nodes_list_t GRClusterSetMetadataBackend::
+    fetch_target_cluster_instances_from_metadata_server(
+        mysqlrouter::MySQLSession &session, const std::string &cluster_id) {
+  metadata_cache::cluster_nodes_list_t result;
+
+  std::string query =
+      "select I.mysql_server_uuid, I.endpoint, I.xendpoint, I.attributes from "
+      "mysql_innodb_cluster_metadata.v2_instances I join "
+      "mysql_innodb_cluster_metadata.v2_gr_clusters C on I.cluster_id = "
+      "C.cluster_id where C.cluster_id = " +
+      session.quote(cluster_id);
+
+  // example response
+  // clang-format off
+    // +--------------------------------------+----------------+-----------------+--------------------------------------------------------------------+
+    // | member_id                            | endpoint       | xendpoint       | attributes                                                         |
+    // +--------------------------------------+----------------+-----------------+--------------------------------------------------------------------+
+    // | dc46223b-d620-11e9-9f25-0800276c00e7 | 127.0.0.1:5000 | 127.0.0.1:50000 | {"tags": {"_hidden": true}, "joinTime": "2020-07-18 09:36:50.416"} |
+    // | f167ceb4-d620-11e9-9155-0800276c00e7 | 127.0.0.1:5001 | 127.0.0.1:50010 | {"joinTime": "2020-07-18 09:36:51.000"}                            |
+    // | 06c519c9-d621-11e9-9451-0800276c00e7 | 127.0.0.1:5002 | 127.0.0.1:50020 | {"joinTime": "2020-07-18 09:36:53.456"}                            |
+    // +--------------------------------------+----------------+-----------------+--------------------------------------------------------------------+
+  // clang-format on
+
+  auto result_processor = [&result](const MySQLSession::Row &row) -> bool {
+    if (row.size() != 4) {
+      throw metadata_cache::metadata_error(
+          "Unexpected number of fields in the resultset. "
+          "Expected = 4, got = " +
+          std::to_string(row.size()));
+    }
+
+    metadata_cache::ManagedInstance instance;
+    instance.mysql_server_uuid = get_string(row[0]);
+
+    if (!set_instance_ports(instance, row, 1, 2)) {
+      return true;  // next row
+    }
+
+    set_instance_attributes(instance, get_string(row[3]));
+
+    result.push_back(instance);
+    return true;  // get next row if available
+  };
+
+  assert(session.is_connected());
+
+  try {
+    session.query(query, result_processor);
+  } catch (const MySQLSession::Error &e) {
+    throw metadata_cache::metadata_error(e.what());
+  }
+
+  return result;
+}
+
+std::string
+GRClusterSetMetadataBackend::get_target_cluster_info_from_metadata_server(
+    mysqlrouter::MySQLSession &session,
+    mysqlrouter::TargetCluster &target_cluster,
+    const std::string &clusterset_id) {
+  std::string result;
+
+  std::string query =
+      "select C.cluster_id, C.cluster_name, CSM.invalidated, CSM.member_role "
+      "from mysql_innodb_cluster_metadata.v2_gr_clusters C join "
+      "mysql_innodb_cluster_metadata.v2_cs_members CSM on "
+      "CSM.cluster_id = C.cluster_id left join "
+      "mysql_innodb_cluster_metadata.v2_cs_clustersets CS on "
+      "CSM.clusterset_id = CS.clusterset_id where";
+
+  const std::string limit_target_cluster =
+      get_limit_target_cluster_clause(target_cluster, session);
+
+  query += " " + limit_target_cluster;
+
+  if (!clusterset_id.empty()) {
+    query += " and CS.clusterset_id = " + session.quote(clusterset_id);
+  }
+
+  auto result_processor =
+      [&result, &target_cluster](const MySQLSession::Row &row) -> bool {
+    if (row.size() != 4) {
+      throw metadata_cache::metadata_error(
+          "Unexpected number of fields in the resultset. "
+          "Expected = 4, got = " +
+          std::to_string(row.size()));
+    }
+
+    result = get_string(row[0]);
+
+    target_cluster.target_type(mysqlrouter::TargetCluster::TargetType::ByName);
+    target_cluster.target_value(get_string(row[1]));
+    target_cluster.is_primary(get_string(row[3]) == "PRIMARY");
+    target_cluster.is_invalidated(strtoui_checked(row[2]) == 1);
+
+    return false;
+  };
+
+  try {
+    session.query(query, result_processor);
+  } catch (const MySQLSession::Error &e) {
+    throw metadata_cache::metadata_error(e.what());
+  }
+
+  return result;
+}
+
+metadata_cache::metadata_servers_list_t
+GRClusterSetMetadataBackend::update_clusterset_topology_from_metadata_server(
+    mysqlrouter::MySQLSession &session, const std::string &clusterset_id) {
+  metadata_cache::metadata_servers_list_t result;
+  ClusterSetTopology clusterset_topology;
+
+  std::string query =
+      "select I.address, I.mysql_server_uuid, C.group_name, CSM.member_role "
+      "from mysql_innodb_cluster_metadata.v2_instances I join "
+      "mysql_innodb_cluster_metadata.v2_gr_clusters C on I.cluster_id = "
+      "C.cluster_id join mysql_innodb_cluster_metadata.v2_cs_members CSM on "
+      "CSM.cluster_id = C.cluster_id left join "
+      "mysql_innodb_cluster_metadata.v2_cs_clustersets CS on "
+      "CSM.clusterset_id = CS.clusterset_id";
+
+  if (!clusterset_id.empty()) {
+    query += " where CS.clusterset_id = " + session.quote(clusterset_id);
+  }
+
+  try {
+    session.query(query,
+                  [&clusterset_topology,
+                   &result](const std::vector<const char *> &row) -> bool {
+                    const std::string node_addr = get_string(row[0]);
+                    const std::string node_uuid = get_string(row[1]);
+                    const std::string cluster_id = get_string(row[2]);
+                    const std::string cluster_role = get_string(row[3]);
+
+                    mysqlrouter::URI uri("mysql://" + node_addr);
+
+                    clusterset_topology.clusters[cluster_id].is_primary =
+                        cluster_role == "PRIMARY";
+
+                    clusterset_topology.clusters[cluster_id].nodes.push_back(
+                        metadata_cache::ManagedInstance{
+                            node_uuid, metadata_cache::ServerMode::ReadOnly,
+                            uri.host, uri.port, 0});
+                    result.push_back({uri.host, uri.port});
+                    return true;
+                  });
+  } catch (const MySQLSession::Error &e) {
+    throw std::runtime_error(std::string("Error querying metadata: ") +
+                             e.what());
+  }
+  clusterset_topology.is_set = true;
+  clusterset_topology_ = std::move(clusterset_topology);
+
+  return result;
+}
+
+stdx::expected<metadata_cache::ClusterTopology, std::error_code>
+GRClusterSetMetadataBackend::fetch_cluster_topology(
+    MySQLSession::Transaction &transaction,
+    mysqlrouter::TargetCluster &target_cluster, const unsigned router_id,
+    const metadata_cache::metadata_server_t &metadata_server,
+    bool needs_writable_node, const std::string &group_name,
+    const std::string &clusterset_id) {
+  metadata_cache::ClusterTopology result;
+  auto connection = metadata_->get_connection();
+
+  std::string cs_id;
+  if (!clusterset_id.empty()) {
+    cs_id = clusterset_id;
+  } else {
+    const auto cluster_id_res = get_clusterset_id(*connection, group_name);
+    if (!cluster_id_res) {
+      log_warning(
+          "Failed fetching clusterset_id from the metadata server on %s:%d - "
+          "could not find Cluster with group name '%s' in the metadata",
+          metadata_server.address().c_str(), metadata_server.port(),
+          group_name.c_str());
+
+      return stdx::make_unexpected(cluster_id_res.error());
+    }
+    cs_id = cluster_id_res.value();
+  }
+
+  const auto view_id_res = get_member_view_id(*connection, cs_id);
+  if (!view_id_res) {
+    log_warning(
+        "Failed fetching view_id from the metadata server on %s:%d - "
+        "could not find ClusterSet with ID '%s' in the metadata",
+        metadata_server.address().c_str(), metadata_server.port(),
+        cs_id.c_str());
+    return stdx::make_unexpected(view_id_res.error());
+  }
+  const uint64_t view_id = view_id_res.value();
+
+  log_debug("Read view_id = %" PRIu64 ", current view_id = %" PRIu64
+            ", metadata_read=%s",
+            view_id, this->view_id_, metadata_read_ ? "yes" : "no");
+
+  if (view_id < this->view_id_) {
+    log_info("Metadata server %s:%d has outdated metadata view_id = %" PRIu64
+             ", current view_id = %" PRIu64 ", ignoring",
+             metadata_server.address().c_str(), metadata_server.port(), view_id,
+             this->view_id_);
+
+    return stdx::make_unexpected(
+        make_error_code(metadata_cache::metadata_errc::outdated_view_id));
+  }
+
+  if (view_id == this->view_id_ && metadata_read_) {
+    return stdx::make_unexpected(
+        make_error_code(metadata_cache::metadata_errc::outdated_view_id));
+  }
+
+  // check if router options did not change in the metadata
+  mysqlrouter::TargetCluster new_target_cluster;
+  if (!update_router_options_from_metadata(*connection, router_id,
+                                           new_target_cluster)) {
+    return stdx::make_unexpected(make_error_code(
+        metadata_cache::metadata_errc::no_metadata_read_successful));
+  }
+
+  if (new_target_cluster.options_string() != target_cluster.options_string()) {
+    log_info("New router options read from the metadata '%s', was '%s'",
+             new_target_cluster.options_string().c_str(),
+             target_cluster.options_string().c_str());
+  }
+
+  // get target_cluster info
+  const auto target_cluster_id = get_target_cluster_info_from_metadata_server(
+      *connection, new_target_cluster, cs_id);
+
+  const bool target_cluster_changed =
+      target_cluster.target_type() != new_target_cluster.target_type() ||
+      target_cluster.to_string() != new_target_cluster.to_string();
+
+  target_cluster = new_target_cluster;
+
+  if (target_cluster_id.empty()) {
+    log_error("Could not find target_cluster '%s' in the metadata",
+              target_cluster.c_str());
+    return stdx::make_unexpected(
+        make_error_code(metadata_cache::metadata_errc::cluster_not_found));
+  } else {
+    if (target_cluster_changed) {
+      log_info("New target cluster assigned in the metadata: '%s'",
+               target_cluster.c_str());
+    }
+  }
+
+  // if our target cluster is invalidated in the metadata our behavior is
+  // determined by the policy we read from the metadata
+  if (target_cluster.is_invalidated()) {
+    const auto policy = target_cluster.invalidated_cluster_routing_policy();
+
+    if (policy ==
+        mysqlrouter::TargetCluster::InvalidatedClusterRoutingPolicy::DropAll) {
+      log_warning(
+          "Target cluster '%s' invalidated in the metadata - blocking all "
+          "connections",
+          target_cluster.c_str());
+      return stdx::make_unexpected(make_error_code(
+          metadata_cache::metadata_errc::cluster_marked_as_invalid));
+    } else {
+      // mysqlrouter::TargetCluster::InvalidatedClusterRoutingPolicy::AcceptRO
+      log_warning(
+          "Target cluster %s invalidated in the metadata - accepting "
+          "only RO connections",
+          target_cluster.c_str());
+      // fall down
+    }
+  }
+
+  // query for the nodes of our target_cluster
+  result.cluster_data.members =
+      fetch_target_cluster_instances_from_metadata_server(*connection,
+                                                          target_cluster_id);
+  // update the metadata servers list
+  result.metadata_servers =
+      update_clusterset_topology_from_metadata_server(*connection, cs_id);
+  result.cluster_data.view_id = view_id;
+  result.cluster_data.single_primary_mode = true;
+
+  // we are done with querying metadata
+  transaction.commit();
+
+  // now connect to the cluster and query for the list and status of its
+  // members. (more precisely: search and connect to a
+  // member which is part of quorum to retrieve this data)
+  metadata_->update_cluster_status(
+      target_cluster,
+      result.cluster_data);  // throws metadata_cache::metadata_error
+
+  // here we change the mode of RW node(s) reported by the GR to RO if the
+  // Cluster is Replica or if our target cluster is invalidated
+  if (!target_cluster.is_primary() || target_cluster.is_invalidated()) {
+    for (auto &member : result.cluster_data.members) {
+      if (member.mode == metadata_cache::ServerMode::ReadWrite) {
+        member.mode = metadata_cache::ServerMode::ReadOnly;
+      }
+    }
+  }
+
+  if (needs_writable_node) {
+    if (target_cluster.is_primary()) {
+      // if our target cluster is PRIMARY we grab the writable node as with
+      // regular standalone Cluster
+      result.cluster_data.writable_server =
+          metadata_->find_rw_server(result.cluster_data.members);
+    } else {
+      // if our target cluster is NOT a PRIMARY we need to connect to the
+      // Primary Cluster and query its GR status to figure out the current
+      // Primary node
+      for (const auto &cluster : clusterset_topology_.clusters) {
+        if (cluster.second.is_primary) {
+          const auto cluster_uuid = cluster.first;
+          metadata_cache::ManagedCluster primary_cluster;
+          for (const auto &node : cluster.second.nodes) {
+            primary_cluster.members.push_back(
+                metadata_cache::ManagedInstance{node});
+          }
+
+          log_debug(
+              "Updating the status of cluster '%s' to find the writable node",
+              cluster_uuid.c_str());
+
+          metadata_->update_cluster_status(
+              {mysqlrouter::TargetCluster::TargetType::ByUUID, cluster_uuid},
+              primary_cluster);
+
+          result.cluster_data.writable_server =
+              metadata_->find_rw_server(primary_cluster.members);
+
+          break;
+        }
+      }
+    }
+  } else {
+    result.cluster_data.writable_server = stdx::make_unexpected(
+        make_error_code(metadata_cache::metadata_errc::no_rw_node_needed));
+  }
+
+  this->view_id_ = view_id;
+  this->metadata_read_ = true;
+  return result;
+}
diff -Nru mysql-8.0-8.0.26/router/src/metadata_cache/src/cluster_metadata_gr.h mysql-8.0-8.0.27/router/src/metadata_cache/src/cluster_metadata_gr.h
--- mysql-8.0-8.0.26/router/src/metadata_cache/src/cluster_metadata_gr.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/metadata_cache/src/cluster_metadata_gr.h	2021-09-28 11:46:34.000000000 +0000
@@ -35,25 +35,16 @@
  public:
   /** @brief Constructor
    *
-   * @param user The user name used to authenticate to the metadata server.
-   * @param password The password used to authenticate to the metadata server.
-   * @param connect_timeout The time after which trying to connect to the
-   *                        metadata server should timeout (in seconds).
-   * @param read_timeout The time after which read from metadata server should
-   *                     timeout (in seconds).
-   * @param connection_attempts The number of times a connection to metadata
-   *                            must be attempted, when a connection attempt
-   *                            fails.  NOTE: not used so far
+   * @param session_config Metadata MySQL session configuration
    * @param ssl_options SSL related options to use for MySQL connections
    * @param use_cluster_notifications Flag indicating if the metadata cache
    * should use cluster notifications as an additional trigger for metadata
    * refresh
    */
-  GRClusterMetadata(const std::string &user, const std::string &password,
-                    int connect_timeout, int read_timeout,
-                    int connection_attempts,
-                    const mysqlrouter::SSLOptions &ssl_options,
-                    const bool use_cluster_notifications = false);
+  GRClusterMetadata(
+      const metadata_cache::MetadataCacheMySQLSessionConfig &session_config,
+      const mysqlrouter::SSLOptions &ssl_options,
+      const bool use_cluster_notifications = false);
 
   explicit GRClusterMetadata(const GRClusterMetadata &) = delete;
   GRClusterMetadata &operator=(const GRClusterMetadata &) = delete;
@@ -64,46 +55,50 @@
    */
   ~GRClusterMetadata() override;
 
-  /** @brief Returns replicasets defined in the metadata server
+  /** @brief Returns cluster defined in the metadata given set of the
+   *         metadata servers (cluster members)
    *
-   * Returns relation as a std::map between replicaset name and object
-   * of the replicasets defined in the metadata and GR status tables.
-   *
-   * @param cluster_name                the name of the cluster to query
-   * @param cluster_type_specific_id    (GR ID for GR cluster, cluster_id for AR
-   * cluster)
-   * @return Map of replicaset ID, server list pairs.
-   * @throws metadata_cache::metadata_error, MetadataUpgradeInProgressException
-   */
-  ReplicaSetsByName fetch_instances(
-      const std::string &cluster_name,
-      const std::string &cluster_type_specific_id) override;
-
-  /** @brief Returns replicasets defined in the metadata server
-   *
-   * Only to satisfy the API, not used for the ReplicaSet Cluster
-   *
-   * @throws logic_error
-   */
-  ReplicaSetsByName fetch_instances(
-      const std::vector<metadata_cache::ManagedInstance> & /*instances*/,
-      const std::string & /*cluster_type_specific_id*/,
-      std::size_t & /*instance_id*/) override {
-    throw std::logic_error("Call to unexpected fetch_instances overload");
-  }
+   * @param terminated flag indicating that the process is cterminating,
+   * allowing the function to leave earlier if possible
+   * @param [in,out] target_cluster object identifying the Cluster this
+   * operation refers to
+   * @param router_id id of the router in the cluster metadata
+   * @param metadata_servers  set of the metadata servers to use to fetch the
+   * metadata
+   * @param needs_writable_node flag indicating if the caller needs us to query
+   * for writable node
+   * @param group_name Cluster Replication Group name (if bootstrapped as a
+   * single Cluster)
+   * @param clusterset_id UUID of the ClusterSet the Cluster belongs to (if
+   * bootstrapped as a ClusterSet)
+   * @param [out] instance_id of the server the metadata was fetched from
+   * @return object containing cluster topology information in case of success,
+   * or error code in case of failure
+   * @throws metadata_cache::metadata_error
+   */
+  stdx::expected<metadata_cache::ClusterTopology, std::error_code>
+  fetch_cluster_topology(
+      const std::atomic<bool> &terminated,
+      mysqlrouter::TargetCluster &target_cluster, const unsigned router_id,
+      const metadata_cache::metadata_servers_list_t &metadata_servers,
+      bool needs_writable_node, const std::string &group_name,
+      const std::string &clusterset_id, std::size_t &instance_id) override;
 
   /** @brief Initializes the notifications listener thread (if a given cluster
    * type supports it)
    *
    * @param instances vector of the current cluster nodes
+   * @param target_cluster object identifying the Cluster this operation refers
+   * to
    * @param callback  callback function to get called when the GR notification
    *                  was received
    */
   void setup_notifications_listener(
       const std::vector<metadata_cache::ManagedInstance> &instances,
+      const mysqlrouter::TargetCluster &target_cluster,
       const GRNotificationListener::NotificationClb &callback) override {
     if (gr_notifications_listener_)
-      gr_notifications_listener_->setup(instances, callback);
+      gr_notifications_listener_->setup(instances, target_cluster, callback);
   }
 
   /** @brief Deinitializes the notifications listener thread
@@ -122,36 +117,41 @@
    * method fetches the following information: username, password hash,
    * privileges and name of the authentication mechanism that should be used.
    *
-   * @param cluster_name - name of the cluster
+   * @param target_cluster information about the Cluster that this information
+   * is retrieved for
+   * @param cluster_type_specific_id additional information about the Cluster
+   * that this information is retrieved for (clusterset_id in case of
+   * clusterset)
    *
    * @returns authentication data of the rest users stored in the metadata
    */
   auth_credentials_t fetch_auth_credentials(
-      const std::string &cluster_name) override;
+      const mysqlrouter::TargetCluster &target_cluster,
+      const std::string &cluster_type_specific_id) override;
 
  protected:
-  /** @brief Queries the metadata server for the list of instances and
-   * replicasets that belong to the desired cluster.
+  /** @brief Queries the metadata server for the list of instances that belong
+   * to the desired cluster.
    */
-  ReplicaSetsByName fetch_instances_from_metadata_server(
-      const std::string &cluster_name,
+  metadata_cache::ManagedCluster fetch_instances_from_metadata_server(
+      const mysqlrouter::TargetCluster &target_cluster,
       const std::string &cluster_type_specific_id);
 
   /** Query the GR performance_schema tables for live information about a
    * cluster.
    *
-   * update_replicaset_status() calls check_replicaset_status() for some of its
+   * update_cluster_status() calls check_cluster_status() for some of its
    * processing. Together, they:
-   * - check current topology (status) returned from a replicaset node
+   * - check current topology (status) returned from a cluster node
    * - update 'instances' with this state
-   * - get other metadata about the replicaset
+   * - get other metadata about the cluster
    *
    * The information is pulled from GR maintained performance_schema tables.
    */
-  void update_replicaset_status(const std::string &name,
-                                metadata_cache::ManagedReplicaSet &replicaset);
+  void update_cluster_status(const mysqlrouter::TargetCluster &target_cluster,
+                             metadata_cache::ManagedCluster &cluster);
 
-  metadata_cache::ReplicasetStatus check_replicaset_status(
+  metadata_cache::ClusterStatus check_cluster_status(
       std::vector<metadata_cache::ManagedInstance> &instances,
       const std::map<std::string, GroupReplicationMember> &member_status,
       bool &metadata_gr_discrepancy) const noexcept;
@@ -160,36 +160,38 @@
   std::unique_ptr<GRMetadataBackend> metadata_backend_;
 
  private:
-  void update_backend(const mysqlrouter::MetadataSchemaVersion &version);
+  void update_backend(const mysqlrouter::MetadataSchemaVersion &version,
+                      unsigned int router_id);
 
   std::unique_ptr<GRNotificationListener> gr_notifications_listener_;
 
+  friend class GRMetadataBackend;
+  friend class GRClusterSetMetadataBackend;
+
 #ifdef FRIEND_TEST
   FRIEND_TEST(MetadataTest, FetchInstancesFromMetadataServer);
   FRIEND_TEST(MetadataTest,
-              UpdateReplicasetStatus_PrimaryMember_FailConnectOnNode2);
-  FRIEND_TEST(MetadataTest,
-              UpdateReplicasetStatus_PrimaryMember_FailConnectOnAllNodes);
+              UpdateClusterStatus_PrimaryMember_FailConnectOnNode2);
   FRIEND_TEST(MetadataTest,
-              UpdateReplicasetStatus_PrimaryMember_FailQueryOnNode1);
+              UpdateClusterStatus_PrimaryMember_FailConnectOnAllNodes);
+  FRIEND_TEST(MetadataTest, UpdateClusterStatus_PrimaryMember_FailQueryOnNode1);
   FRIEND_TEST(MetadataTest,
-              UpdateReplicasetStatus_PrimaryMember_FailQueryOnAllNodes);
-  FRIEND_TEST(MetadataTest, UpdateReplicasetStatus_Status_FailQueryOnNode1);
-  FRIEND_TEST(MetadataTest, UpdateReplicasetStatus_Status_FailQueryOnAllNodes);
+              UpdateClusterStatus_PrimaryMember_FailQueryOnAllNodes);
+  FRIEND_TEST(MetadataTest, UpdateClusterStatus_Status_FailQueryOnNode1);
+  FRIEND_TEST(MetadataTest, UpdateClusterStatus_Status_FailQueryOnAllNodes);
+  FRIEND_TEST(MetadataTest, UpdateClusterStatus_SimpleSunnyDayScenario);
   FRIEND_TEST(MetadataTest, CheckClusterStatus_1Online1RecoveringNotInMetadata);
-  FRIEND_TEST(MetadataTest, UpdateReplicasetStatus_SimpleSunnyDayScenario);
-  FRIEND_TEST(MetadataTest, CheckReplicasetStatus_3NodeSetup);
-  FRIEND_TEST(MetadataTest, CheckReplicasetStatus_VariableNodeSetup);
-  FRIEND_TEST(MetadataTest, CheckReplicasetStatus_VariousStatuses);
-  FRIEND_TEST(MetadataTest, UpdateReplicasetStatus_PrimaryMember_EmptyOnNode1);
-  FRIEND_TEST(MetadataTest,
-              UpdateReplicasetStatus_PrimaryMember_EmptyOnAllNodes);
-  FRIEND_TEST(MetadataTest, CheckReplicasetStatus_Recovering);
-  FRIEND_TEST(MetadataTest, CheckReplicasetStatus_ErrorAndOther);
-  FRIEND_TEST(MetadataTest, CheckReplicasetStatus_Cornercase2of5Alive);
-  FRIEND_TEST(MetadataTest, CheckReplicasetStatus_Cornercase3of5Alive);
-  FRIEND_TEST(MetadataTest, CheckReplicasetStatus_Cornercase1Common);
+  FRIEND_TEST(MetadataTest, CheckClusterStatus_3NodeSetup);
+  FRIEND_TEST(MetadataTest, CheckClusterStatus_VariableNodeSetup);
+  FRIEND_TEST(MetadataTest, CheckClusterStatus_VariousStatuses);
+  FRIEND_TEST(MetadataTest, UpdateClusterStatus_PrimaryMember_EmptyOnNode1);
+  FRIEND_TEST(MetadataTest, UpdateClusterStatus_PrimaryMember_EmptyOnAllNodes);
+  FRIEND_TEST(MetadataTest, CheckClusterStatus_Recovering);
+  FRIEND_TEST(MetadataTest, CheckClusterStatus_ErrorAndOther);
+  FRIEND_TEST(MetadataTest, CheckClusterStatus_Cornercase2of5Alive);
+  FRIEND_TEST(MetadataTest, CheckClusterStatus_Cornercase3of5Alive);
+  FRIEND_TEST(MetadataTest, CheckClusterStatus_Cornercase1Common);
 #endif
 };
 
-#endif  // METADATA_CACHE_CLUSTER_METADATA_AR_INCLUDED
+#endif  // METADATA_CACHE_CLUSTER_METADATA_GR_INCLUDED
diff -Nru mysql-8.0-8.0.26/router/src/metadata_cache/src/cluster_metadata.h mysql-8.0-8.0.27/router/src/metadata_cache/src/cluster_metadata.h
--- mysql-8.0-8.0.26/router/src/metadata_cache/src/cluster_metadata.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/metadata_cache/src/cluster_metadata.h	2021-09-28 11:46:34.000000000 +0000
@@ -61,21 +61,12 @@
  public:
   /** @brief Constructor
    *
-   * @param user The user name used to authenticate to the metadata server.
-   * @param password The password used to authenticate to the metadata server.
-   * @param connect_timeout The time after which trying to connect to the
-   *                        metadata server should timeout (in seconds).
-   * @param read_timeout The time after which read from metadata server should
-   *                     timeout (in seconds).
-   * @param connection_attempts The number of times a connection to metadata
-   *                            must be attempted, when a connection attempt
-   *                            fails.  NOTE: not used so far
+   * @param session_config Metadata MySQL session configuration
    * @param ssl_options SSL related options to use for MySQL connections)
    */
-  ClusterMetadata(const std::string &user, const std::string &password,
-                  int connect_timeout, int read_timeout,
-                  int connection_attempts,
-                  const mysqlrouter::SSLOptions &ssl_options);
+  ClusterMetadata(
+      const metadata_cache::MetadataCacheMySQLSessionConfig &session_config,
+      const mysqlrouter::SSLOptions &ssl_options);
 
   // disable copy as it isn't needed right now. Feel free to enable
   // must be explicitly defined though.
@@ -98,8 +89,8 @@
    * @return a boolean to indicate if the connection and session parameters
    * setup was successful.
    */
-  bool connect_and_setup_session(
-      const metadata_cache::ManagedInstance &metadata_server) noexcept override;
+  bool connect_and_setup_session(const metadata_cache::metadata_server_t
+                                     &metadata_server) noexcept override;
 
   /** @brief Disconnects from the Metadata server
    *
@@ -114,46 +105,38 @@
     return metadata_connection_;
   }
 
-  bool update_router_version(const metadata_cache::ManagedInstance &rw_instance,
-                             const unsigned router_id) override;
+  bool update_router_attributes(
+      const metadata_cache::metadata_server_t &rw_server,
+      const unsigned router_id,
+      const metadata_cache::RouterAttributes &router_attributes) override;
 
   bool update_router_last_check_in(
-      const metadata_cache::ManagedInstance &rw_instance,
+      const metadata_cache::metadata_server_t &rw_server,
       const unsigned router_id) override;
 
   auth_credentials_t fetch_auth_credentials(
-      const std::string &cluster_name) override;
+      const mysqlrouter::TargetCluster &target_cluster,
+      const std::string &cluster_type_specific_id) override;
+
+  stdx::expected<metadata_cache::metadata_server_t, std::error_code>
+  find_rw_server(const std::vector<metadata_cache::ManagedInstance> &instances);
 
  protected:
   /** Connects a MYSQL connection to the given instance
    */
   bool do_connect(mysqlrouter::MySQLSession &connection,
-                  const metadata_cache::ManagedInstance &mi);
+                  const metadata_cache::metadata_server_t &mi);
 
   // throws metadata_cache::metadata_error and
   // MetadataUpgradeInProgressException
   mysqlrouter::MetadataSchemaVersion get_and_check_metadata_schema_version(
       mysqlrouter::MySQLSession &session);
 
-  // Metadata node connection information
-  std::string user_;
-  std::string password_;
-
   // Metadata node generic information
   mysql_ssl_mode ssl_mode_;
   mysqlrouter::SSLOptions ssl_options_;
 
-  std::string cluster_name_;
-#if 0  // not used so far
-  std::string metadata_uuid_;
-  std::string message_;
-#endif
-
-  // The time after which trying to connect to the metadata server should
-  // timeout.
-  int connect_timeout_;
-  // The time after which read from metadata server should timeout.
-  int read_timeout_;
+  metadata_cache::MetadataCacheMySQLSessionConfig session_config_;
 
 #if 0  // not used so far
   // The number of times we should try connecting to the metadata server if a
diff -Nru mysql-8.0-8.0.26/router/src/metadata_cache/src/gr_notifications_listener.cc mysql-8.0-8.0.27/router/src/metadata_cache/src/gr_notifications_listener.cc
--- mysql-8.0-8.0.26/router/src/metadata_cache/src/gr_notifications_listener.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/metadata_cache/src/gr_notifications_listener.cc	2021-09-28 11:46:34.000000000 +0000
@@ -85,8 +85,7 @@
 using namespace std::chrono_literals;
 
 struct GRNotificationListener::Impl {
-  std::string user_name;
-  std::string password;
+  mysqlrouter::UserCredentials user_credentials;
 
   std::map<NodeId, NodeSession> sessions_;
   bool sessions_changed_{false};
@@ -100,8 +99,8 @@
   std::chrono::steady_clock::time_point last_ping_timepoint =
       std::chrono::steady_clock::now();
 
-  Impl(const std::string &auth_user_name, const std::string &auth_password)
-      : user_name(auth_user_name), password(auth_password) {}
+  Impl(const mysqlrouter::UserCredentials &auth_user_credentials)
+      : user_credentials(auth_user_credentials) {}
 
   ~Impl();
 
@@ -109,8 +108,9 @@
   void listener_thread_func();
   bool read_from_session(const NodeId &node_id, NodeSession &session);
 
-  xcl::XError enable_notices(xcl::XSession &session,
-                             const NodeId &node_id) noexcept;
+  xcl::XError enable_notices(
+      xcl::XSession &session, const NodeId &node_id,
+      const mysqlrouter::TargetCluster &target_cluster) noexcept;
   void set_mysqlx_wait_timeout(xcl::XSession &session,
                                const NodeId &node_id) noexcept;
   void check_mysqlx_wait_timeout();
@@ -119,6 +119,7 @@
 
   void reconfigure(
       const std::vector<metadata_cache::ManagedInstance> &instances,
+      const mysqlrouter::TargetCluster &target_cluster,
       const NotificationClb &notification_clb);
 
   // handles the notice from the session
@@ -180,8 +181,9 @@
 
   log_debug("Connecting GR Notices listener on %s:%d", node_id.host.c_str(),
             node_id.port);
-  err = session->connect(node_id.host.c_str(), node_id.port, user_name.c_str(),
-                         password.c_str(), "");
+  err = session->connect(node_id.host.c_str(), node_id.port,
+                         user_credentials.username.c_str(),
+                         user_credentials.password.c_str(), "");
   if (err) {
     log_warning(
         "Failed connecting GR Notices listener on %s:%d; (err_code=%d; "
@@ -391,8 +393,10 @@
  * - state_changed
  */
 xcl::XError GRNotificationListener::Impl::enable_notices(
-    xcl::XSession &session, const NodeId &node_id) noexcept {
-  log_info("Enabling notices for cluster changes");
+    xcl::XSession &session, const NodeId &node_id,
+    const mysqlrouter::TargetCluster &target_cluster) noexcept {
+  log_info("Enabling GR notices for cluster '%s' changes on node %s:%u",
+           target_cluster.c_str(), node_id.host.c_str(), node_id.port);
   xcl::XError err;
 
   xcl::Argument_value::Object arg_obj;
@@ -413,16 +417,17 @@
                                           {xcl::Argument_value(arg_obj)}, &err);
 
   if (!err) {
-    log_debug("Enabled notices for cluster changes on connection to node %s:%d",
-              node_id.host.c_str(), node_id.port);
+    log_debug(
+        "Enabled GR notices for cluster changes on connection to node %s:%d",
+        node_id.host.c_str(), node_id.port);
   } else if (err.error() == ER_X_BAD_NOTICE) {
     log_warning(
-        "Failed enabling notices on the node %s:%d. This MySQL server "
+        "Failed enabling GR notices on the node %s:%d. This MySQL server "
         "version does not support GR notifications (err_code=%d; err_msg='%s')",
         node_id.host.c_str(), node_id.port, err.error(), err.what());
   } else {
     log_warning(
-        "Failed enabling notices on the node %s:%d; (err_code=%d; "
+        "Failed enabling GR notices on the node %s:%d; (err_code=%d; "
         "err_msg='%s')",
         node_id.host.c_str(), node_id.port, err.error(), err.what());
   }
@@ -463,6 +468,7 @@
 
 void GRNotificationListener::Impl::reconfigure(
     const std::vector<metadata_cache::ManagedInstance> &instances,
+    const mysqlrouter::TargetCluster &target_cluster,
     const NotificationClb &notification_clb) {
   std::lock_guard<std::mutex> lock(configuration_data_mtx_);
 
@@ -500,7 +506,7 @@
 
       set_mysqlx_wait_timeout(*session, node_id);
 
-      if (enable_notices(*session, node_id)) continue;
+      if (enable_notices(*session, node_id, target_cluster)) continue;
 
       session->get_protocol().add_notice_handler(
           [this](const xcl::XProtocol *protocol, const bool is_global,
@@ -519,14 +525,15 @@
         new std::thread([this]() { listener_thread_func(); }));
 }
 
-GRNotificationListener::GRNotificationListener(const std::string &user_name,
-                                               const std::string &password)
-    : impl_(new Impl(user_name, password)) {}
+GRNotificationListener::GRNotificationListener(
+    const mysqlrouter::UserCredentials &user_credentials)
+    : impl_(new Impl(user_credentials)) {}
 
 GRNotificationListener::~GRNotificationListener() = default;
 
 void GRNotificationListener::setup(
     const std::vector<metadata_cache::ManagedInstance> &instances,
+    const mysqlrouter::TargetCluster &target_cluster,
     const NotificationClb &notification_clb) {
-  impl_->reconfigure(instances, notification_clb);
+  impl_->reconfigure(instances, target_cluster, notification_clb);
 }
diff -Nru mysql-8.0-8.0.26/router/src/metadata_cache/src/gr_notifications_listener.h mysql-8.0-8.0.27/router/src/metadata_cache/src/gr_notifications_listener.h
--- mysql-8.0-8.0.26/router/src/metadata_cache/src/gr_notifications_listener.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/metadata_cache/src/gr_notifications_listener.h	2021-09-28 11:46:34.000000000 +0000
@@ -33,8 +33,7 @@
 
 class GRNotificationListener {
  public:
-  GRNotificationListener(const std::string &user_name,
-                         const std::string &password);
+  GRNotificationListener(const mysqlrouter::UserCredentials &user_credentials);
 
   ~GRNotificationListener();
   GRNotificationListener(GRNotificationListener &) = delete;
@@ -43,6 +42,7 @@
   using NotificationClb = std::function<void()>;
 
   void setup(const std::vector<metadata_cache::ManagedInstance> &instances,
+             const mysqlrouter::TargetCluster &target_cluster,
              const NotificationClb &notification_clb);
 
  private:
diff -Nru mysql-8.0-8.0.26/router/src/metadata_cache/src/metadata_cache_ar.cc mysql-8.0-8.0.27/router/src/metadata_cache/src/metadata_cache_ar.cc
--- mysql-8.0-8.0.26/router/src/metadata_cache/src/metadata_cache_ar.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/metadata_cache/src/metadata_cache_ar.cc	2021-09-28 11:46:34.000000000 +0000
@@ -28,72 +28,72 @@
 
 IMPORT_LOG_FUNCTIONS()
 
-bool ARMetadataCache::refresh() {
+bool ARMetadataCache::refresh(bool needs_writable_node) {
   bool changed{false};
-  bool fetched{false};
-  unsigned view_id{0};
+  uint64_t view_id{0};
 
   size_t metadata_server_id;
-  auto replicaset_data_temp = meta_data_->fetch_instances(
-      metadata_servers_, cluster_type_specific_id_, metadata_server_id);
+  const auto res = meta_data_->fetch_cluster_topology(
+      terminated_, target_cluster_, router_id_, metadata_servers_,
+      needs_writable_node, cluster_type_specific_id_, "", metadata_server_id);
+
+  if (!res) {
+    const bool md_servers_reachable =
+        res.error() !=
+            metadata_cache::metadata_errc::no_metadata_server_reached &&
+        res.error() !=
+            metadata_cache::metadata_errc::no_metadata_read_successful;
+
+    on_refresh_failed(terminated_, md_servers_reachable);
+    return false;
+  }
+
+  const auto cluster_topology = res.value();
 
   {
     // Ensure that the refresh does not result in an inconsistency during the
     // lookup.
     std::lock_guard<std::mutex> lock(cache_refreshing_mutex_);
-    fetched = !replicaset_data_temp.empty();
-    if (fetched && (replicaset_data_ != replicaset_data_temp)) {
-      replicaset_data_ = replicaset_data_temp;
+    if (cluster_data_ != cluster_topology.cluster_data) {
+      cluster_data_ = cluster_topology.cluster_data;
       changed = true;
+    } else {
+      cluster_data_.writable_server =
+          cluster_topology.cluster_data.writable_server;
     }
   }
 
-  if (!fetched) {
-    on_refresh_failed(/*broke_loop=*/false);
-    return false;
-  }
-
   if (changed) {
     log_info(
         "Potential changes detected in cluster '%s' after metadata refresh",
-        cluster_name_.c_str());
+        target_cluster_.c_str());
     // dump some debugging info about the cluster
-    if (replicaset_data_.empty())
-      log_error("Metadata for cluster '%s' is empty!", cluster_name_.c_str());
+    if (cluster_data_.empty())
+      log_error("Metadata for cluster '%s' is empty!", target_cluster_.c_str());
     else {
-      // there is only one replicaset
-      auto &cluster_data = replicaset_data_["default"];
-      view_id = cluster_data.view_id;
-      log_info("view_id = %u, (%i members)", view_id,
-               (int)cluster_data.members.size());
-      for (auto &mi : cluster_data.members) {
+      view_id = cluster_data_.view_id;
+      log_info("view_id = %" PRIu64 ", (%i members)", view_id,
+               (int)cluster_data_.members.size());
+      for (auto &mi : cluster_data_.members) {
         log_info("    %s:%i / %i - mode=%s %s", mi.host.c_str(), mi.port,
                  mi.xport, to_string(mi.mode).c_str(),
                  get_hidden_info(mi).c_str());
 
         if (mi.mode == metadata_cache::ServerMode::ReadWrite) {
-          std::lock_guard<std::mutex> lock(
-              replicasets_with_unreachable_nodes_mtx_);
-          auto rs_with_unreachable_node =
-              replicasets_with_unreachable_nodes_.find("default");
-          if (rs_with_unreachable_node !=
-              replicasets_with_unreachable_nodes_.end()) {
-            // disable "emergency mode" for this replicaset
-            replicasets_with_unreachable_nodes_.erase(rs_with_unreachable_node);
-          }
+          has_unreachable_nodes = false;
         }
       }
     }
 
-    on_instances_changed(/*md_servers_reachable=*/true, view_id);
+    on_instances_changed(/*md_servers_reachable=*/true, cluster_data_.members,
+                         cluster_topology.metadata_servers, view_id);
+
+    on_refresh_succeeded(metadata_servers_[metadata_server_id]);
 
-    auto metadata_servers_tmp =
-        replicaset_lookup(/*cluster_name_ (all clusters)*/ "");
     // never let the list that we iterate over become empty as we would
     // not recover from that
-    on_refresh_succeeded(metadata_servers_[metadata_server_id]);
-    if (!metadata_servers_tmp.empty()) {
-      metadata_servers_ = std::move(metadata_servers_tmp);
+    if (!cluster_topology.metadata_servers.empty()) {
+      metadata_servers_ = std::move(cluster_topology.metadata_servers);
     }
   } else if (trigger_acceptor_update_on_next_refresh_) {
     // Instances information has not changed, but we failed to start listening
diff -Nru mysql-8.0-8.0.26/router/src/metadata_cache/src/metadata_cache_ar.h mysql-8.0-8.0.27/router/src/metadata_cache/src/metadata_cache_ar.h
--- mysql-8.0-8.0.26/router/src/metadata_cache/src/metadata_cache_ar.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/metadata_cache/src/metadata_cache_ar.h	2021-09-28 11:46:34.000000000 +0000
@@ -33,32 +33,30 @@
    * Initialize a connection to the MySQL Metadata server.
    *
    * @param router_id id of the router in the cluster metadata
-   * @param cluster_id id of the replication group
+   * @param cluster_specific_type_id id of the replication group
    * @param metadata_servers The servers that store the metadata
    * @param cluster_metadata metadata of the cluster
-   * @param ttl The TTL of the cached data
-   * @param auth_credentials_ttl TTL of the rest user authentication data
-   * @param auth_credentials_refresh_rate Refresh rate of the rest user
-   *                                      authentication data
+   * @param ttl_config metadata TTL configuration
    * @param ssl_options SSL related options for connection
-   * @param cluster_name The name of the desired cluster in the metadata server
+   * @param target_cluster object identifying the Cluster this operation refers
+   * to
+   * @param router_attributes Router attributes to be registered in the metadata
    * @param thread_stack_size The maximum memory allocated for thread's stack
    */
   ARMetadataCache(
-      const unsigned router_id, const std::string &cluster_id,
+      const unsigned router_id, const std::string &cluster_specific_type_id,
       const std::vector<mysql_harness::TCPAddress> &metadata_servers,
       std::shared_ptr<MetaData> cluster_metadata,
-      const std::chrono::milliseconds ttl,
-      const std::chrono::milliseconds auth_credentials_ttl,
-      const std::chrono::milliseconds auth_credentials_refresh_rate,
+      const metadata_cache::MetadataCacheTTLConfig &ttl_config,
       const mysqlrouter::SSLOptions &ssl_options,
-      const std::string &cluster_name,
+      const mysqlrouter::TargetCluster &target_cluster,
+      const metadata_cache::RouterAttributes &router_attributes,
       size_t thread_stack_size = mysql_harness::kDefaultStackSizeInKiloBytes)
-      : MetadataCache(router_id, cluster_id, metadata_servers, cluster_metadata,
-                      ttl, auth_credentials_ttl, auth_credentials_refresh_rate,
-                      ssl_options, cluster_name, thread_stack_size, false) {}
+      : MetadataCache(router_id, cluster_specific_type_id, "", metadata_servers,
+                      cluster_metadata, ttl_config, ssl_options, target_cluster,
+                      router_attributes, thread_stack_size, false) {}
 
-  bool refresh() override;
+  bool refresh(bool needs_writable_node) override;
 
   mysqlrouter::ClusterType cluster_type() const noexcept override {
     return mysqlrouter::ClusterType::RS_V2;
diff -Nru mysql-8.0-8.0.26/router/src/metadata_cache/src/metadata_cache.cc mysql-8.0-8.0.27/router/src/metadata_cache/src/metadata_cache.cc
--- mysql-8.0-8.0.26/router/src/metadata_cache/src/metadata_cache.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/metadata_cache/src/metadata_cache.cc	2021-09-28 11:46:34.000000000 +0000
@@ -31,33 +31,38 @@
 #include <vector>
 
 #include "common.h"
+#include "mysql/harness/event_state_tracker.h"
 #include "mysql/harness/logging/logging.h"
 #include "mysql/harness/plugin.h"
 #include "mysqlrouter/mysql_client_thread_token.h"
 
 using namespace std::chrono_literals;
 using namespace std::string_literals;
+using mysql_harness::EventStateTracker;
+using mysql_harness::logging::LogLevel;
 
 IMPORT_LOG_FUNCTIONS()
 
 MetadataCache::MetadataCache(
-    const unsigned router_id, const std::string &cluster_type_specifig_id,
+    const unsigned router_id, const std::string &cluster_type_specific_id,
+    const std::string &clusterset_id,
     const std::vector<mysql_harness::TCPAddress> &metadata_servers,
-    std::shared_ptr<MetaData> cluster_metadata, std::chrono::milliseconds ttl,
-    const std::chrono::milliseconds auth_cache_ttl,
-    const std::chrono::milliseconds auth_cache_refresh_interval,
-    const mysqlrouter::SSLOptions &ssl_options, const std::string &cluster,
+    std::shared_ptr<MetaData> cluster_metadata,
+    const metadata_cache::MetadataCacheTTLConfig &ttl_config,
+    const mysqlrouter::SSLOptions &ssl_options,
+    const mysqlrouter::TargetCluster &target_cluster,
+    const metadata_cache::RouterAttributes &router_attributes,
     size_t thread_stack_size, bool use_cluster_notifications)
-    : cluster_name_(cluster),
-      cluster_type_specific_id_(cluster_type_specifig_id),
-      ttl_(ttl),
-      auth_cache_ttl_(auth_cache_ttl),
-      auth_cache_refresh_interval_(auth_cache_refresh_interval),
+    : target_cluster_(target_cluster),
+      cluster_type_specific_id_(cluster_type_specific_id),
+      clusterset_id_(clusterset_id),
+      ttl_config_(ttl_config),
       ssl_options_(ssl_options),
       router_id_(router_id),
       meta_data_(std::move(cluster_metadata)),
       refresh_thread_(thread_stack_size),
-      use_cluster_notifications_(use_cluster_notifications) {
+      use_cluster_notifications_(use_cluster_notifications),
+      router_attributes_(router_attributes) {
   for (const auto &s : metadata_servers) {
     metadata_servers_.emplace_back(s);
   }
@@ -76,21 +81,6 @@
   return nullptr;
 }
 
-// finds first rw instance in the instances vector,
-// if not found returns false
-static bool find_rw_instance(
-    const std::vector<metadata_cache::ManagedInstance> &instances,
-    const metadata_cache::ManagedInstance **res_instance) {
-  for (auto &instance : instances) {
-    if (instance.mode == metadata_cache::ServerMode::ReadWrite) {
-      *res_instance = &instance;
-      return true;
-    }
-  }
-
-  return false;
-}
-
 void MetadataCache::refresh_thread() {
   mysql_harness::rename_thread("MDC Refresh");
   log_info("Starting metadata cache refresh thread");
@@ -100,15 +90,17 @@
   const std::chrono::milliseconds kTerminateOrForcedRefreshCheckInterval =
       std::chrono::seconds(1);
 
-  auto auth_cache_ttl_left = auth_cache_refresh_interval_;
+  auto auth_cache_ttl_left = ttl_config_.auth_cache_refresh_interval;
   bool auth_cache_force_update = true;
   while (!terminated_) {
     bool refresh_ok{false};
+    const bool needs_writable_node =
+        !version_updated_ || last_check_in_updated_ % 10 == 0;
     try {
       // Component tests are using this log message as a indicator of metadata
       // refresh start
       log_debug("Started refreshing the cluster metadata");
-      refresh_ok = refresh();
+      refresh_ok = refresh(needs_writable_node);
       // Component tests are using this log message as a indicator of metadata
       // refresh finish
       log_debug("Finished refreshing the cluster metadata");
@@ -128,24 +120,9 @@
             "metadata_cache:" +
             metadata_cache::MetadataCacheAPI::instance()->instance_name());
       }
-      // we want to update the router version in the routers table once
-      // when we start
-      if (!version_updated_) {
-        if (!replicaset_data_.empty()) {
-          const auto &instances = replicaset_data_.begin()->second.members;
-          const metadata_cache::ManagedInstance *rw_instance;
-          if (find_rw_instance(instances, &rw_instance)) {
-            try {
-              meta_data_->update_router_version(*rw_instance, router_id_);
-              version_updated_ = true;
-            } catch (const mysqlrouter::MetadataUpgradeInProgressException &) {
-            } catch (...) {
-              // we only attempt it once, if it fails we will not try again
-              version_updated_ = true;
-            }
-          }
-        }
-      }
+      // we want to update router attributes in the routers table once when we
+      // start
+      update_router_attributes();
 
       if (auth_cache_force_update) {
         update_auth_cache();
@@ -153,25 +130,11 @@
       }
 
       // we want to update the router.last_check_in every 10 ttl queries
-      if (last_check_in_updated_ % 10 == 0) {
-        last_check_in_updated_ = 0;
-        if (!replicaset_data_.empty()) {
-          const auto &instances = replicaset_data_.begin()->second.members;
-          const metadata_cache::ManagedInstance *rw_instance;
-          if (find_rw_instance(instances, &rw_instance)) {
-            try {
-              meta_data_->update_router_last_check_in(*rw_instance, router_id_);
-            } catch (const mysqlrouter::MetadataUpgradeInProgressException &) {
-            } catch (...) {
-            }
-          }
-        }
-      }
-      ++last_check_in_updated_;
+      update_router_last_check_in();
     }
 
-    auto ttl_left = ttl_;
-    // wait for up to TTL until next refresh, unless some replicaset loses an
+    auto ttl_left = ttl_config_.ttl;
+    // wait for up to TTL until next refresh, unless cluster loses an
     // online (primary or secondary) server - in that case, "emergency mode" is
     // enabled and we refresh every 1s until "emergency mode" is called off.
     while (ttl_left > 0ms) {
@@ -194,7 +157,7 @@
           ttl_left -= auth_cache_ttl_left;
           auto start_timestamp = std::chrono::steady_clock::now();
           if (refresh_ok && update_auth_cache())
-            auth_cache_ttl_left = auth_cache_refresh_interval_;
+            auth_cache_ttl_left = ttl_config_.auth_cache_refresh_interval;
           auto end_timestamp = std::chrono::steady_clock::now();
           auto time_spent =
               std::chrono::duration_cast<std::chrono::milliseconds>(
@@ -214,16 +177,12 @@
       }
 
       {
-        std::lock_guard<std::mutex> lock(
-            replicasets_with_unreachable_nodes_mtx_);
-
-        if (!replicasets_with_unreachable_nodes_.empty())
+        if (has_unreachable_nodes)
           break;  // we're in "emergency mode", don't wait until TTL expires
 
         // if the metadata is not consistent refresh it at a higher rate (if the
         // ttl>1s) until it becomes consistent again
-        if ((!replicaset_data_.empty()) &&
-            replicaset_data_.begin()->second.md_discrepancy) {
+        if (cluster_data_.md_discrepancy) {
           break;
         }
       }
@@ -255,25 +214,19 @@
   refresh_thread_.join();
 }
 
-MetadataCache::metadata_servers_list_t MetadataCache::replicaset_lookup(
-    const std::string &replicaset_name) {
+/**
+ * Return a list of servers that are part of a cluster.
+ *
+ * TODO: this is not needed, get rid of this API
+ */
+metadata_cache::cluster_nodes_list_t MetadataCache::get_cluster_nodes() {
   std::lock_guard<std::mutex> lock(cache_refreshing_mutex_);
-  auto replicaset = (replicaset_name.empty())
-                        ? replicaset_data_.begin()
-                        : replicaset_data_.find(replicaset_name);
-
-  if (replicaset == replicaset_data_.end()) {
-    log_warning("Replicaset '%s' not available", replicaset_name.c_str());
-    return {};
-  }
-
-  return replicaset->second.members;
+  return cluster_data_.members;
 }
 
 bool metadata_cache::ManagedInstance::operator==(
     const ManagedInstance &other) const {
-  return mysql_server_uuid == other.mysql_server_uuid &&
-         replicaset_name == other.replicaset_name && mode == other.mode &&
+  return mysql_server_uuid == other.mysql_server_uuid && mode == other.mode &&
          host == other.host && port == other.port && xport == other.xport &&
          hidden == other.hidden &&
          disconnect_existing_sessions_when_hidden ==
@@ -281,18 +234,16 @@
 }
 
 metadata_cache::ManagedInstance::ManagedInstance(
-    const std::string &p_replicaset_name,
     const std::string &p_mysql_server_uuid, const ServerMode p_mode,
     const std::string &p_host, const uint16_t p_port, const uint16_t p_xport)
-    : replicaset_name(p_replicaset_name),
-      mysql_server_uuid(p_mysql_server_uuid),
+    : mysql_server_uuid(p_mysql_server_uuid),
       mode(p_mode),
       host(p_host),
       port(p_port),
       xport(p_xport) {}
 
 metadata_cache::ManagedInstance::ManagedInstance(const TCPAddress &addr) {
-  host = addr.address() == "localhost" ? "127.0.0.1" : addr.address();
+  host = addr.address();
   port = addr.port();
 }
 
@@ -302,32 +253,25 @@
   return result;
 }
 
-bool operator==(const MetaData::ReplicaSetsByName &map_a,
-                const MetaData::ReplicaSetsByName &map_b) {
-  if (map_a.size() != map_b.size()) return false;
-  auto ai = map_a.begin();
-  auto bi = map_b.begin();
-  for (; ai != map_a.end(); ++ai, ++bi) {
-    if ((ai->first != bi->first)) return false;
-    if (ai->second.md_discrepancy != bi->second.md_discrepancy) return false;
-    // we need to compare 2 vectors if their content is the same
-    // but order of their elements can be different as we use
-    // SQL with no "ORDER BY" to fetch them from different nodes
-    if (ai->second.members.size() != bi->second.members.size()) return false;
-    if (ai->second.view_id != bi->second.view_id) return false;
-    if (!std::is_permutation(ai->second.members.begin(),
-                             ai->second.members.end(),
-                             bi->second.members.begin())) {
-      return false;
-    }
+bool operator==(const metadata_cache::ManagedCluster &cluster_a,
+                const metadata_cache::ManagedCluster &cluster_b) {
+  if (cluster_a.md_discrepancy != cluster_b.md_discrepancy) return false;
+  // we need to compare 2 vectors if their content is the same
+  // but order of their elements can be different as we use
+  // SQL with no "ORDER BY" to fetch them from different nodes
+  if (cluster_a.members.size() != cluster_b.members.size()) return false;
+  if (cluster_a.view_id != cluster_b.view_id) return false;
+  if (!std::is_permutation(cluster_a.members.begin(), cluster_a.members.end(),
+                           cluster_b.members.begin())) {
+    return false;
   }
 
   return true;
 }
 
-bool operator!=(const MetaData::ReplicaSetsByName &map_a,
-                const MetaData::ReplicaSetsByName &map_b) {
-  return !(map_a == map_b);
+bool operator!=(const metadata_cache::ManagedCluster &cluster_a,
+                const metadata_cache::ManagedCluster &cluster_b) {
+  return !(cluster_a == cluster_b);
 }
 
 std::string to_string(metadata_cache::ServerMode mode) {
@@ -356,83 +300,90 @@
   return result;
 }
 
-void MetadataCache::on_refresh_failed(bool terminated) {
+void MetadataCache::on_refresh_failed(bool terminated,
+                                      bool md_servers_reachable) {
   stats_([](auto &stats) {
     stats.refresh_failed++;
     stats.last_refresh_failed = std::chrono::system_clock::now();
   });
 
+  const bool refresh_state_changed =
+      EventStateTracker::instance().state_changed(
+          false, EventStateTracker::EventId::MetadataRefreshOk);
+
   // we failed to fetch metadata from any of the metadata servers
-  if (!terminated)
-    log_error("Failed fetching metadata from any of the %u metadata servers.",
-              static_cast<unsigned>(metadata_servers_.size()));
+  if (!terminated) {
+    const auto log_level =
+        refresh_state_changed ? LogLevel::kError : LogLevel::kDebug;
+    log_custom(log_level,
+               "Failed fetching metadata from any of the %u metadata servers.",
+               static_cast<unsigned>(metadata_servers_.size()));
+  }
 
   // clearing metadata
   {
     bool clearing;
     {
       std::lock_guard<std::mutex> lock(cache_refreshing_mutex_);
-      clearing = !replicaset_data_.empty();
-      if (clearing) replicaset_data_.clear();
+      clearing = !cluster_data_.empty();
+      if (clearing) cluster_data_.clear();
     }
     if (clearing) {
-      log_info("... cleared current routing table as a precaution");
-      on_instances_changed(/*md_servers_reachable=*/false);
+      const auto log_level =
+          refresh_state_changed ? LogLevel::kInfo : LogLevel::kDebug;
+      log_custom(log_level,
+                 "... cleared current routing table as a precaution");
+      on_instances_changed(md_servers_reachable, {}, {});
     }
   }
 }
 
 void MetadataCache::on_refresh_succeeded(
-    const metadata_cache::ManagedInstance &metadata_server) {
+    const metadata_cache::metadata_server_t &metadata_server) {
+  EventStateTracker::instance().state_changed(
+      true, EventStateTracker::EventId::MetadataRefreshOk);
   stats_([&metadata_server](auto &stats) {
     stats.last_refresh_succeeded = std::chrono::system_clock::now();
-    stats.last_metadata_server_host = metadata_server.host;
-    stats.last_metadata_server_port = metadata_server.port;
+    stats.last_metadata_server_host = metadata_server.address();
+    stats.last_metadata_server_port = metadata_server.port();
     stats.refresh_succeeded++;
   });
 }
 
-void MetadataCache::on_instances_changed(const bool md_servers_reachable,
-                                         unsigned view_id) {
+void MetadataCache::on_instances_changed(
+    const bool md_servers_reachable,
+    const metadata_cache::cluster_nodes_list_t &cluster_nodes,
+    const metadata_cache::metadata_servers_list_t &metadata_servers,
+    uint64_t view_id) {
   // Socket acceptors state will be updated when processing new instances
   // information.
   trigger_acceptor_update_on_next_refresh_ = false;
 
-  auto instances = replicaset_lookup("" /*cluster_name_*/);
   {
-    std::lock_guard<std::mutex> lock(
-        replicaset_instances_change_callbacks_mtx_);
-
-    for (auto &replicaset_clb : state_listeners_) {
-      const std::string replicaset_name = replicaset_clb.first;
+    std::lock_guard<std::mutex> lock(cluster_instances_change_callbacks_mtx_);
 
-      for (auto each : state_listeners_[replicaset_name]) {
-        each->notify_instances_changed(instances, md_servers_reachable,
-                                       view_id);
-      }
+    for (auto each : state_listeners_) {
+      each->notify_instances_changed(cluster_nodes, metadata_servers,
+                                     md_servers_reachable, view_id);
     }
   }
 
   if (use_cluster_notifications_) {
     meta_data_->setup_notifications_listener(
-        instances, [this]() { on_refresh_requested(); });
+        cluster_nodes, target_cluster_, [this]() { on_refresh_requested(); });
   }
 }
 
 void MetadataCache::on_handle_sockets_acceptors() {
-  auto instances = replicaset_lookup("" /*cluster_name_*/);
+  auto instances = get_cluster_nodes();
   {
     std::lock_guard<std::mutex> lock(acceptor_handler_callbacks_mtx_);
 
     trigger_acceptor_update_on_next_refresh_ = false;
-    for (auto &callbacks_info : acceptor_update_listeners_) {
-      const std::string replicaset_name = callbacks_info.first;
-
-      for (const auto &callback : acceptor_update_listeners_[replicaset_name]) {
-        // If setting up any acceptor failed we should retry on next md refresh
-        if (!callback->update_socket_acceptor_state(instances)) {
-          trigger_acceptor_update_on_next_refresh_ = true;
-        }
+    for (const auto &callback : acceptor_update_listeners_) {
+      // If setting up any acceptor failed we should retry on next md refresh
+      if (!callback->update_socket_acceptor_state(instances)) {
+        trigger_acceptor_update_on_next_refresh_ = true;
       }
     }
   }
@@ -452,48 +403,41 @@
     const std::string &instance_id, metadata_cache::InstanceStatus status) {
   // If the status is that the primary or secondary instance is physically
   // unreachable, we enable "emergency mode" (temporarily increase the refresh
-  // rate to 1/s if currently lower) until the replicaset routing table
+  // rate to 1/s if currently lower) until the GR routing table
   // reflects this reality (or at least that is the the intent; in practice
   // this mechanism is buggy - see Metadata Cache module documentation in
   // Doxygen, section "Emergency mode")
 
   std::lock_guard<std::mutex> lock(cache_refreshing_mutex_);
-  // the replicaset that the given instance belongs to
   metadata_cache::ManagedInstance *instance = nullptr;
-  metadata_cache::ManagedReplicaSet *replicaset = nullptr;
-  for (auto &rs : replicaset_data_) {
-    for (auto &inst : rs.second.members) {
-      if (inst.mysql_server_uuid == instance_id) {
-        instance = &inst;
-        replicaset = &rs.second;
-        break;
-      }
+  for (auto &inst : cluster_data_.members) {
+    if (inst.mysql_server_uuid == instance_id) {
+      instance = &inst;
+      break;
     }
-    if (replicaset) break;
   }
 
   // If the instance got marked as invalid we want to trigger metadata-cache
   // update ASAP to aviod keeping try to route to that instance
-  if (replicaset) {
-    std::lock_guard<std::mutex> lplock(replicasets_with_unreachable_nodes_mtx_);
+  if (instance) {
     switch (status) {
       case metadata_cache::InstanceStatus::Reachable:
         break;
       case metadata_cache::InstanceStatus::InvalidHost:
         log_warning(
-            "Instance '%s:%i' [%s] of replicaset '%s' is invalid. Increasing "
+            "Instance '%s:%i' [%s] of cluster '%s' is invalid. Increasing "
             "metadata cache refresh frequency.",
             instance->host.c_str(), instance->port, instance_id.c_str(),
-            replicaset->name.c_str());
-        replicasets_with_unreachable_nodes_.insert(replicaset->name);
+            target_cluster_.c_str());
+        has_unreachable_nodes = true;
         break;
       case metadata_cache::InstanceStatus::Unreachable:
         log_warning(
-            "Instance '%s:%i' [%s] of replicaset '%s' is unreachable. "
+            "Instance '%s:%i' [%s] of cluster '%s' is unreachable. "
             "Increasing metadata cache refresh frequency.",
             instance->host.c_str(), instance->port, instance_id.c_str(),
-            replicaset->name.c_str());
-        replicasets_with_unreachable_nodes_.insert(replicaset->name);
+            target_cluster_.c_str());
+        has_unreachable_nodes = true;
         break;
       case metadata_cache::InstanceStatus::Unusable:
         break;
@@ -526,14 +470,10 @@
   return false;
 }
 
-bool MetadataCache::wait_primary_failover(const std::string &replicaset_name,
-                                          const std::string &server_uuid,
+bool MetadataCache::wait_primary_failover(const std::string &server_uuid,
                                           const std::chrono::seconds &timeout) {
-  log_debug(
-      "Waiting for PRIMARY of replicaset '%s' to change from [%s] to another "
-      "member for %lds",
-      replicaset_name.c_str(), server_uuid.c_str(),
-      static_cast<long>(timeout.count()));
+  log_debug("Waiting for failover to happen in '%s' for %lds",
+            target_cluster_.c_str(), static_cast<long>(timeout.count()));
 
   using clock_type = std::chrono::steady_clock;
   const auto end_time = clock_type::now() + timeout;
@@ -541,7 +481,7 @@
     if (terminated_) return false;
 
     // if we have a member, that's PRIMARY and not "server_uuid" -> success
-    if (primary_has_changed(replicaset_lookup(replicaset_name), server_uuid)) {
+    if (primary_has_changed(get_cluster_nodes(), server_uuid)) {
       return true;
     }
 
@@ -558,68 +498,72 @@
   } while (clock_type::now() < end_time);
 
   // if we have a member, that's PRIMARY and not "server_uuid" -> success
-  return primary_has_changed(replicaset_lookup(replicaset_name), server_uuid);
+  return primary_has_changed(get_cluster_nodes(), server_uuid);
 }
 
 void MetadataCache::add_state_listener(
-    const std::string &replicaset_name,
-    metadata_cache::ReplicasetStateListenerInterface *listener) {
-  std::lock_guard<std::mutex> lock(replicaset_instances_change_callbacks_mtx_);
-  state_listeners_[replicaset_name].insert(listener);
+    metadata_cache::ClusterStateListenerInterface *listener) {
+  std::lock_guard<std::mutex> lock(cluster_instances_change_callbacks_mtx_);
+  state_listeners_.insert(listener);
 }
 
 void MetadataCache::remove_state_listener(
-    const std::string &replicaset_name,
-    metadata_cache::ReplicasetStateListenerInterface *listener) {
-  std::lock_guard<std::mutex> lock(replicaset_instances_change_callbacks_mtx_);
-  state_listeners_[replicaset_name].erase(listener);
+    metadata_cache::ClusterStateListenerInterface *listener) {
+  std::lock_guard<std::mutex> lock(cluster_instances_change_callbacks_mtx_);
+  state_listeners_.erase(listener);
 }
 
 void MetadataCache::add_acceptor_handler_listener(
-    const std::string &replicaset_name,
     metadata_cache::AcceptorUpdateHandlerInterface *listener) {
   std::lock_guard<std::mutex> lock(acceptor_handler_callbacks_mtx_);
-  acceptor_update_listeners_[replicaset_name].insert(listener);
+  acceptor_update_listeners_.insert(listener);
 }
 
 void MetadataCache::remove_acceptor_handler_listener(
-    const std::string &replicaset_name,
     metadata_cache::AcceptorUpdateHandlerInterface *listener) {
   std::lock_guard<std::mutex> lock(acceptor_handler_callbacks_mtx_);
-  acceptor_update_listeners_[replicaset_name].erase(listener);
+  acceptor_update_listeners_.erase(listener);
 }
 
 void MetadataCache::check_auth_metadata_timers() const {
-  if (auth_cache_ttl_ > 0ms && auth_cache_ttl_ < ttl_) {
+  if (ttl_config_.auth_cache_ttl > 0ms &&
+      ttl_config_.auth_cache_ttl < ttl_config_.ttl) {
     throw std::invalid_argument(
         "'auth_cache_ttl' option value '" +
-        std::to_string(static_cast<float>(auth_cache_ttl_.count()) / 1000) +
+        std::to_string(static_cast<float>(ttl_config_.auth_cache_ttl.count()) /
+                       1000) +
         "' cannot be less than the 'ttl' value which is '" +
-        std::to_string(static_cast<float>(ttl_.count()) / 1000) + "'");
+        std::to_string(static_cast<float>(ttl_config_.ttl.count()) / 1000) +
+        "'");
   }
-  if (auth_cache_refresh_interval_ < ttl_) {
+  if (ttl_config_.auth_cache_refresh_interval < ttl_config_.ttl) {
     throw std::invalid_argument(
         "'auth_cache_refresh_interval' option value '" +
-        std::to_string(
-            static_cast<float>(auth_cache_refresh_interval_.count()) / 1000) +
+        std::to_string(static_cast<float>(
+                           ttl_config_.auth_cache_refresh_interval.count()) /
+                       1000) +
         "' cannot be less than the 'ttl' value which is '" +
-        std::to_string(static_cast<float>(ttl_.count()) / 1000) + "'");
+        std::to_string(static_cast<float>(ttl_config_.ttl.count()) / 1000) +
+        "'");
   }
-  if (auth_cache_ttl_ > 0ms && auth_cache_refresh_interval_ > auth_cache_ttl_) {
+  if (ttl_config_.auth_cache_ttl > 0ms &&
+      ttl_config_.auth_cache_refresh_interval > ttl_config_.auth_cache_ttl) {
     throw std::invalid_argument(
         "'auth_cache_ttl' option value '" +
-        std::to_string(static_cast<float>(auth_cache_ttl_.count()) / 1000) +
+        std::to_string(static_cast<float>(ttl_config_.auth_cache_ttl.count()) /
+                       1000) +
         "' cannot be less than the 'auth_cache_refresh_interval' value which "
         "is '" +
-        std::to_string(
-            static_cast<float>(auth_cache_refresh_interval_.count()) / 1000) +
+        std::to_string(static_cast<float>(
+                           ttl_config_.auth_cache_refresh_interval.count()) /
+                       1000) +
         "'");
   }
 }
 
 std::pair<bool, MetaData::auth_credentials_t::mapped_type>
 MetadataCache::get_rest_user_auth_data(const std::string &user) {
-  auto auth_cache_ttl = auth_cache_ttl_;
+  auto auth_cache_ttl = ttl_config_.auth_cache_ttl;
 
   return rest_auth_([&user, auth_cache_ttl](auto &rest_auth)
                         -> std::pair<
@@ -647,8 +591,8 @@
   if (meta_data_ && auth_metadata_fetch_enabled_) {
     try {
       rest_auth_([this](auto &rest_auth) {
-        rest_auth.rest_auth_data_ =
-            meta_data_->fetch_auth_credentials(cluster_name_);
+        rest_auth.rest_auth_data_ = meta_data_->fetch_auth_credentials(
+            target_cluster_, this->cluster_type_specific_id());
         rest_auth.last_credentials_update_ = std::chrono::system_clock::now();
       });
       return true;
@@ -659,3 +603,43 @@
   }
   return false;
 }
+
+void MetadataCache::update_router_attributes() {
+  if (!version_updated_) {
+    if (cluster_data_.writable_server) {
+      const auto &rw_server = cluster_data_.writable_server.value();
+      try {
+        meta_data_->update_router_attributes(rw_server, router_id_,
+                                             router_attributes_);
+        version_updated_ = true;
+      } catch (const mysqlrouter::MetadataUpgradeInProgressException &) {
+      } catch (...) {
+        // we only attempt it once, if it fails we will not try again
+        version_updated_ = true;
+      }
+      log_debug(
+          "Successfully updated the Router version in the metadata using "
+          "instance %s",
+          rw_server.str().c_str());
+    } else {
+      log_debug(
+          "Did not find writable instance to update the Router version in "
+          "the metadata.");
+    }
+  }
+}
+
+void MetadataCache::update_router_last_check_in() {
+  if (last_check_in_updated_ % 10 == 0) {
+    last_check_in_updated_ = 0;
+    if (cluster_data_.writable_server) {
+      const auto &rw_server = cluster_data_.writable_server.value();
+      try {
+        meta_data_->update_router_last_check_in(rw_server, router_id_);
+      } catch (const mysqlrouter::MetadataUpgradeInProgressException &) {
+      } catch (...) {
+      }
+    }
+  }
+  ++last_check_in_updated_;
+}
\ No newline at end of file
diff -Nru mysql-8.0-8.0.26/router/src/metadata_cache/src/metadata_cache_gr.cc mysql-8.0-8.0.27/router/src/metadata_cache/src/metadata_cache_gr.cc
--- mysql-8.0-8.0.26/router/src/metadata_cache/src/metadata_cache_gr.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/metadata_cache/src/metadata_cache_gr.cc	2021-09-28 11:46:34.000000000 +0000
@@ -43,12 +43,6 @@
  * Glossary
  * ========
  *
- * replicaset = group of servers that contain the same data; in simple cases
- *              replicaset and cluster are interchangeable, but in case of
- *              sharded cluster this no longer applies, as the cluster will be
- *              composed of multiple replicasets, each handling a different
- *              shard.
- *
  * MD = metadata, several tables residing on the metadata server, which (among
  *      other things) contain cluster topology information. It reflects the
  *      desired "as it should be" version of topology.
@@ -76,17 +70,6 @@
  * Refresh Mechanism
  * =================
  *
- * @note
- * To keep docs simpler, all below describes how MDC behaves in case of handling
- * just one replicaset. It has been designed to handle more than one, however,
- * ATTOW we don't test it with more than one, so we are uncertain if it would
- * actually deliver on that promise.  This is also the reason why throughout the
- * MDC code there are data structures that are collections of replicasets and
- * for loops that iterate over them, yet in reality we always deal with just one
- * element in those containers and such loops iterate only once.
- *
- *
- *
  *
  *
  * ## Overview
@@ -104,27 +87,27 @@
  *
  * ## Refresh trigger
  * `MetadataCache::refresh_thread()` call to `MetadataCache::refresh()` can be
- * triggered in 2 ways:
+ * triggered in 3 ways:
  * - `<TTL>` seconds passed since last refresh
- * - emergency mode (replicaset is flagged to have at least one node
+ * - emergency mode (cluster is flagged to have at least one node
  * unreachable).
+ * - X protocol notification triggered by the GR change in case of GR cluster
  *
  * It's implemented by running a sleep loop between refreshes. The loop sleeps 1
  * second at a time, until `<TTL>` iterations have gone or emergency mode is
  * enabled.
  *
  *
- *
  * ### Emergency mode
  * Emergency mode is entered, when Routing Plugin discovers that it's unable to
  * connect to a node that's declared by MDC as routable (node that is labelled
- * as writable or readonly). In such situation, it will flag the replicaset as
+ * as writable or readonly). In such situation, it will flag the cluster as
  * missing a node, and MDC will react by increasing refresh rate to 1/s (if it
  * is currently lower).
  *
  * This emergency mode will stay enabled, until routing table resulting from
  * most recent MD and GR query is different from the one before it _AND_ the
- * replicaset is in RW mode.
+ * cluster is in RW mode.
  *
  * @note
  * The reason why we require the routing table to be different before we disable
@@ -134,8 +117,8 @@
  * [05].
  *
  * @note
- * The reason why we require the replicaset to be in RW mode before we disable
- * the emergency mode, is the assumption that the user wants the replicaset to
+ * The reason why we require the cluster to be in RW mode before we disable
+ * the emergency mode, is the assumption that the user wants the cluster to
  * be RW and if it is in RO, it is undergoing a failure. This assumption is
  * probably flawed [06].
  *
@@ -197,8 +180,8 @@
  * Implemented in: `ClusterMetadata::fetch_instances_from_metadata_server()`
  *
  * Using connection established in Stage 1.1, MDC runs a SQL query which
- * extracts a list of nodes (GR members) belonging to the replicaset. Note that
- * this the configured "should be" view of replicaset topology, which might not
+ * extracts a list of nodes (GR members) belonging to the cluster. Note that
+ * this the configured "should be" view of cluster topology, which might not
  * correspond to actual topology, if for example some nodes became unavailable,
  * changed their role or new nodes were added without updating MD in the
  * server.
@@ -212,7 +195,7 @@
  *
  * ### Stage 2: Query GR, combine results with MD, determine availability
  *
- * Implemented in: `ClusterMetadata::update_replicaset_status()`
+ * Implemented in: `ClusterMetadata::update_cluster_status()`
  *
  * Here MDC iterates through the list of GR members obtained from MD in Stage
  * 1.2, until it finds a "trustworthy" GR node. A "trustworthy" GR node is one
@@ -240,7 +223,7 @@
  *
  * #### Stage 2.1: Connect to GR node
  *
- * Implemented in: `ClusterMetadata::update_replicaset_status()`
+ * Implemented in: `ClusterMetadata::update_cluster_status()`
  *
  * New connection to GR node is established (on failure, Stage 2 progresses to
  * next iteration).
@@ -259,11 +242,11 @@
  *                   `find_group_replication_primary_member()`
  *
  * Two SQL queries are ran and combined to produce a status report of all nodes
- * seen by this node (which would be the entire replicaset if it was in perfect
- * health, or its subset if some nodes became unavailable or the replicaset was
+ * seen by this node (which would be the entire cluster if it was in perfect
+ * health, or its subset if some nodes became unavailable or the cluster was
  * experiencing a split-brain scenario):
  *
- *   1. determine the PRIMARY member of the replicaset (if there is more than
+ *   1. determine the PRIMARY member of the cluster (if there is more than
  *      one, such as in MM setups, the first one is returned and the rest are
  *      ignored)
  *
@@ -281,12 +264,12 @@
  *
  * #### Stage 2.3: Quorum test
  *
- * Implemented in: `ClusterMetadata::update_replicaset_status()` and
- *                   `ClusterMetadata::check_replicaset_status()`
+ * Implemented in: `ClusterMetadata::update_cluster_status()` and
+ *                   `ClusterMetadata::check_cluster_status()`
  *
  * MD and GR data collected up to now are compared, to see if GR node just
- * queried belongs to an available replicaset (or to an available replicaset
- * partition, if replicaset has partitioned). For a replicaset (partition) to
+ * queried belongs to an available cluster (or to an available cluster
+ * partition, if cluster has partitioned). For a cluster (partition) to
  * be considered available, it has to have quorum, that is, meet the following
  * condition:
  *
@@ -303,7 +286,7 @@
  * just found). This matters, because having quorum does not automatically
  * imply being available, as next paragraph explains.
  *
- * The availability test will resolve node's replicaset to be in of the 4
+ * The availability test will resolve node's cluster to be in of the 4
  * possible states:
  * - Unavailable (this node is not part of quorum)
  * - UnavailableRecovering (quorum is met, but it consists of only RECOVERING
@@ -321,14 +304,14 @@
  *
  * ATTOW, our Router has a certain limitation: it assumes that MD contains an
  * exact set or superset of nodes in GR. The user is normally expected to use
- * MySQL Shell to reconfigure the replicaset, which automatically updates both
+ * MySQL Shell to reconfigure the cluster, which automatically updates both
  * GR and MD, keeping them in sync. But if for some reason the user tinkers with
  * GR directly and adds nodes without updating MD accordingly,
  * availablity/quorum calculations will be skewed. We run checks to detect such
  * situation, and log a warning like so:
  *
- *     log_error("Member %s:%d (%s) found in replicaset, yet is not defined in
- *     metadata!"
+ *     log_error("Member %s:%d (%s) found in Group Replication, yet is not
+ * defined in metadata!"
  *
  * but beyond that we just act defensively by having our quorum calculation be
  * conservative, and error on the side of caution when such discrepancy happens
@@ -358,7 +341,7 @@
  *     GR defines nodes A, B, C, D, E
  *     A, B are alive; C, D, E are dead
  *
- * Availability calculation should deem replicaset to be unavailable, because
+ * Availability calculation should deem cluster to be unavailable, because
  * only 2 of 5 nodes are alive, even though looking purely from MD
  * point-of-view, 2 of its 3 nodes are still alive, thus could be considered a
  * quorum. In such case:
@@ -376,7 +359,7 @@
  *     GR defines nodes A, B, C, D, E
  *     A, B are dead, C, D, E are alive
  *
- * Availability calculation, if fully GR-aware, could deem replicaset as
+ * Availability calculation, if fully GR-aware, could deem cluster as
  * available, because looking from purely GR perspective, 3 of 5 nodes form
  * quorum. OTOH, looking from MD perspective, only 1 of 3 its nodes (C) is
  * alive.
@@ -433,7 +416,7 @@
  *
  * 1. Appropriate log messages are issued advising of availability change.
  *
- * 2. A check is run if replicaset is in RW mode. If it is, emergency mode is
+ * 2. A check is run if cluster is in RW mode. If it is, emergency mode is
  *    called off (see "Emergency mode" section for more information).
  *
  *
@@ -443,18 +426,18 @@
  * ##NOTES
  *
  * ### Emergency mode
- * [05] Imagine a scenario where a replicaset is perfectly healthy, but Routing
+ * [05] Imagine a scenario where a cluster is perfectly healthy, but Routing
  *      Plugin has a network hickup and fails to connect to one of its nodes. As
- *      a result, it will flag the replicaset as missing a node, triggerring
+ *      a result, it will flag the cluster as missing a node, triggerring
  *      emergency mode. Emergency mode will only be turned off after routing
  *      table changes (the assumption is that the current one is stale and we're
  *      waiting for an updated one reflecting the problem Routing Plugin
- *      observed). However, since the replicaset is healthy, as long as it stays
+ *      observed). However, since the cluster is healthy, as long as it stays
  *      that way no such update will come, leaving emergency mode enabled
  *      indefinitely. This has been reported as BUG#27065614
  *
- * [06] Requiring replicaset to be available in RW mode before disabling
- *      emergency mode has a flaw: if replicaset is placed in super-read-only
+ * [06] Requiring cluster to be available in RW mode before disabling
+ *      emergency mode has a flaw: if cluster is placed in super-read-only
  *      mode, it is possible for PRIMARY node to be read-only.
  *
  *
@@ -481,132 +464,125 @@
 
 IMPORT_LOG_FUNCTIONS()
 
-bool GRMetadataCache::refresh() {
-  bool changed{false}, fetched{false};
-  // fetch metadata
-  bool broke_loop = false;
-  for (const auto &metadata_server : metadata_servers_) {
-    if (terminated_) {
-      broke_loop = true;
-      break;
-    }
+bool GRMetadataCache::refresh(bool needs_writable_node) {
+  bool changed{false};
+  uint64_t view_id{0};
+  size_t metadata_server_id{0};
+  changed = false;
+  std::size_t instance_id;
+  // Fetch the metadata and store it in a temporary variable.
+  const auto res = meta_data_->fetch_cluster_topology(
+      terminated_, target_cluster_, router_id_, metadata_servers_,
+      needs_writable_node, cluster_type_specific_id_, clusterset_id_,
+      instance_id);
+
+  if (!res) {
+    const bool md_servers_reachable =
+        res.error() !=
+            metadata_cache::metadata_errc::no_metadata_server_reached &&
+        res.error() !=
+            metadata_cache::metadata_errc::no_metadata_read_successful;
 
-    if (!meta_data_->connect_and_setup_session(metadata_server)) {
-      log_error("Failed to connect to metadata server %s",
-                metadata_server.mysql_server_uuid.c_str());
-      continue;
-    }
-    fetched = fetch_metadata_from_connected_instance(metadata_server, changed);
-    if (fetched) {
-      on_refresh_succeeded(metadata_server);
-      break;  // successfully updated metadata
-    }
+    on_refresh_failed(terminated_, md_servers_reachable);
+    return false;
   }
 
-  if (fetched) {
-    // only now we can safely update the list of metadata servers
-    // when we no longer iterate over it
-    if (changed) {
-      auto metadata_servers_tmp =
-          replicaset_lookup(/*cluster_name_ (all clusters)*/ "");
-      // never let the list that we iterate over become empty as we would
-      // not recover from that
-      if (!metadata_servers_tmp.empty()) {
-        metadata_servers_ = std::move(metadata_servers_tmp);
-      }
-    }
-    return true;
-  }
+  const auto cluster_topology = res.value();
 
-  on_refresh_failed(broke_loop);
-  return false;
-}
-
-bool GRMetadataCache::fetch_metadata_from_connected_instance(
-    const metadata_cache::ManagedInstance &instance, bool &changed) {
-  try {
-    changed = false;
-    // Fetch the metadata and store it in a temporary variable.
-    auto replicaset_data_temp =
-        meta_data_->fetch_instances(cluster_name_, cluster_type_specific_id_);
-
-    // this node no longer contains metadata for our cluster, check the next
-    // node (if available)
-    if (replicaset_data_temp.empty()) {
-      log_warning(
-          "Tried node %s on host %s, port %d as a metadata server, it does "
-          "not contain metadata for cluster %s",
-          instance.mysql_server_uuid.c_str(), instance.host.c_str(),
-          instance.port, cluster_type_specific_id_.c_str());
-      return false;
-    }
-
-    {
-      // Ensure that the refresh does not result in an inconsistency during the
-      // lookup.
-      std::lock_guard<std::mutex> lock(cache_refreshing_mutex_);
-      if (replicaset_data_ != replicaset_data_temp) {
-        replicaset_data_ = replicaset_data_temp;
-        changed = true;
-      }
+  {
+    // Ensure that the refresh does not result in an inconsistency during
+    // the lookup.
+    std::lock_guard<std::mutex> lock(cache_refreshing_mutex_);
+    if (cluster_data_ != cluster_topology.cluster_data) {
+      cluster_data_ = cluster_topology.cluster_data;
+      changed = true;
+    } else {
+      cluster_data_.writable_server =
+          cluster_topology.cluster_data.writable_server;
     }
+  }
 
-    // we want to trigger those actions not only if the metadata has really
-    // changed but also when something external (like unsuccessful client
-    // connection) triggered the refresh so that we verified if this wasn't
-    // false alarm and turn it off if it was
-    if (changed) {
+  // we want to trigger those actions not only if the metadata has really
+  // changed but also when something external (like unsuccessful client
+  // connection) triggered the refresh so that we verified if this wasn't
+  // false alarm and turn it off if it was
+  view_id = cluster_data_.view_id;
+  if (changed) {
+    log_info(
+        "Potential changes detected in cluster '%s' after metadata refresh",
+        target_cluster_.c_str());
+    // dump some informational/debugging information about the cluster
+    log_cluster_details();
+    if (cluster_data_.empty())
+      log_error("Metadata for cluster '%s' is empty!", target_cluster_.c_str());
+    else {
       log_info(
-          "Potential changes detected in cluster '%s' after metadata refresh",
-          cluster_name_.c_str());
-      // dump some informational/debugging information about the replicasets
-      if (replicaset_data_.empty())
-        log_error("Metadata for cluster '%s' is empty!", cluster_name_.c_str());
-      else {
-        log_info("Metadata for cluster '%s' has %zu replicasets:",
-                 cluster_name_.c_str(), replicaset_data_.size());
-        for (const auto &rs : replicaset_data_) {
-          log_info("'%s' (%zu members, %s)", rs.first.c_str(),
-                   rs.second.members.size(),
-                   rs.second.single_primary_mode ? "single-primary"
-                                                 : "multi-primary");
-          for (const auto &mi : rs.second.members) {
-            log_info("    %s:%i / %i - mode=%s %s", mi.host.c_str(), mi.port,
-                     mi.xport, to_string(mi.mode).c_str(),
-                     get_hidden_info(mi).c_str());
-
-            if (mi.mode == metadata_cache::ServerMode::ReadWrite) {
-              // If we were running with a primary or secondary node gone
-              // missing before (in so-called "emergency mode"), we trust that
-              // the update fixed the problem. This is wrong behavior that
-              // should be fixed, see notes [05] and [06] in Notes section of
-              // Metadata Cache module in Doxygen.
-              std::lock_guard<std::mutex> lock(
-                  replicasets_with_unreachable_nodes_mtx_);
-              auto rs_with_unreachable_node =
-                  replicasets_with_unreachable_nodes_.find(rs.first);
-              if (rs_with_unreachable_node !=
-                  replicasets_with_unreachable_nodes_.end()) {
-                // disable "emergency mode" for this replicaset
-                replicasets_with_unreachable_nodes_.erase(
-                    rs_with_unreachable_node);
-              }
-            }
-          }
+          "Metadata for cluster '%s' has %zu member(s), %s: (view_id=%" PRIu64
+          ")",
+          target_cluster_.c_str(), cluster_data_.members.size(),
+          cluster_data_.single_primary_mode ? "single-primary"
+                                            : "multi-primary",
+          view_id);
+      for (const auto &mi : cluster_data_.members) {
+        log_info("    %s:%i / %i - mode=%s %s", mi.host.c_str(), mi.port,
+                 mi.xport, to_string(mi.mode).c_str(),
+                 get_hidden_info(mi).c_str());
+
+        if (mi.mode == metadata_cache::ServerMode::ReadWrite) {
+          // If we were running with a primary or secondary node gone
+          // missing before (in so-called "emergency mode"), we trust that
+          // the update fixed the problem. This is wrong behavior that
+          // should be fixed, see notes [05] and [06] in Notes section of
+          // Metadata Cache module in Doxygen.
+          has_unreachable_nodes = false;
         }
       }
+    }
 
-      on_instances_changed(/*md_servers_reachable=*/true);
-    } else if (trigger_acceptor_update_on_next_refresh_) {
-      // Instances information has not changed, but we failed to start listening
-      // on incoming sockets, therefore we must retry on next metadata refresh.
-      on_handle_sockets_acceptors();
+    on_instances_changed(/*md_servers_reachable=*/true, cluster_data_.members,
+                         cluster_topology.metadata_servers, view_id);
+    // never let the list that we iterate over become empty as we would
+    // not recover from that
+    if (!cluster_topology.metadata_servers.empty()) {
+      metadata_servers_ = std::move(cluster_topology.metadata_servers);
     }
-  } catch (const std::runtime_error &exc) {
-    // fetching the meatadata failed
-    log_error("Failed fetching metadata: %s", exc.what());
-    return false;
+  } else if (trigger_acceptor_update_on_next_refresh_) {
+    // Instances information has not changed, but we failed to start
+    // listening on incoming sockets, therefore we must retry on next
+    // metadata refresh.
+    on_handle_sockets_acceptors();
   }
 
+  on_refresh_succeeded(metadata_servers_[metadata_server_id]);
   return true;
 }
+
+void GRMetadataCache::log_cluster_details() const {
+  const auto cluster_type = meta_data_->get_cluster_type();
+
+  if (cluster_type == mysqlrouter::ClusterType::GR_CS) {
+    const std::string cluster_role =
+        target_cluster_.is_primary() ? "primary" : "replica";
+    const std::string cluster_invalidated =
+        target_cluster_.is_invalidated()
+            ? "cluster is marked as invalid in the metadata; "
+            : "";
+
+    bool has_rw_nodes{false};
+    for (const auto &mi : cluster_data_.members) {
+      if (mi.mode == metadata_cache::ServerMode::ReadWrite) {
+        has_rw_nodes = true;
+      }
+    }
+
+    const std::string accepting_rw = has_rw_nodes
+                                         ? "accepting RW connections"
+                                         : "not accepting RW connections";
+
+    log_info(
+        "Target cluster '%s' is part of a ClusterSet; role of a cluster within "
+        "a ClusterSet is '%s'; %s%s",
+        target_cluster_.c_str(), cluster_role.c_str(),
+        cluster_invalidated.c_str(), accepting_rw.c_str());
+  }
+}
\ No newline at end of file
diff -Nru mysql-8.0-8.0.26/router/src/metadata_cache/src/metadata_cache_gr.h mysql-8.0-8.0.27/router/src/metadata_cache/src/metadata_cache_gr.h
--- mysql-8.0-8.0.26/router/src/metadata_cache/src/metadata_cache_gr.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/metadata_cache/src/metadata_cache_gr.h	2021-09-28 11:46:34.000000000 +0000
@@ -33,15 +33,17 @@
    * Initialize a connection to the MySQL Metadata server.
    *
    * @param router_id id of the router in the cluster metadata
-   * @param group_replication_id id of the replication group
+   * @param group_replication_id id of the replication group (if bootstrapped as
+   * a single Cluster, empty otherwise)
+   * @param clusterset_id UUID of the ClusterSet the Cluster belongs to (if
+   * bootstrapped as a ClusterSet, empty otherwise)
    * @param metadata_servers The servers that store the metadata
    * @param cluster_metadata metadata of the cluster
-   * @param ttl The TTL of the cached data
-   * @param auth_credentials_ttl TTL of the rest user authentication data
-   * @param auth_credentials_refresh_rate Refresh_rate of the rest user
-   *                                      authentication data
+   * @param ttl_config metadata TTL configuration
    * @param ssl_options SSL related options for connection
-   * @param cluster_name The name of the desired cluster in the metadata server
+   * @param target_cluster object identifying the Cluster this operation refers
+   * to
+   * @param router_attributes Router attributes to be registered in the metadata
    * @param thread_stack_size The maximum memory allocated for thread's stack
    * @param use_gr_notifications Flag indicating if the metadata cache should
    *                             use GR notifications as an additional trigger
@@ -49,39 +51,28 @@
    */
   GRMetadataCache(
       const unsigned router_id, const std::string &group_replication_id,
+      const std::string &clusterset_id,
       const std::vector<mysql_harness::TCPAddress> &metadata_servers,
       std::shared_ptr<MetaData> cluster_metadata,
-      const std::chrono::milliseconds ttl,
-      const std::chrono::milliseconds auth_credentials_ttl,
-      const std::chrono::milliseconds auth_credentials_refresh_rate,
+      const metadata_cache::MetadataCacheTTLConfig &ttl_config,
       const mysqlrouter::SSLOptions &ssl_options,
-      const std::string &cluster_name,
+      const mysqlrouter::TargetCluster &target_cluster,
+      const metadata_cache::RouterAttributes &router_attributes,
       size_t thread_stack_size = mysql_harness::kDefaultStackSizeInKiloBytes,
       bool use_gr_notifications = false)
-      : MetadataCache(router_id, group_replication_id, metadata_servers,
-                      cluster_metadata, ttl, auth_credentials_ttl,
-                      auth_credentials_refresh_rate, ssl_options, cluster_name,
+      : MetadataCache(router_id, group_replication_id, clusterset_id,
+                      metadata_servers, cluster_metadata, ttl_config,
+                      ssl_options, target_cluster, router_attributes,
                       thread_stack_size, use_gr_notifications) {}
 
-  bool refresh() override;
+  bool refresh(bool needs_writable_node) override;
 
   mysqlrouter::ClusterType cluster_type() const noexcept override {
     return meta_data_->get_cluster_type();
   }
 
-  /**
-   * Fetches metadata from the metadata server we are currently connected to.
-   *
-   * @param instance        object representing the metadata server we are
-   * currently connected to
-   * @param [out] changed   true if the metadata read from the server has
-   * changed since the last update, false otherwise
-   *
-   * @return true if the operation succeeded, false otherwise
-   */
-  bool fetch_metadata_from_connected_instance(
-      const metadata_cache::ManagedInstance &instance, bool &changed);
-
+ private:
+  void log_cluster_details() const;
 #ifdef FRIEND_TEST
   FRIEND_TEST(FailoverTest, basics);
   FRIEND_TEST(FailoverTest, primary_failover);
diff -Nru mysql-8.0-8.0.26/router/src/metadata_cache/src/metadata_cache.h mysql-8.0-8.0.27/router/src/metadata_cache/src/metadata_cache.h
--- mysql-8.0-8.0.26/router/src/metadata_cache/src/metadata_cache.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/metadata_cache/src/metadata_cache.h	2021-09-28 11:46:34.000000000 +0000
@@ -52,33 +52,37 @@
  *
  */
 class METADATA_API MetadataCache
-    : public metadata_cache::ReplicasetStateNotifierInterface {
+    : public metadata_cache::ClusterStateNotifierInterface {
  public:
   /**
    * Initialize a connection to the MySQL Metadata server.
    *
    * @param router_id id of the router in the cluster metadata
-   * @param cluster_specific_type_id id of the replication group
+   * @param cluster_type_specific_id id of the ReplicaSet in case of the
+   * ReplicaSet, Replication Group name for GR Cluster (if bootstrapped as a
+   * single Cluster, empty otherwise)
+   * @param clusterset_id UUID of the ClusterSet the Cluster belongs to (if
+   * bootstrapped as a ClusterSet, empty otherwise)
    * @param metadata_servers The servers that store the metadata
    * @param cluster_metadata metadata of the cluster
-   * @param ttl The TTL of the cached data
-   * @param auth_cache_ttl TTL of the rest users authentication data
-   * @param auth_cache_refresh_interval Refresh rate of the rest users
-   *        authentiction data
+   * @param ttl_config metadata TTL configuration
    * @param ssl_options SSL related options for connection
-   * @param cluster_name The name of the desired cluster in the metadata server
+   * @param target_cluster object identifying the Cluster this operation refers
+   * to
+   * @param router_attributes Router attributes to be registered in the metadata
    * @param thread_stack_size The maximum memory allocated for thread's stack
    * @param use_cluster_notifications Flag indicating if the metadata cache
    * should use GR notifications as an additional trigger for metadata refresh
    */
   MetadataCache(
-      const unsigned router_id, const std::string &cluster_specific_type_id,
+      const unsigned router_id, const std::string &cluster_type_specific_id,
+      const std::string &clusterset_id,
       const std::vector<mysql_harness::TCPAddress> &metadata_servers,
-      std::shared_ptr<MetaData> cluster_metadata, std::chrono::milliseconds ttl,
-      const std::chrono::milliseconds auth_cache_ttl,
-      const std::chrono::milliseconds auth_cache_refresh_interval,
+      std::shared_ptr<MetaData> cluster_metadata,
+      const metadata_cache::MetadataCacheTTLConfig &ttl_config,
       const mysqlrouter::SSLOptions &ssl_options,
-      const std::string &cluster_name,
+      const mysqlrouter::TargetCluster &target_cluster,
+      const metadata_cache::RouterAttributes &router_attributes,
       size_t thread_stack_size = mysql_harness::kDefaultStackSizeInKiloBytes,
       bool use_cluster_notifications = false);
 
@@ -96,20 +100,18 @@
    */
   void stop() noexcept;
 
-  using metadata_servers_list_t = std::vector<metadata_cache::ManagedInstance>;
-
-  /** @brief Returns list of managed servers in a replicaset
+  /** @brief Returns list of managed servers in a cluster
+   * TODO: is this needed?!?
    *
-   * Returns list of managed servers in a replicaset.
+   * Returns list of managed servers in a cluster.
    *
-   * @param replicaset_name The ID of the replicaset being looked up
    * @return std::vector containing ManagedInstance objects
    */
-  metadata_servers_list_t replicaset_lookup(const std::string &replicaset_name);
+  metadata_cache::cluster_nodes_list_t get_cluster_nodes();
 
   /** @brief Update the status of the instance
    *
-   * Called when an instance from a replicaset cannot be reached for one reason
+   * Called when an instance from a cluster cannot be reached for one reason
    * or another. When an instance becomes unreachable, an emergency mode is set
    * (the rate of refresh of the metadata cache increases to once per second if
    * currently lower) and lasts until disabled after a suitable change in the
@@ -122,7 +124,7 @@
   void mark_instance_reachability(const std::string &instance_id,
                                   metadata_cache::InstanceStatus status);
 
-  /** Wait until PRIMARY changes in a replicaset.
+  /** Wait until cluster PRIMARY changes.
    *
    * wait until a change of the PRIMARY is noticed
    *
@@ -142,16 +144,14 @@
    * Therefore, if the connection to PRIMARY fails, wait for change of the
    * membership or timeout, whatever happens earlier.
    *
-   * @param replicaset_name name of the replicaset
    * @param server_uuid server-uuid of the PRIMARY that we failed to connect
    * @param timeout - amount of time to wait for a failover
    * @return true if a primary member exists
    */
-  bool wait_primary_failover(const std::string &replicaset_name,
-                             const std::string &server_uuid,
+  bool wait_primary_failover(const std::string &server_uuid,
                              const std::chrono::seconds &timeout);
 
-  /** @brief refresh replicaset information */
+  /** @brief refresh cluster information */
   void refresh_thread();
 
   /** @brief run refresh thread */
@@ -159,47 +159,39 @@
 
   /**
    * @brief Register observer that is notified when there is a change in the
-   * replicaset nodes setup/state discovered.
+   * cluster nodes setup/state discovered.
    *
-   * @param replicaset_name name of the replicaset
-   * @param listener Observer object that is notified when replicaset nodes
+   * @param listener Observer object that is notified when cluster nodes
    * state is changed.
    */
   void add_state_listener(
-      const std::string &replicaset_name,
-      metadata_cache::ReplicasetStateListenerInterface *listener) override;
+      metadata_cache::ClusterStateListenerInterface *listener) override;
 
   /**
    * @brief Unregister observer previously registered with add_state_listener()
    *
-   * @param replicaset_name name of the replicaset
    * @param listener Observer object that should be unregistered.
    */
   void remove_state_listener(
-      const std::string &replicaset_name,
-      metadata_cache::ReplicasetStateListenerInterface *listener) override;
+      metadata_cache::ClusterStateListenerInterface *listener) override;
 
   /**
    * @brief Register observer that is notified when the state of listening
    * socket acceptors should be updated on the next metadata refresh.
    *
-   * @param replicaset_name name of the replicaset
    * @param listener Observer object that is notified when replicaset nodes
    * state is changed.
    */
   void add_acceptor_handler_listener(
-      const std::string &replicaset_name,
       metadata_cache::AcceptorUpdateHandlerInterface *listener);
 
   /**
    * @brief Unregister observer previously registered with
    * add_acceptor_handler_listener()
    *
-   * @param replicaset_name name of the replicaset
    * @param listener Observer object that should be unregistered.
    */
   void remove_acceptor_handler_listener(
-      const std::string &replicaset_name,
       metadata_cache::AcceptorUpdateHandlerInterface *listener);
 
   metadata_cache::MetadataCacheAPIBase::RefreshStatus refresh_status() {
@@ -217,8 +209,8 @@
   std::string cluster_type_specific_id() const {
     return cluster_type_specific_id_;
   }
-  std::chrono::milliseconds ttl() const { return ttl_; }
-  std::string cluster_name() const { return cluster_name_; }
+  std::chrono::milliseconds ttl() const { return ttl_config_.ttl; }
+  mysqlrouter::TargetCluster target_cluster() const { return target_cluster_; }
 
   virtual mysqlrouter::ClusterType cluster_type() const noexcept = 0;
 
@@ -244,16 +236,19 @@
   /** @brief Refreshes the cache
    *
    */
-  virtual bool refresh() = 0;
+  virtual bool refresh(bool needs_writable_node) = 0;
 
-  void on_refresh_failed(bool terminated);
+  void on_refresh_failed(bool terminated, bool md_servers_reachable = false);
   void on_refresh_succeeded(
-      const metadata_cache::ManagedInstance &metadata_server);
+      const metadata_cache::metadata_server_t &metadata_server);
 
   // Called each time the metadata has changed and we need to notify
   // the subscribed observers
-  void on_instances_changed(const bool md_servers_reachable,
-                            unsigned view_id = 0);
+  void on_instances_changed(
+      const bool md_servers_reachable,
+      const metadata_cache::cluster_nodes_list_t &cluster_nodes,
+      const metadata_cache::metadata_servers_list_t &metadata_servers,
+      uint64_t view_id = 0);
 
   /**
    * Called when the listening sockets acceptors state should be updated but
@@ -271,29 +266,31 @@
   // Update rest users authentication data
   bool update_auth_cache();
 
-  // Stores the list replicasets and their server instances.
-  // Keyed by replicaset name
-  std::map<std::string, metadata_cache::ManagedReplicaSet> replicaset_data_;
+  // Update current Router attributes in the metadata
+  void update_router_attributes();
+
+  // Update Router last_check_in timestamp in the metadata
+  void update_router_last_check_in();
 
-  // The name of the cluster in the topology.
-  std::string cluster_name_;
+  // Stores the list of cluster's server instances.
+  metadata_cache::ManagedCluster cluster_data_;
+
+  // identifies the Cluster we work with
+  mysqlrouter::TargetCluster target_cluster_;
 
   // For GR cluster Group Replication ID, for AR cluster cluster_id from the
   // metadata
   const std::string cluster_type_specific_id_;
 
+  // Id of the ClusterSet in case of the ClusterSet setup
+  const std::string clusterset_id_;
+
   // The list of servers that contain the metadata about the managed
   // topology.
-  metadata_servers_list_t metadata_servers_;
+  metadata_cache::metadata_servers_list_t metadata_servers_;
 
-  // The time to live of the metadata cache.
-  std::chrono::milliseconds ttl_;
-
-  // Time to live of the auth credentials cache.
-  std::chrono::milliseconds auth_cache_ttl_;
-
-  // Auth credentials cache refresh interval
-  std::chrono::milliseconds auth_cache_refresh_interval_;
+  // Metadata TTL configuration.
+  metadata_cache::MetadataCacheTTLConfig ttl_config_;
 
   // SSL options for MySQL connections
   mysqlrouter::SSLOptions ssl_options_;
@@ -333,11 +330,7 @@
   // is consistent with the use of the server list.
   std::mutex metadata_servers_mutex_;
 
-  // Contains a set of replicaset names that have at least one unreachable
-  // (primary or secondary) node appearing in the routing table
-  std::set<std::string> replicasets_with_unreachable_nodes_;
-
-  std::mutex replicasets_with_unreachable_nodes_mtx_;
+  std::atomic<bool> has_unreachable_nodes{false};
 
   // Flag used to terminate the refresh thread.
   std::atomic<bool> terminated_{false};
@@ -352,18 +345,13 @@
   std::condition_variable refresh_completed_;
   std::mutex refresh_completed_mtx_;
 
-  // map of lists (per each replicaset name) of registered callbacks to be
-  // called on selected replicaset instances change event
-  std::mutex replicaset_instances_change_callbacks_mtx_;
+  std::mutex cluster_instances_change_callbacks_mtx_;
 
   std::mutex acceptor_handler_callbacks_mtx_;
 
-  std::map<std::string,
-           std::set<metadata_cache::ReplicasetStateListenerInterface *>>
-      state_listeners_;
+  std::set<metadata_cache::ClusterStateListenerInterface *> state_listeners_;
 
-  std::map<std::string,
-           std::set<metadata_cache::AcceptorUpdateHandlerInterface *>>
+  std::set<metadata_cache::AcceptorUpdateHandlerInterface *>
       acceptor_update_listeners_;
 
   struct Stats {
@@ -388,13 +376,15 @@
    * metadata refresh even if instance information has not changed.
    */
   std::atomic<bool> trigger_acceptor_update_on_next_refresh_{false};
+
+  metadata_cache::RouterAttributes router_attributes_;
 };
 
-bool operator==(const MetaData::ReplicaSetsByName &map_a,
-                const MetaData::ReplicaSetsByName &map_b);
+bool operator==(const metadata_cache::ManagedCluster &cluster_a,
+                const metadata_cache::ManagedCluster &cluster_b);
 
-bool operator!=(const MetaData::ReplicaSetsByName &map_a,
-                const MetaData::ReplicaSetsByName &map_b);
+bool operator!=(const metadata_cache::ManagedCluster &cluster_a,
+                const metadata_cache::ManagedCluster &cluster_b);
 
 std::string to_string(metadata_cache::ServerMode mode);
 
diff -Nru mysql-8.0-8.0.26/router/src/metadata_cache/src/metadata_cache_plugin.cc mysql-8.0-8.0.27/router/src/metadata_cache/src/metadata_cache_plugin.cc
--- mysql-8.0-8.0.26/router/src/metadata_cache/src/metadata_cache_plugin.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/metadata_cache/src/metadata_cache_plugin.cc	2021-09-28 11:46:34.000000000 +0000
@@ -38,6 +38,7 @@
 #include "mysql/harness/config_parser.h"
 #include "mysql/harness/loader_config.h"
 #include "mysql/harness/logging/logging.h"
+#include "mysql/harness/utility/string.h"
 #include "mysqlrouter/mysql_client_thread_token.h"
 #include "mysqlrouter/mysql_session.h"  // kSslModePreferred
 #include "mysqlrouter/uri.h"
@@ -51,15 +52,51 @@
 static const std::string kSectionName = "metadata_cache";
 static const char *kKeyringAttributePassword = "password";
 
+metadata_cache::RouterAttributes g_router_attributes;
+
+static metadata_cache::RouterAttributes get_router_attributes(
+    const mysql_harness::Config *cfg) {
+  metadata_cache::RouterAttributes result;
+
+  if (!cfg->has_any("routing")) return result;
+  for (const auto *routing_section : cfg->get("routing")) {
+    if (routing_section->has("bind_port") &&
+        routing_section->has("destinations") &&
+        routing_section->has("protocol")) {
+      const auto port = routing_section->get("bind_port");
+      const auto protocol = routing_section->get("protocol");
+      const auto destinations = routing_section->get("destinations");
+
+      const bool is_rw =
+          mysql_harness::utility::ends_with(destinations, "PRIMARY");
+      const bool is_ro =
+          mysql_harness::utility::ends_with(destinations, "SECONDARY");
+
+      if (protocol == "classic") {
+        if (is_rw)
+          result.rw_classic_port = port;
+        else if (is_ro)
+          result.ro_classic_port = port;
+      } else if (protocol == "x") {
+        if (is_rw)
+          result.rw_x_port = port;
+        else if (is_ro)
+          result.ro_x_port = port;
+      }
+    }
+  }
+
+  return result;
+}
+
 static void init(mysql_harness::PluginFuncEnv *env) {
   g_app_info = get_app_info(env);
   // If a valid configuration object was found.
   if (g_app_info && g_app_info->config) {
+    g_router_attributes = get_router_attributes(g_app_info->config);
     // if a valid metadata_cache section was found in the router
     // configuration.
     if (g_app_info->config->get(kSectionName).empty()) {
-      log_error("[metadata_cache] section is empty");  // TODO remove after
-                                                       // Loader starts logging
       set_error(env, mysql_harness::kConfigInvalidArgument,
                 "[metadata_cache] section is empty");
     }
@@ -90,24 +127,22 @@
 }
 
 class MetadataServersStateListener
-    : public metadata_cache::ReplicasetStateListenerInterface {
+    : public metadata_cache::ClusterStateListenerInterface {
  public:
-  MetadataServersStateListener(ClusterMetadataDynamicState &dynamic_state,
-                               const std::string &replicaset_name)
-      : dynamic_state_(dynamic_state), replicaset_name_(replicaset_name) {}
+  MetadataServersStateListener(ClusterMetadataDynamicState &dynamic_state)
+      : dynamic_state_(dynamic_state) {}
 
   ~MetadataServersStateListener() override {
-    metadata_cache::MetadataCacheAPI::instance()->remove_state_listener(
-        replicaset_name_, this);
+    metadata_cache::MetadataCacheAPI::instance()->remove_state_listener(this);
   }
 
-  void notify_instances_changed(const LookupResult &instances,
-                                const bool md_servers_reachable,
-                                const unsigned view_id) override {
+  void notify_instances_changed(
+      const LookupResult & /*instances*/,
+      const metadata_cache::metadata_servers_list_t &metadata_servers,
+      const bool md_servers_reachable, const uint64_t view_id) override {
     if (!md_servers_reachable) return;
-    auto md_servers = instances.instance_vector;
 
-    if (md_servers.empty()) {
+    if (metadata_servers.empty()) {
       // This happens for example when the router could connect to one of the
       // metadata servers but failed to fetch metadata because the connection
       // went down while querying metadata
@@ -119,11 +154,11 @@
 
     // need to convert from ManagedInstance to uri string
     std::vector<std::string> metadata_servers_str;
-    for (auto &md_server : md_servers) {
+    for (auto &md_server : metadata_servers) {
       mysqlrouter::URI uri;
       uri.scheme = "mysql";
-      uri.host = md_server.host;
-      uri.port = md_server.port;
+      uri.host = md_server.address();
+      uri.port = md_server.port();
       metadata_servers_str.emplace_back(uri.str());
     }
 
@@ -134,7 +169,6 @@
 
  private:
   ClusterMetadataDynamicState &dynamic_state_;
-  std::string replicaset_name_;
 };
 
 /**
@@ -169,16 +203,8 @@
                  "is empty, too."));
     }
 
-    std::chrono::milliseconds ttl{config.ttl};
-    std::chrono::milliseconds auth_cache_ttl{config.auth_cache_ttl};
-    std::chrono::milliseconds auth_cache_refresh_interval{
-        config.auth_cache_refresh_interval};
-    std::string metadata_cluster{config.metadata_cluster};
-
-    // Initialize the defaults.
-    metadata_cluster = metadata_cluster.empty()
-                           ? metadata_cache::kDefaultMetadataCluster
-                           : metadata_cluster;
+    const metadata_cache::MetadataCacheTTLConfig ttl_config{
+        config.ttl, config.auth_cache_ttl, config.auth_cache_refresh_interval};
 
     std::string password;
     try {
@@ -199,39 +225,49 @@
 
     md_cache->instance_name(section->key);
 
-    const std::string replicaset_id = config.get_cluster_type_specific_id();
+    const std::string cluster_type_specific_id =
+        config.get_cluster_type_specific_id();
+
+    const std::string clusterset_id = config.get_clusterset_id();
 
-    md_cache->cache_init(config.cluster_type, config.router_id, replicaset_id,
-                         config.metadata_servers_addresses,
-                         {config.user, password}, ttl, auth_cache_ttl,
-                         auth_cache_refresh_interval, make_ssl_options(section),
-                         metadata_cluster, config.connect_timeout,
-                         config.read_timeout, config.thread_stack_size,
-                         config.use_gr_notifications, config.get_view_id());
+    const metadata_cache::MetadataCacheMySQLSessionConfig session_config{
+        {config.user, password},
+        (int)config.connect_timeout,
+        (int)config.read_timeout,
+        1};
+
+    // we currently support only single metadata-cache instance so there is no
+    // need for locking here
+    g_router_attributes.metadata_user_name = config.user;
+
+    md_cache->cache_init(
+        config.cluster_type, config.router_id, cluster_type_specific_id,
+        clusterset_id, config.metadata_servers_addresses, ttl_config,
+        make_ssl_options(section),
+        mysqlrouter::TargetCluster{
+            mysqlrouter::TargetCluster::TargetType::ByName,
+            config.cluster_name},
+        session_config, g_router_attributes, config.thread_stack_size,
+        config.use_gr_notifications, config.get_view_id());
 
     // register callback
     md_cache_dynamic_state = std::move(config.metadata_cache_dynamic_state);
     if (md_cache_dynamic_state) {
-      md_servers_state_listener.reset(new MetadataServersStateListener(
-          *md_cache_dynamic_state.get(), replicaset_id));
-      md_cache->add_state_listener(replicaset_id,
-                                   md_servers_state_listener.get());
+      md_servers_state_listener.reset(
+          new MetadataServersStateListener(*md_cache_dynamic_state.get()));
+      md_cache->add_state_listener(md_servers_state_listener.get());
     }
 
     // start metadata cache
     md_cache->cache_start();
   } catch (const std::runtime_error &exc) {  // metadata_cache::metadata_error
                                              // inherits from runtime_error
-    log_error("%s", exc.what());  // TODO remove after Loader starts logging
     set_error(env, mysql_harness::kRuntimeError, "%s", exc.what());
     clear_running(env);
   } catch (const std::invalid_argument &exc) {
-    log_error("%s", exc.what());  // TODO remove after Loader starts logging
     set_error(env, mysql_harness::kConfigInvalidArgument, "%s", exc.what());
     clear_running(env);
   } catch (...) {
-    log_error(
-        "Unexpected exception");  // TODO remove after Loader starts logging
     set_error(env, mysql_harness::kUndefinedError, "Unexpected exception");
     clear_running(env);
   }
diff -Nru mysql-8.0-8.0.26/router/src/metadata_cache/src/metadata_factory.cc mysql-8.0-8.0.27/router/src/metadata_cache/src/metadata_factory.cc
--- mysql-8.0-8.0.26/router/src/metadata_cache/src/metadata_factory.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/metadata_cache/src/metadata_factory.cc	2021-09-28 11:46:34.000000000 +0000
@@ -34,15 +34,7 @@
  *
  * @param cluster_type type of the cluster the metadata cache object will
  * represent (GR or ReplicaSet)
- * @param user The user name used to authenticate to the metadata server.
- * @param password The password used to authenticate to the metadata server.
- * @param connect_timeout The time after which trying to connect to the
- *                        metadata server should timeout.
- * @param read_timeout The time after which read from metadata server should
- *                     timeout.
- * @param connection_attempts The number of times a connection to the metadata
- *                            server must be attempted, when a connection
- *                            attempt fails.
+ * @param session_config Metadata MySQL session configuration
  * @param ssl_options SSL related options to be used for connection
  * @param use_cluster_notifications Flag indicating if the metadata cache
  *                                  should use cluster notifications as an
@@ -52,18 +44,19 @@
  *                for ReplicaSet cluster)
  */
 std::shared_ptr<MetaData> get_instance(
-    const mysqlrouter::ClusterType cluster_type, const std::string &user,
-    const std::string &password, int connect_timeout, int read_timeout,
-    int connection_attempts, const mysqlrouter::SSLOptions &ssl_options,
+    const mysqlrouter::ClusterType cluster_type,
+    const metadata_cache::MetadataCacheMySQLSessionConfig &session_config,
+    const mysqlrouter::SSLOptions &ssl_options,
     const bool use_cluster_notifications, const unsigned view_id) {
-  if (cluster_type == mysqlrouter::ClusterType::RS_V2) {
-    meta_data.reset(new ARClusterMetadata(user, password, connect_timeout,
-                                          read_timeout, connection_attempts,
-                                          ssl_options, view_id));
-  } else {
-    meta_data.reset(new GRClusterMetadata(
-        user, password, connect_timeout, read_timeout, connection_attempts,
-        ssl_options, use_cluster_notifications));
+  switch (cluster_type) {
+    case mysqlrouter::ClusterType::RS_V2:
+      meta_data.reset(
+          new ARClusterMetadata(session_config, ssl_options, view_id));
+      break;
+    default:
+      meta_data.reset(new GRClusterMetadata(session_config, ssl_options,
+                                            use_cluster_notifications));
   }
+
   return meta_data;
 }
diff -Nru mysql-8.0-8.0.26/router/src/metadata_cache/src/metadata_factory.h mysql-8.0-8.0.27/router/src/metadata_cache/src/metadata_factory.h
--- mysql-8.0-8.0.26/router/src/metadata_cache/src/metadata_factory.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/metadata_cache/src/metadata_factory.h	2021-09-28 11:46:34.000000000 +0000
@@ -36,9 +36,9 @@
 // fetched.
 
 std::shared_ptr<MetaData> get_instance(
-    const mysqlrouter::ClusterType cluster_type, const std::string &user,
-    const std::string &password, int connect_timeout, int read_timeout,
-    int connection_attempts, const mysqlrouter::SSLOptions &ssl_options,
-    const bool use_gr_notifications, const unsigned view_id);
+    const mysqlrouter::ClusterType cluster_type,
+    const metadata_cache::MetadataCacheMySQLSessionConfig &session_config,
+    const mysqlrouter::SSLOptions &ssl_options, const bool use_gr_notifications,
+    const unsigned view_id);
 
 #endif  // METADATA_CACHE_METADATA_FACTORY_INCLUDED
diff -Nru mysql-8.0-8.0.26/router/src/metadata_cache/src/metadata.h mysql-8.0-8.0.27/router/src/metadata_cache/src/metadata.h
--- mysql-8.0-8.0.26/router/src/metadata_cache/src/metadata.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/metadata_cache/src/metadata.h	2021-09-28 11:46:34.000000000 +0000
@@ -29,6 +29,7 @@
 
 #include <rapidjson/document.h>
 
+#include "mysql/harness/stdx/expected.h"
 #include "mysqlrouter/cluster_metadata.h"
 #include "mysqlrouter/metadata_cache.h"
 #include "mysqlrouter/mysql_session.h"
@@ -43,39 +44,38 @@
  */
 class METADATA_API MetaData {
  public:
-  using ReplicaSetsByName =
-      std::map<std::string, metadata_cache::ManagedReplicaSet>;
   using JsonAllocator = rapidjson::CrtAllocator;
   using JsonDocument = rapidjson::Document;
   // username as key, password hash and priviliges as value
   using auth_credentials_t =
       std::map<std::string, std::pair<std::string, JsonDocument>>;
-  // fetch instances from connected server
-  virtual ReplicaSetsByName fetch_instances(
-      const std::string &cluster_name,
-      const std::string &cluster_type_specific_id) = 0;
 
-  // fetch instances from vector of servers
-  virtual ReplicaSetsByName fetch_instances(
-      const std::vector<metadata_cache::ManagedInstance> &instances,
-      const std::string &cluster_type_specific_id,
-      std::size_t &instance_id) = 0;
-
-  virtual bool update_router_version(
-      const metadata_cache::ManagedInstance &rw_instance,
-      const unsigned router_id) = 0;
+  // fetch instances from vector of metadata servers
+  virtual stdx::expected<metadata_cache::ClusterTopology, std::error_code>
+  fetch_cluster_topology(
+      const std::atomic<bool> &terminated,
+      mysqlrouter::TargetCluster &target_cluster, const unsigned router_id,
+      const metadata_cache::metadata_servers_list_t &metadata_servers,
+      bool needs_writable_node, const std::string &cluster_type_specific_id,
+      const std::string &clusterset_id, std::size_t &instance_id) = 0;
+
+  virtual bool update_router_attributes(
+      const metadata_cache::metadata_server_t &rw_server,
+      const unsigned router_id,
+      const metadata_cache::RouterAttributes &router_attributes) = 0;
 
   virtual bool update_router_last_check_in(
-      const metadata_cache::ManagedInstance &rw_instance,
+      const metadata_cache::metadata_server_t &rw_server,
       const unsigned router_id) = 0;
 
   virtual bool connect_and_setup_session(
-      const metadata_cache::ManagedInstance &metadata_server) = 0;
+      const metadata_cache::metadata_server_t &metadata_server) = 0;
 
   virtual void disconnect() = 0;
 
   virtual void setup_notifications_listener(
       const std::vector<metadata_cache::ManagedInstance> &instances,
+      const mysqlrouter::TargetCluster &target_cluster,
       const std::function<void()> &callback) = 0;
 
   virtual void shutdown_notifications_listener() = 0;
@@ -85,7 +85,8 @@
   virtual mysqlrouter::ClusterType get_cluster_type() = 0;
 
   virtual auth_credentials_t fetch_auth_credentials(
-      const std::string &cluster_name) = 0;
+      const mysqlrouter::TargetCluster &target_cluster,
+      const std::string &cluster_type_specific_id) = 0;
 
   MetaData() = default;
   // disable copy as it isn't needed right now. Feel free to enable
diff -Nru mysql-8.0-8.0.26/router/src/metadata_cache/src/plugin_config.cc mysql-8.0-8.0.27/router/src/metadata_cache/src/plugin_config.cc
--- mysql-8.0-8.0.26/router/src/metadata_cache/src/plugin_config.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/metadata_cache/src/plugin_config.cc	2021-09-28 11:46:34.000000000 +0000
@@ -84,7 +84,16 @@
   return "";
 }
 
-unsigned MetadataCachePluginConfig::get_view_id() const {
+std::string MetadataCachePluginConfig::get_clusterset_id() const {
+  if (metadata_cache_dynamic_state) {
+    metadata_cache_dynamic_state->load();
+    return metadata_cache_dynamic_state->get_clusterset_id();
+  }
+
+  return "";
+}
+
+uint64_t MetadataCachePluginConfig::get_view_id() const {
   if (metadata_cache_dynamic_state) {
     metadata_cache_dynamic_state->load();
     return metadata_cache_dynamic_state->get_view_id();
diff -Nru mysql-8.0-8.0.26/router/src/metadata_cache/src/plugin_config.h mysql-8.0-8.0.27/router/src/metadata_cache/src/plugin_config.h
--- mysql-8.0-8.0.26/router/src/metadata_cache/src/plugin_config.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/metadata_cache/src/plugin_config.h	2021-09-28 11:46:34.000000000 +0000
@@ -59,7 +59,7 @@
             get_option_milliseconds(section, "auth_cache_ttl", -1, 3600.0)),
         auth_cache_refresh_interval(get_option_milliseconds(
             section, "auth_cache_refresh_interval", 0.001, 3600.0)),
-        metadata_cluster(get_option_string(section, "metadata_cluster")),
+        cluster_name(get_option_string(section, "metadata_cluster")),
         connect_timeout(
             get_uint_option<uint16_t>(section, "connect_timeout", 1)),
         read_timeout(get_uint_option<uint16_t>(section, "read_timeout", 1)),
@@ -93,7 +93,7 @@
   mutable std::unique_ptr<ClusterMetadataDynamicState>
       metadata_cache_dynamic_state;
   /** @brief MySQL Metadata hosts to connect with */
-  const std::vector<mysql_harness::TCPAddress> metadata_servers_addresses;
+  const metadata_cache::metadata_servers_list_t metadata_servers_addresses;
   /** @brief User used for authenticating with MySQL Metadata */
   const std::string user;
   /** @brief TTL used for storing data in the cache */
@@ -104,8 +104,9 @@
   /** @brief Refresh rate of the rest user authentication data stored in the
    * cache */
   const std::chrono::milliseconds auth_cache_refresh_interval;
-  /** @brief Cluster in the metadata */
-  const std::string metadata_cluster;
+  /** @brief Name of the Cluster this Router instance was bootstrapped to use.
+   */
+  const std::string cluster_name;
   /** @brief connect_timeout The time in seconds after which trying to connect
    * to metadata server timeouts */
   const unsigned int connect_timeout;
@@ -122,7 +123,7 @@
   /** @brief  Id of the router in the metadata. */
   const unsigned int router_id;
 
-  /** @brief Gets (Replication Group ID for GR cluster or cluster_id for
+  /** @brief Gets (Group Replication ID for GR cluster or cluster_id for
    * ReplicaSet cluster) if preset in the dynamic configuration.
    *
    * @note  If there is no dynamic configuration (backward compatibility) it
@@ -130,9 +131,11 @@
    */
   std::string get_cluster_type_specific_id() const;
 
+  std::string get_clusterset_id() const;
+
   /** @brief Gets last know ReplicaSet cluster metadata view_id stored in the
    * dynamic state file . */
-  unsigned get_view_id() const;
+  uint64_t get_view_id() const;
 
  private:
   /** @brief Gets a list of metadata servers.
diff -Nru mysql-8.0-8.0.26/router/src/metadata_cache/tests/CMakeLists.txt mysql-8.0-8.0.27/router/src/metadata_cache/tests/CMakeLists.txt
--- mysql-8.0-8.0.26/router/src/metadata_cache/tests/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/metadata_cache/tests/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -51,29 +51,29 @@
 
 # We do not link to the metadata cache libraries since the sources are
 # already built as part of the test libraries.
-IF(NOT WIN32)
-  ADD_LIBRARY(metadata_cache_tests SHARED ${METADATA_CACHE_TESTS_HELPER})
+IF(WIN32)
+  ADD_LIBRARY(metadata_cache_tests STATIC ${METADATA_CACHE_TESTS_HELPER})
   TARGET_LINK_LIBRARIES(metadata_cache_tests
     router_lib
+    metadata_cache
     mysqlclient
     mysqlxclient_lite
     mysqlxmessages_lite
     ${PROTOBUF_LITE_LIBRARY}
     )
+  TARGET_COMPILE_DEFINITIONS(metadata_cache_tests
+    PRIVATE -Dmetadata_cache_DEFINE_STATIC=1)
+  TARGET_COMPILE_DEFINITIONS(metadata_cache_tests
+    PRIVATE -Dmetadata_cache_tests_DEFINE_STATIC=1)
 ELSE()
-  ADD_LIBRARY(metadata_cache_tests STATIC ${METADATA_CACHE_TESTS_HELPER})
+  ADD_LIBRARY(metadata_cache_tests SHARED ${METADATA_CACHE_TESTS_HELPER})
   TARGET_LINK_LIBRARIES(metadata_cache_tests
     router_lib
-    metadata_cache
     mysqlclient
     mysqlxclient_lite
     mysqlxmessages_lite
     ${PROTOBUF_LITE_LIBRARY}
     )
-  TARGET_COMPILE_DEFINITIONS(metadata_cache_tests
-    PRIVATE -Dmetadata_cache_DEFINE_STATIC=1)
-  TARGET_COMPILE_DEFINITIONS(metadata_cache_tests
-    PRIVATE -Dmetadata_cache_tests_DEFINE_STATIC=1)
 ENDIF()
 
 SET_PATH_TO_CUSTOM_SSL_FOR_APPLE(metadata_cache_tests)
diff -Nru mysql-8.0-8.0.26/router/src/metadata_cache/tests/helper/mock_metadata.cc mysql-8.0-8.0.27/router/src/metadata_cache/tests/helper/mock_metadata.cc
--- mysql-8.0-8.0.26/router/src/metadata_cache/tests/helper/mock_metadata.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/metadata_cache/tests/helper/mock_metadata.cc	2021-09-28 11:46:34.000000000 +0000
@@ -32,99 +32,40 @@
 
 using namespace std;
 
-MockNG::MockNG(const std::string &user, const std::string &password,
-               int connect_timeout, int read_timeout, int connection_attempts,
-               const mysqlrouter::SSLOptions &ssl_options,
-               const bool use_cluster_notifications)
-    : GRClusterMetadata(user, password, connect_timeout, read_timeout,
-                        connection_attempts, ssl_options,
+MockNG::MockNG(
+    const metadata_cache::MetadataCacheMySQLSessionConfig &session_config,
+    const mysqlrouter::SSLOptions &ssl_options,
+    const bool use_cluster_notifications)
+    : GRClusterMetadata(session_config, ssl_options,
                         use_cluster_notifications) {
-  ms1.replicaset_name = "replicaset-1";
   ms1.mysql_server_uuid = "instance-1";
   ms1.host = "host-1";
   ms1.port = 3306;
   ms1.xport = 33060;
   ms1.mode = metadata_cache::ServerMode::ReadWrite;
 
-  ms2.replicaset_name = "replicaset-1";
   ms2.mysql_server_uuid = "instance-2";
   ms2.host = "host-2";
   ms2.port = 3306;
   ms2.xport = 33060;
   ms2.mode = metadata_cache::ServerMode::ReadOnly;
 
-  ms3.replicaset_name = "replicaset-1";
   ms3.mysql_server_uuid = "instance-3";
   ms3.host = "host-3";
   ms3.port = 3306;
   ms3.xport = 33060;
   ms3.mode = metadata_cache::ServerMode::ReadOnly;
 
-  ms4.replicaset_name = "replicaset-2";
-  ms4.mysql_server_uuid = "instance-4";
-  ms4.host = "host-4";
-  ms4.port = 3306;
-  ms4.xport = 33060;
-  ms4.mode = metadata_cache::ServerMode::ReadWrite;
-
-  ms5.replicaset_name = "replicaset-2";
-  ms5.mysql_server_uuid = "instance-5";
-  ms5.host = "host-5";
-  ms5.port = 3306;
-  ms5.xport = 33060;
-  ms5.mode = metadata_cache::ServerMode::ReadOnly;
-
-  ms6.replicaset_name = "replicaset-2";
-  ms6.mysql_server_uuid = "instance-6";
-  ms6.host = "host-6";
-  ms6.port = 3306;
-  ms6.xport = 33060;
-  ms6.mode = metadata_cache::ServerMode::ReadOnly;
-
-  ms7.replicaset_name = "replicaset-3";
-  ms7.mysql_server_uuid = "instance-7";
-  ms7.host = "host-7";
-  ms7.port = 3306;
-  ms7.xport = 33060;
-  ms7.mode = metadata_cache::ServerMode::ReadWrite;
-
-  ms8.replicaset_name = "replicaset-3";
-  ms8.mysql_server_uuid = "instance-8";
-  ms8.host = "host-8";
-  ms8.port = 3306;
-  ms8.xport = 33060;
-  ms8.mode = metadata_cache::ServerMode::ReadWrite;
-
-  ms9.replicaset_name = "replicaset-3";
-  ms9.mysql_server_uuid = "instance-9";
-  ms9.host = "host-9";
-  ms9.port = 3306;
-  ms9.xport = 33060;
-  ms9.mode = metadata_cache::ServerMode::ReadWrite;
-
-  replicaset_1_vector.push_back(ms1);
-  replicaset_1_vector.push_back(ms2);
-  replicaset_1_vector.push_back(ms3);
-
-  replicaset_2_vector.push_back(ms4);
-  replicaset_2_vector.push_back(ms5);
-  replicaset_2_vector.push_back(ms6);
-
-  replicaset_3_vector.push_back(ms7);
-  replicaset_3_vector.push_back(ms8);
-  replicaset_3_vector.push_back(ms9);
-
-  replicaset_map["replicaset-1"].name = "replicaset-1";
-  replicaset_map["replicaset-1"].single_primary_mode = true;
-  replicaset_map["replicaset-1"].members = replicaset_1_vector;
-
-  replicaset_map["replicaset-2"].name = "replicaset-2";
-  replicaset_map["replicaset-2"].single_primary_mode = true;
-  replicaset_map["replicaset-2"].members = replicaset_2_vector;
-
-  replicaset_map["replicaset-3"].name = "replicaset-3";
-  replicaset_map["replicaset-3"].single_primary_mode = false;
-  replicaset_map["replicaset-3"].members = replicaset_3_vector;
+  cluster_instances_vector.push_back(ms1);
+  cluster_instances_vector.push_back(ms2);
+  cluster_instances_vector.push_back(ms3);
+
+  cluster_info.single_primary_mode = true;
+  cluster_info.members = cluster_instances_vector;
+
+  metadata_servers.push_back({ms1.host, ms1.port});
+  metadata_servers.push_back({ms2.host, ms2.port});
+  metadata_servers.push_back({ms3.host, ms3.port});
 }
 
 /** @brief Destructor
@@ -133,23 +74,20 @@
  */
 MockNG::~MockNG() = default;
 
-/** @brief Returns relation between replicaset ID and list of servers
+/** @brief Returns cluster topology information object
  *
- * Returns relation as a std::map between replicaset ID and list of managed
- * servers.
  *
- * @return Map of replicaset ID, server list pairs.
+ * @return cluster topology information.
  */
-ClusterMetadata::ReplicaSetsByName MockNG::fetch_instances(
-    const std::string & /*cluster_name*/,
-    const string & /*group_replication_id*/) {
-  return replicaset_map;
-}
-
-ClusterMetadata::ReplicaSetsByName MockNG::fetch_instances(
-    const std::vector<metadata_cache::ManagedInstance> & /*instances*/,
-    const string & /*group_replication_id*/, size_t & /*instance_id*/) {
-  return replicaset_map;
+stdx::expected<metadata_cache::ClusterTopology, std::error_code>
+MockNG::fetch_cluster_topology(
+    const std::atomic<bool> & /*terminated*/,
+    mysqlrouter::TargetCluster & /*target_cluster*/,
+    const unsigned /*router_id*/,
+    const metadata_cache::metadata_servers_list_t & /*metadata_servers*/,
+    bool /* needs_writable_node */, const string & /*group_replication_id*/,
+    const string & /*clusterset_id*/, size_t & /*instance_id*/) {
+  return metadata_cache::ClusterTopology{cluster_info, metadata_servers};
 }
 
 /** @brief Mock connect method.
@@ -159,7 +97,7 @@
  * @return a boolean to indicate if the connection was successful.
  */
 bool MockNG::connect_and_setup_session(
-    const metadata_cache::ManagedInstance &metadata_server) noexcept {
+    const metadata_cache::metadata_server_t &metadata_server) noexcept {
   (void)metadata_server;
   return true;
 }
diff -Nru mysql-8.0-8.0.26/router/src/metadata_cache/tests/helper/mock_metadata_factory.cc mysql-8.0-8.0.27/router/src/metadata_cache/tests/helper/mock_metadata_factory.cc
--- mysql-8.0-8.0.26/router/src/metadata_cache/tests/helper/mock_metadata_factory.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/metadata_cache/tests/helper/mock_metadata_factory.cc	2021-09-28 11:46:34.000000000 +0000
@@ -30,12 +30,11 @@
 std::shared_ptr<MetaData> meta_data;
 
 std::shared_ptr<MetaData> get_instance(
-    mysqlrouter::ClusterType /*cluster_type*/, const std::string &user,
-    const std::string &password, int connect_timeout, int read_timeout,
-    int connection_attempts, const mysqlrouter::SSLOptions &ssl_options,
+    mysqlrouter::ClusterType /*cluster_type*/,
+    const metadata_cache::MetadataCacheMySQLSessionConfig &session_config,
+    const mysqlrouter::SSLOptions &ssl_options,
     const bool use_cluster_notifications, unsigned /*view_id*/ = 0) {
-  meta_data.reset(new MockNG(user, password, connect_timeout, read_timeout,
-                             connection_attempts, ssl_options,
-                             use_cluster_notifications));
+  meta_data.reset(
+      new MockNG(session_config, ssl_options, use_cluster_notifications));
   return meta_data;
 }
diff -Nru mysql-8.0-8.0.26/router/src/metadata_cache/tests/helper/mock_metadata.h mysql-8.0-8.0.27/router/src/metadata_cache/tests/helper/mock_metadata.h
--- mysql-8.0-8.0.26/router/src/metadata_cache/tests/helper/mock_metadata.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/metadata_cache/tests/helper/mock_metadata.h	2021-09-28 11:46:34.000000000 +0000
@@ -58,44 +58,29 @@
   metadata_cache::ManagedInstance ms1;
   metadata_cache::ManagedInstance ms2;
   metadata_cache::ManagedInstance ms3;
-  metadata_cache::ManagedInstance ms4;
-  metadata_cache::ManagedInstance ms5;
-  metadata_cache::ManagedInstance ms6;
-  metadata_cache::ManagedInstance ms7;
-  metadata_cache::ManagedInstance ms8;
-  metadata_cache::ManagedInstance ms9;
 
   /**
-   * Server list for each replicaset in the topology. Each server object
-   * represents all relevant information about the server that is
-   * part of the topology.
-   */
-  std::vector<metadata_cache::ManagedInstance> replicaset_1_vector;
-  std::vector<metadata_cache::ManagedInstance> replicaset_2_vector;
-  std::vector<metadata_cache::ManagedInstance> replicaset_3_vector;
+   * Server list for the cluster. Each server object
+   * represents all relevant information about the server that is part of the
+   * topology.
+   */
+  metadata_cache::cluster_nodes_list_t cluster_instances_vector;
 
   /**
    * The information about the HA topology being managed.
    */
-  ReplicaSetsByName replicaset_map;
+  metadata_cache::ManagedCluster cluster_info;
+
+  metadata_cache::metadata_servers_list_t metadata_servers;
 
   /** @brief Constructor
-   * @param user The user name used to authenticate to the metadata server.
-   * @param password The password used to authenticate to the metadata server.
-   * @param connect_timeout The time after which trying to connect to the
-   *                        metadata server should timeout.
-   * @param read_timeout The time after which read from the metadata server
-   *                     should timeout.
-   * @param connection_attempts The number of times a connection to the metadata
-   *                            server must be attempted, when a connection
-   *                            attempt fails.
+   * @param session_config Metadata MySQL session configuration
    * @param use_cluster_notifications Flag indicating if the metadata cache
    *                                  should use cluster notifications as an
    *                                  additional trigger for metadata refresh
    *                                  (only available for GR cluster type)
    */
-  MockNG(const std::string &user, const std::string &password,
-         int connect_timeout, int read_timeout, int connection_attempts,
+  MockNG(const metadata_cache::MetadataCacheMySQLSessionConfig &session_config,
          const mysqlrouter::SSLOptions &ssl_options = mysqlrouter::SSLOptions(),
          const bool use_cluster_notifications = false);
 
@@ -111,8 +96,8 @@
    *
    * @return a boolean to indicate if the connection was successful.
    */
-  bool connect_and_setup_session(
-      const metadata_cache::ManagedInstance &metadata_server) noexcept override;
+  bool connect_and_setup_session(const metadata_cache::metadata_server_t
+                                     &metadata_server) noexcept override;
 
   /** @brief Mock disconnect method.
    *
@@ -123,18 +108,17 @@
 
   /**
    *
-   * Returns relation as a std::map between replicaset ID and list of managed
-   * servers.
+   * Returns cluster topology object.
    *
-   * @return Map of replicaset ID, server list pairs.
+   * @return Cluster topology object.
    */
-  ReplicaSetsByName fetch_instances(
-      const std::string &farm_name,
-      const std::string &group_replication_id) override;
-
-  ReplicaSetsByName fetch_instances(
-      const std::vector<metadata_cache::ManagedInstance> &instances,
-      const std::string &group_replication_id, size_t &instance_id) override;
+  stdx::expected<metadata_cache::ClusterTopology, std::error_code>
+  fetch_cluster_topology(
+      const std::atomic<bool> & /*terminated*/,
+      mysqlrouter::TargetCluster &target_cluster, const unsigned /*router_id*/,
+      const metadata_cache::metadata_servers_list_t &metadata_servers,
+      bool needs_writable_node, const std::string &group_replication_id,
+      const std::string &clusterset_id, size_t &instance_id) override;
 
 #if 0  // not used so far
   /**
diff -Nru mysql-8.0-8.0.26/router/src/metadata_cache/tests/test_cache_plugin.cc mysql-8.0-8.0.27/router/src/metadata_cache/tests/test_cache_plugin.cc
--- mysql-8.0-8.0.26/router/src/metadata_cache/tests/test_cache_plugin.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/metadata_cache/tests/test_cache_plugin.cc	2021-09-28 11:46:34.000000000 +0000
@@ -27,6 +27,7 @@
  */
 
 #include "mock_metadata.h"
+#include "mysqlrouter/cluster_metadata.h"
 #include "mysqlrouter/metadata_cache.h"
 #include "tcp_address.h"
 #include "test/helpers.h"
@@ -43,10 +44,6 @@
  */
 const unsigned kRouterId = 2;
 const std::string replication_group_id = "0000-0000-0001";
-const std::string kDefaultTestReplicaset_1 = "replicaset-1";  // replicaset-1
-const std::string kDefaultTestReplicaset_2 = "replicaset-2";  // replicaset-2
-const std::string kDefaultTestReplicaset_3 = "replicaset-3";  // replicaset-3
-
 const std::string kDefaultMetadataHost = "127.0.0.1";  // 127.0.0.1
 const std::string kDefaultMetadataUser = "admin";      // admin
 const std::string kDefaultMetadataPassword = "";       //
@@ -55,7 +52,7 @@
 const std::chrono::milliseconds kDefaultAuthCacheTTL = std::chrono::seconds(2);
 const std::chrono::milliseconds kDefaultAuthCacheRefreshInterval =
     std::chrono::milliseconds(-1);
-const std::string kDefaultMetadataReplicaset = "replicaset-1";
+const std::string kDefaultClusterName = "cluster_name_1";
 
 const mysql_harness::TCPAddress bootstrap_server(kDefaultMetadataHost,
                                                  kDefaultMetadataPort);
@@ -70,16 +67,19 @@
   MockNG mf;
 
   MetadataCachePluginTest()
-      : mf(kDefaultMetadataUser, kDefaultMetadataPassword, 1, 1, 1) {}
+      : mf({{kDefaultMetadataUser, kDefaultMetadataPassword}, 1, 1, 1}) {}
 
   void SetUp() override {
     std::vector<ManagedInstance> instance_vector_1;
     metadata_cache::MetadataCacheAPI::instance()->cache_init(
-        mysqlrouter::ClusterType::GR_V1, kRouterId, replication_group_id,
+        mysqlrouter::ClusterType::GR_V1, kRouterId, replication_group_id, "",
         metadata_server_vector,
-        {kDefaultMetadataUser, kDefaultMetadataPassword}, kDefaultMetadataTTL,
-        kDefaultAuthCacheTTL, kDefaultAuthCacheRefreshInterval,
-        mysqlrouter::SSLOptions(), kDefaultMetadataReplicaset, 1, 1);
+        {kDefaultMetadataTTL, kDefaultAuthCacheTTL,
+         kDefaultAuthCacheRefreshInterval},
+        mysqlrouter::SSLOptions(),
+        {mysqlrouter::TargetCluster::TargetType::ByName, kDefaultClusterName},
+        {{kDefaultMetadataUser, kDefaultMetadataPassword}, 1, 1, 1},
+        metadata_cache::RouterAttributes{});
     metadata_cache::MetadataCacheAPI::instance()->cache_start();
     int count = 1;
     /**
@@ -89,9 +89,7 @@
      */
     while (instance_vector_1.size() != 3) {
       try {
-        instance_vector_1 =
-            cache_api_->lookup_replicaset(kDefaultTestReplicaset_1)
-                .instance_vector;
+        instance_vector_1 = cache_api_->get_cluster_nodes().instance_vector;
       } catch (const std::runtime_error &exc) {
         /**
          * If the lookup fails after 5 attempts it points to an error
@@ -115,19 +113,11 @@
 };
 
 /**
- * Test that looking up an invalid replicaset returns a empty list.
- */
-TEST_F(MetadataCachePluginTest, InvalidReplicasetTest) {
-  EXPECT_TRUE(cache_api_->lookup_replicaset("InvalidReplicaset")
-                  .instance_vector.empty());
-}
-
-/**
- * Test that the list of servers that are part of a replicaset is accurate.
+ * Test that the list of servers that are part of a cluster is accurate.
  */
-TEST_F(MetadataCachePluginTest, ValidReplicasetTest_1) {
+TEST_F(MetadataCachePluginTest, ValidCluserTest_1) {
   std::vector<ManagedInstance> instance_vector_1 =
-      cache_api_->lookup_replicaset(kDefaultTestReplicaset_1).instance_vector;
+      cache_api_->get_cluster_nodes().instance_vector;
 
   EXPECT_EQ(instance_vector_1[0], mf.ms1);
   EXPECT_EQ(instance_vector_1[1], mf.ms2);
diff -Nru mysql-8.0-8.0.26/router/src/metadata_cache/tests/test_failover.cc mysql-8.0-8.0.27/router/src/metadata_cache/tests/test_failover.cc
--- mysql-8.0-8.0.26/router/src/metadata_cache/tests/test_failover.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/metadata_cache/tests/test_failover.cc	2021-09-28 11:46:34.000000000 +0000
@@ -72,17 +72,23 @@
         [](mysqlrouter::MySQLSession *) {}   // and don't try deleting it!
     );
 
-    cmeta = std::make_shared<GRClusterMetadata>("admin", "admin", 1, 1, 1,
-                                                mysqlrouter::SSLOptions());
+    cmeta = std::make_shared<GRClusterMetadata>(
+        metadata_cache::MetadataCacheMySQLSessionConfig{
+            {"admin", "admin"}, 1, 1, 1},
+        mysqlrouter::SSLOptions());
   }
 
   void init_cache() {
     cache = std::make_shared<GRMetadataCache>(
-        kRouterId, group_uuid,
+        kRouterId, group_uuid, "",
         std::vector<mysql_harness::TCPAddress>{
             {"localhost", 32275},
         },
-        cmeta, 10s, -1s, 20s, mysqlrouter::SSLOptions(), "cluster-1",
+        cmeta, metadata_cache::MetadataCacheTTLConfig{10s, -1s, 20s},
+        mysqlrouter::SSLOptions(),
+        mysqlrouter::TargetCluster{
+            mysqlrouter::TargetCluster::TargetType::ByName, "cluster-1"},
+        metadata_cache::RouterAttributes{},
         mysql_harness::kDefaultStackSizeInKiloBytes, false);
   }
 
@@ -219,6 +225,8 @@
   time_t start_time_;
 };
 
+namespace std {
+
 std::ostream &operator<<(std::ostream &os, const ServerMode &v) {
   switch (v) {
     case ServerMode::ReadOnly:
@@ -243,13 +251,14 @@
   os << "port: " << v.port << ", ";
   os << "xport: " << v.xport << ", ";
   os << "mode: " << v.mode << ", ";
-  os << "mysql_server_uuid: " << v.mysql_server_uuid << ", ";
-  os << "replicaset_name: " << v.replicaset_name;
+  os << "mysql_server_uuid: " << v.mysql_server_uuid;
   os << "}";
 
   return os;
 }
 
+}  // namespace std
+
 MATCHER(PartialInstanceMatcher, "" /* defaults to 'uuid matcher' */) {
   using namespace ::testing;
 
@@ -270,7 +279,7 @@
   ASSERT_NO_THROW(init_cache());
   expect_metadata_1();
   expect_group_members_1();
-  cache->refresh();
+  cache->refresh(true);
 
   // ensure no expected queries leftover
   ASSERT_FALSE(session->print_expected());
@@ -278,7 +287,7 @@
   // ensure that the instance list returned by a lookup is the expected one
   // in the case everything's online and well
 
-  ASSERT_THAT(cache->replicaset_lookup(replicaset_name),
+  ASSERT_THAT(cache->get_cluster_nodes(),
               ::testing::Pointwise(
                   PartialInstanceMatcher(),
                   std::initializer_list<std::tuple<const char *, ServerMode>>{
@@ -290,15 +299,14 @@
   // ----------------------------------------------------------------
   expect_metadata_1();
   expect_group_members_1();
-  ASSERT_NO_THROW(cache->refresh());
+  ASSERT_NO_THROW(cache->refresh(true));
 
   cache->mark_instance_reachability(
       node_1_uuid, metadata_cache::InstanceStatus::Unreachable);
   // this should fail with timeout b/c no primary yet
   {
     DelayCheck t;
-    EXPECT_FALSE(
-        cache->wait_primary_failover(replicaset_name, node_1_uuid, 1s));
+    EXPECT_FALSE(cache->wait_primary_failover(node_1_uuid, 1s));
     EXPECT_GE(t.time_elapsed(), 1);
   }
 }
@@ -307,13 +315,13 @@
   ASSERT_NO_THROW(init_cache());
   expect_metadata_1();
   expect_group_members_1();
-  cache->refresh();
+  cache->refresh(true);
   // ensure no expected queries leftover
   ASSERT_FALSE(session->print_expected());
 
   // primary is still visible, even tho it's dead.. that's because we pretend
   // we're getting updates from an instance that hasn't noticed that yet
-  ASSERT_THAT(cache->replicaset_lookup(replicaset_name),
+  ASSERT_THAT(cache->get_cluster_nodes(),
               ::testing::Pointwise(
                   PartialInstanceMatcher(),
                   std::initializer_list<std::tuple<const char *, ServerMode>>{
@@ -325,9 +333,9 @@
   // ---------------------------------------------------
   expect_metadata_1();
   expect_group_members_1_primary_fail(nullptr, node_2_uuid);
-  ASSERT_NO_THROW(cache->refresh());
+  ASSERT_NO_THROW(cache->refresh(true));
 
-  ASSERT_THAT(cache->replicaset_lookup(replicaset_name),
+  ASSERT_THAT(cache->get_cluster_nodes(),
               ::testing::Pointwise(
                   PartialInstanceMatcher(),
                   std::initializer_list<std::tuple<const char *, ServerMode>>{
@@ -338,7 +346,7 @@
   // this should succeed
   {
     DelayCheck t;
-    EXPECT_TRUE(cache->wait_primary_failover(replicaset_name, node_1_uuid, 2s));
+    EXPECT_TRUE(cache->wait_primary_failover(node_1_uuid, 2s));
     EXPECT_LE(t.time_elapsed(), 1);
   }
 }
@@ -347,7 +355,7 @@
   ASSERT_NO_THROW(init_cache());
   expect_metadata_1();
   expect_group_members_1();
-  ASSERT_NO_THROW(cache->refresh());
+  ASSERT_NO_THROW(cache->refresh(true));
 
   cache->mark_instance_reachability(
       node_1_uuid, metadata_cache::InstanceStatus::Unreachable);
@@ -357,8 +365,7 @@
     // even though we wait for 10s for the primary failover the function should
     // return promptly when the catche->stop() gets called (mimicking terminate
     // request)
-    EXPECT_FALSE(
-        cache->wait_primary_failover(replicaset_name, node_1_uuid, 10s));
+    EXPECT_FALSE(cache->wait_primary_failover(node_1_uuid, 10s));
     EXPECT_LE(t.time_elapsed(), 1);
   });
 
diff -Nru mysql-8.0-8.0.26/router/src/metadata_cache/tests/test_metadata_cache.cc mysql-8.0-8.0.27/router/src/metadata_cache/tests/test_metadata_cache.cc
--- mysql-8.0-8.0.26/router/src/metadata_cache/tests/test_metadata_cache.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/metadata_cache/tests/test_metadata_cache.cc	2021-09-28 11:46:34.000000000 +0000
@@ -40,6 +40,7 @@
 
 using metadata_cache::ManagedInstance;
 using mysql_harness::TCPAddress;
+using namespace std::chrono_literals;
 
 constexpr unsigned kRouterId = 2;
 
@@ -49,14 +50,18 @@
   GRMetadataCache cache;
 
   MetadataCacheTest()
-      : mf("admin", "admin", 1, 1, 1),
-        cache(kRouterId, "0000-0001", {TCPAddress("localhost", 32275)},
-              get_instance(mysqlrouter::ClusterType::GR_V1, "admin", "admin", 1,
-                           1, 1, mysqlrouter::SSLOptions(), false, 0),
-              std::chrono::seconds(10), std::chrono::seconds(-1),
-              std::chrono::seconds(20), mysqlrouter::SSLOptions(),
-              "replicaset-1") {
-    cache.refresh();
+      : mf(metadata_cache::MetadataCacheMySQLSessionConfig{
+            {"admin", "admin"}, 1, 1, 1}),
+        cache(kRouterId, "0000-0001", "", {TCPAddress("localhost", 32275)},
+              get_instance(mysqlrouter::ClusterType::GR_V1,
+                           metadata_cache::MetadataCacheMySQLSessionConfig{
+                               {"admin", "admin"}, 1, 1, 1},
+                           mysqlrouter::SSLOptions(), false, 0),
+              metadata_cache::MetadataCacheTTLConfig{10s, -1s, 20s},
+              mysqlrouter::SSLOptions(),
+              {mysqlrouter::TargetCluster::TargetType::ByName, "cluster-1"},
+              metadata_cache::RouterAttributes{}) {
+    cache.refresh(true);
   }
 };
 
@@ -66,24 +71,13 @@
 TEST_F(MetadataCacheTest, ValidReplicasetTest_1) {
   std::vector<ManagedInstance> instance_vector_1;
 
-  instance_vector_1 = cache.replicaset_lookup("replicaset-1");
+  instance_vector_1 = cache.get_cluster_nodes();
   ASSERT_EQ(3U, instance_vector_1.size());
   EXPECT_EQ(instance_vector_1[0], mf.ms1);
   EXPECT_EQ(instance_vector_1[1], mf.ms2);
   EXPECT_EQ(instance_vector_1[2], mf.ms3);
 }
 
-/**
- * Test that looking up an invalid replicaset returns a empty list.
- */
-TEST_F(MetadataCacheTest, InvalidReplicasetTest) {
-  std::vector<ManagedInstance> instance_vector;
-
-  instance_vector = cache.replicaset_lookup("InvalidReplicasetTest");
-
-  EXPECT_TRUE(instance_vector.empty());
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 //
 // Test Metadata Cache vs metadata server availabilty
@@ -99,8 +93,10 @@
         [this]() { return session.get(); },  // provide pointer to session
         [](mysqlrouter::MySQLSession *) {}   // and don't try deleting it!
     );
-    cmeta.reset(new GRClusterMetadata("admin", "admin", 1, 1, 1,
-                                      mysqlrouter::SSLOptions()));
+    cmeta.reset(new GRClusterMetadata(
+        metadata_cache::MetadataCacheMySQLSessionConfig{
+            {"admin", "admin"}, 1, 1, 1},
+        mysqlrouter::SSLOptions()));
   }
 
   // make queries on metadata schema return a 3 members replicaset
@@ -195,7 +191,7 @@
 };
 
 void expect_cluster_routable(MetadataCache &mc) {
-  std::vector<ManagedInstance> instances = mc.replicaset_lookup("cluster-1");
+  std::vector<ManagedInstance> instances = mc.get_cluster_nodes();
   ASSERT_EQ(3U, instances.size());
   EXPECT_EQ("uuid-server1", instances[0].mysql_server_uuid);
   EXPECT_EQ(metadata_cache::ServerMode::ReadWrite, instances[0].mode);
@@ -206,7 +202,7 @@
 }
 
 void expect_cluster_not_routable(GRMetadataCache &mc) {
-  std::vector<ManagedInstance> instances = mc.replicaset_lookup("cluster-1");
+  std::vector<ManagedInstance> instances = mc.get_cluster_nodes();
   ASSERT_EQ(0U, instances.size());
 }
 
@@ -215,11 +211,13 @@
   expect_sql_metadata();
   expect_sql_members();
 
-  GRMetadataCache mc(kRouterId, gr_id, metadata_servers, cmeta,
-                     std::chrono::seconds(10), std::chrono::seconds(-1),
-                     std::chrono::seconds(20), mysqlrouter::SSLOptions(),
-                     "cluster-1");
-  mc.refresh();
+  GRMetadataCache mc(
+      kRouterId, gr_id, "", metadata_servers, cmeta,
+      metadata_cache::MetadataCacheTTLConfig{10s, -1s, 20s},
+      mysqlrouter::SSLOptions(),
+      {mysqlrouter::TargetCluster::TargetType::ByName, "cluster-1"},
+      metadata_cache::RouterAttributes{});
+  mc.refresh(true);
 
   // verify that cluster can be seen
   expect_cluster_routable(mc);
@@ -229,7 +227,7 @@
   // refresh MC
   expect_sql_metadata();
   expect_sql_members();
-  mc.refresh();
+  mc.refresh(true);
 
   // verify that cluster can be seen
   expect_cluster_routable(mc);
@@ -247,11 +245,13 @@
   // start off with all metadata servers up
   expect_sql_metadata();
   expect_sql_members();
-  GRMetadataCache mc(kRouterId, gr_id, metadata_servers, cmeta,
-                     std::chrono::seconds(10), std::chrono::seconds(-1),
-                     std::chrono::seconds(20), mysqlrouter::SSLOptions(),
-                     "cluster-1");
-  mc.refresh();
+  GRMetadataCache mc(
+      kRouterId, gr_id, "", metadata_servers, cmeta,
+      metadata_cache::MetadataCacheTTLConfig{10s, -1s, 20s},
+      mysqlrouter::SSLOptions(),
+      {mysqlrouter::TargetCluster::TargetType::ByName, "cluster-1"},
+      metadata_cache::RouterAttributes{});
+  mc.refresh(true);
   expect_cluster_routable(mc);
 
   // refresh: fail connecting to first metadata server
@@ -259,7 +259,7 @@
       .then_error("some fake bad connection message", 66);
   expect_sql_metadata();
   expect_sql_members();
-  mc.refresh();
+  mc.refresh(true);
   expect_cluster_routable(mc);
 
   // refresh: fail connecting to all 3 metadata servers
@@ -269,7 +269,7 @@
       .then_error("some fake bad connection message", 66);
   m.expect_connect("127.0.0.1", 3002, "admin", "admin", "")
       .then_error("some fake bad connection message", 66);
-  mc.refresh();
+  mc.refresh(true);
   expect_cluster_not_routable(mc);  // lookup should return nothing (all route
                                     // paths should have been cleared)
 
@@ -280,7 +280,7 @@
       .then_error("some fake bad connection message", 66);
   expect_sql_metadata();
   expect_sql_members();
-  mc.refresh();
+  mc.refresh(true);
   expect_cluster_routable(mc);  // lookup should see the cluster again
 }
 
diff -Nru mysql-8.0-8.0.26/router/src/metadata_cache/tests/test_metadata.cc mysql-8.0-8.0.27/router/src/metadata_cache/tests/test_metadata.cc
--- mysql-8.0-8.0.26/router/src/metadata_cache/tests/test_metadata.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/metadata_cache/tests/test_metadata.cc	2021-09-28 11:46:34.000000000 +0000
@@ -71,14 +71,14 @@
 using ::testing::StartsWith;
 using ::testing::Throw;
 
+using metadata_cache::ManagedCluster;
 using metadata_cache::ManagedInstance;
-using metadata_cache::ManagedReplicaSet;
 using metadata_cache::ServerMode;
 using mysqlrouter::MySQLSession;
 
 using State = GroupReplicationMember::State;
 using Role = GroupReplicationMember::Role;
-using RS = metadata_cache::ReplicasetStatus;
+using RS = metadata_cache::ClusterStatus;
 
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ -98,10 +98,6 @@
 //   help diagnose problems faster, as the stuff tested later depends on the
 //   stuff tested earlier.
 //
-// TODO: At the time of writing, tests don't test multiple replicaset scenarios.
-//       The code will probably work as is, but "it doesn't work until it's
-//       proven by a unit test".
-//
 ////////////////////////////////////////////////////////////////////////////////
 
 /**
@@ -132,18 +128,29 @@
 
 // query #2 (occurs second) - fetches primary member as seen by a particular
 // node
-std::string query_primary_member =
+const std::string query_primary_member =
     "show status like 'group_replication_primary_member'";
 
 // query #3 (occurs last) - fetches current topology as seen by a particular
 // node
-std::string query_status =
+const std::string query_status =
     "SELECT "
     "member_id, member_host, member_port, member_state, "
     "@@group_replication_single_primary_mode "
     "FROM performance_schema.replication_group_members "
     "WHERE channel_name = 'group_replication_applier'";
 
+const std::string setup_session1 =
+    "SET @@SESSION.autocommit=1, @@SESSION.character_set_client=utf8, "
+    "@@SESSION.character_set_results=utf8, "
+    "@@SESSION.character_set_connection=utf8, "
+    "@@SESSION.sql_mode='ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_"
+    "DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION', "
+    "@@SESSION.optimizer_switch='derived_merge=on'";
+
+const std::string setup_session2 =
+    "SET @@SESSION.group_replication_consistency='EVENTUAL'";
+
 ////////////////////////////////////////////////////////////////////////////////
 //
 // mock classes
@@ -253,15 +260,13 @@
   // not being set at the time of writing):
   //   ServerMode mode;
 
-  return lhs.replicaset_name == rhs.replicaset_name &&
-         lhs.mysql_server_uuid == rhs.mysql_server_uuid &&
+  return lhs.mysql_server_uuid == rhs.mysql_server_uuid &&
          lhs.host == rhs.host && lhs.port == rhs.port && lhs.xport == rhs.xport;
 }
 
 static bool cmp_mi_FI(const ManagedInstance &lhs, const ManagedInstance &rhs) {
   // This function compares fields set by Metadata::fetch_instances().
-  return lhs.replicaset_name == rhs.replicaset_name &&
-         lhs.mysql_server_uuid == rhs.mysql_server_uuid &&
+  return lhs.mysql_server_uuid == rhs.mysql_server_uuid &&
          lhs.mode == rhs.mode && lhs.host == rhs.host && lhs.port == rhs.port &&
          lhs.xport == rhs.xport;
 }
@@ -300,11 +305,10 @@
 
   void connect_to_first_metadata_server() {
     std::vector<ManagedInstance> metadata_servers{
-        {"replicaset-1", "instance-1", ServerMode::ReadWrite, "localhost", 3310,
-         33100},
+        {"instance-1", ServerMode::ReadWrite, "localhost", 3310, 33100},
     };
     session_factory.get(0).set_good_conns(
-        {"127.0.0.1:3310", "127.0.0.1:3320", "127.0.0.1:3330"});
+        {"localhost:3310", "localhost:3320", "localhost:3330"});
 
     EXPECT_CALL(session_factory.get(0), flag_succeed(_, 3310)).Times(1);
     EXPECT_TRUE(metadata.connect_and_setup_session(metadata_servers[0]));
@@ -312,7 +316,7 @@
 
   void enable_connection(unsigned session, unsigned port) {
     session_factory.get(session).set_good_conns(
-        {std::string("127.0.0.1:") +
+        {std::string("localhost:") +
          std::to_string(port)});  // \_ new connection
     EXPECT_CALL(session_factory.get(session), flag_succeed(_, port))
         .Times(1);  // /  should succeed
@@ -397,24 +401,20 @@
   MockMySQLSessionFactory &session_factory =
       *up_session_factory_;  // hack: we can do this because unique_ptr will
                              // outlive our tests
-  GRClusterMetadata metadata{"user", "pass", 0,
-                             0,      0,      mysqlrouter::SSLOptions()};
+  GRClusterMetadata metadata{{{"user", "pass"}, 0, 0, 0},
+                             mysqlrouter::SSLOptions()};
 
   // set instances that would be returned by successful
   // metadata.fetch_instances_from_metadata_server() for a healthy 3-node setup.
   // Only some tests need this variable.
 
-  const ManagedReplicaSet typical_replicaset{
-      "replicaset-1",
+  const ManagedCluster typical_cluster{
       {
           // will be set ----------------------vvvvvvvvvvvvvvvvvvvvvvv
           // v--v--vv--- ignored at the time of writing
-          {"replicaset-1", "instance-1", ServerMode::Unavailable, "localhost",
-           3310, 33100},
-          {"replicaset-1", "instance-2", ServerMode::Unavailable, "localhost",
-           3320, 33200},
-          {"replicaset-1", "instance-3", ServerMode::Unavailable, "localhost",
-           3330, 33300},
+          {"instance-1", ServerMode::Unavailable, "localhost", 3310, 33100},
+          {"instance-2", ServerMode::Unavailable, "localhost", 3320, 33200},
+          {"instance-3", ServerMode::Unavailable, "localhost", 3330, 33300},
           // ignored at time of writing
           // -^^^^--------------------------------------------------------^^^^^
           // TODO: ok to ignore xport?
@@ -429,10 +429,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 TEST_F(MetadataTest, ConnectToMetadataServer_Succeed) {
-  ManagedInstance metadata_server{
-      "replicaset-1", "instance-1", ServerMode::ReadWrite,
-      "localhost",    3310,         33100};
-  session_factory.get(0).set_good_conns({"127.0.0.1:3310"});
+  ManagedInstance metadata_server{"instance-1", ServerMode::ReadWrite,
+                                  "localhost", 3310, 33100};
+  session_factory.get(0).set_good_conns({"localhost:3310"});
 
   // should connect successfully
   EXPECT_CALL(session_factory.get(0), flag_succeed(_, 3310)).Times(1);
@@ -440,9 +439,8 @@
 }
 
 TEST_F(MetadataTest, ConnectToMetadataServer_Failed) {
-  ManagedInstance metadata_server{
-      "replicaset-1", "instance-1", ServerMode::ReadWrite,
-      "localhost",    3310,         33100};
+  ManagedInstance metadata_server{"instance-1", ServerMode::ReadWrite,
+                                  "localhost", 3310, 33100};
 
   // connetion attempt should fail
   EXPECT_CALL(session_factory.get(0), flag_fail(_, 3310)).Times(1);
@@ -463,8 +461,7 @@
  * result sets:
  *
  *   1. empty
- *   2. many nodes in many replicasets
- *   3. SQL query fails
+ *   2. SQL query fails
  */
 TEST_F(MetadataTest, FetchInstancesFromMetadataServer) {
   connect_to_first_metadata_server();
@@ -477,11 +474,10 @@
           session_factory.get(0).query_impl(
               processor,
               {
-                  {"replicaset-1", "instance-1", "localhost:3310",
-                   "localhost:33100"},
-                  {"replicaset-1", "instance-2", "localhost:3320", nullptr},
-                  {"replicaset-1", "instance-3", "localhost", nullptr},
-                  {"replicaset-1", "instance-4", nullptr, nullptr},
+                  {"", "instance-1", "localhost:3310", "localhost:33100"},
+                  {"", "instance-2", "localhost:3320", nullptr},
+                  {"", "instance-3", "localhost", nullptr},
+                  {"", "instance-4", nullptr, nullptr},
               });
         };
     EXPECT_CALL(session_factory.get(0), query(StartsWith(query_metadata), _, _))
@@ -490,28 +486,28 @@
 
     ASSERT_NO_THROW({
       metadata.reset_metadata_backend(mysqlrouter::ClusterType::GR_V1);
-      ClusterMetadata::ReplicaSetsByName rs =
-          metadata.fetch_instances_from_metadata_server("replicaset-1", "0001");
+      auto cluster = metadata.fetch_instances_from_metadata_server(
+          {mysqlrouter::TargetCluster::TargetType::ByName, "cluster-name"},
+          "0001");
 
-      EXPECT_EQ(1u, rs.size());
-      EXPECT_EQ(4u, rs.at("replicaset-1").members.size());  // not set/checked
+      EXPECT_EQ(4u, cluster.members.size());  // not set/checked
       // -------------------vvvvvvvvvvvvvvvvvvvvvvv
-      EXPECT_TRUE(cmp_mi_FIFMS(
-          ManagedInstance{"replicaset-1", "instance-1", ServerMode::Unavailable,
-                          "localhost", 3310, 33100},
-          rs.at("replicaset-1").members.at(0)));
-      EXPECT_TRUE(cmp_mi_FIFMS(
-          ManagedInstance{"replicaset-1", "instance-2", ServerMode::Unavailable,
-                          "localhost", 3320, 33200},
-          rs.at("replicaset-1").members.at(1)));
-      EXPECT_TRUE(cmp_mi_FIFMS(
-          ManagedInstance{"replicaset-1", "instance-3", ServerMode::Unavailable,
-                          "localhost", 3306, 33060},
-          rs.at("replicaset-1").members.at(2)));
-      EXPECT_TRUE(cmp_mi_FIFMS(
-          ManagedInstance{"replicaset-1", "instance-4", ServerMode::Unavailable,
-                          "", 3306, 33060},
-          rs.at("replicaset-1").members.at(3)));
+      EXPECT_TRUE(
+          cmp_mi_FIFMS(ManagedInstance{"instance-1", ServerMode::Unavailable,
+                                       "localhost", 3310, 33100},
+                       cluster.members.at(0)));
+      EXPECT_TRUE(
+          cmp_mi_FIFMS(ManagedInstance{"instance-2", ServerMode::Unavailable,
+                                       "localhost", 3320, 33200},
+                       cluster.members.at(1)));
+      EXPECT_TRUE(
+          cmp_mi_FIFMS(ManagedInstance{"instance-3", ServerMode::Unavailable,
+                                       "localhost", 3306, 33060},
+                       cluster.members.at(2)));
+      EXPECT_TRUE(
+          cmp_mi_FIFMS(ManagedInstance{"instance-4", ServerMode::Unavailable,
+                                       "", 3306, 33060},
+                       cluster.members.at(3)));
       // TODO is this really right behavior?
       // ---------------------------------------------------------------------------------------------------^^
     });
@@ -530,66 +526,11 @@
 
     ASSERT_NO_THROW({
       metadata.reset_metadata_backend(mysqlrouter::ClusterType::GR_V1);
-      GRClusterMetadata::ReplicaSetsByName rs =
-          metadata.fetch_instances_from_metadata_server("replicaset-1", "0001");
-
-      EXPECT_EQ(0u, rs.size());
-    });
-  }
-
-  // multiple replicasets
-  {
-    auto resultset_metadata =
-        [this](const std::string &, const MySQLSession::RowProcessor &processor,
-               const MySQLSession::FieldValidator &) {
-          session_factory.get(0).query_impl(
-              processor,
-              {
-                  {"replicaset-2", "instance-4", "localhost2:3333", nullptr},
-                  {"replicaset-1", "instance-1", "localhost1:1111", nullptr},
-                  {"replicaset-1", "instance-2", "localhost1:2222", nullptr},
-                  {"replicaset-1", "instance-3", "localhost1:3333", nullptr},
-                  {"replicaset-3", "instance-5", "localhost3:3333", nullptr},
-                  {"replicaset-3", "instance-6", "localhost3:3333", nullptr},
-              });
-        };
-    EXPECT_CALL(session_factory.get(0), query(StartsWith(query_metadata), _, _))
-        .Times(1)
-        .WillOnce(Invoke(resultset_metadata));
-
-    ASSERT_NO_THROW({
-      metadata.reset_metadata_backend(mysqlrouter::ClusterType::GR_V1);
-      GRClusterMetadata::ReplicaSetsByName rs =
-          metadata.fetch_instances_from_metadata_server("replicaset-1", "0001");
+      auto cluster = metadata.fetch_instances_from_metadata_server(
+          {mysqlrouter::TargetCluster::TargetType::ByName, "cluster-name"},
+          "0001");
 
-      EXPECT_EQ(3u, rs.size());
-      EXPECT_EQ(3u, rs.at("replicaset-1").members.size());
-      EXPECT_TRUE(cmp_mi_FIFMS(
-          ManagedInstance{"replicaset-1", "instance-1", ServerMode::Unavailable,
-                          "localhost1", 1111, 11110},
-          rs.at("replicaset-1").members.at(0)));
-      EXPECT_TRUE(cmp_mi_FIFMS(
-          ManagedInstance{"replicaset-1", "instance-2", ServerMode::Unavailable,
-                          "localhost1", 2222, 22220},
-          rs.at("replicaset-1").members.at(1)));
-      EXPECT_TRUE(cmp_mi_FIFMS(
-          ManagedInstance{"replicaset-1", "instance-3", ServerMode::Unavailable,
-                          "localhost1", 3333, 33330},
-          rs.at("replicaset-1").members.at(2)));
-      EXPECT_EQ(1u, rs.at("replicaset-2").members.size());
-      EXPECT_TRUE(cmp_mi_FIFMS(
-          ManagedInstance{"replicaset-2", "instance-4", ServerMode::Unavailable,
-                          "localhost2", 3333, 33330},
-          rs.at("replicaset-2").members.at(0)));
-      EXPECT_EQ(2u, rs.at("replicaset-3").members.size());
-      EXPECT_TRUE(cmp_mi_FIFMS(
-          ManagedInstance{"replicaset-3", "instance-5", ServerMode::Unavailable,
-                          "localhost3", 3333, 33330},
-          rs.at("replicaset-3").members.at(0)));
-      EXPECT_TRUE(cmp_mi_FIFMS(
-          ManagedInstance{"replicaset-3", "instance-6", ServerMode::Unavailable,
-                          "localhost3", 3333, 33330},
-          rs.at("replicaset-3").members.at(1)));
+      EXPECT_EQ(0u, cluster.members.size());
     });
   }
 
@@ -606,15 +547,16 @@
 
     // exception thrown by MySQLSession::query() should get repackaged in
     // metadata_cache::metadata_error
-    ClusterMetadata::ReplicaSetsByName rs;
+    metadata_cache::ManagedCluster cluster;
     try {
       metadata.reset_metadata_backend(mysqlrouter::ClusterType::GR_V1);
-      rs =
-          metadata.fetch_instances_from_metadata_server("replicaset-1", "0001");
+      auto cluster = metadata.fetch_instances_from_metadata_server(
+          {mysqlrouter::TargetCluster::TargetType::ByName, "cluster-name"},
+          "gr-id");
       FAIL() << "Expected metadata_cache::metadata_error to be thrown";
     } catch (const metadata_cache::metadata_error &e) {
       EXPECT_STREQ("Error executing MySQL query: some error(42)", e.what());
-      EXPECT_EQ(0u, rs.size());
+      EXPECT_EQ(0u, cluster.members.size());
     } catch (...) {
       FAIL() << "Expected metadata_cache::metadata_error to be thrown";
     }
@@ -623,7 +565,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 //
-// test ClusterMetadata::check_replicaset_status()
+// test ClusterMetadata::check_cluster_status()
 //
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -637,7 +579,7 @@
 TEST_F(MetadataTest, CheckClusterStatus_1Online1RecoveringNotInMetadata) {
   std::vector<ManagedInstance> servers_in_metadata{
       // ServerMode doesn't matter ---vvvvv
-      {"", "instance-1", ServerMode::Unavailable, "", 0, 0},
+      {"instance-1", ServerMode::Unavailable, "", 0, 0},
   };
   bool metadata_gr_discrepancy{false};
 
@@ -647,28 +589,28 @@
   };
 
   EXPECT_EQ(RS::AvailableWritable,
-            metadata.check_replicaset_status(servers_in_metadata, server_status,
-                                             metadata_gr_discrepancy));
+            metadata.check_cluster_status(servers_in_metadata, server_status,
+                                          metadata_gr_discrepancy));
   EXPECT_EQ(ServerMode::ReadWrite, servers_in_metadata.at(0).mode);
   EXPECT_TRUE(metadata_gr_discrepancy);
 }
 
 /**
  * @test
- * Verify that `ClusterMetadata::check_replicaset_status()` returns proper
+ * Verify that `ClusterMetadata::check_cluster_status()` returns proper
  * status for each node (instance) that it received from MD server, and
- * calculates proper replicaset availability.
+ * calculates proper cluster availability.
  *
  * The tested function has two inputs: MD (cluster topology from MD server) and
  * GR (health status from GR tables). All tested scenarios in this test keep the
  * MD constant (3 nodes) and while varying the GR.
  */
-TEST_F(MetadataTest, CheckReplicasetStatus_3NodeSetup) {
+TEST_F(MetadataTest, CheckClusterStatus_3NodeSetup) {
   std::vector<ManagedInstance> servers_in_metadata{
       // ServerMode doesn't matter ------vvvvvvvvvvv
-      {"", "instance-1", ServerMode::Unavailable, "", 0, 0},
-      {"", "instance-2", ServerMode::Unavailable, "", 0, 0},
-      {"", "instance-3", ServerMode::Unavailable, "", 0, 0},
+      {"instance-1", ServerMode::Unavailable, "", 0, 0},
+      {"instance-2", ServerMode::Unavailable, "", 0, 0},
+      {"instance-3", ServerMode::Unavailable, "", 0, 0},
   };
   bool metadata_gr_discrepancy{false};
 
@@ -683,8 +625,8 @@
         {"instance-3", {"", "", 0, State::Online, Role::Secondary}},
     };
     EXPECT_EQ(RS::AvailableWritable,
-              metadata.check_replicaset_status(
-                  servers_in_metadata, server_status, metadata_gr_discrepancy));
+              metadata.check_cluster_status(servers_in_metadata, server_status,
+                                            metadata_gr_discrepancy));
     EXPECT_EQ(ServerMode::ReadWrite, servers_in_metadata.at(0).mode);
     EXPECT_EQ(ServerMode::ReadOnly, servers_in_metadata.at(1).mode);
     EXPECT_EQ(ServerMode::ReadOnly, servers_in_metadata.at(2).mode);
@@ -699,8 +641,8 @@
         {"instance-3", {"", "", 0, State::Online, Role::Secondary}},
     };
     EXPECT_EQ(RS::AvailableWritable,
-              metadata.check_replicaset_status(
-                  servers_in_metadata, server_status, metadata_gr_discrepancy));
+              metadata.check_cluster_status(servers_in_metadata, server_status,
+                                            metadata_gr_discrepancy));
 
     auto r = {ServerMode::ReadOnly, ServerMode::ReadWrite,
               ServerMode::ReadOnly};
@@ -718,8 +660,8 @@
         {"instance-3", {"", "", 0, State::Online, Role::Primary}},
     };
     EXPECT_EQ(RS::AvailableWritable,
-              metadata.check_replicaset_status(
-                  servers_in_metadata, server_status, metadata_gr_discrepancy));
+              metadata.check_cluster_status(servers_in_metadata, server_status,
+                                            metadata_gr_discrepancy));
 
     auto r = {ServerMode::ReadOnly, ServerMode::ReadOnly,
               ServerMode::ReadWrite};
@@ -737,8 +679,8 @@
         {"instance-3", {"", "", 0, State::Online, Role::Secondary}},
     };
     EXPECT_EQ(RS::AvailableReadOnly,
-              metadata.check_replicaset_status(
-                  servers_in_metadata, server_status, metadata_gr_discrepancy));
+              metadata.check_cluster_status(servers_in_metadata, server_status,
+                                            metadata_gr_discrepancy));
 
     auto r = {ServerMode::ReadOnly, ServerMode::ReadOnly, ServerMode::ReadOnly};
     EXPECT_TRUE(std::equal(
@@ -758,8 +700,8 @@
     };
 #ifdef NDEBUG  // guardian assert() should fail in Debug
     EXPECT_EQ(RS::AvailableWritable,
-              metadata.check_replicaset_status(
-                  servers_in_metadata, server_status, metadata_gr_discrepancy));
+              metadata.check_cluster_status(servers_in_metadata, server_status,
+                                            metadata_gr_discrepancy));
 
     auto r = {ServerMode::ReadWrite, ServerMode::ReadWrite,
               ServerMode::ReadOnly};
@@ -777,13 +719,13 @@
         {"instance-3", {"", "", 0, State::Online, Role::Secondary}},
     };
     EXPECT_EQ(RS::AvailableWritable,
-              metadata.check_replicaset_status(
-                  servers_in_metadata, server_status, metadata_gr_discrepancy));
+              metadata.check_cluster_status(servers_in_metadata, server_status,
+                                            metadata_gr_discrepancy));
     EXPECT_EQ(ServerMode::ReadWrite, servers_in_metadata.at(0).mode);
     EXPECT_EQ(ServerMode::Unavailable, servers_in_metadata.at(1).mode);
     EXPECT_EQ(ServerMode::ReadOnly, servers_in_metadata.at(2).mode);
     // should log warning "Member <host>:<port> (instance-2) defined in metadata
-    // not found in actual replicaset"
+    // not found in actual Group Replication"
     EXPECT_TRUE(metadata_gr_discrepancy);
   }
 
@@ -794,13 +736,13 @@
         {"instance-3", {"", "", 0, State::Online, Role::Secondary}},
     };
     EXPECT_EQ(RS::AvailableReadOnly,
-              metadata.check_replicaset_status(
-                  servers_in_metadata, server_status, metadata_gr_discrepancy));
+              metadata.check_cluster_status(servers_in_metadata, server_status,
+                                            metadata_gr_discrepancy));
     EXPECT_EQ(ServerMode::Unavailable, servers_in_metadata.at(0).mode);
     EXPECT_EQ(ServerMode::ReadOnly, servers_in_metadata.at(1).mode);
     EXPECT_EQ(ServerMode::ReadOnly, servers_in_metadata.at(2).mode);
     // should log warning "Member <host>:<port> (instance-1) defined in metadata
-    // not found in actual replicaset"
+    // not found in actual Group Replication"
     EXPECT_TRUE(metadata_gr_discrepancy);
   }
 
@@ -810,14 +752,15 @@
         {"instance-1", {"", "", 0, State::Online, Role::Primary}},
     };
     EXPECT_EQ(RS::AvailableWritable,
-              metadata.check_replicaset_status(
-                  servers_in_metadata, server_status, metadata_gr_discrepancy));
+              metadata.check_cluster_status(servers_in_metadata, server_status,
+                                            metadata_gr_discrepancy));
     EXPECT_EQ(ServerMode::ReadWrite, servers_in_metadata.at(0).mode);
     EXPECT_EQ(ServerMode::Unavailable, servers_in_metadata.at(1).mode);
     EXPECT_EQ(ServerMode::Unavailable, servers_in_metadata.at(2).mode);
     // should log warning "Member <host>:<port> (instance-2) defined in metadata
-    // not found in actual replicaset" should log warning "Member <host>:<port>
-    // (instance-3) defined in metadata not found in actual replicaset"
+    // not found in actual Group Replication", should log warning "Member
+    // <host>:<port> (instance-3) defined in metadata not found in actual Group
+    // Replication"
     EXPECT_TRUE(metadata_gr_discrepancy);
   }
 
@@ -827,14 +770,15 @@
         {"instance-3", {"", "", 0, State::Online, Role::Secondary}},
     };
     EXPECT_EQ(RS::AvailableReadOnly,
-              metadata.check_replicaset_status(
-                  servers_in_metadata, server_status, metadata_gr_discrepancy));
+              metadata.check_cluster_status(servers_in_metadata, server_status,
+                                            metadata_gr_discrepancy));
     EXPECT_EQ(ServerMode::Unavailable, servers_in_metadata.at(0).mode);
     EXPECT_EQ(ServerMode::Unavailable, servers_in_metadata.at(1).mode);
     EXPECT_EQ(ServerMode::ReadOnly, servers_in_metadata.at(2).mode);
     // should log warning "Member <host>:<port> (instance-1) defined in metadata
-    // not found in actual replicaset" should log warning "Member <host>:<port>
-    // (instance-2) defined in metadata not found in actual replicaset"
+    // not found in actual Group Replication" should log warning "Member
+    // <host>:<port> (instance-2) defined in metadata not found in actual Group
+    // Replication"
     EXPECT_TRUE(metadata_gr_discrepancy);
   }
 
@@ -842,16 +786,16 @@
   {
     std::map<std::string, GroupReplicationMember> server_status{};
     EXPECT_EQ(RS::Unavailable,
-              metadata.check_replicaset_status(
-                  servers_in_metadata, server_status, metadata_gr_discrepancy));
+              metadata.check_cluster_status(servers_in_metadata, server_status,
+                                            metadata_gr_discrepancy));
     EXPECT_EQ(ServerMode::Unavailable, servers_in_metadata.at(0).mode);
     EXPECT_EQ(ServerMode::Unavailable, servers_in_metadata.at(1).mode);
     EXPECT_EQ(ServerMode::Unavailable, servers_in_metadata.at(2).mode);
     // should log warning "Member <host>:<port> (instance-1) defined in metadata
     // not found in actual replicaset" should log warning "Member <host>:<port>
-    // (instance-2) defined in metadata not found in actual replicaset" should
-    // log warning "Member <host>:<port> (instance-3) defined in metadata not
-    // found in actual replicaset"
+    // (instance-2) defined in metadata not found in actual Group Replication"
+    // should log warning "Member <host>:<port> (instance-3) defined in metadata
+    // not found in actual Group Replication"
     EXPECT_TRUE(metadata_gr_discrepancy);
   }
 
@@ -864,14 +808,15 @@
         {"instance-3", {"", "", 0, State::Online, Role::Secondary}},
     };
     EXPECT_EQ(RS::AvailableWritable,
-              metadata.check_replicaset_status(
-                  servers_in_metadata, server_status, metadata_gr_discrepancy));
+              metadata.check_cluster_status(servers_in_metadata, server_status,
+                                            metadata_gr_discrepancy));
     EXPECT_EQ(ServerMode::Unavailable, servers_in_metadata.at(0).mode);
     EXPECT_EQ(ServerMode::ReadWrite, servers_in_metadata.at(1).mode);
     EXPECT_EQ(ServerMode::ReadOnly, servers_in_metadata.at(2).mode);
     // should log warning "Member <host>:<port> (instance-1) defined in metadata
-    // not found in actual replicaset" should log error "Member <host>:<port>
-    // (instance-4) found in replicaset, yet is not defined in metadata!"
+    // not found in actual Group Replication" should log error "Member
+    // <host>:<port> (instance-4) found in Group Replication, yet is not defined
+    // in metadata!"
     EXPECT_TRUE(metadata_gr_discrepancy);
   }
 
@@ -883,17 +828,18 @@
         {"instance-5", {"", "", 0, State::Online, Role::Secondary}},
     };
     EXPECT_EQ(RS::Unavailable,
-              metadata.check_replicaset_status(
-                  servers_in_metadata, server_status, metadata_gr_discrepancy));
+              metadata.check_cluster_status(servers_in_metadata, server_status,
+                                            metadata_gr_discrepancy));
     EXPECT_EQ(ServerMode::Unavailable, servers_in_metadata.at(0).mode);
     EXPECT_EQ(ServerMode::ReadWrite, servers_in_metadata.at(1).mode);
     EXPECT_EQ(ServerMode::Unavailable, servers_in_metadata.at(2).mode);
     // should log warning "Member <host>:<port> (instance-1) defined in metadata
-    // not found in actual replicaset" should log warning "Member <host>:<port>
-    // (instance-3) defined in metadata not found in actual replicaset" should
-    // log error "Member <host>:<port> (instance-4) found in replicaset, yet is
-    // not defined in metadata!" should log error "Member <host>:<port>
-    // (instance-5) found in replicaset, yet is not defined in metadata!"
+    // not found in actual Group Replication" should log warning "Member
+    // <host>:<port> (instance-3) defined in metadata not found in actual Group
+    // Replication" should log error "Member <host>:<port> (instance-4) found in
+    // Group Replication, yet is not defined in metadata!" should log error
+    // "Member <host>:<port> (instance-5) found in Group Replication, yet is not
+    // defined in metadata!"
     EXPECT_TRUE(metadata_gr_discrepancy);
   }
 
@@ -907,28 +853,28 @@
         {"instance-5", {"", "", 0, State::Online, Role::Secondary}},
     };
     EXPECT_EQ(RS::AvailableWritable,
-              metadata.check_replicaset_status(
-                  servers_in_metadata, server_status, metadata_gr_discrepancy));
+              metadata.check_cluster_status(servers_in_metadata, server_status,
+                                            metadata_gr_discrepancy));
     EXPECT_EQ(ServerMode::ReadWrite, servers_in_metadata.at(0).mode);
     EXPECT_EQ(ServerMode::ReadOnly, servers_in_metadata.at(1).mode);
     EXPECT_EQ(ServerMode::ReadOnly, servers_in_metadata.at(2).mode);
     // should log error "Member <host>:<port> (instance-4) found in replicaset,
     // yet is not defined in metadata!" should log error "Member <host>:<port>
-    // (instance-5) found in replicaset, yet is not defined in metadata!"
+    // (instance-5) found in Group Replication, yet is not defined in metadata!"
     EXPECT_TRUE(metadata_gr_discrepancy);
   }
 }
 
 /**
  * @test
- * Verify that `ClusterMetadata::check_replicaset_status()` returns proper
+ * Verify that `ClusterMetadata::check_cluster_status()` returns proper
  * status for each node (instance) that it received from MD server, and
- * calculates proper replicaset availability.
+ * calculates proper cluster availability.
  *
- * This test is similar to `CheckReplicasetStatus_3NodeSetup`, but here we the
+ * This test is similar to `CheckClusterStatus_3NodeSetup`, but here we the
  * inputs flip: MD is variable, GR is always 3 nodes.
  */
-TEST_F(MetadataTest, CheckReplicasetStatus_VariableNodeSetup) {
+TEST_F(MetadataTest, CheckClusterStatus_VariableNodeSetup) {
   ConnectCallback clb;
   metadata.reset_metadata_backend(mysqlrouter::ClusterType::GR_V1);
   bool metadata_gr_discrepancy{false};
@@ -942,48 +888,48 @@
   // Next 2 scenarios test situation in which the status report (view) contains
   // only a subset of servers provided by metadata server. At the time of
   // writing, this longer list of servers is essentially irrelevant, and the
-  // "view" is king. See notes in ClusterMetadata::check_replicaset_status() for
+  // "view" is king. See notes in ClusterMetadata::check_cluster_status() for
   // more info.
 
   // 7-node setup according to metadata
   {
     std::vector<ManagedInstance> servers_in_metadata{
         // ServerMode doesn't matter ------vvvvvvvvvvv
-        {"", "instance-1", ServerMode::Unavailable, "", 0, 0},
-        {"", "instance-2", ServerMode::Unavailable, "", 0, 0},
-        {"", "instance-3", ServerMode::Unavailable, "", 0, 0},
-        {"", "instance-4", ServerMode::Unavailable, "", 0, 0},
-        {"", "instance-5", ServerMode::Unavailable, "", 0, 0},
-        {"", "instance-6", ServerMode::Unavailable, "", 0, 0},
-        {"", "instance-7", ServerMode::Unavailable, "", 0, 0},
+        {"instance-1", ServerMode::Unavailable, "", 0, 0},
+        {"instance-2", ServerMode::Unavailable, "", 0, 0},
+        {"instance-3", ServerMode::Unavailable, "", 0, 0},
+        {"instance-4", ServerMode::Unavailable, "", 0, 0},
+        {"instance-5", ServerMode::Unavailable, "", 0, 0},
+        {"instance-6", ServerMode::Unavailable, "", 0, 0},
+        {"instance-7", ServerMode::Unavailable, "", 0, 0},
     };
     EXPECT_EQ(RS::AvailableWritable,
-              metadata.check_replicaset_status(
-                  servers_in_metadata, server_status, metadata_gr_discrepancy));
+              metadata.check_cluster_status(servers_in_metadata, server_status,
+                                            metadata_gr_discrepancy));
     EXPECT_EQ(ServerMode::ReadWrite, servers_in_metadata.at(0).mode);
     EXPECT_EQ(ServerMode::ReadOnly, servers_in_metadata.at(1).mode);
     EXPECT_EQ(ServerMode::ReadOnly, servers_in_metadata.at(2).mode);
     // should log warning "Member <host>:<port> (instance-*) defined in metadata
-    // not found in actual replicaset" for instanes 4-7
+    // not found in actual Group Replication" for instanes 4-7
     EXPECT_TRUE(metadata_gr_discrepancy);
   }
 
   // 4-node setup according to metadata
   {
     std::vector<ManagedInstance> servers_in_metadata{
-        {"", "instance-1", ServerMode::Unavailable, "", 0, 0},
-        {"", "instance-2", ServerMode::Unavailable, "", 0, 0},
-        {"", "instance-3", ServerMode::Unavailable, "", 0, 0},
-        {"", "instance-4", ServerMode::Unavailable, "", 0, 0},
+        {"instance-1", ServerMode::Unavailable, "", 0, 0},
+        {"instance-2", ServerMode::Unavailable, "", 0, 0},
+        {"instance-3", ServerMode::Unavailable, "", 0, 0},
+        {"instance-4", ServerMode::Unavailable, "", 0, 0},
     };
     EXPECT_EQ(RS::AvailableWritable,
-              metadata.check_replicaset_status(
-                  servers_in_metadata, server_status, metadata_gr_discrepancy));
+              metadata.check_cluster_status(servers_in_metadata, server_status,
+                                            metadata_gr_discrepancy));
     EXPECT_EQ(ServerMode::ReadWrite, servers_in_metadata.at(0).mode);
     EXPECT_EQ(ServerMode::ReadOnly, servers_in_metadata.at(1).mode);
     EXPECT_EQ(ServerMode::ReadOnly, servers_in_metadata.at(2).mode);
     // should log warning "Member <host>:<port> (instance-4) defined in metadata
-    // not found in actual replicaset"
+    // not found in actual Group Replication"
     EXPECT_TRUE(metadata_gr_discrepancy);
   }
 
@@ -1001,16 +947,16 @@
   // count
   {
     std::vector<ManagedInstance> servers_in_metadata{
-        {"", "instance-1", ServerMode::Unavailable, "", 0, 0},
-        {"", "instance-2", ServerMode::Unavailable, "", 0, 0},
+        {"instance-1", ServerMode::Unavailable, "", 0, 0},
+        {"instance-2", ServerMode::Unavailable, "", 0, 0},
     };
     EXPECT_EQ(RS::AvailableWritable,
-              metadata.check_replicaset_status(
-                  servers_in_metadata, server_status, metadata_gr_discrepancy));
+              metadata.check_cluster_status(servers_in_metadata, server_status,
+                                            metadata_gr_discrepancy));
     EXPECT_EQ(ServerMode::ReadWrite, servers_in_metadata.at(0).mode);
     EXPECT_EQ(ServerMode::ReadOnly, servers_in_metadata.at(1).mode);
-    // should log error "Member <host>:<port> (instance-3) found in replicaset,
-    // yet is not defined in metadata!"
+    // should log error "Member <host>:<port> (instance-3) found in Group
+    // Replication, yet is not defined in metadata!"
     EXPECT_TRUE(metadata_gr_discrepancy);
   }
 
@@ -1018,15 +964,16 @@
   // counts
   {
     std::vector<ManagedInstance> servers_in_metadata{
-        {"", "instance-1", ServerMode::Unavailable, "", 0, 0},
+        {"instance-1", ServerMode::Unavailable, "", 0, 0},
     };
     EXPECT_EQ(RS::Unavailable,
-              metadata.check_replicaset_status(
-                  servers_in_metadata, server_status, metadata_gr_discrepancy));
+              metadata.check_cluster_status(servers_in_metadata, server_status,
+                                            metadata_gr_discrepancy));
     EXPECT_EQ(ServerMode::ReadWrite, servers_in_metadata.at(0).mode);
-    // should log error "Member <host>:<port> (instance-2) found in replicaset,
-    // yet is not defined in metadata!" should log error "Member <host>:<port>
-    // (instance-3) found in replicaset, yet is not defined in metadata!"
+    // should log error "Member <host>:<port> (instance-2) found in Group
+    // Replication, yet is not defined in metadata!" should log error "Member
+    // <host>:<port> (instance-3) found in Group Replication, yet is not defined
+    // in metadata!"
     EXPECT_TRUE(metadata_gr_discrepancy);
   }
 
@@ -1034,36 +981,36 @@
   {
     std::vector<ManagedInstance> servers_in_metadata{};
     EXPECT_EQ(RS::Unavailable,
-              metadata.check_replicaset_status(
-                  servers_in_metadata, server_status, metadata_gr_discrepancy));
-    // should log error "Member <host>:<port> (instance-1) found in replicaset,
-    // yet is not defined in metadata!" should log error "Member <host>:<port>
-    // (instance-2) found in replicaset, yet is not defined in metadata!" should
-    // log error "Member <host>:<port> (instance-3) found in replicaset, yet is
-    // not defined in metadata!"
+              metadata.check_cluster_status(servers_in_metadata, server_status,
+                                            metadata_gr_discrepancy));
+    // should log error "Member <host>:<port> (instance-1) found in Group
+    // Replication, yet is not defined in metadata!" should log error "Member
+    // <host>:<port> (instance-2) found in Group Replication, yet is not defined
+    // in metadata!" should log error "Member <host>:<port> (instance-3) found
+    // in Group Replication, yet is not defined in metadata!"
     EXPECT_TRUE(metadata_gr_discrepancy);
   }
 }
 
 /**
  * @test
- * Verify that `ClusterMetadata::check_replicaset_status()` returns proper
+ * Verify that `ClusterMetadata::check_cluster_status()` returns proper
  * status for each node (instance) that it received from MD server, and
  * calculates proper replicaset availability.
  *
  * This test focuses on scenarios where 1 and 2 nodes (out of 3-node setup) are
  * in one of unavailable states (offline, error, unreachable, other).
  */
-TEST_F(MetadataTest, CheckReplicasetStatus_VariousStatuses) {
+TEST_F(MetadataTest, CheckClusterStatus_VariousStatuses) {
   ConnectCallback clb;
   metadata.reset_metadata_backend(mysqlrouter::ClusterType::GR_V1);
   bool metadata_gr_discrepancy{false};
 
   std::vector<ManagedInstance> servers_in_metadata{
       // ServerMode doesn't matter ------vvvvvvvvvvv
-      {"", "instance-1", ServerMode::Unavailable, "", 0, 0},
-      {"", "instance-2", ServerMode::Unavailable, "", 0, 0},
-      {"", "instance-3", ServerMode::Unavailable, "", 0, 0},
+      {"instance-1", ServerMode::Unavailable, "", 0, 0},
+      {"instance-2", ServerMode::Unavailable, "", 0, 0},
+      {"instance-3", ServerMode::Unavailable, "", 0, 0},
   };
 
   for (State state :
@@ -1075,7 +1022,7 @@
           {"instance-2", {"", "", 0, State::Online, Role::Secondary}},
           {"instance-3", {"", "", 0, state, Role::Secondary}},
       };
-      EXPECT_EQ(RS::AvailableWritable, metadata.check_replicaset_status(
+      EXPECT_EQ(RS::AvailableWritable, metadata.check_cluster_status(
                                            servers_in_metadata, server_status,
                                            metadata_gr_discrepancy));
       EXPECT_EQ(ServerMode::ReadWrite, servers_in_metadata.at(0).mode);
@@ -1091,7 +1038,7 @@
           {"instance-2", {"", "", 0, State::Online, Role::Secondary}},
           {"instance-3", {"", "", 0, state, Role::Secondary}},
       };
-      EXPECT_EQ(RS::AvailableReadOnly, metadata.check_replicaset_status(
+      EXPECT_EQ(RS::AvailableReadOnly, metadata.check_cluster_status(
                                            servers_in_metadata, server_status,
                                            metadata_gr_discrepancy));
       EXPECT_EQ(ServerMode::ReadOnly, servers_in_metadata.at(0).mode);
@@ -1107,7 +1054,7 @@
           {"instance-2", {"", "", 0, state, Role::Secondary}},
           {"instance-3", {"", "", 0, state, Role::Secondary}},
       };
-      EXPECT_EQ(RS::Unavailable, metadata.check_replicaset_status(
+      EXPECT_EQ(RS::Unavailable, metadata.check_cluster_status(
                                      servers_in_metadata, server_status,
                                      metadata_gr_discrepancy));
       EXPECT_EQ(ServerMode::ReadWrite, servers_in_metadata.at(0).mode);
@@ -1120,7 +1067,7 @@
 
 /**
  * @test
- * Verify that `ClusterMetadata::check_replicaset_status()` returns proper
+ * Verify that `ClusterMetadata::check_cluster_status()` returns proper
  * status for each node (instance) that it received from MD server, and
  * calculates proper replicaset availability.
  *
@@ -1129,16 +1076,16 @@
  * cannot be routed to. RS::Recovering should be returned in a (corner) case
  * when all nodes in quorum are recovering.
  */
-TEST_F(MetadataTest, CheckReplicasetStatus_Recovering) {
+TEST_F(MetadataTest, CheckClusterStatus_Recovering) {
   ConnectCallback clb;
   metadata.reset_metadata_backend(mysqlrouter::ClusterType::GR_V1);
   bool metadata_gr_discrepancy{false};
 
   std::vector<ManagedInstance> servers_in_metadata{
       // ServerMode doesn't matter ------vvvvvvvvvvv
-      {"", "instance-1", ServerMode::Unavailable, "", 0, 0},
-      {"", "instance-2", ServerMode::Unavailable, "", 0, 0},
-      {"", "instance-3", ServerMode::Unavailable, "", 0, 0},
+      {"instance-1", ServerMode::Unavailable, "", 0, 0},
+      {"instance-2", ServerMode::Unavailable, "", 0, 0},
+      {"instance-3", ServerMode::Unavailable, "", 0, 0},
   };
 
   // 1 node recovering, 1 RW, 1 RO
@@ -1149,8 +1096,8 @@
         {"instance-3", {"", "", 0, State::Recovering, Role::Secondary}},
     };
     EXPECT_EQ(RS::AvailableWritable,
-              metadata.check_replicaset_status(
-                  servers_in_metadata, server_status, metadata_gr_discrepancy));
+              metadata.check_cluster_status(servers_in_metadata, server_status,
+                                            metadata_gr_discrepancy));
     EXPECT_EQ(ServerMode::ReadWrite, servers_in_metadata.at(0).mode);
     EXPECT_EQ(ServerMode::ReadOnly, servers_in_metadata.at(1).mode);
     EXPECT_EQ(ServerMode::Unavailable, servers_in_metadata.at(2).mode);
@@ -1165,8 +1112,8 @@
         {"instance-3", {"", "", 0, State::Recovering, Role::Secondary}},
     };
     EXPECT_EQ(RS::AvailableWritable,
-              metadata.check_replicaset_status(
-                  servers_in_metadata, server_status, metadata_gr_discrepancy));
+              metadata.check_cluster_status(servers_in_metadata, server_status,
+                                            metadata_gr_discrepancy));
     EXPECT_EQ(ServerMode::ReadWrite, servers_in_metadata.at(0).mode);
     EXPECT_EQ(ServerMode::Unavailable, servers_in_metadata.at(1).mode);
     EXPECT_EQ(ServerMode::Unavailable, servers_in_metadata.at(2).mode);
@@ -1181,8 +1128,8 @@
         {"instance-3", {"", "", 0, State::Recovering, Role::Secondary}},
     };
     EXPECT_EQ(RS::AvailableReadOnly,
-              metadata.check_replicaset_status(
-                  servers_in_metadata, server_status, metadata_gr_discrepancy));
+              metadata.check_cluster_status(servers_in_metadata, server_status,
+                                            metadata_gr_discrepancy));
     EXPECT_EQ(ServerMode::ReadOnly, servers_in_metadata.at(0).mode);
     EXPECT_EQ(ServerMode::Unavailable, servers_in_metadata.at(1).mode);
     EXPECT_EQ(ServerMode::Unavailable, servers_in_metadata.at(2).mode);
@@ -1197,8 +1144,8 @@
         {"instance-3", {"", "", 0, State::Recovering, Role::Secondary}},
     };
     EXPECT_EQ(RS::Unavailable,
-              metadata.check_replicaset_status(
-                  servers_in_metadata, server_status, metadata_gr_discrepancy));
+              metadata.check_cluster_status(servers_in_metadata, server_status,
+                                            metadata_gr_discrepancy));
     EXPECT_EQ(ServerMode::Unavailable, servers_in_metadata.at(0).mode);
     EXPECT_EQ(ServerMode::Unavailable, servers_in_metadata.at(1).mode);
     EXPECT_EQ(ServerMode::Unavailable, servers_in_metadata.at(2).mode);
@@ -1212,8 +1159,8 @@
         {"instance-3", {"", "", 0, State::Recovering, Role::Secondary}},
     };
     EXPECT_EQ(RS::Unavailable,
-              metadata.check_replicaset_status(
-                  servers_in_metadata, server_status, metadata_gr_discrepancy));
+              metadata.check_cluster_status(servers_in_metadata, server_status,
+                                            metadata_gr_discrepancy));
     EXPECT_EQ(ServerMode::Unavailable, servers_in_metadata.at(0).mode);
     EXPECT_EQ(ServerMode::Unavailable, servers_in_metadata.at(1).mode);
     EXPECT_TRUE(metadata_gr_discrepancy);
@@ -1225,8 +1172,8 @@
         {"instance-3", {"", "", 0, State::Recovering, Role::Secondary}},
     };
     EXPECT_EQ(RS::UnavailableRecovering,
-              metadata.check_replicaset_status(
-                  servers_in_metadata, server_status, metadata_gr_discrepancy));
+              metadata.check_cluster_status(servers_in_metadata, server_status,
+                                            metadata_gr_discrepancy));
     EXPECT_EQ(ServerMode::Unavailable, servers_in_metadata.at(0).mode);
     EXPECT_TRUE(metadata_gr_discrepancy);
   }
@@ -1239,8 +1186,8 @@
         {"instance-3", {"", "", 0, State::Recovering, Role::Secondary}},
     };
     EXPECT_EQ(RS::AvailableWritable,
-              metadata.check_replicaset_status(
-                  servers_in_metadata, server_status, metadata_gr_discrepancy));
+              metadata.check_cluster_status(servers_in_metadata, server_status,
+                                            metadata_gr_discrepancy));
     EXPECT_EQ(ServerMode::ReadWrite, servers_in_metadata.at(0).mode);
     EXPECT_EQ(ServerMode::Unavailable, servers_in_metadata.at(1).mode);
     EXPECT_EQ(ServerMode::Unavailable, servers_in_metadata.at(2).mode);
@@ -1255,8 +1202,8 @@
         {"instance-3", {"", "", 0, State::Recovering, Role::Secondary}},
     };
     EXPECT_EQ(RS::AvailableReadOnly,
-              metadata.check_replicaset_status(
-                  servers_in_metadata, server_status, metadata_gr_discrepancy));
+              metadata.check_cluster_status(servers_in_metadata, server_status,
+                                            metadata_gr_discrepancy));
     EXPECT_EQ(ServerMode::ReadOnly, servers_in_metadata.at(0).mode);
     EXPECT_EQ(ServerMode::Unavailable, servers_in_metadata.at(1).mode);
     EXPECT_EQ(ServerMode::Unavailable, servers_in_metadata.at(2).mode);
@@ -1271,8 +1218,8 @@
         {"instance-3", {"", "", 0, State::Recovering, Role::Secondary}},
     };
     EXPECT_EQ(RS::UnavailableRecovering,
-              metadata.check_replicaset_status(
-                  servers_in_metadata, server_status, metadata_gr_discrepancy));
+              metadata.check_cluster_status(servers_in_metadata, server_status,
+                                            metadata_gr_discrepancy));
     EXPECT_EQ(ServerMode::Unavailable, servers_in_metadata.at(0).mode);
     EXPECT_EQ(ServerMode::Unavailable, servers_in_metadata.at(1).mode);
     EXPECT_EQ(ServerMode::Unavailable, servers_in_metadata.at(2).mode);
@@ -1286,8 +1233,8 @@
         {"instance-3", {"", "", 0, State::Recovering, Role::Secondary}},
     };
     EXPECT_EQ(RS::UnavailableRecovering,
-              metadata.check_replicaset_status(
-                  servers_in_metadata, server_status, metadata_gr_discrepancy));
+              metadata.check_cluster_status(servers_in_metadata, server_status,
+                                            metadata_gr_discrepancy));
     EXPECT_EQ(ServerMode::Unavailable, servers_in_metadata.at(0).mode);
     EXPECT_EQ(ServerMode::Unavailable, servers_in_metadata.at(1).mode);
     EXPECT_TRUE(metadata_gr_discrepancy);
@@ -1301,8 +1248,8 @@
         {"instance-3", {"", "", 0, State::Recovering, Role::Secondary}},
     };
     EXPECT_EQ(RS::UnavailableRecovering,
-              metadata.check_replicaset_status(
-                  servers_in_metadata, server_status, metadata_gr_discrepancy));
+              metadata.check_cluster_status(servers_in_metadata, server_status,
+                                            metadata_gr_discrepancy));
     EXPECT_EQ(ServerMode::Unavailable, servers_in_metadata.at(0).mode);
     EXPECT_EQ(ServerMode::Unavailable, servers_in_metadata.at(1).mode);
     EXPECT_EQ(ServerMode::Unavailable, servers_in_metadata.at(2).mode);
@@ -1312,7 +1259,7 @@
 
 /**
  * @test
- * Verify that `ClusterMetadata::check_replicaset_status()` returns proper
+ * Verify that `ClusterMetadata::check_cluster_status()` returns proper
  * status for each node (instance) that it received from MD server, and
  * calculates proper replicaset availability.
  *
@@ -1327,16 +1274,16 @@
  * point-of-view, 2 of its 3 nodes are still alive, thus could be considered a
  * quorum.
  */
-TEST_F(MetadataTest, CheckReplicasetStatus_Cornercase2of5Alive) {
+TEST_F(MetadataTest, CheckClusterStatus_Cornercase2of5Alive) {
   ConnectCallback clb;
   metadata.reset_metadata_backend(mysqlrouter::ClusterType::GR_V1);
   bool metadata_gr_discrepancy{false};
 
   // MD defines 3 nodes
   std::vector<ManagedInstance> servers_in_metadata{
-      {"", "node-A", ServerMode::Unavailable, "", 0, 0},
-      {"", "node-B", ServerMode::Unavailable, "", 0, 0},
-      {"", "node-C", ServerMode::Unavailable, "", 0, 0},
+      {"node-A", ServerMode::Unavailable, "", 0, 0},
+      {"node-B", ServerMode::Unavailable, "", 0, 0},
+      {"node-C", ServerMode::Unavailable, "", 0, 0},
   };
 
   // GR reports 5 nodes, of which only 2 are alive (no qourum), BUT from
@@ -1352,11 +1299,11 @@
         {"node-E", {"", "", 0, dead_state, Role::Secondary}},
     };
     EXPECT_EQ(RS::Unavailable,
-              metadata.check_replicaset_status(
-                  servers_in_metadata, server_status, metadata_gr_discrepancy));
+              metadata.check_cluster_status(servers_in_metadata, server_status,
+                                            metadata_gr_discrepancy));
     // should log error "Member <host>:<port> (node-D) found in replicaset, yet
     // is not defined in metadata!" should log error "Member <host>:<port>
-    // (node-E) found in replicaset, yet is not defined in metadata!"
+    // (node-E) found in Group Replication, yet is not defined in metadata!"
 
     // meeting these is not strictly required, because when the cluster is
     // unavailable, ATTOW these results will be ignored. But OTOH, there's no
@@ -1375,7 +1322,7 @@
 
 /**
  * @test
- * Verify that `ClusterMetadata::check_replicaset_status()` returns proper
+ * Verify that `ClusterMetadata::check_cluster_status()` returns proper
  * status for each node (instance) that it received from MD server, and
  * calculates proper replicaset availability.
  *
@@ -1390,18 +1337,18 @@
  * quorum.
  *
  * However, our availability calculation in
- * `ClusterMetadata::check_replicaset_status()` always assumes that MD is in
+ * `ClusterMetadata::check_cluster_status()` always assumes that MD is in
  * sync with GR (which it always should be), but just in case it violates this
  * assumption, it prefers to err on the side of caution. This erring on the side
  * of caution is demonstrated in this test, where the availability is judged as
  * not available, even though it could be. But that's the price we pay in
  * exchange for the safety the algorithm provides which is demonstrated in the
- * CheckReplicasetStatus_Cornercase2of5Alive testcase.
+ * CheckClusterStatus_Cornercase2of5Alive testcase.
  */
-TEST_F(MetadataTest, CheckReplicasetStatus_Cornercase3of5Alive) {
-  // NOTE: If this test starts failing one day because check_replicaset_status()
+TEST_F(MetadataTest, CheckClusterStatus_Cornercase3of5Alive) {
+  // NOTE: If this test starts failing one day because check_cluster_status()
   //       starts returning that the replicaset is available, it might be a good
-  //       thing, BUT ONLY AS LONG as CheckReplicasetStatus_Cornercase2of5Alive
+  //       thing, BUT ONLY AS LONG as CheckClusterStatus_Cornercase2of5Alive
   //       is also passing. Please read the description of that test, and this
   //       one, before drawing conclusions.
 
@@ -1411,9 +1358,9 @@
 
   // MD defines 3 nodes
   std::vector<ManagedInstance> servers_in_metadata{
-      {"", "node-A", ServerMode::Unavailable, "", 0, 0},
-      {"", "node-B", ServerMode::Unavailable, "", 0, 0},
-      {"", "node-C", ServerMode::Unavailable, "", 0, 0},
+      {"node-A", ServerMode::Unavailable, "", 0, 0},
+      {"node-B", ServerMode::Unavailable, "", 0, 0},
+      {"node-C", ServerMode::Unavailable, "", 0, 0},
   };
 
   // GR reports 5 nodes, of which 3 are alive (have qourum), BUT from
@@ -1429,11 +1376,11 @@
         {"node-E", {"", "", 0, State::Online, Role::Secondary}},
     };
     EXPECT_EQ(RS::Unavailable,
-              metadata.check_replicaset_status(
-                  servers_in_metadata, server_status, metadata_gr_discrepancy));
+              metadata.check_cluster_status(servers_in_metadata, server_status,
+                                            metadata_gr_discrepancy));
     // should log error "Member <host>:<port> (node-D) found in replicaset, yet
     // is not defined in metadata!" should log error "Member <host>:<port>
-    // (node-E) found in replicaset, yet is not defined in metadata!"
+    // (node-E) found in Group Replication, yet is not defined in metadata!"
 
     // meeting these is not strictly required, because when the cluster is
     // unavailable, ATTOW these results will be ignored. But OTOH, there's no
@@ -1452,7 +1399,7 @@
 
 /**
  * @test
- * Verify that `ClusterMetadata::check_replicaset_status()` returns proper
+ * Verify that `ClusterMetadata::check_cluster_status()` returns proper
  * status for each node (instance) that it received from MD server, and
  * calculates proper replicaset availability.
  *
@@ -1465,19 +1412,19 @@
  * According to GR, there's a quorum between nodes C, D and E. However, from MD
  * point-of-view, A, B went missing and only C is known to be alive.
  *
- * Our availability calculation in `ClusterMetadata::check_replicaset_status()`
+ * Our availability calculation in `ClusterMetadata::check_cluster_status()`
  * always assumes that MD is in sync with GR (which it always should be), but
  * just in case it violates this assumption, it prefers to err on the side of
  * caution. This erring on the side of caution is demonstrated in this test,
  * where the availability is judged as not available, even though it could be.
  * But that's the price we pay in exchange for the safety the algorithm provides
- * which is demonstrated in the CheckReplicasetStatus_Cornercase2of5Alive
+ * which is demonstrated in the CheckClusterStatus_Cornercase2of5Alive
  * testcase.
  */
-TEST_F(MetadataTest, CheckReplicasetStatus_Cornercase1Common) {
-  // NOTE: If this test starts failing one day because check_replicaset_status()
+TEST_F(MetadataTest, CheckClusterStatus_Cornercase1Common) {
+  // NOTE: If this test starts failing one day because check_cluster_status()
   //       starts returning that the replicaset is available, it might be a good
-  //       thing, BUT ONLY AS LONG as CheckReplicasetStatus_Cornercase2of5Alive
+  //       thing, BUT ONLY AS LONG as CheckClusterStatus_Cornercase2of5Alive
   //       is also passing. Please read the description of that test, and this
   //       one, before drawing conclusions.
 
@@ -1487,9 +1434,9 @@
 
   // MD defines 3 nodes
   std::vector<ManagedInstance> servers_in_metadata{
-      {"", "node-A", ServerMode::Unavailable, "", 0, 0},
-      {"", "node-B", ServerMode::Unavailable, "", 0, 0},
-      {"", "node-C", ServerMode::Unavailable, "", 0, 0},
+      {"node-A", ServerMode::Unavailable, "", 0, 0},
+      {"node-B", ServerMode::Unavailable, "", 0, 0},
+      {"node-C", ServerMode::Unavailable, "", 0, 0},
   };
 
   // GR reports 3 nodes, of which 3 are alive (have qourum), BUT from
@@ -1502,14 +1449,14 @@
         {"node-E", {"", "", 0, State::Online, Role::Secondary}},
     };
     EXPECT_EQ(RS::Unavailable,
-              metadata.check_replicaset_status(
-                  servers_in_metadata, server_status, metadata_gr_discrepancy));
+              metadata.check_cluster_status(servers_in_metadata, server_status,
+                                            metadata_gr_discrepancy));
     // should log warning "Member <host>:<port> (node-A) defined in metadata not
     // found in actual replicaset" should log warning "Member <host>:<port>
-    // (node-B) defined in metadata not found in actual replicaset" should log
-    // error "Member <host>:<port> (node-D) found in replicaset, yet is not
-    // defined in metadata!" should log error "Member <host>:<port> (node-E)
-    // found in replicaset, yet is not defined in metadata!"
+    // (node-B) defined in metadata not found in actual Group Replication"
+    // should log error "Member <host>:<port> (node-D) found in replicaset, yet
+    // is not defined in metadata!" should log error "Member <host>:<port>
+    // (node-E) found in Group Replication, yet is not defined in metadata!"
 
     // meeting these is not strictly required, because when the cluster is
     // unavailable, ATTOW these results will be ignored. But OTOH, there's no
@@ -1529,13 +1476,13 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 //
-// test ClusterMetadata::update_replicaset_status() - connection failures
+// test ClusterMetadata::update_cluster_status() - connection failures
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 /**
  * @test
- * Verify `ClusterMetadata::update_replicaset_status()` will correctly update
+ * Verify `ClusterMetadata::update_cluster_status()` will correctly update
  * routing table, even despite having to failover on connection errors.
  *
  *     Scenario details:
@@ -1543,10 +1490,10 @@
  *     iteration 2 (instance-2): CAN'T CONNECT
  *     iteration 3 (instance-3): query_primary_member OK, query_status OK
  */
-TEST_F(MetadataTest, UpdateReplicasetStatus_PrimaryMember_FailConnectOnNode2) {
+TEST_F(MetadataTest, UpdateClusterStatus_PrimaryMember_FailConnectOnNode2) {
   connect_to_first_metadata_server();
 
-  // update_replicaset_status() first iteration: requests start with existing
+  // update_cluster_status() first iteration: requests start with existing
   // connection to instance-1 (shared with metadata server)
   unsigned session = 0;
 
@@ -1557,7 +1504,7 @@
       .Times(1)
       .WillOnce(Invoke(query_primary_member_fail(session)));
 
-  // since 1st query_primary_member failed, update_replicaset_status() should
+  // since 1st query_primary_member failed, update_cluster_status() should
   // try to connect to instance-2. Let's make that new connections fail by NOT
   // using enable_connection(session)
   // enable_connection(++session, 3320); // we don't call this on purpose
@@ -1568,7 +1515,7 @@
   // enable_connection(session)
   // enable_connection(++session, 3320); // we don't call this on purpose
 
-  // since 2nd connection failed, update_replicaset_status() should try to
+  // since 2nd connection failed, update_cluster_status() should try to
   // connect to instance-3. Let's allow this.
   enable_connection(++session, 3330);
 
@@ -1588,23 +1535,22 @@
             session_factory
                 .create_cnt());  // caused by connect_to_first_metadata_server()
 
-  ManagedReplicaSet replicaset = typical_replicaset;
+  ManagedCluster cluster = typical_cluster;
   metadata.reset_metadata_backend(mysqlrouter::ClusterType::GR_V1);
-  metadata.update_replicaset_status("replicaset-1", replicaset);
-
-  EXPECT_EQ(3u, replicaset.members.size());
-  EXPECT_TRUE(cmp_mi_FI(
-      ManagedInstance{"replicaset-1", "instance-1", ServerMode::ReadWrite,
-                      "localhost", 3310, 33100},
-      replicaset.members.at(0)));
-  EXPECT_TRUE(
-      cmp_mi_FI(ManagedInstance{"replicaset-1", "instance-2",
-                                ServerMode::ReadOnly, "localhost", 3320, 33200},
-                replicaset.members.at(1)));
-  EXPECT_TRUE(
-      cmp_mi_FI(ManagedInstance{"replicaset-1", "instance-3",
-                                ServerMode::ReadOnly, "localhost", 3330, 33300},
-                replicaset.members.at(2)));
+  metadata.update_cluster_status(
+      {mysqlrouter::TargetCluster::TargetType::ByName, "cluster_name"},
+      cluster);
+
+  EXPECT_EQ(3u, cluster.members.size());
+  EXPECT_TRUE(cmp_mi_FI(ManagedInstance{"instance-1", ServerMode::ReadWrite,
+                                        "localhost", 3310, 33100},
+                        cluster.members.at(0)));
+  EXPECT_TRUE(cmp_mi_FI(ManagedInstance{"instance-2", ServerMode::ReadOnly,
+                                        "localhost", 3320, 33200},
+                        cluster.members.at(1)));
+  EXPECT_TRUE(cmp_mi_FI(ManagedInstance{"instance-3", ServerMode::ReadOnly,
+                                        "localhost", 3330, 33300},
+                        cluster.members.at(2)));
 
   EXPECT_EQ(3, session_factory.create_cnt());  // +2 from new connections to
                                                // localhost:3320 and :3330
@@ -1612,7 +1558,7 @@
 
 /**
  * @test
- * Verify `ClusterMetadata::update_replicaset_status()` will handle correctly
+ * Verify `ClusterMetadata::update_cluster_status()` will handle correctly
  * when all connect attempts fail. Finally, it should clear the routing table
  * since it's unable to connect to any server.
  *
@@ -1621,11 +1567,10 @@
  *     iteration 2 (instance-2): CAN'T CONNECT
  *     iteration 3 (instance-3): CAN'T CONNECT
  */
-TEST_F(MetadataTest,
-       UpdateReplicasetStatus_PrimaryMember_FailConnectOnAllNodes) {
+TEST_F(MetadataTest, UpdateClusterStatus_PrimaryMember_FailConnectOnAllNodes) {
   connect_to_first_metadata_server();
 
-  // update_replicaset_status() first iteration: requests start with existing
+  // update_cluster_status() first iteration: requests start with existing
   // connection to instance-1 (shared with metadata server)
   unsigned session = 0;
 
@@ -1636,7 +1581,7 @@
       .Times(1)
       .WillOnce(Invoke(query_primary_member_fail(session)));
 
-  // since 1st query_primary_member failed, update_replicaset_status() should
+  // since 1st query_primary_member failed, update_cluster_status() should
   // try to connect to instance-2, then instance-3. Let's make those new
   // connections fail by NOT using enable_connection(session)
   EXPECT_CALL(session_factory.get(++session), flag_fail(_, 3320)).Times(1);
@@ -1646,13 +1591,15 @@
             session_factory
                 .create_cnt());  // caused by connect_to_first_metadata_server()
 
-  // if update_replicaset_status() can't connect to a quorum, it should clear
+  // if update_cluster_status() can't connect to a quorum, it should clear
   // replicaset.members
-  ManagedReplicaSet replicaset = typical_replicaset;
+  ManagedCluster cluster = typical_cluster;
   ConnectCallback clb;
   metadata.reset_metadata_backend(mysqlrouter::ClusterType::GR_V1);
-  metadata.update_replicaset_status("replicaset-1", replicaset);
-  EXPECT_TRUE(replicaset.members.empty());
+  metadata.update_cluster_status(
+      {mysqlrouter::TargetCluster::TargetType::ByName, "cluster-name"},
+      cluster);
+  EXPECT_TRUE(cluster.members.empty());
 
   EXPECT_EQ(3, session_factory.create_cnt());  // +2 from new connections to
                                                // localhost:3320 and :3330
@@ -1660,14 +1607,14 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 //
-// test ClusterMetadata::update_replicaset_status() - query_primary_member
+// test ClusterMetadata::update_cluster_status() - query_primary_member
 // failures [QUERY #2: query_primary_member]
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 /**
  * @test
- * Verify `ClusterMetadata::update_replicaset_status()` will correctly update
+ * Verify `ClusterMetadata::update_cluster_status()` will correctly update
  * routing table, even despite having to failover on fetching primary member
  * failing.
  *
@@ -1675,10 +1622,10 @@
  *     iteration 1 (instance-1): query_primary_member FAILS
  *     iteration 2 (instance-2): query_primary_member OK, query_status OK
  */
-TEST_F(MetadataTest, UpdateReplicasetStatus_PrimaryMember_FailQueryOnNode1) {
+TEST_F(MetadataTest, UpdateClusterStatus_PrimaryMember_FailQueryOnNode1) {
   connect_to_first_metadata_server();
 
-  // update_replicaset_status() first iteration: requests start with existing
+  // update_cluster_status() first iteration: requests start with existing
   // connection to instance-1 (shared with metadata server)
   unsigned session = 0;
 
@@ -1709,33 +1656,33 @@
             session_factory
                 .create_cnt());  // caused by connect_to_first_metadata_server()
 
-  ManagedReplicaSet replicaset = typical_replicaset;
+  // replicaset.members
+  ManagedCluster cluster = typical_cluster;
   ConnectCallback clb;
   metadata.reset_metadata_backend(mysqlrouter::ClusterType::GR_V1);
-  metadata.update_replicaset_status("replicaset-1", replicaset);
+  metadata.update_cluster_status(
+      {mysqlrouter::TargetCluster::TargetType::ByName, "cluster-name"},
+      cluster);
 
   EXPECT_EQ(2, session_factory.create_cnt());  // +1 from new connection to
                                                // localhost:3320 (instance-2)
 
   // query_status reported back from instance-2
-  EXPECT_EQ(3u, replicaset.members.size());
-  EXPECT_TRUE(cmp_mi_FI(
-      ManagedInstance{"replicaset-1", "instance-1", ServerMode::ReadWrite,
-                      "localhost", 3310, 33100},
-      replicaset.members.at(0)));
-  EXPECT_TRUE(
-      cmp_mi_FI(ManagedInstance{"replicaset-1", "instance-2",
-                                ServerMode::ReadOnly, "localhost", 3320, 33200},
-                replicaset.members.at(1)));
-  EXPECT_TRUE(
-      cmp_mi_FI(ManagedInstance{"replicaset-1", "instance-3",
-                                ServerMode::ReadOnly, "localhost", 3330, 33300},
-                replicaset.members.at(2)));
+  EXPECT_EQ(3u, cluster.members.size());
+  EXPECT_TRUE(cmp_mi_FI(ManagedInstance{"instance-1", ServerMode::ReadWrite,
+                                        "localhost", 3310, 33100},
+                        cluster.members.at(0)));
+  EXPECT_TRUE(cmp_mi_FI(ManagedInstance{"instance-2", ServerMode::ReadOnly,
+                                        "localhost", 3320, 33200},
+                        cluster.members.at(1)));
+  EXPECT_TRUE(cmp_mi_FI(ManagedInstance{"instance-3", ServerMode::ReadOnly,
+                                        "localhost", 3330, 33300},
+                        cluster.members.at(2)));
 }
 
 /**
  * @test
- * Verify `ClusterMetadata::update_replicaset_status()` will handle correctly
+ * Verify `ClusterMetadata::update_cluster_status()` will handle correctly
  * when all primary member query attempts fail. Finally, it should clear the
  * routing table since it was unable to complete its operation successfully.
  *
@@ -1744,10 +1691,10 @@
  *     iteration 2 (instance-2): query_primary_member FAILS
  *     iteration 3 (instance-3): query_primary_member FAILS
  */
-TEST_F(MetadataTest, UpdateReplicasetStatus_PrimaryMember_FailQueryOnAllNodes) {
+TEST_F(MetadataTest, UpdateClusterStatus_PrimaryMember_FailQueryOnAllNodes) {
   connect_to_first_metadata_server();
 
-  // update_replicaset_status() first iteration: requests start with existing
+  // update_cluster_status() first iteration: requests start with existing
   // connection to instance-1 (shared with metadata server)
   unsigned session = 0;
 
@@ -1784,12 +1731,14 @@
             session_factory
                 .create_cnt());  // caused by connect_to_first_metadata_server()
 
-  // if update_replicaset_status() can't connect to a quorum, it should clear
+  // if update_cluster_status() can't connect to a quorum, it should clear
   // replicaset.members
-  ManagedReplicaSet replicaset = typical_replicaset;
+  ManagedCluster cluster = typical_cluster;
   metadata.reset_metadata_backend(mysqlrouter::ClusterType::GR_V1);
-  metadata.update_replicaset_status("replicaset-1", replicaset);
-  EXPECT_TRUE(replicaset.members.empty());
+  metadata.update_cluster_status(
+      {mysqlrouter::TargetCluster::TargetType::ByName, "cluster-name"},
+      cluster);
+  EXPECT_TRUE(cluster.members.empty());
 
   EXPECT_EQ(3, session_factory.create_cnt());  // +2 from new connections to
                                                // localhost:3320 and :3330
@@ -1797,14 +1746,14 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 //
-// test ClusterMetadata::update_replicaset_status() - query_status failures
+// test ClusterMetadata::update_cluster_status() - query_status failures
 // [QUERY #3: query_status]
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 /**
  * @test
- * Verify `ClusterMetadata::update_replicaset_status()` will correctly update
+ * Verify `ClusterMetadata::update_cluster_status()` will correctly update
  * routing table, even despite having to failover on fetching healh status
  * failing.
  *
@@ -1812,10 +1761,10 @@
  *     iteration 1 (instance-1): query_primary_member OK, query_status FAILS
  *     iteration 2 (instance-2): query_primary_member OK, query_status OK
  */
-TEST_F(MetadataTest, UpdateReplicasetStatus_Status_FailQueryOnNode1) {
+TEST_F(MetadataTest, UpdateClusterStatus_Status_FailQueryOnNode1) {
   connect_to_first_metadata_server();
 
-  // update_replicaset_status() first iteration: requests start with existing
+  // update_cluster_status() first iteration: requests start with existing
   // connection to instance-1 (shared with metadata server)
   unsigned session = 0;
 
@@ -1831,7 +1780,7 @@
       .Times(1)
       .WillOnce(Invoke(query_status_fail(session)));
 
-  // since 1st query_status failed, update_replicaset_status() should start
+  // since 1st query_status failed, update_cluster_status() should start
   // another iteration, but on instance-2 this time. Note that the connection to
   // instance-2 has to be created first
   enable_connection(++session, 3320);
@@ -1852,32 +1801,31 @@
             session_factory
                 .create_cnt());  // caused by connect_to_first_metadata_server()
 
-  ManagedReplicaSet replicaset = typical_replicaset;
+  ManagedCluster cluster = typical_cluster;
   metadata.reset_metadata_backend(mysqlrouter::ClusterType::GR_V1);
-  metadata.update_replicaset_status("replicaset-1", replicaset);
+  metadata.update_cluster_status(
+      {mysqlrouter::TargetCluster::TargetType::ByName, "cluster-name"},
+      cluster);
 
   EXPECT_EQ(2, session_factory.create_cnt());  // +1 from new connection to
                                                // localhost:3320 (instance-2)
 
   // query_status reported back from instance-1
-  EXPECT_EQ(3u, replicaset.members.size());
-  EXPECT_TRUE(cmp_mi_FI(
-      ManagedInstance{"replicaset-1", "instance-1", ServerMode::ReadWrite,
-                      "localhost", 3310, 33100},
-      replicaset.members.at(0)));
-  EXPECT_TRUE(
-      cmp_mi_FI(ManagedInstance{"replicaset-1", "instance-2",
-                                ServerMode::ReadOnly, "localhost", 3320, 33200},
-                replicaset.members.at(1)));
-  EXPECT_TRUE(
-      cmp_mi_FI(ManagedInstance{"replicaset-1", "instance-3",
-                                ServerMode::ReadOnly, "localhost", 3330, 33300},
-                replicaset.members.at(2)));
+  EXPECT_EQ(3u, cluster.members.size());
+  EXPECT_TRUE(cmp_mi_FI(ManagedInstance{"instance-1", ServerMode::ReadWrite,
+                                        "localhost", 3310, 33100},
+                        cluster.members.at(0)));
+  EXPECT_TRUE(cmp_mi_FI(ManagedInstance{"instance-2", ServerMode::ReadOnly,
+                                        "localhost", 3320, 33200},
+                        cluster.members.at(1)));
+  EXPECT_TRUE(cmp_mi_FI(ManagedInstance{"instance-3", ServerMode::ReadOnly,
+                                        "localhost", 3330, 33300},
+                        cluster.members.at(2)));
 }
 
 /**
  * @test
- * Verify `ClusterMetadata::update_replicaset_status()` will handle correctly
+ * Verify `ClusterMetadata::update_cluster_status()` will handle correctly
  * when all health status query attempts fail. Finally, it should clear the
  * routing table since it was unable to complete its operation successfully.
  *
@@ -1886,10 +1834,10 @@
  *     iteration 2 (instance-2): query_primary_member OK, query_status FAILS
  *     iteration 3 (instance-2): query_primary_member OK, query_status FAILS
  */
-TEST_F(MetadataTest, UpdateReplicasetStatus_Status_FailQueryOnAllNodes) {
+TEST_F(MetadataTest, UpdateClusterStatus_Status_FailQueryOnAllNodes) {
   connect_to_first_metadata_server();
 
-  // update_replicaset_status() first iteration: requests start with existing
+  // update_cluster_status() first iteration: requests start with existing
   // connection to instance-1 (shared with metadata server)
   unsigned session = 0;
 
@@ -1905,7 +1853,7 @@
       .Times(1)
       .WillOnce(Invoke(query_status_fail(session)));
 
-  // since 1st query_status failed, update_replicaset_status() should start
+  // since 1st query_status failed, update_cluster_status() should start
   // another iteration, but on instance-2 this time. Note that the connection to
   // instance-2 has to be created first
   enable_connection(++session, 3320);
@@ -1922,7 +1870,7 @@
       .Times(1)
       .WillOnce(Invoke(query_status_fail(session)));
 
-  // since 2st query_status failed, update_replicaset_status() should start
+  // since 2st query_status failed, update_cluster_status() should start
   // another iteration, but on instance-3 this time. Note that the connection to
   // instance-3 has to be created first
   enable_connection(++session, 3330);
@@ -1943,12 +1891,14 @@
             session_factory
                 .create_cnt());  // caused by connect_to_first_metadata_server()
 
-  // if update_replicaset_status() can't connect to a quorum, it should clear
+  // if update_cluster_status() can't connect to a quorum, it should clear
   // replicaset.members
-  ManagedReplicaSet replicaset = typical_replicaset;
+  ManagedCluster cluster = typical_cluster;
   metadata.reset_metadata_backend(mysqlrouter::ClusterType::GR_V1);
-  metadata.update_replicaset_status("replicaset-1", replicaset);
-  EXPECT_TRUE(replicaset.members.empty());
+  metadata.update_cluster_status(
+      {mysqlrouter::TargetCluster::TargetType::ByName, "cluster_name"},
+      cluster);
+  EXPECT_TRUE(cluster.members.empty());
 
   EXPECT_EQ(3, session_factory.create_cnt());  // +2 from new connections to
                                                // localhost:3320 and :3330
@@ -1956,23 +1906,23 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 //
-// test ClusterMetadata::update_replicaset_status() - success scenarios
+// test ClusterMetadata::update_cluster_status() - success scenarios
 // [QUERY #2 + #3]
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 /**
  * @test
- * Verify `ClusterMetadata::update_replicaset_status()` will return correct
+ * Verify `ClusterMetadata::update_cluster_status()` will return correct
  * results in a sunny-day scenario.
  *
  *     Scenario details:
  *     iteration 1 (instance-1): query_primary_member OK, query_status OK
  */
-TEST_F(MetadataTest, UpdateReplicasetStatus_SimpleSunnyDayScenario) {
+TEST_F(MetadataTest, UpdateClusterStatus_SimpleSunnyDayScenario) {
   connect_to_first_metadata_server();
 
-  // update_replicaset_status() first iteration: all requests go to existing
+  // update_cluster_status() first iteration: all requests go to existing
   // connection to instance-1 (shared with metadata server)
   unsigned session = 0;
 
@@ -1992,52 +1942,55 @@
             session_factory
                 .create_cnt());  // caused by connect_to_first_metadata_server()
 
-  ManagedReplicaSet replicaset = typical_replicaset;
+  ManagedCluster cluster = typical_cluster;
   metadata.reset_metadata_backend(mysqlrouter::ClusterType::GR_V1);
-  metadata.update_replicaset_status("replicaset-1", replicaset);
+  metadata.update_cluster_status(
+      {mysqlrouter::TargetCluster::TargetType::ByName, "cluster-name"},
+      cluster);
 
   EXPECT_EQ(1,
             session_factory
                 .create_cnt());  // should resuse localhost:3310 connection,
 
   // query_status reported back from instance-1
-  EXPECT_EQ(3u, replicaset.members.size());
-  EXPECT_TRUE(cmp_mi_FI(
-      ManagedInstance{"replicaset-1", "instance-1", ServerMode::ReadWrite,
-                      "localhost", 3310, 33100},
-      replicaset.members.at(0)));
-  EXPECT_TRUE(
-      cmp_mi_FI(ManagedInstance{"replicaset-1", "instance-2",
-                                ServerMode::ReadOnly, "localhost", 3320, 33200},
-                replicaset.members.at(1)));
-  EXPECT_TRUE(
-      cmp_mi_FI(ManagedInstance{"replicaset-1", "instance-3",
-                                ServerMode::ReadOnly, "localhost", 3330, 33300},
-                replicaset.members.at(2)));
+  EXPECT_EQ(3u, cluster.members.size());
+  EXPECT_TRUE(cmp_mi_FI(ManagedInstance{"instance-1", ServerMode::ReadWrite,
+                                        "localhost", 3310, 33100},
+                        cluster.members.at(0)));
+  EXPECT_TRUE(cmp_mi_FI(ManagedInstance{"instance-2", ServerMode::ReadOnly,
+                                        "localhost", 3320, 33200},
+                        cluster.members.at(1)));
+  EXPECT_TRUE(cmp_mi_FI(ManagedInstance{"instance-3", ServerMode::ReadOnly,
+                                        "localhost", 3330, 33300},
+                        cluster.members.at(2)));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
-// test ClusterMetadata::fetch_instances()
-// (this is the highest-level function, it calls everything tested above
-// except connect() (which is a separate step))
-//
-// TODO add tests for multiple replicasets here, when we begin supporting them
+// test ClusterMetadata::fetch_cluster_topology()
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 /**
  * @test
- * Verify `ClusterMetadata::fetch_instances()` will return correct results in a
- * sunny-day scenario.
+ * Verify `ClusterMetadata::fetch_cluster_topology()` will return correct
+ * results in a sunny-day scenario.
  */
-TEST_F(MetadataTest, FetchInstances_1Replicaset_ok) {
-  connect_to_first_metadata_server();
+TEST_F(MetadataTest, FetchInstances_ok) {
+  metadata_cache::metadata_servers_list_t metadata_servers{
+      {"localhost", 3310},
+  };
+  session_factory.get(0).set_good_conns(
+      {"localhost:3310", "localhost:3320", "localhost:3330"});
 
-  // update_replicaset_status() first iteration: all requests go to existing
+  // update_cluster_status() first iteration: all requests go to existing
   // connection to instance-1 (shared with metadata server)
   unsigned session = 0;
 
+  EXPECT_CALL(session_factory.get(session), execute(StartsWith(setup_session1)))
+      .Times(1);
+  EXPECT_CALL(session_factory.get(session), execute(StartsWith(setup_session2)))
+      .Times(1);
   EXPECT_CALL(session_factory.get(session),
               execute(StartsWith(execute_start_trasaction)))
       .Times(1);
@@ -2051,12 +2004,11 @@
                                    const MySQLSession::RowProcessor &processor,
                                    const MySQLSession::FieldValidator &) {
     session_factory.get(0).query_impl(
-        processor,
-        {
-            {"replicaset-1", "instance-1", "localhost:3310", nullptr},
-            {"replicaset-1", "instance-2", "localhost:3320", nullptr},
-            {"replicaset-1", "instance-3", "localhost:3330", nullptr},
-        });
+        processor, {
+                       {"", "instance-1", "localhost:3310", nullptr},
+                       {"", "instance-2", "localhost:3320", nullptr},
+                       {"", "instance-3", "localhost:3330", nullptr},
+                   });
   };
   EXPECT_CALL(session_factory.get(session),
               query(StartsWith(query_metadata), _, _))
@@ -2074,35 +2026,45 @@
       .WillOnce(Invoke(query_status_ok(session)));
 
   ASSERT_NO_THROW({
-    ClusterMetadata::ReplicaSetsByName rs =
-        metadata.fetch_instances("replicaset-1", "0001");
-
-    EXPECT_EQ(1u, rs.size());
-    EXPECT_EQ(3u, rs.at("replicaset-1").members.size());
-    EXPECT_TRUE(cmp_mi_FI(
-        ManagedInstance{"replicaset-1", "instance-1", ServerMode::ReadWrite,
-                        "localhost", 3310, 33100},
-        rs.at("replicaset-1").members.at(0)));
-    EXPECT_TRUE(cmp_mi_FI(
-        ManagedInstance{"replicaset-1", "instance-2", ServerMode::ReadOnly,
-                        "localhost", 3320, 33200},
-        rs.at("replicaset-1").members.at(1)));
-    EXPECT_TRUE(cmp_mi_FI(
-        ManagedInstance{"replicaset-1", "instance-3", ServerMode::ReadOnly,
-                        "localhost", 3330, 33300},
-        rs.at("replicaset-1").members.at(2)));
+    size_t instance_id;
+    std::atomic<bool> terminated{false};
+    auto target_cluster = mysqlrouter::TargetCluster(
+        mysqlrouter::TargetCluster::TargetType::ByName, "cluster-name");
+    const auto res = metadata.fetch_cluster_topology(terminated, target_cluster,
+                                                     0, metadata_servers, true,
+                                                     "gr-id", "", instance_id);
+
+    EXPECT_TRUE(res);
+    EXPECT_EQ(0u, instance_id);
+    const auto topology = res.value();
+
+    EXPECT_EQ(3u, topology.cluster_data.members.size());
+    EXPECT_TRUE(cmp_mi_FI(ManagedInstance{"instance-1", ServerMode::ReadWrite,
+                                          "localhost", 3310, 33100},
+                          topology.cluster_data.members.at(0)));
+    EXPECT_TRUE(cmp_mi_FI(ManagedInstance{"instance-2", ServerMode::ReadOnly,
+                                          "localhost", 3320, 33200},
+                          topology.cluster_data.members.at(1)));
+    EXPECT_TRUE(cmp_mi_FI(ManagedInstance{"instance-3", ServerMode::ReadOnly,
+                                          "localhost", 3330, 33300},
+                          topology.cluster_data.members.at(2)));
   });
 }
 
 /**
  * @test
- * Verify `ClusterMetadata::fetch_instances()` will handle correctly when
+ * Verify `ClusterMetadata::fetch_cluster_topology()` will handle correctly when
  * retreiving information from all servers fail. It should return an empty
  * routing table since it's unable to complete its operation successfully.
  */
-TEST_F(MetadataTest, FetchInstances_1Replicaset_fail) {
-  connect_to_first_metadata_server();
-  // update_replicaset_status() first iteration: requests start with existing
+TEST_F(MetadataTest, FetchInstances_fail) {
+  metadata_cache::metadata_servers_list_t metadata_servers{
+      {"localhost", 3310},
+  };
+  session_factory.get(0).set_good_conns(
+      {"localhost:3310", "localhost:3320", "localhost:3330"});
+
+  // update_cluster_status() first iteration: requests start with existing
   // connection to instance-1 (shared with metadata server)
   unsigned session = 0;
 
@@ -2116,12 +2078,11 @@
                                    const MySQLSession::RowProcessor &processor,
                                    const MySQLSession::FieldValidator &) {
     session_factory.get(0).query_impl(
-        processor,
-        {
-            {"replicaset-1", "instance-1", "localhost:3310", nullptr},
-            {"replicaset-1", "instance-2", "localhost:3320", nullptr},
-            {"replicaset-1", "instance-3", "localhost:3330", nullptr},
-        });
+        processor, {
+                       {"", "instance-1", "localhost:3310", nullptr},
+                       {"", "instance-2", "localhost:3320", nullptr},
+                       {"", "instance-3", "localhost:3330", nullptr},
+                   });
   };
   EXPECT_CALL(session_factory.get(session),
               query(StartsWith(query_metadata), _, _))
@@ -2139,10 +2100,19 @@
   // if fetch_instances() can't connect to a quorum for a particular replicaset,
   // it should clear its replicaset.members
   ASSERT_NO_THROW({
-    ClusterMetadata::ReplicaSetsByName rs =
-        metadata.fetch_instances("replicaset-1", "0001");
-    EXPECT_EQ(1u, rs.size());
-    EXPECT_EQ(0u, rs.at("replicaset-1").members.size());
+    size_t instance_id;
+    std::atomic<bool> terminated{false};
+    auto target_cluster = mysqlrouter::TargetCluster(
+        mysqlrouter::TargetCluster::TargetType::ByName, "cluster-name");
+    const auto res = metadata.fetch_cluster_topology(terminated, target_cluster,
+                                                     0, metadata_servers, true,
+                                                     "gr-id", "", instance_id);
+
+    EXPECT_TRUE(res);
+    EXPECT_EQ(0u, instance_id);
+    const auto topology = res.value();
+
+    EXPECT_EQ(0u, topology.cluster_data.members.size());
   });
 }
 
diff -Nru mysql-8.0-8.0.26/router/src/metadata_cache/tests/test_plugin_config.cc mysql-8.0-8.0.27/router/src/metadata_cache/tests/test_plugin_config.cc
--- mysql-8.0-8.0.26/router/src/metadata_cache/tests/test_plugin_config.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/metadata_cache/tests/test_plugin_config.cc	2021-09-28 11:46:34.000000000 +0000
@@ -38,23 +38,6 @@
 
 using mysql_harness::TCPAddress;
 
-// demangle the symbols returned by typeid().name() if needed
-//
-// typeid() on gcc/clang returns a mangled name, msvc doesn't.
-static std::string cxx_demangle_name(const char *mangled) {
-#if defined(__GNUC__) && defined(__cplusplus)
-  // gcc and clang are mangling the names
-  std::shared_ptr<char> demangled_name(
-      abi::__cxa_demangle(mangled, nullptr, nullptr, nullptr), [&](char *p) {
-        if (p) free(p);
-      });
-
-  return std::string(demangled_name.get());
-#else
-  return mangled;
-#endif
-}
-
 // the Good
 
 struct GoodTestData {
@@ -108,7 +91,7 @@
 
   EXPECT_THAT(plugin_config.user, StrEq(test_data.expected.user));
   EXPECT_THAT(plugin_config.ttl, Eq(test_data.expected.ttl));
-  EXPECT_THAT(plugin_config.metadata_cluster,
+  EXPECT_THAT(plugin_config.cluster_name,
               StrEq(test_data.expected.metadata_cluster));
   EXPECT_THAT(plugin_config.metadata_servers_addresses,
               ContainerEq(test_data.expected.bootstrap_addresses));
@@ -273,9 +256,8 @@
     MetadataCachePluginConfig plugin_config(&section);
     FAIL() << "should have failed";
   } catch (const std::exception &exc) {
-    EXPECT_THAT(
-        cxx_demangle_name(typeid(exc).name()),
-        StrEq(cxx_demangle_name(test_data.expected.exception_type.name())));
+    EXPECT_THAT(typeid(exc).name(),
+                StrEq(test_data.expected.exception_type.name()));
     EXPECT_THAT(exc.what(), StrEq(test_data.expected.exception_msg));
   }
 }
diff -Nru mysql-8.0-8.0.26/router/src/mock_server/src/authentication.cc mysql-8.0-8.0.27/router/src/mock_server/src/authentication.cc
--- mysql-8.0-8.0.26/router/src/mock_server/src/authentication.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/mock_server/src/authentication.cc	2021-09-28 11:46:34.000000000 +0000
@@ -25,13 +25,13 @@
 #include "authentication.h"
 
 #include <memory>  // unique_ptr
+#include <string_view>
 #include <vector>
 
 #include <openssl/evp.h>
 #include <openssl/opensslv.h>
 
 #include "mysql/harness/stdx/expected.h"
-#include "mysql/harness/stdx/string_view.h"
 
 namespace impl {
 /**
@@ -52,7 +52,7 @@
  * @returns auth-response a client would send it
  */
 static stdx::expected<std::vector<uint8_t>, void> scramble(
-    stdx::string_view nonce, stdx::string_view password,
+    std::string_view nonce, std::string_view password,
     const EVP_MD *digest_func, bool nonce_before_double_hashed_password) {
   // in case of empty password, the hash is empty too
   if (password.size() == 0) return {};
@@ -112,7 +112,7 @@
 // mysql_native_password
 
 stdx::expected<std::vector<uint8_t>, void> MySQLNativePassword::scramble(
-    stdx::string_view nonce, stdx::string_view password) {
+    std::string_view nonce, std::string_view password) {
   return impl::scramble(nonce, password, EVP_sha1(), true);
 }
 
@@ -121,7 +121,7 @@
 // caching_sha2_password
 
 stdx::expected<std::vector<uint8_t>, void> CachingSha2Password::scramble(
-    stdx::string_view nonce, stdx::string_view password) {
+    std::string_view nonce, std::string_view password) {
   return impl::scramble(nonce, password, EVP_sha256(), false);
 }
 constexpr char CachingSha2Password::name[];
@@ -129,7 +129,7 @@
 // clear_text_password
 
 stdx::expected<std::vector<uint8_t>, void> ClearTextPassword::scramble(
-    stdx::string_view /* nonce */, stdx::string_view password) {
+    std::string_view /* nonce */, std::string_view password) {
   std::vector<uint8_t> res(password.begin(), password.end());
 
   // the payload always has a trailing \0
diff -Nru mysql-8.0-8.0.26/router/src/mock_server/src/authentication.h mysql-8.0-8.0.27/router/src/mock_server/src/authentication.h
--- mysql-8.0-8.0.26/router/src/mock_server/src/authentication.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/mock_server/src/authentication.h	2021-09-28 11:46:34.000000000 +0000
@@ -25,10 +25,10 @@
 #ifndef MYSQL_PROTOCOL_AUTHENTICATION_INCLUDED
 #define MYSQL_PROTOCOL_AUTHENTICATION_INCLUDED
 
+#include <string_view>
 #include <vector>
 
 #include "mysql/harness/stdx/expected.h"
-#include "mysql/harness/stdx/string_view.h"
 
 class MySQLNativePassword {
  public:
@@ -36,7 +36,7 @@
 
   // client-side scrambling of the password
   static stdx::expected<std::vector<uint8_t>, void> scramble(
-      stdx::string_view nonce, stdx::string_view password);
+      std::string_view nonce, std::string_view password);
 };
 
 class CachingSha2Password {
@@ -45,7 +45,7 @@
 
   // client-side scrambling of the password
   static stdx::expected<std::vector<uint8_t>, void> scramble(
-      stdx::string_view nonce, stdx::string_view password);
+      std::string_view nonce, std::string_view password);
 };
 
 class ClearTextPassword {
@@ -54,7 +54,7 @@
 
   // client-side scrambling of the password
   static stdx::expected<std::vector<uint8_t>, void> scramble(
-      stdx::string_view nonce, stdx::string_view password);
+      std::string_view nonce, std::string_view password);
 };
 
 #endif
diff -Nru mysql-8.0-8.0.26/router/src/mock_server/src/classic_mock_session.cc mysql-8.0-8.0.27/router/src/mock_server/src/classic_mock_session.cc
--- mysql-8.0-8.0.26/router/src/mock_server/src/classic_mock_session.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/mock_server/src/classic_mock_session.cc	2021-09-28 11:46:34.000000000 +0000
@@ -212,6 +212,10 @@
     return;
   }
 
+  if (auto *ssl = protocol_.ssl()) {
+    json_reader_->set_session_ssl_info(ssl);
+  }
+
   auto decode_res =
       classic_protocol::decode<classic_protocol::message::client::Greeting>(
           net::buffer(payload), protocol_.server_capabilities());
@@ -244,9 +248,6 @@
         return;
       }
 
-      auto *ssl = protocol_.ssl();
-      json_reader_->set_session_ssl_info(ssl);
-
       // read again other part
       client_greeting();
     });
@@ -550,9 +551,9 @@
 void MySQLServerMockSessionClassic::run() { server_greeting(); }
 
 void MySQLClassicProtocol::encode_auth_fast_message() {
-  auto encode_res = classic_protocol::encode<
-      classic_protocol::frame::Frame<classic_protocol::wire::FixedInt<1>>>(
-      {seq_no_++, {3}}, shared_capabilities(),
+  auto encode_res = classic_protocol::encode<classic_protocol::frame::Frame<
+      classic_protocol::message::server::AuthMethodData>>(
+      {seq_no_++, {"\x03"}}, shared_capabilities(),
       net::dynamic_buffer(send_buffer_));
 }
 
@@ -589,11 +590,11 @@
 
   BIO_get_mem_ptr(bio.get(), &buf);
 
-  return {stdx::in_place, buf->data, buf->data + buf->length};
+  return {std::in_place, buf->data, buf->data + buf->length};
 #else
   std::array<char, 256> buf;
 
-  return {stdx::in_place, X509_NAME_oneline(name, buf.data(), buf.size())};
+  return {std::in_place, X509_NAME_oneline(name, buf.data(), buf.size())};
 #endif
 }
 
@@ -723,12 +724,15 @@
     }
   }
 
-  encode_res = classic_protocol::encode<
-      classic_protocol::frame::Frame<classic_protocol::message::server::Eof>>(
-      {seq_no_++, {}}, shared_caps, net::dynamic_buffer(send_buffer_));
-  if (!encode_res) {
-    //
-    return;
+  if (!shared_caps.test(classic_protocol::capabilities::pos::
+                            text_result_with_session_tracking)) {
+    encode_res = classic_protocol::encode<
+        classic_protocol::frame::Frame<classic_protocol::message::server::Eof>>(
+        {seq_no_++, {}}, shared_caps, net::dynamic_buffer(send_buffer_));
+    if (!encode_res) {
+      //
+      return;
+    }
   }
 
   for (auto const &row : response.rows) {
diff -Nru mysql-8.0-8.0.26/router/src/mock_server/src/duktape_statement_reader.cc mysql-8.0-8.0.27/router/src/mock_server/src/duktape_statement_reader.cc
--- mysql-8.0-8.0.26/router/src/mock_server/src/duktape_statement_reader.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/mock_server/src/duktape_statement_reader.cc	2021-09-28 11:46:34.000000000 +0000
@@ -553,7 +553,7 @@
           get_object_string_value(-1, "orig_table"),
           get_object_string_value(-1, "name", "", true),
           get_object_string_value(-1, "orig_name"),
-          get_object_integer_value<uint16_t>(-1, "character_set", 63),
+          get_object_integer_value<uint16_t>(-1, "character_set", 0xff),
           get_object_integer_value<uint32_t>(-1, "length"),
           static_cast<uint8_t>(column_type_from_string(
               get_object_string_value(-1, "type", "", true))),
@@ -829,9 +829,9 @@
       classic_protocol::capabilities::plugin_auth |
       classic_protocol::capabilities::connect_attributes |
       // client_auth_method_data_varint
-      classic_protocol::capabilities::expired_passwords
+      classic_protocol::capabilities::expired_passwords |
       // session_track (not yet)
-      // text_result_with_session_tracking (not yet)
+      classic_protocol::capabilities::text_result_with_session_tracking
       // optional_resultset_metadata (not yet)
       // compress_zstd (not yet)
       ;
@@ -875,7 +875,7 @@
   }
   duk_pop(ctx);
 
-  return {stdx::in_place,
+  return {std::in_place,
           0x0a,
           server_version,
           connection_id,
diff -Nru mysql-8.0-8.0.26/router/src/mock_server/src/rest_mock_server.cc mysql-8.0-8.0.27/router/src/mock_server/src/rest_mock_server.cc
--- mysql-8.0-8.0.26/router/src/mock_server/src/rest_mock_server.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/mock_server/src/rest_mock_server.cc	2021-09-28 11:46:34.000000000 +0000
@@ -31,8 +31,6 @@
 #include <string>
 
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 
diff -Nru mysql-8.0-8.0.26/router/src/mock_server/src/statement_reader.h mysql-8.0-8.0.27/router/src/mock_server/src/statement_reader.h
--- mysql-8.0-8.0.26/router/src/mock_server/src/statement_reader.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/mock_server/src/statement_reader.h	2021-09-28 11:46:34.000000000 +0000
@@ -32,6 +32,7 @@
 #include <utility>
 #include <vector>
 
+#include "my_compiler.h"
 #include "mysql/harness/net_ts/buffer.h"
 #include "mysql/harness/net_ts/executor.h"
 #include "mysql/harness/net_ts/io_context.h"
@@ -170,6 +171,11 @@
     }
   }
 
+  // TlsErrc to net::stream_errc if needed.
+  static std::error_code map_tls_error_code(std::error_code ec) {
+    return (ec == TlsErrc::kZeroReturn) ? net::stream_errc::eof : ec;
+  }
+
   template <class CompletionToken>
   void async_receive_tls(CompletionToken &&token) {
     net::async_completion<CompletionToken, void(std::error_code, size_t)> init{
@@ -207,9 +213,11 @@
       } else {
         // as we can't handle the error, forward the error to the
         // completion handler
-        net::defer(client_socket_.get_executor(),
-                   [compl_handler = std::move(init.completion_handler),
-                    ec = read_ec]() { compl_handler(ec, {}); });
+
+        net::defer(
+            client_socket_.get_executor(),
+            [compl_handler = std::move(init.completion_handler),
+             ec = map_tls_error_code(read_ec)]() { compl_handler(ec, {}); });
       }
     } else {
       // success, forward it to the completion handler
@@ -370,7 +378,10 @@
 
   virtual void set_session_ssl_info(const SSL *ssl) = 0;
 
+  MY_COMPILER_DIAGNOSTIC_PUSH()
+  MY_COMPILER_CLANG_DIAGNOSTIC_IGNORE("-Wdeprecated")
   virtual ~StatementReaderBase() = default;
+  MY_COMPILER_DIAGNOSTIC_POP()
 };
 
 }  // namespace server_mock
diff -Nru mysql-8.0-8.0.26/router/src/mock_server/src/x_mock_session.cc mysql-8.0-8.0.27/router/src/mock_server/src/x_mock_session.cc
--- mysql-8.0-8.0.26/router/src/mock_server/src/x_mock_session.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/mock_server/src/x_mock_session.cc	2021-09-28 11:46:34.000000000 +0000
@@ -35,8 +35,6 @@
 #include <tuple>
 
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 
@@ -107,7 +105,7 @@
   auto buf = net::buffer(payload) + 1;
 
   return {
-      stdx::in_place, msg_id,
+      std::in_place, msg_id,
       protocol_decoder_.decode_message(
           header_msg_id, static_cast<const uint8_t *>(buf.data()), buf.size())};
 }
@@ -309,7 +307,10 @@
     } else {
       log_warning("decoding handshake-frame failed: %s", ec.message().c_str());
 
-      disconnect();
+      protocol_.encode_error({ER_X_BAD_MESSAGE, "Bad Message", "HY000"});
+
+      send_response_then_disconnect();
+
       return;
     }
   }
@@ -319,7 +320,10 @@
     auto ec = decode_res.error();
     log_warning("decoding handshake-message failed: %s", ec.message().c_str());
 
-    disconnect();
+    protocol_.encode_error({ER_X_BAD_MESSAGE, "Bad Message", "HY000"});
+
+    send_response_then_disconnect();
+
     return;
   }
 
@@ -708,8 +712,7 @@
                    metadata_msg);
   }
 
-  for (size_t i = 0; i < response.rows.size(); ++i) {
-    auto row = response.rows[i];
+  for (const auto &row : response.rows) {
     if (response.columns.size() != row.size()) {
       throw std::runtime_error(
           std::string("columns_info.size() != row_values.size() ") +
@@ -717,11 +720,14 @@
           std::to_string(row.size()));
     }
     Mysqlx::Resultset::Row row_msg;
+
+    size_t col_ndx{};
     for (const auto &field : row) {
       const bool is_null = !field;
       protocol_encoder_.encode_row_field(
           row_msg,
-          protocol_encoder_.column_type_to_x(response.columns[i].type()),
+          protocol_encoder_.column_type_to_x(
+              response.columns[col_ndx++].type()),
           field.value(), is_null);
     }
     encode_message(Mysqlx::ServerMessages::RESULTSET_ROW, row_msg);
diff -Nru mysql-8.0-8.0.26/router/src/mysql_protocol/include/mysqlrouter/classic_protocol_codec_message.h mysql-8.0-8.0.27/router/src/mysql_protocol/include/mysqlrouter/classic_protocol_codec_message.h
--- mysql-8.0-8.0.26/router/src/mysql_protocol/include/mysqlrouter/classic_protocol_codec_message.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/mysql_protocol/include/mysqlrouter/classic_protocol_codec_message.h	2021-09-28 11:46:34.000000000 +0000
@@ -294,7 +294,7 @@
     : public impl::EncodeBase<Codec<message::server::AuthMethodData>> {
   template <class Accumulator>
   auto accumulate_fields(Accumulator &&accu) const {
-    return accu.step(wire::FixedInt<1>(v_.packet_type()))
+    return accu.step(wire::FixedInt<1>(cmd_byte()))
         .step(wire::String(v_.auth_method_data()))
         .result();
   }
@@ -308,19 +308,25 @@
   Codec(value_type v, capabilities::value_type caps)
       : __base(caps), v_{std::move(v)} {}
 
+  static constexpr uint8_t cmd_byte() noexcept { return 0x01; }
+
   template <class ConstBufferSequence>
   static stdx::expected<std::pair<size_t, value_type>, std::error_code> decode(
       const ConstBufferSequence &buffers, capabilities::value_type caps) {
     impl::DecodeBufferAccumulator<ConstBufferSequence> accu(buffers, caps);
 
-    auto packet_type_res = accu.template step<wire::FixedInt<1>>();
+    auto cmd_byte_res = accu.template step<wire::FixedInt<1>>();
+    if (!accu.result()) return stdx::make_unexpected(accu.result().error());
+
+    if (cmd_byte_res->value() != cmd_byte()) {
+      return stdx::make_unexpected(make_error_code(codec_errc::invalid_input));
+    }
     auto auth_method_data_res = accu.template step<wire::String>();
 
     if (!accu.result()) return stdx::make_unexpected(accu.result().error());
 
-    return std::make_pair(
-        accu.result().value(),
-        value_type(packet_type_res->value(), auth_method_data_res->value()));
+    return std::make_pair(accu.result().value(),
+                          value_type(auth_method_data_res->value()));
   }
 
  private:
@@ -2426,12 +2432,23 @@
           accu.step(wire::NulTermString(v_.schema()));
         }
 
-        if (shared_caps[classic_protocol::capabilities::pos::plugin_auth]) {
-          accu.step(wire::NulTermString(v_.auth_method_name()));
-        }
-
-        if (shared_caps
+        if (!shared_caps
                 [classic_protocol::capabilities::pos::connect_attributes]) {
+          // special handling for off-spec client/server implimentations.
+          //
+          // 1. older clients may set ::plugin_auth, but
+          //    ::connection_attributes which means nothing follows the
+          //    "auth-method-name" field
+          // 2. auth-method-name is empty, it MAY be skipped.
+          if (shared_caps[classic_protocol::capabilities::pos::plugin_auth] &&
+              !v_.auth_method_name().empty()) {
+            accu.step(wire::NulTermString(v_.auth_method_name()));
+          }
+        } else {
+          if (shared_caps[classic_protocol::capabilities::pos::plugin_auth]) {
+            accu.step(wire::NulTermString(v_.auth_method_name()));
+          }
+
           accu.step(wire::VarString(v_.attributes()));
         }
       }
@@ -2550,7 +2567,13 @@
       stdx::expected<wire::NulTermString, std::error_code> auth_method_res;
       if (shared_capabilities
               [classic_protocol::capabilities::pos::plugin_auth]) {
-        auth_method_res = accu.template step<wire::NulTermString>();
+        if (net::buffer_size(buffers) == accu.result().value()) {
+          // even with plugin_auth set, the server is fine, if no
+          // auth_method_name is sent.
+          auth_method_res = wire::NulTermString{};
+        } else {
+          auth_method_res = accu.template step<wire::NulTermString>();
+        }
       }
       if (!auth_method_res)
         return stdx::make_unexpected(auth_method_res.error());
diff -Nru mysql-8.0-8.0.26/router/src/mysql_protocol/include/mysqlrouter/classic_protocol_codec_wire.h mysql-8.0-8.0.27/router/src/mysql_protocol/include/mysqlrouter/classic_protocol_codec_wire.h
--- mysql-8.0-8.0.26/router/src/mysql_protocol/include/mysqlrouter/classic_protocol_codec_wire.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/mysql_protocol/include/mysqlrouter/classic_protocol_codec_wire.h	2021-09-28 11:46:34.000000000 +0000
@@ -36,6 +36,7 @@
 
 #include "mysql/harness/net_ts/buffer.h"
 #include "mysql/harness/stdx/expected.h"
+#include "mysql/harness/stdx/type_traits.h"  // endian
 #include "mysqlrouter/classic_protocol_codec_base.h"
 #include "mysqlrouter/classic_protocol_codec_error.h"
 #include "mysqlrouter/classic_protocol_wire.h"
diff -Nru mysql-8.0-8.0.26/router/src/mysql_protocol/include/mysqlrouter/classic_protocol_message.h mysql-8.0-8.0.27/router/src/mysql_protocol/include/mysqlrouter/classic_protocol_message.h
--- mysql-8.0-8.0.26/router/src/mysql_protocol/include/mysqlrouter/classic_protocol_message.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/mysql_protocol/include/mysqlrouter/classic_protocol_message.h	2021-09-28 11:46:34.000000000 +0000
@@ -155,28 +155,25 @@
  * - Error
  * - AuthMethodSwitch
  *
- * like:
+ * like caching_sha2_password does:
  *
- * - 0x01 (more auth data)
- * - 0x03 (fast path)
+ * - 0x01 0x02 (send public key)
+ * - 0x01 0x03 (send full handshake)
+ * - 0x01 0x04 (fast path done)
  */
 class AuthMethodData {
  public:
-  AuthMethodData(uint8_t packet_type, std::string auth_method_data)
-      : packet_type_{packet_type},
-        auth_method_data_{std::move(auth_method_data)} {}
+  AuthMethodData(std::string auth_method_data)
+      : auth_method_data_{std::move(auth_method_data)} {}
 
-  uint8_t packet_type() const noexcept { return packet_type_; }
   std::string auth_method_data() const { return auth_method_data_; }
 
  private:
-  uint8_t packet_type_;
   std::string auth_method_data_;
 };
 
 inline bool operator==(const AuthMethodData &a, const AuthMethodData &b) {
-  return (a.auth_method_data() == b.auth_method_data()) &&
-         (a.packet_type() == b.packet_type());
+  return a.auth_method_data() == b.auth_method_data();
 }
 
 /**
diff -Nru mysql-8.0-8.0.26/router/src/mysql_protocol/tests/test_classic_protocol_message.cc mysql-8.0-8.0.27/router/src/mysql_protocol/tests/test_classic_protocol_message.cc
--- mysql-8.0-8.0.26/router/src/mysql_protocol/tests/test_classic_protocol_message.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/mysql_protocol/tests/test_classic_protocol_message.cc	2021-09-28 11:46:34.000000000 +0000
@@ -83,7 +83,7 @@
 namespace message {
 namespace server {
 std::ostream &operator<<(std::ostream &os, const AuthMethodData &v) {
-  os << static_cast<uint16_t>(v.packet_type()) << ", " << v.auth_method_data();
+  os << v.auth_method_data();
   return os;
 }
 }  // namespace server
@@ -102,7 +102,9 @@
 
 const CodecParam<classic_protocol::message::server::AuthMethodData>
     codec_message_server_authmethoddata_param[] = {
-        {"auth_fast_ack", {0x03, ""}, {}, {0x03}},
+        {"caching_sha2_password_public_key", {"\x02"}, {}, {0x01, 0x02}},
+        {"caching_sha2_password_fast_ack", {"\x03"}, {}, {0x01, 0x03}},
+        {"caching_sha2_password_full_handshake", {"\x04"}, {}, {0x01, 0x04}},
 };
 
 INSTANTIATE_TEST_SUITE_P(
@@ -1179,9 +1181,7 @@
 
 // client::Greeting
 
-namespace classic_protocol {
-namespace message {
-namespace client {
+namespace classic_protocol::message::client {
 std::ostream &operator<<(std::ostream &os, const Greeting &v) {
   os << "Greeting: "
      << "\n";
@@ -1193,9 +1193,7 @@
 
   return os;
 }
-}  // namespace client
-}  // namespace message
-}  // namespace classic_protocol
+}  // namespace classic_protocol::message::client
 
 using CodecMessageClientGreetingTest =
     CodecTest<classic_protocol::message::client::Greeting>;
@@ -1367,6 +1365,38 @@
                  0x00, 0x00, 0x00, 0x00,  //
                  0x00, 0x00, 0x00         //
              }},
+            {
+                "choma",
+                {
+                    0b1011'1010'0010'0000'1111,  // caps:
+                                                 // long-pass
+                                                 // found-rows
+                                                 // long-flag
+                                                 // connect-with-schema
+                                                 // protocol_41
+                                                 // transactions
+                                                 // secure_connections
+                                                 // plugin_auth (set, but then
+                                                 // not used)
+                    (1 << 24) - 1,               // max-packet-size
+                    0xff,                        // collation
+                    "myroot",                    // user
+                    "\x14\xa5\xed\xe0\xdf\x96\x9d\x5e"
+                    "\xca\xa3\x45\xc3\x93\x55\xfe\x22"
+                    "\x99\x62\xc9\xed",  // authdata
+                    "mysql",             // schema
+                    "",                  // authmethod
+                    {}                   // attributes
+                },                       // client::Greeting
+                0xffffffff,              // server-caps
+                {0x0f, 0xa2, 0x0b, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x00,
+                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                 0x00, 0x00, 0x6d, 0x79, 0x72, 0x6f, 0x6f, 0x74, 0x00, 0x14,
+                 0x14, 0xa5, 0xed, 0xe0, 0xdf, 0x96, 0x9d, 0x5e, 0xca, 0xa3,
+                 0x45, 0xc3, 0x93, 0x55, 0xfe, 0x22, 0x99, 0x62, 0xc9, 0xed,
+                 0x6d, 0x79, 0x73, 0x71, 0x6c, 0x00}  // bytes
+            },
 };
 
 INSTANTIATE_TEST_SUITE_P(
@@ -1378,9 +1408,7 @@
 
 // client::ChangeUser
 
-namespace classic_protocol {
-namespace message {
-namespace client {
+namespace classic_protocol::message::client {
 std::ostream &operator<<(std::ostream &os, const ChangeUser &v) {
   os << "ChangeUser: "
      << "\n";
@@ -1390,9 +1418,7 @@
 
   return os;
 }
-}  // namespace client
-}  // namespace message
-}  // namespace classic_protocol
+}  // namespace classic_protocol::message::client
 
 using CodecMessageClientChangeUserTest =
     CodecTest<classic_protocol::message::client::ChangeUser>;
diff -Nru mysql-8.0-8.0.26/router/src/openssl/src/CMakeLists.txt mysql-8.0-8.0.27/router/src/openssl/src/CMakeLists.txt
--- mysql-8.0-8.0.26/router/src/openssl/src/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/openssl/src/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -24,11 +24,13 @@
 
 ADD_HARNESS_PLUGIN(router_openssl SOURCES
   openssl_plugin.cc
-  REQUIRES ${SSL_LIBRARIES}
+  REQUIRES ${SSL_LIBRARIES};harness_tls
   DESTINATION "${ROUTER_INSTALL_PLUGINDIR}"
   )
-TARGET_INCLUDE_DIRECTORIES(router_openssl
-  PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/../include/)
+TARGET_INCLUDE_DIRECTORIES(router_openssl PUBLIC
+  ${CMAKE_CURRENT_BINARY_DIR}/../include/
+  ${CMAKE_BINARY_DIR}/router/src/harness/include/
+  )
 
 GENERATE_EXPORT_HEADER(router_openssl
   EXPORT_FILE_NAME
diff -Nru mysql-8.0-8.0.26/router/src/openssl/src/openssl_plugin.cc mysql-8.0-8.0.27/router/src/openssl/src/openssl_plugin.cc
--- mysql-8.0-8.0.26/router/src/openssl/src/openssl_plugin.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/openssl/src/openssl_plugin.cc	2021-09-28 11:46:34.000000000 +0000
@@ -24,6 +24,8 @@
 
 #include "mysqlrouter/router_openssl_export.h"
 
+#include <memory>
+
 #include <openssl/conf.h>
 #include <openssl/engine.h>
 #include <openssl/err.h>
@@ -31,40 +33,20 @@
 #include <openssl/ssl.h>
 
 #include "mysql/harness/plugin.h"
+#include "mysql/harness/tls_context.h"
 
 extern "C" {
 
+std::unique_ptr<TlsLibraryContext> tls_library_context;
+
 static void init(mysql_harness::PluginFuncEnv *) {
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-  SSL_library_init();
-#else
-  OPENSSL_init_ssl(0, nullptr);
-#endif
-  SSL_load_error_strings();
-  ERR_load_crypto_strings();
+  // let the TlsLibraryContext constructor do the SSL initialization
+  tls_library_context.reset(new TlsLibraryContext());
 }
 
 static void deinit(mysql_harness::PluginFuncEnv *) {
-  // in case any of this is needed for cleanup
-#if 0
-  FIPS_mode_set(0);
-  CRYPTO_set_locking_callback(nullptr);
-  CRYPTO_set_id_callback(nullptr);
-
-  SSL_COMP_free_compression_methods();
-
-  ENGINE_cleanup();
-
-  CONF_modules_free();
-  CONF_modules_unload(1);
-
-  COMP_zlib_cleanup();
-
-  ERR_free_strings();
-  EVP_cleanup();
-
-  CRYPTO_cleanup_all_ex_data();
-#endif
+  // let the TlsLibraryContext destructor do the SSL cleanup
+  tls_library_context.reset();
 }
 
 mysql_harness::Plugin ROUTER_OPENSSL_EXPORT harness_plugin_router_openssl = {
diff -Nru mysql-8.0-8.0.26/router/src/plugin_info/src/plugin.cc mysql-8.0-8.0.27/router/src/plugin_info/src/plugin.cc
--- mysql-8.0-8.0.26/router/src/plugin_info/src/plugin.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/plugin_info/src/plugin.cc	2021-09-28 11:46:34.000000000 +0000
@@ -28,8 +28,6 @@
 #include <sstream>
 
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 
diff -Nru mysql-8.0-8.0.26/router/src/plugin_info/tests/CMakeLists.txt mysql-8.0-8.0.27/router/src/plugin_info/tests/CMakeLists.txt
--- mysql-8.0-8.0.26/router/src/plugin_info/tests/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/plugin_info/tests/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -31,10 +31,10 @@
   ${PROJECT_SOURCE_DIR}/tests/
 )
 
-IF(NOT WIN32)
-  ADD_LIBRARY(plugin_info_tests SHARED ${PLUGIN_INFO_SOURCES})
-ELSE()
+IF(WIN32)
   ADD_LIBRARY(plugin_info_tests STATIC ${PLUGIN_INFO_SOURCES})
+ELSE()
+  ADD_LIBRARY(plugin_info_tests SHARED ${PLUGIN_INFO_SOURCES})
 ENDIF()
 
 TARGET_LINK_LIBRARIES(plugin_info_tests harness-library router_lib)
diff -Nru mysql-8.0-8.0.26/router/src/rest_api/include/mysqlrouter/rest_api_component.h mysql-8.0-8.0.27/router/src/rest_api/include/mysqlrouter/rest_api_component.h
--- mysql-8.0-8.0.26/router/src/rest_api/include/mysqlrouter/rest_api_component.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/rest_api/include/mysqlrouter/rest_api_component.h	2021-09-28 11:46:34.000000000 +0000
@@ -30,8 +30,6 @@
 #include "mysqlrouter/rest_api_export.h"
 
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 
diff -Nru mysql-8.0-8.0.26/router/src/rest_api/include/mysqlrouter/rest_api_utils.h mysql-8.0-8.0.27/router/src/rest_api/include/mysqlrouter/rest_api_utils.h
--- mysql-8.0-8.0.26/router/src/rest_api/include/mysqlrouter/rest_api_utils.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/rest_api/include/mysqlrouter/rest_api_utils.h	2021-09-28 11:46:34.000000000 +0000
@@ -29,8 +29,6 @@
 #include <string>
 
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 
diff -Nru mysql-8.0-8.0.26/router/src/rest_api/src/rest_api_utils.cc mysql-8.0-8.0.27/router/src/rest_api/src/rest_api_utils.cc
--- mysql-8.0-8.0.26/router/src/rest_api/src/rest_api_utils.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/rest_api/src/rest_api_utils.cc	2021-09-28 11:46:34.000000000 +0000
@@ -25,8 +25,6 @@
 #include "mysqlrouter/rest_api_utils.h"
 
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 
diff -Nru mysql-8.0-8.0.26/router/src/rest_metadata_cache/src/rest_clusters_list.cc mysql-8.0-8.0.27/router/src/rest_metadata_cache/src/rest_clusters_list.cc
--- mysql-8.0-8.0.26/router/src/rest_metadata_cache/src/rest_clusters_list.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/rest_metadata_cache/src/rest_clusters_list.cc	2021-09-28 11:46:34.000000000 +0000
@@ -25,8 +25,6 @@
 #include "rest_clusters_list.h"
 
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 
diff -Nru mysql-8.0-8.0.26/router/src/rest_metadata_cache/src/rest_clusters_nodes.cc mysql-8.0-8.0.27/router/src/rest_metadata_cache/src/rest_clusters_nodes.cc
--- mysql-8.0-8.0.26/router/src/rest_metadata_cache/src/rest_clusters_nodes.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/rest_metadata_cache/src/rest_clusters_nodes.cc	2021-09-28 11:46:34.000000000 +0000
@@ -25,8 +25,6 @@
 #include "rest_clusters_nodes.h"
 
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 
@@ -52,7 +50,7 @@
 
 bool RestClustersNodes::on_handle_request(
     HttpRequest &req, const std::string & /* base_path */,
-    const std::vector<std::string> &path_matches) {
+    const std::vector<std::string> & /*path_matches*/) {
   if (!ensure_no_params(req)) return true;
 
   auto out_hdrs = req.get_output_headers();
@@ -63,18 +61,15 @@
     rapidjson::Document::AllocatorType &allocator = json_doc.GetAllocator();
 
     metadata_cache::LookupResult res =
-        metadata_cache::MetadataCacheAPI::instance()->lookup_replicaset(
-            path_matches[1]);
+        metadata_cache::MetadataCacheAPI::instance()->get_cluster_nodes();
 
     rapidjson::Value items(rapidjson::kArrayType);
 
     for (auto &inst : res.instance_vector) {
       rapidjson::Value o(rapidjson::kObjectType);
 
-      o.AddMember(
-          "replicasetName",
-          rapidjson::Value(inst.replicaset_name.c_str(), allocator).Move(),
-          allocator);
+      o.AddMember("replicasetName",
+                  rapidjson::Value("default", allocator).Move(), allocator);
       o.AddMember(
           "mysqlServerUuid",
           rapidjson::Value(inst.mysql_server_uuid.c_str(), allocator).Move(),
diff -Nru mysql-8.0-8.0.26/router/src/rest_metadata_cache/src/rest_metadata_cache_config.cc mysql-8.0-8.0.27/router/src/rest_metadata_cache/src/rest_metadata_cache_config.cc
--- mysql-8.0-8.0.26/router/src/rest_metadata_cache/src/rest_metadata_cache_config.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/rest_metadata_cache/src/rest_metadata_cache_config.cc	2021-09-28 11:46:34.000000000 +0000
@@ -25,8 +25,6 @@
 #include "rest_metadata_cache_config.h"
 
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 
@@ -63,7 +61,7 @@
     rapidjson::Document::AllocatorType &allocator = json_doc.GetAllocator();
 
     auto md_api = metadata_cache::MetadataCacheAPI::instance();
-    auto group_members = md_api->lookup_replicaset("");
+    auto group_members = md_api->get_cluster_nodes();
 
     rapidjson::Value members(rapidjson::kArrayType);
 
@@ -81,7 +79,8 @@
 
     json_doc.SetObject()
         .AddMember("clusterName",
-                   json_value_from_string(md_api->cluster_name(), allocator),
+                   json_value_from_string(md_api->target_cluster().to_string(),
+                                          allocator),
                    allocator)
         .AddMember<uint64_t>("timeRefreshInMs",
                              static_cast<uint64_t>(md_api->ttl().count()),
diff -Nru mysql-8.0-8.0.26/router/src/rest_metadata_cache/src/rest_metadata_cache_list.cc mysql-8.0-8.0.27/router/src/rest_metadata_cache/src/rest_metadata_cache_list.cc
--- mysql-8.0-8.0.26/router/src/rest_metadata_cache/src/rest_metadata_cache_list.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/rest_metadata_cache/src/rest_metadata_cache_list.cc	2021-09-28 11:46:34.000000000 +0000
@@ -25,8 +25,6 @@
 #include "rest_metadata_cache_list.h"
 
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 
diff -Nru mysql-8.0-8.0.26/router/src/rest_metadata_cache/src/rest_metadata_cache_status.cc mysql-8.0-8.0.27/router/src/rest_metadata_cache/src/rest_metadata_cache_status.cc
--- mysql-8.0-8.0.26/router/src/rest_metadata_cache/src/rest_metadata_cache_status.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/rest_metadata_cache/src/rest_metadata_cache_status.cc	2021-09-28 11:46:34.000000000 +0000
@@ -25,8 +25,6 @@
 #include "rest_metadata_cache_status.h"
 
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 
diff -Nru mysql-8.0-8.0.26/router/src/rest_router/src/rest_router_status.cc mysql-8.0-8.0.27/router/src/rest_router/src/rest_router_status.cc
--- mysql-8.0-8.0.26/router/src/rest_router/src/rest_router_status.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/rest_router/src/rest_router_status.cc	2021-09-28 11:46:34.000000000 +0000
@@ -32,8 +32,6 @@
 #include <ctime>
 
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 
diff -Nru mysql-8.0-8.0.26/router/src/rest_routing/src/CMakeLists.txt mysql-8.0-8.0.27/router/src/rest_routing/src/CMakeLists.txt
--- mysql-8.0-8.0.26/router/src/rest_routing/src/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/rest_routing/src/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -31,6 +31,7 @@
   rest_routing_health.cc
   rest_routing_list.cc
   rest_routing_plugin.cc
+  rest_routing_routes_status.cc
   rest_routing_status.cc
   REQUIRES router_lib;routing;http_server;rest_api
   DESTINATION "${ROUTER_INSTALL_PLUGINDIR}")
diff -Nru mysql-8.0-8.0.26/router/src/rest_routing/src/rest_routing_blocked_hosts.cc mysql-8.0-8.0.27/router/src/rest_routing/src/rest_routing_blocked_hosts.cc
--- mysql-8.0-8.0.26/router/src/rest_routing/src/rest_routing_blocked_hosts.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/rest_routing/src/rest_routing_blocked_hosts.cc	2021-09-28 11:46:34.000000000 +0000
@@ -25,8 +25,6 @@
 #include "rest_routing_blocked_hosts.h"
 
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 
diff -Nru mysql-8.0-8.0.26/router/src/rest_routing/src/rest_routing_config.cc mysql-8.0-8.0.27/router/src/rest_routing/src/rest_routing_config.cc
--- mysql-8.0-8.0.26/router/src/rest_routing/src/rest_routing_config.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/rest_routing/src/rest_routing_config.cc	2021-09-28 11:46:34.000000000 +0000
@@ -25,8 +25,6 @@
 #include "rest_routing_config.h"
 
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 
diff -Nru mysql-8.0-8.0.26/router/src/rest_routing/src/rest_routing_connections.cc mysql-8.0-8.0.27/router/src/rest_routing/src/rest_routing_connections.cc
--- mysql-8.0-8.0.26/router/src/rest_routing/src/rest_routing_connections.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/rest_routing/src/rest_routing_connections.cc	2021-09-28 11:46:34.000000000 +0000
@@ -25,8 +25,6 @@
 #include "rest_routing_connections.h"
 
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 
diff -Nru mysql-8.0-8.0.26/router/src/rest_routing/src/rest_routing_destinations.cc mysql-8.0-8.0.27/router/src/rest_routing/src/rest_routing_destinations.cc
--- mysql-8.0-8.0.26/router/src/rest_routing/src/rest_routing_destinations.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/rest_routing/src/rest_routing_destinations.cc	2021-09-28 11:46:34.000000000 +0000
@@ -27,8 +27,6 @@
 #include <ctime>
 
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 
diff -Nru mysql-8.0-8.0.26/router/src/rest_routing/src/rest_routing_health.cc mysql-8.0-8.0.27/router/src/rest_routing/src/rest_routing_health.cc
--- mysql-8.0-8.0.26/router/src/rest_routing/src/rest_routing_health.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/rest_routing/src/rest_routing_health.cc	2021-09-28 11:46:34.000000000 +0000
@@ -25,8 +25,6 @@
 #include "rest_routing_health.h"
 
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 
diff -Nru mysql-8.0-8.0.26/router/src/rest_routing/src/rest_routing_plugin.cc mysql-8.0-8.0.27/router/src/rest_routing/src/rest_routing_plugin.cc
--- mysql-8.0-8.0.26/router/src/rest_routing/src/rest_routing_plugin.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/rest_routing/src/rest_routing_plugin.cc	2021-09-28 11:46:34.000000000 +0000
@@ -46,6 +46,7 @@
 #include "rest_routing_destinations.h"
 #include "rest_routing_health.h"
 #include "rest_routing_list.h"
+#include "rest_routing_routes_status.h"
 #include "rest_routing_status.h"
 IMPORT_LOG_FUNCTIONS()
 
@@ -142,6 +143,13 @@
 
 #define STR(s) \
   { s, strlen(s), rapidjson::kPointerInvalidIndex }
+
+static const std::array<JsonPointer::Token, 2> routing_status_path_tokens{
+    {STR("paths"), STR("/routing/status")}};
+
+static const std::array<JsonPointer::Token, 2> routing_status_def_tokens{
+    {STR("definitions"), STR("RoutingGlobalStatus")}};
+
 static const std::array<JsonPointer::Token, 2> route_name_param_tokens{
     {STR("parameters"), STR("routeNameParam")}};
 
@@ -232,6 +240,22 @@
             allocator);
   }
 
+  // /definitions/RoutingGlobalStatus
+  const RestApiComponent::JsonPointer routing_status_def_ptr(
+      routing_status_def_tokens.data(), routing_status_def_tokens.size());
+
+  routing_status_def_ptr.Set(
+      spec_doc,
+      JsonValue(rapidjson::kObjectType)
+          .AddMember("totalMaxConnections",
+                     "number of total connections allowed", allocator)
+          .AddMember("currentMaxConnections",
+                     "number of current total connections", allocator),
+      allocator);
+
+  std::string routing_status_def_ptr_str =
+      json_pointer_stringfy(routing_status_def_ptr);
+
   // /parameters/routeNameParam
   const RestApiComponent::JsonPointer route_name_param_ptr(
       route_name_param_tokens.data(), route_name_param_tokens.size());
@@ -657,6 +681,51 @@
   std::string routes_connection_list_def_ptr_str =
       json_pointer_stringfy(routes_connection_list_def_ptr);
 
+  // /paths/routingStatus
+  {
+    JsonPointer ptr(routing_status_path_tokens.data(),
+                    routing_status_path_tokens.size());
+
+    ptr.Set(
+        spec_doc,
+        JsonValue(rapidjson::kObjectType)
+            .AddMember(
+                "get",
+                JsonValue(rapidjson::kObjectType)
+                    .AddMember("tags",
+                               JsonValue(rapidjson::kArrayType)
+                                   .PushBack("routing", allocator),
+                               allocator)
+                    .AddMember("description",
+                               "Get status of the routing plugin", allocator)
+                    .AddMember(
+                        "responses",
+                        JsonValue(rapidjson::kObjectType)
+                            .AddMember(
+                                "200",
+                                JsonValue(rapidjson::kObjectType)
+                                    .AddMember("description",
+                                               "status of the routing plugin",
+                                               allocator)
+                                    .AddMember(
+                                        "schema",
+                                        JsonValue(rapidjson::kObjectType)
+                                            .AddMember(
+                                                "$ref",
+                                                JsonValue(
+                                                    routing_status_def_ptr_str
+                                                        .data(),
+                                                    routing_status_def_ptr_str
+                                                        .size(),
+                                                    allocator),
+                                                allocator),
+                                        allocator),
+                                allocator),
+                        allocator),
+                allocator),
+        allocator);
+  }
+
   // /paths/routesConfig
   {
     JsonPointer ptr(routes_config_path_tokens.data(),
@@ -1094,7 +1163,9 @@
 
   const bool spec_adder_executed = rest_api_srv.try_process_spec(spec_adder);
 
-  std::array<RestApiComponentPath, 7> paths{{
+  std::array<RestApiComponentPath, 8> paths{{
+      {rest_api_srv, RestRoutingStatus::path_regex,
+       std::make_unique<RestRoutingStatus>(require_realm_routing)},
       {rest_api_srv, RestRoutingList::path_regex,
        std::make_unique<RestRoutingList>(require_realm_routing)},
       {rest_api_srv, RestRoutingBlockedHosts::path_regex,
@@ -1103,8 +1174,8 @@
        std::make_unique<RestRoutingDestinations>(require_realm_routing)},
       {rest_api_srv, RestRoutingConfig::path_regex,
        std::make_unique<RestRoutingConfig>(require_realm_routing)},
-      {rest_api_srv, RestRoutingStatus::path_regex,
-       std::make_unique<RestRoutingStatus>(require_realm_routing)},
+      {rest_api_srv, RestRoutingRoutesStatus::path_regex,
+       std::make_unique<RestRoutingRoutesStatus>(require_realm_routing)},
       {rest_api_srv, RestRoutingHealth::path_regex,
        std::make_unique<RestRoutingHealth>(require_realm_routing)},
       {rest_api_srv, RestRoutingConnections::path_regex,
diff -Nru mysql-8.0-8.0.26/router/src/rest_routing/src/rest_routing_routes_status.cc mysql-8.0-8.0.27/router/src/rest_routing/src/rest_routing_routes_status.cc
--- mysql-8.0-8.0.26/router/src/rest_routing/src/rest_routing_routes_status.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/rest_routing/src/rest_routing_routes_status.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,79 @@
+/*
+  Copyright (c) 2019, 2021, Oracle 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,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "rest_routing_routes_status.h"
+
+#include <ctime>
+
+#ifdef RAPIDJSON_NO_SIZETYPEDEFINE
+#include "my_rapidjson_size_t.h"
+#endif
+
+#include <rapidjson/document.h>
+#include <rapidjson/writer.h>
+
+#include "mysqlrouter/rest_api_utils.h"
+#include "mysqlrouter/routing_component.h"
+
+constexpr const char RestRoutingRoutesStatus::path_regex[];
+
+bool RestRoutingRoutesStatus::on_handle_request(
+    HttpRequest &req, const std::string & /* base_path */,
+    const std::vector<std::string> &path_matches) {
+  if (!ensure_no_params(req)) return true;
+
+  MySQLRoutingAPI inst =
+      MySQLRoutingComponent::get_instance().api(path_matches[1]);
+
+  if (!inst) {
+    send_rfc7807_not_found_error(req);
+    return true;
+  }
+
+  auto out_hdrs = req.get_output_headers();
+  out_hdrs.add("Content-Type", "application/json");
+
+#if 0
+  // handle If-Modified-Since
+
+  last_modified_ = ::time(nullptr);
+
+  if (!ensure_modified_since(req, last_modified_)) return true;
+#endif
+
+  rapidjson::Document json_doc;
+  {
+    rapidjson::Document::AllocatorType &allocator = json_doc.GetAllocator();
+
+    json_doc.SetObject()
+        .AddMember("activeConnections", inst.get_active_connections(),
+                   allocator)
+        .AddMember("totalConnections", inst.get_total_connections(), allocator)
+        .AddMember<uint64_t>("blockedHosts",
+                             inst.get_blocked_client_hosts().size(), allocator);
+  }
+  send_json_document(req, HttpStatusCode::Ok, json_doc);
+
+  return true;
+}
diff -Nru mysql-8.0-8.0.26/router/src/rest_routing/src/rest_routing_routes_status.h mysql-8.0-8.0.27/router/src/rest_routing/src/rest_routing_routes_status.h
--- mysql-8.0-8.0.26/router/src/rest_routing/src/rest_routing_routes_status.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/rest_routing/src/rest_routing_routes_status.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,41 @@
+/*
+  Copyright (c) 2019, 2021, Oracle 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,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef MYSQLROUTER_REST_ROUTING_STATUS_INCLUDED
+#define MYSQLROUTER_REST_ROUTING_STATUS_INCLUDED
+
+#include "mysqlrouter/rest_api_component.h"
+
+class RestRoutingRoutesStatus : public RestApiHandler {
+ public:
+  static constexpr const char path_regex[] = "^/routes/([^/]+)/status/?$";
+
+  RestRoutingRoutesStatus(const std::string &require_realm)
+      : RestApiHandler(require_realm, HttpMethod::Get) {}
+
+  bool on_handle_request(HttpRequest &req, const std::string &base_path,
+                         const std::vector<std::string> &path_matches) override;
+};
+
+#endif
diff -Nru mysql-8.0-8.0.26/router/src/rest_routing/src/rest_routing_status.cc mysql-8.0-8.0.27/router/src/rest_routing/src/rest_routing_status.cc
--- mysql-8.0-8.0.26/router/src/rest_routing/src/rest_routing_status.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/rest_routing/src/rest_routing_status.cc	2021-09-28 11:46:34.000000000 +0000
@@ -27,8 +27,6 @@
 #include <ctime>
 
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 
@@ -42,38 +40,25 @@
 
 bool RestRoutingStatus::on_handle_request(
     HttpRequest &req, const std::string & /* base_path */,
-    const std::vector<std::string> &path_matches) {
+    const std::vector<std::string> & /*path_matches*/) {
   if (!ensure_no_params(req)) return true;
 
-  MySQLRoutingAPI inst =
-      MySQLRoutingComponent::get_instance().api(path_matches[1]);
-
-  if (!inst) {
-    send_rfc7807_not_found_error(req);
-    return true;
-  }
+  auto &routing_component = MySQLRoutingComponent::get_instance();
 
   auto out_hdrs = req.get_output_headers();
   out_hdrs.add("Content-Type", "application/json");
 
-#if 0
-  // handle If-Modified-Since
-
-  last_modified_ = ::time(nullptr);
-
-  if (!ensure_modified_since(req, last_modified_)) return true;
-#endif
-
   rapidjson::Document json_doc;
   {
     rapidjson::Document::AllocatorType &allocator = json_doc.GetAllocator();
 
     json_doc.SetObject()
-        .AddMember("activeConnections", inst.get_active_connections(),
-                   allocator)
-        .AddMember("totalConnections", inst.get_total_connections(), allocator)
-        .AddMember<uint64_t>("blockedHosts",
-                             inst.get_blocked_client_hosts().size(), allocator);
+        .AddMember<uint64_t>("maxTotalConnections",
+                             routing_component.max_total_connections(),
+                             allocator)
+        .AddMember<uint64_t>("currentTotalConnections",
+                             routing_component.current_total_connections(),
+                             allocator);
   }
   send_json_document(req, HttpStatusCode::Ok, json_doc);
 
diff -Nru mysql-8.0-8.0.26/router/src/rest_routing/src/rest_routing_status.h mysql-8.0-8.0.27/router/src/rest_routing/src/rest_routing_status.h
--- mysql-8.0-8.0.26/router/src/rest_routing/src/rest_routing_status.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/rest_routing/src/rest_routing_status.h	2021-09-28 11:46:34.000000000 +0000
@@ -22,14 +22,14 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef MYSQLROUTER_REST_ROUTING_STATUS_INCLUDED
-#define MYSQLROUTER_REST_ROUTING_STATUS_INCLUDED
+#ifndef MYSQLROUTER_REST_ROUTING_GLOBAL_STATUS_INCLUDED
+#define MYSQLROUTER_REST_ROUTING_GLOBAL_STATUS_INCLUDED
 
 #include "mysqlrouter/rest_api_component.h"
 
 class RestRoutingStatus : public RestApiHandler {
  public:
-  static constexpr const char path_regex[] = "^/routes/([^/]+)/status/?$";
+  static constexpr const char path_regex[] = "^/routing/status/?$";
 
   RestRoutingStatus(const std::string &require_realm)
       : RestApiHandler(require_realm, HttpMethod::Get) {}
diff -Nru mysql-8.0-8.0.26/router/src/router/include/mysqlrouter/cluster_metadata_dynamic_state.h mysql-8.0-8.0.27/router/src/router/include/mysqlrouter/cluster_metadata_dynamic_state.h
--- mysql-8.0-8.0.26/router/src/router/include/mysqlrouter/cluster_metadata_dynamic_state.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/router/include/mysqlrouter/cluster_metadata_dynamic_state.h	2021-09-28 11:46:34.000000000 +0000
@@ -95,6 +95,14 @@
       const std::string &cluster_type_specific_id);
 
   /**
+   * @brief Sets the new value for the ClusterSet id in the state object.
+   *
+   * @param clusterset_id new value of the ClusterSet id
+   * to set
+   */
+  void set_clusterset_id(const std::string &clusterset_id);
+
+  /**
    * @brief Sets the new value for the cluster metadata server list in the state
    * object.
    *
@@ -112,15 +120,15 @@
 
   /**
    * @brief Sets the new value for the last known metadata view_id of the
-   * ReplicaSet cluster.
+   * ReplicaSet cluster or ClusterSet.
    *
    * @param view_id last known metadata view_id of the ReplicaSet cluster
    */
-  void set_view_id(const unsigned view_id);
+  void set_view_id(const uint64_t view_id);
 
   /**
    * @brief Reads the current value of the last known metadata view_id of the
-   * ReplicaSet cluster from the state object.
+   * ReplicaSet cluster or ClusterSet from the state object.
    *
    * @return last known metadata view_id of the ReplicaSet cluster
    */
@@ -133,6 +141,20 @@
    */
   std::string get_cluster_type_specific_id() const;
 
+  /**
+   * @brief Reads the current ClusterSet id from the state object.
+   *
+   * @return current cluster type specific id
+   */
+  std::string get_clusterset_id() const;
+
+  /**
+   * @brief Returns true if the metadata is configured to work with a
+   * ClusterSet, false if a single Cluster
+   *
+   */
+  bool is_clusterset() const;
+
  private:
   void save_section();
 
@@ -140,8 +162,9 @@
   std::unique_ptr<Pimpl> pimpl_;
 
   std::string cluster_type_specific_id_;
+  std::string clusterset_id_;
   std::vector<std::string> metadata_servers_;
-  unsigned view_id_{0};
+  uint64_t view_id_{0};
 
   bool changed_{false};
 
diff -Nru mysql-8.0-8.0.26/router/src/router/include/mysqlrouter/cluster_metadata.h mysql-8.0-8.0.27/router/src/router/include/mysqlrouter/cluster_metadata.h
--- mysql-8.0-8.0.26/router/src/router/include/mysqlrouter/cluster_metadata.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/router/include/mysqlrouter/cluster_metadata.h	2021-09-28 11:46:34.000000000 +0000
@@ -51,6 +51,18 @@
     }
   }
 
+  bool operator<=(const MetadataSchemaVersion &o) const {
+    return operator<(o) || operator==(o);
+  }
+
+  bool operator>(const MetadataSchemaVersion &o) const {
+    return operator!=(o) && !operator<(o);
+  }
+
+  bool operator>=(const MetadataSchemaVersion &o) const {
+    return operator>(o) || operator==(o);
+  }
+
   bool operator==(const MetadataSchemaVersion &o) const {
     return major == o.major && minor == o.minor && patch == o.patch;
   }
@@ -73,6 +85,9 @@
 // Version that introduced views and support for ReplicaSet cluster type
 constexpr MetadataSchemaVersion kNewMetadataVersion{2, 0, 0};
 
+// Version that introduced support for ClusterSets
+constexpr MetadataSchemaVersion kClusterSetsMetadataVersion{2, 1, 0};
+
 // Version that will be is set while the metadata is being updated
 constexpr MetadataSchemaVersion kUpgradeInProgressMetadataVersion{0, 0, 0};
 
@@ -110,11 +125,12 @@
 enum class ClusterType {
   GR_V1, /* based on Group Replication (metadata 1.x) */
   GR_V2, /* based on Group Replication (metadata 2.x) */
+  GR_CS, /* based on Group Replication, part of ClusterSet (metadata 2.1+) */
   RS_V2  /* ReplicaSet (metadata 2.x) */
 };
 
 ClusterType get_cluster_type(const MetadataSchemaVersion &schema_version,
-                             MySQLSession *mysql);
+                             MySQLSession *mysql, unsigned int router_id = 0);
 
 std::string to_string(const ClusterType cluster_type);
 
@@ -122,5 +138,53 @@
 
 stdx::expected<void, std::string> setup_metadata_session(MySQLSession &session);
 
+class TargetCluster {
+ public:
+  enum class TargetType { ByUUID, ByName, ByPrimaryRole };
+  enum class InvalidatedClusterRoutingPolicy { DropAll, AcceptRO };
+
+  TargetCluster(const TargetType type = TargetType::ByPrimaryRole,
+                const std::string &value = "")
+      : target_type_(type), target_value_(value) {
+    if (target_type_ == TargetType::ByPrimaryRole) target_value_ = "PRIMARY";
+  }
+
+  std::string to_string() const { return target_value_; }
+  const char *c_str() const { return target_value_.c_str(); }
+
+  TargetType target_type() const { return target_type_; }
+  bool is_primary() const { return is_primary_; }
+  bool is_invalidated() const { return is_invalidated_; }
+  InvalidatedClusterRoutingPolicy invalidated_cluster_routing_policy() const {
+    return invalidated_cluster_routing_policy_;
+  }
+
+  void target_type(const TargetType value) { target_type_ = value; }
+  void target_value(const std::string &value) { target_value_ = value; }
+  void is_primary(const bool value) { is_primary_ = value; }
+  void is_invalidated(const bool value) { is_invalidated_ = value; }
+  void invalidated_cluster_routing_policy(
+      const InvalidatedClusterRoutingPolicy value) {
+    invalidated_cluster_routing_policy_ = value;
+  }
+
+  std::string options_string() const { return options_string_; }
+  void options_string(const std::string &options_string) {
+    options_string_ = options_string;
+  }
+
+ private:
+  TargetType target_type_;
+  std::string target_value_;
+  InvalidatedClusterRoutingPolicy invalidated_cluster_routing_policy_{
+      InvalidatedClusterRoutingPolicy::DropAll};
+  // in case of ClusterSet is this Cluster a Primary
+  bool is_primary_{true};
+  // is the Cluster marked as invalid in the metadata
+  bool is_invalidated_{false};
+
+  std::string options_string_{"{}"};
+};
+
 }  // namespace mysqlrouter
 #endif
diff -Nru mysql-8.0-8.0.26/router/src/router/include/mysqlrouter/mysql_session.h mysql-8.0-8.0.27/router/src/router/include/mysqlrouter/mysql_session.h
--- mysql-8.0-8.0.26/router/src/router/include/mysqlrouter/mysql_session.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/router/include/mysqlrouter/mysql_session.h	2021-09-28 11:46:34.000000000 +0000
@@ -451,7 +451,7 @@
 
   virtual unsigned warning_count() noexcept;
 
-  virtual std::string quote(const std::string &s, char qchar = '\'') noexcept;
+  virtual std::string quote(const std::string &s, char qchar = '\'') const;
 
   virtual bool is_connected() noexcept { return connection_ && connected_; }
   const std::string &get_address() noexcept { return connection_address_; }
diff -Nru mysql-8.0-8.0.26/router/src/router/include/mysqlrouter/utils.h mysql-8.0-8.0.27/router/src/router/include/mysqlrouter/utils.h
--- mysql-8.0-8.0.26/router/src/router/include/mysqlrouter/utils.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/router/include/mysqlrouter/utils.h	2021-09-28 11:46:34.000000000 +0000
@@ -229,6 +229,9 @@
 unsigned strtoui_checked(const char *value,
                          unsigned int default_result = 0) noexcept;
 
+uint64_t strtoull_checked(const char *value,
+                          uint64_t default_result = 0) noexcept;
+
 #ifndef _WIN32
 
 /** @class SysUserOperationsBase
diff -Nru mysql-8.0-8.0.26/router/src/router/src/cluster_metadata.cc mysql-8.0-8.0.27/router/src/router/src/cluster_metadata.cc
--- mysql-8.0-8.0.26/router/src/router/src/cluster_metadata.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/router/src/cluster_metadata.cc	2021-09-28 11:46:34.000000000 +0000
@@ -25,6 +25,8 @@
 #include "cluster_metadata.h"
 
 #include "common.h"
+#include "harness_assert.h"
+#include "mysql/harness/event_state_tracker.h"
 #include "mysql/harness/logging/logging.h"
 #include "mysqld_error.h"
 #include "mysqlrouter/utils.h"
@@ -39,6 +41,11 @@
 #endif
 
 using namespace std::string_literals;
+using mysql_harness::EventStateTracker;
+using mysql_harness::get_from_map;
+using mysql_harness::logging::LogLevel;
+
+static constexpr const std::string_view kClusterSet{"clusterset"};
 
 namespace mysqlrouter {
 
@@ -144,92 +151,136 @@
                               socket_operations_);
 }
 
-static void update_router_info_v1(const uint32_t router_id,
-                                  const std::string &rw_endpoint,
-                                  const std::string &ro_endpoint,
-                                  const std::string &rw_x_endpoint,
-                                  const std::string &ro_x_endpoint,
-                                  const std::string &username,
-                                  MySQLSession *mysql) {
+namespace {
+
+std::string to_string_md(const ClusterType cluster_type) {
+  switch (cluster_type) {
+    case ClusterType::GR_V1:
+    case ClusterType::GR_V2:
+      return "cluster";
+    case ClusterType::RS_V2:
+      return "replicaset";
+    case ClusterType::GR_CS:
+      return "clusterset";
+  }
+
+  return "unknown";
+}
+
+void update_router_info_v1(const uint32_t router_id,
+                           const std::string &rw_endpoint,
+                           const std::string &ro_endpoint,
+                           const std::string &rw_x_endpoint,
+                           const std::string &ro_x_endpoint,
+                           const std::string &username, MySQLSession *mysql) {
   sqlstring query(
       "UPDATE mysql_innodb_cluster_metadata.routers"
       " SET attributes = "
-      "   JSON_SET(JSON_SET(JSON_SET(JSON_SET(JSON_SET(IF(attributes IS NULL, "
-      "'{}', "
-      "attributes),"
+      "   JSON_SET(JSON_SET(JSON_SET(JSON_SET(JSON_SET(JSON_SET(IF(attributes "
+      "IS NULL, '{}', attributes),"
       "    '$.RWEndpoint', ?),"
       "    '$.ROEndpoint', ?),"
       "    '$.RWXEndpoint', ?),"
       "    '$.ROXEndpoint', ?),"
-      "    '$.MetadataUser', ?)"
+      "    '$.MetadataUser', ?),"
+      "    '$.bootstrapTargetType', ?)"
       " WHERE router_id = ?");
 
   query << rw_endpoint << ro_endpoint << rw_x_endpoint << ro_x_endpoint;
-  query << username;
+  query << username << to_string_md(ClusterType::GR_V1);
   query << router_id << sqlstring::end;
 
   mysql->execute(query);
 }
 
-static void update_router_info_v2(
-    const uint32_t router_id, const std::string &cluster_id,
+void update_router_info_v2(
+    const mysqlrouter::ClusterType cluster_type, const uint32_t router_id,
+    const std::string &cluster_id, const std::string &target_cluster,
     const std::string &rw_endpoint, const std::string &ro_endpoint,
     const std::string &rw_x_endpoint, const std::string &ro_x_endpoint,
     const std::string &username, MySQLSession *mysql) {
+  const std::string cluster_id_field =
+      cluster_type == mysqlrouter::ClusterType::GR_CS ? "clusterset_id"
+                                                      : "cluster_id";
   sqlstring query(
       "UPDATE mysql_innodb_cluster_metadata.v2_routers"
       " SET attributes = "
-      "   JSON_SET(JSON_SET(JSON_SET(JSON_SET(JSON_SET(IF(attributes IS NULL, "
+      "   JSON_SET(JSON_SET(JSON_SET(JSON_SET(JSON_SET(JSON_SET(IF(attributes "
+      "IS NULL, "
       "'{}', attributes),"
       "    '$.RWEndpoint', ?),"
       "    '$.ROEndpoint', ?),"
       "    '$.RWXEndpoint', ?),"
       "    '$.ROXEndpoint', ?),"
       "    '$.MetadataUser', ?),"
-      " version = ?, cluster_id = ?"
-      " WHERE router_id = ?");
-
-  query << rw_endpoint << ro_endpoint << rw_x_endpoint << ro_x_endpoint;
-  query << username;
-  query << MYSQL_ROUTER_VERSION << cluster_id << router_id << sqlstring::end;
+      "    '$.bootstrapTargetType', ?),"
+      " version = ?, ! = ?"
+      " WHERE router_id = ?",
+      {mysqlrouter::QuoteOnlyIfNeeded});
+
+  query << rw_endpoint << ro_endpoint << rw_x_endpoint << ro_x_endpoint
+        << username << to_string_md(cluster_type) << MYSQL_ROUTER_VERSION
+        << cluster_id_field << cluster_id << router_id << sqlstring::end;
 
   mysql->execute(query);
+
+  if (!target_cluster.empty()) {
+    sqlstring query_options(
+        "UPDATE mysql_innodb_cluster_metadata.v2_routers"
+        " SET options = JSON_SET(IF(options IS NULL, '{}', options),"
+        " '$.target_cluster', ?)"
+        " WHERE router_id = ?");
+
+    query_options << target_cluster << router_id << sqlstring::end;
+
+    mysql->execute(query_options);
+  }
 }
 
-void ClusterMetadataGRV1::update_router_info(const uint32_t router_id,
-                                             const std::string & /*cluster_id*/,
-                                             const std::string &rw_endpoint,
-                                             const std::string &ro_endpoint,
-                                             const std::string &rw_x_endpoint,
-                                             const std::string &ro_x_endpoint,
-                                             const std::string &username) {
+}  // namespace
+
+void ClusterMetadataGRV1::update_router_info(
+    const uint32_t router_id, const std::string & /*cluster_id*/,
+    const std::string & /*target_cluster*/, const std::string &rw_endpoint,
+    const std::string &ro_endpoint, const std::string &rw_x_endpoint,
+    const std::string &ro_x_endpoint, const std::string &username) {
   update_router_info_v1(router_id, rw_endpoint, ro_endpoint, rw_x_endpoint,
                         ro_x_endpoint, username, mysql_);
 }
 
-void ClusterMetadataGRV2::update_router_info(const uint32_t router_id,
-                                             const std::string &cluster_id,
-                                             const std::string &rw_endpoint,
-                                             const std::string &ro_endpoint,
-                                             const std::string &rw_x_endpoint,
-                                             const std::string &ro_x_endpoint,
-                                             const std::string &username) {
-  update_router_info_v2(router_id, cluster_id, rw_endpoint, ro_endpoint,
-                        rw_x_endpoint, ro_x_endpoint, username, mysql_);
-}
-
-void ClusterMetadataAR::update_router_info(const uint32_t router_id,
-                                           const std::string &cluster_id,
-                                           const std::string &rw_endpoint,
-                                           const std::string &ro_endpoint,
-                                           const std::string &rw_x_endpoint,
-                                           const std::string &ro_x_endpoint,
-                                           const std::string &username) {
-  update_router_info_v2(router_id, cluster_id, rw_endpoint, ro_endpoint,
-                        rw_x_endpoint, ro_x_endpoint, username, mysql_);
+void ClusterMetadataGRV2::update_router_info(
+    const uint32_t router_id, const std::string &cluster_id,
+    const std::string &target_cluster, const std::string &rw_endpoint,
+    const std::string &ro_endpoint, const std::string &rw_x_endpoint,
+    const std::string &ro_x_endpoint, const std::string &username) {
+  update_router_info_v2(mysqlrouter::ClusterType::GR_V2, router_id, cluster_id,
+                        target_cluster, rw_endpoint, ro_endpoint, rw_x_endpoint,
+                        ro_x_endpoint, username, mysql_);
+}
+
+void ClusterMetadataAR::update_router_info(
+    const uint32_t router_id, const std::string &cluster_id,
+    const std::string &target_cluster, const std::string &rw_endpoint,
+    const std::string &ro_endpoint, const std::string &rw_x_endpoint,
+    const std::string &ro_x_endpoint, const std::string &username) {
+  update_router_info_v2(mysqlrouter::ClusterType::RS_V2, router_id, cluster_id,
+                        target_cluster, rw_endpoint, ro_endpoint, rw_x_endpoint,
+                        ro_x_endpoint, username, mysql_);
 }
 
-static uint32_t register_router_v1(
+void ClusterMetadataGRInClusterSet::update_router_info(
+    const uint32_t router_id, const std::string &cluster_id,
+    const std::string &target_cluster, const std::string &rw_endpoint,
+    const std::string &ro_endpoint, const std::string &rw_x_endpoint,
+    const std::string &ro_x_endpoint, const std::string &username) {
+  update_router_info_v2(mysqlrouter::ClusterType::GR_CS, router_id, cluster_id,
+                        target_cluster, rw_endpoint, ro_endpoint, rw_x_endpoint,
+                        ro_x_endpoint, username, mysql_);
+}
+
+namespace {
+
+uint32_t register_router_v1(
     const std::string &router_name, const bool overwrite,
     const std::string &hostname_override, MySQLSession *mysql,
     mysql_harness::SocketOperationsBase *socket_operations) {
@@ -308,7 +359,7 @@
   return static_cast<uint32_t>(mysql->last_insert_id());
 }
 
-static uint32_t register_router_v2(
+uint32_t register_router_v2(
     const std::string &router_name, const bool overwrite,
     const std::string &hostname_override, MySQLSession *mysql,
     mysql_harness::SocketOperationsBase *socket_operations) {
@@ -346,6 +397,8 @@
   }
 }
 
+}  // namespace
+
 uint32_t ClusterMetadataGRV1::register_router(
     const std::string &router_name, const bool overwrite,
     const std::string &hostname_override) {
@@ -498,9 +551,11 @@
         "mysql-innodb-cluster-creating.html about how to create a cluster.");
   } else if (cluster_count != 1) {
     throw std::runtime_error(
-        "Expected the metadata server to contain configuration for one "
-        "cluster, found " +
-        std::to_string(cluster_count));
+        "The metadata server contains configuration for more than 1 Cluster: " +
+        std::to_string(cluster_count) +
+        ". If it was a part of a ClusterSet previously, the metadata should be "
+        "recreated using dba.dropMetadataSchema() and dba.createCluster() with "
+        "adoptFromGR parameter set to true.");
   }
 }
 
@@ -619,9 +674,7 @@
           "expected 1 got " +
           std::to_string(result->size()));
     }
-    const bool has_one_cluster = strtoi_checked((*result)[0]) == 1;
-
-    return has_one_cluster;
+    return strtoui_checked((*result)[0]);
   }
   throw std::logic_error("No result returned for metadata query");
 }
@@ -672,10 +725,10 @@
   try {
     mysql->query(
         query, [&result](const std::vector<const char *> &row) -> bool {
-          if (result.metadata_cluster_id == "") {
-            result.metadata_cluster_id = get_string(row[0]);
-            result.metadata_cluster_name = get_string(row[1]);
-          } else if (result.metadata_cluster_id != get_string(row[0])) {
+          if (result.cluster_id == "") {
+            result.cluster_id = get_string(row[0]);
+            result.name = get_string(row[1]);
+          } else if (result.cluster_id != get_string(row[0])) {
             // metadata with more than 1 cluster not currently supported
             throw std::runtime_error("Metadata contains more than one cluster");
           }
@@ -687,7 +740,7 @@
     throw std::runtime_error(std::string("Error querying metadata: ") +
                              e.what());
   }
-  if (result.metadata_cluster_name.empty())
+  if (result.name.empty())
     throw std::runtime_error("No clusters defined in metadata server");
 
   return result;
@@ -701,6 +754,160 @@
   return query_metadata_servers(mysql_, /*metadata_v2=*/true);
 }
 
+ClusterMetadataGRInClusterSet::ClusterMetadataGRInClusterSet(
+    const MetadataSchemaVersion &schema_version, MySQLSession *mysql,
+    const OptionsMap &options, mysql_harness::SocketOperationsBase *sockops)
+    : ClusterMetadataGRV2(schema_version, mysql, sockops) {
+  const std::string target_cluster_by_name =
+      get_from_map(options, "target-cluster-by-name"s, ""s);
+  if (!target_cluster_by_name.empty()) {
+    target_cluster_type_ = TargetClusterType::targetClusterByName;
+    target_cluster_name_ = target_cluster_by_name;
+    return;
+  }
+
+  const std::string target_cluster =
+      get_from_map(options, "target-cluster"s, "current"s);
+  if (target_cluster == "current")
+    target_cluster_type_ = TargetClusterType::targetClusterCurrent;
+  else {
+    harness_assert(target_cluster == "primary");
+    target_cluster_type_ = TargetClusterType::targetClusterPrimary;
+  }
+}
+
+ClusterInfo ClusterMetadataGRInClusterSet::fetch_metadata_servers() {
+  ClusterInfo result;
+  std::string query =
+      "select C.cluster_id, C.attributes->>'$.group_replication_group_name', "
+      "CS.domain_name, CSM.member_role from "
+      "mysql_innodb_cluster_metadata.v2_gr_clusters C join "
+      "mysql_innodb_cluster_metadata.v2_cs_members CSM on CSM.cluster_id = "
+      "C.cluster_id join mysql_innodb_cluster_metadata.v2_cs_clustersets CS on "
+      "CS.clusterset_id = CSM.clusterset_id";
+
+  switch (target_cluster_type_) {
+    case TargetClusterType::targetClusterByName:
+      query += " where C.cluster_name = " + mysql_->quote(target_cluster_name_);
+      break;
+    case TargetClusterType::targetClusterCurrent:
+      query = query +=
+          " where C.cluster_id = (select cluster_id from "
+          "mysql_innodb_cluster_metadata.v2_this_instance)";
+      break;
+    case TargetClusterType::targetClusterPrimary:
+      query += " where CSM.member_role = 'PRIMARY'";
+  }
+
+  std::unique_ptr<MySQLSession::ResultRow> result_cluster_info(
+      mysql_->query_one(query));
+
+  if (!result_cluster_info) {
+    switch (target_cluster_type_) {
+      case TargetClusterType::targetClusterByName:
+        throw std::runtime_error(
+            "Could not find Cluster with selected name: '" +
+            target_cluster_name_ + "'");
+      case TargetClusterType::targetClusterCurrent:
+        throw std::runtime_error(
+            "The node used for bootstrap does not appear to be part of the "
+            "InnoDB Cluster'");
+      case TargetClusterType::targetClusterPrimary:
+        throw std::runtime_error(
+            "Could not reach Primary Cluster for the ClusterSet");
+    }
+  }
+  if (result_cluster_info->size() != 4) {
+    throw std::out_of_range(
+        "Invalid number of values returned from query for cluster info: "
+        "expected 4 got " +
+        std::to_string(result_cluster_info->size()));
+  }
+  result.cluster_id = get_string((*result_cluster_info)[0]);
+  result.cluster_type_specific_id = get_string((*result_cluster_info)[1]);
+  result.name = get_string((*result_cluster_info)[2]);
+  result.is_primary = get_string((*result_cluster_info)[3]) == "PRIMARY";
+
+  // get all the nodes of all the Clusters that belong to the ClusterSet
+  sqlstring query2 =
+      "select i.address from mysql_innodb_cluster_metadata.v2_instances i "
+      "where i.cluster_id in (select cluster_id from "
+      "mysql_innodb_cluster_metadata.v2_cs_members where clusterset_id = "
+      "(select clusterset_id from mysql_innodb_cluster_metadata.v2_cs_members "
+      "where cluster_id = ?))";
+
+  query2 << result.cluster_id;
+
+  try {
+    mysql_->query(
+        query2, [&result](const std::vector<const char *> &row) -> bool {
+          result.metadata_servers.push_back("mysql://" + get_string(row[0]));
+          return true;
+        });
+  } catch (const MySQLSession::Error &e) {
+    throw std::runtime_error(std::string("Error querying metadata: ") +
+                             e.what());
+  }
+
+  return result;
+}
+
+std::vector<std::tuple<std::string, unsigned long>>
+ClusterMetadataGRInClusterSet::fetch_cluster_hosts() {
+  std::vector<std::tuple<std::string, unsigned long>> result;
+
+  const auto clusterset_servers = fetch_metadata_servers();
+  for (const auto &server : clusterset_servers.metadata_servers) {
+    mysqlrouter::URI uri(server);
+    result.push_back(std::make_tuple(uri.host, uri.port));
+  }
+
+  return result;
+}
+
+std::string ClusterMetadataGRInClusterSet::get_cluster_type_specific_id() {
+  const std::string q =
+      "select CSM.clusterset_id from "
+      "mysql_innodb_cluster_metadata.v2_cs_members CSM "
+      "join mysql_innodb_cluster_metadata.v2_gr_clusters C on CSM.cluster_id = "
+      "C.cluster_id where C.cluster_id = (select cluster_id from "
+      "mysql_innodb_cluster_metadata.v2_this_instance)";
+
+  std::unique_ptr<MySQLSession::ResultRow> result(mysql_->query_one(q));
+  if (result) {
+    if (result->size() != 1) {
+      throw std::out_of_range(
+          "Invalid number of values returned from clusterset_id query expected "
+          "1 got " +
+          std::to_string(result->size()));
+    }
+    return std::string((*result)[0]);
+  }
+
+  throw std::logic_error("No result returned for metadata query");
+}
+
+uint64_t ClusterMetadataGRInClusterSet::get_view_id(
+    const std::string &clusterset_id) {
+  std::string q =
+      "select view_id from mysql_innodb_cluster_metadata.v2_cs_clustersets "
+      "where clusterset_id = " +
+      mysql_->quote(clusterset_id);
+
+  std::unique_ptr<MySQLSession::ResultRow> result(mysql_->query_one(q));
+  if (result) {
+    if (result->size() != 1) {
+      throw std::out_of_range(
+          "Invalid number of values returned from view_id query expected 1 "
+          "got " +
+          std::to_string(result->size()));
+    }
+    return strtoull_checked((*result)[0]);
+  }
+
+  throw std::logic_error("No result returned for metadata query");
+}
+
 static std::vector<std::string> do_get_routing_mode_queries(
     MySQLSession *mysql, const bool metadata_v2,
     const std::string &cluster_name) {
@@ -773,7 +980,7 @@
           "expected 1 got " +
           std::to_string(result->size()));
     }
-    return strtoi_checked((*result)[0]);
+    return strtoui_checked((*result)[0]);
   }
   throw std::logic_error("No result returned for metadata query");
 }
@@ -790,9 +997,8 @@
   if (result) {
     if (result->size() != 1) {
       throw std::out_of_range(
-          "Invalid number of values returned from "
-          "@@group_replication_group_name "
-          "expected 1 got " +
+          "Invalid number of values returned from cluster_id query expected 1 "
+          "got " +
           std::to_string(result->size()));
     }
     return std::string((*result)[0]);
@@ -865,18 +1071,94 @@
       "No result returned for v2_this_instance metadata query");
 }
 
+static bool is_part_of_cluster_set(MySQLSession *mysql) {
+  std::string q =
+      "select count(clusterset_id) from "
+      "mysql_innodb_cluster_metadata.v2_this_instance i join "
+      "mysql_innodb_cluster_metadata.v2_cs_members "
+      "csm on i.cluster_id = csm.cluster_id where clusterset_id is not null";
+
+  std::unique_ptr<MySQLSession::ResultRow> result(mysql->query_one(q));
+  if (result) {
+    if (result->size() != 1) {
+      throw std::out_of_range(
+          "Invalid number of values returned from "
+          "is_part_of_cluster_set query expected 1 got " +
+          std::to_string(result->size()));
+    }
+
+    return strtoui_checked((*result)[0]) > 0;
+  }
+
+  throw std::runtime_error(
+      "No result returned for is_part_of_cluster_set metadata query");
+}
+
+static bool was_bootstrapped_as_clusterset(MySQLSession *mysql,
+                                           const unsigned router_id) {
+  // check if we have a target cluster assigned in the metadata
+  const std::string query =
+      "SELECT JSON_UNQUOTE(JSON_EXTRACT(r.attributes, "
+      "'$.bootstrapTargetType')) FROM mysql_innodb_cluster_metadata.v2_routers "
+      "r where r.router_id = " +
+      std::to_string(router_id);
+
+  std::unique_ptr<MySQLSession::ResultRow> row(mysql->query_one(query));
+  if (!row) {
+    return false;
+  }
+
+  return get_string((*row)[0]) == kClusterSet;
+}
+
 ClusterType get_cluster_type(const MetadataSchemaVersion &schema_version,
-                             MySQLSession *mysql) {
+                             MySQLSession *mysql,
+                             unsigned int router_id /*= 0*/) {
   if (schema_version < kNewMetadataVersion) {
     return ClusterType::GR_V1;
   } else {
-    return get_cluster_type(mysql);
+    const auto type = get_cluster_type(mysql);
+
+    if (schema_version >= kClusterSetsMetadataVersion &&
+        type == ClusterType::GR_V2) {
+      bool is_part_of_cs = is_part_of_cluster_set(mysql);
+      if (is_part_of_cs) {
+        // The type of the cluster that we discovered in the metadata is
+        // ClusterSet. Check if the Router was actually bootstrapped for a
+        // ClusterSet. If not treat it as a standalone cluster and log a
+        // warning.
+        const bool was_bs_for_cs =
+            (router_id == 0) ||
+            was_bootstrapped_as_clusterset(mysql, router_id);
+
+        const bool was_bs_for_cs_changed =
+            EventStateTracker::instance().state_changed(
+                was_bs_for_cs, EventStateTracker::EventId::
+                                   ClusterWasBootstrappedAgainstClusterset);
+
+        if (!was_bs_for_cs) {
+          const auto log_level =
+              was_bs_for_cs_changed ? LogLevel::kWarning : LogLevel::kDebug;
+          log_custom(
+              log_level,
+              "The target Cluster is part of a ClusterSet, but this Router was "
+              "not bootstrapped to use the ClusterSet. Treating the Cluster as "
+              "a standalone Cluster. Please bootstrap the Router again if you "
+              "want to use ClusterSet capabilities.");
+          is_part_of_cs = false;
+        }
+      }
+
+      return is_part_of_cs ? ClusterType::GR_CS : ClusterType::GR_V2;
+    }
+
+    return type;
   }
 }
 
 std::unique_ptr<ClusterMetadata> create_metadata(
     const MetadataSchemaVersion &schema_version, MySQLSession *mysql,
-    mysql_harness::SocketOperationsBase *sockops) {
+    const OptionsMap &options, mysql_harness::SocketOperationsBase *sockops) {
   if (!metadata_schema_version_is_compatible(kRequiredBootstrapSchemaVersion,
                                              schema_version) &&
       !metadata_schema_version_is_compatible(
@@ -896,14 +1178,19 @@
     case ClusterType::GR_V2:
       result.reset(new ClusterMetadataGRV2(schema_version, mysql, sockops));
       break;
-    default:
+    case ClusterType::RS_V2:
       result.reset(new ClusterMetadataAR(schema_version, mysql, sockops));
+      break;
+    case ClusterType::GR_CS:
+      result.reset(new ClusterMetadataGRInClusterSet(schema_version, mysql,
+                                                     options, sockops));
   }
 
   return result;
 }
 
-unsigned ClusterMetadataAR::get_view_id() {
+uint64_t ClusterMetadataAR::get_view_id(
+    const std::string & /*cluster_type_specific_id*/) {
   std::string query =
       "select view_id from mysql_innodb_cluster_metadata.v2_ar_members where "
       "CAST(member_id AS char ascii) = CAST(@@server_uuid AS char ascii)";
@@ -922,10 +1209,11 @@
 }
 
 std::string to_string(const ClusterType cluster_type) {
-  if (cluster_type == ClusterType::RS_V2) {
-    return "rs";
-  } else {
-    return "gr";
+  switch (cluster_type) {
+    case ClusterType::RS_V2:
+      return "rs";
+    default:
+      return "gr";
   }
 }
 
diff -Nru mysql-8.0-8.0.26/router/src/router/src/cluster_metadata_dynamic_state.cc mysql-8.0-8.0.27/router/src/router/src/cluster_metadata_dynamic_state.cc
--- mysql-8.0-8.0.26/router/src/router/src/cluster_metadata_dynamic_state.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/router/src/cluster_metadata_dynamic_state.cc	2021-09-28 11:46:34.000000000 +0000
@@ -26,8 +26,6 @@
 #include "mysql/harness/dynamic_state.h"
 
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 
@@ -66,12 +64,20 @@
 void ClusterMetadataDynamicState::save_section() {
   JsonValue section(rapidjson::kObjectType);
 
-  // write cluster name
+  // write cluster id
   JsonAllocator allocator;
   JsonValue val;
-  val.SetString(cluster_type_specific_id_.c_str(),
-                cluster_type_specific_id_.length());
-  section.AddMember("group-replication-id", val, allocator);
+
+  if (!cluster_type_specific_id_.empty()) {
+    val.SetString(cluster_type_specific_id_.c_str(),
+                  cluster_type_specific_id_.length());
+    section.AddMember("group-replication-id", val, allocator);
+  }
+
+  if (!clusterset_id_.empty()) {
+    val.SetString(clusterset_id_.c_str(), clusterset_id_.length());
+    section.AddMember("clusterset-id", val, allocator);
+  }
 
   // write metadata servers
   JsonValue metadata_servers(rapidjson::kArrayType);
@@ -81,9 +87,9 @@
   }
   section.AddMember("cluster-metadata-servers", metadata_servers, allocator);
 
-  // if this is ReplicaSet cluster write view_id
-  if (cluster_type_ == ClusterType::RS_V2) {
-    val.SetUint(view_id_);
+  // if this is ReplicaSet cluster or ClusterSet write view_id
+  if (view_id_ > 0) {
+    val.SetUint64(view_id_);
     section.AddMember("view-id", val, allocator);
   }
 
@@ -93,7 +99,7 @@
 bool ClusterMetadataDynamicState::save(std::ostream &state_stream) {
   save_section();
 
-  if (pimpl_->base_state_->save_to_stream(state_stream)) {
+  if (pimpl_->base_state_->save_to_stream(state_stream, is_clusterset())) {
     changed_ = false;
     return true;
   }
@@ -104,7 +110,7 @@
 bool ClusterMetadataDynamicState::save() {
   save_section();
 
-  if (pimpl_->base_state_->save()) {
+  if (pimpl_->base_state_->save(is_clusterset())) {
     changed_ = false;
     return true;
   }
@@ -137,11 +143,17 @@
     cluster_type_specific_id_ = cluster_type_specific_id.GetString();
   }
 
+  if (pimpl_->section_->HasMember("clusterset-id")) {
+    const auto &clusterset_id = section["clusterset-id"];
+    assert(clusterset_id.IsString());
+    clusterset_id_ = clusterset_id.GetString();
+  }
+
   view_id_ = 0;
   if (pimpl_->section_->HasMember("view-id")) {
     const auto &view_id = section["view-id"];
-    assert(view_id.IsUint());
-    view_id_ = view_id.GetUint();
+    assert(view_id.IsUint64());
+    view_id_ = view_id.GetUint64();
   }
 
   changed_ = false;
@@ -164,6 +176,14 @@
   return cluster_type_specific_id_;
 }
 
+std::string ClusterMetadataDynamicState::get_clusterset_id() const {
+  return clusterset_id_;
+}
+
+bool ClusterMetadataDynamicState::is_clusterset() const {
+  return !clusterset_id_.empty();
+}
+
 void ClusterMetadataDynamicState::set_cluster_type_specific_id(
     const std::string &cluster_type_specific_id) {
   if (cluster_type_specific_id_ != cluster_type_specific_id) {
@@ -172,7 +192,7 @@
   }
 }
 
-void ClusterMetadataDynamicState::set_view_id(const unsigned view_id) {
+void ClusterMetadataDynamicState::set_view_id(const uint64_t view_id) {
   if (view_id_ != view_id) {
     view_id_ = view_id;
     changed_ = true;
@@ -180,3 +200,11 @@
 }
 
 unsigned ClusterMetadataDynamicState::get_view_id() const { return view_id_; }
+
+void ClusterMetadataDynamicState::set_clusterset_id(
+    const std::string &clusterset_id) {
+  if (clusterset_id_ != clusterset_id) {
+    clusterset_id_ = clusterset_id;
+    changed_ = true;
+  }
+}
diff -Nru mysql-8.0-8.0.26/router/src/router/src/cluster_metadata.h mysql-8.0-8.0.27/router/src/router/src/cluster_metadata.h
--- mysql-8.0-8.0.26/router/src/router/src/cluster_metadata.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/router/src/cluster_metadata.h	2021-09-28 11:46:34.000000000 +0000
@@ -36,11 +36,23 @@
 
 struct ClusterInfo {
   std::vector<std::string> metadata_servers;
-  std::string metadata_cluster_id;
-  std::string metadata_cluster_name;
-  std::string metadata_replicaset;
+  std::string cluster_id;
+  // GR name for GR cluster
+  std::string cluster_type_specific_id;
+  // name of the cluster (or clusterset in case of the clusterset)
+  std::string name;
+  // whether this cluster is a primary cluster in case it is a member of a
+  // ClusterSet
+  bool is_primary{false};
+
+  std::string get_cluster_type_specific_id() const {
+    return cluster_type_specific_id.empty() ? cluster_id
+                                            : cluster_type_specific_id;
+  }
 };
 
+using OptionsMap = std::map<std::string, std::string>;
+
 class ClusterMetadata {
  public:
   ClusterMetadata(const MetadataSchemaVersion &schema_version,
@@ -88,13 +100,11 @@
       const std::string &router_name, const bool overwrite,
       const std::string &hostname_override = "") = 0;
 
-  virtual void update_router_info(const uint32_t router_id,
-                                  const std::string &cluster_id,
-                                  const std::string &rw_endpoint,
-                                  const std::string &ro_endpoint,
-                                  const std::string &rw_x_endpoint,
-                                  const std::string &ro_x_endpoint,
-                                  const std::string &username) = 0;
+  virtual void update_router_info(
+      const uint32_t router_id, const std::string &cluster_id,
+      const std::string &target_cluster, const std::string &rw_endpoint,
+      const std::string &ro_endpoint, const std::string &rw_x_endpoint,
+      const std::string &ro_x_endpoint, const std::string &username) = 0;
 
   virtual std::vector<std::string> get_routing_mode_queries(
       const std::string &cluster_name) = 0;
@@ -137,6 +147,11 @@
 
   MySQLSession &get_session() { return *mysql_; }
 
+  virtual uint64_t get_view_id(
+      const std::string & /*cluster_type_specific_id*/) {
+    return 0;
+  }
+
  protected:
   // throws MySQLSession::Error, std::out_of_range, std::logic_error
   virtual uint64_t query_cluster_count() = 0;
@@ -188,13 +203,11 @@
       const uint32_t router_id,
       const std::string &hostname_override = "") override;
 
-  void update_router_info(const uint32_t router_id,
-                          const std::string &cluster_id,
-                          const std::string &rw_endpoint,
-                          const std::string &ro_endpoint,
-                          const std::string &rw_x_endpoint,
-                          const std::string &ro_x_endpoint,
-                          const std::string &username) override;
+  void update_router_info(
+      const uint32_t router_id, const std::string &cluster_id,
+      const std::string &target_cluster, const std::string &rw_endpoint,
+      const std::string &ro_endpoint, const std::string &rw_x_endpoint,
+      const std::string &ro_x_endpoint, const std::string &username) override;
 
   uint32_t register_router(const std::string &router_name, const bool overwrite,
                            const std::string &hostname_override = "") override;
@@ -228,13 +241,11 @@
   void verify_router_id_is_ours(
       uint32_t router_id, const std::string &hostname_override = "") override;
 
-  void update_router_info(const uint32_t router_id,
-                          const std::string &cluster_id,
-                          const std::string &rw_endpoint,
-                          const std::string &ro_endpoint,
-                          const std::string &rw_x_endpoint,
-                          const std::string &ro_x_endpoint,
-                          const std::string &username) override;
+  void update_router_info(
+      const uint32_t router_id, const std::string &cluster_id,
+      const std::string &target_cluster, const std::string &rw_endpoint,
+      const std::string &ro_endpoint, const std::string &rw_x_endpoint,
+      const std::string &ro_x_endpoint, const std::string &username) override;
 
   uint32_t register_router(const std::string &router_name, const bool overwrite,
                            const std::string &hostname_override = "") override;
@@ -246,6 +257,51 @@
   uint64_t query_cluster_count() override;
 };
 
+class ClusterMetadataGRInClusterSet : public ClusterMetadataGRV2 {
+ public:
+  ClusterMetadataGRInClusterSet(
+      const MetadataSchemaVersion &schema_version, MySQLSession *mysql,
+      const OptionsMap & /*options*/,
+      mysql_harness::SocketOperationsBase *sockops =
+          mysql_harness::SocketOperations::instance());
+
+  ~ClusterMetadataGRInClusterSet() override = default;
+
+  mysqlrouter::ClusterType get_type() override {
+    return mysqlrouter::ClusterType::GR_CS;
+  }
+
+  // nothing specific to check for ClusterSet
+  void require_metadata_is_ok() override {}
+
+  ClusterInfo fetch_metadata_servers() override;
+
+  std::vector<std::tuple<std::string, unsigned long>> fetch_cluster_hosts()
+      override;
+
+  enum class TargetClusterType {
+    // target should be the cluster on which we bootstrap
+    targetClusterCurrent,
+    // target should be the Priamry Cluster
+    targetClusterPrimary,
+    // target should be the Cluster with the given name
+    targetClusterByName
+  };
+
+  std::string get_cluster_type_specific_id() override;
+  uint64_t get_view_id(const std::string &cluster_type_specific_id) override;
+
+  void update_router_info(
+      const uint32_t router_id, const std::string &cluster_id,
+      const std::string &target_cluster, const std::string &rw_endpoint,
+      const std::string &ro_endpoint, const std::string &rw_x_endpoint,
+      const std::string &ro_x_endpoint, const std::string &username) override;
+
+ protected:
+  TargetClusterType target_cluster_type_;
+  std::string target_cluster_name_;
+};
+
 class ClusterMetadataAR : public ClusterMetadata {
  public:
   ClusterMetadataAR(const MetadataSchemaVersion &schema_version,
@@ -268,7 +324,8 @@
 
   std::string get_cluster_type_specific_id() override;
 
-  unsigned int get_view_id();
+  uint64_t get_view_id(
+      const std::string & /*cluster_type_specific_id*/) override;
 
   std::vector<std::string> get_routing_mode_queries(
       const std::string &cluster_name) override;
@@ -276,13 +333,11 @@
   void verify_router_id_is_ours(
       uint32_t router_id, const std::string &hostname_override = "") override;
 
-  void update_router_info(const uint32_t router_id,
-                          const std::string &cluster_id,
-                          const std::string &rw_endpoint,
-                          const std::string &ro_endpoint,
-                          const std::string &rw_x_endpoint,
-                          const std::string &ro_x_endpoint,
-                          const std::string &username) override;
+  void update_router_info(
+      const uint32_t router_id, const std::string &cluster_id,
+      const std::string &target_cluster, const std::string &rw_endpoint,
+      const std::string &ro_endpoint, const std::string &rw_x_endpoint,
+      const std::string &ro_x_endpoint, const std::string &username) override;
 
   uint32_t register_router(const std::string &router_name, const bool overwrite,
                            const std::string &hostname_override = "") override;
@@ -301,6 +356,7 @@
 
 std::unique_ptr<ClusterMetadata> create_metadata(
     const MetadataSchemaVersion &schema_version, MySQLSession *mysql,
+    const OptionsMap &options = {},
     mysql_harness::SocketOperationsBase *sockops =
         mysql_harness::SocketOperations::instance());
 
diff -Nru mysql-8.0-8.0.26/router/src/router/src/CMakeLists.txt mysql-8.0-8.0.27/router/src/router/src/CMakeLists.txt
--- mysql-8.0-8.0.26/router/src/router/src/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/router/src/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -60,12 +60,12 @@
     ../../harness/src/logging/eventlog_rc/MSG00001.bin)
 ENDIF()
 
-IF(NOT WIN32)
-  ADD_LIBRARY(router_lib SHARED ${lib_source_files} ${common_files})
-ELSE()
+IF(WIN32)
   # on Windows, we statically link the router lib to otherwise avoid
   # exporting a bunch of symbols
   ADD_LIBRARY(router_lib STATIC ${lib_source_files})
+ELSE()
+  ADD_LIBRARY(router_lib SHARED ${lib_source_files} ${common_files})
 ENDIF()
 TARGET_LINK_LIBRARIES(router_lib
   ${CMAKE_DL_LIBS}
@@ -82,14 +82,14 @@
   RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/runtime_output_directory
 )
 
-IF(NOT WIN32)
+IF(WIN32)
   SET_TARGET_PROPERTIES(router_lib PROPERTIES
-    OUTPUT_NAME "mysqlrouter"
+    OUTPUT_NAME "mysqlrouter_lib"
     SOVERSION 1
   )
 ELSE()
   SET_TARGET_PROPERTIES(router_lib PROPERTIES
-    OUTPUT_NAME "mysqlrouter_lib"
+    OUTPUT_NAME "mysqlrouter"
     SOVERSION 1
   )
 ENDIF()
diff -Nru mysql-8.0-8.0.26/router/src/router/src/common/mysql_session.cc mysql-8.0-8.0.27/router/src/router/src/common/mysql_session.cc
--- mysql-8.0-8.0.26/router/src/router/src/common/mysql_session.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/router/src/common/mysql_session.cc	2021-09-28 11:46:34.000000000 +0000
@@ -304,12 +304,7 @@
     return stdx::make_unexpected(make_mysql_error_code(connection_));
   }
 
-#if defined(__SUNPRO_CC)
-  // ensure sun-cc doesn't try to the copy-constructor on a move-only type
-  return std::move(res);
-#else
   return res;
-#endif
 }
 
 stdx::expected<MySQLSession::mysql_result_type, MysqlError>
@@ -461,7 +456,7 @@
   return mysql_warning_count(connection_);
 }
 
-std::string MySQLSession::quote(const std::string &s, char qchar) noexcept {
+std::string MySQLSession::quote(const std::string &s, char qchar) const {
   std::string r;
   r.resize(s.length() * 2 + 3);
   r[0] = qchar;
diff -Nru mysql-8.0-8.0.26/router/src/router/src/config_generator.cc mysql-8.0-8.0.27/router/src/router/src/config_generator.cc
--- mysql-8.0-8.0.26/router/src/router/src/config_generator.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/router/src/config_generator.cc	2021-09-28 11:46:34.000000000 +0000
@@ -99,6 +99,10 @@
     std::chrono::milliseconds(500);
 static const std::chrono::milliseconds kDefaultMetadataTTLGRNotificationsON =
     std::chrono::milliseconds(60 * 1000);
+static const std::chrono::milliseconds kDefaultMetadataTTLClusterSet =
+    std::chrono::milliseconds(
+        5 * 1000);  // default TTL for ClusterSet is 5 seconds regardless if GR
+                    // Notifications are used or not
 static const std::chrono::milliseconds kDefaultAuthCacheTTL =
     std::chrono::seconds(-1);
 static const std::chrono::milliseconds kDefaultAuthCacheRefreshInterval =
@@ -112,6 +116,7 @@
 static constexpr unsigned kMaxPasswordRetries = 10000;
 
 using mysql_harness::DIM;
+using mysql_harness::get_from_map;
 using mysql_harness::get_strerror;
 using mysql_harness::Path;
 using mysql_harness::truncate_string;
@@ -360,9 +365,6 @@
           "non-'localhost' hostname: " +
           u.host);
     }
-  } else {
-    // setup localhost address.
-    u.host = (u.host == "localhost" ? "127.0.0.1" : u.host);
   }
 
   return u;
@@ -421,25 +423,26 @@
 
   // throws std::runtime_error, std::logic_error,
   connect_to_metadata_server(u, bootstrap_socket, bootstrap_options);
-  auto schema_version = mysqlrouter::get_metadata_schema_version(mysql_.get());
+  schema_version_ = mysqlrouter::get_metadata_schema_version(mysql_.get());
 
-  if (schema_version == mysqlrouter::kUpgradeInProgressMetadataVersion) {
+  if (schema_version_ == mysqlrouter::kUpgradeInProgressMetadataVersion) {
     throw std::runtime_error(
         "Currently the cluster metadata update is in progress. Please rerun "
         "the bootstrap when it is finished.");
   }
 
   if (!metadata_schema_version_is_compatible(kRequiredBootstrapSchemaVersion,
-                                             schema_version)) {
+                                             schema_version_)) {
     throw std::runtime_error(mysqlrouter::string_format(
         "This version of MySQL Router is not compatible with the provided "
         "MySQL InnoDB cluster metadata. Expected metadata version %s, "
         "got %s",
         to_string(kRequiredBootstrapSchemaVersion).c_str(),
-        to_string(schema_version).c_str()));
+        to_string(schema_version_).c_str()));
   }
 
-  metadata_ = mysqlrouter::create_metadata(schema_version, mysql_.get());
+  metadata_ = mysqlrouter::create_metadata(schema_version_, mysql_.get(),
+                                           bootstrap_options);
 
   // at this point we know the cluster type so let's do additional verifications
   if (mysqlrouter::ClusterType::RS_V2 == metadata_->get_type()) {
@@ -451,6 +454,22 @@
     }
   }
 
+  if (mysqlrouter::ClusterType::GR_CS != metadata_->get_type()) {
+    if (bootstrap_options.find("target-cluster") != bootstrap_options.end()) {
+      throw std::runtime_error(
+          "The parameter 'target-cluster' is valid only for Cluster that is "
+          "part of the ClusterSet.");
+    }
+
+    if (bootstrap_options.find("target-cluster-by-name") !=
+        bootstrap_options.end()) {
+      throw std::runtime_error(
+          "The parameter 'target-cluster-by-name' is valid only for Cluster "
+          "that is "
+          "part of the ClusterSet.");
+    }
+  }
+
   // check if the current server is meta-data server
   metadata_->require_metadata_is_ok();  // throws MySQLSession::Error,
                                         // std::runtime_error,
@@ -473,13 +492,7 @@
         std::error_code{errno, std::generic_category()});
   }
 
-#ifdef __SUNPRO_CC
-  // make sure sun-cc uses the move-constructor (and not the non-existant
-  // copy-constructor)
-  return {std::move(of)};
-#else
   return of;
-#endif
 }
 
 void ConfigGenerator::bootstrap_system_deployment(
@@ -931,8 +944,23 @@
   options.ssl_options.crl = get_opt(user_options, "ssl_crl", "");
   options.ssl_options.crlpath = get_opt(user_options, "ssl_crlpath", "");
 
-  options.use_gr_notifications =
-      user_options.find("use-gr-notifications") != user_options.end();
+  if (user_options.find("use-gr-notifications") != user_options.end())
+    options.use_gr_notifications =
+        user_options.at("use-gr-notifications") == "1";
+  else {
+    // default for ClusterSet is use to GR Notifications, for single cluster it
+    // is not use them
+    options.use_gr_notifications =
+        mysqlrouter::ClusterType::GR_CS == metadata_->get_type();
+  }
+
+  if (mysqlrouter::ClusterType::GR_CS == metadata_->get_type()) {
+    options.ttl = kDefaultMetadataTTLClusterSet;
+  } else {
+    options.ttl = options.use_gr_notifications
+                      ? kDefaultMetadataTTLGRNotificationsON
+                      : kDefaultMetadataTTL;
+  }
 
   if (user_options.find("disable-rest") != user_options.end())
     options.disable_rest = true;
@@ -979,6 +1007,12 @@
   options.server_ssl_verify =
       get_opt(user_options, "server_ssl_verify", "DISABLED");
 
+  options.target_cluster = get_opt(user_options, "target-cluster", "default");
+
+  options.target_cluster = get_opt(user_options, "target-cluster", "");
+  options.target_cluster_by_name =
+      get_opt(user_options, "target-cluster-by-name", "");
+
   return options;
 }
 
@@ -1143,7 +1177,7 @@
       } catch (const MySQLSession::Error &e) {
         MySQLErrorc ec = static_cast<MySQLErrorc>(e.code());
 
-        log_info(
+        log_debug(
             "Executing statements failed with: '%s' (%d), trying to connect to "
             "another node",
             e.what(), e.code());
@@ -1190,7 +1224,7 @@
       }
 
       if (metadata_.get_session().is_connected()) {
-        log_info("%s", "disconnecting from mysql-server");
+        log_debug("%s", "disconnecting from mysql-server");
         metadata_.get_session().disconnect();
       }
 
@@ -1313,14 +1347,6 @@
   }
 }
 
-// get a value from the map if it exists, default-value otherwise
-static std::string map_get(
-    const std::map<std::string, std::string> &user_options,
-    const std::string &key, const std::string &def_value) {
-  const auto &it = user_options.find(key);
-  return (it != user_options.end()) ? it->second : def_value;
-}
-
 std::string ConfigGenerator::bootstrap_deployment(
     std::ostream &config_file, std::ostream &state_file,
     const mysql_harness::Path &config_file_path,
@@ -1336,11 +1362,11 @@
   auto cluster_info = metadata_->fetch_metadata_servers();
 
   auto conf_options = get_options_from_config_if_it_exists(
-      config_file_path.str(), cluster_info.metadata_cluster_name, force);
+      config_file_path.str(), cluster_info.name, force);
 
   // if user provided --account, override username with it
   conf_options.username =
-      map_get(user_options, "account", conf_options.username);
+      get_from_map(user_options, "account"s, conf_options.username);
 
   // If username is still empty at this point, it will be autogenerated
   // inside try_bootstrap_deployment().  It cannot be done here, because the
@@ -1383,8 +1409,8 @@
         cluster_aware.failover_on_failure<std::tuple<std::string>>([&]() {
           return try_bootstrap_deployment(
               conf_options.router_id, conf_options.username, password,
-              router_name, cluster_info.metadata_cluster_id, user_options,
-              multivalue_options, options);
+              router_name, cluster_info, user_options, multivalue_options,
+              options);
         });
   }
 
@@ -1405,8 +1431,8 @@
   // test out the connection that Router would use
   {
     bool strict = user_options.count("strict");
-    verify_router_account(conf_options.username, password,
-                          cluster_info.metadata_cluster_name, strict);
+    verify_router_account(conf_options.username, password, cluster_info.name,
+                          strict);
   }
 
   store_credentials_in_keyring(auto_clean, user_options, conf_options.router_id,
@@ -1417,7 +1443,7 @@
   {
     out_stream_ << "- Creating configuration " << config_file_path.str()
                 << std::endl;
-    auto system_username = map_get(user_options, "user", "");
+    auto system_username = get_from_map(user_options, "user"s, ""s);
     create_config(config_file, state_file, conf_options.router_id, router_name,
                   system_username, cluster_info, conf_options.username, options,
                   default_paths, state_file_path.str());
@@ -1425,12 +1451,22 @@
 
   // return bootstrap report (several lines of human-readable text) if desired
   if (!quiet) {
-    const std::string cluster_type_name =
-        metadata_->get_type() == ClusterType::RS_V2 ? "InnoDB ReplicaSet"
-                                                    : "InnoDB Cluster";
+    const std::string cluster_type_name = [&]() -> auto {
+      switch (metadata_->get_type()) {
+        case ClusterType::RS_V2:
+          return "InnoDB ReplicaSet";
+        case ClusterType::GR_CS:
+          return "ClusterSet";
+        default:
+          return "InnoDB Cluster";
+      }
+    }
+    ();
+
     return get_bootstrap_report_text(
-        config_file_path.str(), router_name, cluster_info.metadata_cluster_name,
-        cluster_type_name, map_get(user_options, "report-host", "localhost"),
+        config_file_path.str(), router_name, cluster_info.name,
+        cluster_type_name,
+        get_from_map(user_options, "report-host"s, "localhost"s),
         !directory_deployment, options);
   } else {
     return "";
@@ -1601,9 +1637,45 @@
   }
 }
 
+static std::string get_target_cluster_value(
+    const std::string &target_cluster_option,
+    const std::string &target_cluster_by_name_option,
+    const ClusterInfo &cluster_info) {
+  if (!target_cluster_by_name_option.empty()) {
+    return cluster_info.get_cluster_type_specific_id();
+  }
+
+  std::string option_lowercase{target_cluster_option};
+  std::transform(option_lowercase.begin(), option_lowercase.end(),
+                 option_lowercase.begin(), ::tolower);
+
+  if (option_lowercase == "primary") return "primary";
+
+  if (option_lowercase == "current") {
+    if (cluster_info.is_primary) {
+      // user wants current on the Primary cluster, let's issue an warning
+      log_warning(
+          "WARNING: Option --conf-target-cluster=current was used to bootstrap "
+          "against the Primary Cluster. Note that the Router will not follow "
+          "the new Primary Cluster in case of the Primary Cluster change in "
+          "the ClusterSet");
+    }
+
+    return cluster_info.get_cluster_type_specific_id();
+  }
+
+  if (option_lowercase.empty()) {
+    // neither --conf-target-cluster nor --conf-target-cluster-by-name was used
+    return "";
+  }
+
+  harness_assert(option_lowercase == "primary");
+  return "primary";
+}
+
 std::tuple<std::string> ConfigGenerator::try_bootstrap_deployment(
     uint32_t &router_id, std::string &username, std::string &password,
-    const std::string &router_name, const std::string &cluster_id,
+    const std::string &router_name, const ClusterInfo &cluster_info,
     const std::map<std::string, std::string> &user_options,
     const std::map<std::string, std::vector<std::string>> &multivalue_options,
     const Options &options) {
@@ -1653,8 +1725,20 @@
   const std::string ro_endpoint = str(options.ro_endpoint);
   const std::string rw_x_endpoint = str(options.rw_x_endpoint);
   const std::string ro_x_endpoint = str(options.ro_x_endpoint);
-  metadata_->update_router_info(router_id, cluster_id, rw_endpoint, ro_endpoint,
-                                rw_x_endpoint, ro_x_endpoint, username);
+  const std::string target_cluster =
+      mysqlrouter::ClusterType::GR_CS == metadata_->get_type()
+          ? get_target_cluster_value(options.target_cluster,
+                                     options.target_cluster_by_name,
+                                     cluster_info)
+          : "";
+  const std::string cluster_id =
+      mysqlrouter::ClusterType::GR_CS == metadata_->get_type()
+          ? cluster_specific_id_
+          : cluster_info.cluster_id;
+
+  metadata_->update_router_info(router_id, cluster_id, target_cluster,
+                                rw_endpoint, ro_endpoint, rw_x_endpoint,
+                                ro_x_endpoint, username);
 
   transaction.commit();
 
@@ -1923,23 +2007,58 @@
   // put metadata-caches secion in it
   ClusterMetadataDynamicState mdc_dynamic_state(&dynamic_state,
                                                 cluster_metadata.get_type());
-  mdc_dynamic_state.set_cluster_type_specific_id(cluster_type_specific_id);
-  mdc_dynamic_state.set_metadata_servers(metadata_server_addresses);
-  if (cluster_metadata.get_type() == ClusterType::RS_V2) {
-    auto view_id =
-        dynamic_cast<mysqlrouter::ClusterMetadataAR &>(cluster_metadata)
-            .get_view_id();
-    mdc_dynamic_state.set_view_id(view_id);
+
+  if (cluster_metadata.get_type() == mysqlrouter::ClusterType::GR_CS) {
+    mdc_dynamic_state.set_clusterset_id(cluster_type_specific_id);
+  } else {
+    mdc_dynamic_state.set_cluster_type_specific_id(cluster_type_specific_id);
   }
+  mdc_dynamic_state.set_metadata_servers(metadata_server_addresses);
+  const auto view_id = cluster_metadata.get_view_id(cluster_type_specific_id);
+  mdc_dynamic_state.set_view_id(view_id);
   // save to out stream
   mdc_dynamic_state.save(state_stream);
 }
 
+/**
+ * Add proper authentication backend section to the config based on the
+ * metadata version. If needed it creates an empty authentication password
+ * file used in the config.
+ *
+ * @param[in] datadir - path of a router data directory
+ * @param[in] auth_backend_name - authentication backend section name
+ * @param[in] schema_version - metadata schema version
+ *
+ * @return http_auth_backend config section string
+ */
+static std::string create_http_auth_backend_section(
+    const mysql_harness::Path &datadir,
+    const std::string_view auth_backend_name,
+    const mysqlrouter::MetadataSchemaVersion schema_version) {
+  if (metadata_schema_version_is_compatible(kNewMetadataVersion,
+                                            schema_version)) {
+    return mysql_harness::ConfigBuilder::build_section(
+        std::string{"http_auth_backend:"}.append(auth_backend_name),
+        {{"backend", "metadata_cache"}});
+  } else {
+    const auto auth_backend_passwd_file =
+        datadir.join("auth_backend_passwd_file").str();
+    const auto open_res = open_ofstream(auth_backend_passwd_file);
+    if (!open_res) {
+      log_warning("Cannot create file '%s': %s",
+                  auth_backend_passwd_file.c_str(),
+                  open_res.error().message().c_str());
+    }
+
+    return mysql_harness::ConfigBuilder::build_section(
+        std::string{"http_auth_backend:"}.append(auth_backend_name),
+        {{"backend", "file"}, {"filename", auth_backend_passwd_file}});
+  }
+}
+
 /*static*/ std::string ConfigGenerator::gen_metadata_cache_routing_section(
     bool is_classic, bool is_writable, const Options::Endpoint endpoint,
-    const Options &options, const std::string &metadata_key,
-    const std::string &metadata_replicaset,
-    const std::string &fast_router_key) {
+    const Options &options, const std::string &metadata_key) {
   if (!endpoint) return "";
 
   const std::string key_suffix =
@@ -1948,9 +2067,11 @@
   const std::string strategy =
       is_writable ? "first-available" : "round-robin-with-fallback";
   const std::string protocol = is_classic ? "classic" : "x";
+  // kept for backward compatibility, always empty
+  const std::string metadata_replicaset{""};
 
   // clang-format off
-  return "[routing:" + fast_router_key + key_suffix + "]\n" +
+  return "[routing:" + metadata_key + key_suffix + "]\n" +
          endpoint_option(options, endpoint) + "\n" +
          "destinations=metadata-cache://" + metadata_key + "/" +
              metadata_replicaset + "?role=" + role + "\n"
@@ -2017,13 +2138,7 @@
 
   config_file << "\n";
 
-  const auto &metadata_key = cluster_info.metadata_cluster_name;
-  auto ttl = options.use_gr_notifications ? kDefaultMetadataTTLGRNotificationsON
-                                          : kDefaultMetadataTTL;
-
-  const auto auth_cache_refresh_interval =
-      options.use_gr_notifications ? kDefaultMetadataTTLGRNotificationsON
-                                   : kDefaultAuthCacheRefreshInterval;
+  const auto &metadata_key = cluster_info.name;
 
   const std::string use_gr_notifications =
       mysqlrouter::ClusterType::RS_V2 == metadata_->get_type()
@@ -2031,19 +2146,26 @@
           : "use_gr_notifications="s +
                 (options.use_gr_notifications ? "1" : "0") + "\n";
 
-  config_file << "[metadata_cache:" << cluster_info.metadata_cluster_name
-              << "]\n"
+  const std::string metadata_cluster =
+      mysqlrouter::ClusterType::GR_CS == metadata_->get_type()
+          ? ""
+          : "metadata_cluster="s + cluster_info.name + "\n";
+
+  config_file << "[metadata_cache:" << cluster_info.name << "]\n"
               << "cluster_type="
               << mysqlrouter::to_string(metadata_->get_type()) << "\n"
               << "router_id=" << router_id << "\n"
               << "user=" << username << "\n"
-              << "metadata_cluster=" << cluster_info.metadata_cluster_name
+              << metadata_cluster
+              << "ttl=" << mysqlrouter::ms_to_seconds_string(options.ttl)
               << "\n"
-              << "ttl=" << mysqlrouter::ms_to_seconds_string(ttl) << "\n"
               << "auth_cache_ttl="
               << mysqlrouter::ms_to_seconds_string(kDefaultAuthCacheTTL) << "\n"
               << "auth_cache_refresh_interval="
-              << mysqlrouter::ms_to_seconds_string(auth_cache_refresh_interval)
+              << mysqlrouter::ms_to_seconds_string(
+                     kDefaultAuthCacheRefreshInterval > options.ttl
+                         ? kDefaultAuthCacheRefreshInterval
+                         : options.ttl)
               << "\n"
               << use_gr_notifications;
 
@@ -2061,17 +2183,11 @@
   // connection itself.
   config_file << "\n";
 
-  const auto &metadata_replicaset = cluster_info.metadata_replicaset;
-  const std::string fast_router_key = metadata_key +
-                                      (metadata_replicaset.empty() ? "" : "_") +
-                                      metadata_replicaset;
-
   // proxy to save on typing the same long list of args
   auto gen_mdc_rt_sect = [&](bool is_classic, bool is_writable,
                              Options::Endpoint endpoint) {
-    return gen_metadata_cache_routing_section(
-        is_classic, is_writable, endpoint, options, metadata_key,
-        metadata_replicaset, fast_router_key);
+    return gen_metadata_cache_routing_section(is_classic, is_writable, endpoint,
+                                              options, metadata_key);
   };
   config_file << gen_mdc_rt_sect(true, true, options.rw_endpoint);
   config_file << gen_mdc_rt_sect(true, false, options.ro_endpoint);
@@ -2123,9 +2239,8 @@
   config << mysql_harness::ConfigBuilder::build_section("rest_api", {});
 
   config << "\n\n";
-  config << mysql_harness::ConfigBuilder::build_section(
-      "http_auth_backend:" + auth_backend_name,
-      {{"backend", "metadata_cache"}});
+  config << create_http_auth_backend_section(datadir_path, auth_backend_name,
+                                             schema_version_);
 
   config << "\n\n";
   config << mysql_harness::ConfigBuilder::build_section(
@@ -2208,7 +2323,7 @@
 #endif
   ss << "    " << kPromptPrefix << g_program_name << " -c " << config_file_name
      << "\n\n"
-     << "the cluster '" << metadata_cluster
+     << cluster_type_name << " '" << metadata_cluster
      << "' can be reached by connecting to:\n"
      << std::endl;
 
@@ -2289,7 +2404,7 @@
   bool if_not_exists;
   {
     const std::string ac =
-        map_get(user_options, "account-create", "if-not-exists");
+        get_from_map(user_options, "account-create"s, "if-not-exists"s);
     if (ac == "never")
       return password;
     else if (ac == "if-not-exists" || !user_options.count("account"))
@@ -2772,7 +2887,7 @@
                     << Vt100::foreground(Vt100::Color::Red) << "ERROR: "
                     << Vt100::render(Vt100::Render::ForegroundDefault) <<
             R"(As part of cleanup after bootstrap failure, we tried to erase account(s)
-that we created.  Unfortuantely the cleanup failed with error:
+that we created.  Unfortunately the cleanup failed with error:
 
   )"s << e.what() << R"(
 You may want to clean up the accounts yourself, here is the full list of
diff -Nru mysql-8.0-8.0.26/router/src/router/src/config_generator.h mysql-8.0-8.0.27/router/src/router/src/config_generator.h
--- mysql-8.0-8.0.26/router/src/router/src/config_generator.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/router/src/config_generator.h	2021-09-28 11:46:34.000000000 +0000
@@ -25,6 +25,7 @@
 #ifndef ROUTER_CONFIG_GENERATOR_INCLUDED
 #define ROUTER_CONFIG_GENERATOR_INCLUDED
 
+#include <chrono>
 #include <functional>
 #include <map>
 #include <ostream>
@@ -35,6 +36,7 @@
 
 #include "auto_cleaner.h"
 #include "mysql/harness/filesystem.h"
+#include "mysqlrouter/cluster_metadata.h"
 #include "mysqlrouter/datatypes.h"
 #include "mysqlrouter/keyring_info.h"
 #include "mysqlrouter/mysql_session.h"
@@ -195,6 +197,7 @@
 
     mysqlrouter::SSLOptions ssl_options;
 
+    std::chrono::milliseconds ttl;
     bool use_gr_notifications;
 
     bool disable_rest{false};
@@ -215,6 +218,10 @@
     std::string server_ssl_crl;
     std::string server_ssl_crlpath;
     std::string server_ssl_verify;
+
+    // only relevant for ClusterSet
+    std::string target_cluster;
+    std::string target_cluster_by_name;
   };
 
   void set_file_owner(
@@ -313,7 +320,7 @@
 
   std::tuple<std::string> try_bootstrap_deployment(
       uint32_t &router_id, std::string &username, std::string &password,
-      const std::string &router_name, const std::string &cluster_id,
+      const std::string &router_name, const ClusterInfo &cluster_info,
       const std::map<std::string, std::string> &user_options,
       const std::map<std::string, std::vector<std::string>> &multivalue_options,
       const Options &options);
@@ -344,9 +351,7 @@
 
   static std::string gen_metadata_cache_routing_section(
       bool is_classic, bool is_writable, const Options::Endpoint endpoint,
-      const Options &options, const std::string &metadata_key,
-      const std::string &metadata_replicaset,
-      const std::string &fast_router_key);
+      const Options &options, const std::string &metadata_key);
 
   /** @brief Deletes Router accounts just created
    *
@@ -579,7 +584,7 @@
   int read_timeout_;
 
   // For GR cluster Group Replication ID, for AR cluster cluster_id from the
-  // metadata
+  // metadata, for ClusterSet clusterset_id
   std::string cluster_specific_id_;
   std::string cluster_initial_hostname_;
   unsigned int cluster_initial_port_;
@@ -613,6 +618,8 @@
   SysUserOperationsBase *sys_user_operations_;
 #endif
 
+  mysqlrouter::MetadataSchemaVersion schema_version_;
+
 #ifdef FRIEND_TEST
   FRIEND_TEST(::ConfigGeneratorTest, fetch_bootstrap_servers_one);
   FRIEND_TEST(::ConfigGeneratorTest, fetch_bootstrap_servers_three);
diff -Nru mysql-8.0-8.0.26/router/src/router/src/keyring_frontend.cc mysql-8.0-8.0.27/router/src/router/src/keyring_frontend.cc
--- mysql-8.0-8.0.26/router/src/router/src/keyring_frontend.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/router/src/keyring_frontend.cc	2021-09-28 11:46:34.000000000 +0000
@@ -31,8 +31,6 @@
 #include <vector>
 
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 
diff -Nru mysql-8.0-8.0.26/router/src/router/src/router_app.cc mysql-8.0-8.0.27/router/src/router/src/router_app.cc
--- mysql-8.0-8.0.26/router/src/router/src/router_app.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/router/src/router_app.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1167,15 +1167,74 @@
   arg_handler_.add_option(
       OptionNames({"--conf-use-gr-notifications"}),
       "Whether to enable handling of cluster state change GR notifications.",
-      CmdOptionValueReq::none, "",
-      [this](const std::string &) {
-        this->bootstrap_options_["use-gr-notifications"] = "1";
+      CmdOptionValueReq::optional, "",
+      [this](const std::string &value) {
+        if (value == "0" || value == "1") {
+          this->bootstrap_options_["use-gr-notifications"] = value;
+        } else if (value.empty()) {
+          this->bootstrap_options_["use-gr-notifications"] = "1";
+        } else {
+          throw std::runtime_error(
+              "Value for parameter '--conf-use-gr-notifications' needs to be "
+              "one of: ['0', '1']");
+        }
       },
       [this](const std::string &) {
         this->assert_bootstrap_mode("--conf-use-gr-notifications");
       });
 
   arg_handler_.add_option(
+      OptionNames({"--conf-target-cluster"}),
+      "Router's target Cluster from the ClusterSet('current' or 'primary').",
+      CmdOptionValueReq::required, "",
+      [this](const std::string &value) {
+        if (this->bootstrap_options_.count("target-cluster-by-name") > 0) {
+          throw std::runtime_error(
+              "Parameters '--conf-target-cluster' and "
+              "'--conf-target-cluster-by-name' are mutually exclusive and "
+              "can't be used together");
+        }
+
+        std::string value_lowercase{value};
+        std::transform(value_lowercase.begin(), value_lowercase.end(),
+                       value_lowercase.begin(), ::tolower);
+
+        if (value_lowercase != "primary" && value_lowercase != "current") {
+          throw std::runtime_error(
+              "Value for parameter '--conf-target-cluster' needs to be one of: "
+              "['primary', 'current']");
+        }
+
+        this->bootstrap_options_["target-cluster"] = value_lowercase;
+      },
+      [this](const std::string &) {
+        this->assert_bootstrap_mode("--conf-target-cluster");
+      });
+
+  arg_handler_.add_option(
+      OptionNames({"--conf-target-cluster-by-name"}),
+      "Name of the target Cluster for the Router when bootstrapping against "
+      "the ClusterSet",
+      CmdOptionValueReq::required, "",
+      [this](const std::string &value) {
+        if (this->bootstrap_options_.count("target-cluster") > 0) {
+          throw std::runtime_error(
+              "Parameters '--conf-target-cluster' and "
+              "'--conf-target-cluster-by-name' are mutually exclusive and "
+              "can't be used together");
+        }
+        if (value.empty()) {
+          throw std::runtime_error(
+              "Value for parameter '--conf-target-cluster-by-name' can't be "
+              "empty");
+        }
+        this->bootstrap_options_["target-cluster-by-name"] = value;
+      },
+      [this](const std::string &) {
+        this->assert_bootstrap_mode("--conf-target-cluster-by-name");
+      });
+
+  arg_handler_.add_option(
       OptionNames({"-d", "--directory"}),
       "Creates a self-contained directory for a new instance of the Router. "
       "(bootstrap)",
diff -Nru mysql-8.0-8.0.26/router/src/router/src/utils.cc mysql-8.0-8.0.27/router/src/router/src/utils.cc
--- mysql-8.0-8.0.26/router/src/router/src/utils.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/router/src/utils.cc	2021-09-28 11:46:34.000000000 +0000
@@ -495,13 +495,32 @@
     return default_value;
 }
 
-int strtoi_checked(const char *value, signed int default_value) noexcept {
-  return strtoX_checked_common<signed int>(value, default_value);
+int strtoi_checked(const char *value, signed int default_result) noexcept {
+  return strtoX_checked_common<signed int>(value, default_result);
 }
 
 unsigned strtoui_checked(const char *value,
-                         unsigned int default_value) noexcept {
-  return strtoX_checked_common<unsigned int>(value, default_value);
+                         unsigned int default_result) noexcept {
+  return strtoX_checked_common<unsigned int>(value, default_result);
+}
+
+uint64_t strtoull_checked(const char *value, uint64_t default_result) noexcept {
+  static_assert(std::numeric_limits<uint64_t>::max() <=
+                    std::numeric_limits<unsigned long long>::max(),
+                "");
+
+  if (value == nullptr) return default_result;
+
+  char *rest;
+  errno = 0;
+  unsigned long long toul = std::strtoull(value, &rest, 10);
+  uint64_t result = static_cast<uint64_t>(toul);
+
+  if (errno > 0 || *rest != '\0' ||
+      result > std::numeric_limits<uint64_t>::max() || result != toul) {
+    return default_result;
+  }
+  return result;
 }
 
 #ifndef _WIN32
diff -Nru mysql-8.0-8.0.26/router/src/router/tests/CMakeLists.txt mysql-8.0-8.0.27/router/src/router/tests/CMakeLists.txt
--- mysql-8.0-8.0.26/router/src/router/tests/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/router/tests/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -36,10 +36,6 @@
   test_mysqlrouter_app.cc
   test_mysqlrouter_utils.cc
   )
-# This compiler fails to handle some of the mock functions involved.
-IF(MY_COMPILER_IS_SUNPRO)
-  LIST(REMOVE_ITEM TESTS test_mysqlrouter_app.cc)
-ENDIF()
 
 FOREACH(TEST_FILE ${TESTS})
   ADD_TEST_FILE(${TEST_FILE}
diff -Nru mysql-8.0-8.0.26/router/src/router/tests/test_config_generator.cc mysql-8.0-8.0.27/router/src/router/tests/test_config_generator.cc
--- mysql-8.0-8.0.26/router/src/router/tests/test_config_generator.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/router/tests/test_config_generator.cc	2021-09-28 11:46:34.000000000 +0000
@@ -256,8 +256,7 @@
 
     ASSERT_THAT(mysql_harness::list_elements(cluster_info.metadata_servers),
                 Eq("mysql://somehost:3306"));
-    ASSERT_THAT(cluster_info.metadata_cluster_name, Eq("mycluster"));
-    ASSERT_THAT(cluster_info.metadata_replicaset, Eq(""));
+    ASSERT_THAT(cluster_info.name, Eq("mycluster"));
   }
 
   {
@@ -272,8 +271,7 @@
 
     ASSERT_THAT(mysql_harness::list_elements(cluster_info.metadata_servers),
                 Eq("mysql://somehost:3306"));
-    ASSERT_THAT(cluster_info.metadata_cluster_name, Eq("mycluster"));
-    ASSERT_THAT(cluster_info.metadata_replicaset, Eq(""));
+    ASSERT_THAT(cluster_info.name, Eq("mycluster"));
   }
 }
 
@@ -295,8 +293,7 @@
     ASSERT_THAT(mysql_harness::list_elements(cluster_info.metadata_servers),
                 Eq("mysql://somehost:3306,mysql://otherhost:3306,mysql://"
                    "sumhost:3306"));
-    ASSERT_THAT(cluster_info.metadata_cluster_name, Eq("mycluster"));
-    ASSERT_THAT(cluster_info.metadata_replicaset, Eq(""));
+    ASSERT_THAT(cluster_info.name, Eq("mycluster"));
   }
 }
 
@@ -1457,7 +1454,7 @@
     ConfigGeneratorTest::SetUp();
 
     cluster_info = {
-        {"server1", "server2", "server3"}, "", "mycluster", "myreplicaset"};
+        {"server1", "server2", "server3"}, "id", "gr_id", "mycluster"};
 
     common_pass_metadata_checks(mock_mysql.get());
     config_gen.init(kServerUrl, {});
@@ -1541,31 +1538,31 @@
       "auth_cache_refresh_interval=2",
       "use_gr_notifications=0",
       "",
-      "[routing:mycluster_myreplicaset_rw]",
+      "[routing:mycluster_rw]",
       "bind_address=0.0.0.0",
       "bind_port=6446",
-      "destinations=metadata-cache://mycluster/myreplicaset?role=PRIMARY",
+      "destinations=metadata-cache://mycluster/?role=PRIMARY",
       "routing_strategy=first-available",
       "protocol=classic",
       "",
-      "[routing:mycluster_myreplicaset_ro]",
+      "[routing:mycluster_ro]",
       "bind_address=0.0.0.0",
       "bind_port=6447",
-      "destinations=metadata-cache://mycluster/myreplicaset?role=SECONDARY",
+      "destinations=metadata-cache://mycluster/?role=SECONDARY",
       "routing_strategy=round-robin-with-fallback",
       "protocol=classic",
       "",
-      "[routing:mycluster_myreplicaset_x_rw]",
+      "[routing:mycluster_x_rw]",
       "bind_address=0.0.0.0",
       "bind_port=6448",
-      "destinations=metadata-cache://mycluster/myreplicaset?role=PRIMARY",
+      "destinations=metadata-cache://mycluster/?role=PRIMARY",
       "routing_strategy=first-available",
       "protocol=x",
       "",
-      "[routing:mycluster_myreplicaset_x_ro]",
+      "[routing:mycluster_x_ro]",
       "bind_address=0.0.0.0",
       "bind_port=6449",
-      "destinations=metadata-cache://mycluster/myreplicaset?role=SECONDARY",
+      "destinations=metadata-cache://mycluster/?role=SECONDARY",
       "routing_strategy=round-robin-with-fallback",
       "protocol=x",
       ""};
@@ -1628,31 +1625,31 @@
       "auth_cache_refresh_interval=2",
       "use_gr_notifications=0",
       "",
-      "[routing:mycluster_myreplicaset_rw]",
+      "[routing:mycluster_rw]",
       "bind_address=0.0.0.0",
       "bind_port=6446",
-      "destinations=metadata-cache://mycluster/myreplicaset?role=PRIMARY",
+      "destinations=metadata-cache://mycluster/?role=PRIMARY",
       "routing_strategy=first-available",
       "protocol=classic",
       "",
-      "[routing:mycluster_myreplicaset_ro]",
+      "[routing:mycluster_ro]",
       "bind_address=0.0.0.0",
       "bind_port=6447",
-      "destinations=metadata-cache://mycluster/myreplicaset?role=SECONDARY",
+      "destinations=metadata-cache://mycluster/?role=SECONDARY",
       "routing_strategy=round-robin-with-fallback",
       "protocol=classic",
       "",
-      "[routing:mycluster_myreplicaset_x_rw]",
+      "[routing:mycluster_x_rw]",
       "bind_address=0.0.0.0",
       "bind_port=6448",
-      "destinations=metadata-cache://mycluster/myreplicaset?role=PRIMARY",
+      "destinations=metadata-cache://mycluster/?role=PRIMARY",
       "routing_strategy=first-available",
       "protocol=x",
       "",
-      "[routing:mycluster_myreplicaset_x_ro]",
+      "[routing:mycluster_x_ro]",
       "bind_address=0.0.0.0",
       "bind_port=6449",
-      "destinations=metadata-cache://mycluster/myreplicaset?role=SECONDARY",
+      "destinations=metadata-cache://mycluster/?role=SECONDARY",
       "routing_strategy=round-robin-with-fallback",
       "protocol=x",
       ""};
@@ -1688,7 +1685,6 @@
   config_gen.create_config(conf_output, state_output, 123, "", "", cluster_info,
                            "cluster_user", options, default_paths,
                            "state_file_name.json");
-
   std::vector<std::string> lines;
   for (std::string line; std::getline(conf_output, line);) {
     lines.push_back(line);
@@ -1719,31 +1715,31 @@
       "auth_cache_refresh_interval=2",
       "use_gr_notifications=0",
       "",
-      "[routing:mycluster_myreplicaset_rw]",
+      "[routing:mycluster_rw]",
       "bind_address=0.0.0.0",
       "bind_port=1234",
-      "destinations=metadata-cache://mycluster/myreplicaset?role=PRIMARY",
+      "destinations=metadata-cache://mycluster/?role=PRIMARY",
       "routing_strategy=first-available",
       "protocol=classic",
       "",
-      "[routing:mycluster_myreplicaset_ro]",
+      "[routing:mycluster_ro]",
       "bind_address=0.0.0.0",
       "bind_port=1235",
-      "destinations=metadata-cache://mycluster/myreplicaset?role=SECONDARY",
+      "destinations=metadata-cache://mycluster/?role=SECONDARY",
       "routing_strategy=round-robin-with-fallback",
       "protocol=classic",
       "",
-      "[routing:mycluster_myreplicaset_x_rw]",
+      "[routing:mycluster_x_rw]",
       "bind_address=0.0.0.0",
       "bind_port=1236",
-      "destinations=metadata-cache://mycluster/myreplicaset?role=PRIMARY",
+      "destinations=metadata-cache://mycluster/?role=PRIMARY",
       "routing_strategy=first-available",
       "protocol=x",
       "",
-      "[routing:mycluster_myreplicaset_x_ro]",
+      "[routing:mycluster_x_ro]",
       "bind_address=0.0.0.0",
       "bind_port=1237",
-      "destinations=metadata-cache://mycluster/myreplicaset?role=SECONDARY",
+      "destinations=metadata-cache://mycluster/?role=SECONDARY",
       "routing_strategy=round-robin-with-fallback",
       "protocol=x",
       ""};
@@ -1813,27 +1809,27 @@
       "auth_cache_refresh_interval=2",
       "use_gr_notifications=0",
       "",
-      "[routing:mycluster_myreplicaset_rw]",
+      "[routing:mycluster_rw]",
       "socket=" + test_dir() + "/mysql.sock",
-      "destinations=metadata-cache://mycluster/myreplicaset?role=PRIMARY",
+      "destinations=metadata-cache://mycluster/?role=PRIMARY",
       "routing_strategy=first-available",
       "protocol=classic",
       "",
-      "[routing:mycluster_myreplicaset_ro]",
+      "[routing:mycluster_ro]",
       "socket=" + test_dir() + "/mysqlro.sock",
-      "destinations=metadata-cache://mycluster/myreplicaset?role=SECONDARY",
+      "destinations=metadata-cache://mycluster/?role=SECONDARY",
       "routing_strategy=round-robin-with-fallback",
       "protocol=classic",
       "",
-      "[routing:mycluster_myreplicaset_x_rw]",
+      "[routing:mycluster_x_rw]",
       "socket=" + test_dir() + "/mysqlx.sock",
-      "destinations=metadata-cache://mycluster/myreplicaset?role=PRIMARY",
+      "destinations=metadata-cache://mycluster/?role=PRIMARY",
       "routing_strategy=first-available",
       "protocol=x",
       "",
-      "[routing:mycluster_myreplicaset_x_ro]",
+      "[routing:mycluster_x_ro]",
       "socket=" + test_dir() + "/mysqlxro.sock",
-      "destinations=metadata-cache://mycluster/myreplicaset?role=SECONDARY",
+      "destinations=metadata-cache://mycluster/?role=SECONDARY",
       "routing_strategy=round-robin-with-fallback",
       "protocol=x",
       ""};
@@ -1844,7 +1840,6 @@
   }
 
   ASSERT_THAT(lines, ::testing::ElementsAreArray(expected_config_lines));
-
   ASSERT_THAT(state_output.str(),
               Eq("{\n"
                  "    \"metadata-cache\": {\n"
@@ -1870,7 +1865,6 @@
   config_gen.create_config(conf_output, state_output, 123, "", "", cluster_info,
                            "cluster_user", options, default_paths,
                            "state_file_name.json");
-
   std::vector<std::string> lines;
   for (std::string line; std::getline(conf_output, line);) {
     lines.push_back(line);
@@ -1901,35 +1895,35 @@
       "auth_cache_refresh_interval=2",
       "use_gr_notifications=0",
       "",
-      "[routing:mycluster_myreplicaset_rw]",
+      "[routing:mycluster_rw]",
       "bind_address=0.0.0.0",
       "bind_port=6446",
       "socket=" + test_dir() + "/mysql.sock",
-      "destinations=metadata-cache://mycluster/myreplicaset?role=PRIMARY",
+      "destinations=metadata-cache://mycluster/?role=PRIMARY",
       "routing_strategy=first-available",
       "protocol=classic",
       "",
-      "[routing:mycluster_myreplicaset_ro]",
+      "[routing:mycluster_ro]",
       "bind_address=0.0.0.0",
       "bind_port=6447",
       "socket=" + test_dir() + "/mysqlro.sock",
-      "destinations=metadata-cache://mycluster/myreplicaset?role=SECONDARY",
+      "destinations=metadata-cache://mycluster/?role=SECONDARY",
       "routing_strategy=round-robin-with-fallback",
       "protocol=classic",
       "",
-      "[routing:mycluster_myreplicaset_x_rw]",
+      "[routing:mycluster_x_rw]",
       "bind_address=0.0.0.0",
       "bind_port=6448",
       "socket=" + test_dir() + "/mysqlx.sock",
-      "destinations=metadata-cache://mycluster/myreplicaset?role=PRIMARY",
+      "destinations=metadata-cache://mycluster/?role=PRIMARY",
       "routing_strategy=first-available",
       "protocol=x",
       "",
-      "[routing:mycluster_myreplicaset_x_ro]",
+      "[routing:mycluster_x_ro]",
       "bind_address=0.0.0.0",
       "bind_port=6449",
       "socket=" + test_dir() + "/mysqlxro.sock",
-      "destinations=metadata-cache://mycluster/myreplicaset?role=SECONDARY",
+      "destinations=metadata-cache://mycluster/?role=SECONDARY",
       "routing_strategy=round-robin-with-fallback",
       "protocol=x",
       ""};
@@ -1998,31 +1992,31 @@
       "auth_cache_refresh_interval=2",
       "use_gr_notifications=0",
       "",
-      "[routing:mycluster_myreplicaset_rw]",
+      "[routing:mycluster_rw]",
       "bind_address=127.0.0.1",
       "bind_port=6446",
-      "destinations=metadata-cache://mycluster/myreplicaset?role=PRIMARY",
+      "destinations=metadata-cache://mycluster/?role=PRIMARY",
       "routing_strategy=first-available",
       "protocol=classic",
       "",
-      "[routing:mycluster_myreplicaset_ro]",
+      "[routing:mycluster_ro]",
       "bind_address=127.0.0.1",
       "bind_port=6447",
-      "destinations=metadata-cache://mycluster/myreplicaset?role=SECONDARY",
+      "destinations=metadata-cache://mycluster/?role=SECONDARY",
       "routing_strategy=round-robin-with-fallback",
       "protocol=classic",
       "",
-      "[routing:mycluster_myreplicaset_x_rw]",
+      "[routing:mycluster_x_rw]",
       "bind_address=127.0.0.1",
       "bind_port=6448",
-      "destinations=metadata-cache://mycluster/myreplicaset?role=PRIMARY",
+      "destinations=metadata-cache://mycluster/?role=PRIMARY",
       "routing_strategy=first-available",
       "protocol=x",
       "",
-      "[routing:mycluster_myreplicaset_x_ro]",
+      "[routing:mycluster_x_ro]",
       "bind_address=127.0.0.1",
       "bind_port=6449",
-      "destinations=metadata-cache://mycluster/myreplicaset?role=SECONDARY",
+      "destinations=metadata-cache://mycluster/?role=SECONDARY",
       "routing_strategy=round-robin-with-fallback",
       "protocol=x",
       ""};
@@ -2033,7 +2027,6 @@
   }
 
   ASSERT_THAT(lines, ::testing::ElementsAreArray(expected_config_lines));
-
   ASSERT_THAT(state_output.str(),
               Eq("{\n"
                  "    \"metadata-cache\": {\n"
@@ -2091,31 +2084,31 @@
       "auth_cache_refresh_interval=2",
       "use_gr_notifications=0",
       "",
-      "[routing:mycluster_myreplicaset_rw]",
+      "[routing:mycluster_rw]",
       "bind_address=0.0.0.0",
       "bind_port=6446",
-      "destinations=metadata-cache://mycluster/myreplicaset?role=PRIMARY",
+      "destinations=metadata-cache://mycluster/?role=PRIMARY",
       "routing_strategy=first-available",
       "protocol=classic",
       "",
-      "[routing:mycluster_myreplicaset_ro]",
+      "[routing:mycluster_ro]",
       "bind_address=0.0.0.0",
       "bind_port=6447",
-      "destinations=metadata-cache://mycluster/myreplicaset?role=SECONDARY",
+      "destinations=metadata-cache://mycluster/?role=SECONDARY",
       "routing_strategy=round-robin-with-fallback",
       "protocol=classic",
       "",
-      "[routing:mycluster_myreplicaset_x_rw]",
+      "[routing:mycluster_x_rw]",
       "bind_address=0.0.0.0",
       "bind_port=6448",
-      "destinations=metadata-cache://mycluster/myreplicaset?role=PRIMARY",
+      "destinations=metadata-cache://mycluster/?role=PRIMARY",
       "routing_strategy=first-available",
       "protocol=x",
       "",
-      "[routing:mycluster_myreplicaset_x_ro]",
+      "[routing:mycluster_x_ro]",
       "bind_address=0.0.0.0",
       "bind_port=6449",
-      "destinations=metadata-cache://mycluster/myreplicaset?role=SECONDARY",
+      "destinations=metadata-cache://mycluster/?role=SECONDARY",
       "routing_strategy=round-robin-with-fallback",
       "protocol=x",
       ""};
@@ -3248,7 +3241,7 @@
             config_gen.fill_options(user_options, default_paths, {});
         std::stringstream conf_output, state_output;
         mysqlrouter::ClusterInfo cluster_info{
-            {"server1", "server2", "server3"}, "", "mycluster", "myreplicaset"};
+            {"server1", "server2", "server3"}, "", "gr_id", "mycluster"};
         config_gen.create_config(conf_output, state_output, 123, "myrouter",
                                  "user", cluster_info, "cluster_user", options,
                                  default_paths);
@@ -4013,7 +4006,7 @@
   common_pass_cluster_type(&mysql);
 
   conf_gen.metadata_ =
-      mysqlrouter::create_metadata(kNewSchemaVersion, &mysql, &sock_ops);
+      mysqlrouter::create_metadata(kNewSchemaVersion, &mysql, {}, &sock_ops);
 
   EXPECT_THROW_LIKE(conf_gen.register_router("foo", "", false),
                     std::runtime_error,
@@ -4045,7 +4038,7 @@
   uint32_t router_id = 1u;
   ConfigGenerator conf_gen;
   conf_gen.metadata_ =
-      mysqlrouter::create_metadata(kNewSchemaVersion, &mysql, &sock_ops);
+      mysqlrouter::create_metadata(kNewSchemaVersion, &mysql, {}, &sock_ops);
   EXPECT_THROW_LIKE(
       conf_gen.ensure_router_id_is_ours(router_id, ""), std::runtime_error,
       "Could not verify if this Router instance is already registered with the "
diff -Nru mysql-8.0-8.0.26/router/src/router/tests/test_metadata_check.cc mysql-8.0-8.0.27/router/src/router/tests/test_metadata_check.cc
--- mysql-8.0-8.0.26/router/src/router/tests/test_metadata_check.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/router/tests/test_metadata_check.cc	2021-09-28 11:46:34.000000000 +0000
@@ -47,6 +47,7 @@
 
 using ::testing::Return;
 using namespace testing;
+using namespace std::string_literals;
 
 static MySQLSessionReplayer &q_schema_version(MySQLSessionReplayer &m) {
   m.expect_query_one(
@@ -187,23 +188,47 @@
   std::unique_ptr<mysqlrouter::ClusterMetadata> metadata(
       mysqlrouter::create_metadata(kNewSchemaVersion, &m));
 
-  q_metadata_has_one_cluster(m, std::get<0>(GetParam()));
-  ASSERT_THROW_LIKE(metadata->require_metadata_is_ok(), std::runtime_error,
-                    "Expected the metadata server to contain configuration for "
-                    "one cluster, found none.");
+  const std::string clusters_count = std::get<0>(GetParam());
+  q_metadata_has_one_cluster(m, clusters_count.c_str());
+  if (clusters_count == "0") {
+    ASSERT_THROW_LIKE(
+        metadata->require_metadata_is_ok(), std::runtime_error,
+        "Expected the metadata server to contain configuration for "
+        "one cluster, found none");
+  } else {
+    ASSERT_THROW_LIKE(
+        metadata->require_metadata_is_ok(), std::runtime_error,
+        "The metadata server contains configuration for more than 1 Cluster: "s +
+            clusters_count +
+            ". If it was a part of a ClusterSet previously, the metadata "
+            "should be recreated using dba.dropMetadataSchema() and "
+            "dba.createCluster() with adoptFromGR parameter set to true");
+  }
 }
 
 TEST_P(MetadataGroupMembers_2_0_Throws, metadata_unsupported_2_0_3) {
   MySQLSessionReplayer m;
   q_schema_version(m, "2", "0", "3");
   q_cluster_type(m);
-  q_metadata_has_one_cluster(m, std::get<0>(GetParam()));
+  const std::string clusters_count = std::get<0>(GetParam());
+  q_metadata_has_one_cluster(m, clusters_count.c_str());
   const auto version = mysqlrouter::get_metadata_schema_version(&m);
   std::unique_ptr<mysqlrouter::ClusterMetadata> metadata(
       mysqlrouter::create_metadata(version, &m));
-  ASSERT_THROW_LIKE(metadata->require_metadata_is_ok(), std::runtime_error,
-                    "Expected the metadata server to contain configuration for "
-                    "one cluster, found none.");
+  if (clusters_count == "0") {
+    ASSERT_THROW_LIKE(
+        metadata->require_metadata_is_ok(), std::runtime_error,
+        "Expected the metadata server to contain configuration for "
+        "one cluster, found none");
+  } else {
+    ASSERT_THROW_LIKE(
+        metadata->require_metadata_is_ok(), std::runtime_error,
+        "The metadata server contains configuration for more than 1 Cluster: "s +
+            clusters_count +
+            ". If it was a part of a ClusterSet previously, the metadata "
+            "should be recreated using dba.dropMetadataSchema() and "
+            "dba.createCluster() with adoptFromGR parameter set to true");
+  }
 }
 
 INSTANTIATE_TEST_SUITE_P(Quorum, MetadataGroupMembers_2_0_Throws,
diff -Nru mysql-8.0-8.0.26/router/src/router/tests/test_utils.cc mysql-8.0-8.0.27/router/src/router/tests/test_utils.cc
--- mysql-8.0-8.0.26/router/src/router/tests/test_utils.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/router/tests/test_utils.cc	2021-09-28 11:46:34.000000000 +0000
@@ -261,6 +261,22 @@
   EXPECT_EQ(0u, strtoui_checked("+0", 66));
 }
 
+TEST_F(UtilsTests, uint64_conversion) {
+  using mysqlrouter::strtoull_checked;
+  const uint64_t kDefault{66};
+
+  EXPECT_EQ(kDefault, strtoull_checked(nullptr, kDefault));
+  EXPECT_EQ(kDefault, strtoull_checked(0, kDefault));
+  EXPECT_EQ(kDefault, strtoull_checked("18446744073709551617", kDefault));
+
+  EXPECT_EQ(static_cast<uint64_t>(0), strtoull_checked("0", kDefault));
+  EXPECT_EQ(static_cast<uint64_t>(4294967298),
+            strtoull_checked("4294967298", kDefault));
+  EXPECT_EQ(static_cast<uint64_t>(0x7fffffffffffffff),
+            strtoull_checked("9223372036854775807", kDefault));
+  EXPECT_EQ(static_cast<uint64_t>(66), strtoull_checked("66", kDefault));
+}
+
 int main(int argc, char **argv) {
   ::testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
diff -Nru mysql-8.0-8.0.26/router/src/routing/include/mysqlrouter/routing_component.h mysql-8.0-8.0.27/router/src/routing/include/mysqlrouter/routing_component.h
--- mysql-8.0-8.0.26/router/src/routing/include/mysqlrouter/routing_component.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/routing/include/mysqlrouter/routing_component.h	2021-09-28 11:46:34.000000000 +0000
@@ -34,16 +34,17 @@
 #include <string>
 #include <vector>
 
+#include "mysql/harness/config_parser.h"
 #include "tcp_address.h"
 
-class MySQLRouting;
+class MySQLRoutingBase;
 class BaseProtocol;
 
 class ROUTING_EXPORT MySQLRoutingAPI {
  public:
   MySQLRoutingAPI() = default;
 
-  MySQLRoutingAPI(std::shared_ptr<MySQLRouting> r) : r_{std::move(r)} {}
+  MySQLRoutingAPI(std::shared_ptr<MySQLRoutingBase> r) : r_{std::move(r)} {}
 
   // config
   std::string get_bind_address() const;
@@ -93,26 +94,35 @@
   bool is_accepting_connections() const;
 
  private:
-  std::shared_ptr<MySQLRouting> r_;
+  std::shared_ptr<MySQLRoutingBase> r_;
 };
 
 class ROUTING_EXPORT MySQLRoutingComponent {
  public:
   static MySQLRoutingComponent &get_instance();
 
-  void init(const std::string &name, std::shared_ptr<MySQLRouting> srv);
+  void init(const mysql_harness::Config &config);
+
+  void init(const std::string &name, std::shared_ptr<MySQLRoutingBase> srv);
 
   MySQLRoutingAPI api(const std::string &name);
 
+  uint64_t current_total_connections();
+  uint64_t max_total_connections() const { return max_total_connections_; }
+
   std::vector<std::string> route_names() const;
 
+  static const uint64_t kDefaultMaxTotalConnections = 512;
+
  private:
   // disable copy, as we are a single-instance
   MySQLRoutingComponent(MySQLRoutingComponent const &) = delete;
   void operator=(MySQLRoutingComponent const &) = delete;
 
   std::mutex routes_mu_;
-  std::map<std::string, std::weak_ptr<MySQLRouting>> routes_;
+  std::map<std::string, std::weak_ptr<MySQLRoutingBase>> routes_;
+
+  uint64_t max_total_connections_{0};
 
   MySQLRoutingComponent() = default;
 };
diff -Nru mysql-8.0-8.0.26/router/src/routing/src/classic_protocol_splicer.cc mysql-8.0-8.0.27/router/src/routing/src/classic_protocol_splicer.cc
--- mysql-8.0-8.0.26/router/src/routing/src/classic_protocol_splicer.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/routing/src/classic_protocol_splicer.cc	2021-09-28 11:46:34.000000000 +0000
@@ -370,7 +370,7 @@
       return state();
     }
 
-    log_debug("decoding server greeting failed: %s",
+    log_debug("decoding client greeting failed: %s",
               header_decode_res.error().message().c_str());
 
     return State::FINISH;
@@ -406,7 +406,7 @@
       return state();
     }
 
-    log_debug("decoding server greeting failed: %s",
+    log_debug("decoding client greeting failed: %s",
               payload_decode_res.error().message().c_str());
 
     return State::FINISH;
@@ -647,7 +647,7 @@
       return state();
     }
 
-    log_debug("decoding server greeting failed: %s",
+    log_debug("decoding client greeting after TLS failed: %s",
               decode_res.error().message().c_str());
 
     return State::FINISH;
diff -Nru mysql-8.0-8.0.26/router/src/routing/src/connection_container.cc mysql-8.0-8.0.27/router/src/routing/src/connection_container.cc
--- mysql-8.0-8.0.26/router/src/routing/src/connection_container.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/routing/src/connection_container.cc	2021-09-28 11:46:34.000000000 +0000
@@ -32,7 +32,7 @@
   connections_.put(connection.get(), std::move(connection));
 }
 
-void ConnectionContainer::disconnect(const AllowedNodes &nodes) {
+unsigned ConnectionContainer::disconnect(const AllowedNodes &nodes) {
   unsigned number_of_disconnected_connections = 0;
 
   auto mark_to_diconnect_if_not_allowed =
@@ -52,8 +52,8 @@
       };
 
   connections_.for_each(mark_to_diconnect_if_not_allowed);
-  if (number_of_disconnected_connections > 0)
-    log_info("Disconnected %u connections", number_of_disconnected_connections);
+
+  return number_of_disconnected_connections;
 }
 
 void ConnectionContainer::disconnect_all() {
diff -Nru mysql-8.0-8.0.26/router/src/routing/src/connection_container.h mysql-8.0-8.0.27/router/src/routing/src/connection_container.h
--- mysql-8.0-8.0.26/router/src/routing/src/connection_container.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/routing/src/connection_container.h	2021-09-28 11:46:34.000000000 +0000
@@ -205,8 +205,9 @@
    *
    * @param nodes Allowed servers. Connections to servers that are not in nodes
    *        are closed.
+   * @returns number of connections marked to be disconnected
    */
-  void disconnect(const AllowedNodes &nodes);
+  unsigned disconnect(const AllowedNodes &nodes);
 
   /**
    * @brief Disconnects all connection in the ConnectionContainer.
diff -Nru mysql-8.0-8.0.26/router/src/routing/src/destination.h mysql-8.0-8.0.27/router/src/routing/src/destination.h
--- mysql-8.0-8.0.26/router/src/routing/src/destination.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/routing/src/destination.h	2021-09-28 11:46:34.000000000 +0000
@@ -227,8 +227,8 @@
    *
    * @param env pointer to the PluginFuncEnv object
    */
-  virtual void start(
-      const mysql_harness::PluginFuncEnv *env MY_ATTRIBUTE((unused))) {}
+  virtual void start(const mysql_harness::PluginFuncEnv *env [[maybe_unused]]) {
+  }
 
   AddrVector::iterator begin() { return destinations_.begin(); }
 
@@ -257,7 +257,7 @@
    * @returns new destinations, if there are any.
    */
   virtual stdx::expected<Destinations, void> refresh_destinations(
-      const Destinations &dests MY_ATTRIBUTE((unused))) {
+      const Destinations &dests [[maybe_unused]]) {
     return stdx::make_unexpected();
   }
 
diff -Nru mysql-8.0-8.0.26/router/src/routing/src/destination_ssl_context.cc mysql-8.0-8.0.27/router/src/routing/src/destination_ssl_context.cc
--- mysql-8.0-8.0.26/router/src/routing/src/destination_ssl_context.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/routing/src/destination_ssl_context.cc	2021-09-28 11:46:34.000000000 +0000
@@ -87,7 +87,7 @@
         break;
       case SslVerify::kVerifyIdentity:
         tls_ctx->verify_hostname(dest_id);
-        // fallthrough
+        [[fallthrough]];
       case SslVerify::kVerifyCa:
         tls_ctx->ssl_ca(ca_file_, ca_path_);
         tls_ctx->crl(crl_file_, crl_path_);
diff -Nru mysql-8.0-8.0.26/router/src/routing/src/dest_metadata_cache.cc mysql-8.0-8.0.27/router/src/routing/src/dest_metadata_cache.cc
--- mysql-8.0-8.0.26/router/src/routing/src/dest_metadata_cache.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/routing/src/dest_metadata_cache.cc	2021-09-28 11:46:34.000000000 +0000
@@ -184,14 +184,12 @@
 // 'std::map<std::string, std::string>'
 DestMetadataCacheGroup::DestMetadataCacheGroup(
     net::io_context &io_ctx, const std::string &metadata_cache,
-    const std::string &replicaset,
     const routing::RoutingStrategy routing_strategy,
     const mysqlrouter::URIQuery &query, const Protocol::Type protocol,
     const routing::AccessMode access_mode,
     metadata_cache::MetadataCacheAPIBase *cache_api)
     : RouteDestination(io_ctx, protocol),
       cache_name_(metadata_cache),
-      ha_replicaset_(replicaset),
       uri_query_(query),
       routing_strategy_(routing_strategy),
       access_mode_(access_mode),
@@ -374,18 +372,18 @@
 }
 
 void DestMetadataCacheGroup::subscribe_for_metadata_cache_changes() {
-  cache_api_->add_state_listener(ha_replicaset_, this);
+  cache_api_->add_state_listener(this);
   subscribed_for_metadata_cache_changes_ = true;
 }
 
 void DestMetadataCacheGroup::subscribe_for_acceptor_handler() {
-  cache_api_->add_acceptor_handler_listener(ha_replicaset_, this);
+  cache_api_->add_acceptor_handler_listener(this);
 }
 
 DestMetadataCacheGroup::~DestMetadataCacheGroup() {
   if (subscribed_for_metadata_cache_changes_) {
-    cache_api_->remove_state_listener(ha_replicaset_, this);
-    cache_api_->remove_acceptor_handler_listener(ha_replicaset_, this);
+    cache_api_->remove_state_listener(this);
+    cache_api_->remove_acceptor_handler_listener(this);
   }
 }
 
@@ -480,8 +478,7 @@
         return stdx::make_unexpected();
       }
 
-      if (cache_api_->wait_primary_failover(ha_replicaset_,
-                                            primary_member->server_uuid(),
+      if (cache_api_->wait_primary_failover(primary_member->server_uuid(),
                                             kPrimaryFailoverTimeout)) {
         return primary_destinations();
       }
@@ -574,8 +571,7 @@
   }
 
   if (dests.empty()) {
-    log_warning("No available servers found for '%s' %s routing",
-                ha_replicaset_.c_str(),
+    log_warning("No available servers found for %s routing",
                 server_role_ == ServerRole::Primary ? "PRIMARY" : "SECONDARY");
 
     // return an empty list
@@ -600,7 +596,7 @@
   AvailableDestinations available;
   bool primary_failover;
   const auto &all_replicaset_nodes =
-      cache_api_->lookup_replicaset(ha_replicaset_).instance_vector;
+      cache_api_->get_cluster_nodes().instance_vector;
 
   std::tie(available, primary_failover) = get_available(all_replicaset_nodes);
 
@@ -611,7 +607,7 @@
   if (!cache_api_->is_initialized()) return {};
 
   const auto &all_replicaset_nodes =
-      cache_api_->lookup_replicaset(ha_replicaset_).instance_vector;
+      cache_api_->get_cluster_nodes().instance_vector;
 
   auto available = get_available_primaries(all_replicaset_nodes);
 
@@ -624,9 +620,7 @@
   if (!cache_api_->is_initialized()) return {};
 
   auto available =
-      get_available(
-          cache_api_->lookup_replicaset(ha_replicaset_).instance_vector)
-          .first;
+      get_available(cache_api_->get_cluster_nodes().instance_vector).first;
 
   AddrVector addresses;
   for (const auto &dest : available) {
@@ -677,7 +671,8 @@
 
 void DestMetadataCacheGroup::notify_instances_changed(
     const metadata_cache::LookupResult &instances,
-    const bool md_servers_reachable, const unsigned /*view_id*/) noexcept {
+    const metadata_cache::metadata_servers_list_t & /*metadata_servers*/,
+    const bool md_servers_reachable, const uint64_t /*view_id*/) noexcept {
   on_instances_change(instances, md_servers_reachable);
 }
 
diff -Nru mysql-8.0-8.0.26/router/src/routing/src/dest_metadata_cache.h mysql-8.0-8.0.27/router/src/routing/src/dest_metadata_cache.h
--- mysql-8.0-8.0.26/router/src/routing/src/dest_metadata_cache.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/routing/src/dest_metadata_cache.h	2021-09-28 11:46:34.000000000 +0000
@@ -38,7 +38,7 @@
 
 class DestMetadataCacheGroup final
     : public RouteDestination,
-      public metadata_cache::ReplicasetStateListenerInterface,
+      public metadata_cache::ClusterStateListenerInterface,
       public metadata_cache::AcceptorUpdateHandlerInterface {
  public:
   enum ServerRole { Primary, Secondary, PrimaryAndSecondary };
@@ -46,7 +46,6 @@
   /** @brief Constructor */
   DestMetadataCacheGroup(
       net::io_context &io_ctx_, const std::string &metadata_cache,
-      const std::string &replicaset,
       const routing::RoutingStrategy routing_strategy,
       const mysqlrouter::URIQuery &query, const Protocol::Type protocol,
       const routing::AccessMode access_mode = routing::AccessMode::kUndefined,
@@ -127,9 +126,6 @@
    */
   const std::string cache_name_;
 
-  /** @brief The HA Group which will be used for looking up managed servers */
-  const std::string ha_replicaset_;
-
   /** @brief Query part of the URI given as destination in the configuration
    *
    * For example, given following Metadata Cache configuration:
@@ -163,7 +159,7 @@
   /** @brief Gets available destinations from Metadata Cache
    *
    * This method gets the destinations using Metadata Cache information. It uses
-   * the `metadata_cache::lookup_replicaset()` function to get a list of current
+   * the `metadata_cache::get_cluster_nodes()` function to get a list of current
    * managed servers. Bool in the returned pair indicates if (in case of the
    * round-robin-with-fallback routing strategy) the returned nodes are the
    * primaries after the fallback (true), regular primaries (false) or
@@ -198,9 +194,11 @@
   void subscribe_for_metadata_cache_changes();
   void subscribe_for_acceptor_handler();
 
-  void notify_instances_changed(const metadata_cache::LookupResult &instances,
-                                const bool md_servers_reachable,
-                                const unsigned /*view_id*/) noexcept override;
+  void notify_instances_changed(
+      const metadata_cache::LookupResult &instances,
+      const metadata_cache::metadata_servers_list_t &metadata_servers,
+      const bool md_servers_reachable,
+      const uint64_t /*view_id*/) noexcept override;
 
   bool update_socket_acceptor_state(
       const metadata_cache::LookupResult &instances) noexcept override;
diff -Nru mysql-8.0-8.0.26/router/src/routing/src/dest_round_robin.cc mysql-8.0-8.0.27/router/src/routing/src/dest_round_robin.cc
--- mysql-8.0-8.0.26/router/src/routing/src/dest_round_robin.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/routing/src/dest_round_robin.cc	2021-09-28 11:46:34.000000000 +0000
@@ -291,10 +291,13 @@
       // If there are unquarantined destinations, listening router socket should
       // be open.
       quarantine_([this, &start_socket_acceptor_res](auto &q) {
-        if (q.size() < this->destinations().size() &&
-            this->start_router_socket_acceptor_callback_) {
-          start_socket_acceptor_res =
-              this->start_router_socket_acceptor_callback_();
+        if (q.size() < this->destinations().size()) {
+          std::lock_guard<std::mutex> lock(
+              socket_acceptor_handle_callbacks_mtx);
+          if (this->start_router_socket_acceptor_callback_) {
+            start_socket_acceptor_res =
+                this->start_router_socket_acceptor_callback_();
+          }
         }
       });
       // Temporize
diff -Nru mysql-8.0-8.0.26/router/src/routing/src/mysql_routing_base.h mysql-8.0-8.0.27/router/src/routing/src/mysql_routing_base.h
--- mysql-8.0-8.0.26/router/src/routing/src/mysql_routing_base.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/routing/src/mysql_routing_base.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,47 @@
+/*
+  Copyright (c) 2021, Oracle 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,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef ROUTING_MYSQL_ROUTING_BASE_INCLUDED
+#define ROUTING_MYSQL_ROUTING_BASE_INCLUDED
+
+#include "context.h"
+
+/** @class MySQLRoutingBase
+ *  @brief Facade to avoid a tight coupling between Routing component and
+ * actuall routing endpoint implementation. Allows replacing the routing
+ * endpoint with an alternative implementation.
+ */
+class MySQLRoutingBase {
+ public:
+  virtual MySQLRoutingContext &get_context() = 0;
+  virtual int get_max_connections() const noexcept = 0;
+  virtual std::vector<mysql_harness::TCPAddress> get_destinations() const = 0;
+  virtual std::vector<MySQLRoutingAPI::ConnData> get_connections() = 0;
+  virtual bool is_accepting_connections() const = 0;
+  virtual routing::RoutingStrategy get_routing_strategy() const = 0;
+  virtual routing::AccessMode get_mode() const = 0;
+  virtual ~MySQLRoutingBase() {}
+};
+
+#endif  // ROUTING_MYSQL_ROUTING_BASE_INCLUDED
diff -Nru mysql-8.0-8.0.26/router/src/routing/src/mysql_routing.cc mysql-8.0-8.0.27/router/src/routing/src/mysql_routing.cc
--- mysql-8.0-8.0.26/router/src/routing/src/mysql_routing.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/routing/src/mysql_routing.cc	2021-09-28 11:46:34.000000000 +0000
@@ -79,8 +79,6 @@
 
 static const int kListenQueueSize{1024};
 
-static const char *kDefaultReplicaSetName = "default";
-
 /**
  * encode a initial error-msg into a buffer.
  *
@@ -831,6 +829,7 @@
         return;
       }
 
+      auto &routing_component = MySQLRoutingComponent::get_instance();
       while (is_running(env_)) {
         typename client_protocol_type::endpoint client_endpoint;
         const int socket_flags {
@@ -925,7 +924,7 @@
                   r_->get_context().get_bind_named_socket().str().c_str(),
                   peer_pid, peer_uid);
             } else
-            // fall through
+            [[fallthrough]];
 #endif
               log_debug(
                   "[%s] fd=%d connection accepted at %s",
@@ -962,40 +961,61 @@
 
             // log_info("%s", msg.c_str());
             sock.close();
-          } else if (r_->get_context().info_active_routes_.load(
-                         std::memory_order_relaxed) >=
-                     r_->get_max_connections()) {
-            std::vector<uint8_t> error_frame;
-            const auto encode_res = encode_initial_error_packet(
-                r_->get_context().get_protocol(), error_frame, 1040,
-                "Too many connections to MySQL Router", "08004");
+          } else {
+            const auto current_total_connections =
+                routing_component.current_total_connections();
+            const auto max_total_connections =
+                routing_component.max_total_connections();
+
+            const bool max_route_connections_limit_reached =
+                r_->get_max_connections() > 0 &&
+                r_->get_context().info_active_routes_.load(
+                    std::memory_order_relaxed) >= r_->get_max_connections();
+            const bool max_total_connections_limit_reached =
+                current_total_connections >= max_total_connections;
+
+            if (max_route_connections_limit_reached ||
+                max_total_connections_limit_reached) {
+              std::vector<uint8_t> error_frame;
+              const auto encode_res = encode_initial_error_packet(
+                  r_->get_context().get_protocol(), error_frame, 1040,
+                  "Too many connections to MySQL Router", "08004");
 
-            if (!encode_res) {
-              log_debug("[%s] fd=%d encode error: %s",
-                        r_->get_context().get_name().c_str(),
-                        sock.native_handle(),
-                        encode_res.error().message().c_str());
-            } else {
-              auto write_res = net::write(sock, net::buffer(error_frame));
-              if (!write_res) {
-                log_debug("[%s] fd=%d write error: %s",
+              if (!encode_res) {
+                log_debug("[%s] fd=%d encode error: %s",
                           r_->get_context().get_name().c_str(),
                           sock.native_handle(),
-                          write_res.error().message().c_str());
+                          encode_res.error().message().c_str());
+              } else {
+                auto write_res = net::write(sock, net::buffer(error_frame));
+                if (!write_res) {
+                  log_debug("[%s] fd=%d write error: %s",
+                            r_->get_context().get_name().c_str(),
+                            sock.native_handle(),
+                            write_res.error().message().c_str());
+                }
               }
-            }
 
-            sock.close();  // no shutdown() before close()
+              sock.close();  // no shutdown() before close()
 
-            log_warning("[%s] reached max active connections (%d max=%d)",
-                        r_->get_context().get_name().c_str(),
-                        r_->get_context().info_active_routes_.load(),
-                        r_->get_max_connections());
-          } else {
-            Connector<client_protocol_type>(
-                r_, std::move(sock), client_endpoint, client_sock_container_,
-                server_sock_container_)
-                .async_run();
+              if (max_route_connections_limit_reached) {
+                log_warning(
+                    "[%s] reached max active connections for route (%d max=%d)",
+                    r_->get_context().get_name().c_str(),
+                    r_->get_context().info_active_routes_.load(),
+                    r_->get_max_connections());
+              } else {
+                log_warning("[%s] Total connections count=%" PRIu64
+                            " exceeds [DEFAULT].max_total_connections=%" PRIu64,
+                            r_->get_context().get_name().c_str(),
+                            current_total_connections, max_total_connections);
+              }
+            } else {
+              Connector<client_protocol_type>(
+                  r_, std::move(sock), client_endpoint, client_sock_container_,
+                  server_sock_container_)
+                  .async_run();
+            }
           }
         } else if (sock_res.error() ==
                    make_error_condition(std::errc::operation_would_block)) {
@@ -1091,7 +1111,7 @@
 
   if (!destinations()->empty() ||
       (routing_strategy_ == RoutingStrategy::kFirstAvailable &&
-       is_destination_standalone)) {
+       is_destination_standalone_)) {
     // For standalone destination with first-available strategy we always try
     // to open a listening socket, even if there are no destinations.
     auto res = start_accepting_connections(env);
@@ -1100,42 +1120,46 @@
     // allow for it to happen, in that case we pass that information to the
     // destination, socket acceptor state should be handled basend on the
     // destination type.
-    if (!is_destination_standalone) destination_->handle_sockets_acceptors();
+    if (!is_destination_standalone_) destination_->handle_sockets_acceptors();
     // If we failed to start accepting connections on startup then router
     // should fail.
     if (!res) return res.get_unexpected();
   }
   mysql_harness::on_service_ready(env);
 
-  auto allowed_nodes_changed =
-      [&](const AllowedNodes &existing_connections_nodes,
-          const AllowedNodes &new_connection_nodes, const bool disconnect,
-          const std::string &disconnect_reason) {
-        const std::string &port_str = get_port_str();
-
-        if (disconnect) {
-          log_info(
-              "Routing %s listening on %s got request to disconnect invalid "
-              "connections: %s",
-              context_.get_name().c_str(), port_str.c_str(),
-              disconnect_reason.c_str());
-
-          // handle allowed nodes changed for existing connections
+  auto allowed_nodes_changed = [&](const AllowedNodes
+                                       &existing_connections_nodes,
+                                   const AllowedNodes &new_connection_nodes,
+                                   const bool disconnect,
+                                   const std::string &disconnect_reason) {
+    const std::string &port_str = get_port_str();
+
+    if (disconnect) {
+      // handle allowed nodes changed for existing connections
+      const auto num_of_cons =
           connection_container_.disconnect(existing_connections_nodes);
-        }
 
-        if (!is_running(env)) return;
-        if (service_tcp_.is_open() && new_connection_nodes.empty()) {
-          stop_socket_acceptors();
-        } else if (!service_tcp_.is_open() && !new_connection_nodes.empty()) {
-          if (!start_accepting_connections(env)) {
-            // We could not start acceptor (e.g. the port is used by other app)
-            // In that case we should retry on the next md refresh with the
-            // latest instance information.
-            destination_->handle_sockets_acceptors();
-          }
-        }
-      };
+      if (num_of_cons > 0) {
+        log_info(
+            "Routing %s listening on %s got request to disconnect %u invalid "
+            "connections: %s",
+            context_.get_name().c_str(), port_str.c_str(), num_of_cons,
+            disconnect_reason.c_str());
+      }
+    }
+
+    if (!is_running(env)) return;
+    if (service_tcp_.is_open() && new_connection_nodes.empty()) {
+      stop_socket_acceptors();
+    } else if (!service_tcp_.is_open() && !new_connection_nodes.empty()) {
+      if (!start_accepting_connections(env)) {
+        // We could not start acceptor (e.g. the port is used by other app)
+        // In that case we should retry on the next md refresh with the
+        // latest instance information.
+        destination_->handle_sockets_acceptors();
+      }
+    }
+  };
 
   allowed_nodes_list_iterator_ =
       destination_->register_allowed_nodes_change_callback(
@@ -1450,13 +1474,13 @@
   if (uri.scheme == "metadata-cache") {
     // Syntax:
     // metadata_cache://[<metadata_cache_key(unused)>]/<replicaset_name>?role=PRIMARY|SECONDARY|PRIMARY_AND_SECONDARY
-    std::string replicaset_name = kDefaultReplicaSetName;
+    //    std::string replicaset_name = kDefaultReplicaSetName;
 
-    if (uri.path.size() > 0 && !uri.path[0].empty())
-      replicaset_name = uri.path[0];
+    //    if (uri.path.size() > 0 && !uri.path[0].empty())
+    //      replicaset_name = uri.path[0];
 
     destination_ = std::make_unique<DestMetadataCacheGroup>(
-        io_ctx_, uri.host, replicaset_name, routing_strategy_, uri.query,
+        io_ctx_, uri.host, routing_strategy_, uri.query,
         context_.get_protocol(), access_mode_);
   } else {
     throw std::runtime_error(string_format(
@@ -1512,7 +1536,7 @@
     routing_strategy_ = get_default_routing_strategy(access_mode_);
   }
 
-  is_destination_standalone = true;
+  is_destination_standalone_ = true;
   destination_ = create_standalone_destination(
       io_ctx_, routing_strategy_, context_.get_protocol(),
       context_.get_thread_stack_size());
@@ -1563,7 +1587,7 @@
 }
 
 int MySQLRouting::set_max_connections(int maximum) {
-  if (maximum <= 0 || maximum > static_cast<int>(UINT16_MAX)) {
+  if (maximum < 0 || maximum > static_cast<int>(UINT16_MAX)) {
     auto err = string_format(
         "[%s] tried to set max_connections using invalid value, was '%d'",
         context_.get_name().c_str(), maximum);
diff -Nru mysql-8.0-8.0.26/router/src/routing/src/mysql_routing.h mysql-8.0-8.0.27/router/src/routing/src/mysql_routing.h
--- mysql-8.0-8.0.26/router/src/routing/src/mysql_routing.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/routing/src/mysql_routing.h	2021-09-28 11:46:34.000000000 +0000
@@ -66,12 +66,14 @@
 #include "mysql/harness/plugin.h"
 #include "mysql/harness/stdx/monitor.h"
 #include "mysql_router_thread.h"
+#include "mysql_routing_base.h"
 #include "mysqlrouter/routing.h"
 #include "mysqlrouter/routing_export.h"
 #include "mysqlrouter/uri.h"
 #include "plugin_config.h"
 #include "protocol/base_protocol.h"
 #include "router_config.h"
+#include "socket_container.h"
 #include "ssl_mode.h"
 #include "tcp_address.h"
 
@@ -79,124 +81,12 @@
 class PluginFuncEnv;
 }
 
-/**
- * container of sockets.
- *
- * allows to disconnect all of them.
- *
- * thread-safe.
- */
-template <class Protocol>
-class SocketContainer {
-  using protocol_type = Protocol;
-  using socket_type = typename protocol_type::socket;
-
-  // as a ref will get returned, the socket_type' object needs a stable address.
-  // - std::list<socket_type> provide that.
-  // - std::vector<std::unique_ptr<socket_type>> should work too.
-  using container_type = std::list<socket_type>;
-
- public:
-  /**
-   * move ownership of socket_type to the container.
-   *
-   * @return a ref to the stored socket.
-   */
-  socket_type &push_back(socket_type &&sock) {
-    std::lock_guard<std::mutex> lk(mtx_);
-
-    sockets_.push_back(std::move(sock));
-
-    return sockets_.back();
-  }
-
-  /**
-   * move ownership of socket_type to the container.
-   *
-   * @return a ref to the stored socket.
-   */
-  template <class... Args>
-  socket_type &emplace_back(Args &&... args) {
-    std::lock_guard<std::mutex> lk(mtx_);
-
-    sockets_.emplace_back(std::forward<Args>(args)...);
-
-    return sockets_.back();
-  }
-
-  /**
-   * release socket from container.
-   *
-   * moves ownership of the socket to the caller.
-   *
-   * @return socket
-   */
-  socket_type release(socket_type &client_sock) {
-    std::lock_guard<std::mutex> lk(mtx_);
-
-    return release_unlocked(client_sock);
-  }
-
-  socket_type release_unlocked(socket_type &client_sock) {
-    for (auto cur = sockets_.begin(); cur != sockets_.end(); ++cur) {
-      if (cur->native_handle() == client_sock.native_handle()) {
-        auto sock = std::move(*cur);
-        sockets_.erase(cur);
-        return sock;
-      }
-    }
-
-    // not found.
-    return socket_type{client_sock.get_executor().context()};
-  }
-
-  template <class F>
-  auto run(F &&f) {
-    std::lock_guard<std::mutex> lk(mtx_);
-
-    return f();
-  }
-
-  /**
-   * disconnect all sockets.
-   */
-
-  void disconnect_all() {
-    std::lock_guard<std::mutex> lk(mtx_);
-
-    for (auto &sock : sockets_) {
-      sock.cancel();
-    }
-  }
-
-  /**
-   * check if the container is empty.
-   */
-  bool empty() const {
-    std::lock_guard<std::mutex> lk(mtx_);
-    return sockets_.empty();
-  }
-
-  /**
-   * get size of container.
-   */
-  size_t size() const {
-    std::lock_guard<std::mutex> lk(mtx_);
-    return sockets_.size();
-  }
-
- private:
-  container_type sockets_;
-
-  mutable std::mutex mtx_;
-};
-
 using mysqlrouter::URI;
 using std::string;
 
 struct Nothing {};
 
-/** @class MySQLRouter
+/** @class MySQLRouting
  *  @brief Manage Connections from clients to MySQL servers
  *
  *  The class MySQLRouter is used to start a service listening on a particular
@@ -227,7 +117,7 @@
  *  use 10.0.11.6 to setup the connection routing.
  *
  */
-class MySQLRouting {
+class MySQLRouting : public MySQLRoutingBase {
  public:
   /** @brief Default constructor
    *
@@ -333,7 +223,7 @@
    *
    * @return Maximum as int
    */
-  int get_max_connections() const noexcept { return max_connections_; }
+  int get_max_connections() const noexcept override { return max_connections_; }
 
   /**
    * create new connection to MySQL Server than can handle client's
@@ -353,13 +243,13 @@
       typename ServerProtocol::socket server_socket,
       const typename ServerProtocol::endpoint &server_endpoint);
 
-  routing::RoutingStrategy get_routing_strategy() const;
+  routing::RoutingStrategy get_routing_strategy() const override;
 
-  routing::AccessMode get_mode() const;
+  routing::AccessMode get_mode() const override;
 
-  std::vector<mysql_harness::TCPAddress> get_destinations() const;
+  std::vector<mysql_harness::TCPAddress> get_destinations() const override;
 
-  std::vector<MySQLRoutingAPI::ConnData> get_connections();
+  std::vector<MySQLRoutingAPI::ConnData> get_connections() override;
 
   RouteDestination *destinations() { return destination_.get(); }
 
@@ -377,7 +267,7 @@
    *
    * @retval true if we are accepting connections, false otherwise
    */
-  bool is_accepting_connections() const;
+  bool is_accepting_connections() const override;
 
  private:
   /**
@@ -421,7 +311,7 @@
       mysql_harness::PluginFuncEnv *env);
 
  public:
-  MySQLRoutingContext &get_context() { return context_; }
+  MySQLRoutingContext &get_context() override { return context_; }
 
  private:
   /** Monitor for notifying socket acceptor */
@@ -435,7 +325,7 @@
   /** @brief Destination object to use when getting next connection */
   std::unique_ptr<RouteDestination> destination_;
 
-  bool is_destination_standalone{false};
+  bool is_destination_standalone_{false};
 
   /** @brief Routing strategy to use when getting next destination */
   routing::RoutingStrategy routing_strategy_;
diff -Nru mysql-8.0-8.0.26/router/src/routing/src/plugin_config.cc mysql-8.0-8.0.27/router/src/routing/src/plugin_config.cc
--- mysql-8.0-8.0.26/router/src/routing/src/plugin_config.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/routing/src/plugin_config.cc	2021-09-28 11:46:34.000000000 +0000
@@ -26,6 +26,7 @@
 
 #include <algorithm>  // transform
 #include <array>
+#include <cinttypes>
 #include <initializer_list>
 #include <stdexcept>  // invalid_argument
 #include <string>
@@ -35,15 +36,18 @@
 #include "hostname_validator.h"
 #include "mysql/harness/config_option.h"
 #include "mysql/harness/config_parser.h"
+#include "mysql/harness/logging/logging.h"
 #include "mysql/harness/string_utils.h"  // trim
 #include "mysql_router_thread.h"         // kDefaultStackSizeInKiloByte
 #include "mysqlrouter/routing.h"         // AccessMode
+#include "mysqlrouter/routing_component.h"
 #include "mysqlrouter/uri.h"
 #include "mysqlrouter/utils.h"  // is_valid_socket_name
 #include "ssl_mode.h"
 #include "tcp_address.h"
 
-using namespace stdx::string_view_literals;
+using namespace std::string_view_literals;
+IMPORT_LOG_FUNCTIONS()
 
 static std::string get_log_prefix(const mysql_harness::ConfigSection *section,
                                   const mysql_harness::ConfigOption &option) {
@@ -429,6 +433,26 @@
   return res.value();
 }
 
+uint16_t get_option_max_connections(
+    const mysql_harness::ConfigSection *section) {
+  const auto result = get_uint_option<uint16_t>(
+      section, mysql_harness::ConfigOption(
+                   "max_connections"sv,
+                   std::to_string(routing::kDefaultMaxConnections)));
+
+  auto &routing_component = MySQLRoutingComponent::get_instance();
+
+  if (result != routing::kDefaultMaxConnections &&
+      result > routing_component.max_total_connections()) {
+    log_warning(
+        "Value configured for max_connections > max_total_connections (%u "
+        "> %" PRIu64 "). Will have no effect.",
+        result, routing_component.max_total_connections());
+  }
+
+  return result;
+}
+
 /** @brief Constructor
  *
  * @param section from configuration file provided as ConfigSection
@@ -437,47 +461,42 @@
     const mysql_harness::ConfigSection *section)
     : metadata_cache_(false),
       protocol(
-          get_protocol(section, mysql_harness::ConfigOption("protocol"_sv))),
+          get_protocol(section, mysql_harness::ConfigOption("protocol"sv))),
       destinations(get_option_destinations(
-          section, mysql_harness::ConfigOption("destinations"_sv), protocol,
+          section, mysql_harness::ConfigOption("destinations"sv), protocol,
           metadata_cache_)),
       bind_port(get_option_tcp_port(
-          section, mysql_harness::ConfigOption("bind_port"_sv, ""_sv))),
+          section, mysql_harness::ConfigOption("bind_port"sv, ""sv))),
       bind_address(get_option_tcp_address(
           section,
-          mysql_harness::ConfigOption("bind_address"_sv,
+          mysql_harness::ConfigOption("bind_address"sv,
                                       routing::kDefaultBindAddress),
           false, bind_port)),
       named_socket(get_option_named_socket(
-          section, mysql_harness::ConfigOption("socket"_sv, ""_sv))),
+          section, mysql_harness::ConfigOption("socket"sv, ""sv))),
       connect_timeout(get_uint_option<uint16_t>(
           section,
           mysql_harness::ConfigOption(
-              "connect_timeout"_sv,
+              "connect_timeout"sv,
               std::to_string(std::chrono::duration_cast<std::chrono::seconds>(
                                  routing::kDefaultDestinationConnectionTimeout)
                                  .count())),
           1)),
-      mode(get_option_mode(section, mysql_harness::ConfigOption("mode"_sv))),
+      mode(get_option_mode(section, mysql_harness::ConfigOption("mode"sv))),
       routing_strategy(get_option_routing_strategy(
-          section, mysql_harness::ConfigOption("routing_strategy"_sv), mode,
+          section, mysql_harness::ConfigOption("routing_strategy"sv), mode,
           metadata_cache_)),
-      max_connections(get_uint_option<uint16_t>(
-          section,
-          mysql_harness::ConfigOption(
-              "max_connections"_sv,
-              std::to_string(routing::kDefaultMaxConnections)),
-          1)),
+      max_connections(get_option_max_connections(section)),
       max_connect_errors(get_uint_option<uint32_t>(
           section,
           mysql_harness::ConfigOption(
-              "max_connect_errors"_sv,
+              "max_connect_errors"sv,
               std::to_string(routing::kDefaultMaxConnectErrors)),
           1, UINT32_MAX)),
       client_connect_timeout(get_uint_option<uint32_t>(
           section,
           mysql_harness::ConfigOption(
-              "client_connect_timeout"_sv,
+              "client_connect_timeout"sv,
               std::to_string(std::chrono::duration_cast<std::chrono::seconds>(
                                  routing::kDefaultClientConnectTimeout)
                                  .count())),
@@ -485,54 +504,52 @@
       net_buffer_length(get_uint_option<uint32_t>(
           section,
           mysql_harness::ConfigOption(
-              "net_buffer_length"_sv,
+              "net_buffer_length"sv,
               std::to_string(routing::kDefaultNetBufferLength)),
           1024, 1048576)),
       thread_stack_size(get_uint_option<uint32_t>(
           section,
           mysql_harness::ConfigOption(
-              "thread_stack_size"_sv,
+              "thread_stack_size"sv,
               std::to_string(mysql_harness::kDefaultStackSizeInKiloBytes)),
           1, 65535)),
       source_ssl_mode{get_option_ssl_mode(
-          section, mysql_harness::ConfigOption("client_ssl_mode"_sv, ""_sv),
+          section, mysql_harness::ConfigOption("client_ssl_mode"sv, ""sv),
           {SslMode::kDisabled, SslMode::kPreferred, SslMode::kRequired,
            SslMode::kPassthrough, SslMode::kDefault})},
       source_ssl_cert{get_option_string(
-          section, mysql_harness::ConfigOption("client_ssl_cert"_sv, ""_sv))},
+          section, mysql_harness::ConfigOption("client_ssl_cert"sv, ""sv))},
       source_ssl_key{get_option_string(
-          section, mysql_harness::ConfigOption("client_ssl_key"_sv, ""_sv))},
+          section, mysql_harness::ConfigOption("client_ssl_key"sv, ""sv))},
       source_ssl_cipher{get_option_string(
-          section, mysql_harness::ConfigOption("client_ssl_cipher"_sv, ""_sv))},
+          section, mysql_harness::ConfigOption("client_ssl_cipher"sv, ""sv))},
       source_ssl_curves{get_option_string(
-          section, mysql_harness::ConfigOption("client_ssl_curves"_sv, ""_sv))},
+          section, mysql_harness::ConfigOption("client_ssl_curves"sv, ""sv))},
       source_ssl_dh_params{get_option_string(
           section,
-          mysql_harness::ConfigOption("client_ssl_dh_params"_sv, ""_sv))},
+          mysql_harness::ConfigOption("client_ssl_dh_params"sv, ""sv))},
       dest_ssl_mode{get_option_ssl_mode(
           section,
-          mysql_harness::ConfigOption("server_ssl_mode"_sv, "as_client"_sv),
+          mysql_harness::ConfigOption("server_ssl_mode"sv, "as_client"sv),
           {SslMode::kDisabled, SslMode::kPreferred, SslMode::kRequired,
            SslMode::kAsClient})},
       dest_ssl_verify{get_option_ssl_verify(
           section,
-          mysql_harness::ConfigOption("server_ssl_verify"_sv, "disabled"_sv),
+          mysql_harness::ConfigOption("server_ssl_verify"sv, "disabled"sv),
           {SslVerify::kDisabled, SslVerify::kVerifyCa,
            SslVerify::kVerifyIdentity})},
       dest_ssl_cipher{get_option_string(
-          section, mysql_harness::ConfigOption("server_ssl_cipher"_sv, ""_sv))},
+          section, mysql_harness::ConfigOption("server_ssl_cipher"sv, ""sv))},
       dest_ssl_ca_file{get_option_string(
-          section, mysql_harness::ConfigOption("server_ssl_ca"_sv, ""_sv))},
+          section, mysql_harness::ConfigOption("server_ssl_ca"sv, ""sv))},
       dest_ssl_ca_dir{get_option_string(
-          section, mysql_harness::ConfigOption("server_ssl_capath"_sv, ""_sv))},
+          section, mysql_harness::ConfigOption("server_ssl_capath"sv, ""sv))},
       dest_ssl_crl_file{get_option_string(
-          section, mysql_harness::ConfigOption("server_ssl_crl"_sv, ""_sv))},
+          section, mysql_harness::ConfigOption("server_ssl_crl"sv, ""sv))},
       dest_ssl_crl_dir{get_option_string(
-          section,
-          mysql_harness::ConfigOption("server_ssl_crlpath"_sv, ""_sv))},
+          section, mysql_harness::ConfigOption("server_ssl_crlpath"sv, ""sv))},
       dest_ssl_curves{get_option_string(
-          section,
-          mysql_harness::ConfigOption("server_ssl_curves"_sv, ""_sv))} {
+          section, mysql_harness::ConfigOption("server_ssl_curves"sv, ""sv))} {
   using namespace std::string_literals;
 
   // either bind_address or socket needs to be set, or both
diff -Nru mysql-8.0-8.0.26/router/src/routing/src/routing.cc mysql-8.0-8.0.27/router/src/routing/src/routing.cc
--- mysql-8.0-8.0.26/router/src/routing/src/routing.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/routing/src/routing.cc	2021-09-28 11:46:34.000000000 +0000
@@ -48,8 +48,8 @@
 
 namespace routing {
 
-const int kDefaultWaitTimeout = 0;  // 0 = no timeout used
-const int kDefaultMaxConnections = 512;
+const int kDefaultWaitTimeout = 0;     // 0 = no timeout used
+const int kDefaultMaxConnections = 0;  // 0 = no limit per route is the default
 const std::chrono::seconds kDefaultDestinationConnectionTimeout{1};
 const std::string kDefaultBindAddress = "127.0.0.1";
 const unsigned int kDefaultNetBufferLength =
diff -Nru mysql-8.0-8.0.26/router/src/routing/src/routing_component.cc mysql-8.0-8.0.27/router/src/routing/src/routing_component.cc
--- mysql-8.0-8.0.26/router/src/routing/src/routing_component.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/routing/src/routing_component.cc	2021-09-28 11:46:34.000000000 +0000
@@ -23,15 +23,18 @@
 */
 
 #include "mysqlrouter/routing_component.h"
+#include "mysql/harness/config_option.h"
 
 #include <cstring>
 
-#include "mysql_routing.h"
+#include "mysql_routing_base.h"
 #include "mysqlrouter/routing.h"
 
 #include <algorithm>
 #include <iostream>
 
+using namespace std::string_literals;
+
 int MySQLRoutingAPI::get_max_connections() const {
   return r_->get_max_connections();
 }
@@ -117,7 +120,7 @@
 }
 
 void MySQLRoutingComponent::init(const std::string &name,
-                                 std::shared_ptr<MySQLRouting> srv) {
+                                 std::shared_ptr<MySQLRoutingBase> srv) {
   std::lock_guard<std::mutex> lock(routes_mu_);
 
   routes_.emplace(name, std::move(srv));
@@ -139,6 +142,21 @@
   return names;
 }
 
+uint64_t MySQLRoutingComponent::current_total_connections() {
+  uint64_t result{};
+
+  std::lock_guard<std::mutex> lock(routes_mu_);
+
+  for (const auto &el : routes_) {
+    if (auto r = el.second.lock()) {
+      result +=
+          r->get_context().info_active_routes_.load(std::memory_order_relaxed);
+    }
+  }
+
+  return result;
+}
+
 MySQLRoutingAPI MySQLRoutingComponent::api(const std::string &name) {
   std::lock_guard<std::mutex> lock(routes_mu_);
 
@@ -154,3 +172,26 @@
     return {};
   }
 }
+
+static uint64_t get_uint64_config(const mysql_harness::Config &config,
+                                  const std::string &option, uint64_t min_value,
+                                  uint64_t max_value, uint64_t default_val) {
+  std::string conf_str;
+  try {
+    conf_str = config.get_default(option);
+  } catch (const mysql_harness::bad_option &) {
+  }
+
+  if (!conf_str.empty()) {
+    return mysql_harness::option_as_uint<uint64_t>(
+        conf_str, "[DEFAULT]."s + option, min_value, max_value);
+  }
+
+  return default_val;
+}
+
+void MySQLRoutingComponent::init(const mysql_harness::Config &config) {
+  max_total_connections_ = get_uint64_config(
+      config, "max_total_connections", 1, std::numeric_limits<int64_t>::max(),
+      kDefaultMaxTotalConnections);
+}
\ No newline at end of file
diff -Nru mysql-8.0-8.0.26/router/src/routing/src/routing_plugin.cc mysql-8.0-8.0.27/router/src/routing/src/routing_plugin.cc
--- mysql-8.0-8.0.26/router/src/routing/src/routing_plugin.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/routing/src/routing_plugin.cc	2021-09-28 11:46:34.000000000 +0000
@@ -42,6 +42,7 @@
 #include "mysqlrouter/io_component.h"
 #include "mysqlrouter/routing_component.h"
 #include "mysqlrouter/routing_export.h"  // ROUTING_EXPORT
+#include "mysqlrouter/utils.h"           // string_format
 #include "plugin_config.h"
 #include "ssl_mode.h"
 
@@ -138,6 +139,7 @@
 
   try {
     if (info->config != nullptr) {
+      MySQLRoutingComponent::get_instance().init(*info->config);
       bool have_metadata_cache = false;
       bool need_metadata_cache = false;
       std::vector<mysql_harness::TCPAddress> bind_addresses;
@@ -207,18 +209,14 @@
     }
     g_app_info = info;
   } catch (const std::invalid_argument &exc) {
-    log_error("%s", exc.what());  // TODO remove after Loader starts logging
     set_error(env, mysql_harness::kConfigInvalidArgument, "%s", exc.what());
 
     io_context_work_guards.clear();
   } catch (const std::exception &exc) {
-    log_error("%s", exc.what());  // TODO remove after Loader starts logging
     set_error(env, mysql_harness::kRuntimeError, "%s", exc.what());
 
     io_context_work_guards.clear();
   } catch (...) {
-    log_error(
-        "Unexpected exception");  // TODO remove after Loader starts logging
     set_error(env, mysql_harness::kUndefinedError, "Unexpected exception");
 
     io_context_work_guards.clear();
@@ -301,8 +299,7 @@
         } else {
           throw std::invalid_argument(
               "setting client_ssl_curves is not supported by the ssl library, "
-              "it "
-              "should stay unset");
+              "it should stay unset");
         }
       }
 
@@ -424,16 +421,11 @@
     MySQLRoutingComponent::get_instance().init(section->key, r);
     r->start(env);
   } catch (const std::invalid_argument &exc) {
-    log_error("%s", exc.what());  // TODO remove after Loader starts logging
     set_error(env, mysql_harness::kConfigInvalidArgument, "%s", exc.what());
   } catch (const std::runtime_error &exc) {
-    log_error("%s: %s", name.c_str(),
-              exc.what());  // TODO remove after Loader starts logging
     set_error(env, mysql_harness::kRuntimeError, "%s: %s", name.c_str(),
               exc.what());
   } catch (...) {
-    log_error(
-        "Unexpected exception");  // TODO remove after Loader starts logging
     set_error(env, mysql_harness::kUndefinedError, "Unexpected exception");
   }
 
diff -Nru mysql-8.0-8.0.26/router/src/routing/src/socket_container.h mysql-8.0-8.0.27/router/src/routing/src/socket_container.h
--- mysql-8.0-8.0.26/router/src/routing/src/socket_container.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/routing/src/socket_container.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,143 @@
+/*
+  Copyright (c) 2021, Oracle 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,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef ROUTING_SOCKETCONTAINER_INCLUDED
+#define ROUTING_SOCKETCONTAINER_INCLUDED
+
+#include <mutex>
+#include <vector>
+
+/**
+ * container of sockets.
+ *
+ * allows to disconnect all of them.
+ *
+ * thread-safe.
+ */
+template <class Protocol>
+class SocketContainer {
+ public:
+  using protocol_type = Protocol;
+  using socket_type = typename protocol_type::socket;
+
+  // as a ref will get returned, the socket_type' object needs a stable address.
+  // - std::list<socket_type> provide that.
+  // - std::vector<std::unique_ptr<socket_type>> should work too.
+  using container_type = std::list<socket_type>;
+
+  /**
+   * move ownership of socket_type to the container.
+   *
+   * @return a ref to the stored socket.
+   */
+  socket_type &push_back(socket_type &&sock) {
+    std::lock_guard<std::mutex> lk(mtx_);
+
+    sockets_.push_back(std::move(sock));
+
+    return sockets_.back();
+  }
+
+  /**
+   * move ownership of socket_type to the container.
+   *
+   * @return a ref to the stored socket.
+   */
+  template <class... Args>
+  socket_type &emplace_back(Args &&... args) {
+    std::lock_guard<std::mutex> lk(mtx_);
+
+    sockets_.emplace_back(std::forward<Args>(args)...);
+
+    return sockets_.back();
+  }
+
+  /**
+   * release socket from container.
+   *
+   * moves ownership of the socket to the caller.
+   *
+   * @return socket
+   */
+  socket_type release(socket_type &client_sock) {
+    std::lock_guard<std::mutex> lk(mtx_);
+
+    return release_unlocked(client_sock);
+  }
+
+  socket_type release_unlocked(socket_type &client_sock) {
+    for (auto cur = sockets_.begin(); cur != sockets_.end(); ++cur) {
+      if (cur->native_handle() == client_sock.native_handle()) {
+        auto sock = std::move(*cur);
+        sockets_.erase(cur);
+        return sock;
+      }
+    }
+
+    // not found.
+    return socket_type{client_sock.get_executor().context()};
+  }
+
+  template <class F>
+  auto run(F &&f) {
+    std::lock_guard<std::mutex> lk(mtx_);
+
+    return f();
+  }
+
+  /**
+   * disconnect all sockets.
+   */
+
+  void disconnect_all() {
+    std::lock_guard<std::mutex> lk(mtx_);
+
+    for (auto &sock : sockets_) {
+      sock.cancel();
+    }
+  }
+
+  /**
+   * check if the container is empty.
+   */
+  bool empty() const {
+    std::lock_guard<std::mutex> lk(mtx_);
+    return sockets_.empty();
+  }
+
+  /**
+   * get size of container.
+   */
+  size_t size() const {
+    std::lock_guard<std::mutex> lk(mtx_);
+    return sockets_.size();
+  }
+
+ private:
+  container_type sockets_;
+
+  mutable std::mutex mtx_;
+};
+
+#endif
diff -Nru mysql-8.0-8.0.26/router/src/routing/src/x_protocol_splicer.cc mysql-8.0-8.0.27/router/src/routing/src/x_protocol_splicer.cc
--- mysql-8.0-8.0.26/router/src/routing/src/x_protocol_splicer.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/routing/src/x_protocol_splicer.cc	2021-09-28 11:46:34.000000000 +0000
@@ -829,9 +829,10 @@
                     xproto_server_message_to_string(message_type));
 #endif
 
-          if (message_type == Mysqlx::ServerMessages::OK ||
-              message_type == Mysqlx::ServerMessages::ERROR ||
-              message_type == Mysqlx::ServerMessages::SESS_AUTHENTICATE_OK) {
+          if (!xproto_client_msg_type_.empty() &&
+              (message_type == Mysqlx::ServerMessages::OK ||
+               message_type == Mysqlx::ServerMessages::ERROR ||
+               message_type == Mysqlx::ServerMessages::SESS_AUTHENTICATE_OK)) {
             const uint8_t client_message_type = xproto_client_msg_type_[0];
             // client command is finished, remove it from the FIFO.
             xproto_client_msg_type_.erase(xproto_client_msg_type_.begin());
diff -Nru mysql-8.0-8.0.26/router/src/routing/tests/CMakeLists.txt mysql-8.0-8.0.27/router/src/routing/tests/CMakeLists.txt
--- mysql-8.0-8.0.26/router/src/routing/tests/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/routing/tests/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -80,10 +80,6 @@
   test_setup_named_socket_service.cc
   test_setup_tcp_service.cc
   )
-# This compiler fails to handle some of the mock functions involved.
-IF(MY_COMPILER_IS_SUNPRO)
-  LIST(REMOVE_ITEM test_files test_connection.cc)
-ENDIF()
 
 FOREACH(test_file ${test_files})
   add_test_file(${CMAKE_CURRENT_SOURCE_DIR}/${test_file}
diff -Nru mysql-8.0-8.0.26/router/src/routing/tests/issues/test_bug21873666.cc mysql-8.0-8.0.27/router/src/routing/tests/issues/test_bug21873666.cc
--- mysql-8.0-8.0.26/router/src/routing/tests/issues/test_bug21873666.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/routing/tests/issues/test_bug21873666.cc	2021-09-28 11:46:34.000000000 +0000
@@ -39,7 +39,6 @@
 #include "mysqlrouter/routing.h"
 #include "plugin_config.h"
 
-using mysqlrouter::to_string;
 using ::testing::HasSubstr;
 
 class Bug21771595 : public ::testing::Test {
@@ -58,7 +57,7 @@
 }
 
 TEST_F(Bug21771595, Constructor) {
-  auto expect_max_connections = routing::kDefaultMaxConnections - 10;
+  auto expect_max_connections = 20;
   auto expect_connect_timeout =
       routing::kDefaultDestinationConnectionTimeout + std::chrono::seconds(10);
 
@@ -114,17 +113,18 @@
   ASSERT_THROW(r.set_max_connections(-1), std::invalid_argument);
   ASSERT_THROW(r.set_max_connections(UINT16_MAX + 1), std::invalid_argument);
   try {
-    r.set_max_connections(0);
+    r.set_max_connections(-1);
   } catch (const std::invalid_argument &exc) {
     ASSERT_THAT(
         exc.what(),
-        HasSubstr("tried to set max_connections using invalid value, was '0'"));
+        HasSubstr(
+            "tried to set max_connections using invalid value, was '-1'"));
   }
   ASSERT_THROW(
       MySQLRouting(io_ctx_, routing::RoutingStrategy::kRoundRobin, 7001,
                    Protocol::Type::kClassicProtocol,
                    routing::AccessMode::kReadWrite, "127.0.0.1",
-                   mysql_harness::Path(), "test", 0, std::chrono::seconds(1)),
+                   mysql_harness::Path(), "test", -1, std::chrono::seconds(1)),
       std::invalid_argument);
 }
 
diff -Nru mysql-8.0-8.0.26/router/src/routing/tests/issues/test_bug21962350.cc mysql-8.0-8.0.27/router/src/routing/tests/issues/test_bug21962350.cc
--- mysql-8.0-8.0.26/router/src/routing/tests/issues/test_bug21962350.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/routing/tests/issues/test_bug21962350.cc	2021-09-28 11:46:34.000000000 +0000
@@ -56,7 +56,6 @@
 #include "mysql/harness/logging/registry.h"
 #include "mysql/harness/net_ts/io_context.h"
 #include "mysql/harness/stdx/expected.h"
-#include "mysql/harness/stdx/type_traits.h"
 #include "mysqlrouter/routing.h"
 #include "protocol/protocol.h"
 #include "tcp_address.h"
@@ -188,7 +187,7 @@
     ai->ai_addr = reinterpret_cast<sockaddr *>(addr_in);
     ai->ai_addrlen = sizeof(sockaddr_in);
 
-    return {stdx::in_place, ai, mock_free_addrinfo};
+    return {std::in_place, ai, mock_free_addrinfo};
   };
 
   EXPECT_CALL(*sock_service, getaddrinfo(_, _, _))
diff -Nru mysql-8.0-8.0.26/router/src/routing/tests/test_metadata_cache_group.cc mysql-8.0-8.0.27/router/src/routing/tests/test_metadata_cache_group.cc
--- mysql-8.0-8.0.26/router/src/routing/tests/test_metadata_cache_group.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/routing/tests/test_metadata_cache_group.cc	2021-09-28 11:46:34.000000000 +0000
@@ -73,29 +73,24 @@
 
 class MetadataCacheAPIStub : public metadata_cache::MetadataCacheAPIBase {
  public:
-  LookupResult lookup_replicaset(
-      const std::string & /* replicaset_name */) override {
+  LookupResult get_cluster_nodes() override {
     return LookupResult(instance_vector_);
   }
 
   void add_state_listener(
-      const std::string &,
-      metadata_cache::ReplicasetStateListenerInterface *listener) override {
+      metadata_cache::ClusterStateListenerInterface *listener) override {
     instances_change_listener_ = listener;
   }
 
   void remove_state_listener(
-      const std::string &,
-      metadata_cache::ReplicasetStateListenerInterface *) override {
+      metadata_cache::ClusterStateListenerInterface *) override {
     instances_change_listener_ = nullptr;
   }
 
-  MOCK_METHOD2(add_acceptor_handler_listener,
-               void(const std::string &,
-                    metadata_cache::AcceptorUpdateHandlerInterface *));
-  MOCK_METHOD2(remove_acceptor_handler_listener,
-               void(const std::string &,
-                    metadata_cache::AcceptorUpdateHandlerInterface *));
+  MOCK_METHOD1(add_acceptor_handler_listener,
+               void(metadata_cache::AcceptorUpdateHandlerInterface *));
+  MOCK_METHOD1(remove_acceptor_handler_listener,
+               void(metadata_cache::AcceptorUpdateHandlerInterface *));
 
   MOCK_METHOD0(enable_fetch_auth_metadata, void());
   MOCK_METHOD0(force_cache_update, void());
@@ -108,9 +103,8 @@
 
   MOCK_METHOD2(mark_instance_reachability,
                void(const std::string &, InstanceStatus));
-  MOCK_METHOD3(wait_primary_failover,
-               bool(const std::string &, const std::string &,
-                    const std::chrono::seconds &));
+  MOCK_METHOD2(wait_primary_failover,
+               bool(const std::string &, const std::chrono::seconds &));
 
   MOCK_METHOD0(handle_sockets_acceptors_on_md_refresh, void());
 
@@ -118,18 +112,18 @@
   void cache_init(
       const mysqlrouter::ClusterType /*cluster_type*/, unsigned /*router_id*/,
       const std::string & /*group_replication_id*/,
+      const std::string & /*clusterset_id*/,
       const std::vector<mysql_harness::TCPAddress> & /*metadata_servers*/,
-      const mysqlrouter::UserCredentials & /*user_credentials*/,
-      std::chrono::milliseconds /*ttl*/,
-      std::chrono::milliseconds /*auth_cache_ttl*/,
-      std::chrono::milliseconds /*auth_cache_refresh_interval*/,
+      const metadata_cache::MetadataCacheTTLConfig & /*ttl_config*/,
       const mysqlrouter::SSLOptions & /*ssl_options*/,
-      const std::string & /*cluster_name*/, int /*connect_timeout*/,
-      int /*read_timeout*/,
+      const mysqlrouter::TargetCluster & /*target_cluster*/,
+      const metadata_cache::MetadataCacheMySQLSessionConfig
+          & /*session_config*/,
+      const metadata_cache::RouterAttributes &,
       size_t /*thread_stack_size*/ =
           mysql_harness::kDefaultStackSizeInKiloBytes,
       bool /*use_gr_notifications*/ = false,
-      unsigned /*cluster_id*/ = 0) override {}
+      uint64_t /*view_id*/ = 0) override {}
 
   mysqlrouter::ClusterType cluster_type() const override {
     return mysqlrouter::ClusterType::GR_V1;
@@ -143,7 +137,9 @@
   void instance_name(const std::string &) override {}
   std::string instance_name() const override { return "foo"; }
   std::string cluster_type_specific_id() const override { return "foo"; }
-  std::string cluster_name() const override { return "foo"; }
+  mysqlrouter::TargetCluster target_cluster() const override {
+    return {mysqlrouter::TargetCluster::TargetType::ByName, "foo"};
+  }
   std::chrono::milliseconds ttl() const override { return {}; }
 
   RefreshStatus get_refresh_status() override { return {}; }
@@ -154,12 +150,18 @@
   void trigger_instances_change_callback(
       const bool md_servers_reachable = true) {
     if (!instances_change_listener_) return;
+
+    metadata_cache::metadata_servers_list_t md_servers;
+    for (const auto &instance : instance_vector_) {
+      md_servers.push_back({instance.host, instance.port});
+    }
+
     instances_change_listener_->notify_instances_changed(
-        instance_vector_, md_servers_reachable, 0);
+        instance_vector_, md_servers, md_servers_reachable, 0);
   }
 
   std::vector<metadata_cache::ManagedInstance> instance_vector_;
-  metadata_cache::ReplicasetStateListenerInterface *instances_change_listener_{
+  metadata_cache::ClusterStateListenerInterface *instances_change_listener_{
       nullptr};
 };
 
@@ -171,8 +173,6 @@
 
   MetadataCacheAPIStub metadata_cache_api_;
   net::io_context io_ctx_;
-
-  const std::string kReplicasetName{"replicaset-name"};
 };
 
 /*****************************************/
@@ -180,20 +180,16 @@
 /*****************************************/
 TEST_F(DestMetadataCacheTest, StrategyFirstAvailableOnPrimaries) {
   DestMetadataCacheGroup dest(
-      io_ctx_, "cache-name", kReplicasetName,
-      routing::RoutingStrategy::kFirstAvailable,
+      io_ctx_, "cache-name", routing::RoutingStrategy::kFirstAvailable,
       mysqlrouter::URI("metadata-cache://cache-name/default?role=PRIMARY")
           .query,
       BaseProtocol::Type::kClassicProtocol, routing::AccessMode::kUndefined,
       &metadata_cache_api_);
 
   fill_instance_vector({
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadWrite, "3306",
-       3306, 33060},
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadWrite, "3307",
-       3307, 33061},
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadOnly, "3308",
-       3308, 33062},
+      {"uuid1", metadata_cache::ServerMode::ReadWrite, "3306", 3306, 33060},
+      {"uuid1", metadata_cache::ServerMode::ReadWrite, "3307", 3307, 33061},
+      {"uuid1", metadata_cache::ServerMode::ReadOnly, "3308", 3308, 33062},
   });
 
   {
@@ -214,20 +210,16 @@
 
 TEST_F(DestMetadataCacheTest, StrategyFirstAvailableOnSinglePrimary) {
   DestMetadataCacheGroup dest(
-      io_ctx_, "cache-name", kReplicasetName,
-      routing::RoutingStrategy::kFirstAvailable,
+      io_ctx_, "cache-name", routing::RoutingStrategy::kFirstAvailable,
       mysqlrouter::URI("metadata-cache://cache-name/default?role=PRIMARY")
           .query,
       BaseProtocol::Type::kClassicProtocol, routing::AccessMode::kUndefined,
       &metadata_cache_api_);
 
   fill_instance_vector({
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadWrite, "3306",
-       3306, 33060},
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadOnly, "3307",
-       3307, 33061},
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadOnly, "3308",
-       3308, 33062},
+      {"uuid1", metadata_cache::ServerMode::ReadWrite, "3306", 3306, 33060},
+      {"uuid1", metadata_cache::ServerMode::ReadOnly, "3307", 3307, 33061},
+      {"uuid1", metadata_cache::ServerMode::ReadOnly, "3308", 3308, 33062},
   });
 
   // only one PRIMARY
@@ -247,20 +239,16 @@
 
 TEST_F(DestMetadataCacheTest, StrategyFirstAvailableOnNoPrimary) {
   DestMetadataCacheGroup dest(
-      io_ctx_, "cache-name", kReplicasetName,
-      routing::RoutingStrategy::kFirstAvailable,
+      io_ctx_, "cache-name", routing::RoutingStrategy::kFirstAvailable,
       mysqlrouter::URI("metadata-cache://cache-name/default?role=PRIMARY")
           .query,
       BaseProtocol::Type::kClassicProtocol, routing::AccessMode::kUndefined,
       &metadata_cache_api_);
 
   fill_instance_vector({
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadOnly, "3306",
-       3306, 33060},
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadOnly, "3307",
-       3307, 33061},
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadOnly, "3308",
-       3308, 33062},
+      {"uuid1", metadata_cache::ServerMode::ReadOnly, "3306", 3306, 33060},
+      {"uuid1", metadata_cache::ServerMode::ReadOnly, "3307", 3307, 33061},
+      {"uuid1", metadata_cache::ServerMode::ReadOnly, "3308", 3308, 33062},
   });
 
   // no PRIMARY
@@ -278,20 +266,16 @@
 
 TEST_F(DestMetadataCacheTest, StrategyFirstAvailableOnSecondaries) {
   DestMetadataCacheGroup dest(
-      io_ctx_, "cache-name", kReplicasetName,
-      routing::RoutingStrategy::kFirstAvailable,
+      io_ctx_, "cache-name", routing::RoutingStrategy::kFirstAvailable,
       mysqlrouter::URI("metadata-cache://cache-name/default?role=SECONDARY")
           .query,
       BaseProtocol::Type::kClassicProtocol, routing::AccessMode::kUndefined,
       &metadata_cache_api_);
 
   fill_instance_vector({
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadWrite, "3306",
-       3306, 33060},
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadOnly, "3307",
-       3307, 33061},
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadOnly, "3308",
-       3308, 33062},
+      {"uuid1", metadata_cache::ServerMode::ReadWrite, "3306", 3306, 33060},
+      {"uuid1", metadata_cache::ServerMode::ReadOnly, "3307", 3307, 33061},
+      {"uuid1", metadata_cache::ServerMode::ReadOnly, "3308", 3308, 33062},
   });
 
   // two SECONDARY's
@@ -313,20 +297,16 @@
 
 TEST_F(DestMetadataCacheTest, StrategyFirstAvailableOnSingleSecondary) {
   DestMetadataCacheGroup dest(
-      io_ctx_, "cache-name", kReplicasetName,
-      routing::RoutingStrategy::kFirstAvailable,
+      io_ctx_, "cache-name", routing::RoutingStrategy::kFirstAvailable,
       mysqlrouter::URI("metadata-cache://cache-name/default?role=SECONDARY")
           .query,
       BaseProtocol::Type::kClassicProtocol, routing::AccessMode::kUndefined,
       &metadata_cache_api_);
 
   fill_instance_vector({
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadWrite, "3306",
-       3306, 33060},
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadWrite, "3307",
-       3307, 33061},
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadOnly, "3308",
-       3308, 33062},
+      {"uuid1", metadata_cache::ServerMode::ReadWrite, "3306", 3306, 33060},
+      {"uuid1", metadata_cache::ServerMode::ReadWrite, "3307", 3307, 33061},
+      {"uuid1", metadata_cache::ServerMode::ReadOnly, "3308", 3308, 33062},
   });
 
   // one SECONDARY
@@ -346,20 +326,16 @@
 
 TEST_F(DestMetadataCacheTest, StrategyFirstAvailableOnNoSecondary) {
   DestMetadataCacheGroup dest(
-      io_ctx_, "cache-name", kReplicasetName,
-      routing::RoutingStrategy::kFirstAvailable,
+      io_ctx_, "cache-name", routing::RoutingStrategy::kFirstAvailable,
       mysqlrouter::URI("metadata-cache://cache-name/default?role=SECONDARY")
           .query,
       BaseProtocol::Type::kClassicProtocol, routing::AccessMode::kUndefined,
       &metadata_cache_api_);
 
   fill_instance_vector({
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadWrite, "3306",
-       3306, 33060},
-      {kReplicasetName, "uuid2", metadata_cache::ServerMode::ReadWrite, "3307",
-       3307, 33061},
-      {kReplicasetName, "uuid3", metadata_cache::ServerMode::ReadWrite, "3308",
-       3308, 33062},
+      {"uuid1", metadata_cache::ServerMode::ReadWrite, "3306", 3306, 33060},
+      {"uuid2", metadata_cache::ServerMode::ReadWrite, "3307", 3307, 33061},
+      {"uuid3", metadata_cache::ServerMode::ReadWrite, "3308", 3308, 33062},
   });
 
   // no SECONDARY
@@ -377,8 +353,7 @@
 
 TEST_F(DestMetadataCacheTest, StrategyFirstAvailablePrimaryAndSecondary) {
   DestMetadataCacheGroup dest(
-      io_ctx_, "cache-name", kReplicasetName,
-      routing::RoutingStrategy::kFirstAvailable,
+      io_ctx_, "cache-name", routing::RoutingStrategy::kFirstAvailable,
       mysqlrouter::URI(
           "metadata-cache://cache-name/default?role=PRIMARY_AND_SECONDARY")
           .query,
@@ -386,12 +361,9 @@
       &metadata_cache_api_);
 
   fill_instance_vector({
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadWrite, "3306",
-       3306, 33060},
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadOnly, "3307",
-       3307, 33061},
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadOnly, "3308",
-       3308, 33062},
+      {"uuid1", metadata_cache::ServerMode::ReadWrite, "3306", 3306, 33060},
+      {"uuid1", metadata_cache::ServerMode::ReadOnly, "3307", 3307, 33061},
+      {"uuid1", metadata_cache::ServerMode::ReadOnly, "3308", 3308, 33062},
   });
 
   // all nodes
@@ -415,20 +387,16 @@
 
 TEST_F(DestMetadataCacheTest, StrategyRoundRobinWithFallbackUnavailableServer) {
   DestMetadataCacheGroup dest(
-      io_ctx_, "cache-name", kReplicasetName,
-      routing::RoutingStrategy::kRoundRobinWithFallback,
+      io_ctx_, "cache-name", routing::RoutingStrategy::kRoundRobinWithFallback,
       mysqlrouter::URI("metadata-cache://cache-name/default?role=SECONDARY")
           .query,
       BaseProtocol::Type::kClassicProtocol, routing::AccessMode::kUndefined,
       &metadata_cache_api_);
 
   fill_instance_vector({
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::Unavailable,
-       "3306", 3306, 33060},
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadWrite, "3307",
-       3307, 33061},
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadWrite, "3308",
-       3308, 33062},
+      {"uuid1", metadata_cache::ServerMode::Unavailable, "3306", 3306, 33060},
+      {"uuid1", metadata_cache::ServerMode::ReadWrite, "3307", 3307, 33061},
+      {"uuid1", metadata_cache::ServerMode::ReadWrite, "3308", 3308, 33062},
   });
 
   // all available nodes
@@ -461,22 +429,17 @@
 /*****************************************/
 TEST_F(DestMetadataCacheTest, StrategyRoundRobinOnPrimaries) {
   DestMetadataCacheGroup dest(
-      io_ctx_, "cache-name", kReplicasetName,
-      routing::RoutingStrategy::kRoundRobin,
+      io_ctx_, "cache-name", routing::RoutingStrategy::kRoundRobin,
       mysqlrouter::URI("metadata-cache://cache-name/default?role=PRIMARY")
           .query,
       BaseProtocol::Type::kClassicProtocol, routing::AccessMode::kUndefined,
       &metadata_cache_api_);
 
   fill_instance_vector({
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadWrite, "3306",
-       3306, 33060},
-      {kReplicasetName, "uuid2", metadata_cache::ServerMode::ReadWrite, "3307",
-       3307, 33061},
-      {kReplicasetName, "uuid3", metadata_cache::ServerMode::ReadWrite, "3308",
-       3308, 33062},
-      {kReplicasetName, "uuid4", metadata_cache::ServerMode::ReadOnly, "3309",
-       3309, 33063},
+      {"uuid1", metadata_cache::ServerMode::ReadWrite, "3306", 3306, 33060},
+      {"uuid2", metadata_cache::ServerMode::ReadWrite, "3307", 3307, 33061},
+      {"uuid3", metadata_cache::ServerMode::ReadWrite, "3308", 3308, 33062},
+      {"uuid4", metadata_cache::ServerMode::ReadOnly, "3309", 3309, 33063},
   });
 
   // all PRIMARY nodes
@@ -518,20 +481,16 @@
 
 TEST_F(DestMetadataCacheTest, StrategyRoundRobinOnSinglePrimary) {
   DestMetadataCacheGroup dest(
-      io_ctx_, "cache-name", kReplicasetName,
-      routing::RoutingStrategy::kRoundRobin,
+      io_ctx_, "cache-name", routing::RoutingStrategy::kRoundRobin,
       mysqlrouter::URI("metadata-cache://cache-name/default?role=PRIMARY")
           .query,
       BaseProtocol::Type::kClassicProtocol, routing::AccessMode::kUndefined,
       &metadata_cache_api_);
 
   fill_instance_vector({
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadWrite, "3306",
-       3306, 33060},
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadOnly, "3307",
-       3307, 33061},
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadOnly, "3308",
-       3308, 33062},
+      {"uuid1", metadata_cache::ServerMode::ReadWrite, "3306", 3306, 33060},
+      {"uuid1", metadata_cache::ServerMode::ReadOnly, "3307", 3307, 33061},
+      {"uuid1", metadata_cache::ServerMode::ReadOnly, "3308", 3308, 33062},
   });
 
   // the one PRIMARY nodes
@@ -551,18 +510,15 @@
 
 TEST_F(DestMetadataCacheTest, StrategyRoundRobinPrimaryMissing) {
   DestMetadataCacheGroup dest(
-      io_ctx_, "cache-name", kReplicasetName,
-      routing::RoutingStrategy::kRoundRobin,
+      io_ctx_, "cache-name", routing::RoutingStrategy::kRoundRobin,
       mysqlrouter::URI("metadata-cache://cache-name/default?role=PRIMARY")
           .query,
       BaseProtocol::Type::kClassicProtocol, routing::AccessMode::kUndefined,
       &metadata_cache_api_);
 
   fill_instance_vector({
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadOnly, "3307",
-       3307, 33061},
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadOnly, "3308",
-       3308, 33062},
+      {"uuid1", metadata_cache::ServerMode::ReadOnly, "3307", 3307, 33061},
+      {"uuid1", metadata_cache::ServerMode::ReadOnly, "3308", 3308, 33062},
   });
 
   // no PRIMARY nodes
@@ -580,22 +536,17 @@
 
 TEST_F(DestMetadataCacheTest, StrategyRoundRobinOnSecondaries) {
   DestMetadataCacheGroup dest(
-      io_ctx_, "cache-name", kReplicasetName,
-      routing::RoutingStrategy::kRoundRobin,
+      io_ctx_, "cache-name", routing::RoutingStrategy::kRoundRobin,
       mysqlrouter::URI("metadata-cache://cache-name/default?role=SECONDARY")
           .query,
       BaseProtocol::Type::kClassicProtocol, routing::AccessMode::kUndefined,
       &metadata_cache_api_);
 
   fill_instance_vector({
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadWrite, "3306",
-       3306, 33060},
-      {kReplicasetName, "uuid2", metadata_cache::ServerMode::ReadOnly, "3307",
-       3307, 33061},
-      {kReplicasetName, "uuid3", metadata_cache::ServerMode::ReadOnly, "3308",
-       3308, 33062},
-      {kReplicasetName, "uuid4", metadata_cache::ServerMode::ReadOnly, "3309",
-       3309, 33063},
+      {"uuid1", metadata_cache::ServerMode::ReadWrite, "3306", 3306, 33060},
+      {"uuid2", metadata_cache::ServerMode::ReadOnly, "3307", 3307, 33061},
+      {"uuid3", metadata_cache::ServerMode::ReadOnly, "3308", 3308, 33062},
+      {"uuid4", metadata_cache::ServerMode::ReadOnly, "3309", 3309, 33063},
   });
 
   // all SECONDAY nodes
@@ -637,20 +588,16 @@
 
 TEST_F(DestMetadataCacheTest, StrategyRoundRobinOnSingleSecondary) {
   DestMetadataCacheGroup dest(
-      io_ctx_, "cache-name", kReplicasetName,
-      routing::RoutingStrategy::kRoundRobin,
+      io_ctx_, "cache-name", routing::RoutingStrategy::kRoundRobin,
       mysqlrouter::URI("metadata-cache://cache-name/default?role=SECONDARY")
           .query,
       BaseProtocol::Type::kClassicProtocol, routing::AccessMode::kUndefined,
       &metadata_cache_api_);
 
   fill_instance_vector({
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadWrite, "3306",
-       3306, 33060},
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadWrite, "3307",
-       3307, 33061},
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadOnly, "3308",
-       3308, 33062},
+      {"uuid1", metadata_cache::ServerMode::ReadWrite, "3306", 3306, 33060},
+      {"uuid1", metadata_cache::ServerMode::ReadWrite, "3307", 3307, 33061},
+      {"uuid1", metadata_cache::ServerMode::ReadOnly, "3308", 3308, 33062},
   });
 
   // the one SECONDARY nodes
@@ -670,18 +617,15 @@
 
 TEST_F(DestMetadataCacheTest, StrategyRoundRobinSecondaryMissing) {
   DestMetadataCacheGroup dest(
-      io_ctx_, "cache-name", kReplicasetName,
-      routing::RoutingStrategy::kRoundRobin,
+      io_ctx_, "cache-name", routing::RoutingStrategy::kRoundRobin,
       mysqlrouter::URI("metadata-cache://cache-name/default?role=SECONDARY")
           .query,
       BaseProtocol::Type::kClassicProtocol, routing::AccessMode::kUndefined,
       &metadata_cache_api_);
 
   fill_instance_vector({
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadWrite, "3307",
-       3307, 33061},
-      {kReplicasetName, "uuid2", metadata_cache::ServerMode::ReadWrite, "3308",
-       3308, 33062},
+      {"uuid1", metadata_cache::ServerMode::ReadWrite, "3307", 3307, 33061},
+      {"uuid2", metadata_cache::ServerMode::ReadWrite, "3308", 3308, 33062},
   });
 
   // no SECONDARY nodes
@@ -699,8 +643,7 @@
 
 TEST_F(DestMetadataCacheTest, StrategyRoundRobinPrimaryAndSecondary) {
   DestMetadataCacheGroup dest(
-      io_ctx_, "cache-name", kReplicasetName,
-      routing::RoutingStrategy::kRoundRobin,
+      io_ctx_, "cache-name", routing::RoutingStrategy::kRoundRobin,
       mysqlrouter::URI(
           "metadata-cache://cache-name/default?role=PRIMARY_AND_SECONDARY")
           .query,
@@ -708,12 +651,9 @@
       &metadata_cache_api_);
 
   fill_instance_vector({
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadWrite, "3307",
-       3307, 33061},
-      {kReplicasetName, "uuid2", metadata_cache::ServerMode::ReadOnly, "3308",
-       3308, 33062},
-      {kReplicasetName, "uuid3", metadata_cache::ServerMode::ReadOnly, "3309",
-       3309, 33063},
+      {"uuid1", metadata_cache::ServerMode::ReadWrite, "3307", 3307, 33061},
+      {"uuid2", metadata_cache::ServerMode::ReadOnly, "3308", 3308, 33062},
+      {"uuid3", metadata_cache::ServerMode::ReadOnly, "3309", 3309, 33063},
   });
 
   // all nodes
@@ -758,20 +698,16 @@
 /*****************************************/
 TEST_F(DestMetadataCacheTest, StrategyRoundRobinWithFallbackBasicScenario) {
   DestMetadataCacheGroup dest(
-      io_ctx_, "cache-name", kReplicasetName,
-      routing::RoutingStrategy::kRoundRobinWithFallback,
+      io_ctx_, "cache-name", routing::RoutingStrategy::kRoundRobinWithFallback,
       mysqlrouter::URI("metadata-cache://cache-name/default?role=SECONDARY")
           .query,
       BaseProtocol::Type::kClassicProtocol, routing::AccessMode::kUndefined,
       &metadata_cache_api_);
 
   fill_instance_vector({
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadWrite, "3306",
-       3306, 33060},
-      {kReplicasetName, "uuid2", metadata_cache::ServerMode::ReadOnly, "3307",
-       3307, 33061},
-      {kReplicasetName, "uuid3", metadata_cache::ServerMode::ReadOnly, "3308",
-       3308, 33062},
+      {"uuid1", metadata_cache::ServerMode::ReadWrite, "3306", 3306, 33060},
+      {"uuid2", metadata_cache::ServerMode::ReadOnly, "3307", 3307, 33061},
+      {"uuid3", metadata_cache::ServerMode::ReadOnly, "3308", 3308, 33062},
   });
 
   // we have 2 SECONDARIES up so we expect round robin on them
@@ -801,20 +737,16 @@
 
 TEST_F(DestMetadataCacheTest, StrategyRoundRobinWithFallbackSingleSecondary) {
   DestMetadataCacheGroup dest(
-      io_ctx_, "cache-name", kReplicasetName,
-      routing::RoutingStrategy::kRoundRobinWithFallback,
+      io_ctx_, "cache-name", routing::RoutingStrategy::kRoundRobinWithFallback,
       mysqlrouter::URI("metadata-cache://cache-name/default?role=SECONDARY")
           .query,
       BaseProtocol::Type::kClassicProtocol, routing::AccessMode::kUndefined,
       &metadata_cache_api_);
 
   fill_instance_vector({
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadWrite, "3306",
-       3306, 33060},
-      {kReplicasetName, "uuid2", metadata_cache::ServerMode::ReadWrite, "3307",
-       3307, 33061},
-      {kReplicasetName, "uuid3", metadata_cache::ServerMode::ReadOnly, "3308",
-       3308, 33062},
+      {"uuid1", metadata_cache::ServerMode::ReadWrite, "3306", 3306, 33060},
+      {"uuid2", metadata_cache::ServerMode::ReadWrite, "3307", 3307, 33061},
+      {"uuid3", metadata_cache::ServerMode::ReadOnly, "3308", 3308, 33062},
   });
 
   // we do not fallback to PRIMARIES as long as there is at least single
@@ -835,18 +767,15 @@
 
 TEST_F(DestMetadataCacheTest, StrategyRoundRobinWithFallbackNoSecondary) {
   DestMetadataCacheGroup dest(
-      io_ctx_, "cache-name", kReplicasetName,
-      routing::RoutingStrategy::kRoundRobinWithFallback,
+      io_ctx_, "cache-name", routing::RoutingStrategy::kRoundRobinWithFallback,
       mysqlrouter::URI("metadata-cache://cache-name/default?role=SECONDARY")
           .query,
       BaseProtocol::Type::kClassicProtocol, routing::AccessMode::kUndefined,
       &metadata_cache_api_);
 
   fill_instance_vector({
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadWrite, "3306",
-       3306, 33060},
-      {kReplicasetName, "uuid2", metadata_cache::ServerMode::ReadWrite, "3307",
-       3307, 33061},
+      {"uuid1", metadata_cache::ServerMode::ReadWrite, "3306", 3306, 33060},
+      {"uuid2", metadata_cache::ServerMode::ReadWrite, "3307", 3307, 33061},
   });
 
   // no SECONDARY available so we expect round-robin on PRIAMRIES
@@ -870,7 +799,7 @@
        StrategyRoundRobinWithFallbackPrimaryAndSecondary) {
   ASSERT_THROW_LIKE(
       DestMetadataCacheGroup dest(
-          io_ctx_, "cache-name", kReplicasetName,
+          io_ctx_, "cache-name",
           routing::RoutingStrategy::kRoundRobinWithFallback,
           mysqlrouter::URI(
               "metadata-cache://cache-name/default?role=PRIMARY_AND_SECONDARY")
@@ -887,8 +816,7 @@
 /*****************************************/
 TEST_F(DestMetadataCacheTest, AllowPrimaryReadsBasic) {
   DestMetadataCacheGroup dest(
-      io_ctx_, "cache-name", kReplicasetName,
-      routing::RoutingStrategy::kUndefined,
+      io_ctx_, "cache-name", routing::RoutingStrategy::kUndefined,
       mysqlrouter::URI("metadata-cache://cache-name/"
                        "default?role=SECONDARY&allow_primary_reads=yes")
           .query,
@@ -896,12 +824,9 @@
       &metadata_cache_api_);
 
   fill_instance_vector({
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadWrite, "3306",
-       3306, 33060},
-      {kReplicasetName, "uuid2", metadata_cache::ServerMode::ReadOnly, "3307",
-       3307, 33061},
-      {kReplicasetName, "uuid2", metadata_cache::ServerMode::ReadOnly, "3308",
-       3308, 33062},
+      {"uuid1", metadata_cache::ServerMode::ReadWrite, "3306", 3306, 33060},
+      {"uuid2", metadata_cache::ServerMode::ReadOnly, "3307", 3307, 33061},
+      {"uuid2", metadata_cache::ServerMode::ReadOnly, "3308", 3308, 33062},
   });
 
   // we expect round-robin on all the servers (PRIMARY and SECONDARY)
@@ -943,8 +868,7 @@
 
 TEST_F(DestMetadataCacheTest, AllowPrimaryReadsNoSecondary) {
   DestMetadataCacheGroup dest(
-      io_ctx_, "cache-name", kReplicasetName,
-      routing::RoutingStrategy::kUndefined,
+      io_ctx_, "cache-name", routing::RoutingStrategy::kUndefined,
       mysqlrouter::URI("metadata-cache://cache-name/"
                        "default?role=SECONDARY&allow_primary_reads=yes")
           .query,
@@ -952,8 +876,7 @@
       &metadata_cache_api_);
 
   fill_instance_vector({
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadWrite, "3306",
-       3306, 33060},
+      {"uuid1", metadata_cache::ServerMode::ReadWrite, "3306", 3306, 33060},
   });
 
   // we expect the PRIMARY being used
@@ -976,18 +899,15 @@
 /*****************************************/
 TEST_F(DestMetadataCacheTest, PrimaryDefault) {
   DestMetadataCacheGroup dest(
-      io_ctx_, "cache-name", kReplicasetName,
-      routing::RoutingStrategy::kUndefined,
+      io_ctx_, "cache-name", routing::RoutingStrategy::kUndefined,
       mysqlrouter::URI("metadata-cache://cache-name/default?role=PRIMARY")
           .query,
       BaseProtocol::Type::kClassicProtocol, routing::AccessMode::kReadWrite,
       &metadata_cache_api_);
 
   fill_instance_vector({
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadWrite, "3306",
-       3306, 33060},
-      {kReplicasetName, "uuid2", metadata_cache::ServerMode::ReadWrite, "3307",
-       3307, 33061},
+      {"uuid1", metadata_cache::ServerMode::ReadWrite, "3306", 3306, 33060},
+      {"uuid2", metadata_cache::ServerMode::ReadWrite, "3307", 3307, 33061},
   });
 
   // default for PRIMARY should be round-robin on ReadWrite servers
@@ -1017,20 +937,16 @@
 
 TEST_F(DestMetadataCacheTest, SecondaryDefault) {
   DestMetadataCacheGroup dest(
-      io_ctx_, "cache-name", kReplicasetName,
-      routing::RoutingStrategy::kUndefined,
+      io_ctx_, "cache-name", routing::RoutingStrategy::kUndefined,
       mysqlrouter::URI("metadata-cache://cache-name/default?role=SECONDARY")
           .query,
       BaseProtocol::Type::kClassicProtocol, routing::AccessMode::kReadOnly,
       &metadata_cache_api_);
 
   fill_instance_vector({
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadWrite, "3306",
-       3306, 33060},
-      {kReplicasetName, "uuid2", metadata_cache::ServerMode::ReadOnly, "3307",
-       3307, 33061},
-      {kReplicasetName, "uuid3", metadata_cache::ServerMode::ReadOnly, "3308",
-       3308, 33062},
+      {"uuid1", metadata_cache::ServerMode::ReadWrite, "3306", 3306, 33060},
+      {"uuid2", metadata_cache::ServerMode::ReadOnly, "3307", 3307, 33061},
+      {"uuid3", metadata_cache::ServerMode::ReadOnly, "3308", 3308, 33062},
   });
 
   // default for SECONDARY should be round-robin on ReadOnly servers
@@ -1060,8 +976,7 @@
 
 TEST_F(DestMetadataCacheTest, PrimaryAndSecondaryDefault) {
   DestMetadataCacheGroup dest(
-      io_ctx_, "cache-name", kReplicasetName,
-      routing::RoutingStrategy::kUndefined,
+      io_ctx_, "cache-name", routing::RoutingStrategy::kUndefined,
       mysqlrouter::URI(
           "metadata-cache://cache-name/default?role=PRIMARY_AND_SECONDARY")
           .query,
@@ -1069,12 +984,9 @@
       &metadata_cache_api_);
 
   fill_instance_vector({
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadWrite, "3306",
-       3306, 33060},
-      {kReplicasetName, "uuid2", metadata_cache::ServerMode::ReadOnly, "3307",
-       3307, 33061},
-      {kReplicasetName, "uuid3", metadata_cache::ServerMode::ReadOnly, "3308",
-       3308, 33062},
+      {"uuid1", metadata_cache::ServerMode::ReadWrite, "3306", 3306, 33060},
+      {"uuid2", metadata_cache::ServerMode::ReadOnly, "3307", 3307, 33061},
+      {"uuid3", metadata_cache::ServerMode::ReadOnly, "3308", 3308, 33062},
   });
 
   // default for PRIMARY_AND_SECONDARY should be round-robin on ReadOnly and
@@ -1126,28 +1038,23 @@
  */
 TEST_F(DestMetadataCacheTest, AllowedNodesNoPrimary) {
   DestMetadataCacheGroup dest_mc_group(
-      io_ctx_, "cache-name", kReplicasetName,
-      routing::RoutingStrategy::kUndefined,
+      io_ctx_, "cache-name", routing::RoutingStrategy::kUndefined,
       mysqlrouter::URI("metadata-cache://cache-name/default?role=PRIMARY")
           .query,
       BaseProtocol::Type::kClassicProtocol, routing::AccessMode::kReadWrite,
       &metadata_cache_api_);
 
   fill_instance_vector({
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadWrite, "3306",
-       3306, 33060},
-      {kReplicasetName, "uuid2", metadata_cache::ServerMode::ReadOnly, "3307",
-       3307, 33070},
+      {"uuid1", metadata_cache::ServerMode::ReadWrite, "3306", 3306, 33060},
+      {"uuid2", metadata_cache::ServerMode::ReadOnly, "3307", 3307, 33070},
   });
 
   dest_mc_group.start(nullptr);
 
   // new metadata - no primary
   fill_instance_vector({
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadOnly, "3306",
-       3306, 33060},
-      {kReplicasetName, "uuid2", metadata_cache::ServerMode::ReadOnly, "3307",
-       3307, 33070},
+      {"uuid1", metadata_cache::ServerMode::ReadOnly, "3306", 3306, 33060},
+      {"uuid2", metadata_cache::ServerMode::ReadOnly, "3307", 3307, 33070},
   });
 
   bool callback_called{false};
@@ -1173,18 +1080,15 @@
  */
 TEST_F(DestMetadataCacheTest, AllowedNodes2Primaries) {
   DestMetadataCacheGroup dest_mc_group(
-      io_ctx_, "cache-name", kReplicasetName,
-      routing::RoutingStrategy::kUndefined,
+      io_ctx_, "cache-name", routing::RoutingStrategy::kUndefined,
       mysqlrouter::URI("metadata-cache://cache-name/default?role=PRIMARY")
           .query,
       BaseProtocol::Type::kClassicProtocol, routing::AccessMode::kReadWrite,
       &metadata_cache_api_);
 
   InstanceVector instances{
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadWrite, "3306",
-       3306, 33060},
-      {kReplicasetName, "uuid2", metadata_cache::ServerMode::ReadOnly, "3307",
-       3307, 33070},
+      {"uuid1", metadata_cache::ServerMode::ReadWrite, "3306", 3306, 33060},
+      {"uuid2", metadata_cache::ServerMode::ReadOnly, "3307", 3307, 33070},
   };
 
   fill_instance_vector(instances);
@@ -1224,18 +1128,15 @@
  */
 TEST_F(DestMetadataCacheTest, AllowedNodesNoSecondaries) {
   DestMetadataCacheGroup dest_mc_group(
-      io_ctx_, "cache-name", kReplicasetName,
-      routing::RoutingStrategy::kUndefined,
+      io_ctx_, "cache-name", routing::RoutingStrategy::kUndefined,
       mysqlrouter::URI("metadata-cache://cache-name/default?role=SECONDARY")
           .query,
       BaseProtocol::Type::kClassicProtocol, routing::AccessMode::kReadOnly,
       &metadata_cache_api_);
 
   InstanceVector instances{
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadWrite, "3306",
-       3306, 33060},
-      {kReplicasetName, "uuid2", metadata_cache::ServerMode::ReadOnly, "3307",
-       3307, 33070},
+      {"uuid1", metadata_cache::ServerMode::ReadWrite, "3306", 3306, 33060},
+      {"uuid2", metadata_cache::ServerMode::ReadOnly, "3307", 3307, 33070},
   };
 
   fill_instance_vector(instances);
@@ -1273,8 +1174,7 @@
  */
 TEST_F(DestMetadataCacheTest, AllowedNodesSecondaryDisconnectToPromoted) {
   DestMetadataCacheGroup dest_mc_group(
-      io_ctx_, "cache-name", kReplicasetName,
-      routing::RoutingStrategy::kUndefined,
+      io_ctx_, "cache-name", routing::RoutingStrategy::kUndefined,
       mysqlrouter::URI(
           "metadata-cache://cache-name/"
           "default?role=SECONDARY&disconnect_on_promoted_to_primary=yes")
@@ -1283,10 +1183,8 @@
       &metadata_cache_api_);
 
   InstanceVector instances{
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadWrite, "3306",
-       3306, 33060},
-      {kReplicasetName, "uuid2", metadata_cache::ServerMode::ReadOnly, "3307",
-       3307, 33070},
+      {"uuid1", metadata_cache::ServerMode::ReadWrite, "3306", 3306, 33060},
+      {"uuid2", metadata_cache::ServerMode::ReadOnly, "3307", 3307, 33070},
   };
 
   fill_instance_vector(instances);
@@ -1329,8 +1227,7 @@
  */
 TEST_F(DestMetadataCacheTest, AllowedNodesSecondaryDisconnectToPromotedTwice) {
   DestMetadataCacheGroup dest_mc_group(
-      io_ctx_, "cache-name", kReplicasetName,
-      routing::RoutingStrategy::kUndefined,
+      io_ctx_, "cache-name", routing::RoutingStrategy::kUndefined,
       mysqlrouter::URI("metadata-cache://cache-name/"
                        "default?role=SECONDARY&disconnect_on_promoted_to_"
                        "primary=no&disconnect_on_promoted_to_primary=yes")
@@ -1339,10 +1236,8 @@
       &metadata_cache_api_);
 
   InstanceVector instances{
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadWrite, "3306",
-       3306, 33060},
-      {kReplicasetName, "uuid2", metadata_cache::ServerMode::ReadOnly, "3307",
-       3307, 33070},
+      {"uuid1", metadata_cache::ServerMode::ReadWrite, "3306", 3306, 33060},
+      {"uuid2", metadata_cache::ServerMode::ReadOnly, "3307", 3307, 33070},
   };
 
   fill_instance_vector(instances);
@@ -1378,18 +1273,15 @@
 TEST_F(DestMetadataCacheTest,
        AllowedNodesEmptyKeepConnectionsIfMetadataUnavailable) {
   DestMetadataCacheGroup dest_mc_group(
-      io_ctx_, "cache-name", kReplicasetName,
-      routing::RoutingStrategy::kUndefined,
+      io_ctx_, "cache-name", routing::RoutingStrategy::kUndefined,
       mysqlrouter::URI("metadata-cache://cache-name/default?role=SECONDARY")
           .query,
       BaseProtocol::Type::kClassicProtocol, routing::AccessMode::kReadOnly,
       &metadata_cache_api_);
 
   fill_instance_vector({
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadWrite, "3306",
-       3306, 33060},
-      {kReplicasetName, "uuid2", metadata_cache::ServerMode::ReadOnly, "3307",
-       3307, 33070},
+      {"uuid1", metadata_cache::ServerMode::ReadWrite, "3306", 3306, 33060},
+      {"uuid2", metadata_cache::ServerMode::ReadOnly, "3307", 3307, 33070},
   });
 
   dest_mc_group.start(nullptr);
@@ -1425,8 +1317,7 @@
 TEST_F(DestMetadataCacheTest,
        AllowedNodesEmptyDisconnectConnectionsIfMetadataUnavailable) {
   DestMetadataCacheGroup dest_mc_group(
-      io_ctx_, "cache-name", kReplicasetName,
-      routing::RoutingStrategy::kUndefined,
+      io_ctx_, "cache-name", routing::RoutingStrategy::kUndefined,
       mysqlrouter::URI(
           "metadata-cache://cache-name/"
           "default?role=SECONDARY&disconnect_on_metadata_unavailable=yes")
@@ -1435,10 +1326,8 @@
       &metadata_cache_api_);
 
   fill_instance_vector({
-      {kReplicasetName, "uuid1", metadata_cache::ServerMode::ReadWrite, "3306",
-       3306, 33060},
-      {kReplicasetName, "uuid2", metadata_cache::ServerMode::ReadOnly, "3307",
-       3307, 33070},
+      {"uuid1", metadata_cache::ServerMode::ReadWrite, "3306", 3306, 33060},
+      {"uuid2", metadata_cache::ServerMode::ReadOnly, "3307", 3307, 33070},
   });
 
   dest_mc_group.start(nullptr);
@@ -1472,8 +1361,7 @@
 TEST_F(DestMetadataCacheTest, InvalidServerNodeRole) {
   ASSERT_THROW_LIKE(
       DestMetadataCacheGroup dest_mc_group(
-          io_ctx_, "cache-name", kReplicasetName,
-          routing::RoutingStrategy::kRoundRobin,
+          io_ctx_, "cache-name", routing::RoutingStrategy::kRoundRobin,
           mysqlrouter::URI("metadata-cache://cache-name/default?role=INVALID")
               .query,
           BaseProtocol::Type::kClassicProtocol, routing::AccessMode::kUndefined,
@@ -1484,7 +1372,7 @@
 TEST_F(DestMetadataCacheTest, UnsupportedRoutingStrategy) {
   ASSERT_THROW_LIKE(
       DestMetadataCacheGroup dest_mc_group(
-          io_ctx_, "cache-name", kReplicasetName,
+          io_ctx_, "cache-name",
           routing::RoutingStrategy::kNextAvailable,  // this one is not
                                                      // supported for metadata
                                                      // cache
@@ -1498,8 +1386,7 @@
 TEST_F(DestMetadataCacheTest, AllowPrimaryReadsWithPrimaryRouting) {
   ASSERT_THROW_LIKE(
       DestMetadataCacheGroup dest_mc_group(
-          io_ctx_, "cache-name", kReplicasetName,
-          routing::RoutingStrategy::kUndefined,
+          io_ctx_, "cache-name", routing::RoutingStrategy::kUndefined,
           mysqlrouter::URI("metadata-cache://cache-name/"
                            "default?role=PRIMARY&allow_primary_reads=yes")
               .query,
@@ -1512,8 +1399,7 @@
 TEST_F(DestMetadataCacheTest, AllowPrimaryReadsWithRoutingStrategy) {
   ASSERT_THROW_LIKE(
       DestMetadataCacheGroup dest_mc_group(
-          io_ctx_, "cache-name", kReplicasetName,
-          routing::RoutingStrategy::kRoundRobin,
+          io_ctx_, "cache-name", routing::RoutingStrategy::kRoundRobin,
           mysqlrouter::URI("metadata-cache://cache-name/"
                            "default?role=SECONDARY&allow_primary_reads=yes")
               .query,
@@ -1528,7 +1414,7 @@
 TEST_F(DestMetadataCacheTest, RoundRobinWitFallbackStrategyWithPrimaryRouting) {
   ASSERT_THROW_LIKE(
       DestMetadataCacheGroup dest_mc_group(
-          io_ctx_, "cache-name", kReplicasetName,
+          io_ctx_, "cache-name",
           routing::RoutingStrategy::kRoundRobinWithFallback,
           mysqlrouter::URI("metadata-cache://cache-name/default?role=PRIMARY")
               .query,
@@ -1542,8 +1428,7 @@
 TEST_F(DestMetadataCacheTest, ModeWithStrategy) {
   ASSERT_THROW_LIKE(
       DestMetadataCacheGroup dest_mc_group(
-          io_ctx_, "cache-name", kReplicasetName,
-          routing::RoutingStrategy::kFirstAvailable,
+          io_ctx_, "cache-name", routing::RoutingStrategy::kFirstAvailable,
           mysqlrouter::URI("metadata-cache://cache-name/default?role=PRIMARY")
               .query,
           BaseProtocol::Type::kClassicProtocol, routing::AccessMode::kReadWrite,
@@ -1555,8 +1440,7 @@
 TEST_F(DestMetadataCacheTest, RolePrimaryWrongMode) {
   ASSERT_THROW_LIKE(
       DestMetadataCacheGroup dest_mc_group(
-          io_ctx_, "cache-name", kReplicasetName,
-          routing::RoutingStrategy::kUndefined,
+          io_ctx_, "cache-name", routing::RoutingStrategy::kUndefined,
           mysqlrouter::URI("metadata-cache://cache-name/default?role=PRIMARY")
               .query,
           BaseProtocol::Type::kClassicProtocol, routing::AccessMode::kReadOnly,
@@ -1567,8 +1451,7 @@
 TEST_F(DestMetadataCacheTest, RoleSecondaryWrongMode) {
   ASSERT_THROW_LIKE(
       DestMetadataCacheGroup dest_mc_group(
-          io_ctx_, "cache-name", kReplicasetName,
-          routing::RoutingStrategy::kUndefined,
+          io_ctx_, "cache-name", routing::RoutingStrategy::kUndefined,
           mysqlrouter::URI("metadata-cache://cache-name/default?role=SECONDARY")
               .query,
           BaseProtocol::Type::kClassicProtocol, routing::AccessMode::kReadWrite,
@@ -1580,8 +1463,7 @@
 TEST_F(DestMetadataCacheTest, RolePrimaryAndSecondaryWrongMode) {
   ASSERT_THROW_LIKE(
       DestMetadataCacheGroup dest_mc_group(
-          io_ctx_, "cache-name", kReplicasetName,
-          routing::RoutingStrategy::kUndefined,
+          io_ctx_, "cache-name", routing::RoutingStrategy::kUndefined,
           mysqlrouter::URI(
               "metadata-cache://cache-name/default?role=PRIMARY_AND_SECONDARY")
               .query,
@@ -1600,9 +1482,8 @@
     mysqlrouter::URI uri(
         "metadata-cache://test/default?allow_primary_reads=yes&role=SECONDARY");
     ASSERT_NO_THROW(DestMetadataCacheGroup dest(
-        io_ctx_, "metadata_cache_name", "replicaset_name",
-        routing::RoutingStrategy::kUndefined, uri.query,
-        Protocol::Type::kClassicProtocol));
+        io_ctx_, "metadata_cache_name", routing::RoutingStrategy::kUndefined,
+        uri.query, Protocol::Type::kClassicProtocol));
   }
 
   // no
@@ -1610,9 +1491,8 @@
     mysqlrouter::URI uri(
         "metadata-cache://test/default?allow_primary_reads=no&role=SECONDARY");
     ASSERT_NO_THROW(DestMetadataCacheGroup dest(
-        io_ctx_, "metadata_cache_name", "replicaset_name",
-        routing::RoutingStrategy::kUndefined, uri.query,
-        Protocol::Type::kClassicProtocol));
+        io_ctx_, "metadata_cache_name", routing::RoutingStrategy::kUndefined,
+        uri.query, Protocol::Type::kClassicProtocol));
   }
 
   // invalid value
@@ -1621,10 +1501,10 @@
         "metadata-cache://test/"
         "default?allow_primary_reads=yes,xxx&role=SECONDARY");
     ASSERT_THROW_LIKE(
-        DestMetadataCacheGroup dest(
-            io_ctx_, "metadata_cache_name", "replicaset_name",
-            routing::RoutingStrategy::kUndefined, uri.query,
-            Protocol::Type::kClassicProtocol),
+        DestMetadataCacheGroup dest(io_ctx_, "metadata_cache_name",
+                                    routing::RoutingStrategy::kUndefined,
+                                    uri.query,
+                                    Protocol::Type::kClassicProtocol),
         std::runtime_error,
         "Invalid value for allow_primary_reads option: 'yes,xxx'");
   }
@@ -1636,7 +1516,7 @@
         "metadata-cache://test/default?role=SECONDARY,metadata-cache://test2/"
         "default?role=SECONDARY");
     ASSERT_THROW_LIKE(DestMetadataCacheGroup dest(
-                          io_ctx_, "metadata_cache_name", "replicaset_name",
+                          io_ctx_, "metadata_cache_name",
                           routing::RoutingStrategy::kUndefined, uri.query,
                           Protocol::Type::kClassicProtocol),
                       std::runtime_error,
@@ -1652,9 +1532,8 @@
         "metadata-cache://test/"
         "default?role=SECONDARY&disconnect_on_promoted_to_primary=yes");
     ASSERT_NO_THROW(DestMetadataCacheGroup dest(
-        io_ctx_, "metadata_cache_name", "replicaset_name",
-        routing::RoutingStrategy::kUndefined, uri.query,
-        Protocol::Type::kClassicProtocol));
+        io_ctx_, "metadata_cache_name", routing::RoutingStrategy::kUndefined,
+        uri.query, Protocol::Type::kClassicProtocol));
   }
 
   // no valid
@@ -1663,9 +1542,8 @@
         "metadata-cache://test/"
         "default?role=SECONDARY&disconnect_on_promoted_to_primary=no");
     ASSERT_NO_THROW(DestMetadataCacheGroup dest(
-        io_ctx_, "metadata_cache_name", "replicaset_name",
-        routing::RoutingStrategy::kUndefined, uri.query,
-        Protocol::Type::kClassicProtocol));
+        io_ctx_, "metadata_cache_name", routing::RoutingStrategy::kUndefined,
+        uri.query, Protocol::Type::kClassicProtocol));
   }
 
   // invalid option
@@ -1674,10 +1552,10 @@
         "metadata-cache://test/"
         "default?role=SECONDARY&disconnect_on_promoted_to_primary=invalid");
     ASSERT_THROW_LIKE(
-        DestMetadataCacheGroup dest(
-            io_ctx_, "metadata_cache_name", "replicaset_name",
-            routing::RoutingStrategy::kUndefined, uri.query,
-            Protocol::Type::kClassicProtocol),
+        DestMetadataCacheGroup dest(io_ctx_, "metadata_cache_name",
+                                    routing::RoutingStrategy::kUndefined,
+                                    uri.query,
+                                    Protocol::Type::kClassicProtocol),
         std::runtime_error,
         "Invalid value for option 'disconnect_on_promoted_to_primary'. Allowed "
         "are 'yes' and 'no'");
@@ -1689,7 +1567,7 @@
         "metadata-cache://test/"
         "default?role=PRIMARY&disconnect_on_promoted_to_primary=invalid");
     ASSERT_THROW_LIKE(DestMetadataCacheGroup dest(
-                          io_ctx_, "metadata_cache_name", "replicaset_name",
+                          io_ctx_, "metadata_cache_name",
                           routing::RoutingStrategy::kUndefined, uri.query,
                           Protocol::Type::kClassicProtocol),
                       std::runtime_error,
@@ -1705,9 +1583,8 @@
         "metadata-cache://test/"
         "default?role=SECONDARY&disconnect_on_metadata_unavailable=yes");
     ASSERT_NO_THROW(DestMetadataCacheGroup dest(
-        io_ctx_, "metadata_cache_name", "replicaset_name",
-        routing::RoutingStrategy::kUndefined, uri.query,
-        Protocol::Type::kClassicProtocol));
+        io_ctx_, "metadata_cache_name", routing::RoutingStrategy::kUndefined,
+        uri.query, Protocol::Type::kClassicProtocol));
   }
 
   // no valid
@@ -1716,9 +1593,8 @@
         "metadata-cache://test/"
         "default?role=SECONDARY&disconnect_on_metadata_unavailable=no");
     ASSERT_NO_THROW(DestMetadataCacheGroup dest(
-        io_ctx_, "metadata_cache_name", "replicaset_name",
-        routing::RoutingStrategy::kUndefined, uri.query,
-        Protocol::Type::kClassicProtocol));
+        io_ctx_, "metadata_cache_name", routing::RoutingStrategy::kUndefined,
+        uri.query, Protocol::Type::kClassicProtocol));
   }
 
   // invalid option
@@ -1727,10 +1603,10 @@
         "metadata-cache://test/"
         "default?role=SECONDARY&disconnect_on_metadata_unavailable=invalid");
     ASSERT_THROW_LIKE(
-        DestMetadataCacheGroup dest(
-            io_ctx_, "metadata_cache_name", "replicaset_name",
-            routing::RoutingStrategy::kUndefined, uri.query,
-            Protocol::Type::kClassicProtocol),
+        DestMetadataCacheGroup dest(io_ctx_, "metadata_cache_name",
+                                    routing::RoutingStrategy::kUndefined,
+                                    uri.query,
+                                    Protocol::Type::kClassicProtocol),
         std::runtime_error,
         "Invalid value for option 'disconnect_on_metadata_unavailable'. "
         "Allowed are 'yes' and 'no'");
@@ -1743,7 +1619,7 @@
         "metadata-cache://test/default?role=SECONDARY&xxx=yyy,metadata-cache://"
         "test2/default?role=SECONDARY");
     ASSERT_THROW_LIKE(DestMetadataCacheGroup dest(
-                          io_ctx_, "metadata_cache_name", "replicaset_name",
+                          io_ctx_, "metadata_cache_name",
                           routing::RoutingStrategy::kUndefined, uri.query,
                           Protocol::Type::kClassicProtocol),
                       std::runtime_error,
diff -Nru mysql-8.0-8.0.26/router/src/routing/tests/test_routing.cc mysql-8.0-8.0.27/router/src/routing/tests/test_routing.cc
--- mysql-8.0-8.0.26/router/src/routing/tests/test_routing.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/src/routing/tests/test_routing.cc	2021-09-28 11:46:34.000000000 +0000
@@ -85,7 +85,7 @@
 
 TEST_F(RoutingTests, Defaults) {
   ASSERT_EQ(routing::kDefaultWaitTimeout, 0);
-  ASSERT_EQ(routing::kDefaultMaxConnections, 512);
+  ASSERT_EQ(routing::kDefaultMaxConnections, 0);
   ASSERT_EQ(routing::kDefaultDestinationConnectionTimeout,
             std::chrono::seconds(1));
   ASSERT_EQ(routing::kDefaultBindAddress, "127.0.0.1");
@@ -248,14 +248,6 @@
   std::atomic_bool stop_;
 };
 
-// sunpro tries to invoke the disabled copy-constructor of sock.
-// while GCC complains about "redundant move in return statement".
-#if defined(__SUNPRO_CC)
-#define WORKAROUND_RETURN_NON_COPYABLE_EXPECTED(x) std::move(x)
-#else
-#define WORKAROUND_RETURN_NON_COPYABLE_EXPECTED(x) (x)
-#endif
-
 static stdx::expected<net::ip::tcp::socket, std::error_code> connect_tcp(
     net::io_context &io_ctx, const std::string &host, uint16_t port,
     std::chrono::milliseconds connect_timeout) {
@@ -302,7 +294,7 @@
           } else {
             // success, we can continue
             sock.native_non_blocking(false);
-            return WORKAROUND_RETURN_NON_COPYABLE_EXPECTED(sock);
+            return sock;
           }
         }
       } else {
@@ -312,7 +304,7 @@
       // everything is fine, we are connected
       sock.native_non_blocking(false);
 
-      return WORKAROUND_RETURN_NON_COPYABLE_EXPECTED(sock);
+      return sock;
     }
 
     // it failed, try the next address
@@ -364,7 +356,7 @@
     return stdx::make_unexpected(socket_res.error());
   }
 
-  return WORKAROUND_RETURN_NON_COPYABLE_EXPECTED(sock);
+  return sock;
 }
 #endif
 
@@ -468,6 +460,9 @@
     thd.join();
   });
 
+  mysql_harness::Config conf;
+  MySQLRoutingComponent::get_instance().init(conf);
+
   // set the number of accepts that the server should expect for before
   // stopping
   server.stop_after_n_accepts(expected_accepts);
diff -Nru mysql-8.0-8.0.26/router/tests/CMakeLists.txt mysql-8.0-8.0.27/router/tests/CMakeLists.txt
--- mysql-8.0-8.0.26/router/tests/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -36,6 +36,7 @@
   helpers/mysql_session_replayer.cc
   helpers/process_manager.cc
   helpers/process_wrapper.cc
+  helpers/router_component_clusterset.cc
   helpers/router_component_test.cc
   helpers/router_component_testutils.cc
   helpers/router_component_system_layout.cc
diff -Nru mysql-8.0-8.0.26/router/tests/component/CMakeLists.txt mysql-8.0-8.0.27/router/tests/component/CMakeLists.txt
--- mysql-8.0-8.0.26/router/tests/component/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -36,8 +36,10 @@
     test_async_replicaset.cc
     test_bootstrap.cc
     test_bootstrap_account.cc
+    test_bootstrap_clusterset.cc
     test_bootstrap_system_deployment.cc
     test_bootstrap_tls_endpoint.cc
+    test_clusterset.cc
     test_component_test_framework.cc
     test_config.cc
     test_gr_notifications.cc
@@ -69,6 +71,7 @@
   INCLUDE_DIRS
     ${PROJECT_SOURCE_DIR}/src/http/include/
     ${PROJECT_SOURCE_DIR}/src/mock_server/include/mysqlrouter/
+    ${CMAKE_SOURCE_DIR}/plugin/x/client
   SYSTEM_INCLUDE_DIRS ${GMOCK_INCLUDE_DIRS} ${LIBEVENT_INCLUDE_DIRS}
                       ${PROTOBUF_INCLUDE_DIR} ${MYSQLX_GENERATE_DIR}
   LIB_DEPENDS
@@ -76,6 +79,9 @@
   http_common
   mock_server_rest_client
   mysql_protocol
+  mysqlxclient_lite
+  mysqlxmessages_lite
+  ${PROTOBUF_LITE_LIBRARY}
 
   DEPENDS
   http_auth_backend
diff -Nru mysql-8.0-8.0.26/router/tests/component/data/bootstrap_access_error_at_grant.js mysql-8.0-8.0.27/router/tests/component/data/bootstrap_access_error_at_grant.js
--- mysql-8.0-8.0.26/router/tests/component/data/bootstrap_access_error_at_grant.js	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/data/bootstrap_access_error_at_grant.js	2021-09-28 11:46:34.000000000 +0000
@@ -39,6 +39,7 @@
       "router_grant_on_routers",
       "router_grant_on_v2_routers",
       "router_update_routers_in_metadata",
+      "router_update_router_options_in_metadata",
     ],
     options);
 
diff -Nru mysql-8.0-8.0.26/router/tests/component/data/bootstrap_account_host_multiple_patterns.js mysql-8.0-8.0.27/router/tests/component/data/bootstrap_account_host_multiple_patterns.js
--- mysql-8.0-8.0.26/router/tests/component/data/bootstrap_account_host_multiple_patterns.js	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/data/bootstrap_account_host_multiple_patterns.js	2021-09-28 11:46:34.000000000 +0000
@@ -42,6 +42,7 @@
           "router_grant_on_pfs_db",
           "router_grant_on_routers",
           "router_update_routers_in_metadata",
+          "router_update_router_options_in_metadata",
         ],
         options);
 
diff -Nru mysql-8.0-8.0.26/router/tests/component/data/bootstrap_account_tests.js mysql-8.0-8.0.27/router/tests/component/data/bootstrap_account_tests.js
--- mysql-8.0-8.0.26/router/tests/component/data/bootstrap_account_tests.js	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/data/bootstrap_account_tests.js	2021-09-28 11:46:34.000000000 +0000
@@ -52,6 +52,7 @@
       "router_grant_on_routers",           //   /
       "router_grant_on_v2_routers",        //   /
       "router_update_routers_in_metadata",
+      "router_update_router_options_in_metadata",
       "router_select_router_id",
     ],
     options);
diff -Nru mysql-8.0-8.0.26/router/tests/component/data/bootstrap_ar.js mysql-8.0-8.0.27/router/tests/component/data/bootstrap_ar.js
--- mysql-8.0-8.0.26/router/tests/component/data/bootstrap_ar.js	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/data/bootstrap_ar.js	2021-09-28 11:46:34.000000000 +0000
@@ -35,6 +35,7 @@
       "router_grant_on_routers",
       "router_grant_on_v2_routers",
       "router_update_routers_in_metadata",
+      "router_update_router_options_in_metadata",
     ],
     options);
 
diff -Nru mysql-8.0-8.0.26/router/tests/component/data/bootstrap_big_data.js mysql-8.0-8.0.27/router/tests/component/data/bootstrap_big_data.js
--- mysql-8.0-8.0.26/router/tests/component/data/bootstrap_big_data.js	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/data/bootstrap_big_data.js	2021-09-28 11:46:34.000000000 +0000
@@ -33,6 +33,7 @@
       "router_grant_on_routers",
       "router_grant_on_v2_routers",
       "router_update_routers_in_metadata",
+      "router_update_router_options_in_metadata",
     ],
     options);
 
diff -Nru mysql-8.0-8.0.26/router/tests/component/data/bootstrap_clusterset.js mysql-8.0-8.0.27/router/tests/component/data/bootstrap_clusterset.js
--- mysql-8.0-8.0.26/router/tests/component/data/bootstrap_clusterset.js	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/data/bootstrap_clusterset.js	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,84 @@
+var common_stmts = require("common_statements");
+
+var options = {
+  cluster_type: "gr",
+
+  metadata_schema_version: [2, 1, 0],
+  clusterset_present: 1,
+  clusterset_target_cluster_id: mysqld.global.target_cluster_id,
+  clusterset_data: mysqld.global.clusterset_data,
+  clusterset_data: mysqld.global.clusterset_data,
+  clusterset_simulate_cluster_not_found:
+      mysqld.global.simulate_cluster_not_found,
+  router_expected_target_cluster: mysqld.global.router_expected_target_cluster,
+  group_replication_name:
+      mysqld.global.clusterset_data
+          .clusters[mysqld.global.clusterset_data.this_cluster_id]
+          .gr_uuid,
+};
+
+var common_responses = common_stmts.prepare_statement_responses(
+    [
+      "router_set_session_options",
+      "router_set_gr_consistency_level",
+      "router_select_schema_version",
+      "router_select_cluster_type_v2",
+      "router_count_clusters_v2",
+      "router_check_member_state",
+      "router_select_members_count",
+      "router_select_replication_group_name",
+      "router_show_cipher_status",
+      "router_select_cluster_instances_v2",
+      "router_start_transaction",
+      "router_commit",
+
+      // account verification
+      //"router_select_metadata_v2_gr",
+      //"router_select_group_replication_primary_member",
+      //"router_select_group_membership_with_primary_mode",
+
+      // clusterset specific
+      "router_clusterset_cluster_info_by_name",
+      "router_clusterset_cluster_info_current_cluster",
+      "router_clusterset_cluster_info_primary",
+      "router_clusterset_all_nodes",
+      "router_clusterset_present",
+      "router_clusterset_id_current",
+      "router_clusterset_view_id",
+    ],
+    options);
+
+var common_responses_regex = common_stmts.prepare_statement_responses_regex(
+    [
+      "router_insert_into_routers",
+      "router_create_user_if_not_exists",
+      "router_grant_on_metadata_db",
+      "router_grant_on_pfs_db",
+      "router_grant_on_routers",
+      "router_grant_on_v2_routers",
+      "router_clusterset_update_routers_in_metadata",
+      "router_update_router_options_in_metadata",
+      "router_clusterset_cluster_info_by_name_unknown",
+    ],
+    options);
+
+({
+  handshake: {
+    auth: {
+      username: "root",
+      password: "fake-pass",
+    }
+  },
+  stmts: function(stmt) {
+    var res;
+    if (common_responses.hasOwnProperty(stmt)) {
+      return common_responses[stmt];
+    } else if (
+        (res = common_stmts.handle_regex_stmt(stmt, common_responses_regex)) !==
+        undefined) {
+      return res;
+    } else {
+      return common_stmts.unknown_statement_response(stmt);
+    }
+  }
+})
diff -Nru mysql-8.0-8.0.26/router/tests/component/data/bootstrap_exec_time_2_seconds.js mysql-8.0-8.0.27/router/tests/component/data/bootstrap_exec_time_2_seconds.js
--- mysql-8.0-8.0.26/router/tests/component/data/bootstrap_exec_time_2_seconds.js	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/data/bootstrap_exec_time_2_seconds.js	2021-09-28 11:46:34.000000000 +0000
@@ -39,6 +39,7 @@
       "router_grant_on_routers",
       "router_grant_on_v2_routers",
       "router_update_routers_in_metadata",
+      "router_update_router_options_in_metadata",
     ],
     options);
 
diff -Nru mysql-8.0-8.0.26/router/tests/component/data/bootstrap_failover_reconfigure_ok_3_old_users.js mysql-8.0-8.0.27/router/tests/component/data/bootstrap_failover_reconfigure_ok_3_old_users.js
--- mysql-8.0-8.0.26/router/tests/component/data/bootstrap_failover_reconfigure_ok_3_old_users.js	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/data/bootstrap_failover_reconfigure_ok_3_old_users.js	2021-09-28 11:46:34.000000000 +0000
@@ -24,6 +24,7 @@
       "router_grant_on_routers",
       "router_grant_on_v2_routers",
       "router_update_routers_in_metadata",
+      "router_update_router_options_in_metadata",
       "router_drop_users",
     ],
     options);
@@ -37,7 +38,7 @@
         undefined) {
       return res;
     } else {
-      return common_stmts.unknown_statement_response("TODO:" + stmt);
+      return common_stmts.unknown_statement_response(stmt);
     }
   }
 })
diff -Nru mysql-8.0-8.0.26/router/tests/component/data/bootstrap_failover_reconfigure_ok.js mysql-8.0-8.0.27/router/tests/component/data/bootstrap_failover_reconfigure_ok.js
--- mysql-8.0-8.0.26/router/tests/component/data/bootstrap_failover_reconfigure_ok.js	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/data/bootstrap_failover_reconfigure_ok.js	2021-09-28 11:46:34.000000000 +0000
@@ -35,6 +35,7 @@
       "router_grant_on_v2_routers",
       "router_grant_on_routers",
       "router_update_routers_in_metadata",
+      "router_update_router_options_in_metadata",
     ],
     options);
 
diff -Nru mysql-8.0-8.0.26/router/tests/component/data/bootstrap_failover_super_read_only_1_ar.js mysql-8.0-8.0.27/router/tests/component/data/bootstrap_failover_super_read_only_1_ar.js
--- mysql-8.0-8.0.26/router/tests/component/data/bootstrap_failover_super_read_only_1_ar.js	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/data/bootstrap_failover_super_read_only_1_ar.js	2021-09-28 11:46:34.000000000 +0000
@@ -43,6 +43,7 @@
       "router_grant_on_routers",
       "router_grant_on_v2_routers",
       "router_update_routers_in_metadata",
+      "router_update_router_options_in_metadata",
     ],
     options);
 
diff -Nru mysql-8.0-8.0.26/router/tests/component/data/bootstrap_failover_super_read_only_1_gr.js mysql-8.0-8.0.27/router/tests/component/data/bootstrap_failover_super_read_only_1_gr.js
--- mysql-8.0-8.0.26/router/tests/component/data/bootstrap_failover_super_read_only_1_gr.js	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/data/bootstrap_failover_super_read_only_1_gr.js	2021-09-28 11:46:34.000000000 +0000
@@ -44,6 +44,7 @@
       "router_grant_on_routers",
       "router_grant_on_v2_routers",
       "router_update_routers_in_metadata",
+      "router_update_router_options_in_metadata",
     ],
     options);
 
diff -Nru mysql-8.0-8.0.26/router/tests/component/data/bootstrap_failover_super_read_only_delete_user_gr.js mysql-8.0-8.0.27/router/tests/component/data/bootstrap_failover_super_read_only_delete_user_gr.js
--- mysql-8.0-8.0.26/router/tests/component/data/bootstrap_failover_super_read_only_delete_user_gr.js	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/data/bootstrap_failover_super_read_only_delete_user_gr.js	2021-09-28 11:46:34.000000000 +0000
@@ -59,7 +59,7 @@
         }
       }
     } else {
-      return common_stmts.unknown_statement_response("TODO0000:" + stmt);
+      return common_stmts.unknown_statement_response(stmt);
     }
   }
 })
diff -Nru mysql-8.0-8.0.26/router/tests/component/data/bootstrap_gr.js mysql-8.0-8.0.27/router/tests/component/data/bootstrap_gr.js
--- mysql-8.0-8.0.26/router/tests/component/data/bootstrap_gr.js	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/data/bootstrap_gr.js	2021-09-28 11:46:34.000000000 +0000
@@ -9,8 +9,14 @@
   mysqld.global.cluster_name = "mycluster";
 }
 
+if (mysqld.global.metadata_version === undefined) {
+  mysqld.global.metadata_version = [2, 0, 3];
+}
+
 var options = {
+  metadata_schema_version: mysqld.global.metadata_version,
   cluster_type: "gr",
+  clusterset_present: 0,
   innodb_cluster_name: mysqld.global.cluster_name,
   innodb_cluster_instances: mysqld.global.innodb_cluster_instances,
 };
@@ -37,6 +43,12 @@
     ],
     options);
 
+var common_responses_v2_1 = common_stmts.prepare_statement_responses(
+    [
+      "router_clusterset_present",
+    ],
+    options);
+
 var common_responses_regex = common_stmts.prepare_statement_responses_regex(
     [
       "router_insert_into_routers",
@@ -46,6 +58,7 @@
       "router_grant_on_routers",
       "router_grant_on_v2_routers",
       "router_update_routers_in_metadata",
+      "router_update_router_options_in_metadata",
     ],
     options);
 
@@ -60,6 +73,13 @@
     var res;
     if (common_responses.hasOwnProperty(stmt)) {
       return common_responses[stmt];
+    }
+    // metadata ver 2.1+
+    else if (
+        (mysqld.global.metadata_version[0] >= 2 &&
+         mysqld.global.metadata_version[1] >= 1) &&
+        common_responses_v2_1.hasOwnProperty(stmt)) {
+      return common_responses_v2_1[stmt];
     } else if (
         (res = common_stmts.handle_regex_stmt(stmt, common_responses_regex)) !==
         undefined) {
diff -Nru mysql-8.0-8.0.26/router/tests/component/data/bootstrap_report_host.js mysql-8.0-8.0.27/router/tests/component/data/bootstrap_report_host.js
--- mysql-8.0-8.0.26/router/tests/component/data/bootstrap_report_host.js	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/data/bootstrap_report_host.js	2021-09-28 11:46:34.000000000 +0000
@@ -38,6 +38,7 @@
       "router_grant_on_routers",
       "router_grant_on_v2_routers",
       "router_update_routers_in_metadata",
+      "router_update_router_options_in_metadata",
 
       // to avoid creating yet another .js just for one test, below entry was
       // added so this .js can be reused by test:
diff -Nru mysql-8.0-8.0.26/router/tests/component/data/local_modules/common_statements.js mysql-8.0-8.0.27/router/tests/component/data/local_modules/common_statements.js
--- mysql-8.0-8.0.26/router/tests/component/data/local_modules/common_statements.js	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/data/local_modules/common_statements.js	2021-09-28 11:46:34.000000000 +0000
@@ -32,6 +32,47 @@
   create_user_warning_count: 0,
   create_user_show_warnings_results: [],
 
+  bootstrap_target_type: "cluster",
+  clusterset_present: 0,
+  clusterset_target_cluster_id: 0,
+  // JSON object describing the clusterset
+  // this default is needed for tests that do not use ClusterSets because this
+  // data is used in "stmt"
+  clusterset_data: {
+    "clusterset_id": "clusterset-uuid",
+    "clusterset_name": "clusterset-name",
+    "this_cluster_id": 0,
+    "target_cluster_id": 0,
+    "primary_cluster_id": 0,
+    "clusters": [
+      {
+        "primary_node_id": 0,
+        "uuid": "cluster-id-1",
+        "name": "cluster-name-1",
+        "role": "PRIMARY",
+        "gr_uuid": "gr-id-1",
+        "nodes": [
+          {"host": "127.0.0.1", "classic_port": 11010, "http_port": 11011},
+          {"host": "127.0.0.1", "classic_port": 11012, "http_port": 11013}
+        ],
+        "primary_node_id": 0
+      },
+      {
+        "primary_node_id": 0,
+        "uuid": "cluster-id-2",
+        "name": "cluster-name-2",
+        "role": "SECONDARY",
+        "gr_uuid": "gr-id-2",
+        "nodes": [
+          {"host": "127.0.0.1", "classic_port": 11014, "http_port": 11015},
+          {"host": "127.0.0.1", "classic_port": 11016, "http_port": 11017}
+        ],
+        "primary_node_id": 0
+      }
+    ]
+  },
+  clusterset_simulate_cluster_not_found: 0,
+
   user_host_pattern: ".*",
   cluster_type: "gr",
   view_id: 1,
@@ -41,7 +82,15 @@
   // mean failures each time the version is bumped up (which we don't even
   // control)
   router_version: "",
-  rest_user_credentials: []
+  router_rw_classic_port: "",
+  router_ro_classic_port: "",
+  router_rw_x_port: "",
+  router_ro_x_port: "",
+  router_metadata_user: "",
+  rest_user_credentials: [],
+  version: "8.0.24",  // SELECT @@version;
+  router_expected_target_cluster: ".*",
+  router_options: "",
 };
 
 function ensure_type(options, field, expected_type) {
@@ -245,6 +294,34 @@
           }),
         }
       };
+
+    case "router_select_metadata_v2_gr_by_cluster_id":
+      return {
+        stmt:
+            "select I.mysql_server_uuid, I.endpoint, I.xendpoint, I.attributes from mysql_innodb_cluster_metadata.v2_instances I join mysql_innodb_cluster_metadata.v2_gr_clusters C on I.cluster_id = C.cluster_id where C.cluster_id = '" +
+            options.cluster_id + "'" +
+            (options.gr_id === undefined || options.gr_id === "" ?
+                 "" :
+                 (" AND C.group_name = '" + options.gr_id + "'")),
+        result: {
+          columns: [
+            {"name": "mysql_server_uuid", "type": "VAR_STRING"},
+            {"name": "I.addresses->>'$.mysqlClassic'", "type": "LONGBLOB"},
+            {"name": "I.addresses->>'$.mysqlX'", "type": "LONGBLOB"},
+            {"name": "I.attributes", "type": "VAR_STRING"}
+          ],
+          rows: options["group_replication_membership"].map(function(
+              currentValue) {
+            var xport = currentValue[4] === undefined ? 0 : currentValue[4];
+            var attributes =
+                currentValue[5] === undefined ? "" : currentValue[5];
+            return [
+              currentValue[0], currentValue[1] + ":" + currentValue[2],
+              currentValue[1] + ":" + xport, attributes
+            ]
+          }),
+        }
+      };
     case "router_select_metadata_v2_ar":
       return {
         stmt:
@@ -450,9 +527,9 @@
       return {
         "stmt_regex":
             "^UPDATE mysql_innodb_cluster_metadata\\.routers SET attributes =    " +
-            "JSON_SET\\(JSON_SET\\(JSON_SET\\(JSON_SET\\(JSON_SET\\(IF\\(attributes IS NULL, '\\{\\}', attributes\\),    " +
+            "JSON_SET\\(JSON_SET\\(JSON_SET\\(JSON_SET\\(JSON_SET\\(JSON_SET\\(IF\\(attributes IS NULL, '\\{\\}', attributes\\),    " +
             "'\\$\\.RWEndpoint', '.*'\\),    '\\$\\.ROEndpoint', '.*'\\),    '\\$\\.RWXEndpoint', '.*'\\),    " +
-            "'\\$\\.ROXEndpoint', '.*'\\),    '\\$.MetadataUser', 'mysql_router.*'\\) " +
+            "'\\$\\.ROXEndpoint', '.*'\\),    '\\$.MetadataUser', 'mysql_router.*'\\),    '\\$.bootstrapTargetType', '.*'\\) " +
             "WHERE router_id = .*",
         "ok": {}
       };
@@ -460,9 +537,30 @@
       return {
         "stmt_regex":
             "^UPDATE mysql_innodb_cluster_metadata\\.v2_routers SET attributes =    " +
-            "JSON_SET\\(JSON_SET\\(JSON_SET\\(JSON_SET\\(JSON_SET\\(IF\\(attributes IS NULL, '\\{\\}', attributes\\),    " +
+            "JSON_SET\\(JSON_SET\\(JSON_SET\\(JSON_SET\\(JSON_SET\\(JSON_SET\\(IF\\(attributes IS NULL, '\\{\\}', attributes\\),    " +
             "'\\$\\.RWEndpoint', '.*'\\),    '\\$\\.ROEndpoint', '.*'\\),    '\\$\\.RWXEndpoint', '.*'\\),    " +
-            "'\\$\\.ROXEndpoint', '.*'\\),    '\\$.MetadataUser', '.*'\\), version = '.*', cluster_id = '.*' " +
+            "'\\$\\.ROXEndpoint', '.*'\\),    '\\$\\.MetadataUser', '.*'\\),    '\\$\\.bootstrapTargetType', '.*'\\), " +
+            "version = '.*', cluster_id = '.*' " +
+            "WHERE router_id = .*",
+        "ok": {}
+      };
+    case "router_clusterset_update_routers_in_metadata":
+      return {
+        "stmt_regex":
+            "^UPDATE mysql_innodb_cluster_metadata\\.v2_routers SET attributes =    " +
+            "JSON_SET\\(JSON_SET\\(JSON_SET\\(JSON_SET\\(JSON_SET\\(JSON_SET\\(IF\\(attributes IS NULL, '\\{\\}', attributes\\),    " +
+            "'\\$\\.RWEndpoint', '.*'\\),    '\\$\\.ROEndpoint', '.*'\\),    '\\$\\.RWXEndpoint', '.*'\\),    " +
+            "'\\$\\.ROXEndpoint', '.*'\\),    '\\$\\.MetadataUser', '.*'\\),    '\\$\\.bootstrapTargetType', '.*'\\), " +
+            "version = '.*', clusterset_id = '.*' " +
+            "WHERE router_id = .*",
+        "ok": {}
+      };
+    case "router_update_router_options_in_metadata":
+      return {
+        "stmt_regex":
+            "^UPDATE mysql_innodb_cluster_metadata\\.v2_routers SET " +
+            "options = JSON_SET\\(IF\\(options IS NULL, '\\{\\}', options\\), '\\$\\.target_cluster', '" +
+            options.router_expected_target_cluster + "'\\) " +
             "WHERE router_id = .*",
         "ok": {}
       };
@@ -673,19 +771,28 @@
           "rows": [[options.cluster_id]]
         }
       };
-    case "router_update_version_v1":
+    case "router_update_attributes_v1":
       return {
         "stmt_regex": "UPDATE mysql_innodb_cluster_metadata\.routers" +
-            " SET attributes = JSON_SET\(IF\(attributes IS NULL, '\{\}', attributes\), " +
-            "'\$\.version', .*\) WHERE router_id = " + options.router_id,
+            " SET attributes = JSON_SET\(JSON_SET\(JSON_SET\(JSON_SET\(JSON_SET\(JSON_SET\(" +
+            " IF\(attributes IS NULL, '\{\}', attributes\), '\$\.version', '.*'\)," +
+            " '\$\.RWEndpoint', '.*'\), '\$\.ROEndpoint', '.*'\), '\$\.RWXEndpoint', '.*'\)," +
+            " '\$\.ROXEndpoint', '.*'\), '\$\.MetadataUser', '.*'\) WHERE router_id = " +
+            options.router_id,
         "ok": {}
       };
-    case "router_update_version_strict_v1":
+    case "router_update_attributes_strict_v1":
       // the exact match, not regex
       return {
         "stmt": "UPDATE mysql_innodb_cluster_metadata.routers" +
-            " SET attributes = JSON_SET(IF(attributes IS NULL, '{}', attributes), " +
-            "'$.version', '" + options.router_version +
+            " SET attributes = JSON_SET(JSON_SET(JSON_SET(JSON_SET(JSON_SET(JSON_SET(" +
+            " IF(attributes IS NULL, '{}', attributes)," +
+            " '$.version', '" + options.router_version +
+            "'), '$.RWEndpoint', '" + options.router_rw_classic_port +
+            "'), '$.ROEndpoint', '" + options.router_ro_classic_port +
+            "'), '$.RWXEndpoint', '" + options.router_rw_x_port +
+            "'), '$.ROXEndpoint', '" + options.router_ro_x_port +
+            "'), '$.MetadataUser', '" + options.router_metadata_user +
             "') WHERE router_id = " + options.router_id,
         "ok": {}
       };
@@ -709,18 +816,27 @@
           rows: options.create_user_show_warnings_results
         }
       };
-    case "router_update_version_v2":
+    case "router_update_attributes_v2":
       return {
-        "stmt_regex":
-            "UPDATE mysql_innodb_cluster_metadata\.v2_routers set version = .*" +
-            " where router_id = .+",
+        "stmt_regex": "UPDATE mysql_innodb_cluster_metadata\.v2_routers" +
+            " SET version = .*, attributes = JSON_SET\(JSON_SET\(JSON_SET\(JSON_SET\(JSON_SET\(" +
+            " IF\(attributes IS NULL, '\{\}', attributes\)," +
+            " '\$\.RWEndpoint', '.*'\), '\$\.ROEndpoint', '.*'\), '\$\.RWXEndpoint', '.*'\)," +
+            " '\$\.ROXEndpoint', '.*'\), '\$\.MetadataUser', '.*'\) WHERE router_id = .*",
         "ok": {}
       };
-    case "router_update_version_strict_v2":
+    case "router_update_attributes_strict_v2":
       return {
-        "stmt":
-            "UPDATE mysql_innodb_cluster_metadata.v2_routers set version = '" +
-            options.router_version + "' where router_id = " + options.router_id,
+        "stmt": "UPDATE mysql_innodb_cluster_metadata.v2_routers" +
+            " SET version = '" + options.router_version +
+            "', attributes = JSON_SET(JSON_SET(JSON_SET(JSON_SET(JSON_SET(" +
+            " IF(attributes IS NULL, '{}', attributes)," +
+            " '$.RWEndpoint', '" + options.router_rw_classic_port +
+            "'), '$.ROEndpoint', '" + options.router_ro_classic_port +
+            "'), '$.RWXEndpoint', '" + options.router_rw_x_port +
+            "'), '$.ROXEndpoint', '" + options.router_ro_x_port +
+            "'), '$.MetadataUser', '" + options.router_metadata_user +
+            "') WHERE router_id = " + options.router_id,
         "ok": {}
       };
     case "router_update_last_check_in_v2":
@@ -753,23 +869,461 @@
             "cluster_id=(SELECT cluster_id FROM " +
             "mysql_innodb_cluster_metadata.v2_clusters WHERE cluster_name='" +
             options.innodb_cluster_name + "')",
-            "result": {
-              "columns":
+        "result": {
+          "columns": [
+            {"type": "STRING", "name": "user"},
+            {"type": "STRING", "name": "authentication_string"},
+            {"type": "STRING", "name": "privileges"},
+            {"type": "STRING", "name": "authentication_method"}
+          ],
+          "rows": options["rest_user_credentials"].map(function(currentValue) {
+            return [
+              currentValue[0],
+              currentValue[1],
+              currentValue[2] === "" ? null : currentValue[2],
+              currentValue[3],
+            ]
+          })
+        }
+      };
+    case "mysqlsh_select_connection_id":
+      // needed by mysqlsh to start.
+      return {
+        "stmt":
+            "select @@lower_case_table_names, @@version, connection_id(), variable_value " +
+            "from performance_schema.session_status " +
+            "where variable_name = 'mysqlx_ssl_cipher'",
+        "result": {
+          "columns": [
+            {"type": "LONG", "name": "@@lower_case_table_names"},
+            {"type": "VAR_STRING", "name": "@@version"},
+            {"type": "LONG", "name": "connection_id()"},
+            {"type": "VAR_STRING", "name": "variable_value"}
+          ],
+          "rows": [[0, options["version"], 1, mysqld.session.mysqlx_ssl_cipher]]
+        }
+      };
+    case "mysqlsh_select_version_comment":
+      // needed by mysqlsh to start.
+      return {
+        "stmt": "select concat(@@version, ' ', @@version_comment)",
+        "result": {
+          "columns": [
+            {
+              "type": "VAR_STRING",
+              "name": "concat(@@version, ' ', @@version_comment)"
+            },
+          ],
+          "rows": [[options["version"] + " " + options["version_comment"]]]
+        }
+      };
+    case "router_clusterset_cluster_info_by_name":
+      return {
+        stmt:
+            "select C.cluster_id, C.attributes->>'$.group_replication_group_name', CS.domain_name, CSM.member_role from mysql_innodb_cluster_metadata.v2_gr_clusters C join mysql_innodb_cluster_metadata.v2_cs_members CSM on CSM.cluster_id = C.cluster_id join mysql_innodb_cluster_metadata.v2_cs_clustersets CS on CS.clusterset_id = CSM.clusterset_id where C.cluster_name = '" +
+            options.clusterset_data
+                .clusters[options.clusterset_target_cluster_id]
+                .name +
+            "'",
+        result: {
+          columns: [
+            {"type": "STRING", "name": "C.cluster_id"},
+            {
+              "type": "STRING",
+              "name": "C.attributes->>'$.group_replication_group_name'"
+            },
+            {"type": "STRING", "name": "CS.domain_name"},
+            {"type": "STRING", "name": "CSM.member_role"},
+          ],
+          rows: [[
+            options.clusterset_data
+                .clusters[options.clusterset_target_cluster_id]
+                .uuid,
+            options.clusterset_data
+                .clusters[options.clusterset_target_cluster_id]
+                .gr_uuid,
+            options.clusterset_data.clusterset_name,
+            options.clusterset_data
+                .clusters[options.clusterset_target_cluster_id]
+                .role
+          ]]
+        }
+      };
+    case "router_clusterset_cluster_info_by_name_unknown":
+      return {
+        stmt_regex:
+            "select C.cluster_id, C.attributes->>'\\$.group_replication_group_name', CS.domain_name, CSM.member_role from mysql_innodb_cluster_metadata.v2_gr_clusters C join mysql_innodb_cluster_metadata.v2_cs_members CSM on CSM.cluster_id = C.cluster_id join mysql_innodb_cluster_metadata.v2_cs_clustersets CS on CS.clusterset_id = CSM.clusterset_id where C.cluster_name = .*",
+        result: {
+          columns: [
+            {"type": "STRING", "name": "C.cluster_id"},
+            {
+              "type": "STRING",
+              "name": "C.attributes->>'$.group_replication_group_name'"
+            },
+            {"type": "STRING", "name": "CS.domain_name"},
+            {"type": "STRING", "name": "CSM.member_role"},
+          ],
+          rows: []
+        }
+      };
+    case "router_clusterset_cluster_info_current_cluster":
+      return {
+        stmt:
+            "select C.cluster_id, C.attributes->>'$.group_replication_group_name', CS.domain_name, CSM.member_role from mysql_innodb_cluster_metadata.v2_gr_clusters C join mysql_innodb_cluster_metadata.v2_cs_members CSM on CSM.cluster_id = C.cluster_id join mysql_innodb_cluster_metadata.v2_cs_clustersets CS on CS.clusterset_id = CSM.clusterset_id where C.cluster_id = (select cluster_id from mysql_innodb_cluster_metadata.v2_this_instance)",
+        result: {
+          columns: [
+            {"type": "STRING", "name": "C.cluster_id"},
+            {
+              "type": "STRING",
+              "name": "C.attributes->>'$.group_replication_group_name'"
+            },
+            {"type": "STRING", "name": "CS.domain_name"},
+            {"type": "STRING", "name": "CSM.member_role"},
+          ],
+          rows: options.clusterset_simulate_cluster_not_found ? [] : [[
+            options.clusterset_data
+                .clusters[options.clusterset_target_cluster_id]
+                .uuid,
+            options.clusterset_data
+                .clusters[options.clusterset_target_cluster_id]
+                .gr_uuid,
+            options.clusterset_data.clusterset_name,
+            options.clusterset_data
+                .clusters[options.clusterset_target_cluster_id]
+                .role
+          ]]
+        }
+      };
+    case "router_clusterset_cluster_info_primary":
+      return {
+        stmt:
+            "select C.cluster_id, C.attributes->>'$.group_replication_group_name', CS.domain_name, CSM.member_role from mysql_innodb_cluster_metadata.v2_gr_clusters C join mysql_innodb_cluster_metadata.v2_cs_members CSM on CSM.cluster_id = C.cluster_id join mysql_innodb_cluster_metadata.v2_cs_clustersets CS on CS.clusterset_id = CSM.clusterset_id where CSM.member_role = 'PRIMARY'",
+        result: {
+          columns: [
+            {"type": "STRING", "name": "C.cluster_id"},
+            {
+              "type": "STRING",
+              "name": "C.attributes->>'$.group_replication_group_name'"
+            },
+            {"type": "STRING", "name": "CS.domain_name"},
+            {"type": "STRING", "name": "CSM.member_role"},
+          ],
+          rows: options.clusterset_simulate_cluster_not_found ||
+                  (options.clusterset_data.primary_cluster_id >=
+                   options.clusterset_data.clusters.length) ?
+              [] :
+              [[
+                options.clusterset_data
+                    .clusters[options.clusterset_data.primary_cluster_id]
+                    .uuid,
+                options.clusterset_data
+                    .clusters[options.clusterset_data.primary_cluster_id]
+                    .gr_uuid,
+                options.clusterset_data.clusterset_name, "PRIMARY"
+              ]]
+        }
+      };
+    case "router_clusterset_all_nodes":
+      return {
+        stmt:
+            "select i.address from mysql_innodb_cluster_metadata.v2_instances i where i.cluster_id in " +
+            "(select cluster_id from mysql_innodb_cluster_metadata.v2_cs_members where clusterset_id = (" +
+            "select clusterset_id from mysql_innodb_cluster_metadata.v2_cs_members where cluster_id = '" +
+            options.clusterset_data
+                .clusters[options.clusterset_target_cluster_id]
+                .uuid +
+            "'))",
+        result: {
+          columns: [
+            {"type": "STRING", "name": "i.address"},
+          ],
+
+          rows: options.clusterset_data.clusters
+                    .reduce(
+                        function(nodes, cluster) {
+                          return nodes.concat(cluster.nodes);
+                        },
+                        [])
+                    .map(function(node) {
+                      return [node.host + ":" + node.classic_port]
+                    })
+        }
+      };
+    case "router_clusterset_all_nodes_by_clusterset_id":
+      return {
+        stmt:
+            "select I.address, I.mysql_server_uuid, C.group_name, CSM.member_role from mysql_innodb_cluster_metadata.v2_instances I " +
+            "join mysql_innodb_cluster_metadata.v2_gr_clusters C on I.cluster_id = C.cluster_id join mysql_innodb_cluster_metadata.v2_cs_members CSM " +
+            "on CSM.cluster_id = C.cluster_id left join mysql_innodb_cluster_metadata.v2_cs_clustersets CS on CSM.clusterset_id = CS.clusterset_id " +
+            "where CS.clusterset_id = '" +
+            options.clusterset_data.clusterset_id + "'",
+        result: {
+          columns: [
+            {"type": "STRING", "name": "I.address"},
+            {"type": "STRING", "name": "I.mysql_server_uuid"},
+            {"type": "STRING", "name": "C.cluster_id"},
+            {"type": "STRING", "name": "CSM.member_role"},
+          ],
+
+          rows: options.clusterset_data.clusters
+                    .reduce(
+                        function(nodes, cluster) {
+                          var cluster_nodes = cluster.nodes;
+                          for (var i = 0; i < cluster_nodes.length; i++) {
+                            cluster_nodes[i].cluster_uuid = cluster.gr_uuid;
+                            cluster_nodes[i].cluster_role = cluster.role;
+                          }
+
+                          return nodes.concat(cluster_nodes);
+                        },
+                        [])
+                    .map(function(node) {
+                      return [
+                        node.host + ":" + node.classic_port, node.uuid,
+                        node.cluster_uuid, node.cluster_role
+                      ];
+                    })
+        }
+      };
+    case "router_clusterset_id":
+      return {
+        stmt_regex:
+            "select CSM.clusterset_id from mysql_innodb_cluster_metadata.v2_cs_members CSM join mysql_innodb_cluster_metadata.v2_gr_clusters C on CSM.cluster_id = C.cluster_id where C.group_name = .*",
+        result: {
+          columns: [
+            {"type": "STRING", "name": "CSM.clusterset_id"},
+          ],
+          rows: [[options.clusterset_data.clusterset_id]]
+        }
+      };
+    case "router_clusterset_id_current":
+      return {
+        stmt:
+            "select CSM.clusterset_id from mysql_innodb_cluster_metadata.v2_cs_members CSM join mysql_innodb_cluster_metadata.v2_gr_clusters C on CSM.cluster_id = C.cluster_id where C.cluster_id = (select cluster_id from mysql_innodb_cluster_metadata.v2_this_instance)",
+        result: {
+          columns: [
+            {"type": "STRING", "name": "CSM.clusterset_id"},
+          ],
+          rows: [[options.clusterset_data.clusterset_id]]
+        }
+      };
+    case "router_clusterset_view_id":
+      return {
+        stmt:
+            "select view_id from mysql_innodb_cluster_metadata.v2_cs_clustersets where clusterset_id = '" +
+            options.clusterset_data.clusterset_id + "'",
+        result: {
+          columns: [
+            {"name": "view_id", "type": "LONG"},
+          ],
+          rows: [[options.view_id]]
+        }
+      };
+    case "router_unknown_clusterset_view_id":
+      return {
+        stmt_regex:
+            "select view_id from mysql_innodb_cluster_metadata.v2_cs_clustersets where clusterset_id = .*",
+        result: {
+          columns: [
+            {"name": "view_id", "type": "LONG"},
+          ],
+          rows: []
+        }
+      };
+    case "router_clusterset_present":
+      return {
+        stmt:
+            "select count(clusterset_id) from mysql_innodb_cluster_metadata.v2_this_instance i join mysql_innodb_cluster_metadata.v2_cs_members " +
+            "csm on i.cluster_id = csm.cluster_id where clusterset_id is not null",
+        result: {
+          columns: [
+            {"type": "LONGLONG", "name": "count(clusterset_id)"},
+          ],
+          rows: [[options.clusterset_present]]
+        }
+      };
+    case "router_bootstrap_target_type":
+      return {
+        stmt:
+            "SELECT JSON_UNQUOTE(JSON_EXTRACT(r.attributes, '$.bootstrapTargetType')) " +
+            "FROM mysql_innodb_cluster_metadata.v2_routers r where r.router_id = " +
+            options.router_id,
+        result: {
+          columns: [
+            {"type": "VAR_STRING", "name": "bootstrapTargetType"},
+          ],
+          rows: [[options.bootstrap_target_type]]
+        }
+      };
+    case "router_router_options":
+      return {
+        stmt:
+            "SELECT router_options FROM mysql_innodb_cluster_metadata.v2_cs_router_options where router_id = " +
+            options.router_id,
+        result: {
+          columns: [{"name": "router_options", "type": "VAR_STRING"}],
+          rows: [[options.router_options]]
+        }
+      };
+    case "router_clusterset_select_cluster_instances":
+      return {
+        stmt:
+            "select I.mysql_server_uuid, I.endpoint, I.xendpoint, I.attributes from mysql_innodb_cluster_metadata.v2_instances I join mysql_innodb_cluster_metadata.v2_gr_clusters C on I.cluster_id = C.cluster_id where C.cluster_id = '" +
+            options.clusterset_data
+                .clusters[options.clusterset_target_cluster_id]
+                .uuid +
+            "'",
+        result: {
+          columns: [
+            {"name": "I.mysql_server_uuid", "type": "VAR_STRING"},
+            {"name": "I.endpoint", "type": "LONGBLOB"},
+            {"name": "I.xendpoint", "type": "LONGBLOB"},
+            {"name": "I.attributes", "type": "LONGBLOB"},
+          ],
+          // TODO: xport is hadcoded 0 now
+          // TODO: attributes is hardcoded empty string now
+          rows: options.clusterset_data
+                    .clusters[options.clusterset_target_cluster_id]
+                    .nodes.map(function(node) {
+                      return [
+                        node.uuid, node.host + ":" + node.classic_port,
+                        node.host + ":" + 0, ""
+                      ]
+                    })
+        }
+      };
+    case "router_clusterset_select_cluster_info_by_primary_role":
+      return {
+        stmt:
+            "select C.cluster_id, C.cluster_name, CSM.invalidated, CSM.member_role from mysql_innodb_cluster_metadata.v2_gr_clusters C join " +
+            "mysql_innodb_cluster_metadata.v2_cs_members CSM on CSM.cluster_id = C.cluster_id left join " +
+            "mysql_innodb_cluster_metadata.v2_cs_clustersets CS on CSM.clusterset_id = CS.clusterset_id where " +
+            "CSM.member_role = 'PRIMARY' and CS.clusterset_id = '" +
+            options.clusterset_data.clusterset_id + "'",
+        result: {
+          columns: [
+            {"name": "C.cluster_id", "type": "VAR_STRING"},
+            {"name": "C.cluster_name", "type": "VAR_STRING"},
+            {"name": "CSM.invalidated", "type": "LONGLONG"},
+            {"name": "CSM.member_role", "type": "STRING"},
+          ],
+          rows: options.clusterset_simulate_cluster_not_found ? [] : [[
+            options.clusterset_data
+                .clusters[options.clusterset_target_cluster_id]
+                .uuid,
+            options.clusterset_data
+                .clusters[options.clusterset_target_cluster_id]
+                .name,
+            options.clusterset_data
+                .clusters[options.clusterset_target_cluster_id]
+                .invalid,
+            options.clusterset_data
+                .clusters[options.clusterset_target_cluster_id]
+                .role
+          ]],
+        }
+      };
+    case "router_clusterset_select_cluster_info_by_gr_uuid":
+      return {
+        stmt:
+            "select C.cluster_id, C.cluster_name, CSM.invalidated, CSM.member_role from mysql_innodb_cluster_metadata.v2_gr_clusters C join " +
+            "mysql_innodb_cluster_metadata.v2_cs_members CSM on CSM.cluster_id = C.cluster_id left join " +
+            "mysql_innodb_cluster_metadata.v2_cs_clustersets CS on CSM.clusterset_id = CS.clusterset_id where " +
+            "C.attributes->>'$.group_replication_group_name' = '" +
+            options.clusterset_data
+                .clusters[options.clusterset_target_cluster_id]
+                .gr_uuid +
+            "' and CS.clusterset_id = '" +
+            options.clusterset_data.clusterset_id + "'",
+        result: {
+          columns: [
+            {"name": "C.cluster_id", "type": "VAR_STRING"},
+            {"name": "C.cluster_name", "type": "VAR_STRING"},
+            {"name": "CSM.invalidated", "type": "LONGLONG"},
+            {"name": "CSM.member_role", "type": "STRING"},
+          ],
+          rows: options.clusterset_simulate_cluster_not_found ? [] : [[
+            options.clusterset_data
+                .clusters[options.clusterset_target_cluster_id]
+                .uuid,
+            options.clusterset_data
+                .clusters[options.clusterset_target_cluster_id]
+                .name,
+            options.clusterset_data
+                .clusters[options.clusterset_target_cluster_id]
+                .invalid,
+            options.clusterset_data
+                .clusters[options.clusterset_target_cluster_id]
+                .role
+          ]]
+        }
+      };
+    case "router_clusterset_select_cluster_info_by_gr_uuid_unknown":
+      return {
+        stmt_regex:
+            "select C.cluster_id, C.cluster_name, CSM.invalidated, CSM.member_role from mysql_innodb_cluster_metadata.v2_gr_clusters C join mysql_innodb_cluster_metadata.v2_cs_members CSM on CSM.cluster_id = C.cluster_id left join mysql_innodb_cluster_metadata.v2_cs_clustersets CS on CSM.clusterset_id = CS.clusterset_id where C.attributes->>'\\$.group_replication_group_name' = .*" +
+            " and CS.clusterset_id = '" +
+            options.clusterset_data.clusterset_id + "'",
+        result: {
+          columns: [
+            {"name": "C.cluster_id", "type": "VAR_STRING"},
+            {"name": "C.cluster_name", "type": "VAR_STRING"},
+            {"name": "CSM.invalidated", "type": "LONGLONG"},
+            {"name": "CSM.member_role", "type": "STRING"},
+          ],
+          rows: []
+        }
+      };
+    case "router_clusterset_select_gr_primary_member":
+      return {
+        stmt: "show status like 'group_replication_primary_member'",
+        result: {
+          columns: [
+            {"name": "Variable_name", "type": "VAR_STRING"},
+            {"name": "Value", "type": "VAR_STRING"}
+          ],
+          rows:
+              [options.clusterset_data
+                       .clusters[options.clusterset_data.this_cluster_id]
+                       .nodes[options.clusterset_data
+                                  .clusters[options.clusterset_data
+                                                .this_cluster_id]
+                                  .primary_node_id] ?
+                   [
+                     "group_replication_primary_member",
+                     options.clusterset_data
+                         .clusters[options.clusterset_data.this_cluster_id]
+                         .nodes[options.clusterset_data
+                                    .clusters[options.clusterset_data
+                                                  .this_cluster_id]
+                                    .primary_node_id]
+                         .uuid
+                   ] :
+                   []]
+        }
+      };
+    case "router_clusterset_select_gr_members_status":
+      return {
+        stmt:
+            "SELECT member_id, member_host, member_port, member_state, @@group_replication_single_primary_mode FROM performance_schema.replication_group_members WHERE channel_name = 'group_replication_applier'",
+            result: {
+              columns:
                   [
-                    {"type": "STRING", "name": "user"},
-                    {"type": "STRING", "name": "authentication_string"},
-                    {"type": "STRING", "name": "privileges"},
-                    {"type": "STRING", "name": "authentication_method"}
+                    {"name": "member_id", "type": "STRING"},
+                    {"name": "member_host", "type": "STRING"},
+                    {"name": "member_port", "type": "LONG"},
+                    {"name": "member_state", "type": "STRING"}, {
+                      "name": "@@group_replication_single_primary_mode",
+                      "type": "LONGLONG"
+                    }
                   ],
-              "rows": options["rest_user_credentials"].map(function(
-                  currentValue) {
-                return [
-                  currentValue[0],
-                  currentValue[1],
-                  currentValue[2] === "" ? null : currentValue[2],
-                  currentValue[3],
-                ]
-              })
+              rows: options.clusterset_data
+                      .clusters[options.clusterset_data.this_cluster_id]
+                      .nodes.map(function(node) {
+                        return [
+                          node.uuid, node.host, node.classic_port, "ONLINE", 1
+                        ];
+                      }),
             }
       }
   };
@@ -861,3 +1415,9 @@
 
   return undefined;
 };
+
+exports.empty_if_undef = function(variable) {
+  if (variable === undefined) {
+    variable = "";
+  }
+};
diff -Nru mysql-8.0-8.0.26/router/tests/component/data/metadata_1_node_repeat.js mysql-8.0-8.0.27/router/tests/component/data/metadata_1_node_repeat.js
--- mysql-8.0-8.0.26/router/tests/component/data/metadata_1_node_repeat.js	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/data/metadata_1_node_repeat.js	2021-09-28 11:46:34.000000000 +0000
@@ -43,7 +43,7 @@
 
 var common_responses_regex = common_stmts.prepare_statement_responses_regex(
     [
-      "router_update_version_v1",
+      "router_update_attributes_v1",
     ],
     options);
 
diff -Nru mysql-8.0-8.0.26/router/tests/component/data/metadata_1_node_repeat_metadatada_upgrade.js mysql-8.0-8.0.27/router/tests/component/data/metadata_1_node_repeat_metadatada_upgrade.js
--- mysql-8.0-8.0.26/router/tests/component/data/metadata_1_node_repeat_metadatada_upgrade.js	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/data/metadata_1_node_repeat_metadatada_upgrade.js	2021-09-28 11:46:34.000000000 +0000
@@ -69,7 +69,7 @@
 
   common_responses_regex = common_stmts.prepare_statement_responses_regex(
       [
-        "router_update_version_v1",
+        "router_update_attributes_v1",
       ],
       options);
 
@@ -89,7 +89,7 @@
 
   common_responses_regex = common_stmts.prepare_statement_responses_regex(
       [
-        "router_update_version_v2",
+        "router_update_attributes_v2",
         "router_update_last_check_in_v2",
       ],
       options);
diff -Nru mysql-8.0-8.0.26/router/tests/component/data/metadata_1_node_repeat_v2_ar.js mysql-8.0-8.0.27/router/tests/component/data/metadata_1_node_repeat_v2_ar.js
--- mysql-8.0-8.0.26/router/tests/component/data/metadata_1_node_repeat_v2_ar.js	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/data/metadata_1_node_repeat_v2_ar.js	2021-09-28 11:46:34.000000000 +0000
@@ -42,7 +42,7 @@
 
 var common_responses_regex = common_stmts.prepare_statement_responses_regex(
     [
-      "router_update_version_v2",
+      "router_update_attributes_v2",
       "router_update_last_check_in_v2",
     ],
     options);
diff -Nru mysql-8.0-8.0.26/router/tests/component/data/metadata_1_node_repeat_v2_gr.js mysql-8.0-8.0.27/router/tests/component/data/metadata_1_node_repeat_v2_gr.js
--- mysql-8.0-8.0.26/router/tests/component/data/metadata_1_node_repeat_v2_gr.js	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/data/metadata_1_node_repeat_v2_gr.js	2021-09-28 11:46:34.000000000 +0000
@@ -41,7 +41,7 @@
 
 var common_responses_regex = common_stmts.prepare_statement_responses_regex(
     [
-      "router_update_version_v2",
+      "router_update_attributes_v2",
       "router_update_last_check_in_v2",
     ],
     options);
diff -Nru mysql-8.0-8.0.26/router/tests/component/data/metadata_4_secondaries_partitioning_v2_gr.js mysql-8.0-8.0.27/router/tests/component/data/metadata_4_secondaries_partitioning_v2_gr.js
--- mysql-8.0-8.0.26/router/tests/component/data/metadata_4_secondaries_partitioning_v2_gr.js	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/data/metadata_4_secondaries_partitioning_v2_gr.js	2021-09-28 11:46:34.000000000 +0000
@@ -61,7 +61,7 @@
 
 var common_responses_regex = common_stmts.prepare_statement_responses_regex(
     [
-      "router_update_version_v2",
+      "router_update_attributes_v2",
     ],
     options);
 
diff -Nru mysql-8.0-8.0.26/router/tests/component/data/metadata_clusterset.js mysql-8.0-8.0.27/router/tests/component/data/metadata_clusterset.js
--- mysql-8.0-8.0.26/router/tests/component/data/metadata_clusterset.js	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/data/metadata_clusterset.js	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,101 @@
+var common_stmts = require("common_statements");
+
+if (mysqld.global.transaction_count === undefined) {
+  mysqld.global.transaction_count = 0;
+}
+
+if (mysqld.global.update_attributes_count === undefined) {
+  mysqld.global.update_attributes_count = 0;
+}
+
+if (mysqld.global.update_last_check_in_count === undefined) {
+  mysqld.global.update_last_check_in_count = 0;
+}
+
+var options = {
+  cluster_type: "gr",
+  metadata_schema_version: [2, 1, 0],
+  clusterset_present: 1,
+  bootstrap_target_type: "clusterset",
+  clusterset_target_cluster_id: mysqld.global.target_cluster_id,
+  view_id: mysqld.global.view_id,
+  clusterset_data: mysqld.global.clusterset_data,
+  router_options: mysqld.global.router_options,
+  clusterset_simulate_cluster_not_found:
+      mysqld.global.simulate_cluster_not_found,
+};
+
+// TODO: clean those not needed here
+var common_responses = common_stmts.prepare_statement_responses(
+    [
+      "router_set_session_options",
+      "router_set_gr_consistency_level",
+      "router_select_schema_version",
+      "router_select_cluster_type_v2",
+      "router_count_clusters_v2",
+      "router_check_member_state",
+      "router_select_members_count",
+      "router_select_replication_group_name",
+      "router_show_cipher_status",
+      "router_select_cluster_instances_v2",
+      "router_commit",
+      "router_router_options",
+      "router_rollback",
+
+      "select_port",
+
+      // clusterset specific
+      "router_clusterset_view_id",
+      "router_clusterset_all_nodes_by_clusterset_id",
+      "router_clusterset_present",
+      "router_bootstrap_target_type",
+      "router_clusterset_select_cluster_instances",
+      "router_clusterset_select_cluster_info_by_primary_role",
+      "router_clusterset_select_cluster_info_by_gr_uuid",
+      "router_clusterset_select_gr_primary_member",
+      "router_clusterset_select_gr_members_status",
+    ],
+    options);
+
+
+var common_responses_regex = common_stmts.prepare_statement_responses_regex(
+    [
+      "router_unknown_clusterset_view_id",
+      "router_clusterset_select_cluster_info_by_gr_uuid_unknown",
+      "router_clusterset_id",
+    ],
+    options);
+
+var router_start_transaction =
+    common_stmts.get("router_start_transaction", options);
+
+var router_update_attributes =
+    common_stmts.get("router_update_attributes_v2", options);
+
+var router_update_last_check_in =
+    common_stmts.get("router_update_last_check_in_v2", options);
+
+
+({
+  stmts: function(stmt) {
+    var res;
+    if (common_responses.hasOwnProperty(stmt)) {
+      return common_responses[stmt];
+    } else if (stmt === router_start_transaction.stmt) {
+      mysqld.global.transaction_count++;
+      return router_start_transaction;
+    } else if (stmt === router_update_last_check_in.stmt) {
+      mysqld.global.update_last_check_in_count++;
+      return router_update_last_check_in;
+    } else if (
+        (res = common_stmts.handle_regex_stmt(stmt, common_responses_regex)) !==
+        undefined) {
+      return res;
+    } else if (stmt.match(router_update_attributes.stmt_regex)) {
+      mysqld.global.update_attributes_count++;
+      return router_update_attributes;
+    } else {
+      return common_stmts.unknown_statement_response(stmt);
+    }
+  }
+})
diff -Nru mysql-8.0-8.0.26/router/tests/component/data/metadata_dynamic_nodes.js mysql-8.0-8.0.27/router/tests/component/data/metadata_dynamic_nodes.js
--- mysql-8.0-8.0.26/router/tests/component/data/metadata_dynamic_nodes.js	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/data/metadata_dynamic_nodes.js	2021-09-28 11:46:34.000000000 +0000
@@ -86,7 +86,7 @@
 
 var common_responses_regex = common_stmts.prepare_statement_responses_regex(
     [
-      "router_update_version_v1",
+      "router_update_attributes_v1",
     ],
     options);
 
diff -Nru mysql-8.0-8.0.26/router/tests/component/data/metadata_dynamic_nodes_v2_ar.js mysql-8.0-8.0.27/router/tests/component/data/metadata_dynamic_nodes_v2_ar.js
--- mysql-8.0-8.0.26/router/tests/component/data/metadata_dynamic_nodes_v2_ar.js	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/data/metadata_dynamic_nodes_v2_ar.js	2021-09-28 11:46:34.000000000 +0000
@@ -99,7 +99,7 @@
 
 var common_responses_regex = common_stmts.prepare_statement_responses_regex(
     [
-      "router_update_version_v2",
+      "router_update_attributes_v2",
     ],
     options);
 
diff -Nru mysql-8.0-8.0.26/router/tests/component/data/metadata_dynamic_nodes_v2_gr_incons_md.js mysql-8.0-8.0.27/router/tests/component/data/metadata_dynamic_nodes_v2_gr_incons_md.js
--- mysql-8.0-8.0.26/router/tests/component/data/metadata_dynamic_nodes_v2_gr_incons_md.js	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/data/metadata_dynamic_nodes_v2_gr_incons_md.js	2021-09-28 11:46:34.000000000 +0000
@@ -78,7 +78,7 @@
 
 var common_responses_regex = common_stmts.prepare_statement_responses_regex(
     [
-      "router_update_version_v2",
+      "router_update_attributes_v2",
     ],
     options);
 
diff -Nru mysql-8.0-8.0.26/router/tests/component/data/metadata_dynamic_nodes_v2_gr.js mysql-8.0-8.0.27/router/tests/component/data/metadata_dynamic_nodes_v2_gr.js
--- mysql-8.0-8.0.26/router/tests/component/data/metadata_dynamic_nodes_v2_gr.js	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/data/metadata_dynamic_nodes_v2_gr.js	2021-09-28 11:46:34.000000000 +0000
@@ -99,13 +99,16 @@
 
 var common_responses_regex = common_stmts.prepare_statement_responses_regex(
     [
-      "router_update_version_v2",
+      "router_update_attributes_v2",
     ],
     options);
 
 var router_select_metadata =
     common_stmts.get("router_select_metadata_v2_gr", options);
 
+var router_select_metadata_by_cluster_id =
+    common_stmts.get("router_select_metadata_v2_gr_by_cluster_id", options);
+
 var router_start_transaction =
     common_stmts.get("router_start_transaction", options);
 
@@ -129,6 +132,9 @@
     } else if (stmt === router_select_metadata.stmt) {
       mysqld.global.md_query_count++;
       return router_select_metadata;
+    } else if (stmt === router_select_metadata_by_cluster_id.stmt) {
+      mysqld.global.md_query_count++;
+      return router_select_metadata_by_cluster_id;
     } else if (stmt === "set @@mysqlx_wait_timeout = 28800") {
       if (mysqld.global.mysqlx_wait_timeout_unsupported === 0) return {
           ok: {}
diff -Nru mysql-8.0-8.0.26/router/tests/component/data/metadata_dynamic_nodes_version_update.js mysql-8.0-8.0.27/router/tests/component/data/metadata_dynamic_nodes_version_update.js
--- mysql-8.0-8.0.26/router/tests/component/data/metadata_dynamic_nodes_version_update.js	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/data/metadata_dynamic_nodes_version_update.js	2021-09-28 11:46:34.000000000 +0000
@@ -19,14 +19,34 @@
   mysqld.global.primary_id = 0;
 }
 
-if (mysqld.global.update_version_count === undefined) {
-  mysqld.global.update_version_count = 0;
+if (mysqld.global.update_attributes_count === undefined) {
+  mysqld.global.update_attributes_count = 0;
 }
 
 if (mysqld.global.router_version === undefined) {
   mysqld.global.router_version = "";
 }
 
+if (mysqld.global.router_rw_classic_port === undefined) {
+  mysqld.global.router_rw_classic_port = "";
+}
+
+if (mysqld.global.router_ro_classic_port === undefined) {
+  mysqld.global.router_ro_classic_port = "";
+}
+
+if (mysqld.global.router_rw_x_port === undefined) {
+  mysqld.global.router_rw_x_port = "";
+}
+
+if (mysqld.global.router_ro_x_port === undefined) {
+  mysqld.global.router_ro_x_port = "";
+}
+
+if (mysqld.global.router_metadata_user === undefined) {
+  mysqld.global.router_metadata_user = "";
+}
+
 if (mysqld.global.perm_error_on_version_update === undefined) {
   mysqld.global.perm_error_on_version_update = 0;
 }
@@ -67,6 +87,11 @@
   group_replication_membership: group_replication_membership_online,
   gr_id: mysqld.global.gr_id,
   router_version: mysqld.global.router_version,
+  router_rw_classic_port: mysqld.global.router_rw_classic_port,
+  router_ro_classic_port: mysqld.global.router_ro_classic_port,
+  router_rw_x_port: mysqld.global.router_rw_x_port,
+  router_ro_x_port: mysqld.global.router_ro_x_port,
+  router_metadata_user: mysqld.global.router_metadata_user,
 };
 
 // first node is PRIMARY
@@ -86,8 +111,8 @@
     ],
     options);
 
-var router_update_version_strict_v1 =
-    common_stmts.get("router_update_version_strict_v1", options);
+var router_update_attributes_strict_v1 =
+    common_stmts.get("router_update_attributes_strict_v1", options);
 
 var router_select_metadata =
     common_stmts.get("router_select_metadata", options);
@@ -110,8 +135,8 @@
     } else if (stmt === router_start_transaction.stmt) {
       mysqld.global.transaction_count++;
       return router_start_transaction;
-    } else if (stmt === router_update_version_strict_v1.stmt) {
-      mysqld.global.update_version_count++;
+    } else if (stmt === router_update_attributes_strict_v1.stmt) {
+      mysqld.global.update_attributes_count++;
       if (mysqld.global.perm_error_on_version_update === 1) {
         return {
           error: {
@@ -122,7 +147,7 @@
           }
         }
       } else
-        return router_update_version_strict_v1;
+        return router_update_attributes_strict_v1;
     } else if (stmt === router_select_metadata.stmt) {
       mysqld.global.md_query_count++;
       return router_select_metadata;
diff -Nru mysql-8.0-8.0.26/router/tests/component/data/metadata_dynamic_nodes_version_update_v2_ar.js mysql-8.0-8.0.27/router/tests/component/data/metadata_dynamic_nodes_version_update_v2_ar.js
--- mysql-8.0-8.0.26/router/tests/component/data/metadata_dynamic_nodes_version_update_v2_ar.js	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/data/metadata_dynamic_nodes_version_update_v2_ar.js	2021-09-28 11:46:34.000000000 +0000
@@ -33,8 +33,8 @@
   mysqld.global.view_id = 0;
 }
 
-if (mysqld.global.update_version_count === undefined) {
-  mysqld.global.update_version_count = 0;
+if (mysqld.global.update_attributes_count === undefined) {
+  mysqld.global.update_attributes_count = 0;
 }
 
 if (mysqld.global.update_last_check_in_count === undefined) {
@@ -45,6 +45,26 @@
   mysqld.global.router_version = "";
 }
 
+if (mysqld.global.router_rw_classic_port === undefined) {
+  mysqld.global.router_rw_classic_port = "";
+}
+
+if (mysqld.global.router_ro_classic_port === undefined) {
+  mysqld.global.router_ro_classic_port = "";
+}
+
+if (mysqld.global.router_rw_x_port === undefined) {
+  mysqld.global.router_rw_x_port = "";
+}
+
+if (mysqld.global.router_ro_x_port === undefined) {
+  mysqld.global.router_ro_x_port = "";
+}
+
+if (mysqld.global.router_metadata_user === undefined) {
+  mysqld.global.router_metadata_user = "";
+}
+
 if (mysqld.global.perm_error_on_version_update === undefined) {
   mysqld.global.perm_error_on_version_update = 0;
 }
@@ -89,6 +109,11 @@
   cluster_type: "ar",
   innodb_cluster_name: "test",
   router_version: mysqld.global.router_version,
+  router_rw_classic_port: mysqld.global.router_rw_classic_port,
+  router_ro_classic_port: mysqld.global.router_ro_classic_port,
+  router_rw_x_port: mysqld.global.router_rw_x_port,
+  router_ro_x_port: mysqld.global.router_ro_x_port,
+  router_metadata_user: mysqld.global.router_metadata_user,
 };
 
 // first node is PRIMARY
@@ -109,8 +134,8 @@
 var router_select_metadata =
     common_stmts.get("router_select_metadata_v2_ar", options);
 
-var router_update_version_strict_v2 =
-    common_stmts.get("router_update_version_strict_v2", options);
+var router_update_attributes_strict_v2 =
+    common_stmts.get("router_update_attributes_strict_v2", options);
 
 var router_update_last_check_in_v2 =
     common_stmts.get("router_update_last_check_in_v2", options);
@@ -133,8 +158,8 @@
     } else if (stmt === router_start_transaction.stmt) {
       mysqld.global.transaction_count++;
       return router_start_transaction;
-    } else if (stmt === router_update_version_strict_v2.stmt) {
-      mysqld.global.update_version_count++;
+    } else if (stmt === router_update_attributes_strict_v2.stmt) {
+      mysqld.global.update_attributes_count++;
       if (mysqld.global.perm_error_on_version_update === 1) {
         return {
           error: {
@@ -145,7 +170,7 @@
           }
         }
       } else
-        return router_update_version_strict_v2;
+        return router_update_attributes_strict_v2;
     } else if (stmt === router_update_last_check_in_v2.stmt) {
       mysqld.global.update_last_check_in_count++;
       return router_update_last_check_in_v2;
diff -Nru mysql-8.0-8.0.26/router/tests/component/data/metadata_dynamic_nodes_version_update_v2_gr.js mysql-8.0-8.0.27/router/tests/component/data/metadata_dynamic_nodes_version_update_v2_gr.js
--- mysql-8.0-8.0.26/router/tests/component/data/metadata_dynamic_nodes_version_update_v2_gr.js	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/data/metadata_dynamic_nodes_version_update_v2_gr.js	2021-09-28 11:46:34.000000000 +0000
@@ -29,8 +29,8 @@
   mysqld.global.primary_id = 0;
 }
 
-if (mysqld.global.update_version_count === undefined) {
-  mysqld.global.update_version_count = 0;
+if (mysqld.global.update_attributes_count === undefined) {
+  mysqld.global.update_attributes_count = 0;
 }
 
 if (mysqld.global.update_last_check_in_count === undefined) {
@@ -41,6 +41,26 @@
   mysqld.global.router_version = "";
 }
 
+if (mysqld.global.router_rw_classic_port === undefined) {
+  mysqld.global.router_rw_classic_port = "";
+}
+
+if (mysqld.global.router_ro_classic_port === undefined) {
+  mysqld.global.router_ro_classic_port = "";
+}
+
+if (mysqld.global.router_rw_x_port === undefined) {
+  mysqld.global.router_rw_x_port = "";
+}
+
+if (mysqld.global.router_ro_x_port === undefined) {
+  mysqld.global.router_ro_x_port = "";
+}
+
+if (mysqld.global.router_metadata_user === undefined) {
+  mysqld.global.router_metadata_user = "";
+}
+
 if (mysqld.global.perm_error_on_version_update === undefined) {
   mysqld.global.perm_error_on_version_update = 0;
 }
@@ -81,6 +101,11 @@
   gr_id: mysqld.global.gr_id,
   cluster_type: "gr",
   router_version: mysqld.global.router_version,
+  router_rw_classic_port: mysqld.global.router_rw_classic_port,
+  router_ro_classic_port: mysqld.global.router_ro_classic_port,
+  router_rw_x_port: mysqld.global.router_rw_x_port,
+  router_ro_x_port: mysqld.global.router_ro_x_port,
+  router_metadata_user: mysqld.global.router_metadata_user,
 };
 
 // first node is PRIMARY
@@ -102,8 +127,8 @@
     ],
     options);
 
-var router_update_version_strict_v2 =
-    common_stmts.get("router_update_version_strict_v2", options);
+var router_update_attributes_strict_v2 =
+    common_stmts.get("router_update_attributes_strict_v2", options);
 
 var router_update_last_check_in_v2 =
     common_stmts.get("router_update_last_check_in_v2", options);
@@ -129,8 +154,8 @@
     } else if (stmt === router_start_transaction.stmt) {
       mysqld.global.transaction_count++;
       return router_start_transaction;
-    } else if (stmt === router_update_version_strict_v2.stmt) {
-      mysqld.global.update_version_count++;
+    } else if (stmt === router_update_attributes_strict_v2.stmt) {
+      mysqld.global.update_attributes_count++;
       if (mysqld.global.perm_error_on_version_update === 1) {
         return {
           error: {
@@ -141,7 +166,7 @@
           }
         }
       } else
-        return router_update_version_strict_v2;
+        return router_update_attributes_strict_v2;
     } else if (stmt === router_update_last_check_in_v2.stmt) {
       mysqld.global.update_last_check_in_count++;
       return router_update_last_check_in_v2;
diff -Nru mysql-8.0-8.0.26/router/tests/component/data/metadata_http_auth_backend.js mysql-8.0-8.0.27/router/tests/component/data/metadata_http_auth_backend.js
--- mysql-8.0-8.0.26/router/tests/component/data/metadata_http_auth_backend.js	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/data/metadata_http_auth_backend.js	2021-09-28 11:46:34.000000000 +0000
@@ -83,7 +83,7 @@
 
 var common_responses_regex = common_stmts.prepare_statement_responses_regex(
     [
-      "router_update_version_v2",
+      "router_update_attributes_v2",
     ],
     options);
 
diff -Nru mysql-8.0-8.0.26/router/tests/component/data/rest_api_enable.js mysql-8.0-8.0.27/router/tests/component/data/rest_api_enable.js
--- mysql-8.0-8.0.26/router/tests/component/data/rest_api_enable.js	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/data/rest_api_enable.js	2021-09-28 11:46:34.000000000 +0000
@@ -92,6 +92,7 @@
       "router_grant_on_routers",
       "router_grant_on_v2_routers",
       "router_update_routers_in_metadata",
+      "router_update_router_options_in_metadata",
     ],
     options);
 
diff -Nru mysql-8.0-8.0.26/router/tests/component/data/tls_endpoint.js mysql-8.0-8.0.27/router/tests/component/data/tls_endpoint.js
--- mysql-8.0-8.0.26/router/tests/component/data/tls_endpoint.js	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/data/tls_endpoint.js	2021-09-28 11:46:34.000000000 +0000
@@ -7,6 +7,8 @@
       "select_length_4097",
       "select_repeat_4097",
       "select_repeat_15M",
+      "mysqlsh_select_connection_id",
+      "mysqlsh_select_version_comment",
       "router_show_cipher_status",
       "router_show_mysqlx_cipher_status",
     ],
diff -Nru mysql-8.0-8.0.26/router/tests/component/test_async_replicaset.cc mysql-8.0-8.0.27/router/tests/component/test_async_replicaset.cc
--- mysql-8.0-8.0.26/router/tests/component/test_async_replicaset.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/test_async_replicaset.cc	2021-09-28 11:46:34.000000000 +0000
@@ -28,8 +28,6 @@
 #include <thread>
 
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 
@@ -155,7 +153,7 @@
 
   void set_mock_metadata(uint16_t http_port, const std::string &gr_id,
                          const std::vector<uint16_t> &gr_node_ports,
-                         unsigned primary_id = 0, unsigned view_id = 0,
+                         unsigned primary_id = 0, uint64_t view_id = 0,
                          bool error_on_md_query = false,
                          bool empty_result_from_cluster_type_query = false) {
     auto json_doc = mock_GR_metadata_as_json(gr_id, gr_node_ports, primary_id,
@@ -225,7 +223,7 @@
   SCOPED_TRACE("// Create a router state file with all of the members");
   const std::string state_file = create_state_file(
       temp_test_dir.name(),
-      create_state_file_content(cluster_id, cluster_nodes_ports, view_id));
+      create_state_file_content(cluster_id, "", cluster_nodes_ports, view_id));
 
   SCOPED_TRACE(
       "// Create a configuration file sections with low ttl so that any "
@@ -248,7 +246,8 @@
       "// Check our state file content, it should not change, there is "
       "single metadata server reported as initially");
 
-  check_state_file(state_file, cluster_id, cluster_nodes_ports, view_id);
+  check_state_file(state_file, ClusterType::RS_V2, cluster_id,
+                   cluster_nodes_ports, view_id);
 }
 
 /**
@@ -286,7 +285,7 @@
   const std::string state_file = create_state_file(
       temp_test_dir.name(),
       create_state_file_content(
-          cluster_id, {cluster_nodes_ports[0], cluster_nodes_ports[1]},
+          cluster_id, "", {cluster_nodes_ports[0], cluster_nodes_ports[1]},
           view_id));
 
   SCOPED_TRACE(
@@ -315,7 +314,7 @@
   SCOPED_TRACE(
       "// Check our state file content, it should first contain only 2 "
       "members");
-  check_state_file(state_file, cluster_id,
+  check_state_file(state_file, ClusterType::RS_V2, cluster_id,
                    {cluster_nodes_ports[0], cluster_nodes_ports[1]}, view_id);
 
   SCOPED_TRACE("// Make a connection to the secondary");
@@ -333,7 +332,8 @@
   SCOPED_TRACE(
       "// Check our state file content, it should now contain all 3 members "
       "and increased view_id");
-  check_state_file(state_file, cluster_id, cluster_nodes_ports, view_id + 1);
+  check_state_file(state_file, ClusterType::RS_V2, cluster_id,
+                   cluster_nodes_ports, view_id + 1);
 
   SCOPED_TRACE("// Check that the existing connection is still alive");
   verify_existing_connection_ok(client1.get());
@@ -375,7 +375,7 @@
   SCOPED_TRACE("// Create a router state file the 3 members");
   const std::string state_file = create_state_file(
       temp_test_dir.name(),
-      create_state_file_content(cluster_id, cluster_nodes_ports, view_id));
+      create_state_file_content(cluster_id, "", cluster_nodes_ports, view_id));
 
   SCOPED_TRACE(
       "// Create a configuration file sections with low ttl so that any "
@@ -402,7 +402,8 @@
 
   SCOPED_TRACE(
       "// Check our state file content, it should first contain all 3 members");
-  check_state_file(state_file, cluster_id, cluster_nodes_ports, view_id);
+  check_state_file(state_file, ClusterType::RS_V2, cluster_id,
+                   cluster_nodes_ports, view_id);
 
   SCOPED_TRACE(
       "// Let's make a connection to the both secondaries, both should be "
@@ -423,7 +424,7 @@
   SCOPED_TRACE(
       "// Check our state file content, it should now contain only 2 members "
       "and increased view_id");
-  check_state_file(state_file, cluster_id,
+  check_state_file(state_file, ClusterType::RS_V2, cluster_id,
                    {cluster_nodes_ports[0], cluster_nodes_ports[1]},
                    view_id + 1);
 
@@ -465,7 +466,7 @@
   SCOPED_TRACE("// Create a router state file with 3 members");
   const std::string state_file = create_state_file(
       temp_test_dir.name(),
-      create_state_file_content(cluster_id, cluster_nodes_ports, view_id));
+      create_state_file_content(cluster_id, "", cluster_nodes_ports, view_id));
 
   SCOPED_TRACE(
       "// Create a configuration file sections with low ttl so that any "
@@ -492,7 +493,8 @@
 
   SCOPED_TRACE(
       "// Check our state file content, it should first contain all 3 members");
-  check_state_file(state_file, cluster_id, cluster_nodes_ports, view_id);
+  check_state_file(state_file, ClusterType::RS_V2, cluster_id,
+                   cluster_nodes_ports, view_id);
 
   SCOPED_TRACE("// Now let's change the md on the PRIMARY: " + cluster_id +
                ", " + std::to_string(view_id) + " (cluster_id, view_id) to " +
@@ -507,7 +509,8 @@
   SCOPED_TRACE(
       "// Check our state file content, not change, the PRIMARYs view of the "
       "world should not get into account as it contains different cluster_id");
-  check_state_file(state_file, cluster_id, cluster_nodes_ports, view_id);
+  check_state_file(state_file, ClusterType::RS_V2, cluster_id,
+                   cluster_nodes_ports, view_id);
 }
 
 /**
@@ -542,7 +545,7 @@
   SCOPED_TRACE("// Create a router state file the 3 members");
   const std::string state_file = create_state_file(
       temp_test_dir.name(),
-      create_state_file_content(cluster_id, cluster_nodes_ports, view_id));
+      create_state_file_content(cluster_id, "", cluster_nodes_ports, view_id));
 
   SCOPED_TRACE(
       "// Create a configuration file sections with low ttl so that any "
@@ -569,17 +572,20 @@
 
   SCOPED_TRACE(
       "// Check our state file content, it should contain all 3 members");
-  check_state_file(state_file, cluster_id, cluster_nodes_ports, view_id);
+  check_state_file(state_file, ClusterType::RS_V2, cluster_id,
+                   cluster_nodes_ports, view_id);
 
   SCOPED_TRACE(
       "// Check that there are warnings reported for not being able to fetch "
       "the metadata from both secondaries");
-  check_state_file(state_file, cluster_id, cluster_nodes_ports, view_id);
+  check_state_file(state_file, ClusterType::RS_V2, cluster_id,
+                   cluster_nodes_ports, view_id);
   const std::string log_content = router.get_full_logfile();
 
   for (size_t i = 1; i <= 2; i++) {
     const std::string pattern =
-        "metadata_cache WARNING .* Failed fetching metadata from instance: " +
+        "metadata_cache WARNING .* Failed fetching metadata from metadata "
+        "server on 127.0.0.1:" +
         std::to_string(cluster_nodes_ports[i]);
     ASSERT_TRUE(pattern_found(log_content, pattern)) << log_content;
   }
@@ -613,7 +619,7 @@
   SCOPED_TRACE("// Create a router state file the 3 members");
   const std::string state_file = create_state_file(
       temp_test_dir.name(),
-      create_state_file_content(cluster_id, cluster_nodes_ports, view_id));
+      create_state_file_content(cluster_id, "", cluster_nodes_ports, view_id));
 
   SCOPED_TRACE(
       "// Create a configuration file. disconnect_on_metadata_unavailable for "
@@ -641,7 +647,8 @@
 
   SCOPED_TRACE(
       "// Check our state file content, it should contain both members");
-  check_state_file(state_file, cluster_id, cluster_nodes_ports, view_id);
+  check_state_file(state_file, ClusterType::RS_V2, cluster_id,
+                   cluster_nodes_ports, view_id);
 
   SCOPED_TRACE("// Let's make a connection to the both servers RW and RO");
   auto client1 = make_new_connection_ok(router_port_rw, cluster_nodes_ports[0]);
@@ -666,7 +673,8 @@
   SCOPED_TRACE(
       "// Make sure the state file did not change, it should still contain "
       "the 2 members.");
-  check_state_file(state_file, cluster_id, cluster_nodes_ports, view_id);
+  check_state_file(state_file, ClusterType::RS_V2, cluster_id,
+                   cluster_nodes_ports, view_id);
 }
 
 /**
@@ -697,7 +705,7 @@
   SCOPED_TRACE("// Create a router state file the 3 members");
   const std::string state_file = create_state_file(
       temp_test_dir.name(),
-      create_state_file_content(cluster_id, cluster_nodes_ports, view_id));
+      create_state_file_content(cluster_id, "", cluster_nodes_ports, view_id));
 
   SCOPED_TRACE(
       "// Create a configuration file. disconnect_on_metadata_unavailable for "
@@ -725,7 +733,8 @@
 
   SCOPED_TRACE(
       "// Check our state file content, it should contain both members");
-  check_state_file(state_file, cluster_id, cluster_nodes_ports, view_id);
+  check_state_file(state_file, ClusterType::RS_V2, cluster_id,
+                   cluster_nodes_ports, view_id);
 
   SCOPED_TRACE("// Let's make a connection to the both servers RW and RO");
   auto client1 = make_new_connection_ok(router_port_rw, cluster_nodes_ports[0]);
@@ -797,9 +806,10 @@
 
   SCOPED_TRACE(
       "// Let us start with 3 members (one PRIMARY and 2 SECONDARIES)");
-  const std::string state_file = create_state_file(
-      temp_test_dir.name(),
-      create_state_file_content(cluster_id, initial_cluster_members, view_id));
+  const std::string state_file =
+      create_state_file(temp_test_dir.name(),
+                        create_state_file_content(
+                            cluster_id, "", initial_cluster_members, view_id));
 
   SCOPED_TRACE("// Create a configuration file.");
   const std::string metadata_cache_section =
@@ -823,7 +833,8 @@
 
   SCOPED_TRACE(
       "// Check our state file content, it should contain the initial members");
-  check_state_file(state_file, cluster_id, initial_cluster_members, view_id);
+  check_state_file(state_file, ClusterType::RS_V2, cluster_id,
+                   initial_cluster_members, view_id);
 
   SCOPED_TRACE("// Now let's mess a little bit with the metadata");
   // let's remove one of the nodes and add another one
@@ -839,7 +850,8 @@
   ASSERT_TRUE(wait_for_transaction_count_increase(cluster_http_ports[2], 2));
 
   SCOPED_TRACE("// Check that the state file caught up with all those changes");
-  check_state_file(state_file, cluster_id, new_cluster_members, view_id + 1);
+  check_state_file(state_file, ClusterType::RS_V2, cluster_id,
+                   new_cluster_members, view_id + 1);
 }
 
 /**
@@ -871,7 +883,7 @@
       "// Let us start with 3 members (one PRIMARY and 2 SECONDARIES)");
   const std::string state_file = create_state_file(
       temp_test_dir.name(),
-      create_state_file_content(cluster_id, cluster_nodes_ports, view_id));
+      create_state_file_content(cluster_id, "", cluster_nodes_ports, view_id));
 
   SCOPED_TRACE("// Create a configuration file.");
   const std::string metadata_cache_section =
@@ -895,7 +907,8 @@
 
   SCOPED_TRACE(
       "// Check our state file content, it should contain the initial members");
-  check_state_file(state_file, cluster_id, cluster_nodes_ports, view_id);
+  check_state_file(state_file, ClusterType::RS_V2, cluster_id,
+                   cluster_nodes_ports, view_id);
 
   SCOPED_TRACE("// Make 2 RO connections, one for each SECONDARY");
   auto client1 = make_new_connection_ok(router_port_ro, cluster_nodes_ports[1]);
@@ -913,7 +926,8 @@
   SCOPED_TRACE(
       "// Check that the state file does not contain the second SECONDARY "
       "anymore");
-  check_state_file(state_file, cluster_id, new_cluster_members, view_id + 1);
+  check_state_file(state_file, ClusterType::RS_V2, cluster_id,
+                   new_cluster_members, view_id + 1);
 
   SCOPED_TRACE(
       "// Check that the existing connection to the second SECONDARY got "
@@ -955,9 +969,10 @@
                       initial_cluster_members, 0, view_id);
   }
 
-  const std::string state_file = create_state_file(
-      temp_test_dir.name(),
-      create_state_file_content(cluster_id, initial_cluster_members, view_id));
+  const std::string state_file =
+      create_state_file(temp_test_dir.name(),
+                        create_state_file_content(
+                            cluster_id, "", initial_cluster_members, view_id));
 
   SCOPED_TRACE("// Create a configuration file.");
   const std::string metadata_cache_section =
@@ -981,7 +996,8 @@
 
   SCOPED_TRACE(
       "// Check our state file content, it should contain the initial members");
-  check_state_file(state_file, cluster_id, initial_cluster_members, view_id);
+  check_state_file(state_file, ClusterType::RS_V2, cluster_id,
+                   initial_cluster_members, view_id);
 
   SCOPED_TRACE("// Make one RW and one RO connection");
   auto client_rw =
@@ -1001,7 +1017,8 @@
   ASSERT_TRUE(wait_for_transaction_count_increase(cluster_http_ports[1], 2));
 
   SCOPED_TRACE("// Check that the state file is as expected");
-  check_state_file(state_file, cluster_id, new_cluster_members, view_id + 1);
+  check_state_file(state_file, ClusterType::RS_V2, cluster_id,
+                   new_cluster_members, view_id + 1);
 
   SCOPED_TRACE(
       "// Check that the existing connection to the old PRIMARY got dropped");
@@ -1038,7 +1055,7 @@
 
   const std::string state_file = create_state_file(
       temp_test_dir.name(),
-      create_state_file_content(cluster_id, cluster_nodes_ports, view_id));
+      create_state_file_content(cluster_id, "", cluster_nodes_ports, view_id));
 
   SCOPED_TRACE("// Create a configuration file.");
   const std::string metadata_cache_section =
@@ -1062,7 +1079,8 @@
 
   SCOPED_TRACE(
       "// Check our state file content, it should contain the initial members");
-  check_state_file(state_file, cluster_id, cluster_nodes_ports, view_id);
+  check_state_file(state_file, ClusterType::RS_V2, cluster_id,
+                   cluster_nodes_ports, view_id);
 
   SCOPED_TRACE("// Make one RW and one RO connection");
   auto client_rw =
@@ -1115,7 +1133,7 @@
 
   const std::string state_file = create_state_file(
       temp_test_dir.name(),
-      create_state_file_content(cluster_id, cluster_nodes_ports, view_id));
+      create_state_file_content(cluster_id, "", cluster_nodes_ports, view_id));
 
   SCOPED_TRACE("// Create a configuration file.");
   const std::string metadata_cache_section =
@@ -1141,7 +1159,8 @@
 
   SCOPED_TRACE(
       "// Check our state file content, it should contain the initial members");
-  check_state_file(state_file, cluster_id, cluster_nodes_ports, view_id);
+  check_state_file(state_file, ClusterType::RS_V2, cluster_id,
+                   cluster_nodes_ports, view_id);
 
   SCOPED_TRACE("// Make one RW and one RO connection");
   auto client_rw =
@@ -1159,7 +1178,8 @@
   ASSERT_TRUE(wait_for_transaction_count_increase(cluster_http_ports[1], 2));
 
   SCOPED_TRACE("// Check that the state file is as expected");
-  check_state_file(state_file, cluster_id, cluster_nodes_ports, view_id + 1);
+  check_state_file(state_file, ClusterType::RS_V2, cluster_id,
+                   cluster_nodes_ports, view_id + 1);
 
   SCOPED_TRACE("// Check that both RW and RO connections are down");
   EXPECT_TRUE(wait_connection_dropped(*client_rw.get()));
@@ -1195,7 +1215,7 @@
 
   const std::string state_file = create_state_file(
       temp_test_dir.name(),
-      create_state_file_content(cluster_id, cluster_nodes_ports, view_id));
+      create_state_file_content(cluster_id, "", cluster_nodes_ports, view_id));
 
   SCOPED_TRACE("// Create a configuration file.");
   const std::string metadata_cache_section =
@@ -1219,7 +1239,8 @@
 
   SCOPED_TRACE(
       "// Check our state file content, it should contain the initial members");
-  check_state_file(state_file, cluster_id, cluster_nodes_ports, view_id);
+  check_state_file(state_file, ClusterType::RS_V2, cluster_id,
+                   cluster_nodes_ports, view_id);
 
   SCOPED_TRACE("// Make one RW and one RO connection");
   auto client_rw =
@@ -1239,8 +1260,8 @@
   ASSERT_TRUE(wait_for_transaction_count_increase(cluster_http_ports[1], 2));
 
   SCOPED_TRACE("// Check that the state file is as expected");
-  check_state_file(state_file, cluster_id, {cluster_nodes_ports[1]},
-                   view_id + 1);
+  check_state_file(state_file, ClusterType::RS_V2, cluster_id,
+                   {cluster_nodes_ports[1]}, view_id + 1);
 
   SCOPED_TRACE("// Check that both RW and RO connections are down");
   EXPECT_TRUE(wait_connection_dropped(*client_rw.get()));
@@ -1277,7 +1298,7 @@
 
   const std::string state_file = create_state_file(
       temp_test_dir.name(),
-      create_state_file_content(cluster_id, cluster_nodes_ports, view_id));
+      create_state_file_content(cluster_id, "", cluster_nodes_ports, view_id));
 
   SCOPED_TRACE("// Create a configuration file.");
   const std::string metadata_cache_section =
@@ -1301,7 +1322,8 @@
 
   SCOPED_TRACE(
       "// Check our state file content, it should contain the initial members");
-  check_state_file(state_file, cluster_id, cluster_nodes_ports, view_id);
+  check_state_file(state_file, ClusterType::RS_V2, cluster_id,
+                   cluster_nodes_ports, view_id);
 
   SCOPED_TRACE("// Make one RO connection");
   auto client_ro =
@@ -1315,8 +1337,8 @@
   ASSERT_TRUE(wait_for_transaction_count_increase(cluster_http_ports[0], 2));
 
   SCOPED_TRACE("// Check that the state file is as expected");
-  check_state_file(state_file, cluster_id, {cluster_nodes_ports[0]},
-                   view_id + 1);
+  check_state_file(state_file, ClusterType::RS_V2, cluster_id,
+                   {cluster_nodes_ports[0]}, view_id + 1);
 
   SCOPED_TRACE("// Check that RO connection is down and no new is accepted");
   EXPECT_TRUE(wait_connection_dropped(*client_ro.get()));
@@ -1358,7 +1380,7 @@
 
   const std::string state_file = create_state_file(
       temp_test_dir.name(),
-      create_state_file_content(cluster_id, cluster_nodes_ports, view_id));
+      create_state_file_content(cluster_id, "", cluster_nodes_ports, view_id));
 
   SCOPED_TRACE("// Create a configuration file.");
   const std::string metadata_cache_section =
@@ -1382,7 +1404,8 @@
 
   SCOPED_TRACE(
       "// Check our state file content, it should contain the initial members");
-  check_state_file(state_file, cluster_id, cluster_nodes_ports, view_id);
+  check_state_file(state_file, ClusterType::RS_V2, cluster_id,
+                   cluster_nodes_ports, view_id);
 
   SCOPED_TRACE(
       "// Make 3 RO connections, even though one of the secondaries is down "
@@ -1443,7 +1466,7 @@
 
   const std::string state_file = create_state_file(
       temp_test_dir.name(),
-      create_state_file_content(cluster_id, cluster_nodes_ports, view_id));
+      create_state_file_content(cluster_id, "", cluster_nodes_ports, view_id));
 
   SCOPED_TRACE("// Create a configuration file.");
   const std::string metadata_cache_section =
@@ -1468,7 +1491,8 @@
 
   SCOPED_TRACE(
       "// Check our state file content, it should contain the initial members");
-  check_state_file(state_file, cluster_id, cluster_nodes_ports, view_id);
+  check_state_file(state_file, ClusterType::RS_V2, cluster_id,
+                   cluster_nodes_ports, view_id);
 
   SCOPED_TRACE(
       "// Attempt 2 RO connections, each should fail unless we fallback to the "
@@ -1523,7 +1547,7 @@
 
   const std::string state_file = create_state_file(
       temp_test_dir.name(),
-      create_state_file_content(cluster_id, cluster_nodes_ports, view_id));
+      create_state_file_content(cluster_id, "", cluster_nodes_ports, view_id));
 
   SCOPED_TRACE("// Create a configuration file.");
   const std::string metadata_cache_section =
@@ -1599,7 +1623,7 @@
   SCOPED_TRACE("// Create a router state file containing both members");
   const std::string state_file = create_state_file(
       temp_test_dir.name(),
-      create_state_file_content(cluster_id, cluster_nodes_ports, view_id));
+      create_state_file_content(cluster_id, "", cluster_nodes_ports, view_id));
 
   SCOPED_TRACE(
       "// Create a configuration file. disconnect_on_metadata_unavailable for "
diff -Nru mysql-8.0-8.0.26/router/tests/component/test_bootstrap_account.cc mysql-8.0-8.0.27/router/tests/component/test_bootstrap_account.cc
--- mysql-8.0-8.0.26/router/tests/component/test_bootstrap_account.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/test_bootstrap_account.cc	2021-09-28 11:46:34.000000000 +0000
@@ -30,12 +30,10 @@
 #include <fstream>
 #include <string>
 
-#include <gmock/gmock.h>
+#include <gmock/gmock-matchers.h>
 #include <gtest/gtest.h>
 
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 #include <rapidjson/document.h>
@@ -55,6 +53,7 @@
 #include "random_generator.h"
 #include "rest_api_testutils.h"
 #include "router_component_test.h"
+#include "router_test_helpers.h"  // get_file_output
 #include "script_generator.h"
 #include "socket_operations.h"
 #include "utils.h"
@@ -651,10 +650,10 @@
     // expected account name
     if (expect_exists) {
       ASSERT_TRUE(config_file.exists());
-      EXPECT_TRUE(
-          find_in_file(config_file.str(), [&](const std::string &line) -> bool {
-            return line.find("user=" + username) != line.npos;
-          }));
+      auto file_content = get_file_output(config_file.str());
+      auto lines = mysql_harness::split_string(file_content, '\n');
+      EXPECT_THAT(
+          lines, ::testing::Contains(::testing::HasSubstr("user=" + username)));
     } else {
       EXPECT_FALSE(config_file.exists());
     }
@@ -837,7 +836,7 @@
         "FATAL ERROR ENCOUNTERED, attempting to undo new accounts that were created",
 
         "ERROR: As part of cleanup after bootstrap failure, we tried to erase account(s)",
-        "that we created.  Unfortuantely the cleanup failed with error:",
+        "that we created.  Unfortunately the cleanup failed with error:",
         "  Error executing MySQL query \"DROP USER IF EXISTS " + new_account_list + "\": " + du_err_msg + " (" + std::to_string(du_err_code) + ")",
         "You may want to clean up the accounts yourself, here is the full list of",
         "accounts that were created:",
diff -Nru mysql-8.0-8.0.26/router/tests/component/test_bootstrap.cc mysql-8.0-8.0.27/router/tests/component/test_bootstrap.cc
--- mysql-8.0-8.0.26/router/tests/component/test_bootstrap.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/test_bootstrap.cc	2021-09-28 11:46:34.000000000 +0000
@@ -29,12 +29,10 @@
 #include <fstream>
 #include <string>
 
-#include <gmock/gmock.h>
+#include <gmock/gmock-matchers.h>
 #include <gtest/gtest.h>
 
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 #include <rapidjson/document.h>
@@ -49,11 +47,13 @@
 #include "mysql/harness/net_ts/impl/resolver.h"
 #include "mysql/harness/net_ts/internet.h"
 #include "mysql/harness/stdx/expected.h"
+#include "mysql/harness/string_utils.h"  // split_lines
 #include "mysqld_error.h"
 #include "mysqlrouter/cluster_metadata.h"
 #include "random_generator.h"
 #include "rest_api_testutils.h"
 #include "router_component_test.h"
+#include "router_test_helpers.h"  // get_file_output
 #include "script_generator.h"
 #include "socket_operations.h"
 #include "tcp_port_pool.h"
@@ -1599,108 +1599,49 @@
   }
 }
 
+struct UseGrNotificationTestParams {
+  std::vector<std::string> bootstrap_params;
+  std::vector<std::string> expected_config_lines;
+  mysqlrouter::MetadataSchemaVersion metadata_schema_version;
+};
+
+class ConfUseGrNotificationParamTest
+    : public RouterBootstrapTest,
+      public ::testing::WithParamInterface<UseGrNotificationTestParams> {};
+
 /**
  * @test
  *       verify that using --conf-use-gr-notifications creates proper config
  * file entry.
  */
-TEST_F(RouterBootstrapTest, ConfUseGrNotificationsYes) {
+TEST_P(ConfUseGrNotificationParamTest, ConfUseGrNotificationParam) {
   TempDirectory bootstrap_directory;
   const auto server_port = port_pool_.get_next_available();
-  const auto bootstrap_server_port = port_pool_.get_next_available();
-  const auto server_http_port = port_pool_.get_next_available();
-  const auto bootstrap_server_http_port = port_pool_.get_next_available();
+  const auto server_port2 = port_pool_.get_next_available();
+  const auto http_port = port_pool_.get_next_available();
   const std::string json_stmts = get_data_dir().join("bootstrap_gr.js").str();
 
   // launch mock server that is our metadata server for the bootstrap
-  auto &server_mock =
-      launch_mysql_server_mock(json_stmts, bootstrap_server_port, EXIT_SUCCESS,
-                               false, bootstrap_server_http_port);
-  set_mock_bootstrap_data(bootstrap_server_http_port, "test",
-                          {{"127.0.0.1", server_port}}, {2, 0, 3},
-                          "cluster-specific-id");
-
-  // launch the router in bootstrap mode
-  auto &router = launch_router_for_bootstrap(
-      {"--bootstrap=127.0.0.1:" + std::to_string(bootstrap_server_port), "-d",
-       bootstrap_directory.name(), "--conf-use-gr-notifications"});
-
-  // add login hook
-  router.register_response("Please enter MySQL password for root: ",
-                           kRootPassword + "\n"s);
-
-  check_exit_code(router, EXIT_SUCCESS);
-
-  const std::string &conf_file =
-      bootstrap_directory.name() + "/mysqlrouter.conf";
-  // check if the valid config option was added to the file
-  EXPECT_TRUE(find_in_file(
-      conf_file,
-      [](const std::string &line) -> bool {
-        return line == "use_gr_notifications=1";
-      },
-      0ms));
-
-  // check if valid TTL is set (with GR notifications it should be increased to
-  // 60s)
-  EXPECT_TRUE(find_in_file(
-      conf_file,
-      [](const std::string &line) -> bool { return line == "ttl=60"; }, 0ms));
-
-  // auth_cache_refresh_interval should be adjusted to the ttl value
-  EXPECT_TRUE(find_in_file(
-      conf_file,
-      [](const std::string &line) -> bool {
-        return line == "auth_cache_refresh_interval=60";
-      },
-      0ms));
+  auto &server_mock = launch_mysql_server_mock(json_stmts, server_port,
+                                               EXIT_SUCCESS, false, http_port);
 
-  // Stop the mock that was used for bootstrap
-  server_mock.send_clean_shutdown_event();
-  EXPECT_NO_THROW(server_mock.wait_for_exit());
-
-  auto plugin_dir = mysql_harness::get_plugin_dir(get_origin().str());
-  ASSERT_TRUE(add_line_to_config_file(conf_file, "DEFAULT", "plugin_folder",
-                                      plugin_dir));
-
-  const std::string runtime_json_stmts =
-      get_data_dir().join("metadata_dynamic_nodes_v2_gr.js").str();
-
-  // launch mock server that is our metadata server
-  launch_mysql_server_mock(runtime_json_stmts, server_port, EXIT_SUCCESS, false,
-                           server_http_port);
-  set_mock_metadata(server_http_port, "cluster-specific-id", {server_port});
-
-  ASSERT_NO_FATAL_FAILURE(launch_router({"-c", conf_file}));
-}
-
-/**
- * @test
- *       verify that NOT using --conf-use-gr-notifications
- *       creates a proper config file entry.
- */
-TEST_F(RouterBootstrapTest, ConfUseGrNotificationsNo) {
-  TempDirectory bootstrap_directory;
-  const auto server_port = port_pool_.get_next_available();
-  const auto bootstrap_server_port = port_pool_.get_next_available();
-  const auto server_http_port = port_pool_.get_next_available();
-  const auto bootstrap_server_http_port = port_pool_.get_next_available();
+  set_mock_bootstrap_data(
+      http_port, "test",
+      {{"localhost", server_port}, {"localhost", server_port2}},
+      GetParam().metadata_schema_version, "cluster-specific-id");
 
-  const std::string bootstrap_json_stmts =
-      get_data_dir().join("bootstrap_gr.js").str();
+  const auto base_listening_port = port_pool_.get_next_available();
+  std::vector<std::string> bootsrtap_params{
+      "--bootstrap=127.0.0.1:" + std::to_string(server_port), "-d",
+      bootstrap_directory.name(),
+      "--conf-base-port=" + std::to_string(base_listening_port)};
 
-  // launch mock server that is our metadata server for the bootstrap
-  auto &server_mock =
-      launch_mysql_server_mock(bootstrap_json_stmts, bootstrap_server_port,
-                               EXIT_SUCCESS, false, bootstrap_server_http_port);
-  set_mock_bootstrap_data(bootstrap_server_http_port, "test",
-                          {{"127.0.0.1", server_port}}, {2, 0, 3},
-                          "cluster-specific-id");
+  bootsrtap_params.insert(bootsrtap_params.end(),
+                          GetParam().bootstrap_params.begin(),
+                          GetParam().bootstrap_params.end());
 
   // launch the router in bootstrap mode
-  auto &router = launch_router_for_bootstrap(
-      {"--bootstrap=127.0.0.1:" + std::to_string(bootstrap_server_port), "-d",
-       bootstrap_directory.name()});
+  auto &router = launch_router_for_bootstrap(bootsrtap_params);
 
   // add login hook
   router.register_response("Please enter MySQL password for root: ",
@@ -1708,31 +1649,16 @@
 
   check_exit_code(router, EXIT_SUCCESS);
 
-  const std::string &conf_file =
+  const std::string conf_file =
       bootstrap_directory.name() + "/mysqlrouter.conf";
-  // check if valid config option was added to the file
-  EXPECT_TRUE(find_in_file(
-      conf_file,
-      [](const std::string &line) -> bool {
-        return line == "use_gr_notifications=0";
-      },
-      0ms));
 
-  // check if valid TTL is set (with no GR notifications it should be 0.5s)
-  EXPECT_TRUE(find_in_file(
-      conf_file,
-      [](const std::string &line) -> bool { return line == "ttl=0.5"; }, 0ms));
-
-  // auth_cache_refresh_interval should have the default value
-  EXPECT_TRUE(find_in_file(
-      conf_file,
-      [](const std::string &line) -> bool {
-        return line == "auth_cache_refresh_interval=2";
-      },
-      0ms));
-
-  // Stop the mock that was used for bootstrap
+  // check if valid config option was added to the file
+  auto conf_file_content = get_file_output(conf_file);
+  auto conf_lines = mysql_harness::split_string(conf_file_content, '\n');
+  EXPECT_THAT(conf_lines,
+              ::testing::IsSupersetOf(GetParam().expected_config_lines));
   server_mock.send_clean_shutdown_event();
+  EXPECT_NO_THROW(server_mock.wait_for_exit());
 
   auto plugin_dir = mysql_harness::get_plugin_dir(get_origin().str());
   ASSERT_TRUE(add_line_to_config_file(conf_file, "DEFAULT", "plugin_folder",
@@ -1743,12 +1669,54 @@
 
   // launch mock server that is our metadata server
   launch_mysql_server_mock(runtime_json_stmts, server_port, EXIT_SUCCESS, false,
-                           server_http_port);
-  set_mock_metadata(server_http_port, "cluster-specific-id", {server_port});
+                           http_port);
+  set_mock_metadata(http_port, "cluster-specific-id", {server_port});
 
   ASSERT_NO_FATAL_FAILURE(launch_router({"-c", conf_file}));
 }
 
+INSTANTIATE_TEST_SUITE_P(
+    ConfUseGrNotificationParam, ConfUseGrNotificationParamTest,
+    ::testing::Values(
+        // 0, 1) --conf-use-gr-notifications with no param
+        UseGrNotificationTestParams{{"--conf-use-gr-notifications"},
+                                    {"use_gr_notifications=1", "ttl=60",
+                                     "auth_cache_refresh_interval=60"},
+                                    {2, 0, 3}},
+        UseGrNotificationTestParams{{"--conf-use-gr-notifications"},
+                                    {"use_gr_notifications=1", "ttl=60",
+                                     "auth_cache_refresh_interval=60"},
+                                    {2, 1, 0}},
+        // 2, 3) --conf-use-gr-notifications=1
+        // [@FR5.2.2]
+        UseGrNotificationTestParams{{"--conf-use-gr-notifications=1"},
+                                    {"use_gr_notifications=1", "ttl=60",
+                                     "auth_cache_refresh_interval=60"},
+                                    {2, 0, 3}},
+        UseGrNotificationTestParams{{"--conf-use-gr-notifications=1"},
+                                    {"use_gr_notifications=1", "ttl=60",
+                                     "auth_cache_refresh_interval=60"},
+                                    {2, 1, 0}},
+        // 4, 5) no --conf-use-gr-notifications param
+        UseGrNotificationTestParams{{},
+                                    {"use_gr_notifications=0", "ttl=0.5",
+                                     "auth_cache_refresh_interval=2"},
+                                    {2, 0, 3}},
+        UseGrNotificationTestParams{{},
+                                    {"use_gr_notifications=0", "ttl=0.5",
+                                     "auth_cache_refresh_interval=2"},
+                                    {2, 1, 0}},
+        // 6, 7) --conf-use-gr-notification=0
+        // [@FR5.2.1]
+        UseGrNotificationTestParams{{"--conf-use-gr-notifications=0"},
+                                    {"use_gr_notifications=0", "ttl=0.5",
+                                     "auth_cache_refresh_interval=2"},
+                                    {2, 0, 3}},
+        UseGrNotificationTestParams{{"--conf-use-gr-notifications=0"},
+                                    {"use_gr_notifications=0", "ttl=0.5",
+                                     "auth_cache_refresh_interval=2"},
+                                    {2, 1, 0}}));
+
 class ErrorReportTest : public RouterComponentBootstrapTest {};
 
 /**
@@ -1768,24 +1736,35 @@
   check_exit_code(router, EXIT_FAILURE);
 }
 
+class ConfUseGrNotificationWrongValueParamTest
+    : public RouterBootstrapTest,
+      public ::testing::WithParamInterface<std::string> {};
+
 /**
  * @test
- *        verify that --conf-use-gr-notifications used with some value
- *        causes proper error report
+ *        verify that --conf-use-gr-notifications used with value other than 0
+ * and 1 causes proper error report
+ * [@FR5.2.4]
  */
-TEST_F(ErrorReportTest, ConfUseGrNotificationsHasValue) {
+TEST_P(ConfUseGrNotificationWrongValueParamTest,
+       ConfUseGrNotificationWrongValueParam) {
   auto &router = launch_router_for_bootstrap(
-      {"-B", "somehost:12345", "--conf-use-gr-notifications=some"},
+      {"-B", "somehost:12345", "--conf-use-gr-notifications=" + GetParam()},
       EXIT_FAILURE);
 
   EXPECT_NO_THROW(router.wait_for_exit());
-  EXPECT_THAT(
-      router.get_full_output(),
-      ::testing::HasSubstr("Error: option '--conf-use-gr-notifications' does "
-                           "not expect a value, but got a value"));
+  EXPECT_THAT(router.get_full_output(),
+              ::testing::HasSubstr(
+                  "Error: Value for parameter '--conf-use-gr-notifications' "
+                  "needs to be one of: ['0', '1']"));
   check_exit_code(router, EXIT_FAILURE);
 }
 
+INSTANTIATE_TEST_SUITE_P(ConfUseGrNotificationWrongValueParam,
+                         ConfUseGrNotificationWrongValueParamTest,
+                         ::testing::Values("2", "true", "false", "N/A", "yes",
+                                           "no"));
+
 /**
  * @test
  *       verify that running bootstrap with -d with dir that already exists and
@@ -2045,6 +2024,52 @@
   EXPECT_FALSE(router.expect_output("Could not delete file .*", true, 0ms));
 }
 
+TEST_F(RouterBootstrapTest, CheckAuthBackendWhenOldMetadata) {
+  TempDirectory bootstrap_directory;
+  const auto server_port = port_pool_.get_next_available();
+  const auto http_port = port_pool_.get_next_available();
+  const std::string json_stmts =
+      get_data_dir().join("bootstrap_gr_v1.js").str();
+
+  // launch mock server that is our metadata server for the bootstrap
+  launch_mysql_server_mock(json_stmts, server_port, EXIT_SUCCESS, false,
+                           http_port);
+
+  set_mock_bootstrap_data(http_port, "test", {{"localhost", server_port}},
+                          {1, 0, 0}, "cluster-specific-id");
+
+  const auto base_listening_port = port_pool_.get_next_available();
+  std::vector<std::string> bootsrtap_params{
+      "--bootstrap=127.0.0.1:" + std::to_string(server_port), "-d",
+      bootstrap_directory.name(),
+      "--conf-base-port=" + std::to_string(base_listening_port)};
+
+  // launch the router in bootstrap mode
+  auto &router = launch_router_for_bootstrap(bootsrtap_params, EXIT_SUCCESS,
+                                             /*disable rest*/ false);
+
+  // add login hook
+  router.register_response("Please enter MySQL password for root: ",
+                           kRootPassword + "\n"s);
+
+  check_exit_code(router, EXIT_SUCCESS);
+
+  const std::string conf_file =
+      bootstrap_directory.name() + "/mysqlrouter.conf";
+
+  // check if valid authentication backend option was added to the config file
+  auto conf_file_content = get_file_output(conf_file);
+  auto conf_lines = mysql_harness::split_string(conf_file_content, '\n');
+  const auto passwd_file = mysql_harness::Path{
+      bootstrap_directory.name() + "/data/auth_backend_passwd_file"};
+  EXPECT_THAT(conf_lines,
+              ::testing::IsSupersetOf(
+                  {::testing::ContainsRegex("backend=file"),
+                   ::testing::ContainsRegex(std::string{"filename=.*"} +
+                                            passwd_file.str())}));
+  ASSERT_TRUE(passwd_file.exists());
+}
+
 int main(int argc, char *argv[]) {
   init_windows_sockets();
   ProcessManager::set_origin(Path(argv[0]).dirname());
diff -Nru mysql-8.0-8.0.26/router/tests/component/test_bootstrap_clusterset.cc mysql-8.0-8.0.27/router/tests/component/test_bootstrap_clusterset.cc
--- mysql-8.0-8.0.26/router/tests/component/test_bootstrap_clusterset.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/test_bootstrap_clusterset.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,946 @@
+/*
+  Copyright (c) 2021, Oracle 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,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include <chrono>
+
+#include <gmock/gmock.h>
+
+#ifdef RAPIDJSON_NO_SIZETYPEDEFINE
+// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
+// globally and require to include my_rapidjson_size_t.h
+#include "my_rapidjson_size_t.h"
+#endif
+#include <rapidjson/document.h>
+#include <rapidjson/writer.h>
+
+#include "dim.h"
+#include "filesystem_utils.h"
+#include "harness_assert.h"
+#include "keyring/keyring_manager.h"
+#include "mock_server_rest_client.h"
+#include "mock_server_testutils.h"
+#include "mysql/harness/string_utils.h"  // mysql_harness::split_string
+#include "mysqlrouter/cluster_metadata.h"
+#include "random_generator.h"
+#include "rest_api_testutils.h"
+#include "router_component_clusterset.h"
+#include "router_component_test.h"
+#include "router_component_testutils.h"
+#include "socket_operations.h"
+#include "tcp_port_pool.h"
+
+using namespace std::chrono_literals;
+using namespace std::string_literals;
+using mysqlrouter::ClusterType;
+
+// for the test with no param
+class RouterClusterSetBootstrapTest : public RouterComponentBootstrapTest,
+                                      public RouterComponentClusterSetTest {
+ protected:
+  using NodeAddress = std::pair<std::string, uint16_t>;
+  TempDirectory bootstrap_directory;
+  uint64_t view_id{1};
+};
+
+struct TargetClusterTestParams {
+  // which cluster from the CS should be used as a param for --bootstrap
+  unsigned bootstrap_cluster_id;
+  // which node from the selected cluster hould be used as a param for
+  // --bootstrap
+  unsigned bootstrap_node_id;
+  // what should be the value for --conf-target-cluster (if empty do not use
+  // this parameter in the bootstrap command)
+  std::string target_cluster_param;
+  // what should be the value for --conf-target-cluster-by-name (if empty do not
+  // use this parameter in the bootstrap command)
+  std::string target_cluster_by_name_param;
+
+  // id of the target Cluster within ClusterSet
+  unsigned target_cluster_id;
+
+  // what is the expected value of the target_cluster in the configuration file
+  // created by the bootstrap
+  std::string expected_target_cluster;
+
+  // vector of strings expected on the console after the bootstrap
+  std::vector<std::string> expected_output_strings;
+};
+
+class ClusterSetBootstrapTargetClusterTest
+    : public RouterClusterSetBootstrapTest,
+      public ::testing::WithParamInterface<TargetClusterTestParams> {};
+
+TEST_P(ClusterSetBootstrapTargetClusterTest, ClusterSetBootstrapTargetCluster) {
+  const auto target_cluster_id = GetParam().target_cluster_id;
+  const std::string expected_target_cluster =
+      GetParam().expected_target_cluster;
+
+  create_clusterset(view_id, target_cluster_id, /*primary_cluster_id*/ 0,
+                    "bootstrap_clusterset.js", "", expected_target_cluster);
+  const unsigned bootstrap_cluster_id = GetParam().bootstrap_cluster_id;
+  const unsigned bootstrap_node_id = GetParam().bootstrap_node_id;
+  const std::string target_cluster_param =
+      GetParam().target_cluster_param.empty()
+          ? ""
+          : "--conf-target-cluster=" + GetParam().target_cluster_param;
+
+  const std::string target_cluster_by_name_param =
+      GetParam().target_cluster_by_name_param.empty()
+          ? ""
+          : "--conf-target-cluster-by-name=" +
+                GetParam().target_cluster_by_name_param;
+  const auto &expected_output_strings = GetParam().expected_output_strings;
+
+  std::vector<std::string> bootstrap_params = {
+      "--bootstrap=127.0.0.1:" +
+          std::to_string(clusterset_data_.clusters[bootstrap_cluster_id]
+                             .nodes[bootstrap_node_id]
+                             .classic_port),
+      "-d", bootstrap_directory.name()};
+
+  if (!target_cluster_param.empty()) {
+    bootstrap_params.push_back(target_cluster_param);
+  }
+  if (!target_cluster_by_name_param.empty()) {
+    bootstrap_params.push_back(target_cluster_by_name_param);
+  }
+
+  auto &router = launch_router_for_bootstrap(bootstrap_params, EXIT_SUCCESS);
+
+  // add login hook
+  router.register_response("Please enter MySQL password for root: ",
+                           kRootPassword + "\n"s);
+
+  check_exit_code(router, EXIT_SUCCESS, 5s);
+
+  const std::string conf_file_path =
+      bootstrap_directory.name() + "/mysqlrouter.conf";
+
+  const std::string state_file_path =
+      bootstrap_directory.name() + "/data/state.json";
+
+  // check the state file that was produced
+  // [@FR12]
+  check_state_file(state_file_path, ClusterType::GR_CS, clusterset_data_.uuid,
+                   clusterset_data_.get_all_nodes_classic_ports(), view_id);
+
+  const std::string config_file_str = get_file_output(conf_file_path);
+
+  // [@FR2]
+  EXPECT_TRUE(pattern_found(config_file_str, "cluster_type=gr"))
+      << config_file_str;
+  EXPECT_TRUE(pattern_found(config_file_str, "ttl=5")) << config_file_str;
+
+  const std::string router_console_output = router.get_full_output();
+  for (const auto &expected_output_string : expected_output_strings) {
+    EXPECT_TRUE(pattern_found(router_console_output, expected_output_string))
+        << router_console_output;
+  }
+}
+
+INSTANTIATE_TEST_SUITE_P(
+    ClusterSetBootstrapTargetCluster, ClusterSetBootstrapTargetClusterTest,
+    ::testing::Values(
+        // we bootstrap against the consecutive nodes (0, 1, 2) of the first
+        // cluster which is the PRIMARY cluster; both "--conf-target-cluster"
+        // and "--conf-target-cluster-by-name" parameters are empty (not used)
+        // so per requirement we are expected to configure
+        // empty target cluster
+        // [@FR1]
+        TargetClusterTestParams{/*bootstrap_cluster_id*/ 0,
+                                /*bootstrap_node_id*/ 0,
+                                /*--conf-target-cluster*/ "",
+                                /*--conf-target-cluster-by-name*/ "",
+                                /*target_cluster_id*/ 0,
+                                /*expected_target_cluster*/ "",
+                                /*expected_output_strings*/ {}},
+        TargetClusterTestParams{/*bootstrap_cluster_id*/ 0,
+                                /*bootstrap_node_id*/ 1,
+                                /*--conf-target-cluster*/ "",
+                                /*--conf-target-cluster-by-name*/ "",
+                                /*target_cluster_id*/ 0,
+                                /*expected_target_cluster*/ "",
+                                /*expected_output_strings*/ {}},
+        TargetClusterTestParams{/*bootstrap_cluster_id*/ 0,
+                                /*bootstrap_node_id*/ 2,
+                                /*--conf-target-cluster*/ "",
+                                /*--conf-target-cluster-by-name*/ "",
+                                /*target_cluster_id*/ 0,
+                                /*expected_target_cluster*/ "",
+                                /*expected_output_strings*/ {}},
+        // we bootstrap against the nodes of the other clusters which is
+        // are REPLICA clusters; both "--conf-target-cluster" and
+        // "--conf-target-cluster-by-name" parameters are empty (not used) so
+        // per requirement we are expected to configure empty target cluster
+        TargetClusterTestParams{/*bootstrap_cluster_id*/ 1,
+                                /*bootstrap_node_id*/ 0,
+                                /*--conf-target-cluster*/ "",
+                                /*--conf-target-cluster-by-name*/ "",
+                                /*target_cluster_id*/ 1,
+                                /*expected_target_cluster*/ "",
+                                /*expected_output_strings*/ {}},
+        TargetClusterTestParams{/*bootstrap_cluster_id*/ 1,
+                                /*bootstrap_node_id*/ 1,
+                                /*--conf-target-cluster*/ "",
+                                /*--conf-target-cluster-by-name*/ "",
+                                /*target_cluster_id*/ 1,
+                                /*expected_target_cluster*/ "",
+                                /*expected_output_strings*/ {}},
+        TargetClusterTestParams{/*bootstrap_cluster_id*/ 1,
+                                /*bootstrap_node_id*/ 2,
+                                /*--conf-target-cluster*/ "",
+                                /*--conf-target-cluster-by-name*/ "",
+                                /*target_cluster_id*/ 1,
+                                /*expected_target_cluster*/ "",
+                                /*expected_output_strings*/ {}},
+        // second Replica Cluster, nodes 0-2
+        TargetClusterTestParams{/*bootstrap_cluster_id*/ 2,
+                                /*bootstrap_node_id*/ 0,
+                                /*--conf-target-cluster*/ "",
+                                /*--conf-target-cluster-by-name*/ "",
+                                /*target_cluster_id*/ 2,
+                                /*expected_target_cluster*/ "",
+                                /*expected_output_strings*/ {}},
+        TargetClusterTestParams{/*bootstrap_cluster_id*/ 2,
+                                /*bootstrap_node_id*/ 1,
+                                /*--conf-target-cluster*/ "",
+                                /*--conf-target-cluster-by-name*/ "",
+                                /*target_cluster_id*/ 2,
+                                /*expected_target_cluster*/ "",
+                                /*expected_output_strings*/ {}},
+        TargetClusterTestParams{/*bootstrap_cluster_id*/ 2,
+                                /*bootstrap_node_id*/ 2,
+                                /*--conf-target-cluster*/ "",
+                                /*--conf-target-cluster-by-name*/ "",
+                                /*target_cluster_id*/ 2,
+                                /*expected_target_cluster*/ "",
+                                /*expected_output_strings*/ {}},
+        // we bootstrap against the nodes of the first Cluster which is the
+        // PRIMARY Cluster; the "--conf-target-cluster=current" so
+        // per requirement we are expected to configure
+        // target_cluster=UUID-OF-PRIMARY-CLUSTER
+        // NOTE: since we are using "current" on the Primary cluster we expect
+        // the warning on the console
+        // NOTE: also checks that the "current" option is case insesitive
+        // [@FR3.1.1] [@FR3.3] [@TS_R2_1/1]
+        TargetClusterTestParams{
+            /*bootstrap_cluster_id*/ 0,
+            /*bootstrap_node_id*/ 0,
+            /*--conf-target-cluster*/ "current",
+            /*--conf-target-cluster-by-name*/ "",
+            /*target_cluster_id*/ 0,
+            /*expected_target_cluster*/ "00000000-0000-0000-0000-0000000000g1",
+            /*expected_output_strings*/
+            {"WARNING: Option --conf-target-cluster=current was used to "
+             "bootstrap against the Primary Cluster. Note that the Router will "
+             "not follow the new Primary Cluster in case of the Primary "
+             "Cluster change in the ClusterSet"}},
+        TargetClusterTestParams{
+            /*bootstrap_cluster_id*/ 0,
+            /*bootstrap_node_id*/ 0,
+            /*--conf-target-cluster*/ "Current",
+            /*--conf-target-cluster-by-name*/ "",
+            /*target_cluster_id*/ 0,
+            /*expected_target_cluster*/ "00000000-0000-0000-0000-0000000000g1",
+            /*expected_output_strings*/
+            {"WARNING: Option --conf-target-cluster=current was used to "
+             "bootstrap against the Primary Cluster. Note that the Router will "
+             "not follow the new Primary Cluster in case of the Primary "
+             "Cluster change in the ClusterSet"}},
+        TargetClusterTestParams{
+            /*bootstrap_cluster_id*/ 0,
+            /*bootstrap_node_id*/ 0,
+            /*--conf-target-cluster*/ "CURRENT",
+            /*--conf-target-cluster-by-name*/ "",
+            /*target_cluster_id*/ 0,
+            /*expected_target_cluster*/ "00000000-0000-0000-0000-0000000000g1",
+            /*expected_output_strings*/
+            {"WARNING: Option --conf-target-cluster=current was used to "
+             "bootstrap against the Primary Cluster. Note that the Router will "
+             "not follow the new Primary Cluster in case of the Primary "
+             "Cluster change in the ClusterSet"}},
+        // [@TS_R2_1/2]
+        TargetClusterTestParams{
+            /*bootstrap_cluster_id*/ 0,
+            /*bootstrap_node_id*/ 1,
+            /*--conf-target-cluster*/ "currenT",
+            /*--conf-target-cluster-by-name*/ "",
+            /*target_cluster_id*/ 0,
+            /*expected_target_cluster*/ "00000000-0000-0000-0000-0000000000g1",
+            /*expected_output_strings*/
+            {"WARNING: Option --conf-target-cluster=current was used to "
+             "bootstrap against the Primary Cluster. Note that the Router will "
+             "not follow the new Primary Cluster in case of the Primary "
+             "Cluster change in the ClusterSet"}},
+
+        // we bootstrap against the nodes of the second Cluster which is the
+        // REPLICA Cluster; the "--conf-target-cluster=current" so
+        // per requirement we are expected to configure
+        // target_cluster=UUID-OF-REPLICA-CLUSTER
+        // NOTE: since this is not the PRIMARY cluster we do not expect the
+        // warning now NOTE: also checks that the "current" option is case
+        // insesitive
+        // [@FR3.2] [@TS_R2_1/3]
+        TargetClusterTestParams{
+            /*bootstrap_cluster_id*/ 1,
+            /*bootstrap_node_id*/ 0,
+            /*--conf-target-cluster*/ "current",
+            /*--conf-target-cluster-by-name*/ "",
+            /*target_cluster_id*/ 1,
+            /*expected_target_cluster*/ "00000000-0000-0000-0000-0000000000g2",
+            /*expected_output_strings*/
+            {""}},
+        TargetClusterTestParams{
+            /*bootstrap_cluster_id*/ 1,
+            /*bootstrap_node_id*/ 0,
+            /*--conf-target-cluster*/ "Current",
+            /*--conf-target-cluster-by-name*/ "",
+            /*target_cluster_id*/ 1,
+            /*expected_target_cluster*/ "00000000-0000-0000-0000-0000000000g2",
+            /*expected_output_strings*/
+            {""}},
+        TargetClusterTestParams{
+            /*bootstrap_cluster_id*/ 1,
+            /*bootstrap_node_id*/ 0,
+            /*--conf-target-cluster*/ "CURRENT",
+            /*--conf-target-cluster-by-name*/ "",
+            /*target_cluster_id*/ 1,
+            /*expected_target_cluster*/ "00000000-0000-0000-0000-0000000000g2",
+            /*expected_output_strings*/
+            {""}},
+        // [@TS_R2_1/4]
+        TargetClusterTestParams{
+            /*bootstrap_cluster_id*/ 1,
+            /*bootstrap_node_id*/ 1,
+            /*--conf-target-cluster*/ "current",
+            /*--conf-target-cluster-by-name*/ "",
+            /*target_cluster_id*/ 1,
+            /*expected_target_cluster*/ "00000000-0000-0000-0000-0000000000g2",
+            /*expected_output_strings*/
+            {""}},
+
+        // we bootstrap against various ClusterSet nodes using
+        // "--conf-target-cluster=primary" so we expect target_cluster=primary
+        // NOTE: also checks that the "current" option is case insesitive
+        // [@FR3.2] [@FR3.3] [@TS_R3_1/1]
+        TargetClusterTestParams{/*bootstrap_cluster_id*/ 0,
+                                /*bootstrap_node_id*/ 0,
+                                /*--conf-target-cluster*/ "primary",
+                                /*--conf-target-cluster-by-name*/ "",
+                                /*target_cluster_id*/ 0,
+                                /*expected_target_cluster*/ "primary",
+                                /*expected_output_strings*/
+                                {""}},
+        TargetClusterTestParams{/*bootstrap_cluster_id*/ 0,
+                                /*bootstrap_node_id*/ 0,
+                                /*--conf-target-cluster*/ "Primary",
+                                /*--conf-target-cluster-by-name*/ "",
+                                /*target_cluster_id*/ 0,
+                                /*expected_target_cluster*/ "primary",
+                                /*expected_output_strings*/
+                                {""}},
+        TargetClusterTestParams{/*bootstrap_cluster_id*/ 0,
+                                /*bootstrap_node_id*/ 0,
+                                /*--conf-target-cluster*/ "PRIMARY",
+                                /*--conf-target-cluster-by-name*/ "",
+                                /*target_cluster_id*/ 0,
+                                /*expected_target_cluster*/ "primary",
+                                /*expected_output_strings*/
+                                {""}},
+        // [@TS_R3_1/2]
+        TargetClusterTestParams{/*bootstrap_cluster_id*/ 0,
+                                /*bootstrap_node_id*/ 2,
+                                /*--conf-target-cluster*/ "primarY",
+                                /*--conf-target-cluster-by-name*/ "",
+                                /*target_cluster_id*/ 0,
+                                /*expected_target_cluster*/ "primary",
+                                /*expected_output_strings*/
+                                {""}},
+        // [@TS_R3_1/3]
+        TargetClusterTestParams{/*bootstrap_cluster_id*/ 1,
+                                /*bootstrap_node_id*/ 0,
+                                /*--conf-target-cluster*/ "primary",
+                                /*--conf-target-cluster-by-name*/ "",
+                                /*target_cluster_id*/ 0,
+                                /*expected_target_cluster*/ "primary",
+                                /*expected_output_strings*/
+                                {""}},
+        // [@TS_R3_1/4]
+        TargetClusterTestParams{/*bootstrap_cluster_id*/ 2,
+                                /*bootstrap_node_id*/ 0,
+                                /*--conf-target-cluster*/ "primary",
+                                /*--conf-target-cluster-by-name*/ "",
+                                /*target_cluster_id*/ 0,
+                                /*expected_target_cluster*/ "primary",
+                                /*expected_output_strings*/
+                                {""}},
+        TargetClusterTestParams{/*bootstrap_cluster_id*/ 2,
+                                /*bootstrap_node_id*/ 1,
+                                /*--conf-target-cluster*/ "Primary",
+                                /*--conf-target-cluster-by-name*/ "",
+                                /*target_cluster_id*/ 0,
+                                /*expected_target_cluster*/ "primary",
+                                /*expected_output_strings*/
+                                {""}},
+        TargetClusterTestParams{/*bootstrap_cluster_id*/ 2,
+                                /*bootstrap_node_id*/ 0,
+                                /*--conf-target-cluster*/ "PRIMARY",
+                                /*--conf-target-cluster-by-name*/ "",
+                                /*target_cluster_id*/ 0,
+                                /*expected_target_cluster*/ "primary",
+                                /*expected_output_strings*/
+                                {""}},
+
+        // we bootstrap against various ClusterSet nodes using
+        // "--conf-target-cluster-name=<CLUSTER-NAME>" so we expect
+        // target_cluster=<CLUSTER_GR_UUID>
+        // [@FR3.4]
+        TargetClusterTestParams{
+            /*bootstrap_cluster_id*/ 0,
+            /*bootstrap_node_id*/ 0,
+            /*--conf-target-cluster*/ "",
+            /*--conf-target-cluster-by-name*/ "cluster-name-1",
+            /*target_cluster_id*/ 0,
+            /*expected_target_cluster*/ "00000000-0000-0000-0000-0000000000g1",
+            /*expected_output_strings*/ {}},
+        // [@TS_R5_1/2]
+        TargetClusterTestParams{
+            /*bootstrap_cluster_id*/ 0,
+            /*bootstrap_node_id*/ 1,
+            /*--conf-target-cluster*/ "",
+            /*--conf-target-cluster-by-name*/ "cluster-name-1",
+            /*target_cluster_id*/ 0,
+            /*expected_target_cluster*/ "00000000-0000-0000-0000-0000000000g1",
+            /*expected_output_strings*/ {}},
+        // [@TS_R5_1/2]
+        TargetClusterTestParams{
+            /*bootstrap_cluster_id*/ 0,
+            /*bootstrap_node_id*/ 1,
+            /*--conf-target-cluster*/ "",
+            /*--conf-target-cluster-by-name*/ "cluster-name-1",
+            /*target_cluster_id*/ 0,
+            /*expected_target_cluster*/ "00000000-0000-0000-0000-0000000000g1",
+            /*expected_output_strings*/ {}}));
+
+struct ClusterSetUseGrNotificationTestParams {
+  std::vector<std::string> bootstrap_params;
+  std::vector<std::string> expected_config_lines;
+};
+
+class ClusterSetConfUseGrNotificationParamTest
+    : public RouterClusterSetBootstrapTest,
+      public ::testing::WithParamInterface<
+          ClusterSetUseGrNotificationTestParams> {};
+
+/**
+ * @test
+ *       verify that using various values for --conf-use-gr-notifications
+ * creates proper config file entries.
+ */
+TEST_P(ClusterSetConfUseGrNotificationParamTest,
+       ClusterSetConfUseGrNotificationParam) {
+  TempDirectory bootstrap_directory;
+  create_clusterset(view_id, /*target_cluster_id*/ 0, /*primary_cluster_id*/ 0,
+                    "bootstrap_clusterset.js");
+
+  std::vector<std::string> bootstrap_params = {
+      "--bootstrap=127.0.0.1:" +
+          std::to_string(clusterset_data_.clusters[0].nodes[0].classic_port),
+      "-d", bootstrap_directory.name()};
+
+  bootstrap_params.insert(bootstrap_params.end(),
+                          GetParam().bootstrap_params.begin(),
+                          GetParam().bootstrap_params.end());
+
+  // launch the router in bootstrap mode
+  auto &router = launch_router_for_bootstrap(bootstrap_params);
+
+  // add login hook
+  router.register_response("Please enter MySQL password for root: ",
+                           kRootPassword + "\n"s);
+
+  check_exit_code(router, EXIT_SUCCESS, 5s);
+
+  const std::string state_file_path =
+      bootstrap_directory.name() + "/data/state.json";
+
+  // check the state file that was produced
+  // [@FR12]
+  check_state_file(state_file_path, ClusterType::GR_CS, clusterset_data_.uuid,
+                   clusterset_data_.get_all_nodes_classic_ports(), view_id);
+
+  // check if the expected config options were added to the configuration file
+  const auto conf_file_content =
+      get_file_output(bootstrap_directory.name() + "/mysqlrouter.conf");
+  for (const auto &expected_config_line : GetParam().expected_config_lines) {
+    EXPECT_THAT(mysql_harness::split_string(conf_file_content, '\n'),
+                ::testing::Contains(expected_config_line));
+  }
+}
+
+INSTANTIATE_TEST_SUITE_P(
+    ClusterSetConfUseGrNotificationParam,
+    ClusterSetConfUseGrNotificationParamTest,
+    ::testing::Values(
+        // 0) --conf-use-gr-notifications with no param: GR Notifications should
+        // be enabled and TTL=5 seconds
+        // [@FR5]
+        // [@FR5.2.3]
+        ClusterSetUseGrNotificationTestParams{
+            {"--conf-use-gr-notifications"},
+            {"use_gr_notifications=1", "ttl=5"}},
+        // 1) --conf-use-gr-notifications=1: GR Notifications should be enabled
+        // and TTL=5 seconds
+        // [@FR5]
+        ClusterSetUseGrNotificationTestParams{
+            {"--conf-use-gr-notifications=1"},
+            {"use_gr_notifications=1", "ttl=5"}},
+        // 2) no --conf-use-gr-notifications param: GR Notifications should be
+        // enabled and TTL=5 seconds
+        // [@FR5]
+        // [@FR5.1]
+        // [@FR5.2]
+        // [@FR5.2.2]
+        ClusterSetUseGrNotificationTestParams{
+            {}, {"use_gr_notifications=1", "ttl=5"}},
+        // 3) --conf-use-gr-notification=0: GR Notifications should be disabled
+        // and TTL=5 seconds
+        // [@FR5.2]
+        // [@FR5.2.1]
+        ClusterSetUseGrNotificationTestParams{
+            {"--conf-use-gr-notifications=0"},
+            {"use_gr_notifications=0", "ttl=5"}}));
+
+struct BootstrapParametersErrorTestParams {
+  // which cluster from the CS should be used as a param for --bootstrap
+  unsigned bootstrap_cluster_id;
+  // which node from the selected cluster hould be used as a param for
+  // --bootstrap
+  unsigned bootstrap_node_id;
+
+  std::vector<std::string> bootstrap_params;
+  std::string expected_error;
+};
+
+class ClusterSetBootstrapParamsErrorTest
+    : public RouterClusterSetBootstrapTest,
+      public ::testing::WithParamInterface<BootstrapParametersErrorTestParams> {
+};
+
+/**
+ * @test
+ *       verify the proper errors are reported for invalid --conf-target-cluster
+ * and --conf-target-cluster-by-name uses
+ */
+TEST_P(ClusterSetBootstrapParamsErrorTest, ClusterSetBootstrapParamsError) {
+  const unsigned bootstrap_cluster_id = GetParam().bootstrap_cluster_id;
+  const unsigned bootstrap_node_id = GetParam().bootstrap_node_id;
+
+  create_clusterset(view_id, /*target_cluster_id*/ 0, /*primary_cluster_id*/ 0,
+                    "bootstrap_clusterset.js");
+
+  std::vector<std::string> bootsrtap_params{
+      "--bootstrap=127.0.0.1:" +
+          std::to_string(clusterset_data_.clusters[bootstrap_cluster_id]
+                             .nodes[bootstrap_node_id]
+                             .classic_port),
+      "--connect-timeout=1",
+      "-d",
+      bootstrap_directory.name(),
+  };
+
+  bootsrtap_params.insert(bootsrtap_params.end(),
+                          GetParam().bootstrap_params.begin(),
+                          GetParam().bootstrap_params.end());
+
+  auto &router = launch_router_for_bootstrap(bootsrtap_params, EXIT_FAILURE);
+  // add login hook
+  router.register_response("Please enter MySQL password for root: ",
+                           kRootPassword + "\n"s);
+
+  // verify that appropriate message was logged
+
+  EXPECT_NO_THROW(router.wait_for_exit());
+  EXPECT_THAT(router.get_full_output(),
+              ::testing::HasSubstr(GetParam().expected_error));
+
+  check_exit_code(router, EXIT_FAILURE);
+}
+
+INSTANTIATE_TEST_SUITE_P(
+    ClusterSetBootstrapParamsError, ClusterSetBootstrapParamsErrorTest,
+    ::testing::Values(
+        // verify that using empty string as value for --conf-target-cluster
+        // leads to expected bootstrap error
+        // [@FR3.3.2]
+        // [@FTS_R4_1/1]
+        BootstrapParametersErrorTestParams{
+            /*bootstrap_cluster_id*/ 0,
+            /*bootstrap_node_id*/ 0,
+            {"--conf-target-cluster="},
+            "Value for parameter '--conf-target-cluster' needs to be one of: "
+            "['primary', 'current']"},
+        //[@FTS_R4_1/2]
+        BootstrapParametersErrorTestParams{
+            /*bootstrap_cluster_id*/ 0,
+            /*bootstrap_node_id*/ 0,
+            {"--conf-target-cluster=''"},
+            "Value for parameter '--conf-target-cluster' needs to be one of: "
+            "['primary', 'current']"},
+        // [@FTS_R4_1/3]
+        BootstrapParametersErrorTestParams{
+            /*bootstrap_cluster_id*/ 2,
+            /*bootstrap_node_id*/ 0,
+            {"--conf-target-cluster=''"},
+            "Value for parameter '--conf-target-cluster' needs to be one of: "
+            "['primary', 'current']"},
+        //[@FTS_R4_1/4]
+        BootstrapParametersErrorTestParams{
+            /*bootstrap_cluster_id*/ 0,
+            /*bootstrap_node_id*/ 1,
+            {"--conf-target-cluster=\"\""},
+            "Value for parameter '--conf-target-cluster' needs to be one of: "
+            "['primary', 'current']"},
+        // [@FTS_R4_1/5]
+        BootstrapParametersErrorTestParams{
+            /*bootstrap_cluster_id*/ 1,
+            /*bootstrap_node_id*/ 0,
+            {"--conf-target-cluster=none"},
+            "Value for parameter '--conf-target-cluster' needs to be one of: "
+            "['primary', 'current']"},
+        // [@FTS_R4_1/6]
+        BootstrapParametersErrorTestParams{
+            /*bootstrap_cluster_id*/ 2,
+            /*bootstrap_node_id*/ 0,
+            {"--conf-target-cluster=gr-id-1"},
+            "Value for parameter '--conf-target-cluster' needs to be one of: "
+            "['primary', 'current']"},
+        // [@FTS_R4_1/7]
+        BootstrapParametersErrorTestParams{
+            /*bootstrap_cluster_id*/ 0,
+            /*bootstrap_node_id*/ 0,
+            {"--conf-target-cluster=current2"},
+            "Value for parameter '--conf-target-cluster' needs to be one of: "
+            "['primary', 'current']"},
+        // [@FTS_R4_1/8]
+        BootstrapParametersErrorTestParams{
+            /*bootstrap_cluster_id*/ 1,
+            /*bootstrap_node_id*/ 0,
+            {"--conf-target-cluster=primary cluster"},
+            "Value for parameter '--conf-target-cluster' needs to be one of: "
+            "['primary', 'current']"},
+        // [@FTS_R4_1/9]
+        BootstrapParametersErrorTestParams{
+            /*bootstrap_cluster_id*/ 2,
+            /*bootstrap_node_id*/ 1,
+            {"--conf-target-cluster=0"},
+            "Value for parameter '--conf-target-cluster' needs to be one of: "
+            "['primary', 'current']"},
+        // verify that using --conf-target-cluster-by-name with no value
+        // leads to expected bootstrap error
+        BootstrapParametersErrorTestParams{
+            /*bootstrap_cluster_id*/ 0,
+            /*bootstrap_node_id*/ 0,
+            {"--conf-target-cluster-by-name"},
+            "Error: option '--conf-target-cluster-by-name' expects a value, "
+            "got nothing"},
+        // verify that using --conf-target-cluster-by-name with no value
+        // leads to expected bootstrap error
+        // [@TS_R5_1/13]
+        BootstrapParametersErrorTestParams{
+            /*bootstrap_cluster_id*/ 1,
+            /*bootstrap_node_id*/ 1,
+            {"--conf-target-cluster-by-name="},
+            "Value for parameter '--conf-target-cluster-by-name' can't be "
+            "empty"},
+        // verify that using both --conf-target-cluster and
+        // --conf-target-cluster-by-name leads to expected bootstrap error
+        // [@FR3.5.1]
+        // [@TS_R8_2/1]
+        BootstrapParametersErrorTestParams{
+            /*bootstrap_cluster_id*/ 0,
+            /*bootstrap_node_id*/ 0,
+            {"--conf-target-cluster=primary",
+             "--conf-target-cluster-by-name=cluster-name-1"},
+            "Parameters '--conf-target-cluster' and "
+            "'--conf-target-cluster-by-name' "
+            "are mutually exclusive and can't be used together"},
+        // [@TS_R8_2/2]
+        BootstrapParametersErrorTestParams{
+            /*bootstrap_cluster_id*/ 0,
+            /*bootstrap_node_id*/ 0,
+            {"--conf-target-cluster-by-name=cluster-name-1",
+             "--conf-target-cluster=primary"},
+            "Parameters '--conf-target-cluster' and "
+            "'--conf-target-cluster-by-name' "
+            "are mutually exclusive and can't be used together"},
+        // verify that using value other than 'primary' or 'current' for
+        // --conf-target-cluster leads to expected bootstrap error
+        // [@FR3.3.1]
+        BootstrapParametersErrorTestParams{
+            /*bootstrap_cluster_id*/ 0,
+            /*bootstrap_node_id*/ 0,
+            {"--conf-target-cluster=invalid"},
+            "Value for parameter '--conf-target-cluster' needs to be one of: "
+            "['primary', 'current']"},
+        // verify that using --conf-target-cluster with no value leads to
+        // expected bootstrap error
+        // [@FR3.3.2]
+        BootstrapParametersErrorTestParams{
+            /*bootstrap_cluster_id*/ 0,
+            /*bootstrap_node_id*/ 0,
+            {"--conf-target-cluster"},
+            "Error: option '--conf-target-cluster' expects a value, got "
+            "nothing"}));
+
+class ClusterSetBootstrapClusterNotFoundErrorTest
+    : public RouterClusterSetBootstrapTest,
+      public ::testing::WithParamInterface<BootstrapParametersErrorTestParams> {
+};
+
+/**
+ * @test
+ *       verify the proper errors are reported if requested Cluster was not
+ * found when bootstrapping
+ */
+TEST_P(ClusterSetBootstrapClusterNotFoundErrorTest,
+       ClusterSetBootstrapClusterNotFoundError) {
+  const unsigned bootstrap_cluster_id = GetParam().bootstrap_cluster_id;
+  const unsigned bootstrap_node_id = GetParam().bootstrap_node_id;
+
+  create_clusterset(view_id, 0, /*primary_cluster_id*/ 0,
+                    "bootstrap_clusterset.js", "", "",
+                    /*simulate_cluster_not_found*/ true);
+
+  std::vector<std::string> bootsrtap_params{
+      "--bootstrap=127.0.0.1:" +
+          std::to_string(clusterset_data_.clusters[bootstrap_cluster_id]
+                             .nodes[bootstrap_node_id]
+                             .classic_port),
+      "--connect-timeout=1",
+      "-d",
+      bootstrap_directory.name(),
+  };
+
+  bootsrtap_params.insert(bootsrtap_params.end(),
+                          GetParam().bootstrap_params.begin(),
+                          GetParam().bootstrap_params.end());
+
+  auto &router = launch_router_for_bootstrap(bootsrtap_params, EXIT_FAILURE);
+  // add login hook
+  router.register_response("Please enter MySQL password for root: ",
+                           kRootPassword + "\n"s);
+
+  // verify that appropriate message was logged
+
+  EXPECT_NO_THROW(router.wait_for_exit());
+  EXPECT_THAT(router.get_full_output(),
+              ::testing::HasSubstr(GetParam().expected_error));
+
+  check_exit_code(router, EXIT_FAILURE);
+}
+
+INSTANTIATE_TEST_SUITE_P(
+    ClusterSetBootstrapClusterNotFoundError,
+    ClusterSetBootstrapClusterNotFoundErrorTest,
+    ::testing::Values(
+        // verify that using --conf-target-cluster=primary where PRIMARY
+        // Cluster can't be found leads to a proper error
+        // [@FR3.2.1]
+        BootstrapParametersErrorTestParams{
+            /*bootstrap_cluster_id*/ 0,
+            /*bootstrap_node_id*/ 0,
+            {"--conf-target-cluster=primary"},
+            "Error: Could not reach Primary Cluster for the ClusterSet"},
+
+        // verify that using --conf-target-cluster-by-name=foo where foo is
+        // not a cluster leads to a proper error
+        // [@FR3.4.1]
+        // [@TS_R5_1/19]
+        BootstrapParametersErrorTestParams{
+            /*bootstrap_cluster_id*/ 0,
+            /*bootstrap_node_id*/ 0,
+            {"--conf-target-cluster-by-name=foo"},
+            "Error: Could not find Cluster with selected name: 'foo'"},
+        // [@TS_R5_1/12]
+        BootstrapParametersErrorTestParams{
+            /*bootstrap_cluster_id*/ 0,
+            /*bootstrap_node_id*/ 1,
+            {"--conf-target-cluster-by-name=primary"},
+            "Error: Could not find Cluster with selected name: 'primary'"},
+        // [@TS_R5_1/13]
+        BootstrapParametersErrorTestParams{
+            /*bootstrap_cluster_id*/ 0,
+            /*bootstrap_node_id*/ 1,
+            {"--conf-target-cluster-by-name=current"},
+            "Error: Could not find Cluster with selected name: 'current'"},
+        // [@TS_R5_1/14]
+        BootstrapParametersErrorTestParams{
+            /*bootstrap_cluster_id*/ 2,
+            /*bootstrap_node_id*/ 1,
+            {"--conf-target-cluster-by-name=''"},
+            "Error: Could not find Cluster with selected name: ''"},
+        // [@TS_R5_1/15]
+        BootstrapParametersErrorTestParams{
+            /*bootstrap_cluster_id*/ 2,
+            /*bootstrap_node_id*/ 1,
+            {"--conf-target-cluster-by-name=\" \""},
+            "Error: Could not find Cluster with selected name: '\" \"'"},
+        // [@TS_R5_1/16]
+        BootstrapParametersErrorTestParams{
+            /*bootstrap_cluster_id*/ 2,
+            /*bootstrap_node_id*/ 1,
+            {"--conf-target-cluster-by-name=0"},
+            "Error: Could not find Cluster with selected name: '0'"},
+        // [@TS_R5_1/1]
+        BootstrapParametersErrorTestParams{
+            /*bootstrap_cluster_id*/ 0,
+            /*bootstrap_node_id*/ 0,
+            {"--conf-target-cluster-by-name=00000000-0000-0000-0000-"
+             "0000000000c1"},
+            "Error: Could not find Cluster with selected name: "
+            "'00000000-0000-0000-0000-0000000000c1'"},
+        // [@TS_R5_1/8]
+        BootstrapParametersErrorTestParams{
+            /*bootstrap_cluster_id*/ 2,
+            /*bootstrap_node_id*/ 1,
+            {"--conf-target-cluster-by-name=00000000-0000-0000-0000-"
+             "0000000000c3"},
+            "Error: Could not find Cluster with selected name: "
+            "'00000000-0000-0000-0000-0000000000c3'"},
+        // [@TS_R5_1/19]
+        BootstrapParametersErrorTestParams{
+            /*bootstrap_cluster_id*/ 0,
+            /*bootstrap_node_id*/ 0,
+            {"--conf-target-cluster-by-name=\"foo\""},
+            "Error: Could not find Cluster with selected name: '\"foo\"'"}));
+
+/**
+ * @test
+ *       verify that Router fails whene there is no Primary Cluster while doing
+ * the bootstrap
+ * [@TS_R7_1]
+ */
+TEST_F(RouterClusterSetBootstrapTest, ClusterSetBootstrapNoPrimaryError) {
+  const unsigned non_existing_cluster_id{5};
+
+  create_clusterset(view_id, 0, /*primary_cluster_id*/ non_existing_cluster_id,
+                    "bootstrap_clusterset.js", "");
+
+  std::vector<std::string> bootsrtap_params{
+      "--bootstrap=127.0.0.1:" +
+          std::to_string(clusterset_data_.clusters[0].nodes[0].classic_port),
+      "--connect-timeout=1",
+      "-d",
+      bootstrap_directory.name(),
+      "--conf-target-cluster",
+      "primary",
+  };
+
+  auto &router = launch_router_for_bootstrap(bootsrtap_params, EXIT_FAILURE);
+  // add login hook
+  router.register_response("Please enter MySQL password for root: ",
+                           kRootPassword + "\n"s);
+
+  // verify that appropriate message was logged
+  EXPECT_NO_THROW(router.wait_for_exit());
+  EXPECT_THAT(router.get_full_output(),
+              ::testing::HasSubstr(
+                  "Error: Could not reach Primary Cluster for the ClusterSet"));
+
+  check_exit_code(router, EXIT_FAILURE);
+}
+
+class ClusterSetBootstrapParamsNoBootstrapErrorTest
+    : public RouterClusterSetBootstrapTest,
+      public ::testing::WithParamInterface<BootstrapParametersErrorTestParams> {
+};
+
+/**
+ * @test
+ *       verify that --conf-target-cluster and --conf-target-cluster-by-name
+ * params are only valid for bootstrap
+ */
+TEST_P(ClusterSetBootstrapParamsNoBootstrapErrorTest,
+       ClusterSetBootstrapParamsNoBootstrapError) {
+  // const uint16_t server_port = port_pool_.get_next_available();
+  std::vector<std::string> router_params{"--connect-timeout=1"};
+
+  router_params.insert(router_params.end(), GetParam().bootstrap_params.begin(),
+                       GetParam().bootstrap_params.end());
+
+  auto &router = launch_router_for_bootstrap(router_params, EXIT_FAILURE);
+  //  // add login hook
+  //  router.register_response("Please enter MySQL password for root: ",
+  //                           kRootPassword + "\n"s);
+
+  //  // verify that appropriate message was logged
+
+  EXPECT_NO_THROW(router.wait_for_exit());
+  EXPECT_THAT(router.get_full_output(),
+              ::testing::HasSubstr(GetParam().expected_error));
+
+  check_exit_code(router, EXIT_FAILURE);
+}
+
+INSTANTIATE_TEST_SUITE_P(
+    ClusterSetBootstrapParamsNoBootstrapError,
+    ClusterSetBootstrapParamsNoBootstrapErrorTest,
+    ::testing::Values(
+        // 0) verify that using --conf-target-cluster when
+        // not bootstrapping leads to expected error
+        // [@FR3.5]
+        // [@TS_R8_1/1]
+        BootstrapParametersErrorTestParams{
+            /*bootstrap_cluster_id*/ 0,
+            /*bootstrap_node_id*/ 0,
+            {"--conf-target-cluster=primary"},
+            "Error: Option --conf-target-cluster can only "
+            "be used together with -B/--bootstrap"},
+        // 1) verify that using --conf-target-cluster-by-name when not
+        // bootstrapping leads to expected error
+        // [@FR3.5]
+        // [@TS_R8_1/2]
+        BootstrapParametersErrorTestParams{
+            /*bootstrap_cluster_id*/ 0,
+            /*bootstrap_node_id*/ 0,
+            {"--conf-target-cluster-by-name=cluster-name-1"},
+            "Error: Option --conf-target-cluster-by-name can only "
+            "be used together with -B/--bootstrap"},
+        // [@TS_R8_1/3]
+        BootstrapParametersErrorTestParams{
+            /*bootstrap_cluster_id*/ 0,
+            /*bootstrap_node_id*/ 0,
+            {"--conf-target-cluster=primary",
+             "--conf-target-cluster-by-name=cluster-name-1"},
+            "Error: Parameters '--conf-target-cluster' and "
+            "'--conf-target-cluster-by-name' are mutually exclusive and can't "
+            "be used together"}));
+
+int main(int argc, char *argv[]) {
+  init_windows_sockets();
+  ProcessManager::set_origin(Path(argv[0]).dirname());
+  ::testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}
diff -Nru mysql-8.0-8.0.26/router/tests/component/test_bootstrap_tls_endpoint.cc mysql-8.0-8.0.27/router/tests/component/test_bootstrap_tls_endpoint.cc
--- mysql-8.0-8.0.26/router/tests/component/test_bootstrap_tls_endpoint.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/test_bootstrap_tls_endpoint.cc	2021-09-28 11:46:34.000000000 +0000
@@ -351,7 +351,7 @@
                  get_data_dir().join("bootstrap_gr.js").str()},
       },
       mysqlrouter::ClusterType::GR_V2, {}, EXIT_SUCCESS,
-      {"# MySQL Router configured"}, 1000ms, {2, 0, 3}, cmdline_args));
+      {"# MySQL Router configured"}, 5s, {2, 0, 3}, cmdline_args));
 
   ASSERT_NE(config_file.size(), 0);
 
@@ -1165,8 +1165,7 @@
                  get_data_dir().join("bootstrap_gr.js").str()},
       },
       mysqlrouter::ClusterType::GR_V2, {}, EXIT_FAILURE,
-      GetParam().expected_output_lines, 1000ms, {2, 0, 3},
-      GetParam().cmdline_args);
+      GetParam().expected_output_lines, 1s, {2, 0, 3}, GetParam().cmdline_args);
 }
 
 const BootstrapTlsEndpointFailMockParams
diff -Nru mysql-8.0-8.0.26/router/tests/component/test_clusterset.cc mysql-8.0-8.0.27/router/tests/component/test_clusterset.cc
--- mysql-8.0-8.0.26/router/tests/component/test_clusterset.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/test_clusterset.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,1962 @@
+/*
+Copyright (c) 2021, Oracle 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,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include <chrono>
+#include <fstream>
+#include <stdexcept>
+#include <thread>
+
+#ifdef RAPIDJSON_NO_SIZETYPEDEFINE
+// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
+// globally and require to include my_rapidjson_size_t.h
+#include "my_rapidjson_size_t.h"
+#endif
+
+#include <gmock/gmock.h>
+#include <rapidjson/document.h>
+#include <rapidjson/error/en.h>
+#include <rapidjson/filereadstream.h>
+#include <rapidjson/prettywriter.h>
+#include <rapidjson/schema.h>
+#include <rapidjson/stringbuffer.h>
+
+#include "keyring/keyring_manager.h"
+#include "mock_server_rest_client.h"
+#include "mock_server_testutils.h"
+#include "mysql_session.h"
+#include "mysqlrouter/cluster_metadata.h"
+#include "mysqlrouter/rest_client.h"
+#include "mysqlrouter/utils.h"
+#include "router_component_clusterset.h"
+#include "router_component_test.h"
+#include "router_component_testutils.h"
+#include "tcp_port_pool.h"
+
+using mysqlrouter::ClusterType;
+using mysqlrouter::MySQLSession;
+using ::testing::PrintToString;
+using namespace std::chrono_literals;
+
+Path g_origin_path;
+
+class ClusterSetTest : public RouterComponentClusterSetTest {
+ protected:
+  void SetUp() override { RouterComponentTest::SetUp(); }
+
+  std::string get_metadata_cache_section(
+      const std::chrono::milliseconds ttl = kTTL,
+      const std::string &cluster_type_str = "gr") {
+    auto ttl_str = std::to_string(std::chrono::duration<double>(ttl).count());
+
+    return "[metadata_cache:test]\n"
+           "cluster_type=" +
+           cluster_type_str +
+           "\n"
+           "router_id=1\n" +
+           "user=mysql_router1_user\n"
+           "metadata_cluster=test\n"
+           "connect_timeout=1\n"
+           "ttl=" +
+           ttl_str + "\n\n";
+  }
+
+  std::string get_metadata_cache_routing_section(uint16_t router_port,
+                                                 const std::string &role,
+                                                 const std::string &strategy) {
+    std::string result =
+        "[routing:test_default" + std::to_string(router_port) +
+        "]\n"
+        "bind_port=" +
+        std::to_string(router_port) + "\n" +
+        "destinations=metadata-cache://test/default?role=" + role +
+        /*disconnect_rules +*/ "\n" + "protocol=classic\n";
+
+    if (!strategy.empty())
+      result += std::string("routing_strategy=" + strategy + "\n");
+
+    return result;
+  }
+
+  auto &launch_router(int expected_errorcode = EXIT_SUCCESS,
+                      std::chrono::milliseconds wait_for_notify_ready = 10s) {
+    SCOPED_TRACE("// Prepare the dynamic state file for the Router");
+    const auto clusterset_all_nodes_ports =
+        clusterset_data_.get_all_nodes_classic_ports();
+    router_state_file =
+        create_state_file(temp_test_dir.name(),
+                          create_state_file_content("", clusterset_data_.uuid,
+                                                    clusterset_all_nodes_ports,
+                                                    /*view_id*/ 1));
+
+    SCOPED_TRACE("// Prepare the config file for the Router");
+    const std::string metadata_cache_section = get_metadata_cache_section(kTTL);
+    router_port_rw = port_pool_.get_next_available();
+    router_port_ro = port_pool_.get_next_available();
+    const std::string routing_section_rw = get_metadata_cache_routing_section(
+        router_port_rw, "PRIMARY", "first-available");
+    const std::string routing_section_ro = get_metadata_cache_routing_section(
+        router_port_ro, "SECONDARY", "round-robin");
+    const std::string masterkey_file =
+        Path(temp_test_dir.name()).join("master.key").str();
+    const std::string keyring_file =
+        Path(temp_test_dir.name()).join("keyring").str();
+    mysql_harness::init_keyring(keyring_file, masterkey_file, true);
+    mysql_harness::Keyring *keyring = mysql_harness::get_keyring();
+    keyring->store("mysql_router1_user", "password", "root");
+    mysql_harness::flush_keyring();
+    mysql_harness::reset_keyring();
+
+    // launch the router with metadata-cache configuration
+    auto default_section = get_DEFAULT_defaults();
+    default_section["keyring_path"] = keyring_file;
+    default_section["master_key_path"] = masterkey_file;
+    default_section["dynamic_state"] = router_state_file;
+    router_conf_file = create_config_file(
+        temp_test_dir.name(),
+        metadata_cache_section + routing_section_rw + routing_section_ro,
+        &default_section);
+    auto &router = ProcessManager::launch_router(
+        {"-c", router_conf_file}, expected_errorcode, /*catch_stderr=*/true,
+        /*with_sudo=*/false, wait_for_notify_ready);
+    return router;
+  }
+
+  auto &relaunch_router(const std::string &conf_file,
+                        int expected_errorcode = EXIT_SUCCESS,
+                        std::chrono::milliseconds wait_for_notify_ready = 10s) {
+    auto &router = ProcessManager::launch_router(
+        {"-c", conf_file}, expected_errorcode, /*catch_stderr=*/true,
+        /*with_sudo=*/false, wait_for_notify_ready);
+    return router;
+  }
+
+  int get_int_global_value(const uint16_t http_port, const std::string &name) {
+    const auto server_globals =
+        MockServerRestClient(http_port).get_globals_as_json_string();
+
+    return get_int_field_value(server_globals, name);
+  }
+
+  // @brief wait until global read from the mock server is greater or equal
+  // epxected threashold
+  // @retval true selected global is greated or equal expectred threashold
+  // @retval false timed out waiting for selectged global to become greater or
+  // equal expected threashold
+  bool wait_global_ge(const uint16_t http_port, const std::string &name,
+                      int threashold, std::chrono::milliseconds timeout = 15s) {
+    const auto kStep = 100ms;
+    do {
+      const auto value = get_int_global_value(http_port, name);
+      if (value >= threashold) return true;
+      std::this_thread::sleep_for(kStep);
+      timeout -= kStep;
+    } while (timeout >= 0ms);
+
+    return false;
+  }
+
+  void verify_only_primary_gets_updates(const unsigned primary_cluster_id,
+                                        const unsigned primary_node_id = 0) {
+    // <cluster_id, node_id>
+    using NodeId = std::pair<unsigned, unsigned>;
+    std::map<NodeId, size_t> count;
+
+    // in the first run pick up how many times the last_check_in updte was
+    // performed on each node so far
+    for (const auto &cluster : clusterset_data_.clusters) {
+      unsigned node_id = 0;
+      for (const auto &node : cluster.nodes) {
+        count[NodeId(cluster.id, node_id)] =
+            get_int_global_value(node.http_port, "update_last_check_in_count");
+        ++node_id;
+      }
+    }
+
+    // in the next step wait for the counter to be incremented on the primary
+    // node
+    const auto http_port = clusterset_data_.clusters[primary_cluster_id]
+                               .nodes[primary_node_id]
+                               .http_port;
+    EXPECT_TRUE(
+        wait_global_ge(http_port, "update_last_check_in_count",
+                       count[NodeId(primary_cluster_id, primary_node_id)] + 1));
+
+    // the counter for all other nodes should not change
+    for (const auto &cluster : clusterset_data_.clusters) {
+      unsigned node_id = 0;
+      for (const auto &node : cluster.nodes) {
+        // only primary node of the primary cluster is expected do the
+        // metadata version update and last_check_in updates
+        if (cluster.id != primary_cluster_id || node_id != primary_node_id) {
+          EXPECT_EQ(get_int_global_value(node.http_port,
+                                         "update_last_check_in_count"),
+                    count[NodeId(cluster.id, node_id)]);
+        }
+        ++node_id;
+      }
+    }
+  }
+
+  int get_update_attributes_count(const std::string &json_string) {
+    return get_int_field_value(json_string, "update_attributes_count");
+  }
+
+  int get_update_last_check_in_count(const std::string &json_string) {
+    return get_int_field_value(json_string, "update_last_check_in_count");
+  }
+
+  std::string router_conf_file;
+
+  TempDirectory temp_test_dir;
+  uint64_t view_id = 1;
+
+  std::string router_state_file;
+  uint16_t router_port_rw;
+  uint16_t router_port_ro;
+
+  static const std::chrono::milliseconds kTTL;
+  static const unsigned kRWNodeId = 0;
+  static const unsigned kRONodeId = 1;
+
+  const unsigned kPrimaryClusterId{0};
+  const unsigned kFirstReplicaClusterId{1};
+  const unsigned kSecondReplicaClusterId{2};
+};
+
+const std::chrono::milliseconds ClusterSetTest::kTTL = 50ms;
+
+//////////////////////////////////////////////////////////////////////////
+
+struct TargetClusterTestParams {
+  // target_cluster= for the config file
+  std::string target_cluster;
+  // id of the target Cluster within ClusterSet
+  unsigned target_cluster_id;
+
+  // which cluster we expect to handle the connections (same for RW and RO)
+  unsigned expected_connection_cluster_id{99};
+
+  std::string expected_error{""};
+};
+
+class ClusterSetTargetClusterTest
+    : public ClusterSetTest,
+      public ::testing::WithParamInterface<TargetClusterTestParams> {};
+
+/**
+ * @test Checks that the target cluster from the metadata is respected
+ * and the Router is using expected cluster for client RW and RO connections.
+ * [@FR3.6]
+ */
+TEST_P(ClusterSetTargetClusterTest, ClusterSetTargetCluster) {
+  const auto target_cluster = GetParam().target_cluster;
+  const auto target_cluster_id = GetParam().target_cluster_id;
+  const auto expected_connection_cluster_id =
+      GetParam().expected_connection_cluster_id;
+
+  create_clusterset(
+      view_id, target_cluster_id, /*primary_cluster_id*/ 0,
+      "metadata_clusterset.js",
+      /*router_options*/ R"({"target_cluster" : ")" + target_cluster + "\" }");
+
+  SCOPED_TRACE("// Launch the Router");
+  /*auto &router =*/launch_router();
+
+  SCOPED_TRACE(
+      "// Make the connections to both RW and RO ports and check if they are "
+      "directed to expected Cluster from the ClusterSet");
+
+  if (target_cluster_id == 0 /*primary_cluster_id*/) {
+    make_new_connection_ok(
+        router_port_rw,
+        clusterset_data_.clusters[expected_connection_cluster_id]
+            .nodes[kRWNodeId]
+            .classic_port);
+  } else {
+    /* replica cluster*/
+    verify_new_connection_fails(router_port_rw);
+  }
+
+  // in case of replica cluster first RO node is primary node of the Cluster
+  const auto first_ro_node = (target_cluster_id == 0) ? kRONodeId : kRWNodeId;
+
+  make_new_connection_ok(
+      router_port_ro, clusterset_data_.clusters[expected_connection_cluster_id]
+                          .nodes[first_ro_node]
+                          .classic_port);
+}
+
+INSTANTIATE_TEST_SUITE_P(
+    ClusterSetTargetCluster, ClusterSetTargetClusterTest,
+    ::testing::Values(
+        // 0) we use "primary" as a target_cluster so the connections should go
+        // the the first Cluster as it's the Primary Cluster
+        TargetClusterTestParams{/*target_cluster*/ "primary",
+                                /*target_cluster_id*/ 0,
+                                /*expected_connection_cluster_id*/ 0},
+        // 1) we use first Cluster's GR UUID as a target_cluster so the
+        // connections should go the the first Cluster
+        TargetClusterTestParams{
+            /*target_cluster*/ "00000000-0000-0000-0000-0000000000g1",
+            /*target_cluster_id*/ 0,
+            /*expected_connection_cluster_id*/ 0},
+        // 2) we use second Cluster's GR UUID as a target_cluster so the
+        // connections should go the the second Cluster
+        TargetClusterTestParams{
+            /*target_cluster*/ "00000000-0000-0000-0000-0000000000g2",
+            /*target_cluster_id*/ 1,
+            /*expected_connection_cluster_id*/ 1}));
+
+struct TargetClusterChangeInMetataTestParams {
+  // info about the target_cluster we start with (in config file)
+  // and the expected connections destinations for that cluster
+  TargetClusterTestParams initial_target_cluster;
+
+  // info about the target_cluster we change to (in the metadata)
+  // and the expected connections destinations for that cluster
+  TargetClusterTestParams changed_target_cluster;
+
+  // wether the initial connections (the ones for first target_cluster before
+  // the change) are expected to be dropped or expected to stay
+  bool initial_connections_should_drop;
+};
+
+/**
+ * @test Checks that if the target cluster does not change in the metadata,
+ * Router does not keep reporting it has changed (bug#33261274)
+ */
+TEST_F(ClusterSetTest, TargetClusterNoChange) {
+  const std::string target_cluster = "primary";
+  const auto target_cluster_id = 0;
+
+  create_clusterset(
+      view_id, target_cluster_id, /*primary_cluster_id*/ 0,
+      "metadata_clusterset.js",
+      /*router_options*/ R"({"target_cluster" : ")" + target_cluster + "\" }");
+
+  SCOPED_TRACE("// Launch the Router");
+  auto &router = launch_router();
+
+  // keep the Router running for several md refresh rounds
+  EXPECT_TRUE(wait_for_transaction_count_increase(
+      clusterset_data_.clusters[0].nodes[0].http_port, 3));
+
+  // check the new target_cluster was repoted only once
+  const std::string needle = "New target cluster assigned in the metadata";
+  const std::string log_content = router.get_full_logfile();
+
+  // 1 is expected, that comes from the inital reading of the metadata
+  EXPECT_EQ(1, count_str_occurences(log_content, needle)) << log_content;
+}
+
+class ClusterChangeTargetClusterInTheMetadataTest
+    : public ClusterSetTest,
+      public ::testing::WithParamInterface<
+          TargetClusterChangeInMetataTestParams> {};
+
+/**
+ * @test Checks that the target cluster changes in the metadata are correctly
+ * followed by the Router.
+ * [@FR3.7]
+ * [@FR3.7.1]
+ */
+TEST_P(ClusterChangeTargetClusterInTheMetadataTest,
+       ClusterChangeTargetClusterInTheMetadata) {
+  const auto initial_target_cluster =
+      GetParam().initial_target_cluster.target_cluster;
+  const auto initial_target_cluster_id =
+      GetParam().initial_target_cluster.target_cluster_id;
+  const auto expected_initial_connection_cluster_id =
+      GetParam().initial_target_cluster.expected_connection_cluster_id;
+
+  create_clusterset(view_id, initial_target_cluster_id,
+                    /*primary_cluster_id*/ 0, "metadata_clusterset.js",
+                    /*router_options*/ R"({"target_cluster" : ")" +
+                        initial_target_cluster + "\" }");
+  auto &router = launch_router();
+
+  {
+    const auto target_cluster_name =
+        clusterset_data_.clusters[initial_target_cluster_id].name;
+    const std::string cluster_role =
+        initial_target_cluster_id == 0 ? "primary" : "replica";
+    const std::string accepting_rw = initial_target_cluster_id == 0
+                                         ? "accepting RW connections"
+                                         : "not accepting RW connections";
+    const auto log_content = router.get_full_logfile();
+    const std::string pattern =
+        "INFO .* Target cluster '" + target_cluster_name +
+        "' is part of a ClusterSet; role of a cluster within a ClusterSet "
+        "is '" +
+        cluster_role + "'; " + accepting_rw;
+
+    EXPECT_TRUE(pattern_found(log_content, pattern)) << log_content;
+  }
+
+  SCOPED_TRACE(
+      "// Make the connections to both RW and RO ports and check if they are "
+      "directed to expected Cluster from the ClusterSet");
+  std::unique_ptr<MySQLSession> rw_con1;
+  if (expected_initial_connection_cluster_id == 0 /*primary_cluster_id*/) {
+    rw_con1 = make_new_connection_ok(
+        router_port_rw,
+        clusterset_data_.clusters[expected_initial_connection_cluster_id]
+            .nodes[kRWNodeId]
+            .classic_port);
+  } else {
+    /* replica cluster, the RW connection should fail */
+    verify_new_connection_fails(router_port_rw);
+  }
+
+  const auto first_ro_node1 =
+      (expected_initial_connection_cluster_id == 0 /*Primary*/) ? kRONodeId
+                                                                : kRWNodeId;
+  auto ro_con1 = make_new_connection_ok(
+      router_port_ro,
+      clusterset_data_.clusters[expected_initial_connection_cluster_id]
+          .nodes[first_ro_node1]
+          .classic_port);
+
+  SCOPED_TRACE(
+      "// Change the target_cluster in the metadata of the first Cluster and "
+      "bump its view id");
+
+  const auto changed_target_cluster =
+      GetParam().changed_target_cluster.target_cluster;
+  const auto changed_target_cluster_id =
+      GetParam().changed_target_cluster.target_cluster_id;
+
+  set_mock_metadata(view_id, /*this_cluster_id*/ 0, changed_target_cluster_id,
+                    clusterset_data_.clusters[0].nodes[0].http_port,
+                    clusterset_data_,
+                    /*router_options*/ R"({"target_cluster" : ")" +
+                        changed_target_cluster + "\" }");
+
+  EXPECT_TRUE(wait_for_transaction_count_increase(
+      clusterset_data_.clusters[0].nodes[0].http_port, 3));
+
+  SCOPED_TRACE("// Check if the change of a target cluster has been logged");
+  {
+    const auto changed_target_cluster_name =
+        clusterset_data_.clusters[changed_target_cluster_id].name;
+    const std::string cluster_role =
+        changed_target_cluster_id == 0 ? "primary" : "replica";
+    const std::string accepting_rw = changed_target_cluster_id == 0
+                                         ? "accepting RW connections"
+                                         : "not accepting RW connections";
+
+    const auto log_content = router.get_full_logfile();
+    const std::string pattern =
+        "INFO .* New target cluster assigned in the metadata: '" +
+        changed_target_cluster_name + "'";
+    EXPECT_TRUE(pattern_found(log_content, pattern)) << log_content;
+
+    const std::string pattern2 =
+        "INFO .* Target cluster '" + changed_target_cluster_name +
+        "' is part of a ClusterSet; role of a cluster within a ClusterSet "
+        "is '" +
+        cluster_role + "'; " + accepting_rw;
+
+    EXPECT_TRUE(pattern_found(log_content, pattern2)) << log_content;
+
+    const std::string pattern3 =
+        "INFO .* New router options read from the metadata "
+        "'\\{\"target_cluster\" : \"" +
+        changed_target_cluster + "\" \\}', was '\\{\"target_cluster\" : \"" +
+        initial_target_cluster + "\" \\}'";
+
+    EXPECT_TRUE(pattern_found(log_content, pattern3)) << "pattern:\n"
+                                                      << pattern << "\n"
+                                                      << log_content;
+  }
+
+  if (GetParam().initial_connections_should_drop) {
+    SCOPED_TRACE(
+        "// Since the target_cluster has changed the existing connection "
+        "should get dropped");
+    if (rw_con1) verify_existing_connection_dropped(rw_con1.get());
+    verify_existing_connection_dropped(ro_con1.get());
+  } else {
+    if (rw_con1) verify_existing_connection_ok(rw_con1.get());
+    verify_existing_connection_ok(ro_con1.get());
+  }
+
+  const auto expected_new_connection_cluster_id =
+      GetParam().changed_target_cluster.expected_connection_cluster_id;
+
+  SCOPED_TRACE(
+      "// The new connections should get routed to the new target Cluster");
+
+  if (expected_new_connection_cluster_id == 0 /*primary_cluster_id*/) {
+    /*auto rw_con2 =*/make_new_connection_ok(
+        router_port_rw,
+        clusterset_data_.clusters[expected_new_connection_cluster_id]
+            .nodes[kRWNodeId]
+            .classic_port);
+  } else {
+    /* replica cluster, the RW connection should fail */
+    verify_new_connection_fails(router_port_rw);
+  }
+
+  const auto first_ro_node =
+      (expected_new_connection_cluster_id == 0 /*Primary*/) ? kRONodeId
+                                                            : kRWNodeId;
+  // +1 because it's round-robin and this is the second RO connection
+  /*auto ro_con2 =*/make_new_connection_ok(
+      router_port_ro,
+      clusterset_data_.clusters[expected_new_connection_cluster_id]
+          .nodes[first_ro_node + 1]
+          .classic_port);
+
+  SCOPED_TRACE(
+      "// Check that only primary nodes from each Cluster were checked for the "
+      "metadata");
+  for (const auto &cluster : clusterset_data_.clusters) {
+    unsigned node_id = 0;
+    for (const auto &node : cluster.nodes) {
+      const auto transactions_count = get_transaction_count(node.http_port);
+      if (node_id == 0) {
+        wait_for_transaction_count(node.http_port, 2);
+      } else {
+        // we expect the secondary node of each Cluster being queried only once,
+        // when the first metadata refresh is run, as at that point we only have
+        // a set of the metadata servers (all cluster nodes) from the state file
+        // and we do not know which of then belongs to which of the Clusters
+        // (we do not know the topology)
+        EXPECT_EQ(transactions_count, 1);
+      }
+      ++node_id;
+    }
+  }
+}
+
+INSTANTIATE_TEST_SUITE_P(
+    ClusterChangeTargetClusterInTheMetadata,
+    ClusterChangeTargetClusterInTheMetadataTest,
+    ::testing::Values(
+        // 0) "primary" (which is "gr-id-1") overwritten in metadata with
+        // "gr-id-2" - existing connections are expected to drop
+        TargetClusterChangeInMetataTestParams{
+            TargetClusterTestParams{/*target_cluster*/ "primary",
+                                    /*target_cluster_id*/ 0,
+                                    /*expected_connection_cluster_id*/ 0},
+            TargetClusterTestParams{
+                /*target_cluster*/ "00000000-0000-0000-0000-0000000000g2",
+                /*target_cluster_id*/ 1,
+                /*expected_connection_cluster_id*/ 1},
+            true},
+        // 1) "gr-id-2" overwritten in metadata with "primary" - existing
+        // connections are expected to drop
+        TargetClusterChangeInMetataTestParams{
+            TargetClusterTestParams{
+                /*target_cluster*/ "00000000-0000-0000-0000-0000000000g2",
+                /*target_cluster_id*/ 1,
+                /*expected_connection_cluster_id*/ 1},
+            TargetClusterTestParams{/*target_cluster*/ "primary",
+                                    /*target_cluster_id*/ 0,
+                                    /*expected_connection_cluster_id*/ 0},
+            true},
+        // 2) "gr-id-1" overwritten in metadata with "primary" - existing
+        // connections are NOT expected to drop as this is the same Cluster
+        TargetClusterChangeInMetataTestParams{
+            TargetClusterTestParams{
+                /*target_cluster*/ "00000000-0000-0000-0000-0000000000g1",
+                /*target_cluster_id*/ 0,
+                /*expected_connection_cluster_id*/ 0},
+            TargetClusterTestParams{/*target_cluster*/ "primary",
+                                    /*target_cluster_id*/ 0,
+                                    /*expected_connection_cluster_id*/ 0},
+            false}));
+
+/**
+ * @test Check that the Router correctly handles clustersetid not matching the
+ * one in the state file.
+ * [@FR13]
+ * [@FR13.1]
+ * [@TS_R14_1]
+ */
+TEST_F(ClusterSetTest, ClusterChangeClustersetIDInTheMetadata) {
+  const int kTargetClusterId = 0;
+  const std::string router_options = R"({"target_cluster" : "primary"})";
+
+  create_clusterset(view_id, kTargetClusterId,
+                    /*primary_cluster_id*/ 0, "metadata_clusterset.js",
+                    router_options);
+  /*auto &router =*/launch_router();
+
+  SCOPED_TRACE(
+      "// Make the connections to both RW and RO ports and check if they are"
+      " directed to expected Cluster from the ClusterSet");
+  auto rw_con1 = make_new_connection_ok(
+      router_port_rw, clusterset_data_.clusters[kTargetClusterId]
+                          .nodes[kRWNodeId]
+                          .classic_port);
+  auto ro_con1 = make_new_connection_ok(
+      router_port_ro, clusterset_data_.clusters[kTargetClusterId]
+                          .nodes[kRONodeId]
+                          .classic_port);
+
+  SCOPED_TRACE("// Change the clusterset_id in the metadata");
+  clusterset_data_.uuid = "changed-clusterset-uuid";
+  for (const auto &cluster : clusterset_data_.clusters) {
+    for (const auto &node : cluster.nodes) {
+      set_mock_metadata(view_id + 1, /*this_cluster_id*/ cluster.id,
+                        kTargetClusterId, node.http_port, clusterset_data_,
+                        router_options);
+    }
+  }
+  EXPECT_TRUE(wait_for_transaction_count_increase(
+      clusterset_data_.clusters[0].nodes[0].http_port, 2));
+
+  SCOPED_TRACE(
+      "// Check that the old connections got dropped and new are not "
+      "possible");
+  verify_existing_connection_dropped(rw_con1.get());
+  verify_existing_connection_dropped(ro_con1.get());
+  verify_new_connection_fails(router_port_rw);
+  verify_new_connection_fails(router_port_ro);
+
+  SCOPED_TRACE(
+      "// Restore the original ClusterSet ID, matching the one stored in the "
+      "state file");
+  clusterset_data_.uuid = "clusterset-uuid";
+  for (const auto &cluster : clusterset_data_.clusters) {
+    for (const auto &node : cluster.nodes) {
+      set_mock_metadata(view_id + 2, /*this_cluster_id*/ cluster.id,
+                        kTargetClusterId, node.http_port, clusterset_data_,
+                        router_options);
+    }
+  }
+  EXPECT_TRUE(wait_for_transaction_count_increase(
+      clusterset_data_.clusters[0].nodes[0].http_port, 2));
+
+  SCOPED_TRACE("// Check that the connections are possible again");
+  auto rw_con2 = make_new_connection_ok(
+      router_port_rw, clusterset_data_.clusters[kTargetClusterId]
+                          .nodes[kRWNodeId]
+                          .classic_port);
+  auto ro_con2 = make_new_connection_ok(
+      router_port_ro, clusterset_data_.clusters[kTargetClusterId]
+                          .nodes[kRONodeId + 1]
+                          .classic_port);
+
+  SCOPED_TRACE(
+      "// Simulate the primary cluster can't be found in the ClusterSet");
+  for (const auto &cluster : clusterset_data_.clusters) {
+    for (const auto &node : cluster.nodes) {
+      set_mock_metadata(view_id + 3, /*this_cluster_id*/ cluster.id,
+                        kTargetClusterId, node.http_port, clusterset_data_,
+                        router_options, "", {2, 1, 0},
+                        /*simulate_cluster_not_found*/ true);
+    }
+  }
+  EXPECT_TRUE(wait_for_transaction_count_increase(
+      clusterset_data_.clusters[1].nodes[0].http_port, 2));
+
+  SCOPED_TRACE(
+      "// Check that the old connections got dropped and new are not "
+      "possible");
+  verify_existing_connection_dropped(rw_con2.get());
+  verify_existing_connection_dropped(ro_con2.get());
+  verify_new_connection_fails(router_port_rw);
+  verify_new_connection_fails(router_port_ro);
+}
+
+class UnknownClusterSetTargetClusterTest
+    : public ClusterSetTest,
+      public ::testing::WithParamInterface<TargetClusterTestParams> {};
+
+/**
+ * @test Checks that if the `target_cluster` for the Router can't be find in the
+ * metadata the error should be logged and the Router should not accept any
+ * connections.
+ */
+TEST_P(UnknownClusterSetTargetClusterTest, UnknownClusterSetTargetCluster) {
+  const auto target_cluster = GetParam().target_cluster;
+  const auto target_cluster_id = GetParam().target_cluster_id;
+
+  create_clusterset(
+      view_id, target_cluster_id, /*primary_cluster_id*/ 0,
+      "metadata_clusterset.js",
+      /*router_options*/ R"({"target_cluster" : ")" + target_cluster + "\" }");
+
+  SCOPED_TRACE("// Prepare the dynamic state file for the Router");
+  auto &router = launch_router(EXIT_SUCCESS, -1s);
+
+  EXPECT_TRUE(wait_log_contains(router, GetParam().expected_error, 2s))
+      << router.get_full_logfile();
+
+  SCOPED_TRACE(
+      "// Make the connections to both RW and RO ports, both should fail");
+
+  verify_new_connection_fails(router_port_rw);
+  verify_new_connection_fails(router_port_ro);
+}
+
+INSTANTIATE_TEST_SUITE_P(
+    UnknownClusterSetTargetCluster, UnknownClusterSetTargetClusterTest,
+    ::testing::Values(
+        // [@TS_R9_1/1]
+        TargetClusterTestParams{
+            "000000000000000000000000000000g1", 0, 0,
+            "ERROR.* Could not find target_cluster "
+            "'000000000000000000000000000000g1' in the metadata"},
+        // [@TS_R9_1/2]
+        TargetClusterTestParams{
+            "00000000-0000-0000-0000-0000000000g11", 0, 0,
+            "ERROR.* Could not find target_cluster "
+            "'00000000-0000-0000-0000-0000000000g11' in the metadata"},
+        // [@TS_R9_1/3]
+        TargetClusterTestParams{
+            "00000000-0000-0000-0000-0000000000g", 0, 0,
+            "ERROR.* Could not find target_cluster "
+            "'00000000-0000-0000-0000-0000000000g' in the metadata"},
+        // [@TS_R9_1/4]
+        TargetClusterTestParams{
+            "00000000-0000-0000-Z000-0000000000g1", 0, 0,
+            "ERROR.* Could not find target_cluster "
+            "'00000000-0000-0000-Z000-0000000000g1' in the metadata"},
+        // [@TS_R9_1/5]
+        TargetClusterTestParams{
+            "00000000-0000-0000-0000-0000000000G1", 0, 0,
+            "ERROR.* Could not find target_cluster "
+            "'00000000-0000-0000-0000-0000000000G1' in the metadata"},
+        // [@TS_R9_1/7]
+        TargetClusterTestParams{"", 0, 0,
+                                "Target cluster for router_id=1 not set, using "
+                                "'primary' as a target cluster"},
+        // [@TS_R9_1/8]
+        TargetClusterTestParams{"0", 0, 0,
+                                "ERROR.* Could not find target_cluster "
+                                "'0' in the metadata"},
+        // [@TS_R9_1/9]
+        TargetClusterTestParams{
+            "'00000000-0000-0000-0000-0000000000g1'", 0, 0,
+            "ERROR.* Could not find target_cluster "
+            "''00000000-0000-0000-0000-0000000000g1'' in the metadata"}));
+
+/**
+ * @test Check that the Router correctly follows primary Cluster when it is its
+ * target_cluster.
+ */
+TEST_F(ClusterSetTest, ClusterRolesChangeInTheRuntime) {
+  // first cluster is a primary on start
+  unsigned primary_cluster_id = 0;
+  const std::string router_options = R"({"target_cluster" : "primary"})";
+
+  create_clusterset(view_id, /*target_cluster_id*/ primary_cluster_id,
+                    /*primary_cluster_id*/ primary_cluster_id,
+                    "metadata_clusterset.js", router_options);
+  /*auto &router =*/launch_router();
+
+  SCOPED_TRACE(
+      "// Make the connections to both RW and RO ports and check if they are"
+      " directed to expected Cluster from the ClusterSet");
+  auto rw_con1 = make_new_connection_ok(
+      router_port_rw, clusterset_data_.clusters[primary_cluster_id]
+                          .nodes[kRWNodeId]
+                          .classic_port);
+  auto ro_con1 = make_new_connection_ok(
+      router_port_ro, clusterset_data_.clusters[primary_cluster_id]
+                          .nodes[kRONodeId]
+                          .classic_port);
+
+  verify_only_primary_gets_updates(primary_cluster_id);
+
+  ////////////////////////////////////
+  SCOPED_TRACE(
+      "// Change the primary cluster in the metadata, now the first Replica "
+      "Cluster becomes the PRIMARY");
+  ////////////////////////////////////
+
+  view_id++;
+  primary_cluster_id = 1;
+  change_clusterset_primary(clusterset_data_, primary_cluster_id);
+  for (const auto &cluster : clusterset_data_.clusters) {
+    for (const auto &node : cluster.nodes) {
+      const auto http_port = node.http_port;
+      set_mock_metadata(view_id, /*this_cluster_id*/ cluster.id,
+                        /*target_cluster_id*/ primary_cluster_id, http_port,
+                        clusterset_data_, router_options);
+    }
+  }
+
+  EXPECT_TRUE(wait_for_transaction_count_increase(
+      clusterset_data_.clusters[0].nodes[0].http_port, 2));
+
+  SCOPED_TRACE("// Check that the existing connections got dropped");
+  verify_existing_connection_dropped(rw_con1.get());
+  verify_existing_connection_dropped(ro_con1.get());
+
+  SCOPED_TRACE(
+      "// Check that new connections are directed to the new PRIMARY cluster "
+      "nodes");
+  auto rw_con2 = make_new_connection_ok(
+      router_port_rw, clusterset_data_.clusters[primary_cluster_id]
+                          .nodes[kRWNodeId]
+                          .classic_port);
+  // +1%2 is for round-robin
+  auto ro_con2 = make_new_connection_ok(
+      router_port_ro, clusterset_data_.clusters[primary_cluster_id]
+                          .nodes[kRONodeId + 1 % 2]
+                          .classic_port);
+
+  // check the new primary gets updates
+  verify_only_primary_gets_updates(primary_cluster_id);
+
+  ////////////////////////////////////
+  SCOPED_TRACE(
+      "// Change the primary cluster in the metadata, now the second Replica "
+      "Cluster becomes the PRIMARY");
+  ////////////////////////////////////
+  view_id++;
+  primary_cluster_id = 2;
+  change_clusterset_primary(clusterset_data_, primary_cluster_id);
+  for (const auto &cluster : clusterset_data_.clusters) {
+    for (const auto &node : cluster.nodes) {
+      const auto http_port = node.http_port;
+      set_mock_metadata(view_id, /*this_cluster_id*/ cluster.id,
+                        /*target_cluster_id*/ primary_cluster_id, http_port,
+                        clusterset_data_, router_options);
+    }
+  }
+
+  EXPECT_TRUE(wait_for_transaction_count_increase(
+      clusterset_data_.clusters[0].nodes[0].http_port, 2));
+
+  SCOPED_TRACE("// Check that the existing connections got dropped");
+  verify_existing_connection_dropped(rw_con2.get());
+  verify_existing_connection_dropped(ro_con2.get());
+
+  SCOPED_TRACE(
+      "// Check that new connections are directed to the new PRIMARY cluster "
+      "nodes");
+  auto rw_con3 = make_new_connection_ok(
+      router_port_rw, clusterset_data_.clusters[primary_cluster_id]
+                          .nodes[kRWNodeId]
+                          .classic_port);
+  // +2 %2 is for round-robin
+  auto ro_con3 = make_new_connection_ok(
+      router_port_ro, clusterset_data_.clusters[primary_cluster_id]
+                          .nodes[kRONodeId + 2 % 2]
+                          .classic_port);
+
+  ////////////////////////////////////
+  SCOPED_TRACE(
+      "// Change the primary cluster in the metadata, let the original PRIMARY "
+      "be the primary again");
+  ////////////////////////////////////
+  view_id++;
+  primary_cluster_id = 0;
+  change_clusterset_primary(clusterset_data_, primary_cluster_id);
+  for (const auto &cluster : clusterset_data_.clusters) {
+    for (const auto &node : cluster.nodes) {
+      const auto http_port = node.http_port;
+      set_mock_metadata(view_id, /*this_cluster_id*/ cluster.id,
+                        /*target_cluster_id*/ primary_cluster_id, http_port,
+                        clusterset_data_, router_options);
+    }
+  }
+
+  EXPECT_TRUE(wait_for_transaction_count_increase(
+      clusterset_data_.clusters[0].nodes[0].http_port, 2));
+
+  SCOPED_TRACE("// Check that the existing connections got dropped");
+  verify_existing_connection_dropped(rw_con3.get());
+  verify_existing_connection_dropped(ro_con3.get());
+
+  SCOPED_TRACE(
+      "// Check that new connections are directed to the new PRIMARY cluster "
+      "nodes");
+  auto rw_con4 = make_new_connection_ok(
+      router_port_rw, clusterset_data_.clusters[primary_cluster_id]
+                          .nodes[kRWNodeId]
+                          .classic_port);
+  // +3%2 is for round-robin
+  auto ro_con4 = make_new_connection_ok(
+      router_port_ro, clusterset_data_.clusters[primary_cluster_id]
+                          .nodes[kRONodeId + 3 % 2]
+                          .classic_port);
+}
+
+/**
+ * @test Check that the Router sticks to the target_cluster given by UUID when
+ * its role changes starting from PRIMARY.
+ * [@TS_R6_2]
+ */
+TEST_F(ClusterSetTest, TargetClusterStickToPrimaryUUID) {
+  // first cluster is a primary on start
+  unsigned primary_cluster_id = 0;
+  const unsigned target_cluster_id = 0;
+  const std::string router_options =
+      R"({"target_cluster" : "00000000-0000-0000-0000-0000000000g1"})";
+
+  create_clusterset(view_id, /*target_cluster_id*/ target_cluster_id,
+                    /*primary_cluster_id*/ primary_cluster_id,
+                    "metadata_clusterset.js", router_options);
+  /*auto &router =*/launch_router();
+
+  SCOPED_TRACE(
+      "// Make the connections to both RW and RO ports and check if they are"
+      " directed to expected Cluster from the ClusterSet");
+  auto rw_con1 = make_new_connection_ok(
+      router_port_rw, clusterset_data_.clusters[target_cluster_id]
+                          .nodes[kRWNodeId]
+                          .classic_port);
+  auto ro_con1 = make_new_connection_ok(
+      router_port_ro, clusterset_data_.clusters[target_cluster_id]
+                          .nodes[kRONodeId]
+                          .classic_port);
+
+  // check that the primary cluster is getting the periodic metadata updates
+  verify_only_primary_gets_updates(primary_cluster_id);
+
+  ////////////////////////////////////
+  SCOPED_TRACE(
+      "// Change the primary cluster in the metadata, now the first Replica "
+      "Cluster becomes the PRIMARY");
+  ////////////////////////////////////
+
+  view_id++;
+  primary_cluster_id = 1;
+  change_clusterset_primary(clusterset_data_, primary_cluster_id);
+  for (const auto &cluster : clusterset_data_.clusters) {
+    for (const auto &node : cluster.nodes) {
+      const auto http_port = node.http_port;
+      set_mock_metadata(view_id, /*this_cluster_id*/ cluster.id,
+                        /*target_cluster_id*/ target_cluster_id, http_port,
+                        clusterset_data_, router_options);
+    }
+  }
+
+  EXPECT_TRUE(wait_for_transaction_count_increase(
+      clusterset_data_.clusters[0].nodes[0].http_port, 2));
+
+  SCOPED_TRACE(
+      "// RW connection should get dropped as our target_cluster is no longer "
+      "PRIMARY");
+  verify_existing_connection_dropped(rw_con1.get());
+  SCOPED_TRACE("// RO connection should stay valid");
+  verify_existing_connection_ok(ro_con1.get());
+
+  SCOPED_TRACE(
+      "// Check that new RO connection is directed to the same Cluster and no "
+      "new RW connection is possible");
+  // +1%3 because we round-robin and we now have 3 RO nodes
+  auto ro_con2 = make_new_connection_ok(
+      router_port_ro, clusterset_data_.clusters[target_cluster_id]
+                          .nodes[(kRWNodeId + 1) % 3]
+                          .classic_port);
+  verify_new_connection_fails(router_port_rw);
+
+  // check that the primary cluster is getting the periodic metadata updates
+  verify_only_primary_gets_updates(primary_cluster_id);
+
+  ////////////////////////////////////
+  SCOPED_TRACE(
+      "// Change the primary cluster in the metadata, now the second Replica "
+      "Cluster becomes the PRIMARY");
+  ////////////////////////////////////
+  view_id++;
+  primary_cluster_id = 2;
+  change_clusterset_primary(clusterset_data_, primary_cluster_id);
+  for (const auto &cluster : clusterset_data_.clusters) {
+    for (const auto &node : cluster.nodes) {
+      const auto http_port = node.http_port;
+      set_mock_metadata(view_id, /*this_cluster_id*/ cluster.id,
+                        /*target_cluster_id*/ target_cluster_id, http_port,
+                        clusterset_data_, router_options);
+    }
+  }
+
+  EXPECT_TRUE(wait_for_transaction_count_increase(
+      clusterset_data_.clusters[0].nodes[0].http_port, 2));
+
+  SCOPED_TRACE("// Both existing RO connections should be fine");
+  verify_existing_connection_ok(ro_con1.get());
+  verify_existing_connection_ok(ro_con2.get());
+
+  SCOPED_TRACE(
+      "// Check that new RO connection is directed to the same Cluster and no "
+      "new RW connection is possible");
+  verify_new_connection_fails(router_port_rw);
+  // +2%3 because we round-robin and we now have 3 RO nodes
+  auto ro_con3 = make_new_connection_ok(
+      router_port_ro, clusterset_data_.clusters[target_cluster_id]
+                          .nodes[(kRWNodeId + 2) % 3]
+                          .classic_port);
+
+  ////////////////////////////////////
+  SCOPED_TRACE(
+      "// Change the primary cluster in the metadata, let the original PRIMARY "
+      "be the primary again");
+  ////////////////////////////////////
+  view_id++;
+  primary_cluster_id = 0;
+  change_clusterset_primary(clusterset_data_, primary_cluster_id);
+  for (const auto &cluster : clusterset_data_.clusters) {
+    for (const auto &node : cluster.nodes) {
+      const auto http_port = node.http_port;
+      set_mock_metadata(view_id, /*this_cluster_id*/ cluster.id,
+                        /*target_cluster_id*/ target_cluster_id, http_port,
+                        clusterset_data_, router_options);
+    }
+  }
+
+  EXPECT_TRUE(wait_for_transaction_count_increase(
+      clusterset_data_.clusters[0].nodes[0].http_port, 2));
+
+  SCOPED_TRACE("// Check that all the existing RO connections are OK");
+  verify_existing_connection_ok(ro_con1.get());
+  verify_existing_connection_ok(ro_con2.get());
+  verify_existing_connection_ok(ro_con3.get());
+
+  SCOPED_TRACE("// Check that both RW and RO connections are possible again");
+  auto rw_con4 = make_new_connection_ok(
+      router_port_rw, clusterset_data_.clusters[target_cluster_id]
+                          .nodes[kRWNodeId]
+                          .classic_port);
+  auto ro_con4 = make_new_connection_ok(
+      router_port_ro, clusterset_data_.clusters[target_cluster_id]
+                          .nodes[kRONodeId]
+                          .classic_port);
+}
+
+/**
+ * @test Check that the Router sticks to the target_cluster given by UUID when
+ * its role changes starting from REPLICA.
+ */
+TEST_F(ClusterSetTest, TargetClusterStickToReaplicaUUID) {
+  // first cluster is a primary on start
+  unsigned primary_cluster_id = 0;
+  // our target_cluster is first Replica
+  const unsigned target_cluster_id = 1;
+  const std::string router_options =
+      R"({"target_cluster" : "00000000-0000-0000-0000-0000000000g2"})";
+
+  create_clusterset(view_id, /*target_cluster_id*/ target_cluster_id,
+                    /*primary_cluster_id*/ primary_cluster_id,
+                    "metadata_clusterset.js", router_options);
+
+  /*auto &router =*/launch_router();
+
+  SCOPED_TRACE(
+      "// Make the connections to both RW and RO ports, RW should not be "
+      "possible as our target_cluster is REPLICA cluster, RO should be routed "
+      "to our target_cluster");
+  verify_new_connection_fails(router_port_rw);
+  auto ro_con1 = make_new_connection_ok(
+      router_port_ro, clusterset_data_.clusters[target_cluster_id]
+                          .nodes[kRWNodeId]
+                          .classic_port);
+
+  ////////////////////////////////////
+  SCOPED_TRACE(
+      "// Change the primary cluster in the metadata, now the SECOND REPLICA "
+      "Cluster becomes the PRIMARY");
+  ////////////////////////////////////
+
+  view_id++;
+  primary_cluster_id = 2;
+  change_clusterset_primary(clusterset_data_, primary_cluster_id);
+  for (const auto &cluster : clusterset_data_.clusters) {
+    for (const auto &node : cluster.nodes) {
+      const auto http_port = node.http_port;
+      set_mock_metadata(view_id, /*this_cluster_id*/ cluster.id,
+                        /*target_cluster_id*/ target_cluster_id, http_port,
+                        clusterset_data_, router_options);
+    }
+  }
+
+  EXPECT_TRUE(wait_for_transaction_count_increase(
+      clusterset_data_.clusters[0].nodes[0].http_port, 2));
+
+  SCOPED_TRACE("// Our existing RO connection should still be fine");
+  verify_existing_connection_ok(ro_con1.get());
+
+  SCOPED_TRACE(
+      "// Check that new RO connection is directed to the same Cluster and no "
+      "new RW connection is possible");
+  // +1%3 because we round-robin and we now have 3 RO nodes
+  auto ro_con2 = make_new_connection_ok(
+      router_port_ro, clusterset_data_.clusters[target_cluster_id]
+                          .nodes[(kRWNodeId + 1) % 3]
+                          .classic_port);
+  verify_new_connection_fails(router_port_rw);
+
+  ////////////////////////////////////
+  SCOPED_TRACE(
+      "// Change the primary cluster in the metadata, now the FIRST REPLICA "
+      "which happens to be our target cluster becomes PRIMARY");
+  ////////////////////////////////////
+  view_id++;
+  primary_cluster_id = 1;
+  change_clusterset_primary(clusterset_data_, primary_cluster_id);
+  for (const auto &cluster : clusterset_data_.clusters) {
+    for (const auto &node : cluster.nodes) {
+      const auto http_port = node.http_port;
+      set_mock_metadata(view_id, /*this_cluster_id*/ cluster.id,
+                        /*target_cluster_id*/ target_cluster_id, http_port,
+                        clusterset_data_, router_options);
+    }
+  }
+
+  EXPECT_TRUE(wait_for_transaction_count_increase(
+      clusterset_data_.clusters[0].nodes[0].http_port, 2));
+
+  SCOPED_TRACE("// Both existing RO connections should be fine");
+  verify_existing_connection_ok(ro_con1.get());
+  verify_existing_connection_ok(ro_con2.get());
+
+  SCOPED_TRACE(
+      "// Check that new RO connection is directed to the same Cluster and now "
+      "RW connection is possible");
+  auto rw_con = make_new_connection_ok(
+      router_port_rw, clusterset_data_.clusters[target_cluster_id]
+                          .nodes[kRWNodeId]
+                          .classic_port);
+  // +2%2 because we round-robin and we now have 2 RO nodes
+  auto ro_con3 = make_new_connection_ok(
+      router_port_ro, clusterset_data_.clusters[target_cluster_id]
+                          .nodes[kRONodeId + 2 % 2]
+                          .classic_port);
+
+  ////////////////////////////////////
+  SCOPED_TRACE(
+      "// Change the primary cluster in the metadata, let the original PRIMARY "
+      "be the primary again");
+  ////////////////////////////////////
+  view_id++;
+  primary_cluster_id = 0;
+  change_clusterset_primary(clusterset_data_, primary_cluster_id);
+  for (const auto &cluster : clusterset_data_.clusters) {
+    for (const auto &node : cluster.nodes) {
+      const auto http_port = node.http_port;
+      set_mock_metadata(view_id, /*this_cluster_id*/ cluster.id,
+                        /*target_cluster_id*/ target_cluster_id, http_port,
+                        clusterset_data_, router_options);
+    }
+  }
+
+  EXPECT_TRUE(wait_for_transaction_count_increase(
+      clusterset_data_.clusters[0].nodes[0].http_port, 2));
+
+  SCOPED_TRACE("// Check that all the existing RO connections are OK");
+  verify_existing_connection_ok(ro_con1.get());
+  verify_existing_connection_ok(ro_con2.get());
+  verify_existing_connection_ok(ro_con3.get());
+  SCOPED_TRACE(
+      "// Check that RW connection got dropped as our target_cluster is not "
+      "PRIMARY anymore");
+  verify_existing_connection_dropped(rw_con.get());
+
+  SCOPED_TRACE(
+      "// Check that new RO connection is possible, new RW connection is not "
+      "possible");
+  verify_new_connection_fails(router_port_rw);
+  auto ro_con4 = make_new_connection_ok(
+      router_port_ro, clusterset_data_.clusters[target_cluster_id]
+                          .nodes[kRONodeId]
+                          .classic_port);
+}
+
+class ViewIdChangesTest
+    : public ClusterSetTest,
+      public ::testing::WithParamInterface<TargetClusterTestParams> {};
+
+/**
+ * @test Check that the Router correctly notices the view_id changes and
+ * applies the new metadata according to them.
+ * [@FR8]
+ * [@FR8.1]
+ */
+TEST_P(ViewIdChangesTest, ViewIdChanges) {
+  const int target_cluster_id = GetParam().target_cluster_id;
+  const std::string target_cluster = GetParam().target_cluster;
+  const std::string router_options =
+      R"({"target_cluster" : ")" + target_cluster + "\" }";
+
+  SCOPED_TRACE(
+      "// We start wtih view_id=1, all the clusterset nodes are metadata "
+      "servers");
+
+  create_clusterset(view_id, target_cluster_id,
+                    /*primary_cluster_id*/ 0, "metadata_clusterset.js",
+                    router_options);
+  auto &router = launch_router();
+  EXPECT_EQ(9u, clusterset_data_.get_all_nodes_classic_ports().size());
+
+  EXPECT_TRUE(wait_for_transaction_count_increase(
+      clusterset_data_.clusters[0].nodes[0].http_port, 2));
+
+  check_state_file(router_state_file, mysqlrouter::ClusterType::GR_CS,
+                   clusterset_data_.uuid,
+                   clusterset_data_.get_all_nodes_classic_ports(), view_id);
+
+  SCOPED_TRACE(
+      "// Now let's make some change in the metadata (remove second node in "
+      "the second replicaset) and let know only first REPLICA cluster about "
+      "that");
+
+  clusterset_data_.remove_node("00000000-0000-0000-0000-000000000033");
+  EXPECT_EQ(8u, clusterset_data_.get_all_nodes_classic_ports().size());
+
+  set_mock_metadata(view_id + 1, /*this_cluster_id*/ 1, target_cluster_id,
+                    clusterset_data_.clusters[1].nodes[0].http_port,
+                    clusterset_data_, router_options);
+
+  EXPECT_TRUE(wait_for_transaction_count_increase(
+      clusterset_data_.clusters[0].nodes[0].http_port, 2));
+
+  SCOPED_TRACE(
+      "// Check that the Router has seen the change and that it is reflected "
+      "in the state file");
+
+  check_state_file(router_state_file, mysqlrouter::ClusterType::GR_CS,
+                   clusterset_data_.uuid,
+                   clusterset_data_.get_all_nodes_classic_ports(), view_id + 1);
+
+  SCOPED_TRACE("// Check that information about outdated view id is logged");
+  const auto log_content = router.get_full_logfile();
+  const std::string pattern =
+      "INFO .* Metadata server 127.0.0.1:" +
+      std::to_string(clusterset_data_.clusters[0].nodes[0].classic_port) +
+      " has outdated metadata view_id = " + std::to_string(view_id) +
+      ", current view_id = " + std::to_string(view_id + 1) + ", ignoring";
+  EXPECT_TRUE(pattern_found(log_content, pattern)) << log_content;
+
+  SCOPED_TRACE(
+      "// Let's make another change in the metadata (remove second node in "
+      "the first replicaset) and let know only second REPLICA cluster about "
+      "that");
+
+  clusterset_data_.remove_node("00000000-0000-0000-0000-000000000023");
+  EXPECT_EQ(7u, clusterset_data_.get_all_nodes_classic_ports().size());
+
+  set_mock_metadata(view_id + 2, /*this_cluster_id*/ 2, target_cluster_id,
+                    clusterset_data_.clusters[2].nodes[0].http_port,
+                    clusterset_data_, router_options);
+
+  EXPECT_TRUE(wait_for_transaction_count_increase(
+      clusterset_data_.clusters[0].nodes[0].http_port, 2));
+
+  SCOPED_TRACE(
+      "// Check that the Router has seen the change and that it is reflected "
+      "in the state file");
+
+  check_state_file(router_state_file, mysqlrouter::ClusterType::GR_CS,
+                   clusterset_data_.uuid,
+                   clusterset_data_.get_all_nodes_classic_ports(), view_id + 2);
+
+  SCOPED_TRACE(
+      "// Let's propagete the last change to all nodes in the ClusterSet");
+
+  for (const auto &cluster : clusterset_data_.clusters) {
+    for (const auto &node : cluster.nodes) {
+      const auto http_port = node.http_port;
+      set_mock_metadata(view_id + 2, /*this_cluster_id*/ 2, target_cluster_id,
+                        http_port, clusterset_data_, router_options);
+    }
+  }
+
+  // state file should not change
+  SCOPED_TRACE(
+      "// Check that the Router has seen the change and that it is reflected "
+      "in the state file");
+
+  EXPECT_TRUE(wait_for_transaction_count_increase(
+      clusterset_data_.clusters[0].nodes[0].http_port, 2));
+
+  check_state_file(router_state_file, mysqlrouter::ClusterType::GR_CS,
+                   clusterset_data_.uuid,
+                   clusterset_data_.get_all_nodes_classic_ports(), view_id + 2);
+}
+
+INSTANTIATE_TEST_SUITE_P(ViewIdChanges, ViewIdChangesTest,
+                         ::testing::Values(
+                             // [@TS_R11_1] // TODO: are these references ok?
+                             TargetClusterTestParams{"primary", 0},
+                             // [@TS_R11_2]
+                             TargetClusterTestParams{
+                                 "00000000-0000-0000-0000-0000000000g2", 1}));
+
+/**
+ * @test Check that when 2 clusters claim they are both PRIMARY, Router follows
+ * the one that has a highier view_id
+ * [@FR9]
+ * [@TS_R11_3]
+ */
+TEST_F(ClusterSetTest, TwoPrimaryClustersHighierViewId) {
+  const std::string router_options = R"({"target_cluster" : "primary"})";
+  SCOPED_TRACE(
+      "// We configure Router to follow PRIMARY cluster, first cluster starts "
+      "as a PRIMARY");
+
+  create_clusterset(view_id, /*target_cluster_id*/ 0,
+                    /*primary_cluster_id*/ 0, "metadata_clusterset.js",
+                    router_options);
+  /*auto &router =*/launch_router();
+
+  EXPECT_TRUE(wait_for_transaction_count_increase(
+      clusterset_data_.clusters[kPrimaryClusterId].nodes[0].http_port, 2));
+
+  auto rw_con1 = make_new_connection_ok(
+      router_port_rw, clusterset_data_.clusters[kPrimaryClusterId]
+                          .nodes[kRWNodeId]
+                          .classic_port);
+
+  auto ro_con1 = make_new_connection_ok(
+      router_port_ro, clusterset_data_.clusters[kPrimaryClusterId]
+                          .nodes[kRONodeId]
+                          .classic_port);
+
+  SCOPED_TRACE(
+      "// Now let's make first REPLICA to claim that it's also a primary. But "
+      "it has a highier view so the Router should believe the REPLICA");
+
+  change_clusterset_primary(clusterset_data_, kFirstReplicaClusterId);
+  for (unsigned node_id = 0;
+       node_id < clusterset_data_.clusters[kFirstReplicaClusterId].nodes.size();
+       ++node_id) {
+    set_mock_metadata(view_id + 1, /*this_cluster_id*/ kFirstReplicaClusterId,
+                      kFirstReplicaClusterId,
+                      clusterset_data_.clusters[kFirstReplicaClusterId]
+                          .nodes[node_id]
+                          .http_port,
+                      clusterset_data_, router_options);
+  }
+
+  EXPECT_TRUE(wait_for_transaction_count_increase(
+      clusterset_data_.clusters[kFirstReplicaClusterId].nodes[0].http_port, 2));
+
+  SCOPED_TRACE(
+      "// Check that the Router has seen the change and that it is reflected "
+      "in the state file");
+
+  check_state_file(router_state_file, mysqlrouter::ClusterType::GR_CS,
+                   clusterset_data_.uuid,
+                   clusterset_data_.get_all_nodes_classic_ports(), view_id + 1);
+
+  SCOPED_TRACE(
+      "// Check that the Router now uses new PRIMARY as a target cluster - "
+      "existing connections dropped, new one directed to second Cluster");
+
+  verify_existing_connection_dropped(rw_con1.get());
+  verify_existing_connection_dropped(ro_con1.get());
+
+  auto rw_con2 = make_new_connection_ok(
+      router_port_rw, clusterset_data_.clusters[kFirstReplicaClusterId]
+                          .nodes[kRWNodeId]
+                          .classic_port);
+
+  // +1 as we round-dobin and this is already a second connection
+  auto ro_con2 = make_new_connection_ok(
+      router_port_ro, clusterset_data_.clusters[kFirstReplicaClusterId]
+                          .nodes[kRONodeId + 1]
+                          .classic_port);
+
+  SCOPED_TRACE(
+      "// Now let's bump the old PRIMARY's view_id up, it should become again "
+      "our target_cluster");
+
+  change_clusterset_primary(clusterset_data_, kPrimaryClusterId);
+  for (unsigned node_id = 0;
+       node_id < clusterset_data_.clusters[kPrimaryClusterId].nodes.size();
+       ++node_id) {
+    set_mock_metadata(view_id + 2, /*this_cluster_id*/ kPrimaryClusterId,
+                      kPrimaryClusterId,
+                      clusterset_data_.clusters[kFirstReplicaClusterId]
+                          .nodes[node_id]
+                          .http_port,
+                      clusterset_data_, router_options);
+  }
+
+  EXPECT_TRUE(wait_for_transaction_count_increase(
+      clusterset_data_.clusters[kPrimaryClusterId].nodes[0].http_port, 2));
+
+  SCOPED_TRACE(
+      "// Check that the Router has seen the change and that it is reflected "
+      "in the state file");
+
+  check_state_file(router_state_file, mysqlrouter::ClusterType::GR_CS,
+                   clusterset_data_.uuid,
+                   clusterset_data_.get_all_nodes_classic_ports(), view_id + 2);
+
+  SCOPED_TRACE(
+      "// Check that the Router now uses original PRIMARY as a target cluster "
+      "- "
+      "existing connections dropped, new one directed to first Cluster");
+
+  verify_existing_connection_dropped(rw_con2.get());
+  verify_existing_connection_dropped(ro_con2.get());
+
+  /*auto rw_con3 =*/make_new_connection_ok(
+      router_port_rw, clusterset_data_.clusters[kPrimaryClusterId]
+                          .nodes[kRWNodeId]
+                          .classic_port);
+
+  // +1 as we round-dobin and this is already a second connection
+  /*auto ro_con3 =*/make_new_connection_ok(
+      router_port_ro, clusterset_data_.clusters[kPrimaryClusterId]
+                          .nodes[kRONodeId]
+                          .classic_port);
+}
+
+/**
+ * @test Check that when 2 clusters claim they are both PRIMARY, Router follows
+ * the one that has a highier view_id
+ * [@FR9]
+ * [@TS_R11_4]
+ */
+TEST_F(ClusterSetTest, TwoPrimaryClustersLowerViewId) {
+  view_id = 1;
+
+  SCOPED_TRACE(
+      "// We configure Router to follow PRIMARY cluster, first cluster starts "
+      "as a PRIMARY");
+
+  create_clusterset(view_id, /*target_cluster_id*/ 0,
+                    /*primary_cluster_id*/ 0, "metadata_clusterset.js",
+                    /*router_options*/ R"({"target_cluster" : "primary"})");
+  /*auto &router =*/launch_router();
+
+  EXPECT_TRUE(wait_for_transaction_count_increase(
+      clusterset_data_.clusters[kPrimaryClusterId].nodes[0].http_port, 2));
+
+  auto rw_con1 = make_new_connection_ok(
+      router_port_rw, clusterset_data_.clusters[kPrimaryClusterId]
+                          .nodes[kRWNodeId]
+                          .classic_port);
+
+  auto ro_con1 = make_new_connection_ok(
+      router_port_ro, clusterset_data_.clusters[kPrimaryClusterId]
+                          .nodes[kRONodeId]
+                          .classic_port);
+
+  SCOPED_TRACE(
+      "// Now let's make first REPLICA to claim that it's also a primary. But "
+      "it has a lower view so the Router should not take that into account");
+
+  change_clusterset_primary(clusterset_data_, kFirstReplicaClusterId);
+  for (unsigned node_id = 0;
+       node_id < clusterset_data_.clusters[kFirstReplicaClusterId].nodes.size();
+       ++node_id) {
+    set_mock_metadata(view_id - 1, /*this_cluster_id*/ kFirstReplicaClusterId,
+                      kFirstReplicaClusterId,
+                      clusterset_data_.clusters[kFirstReplicaClusterId]
+                          .nodes[node_id]
+                          .http_port,
+                      clusterset_data_,
+                      /*router_options*/ "");
+  }
+
+  EXPECT_TRUE(wait_for_transaction_count_increase(
+      clusterset_data_.clusters[kFirstReplicaClusterId].nodes[0].http_port, 2));
+
+  SCOPED_TRACE("// Check that the state file did not change");
+
+  check_state_file(router_state_file, mysqlrouter::ClusterType::GR_CS,
+                   clusterset_data_.uuid,
+                   clusterset_data_.get_all_nodes_classic_ports(), view_id);
+
+  SCOPED_TRACE(
+      "// Check that existing connections are still open and the original "
+      "PRIMARY is used for new ones");
+
+  verify_existing_connection_ok(rw_con1.get());
+  verify_existing_connection_ok(ro_con1.get());
+
+  auto rw_con2 = make_new_connection_ok(
+      router_port_rw, clusterset_data_.clusters[kPrimaryClusterId]
+                          .nodes[kRWNodeId]
+                          .classic_port);
+
+  // +1 as we round-dobin and this is already a second connection
+  auto ro_con2 = make_new_connection_ok(
+      router_port_ro, clusterset_data_.clusters[kPrimaryClusterId]
+                          .nodes[kRONodeId + 1]
+                          .classic_port);
+}
+
+struct InvalidatedClusterTestParams {
+  std::string invalidated_cluster_routing_policy;
+  bool expected_ro_connections_allowed;
+};
+
+class ClusterMarkedInvalidInTheMetadataTest
+    : public ClusterSetTest,
+      public ::testing::WithParamInterface<InvalidatedClusterTestParams> {};
+
+/**
+ * @test Check that when target_cluster is marked as invalidated in the metadata
+ * the Router either handles only RO connections or no connections at all
+ * depending on the invalidatedClusterRoutingPolicy
+ * [@FR11]
+ * [@TS_R15_1-3]
+ */
+TEST_P(ClusterMarkedInvalidInTheMetadataTest,
+       ClusterMarkedInvalidInTheMetadata) {
+  view_id = 1;
+  const std::string policy = GetParam().invalidated_cluster_routing_policy;
+  const bool ro_allowed = GetParam().expected_ro_connections_allowed;
+
+  SCOPED_TRACE("// We configure Router to follow the first REPLICA cluster");
+
+  create_clusterset(view_id, /*target_cluster_id*/ kPrimaryClusterId,
+                    /*primary_cluster_id*/ kPrimaryClusterId,
+                    "metadata_clusterset.js",
+                    /*router_options*/ R"({"target_cluster" : "primary"})");
+  /* auto &router = */ launch_router();
+
+  EXPECT_TRUE(wait_for_transaction_count_increase(
+      clusterset_data_.clusters[kPrimaryClusterId].nodes[0].http_port, 2));
+
+  auto rw_con1 = make_new_connection_ok(
+      router_port_rw, clusterset_data_.clusters[kPrimaryClusterId]
+                          .nodes[kRWNodeId]
+                          .classic_port);
+
+  auto ro_con1 = make_new_connection_ok(
+      router_port_ro, clusterset_data_.clusters[kPrimaryClusterId]
+                          .nodes[kRONodeId]
+                          .classic_port);
+
+  SCOPED_TRACE(
+      "// Mark our PRIMARY cluster as invalidated in the metadata, also set "
+      "the selected invalidatedClusterRoutingPolicy");
+  clusterset_data_.clusters[kPrimaryClusterId].invalid = true;
+  for (const auto &cluster : clusterset_data_.clusters) {
+    for (const auto &node : cluster.nodes) {
+      const auto http_port = node.http_port;
+      set_mock_metadata(
+          view_id + 1, /*this_cluster_id*/ cluster.id,
+          /*target_cluster_id*/ kPrimaryClusterId, http_port, clusterset_data_,
+          /*router_options*/
+          R"({"target_cluster" : "primary", "invalidated_cluster_policy" : ")" +
+              policy + "\" }");
+    }
+  }
+
+  EXPECT_TRUE(wait_for_transaction_count_increase(
+      clusterset_data_.clusters[kPrimaryClusterId].nodes[0].http_port, 2));
+
+  SCOPED_TRACE(
+      "// Check that existing RW connections are down and no new are possible");
+
+  verify_existing_connection_dropped(rw_con1.get());
+  verify_new_connection_fails(router_port_rw);
+
+  SCOPED_TRACE(
+      "// Check that RO connections are possible or not depending on the "
+      "configured policy");
+  if (!ro_allowed) {
+    verify_existing_connection_dropped(ro_con1.get());
+    verify_new_connection_fails(router_port_ro);
+  } else {
+    verify_existing_connection_ok(ro_con1.get());
+    make_new_connection_ok(router_port_ro,
+                           clusterset_data_.clusters[kPrimaryClusterId]
+                               .nodes[kRONodeId]
+                               .classic_port);
+  }
+}
+
+INSTANTIATE_TEST_SUITE_P(
+    ClusterMarkedInvalidInTheMetadata, ClusterMarkedInvalidInTheMetadataTest,
+    ::testing::Values(
+        // policy empty, default should be dropAll so RO connections are not
+        // allowed
+        InvalidatedClusterTestParams{"", false},
+        // unsupported policy name, again expect the default behavior
+        InvalidatedClusterTestParams{"unsupported", false},
+        // explicitly set dropAll, no RO connections allowed again
+        InvalidatedClusterTestParams{"drop_all", false},
+        // accept_ro policy in  the metadata, RO connections are allowed
+        InvalidatedClusterTestParams{"accept_ro", true}));
+
+/**
+ * @test Check that the Router correctly follows new target_cluster when it is
+ * changed manually in the config file.
+ * [@FR3.6]
+ * [@TS_R8_3]
+ */
+#if 0
+TEST_F(ClusterSetTest, ManualTargetClusterChangeInConfig) {
+  create_clusterset(0, /*target_cluster_id*/ 0,
+                    /*primary_cluster_id*/ 0, "metadata_clusterset.js");
+
+  SCOPED_TRACE("// Launch Router with target_cluster=primary");
+  auto &router = launch_router("primary");
+
+  make_new_connection_ok(router_port_rw,
+                         clusterset_data_.clusters[kPrimaryClusterId]
+                             .nodes[kRWNodeId]
+                             .classic_port);
+
+  make_new_connection_ok(router_port_ro,
+                         clusterset_data_.clusters[kPrimaryClusterId]
+                             .nodes[kRONodeId]
+                             .classic_port);
+
+  router.kill();
+  EXPECT_TRUE(
+      wait_log_contains(router, "DEBUG .* Unloading all plugins.", 5000ms));
+
+  SCOPED_TRACE(
+      "// Now the Router is down, let's change the target_cluster to first "
+      "Replica Cluster");
+
+  {
+    std::ifstream conf_in{router_conf_file};
+    std::ofstream conf_out{router_conf_file + "tmp"};
+    std::string line;
+    bool replaced{false};
+    EXPECT_TRUE(conf_in);
+    while (std::getline(conf_in, line)) {
+      if (line == "target_cluster=primary") {
+        conf_out << "target_cluster=00000000-0000-0000-0000-0000000000g2"
+                 << std::endl;
+        replaced = true;
+      } else {
+        conf_out << line << std::endl;
+      }
+    }
+    EXPECT_TRUE(replaced);
+  }
+  mysqlrouter::rename_file(router_conf_file + "tmp", router_conf_file);
+
+  for (const auto &cluster : clusterset_data_.clusters) {
+    for (const auto &node : cluster.nodes) {
+      const auto http_port = node.http_port;
+      set_mock_metadata(view_id, /*this_cluster_id*/ cluster.id,
+                        /*target_cluster_id*/ kFirstReplicaClusterId, http_port,
+                        clusterset_data_,
+                        /*router_options*/ "");
+    }
+  }
+
+  SCOPED_TRACE(
+      "// After restarting the Router it should now use Replica for a "
+      "connections");
+  relaunch_router(router_conf_file);
+
+  verify_new_connection_fails(router_port_rw);
+
+  make_new_connection_ok(router_port_ro,
+                         clusterset_data_.clusters[kFirstReplicaClusterId]
+                             .nodes[kRWNodeId]
+                             .classic_port);
+}
+#endif
+
+/**
+ * @test Check that the changes to the ClusterSet topology are reflected in the
+ * state file in the runtime.
+ * [@FR12]
+ * [@TS_R13_1]
+ */
+TEST_F(ClusterSetTest, StateFileMetadataServersChange) {
+  // also check if we handle view_id grater than 2^32 correctly
+  uint64_t view_id = std::numeric_limits<uint32_t>::max() + 1;
+  const std::string router_options = R"({"target_cluster" : "primary"})";
+  create_clusterset(view_id, /*target_cluster_id*/ kPrimaryClusterId,
+                    /*primary_cluster_id*/ 0, "metadata_clusterset.js",
+                    router_options);
+
+  const auto original_clusterset_data = clusterset_data_;
+
+  SCOPED_TRACE("// Launch Router with target_cluster=primary");
+  /*auto &router =*/launch_router();
+
+  check_state_file(router_state_file, mysqlrouter::ClusterType::GR_CS,
+                   clusterset_data_.uuid,
+                   clusterset_data_.get_all_nodes_classic_ports(), view_id);
+
+  SCOPED_TRACE(
+      "// Remove second Replica Cluster nodes one by one and check that it is "
+      "reflected in the state file");
+
+  for (unsigned node_id = 1; node_id <= 3; ++node_id) {
+    // remove node from the metadata
+    clusterset_data_.remove_node("00000000-0000-0000-0000-00000000003" +
+                                 std::to_string(node_id));
+    ++view_id;
+    // update each remaining node with that metadata
+    for (const auto &cluster : clusterset_data_.clusters) {
+      for (const auto &node : cluster.nodes) {
+        const auto http_port = node.http_port;
+        set_mock_metadata(view_id, /*this_cluster_id*/ cluster.id,
+                          /*target_cluster_id*/ kPrimaryClusterId, http_port,
+                          clusterset_data_, router_options);
+      }
+    }
+
+    // wait for the Router to refresh the metadata
+    EXPECT_TRUE(wait_for_transaction_count_increase(
+        clusterset_data_.clusters[kPrimaryClusterId].nodes[0].http_port, 2));
+
+    // check that the list of the nodes is reflected in the state file
+    EXPECT_EQ(9 - node_id,
+              clusterset_data_.get_all_nodes_classic_ports().size());
+    check_state_file(router_state_file, mysqlrouter::ClusterType::GR_CS,
+                     clusterset_data_.uuid,
+                     clusterset_data_.get_all_nodes_classic_ports(), view_id);
+  }
+
+  SCOPED_TRACE("// Check that we can still connect to the Primary");
+  make_new_connection_ok(router_port_rw,
+                         clusterset_data_.clusters[kPrimaryClusterId]
+                             .nodes[kRWNodeId]
+                             .classic_port);
+
+  make_new_connection_ok(router_port_ro,
+                         clusterset_data_.clusters[kPrimaryClusterId]
+                             .nodes[kRONodeId]
+                             .classic_port);
+
+  SCOPED_TRACE(
+      "// Remove Primary Cluster nodes one by one and check that it is "
+      "reflected in the state file");
+
+  for (unsigned node_id = 1; node_id <= 3; ++node_id) {
+    // remove node from the metadata
+    clusterset_data_.remove_node("00000000-0000-0000-0000-00000000001" +
+                                 std::to_string(node_id));
+    ++view_id;
+    // update each remaining node with that metadata
+    for (const auto &cluster : clusterset_data_.clusters) {
+      for (const auto &node : cluster.nodes) {
+        const auto http_port = node.http_port;
+        set_mock_metadata(view_id, /*this_cluster_id*/ cluster.id,
+                          /*target_cluster_id*/ kPrimaryClusterId, http_port,
+                          clusterset_data_, router_options);
+      }
+    }
+
+    // wait for the Router to refresh the metadata
+    EXPECT_TRUE(wait_for_transaction_count_increase(
+        clusterset_data_.clusters[kFirstReplicaClusterId].nodes[0].http_port,
+        2));
+
+    // check that the list of the nodes is reflected in the state file
+    EXPECT_EQ(9 - 3 - node_id,
+              clusterset_data_.get_all_nodes_classic_ports().size());
+    check_state_file(router_state_file, mysqlrouter::ClusterType::GR_CS,
+                     clusterset_data_.uuid,
+                     clusterset_data_.get_all_nodes_classic_ports(), view_id);
+  }
+
+  verify_new_connection_fails(router_port_rw);
+  verify_new_connection_fails(router_port_ro);
+
+  SCOPED_TRACE(
+      "// Remove First Replica Cluster nodes one by one and check that it is "
+      "reflected in the state file");
+
+  for (unsigned node_id = 2; node_id <= 3; ++node_id) {
+    // remove node from the metadata
+    clusterset_data_.remove_node("00000000-0000-0000-0000-00000000002" +
+                                 std::to_string(node_id));
+    ++view_id;
+    // update each remaining node with that metadata
+    for (const auto &cluster : clusterset_data_.clusters) {
+      for (const auto &node : cluster.nodes) {
+        const auto http_port = node.http_port;
+        set_mock_metadata(view_id, /*this_cluster_id*/ cluster.id,
+                          /*target_cluster_id*/ kPrimaryClusterId, http_port,
+                          clusterset_data_, router_options);
+      }
+    }
+
+    // wait for the Router to refresh the metadata
+    EXPECT_TRUE(wait_for_transaction_count_increase(
+        clusterset_data_.clusters[kFirstReplicaClusterId].nodes[0].http_port,
+        2));
+
+    // check that the list of the nodes is reflected in the state file
+    EXPECT_EQ(4 - node_id,
+              clusterset_data_.get_all_nodes_classic_ports().size());
+
+    check_state_file(router_state_file, mysqlrouter::ClusterType::GR_CS,
+                     clusterset_data_.uuid,
+                     clusterset_data_.get_all_nodes_classic_ports(), view_id);
+  }
+
+  SCOPED_TRACE(
+      "// Remove the last node, that should not be reflected in the state file "
+      "as Router never writes empty list to the state file");
+  clusterset_data_.remove_node("00000000-0000-0000-0000-000000000021");
+  view_id++;
+
+  set_mock_metadata(view_id, /*this_cluster_id*/ 1,
+                    /*target_cluster_id*/ kPrimaryClusterId,
+                    original_clusterset_data.clusters[kFirstReplicaClusterId]
+                        .nodes[0]
+                        .http_port,
+                    clusterset_data_, router_options);
+  // wait for the Router to refresh the metadata
+  EXPECT_TRUE(wait_for_transaction_count_increase(
+      original_clusterset_data.clusters.at(kFirstReplicaClusterId)
+          .nodes.at(0)
+          .http_port,
+      2));
+
+  // check that the list of the nodes is NOT reflected in the state file
+  EXPECT_EQ(0, clusterset_data_.get_all_nodes_classic_ports().size());
+  const std::vector<uint16_t> expected_port{
+      original_clusterset_data.clusters.at(kFirstReplicaClusterId)
+          .nodes.at(0)
+          .classic_port};
+  check_state_file(router_state_file, mysqlrouter::ClusterType::GR_CS,
+                   clusterset_data_.uuid, expected_port, view_id - 1);
+
+  verify_new_connection_fails(router_port_rw);
+  verify_new_connection_fails(router_port_ro);
+
+  SCOPED_TRACE("// Restore Primary Cluster nodes one by one");
+
+  for (unsigned node_id = 1; node_id <= 3; ++node_id) {
+    ++view_id;
+    clusterset_data_.add_node(
+        kPrimaryClusterId, original_clusterset_data.clusters[kPrimaryClusterId]
+                               .nodes[node_id - 1]);
+    // update each node with that metadata
+    for (const auto &cluster : clusterset_data_.clusters) {
+      for (const auto &node : cluster.nodes) {
+        const auto http_port = node.http_port;
+        set_mock_metadata(view_id, /*this_cluster_id*/ cluster.id,
+                          /*target_cluster_id*/ kPrimaryClusterId, http_port,
+                          clusterset_data_, router_options);
+      }
+    }
+
+    // if this is the first node that we are adding back we also need to set it
+    // in our last standing metadata server which is no longer part of the
+    // clusterset
+    if (node_id == 1) {
+      const auto http_port =
+          original_clusterset_data.clusters[kFirstReplicaClusterId]
+              .nodes[0]
+              .http_port;
+      set_mock_metadata(view_id, /*this_cluster_id*/ 1,
+                        /*target_cluster_id*/ kPrimaryClusterId, http_port,
+                        clusterset_data_, router_options);
+    }
+
+    // wait for the Router to refresh the metadata
+    EXPECT_TRUE(wait_for_transaction_count_increase(
+        clusterset_data_.clusters[kPrimaryClusterId].nodes[0].http_port, 2));
+
+    // check that the list of the nodes is reflected in the state file
+    EXPECT_EQ(node_id, clusterset_data_.get_all_nodes_classic_ports().size());
+    check_state_file(router_state_file, mysqlrouter::ClusterType::GR_CS,
+                     clusterset_data_.uuid,
+                     clusterset_data_.get_all_nodes_classic_ports(), view_id);
+  }
+
+  SCOPED_TRACE("// The connections via the Router should be possible again");
+  make_new_connection_ok(router_port_rw,
+                         clusterset_data_.clusters[kPrimaryClusterId]
+                             .nodes[kRWNodeId]
+                             .classic_port);
+
+  make_new_connection_ok(router_port_ro,
+                         clusterset_data_.clusters[kPrimaryClusterId]
+                             .nodes[kRONodeId + 1]
+                             .classic_port);
+}
+
+/**
+ * @test Check that the Router works correctly when can't access some metadata
+ * servers.
+ * [@FR10]
+ * [@TS_R11_5]
+ */
+TEST_F(ClusterSetTest, SomeMetadataServerUnaccessible) {
+  uint64_t view_id = 1;
+  const std::string router_options = R"({"target_cluster" : "primary"})";
+
+  create_clusterset(view_id, /*target_cluster_id*/ 0,
+                    /*primary_cluster_id*/ 0, "metadata_clusterset.js",
+                    router_options);
+
+  SCOPED_TRACE("// Launch Router with target_cluster=primary");
+  /*auto &router =*/launch_router();
+
+  auto rw_con1 = make_new_connection_ok(
+      router_port_rw, clusterset_data_.clusters[kPrimaryClusterId]
+                          .nodes[kRWNodeId]
+                          .classic_port);
+
+  auto ro_con1 = make_new_connection_ok(
+      router_port_ro, clusterset_data_.clusters[kPrimaryClusterId]
+                          .nodes[kRONodeId]
+                          .classic_port);
+
+  SCOPED_TRACE("// Make the first Replica Cluster nodes unaccessible");
+  for (unsigned node_id = 0; node_id < 3; ++node_id) {
+    clusterset_data_.clusters[kFirstReplicaClusterId]
+        .nodes[node_id]
+        .process->kill();
+  }
+
+  EXPECT_TRUE(wait_for_transaction_count_increase(
+      clusterset_data_.clusters[kPrimaryClusterId].nodes[0].http_port, 2));
+
+  SCOPED_TRACE("// Bump up the view_id on the second Replica (remove First)");
+  view_id++;
+  for (const auto &node :
+       clusterset_data_.clusters[kSecondReplicaClusterId].nodes) {
+    const auto http_port = node.http_port;
+    set_mock_metadata(view_id, /*this_cluster_id*/ kSecondReplicaClusterId,
+                      /*target_cluster_id*/ kPrimaryClusterId, http_port,
+                      clusterset_data_, router_options);
+  }
+
+  EXPECT_TRUE(wait_for_transaction_count_increase(
+      clusterset_data_.clusters[kSecondReplicaClusterId].nodes[0].http_port,
+      2));
+
+  SCOPED_TRACE(
+      "// The existing connections should still be alive, new ones should be "
+      "possible");
+  verify_existing_connection_ok(rw_con1.get());
+  verify_existing_connection_ok(ro_con1.get());
+  make_new_connection_ok(router_port_rw,
+                         clusterset_data_.clusters[kPrimaryClusterId]
+                             .nodes[kRWNodeId]
+                             .classic_port);
+  make_new_connection_ok(router_port_ro,
+                         clusterset_data_.clusters[kPrimaryClusterId]
+                             .nodes[kRONodeId + 1]
+                             .classic_port);
+}
+
+int main(int argc, char *argv[]) {
+  init_windows_sockets();
+  g_origin_path = Path(argv[0]).dirname();
+  ProcessManager::set_origin(g_origin_path);
+  ::testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}
diff -Nru mysql-8.0-8.0.26/router/tests/component/test_gr_notifications.cc mysql-8.0-8.0.27/router/tests/component/test_gr_notifications.cc
--- mysql-8.0-8.0.26/router/tests/component/test_gr_notifications.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/test_gr_notifications.cc	2021-09-28 11:46:34.000000000 +0000
@@ -24,8 +24,6 @@
 
 #include <limits>
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 
@@ -260,7 +258,7 @@
                                 const std::string &group_id,
                                 const std::vector<uint16_t> node_ports) {
     return RouterComponentTest::create_state_file(
-        dir, create_state_file_content(group_id, node_ports));
+        dir, create_state_file_content(group_id, "", node_ports));
   }
 
   int get_current_queries_count(const uint16_t http_port) {
@@ -387,8 +385,8 @@
   }
 
   SCOPED_TRACE("// Create a router state file");
-  const std::string state_file =
-      create_state_file(temp_test_dir.name(), kGroupId, cluster_nodes_ports);
+  const std::string state_file = GrNotificationsTest::create_state_file(
+      temp_test_dir.name(), kGroupId, cluster_nodes_ports);
 
   SCOPED_TRACE(
       "// Create a configuration file sections with high ttl so that "
@@ -400,8 +398,20 @@
       router_port, "PRIMARY", "first-available");
 
   SCOPED_TRACE("// Launch ther router");
-  launch_router(temp_test_dir.name(), metadata_cache_section, routing_section,
-                state_file);
+  auto &router = launch_router(temp_test_dir.name(), metadata_cache_section,
+                               routing_section, state_file);
+
+  SCOPED_TRACE("// Wait for the expected log about enabling the GR notices");
+  for (unsigned i = 0; i < kClusterNodesCount; ++i) {
+    const bool found =
+        wait_log_contains(router,
+                          "INFO .* Enabling GR notices for cluster 'test' "
+                          "changes on node 127.0.0.1:" +
+                              std::to_string(cluster_nodes_xports[i]),
+                          2s);
+
+    EXPECT_TRUE(found);
+  }
 
   RouterComponentTest::sleep_for(test_params.router_uptime);
 
@@ -649,8 +659,8 @@
   }
 
   SCOPED_TRACE("// Create a router state file");
-  const std::string state_file =
-      create_state_file(temp_test_dir.name(), kGroupId, cluster_nodes_ports);
+  const std::string state_file = GrNotificationsTest::create_state_file(
+      temp_test_dir.name(), kGroupId, cluster_nodes_ports);
 
   SCOPED_TRACE("// Create a configuration file sections with high ttl");
   const std::string metadata_cache_section =
@@ -731,8 +741,8 @@
       true);
 
   SCOPED_TRACE("// Create a router state file");
-  const std::string state_file =
-      create_state_file(temp_test_dir.name(), kGroupId, {cluster_classic_port});
+  const std::string state_file = GrNotificationsTest::create_state_file(
+      temp_test_dir.name(), kGroupId, {cluster_classic_port});
 
   SCOPED_TRACE("// Create a configuration file sections with high ttl");
   const std::string metadata_cache_section =
@@ -755,10 +765,15 @@
 
   // there should be no WARNINGs nor ERRORs in the log file
   const std::string log_content = router.get_full_logfile();
-  EXPECT_EQ(log_content.find("ERROR"), log_content.npos) << log_content;
-  EXPECT_EQ(log_content.find("WARNING"), log_content.npos) << log_content;
+  EXPECT_EQ(log_content.find(" ERROR "), log_content.npos) << log_content;
+  EXPECT_EQ(log_content.find(" WARNING "), log_content.npos) << log_content;
 }
 
+INSTANTIATE_TEST_SUITE_P(GrNotificationMysqlxWaitTimeoutUnsupported,
+                         GrNotificationMysqlxWaitTimeoutUnsupportedTest,
+                         ::testing::Values("metadata_dynamic_nodes_v2_gr.js",
+                                           "metadata_dynamic_nodes.js"));
+
 class GrNotificationNoticesUnsupportedTest
     : public GrNotificationsTest,
       public ::testing::WithParamInterface<std::string> {};
@@ -792,8 +807,8 @@
                     {cluster_x_port}, true);
 
   SCOPED_TRACE("// Create a router state file");
-  const std::string state_file =
-      create_state_file(temp_test_dir.name(), kGroupId, {cluster_classic_port});
+  const std::string state_file = GrNotificationsTest::create_state_file(
+      temp_test_dir.name(), kGroupId, {cluster_classic_port});
 
   SCOPED_TRACE("// Create a configuration file sections with high ttl");
   const std::string metadata_cache_section =
@@ -816,7 +831,7 @@
 
   const bool found = wait_log_contains(
       router,
-      "WARNING.* Failed enabling notices on the node.* This "
+      "WARNING.* Failed enabling GR notices on the node.* This "
       "MySQL server version does not support GR notifications.*",
       2s);
 
@@ -869,8 +884,8 @@
   }
 
   SCOPED_TRACE("// Create a router state file");
-  const std::string state_file =
-      create_state_file(temp_test_dir.name(), kGroupId, cluster_nodes_ports);
+  const std::string state_file = GrNotificationsTest::create_state_file(
+      temp_test_dir.name(), kGroupId, cluster_nodes_ports);
 
   SCOPED_TRACE("// Create a configuration file sections with high ttl");
   const std::string metadata_cache_section =
@@ -1027,8 +1042,8 @@
   }
 
   SCOPED_TRACE("// Create a router state file");
-  const std::string state_file =
-      create_state_file(temp_test_dir.name(), "00-000", nodes_ports);
+  const std::string state_file = GrNotificationsTest::create_state_file(
+      temp_test_dir.name(), "00-000", nodes_ports);
 
   SCOPED_TRACE(
       "// Create a configuration file sections with high ttl so that "
diff -Nru mysql-8.0-8.0.26/router/tests/component/test_logging.cc mysql-8.0-8.0.27/router/tests/component/test_logging.cc
--- mysql-8.0-8.0.26/router/tests/component/test_logging.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/test_logging.cc	2021-09-28 11:46:34.000000000 +0000
@@ -31,7 +31,7 @@
 #include <string>
 #include <thread>
 
-#include <gmock/gmock.h>
+#include <gmock/gmock-matchers.h>
 #include <gtest/gtest.h>
 
 #include "config_builder.h"
@@ -39,11 +39,14 @@
 #include "mock_server_rest_client.h"
 #include "mock_server_testutils.h"
 #include "mysql/harness/logging/logging.h"
+#include "mysql/harness/string_utils.h"  // split_lines
 #include "mysql_session.h"
 #include "mysqlrouter/utils.h"  // rename_file
 #include "process_wrapper.h"
 #include "random_generator.h"
 #include "router_component_test.h"
+#include "router_component_testutils.h"
+#include "router_test_helpers.h"  // get_file_output
 #include "tcp_port_pool.h"
 
 /**
@@ -125,15 +128,14 @@
   // expect something like this to appear in log:
   // 2018-12-19 03:54:04 main ERROR [7f539f628780] Configuration error: option
   // destinations in [routing] is required
-  auto matcher = [](const std::string &line) -> bool {
-    return line.find(
-               "Configuration error: option destinations in [routing] is "
-               "required") != line.npos;
-  };
-
-  EXPECT_TRUE(find_in_file(logging_folder.name() + "/mysqlrouter.log", matcher))
-      << "log:"
-      << router.get_full_logfile("mysqlrouter.log", logging_folder.name());
+  auto file_content =
+      router.get_full_logfile("mysqlrouter.log", logging_folder.name());
+  auto lines = mysql_harness::split_string(file_content, '\n');
+
+  EXPECT_THAT(lines,
+              ::testing::Contains(::testing::HasSubstr(
+                  "Configuration error: option destinations in [routing] is "
+                  "required")));
 }
 
 /** @test This test verifies that invalid logging_folder is properly handled and
@@ -1853,13 +1855,12 @@
   // check if log output contains the SQL queries.
   //
   // SQL queries are logged with host:port at the start.
-  auto matcher = [server_port](const std::string &line) -> bool {
-    return line.find("127.0.0.1:" + std::to_string(server_port)) != line.npos;
-  };
-
-  EXPECT_TRUE(find_in_file(bootstrap_conf.name() + "/mysqlrouter.log", matcher,
-                           std::chrono::milliseconds(5000)))
-      << router.get_full_logfile("mysqlrouter.log", bootstrap_conf.name());
+  auto file_content =
+      router.get_full_logfile("mysqlrouter.log", bootstrap_conf.name());
+  auto lines = mysql_harness::split_string(file_content, '\n');
+
+  EXPECT_THAT(lines, ::testing::Contains(::testing::HasSubstr(
+                         "127.0.0.1:" + std::to_string(server_port))));
 }
 
 /**
@@ -1977,7 +1978,7 @@
             {"user", "mysql_router1_user"},
             {"metadata_cluster", "test"},
             {"connect_timeout", "1"},
-            {"ttl", "0.1"},
+            {"ttl", std::to_string(static_cast<double>(ttl_.count()) / 1000)},
         });
   }
 
@@ -2022,15 +2023,16 @@
         log_to_console ? "" : get_logging_dir().str();
     const std::string sinks =
         (log_to_console ? "consolelog,"s : "") + "filelog";
-    return create_config_file(
-        conf_dir,
-        mysql_harness::ConfigBuilder::build_section("logger",
-                                                    {
-                                                        {"level", "DEBUG"},
-                                                        {"sinks", sinks},
-                                                    }) +
-            "\n" + config,
-        &default_section);
+    return create_config_file(conf_dir,
+                              mysql_harness::ConfigBuilder::build_section(
+                                  "logger",
+                                  {
+                                      {"level", "DEBUG"},
+                                      {"timestamp_precision", "millisecond"},
+                                      {"sinks", sinks},
+                                  }) +
+                                  "\n" + config,
+                              &default_section);
   }
 
   TempDirectory temp_test_dir;
@@ -2039,8 +2041,27 @@
   uint16_t router_port_;
   std::string metadata_cache_section;
   std::string routing_section;
+  const std::chrono::milliseconds ttl_{200};
 };
 
+template <class F>
+bool retry_for(F &&f, std::chrono::milliseconds duration) {
+  using clock_type = std::chrono::steady_clock;
+
+  auto sleep_time = duration / 20;
+  auto end_time = clock_type::now() + duration;
+
+  do {
+    auto res = f();
+
+    if (res) return true;
+
+    RouterComponentTest::sleep_for(sleep_time);
+  } while (clock_type::now() < end_time);
+
+  return false;
+}
+
 /**
  * @test verify if error message is logged if router cannot connect to any
  *       metadata server.
@@ -2061,18 +2082,55 @@
   // expect something like this to appear on STDERR
   // 2017-12-21 17:22:35 metadata_cache ERROR [7ff0bb001700] Failed connecting
   // with any of the 3 metadata servers
-  auto matcher = [](const std::string &line) -> bool {
-    return line.find("metadata_cache ERROR") != line.npos &&
-           line.find(
-               "Failed fetching metadata from any of the 3 metadata servers") !=
-               line.npos;
-  };
-
-  auto log_file = get_logging_dir();
-  log_file.append("mysqlrouter.log");
-  EXPECT_TRUE(
-      find_in_file(log_file.str(), matcher, std::chrono::milliseconds(5000)))
-      << router.get_full_logfile();
+  const auto fail_msg =
+      "Failed fetching metadata from any of the 3 metadata servers.";
+
+  // Log as error only once
+  const auto error_timestamp = get_log_timestamp(
+      router.get_logfile_path(),
+      std::string{".*metadata_cache ERROR.*"} + fail_msg, 1, 20 * ttl_);
+  EXPECT_TRUE(error_timestamp);
+  EXPECT_FALSE(get_log_timestamp(
+      router.get_logfile_path(),
+      std::string{".*metadata_cache ERROR.*"} + fail_msg, 2, 20 * ttl_));
+  // After logging an error next logs should be debug (unless the server state
+  // changes)
+  const auto debug_timestamp = get_log_timestamp(
+      router.get_logfile_path(),
+      std::string{".*metadata_cache DEBUG.*"} + fail_msg, 1, 20 * ttl_);
+  EXPECT_TRUE(debug_timestamp);
+  EXPECT_GT(debug_timestamp.value(), error_timestamp.value());
+
+  // Launch metadata server
+  const auto http_port = cluster_nodes_http_ports[0];
+  auto &server = launch_mysql_server_mock(
+      get_data_dir().join("metadata_dynamic_nodes.js").str(),
+      cluster_nodes_ports[0], EXIT_SUCCESS, false, http_port);
+  ASSERT_NO_FATAL_FAILURE(check_port_ready(server, cluster_nodes_ports[0]));
+  EXPECT_TRUE(MockServerRestClient(http_port).wait_for_rest_endpoint_ready());
+  set_mock_metadata(http_port, "", cluster_nodes_ports);
+  wait_for_transaction_count_increase(http_port);
+
+  // We report to log info that we have connected only if there was an error,
+  // otherwise those reports should be treated as debug
+  const auto connect_msg = "Connected with metadata server";
+  EXPECT_TRUE(get_log_timestamp(
+      router.get_logfile_path(),
+      std::string{".*metadata_cache INFO.*"} + connect_msg, 1, 20 * ttl_));
+  EXPECT_FALSE(get_log_timestamp(
+      router.get_logfile_path(),
+      std::string{".*metadata_cache INFO.*"} + connect_msg, 3, 5 * ttl_));
+  EXPECT_TRUE(get_log_timestamp(
+      router.get_logfile_path(),
+      std::string{".*metadata_cache DEBUG.*"} + connect_msg, 1, 20 * ttl_));
+
+  server.send_clean_shutdown_event();
+  server.wait_for_exit();
+  std::this_thread::sleep_for(ttl_);
+  // Log error after server was shut down
+  EXPECT_TRUE(get_log_timestamp(
+      router.get_logfile_path(),
+      std::string{".*metadata_cache ERROR.*"} + fail_msg, 2, 20 * ttl_));
 }
 
 /**
@@ -2093,53 +2151,64 @@
   set_mock_metadata(http_port, "", cluster_nodes_ports);
 
   // launch the router with metadata-cache configuration
-  /* auto &router = */ ProcessManager::launch_router(
+  auto &router = ProcessManager::launch_router(
       {"-c", init_keyring_and_config_file(conf_dir.name())}, EXIT_SUCCESS, true,
       false, -1s);
 
-  // expect something like this to appear on STDERR
-  // 2017-12-21 17:22:35 metadata_cache WARNING [7ff0bb001700] Failed connecting
-  // with Metadata Server 127.0.0.1:7002: Can't connect to MySQL server on
-  // '127.0.0.1' (111) (2003)
-  auto info_matcher = [&](const std::string &line) -> bool {
-    return line.find("metadata_cache WARNING") != line.npos &&
-           line.find("Failed connecting with Metadata Server 127.0.0.1:" +
-                     std::to_string(cluster_nodes_ports[0])) != line.npos;
-  };
-
-  EXPECT_TRUE(find_in_file(get_logging_dir().str() + "/mysqlrouter.log",
-                           info_matcher, 10s));
-
-  auto warning_matcher = [](const std::string &line) -> bool {
-    return line.find("metadata_cache WARNING") != line.npos &&
-           line.find(
-               "While updating metadata, could not establish a connection to "
-               "replicaset") != line.npos;
-  };
-  EXPECT_TRUE(find_in_file(get_logging_dir().str() + "/mysqlrouter.log",
-                           warning_matcher, 10s));
+  // expect something like this to appear on STDERR:
+  //
+  // - ... metadata_cache WARNING ... Failed connecting with Metadata Server
+  //   localhost:7002: Can't connect to MySQL server on '127.0.0.1' (111) (2003)
+  // - ... metadata_cache WARNING ... While updating metadata, could ...
+  const auto connection_failed_msg =
+      "Failed connecting with Metadata Server localhost:" +
+      std::to_string(cluster_nodes_ports[0]);
+  const auto update_failed_msg =
+      "While updating metadata, could not establish a connection to cluster "
+      "'test' through .*" +
+      std::to_string(cluster_nodes_ports[0]);
+
+  EXPECT_TRUE(get_log_timestamp(
+      router.get_logfile_path(),
+      std::string{".*metadata_cache WARNING.*"} + update_failed_msg, 1,
+      20 * ttl_));
+  EXPECT_TRUE(get_log_timestamp(
+      router.get_logfile_path(),
+      std::string{".*metadata_cache WARNING.*"} + connection_failed_msg, 1,
+      20 * ttl_));
+  EXPECT_FALSE(get_log_timestamp(
+      router.get_logfile_path(),
+      std::string{".*metadata_cache WARNING.*"} + connection_failed_msg, 2,
+      5 * ttl_));
+  EXPECT_TRUE(get_log_timestamp(
+      router.get_logfile_path(),
+      std::string{".*metadata_cache DEBUG.*"} + connection_failed_msg, 1,
+      20 * ttl_));
+
+  server.send_clean_shutdown_event();
+  server.wait_for_exit();
+
+  auto &new_server = launch_mysql_server_mock(
+      get_data_dir().join("metadata_dynamic_nodes.js").str(),
+      cluster_nodes_ports[0], EXIT_SUCCESS, false, cluster_nodes_http_ports[0]);
+  ASSERT_NO_FATAL_FAILURE(check_port_ready(new_server, cluster_nodes_ports[0]));
+  EXPECT_TRUE(MockServerRestClient(cluster_nodes_http_ports[0])
+                  .wait_for_rest_endpoint_ready());
+  set_mock_metadata(cluster_nodes_http_ports[0], "", cluster_nodes_ports);
+  wait_for_transaction_count_increase(cluster_nodes_http_ports[0]);
+
+  const auto connect_msg = "Connected with metadata server running on .*" +
+                           std::to_string(cluster_nodes_ports[0]);
+  EXPECT_TRUE(get_log_timestamp(
+      router.get_logfile_path(),
+      std::string{".*metadata_cache INFO.*"} + connect_msg, 1, 20 * ttl_));
+  EXPECT_TRUE(get_log_timestamp(
+      router.get_logfile_path(),
+      std::string{".*metadata_cache DEBUG.*"} + connect_msg, 1, 20 * ttl_));
 }
 
 #ifndef _WIN32
 
-template <class F>
-bool retry_for(F &&f, std::chrono::milliseconds duration) {
-  using clock_type = std::chrono::steady_clock;
-
-  auto sleep_time = duration / 10;
-  auto end_time = clock_type::now() + duration;
-
-  do {
-    auto res = f();
-
-    if (res) return true;
-
-    RouterComponentTest::sleep_for(sleep_time);
-  } while (clock_type::now() < end_time);
-
-  return false;
-}
-
 /**
  * @test Checks that the logs rotation works (meaning Router will recreate
  * it's log file when it was moved and HUP singnal was sent to the Router).
diff -Nru mysql-8.0-8.0.26/router/tests/component/test_metadata_http_auth_backend.cc mysql-8.0-8.0.27/router/tests/component/test_metadata_http_auth_backend.cc
--- mysql-8.0-8.0.26/router/tests/component/test_metadata_http_auth_backend.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/test_metadata_http_auth_backend.cc	2021-09-28 11:46:34.000000000 +0000
@@ -186,7 +186,7 @@
       const std::vector<Auth_data> &auth_data_collection,
       const uint16_t http_port, const std::string &gr_id,
       const uint16_t cluster_node_port, const bool error_on_md_query = false,
-      const unsigned primary_id = 0, const unsigned view_id = 0,
+      const unsigned primary_id = 0, const uint64_t view_id = 0,
       const mysqlrouter::MetadataSchemaVersion md_version = {2, 0, 3}) const {
     auto json_doc = mock_GR_metadata_as_json(
         gr_id, {cluster_node_port}, primary_id, view_id, error_on_md_query);
@@ -286,7 +286,7 @@
   static const std::chrono::milliseconds kAuthCacheRefreshRate;
   static const std::string cluster_id;
   TempDirectory temp_test_dir;
-  unsigned view_id = 1;
+  uint64_t view_id = 1;
 
   ProcessWrapper *cluster_node;
   uint16_t cluster_node_port;
diff -Nru mysql-8.0-8.0.26/router/tests/component/test_metadata_ttl.cc mysql-8.0-8.0.27/router/tests/component/test_metadata_ttl.cc
--- mysql-8.0-8.0.26/router/tests/component/test_metadata_ttl.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/test_metadata_ttl.cc	2021-09-28 11:46:34.000000000 +0000
@@ -76,7 +76,8 @@
            "router_id=1\n"
            "bootstrap_server_addresses=" +
            bootstrap_server_addresses + "\n" +
-           "user=mysql_router1_user\n"
+           "user=" + router_metadata_username +
+           "\n"
            "connect_timeout=1\n"
            "metadata_cluster=test\n" +
            (ttl.empty() ? "" : std::string("ttl=" + ttl + "\n")) + "\n";
@@ -124,8 +125,8 @@
     return get_int_field_value(json_string, "md_query_count");
   }
 
-  int get_update_version_count(const std::string &json_string) {
-    return get_int_field_value(json_string, "update_version_count");
+  int get_update_attributes_count(const std::string &json_string) {
+    return get_int_field_value(json_string, "update_attributes_count");
   }
 
   int get_update_last_check_in_count(const std::string &json_string) {
@@ -156,6 +157,8 @@
 
     return router;
   }
+
+  const std::string router_metadata_username{"mysql_router1_user"};
 };
 
 struct MetadataTTLTestParams {
@@ -218,77 +221,6 @@
   return a <= arg && arg <= b;
 }
 
-// Wait for the nth occurence of the log_regex in the log_file with the timeout
-// If it's found returns the full line containing the log_regex
-// If the timeout has been reached returns unexpected
-static stdx::expected<std::string, void> wait_log_line(
-    const std::string &log_file, const std::string &log_regex,
-    const unsigned n_occurence = 1,
-    const std::chrono::milliseconds timeout = 1s) {
-  const auto start_timestamp = std::chrono::steady_clock::now();
-  const auto kStep = 50ms;
-
-  do {
-    std::istringstream ss{get_file_output(log_file)};
-
-    unsigned current_occurence = 0;
-    for (std::string line; std::getline(ss, line);) {
-      if (pattern_found(line, log_regex)) {
-        current_occurence++;
-        if (current_occurence == n_occurence) return {line};
-      }
-    }
-
-    if (std::chrono::duration_cast<std::chrono::milliseconds>(
-            std::chrono::steady_clock::now() - start_timestamp) >= timeout) {
-      return stdx::make_unexpected();
-    }
-    std::this_thread::sleep_for(kStep);
-  } while (true);
-}
-
-// Wait for the nth occurence of the log_regex in the log_file with timeout
-// If it's found returns the timepoint from the matched line prefix
-// If timed out or failed to convert the timestamp returns unexpected
-static stdx::expected<std::chrono::time_point<std::chrono::system_clock>, void>
-get_log_timestamp(const std::string &log_file, const std::string &log_regex,
-                  const unsigned occurence = 1,
-                  const std::chrono::milliseconds timeout = 1s) {
-  // first wait for the nth occurence of the pattern
-  const auto log_line = wait_log_line(log_file, log_regex, occurence, timeout);
-  if (!log_line) {
-    return log_line.get_unexpected();
-  }
-
-  const std::string log_line_str = log_line.value();
-  // make sure the line is prefixed with the expected timestamp
-  // 2020-06-09 03:53:26.027 foo bar
-  if (!pattern_found(log_line_str,
-                     "^\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}\\.\\d{3}.*")) {
-    return stdx::make_unexpected();
-  }
-
-  // extract the timestamp prefix and conver to the duration
-  std::string timestamp_str =
-      log_line_str.substr(0, strlen("2020-06-09 03:53:26.027"));
-  std::tm tm{};
-#ifdef HAVE_STRPTIME
-  char *rest = strptime(timestamp_str.c_str(), "%Y-%m-%d %H:%M:%S", &tm);
-  assert(*rest == '.');
-  int milliseconds = atoi(++rest);
-#else
-  std::stringstream timestamp_ss(timestamp_str);
-  char dot;
-  unsigned milliseconds;
-  timestamp_ss >> std::get_time(&tm, "%Y-%m-%d %H:%M:%S") >> dot >>
-      milliseconds;
-#endif
-  auto result = std::chrono::system_clock::from_time_t(std::mktime(&tm));
-  result += std::chrono::milliseconds(milliseconds);
-
-  return result;
-}
-
 TEST_P(MetadataChacheTTLTestParam, CheckTTLValid) {
   auto test_params = GetParam();
 
@@ -427,17 +359,6 @@
                               ClusterType::GR_V2, "1,1")),
     get_test_description);
 
-static size_t count_str_occurences(const std::string &s,
-                                   const std::string &needle) {
-  if (needle.length() == 0) return 0;
-  size_t result = 0;
-  for (size_t pos = s.find(needle); pos != std::string::npos;) {
-    ++result;
-    pos = s.find(needle, pos + needle.length());
-  }
-  return result;
-}
-
 class MetadataChacheTTLTestInstanceListUnordered
     : public MetadataChacheTTLTest,
       public ::testing::WithParamInterface<MetadataTTLTestParams> {};
@@ -625,6 +546,7 @@
       public ::testing::WithParamInterface<MetadataTTLTestParams> {};
 
 TEST_P(CheckRouterVersionUpdateOnceTest, CheckRouterVersionUpdateOnce) {
+  const auto router_port = port_pool_.get_next_available();
   SCOPED_TRACE(
       "// launch the server mock (it's our metadata server and single cluster "
       "node)");
@@ -637,16 +559,21 @@
       json_metadata, md_server_port, EXIT_SUCCESS, false, md_server_http_port);
 
   SCOPED_TRACE(
-      "// let's tell the mock which version it should expect so that it does "
+      "// let's tell the mock which attributes it should expect so that it "
+      "does "
       "the strict sql matching for us");
   auto globals = mock_GR_metadata_as_json("", {md_server_port});
   JsonAllocator allocator;
   globals.AddMember("router_version", MYSQL_ROUTER_VERSION, allocator);
+  globals.AddMember("router_rw_classic_port", router_port, allocator);
+  globals.AddMember("router_metadata_user",
+                    JsonValue(router_metadata_username.c_str(),
+                              router_metadata_username.length(), allocator),
+                    allocator);
   const auto globals_str = json_to_string(globals);
   MockServerRestClient(md_server_http_port).set_globals(globals_str);
 
   SCOPED_TRACE("// launch the router with metadata-cache configuration");
-  const auto router_port = port_pool_.get_next_available();
 
   const std::string metadata_cache_section = get_metadata_cache_section(
       {md_server_port}, GetParam().cluster_type, GetParam().ttl);
@@ -661,8 +588,8 @@
   SCOPED_TRACE("// we still expect the version to be only set once");
   std::string server_globals =
       MockServerRestClient(md_server_http_port).get_globals_as_json_string();
-  const int version_upd_count = get_update_version_count(server_globals);
-  EXPECT_EQ(1, version_upd_count);
+  const int attributes_upd_count = get_update_attributes_count(server_globals);
+  EXPECT_EQ(1, attributes_upd_count);
 
   SCOPED_TRACE(
       "// Let's check if the first query is starting a trasaction and the "
@@ -713,7 +640,8 @@
     : public MetadataChacheTTLTest,
       public ::testing::WithParamInterface<MetadataTTLTestParams> {};
 
-TEST_P(PermissionErrorOnVersionUpdateTest, PermissionErrorOnVersionUpdate) {
+TEST_P(PermissionErrorOnVersionUpdateTest, PermissionErrorOnAttributesUpdate) {
+  const auto router_port = port_pool_.get_next_available();
   SCOPED_TRACE(
       "// launch the server mock (it's our metadata server and single cluster "
       "node)");
@@ -726,18 +654,23 @@
       json_metadata, md_server_port, EXIT_SUCCESS, false, md_server_http_port);
 
   SCOPED_TRACE(
-      "// let's tell the mock which version it should expect so that it does "
-      "the strict sql matching for us, also tell it to issue the permission "
-      "error on the update attempt");
+      "// let's tell the mock which attributes it should expect so that it "
+      "does the strict sql matching for us, also tell it to issue the "
+      "permission error on the update attempt");
   auto globals = mock_GR_metadata_as_json("", {md_server_port});
   JsonAllocator allocator;
   globals.AddMember("router_version", MYSQL_ROUTER_VERSION, allocator);
+  globals.AddMember("router_rw_classic_port", router_port, allocator);
+  globals.AddMember("router_metadata_user",
+                    JsonValue(router_metadata_username.c_str(),
+                              router_metadata_username.length(), allocator),
+                    allocator);
+
   globals.AddMember("perm_error_on_version_update", 1, allocator);
   const auto globals_str = json_to_string(globals);
   MockServerRestClient(md_server_http_port).set_globals(globals_str);
 
   SCOPED_TRACE("// launch the router with metadata-cache configuration");
-  const auto router_port = port_pool_.get_next_available();
 
   const std::string metadata_cache_section = get_metadata_cache_section(
       {md_server_port}, GetParam().cluster_type, GetParam().ttl);
@@ -751,10 +684,10 @@
   EXPECT_TRUE(wait_for_transaction_count_increase(md_server_http_port, 3));
 
   SCOPED_TRACE(
-      "// we expect the error trying to update the version in the log");
+      "// we expect the error trying to update the attributes in the log");
   const std::string log_content = router.get_full_logfile();
   const std::string pattern =
-      "Updating the router version in metadata failed:.*\n"
+      "Updating the router attributes in metadata failed:.*\n"
       "Make sure to follow the correct steps to upgrade your metadata.\n"
       "Run the dba.upgradeMetadata\\(\\) then launch the new Router version "
       "when prompted";
@@ -765,8 +698,8 @@
       "even tho it failed");
   std::string server_globals =
       MockServerRestClient(md_server_http_port).get_globals_as_json_string();
-  const int version_upd_count = get_update_version_count(server_globals);
-  EXPECT_EQ(1, version_upd_count);
+  const int attributes_upd_count = get_update_attributes_count(server_globals);
+  EXPECT_EQ(1, attributes_upd_count);
 
   SCOPED_TRACE(
       "// It should still not be fatal, the router should accept the "
@@ -1029,13 +962,14 @@
   void set_nodes_attributes(const std::vector<std::string> &nodes_attributes,
                             const bool no_primary = false) {
     const auto primary_id = no_primary ? -1 : 0;
+
     ASSERT_NO_THROW({
       set_mock_metadata(node_http_ports[0], "", node_ports, primary_id, 0,
                         false, node_hostname, {}, nodes_attributes);
     });
 
     try {
-      ASSERT_TRUE(wait_for_transaction_count_increase(node_http_ports[0], 2));
+      ASSERT_TRUE(wait_for_transaction_count_increase(node_http_ports[0], 3));
     } catch (const std::exception &e) {
       FAIL() << "failed waiting for trans' count increase: " << e.what();
     };
diff -Nru mysql-8.0-8.0.26/router/tests/component/test_mock_server.cc mysql-8.0-8.0.27/router/tests/component/test_mock_server.cc
--- mysql-8.0-8.0.26/router/tests/component/test_mock_server.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/test_mock_server.cc	2021-09-28 11:46:34.000000000 +0000
@@ -27,6 +27,8 @@
 
 #include "mysql_session.h"
 #include "mysqlxclient.h"
+#include "mysqlxclient/xerror.h"
+#include "mysqlxclient/xrow.h"
 #include "router_component_test.h"
 #include "router_config.h"
 #include "tcp_port_pool.h"
@@ -34,6 +36,42 @@
 using namespace std::chrono_literals;
 using namespace std::string_literals;
 
+const char *xcl_column_type_to_string(xcl::Column_type type) {
+  switch (type) {
+    case xcl::Column_type::BIT:
+      return "BIT";
+    case xcl::Column_type::BYTES:
+      return "BYTES";
+    case xcl::Column_type::DATETIME:
+      return "DATETIME";
+    case xcl::Column_type::DECIMAL:
+      return "DECIMAL";
+    case xcl::Column_type::SET:
+      return "SET";
+    case xcl::Column_type::ENUM:
+      return "ENUM";
+    case xcl::Column_type::TIME:
+      return "TIME";
+    case xcl::Column_type::SINT:
+      return "SINT";
+    case xcl::Column_type::UINT:
+      return "UINT";
+    case xcl::Column_type::DOUBLE:
+      return "DOUBLE";
+    case xcl::Column_type::FLOAT:
+      return "FLOAT";
+  }
+
+  return "unknown";
+}
+
+namespace xcl {
+std::ostream &operator<<(std::ostream &os, xcl::Column_type type) {
+  os << xcl_column_type_to_string(type);
+  return os;
+}
+}  // namespace xcl
+
 struct MockServerCLITestParam {
   const char *test_name;
 
@@ -58,8 +96,7 @@
                              GetParam().expected_exit_code, true);
 
   SCOPED_TRACE("// wait for exit");
-  check_exit_code(cmd, GetParam().expected_exit_code,
-                  1000ms);  // should be quick, and return 0
+  check_exit_code(cmd, GetParam().expected_exit_code, 5s);
   SCOPED_TRACE("// checking stdout");
 
   GetParam().checker(cmd.get_full_output());
@@ -370,8 +407,7 @@
   cmdline_args.push_back(std::to_string(bind_port));
 
   SCOPED_TRACE("// start binary");
-  launch_command(mysql_server_mock_path, cmdline_args, EXIT_SUCCESS, true,
-                 1000ms);
+  launch_command(mysql_server_mock_path, cmdline_args, EXIT_SUCCESS, true, 1s);
 
   SCOPED_TRACE("// checking "s + GetParam().test_name);
   classic_protocol_connect_ok(config.at("hostname"), bind_port);
@@ -403,8 +439,7 @@
   cmdline_args.push_back(std::to_string(bind_port));
 
   SCOPED_TRACE("// start binary");
-  launch_command(mysql_server_mock_path, cmdline_args, EXIT_SUCCESS, true,
-                 1000ms);
+  launch_command(mysql_server_mock_path, cmdline_args, EXIT_SUCCESS, true, 1s);
 
   SCOPED_TRACE("// checking "s + GetParam().test_name);
   x_protocol_connect_ok(config.at("hostname"), bind_port);
@@ -564,8 +599,7 @@
   }
 
   SCOPED_TRACE("// start binary");
-  launch_command(mysql_server_mock_path, cmdline_args, EXIT_SUCCESS, true,
-                 1000ms);
+  launch_command(mysql_server_mock_path, cmdline_args, EXIT_SUCCESS, true, 1s);
 
   SCOPED_TRACE("// checking "s + GetParam().test_name);
   GetParam().checker(config);
@@ -956,6 +990,58 @@
          ASSERT_EQ(e.code(), 2026);
        }
      }},
+    {"xproto_mysqlsh_select_connection_id",
+     {
+         "--filename", "@datadir@/tls_endpoint.js",      //
+         "--module-prefix", "@datadir@",                 //
+         "--xport", "@xport@",                           //
+         "--ssl-mode", "required",                       //
+         "--ssl-ca", "@certdir@/crl-ca-cert.pem",        //
+         "--ssl-key", "@certdir@/crl-server-key.pem",    //
+         "--ssl-cert", "@certdir@/crl-server-cert.pem",  //
+         "--tls-version", "TLSv1.2",                     //
+     },
+     [](const std::map<std::string, std::string> &config) {
+       auto sess = xcl::create_session();
+       ASSERT_THAT(
+           sess->set_mysql_option(xcl::XSession::Mysqlx_option::Ssl_mode,
+                                  mysqlrouter::MySQLSession::ssl_mode_to_string(
+                                      SSL_MODE_PREFERRED)),
+           ::testing::Truly([](const xcl::XError &xerr) { return !xerr; }));
+       ASSERT_THAT(
+           sess->connect(config.at("hostname").c_str(),
+                         atol(config.at("xport").c_str()), "someuser",
+                         "somepass", ""),
+           ::testing::Truly([](auto const &err) { return err.error() == 0; }));
+       xcl::XError xerr;
+       auto query_result = sess->execute_sql(
+           "select "
+           "@@lower_case_table_names, @@version, connection_id(), "
+           "variable_value "
+           "from performance_schema.session_status "
+           "where variable_name = 'mysqlx_ssl_cipher'",
+           &xerr);
+
+       ASSERT_TRUE(query_result->has_resultset());
+
+       const auto &meta = query_result->get_metadata();
+       ASSERT_THAT(meta, ::testing::SizeIs(::testing::Eq(4)));
+       EXPECT_EQ(meta[0].type,
+                 xcl::Column_type::SINT);  // lower_case_table_names
+       EXPECT_EQ(meta[1].type, xcl::Column_type::BYTES);  // version
+       EXPECT_EQ(meta[2].type, xcl::Column_type::SINT);   // connection_id
+       EXPECT_EQ(meta[3].type, xcl::Column_type::BYTES);  // cipher
+
+       auto row = query_result->get_next_row();
+       ASSERT_TRUE(row);
+       ASSERT_EQ(row->get_number_of_fields(), 4);
+
+       // check if there something like a version-string in field[1]
+       std::string version_string;
+       ASSERT_TRUE(row->get_string(1, &version_string));
+       ASSERT_THAT(version_string,
+                   ::testing::SizeIs(::testing::Gt(5)));  // x.y.z
+     }},
 };
 
 INSTANTIATE_TEST_CASE_P(Spec, MockServerConnectTest,
diff -Nru mysql-8.0-8.0.26/router/tests/component/test_rest_api.cc mysql-8.0-8.0.27/router/tests/component/test_rest_api.cc
--- mysql-8.0-8.0.26/router/tests/component/test_rest_api.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/test_rest_api.cc	2021-09-28 11:46:34.000000000 +0000
@@ -25,8 +25,6 @@
 #include <thread>
 
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 
@@ -101,7 +99,7 @@
                                            GetParam().expected_content_type));
 
       for (const auto &kv : GetParam().value_checks) {
-        validate_value(json_doc, kv.first, kv.second);
+        ASSERT_NO_FATAL_FAILURE(validate_value(json_doc, kv.first, kv.second));
       }
     }
   }
@@ -293,7 +291,7 @@
      kRestApiUsername,
      kRestApiPassword,
      /*request_authentication =*/true,
-     RestApiComponentTest::kProblemJsonMethodNotAllowed,
+     RestApiComponentTest::get_json_method_not_allowed_verifiers(),
      {}},
 };
 
@@ -320,7 +318,7 @@
      /*username =*/"",
      /*password =*/"",
      /*request_authentication =*/false,
-     RestApiComponentTest::kProblemJsonMethodNotAllowed,
+     RestApiComponentTest::get_json_method_not_allowed_verifiers(),
      {}},
 };
 
diff -Nru mysql-8.0-8.0.26/router/tests/component/test_rest_api_enable.cc mysql-8.0-8.0.27/router/tests/component/test_rest_api_enable.cc
--- mysql-8.0-8.0.26/router/tests/component/test_rest_api_enable.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/test_rest_api_enable.cc	2021-09-28 11:46:34.000000000 +0000
@@ -506,25 +506,18 @@
 /**
  * @test
  * Verify that bootstrap enables REST API by default. 'mysqlrouter.conf' should
- * contain lines required to enable REST API and connecting to REST API
- * should work.
+ * contain lines required to enable REST API.
  *
  * WL13906:TS_FR03_01
  * WL13906:TS_FR05_01
  */
-TEST_F(TestRestApiEnable, ensure_rest_works) {
+TEST_F(TestRestApiEnable, ensure_rest_is_configured_by_default) {
   ASSERT_NO_FATAL_FAILURE(do_bootstrap({/*default command line arguments*/}));
 
   EXPECT_TRUE(certificate_files_exists(
       {cert_file_t::k_ca_key, cert_file_t::k_ca_cert, cert_file_t::k_router_key,
        cert_file_t::k_router_cert}));
   assert_rest_config(config_path, true);
-
-  patch_config_file(config_path.str());
-
-  ProcessManager::launch_router({"-c", config_path.str()});
-
-  assert_rest_works(default_rest_port);
 }
 
 /**
@@ -673,7 +666,8 @@
  */
 TEST_P(RestApiEnableUserCertificates, ensure_rest_works_with_user_certs) {
   create_cert_files(GetParam());
-  auto &router_bootstrap = do_bootstrap({/*default command line arguments*/});
+  auto &router_bootstrap =
+      do_bootstrap({"--https-port", std::to_string(custom_port)});
   const auto expected_message = mysqlrouter::string_format(
       "- Using existing certificates from the '%s' directory",
       datadir_path.real_path().c_str());
@@ -689,7 +683,7 @@
 
   ProcessManager::launch_router({"-c", config_path.str()});
 
-  assert_rest_works(default_rest_port);
+  assert_rest_works(custom_port);
 }
 
 INSTANTIATE_TEST_SUITE_P(
@@ -979,7 +973,7 @@
   setup_mocks(successful_failover);
   auto &router_bootstrap = do_bootstrap({/*default command line arguments*/});
   EXPECT_THAT(router_bootstrap.get_full_output(),
-              ::testing::HasSubstr("trying to connect to another node"));
+              ::testing::HasSubstr("trying to connect to"));
 
   EXPECT_TRUE(certificate_files_exists(
       {cert_file_t::k_ca_key, cert_file_t::k_ca_cert, cert_file_t::k_router_key,
@@ -1015,7 +1009,7 @@
 
   check_exit_code(router_bootstrap, EXIT_FAILURE);
   EXPECT_THAT(router_bootstrap.get_full_output(),
-              ::testing::HasSubstr("trying to connect to another node"));
+              ::testing::HasSubstr("trying to connect to"));
   EXPECT_THAT(router_bootstrap.get_full_output(),
               ::testing::HasSubstr("Account verification failed"));
 
diff -Nru mysql-8.0-8.0.26/router/tests/component/test_rest_metadata_cache.cc mysql-8.0-8.0.27/router/tests/component/test_rest_metadata_cache.cc
--- mysql-8.0-8.0.26/router/tests/component/test_rest_metadata_cache.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/test_rest_metadata_cache.cc	2021-09-28 11:46:34.000000000 +0000
@@ -26,8 +26,6 @@
 #include <thread>
 
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 
@@ -124,7 +122,8 @@
   g_refresh_failed = 0;
   g_time_last_refresh_failed = "";
 
-  fetch_and_validate_schema_and_resource(GetParam(), http_server);
+  ASSERT_NO_FATAL_FAILURE(
+      fetch_and_validate_schema_and_resource(GetParam(), http_server));
 
   // this part is relevant only for Get OK, otherwise let's avoid useless sleep
   if (GetParam().status_code == HttpMethod::Get &&
@@ -134,7 +133,8 @@
 
     // check the resources again, we want to compare them against the previous
     // ones
-    fetch_and_validate_schema_and_resource(GetParam(), http_server);
+    ASSERT_NO_FATAL_FAILURE(
+        fetch_and_validate_schema_and_resource(GetParam(), http_server));
   }
 }
 
@@ -402,7 +402,7 @@
                                   metadata_cache_section_name + "/status"));
   }
 
-  EXPECT_NO_FATAL_FAILURE(
+  ASSERT_NO_FATAL_FAILURE(
       fetch_and_validate_schema_and_resource(GetParam(), router_proc));
 
   // this part is relevant only for Get OK, otherwise let's avoid useless sleep
@@ -413,7 +413,7 @@
 
     // check the resources again, we want to compare them against the previous
     // ones
-    EXPECT_NO_FATAL_FAILURE(
+    ASSERT_NO_FATAL_FAILURE(
         fetch_and_validate_schema_and_resource(GetParam(), router_proc));
   }
 }
@@ -800,7 +800,8 @@
      HttpStatusCode::MethodNotAllowed, kContentTypeJsonProblem,
      kRestApiUsername, kRestApiPassword,
      /*request_authentication =*/true,
-     RestApiComponentTest::kProblemJsonMethodNotAllowed, kMetadataSwaggerPaths},
+     RestApiComponentTest::get_json_method_not_allowed_verifiers(),
+     kMetadataSwaggerPaths},
 
     {"metadata_status_invalid_methods",
      std::string(rest_api_basepath) + "/metadata/" +
@@ -812,7 +813,8 @@
      HttpStatusCode::MethodNotAllowed, kContentTypeJsonProblem,
      kRestApiUsername, kRestApiPassword,
      /*request_authentication =*/true,
-     RestApiComponentTest::kProblemJsonMethodNotAllowed, kMetadataSwaggerPaths},
+     RestApiComponentTest::get_json_method_not_allowed_verifiers(),
+     kMetadataSwaggerPaths},
 
     {"metadata_config_invalid_methods",
      std::string(rest_api_basepath) + "/metadata/" +
@@ -824,7 +826,8 @@
      HttpStatusCode::MethodNotAllowed, kContentTypeJsonProblem,
      kRestApiUsername, kRestApiPassword,
      /*request_authentication =*/true,
-     RestApiComponentTest::kProblemJsonMethodNotAllowed, kMetadataSwaggerPaths},
+     RestApiComponentTest::get_json_method_not_allowed_verifiers(),
+     kMetadataSwaggerPaths},
 };
 
 INSTANTIATE_TEST_SUITE_P(
diff -Nru mysql-8.0-8.0.26/router/tests/component/test_rest_mock_server.cc mysql-8.0-8.0.27/router/tests/component/test_rest_mock_server.cc
--- mysql-8.0-8.0.26/router/tests/component/test_rest_mock_server.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/test_rest_mock_server.cc	2021-09-28 11:46:34.000000000 +0000
@@ -25,8 +25,6 @@
 #include <thread>
 
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 
diff -Nru mysql-8.0-8.0.26/router/tests/component/test_rest_router.cc mysql-8.0-8.0.27/router/tests/component/test_rest_router.cc
--- mysql-8.0-8.0.26/router/tests/component/test_rest_router.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/test_rest_router.cc	2021-09-28 11:46:34.000000000 +0000
@@ -28,8 +28,6 @@
 #include <gmock/gmock.h>
 
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 
@@ -79,7 +77,8 @@
       conf_dir_.name(), mysql_harness::join(config_sections, "\n"))};
   ProcessWrapper &http_server{launch_router({"-c", conf_file})};
 
-  fetch_and_validate_schema_and_resource(GetParam(), http_server);
+  ASSERT_NO_FATAL_FAILURE(
+      fetch_and_validate_schema_and_resource(GetParam(), http_server));
 }
 
 // ****************************************************************************
@@ -197,7 +196,8 @@
      HttpStatusCode::MethodNotAllowed, kContentTypeJsonProblem,
      kRestApiUsername, kRestApiPassword,
      /*request_authentication =*/true,
-     RestApiComponentTest::kProblemJsonMethodNotAllowed, kRouterSwaggerPaths},
+     RestApiComponentTest::get_json_method_not_allowed_verifiers(),
+     kRouterSwaggerPaths},
 };
 
 INSTANTIATE_TEST_SUITE_P(
diff -Nru mysql-8.0-8.0.26/router/tests/component/test_rest_routing.cc mysql-8.0-8.0.27/router/tests/component/test_rest_routing.cc
--- mysql-8.0-8.0.26/router/tests/component/test_rest_routing.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/test_rest_routing.cc	2021-09-28 11:46:34.000000000 +0000
@@ -27,8 +27,6 @@
 
 #include <gmock/gmock.h>
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 #include <rapidjson/document.h>
@@ -222,11 +220,29 @@
       fetch_and_validate_schema_and_resource(GetParam(), http_server));
 }
 
-static const std::vector<
-    std::pair<std::string, RestApiTestParams::value_check_func>>
-get_expected_status_fields(const int expected_active_connections,
-                           const int expected_total_connections,
-                           const int expected_blocked_hosts) {
+static const RestApiComponentTest::json_verifiers_t get_expected_status_fields(
+    const int expected_max_total_connections,
+    const int expected_current_total_connections) {
+  return {
+      {"/maxTotalConnections",
+       [=](const JsonValue *value) {
+         ASSERT_TRUE(value != nullptr);
+         ASSERT_TRUE(value->IsInt());
+         ASSERT_EQ(value->GetInt(), expected_max_total_connections);
+       }},
+      {"/currentTotalConnections",
+       [=](const JsonValue *value) {
+         ASSERT_TRUE(value != nullptr);
+         ASSERT_TRUE(value->IsInt());
+         ASSERT_EQ(value->GetInt(), expected_current_total_connections);
+       }},
+  };
+}
+
+static const RestApiComponentTest::json_verifiers_t
+get_expected_routes_status_fields(const int expected_active_connections,
+                                  const int expected_total_connections,
+                                  const int expected_blocked_hosts) {
   return {
       {"/activeConnections",
        [=](const JsonValue *value) {
@@ -249,8 +265,7 @@
   };
 }
 
-static const std::vector<
-    std::pair<std::string, RestApiTestParams::value_check_func>>
+static const RestApiComponentTest::json_verifiers_t
 get_expected_config_fields() {
   return {
       {"/bindAddress",
@@ -303,9 +318,8 @@
   };
 }
 
-static const std::vector<
-    std::pair<std::string, RestApiTestParams::value_check_func>>
-get_expected_health_fields(const bool expected_alive) {
+static const RestApiComponentTest::json_verifiers_t get_expected_health_fields(
+    const bool expected_alive) {
   return {
       {"/isAlive",
        [=](const JsonValue *value) {
@@ -315,18 +329,16 @@
   };
 }
 
-static const std::vector<
-    std::pair<std::string, RestApiTestParams::value_check_func>>
+static const RestApiComponentTest::json_verifiers_t
 get_expected_destinations_fields(int expected_destinations_num) {
-  std::vector<std::pair<std::string, RestApiTestParams::value_check_func>>
-      result{
-          {"/items",
-           [=](const JsonValue *value) {
-             ASSERT_NE(value, nullptr);
-             ASSERT_TRUE(value->IsArray());
-             ASSERT_EQ(value->GetArray().Size(), expected_destinations_num);
-           }},
-      };
+  RestApiComponentTest::json_verifiers_t result{
+      {"/items",
+       [=](const JsonValue *value) {
+         ASSERT_NE(value, nullptr);
+         ASSERT_TRUE(value->IsArray());
+         ASSERT_EQ(value->GetArray().Size(), expected_destinations_num);
+       }},
+  };
 
   for (int i = 0; i < expected_destinations_num; ++i) {
     result.emplace_back("/items/0/address", [](const JsonValue *value) {
@@ -343,15 +355,14 @@
   return result;
 }
 
-static const std::vector<
-    std::pair<std::string, RestApiTestParams::value_check_func>>
-get_expected_blocked_hosts_fields(const int expected_blocked_hosts) {
-  std::vector<std::pair<std::string, RestApiTestParams::value_check_func>>
-      result{{"/items", [=](const JsonValue *value) {
-                ASSERT_NE(value, nullptr);
-                ASSERT_TRUE(value->IsArray());
-                ASSERT_EQ(value->GetArray().Size(), expected_blocked_hosts);
-              }}};
+static RestApiComponentTest::json_verifiers_t get_expected_blocked_hosts_fields(
+    const int expected_blocked_hosts) {
+  RestApiComponentTest::json_verifiers_t result{
+      {"/items", [=](const JsonValue *value) {
+         ASSERT_NE(value, nullptr);
+         ASSERT_TRUE(value->IsArray());
+         ASSERT_EQ(value->GetArray().Size(), expected_blocked_hosts);
+       }}};
 
   for (int i = 0; i < expected_blocked_hosts; ++i) {
     result.emplace_back(
@@ -364,20 +375,19 @@
   return result;
 }
 
-static const std::vector<
-    std::pair<std::string, RestApiTestParams::value_check_func>>
+static const RestApiComponentTest::json_verifiers_t
 get_expected_connections_fields_fields(const int expected_connection_qty) {
-  std::vector<std::pair<std::string, RestApiTestParams::value_check_func>>
-      result{{"/items", [=](const JsonValue *value) {
-                ASSERT_NE(value, nullptr);
-                ASSERT_TRUE(value->IsArray());
-                // -1 means that we don't really know how many connections are
-                // there, we did wait_for_port_ready on a socket and this can
-                // still be accounted for
-                if (expected_connection_qty >= 0) {
-                  ASSERT_EQ(value->GetArray().Size(), expected_connection_qty);
-                }
-              }}};
+  RestApiComponentTest::json_verifiers_t result{
+      {"/items", [=](const JsonValue *value) {
+         ASSERT_NE(value, nullptr);
+         ASSERT_TRUE(value->IsArray());
+         // -1 means that we don't really know how many connections are
+         // there, we did wait_for_port_ready on a socket and this can
+         // still be accounted for
+         if (expected_connection_qty >= 0) {
+           ASSERT_EQ(value->GetArray().Size(), expected_connection_qty);
+         }
+       }}};
 
   for (int i = 0; i < expected_connection_qty; ++i) {
     result.emplace_back("/items/" + std::to_string(i) + "/bytesToServer",
@@ -422,41 +432,51 @@
 // ****************************************************************************
 
 static const RestApiTestParams rest_api_valid_methods[]{
-    {"routing_status_ro", std::string(rest_api_basepath) + "/routes/ro/status",
+    {"routing_status", std::string(rest_api_basepath) + "/routing/status",
+     "/routing/status", HttpMethod::Get, HttpStatusCode::Ok, kContentTypeJson,
+     kRestApiUsername, kRestApiPassword,
+     /*request_authentication =*/true,
+     get_expected_status_fields(
+         /*expected_max_total_connections=*/512,
+         /*expected_current_total_connections=*/3 + 1),
+     kRoutingSwaggerPaths},
+    {"routing_routes_status_ro",
+     std::string(rest_api_basepath) + "/routes/ro/status",
      "/routes/{routeName}/status", HttpMethod::Get, HttpStatusCode::Ok,
      kContentTypeJson, kRestApiUsername, kRestApiPassword,
      /*request_authentication =*/true,
-     get_expected_status_fields(/*expected_active_connections=*/3,
-                                /*expected_total_connections=*/3,
-                                /*expected_blocked_hosts*=*/0),
+     get_expected_routes_status_fields(/*expected_active_connections=*/3,
+                                       /*expected_total_connections=*/3,
+                                       /*expected_blocked_hosts*=*/0),
      kRoutingSwaggerPaths},
-    {"routing_status__", std::string(rest_api_basepath) + "/routes/_/status",
+    {"routing_routes_status__",
+     std::string(rest_api_basepath) + "/routes/_/status",
      "/routes/{routeName}/status", HttpMethod::Get, HttpStatusCode::Ok,
      kContentTypeJson, kRestApiUsername, kRestApiPassword,
      /*request_authentication =*/true,
-     get_expected_status_fields(/*expected_active_connections=*/0,
-                                /*expected_total_connections=*/0,
-                                /*expected_blocked_hosts*=*/0),
+     get_expected_routes_status_fields(/*expected_active_connections=*/0,
+                                       /*expected_total_connections=*/0,
+                                       /*expected_blocked_hosts*=*/0),
      kRoutingSwaggerPaths},
-    {"routing_status_Aaz",
+    {"routing_routes_status_Aaz",
      std::string(rest_api_basepath) + "/routes/Aaz/status",
      "/routes/{routeName}/status", HttpMethod::Get, HttpStatusCode::Ok,
      kContentTypeJson, kRestApiUsername, kRestApiPassword,
      /*request_authentication =*/true,
-     get_expected_status_fields(/*expected_active_connections=*/1,
-                                /*expected_total_connections=*/1,
-                                /*expected_blocked_hosts*=*/0),
+     get_expected_routes_status_fields(/*expected_active_connections=*/1,
+                                       /*expected_total_connections=*/1,
+                                       /*expected_blocked_hosts*=*/0),
      kRoutingSwaggerPaths},
-    {"routing_status_123",
+    {"routing_routes_status_123",
      std::string(rest_api_basepath) + "/routes/123/status",
      "/routes/{routeName}/status", HttpMethod::Get, HttpStatusCode::Ok,
      kContentTypeJson, kRestApiUsername, kRestApiPassword,
      /*request_authentication =*/true,
-     get_expected_status_fields(/*expected_active_connections=*/0,
-                                /*expected_total_connections=*/3,
-                                /*expected_blocked_hosts*=*/1),
+     get_expected_routes_status_fields(/*expected_active_connections=*/0,
+                                       /*expected_total_connections=*/3,
+                                       /*expected_blocked_hosts*=*/1),
      kRoutingSwaggerPaths},
-    {"routing_status_nonexistent",
+    {"routing_routes_status_nonexistent",
      std::string(rest_api_basepath) + "/routes/nonexistent/status",
      "/routes/{routeName}/status",
      HttpMethod::Get,
@@ -467,7 +487,7 @@
      /*request_authentication =*/true,
      {},
      kRoutingSwaggerPaths},
-    {"routing_status_params",
+    {"routing_routes_status_params",
      std::string(rest_api_basepath) + "/routes/123/status?someparam",
      "/routes/{routeName}/status",
      HttpMethod::Get,
@@ -852,7 +872,8 @@
      HttpStatusCode::MethodNotAllowed, kContentTypeJsonProblem,
      kRestApiUsername, kRestApiPassword,
      /*request_authentication =*/true,
-     RestApiComponentTest::kProblemJsonMethodNotAllowed, kRoutingSwaggerPaths},
+     RestApiComponentTest::get_json_method_not_allowed_verifiers(),
+     kRoutingSwaggerPaths},
     {"routes_invalid_methods", std::string(rest_api_basepath) + "/routes",
      "/routes",
      HttpMethod::Post | HttpMethod::Delete | HttpMethod::Patch |
@@ -861,7 +882,8 @@
      HttpStatusCode::MethodNotAllowed, kContentTypeJsonProblem,
      kRestApiUsername, kRestApiPassword,
      /*request_authentication =*/true,
-     RestApiComponentTest::kProblemJsonMethodNotAllowed, kRoutingSwaggerPaths},
+     RestApiComponentTest::get_json_method_not_allowed_verifiers(),
+     kRoutingSwaggerPaths},
     {"routes_config_invalid_methods",
      std::string(rest_api_basepath) + "/routes/ro/config",
      "/routes/{routeName}/config",
@@ -871,7 +893,8 @@
      HttpStatusCode::MethodNotAllowed, kContentTypeJsonProblem,
      kRestApiUsername, kRestApiPassword,
      /*request_authentication =*/true,
-     RestApiComponentTest::kProblemJsonMethodNotAllowed, kRoutingSwaggerPaths},
+     RestApiComponentTest::get_json_method_not_allowed_verifiers(),
+     kRoutingSwaggerPaths},
     {"routes_health_invalid_methods",
      std::string(rest_api_basepath) + "/routes/ro/health",
      "/routes/{routeName}/health",
@@ -881,7 +904,8 @@
      HttpStatusCode::MethodNotAllowed, kContentTypeJsonProblem,
      kRestApiUsername, kRestApiPassword,
      /*request_authentication =*/true,
-     RestApiComponentTest::kProblemJsonMethodNotAllowed, kRoutingSwaggerPaths},
+     RestApiComponentTest::get_json_method_not_allowed_verifiers(),
+     kRoutingSwaggerPaths},
     {"routes_destinations_invalid_methods",
      std::string(rest_api_basepath) + "/routes/ro/destinations",
      "/routes/{routeName}/destinations",
@@ -891,7 +915,8 @@
      HttpStatusCode::MethodNotAllowed, kContentTypeJsonProblem,
      kRestApiUsername, kRestApiPassword,
      /*request_authentication =*/true,
-     RestApiComponentTest::kProblemJsonMethodNotAllowed, kRoutingSwaggerPaths},
+     RestApiComponentTest::get_json_method_not_allowed_verifiers(),
+     kRoutingSwaggerPaths},
     {"routes_blockedhosts_invalid_methods",
      std::string(rest_api_basepath) + "/routes/ro/blockedHosts",
      "/routes/{routeName}/blockedHosts",
@@ -901,7 +926,8 @@
      HttpStatusCode::MethodNotAllowed, kContentTypeJsonProblem,
      kRestApiUsername, kRestApiPassword,
      /*request_authentication =*/true,
-     RestApiComponentTest::kProblemJsonMethodNotAllowed, kRoutingSwaggerPaths},
+     RestApiComponentTest::get_json_method_not_allowed_verifiers(),
+     kRoutingSwaggerPaths},
     {"routes_connections_invalid_methods",
      std::string(rest_api_basepath) + "/routes/ro/connections",
      "/routes/{routeName}/connections",
@@ -911,7 +937,8 @@
      HttpStatusCode::MethodNotAllowed, kContentTypeJsonProblem,
      kRestApiUsername, kRestApiPassword,
      /*request_authentication =*/true,
-     RestApiComponentTest::kProblemJsonMethodNotAllowed, kRoutingSwaggerPaths},
+     RestApiComponentTest::get_json_method_not_allowed_verifiers(),
+     kRoutingSwaggerPaths},
 };
 
 INSTANTIATE_TEST_SUITE_P(
@@ -1160,29 +1187,37 @@
   EXPECT_NO_THROW(client_rw_2.connect("127.0.0.1", routing_ports_[1], "root",
                                       "fake-pass", "", ""));
 
-  EXPECT_NO_FATAL_FAILURE(
+  ASSERT_NO_FATAL_FAILURE(
       fetch_and_validate_schema_and_resource(GetParam(), http_server));
 }
 
 static const RestApiTestParams rest_api_valid_methods_params_cluster[]{
-    {"routing_rw_status",
+    {"routing_status", std::string(rest_api_basepath) + "/routing/status",
+     "/routing/status", HttpMethod::Get, HttpStatusCode::Ok, kContentTypeJson,
+     kRestApiUsername, kRestApiPassword,
+     /*request_authentication =*/true,
+     get_expected_status_fields(
+         /*expected_max_total_connections=*/512,
+         /*expected_current_total_connections=*/2 + 1),
+     kRoutingSwaggerPaths},
+    {"routing_routes_rw_status",
      std::string(rest_api_basepath) + "/routes/cluster_rw/status",
      "/routes/{routeName}/status", HttpMethod::Get, HttpStatusCode::Ok,
      kContentTypeJson, kRestApiUsername, kRestApiPassword,
      /*request_authentication =*/true,
-     get_expected_status_fields(/*expected_active_connections=*/1,
-                                /*expected_total_connections=*/1,
-                                /*expected_blocked_hosts*=*/0),
+     get_expected_routes_status_fields(/*expected_active_connections=*/1,
+                                       /*expected_total_connections=*/1,
+                                       /*expected_blocked_hosts*=*/0),
      kRoutingSwaggerPaths},
 
-    {"routing_ro_status",
+    {"routing_routes_ro_status",
      std::string(rest_api_basepath) + "/routes/cluster_ro/status",
      "/routes/{routeName}/status", HttpMethod::Get, HttpStatusCode::Ok,
      kContentTypeJson, kRestApiUsername, kRestApiPassword,
      /*request_authentication =*/true,
-     get_expected_status_fields(/*expected_active_connections=*/2,
-                                /*expected_total_connections=*/2,
-                                /*expected_blocked_hosts*=*/0),
+     get_expected_routes_status_fields(/*expected_active_connections=*/2,
+                                       /*expected_total_connections=*/2,
+                                       /*expected_blocked_hosts*=*/0),
      kRoutingSwaggerPaths},
 
     {"cluster_routes",
diff -Nru mysql-8.0-8.0.26/router/tests/component/test_routing.cc mysql-8.0-8.0.27/router/tests/component/test_routing.cc
--- mysql-8.0-8.0.26/router/tests/component/test_routing.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/test_routing.cc	2021-09-28 11:46:34.000000000 +0000
@@ -28,20 +28,25 @@
 #include <string>
 #include <thread>
 
-#include <gmock/gmock.h>
+#include <gmock/gmock-matchers.h>
 #include <gtest/gtest.h>
 
 #include "config_builder.h"
+#include "mysql/harness/net_ts/buffer.h"
 #include "mysql/harness/net_ts/impl/resolver.h"
 #include "mysql/harness/net_ts/impl/socket.h"
+#include "mysql/harness/net_ts/internet.h"
 #include "mysql/harness/stdx/expected.h"
+#include "mysql/harness/stdx/expected_ostream.h"
 #include "mysql_session.h"
+#include "mysqlxclient/xsession.h"
 #include "router_component_test.h"
 #include "router_test_helpers.h"
 #include "socket_operations.h"  // socket_t
 #include "tcp_port_pool.h"
 
 using namespace std::chrono_literals;
+using namespace std::string_literals;
 
 namespace std {
 
@@ -71,7 +76,7 @@
 
   // launch the server mock for bootstrapping
   launch_mysql_server_mock(
-      json_stmts, server_port,
+      json_stmts, server_port, EXIT_SUCCESS,
       false /*expecting huge data, can't print on the console*/);
 
   const std::string routing_section =
@@ -224,7 +229,116 @@
   EXPECT_LT(end - start, client_connect_timeout + 5s);
 }
 
-TEST_F(RouterRoutingTest, RoutingTooManyConnections) {
+/**
+ * check empty packet leads to an error.
+ *
+ * - Bug#33240637 crash when empty packet is sent in first handshake packet
+ */
+TEST_F(RouterRoutingTest, XProtoHandshakeEmpty) {
+  const auto server_classic_port = port_pool_.get_next_available();
+  const auto server_x_port = port_pool_.get_next_available();
+  const auto router_port = port_pool_.get_next_available();
+
+  // doesn't really matter which file we use here, we are not going to do any
+  // queries
+  const std::string json_stmts =
+      get_data_dir().join("handshake_too_many_con_error.js").str();
+
+  // launch the server mock
+  launch_mysql_server_mock(json_stmts, server_classic_port, EXIT_SUCCESS, false,
+                           0, server_x_port);
+
+  const auto routing_section = mysql_harness::ConfigBuilder::build_section(
+      "routing:xproto",
+      {{"bind_port", std::to_string(router_port)},
+       {"mode", "read-write"},
+       {"protocol", "x"},
+       {"destinations", "127.0.0.1:" + std::to_string(server_x_port)}});
+
+  const std::string conf_file =
+      create_config_file(get_test_temp_dir_name(), routing_section);
+
+  // launch the router with simple static routing configuration
+  /*auto &router_static =*/launch_router({"-c", conf_file});
+
+  SCOPED_TRACE("// connect to router");
+
+  net::io_context io_ctx;
+  net::ip::tcp::socket router_sock{io_ctx};
+
+  net::ip::tcp::endpoint router_ep{net::ip::address_v4::loopback(),
+                                   router_port};
+
+  const auto connect_res = router_sock.connect(router_ep);
+  EXPECT_THAT(connect_res,
+              ::testing::Truly([](auto res) { return bool(res); }));
+  const auto write_res =
+      router_sock.write_some(net::buffer("\x00\x00\x00\x00"));
+  EXPECT_THAT(write_res, ::testing::Truly([](auto res) { return bool(res); }));
+
+  {
+    // a notify.
+    std::vector<uint8_t> recv_buf;
+    const auto read_res = net::read(router_sock, net::dynamic_buffer(recv_buf));
+    ASSERT_THAT(read_res, ::testing::Truly([](auto res) { return bool(res); }));
+    EXPECT_THAT(recv_buf, ::testing::SizeIs(
+                              ::testing::Ge(4 + 7)));  // notify (+ error-msg)
+  }
+
+  {
+    std::vector<uint8_t> recv_buf;
+    const auto read_res = net::read(router_sock, net::dynamic_buffer(recv_buf));
+    // the read will either block until the socket is closed or succeed.
+    EXPECT_THAT(read_res, ::testing::AnyOf(::testing::Eq(
+                              stdx::make_unexpected(net::stream_errc::eof))));
+  }
+}
+
+class RouterMaxConnectionsTest : public RouterRoutingTest {
+ public:
+  std::string get_static_routing_section(
+      const std::string &name, uint16_t bind_port, uint16_t server_port,
+      const std::string &protocol, const std::string &custom_settings = "") {
+    const std::string result = "[routing:"s + name +
+                               "]\n"
+                               "bind_port = " +
+                               std::to_string(bind_port) +
+                               "\n"
+                               "mode = read-write\n"
+                               "destinations = 127.0.0.1:" +
+                               std::to_string(server_port) + "\n" +
+                               "protocol=" + protocol + "\n" + custom_settings +
+                               "\n";
+
+    return result;
+  }
+
+  bool make_new_connection(uint16_t port,
+                           const std::chrono::milliseconds timeout = 5s) {
+    const auto start_timestamp = std::chrono::steady_clock::now();
+    const auto kStep = 50ms;
+    mysqlrouter::MySQLSession client;
+
+    do {
+      try {
+        client.connect("127.0.0.1", port, "root", "fake-pass", "", "");
+
+        return true;
+      } catch (...) {
+      }
+
+      if (std::chrono::duration_cast<std::chrono::milliseconds>(
+              std::chrono::steady_clock::now() - start_timestamp) >= timeout) {
+        break;
+      }
+      std::this_thread::sleep_for(kStep);
+    } while (true);
+
+    return false;
+  }
+};
+
+TEST_F(RouterMaxConnectionsTest, RoutingTooManyConnections) {
   const auto server_port = port_pool_.get_next_available();
   const auto router_port = port_pool_.get_next_available();
 
@@ -233,18 +347,11 @@
   const std::string json_stmts = get_data_dir().join("bootstrap_gr.js").str();
 
   // launch the server mock
-  launch_mysql_server_mock(json_stmts, server_port, false);
+  launch_mysql_server_mock(json_stmts, server_port, EXIT_SUCCESS, false);
 
   // create a config with routing that has max_connections == 2
-  const std::string routing_section =
-      "[routing:basic]\n"
-      "bind_port = " +
-      std::to_string(router_port) +
-      "\n"
-      "mode = read-write\n"
-      "max_connections = 2\n"
-      "destinations = 127.0.0.1:" +
-      std::to_string(server_port) + "\n";
+  const std::string routing_section = get_static_routing_section(
+      "A", router_port, server_port, "classic", "max_connections = 2");
 
   TempDirectory conf_dir("conf");
   std::string conf_file = create_config_file(conf_dir.name(), routing_section);
@@ -273,7 +380,7 @@
  *   2. This scenario is not treated as connection error (connection error is
  *      not incremented)
  */
-TEST_F(RouterRoutingTest, RoutingTooManyServerConnections) {
+TEST_F(RouterMaxConnectionsTest, RoutingTooManyServerConnections) {
   const auto server_port = port_pool_.get_next_available();
   const auto router_port = port_pool_.get_next_available();
 
@@ -283,7 +390,7 @@
       get_data_dir().join("handshake_too_many_con_error.js").str();
 
   // launch the server mock
-  launch_mysql_server_mock(json_stmts, server_port, false);
+  launch_mysql_server_mock(json_stmts, server_port, EXIT_SUCCESS, false);
 
   // create a config with routing that has max_connections == 2
   const std::string routing_section =
@@ -326,6 +433,318 @@
   ASSERT_FALSE(pattern_found(log_content, pattern)) << log_content;
 }
 
+/**
+ * @test Verify that max_total_connections configuration options is correctly
+ * honoured.
+ */
+TEST_F(RouterMaxConnectionsTest, RoutingTotalMaxConnectionsExceeded) {
+  const auto server_port = port_pool_.get_next_available();
+  const auto router_portA = port_pool_.get_next_available();
+  const auto router_portB = port_pool_.get_next_available();
+
+  const std::string json_stmts = get_data_dir().join("bootstrap_gr.js").str();
+
+  // launch the server mock
+  launch_mysql_server_mock(json_stmts, server_port, EXIT_SUCCESS, false);
+
+  // create a config with 2 routing sections and max_total_connections = 2
+  const std::string routing_section1 =
+      get_static_routing_section("A", router_portA, server_port, "classic");
+  const std::string routing_section2 =
+      get_static_routing_section("B", router_portB, server_port, "classic");
+
+  TempDirectory conf_dir("conf");
+
+  std::string conf_file = create_config_file(
+      conf_dir.name(), routing_section1 + routing_section2, nullptr,
+      "mysqlrouter.conf", "max_total_connections=2");
+
+  // launch the router with the created configuration
+  auto &router = launch_router({"-c", conf_file});
+
+  // try to create 3 connections, the third should fail
+  // because of the max_connections limit being exceeded
+  mysqlrouter::MySQLSession client1, client2, client3;
+
+  // make 2 connections, one for each routing port
+  EXPECT_NO_THROW(
+      client1.connect("127.0.0.1", router_portA, "root", "fake-pass", "", ""));
+  EXPECT_NO_THROW(
+      client2.connect("127.0.0.1", router_portB, "root", "fake-pass", "", ""));
+
+  // try to connect to both routing ports, it should fail both times,
+  // max_total_connections has been reached
+  ASSERT_THROW_LIKE(
+      client3.connect("127.0.0.1", router_portA, "root", "fake-pass", "", ""),
+      std::runtime_error, "Too many connections to MySQL Router (1040)");
+
+  // The log should contain expected warning message
+  EXPECT_TRUE(
+      wait_log_contains(router,
+                        "WARNING .* \\[routing:A\\] Total connections count=2 "
+                        "exceeds \\[DEFAULT\\].max_total_connections=2",
+                        5s));
+
+  ASSERT_THROW_LIKE(
+      client3.connect("127.0.0.1", router_portB, "root", "fake-pass", "", ""),
+      std::runtime_error, "Too many connections to MySQL Router (1040)");
+
+  EXPECT_TRUE(
+      wait_log_contains(router,
+                        "WARNING .* \\[routing:B\\] Total connections count=2 "
+                        "exceeds \\[DEFAULT\\].max_total_connections=2",
+                        5s));
+
+  // disconnect the first client, now we should be able to connect again
+  client1.disconnect();
+  EXPECT_TRUE(make_new_connection(router_portA));
+}
+
+using XProtocolSession = std::shared_ptr<xcl::XSession>;
+
+static xcl::XError make_x_connection(XProtocolSession &session,
+                                     const std::string &host,
+                                     const uint16_t port,
+                                     const std::string &username,
+                                     const std::string &password) {
+  session = xcl::create_session();
+  xcl::XError err;
+  const auto kConnTimeout = int64_t{10000};  // 10s
+
+  err = session->set_mysql_option(
+      xcl::XSession::Mysqlx_option::Authentication_method, "FROM_CAPABILITIES");
+  if (err) return err;
+
+  err = session->set_mysql_option(xcl::XSession::Mysqlx_option::Ssl_mode,
+                                  "PREFERRED");
+  if (err) return err;
+
+  err = session->set_mysql_option(
+      xcl::XSession::Mysqlx_option::Session_connect_timeout, kConnTimeout);
+  if (err) return err;
+
+  err = session->set_mysql_option(xcl::XSession::Mysqlx_option::Connect_timeout,
+                                  kConnTimeout);
+  if (err) return err;
+
+  return session->connect(host.c_str(), port, username.c_str(),
+                          password.c_str(), "");
+}
+
+/**
+ * @test Check if the Router behavior is correct when the configured sum of all
+ * max_connections per route is higher than max_total_connections
+ */
+TEST_F(RouterMaxConnectionsTest,
+       RoutingRouteMaxConnectionsSumOfAllMaxConsHigherThanMaxTotalConns) {
+  const auto server_classic_port = port_pool_.get_next_available();
+  const auto server_x_port = port_pool_.get_next_available();
+  const auto router_classic_rw_port = port_pool_.get_next_available();
+  const auto router_classic_ro_port = port_pool_.get_next_available();
+  const auto router_x_rw_port = port_pool_.get_next_available();
+  const auto router_x_ro_port = port_pool_.get_next_available();
+
+  const std::string json_stmts = get_data_dir().join("bootstrap_gr.js").str();
+
+  // launch the server mock that will terminate all our classic and x
+  // connections
+  launch_mysql_server_mock(json_stmts, server_classic_port, EXIT_SUCCESS, false,
+                           /*http_port*/ 0, server_x_port);
+
+  // create a configuration with 4 routes (classic rw, ro, x rw, ro)
+  // each has "local" limit of 5 max_connections
+  // the total_max_connections is 10
+  const std::string routing_section_classic_rw = get_static_routing_section(
+      "classic_rw", router_classic_rw_port, server_classic_port, "classic",
+      "max_connections=5");
+  const std::string routing_section_classic_ro = get_static_routing_section(
+      "classic_ro", router_classic_ro_port, server_classic_port, "classic",
+      "max_connections=5");
+
+  const std::string routing_section_x_rw = get_static_routing_section(
+      "x_rw", router_x_rw_port, server_x_port, "x", "max_connections=2");
+  const std::string routing_section_x_ro = get_static_routing_section(
+      "x_ro", router_x_ro_port, server_x_port, "x", "max_connections=2");
+
+  TempDirectory conf_dir("conf");
+
+  std::string conf_file = create_config_file(
+      conf_dir.name(),
+      routing_section_classic_rw + routing_section_classic_ro +
+          routing_section_x_rw + routing_section_x_ro,
+      nullptr, "mysqlrouter.conf", "max_total_connections=10");
+
+  // launch the router with the created configuration
+  launch_router({"-c", conf_file});
+
+  std::list<mysqlrouter::MySQLSession> classic_sessions;
+  // connect 5x to classic rw route, it should be OK
+  for (size_t i = 0; i < 5; ++i) {
+    classic_sessions.emplace_back();
+    auto &new_session = classic_sessions.back();
+    EXPECT_NO_THROW(new_session.connect("127.0.0.1", router_classic_rw_port,
+                                        "root", "fake-pass", "", ""));
+  }
+
+  // the 6th connection should fail, the "local" route connections limit has
+  // been reached
+  mysqlrouter::MySQLSession failed_session;
+  ASSERT_THROW_LIKE(failed_session.connect("127.0.0.1", router_classic_rw_port,
+                                           "root", "fake-pass", "", ""),
+                    std::runtime_error,
+                    "Too many connections to MySQL Router (1040)");
+
+  // connect 5x to classic ro route, it should be OK
+  for (size_t i = 0; i < 5; ++i) {
+    classic_sessions.emplace_back();
+    auto &new_session = classic_sessions.back();
+    EXPECT_NO_THROW(new_session.connect("127.0.0.1", router_classic_ro_port,
+                                        "root", "fake-pass", "", ""));
+  }
+
+  // the 6th connection should fail, both "local" route connections limit and
+  // max_total_connections limits has been reached
+  ASSERT_THROW_LIKE(failed_session.connect("127.0.0.1", router_classic_ro_port,
+                                           "root", "fake-pass", "", ""),
+                    std::runtime_error,
+                    "Too many connections to MySQL Router (1040)");
+
+  // trying to connect to x routes shold fail, as max_total_connections limit
+  // has been reached
+  for (size_t i = 0; i < 5; ++i) {
+    XProtocolSession x_session;
+    const auto res = make_x_connection(x_session, "127.0.0.1", router_x_rw_port,
+                                       "root", "fake-pass");
+    EXPECT_TRUE(res);
+    EXPECT_EQ("Too many connections to MySQL Router"s, res.what());
+  }
+
+  for (size_t i = 0; i < 5; ++i) {
+    XProtocolSession x_session;
+    const auto res = make_x_connection(x_session, "127.0.0.1", router_x_ro_port,
+                                       "root", "fake-pass");
+    EXPECT_TRUE(res);
+    EXPECT_EQ("Too many connections to MySQL Router"s, res.what());
+  }
+}
+
+/**
+ * @test Check if the Router behavior is correct when the configured sum of all
+ * max_connections per route is lower than max_total_connections
+ */
+TEST_F(RouterMaxConnectionsTest,
+       RoutingRouteMaxConnectionsSumOfAllMaxConsLowerThanMaxTotalConns) {
+  const auto server_classic_port = port_pool_.get_next_available();
+  const auto server_x_port = port_pool_.get_next_available();
+  const auto router_classic_rw_port = port_pool_.get_next_available();
+  const auto router_classic_ro_port = port_pool_.get_next_available();
+  const auto router_x_rw_port = port_pool_.get_next_available();
+  const auto router_x_ro_port = port_pool_.get_next_available();
+
+  const std::string json_stmts = get_data_dir().join("bootstrap_gr.js").str();
+
+  // launch the server mock that will terminate all our classic and x
+  // connections
+  launch_mysql_server_mock(json_stmts, server_classic_port, EXIT_SUCCESS, false,
+                           /*http_port*/ 0, server_x_port);
+
+  // create a configuration with 4 routes (classic rw, ro, x rw, ro)
+  // each has "local" limit of 5 max_connections
+  // the total_max_connections is 25
+  const std::string routing_section_classic_rw = get_static_routing_section(
+      "classic_rw", router_classic_rw_port, server_classic_port, "classic",
+      "max_connections=5");
+  const std::string routing_section_classic_ro = get_static_routing_section(
+      "classic_ro", router_classic_ro_port, server_classic_port, "classic",
+      "max_connections=5");
+
+  const std::string routing_section_x_rw = get_static_routing_section(
+      "x_rw", router_x_rw_port, server_x_port, "x", "max_connections=5");
+  const std::string routing_section_x_ro = get_static_routing_section(
+      "x_ro", router_x_ro_port, server_x_port, "x", "max_connections=5");
+
+  TempDirectory conf_dir("conf");
+
+  std::string conf_file = create_config_file(
+      conf_dir.name(),
+      routing_section_classic_rw + routing_section_classic_ro +
+          routing_section_x_rw + routing_section_x_ro,
+      nullptr, "mysqlrouter.conf", "max_total_connections=25");
+
+  // launch the router with the created configuration
+  launch_router({"-c", conf_file});
+
+  std::list<mysqlrouter::MySQLSession> classic_sessions;
+  // connect 5x to classic rw route, it should be OK
+  for (size_t i = 0; i < 5; ++i) {
+    classic_sessions.emplace_back();
+    auto &new_session = classic_sessions.back();
+    EXPECT_NO_THROW(new_session.connect("127.0.0.1", router_classic_rw_port,
+                                        "root", "fake-pass", "", ""));
+  }
+
+  // the 6th connection should fail, the "local" route connections limit has
+  // been reached
+  mysqlrouter::MySQLSession failed_session;
+  ASSERT_THROW_LIKE(failed_session.connect("127.0.0.1", router_classic_rw_port,
+                                           "root", "fake-pass", "", ""),
+                    std::runtime_error,
+                    "Too many connections to MySQL Router (1040)");
+
+  // connect 5x to classic ro route, it should be OK
+  for (size_t i = 0; i < 5; ++i) {
+    classic_sessions.emplace_back();
+    auto &new_session = classic_sessions.back();
+    EXPECT_NO_THROW(new_session.connect("127.0.0.1", router_classic_ro_port,
+                                        "root", "fake-pass", "", ""));
+  }
+
+  // the 6th connection should fail, the "local" route connections limit has
+  // been reached
+  ASSERT_THROW_LIKE(failed_session.connect("127.0.0.1", router_classic_ro_port,
+                                           "root", "fake-pass", "", ""),
+                    std::runtime_error,
+                    "Too many connections to MySQL Router (1040)");
+
+  std::list<XProtocolSession> x_sessions;
+
+  // connect 5x to X rw route, it should be OK
+  for (size_t i = 0; i < 5; ++i) {
+    x_sessions.emplace_back();
+    auto &new_session = x_sessions.back();
+    EXPECT_FALSE(make_x_connection(new_session, "127.0.0.1", router_x_rw_port,
+                                   "root", "fake-pass"));
+  }
+
+  // the 6th connection should fail, the "local" route connections limit has
+  // been reached
+  for (size_t i = 0; i < 1; ++i) {
+    XProtocolSession x_session;
+    const auto res = make_x_connection(x_session, "127.0.0.1", router_x_rw_port,
+                                       "root", "fake-pass");
+    EXPECT_TRUE(res);
+    EXPECT_EQ("Too many connections to MySQL Router"s, res.what());
+  }
+
+  // connect 5x to X ro route, it should be OK
+  for (size_t i = 0; i < 5; ++i) {
+    x_sessions.emplace_back();
+    auto &new_session = x_sessions.back();
+    EXPECT_FALSE(make_x_connection(new_session, "127.0.0.1", router_x_ro_port,
+                                   "root", "fake-pass"));
+  }
+
+  // the 6th connection should fail, the "local" route connections limit has
+  // been reached
+  for (size_t i = 0; i < 1; ++i) {
+    XProtocolSession x_session;
+    const auto res = make_x_connection(x_session, "127.0.0.1", router_x_ro_port,
+                                       "root", "fake-pass");
+    EXPECT_TRUE(res);
+    EXPECT_EQ("Too many connections to MySQL Router"s, res.what());
+  }
+}
+
 template <class T>
 ::testing::AssertionResult ThrowsExceptionWith(std::function<void()> callable,
                                                const char *expected_text) {
@@ -358,6 +777,43 @@
   }
 }
 
+/**
+ * @test Check if the Router logs expected warning if the
+ * routing.max_connections is configured to non-default value that exceeds
+ * max_total_connections
+ */
+TEST_F(RouterMaxConnectionsTest, WarningWhenLocalMaxConGreaterThanTotalMaxCon) {
+  const auto server_classic_port = port_pool_.get_next_available();
+  const auto router_classic_rw_port = port_pool_.get_next_available();
+
+  const std::string json_stmts = get_data_dir().join("bootstrap_gr.js").str();
+
+  // launch the server mock that will terminate all our classic and x
+  // connections
+  launch_mysql_server_mock(json_stmts, server_classic_port, EXIT_SUCCESS, false,
+                           /*http_port*/ 0);
+
+  // create a configuration with 1 route (classic rw) that has  "local" limit of
+  // 600 max_connections the total_max_connections is default 512
+  const std::string routing_section_classic_rw = get_static_routing_section(
+      "classic_rw", router_classic_rw_port, server_classic_port, "classic",
+      "max_connections=600");
+  TempDirectory conf_dir("conf");
+
+  std::string conf_file = create_config_file(
+      conf_dir.name(), routing_section_classic_rw, nullptr, "mysqlrouter.conf");
+
+  // launch the router with the created configuration
+  auto &router = launch_router({"-c", conf_file});
+
+  // The log should contain expected warning message
+  EXPECT_TRUE(wait_log_contains(
+      router,
+      "WARNING .* Value configured for max_connections > max_total_connections "
+      "\\(600 > 512\\)\\. Will have no effect\\.",
+      5s));
+}
+
 #ifndef _WIN32  // named sockets are not supported on Windows;
                 // on Unix, they're implemented using Unix sockets
 TEST_F(RouterRoutingTest, named_socket_has_right_permissions) {
@@ -424,7 +880,7 @@
 
   // launch the server mock for bootstrapping
   launch_mysql_server_mock(
-      json_stmts, server_port,
+      json_stmts, server_port, EXIT_SUCCESS,
       false /*expecting huge data, can't print on the console*/);
 
   const std::string routing_section =
@@ -450,14 +906,8 @@
   //       connection errors counter.  This test relies on that.
   ASSERT_NO_FATAL_FAILURE(check_port_ready(router, router_port));
 
-  // wait until blocking client host info appears in the log
-  bool res =
-      find_in_file(get_logging_dir().str() + "/mysqlrouter.log",
-                   [](const std::string &line) -> bool {
-                     return line.find("blocking client host") != line.npos;
-                   });
-
-  ASSERT_TRUE(res) << "Did not found expected entry in log file";
+  SCOPED_TRACE("// wait until 'blocking client host' appears in the log");
+  ASSERT_TRUE(wait_log_contains(router, "blocking client host", 5000ms));
 
   // for the next connection attempt we should get an error as the
   // max_connect_errors was exceeded
@@ -543,7 +993,7 @@
   const std::string json_stmts = get_data_dir().join("bootstrap_gr.js").str();
 
   // launch the server mock
-  launch_mysql_server_mock(json_stmts, server_port, false);
+  launch_mysql_server_mock(json_stmts, server_port, EXIT_SUCCESS, false);
 
   // create a config with max_connect_errors == 3
   const std::string routing_section =
@@ -1018,6 +1468,133 @@
                          ::testing::ValuesIn(routing_config_param),
                          [](const auto &info) { return info.param.test_name; });
 
+struct RoutingDefaultConfigParam {
+  const char *test_name;
+
+  std::string extra_defaults;
+
+  std::function<void(const std::vector<std::string> &)> checker;
+};
+
+class RoutingDefaultConfigTest
+    : public RouterComponentTest,
+      public ::testing::WithParamInterface<RoutingDefaultConfigParam> {};
+
+TEST_P(RoutingDefaultConfigTest, check) {
+  mysql_harness::ConfigBuilder builder;
+
+  const std::string routing_section = builder.build_section(
+      "routing", {
+                     {"destinations", "127.0.0.1:3306"},
+                     {"bind_address", "127.0.0.1"},
+                     {"routing_strategy", "first-available"},
+                 });
+
+  TempDirectory conf_dir("conf");
+  std::string conf_file =
+      create_config_file(conf_dir.name(), routing_section, nullptr,
+                         "mysqlrouter.conf", GetParam().extra_defaults);
+
+  // launch the router with the created configuration
+  auto &router =
+      launch_router({"-c", conf_file}, EXIT_FAILURE, true, false, -1ms);
+  router.wait_for_exit();
+
+  std::vector<std::string> lines;
+  {
+    std::istringstream ss{router.get_full_logfile()};
+
+    std::string line;
+    while (std::getline(ss, line, '\n')) {
+      lines.push_back(std::move(line));
+    }
+  }
+
+  GetParam().checker(lines);
+}
+
+const RoutingDefaultConfigParam routing_default_config_param[] = {
+    {"max_total_connections_0", "max_total_connections=0",
+     [](const std::vector<std::string> &lines) {
+       EXPECT_THAT(lines,
+                   ::testing::Contains(::testing::HasSubstr(
+                       "Configuration error: "
+                       "[DEFAULT].max_total_connections needs value between 1 "
+                       "and 9223372036854775807 inclusive, was '0'")));
+     }},
+    {"max_total_connections_negative", "max_total_connections=-1",
+     [](const std::vector<std::string> &lines) {
+       EXPECT_THAT(lines,
+                   ::testing::Contains(::testing::HasSubstr(
+                       "Configuration error: "
+                       "[DEFAULT].max_total_connections needs value between 1 "
+                       "and 9223372036854775807 inclusive, was '-1'")));
+     }},
+    {"max_total_connections_too_big",
+     "max_total_connections=9223372036854775808",
+     [](const std::vector<std::string> &lines) {
+       EXPECT_THAT(lines,
+                   ::testing::Contains(::testing::HasSubstr(
+                       "Configuration error: "
+                       "[DEFAULT].max_total_connections needs value between 1 "
+                       "and 9223372036854775807 inclusive, was "
+                       "'9223372036854775808'")));
+     }},
+    {"max_total_connections_comma", "max_total_connections=10,000",
+     [](const std::vector<std::string> &lines) {
+       EXPECT_THAT(lines,
+                   ::testing::Contains(::testing::HasSubstr(
+                       "Configuration error: "
+                       "[DEFAULT].max_total_connections needs value between 1 "
+                       "and 9223372036854775807 inclusive, was "
+                       "'10,000'")));
+     }},
+    {"max_total_connections_yes", "max_total_connections=yes",
+     [](const std::vector<std::string> &lines) {
+       EXPECT_THAT(lines,
+                   ::testing::Contains(::testing::HasSubstr(
+                       "Configuration error: "
+                       "[DEFAULT].max_total_connections needs value between 1 "
+                       "and 9223372036854775807 inclusive, was 'yes'")));
+     }},
+    {"max_total_connections_hex", "max_total_connections=0x7FFFFFFFFFFFFFFF ",
+     [](const std::vector<std::string> &lines) {
+       EXPECT_THAT(
+           lines,
+           ::testing::Contains(::testing::HasSubstr(
+               "Configuration error: "
+               "[DEFAULT].max_total_connections needs value between 1 "
+               "and 9223372036854775807 inclusive, was '0x7FFFFFFFFFFFFFFF'")));
+     }},
+    {"max_total_connections_hex2", "max_total_connections=0x1",
+     [](const std::vector<std::string> &lines) {
+       EXPECT_THAT(lines,
+                   ::testing::Contains(::testing::HasSubstr(
+                       "Configuration error: "
+                       "[DEFAULT].max_total_connections needs value between 1 "
+                       "and 9223372036854775807 inclusive, was '0x1'")));
+     }},
+    {"max_total_connections_inv2", "max_total_connections=12a",
+     [](const std::vector<std::string> &lines) {
+       EXPECT_THAT(lines,
+                   ::testing::Contains(::testing::HasSubstr(
+                       "Configuration error: "
+                       "[DEFAULT].max_total_connections needs value between 1 "
+                       "and 9223372036854775807 inclusive, was '12a'")));
+     }},
+    {"max_total_connections_inv3", "max_total_connections=#^%",
+     [](const std::vector<std::string> &lines) {
+       EXPECT_THAT(lines,
+                   ::testing::Contains(::testing::HasSubstr(
+                       "Configuration error: "
+                       "[DEFAULT].max_total_connections needs value between 1 "
+                       "and 9223372036854775807 inclusive, was '#^%'")));
+     }}};
+
+INSTANTIATE_TEST_SUITE_P(Spec, RoutingDefaultConfigTest,
+                         ::testing::ValuesIn(routing_default_config_param),
+                         [](const auto &info) { return info.param.test_name; });
+
 int main(int argc, char *argv[]) {
   init_windows_sockets();
   ProcessManager::set_origin(Path(argv[0]).dirname());
diff -Nru mysql-8.0-8.0.26/router/tests/component/test_routing_connection.cc mysql-8.0-8.0.27/router/tests/component/test_routing_connection.cc
--- mysql-8.0-8.0.26/router/tests/component/test_routing_connection.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/test_routing_connection.cc	2021-09-28 11:46:34.000000000 +0000
@@ -30,8 +30,6 @@
 #include <gtest/gtest.h>
 
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 #include <rapidjson/document.h>
@@ -633,6 +631,13 @@
     auto &client = client_and_port.first;
     EXPECT_TRUE(wait_connection_dropped(client));
   }
+
+  // check there info about closing invalid connections in the logfile
+  const auto log_content = router.get_full_logfile();
+  const std::string pattern = "INFO .* got request to disconnect " +
+                              std::to_string(clients.size()) + " invalid";
+
+  EXPECT_TRUE(pattern_found(log_content, pattern)) << log_content;
 }
 
 INSTANTIATE_TEST_SUITE_P(
@@ -1317,9 +1322,9 @@
 
   config_generator_->disconnect_on_metadata_unavailable(
       "&disconnect_on_metadata_unavailable=yes");
-  launch_router(router_ro_port_,
-                config_generator_->build_config_file(temp_test_dir_.name(),
-                                                     GetParam().cluster_type));
+  auto &router = launch_router(
+      router_ro_port_, config_generator_->build_config_file(
+                           temp_test_dir_.name(), GetParam().cluster_type));
   EXPECT_TRUE(wait_for_port_not_available(router_rw_port_));
 
   // connect clients
@@ -1360,6 +1365,12 @@
     ASSERT_NO_THROW(std::unique_ptr<MySQLSession::ResultRow> result{
         client.query_one("select @@port")});
   }
+
+  // check there is NO info about closing invalid connections in the logfile
+  const auto log_content = router.get_full_logfile();
+  const std::string pattern = ".* got request to disconnect .* invalid";
+
+  EXPECT_FALSE(pattern_found(log_content, pattern)) << log_content;
 }
 
 MDRefreshTestParam steps[] = {
diff -Nru mysql-8.0-8.0.26/router/tests/component/test_routing_splicer.cc mysql-8.0-8.0.27/router/tests/component/test_routing_splicer.cc
--- mysql-8.0-8.0.26/router/tests/component/test_routing_splicer.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/test_routing_splicer.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1968,6 +1968,7 @@
 
     try {
       const auto row = sess.query_one("show status like 'ssl_cipher'");
+      ASSERT_TRUE(row) << "<show status like 'ssl_cipher'> returned no row";
       ASSERT_EQ(row->size(), 2);
 
       if (GetParam().expect_server_encrypted) {
@@ -2150,7 +2151,8 @@
       if (!result->has_resultset()) {
         FAIL() << xerr.what();
       } else {
-        const auto row = result->get_next_row();
+        const auto row = result->get_next_row(&xerr);
+        ASSERT_TRUE(row) << xerr;
         std::string field;
         ASSERT_TRUE(row->get_string(1, &field));
 
diff -Nru mysql-8.0-8.0.26/router/tests/component/test_shutdown.cc mysql-8.0-8.0.27/router/tests/component/test_shutdown.cc
--- mysql-8.0-8.0.26/router/tests/component/test_shutdown.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/test_shutdown.cc	2021-09-28 11:46:34.000000000 +0000
@@ -34,8 +34,6 @@
 #include <gmock/gmock.h>
 
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 #include <rapidjson/document.h>
diff -Nru mysql-8.0-8.0.26/router/tests/component/test_state_file.cc mysql-8.0-8.0.27/router/tests/component/test_state_file.cc
--- mysql-8.0-8.0.26/router/tests/component/test_state_file.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/component/test_state_file.cc	2021-09-28 11:46:34.000000000 +0000
@@ -29,12 +29,10 @@
 #include <thread>
 
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 
-#include <gmock/gmock.h>
+#include <gmock/gmock-matchers.h>
 #include <gtest/gtest.h>
 #include <rapidjson/document.h>
 #include <rapidjson/error/en.h>
@@ -47,6 +45,7 @@
 #include "keyring/keyring_manager.h"
 #include "mock_server_rest_client.h"
 #include "mock_server_testutils.h"
+#include "mysql/harness/string_utils.h"  // split_string
 #include "mysql_session.h"
 #include "mysqlrouter/cluster_metadata.h"
 #include "mysqlrouter/rest_client.h"
@@ -292,7 +291,7 @@
                     .wait_for_rest_endpoint_ready());
 
     SCOPED_TRACE(
-        "// Make our metadata server to return single node as a replicaset "
+        "// Make our metadata server to return single node as a cluster "
         "member (meaning single metadata server)");
     set_mock_metadata(cluster_http_ports[i], kGroupId,
                       std::vector<uint16_t>{cluster_nodes_ports[i]}, 0, 0,
@@ -322,8 +321,8 @@
       "// Check our state file content, it should not change yet, there is "
       "single metadata server reported as initially");
 
-  check_state_file(state_file, kGroupId, {cluster_nodes_ports[0]}, 0,
-                   node_host);
+  check_state_file(state_file, param.cluster_type, kGroupId,
+                   {cluster_nodes_ports[0]}, 0, node_host);
 
   SCOPED_TRACE(
       "// Now change the response from the metadata server to return 3 gr "
@@ -338,7 +337,7 @@
       "servers");
 
   check_state_file(
-      state_file, kGroupId,
+      state_file, param.cluster_type, kGroupId,
       {cluster_nodes_ports[0], cluster_nodes_ports[1], cluster_nodes_ports[2]},
       0, node_host);
 
@@ -372,7 +371,7 @@
   SCOPED_TRACE(
       "// Check our state file content, it should now contain 2 metadata "
       "servers reported by the second metadata server");
-  check_state_file(state_file, kGroupId,
+  check_state_file(state_file, param.cluster_type, kGroupId,
                    {cluster_nodes_ports[1], cluster_nodes_ports[2]}, 0,
                    node_host, 10000ms);
 }
@@ -422,7 +421,7 @@
       MockServerRestClient(cluster_http_port).wait_for_rest_endpoint_ready());
 
   SCOPED_TRACE(
-      "// Make our metadata server return single node as a replicaset "
+      "// Make our metadata server return single node as a cluster "
       "member (meaning single metadata server)");
 
   set_mock_metadata(cluster_http_port, kGroupId,
@@ -452,8 +451,8 @@
       "// Check our state file content, it should still contain out metadata "
       "server");
 
-  check_state_file(state_file, kGroupId, {cluster_node_port}, 0, "127.0.0.1",
-                   10s);
+  check_state_file(state_file, param.cluster_type, kGroupId,
+                   {cluster_node_port}, 0, "127.0.0.1", 10s);
 
   router.send_shutdown_event();
 
@@ -495,13 +494,13 @@
   auto cluster_node_port = port_pool_.get_next_available();
   auto cluster_http_port = port_pool_.get_next_available();
 
-  SCOPED_TRACE("// Launch  server mock that will act as our metadata server");
+  SCOPED_TRACE("// Launch server mock that will act as our metadata server");
   const auto trace_file = get_data_dir().join(param.trace_file).str();
   /*auto &cluster_node =*/ProcessManager::launch_mysql_server_mock(
       trace_file, cluster_node_port, EXIT_SUCCESS, false, cluster_http_port);
 
   SCOPED_TRACE(
-      "// Make our metadata server to return single node as a replicaset "
+      "// Make our metadata server to return single node as a cluster "
       "member (meaning single metadata server)");
 
   set_mock_metadata(cluster_http_port, kClusterFileGroupId,
@@ -534,7 +533,8 @@
       "We did not found the data for our replication group on any of the "
       "servers so we do not update the metadata srever list.");
 
-  check_state_file(state_file, kStateFileGroupId, {cluster_node_port});
+  check_state_file(state_file, param.cluster_type, kStateFileGroupId,
+                   {cluster_node_port});
 
   SCOPED_TRACE("// We expect an error in the logfile");
   EXPECT_TRUE(wait_log_file_contains(
@@ -645,7 +645,7 @@
   for (unsigned i = 0; i < 2; ++i) {
     node_ports.push_back(cluster_node_ports[i].first);
   }
-  check_state_file(state_file, kClusterGroupId, node_ports);
+  check_state_file(state_file, param.cluster_type, kClusterGroupId, node_ports);
 
   SCOPED_TRACE(
       "// Try to connect to the router port, we expect first port from the "
@@ -895,7 +895,7 @@
             "}",
             // clang-format on
             {"Unsupported state file version, "
-             "expected: 1.0.0, found: 2.0.0"}},
+             "expected: 1.1.0, found: 2.0.0"}},
 
         // major version does not match (AR cluster)
         StateFileSchemaTestParams{
@@ -912,13 +912,13 @@
             "}",
             // clang-format on
             {"Unsupported state file version, "
-             "expected: 1.0.0, found: 2.0.0"}, true, "", false,
+             "expected: 1.1.0, found: 2.0.0"}, true, "", false,
              ClusterType::RS_V2},
 
         // minor version does not match
         StateFileSchemaTestParams{            // clang-format off
         "{"
-          "\"version\": \"1.1.0\","
+          "\"version\": \"1.2.0\","
           "\"metadata-cache\": {"
             "\"group-replication-id\": \"3a0be5af-994c-11e8-9655-0800279e6a88\","
             "\"cluster-metadata-servers\": ["
@@ -929,7 +929,7 @@
         "}",
         // clang-format on
         {"Unsupported state file version, "
-         "expected: 1.0.0, found: 1.1.0"}},
+         "expected: 1.1.0, found: 1.2.0"}},
 
         // both bootstrap_server_addresses and dynamic_state configured
         StateFileSchemaTestParams{
@@ -951,22 +951,23 @@
         true /*use static bootstrap_server_addresses in static conf. file*/},
 
         // group-replication-id filed missing
-        StateFileSchemaTestParams{
-        // clang-format off
-        "{"
-          "\"version\": \"1.0.0\","
-          "\"metadata-cache\": {"
-            "\"cluster-metadata-servers\": ["
-              "\"mysql://localhost:5000\","
-              "\"mysql://127.0.0.1:5001\""
-            "]"
-          "}"
-        "}",
-        // clang-format on
-        {"JSON file failed validation against JSON schema: Failed schema "
-         "directive: #/properties/metadata-cache",
-         "Failed schema keyword:   required",
-         "Failure location in validated document: #/metadata-cache"}},
+        // no longer required
+//        StateFileSchemaTestParams{
+//        // clang-format off
+//        "{"
+//          "\"version\": \"1.0.0\","
+//          "\"metadata-cache\": {"
+//            "\"cluster-metadata-servers\": ["
+//              "\"mysql://localhost:5000\","
+//              "\"mysql://127.0.0.1:5001\""
+//            "]"
+//          "}"
+//        "}",
+//        // clang-format on
+//        {"JSON file failed validation against JSON schema: Failed schema "
+//         "directive: #/properties/metadata-cache",
+//         "Failed schema keyword:   required",
+//         "Failure location in validated document: #/metadata-cache"}},
 
         // cluster-metadata-servers filed missing (GR cluster)
         StateFileSchemaTestParams{
@@ -1076,14 +1077,7 @@
   ASSERT_NO_FATAL_FAILURE(check_exit_code(router, EXIT_FAILURE));
 
   // proper error should get logged
-  const bool found = find_in_file(
-      get_logging_dir().str() + "/mysqlrouter.log",
-      [&](const std::string &line) -> bool {
-        return pattern_found(line, test_params.expected_error);
-      },
-      1ms);
-
-  EXPECT_TRUE(found);
+  EXPECT_TRUE(wait_log_file_contains(router, test_params.expected_error, 1ms));
 }
 
 INSTANTIATE_TEST_SUITE_P(
@@ -1131,28 +1125,23 @@
   router.register_response("Please enter MySQL password for root: ",
                            "fake-pass\n");
 
-  ASSERT_NO_FATAL_FAILURE(check_exit_code(router, EXIT_SUCCESS, 5s));
+  ASSERT_NO_FATAL_FAILURE(check_exit_code(router, EXIT_SUCCESS, 20s));
 
   // check the state file that was produced, if it constains
   // what the bootstrap server has reported
   const std::string state_file = temp_test_dir.name() + "/data/state.json";
-  check_state_file(state_file, "cluster-specific-id", {5500, 5510, 5520}, 0,
-                   "localhost");
+  check_state_file(state_file, ClusterType::GR_V1, "cluster-specific-id",
+                   {5500, 5510, 5520}, 0, "localhost");
 
   // check that static file has a proper reference to the dynamic file
-  const std::string static_conf = temp_test_dir.name() + "/mysqlrouter.conf";
-  const std::string expected_entry =
-      std::string("dynamic_state=") + Path(state_file).real_path().str();
-  const bool found = find_in_file(
-      static_conf,
-      [&](const std::string &line) -> bool {
-        return pattern_found(line, expected_entry);
-      },
-      1ms);
-
-  EXPECT_TRUE(found) << "Did not found: " << expected_entry << "\n"
-                     << get_file_output("mysqlrouter.conf",
-                                        temp_test_dir.name());
+  const std::string conf_content =
+      get_file_output("mysqlrouter.conf", temp_test_dir.name());
+  const std::vector<std::string> lines =
+      mysql_harness::split_string(conf_content, '\n');
+
+  ASSERT_THAT(lines,
+              ::testing::Contains(::testing::HasSubstr(
+                  "dynamic_state=" + Path(state_file).real_path().str())));
 }
 
 /*
@@ -1203,8 +1192,8 @@
   const std::string state_file =
       RouterSystemLayout::tmp_dir_ + "/stage/var/lib/mysqlrouter/state.json";
 
-  check_state_file(state_file, "cluster-specific-id", {5500, 5510, 5520}, 0,
-                   "localhost");
+  check_state_file(state_file, ClusterType::GR_V1, "cluster-specific-id",
+                   {5500, 5510, 5520}, 0, "localhost");
 }
 
 #endif  // SKIP_BOOTSTRAP_SYSTEM_DEPLOYMENT_TESTS
diff -Nru mysql-8.0-8.0.26/router/tests/helpers/mock_server_testutils.cc mysql-8.0-8.0.27/router/tests/helpers/mock_server_testutils.cc
--- mysql-8.0-8.0.26/router/tests/helpers/mock_server_testutils.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/helpers/mock_server_testutils.cc	2021-09-28 11:46:34.000000000 +0000
@@ -31,8 +31,6 @@
 
 #include <gmock/gmock.h>
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 
@@ -53,7 +51,7 @@
 
 JsonValue mock_GR_metadata_as_json(
     const std::string &gr_id, const std::vector<uint16_t> &gr_node_ports,
-    unsigned primary_id, unsigned view_id, bool error_on_md_query,
+    unsigned primary_id, uint64_t view_id, bool error_on_md_query,
     const std::string &gr_node_host,
     const std::vector<uint32_t> &gr_node_xports,
     const std::vector<std::string> &node_attributes) {
@@ -92,7 +90,7 @@
   json_doc.AddMember("gr_nodes", gr_nodes_json, allocator);
   json_doc.AddMember("primary_id", static_cast<int>(primary_id), allocator);
   if (view_id > 0) {
-    json_doc.AddMember("view_id", static_cast<int>(view_id), allocator);
+    json_doc.AddMember("view_id", view_id, allocator);
   }
   json_doc.AddMember("error_on_md_query", error_on_md_query ? 1 : 0, allocator);
   json_doc.AddMember(
@@ -105,7 +103,7 @@
 
 void set_mock_metadata(uint16_t http_port, const std::string &gr_id,
                        const std::vector<uint16_t> &gr_node_ports,
-                       unsigned primary_id, unsigned view_id,
+                       unsigned primary_id, uint64_t view_id,
                        bool error_on_md_query, const std::string &gr_node_host,
                        const std::vector<uint32_t> &gr_node_xports,
                        const std::vector<std::string> &node_attributes) {
diff -Nru mysql-8.0-8.0.26/router/tests/helpers/mock_server_testutils.h mysql-8.0-8.0.27/router/tests/helpers/mock_server_testutils.h
--- mysql-8.0-8.0.26/router/tests/helpers/mock_server_testutils.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/helpers/mock_server_testutils.h	2021-09-28 11:46:34.000000000 +0000
@@ -28,8 +28,6 @@
 #include <chrono>
 
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 
@@ -69,7 +67,7 @@
  */
 JsonValue mock_GR_metadata_as_json(
     const std::string &gr_id, const std::vector<uint16_t> &gr_node_ports,
-    unsigned primary_id = 0, unsigned view_id = 0,
+    unsigned primary_id = 0, uint64_t view_id = 0,
     bool error_on_md_query = false,
     const std::string &gr_node_host = "127.0.0.1",
     const std::vector<uint32_t> &gr_node_xports = {},
@@ -94,7 +92,7 @@
  */
 void set_mock_metadata(uint16_t http_port, const std::string &gr_id,
                        const std::vector<uint16_t> &gr_node_ports,
-                       unsigned primary_id = 0, unsigned view_id = 0,
+                       unsigned primary_id = 0, uint64_t view_id = 0,
                        bool error_on_md_query = false,
                        const std::string &gr_node_host = "127.0.0.1",
                        const std::vector<uint32_t> &gr_node_xports = {},
diff -Nru mysql-8.0-8.0.26/router/tests/helpers/mysql_session_replayer.cc mysql-8.0-8.0.27/router/tests/helpers/mysql_session_replayer.cc
--- mysql-8.0-8.0.26/router/tests/helpers/mysql_session_replayer.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/helpers/mysql_session_replayer.cc	2021-09-28 11:46:34.000000000 +0000
@@ -278,7 +278,7 @@
 unsigned int MySQLSessionReplayer::last_errno() { return last_error_code; }
 
 std::string MySQLSessionReplayer::quote(const std::string &s,
-                                        char qchar) noexcept {
+                                        char qchar) const {
   std::string quoted;
   quoted.push_back(qchar);
   quoted.append(mysqlrouter::escape_sql_string(s));
diff -Nru mysql-8.0-8.0.26/router/tests/helpers/mysql_session_replayer.h mysql-8.0-8.0.27/router/tests/helpers/mysql_session_replayer.h
--- mysql-8.0-8.0.26/router/tests/helpers/mysql_session_replayer.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/helpers/mysql_session_replayer.h	2021-09-28 11:46:34.000000000 +0000
@@ -68,7 +68,7 @@
   virtual unsigned warning_count() noexcept override;
 
   virtual std::string quote(const std::string &s,
-                            char qchar = '\'') noexcept override;
+                            char qchar = '\'') const override;
 
   virtual const char *last_error() override;
   virtual unsigned int last_errno() override;
diff -Nru mysql-8.0-8.0.26/router/tests/helpers/process_manager.cc mysql-8.0-8.0.27/router/tests/helpers/process_manager.cc
--- mysql-8.0-8.0.26/router/tests/helpers/process_manager.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/helpers/process_manager.cc	2021-09-28 11:46:34.000000000 +0000
@@ -29,6 +29,7 @@
 #include <chrono>
 #include <iterator>
 #include <stdexcept>
+#include <string_view>
 #include <system_error>
 #include <thread>
 
@@ -54,7 +55,6 @@
 #include "mysql/harness/net_ts/io_context.h"
 #include "mysql/harness/net_ts/local.h"
 #include "mysql/harness/stdx/expected.h"
-#include "mysql/harness/stdx/string_view.h"
 #include "mysql_session.h"
 #include "mysqlrouter/rest_client.h"
 #include "mysqlrouter/utils.h"
@@ -155,8 +155,8 @@
       const auto bytes_read = read_res.value();
 
       if (bytes_read >= expected_notification.size()) {
-        if (stdx::string_view(expected_notification) ==
-            stdx::string_view(buff.data(), expected_notification.size())) {
+        if (expected_notification ==
+            std::string_view(buff.data(), expected_notification.size())) {
           return {};
         }
       } else {
@@ -199,8 +199,8 @@
       const auto bytes_read = read_res.value();
 
       if (bytes_read >= expected_notification.size()) {
-        if (stdx::string_view(expected_notification) ==
-            stdx::string_view(buff.data(), expected_notification.size())) {
+        if (expected_notification ==
+            std::string_view(buff.data(), expected_notification.size())) {
           return {};
         }
       } else {
diff -Nru mysql-8.0-8.0.26/router/tests/helpers/rest_api_testutils.cc mysql-8.0-8.0.27/router/tests/helpers/rest_api_testutils.cc
--- mysql-8.0-8.0.26/router/tests/helpers/rest_api_testutils.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/helpers/rest_api_testutils.cc	2021-09-28 11:46:34.000000000 +0000
@@ -28,8 +28,6 @@
 
 #include <gmock/gmock.h>
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 
@@ -458,39 +456,53 @@
       }
 
       SCOPED_TRACE("// validating values");
-      for (const auto &kv : test_params.value_checks) {
-        validate_value(json_doc, kv.first, kv.second);
+      // HEAD does not return a body
+      if (method != HttpMethod::Head) {
+        for (const auto &kv : test_params.value_checks) {
+          ASSERT_NO_FATAL_FAILURE(
+              validate_value(json_doc, kv.first, kv.second));
+        }
       }
     }
   }
 }
 
-/*static*/ const std::vector<
-    std::pair<std::string, RestApiTestParams::value_check_func>>
-    RestApiComponentTest::kProblemJsonMethodNotAllowed{
-        {"/status",
-         [](const JsonValue *value) -> void {
-           ASSERT_NE(value, nullptr);
-
-           ASSERT_TRUE(value->IsInt());
-           ASSERT_EQ(value->GetInt(), HttpStatusCode::MethodNotAllowed);
-         }},
-        {"/title",
-         [](const JsonValue *value) -> void {
-           ASSERT_NE(value, nullptr);
-
+RestApiComponentTest::json_verifiers_t
+RestApiComponentTest::get_json_method_not_allowed_verifiers() {
+  static const RestApiComponentTest::json_verifiers_t result{
+      {"/status",
+       [](const JsonValue *value) -> void {
+         ASSERT_NE(value, nullptr);
+
+         ASSERT_TRUE(value->IsInt());
+         ASSERT_EQ(value->GetInt(), HttpStatusCode::MethodNotAllowed);
+       }},
+      {"/title",
+       [](const JsonValue *value) -> void {
+         ASSERT_NE(value, nullptr);
+
+         ASSERT_TRUE(value->IsString());
+         // CONNECT returns "Method Not Allowed"
+         const std::vector<std::string> msgs{"HTTP Method not allowed",
+                                             "Method Not Allowed"};
+         ASSERT_THAT(msgs, ::testing::Contains(value->GetString()));
+       }},
+      {"/detail",
+       [](const JsonValue *value) -> void {
+         // there is no /detail field for CONNECT
+         if (value != nullptr) {
            ASSERT_TRUE(value->IsString());
-           ASSERT_STREQ(value->GetString(), "HTTP Method not allowed");
-         }},
-        {"/detail",
-         [](const JsonValue *value) -> void {
-           ASSERT_NE(value, nullptr);
+           // swagger.json allows HEAD
+           const std::vector<std::string> msgs{
+               "only HTTP Methods GET are supported",
+               "only HTTP Methods GET,HEAD are supported"};
+           ASSERT_THAT(msgs, ::testing::Contains(value->GetString()));
+         }
+       }},
+  };
 
-           ASSERT_TRUE(value->IsString());
-           ASSERT_STREQ(value->GetString(),
-                        "only HTTP Methods GET,HEAD are supported");
-         }},
-    };
+  return result;
+}
 
 void RestApiComponentTest::validate_value(
     const JsonDocument &json_doc, const std::string &value_json_pointer,
diff -Nru mysql-8.0-8.0.26/router/tests/helpers/rest_api_testutils.h mysql-8.0-8.0.27/router/tests/helpers/rest_api_testutils.h
--- mysql-8.0-8.0.26/router/tests/helpers/rest_api_testutils.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/helpers/rest_api_testutils.h	2021-09-28 11:46:34.000000000 +0000
@@ -28,8 +28,6 @@
 #include <chrono>
 
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 
@@ -237,9 +235,10 @@
                       const std::string &value_json_pointer,
                       const RestApiTestParams::value_check_func value_check);
 
-  static const std::vector<
-      std::pair<std::string, RestApiTestParams::value_check_func>>
-      kProblemJsonMethodNotAllowed;
+  using json_verifiers_t =
+      std::vector<std::pair<std::string, RestApiTestParams::value_check_func>>;
+
+  static json_verifiers_t get_json_method_not_allowed_verifiers();
 
  protected:
   const uint16_t http_port_{port_pool_.get_next_available()};
diff -Nru mysql-8.0-8.0.26/router/tests/helpers/rest_metadata_client.cc mysql-8.0-8.0.27/router/tests/helpers/rest_metadata_client.cc
--- mysql-8.0-8.0.26/router/tests/helpers/rest_metadata_client.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/helpers/rest_metadata_client.cc	2021-09-28 11:46:34.000000000 +0000
@@ -28,8 +28,6 @@
 #include "rest_metadata_client.h"
 
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 
diff -Nru mysql-8.0-8.0.26/router/tests/helpers/router_component_clusterset.cc mysql-8.0-8.0.27/router/tests/helpers/router_component_clusterset.cc
--- mysql-8.0-8.0.26/router/tests/helpers/router_component_clusterset.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/helpers/router_component_clusterset.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,190 @@
+/*
+  Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+
+  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,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "router_component_clusterset.h"
+#include "mock_server_rest_client.h"
+#include "mock_server_testutils.h"
+
+void RouterComponentClusterSetTest::create_clusterset(
+    uint64_t view_id, int target_cluster_id, int primary_cluster_id,
+    const std::string &tracefile, const std::string &router_options,
+    const std::string &expected_target_cluster,
+    bool simulate_cluster_not_found) {
+  const std::string tracefile_path = get_data_dir().str() + "/" + tracefile;
+
+  ClusterSetData clusterset_data;
+
+  clusterset_data.primary_cluster_id = primary_cluster_id;
+
+  // first create a ClusterSet topology
+  for (unsigned cluster_id = 0; cluster_id < kClustersNumber; ++cluster_id) {
+    ClusterData cluster_data;
+    cluster_data.id = cluster_id;
+    cluster_data.primary_node_id = 0;
+    // 0-based -> 1-based
+    const std::string id = std::to_string(cluster_id + 1);
+
+    cluster_data.uuid = "00000000-0000-0000-0000-0000000000c" + id;
+    cluster_data.name = "cluster-name-" + id;
+    cluster_data.gr_uuid = "00000000-0000-0000-0000-0000000000g" + id;
+    for (unsigned node_id = 0; node_id < kNodesPerClusterNumber; ++node_id) {
+      ClusterNode cluster_node;
+      cluster_node.uuid = "00000000-0000-0000-0000-0000000000" +
+                          std::to_string(cluster_id + 1) +
+                          std::to_string(node_id + 1);
+      cluster_node.host = "127.0.0.1";
+      cluster_node.classic_port = port_pool_.get_next_available();
+      cluster_node.http_port = port_pool_.get_next_available();
+
+      cluster_data.nodes.push_back(cluster_node);
+    }
+    clusterset_data.clusters.push_back(cluster_data);
+  }
+
+  change_clusterset_primary(clusterset_data, primary_cluster_id);
+
+  // now launch the mock servers and set their metadata
+  for (unsigned cluster_id = 0; cluster_id < clusterset_data.clusters.size();
+       ++cluster_id) {
+    auto &cluster = clusterset_data.clusters[cluster_id];
+    for (unsigned node_id = 0; node_id < cluster.nodes.size(); ++node_id) {
+      auto &node = cluster.nodes[node_id];
+      node.process =
+          &launch_mysql_server_mock(tracefile_path, node.classic_port,
+                                    EXIT_SUCCESS, false, node.http_port);
+
+      set_mock_metadata(view_id, cluster_id, target_cluster_id, node.http_port,
+                        clusterset_data, router_options,
+                        expected_target_cluster, {2, 1, 0},
+                        simulate_cluster_not_found);
+    }
+  }
+
+  clusterset_data_ = std::move(clusterset_data);
+}
+
+void RouterComponentClusterSetTest::change_clusterset_primary(
+    ClusterSetData &clusterset_data, const unsigned new_primary_id) {
+  for (unsigned cluster_id = 0; cluster_id < clusterset_data.clusters.size();
+       ++cluster_id) {
+    clusterset_data.clusters[cluster_id].role =
+        cluster_id == new_primary_id ? "PRIMARY" : "SECONDARY";
+  }
+}
+
+void RouterComponentClusterSetTest::add_json_str_field(
+    JsonValue &json_doc, const std::string &field, const std::string &value) {
+  json_doc.AddMember(JsonValue(field.c_str(), field.length(), json_allocator),
+                     JsonValue(value.c_str(), value.length(), json_allocator),
+                     json_allocator);
+}
+
+void RouterComponentClusterSetTest::add_json_int_field(JsonValue &json_doc,
+                                                       const std::string &field,
+                                                       const int value) {
+  json_doc.AddMember(JsonValue(field.c_str(), field.length(), json_allocator),
+                     JsonValue(value), json_allocator);
+}
+
+void RouterComponentClusterSetTest::add_clusterset_data_field(
+    JsonValue &json_doc, const std::string &field,
+    const ClusterSetData &clusterset_data, const unsigned this_cluster_id) {
+  JsonValue clusterset_obj(rapidjson::kObjectType);
+  add_json_str_field(clusterset_obj, "clusterset_id", clusterset_data.uuid);
+  add_json_str_field(clusterset_obj, "clusterset_name", "clusterset-name");
+  add_json_int_field(clusterset_obj, "this_cluster_id", this_cluster_id);
+  add_json_int_field(clusterset_obj, "primary_cluster_id",
+                     clusterset_data.primary_cluster_id);
+
+  JsonValue json_array_clusters(rapidjson::kArrayType);
+  for (unsigned cluster_id = 0; cluster_id < clusterset_data.clusters.size();
+       ++cluster_id) {
+    JsonValue cluster_obj(rapidjson::kObjectType);
+    const auto &cluster_data = clusterset_data.clusters[cluster_id];
+
+    add_json_int_field(cluster_obj, "primary_node_id",
+                       cluster_data.primary_node_id);
+    add_json_str_field(cluster_obj, "uuid", cluster_data.uuid);
+    add_json_str_field(cluster_obj, "name", cluster_data.name);
+    add_json_str_field(cluster_obj, "role", cluster_data.role);
+    add_json_str_field(cluster_obj, "gr_uuid", cluster_data.gr_uuid);
+    add_json_int_field(cluster_obj, "invalid", cluster_data.invalid ? 1 : 0);
+
+    JsonValue cluster_nodes_array(rapidjson::kArrayType);
+    for (auto &node_data : cluster_data.nodes) {
+      JsonValue node_obj(rapidjson::kObjectType);
+
+      add_json_str_field(node_obj, "uuid", node_data.uuid);
+      add_json_str_field(node_obj, "host", node_data.host);
+      add_json_int_field(node_obj, "classic_port", node_data.classic_port);
+      add_json_int_field(node_obj, "http_port", node_data.http_port);
+
+      cluster_nodes_array.PushBack(node_obj, json_allocator);
+    }
+
+    cluster_obj.AddMember("nodes", cluster_nodes_array, json_allocator);
+    add_json_int_field(cluster_obj, "primary_node_id",
+                       cluster_data.primary_node_id);
+
+    json_array_clusters.PushBack(cluster_obj, json_allocator);
+  }
+
+  clusterset_obj.AddMember("clusters", json_array_clusters, json_allocator);
+
+  json_doc.AddMember(JsonValue(field.c_str(), field.length(), json_allocator),
+                     clusterset_obj, json_allocator);
+}
+
+void RouterComponentClusterSetTest::set_mock_metadata(
+    uint64_t view_id, unsigned this_cluster_id, unsigned target_cluster_id,
+    uint16_t http_port, const ClusterSetData &clusterset_data,
+    const std::string &router_options /*= ""*/,
+    const std::string &expected_target_cluster /*= ""*/,
+    const mysqlrouter::MetadataSchemaVersion &metadata_version /*= {2, 1, 0}*/,
+    bool simulate_cluster_not_found /* = false*/) {
+  JsonValue json_doc(rapidjson::kObjectType);
+
+  add_clusterset_data_field(json_doc, "clusterset_data", clusterset_data,
+                            this_cluster_id);
+
+  JsonValue md_version(rapidjson::kArrayType);
+  md_version.PushBack(static_cast<int>(metadata_version.major), json_allocator);
+  md_version.PushBack(static_cast<int>(metadata_version.minor), json_allocator);
+  md_version.PushBack(static_cast<int>(metadata_version.patch), json_allocator);
+  json_doc.AddMember("metadata_version", md_version, json_allocator);
+  add_json_int_field(json_doc, "view_id", view_id);
+  add_json_int_field(json_doc, "target_cluster_id", target_cluster_id);
+  add_json_str_field(json_doc, "router_options", router_options);
+  add_json_str_field(json_doc, "router_expected_target_cluster",
+                     expected_target_cluster);
+
+  add_json_int_field(json_doc, "simulate_cluster_not_found",
+                     simulate_cluster_not_found);
+
+  const auto json_str = json_to_string(json_doc);
+
+  //  if (clusterset_data.primary_cluster_id > 0) FAIL() << json_str;
+
+  EXPECT_NO_THROW(MockServerRestClient(http_port).set_globals(json_str));
+}
diff -Nru mysql-8.0-8.0.26/router/tests/helpers/router_component_clusterset.h mysql-8.0-8.0.27/router/tests/helpers/router_component_clusterset.h
--- mysql-8.0-8.0.26/router/tests/helpers/router_component_clusterset.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/helpers/router_component_clusterset.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,155 @@
+/*
+  Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+
+  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,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef _ROUTER_COMPONENT_CLUSTERSET_H_
+#define _ROUTER_COMPONENT_CLUSTERSET_H_
+
+#include <chrono>
+#include <fstream>
+#include <stdexcept>
+#include <thread>
+
+#ifdef RAPIDJSON_NO_SIZETYPEDEFINE
+// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
+// globally and require to include my_rapidjson_size_t.h
+#include "my_rapidjson_size_t.h"
+#endif
+
+#include <rapidjson/document.h>
+#include <rapidjson/error/en.h>
+#include <rapidjson/filereadstream.h>
+#include <rapidjson/prettywriter.h>
+#include <rapidjson/schema.h>
+#include <rapidjson/stringbuffer.h>
+
+#include "mysqlrouter/cluster_metadata.h"
+#include "router_component_test.h"
+
+using mysqlrouter::ClusterType;
+
+namespace {
+// default allocator for rapidJson (MemoryPoolAllocator) is broken for
+// SparcSolaris
+using JsonAllocator = rapidjson::CrtAllocator;
+using JsonValue = rapidjson::GenericValue<rapidjson::UTF8<>, JsonAllocator>;
+using JsonDocument =
+    rapidjson::GenericDocument<rapidjson::UTF8<>, JsonAllocator>;
+using JsonStringBuffer =
+    rapidjson::GenericStringBuffer<rapidjson::UTF8<>, rapidjson::CrtAllocator>;
+}  // namespace
+
+class RouterComponentClusterSetTest : virtual public RouterComponentTest {
+ protected:
+  struct ClusterNode {
+    std::string uuid;
+
+    std::string host;
+    uint16_t classic_port;
+    uint16_t http_port;
+
+    ProcessWrapper *process{nullptr};
+  };
+
+  struct ClusterData {
+    unsigned id;
+
+    std::string uuid;
+    std::string name;
+    std::string gr_uuid;
+    std::string role;  // [PRIMARY, SECONDARY]
+    // cluster is marked as invalid in the metadata
+    bool invalid{false};
+
+    std::vector<ClusterNode> nodes;
+    unsigned primary_node_id;
+  };
+
+  struct ClusterSetData {
+    std::string uuid{"clusterset-uuid"};
+    std::vector<ClusterData> clusters;
+    unsigned primary_cluster_id;
+
+    auto get_all_nodes_classic_ports() const {
+      std::vector<uint16_t> result;
+      for (const auto &cluster : clusters) {
+        for (const auto &node : cluster.nodes) {
+          result.push_back(node.classic_port);
+        }
+      }
+      return result;
+    }
+
+    void remove_node(const std::string &node_uuid) {
+      for (auto &cluster : clusters) {
+        unsigned i = 0;
+        for (const auto &node : cluster.nodes) {
+          if (node.uuid == node_uuid) {
+            cluster.nodes.erase(cluster.nodes.begin() + i);
+            return;
+          }
+          ++i;
+        }
+      }
+    }
+
+    void add_node(const unsigned cluster_id, const ClusterNode &node) {
+      clusters[cluster_id].nodes.push_back(node);
+    }
+  };
+
+  constexpr static unsigned kClustersNumber = 3;
+  constexpr static unsigned kNodesPerClusterNumber = 3;
+
+  void create_clusterset(uint64_t view_id, int target_cluster_id,
+                         int primary_cluster_id, const std::string &tracefile,
+                         const std::string &router_options = "",
+                         const std::string &expected_target_cluster = ".*",
+                         bool simulate_cluster_not_found = false);
+
+  void change_clusterset_primary(ClusterSetData &clusterset_data,
+                                 const unsigned new_primary_id);
+
+  void add_json_str_field(JsonValue &json_doc, const std::string &field,
+                          const std::string &value);
+
+  void add_json_int_field(JsonValue &json_doc, const std::string &field,
+                          const int value);
+
+  void add_clusterset_data_field(JsonValue &json_doc, const std::string &field,
+                                 const ClusterSetData &clusterset_data,
+                                 const unsigned this_cluster_id);
+
+  void set_mock_metadata(
+      uint64_t view_id, unsigned this_cluster_id, unsigned target_cluster_id,
+      uint16_t http_port, const ClusterSetData &clusterset_data,
+      const std::string &router_options = "",
+      const std::string &expected_target_cluster = ".*",
+      const mysqlrouter::MetadataSchemaVersion &metadata_version = {2, 1, 0},
+      bool simulate_cluster_not_found = false);
+
+  ClusterSetData clusterset_data_;
+  JsonAllocator json_allocator;
+};
+
+#endif  // _ROUTER_COMPONENT_CLUSTERSET_H_
diff -Nru mysql-8.0-8.0.26/router/tests/helpers/router_component_test.h mysql-8.0-8.0.27/router/tests/helpers/router_component_test.h
--- mysql-8.0-8.0.26/router/tests/helpers/router_component_test.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/helpers/router_component_test.h	2021-09-28 11:46:34.000000000 +0000
@@ -63,10 +63,9 @@
    * @return bool value indicating if the pattern was found in the log file or
    * not
    */
-  STDX_NODISCARD
-  bool wait_log_contains(const ProcessWrapper &process,
-                         const std::string &pattern,
-                         std::chrono::milliseconds timeout);
+  [[nodiscard]] bool wait_log_contains(const ProcessWrapper &process,
+                                       const std::string &pattern,
+                                       std::chrono::milliseconds timeout);
 
   /** @brief Sleep for a duration given as a parameter. The duration is
    * increased 10 times for the run with VALGRIND.
@@ -100,8 +99,29 @@
     }
   }
 
-  void verify_existing_connection_dropped(MySQLSession *session) {
-    ASSERT_ANY_THROW(session->query_one("select @@port"));
+  void verify_existing_connection_dropped(
+      MySQLSession *session,
+      std::chrono::milliseconds timeout = std::chrono::seconds(5)) {
+    if (getenv("WITH_VALGRIND")) {
+      timeout *= 10;
+    }
+
+    const auto MSEC_STEP = std::chrono::milliseconds(50);
+    const auto started = std::chrono::steady_clock::now();
+    do {
+      try {
+        session->query_one("select @@port");
+      } catch (mysqlrouter::MySQLSession::Error &) {
+        // query failed, connection dropped, all good
+        return;
+      }
+
+      auto step = std::min(timeout, MSEC_STEP);
+      RouterComponentTest::sleep_for(step);
+      timeout -= step;
+    } while (timeout > std::chrono::steady_clock::now() - started);
+
+    FAIL() << "Timed out waiting for the connection to drop";
   }
 
  protected:
@@ -113,7 +133,7 @@
  * Base class for the MySQLRouter component-like bootstrap tests.
  *
  **/
-class RouterComponentBootstrapTest : public RouterComponentTest {
+class RouterComponentBootstrapTest : virtual public RouterComponentTest {
  public:
   static void SetUpTestCase() { my_hostname = "dont.query.dns"; }
 
@@ -147,8 +167,9 @@
       const std::vector<std::tuple<ProcessWrapper &, unsigned int>> &T);
 
   ProcessWrapper &launch_router_for_bootstrap(
-      std::vector<std::string> params, int expected_exit_code = EXIT_SUCCESS) {
-    params.push_back("--disable-rest");
+      std::vector<std::string> params, int expected_exit_code = EXIT_SUCCESS,
+      const bool disable_rest = true) {
+    if (disable_rest) params.push_back("--disable-rest");
     return ProcessManager::launch_router(
         params, expected_exit_code, /*catch_stderr=*/true, /*with_sudo=*/false,
         /*wait_for_notify_ready=*/std::chrono::seconds(-1));
diff -Nru mysql-8.0-8.0.26/router/tests/helpers/router_component_testutils.cc mysql-8.0-8.0.27/router/tests/helpers/router_component_testutils.cc
--- mysql-8.0-8.0.26/router/tests/helpers/router_component_testutils.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/helpers/router_component_testutils.cc	2021-09-28 11:46:34.000000000 +0000
@@ -25,8 +25,6 @@
 #include "router_component_testutils.h"
 
 #ifdef RAPIDJSON_NO_SIZETYPEDEFINE
-// if we build within the server, it will set RAPIDJSON_NO_SIZETYPEDEFINE
-// globally and require to include my_rapidjson_size_t.h
 #include "my_rapidjson_size_t.h"
 #endif
 #include <gmock/gmock.h>
@@ -37,9 +35,8 @@
 #include <fstream>
 #include <thread>
 
-#include "router_test_helpers.h"
-
 #include "mock_server_rest_client.h"
+#include "router_test_helpers.h"
 
 namespace {
 // default allocator for rapidJson (MemoryPoolAllocator) is broken for
@@ -55,9 +52,10 @@
 using namespace std::chrono_literals;
 
 std::string create_state_file_content(
-    const std::string &replication_goup_id,
+    const std::string &cluster_type_specific_id,
+    const std::string &clusterset_id,
     const std::vector<uint16_t> &metadata_servers_ports,
-    const unsigned view_id /*= 0*/) {
+    const uint64_t view_id /*= 0*/) {
   std::string metadata_servers;
   for (std::size_t i = 0; i < metadata_servers_ports.size(); i++) {
     metadata_servers +=
@@ -67,12 +65,23 @@
   }
   std::string view_id_str;
   if (view_id > 0) view_id_str = R"(, "view-id":)" + std::to_string(view_id);
+  std::string cluster_id;
+  if (!cluster_type_specific_id.empty()) {
+    cluster_id =
+        R"("group-replication-id": ")" + cluster_type_specific_id + R"(",)";
+  }
+  if (!clusterset_id.empty()) {
+    cluster_id += (R"("clusterset-id": ")" + clusterset_id + R"(",)");
+  }
+
+  const std::string version = clusterset_id.empty() ? "1.1.0" : "1.0.0";
+
   // clang-format off
   const std::string result =
     "{"
-       R"("version": "1.0.0",)"
+       R"("version": ")" + version + R"(",)"
        R"("metadata-cache": {)"
-         R"("group-replication-id": ")" + replication_goup_id + R"(",)"
+         + cluster_id +
          R"("cluster-metadata-servers": [)" + metadata_servers + "]"
          + view_id_str +
         "}"
@@ -85,16 +94,19 @@
 #define CHECK_TRUE(expr) \
   if (!(expr)) return false
 
-bool check_state_file_helper(const std::string &state_file_content,
-                             const std::string &expected_group_replication_id,
-                             const std::vector<uint16_t> expected_cluster_nodes,
-                             const unsigned expected_view_id /*= 0*/,
-                             const std::string node_address /*= "127.0.0.1"*/) {
+static bool check_state_file_helper(
+    const std::string &state_file_content,
+    const mysqlrouter::ClusterType cluster_type,
+    const std::string &expected_cluster_type_specific_id,
+    const std::vector<uint16_t> expected_cluster_nodes,
+    const uint64_t expected_view_id /*= 0*/,
+    const std::string node_address /*= "127.0.0.1"*/) {
   JsonDocument json_doc;
   if (json_doc.Parse<0>(state_file_content.c_str()).HasParseError())
     return false;
 
-  const std::string kExpectedVersion = "1.0.0";
+  const std::string kExpectedVersion =
+      cluster_type == mysqlrouter::ClusterType::GR_CS ? "1.1.0" : "1.0.0";
 
   CHECK_TRUE(json_doc.HasMember("version"));
   CHECK_TRUE(json_doc["version"].IsString());
@@ -105,17 +117,23 @@
 
   auto metadata_cache_section = json_doc["metadata-cache"].GetObject();
 
-  CHECK_TRUE(metadata_cache_section.HasMember("group-replication-id"));
-  CHECK_TRUE(metadata_cache_section["group-replication-id"].IsString());
-  CHECK_TRUE(expected_group_replication_id ==
-             metadata_cache_section["group-replication-id"].GetString());
+  const std::string cluster_type_specific_id_field =
+      cluster_type == mysqlrouter::ClusterType::GR_CS ? "clusterset-id"
+                                                      : "group-replication-id";
+
+  CHECK_TRUE(
+      metadata_cache_section.HasMember(cluster_type_specific_id_field.c_str()));
+  CHECK_TRUE(metadata_cache_section[cluster_type_specific_id_field.c_str()]
+                 .IsString());
+  CHECK_TRUE(expected_cluster_type_specific_id ==
+             metadata_cache_section[cluster_type_specific_id_field.c_str()]
+                 .GetString());
 
   if (expected_view_id > 0) {
     CHECK_TRUE(metadata_cache_section.HasMember("view-id"));
     CHECK_TRUE(metadata_cache_section["view-id"].IsInt());
-    CHECK_TRUE(
-        expected_view_id ==
-        static_cast<unsigned>(metadata_cache_section["view-id"].GetInt()));
+    CHECK_TRUE(expected_view_id ==
+               metadata_cache_section["view-id"].GetUint64());
   }
 
   CHECK_TRUE(metadata_cache_section.HasMember("cluster-metadata-servers"));
@@ -135,9 +153,10 @@
 }
 
 void check_state_file(const std::string &state_file,
-                      const std::string &expected_group_replication_id,
+                      const mysqlrouter::ClusterType cluster_type,
+                      const std::string &expected_cluster_type_specific_id,
                       const std::vector<uint16_t> expected_cluster_nodes,
-                      const unsigned expected_view_id /*= 0*/,
+                      const uint64_t expected_view_id /*= 0*/,
                       const std::string node_address /*= "127.0.0.1"*/,
                       std::chrono::milliseconds max_wait_time /*= 5000*/) {
   bool result = false;
@@ -150,7 +169,7 @@
   do {
     state_file_content = get_file_output(state_file);
     result = check_state_file_helper(
-        state_file_content, expected_group_replication_id,
+        state_file_content, cluster_type, expected_cluster_type_specific_id,
         expected_cluster_nodes, expected_view_id, node_address);
     if (!result) {
       std::this_thread::sleep_for(kRetryStep);
@@ -166,7 +185,7 @@
     }
 
     FAIL() << "Unexpected state file content." << std::endl
-           << "expected_group_replication_id: " << expected_group_replication_id
+           << "cluster_type_specific_id: " << expected_cluster_type_specific_id
            << std::endl
            << "expected_cluster_nodes: " << expected_cluster_nodes_str
            << std::endl
@@ -204,6 +223,13 @@
   return get_int_field_value(json_string, "transaction_count");
 }
 
+int get_transaction_count(const uint16_t http_port) {
+  std::string server_globals =
+      MockServerRestClient(http_port).get_globals_as_json_string();
+
+  return get_transaction_count(server_globals);
+}
+
 bool wait_for_transaction_count(const uint16_t http_port,
                                 const int expected_queries_count,
                                 std::chrono::milliseconds timeout) {
@@ -255,3 +281,13 @@
 
   return false;
 }
+
+size_t count_str_occurences(const std::string &s, const std::string &needle) {
+  if (needle.length() == 0) return 0;
+  size_t result = 0;
+  for (size_t pos = s.find(needle); pos != std::string::npos;
+       pos = s.find(needle, pos + needle.length())) {
+    ++result;
+  }
+  return result;
+}
\ No newline at end of file
diff -Nru mysql-8.0-8.0.26/router/tests/helpers/router_component_testutils.h mysql-8.0-8.0.27/router/tests/helpers/router_component_testutils.h
--- mysql-8.0-8.0.26/router/tests/helpers/router_component_testutils.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/helpers/router_component_testutils.h	2021-09-28 11:46:34.000000000 +0000
@@ -29,17 +29,19 @@
 #include <string>
 #include <vector>
 #include "mysql_session.h"
+#include "mysqlrouter/cluster_metadata.h"
 
 std::string create_state_file_content(
-    const std::string &replication_goup_id,
+    const std::string &cluster_type_specific_id,
+    const std::string &clusterset_id,
     const std::vector<uint16_t> &metadata_servers_ports,
-    const unsigned view_id = 0);
+    const uint64_t view_id = 0);
 
 void check_state_file(
-    const std::string &state_file,
-    const std::string &expected_group_replication_id,
+    const std::string &state_file, const mysqlrouter::ClusterType cluster_type,
+    const std::string &expected_cluster_type_specific_id,
     const std::vector<uint16_t> expected_cluster_nodes,
-    const unsigned expected_view_id = 0,
+    const uint64_t expected_view_id = 0,
     const std::string node_address = "127.0.0.1",
     std::chrono::milliseconds max_wait_time = std::chrono::milliseconds(5000));
 
@@ -48,6 +50,8 @@
 
 int get_transaction_count(const std::string &json_string);
 
+int get_transaction_count(const uint16_t http_port);
+
 bool wait_for_transaction_count(
     const uint16_t http_port, const int expected_queries_count,
     std::chrono::milliseconds timeout = std::chrono::seconds(5));
@@ -60,4 +64,6 @@
     mysqlrouter::MySQLSession &session,
     std::chrono::milliseconds timeout = std::chrono::seconds(5));
 
+size_t count_str_occurences(const std::string &s, const std::string &needle);
+
 #endif  // _ROUTER_COMPONENT_TESTUTILS_H_
diff -Nru mysql-8.0-8.0.26/router/tests/helpers/router_test_helpers.cc mysql-8.0-8.0.27/router/tests/helpers/router_test_helpers.cc
--- mysql-8.0-8.0.26/router/tests/helpers/router_test_helpers.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/helpers/router_test_helpers.cc	2021-09-28 11:46:34.000000000 +0000
@@ -30,6 +30,7 @@
 #include <cstdint>
 #include <cstdlib>
 #include <cstring>
+#include <iomanip>
 #include <iostream>
 #include <iterator>
 #include <regex>
@@ -340,7 +341,7 @@
 #elif defined(_WIN32)
   const std::string &netstat_cmd{"netstat -p tcp -n -a | findstr LISTEN"};
 #elif defined(__sun)
-  const std::string &netstat_cmd{"netstat -n -P tcp | grep LISTEN"};
+  const std::string &netstat_cmd{"netstat -na -P tcp | grep LISTEN"};
 #else
   // BSD and MacOS
   const std::string &netstat_cmd{"netstat -p tcp -an | grep LISTEN"};
@@ -360,8 +361,26 @@
 
   std::string line;
   while (std::getline(file, line)) {
-    if (pattern_found(line,
-                      "127\\..*[.:]" + std::to_string(port) + "[^\\d]?")) {
+    // Check if netstat output contains listening port <XYZ> given the following
+    // netstat outputs:
+    //
+    // MacOS
+    // tcp46   0   0 *.XYZ             *.*          LISTEN
+    // tcp4    0   0 127.0.0.1.XYZ     *.*          LISTEN
+    //
+    // Windows
+    //  TCP    127.0.0.1:XYZ          0.0.0.0:0              LISTENING
+    //  TCP    0.0.0.0:XYZ            0.0.0.0:0              LISTENING
+    //
+    //  Linux/BSD
+    //  tcp     0    0 0.0.0.0:XYZ       0.0.0.0:*               LISTEN
+    //  tcp     0    0 127.0.0.1:XYZ     0.0.0.0:*               LISTEN
+    //
+    //  SunOS
+    //  *.XYZ                 *.*              0      0  256000      0 LISTEN
+    //  127.0.0.1.XYZ         *.*              0      0  256000      0 LISTEN
+    if (pattern_found(
+            line, "[\\*,0,127]\\..*[.:]" + std::to_string(port) + "[^\\d]?")) {
       return false;
     }
   }
@@ -577,3 +596,71 @@
   }
   out_port = std::string((*result)[0]);
 }
+
+// Wait for the nth occurence of the log_regex in the log_file with the timeout
+// If it's found returns the full line containing the log_regex
+// If the timeout has been reached returns unexpected
+static stdx::expected<std::string, void> wait_log_line(
+    const std::string &log_file, const std::string &log_regex,
+    const unsigned n_occurence = 1,
+    const std::chrono::milliseconds timeout = 1s) {
+  const auto start_timestamp = std::chrono::steady_clock::now();
+  const auto kStep = 50ms;
+
+  do {
+    std::istringstream ss{get_file_output(log_file)};
+
+    unsigned current_occurence = 0;
+    for (std::string line; std::getline(ss, line);) {
+      if (pattern_found(line, log_regex)) {
+        current_occurence++;
+        if (current_occurence == n_occurence) return {line};
+      }
+    }
+
+    if (std::chrono::duration_cast<std::chrono::milliseconds>(
+            std::chrono::steady_clock::now() - start_timestamp) >= timeout) {
+      return stdx::make_unexpected();
+    }
+    std::this_thread::sleep_for(kStep);
+  } while (true);
+}
+
+stdx::expected<std::chrono::time_point<std::chrono::system_clock>, void>
+get_log_timestamp(const std::string &log_file, const std::string &log_regex,
+                  const unsigned occurence,
+                  const std::chrono::milliseconds timeout) {
+  // first wait for the nth occurence of the pattern
+  const auto log_line = wait_log_line(log_file, log_regex, occurence, timeout);
+  if (!log_line) {
+    return log_line.get_unexpected();
+  }
+
+  const std::string log_line_str = log_line.value();
+  // make sure the line is prefixed with the expected timestamp
+  // 2020-06-09 03:53:26.027 foo bar
+  if (!pattern_found(log_line_str,
+                     "^\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}\\.\\d{3}.*")) {
+    return stdx::make_unexpected();
+  }
+
+  // extract the timestamp prefix and conver to the duration
+  std::string timestamp_str =
+      log_line_str.substr(0, strlen("2020-06-09 03:53:26.027"));
+  std::tm tm{};
+#ifdef HAVE_STRPTIME
+  char *rest = strptime(timestamp_str.c_str(), "%Y-%m-%d %H:%M:%S", &tm);
+  assert(*rest == '.');
+  int milliseconds = atoi(++rest);
+#else
+  std::stringstream timestamp_ss(timestamp_str);
+  char dot;
+  unsigned milliseconds;
+  timestamp_ss >> std::get_time(&tm, "%Y-%m-%d %H:%M:%S") >> dot >>
+      milliseconds;
+#endif
+  auto result = std::chrono::system_clock::from_time_t(std::mktime(&tm));
+  result += std::chrono::milliseconds(milliseconds);
+
+  return result;
+}
diff -Nru mysql-8.0-8.0.26/router/tests/helpers/router_test_helpers.h mysql-8.0-8.0.27/router/tests/helpers/router_test_helpers.h
--- mysql-8.0-8.0.26/router/tests/helpers/router_test_helpers.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/router/tests/helpers/router_test_helpers.h	2021-09-28 11:46:34.000000000 +0000
@@ -174,8 +174,7 @@
  *
  * @returns true if the selected port accepts connections, false otherwise
  */
-STDX_NODISCARD
-bool wait_for_port_ready(
+[[nodiscard]] bool wait_for_port_ready(
     uint16_t port, std::chrono::milliseconds timeout = kDefaultPortReadyTimeout,
     const std::string &hostname = "127.0.0.1");
 
@@ -185,8 +184,7 @@
  *
  * @returns true if the selected port is available, false otherwise
  */
-STDX_NODISCARD
-bool is_port_available(const uint16_t port);
+[[nodiscard]] bool is_port_available(const uint16_t port);
 
 /**
  * Wait until the port is not available (is used by any application).
@@ -197,8 +195,7 @@
  * @return false if the port is still available after the timeout expiry,
  *         true otherwise.
  */
-STDX_NODISCARD
-bool wait_for_port_not_available(
+[[nodiscard]] bool wait_for_port_not_available(
     const uint16_t port,
     std::chrono::milliseconds timeout = std::chrono::seconds(10));
 
@@ -211,8 +208,7 @@
  * @return false if the port is still not available after the timeout expiry,
  *         true otherwise.
  */
-STDX_NODISCARD
-bool wait_for_port_available(
+[[nodiscard]] bool wait_for_port_available(
     const uint16_t port,
     std::chrono::milliseconds timeout = std::chrono::seconds(10));
 
@@ -235,8 +231,10 @@
  * @param file_path path to the file we want to serach
  * @param predicate predicate to test the file
  * @param sleep_time max time to wait for the entry in the file
+ * @deprecated use wait_log_contains() or get_file_output() with
+ * "EXPECT_THAT(..., Contains())"
  */
-bool find_in_file(
+[[deprecated]] bool find_in_file(
     const std::string &file_path,
     const std::function<bool(const std::string &)> &predicate,
     std::chrono::milliseconds sleep_time = std::chrono::milliseconds(5000));
@@ -282,4 +280,25 @@
                              const std::string &section_name,
                              const std::string &key, const std::string &value);
 
+/**
+ * Wait for the nth occurence of the log_regex in the log_file with timeout
+ * If it's found returns the timepoint from the matched line prefix
+ * If timed out or failed to convert the timestamp returns unexpected
+ *
+ * @param log_file path to file containing router log
+ * @param log_regex value that is going to be searched for in the log
+ * @param occurence number denoting which occurence of a log_regex is expected
+ * @param timeout number of milliseconds we are going to wait for the log_regex
+ * to occur at expected position
+ *
+ * @retval if log_regex is found at expected position return the timestamp of
+ * this log
+ * @retval unexpected otherwise
+ */
+stdx::expected<std::chrono::time_point<std::chrono::system_clock>, void>
+get_log_timestamp(
+    const std::string &log_file, const std::string &log_regex,
+    const unsigned occurence = 1,
+    const std::chrono::milliseconds timeout = std::chrono::seconds(1));
+
 #endif  // ROUTER_TESTS_TEST_HELPERS_INCLUDED
diff -Nru mysql-8.0-8.0.26/scripts/CMakeLists.txt mysql-8.0-8.0.27/scripts/CMakeLists.txt
--- mysql-8.0-8.0.26/scripts/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/scripts/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -306,27 +306,25 @@
 SET(CLIENT_LIBS "")
 SET(LIBS "")
 
-# Extract dependencies using CMake's internal ${target}_LIB_DEPENDS variable
-# returned string in ${var} is can be passed to linker's command line
+# Extract dependencies using CMake's LINK_LIBRARIES property.
+# Returned string in ${var} is can be passed to linker's command line
 MACRO(EXTRACT_LINK_LIBRARIES target var)
-  IF(${target}_LIB_DEPENDS)
-    LIST(REMOVE_ITEM ${target}_LIB_DEPENDS "")
-    LIST(REMOVE_DUPLICATES ${target}_LIB_DEPENDS)
-    FOREACH(lib ${${target}_LIB_DEPENDS})
-      # Filter out "general", it is not a library, just CMake hint
-      IF(NOT lib STREQUAL "general" AND NOT ${var}  MATCHES "-l${lib} ")
-        IF (lib MATCHES "^\\-l")
-          SET(${var} "${${var}} ${lib} ")
-        ELSEIF (lib MATCHES "^\\-L")
-          SET(${var} "${${var}} ${lib} ")
-        ELSEIF(lib MATCHES "^/")
-          # Full path, convert to just filename, strip "lib" prefix and extension
-          GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
-          STRING(REGEX REPLACE "^lib" "" lib "${lib}")
-          SET(${var} "${${var}}-l${lib} " )
-        ELSE()
-          SET(${var} "${${var}}-l${lib} " )
-        ENDIF()
+  GET_TARGET_PROPERTY(TARGET_LIB_DEPENDS ${target} LINK_LIBRARIES)
+  IF(TARGET_LIB_DEPENDS)
+    LIST(REMOVE_DUPLICATES TARGET_LIB_DEPENDS)
+    FOREACH(lib ${TARGET_LIB_DEPENDS})
+      IF (lib MATCHES "^\\-l")
+        SET(${var} "${${var}} ${lib} ")
+      ELSEIF (lib MATCHES "^\\-L")
+        # Search directory. Test on FreeBSD: -L/usr/local/lib -lunwind
+        SET(${var} "${${var}} ${lib} ")
+      ELSEIF(lib MATCHES "^/")
+        # Full path, convert to just filename, strip "lib" prefix and extension
+        GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
+        STRING(REGEX REPLACE "^lib" "" lib "${lib}")
+        SET(${var} "${${var}}-l${lib} " )
+      ELSE()
+        SET(${var} "${${var}}-l${lib} " )
       ENDIF()
     ENDFOREACH()
   ENDIF()
diff -Nru mysql-8.0-8.0.26/scripts/fill_help_tables.sql mysql-8.0-8.0.27/scripts/fill_help_tables.sql
--- mysql-8.0-8.0.26/scripts/fill_help_tables.sql	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/scripts/fill_help_tables.sql	2021-09-28 11:46:34.000000000 +0000
@@ -25,9 +25,9 @@
 -- documentation team. If you require changes to the content of this
 -- file, contact the documentation team.
 
--- File generation date: 2021-06-04
+-- File generation date: 2021-09-04
 -- MySQL series: 8.0
--- Document repository revision: 69949
+-- Document repository revision: 70750
 
 -- To use this file, load its contents into the mysql system database.
 -- For example, with the mysql client program, process the file like
@@ -99,8 +99,8 @@
 INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (51,'Utility',0,'');
 INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (52,'Storage Engines',0,'');
 
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (0,1,'HELP_DATE','This help information was generated from the MySQL 8.0 Reference Manual\non: 2021-06-04\n','','');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (1,1,'HELP_VERSION','This help information was generated from the MySQL 8.0 Reference Manual\non: 2021-06-04 (revision: 69949)\n\nThis information applies to MySQL 8.0 through 8.0.25.\n','','');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (0,1,'HELP_DATE','This help information was generated from the MySQL 8.0 Reference Manual\non: 2021-09-04\n','','');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (1,1,'HELP_VERSION','This help information was generated from the MySQL 8.0 Reference Manual\non: 2021-09-04 (revision: 70750)\n\nThis information applies to MySQL 8.0 through 8.0.26.\n','','');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (2,2,'AUTO_INCREMENT','The AUTO_INCREMENT attribute can be used to generate a unique identity\nfor new rows:\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/example-auto-increment.html\n\n','CREATE TABLE animals (\n     id MEDIUMINT NOT NULL AUTO_INCREMENT,\n     name CHAR(30) NOT NULL,\n     PRIMARY KEY (id)\n);\n\nINSERT INTO animals (name) VALUES\n    (\'dog\'),(\'cat\'),(\'penguin\'),\n    (\'lax\'),(\'whale\'),(\'ostrich\');\n\nSELECT * FROM animals;\n','https://dev.mysql.com/doc/refman/8.0/en/example-auto-increment.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (3,3,'HELP COMMAND','Syntax:\nmysql> help search_string\n\nIf you provide an argument to the help command, mysql uses it as a\nsearch string to access server-side help from the contents of the MySQL\nReference Manual. The proper operation of this command requires that\nthe help tables in the mysql database be initialized with help topic\ninformation (see\nhttps://dev.mysql.com/doc/refman/8.0/en/server-side-help-support.html).\n\nIf there is no match for the search string, the search fails:\n\nmysql> help me\n\nNothing found\nPlease try to run \'help contents\' for a list of all accessible topics\n\nUse help contents to see a list of the help categories:\n\nmysql> help contents\nYou asked for help about help category: "Contents"\nFor more information, type \'help <item>\', where <item> is one of the\nfollowing categories:\n   Account Management\n   Administration\n   Data Definition\n   Data Manipulation\n   Data Types\n   Functions\n   Functions and Modifiers for Use with GROUP BY\n   Geographic Features\n   Language Structure\n   Plugins\n   Storage Engines\n   Stored Routines\n   Table Maintenance\n   Transactions\n   Triggers\n\nIf the search string matches multiple items, mysql shows a list of\nmatching topics:\n\nmysql> help logs\nMany help items for your request exist.\nTo make a more specific request, please type \'help <item>\',\nwhere <item> is one of the following topics:\n   SHOW\n   SHOW BINARY LOGS\n   SHOW ENGINE\n   SHOW LOGS\n\nUse a topic as the search string to see the help entry for that topic:\n\nmysql> help show binary logs\nName: \'SHOW BINARY LOGS\'\nDescription:\nSyntax:\nSHOW BINARY LOGS\nSHOW MASTER LOGS\n\nLists the binary log files on the server. This statement is used as\npart of the procedure described in [purge-binary-logs], that shows how\nto determine which logs can be purged.\n\nmysql> SHOW BINARY LOGS;\n+---------------+-----------+-----------+\n| Log_name      | File_size | Encrypted |\n+---------------+-----------+-----------+\n| binlog.000015 |    724935 | Yes       |\n| binlog.000016 |    733481 | Yes       |\n+---------------+-----------+-----------+\n\nThe search string can contain the wildcard characters % and _. These\nhave the same meaning as for pattern-matching operations performed with\nthe LIKE operator. For example, HELP rep% returns a list of topics that\nbegin with rep:\n\nmysql> HELP rep%\nMany help items for your request exist.\nTo make a more specific request, please type \'help <item>\',\nwhere <item> is one of the following\ntopics:\n   REPAIR TABLE\n   REPEAT FUNCTION\n   REPEAT LOOP\n   REPLACE\n   REPLACE FUNCTION\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/mysql-server-side-help.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/mysql-server-side-help.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (4,5,'ASYMMETRIC_DECRYPT','Syntax:\nasymmetric_decrypt(algorithm, crypt_str, key_str)\n\nDecrypts an encrypted string using the given algorithm and key string,\nand returns the resulting plaintext as a binary string. If decryption\nfails, the result is NULL.\n\nkey_str must be a valid key string in PEM format. For successful\ndecryption, it must be the public or private key string corresponding\nto the private or public key string used with asymmetric_encrypt() to\nproduce the encrypted string. algorithm indicates the encryption\nalgorithm used to create the key.\n\nSupported algorithm values: \'RSA\'\n\nFor a usage example, see the description of asymmetric_encrypt().\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/enterprise-encryption-functions.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/enterprise-encryption-functions.html');
@@ -111,7 +111,7 @@
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (9,5,'CREATE_ASYMMETRIC_PRIV_KEY','Syntax:\ncreate_asymmetric_priv_key(algorithm, {key_len|dh_secret})\n\nCreates a private key using the given algorithm and key length or DH\nsecret, and returns the key as a binary string in PEM format. If key\ngeneration fails, the result is NULL.\n\nSupported algorithm values: \'RSA\', \'DSA\', \'DH\'\n\nSupported key_len values: The minimum key length in bits is 1,024. The\nmaximum key length depends on the algorithm: 16,384 for RSA and 10,000\nfor DSA. These key-length limits are constraints imposed by OpenSSL.\nServer administrators can impose additional limits on maximum key\nlength by setting environment variables. See\nhttps://dev.mysql.com/doc/refman/8.0/en/enterprise-encryption-usage.htm\nl.\n\nFor DH keys, pass a shared DH secret instead of a key length. To create\nthe secret, pass the key length to create_dh_parameters().\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/enterprise-encryption-functions.html\n\n','SET @priv = create_asymmetric_priv_key(\'DSA\', 2048);\nSET @pub = create_asymmetric_pub_key(\'DSA\', @priv);\n','https://dev.mysql.com/doc/refman/8.0/en/enterprise-encryption-functions.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (10,5,'CREATE_ASYMMETRIC_PUB_KEY','Syntax:\ncreate_asymmetric_pub_key(algorithm, priv_key_str)\n\nDerives a public key from the given private key using the given\nalgorithm, and returns the key as a binary string in PEM format. If key\nderivation fails, the result is NULL.\n\npriv_key_str must be a valid key string in PEM format. algorithm\nindicates the encryption algorithm used to create the key.\n\nSupported algorithm values: \'RSA\', \'DSA\', \'DH\'\n\nFor a usage example, see the description of\ncreate_asymmetric_priv_key().\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/enterprise-encryption-functions.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/enterprise-encryption-functions.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (11,5,'CREATE_DH_PARAMETERS','create_dh_parameters(key_len)\n\nCreates a shared secret for generating a DH private/public key pair and\nreturns a binary string that can be passed to\ncreate_asymmetric_priv_key(). If secret generation fails, the result is\nnull.\n\nSupported key_len values: The minimum and maximum key lengths in bits\nare 1,024 and 10,000. These key-length limits are constraints imposed\nby OpenSSL. Server administrators can impose additional limits on\nmaximum key length by setting environment variables. See\nhttps://dev.mysql.com/doc/refman/8.0/en/enterprise-encryption-usage.htm\nl.\n\nFor an example showing how to use the return value for generating\nsymmetric keys, see the description of asymmetric_derive().\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/enterprise-encryption-functions.html\n\n','SET @dhp = create_dh_parameters(1024);\n','https://dev.mysql.com/doc/refman/8.0/en/enterprise-encryption-functions.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (12,5,'CREATE_DIGEST','Syntax:\ncreate_digest(digest_type, str)\n\nCreates a digest from the given string using the given digest type, and\nreturns the digest as a binary string. If digest generation fails, the\nresult is NULL.\n\nSupported digest_type values: \'SHA224\', \'SHA256\', \'SHA384\', \'SHA512\'\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/enterprise-encryption-functions.html\n\n','SET @dig = create_digest(\'SHA512\', The quick brown fox\');\n','https://dev.mysql.com/doc/refman/8.0/en/enterprise-encryption-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (12,5,'CREATE_DIGEST','Syntax:\ncreate_digest(digest_type, str)\n\nCreates a digest from the given string using the given digest type, and\nreturns the digest as a binary string. If digest generation fails, the\nresult is NULL.\n\nSupported digest_type values: \'SHA224\', \'SHA256\', \'SHA384\', \'SHA512\'\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/enterprise-encryption-functions.html\n\n','SET @dig = create_digest(\'SHA512\', \'The quick brown fox\');\n','https://dev.mysql.com/doc/refman/8.0/en/enterprise-encryption-functions.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (13,6,'TRUE','The constants TRUE and FALSE evaluate to 1 and 0, respectively. The\nconstant names can be written in any lettercase.\n\nmysql> SELECT TRUE, true, FALSE, false;\n        -> 1, 1, 0, 0\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/boolean-literals.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/boolean-literals.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (14,6,'FALSE','The constants TRUE and FALSE evaluate to 1 and 0, respectively. The\nconstant names can be written in any lettercase.\n\nmysql> SELECT TRUE, true, FALSE, false;\n        -> 1, 1, 0, 0\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/boolean-literals.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/boolean-literals.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (15,2,'BIT','BIT[(M)]\n\nA bit-value type. M indicates the number of bits per value, from 1 to\n64. The default is 1 if M is omitted.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/numeric-type-syntax.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/numeric-type-syntax.html');
@@ -180,7 +180,7 @@
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (78,11,'ASSIGN-VALUE','Syntax:\n:=\n\nAssignment operator. Causes the user variable on the left hand side of\nthe operator to take on the value to its right. The value on the right\nhand side may be a literal value, another variable storing a value, or\nany legal expression that yields a scalar value, including the result\nof a query (provided that this value is a scalar value). You can\nperform multiple assignments in the same SET statement. You can perform\nmultiple assignments in the same statement.\n\nUnlike =, the := operator is never interpreted as a comparison\noperator. This means you can use := in any valid SQL statement (not\njust in SET statements) to assign a value to a variable.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/assignment-operators.html\n\n','mysql> SELECT @var1, @var2;\n        -> NULL, NULL\nmysql> SELECT @var1 := 1, @var2;\n        -> 1, NULL\nmysql> SELECT @var1, @var2;\n        -> 1, NULL\nmysql> SELECT @var1, @var2 := @var1;\n        -> 1, 1\nmysql> SELECT @var1, @var2;\n        -> 1, 1\n\nmysql> SELECT @var1:=COUNT(*) FROM t1;\n        -> 4\nmysql> SELECT @var1;\n        -> 4\n','https://dev.mysql.com/doc/refman/8.0/en/assignment-operators.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (79,11,'ASSIGN-EQUAL','Syntax:\n=\n\nThis operator is used to perform value assignments in two cases,\ndescribed in the next two paragraphs.\n\nWithin a SET statement, = is treated as an assignment operator that\ncauses the user variable on the left hand side of the operator to take\non the value to its right. (In other words, when used in a SET\nstatement, = is treated identically to :=.) The value on the right hand\nside may be a literal value, another variable storing a value, or any\nlegal expression that yields a scalar value, including the result of a\nquery (provided that this value is a scalar value). You can perform\nmultiple assignments in the same SET statement.\n\nIn the SET clause of an UPDATE statement, = also acts as an assignment\noperator; in this case, however, it causes the column named on the left\nhand side of the operator to assume the value given to the right,\nprovided any WHERE conditions that are part of the UPDATE are met. You\ncan make multiple assignments in the same SET clause of an UPDATE\nstatement.\n\nIn any other context, = is treated as a comparison operator.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/assignment-operators.html\n\n','mysql> SELECT @var1, @var2;\n        -> NULL, NULL\nmysql> SELECT @var1 := 1, @var2;\n        -> 1, NULL\nmysql> SELECT @var1, @var2;\n        -> 1, NULL\nmysql> SELECT @var1, @var2 := @var1;\n        -> 1, 1\nmysql> SELECT @var1, @var2;\n        -> 1, 1\n','https://dev.mysql.com/doc/refman/8.0/en/assignment-operators.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (80,12,'CASE OPERATOR','Syntax:\nCASE value WHEN compare_value THEN result [WHEN compare_value THEN\nresult ...] [ELSE result] END\n\nCASE WHEN condition THEN result [WHEN condition THEN result ...] [ELSE\nresult] END\n\nThe first CASE syntax returns the result for the first\nvalue=compare_value comparison that is true. The second syntax returns\nthe result for the first condition that is true. If no comparison or\ncondition is true, the result after ELSE is returned, or NULL if there\nis no ELSE part.\n\n*Note*:\n\nThe syntax of the CASE operator described here differs slightly from\nthat of the SQL CASE statement described in [HELP CASE statement], for\nuse inside stored programs. The CASE statement cannot have an ELSE NULL\nclause, and it is terminated with END CASE instead of END.\n\nThe return type of a CASE expression result is the aggregated type of\nall result values:\n\no If all types are numeric, the aggregated type is also numeric:\n\n  o If at least one argument is double precision, the result is double\n    precision.\n\n  o Otherwise, if at least one argument is DECIMAL, the result is\n    DECIMAL.\n\n  o Otherwise, the result is an integer type (with one exception):\n\n    o If all integer types are all signed or all unsigned, the result\n      is the same sign and the precision is the highest of all\n      specified integer types (that is, TINYINT, SMALLINT, MEDIUMINT,\n      INT, or BIGINT).\n\n    o If there is a combination of signed and unsigned integer types,\n      the result is signed and the precision may be higher. For\n      example, if the types are signed INT and unsigned INT, the result\n      is signed BIGINT.\n\n    o The exception is unsigned BIGINT combined with any signed integer\n      type. The result is DECIMAL with sufficient precision and scale\n      0.\n\no If all types are BIT, the result is BIT. Otherwise, BIT arguments are\n  treated similar to BIGINT.\n\no If all types are YEAR, the result is YEAR. Otherwise, YEAR arguments\n  are treated similar to INT.\n\no If all types are character string (CHAR or VARCHAR), the result is\n  VARCHAR with maximum length determined by the longest character\n  length of the operands.\n\no If all types are character or binary string, the result is VARBINARY.\n\no SET and ENUM are treated similar to VARCHAR; the result is VARCHAR.\n\no If all types are JSON, the result is JSON.\n\no If all types are temporal, the result is temporal:\n\n  o If all temporal types are DATE, TIME, or TIMESTAMP, the result is\n    DATE, TIME, or TIMESTAMP, respectively.\n\n  o Otherwise, for a mix of temporal types, the result is DATETIME.\n\no If all types are GEOMETRY, the result is GEOMETRY.\n\no If any type is BLOB, the result is BLOB.\n\no For all other type combinations, the result is VARCHAR.\n\no Literal NULL operands are ignored for type aggregation.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/flow-control-functions.html\n\n','mysql> SELECT CASE 1 WHEN 1 THEN \'one\'\n    ->     WHEN 2 THEN \'two\' ELSE \'more\' END;\n        -> \'one\'\nmysql> SELECT CASE WHEN 1>0 THEN \'true\' ELSE \'false\' END;\n        -> \'true\'\nmysql> SELECT CASE BINARY \'B\'\n    ->     WHEN \'a\' THEN 1 WHEN \'b\' THEN 2 END;\n        -> NULL\n','https://dev.mysql.com/doc/refman/8.0/en/flow-control-functions.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (81,12,'IF FUNCTION','Syntax:\nIF(expr1,expr2,expr3)\n\nIf expr1 is TRUE (expr1 <> 0 and expr1 <> NULL), IF() returns expr2.\nOtherwise, it returns expr3.\n\n*Note*:\n\nThere is also an IF statement, which differs from the IF() function\ndescribed here. See [HELP IF statement].\n\nIf only one of expr2 or expr3 is explicitly NULL, the result type of\nthe IF() function is the type of the non-NULL expression.\n\nThe default return type of IF() (which may matter when it is stored\ninto a temporary table) is calculated as follows:\n\no If expr2 or expr3 produce a string, the result is a string.\n\n  If expr2 and expr3 are both strings, the result is case-sensitive if\n  either string is case-sensitive.\n\no If expr2 or expr3 produce a floating-point value, the result is a\n  floating-point value.\n\no If expr2 or expr3 produce an integer, the result is an integer.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/flow-control-functions.html\n\n','mysql> SELECT IF(1>2,2,3);\n        -> 3\nmysql> SELECT IF(1<2,\'yes\',\'no\');\n        -> \'yes\'\nmysql> SELECT IF(STRCMP(\'test\',\'test1\'),\'no\',\'yes\');\n        -> \'no\'\n','https://dev.mysql.com/doc/refman/8.0/en/flow-control-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (81,12,'IF FUNCTION','Syntax:\nIF(expr1,expr2,expr3)\n\nIf expr1 is TRUE (expr1 <> 0 and expr1 <=> NULL), IF() returns expr2.\nOtherwise, it returns expr3.\n\n*Note*:\n\nThere is also an IF statement, which differs from the IF() function\ndescribed here. See [HELP IF statement].\n\nIf only one of expr2 or expr3 is explicitly NULL, the result type of\nthe IF() function is the type of the non-NULL expression.\n\nThe default return type of IF() (which may matter when it is stored\ninto a temporary table) is calculated as follows:\n\no If expr2 or expr3 produce a string, the result is a string.\n\n  If expr2 and expr3 are both strings, the result is case-sensitive if\n  either string is case-sensitive.\n\no If expr2 or expr3 produce a floating-point value, the result is a\n  floating-point value.\n\no If expr2 or expr3 produce an integer, the result is an integer.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/flow-control-functions.html\n\n','mysql> SELECT IF(1>2,2,3);\n        -> 3\nmysql> SELECT IF(1<2,\'yes\',\'no\');\n        -> \'yes\'\nmysql> SELECT IF(STRCMP(\'test\',\'test1\'),\'no\',\'yes\');\n        -> \'no\'\n','https://dev.mysql.com/doc/refman/8.0/en/flow-control-functions.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (82,12,'IFNULL','Syntax:\nIFNULL(expr1,expr2)\n\nIf expr1 is not NULL, IFNULL() returns expr1; otherwise it returns\nexpr2.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/flow-control-functions.html\n\n','mysql> SELECT IFNULL(1,0);\n        -> 1\nmysql> SELECT IFNULL(NULL,10);\n        -> 10\nmysql> SELECT IFNULL(1/0,10);\n        -> 10\nmysql> SELECT IFNULL(1/0,\'yes\');\n        -> \'yes\'\n','https://dev.mysql.com/doc/refman/8.0/en/flow-control-functions.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (83,12,'NULLIF','Syntax:\nNULLIF(expr1,expr2)\n\nReturns NULL if expr1 = expr2 is true, otherwise returns expr1. This is\nthe same as CASE WHEN expr1 = expr2 THEN NULL ELSE expr1 END.\n\nThe return value has the same type as the first argument.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/flow-control-functions.html\n\n','mysql> SELECT NULLIF(1,1);\n        -> NULL\nmysql> SELECT NULLIF(1,2);\n        -> 1\n','https://dev.mysql.com/doc/refman/8.0/en/flow-control-functions.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (84,13,'+','Syntax:\n+\n\nAddition:\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/arithmetic-functions.html\n\n','mysql> SELECT 3+5;\n        -> 8\n','https://dev.mysql.com/doc/refman/8.0/en/arithmetic-functions.html');
@@ -240,7 +240,7 @@
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (138,14,'DAYOFYEAR','Syntax:\nDAYOFYEAR(date)\n\nReturns the day of the year for date, in the range 1 to 366.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/date-and-time-functions.html\n\n','mysql> SELECT DAYOFYEAR(\'2007-02-03\');\n        -> 34\n','https://dev.mysql.com/doc/refman/8.0/en/date-and-time-functions.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (139,14,'EXTRACT','Syntax:\nEXTRACT(unit FROM date)\n\nThe EXTRACT() function uses the same kinds of unit specifiers as\nDATE_ADD() or DATE_SUB(), but extracts parts from the date rather than\nperforming date arithmetic. For information on the unit argument, see\nhttps://dev.mysql.com/doc/refman/8.0/en/expressions.html#temporal-inter\nvals.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/date-and-time-functions.html\n\n','mysql> SELECT EXTRACT(YEAR FROM \'2019-07-02\');\n        -> 2019\nmysql> SELECT EXTRACT(YEAR_MONTH FROM \'2019-07-02 01:02:03\');\n        -> 201907\nmysql> SELECT EXTRACT(DAY_MINUTE FROM \'2019-07-02 01:02:03\');\n        -> 20102\nmysql> SELECT EXTRACT(MICROSECOND\n    ->                FROM \'2003-01-02 10:30:00.000123\');\n        -> 123\n','https://dev.mysql.com/doc/refman/8.0/en/date-and-time-functions.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (140,14,'FROM_DAYS','Syntax:\nFROM_DAYS(N)\n\nGiven a day number N, returns a DATE value.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/date-and-time-functions.html\n\n','mysql> SELECT FROM_DAYS(730669);\n        -> \'2000-07-03\'\n','https://dev.mysql.com/doc/refman/8.0/en/date-and-time-functions.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (141,14,'FROM_UNIXTIME','Syntax:\nFROM_UNIXTIME(unix_timestamp[,format])\n\nReturns a representation of the unix_timestamp argument as a value in\n\'YYYY-MM-DD hh:mm:ss\' or YYYYMMDDhhmmss format, depending on whether\nthe function is used in a string or numeric context. unix_timestamp is\nan internal timestamp value representing seconds since \'1970-01-01\n00:00:00\' UTC, such as produced by the UNIX_TIMESTAMP() function.\n\nThe return value is expressed in the session time zone. (Clients can\nset the session time zone as described in\nhttps://dev.mysql.com/doc/refman/8.0/en/time-zone-support.html.) The\nformat string, if given, is used to format the result the same way as\ndescribed in the entry for the DATE_FORMAT() function.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/date-and-time-functions.html\n\n','mysql> SELECT FROM_UNIXTIME(1447430881);\n        -> \'2015-11-13 10:08:01\'\nmysql> SELECT FROM_UNIXTIME(1447430881) + 0;\n        -> 20151113100801\nmysql> SELECT FROM_UNIXTIME(1447430881,\n    ->                      \'%Y %D %M %h:%i:%s %x\');\n        -> \'2015 13th November 10:08:01 2015\'\n','https://dev.mysql.com/doc/refman/8.0/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (141,14,'FROM_UNIXTIME','Syntax:\nFROM_UNIXTIME(unix_timestamp[,format])\n\nReturns a representation of unix_timestamp as a datetime or character\nstring value. The value returned is expressed using the session time\nzone. (Clients can set the session time zone as described in\nhttps://dev.mysql.com/doc/refman/8.0/en/time-zone-support.html.)\nunix_timestamp is an internal timestamp value representing seconds\nsince \'1970-01-01 00:00:00\' UTC, such as produced by the\nUNIX_TIMESTAMP() function.\n\nIf format is omitted, this function returns a DATETIME value.\n\nIf unix_timestamp is an integer, the fractional seconds precision of\nthe DATETIME is zero. When unix_timestamp is a decimal value, the\nfractional seconds precision of the DATETIME is the same as the\nprecision of the decimal value, up to a maximum of 6. When\nunix_timestamp is a floating point number, the fractional seconds\nprecision of the datetime is 6.\n\nformat is used to format the result in the same way as the format\nstring used for the DATE_FORMAT() function. If format is supplied, the\nvalue returned is a VARCHAR.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/date-and-time-functions.html\n\n','mysql> SELECT FROM_UNIXTIME(1447430881);\n        -> \'2015-11-13 10:08:01\'\nmysql> SELECT FROM_UNIXTIME(1447430881) + 0;\n        -> 20151113100801\nmysql> SELECT FROM_UNIXTIME(1447430881,\n    ->                      \'%Y %D %M %h:%i:%s %x\');\n        -> \'2015 13th November 10:08:01 2015\'\n','https://dev.mysql.com/doc/refman/8.0/en/date-and-time-functions.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (142,14,'GET_FORMAT','Syntax:\nGET_FORMAT({DATE|TIME|DATETIME}, {\'EUR\'|\'USA\'|\'JIS\'|\'ISO\'|\'INTERNAL\'})\n\nReturns a format string. This function is useful in combination with\nthe DATE_FORMAT() and the STR_TO_DATE() functions.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/date-and-time-functions.html\n\n','mysql> SELECT DATE_FORMAT(\'2003-10-03\',GET_FORMAT(DATE,\'EUR\'));\n        -> \'03.10.2003\'\nmysql> SELECT STR_TO_DATE(\'10.31.2003\',GET_FORMAT(DATE,\'USA\'));\n        -> \'2003-10-31\'\n','https://dev.mysql.com/doc/refman/8.0/en/date-and-time-functions.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (143,14,'HOUR','Syntax:\nHOUR(time)\n\nReturns the hour for time. The range of the return value is 0 to 23 for\ntime-of-day values. However, the range of TIME values actually is much\nlarger, so HOUR can return values greater than 23.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/date-and-time-functions.html\n\n','mysql> SELECT HOUR(\'10:05:03\');\n        -> 10\nmysql> SELECT HOUR(\'272:59:59\');\n        -> 272\n','https://dev.mysql.com/doc/refman/8.0/en/date-and-time-functions.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (144,14,'LAST_DAY','Syntax:\nLAST_DAY(date)\n\nTakes a date or datetime value and returns the corresponding value for\nthe last day of the month. Returns NULL if the argument is invalid.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/date-and-time-functions.html\n\n','mysql> SELECT LAST_DAY(\'2003-02-05\');\n        -> \'2003-02-28\'\nmysql> SELECT LAST_DAY(\'2004-02-05\');\n        -> \'2004-02-29\'\nmysql> SELECT LAST_DAY(\'2004-01-01 01:01:01\');\n        -> \'2004-01-31\'\nmysql> SELECT LAST_DAY(\'2003-03-32\');\n        -> NULL\n','https://dev.mysql.com/doc/refman/8.0/en/date-and-time-functions.html');
@@ -334,15 +334,15 @@
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (232,15,'NOT LIKE','Syntax:\nexpr NOT LIKE pat [ESCAPE \'escape_char\']\n\nThis is the same as NOT (expr LIKE pat [ESCAPE \'escape_char\']).\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/string-comparison-functions.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/string-comparison-functions.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (233,15,'STRCMP','Syntax:\nSTRCMP(expr1,expr2)\n\nSTRCMP() returns 0 if the strings are the same, -1 if the first\nargument is smaller than the second according to the current sort\norder, and 1 otherwise.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/string-comparison-functions.html\n\n','mysql> SELECT STRCMP(\'text\', \'text2\');\n        -> -1\nmysql> SELECT STRCMP(\'text2\', \'text\');\n        -> 1\nmysql> SELECT STRCMP(\'text\', \'text\');\n        -> 0\n','https://dev.mysql.com/doc/refman/8.0/en/string-comparison-functions.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (234,15,'NOT REGEXP','Syntax:\nexpr NOT REGEXP pat, expr NOT RLIKE pat\n\nThis is the same as NOT (expr REGEXP pat).\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/regexp.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/regexp.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (235,15,'REGEXP','Syntax:\nexpr REGEXP pat, expr RLIKE pat\n\nReturns 1 if the string expr matches the regular expression specified\nby the pattern pat, 0 otherwise. If expr or pat is NULL, the return\nvalue is NULL.\n\nREGEXP and RLIKE are synonyms for REGEXP_LIKE().\n\nFor additional information about how matching occurs, see the\ndescription for REGEXP_LIKE().\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/regexp.html\n\n','mysql> SELECT \'Michael!\' REGEXP \'.*\';\n+------------------------+\n| \'Michael!\' REGEXP \'.*\' |\n+------------------------+\n|                      1 |\n+------------------------+\nmysql> SELECT \'new*\\n*line\' REGEXP \'new\\\\*.\\\\*line\';\n+---------------------------------------+\n| \'new*\\n*line\' REGEXP \'new\\\\*.\\\\*line\' |\n+---------------------------------------+\n|                                     0 |\n+---------------------------------------+\nmysql> SELECT \'a\' REGEXP \'^[a-d]\';\n+---------------------+\n| \'a\' REGEXP \'^[a-d]\' |\n+---------------------+\n|                   1 |\n+---------------------+\nmysql> SELECT \'a\' REGEXP \'A\', \'a\' REGEXP BINARY \'A\';\n+----------------+-----------------------+\n| \'a\' REGEXP \'A\' | \'a\' REGEXP BINARY \'A\' |\n+----------------+-----------------------+\n|              1 |                     0 |\n+----------------+-----------------------+\n','https://dev.mysql.com/doc/refman/8.0/en/regexp.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (235,15,'REGEXP','Syntax:\nexpr REGEXP pat, expr RLIKE pat\n\nReturns 1 if the string expr matches the regular expression specified\nby the pattern pat, 0 otherwise. If expr or pat is NULL, the return\nvalue is NULL.\n\nREGEXP and RLIKE are synonyms for REGEXP_LIKE().\n\nFor additional information about how matching occurs, see the\ndescription for REGEXP_LIKE().\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/regexp.html\n\n','mysql> SELECT \'Michael!\' REGEXP \'.*\';\n+------------------------+\n| \'Michael!\' REGEXP \'.*\' |\n+------------------------+\n|                      1 |\n+------------------------+\nmysql> SELECT \'new*\\n*line\' REGEXP \'new\\\\*.\\\\*line\';\n+---------------------------------------+\n| \'new*\\n*line\' REGEXP \'new\\\\*.\\\\*line\' |\n+---------------------------------------+\n|                                     0 |\n+---------------------------------------+\nmysql> SELECT \'a\' REGEXP \'^[a-d]\';\n+---------------------+\n| \'a\' REGEXP \'^[a-d]\' |\n+---------------------+\n|                   1 |\n+---------------------+\n','https://dev.mysql.com/doc/refman/8.0/en/regexp.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (236,15,'REGEXP_INSTR','REGEXP_INSTR(expr, pat[, pos[, occurrence[, return_option[,\nmatch_type]]]])\n\nReturns the starting index of the substring of the string expr that\nmatches the regular expression specified by the pattern pat, 0 if there\nis no match. If expr or pat is NULL, the return value is NULL.\nCharacter indexes begin at 1.\n\nREGEXP_INSTR() takes these optional arguments:\n\no pos: The position in expr at which to start the search. If omitted,\n  the default is 1.\n\no occurrence: Which occurrence of a match to search for. If omitted,\n  the default is 1.\n\no return_option: Which type of position to return. If this value is 0,\n  REGEXP_INSTR() returns the position of the matched substring\'s first\n  character. If this value is 1, REGEXP_INSTR() returns the position\n  following the matched substring. If omitted, the default is 0.\n\no match_type: A string that specifies how to perform matching. The\n  meaning is as described for REGEXP_LIKE().\n\nFor additional information about how matching occurs, see the\ndescription for REGEXP_LIKE().\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/regexp.html\n\n','mysql> SELECT REGEXP_INSTR(\'dog cat dog\', \'dog\');\n+------------------------------------+\n| REGEXP_INSTR(\'dog cat dog\', \'dog\') |\n+------------------------------------+\n|                                  1 |\n+------------------------------------+\nmysql> SELECT REGEXP_INSTR(\'dog cat dog\', \'dog\', 2);\n+---------------------------------------+\n| REGEXP_INSTR(\'dog cat dog\', \'dog\', 2) |\n+---------------------------------------+\n|                                     9 |\n+---------------------------------------+\nmysql> SELECT REGEXP_INSTR(\'aa aaa aaaa\', \'a{2}\');\n+-------------------------------------+\n| REGEXP_INSTR(\'aa aaa aaaa\', \'a{2}\') |\n+-------------------------------------+\n|                                   1 |\n+-------------------------------------+\nmysql> SELECT REGEXP_INSTR(\'aa aaa aaaa\', \'a{4}\');\n+-------------------------------------+\n| REGEXP_INSTR(\'aa aaa aaaa\', \'a{4}\') |\n+-------------------------------------+\n|                                   8 |\n+-------------------------------------+\n','https://dev.mysql.com/doc/refman/8.0/en/regexp.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (237,15,'REGEXP_LIKE','REGEXP_LIKE(expr, pat[, match_type])\n\nReturns 1 if the string expr matches the regular expression specified\nby the pattern pat, 0 otherwise. If expr or pat is NULL, the return\nvalue is NULL.\n\nThe pattern can be an extended regular expression, the syntax for which\nis discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/regexp.html#regexp-syntax. The\npattern need not be a literal string. For example, it can be specified\nas a string expression or table column.\n\nThe optional match_type argument is a string that may contain any or\nall the following characters specifying how to perform matching:\n\no c: Case-sensitive matching.\n\no i: Case-insensitive matching.\n\no m: Multiple-line mode. Recognize line terminators within the string.\n  The default behavior is to match line terminators only at the start\n  and end of the string expression.\n\no n: The . character matches line terminators. The default is for .\n  matching to stop at the end of a line.\n\no u: Unix-only line endings. Only the newline character is recognized\n  as a line ending by the ., ^, and $ match operators.\n\nIf characters specifying contradictory options are specified within\nmatch_type, the rightmost one takes precedence.\n\nBy default, regular expression operations use the character set and\ncollation of the expr and pat arguments when deciding the type of a\ncharacter and performing the comparison. If the arguments have\ndifferent character sets or collations, coercibility rules apply as\ndescribed in\nhttps://dev.mysql.com/doc/refman/8.0/en/charset-collation-coercibility.\nhtml. Arguments may be specified with explicit collation indicators to\nchange comparison behavior.\n\nmysql> SELECT REGEXP_LIKE(\'CamelCase\', \'CAMELCASE\');\n+---------------------------------------+\n| REGEXP_LIKE(\'CamelCase\', \'CAMELCASE\') |\n+---------------------------------------+\n|                                     1 |\n+---------------------------------------+\nmysql> SELECT REGEXP_LIKE(\'CamelCase\', \'CAMELCASE\' COLLATE utf8mb4_0900_as_cs);\n+------------------------------------------------------------------+\n| REGEXP_LIKE(\'CamelCase\', \'CAMELCASE\' COLLATE utf8mb4_0900_as_cs) |\n+------------------------------------------------------------------+\n|                                                                0 |\n+------------------------------------------------------------------+\n\nmatch_type may be specified with the c or i characters to override the\ndefault case sensitivity. Exception: If either argument is a binary\nstring, the arguments are handled in case-sensitive fashion as binary\nstrings, even if match_type contains the i character.\n\n*Note*:\n\nMySQL uses C escape syntax in strings (for example, \\n to represent the\nnewline character). If you want your expr or pat argument to contain a\nliteral \\, you must double it. (Unless the NO_BACKSLASH_ESCAPES SQL\nmode is enabled, in which case no escape character is used.)\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/regexp.html\n\n','mysql> SELECT REGEXP_LIKE(\'Michael!\', \'.*\');\n+-------------------------------+\n| REGEXP_LIKE(\'Michael!\', \'.*\') |\n+-------------------------------+\n|                             1 |\n+-------------------------------+\nmysql> SELECT REGEXP_LIKE(\'new*\\n*line\', \'new\\\\*.\\\\*line\');\n+----------------------------------------------+\n| REGEXP_LIKE(\'new*\\n*line\', \'new\\\\*.\\\\*line\') |\n+----------------------------------------------+\n|                                            0 |\n+----------------------------------------------+\nmysql> SELECT REGEXP_LIKE(\'a\', \'^[a-d]\');\n+----------------------------+\n| REGEXP_LIKE(\'a\', \'^[a-d]\') |\n+----------------------------+\n|                          1 |\n+----------------------------+\nmysql> SELECT REGEXP_LIKE(\'a\', \'A\'), REGEXP_LIKE(\'a\', BINARY \'A\');\n+-----------------------+------------------------------+\n| REGEXP_LIKE(\'a\', \'A\') | REGEXP_LIKE(\'a\', BINARY \'A\') |\n+-----------------------+------------------------------+\n|                     1 |                            0 |\n+-----------------------+------------------------------+\n\nmysql> SELECT REGEXP_LIKE(\'abc\', \'ABC\');\n+---------------------------+\n| REGEXP_LIKE(\'abc\', \'ABC\') |\n+---------------------------+\n|                         1 |\n+---------------------------+\nmysql> SELECT REGEXP_LIKE(\'abc\', \'ABC\', \'c\');\n+--------------------------------+\n| REGEXP_LIKE(\'abc\', \'ABC\', \'c\') |\n+--------------------------------+\n|                              0 |\n+--------------------------------+\n','https://dev.mysql.com/doc/refman/8.0/en/regexp.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (237,15,'REGEXP_LIKE','REGEXP_LIKE(expr, pat[, match_type])\n\nReturns 1 if the string expr matches the regular expression specified\nby the pattern pat, 0 otherwise. If expr or pat is NULL, the return\nvalue is NULL.\n\nThe pattern can be an extended regular expression, the syntax for which\nis discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/regexp.html#regexp-syntax. The\npattern need not be a literal string. For example, it can be specified\nas a string expression or table column.\n\nThe optional match_type argument is a string that may contain any or\nall the following characters specifying how to perform matching:\n\no c: Case-sensitive matching.\n\no i: Case-insensitive matching.\n\no m: Multiple-line mode. Recognize line terminators within the string.\n  The default behavior is to match line terminators only at the start\n  and end of the string expression.\n\no n: The . character matches line terminators. The default is for .\n  matching to stop at the end of a line.\n\no u: Unix-only line endings. Only the newline character is recognized\n  as a line ending by the ., ^, and $ match operators.\n\nIf characters specifying contradictory options are specified within\nmatch_type, the rightmost one takes precedence.\n\nBy default, regular expression operations use the character set and\ncollation of the expr and pat arguments when deciding the type of a\ncharacter and performing the comparison. If the arguments have\ndifferent character sets or collations, coercibility rules apply as\ndescribed in\nhttps://dev.mysql.com/doc/refman/8.0/en/charset-collation-coercibility.\nhtml. Arguments may be specified with explicit collation indicators to\nchange comparison behavior.\n\nmysql> SELECT REGEXP_LIKE(\'CamelCase\', \'CAMELCASE\');\n+---------------------------------------+\n| REGEXP_LIKE(\'CamelCase\', \'CAMELCASE\') |\n+---------------------------------------+\n|                                     1 |\n+---------------------------------------+\nmysql> SELECT REGEXP_LIKE(\'CamelCase\', \'CAMELCASE\' COLLATE utf8mb4_0900_as_cs);\n+------------------------------------------------------------------+\n| REGEXP_LIKE(\'CamelCase\', \'CAMELCASE\' COLLATE utf8mb4_0900_as_cs) |\n+------------------------------------------------------------------+\n|                                                                0 |\n+------------------------------------------------------------------+\n\nmatch_type may be specified with the c or i characters to override the\ndefault case sensitivity. Exception: If either argument is a binary\nstring, the arguments are handled in case-sensitive fashion as binary\nstrings, even if match_type contains the i character.\n\n*Note*:\n\nMySQL uses C escape syntax in strings (for example, \\n to represent the\nnewline character). If you want your expr or pat argument to contain a\nliteral \\, you must double it. (Unless the NO_BACKSLASH_ESCAPES SQL\nmode is enabled, in which case no escape character is used.)\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/regexp.html\n\n','mysql> SELECT REGEXP_LIKE(\'Michael!\', \'.*\');\n+-------------------------------+\n| REGEXP_LIKE(\'Michael!\', \'.*\') |\n+-------------------------------+\n|                             1 |\n+-------------------------------+\nmysql> SELECT REGEXP_LIKE(\'new*\\n*line\', \'new\\\\*.\\\\*line\');\n+----------------------------------------------+\n| REGEXP_LIKE(\'new*\\n*line\', \'new\\\\*.\\\\*line\') |\n+----------------------------------------------+\n|                                            0 |\n+----------------------------------------------+\nmysql> SELECT REGEXP_LIKE(\'a\', \'^[a-d]\');\n+----------------------------+\n| REGEXP_LIKE(\'a\', \'^[a-d]\') |\n+----------------------------+\n|                          1 |\n+----------------------------+\n\nmysql> SELECT REGEXP_LIKE(\'abc\', \'ABC\');\n+---------------------------+\n| REGEXP_LIKE(\'abc\', \'ABC\') |\n+---------------------------+\n|                         1 |\n+---------------------------+\nmysql> SELECT REGEXP_LIKE(\'abc\', \'ABC\', \'c\');\n+--------------------------------+\n| REGEXP_LIKE(\'abc\', \'ABC\', \'c\') |\n+--------------------------------+\n|                              0 |\n+--------------------------------+\n','https://dev.mysql.com/doc/refman/8.0/en/regexp.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (238,15,'REGEXP_REPLACE','REGEXP_REPLACE(expr, pat, repl[, pos[, occurrence[, match_type]]])\n\nReplaces occurrences in the string expr that match the regular\nexpression specified by the pattern pat with the replacement string\nrepl, and returns the resulting string. If expr, pat, or repl is NULL,\nthe return value is NULL.\n\nREGEXP_REPLACE() takes these optional arguments:\n\no pos: The position in expr at which to start the search. If omitted,\n  the default is 1.\n\no occurrence: Which occurrence of a match to replace. If omitted, the\n  default is 0 (which means "replace all occurrences").\n\no match_type: A string that specifies how to perform matching. The\n  meaning is as described for REGEXP_LIKE().\n\nPrior to MySQL 8.0.17, the result returned by this function used the\nUTF-16 character set; in MySQL 8.0.17 and later, the character set and\ncollation of the expression searched for matches is used. (Bug #94203,\nBug #29308212)\n\nFor additional information about how matching occurs, see the\ndescription for REGEXP_LIKE().\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/regexp.html\n\n','mysql> SELECT REGEXP_REPLACE(\'a b c\', \'b\', \'X\');\n+-----------------------------------+\n| REGEXP_REPLACE(\'a b c\', \'b\', \'X\') |\n+-----------------------------------+\n| a X c                             |\n+-----------------------------------+\nmysql> SELECT REGEXP_REPLACE(\'abc def ghi\', \'[a-z]+\', \'X\', 1, 3);\n+----------------------------------------------------+\n| REGEXP_REPLACE(\'abc def ghi\', \'[a-z]+\', \'X\', 1, 3) |\n+----------------------------------------------------+\n| abc def X                                          |\n+----------------------------------------------------+\n','https://dev.mysql.com/doc/refman/8.0/en/regexp.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (239,15,'REGEXP_SUBSTR','REGEXP_SUBSTR(expr, pat[, pos[, occurrence[, match_type]]])\n\nReturns the substring of the string expr that matches the regular\nexpression specified by the pattern pat, NULL if there is no match. If\nexpr or pat is NULL, the return value is NULL.\n\nREGEXP_SUBSTR() takes these optional arguments:\n\no pos: The position in expr at which to start the search. If omitted,\n  the default is 1.\n\no occurrence: Which occurrence of a match to search for. If omitted,\n  the default is 1.\n\no match_type: A string that specifies how to perform matching. The\n  meaning is as described for REGEXP_LIKE().\n\nPrior to MySQL 8.0.17, the result returned by this function used the\nUTF-16 character set; in MySQL 8.0.17 and later, the character set and\ncollation of the expression searched for matches is used. (Bug #94203,\nBug #29308212)\n\nFor additional information about how matching occurs, see the\ndescription for REGEXP_LIKE().\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/regexp.html\n\n','mysql> SELECT REGEXP_SUBSTR(\'abc def ghi\', \'[a-z]+\');\n+----------------------------------------+\n| REGEXP_SUBSTR(\'abc def ghi\', \'[a-z]+\') |\n+----------------------------------------+\n| abc                                    |\n+----------------------------------------+\nmysql> SELECT REGEXP_SUBSTR(\'abc def ghi\', \'[a-z]+\', 1, 3);\n+----------------------------------------------+\n| REGEXP_SUBSTR(\'abc def ghi\', \'[a-z]+\', 1, 3) |\n+----------------------------------------------+\n| ghi                                          |\n+----------------------------------------------+\n','https://dev.mysql.com/doc/refman/8.0/en/regexp.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (240,15,'MATCH AGAINST','Syntax:\nMATCH (col1,col2,...) AGAINST (expr [search_modifier])\n\nMySQL has support for full-text indexing and searching:\n\no A full-text index in MySQL is an index of type FULLTEXT.\n\no Full-text indexes can be used only with InnoDB or MyISAM tables, and\n  can be created only for CHAR, VARCHAR, or TEXT columns.\n\no MySQL provides a built-in full-text ngram parser that supports\n  Chinese, Japanese, and Korean (CJK), and an installable MeCab\n  full-text parser plugin for Japanese. Parsing differences are\n  outlined in\n  https://dev.mysql.com/doc/refman/8.0/en/fulltext-search-ngram.html,\n  and\n  https://dev.mysql.com/doc/refman/8.0/en/fulltext-search-mecab.html.\n\no A FULLTEXT index definition can be given in the CREATE TABLE\n  statement when a table is created, or added later using ALTER TABLE\n  or CREATE INDEX.\n\no For large data sets, it is much faster to load your data into a table\n  that has no FULLTEXT index and then create the index after that, than\n  to load data into a table that has an existing FULLTEXT index.\n\nFull-text searching is performed using MATCH() AGAINST() syntax.\nMATCH() takes a comma-separated list that names the columns to be\nsearched. AGAINST takes a string to search for, and an optional\nmodifier that indicates what type of search to perform. The search\nstring must be a string value that is constant during query evaluation.\nThis rules out, for example, a table column because that can differ for\neach row.\n\nThere are three types of full-text searches:\n\no A natural language search interprets the search string as a phrase in\n  natural human language (a phrase in free text). There are no special\n  operators, with the exception of double quote (") characters. The\n  stopword list applies. For more information about stopword lists, see\n  https://dev.mysql.com/doc/refman/8.0/en/fulltext-stopwords.html.\n\n  Full-text searches are natural language searches if the IN NATURAL\n  LANGUAGE MODE modifier is given or if no modifier is given. For more\n  information, see\n  https://dev.mysql.com/doc/refman/8.0/en/fulltext-natural-language.htm\n  l.\n\no A boolean search interprets the search string using the rules of a\n  special query language. The string contains the words to search for.\n  It can also contain operators that specify requirements such that a\n  word must be present or absent in matching rows, or that it should be\n  weighted higher or lower than usual. Certain common words (stopwords)\n  are omitted from the search index and do not match if present in the\n  search string. The IN BOOLEAN MODE modifier specifies a boolean\n  search. For more information, see\n  https://dev.mysql.com/doc/refman/8.0/en/fulltext-boolean.html.\n\no A query expansion search is a modification of a natural language\n  search. The search string is used to perform a natural language\n  search. Then words from the most relevant rows returned by the search\n  are added to the search string and the search is done again. The\n  query returns the rows from the second search. The IN NATURAL\n  LANGUAGE MODE WITH QUERY EXPANSION or WITH QUERY EXPANSION modifier\n  specifies a query expansion search. For more information, see\n  https://dev.mysql.com/doc/refman/8.0/en/fulltext-query-expansion.html\n  .\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/fulltext-search.html\n\n','mysql> SELECT id, body, MATCH (title,body) AGAINST\n    (\'Security implications of running MySQL as root\'\n    IN NATURAL LANGUAGE MODE) AS score\n    FROM articles WHERE MATCH (title,body) AGAINST\n    (\'Security implications of running MySQL as root\'\n    IN NATURAL LANGUAGE MODE);\n+----+-------------------------------------+-----------------+\n| id | body                                | score           |\n+----+-------------------------------------+-----------------+\n|  4 | 1. Never run mysqld as root. 2. ... | 1.5219271183014 |\n|  6 | When configured properly, MySQL ... | 1.3114095926285 |\n+----+-------------------------------------+-----------------+\n2 rows in set (0.00 sec)\n','https://dev.mysql.com/doc/refman/8.0/en/fulltext-search.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (241,16,'BINARY OPERATOR','Syntax:\nBINARY expr\n\nThe BINARY operator converts the expression to a binary string (a\nstring that has the binary character set and binary collation). A\ncommon use for BINARY is to force a character string comparison to be\ndone byte by byte using numeric byte values rather than character by\ncharacter. The BINARY operator also causes trailing spaces in\ncomparisons to be significant. For information about the differences\nbetween the binary collation of the binary character set and the _bin\ncollations of nonbinary character sets, see\nhttps://dev.mysql.com/doc/refman/8.0/en/charset-binary-collations.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/cast-functions.html\n\n','mysql> SELECT \'a\' = \'A\';\n        -> 1\nmysql> SELECT BINARY \'a\' = \'A\';\n        -> 0\nmysql> SELECT \'a\' = \'a \';\n        -> 1\nmysql> SELECT BINARY \'a\' = \'a \';\n        -> 0\n','https://dev.mysql.com/doc/refman/8.0/en/cast-functions.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (242,16,'CAST','Syntax:\nCAST(expr AS type [ARRAY])\n\nCAST(timestamp_value AT TIME ZONE timezone_specifier AS\nDATETIME[(precision)])\n\ntimezone_specifier: [INTERVAL] \'+00:00\' | \'UTC\'\n\nThe CAST() function takes an expression of any type and produces a\nresult value of the specified type, similar to CONVERT(). For more\ninformation, see the description of CONVERT().\n\nIn MySQL 8.0.17 and higher, InnoDB allows the use of an additional\nARRAY keyword for creating a multi-valued index on a JSON array as part\nof CREATE INDEX, CREATE TABLE, and ALTER TABLE statements. ARRAY is not\nsupported except when used to create a multi-valued index in one of\nthese statements, in which case it is required. The column being\nindexed must be a column of type JSON. With ARRAY, the type following\nthe AS keyword may specify any of the types supported by CAST(), with\nthe exceptions of BINARY, JSON, and YEAR. For syntax information and\nexamples, as well as other relevant information, see\nhttps://dev.mysql.com/doc/refman/8.0/en/create-index.html#create-index-\nmulti-valued.\n\n*Note*:\n\nUnlike CAST(), CONVERT() does not support multi-valued index creation\nor the ARRAY keyword.\n\nBeginning with MySQL 8.0.22, CAST() supports retrieval of a TIMESTAMP\nvalue as being in UTC, using the AT TIMEZONE operator. The only\nsupported time zone is UTC; this can be specified as either of \'+00:00\'\nor \'UTC\'. The only return type supported by this syntax is DATETIME,\nwith an optional precision specifier in the range of 0 to 6, inclusive.\n\nTIMESTAMP values that use timezone offsets are also supported.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/cast-functions.html\n\n','mysql> SELECT @@system_time_zone;\n+--------------------+\n| @@system_time_zone |\n+--------------------+\n| EDT                |\n+--------------------+\n1 row in set (0.00 sec)\n\nmysql> CREATE TABLE TZ (c TIMESTAMP);\nQuery OK, 0 rows affected (0.41 sec)\n\nmysql> INSERT INTO tz VALUES\n     >     ROW(CURRENT_TIMESTAMP),\n     >     ROW(\'2020-07-28 14:50:15+1:00\');\nQuery OK, 1 row affected (0.08 sec)\n\nmysql> TABLE tz;\n+---------------------+\n| c                   |\n+---------------------+\n| 2020-07-28 09:22:41 |\n| 2020-07-28 09:50:15 |\n+---------------------+\n2 rows in set (0.00 sec)\n\nmysql> SELECT CAST(c AT TIME ZONE \'+00:00\' AS DATETIME) AS u FROM tz;\n+---------------------+\n| u                   |\n+---------------------+\n| 2020-07-28 13:22:41 |\n| 2020-07-28 13:50:15 |\n+---------------------+\n2 rows in set (0.00 sec)\n\nmysql> SELECT CAST(c AT TIME ZONE \'UTC\' AS DATETIME(2)) AS u FROM tz;\n+------------------------+\n| u                      |\n+------------------------+\n| 2020-07-28 13:22:41.00 |\n| 2020-07-28 13:50:15.00 |\n+------------------------+\n2 rows in set (0.00 sec)\n','https://dev.mysql.com/doc/refman/8.0/en/cast-functions.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (243,16,'CONVERT','Syntax:\nCONVERT(expr USING transcoding_name), CONVERT(expr,type)\n\nThe CONVERT() function takes an expression of any type and produces a\nresult value of the specified type.\n\nCONVERT(... USING ...) is standard SQL syntax. The non-USING form of\nCONVERT() is ODBC syntax.\n\nCONVERT(expr USING transcoding_name) converts data between different\ncharacter sets. In MySQL, transcoding names are the same as the\ncorresponding character set names. For example, this statement converts\nthe string \'abc\' in the default character set to the corresponding\nstring in the utf8mb4 character set:\n\nSELECT CONVERT(\'abc\' USING utf8mb4);\n\nCONVERT(expr, type) syntax (without USING) takes an expression and a\ntype value specifying the result type. This operation may also be\nexpressed as CAST(expr AS type), which is equivalent. These type values\nare permitted:\n\no BINARY[(N)]\n\n  Produces a string with the BINARY data type. For a description of how\n  this affects comparisons, see\n  https://dev.mysql.com/doc/refman/8.0/en/binary-varbinary.html. If the\n  optional length N is given, BINARY(N) causes the cast to use no more\n  than N bytes of the argument. Values shorter than N bytes are padded\n  with 0x00 bytes to a length of N.\n\no CHAR[(N)] [charset_info]\n\n  Produces a string with the CHAR data type. If the optional length N\n  is given, CHAR(N) causes the cast to use no more than N characters of\n  the argument. No padding occurs for values shorter than N characters.\n\n  With no charset_info clause, CHAR produces a string with the default\n  character set. To specify the character set explicitly, these\n  charset_info values are permitted:\n\n  o CHARACTER SET charset_name: Produces a string with the given\n    character set.\n\n  o ASCII: Shorthand for CHARACTER SET latin1.\n\n  o UNICODE: Shorthand for CHARACTER SET ucs2.\n\n  In all cases, the string has the character set default collation.\n\no DATE\n\n  Produces a DATE value.\n\no DATETIME\n\n  Produces a DATETIME value.\n\no DECIMAL[(M[,D])]\n\n  Produces a DECIMAL value. If the optional M and D values are given,\n  they specify the maximum number of digits (the precision) and the\n  number of digits following the decimal point (the scale).\n\no DOUBLE\n\n  Produces a DOUBLE result. Added in MySQL 8.0.17.\n\no FLOAT[(p)]\n\n  If the precision p is not specified, produces a result of type FLOAT.\n  If p is provided and 0 <= < p <= 24, the result is of type FLOAT. If\n  25 <= p <= 53, the result is of type DOUBLE. If p < 0 or p > 53, an\n  error is returned. Added in MySQL 8.0.17.\n\no JSON\n\n  Produces a JSON value. For details on the rules for conversion of\n  values between JSON and other types, see\n  https://dev.mysql.com/doc/refman/8.0/en/json.html#json-comparison.\n\no NCHAR[(N)]\n\n  Like CHAR, but produces a string with the national character set. See\n  https://dev.mysql.com/doc/refman/8.0/en/charset-national.html.\n\n  Unlike CHAR, NCHAR does not permit trailing character set information\n  to be specified.\n\no REAL\n\n  Produces a result of type REAL. This is actually FLOAT if the\n  REAL_AS_FLOAT SQL mode is enabled; otherwise the result is of type\n  DOUBLE.\n\no SIGNED [INTEGER]\n\n  Produces a signed integer value.\n\no spatial_type\n\n  As of MySQL 8.0.24, CAST() and CONVERT() support casting geometry\n  values from one spatial type to another, for certain combinations of\n  spatial types. The following list shows the permitted type\n  combinations, where "MySQL extension" designates casts implemented in\n  MySQL beyond those defined in the SQL/MM standard:\n\n  o From Point to:\n\n    o MultiPoint\n\n    o GeometryCollection\n\n  o From LineString to:\n\n    o Polygon (MySQL extension)\n\n    o MultiPoint (MySQL extension)\n\n    o MultiLineString\n\n    o GeometryCollection\n\n  o From Polygon to:\n\n    o LineString (MySQL extension)\n\n    o MultiLineString (MySQL extension)\n\n    o MultiPolygon\n\n    o GeometryCollection\n\n  o From MultiPoint to:\n\n    o Point\n\n    o LineString (MySQL extension)\n\n    o GeometryCollection\n\n  o From MultiLineString to:\n\n    o LineString\n\n    o Polygon (MySQL extension)\n\n    o MultiPolygon (MySQL extension)\n\n    o GeometryCollection\n\n  o From MultiPolygon to:\n\n    o Polygon\n\n    o MultiLineString (MySQL extension)\n\n    o GeometryCollection\n\n  o From GeometryCollection to:\n\n    o Point\n\n    o LineString\n\n    o Polygon\n\n    o MultiPoint\n\n    o MultiLineString\n\n    o MultiPolygon\n\n  In spatial casts, GeometryCollection and GeomCollection are synonyms\n  for the same result type.\n\n  Some conditions apply to all spatial type casts, and some conditions\n  apply only when the cast result is to have a particular spatial type.\n  For information about terms such as "well-formed geometry," see\n  https://dev.mysql.com/doc/refman/8.0/en/geometry-well-formedness-vali\n  dity.html.\n\n  o https://dev.mysql.com/doc/refman/8.0/en/cast-functions.html#spatial\n    -cast-general-conditions\n\n  o https://dev.mysql.com/doc/refman/8.0/en/cast-functions.html#spatial\n    -cast-point-conditions\n\n  o https://dev.mysql.com/doc/refman/8.0/en/cast-functions.html#spatial\n    -cast-linestring-conditions\n\n  o https://dev.mysql.com/doc/refman/8.0/en/cast-functions.html#spatial\n    -cast-polygon-conditions\n\n  o https://dev.mysql.com/doc/refman/8.0/en/cast-functions.html#spatial\n    -cast-multipoint-conditions\n\n  o https://dev.mysql.com/doc/refman/8.0/en/cast-functions.html#spatial\n    -cast-multilinestring-conditions\n\n  o https://dev.mysql.com/doc/refman/8.0/en/cast-functions.html#spatial\n    -cast-multipolygon-conditions\n\n  o https://dev.mysql.com/doc/refman/8.0/en/cast-functions.html#spatial\n    -cast-geometrycollection-conditions\n\n  General Conditions for Spatial Casts\n\n  These conditions apply to all spatial casts regardless of the result\n  type:\n\n  o The result of a cast is in the same SRS as that of the expression\n    to cast.\n\n  o Casting between spatial types does not change coordinate values or\n    order.\n\n  o If the expression to cast is NULL, the function result is NULL.\n\n  o Casting to spatial types using the JSON_VALUE() function with a\n    RETURNING clause specifying a spatial type is not permitted.\n\n  o Casting to an ARRAY of spatial types is not permitted.\n\n  o If the spatial type combination is permitted but the expression to\n    cast is not a syntactically well-formed geometry, an\n    ER_GIS_INVALID_DATA\n    (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-referen\n    ce.html#error_er_gis_invalid_data) error occurs.\n\n  o If the spatial type combination is permitted but the expression to\n    cast is a syntactically well-formed geometry in an undefined\n    spatial reference system (SRS), an ER_SRS_NOT_FOUND\n    (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-referen\n    ce.html#error_er_srs_not_found) error occurs.\n\n  o If the expression to cast has a geographic SRS but has a longitude\n    or latitude that is out of range, an error occurs:\n\n    o If a longitude value is not in the range (−180, 180], an\n      ER_GEOMETRY_PARAM_LONGITUDE_OUT_OF_RANGE\n      (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-refer\n      ence.html#error_er_geometry_param_longitude_out_of_range) error\n      occurs.\n\n    o If a latitude value is not in the range [−90, 90], an\n      ER_GEOMETRY_PARAM_LATITUDE_OUT_OF_RANGE\n      (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-refer\n      ence.html#error_er_geometry_param_latitude_out_of_range) error\n      occurs.\n\n    Ranges shown are in degrees. If an SRS uses another unit, the range\n    uses the corresponding values in its unit. The exact range limits\n    deviate slightly due to floating-point arithmetic.\n\n  Conditions for Casts to Point\n\n  These conditions apply when the cast result type is Point:\n\n  o If the expression to cast is a well-formed geometry of type Point,\n    the function result is that Point.\n\n  o If the expression to cast is a well-formed geometry of type\n    MultiPoint containing a single Point, the function result is that\n    Point. If the expression contains more than one Point, an\n    ER_INVALID_CAST_TO_GEOMETRY\n    (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-referen\n    ce.html#error_er_invalid_cast_to_geometry) error occurs.\n\n  o If the expression to cast is a well-formed geometry of type\n    GeometryCollection containing only a single Point, the function\n    result is that Point. If the expression is empty, contains more\n    than one Point, or contains other geometry types, an\n    ER_INVALID_CAST_TO_GEOMETRY\n    (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-referen\n    ce.html#error_er_invalid_cast_to_geometry) error occurs.\n\n  o If the expression to cast is a well-formed geometry of type other\n    than Point, MultiPoint, GeometryCollection, an\n    ER_INVALID_CAST_TO_GEOMETRY\n    (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-referen\n    ce.html#error_er_invalid_cast_to_geometry) error occurs.\n\n  Conditions for Casts to LineString\n\n  These conditions apply when the cast result type is LineString:\n\n  o If the expression to cast is a well-formed geometry of type\n    LineString, the function result is that LineString.\n\n  o If the expression to cast is a well-formed geometry of type Polygon\n    that has no inner rings, the function result is a LineString\n    containing the points of the outer ring in the same order. If the\n    expression has inner rings, an ER_INVALID_CAST_TO_GEOMETRY\n    (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-referen\n    ce.html#error_er_invalid_cast_to_geometry) error occurs.\n\n  o If the expression to cast is a well-formed geometry of type\n    MultiPoint containing at least two points, the function result is a\n    LineString containing the points of the MultiPoint in the order\n    they appear in the expression. If the expression contains only one\n    Point, an ER_INVALID_CAST_TO_GEOMETRY\n    (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-referen\n    ce.html#error_er_invalid_cast_to_geometry) error occurs.\n\n  o If the expression to cast is a well-formed geometry of type\n    MultiLineString containing a single LineString, the function result\n    is that LineString. If the expression contains more than one\n    LineString, an ER_INVALID_CAST_TO_GEOMETRY\n    (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-referen\n    ce.html#error_er_invalid_cast_to_geometry) error occurs.\n\n  o If the expression to cast is a well-formed geometry of type\n    GeometryCollection, containing only a single LineString, the\n    function result is that LineString. If the expression is empty,\n    contains more than one LineString, or contains other geometry\n    types, an ER_INVALID_CAST_TO_GEOMETRY\n    (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-referen\n    ce.html#error_er_invalid_cast_to_geometry) error occurs.\n\n  o If the expression to cast is a well-formed geometry of type other\n    than LineString, Polygon, MultiPoint, MultiLineString, or\n    GeometryCollection, an ER_INVALID_CAST_TO_GEOMETRY\n    (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-referen\n    ce.html#error_er_invalid_cast_to_geometry) error occurs.\n\n  Conditions for Casts to Polygon\n\n  These conditions apply when the cast result type is Polygon:\n\n  o If the expression to cast is a well-formed geometry of type\n    LineString that is a ring (that is, the start and end points are\n    the same), the function result is a Polygon with an outer ring\n    consisting of the points of the LineString in the same order. If\n    the expression is not a ring, an ER_INVALID_CAST_TO_GEOMETRY\n    (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-referen\n    ce.html#error_er_invalid_cast_to_geometry) error occurs. If the\n    ring is not in the correct order (the exterior ring must be\n    counter-clockwise), an ER_INVALID_CAST_POLYGON_RING_DIRECTION\n    (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-referen\n    ce.html#error_er_invalid_cast_polygon_ring_direction) error occurs.\n\n  o If the expression to cast is a well-formed geometry of type\n    Polygon, the function result is that Polygon.\n\n  o If the expression to cast is a well-formed geometry of type\n    MultiLineString where all elements are rings, the function result\n    is a Polygon with the first LineString as outer ring and any\n    additional LineString values as inner rings. If any element of the\n    expression is not a ring, an ER_INVALID_CAST_TO_GEOMETRY\n    (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-referen\n    ce.html#error_er_invalid_cast_to_geometry) error occurs. If any\n    ring is not in the correct order (the exterior ring must be\n    counter-clockwise, interior rings must be clockwise), an\n    ER_INVALID_CAST_POLYGON_RING_DIRECTION\n    (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-referen\n    ce.html#error_er_invalid_cast_polygon_ring_direction) error occurs.\n\n  o If the expression to cast is a well-formed geometry of type\n    MultiPolygon containing a single Polygon, the function result is\n    that Polygon. If the expression contains more than one Polygon, an\n    ER_INVALID_CAST_TO_GEOMETRY\n    (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-referen\n    ce.html#error_er_invalid_cast_to_geometry) error occurs.\n\n  o If the expression to cast is a well-formed geometry of type\n    GeometryCollection containing only a single Polygon, the function\n    result is that Polygon. If the expression is empty, contains more\n    than one Polygon, or contains other geometry types, an\n    ER_INVALID_CAST_TO_GEOMETRY\n    (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-referen\n    ce.html#error_er_invalid_cast_to_geometry) error occurs.\n\n  o If the expression to cast is a well-formed geometry of type other\n    than LineString, Polygon, MultiLineString, MultiPolygon, or\n    GeometryCollection, an ER_INVALID_CAST_TO_GEOMETRY\n    (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-referen\n    ce.html#error_er_invalid_cast_to_geometry) error occurs.\n\n  Conditions for Casts to MultiPoint\n\n  These conditions apply when the cast result type is MultiPoint:\n\n  o If the expression to cast is a well-formed geometry of type Point,\n    the function result is a MultiPoint containing that Point as its\n    sole element.\n\n  o If the expression to cast is a well-formed geometry of type\n    LineString, the function result is a MultiPoint containing the\n    points of the LineString in the same order.\n\n  o If the expression to cast is a well-formed geometry of type\n    MultiPoint, the function result is that MultiPoint.\n\n  o If the expression to cast is a well-formed geometry of type\n    GeometryCollection containing only points, the function result is a\n    MultiPoint containing those points. If the GeometryCollection is\n    empty or contains other geometry types, an\n    ER_INVALID_CAST_TO_GEOMETRY\n    (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-referen\n    ce.html#error_er_invalid_cast_to_geometry) error occurs.\n\n  o If the expression to cast is a well-formed geometry of type other\n    than Point, LineString, MultiPoint, or GeometryCollection, an\n    ER_INVALID_CAST_TO_GEOMETRY\n    (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-referen\n    ce.html#error_er_invalid_cast_to_geometry) error occurs.\n\n  Conditions for Casts to MultiLineString\n\n  These conditions apply when the cast result type is MultiLineString:\n\n  o If the expression to cast is a well-formed geometry of type\n    LineString, the function result is a MultiLineString containing\n    that LineString as its sole element.\n\n  o If the expression to cast is a well-formed geometry of type\n    Polygon, the function result is a MultiLineString containing the\n    outer ring of the Polygon as its first element and any inner rings\n    as additional elements in the order they appear in the expression.\n\n  o If the expression to cast is a well-formed geometry of type\n    MultiLineString, the function result is that MultiLineString.\n\n  o If the expression to cast is a well-formed geometry of type\n    MultiPolygon containing only polygons without inner rings, the\n    function result is a MultiLineString containing the polygon rings\n    in the order they appear in the expression. If the expression\n    contains any polygons with inner rings, an\n    ER_WRONG_PARAMETERS_TO_STORED_FCT\n    (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-referen\n    ce.html#error_er_wrong_parameters_to_stored_fct) error occurs.\n\n  o If the expression to cast is a well-formed geometry of type\n    GeometryCollection containing only linestrings, the function result\n    is a MultiLineString containing those linestrings. If the\n    expression is empty or contains other geometry types, an\n    ER_INVALID_CAST_TO_GEOMETRY\n    (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-referen\n    ce.html#error_er_invalid_cast_to_geometry) error occurs.\n\n  o If the expression to cast is a well-formed geometry of type other\n    than LineString, Polygon, MultiLineString, MultiPolygon, or\n    GeometryCollection, an ER_INVALID_CAST_TO_GEOMETRY\n    (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-referen\n    ce.html#error_er_invalid_cast_to_geometry) error occurs.\n\n  Conditions for Casts to MultiPolygon\n\n  These conditions apply when the cast result type is MultiPolygon:\n\n  o If the expression to cast is a well-formed geometry of type\n    Polygon, the function result is a MultiPolygon containing the\n    Polygon as its sole element.\n\n  o If the expression to cast is a well-formed geometry of type\n    MultiLineString where all elements are rings, the function result\n    is a MultiPolygon containing a Polygon with only an outer ring for\n    each element of the expression. If any element is not a ring, an\n    ER_INVALID_CAST_TO_GEOMETRY\n    (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-referen\n    ce.html#error_er_invalid_cast_to_geometry) error occurs. If any\n    ring is not in the correct order (exterior ring must be\n    counter-clockwise), an ER_INVALID_CAST_POLYGON_RING_DIRECTION\n    (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-referen\n    ce.html#error_er_invalid_cast_polygon_ring_direction) error occurs.\n\n  o If the expression to cast is a well-formed geometry of type\n    MultiPolygon, the function result is that MultiPolygon.\n\n  o If the expression to cast is a well-formed geometry of type\n    GeometryCollection containing only polygons, the function result is\n    a MultiPolygon containing those polygons. If the expression is\n    empty or contains other geometry types, an\n    ER_INVALID_CAST_TO_GEOMETRY\n    (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-referen\n    ce.html#error_er_invalid_cast_to_geometry) error occurs.\n\n  o If the expression to cast is a well-formed geometry of type other\n    than Polygon, MultiLineString, MultiPolygon, or GeometryCollection,\n    an ER_INVALID_CAST_TO_GEOMETRY\n    (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-referen\n    ce.html#error_er_invalid_cast_to_geometry) error occurs.\n\n  Conditions for Casts to GeometryCollection\n\n  These conditions apply when the cast result type is\n  GeometryCollection:\n\n  o GeometryCollection and GeomCollection are synonyms for the same\n    result type.\n\n  o If the expression to cast is a well-formed geometry of type Point,\n    the function result is a GeometryCollection containing that Point\n    as its sole element.\n\n  o If the expression to cast is a well-formed geometry of type\n    LineString, the function result is a GeometryCollection containing\n    that LineString as its sole element.\n\n  o If the expression to cast is a well-formed geometry of type\n    Polygon, the function result is a GeometryCollection containing\n    that Polygon as its sole element.\n\n  o If the expression to cast is a well-formed geometry of type\n    MultiPoint, the function result is a GeometryCollection containing\n    the points in the order they appear in the expression.\n\n  o If the expression to cast is a well-formed geometry of type\n    MultiLineString, the function result is a GeometryCollection\n    containing the linestrings in the order they appear in the\n    expression.\n\n  o If the expression to cast is a well-formed geometry of type\n    MultiPolygon, the function result is a GeometryCollection\n    containing the elements of the MultiPolygon in the order they\n    appear in the expression.\n\n  o If the expression to cast is a well-formed geometry of type\n    GeometryCollection, the function result is that GeometryCollection.\n\no TIME\n\n  Produces a TIME value.\n\no UNSIGNED [INTEGER]\n\n  Produces an unsigned integer value.\n\no YEAR\n\n  Produces a YEAR value. Added in MySQL 8.0.22. These rules govern\n  conversion to YEAR:\n\n  o For a four-digit number in the range 1901-2155 inclusive, or for a\n    string which can be interpreted as a four-digit number in this\n    range, return the corresponding YEAR value.\n\n  o For a number consisting of one or two digits, or for a string which\n    can be interpeted as such a number, return a YEAR value as follows:\n\n    o If the number is in the range 1-69 inclusive, add 2000 and return\n      the sum.\n\n    o If the number is in the range 70-99 inclusive, add 1900 and\n      return the sum.\n\n  o For a string which evaluates to 0, return 2000.\n\n  o For the number 0, return 0.\n\n  o For a DATE, DATETIME, or TIMESTAMP value, return the YEAR portion\n    of the value. For a TIME value, return the current year.\n\n    If you do not specify the type of a TIME argument, you may get a\n    different result from what you expect, as shown here:\n\nmysql> SELECT CONVERT("11:35:00", YEAR), CONVERT(TIME "11:35:00", YEAR);\n+---------------------------+--------------------------------+\n| CONVERT("11:35:00", YEAR) | CONVERT(TIME "11:35:00", YEAR) |\n+---------------------------+--------------------------------+\n|                      2011 |                           2020 |\n+---------------------------+--------------------------------+\n\n  o If the argument is of type DECIMAL, DOUBLE, DECIMAL, or REAL, round\n    the value to the nearest integer, then attempt to cast the value to\n    YEAR using the rules for integer values, as shown here:\n\nmysql> SELECT CONVERT(1944.35, YEAR), CONVERT(1944.50, YEAR);\n+------------------------+------------------------+\n| CONVERT(1944.35, YEAR) | CONVERT(1944.50, YEAR) |\n+------------------------+------------------------+\n|                   1944 |                   1945 |\n+------------------------+------------------------+\n1 row in set (0.00 sec)\n\nmysql> SELECT CONVERT(66.35, YEAR), CONVERT(66.50, YEAR);\n+----------------------+----------------------+\n| CONVERT(66.35, YEAR) | CONVERT(66.50, YEAR) |\n+----------------------+----------------------+\n|                 2066 |                 2067 |\n+----------------------+----------------------+\n1 row in set (0.00 sec)\n\n  o An argument of type GEOMETRY cannot be converted to YEAR.\n\n  o For a value that cannot be successfully converted to YEAR, return\n    NULL.\n\n  A string value containing non-numeric characters which must be\n  truncated prior to conversion raises a warning, as shown here:\n\nmysql> SELECT CONVERT("1979aaa", YEAR);\n+--------------------------+\n| CONVERT("1979aaa", YEAR) |\n+--------------------------+\n|                     1979 |\n+--------------------------+\n1 row in set, 1 warning (0.00 sec)\n\nmysql> SHOW WARNINGS;\n+---------+------+-------------------------------------------+\n| Level   | Code | Message                                   |\n+---------+------+-------------------------------------------+\n| Warning | 1292 | Truncated incorrect YEAR value: \'1979aaa\' |\n+---------+------+-------------------------------------------+\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/cast-functions.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/cast-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (241,16,'BINARY OPERATOR','Syntax:\nBINARY expr\n\nThe BINARY operator converts the expression to a binary string (a\nstring that has the binary character set and binary collation). A\ncommon use for BINARY is to force a character string comparison to be\ndone byte by byte using numeric byte values rather than character by\ncharacter. The BINARY operator also causes trailing spaces in\ncomparisons to be significant. For information about the differences\nbetween the binary collation of the binary character set and the _bin\ncollations of nonbinary character sets, see\nhttps://dev.mysql.com/doc/refman/8.0/en/charset-binary-collations.html.\n\nThe BINARY operator is deprecated as of MySQL 8.0.27, and you should\nexpect its removal in a future version of MySQL. Use CAST(... AS\nBINARY) instead.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/cast-functions.html\n\n','mysql> SELECT \'a\' = \'A\';\n        -> 1\nmysql> SELECT BINARY \'a\' = \'A\';\n        -> 0\nmysql> SELECT \'a\' = \'a \';\n        -> 1\nmysql> SELECT BINARY \'a\' = \'a \';\n        -> 0\n','https://dev.mysql.com/doc/refman/8.0/en/cast-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (242,16,'CAST','Syntax:\nCAST(expr AS type [ARRAY])\n\nCAST(timestamp_value AT TIME ZONE timezone_specifier AS\nDATETIME[(precision)])\n\ntimezone_specifier: [INTERVAL] \'+00:00\' | \'UTC\'\n\nWith CAST(expr AS type syntax, the CAST() function takes an expression\nof any type and produces a result value of the specified type. This\noperation may also be expressed as CONVERT(expr, type), which is\nequivalent.\n\nThese type values are permitted:\n\no BINARY[(N)]\n\n  Produces a string with the VARBINARY data type, except that when the\n  expression expr is empty (zero length), the result type is BINARY(0).\n  If the optional length N is given, BINARY(N) causes the cast to use\n  no more than N bytes of the argument. Values shorter than N bytes are\n  padded with 0x00 bytes to a length of N. If the optional length N is\n  not given, MySQL calculates the maximum length from the expression.\n  If the supplied or calculated length is greater than an internal\n  threshold, the result type is BLOB. If the length is still too long,\n  the result type is LONGBLOB.\n\n  For a description of how casting to BINARY affects comparisons, see\n  https://dev.mysql.com/doc/refman/8.0/en/binary-varbinary.html.\n\no CHAR[(N)] [charset_info]\n\n  Produces a string with the VARCHAR data type. except that when the\n  expression expr is empty (zero length), the result type is CHAR(0).\n  If the optional length N is given, CHAR(N) causes the cast to use no\n  more than N characters of the argument. No padding occurs for values\n  shorter than N characters. If the optional length N is not given,\n  MySQL calculates the maximum length from the expression. If the\n  supplied or calculated length is greater than an internal threshold,\n  the result type is TEXT. If the length is still too long, the result\n  type is LONGTEXT.\n\n  With no charset_info clause, CHAR produces a string with the default\n  character set. To specify the character set explicitly, these\n  charset_info values are permitted:\n\n  o CHARACTER SET charset_name: Produces a string with the given\n    character set.\n\n  o ASCII: Shorthand for CHARACTER SET latin1.\n\n  o UNICODE: Shorthand for CHARACTER SET ucs2.\n\n  In all cases, the string has the character set default collation.\n\no DATE\n\n  Produces a DATE value.\n\no DATETIME[(M)]\n\n  Produces a DATETIME value. If the optional M value is given, it\n  specifies the fractional seconds precision.\n\no DECIMAL[(M[,D])]\n\n  Produces a DECIMAL value. If the optional M and D values are given,\n  they specify the maximum number of digits (the precision) and the\n  number of digits following the decimal point (the scale). If D is\n  omitted, 0 is assumed. If M is omitted, 10 is assumed.\n\no DOUBLE\n\n  Produces a DOUBLE result. Added in MySQL 8.0.17.\n\no FLOAT[(p)]\n\n  If the precision p is not specified, produces a result of type FLOAT.\n  If p is provided and 0 <= < p <= 24, the result is of type FLOAT. If\n  25 <= p <= 53, the result is of type DOUBLE. If p < 0 or p > 53, an\n  error is returned. Added in MySQL 8.0.17.\n\no JSON\n\n  Produces a JSON value. For details on the rules for conversion of\n  values between JSON and other types, see\n  https://dev.mysql.com/doc/refman/8.0/en/json.html#json-comparison.\n\no NCHAR[(N)]\n\n  Like CHAR, but produces a string with the national character set. See\n  https://dev.mysql.com/doc/refman/8.0/en/charset-national.html.\n\n  Unlike CHAR, NCHAR does not permit trailing character set information\n  to be specified.\n\no REAL\n\n  Produces a result of type REAL. This is actually FLOAT if the\n  REAL_AS_FLOAT SQL mode is enabled; otherwise the result is of type\n  DOUBLE.\n\no SIGNED [INTEGER]\n\n  Produces a signed BIGINT value.\n\no spatial_type\n\n  As of MySQL 8.0.24, CAST() and CONVERT() support casting geometry\n  values from one spatial type to another, for certain combinations of\n  spatial types. For details, see\n  https://dev.mysql.com/doc/refman/8.0/en/cast-functions.html#cast-spat\n  ial-types.\n\no TIME[(M)]\n\n  Produces a TIME value. If the optional M value is given, it specifies\n  the fractional seconds precision.\n\no UNSIGNED [INTEGER]\n\n  Produces an unsigned BIGINT value.\n\no YEAR\n\n  Produces a YEAR value. Added in MySQL 8.0.22. These rules govern\n  conversion to YEAR:\n\n  o For a four-digit number in the range 1901-2155 inclusive, or for a\n    string which can be interpreted as a four-digit number in this\n    range, return the corresponding YEAR value.\n\n  o For a number consisting of one or two digits, or for a string which\n    can be interpeted as such a number, return a YEAR value as follows:\n\n    o If the number is in the range 1-69 inclusive, add 2000 and return\n      the sum.\n\n    o If the number is in the range 70-99 inclusive, add 1900 and\n      return the sum.\n\n  o For a string which evaluates to 0, return 2000.\n\n  o For the number 0, return 0.\n\n  o For a DATE, DATETIME, or TIMESTAMP value, return the YEAR portion\n    of the value. For a TIME value, return the current year.\n\n    If you do not specify the type of a TIME argument, you may get a\n    different result from what you expect, as shown here:\n\nmysql> SELECT CAST("11:35:00" AS YEAR), CAST(TIME "11:35:00" AS YEAR);\n+--------------------------+-------------------------------+\n| CAST("11:35:00" AS YEAR) | CAST(TIME "11:35:00" AS YEAR) |\n+--------------------------+-------------------------------+\n|                     2011 |                          2021 |\n+--------------------------+-------------------------------+\n\n  o If the argument is of type DECIMAL, DOUBLE, DECIMAL, or REAL, round\n    the value to the nearest integer, then attempt to cast the value to\n    YEAR using the rules for integer values, as shown here:\n\nmysql> SELECT CAST(1944.35 AS YEAR), CAST(1944.50 AS YEAR);\n+-----------------------+-----------------------+\n| CAST(1944.35 AS YEAR) | CAST(1944.50 AS YEAR) |\n+-----------------------+-----------------------+\n|                  1944 |                  1945 |\n+-----------------------+-----------------------+\n\nmysql> SELECT CAST(66.35 AS YEAR), CAST(66.50 AS YEAR);\n+---------------------+---------------------+\n| CAST(66.35 AS YEAR) | CAST(66.50 AS YEAR) |\n+---------------------+---------------------+\n|                2066 |                2067 |\n+---------------------+---------------------+\n\n  o An argument of type GEOMETRY cannot be converted to YEAR.\n\n  o For a value that cannot be successfully converted to YEAR, return\n    NULL.\n\n  A string value containing non-numeric characters which must be\n  truncated prior to conversion raises a warning, as shown here:\n\nmysql> SELECT CAST("1979aaa" AS YEAR);\n+-------------------------+\n| CAST("1979aaa" AS YEAR) |\n+-------------------------+\n|                    1979 |\n+-------------------------+\n1 row in set, 1 warning (0.00 sec)\n\nmysql> SHOW WARNINGS;\n+---------+------+-------------------------------------------+\n| Level   | Code | Message                                   |\n+---------+------+-------------------------------------------+\n| Warning | 1292 | Truncated incorrect YEAR value: \'1979aaa\' |\n+---------+------+-------------------------------------------+\n\nIn MySQL 8.0.17 and higher, InnoDB allows the use of an additional\nARRAY keyword for creating a multi-valued index on a JSON array as part\nof CREATE INDEX, CREATE TABLE, and ALTER TABLE statements. ARRAY is not\nsupported except when used to create a multi-valued index in one of\nthese statements, in which case it is required. The column being\nindexed must be a column of type JSON. With ARRAY, the type following\nthe AS keyword may specify any of the types supported by CAST(), with\nthe exceptions of BINARY, JSON, and YEAR. For syntax information and\nexamples, as well as other relevant information, see\nhttps://dev.mysql.com/doc/refman/8.0/en/create-index.html#create-index-\nmulti-valued.\n\n*Note*:\n\nCONVERT(), unlike CAST(), does not support multi-valued index creation\nor the ARRAY keyword.\n\nBeginning with MySQL 8.0.22, CAST() supports retrieval of a TIMESTAMP\nvalue as being in UTC, using the AT TIMEZONE operator. The only\nsupported time zone is UTC; this can be specified as either of \'+00:00\'\nor \'UTC\'. The only return type supported by this syntax is DATETIME,\nwith an optional precision specifier in the range of 0 to 6, inclusive.\n\nTIMESTAMP values that use timezone offsets are also supported.\n\nmysql> SELECT @@system_time_zone;\n+--------------------+\n| @@system_time_zone |\n+--------------------+\n| EDT                |\n+--------------------+\n1 row in set (0.00 sec)\n\nmysql> CREATE TABLE TZ (c TIMESTAMP);\nQuery OK, 0 rows affected (0.41 sec)\n\nmysql> INSERT INTO tz VALUES\n     >     ROW(CURRENT_TIMESTAMP),\n     >     ROW(\'2020-07-28 14:50:15+1:00\');\nQuery OK, 1 row affected (0.08 sec)\n\nmysql> TABLE tz;\n+---------------------+\n| c                   |\n+---------------------+\n| 2020-07-28 09:22:41 |\n| 2020-07-28 09:50:15 |\n+---------------------+\n2 rows in set (0.00 sec)\n\nmysql> SELECT CAST(c AT TIME ZONE \'+00:00\' AS DATETIME) AS u FROM tz;\n+---------------------+\n| u                   |\n+---------------------+\n| 2020-07-28 13:22:41 |\n| 2020-07-28 13:50:15 |\n+---------------------+\n2 rows in set (0.00 sec)\n\nmysql> SELECT CAST(c AT TIME ZONE \'UTC\' AS DATETIME(2)) AS u FROM tz;\n+------------------------+\n| u                      |\n+------------------------+\n| 2020-07-28 13:22:41.00 |\n| 2020-07-28 13:50:15.00 |\n+------------------------+\n2 rows in set (0.00 sec)\n\nIf you use \'UTC\' as the time zone specifier with this form of CAST(),\nand the server raises an error such as Unknown or incorrect time zone:\n\'UTC\', you may need to install the MySQL time zone tables (see\nhttps://dev.mysql.com/doc/refman/8.0/en/time-zone-support.html#time-zon\ne-installation).\n\nAT TIME ZONE does not support the ARRAY keyword, and is not supported\nby the CONVERT() function.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/cast-functions.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/cast-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (243,16,'CONVERT','Syntax:\nCONVERT(expr USING transcoding_name)\n\nCONVERT(expr,type)\n\nCONVERT(expr USING transcoding_name) is standard SQL syntax. The\nnon-USING form of CONVERT() is ODBC syntax.\n\nCONVERT(expr USING transcoding_name) converts data between different\ncharacter sets. In MySQL, transcoding names are the same as the\ncorresponding character set names. For example, this statement converts\nthe string \'abc\' in the default character set to the corresponding\nstring in the utf8mb4 character set:\n\nSELECT CONVERT(\'abc\' USING utf8mb4);\n\nCONVERT(expr, type) syntax (without USING) takes an expression and a\ntype value specifying a result type, and produces a result value of the\nspecified type. This operation may also be expressed as CAST(expr AS\ntype), which is equivalent. For more information, see the description\nof CAST().\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/cast-functions.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/cast-functions.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (244,17,'EXTRACTVALUE','Syntax:\nExtractValue(xml_frag, xpath_expr)\n\nExtractValue() takes two string arguments, a fragment of XML markup\nxml_frag and an XPath expression xpath_expr (also known as a locator);\nit returns the text (CDATA) of the first text node which is a child of\nthe element or elements matched by the XPath expression.\n\nUsing this function is the equivalent of performing a match using the\nxpath_expr after appending /text(). In other words,\nExtractValue(\'<a><b>Sakila</b></a>\', \'/a/b\') and\nExtractValue(\'<a><b>Sakila</b></a>\', \'/a/b/text()\') produce the same\nresult.\n\nIf multiple matches are found, the content of the first child text node\nof each matching element is returned (in the order matched) as a\nsingle, space-delimited string.\n\nIf no matching text node is found for the expression (including the\nimplicit /text())---for whatever reason, as long as xpath_expr is\nvalid, and xml_frag consists of elements which are properly nested and\nclosed---an empty string is returned. No distinction is made between a\nmatch on an empty element and no match at all. This is by design.\n\nIf you need to determine whether no matching element was found in\nxml_frag or such an element was found but contained no child text\nnodes, you should test the result of an expression that uses the XPath\ncount() function. For example, both of these statements return an empty\nstring, as shown here:\n\nmysql> SELECT ExtractValue(\'<a><b/></a>\', \'/a/b\');\n+-------------------------------------+\n| ExtractValue(\'<a><b/></a>\', \'/a/b\') |\n+-------------------------------------+\n|                                     |\n+-------------------------------------+\n1 row in set (0.00 sec)\n\nmysql> SELECT ExtractValue(\'<a><c/></a>\', \'/a/b\');\n+-------------------------------------+\n| ExtractValue(\'<a><c/></a>\', \'/a/b\') |\n+-------------------------------------+\n|                                     |\n+-------------------------------------+\n1 row in set (0.00 sec)\n\nHowever, you can determine whether there was actually a matching\nelement using the following:\n\nmysql> SELECT ExtractValue(\'<a><b/></a>\', \'count(/a/b)\');\n+-------------------------------------+\n| ExtractValue(\'<a><b/></a>\', \'count(/a/b)\') |\n+-------------------------------------+\n| 1                                   |\n+-------------------------------------+\n1 row in set (0.00 sec)\n\nmysql> SELECT ExtractValue(\'<a><c/></a>\', \'count(/a/b)\');\n+-------------------------------------+\n| ExtractValue(\'<a><c/></a>\', \'count(/a/b)\') |\n+-------------------------------------+\n| 0                                   |\n+-------------------------------------+\n1 row in set (0.01 sec)\n\n*Important*:\n\nExtractValue() returns only CDATA, and does not return any tags that\nmight be contained within a matching tag, nor any of their content (see\nthe result returned as val1 in the following example).\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/xml-functions.html\n\n','mysql> SELECT\n    ->   ExtractValue(\'<a>ccc<b>ddd</b></a>\', \'/a\') AS val1,\n    ->   ExtractValue(\'<a>ccc<b>ddd</b></a>\', \'/a/b\') AS val2,\n    ->   ExtractValue(\'<a>ccc<b>ddd</b></a>\', \'//b\') AS val3,\n    ->   ExtractValue(\'<a>ccc<b>ddd</b></a>\', \'/b\') AS val4,\n    ->   ExtractValue(\'<a>ccc<b>ddd</b><b>eee</b></a>\', \'//b\') AS val5;\n\n+------+------+------+------+---------+\n| val1 | val2 | val3 | val4 | val5    |\n+------+------+------+------+---------+\n| ccc  | ddd  | ddd  |      | ddd eee |\n+------+------+------+------+---------+\n','https://dev.mysql.com/doc/refman/8.0/en/xml-functions.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (245,17,'UPDATEXML','Syntax:\nUpdateXML(xml_target, xpath_expr, new_xml)\n\nThis function replaces a single portion of a given fragment of XML\nmarkup xml_target with a new XML fragment new_xml, and then returns the\nchanged XML. The portion of xml_target that is replaced matches an\nXPath expression xpath_expr supplied by the user.\n\nIf no expression matching xpath_expr is found, or if multiple matches\nare found, the function returns the original xml_target XML fragment.\nAll three arguments should be strings.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/xml-functions.html\n\n','mysql> SELECT\n    ->   UpdateXML(\'<a><b>ccc</b><d></d></a>\', \'/a\', \'<e>fff</e>\') AS val1,\n    ->   UpdateXML(\'<a><b>ccc</b><d></d></a>\', \'/b\', \'<e>fff</e>\') AS val2,\n    ->   UpdateXML(\'<a><b>ccc</b><d></d></a>\', \'//b\', \'<e>fff</e>\') AS val3,\n    ->   UpdateXML(\'<a><b>ccc</b><d></d></a>\', \'/a/d\', \'<e>fff</e>\') AS val4,\n    ->   UpdateXML(\'<a><d></d><b>ccc</b><d></d></a>\', \'/a/d\', \'<e>fff</e>\') AS val5\n    -> \\G\n\n*************************** 1. row ***************************\nval1: <e>fff</e>\nval2: <a><b>ccc</b><d></d></a>\nval3: <a><e>fff</e><d></d></a>\nval4: <a><b>ccc</b><e>fff</e></a>\nval5: <a><d></d><b>ccc</b><d></d></a>\n','https://dev.mysql.com/doc/refman/8.0/en/xml-functions.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (246,18,'|','Syntax:\n|\n\nBitwise OR.\n\nThe result type depends on whether the arguments are evaluated as\nbinary strings or numbers:\n\no Binary-string evaluation occurs when the arguments have a binary\n  string type, and at least one of them is not a hexadecimal literal,\n  bit literal, or NULL literal. Numeric evaluation occurs otherwise,\n  with argument conversion to unsigned 64-bit integers as necessary.\n\no Binary-string evaluation produces a binary string of the same length\n  as the arguments. If the arguments have unequal lengths, an\n  ER_INVALID_BITWISE_OPERANDS_SIZE\n  (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference\n  .html#error_er_invalid_bitwise_operands_size) error occurs. Numeric\n  evaluation produces an unsigned 64-bit integer.\n\nFor more information, see the introductory discussion in this section.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/bit-functions.html\n\n','mysql> SELECT 29 | 15;\n        -> 31\nmysql> SELECT _binary X\'40404040\' | X\'01020304\';\n        -> \'ABCD\'\n','https://dev.mysql.com/doc/refman/8.0/en/bit-functions.html');
@@ -386,7 +386,7 @@
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (284,21,'SESSION_USER','Syntax:\nSESSION_USER()\n\nSESSION_USER() is a synonym for USER().\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/information-functions.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/information-functions.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (285,21,'SYSTEM_USER','Syntax:\nSYSTEM_USER()\n\nSYSTEM_USER() is a synonym for USER().\n\n*Note*:\n\nThe SYSTEM_USER() function is distinct from the SYSTEM_USER privilege.\nThe former returns the current MySQL account name. The latter\ndistinguishes the system user and regular user account categories (see\nhttps://dev.mysql.com/doc/refman/8.0/en/account-categories.html).\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/information-functions.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/information-functions.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (286,21,'USER','Syntax:\nUSER()\n\nReturns the current MySQL user name and host name as a string in the\nutf8 character set.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/information-functions.html\n\n','mysql> SELECT USER();\n        -> \'davida@localhost\'\n','https://dev.mysql.com/doc/refman/8.0/en/information-functions.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (287,21,'VERSION','Syntax:\nVERSION()\n\nReturns a string that indicates the MySQL server version. The string\nuses the utf8 character set. The value might have a suffix in addition\nto the version number. See the description of the version system\nvariable in\nhttps://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/information-functions.html\n\n','mysql> SELECT VERSION();\n        -> \'8.0.25-standard\'\n','https://dev.mysql.com/doc/refman/8.0/en/information-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (287,21,'VERSION','Syntax:\nVERSION()\n\nReturns a string that indicates the MySQL server version. The string\nuses the utf8 character set. The value might have a suffix in addition\nto the version number. See the description of the version system\nvariable in\nhttps://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/information-functions.html\n\n','mysql> SELECT VERSION();\n        -> \'8.0.26-standard\'\n','https://dev.mysql.com/doc/refman/8.0/en/information-functions.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (288,23,'ST_GEOMCOLLFROMTEXT','ST_GeomCollFromText(wkt [, srid [, options]]),\nST_GeometryCollectionFromText(wkt [, srid [, options]]),\nST_GeomCollFromTxt(wkt [, srid [, options]])\n\nConstructs a GeometryCollection value using its WKT representation and\nSRID.\n\nThese functions handle their arguments as described in the introduction\nto this section.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/gis-wkt-functions.html\n\n','mysql> SET @g = "MULTILINESTRING((10 10, 11 11), (9 9, 10 10))";\nmysql> SELECT ST_AsText(ST_GeomCollFromText(@g));\n+--------------------------------------------+\n| ST_AsText(ST_GeomCollFromText(@g))         |\n+--------------------------------------------+\n| MULTILINESTRING((10 10,11 11),(9 9,10 10)) |\n+--------------------------------------------+\n','https://dev.mysql.com/doc/refman/8.0/en/gis-wkt-functions.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (289,23,'ST_GEOMFROMTEXT','ST_GeomFromText(wkt [, srid [, options]]), ST_GeometryFromText(wkt [,\nsrid [, options]])\n\nConstructs a geometry value of any type using its WKT representation\nand SRID.\n\nThese functions handle their arguments as described in the introduction\nto this section.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/gis-wkt-functions.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/gis-wkt-functions.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (290,23,'ST_LINEFROMTEXT','ST_LineFromText(wkt [, srid [, options]]), ST_LineStringFromText(wkt [,\nsrid [, options]])\n\nConstructs a LineString value using its WKT representation and SRID.\n\nThese functions handle their arguments as described in the introduction\nto this section.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/gis-wkt-functions.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/gis-wkt-functions.html');
@@ -445,7 +445,7 @@
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (343,30,'ST_LINEINTERPOLATEPOINT','ST_LineInterpolatePoint(ls, fractional_distance)\n\nThis function takes a LineString geometry and a fractional distance in\nthe range [0.0, 1.0] and returns the Point along the LineString at the\ngiven fraction of the distance from its start point to its endpoint. It\ncan be used to answer questions such as which Point lies halfway along\nthe road described by the geometry argument.\n\nThe function is implemented for LineString geometries in all spatial\nreference systems, both Cartesian and geographic.\n\nIf the fractional_distance argument is 1.0, the result may not be\nexactly the last point of the LineString argument but a point close to\nit due to numerical inaccuracies in approximate-value computations.\n\nA related function, ST_LineInterpolatePoints(), takes similar arguments\nbut returns a MultiPoint consisting of Point values along the\nLineString at each fraction of the distance from its start point to its\nendpoint. For examples of both functions, see the\nST_LineInterpolatePoints() description.\n\nST_LineInterpolatePoint() handles its arguments as described in the\nintroduction to this section, with these exceptions:\n\no If the geometry argument is not a LineString, an\n  ER_UNEXPECTED_GEOMETRY_TYPE\n  (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference\n  .html#error_er_unexpected_geometry_type) error occurs.\n\no If the fractional distance argument is outside the range [0.0, 1.0],\n  an ER_DATA_OUT_OF_RANGE\n  (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference\n  .html#error_er_data_out_of_range) error occurs.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/spatial-operator-functions.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/spatial-operator-functions.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (344,30,'ST_LINEINTERPOLATEPOINTS','ST_LineInterpolatePoints(ls, fractional_distance)\n\nThis function takes a LineString geometry and a fractional distance in\nthe range (0.0, 1.0] and returns the MultiPoint consisting of the\nLineString start point, plus Point values along the LineString at each\nfraction of the distance from its start point to its endpoint. It can\nbe used to answer questions such as which Point values lie every 10% of\nthe way along the road described by the geometry argument.\n\nThe function is implemented for LineString geometries in all spatial\nreference systems, both Cartesian and geographic.\n\nIf the fractional_distance argument divides 1.0 with zero remainder the\nresult may not contain the last point of the LineString argument but a\npoint close to it due to numerical inaccuracies in approximate-value\ncomputations.\n\nA related function, ST_LineInterpolatePoint(), takes similar arguments\nbut returns the Point along the LineString at the given fraction of the\ndistance from its start point to its endpoint.\n\nST_LineInterpolatePoints() handles its arguments as described in the\nintroduction to this section, with these exceptions:\n\no If the geometry argument is not a LineString, an\n  ER_UNEXPECTED_GEOMETRY_TYPE\n  (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference\n  .html#error_er_unexpected_geometry_type) error occurs.\n\no If the fractional distance argument is outside the range [0.0, 1.0],\n  an ER_DATA_OUT_OF_RANGE\n  (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference\n  .html#error_er_data_out_of_range) error occurs.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/spatial-operator-functions.html\n\n','mysql> SET @ls1 = ST_GeomFromText(\'LINESTRING(0 0,0 5,5 5)\');\nmysql> SELECT ST_AsText(ST_LineInterpolatePoint(@ls1, .5));\n+----------------------------------------------+\n| ST_AsText(ST_LineInterpolatePoint(@ls1, .5)) |\n+----------------------------------------------+\n| POINT(0 5)                                   |\n+----------------------------------------------+\nmysql> SELECT ST_AsText(ST_LineInterpolatePoint(@ls1, .75));\n+-----------------------------------------------+\n| ST_AsText(ST_LineInterpolatePoint(@ls1, .75)) |\n+-----------------------------------------------+\n| POINT(2.5 5)                                  |\n+-----------------------------------------------+\nmysql> SELECT ST_AsText(ST_LineInterpolatePoint(@ls1, 1));\n+---------------------------------------------+\n| ST_AsText(ST_LineInterpolatePoint(@ls1, 1)) |\n+---------------------------------------------+\n| POINT(5 5)                                  |\n+---------------------------------------------+\nmysql> SELECT ST_AsText(ST_LineInterpolatePoints(@ls1, .25));\n+------------------------------------------------+\n| ST_AsText(ST_LineInterpolatePoints(@ls1, .25)) |\n+------------------------------------------------+\n| MULTIPOINT((0 2.5),(0 5),(2.5 5),(5 5))        |\n+------------------------------------------------+\n','https://dev.mysql.com/doc/refman/8.0/en/spatial-operator-functions.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (345,30,'ST_POINTATDISTANCE','ST_PointAtDistance(ls, distance)\n\nThis function takes a LineString geometry and a distance in the range\n[0.0, ST_Length(ls)] measured in the unit of the spatial reference\nsystem (SRS) of the LineString, and returns the Point along the\nLineString at that distance from its start point. It can be used to\nanswer questions such as which Point value is 400 meters from the start\nof the road described by the geometry argument.\n\nThe function is implemented for LineString geometries in all spatial\nreference systems, both Cartesian and geographic.\n\nST_PointAtDistance() handles its arguments as described in the\nintroduction to this section, with these exceptions:\n\no If the geometry argument is not a LineString, an\n  ER_UNEXPECTED_GEOMETRY_TYPE\n  (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference\n  .html#error_er_unexpected_geometry_type) error occurs.\n\no If the fractional distance argument is outside the range [0.0,\n  ST_Length(ls)], an ER_DATA_OUT_OF_RANGE\n  (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference\n  .html#error_er_data_out_of_range) error occurs.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/spatial-operator-functions.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/spatial-operator-functions.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (346,30,'ST_SYMDIFFERENCE','ST_SymDifference(g1, g2)\n\nReturns a geometry that represents the point set symmetric difference\nof the geometry values g1 and g2, which is defined as:\n\ng1 symdifference g2 := (g1 union g2) difference (g1 intersection g2)\n\nOr, in function call notation:\n\nST_SymDifference(g1, g2) = ST_Difference(ST_Union(g1, g2), ST_Intersection(g1, g2))\n\nST_SymDifference() handles its arguments as described in the\nintroduction to this section.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/spatial-operator-functions.html\n\n','mysql> SET @g1 = Point(1,1), @g2 = Point(2,2);\nmysql> SELECT ST_AsText(ST_SymDifference(@g1, @g2));\n+---------------------------------------+\n| ST_AsText(ST_SymDifference(@g1, @g2)) |\n+---------------------------------------+\n| MULTIPOINT((1 1),(2 2))               |\n+---------------------------------------+\n','https://dev.mysql.com/doc/refman/8.0/en/spatial-operator-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (346,30,'ST_SYMDIFFERENCE','ST_SymDifference(g1, g2)\n\nReturns a geometry that represents the point set symmetric difference\nof the geometry values g1 and g2, which is defined as:\n\ng1 symdifference g2 := (g1 union g2) difference (g1 intersection g2)\n\nOr, in function call notation:\n\nST_SymDifference(g1, g2) = ST_Difference(ST_Union(g1, g2), ST_Intersection(g1, g2))\n\nThe result is in the same SRS as the geometry arguments.\n\nAs of MySQL 8.0.27, ST_SymDifference() permits arguments in either a\nCartesian or a geographic SRS. Prior to MySQL 8.0.27,\nST_SymDifference() permits arguments in a Cartesian SRS only; for\narguments in a geographic SRS, an ER_NOT_IMPLEMENTED_FOR_GEOGRAPHIC_SRS\n(https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference.h\ntml#error_er_not_implemented_for_geographic_srs) error occurs.\n\nST_SymDifference() handles its arguments as described in the\nintroduction to this section.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/spatial-operator-functions.html\n\n','mysql> SET @g1 = ST_GeomFromText(\'MULTIPOINT(5 0,15 10,15 25)\');\nmysql> SET @g2 = ST_GeomFromText(\'MULTIPOINT(1 1,15 10,15 25)\');\nmysql> SELECT ST_AsText(ST_SymDifference(@g1, @g2));\n+---------------------------------------+\n| ST_AsText(ST_SymDifference(@g1, @g2)) |\n+---------------------------------------+\n| MULTIPOINT((1 1),(5 0))               |\n+---------------------------------------+\n','https://dev.mysql.com/doc/refman/8.0/en/spatial-operator-functions.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (347,30,'ST_TRANSFORM','ST_Transform(g, target_srid)\n\nTransforms a geometry from one spatial reference system (SRS) to\nanother. The return value is a geometry of the same type as the input\ngeometry with all coordinates transformed to the target SRID,\ntarget_srid. Transformation support is limited to geographic SRSs,\nunless the SRID of the geometry argument is the same as the target SRID\nvalue, in which case the return value is the input geometry for any\nvalid SRS.\n\nST_Transform() handles its arguments as described in the introduction\nto this section, with these exceptions:\n\no Geometry arguments that have an SRID value for a geographic SRS do\n  not produce an error.\n\no If the geometry or target SRID argument has an SRID value that refers\n  to an undefined spatial reference system (SRS), an ER_SRS_NOT_FOUND\n  (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference\n  .html#error_er_srs_not_found) error occurs.\n\no If the geometry is in an SRS that ST_Transform() cannot transform\n  from, an ER_TRANSFORM_SOURCE_SRS_NOT_SUPPORTED\n  (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference\n  .html#error_er_transform_source_srs_not_supported) error occurs.\n\no If the target SRID is in an SRS that ST_Transform() cannot transform\n  to, an ER_TRANSFORM_TARGET_SRS_NOT_SUPPORTED\n  (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference\n  .html#error_er_transform_target_srs_not_supported) error occurs.\n\no If the geometry is in an SRS that is not WGS 84 and has no TOWGS84\n  clause, an ER_TRANSFORM_SOURCE_SRS_MISSING_TOWGS84\n  (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference\n  .html#error_er_transform_source_srs_missing_towgs84) error occurs.\n\no If the target SRID is in an SRS that is not WGS 84 and has no TOWGS84\n  clause, an ER_TRANSFORM_TARGET_SRS_MISSING_TOWGS84\n  (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference\n  .html#error_er_transform_target_srs_missing_towgs84) error occurs.\n\nST_SRID(g, target_srid) and ST_Transform(g, target_srid) differ as\nfollows:\n\no ST_SRID() changes the geometry SRID value without transforming its\n  coordinates.\n\no ST_Transform() transforms the geometry coordinates in addition to\n  changing its SRID value.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/spatial-operator-functions.html\n\n','mysql> SET @p = ST_GeomFromText(\'POINT(52.381389 13.064444)\', 4326);\nmysql> SELECT ST_AsText(@p);\n+----------------------------+\n| ST_AsText(@p)              |\n+----------------------------+\n| POINT(52.381389 13.064444) |\n+----------------------------+\nmysql> SET @p = ST_Transform(@p, 4230);\nmysql> SELECT ST_AsText(@p);\n+---------------------------------------------+\n| ST_AsText(@p)                               |\n+---------------------------------------------+\n| POINT(52.38208611407426 13.065520672345304) |\n+---------------------------------------------+\n','https://dev.mysql.com/doc/refman/8.0/en/spatial-operator-functions.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (348,30,'ST_UNION','ST_Union(g1, g2)\n\nReturns a geometry that represents the point set union of the geometry\nvalues g1 and g2. The result is in the same SRS as the geometry\narguments.\n\nAs of MySQL 8.0.26, ST_Union() permits arguments in either a Cartesian\nor a geographic SRS. Prior to MySQL 8.0.26, ST_Union() permits\narguments in a Cartesian SRS only; for arguments in a geographic SRS,\nan ER_NOT_IMPLEMENTED_FOR_GEOGRAPHIC_SRS\n(https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference.h\ntml#error_er_not_implemented_for_geographic_srs) error occurs.\n\nST_Union() handles its arguments as described in the introduction to\nthis section.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/spatial-operator-functions.html\n\n','mysql> SET @g1 = ST_GeomFromText(\'LineString(1 1, 3 3)\');\nmysql> SET @g2 = ST_GeomFromText(\'LineString(1 3, 3 1)\');\nmysql> SELECT ST_AsText(ST_Union(@g1, @g2));\n+--------------------------------------+\n| ST_AsText(ST_Union(@g1, @g2))        |\n+--------------------------------------+\n| MULTILINESTRING((1 1,3 3),(1 3,3 1)) |\n+--------------------------------------+\n','https://dev.mysql.com/doc/refman/8.0/en/spatial-operator-functions.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (349,31,'ST_CONTAINS','ST_Contains(g1, g2)\n\nReturns 1 or 0 to indicate whether g1 completely contains g2. This\ntests the opposite relationship as ST_Within().\n\nST_Contains() handles its arguments as described in the introduction to\nthis section.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/spatial-relation-functions-object-shapes.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/spatial-relation-functions-object-shapes.html');
@@ -593,212 +593,213 @@
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (491,39,'IS_IPV4_MAPPED','Syntax:\nIS_IPV4_MAPPED(expr)\n\nThis function takes an IPv6 address represented in numeric form as a\nbinary string, as returned by INET6_ATON(). It returns 1 if the\nargument is a valid IPv4-mapped IPv6 address, 0 otherwise. IPv4-mapped\naddresses have the form ::ffff:ipv4_address.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/miscellaneous-functions.html\n\n','mysql> SELECT IS_IPV4_MAPPED(INET6_ATON(\'::10.0.5.9\'));\n        -> 0\nmysql> SELECT IS_IPV4_MAPPED(INET6_ATON(\'::ffff:10.0.5.9\'));\n        -> 1\n','https://dev.mysql.com/doc/refman/8.0/en/miscellaneous-functions.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (492,39,'IS_IPV6','Syntax:\nIS_IPV6(expr)\n\nReturns 1 if the argument is a valid IPv6 address specified as a\nstring, 0 otherwise. This function does not consider IPv4 addresses to\nbe valid IPv6 addresses.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/miscellaneous-functions.html\n\n','mysql> SELECT IS_IPV6(\'10.0.5.9\'), IS_IPV6(\'::1\');\n        -> 0, 1\n','https://dev.mysql.com/doc/refman/8.0/en/miscellaneous-functions.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (493,39,'IS_UUID','IS_UUID(string_uuid)\n\nReturns 1 if the argument is a valid string-format UUID, 0 if the\nargument is not a valid UUID, and NULL if the argument is NULL.\n\n"Valid" means that the value is in a format that can be parsed. That\nis, it has the correct length and contains only the permitted\ncharacters (hexadecimal digits in any lettercase and, optionally,\ndashes and curly braces). This format is most common:\n\naaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee\n\nThese other formats are also permitted:\n\naaaaaaaabbbbccccddddeeeeeeeeeeee\n{aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee}\n\nFor the meanings of fields within the value, see the UUID() function\ndescription.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/miscellaneous-functions.html\n\n','mysql> SELECT IS_UUID(\'6ccd780c-baba-1026-9564-5b8c656024db\');\n+-------------------------------------------------+\n| IS_UUID(\'6ccd780c-baba-1026-9564-5b8c656024db\') |\n+-------------------------------------------------+\n|                                               1 |\n+-------------------------------------------------+\nmysql> SELECT IS_UUID(\'6CCD780C-BABA-1026-9564-5B8C656024DB\');\n+-------------------------------------------------+\n| IS_UUID(\'6CCD780C-BABA-1026-9564-5B8C656024DB\') |\n+-------------------------------------------------+\n|                                               1 |\n+-------------------------------------------------+\nmysql> SELECT IS_UUID(\'6ccd780cbaba102695645b8c656024db\');\n+---------------------------------------------+\n| IS_UUID(\'6ccd780cbaba102695645b8c656024db\') |\n+---------------------------------------------+\n|                                           1 |\n+---------------------------------------------+\nmysql> SELECT IS_UUID(\'{6ccd780c-baba-1026-9564-5b8c656024db}\');\n+---------------------------------------------------+\n| IS_UUID(\'{6ccd780c-baba-1026-9564-5b8c656024db}\') |\n+---------------------------------------------------+\n|                                                 1 |\n+---------------------------------------------------+\nmysql> SELECT IS_UUID(\'6ccd780c-baba-1026-9564-5b8c6560\');\n+---------------------------------------------+\n| IS_UUID(\'6ccd780c-baba-1026-9564-5b8c6560\') |\n+---------------------------------------------+\n|                                           0 |\n+---------------------------------------------+\nmysql> SELECT IS_UUID(RAND());\n+-----------------+\n| IS_UUID(RAND()) |\n+-----------------+\n|               0 |\n+-----------------+\n','https://dev.mysql.com/doc/refman/8.0/en/miscellaneous-functions.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (494,39,'MASTER_POS_WAIT','Syntax:\nMASTER_POS_WAIT(log_name,log_pos[,timeout][,channel])\n\nThis function is useful for control of source/replica synchronization.\nIt blocks until the replica has read and applied all updates up to the\nspecified position in the source\'s binary log. The return value is the\nnumber of log events the replica had to wait for to advance to the\nspecified position. The function returns NULL if the replication SQL\nthread is not started, the replica\'s source information is not\ninitialized, the arguments are incorrect, or an error occurs. It\nreturns -1 if the timeout has been exceeded. If the replication SQL\nthread stops while MASTER_POS_WAIT() is waiting, the function returns\nNULL. If the replica is past the specified position, the function\nreturns immediately.\n\nOn a multithreaded replica, the function waits until expiry of the\nlimit set by the slave_checkpoint_group or slave_checkpoint_period\nsystem variable, when the checkpoint operation is called to update the\nstatus of the replica. Depending on the setting for the system\nvariables, the function might therefore return some time after the\nspecified position was reached.\n\nIf binary log transaction compression is in use and the transaction\npayload at the specified position is compressed (as a\nTransaction_payload_event), the function waits until the whole\ntransaction has been read and applied, and the positions have updated.\n\nIf a timeout value is specified, MASTER_POS_WAIT() stops waiting when\ntimeout seconds have elapsed. timeout must be greater than 0; a zero or\nnegative timeout means no timeout.\n\nThe optional channel value enables you to name which replication\nchannel the function applies to. See\nhttps://dev.mysql.com/doc/refman/8.0/en/replication-channels.html for\nmore information.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/miscellaneous-functions.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/miscellaneous-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (494,39,'MASTER_POS_WAIT','Syntax:\nMASTER_POS_WAIT(log_name,log_pos[,timeout][,channel])\n\nThis function is for control of source/replica synchronization. It\nblocks until the replica has read and applied all updates up to the\nspecified position in the source\'s binary log. From MySQL 8.0.26,\nMASTER_POS_WAIT() is deprecated and the alias SOURCE_POS_WAIT() should\nbe used instead. In releases before MySQL 8.0.26, use\nMASTER_POS_WAIT().\n\nThe return value is the number of log events the replica had to wait\nfor to advance to the specified position. The function returns NULL if\nthe replication SQL thread is not started, the replica\'s source\ninformation is not initialized, the arguments are incorrect, or an\nerror occurs. It returns -1 if the timeout has been exceeded. If the\nreplication SQL thread stops while MASTER_POS_WAIT() is waiting, the\nfunction returns NULL. If the replica is past the specified position,\nthe function returns immediately.\n\nOn a multithreaded replica, the function waits until expiry of the\nlimit set by the replica_checkpoint_group, slave_checkpoint_group,\nreplica_checkpoint_period or slave_checkpoint_period system variable,\nwhen the checkpoint operation is called to update the status of the\nreplica. Depending on the setting for the system variables, the\nfunction might therefore return some time after the specified position\nwas reached.\n\nIf binary log transaction compression is in use and the transaction\npayload at the specified position is compressed (as a\nTransaction_payload_event), the function waits until the whole\ntransaction has been read and applied, and the positions have updated.\n\nIf a timeout value is specified, MASTER_POS_WAIT() stops waiting when\ntimeout seconds have elapsed. timeout must be greater than 0; a zero or\nnegative timeout means no timeout.\n\nThe optional channel value enables you to name which replication\nchannel the function applies to. See\nhttps://dev.mysql.com/doc/refman/8.0/en/replication-channels.html for\nmore information.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/miscellaneous-functions.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/miscellaneous-functions.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (495,39,'NAME_CONST','Syntax:\nNAME_CONST(name,value)\n\nReturns the given value. When used to produce a result set column,\nNAME_CONST() causes the column to have the given name. The arguments\nshould be constants.\n\nmysql> SELECT NAME_CONST(\'myname\', 14);\n+--------+\n| myname |\n+--------+\n|     14 |\n+--------+\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/miscellaneous-functions.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/miscellaneous-functions.html');
 INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (496,39,'SLEEP','Syntax:\nSLEEP(duration)\n\nSleeps (pauses) for the number of seconds given by the duration\nargument, then returns 0. The duration may have a fractional part. If\nthe argument is NULL or negative, SLEEP() produces a warning, or an\nerror in strict SQL mode.\n\nWhen sleep returns normally (without interruption), it returns 0:\n\nmysql> SELECT SLEEP(1000);\n+-------------+\n| SLEEP(1000) |\n+-------------+\n|           0 |\n+-------------+\n\nWhen SLEEP() is the only thing invoked by a query that is interrupted,\nit returns 1 and the query itself returns no error. This is true\nwhether the query is killed or times out:\n\no This statement is interrupted using KILL QUERY from another session:\n\nmysql> SELECT SLEEP(1000);\n+-------------+\n| SLEEP(1000) |\n+-------------+\n|           1 |\n+-------------+\n\no This statement is interrupted by timing out:\n\nmysql> SELECT /*+ MAX_EXECUTION_TIME(1) */ SLEEP(1000);\n+-------------+\n| SLEEP(1000) |\n+-------------+\n|           1 |\n+-------------+\n\nWhen SLEEP() is only part of a query that is interrupted, the query\nreturns an error:\n\no This statement is interrupted using KILL QUERY from another session:\n\nmysql> SELECT 1 FROM t1 WHERE SLEEP(1000);\nERROR 1317 (70100): Query execution was interrupted\n\no This statement is interrupted by timing out:\n\nmysql> SELECT /*+ MAX_EXECUTION_TIME(1000) */ 1 FROM t1 WHERE SLEEP(1000);\nERROR 3024 (HY000): Query execution was interrupted, maximum statement\nexecution time exceeded\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/miscellaneous-functions.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/miscellaneous-functions.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (497,39,'UUID','Syntax:\nUUID()\n\nReturns a Universal Unique Identifier (UUID) generated according to RFC\n4122, "A Universally Unique IDentifier (UUID) URN Namespace"\n(http://www.ietf.org/rfc/rfc4122.txt).\n\nA UUID is designed as a number that is globally unique in space and\ntime. Two calls to UUID() are expected to generate two different\nvalues, even if these calls are performed on two separate devices not\nconnected to each other.\n\n*Warning*:\n\nAlthough UUID() values are intended to be unique, they are not\nnecessarily unguessable or unpredictable. If unpredictability is\nrequired, UUID values should be generated some other way.\n\nUUID() returns a value that conforms to UUID version 1 as described in\nRFC 4122. The value is a 128-bit number represented as a utf8 string of\nfive hexadecimal numbers in aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee\nformat:\n\no The first three numbers are generated from the low, middle, and high\n  parts of a timestamp. The high part also includes the UUID version\n  number.\n\no The fourth number preserves temporal uniqueness in case the timestamp\n  value loses monotonicity (for example, due to daylight saving time).\n\no The fifth number is an IEEE 802 node number that provides spatial\n  uniqueness. A random number is substituted if the latter is not\n  available (for example, because the host device has no Ethernet card,\n  or it is unknown how to find the hardware address of an interface on\n  the host operating system). In this case, spatial uniqueness cannot\n  be guaranteed. Nevertheless, a collision should have very low\n  probability.\n\n  The MAC address of an interface is taken into account only on\n  FreeBSD, Linux, and Windows. On other operating systems, MySQL uses a\n  randomly generated 48-bit number.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/miscellaneous-functions.html\n\n','mysql> SELECT UUID();\n        -> \'6ccd780c-baba-1026-9564-5b8c656024db\'\n','https://dev.mysql.com/doc/refman/8.0/en/miscellaneous-functions.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (498,39,'UUID_SHORT','Syntax:\nUUID_SHORT()\n\nReturns a "short" universal identifier as a 64-bit unsigned integer.\nValues returned by UUID_SHORT() differ from the string-format 128-bit\nidentifiers returned by the UUID() function and have different\nuniqueness properties. The value of UUID_SHORT() is guaranteed to be\nunique if the following conditions hold:\n\no The server_id value of the current server is between 0 and 255 and is\n  unique among your set of source and replica servers\n\no You do not set back the system time for your server host between\n  mysqld restarts\n\no You invoke UUID_SHORT() on average fewer than 16 million times per\n  second between mysqld restarts\n\nThe UUID_SHORT() return value is constructed this way:\n\n  (server_id & 255) << 56\n+ (server_startup_time_in_seconds << 24)\n+ incremented_variable++;\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/miscellaneous-functions.html\n\n','mysql> SELECT UUID_SHORT();\n        -> 92395783831158784\n','https://dev.mysql.com/doc/refman/8.0/en/miscellaneous-functions.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (499,39,'UUID_TO_BIN','Syntax:\nUUID_TO_BIN(string_uuid), UUID_TO_BIN(string_uuid, swap_flag)\n\nConverts a string UUID to a binary UUID and returns the result. (The\nIS_UUID() function description lists the permitted string UUID\nformats.) The return binary UUID is a VARBINARY(16) value. If the UUID\nargument is NULL, the return value is NULL. If any argument is invalid,\nan error occurs.\n\nUUID_TO_BIN() takes one or two arguments:\n\no The one-argument form takes a string UUID value. The binary result is\n  in the same order as the string argument.\n\no The two-argument form takes a string UUID value and a flag value:\n\n  o If swap_flag is 0, the two-argument form is equivalent to the\n    one-argument form. The binary result is in the same order as the\n    string argument.\n\n  o If swap_flag is 1, the format of the return value differs: The\n    time-low and time-high parts (the first and third groups of\n    hexadecimal digits, respectively) are swapped. This moves the more\n    rapidly varying part to the right and can improve indexing\n    efficiency if the result is stored in an indexed column.\n\nTime-part swapping assumes the use of UUID version 1 values, such as\nare generated by the UUID() function. For UUID values produced by other\nmeans that do not follow version 1 format, time-part swapping provides\nno benefit. For details about version 1 format, see the UUID() function\ndescription.\n\nSuppose that you have the following string UUID value:\n\nmysql> SET @uuid = \'6ccd780c-baba-1026-9564-5b8c656024db\';\n\nTo convert the string UUID to binary with or without time-part\nswapping, use UUID_TO_BIN():\n\nmysql> SELECT HEX(UUID_TO_BIN(@uuid));\n+----------------------------------+\n| HEX(UUID_TO_BIN(@uuid))          |\n+----------------------------------+\n| 6CCD780CBABA102695645B8C656024DB |\n+----------------------------------+\nmysql> SELECT HEX(UUID_TO_BIN(@uuid, 0));\n+----------------------------------+\n| HEX(UUID_TO_BIN(@uuid, 0))       |\n+----------------------------------+\n| 6CCD780CBABA102695645B8C656024DB |\n+----------------------------------+\nmysql> SELECT HEX(UUID_TO_BIN(@uuid, 1));\n+----------------------------------+\n| HEX(UUID_TO_BIN(@uuid, 1))       |\n+----------------------------------+\n| 1026BABA6CCD780C95645B8C656024DB |\n+----------------------------------+\n\nTo convert a binary UUID returned by UUID_TO_BIN() to a string UUID,\nuse BIN_TO_UUID(). If you produce a binary UUID by calling\nUUID_TO_BIN() with a second argument of 1 to swap time parts, you\nshould also pass a second argument of 1 to BIN_TO_UUID() to unswap the\ntime parts when converting the binary UUID back to a string UUID:\n\nmysql> SELECT BIN_TO_UUID(UUID_TO_BIN(@uuid));\n+--------------------------------------+\n| BIN_TO_UUID(UUID_TO_BIN(@uuid))      |\n+--------------------------------------+\n| 6ccd780c-baba-1026-9564-5b8c656024db |\n+--------------------------------------+\nmysql> SELECT BIN_TO_UUID(UUID_TO_BIN(@uuid,0),0);\n+--------------------------------------+\n| BIN_TO_UUID(UUID_TO_BIN(@uuid,0),0)  |\n+--------------------------------------+\n| 6ccd780c-baba-1026-9564-5b8c656024db |\n+--------------------------------------+\nmysql> SELECT BIN_TO_UUID(UUID_TO_BIN(@uuid,1),1);\n+--------------------------------------+\n| BIN_TO_UUID(UUID_TO_BIN(@uuid,1),1)  |\n+--------------------------------------+\n| 6ccd780c-baba-1026-9564-5b8c656024db |\n+--------------------------------------+\n\nIf the use of time-part swapping is not the same for the conversion in\nboth directions, the original UUID is not recovered properly:\n\nmysql> SELECT BIN_TO_UUID(UUID_TO_BIN(@uuid,0),1);\n+--------------------------------------+\n| BIN_TO_UUID(UUID_TO_BIN(@uuid,0),1)  |\n+--------------------------------------+\n| baba1026-780c-6ccd-9564-5b8c656024db |\n+--------------------------------------+\nmysql> SELECT BIN_TO_UUID(UUID_TO_BIN(@uuid,1),0);\n+--------------------------------------+\n| BIN_TO_UUID(UUID_TO_BIN(@uuid,1),0)  |\n+--------------------------------------+\n| 1026baba-6ccd-780c-9564-5b8c656024db |\n+--------------------------------------+\n\nIf UUID_TO_BIN() is invoked from within the mysql client, binary\nstrings display using hexadecimal notation, depending on the value of\nthe --binary-as-hex. For more information about that option, see\nhttps://dev.mysql.com/doc/refman/8.0/en/mysql.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/miscellaneous-functions.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/miscellaneous-functions.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (500,39,'VALUES','Syntax:\nVALUES(col_name)\n\nIn an INSERT ... ON DUPLICATE KEY UPDATE statement, you can use the\nVALUES(col_name) function in the UPDATE clause to refer to column\nvalues from the INSERT portion of the statement. In other words,\nVALUES(col_name) in the UPDATE clause refers to the value of col_name\nthat would be inserted, had no duplicate-key conflict occurred. This\nfunction is especially useful in multiple-row inserts. The VALUES()\nfunction is meaningful only in the ON DUPLICATE KEY UPDATE clause of\nINSERT statements and returns NULL otherwise. See\nhttps://dev.mysql.com/doc/refman/8.0/en/insert-on-duplicate.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/miscellaneous-functions.html\n\n','mysql> INSERT INTO table (a,b,c) VALUES (1,2,3),(4,5,6)\n    -> ON DUPLICATE KEY UPDATE c=VALUES(a)+VALUES(b);\n','https://dev.mysql.com/doc/refman/8.0/en/miscellaneous-functions.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (501,40,'ALTER DATABASE','Syntax:\nALTER {DATABASE | SCHEMA} [db_name]\n    alter_option ...\n\nalter_option: {\n    [DEFAULT] CHARACTER SET [=] charset_name\n  | [DEFAULT] COLLATE [=] collation_name\n  | [DEFAULT] ENCRYPTION [=] {\'Y\' | \'N\'}\n  | READ ONLY [=] {DEFAULT | 0 | 1}\n}\n\nALTER DATABASE enables you to change the overall characteristics of a\ndatabase. These characteristics are stored in the data dictionary. This\nstatement requires the ALTER privilege on the database. ALTER SCHEMA is\na synonym for ALTER DATABASE.\n\nIf the database name is omitted, the statement applies to the default\ndatabase. In that case, an error occurs if there is no default\ndatabase.\n\nFor any alter_option omitted from the statement, the database retains\nits current option value, with the exception that changing the\ncharacter set may change the collation and vice versa.\n\no https://dev.mysql.com/doc/refman/8.0/en/alter-database.html#alter-dat\n  abase-charset\n\no https://dev.mysql.com/doc/refman/8.0/en/alter-database.html#alter-dat\n  abase-encryption\n\no https://dev.mysql.com/doc/refman/8.0/en/alter-database.html#alter-dat\n  abase-read-only\n\nCharacter Set and Collation Options\n\nThe CHARACTER SET option changes the default database character set.\nThe COLLATE option changes the default database collation. For\ninformation about character set and collation names, see\nhttps://dev.mysql.com/doc/refman/8.0/en/charset.html.\n\nTo see the available character sets and collations, use the SHOW\nCHARACTER SET and SHOW COLLATION statements, respectively. See [HELP\nSHOW CHARACTER SET], and [HELP SHOW COLLATION].\n\nA stored routine that uses the database defaults when the routine is\ncreated includes those defaults as part of its definition. (In a stored\nroutine, variables with character data types use the database defaults\nif the character set or collation are not specified explicitly. See\n[HELP CREATE PROCEDURE].) If you change the default character set or\ncollation for a database, any stored routines that are to use the new\ndefaults must be dropped and recreated.\n\nEncryption Option\n\nThe ENCRYPTION option, introduced in MySQL 8.0.16, defines the default\ndatabase encryption, which is inherited by tables created in the\ndatabase. The permitted values are \'Y\' (encryption enabled) and \'N\'\n(encryption disabled). Only newly created tables inherit the default\ndatabase encryption. For existing tables associated with the database,\ntheir encryption remains unchanged. If the\ntable_encryption_privilege_check system variable is enabled, the\nTABLE_ENCRYPTION_ADMIN privilege is required to specify a default\nencryption setting that differs from the value of the\ndefault_table_encryption system variable. For more information, see\nhttps://dev.mysql.com/doc/refman/8.0/en/innodb-data-encryption.html#inn\nodb-schema-tablespace-encryption-default.\n\nRead Only Option\n\nThe READ ONLY option, introduced in MySQL 8.0.22, controls whether to\npermit modification of the database and objects within it. The\npermitted values are DEFAULT or 0 (not read only) and 1 (read only).\nThis option is useful for database migration because a database for\nwhich READ ONLY is enabled can be migrated to another MySQL instance\nwithout concern that the database might be changed during the\noperation.\n\nWith NDB Cluster, making a database read only on one mysqld server is\nsynchronized to other mysqld servers in the same cluster, so that the\ndatabase becomes read only on all mysqld servers.\n\nThe READ ONLY option, if enabled, is displayed in the\nINFORMATION_SCHEMA SCHEMATA_EXTENSIONS table. See\nhttps://dev.mysql.com/doc/refman/8.0/en/information-schema-schemata-ext\nensions-table.html.\n\nThe READ ONLY option cannot be enabled for these system schemas: mysql,\ninformation_schema, performance_schema.\n\nIn ALTER DATABASE statements, the READ ONLY option interacts with other\ninstances of itself and with other options as follows:\n\no An error occurs if multiple instances of READ ONLY conflict (for\n  example, READ ONLY = 1 READ ONLY = 0).\n\no An ALTER DATABASE statement that contains only (nonconflicting) READ\n  ONLY options is permitted even for a read-only database.\n\no A mix of (nonconflicting) READ ONLY options with other options is\n  permitted if the read-only state of the database either before or\n  after the statement permits modifications. If the read-only state\n  both before and after prohibits changes, an error occurs.\n\n  This statement succeeds whether or not the database is read only:\n\nALTER DATABASE mydb READ ONLY = 0 DEFAULT COLLATE utf8mb4_bin;\n\n  This statement succeeds if the database is not read only, but fails\n  if it is already read only:\n\nALTER DATABASE mydb READ ONLY = 1 DEFAULT COLLATE utf8mb4_bin;\n\nEnabling READ ONLY affects all users of the database, with these\nexceptions that are not subject to read-only checks:\n\no Statements executed by the server as part of server initialization,\n  restart, upgrade, or replication.\n\no Statements in a file named at server startup by the init_file system\n  variable.\n\no TEMPORARY tables; it is possible to create, alter, drop, and write to\n  TEMPORARY tables in a read-only database.\n\no NDB Cluster non-SQL inserts and updates.\n\nOther than for the excepted operations just listed, enabling READ ONLY\nprohibits write operations to the database and its objects, including\ntheir definitions, data, and metadata. The following list details\naffected SQL statements and operations:\n\no The database itself:\n\n  o CREATE DATABASE\n\n  o ALTER DATABASE (except to change the READ ONLY option)\n\n  o DROP DATABASE\n\no Views:\n\n  o CREATE VIEW\n\n  o ALTER VIEW\n\n  o DROP VIEW\n\n  o Selecting from views that invoke functions with side effects.\n\n  o Updating updatable views.\n\n  o Statements that create or drop objects in a writable database are\n    rejected if they affect metadata of a view in a read-only database\n    (for example, by making the view valid or invalid).\n\no Stored routines:\n\n  o CREATE PROCEDURE\n\n  o DROP PROCEDURE\n\n  o CALL (of procedures with side effects)\n\n  o CREATE FUNCTION\n\n  o DROP FUNCTION\n\n  o SELECT (of functions with side effects)\n\n  o For procedures and functions, read-only checks follow prelocking\n    behavior. For CALL statements, read-only checks are done on a\n    per-statement basis, so if some conditionally executed statement\n    writing to a read-only database does not actually execute, the call\n    still succeeds. On the other hand, for a function called within a\n    SELECT, execution of the function body happens in prelocked mode.\n    As long as a some statement within the function writes to a\n    read-only database, execution of the function fails with an error\n    regardless of whether the statement actually executes.\n\no Triggers:\n\n  o CREATE TRIGGER\n\n  o DROP TRIGGER\n\n  o Trigger invocation.\n\no Events:\n\n  o CREATE EVENT\n\n  o ALTER EVENT\n\n  o DROP EVENT\n\n  o Event execution:\n\n    o Executing an event in the database fails because that would\n      change the last-execution timestamp, which is event metadata\n      stored in the data dictionary. Failure of event execution also\n      has the effect of causing the event scheduler to stop.\n\n    o If an event writes to an object in a read-only database,\n      execution of the event fails with an error, but the event\n      scheduler is not stopped.\n\no Tables:\n\n  o CREATE TABLE\n\n  o ALTER TABLE\n\n  o CREATE INDEX\n\n  o DROP INDEX\n\n  o RENAME TABLE\n\n  o TRUNCATE TABLE\n\n  o DROP TABLE\n\n  o DELETE\n\n  o INSERT\n\n  o IMPORT TABLE\n\n  o LOAD DATA\n\n  o LOAD XML\n\n  o REPLACE\n\n  o UPDATE\n\n  o For cascading foreign keys where the child table is in a read-only\n    database, updates and deletes on the parent are rejected even if\n    the child table is not directly affected.\n\n  o For a MERGE table such as CREATE TABLE s1.t(i int) ENGINE MERGE\n    UNION (s2.t, s3.t), INSERT_METHOD=..., the following behavior\n    applies:\n\n    o Inserting into the MERGE table (INSERT into s1.t) fails if at\n      least one of s1, s2, s3 is read only, regardless of insert\n      method. The insert is refused even if it would actually end up in\n      a writable table.\n\n    o Dropping the MERGE table (DROP TABLE s1.t) succeeds as long as s1\n      is not read only. It is permitted to drop a MERGE table that\n      refers to a read-only database.\n\nAn ALTER DATABASE statement blocks until all concurrent transactions\nthat have already accessed an object in the database being altered have\ncommitted. Conversely, a write transaction accessing an object in a\ndatabase being altered in a concurrent ALTER DATABASE blocks until the\nALTER DATABASE has committed.\n\nIf the Clone plugin is used to clone a local or remote data directory,\nthe databases in the clone retain the read-only state they had in the\nsource data directory. The read-only state does not affect the cloning\nprocess itself. If it is not desirable to have the same database\nread-only state in the clone, the option must be changed explicitly for\nthe clone after the cloning process has finished, using ALTER DATABASE\noperations on the clone.\n\nWhen cloning from a donor to a recipient, if the recipient has a user\ndatabase that is read only, cloning fails with an error message.\nCloning may be retried after making the database writable.\n\nREAD ONLY is permitted for ALTER DATABASE, but not for CREATE DATABASE.\nHowever, for a read-only database, the statement produced by SHOW\nCREATE DATABASE does include READ ONLY=1 within a comment to indicate\nits read-only status:\n\nmysql> ALTER DATABASE mydb READ ONLY = 1;\nmysql> SHOW CREATE DATABASE mydb\\G\n*************************** 1. row ***************************\n       Database: mydb\nCreate Database: CREATE DATABASE `mydb`\n                 /*!40100 DEFAULT CHARACTER SET utf8mb4\n                          COLLATE utf8mb4_0900_ai_ci */\n                 /*!80016 DEFAULT ENCRYPTION=\'N\' */\n                 /* READ ONLY = 1 */\n\nIf the server executes a CREATE DATABASE statement containing such a\ncomment, the server ignores the comment and the READ ONLY option is not\nprocessed. This has implications for mysqldump and mysqlpump, which use\nSHOW CREATE DATABASE to produce CREATE DATABASE statements in dump\noutput:\n\no In a dump file, the CREATE DATABASE statement for a read-only\n  database contains the commented READ ONLY option.\n\no The dump file can be restored as usual, but because the server\n  ignores the commented READ ONLY option, the restored database is not\n  read only. If the database is to be read ony after being restored,\n  you must execute ALTER DATABASE manually to make it so.\n\nSuppose that mydb is read only and you dump it as follows:\n\nshell> mysqldump --databases mydb > mydb.sql\n\nA restore operation later must be followed by ALTER DATABASE if mydb\nshould still be read only:\n\nshell> mysql\nmysql> SOURCE mydb.sql;\nmysql> ALTER DATABASE mydb READ ONLY = 1;\n\nMySQL Enterprise Backup is not subject to this issue. It backs up and\nrestores a read-only database like any other, but enables the READ ONLY\noption at restore time if it was enabled at backup time.\n\nALTER DATABASE is written to the binary log, so a change to the READ\nONLY option on a replication source server also affects replicas. To\nprevent this from happening, binary logging must be disabled prior to\nexecution of the ALTER DATABASE statement. For example, to prepare for\nmigrating a database without affecting replicas, perform these\noperations:\n\n1. Within a single session, disable binary logging and enable READ ONLY\n   for the database:\n\nmysql> SET sql_log_bin = OFF;\nmysql> ALTER DATABASE mydb READ ONLY = 1;\n\n2. Dump the database, for example, with mysqldump or mysqlpump:\n\nshell> mysqldump --databases mydb > mydb.sql\n\n3. Within a single session, disable binary logging and disable READ\n   ONLY for the database:\n\nmysql> SET sql_log_bin = OFF;\nmysql> ALTER DATABASE mydb READ ONLY = 0;\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/alter-database.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/alter-database.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (502,40,'ALTER SCHEMA','Syntax:\nALTER {DATABASE | SCHEMA} [db_name]\n    alter_option ...\n\nalter_option: {\n    [DEFAULT] CHARACTER SET [=] charset_name\n  | [DEFAULT] COLLATE [=] collation_name\n  | [DEFAULT] ENCRYPTION [=] {\'Y\' | \'N\'}\n  | READ ONLY [=] {DEFAULT | 0 | 1}\n}\n\nALTER DATABASE enables you to change the overall characteristics of a\ndatabase. These characteristics are stored in the data dictionary. This\nstatement requires the ALTER privilege on the database. ALTER SCHEMA is\na synonym for ALTER DATABASE.\n\nIf the database name is omitted, the statement applies to the default\ndatabase. In that case, an error occurs if there is no default\ndatabase.\n\nFor any alter_option omitted from the statement, the database retains\nits current option value, with the exception that changing the\ncharacter set may change the collation and vice versa.\n\no https://dev.mysql.com/doc/refman/8.0/en/alter-database.html#alter-dat\n  abase-charset\n\no https://dev.mysql.com/doc/refman/8.0/en/alter-database.html#alter-dat\n  abase-encryption\n\no https://dev.mysql.com/doc/refman/8.0/en/alter-database.html#alter-dat\n  abase-read-only\n\nCharacter Set and Collation Options\n\nThe CHARACTER SET option changes the default database character set.\nThe COLLATE option changes the default database collation. For\ninformation about character set and collation names, see\nhttps://dev.mysql.com/doc/refman/8.0/en/charset.html.\n\nTo see the available character sets and collations, use the SHOW\nCHARACTER SET and SHOW COLLATION statements, respectively. See [HELP\nSHOW CHARACTER SET], and [HELP SHOW COLLATION].\n\nA stored routine that uses the database defaults when the routine is\ncreated includes those defaults as part of its definition. (In a stored\nroutine, variables with character data types use the database defaults\nif the character set or collation are not specified explicitly. See\n[HELP CREATE PROCEDURE].) If you change the default character set or\ncollation for a database, any stored routines that are to use the new\ndefaults must be dropped and recreated.\n\nEncryption Option\n\nThe ENCRYPTION option, introduced in MySQL 8.0.16, defines the default\ndatabase encryption, which is inherited by tables created in the\ndatabase. The permitted values are \'Y\' (encryption enabled) and \'N\'\n(encryption disabled). Only newly created tables inherit the default\ndatabase encryption. For existing tables associated with the database,\ntheir encryption remains unchanged. If the\ntable_encryption_privilege_check system variable is enabled, the\nTABLE_ENCRYPTION_ADMIN privilege is required to specify a default\nencryption setting that differs from the value of the\ndefault_table_encryption system variable. For more information, see\nhttps://dev.mysql.com/doc/refman/8.0/en/innodb-data-encryption.html#inn\nodb-schema-tablespace-encryption-default.\n\nRead Only Option\n\nThe READ ONLY option, introduced in MySQL 8.0.22, controls whether to\npermit modification of the database and objects within it. The\npermitted values are DEFAULT or 0 (not read only) and 1 (read only).\nThis option is useful for database migration because a database for\nwhich READ ONLY is enabled can be migrated to another MySQL instance\nwithout concern that the database might be changed during the\noperation.\n\nWith NDB Cluster, making a database read only on one mysqld server is\nsynchronized to other mysqld servers in the same cluster, so that the\ndatabase becomes read only on all mysqld servers.\n\nThe READ ONLY option, if enabled, is displayed in the\nINFORMATION_SCHEMA SCHEMATA_EXTENSIONS table. See\nhttps://dev.mysql.com/doc/refman/8.0/en/information-schema-schemata-ext\nensions-table.html.\n\nThe READ ONLY option cannot be enabled for these system schemas: mysql,\ninformation_schema, performance_schema.\n\nIn ALTER DATABASE statements, the READ ONLY option interacts with other\ninstances of itself and with other options as follows:\n\no An error occurs if multiple instances of READ ONLY conflict (for\n  example, READ ONLY = 1 READ ONLY = 0).\n\no An ALTER DATABASE statement that contains only (nonconflicting) READ\n  ONLY options is permitted even for a read-only database.\n\no A mix of (nonconflicting) READ ONLY options with other options is\n  permitted if the read-only state of the database either before or\n  after the statement permits modifications. If the read-only state\n  both before and after prohibits changes, an error occurs.\n\n  This statement succeeds whether or not the database is read only:\n\nALTER DATABASE mydb READ ONLY = 0 DEFAULT COLLATE utf8mb4_bin;\n\n  This statement succeeds if the database is not read only, but fails\n  if it is already read only:\n\nALTER DATABASE mydb READ ONLY = 1 DEFAULT COLLATE utf8mb4_bin;\n\nEnabling READ ONLY affects all users of the database, with these\nexceptions that are not subject to read-only checks:\n\no Statements executed by the server as part of server initialization,\n  restart, upgrade, or replication.\n\no Statements in a file named at server startup by the init_file system\n  variable.\n\no TEMPORARY tables; it is possible to create, alter, drop, and write to\n  TEMPORARY tables in a read-only database.\n\no NDB Cluster non-SQL inserts and updates.\n\nOther than for the excepted operations just listed, enabling READ ONLY\nprohibits write operations to the database and its objects, including\ntheir definitions, data, and metadata. The following list details\naffected SQL statements and operations:\n\no The database itself:\n\n  o CREATE DATABASE\n\n  o ALTER DATABASE (except to change the READ ONLY option)\n\n  o DROP DATABASE\n\no Views:\n\n  o CREATE VIEW\n\n  o ALTER VIEW\n\n  o DROP VIEW\n\n  o Selecting from views that invoke functions with side effects.\n\n  o Updating updatable views.\n\n  o Statements that create or drop objects in a writable database are\n    rejected if they affect metadata of a view in a read-only database\n    (for example, by making the view valid or invalid).\n\no Stored routines:\n\n  o CREATE PROCEDURE\n\n  o DROP PROCEDURE\n\n  o CALL (of procedures with side effects)\n\n  o CREATE FUNCTION\n\n  o DROP FUNCTION\n\n  o SELECT (of functions with side effects)\n\n  o For procedures and functions, read-only checks follow prelocking\n    behavior. For CALL statements, read-only checks are done on a\n    per-statement basis, so if some conditionally executed statement\n    writing to a read-only database does not actually execute, the call\n    still succeeds. On the other hand, for a function called within a\n    SELECT, execution of the function body happens in prelocked mode.\n    As long as a some statement within the function writes to a\n    read-only database, execution of the function fails with an error\n    regardless of whether the statement actually executes.\n\no Triggers:\n\n  o CREATE TRIGGER\n\n  o DROP TRIGGER\n\n  o Trigger invocation.\n\no Events:\n\n  o CREATE EVENT\n\n  o ALTER EVENT\n\n  o DROP EVENT\n\n  o Event execution:\n\n    o Executing an event in the database fails because that would\n      change the last-execution timestamp, which is event metadata\n      stored in the data dictionary. Failure of event execution also\n      has the effect of causing the event scheduler to stop.\n\n    o If an event writes to an object in a read-only database,\n      execution of the event fails with an error, but the event\n      scheduler is not stopped.\n\no Tables:\n\n  o CREATE TABLE\n\n  o ALTER TABLE\n\n  o CREATE INDEX\n\n  o DROP INDEX\n\n  o RENAME TABLE\n\n  o TRUNCATE TABLE\n\n  o DROP TABLE\n\n  o DELETE\n\n  o INSERT\n\n  o IMPORT TABLE\n\n  o LOAD DATA\n\n  o LOAD XML\n\n  o REPLACE\n\n  o UPDATE\n\n  o For cascading foreign keys where the child table is in a read-only\n    database, updates and deletes on the parent are rejected even if\n    the child table is not directly affected.\n\n  o For a MERGE table such as CREATE TABLE s1.t(i int) ENGINE MERGE\n    UNION (s2.t, s3.t), INSERT_METHOD=..., the following behavior\n    applies:\n\n    o Inserting into the MERGE table (INSERT into s1.t) fails if at\n      least one of s1, s2, s3 is read only, regardless of insert\n      method. The insert is refused even if it would actually end up in\n      a writable table.\n\n    o Dropping the MERGE table (DROP TABLE s1.t) succeeds as long as s1\n      is not read only. It is permitted to drop a MERGE table that\n      refers to a read-only database.\n\nAn ALTER DATABASE statement blocks until all concurrent transactions\nthat have already accessed an object in the database being altered have\ncommitted. Conversely, a write transaction accessing an object in a\ndatabase being altered in a concurrent ALTER DATABASE blocks until the\nALTER DATABASE has committed.\n\nIf the Clone plugin is used to clone a local or remote data directory,\nthe databases in the clone retain the read-only state they had in the\nsource data directory. The read-only state does not affect the cloning\nprocess itself. If it is not desirable to have the same database\nread-only state in the clone, the option must be changed explicitly for\nthe clone after the cloning process has finished, using ALTER DATABASE\noperations on the clone.\n\nWhen cloning from a donor to a recipient, if the recipient has a user\ndatabase that is read only, cloning fails with an error message.\nCloning may be retried after making the database writable.\n\nREAD ONLY is permitted for ALTER DATABASE, but not for CREATE DATABASE.\nHowever, for a read-only database, the statement produced by SHOW\nCREATE DATABASE does include READ ONLY=1 within a comment to indicate\nits read-only status:\n\nmysql> ALTER DATABASE mydb READ ONLY = 1;\nmysql> SHOW CREATE DATABASE mydb\\G\n*************************** 1. row ***************************\n       Database: mydb\nCreate Database: CREATE DATABASE `mydb`\n                 /*!40100 DEFAULT CHARACTER SET utf8mb4\n                          COLLATE utf8mb4_0900_ai_ci */\n                 /*!80016 DEFAULT ENCRYPTION=\'N\' */\n                 /* READ ONLY = 1 */\n\nIf the server executes a CREATE DATABASE statement containing such a\ncomment, the server ignores the comment and the READ ONLY option is not\nprocessed. This has implications for mysqldump and mysqlpump, which use\nSHOW CREATE DATABASE to produce CREATE DATABASE statements in dump\noutput:\n\no In a dump file, the CREATE DATABASE statement for a read-only\n  database contains the commented READ ONLY option.\n\no The dump file can be restored as usual, but because the server\n  ignores the commented READ ONLY option, the restored database is not\n  read only. If the database is to be read ony after being restored,\n  you must execute ALTER DATABASE manually to make it so.\n\nSuppose that mydb is read only and you dump it as follows:\n\nshell> mysqldump --databases mydb > mydb.sql\n\nA restore operation later must be followed by ALTER DATABASE if mydb\nshould still be read only:\n\nshell> mysql\nmysql> SOURCE mydb.sql;\nmysql> ALTER DATABASE mydb READ ONLY = 1;\n\nMySQL Enterprise Backup is not subject to this issue. It backs up and\nrestores a read-only database like any other, but enables the READ ONLY\noption at restore time if it was enabled at backup time.\n\nALTER DATABASE is written to the binary log, so a change to the READ\nONLY option on a replication source server also affects replicas. To\nprevent this from happening, binary logging must be disabled prior to\nexecution of the ALTER DATABASE statement. For example, to prepare for\nmigrating a database without affecting replicas, perform these\noperations:\n\n1. Within a single session, disable binary logging and enable READ ONLY\n   for the database:\n\nmysql> SET sql_log_bin = OFF;\nmysql> ALTER DATABASE mydb READ ONLY = 1;\n\n2. Dump the database, for example, with mysqldump or mysqlpump:\n\nshell> mysqldump --databases mydb > mydb.sql\n\n3. Within a single session, disable binary logging and disable READ\n   ONLY for the database:\n\nmysql> SET sql_log_bin = OFF;\nmysql> ALTER DATABASE mydb READ ONLY = 0;\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/alter-database.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/alter-database.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (503,40,'ALTER EVENT','Syntax:\nALTER\n    [DEFINER = user]\n    EVENT event_name\n    [ON SCHEDULE schedule]\n    [ON COMPLETION [NOT] PRESERVE]\n    [RENAME TO new_event_name]\n    [ENABLE | DISABLE | DISABLE ON SLAVE]\n    [COMMENT \'string\']\n    [DO event_body]\n\nThe ALTER EVENT statement changes one or more of the characteristics of\nan existing event without the need to drop and recreate it. The syntax\nfor each of the DEFINER, ON SCHEDULE, ON COMPLETION, COMMENT, ENABLE /\nDISABLE, and DO clauses is exactly the same as when used with CREATE\nEVENT. (See [HELP CREATE EVENT].)\n\nAny user can alter an event defined on a database for which that user\nhas the EVENT privilege. When a user executes a successful ALTER EVENT\nstatement, that user becomes the definer for the affected event.\n\nALTER EVENT works only with an existing event:\n\nmysql> ALTER EVENT no_such_event \n     >     ON SCHEDULE \n     >       EVERY \'2:3\' DAY_HOUR;\nERROR 1517 (HY000): Unknown event \'no_such_event\'\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/alter-event.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/alter-event.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (504,40,'ALTER FUNCTION','Syntax:\nALTER FUNCTION func_name [characteristic ...]\n\ncharacteristic: {\n    COMMENT \'string\'\n  | LANGUAGE SQL\n  | { CONTAINS SQL | NO SQL | READS SQL DATA | MODIFIES SQL DATA }\n  | SQL SECURITY { DEFINER | INVOKER }\n}\n\nThis statement can be used to change the characteristics of a stored\nfunction. More than one change may be specified in an ALTER FUNCTION\nstatement. However, you cannot change the parameters or body of a\nstored function using this statement; to make such changes, you must\ndrop and re-create the function using DROP FUNCTION and CREATE\nFUNCTION.\n\nYou must have the ALTER ROUTINE privilege for the function. (That\nprivilege is granted automatically to the function creator.) If binary\nlogging is enabled, the ALTER FUNCTION statement might also require the\nSUPER privilege, as described in\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-programs-logging.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/alter-function.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/alter-function.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (505,40,'ALTER INSTANCE','Syntax:\nALTER INSTANCE instance_action\n\ninstance_action: {\n  | {ENABLE|DISABLE} INNODB REDO_LOG\n  | ROTATE INNODB MASTER KEY\n  | ROTATE BINLOG MASTER KEY\n  | RELOAD TLS\n      [FOR CHANNEL {mysql_main | mysql_admin}]\n      [NO ROLLBACK ON ERROR]\n  | RELOAD KEYRING\n}\n\nALTER INSTANCE defines actions applicable to a MySQL server instance.\nThe statement supports these actions:\n\no ALTER INSTANCE {ENABLE | DISABLE} INNODB REDO_LOG\n\n  This action enables or disables InnoDB redo logging. Redo logging is\n  enabled by default. This feature is intended only for loading data\n  into a new MySQL instance. The statement is not written to the binary\n  log. This action was introduced in MySQL 8.0.21.\n\n  *Warning*:\n\n  Do not disable redo logging on a production system. While it is\n  permitted to shutdown and restart the server while redo logging is\n  disabled, an unexpected server stoppage while redo logging is\n  disabled can cause data loss and instance corruption.\n\n  An ALTER INSTANCE [ENABLE|DISABLE] INNODB REDO_LOG operation requires\n  an exclusive backup lock, which prevents other ALTER INSTANCE\n  operations from executing concurrently. Other ALTER INSTANCE\n  operations must wait for the lock to be released before executing.\n\n  For more information, see\n  https://dev.mysql.com/doc/refman/8.0/en/innodb-redo-log.html#innodb-d\n  isable-redo-logging.\n\no ALTER INSTANCE ROTATE INNODB MASTER KEY\n\n  This action rotates the master encryption key used for InnoDB\n  tablespace encryption. Key rotation requires the ENCRYPTION_KEY_ADMIN\n  or SUPER privilege. To perform this action, a keyring plugin must be\n  installed and configured. For instructions, see\n  https://dev.mysql.com/doc/refman/8.0/en/keyring.html.\n\n  ALTER INSTANCE ROTATE INNODB MASTER KEY supports concurrent DML.\n  However, it cannot be run concurrently with CREATE TABLE ...\n  ENCRYPTION or ALTER TABLE ... ENCRYPTION operations, and locks are\n  taken to prevent conflicts that could arise from concurrent execution\n  of these statements. If one of the conflicting statements is running,\n  it must complete before another can proceed.\n\n  ALTER INSTANCE ROTATE INNODB MASTER KEY statements are written to the\n  binary log so that they can be executed on replicated servers.\n\n  For additional ALTER INSTANCE ROTATE INNODB MASTER KEY usage\n  information, see\n  https://dev.mysql.com/doc/refman/8.0/en/innodb-data-encryption.html.\n\no ALTER INSTANCE ROTATE BINLOG MASTER KEY\n\n  This action rotates the binary log master key used for binary log\n  encryption. Key rotation for the binary log master key requires the\n  BINLOG_ENCRYPTION_ADMIN or SUPER privilege. The statement cannot be\n  used if the binlog_encryption system variable is set to OFF. To\n  perform this action, a keyring plugin must be installed and\n  configured. For instructions, see\n  https://dev.mysql.com/doc/refman/8.0/en/keyring.html.\n\n  ALTER INSTANCE ROTATE BINLOG MASTER KEY actions are not written to\n  the binary log and are not executed on replicas. Binary log master\n  key rotation can therefore be carried out in replication environments\n  including a mix of MySQL versions. To schedule regular rotation of\n  the binary log master key on all applicable source and replica\n  servers, you can enable the MySQL Event Scheduler on each server and\n  issue the ALTER INSTANCE ROTATE BINLOG MASTER KEY statement using a\n  CREATE EVENT statement. If you rotate the binary log master key\n  because you suspect that the current or any of the previous binary\n  log master keys might have been compromised, issue the statement on\n  every applicable source and replica server, which enables you to\n  verify immediate compliance.\n\n  For additional ALTER INSTANCE ROTATE BINLOG MASTER KEY usage\n  information, including what to do if the process does not complete\n  correctly or is interrupted by an unexpected server halt, see\n  https://dev.mysql.com/doc/refman/8.0/en/replication-binlog-encryption\n  .html.\n\no ALTER INSTANCE RELOAD TLS\n\n  This action reconfigures a TLS context from the current values of the\n  system variables that define the context. It also updates the status\n  variables that reflect the active context values. This action\n  requires the CONNECTION_ADMIN privilege. For additional information\n  about reconfiguring the TLS context, including which system and\n  status variables are context-related, see\n  https://dev.mysql.com/doc/refman/8.0/en/using-encrypted-connections.h\n  tml#using-encrypted-connections-server-side-runtime-configuration.\n\n  By default, the statement reloads the TLS context for the main\n  connection interface. If the FOR CHANNEL clause (available as of\n  MySQL 8.0.21) is given, the statement reloads the TLS context for the\n  named channel: mysql_main for the main connection interface,\n  mysql_admin for the administrative connection interface. For\n  information about the different interfaces, see\n  https://dev.mysql.com/doc/refman/8.0/en/connection-interfaces.html.\n  The updated TLS context properties are exposed in the Performance\n  Schema tls_channel_status table. See\n  https://dev.mysql.com/doc/refman/8.0/en/performance-schema-tls-channe\n  l-status-table.html.\n\n  Updating the TLS context for the main interface may also affect the\n  administrative interface because unless some nondefault TLS value is\n  configured for that interface, it uses the same TLS context as the\n  main interface.\n\n  By default, the RELOAD TLS action rolls back with an error and has no\n  effect if the configuration values do not permit creation of the new\n  TLS context. The previous context values continue to be used for new\n  connections. If the optional NO ROLLBACK ON ERROR clause is given and\n  the new context cannot be created, rollback does not occur. Instead,\n  a warning is generated and encryption is disabled for new connections\n  on the interface to which the statement applies.\n\n  ALTER INSTANCE RELOAD TLS statements are not written to the binary\n  log (and thus are not replicated). TLS configuration is local and\n  depends on local files not necessarily present on all servers\n  involved.\n\no ALTER INSTANCE RELOAD KEYRING\n\n  If a keyring component is installed, this action tells the component\n  to re-read its configuration file and reinitialize any keyring\n  in-memory data. If you modify the component configuration at runtime,\n  the new configuration does not take effect until you perform this\n  action. Keyring reloading requires the ENCRYPTION_KEY_ADMIN\n  privilege. This action was added in MySQL 8.0.24.\n\n  This action enables reconfiguring only the currently installed\n  keyring component. It does not enable changing which component is\n  installed. For example, if you change the configuration for the\n  installed keyring component, ALTER INSTANCE RELOAD KEYRING causes the\n  new configuration to take effect. On the other hand, if you change\n  the keyring component named in the server manifest file, ALTER\n  INSTANCE RELOAD KEYRING has no effect and the current component\n  remains installed.\n\n  ALTER INSTANCE RELOAD KEYRING statements are not written to the\n  binary log (and thus are not replicated).\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/alter-instance.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/alter-instance.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (506,40,'ALTER LOGFILE GROUP','Syntax:\nALTER LOGFILE GROUP logfile_group\n    ADD UNDOFILE \'file_name\'\n    [INITIAL_SIZE [=] size]\n    [WAIT]\n    ENGINE [=] engine_name\n\nThis statement adds an UNDO file named \'file_name\' to an existing log\nfile group logfile_group. An ALTER LOGFILE GROUP statement has one and\nonly one ADD UNDOFILE clause. No DROP UNDOFILE clause is currently\nsupported.\n\n*Note*:\n\nAll NDB Cluster Disk Data objects share the same namespace. This means\nthat each Disk Data object must be uniquely named (and not merely each\nDisk Data object of a given type). For example, you cannot have a\ntablespace and an undo log file with the same name, or an undo log file\nand a data file with the same name.\n\nThe optional INITIAL_SIZE parameter sets the UNDO file\'s initial size\nin bytes; if not specified, the initial size defaults to 134217728 (128\nMB). You may optionally follow size with a one-letter abbreviation for\nan order of magnitude, similar to those used in my.cnf. Generally, this\nis one of the letters M (megabytes) or G (gigabytes). (Bug #13116514,\nBug #16104705, Bug #62858)\n\nOn 32-bit systems, the maximum supported value for INITIAL_SIZE is\n4294967296 (4 GB). (Bug #29186)\n\nThe minimum allowed value for INITIAL_SIZE is 1048576 (1 MB). (Bug\n#29574)\n\n*Note*:\n\nWAIT is parsed but otherwise ignored. This keyword currently has no\neffect, and is intended for future expansion.\n\nThe ENGINE parameter (required) determines the storage engine which is\nused by this log file group, with engine_name being the name of the\nstorage engine. Currently, the only accepted values for engine_name are\n"NDBCLUSTER" and "NDB". The two values are equivalent.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/alter-logfile-group.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/alter-logfile-group.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (507,40,'ALTER PROCEDURE','Syntax:\nALTER PROCEDURE proc_name [characteristic ...]\n\ncharacteristic: {\n    COMMENT \'string\'\n  | LANGUAGE SQL\n  | { CONTAINS SQL | NO SQL | READS SQL DATA | MODIFIES SQL DATA }\n  | SQL SECURITY { DEFINER | INVOKER }\n}\n\nThis statement can be used to change the characteristics of a stored\nprocedure. More than one change may be specified in an ALTER PROCEDURE\nstatement. However, you cannot change the parameters or body of a\nstored procedure using this statement; to make such changes, you must\ndrop and re-create the procedure using DROP PROCEDURE and CREATE\nPROCEDURE.\n\nYou must have the ALTER ROUTINE privilege for the procedure. By\ndefault, that privilege is granted automatically to the procedure\ncreator. This behavior can be changed by disabling the\nautomatic_sp_privileges system variable. See\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-routines-privileges.html\n.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/alter-procedure.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/alter-procedure.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (508,40,'ALTER SERVER','Syntax:\nALTER SERVER  server_name\n    OPTIONS (option [, option] ...)\n\nAlters the server information for server_name, adjusting any of the\noptions permitted in the CREATE SERVER statement. The corresponding\nfields in the mysql.servers table are updated accordingly. This\nstatement requires the SUPER privilege.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/alter-server.html\n\n','ALTER SERVER s OPTIONS (USER \'sally\');\n','https://dev.mysql.com/doc/refman/8.0/en/alter-server.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (509,40,'ALTER TABLE','Syntax:\nALTER TABLE tbl_name\n    [alter_option [, alter_option] ...]\n    [partition_options]\n\nalter_option: {\n    table_options\n  | ADD [COLUMN] col_name column_definition\n        [FIRST | AFTER col_name]\n  | ADD [COLUMN] (col_name column_definition,...)\n  | ADD {INDEX | KEY} [index_name]\n        [index_type] (key_part,...) [index_option] ...\n  | ADD {FULLTEXT | SPATIAL} [INDEX | KEY] [index_name]\n        (key_part,...) [index_option] ...\n  | ADD [CONSTRAINT [symbol]] PRIMARY KEY\n        [index_type] (key_part,...)\n        [index_option] ...\n  | ADD [CONSTRAINT [symbol]] UNIQUE [INDEX | KEY]\n        [index_name] [index_type] (key_part,...)\n        [index_option] ...\n  | ADD [CONSTRAINT [symbol]] FOREIGN KEY\n        [index_name] (col_name,...)\n        reference_definition\n  | ADD [CONSTRAINT [symbol]] CHECK (expr) [[NOT] ENFORCED]\n  | DROP {CHECK | CONSTRAINT} symbol\n  | ALTER {CHECK | CONSTRAINT} symbol [NOT] ENFORCED\n  | ALGORITHM [=] {DEFAULT | INSTANT | INPLACE | COPY}\n  | ALTER [COLUMN] col_name {\n        SET DEFAULT {literal | (expr)}\n      | SET {VISIBLE | INVISIBLE}\n      | DROP DEFAULT\n    }\n  | ALTER INDEX index_name {VISIBLE | INVISIBLE}\n  | CHANGE [COLUMN] old_col_name new_col_name column_definition\n        [FIRST | AFTER col_name]\n  | [DEFAULT] CHARACTER SET [=] charset_name [COLLATE [=] collation_name]\n  | CONVERT TO CHARACTER SET charset_name [COLLATE collation_name]\n  | {DISABLE | ENABLE} KEYS\n  | {DISCARD | IMPORT} TABLESPACE\n  | DROP [COLUMN] col_name\n  | DROP {INDEX | KEY} index_name\n  | DROP PRIMARY KEY\n  | DROP FOREIGN KEY fk_symbol\n  | FORCE\n  | LOCK [=] {DEFAULT | NONE | SHARED | EXCLUSIVE}\n  | MODIFY [COLUMN] col_name column_definition\n        [FIRST | AFTER col_name]\n  | ORDER BY col_name [, col_name] ...\n  | RENAME COLUMN old_col_name TO new_col_name\n  | RENAME {INDEX | KEY} old_index_name TO new_index_name\n  | RENAME [TO | AS] new_tbl_name\n  | {WITHOUT | WITH} VALIDATION\n}\n\npartition_options:\n    partition_option [partition_option] ...\n\npartition_option: {\n    ADD PARTITION (partition_definition)\n  | DROP PARTITION partition_names\n  | DISCARD PARTITION {partition_names | ALL} TABLESPACE\n  | IMPORT PARTITION {partition_names | ALL} TABLESPACE\n  | TRUNCATE PARTITION {partition_names | ALL}\n  | COALESCE PARTITION number\n  | REORGANIZE PARTITION partition_names INTO (partition_definitions)\n  | EXCHANGE PARTITION partition_name WITH TABLE tbl_name [{WITH | WITHOUT} VALIDATION]\n  | ANALYZE PARTITION {partition_names | ALL}\n  | CHECK PARTITION {partition_names | ALL}\n  | OPTIMIZE PARTITION {partition_names | ALL}\n  | REBUILD PARTITION {partition_names | ALL}\n  | REPAIR PARTITION {partition_names | ALL}\n  | REMOVE PARTITIONING\n}\n\nkey_part: {col_name [(length)] | (expr)} [ASC | DESC]\n\nindex_type:\n    USING {BTREE | HASH}\n\nindex_option: {\n    KEY_BLOCK_SIZE [=] value\n  | index_type\n  | WITH PARSER parser_name\n  | COMMENT \'string\'\n  | {VISIBLE | INVISIBLE}\n}\n\ntable_options:\n    table_option [[,] table_option] ...\n\ntable_option: {\n    AUTOEXTEND_SIZE [=] value\n  | AUTO_INCREMENT [=] value\n  | AVG_ROW_LENGTH [=] value\n  | [DEFAULT] CHARACTER SET [=] charset_name\n  | CHECKSUM [=] {0 | 1}\n  | [DEFAULT] COLLATE [=] collation_name\n  | COMMENT [=] \'string\'\n  | COMPRESSION [=] {\'ZLIB\' | \'LZ4\' | \'NONE\'}\n  | CONNECTION [=] \'connect_string\'\n  | {DATA | INDEX} DIRECTORY [=] \'absolute path to directory\'\n  | DELAY_KEY_WRITE [=] {0 | 1}\n  | ENCRYPTION [=] {\'Y\' | \'N\'}\n  | ENGINE [=] engine_name\n  | ENGINE_ATTRIBUTE [=] \'string\'\n  | INSERT_METHOD [=] { NO | FIRST | LAST }\n  | KEY_BLOCK_SIZE [=] value\n  | MAX_ROWS [=] value\n  | MIN_ROWS [=] value\n  | PACK_KEYS [=] {0 | 1 | DEFAULT}\n  | PASSWORD [=] \'string\'\n  | ROW_FORMAT [=] {DEFAULT | DYNAMIC | FIXED | COMPRESSED | REDUNDANT | COMPACT}\n  | SECONDARY_ENGINE_ATTRIBUTE [=] \'string\'\n  | STATS_AUTO_RECALC [=] {DEFAULT | 0 | 1}\n  | STATS_PERSISTENT [=] {DEFAULT | 0 | 1}\n  | STATS_SAMPLE_PAGES [=] value\n  | TABLESPACE tablespace_name [STORAGE {DISK | MEMORY}]\n  | UNION [=] (tbl_name[,tbl_name]...)\n}\n\npartition_options:\n    (see CREATE TABLE options)\n\nALTER TABLE changes the structure of a table. For example, you can add\nor delete columns, create or destroy indexes, change the type of\nexisting columns, or rename columns or the table itself. You can also\nchange characteristics such as the storage engine used for the table or\nthe table comment.\n\no To use ALTER TABLE, you need ALTER, CREATE, and INSERT privileges for\n  the table. Renaming a table requires ALTER and DROP on the old table,\n  ALTER, CREATE, and INSERT on the new table.\n\no Following the table name, specify the alterations to be made. If none\n  are given, ALTER TABLE does nothing.\n\no The syntax for many of the permissible alterations is similar to\n  clauses of the CREATE TABLE statement. column_definition clauses use\n  the same syntax for ADD and CHANGE as for CREATE TABLE. For more\n  information, see [HELP CREATE TABLE].\n\no The word COLUMN is optional and can be omitted, except for RENAME\n  COLUMN (to distinguish a column-renaming operation from the RENAME\n  table-renaming operation).\n\no Multiple ADD, ALTER, DROP, and CHANGE clauses are permitted in a\n  single ALTER TABLE statement, separated by commas. This is a MySQL\n  extension to standard SQL, which permits only one of each clause per\n  ALTER TABLE statement. For example, to drop multiple columns in a\n  single statement, do this:\n\nALTER TABLE t2 DROP COLUMN c, DROP COLUMN d;\n\no If a storage engine does not support an attempted ALTER TABLE\n  operation, a warning may result. Such warnings can be displayed with\n  SHOW WARNINGS. See [HELP SHOW WARNINGS]. For information on\n  troubleshooting ALTER TABLE, see\n  https://dev.mysql.com/doc/refman/8.0/en/alter-table-problems.html.\n\no For information about generated columns, see\n  https://dev.mysql.com/doc/refman/8.0/en/alter-table-generated-columns\n  .html.\n\no For usage examples, see\n  https://dev.mysql.com/doc/refman/8.0/en/alter-table-examples.html.\n\no InnoDB in MySQL 8.0.17 and later supports addition of multi-valued\n  indexes on JSON columns using a key_part specification can take the\n  form (CAST json_path AS type ARRAY). See\n  https://dev.mysql.com/doc/refman/8.0/en/create-index.html#create-inde\n  x-multi-valued, for detailed information regarding multi-valued index\n  creation and usage of, as well as restrictions and limitations on\n  multi-valued indexes.\n\no With the mysql_info()\n  (https://dev.mysql.com/doc/c-api/8.0/en/mysql-info.html) C API\n  function, you can find out how many rows were copied by ALTER TABLE.\n  See mysql_info()\n  (https://dev.mysql.com/doc/c-api/8.0/en/mysql-info.html).\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/alter-table.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/alter-table.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (510,40,'ALTER TABLESPACE','Syntax:\nALTER [UNDO] TABLESPACE tablespace_name\n  NDB only:\n    {ADD | DROP} DATAFILE \'file_name\'\n    [INITIAL_SIZE [=] size]\n    [WAIT]\n  InnoDB and NDB:\n    [RENAME TO tablespace_name]\n  InnoDB only:\n    [AUTOEXTEND_SIZE [=] \'value\']\n    [SET {ACTIVE | INACTIVE}]\n    [ENCRYPTION [=] {\'Y\' | \'N\'}]\n  InnoDB and NDB:\n    [ENGINE [=] engine_name]\n  Reserved for future use:\n    [ENGINE_ATTRIBUTE [=] \'string\']\n\nThis statement is used with NDB and InnoDB tablespaces. It can be used\nto add a new data file to, or to drop a data file from an NDB\ntablespace. It can also be used to rename an NDB Cluster Disk Data\ntablespace, rename an InnoDB general tablespace, encrypt an InnoDB\ngeneral tablespace, or mark an InnoDB undo tablespace as active or\ninactive.\n\nThe UNDO keyword, introduced in MySQL 8.0.14, is used with the SET\n{ACTIVE | INACTIVE} clause to mark an InnoDB undo tablespace as active\nor inactive. For more information, see\nhttps://dev.mysql.com/doc/refman/8.0/en/innodb-undo-tablespaces.html.\n\nThe ADD DATAFILE variant enables you to specify an initial size for an\nNDB Disk Data tablespace using an INITIAL_SIZE clause, where size is\nmeasured in bytes; the default value is 134217728 (128 MB). You may\noptionally follow size with a one-letter abbreviation for an order of\nmagnitude, similar to those used in my.cnf. Generally, this is one of\nthe letters M (megabytes) or G (gigabytes).\n\nOn 32-bit systems, the maximum supported value for INITIAL_SIZE is\n4294967296 (4 GB). (Bug #29186)\n\nINITIAL_SIZE is rounded, explicitly, as for CREATE TABLESPACE.\n\nOnce a data file has been created, its size cannot be changed; however,\nyou can add more data files to an NDB tablespace using additional ALTER\nTABLESPACE ... ADD DATAFILE statements.\n\nWhen ALTER TABLESPACE ... ADD DATAFILE is used with ENGINE = NDB, a\ndata file is created on each Cluster data node, but only one row is\ngenerated in the INFORMATION_SCHEMA.FILES table. See the description of\nthis table, as well as\nhttps://dev.mysql.com/doc/refman/8.0/en/mysql-cluster-disk-data-objects\n.html, for more information. ADD DATAFILE is not supported with InnoDB\ntablespaces.\n\nUsing DROP DATAFILE with ALTER TABLESPACE drops the data file\n\'file_name\' from an NDB tablespace. You cannot drop a data file from a\ntablespace which is in use by any table; in other words, the data file\nmust be empty (no extents used). See\nhttps://dev.mysql.com/doc/refman/8.0/en/mysql-cluster-disk-data-objects\n.html. In addition, any data file to be dropped must previously have\nbeen added to the tablespace with CREATE TABLESPACE or ALTER\nTABLESPACE. DROP DATAFILE is not supported with InnoDB tablespaces.\n\nWAIT is parsed but otherwise ignored. It is intended for future\nexpansion.\n\nThe ENGINE clause, which specifies the storage engine used by the\ntablespace, is deprecated; expect it to be removed in a future release.\nThe tablespace storage engine is known by the data dictionary, making\nthe ENGINE clause obsolete. If the storage engine is specified, it must\nmatch the tablespace storage engine defined in the data dictionary. The\nonly values for engine_name compatible with NDB tablespaces are NDB and\nNDBCLUSTER.\n\nRENAME TO operations are implicitly performed in autocommit mode,\nregardless of the autocommit setting.\n\nA RENAME TO operation cannot be performed while LOCK TABLES or FLUSH\nTABLES WITH READ LOCK is in effect for tables that reside in the\ntablespace.\n\nExclusive metadata locks are taken on tables that reside in a general\ntablespace while the tablespace is renamed, which prevents concurrent\nDDL. Concurrent DML is supported.\n\nThe CREATE TABLESPACE privilege is required to rename an InnoDB general\ntablespace.\n\nThe AUTOEXTEND_SIZE option defines the amount by which InnoDB extends\nthe size of a tablespace when it becomes full. Introduced in MySQL\n8.0.23. The setting must be a multiple of 4MB. The default setting is\n0, which causes the tablespace to be extended according to the implicit\ndefault behavior. For more information, see\nhttps://dev.mysql.com/doc/refman/8.0/en/innodb-tablespace-autoextend-si\nze.html.\n\nThe ENCRYPTION clause enables or disables page-level data encryption\nfor an InnoDB general tablespace or the mysql system tablespace.\nEncryption support for general tablespaces was introduced in MySQL\n8.0.13. Encryption support for the mysql system tablespace was\nintroduced in MySQL 8.0.16.\n\nA keyring plugin must be installed and configured before encryption can\nbe enabled.\n\nAs of MySQL 8.0.16, if the table_encryption_privilege_check variable is\nenabled, the TABLE_ENCRYPTION_ADMIN privilege is required to alter a\ngeneral tablespace with an ENCRYPTION clause setting that differs from\nthe default_table_encryption setting.\n\nEnabling encryption for a general tablespace fails if any table in the\ntablespace belongs to a schema defined with DEFAULT ENCRYPTION=\'N\'.\nSimilarly, disabling encryption fails if any table in the general\ntablespace belongs to a schema defined with DEFAULT ENCRYPTION=\'Y\'. The\nDEFAULT ENCRYPTION schema option was introduced in MySQL 8.0.16.\n\nIf an ALTER TABLESPACE statement executed on a general tablespace does\nnot include an ENCRYPTION clause, the tablespace retains its current\nencryption status, regardless of the default_table_encryption setting.\n\nWhen a general tablespace or the mysql system tablespace is encrypted,\nall tables residing in the tablespace are encrypted. Likewise, a table\ncreated in an encrypted tablespace is encrypted.\n\nThe INPLACE algorithm is used when altering the ENCRYPTION attribute of\na general tablespace or the mysql system tablespace. The INPLACE\nalgorithm permits concurrent DML on tables that reside in the\ntablespace. Concurrent DDL is blocked.\n\nFor more information, see\nhttps://dev.mysql.com/doc/refman/8.0/en/innodb-data-encryption.html.\n\nThe ENGINE_ATTRIBUTE option (available as of MySQL 8.0.21) is used to\nspecify tablespace attributes for primary storage engines. The option\nis reserved for future use.\n\nPermitted values are a string literal containing a valid JSON document\nor an empty string (\'\'). Invalid JSON is rejected.\n\nALTER TABLESPACE ts1 ENGINE_ATTRIBUTE=\'{"key":"value"}\';\n\nENGINE_ATTRIBUTE values can be repeated without error. In this case,\nthe last specified value is used.\n\nENGINE_ATTRIBUTE values are not checked by the server, nor are they\ncleared when the table\'s storage engine is changed.\n\nIt is not permitted to alter an individual element of a JSON attribute\nvalue. You can only add or replace an attribute.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/alter-tablespace.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/alter-tablespace.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (511,40,'ALTER VIEW','Syntax:\nALTER\n    [ALGORITHM = {UNDEFINED | MERGE | TEMPTABLE}]\n    [DEFINER = user]\n    [SQL SECURITY { DEFINER | INVOKER }]\n    VIEW view_name [(column_list)]\n    AS select_statement\n    [WITH [CASCADED | LOCAL] CHECK OPTION]\n\nThis statement changes the definition of a view, which must exist. The\nsyntax is similar to that for CREATE VIEW see [HELP CREATE VIEW]). This\nstatement requires the CREATE VIEW and DROP privileges for the view,\nand some privilege for each column referred to in the SELECT statement.\nALTER VIEW is permitted only to the definer or users with the\nSET_USER_ID privilege (or the deprecated SUPER privilege).\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/alter-view.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/alter-view.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (512,40,'CREATE DATABASE','Syntax:\nCREATE {DATABASE | SCHEMA} [IF NOT EXISTS] db_name\n    [create_option] ...\n\ncreate_option: [DEFAULT] {\n    CHARACTER SET [=] charset_name\n  | COLLATE [=] collation_name\n  | ENCRYPTION [=] {\'Y\' | \'N\'}\n}\n\nCREATE DATABASE creates a database with the given name. To use this\nstatement, you need the CREATE privilege for the database. CREATE\nSCHEMA is a synonym for CREATE DATABASE.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/create-database.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/create-database.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (513,40,'CREATE SCHEMA','Syntax:\nCREATE {DATABASE | SCHEMA} [IF NOT EXISTS] db_name\n    [create_option] ...\n\ncreate_option: [DEFAULT] {\n    CHARACTER SET [=] charset_name\n  | COLLATE [=] collation_name\n  | ENCRYPTION [=] {\'Y\' | \'N\'}\n}\n\nCREATE DATABASE creates a database with the given name. To use this\nstatement, you need the CREATE privilege for the database. CREATE\nSCHEMA is a synonym for CREATE DATABASE.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/create-database.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/create-database.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (514,40,'CREATE EVENT','Syntax:\nCREATE\n    [DEFINER = user]\n    EVENT\n    [IF NOT EXISTS]\n    event_name\n    ON SCHEDULE schedule\n    [ON COMPLETION [NOT] PRESERVE]\n    [ENABLE | DISABLE | DISABLE ON SLAVE]\n    [COMMENT \'string\']\n    DO event_body;\n\nschedule: {\n    AT timestamp [+ INTERVAL interval] ...\n  | EVERY interval\n    [STARTS timestamp [+ INTERVAL interval] ...]\n    [ENDS timestamp [+ INTERVAL interval] ...]\n}\n\ninterval:\n    quantity {YEAR | QUARTER | MONTH | DAY | HOUR | MINUTE |\n              WEEK | SECOND | YEAR_MONTH | DAY_HOUR | DAY_MINUTE |\n              DAY_SECOND | HOUR_MINUTE | HOUR_SECOND | MINUTE_SECOND}\n\nThis statement creates and schedules a new event. The event does not\nrun unless the Event Scheduler is enabled. For information about\nchecking Event Scheduler status and enabling it if necessary, see\nhttps://dev.mysql.com/doc/refman/8.0/en/events-configuration.html.\n\nCREATE EVENT requires the EVENT privilege for the schema in which the\nevent is to be created. If the DEFINER clause is present, the\nprivileges required depend on the user value, as discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-objects-security.html.\n\nThe minimum requirements for a valid CREATE EVENT statement are as\nfollows:\n\no The keywords CREATE EVENT plus an event name, which uniquely\n  identifies the event in a database schema.\n\no An ON SCHEDULE clause, which determines when and how often the event\n  executes.\n\no A DO clause, which contains the SQL statement to be executed by an\n  event.\n\nThis is an example of a minimal CREATE EVENT statement:\n\nCREATE EVENT myevent\n    ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 1 HOUR\n    DO\n      UPDATE myschema.mytable SET mycol = mycol + 1;\n\nThe previous statement creates an event named myevent. This event\nexecutes once---one hour following its creation---by running an SQL\nstatement that increments the value of the myschema.mytable table\'s\nmycol column by 1.\n\nThe event_name must be a valid MySQL identifier with a maximum length\nof 64 characters. Event names are not case-sensitive, so you cannot\nhave two events named myevent and MyEvent in the same schema. In\ngeneral, the rules governing event names are the same as those for\nnames of stored routines. See\nhttps://dev.mysql.com/doc/refman/8.0/en/identifiers.html.\n\nAn event is associated with a schema. If no schema is indicated as part\nof event_name, the default (current) schema is assumed. To create an\nevent in a specific schema, qualify the event name with a schema using\nschema_name.event_name syntax.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/create-event.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/create-event.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (515,40,'CREATE INDEX','Syntax:\nCREATE [UNIQUE | FULLTEXT | SPATIAL] INDEX index_name\n    [index_type]\n    ON tbl_name (key_part,...)\n    [index_option]\n    [algorithm_option | lock_option] ...\n\nkey_part: {col_name [(length)] | (expr)} [ASC | DESC]\n\nindex_option: {\n    KEY_BLOCK_SIZE [=] value\n  | index_type\n  | WITH PARSER parser_name\n  | COMMENT \'string\'\n  | {VISIBLE | INVISIBLE}\n  | ENGINE_ATTRIBUTE [=] \'string\'\n  | SECONDARY_ENGINE_ATTRIBUTE [=] \'string\'\n}\n\nindex_type:\n    USING {BTREE | HASH}\n\nalgorithm_option:\n    ALGORITHM [=] {DEFAULT | INPLACE | COPY}\n\nlock_option:\n    LOCK [=] {DEFAULT | NONE | SHARED | EXCLUSIVE}\n\nNormally, you create all indexes on a table at the time the table\nitself is created with CREATE TABLE. See [HELP CREATE TABLE]. This\nguideline is especially important for InnoDB tables, where the primary\nkey determines the physical layout of rows in the data file. CREATE\nINDEX enables you to add indexes to existing tables.\n\nCREATE INDEX is mapped to an ALTER TABLE statement to create indexes.\nSee [HELP ALTER TABLE]. CREATE INDEX cannot be used to create a PRIMARY\nKEY; use ALTER TABLE instead. For more information about indexes, see\nhttps://dev.mysql.com/doc/refman/8.0/en/mysql-indexes.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/create-index.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/create-index.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (516,40,'CREATE LOGFILE GROUP','Syntax:\nCREATE LOGFILE GROUP logfile_group\n    ADD UNDOFILE \'undo_file\'\n    [INITIAL_SIZE [=] initial_size]\n    [UNDO_BUFFER_SIZE [=] undo_buffer_size]\n    [REDO_BUFFER_SIZE [=] redo_buffer_size]\n    [NODEGROUP [=] nodegroup_id]\n    [WAIT]\n    [COMMENT [=] \'string\']\n    ENGINE [=] engine_name\n\nThis statement creates a new log file group named logfile_group having\na single UNDO file named \'undo_file\'. A CREATE LOGFILE GROUP statement\nhas one and only one ADD UNDOFILE clause. For rules covering the naming\nof log file groups, see\nhttps://dev.mysql.com/doc/refman/8.0/en/identifiers.html.\n\n*Note*:\n\nAll NDB Cluster Disk Data objects share the same namespace. This means\nthat each Disk Data object must be uniquely named (and not merely each\nDisk Data object of a given type). For example, you cannot have a\ntablespace and a log file group with the same name, or a tablespace and\na data file with the same name.\n\nThere can be only one log file group per NDB Cluster instance at any\ngiven time.\n\nThe optional INITIAL_SIZE parameter sets the UNDO file\'s initial size;\nif not specified, it defaults to 128M (128 megabytes). The optional\nUNDO_BUFFER_SIZE parameter sets the size used by the UNDO buffer for\nthe log file group; The default value for UNDO_BUFFER_SIZE is 8M (eight\nmegabytes); this value cannot exceed the amount of system memory\navailable. Both of these parameters are specified in bytes. You may\noptionally follow either or both of these with a one-letter\nabbreviation for an order of magnitude, similar to those used in\nmy.cnf. Generally, this is one of the letters M (for megabytes) or G\n(for gigabytes).\n\nMemory used for UNDO_BUFFER_SIZE comes from the global pool whose size\nis determined by the value of the SharedGlobalMemory data node\nconfiguration parameter. This includes any default value implied for\nthis option by the setting of the InitialLogFileGroup data node\nconfiguration parameter.\n\nThe maximum permitted for UNDO_BUFFER_SIZE is 629145600 (600 MB).\n\nOn 32-bit systems, the maximum supported value for INITIAL_SIZE is\n4294967296 (4 GB). (Bug #29186)\n\nThe minimum allowed value for INITIAL_SIZE is 1048576 (1 MB).\n\nThe ENGINE option determines the storage engine to be used by this log\nfile group, with engine_name being the name of the storage engine. In\nMySQL 8.0, this must be NDB (or NDBCLUSTER). If ENGINE is not set,\nMySQL tries to use the engine specified by the default_storage_engine\nserver system variable (formerly storage_engine\n(https://dev.mysql.com/doc/refman/5.6/en/server-system-variables.html#s\nysvar_storage_engine)). In any case, if the engine is not specified as\nNDB or NDBCLUSTER, the CREATE LOGFILE GROUP statement appears to\nsucceed but actually fails to create the log file group, as shown here:\n\nmysql> CREATE LOGFILE GROUP lg1\n    ->     ADD UNDOFILE \'undo.dat\' INITIAL_SIZE = 10M;\nQuery OK, 0 rows affected, 1 warning (0.00 sec)\n\nmysql> SHOW WARNINGS;\n+-------+------+------------------------------------------------------------------------------------------------+\n| Level | Code | Message                                                                                        |\n+-------+------+------------------------------------------------------------------------------------------------+\n| Error | 1478 | Table storage engine \'InnoDB\' does not support the create option \'TABLESPACE or LOGFILE GROUP\' |\n+-------+------+------------------------------------------------------------------------------------------------+\n1 row in set (0.00 sec)\n\nmysql> DROP LOGFILE GROUP lg1 ENGINE = NDB;\nERROR 1529 (HY000): Failed to drop LOGFILE GROUP\n\nmysql> CREATE LOGFILE GROUP lg1\n    ->     ADD UNDOFILE \'undo.dat\' INITIAL_SIZE = 10M\n    ->     ENGINE = NDB;\nQuery OK, 0 rows affected (2.97 sec)\n\nThe fact that the CREATE LOGFILE GROUP statement does not actually\nreturn an error when a non-NDB storage engine is named, but rather\nappears to succeed, is a known issue which we hope to address in a\nfuture release of NDB Cluster.\n\nREDO_BUFFER_SIZE, NODEGROUP, WAIT, and COMMENT are parsed but ignored,\nand so have no effect in MySQL 8.0. These options are intended for\nfuture expansion.\n\nWhen used with ENGINE [=] NDB, a log file group and associated UNDO log\nfile are created on each Cluster data node. You can verify that the\nUNDO files were created and obtain information about them by querying\nthe INFORMATION_SCHEMA.FILES table. For example:\n\nmysql> SELECT LOGFILE_GROUP_NAME, LOGFILE_GROUP_NUMBER, EXTRA\n    -> FROM INFORMATION_SCHEMA.FILES\n    -> WHERE FILE_NAME = \'undo_10.dat\';\n+--------------------+----------------------+----------------+\n| LOGFILE_GROUP_NAME | LOGFILE_GROUP_NUMBER | EXTRA          |\n+--------------------+----------------------+----------------+\n| lg_3               |                   11 | CLUSTER_NODE=3 |\n| lg_3               |                   11 | CLUSTER_NODE=4 |\n+--------------------+----------------------+----------------+\n2 rows in set (0.06 sec)\n\nCREATE LOGFILE GROUP is useful only with Disk Data storage for NDB\nCluster. See\nhttps://dev.mysql.com/doc/refman/8.0/en/mysql-cluster-disk-data.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/create-logfile-group.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/create-logfile-group.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (517,40,'CREATE PROCEDURE','Syntax:\nCREATE\n    [DEFINER = user]\n    PROCEDURE sp_name ([proc_parameter[,...]])\n    [characteristic ...] routine_body\n\nCREATE\n    [DEFINER = user]\n    FUNCTION sp_name ([func_parameter[,...]])\n    RETURNS type\n    [characteristic ...] routine_body\n\nproc_parameter:\n    [ IN | OUT | INOUT ] param_name type\n\nfunc_parameter:\n    param_name type\n\ntype:\n    Any valid MySQL data type\n\ncharacteristic: {\n    COMMENT \'string\'\n  | LANGUAGE SQL\n  | [NOT] DETERMINISTIC\n  | { CONTAINS SQL | NO SQL | READS SQL DATA | MODIFIES SQL DATA }\n  | SQL SECURITY { DEFINER | INVOKER }\n}\n\nroutine_body:\n    Valid SQL routine statement\n\nThese statements are used to create a stored routine (a stored\nprocedure or function). That is, the specified routine becomes known to\nthe server. By default, a stored routine is associated with the default\ndatabase. To associate the routine explicitly with a given database,\nspecify the name as db_name.sp_name when you create it.\n\nThe CREATE FUNCTION statement is also used in MySQL to support loadable\nfunctions. See [HELP CREATE FUNCTION loadable function]. A loadable\nfunction can be regarded as an external stored function. Stored\nfunctions share their namespace with loadable functions. See\nhttps://dev.mysql.com/doc/refman/8.0/en/function-resolution.html, for\nthe rules describing how the server interprets references to different\nkinds of functions.\n\nTo invoke a stored procedure, use the CALL statement (see [HELP CALL]).\nTo invoke a stored function, refer to it in an expression. The function\nreturns a value during expression evaluation.\n\nCREATE PROCEDURE and CREATE FUNCTION require the CREATE ROUTINE\nprivilege. If the DEFINER clause is present, the privileges required\ndepend on the user value, as discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-objects-security.html.\nIf binary logging is enabled, CREATE FUNCTION might require the SUPER\nprivilege, as discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-programs-logging.html.\n\nBy default, MySQL automatically grants the ALTER ROUTINE and EXECUTE\nprivileges to the routine creator. This behavior can be changed by\ndisabling the automatic_sp_privileges system variable. See\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-routines-privileges.html\n.\n\nThe DEFINER and SQL SECURITY clauses specify the security context to be\nused when checking access privileges at routine execution time, as\ndescribed later in this section.\n\nIf the routine name is the same as the name of a built-in SQL function,\na syntax error occurs unless you use a space between the name and the\nfollowing parenthesis when defining the routine or invoking it later.\nFor this reason, avoid using the names of existing SQL functions for\nyour own stored routines.\n\nThe IGNORE_SPACE SQL mode applies to built-in functions, not to stored\nroutines. It is always permissible to have spaces after a stored\nroutine name, regardless of whether IGNORE_SPACE is enabled.\n\nThe parameter list enclosed within parentheses must always be present.\nIf there are no parameters, an empty parameter list of () should be\nused. Parameter names are not case-sensitive.\n\nEach parameter is an IN parameter by default. To specify otherwise for\na parameter, use the keyword OUT or INOUT before the parameter name.\n\n*Note*:\n\nSpecifying a parameter as IN, OUT, or INOUT is valid only for a\nPROCEDURE. For a FUNCTION, parameters are always regarded as IN\nparameters.\n\nAn IN parameter passes a value into a procedure. The procedure might\nmodify the value, but the modification is not visible to the caller\nwhen the procedure returns. An OUT parameter passes a value from the\nprocedure back to the caller. Its initial value is NULL within the\nprocedure, and its value is visible to the caller when the procedure\nreturns. An INOUT parameter is initialized by the caller, can be\nmodified by the procedure, and any change made by the procedure is\nvisible to the caller when the procedure returns.\n\nFor each OUT or INOUT parameter, pass a user-defined variable in the\nCALL statement that invokes the procedure so that you can obtain its\nvalue when the procedure returns. If you are calling the procedure from\nwithin another stored procedure or function, you can also pass a\nroutine parameter or local routine variable as an OUT or INOUT\nparameter. If you are calling the procedure from within a trigger, you\ncan also pass NEW.col_name as an OUT or INOUT parameter.\n\nFor information about the effect of unhandled conditions on procedure\nparameters, see\nhttps://dev.mysql.com/doc/refman/8.0/en/conditions-and-parameters.html.\n\nRoutine parameters cannot be referenced in statements prepared within\nthe routine; see\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-program-restrictions.htm\nl.\n\nThe following example shows a simple stored procedure that, given a\ncountry code, counts the number of cities for that country that appear\nin the city table of the world database. The country code is passed\nusing an IN parameter, and the city count is returned using an OUT\nparameter:\n\nmysql> delimiter //\n\nmysql> CREATE PROCEDURE citycount (IN country CHAR(3), OUT cities INT)\n       BEGIN\n         SELECT COUNT(*) INTO cities FROM world.city\n         WHERE CountryCode = country;\n       END//\nQuery OK, 0 rows affected (0.01 sec)\n\nmysql> delimiter ;\n\nmysql> CALL citycount(\'JPN\', @cities); -- cities in Japan\nQuery OK, 1 row affected (0.00 sec)\n\nmysql> SELECT @cities;\n+---------+\n| @cities |\n+---------+\n|     248 |\n+---------+\n1 row in set (0.00 sec)\n\nmysql> CALL citycount(\'FRA\', @cities); -- cities in France\nQuery OK, 1 row affected (0.00 sec)\n\nmysql> SELECT @cities;\n+---------+\n| @cities |\n+---------+\n|      40 |\n+---------+\n1 row in set (0.00 sec)\n\nThe example uses the mysql client delimiter command to change the\nstatement delimiter from ; to // while the procedure is being defined.\nThis enables the ; delimiter used in the procedure body to be passed\nthrough to the server rather than being interpreted by mysql itself.\nSee\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-programs-defining.html.\n\nThe RETURNS clause may be specified only for a FUNCTION, for which it\nis mandatory. It indicates the return type of the function, and the\nfunction body must contain a RETURN value statement. If the RETURN\nstatement returns a value of a different type, the value is coerced to\nthe proper type. For example, if a function specifies an ENUM or SET\nvalue in the RETURNS clause, but the RETURN statement returns an\ninteger, the value returned from the function is the string for the\ncorresponding ENUM member of set of SET members.\n\nThe following example function takes a parameter, performs an operation\nusing an SQL function, and returns the result. In this case, it is\nunnecessary to use delimiter because the function definition contains\nno internal ; statement delimiters:\n\nmysql> CREATE FUNCTION hello (s CHAR(20))\nmysql> RETURNS CHAR(50) DETERMINISTIC\n       RETURN CONCAT(\'Hello, \',s,\'!\');\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> SELECT hello(\'world\');\n+----------------+\n| hello(\'world\') |\n+----------------+\n| Hello, world!  |\n+----------------+\n1 row in set (0.00 sec)\n\nParameter types and function return types can be declared to use any\nvalid data type. The COLLATE attribute can be used if preceded by a\nCHARACTER SET specification.\n\nThe routine_body consists of a valid SQL routine statement. This can be\na simple statement such as SELECT or INSERT, or a compound statement\nwritten using BEGIN and END. Compound statements can contain\ndeclarations, loops, and other control structure statements. The syntax\nfor these statements is described in\nhttps://dev.mysql.com/doc/refman/8.0/en/sql-compound-statements.html.\nIn practice, stored functions tend to use compound statements, unless\nthe body consists of a single RETURN statement.\n\nMySQL permits routines to contain DDL statements, such as CREATE and\nDROP. MySQL also permits stored procedures (but not stored functions)\nto contain SQL transaction statements such as COMMIT. Stored functions\nmay not contain statements that perform explicit or implicit commit or\nrollback. Support for these statements is not required by the SQL\nstandard, which states that each DBMS vendor may decide whether to\npermit them.\n\nStatements that return a result set can be used within a stored\nprocedure but not within a stored function. This prohibition includes\nSELECT statements that do not have an INTO var_list clause and other\nstatements such as SHOW, EXPLAIN, and CHECK TABLE. For statements that\ncan be determined at function definition time to return a result set, a\nNot allowed to return a result set from a function error occurs\n(ER_SP_NO_RETSET\n(https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference.h\ntml#error_er_sp_no_retset)). For statements that can be determined only\nat runtime to return a result set, a PROCEDURE %s can\'t return a result\nset in the given context error occurs (ER_SP_BADSELECT\n(https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference.h\ntml#error_er_sp_badselect)).\n\nUSE statements within stored routines are not permitted. When a routine\nis invoked, an implicit USE db_name is performed (and undone when the\nroutine terminates). The causes the routine to have the given default\ndatabase while it executes. References to objects in databases other\nthan the routine default database should be qualified with the\nappropriate database name.\n\nFor additional information about statements that are not permitted in\nstored routines, see\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-program-restrictions.htm\nl.\n\nFor information about invoking stored procedures from within programs\nwritten in a language that has a MySQL interface, see [HELP CALL].\n\nMySQL stores the sql_mode system variable setting in effect when a\nroutine is created or altered, and always executes the routine with\nthis setting in force, regardless of the current server SQL mode when\nthe routine begins executing.\n\nThe switch from the SQL mode of the invoker to that of the routine\noccurs after evaluation of arguments and assignment of the resulting\nvalues to routine parameters. If you define a routine in strict SQL\nmode but invoke it in nonstrict mode, assignment of arguments to\nroutine parameters does not take place in strict mode. If you require\nthat expressions passed to a routine be assigned in strict SQL mode,\nyou should invoke the routine with strict mode in effect.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/create-procedure.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/create-procedure.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (518,40,'CREATE FUNCTION','Syntax:\nCREATE\n    [DEFINER = user]\n    PROCEDURE sp_name ([proc_parameter[,...]])\n    [characteristic ...] routine_body\n\nCREATE\n    [DEFINER = user]\n    FUNCTION sp_name ([func_parameter[,...]])\n    RETURNS type\n    [characteristic ...] routine_body\n\nproc_parameter:\n    [ IN | OUT | INOUT ] param_name type\n\nfunc_parameter:\n    param_name type\n\ntype:\n    Any valid MySQL data type\n\ncharacteristic: {\n    COMMENT \'string\'\n  | LANGUAGE SQL\n  | [NOT] DETERMINISTIC\n  | { CONTAINS SQL | NO SQL | READS SQL DATA | MODIFIES SQL DATA }\n  | SQL SECURITY { DEFINER | INVOKER }\n}\n\nroutine_body:\n    Valid SQL routine statement\n\nThese statements are used to create a stored routine (a stored\nprocedure or function). That is, the specified routine becomes known to\nthe server. By default, a stored routine is associated with the default\ndatabase. To associate the routine explicitly with a given database,\nspecify the name as db_name.sp_name when you create it.\n\nThe CREATE FUNCTION statement is also used in MySQL to support loadable\nfunctions. See [HELP CREATE FUNCTION loadable function]. A loadable\nfunction can be regarded as an external stored function. Stored\nfunctions share their namespace with loadable functions. See\nhttps://dev.mysql.com/doc/refman/8.0/en/function-resolution.html, for\nthe rules describing how the server interprets references to different\nkinds of functions.\n\nTo invoke a stored procedure, use the CALL statement (see [HELP CALL]).\nTo invoke a stored function, refer to it in an expression. The function\nreturns a value during expression evaluation.\n\nCREATE PROCEDURE and CREATE FUNCTION require the CREATE ROUTINE\nprivilege. If the DEFINER clause is present, the privileges required\ndepend on the user value, as discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-objects-security.html.\nIf binary logging is enabled, CREATE FUNCTION might require the SUPER\nprivilege, as discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-programs-logging.html.\n\nBy default, MySQL automatically grants the ALTER ROUTINE and EXECUTE\nprivileges to the routine creator. This behavior can be changed by\ndisabling the automatic_sp_privileges system variable. See\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-routines-privileges.html\n.\n\nThe DEFINER and SQL SECURITY clauses specify the security context to be\nused when checking access privileges at routine execution time, as\ndescribed later in this section.\n\nIf the routine name is the same as the name of a built-in SQL function,\na syntax error occurs unless you use a space between the name and the\nfollowing parenthesis when defining the routine or invoking it later.\nFor this reason, avoid using the names of existing SQL functions for\nyour own stored routines.\n\nThe IGNORE_SPACE SQL mode applies to built-in functions, not to stored\nroutines. It is always permissible to have spaces after a stored\nroutine name, regardless of whether IGNORE_SPACE is enabled.\n\nThe parameter list enclosed within parentheses must always be present.\nIf there are no parameters, an empty parameter list of () should be\nused. Parameter names are not case-sensitive.\n\nEach parameter is an IN parameter by default. To specify otherwise for\na parameter, use the keyword OUT or INOUT before the parameter name.\n\n*Note*:\n\nSpecifying a parameter as IN, OUT, or INOUT is valid only for a\nPROCEDURE. For a FUNCTION, parameters are always regarded as IN\nparameters.\n\nAn IN parameter passes a value into a procedure. The procedure might\nmodify the value, but the modification is not visible to the caller\nwhen the procedure returns. An OUT parameter passes a value from the\nprocedure back to the caller. Its initial value is NULL within the\nprocedure, and its value is visible to the caller when the procedure\nreturns. An INOUT parameter is initialized by the caller, can be\nmodified by the procedure, and any change made by the procedure is\nvisible to the caller when the procedure returns.\n\nFor each OUT or INOUT parameter, pass a user-defined variable in the\nCALL statement that invokes the procedure so that you can obtain its\nvalue when the procedure returns. If you are calling the procedure from\nwithin another stored procedure or function, you can also pass a\nroutine parameter or local routine variable as an OUT or INOUT\nparameter. If you are calling the procedure from within a trigger, you\ncan also pass NEW.col_name as an OUT or INOUT parameter.\n\nFor information about the effect of unhandled conditions on procedure\nparameters, see\nhttps://dev.mysql.com/doc/refman/8.0/en/conditions-and-parameters.html.\n\nRoutine parameters cannot be referenced in statements prepared within\nthe routine; see\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-program-restrictions.htm\nl.\n\nThe following example shows a simple stored procedure that, given a\ncountry code, counts the number of cities for that country that appear\nin the city table of the world database. The country code is passed\nusing an IN parameter, and the city count is returned using an OUT\nparameter:\n\nmysql> delimiter //\n\nmysql> CREATE PROCEDURE citycount (IN country CHAR(3), OUT cities INT)\n       BEGIN\n         SELECT COUNT(*) INTO cities FROM world.city\n         WHERE CountryCode = country;\n       END//\nQuery OK, 0 rows affected (0.01 sec)\n\nmysql> delimiter ;\n\nmysql> CALL citycount(\'JPN\', @cities); -- cities in Japan\nQuery OK, 1 row affected (0.00 sec)\n\nmysql> SELECT @cities;\n+---------+\n| @cities |\n+---------+\n|     248 |\n+---------+\n1 row in set (0.00 sec)\n\nmysql> CALL citycount(\'FRA\', @cities); -- cities in France\nQuery OK, 1 row affected (0.00 sec)\n\nmysql> SELECT @cities;\n+---------+\n| @cities |\n+---------+\n|      40 |\n+---------+\n1 row in set (0.00 sec)\n\nThe example uses the mysql client delimiter command to change the\nstatement delimiter from ; to // while the procedure is being defined.\nThis enables the ; delimiter used in the procedure body to be passed\nthrough to the server rather than being interpreted by mysql itself.\nSee\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-programs-defining.html.\n\nThe RETURNS clause may be specified only for a FUNCTION, for which it\nis mandatory. It indicates the return type of the function, and the\nfunction body must contain a RETURN value statement. If the RETURN\nstatement returns a value of a different type, the value is coerced to\nthe proper type. For example, if a function specifies an ENUM or SET\nvalue in the RETURNS clause, but the RETURN statement returns an\ninteger, the value returned from the function is the string for the\ncorresponding ENUM member of set of SET members.\n\nThe following example function takes a parameter, performs an operation\nusing an SQL function, and returns the result. In this case, it is\nunnecessary to use delimiter because the function definition contains\nno internal ; statement delimiters:\n\nmysql> CREATE FUNCTION hello (s CHAR(20))\nmysql> RETURNS CHAR(50) DETERMINISTIC\n       RETURN CONCAT(\'Hello, \',s,\'!\');\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> SELECT hello(\'world\');\n+----------------+\n| hello(\'world\') |\n+----------------+\n| Hello, world!  |\n+----------------+\n1 row in set (0.00 sec)\n\nParameter types and function return types can be declared to use any\nvalid data type. The COLLATE attribute can be used if preceded by a\nCHARACTER SET specification.\n\nThe routine_body consists of a valid SQL routine statement. This can be\na simple statement such as SELECT or INSERT, or a compound statement\nwritten using BEGIN and END. Compound statements can contain\ndeclarations, loops, and other control structure statements. The syntax\nfor these statements is described in\nhttps://dev.mysql.com/doc/refman/8.0/en/sql-compound-statements.html.\nIn practice, stored functions tend to use compound statements, unless\nthe body consists of a single RETURN statement.\n\nMySQL permits routines to contain DDL statements, such as CREATE and\nDROP. MySQL also permits stored procedures (but not stored functions)\nto contain SQL transaction statements such as COMMIT. Stored functions\nmay not contain statements that perform explicit or implicit commit or\nrollback. Support for these statements is not required by the SQL\nstandard, which states that each DBMS vendor may decide whether to\npermit them.\n\nStatements that return a result set can be used within a stored\nprocedure but not within a stored function. This prohibition includes\nSELECT statements that do not have an INTO var_list clause and other\nstatements such as SHOW, EXPLAIN, and CHECK TABLE. For statements that\ncan be determined at function definition time to return a result set, a\nNot allowed to return a result set from a function error occurs\n(ER_SP_NO_RETSET\n(https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference.h\ntml#error_er_sp_no_retset)). For statements that can be determined only\nat runtime to return a result set, a PROCEDURE %s can\'t return a result\nset in the given context error occurs (ER_SP_BADSELECT\n(https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference.h\ntml#error_er_sp_badselect)).\n\nUSE statements within stored routines are not permitted. When a routine\nis invoked, an implicit USE db_name is performed (and undone when the\nroutine terminates). The causes the routine to have the given default\ndatabase while it executes. References to objects in databases other\nthan the routine default database should be qualified with the\nappropriate database name.\n\nFor additional information about statements that are not permitted in\nstored routines, see\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-program-restrictions.htm\nl.\n\nFor information about invoking stored procedures from within programs\nwritten in a language that has a MySQL interface, see [HELP CALL].\n\nMySQL stores the sql_mode system variable setting in effect when a\nroutine is created or altered, and always executes the routine with\nthis setting in force, regardless of the current server SQL mode when\nthe routine begins executing.\n\nThe switch from the SQL mode of the invoker to that of the routine\noccurs after evaluation of arguments and assignment of the resulting\nvalues to routine parameters. If you define a routine in strict SQL\nmode but invoke it in nonstrict mode, assignment of arguments to\nroutine parameters does not take place in strict mode. If you require\nthat expressions passed to a routine be assigned in strict SQL mode,\nyou should invoke the routine with strict mode in effect.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/create-procedure.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/create-procedure.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (519,40,'CREATE SERVER','Syntax:\nCREATE SERVER server_name\n    FOREIGN DATA WRAPPER wrapper_name\n    OPTIONS (option [, option] ...)\n\noption: {\n    HOST character-literal\n  | DATABASE character-literal\n  | USER character-literal\n  | PASSWORD character-literal\n  | SOCKET character-literal\n  | OWNER character-literal\n  | PORT numeric-literal\n}\n\nThis statement creates the definition of a server for use with the\nFEDERATED storage engine. The CREATE SERVER statement creates a new row\nin the servers table in the mysql database. This statement requires the\nSUPER privilege.\n\nThe server_name should be a unique reference to the server. Server\ndefinitions are global within the scope of the server, it is not\npossible to qualify the server definition to a specific database.\nserver_name has a maximum length of 64 characters (names longer than 64\ncharacters are silently truncated), and is case-insensitive. You may\nspecify the name as a quoted string.\n\nThe wrapper_name is an identifier and may be quoted with single\nquotation marks.\n\nFor each option you must specify either a character literal or numeric\nliteral. Character literals are UTF-8, support a maximum length of 64\ncharacters and default to a blank (empty) string. String literals are\nsilently truncated to 64 characters. Numeric literals must be a number\nbetween 0 and 9999, default value is 0.\n\n*Note*:\n\nThe OWNER option is currently not applied, and has no effect on the\nownership or operation of the server connection that is created.\n\nThe CREATE SERVER statement creates an entry in the mysql.servers table\nthat can later be used with the CREATE TABLE statement when creating a\nFEDERATED table. The options that you specify are used to populate the\ncolumns in the mysql.servers table. The table columns are Server_name,\nHost, Db, Username, Password, Port and Socket.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/create-server.html\n\n','CREATE SERVER s\nFOREIGN DATA WRAPPER mysql\nOPTIONS (USER \'Remote\', HOST \'198.51.100.106\', DATABASE \'test\');\n','https://dev.mysql.com/doc/refman/8.0/en/create-server.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (520,40,'CREATE SPATIAL REFERENCE SYSTEM','Syntax:\nCREATE OR REPLACE SPATIAL REFERENCE SYSTEM\n    srid srs_attribute ...\n\nCREATE SPATIAL REFERENCE SYSTEM\n    [IF NOT EXISTS]\n    srid srs_attribute ...\n\nsrs_attribute: {\n    NAME \'srs_name\'\n  | DEFINITION \'definition\'\n  | ORGANIZATION \'org_name\' IDENTIFIED BY org_id\n  | DESCRIPTION \'description\'\n}\n\nsrid, org_id: 32-bit unsigned integer\n\nThis statement creates a spatial reference system (SRS) definition and\nstores it in the data dictionary. It requires the SUPER privilege. The\nresulting data dictionary entry can be inspected using the\nINFORMATION_SCHEMA ST_SPATIAL_REFERENCE_SYSTEMS table.\n\nSRID values must be unique, so if neither OR REPLACE nor IF NOT EXISTS\nis specified, an error occurs if an SRS definition with the given srid\nvalue already exists.\n\nWith CREATE OR REPLACE syntax, any existing SRS definition with the\nsame SRID value is replaced, unless the SRID value is used by some\ncolumn in an existing table. In that case, an error occurs. For\nexample:\n\nmysql> CREATE OR REPLACE SPATIAL REFERENCE SYSTEM 4326 ...;\nERROR 3716 (SR005): Can\'t modify SRID 4326. There is at\nleast one column depending on it.\n\nTo identify which column or columns use the SRID, use this query,\nreplacing 4326 with the SRID of the definition you are trying to\ncreate:\n\nSELECT * FROM INFORMATION_SCHEMA.ST_GEOMETRY_COLUMNS WHERE SRS_ID=4326;\n\nWith CREATE ... IF NOT EXISTS syntax, any existing SRS definition with\nthe same SRID value causes the new definition to be ignored and a\nwarning occurs.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/create-spatial-reference-system.html\n\n','CREATE SPATIAL REFERENCE SYSTEM 4120\nNAME \'Greek\'\nORGANIZATION \'EPSG\' IDENTIFIED BY 4120\nDEFINITION\n  \'GEOGCS["Greek",DATUM["Greek",SPHEROID["Bessel 1841",\n  6377397.155,299.1528128,AUTHORITY["EPSG","7004"]],\n  AUTHORITY["EPSG","6120"]],PRIMEM["Greenwich",0,\n  AUTHORITY["EPSG","8901"]],UNIT["degree",0.017453292519943278,\n  AUTHORITY["EPSG","9122"]],AXIS["Lat",NORTH],AXIS["Lon",EAST],\n  AUTHORITY["EPSG","4120"]]\';\n','https://dev.mysql.com/doc/refman/8.0/en/create-spatial-reference-system.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (521,40,'CREATE TABLE','Syntax:\nCREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name\n    (create_definition,...)\n    [table_options]\n    [partition_options]\n\nCREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name\n    [(create_definition,...)]\n    [table_options]\n    [partition_options]\n    [IGNORE | REPLACE]\n    [AS] query_expression\n\nCREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name\n    { LIKE old_tbl_name | (LIKE old_tbl_name) }\n\ncreate_definition: {\n    col_name column_definition\n  | {INDEX | KEY} [index_name] [index_type] (key_part,...)\n      [index_option] ...\n  | {FULLTEXT | SPATIAL} [INDEX | KEY] [index_name] (key_part,...)\n      [index_option] ...\n  | [CONSTRAINT [symbol]] PRIMARY KEY\n      [index_type] (key_part,...)\n      [index_option] ...\n  | [CONSTRAINT [symbol]] UNIQUE [INDEX | KEY]\n      [index_name] [index_type] (key_part,...)\n      [index_option] ...\n  | [CONSTRAINT [symbol]] FOREIGN KEY\n      [index_name] (col_name,...)\n      reference_definition\n  | check_constraint_definition\n}\n\ncolumn_definition: {\n    data_type [NOT NULL | NULL] [DEFAULT {literal | (expr)} ]\n      [VISIBLE | INVISIBLE]\n      [AUTO_INCREMENT] [UNIQUE [KEY]] [[PRIMARY] KEY]\n      [COMMENT \'string\']\n      [COLLATE collation_name]\n      [COLUMN_FORMAT {FIXED | DYNAMIC | DEFAULT}]\n      [ENGINE_ATTRIBUTE [=] \'string\']\n      [SECONDARY_ENGINE_ATTRIBUTE [=] \'string\']\n      [STORAGE {DISK | MEMORY}]\n      [reference_definition]\n      [check_constraint_definition]\n  | data_type\n      [COLLATE collation_name]\n      [GENERATED ALWAYS] AS (expr)\n      [VIRTUAL | STORED] [NOT NULL | NULL]\n      [VISIBLE | INVISIBLE]\n      [UNIQUE [KEY]] [[PRIMARY] KEY]\n      [COMMENT \'string\']\n      [reference_definition]\n      [check_constraint_definition]\n}\n\ndata_type:\n    (see https://dev.mysql.com/doc/refman/8.0/en/data-types.html)\n\nkey_part: {col_name [(length)] | (expr)} [ASC | DESC]\n\nindex_type:\n    USING {BTREE | HASH}\n\nindex_option: {\n    KEY_BLOCK_SIZE [=] value\n  | index_type\n  | WITH PARSER parser_name\n  | COMMENT \'string\'\n  | {VISIBLE | INVISIBLE}\n  |ENGINE_ATTRIBUTE [=] \'string\'\n  |SECONDARY_ENGINE_ATTRIBUTE [=] \'string\'\n}\n\ncheck_constraint_definition:\n    [CONSTRAINT [symbol]] CHECK (expr) [[NOT] ENFORCED]\n\nreference_definition:\n    REFERENCES tbl_name (key_part,...)\n      [MATCH FULL | MATCH PARTIAL | MATCH SIMPLE]\n      [ON DELETE reference_option]\n      [ON UPDATE reference_option]\n\nreference_option:\n    RESTRICT | CASCADE | SET NULL | NO ACTION | SET DEFAULT\n\ntable_options:\n    table_option [[,] table_option] ...\n\ntable_option: {\n    AUTOEXTEND_SIZE [=] value\n  | AUTO_INCREMENT [=] value\n  | AVG_ROW_LENGTH [=] value\n  | [DEFAULT] CHARACTER SET [=] charset_name\n  | CHECKSUM [=] {0 | 1}\n  | [DEFAULT] COLLATE [=] collation_name\n  | COMMENT [=] \'string\'\n  | COMPRESSION [=] {\'ZLIB\' | \'LZ4\' | \'NONE\'}\n  | CONNECTION [=] \'connect_string\'\n  | {DATA | INDEX} DIRECTORY [=] \'absolute path to directory\'\n  | DELAY_KEY_WRITE [=] {0 | 1}\n  | ENCRYPTION [=] {\'Y\' | \'N\'}\n  | ENGINE [=] engine_name\n  | ENGINE_ATTRIBUTE [=] \'string\'\n  | INSERT_METHOD [=] { NO | FIRST | LAST }\n  | KEY_BLOCK_SIZE [=] value\n  | MAX_ROWS [=] value\n  | MIN_ROWS [=] value\n  | PACK_KEYS [=] {0 | 1 | DEFAULT}\n  | PASSWORD [=] \'string\'\n  | ROW_FORMAT [=] {DEFAULT | DYNAMIC | FIXED | COMPRESSED | REDUNDANT | COMPACT}\n  | SECONDARY_ENGINE_ATTRIBUTE [=] \'string\'\n  | STATS_AUTO_RECALC [=] {DEFAULT | 0 | 1}\n  | STATS_PERSISTENT [=] {DEFAULT | 0 | 1}\n  | STATS_SAMPLE_PAGES [=] value\n  | TABLESPACE tablespace_name [STORAGE {DISK | MEMORY}]\n  | UNION [=] (tbl_name[,tbl_name]...)\n}\n\npartition_options:\n    PARTITION BY\n        { [LINEAR] HASH(expr)\n        | [LINEAR] KEY [ALGORITHM={1 | 2}] (column_list)\n        | RANGE{(expr) | COLUMNS(column_list)}\n        | LIST{(expr) | COLUMNS(column_list)} }\n    [PARTITIONS num]\n    [SUBPARTITION BY\n        { [LINEAR] HASH(expr)\n        | [LINEAR] KEY [ALGORITHM={1 | 2}] (column_list) }\n      [SUBPARTITIONS num]\n    ]\n    [(partition_definition [, partition_definition] ...)]\n\npartition_definition:\n    PARTITION partition_name\n        [VALUES\n            {LESS THAN {(expr | value_list) | MAXVALUE}\n            |\n            IN (value_list)}]\n        [[STORAGE] ENGINE [=] engine_name]\n        [COMMENT [=] \'string\' ]\n        [DATA DIRECTORY [=] \'data_dir\']\n        [INDEX DIRECTORY [=] \'index_dir\']\n        [MAX_ROWS [=] max_number_of_rows]\n        [MIN_ROWS [=] min_number_of_rows]\n        [TABLESPACE [=] tablespace_name]\n        [(subpartition_definition [, subpartition_definition] ...)]\n\nsubpartition_definition:\n    SUBPARTITION logical_name\n        [[STORAGE] ENGINE [=] engine_name]\n        [COMMENT [=] \'string\' ]\n        [DATA DIRECTORY [=] \'data_dir\']\n        [INDEX DIRECTORY [=] \'index_dir\']\n        [MAX_ROWS [=] max_number_of_rows]\n        [MIN_ROWS [=] min_number_of_rows]\n        [TABLESPACE [=] tablespace_name]\n\nquery_expression:\n    SELECT ...   (Some valid select or union statement)\n\nCREATE TABLE creates a table with the given name. You must have the\nCREATE privilege for the table.\n\nBy default, tables are created in the default database, using the\nInnoDB storage engine. An error occurs if the table exists, if there is\nno default database, or if the database does not exist.\n\nMySQL has no limit on the number of tables. The underlying file system\nmay have a limit on the number of files that represent tables.\nIndividual storage engines may impose engine-specific constraints.\nInnoDB permits up to 4 billion tables.\n\nFor information about the physical representation of a table, see\nhttps://dev.mysql.com/doc/refman/8.0/en/create-table-files.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/create-table.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/create-table.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (522,40,'FOREIGN KEY','MySQL supports foreign keys, which permit cross-referencing related\ndata across tables, and foreign key constraints, which help keep the\nrelated data consistent.\n\nA foreign key relationship involves a parent table that holds the\ninitial column values, and a child table with column values that\nreference the parent column values. A foreign key constraint is defined\non the child table.\n\nThe essential syntax for a defining a foreign key constraint in a\nCREATE TABLE or ALTER TABLE statement includes the following:\n\n[CONSTRAINT [symbol]] FOREIGN KEY\n    [index_name] (col_name, ...)\n    REFERENCES tbl_name (col_name,...)\n    [ON DELETE reference_option]\n    [ON UPDATE reference_option]\n\nreference_option:\n    RESTRICT | CASCADE | SET NULL | NO ACTION | SET DEFAULT\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/create-table-foreign-keys.html\n\n','CREATE TABLE product (\n    category INT NOT NULL, id INT NOT NULL,\n    price DECIMAL,\n    PRIMARY KEY(category, id)\n)   ENGINE=INNODB;\n\nCREATE TABLE customer (\n    id INT NOT NULL,\n    PRIMARY KEY (id)\n)   ENGINE=INNODB;\n\nCREATE TABLE product_order (\n    no INT NOT NULL AUTO_INCREMENT,\n    product_category INT NOT NULL,\n    product_id INT NOT NULL,\n    customer_id INT NOT NULL,\n\n    PRIMARY KEY(no),\n    INDEX (product_category, product_id),\n    INDEX (customer_id),\n\n    FOREIGN KEY (product_category, product_id)\n      REFERENCES product(category, id)\n      ON UPDATE CASCADE ON DELETE RESTRICT,\n\n    FOREIGN KEY (customer_id)\n      REFERENCES customer(id)\n)   ENGINE=INNODB;\n','https://dev.mysql.com/doc/refman/8.0/en/create-table-foreign-keys.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (523,40,'CREATE TABLESPACE','Syntax:\nCREATE [UNDO] TABLESPACE tablespace_name\n\n  InnoDB and NDB:\n    [ADD DATAFILE \'file_name\']\n    [AUTOEXTEND_SIZE [=] value]\n\n  InnoDB only:\n    [FILE_BLOCK_SIZE = value]\n    [ENCRYPTION [=] {\'Y\' | \'N\'}]\n\n  NDB only:\n    USE LOGFILE GROUP logfile_group\n    [EXTENT_SIZE [=] extent_size]\n    [INITIAL_SIZE [=] initial_size]\n    [MAX_SIZE [=] max_size]\n    [NODEGROUP [=] nodegroup_id]\n    [WAIT]\n    [COMMENT [=] \'string\']\n\n  InnoDB and NDB:\n    [ENGINE [=] engine_name]\n\n  Reserved for future use:\n    [ENGINE_ATTRIBUTE [=] \'string\']\n\nThis statement is used to create a tablespace. The precise syntax and\nsemantics depend on the storage engine used. In standard MySQL\nreleases, this is always an InnoDB tablespace. MySQL NDB Cluster also\nsupports tablespaces using the NDB storage engine.\n\no https://dev.mysql.com/doc/refman/8.0/en/create-tablespace.html#create\n  -tablespace-innodb\n\no https://dev.mysql.com/doc/refman/8.0/en/create-tablespace.html#create\n  -tablespace-ndb\n\no https://dev.mysql.com/doc/refman/8.0/en/create-tablespace.html#create\n  -tablespace-options\n\no https://dev.mysql.com/doc/refman/8.0/en/create-tablespace.html#create\n  -tablespace-notes\n\no https://dev.mysql.com/doc/refman/8.0/en/create-tablespace.html#create\n  -tablespace-innodb-examples\n\no https://dev.mysql.com/doc/refman/8.0/en/create-tablespace.html#create\n  -tablespace-ndb-examples\n\nConsiderations for InnoDB\n\nCREATE TABLESPACE syntax is used to create general tablespaces or undo\ntablespaces. The UNDO keyword, introduced in MySQL 8.0.14, must be\nspecified to create an undo tablespace.\n\nA general tablespace is a shared tablespace. It can hold multiple\ntables, and supports all table row formats. General tablespaces can be\ncreated in a location relative to or independent of the data directory.\n\nAfter creating an InnoDB general tablespace, use CREATE TABLE tbl_name\n... TABLESPACE [=] tablespace_name or ALTER TABLE tbl_name TABLESPACE\n[=] tablespace_name to add tables to the tablespace. For more\ninformation, see\nhttps://dev.mysql.com/doc/refman/8.0/en/general-tablespaces.html.\n\nUndo tablespaces contain undo logs. Undo tablespaces can be created in\na chosen location by specifying a fully qualified data file path. For\nmore information, see\nhttps://dev.mysql.com/doc/refman/8.0/en/innodb-undo-tablespaces.html.\n\nConsiderations for NDB Cluster\n\nThis statement is used to create a tablespace, which can contain one or\nmore data files, providing storage space for NDB Cluster Disk Data\ntables (see\nhttps://dev.mysql.com/doc/refman/8.0/en/mysql-cluster-disk-data.html).\nOne data file is created and added to the tablespace using this\nstatement. Additional data files may be added to the tablespace by\nusing the ALTER TABLESPACE statement (see [HELP ALTER TABLESPACE]).\n\n*Note*:\n\nAll NDB Cluster Disk Data objects share the same namespace. This means\nthat each Disk Data object must be uniquely named (and not merely each\nDisk Data object of a given type). For example, you cannot have a\ntablespace and a log file group with the same name, or a tablespace and\na data file with the same name.\n\nA log file group of one or more UNDO log files must be assigned to the\ntablespace to be created with the USE LOGFILE GROUP clause.\nlogfile_group must be an existing log file group created with CREATE\nLOGFILE GROUP (see [HELP CREATE LOGFILE GROUP]). Multiple tablespaces\nmay use the same log file group for UNDO logging.\n\nWhen setting EXTENT_SIZE or INITIAL_SIZE, you may optionally follow the\nnumber with a one-letter abbreviation for an order of magnitude,\nsimilar to those used in my.cnf. Generally, this is one of the letters\nM (for megabytes) or G (for gigabytes).\n\nINITIAL_SIZE and EXTENT_SIZE are subject to rounding as follows:\n\no EXTENT_SIZE is rounded up to the nearest whole multiple of 32K.\n\no INITIAL_SIZE is rounded down to the nearest whole multiple of 32K;\n  this result is rounded up to the nearest whole multiple of\n  EXTENT_SIZE (after any rounding).\n\n*Note*:\n\nNDB reserves 4% of a tablespace for data node restart operations. This\nreserved space cannot be used for data storage.\n\nThe rounding just described is done explicitly, and a warning is issued\nby the MySQL Server when any such rounding is performed. The rounded\nvalues are also used by the NDB kernel for calculating\nINFORMATION_SCHEMA.FILES column values and other purposes. However, to\navoid an unexpected result, we suggest that you always use whole\nmultiples of 32K in specifying these options.\n\nWhen CREATE TABLESPACE is used with ENGINE [=] NDB, a tablespace and\nassociated data file are created on each Cluster data node. You can\nverify that the data files were created and obtain information about\nthem by querying the INFORMATION_SCHEMA.FILES table. (See the example\nlater in this section.)\n\n(See\nhttps://dev.mysql.com/doc/refman/8.0/en/information-schema-files-table.\nhtml.)\n\nOptions\n\no ADD DATAFILE: Defines the name of a tablespace data file. This option\n  is always required when creating an NDB tablespace; for InnoDB in\n  MySQL 8.0.14 and later, it is required only when creating an undo\n  tablespace. The file_name, including any specified path, must be\n  quoted with single or double quotation marks. File names (not\n  counting the file extension) and directory names must be at least one\n  byte in length. Zero length file names and directory names are not\n  supported.\n\n  Because there are considerable differences in how InnoDB and NDB\n  treat data files, the two storage engines are covered separately in\n  the discussion that follows.\n\n  InnoDB data files An InnoDB tablespace supports only a single data\n  file, whose name must include a .ibd extension.\n\n  To place an InnoDB general tablespace data file in a location outside\n  of the data directory, include a fully qualified path or a path\n  relative to the data directory. Only a fully qualified path is\n  permitted for undo tablespaces. If you do not specify a path, a\n  general tablespace is created in the data directory. An undo\n  tablespace created without specifying a path is created in the\n  directory defined by the innodb_undo_directory variable. If the\n  innodb_undo_directory variable is undefined, undo tablespaces are\n  created in the data directory.\n\n  To avoid conflicts with implicitly created file-per-table\n  tablespaces, creating an InnoDB general tablespace in a subdirectory\n  under the data directory is not supported. When creating a general\n  tablespace or undo tablespace outside of the data directory, the\n  directory must exist and must be known to InnoDB prior to creating\n  the tablespace. To make a directory known to InnoDB, add it to the\n  innodb_directories value or to one of the variables whose values are\n  appended to the innodb_directories value. innodb_directories is a\n  read-only variable. Configuring it requires restarting the server.\n\n  If the ADD DATAFILE clause is not specified when creating an InnoDB\n  tablespace, a tablespace data file with a unique file name is created\n  implicitly. The unique file name is a 128 bit UUID formatted into\n  five groups of hexadecimal numbers separated by dashes\n  (aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee). A file extension is added if\n  required by the storage engine. An .ibd file extension is added for\n  InnoDB general tablespace data files. In a replication environment,\n  the data file name created on the replication source server is not\n  the same as the data file name created on the replica.\n\n  As of MySQL 8.0.17, the ADD DATAFILE clause does not permit circular\n  directory references when creating an InnoDB tablespace. For example,\n  the circular directory reference (/../) in the following statement is\n  not permitted:\n\nCREATE TABLESPACE ts1 ADD DATAFILE ts1.ibd \'any_directory/../ts1.ibd\';\n\n  An exception to this restriction exists on Linux, where a circular\n  directory reference is permitted if the preceding directory is a\n  symbolic link. For example, the data file path in the example above\n  is permitted if any_directory is a symbolic link. (It is still\n  permitted for data file paths to begin with \'../\'.)\n\n  NDB data files An NDB tablespace supports multiple data files which\n  can have any legal file names; more data files can be added to an NDB\n  Cluster tablespace following its creation by using an ALTER\n  TABLESPACE statement.\n\n  An NDB tablespace data file is created by default in the data node\n  file system directory---that is, the directory named ndb_nodeid_fs/TS\n  under the data node\'s data directory (DataDir), where nodeid is the\n  data node\'s NodeId. To place the data file in a location other than\n  the default, include an absolute directory path or a path relative to\n  the default location. If the directory specified does not exist, NDB\n  attempts to create it; the system user account under which the data\n  node process is running must have the appropriate permissions to do\n  so.\n\n  *Note*:\n\n  When determining the path used for a data file, NDB does not expand\n  the ~ (tilde) character.\n\n  When multiple data nodes are run on the same physical host, the\n  following considerations apply:\n\n  o You cannot specify an absolute path when creating a data file.\n\n  o It is not possible to create tablespace data files outside the data\n    node file system directory, unless each data node has a separate\n    data directory.\n\n  o If each data node has its own data directory, data files can be\n    created anywhere within this directory.\n\n  o If each data node has its own data directory, it may also be\n    possible to create a data file outside the node\'s data directory\n    using a relative path, as long as this path resolves to a unique\n    location on the host file system for each data node running on that\n    host.\n\no FILE_BLOCK_SIZE: This option---which is specific to InnoDB general\n  tablespaces, and is ignored by NDB---defines the block size for the\n  tablespace data file. Values can be specified in bytes or kilobytes.\n  For example, an 8 kilobyte file block size can be specified as 8192\n  or 8K. If you do not specify this option, FILE_BLOCK_SIZE defaults to\n  the innodb_page_size value. FILE_BLOCK_SIZE is required when you\n  intend to use the tablespace for storing compressed InnoDB tables\n  (ROW_FORMAT=COMPRESSED). In this case, you must define the tablespace\n  FILE_BLOCK_SIZE when creating the tablespace.\n\n  If FILE_BLOCK_SIZE is equal the innodb_page_size value, the\n  tablespace can contain only tables having an uncompressed row format\n  (COMPACT, REDUNDANT, and DYNAMIC). Tables with a COMPRESSED row\n  format have a different physical page size than uncompressed tables.\n  Therefore, compressed tables cannot coexist in the same tablespace as\n  uncompressed tables.\n\n  For a general tablespace to contain compressed tables,\n  FILE_BLOCK_SIZE must be specified, and the FILE_BLOCK_SIZE value must\n  be a valid compressed page size in relation to the innodb_page_size\n  value. Also, the physical page size of the compressed table\n  (KEY_BLOCK_SIZE) must be equal to FILE_BLOCK_SIZE/1024. For example,\n  if innodb_page_size=16K, and FILE_BLOCK_SIZE=8K, the KEY_BLOCK_SIZE\n  of the table must be 8. For more information, see\n  https://dev.mysql.com/doc/refman/8.0/en/general-tablespaces.html.\n\no USE LOGFILE GROUP: Required for NDB, this is the name of a log file\n  group previously created using CREATE LOGFILE GROUP. Not supported\n  for InnoDB, where it fails with an error.\n\no EXTENT_SIZE: This option is specific to NDB, and is not supported by\n  InnoDB, where it fails with an error. EXTENT_SIZE sets the size, in\n  bytes, of the extents used by any files belonging to the tablespace.\n  The default value is 1M. The minimum size is 32K, and theoretical\n  maximum is 2G, although the practical maximum size depends on a\n  number of factors. In most cases, changing the extent size does not\n  have any measurable effect on performance, and the default value is\n  recommended for all but the most unusual situations.\n\n  An extent is a unit of disk space allocation. One extent is filled\n  with as much data as that extent can contain before another extent is\n  used. In theory, up to 65,535 (64K) extents may used per data file;\n  however, the recommended maximum is 32,768 (32K). The recommended\n  maximum size for a single data file is 32G---that is, 32K extents x 1\n  MB per extent. In addition, once an extent is allocated to a given\n  partition, it cannot be used to store data from a different\n  partition; an extent cannot store data from more than one partition.\n  This means, for example that a tablespace having a single datafile\n  whose INITIAL_SIZE (described in the following item) is 256 MB and\n  whose EXTENT_SIZE is 128M has just two extents, and so can be used to\n  store data from at most two different disk data table partitions.\n\n  You can see how many extents remain free in a given data file by\n  querying the INFORMATION_SCHEMA.FILES table, and so derive an\n  estimate for how much space remains free in the file. For further\n  discussion and examples, see\n  https://dev.mysql.com/doc/refman/8.0/en/information-schema-files-tabl\n  e.html.\n\no INITIAL_SIZE: This option is specific to NDB, and is not supported by\n  InnoDB, where it fails with an error.\n\n  The INITIAL_SIZE parameter sets the total size in bytes of the data\n  file that was specific using ADD DATATFILE. Once this file has been\n  created, its size cannot be changed; however, you can add more data\n  files to the tablespace using ALTER TABLESPACE ... ADD DATAFILE.\n\n  INITIAL_SIZE is optional; its default value is 134217728 (128 MB).\n\n  On 32-bit systems, the maximum supported value for INITIAL_SIZE is\n  4294967296 (4 GB).\n\no AUTOEXTEND_SIZE: Ignored by MySQL prior to MySQL 8.0.23; From MySQL\n  8.0.23, defines the amount by which InnoDB extends the size of the\n  tablespace when it becomes full. The setting must be a multiple of\n  4MB. The default setting is 0, which causes the tablespace to be\n  extended according to the implicit default behavior. For more\n  information, see\n  https://dev.mysql.com/doc/refman/8.0/en/innodb-tablespace-autoextend-\n  size.html.\n\n  Has no effect in any release of MySQL NDB Cluster 8.0, regardless of\n  the storage engine used.\n\no MAX_SIZE: Currently ignored by MySQL; reserved for possible future\n  use. Has no effect in any release of MySQL 8.0 or MySQL NDB Cluster\n  8.0, regardless of the storage engine used.\n\no NODEGROUP: Currently ignored by MySQL; reserved for possible future\n  use. Has no effect in any release of MySQL 8.0 or MySQL NDB Cluster\n  8.0, regardless of the storage engine used.\n\no WAIT: Currently ignored by MySQL; reserved for possible future use.\n  Has no effect in any release of MySQL 8.0 or MySQL NDB Cluster 8.0,\n  regardless of the storage engine used.\n\no COMMENT: Currently ignored by MySQL; reserved for possible future\n  use. Has no effect in any release of MySQL 8.0 or MySQL NDB Cluster\n  8.0, regardless of the storage engine used.\n\no The ENCRYPTION clause enables or disables page-level data encryption\n  for an InnoDB general tablespace. Encryption support for general\n  tablespaces was introduced in MySQL 8.0.13.\n\n  As of MySQL 8.0.16, if the ENCRYPTION clause is not specified, the\n  default_table_encryption setting controls whether encryption is\n  enabled. The ENCRYPTION clause overrides the default_table_encryption\n  setting. However, if the table_encryption_privilege_check variable is\n  enabled, the TABLE_ENCRYPTION_ADMIN privilege is required to use an\n  ENCRYPTION clause setting that differs from the\n  default_table_encryption setting.\n\n  A keyring plugin must be installed and configured before an\n  encryption-enabled tablespace can be created.\n\n  When a general tablespace is encrypted, all tables residing in the\n  tablespace are encrypted. Likewise, a table created in an encrypted\n  tablespace is encrypted.\n\n  For more information, see\n  https://dev.mysql.com/doc/refman/8.0/en/innodb-data-encryption.html\n\no ENGINE: Defines the storage engine which uses the tablespace, where\n  engine_name is the name of the storage engine. Currently, only the\n  InnoDB storage engine is supported by standard MySQL 8.0 releases.\n  MySQL NDB Cluster supports both NDB and InnoDB tablespaces. The value\n  of the default_storage_engine system variable is used for ENGINE if\n  the option is not specified.\n\no The ENGINE_ATTRIBUTE option (available as of MySQL 8.0.21) is used to\n  specify tablespace attributes for primary storage engines. The option\n  is reserved for future use.\n\n  Permitted values are a string literal containing a valid JSON\n  document or an empty string (\'\'). Invalid JSON is rejected.\n\nCREATE TABLESPACE ts1 ENGINE_ATTRIBUTE=\'{"key":"value"}\';\n\n  ENGINE_ATTRIBUTE values can be repeated without error. In this case,\n  the last specified value is used.\n\n  ENGINE_ATTRIBUTE values are not checked by the server, nor are they\n  cleared when the table\'s storage engine is changed.\n\nNotes\n\no For the rules covering the naming of MySQL tablespaces, see\n  https://dev.mysql.com/doc/refman/8.0/en/identifiers.html. In addition\n  to these rules, the slash character ("/") is not permitted, nor can\n  you use names beginning with innodb_, as this prefix is reserved for\n  system use.\n\no Creation of temporary general tablespaces is not supported.\n\no General tablespaces do not support temporary tables.\n\no The TABLESPACE option may be used with CREATE TABLE or ALTER TABLE to\n  assign an InnoDB table partition or subpartition to a file-per-table\n  tablespace. All partitions must belong to the same storage engine.\n  Assigning table partitions to shared InnoDB tablespaces is not\n  supported. Shared tablespaces include the InnoDB system tablespace\n  and general tablespaces.\n\no General tablespaces support the addition of tables of any row format\n  using CREATE TABLE ... TABLESPACE. innodb_file_per_table does not\n  need to be enabled.\n\no innodb_strict_mode is not applicable to general tablespaces.\n  Tablespace management rules are strictly enforced independently of\n  innodb_strict_mode. If CREATE TABLESPACE parameters are incorrect or\n  incompatible, the operation fails regardless of the\n  innodb_strict_mode setting. When a table is added to a general\n  tablespace using CREATE TABLE ... TABLESPACE or ALTER TABLE ...\n  TABLESPACE, innodb_strict_mode is ignored but the statement is\n  evaluated as if innodb_strict_mode is enabled.\n\no Use DROP TABLESPACE to remove a tablespace. All tables must be\n  dropped from a tablespace using DROP TABLE prior to dropping the\n  tablespace. Before dropping an NDB Cluster tablespace you must also\n  remove all its data files using one or more ALTER TABLESPACE ... DROP\n  DATATFILE statements. See\n  https://dev.mysql.com/doc/refman/8.0/en/mysql-cluster-disk-data-objec\n  ts.html.\n\no All parts of an InnoDB table added to an InnoDB general tablespace\n  reside in the general tablespace, including indexes and BLOB pages.\n\n  For an NDB table assigned to a tablespace, only those columns which\n  are not indexed are stored on disk, and actually use the tablespace\n  data files. Indexes and indexed columns for all NDB tables are always\n  kept in memory.\n\no Similar to the system tablespace, truncating or dropping tables\n  stored in a general tablespace creates free space internally in the\n  general tablespace .ibd data file which can only be used for new\n  InnoDB data. Space is not released back to the operating system as it\n  is for file-per-table tablespaces.\n\no A general tablespace is not associated with any database or schema.\n\no ALTER TABLE ... DISCARD TABLESPACE and ALTER TABLE ...IMPORT\n  TABLESPACE are not supported for tables that belong to a general\n  tablespace.\n\no The server uses tablespace-level metadata locking for DDL that\n  references general tablespaces. By comparison, the server uses\n  table-level metadata locking for DDL that references file-per-table\n  tablespaces.\n\no A generated or existing tablespace cannot be changed to a general\n  tablespace.\n\no There is no conflict between general tablespace names and\n  file-per-table tablespace names. The "/" character, which is present\n  in file-per-table tablespace names, is not permitted in general\n  tablespace names.\n\no mysqldump and mysqlpump do not dump InnoDB CREATE TABLESPACE\n  statements.\n\nInnoDB Examples\n\nThis example demonstrates creating a general tablespace and adding\nthree uncompressed tables of different row formats.\n\nmysql> CREATE TABLESPACE `ts1` ADD DATAFILE \'ts1.ibd\' ENGINE=INNODB;\n\nmysql> CREATE TABLE t1 (c1 INT PRIMARY KEY) TABLESPACE ts1 ROW_FORMAT=REDUNDANT;\n\nmysql> CREATE TABLE t2 (c1 INT PRIMARY KEY) TABLESPACE ts1 ROW_FORMAT=COMPACT;\n\nmysql> CREATE TABLE t3 (c1 INT PRIMARY KEY) TABLESPACE ts1 ROW_FORMAT=DYNAMIC;\n\nThis example demonstrates creating a general tablespace and adding a\ncompressed table. The example assumes a default innodb_page_size value\nof 16K. The FILE_BLOCK_SIZE of 8192 requires that the compressed table\nhave a KEY_BLOCK_SIZE of 8.\n\nmysql> CREATE TABLESPACE `ts2` ADD DATAFILE \'ts2.ibd\' FILE_BLOCK_SIZE = 8192 Engine=InnoDB;\n\nmysql> CREATE TABLE t4 (c1 INT PRIMARY KEY) TABLESPACE ts2 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;\n\nThis example demonstrates creating a general tablespace without\nspecifying the ADD DATAFILE clause, which is optional as of MySQL\n8.0.14.\n\nmysql> CREATE TABLESPACE `ts3` ENGINE=INNODB;\n\nThis example demonstrates creating an undo tablespace.\n\nmysql> CREATE UNDO TABLESPACE undo_003 ADD DATAFILE \'undo_003.ibu\';\n\nNDB Example\n\nSuppose that you wish to create an NDB Cluster Disk Data tablespace\nnamed myts using a datafile named mydata-1.dat. An NDB tablespace\nalways requires the use of a log file group consisting of one or more\nundo log files. For this example, we first create a log file group\nnamed mylg that contains one undo long file named myundo-1.dat, using\nthe CREATE LOGFILE GROUP statement shown here:\n\nmysql> CREATE LOGFILE GROUP myg1\n    ->     ADD UNDOFILE \'myundo-1.dat\'\n    ->     ENGINE=NDB;\nQuery OK, 0 rows affected (3.29 sec)\n\nNow you can create the tablespace previously described using the\nfollowing statement:\n\nmysql> CREATE TABLESPACE myts\n    ->     ADD DATAFILE \'mydata-1.dat\'\n    ->     USE LOGFILE GROUP mylg\n    ->     ENGINE=NDB;\nQuery OK, 0 rows affected (2.98 sec)\n\nYou can now create a Disk Data table using a CREATE TABLE statement\nwith the TABLESPACE and STORAGE DISK options, similar to what is shown\nhere:\n\nmysql> CREATE TABLE mytable (\n    ->     id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,\n    ->     lname VARCHAR(50) NOT NULL,\n    ->     fname VARCHAR(50) NOT NULL,\n    ->     dob DATE NOT NULL,\n    ->     joined DATE NOT NULL,\n    ->     INDEX(last_name, first_name)\n    -> )\n    ->     TABLESPACE myts STORAGE DISK\n    ->     ENGINE=NDB;\nQuery OK, 0 rows affected (1.41 sec)\n\nIt is important to note that only the dob and joined columns from\nmytable are actually stored on disk, due to the fact that the id,\nlname, and fname columns are all indexed.\n\nAs mentioned previously, when CREATE TABLESPACE is used with ENGINE [=]\nNDB, a tablespace and associated data file are created on each NDB\nCluster data node. You can verify that the data files were created and\nobtain information about them by querying the INFORMATION_SCHEMA.FILES\ntable, as shown here:\n\nmysql> SELECT FILE_NAME, FILE_TYPE, LOGFILE_GROUP_NAME, STATUS, EXTRA\n    ->     FROM INFORMATION_SCHEMA.FILES\n    ->     WHERE TABLESPACE_NAME = \'myts\';\n\n+--------------+------------+--------------------+--------+----------------+\n| file_name    | file_type  | logfile_group_name | status | extra          |\n+--------------+------------+--------------------+--------+----------------+\n| mydata-1.dat | DATAFILE   | mylg               | NORMAL | CLUSTER_NODE=5 |\n| mydata-1.dat | DATAFILE   | mylg               | NORMAL | CLUSTER_NODE=6 |\n| NULL         | TABLESPACE | mylg               | NORMAL | NULL           |\n+--------------+------------+--------------------+--------+----------------+\n3 rows in set (0.01 sec)\n\nFor additional information and examples, see\nhttps://dev.mysql.com/doc/refman/8.0/en/mysql-cluster-disk-data-objects\n.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/create-tablespace.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/create-tablespace.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (524,40,'CREATE TRIGGER','Syntax:\nCREATE\n    [DEFINER = user]\n    TRIGGER trigger_name\n    trigger_time trigger_event\n    ON tbl_name FOR EACH ROW\n    [trigger_order]\n    trigger_body\n\ntrigger_time: { BEFORE | AFTER }\n\ntrigger_event: { INSERT | UPDATE | DELETE }\n\ntrigger_order: { FOLLOWS | PRECEDES } other_trigger_name\n\nThis statement creates a new trigger. A trigger is a named database\nobject that is associated with a table, and that activates when a\nparticular event occurs for the table. The trigger becomes associated\nwith the table named tbl_name, which must refer to a permanent table.\nYou cannot associate a trigger with a TEMPORARY table or a view.\n\nTrigger names exist in the schema namespace, meaning that all triggers\nmust have unique names within a schema. Triggers in different schemas\ncan have the same name.\n\nThis section describes CREATE TRIGGER syntax. For additional\ndiscussion, see\nhttps://dev.mysql.com/doc/refman/8.0/en/trigger-syntax.html.\n\nCREATE TRIGGER requires the TRIGGER privilege for the table associated\nwith the trigger. If the DEFINER clause is present, the privileges\nrequired depend on the user value, as discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-objects-security.html.\nIf binary logging is enabled, CREATE TRIGGER might require the SUPER\nprivilege, as discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-programs-logging.html.\n\nThe DEFINER clause determines the security context to be used when\nchecking access privileges at trigger activation time, as described\nlater in this section.\n\ntrigger_time is the trigger action time. It can be BEFORE or AFTER to\nindicate that the trigger activates before or after each row to be\nmodified.\n\nBasic column value checks occur prior to trigger activation, so you\ncannot use BEFORE triggers to convert values inappropriate for the\ncolumn type to valid values.\n\ntrigger_event indicates the kind of operation that activates the\ntrigger. These trigger_event values are permitted:\n\no INSERT: The trigger activates whenever a new row is inserted into the\n  table (for example, through INSERT, LOAD DATA, and REPLACE\n  statements).\n\no UPDATE: The trigger activates whenever a row is modified (for\n  example, through UPDATE statements).\n\no DELETE: The trigger activates whenever a row is deleted from the\n  table (for example, through DELETE and REPLACE statements). DROP\n  TABLE and TRUNCATE TABLE statements on the table do not activate this\n  trigger, because they do not use DELETE. Dropping a partition does\n  not activate DELETE triggers, either.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/create-trigger.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/create-trigger.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (525,40,'CREATE VIEW','Syntax:\nCREATE\n    [OR REPLACE]\n    [ALGORITHM = {UNDEFINED | MERGE | TEMPTABLE}]\n    [DEFINER = user]\n    [SQL SECURITY { DEFINER | INVOKER }]\n    VIEW view_name [(column_list)]\n    AS select_statement\n    [WITH [CASCADED | LOCAL] CHECK OPTION]\n\nThe CREATE VIEW statement creates a new view, or replaces an existing\nview if the OR REPLACE clause is given. If the view does not exist,\nCREATE OR REPLACE VIEW is the same as CREATE VIEW. If the view does\nexist, CREATE OR REPLACE VIEW replaces it.\n\nFor information about restrictions on view use, see\nhttps://dev.mysql.com/doc/refman/8.0/en/view-restrictions.html.\n\nThe select_statement is a SELECT statement that provides the definition\nof the view. (Selecting from the view selects, in effect, using the\nSELECT statement.) The select_statement can select from base tables,\nother views. Beginning with MySQL 8.0.19, the SELECT statement can use\na VALUES statement as its source, or can be replaced with a TABLE\nstatement, as with CREATE TABLE ... SELECT.\n\nThe view definition is "frozen" at creation time and is not affected by\nsubsequent changes to the definitions of the underlying tables. For\nexample, if a view is defined as SELECT * on a table, new columns added\nto the table later do not become part of the view, and columns dropped\nfrom the table result in an error when selecting from the view.\n\nThe ALGORITHM clause affects how MySQL processes the view. The DEFINER\nand SQL SECURITY clauses specify the security context to be used when\nchecking access privileges at view invocation time. The WITH CHECK\nOPTION clause can be given to constrain inserts or updates to rows in\ntables referenced by the view. These clauses are described later in\nthis section.\n\nThe CREATE VIEW statement requires the CREATE VIEW privilege for the\nview, and some privilege for each column selected by the SELECT\nstatement. For columns used elsewhere in the SELECT statement, you must\nhave the SELECT privilege. If the OR REPLACE clause is present, you\nmust also have the DROP privilege for the view. If the DEFINER clause\nis present, the privileges required depend on the user value, as\ndiscussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-objects-security.html.\n\nWhen a view is referenced, privilege checking occurs as described later\nin this section.\n\nA view belongs to a database. By default, a new view is created in the\ndefault database. To create the view explicitly in a given database,\nuse db_name.view_name syntax to qualify the view name with the database\nname:\n\nCREATE VIEW test.v AS SELECT * FROM t;\n\nUnqualified table or view names in the SELECT statement are also\ninterpreted with respect to the default database. A view can refer to\ntables or views in other databases by qualifying the table or view name\nwith the appropriate database name.\n\nWithin a database, base tables and views share the same namespace, so a\nbase table and a view cannot have the same name.\n\nColumns retrieved by the SELECT statement can be simple references to\ntable columns, or expressions that use functions, constant values,\noperators, and so forth.\n\nA view must have unique column names with no duplicates, just like a\nbase table. By default, the names of the columns retrieved by the\nSELECT statement are used for the view column names. To define explicit\nnames for the view columns, specify the optional column_list clause as\na list of comma-separated identifiers. The number of names in\ncolumn_list must be the same as the number of columns retrieved by the\nSELECT statement.\n\nA view can be created from many kinds of SELECT statements. It can\nrefer to base tables or other views. It can use joins, UNION, and\nsubqueries. The SELECT need not even refer to any tables:\n\nCREATE VIEW v_today (today) AS SELECT CURRENT_DATE;\n\nThe following example defines a view that selects two columns from\nanother table as well as an expression calculated from those columns:\n\nmysql> CREATE TABLE t (qty INT, price INT);\nmysql> INSERT INTO t VALUES(3, 50);\nmysql> CREATE VIEW v AS SELECT qty, price, qty*price AS value FROM t;\nmysql> SELECT * FROM v;\n+------+-------+-------+\n| qty  | price | value |\n+------+-------+-------+\n|    3 |    50 |   150 |\n+------+-------+-------+\n\nA view definition is subject to the following restrictions:\n\no The SELECT statement cannot refer to system variables or user-defined\n  variables.\n\no Within a stored program, the SELECT statement cannot refer to program\n  parameters or local variables.\n\no The SELECT statement cannot refer to prepared statement parameters.\n\no Any table or view referred to in the definition must exist. If, after\n  the view has been created, a table or view that the definition refers\n  to is dropped, use of the view results in an error. To check a view\n  definition for problems of this kind, use the CHECK TABLE statement.\n\no The definition cannot refer to a TEMPORARY table, and you cannot\n  create a TEMPORARY view.\n\no You cannot associate a trigger with a view.\n\no Aliases for column names in the SELECT statement are checked against\n  the maximum column length of 64 characters (not the maximum alias\n  length of 256 characters).\n\nORDER BY is permitted in a view definition, but it is ignored if you\nselect from a view using a statement that has its own ORDER BY.\n\nFor other options or clauses in the definition, they are added to the\noptions or clauses of the statement that references the view, but the\neffect is undefined. For example, if a view definition includes a LIMIT\nclause, and you select from the view using a statement that has its own\nLIMIT clause, it is undefined which limit applies. This same principle\napplies to options such as ALL, DISTINCT, or SQL_SMALL_RESULT that\nfollow the SELECT keyword, and to clauses such as INTO, FOR UPDATE, FOR\nSHARE, LOCK IN SHARE MODE, and PROCEDURE.\n\nThe results obtained from a view may be affected if you change the\nquery processing environment by changing system variables:\n\nmysql> CREATE VIEW v (mycol) AS SELECT \'abc\';\nQuery OK, 0 rows affected (0.01 sec)\n\nmysql> SET sql_mode = \'\';\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> SELECT "mycol" FROM v;\n+-------+\n| mycol |\n+-------+\n| mycol |\n+-------+\n1 row in set (0.01 sec)\n\nmysql> SET sql_mode = \'ANSI_QUOTES\';\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> SELECT "mycol" FROM v;\n+-------+\n| mycol |\n+-------+\n| abc   |\n+-------+\n1 row in set (0.00 sec)\n\nThe DEFINER and SQL SECURITY clauses determine which MySQL account to\nuse when checking access privileges for the view when a statement is\nexecuted that references the view. The valid SQL SECURITY\ncharacteristic values are DEFINER (the default) and INVOKER. These\nindicate that the required privileges must be held by the user who\ndefined or invoked the view, respectively.\n\nIf the DEFINER clause is present, the user value should be a MySQL\naccount specified as \'user_name\'@\'host_name\', CURRENT_USER, or\nCURRENT_USER(). The permitted user values depend on the privileges you\nhold, as discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-objects-security.html.\nAlso see that section for additional information about view security.\n\nIf the DEFINER clause is omitted, the default definer is the user who\nexecutes the CREATE VIEW statement. This is the same as specifying\nDEFINER = CURRENT_USER explicitly.\n\nWithin a view definition, the CURRENT_USER function returns the view\'s\nDEFINER value by default. For views defined with the SQL SECURITY\nINVOKER characteristic, CURRENT_USER returns the account for the view\'s\ninvoker. For information about user auditing within views, see\nhttps://dev.mysql.com/doc/refman/8.0/en/account-activity-auditing.html.\n\nWithin a stored routine that is defined with the SQL SECURITY DEFINER\ncharacteristic, CURRENT_USER returns the routine\'s DEFINER value. This\nalso affects a view defined within such a routine, if the view\ndefinition contains a DEFINER value of CURRENT_USER.\n\nMySQL checks view privileges like this:\n\no At view definition time, the view creator must have the privileges\n  needed to use the top-level objects accessed by the view. For\n  example, if the view definition refers to table columns, the creator\n  must have some privilege for each column in the select list of the\n  definition, and the SELECT privilege for each column used elsewhere\n  in the definition. If the definition refers to a stored function,\n  only the privileges needed to invoke the function can be checked. The\n  privileges required at function invocation time can be checked only\n  as it executes: For different invocations, different execution paths\n  within the function might be taken.\n\no The user who references a view must have appropriate privileges to\n  access it (SELECT to select from it, INSERT to insert into it, and so\n  forth.)\n\no When a view has been referenced, privileges for objects accessed by\n  the view are checked against the privileges held by the view DEFINER\n  account or invoker, depending on whether the SQL SECURITY\n  characteristic is DEFINER or INVOKER, respectively.\n\no If reference to a view causes execution of a stored function,\n  privilege checking for statements executed within the function depend\n  on whether the function SQL SECURITY characteristic is DEFINER or\n  INVOKER. If the security characteristic is DEFINER, the function runs\n  with the privileges of the DEFINER account. If the characteristic is\n  INVOKER, the function runs with the privileges determined by the\n  view\'s SQL SECURITY characteristic.\n\nExample: A view might depend on a stored function, and that function\nmight invoke other stored routines. For example, the following view\ninvokes a stored function f():\n\nCREATE VIEW v AS SELECT * FROM t WHERE t.id = f(t.name);\n\nSuppose that f() contains a statement such as this:\n\nIF name IS NULL then\n  CALL p1();\nELSE\n  CALL p2();\nEND IF;\n\nThe privileges required for executing statements within f() need to be\nchecked when f() executes. This might mean that privileges are needed\nfor p1() or p2(), depending on the execution path within f(). Those\nprivileges must be checked at runtime, and the user who must possess\nthe privileges is determined by the SQL SECURITY values of the view v\nand the function f().\n\nThe DEFINER and SQL SECURITY clauses for views are extensions to\nstandard SQL. In standard SQL, views are handled using the rules for\nSQL SECURITY DEFINER. The standard says that the definer of the view,\nwhich is the same as the owner of the view\'s schema, gets applicable\nprivileges on the view (for example, SELECT) and may grant them. MySQL\nhas no concept of a schema "owner", so MySQL adds a clause to identify\nthe definer. The DEFINER clause is an extension where the intent is to\nhave what the standard has; that is, a permanent record of who defined\nthe view. This is why the default DEFINER value is the account of the\nview creator.\n\nThe optional ALGORITHM clause is a MySQL extension to standard SQL. It\naffects how MySQL processes the view. ALGORITHM takes three values:\nMERGE, TEMPTABLE, or UNDEFINED. For more information, see\nhttps://dev.mysql.com/doc/refman/8.0/en/view-algorithms.html, as well\nas\nhttps://dev.mysql.com/doc/refman/8.0/en/derived-table-optimization.html\n.\n\nSome views are updatable. That is, you can use them in statements such\nas UPDATE, DELETE, or INSERT to update the contents of the underlying\ntable. For a view to be updatable, there must be a one-to-one\nrelationship between the rows in the view and the rows in the\nunderlying table. There are also certain other constructs that make a\nview nonupdatable.\n\nA generated column in a view is considered updatable because it is\npossible to assign to it. However, if such a column is updated\nexplicitly, the only permitted value is DEFAULT. For information about\ngenerated columns, see\nhttps://dev.mysql.com/doc/refman/8.0/en/create-table-generated-columns.\nhtml.\n\nThe WITH CHECK OPTION clause can be given for an updatable view to\nprevent inserts or updates to rows except those for which the WHERE\nclause in the select_statement is true.\n\nIn a WITH CHECK OPTION clause for an updatable view, the LOCAL and\nCASCADED keywords determine the scope of check testing when the view is\ndefined in terms of another view. The LOCAL keyword restricts the CHECK\nOPTION only to the view being defined. CASCADED causes the checks for\nunderlying views to be evaluated as well. When neither keyword is\ngiven, the default is CASCADED.\n\nFor more information about updatable views and the WITH CHECK OPTION\nclause, see\nhttps://dev.mysql.com/doc/refman/8.0/en/view-updatability.html, and\nhttps://dev.mysql.com/doc/refman/8.0/en/view-check-option.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/create-view.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/create-view.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (526,40,'DROP DATABASE','Syntax:\nDROP {DATABASE | SCHEMA} [IF EXISTS] db_name\n\nDROP DATABASE drops all tables in the database and deletes the\ndatabase. Be very careful with this statement! To use DROP DATABASE,\nyou need the DROP privilege on the database. DROP SCHEMA is a synonym\nfor DROP DATABASE.\n\n*Important*:\n\nWhen a database is dropped, privileges granted specifically for the\ndatabase are not automatically dropped. They must be dropped manually.\nSee [HELP GRANT].\n\nIF EXISTS is used to prevent an error from occurring if the database\ndoes not exist.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/drop-database.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/drop-database.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (527,40,'DROP SCHEMA','Syntax:\nDROP {DATABASE | SCHEMA} [IF EXISTS] db_name\n\nDROP DATABASE drops all tables in the database and deletes the\ndatabase. Be very careful with this statement! To use DROP DATABASE,\nyou need the DROP privilege on the database. DROP SCHEMA is a synonym\nfor DROP DATABASE.\n\n*Important*:\n\nWhen a database is dropped, privileges granted specifically for the\ndatabase are not automatically dropped. They must be dropped manually.\nSee [HELP GRANT].\n\nIF EXISTS is used to prevent an error from occurring if the database\ndoes not exist.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/drop-database.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/drop-database.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (528,40,'DROP EVENT','Syntax:\nDROP EVENT [IF EXISTS] event_name\n\nThis statement drops the event named event_name. The event immediately\nceases being active, and is deleted completely from the server.\n\nIf the event does not exist, the error ERROR 1517 (HY000): Unknown\nevent \'event_name\' results. You can override this and cause the\nstatement to generate a warning for nonexistent events instead using IF\nEXISTS.\n\nThis statement requires the EVENT privilege for the schema to which the\nevent to be dropped belongs.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/drop-event.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/drop-event.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (529,40,'DROP INDEX','Syntax:\nDROP INDEX index_name ON tbl_name\n    [algorithm_option | lock_option] ...\n\nalgorithm_option:\n    ALGORITHM [=] {DEFAULT | INPLACE | COPY}\n\nlock_option:\n    LOCK [=] {DEFAULT | NONE | SHARED | EXCLUSIVE}\n\nDROP INDEX drops the index named index_name from the table tbl_name.\nThis statement is mapped to an ALTER TABLE statement to drop the index.\nSee [HELP ALTER TABLE].\n\nTo drop a primary key, the index name is always PRIMARY, which must be\nspecified as a quoted identifier because PRIMARY is a reserved word:\n\nDROP INDEX `PRIMARY` ON t;\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/drop-index.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/drop-index.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (530,40,'DROP PROCEDURE','Syntax:\nDROP {PROCEDURE | FUNCTION} [IF EXISTS] sp_name\n\nThese statements are used to drop a stored routine (a stored procedure\nor function). That is, the specified routine is removed from the\nserver. (DROP FUNCTION is also used to drop loadable functions; see\n[HELP DROP FUNCTION loadable function].)\n\nTo drop a stored routine, you must have the ALTER ROUTINE privilege for\nit. (If the automatic_sp_privileges system variable is enabled, that\nprivilege and EXECUTE are granted automatically to the routine creator\nwhen the routine is created and dropped from the creator when the\nroutine is dropped. See\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-routines-privileges.html\n.)\n\nThe IF EXISTS clause is a MySQL extension. It prevents an error from\noccurring if the procedure or function does not exist. A warning is\nproduced that can be viewed with SHOW WARNINGS.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/drop-procedure.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/drop-procedure.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (531,40,'DROP FUNCTION','Syntax:\nDROP {PROCEDURE | FUNCTION} [IF EXISTS] sp_name\n\nThese statements are used to drop a stored routine (a stored procedure\nor function). That is, the specified routine is removed from the\nserver. (DROP FUNCTION is also used to drop loadable functions; see\n[HELP DROP FUNCTION loadable function].)\n\nTo drop a stored routine, you must have the ALTER ROUTINE privilege for\nit. (If the automatic_sp_privileges system variable is enabled, that\nprivilege and EXECUTE are granted automatically to the routine creator\nwhen the routine is created and dropped from the creator when the\nroutine is dropped. See\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-routines-privileges.html\n.)\n\nThe IF EXISTS clause is a MySQL extension. It prevents an error from\noccurring if the procedure or function does not exist. A warning is\nproduced that can be viewed with SHOW WARNINGS.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/drop-procedure.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/drop-procedure.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (532,40,'DROP SERVER','Syntax:\nDROP SERVER [ IF EXISTS ] server_name\n\nDrops the server definition for the server named server_name. The\ncorresponding row in the mysql.servers table is deleted. This statement\nrequires the SUPER privilege.\n\nDropping a server for a table does not affect any FEDERATED tables that\nused this connection information when they were created. See [HELP\nCREATE SERVER].\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/drop-server.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/drop-server.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (533,40,'DROP SPATIAL REFERENCE SYSTEM','Syntax:\nDROP SPATIAL REFERENCE SYSTEM\n    [IF EXISTS]\n    srid\n\nsrid: 32-bit unsigned integer\n\nThis statement removes a spatial reference system (SRS) definition from\nthe data dictionary. It requires the SUPER privilege.\n\nExample:\n\nDROP SPATIAL REFERENCE SYSTEM 4120;\n\nIf no SRS definition with the SRID value exists, an error occurs unless\nIF EXISTS is specified. In that case, a warning occurs rather than an\nerror.\n\nIf the SRID value is used by some column in an existing table, an error\noccurs. For example:\n\nmysql> DROP SPATIAL REFERENCE SYSTEM 4326;\nERROR 3716 (SR005): Can\'t modify SRID 4326. There is at\nleast one column depending on it.\n\nTo identify which column or columns use the SRID, use this query:\n\nSELECT * FROM INFORMATION_SCHEMA.ST_GEOMETRY_COLUMNS WHERE SRS_ID=4326;\n\nSRID values must be in the range of 32-bit unsigned integers, with\nthese restrictions:\n\no SRID 0 is a valid SRID but cannot be used with DROP SPATIAL REFERENCE\n  SYSTEM.\n\no If the value is in a reserved SRID range, a warning occurs. Reserved\n  ranges are [0, 32767] (reserved by EPSG), [60,000,000, 69,999,999]\n  (reserved by EPSG), and [2,000,000,000, 2,147,483,647] (reserved by\n  MySQL). EPSG stands for the European Petroleum Survey Group\n  (http://epsg.org).\n\no Users should not drop SRSs with SRIDs in the reserved ranges. If\n  system-installed SRSs are dropped, the SRS definitions may be\n  recreated for MySQL upgrades.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/drop-spatial-reference-system.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/drop-spatial-reference-system.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (534,40,'DROP TABLE','Syntax:\nDROP [TEMPORARY] TABLE [IF EXISTS]\n    tbl_name [, tbl_name] ...\n    [RESTRICT | CASCADE]\n\nDROP TABLE removes one or more tables. You must have the DROP privilege\nfor each table.\n\nBe careful with this statement! For each table, it removes the table\ndefinition and all table data. If the table is partitioned, the\nstatement removes the table definition, all its partitions, all data\nstored in those partitions, and all partition definitions associated\nwith the dropped table.\n\nDropping a table also drops any triggers for the table.\n\nDROP TABLE causes an implicit commit, except when used with the\nTEMPORARY keyword. See\nhttps://dev.mysql.com/doc/refman/8.0/en/implicit-commit.html.\n\n*Important*:\n\nWhen a table is dropped, privileges granted specifically for the table\nare not automatically dropped. They must be dropped manually. See [HELP\nGRANT].\n\nIf any tables named in the argument list do not exist, DROP TABLE\nbehavior depends on whether the IF EXISTS clause is given:\n\no Without IF EXISTS, the statement fails with an error indicating which\n  nonexisting tables it was unable to drop, and no changes are made.\n\no With IF EXISTS, no error occurs for nonexisting tables. The statement\n  drops all named tables that do exist, and generates a NOTE diagnostic\n  for each nonexistent table. These notes can be displayed with SHOW\n  WARNINGS. See [HELP SHOW WARNINGS].\n\nIF EXISTS can also be useful for dropping tables in unusual\ncircumstances under which there is an entry in the data dictionary but\nno table managed by the storage engine. (For example, if an abnormal\nserver exit occurs after removal of the table from the storage engine\nbut before removal of the data dictionary entry.)\n\nThe TEMPORARY keyword has the following effects:\n\no The statement drops only TEMPORARY tables.\n\no The statement does not cause an implicit commit.\n\no No access rights are checked. A TEMPORARY table is visible only with\n  the session that created it, so no check is necessary.\n\nIncluding the TEMPORARY keyword is a good way to prevent accidentally\ndropping non-TEMPORARY tables.\n\nThe RESTRICT and CASCADE keywords do nothing. They are permitted to\nmake porting easier from other database systems.\n\nDROP TABLE is not supported with all innodb_force_recovery settings.\nSee\nhttps://dev.mysql.com/doc/refman/8.0/en/forcing-innodb-recovery.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/drop-table.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/drop-table.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (535,40,'DROP TABLESPACE','Syntax:\nDROP [UNDO] TABLESPACE tablespace_name\n    [ENGINE [=] engine_name]\n\nThis statement drops a tablespace that was previously created using\nCREATE TABLESPACE. It is supported by the NDB and InnoDB storage\nengines.\n\nThe UNDO keyword, introduced in MySQL 8.0.14, must be specified to drop\nan undo tablespace. Only undo tablespaces created using CREATE UNDO\nTABLESPACE syntax can be dropped. An undo tablespace must be in an\nempty state before it can be dropped. For more information, see\nhttps://dev.mysql.com/doc/refman/8.0/en/innodb-undo-tablespaces.html.\n\nENGINE sets the storage engine that uses the tablespace, where\nengine_name is the name of the storage engine. Currently, the values\nInnoDB and NDB are supported. If not set, the value of\ndefault_storage_engine is used. If it is not the same as the storage\nengine used to create the tablespace, the DROP TABLESPACE statement\nfails.\n\ntablespace_name is a case-sensitive identifier in MySQL.\n\nFor an InnoDB general tablespace, all tables must be dropped from the\ntablespace prior to a DROP TABLESPACE operation. If the tablespace is\nnot empty, DROP TABLESPACE returns an error.\n\nAn NDB tablespace to be dropped must not contain any data files; in\nother words, before you can drop an NDB tablespace, you must first drop\neach of its data files using ALTER TABLESPACE ... DROP DATAFILE.\n\nNotes\n\no A general InnoDB tablespace is not deleted automatically when the\n  last table in the tablespace is dropped. The tablespace must be\n  dropped explicitly using DROP TABLESPACE tablespace_name.\n\no A DROP DATABASE operation can drop tables that belong to a general\n  tablespace but it cannot drop the tablespace, even if the operation\n  drops all tables that belong to the tablespace. The tablespace must\n  be dropped explicitly using DROP TABLESPACE tablespace_name.\n\no Similar to the system tablespace, truncating or dropping tables\n  stored in a general tablespace creates free space internally in the\n  general tablespace .ibd data file which can only be used for new\n  InnoDB data. Space is not released back to the operating system as it\n  is for file-per-table tablespaces.\n\nInnoDB Examples\n\nThis example demonstrates how to drop an InnoDB general tablespace. The\ngeneral tablespace ts1 is created with a single table. Before dropping\nthe tablespace, the table must be dropped.\n\nmysql> CREATE TABLESPACE `ts1` ADD DATAFILE \'ts1.ibd\' Engine=InnoDB;\n\nmysql> CREATE TABLE t1 (c1 INT PRIMARY KEY) TABLESPACE ts1 Engine=InnoDB;\n\nmysql> DROP TABLE t1;\n\nmysql> DROP TABLESPACE ts1;\n\nThis example demonstrates dropping an undo tablespace. An undo\ntablespace must be in an empty state before it can be dropped. For more\ninformation, see\nhttps://dev.mysql.com/doc/refman/8.0/en/innodb-undo-tablespaces.html.\n\nmysql> DROP UNDO TABLESPACE undo_003;\n\nNDB Example\n\nThis example shows how to drop an NDB tablespace myts having a data\nfile named mydata-1.dat after first creating the tablespace, and\nassumes the existence of a log file group named mylg (see [HELP CREATE\nLOGFILE GROUP]).\n\nmysql> CREATE TABLESPACE myts\n    ->     ADD DATAFILE \'mydata-1.dat\'\n    ->     USE LOGFILE GROUP mylg\n    ->     ENGINE=NDB;\n\nYou must remove all data files from the tablespace using ALTER\nTABLESPACE, as shown here, before it can be dropped:\n\nmysql> ALTER TABLESPACE myts\n    ->     DROP DATAFILE \'mydata-1.dat\'\n    ->     ENGINE=NDB;\n\nmysql> DROP TABLESPACE myts;\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/drop-tablespace.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/drop-tablespace.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (536,40,'DROP TRIGGER','Syntax:\nDROP TRIGGER [IF EXISTS] [schema_name.]trigger_name\n\nThis statement drops a trigger. The schema (database) name is optional.\nIf the schema is omitted, the trigger is dropped from the default\nschema. DROP TRIGGER requires the TRIGGER privilege for the table\nassociated with the trigger.\n\nUse IF EXISTS to prevent an error from occurring for a trigger that\ndoes not exist. A NOTE is generated for a nonexistent trigger when\nusing IF EXISTS. See [HELP SHOW WARNINGS].\n\nTriggers for a table are also dropped if you drop the table.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/drop-trigger.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/drop-trigger.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (537,40,'DROP VIEW','Syntax:\nDROP VIEW [IF EXISTS]\n    view_name [, view_name] ...\n    [RESTRICT | CASCADE]\n\nDROP VIEW removes one or more views. You must have the DROP privilege\nfor each view.\n\nIf any views named in the argument list do not exist, the statement\nfails with an error indicating by name which nonexisting views it was\nunable to drop, and no changes are made.\n\n*Note*:\n\nIn MySQL 5.7 and earlier, DROP VIEW returns an error if any views named\nin the argument list do not exist, but also drops all views in the list\nthat do exist. Due to the change in behavior in MySQL 8.0, a partially\ncompleted DROP VIEW operation on a MySQL 5.7 replication source server\nfails when replicated on a MySQL 8.0 replica. To avoid this failure\nscenario, use IF EXISTS syntax in DROP VIEW statements to prevent an\nerror from occurring for views that do not exist. For more information,\nsee https://dev.mysql.com/doc/refman/8.0/en/atomic-ddl.html.\n\nThe IF EXISTS clause prevents an error from occurring for views that\ndon\'t exist. When this clause is given, a NOTE is generated for each\nnonexistent view. See [HELP SHOW WARNINGS].\n\nRESTRICT and CASCADE, if given, are parsed and ignored.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/drop-view.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/drop-view.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (538,40,'RENAME TABLE','Syntax:\nRENAME TABLE\n    tbl_name TO new_tbl_name\n    [, tbl_name2 TO new_tbl_name2] ...\n\nRENAME TABLE renames one or more tables. You must have ALTER and DROP\nprivileges for the original table, and CREATE and INSERT privileges for\nthe new table.\n\nFor example, to rename a table named old_table to new_table, use this\nstatement:\n\nRENAME TABLE old_table TO new_table;\n\nThat statement is equivalent to the following ALTER TABLE statement:\n\nALTER TABLE old_table RENAME new_table;\n\nRENAME TABLE, unlike ALTER TABLE, can rename multiple tables within a\nsingle statement:\n\nRENAME TABLE old_table1 TO new_table1,\n             old_table2 TO new_table2,\n             old_table3 TO new_table3;\n\nRenaming operations are performed left to right. Thus, to swap two\ntable names, do this (assuming that a table with the intermediary name\ntmp_table does not already exist):\n\nRENAME TABLE old_table TO tmp_table,\n             new_table TO old_table,\n             tmp_table TO new_table;\n\nMetadata locks on tables are acquired in name order, which in some\ncases can make a difference in operation outcome when multiple\ntransactions execute concurrently. See\nhttps://dev.mysql.com/doc/refman/8.0/en/metadata-locking.html.\n\nAs of MySQL 8.0.13, you can rename tables locked with a LOCK TABLES\nstatement, provided that they are locked with a WRITE lock or are the\nproduct of renaming WRITE-locked tables from earlier steps in a\nmultiple-table rename operation. For example, this is permitted:\n\nLOCK TABLE old_table1 WRITE;\nRENAME TABLE old_table1 TO new_table1,\n             new_table1 TO new_table2;\n\nThis is not permitted:\n\nLOCK TABLE old_table1 READ;\nRENAME TABLE old_table1 TO new_table1,\n             new_table1 TO new_table2;\n\nPrior to MySQL 8.0.13, to execute RENAME TABLE, there must be no tables\nlocked with LOCK TABLES.\n\nWith the transaction table locking conditions satisfied, the rename\noperation is done atomically; no other session can access any of the\ntables while the rename is in progress.\n\nIf any errors occur during a RENAME TABLE, the statement fails and no\nchanges are made.\n\nYou can use RENAME TABLE to move a table from one database to another:\n\nRENAME TABLE current_db.tbl_name TO other_db.tbl_name;\n\nUsing this method to move all tables from one database to a different\none in effect renames the database (an operation for which MySQL has no\nsingle statement), except that the original database continues to\nexist, albeit with no tables.\n\nLike RENAME TABLE, ALTER TABLE ... RENAME can also be used to move a\ntable to a different database. Regardless of the statement used, if the\nrename operation would move the table to a database located on a\ndifferent file system, the success of the outcome is platform specific\nand depends on the underlying operating system calls used to move table\nfiles.\n\nIf a table has triggers, attempts to rename the table into a different\ndatabase fail with a Trigger in wrong schema (ER_TRG_IN_WRONG_SCHEMA\n(https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference.h\ntml#error_er_trg_in_wrong_schema)) error.\n\nAn unencrypted table can be moved to an encryption-enabled database and\nvice versa. However, if the table_encryption_privilege_check variable\nis enabled, the TABLE_ENCRYPTION_ADMIN privilege is required if the\ntable encryption setting differs from the default database encryption.\n\nTo rename TEMPORARY tables, RENAME TABLE does not work. Use ALTER TABLE\ninstead.\n\nRENAME TABLE works for views, except that views cannot be renamed into\na different database.\n\nAny privileges granted specifically for a renamed table or view are not\nmigrated to the new name. They must be changed manually.\n\nRENAME TABLE tbl_name TO new_tbl_name changes internally generated\nforeign key constraint names and user-defined foreign key constraint\nnames that begin with the string "tbl_name_ibfk_" to reflect the new\ntable name. InnoDB interprets foreign key constraint names that begin\nwith the string "tbl_name_ibfk_" as internally generated names.\n\nForeign key constraint names that point to the renamed table are\nautomatically updated unless there is a conflict, in which case the\nstatement fails with an error. A conflict occurs if the renamed\nconstraint name already exists. In such cases, you must drop and\nre-create the foreign keys for them to function properly.\n\nRENAME TABLE tbl_name TO new_tbl_name changes internally generated and\nuser-defined CHECK constraint names that begin with the string\n"tbl_name_chk_" to reflect the new table name. MySQL interprets CHECK\nconstraint names that begin with the string "tbl_name_chk_" as\ninternally generated names. Example:\n\nmysql> SHOW CREATE TABLE t1\\G\n*************************** 1. row ***************************\n       Table: t1\nCreate Table: CREATE TABLE `t1` (\n  `i1` int(11) DEFAULT NULL,\n  `i2` int(11) DEFAULT NULL,\n  CONSTRAINT `t1_chk_1` CHECK ((`i1` > 0)),\n  CONSTRAINT `t1_chk_2` CHECK ((`i2` < 0))\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci\n1 row in set (0.02 sec)\n\nmysql> RENAME TABLE t1 TO t3;\nQuery OK, 0 rows affected (0.03 sec)\n\nmysql> SHOW CREATE TABLE t3\\G\n*************************** 1. row ***************************\n       Table: t3\nCreate Table: CREATE TABLE `t3` (\n  `i1` int(11) DEFAULT NULL,\n  `i2` int(11) DEFAULT NULL,\n  CONSTRAINT `t3_chk_1` CHECK ((`i1` > 0)),\n  CONSTRAINT `t3_chk_2` CHECK ((`i2` < 0))\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci\n1 row in set (0.01 sec)\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/rename-table.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/rename-table.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (539,40,'TRUNCATE TABLE','Syntax:\nTRUNCATE [TABLE] tbl_name\n\nTRUNCATE TABLE empties a table completely. It requires the DROP\nprivilege. Logically, TRUNCATE TABLE is similar to a DELETE statement\nthat deletes all rows, or a sequence of DROP TABLE and CREATE TABLE\nstatements.\n\nTo achieve high performance, TRUNCATE TABLE bypasses the DML method of\ndeleting data. Thus, it does not cause ON DELETE triggers to fire, it\ncannot be performed for InnoDB tables with parent-child foreign key\nrelationships, and it cannot be rolled back like a DML operation.\nHowever, TRUNCATE TABLE operations on tables that use an atomic\nDDL-supported storage engine are either fully committed or rolled back\nif the server halts during their operation. For more information, see\nhttps://dev.mysql.com/doc/refman/8.0/en/atomic-ddl.html.\n\nAlthough TRUNCATE TABLE is similar to DELETE, it is classified as a DDL\nstatement rather than a DML statement. It differs from DELETE in the\nfollowing ways:\n\no Truncate operations drop and re-create the table, which is much\n  faster than deleting rows one by one, particularly for large tables.\n\no Truncate operations cause an implicit commit, and so cannot be rolled\n  back. See\n  https://dev.mysql.com/doc/refman/8.0/en/implicit-commit.html.\n\no Truncation operations cannot be performed if the session holds an\n  active table lock.\n\no TRUNCATE TABLE fails for an InnoDB table or NDB table if there are\n  any FOREIGN KEY constraints from other tables that reference the\n  table. Foreign key constraints between columns of the same table are\n  permitted.\n\no Truncation operations do not return a meaningful value for the number\n  of deleted rows. The usual result is "0 rows affected," which should\n  be interpreted as "no information."\n\no As long as the table definition is valid, the table can be re-created\n  as an empty table with TRUNCATE TABLE, even if the data or index\n  files have become corrupted.\n\no Any AUTO_INCREMENT value is reset to its start value. This is true\n  even for MyISAM and InnoDB, which normally do not reuse sequence\n  values.\n\no When used with partitioned tables, TRUNCATE TABLE preserves the\n  partitioning; that is, the data and index files are dropped and\n  re-created, while the partition definitions are unaffected.\n\no The TRUNCATE TABLE statement does not invoke ON DELETE triggers.\n\no Truncating a corrupted InnoDB table is supported.\n\nTRUNCATE TABLE is treated for purposes of binary logging and\nreplication as DDL rather than DML, and is always logged as a\nstatement.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/truncate-table.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/truncate-table.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (540,41,'CALL','Syntax:\nCALL sp_name([parameter[,...]])\nCALL sp_name[()]\n\nThe CALL statement invokes a stored procedure that was defined\npreviously with CREATE PROCEDURE.\n\nStored procedures that take no arguments can be invoked without\nparentheses. That is, CALL p() and CALL p are equivalent.\n\nCALL can pass back values to its caller using parameters that are\ndeclared as OUT or INOUT parameters. When the procedure returns, a\nclient program can also obtain the number of rows affected for the\nfinal statement executed within the routine: At the SQL level, call the\nROW_COUNT() function; from the C API, call the mysql_affected_rows()\n(https://dev.mysql.com/doc/c-api/8.0/en/mysql-affected-rows.html)\nfunction.\n\nFor information about the effect of unhandled conditions on procedure\nparameters, see\nhttps://dev.mysql.com/doc/refman/8.0/en/conditions-and-parameters.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/call.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/call.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (541,41,'DELETE','Syntax:\nDELETE is a DML statement that removes rows from a table.\n\nA DELETE statement can start with a WITH clause to define common table\nexpressions accessible within the DELETE. See\nhttps://dev.mysql.com/doc/refman/8.0/en/with.html.\n\nSingle-Table Syntax\n\nDELETE [LOW_PRIORITY] [QUICK] [IGNORE] FROM tbl_name [[AS] tbl_alias]\n    [PARTITION (partition_name [, partition_name] ...)]\n    [WHERE where_condition]\n    [ORDER BY ...]\n    [LIMIT row_count]\n\nThe DELETE statement deletes rows from tbl_name and returns the number\nof deleted rows. To check the number of deleted rows, call the\nROW_COUNT() function described in\nhttps://dev.mysql.com/doc/refman/8.0/en/information-functions.html.\n\nMain Clauses\n\nThe conditions in the optional WHERE clause identify which rows to\ndelete. With no WHERE clause, all rows are deleted.\n\nwhere_condition is an expression that evaluates to true for each row to\nbe deleted. It is specified as described in\nhttps://dev.mysql.com/doc/refman/8.0/en/select.html.\n\nIf the ORDER BY clause is specified, the rows are deleted in the order\nthat is specified. The LIMIT clause places a limit on the number of\nrows that can be deleted. These clauses apply to single-table deletes,\nbut not multi-table deletes.\n\nMultiple-Table Syntax\n\nDELETE [LOW_PRIORITY] [QUICK] [IGNORE]\n    tbl_name[.*] [, tbl_name[.*]] ...\n    FROM table_references\n    [WHERE where_condition]\n\nDELETE [LOW_PRIORITY] [QUICK] [IGNORE]\n    FROM tbl_name[.*] [, tbl_name[.*]] ...\n    USING table_references\n    [WHERE where_condition]\n\nPrivileges\n\nYou need the DELETE privilege on a table to delete rows from it. You\nneed only the SELECT privilege for any columns that are only read, such\nas those named in the WHERE clause.\n\nPerformance\n\nWhen you do not need to know the number of deleted rows, the TRUNCATE\nTABLE statement is a faster way to empty a table than a DELETE\nstatement with no WHERE clause. Unlike DELETE, TRUNCATE TABLE cannot be\nused within a transaction or if you have a lock on the table. See [HELP\nTRUNCATE TABLE] and [HELP LOCK TABLES].\n\nThe speed of delete operations may also be affected by factors\ndiscussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/delete-optimization.html.\n\nTo ensure that a given DELETE statement does not take too much time,\nthe MySQL-specific LIMIT row_count clause for DELETE specifies the\nmaximum number of rows to be deleted. If the number of rows to delete\nis larger than the limit, repeat the DELETE statement until the number\nof affected rows is less than the LIMIT value.\n\nSubqueries\n\nYou cannot delete from a table and select from the same table in a\nsubquery.\n\nPartitioned Table Support\n\nDELETE supports explicit partition selection using the PARTITION\nclause, which takes a list of the comma-separated names of one or more\npartitions or subpartitions (or both) from which to select rows to be\ndropped. Partitions not included in the list are ignored. Given a\npartitioned table t with a partition named p0, executing the statement\nDELETE FROM t PARTITION (p0) has the same effect on the table as\nexecuting ALTER TABLE t TRUNCATE PARTITION (p0); in both cases, all\nrows in partition p0 are dropped.\n\nPARTITION can be used along with a WHERE condition, in which case the\ncondition is tested only on rows in the listed partitions. For example,\nDELETE FROM t PARTITION (p0) WHERE c < 5 deletes rows only from\npartition p0 for which the condition c < 5 is true; rows in any other\npartitions are not checked and thus not affected by the DELETE.\n\nThe PARTITION clause can also be used in multiple-table DELETE\nstatements. You can use up to one such option per table named in the\nFROM option.\n\nFor more information and examples, see\nhttps://dev.mysql.com/doc/refman/8.0/en/partitioning-selection.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/delete.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/delete.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (542,41,'DO','Syntax:\nDO expr [, expr] ...\n\nDO executes the expressions but does not return any results. In most\nrespects, DO is shorthand for SELECT expr, ..., but has the advantage\nthat it is slightly faster when you do not care about the result.\n\nDO is useful primarily with functions that have side effects, such as\nRELEASE_LOCK().\n\nExample: This SELECT statement pauses, but also produces a result set:\n\nmysql> SELECT SLEEP(5);\n+----------+\n| SLEEP(5) |\n+----------+\n|        0 |\n+----------+\n1 row in set (5.02 sec)\n\nDO, on the other hand, pauses without producing a result set.:\n\nmysql> DO SLEEP(5);\nQuery OK, 0 rows affected (4.99 sec)\n\nThis could be useful, for example in a stored function or trigger,\nwhich prohibit statements that produce result sets.\n\nDO only executes expressions. It cannot be used in all cases where\nSELECT can be used. For example, DO id FROM t1 is invalid because it\nreferences a table.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/do.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/do.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (543,41,'HANDLER','Syntax:\nHANDLER tbl_name OPEN [ [AS] alias]\n\nHANDLER tbl_name READ index_name { = | <= | >= | < | > } (value1,value2,...)\n    [ WHERE where_condition ] [LIMIT ... ]\nHANDLER tbl_name READ index_name { FIRST | NEXT | PREV | LAST }\n    [ WHERE where_condition ] [LIMIT ... ]\nHANDLER tbl_name READ { FIRST | NEXT }\n    [ WHERE where_condition ] [LIMIT ... ]\n\nHANDLER tbl_name CLOSE\n\nThe HANDLER statement provides direct access to table storage engine\ninterfaces. It is available for InnoDB and MyISAM tables.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/handler.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/handler.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (544,41,'IMPORT TABLE','Syntax:\nIMPORT TABLE FROM sdi_file [, sdi_file] ...\n\nThe IMPORT TABLE statement imports MyISAM tables based on information\ncontained in .sdi (serialized dictionary information) metadata files.\nIMPORT TABLE requires the FILE privilege to read the .sdi and table\ncontent files, and the CREATE privilege for the table to be created.\n\nTables can be exported from one server using mysqldump to write a file\nof SQL statements and imported into another server using mysql to\nprocess the dump file. IMPORT TABLE provides a faster alternative using\nthe "raw" table files.\n\nPrior to import, the files that provide the table content must be\nplaced in the appropriate schema directory for the import server, and\nthe .sdi file must be located in a directory accessible to the server.\nFor example, the .sdi file can be placed in the directory named by the\nsecure_file_priv system variable, or (if secure_file_priv is empty) in\na directory under the server data directory.\n\nThe following example describes how to export MyISAM tables named\nemployees and managers from the hr schema of one server and import them\ninto the hr schema of another server. The example uses these\nassumptions (to perform a similar operation on your own system, modify\nthe path names as appropriate):\n\no For the export server, export_basedir represents its base directory,\n  and its data directory is export_basedir/data.\n\no For the import server, import_basedir represents its base directory,\n  and its data directory is import_basedir/data.\n\no Table files are exported from the export server into the /tmp/export\n  directory and this directory is secure (not accessible to other\n  users).\n\no The import server uses /tmp/mysql-files as the directory named by its\n  secure_file_priv system variable.\n\nTo export tables from the export server, use this procedure:\n\n1. Ensure a consistent snapshot by executing this statement to lock the\n   tables so that they cannot be modified during export:\n\nmysql> FLUSH TABLES hr.employees, hr.managers WITH READ LOCK;\n\n   While the lock is in effect, the tables can still be used, but only\n   for read access.\n\n2. At the file system level, copy the .sdi and table content files from\n   the hr schema directory to the secure export directory:\n\n  o The .sdi file is located in the hr schema directory, but might not\n    have exactly the same basename as the table name. For example, the\n    .sdi files for the employees and managers tables might be named\n    employees_125.sdi and managers_238.sdi.\n\n  o For a MyISAM table, the content files are its .MYD data file and\n    .MYI index file.\n\n   Given those file names, the copy commands look like this:\n\nshell> cd export_basedir/data/hr\nshell> cp employees_125.sdi /tmp/export\nshell> cp managers_238.sdi /tmp/export\nshell> cp employees.{MYD,MYI} /tmp/export\nshell> cp managers.{MYD,MYI} /tmp/export\n\n3. Unlock the tables:\n\nmysql> UNLOCK TABLES;\n\nTo import tables into the import server, use this procedure:\n\n1. The import schema must exist. If necessary, execute this statement\n   to create it:\n\nmysql> CREATE SCHEMA hr;\n\n2. At the file system level, copy the .sdi files to the import server\n   secure_file_priv directory, /tmp/mysql-files. Also, copy the table\n   content files to the hr schema directory:\n\nshell> cd /tmp/export\nshell> cp employees_125.sdi /tmp/mysql-files\nshell> cp managers_238.sdi /tmp/mysql-files\nshell> cp employees.{MYD,MYI} import_basedir/data/hr\nshell> cp managers.{MYD,MYI} import_basedir/data/hr\n\n3. Import the tables by executing an IMPORT TABLE statement that names\n   the .sdi files:\n\nmysql> IMPORT TABLE FROM\n       \'/tmp/mysql-files/employees.sdi\',\n       \'/tmp/mysql-files/managers.sdi\';\n\nThe .sdi file need not be placed in the import server directory named\nby the secure_file_priv system variable if that variable is empty; it\ncan be in any directory accessible to the server, including the schema\ndirectory for the imported table. If the .sdi file is placed in that\ndirectory, however, it may be rewritten; the import operation creates a\nnew .sdi file for the table, which overwrites the old .sdi file if the\noperation uses the same file name for the new file.\n\nEach sdi_file value must be a string literal that names the .sdi file\nfor a table or is a pattern that matches .sdi files. If the string is a\npattern, any leading directory path and the .sdi file name suffix must\nbe given literally. Pattern characters are permitted only in the base\nname part of the file name:\n\no ? matches any single character\n\no * matches any sequence of characters, including no characters\n\nUsing a pattern, the previous IMPORT TABLE statement could have been\nwritten like this (assuming that the /tmp/mysql-files directory\ncontains no other .sdi files matching the pattern):\n\nIMPORT TABLE FROM \'/tmp/mysql-files/*.sdi\';\n\nTo interpret the location of .sdi file path names, the server uses the\nsame rules for IMPORT TABLE as the server-side rules for LOAD DATA\n(that is, the non-LOCAL rules). See [HELP LOAD DATA], paying particular\nattention to the rules used to interpret relative path names.\n\nIMPORT TABLE fails if the .sdi or table files cannot be located. After\nimporting a table, the server attempts to open it and reports as\nwarnings any problems detected. To attempt a repair to correct any\nreported issues, use REPAIR TABLE.\n\nIMPORT TABLE is not written to the binary log.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/import-table.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/import-table.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (545,41,'INSERT','Syntax:\nINSERT [LOW_PRIORITY | DELAYED | HIGH_PRIORITY] [IGNORE]\n    [INTO] tbl_name\n    [PARTITION (partition_name [, partition_name] ...)]\n    [(col_name [, col_name] ...)]\n    { {VALUES | VALUE} (value_list) [, (value_list)] ...\n      |\n      VALUES row_constructor_list\n    }\n    [AS row_alias[(col_alias [, col_alias] ...)]]\n    [ON DUPLICATE KEY UPDATE assignment_list]\n\nINSERT [LOW_PRIORITY | DELAYED | HIGH_PRIORITY] [IGNORE]\n    [INTO] tbl_name\n    [PARTITION (partition_name [, partition_name] ...)]\n    [AS row_alias[(col_alias [, col_alias] ...)]]\n    SET assignment_list\n    [ON DUPLICATE KEY UPDATE assignment_list]\n\nINSERT [LOW_PRIORITY | HIGH_PRIORITY] [IGNORE]\n    [INTO] tbl_name\n    [PARTITION (partition_name [, partition_name] ...)]\n    [(col_name [, col_name] ...)]\n    [AS row_alias[(col_alias [, col_alias] ...)]]\n    {SELECT ... | TABLE table_name}\n    [ON DUPLICATE KEY UPDATE assignment_list]\n\nvalue:\n    {expr | DEFAULT}\n\nvalue_list:\n    value [, value] ...\n\nrow_constructor_list:\n    ROW(value_list)[, ROW(value_list)][, ...]\n\nassignment:\n    col_name = [row_alias.]value\n\nassignment_list:\n    assignment [, assignment] ...\n\nINSERT inserts new rows into an existing table. The INSERT ... VALUES,\nINSERT ... VALUES ROW(), and INSERT ... SET forms of the statement\ninsert rows based on explicitly specified values. The INSERT ... SELECT\nform inserts rows selected from another table or tables. You can also\nuse INSERT ... TABLE in MySQL 8.0.19 and later to insert rows from a\nsingle table. INSERT with an ON DUPLICATE KEY UPDATE clause enables\nexisting rows to be updated if a row to be inserted would cause a\nduplicate value in a UNIQUE index or PRIMARY KEY. In MySQL 8.0.19 and\nlater, a row alias with one or more optional column alises can be used\nwith ON DUPLICATE KEY UPDATE to refer to the row to be inserted.\n\nFor additional information about INSERT ... SELECT and INSERT ... ON\nDUPLICATE KEY UPDATE, see [HELP INSERT SELECT], and\nhttps://dev.mysql.com/doc/refman/8.0/en/insert-on-duplicate.html.\n\nIn MySQL 8.0, the DELAYED keyword is accepted but ignored by the\nserver. For the reasons for this, see [HELP INSERT DELAYED],\n\nInserting into a table requires the INSERT privilege for the table. If\nthe ON DUPLICATE KEY UPDATE clause is used and a duplicate key causes\nan UPDATE to be performed instead, the statement requires the UPDATE\nprivilege for the columns to be updated. For columns that are read but\nnot modified you need only the SELECT privilege (such as for a column\nreferenced only on the right hand side of an col_name=expr assignment\nin an ON DUPLICATE KEY UPDATE clause).\n\nWhen inserting into a partitioned table, you can control which\npartitions and subpartitions accept new rows. The PARTITION clause\ntakes a list of the comma-separated names of one or more partitions or\nsubpartitions (or both) of the table. If any of the rows to be inserted\nby a given INSERT statement do not match one of the partitions listed,\nthe INSERT statement fails with the error Found a row not matching the\ngiven partition set. For more information and examples, see\nhttps://dev.mysql.com/doc/refman/8.0/en/partitioning-selection.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/insert.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/insert.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (546,41,'INSERT SELECT','Syntax:\nINSERT [LOW_PRIORITY | HIGH_PRIORITY] [IGNORE]\n    [INTO] tbl_name\n    [PARTITION (partition_name [, partition_name] ...)]\n    [(col_name [, col_name] ...)]\n    {SELECT ... | TABLE table_name}\n    [ON DUPLICATE KEY UPDATE assignment_list]\n\nvalue:\n    {expr | DEFAULT}\n\nassignment:\n    col_name = value\n\nassignment_list:\n    assignment [, assignment] ...\n\nWith INSERT ... SELECT, you can quickly insert many rows into a table\nfrom the result of a SELECT statement, which can select from one or\nmany tables. For example:\n\nINSERT INTO tbl_temp2 (fld_id)\n  SELECT tbl_temp1.fld_order_id\n  FROM tbl_temp1 WHERE tbl_temp1.fld_order_id > 100;\n\nBeginning with MySQL 8.0.19, you can use a TABLE statement in place of\nSELECT, as shown here:\n\nINSERT INTO ta TABLE tb;\n\nTABLE tb is equivalent to SELECT * FROM tb. It can be useful when\ninserting all columns from the source table into the target table, and\nno filtering with WHERE is required. In addition, the rows from TABLE\ncan be ordered by one or more columns using ORDER BY, and the number of\nrows inserted can be limited using a LIMIT clause. For more\ninformation, see [HELP TABLE].\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/insert-select.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/insert-select.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (547,41,'INSERT DELAYED','Syntax:\nINSERT DELAYED ...\n\nThe DELAYED option for the INSERT statement is a MySQL extension to\nstandard SQL. In previous versions of MySQL, it can be used for certain\nkinds of tables (such as MyISAM), such that when a client uses INSERT\nDELAYED, it gets an okay from the server at once, and the row is queued\nto be inserted when the table is not in use by any other thread.\n\nDELAYED inserts and replaces were deprecated in MySQL 5.6. In MySQL\n8.0, DELAYED is not supported. The server recognizes but ignores the\nDELAYED keyword, handles the insert as a nondelayed insert, and\ngenerates an ER_WARN_LEGACY_SYNTAX_CONVERTED warning: INSERT DELAYED is\nno longer supported. The statement was converted to INSERT. The DELAYED\nkeyword is scheduled for removal in a future release.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/insert-delayed.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/insert-delayed.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (548,41,'LOAD DATA','Syntax:\nLOAD DATA\n    [LOW_PRIORITY | CONCURRENT] [LOCAL]\n    INFILE \'file_name\'\n    [REPLACE | IGNORE]\n    INTO TABLE tbl_name\n    [PARTITION (partition_name [, partition_name] ...)]\n    [CHARACTER SET charset_name]\n    [{FIELDS | COLUMNS}\n        [TERMINATED BY \'string\']\n        [[OPTIONALLY] ENCLOSED BY \'char\']\n        [ESCAPED BY \'char\']\n    ]\n    [LINES\n        [STARTING BY \'string\']\n        [TERMINATED BY \'string\']\n    ]\n    [IGNORE number {LINES | ROWS}]\n    [(col_name_or_user_var\n        [, col_name_or_user_var] ...)]\n    [SET col_name={expr | DEFAULT}\n        [, col_name={expr | DEFAULT}] ...]\n\nThe LOAD DATA statement reads rows from a text file into a table at a\nvery high speed. The file can be read from the server host or the\nclient host, depending on whether the LOCAL modifier is given. LOCAL\nalso affects data interpretation and error handling.\n\nLOAD DATA is the complement of SELECT ... INTO OUTFILE. (See\nhttps://dev.mysql.com/doc/refman/8.0/en/select-into.html.) To write\ndata from a table to a file, use SELECT ... INTO OUTFILE. To read the\nfile back into a table, use LOAD DATA. The syntax of the FIELDS and\nLINES clauses is the same for both statements.\n\nThe mysqlimport utility provides another way to load data files; it\noperates by sending a LOAD DATA statement to the server. See\nhttps://dev.mysql.com/doc/refman/8.0/en/mysqlimport.html.\n\nFor information about the efficiency of INSERT versus LOAD DATA and\nspeeding up LOAD DATA, see\nhttps://dev.mysql.com/doc/refman/8.0/en/insert-optimization.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/load-data.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/load-data.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (549,41,'LOAD XML','Syntax:\nLOAD XML\n    [LOW_PRIORITY | CONCURRENT] [LOCAL]\n    INFILE \'file_name\'\n    [REPLACE | IGNORE]\n    INTO TABLE [db_name.]tbl_name\n    [CHARACTER SET charset_name]\n    [ROWS IDENTIFIED BY \'<tagname>\']\n    [IGNORE number {LINES | ROWS}]\n    [(field_name_or_user_var\n        [, field_name_or_user_var] ...)]\n    [SET col_name={expr | DEFAULT}\n        [, col_name={expr | DEFAULT}] ...]\n\nThe LOAD XML statement reads data from an XML file into a table. The\nfile_name must be given as a literal string. The tagname in the\noptional ROWS IDENTIFIED BY clause must also be given as a literal\nstring, and must be surrounded by angle brackets (< and >).\n\nLOAD XML acts as the complement of running the mysql client in XML\noutput mode (that is, starting the client with the --xml option). To\nwrite data from a table to an XML file, you can invoke the mysql client\nwith the --xml and -e options from the system shell, as shown here:\n\nshell> mysql --xml -e \'SELECT * FROM mydb.mytable\' > file.xml\n\nTo read the file back into a table, use LOAD XML. By default, the <row>\nelement is considered to be the equivalent of a database table row;\nthis can be changed using the ROWS IDENTIFIED BY clause.\n\nThis statement supports three different XML formats:\n\no Column names as attributes and column values as attribute values:\n\n<row column1="value1" column2="value2" .../>\n\no Column names as tags and column values as the content of these tags:\n\n<row>\n  <column1>value1</column1>\n  <column2>value2</column2>\n</row>\n\no Column names are the name attributes of <field> tags, and values are\n  the contents of these tags:\n\n<row>\n  <field name=\'column1\'>value1</field>\n  <field name=\'column2\'>value2</field>\n</row>\n\n  This is the format used by other MySQL tools, such as mysqldump.\n\nAll three formats can be used in the same XML file; the import routine\nautomatically detects the format for each row and interprets it\ncorrectly. Tags are matched based on the tag or attribute name and the\ncolumn name.\n\nPrior to MySQL 8.0.21, LOAD XML did not support CDATA sections in the\nsource XML. (Bug #30753708, Bug #98199)\n\nThe following clauses work essentially the same way for LOAD XML as\nthey do for LOAD DATA:\n\no LOW_PRIORITY or CONCURRENT\n\no LOCAL\n\no REPLACE or IGNORE\n\no CHARACTER SET\n\no SET\n\nSee [HELP LOAD DATA], for more information about these clauses.\n\n(field_name_or_user_var, ...) is a list of one or more comma-separated\nXML fields or user variables. The name of a user variable used for this\npurpose must match the name of a field from the XML file, prefixed with\n@. You can use field names to select only desired fields. User\nvariables can be employed to store the corresponding field values for\nsubsequent re-use.\n\nThe IGNORE number LINES or IGNORE number ROWS clause causes the first\nnumber rows in the XML file to be skipped. It is analogous to the LOAD\nDATA statement\'s IGNORE ... LINES clause.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/load-xml.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/load-xml.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (550,41,'REPLACE','Syntax:\nREPLACE [LOW_PRIORITY | DELAYED]\n    [INTO] tbl_name\n    [PARTITION (partition_name [, partition_name] ...)]\n    [(col_name [, col_name] ...)]\n    { {VALUES | VALUE} (value_list) [, (value_list)] ...\n      |\n      VALUES row_constructor_list\n    }\n\nREPLACE [LOW_PRIORITY | DELAYED]\n    [INTO] tbl_name\n    [PARTITION (partition_name [, partition_name] ...)]\n    SET assignment_list\n\nREPLACE [LOW_PRIORITY | DELAYED]\n    [INTO] tbl_name\n    [PARTITION (partition_name [, partition_name] ...)]\n    [(col_name [, col_name] ...)]\n    {SELECT ... | TABLE table_name}\n\nvalue:\n    {expr | DEFAULT}\n\nvalue_list:\n    value [, value] ...\n\nrow_constructor_list:\n    ROW(value_list)[, ROW(value_list)][, ...]\n\nassignment:\n    col_name = value\n\nassignment_list:\n    assignment [, assignment] ...\n\nREPLACE works exactly like INSERT, except that if an old row in the\ntable has the same value as a new row for a PRIMARY KEY or a UNIQUE\nindex, the old row is deleted before the new row is inserted. See [HELP\nINSERT].\n\nREPLACE is a MySQL extension to the SQL standard. It either inserts, or\ndeletes and inserts. For another MySQL extension to standard SQL---that\neither inserts or updates---see\nhttps://dev.mysql.com/doc/refman/8.0/en/insert-on-duplicate.html.\n\nDELAYED inserts and replaces were deprecated in MySQL 5.6. In MySQL\n8.0, DELAYED is not supported. The server recognizes but ignores the\nDELAYED keyword, handles the replace as a nondelayed replace, and\ngenerates an ER_WARN_LEGACY_SYNTAX_CONVERTED warning: REPLACE DELAYED\nis no longer supported. The statement was converted to REPLACE. The\nDELAYED keyword is scheduled for removal in a future release. release.\n\n*Note*:\n\nREPLACE makes sense only if a table has a PRIMARY KEY or UNIQUE index.\nOtherwise, it becomes equivalent to INSERT, because there is no index\nto be used to determine whether a new row duplicates another.\n\nValues for all columns are taken from the values specified in the\nREPLACE statement. Any missing columns are set to their default values,\njust as happens for INSERT. You cannot refer to values from the current\nrow and use them in the new row. If you use an assignment such as SET\ncol_name = col_name + 1, the reference to the column name on the right\nhand side is treated as DEFAULT(col_name), so the assignment is\nequivalent to SET col_name = DEFAULT(col_name) + 1.\n\nIn MySQL 8.0.19 and later, you can specify the column values that\nREPLACE attempts to insert using VALUES ROW().\n\nTo use REPLACE, you must have both the INSERT and DELETE privileges for\nthe table.\n\nIf a generated column is replaced explicitly, the only permitted value\nis DEFAULT. For information about generated columns, see\nhttps://dev.mysql.com/doc/refman/8.0/en/create-table-generated-columns.\nhtml.\n\nREPLACE supports explicit partition selection using the PARTITION\nclause with a list of comma-separated names of partitions,\nsubpartitions, or both. As with INSERT, if it is not possible to insert\nthe new row into any of these partitions or subpartitions, the REPLACE\nstatement fails with the error Found a row not matching the given\npartition set. For more information and examples, see\nhttps://dev.mysql.com/doc/refman/8.0/en/partitioning-selection.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/replace.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/replace.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (551,41,'SELECT','Syntax:\nSELECT\n    [ALL | DISTINCT | DISTINCTROW ]\n    [HIGH_PRIORITY]\n    [STRAIGHT_JOIN]\n    [SQL_SMALL_RESULT] [SQL_BIG_RESULT] [SQL_BUFFER_RESULT]\n    [SQL_NO_CACHE] [SQL_CALC_FOUND_ROWS]\n    select_expr [, select_expr] ...\n    [into_option]\n    [FROM table_references\n      [PARTITION partition_list]]\n    [WHERE where_condition]\n    [GROUP BY {col_name | expr | position}, ... [WITH ROLLUP]]\n    [HAVING where_condition]\n    [WINDOW window_name AS (window_spec)\n        [, window_name AS (window_spec)] ...]\n    [ORDER BY {col_name | expr | position}\n      [ASC | DESC], ... [WITH ROLLUP]]\n    [LIMIT {[offset,] row_count | row_count OFFSET offset}]\n    [into_option]\n    [FOR {UPDATE | SHARE}\n        [OF tbl_name [, tbl_name] ...]\n        [NOWAIT | SKIP LOCKED]\n      | LOCK IN SHARE MODE]\n    [into_option]\n\ninto_option: {\n    INTO OUTFILE \'file_name\'\n        [CHARACTER SET charset_name]\n        export_options\n  | INTO DUMPFILE \'file_name\'\n  | INTO var_name [, var_name] ...\n}\n\nSELECT is used to retrieve rows selected from one or more tables, and\ncan include UNION statements and subqueries. See [HELP UNION], and\nhttps://dev.mysql.com/doc/refman/8.0/en/subqueries.html. A SELECT\nstatement can start with a WITH clause to define common table\nexpressions accessible within the SELECT. See\nhttps://dev.mysql.com/doc/refman/8.0/en/with.html.\n\nThe most commonly used clauses of SELECT statements are these:\n\no Each select_expr indicates a column that you want to retrieve. There\n  must be at least one select_expr.\n\no table_references indicates the table or tables from which to retrieve\n  rows. Its syntax is described in [HELP JOIN].\n\no SELECT supports explicit partition selection using the PARTITION\n  clause with a list of partitions or subpartitions (or both) following\n  the name of the table in a table_reference (see [HELP JOIN]). In this\n  case, rows are selected only from the partitions listed, and any\n  other partitions of the table are ignored. For more information and\n  examples, see\n  https://dev.mysql.com/doc/refman/8.0/en/partitioning-selection.html.\n\no The WHERE clause, if given, indicates the condition or conditions\n  that rows must satisfy to be selected. where_condition is an\n  expression that evaluates to true for each row to be selected. The\n  statement selects all rows if there is no WHERE clause.\n\n  In the WHERE expression, you can use any of the functions and\n  operators that MySQL supports, except for aggregate (group)\n  functions. See\n  https://dev.mysql.com/doc/refman/8.0/en/expressions.html, and\n  https://dev.mysql.com/doc/refman/8.0/en/functions.html.\n\nSELECT can also be used to retrieve rows computed without reference to\nany table.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/select.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/select.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (552,41,'DUAL','You are permitted to specify DUAL as a dummy table name in situations\nwhere no tables are referenced:\n\nmysql> SELECT 1 + 1 FROM DUAL;\n        -> 2\n\nDUAL is purely for the convenience of people who require that all\nSELECT statements should have FROM and possibly other clauses. MySQL\nmay ignore the clauses. MySQL does not require FROM DUAL if no tables\nare referenced.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/select.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/select.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (553,41,'JOIN','MySQL supports the following JOIN syntax for the table_references part\nof SELECT statements and multiple-table DELETE and UPDATE statements:\n\ntable_references:\n    escaped_table_reference [, escaped_table_reference] ...\n\nescaped_table_reference: {\n    table_reference\n  | { OJ table_reference }\n}\n\ntable_reference: {\n    table_factor\n  | joined_table\n}\n\ntable_factor: {\n    tbl_name [PARTITION (partition_names)]\n        [[AS] alias] [index_hint_list]\n  | [LATERAL] table_subquery [AS] alias [(col_list)]\n  | ( table_references )\n}\n\njoined_table: {\n    table_reference {[INNER | CROSS] JOIN | STRAIGHT_JOIN} table_factor [join_specification]\n  | table_reference {LEFT|RIGHT} [OUTER] JOIN table_reference join_specification\n  | table_reference NATURAL [INNER | {LEFT|RIGHT} [OUTER]] JOIN table_factor\n}\n\njoin_specification: {\n    ON search_condition\n  | USING (join_column_list)\n}\n\njoin_column_list:\n    column_name [, column_name] ...\n\nindex_hint_list:\n    index_hint [, index_hint] ...\n\nindex_hint: {\n    USE {INDEX|KEY}\n      [FOR {JOIN|ORDER BY|GROUP BY}] ([index_list])\n  | {IGNORE|FORCE} {INDEX|KEY}\n      [FOR {JOIN|ORDER BY|GROUP BY}] (index_list)\n}\n\nindex_list:\n    index_name [, index_name] ...\n\nA table reference is also known as a join expression.\n\nA table reference (when it refers to a partitioned table) may contain a\nPARTITION clause, including a list of comma-separated partitions,\nsubpartitions, or both. This option follows the name of the table and\nprecedes any alias declaration. The effect of this option is that rows\nare selected only from the listed partitions or subpartitions. Any\npartitions or subpartitions not named in the list are ignored. For more\ninformation and examples, see\nhttps://dev.mysql.com/doc/refman/8.0/en/partitioning-selection.html.\n\nThe syntax of table_factor is extended in MySQL in comparison with\nstandard SQL. The standard accepts only table_reference, not a list of\nthem inside a pair of parentheses.\n\nThis is a conservative extension if each comma in a list of\ntable_reference items is considered as equivalent to an inner join. For\nexample:\n\nSELECT * FROM t1 LEFT JOIN (t2, t3, t4)\n                 ON (t2.a = t1.a AND t3.b = t1.b AND t4.c = t1.c)\n\nis equivalent to:\n\nSELECT * FROM t1 LEFT JOIN (t2 CROSS JOIN t3 CROSS JOIN t4)\n                 ON (t2.a = t1.a AND t3.b = t1.b AND t4.c = t1.c)\n\nIn MySQL, JOIN, CROSS JOIN, and INNER JOIN are syntactic equivalents\n(they can replace each other). In standard SQL, they are not\nequivalent. INNER JOIN is used with an ON clause, CROSS JOIN is used\notherwise.\n\nIn general, parentheses can be ignored in join expressions containing\nonly inner join operations. MySQL also supports nested joins. See\nhttps://dev.mysql.com/doc/refman/8.0/en/nested-join-optimization.html.\n\nIndex hints can be specified to affect how the MySQL optimizer makes\nuse of indexes. For more information, see\nhttps://dev.mysql.com/doc/refman/8.0/en/index-hints.html. Optimizer\nhints and the optimizer_switch system variable are other ways to\ninfluence optimizer use of indexes. See\nhttps://dev.mysql.com/doc/refman/8.0/en/optimizer-hints.html, and\nhttps://dev.mysql.com/doc/refman/8.0/en/switchable-optimizations.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/join.html\n\n','SELECT left_tbl.*\n  FROM left_tbl LEFT JOIN right_tbl ON left_tbl.id = right_tbl.id\n  WHERE right_tbl.id IS NULL;\n','https://dev.mysql.com/doc/refman/8.0/en/join.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (554,41,'UNION','Syntax:\nSELECT ...\nUNION [ALL | DISTINCT] SELECT ...\n[UNION [ALL | DISTINCT] SELECT ...]\n\nUNION combines the result from multiple SELECT statements into a single\nresult set. Example:\n\nmysql> SELECT 1, 2;\n+---+---+\n| 1 | 2 |\n+---+---+\n| 1 | 2 |\n+---+---+\nmysql> SELECT \'a\', \'b\';\n+---+---+\n| a | b |\n+---+---+\n| a | b |\n+---+---+\nmysql> SELECT 1, 2 UNION SELECT \'a\', \'b\';\n+---+---+\n| 1 | 2 |\n+---+---+\n| 1 | 2 |\n| a | b |\n+---+---+\n\no https://dev.mysql.com/doc/refman/8.0/en/union.html#union-result-set\n\no https://dev.mysql.com/doc/refman/8.0/en/union.html#union-table\n\no https://dev.mysql.com/doc/refman/8.0/en/union.html#union-distinct-all\n\no https://dev.mysql.com/doc/refman/8.0/en/union.html#union-order-by-lim\n  it\n\no https://dev.mysql.com/doc/refman/8.0/en/union.html#union-restrictions\n\no https://dev.mysql.com/doc/refman/8.0/en/union.html#union-8-0-versus-5\n  -7\n\nResult Set Column Names and Data Types\n\nThe column names for a UNION result set are taken from the column names\nof the first SELECT statement.\n\nSelected columns listed in corresponding positions of each SELECT\nstatement should have the same data type. For example, the first column\nselected by the first statement should have the same type as the first\ncolumn selected by the other statements. If the data types of\ncorresponding SELECT columns do not match, the types and lengths of the\ncolumns in the UNION result take into account the values retrieved by\nall the SELECT statements. For example, consider the following, where\nthe column length is not constrained to the length of the value from\nthe first SELECT:\n\nmysql> SELECT REPEAT(\'a\',1) UNION SELECT REPEAT(\'b\',20);\n+----------------------+\n| REPEAT(\'a\',1)        |\n+----------------------+\n| a                    |\n| bbbbbbbbbbbbbbbbbbbb |\n+----------------------+\n\nTABLE in Unions\n\nBeginning with MySQL 8.0.19, you can also use a TABLE statement or\nVALUES statement in a UNION wherever you can employ the equivalent\nSELECT statement. Assume that tables t1 and t2 are created and\npopulated as shown here:\n\nCREATE TABLE t1 (x INT, y INT);\nINSERT INTO t1 VALUES ROW(4,-2),ROW(5,9);\n\nCREATE TABLE t2 (a INT, b INT);\nINSERT INTO t2 VALUES ROW(1,2),ROW(3,4);\n\nThe preceding being the case, and disregarding the column names in the\noutput of the queries beginning with VALUES, all of the following UNION\nqueries yield the same result:\n\nSELECT * FROM t1 UNION SELECT * FROM t2;\nTABLE t1 UNION SELECT * FROM t2;\nVALUES ROW(4,-2), ROW(5,9) UNION SELECT * FROM t2;\nSELECT * FROM t1 UNION TABLE t2;\nTABLE t1 UNION TABLE t2;\nVALUES ROW(4,-2), ROW(5,9) UNION TABLE t2;\nSELECT * FROM t1 UNION VALUES ROW(4,-2),ROW(5,9);\nTABLE t1 UNION VALUES ROW(4,-2),ROW(5,9);\nVALUES ROW(4,-2), ROW(5,9) UNION VALUES ROW(4,-2),ROW(5,9);\n\nTo force the column names to be the same, wrap the VALUES on the left\nhand side in a SELECT and use aliases, like this:\n\nSELECT * FROM (VALUES ROW(4,-2), ROW(5,9)) AS t(x,y)\n  UNION TABLE t2;\nSELECT * FROM (VALUES ROW(4,-2), ROW(5,9)) AS t(x,y)\n  UNION VALUES ROW(4,-2),ROW(5,9);\n\nUNION DISTINCT and UNION ALL\n\nBy default, duplicate rows are removed from UNION results. The optional\nDISTINCT keyword has the same effect but makes it explicit. With the\noptional ALL keyword, duplicate-row removal does not occur and the\nresult includes all matching rows from all the SELECT statements.\n\nYou can mix UNION ALL and UNION DISTINCT in the same query. Mixed UNION\ntypes are treated such that a DISTINCT union overrides any ALL union to\nits left. A DISTINCT union can be produced explicitly by using UNION\nDISTINCT or implicitly by using UNION with no following DISTINCT or ALL\nkeyword.\n\nIn MySQL 8.0.19 and later, UNION ALL and UNION DISTINCT work the same\nway when one or more TABLE statements are used in the union.\n\nORDER BY and LIMIT in Unions\n\nTo apply an ORDER BY or LIMIT clause to an individual SELECT,\nparenthesize the SELECT and place the clause inside the parentheses:\n\n(SELECT a FROM t1 WHERE a=10 AND B=1 ORDER BY a LIMIT 10)\nUNION\n(SELECT a FROM t2 WHERE a=11 AND B=2 ORDER BY a LIMIT 10);\n\nUse of ORDER BY for individual SELECT statements implies nothing about\nthe order in which the rows appear in the final result because UNION by\ndefault produces an unordered set of rows. Therefore, ORDER BY in this\ncontext typically is used in conjunction with LIMIT, to determine the\nsubset of the selected rows to retrieve for the SELECT, even though it\ndoes not necessarily affect the order of those rows in the final UNION\nresult. If ORDER BY appears without LIMIT in a SELECT, it is optimized\naway because it has no effect in any case.\n\nTo use an ORDER BY or LIMIT clause to sort or limit the entire UNION\nresult, parenthesize the individual SELECT statements and place the\nORDER BY or LIMIT after the last one:\n\n(SELECT a FROM t1 WHERE a=10 AND B=1)\nUNION\n(SELECT a FROM t2 WHERE a=11 AND B=2)\nORDER BY a LIMIT 10;\n\nA statement without parentheses is equivalent to one parenthesized as\njust shown.\n\nBeginning with MySQL 8.0.19, you can use ORDER BY and LIMIT with TABLE\nin unions in the same way as just shown, bearing in mind that TABLE\ndoes not support a WHERE clause.\n\nThis kind of ORDER BY cannot use column references that include a table\nname (that is, names in tbl_name.col_name format). Instead, provide a\ncolumn alias in the first SELECT statement and refer to the alias in\nthe ORDER BY. (Alternatively, refer to the column in the ORDER BY using\nits column position. However, use of column positions is deprecated.)\n\nAlso, if a column to be sorted is aliased, the ORDER BY clause must\nrefer to the alias, not the column name. The first of the following\nstatements is permitted, but the second fails with an Unknown column\n\'a\' in \'order clause\' error:\n\n(SELECT a AS b FROM t) UNION (SELECT ...) ORDER BY b;\n(SELECT a AS b FROM t) UNION (SELECT ...) ORDER BY a;\n\nTo cause rows in a UNION result to consist of the sets of rows\nretrieved by each SELECT one after the other, select an additional\ncolumn in each SELECT to use as a sort column and add an ORDER BY that\nsorts on that column following the last SELECT:\n\n(SELECT 1 AS sort_col, col1a, col1b, ... FROM t1)\nUNION\n(SELECT 2, col2a, col2b, ... FROM t2) ORDER BY sort_col;\n\nTo additionally maintain sort order within individual SELECT results,\nadd a secondary column to the ORDER BY clause:\n\n(SELECT 1 AS sort_col, col1a, col1b, ... FROM t1)\nUNION\n(SELECT 2, col2a, col2b, ... FROM t2) ORDER BY sort_col, col1a;\n\nUse of an additional column also enables you to determine which SELECT\neach row comes from. Extra columns can provide other identifying\ninformation as well, such as a string that indicates a table name.\n\nUNION Restrictions\n\nIn a UNION, the SELECT statements are normal select statements, but\nwith the following restrictions:\n\no HIGH_PRIORITY in the first SELECT has no effect. HIGH_PRIORITY in any\n  subsequent SELECT produces a syntax error.\n\no Only the last SELECT statement can use an INTO clause. However, the\n  entire UNION result is written to the INTO output destination.\n\nAs of MySQL 8.0.20, these two UNION variants containing INTO are\ndeprecated and you should expect support for them to be removed in a\nfuture version of MySQL:\n\no In the trailing query block of a query expression, use of INTO before\n  FROM produces a warning. Example:\n\n... UNION SELECT * INTO OUTFILE \'file_name\' FROM table_name;\n\no In a parenthesized trailing block of a query expression, use of INTO\n  (regardless of its position relative to FROM) produces a warning.\n  Example:\n\n... UNION (SELECT * INTO OUTFILE \'file_name\' FROM table_name);\n\n  Those variants are deprecated because they are confusing, as if they\n  collect information from the named table rather than the entire query\n  expression (the UNION).\n\nUNION queries with an aggregate function in an ORDER BY clause are\nrejected with an ER_AGGREGATE_ORDER_FOR_UNION\n(https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference.h\ntml#error_er_aggregate_order_for_union) error. Example:\n\nSELECT 1 AS foo UNION SELECT 2 ORDER BY MAX(1);\n\nUNION Handing in MySQL 8.0 Compared to MySQL 5.7\n\nIn MySQL 8.0, the parser rules for SELECT and UNION were refactored to\nbe more consistent (the same SELECT syntax applies uniformly in each\nsuch context) and reduce duplication. Compared to MySQL 5.7, several\nuser-visible effects resulted from this work, which may require\nrewriting of certain statements:\n\no NATURAL JOIN permits an optional INNER keyword (NATURAL INNER JOIN),\n  in compliance with standard SQL.\n\no Right-deep joins without parentheses are permitted (for example, ...\n  JOIN ... JOIN ... ON ... ON), in compliance with standard SQL.\n\no STRAIGHT_JOIN now permits a USING clause, similar to other inner\n  joins.\n\no The parser accepts parentheses around query expressions. For example,\n  (SELECT ... UNION SELECT ...) is permitted. See also [HELP\n  parenthesized query expressions].\n\no The parser better conforms to the documented permitted placement of\n  the SQL_CACHE and SQL_NO_CACHE query modifiers.\n\no Left-hand nesting of unions, previously permitted only in subqueries,\n  is now permitted in top-level statements. For example, this statement\n  is now accepted as valid:\n\n(SELECT 1 UNION SELECT 1) UNION SELECT 1;\n\no Locking clauses (FOR UPDATE, LOCK IN SHARE MODE) are allowed only in\n  non-UNION queries. This means that parentheses must be used for\n  SELECT statements containing locking clauses. This statement is no\n  longer accepted as valid:\n\nSELECT 1 FOR UPDATE UNION SELECT 1 FOR UPDATE;\n\n  Instead, write the statement like this:\n\n(SELECT 1 FOR UPDATE) UNION (SELECT 1 FOR UPDATE);\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/union.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/union.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (555,41,'PARENTHESIZED QUERY EXPRESSIONS','Syntax:\nparenthesized_query_expression:\n    ( query_expression [order_by_clause] [limit_clause] )\n      [order_by_clause]\n      [limit_clause]\n      [into_clause]\n\nquery_expression:\n    query_block [UNION query_block [UNION query_block ...]]\n      [order_by_clause]\n      [limit_clause]\n      [into_clause]\n\nquery_block:\n    SELECT ...             (see )\n\norder_by_clause:\n    ORDER BY as for SELECT (see )\n\nlimit_clause:\n    LIMIT as for SELECT    (see )\n\ninto_clause:\n    INTO as for SELECT     (see )\n\nMySQL 8.0.22 and higher supports parenthesized query expressions\naccording to the preceding syntax. At its simplest, a parenthesized\nquery expression contains a single SELECT and no following optional\nclauses:\n\n(SELECT 1);\n(SELECT * FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = \'mysql\');\n\nA parenthesized query expression can also contain a UNION comprising\nmultiple SELECT statements, and end with any or all of the optional\nclauses:\n\nmysql> (SELECT 1 AS result UNION SELECT 2);\n+--------+\n| result |\n+--------+\n|      1 |\n|      2 |\n+--------+\nmysql> (SELECT 1 AS result UNION SELECT 2) LIMIT 1;\n+--------+\n| result |\n+--------+\n|      1 |\n+--------+\nmysql> (SELECT 1 AS result UNION SELECT 2) LIMIT 1 OFFSET 1;\n+--------+\n| result |\n+--------+\n|      2 |\n+--------+\nmysql> (SELECT 1 AS result UNION SELECT 2)\n       ORDER BY result DESC LIMIT 1;\n+--------+\n| result |\n+--------+\n|      2 |\n+--------+\nmysql> (SELECT 1 AS result UNION SELECT 2)\n       ORDER BY result DESC LIMIT 1 OFFSET 1;\n+--------+\n| result |\n+--------+\n|      1 |\n+--------+\nmysql> (SELECT 1 AS result UNION SELECT 3 UNION SELECT 2)\n       ORDER BY result LIMIT 1 OFFSET 1 INTO @var;\nmysql> SELECT @var;\n+------+\n| @var |\n+------+\n|    2 |\n+------+\n\nParenthesized query expressions are also used as query expressions, so\na query expression, usually composed of query blocks, may also consist\nof parenthesized query expressions:\n\n(SELECT * FROM t1 ORDER BY a) UNION (SELECT * FROM t2 ORDER BY b) ORDER BY z;\n\nQuery blocks may have trailing ORDER BY and LIMIT clauses, which are\napplied before the outer UNION and ORDER BY and LIMIT.\n\nYou cannot have a query block with a trailing ORDER BY or LIMIT,\nwithout wrapping it in parentheses, but parentheses may be used for\nenforcement in various ways:\n\no To enforce LIMIT on each query block:\n\n(SELECT 1 LIMIT 1) UNION (SELECT 2 LIMIT 1);\n\no To enforce LIMIT on both query blocks and the entire query\n  expression:\n\n(SELECT 1 LIMIT 1) UNION (SELECT 2 LIMIT 1) LIMIT 1;\n\no To enforce LIMIT on the entire query expression (with no\n  parentheses):\n\nSELECT 1 UNION SELECT 2 LIMIT 1;\n\no Hybrid enforcement: LIMIT on the first query block and on the entire\n  query expression:\n\n(SELECT 1 LIMIT 1) UNION SELECT 2 LIMIT 1;\n\nThe syntax described in this section is subject to certain\nrestrictions:\n\no If ORDER BY occurs within a parenthesized query expression and also\n  is applied in the outer query, the results are undefined and may\n  change in a future version of MySQL. The same is true if LIMIT occurs\n  within a parenthesized query expression and also is applied in the\n  outer query.\n\no A trailing INTO clause for a query expression is not permitted if\n  there is another INTO clause inside parentheses.\n\no Parenthesized query expressions do not permit multiple levels of\n  ORDER BY or LIMIT operations. For example:\n\nmysql> (SELECT \'a\' UNION SELECT \'b\' LIMIT 1) LIMIT 2;\nERROR 1235 (42000): This version of MySQL doesn\'t yet support \'parenthesized\nquery expression with more than one external level of ORDER/LIMIT operations\'\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/parenthesized-query-expressions.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/parenthesized-query-expressions.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (556,41,'TABLE','Syntax:\nTABLE is a DML statement introduced in MySQL 8.0.19 which returns rows\nand columns of the named table.\n\nTABLE table_name [ORDER BY column_name] [LIMIT number [OFFSET number]]\n\nThe TABLE statement in some ways acts like SELECT. Given the existance\nof a table named t, the following two statements produce identical\noutput:\n\nTABLE t;\n\nSELECT * FROM t;\n\nYou can order and limit the number of rows produced by TABLE using\nORDER BY and LIMIT clauses, respectively. These function identically to\nthe same clauses when used with SELECT (including an optional OFFSET\nclause with LIMIT), as you can see here:\n\nmysql> TABLE t;\n+----+----+\n| a  | b  |\n+----+----+\n|  1 |  2 |\n|  6 |  7 |\n|  9 |  5 |\n| 10 | -4 |\n| 11 | -1 |\n| 13 |  3 |\n| 14 |  6 |\n+----+----+\n7 rows in set (0.00 sec)\n\nmysql> TABLE t ORDER BY b;\n+----+----+\n| a  | b  |\n+----+----+\n| 10 | -4 |\n| 11 | -1 |\n|  1 |  2 |\n| 13 |  3 |\n|  9 |  5 |\n| 14 |  6 |\n|  6 |  7 |\n+----+----+\n7 rows in set (0.00 sec)\n\nmysql> TABLE t LIMIT 3;\n+---+---+\n| a | b |\n+---+---+\n| 1 | 2 |\n| 6 | 7 |\n| 9 | 5 |\n+---+---+\n3 rows in set (0.00 sec)\n\nmysql> TABLE t ORDER BY b LIMIT 3;\n+----+----+\n| a  | b  |\n+----+----+\n| 10 | -4 |\n| 11 | -1 |\n|  1 |  2 |\n+----+----+\n3 rows in set (0.00 sec)\n\nmysql> TABLE t ORDER BY b LIMIT 3 OFFSET 2;\n+----+----+\n| a  | b  |\n+----+----+\n|  1 |  2 |\n| 13 |  3 |\n|  9 |  5 |\n+----+----+\n3 rows in set (0.00 sec)\n\nTABLE differs from SELECT in two key respects:\n\no TABLE always displays all columns of the table.\n\no TABLE does not allow for any arbitrary filtering of rows; that is,\n  TABLE does not support any WHERE clause.\n\nFor limiting which table columns are returned, filtering rows beyond\nwhat can be accomplished using ORDER BY and LIMIT, or both, use SELECT.\n\nTABLE can be used with temporary tables.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/table.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/table.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (557,41,'UPDATE','Syntax:\nUPDATE is a DML statement that modifies rows in a table.\n\nAn UPDATE statement can start with a WITH clause to define common table\nexpressions accessible within the UPDATE. See\nhttps://dev.mysql.com/doc/refman/8.0/en/with.html.\n\nSingle-table syntax:\n\nUPDATE [LOW_PRIORITY] [IGNORE] table_reference\n    SET assignment_list\n    [WHERE where_condition]\n    [ORDER BY ...]\n    [LIMIT row_count]\n\nvalue:\n    {expr | DEFAULT}\n\nassignment:\n    col_name = value\n\nassignment_list:\n    assignment [, assignment] ...\n\nMultiple-table syntax:\n\nUPDATE [LOW_PRIORITY] [IGNORE] table_references\n    SET assignment_list\n    [WHERE where_condition]\n\nFor the single-table syntax, the UPDATE statement updates columns of\nexisting rows in the named table with new values. The SET clause\nindicates which columns to modify and the values they should be given.\nEach value can be given as an expression, or the keyword DEFAULT to set\na column explicitly to its default value. The WHERE clause, if given,\nspecifies the conditions that identify which rows to update. With no\nWHERE clause, all rows are updated. If the ORDER BY clause is\nspecified, the rows are updated in the order that is specified. The\nLIMIT clause places a limit on the number of rows that can be updated.\n\nFor the multiple-table syntax, UPDATE updates rows in each table named\nin table_references that satisfy the conditions. Each matching row is\nupdated once, even if it matches the conditions multiple times. For\nmultiple-table syntax, ORDER BY and LIMIT cannot be used.\n\nFor partitioned tables, both the single-single and multiple-table forms\nof this statement support the use of a PARTITION clause as part of a\ntable reference. This option takes a list of one or more partitions or\nsubpartitions (or both). Only the partitions (or subpartitions) listed\nare checked for matches, and a row that is not in any of these\npartitions or subpartitions is not updated, whether it satisfies the\nwhere_condition or not.\n\n*Note*:\n\nUnlike the case when using PARTITION with an INSERT or REPLACE\nstatement, an otherwise valid UPDATE ... PARTITION statement is\nconsidered successful even if no rows in the listed partitions (or\nsubpartitions) match the where_condition.\n\nFor more information and examples, see\nhttps://dev.mysql.com/doc/refman/8.0/en/partitioning-selection.html.\n\nwhere_condition is an expression that evaluates to true for each row to\nbe updated. For expression syntax, see\nhttps://dev.mysql.com/doc/refman/8.0/en/expressions.html.\n\ntable_references and where_condition are specified as described in\nhttps://dev.mysql.com/doc/refman/8.0/en/select.html.\n\nYou need the UPDATE privilege only for columns referenced in an UPDATE\nthat are actually updated. You need only the SELECT privilege for any\ncolumns that are read but not modified.\n\nThe UPDATE statement supports the following modifiers:\n\no With the LOW_PRIORITY modifier, execution of the UPDATE is delayed\n  until no other clients are reading from the table. This affects only\n  storage engines that use only table-level locking (such as MyISAM,\n  MEMORY, and MERGE).\n\no With the IGNORE modifier, the update statement does not abort even if\n  errors occur during the update. Rows for which duplicate-key\n  conflicts occur on a unique key value are not updated. Rows updated\n  to values that would cause data conversion errors are updated to the\n  closest valid values instead. For more information, see\n  https://dev.mysql.com/doc/refman/8.0/en/sql-mode.html#ignore-effect-o\n  n-execution.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/update.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/update.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (558,41,'VALUES STATEMENT','Syntax:\nVALUES row_constructor_list [ORDER BY column_designator] [LIMIT BY number]\n\nrow_constructor_list:\n    ROW(value_list)[, ROW(value_list)][, ...]\n\nvalue_list:\n    value[, value][, ...]\n\ncolumn_designator:\n    column_index\n\nThe VALUES statement consists of the VALUES keyword followed by a list\nof one or more row constructors, separated by commas. A row constructor\nconsists of the ROW() row constructor clause with a value list of one\nor more scalar values enclosed in the parentheses. A value can be a\nliteral of any MySQL data type or an expression that resolves to a\nscalar value.\n\nROW() cannot be empty (but each of the supplied scalar values can be\nNULL). Each ROW() in the same VALUES statement must have the same\nnumber of values in its value list.\n\nThe DEFAULT keyword is not supported by VALUES and causes a syntax\nerror, except when it is used to supply values in an INSERT statement.\n\nThe output of VALUES is a table:\n\nmysql> VALUES ROW(1,-2,3), ROW(5,7,9), ROW(4,6,8);\n+----------+----------+----------+\n| column_0 | column_1 | column_2 |\n+----------+----------+----------+\n|        1 |       -2 |        3 |\n|        5 |        7 |        9 |\n|        4 |        6 |        8 |\n+----------+----------+----------+\n3 rows in set (0.00 sec)\n\nThe columns of the table output from VALUES have the implicitly named\ncolumns column_0, column_1, column_2, and so on, always beginning with\n0. This fact can be used to order the rows by column using an optional\nORDER BY clause in the same way that this clause works with a SELECT\nstatement, as shown here:\n\nmysql> VALUES ROW(1,-2,3), ROW(5,7,9), ROW(4,6,8) ORDER BY column_1;\n+----------+----------+----------+\n| column_0 | column_1 | column_2 |\n+----------+----------+----------+\n|        1 |       -2 |        3 |\n|        4 |        6 |        8 |\n|        5 |        7 |        9 |\n+----------+----------+----------+\n3 rows in set (0.00 sec)\n\nThe VALUES statement also supports a LIMIT clause for limiting the\nnumber of rows in the output.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/values.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/values.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (559,42,'START TRANSACTION','Syntax:\nSTART TRANSACTION\n    [transaction_characteristic [, transaction_characteristic] ...]\n\ntransaction_characteristic: {\n    WITH CONSISTENT SNAPSHOT\n  | READ WRITE\n  | READ ONLY\n}\n\nBEGIN [WORK]\nCOMMIT [WORK] [AND [NO] CHAIN] [[NO] RELEASE]\nROLLBACK [WORK] [AND [NO] CHAIN] [[NO] RELEASE]\nSET autocommit = {0 | 1}\n\nThese statements provide control over use of transactions:\n\no START TRANSACTION or BEGIN start a new transaction.\n\no COMMIT commits the current transaction, making its changes permanent.\n\no ROLLBACK rolls back the current transaction, canceling its changes.\n\no SET autocommit disables or enables the default autocommit mode for\n  the current session.\n\nBy default, MySQL runs with autocommit mode enabled. This means that,\nwhen not otherwise inside a transaction, each statement is atomic, as\nif it were surrounded by START TRANSACTION and COMMIT. You cannot use\nROLLBACK to undo the effect; however, if an error occurs during\nstatement execution, the statement is rolled back.\n\nTo disable autocommit mode implicitly for a single series of\nstatements, use the START TRANSACTION statement:\n\nSTART TRANSACTION;\nSELECT @A:=SUM(salary) FROM table1 WHERE type=1;\nUPDATE table2 SET summary=@A WHERE type=1;\nCOMMIT;\n\nWith START TRANSACTION, autocommit remains disabled until you end the\ntransaction with COMMIT or ROLLBACK. The autocommit mode then reverts\nto its previous state.\n\nSTART TRANSACTION permits several modifiers that control transaction\ncharacteristics. To specify multiple modifiers, separate them by\ncommas.\n\no The WITH CONSISTENT SNAPSHOT modifier starts a consistent read for\n  storage engines that are capable of it. This applies only to InnoDB.\n  The effect is the same as issuing a START TRANSACTION followed by a\n  SELECT from any InnoDB table. See\n  https://dev.mysql.com/doc/refman/8.0/en/innodb-consistent-read.html.\n  The WITH CONSISTENT SNAPSHOT modifier does not change the current\n  transaction isolation level, so it provides a consistent snapshot\n  only if the current isolation level is one that permits a consistent\n  read. The only isolation level that permits a consistent read is\n  REPEATABLE READ. For all other isolation levels, the WITH CONSISTENT\n  SNAPSHOT clause is ignored. A warning is generated when the WITH\n  CONSISTENT SNAPSHOT clause is ignored.\n\no The READ WRITE and READ ONLY modifiers set the transaction access\n  mode. They permit or prohibit changes to tables used in the\n  transaction. The READ ONLY restriction prevents the transaction from\n  modifying or locking both transactional and nontransactional tables\n  that are visible to other transactions; the transaction can still\n  modify or lock temporary tables.\n\n  MySQL enables extra optimizations for queries on InnoDB tables when\n  the transaction is known to be read-only. Specifying READ ONLY\n  ensures these optimizations are applied in cases where the read-only\n  status cannot be determined automatically. See\n  https://dev.mysql.com/doc/refman/8.0/en/innodb-performance-ro-txn.htm\n  l for more information.\n\n  If no access mode is specified, the default mode applies. Unless the\n  default has been changed, it is read/write. It is not permitted to\n  specify both READ WRITE and READ ONLY in the same statement.\n\n  In read-only mode, it remains possible to change tables created with\n  the TEMPORARY keyword using DML statements. Changes made with DDL\n  statements are not permitted, just as with permanent tables.\n\n  For additional information about transaction access mode, including\n  ways to change the default mode, see [HELP SET TRANSACTION].\n\n  If the read_only system variable is enabled, explicitly starting a\n  transaction with START TRANSACTION READ WRITE requires the\n  CONNECTION_ADMIN privilege (or the deprecated SUPER privilege).\n\n*Important*:\n\nMany APIs used for writing MySQL client applications (such as JDBC)\nprovide their own methods for starting transactions that can (and\nsometimes should) be used instead of sending a START TRANSACTION\nstatement from the client. See\nhttps://dev.mysql.com/doc/refman/8.0/en/connectors-apis.html, or the\ndocumentation for your API, for more information.\n\nTo disable autocommit mode explicitly, use the following statement:\n\nSET autocommit=0;\n\nAfter disabling autocommit mode by setting the autocommit variable to\nzero, changes to transaction-safe tables (such as those for InnoDB or\nNDB) are not made permanent immediately. You must use COMMIT to store\nyour changes to disk or ROLLBACK to ignore the changes.\n\nautocommit is a session variable and must be set for each session. To\ndisable autocommit mode for each new connection, see the description of\nthe autocommit system variable at\nhttps://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html.\n\nBEGIN and BEGIN WORK are supported as aliases of START TRANSACTION for\ninitiating a transaction. START TRANSACTION is standard SQL syntax, is\nthe recommended way to start an ad-hoc transaction, and permits\nmodifiers that BEGIN does not.\n\nThe BEGIN statement differs from the use of the BEGIN keyword that\nstarts a BEGIN ... END compound statement. The latter does not begin a\ntransaction. See [HELP BEGIN END].\n\n*Note*:\n\nWithin all stored programs (stored procedures and functions, triggers,\nand events), the parser treats BEGIN [WORK] as the beginning of a BEGIN\n... END block. Begin a transaction in this context with START\nTRANSACTION instead.\n\nThe optional WORK keyword is supported for COMMIT and ROLLBACK, as are\nthe CHAIN and RELEASE clauses. CHAIN and RELEASE can be used for\nadditional control over transaction completion. The value of the\ncompletion_type system variable determines the default completion\nbehavior. See\nhttps://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html.\n\nThe AND CHAIN clause causes a new transaction to begin as soon as the\ncurrent one ends, and the new transaction has the same isolation level\nas the just-terminated transaction. The new transaction also uses the\nsame access mode (READ WRITE or READ ONLY) as the just-terminated\ntransaction. The RELEASE clause causes the server to disconnect the\ncurrent client session after terminating the current transaction.\nIncluding the NO keyword suppresses CHAIN or RELEASE completion, which\ncan be useful if the completion_type system variable is set to cause\nchaining or release completion by default.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/commit.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/commit.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (560,42,'BEGIN','Syntax:\nSTART TRANSACTION\n    [transaction_characteristic [, transaction_characteristic] ...]\n\ntransaction_characteristic: {\n    WITH CONSISTENT SNAPSHOT\n  | READ WRITE\n  | READ ONLY\n}\n\nBEGIN [WORK]\nCOMMIT [WORK] [AND [NO] CHAIN] [[NO] RELEASE]\nROLLBACK [WORK] [AND [NO] CHAIN] [[NO] RELEASE]\nSET autocommit = {0 | 1}\n\nThese statements provide control over use of transactions:\n\no START TRANSACTION or BEGIN start a new transaction.\n\no COMMIT commits the current transaction, making its changes permanent.\n\no ROLLBACK rolls back the current transaction, canceling its changes.\n\no SET autocommit disables or enables the default autocommit mode for\n  the current session.\n\nBy default, MySQL runs with autocommit mode enabled. This means that,\nwhen not otherwise inside a transaction, each statement is atomic, as\nif it were surrounded by START TRANSACTION and COMMIT. You cannot use\nROLLBACK to undo the effect; however, if an error occurs during\nstatement execution, the statement is rolled back.\n\nTo disable autocommit mode implicitly for a single series of\nstatements, use the START TRANSACTION statement:\n\nSTART TRANSACTION;\nSELECT @A:=SUM(salary) FROM table1 WHERE type=1;\nUPDATE table2 SET summary=@A WHERE type=1;\nCOMMIT;\n\nWith START TRANSACTION, autocommit remains disabled until you end the\ntransaction with COMMIT or ROLLBACK. The autocommit mode then reverts\nto its previous state.\n\nSTART TRANSACTION permits several modifiers that control transaction\ncharacteristics. To specify multiple modifiers, separate them by\ncommas.\n\no The WITH CONSISTENT SNAPSHOT modifier starts a consistent read for\n  storage engines that are capable of it. This applies only to InnoDB.\n  The effect is the same as issuing a START TRANSACTION followed by a\n  SELECT from any InnoDB table. See\n  https://dev.mysql.com/doc/refman/8.0/en/innodb-consistent-read.html.\n  The WITH CONSISTENT SNAPSHOT modifier does not change the current\n  transaction isolation level, so it provides a consistent snapshot\n  only if the current isolation level is one that permits a consistent\n  read. The only isolation level that permits a consistent read is\n  REPEATABLE READ. For all other isolation levels, the WITH CONSISTENT\n  SNAPSHOT clause is ignored. A warning is generated when the WITH\n  CONSISTENT SNAPSHOT clause is ignored.\n\no The READ WRITE and READ ONLY modifiers set the transaction access\n  mode. They permit or prohibit changes to tables used in the\n  transaction. The READ ONLY restriction prevents the transaction from\n  modifying or locking both transactional and nontransactional tables\n  that are visible to other transactions; the transaction can still\n  modify or lock temporary tables.\n\n  MySQL enables extra optimizations for queries on InnoDB tables when\n  the transaction is known to be read-only. Specifying READ ONLY\n  ensures these optimizations are applied in cases where the read-only\n  status cannot be determined automatically. See\n  https://dev.mysql.com/doc/refman/8.0/en/innodb-performance-ro-txn.htm\n  l for more information.\n\n  If no access mode is specified, the default mode applies. Unless the\n  default has been changed, it is read/write. It is not permitted to\n  specify both READ WRITE and READ ONLY in the same statement.\n\n  In read-only mode, it remains possible to change tables created with\n  the TEMPORARY keyword using DML statements. Changes made with DDL\n  statements are not permitted, just as with permanent tables.\n\n  For additional information about transaction access mode, including\n  ways to change the default mode, see [HELP SET TRANSACTION].\n\n  If the read_only system variable is enabled, explicitly starting a\n  transaction with START TRANSACTION READ WRITE requires the\n  CONNECTION_ADMIN privilege (or the deprecated SUPER privilege).\n\n*Important*:\n\nMany APIs used for writing MySQL client applications (such as JDBC)\nprovide their own methods for starting transactions that can (and\nsometimes should) be used instead of sending a START TRANSACTION\nstatement from the client. See\nhttps://dev.mysql.com/doc/refman/8.0/en/connectors-apis.html, or the\ndocumentation for your API, for more information.\n\nTo disable autocommit mode explicitly, use the following statement:\n\nSET autocommit=0;\n\nAfter disabling autocommit mode by setting the autocommit variable to\nzero, changes to transaction-safe tables (such as those for InnoDB or\nNDB) are not made permanent immediately. You must use COMMIT to store\nyour changes to disk or ROLLBACK to ignore the changes.\n\nautocommit is a session variable and must be set for each session. To\ndisable autocommit mode for each new connection, see the description of\nthe autocommit system variable at\nhttps://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html.\n\nBEGIN and BEGIN WORK are supported as aliases of START TRANSACTION for\ninitiating a transaction. START TRANSACTION is standard SQL syntax, is\nthe recommended way to start an ad-hoc transaction, and permits\nmodifiers that BEGIN does not.\n\nThe BEGIN statement differs from the use of the BEGIN keyword that\nstarts a BEGIN ... END compound statement. The latter does not begin a\ntransaction. See [HELP BEGIN END].\n\n*Note*:\n\nWithin all stored programs (stored procedures and functions, triggers,\nand events), the parser treats BEGIN [WORK] as the beginning of a BEGIN\n... END block. Begin a transaction in this context with START\nTRANSACTION instead.\n\nThe optional WORK keyword is supported for COMMIT and ROLLBACK, as are\nthe CHAIN and RELEASE clauses. CHAIN and RELEASE can be used for\nadditional control over transaction completion. The value of the\ncompletion_type system variable determines the default completion\nbehavior. See\nhttps://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html.\n\nThe AND CHAIN clause causes a new transaction to begin as soon as the\ncurrent one ends, and the new transaction has the same isolation level\nas the just-terminated transaction. The new transaction also uses the\nsame access mode (READ WRITE or READ ONLY) as the just-terminated\ntransaction. The RELEASE clause causes the server to disconnect the\ncurrent client session after terminating the current transaction.\nIncluding the NO keyword suppresses CHAIN or RELEASE completion, which\ncan be useful if the completion_type system variable is set to cause\nchaining or release completion by default.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/commit.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/commit.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (561,42,'COMMIT','Syntax:\nSTART TRANSACTION\n    [transaction_characteristic [, transaction_characteristic] ...]\n\ntransaction_characteristic: {\n    WITH CONSISTENT SNAPSHOT\n  | READ WRITE\n  | READ ONLY\n}\n\nBEGIN [WORK]\nCOMMIT [WORK] [AND [NO] CHAIN] [[NO] RELEASE]\nROLLBACK [WORK] [AND [NO] CHAIN] [[NO] RELEASE]\nSET autocommit = {0 | 1}\n\nThese statements provide control over use of transactions:\n\no START TRANSACTION or BEGIN start a new transaction.\n\no COMMIT commits the current transaction, making its changes permanent.\n\no ROLLBACK rolls back the current transaction, canceling its changes.\n\no SET autocommit disables or enables the default autocommit mode for\n  the current session.\n\nBy default, MySQL runs with autocommit mode enabled. This means that,\nwhen not otherwise inside a transaction, each statement is atomic, as\nif it were surrounded by START TRANSACTION and COMMIT. You cannot use\nROLLBACK to undo the effect; however, if an error occurs during\nstatement execution, the statement is rolled back.\n\nTo disable autocommit mode implicitly for a single series of\nstatements, use the START TRANSACTION statement:\n\nSTART TRANSACTION;\nSELECT @A:=SUM(salary) FROM table1 WHERE type=1;\nUPDATE table2 SET summary=@A WHERE type=1;\nCOMMIT;\n\nWith START TRANSACTION, autocommit remains disabled until you end the\ntransaction with COMMIT or ROLLBACK. The autocommit mode then reverts\nto its previous state.\n\nSTART TRANSACTION permits several modifiers that control transaction\ncharacteristics. To specify multiple modifiers, separate them by\ncommas.\n\no The WITH CONSISTENT SNAPSHOT modifier starts a consistent read for\n  storage engines that are capable of it. This applies only to InnoDB.\n  The effect is the same as issuing a START TRANSACTION followed by a\n  SELECT from any InnoDB table. See\n  https://dev.mysql.com/doc/refman/8.0/en/innodb-consistent-read.html.\n  The WITH CONSISTENT SNAPSHOT modifier does not change the current\n  transaction isolation level, so it provides a consistent snapshot\n  only if the current isolation level is one that permits a consistent\n  read. The only isolation level that permits a consistent read is\n  REPEATABLE READ. For all other isolation levels, the WITH CONSISTENT\n  SNAPSHOT clause is ignored. A warning is generated when the WITH\n  CONSISTENT SNAPSHOT clause is ignored.\n\no The READ WRITE and READ ONLY modifiers set the transaction access\n  mode. They permit or prohibit changes to tables used in the\n  transaction. The READ ONLY restriction prevents the transaction from\n  modifying or locking both transactional and nontransactional tables\n  that are visible to other transactions; the transaction can still\n  modify or lock temporary tables.\n\n  MySQL enables extra optimizations for queries on InnoDB tables when\n  the transaction is known to be read-only. Specifying READ ONLY\n  ensures these optimizations are applied in cases where the read-only\n  status cannot be determined automatically. See\n  https://dev.mysql.com/doc/refman/8.0/en/innodb-performance-ro-txn.htm\n  l for more information.\n\n  If no access mode is specified, the default mode applies. Unless the\n  default has been changed, it is read/write. It is not permitted to\n  specify both READ WRITE and READ ONLY in the same statement.\n\n  In read-only mode, it remains possible to change tables created with\n  the TEMPORARY keyword using DML statements. Changes made with DDL\n  statements are not permitted, just as with permanent tables.\n\n  For additional information about transaction access mode, including\n  ways to change the default mode, see [HELP SET TRANSACTION].\n\n  If the read_only system variable is enabled, explicitly starting a\n  transaction with START TRANSACTION READ WRITE requires the\n  CONNECTION_ADMIN privilege (or the deprecated SUPER privilege).\n\n*Important*:\n\nMany APIs used for writing MySQL client applications (such as JDBC)\nprovide their own methods for starting transactions that can (and\nsometimes should) be used instead of sending a START TRANSACTION\nstatement from the client. See\nhttps://dev.mysql.com/doc/refman/8.0/en/connectors-apis.html, or the\ndocumentation for your API, for more information.\n\nTo disable autocommit mode explicitly, use the following statement:\n\nSET autocommit=0;\n\nAfter disabling autocommit mode by setting the autocommit variable to\nzero, changes to transaction-safe tables (such as those for InnoDB or\nNDB) are not made permanent immediately. You must use COMMIT to store\nyour changes to disk or ROLLBACK to ignore the changes.\n\nautocommit is a session variable and must be set for each session. To\ndisable autocommit mode for each new connection, see the description of\nthe autocommit system variable at\nhttps://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html.\n\nBEGIN and BEGIN WORK are supported as aliases of START TRANSACTION for\ninitiating a transaction. START TRANSACTION is standard SQL syntax, is\nthe recommended way to start an ad-hoc transaction, and permits\nmodifiers that BEGIN does not.\n\nThe BEGIN statement differs from the use of the BEGIN keyword that\nstarts a BEGIN ... END compound statement. The latter does not begin a\ntransaction. See [HELP BEGIN END].\n\n*Note*:\n\nWithin all stored programs (stored procedures and functions, triggers,\nand events), the parser treats BEGIN [WORK] as the beginning of a BEGIN\n... END block. Begin a transaction in this context with START\nTRANSACTION instead.\n\nThe optional WORK keyword is supported for COMMIT and ROLLBACK, as are\nthe CHAIN and RELEASE clauses. CHAIN and RELEASE can be used for\nadditional control over transaction completion. The value of the\ncompletion_type system variable determines the default completion\nbehavior. See\nhttps://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html.\n\nThe AND CHAIN clause causes a new transaction to begin as soon as the\ncurrent one ends, and the new transaction has the same isolation level\nas the just-terminated transaction. The new transaction also uses the\nsame access mode (READ WRITE or READ ONLY) as the just-terminated\ntransaction. The RELEASE clause causes the server to disconnect the\ncurrent client session after terminating the current transaction.\nIncluding the NO keyword suppresses CHAIN or RELEASE completion, which\ncan be useful if the completion_type system variable is set to cause\nchaining or release completion by default.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/commit.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/commit.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (562,42,'ROLLBACK','Syntax:\nSTART TRANSACTION\n    [transaction_characteristic [, transaction_characteristic] ...]\n\ntransaction_characteristic: {\n    WITH CONSISTENT SNAPSHOT\n  | READ WRITE\n  | READ ONLY\n}\n\nBEGIN [WORK]\nCOMMIT [WORK] [AND [NO] CHAIN] [[NO] RELEASE]\nROLLBACK [WORK] [AND [NO] CHAIN] [[NO] RELEASE]\nSET autocommit = {0 | 1}\n\nThese statements provide control over use of transactions:\n\no START TRANSACTION or BEGIN start a new transaction.\n\no COMMIT commits the current transaction, making its changes permanent.\n\no ROLLBACK rolls back the current transaction, canceling its changes.\n\no SET autocommit disables or enables the default autocommit mode for\n  the current session.\n\nBy default, MySQL runs with autocommit mode enabled. This means that,\nwhen not otherwise inside a transaction, each statement is atomic, as\nif it were surrounded by START TRANSACTION and COMMIT. You cannot use\nROLLBACK to undo the effect; however, if an error occurs during\nstatement execution, the statement is rolled back.\n\nTo disable autocommit mode implicitly for a single series of\nstatements, use the START TRANSACTION statement:\n\nSTART TRANSACTION;\nSELECT @A:=SUM(salary) FROM table1 WHERE type=1;\nUPDATE table2 SET summary=@A WHERE type=1;\nCOMMIT;\n\nWith START TRANSACTION, autocommit remains disabled until you end the\ntransaction with COMMIT or ROLLBACK. The autocommit mode then reverts\nto its previous state.\n\nSTART TRANSACTION permits several modifiers that control transaction\ncharacteristics. To specify multiple modifiers, separate them by\ncommas.\n\no The WITH CONSISTENT SNAPSHOT modifier starts a consistent read for\n  storage engines that are capable of it. This applies only to InnoDB.\n  The effect is the same as issuing a START TRANSACTION followed by a\n  SELECT from any InnoDB table. See\n  https://dev.mysql.com/doc/refman/8.0/en/innodb-consistent-read.html.\n  The WITH CONSISTENT SNAPSHOT modifier does not change the current\n  transaction isolation level, so it provides a consistent snapshot\n  only if the current isolation level is one that permits a consistent\n  read. The only isolation level that permits a consistent read is\n  REPEATABLE READ. For all other isolation levels, the WITH CONSISTENT\n  SNAPSHOT clause is ignored. A warning is generated when the WITH\n  CONSISTENT SNAPSHOT clause is ignored.\n\no The READ WRITE and READ ONLY modifiers set the transaction access\n  mode. They permit or prohibit changes to tables used in the\n  transaction. The READ ONLY restriction prevents the transaction from\n  modifying or locking both transactional and nontransactional tables\n  that are visible to other transactions; the transaction can still\n  modify or lock temporary tables.\n\n  MySQL enables extra optimizations for queries on InnoDB tables when\n  the transaction is known to be read-only. Specifying READ ONLY\n  ensures these optimizations are applied in cases where the read-only\n  status cannot be determined automatically. See\n  https://dev.mysql.com/doc/refman/8.0/en/innodb-performance-ro-txn.htm\n  l for more information.\n\n  If no access mode is specified, the default mode applies. Unless the\n  default has been changed, it is read/write. It is not permitted to\n  specify both READ WRITE and READ ONLY in the same statement.\n\n  In read-only mode, it remains possible to change tables created with\n  the TEMPORARY keyword using DML statements. Changes made with DDL\n  statements are not permitted, just as with permanent tables.\n\n  For additional information about transaction access mode, including\n  ways to change the default mode, see [HELP SET TRANSACTION].\n\n  If the read_only system variable is enabled, explicitly starting a\n  transaction with START TRANSACTION READ WRITE requires the\n  CONNECTION_ADMIN privilege (or the deprecated SUPER privilege).\n\n*Important*:\n\nMany APIs used for writing MySQL client applications (such as JDBC)\nprovide their own methods for starting transactions that can (and\nsometimes should) be used instead of sending a START TRANSACTION\nstatement from the client. See\nhttps://dev.mysql.com/doc/refman/8.0/en/connectors-apis.html, or the\ndocumentation for your API, for more information.\n\nTo disable autocommit mode explicitly, use the following statement:\n\nSET autocommit=0;\n\nAfter disabling autocommit mode by setting the autocommit variable to\nzero, changes to transaction-safe tables (such as those for InnoDB or\nNDB) are not made permanent immediately. You must use COMMIT to store\nyour changes to disk or ROLLBACK to ignore the changes.\n\nautocommit is a session variable and must be set for each session. To\ndisable autocommit mode for each new connection, see the description of\nthe autocommit system variable at\nhttps://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html.\n\nBEGIN and BEGIN WORK are supported as aliases of START TRANSACTION for\ninitiating a transaction. START TRANSACTION is standard SQL syntax, is\nthe recommended way to start an ad-hoc transaction, and permits\nmodifiers that BEGIN does not.\n\nThe BEGIN statement differs from the use of the BEGIN keyword that\nstarts a BEGIN ... END compound statement. The latter does not begin a\ntransaction. See [HELP BEGIN END].\n\n*Note*:\n\nWithin all stored programs (stored procedures and functions, triggers,\nand events), the parser treats BEGIN [WORK] as the beginning of a BEGIN\n... END block. Begin a transaction in this context with START\nTRANSACTION instead.\n\nThe optional WORK keyword is supported for COMMIT and ROLLBACK, as are\nthe CHAIN and RELEASE clauses. CHAIN and RELEASE can be used for\nadditional control over transaction completion. The value of the\ncompletion_type system variable determines the default completion\nbehavior. See\nhttps://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html.\n\nThe AND CHAIN clause causes a new transaction to begin as soon as the\ncurrent one ends, and the new transaction has the same isolation level\nas the just-terminated transaction. The new transaction also uses the\nsame access mode (READ WRITE or READ ONLY) as the just-terminated\ntransaction. The RELEASE clause causes the server to disconnect the\ncurrent client session after terminating the current transaction.\nIncluding the NO keyword suppresses CHAIN or RELEASE completion, which\ncan be useful if the completion_type system variable is set to cause\nchaining or release completion by default.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/commit.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/commit.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (563,42,'SAVEPOINT','Syntax:\nSAVEPOINT identifier\nROLLBACK [WORK] TO [SAVEPOINT] identifier\nRELEASE SAVEPOINT identifier\n\nInnoDB supports the SQL statements SAVEPOINT, ROLLBACK TO SAVEPOINT,\nRELEASE SAVEPOINT and the optional WORK keyword for ROLLBACK.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/savepoint.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/savepoint.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (564,42,'ROLLBACK TO SAVEPOINT','Syntax:\nSAVEPOINT identifier\nROLLBACK [WORK] TO [SAVEPOINT] identifier\nRELEASE SAVEPOINT identifier\n\nInnoDB supports the SQL statements SAVEPOINT, ROLLBACK TO SAVEPOINT,\nRELEASE SAVEPOINT and the optional WORK keyword for ROLLBACK.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/savepoint.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/savepoint.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (565,42,'RELEASE SAVEPOINT','Syntax:\nSAVEPOINT identifier\nROLLBACK [WORK] TO [SAVEPOINT] identifier\nRELEASE SAVEPOINT identifier\n\nInnoDB supports the SQL statements SAVEPOINT, ROLLBACK TO SAVEPOINT,\nRELEASE SAVEPOINT and the optional WORK keyword for ROLLBACK.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/savepoint.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/savepoint.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (566,42,'LOCK INSTANCE FOR BACKUP','Syntax:\nLOCK INSTANCE FOR BACKUP\n\nUNLOCK INSTANCE\n\nLOCK INSTANCE FOR BACKUP acquires an instance-level backup lock that\npermits DML during an online backup while preventing operations that\ncould result in an inconsistent snapshot.\n\nExecuting the LOCK INSTANCE FOR BACKUP statement requires the\nBACKUP_ADMIN privilege. The BACKUP_ADMIN privilege is automatically\ngranted to users with the RELOAD privilege when performing an in-place\nupgrade to MySQL 8.0 from an earlier version.\n\nMultiple sessions can hold a backup lock simultaneously.\n\nUNLOCK INSTANCE releases a backup lock held by the current session. A\nbackup lock held by a session is also released if the session is\nterminated.\n\nLOCK INSTANCE FOR BACKUP prevents files from being created, renamed, or\nremoved. REPAIR TABLE TRUNCATE TABLE, OPTIMIZE TABLE, and account\nmanagement statements are blocked. See\nhttps://dev.mysql.com/doc/refman/8.0/en/account-management-statements.h\ntml. Operations that modify InnoDB files that are not recorded in the\nInnoDB redo log are also blocked.\n\nLOCK INSTANCE FOR BACKUP permits DDL operations that only affect\nuser-created temporary tables. In effect, files that belong to\nuser-created temporary tables can be created, renamed, or removed while\na backup lock is held. Creation of binary log files is also permitted.\n\nA backup lock acquired by LOCK INSTANCE FOR BACKUP is independent of\ntransactional locks and locks taken by FLUSH TABLES tbl_name [,\ntbl_name] ... WITH READ LOCK, and the following sequences of statements\nare permitted:\n\nLOCK INSTANCE FOR BACKUP;\nFLUSH TABLES tbl_name [, tbl_name] ... WITH READ LOCK;\nUNLOCK TABLES;\nUNLOCK INSTANCE;\n\nFLUSH TABLES tbl_name [, tbl_name] ... WITH READ LOCK;\nLOCK INSTANCE FOR BACKUP;\nUNLOCK INSTANCE;\nUNLOCK TABLES;\n\nThe lock_wait_timeout setting defines the amount of time that a LOCK\nINSTANCE FOR BACKUP statement waits to acquire a lock before giving up.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/lock-instance-for-backup.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/lock-instance-for-backup.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (567,42,'LOCK TABLES','Syntax:\nLOCK TABLES\n    tbl_name [[AS] alias] lock_type\n    [, tbl_name [[AS] alias] lock_type] ...\n\nlock_type: {\n    READ [LOCAL]\n  | [LOW_PRIORITY] WRITE\n}\n\nUNLOCK TABLES\n\nMySQL enables client sessions to acquire table locks explicitly for the\npurpose of cooperating with other sessions for access to tables, or to\nprevent other sessions from modifying tables during periods when a\nsession requires exclusive access to them. A session can acquire or\nrelease locks only for itself. One session cannot acquire locks for\nanother session or release locks held by another session.\n\nLocks may be used to emulate transactions or to get more speed when\nupdating tables. This is explained in more detail in\nhttps://dev.mysql.com/doc/refman/8.0/en/lock-tables.html#lock-tables-re\nstrictions.\n\nLOCK TABLES explicitly acquires table locks for the current client\nsession. Table locks can be acquired for base tables or views. You must\nhave the LOCK TABLES privilege, and the SELECT privilege for each\nobject to be locked.\n\nFor view locking, LOCK TABLES adds all base tables used in the view to\nthe set of tables to be locked and locks them automatically. For tables\nunderlying any view being locked, LOCK TABLES checks that the view\ndefiner (for SQL SECURITY DEFINER views) or invoker (for all views) has\nthe proper privileges on the tables.\n\nIf you lock a table explicitly with LOCK TABLES, any tables used in\ntriggers are also locked implicitly, as described in\nhttps://dev.mysql.com/doc/refman/8.0/en/lock-tables.html#lock-tables-an\nd-triggers.\n\nIf you lock a table explicitly with LOCK TABLES, any tables related by\na foreign key constraint are opened and locked implicitly. For foreign\nkey checks, a shared read-only lock (LOCK TABLES READ) is taken on\nrelated tables. For cascading updates, a shared-nothing write lock\n(LOCK TABLES WRITE) is taken on related tables that are involved in the\noperation.\n\nUNLOCK TABLES explicitly releases any table locks held by the current\nsession. LOCK TABLES implicitly releases any table locks held by the\ncurrent session before acquiring new locks.\n\nAnother use for UNLOCK TABLES is to release the global read lock\nacquired with the FLUSH TABLES WITH READ LOCK statement, which enables\nyou to lock all tables in all databases. See [HELP FLUSH]. (This is a\nvery convenient way to get backups if you have a file system such as\nVeritas that can take snapshots in time.)\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/lock-tables.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/lock-tables.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (568,42,'SET TRANSACTION','Syntax:\nSET [GLOBAL | SESSION] TRANSACTION\n    transaction_characteristic [, transaction_characteristic] ...\n\ntransaction_characteristic: {\n    ISOLATION LEVEL level\n  | access_mode\n}\n\nlevel: {\n     REPEATABLE READ\n   | READ COMMITTED\n   | READ UNCOMMITTED\n   | SERIALIZABLE\n}\n\naccess_mode: {\n     READ WRITE\n   | READ ONLY\n}\n\nThis statement specifies transaction characteristics. It takes a list\nof one or more characteristic values separated by commas. Each\ncharacteristic value sets the transaction isolation level or access\nmode. The isolation level is used for operations on InnoDB tables. The\naccess mode specifies whether transactions operate in read/write or\nread-only mode.\n\nIn addition, SET TRANSACTION can include an optional GLOBAL or SESSION\nkeyword to indicate the scope of the statement.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/set-transaction.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/set-transaction.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (569,42,'XA','Syntax:\nXA {START|BEGIN} xid [JOIN|RESUME]\n\nXA END xid [SUSPEND [FOR MIGRATE]]\n\nXA PREPARE xid\n\nXA COMMIT xid [ONE PHASE]\n\nXA ROLLBACK xid\n\nXA RECOVER [CONVERT XID]\n\nFor XA START, the JOIN and RESUME clauses are recognized but have no\neffect.\n\nFor XA END the SUSPEND [FOR MIGRATE] clause is recognized but has no\neffect.\n\nEach XA statement begins with the XA keyword, and most of them require\nan xid value. An xid is an XA transaction identifier. It indicates\nwhich transaction the statement applies to. xid values are supplied by\nthe client, or generated by the MySQL server. An xid value has from one\nto three parts:\n\nxid: gtrid [, bqual [, formatID ]]\n\ngtrid is a global transaction identifier, bqual is a branch qualifier,\nand formatID is a number that identifies the format used by the gtrid\nand bqual values. As indicated by the syntax, bqual and formatID are\noptional. The default bqual value is \'\' if not given. The default\nformatID value is 1 if not given.\n\ngtrid and bqual must be string literals, each up to 64 bytes (not\ncharacters) long. gtrid and bqual can be specified in several ways. You\ncan use a quoted string (\'ab\'), hex string (X\'6162\', 0x6162), or bit\nvalue (b\'nnnn\').\n\nformatID is an unsigned integer.\n\nThe gtrid and bqual values are interpreted in bytes by the MySQL\nserver\'s underlying XA support routines. However, while an SQL\nstatement containing an XA statement is being parsed, the server works\nwith some specific character set. To be safe, write gtrid and bqual as\nhex strings.\n\nxid values typically are generated by the Transaction Manager. Values\ngenerated by one TM must be different from values generated by other\nTMs. A given TM must be able to recognize its own xid values in a list\nof values returned by the XA RECOVER statement.\n\nXA START xid starts an XA transaction with the given xid value. Each XA\ntransaction must have a unique xid value, so the value must not\ncurrently be used by another XA transaction. Uniqueness is assessed\nusing the gtrid and bqual values. All following XA statements for the\nXA transaction must be specified using the same xid value as that given\nin the XA START statement. If you use any of those statements but\nspecify an xid value that does not correspond to some existing XA\ntransaction, an error occurs.\n\nOne or more XA transactions can be part of the same global transaction.\nAll XA transactions within a given global transaction must use the same\ngtrid value in the xid value. For this reason, gtrid values must be\nglobally unique so that there is no ambiguity about which global\ntransaction a given XA transaction is part of. The bqual part of the\nxid value must be different for each XA transaction within a global\ntransaction. (The requirement that bqual values be different is a\nlimitation of the current MySQL XA implementation. It is not part of\nthe XA specification.)\n\nThe XA RECOVER statement returns information for those XA transactions\non the MySQL server that are in the PREPARED state. (See\nhttps://dev.mysql.com/doc/refman/8.0/en/xa-states.html.) The output\nincludes a row for each such XA transaction on the server, regardless\nof which client started it.\n\nXA RECOVER requires the XA_RECOVER_ADMIN privilege. This privilege\nrequirement prevents users from discovering the XID values for\noutstanding prepared XA transactions other than their own. It does not\naffect normal commit or rollback of an XA transaction because the user\nwho started it knows its XID.\n\nXA RECOVER output rows look like this (for an example xid value\nconsisting of the parts \'abc\', \'def\', and 7):\n\nmysql> XA RECOVER;\n+----------+--------------+--------------+--------+\n| formatID | gtrid_length | bqual_length | data   |\n+----------+--------------+--------------+--------+\n|        7 |            3 |            3 | abcdef |\n+----------+--------------+--------------+--------+\n\nThe output columns have the following meanings:\n\no formatID is the formatID part of the transaction xid\n\no gtrid_length is the length in bytes of the gtrid part of the xid\n\no bqual_length is the length in bytes of the bqual part of the xid\n\no data is the concatenation of the gtrid and bqual parts of the xid\n\nXID values may contain nonprintable characters. XA RECOVER permits an\noptional CONVERT XID clause so that clients can request XID values in\nhexadecimal.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/xa-statements.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/xa-statements.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (570,43,'PURGE BINARY LOGS','Syntax:\nPURGE { BINARY | MASTER } LOGS {\n    TO \'log_name\'\n  | BEFORE datetime_expr\n}\n\nThe binary log is a set of files that contain information about data\nmodifications made by the MySQL server. The log consists of a set of\nbinary log files, plus an index file (see\nhttps://dev.mysql.com/doc/refman/8.0/en/binary-log.html).\n\nThe PURGE BINARY LOGS statement deletes all the binary log files listed\nin the log index file prior to the specified log file name or date.\nBINARY and MASTER are synonyms. Deleted log files also are removed from\nthe list recorded in the index file, so that the given log file becomes\nthe first in the list.\n\nPURGE BINARY LOGS requires the BINLOG_ADMIN privilege. This statement\nhas no effect if the server was not started with the --log-bin option\nto enable binary logging.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/purge-binary-logs.html\n\n','PURGE BINARY LOGS TO \'mysql-bin.010\';\nPURGE BINARY LOGS BEFORE \'2019-04-02 22:46:26\';\n','https://dev.mysql.com/doc/refman/8.0/en/purge-binary-logs.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (571,43,'PURGE MASTER LOGS','Syntax:\nPURGE { BINARY | MASTER } LOGS {\n    TO \'log_name\'\n  | BEFORE datetime_expr\n}\n\nThe binary log is a set of files that contain information about data\nmodifications made by the MySQL server. The log consists of a set of\nbinary log files, plus an index file (see\nhttps://dev.mysql.com/doc/refman/8.0/en/binary-log.html).\n\nThe PURGE BINARY LOGS statement deletes all the binary log files listed\nin the log index file prior to the specified log file name or date.\nBINARY and MASTER are synonyms. Deleted log files also are removed from\nthe list recorded in the index file, so that the given log file becomes\nthe first in the list.\n\nPURGE BINARY LOGS requires the BINLOG_ADMIN privilege. This statement\nhas no effect if the server was not started with the --log-bin option\nto enable binary logging.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/purge-binary-logs.html\n\n','PURGE BINARY LOGS TO \'mysql-bin.010\';\nPURGE BINARY LOGS BEFORE \'2019-04-02 22:46:26\';\n','https://dev.mysql.com/doc/refman/8.0/en/purge-binary-logs.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (572,43,'RESET MASTER','Syntax:\nRESET MASTER [TO binary_log_file_index_number]\n\n*Warning*:\n\nUse this statement with caution to ensure you do not lose any wanted\nbinary log file data and GTID execution history.\n\nRESET MASTER requires the RELOAD privilege.\n\nFor a server where binary logging is enabled (log_bin is ON), RESET\nMASTER deletes all existing binary log files and resets the binary log\nindex file, resetting the server to its state before binary logging was\nstarted. A new empty binary log file is created so that binary logging\ncan be restarted.\n\nFor a server where GTIDs are in use (gtid_mode is ON), issuing RESET\nMASTER resets the GTID execution history. The value of the gtid_purged\nsystem variable is set to an empty string (\'\'), the global value (but\nnot the session value) of the gtid_executed system variable is set to\nan empty string, and the mysql.gtid_executed table is cleared (see\nhttps://dev.mysql.com/doc/refman/8.0/en/replication-gtids-concepts.html\n#replication-gtids-gtid-executed-table). If the GTID-enabled server has\nbinary logging enabled, RESET MASTER also resets the binary log as\ndescribed above. Note that RESET MASTER is the method to reset the GTID\nexecution history even if the GTID-enabled server is a replica where\nbinary logging is disabled; RESET REPLICA | SLAVE has no effect on the\nGTID execution history. For more information on resetting the GTID\nexecution history, see\nhttps://dev.mysql.com/doc/refman/8.0/en/replication-gtids-lifecycle.htm\nl#replication-gtids-execution-history.\n\nIssuing RESET MASTER without the optional TO clause deletes all binary\nlog files listed in the index file, resets the binary log index file to\nbe empty, and creates a new binary log file starting at 1. Use the\noptional TO clause to start the binary log file index from a number\nother than 1 after the reset.\n\nUsing RESET MASTER with the TO clause to specify a binary log file\nindex number to start from simplifies failover by providing a single\nstatement alternative to the FLUSH BINARY LOGS and PURGE BINARY LOGS TO\nstatements. Check that you are using a reasonable value for the index\nnumber. If you enter an incorrect value, you can correct this by\nissuing another RESET MASTER statement with or without the TO clause.\nIf you do not correct a value that is out of range, the server cannot\nbe restarted.\n\nThe following example demonstrates TO clause usage:\n\nRESET MASTER TO 1234;\n\nSHOW BINARY LOGS;\n+-------------------+-----------+-----------+\n| Log_name          | File_size | Encrypted |\n+-------------------+-----------+-----------+\n| source-bin.001234 |       154 | No        |\n+-------------------+-----------+-----------+\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/reset-master.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/reset-master.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (573,43,'SET SQL_LOG_BIN','Syntax:\nSET sql_log_bin = {OFF|ON}\n\nThe sql_log_bin variable controls whether logging to the binary log is\nenabled for the current session (assuming that the binary log itself is\nenabled). The default value is ON. To disable or enable binary logging\nfor the current session, set the session sql_log_bin variable to OFF or\nON.\n\nSet this variable to OFF for a session to temporarily disable binary\nlogging while making changes to the source that you do not want\nreplicated to the replica.\n\nSetting the session value of this system variable is a restricted\noperation. The session user must have privileges sufficient to set\nrestricted session variables. See\nhttps://dev.mysql.com/doc/refman/8.0/en/system-variable-privileges.html\n.\n\nIt is not possible to set the session value of sql_log_bin within a\ntransaction or subquery.\n\nSetting this variable to OFF prevents new GTIDs from being assigned to\ntransactions in the binary log. If you are using GTIDs for replication,\nthis means that even when binary logging is later enabled again, the\nGTIDs written into the log from this point do not account for any\ntransactions that occurred in the meantime, so in effect those\ntransactions are lost.\n\nmysqldump adds a SET @@SESSION.sql_log_bin=0 statement to a dump file\nfrom a server where GTIDs are in use, which disables binary logging\nwhile the dump file is being reloaded. The statement prevents new GTIDs\nfrom being generated and assigned to the transactions in the dump file\nas they are executed, so that the original GTIDs for the transactions\nare used.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/set-sql-log-bin.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/set-sql-log-bin.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (574,43,'CHANGE MASTER TO','Syntax:\nCHANGE MASTER TO option [, option] ... [ channel_option ]\n\noption: {\n    MASTER_BIND = \'interface_name\'\n  | MASTER_HOST = \'host_name\'\n  | MASTER_USER = \'user_name\'\n  | MASTER_PASSWORD = \'password\'\n  | MASTER_PORT = port_num\n  | PRIVILEGE_CHECKS_USER = {\'account\' | NULL}\n  | REQUIRE_ROW_FORMAT = {0|1}\n  | REQUIRE_TABLE_PRIMARY_KEY_CHECK = {STREAM | ON | OFF}\n  | ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS = {OFF | LOCAL | uuid}\n  | MASTER_LOG_FILE = \'source_log_name\'\n  | MASTER_LOG_POS = source_log_pos\n  | MASTER_AUTO_POSITION = {0|1}\n  | RELAY_LOG_FILE = \'relay_log_name\'\n  | RELAY_LOG_POS = relay_log_pos\n  | MASTER_HEARTBEAT_PERIOD = interval\n  | MASTER_CONNECT_RETRY = interval\n  | MASTER_RETRY_COUNT = count\n  | SOURCE_CONNECTION_AUTO_FAILOVER = {0|1}\n  | MASTER_DELAY = interval\n  | MASTER_COMPRESSION_ALGORITHMS = \'value\'\n  | MASTER_ZSTD_COMPRESSION_LEVEL = level\n  | MASTER_SSL = {0|1}\n  | MASTER_SSL_CA = \'ca_file_name\'\n  | MASTER_SSL_CAPATH = \'ca_directory_name\'\n  | MASTER_SSL_CERT = \'cert_file_name\'\n  | MASTER_SSL_CRL = \'crl_file_name\'\n  | MASTER_SSL_CRLPATH = \'crl_directory_name\'\n  | MASTER_SSL_KEY = \'key_file_name\'\n  | MASTER_SSL_CIPHER = \'cipher_list\'\n  | MASTER_SSL_VERIFY_SERVER_CERT = {0|1}\n  | MASTER_TLS_VERSION = \'protocol_list\'\n  | MASTER_TLS_CIPHERSUITES = \'ciphersuite_list\'\n  | MASTER_PUBLIC_KEY_PATH = \'key_file_name\'\n  | GET_MASTER_PUBLIC_KEY = {0|1}\n  | NETWORK_NAMESPACE = \'namespace\'\n  | IGNORE_SERVER_IDS = (server_id_list)\n}\n\nchannel_option:\n    FOR CHANNEL channel\n\nserver_id_list:\n    [server_id [, server_id] ... ]\n\nCHANGE MASTER TO changes the parameters that the replica server uses\nfor connecting to the source and for reading data from the source. It\nalso updates the contents of the replication metadata repositories (see\nhttps://dev.mysql.com/doc/refman/8.0/en/replica-logs.html). From MySQL\n8.0.23, use CHANGE REPLICATION SOURCE TO in place of CHANGE MASTER TO,\nwhich is deprecated from that release. In releases before MySQL 8.0.23,\nuse CHANGE MASTER TO.\n\nYou can issue CHANGE MASTER TO statements on a running replica without\nfirst stopping it, depending on the states of the replication SQL\nthread and replication I/O thread. The rules governing such use are\nprovided later in this section. CHANGE MASTER TO requires the\nREPLICATION_SLAVE_ADMIN privilege (or the deprecated SUPER privilege).\n\nWhen using a multithreaded replica (in other words\nslave_parallel_workers is greater than 0), stopping the replica can\ncause "gaps" in the sequence of transactions that have been executed\nfrom the relay log, regardless of whether the replica was stopped\nintentionally or otherwise. When such gaps exist, issuing CHANGE MASTER\nTO fails. The solution in this situation is to issue START REPLICA |\nSLAVE UNTIL SQL_AFTER_MTS_GAPS which ensures that the gaps are closed.\n\nThe optional FOR CHANNEL channel clause enables you to name which\nreplication channel the statement applies to. Providing a FOR CHANNEL\nchannel clause applies the CHANGE MASTER TO statement to a specific\nreplication channel, and is used to add a new channel or modify an\nexisting channel. For example, to add a new channel called channel2:\n\nCHANGE MASTER TO MASTER_HOST=host1, MASTER_PORT=3002 FOR CHANNEL \'channel2\'\n\nIf no clause is named and no extra channels exist, the statement\napplies to the default channel.\n\nWhen using multiple replication channels, if a CHANGE MASTER TO\nstatement does not name a channel using a FOR CHANNEL channel clause,\nan error occurs. See\nhttps://dev.mysql.com/doc/refman/8.0/en/replication-channels.html for\nmore information.\n\nValues used for MASTER_HOST and other CHANGE MASTER TO options are\nchecked for linefeed (\\n or 0x0A) characters. The presence of such\ncharacters in these values causes the statement to fail with\nER_MASTER_INFO\n(https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference.h\ntml#error_er_master_info).\n\nInvoking CHANGE MASTER TO causes the previous values for MASTER_HOST,\nMASTER_PORT, MASTER_LOG_FILE, and MASTER_LOG_POS to be written to the\nerror log, along with other information about the replica\'s state prior\nto execution.\n\nCHANGE MASTER TO causes an implicit commit of an ongoing transaction.\nSee https://dev.mysql.com/doc/refman/8.0/en/implicit-commit.html.\n\nFor some of the options of the CHANGE MASTER TO statement, you must\nissue a STOP REPLICA | SLAVE statement prior to issuing a CHANGE MASTER\nTO statement (and a START REPLICA | SLAVE statement afterwards).\nSometimes, you only need to stop the replication SQL thread or the\nreplication I/O thread, not both:\n\no When the SQL thread is stopped, you can execute CHANGE MASTER TO\n  using any combination that is otherwise allowed of RELAY_LOG_FILE,\n  RELAY_LOG_POS, and MASTER_DELAY options, even if the replication I/O\n  thread is running. No other options may be used with this statement\n  when the I/O thread is running.\n\no When the I/O thread is stopped, you can execute CHANGE MASTER TO\n  using any of the options for this statement (in any allowed\n  combination) except RELAY_LOG_FILE, RELAY_LOG_POS, MASTER_DELAY, or\n  MASTER_AUTO_POSITION = 1 even when the SQL thread is running.\n\no Both the SQL thread and the I/O thread must be stopped before issuing\n  a CHANGE MASTER TO statement that employs MASTER_AUTO_POSITION = 1 or\n  ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS.\n\nYou can check the current state of the replication SQL thread and\nreplication I/O thread using SHOW REPLICA | SLAVE STATUS. Note that the\nGroup Replication applier channel (group_replication_applier) has no\nI/O thread, only an SQL thread.\n\nFor more information, see\nhttps://dev.mysql.com/doc/refman/8.0/en/replication-solutions-switch.ht\nml.\n\nIf you are using statement-based replication and temporary tables, it\nis possible for a CHANGE MASTER TO statement following a STOP REPLICA |\nSLAVE statement to leave behind temporary tables on the replica. A\nwarning (ER_WARN_OPEN_TEMP_TABLES_MUST_BE_ZERO\n(https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference.h\ntml#error_er_warn_open_temp_tables_must_be_zero)) is now issued\nwhenever this occurs. You can avoid this in such cases by making sure\nthat the value of the Slave_open_temp_tables system status variable is\nequal to 0 prior to executing such a CHANGE MASTER TO statement.\n\nCHANGE MASTER TO is useful for setting up a replica when you have the\nsnapshot of the source and have recorded the source\'s binary log\ncoordinates corresponding to the time of the snapshot. After loading\nthe snapshot into the replica to synchronize it with the source, you\ncan run CHANGE MASTER TO MASTER_LOG_FILE=\'log_name\',\nMASTER_LOG_POS=log_pos on the replica to specify the coordinates at\nwhich the replica should begin reading the source\'s binary log.\n\nThe following example changes the source server the replica uses and\nestablishes the source\'s binary log coordinates from which the replica\nbegins reading:\n\nCHANGE MASTER TO\n  MASTER_HOST=\'source2.example.com\',\n  MASTER_USER=\'replication\',\n  MASTER_PASSWORD=\'password\',\n  MASTER_PORT=3306,\n  MASTER_LOG_FILE=\'source2-bin.001\',\n  MASTER_LOG_POS=4,\n  MASTER_CONNECT_RETRY=10;\n\nThe next example shows an operation that is less frequently employed.\nIt is used when the replica has relay log files that you want it to\nexecute again for some reason. To do this, the source need not be\nreachable. You need only use CHANGE MASTER TO and start the SQL thread\n(START REPLICA | SLAVE SQL_THREAD):\n\nCHANGE MASTER TO\n  RELAY_LOG_FILE=\'replica-relay-bin.006\',\n  RELAY_LOG_POS=4025;\n\nOptions that you do not specify on a CHANGE MASTER TO statement retain\ntheir value, except as indicated in the following discussion. Thus, in\nmost cases, there is no need to specify options that do not change.\n\no ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS\n\n  Makes the replication channel assign a GTID to replicated\n  transactions that do not have one, enabling replication from a source\n  that does not use GTID-based replication, to a replica that does. For\n  a multi-source replica, you can have a mix of channels that use\n  ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS, and channels that do not. The\n  default is OFF, meaning that the feature is not used.\n\n  LOCAL assigns a GTID including the replica\'s own UUID (the\n  server_uuid setting). uuid assigns a GTID including the specified\n  UUID, such as the server_uuid setting for the replication source\n  server. Using a nonlocal UUID lets you differentiate between\n  transactions that originated on the replica and transactions that\n  originated on the source, and for a multi-source replica, between\n  transactions that originated on different sources. The UUID you\n  choose only has significance for the replica\'s own use. If any of the\n  transactions sent by the source do have a GTID already, that GTID is\n  retained.\n\n  Channels specific to Group Replication cannot use\n  ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS, but an asynchronous\n  replication channel for another source on a server instance that is a\n  Group Replication group member can do so. In that case, do not\n  specify the Group Replication group name as the UUID for creating the\n  GTIDs.\n\n  To set ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS to LOCAL or uuid, the\n  replica must have gtid_mode=ON set, and this cannot be changed\n  afterwards. This option is for use with a source that has binary log\n  file position based replication, so MASTER_AUTO_POSITION=1 cannot be\n  set for the channel. Both the replication SQL thread and the\n  replication I/O thread must be stopped before setting this option.\n\n  *Important*:\n\n  A replica set up with ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS on any\n  channel cannot be promoted to replace the replication source server\n  in the event that a failover is required, and a backup taken from the\n  replica cannot be used to restore the replication source server. The\n  same restriction applies to replacing or restoring other replicas\n  that use ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS on any channel.\n\n  For further restrictions and information, see\n  https://dev.mysql.com/doc/refman/8.0/en/replication-gtids-assign-anon\n  .html.\n\no GET_MASTER_PUBLIC_KEY\n\n  Enables RSA key pair-based password exchange by requesting the public\n  key from the source. This option applies to replicas that\n  authenticate with the caching_sha2_password authentication plugin.\n  For connections by accounts that authenticate using this plugin, the\n  source does not send the public key unless requested, so it must be\n  requested or specified in the client. If MASTER_PUBLIC_KEY_PATH is\n  given and specifies a valid public key file, it takes precedence over\n  GET_MASTER_PUBLIC_KEY. If you are using a replication user account\n  that authenticates with the caching_sha2_password plugin (which is\n  the default from MySQL 8.0), and you are not using a secure\n  connection, you must specify either this option or the\n  MASTER_PUBLIC_KEY_PATH option to provide the RSA public key to the\n  replica.\n\no IGNORE_SERVER_IDS\n\n  Makes the replica ignore events originating from the specified\n  servers. The option takes a comma-separated list of 0 or more server\n  IDs. Log rotation and deletion events from the servers are not\n  ignored, and are recorded in the relay log.\n\n  In circular replication, the originating server normally acts as the\n  terminator of its own events, so that they are not applied more than\n  once. Thus, this option is useful in circular replication when one of\n  the servers in the circle is removed. Suppose that you have a\n  circular replication setup with 4 servers, having server IDs 1, 2, 3,\n  and 4, and server 3 fails. When bridging the gap by starting\n  replication from server 2 to server 4, you can include\n  IGNORE_SERVER_IDS = (3) in the CHANGE MASTER TO statement that you\n  issue on server 4 to tell it to use server 2 as its source instead of\n  server 3. Doing so causes it to ignore and not to propagate any\n  statements that originated with the server that is no longer in use.\n\n  If IGNORE_SERVER_IDS contains the server\'s own ID and the server was\n  started with the --replicate-same-server-id option enabled, an error\n  results.\n\n  *Note*:\n\n  When global transaction identifiers (GTIDs) are used for replication,\n  transactions that have already been applied are automatically\n  ignored, so the IGNORE_SERVER_IDS function is not required and is\n  deprecated. If gtid_mode=ON is set for the server, a deprecation\n  warning is issued if you include the IGNORE_SERVER_IDS option in a\n  CHANGE MASTER TO statement.\n\n  The source metadata repository and the output of SHOW REPLICA | SLAVE\n  STATUS provide the list of servers that are currently ignored. For\n  more information, see\n  https://dev.mysql.com/doc/refman/8.0/en/replica-logs-status.html, and\n  [HELP SHOW REPLICA STATUS].\n\n  If a CHANGE MASTER TO statement is issued without any\n  IGNORE_SERVER_IDS option, any existing list is preserved. To clear\n  the list of ignored servers, it is necessary to use the option with\n  an empty list:\n\nCHANGE MASTER TO IGNORE_SERVER_IDS = ();\n\n  RESET REPLICA | SLAVE ALL clears IGNORE_SERVER_IDS.\n\n  *Note*:\n\n  A deprecation warning is issued if SET GTID_MODE=ON is issued when\n  any channel has existing server IDs set with IGNORE_SERVER_IDS.\n  Before starting GTID-based replication, check for and clear all\n  ignored server ID lists on the servers involved. The SHOW REPLICA |\n  SLAVE STATUS statement displays the list of ignored IDs, if there is\n  one. If you do receive the deprecation warning, you can still clear a\n  list after gtid_mode=ON is set by issuing a CHANGE MASTER TO\n  statement containing the IGNORE_SERVER_IDS option with an empty list.\n\no MASTER_AUTO_POSITION\n\n  Makes the replica attempt to connect to the source using the\n  auto-positioning feature of GTID-based replication, rather than a\n  binary log file based position. This option can be used with CHANGE\n  MASTER TO only if both the replication SQL thread and replication I/O\n  thread are stopped.\n\n  Both the replica and the source must have GTIDs enabled\n  (GTID_MODE=ON, ON_PERMISSIVE, or OFF_PERMISSIVE on the replica, and\n  GTID_MODE=ON on the source). MASTER_LOG_FILE, MASTER_LOG_POS,\n  RELAY_LOG_FILE, and RELAY_LOG_POS cannot be specified together with\n  MASTER_AUTO_POSITION = 1. If multi-source replication is enabled on\n  the replica, you need to set the MASTER_AUTO_POSITION = 1 option for\n  each applicable replication channel.\n\n  With MASTER_AUTO_POSITION = 1 set, in the initial connection\n  handshake, the replica sends a GTID set containing the transactions\n  that it has already received, committed, or both. The source responds\n  by sending all transactions recorded in its binary log whose GTID is\n  not included in the GTID set sent by the replica. This exchange\n  ensures that the source only sends the transactions with a GTID that\n  the replica has not already recorded or committed. If the replica\n  receives transactions from more than one source, as in the case of a\n  diamond topology, the auto-skip function ensures that the\n  transactions are not applied twice. For details of how the GTID set\n  sent by the replica is computed, see\n  https://dev.mysql.com/doc/refman/8.0/en/replication-gtids-auto-positi\n  oning.html.\n\n  If any of the transactions that should be sent by the source have\n  been purged from the source\'s binary log, or added to the set of\n  GTIDs in the gtid_purged system variable by another method, the\n  source sends the error ER_MASTER_HAS_PURGED_REQUIRED_GTIDS to the\n  replica, and replication does not start. The GTIDs of the missing\n  purged transactions are identified and listed in the source\'s error\n  log in the warning message ER_FOUND_MISSING_GTIDS. Also, if during\n  the exchange of transactions it is found that the replica has\n  recorded or committed transactions with the source\'s UUID in the\n  GTID, but the source itself has not committed them, the source sends\n  the error ER_SLAVE_HAS_MORE_GTIDS_THAN_MASTER to the replica and\n  replication does not start. For information on how to handle these\n  situations, see\n  https://dev.mysql.com/doc/refman/8.0/en/replication-gtids-auto-positi\n  oning.html.\n\n  You can see whether replication is running with GTID auto-positioning\n  enabled by checking the Performance Schema\n  replication_connection_status table or the output of SHOW REPLICA\n  STATUS. Disabling the MASTER_AUTO_POSITION option again makes the\n  replica revert to file-based replication.\n\no MASTER_BIND\n\n  Determines which of the replica\'s network interfaces is chosen for\n  connecting to the source, for use on replicas that have multiple\n  network interfaces. The address configured with this option, if any,\n  can be seen in the Master_Bind column of the output from SHOW REPLICA\n  | SLAVE STATUS. In the source metadata repository table\n  mysql.slave_master_info, the value can be seen as the Master_bind\n  column. The ability to bind a replica to a specific network interface\n  is also supported by NDB Cluster.\n\no MASTER_COMPRESSION_ALGORITHMS\n\n  Specifies the permitted compression algorithms for connections to the\n  replication source server. The available algorithms are the same as\n  for the protocol_compression_algorithms system variable. The default\n  value is uncompressed. MASTER_COMPRESSION_ALGORITHMS is available as\n  of MySQL 8.0.18.\n\n  The value of MASTER_COMPRESSION_ALGORITHMS applies only if the\n  slave_compressed_protocol system variable is disabled. If\n  slave_compressed_protocol is enabled, it takes precedence over\n  MASTER_COMPRESSION_ALGORITHMS and connections to the source use zlib\n  compression if both source and replica support that algorithm. For\n  more information, see\n  https://dev.mysql.com/doc/refman/8.0/en/connection-compression-contro\n  l.html.\n\n  Binary log transaction compression (available as of MySQL 8.0.20),\n  which is activated by the binlog_transaction_compression system\n  variable, can also be used to save bandwidth. If you do this in\n  combination with connection compression, connection compression has\n  less opportunity to act on the data, but can still compress headers\n  and those events and transaction payloads that are uncompressed. For\n  more information on binary log transaction compression, see\n  https://dev.mysql.com/doc/refman/8.0/en/binary-log-transaction-compre\n  ssion.html.\n\no MASTER_CONNECT_RETRY\n\n  Specifies the interval between the reconnection attempts that the\n  replica makes after the connection to the source times out. The\n  attempts are limited by the MASTER_RETRY_COUNT option. If both the\n  default settings are used, the replica waits 60 seconds between\n  reconnection attempts (MASTER_CONNECT_RETRY=60), and keeps attempting\n  to reconnect at this rate for 60 days (MASTER_RETRY_COUNT=86400).\n  These values are recorded in the source metadata repository and shown\n  in the replication_connection_configuration Performance Schema table.\n\no MASTER_DELAY\n\n  Specifies how many seconds behind the source the replica must lag. An\n  event received from the source is not executed until at least\n  interval seconds later than its execution on the source. The default\n  is 0. An error occurs if interval is not a nonnegative integer in the\n  range from 0 to 231−1. For more information, see\n  https://dev.mysql.com/doc/refman/8.0/en/replication-delayed.html. A\n  CHANGE MASTER TO statement employing the MASTER_DELAY option can be\n  executed on a running replica when the replication SQL thread is\n  stopped.\n\no MASTER_HEARTBEAT_PERIOD\n\n  Controls the heartbeat interval, which stops the connection timeout\n  occurring in the absence of data if the connection is still good. A\n  heartbeat signal is sent to the replica after that number of seconds,\n  and the waiting period is reset whenever the source\'s binary log is\n  updated with an event. Heartbeats are therefore sent by the source\n  only if there are no unsent events in the binary log file for a\n  period longer than this.\n\n  The heartbeat interval interval is a decimal value having the range 0\n  to 4294967 seconds and a resolution in milliseconds; the smallest\n  nonzero value is 0.001. Setting interval to 0 disables heartbeats\n  altogether. The heartbeat interval defaults to half the value of the\n  slave_net_timeout system variable. It is recorded in the source\n  metadata repository and shown in the\n  replication_connection_configuration Performance Schema table.\n  Issuing RESET REPLICA | SLAVE resets the heartbeat interval to the\n  default value.\n\n  The slave_net_timeout system variable specifies the number of seconds\n  that the replica waits for either more data or a heartbeat signal\n  from the source, before the replica considers the connection broken,\n  aborts the read, and tries to reconnect. The default value is 60\n  seconds (one minute). Note that a change to the value or default\n  setting of slave_net_timeout does not automatically change the\n  heartbeat interval, whether that has been set explicitly or is using\n  a previously calculated default. A warning is issued if you set\n  @@GLOBAL.slave_net_timeout to a value less than that of the current\n  heartbeat interval. If slave_net_timeout is changed, you must also\n  issue CHANGE MASTER TO to adjust the heartbeat interval to an\n  appropriate value so that the heartbeat signal occurs before the\n  connection timeout. If you do not do this, the heartbeat signal has\n  no effect, and if no data is received from the source, the replica\n  can make repeated reconnection attempts, creating zombie dump\n  threads.\n\no MASTER_HOST\n\n  The host name or IP address of the replication source server. The\n  replica uses this to connect to the source.\n\n  If you specify MASTER_HOST or MASTER_PORT, the replica assumes that\n  the source server is different from before (even if the option value\n  is the same as its current value.) In this case, the old values for\n  the source\'s binary log file name and position are considered no\n  longer applicable, so if you do not specify MASTER_LOG_FILE and\n  MASTER_LOG_POS in the statement, MASTER_LOG_FILE=\'\' and\n  MASTER_LOG_POS=4 are silently appended to it.\n\n  Setting MASTER_HOST=\'\' (that is, setting its value explicitly to an\n  empty string) is not the same as not setting MASTER_HOST at all.\n  Trying to set MASTER_HOST to an empty string fails with an error.\n\no MASTER_LOG_FILE, MASTER_LOG_POS\n\n  The binary log file name, and the location in that file, at which the\n  replication I/O thread begins reading from the source\'s binary log\n  the next time the thread starts. Specify these options if you are\n  using binary log file position based replication. MASTER_LOG_FILE\n  must include the numeric suffix of a specific binary log file that is\n  available on the source server, for example,\n  MASTER_LOG_FILE=\'binlog.000145\'. MASTER_LOG_POS is the numeric\n  position for the replica to start reading in that file.\n  MASTER_LOG_POS=4 represents the start of the events in a binary log\n  file.\n\n  If you specify either of MASTER_LOG_FILE or MASTER_LOG_POS, you\n  cannot specify MASTER_AUTO_POSITION = 1, which is for GTID-based\n  replication.\n\n  If neither of MASTER_LOG_FILE or MASTER_LOG_POS is specified, the\n  replica uses the last coordinates of the replication SQL thread\n  before CHANGE MASTER TO was issued. This ensures that there is no\n  discontinuity in replication, even if the replication SQL thread was\n  late compared to the replication I/O thread.\n\no MASTER_PASSWORD\n\n  The password for the replication user account to use for connecting\n  to the replication source server. If you specify MASTER_PASSWORD,\n  MASTER_USER is also required.\n\n  The password used for a replication user account in a CHANGE MASTER\n  TO statement is limited to 32 characters in length. Trying to use a\n  password of more than 32 characters causes CHANGE MASTER TO to fail.\n\no MASTER_PORT\n\n  The TCP/IP port number that the replica uses to connect to the\n  replication source server.\n\n  *Note*:\n\n  Replication cannot use Unix socket files. You must be able to connect\n  to the replication source server using TCP/IP.\n\n  If you specify MASTER_HOST or MASTER_PORT, the replica assumes that\n  the source server is different from before (even if the option value\n  is the same as its current value.) In this case, the old values for\n  the source\'s binary log file name and position are considered no\n  longer applicable, so if you do not specify MASTER_LOG_FILE and\n  MASTER_LOG_POS in the statement, MASTER_LOG_FILE=\'\' and\n  MASTER_LOG_POS=4 are silently appended to it.\n\no MASTER_PUBLIC_KEY_PATH\n\n  Enables RSA key pair-based password exchange by providing the path\n  name to a file containing a replica-side copy of the public key\n  required by the source. The file must be in PEM format. This option\n  applies to replicas that authenticate with the sha256_password or\n  caching_sha2_password authentication plugin. (For sha256_password,\n  MASTER_PUBLIC_KEY_PATH can be used only if MySQL was built using\n  OpenSSL.) If you are using a replication user account that\n  authenticates with the caching_sha2_password plugin (which is the\n  default from MySQL 8.0), and you are not using a secure connection,\n  you must specify either this option or the GET_MASTER_PUBLIC_KEY=1\n  option to provide the RSA public key to the replica.\n\no MASTER_RETRY_COUNT\n\n  Sets the maximum number of reconnection attempts that the replica\n  makes after the connection to the source times out, as determined by\n  the slave_net_timeout system variable. If the replica does need to\n  reconnect, the first retry occurs immediately after the timeout. The\n  interval between the attempts is specified by the\n  MASTER_CONNECT_RETRY option.\n\n  If both the default settings are used, the replica waits 60 seconds\n  between reconnection attempts (MASTER_CONNECT_RETRY=60), and keeps\n  attempting to reconnect at this rate for 60 days\n  (MASTER_RETRY_COUNT=86400). A setting of 0 for MASTER_RETRY_COUNT\n  means that there is no limit on the number of reconnection attempts,\n  so the replica keeps trying to reconnect indefinitely.\n\n  The values for MASTER_CONNECT_RETRY and MASTER_RETRY_COUNT are\n  recorded in the source metadata repository and shown in the\n  replication_connection_configuration Performance Schema table.\n  MASTER_RETRY_COUNT supersedes the --master-retry-count server startup\n  option.\n\no MASTER_SSL_xxx, MASTER_TLS_xxx\n\n  Specify how the replica uses encryption and ciphers to secure the\n  replication connection. These options can be changed even on replicas\n  that are compiled without SSL support. They are saved to the source\n  metadata repository, but are ignored if the replica does not have SSL\n  support enabled. The MASTER_SSL_xxx and MASTER_TLS_xxx options\n  perform the same functions as the --ssl-xxx and --tls-xxx client\n  options described in\n  https://dev.mysql.com/doc/refman/8.0/en/connection-options.html#encry\n  pted-connection-options. The correspondence between the two sets of\n  options, and the use of the MASTER_SSL_xxx and MASTER_TLS_xxx options\n  to set up a secure connection, is explained in\n  https://dev.mysql.com/doc/refman/8.0/en/replication-solutions-encrypt\n  ed-connections.html.\n\no MASTER_USER\n\n  The user name for the replication user account to use for connecting\n  to the replication source server.\n\n  *Important*:\n\n  To connect to the source using a replication user account that\n  authenticates with the caching_sha2_password plugin, you must either\n  set up a secure connection as described in\n  https://dev.mysql.com/doc/refman/8.0/en/replication-solutions-encrypt\n  ed-connections.html, or enable the unencrypted connection to support\n  password exchange using an RSA key pair. The caching_sha2_password\n  authentication plugin is the default for new users created from MySQL\n  8.0 (for details, see\n  https://dev.mysql.com/doc/refman/8.0/en/caching-sha2-pluggable-authen\n  tication.html). If the user account that you create or use for\n  replication uses this authentication plugin, and you are not using a\n  secure connection, you must enable RSA key pair-based password\n  exchange for a successful connection. You can do this using either\n  the MASTER_PUBLIC_KEY_PATH option or the GET_MASTER_PUBLIC_KEY=1\n  option for this statement.\n\n  It is possible to set an empty user name by specifying\n  MASTER_USER=\'\', but the replication channel cannot be started with an\n  empty user name. In releases before MySQL 8.0.21, only set an empty\n  MASTER_USER user name if you need to clear previously used\n  credentials from the replication metadata repositories for security\n  purposes. Do not use the channel afterwards, due to a bug in these\n  releases that can substitute a default user name if an empty user\n  name is read from the repositories (for example, during an automatic\n  restart of a Group Replication channel). From MySQL 8.0.21, it is\n  valid to set an empty MASTER_USER user name and use the channel\n  afterwards if you always provide user credentials using the START\n  REPLICA | SLAVE statement or START GROUP_REPLICATION statement that\n  starts the replication channel. This approach means that the\n  replication channel always needs operator intervention to restart,\n  but the user credentials are not recorded in the replication metadata\n  repositories.\n\n  The text of a running CHANGE MASTER TO statement, including values\n  for MASTER_USER and MASTER_PASSWORD, can be seen in the output of a\n  concurrent SHOW PROCESSLIST statement. (The complete text of a START\n  REPLICA | SLAVE statement is also visible to SHOW PROCESSLIST.)\n\no MASTER_ZSTD_COMPRESSION_LEVEL\n\n  The compression level to use for connections to the replication\n  source server that use the zstd compression algorithm. The permitted\n  levels are from 1 to 22, with larger values indicating increasing\n  levels of compression. The default zstd compression level is 3. The\n  compression level setting has no effect on connections that do not\n  use zstd compression. MASTER_ZSTD_COMPRESSION_LEVEL is available as\n  of MySQL 8.0.18. For more information, see\n  https://dev.mysql.com/doc/refman/8.0/en/connection-compression-contro\n  l.html.\n\no NETWORK_NAMESPACE\n\n  The network namespace to use for TCP/IP connections to the\n  replication source server. If this option is omitted, connections\n  from the replica use the default (global) namespace. On platforms\n  that do not implement network namespace support, failure occurs when\n  the replica attempts to connect to the source. For information about\n  network namespaces, see\n  https://dev.mysql.com/doc/refman/8.0/en/network-namespace-support.htm\n  l. NETWORK_NAMESPACE is available as of MySQL 8.0.22.\n\no PRIVILEGE_CHECKS_USER\n\n  Names a user account that supplies a security context for the\n  specified channel. NULL, which is the default, means no security\n  context is used. PRIVILEGE_CHECKS_USER is available as of MySQL\n  8.0.18.\n\n  The user name and host name for the user account must follow the\n  syntax described in\n  https://dev.mysql.com/doc/refman/8.0/en/account-names.html, and the\n  user must not be an anonymous user (with a blank user name) or the\n  CURRENT_USER. The account must have the REPLICATION_APPLIER\n  privilege, plus the required privileges to execute the transactions\n  replicated on the channel. For details of the privileges required by\n  the account, see\n  https://dev.mysql.com/doc/refman/8.0/en/replication-privilege-checks.\n  html. When you restart the replication channel, the privilege checks\n  are applied from that point on. If you do not specify a channel and\n  no other channels exist, the statement is applied to the default\n  channel.\n\n  The use of row-based binary logging is strongly recommended when\n  PRIVILEGE_CHECKS_USER is set, and you can set REQUIRE_ROW_FORMAT to\n  enforce this. For example, to start privilege checks on the channel\n  channel_1 on a running replica, issue the following statements:\n\nmysql> STOP REPLICA | SLAVE FOR CHANNEL \'channel_1\';\nmysql> CHANGE MASTER TO\n         PRIVILEGE_CHECKS_USER = \'priv_repl\'@\'%.example.com\',\n         REQUIRE_ROW_FORMAT = 1,\n         FOR CHANNEL \'channel_1\';\nmysql> START REPLICA | SLAVE FOR CHANNEL \'channel_1\';\n\no RELAY_LOG_FILE, RELAY_LOG_POS\n\n  The relay log file name, and the location in that file, at which the\n  replication SQL thread begins reading from the replica\'s relay log\n  the next time the thread starts. RELAY_LOG_FILE can use either an\n  absolute or relative path, and uses the same base name as\n  MASTER_LOG_FILE.\n\n  A CHANGE MASTER TO statement using RELAY_LOG_FILE, RELAY_LOG_POS, or\n  both options can be executed on a running replica when the\n  replication SQL thread is stopped. Relay logs are preserved if at\n  least one of the replication SQL thread and the replication I/O\n  thread is running. If both threads are stopped, all relay log files\n  are deleted unless at least one of RELAY_LOG_FILE or RELAY_LOG_POS is\n  specified. For the Group Replication applier channel\n  (group_replication_applier), which only has an SQL thread and no I/O\n  thread, this is the case if the SQL thread is stopped, but with that\n  channel you cannot use the RELAY_LOG_FILE and RELAY_LOG_POS options.\n\no REQUIRE_ROW_FORMAT\n\n  Permits only row-based replication events to be processed by the\n  replication channel. This option prevents the replication applier\n  from taking actions such as creating temporary tables and executing\n  LOAD DATA INFILE requests, which increases the security of the\n  channel. Group Replication channels are automatically created with\n  REQUIRE_ROW_FORMAT set, and you cannot change the option for those\n  channels. For more information, see\n  https://dev.mysql.com/doc/refman/8.0/en/replication-privilege-checks.\n  html. REQUIRE_ROW_FORMAT is available as of MySQL 8.0.19.\n\no REQUIRE_TABLE_PRIMARY_KEY_CHECK\n\n  Enables a replica to select its own policy for primary key checks.\n  When the option is set to ON for a replication channel, the replica\n  always uses the value ON for the sql_require_primary_key system\n  variable in replication operations, requiring a primary key. When the\n  option is set to OFF, the replica always uses the value OFF for the\n  sql_require_primary_key system variable in replication operations, so\n  that a primary key is never required, even if the source required\n  one. When the REQUIRE_TABLE_PRIMARY_KEY_CHECK option is set to\n  STREAM, which is the default, the replica uses whatever value is\n  replicated from the source for each transaction.\n  REQUIRE_TABLE_PRIMARY_KEY_CHECK is available as of MySQL 8.0.20.\n\n  For multisource replication, setting REQUIRE_TABLE_PRIMARY_KEY_CHECK\n  to ON or OFF enables a replica to normalize behavior across the\n  replication channels for different sources, and keep a consistent\n  setting for the sql_require_primary_key system variable. Using ON\n  safeguards against the accidental loss of primary keys when multiple\n  sources update the same set of tables. Using OFF allows sources that\n  can manipulate primary keys to work alongside sources that cannot.\n\n  When PRIVILEGE_CHECKS_USER is set, setting\n  REQUIRE_TABLE_PRIMARY_KEY_CHECK to ON or OFF means that the user\n  account does not need session administration level privileges to set\n  restricted session variables, which are required to change the value\n  of sql_require_primary_key to match the source\'s setting for each\n  transaction. For more information, see\n  https://dev.mysql.com/doc/refman/8.0/en/replication-privilege-checks.\n  html.\n\no SOURCE_CONNECTION_AUTO_FAILOVER\n\n  Activates the asynchronous connection failover mechanism for a\n  replication channel if one or more alternative replication source\n  servers are available (so when there are multiple MySQL servers or\n  groups of servers that share the replicated data).\n  SOURCE_CONNECTION_AUTO_FAILOVER is available as of MySQL 8.0.22. The\n  asynchronous connection failover mechanism takes over after the\n  reconnection attempts controlled by MASTER_CONNECT_RETRY and\n  MASTER_RETRY_COUNT are exhausted. It reconnects the replica to an\n  alternative source chosen from a specified source list, which you\n  manage using the asynchronous_connection_failover_add_source and\n  asynchronous_connection_failover_delete_source functions. To add and\n  remove managed groups of servers, use the\n  asynchronous_connection_failover_add_managed and\n  asynchronous_connection_failover_delete_managed functions instead.\n  For more information, see\n  https://dev.mysql.com/doc/refman/8.0/en/replication-asynchronous-conn\n  ection-failover.html.\n\n  *Important*:\n\n   1. You can only set SOURCE_CONNECTION_AUTO_FAILOVER = 1 when GTID\n      auto-positioning is in use (MASTER_AUTO_POSITION = 1).\n\n   2. When you set SOURCE_CONNECTION_AUTO_FAILOVER = 1, set\n      MASTER_RETRY_COUNT and MASTER_CONNECT_RETRY to minimal numbers\n      that just allow a few retry attempts with the same source in a\n      short time, in case the connection failure is caused by a\n      transient network outage. Otherwise the asynchronous connection\n      failover mechanism cannot be activated promptly. Suitable values\n      are MASTER_RETRY_COUNT=3 and MASTER_CONNECT_RETRY=10, which make\n      the replica retry the connection 3 times with 10-second intervals\n      between.\n\n   3. When you set SOURCE_CONNECTION_AUTO_FAILOVER = 1, the replication\n      metadata repositories must contain the credentials for a\n      replication user account that can be used to connect to all the\n      servers on the source list for the replication channel. These\n      credentials can be set using the CHANGE REPLICATION SOURCE TO\n      statement with the MASTER_USER and MASTER_PASSWORD options. For\n      more information, see\n      https://dev.mysql.com/doc/refman/8.0/en/replication-asynchronous-\n      connection-failover.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/change-master-to.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/change-master-to.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (575,43,'CHANGE REPLICATION FILTER','Syntax:\nCHANGE REPLICATION FILTER filter[, filter]\n	[, ...] [FOR CHANNEL channel]\n\nfilter: {\n    REPLICATE_DO_DB = (db_list)\n  | REPLICATE_IGNORE_DB = (db_list)\n  | REPLICATE_DO_TABLE = (tbl_list)\n  | REPLICATE_IGNORE_TABLE = (tbl_list)\n  | REPLICATE_WILD_DO_TABLE = (wild_tbl_list)\n  | REPLICATE_WILD_IGNORE_TABLE = (wild_tbl_list)\n  | REPLICATE_REWRITE_DB = (db_pair_list)\n}\n\ndb_list:\n    db_name[, db_name][, ...]\n\ntbl_list:\n    db_name.table_name[, db_name.table_name][, ...]\nwild_tbl_list:\n    \'db_pattern.table_pattern\'[, \'db_pattern.table_pattern\'][, ...]\n\ndb_pair_list:\n    (db_pair)[, (db_pair)][, ...]\n\ndb_pair:\n    from_db, to_db\n\nCHANGE REPLICATION FILTER sets one or more replication filtering rules\non the replica in the same way as starting the replica mysqld with\nreplication filtering options such as --replicate-do-db or\n--replicate-wild-ignore-table. Unlike the case with the server options,\nthis statement does not require restarting the server to take effect,\nonly that the replication SQL thread be stopped using STOP REPLICA |\nSLAVE SQL_THREAD first (and restarted with START REPLICA | SLAVE\nSQL_THREAD afterwards). CHANGE REPLICATION FILTER requires the\nREPLICATION_SLAVE_ADMIN privilege (or the deprecated SUPER privilege).\nUse the FOR CHANNEL channel clause to make a replication filter\nspecific to a replication channel, for example on a multi-source\nreplica. Filters applied without a specific FOR CHANNEL clause are\nconsidered global filters, meaning that they are applied to all\nreplication channels.\n\nGlobal replication filters cannot be set on a MySQL server instance\nthat is configured for Group Replication, because filtering\ntransactions on some servers would make the group unable to reach\nagreement on a consistent state. Channel specific replication filters\ncan be set on replication channels that are not directly involved with\nGroup Replication, such as where a group member also acts as a replica\nto a source that is outside the group. They cannot be set on the\ngroup_replication_applier or group_replication_recovery channels.\n\nThe following list shows the CHANGE REPLICATION FILTER options and how\nthey relate to --replicate-* server options:\n\no REPLICATE_DO_DB: Include updates based on database name. Equivalent\n  to --replicate-do-db.\n\no REPLICATE_IGNORE_DB: Exclude updates based on database name.\n  Equivalent to --replicate-ignore-db.\n\no REPLICATE_DO_TABLE: Include updates based on table name. Equivalent\n  to --replicate-do-table.\n\no REPLICATE_IGNORE_TABLE: Exclude updates based on table name.\n  Equivalent to --replicate-ignore-table.\n\no REPLICATE_WILD_DO_TABLE: Include updates based on wildcard pattern\n  matching table name. Equivalent to --replicate-wild-do-table.\n\no REPLICATE_WILD_IGNORE_TABLE: Exclude updates based on wildcard\n  pattern matching table name. Equivalent to\n  --replicate-wild-ignore-table.\n\no REPLICATE_REWRITE_DB: Perform updates on replica after substituting\n  new name on replica for specified database on source. Equivalent to\n  --replicate-rewrite-db.\n\nThe precise effects of REPLICATE_DO_DB and REPLICATE_IGNORE_DB filters\nare dependent on whether statement-based or row-based replication is in\neffect. See\nhttps://dev.mysql.com/doc/refman/8.0/en/replication-rules.html, for\nmore information.\n\nMultiple replication filtering rules can be created in a single CHANGE\nREPLICATION FILTER statement by separating the rules with commas, as\nshown here:\n\nCHANGE REPLICATION FILTER\n    REPLICATE_DO_DB = (d1), REPLICATE_IGNORE_DB = (d2);\n\nIssuing the statement just shown is equivalent to starting the replica\nmysqld with the options --replicate-do-db=d1 --replicate-ignore-db=d2.\n\nOn a multi-source replica, which uses multiple replication channels to\nprocess transaction from different sources, use the FOR CHANNEL channel\nclause to set a replication filter on a replication channel:\n\nCHANGE REPLICATION FILTER REPLICATE_DO_DB = (d1) FOR CHANNEL channel_1;\n\nThis enables you to create a channel specific replication filter to\nfilter out selected data from a source. When a FOR CHANNEL clause is\nprovided, the replication filter statement acts on that replication\nchannel, removing any existing replication filter which has the same\nfilter type as the specified replication filters, and replacing them\nwith the specified filter. Filter types not explicitly listed in the\nstatement are not modified. If issued against a replication channel\nwhich is not configured, the statement fails with an\nER_SLAVE_CONFIGURATION error. If issued against Group Replication\nchannels, the statement fails with an\nER_SLAVE_CHANNEL_OPERATION_NOT_ALLOWED error.\n\nOn a replica with multiple replication channels configured, issuing\nCHANGE REPLICATION FILTER with no FOR CHANNEL clause configures the\nreplication filter for every configured replication channel, and for\nthe global replication filters. For every filter type, if the filter\ntype is listed in the statement, then any existing filter rules of that\ntype are replaced by the filter rules specified in the most recently\nissued statement, otherwise the old value of the filter type is\nretained. For more information see\nhttps://dev.mysql.com/doc/refman/8.0/en/replication-rules-channel-based\n-filters.html.\n\nIf the same filtering rule is specified multiple times, only the last\nsuch rule is actually used. For example, the two statements shown here\nhave exactly the same effect, because the first REPLICATE_DO_DB rule in\nthe first statement is ignored:\n\nCHANGE REPLICATION FILTER\n    REPLICATE_DO_DB = (db1, db2), REPLICATE_DO_DB = (db3, db4);\n\nCHANGE REPLICATION FILTER\n    REPLICATE_DO_DB = (db3, db4);\n\n*Caution*:\n\nThis behavior differs from that of the --replicate-* filter options\nwhere specifying the same option multiple times causes the creation of\nmultiple filter rules.\n\nNames of tables and database not containing any special characters need\nnot be quoted. Values used with REPLICATION_WILD_TABLE and\nREPLICATION_WILD_IGNORE_TABLE are string expressions, possibly\ncontaining (special) wildcard characters, and so must be quoted. This\nis shown in the following example statements:\n\nCHANGE REPLICATION FILTER\n    REPLICATE_WILD_DO_TABLE = (\'db1.old%\');\n\nCHANGE REPLICATION FILTER\n    REPLICATE_WILD_IGNORE_TABLE = (\'db1.new%\', \'db2.new%\');\n\nValues used with REPLICATE_REWRITE_DB represent pairs of database\nnames; each such value must be enclosed in parentheses. The following\nstatement rewrites statements occurring on database db1 on the source\nto database db2 on the replica:\n\nCHANGE REPLICATION FILTER REPLICATE_REWRITE_DB = ((db1, db2));\n\nThe statement just shown contains two sets of parentheses, one\nenclosing the pair of database names, and the other enclosing the\nentire list. This is perhaps more easily seen in the following example,\nwhich creates two rewrite-db rules, one rewriting database dbA to dbB,\nand one rewriting database dbC to dbD:\n\nCHANGE REPLICATION FILTER\n  REPLICATE_REWRITE_DB = ((dbA, dbB), (dbC, dbD));\n\nThe CHANGE REPLICATION FILTER statement replaces replication filtering\nrules only for the filter types and replication channels affected by\nthe statement, and leaves other rules and channels unchanged. If you\nwant to unset all filters of a given type, set the filter\'s value to an\nexplicitly empty list, as shown in this example, which removes all\nexisting REPLICATE_DO_DB and REPLICATE_IGNORE_DB rules:\n\nCHANGE REPLICATION FILTER\n    REPLICATE_DO_DB = (), REPLICATE_IGNORE_DB = ();\n\nSetting a filter to empty in this way removes all existing rules, does\nnot create any new ones, and does not restore any rules set at mysqld\nstartup using --replicate-* options on the command line or in the\nconfiguration file.\n\nThe RESET REPLICA | SLAVE ALL statement removes channel specific\nreplication filters that were set on channels deleted by the statement.\nWhen the deleted channel or channels are recreated, any global\nreplication filters specified for the replica are copied to them, and\nno channel specific replication filters are applied.\n\nFor more information, see\nhttps://dev.mysql.com/doc/refman/8.0/en/replication-rules.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/change-replication-filter.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/change-replication-filter.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (576,43,'CHANGE REPLICATION SOURCE TO','Syntax:\nCHANGE REPLICATION SOURCE TO option [, option] ... [ channel_option ]\n\noption: {\n    SOURCE_BIND = \'interface_name\'\n  | SOURCE_HOST = \'host_name\'\n  | SOURCE_USER = \'user_name\'\n  | SOURCE_PASSWORD = \'password\'\n  | SOURCE_PORT = port_num\n  | PRIVILEGE_CHECKS_USER = {\'account\' | NULL}\n  | REQUIRE_ROW_FORMAT = {0|1}\n  | REQUIRE_TABLE_PRIMARY_KEY_CHECK = {STREAM | ON | OFF}\n  | ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS = {OFF | LOCAL | uuid}\n  | SOURCE_LOG_FILE = \'source_log_name\'\n  | SOURCE_LOG_POS = source_log_pos\n  | SOURCE_AUTO_POSITION = {0|1}\n  | RELAY_LOG_FILE = \'relay_log_name\'\n  | RELAY_LOG_POS = relay_log_pos\n  | SOURCE_HEARTBEAT_PERIOD = interval\n  | SOURCE_CONNECT_RETRY = interval\n  | SOURCE_RETRY_COUNT = count\n  | SOURCE_CONNECTION_AUTO_FAILOVER = {0|1}\n  | SOURCE_DELAY = interval\n  | SOURCE_COMPRESSION_ALGORITHMS = \'value\'\n  | SOURCE_ZSTD_COMPRESSION_LEVEL = level\n  | SOURCE_SSL = {0|1}\n  | SOURCE_SSL_CA = \'ca_file_name\'\n  | SOURCE_SSL_CAPATH = \'ca_directory_name\'\n  | SOURCE_SSL_CERT = \'cert_file_name\'\n  | SOURCE_SSL_CRL = \'crl_file_name\'\n  | SOURCE_SSL_CRLPATH = \'crl_directory_name\'\n  | SOURCE_SSL_KEY = \'key_file_name\'\n  | SOURCE_SSL_CIPHER = \'cipher_list\'\n  | SOURCE_SSL_VERIFY_SERVER_CERT = {0|1}\n  | SOURCE_TLS_VERSION = \'protocol_list\'\n  | SOURCE_TLS_CIPHERSUITES = \'ciphersuite_list\'\n  | SOURCE_PUBLIC_KEY_PATH = \'key_file_name\'\n  | GET_SOURCE_PUBLIC_KEY = {0|1}\n  | NETWORK_NAMESPACE = \'namespace\'\n  | IGNORE_SERVER_IDS = (server_id_list)\n}\n\nchannel_option:\n    FOR CHANNEL channel\n\nserver_id_list:\n    [server_id [, server_id] ... ]\n\nCHANGE REPLICATION SOURCE TO changes the parameters that the replica\nserver uses for connecting to the source and for reading data from the\nsource. It also updates the contents of the replication metadata\nrepositories (see\nhttps://dev.mysql.com/doc/refman/8.0/en/replica-logs.html). From MySQL\n8.0.23, use CHANGE REPLICATION SOURCE TO in place of CHANGE MASTER TO,\nwhich is deprecated from that release. In releases before MySQL 8.0.23,\nuse CHANGE MASTER TO.\n\nYou can issue CHANGE REPLICATION SOURCE TO statements on a running\nreplica without first stopping it, depending on the states of the\nreplication SQL thread and replication I/O thread. The rules governing\nsuch use are provided later in this section. CHANGE REPLICATION SOURCE\nTO requires the REPLICATION_SLAVE_ADMIN privilege (or the deprecated\nSUPER privilege).\n\nWhen using a multithreaded replica (in other words\nslave_parallel_workers is greater than 0), stopping the replica can\ncause "gaps" in the sequence of transactions that have been executed\nfrom the relay log, regardless of whether the replica was stopped\nintentionally or otherwise. When such gaps exist, issuing CHANGE\nREPLICATION SOURCE TO fails. The solution in this situation is to issue\nSTART REPLICA UNTIL SQL_AFTER_MTS_GAPS which ensures that the gaps are\nclosed.\n\nThe optional FOR CHANNEL channel clause enables you to name which\nreplication channel the statement applies to. Providing a FOR CHANNEL\nchannel clause applies the CHANGE REPLICATION SOURCE TO statement to a\nspecific replication channel, and is used to add a new channel or\nmodify an existing channel. For example, to add a new channel called\nchannel2:\n\nCHANGE REPLICATION SOURCE TO SOURCE_HOST=host1, SOURCE_PORT=3002 FOR CHANNEL \'channel2\'\n\nIf no clause is named and no extra channels exist, the statement\napplies to the default channel.\n\nWhen using multiple replication channels, if a CHANGE REPLICATION\nSOURCE TO statement does not name a channel using a FOR CHANNEL channel\nclause, an error occurs. See\nhttps://dev.mysql.com/doc/refman/8.0/en/replication-channels.html for\nmore information.\n\nValues used for SOURCE_HOST and other CHANGE REPLICATION SOURCE TO\noptions are checked for linefeed (\\n or 0x0A) characters. The presence\nof such characters in these values causes the statement to fail with\nER_MASTER_INFO\n(https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference.h\ntml#error_er_master_info).\n\nInvoking CHANGE REPLICATION SOURCE TO causes the previous values for\nSOURCE_HOST, SOURCE_PORT, SOURCE_LOG_FILE, and SOURCE_LOG_POS to be\nwritten to the error log, along with other information about the\nreplica\'s state prior to execution.\n\nCHANGE REPLICATION SOURCE TO causes an implicit commit of an ongoing\ntransaction. See\nhttps://dev.mysql.com/doc/refman/8.0/en/implicit-commit.html.\n\nFor some of the options of the CHANGE REPLICATION SOURCE TO statement,\nyou must issue a STOP REPLICA statement prior to issuing a CHANGE\nREPLICATION SOURCE TO statement (and a START REPLICA statement\nafterwards). Sometimes, you only need to stop the replication SQL\nthread or the replication I/O thread, not both:\n\no When the SQL thread is stopped, you can execute CHANGE REPLICATION\n  SOURCE TO using any combination that is otherwise allowed of\n  RELAY_LOG_FILE, RELAY_LOG_POS, and SOURCE_DELAY options, even if the\n  replication I/O thread is running. No other options may be used with\n  this statement when the I/O thread is running.\n\no When the I/O thread is stopped, you can execute CHANGE REPLICATION\n  SOURCE TO using any of the options for this statement (in any allowed\n  combination) except RELAY_LOG_FILE, RELAY_LOG_POS, SOURCE_DELAY, or\n  SOURCE_AUTO_POSITION = 1 even when the SQL thread is running.\n\no Both the SQL thread and the I/O thread must be stopped before issuing\n  a CHANGE REPLICATION SOURCE TO statement that employs\n  SOURCE_AUTO_POSITION = 1 or ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS.\n\nYou can check the current state of the replication SQL thread and\nreplication I/O thread using SHOW REPLICA STATUS. Note that the Group\nReplication applier channel (group_replication_applier) has no I/O\nthread, only an SQL thread.\n\nFor more information, see\nhttps://dev.mysql.com/doc/refman/8.0/en/replication-solutions-switch.ht\nml.\n\nIf you are using statement-based replication and temporary tables, it\nis possible for a CHANGE REPLICATION SOURCE TO statement following a\nSTOP REPLICA statement to leave behind temporary tables on the replica.\nA warning (ER_WARN_OPEN_TEMP_TABLES_MUST_BE_ZERO\n(https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference.h\ntml#error_er_warn_open_temp_tables_must_be_zero)) is now issued\nwhenever this occurs. You can avoid this in such cases by making sure\nthat the value of the Slave_open_temp_tables system status variable is\nequal to 0 prior to executing such a CHANGE REPLICATION SOURCE TO\nstatement.\n\nCHANGE REPLICATION SOURCE TO is useful for setting up a replica when\nyou have the snapshot of the source and have recorded the source\'s\nbinary log coordinates corresponding to the time of the snapshot. After\nloading the snapshot into the replica to synchronize it with the\nsource, you can run CHANGE REPLICATION SOURCE TO\nSOURCE_LOG_FILE=\'log_name\', SOURCE_LOG_POS=log_pos on the replica to\nspecify the coordinates at which the replica should begin reading the\nsource\'s binary log.\n\nThe following example changes the source server the replica uses and\nestablishes the source\'s binary log coordinates from which the replica\nbegins reading:\n\nCHANGE REPLICATION SOURCE TO\n  SOURCE_HOST=\'source2.example.com\',\n  SOURCE_USER=\'replication\',\n  SOURCE_PASSWORD=\'password\',\n  SOURCE_PORT=3306,\n  SOURCE_LOG_FILE=\'source2-bin.001\',\n  SOURCE_LOG_POS=4,\n  SOURCE_CONNECT_RETRY=10;\n\nThe next example shows an operation that is less frequently employed.\nIt is used when the replica has relay log files that you want it to\nexecute again for some reason. To do this, the source need not be\nreachable. You need only use CHANGE REPLICATION SOURCE TO and start the\nSQL thread (START REPLICA SQL_THREAD):\n\nCHANGE REPLICATION SOURCE TO\n  RELAY_LOG_FILE=\'replica-relay-bin.006\',\n  RELAY_LOG_POS=4025;\n\nOptions that you do not specify on a CHANGE REPLICATION SOURCE TO\nstatement retain their value, except as indicated in the following\ndiscussion. Thus, in most cases, there is no need to specify options\nthat do not change.\n\no ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS\n\n  Makes the replication channel assign a GTID to replicated\n  transactions that do not have one, enabling replication from a source\n  that does not use GTID-based replication, to a replica that does. For\n  a multi-source replica, you can have a mix of channels that use\n  ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS, and channels that do not. The\n  default is OFF, meaning that the feature is not used.\n\n  LOCAL assigns a GTID including the replica\'s own UUID (the\n  server_uuid setting). uuid assigns a GTID including the specified\n  UUID, such as the server_uuid setting for the replication source\n  server. Using a nonlocal UUID lets you differentiate between\n  transactions that originated on the replica and transactions that\n  originated on the source, and for a multi-source replica, between\n  transactions that originated on different sources. The UUID you\n  choose only has significance for the replica\'s own use. If any of the\n  transactions sent by the source do have a GTID already, that GTID is\n  retained.\n\n  Channels specific to Group Replication cannot use\n  ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS, but an asynchronous\n  replication channel for another source on a server instance that is a\n  Group Replication group member can do so. In that case, do not\n  specify the Group Replication group name as the UUID for creating the\n  GTIDs.\n\n  To set ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS to LOCAL or uuid, the\n  replica must have gtid_mode=ON set, and this cannot be changed\n  afterwards. This option is for use with a source that has binary log\n  file position based replication, so MASTER_AUTO_POSITION=1 cannot be\n  set for the channel. Both the replication SQL thread and the\n  replication I/O thread must be stopped before setting this option.\n\n  *Important*:\n\n  A replica set up with ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS on any\n  channel cannot be promoted to replace the replication source server\n  in the event that a failover is required, and a backup taken from the\n  replica cannot be used to restore the replication source server. The\n  same restriction applies to replacing or restoring other replicas\n  that use ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS on any channel.\n\n  For further restrictions and information, see\n  https://dev.mysql.com/doc/refman/8.0/en/replication-gtids-assign-anon\n  .html.\n\no GET_SOURCE_PUBLIC_KEY\n\n  Enables RSA key pair-based password exchange by requesting the public\n  key from the source. This option applies to replicas that\n  authenticate with the caching_sha2_password authentication plugin.\n  For connections by accounts that authenticate using this plugin, the\n  source does not send the public key unless requested, so it must be\n  requested or specified in the client. If SOURCE_PUBLIC_KEY_PATH is\n  given and specifies a valid public key file, it takes precedence over\n  GET_SOURCE_PUBLIC_KEY. If you are using a replication user account\n  that authenticates with the caching_sha2_password plugin (which is\n  the default from MySQL 8.0), and you are not using a secure\n  connection, you must specify either this option or the\n  SOURCE_PUBLIC_KEY_PATH option to provide the RSA public key to the\n  replica.\n\no IGNORE_SERVER_IDS\n\n  Makes the replica ignore events originating from the specified\n  servers. The option takes a comma-separated list of 0 or more server\n  IDs. Log rotation and deletion events from the servers are not\n  ignored, and are recorded in the relay log.\n\n  In circular replication, the originating server normally acts as the\n  terminator of its own events, so that they are not applied more than\n  once. Thus, this option is useful in circular replication when one of\n  the servers in the circle is removed. Suppose that you have a\n  circular replication setup with 4 servers, having server IDs 1, 2, 3,\n  and 4, and server 3 fails. When bridging the gap by starting\n  replication from server 2 to server 4, you can include\n  IGNORE_SERVER_IDS = (3) in the CHANGE REPLICATION SOURCE TO statement\n  that you issue on server 4 to tell it to use server 2 as its source\n  instead of server 3. Doing so causes it to ignore and not to\n  propagate any statements that originated with the server that is no\n  longer in use.\n\n  If IGNORE_SERVER_IDS contains the server\'s own ID and the server was\n  started with the --replicate-same-server-id option enabled, an error\n  results.\n\n  *Note*:\n\n  When global transaction identifiers (GTIDs) are used for replication,\n  transactions that have already been applied are automatically\n  ignored, so the IGNORE_SERVER_IDS function is not required and is\n  deprecated. If gtid_mode=ON is set for the server, a deprecation\n  warning is issued if you include the IGNORE_SERVER_IDS option in a\n  CHANGE REPLICATION SOURCE TO statement.\n\n  The source metadata repository and the output of SHOW REPLICA STATUS\n  provide the list of servers that are currently ignored. For more\n  information, see\n  https://dev.mysql.com/doc/refman/8.0/en/replica-logs-status.html, and\n  [HELP SHOW REPLICA STATUS].\n\n  If a CHANGE REPLICATION SOURCE TO statement is issued without any\n  IGNORE_SERVER_IDS option, any existing list is preserved. To clear\n  the list of ignored servers, it is necessary to use the option with\n  an empty list:\n\nCHANGE REPLICATION SOURCE TO IGNORE_SERVER_IDS = ();\n\n  RESET REPLICA ALL clears IGNORE_SERVER_IDS.\n\n  *Note*:\n\n  A deprecation warning is issued if SET GTID_MODE=ON is issued when\n  any channel has existing server IDs set with IGNORE_SERVER_IDS.\n  Before starting GTID-based replication, check for and clear all\n  ignored server ID lists on the servers involved. The SHOW REPLICA\n  STATUS statement displays the list of ignored IDs, if there is one.\n  If you do receive the deprecation warning, you can still clear a list\n  after gtid_mode=ON is set by issuing a CHANGE REPLICATION SOURCE TO\n  statement containing the IGNORE_SERVER_IDS option with an empty list.\n\no NETWORK_NAMESPACE\n\n  The network namespace to use for TCP/IP connections to the\n  replication source server. If this option is omitted, connections\n  from the replica use the default (global) namespace. On platforms\n  that do not implement network namespace support, failure occurs when\n  the replica attempts to connect to the source. For information about\n  network namespaces, see\n  https://dev.mysql.com/doc/refman/8.0/en/network-namespace-support.htm\n  l. NETWORK_NAMESPACE is available as of MySQL 8.0.22.\n\no PRIVILEGE_CHECKS_USER\n\n  Names a user account that supplies a security context for the\n  specified channel. NULL, which is the default, means no security\n  context is used. PRIVILEGE_CHECKS_USER is available as of MySQL\n  8.0.18.\n\n  The user name and host name for the user account must follow the\n  syntax described in\n  https://dev.mysql.com/doc/refman/8.0/en/account-names.html, and the\n  user must not be an anonymous user (with a blank user name) or the\n  CURRENT_USER. The account must have the REPLICATION_APPLIER\n  privilege, plus the required privileges to execute the transactions\n  replicated on the channel. For details of the privileges required by\n  the account, see\n  https://dev.mysql.com/doc/refman/8.0/en/replication-privilege-checks.\n  html. When you restart the replication channel, the privilege checks\n  are applied from that point on. If you do not specify a channel and\n  no other channels exist, the statement is applied to the default\n  channel.\n\n  The use of row-based binary logging is strongly recommended when\n  PRIVILEGE_CHECKS_USER is set, and you can set REQUIRE_ROW_FORMAT to\n  enforce this. For example, to start privilege checks on the channel\n  channel_1 on a running replica, issue the following statements:\n\nmysql> STOP REPLICA FOR CHANNEL \'channel_1\';\nmysql> CHANGE REPLICATION SOURCE TO\n         PRIVILEGE_CHECKS_USER = \'priv_repl\'@\'%.example.com\',\n         REQUIRE_ROW_FORMAT = 1,\n         FOR CHANNEL \'channel_1\';\nmysql> START REPLICA FOR CHANNEL \'channel_1\';\n\no RELAY_LOG_FILE, RELAY_LOG_POS\n\n  The relay log file name, and the location in that file, at which the\n  replication SQL thread begins reading from the replica\'s relay log\n  the next time the thread starts. RELAY_LOG_FILE can use either an\n  absolute or relative path, and uses the same base name as\n  SOURCE_LOG_FILE.\n\n  A CHANGE REPLICATION SOURCE TO statement using RELAY_LOG_FILE,\n  RELAY_LOG_POS, or both options can be executed on a running replica\n  when the replication SQL thread is stopped. Relay logs are preserved\n  if at least one of the replication SQL thread and the replication I/O\n  thread is running. If both threads are stopped, all relay log files\n  are deleted unless at least one of RELAY_LOG_FILE or RELAY_LOG_POS is\n  specified. For the Group Replication applier channel\n  (group_replication_applier), which only has an SQL thread and no I/O\n  thread, this is the case if the SQL thread is stopped, but with that\n  channel you cannot use the RELAY_LOG_FILE and RELAY_LOG_POS options.\n\no REQUIRE_ROW_FORMAT\n\n  Permits only row-based replication events to be processed by the\n  replication channel. This option prevents the replication applier\n  from taking actions such as creating temporary tables and executing\n  LOAD DATA INFILE requests, which increases the security of the\n  channel. Group Replication channels are automatically created with\n  REQUIRE_ROW_FORMAT set, and you cannot change the option for those\n  channels. For more information, see\n  https://dev.mysql.com/doc/refman/8.0/en/replication-privilege-checks.\n  html. REQUIRE_ROW_FORMAT is available as of MySQL 8.0.19.\n\no REQUIRE_TABLE_PRIMARY_KEY_CHECK\n\n  Enables a replica to select its own policy for primary key checks.\n  When the option is set to ON for a replication channel, the replica\n  always uses the value ON for the sql_require_primary_key system\n  variable in replication operations, requiring a primary key. When the\n  option is set to OFF, the replica always uses the value OFF for the\n  sql_require_primary_key system variable in replication operations, so\n  that a primary key is never required, even if the source required\n  one. When the REQUIRE_TABLE_PRIMARY_KEY_CHECK option is set to\n  STREAM, which is the default, the replica uses whatever value is\n  replicated from the source for each transaction.\n  REQUIRE_TABLE_PRIMARY_KEY_CHECK is available as of MySQL 8.0.20.\n\n  For multisource replication, setting REQUIRE_TABLE_PRIMARY_KEY_CHECK\n  to ON or OFF enables a replica to normalize behavior across the\n  replication channels for different sources, and keep a consistent\n  setting for the sql_require_primary_key system variable. Using ON\n  safeguards against the accidental loss of primary keys when multiple\n  sources update the same set of tables. Using OFF allows sources that\n  can manipulate primary keys to work alongside sources that cannot.\n\n  When PRIVILEGE_CHECKS_USER is set, setting\n  REQUIRE_TABLE_PRIMARY_KEY_CHECK to ON or OFF means that the user\n  account does not need session administration level privileges to set\n  restricted session variables, which are required to change the value\n  of sql_require_primary_key to match the source\'s setting for each\n  transaction. For more information, see\n  https://dev.mysql.com/doc/refman/8.0/en/replication-privilege-checks.\n  html.\n\no SOURCE_AUTO_POSITION\n\n  Makes the replica attempt to connect to the source using the\n  auto-positioning feature of GTID-based replication, rather than a\n  binary log file based position. This option can be used with CHANGE\n  REPLICATION SOURCE TO only if both the replication SQL thread and\n  replication I/O thread are stopped.\n\n  Both the replica and the source must have GTIDs enabled\n  (GTID_MODE=ON, ON_PERMISSIVE, or OFF_PERMISSIVE on the replica, and\n  GTID_MODE=ON on the source). SOURCE_LOG_FILE, SOURCE_LOG_POS,\n  RELAY_LOG_FILE, and RELAY_LOG_POS cannot be specified together with\n  SOURCE_AUTO_POSITION = 1. If multi-source replication is enabled on\n  the replica, you need to set the SOURCE_AUTO_POSITION = 1 option for\n  each applicable replication channel.\n\n  With SOURCE_AUTO_POSITION = 1 set, in the initial connection\n  handshake, the replica sends a GTID set containing the transactions\n  that it has already received, committed, or both. The source responds\n  by sending all transactions recorded in its binary log whose GTID is\n  not included in the GTID set sent by the replica. This exchange\n  ensures that the source only sends the transactions with a GTID that\n  the replica has not already recorded or committed. If the replica\n  receives transactions from more than one source, as in the case of a\n  diamond topology, the auto-skip function ensures that the\n  transactions are not applied twice. For details of how the GTID set\n  sent by the replica is computed, see\n  https://dev.mysql.com/doc/refman/8.0/en/replication-gtids-auto-positi\n  oning.html.\n\n  If any of the transactions that should be sent by the source have\n  been purged from the source\'s binary log, or added to the set of\n  GTIDs in the gtid_purged system variable by another method, the\n  source sends the error ER_MASTER_HAS_PURGED_REQUIRED_GTIDS to the\n  replica, and replication does not start. The GTIDs of the missing\n  purged transactions are identified and listed in the source\'s error\n  log in the warning message ER_FOUND_MISSING_GTIDS. Also, if during\n  the exchange of transactions it is found that the replica has\n  recorded or committed transactions with the source\'s UUID in the\n  GTID, but the source itself has not committed them, the source sends\n  the error ER_SLAVE_HAS_MORE_GTIDS_THAN_MASTER to the replica and\n  replication does not start. For information on how to handle these\n  situations, see\n  https://dev.mysql.com/doc/refman/8.0/en/replication-gtids-auto-positi\n  oning.html.\n\n  You can see whether replication is running with GTID auto-positioning\n  enabled by checking the Performance Schema\n  replication_connection_status table or the output of SHOW REPLICA\n  STATUS. Disabling the SOURCE_AUTO_POSITION option again makes the\n  replica revert to file-based replication.\n\no SOURCE_BIND\n\n  Determines which of the replica\'s network interfaces is chosen for\n  connecting to the source, for use on replicas that have multiple\n  network interfaces. The address configured with this option, if any,\n  can be seen in the Source_Bind column of the output from SHOW REPLICA\n  STATUS. In the source metadata repository table\n  mysql.slave_master_info, the value can be seen as the Source_bind\n  column. The ability to bind a replica to a specific network interface\n  is also supported by NDB Cluster.\n\no SOURCE_COMPRESSION_ALGORITHMS\n\n  Specifies the permitted compression algorithms for connections to the\n  replication source server. The available algorithms are the same as\n  for the protocol_compression_algorithms system variable. The default\n  value is uncompressed. SOURCE_COMPRESSION_ALGORITHMS is available as\n  of MySQL 8.0.18.\n\n  The value of SOURCE_COMPRESSION_ALGORITHMS applies only if the\n  slave_compressed_protocol system variable is disabled. If\n  slave_compressed_protocol is enabled, it takes precedence over\n  SOURCE_COMPRESSION_ALGORITHMS and connections to the source use zlib\n  compression if both source and replica support that algorithm. For\n  more information, see\n  https://dev.mysql.com/doc/refman/8.0/en/connection-compression-contro\n  l.html.\n\n  Binary log transaction compression (available as of MySQL 8.0.20),\n  which is activated by the binlog_transaction_compression system\n  variable, can also be used to save bandwidth. If you do this in\n  combination with connection compression, connection compression has\n  less opportunity to act on the data, but can still compress headers\n  and those events and transaction payloads that are uncompressed. For\n  more information on binary log transaction compression, see\n  https://dev.mysql.com/doc/refman/8.0/en/binary-log-transaction-compre\n  ssion.html.\n\no SOURCE_CONNECT_RETRY\n\n  Specifies the interval between the reconnection attempts that the\n  replica makes after the connection to the source times out. The\n  attempts are limited by the SOURCE_RETRY_COUNT option. If both the\n  default settings are used, the replica waits 60 seconds between\n  reconnection attempts (SOURCE_CONNECT_RETRY=60), and keeps attempting\n  to reconnect at this rate for 60 days (SOURCE_RETRY_COUNT=86400).\n  These values are recorded in the source metadata repository and shown\n  in the replication_connection_configuration Performance Schema table.\n\no SOURCE_CONNECTION_AUTO_FAILOVER\n\n  Activates the asynchronous connection failover mechanism for a\n  replication channel if one or more alternative replication source\n  servers are available (so when there are multiple MySQL servers or\n  groups of servers that share the replicated data).\n  SOURCE_CONNECTION_AUTO_FAILOVER is available as of MySQL 8.0.22. The\n  asynchronous connection failover mechanism takes over after the\n  reconnection attempts controlled by SOURCE_CONNECT_RETRY and\n  SOURCE_RETRY_COUNT are exhausted. It reconnects the replica to an\n  alternative source chosen from a specified source list, which you\n  manage using the asynchronous_connection_failover_add_source and\n  asynchronous_connection_failover_delete_source functions. To add and\n  remove managed groups of servers, use the\n  asynchronous_connection_failover_add_managed and\n  asynchronous_connection_failover_delete_managed functions instead.\n  For more information, see\n  https://dev.mysql.com/doc/refman/8.0/en/replication-asynchronous-conn\n  ection-failover.html.\n\n  *Important*:\n\n   1. You can only set SOURCE_CONNECTION_AUTO_FAILOVER = 1 when GTID\n      auto-positioning is in use (SOURCE_AUTO_POSITION = 1).\n\n   2. When you set SOURCE_CONNECTION_AUTO_FAILOVER = 1, set\n      SOURCE_RETRY_COUNT and SOURCE_CONNECT_RETRY to minimal numbers\n      that just allow a few retry attempts with the same source, in\n      case the connection failure is caused by a transient network\n      outage. Otherwise the asynchronous connection failover mechanism\n      cannot be activated promptly. Suitable values are\n      SOURCE_RETRY_COUNT=3 and SOURCE_CONNECT_RETRY=10, which make the\n      replica retry the connection 3 times with 10-second intervals\n      between.\n\n   3. When you set SOURCE_CONNECTION_AUTO_FAILOVER = 1, the replication\n      metadata repositories must contain the credentials for a\n      replication user account that can be used to connect to all the\n      servers on the source list for the replication channel. The\n      account must also have SELECT permissions on the Performance\n      Schema tables. These credentials can be set using the CHANGE\n      REPLICATION SOURCE TO statement with the SOURCE_USER and\n      SOURCE_PASSWORD options. For more information, see\n      https://dev.mysql.com/doc/refman/8.0/en/replication-asynchronous-\n      connection-failover.html.\n\no SOURCE_DELAY\n\n  Specifies how many seconds behind the source the replica must lag. An\n  event received from the source is not executed until at least\n  interval seconds later than its execution on the source. The default\n  is 0. An error occurs if interval is not a nonnegative integer in the\n  range from 0 to 231−1. For more information, see\n  https://dev.mysql.com/doc/refman/8.0/en/replication-delayed.html. A\n  CHANGE REPLICATION SOURCE TO statement using the SOURCE_DELAY option\n  can be executed on a running replica when the replication SQL thread\n  is stopped.\n\no SOURCE_HEARTBEAT_PERIOD\n\n  Controls the heartbeat interval, which stops the connection timeout\n  occurring in the absence of data if the connection is still good. A\n  heartbeat signal is sent to the replica after that number of seconds,\n  and the waiting period is reset whenever the source\'s binary log is\n  updated with an event. Heartbeats are therefore sent by the source\n  only if there are no unsent events in the binary log file for a\n  period longer than this.\n\n  The heartbeat interval interval is a decimal value having the range 0\n  to 4294967 seconds and a resolution in milliseconds; the smallest\n  nonzero value is 0.001. Setting interval to 0 disables heartbeats\n  altogether. The heartbeat interval defaults to half the value of the\n  slave_net_timeout system variable. It is recorded in the source\n  metadata repository and shown in the\n  replication_connection_configuration Performance Schema table.\n  Issuing RESET REPLICA resets the heartbeat interval to the default\n  value.\n\n  The slave_net_timeout system variable specifies the number of seconds\n  that the replica waits for either more data or a heartbeat signal\n  from the source, before the replica considers the connection broken,\n  aborts the read, and tries to reconnect. The default value is 60\n  seconds (one minute). Note that a change to the value or default\n  setting of slave_net_timeout does not automatically change the\n  heartbeat interval, whether that has been set explicitly or is using\n  a previously calculated default. A warning is issued if you set\n  @@GLOBAL.slave_net_timeout to a value less than that of the current\n  heartbeat interval. If slave_net_timeout is changed, you must also\n  issue CHANGE REPLICATION SOURCE TO to adjust the heartbeat interval\n  to an appropriate value so that the heartbeat signal occurs before\n  the connection timeout. If you do not do this, the heartbeat signal\n  has no effect, and if no data is received from the source, the\n  replica can make repeated reconnection attempts, creating zombie dump\n  threads.\n\no SOURCE_HOST\n\n  The host name or IP address of the replication source server. The\n  replica uses this to connect to the source.\n\n  If you specify SOURCE_HOST or SOURCE_PORT, the replica assumes that\n  the source server is different from before (even if the option value\n  is the same as its current value.) In this case, the old values for\n  the source\'s binary log file name and position are considered no\n  longer applicable, so if you do not specify SOURCE_LOG_FILE and\n  SOURCE_LOG_POS in the statement, SOURCE_LOG_FILE=\'\' and\n  SOURCE_LOG_POS=4 are silently appended to it.\n\n  Setting SOURCE_HOST=\'\' (that is, setting its value explicitly to an\n  empty string) is not the same as not setting SOURCE_HOST at all.\n  Trying to set SOURCE_HOST to an empty string fails with an error.\n\no SOURCE_LOG_FILE, SOURCE_LOG_POS\n\n  The binary log file name, and the location in that file, at which the\n  replication I/O thread begins reading from the source\'s binary log\n  the next time the thread starts. Specify these options if you are\n  using binary log file position based replication. SOURCE_LOG_FILE\n  must include the numeric suffix of a specific binary log file that is\n  available on the source server, for example,\n  SOURCE_LOG_FILE=\'binlog.000145\'. SOURCE_LOG_POS is the numeric\n  position for the replica to start reading in that file.\n  SOURCE_LOG_POS=4 represents the start of the events in a binary log\n  file.\n\n  If you specify either of SOURCE_LOG_FILE or SOURCE_LOG_POS, you\n  cannot specify SOURCE_AUTO_POSITION = 1, which is for GTID-based\n  replication.\n\n  If neither of SOURCE_LOG_FILE or SOURCE_LOG_POS is specified, the\n  replica uses the last coordinates of the replication SQL thread\n  before CHANGE REPLICATION SOURCE TO was issued. This ensures that\n  there is no discontinuity in replication, even if the replication SQL\n  thread was late compared to the replication I/O thread.\n\no SOURCE_PASSWORD\n\n  The password for the replication user account to use for connecting\n  to the replication source server. If you specify SOURCE_PASSWORD,\n  SOURCE_USER is also required.\n\n  The password used for a replication user account in a CHANGE\n  REPLICATION SOURCE TO statement is limited to 32 characters in\n  length. Trying to use a password of more than 32 characters causes\n  CHANGE REPLICATION SOURCE TO to fail.\n\no SOURCE_PORT\n\n  The TCP/IP port number that the replica uses to connect to the\n  replication source server.\n\n  *Note*:\n\n  Replication cannot use Unix socket files. You must be able to connect\n  to the replication source server using TCP/IP.\n\n  If you specify SOURCE_HOST or SOURCE_PORT, the replica assumes that\n  the source server is different from before (even if the option value\n  is the same as its current value.) In this case, the old values for\n  the source\'s binary log file name and position are considered no\n  longer applicable, so if you do not specify SOURCE_LOG_FILE and\n  SOURCE_LOG_POS in the statement, SOURCE_LOG_FILE=\'\' and\n  SOURCE_LOG_POS=4 are silently appended to it.\n\no SOURCE_PUBLIC_KEY_PATH\n\n  Enables RSA key pair-based password exchange by providing the path\n  name to a file containing a replica-side copy of the public key\n  required by the source. The file must be in PEM format. This option\n  applies to replicas that authenticate with the sha256_password or\n  caching_sha2_password authentication plugin. (For sha256_password,\n  SOURCE_PUBLIC_KEY_PATH can be used only if MySQL was built using\n  OpenSSL.) If you are using a replication user account that\n  authenticates with the caching_sha2_password plugin (which is the\n  default from MySQL 8.0), and you are not using a secure connection,\n  you must specify either this option or the GET_SOURCE_PUBLIC_KEY=1\n  option to provide the RSA public key to the replica.\n\no SOURCE_RETRY_COUNT\n\n  Sets the maximum number of reconnection attempts that the replica\n  makes after the connection to the source times out, as determined by\n  the slave_net_timeout system variable. If the replica does need to\n  reconnect, the first retry occurs immediately after the timeout.\n\n  The interval between the attempts is specified by the\n  SOURCE_CONNECT_RETRY option. If both the default settings are used,\n  the replica waits 60 seconds between reconnection attempts\n  (SOURCE_CONNECT_RETRY=60), and keeps attempting to reconnect at this\n  rate for 60 days (SOURCE_RETRY_COUNT=86400). A setting of 0 for\n  SOURCE_RETRY_COUNT means that there is no limit on the number of\n  reconnection attempts, so the replica keeps trying to reconnect\n  indefinitely.\n\n  The values for SOURCE_CONNECT_RETRY and SOURCE_RETRY_COUNT are\n  recorded in the source metadata repository and shown in the\n  replication_connection_configuration Performance Schema table.\n  SOURCE_RETRY_COUNT supersedes the --master-retry-count server startup\n  option.\n\no SOURCE_SSL_xxx, SOURCE_TLS_xxx\n\n  Specify how the replica uses encryption and ciphers to secure the\n  replication connection. These options can be changed even on replicas\n  that are compiled without SSL support. They are saved to the source\n  metadata repository, but are ignored if the replica does not have SSL\n  support enabled. The SOURCE_SSL_xxx and SOURCE_TLS_xxx options\n  perform the same functions as the --ssl-xxx and --tls-xxx client\n  options described in\n  https://dev.mysql.com/doc/refman/8.0/en/connection-options.html#encry\n  pted-connection-options. The correspondence between the two sets of\n  options, and the use of the SOURCE_SSL_xxx and SOURCE_TLS_xxx options\n  to set up a secure connection, is explained in\n  https://dev.mysql.com/doc/refman/8.0/en/replication-solutions-encrypt\n  ed-connections.html.\n\no SOURCE_USER\n\n  The user name for the replication user account to use for connecting\n  to the replication source server.\n\n  *Important*:\n\n  To connect to the source using a replication user account that\n  authenticates with the caching_sha2_password plugin, you must either\n  set up a secure connection as described in\n  https://dev.mysql.com/doc/refman/8.0/en/replication-solutions-encrypt\n  ed-connections.html, or enable the unencrypted connection to support\n  password exchange using an RSA key pair. The caching_sha2_password\n  authentication plugin is the default for new users created from MySQL\n  8.0 (for details, see\n  https://dev.mysql.com/doc/refman/8.0/en/caching-sha2-pluggable-authen\n  tication.html). If the user account that you create or use for\n  replication uses this authentication plugin, and you are not using a\n  secure connection, you must enable RSA key pair-based password\n  exchange for a successful connection. You can do this using either\n  the SOURCE_PUBLIC_KEY_PATH option or the GET_SOURCE_PUBLIC_KEY=1\n  option for this statement.\n\n  It is possible to set an empty user name by specifying\n  SOURCE_USER=\'\', but the replication channel cannot be started with an\n  empty user name. In releases before MySQL 8.0.21, only set an empty\n  SOURCE_USER user name if you need to clear previously used\n  credentials from the replication metadata repositories for security\n  purposes. Do not use the channel afterwards, due to a bug in these\n  releases that can substitute a default user name if an empty user\n  name is read from the repositories (for example, during an automatic\n  restart of a Group Replication channel). From MySQL 8.0.21, it is\n  valid to set an empty SOURCE_USER user name and use the channel\n  afterwards if you always provide user credentials using the START\n  REPLICA statement or START GROUP_REPLICATION statement that starts\n  the replication channel. This approach means that the replication\n  channel always needs operator intervention to restart, but the user\n  credentials are not recorded in the replication metadata\n  repositories.\n\n  The text of a running CHANGE REPLICATION SOURCE TO statement,\n  including values for SOURCE_USER and SOURCE_PASSWORD, can be seen in\n  the output of a concurrent SHOW PROCESSLIST statement. (The complete\n  text of a START REPLICA statement is also visible to SHOW\n  PROCESSLIST.)\n\no SOURCE_ZSTD_COMPRESSION_LEVEL\n\n  The compression level to use for connections to the replication\n  source server that use the zstd compression algorithm. The permitted\n  levels are from 1 to 22, with larger values indicating increasing\n  levels of compression. The default zstd compression level is 3. The\n  compression level setting has no effect on connections that do not\n  use zstd compression. SOURCE_ZSTD_COMPRESSION_LEVEL is available as\n  of MySQL 8.0.18. For more information, see\n  https://dev.mysql.com/doc/refman/8.0/en/connection-compression-contro\n  l.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/change-replication-source-to.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/change-replication-source-to.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (577,43,'RESET REPLICA','Syntax:\nRESET {REPLICA | SLAVE} [ALL] [channel_option]\n\nchannel_option:\n    FOR CHANNEL channel\n\nRESET REPLICA | SLAVE makes the replica forget its position in the\nsource\'s binary log. From MySQL 8.0.22, use RESET REPLICA in place of\nRESET SLAVE, which is deprecated from that release. In releases before\nMySQL 8.0.22, use RESET SLAVE.\n\nThis statement is meant to be used for a clean start; it clears the\nreplication metadata repositories, deletes all the relay log files, and\nstarts a new relay log file. It also resets to 0 the replication delay\nspecified with the SOURCE_DELAY | MASTER_DELAY option of the CHANGE\nREPLICATION SOURCE TO statement (from MySQL 8.0.23) or CHANGE MASTER TO\nstatement (before MySQL 8.0.23).\n\n*Note*:\n\nAll relay log files are deleted, even if they have not been completely\nexecuted by the replication SQL thread. (This is a condition likely to\nexist on a replica if you have issued a STOP REPLICA | SLAVE statement\nor if the replica is highly loaded.)\n\nFor a server where GTIDs are in use (gtid_mode is ON), issuing RESET\nREPLICA | SLAVE has no effect on the GTID execution history. The\nstatement does not change the values of gtid_executed or gtid_purged,\nor the mysql.gtid_executed table. If you need to reset the GTID\nexecution history, use RESET MASTER, even if the GTID-enabled server is\na replica where binary logging is disabled.\n\nRESET REPLICA | SLAVE requires the RELOAD privilege.\n\nTo use RESET REPLICA | SLAVE, the replication SQL thread and\nreplication I/O thread must be stopped, so on a running replica use\nSTOP REPLICA | SLAVE before issuing RESET REPLICA | SLAVE. To use RESET\nREPLICA | SLAVE on a Group Replication group member, the member status\nmust be OFFLINE, meaning that the plugin is loaded but the member does\nnot currently belong to any group. A group member can be taken offline\nby using a STOP GROUP REPLICATION statement.\n\nThe optional FOR CHANNEL channel clause enables you to name which\nreplication channel the statement applies to. Providing a FOR CHANNEL\nchannel clause applies the RESET REPLICA | SLAVE statement to a\nspecific replication channel. Combining a FOR CHANNEL channel clause\nwith the ALL option deletes the specified channel. If no channel is\nnamed and no extra channels exist, the statement applies to the default\nchannel. Issuing a RESET REPLICA | SLAVE ALL statement without a FOR\nCHANNEL channel clause when multiple replication channels exist deletes\nall replication channels and recreates only the default channel. See\nhttps://dev.mysql.com/doc/refman/8.0/en/replication-channels.html for\nmore information.\n\nRESET REPLICA | SLAVE does not change any replication connection\nparameters, which include the source\'s host name and port, the\nreplication user account and its password, the PRIVILEGE_CHECKS_USER\naccount, the REQUIRE_ROW_FORMAT option, the\nREQUIRE_TABLE_PRIMARY_KEY_CHECK option, and the\nASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS option. If you want to change\nany of the replication connection parameters, you can do this using a\nCHANGE REPLICATION SOURCE TO statement (from MySQL 8.0.23) or CHANGE\nMASTER TO statement (before MySQL 8.0.23) after the server start. If\nyou want to remove all of the replication connection parameters, use\nRESET REPLICA | SLAVE ALL. RESET REPLICA | SLAVE ALL also clears the\nIGNORE_SERVER_IDS list set by CHANGE REPLICATION SOURCE TO | CHANGE\nMASTER TO. When you have used RESET REPLICA | SLAVE ALL, if you want to\nuse the instance as a replica again, you need to issue a CHANGE\nREPLICATION SOURCE TO | CHANGE MASTER TO statement after the server\nstart to specify new connection parameters.\n\nIn the event of an unexpected server exit or deliberate restart after\nissuing RESET REPLICA | SLAVE but before issuing START REPLICA | SLAVE,\nretention of the replication connection parameters depends on the\nrepository used for the replication metadata:\n\no When master_info_repository=TABLE and relay_log_info_repository=TABLE\n  are set on the server (which are the default settings from MySQL\n  8.0), replication connection parameters are preserved in the\n  crash-safe InnoDB tables mysql.slave_master_info and\n  mysql.slave_relay_log_info as part of the RESET REPLICA | SLAVE\n  operation. They are also retained in memory. In the event of an\n  unexpected server exit or deliberate restart after issuing RESET\n  REPLICA | SLAVE but before issuing START REPLICA | SLAVE, the\n  replication connection parameters are retrieved from the tables and\n  reapplied to the channel. This situation applies from MySQL 8.0.13\n  for the connection metadata repository, and from MySQL 8.0.19 for the\n  applier metadata repository.\n\no If master_info_repository=FILE and relay_log_info_repository=FILE are\n  set on the server, which is deprecated from MySQL 8.0, or the MySQL\n  Server release is earlier than those specified above, replication\n  connection parameters are only retained in memory. If the replica\n  mysqld is restarted immediately after issuing RESET REPLICA | SLAVE\n  due to an unexpected server exit or deliberate restart, the\n  connection parameters are lost. In that case, you must issue a CHANGE\n  REPLICATION SOURCE TO statement (from MySQL 8.0.23) or CHANGE MASTER\n  TO statement (before MySQL 8.0.23) after the server start to\n  respecify the connection parameters before issuing START REPLICA |\n  SLAVE.\n\nRESET REPLICA | SLAVE does not change any replication filter settings\n(such as --replicate-ignore-table) for channels affected by the\nstatement. However, RESET REPLICA | SLAVE ALL removes the replication\nfilters that were set on the channels deleted by the statement. When\nthe deleted channel or channels are recreated, any global replication\nfilters specified for the replica are copied to them, and no channel\nspecific replication filters are applied. For more information see\nhttps://dev.mysql.com/doc/refman/8.0/en/replication-rules-channel-based\n-filters.html.\n\nRESET REPLICA | SLAVE causes an implicit commit of an ongoing\ntransaction. See\nhttps://dev.mysql.com/doc/refman/8.0/en/implicit-commit.html.\n\nIf the replication SQL thread was in the middle of replicating\ntemporary tables when it was stopped, and RESET REPLICA | SLAVE is\nissued, these replicated temporary tables are deleted on the replica.\n\nRESET REPLICA | SLAVE does not reset the heartbeat period or\nSSL_VERIFY_SERVER_CERT.\n\n*Note*:\n\nWhen used on an NDB Cluster replica SQL node, RESET REPLICA | SLAVE\nclears the mysql.ndb_apply_status table. You should keep in mind when\nusing this statement that ndb_apply_status uses the NDB storage engine\nand so is shared by all SQL nodes attached to the cluster.\n\nYou can override this behavior by issuing SET GLOBAL\n@@ndb_clear_apply_status=OFF prior to executing RESET REPLICA | SLAVE,\nwhich keeps the replica from purging the ndb_apply_status table in such\ncases.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/reset-replica.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/reset-replica.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (578,43,'RESET SLAVE','Syntax:\nRESET {SLAVE | REPLICA} [ALL] [channel_option]\n\nchannel_option:\n    FOR CHANNEL channel\n\nMakes the replica forget its position in the source\'s binary log. From\nMySQL 8.0.22, RESET SLAVE is deprecated and the alias RESET REPLICA\nshould be used instead. In releases before MySQL 8.0.22, use RESET\nSLAVE. The statement works in the same way as before, only the\nterminology used for the statement and its output has changed. Both\nversions of the statement update the same status variables when used.\nPlease see the documentation for RESET REPLICA for a description of the\nstatement.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/reset-slave.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/reset-slave.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (579,43,'START REPLICA','Syntax:\nSTART {REPLICA | SLAVE} [thread_types] [until_option] [connection_options] [channel_option]\n\nthread_types:\n    [thread_type [, thread_type] ... ]\n\nthread_type:\n    IO_THREAD | SQL_THREAD\n\nuntil_option:\n    UNTIL {   {SQL_BEFORE_GTIDS | SQL_AFTER_GTIDS} = gtid_set\n          |   MASTER_LOG_FILE = \'log_name\', MASTER_LOG_POS = log_pos\n          |   SOURCE_LOG_FILE = \'log_name\', SOURCE_LOG_POS = log_pos\n          |   RELAY_LOG_FILE = \'log_name\', RELAY_LOG_POS = log_pos\n          |   SQL_AFTER_MTS_GAPS  }\n\nconnection_options:\n    [USER=\'user_name\'] [PASSWORD=\'user_pass\'] [DEFAULT_AUTH=\'plugin_name\'] [PLUGIN_DIR=\'plugin_dir\']\n\n\nchannel_option:\n    FOR CHANNEL channel\n\ngtid_set:\n    uuid_set [, uuid_set] ...\n    | \'\'\n\nuuid_set:\n    uuid:interval[:interval]...\n\nuuid:\n    hhhhhhhh-hhhh-hhhh-hhhh-hhhhhhhhhhhh\n\nh:\n    [0-9,A-F]\n\ninterval:\n    n[-n]\n\n    (n >= 1)\n\nSTART REPLICA | SLAVE starts one or both of the replication threads.\nFrom MySQL 8.0.22, use START REPLICA in place of START SLAVE, which is\ndeprecated from that release. In releases before MySQL 8.0.22, use\nSTART SLAVE.\n\nSTART REPLICA | SLAVE with no thread_type options starts both of the\nreplication threads. The replication I/O thread reads events from the\nsource server and stores them in the relay log. The replication SQL\nthread reads events from the relay log and executes them. START REPLICA\n| SLAVE requires the REPLICATION_SLAVE_ADMIN privilege (or the\ndeprecated SUPER privilege).\n\nIf START REPLICA | SLAVE succeeds in starting the replication threads,\nit returns without any error. However, even in that case, it might be\nthat the replication threads start and then later stop (for example,\nbecause they do not manage to connect to the source or read its binary\nlog, or some other problem). START REPLICA | SLAVE does not warn you\nabout this. You must check the replica\'s error log for error messages\ngenerated by the replication threads, or check that they are running\nsatisfactorily with SHOW REPLICA | SLAVE STATUS.\n\nSTART REPLICA | SLAVE causes an implicit commit of an ongoing\ntransaction. See\nhttps://dev.mysql.com/doc/refman/8.0/en/implicit-commit.html.\n\ngtid_next must be set to AUTOMATIC before issuing this statement.\n\nThe optional FOR CHANNEL channel clause enables you to name which\nreplication channel the statement applies to. Providing a FOR CHANNEL\nchannel clause applies the START REPLICA | SLAVE statement to a\nspecific replication channel. If no clause is named and no extra\nchannels exist, the statement applies to the default channel. If a\nSTART REPLICA | SLAVE statement does not have a channel defined when\nusing multiple channels, this statement starts the specified threads\nfor all channels. This statement is disallowed for the\ngroup_replication_recovery channel. See\nhttps://dev.mysql.com/doc/refman/8.0/en/replication-channels.html for\nmore information.\n\nYou can add IO_THREAD and SQL_THREAD options to the statement to name\nwhich of the threads to start. Note that the Group Replication applier\nchannel (group_replication_applier) has no I/O thread, only an SQL\nthread. Specifying the IO_THREAD or SQL_THREAD options when you start\nthis channel has no benefit.\n\nSTART REPLICA | SLAVE supports pluggable user-password authentication\nwith the USER, PASSWORD, DEFAULT_AUTH and PLUGIN_DIR options, as\ndescribed in the following list:\n\no USER: User name. Cannot be set to an empty or null string, or left\n  unset if PASSWORD is used.\n\no PASSWORD: Password.\n\no DEFAULT_AUTH: Name of plugin; default is MySQL native authentication.\n\no PLUGIN_DIR: Location of plugin.\n\nYou cannot use the SQL_THREAD option when specifying any of USER,\nPASSWORD, DEFAULT_AUTH, or PLUGIN_DIR, unless the IO_THREAD option is\nalso provided.\n\nFor more information, see\nhttps://dev.mysql.com/doc/refman/8.0/en/pluggable-authentication.html.\n\nIf an insecure connection is used with any these options, the server\nissues the warning Sending passwords in plain text without SSL/TLS is\nextremely insecure.\n\nSTART REPLICA | SLAVE ... UNTIL supports two additional options for use\nwith global transaction identifiers (GTIDs) (see\nhttps://dev.mysql.com/doc/refman/8.0/en/replication-gtids.html). Each\nof these takes a set of one or more global transaction identifiers\ngtid_set as an argument (see\nhttps://dev.mysql.com/doc/refman/8.0/en/replication-gtids-concepts.html\n#replication-gtids-concepts-gtid-sets, for more information).\n\nWhen no thread_type is specified, START REPLICA | SLAVE UNTIL\nSQL_BEFORE_GTIDS causes the replication SQL thread to process\ntransactions until it has reached the first transaction whose GTID is\nlisted in the gtid_set. START REPLICA | SLAVE UNTIL SQL_AFTER_GTIDS\ncauses the replication threads to process all transactions until the\nlast transaction in the gtid_set has been processed by both threads. In\nother words, START REPLICA | SLAVE UNTIL SQL_BEFORE_GTIDS causes the\nreplication SQL thread to process all transactions occurring before the\nfirst GTID in the gtid_set is reached, and START REPLICA | SLAVE UNTIL\nSQL_AFTER_GTIDS causes the replication threads to handle all\ntransactions, including those whose GTIDs are found in gtid_set, until\neach has encountered a transaction whose GTID is not part of the set.\nSQL_BEFORE_GTIDS and SQL_AFTER_GTIDS each support the SQL_THREAD and\nIO_THREAD options, although using IO_THREAD with them currently has no\neffect.\n\nFor example, START REPLICA | SLAVE SQL_THREAD UNTIL SQL_BEFORE_GTIDS =\n3E11FA47-71CA-11E1-9E33-C80AA9429562:11-56 causes the replication SQL\nthread to process all transactions originating from the source whose\nserver_uuid is 3E11FA47-71CA-11E1-9E33-C80AA9429562 until it encounters\nthe transaction having sequence number 11; it then stops without\nprocessing this transaction. In other words, all transactions up to and\nincluding the transaction with sequence number 10 are processed.\nExecuting START REPLICA | SLAVE SQL_THREAD UNTIL SQL_AFTER_GTIDS =\n3E11FA47-71CA-11E1-9E33-C80AA9429562:11-56, on the other hand, would\ncause the replication SQL thread to obtain all transactions just\nmentioned from the source, including all of the transactions having the\nsequence numbers 11 through 56, and then to stop without processing any\nadditional transactions; that is, the transaction having sequence\nnumber 56 would be the last transaction fetched by the replication SQL\nthread.\n\nWhen using a multithreaded replica with slave_preserve_commit_order=0\nset, there is a chance of gaps in the sequence of transactions that\nhave been executed from the relay log in the following cases:\n\no killing the coordinator thread\n\no after an error occurs in the applier threads\n\no mysqld shuts down unexpectedly\n\nUse the START REPLICA | SLAVE UNTIL SQL_AFTER_MTS_GAPS statement to\ncause a multithreaded replica\'s worker threads to only run until no\nmore gaps are found in the relay log, and then to stop. This statement\ncan take an SQL_THREAD option, but the effects of the statement remain\nunchanged. It has no effect on the replication I/O thread (and cannot\nbe used with the IO_THREAD option).\n\nIssuing START REPLICA | SLAVE on a multithreaded replica with gaps in\nthe sequence of transactions executed from the relay log generates a\nwarning. In such a situation, the solution is to use START REPLICA |\nSLAVE UNTIL SQL_AFTER_MTS_GAPS, then issue RESET REPLICA | SLAVE to\nremove any remaining relay logs. See\nhttps://dev.mysql.com/doc/refman/8.0/en/replication-features-transactio\nn-inconsistencies.html for more information.\n\nTo change a failed multithreaded replica to single-threaded mode, you\ncan issue the following series of statements, in the order shown:\n\nSTART {REPLICA | SLAVE} UNTIL SQL_AFTER_MTS_GAPS;\n\nSET @@GLOBAL.slave_parallel_workers = 0;\n\nSTART {REPLICA | SLAVE} SQL_THREAD;\n\n*Note*:\n\nIt is possible to view the entire text of a running START REPLICA |\nSLAVE statement, including any USER or PASSWORD values used, in the\noutput of SHOW PROCESSLIST. This is also true for the text of a running\nCHANGE REPLICATION SOURCE TO | CHANGE MASTER TO statement, including\nany values it employs for SOURCE_USER | MASTER_USER or SOURCE_PASSWORD\n| MASTER_PASSWORD.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/start-replica.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/start-replica.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (580,43,'START SLAVE','Syntax:\nSTART {SLAVE | REPLICA} [thread_types] [until_option] [connection_options] [channel_option]\n\nthread_types:\n    [thread_type [, thread_type] ... ]\n\nthread_type:\n    IO_THREAD | SQL_THREAD\n\nuntil_option:\n    UNTIL {   {SQL_BEFORE_GTIDS | SQL_AFTER_GTIDS} = gtid_set\n          |   MASTER_LOG_FILE = \'log_name\', MASTER_LOG_POS = log_pos\n          |   SOURCE_LOG_FILE = \'log_name\', SOURCE_LOG_POS = log_pos\n          |   RELAY_LOG_FILE = \'log_name\', RELAY_LOG_POS = log_pos\n          |   SQL_AFTER_MTS_GAPS  }\n\nconnection_options:\n    [USER=\'user_name\'] [PASSWORD=\'user_pass\'] [DEFAULT_AUTH=\'plugin_name\'] [PLUGIN_DIR=\'plugin_dir\']\n\n\nchannel_option:\n    FOR CHANNEL channel\n\ngtid_set:\n    uuid_set [, uuid_set] ...\n    | \'\'\n\nuuid_set:\n    uuid:interval[:interval]...\n\nuuid:\n    hhhhhhhh-hhhh-hhhh-hhhh-hhhhhhhhhhhh\n\nh:\n    [0-9,A-F]\n\ninterval:\n    n[-n]\n\n    (n >= 1)\n\nStarts the replication threads. From MySQL 8.0.22, START SLAVE is\ndeprecated and the alias START REPLICA should be used instead. The\nstatement works in the same way as before, only the terminology used\nfor the statement and its output has changed. Both versions of the\nstatement update the same status variables when used. Please see the\ndocumentation for START REPLICA for a description of the statement.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/start-slave.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/start-slave.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (581,43,'STOP REPLICA','Syntax:\nSTOP {REPLICA | SLAVE} [thread_types] [channel_option]\n\nthread_types:\n    [thread_type [, thread_type] ... ]\n\nthread_type: IO_THREAD | SQL_THREAD\n\nchannel_option:\n    FOR CHANNEL channel\n\nStops the replication threads. From MySQL 8.0.22, use STOP REPLICA in\nplace of STOP SLAVE, which is now deprecated. In releases before MySQL\n8.0.22, use STOP SLAVE.\n\nSTOP REPLICA | SLAVE requires the REPLICATION_SLAVE_ADMIN privilege (or\nthe deprecated SUPER privilege). Recommended best practice is to\nexecute STOP REPLICA | SLAVE on the replica before stopping the replica\nserver (see\nhttps://dev.mysql.com/doc/refman/8.0/en/server-shutdown.html, for more\ninformation).\n\nLike START REPLICA | SLAVE, this statement may be used with the\nIO_THREAD and SQL_THREAD options to name the replication thread or\nthreads to be stopped. Note that the Group Replication applier channel\n(group_replication_applier) has no replication I/O thread, only a\nreplication SQL thread. Using the SQL_THREAD option therefore stops\nthis channel completely.\n\nSTOP REPLICA | SLAVE causes an implicit commit of an ongoing\ntransaction. See\nhttps://dev.mysql.com/doc/refman/8.0/en/implicit-commit.html.\n\ngtid_next must be set to AUTOMATIC before issuing this statement.\n\nYou can control how long STOP REPLICA | SLAVE waits before timing out\nby setting the rpl_stop_slave_timeout system variable. This can be used\nto avoid deadlocks between STOP REPLICA | SLAVE and other SQL\nstatements using different client connections to the replica. When the\ntimeout value is reached, the issuing client returns an error message\nand stops waiting, but the STOP REPLICA | SLAVE instruction remains in\neffect. Once the replication threads are no longer busy, the STOP\nREPLICA | SLAVE statement is executed and the replica stops.\n\nSome CHANGE REPLICATION SOURCE TO | CHANGE MASTER TO statements are\nallowed while the replica is running, depending on the states of the\nreplication threads. However, using STOP REPLICA | SLAVE prior to\nexecuting a CHANGE REPLICATION SOURCE TO | CHANGE MASTER TO statement\nin such cases is still supported. See [HELP CHANGE REPLICATION SOURCE\nTO], [HELP CHANGE MASTER TO], and\nhttps://dev.mysql.com/doc/refman/8.0/en/replication-solutions-switch.ht\nml, for more information.\n\nThe optional FOR CHANNEL channel clause enables you to name which\nreplication channel the statement applies to. Providing a FOR CHANNEL\nchannel clause applies the STOP REPLICA | SLAVE statement to a specific\nreplication channel. If no channel is named and no extra channels\nexist, the statement applies to the default channel. If a STOP REPLICA\n| SLAVE statement does not name a channel when using multiple channels,\nthis statement stops the specified threads for all channels. This\nstatement cannot be used with the group_replication_recovery channel.\nSee https://dev.mysql.com/doc/refman/8.0/en/replication-channels.html\nfor more information.\n\nWhen the replica is multithreaded (slave_parallel_workers is a nonzero\nvalue), any gaps in the sequence of transactions executed from the\nrelay log are closed as part of stopping the worker threads. If the\nreplica is stopped unexpectedly (for example due to an error in a\nworker thread, or another thread issuing KILL) while a STOP REPLICA |\nSLAVE statement is executing, the sequence of executed transactions\nfrom the relay log may become inconsistent. See\nhttps://dev.mysql.com/doc/refman/8.0/en/replication-features-transactio\nn-inconsistencies.html, for more information.\n\nWhen the source is using the row-based binary logging format, you\nshould execute STOP REPLICA | SLAVE or STOP REPLICA | SLAVE SQL_THREAD\non the replica prior to shutting down the replica server if you are\nreplicating any tables that use a nontransactional storage engine. If\nthe current replication event group has modified one or more\nnontransactional tables, STOP REPLICA | SLAVE waits for up to 60\nseconds for the event group to complete, unless you issue a KILL QUERY\nor KILL CONNECTION statement for the replication SQL thread. If the\nevent group remains incomplete after the timeout, an error message is\nlogged.\n\nWhen the source is using the statement-based binary logging format,\nchanging the source while it has open temporary tables is potentially\nunsafe. This is one of the reasons why statement-based replication of\ntemporary tables is not recommended. You can find out whether there are\nany temporary tables on the replica by checking the value of\nSlave_open_temp_tables; when using statement-based replication, this\nvalue should be 0 before executing CHANGE REPLICATION SOURCE TO |\nCHANGE MASTER TO. If there are any temporary tables open on the\nreplica, issuing a CHANGE REPLICATION SOURCE TO | CHANGE MASTER TO\nstatement after issuing a STOP REPLICA | SLAVE causes an\nER_WARN_OPEN_TEMP_TABLES_MUST_BE_ZERO\n(https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference.h\ntml#error_er_warn_open_temp_tables_must_be_zero) warning.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/stop-replica.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/stop-replica.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (582,43,'STOP SLAVE','Syntax:\nSTOP {SLAVE | REPLICA} [thread_types] [channel_option]\n\nthread_types:\n    [thread_type [, thread_type] ... ]\n\nthread_type: IO_THREAD | SQL_THREAD\n\nchannel_option:\n    FOR CHANNEL channel\n\nStops the replication threads. From MySQL 8.0.22, STOP SLAVE is\ndeprecated and the alias STOP REPLICA should be used instead. The\nstatement works in the same way as before, only the terminology used\nfor the statement and its output has changed. Both versions of the\nstatement update the same status variables when used. Please see the\ndocumentation for STOP REPLICA for a description of the statement.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/stop-slave.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/stop-slave.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (583,44,'PREPARE','Syntax:\nPREPARE stmt_name FROM preparable_stmt\n\nThe PREPARE statement prepares a SQL statement and assigns it a name,\nstmt_name, by which to refer to the statement later. The prepared\nstatement is executed with EXECUTE and released with DEALLOCATE\nPREPARE. For examples, see\nhttps://dev.mysql.com/doc/refman/8.0/en/sql-prepared-statements.html.\n\nStatement names are not case-sensitive. preparable_stmt is either a\nstring literal or a user variable that contains the text of the SQL\nstatement. The text must represent a single statement, not multiple\nstatements. Within the statement, ? characters can be used as parameter\nmarkers to indicate where data values are to be bound to the query\nlater when you execute it. The ? characters should not be enclosed\nwithin quotation marks, even if you intend to bind them to string\nvalues. Parameter markers can be used only where data values should\nappear, not for SQL keywords, identifiers, and so forth.\n\nIf a prepared statement with the given name already exists, it is\ndeallocated implicitly before the new statement is prepared. This means\nthat if the new statement contains an error and cannot be prepared, an\nerror is returned and no statement with the given name exists.\n\nThe scope of a prepared statement is the session within which it is\ncreated, which as several implications:\n\no A prepared statement created in one session is not available to other\n  sessions.\n\no When a session ends, whether normally or abnormally, its prepared\n  statements no longer exist. If auto-reconnect is enabled, the client\n  is not notified that the connection was lost. For this reason,\n  clients may wish to disable auto-reconnect. See Automatic\n  Reconnection Control\n  (https://dev.mysql.com/doc/c-api/8.0/en/c-api-auto-reconnect.html).\n\no A prepared statement created within a stored program continues to\n  exist after the program finishes executing and can be executed\n  outside the program later.\n\no A statement prepared in stored program context cannot refer to stored\n  procedure or function parameters or local variables because they go\n  out of scope when the program ends and would be unavailable were the\n  statement to be executed later outside the program. As a workaround,\n  refer instead to user-defined variables, which also have session\n  scope; see\n  https://dev.mysql.com/doc/refman/8.0/en/user-variables.html.\n\nBeginning with MySQL 8.0.22, a parameter used in a prepared statement\nhas its type determined when the statement is first prepared, and\nretains this type whenever EXECUTE is invoked for this prepared\nstatement (unless the statement is reprepared, as explained later in\nthis section). Rules for determining a parameter\'s type are listed\nhere:\n\no A parameter which is an operand of a binary arithmetic operator has\n  the same data type as the other operand.\n\no If both operands of a binary arithmetic operator are parameters, the\n  type of the parameters is decided by the context of the operator.\n\no If a parameter is the operand of a unary arithmetic operator, the\n  parameter\'s type is decided by the context of the operator.\n\no If an arithmetic operator has no type-determining context, the\n  derived type for any parameters involved is DOUBLE PRECISION. This\n  can happen, for example, when the parameter is a top-level node in a\n  SELECT list, or when it is part of a comparison operator.\n\no A parameter which is an operand of a character string operator has\n  the same derived type as the aggregated type of the other operands.\n  If all operands of the operator are parameters, the derived type is\n  VARCHAR; its collation is determined by the value of\n  collation_connection.\n\no A parameter which is an operand of a temporal operator has type\n  DATETIME if the operator returns a DATETIME, TIME if the operator\n  returns a TIME, and DATE if the operator returns a DATE.\n\no A parameter which is an operand of a binary comparison operator has\n  the same derived type as the other operand of the comparison.\n\no A parameter that is an operand of a ternary comparison operator such\n  as BETWEEN has the same derived type as the aggregated type of the\n  other operands.\n\no If all operands of a comparison operator are parameters, the derived\n  type for each of them is VARCHAR, with collation determined by the\n  value of collation_connection.\n\no A parameter that is an output operand of any of CASE, COALESCE, IF,\n  IFNULL, or NULLIF has the same derived type as the aggregated type of\n  the operator\'s other output operands.\n\no If all output operands of any of CASE, COALESCE, IF, IFNULL, or\n  NULLIF are parameters, or they are all NULL, the type of the\n  parameter is decided by the context of the operator.\n\no If the parameter is an operand of any of of CASE, COALESCE(), IF, or\n  IFNULL, and has no type-determining context, the derived type for\n  each of the parameters involved is VARCHAR, and its collation is\n  determined by the value of collation_connection.\n\no A parameter which is the operand of a CAST() has the same type as\n  specified by the CAST().\n\no If a parameter is an immediate member of a SELECT list that is not\n  part of an INSERT statement, the derived type of the parameter is\n  VARCHAR, and its collation is determined by the value of\n  collation_connection.\n\no If a parameter is an immediate member of a SELECT list that is part\n  of an INSERT statement, the derived type of the parameter is the type\n  of the corresponding column into which the parameter is inserted.\n\no If a parameter is used as source for an assignment in a SET clause of\n  an UPDATE statement or in the ON DUPLICATE KEY UPDATE clause of an\n  INSERT statement, the derived type of the parameter is the type of\n  the corresponding column which is updated by the SET or ON DUPLICATE\n  KEY UPDATE clause.\n\no If a parameter is an argument of a function, the derived type depends\n  on the function\'s return type.\n\nFor some combinations of actual type and derived type, an automatic\nrepreparation of the statement is triggered, to ensure closer\ncompatibility with previous versions of MySQL. Repreparation does not\noccur if any of the following conditions are true:\n\no NULL is used as the actual parameter value.\n\no A parameter is an operand of a CAST(). (Instead, a cast to the\n  derived type is attempted, and an exception raised if the cast\n  fails.)\n\no A parameter is a string. (In this case, an implicit CAST(? AS\n  derived_type) is performed.)\n\no The derived type and actual type of the parameter are both INTEGER\n  and have the same sign.\n\no The parameter\'s derived type is DECIMAL and its actual type is either\n  DECIMAL or INTEGER.\n\no The derived type is DOUBLE and the actual type is any numeric type.\n\no Both the derived type and the actual type are string types.\n\no If the derived type is temporal and the actual type is temporal.\n  Exceptions: The derived type is TIME and the actual type is not TIME;\n  the derived type is DATE and the actual type is not DATE.\n\no The derived type is temporal and the actual type is numeric.\n\nFor cases other than those just listed, the statement is reprepared and\nthe actual parameter types are used instead of the derived parameter\ntypes.\n\nThese rules also apply to a user variable referenced in a prepared\nstatement.\n\nUsing a different data type for a given parameter or user variable\nwithin a prepared statement for executions of the statement subsequent\nto the first execution causes the statement to be reprepared. This is\nless efficient; it may also lead to the parameter\'s (or variable\'s)\nactual type to vary, and thus for results to be inconsistent, with\nsubsequent executions of the prepared statement. For these reasons, it\nis advisable to use the same data type for a given parameter when\nre-executing a prepared statement.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/prepare.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/prepare.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (584,44,'EXECUTE STATEMENT','Syntax:\nEXECUTE stmt_name\n    [USING @var_name [, @var_name] ...]\n\nAfter preparing a statement with PREPARE, you execute it with an\nEXECUTE statement that refers to the prepared statement name. If the\nprepared statement contains any parameter markers, you must supply a\nUSING clause that lists user variables containing the values to be\nbound to the parameters. Parameter values can be supplied only by user\nvariables, and the USING clause must name exactly as many variables as\nthe number of parameter markers in the statement.\n\nYou can execute a given prepared statement multiple times, passing\ndifferent variables to it or setting the variables to different values\nbefore each execution.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/execute.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/execute.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (585,44,'DEALLOCATE PREPARE','Syntax:\n{DEALLOCATE | DROP} PREPARE stmt_name\n\nTo deallocate a prepared statement produced with PREPARE, use a\nDEALLOCATE PREPARE statement that refers to the prepared statement\nname. Attempting to execute a prepared statement after deallocating it\nresults in an error. If too many prepared statements are created and\nnot deallocated by either the DEALLOCATE PREPARE statement or the end\nof the session, you might encounter the upper limit enforced by the\nmax_prepared_stmt_count system variable.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/deallocate-prepare.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/deallocate-prepare.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (586,44,'DROP PREPARE','Syntax:\n{DEALLOCATE | DROP} PREPARE stmt_name\n\nTo deallocate a prepared statement produced with PREPARE, use a\nDEALLOCATE PREPARE statement that refers to the prepared statement\nname. Attempting to execute a prepared statement after deallocating it\nresults in an error. If too many prepared statements are created and\nnot deallocated by either the DEALLOCATE PREPARE statement or the end\nof the session, you might encounter the upper limit enforced by the\nmax_prepared_stmt_count system variable.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/deallocate-prepare.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/deallocate-prepare.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (587,45,'BEGIN END','Syntax:\n[begin_label:] BEGIN\n    [statement_list]\nEND [end_label]\n\nBEGIN ... END syntax is used for writing compound statements, which can\nappear within stored programs (stored procedures and functions,\ntriggers, and events). A compound statement can contain multiple\nstatements, enclosed by the BEGIN and END keywords. statement_list\nrepresents a list of one or more statements, each terminated by a\nsemicolon (;) statement delimiter. The statement_list itself is\noptional, so the empty compound statement (BEGIN END) is legal.\n\nBEGIN ... END blocks can be nested.\n\nUse of multiple statements requires that a client is able to send\nstatement strings containing the ; statement delimiter. In the mysql\ncommand-line client, this is handled with the delimiter command.\nChanging the ; end-of-statement delimiter (for example, to //) permit ;\nto be used in a program body. For an example, see\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-programs-defining.html.\n\nA BEGIN ... END block can be labeled. See [HELP labels].\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/begin-end.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/begin-end.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (588,45,'LABELS','Syntax:\n[begin_label:] BEGIN\n    [statement_list]\nEND [end_label]\n\n[begin_label:] LOOP\n    statement_list\nEND LOOP [end_label]\n\n[begin_label:] REPEAT\n    statement_list\nUNTIL search_condition\nEND REPEAT [end_label]\n\n[begin_label:] WHILE search_condition DO\n    statement_list\nEND WHILE [end_label]\n\nLabels are permitted for BEGIN ... END blocks and for the LOOP, REPEAT,\nand WHILE statements. Label use for those statements follows these\nrules:\n\no begin_label must be followed by a colon.\n\no begin_label can be given without end_label. If end_label is present,\n  it must be the same as begin_label.\n\no end_label cannot be given without begin_label.\n\no Labels at the same nesting level must be distinct.\n\no Labels can be up to 16 characters long.\n\nTo refer to a label within the labeled construct, use an ITERATE or\nLEAVE statement. The following example uses those statements to\ncontinue iterating or terminate the loop:\n\nCREATE PROCEDURE doiterate(p1 INT)\nBEGIN\n  label1: LOOP\n    SET p1 = p1 + 1;\n    IF p1 < 10 THEN ITERATE label1; END IF;\n    LEAVE label1;\n  END LOOP label1;\nEND;\n\nThe scope of a block label does not include the code for handlers\ndeclared within the block. For details, see [HELP DECLARE HANDLER].\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/statement-labels.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/statement-labels.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (589,45,'DECLARE VARIABLE','Syntax:\nDECLARE var_name [, var_name] ... type [DEFAULT value]\n\nThis statement declares local variables within stored programs. To\nprovide a default value for a variable, include a DEFAULT clause. The\nvalue can be specified as an expression; it need not be a constant. If\nthe DEFAULT clause is missing, the initial value is NULL.\n\nLocal variables are treated like stored routine parameters with respect\nto data type and overflow checking. See [HELP CREATE PROCEDURE].\n\nVariable declarations must appear before cursor or handler\ndeclarations.\n\nLocal variable names are not case-sensitive. Permissible characters and\nquoting rules are the same as for other identifiers, as described in\nhttps://dev.mysql.com/doc/refman/8.0/en/identifiers.html.\n\nThe scope of a local variable is the BEGIN ... END block within which\nit is declared. The variable can be referred to in blocks nested within\nthe declaring block, except those blocks that declare a variable with\nthe same name.\n\nFor examples of variable declarations, see\nhttps://dev.mysql.com/doc/refman/8.0/en/local-variable-scope.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/declare-local-variable.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/declare-local-variable.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (590,45,'CASE STATEMENT','Syntax:\nCASE case_value\n    WHEN when_value THEN statement_list\n    [WHEN when_value THEN statement_list] ...\n    [ELSE statement_list]\nEND CASE\n\nOr:\n\nCASE\n    WHEN search_condition THEN statement_list\n    [WHEN search_condition THEN statement_list] ...\n    [ELSE statement_list]\nEND CASE\n\nThe CASE statement for stored programs implements a complex conditional\nconstruct.\n\n*Note*:\n\nThere is also a CASE operator, which differs from the CASE statement\ndescribed here. See\nhttps://dev.mysql.com/doc/refman/8.0/en/flow-control-functions.html.\nThe CASE statement cannot have an ELSE NULL clause, and it is\nterminated with END CASE instead of END.\n\nFor the first syntax, case_value is an expression. This value is\ncompared to the when_value expression in each WHEN clause until one of\nthem is equal. When an equal when_value is found, the corresponding\nTHEN clause statement_list executes. If no when_value is equal, the\nELSE clause statement_list executes, if there is one.\n\nThis syntax cannot be used to test for equality with NULL because NULL\n= NULL is false. See\nhttps://dev.mysql.com/doc/refman/8.0/en/working-with-null.html.\n\nFor the second syntax, each WHEN clause search_condition expression is\nevaluated until one is true, at which point its corresponding THEN\nclause statement_list executes. If no search_condition is equal, the\nELSE clause statement_list executes, if there is one.\n\nIf no when_value or search_condition matches the value tested and the\nCASE statement contains no ELSE clause, a Case not found for CASE\nstatement error results.\n\nEach statement_list consists of one or more SQL statements; an empty\nstatement_list is not permitted.\n\nTo handle situations where no value is matched by any WHEN clause, use\nan ELSE containing an empty BEGIN ... END block, as shown in this\nexample. (The indentation used here in the ELSE clause is for purposes\nof clarity only, and is not otherwise significant.)\n\nDELIMITER |\n\nCREATE PROCEDURE p()\n  BEGIN\n    DECLARE v INT DEFAULT 1;\n\n    CASE v\n      WHEN 2 THEN SELECT v;\n      WHEN 3 THEN SELECT 0;\n      ELSE\n        BEGIN\n        END;\n    END CASE;\n  END;\n  |\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/case.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/case.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (591,45,'IF STATEMENT','Syntax:\nIF search_condition THEN statement_list\n    [ELSEIF search_condition THEN statement_list] ...\n    [ELSE statement_list]\nEND IF\n\nThe IF statement for stored programs implements a basic conditional\nconstruct.\n\n*Note*:\n\nThere is also an IF() function, which differs from the IF statement\ndescribed here. See\nhttps://dev.mysql.com/doc/refman/8.0/en/flow-control-functions.html.\nThe IF statement can have THEN, ELSE, and ELSEIF clauses, and it is\nterminated with END IF.\n\nIf a given search_condition evaluates to true, the corresponding THEN\nor ELSEIF clause statement_list executes. If no search_condition\nmatches, the ELSE clause statement_list executes.\n\nEach statement_list consists of one or more SQL statements; an empty\nstatement_list is not permitted.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/if.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/if.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (592,45,'ITERATE','Syntax:\nITERATE label\n\nITERATE can appear only within LOOP, REPEAT, and WHILE statements.\nITERATE means "start the loop again."\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/iterate.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/iterate.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (593,45,'LEAVE','Syntax:\nLEAVE label\n\nThis statement is used to exit the flow control construct that has the\ngiven label. If the label is for the outermost stored program block,\nLEAVE exits the program.\n\nLEAVE can be used within BEGIN ... END or loop constructs (LOOP,\nREPEAT, WHILE).\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/leave.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/leave.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (594,45,'LOOP','Syntax:\n[begin_label:] LOOP\n    statement_list\nEND LOOP [end_label]\n\nLOOP implements a simple loop construct, enabling repeated execution of\nthe statement list, which consists of one or more statements, each\nterminated by a semicolon (;) statement delimiter. The statements\nwithin the loop are repeated until the loop is terminated. Usually,\nthis is accomplished with a LEAVE statement. Within a stored function,\nRETURN can also be used, which exits the function entirely.\n\nNeglecting to include a loop-termination statement results in an\ninfinite loop.\n\nA LOOP statement can be labeled. For the rules regarding label use, see\n[HELP labels].\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/loop.html\n\n','CREATE PROCEDURE doiterate(p1 INT)\nBEGIN\n  label1: LOOP\n    SET p1 = p1 + 1;\n    IF p1 < 10 THEN\n      ITERATE label1;\n    END IF;\n    LEAVE label1;\n  END LOOP label1;\n  SET @x = p1;\nEND;\n','https://dev.mysql.com/doc/refman/8.0/en/loop.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (595,45,'REPEAT LOOP','Syntax:\n[begin_label:] REPEAT\n    statement_list\nUNTIL search_condition\nEND REPEAT [end_label]\n\nThe statement list within a REPEAT statement is repeated until the\nsearch_condition expression is true. Thus, a REPEAT always enters the\nloop at least once. statement_list consists of one or more statements,\neach terminated by a semicolon (;) statement delimiter.\n\nA REPEAT statement can be labeled. For the rules regarding label use,\nsee [HELP labels].\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/repeat.html\n\n','mysql> delimiter //\n\nmysql> CREATE PROCEDURE dorepeat(p1 INT)\n       BEGIN\n         SET @x = 0;\n         REPEAT\n           SET @x = @x + 1;\n         UNTIL @x > p1 END REPEAT;\n       END\n       //\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> CALL dorepeat(1000)//\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> SELECT @x//\n+------+\n| @x   |\n+------+\n| 1001 |\n+------+\n1 row in set (0.00 sec)\n','https://dev.mysql.com/doc/refman/8.0/en/repeat.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (596,45,'RETURN','Syntax:\nRETURN expr\n\nThe RETURN statement terminates execution of a stored function and\nreturns the value expr to the function caller. There must be at least\none RETURN statement in a stored function. There may be more than one\nif the function has multiple exit points.\n\nThis statement is not used in stored procedures, triggers, or events.\nThe LEAVE statement can be used to exit a stored program of those\ntypes.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/return.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/return.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (597,45,'WHILE','Syntax:\n[begin_label:] WHILE search_condition DO\n    statement_list\nEND WHILE [end_label]\n\nThe statement list within a WHILE statement is repeated as long as the\nsearch_condition expression is true. statement_list consists of one or\nmore SQL statements, each terminated by a semicolon (;) statement\ndelimiter.\n\nA WHILE statement can be labeled. For the rules regarding label use,\nsee [HELP labels].\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/while.html\n\n','CREATE PROCEDURE dowhile()\nBEGIN\n  DECLARE v1 INT DEFAULT 5;\n\n  WHILE v1 > 0 DO\n    ...\n    SET v1 = v1 - 1;\n  END WHILE;\nEND;\n','https://dev.mysql.com/doc/refman/8.0/en/while.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (598,45,'CLOSE','Syntax:\nCLOSE cursor_name\n\nThis statement closes a previously opened cursor. For an example, see\nhttps://dev.mysql.com/doc/refman/8.0/en/cursors.html.\n\nAn error occurs if the cursor is not open.\n\nIf not closed explicitly, a cursor is closed at the end of the BEGIN\n... END block in which it was declared.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/close.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/close.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (599,45,'DECLARE CURSOR','Syntax:\nDECLARE cursor_name CURSOR FOR select_statement\n\nThis statement declares a cursor and associates it with a SELECT\nstatement that retrieves the rows to be traversed by the cursor. To\nfetch the rows later, use a FETCH statement. The number of columns\nretrieved by the SELECT statement must match the number of output\nvariables specified in the FETCH statement.\n\nThe SELECT statement cannot have an INTO clause.\n\nCursor declarations must appear before handler declarations and after\nvariable and condition declarations.\n\nA stored program may contain multiple cursor declarations, but each\ncursor declared in a given block must have a unique name. For an\nexample, see https://dev.mysql.com/doc/refman/8.0/en/cursors.html.\n\nFor information available through SHOW statements, it is possible in\nmany cases to obtain equivalent information by using a cursor with an\nINFORMATION_SCHEMA table.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/declare-cursor.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/declare-cursor.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (600,45,'FETCH','Syntax:\nFETCH [[NEXT] FROM] cursor_name INTO var_name [, var_name] ...\n\nThis statement fetches the next row for the SELECT statement associated\nwith the specified cursor (which must be open), and advances the cursor\npointer. If a row exists, the fetched columns are stored in the named\nvariables. The number of columns retrieved by the SELECT statement must\nmatch the number of output variables specified in the FETCH statement.\n\nIf no more rows are available, a No Data condition occurs with SQLSTATE\nvalue \'02000\'. To detect this condition, you can set up a handler for\nit (or for a NOT FOUND condition). For an example, see\nhttps://dev.mysql.com/doc/refman/8.0/en/cursors.html.\n\nBe aware that another operation, such as a SELECT or another FETCH, may\nalso cause the handler to execute by raising the same condition. If it\nis necessary to distinguish which operation raised the condition, place\nthe operation within its own BEGIN ... END block so that it can be\nassociated with its own handler.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/fetch.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/fetch.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (601,45,'OPEN','Syntax:\nOPEN cursor_name\n\nThis statement opens a previously declared cursor. For an example, see\nhttps://dev.mysql.com/doc/refman/8.0/en/cursors.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/open.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/open.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (602,45,'DECLARE CONDITION','Syntax:\nDECLARE condition_name CONDITION FOR condition_value\n\ncondition_value: {\n    mysql_error_code\n  | SQLSTATE [VALUE] sqlstate_value\n}\n\nThe DECLARE ... CONDITION statement declares a named error condition,\nassociating a name with a condition that needs specific handling. The\nname can be referred to in a subsequent DECLARE ... HANDLER statement\n(see [HELP DECLARE HANDLER]).\n\nCondition declarations must appear before cursor or handler\ndeclarations.\n\nThe condition_value for DECLARE ... CONDITION indicates the specific\ncondition or class of conditions to associate with the condition name.\nIt can take the following forms:\n\no mysql_error_code: An integer literal indicating a MySQL error code.\n\n  Do not use MySQL error code 0 because that indicates success rather\n  than an error condition. For a list of MySQL error codes, see Server\n  Error Message Reference\n  (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference\n  .html).\n\no SQLSTATE [VALUE] sqlstate_value: A 5-character string literal\n  indicating an SQLSTATE value.\n\n  Do not use SQLSTATE values that begin with \'00\' because those\n  indicate success rather than an error condition. For a list of\n  SQLSTATE values, see Server Error Message Reference\n  (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference\n  .html).\n\nCondition names referred to in SIGNAL or use RESIGNAL statements must\nbe associated with SQLSTATE values, not MySQL error codes.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/declare-condition.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/declare-condition.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (603,45,'DECLARE HANDLER','Syntax:\nDECLARE handler_action HANDLER\n    FOR condition_value [, condition_value] ...\n    statement\n\nhandler_action: {\n    CONTINUE\n  | EXIT\n  | UNDO\n}\n\ncondition_value: {\n    mysql_error_code\n  | SQLSTATE [VALUE] sqlstate_value\n  | condition_name\n  | SQLWARNING\n  | NOT FOUND\n  | SQLEXCEPTION\n}\n\nThe DECLARE ... HANDLER statement specifies a handler that deals with\none or more conditions. If one of these conditions occurs, the\nspecified statement executes. statement can be a simple statement such\nas SET var_name = value, or a compound statement written using BEGIN\nand END (see [HELP BEGIN END]).\n\nHandler declarations must appear after variable or condition\ndeclarations.\n\nThe handler_action value indicates what action the handler takes after\nexecution of the handler statement:\n\no CONTINUE: Execution of the current program continues.\n\no EXIT: Execution terminates for the BEGIN ... END compound statement\n  in which the handler is declared. This is true even if the condition\n  occurs in an inner block.\n\no UNDO: Not supported.\n\nThe condition_value for DECLARE ... HANDLER indicates the specific\ncondition or class of conditions that activates the handler. It can\ntake the following forms:\n\no mysql_error_code: An integer literal indicating a MySQL error code,\n  such as 1051 to specify "unknown table":\n\nDECLARE CONTINUE HANDLER FOR 1051\n  BEGIN\n    -- body of handler\n  END;\n\n  Do not use MySQL error code 0 because that indicates success rather\n  than an error condition. For a list of MySQL error codes, see Server\n  Error Message Reference\n  (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference\n  .html).\n\no SQLSTATE [VALUE] sqlstate_value: A 5-character string literal\n  indicating an SQLSTATE value, such as \'42S01\' to specify "unknown\n  table":\n\nDECLARE CONTINUE HANDLER FOR SQLSTATE \'42S02\'\n  BEGIN\n    -- body of handler\n  END;\n\n  Do not use SQLSTATE values that begin with \'00\' because those\n  indicate success rather than an error condition. For a list of\n  SQLSTATE values, see Server Error Message Reference\n  (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference\n  .html).\n\no condition_name: A condition name previously specified with DECLARE\n  ... CONDITION. A condition name can be associated with a MySQL error\n  code or SQLSTATE value. See [HELP DECLARE CONDITION].\n\no SQLWARNING: Shorthand for the class of SQLSTATE values that begin\n  with \'01\'.\n\nDECLARE CONTINUE HANDLER FOR SQLWARNING\n  BEGIN\n    -- body of handler\n  END;\n\no NOT FOUND: Shorthand for the class of SQLSTATE values that begin with\n  \'02\'. This is relevant within the context of cursors and is used to\n  control what happens when a cursor reaches the end of a data set. If\n  no more rows are available, a No Data condition occurs with SQLSTATE\n  value \'02000\'. To detect this condition, you can set up a handler for\n  it or for a NOT FOUND condition.\n\nDECLARE CONTINUE HANDLER FOR NOT FOUND\n  BEGIN\n    -- body of handler\n  END;\n\n  For another example, see\n  https://dev.mysql.com/doc/refman/8.0/en/cursors.html. The NOT FOUND\n  condition also occurs for SELECT ... INTO var_list statements that\n  retrieve no rows.\n\no SQLEXCEPTION: Shorthand for the class of SQLSTATE values that do not\n  begin with \'00\', \'01\', or \'02\'.\n\nDECLARE CONTINUE HANDLER FOR SQLEXCEPTION\n  BEGIN\n    -- body of handler\n  END;\n\nFor information about how the server chooses handlers when a condition\noccurs, see https://dev.mysql.com/doc/refman/8.0/en/handler-scope.html.\n\nIf a condition occurs for which no handler has been declared, the\naction taken depends on the condition class:\n\no For SQLEXCEPTION conditions, the stored program terminates at the\n  statement that raised the condition, as if there were an EXIT\n  handler. If the program was called by another stored program, the\n  calling program handles the condition using the handler selection\n  rules applied to its own handlers.\n\no For SQLWARNING conditions, the program continues executing, as if\n  there were a CONTINUE handler.\n\no For NOT FOUND conditions, if the condition was raised normally, the\n  action is CONTINUE. If it was raised by SIGNAL or RESIGNAL, the\n  action is EXIT.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/declare-handler.html\n\n','mysql> CREATE TABLE test.t (s1 INT, PRIMARY KEY (s1));\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> delimiter //\n\nmysql> CREATE PROCEDURE handlerdemo ()\n       BEGIN\n         DECLARE CONTINUE HANDLER FOR SQLSTATE \'23000\' SET @x2 = 1;\n         SET @x = 1;\n         INSERT INTO test.t VALUES (1);\n         SET @x = 2;\n         INSERT INTO test.t VALUES (1);\n         SET @x = 3;\n       END;\n       //\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> CALL handlerdemo()//\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> SELECT @x//\n    +------+\n    | @x   |\n    +------+\n    | 3    |\n    +------+\n    1 row in set (0.00 sec)\n','https://dev.mysql.com/doc/refman/8.0/en/declare-handler.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (604,45,'GET DIAGNOSTICS','Syntax:\nGET [CURRENT | STACKED] DIAGNOSTICS {\n    statement_information_item\n    [, statement_information_item] ...\n  | CONDITION condition_number\n    condition_information_item\n    [, condition_information_item] ...\n}\n\nstatement_information_item:\n    target = statement_information_item_name\n\ncondition_information_item:\n    target = condition_information_item_name\n\nstatement_information_item_name: {\n    NUMBER\n  | ROW_COUNT\n}\n\ncondition_information_item_name: {\n    CLASS_ORIGIN\n  | SUBCLASS_ORIGIN\n  | RETURNED_SQLSTATE\n  | MESSAGE_TEXT\n  | MYSQL_ERRNO\n  | CONSTRAINT_CATALOG\n  | CONSTRAINT_SCHEMA\n  | CONSTRAINT_NAME\n  | CATALOG_NAME\n  | SCHEMA_NAME\n  | TABLE_NAME\n  | COLUMN_NAME\n  | CURSOR_NAME\n}\n\ncondition_number, target:\n    (see following discussion)\n\nSQL statements produce diagnostic information that populates the\ndiagnostics area. The GET DIAGNOSTICS statement enables applications to\ninspect this information. (You can also use SHOW WARNINGS or SHOW\nERRORS to see conditions or errors.)\n\nNo special privileges are required to execute GET DIAGNOSTICS.\n\nThe keyword CURRENT means to retrieve information from the current\ndiagnostics area. The keyword STACKED means to retrieve information\nfrom the second diagnostics area, which is available only if the\ncurrent context is a condition handler. If neither keyword is given,\nthe default is to use the current diagnostics area.\n\nThe GET DIAGNOSTICS statement is typically used in a handler within a\nstored program. It is a MySQL extension that GET [CURRENT] DIAGNOSTICS\nis permitted outside handler context to check the execution of any SQL\nstatement. For example, if you invoke the mysql client program, you can\nenter these statements at the prompt:\n\nmysql> DROP TABLE test.no_such_table;\nERROR 1051 (42S02): Unknown table \'test.no_such_table\'\nmysql> GET DIAGNOSTICS CONDITION 1\n         @p1 = RETURNED_SQLSTATE, @p2 = MESSAGE_TEXT;\nmysql> SELECT @p1, @p2;\n+-------+------------------------------------+\n| @p1   | @p2                                |\n+-------+------------------------------------+\n| 42S02 | Unknown table \'test.no_such_table\' |\n+-------+------------------------------------+\n\nThis extension applies only to the current diagnostics area. It does\nnot apply to the second diagnostics area because GET STACKED\nDIAGNOSTICS is permitted only if the current context is a condition\nhandler. If that is not the case, a GET STACKED DIAGNOSTICS when\nhandler not active error occurs.\n\nFor a description of the diagnostics area, see\nhttps://dev.mysql.com/doc/refman/8.0/en/diagnostics-area.html. Briefly,\nit contains two kinds of information:\n\no Statement information, such as the number of conditions that occurred\n  or the affected-rows count.\n\no Condition information, such as the error code and message. If a\n  statement raises multiple conditions, this part of the diagnostics\n  area has a condition area for each one. If a statement raises no\n  conditions, this part of the diagnostics area is empty.\n\nFor a statement that produces three conditions, the diagnostics area\ncontains statement and condition information like this:\n\nStatement information:\n  row count\n  ... other statement information items ...\nCondition area list:\n  Condition area 1:\n    error code for condition 1\n    error message for condition 1\n    ... other condition information items ...\n  Condition area 2:\n    error code for condition 2:\n    error message for condition 2\n    ... other condition information items ...\n  Condition area 3:\n    error code for condition 3\n    error message for condition 3\n    ... other condition information items ...\n\nGET DIAGNOSTICS can obtain either statement or condition information,\nbut not both in the same statement:\n\no To obtain statement information, retrieve the desired statement items\n  into target variables. This instance of GET DIAGNOSTICS assigns the\n  number of available conditions and the rows-affected count to the\n  user variables @p1 and @p2:\n\nGET DIAGNOSTICS @p1 = NUMBER, @p2 = ROW_COUNT;\n\no To obtain condition information, specify the condition number and\n  retrieve the desired condition items into target variables. This\n  instance of GET DIAGNOSTICS assigns the SQLSTATE value and error\n  message to the user variables @p3 and @p4:\n\nGET DIAGNOSTICS CONDITION 1\n  @p3 = RETURNED_SQLSTATE, @p4 = MESSAGE_TEXT;\n\nThe retrieval list specifies one or more target = item_name\nassignments, separated by commas. Each assignment names a target\nvariable and either a statement_information_item_name or\ncondition_information_item_name designator, depending on whether the\nstatement retrieves statement or condition information.\n\nValid target designators for storing item information can be stored\nprocedure or function parameters, stored program local variables\ndeclared with DECLARE, or user-defined variables.\n\nValid condition_number designators can be stored procedure or function\nparameters, stored program local variables declared with DECLARE,\nuser-defined variables, system variables, or literals. A character\nliteral may include a _charset introducer. A warning occurs if the\ncondition number is not in the range from 1 to the number of condition\nareas that have information. In this case, the warning is added to the\ndiagnostics area without clearing it.\n\nWhen a condition occurs, MySQL does not populate all condition items\nrecognized by GET DIAGNOSTICS. For example:\n\nmysql> GET DIAGNOSTICS CONDITION 1\n         @p5 = SCHEMA_NAME, @p6 = TABLE_NAME;\nmysql> SELECT @p5, @p6;\n+------+------+\n| @p5  | @p6  |\n+------+------+\n|      |      |\n+------+------+\n\nIn standard SQL, if there are multiple conditions, the first condition\nrelates to the SQLSTATE value returned for the previous SQL statement.\nIn MySQL, this is not guaranteed. To get the main error, you cannot do\nthis:\n\nGET DIAGNOSTICS CONDITION 1 @errno = MYSQL_ERRNO;\n\nInstead, retrieve the condition count first, then use it to specify\nwhich condition number to inspect:\n\nGET DIAGNOSTICS @cno = NUMBER;\nGET DIAGNOSTICS CONDITION @cno @errno = MYSQL_ERRNO;\n\nFor information about permissible statement and condition information\nitems, and which ones are populated when a condition occurs, see\nhttps://dev.mysql.com/doc/refman/8.0/en/diagnostics-area.html#diagnosti\ncs-area-information-items.\n\nHere is an example that uses GET DIAGNOSTICS and an exception handler\nin stored procedure context to assess the outcome of an insert\noperation. If the insert was successful, the procedure uses GET\nDIAGNOSTICS to get the rows-affected count. This shows that you can use\nGET DIAGNOSTICS multiple times to retrieve information about a\nstatement as long as the current diagnostics area has not been cleared.\n\nCREATE PROCEDURE do_insert(value INT)\nBEGIN\n  -- Declare variables to hold diagnostics area information\n  DECLARE code CHAR(5) DEFAULT \'00000\';\n  DECLARE msg TEXT;\n  DECLARE nrows INT;\n  DECLARE result TEXT;\n  -- Declare exception handler for failed insert\n  DECLARE CONTINUE HANDLER FOR SQLEXCEPTION\n    BEGIN\n      GET DIAGNOSTICS CONDITION 1\n        code = RETURNED_SQLSTATE, msg = MESSAGE_TEXT;\n    END;\n\n  -- Perform the insert\n  INSERT INTO t1 (int_col) VALUES(value);\n  -- Check whether the insert was successful\n  IF code = \'00000\' THEN\n    GET DIAGNOSTICS nrows = ROW_COUNT;\n    SET result = CONCAT(\'insert succeeded, row count = \',nrows);\n  ELSE\n    SET result = CONCAT(\'insert failed, error = \',code,\', message = \',msg);\n  END IF;\n  -- Say what happened\n  SELECT result;\nEND;\n\nSuppose that t1.int_col is an integer column that is declared as NOT\nNULL. The procedure produces these results when invoked to insert\nnon-NULL and NULL values, respectively:\n\nmysql> CALL do_insert(1);\n+---------------------------------+\n| result                          |\n+---------------------------------+\n| insert succeeded, row count = 1 |\n+---------------------------------+\n\nmysql> CALL do_insert(NULL);\n+-------------------------------------------------------------------------+\n| result                                                                  |\n+-------------------------------------------------------------------------+\n| insert failed, error = 23000, message = Column \'int_col\' cannot be null |\n+-------------------------------------------------------------------------+\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/get-diagnostics.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/get-diagnostics.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (605,45,'RESIGNAL','Syntax:\nRESIGNAL [condition_value]\n    [SET signal_information_item\n    [, signal_information_item] ...]\n\ncondition_value: {\n    SQLSTATE [VALUE] sqlstate_value\n  | condition_name\n}\n\nsignal_information_item:\n    condition_information_item_name = simple_value_specification\n\ncondition_information_item_name: {\n    CLASS_ORIGIN\n  | SUBCLASS_ORIGIN\n  | MESSAGE_TEXT\n  | MYSQL_ERRNO\n  | CONSTRAINT_CATALOG\n  | CONSTRAINT_SCHEMA\n  | CONSTRAINT_NAME\n  | CATALOG_NAME\n  | SCHEMA_NAME\n  | TABLE_NAME\n  | COLUMN_NAME\n  | CURSOR_NAME\n}\n\ncondition_name, simple_value_specification:\n    (see following discussion)\n\nRESIGNAL passes on the error condition information that is available\nduring execution of a condition handler within a compound statement\ninside a stored procedure or function, trigger, or event. RESIGNAL may\nchange some or all information before passing it on. RESIGNAL is\nrelated to SIGNAL, but instead of originating a condition as SIGNAL\ndoes, RESIGNAL relays existing condition information, possibly after\nmodifying it.\n\nRESIGNAL makes it possible to both handle an error and return the error\ninformation. Otherwise, by executing an SQL statement within the\nhandler, information that caused the handler\'s activation is destroyed.\nRESIGNAL also can make some procedures shorter if a given handler can\nhandle part of a situation, then pass the condition "up the line" to\nanother handler.\n\nNo privileges are required to execute the RESIGNAL statement.\n\nAll forms of RESIGNAL require that the current context be a condition\nhandler. Otherwise, RESIGNAL is illegal and a RESIGNAL when handler not\nactive error occurs.\n\nTo retrieve information from the diagnostics area, use the GET\nDIAGNOSTICS statement (see [HELP GET DIAGNOSTICS]). For information\nabout the diagnostics area, see\nhttps://dev.mysql.com/doc/refman/8.0/en/diagnostics-area.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/resignal.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/resignal.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (606,45,'SIGNAL','Syntax:\nSIGNAL condition_value\n    [SET signal_information_item\n    [, signal_information_item] ...]\n\ncondition_value: {\n    SQLSTATE [VALUE] sqlstate_value\n  | condition_name\n}\n\nsignal_information_item:\n    condition_information_item_name = simple_value_specification\n\ncondition_information_item_name: {\n    CLASS_ORIGIN\n  | SUBCLASS_ORIGIN\n  | MESSAGE_TEXT\n  | MYSQL_ERRNO\n  | CONSTRAINT_CATALOG\n  | CONSTRAINT_SCHEMA\n  | CONSTRAINT_NAME\n  | CATALOG_NAME\n  | SCHEMA_NAME\n  | TABLE_NAME\n  | COLUMN_NAME\n  | CURSOR_NAME\n}\n\ncondition_name, simple_value_specification:\n    (see following discussion)\n\nSIGNAL is the way to "return" an error. SIGNAL provides error\ninformation to a handler, to an outer portion of the application, or to\nthe client. Also, it provides control over the error\'s characteristics\n(error number, SQLSTATE value, message). Without SIGNAL, it is\nnecessary to resort to workarounds such as deliberately referring to a\nnonexistent table to cause a routine to return an error.\n\nNo privileges are required to execute the SIGNAL statement.\n\nTo retrieve information from the diagnostics area, use the GET\nDIAGNOSTICS statement (see [HELP GET DIAGNOSTICS]). For information\nabout the diagnostics area, see\nhttps://dev.mysql.com/doc/refman/8.0/en/diagnostics-area.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/signal.html\n\n','CREATE PROCEDURE p (pval INT)\nBEGIN\n  DECLARE specialty CONDITION FOR SQLSTATE \'45000\';\n  IF pval = 0 THEN\n    SIGNAL SQLSTATE \'01000\';\n  ELSEIF pval = 1 THEN\n    SIGNAL SQLSTATE \'45000\'\n      SET MESSAGE_TEXT = \'An error occurred\';\n  ELSEIF pval = 2 THEN\n    SIGNAL specialty\n      SET MESSAGE_TEXT = \'An error occurred\';\n  ELSE\n    SIGNAL SQLSTATE \'01000\'\n      SET MESSAGE_TEXT = \'A warning occurred\', MYSQL_ERRNO = 1000;\n    SIGNAL SQLSTATE \'45000\'\n      SET MESSAGE_TEXT = \'An error occurred\', MYSQL_ERRNO = 1001;\n  END IF;\nEND;\n','https://dev.mysql.com/doc/refman/8.0/en/signal.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (607,46,'ALTER USER','Syntax:\nALTER USER [IF EXISTS]\n    user [auth_option] [, user [auth_option]] ...\n    [REQUIRE {NONE | tls_option [[AND] tls_option] ...}]\n    [WITH resource_option [resource_option] ...]\n    [password_option | lock_option] ...\n    [COMMENT \'comment_string\' | ATTRIBUTE \'json_object\']\n\nALTER USER [IF EXISTS] USER() user_func_auth_option\n\nALTER USER [IF EXISTS]\n    user DEFAULT ROLE\n    {NONE | ALL | role [, role ] ...}\n\nuser:\n    (see )\n\nauth_option: {\n    IDENTIFIED BY \'auth_string\'\n        [REPLACE \'current_auth_string\']\n        [RETAIN CURRENT PASSWORD]\n  | IDENTIFIED BY RANDOM PASSWORD\n        [REPLACE \'current_auth_string\']\n        [RETAIN CURRENT PASSWORD]\n  | IDENTIFIED WITH auth_plugin\n  | IDENTIFIED WITH auth_plugin BY \'auth_string\'\n        [REPLACE \'current_auth_string\']\n        [RETAIN CURRENT PASSWORD]\n  | IDENTIFIED WITH auth_plugin BY RANDOM PASSWORD\n        [REPLACE \'current_auth_string\']\n        [RETAIN CURRENT PASSWORD]\n  | IDENTIFIED WITH auth_plugin AS \'auth_string\'\n  | DISCARD OLD PASSWORD\n}\n\nuser_func_auth_option: {\n    IDENTIFIED BY \'auth_string\'\n        [REPLACE \'current_auth_string\']\n        [RETAIN CURRENT PASSWORD]\n  | DISCARD OLD PASSWORD\n}\n\ntls_option: {\n   SSL\n | X509\n | CIPHER \'cipher\'\n | ISSUER \'issuer\'\n | SUBJECT \'subject\'\n}\n\nresource_option: {\n    MAX_QUERIES_PER_HOUR count\n  | MAX_UPDATES_PER_HOUR count\n  | MAX_CONNECTIONS_PER_HOUR count\n  | MAX_USER_CONNECTIONS count\n}\n\npassword_option: {\n    PASSWORD EXPIRE [DEFAULT | NEVER | INTERVAL N DAY]\n  | PASSWORD HISTORY {DEFAULT | N}\n  | PASSWORD REUSE INTERVAL {DEFAULT | N DAY}\n  | PASSWORD REQUIRE CURRENT [DEFAULT | OPTIONAL]\n  | FAILED_LOGIN_ATTEMPTS N\n  | PASSWORD_LOCK_TIME {N | UNBOUNDED}\n}\n\nlock_option: {\n    ACCOUNT LOCK\n  | ACCOUNT UNLOCK\n}\n\nThe ALTER USER statement modifies MySQL accounts. It enables\nauthentication, role, SSL/TLS, resource-limit, and password-management\nproperties to be modified for existing accounts. It can also be used to\nlock and unlock accounts.\n\nIn most cases, ALTER USER requires the global CREATE USER privilege, or\nthe UPDATE privilege for the mysql system schema. The exceptions are:\n\no Any client who connects to the server using a nonanonymous account\n  can change the password for that account. (In particular, you can\n  change your own password.) To see which account the server\n  authenticated you as, invoke the CURRENT_USER() function:\n\nSELECT CURRENT_USER();\n\no For DEFAULT ROLE syntax, ALTER USER requires these privileges:\n\n  o Setting the default roles for another user requires the global\n    CREATE USER privilege, or the UPDATE privilege for the\n    mysql.default_roles system table.\n\n  o Setting the default roles for yourself requires no special\n    privileges, as long as the roles you want as the default have been\n    granted to you.\n\no Statements that modify secondary passwords require these privileges:\n\n  o The APPLICATION_PASSWORD_ADMIN privilege is required to use the\n    RETAIN CURRENT PASSWORD or DISCARD OLD PASSWORD clause for ALTER\n    USER statements that apply to your own account. The privilege is\n    required to manipulate your own secondary password because most\n    users require only one password.\n\n  o If an account is to be permitted to manipulate secondary passwords\n    for all accounts, it requires the CREATE USER privilege rather than\n    APPLICATION_PASSWORD_ADMIN.\n\nWhen the read_only system variable is enabled, ALTER USER additionally\nrequires the CONNECTION_ADMIN privilege (or the deprecated SUPER\nprivilege).\n\nBy default, an error occurs if you try to modify a user that does not\nexist. If the IF EXISTS clause is given, the statement produces a\nwarning for each named user that does not exist, rather than an error.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/alter-user.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/alter-user.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (608,46,'CREATE ROLE','Syntax:\nCREATE ROLE [IF NOT EXISTS] role [, role ] ...\n\nCREATE ROLE creates one or more roles, which are named collections of\nprivileges. To use this statement, you must have the global CREATE ROLE\nor CREATE USER privilege. When the read_only system variable is\nenabled, CREATE ROLE additionally requires the CONNECTION_ADMIN\nprivilege (or the deprecated SUPER privilege).\n\nA role when created is locked, has no password, and is assigned the\ndefault authentication plugin. (These role attributes can be changed\nlater with the ALTER USER statement, by users who have the global\nCREATE USER privilege.)\n\nCREATE ROLE either succeeds for all named roles or rolls back and has\nno effect if any error occurs. By default, an error occurs if you try\nto create a role that already exists. If the IF NOT EXISTS clause is\ngiven, the statement produces a warning for each named role that\nalready exists, rather than an error.\n\nThe statement is written to the binary log if it succeeds, but not if\nit fails; in that case, rollback occurs and no changes are made. A\nstatement written to the binary log includes all named roles. If the IF\nNOT EXISTS clause is given, this includes even roles that already exist\nand were not created.\n\nEach role name uses the format described in\nhttps://dev.mysql.com/doc/refman/8.0/en/role-names.html. For example:\n\nCREATE ROLE \'admin\', \'developer\';\nCREATE ROLE \'webapp\'@\'localhost\';\n\nThe host name part of the role name, if omitted, defaults to \'%\'.\n\nFor role usage examples, see\nhttps://dev.mysql.com/doc/refman/8.0/en/roles.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/create-role.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/create-role.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (609,46,'CREATE USER','Syntax:\nCREATE USER [IF NOT EXISTS]\n    user [auth_option] [, user [auth_option]] ...\n    DEFAULT ROLE role [, role ] ...\n    [REQUIRE {NONE | tls_option [[AND] tls_option] ...}]\n    [WITH resource_option [resource_option] ...]\n    [password_option | lock_option] ...\n    [COMMENT \'comment_string\' | ATTRIBUTE \'json_object\']\n\nuser:\n    (see )\n\nauth_option: {\n    IDENTIFIED BY \'auth_string\'\n  | IDENTIFIED BY RANDOM PASSWORD\n  | IDENTIFIED WITH auth_plugin\n  | IDENTIFIED WITH auth_plugin BY \'auth_string\'\n  | IDENTIFIED WITH auth_plugin BY RANDOM PASSWORD\n  | IDENTIFIED WITH auth_plugin AS \'auth_string\'\n}\n\ntls_option: {\n   SSL\n | X509\n | CIPHER \'cipher\'\n | ISSUER \'issuer\'\n | SUBJECT \'subject\'\n}\n\nresource_option: {\n    MAX_QUERIES_PER_HOUR count\n  | MAX_UPDATES_PER_HOUR count\n  | MAX_CONNECTIONS_PER_HOUR count\n  | MAX_USER_CONNECTIONS count\n}\n\npassword_option: {\n    PASSWORD EXPIRE [DEFAULT | NEVER | INTERVAL N DAY]\n  | PASSWORD HISTORY {DEFAULT | N}\n  | PASSWORD REUSE INTERVAL {DEFAULT | N DAY}\n  | PASSWORD REQUIRE CURRENT [DEFAULT | OPTIONAL]\n  | FAILED_LOGIN_ATTEMPTS N\n  | PASSWORD_LOCK_TIME {N | UNBOUNDED}\n}\n\nlock_option: {\n    ACCOUNT LOCK\n  | ACCOUNT UNLOCK\n}\n\nThe CREATE USER statement creates new MySQL accounts. It enables\nauthentication, role, SSL/TLS, resource-limit, and password-management\nproperties to be established for new accounts. It also controls whether\naccounts are initially locked or unlocked.\n\nTo use CREATE USER, you must have the global CREATE USER privilege, or\nthe INSERT privilege for the mysql system schema. When the read_only\nsystem variable is enabled, CREATE USER additionally requires the\nCONNECTION_ADMIN privilege (or the deprecated SUPER privilege).\n\nAs of MySQL 8.0.22, CREATE USER fails with an error if any account to\nbe created is named as the DEFINER attribute for any stored object.\n(That is, the statement fails if creating an account would cause the\naccount to adopt a currently orphaned stored object.) To perform the\noperation anyway, you must have the SET_USER_ID privilege; in this\ncase, the statement succeeds with a warning rather than failing with an\nerror. Without SET_USER_ID, to perform the user-creation operation,\ndrop the orphan objects, create the account and grant its privileges,\nand then re-create the dropped objects. For additional information,\nincluding how to identify which objects name a given account as the\nDEFINER attribute, see\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-objects-security.html#st\nored-objects-security-orphan-objects.\n\nCREATE USER either succeeds for all named users or rolls back and has\nno effect if any error occurs. By default, an error occurs if you try\nto create a user that already exists. If the IF NOT EXISTS clause is\ngiven, the statement produces a warning for each named user that\nalready exists, rather than an error.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/create-user.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/create-user.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (610,46,'DROP ROLE','Syntax:\nDROP ROLE [IF EXISTS] role [, role ] ...\n\nDROP ROLE removes one or more roles (named collections of privileges).\nTo use this statement, you must have the global DROP ROLE or CREATE\nUSER privilege. When the read_only system variable is enabled, DROP\nROLE additionally requires the CONNECTION_ADMIN privilege (or the\ndeprecated SUPER privilege).\n\nAs of MySQL 8.0.16, users who have the CREATE USER privilege can use\nthis statement to drop accounts that are locked or unlocked. Users who\nhave the DROP ROLE privilege can use this statement only to drop\naccounts that are locked (unlocked accounts are presumably user\naccounts used to log in to the server and not just as roles).\n\nRoles named in the mandatory_roles system variable value cannot be\ndropped.\n\nDROP ROLE either succeeds for all named roles or rolls back and has no\neffect if any error occurs. By default, an error occurs if you try to\ndrop a role that does not exist. If the IF EXISTS clause is given, the\nstatement produces a warning for each named role that does not exist,\nrather than an error.\n\nThe statement is written to the binary log if it succeeds, but not if\nit fails; in that case, rollback occurs and no changes are made. A\nstatement written to the binary log includes all named roles. If the IF\nEXISTS clause is given, this includes even roles that do not exist and\nwere not dropped.\n\nEach role name uses the format described in\nhttps://dev.mysql.com/doc/refman/8.0/en/role-names.html. For example:\n\nDROP ROLE \'admin\', \'developer\';\nDROP ROLE \'webapp\'@\'localhost\';\n\nThe host name part of the role name, if omitted, defaults to \'%\'.\n\nA dropped role is automatically revoked from any user account (or role)\nto which the role was granted. Within any current session for such an\naccount, its adjusted privileges apply beginning with the next\nstatement executed.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/drop-role.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/drop-role.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (611,46,'DROP USER','Syntax:\nDROP USER [IF EXISTS] user [, user] ...\n\nThe DROP USER statement removes one or more MySQL accounts and their\nprivileges. It removes privilege rows for the account from all grant\ntables.\n\nRoles named in the mandatory_roles system variable value cannot be\ndropped.\n\nTo use DROP USER, you must have the global CREATE USER privilege, or\nthe DELETE privilege for the mysql system schema. When the read_only\nsystem variable is enabled, DROP USER additionally requires the\nCONNECTION_ADMIN privilege (or the deprecated SUPER privilege).\n\nAs of MySQL 8.0.22, DROP USER fails with an error if any account to be\ndropped is named as the DEFINER attribute for any stored object. (That\nis, the statement fails if dropping an account would cause a stored\nobject to become orphaned.) To perform the operation anyway, you must\nhave the SET_USER_ID privilege; in this case, the statement succeeds\nwith a warning rather than failing with an error. For additional\ninformation, including how to identify which objects name a given\naccount as the DEFINER attribute, see\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-objects-security.html#st\nored-objects-security-orphan-objects.\n\nDROP USER either succeeds for all named users or rolls back and has no\neffect if any error occurs. By default, an error occurs if you try to\ndrop a user that does not exist. If the IF EXISTS clause is given, the\nstatement produces a warning for each named user that does not exist,\nrather than an error.\n\nThe statement is written to the binary log if it succeeds, but not if\nit fails; in that case, rollback occurs and no changes are made. A\nstatement written to the binary log includes all named users. If the IF\nEXISTS clause is given, this includes even users that do not exist and\nwere not dropped.\n\nEach account name uses the format described in\nhttps://dev.mysql.com/doc/refman/8.0/en/account-names.html. For\nexample:\n\nDROP USER \'jeffrey\'@\'localhost\';\n\nThe host name part of the account name, if omitted, defaults to \'%\'.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/drop-user.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/drop-user.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (612,46,'GRANT','Syntax:\nGRANT\n    priv_type [(column_list)]\n      [, priv_type [(column_list)]] ...\n    ON [object_type] priv_level\n    TO user_or_role [, user_or_role] ...\n    [WITH GRANT OPTION]\n    [AS user\n        [WITH ROLE\n            DEFAULT\n          | NONE\n          | ALL\n          | ALL EXCEPT role [, role ] ...\n          | role [, role ] ...\n        ]\n    ]\n}\n\nGRANT PROXY ON user_or_role\n    TO user_or_role [, user_or_role] ...\n    [WITH GRANT OPTION]\n\nGRANT role [, role] ...\n    TO user_or_role [, user_or_role] ...\n    [WITH ADMIN OPTION]\n\nobject_type: {\n    TABLE\n  | FUNCTION\n  | PROCEDURE\n}\n\npriv_level: {\n    *\n  | *.*\n  | db_name.*\n  | db_name.tbl_name\n  | tbl_name\n  | db_name.routine_name\n}\n\nuser_or_role: {\n    user (see https://dev.mysql.com/doc/refman/8.0/en/account-names.html)\n  | role (see https://dev.mysql.com/doc/refman/8.0/en/role-names.html)\n}\n\nThe GRANT statement enables system administrators to grant privileges\nand roles, which can be granted to user accounts and roles. These\nsyntax restrictions apply:\n\no GRANT cannot mix granting both privileges and roles in the same\n  statement. A given GRANT statement must grant either privileges or\n  roles.\n\no The ON clause distinguishes whether the statement grants privileges\n  or roles:\n\n  o With ON, the statement grants privileges.\n\n  o Without ON, the statement grants roles.\n\n  o It is permitted to assign both privileges and roles to an account,\n    but you must use separate GRANT statements, each with syntax\n    appropriate to what is to be granted.\n\nFor more information about roles, see\nhttps://dev.mysql.com/doc/refman/8.0/en/roles.html.\n\nTo grant a privilege with GRANT, you must have the GRANT OPTION\nprivilege, and you must have the privileges that you are granting.\n(Alternatively, if you have the UPDATE privilege for the grant tables\nin the mysql system schema, you can grant any account any privilege.)\nWhen the read_only system variable is enabled, GRANT additionally\nrequires the CONNECTION_ADMIN privilege (or the deprecated SUPER\nprivilege).\n\nGRANT either succeeds for all named users and roles or rolls back and\nhas no effect if any error occurs. The statement is written to the\nbinary log only if it succeeds for all named users and roles.\n\nThe REVOKE statement is related to GRANT and enables administrators to\nremove account privileges. See [HELP REVOKE].\n\nEach account name uses the format described in\nhttps://dev.mysql.com/doc/refman/8.0/en/account-names.html. Each role\nname uses the format described in\nhttps://dev.mysql.com/doc/refman/8.0/en/role-names.html. For example:\n\nGRANT ALL ON db1.* TO \'jeffrey\'@\'localhost\';\nGRANT \'role1\', \'role2\' TO \'user1\'@\'localhost\', \'user2\'@\'localhost\';\nGRANT SELECT ON world.* TO \'role3\';\n\nThe host name part of the account or role name, if omitted, defaults to\n\'%\'.\n\nNormally, a database administrator first uses CREATE USER to create an\naccount and define its nonprivilege characteristics such as its\npassword, whether it uses secure connections, and limits on access to\nserver resources, then uses GRANT to define its privileges. ALTER USER\nmay be used to change the nonprivilege characteristics of existing\naccounts. For example:\n\nCREATE USER \'jeffrey\'@\'localhost\' IDENTIFIED BY \'password\';\nGRANT ALL ON db1.* TO \'jeffrey\'@\'localhost\';\nGRANT SELECT ON db2.invoice TO \'jeffrey\'@\'localhost\';\nALTER USER \'jeffrey\'@\'localhost\' WITH MAX_QUERIES_PER_HOUR 90;\n\nFrom the mysql program, GRANT responds with Query OK, 0 rows affected\nwhen executed successfully. To determine what privileges result from\nthe operation, use SHOW GRANTS. See [HELP SHOW GRANTS].\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/grant.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/grant.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (613,46,'RENAME USER','Syntax:\nRENAME USER old_user TO new_user\n    [, old_user TO new_user] ...\n\nThe RENAME USER statement renames existing MySQL accounts. An error\noccurs for old accounts that do not exist or new accounts that already\nexist.\n\nTo use RENAME USER, you must have the global CREATE USER privilege, or\nthe UPDATE privilege for the mysql system schema. When the read_only\nsystem variable is enabled, RENAME USER additionally requires the\nCONNECTION_ADMIN privilege (or the deprecated SUPER privilege).\n\nAs of MySQL 8.0.22, RENAME USER fails with an error if any account to\nbe renamed is named as the DEFINER attribute for any stored object.\n(That is, the statement fails if renaming an account would cause a\nstored object to become orphaned.) To perform the operation anyway, you\nmust have the SET_USER_ID privilege; in this case, the statement\nsucceeds with a warning rather than failing with an error. For\nadditional information, including how to identify which objects name a\ngiven account as the DEFINER attribute, see\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-objects-security.html#st\nored-objects-security-orphan-objects.\n\nEach account name uses the format described in\nhttps://dev.mysql.com/doc/refman/8.0/en/account-names.html. For\nexample:\n\nRENAME USER \'jeffrey\'@\'localhost\' TO \'jeff\'@\'127.0.0.1\';\n\nThe host name part of the account name, if omitted, defaults to \'%\'.\n\nRENAME USER causes the privileges held by the old user to be those held\nby the new user. However, RENAME USER does not automatically drop or\ninvalidate databases or objects within them that the old user created.\nThis includes stored programs or views for which the DEFINER attribute\nnames the old user. Attempts to access such objects may produce an\nerror if they execute in definer security context. (For information\nabout security context, see\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-objects-security.html.)\n\nThe privilege changes take effect as indicated in\nhttps://dev.mysql.com/doc/refman/8.0/en/privilege-changes.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/rename-user.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/rename-user.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (614,46,'REVOKE','Syntax:\nREVOKE\n    priv_type [(column_list)]\n      [, priv_type [(column_list)]] ...\n    ON [object_type] priv_level\n    FROM user_or_role [, user_or_role] ...\n\nREVOKE ALL [PRIVILEGES], GRANT OPTION\n    FROM user_or_role [, user_or_role] ...\n\nREVOKE PROXY ON user_or_role\n    FROM user_or_role [, user_or_role] ...\n\nREVOKE role [, role ] ...\n    FROM user_or_role [, user_or_role ] ...\n\nuser_or_role: {\n    user (see https://dev.mysql.com/doc/refman/8.0/en/account-names.html)\n  | role (see https://dev.mysql.com/doc/refman/8.0/en/role-names.html.\n}\n\nThe REVOKE statement enables system administrators to revoke privileges\nand roles, which can be revoked from user accounts and roles.\n\nFor details on the levels at which privileges exist, the permissible\npriv_type, priv_level, and object_type values, and the syntax for\nspecifying users and passwords, see [HELP GRANT].\n\nFor information about roles, see\nhttps://dev.mysql.com/doc/refman/8.0/en/roles.html.\n\nWhen the read_only system variable is enabled, REVOKE requires the\nCONNECTION_ADMIN or privilege (or the deprecated SUPER privilege), in\naddition to any other required privileges described in the following\ndiscussion.\n\nREVOKE either succeeds for all named users and roles or rolls back and\nhas no effect if any error occurs. The statement is written to the\nbinary log only if it succeeds for all named users and roles.\n\nEach account name uses the format described in\nhttps://dev.mysql.com/doc/refman/8.0/en/account-names.html. Each role\nname uses the format described in\nhttps://dev.mysql.com/doc/refman/8.0/en/role-names.html. For example:\n\nREVOKE INSERT ON *.* FROM \'jeffrey\'@\'localhost\';\nREVOKE \'role1\', \'role2\' FROM \'user1\'@\'localhost\', \'user2\'@\'localhost\';\nREVOKE SELECT ON world.* FROM \'role3\';\n\nThe host name part of the account or role name, if omitted, defaults to\n\'%\'.\n\nTo use the first REVOKE syntax, you must have the GRANT OPTION\nprivilege, and you must have the privileges that you are revoking.\n\nTo revoke all privileges, use the second syntax, which drops all\nglobal, database, table, column, and routine privileges for the named\nusers or roles:\n\nREVOKE ALL PRIVILEGES, GRANT OPTION\n  FROM user_or_role [, user_or_role] ...\n\nREVOKE ALL PRIVILEGES, GRANT OPTION does not revoke any roles.\n\nTo use this REVOKE syntax, you must have the global CREATE USER\nprivilege, or the UPDATE privilege for the mysql system schema.\n\nThe syntax for which the REVOKE keyword is followed by one or more role\nnames takes a FROM clause indicating one or more users or roles from\nwhich to revoke the roles.\n\nRoles named in the mandatory_roles system variable value cannot be\nrevoked.\n\nA revoked role immediately affects any user account from which it was\nrevoked, such that within any current session for the account, its\nprivileges are adjusted for the next statement executed.\n\nRevoking a role revokes the role itself, not the privileges that it\nrepresents. Suppose that an account is granted a role that includes a\ngiven privilege, and is also granted the privilege explicitly or\nanother role that includes the privilege. In this case, the account\nstill possesses that privilege if the first role is revoked. For\nexample, if an account is granted two roles that each include SELECT,\nthe account still can select after either role is revoked.\n\nREVOKE ALL ON *.* (at the global level) revokes all granted static\nglobal privileges and all granted dynamic privileges.\n\nUser accounts and roles from which privileges and roles are to be\nrevoked must exist, but the privileges and roles to be revoked need not\nbe currently granted to them.\n\nA revoked privilege that is granted but not known to the server is\nrevoked with a warning. This situtation can occur for dynamic\nprivileges. For example, a dynamic privilege can be granted while the\ncomponent that registers it is installed, but if that component is\nsubsequently uninstalled, the privilege becomes unregistered, although\naccounts that possess the privilege still possess it and it can be\nrevoked from them.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/revoke.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/revoke.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (615,46,'SET DEFAULT ROLE','Syntax:\nSET DEFAULT ROLE\n    {NONE | ALL | role [, role ] ...}\n    TO user [, user ] ...\n\nFor each user named immediately after the TO keyword, this statement\ndefines which roles become active when the user connects to the server\nand authenticates, or when the user executes the SET ROLE DEFAULT\nstatement during a session.\n\nSET DEFAULT ROLE is alternative syntax for ALTER USER ... DEFAULT ROLE\n(see [HELP ALTER USER]). However, ALTER USER can set the default for\nonly a single user, whereas SET DEFAULT ROLE can set the default for\nmultiple users. On the other hand, you can specify CURRENT_USER as the\nuser name for the ALTER USER statement, whereas you cannot for SET\nDEFAULT ROLE.\n\nSET DEFAULT ROLE requires these privileges:\n\no Setting the default roles for another user requires the global CREATE\n  USER privilege, or the UPDATE privilege for the mysql.default_roles\n  system table.\n\no Setting the default roles for yourself requires no special\n  privileges, as long as the roles you want as the default have been\n  granted to you.\n\nEach role name uses the format described in\nhttps://dev.mysql.com/doc/refman/8.0/en/role-names.html. For example:\n\nSET DEFAULT ROLE \'admin\', \'developer\' TO \'joe\'@\'10.0.0.1\';\n\nThe host name part of the role name, if omitted, defaults to \'%\'.\n\nThe clause following the DEFAULT ROLE keywords permits these values:\n\no NONE: Set the default to NONE (no roles).\n\no ALL: Set the default to all roles granted to the account.\n\no role [, role ] ...: Set the default to the named roles, which must\n  exist and be granted to the account at the time SET DEFAULT ROLE is\n  executed.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/set-default-role.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/set-default-role.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (616,46,'SET PASSWORD','Syntax:\nSET PASSWORD [FOR user] auth_option\n    [REPLACE \'current_auth_string\']\n    [RETAIN CURRENT PASSWORD]\n\nauth_option: {\n    = \'auth_string\'\n  | TO RANDOM\n}\n\nThe SET PASSWORD statement assigns a password to a MySQL user account.\nThe password may be either explicitly specified in the statement or\nrandomly generated by MySQL. The statement may also include a\npassword-verification clause that specifies the account current\npassword to be replaced, and a clause that manages whether an account\nhas a secondary password. \'auth_string\' and \'current_auth_string\' each\nrepresent a cleartext (unencrypted) password.\n\n*Note*:\n\nRather than using SET PASSWORD to assign passwords, ALTER USER is the\npreferred statement for account alterations, including assigning\npasswords. For example:\n\nALTER USER user IDENTIFIED BY \'auth_string\';\n\n*Note*:\n\nClauses for random password generation, password verification, and\nsecondary passwords apply only to accounts that use an authentication\nplugin that stores credentials internally to MySQL. For accounts that\nuse a plugin that performs authentication against a credentials system\nthat is external to MySQL, password management must be handled\nexternally against that system as well. For more information about\ninternal credentials storage, see\nhttps://dev.mysql.com/doc/refman/8.0/en/password-management.html.\n\nThe REPLACE \'current_auth_string\' clause performs password verification\nand is available as of MySQL 8.0.13. If given:\n\no REPLACE specifies the account current password to be replaced, as a\n  cleartext (unencrypted) string.\n\no The clause must be given if password changes for the account are\n  required to specify the current password, as verification that the\n  user attempting to make the change actually knows the current\n  password.\n\no The clause is optional if password changes for the account may but\n  need not specify the current password.\n\no The statement fails if the clause is given but does not match the\n  current password, even if the clause is optional.\n\no REPLACE can be specified only when changing the account password for\n  the current user.\n\nFor more information about password verification by specifying the\ncurrent password, see\nhttps://dev.mysql.com/doc/refman/8.0/en/password-management.html.\n\nThe RETAIN CURRENT PASSWORD clause implements dual-password capability\nand is available as of MySQL 8.0.14. If given:\n\no RETAIN CURRENT PASSWORD retains an account current password as its\n  secondary password, replacing any existing secondary password. The\n  new password becomes the primary password, but clients can use the\n  account to connect to the server using either the primary or\n  secondary password. (Exception: If the new password specified by the\n  SET PASSWORD statement is empty, the secondary password becomes empty\n  as well, even if RETAIN CURRENT PASSWORD is given.)\n\no If you specify RETAIN CURRENT PASSWORD for an account that has an\n  empty primary password, the statement fails.\n\no If an account has a secondary password and you change its primary\n  password without specifying RETAIN CURRENT PASSWORD, the secondary\n  password remains unchanged.\n\nFor more information about use of dual passwords, see\nhttps://dev.mysql.com/doc/refman/8.0/en/password-management.html.\n\nSET PASSWORD permits these auth_option syntaxes:\n\no = \'auth_string\'\n\n  Assigns the account the given literal password.\n\no TO RANDOM\n\n  Assigns the account a password randomly generated by MySQL. The\n  statement also returns the cleartext password in a result set to make\n  it available to the user or application executing the statement.\n\n  For details about the result set and characteristics of randomly\n  generated passwords, see\n  https://dev.mysql.com/doc/refman/8.0/en/password-management.html#rand\n  om-password-generation.\n\n  Random password generation is available as of MySQL 8.0.18.\n\n*Important*:\n\nUnder some circumstances, SET PASSWORD may be recorded in server logs\nor on the client side in a history file such as ~/.mysql_history, which\nmeans that cleartext passwords may be read by anyone having read access\nto that information. For information about the conditions under which\nthis occurs for the server logs and how to control it, see\nhttps://dev.mysql.com/doc/refman/8.0/en/password-logging.html. For\nsimilar information about client-side logging, see\nhttps://dev.mysql.com/doc/refman/8.0/en/mysql-logging.html.\n\nSET PASSWORD can be used with or without a FOR clause that explicitly\nnames a user account:\n\no With a FOR user clause, the statement sets the password for the named\n  account, which must exist:\n\nSET PASSWORD FOR \'jeffrey\'@\'localhost\' = \'auth_string\';\n\no With no FOR user clause, the statement sets the password for the\n  current user:\n\nSET PASSWORD = \'auth_string\';\n\n  Any client who connects to the server using a nonanonymous account\n  can change the password for that account. (In particular, you can\n  change your own password.) To see which account the server\n  authenticated you as, invoke the CURRENT_USER() function:\n\nSELECT CURRENT_USER();\n\nIf a FOR user clause is given, the account name uses the format\ndescribed in\nhttps://dev.mysql.com/doc/refman/8.0/en/account-names.html. For\nexample:\n\nSET PASSWORD FOR \'bob\'@\'%.example.org\' = \'auth_string\';\n\nThe host name part of the account name, if omitted, defaults to \'%\'.\n\nSET PASSWORD interprets the string as a cleartext string, passes it to\nthe authentication plugin associated with the account, and stores the\nresult returned by the plugin in the account row in the mysql.user\nsystem table. (The plugin is given the opportunity to hash the value\ninto the encryption format it expects. The plugin may use the value as\nspecified, in which case no hashing occurs.)\n\nSetting the password for a named account (with a FOR clause) requires\nthe UPDATE privilege for the mysql system schema. Setting the password\nfor yourself (for a nonanonymous account with no FOR clause) requires\nno special privileges.\n\nStatements that modify secondary passwords require these privileges:\n\no The APPLICATION_PASSWORD_ADMIN privilege is required to use the\n  RETAIN CURRENT PASSWORD clause for SET PASSWORD statements that apply\n  to your own account. The privilege is required to manipulate your own\n  secondary password because most users require only one password.\n\no If an account is to be permitted to manipulate secondary passwords\n  for all accounts, it should be granted the CREATE USER privilege\n  rather than APPLICATION_PASSWORD_ADMIN.\n\nWhen the read_only system variable is enabled, SET PASSWORD requires\nthe CONNECTION_ADMIN privilege (or the deprecated SUPER privilege), in\naddition to any other required privileges.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/set-password.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/set-password.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (617,46,'SET ROLE','Syntax:\nSET ROLE {\n    DEFAULT\n  | NONE\n  | ALL\n  | ALL EXCEPT role [, role ] ...\n  | role [, role ] ...\n}\n\nSET ROLE modifies the current user\'s effective privileges within the\ncurrent session by specifying which of its granted roles are active.\nGranted roles include those granted explicitly to the user and those\nnamed in the mandatory_roles system variable value.\n\nExamples:\n\nSET ROLE DEFAULT;\nSET ROLE \'role1\', \'role2\';\nSET ROLE ALL;\nSET ROLE ALL EXCEPT \'role1\', \'role2\';\n\nEach role name uses the format described in\nhttps://dev.mysql.com/doc/refman/8.0/en/role-names.html. The host name\npart of the role name, if omitted, defaults to \'%\'.\n\nPrivileges that the user has been granted directly (rather than through\nroles) remain unaffected by changes to the active roles.\n\nThe statement permits these role specifiers:\n\no DEFAULT: Activate the account default roles. Default roles are those\n  specified with SET DEFAULT ROLE.\n\n  When a user connects to the server and authenticates successfully,\n  the server determines which roles to activate as the default roles.\n  If the activate_all_roles_on_login system variable is enabled, the\n  server activates all granted roles. Otherwise, the server executes\n  SET ROLE DEFAULT implicitly. The server activates only default roles\n  that can be activated. The server writes warnings to its error log\n  for default roles that cannot be activated, but the client receives\n  no warnings.\n\n  If a user executes SET ROLE DEFAULT during a session, an error occurs\n  if any default role cannot be activated (for example, if it does not\n  exist or is not granted to the user). In this case, the current\n  active roles are not changed.\n\no NONE: Set the active roles to NONE (no active roles).\n\no ALL: Activate all roles granted to the account.\n\no ALL EXCEPT role [, role ] ...: Activate all roles granted to the\n  account except those named. The named roles need not exist or be\n  granted to the account.\n\no role [, role ] ...: Activate the named roles, which must be granted\n  to the account.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/set-role.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/set-role.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (618,46,'ALTER RESOURCE GROUP','Syntax:\nALTER RESOURCE GROUP group_name\n    [VCPU [=] vcpu_spec [, vcpu_spec] ...]\n    [THREAD_PRIORITY [=] N]\n    [ENABLE|DISABLE [FORCE]]\n\nvcpu_spec: {N | M - N}\n\nALTER RESOURCE GROUP is used for resource group management (see\nhttps://dev.mysql.com/doc/refman/8.0/en/resource-groups.html). This\nstatement alters modifiable attributes of an existing resource group.\nIt requires the RESOURCE_GROUP_ADMIN privilege.\n\ngroup_name identifies which resource group to alter. If the group does\nnot exist, an error occurs.\n\nThe attributes for CPU affinity, priority, and whether the group is\nenabled can be modified with ALTER RESOURCE GROUP. These attributes are\nspecified the same way as described for CREATE RESOURCE GROUP (see\n[HELP CREATE RESOURCE GROUP]). Only the attributes specified are\naltered. Unspecified attributes retain their current values.\n\nThe FORCE modifier is used with DISABLE. It determines statement\nbehavior if the resource group has any threads assigned to it:\n\no If FORCE is not given, existing threads in the group continue to run\n  until they terminate, but new threads cannot be assigned to the\n  group.\n\no If FORCE is given, existing threads in the group are moved to their\n  respective default group (system threads to SYS_default, user threads\n  to USR_default).\n\nThe name and type attributes are set at group creation time and cannot\nbe modified thereafter with ALTER RESOURCE GROUP.\n\nExamples:\n\no Alter a group CPU affinity:\n\nALTER RESOURCE GROUP rg1 VCPU = 0-63;\n\no Alter a group thread priority:\n\nALTER RESOURCE GROUP rg2 THREAD_PRIORITY = 5;\n\no Disable a group, moving any threads assigned to it to the default\n  groups:\n\nALTER RESOURCE GROUP rg3 DISABLE FORCE;\n\nResource group management is local to the server on which it occurs.\nALTER RESOURCE GROUP statements are not written to the binary log and\nare not replicated.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/alter-resource-group.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/alter-resource-group.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (619,46,'CREATE RESOURCE GROUP','Syntax:\nCREATE RESOURCE GROUP group_name\n    TYPE = {SYSTEM|USER}\n    [VCPU [=] vcpu_spec [, vcpu_spec] ...]\n    [THREAD_PRIORITY [=] N]\n    [ENABLE|DISABLE]\n\nvcpu_spec: {N | M - N}\n\nCREATE RESOURCE GROUP is used for resource group management (see\nhttps://dev.mysql.com/doc/refman/8.0/en/resource-groups.html). This\nstatement creates a new resource group and assigns its initial\nattribute values. It requires the RESOURCE_GROUP_ADMIN privilege.\n\ngroup_name identifies which resource group to create. If the group\nalready exists, an error occurs.\n\nThe TYPE attribute is required. It should be SYSTEM for a system\nresource group, USER for a user resource group. The group type affects\npermitted THREAD_PRIORITY values, as described later.\n\nThe VCPU attribute indicates the CPU affinity; that is, the set of\nvirtual CPUs the group can use:\n\no If VCPU is not given, the resource group has no CPU affinity and can\n  use all available CPUs.\n\no If VCPU is given, the attribute value is a list of comma-separated\n  CPU numbers or ranges:\n\n  o Each number must be an integer in the range from 0 to the number of\n    CPUs − 1. For example, on a system with 64 CPUs, the number can\n    range from 0 to 63.\n\n  o A range is given in the form M − N, where M is less than or equal\n    to N and both numbers are in the CPU range.\n\n  o If a CPU number is an integer outside the permitted range or is not\n    an integer, an error occurs.\n\nExample VCPU specifiers (these are all equivalent):\n\nVCPU = 0,1,2,3,9,10\nVCPU = 0-3,9-10\nVCPU = 9,10,0-3\nVCPU = 0,10,1,9,3,2\n\nThe THREAD_PRIORITY attribute indicates the priority for threads\nassigned to the group:\n\no If THREAD_PRIORITY is not given, the default priority is 0.\n\no If THREAD_PRIORITY is given, the attribute value must be in the range\n  from -20 (highest priority) to 19 (lowest priority). The priority for\n  system resource groups must be in the range from -20 to 0. The\n  priority for user resource groups must be in the range from 0 to 19.\n  Use of different ranges for system and user groups ensures that user\n  threads never have a higher priority than system threads.\n\nENABLE and DISABLE specify that the resource group is initially enabled\nor disabled. If neither is specified, the group is enabled by default.\nA disabled group cannot have threads assigned to it.\n\nExamples:\n\no Create an enabled user group that has a single CPU and the lowest\n  priority:\n\nCREATE RESOURCE GROUP rg1\n  TYPE = USER\n  VCPU = 0\n  THREAD_PRIORITY = 19;\n\no Create a disabled system group that has no CPU affinity (can use all\n  CPUs) and the highest priority:\n\nCREATE RESOURCE GROUP rg2\n  TYPE = SYSTEM\n  THREAD_PRIORITY = -20\n  DISABLE;\n\nResource group management is local to the server on which it occurs.\nCREATE RESOURCE GROUP statements are not written to the binary log and\nare not replicated.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/create-resource-group.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/create-resource-group.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (620,46,'DROP RESOURCE GROUP','Syntax:\nDROP RESOURCE GROUP group_name [FORCE]\n\nDROP RESOURCE GROUP is used for resource group management (see\nhttps://dev.mysql.com/doc/refman/8.0/en/resource-groups.html). This\nstatement drops a resource group. It requires the RESOURCE_GROUP_ADMIN\nprivilege.\n\ngroup_name identifies which resource group to drop. If the group does\nnot exist, an error occurs.\n\nThe FORCE modifier determines statement behavior if the resource group\nhas any threads assigned to it:\n\no If FORCE is not given and any threads are assigned to the group, an\n  error occurs.\n\no If FORCE is given, existing threads in the group are moved to their\n  respective default group (system threads to SYS_default, user threads\n  to USR_default).\n\nExamples:\n\no Drop a group, failing if the group contains any threads:\n\nDROP RESOURCE GROUP rg1;\n\no Drop a group and move existing threads to the default groups:\n\nDROP RESOURCE GROUP rg2 FORCE;\n\nResource group management is local to the server on which it occurs.\nDROP RESOURCE GROUP statements are not written to the binary log and\nare not replicated.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/drop-resource-group.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/drop-resource-group.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (621,46,'SET RESOURCE GROUP','Syntax:\nSET RESOURCE GROUP group_name\n    [FOR thread_id [, thread_id] ...]\n\nSET RESOURCE GROUP is used for resource group management (see\nhttps://dev.mysql.com/doc/refman/8.0/en/resource-groups.html). This\nstatement assigns threads to a resource group. It requires the\nRESOURCE_GROUP_ADMIN or RESOURCE_GROUP_USER privilege.\n\ngroup_name identifies which resource group to be assigned. Any\nthread_id values indicate threads to assign to the group. Thread IDs\ncan be determined from the Performance Schema threads table. If the\nresource group or any named thread ID does not exist, an error occurs.\n\nWith no FOR clause, the statement assigns the current thread for the\nsession to the resource group.\n\nWith a FOR clause that names thread IDs, the statement assigns those\nthreads to the resource group.\n\nFor attempts to assign a system thread to a user resource group or a\nuser thread to a system resource group, a warning occurs.\n\nExamples:\n\no Assign the current session thread to a group:\n\nSET RESOURCE GROUP rg1;\n\no Assign the named threads to a group:\n\nSET RESOURCE GROUP rg2 FOR 14, 78, 4;\n\nResource group management is local to the server on which it occurs.\nSET RESOURCE GROUP statements are not written to the binary log and are\nnot replicated.\n\nAn alternative to SET RESOURCE GROUP is the RESOURCE_GROUP optimizer\nhint, which assigns individual statements to a resource group. See\nhttps://dev.mysql.com/doc/refman/8.0/en/optimizer-hints.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/set-resource-group.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/set-resource-group.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (622,47,'ANALYZE TABLE','Syntax:\nANALYZE [NO_WRITE_TO_BINLOG | LOCAL]\n    TABLE tbl_name [, tbl_name] ...\n\nANALYZE [NO_WRITE_TO_BINLOG | LOCAL]\n    TABLE tbl_name\n    UPDATE HISTOGRAM ON col_name [, col_name] ...\n        [WITH N BUCKETS]\n\nANALYZE [NO_WRITE_TO_BINLOG | LOCAL]\n    TABLE tbl_name\n    DROP HISTOGRAM ON col_name [, col_name] ...\n\nANALYZE TABLE generates table statistics:\n\no ANALYZE TABLE without either HISTOGRAM clause performs a key\n  distribution analysis and stores the distribution for the named table\n  or tables. For MyISAM tables, ANALYZE TABLE for key distribution\n  analysis is equivalent to using myisamchk --analyze.\n\no ANALYZE TABLE with the UPDATE HISTOGRAM clause generates histogram\n  statistics for the named table columns and stores them in the data\n  dictionary. Only one table name is permitted for this syntax.\n\no ANALYZE TABLE with the DROP HISTOGRAM clause removes histogram\n  statistics for the named table columns from the data dictionary. Only\n  one table name is permitted for this syntax.\n\nThis statement requires SELECT and INSERT privileges for the table.\n\nANALYZE TABLE works with InnoDB, NDB, and MyISAM tables. It does not\nwork with views.\n\nIf the innodb_read_only system variable is enabled, ANALYZE TABLE may\nfail because it cannot update statistics tables in the data dictionary,\nwhich use InnoDB. For ANALYZE TABLE operations that update the key\ndistribution, failure may occur even if the operation updates the table\nitself (for example, if it is a MyISAM table). To obtain the updated\ndistribution statistics, set information_schema_stats_expiry=0.\n\nANALYZE TABLE is supported for partitioned tables, and you can use\nALTER TABLE ... ANALYZE PARTITION to analyze one or more partitions;\nfor more information, see [HELP ALTER TABLE], and\nhttps://dev.mysql.com/doc/refman/8.0/en/partitioning-maintenance.html.\n\nDuring the analysis, the table is locked with a read lock for InnoDB\nand MyISAM.\n\nANALYZE TABLE removes the table from the table definition cache, which\nrequires a flush lock. If there are long running statements or\ntransactions still using the table, subsequent statements and\ntransactions must wait for those operations to finish before the flush\nlock is released. Because ANALYZE TABLE itself typically finishes\nquickly, it may not be apparent that delayed transactions or statements\ninvolving the same table are due to the remaining flush lock.\n\nBy default, the server writes ANALYZE TABLE statements to the binary\nlog so that they replicate to replicas. To suppress logging, specify\nthe optional NO_WRITE_TO_BINLOG keyword or its alias LOCAL.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/analyze-table.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/analyze-table.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (623,47,'CHECK TABLE','Syntax:\nCHECK TABLE tbl_name [, tbl_name] ... [option] ...\n\noption: {\n    FOR UPGRADE\n  | QUICK\n  | FAST\n  | MEDIUM\n  | EXTENDED\n  | CHANGED\n}\n\nCHECK TABLE checks a table or tables for errors. CHECK TABLE can also\ncheck views for problems, such as tables that are referenced in the\nview definition that no longer exist.\n\nTo check a table, you must have some privilege for it.\n\nCHECK TABLE works for InnoDB, MyISAM, ARCHIVE, and CSV tables.\n\nBefore running CHECK TABLE on InnoDB tables, see\nhttps://dev.mysql.com/doc/refman/8.0/en/check-table.html#check-table-in\nnodb.\n\nCHECK TABLE is supported for partitioned tables, and you can use ALTER\nTABLE ... CHECK PARTITION to check one or more partitions; for more\ninformation, see [HELP ALTER TABLE], and\nhttps://dev.mysql.com/doc/refman/8.0/en/partitioning-maintenance.html.\n\nCHECK TABLE ignores virtual generated columns that are not indexed.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/check-table.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/check-table.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (624,47,'CHECKSUM TABLE','Syntax:\nCHECKSUM TABLE tbl_name [, tbl_name] ... [QUICK | EXTENDED]\n\nCHECKSUM TABLE reports a checksum for the contents of a table. You can\nuse this statement to verify that the contents are the same before and\nafter a backup, rollback, or other operation that is intended to put\nthe data back to a known state.\n\nThis statement requires the SELECT privilege for the table.\n\nThis statement is not supported for views. If you run CHECKSUM TABLE\nagainst a view, the Checksum value is always NULL, and a warning is\nreturned.\n\nFor a nonexistent table, CHECKSUM TABLE returns NULL and generates a\nwarning.\n\nDuring the checksum operation, the table is locked with a read lock for\nInnoDB and MyISAM.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/checksum-table.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/checksum-table.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (625,47,'OPTIMIZE TABLE','Syntax:\nOPTIMIZE [NO_WRITE_TO_BINLOG | LOCAL]\n    TABLE tbl_name [, tbl_name] ...\n\nOPTIMIZE TABLE reorganizes the physical storage of table data and\nassociated index data, to reduce storage space and improve I/O\nefficiency when accessing the table. The exact changes made to each\ntable depend on the storage engine used by that table.\n\nUse OPTIMIZE TABLE in these cases, depending on the type of table:\n\no After doing substantial insert, update, or delete operations on an\n  InnoDB table that has its own .ibd file because it was created with\n  the innodb_file_per_table option enabled. The table and indexes are\n  reorganized, and disk space can be reclaimed for use by the operating\n  system.\n\no After doing substantial insert, update, or delete operations on\n  columns that are part of a FULLTEXT index in an InnoDB table. Set the\n  configuration option innodb_optimize_fulltext_only=1 first. To keep\n  the index maintenance period to a reasonable time, set the\n  innodb_ft_num_word_optimize option to specify how many words to\n  update in the search index, and run a sequence of OPTIMIZE TABLE\n  statements until the search index is fully updated.\n\no After deleting a large part of a MyISAM or ARCHIVE table, or making\n  many changes to a MyISAM or ARCHIVE table with variable-length rows\n  (tables that have VARCHAR, VARBINARY, BLOB, or TEXT columns). Deleted\n  rows are maintained in a linked list and subsequent INSERT operations\n  reuse old row positions. You can use OPTIMIZE TABLE to reclaim the\n  unused space and to defragment the data file. After extensive changes\n  to a table, this statement may also improve performance of statements\n  that use the table, sometimes significantly.\n\nThis statement requires SELECT and INSERT privileges for the table.\n\nOPTIMIZE TABLE works for InnoDB, MyISAM, and ARCHIVE tables. OPTIMIZE\nTABLE is also supported for dynamic columns of in-memory NDB tables. It\ndoes not work for fixed-width columns of in-memory tables, nor does it\nwork for Disk Data tables. The performance of OPTIMIZE on NDB Cluster\ntables can be tuned using --ndb-optimization-delay, which controls the\nlength of time to wait between processing batches of rows by OPTIMIZE\nTABLE. For more information, see\nhttps://dev.mysql.com/doc/refman/8.0/en/mysql-cluster-limitations-resol\nved.html.\n\nFor NDB Cluster tables, OPTIMIZE TABLE can be interrupted by (for\nexample) killing the SQL thread performing the OPTIMIZE operation.\n\nBy default, OPTIMIZE TABLE does not work for tables created using any\nother storage engine and returns a result indicating this lack of\nsupport. You can make OPTIMIZE TABLE work for other storage engines by\nstarting mysqld with the --skip-new option. In this case, OPTIMIZE\nTABLE is just mapped to ALTER TABLE.\n\nThis statement does not work with views.\n\nOPTIMIZE TABLE is supported for partitioned tables. For information\nabout using this statement with partitioned tables and table\npartitions, see\nhttps://dev.mysql.com/doc/refman/8.0/en/partitioning-maintenance.html.\n\nBy default, the server writes OPTIMIZE TABLE statements to the binary\nlog so that they replicate to replicas. To suppress logging, specify\nthe optional NO_WRITE_TO_BINLOG keyword or its alias LOCAL.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/optimize-table.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/optimize-table.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (626,47,'REPAIR TABLE','Syntax:\nREPAIR [NO_WRITE_TO_BINLOG | LOCAL]\n    TABLE tbl_name [, tbl_name] ...\n    [QUICK] [EXTENDED] [USE_FRM]\n\nREPAIR TABLE repairs a possibly corrupted table, for certain storage\nengines only.\n\nThis statement requires SELECT and INSERT privileges for the table.\n\nAlthough normally you should never have to run REPAIR TABLE, if\ndisaster strikes, this statement is very likely to get back all your\ndata from a MyISAM table. If your tables become corrupted often, try to\nfind the reason for it, to eliminate the need to use REPAIR TABLE. See\nhttps://dev.mysql.com/doc/refman/8.0/en/crashing.html, and\nhttps://dev.mysql.com/doc/refman/8.0/en/myisam-table-problems.html.\n\nREPAIR TABLE checks the table to see whether an upgrade is required. If\nso, it performs the upgrade, following the same rules as CHECK TABLE\n... FOR UPGRADE. See [HELP CHECK TABLE], for more information.\n\n*Important*:\n\no Make a backup of a table before performing a table repair operation;\n  under some circumstances the operation might cause data loss.\n  Possible causes include but are not limited to file system errors.\n  See https://dev.mysql.com/doc/refman/8.0/en/backup-and-recovery.html.\n\no If the server exits during a REPAIR TABLE operation, it is essential\n  after restarting it that you immediately execute another REPAIR TABLE\n  statement for the table before performing any other operations on it.\n  In the worst case, you might have a new clean index file without\n  information about the data file, and then the next operation you\n  perform could overwrite the data file. This is an unlikely but\n  possible scenario that underscores the value of making a backup\n  first.\n\no In the event that a table on the source becomes corrupted and you run\n  REPAIR TABLE on it, any resulting changes to the original table are\n  not propagated to replicas.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/repair-table.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/repair-table.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (627,48,'CREATE FUNCTION LOADABLE FUNCTION','Syntax:\nCREATE [AGGREGATE] FUNCTION function_name\n    RETURNS {STRING|INTEGER|REAL|DECIMAL}\n    SONAME shared_library_name\n\nThis statement loads the loadable function named function_name. (CREATE\nFUNCTION is also used to created stored functions; see [HELP CREATE\nPROCEDURE].)\n\nA loadable function is a way to extend MySQL with a new function that\nworks like a native (built-in) MySQL function such as ABS() or\nCONCAT(). See Adding a Loadable Function\n(https://dev.mysql.com/doc/extending-mysql/8.0/en/adding-loadable-funct\nion.html).\n\nfunction_name is the name that should be used in SQL statements to\ninvoke the function. The RETURNS clause indicates the type of the\nfunction\'s return value. DECIMAL is a legal value after RETURNS, but\ncurrently DECIMAL functions return string values and should be written\nlike STRING functions.\n\nThe AGGREGATE keyword, if given, signifies that the function is an\naggregate (group) function. An aggregate function works exactly like a\nnative MySQL aggregate function such as SUM() or COUNT().\n\nshared_library_name is the base name of the shared library file\ncontaining the code that implements the function. The file must be\nlocated in the plugin directory. This directory is given by the value\nof the plugin_dir system variable. For more information, see\nhttps://dev.mysql.com/doc/refman/8.0/en/function-loading.html.\n\nCREATE FUNCTION requires the INSERT privilege for the mysql system\nschema because it adds a row to the mysql.func system table to register\nthe function.\n\nCREATE FUNCTION also adds the function to the Performance Schema\nuser_defined_functions table that provides runtime information about\ninstalled loadable functions. See\nhttps://dev.mysql.com/doc/refman/8.0/en/performance-schema-user-defined\n-functions-table.html.\n\n*Note*:\n\nLike the mysql.func system table, the Performance Schema\nuser_defined_functions table lists loadable functions installed using\nCREATE FUNCTION. Unlike the mysql.func table, the\nuser_defined_functions table also lists loadable functions installed\nautomatically by server components or plugins. This difference makes\nuser_defined_functions preferable to mysql.func for checking which\nloadable functions are installed.\n\nDuring the normal startup sequence, the server loads functions\nregistered in the mysql.func table. If the server is started with the\n--skip-grant-tables option, functions registered in the table are not\nloaded and are unavailable.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/create-function-loadable.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/create-function-loadable.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (628,48,'DROP FUNCTION LOADABLE FUNCTION','Syntax:\nDROP FUNCTION [IF EXISTS] function_name\n\nThis statement drops the loadable function named function_name. (DROP\nFUNCTION is also used to drop stored functions; see [HELP DROP\nPROCEDURE].)\n\nDROP FUNCTION is the complement of CREATE FUNCTION. It requires the\nDELETE privilege for the mysql system schema because it removes the row\nfrom the mysql.func system table that registers the function.\n\nDROP FUNCTION also removes the function from the Performance Schema\nuser_defined_functions table that provides runtime information about\ninstalled loadable functions. See\nhttps://dev.mysql.com/doc/refman/8.0/en/performance-schema-user-defined\n-functions-table.html.\n\nDuring the normal startup sequence, the server loads functions\nregistered in the mysql.func table. Because DROP FUNCTION removes the\nmysql.func row for the dropped function, the server does not load the\nfunction during subsequent restarts.\n\nDROP FUNCTION cannot be used to drop a loadable function that is\ninstalled automatically by components or plugins rather than by using\nCREATE FUNCTION. Such a function is also dropped automatically, when\nthe component or plugin that installed it is uninstalled.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/drop-function-loadable.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/drop-function-loadable.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (629,49,'INSTALL COMPONENT','Syntax:\nINSTALL COMPONENT component_name [, component_name ] ...\n\nThis statement installs one or more components, which become active\nimmediately. A component provides services that are available to the\nserver and other components; see\nhttps://dev.mysql.com/doc/refman/8.0/en/components.html. INSTALL\nCOMPONENT requires the INSERT privilege for the mysql.component system\ntable because it adds a row to that table to register the component.\n\nExample:\n\nINSTALL COMPONENT \'file://component1\', \'file://component2\';\n\nA component is named using a URN that begins with file:// and indicates\nthe base name of the library file that implements the component,\nlocated in the directory named by the plugin_dir system variable.\nComponent names do not include any platform-dependent file name suffix\nsuch as .so or .dll. (These naming details are subject to change\nbecause component name interpretation is itself performed by a service\nand the component infrastructure makes it possible to replace the\ndefault service implementation with alternative implementations.)\n\nIf any error occurs, the statement fails and has no effect. For\nexample, this happens if a component name is erroneous, a named\ncomponent does not exist or is already installed, or component\ninitialization fails.\n\nA loader service handles component loading, which includes adding\ninstalled components to the mysql.component system table that serves as\na registry. For subsequent server restarts, any components listed in\nmysql.component are loaded by the loader service during the startup\nsequence. This occurs even if the server is started with the\n--skip-grant-tables option.\n\nIf a component depends on services not present in the registry and you\nattempt to install the component without also installing the component\nor components that provide the services on which it depends, an error\noccurs:\n\nERROR 3527 (HY000): Cannot satisfy dependency for service \'component_a\'\nrequired by component \'component_b\'.\n\nTo avoid this problem, either install all components in the same\nstatement, or install the dependent component after installing any\ncomponents on which it depends.\n\n*Note*:\n\nFor keyring components, do not use INSTALL COMPONENT. Instead,\nconfigure keyring component loading using a manifest file. See\nhttps://dev.mysql.com/doc/refman/8.0/en/keyring-component-installation.\nhtml.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/install-component.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/install-component.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (630,50,'INSTALL PLUGIN','Syntax:\nINSTALL PLUGIN plugin_name SONAME \'shared_library_name\'\n\nThis statement installs a server plugin. It requires the INSERT\nprivilege for the mysql.plugin system table because it adds a row to\nthat table to register the plugin.\n\nplugin_name is the name of the plugin as defined in the plugin\ndescriptor structure contained in the library file (see Plugin Data\nStructures\n(https://dev.mysql.com/doc/extending-mysql/8.0/en/plugin-data-structure\ns.html)). Plugin names are not case-sensitive. For maximal\ncompatibility, plugin names should be limited to ASCII letters, digits,\nand underscore because they are used in C source files, shell command\nlines, M4 and Bourne shell scripts, and SQL environments.\n\nshared_library_name is the name of the shared library that contains the\nplugin code. The name includes the file name extension (for example,\nlibmyplugin.so, libmyplugin.dll, or libmyplugin.dylib).\n\nThe shared library must be located in the plugin directory (the\ndirectory named by the plugin_dir system variable). The library must be\nin the plugin directory itself, not in a subdirectory. By default,\nplugin_dir is the plugin directory under the directory named by the\npkglibdir configuration variable, but it can be changed by setting the\nvalue of plugin_dir at server startup. For example, set its value in a\nmy.cnf file:\n\n[mysqld]\nplugin_dir=/path/to/plugin/directory\n\nIf the value of plugin_dir is a relative path name, it is taken to be\nrelative to the MySQL base directory (the value of the basedir system\nvariable).\n\nINSTALL PLUGIN loads and initializes the plugin code to make the plugin\navailable for use. A plugin is initialized by executing its\ninitialization function, which handles any setup that the plugin must\nperform before it can be used. When the server shuts down, it executes\nthe deinitialization function for each plugin that is loaded so that\nthe plugin has a chance to perform any final cleanup.\n\nINSTALL PLUGIN also registers the plugin by adding a line that\nindicates the plugin name and library file name to the mysql.plugin\nsystem table. During the normal startup sequence, the server loads and\ninitializes plugins registered in mysql.plugin. This means that a\nplugin is installed with INSTALL PLUGIN only once, not every time the\nserver starts. If the server is started with the --skip-grant-tables\noption, plugins registered in the mysql.plugin table are not loaded and\nare unavailable.\n\nA plugin library can contain multiple plugins. For each of them to be\ninstalled, use a separate INSTALL PLUGIN statement. Each statement\nnames a different plugin, but all of them specify the same library\nname.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/install-plugin.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/install-plugin.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (631,49,'UNINSTALL COMPONENT','Syntax:\nUNINSTALL COMPONENT component_name [, component_name ] ...\n\nThis statement deactivates and uninstalls one or more components. A\ncomponent provides services that are available to the server and other\ncomponents; see\nhttps://dev.mysql.com/doc/refman/8.0/en/components.html. UNINSTALL\nCOMPONENT is the complement of INSTALL COMPONENT. It requires the\nDELETE privilege for the mysql.component system table because it\nremoves the row from that table that registers the component.\n\nExample:\n\nUNINSTALL COMPONENT \'file://component1\', \'file://component2\';\n\nFor information about component naming, see [HELP INSTALL COMPONENT].\n\nIf any error occurs, the statement fails and has no effect. For\nexample, this happens if a component name is erroneous, a named\ncomponent is not installed, or cannot be uninstalled because other\ninstalled components depend on it.\n\nA loader service handles component unloading, which includes removing\nuninstalled components from the mysql.component system table that\nserves as a registry. As a result, unloaded components are not loaded\nduring the startup sequence for subsequent server restarts.\n\n*Note*:\n\nThis statement has no effect for keyring components, which are loaded\nusing a manifest file and cannot be uninstalled. See\nhttps://dev.mysql.com/doc/refman/8.0/en/keyring-component-installation.\nhtml.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/uninstall-component.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/uninstall-component.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (632,49,'UNINSTALL PLUGIN','Syntax:\nUNINSTALL PLUGIN plugin_name\n\nThis statement removes an installed server plugin. UNINSTALL PLUGIN is\nthe complement of INSTALL PLUGIN. It requires the DELETE privilege for\nthe mysql.plugin system table because it removes the row from that\ntable that registers the plugin.\n\nplugin_name must be the name of some plugin that is listed in the\nmysql.plugin table. The server executes the plugin\'s deinitialization\nfunction and removes the row for the plugin from the mysql.plugin\nsystem table, so that subsequent server restarts do not load and\ninitialize the plugin. UNINSTALL PLUGIN does not remove the plugin\'s\nshared library file.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/uninstall-plugin.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/uninstall-plugin.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (633,49,'CLONE','Syntax:\nCLONE clone_action\n\nclone_action: {\n    LOCAL DATA DIRECTORY [=] \'clone_dir\';\n  | INSTANCE FROM \'user\'@\'host\':port\n    IDENTIFIED BY \'password\'\n    [DATA DIRECTORY [=] \'clone_dir\']\n    [REQUIRE [NO] SSL]\n}\n\nThe CLONE statement is used to clone data locally or from a remote\nMySQL server instance. To use CLONE syntax, the clone plugin must be\ninstalled. See\nhttps://dev.mysql.com/doc/refman/8.0/en/clone-plugin.html.\n\nCLONE LOCAL DATA DIRECTORY syntax clones data from the local MySQL data\ndirectory to a directory on the same server or node where the MySQL\nserver instance runs. The \'clone_dir\' directory is the full path of the\nlocal directory that data is cloned to. An absolute path is required.\nThe specified directory must not exist, but the specified path must be\nan existent path. The MySQL server requires the necessary write access\nto create the specified directory. For more information, see\nhttps://dev.mysql.com/doc/refman/8.0/en/clone-plugin-local.html.\n\nCLONE INSTANCE syntax clones data from a remote MySQL server instance\n(the donor) and transfers it to the MySQL instance where the cloning\noperation was initiated (the recipient).\n\no user is the clone user on the donor MySQL server instance.\n\no host is the hostname address of the donor MySQL server instance.\n  Internet Protocol version 6 (IPv6) address format is not supported.\n  An alias to the IPv6 address can be used instead. An IPv4 address can\n  be used as is.\n\no port is the port number of the donor MySQL server instance. (The X\n  Protocol port specified by mysqlx_port is not supported. Connecting\n  to the donor MySQL server instance through MySQL Router is also not\n  supported.)\n\no IDENTIFIED BY \'password\' specifies the password of the clone user on\n  the donor MySQL server instance.\n\no DATA DIRECTORY [=] \'clone_dir\' is an optional clause used to specify\n  a directory on the recipient for the data you are cloning. Use this\n  option if you do not want to remove existing data in the recipient\n  data directory. An absolute path is required, and the directory must\n  not exist. The MySQL server must have the necessary write access to\n  create the directory.\n\n  When the optional DATA DIRECTORY [=] \'clone_dir\' clause is not used,\n  a cloning operation removes existing data in the recipient data\n  directory, replaces it with the cloned data, and automatically\n  restarts the server afterward.\n\no [REQUIRE [NO] SSL] explicitly specifies whether an encrypted\n  connection is to be used or not when transferring cloned data over\n  the network. An error is returned if the explicit specification\n  cannot be satisfied. If an SSL clause is not specified, clone\n  attempts to establish an encrypted connection by default, falling\n  back to an insecure connection if the secure connection attempt\n  fails. A secure connection is required when cloning encrypted data\n  regardless of whether this clause is specified. For more information,\n  see\n  https://dev.mysql.com/doc/refman/8.0/en/clone-plugin-remote.html#clon\n  e-plugin-remote-ssl.\n\nFor additional information about cloning data from a remote MySQL\nserver instance, see\nhttps://dev.mysql.com/doc/refman/8.0/en/clone-plugin-remote.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/clone.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/clone.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (634,3,'SET','Syntax:\nSET variable = expr [, variable = expr] ...\n\nvariable: {\n    user_var_name\n  | param_name\n  | local_var_name\n  | {GLOBAL | @@GLOBAL.} system_var_name\n  | {PERSIST | @@PERSIST.} system_var_name\n  | {PERSIST_ONLY | @@PERSIST_ONLY.} system_var_name\n  | [SESSION | @@SESSION. | @@] system_var_name\n}\n\nSET syntax for variable assignment enables you to assign values to\ndifferent types of variables that affect the operation of the server or\nclients:\n\no User-defined variables. See\n  https://dev.mysql.com/doc/refman/8.0/en/user-variables.html.\n\no Stored procedure and function parameters, and stored program local\n  variables. See\n  https://dev.mysql.com/doc/refman/8.0/en/stored-program-variables.html\n  .\n\no System variables. See\n  https://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html.\n  System variables also can be set at server startup, as described in\n  https://dev.mysql.com/doc/refman/8.0/en/using-system-variables.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/set-variable.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/set-variable.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (635,3,'SET CHARACTER SET','Syntax:\nSET {CHARACTER SET | CHARSET}\n    {\'charset_name\' | DEFAULT}\n\nThis statement maps all strings sent between the server and the current\nclient with the given mapping. SET CHARACTER SET sets three session\nsystem variables: character_set_client and character_set_results are\nset to the given character set, and character_set_connection to the\nvalue of character_set_database. See\nhttps://dev.mysql.com/doc/refman/8.0/en/charset-connection.html.\n\ncharset_name may be quoted or unquoted.\n\nThe default character set mapping can be restored by using the value\nDEFAULT. The default depends on the server configuration.\n\nSome character sets cannot be used as the client character set.\nAttempting to use them with SET CHARACTER SET produces an error. See\nhttps://dev.mysql.com/doc/refman/8.0/en/charset-connection.html#charset\n-connection-impermissible-client-charset.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/set-character-set.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/set-character-set.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (636,3,'SET CHARSET','Syntax:\nSET {CHARACTER SET | CHARSET}\n    {\'charset_name\' | DEFAULT}\n\nThis statement maps all strings sent between the server and the current\nclient with the given mapping. SET CHARACTER SET sets three session\nsystem variables: character_set_client and character_set_results are\nset to the given character set, and character_set_connection to the\nvalue of character_set_database. See\nhttps://dev.mysql.com/doc/refman/8.0/en/charset-connection.html.\n\ncharset_name may be quoted or unquoted.\n\nThe default character set mapping can be restored by using the value\nDEFAULT. The default depends on the server configuration.\n\nSome character sets cannot be used as the client character set.\nAttempting to use them with SET CHARACTER SET produces an error. See\nhttps://dev.mysql.com/doc/refman/8.0/en/charset-connection.html#charset\n-connection-impermissible-client-charset.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/set-character-set.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/set-character-set.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (637,3,'SET NAMES','Syntax:\nSET NAMES {\'charset_name\'\n    [COLLATE \'collation_name\'] | DEFAULT}\n\nThis statement sets the three session system variables\ncharacter_set_client, character_set_connection, and\ncharacter_set_results to the given character set. Setting\ncharacter_set_connection to charset_name also sets collation_connection\nto the default collation for charset_name. See\nhttps://dev.mysql.com/doc/refman/8.0/en/charset-connection.html.\n\nThe optional COLLATE clause may be used to specify a collation\nexplicitly. If given, the collation must one of the permitted\ncollations for charset_name.\n\ncharset_name and collation_name may be quoted or unquoted.\n\nThe default mapping can be restored by using a value of DEFAULT. The\ndefault depends on the server configuration.\n\nSome character sets cannot be used as the client character set.\nAttempting to use them with SET NAMES produces an error. See\nhttps://dev.mysql.com/doc/refman/8.0/en/charset-connection.html#charset\n-connection-impermissible-client-charset.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/set-names.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/set-names.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (638,3,'SHOW','SHOW has many forms that provide information about databases, tables,\ncolumns, or status information about the server. This section describes\nthose following:\n\nSHOW {BINARY | MASTER} LOGS\nSHOW BINLOG EVENTS [IN \'log_name\'] [FROM pos] [LIMIT [offset,] row_count]\nSHOW CHARACTER SET [like_or_where]\nSHOW COLLATION [like_or_where]\nSHOW [FULL] COLUMNS FROM tbl_name [FROM db_name] [like_or_where]\nSHOW CREATE DATABASE db_name\nSHOW CREATE EVENT event_name\nSHOW CREATE FUNCTION func_name\nSHOW CREATE PROCEDURE proc_name\nSHOW CREATE TABLE tbl_name\nSHOW CREATE TRIGGER trigger_name\nSHOW CREATE VIEW view_name\nSHOW DATABASES [like_or_where]\nSHOW ENGINE engine_name {STATUS | MUTEX}\nSHOW [STORAGE] ENGINES\nSHOW ERRORS [LIMIT [offset,] row_count]\nSHOW EVENTS\nSHOW FUNCTION CODE func_name\nSHOW FUNCTION STATUS [like_or_where]\nSHOW GRANTS FOR user\nSHOW INDEX FROM tbl_name [FROM db_name]\nSHOW MASTER STATUS\nSHOW OPEN TABLES [FROM db_name] [like_or_where]\nSHOW PLUGINS\nSHOW PROCEDURE CODE proc_name\nSHOW PROCEDURE STATUS [like_or_where]\nSHOW PRIVILEGES\nSHOW [FULL] PROCESSLIST\nSHOW PROFILE [types] [FOR QUERY n] [OFFSET n] [LIMIT n]\nSHOW PROFILES\nSHOW RELAYLOG EVENTS [IN \'log_name\'] [FROM pos] [LIMIT [offset,] row_count]\nSHOW {REPLICAS | SLAVE HOSTS}\nSHOW {REPLICA | SLAVE} STATUS [FOR CHANNEL channel]\nSHOW [GLOBAL | SESSION] STATUS [like_or_where]\nSHOW TABLE STATUS [FROM db_name] [like_or_where]\nSHOW [FULL] TABLES [FROM db_name] [like_or_where]\nSHOW TRIGGERS [FROM db_name] [like_or_where]\nSHOW [GLOBAL | SESSION] VARIABLES [like_or_where]\nSHOW WARNINGS [LIMIT [offset,] row_count]\n\nlike_or_where: {\n    LIKE \'pattern\'\n  | WHERE expr\n}\n\nIf the syntax for a given SHOW statement includes a LIKE \'pattern\'\npart, \'pattern\' is a string that can contain the SQL % and _ wildcard\ncharacters. The pattern is useful for restricting statement output to\nmatching values.\n\nSeveral SHOW statements also accept a WHERE clause that provides more\nflexibility in specifying which rows to display. See\nhttps://dev.mysql.com/doc/refman/8.0/en/extended-show.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (639,3,'SHOW BINARY LOGS','Syntax:\nSHOW BINARY LOGS\nSHOW MASTER LOGS\n\nLists the binary log files on the server. This statement is used as\npart of the procedure described in [HELP PURGE BINARY LOGS], that shows\nhow to determine which logs can be purged. SHOW BINARY LOGS requires\nthe REPLICATION CLIENT privilege (or the deprecated SUPER privilege).\n\nEncrypted binary log files have a 512-byte file header that stores\ninformation required for encryption and decryption of the file. This is\nincluded in the file size displayed by SHOW BINARY LOGS. The Encrypted\ncolumn shows whether or not the binary log file is encrypted. Binary\nlog encryption is active if binlog_encryption=ON is set for the server.\nExisting binary log files are not encrypted or decrypted if binary log\nencryption is activated or deactivated while the server is running.\n\nmysql> SHOW BINARY LOGS;\n+---------------+-----------+-----------+\n| Log_name      | File_size | Encrypted |\n+---------------+-----------+-----------+\n| binlog.000015 |    724935 |       Yes |\n| binlog.000016 |    733481 |       Yes |\n+---------------+-----------+-----------+\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-binary-logs.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-binary-logs.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (640,3,'SHOW MASTER LOGS','Syntax:\nSHOW BINARY LOGS\nSHOW MASTER LOGS\n\nLists the binary log files on the server. This statement is used as\npart of the procedure described in [HELP PURGE BINARY LOGS], that shows\nhow to determine which logs can be purged. SHOW BINARY LOGS requires\nthe REPLICATION CLIENT privilege (or the deprecated SUPER privilege).\n\nEncrypted binary log files have a 512-byte file header that stores\ninformation required for encryption and decryption of the file. This is\nincluded in the file size displayed by SHOW BINARY LOGS. The Encrypted\ncolumn shows whether or not the binary log file is encrypted. Binary\nlog encryption is active if binlog_encryption=ON is set for the server.\nExisting binary log files are not encrypted or decrypted if binary log\nencryption is activated or deactivated while the server is running.\n\nmysql> SHOW BINARY LOGS;\n+---------------+-----------+-----------+\n| Log_name      | File_size | Encrypted |\n+---------------+-----------+-----------+\n| binlog.000015 |    724935 |       Yes |\n| binlog.000016 |    733481 |       Yes |\n+---------------+-----------+-----------+\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-binary-logs.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-binary-logs.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (641,3,'SHOW BINLOG EVENTS','Syntax:\nSHOW BINLOG EVENTS\n   [IN \'log_name\']\n   [FROM pos]\n   [LIMIT [offset,] row_count]\n\nShows the events in the binary log. If you do not specify \'log_name\',\nthe first binary log is displayed. SHOW BINLOG EVENTS requires the\nREPLICATION SLAVE privilege.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-binlog-events.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-binlog-events.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (642,3,'SHOW CHARACTER SET','Syntax:\nSHOW CHARACTER SET\n    [LIKE \'pattern\' | WHERE expr]\n\nThe SHOW CHARACTER SET statement shows all available character sets.\nThe LIKE clause, if present, indicates which character set names to\nmatch. The WHERE clause can be given to select rows using more general\nconditions, as discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/extended-show.html. For\nexample:\n\nmysql> SHOW CHARACTER SET LIKE \'latin%\';\n+---------+-----------------------------+-------------------+--------+\n| Charset | Description                 | Default collation | Maxlen |\n+---------+-----------------------------+-------------------+--------+\n| latin1  | cp1252 West European        | latin1_swedish_ci |      1 |\n| latin2  | ISO 8859-2 Central European | latin2_general_ci |      1 |\n| latin5  | ISO 8859-9 Turkish          | latin5_turkish_ci |      1 |\n| latin7  | ISO 8859-13 Baltic          | latin7_general_ci |      1 |\n+---------+-----------------------------+-------------------+--------+\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-character-set.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-character-set.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (643,3,'SHOW COLLATION','Syntax:\nSHOW COLLATION\n    [LIKE \'pattern\' | WHERE expr]\n\nThis statement lists collations supported by the server. By default,\nthe output from SHOW COLLATION includes all available collations. The\nLIKE clause, if present, indicates which collation names to match. The\nWHERE clause can be given to select rows using more general conditions,\nas discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/extended-show.html. For\nexample:\n\nmysql> SHOW COLLATION WHERE Charset = \'latin1\';\n+-------------------+---------+----+---------+----------+---------+\n| Collation         | Charset | Id | Default | Compiled | Sortlen |\n+-------------------+---------+----+---------+----------+---------+\n| latin1_german1_ci | latin1  |  5 |         | Yes      |       1 |\n| latin1_swedish_ci | latin1  |  8 | Yes     | Yes      |       1 |\n| latin1_danish_ci  | latin1  | 15 |         | Yes      |       1 |\n| latin1_german2_ci | latin1  | 31 |         | Yes      |       2 |\n| latin1_bin        | latin1  | 47 |         | Yes      |       1 |\n| latin1_general_ci | latin1  | 48 |         | Yes      |       1 |\n| latin1_general_cs | latin1  | 49 |         | Yes      |       1 |\n| latin1_spanish_ci | latin1  | 94 |         | Yes      |       1 |\n+-------------------+---------+----+---------+----------+---------+\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-collation.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-collation.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (644,3,'SHOW COLUMNS','Syntax:\nSHOW [EXTENDED] [FULL] {COLUMNS | FIELDS}\n    {FROM | IN} tbl_name\n    [{FROM | IN} db_name]\n    [LIKE \'pattern\' | WHERE expr]\n\nSHOW COLUMNS displays information about the columns in a given table.\nIt also works for views. SHOW COLUMNS displays information only for\nthose columns for which you have some privilege.\n\nmysql> SHOW COLUMNS FROM City;\n+-------------+----------+------+-----+---------+----------------+\n| Field       | Type     | Null | Key | Default | Extra          |\n+-------------+----------+------+-----+---------+----------------+\n| ID          | int(11)  | NO   | PRI | NULL    | auto_increment |\n| Name        | char(35) | NO   |     |         |                |\n| CountryCode | char(3)  | NO   | MUL |         |                |\n| District    | char(20) | NO   |     |         |                |\n| Population  | int(11)  | NO   |     | 0       |                |\n+-------------+----------+------+-----+---------+----------------+\n\nAn alternative to tbl_name FROM db_name syntax is db_name.tbl_name.\nThese two statements are equivalent:\n\nSHOW COLUMNS FROM mytable FROM mydb;\nSHOW COLUMNS FROM mydb.mytable;\n\nThe optional EXTENDED keyword causes the output to include information\nabout hidden columns that MySQL uses internally and are not accessible\nby users.\n\nThe optional FULL keyword causes the output to include the column\ncollation and comments, as well as the privileges you have for each\ncolumn.\n\nThe LIKE clause, if present, indicates which column names to match. The\nWHERE clause can be given to select rows using more general conditions,\nas discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/extended-show.html.\n\nThe data types may differ from what you expect them to be based on a\nCREATE TABLE statement because MySQL sometimes changes data types when\nyou create or alter a table. The conditions under which this occurs are\ndescribed in\nhttps://dev.mysql.com/doc/refman/8.0/en/silent-column-changes.html.\n\nSHOW COLUMNS displays the following values for each table column:\n\no Field\n\n  The name of the column.\n\no Type\n\n  The column data type.\n\no Collation\n\n  The collation for nonbinary string columns, or NULL for other\n  columns. This value is displayed only if you use the FULL keyword.\n\no Null\n\n  The column nullability. The value is YES if NULL values can be stored\n  in the column, NO if not.\n\no Key\n\n  Whether the column is indexed:\n\n  o If Key is empty, the column either is not indexed or is indexed\n    only as a secondary column in a multiple-column, nonunique index.\n\n  o If Key is PRI, the column is a PRIMARY KEY or is one of the columns\n    in a multiple-column PRIMARY KEY.\n\n  o If Key is UNI, the column is the first column of a UNIQUE index. (A\n    UNIQUE index permits multiple NULL values, but you can tell whether\n    the column permits NULL by checking the Null field.)\n\n  o If Key is MUL, the column is the first column of a nonunique index\n    in which multiple occurrences of a given value are permitted within\n    the column.\n\n  If more than one of the Key values applies to a given column of a\n  table, Key displays the one with the highest priority, in the order\n  PRI, UNI, MUL.\n\n  A UNIQUE index may be displayed as PRI if it cannot contain NULL\n  values and there is no PRIMARY KEY in the table. A UNIQUE index may\n  display as MUL if several columns form a composite UNIQUE index;\n  although the combination of the columns is unique, each column can\n  still hold multiple occurrences of a given value.\n\no Default\n\n  The default value for the column. This is NULL if the column has an\n  explicit default of NULL, or if the column definition includes no\n  DEFAULT clause.\n\no Extra\n\n  Any additional information that is available about a given column.\n  The value is nonempty in these cases:\n\n  o auto_increment for columns that have the AUTO_INCREMENT attribute.\n\n  o on update CURRENT_TIMESTAMP for TIMESTAMP or DATETIME columns that\n    have the ON UPDATE CURRENT_TIMESTAMP attribute.\n\n  o VIRTUAL GENERATED or VIRTUAL STORED for generated columns.\n\n  o DEFAULT_GENERATED for columns that have an expression default\n    value.\n\no Privileges\n\n  The privileges you have for the column. This value is displayed only\n  if you use the FULL keyword.\n\no Comment\n\n  Any comment included in the column definition. This value is\n  displayed only if you use the FULL keyword.\n\nTable column information is also available from the INFORMATION_SCHEMA\nCOLUMNS table. See\nhttps://dev.mysql.com/doc/refman/8.0/en/information-schema-columns-tabl\ne.html. The extended information about hidden columns is available only\nusing SHOW EXTENDED COLUMNS; it cannot be obtained from the COLUMNS\ntable.\n\nYou can list a table\'s columns with the mysqlshow db_name tbl_name\ncommand.\n\nThe DESCRIBE statement provides information similar to SHOW COLUMNS.\nSee https://dev.mysql.com/doc/refman/8.0/en/describe.html.\n\nThe SHOW CREATE TABLE, SHOW TABLE STATUS, and SHOW INDEX statements\nalso provide information about tables. See [HELP SHOW].\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-columns.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-columns.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (645,3,'SHOW FIELDS','Syntax:\nSHOW [EXTENDED] [FULL] {COLUMNS | FIELDS}\n    {FROM | IN} tbl_name\n    [{FROM | IN} db_name]\n    [LIKE \'pattern\' | WHERE expr]\n\nSHOW COLUMNS displays information about the columns in a given table.\nIt also works for views. SHOW COLUMNS displays information only for\nthose columns for which you have some privilege.\n\nmysql> SHOW COLUMNS FROM City;\n+-------------+----------+------+-----+---------+----------------+\n| Field       | Type     | Null | Key | Default | Extra          |\n+-------------+----------+------+-----+---------+----------------+\n| ID          | int(11)  | NO   | PRI | NULL    | auto_increment |\n| Name        | char(35) | NO   |     |         |                |\n| CountryCode | char(3)  | NO   | MUL |         |                |\n| District    | char(20) | NO   |     |         |                |\n| Population  | int(11)  | NO   |     | 0       |                |\n+-------------+----------+------+-----+---------+----------------+\n\nAn alternative to tbl_name FROM db_name syntax is db_name.tbl_name.\nThese two statements are equivalent:\n\nSHOW COLUMNS FROM mytable FROM mydb;\nSHOW COLUMNS FROM mydb.mytable;\n\nThe optional EXTENDED keyword causes the output to include information\nabout hidden columns that MySQL uses internally and are not accessible\nby users.\n\nThe optional FULL keyword causes the output to include the column\ncollation and comments, as well as the privileges you have for each\ncolumn.\n\nThe LIKE clause, if present, indicates which column names to match. The\nWHERE clause can be given to select rows using more general conditions,\nas discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/extended-show.html.\n\nThe data types may differ from what you expect them to be based on a\nCREATE TABLE statement because MySQL sometimes changes data types when\nyou create or alter a table. The conditions under which this occurs are\ndescribed in\nhttps://dev.mysql.com/doc/refman/8.0/en/silent-column-changes.html.\n\nSHOW COLUMNS displays the following values for each table column:\n\no Field\n\n  The name of the column.\n\no Type\n\n  The column data type.\n\no Collation\n\n  The collation for nonbinary string columns, or NULL for other\n  columns. This value is displayed only if you use the FULL keyword.\n\no Null\n\n  The column nullability. The value is YES if NULL values can be stored\n  in the column, NO if not.\n\no Key\n\n  Whether the column is indexed:\n\n  o If Key is empty, the column either is not indexed or is indexed\n    only as a secondary column in a multiple-column, nonunique index.\n\n  o If Key is PRI, the column is a PRIMARY KEY or is one of the columns\n    in a multiple-column PRIMARY KEY.\n\n  o If Key is UNI, the column is the first column of a UNIQUE index. (A\n    UNIQUE index permits multiple NULL values, but you can tell whether\n    the column permits NULL by checking the Null field.)\n\n  o If Key is MUL, the column is the first column of a nonunique index\n    in which multiple occurrences of a given value are permitted within\n    the column.\n\n  If more than one of the Key values applies to a given column of a\n  table, Key displays the one with the highest priority, in the order\n  PRI, UNI, MUL.\n\n  A UNIQUE index may be displayed as PRI if it cannot contain NULL\n  values and there is no PRIMARY KEY in the table. A UNIQUE index may\n  display as MUL if several columns form a composite UNIQUE index;\n  although the combination of the columns is unique, each column can\n  still hold multiple occurrences of a given value.\n\no Default\n\n  The default value for the column. This is NULL if the column has an\n  explicit default of NULL, or if the column definition includes no\n  DEFAULT clause.\n\no Extra\n\n  Any additional information that is available about a given column.\n  The value is nonempty in these cases:\n\n  o auto_increment for columns that have the AUTO_INCREMENT attribute.\n\n  o on update CURRENT_TIMESTAMP for TIMESTAMP or DATETIME columns that\n    have the ON UPDATE CURRENT_TIMESTAMP attribute.\n\n  o VIRTUAL GENERATED or VIRTUAL STORED for generated columns.\n\n  o DEFAULT_GENERATED for columns that have an expression default\n    value.\n\no Privileges\n\n  The privileges you have for the column. This value is displayed only\n  if you use the FULL keyword.\n\no Comment\n\n  Any comment included in the column definition. This value is\n  displayed only if you use the FULL keyword.\n\nTable column information is also available from the INFORMATION_SCHEMA\nCOLUMNS table. See\nhttps://dev.mysql.com/doc/refman/8.0/en/information-schema-columns-tabl\ne.html. The extended information about hidden columns is available only\nusing SHOW EXTENDED COLUMNS; it cannot be obtained from the COLUMNS\ntable.\n\nYou can list a table\'s columns with the mysqlshow db_name tbl_name\ncommand.\n\nThe DESCRIBE statement provides information similar to SHOW COLUMNS.\nSee https://dev.mysql.com/doc/refman/8.0/en/describe.html.\n\nThe SHOW CREATE TABLE, SHOW TABLE STATUS, and SHOW INDEX statements\nalso provide information about tables. See [HELP SHOW].\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-columns.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-columns.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (646,3,'SHOW CREATE DATABASE','Syntax:\nSHOW CREATE {DATABASE | SCHEMA} [IF NOT EXISTS] db_name\n\nShows the CREATE DATABASE statement that creates the named database. If\nthe SHOW statement includes an IF NOT EXISTS clause, the output too\nincludes such a clause. SHOW CREATE SCHEMA is a synonym for SHOW CREATE\nDATABASE.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-create-database.html\n\n','mysql> SHOW CREATE DATABASE test\\G\n*************************** 1. row ***************************\n       Database: test\nCreate Database: CREATE DATABASE `test` /*!40100 DEFAULT CHARACTER SET utf8mb4\n                 COLLATE utf8mb4_0900_ai_ci */ /*!80014 DEFAULT ENCRYPTION=\'N\' */\n\nmysql> SHOW CREATE SCHEMA test\\G\n*************************** 1. row ***************************\n       Database: test\nCreate Database: CREATE DATABASE `test` /*!40100 DEFAULT CHARACTER SET utf8mb4\n                 COLLATE utf8mb4_0900_ai_ci */ /*!80014 DEFAULT ENCRYPTION=\'N\' */\n','https://dev.mysql.com/doc/refman/8.0/en/show-create-database.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (647,3,'SHOW CREATE SCHEMA','Syntax:\nSHOW CREATE {DATABASE | SCHEMA} [IF NOT EXISTS] db_name\n\nShows the CREATE DATABASE statement that creates the named database. If\nthe SHOW statement includes an IF NOT EXISTS clause, the output too\nincludes such a clause. SHOW CREATE SCHEMA is a synonym for SHOW CREATE\nDATABASE.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-create-database.html\n\n','mysql> SHOW CREATE DATABASE test\\G\n*************************** 1. row ***************************\n       Database: test\nCreate Database: CREATE DATABASE `test` /*!40100 DEFAULT CHARACTER SET utf8mb4\n                 COLLATE utf8mb4_0900_ai_ci */ /*!80014 DEFAULT ENCRYPTION=\'N\' */\n\nmysql> SHOW CREATE SCHEMA test\\G\n*************************** 1. row ***************************\n       Database: test\nCreate Database: CREATE DATABASE `test` /*!40100 DEFAULT CHARACTER SET utf8mb4\n                 COLLATE utf8mb4_0900_ai_ci */ /*!80014 DEFAULT ENCRYPTION=\'N\' */\n','https://dev.mysql.com/doc/refman/8.0/en/show-create-database.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (648,3,'SHOW CREATE EVENT','Syntax:\nSHOW CREATE EVENT event_name\n\nThis statement displays the CREATE EVENT statement needed to re-create\na given event. It requires the EVENT privilege for the database from\nwhich the event is to be shown. For example (using the same event\ne_daily defined and then altered in [HELP SHOW EVENTS]):\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-create-event.html\n\n','mysql> SHOW CREATE EVENT myschema.e_daily\\G\n*************************** 1. row ***************************\n               Event: e_daily\n            sql_mode: ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,\n                      NO_ZERO_IN_DATE,NO_ZERO_DATE,\n                      ERROR_FOR_DIVISION_BY_ZERO,\n                      NO_ENGINE_SUBSTITUTION\n           time_zone: SYSTEM\n        Create Event: CREATE DEFINER=`jon`@`ghidora` EVENT `e_daily`\n                        ON SCHEDULE EVERY 1 DAY\n                        STARTS CURRENT_TIMESTAMP + INTERVAL 6 HOUR\n                        ON COMPLETION NOT PRESERVE\n                        ENABLE\n                        COMMENT \'Saves total number of sessions then\n                                clears the table each day\'\n                        DO BEGIN\n                          INSERT INTO site_activity.totals (time, total)\n                            SELECT CURRENT_TIMESTAMP, COUNT(*)\n                              FROM site_activity.sessions;\n                          DELETE FROM site_activity.sessions;\n                        END\ncharacter_set_client: utf8mb4\ncollation_connection: utf8mb4_0900_ai_ci\n  Database Collation: utf8mb4_0900_ai_ci\n','https://dev.mysql.com/doc/refman/8.0/en/show-create-event.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (649,3,'SHOW CREATE FUNCTION','Syntax:\nSHOW CREATE FUNCTION func_name\n\nThis statement is similar to SHOW CREATE PROCEDURE but for stored\nfunctions. See [HELP SHOW CREATE PROCEDURE].\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-create-function.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-create-function.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (650,3,'SHOW CREATE PROCEDURE','Syntax:\nSHOW CREATE PROCEDURE proc_name\n\nThis statement is a MySQL extension. It returns the exact string that\ncan be used to re-create the named stored procedure. A similar\nstatement, SHOW CREATE FUNCTION, displays information about stored\nfunctions (see [HELP SHOW CREATE FUNCTION]).\n\nTo use either statement, you must be the user named as the routine\nDEFINER, have the SHOW_ROUTINE privilege, have the SELECT privilege at\nthe global level, or have the CREATE ROUTINE, ALTER ROUTINE, or EXECUTE\nprivilege granted at a scope that includes the routine. The value\ndisplayed for the Create Procedure or Create Function field is NULL if\nyou have only CREATE ROUTINE, ALTER ROUTINE, or EXECUTE.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-create-procedure.html\n\n','mysql> SHOW CREATE PROCEDURE test.citycount\\G\n*************************** 1. row ***************************\n           Procedure: citycount\n            sql_mode: ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,\n                      NO_ZERO_IN_DATE,NO_ZERO_DATE,\n                      ERROR_FOR_DIVISION_BY_ZERO,\n                      NO_ENGINE_SUBSTITUTION\n    Create Procedure: CREATE DEFINER=`me`@`localhost`\n                      PROCEDURE `citycount`(IN country CHAR(3), OUT cities INT)\n                      BEGIN\n                        SELECT COUNT(*) INTO cities FROM world.city\n                        WHERE CountryCode = country;\n                      END\ncharacter_set_client: utf8mb4\ncollation_connection: utf8mb4_0900_ai_ci\n  Database Collation: utf8mb4_0900_ai_ci\n\nmysql> SHOW CREATE FUNCTION test.hello\\G\n*************************** 1. row ***************************\n            Function: hello\n            sql_mode: ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,\n                      NO_ZERO_IN_DATE,NO_ZERO_DATE,\n                      ERROR_FOR_DIVISION_BY_ZERO,\n                      NO_ENGINE_SUBSTITUTION\n     Create Function: CREATE DEFINER=`me`@`localhost`\n                      FUNCTION `hello`(s CHAR(20))\n                      RETURNS char(50) CHARSET utf8mb4\n                      DETERMINISTIC\n                      RETURN CONCAT(\'Hello, \',s,\'!\')\ncharacter_set_client: utf8mb4\ncollation_connection: utf8mb4_0900_ai_ci\n  Database Collation: utf8mb4_0900_ai_ci\n','https://dev.mysql.com/doc/refman/8.0/en/show-create-procedure.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (651,3,'SHOW CREATE TABLE','Syntax:\nSHOW CREATE TABLE tbl_name\n\nShows the CREATE TABLE statement that creates the named table. To use\nthis statement, you must have some privilege for the table. This\nstatement also works with views.\n\nAs of MySQL 8.0.16, MySQL implements CHECK constraints and SHOW CREATE\nTABLE displays them. All CHECK constraints are displayed as table\nconstraints. That is, a CHECK constraint originally specified as part\nof a column definition displays as a separate clause not part of the\ncolumn definition. Example:\n\nmysql> CREATE TABLE t1 (\n         i1 INT CHECK (i1 <> 0),      -- column constraint\n         i2 INT,\n         CHECK (i2 > i1),             -- table constraint\n         CHECK (i2 <> 0) NOT ENFORCED -- table constraint, not enforced\n       );\n\nmysql> SHOW CREATE TABLE t1\\G\n*************************** 1. row ***************************\n       Table: t1\nCreate Table: CREATE TABLE `t1` (\n  `i1` int(11) DEFAULT NULL,\n  `i2` int(11) DEFAULT NULL,\n  CONSTRAINT `t1_chk_1` CHECK ((`i1` <> 0)),\n  CONSTRAINT `t1_chk_2` CHECK ((`i2` > `i1`)),\n  CONSTRAINT `t1_chk_3` CHECK ((`i2` <> 0)) /*!80016 NOT ENFORCED */\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci\n\nSHOW CREATE TABLE quotes table and column names according to the value\nof the sql_quote_show_create option. See\nhttps://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html.\n\nWhen altering the storage engine of a table, table options that are not\napplicable to the new storage engine are retained in the table\ndefinition to enable reverting the table with its previously defined\noptions to the original storage engine, if necessary. For example, when\nchanging the storage engine from InnoDB to MyISAM, InnoDB-specific\noptions such as ROW_FORMAT=COMPACT are retained.\n\nmysql> CREATE TABLE t1 (c1 INT PRIMARY KEY) ROW_FORMAT=COMPACT ENGINE=InnoDB;\nmysql> ALTER TABLE t1 ENGINE=MyISAM;\nmysql> SHOW CREATE TABLE t1\\G\n*************************** 1. row ***************************\n       Table: t1\nCreate Table: CREATE TABLE `t1` (\n  `c1` int NOT NULL,\n  PRIMARY KEY (`c1`)\n) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=COMPACT\n\nWhen creating a table with strict mode disabled, the storage engine\'s\ndefault row format is used if the specified row format is not\nsupported. The actual row format of the table is reported in the\nRow_format column in response to SHOW TABLE STATUS. SHOW CREATE TABLE\nshows the row format that was specified in the CREATE TABLE statement.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-create-table.html\n\n','mysql> SHOW CREATE TABLE t\\G\n*************************** 1. row ***************************\n       Table: t\nCreate Table: CREATE TABLE `t` (\n  `id` int(11) NOT NULL AUTO_INCREMENT,\n  `s` char(60) DEFAULT NULL,\n  PRIMARY KEY (`id`)\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4\n','https://dev.mysql.com/doc/refman/8.0/en/show-create-table.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (652,3,'SHOW CREATE TRIGGER','Syntax:\nSHOW CREATE TRIGGER trigger_name\n\nThis statement shows the CREATE TRIGGER statement that creates the\nnamed trigger. This statement requires the TRIGGER privilege for the\ntable associated with the trigger.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-create-trigger.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-create-trigger.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (653,3,'SHOW CREATE USER','Syntax:\nSHOW CREATE USER user\n\nThis statement shows the CREATE USER statement that creates the named\nuser. An error occurs if the user does not exist. The statement\nrequires the SELECT privilege for the mysql system schema, except to\nsee information for the current user. For the current user, the SELECT\nprivilege for the mysql.user system table is required for display of\nthe password hash in the IDENTIFIED AS clause; otherwise, the hash\ndisplays as <secret>.\n\nTo name the account, use the format described in\nhttps://dev.mysql.com/doc/refman/8.0/en/account-names.html. The host\nname part of the account name, if omitted, defaults to \'%\'. It is also\npossible to specify CURRENT_USER or CURRENT_USER() to refer to the\naccount associated with the current session.\n\nPassword hash values displayed in the IDENTIFIED WITH clause of output\nfrom SHOW CREATE USER may contain unprintable characters that have\nadverse effects on terminal displays and in other environments.\nEnabling the print_identified_with_as_hex system variable (available as\nof MySQL 8.0.17) causes SHOW CREATE USER to display such hash values as\nhexadecimal strings rather than as regular string literals. Hash values\nthat do not contain unprintable characters still display as regular\nstring literals, even with this variable enabled.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-create-user.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-create-user.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (654,3,'SHOW CREATE VIEW','Syntax:\nSHOW CREATE VIEW view_name\n\nThis statement shows the CREATE VIEW statement that creates the named\nview.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-create-view.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-create-view.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (655,3,'SHOW DATABASES','Syntax:\nSHOW {DATABASES | SCHEMAS}\n    [LIKE \'pattern\' | WHERE expr]\n\nSHOW DATABASES lists the databases on the MySQL server host. SHOW\nSCHEMAS is a synonym for SHOW DATABASES. The LIKE clause, if present,\nindicates which database names to match. The WHERE clause can be given\nto select rows using more general conditions, as discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/extended-show.html.\n\nYou see only those databases for which you have some kind of privilege,\nunless you have the global SHOW DATABASES privilege. You can also get\nthis list using the mysqlshow command.\n\nIf the server was started with the --skip-show-database option, you\ncannot use this statement at all unless you have the SHOW DATABASES\nprivilege.\n\nMySQL implements databases as directories in the data directory, so\nthis statement simply lists directories in that location. However, the\noutput may include names of directories that do not correspond to\nactual databases.\n\nDatabase information is also available from the INFORMATION_SCHEMA\nSCHEMATA table. See\nhttps://dev.mysql.com/doc/refman/8.0/en/information-schema-schemata-tab\nle.html.\n\n*Caution*:\n\nBecause any static global privilege is considered a privilege for all\ndatabases, any static global privilege enables a user to see all\ndatabase names with SHOW DATABASES or by examining the SCHEMATA table\nof INFORMATION_SCHEMA, except databases that have been restricted at\nthe database level by partial revokes.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-databases.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-databases.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (656,3,'SHOW SCHEMAS','Syntax:\nSHOW {DATABASES | SCHEMAS}\n    [LIKE \'pattern\' | WHERE expr]\n\nSHOW DATABASES lists the databases on the MySQL server host. SHOW\nSCHEMAS is a synonym for SHOW DATABASES. The LIKE clause, if present,\nindicates which database names to match. The WHERE clause can be given\nto select rows using more general conditions, as discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/extended-show.html.\n\nYou see only those databases for which you have some kind of privilege,\nunless you have the global SHOW DATABASES privilege. You can also get\nthis list using the mysqlshow command.\n\nIf the server was started with the --skip-show-database option, you\ncannot use this statement at all unless you have the SHOW DATABASES\nprivilege.\n\nMySQL implements databases as directories in the data directory, so\nthis statement simply lists directories in that location. However, the\noutput may include names of directories that do not correspond to\nactual databases.\n\nDatabase information is also available from the INFORMATION_SCHEMA\nSCHEMATA table. See\nhttps://dev.mysql.com/doc/refman/8.0/en/information-schema-schemata-tab\nle.html.\n\n*Caution*:\n\nBecause any static global privilege is considered a privilege for all\ndatabases, any static global privilege enables a user to see all\ndatabase names with SHOW DATABASES or by examining the SCHEMATA table\nof INFORMATION_SCHEMA, except databases that have been restricted at\nthe database level by partial revokes.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-databases.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-databases.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (657,3,'SHOW ENGINE','Syntax:\nSHOW ENGINE engine_name {STATUS | MUTEX}\n\nSHOW ENGINE displays operational information about a storage engine. It\nrequires the PROCESS privilege. The statement has these variants:\n\nSHOW ENGINE INNODB STATUS\nSHOW ENGINE INNODB MUTEX\nSHOW ENGINE PERFORMANCE_SCHEMA STATUS\n\nSHOW ENGINE INNODB STATUS displays extensive information from the\nstandard InnoDB Monitor about the state of the InnoDB storage engine.\nFor information about the standard monitor and other InnoDB Monitors\nthat provide information about InnoDB processing, see\nhttps://dev.mysql.com/doc/refman/8.0/en/innodb-monitors.html.\n\nSHOW ENGINE INNODB MUTEX displays InnoDB mutex and rw-lock statistics.\n\n*Note*:\n\nInnoDB mutexes and rwlocks can also be monitored using Performance\nSchema tables. See\nhttps://dev.mysql.com/doc/refman/8.0/en/monitor-innodb-mutex-waits-perf\normance-schema.html.\n\nMutex statistics collection is configured dynamically using the\nfollowing options:\n\no To enable the collection of mutex statistics, run:\n\nSET GLOBAL innodb_monitor_enable=\'latch\';\n\no To reset mutex statistics, run:\n\nSET GLOBAL innodb_monitor_reset=\'latch\';\n\no To disable the collection of mutex statistics, run:\n\nSET GLOBAL innodb_monitor_disable=\'latch\';\n\nCollection of mutex statistics for SHOW ENGINE INNODB MUTEX can also be\nenabled by setting innodb_monitor_enable=\'all\', or disabled by setting\ninnodb_monitor_disable=\'all\'.\n\nSHOW ENGINE INNODB MUTEX output has these columns:\n\no Type\n\n  Always InnoDB.\n\no Name\n\n  For mutexes, the Name field reports only the mutex name. For rwlocks,\n  the Name field reports the source file where the rwlock is\n  implemented, and the line number in the file where the rwlock is\n  created. The line number is specific to your version of MySQL.\n\no Status\n\n  The mutex status. This field reports the number of spins, waits, and\n  calls. Statistics for low-level operating system mutexes, which are\n  implemented outside of InnoDB, are not reported.\n\n  o spins indicates the number of spins.\n\n  o waits indicates the number of mutex waits.\n\n  o calls indicates how many times the mutex was requested.\n\nSHOW ENGINE INNODB MUTEX does not list mutexes and rw-locks for each\nbuffer pool block, as the amount of output would be overwhelming on\nsystems with a large buffer pool. SHOW ENGINE INNODB MUTEX does,\nhowever, print aggregate BUF_BLOCK_MUTEX spin, wait, and call values\nfor buffer pool block mutexes and rw-locks. SHOW ENGINE INNODB MUTEX\nalso does not list any mutexes or rw-locks that have never been waited\non (os_waits=0). Thus, SHOW ENGINE INNODB MUTEX only displays\ninformation about mutexes and rw-locks outside of the buffer pool that\nhave caused at least one OS-level wait.\n\nUse SHOW ENGINE PERFORMANCE_SCHEMA STATUS to inspect the internal\noperation of the Performance Schema code:\n\nmysql> SHOW ENGINE PERFORMANCE_SCHEMA STATUS\\G\n...\n*************************** 3. row ***************************\n  Type: performance_schema\n  Name: events_waits_history.size\nStatus: 76\n*************************** 4. row ***************************\n  Type: performance_schema\n  Name: events_waits_history.count\nStatus: 10000\n*************************** 5. row ***************************\n  Type: performance_schema\n  Name: events_waits_history.memory\nStatus: 760000\n...\n*************************** 57. row ***************************\n  Type: performance_schema\n  Name: performance_schema.memory\nStatus: 26459600\n...\n\nThis statement is intended to help the DBA understand the effects that\ndifferent Performance Schema options have on memory requirements.\n\nName values consist of two parts, which name an internal buffer and a\nbuffer attribute, respectively. Interpret buffer names as follows:\n\no An internal buffer that is not exposed as a table is named within\n  parentheses. Examples: (pfs_cond_class).size,\n  (pfs_mutex_class).memory.\n\no An internal buffer that is exposed as a table in the\n  performance_schema database is named after the table, without\n  parentheses. Examples: events_waits_history.size,\n  mutex_instances.count.\n\no A value that applies to the Performance Schema as a whole begins with\n  performance_schema. Example: performance_schema.memory.\n\nBuffer attributes have these meanings:\n\no size is the size of the internal record used by the implementation,\n  such as the size of a row in a table. size values cannot be changed.\n\no count is the number of internal records, such as the number of rows\n  in a table. count values can be changed using Performance Schema\n  configuration options.\n\no For a table, tbl_name.memory is the product of size and count. For\n  the Performance Schema as a whole, performance_schema.memory is the\n  sum of all the memory used (the sum of all other memory values).\n\nIn some cases, there is a direct relationship between a Performance\nSchema configuration parameter and a SHOW ENGINE value. For example,\nevents_waits_history_long.count corresponds to\nperformance_schema_events_waits_history_long_size. In other cases, the\nrelationship is more complex. For example, events_waits_history.count\ncorresponds to performance_schema_events_waits_history_size (the number\nof rows per thread) multiplied by\nperformance_schema_max_thread_instances ( the number of threads).\n\nSHOW ENGINE NDB STATUS If the server has the NDB storage engine\nenabled, SHOW ENGINE NDB STATUS displays cluster status information\nsuch as the number of connected data nodes, the cluster connectstring,\nand cluster binary log epochs, as well as counts of various Cluster API\nobjects created by the MySQL Server when connected to the cluster.\nSample output from this statement is shown here:\n\nmysql> SHOW ENGINE NDB STATUS;\n+------------+-----------------------+--------------------------------------------------+\n| Type       | Name                  | Status                                           |\n+------------+-----------------------+--------------------------------------------------+\n| ndbcluster | connection            | cluster_node_id=7,\n  connected_host=198.51.100.103, connected_port=1186, number_of_data_nodes=4,\n  number_of_ready_data_nodes=3, connect_count=0                                         |\n| ndbcluster | NdbTransaction        | created=6, free=0, sizeof=212                    |\n| ndbcluster | NdbOperation          | created=8, free=8, sizeof=660                    |\n| ndbcluster | NdbIndexScanOperation | created=1, free=1, sizeof=744                    |\n| ndbcluster | NdbIndexOperation     | created=0, free=0, sizeof=664                    |\n| ndbcluster | NdbRecAttr            | created=1285, free=1285, sizeof=60               |\n| ndbcluster | NdbApiSignal          | created=16, free=16, sizeof=136                  |\n| ndbcluster | NdbLabel              | created=0, free=0, sizeof=196                    |\n| ndbcluster | NdbBranch             | created=0, free=0, sizeof=24                     |\n| ndbcluster | NdbSubroutine         | created=0, free=0, sizeof=68                     |\n| ndbcluster | NdbCall               | created=0, free=0, sizeof=16                     |\n| ndbcluster | NdbBlob               | created=1, free=1, sizeof=264                    |\n| ndbcluster | NdbReceiver           | created=4, free=0, sizeof=68                     |\n| ndbcluster | binlog                | latest_epoch=155467, latest_trans_epoch=148126,\n  latest_received_binlog_epoch=0, latest_handled_binlog_epoch=0,\n  latest_applied_binlog_epoch=0                                                         |\n+------------+-----------------------+--------------------------------------------------+\n\nThe Status column in each of these rows provides information about the\nMySQL server\'s connection to the cluster and about the cluster binary\nlog\'s status, respectively. The Status information is in the form of\ncomma-delimited set of name/value pairs.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-engine.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-engine.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (658,3,'SHOW ENGINES','Syntax:\nSHOW [STORAGE] ENGINES\n\nSHOW ENGINES displays status information about the server\'s storage\nengines. This is particularly useful for checking whether a storage\nengine is supported, or to see what the default engine is.\n\nFor information about MySQL storage engines, see\nhttps://dev.mysql.com/doc/refman/8.0/en/innodb-storage-engine.html, and\nhttps://dev.mysql.com/doc/refman/8.0/en/storage-engines.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-engines.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-engines.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (659,3,'SHOW ERRORS','Syntax:\nSHOW ERRORS [LIMIT [offset,] row_count]\nSHOW COUNT(*) ERRORS\n\nSHOW ERRORS is a diagnostic statement that is similar to SHOW WARNINGS,\nexcept that it displays information only for errors, rather than for\nerrors, warnings, and notes.\n\nThe LIMIT clause has the same syntax as for the SELECT statement. See\nhttps://dev.mysql.com/doc/refman/8.0/en/select.html.\n\nThe SHOW COUNT(*) ERRORS statement displays the number of errors. You\ncan also retrieve this number from the error_count variable:\n\nSHOW COUNT(*) ERRORS;\nSELECT @@error_count;\n\nSHOW ERRORS and error_count apply only to errors, not warnings or\nnotes. In other respects, they are similar to SHOW WARNINGS and\nwarning_count. In particular, SHOW ERRORS cannot display information\nfor more than max_error_count messages, and error_count can exceed the\nvalue of max_error_count if the number of errors exceeds\nmax_error_count.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-errors.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-errors.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (660,3,'SHOW EVENTS','Syntax:\nSHOW EVENTS\n    [{FROM | IN} schema_name]\n    [LIKE \'pattern\' | WHERE expr]\n\nThis statement displays information about Event Manager events, which\nare discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/event-scheduler.html. It\nrequires the EVENT privilege for the database from which the events are\nto be shown.\n\nIn its simplest form, SHOW EVENTS lists all of the events in the\ncurrent schema:\n\nmysql> SELECT CURRENT_USER(), SCHEMA();\n+----------------+----------+\n| CURRENT_USER() | SCHEMA() |\n+----------------+----------+\n| jon@ghidora    | myschema |\n+----------------+----------+\n1 row in set (0.00 sec)\n\nmysql> SHOW EVENTS\\G\n*************************** 1. row ***************************\n                  Db: myschema\n                Name: e_daily\n             Definer: jon@ghidora\n           Time zone: SYSTEM\n                Type: RECURRING\n          Execute at: NULL\n      Interval value: 1\n      Interval field: DAY\n              Starts: 2018-08-08 11:06:34\n                Ends: NULL\n              Status: ENABLED\n          Originator: 1\ncharacter_set_client: utf8mb4\ncollation_connection: utf8mb4_0900_ai_ci\n  Database Collation: utf8mb4_0900_ai_ci\n\nTo see events for a specific schema, use the FROM clause. For example,\nto see events for the test schema, use the following statement:\n\nSHOW EVENTS FROM test;\n\nThe LIKE clause, if present, indicates which event names to match. The\nWHERE clause can be given to select rows using more general conditions,\nas discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/extended-show.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-events.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-events.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (661,3,'SHOW FUNCTION CODE','Syntax:\nSHOW FUNCTION CODE func_name\n\nThis statement is similar to SHOW PROCEDURE CODE but for stored\nfunctions. See [HELP SHOW PROCEDURE CODE].\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-function-code.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-function-code.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (662,3,'SHOW FUNCTION STATUS','Syntax:\nSHOW FUNCTION STATUS\n    [LIKE \'pattern\' | WHERE expr]\n\nThis statement is similar to SHOW PROCEDURE STATUS but for stored\nfunctions. See [HELP SHOW PROCEDURE STATUS].\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-function-status.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-function-status.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (663,3,'SHOW GRANTS','Syntax:\nSHOW GRANTS\n    [FOR user_or_role\n        [USING role [, role] ...]]\n\nuser_or_role: {\n    user (see )\n  | role (see .\n}\n\nThis statement displays the privileges and roles that are assigned to a\nMySQL user account or role, in the form of GRANT statements that must\nbe executed to duplicate the privilege and role assignments.\n\n*Note*:\n\nTo display nonprivilege information for MySQL accounts, use the SHOW\nCREATE USER statement. See [HELP SHOW CREATE USER].\n\nSHOW GRANTS requires the SELECT privilege for the mysql system schema,\nexcept to display privileges and roles for the current user.\n\nTo name the account or role for SHOW GRANTS, use the same format as for\nthe GRANT statement (for example, \'jeffrey\'@\'localhost\'):\n\nmysql> SHOW GRANTS FOR \'jeffrey\'@\'localhost\';\n+------------------------------------------------------------------+\n| Grants for jeffrey@localhost                                     |\n+------------------------------------------------------------------+\n| GRANT USAGE ON *.* TO `jeffrey`@`localhost`                      |\n| GRANT SELECT, INSERT, UPDATE ON `db1`.* TO `jeffrey`@`localhost` |\n+------------------------------------------------------------------+\n\nThe host part, if omitted, defaults to \'%\'. For additional information\nabout specifying account and role names, see\nhttps://dev.mysql.com/doc/refman/8.0/en/account-names.html, and\nhttps://dev.mysql.com/doc/refman/8.0/en/role-names.html.\n\nTo display the privileges granted to the current user (the account you\nare using to connect to the server), you can use any of the following\nstatements:\n\nSHOW GRANTS;\nSHOW GRANTS FOR CURRENT_USER;\nSHOW GRANTS FOR CURRENT_USER();\n\nIf SHOW GRANTS FOR CURRENT_USER (or any equivalent syntax) is used in\ndefiner context, such as within a stored procedure that executes with\ndefiner rather than invoker privileges, the grants displayed are those\nof the definer and not the invoker.\n\nIn MySQL 8.0 compared to previous series, SHOW GRANTS no longer\ndisplays ALL PRIVILEGES in its global-privileges output because the\nmeaning of ALL PRIVILEGES at the global level varies depending on which\ndynamic privileges are defined. Instead, SHOW GRANTS explictly lists\neach granted global privilege:\n\nmysql> SHOW GRANTS FOR \'root\'@\'localhost\';\n+---------------------------------------------------------------------+\n| Grants for root@localhost                                           |\n+---------------------------------------------------------------------+\n| GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD,         |\n| SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES,  |\n| SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION   |\n| SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE,  |\n| ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE,      |\n| CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT      |\n| OPTION                                                              |\n| GRANT PROXY ON \'\'@\'\' TO \'root\'@\'localhost\' WITH GRANT OPTION        |\n+---------------------------------------------------------------------+\n\nApplications that process SHOW GRANTS output should be adjusted\naccordingly.\n\nAt the global level, GRANT OPTION applies to all granted static global\nprivileges if granted for any of them, but applies individually to\ngranted dynamic privileges. SHOW GRANTS displays global privileges this\nway:\n\no One line listing all granted static privileges, if there are any,\n  including WITH GRANT OPTION if appropriate.\n\no One line listing all granted dynamic privileges for which GRANT\n  OPTION is granted, if there are any, including WITH GRANT OPTION.\n\no One line listing all granted dynamic privileges for which GRANT\n  OPTION is not granted, if there are any, without WITH GRANT OPTION.\n\nWith the optional USING clause, SHOW GRANTS enables you to examine the\nprivileges associated with roles for the user. Each role named in the\nUSING clause must be granted to the user.\n\nSuppose that user u1 is assigned roles r1 and r2, as follows:\n\nCREATE ROLE \'r1\', \'r2\';\nGRANT SELECT ON db1.* TO \'r1\';\nGRANT INSERT, UPDATE, DELETE ON db1.* TO \'r2\';\nCREATE USER \'u1\'@\'localhost\' IDENTIFIED BY \'u1pass\';\nGRANT \'r1\', \'r2\' TO \'u1\'@\'localhost\';\n\nSHOW GRANTS without USING shows the granted roles:\n\nmysql> SHOW GRANTS FOR \'u1\'@\'localhost\';\n+---------------------------------------------+\n| Grants for u1@localhost                     |\n+---------------------------------------------+\n| GRANT USAGE ON *.* TO `u1`@`localhost`      |\n| GRANT `r1`@`%`,`r2`@`%` TO `u1`@`localhost` |\n+---------------------------------------------+\n\nAdding a USING clause causes the statement to also display the\nprivileges associated with each role named in the clause:\n\nmysql> SHOW GRANTS FOR \'u1\'@\'localhost\' USING \'r1\';\n+---------------------------------------------+\n| Grants for u1@localhost                     |\n+---------------------------------------------+\n| GRANT USAGE ON *.* TO `u1`@`localhost`      |\n| GRANT SELECT ON `db1`.* TO `u1`@`localhost` |\n| GRANT `r1`@`%`,`r2`@`%` TO `u1`@`localhost` |\n+---------------------------------------------+\nmysql> SHOW GRANTS FOR \'u1\'@\'localhost\' USING \'r2\';\n+-------------------------------------------------------------+\n| Grants for u1@localhost                                     |\n+-------------------------------------------------------------+\n| GRANT USAGE ON *.* TO `u1`@`localhost`                      |\n| GRANT INSERT, UPDATE, DELETE ON `db1`.* TO `u1`@`localhost` |\n| GRANT `r1`@`%`,`r2`@`%` TO `u1`@`localhost`                 |\n+-------------------------------------------------------------+\nmysql> SHOW GRANTS FOR \'u1\'@\'localhost\' USING \'r1\', \'r2\';\n+---------------------------------------------------------------------+\n| Grants for u1@localhost                                             |\n+---------------------------------------------------------------------+\n| GRANT USAGE ON *.* TO `u1`@`localhost`                              |\n| GRANT SELECT, INSERT, UPDATE, DELETE ON `db1`.* TO `u1`@`localhost` |\n| GRANT `r1`@`%`,`r2`@`%` TO `u1`@`localhost`                         |\n+---------------------------------------------------------------------+\n\n*Note*:\n\nA privilege granted to an account is always in effect, but a role is\nnot. The active roles for an account can differ across and within\nsessions, depending on the value of the activate_all_roles_on_login\nsystem variable, the account default roles, and whether SET ROLE has\nbeen executed within a session.\n\nMySQL 8.0.16 and higher supports partial revokes of global privileges,\nsuch that a global privilege can be restricted from applying to\nparticular schemas (see\nhttps://dev.mysql.com/doc/refman/8.0/en/partial-revokes.html). To\nindicate which global schema privileges have been revoked for\nparticular schemas, SHOW GRANTS output includes REVOKE statements:\n\nmysql> SET PERSIST partial_revokes = ON;\nmysql> CREATE USER u1;\nmysql> GRANT SELECT, INSERT, DELETE ON *.* TO u1;\nmysql> REVOKE SELECT, INSERT ON mysql.* FROM u1;\nmysql> REVOKE DELETE ON world.* FROM u1;\nmysql> SHOW GRANTS FOR u1;\n+--------------------------------------------------+\n| Grants for u1@%                                  |\n+--------------------------------------------------+\n| GRANT SELECT, INSERT, DELETE ON *.* TO `u1`@`%`  |\n| REVOKE SELECT, INSERT ON `mysql`.* FROM `u1`@`%` |\n| REVOKE DELETE ON `world`.* FROM `u1`@`%`         |\n+--------------------------------------------------+\n\nSHOW GRANTS does not display privileges that are available to the named\naccount but are granted to a different account. For example, if an\nanonymous account exists, the named account might be able to use its\nprivileges, but SHOW GRANTS does not display them.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-grants.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-grants.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (664,3,'SHOW INDEX','Syntax:\nSHOW [EXTENDED] {INDEX | INDEXES | KEYS}\n    {FROM | IN} tbl_name\n    [{FROM | IN} db_name]\n    [WHERE expr]\n\nSHOW INDEX returns table index information. The format resembles that\nof the SQLStatistics call in ODBC. This statement requires some\nprivilege for any column in the table.\n\nmysql> SHOW INDEX FROM City\\G\n*************************** 1. row ***************************\n        Table: city\n   Non_unique: 0\n     Key_name: PRIMARY\n Seq_in_index: 1\n  Column_name: ID\n    Collation: A\n  Cardinality: 4188\n     Sub_part: NULL\n       Packed: NULL\n         Null:\n   Index_type: BTREE\n      Comment:\nIndex_comment:\n      Visible: YES\n   Expression: NULL\n*************************** 2. row ***************************\n        Table: city\n   Non_unique: 1\n     Key_name: CountryCode\n Seq_in_index: 1\n  Column_name: CountryCode\n    Collation: A\n  Cardinality: 232\n     Sub_part: NULL\n       Packed: NULL\n         Null:\n   Index_type: BTREE\n      Comment:\nIndex_comment:\n      Visible: YES\n   Expression: NULL\n\nAn alternative to tbl_name FROM db_name syntax is db_name.tbl_name.\nThese two statements are equivalent:\n\nSHOW INDEX FROM mytable FROM mydb;\nSHOW INDEX FROM mydb.mytable;\n\nThe optional EXTENDED keyword causes the output to include information\nabout hidden indexes that MySQL uses internally and are not accessible\nby users.\n\nThe WHERE clause can be given to select rows using more general\nconditions, as discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/extended-show.html.\n\nSHOW INDEX returns the following fields:\n\no Table\n\n  The name of the table.\n\no Non_unique\n\n  0 if the index cannot contain duplicates, 1 if it can.\n\no Key_name\n\n  The name of the index. If the index is the primary key, the name is\n  always PRIMARY.\n\no Seq_in_index\n\n  The column sequence number in the index, starting with 1.\n\no Column_name\n\n  The column name. See also the description for the Expression column.\n\no Collation\n\n  How the column is sorted in the index. This can have values A\n  (ascending), D (descending), or NULL (not sorted).\n\no Cardinality\n\n  An estimate of the number of unique values in the index. To update\n  this number, run ANALYZE TABLE or (for MyISAM tables) myisamchk -a.\n\n  Cardinality is counted based on statistics stored as integers, so the\n  value is not necessarily exact even for small tables. The higher the\n  cardinality, the greater the chance that MySQL uses the index when\n  doing joins.\n\no Sub_part\n\n  The index prefix. That is, the number of indexed characters if the\n  column is only partly indexed, NULL if the entire column is indexed.\n\n  *Note*:\n\n  Prefix limits are measured in bytes. However, prefix lengths for\n  index specifications in CREATE TABLE, ALTER TABLE, and CREATE INDEX\n  statements are interpreted as number of characters for nonbinary\n  string types (CHAR, VARCHAR, TEXT) and number of bytes for binary\n  string types (BINARY, VARBINARY, BLOB). Take this into account when\n  specifying a prefix length for a nonbinary string column that uses a\n  multibyte character set.\n\n  For additional information about index prefixes, see\n  https://dev.mysql.com/doc/refman/8.0/en/column-indexes.html, and\n  [HELP CREATE INDEX].\n\no Packed\n\n  Indicates how the key is packed. NULL if it is not.\n\no Null\n\n  Contains YES if the column may contain NULL values and \'\' if not.\n\no Index_type\n\n  The index method used (BTREE, FULLTEXT, HASH, RTREE).\n\no Comment\n\n  Information about the index not described in its own column, such as\n  disabled if the index is disabled.\n\no Index_comment\n\n  Any comment provided for the index with a COMMENT attribute when the\n  index was created.\n\no Visible\n\n  Whether the index is visible to the optimizer. See\n  https://dev.mysql.com/doc/refman/8.0/en/invisible-indexes.html.\n\no Expression\n\n  MySQL 8.0.13 and higher supports functional key parts (see\n  https://dev.mysql.com/doc/refman/8.0/en/create-index.html#create-inde\n  x-functional-key-parts), which affects both the Column_name and\n  Expression columns:\n\n  o For a nonfunctional key part, Column_name indicates the column\n    indexed by the key part and Expression is NULL.\n\n  o For a functional key part, Column_name column is NULL and\n    Expression indicates the expression for the key part.\n\nInformation about table indexes is also available from the\nINFORMATION_SCHEMA STATISTICS table. See\nhttps://dev.mysql.com/doc/refman/8.0/en/information-schema-statistics-t\nable.html. The extended information about hidden indexes is available\nonly using SHOW EXTENDED INDEX; it cannot be obtained from the\nSTATISTICS table.\n\nYou can list a table\'s indexes with the mysqlshow -k db_name tbl_name\ncommand.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-index.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-index.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (665,3,'SHOW MASTER STATUS','Syntax:\nSHOW MASTER STATUS\n\nThis statement provides status information about the binary log files\nof the source server. It requires the REPLICATION CLIENT privilege (or\nthe deprecated SUPER privilege).\n\nExample:\n\nmysql> SHOW MASTER STATUS\\G\n*************************** 1. row ***************************\n             File: source-bin.000002\n         Position: 1307\n     Binlog_Do_DB: test\n Binlog_Ignore_DB: manual, mysql\nExecuted_Gtid_Set: 3E11FA47-71CA-11E1-9E33-C80AA9429562:1-5\n1 row in set (0.00 sec)\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-master-status.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-master-status.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (666,3,'SHOW OPEN TABLES','Syntax:\nSHOW OPEN TABLES\n    [{FROM | IN} db_name]\n    [LIKE \'pattern\' | WHERE expr]\n\nSHOW OPEN TABLES lists the non-TEMPORARY tables that are currently open\nin the table cache. See\nhttps://dev.mysql.com/doc/refman/8.0/en/table-cache.html. The FROM\nclause, if present, restricts the tables shown to those present in the\ndb_name database. The LIKE clause, if present, indicates which table\nnames to match. The WHERE clause can be given to select rows using more\ngeneral conditions, as discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/extended-show.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-open-tables.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-open-tables.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (667,3,'SHOW PLUGINS','Syntax:\nSHOW PLUGINS\n\nSHOW PLUGINS displays information about server plugins.\n\nExample of SHOW PLUGINS output:\n\nmysql> SHOW PLUGINS\\G\n*************************** 1. row ***************************\n   Name: binlog\n Status: ACTIVE\n   Type: STORAGE ENGINE\nLibrary: NULL\nLicense: GPL\n*************************** 2. row ***************************\n   Name: CSV\n Status: ACTIVE\n   Type: STORAGE ENGINE\nLibrary: NULL\nLicense: GPL\n*************************** 3. row ***************************\n   Name: MEMORY\n Status: ACTIVE\n   Type: STORAGE ENGINE\nLibrary: NULL\nLicense: GPL\n*************************** 4. row ***************************\n   Name: MyISAM\n Status: ACTIVE\n   Type: STORAGE ENGINE\nLibrary: NULL\nLicense: GPL\n...\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-plugins.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-plugins.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (668,3,'SHOW PRIVILEGES','Syntax:\nSHOW PRIVILEGES\n\nSHOW PRIVILEGES shows the list of system privileges that the MySQL\nserver supports. The privileges displayed include all static\nprivileges, and all currently registered dynamic privileges.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-privileges.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-privileges.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (669,3,'SHOW PROCEDURE CODE','Syntax:\nSHOW PROCEDURE CODE proc_name\n\nThis statement is a MySQL extension that is available only for servers\nthat have been built with debugging support. It displays a\nrepresentation of the internal implementation of the named stored\nprocedure. A similar statement, SHOW FUNCTION CODE, displays\ninformation about stored functions (see [HELP SHOW FUNCTION CODE]).\n\nTo use either statement, you must be the user named as the routine\nDEFINER, have the SHOW_ROUTINE privilege, or have the SELECT privilege\nat the global level.\n\nIf the named routine is available, each statement produces a result\nset. Each row in the result set corresponds to one "instruction" in the\nroutine. The first column is Pos, which is an ordinal number beginning\nwith 0. The second column is Instruction, which contains an SQL\nstatement (usually changed from the original source), or a directive\nwhich has meaning only to the stored-routine handler.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-procedure-code.html\n\n','mysql> DELIMITER //\nmysql> CREATE PROCEDURE p1 ()\n       BEGIN\n         DECLARE fanta INT DEFAULT 55;\n         DROP TABLE t2;\n         LOOP\n           INSERT INTO t3 VALUES (fanta);\n           END LOOP;\n         END//\nQuery OK, 0 rows affected (0.01 sec)\n\nmysql> SHOW PROCEDURE CODE p1//\n+-----+----------------------------------------+\n| Pos | Instruction                            |\n+-----+----------------------------------------+\n|   0 | set fanta@0 55                         |\n|   1 | stmt 9 "DROP TABLE t2"                 |\n|   2 | stmt 5 "INSERT INTO t3 VALUES (fanta)" |\n|   3 | jump 2                                 |\n+-----+----------------------------------------+\n4 rows in set (0.00 sec)\n\nmysql> CREATE FUNCTION test.hello (s CHAR(20))\n       RETURNS CHAR(50) DETERMINISTIC\n       RETURN CONCAT(\'Hello, \',s,\'!\');\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> SHOW FUNCTION CODE test.hello;\n+-----+---------------------------------------+\n| Pos | Instruction                           |\n+-----+---------------------------------------+\n|   0 | freturn 254 concat(\'Hello, \',s@0,\'!\') |\n+-----+---------------------------------------+\n1 row in set (0.00 sec)\n','https://dev.mysql.com/doc/refman/8.0/en/show-procedure-code.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (670,3,'SHOW PROCEDURE STATUS','Syntax:\nSHOW PROCEDURE STATUS\n    [LIKE \'pattern\' | WHERE expr]\n\nThis statement is a MySQL extension. It returns characteristics of a\nstored procedure, such as the database, name, type, creator, creation\nand modification dates, and character set information. A similar\nstatement, SHOW FUNCTION STATUS, displays information about stored\nfunctions (see [HELP SHOW FUNCTION STATUS]).\n\nTo use either statement, you must be the user named as the routine\nDEFINER, have the SHOW_ROUTINE privilege, have the SELECT privilege at\nthe global level, or have the CREATE ROUTINE, ALTER ROUTINE, or EXECUTE\nprivilege granted at a scope that includes the routine.\n\nThe LIKE clause, if present, indicates which procedure or function\nnames to match. The WHERE clause can be given to select rows using more\ngeneral conditions, as discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/extended-show.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-procedure-status.html\n\n','mysql> SHOW PROCEDURE STATUS LIKE \'sp1\'\\G\n*************************** 1. row ***************************\n                  Db: test\n                Name: sp1\n                Type: PROCEDURE\n             Definer: testuser@localhost\n            Modified: 2018-08-08 13:54:11\n             Created: 2018-08-08 13:54:11\n       Security_type: DEFINER\n             Comment:\ncharacter_set_client: utf8mb4\ncollation_connection: utf8mb4_0900_ai_ci\n  Database Collation: utf8mb4_0900_ai_ci\n\nmysql> SHOW FUNCTION STATUS LIKE \'hello\'\\G\n*************************** 1. row ***************************\n                  Db: test\n                Name: hello\n                Type: FUNCTION\n             Definer: testuser@localhost\n            Modified: 2020-03-10 11:10:03\n             Created: 2020-03-10 11:10:03\n       Security_type: DEFINER\n             Comment:\ncharacter_set_client: utf8mb4\ncollation_connection: utf8mb4_0900_ai_ci\n  Database Collation: utf8mb4_0900_ai_ci\n','https://dev.mysql.com/doc/refman/8.0/en/show-procedure-status.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (671,3,'SHOW PROCESSLIST','Syntax:\nSHOW [FULL] PROCESSLIST\n\nThe MySQL process list indicates the operations currently being\nperformed by the set of threads executing within the server. The SHOW\nPROCESSLIST statement is one source of process information. For a\ncomparison of this statement with other sources, see\nhttps://dev.mysql.com/doc/refman/8.0/en/processlist-access.html#process\nlist-sources.\n\n*Note*:\n\nAs of MySQL 8.0.22, an alternative implementation for SHOW PROCESSLIST\nis available based on the Performance Schema processlist table, which,\nunlike the default SHOW PROCESSLIST implementation, does not require a\nmutex and has better performance characteristics. For details, see\nhttps://dev.mysql.com/doc/refman/8.0/en/performance-schema-processlist-\ntable.html.\n\nIf you have the PROCESS privilege, you can see all threads, even those\nbelonging to other users. Otherwise (without the PROCESS privilege),\nnonanonymous users have access to information about their own threads\nbut not threads for other users, and anonymous users have no access to\nthread information.\n\nWithout the FULL keyword, SHOW PROCESSLIST displays only the first 100\ncharacters of each statement in the Info field.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-processlist.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-processlist.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (672,3,'SHOW PROFILE','Syntax:\nSHOW PROFILE [type [, type] ... ]\n    [FOR QUERY n]\n    [LIMIT row_count [OFFSET offset]]\n\ntype: {\n    ALL\n  | BLOCK IO\n  | CONTEXT SWITCHES\n  | CPU\n  | IPC\n  | MEMORY\n  | PAGE FAULTS\n  | SOURCE\n  | SWAPS\n}\n\nThe SHOW PROFILE and SHOW PROFILES statements display profiling\ninformation that indicates resource usage for statements executed\nduring the course of the current session.\n\n*Note*:\n\nThe SHOW PROFILE and SHOW PROFILES statements are deprecated; expect\nthem to be removed in a future MySQL release. Use the Performance\nSchema instead; see\nhttps://dev.mysql.com/doc/refman/8.0/en/performance-schema-query-profil\ning.html.\n\nTo control profiling, use the profiling session variable, which has a\ndefault value of 0 (OFF). Enable profiling by setting profiling to 1 or\nON:\n\nmysql> SET profiling = 1;\n\nSHOW PROFILES displays a list of the most recent statements sent to the\nserver. The size of the list is controlled by the\nprofiling_history_size session variable, which has a default value of\n15. The maximum value is 100. Setting the value to 0 has the practical\neffect of disabling profiling.\n\nAll statements are profiled except SHOW PROFILE and SHOW PROFILES, so\nneither of those statements appears in the profile list. Malformed\nstatements are profiled. For example, SHOW PROFILING is an illegal\nstatement, and a syntax error occurs if you try to execute it, but it\nshows up in the profiling list.\n\nSHOW PROFILE displays detailed information about a single statement.\nWithout the FOR QUERY n clause, the output pertains to the most\nrecently executed statement. If FOR QUERY n is included, SHOW PROFILE\ndisplays information for statement n. The values of n correspond to the\nQuery_ID values displayed by SHOW PROFILES.\n\nThe LIMIT row_count clause may be given to limit the output to\nrow_count rows. If LIMIT is given, OFFSET offset may be added to begin\nthe output offset rows into the full set of rows.\n\nBy default, SHOW PROFILE displays Status and Duration columns. The\nStatus values are like the State values displayed by SHOW PROCESSLIST,\nalthough there might be some minor differences in interpretion for the\ntwo statements for some status values (see\nhttps://dev.mysql.com/doc/refman/8.0/en/thread-information.html).\n\nOptional type values may be specified to display specific additional\ntypes of information:\n\no ALL displays all information\n\no BLOCK IO displays counts for block input and output operations\n\no CONTEXT SWITCHES displays counts for voluntary and involuntary\n  context switches\n\no CPU displays user and system CPU usage times\n\no IPC displays counts for messages sent and received\n\no MEMORY is not currently implemented\n\no PAGE FAULTS displays counts for major and minor page faults\n\no SOURCE displays the names of functions from the source code, together\n  with the name and line number of the file in which the function\n  occurs\n\no SWAPS displays swap counts\n\nProfiling is enabled per session. When a session ends, its profiling\ninformation is lost.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-profile.html\n\n','mysql> SELECT @@profiling;\n+-------------+\n| @@profiling |\n+-------------+\n|           0 |\n+-------------+\n1 row in set (0.00 sec)\n\nmysql> SET profiling = 1;\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> DROP TABLE IF EXISTS t1;\nQuery OK, 0 rows affected, 1 warning (0.00 sec)\n\nmysql> CREATE TABLE T1 (id INT);\nQuery OK, 0 rows affected (0.01 sec)\n\nmysql> SHOW PROFILES;\n+----------+----------+--------------------------+\n| Query_ID | Duration | Query                    |\n+----------+----------+--------------------------+\n|        0 | 0.000088 | SET PROFILING = 1        |\n|        1 | 0.000136 | DROP TABLE IF EXISTS t1  |\n|        2 | 0.011947 | CREATE TABLE t1 (id INT) |\n+----------+----------+--------------------------+\n3 rows in set (0.00 sec)\n\nmysql> SHOW PROFILE;\n+----------------------+----------+\n| Status               | Duration |\n+----------------------+----------+\n| checking permissions | 0.000040 |\n| creating table       | 0.000056 |\n| After create         | 0.011363 |\n| query end            | 0.000375 |\n| freeing items        | 0.000089 |\n| logging slow query   | 0.000019 |\n| cleaning up          | 0.000005 |\n+----------------------+----------+\n7 rows in set (0.00 sec)\n\nmysql> SHOW PROFILE FOR QUERY 1;\n+--------------------+----------+\n| Status             | Duration |\n+--------------------+----------+\n| query end          | 0.000107 |\n| freeing items      | 0.000008 |\n| logging slow query | 0.000015 |\n| cleaning up        | 0.000006 |\n+--------------------+----------+\n4 rows in set (0.00 sec)\n\nmysql> SHOW PROFILE CPU FOR QUERY 2;\n+----------------------+----------+----------+------------+\n| Status               | Duration | CPU_user | CPU_system |\n+----------------------+----------+----------+------------+\n| checking permissions | 0.000040 | 0.000038 |   0.000002 |\n| creating table       | 0.000056 | 0.000028 |   0.000028 |\n| After create         | 0.011363 | 0.000217 |   0.001571 |\n| query end            | 0.000375 | 0.000013 |   0.000028 |\n| freeing items        | 0.000089 | 0.000010 |   0.000014 |\n| logging slow query   | 0.000019 | 0.000009 |   0.000010 |\n| cleaning up          | 0.000005 | 0.000003 |   0.000002 |\n+----------------------+----------+----------+------------+\n7 rows in set (0.00 sec)\n','https://dev.mysql.com/doc/refman/8.0/en/show-profile.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (673,3,'SHOW PROFILES','Syntax:\nSHOW PROFILES\n\nThe SHOW PROFILES statement, together with SHOW PROFILE, displays\nprofiling information that indicates resource usage for statements\nexecuted during the course of the current session. For more\ninformation, see [HELP SHOW PROFILE].\n\n*Note*:\n\nThe SHOW PROFILE and SHOW PROFILES statements are deprecated; expect it\nto be removed in a future MySQL release. Use the Performance Schema\ninstead; see\nhttps://dev.mysql.com/doc/refman/8.0/en/performance-schema-query-profil\ning.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-profiles.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-profiles.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (674,3,'SHOW RELAYLOG EVENTS','Syntax:\nSHOW RELAYLOG EVENTS\n    [IN \'log_name\']\n    [FROM pos]\n    [LIMIT [offset,] row_count]\n    [channel_option]\n\nchannel_option:\n    FOR CHANNEL channel\n\nShows the events in the relay log of a replica. If you do not specify\n\'log_name\', the first relay log is displayed. This statement has no\neffect on the source. SHOW RELAYLOG EVENTS requires the REPLICATION\nSLAVE privilege.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-relaylog-events.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-relaylog-events.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (675,3,'SHOW REPLICAS','Syntax:\n{SHOW REPLICAS | SHOW SLAVE HOSTS}\n\nDisplays a list of replicas currently registered with the source. From\nMySQL 8.0.22, use SHOW REPLICAS in place of SHOW SLAVE HOSTS, which is\ndeprecated from that release. In releases before MySQL 8.0.22, use SHOW\nSLAVE HOSTS. SHOW REPLICAS | SHOW SLAVE HOSTS requires the REPLICATION\nSLAVE privilege.\n\nSHOW REPLICAS | SHOW SLAVE HOSTS should be executed on a server that\nacts as a replication source. The statement displays information about\nservers that are or have been connected as replicas, with each row of\nthe result corresponding to one replica server, as shown here:\n\nmysql> SHOW REPLICAS;\n+------------+-----------+------+-----------+--------------------------------------+\n| Server_id  | Host      | Port | Source_id | Replica_UUID                         |\n+------------+-----------+------+-----------+--------------------------------------+\n|         10 | iconnect2 | 3306 |         3 | 14cb6624-7f93-11e0-b2c0-c80aa9429562 |\n|         21 | athena    | 3306 |         3 | 07af4990-f41f-11df-a566-7ac56fdaf645 |\n+------------+-----------+------+-----------+--------------------------------------+\n\no Server_id: The unique server ID of the replica server, as configured\n  in the replica server\'s option file, or on the command line with\n  --server-id=value.\n\no Host: The host name of the replica server, as specified on the\n  replica with the --report-host option. This can differ from the\n  machine name as configured in the operating system.\n\no User: The replica server user name, as specified on the replica with\n  the --report-user option. Statement output includes this column only\n  if the source server is started with the --show-slave-auth-info\n  option.\n\no Password: The replica server password, as specified on the replica\n  with the --report-password option. Statement output includes this\n  column only if the source server is started with the\n  --show-slave-auth-info option.\n\no Port: The port on the source to which the replica server is\n  listening, as specified on the replica with the --report-port option.\n\n  A zero in this column means that the replica port (--report-port) was\n  not set.\n\no Source_id: The unique server ID of the source server that the replica\n  server is replicating from. This is the server ID of the server on\n  which SHOW REPLICAS | SHOW SLAVE HOSTS is executed, so this same\n  value is listed for each row in the result.\n\no Replica_UUID: The globally unique ID of this replica, as generated on\n  the replica and found in the replica\'s auto.cnf file.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-replicas.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-replicas.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (676,3,'SHOW SLAVE HOSTS','Syntax:\n{SHOW SLAVE HOSTS | SHOW REPLICAS}\n\nDisplays a list of replicas currently registered with the source. From\nMySQL 8.0.22, SHOW SLAVE HOSTS is deprecated and the alias SHOW\nREPLICAS should be used instead. The statement works in the same way as\nbefore, only the terminology used for the statement and its output has\nchanged. Both versions of the statement update the same status\nvariables when used. Please see the documentation for SHOW REPLICAS for\na description of the statement.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-slave-hosts.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-slave-hosts.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (677,3,'SHOW REPLICA STATUS','Syntax:\nSHOW {REPLICA | SLAVE} STATUS [FOR CHANNEL channel]\n\nThis statement provides status information on essential parameters of\nthe replica threads. From MySQL 8.0.22, use SHOW REPLICA STATUS in\nplace of SHOW SLAVE STATUS, which is deprecated from that release. In\nreleases before MySQL 8.0.22, use SHOW SLAVE STATUS. The statement\nrequires the REPLICATION CLIENT privilege (or the deprecated SUPER\nprivilege).\n\nSHOW REPLICA | SLAVE STATUS is nonblocking. When run concurrently with\nSTOP REPLICA | SLAVE, SHOW REPLICA | SLAVE STATUS returns without\nwaiting for STOP REPLICA | SLAVE to finish shutting down the\nreplication SQL thread or replication I/O thread (or both). This\npermits use in monitoring and other applications where getting an\nimmediate response from SHOW REPLICA | SLAVE STATUS is more important\nthan ensuring that it returned the latest data.\n\nIf you issue this statement using the mysql client, you can use a \\G\nstatement terminator rather than a semicolon to obtain a more readable\nvertical layout:\n\nmysql> SHOW REPLICA STATUS\\G\n*************************** 1. row ***************************\n             Replica_IO_State: Waiting for source to send event\n                  Source_Host: localhost\n                  Source_User: repl\n                  Source_Port: 13000\n                Connect_Retry: 60\n              Source_Log_File: source-bin.000002\n          Read_Source_Log_Pos: 1307\n               Relay_Log_File: replica-relay-bin.000003\n                Relay_Log_Pos: 1508\n        Relay_Source_Log_File: source-bin.000002\n           Replica_IO_Running: Yes\n          Replica_SQL_Running: Yes\n              Replicate_Do_DB:\n          Replicate_Ignore_DB:\n           Replicate_Do_Table:\n       Replicate_Ignore_Table:\n      Replicate_Wild_Do_Table:\n  Replicate_Wild_Ignore_Table:\n                   Last_Errno: 0\n                   Last_Error:\n                 Skip_Counter: 0\n          Exec_Source_Log_Pos: 1307\n              Relay_Log_Space: 1858\n              Until_Condition: None\n               Until_Log_File:\n                Until_Log_Pos: 0\n           Source_SSL_Allowed: No\n           Source_SSL_CA_File:\n           Source_SSL_CA_Path:\n              Source_SSL_Cert:\n            Source_SSL_Cipher:\n               Source_SSL_Key:\n        Seconds_Behind_Source: 0\nSource_SSL_Verify_Server_Cert: No\n                Last_IO_Errno: 0\n                Last_IO_Error:\n               Last_SQL_Errno: 0\n               Last_SQL_Error:\n  Replicate_Ignore_Server_Ids:\n             Source_Server_Id: 1\n                  Source_UUID: 3e11fa47-71ca-11e1-9e33-c80aa9429562\n             Source_Info_File:\n                    SQL_Delay: 0\n          SQL_Remaining_Delay: NULL\n    Replica_SQL_Running_State: Reading event from the relay log\n           Source_Retry_Count: 10\n                  Source_Bind:\n      Last_IO_Error_Timestamp:\n     Last_SQL_Error_Timestamp:\n               Source_SSL_Crl:\n           Source_SSL_Crlpath:\n           Retrieved_Gtid_Set: 3e11fa47-71ca-11e1-9e33-c80aa9429562:1-5\n            Executed_Gtid_Set: 3e11fa47-71ca-11e1-9e33-c80aa9429562:1-5\n                Auto_Position: 1\n         Replicate_Rewrite_DB:\n                 Channel_name:\n           Source_TLS_Version: TLSv1.2\n       Source_public_key_path: public_key.pem\n        Get_source_public_key: 0\n            Network_Namespace:\n\nThe Performance Schema provides tables that expose replication\ninformation. This is similar to the information available from the SHOW\nREPLICA | SLAVE STATUS statement, but represented in table form. For\ndetails, see\nhttps://dev.mysql.com/doc/refman/8.0/en/performance-schema-replication-\ntables.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-replica-status.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-replica-status.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (678,3,'SHOW SLAVE STATUS','Syntax:\nSHOW {SLAVE | REPLICA} STATUS [FOR CHANNEL channel]\n\nThis statement provides status information on essential parameters of\nthe replica threads. From MySQL 8.0.22, SHOW SLAVE STATUS is deprecated\nand the alias SHOW REPLICA STATUS should be used instead. The statement\nworks in the same way as before, only the terminology used for the\nstatement and its output has changed. Both versions of the statement\nupdate the same status variables when used. Please see the\ndocumentation for SHOW REPLICA STATUS for a description of the\nstatement.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-slave-status.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-slave-status.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (679,3,'SHOW STATUS','Syntax:\nSHOW [GLOBAL | SESSION] STATUS\n    [LIKE \'pattern\' | WHERE expr]\n\nSHOW STATUS provides server status information (see\nhttps://dev.mysql.com/doc/refman/8.0/en/server-status-variables.html).\nThis statement does not require any privilege. It requires only the\nability to connect to the server.\n\nStatus variable information is also available from these sources:\n\no Performance Schema tables. See\n  https://dev.mysql.com/doc/refman/8.0/en/performance-schema-status-var\n  iable-tables.html.\n\no The mysqladmin extended-status command. See\n  https://dev.mysql.com/doc/refman/8.0/en/mysqladmin.html.\n\nFor SHOW STATUS, a LIKE clause, if present, indicates which variable\nnames to match. A WHERE clause can be given to select rows using more\ngeneral conditions, as discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/extended-show.html.\n\nSHOW STATUS accepts an optional GLOBAL or SESSION variable scope\nmodifier:\n\no With a GLOBAL modifier, the statement displays the global status\n  values. A global status variable may represent status for some aspect\n  of the server itself (for example, Aborted_connects), or the\n  aggregated status over all connections to MySQL (for example,\n  Bytes_received and Bytes_sent). If a variable has no global value,\n  the session value is displayed.\n\no With a SESSION modifier, the statement displays the status variable\n  values for the current connection. If a variable has no session\n  value, the global value is displayed. LOCAL is a synonym for SESSION.\n\no If no modifier is present, the default is SESSION.\n\nThe scope for each status variable is listed at\nhttps://dev.mysql.com/doc/refman/8.0/en/server-status-variables.html.\n\nEach invocation of the SHOW STATUS statement uses an internal temporary\ntable and increments the global Created_tmp_tables value.\n\nWith a LIKE clause, the statement displays only rows for those\nvariables with names that match the pattern:\n\nmysql> SHOW STATUS LIKE \'Key%\';\n+--------------------+----------+\n| Variable_name      | Value    |\n+--------------------+----------+\n| Key_blocks_used    | 14955    |\n| Key_read_requests  | 96854827 |\n| Key_reads          | 162040   |\n| Key_write_requests | 7589728  |\n| Key_writes         | 3813196  |\n+--------------------+----------+\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-status.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-status.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (680,3,'SHOW TABLE STATUS','Syntax:\nSHOW TABLE STATUS\n    [{FROM | IN} db_name]\n    [LIKE \'pattern\' | WHERE expr]\n\nSHOW TABLE STATUS works likes SHOW TABLES, but provides a lot of\ninformation about each non-TEMPORARY table. You can also get this list\nusing the mysqlshow --status db_name command. The LIKE clause, if\npresent, indicates which table names to match. The WHERE clause can be\ngiven to select rows using more general conditions, as discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/extended-show.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-table-status.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-table-status.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (681,3,'SHOW TABLES','Syntax:\nSHOW [EXTENDED] [FULL] TABLES\n    [{FROM | IN} db_name]\n    [LIKE \'pattern\' | WHERE expr]\n\nSHOW TABLES lists the non-TEMPORARY tables in a given database. You can\nalso get this list using the mysqlshow db_name command. The LIKE\nclause, if present, indicates which table names to match. The WHERE\nclause can be given to select rows using more general conditions, as\ndiscussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/extended-show.html.\n\nMatching performed by the LIKE clause is dependent on the setting of\nthe lower_case_table_names system variable.\n\nThe optional EXTENDED modifier causes SHOW TABLES to list hidden tables\ncreated by failed ALTER TABLE statements. These temporary tables have\nnames beginning with #sql and can be dropped using DROP TABLE.\n\nThis statement also lists any views in the database. The optional FULL\nmodifier causes SHOW TABLES to display a second output column with\nvalues of BASE TABLE for a table, VIEW for a view, or SYSTEM VIEW for\nan INFORMATION_SCHEMA table.\n\nIf you have no privileges for a base table or view, it does not show up\nin the output from SHOW TABLES or mysqlshow db_name.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-tables.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-tables.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (682,3,'SHOW TRIGGERS','Syntax:\nSHOW TRIGGERS\n    [{FROM | IN} db_name]\n    [LIKE \'pattern\' | WHERE expr]\n\nSHOW TRIGGERS lists the triggers currently defined for tables in a\ndatabase (the default database unless a FROM clause is given). This\nstatement returns results only for databases and tables for which you\nhave the TRIGGER privilege. The LIKE clause, if present, indicates\nwhich table names (not trigger names) to match and causes the statement\nto display triggers for those tables. The WHERE clause can be given to\nselect rows using more general conditions, as discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/extended-show.html.\n\nFor the ins_sum trigger defined in\nhttps://dev.mysql.com/doc/refman/8.0/en/triggers.html, the output of\nSHOW TRIGGERS is as shown here:\n\nmysql> SHOW TRIGGERS LIKE \'acc%\'\\G\n*************************** 1. row ***************************\n             Trigger: ins_sum\n               Event: INSERT\n               Table: account\n           Statement: SET @sum = @sum + NEW.amount\n              Timing: BEFORE\n             Created: 2018-08-08 10:10:12.61\n            sql_mode: ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,\n                      NO_ZERO_IN_DATE,NO_ZERO_DATE,\n                      ERROR_FOR_DIVISION_BY_ZERO,\n                      NO_ENGINE_SUBSTITUTION\n             Definer: me@localhost\ncharacter_set_client: utf8mb4\ncollation_connection: utf8mb4_0900_ai_ci\n  Database Collation: utf8mb4_0900_ai_ci\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-triggers.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-triggers.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (683,3,'SHOW VARIABLES','Syntax:\nSHOW [GLOBAL | SESSION] VARIABLES\n    [LIKE \'pattern\' | WHERE expr]\n\nSHOW VARIABLES shows the values of MySQL system variables (see\nhttps://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html).\nThis statement does not require any privilege. It requires only the\nability to connect to the server.\n\nSystem variable information is also available from these sources:\n\no Performance Schema tables. See\n  https://dev.mysql.com/doc/refman/8.0/en/performance-schema-system-var\n  iable-tables.html.\n\no The mysqladmin variables command. See\n  https://dev.mysql.com/doc/refman/8.0/en/mysqladmin.html.\n\nFor SHOW VARIABLES, a LIKE clause, if present, indicates which variable\nnames to match. A WHERE clause can be given to select rows using more\ngeneral conditions, as discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/extended-show.html.\n\nSHOW VARIABLES accepts an optional GLOBAL or SESSION variable scope\nmodifier:\n\no With a GLOBAL modifier, the statement displays global system variable\n  values. These are the values used to initialize the corresponding\n  session variables for new connections to MySQL. If a variable has no\n  global value, no value is displayed.\n\no With a SESSION modifier, the statement displays the system variable\n  values that are in effect for the current connection. If a variable\n  has no session value, the global value is displayed. LOCAL is a\n  synonym for SESSION.\n\no If no modifier is present, the default is SESSION.\n\nThe scope for each system variable is listed at\nhttps://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html.\n\nSHOW VARIABLES is subject to a version-dependent display-width limit.\nFor variables with very long values that are not completely displayed,\nuse SELECT as a workaround. For example:\n\nSELECT @@GLOBAL.innodb_data_file_path;\n\nMost system variables can be set at server startup (read-only variables\nsuch as version_comment are exceptions). Many can be changed at runtime\nwith the SET statement. See\nhttps://dev.mysql.com/doc/refman/8.0/en/using-system-variables.html,\nand [HELP SET].\n\nWith a LIKE clause, the statement displays only rows for those\nvariables with names that match the pattern. To obtain the row for a\nspecific variable, use a LIKE clause as shown:\n\nSHOW VARIABLES LIKE \'max_join_size\';\nSHOW SESSION VARIABLES LIKE \'max_join_size\';\n\nTo get a list of variables whose name match a pattern, use the %\nwildcard character in a LIKE clause:\n\nSHOW VARIABLES LIKE \'%size%\';\nSHOW GLOBAL VARIABLES LIKE \'%size%\';\n\nWildcard characters can be used in any position within the pattern to\nbe matched. Strictly speaking, because _ is a wildcard that matches any\nsingle character, you should escape it as \\_ to match it literally. In\npractice, this is rarely necessary.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-variables.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-variables.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (684,3,'SHOW WARNINGS','Syntax:\nSHOW WARNINGS [LIMIT [offset,] row_count]\nSHOW COUNT(*) WARNINGS\n\nSHOW WARNINGS is a diagnostic statement that displays information about\nthe conditions (errors, warnings, and notes) resulting from executing a\nstatement in the current session. Warnings are generated for DML\nstatements such as INSERT, UPDATE, and LOAD DATA as well as DDL\nstatements such as CREATE TABLE and ALTER TABLE.\n\nThe LIMIT clause has the same syntax as for the SELECT statement. See\nhttps://dev.mysql.com/doc/refman/8.0/en/select.html.\n\nSHOW WARNINGS is also used following EXPLAIN, to display the extended\ninformation generated by EXPLAIN. See\nhttps://dev.mysql.com/doc/refman/8.0/en/explain-extended.html.\n\nSHOW WARNINGS displays information about the conditions resulting from\nexecution of the most recent nondiagnostic statement in the current\nsession. If the most recent statement resulted in an error during\nparsing, SHOW WARNINGS shows the resulting conditions, regardless of\nstatement type (diagnostic or nondiagnostic).\n\nThe SHOW COUNT(*) WARNINGS diagnostic statement displays the total\nnumber of errors, warnings, and notes. You can also retrieve this\nnumber from the warning_count system variable:\n\nSHOW COUNT(*) WARNINGS;\nSELECT @@warning_count;\n\nA difference in these statements is that the first is a diagnostic\nstatement that does not clear the message list. The second, because it\nis a SELECT statement is considered nondiagnostic and does clear the\nmessage list.\n\nA related diagnostic statement, SHOW ERRORS, shows only error\nconditions (it excludes warnings and notes), and SHOW COUNT(*) ERRORS\nstatement displays the total number of errors. See [HELP SHOW ERRORS].\nGET DIAGNOSTICS can be used to examine information for individual\nconditions. See [HELP GET DIAGNOSTICS].\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-warnings.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-warnings.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (685,3,'BINLOG','Syntax:\nBINLOG \'str\'\n\nBINLOG is an internal-use statement. It is generated by the mysqlbinlog\nprogram as the printable representation of certain events in binary log\nfiles. (See https://dev.mysql.com/doc/refman/8.0/en/mysqlbinlog.html.)\nThe \'str\' value is a base 64-encoded string the that server decodes to\ndetermine the data change indicated by the corresponding event.\n\nTo execute BINLOG statements when applying mysqlbinlog output, a user\naccount requires the BINLOG_ADMIN privilege (or the deprecated SUPER\nprivilege), or the REPLICATION_APPLIER privilege plus the appropriate\nprivileges to execute each log event.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/binlog.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/binlog.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (686,3,'CACHE INDEX','Syntax:\nCACHE INDEX {\n      tbl_index_list [, tbl_index_list] ...\n    | tbl_name PARTITION (partition_list)\n  }\n  IN key_cache_name\n\ntbl_index_list:\n  tbl_name [{INDEX|KEY} (index_name[, index_name] ...)]\n\npartition_list: {\n    partition_name[, partition_name] ...\n  | ALL\n}\n\nThe CACHE INDEX statement assigns table indexes to a specific key\ncache. It applies only to MyISAM tables, including partitioned MyISAM\ntables. After the indexes have been assigned, they can be preloaded\ninto the cache if desired with LOAD INDEX INTO CACHE.\n\nThe following statement assigns indexes from the tables t1, t2, and t3\nto the key cache named hot_cache:\n\nmysql> CACHE INDEX t1, t2, t3 IN hot_cache;\n+---------+--------------------+----------+----------+\n| Table   | Op                 | Msg_type | Msg_text |\n+---------+--------------------+----------+----------+\n| test.t1 | assign_to_keycache | status   | OK       |\n| test.t2 | assign_to_keycache | status   | OK       |\n| test.t3 | assign_to_keycache | status   | OK       |\n+---------+--------------------+----------+----------+\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/cache-index.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/cache-index.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (687,3,'FLUSH','Syntax:\nFLUSH [NO_WRITE_TO_BINLOG | LOCAL] {\n    flush_option [, flush_option] ...\n  | tables_option\n}\n\nflush_option: {\n    BINARY LOGS\n  | ENGINE LOGS\n  | ERROR LOGS\n  | GENERAL LOGS\n  | HOSTS\n  | LOGS\n  | PRIVILEGES\n  | OPTIMIZER_COSTS\n  | RELAY LOGS [FOR CHANNEL channel]\n  | SLOW LOGS\n  | STATUS\n  | USER_RESOURCES\n}\n\ntables_option: {\n    TABLES\n  | TABLES tbl_name [, tbl_name] ...\n  | TABLES WITH READ LOCK\n  | TABLES tbl_name [, tbl_name] ... WITH READ LOCK\n  | TABLES tbl_name [, tbl_name] ... FOR EXPORT\n}\n\nThe FLUSH statement has several variant forms that clear or reload\nvarious internal caches, flush tables, or acquire locks. Each FLUSH\noperation requires the privileges indicated in its description.\n\n*Note*:\n\nIt is not possible to issue FLUSH statements within stored functions or\ntriggers. However, you may use FLUSH in stored procedures, so long as\nthese are not called from stored functions or triggers. See\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-program-restrictions.htm\nl.\n\nBy default, the server writes FLUSH statements to the binary log so\nthat they replicate to replicas. To suppress logging, specify the\noptional NO_WRITE_TO_BINLOG keyword or its alias LOCAL.\n\n*Note*:\n\nFLUSH LOGS, FLUSH BINARY LOGS, FLUSH TABLES WITH READ LOCK (with or\nwithout a table list), and FLUSH TABLES tbl_name ... FOR EXPORT are not\nwritten to the binary log in any case because they would cause problems\nif replicated to a replica.\n\nThe FLUSH statement causes an implicit commit. See\nhttps://dev.mysql.com/doc/refman/8.0/en/implicit-commit.html.\n\nThe mysqladmin utility provides a command-line interface to some flush\noperations, using commands such as flush-hosts, flush-logs,\nflush-privileges, flush-status, and flush-tables. See\nhttps://dev.mysql.com/doc/refman/8.0/en/mysqladmin.html.\n\nSending a SIGHUP or SIGUSR1 signal to the server causes several flush\noperations to occur that are similar to various forms of the FLUSH\nstatement. Signals can be sent by the root system account or the system\naccount that owns the server process. This enables the flush operations\nto be performed without having to connect to the server, which requires\na MySQL account that has privileges sufficient for those operations.\nSee https://dev.mysql.com/doc/refman/8.0/en/unix-signal-response.html.\n\nThe RESET statement is similar to FLUSH. See [HELP RESET], for\ninformation about using RESET with replication.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/flush.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/flush.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (688,3,'KILL','Syntax:\nKILL [CONNECTION | QUERY] processlist_id\n\nEach connection to mysqld runs in a separate thread. You can kill a\nthread with the KILL processlist_id statement.\n\nThread processlist identifiers can be determined from the ID column of\nthe INFORMATION_SCHEMA PROCESSLIST table, the Id column of SHOW\nPROCESSLIST output, and the PROCESSLIST_ID column of the Performance\nSchema threads table. The value for the current thread is returned by\nthe CONNECTION_ID() function.\n\nKILL permits an optional CONNECTION or QUERY modifier:\n\no KILL CONNECTION is the same as KILL with no modifier: It terminates\n  the connection associated with the given processlist_id, after\n  terminating any statement the connection is executing.\n\no KILL QUERY terminates the statement the connection is currently\n  executing, but leaves the connection itself intact.\n\nThe ability to see which threads are available to be killed depends on\nthe PROCESS privilege:\n\no Without PROCESS, you can see only your own threads.\n\no With PROCESS, you can see all threads.\n\nThe ability to kill threads and statements depends on the\nCONNECTION_ADMIN privilege and the deprecated SUPER privilege:\n\no Without CONNECTION_ADMIN or SUPER, you can kill only your own threads\n  and statements.\n\no With CONNECTION_ADMIN or SUPER, you can kill all threads and\n  statements, except that to affect a thread or statement that is\n  executing with the SYSTEM_USER privilege, your own session must\n  additionally have the SYSTEM_USER privilege.\n\nYou can also use the mysqladmin processlist and mysqladmin kill\ncommands to examine and kill threads.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/kill.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/kill.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (689,3,'LOAD INDEX','Syntax:\nLOAD INDEX INTO CACHE\n  tbl_index_list [, tbl_index_list] ...\n\ntbl_index_list:\n  tbl_name\n    [PARTITION (partition_list)]\n    [{INDEX|KEY} (index_name[, index_name] ...)]\n    [IGNORE LEAVES]\n\npartition_list: {\n    partition_name[, partition_name] ...\n  | ALL\n}\n\nThe LOAD INDEX INTO CACHE statement preloads a table index into the key\ncache to which it has been assigned by an explicit CACHE INDEX\nstatement, or into the default key cache otherwise.\n\nLOAD INDEX INTO CACHE applies only to MyISAM tables, including\npartitioned MyISAM tables. In addition, indexes on partitioned tables\ncan be preloaded for one, several, or all partitions.\n\nThe IGNORE LEAVES modifier causes only blocks for the nonleaf nodes of\nthe index to be preloaded.\n\nIGNORE LEAVES is also supported for partitioned MyISAM tables.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/load-index.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/load-index.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (690,3,'RESET','Syntax:\nRESET reset_option [, reset_option] ...\n\nreset_option: {\n    MASTER\n  | REPLICA\n  | SLAVE\n}\n\nThe RESET statement is used to clear the state of various server\noperations. You must have the RELOAD privilege to execute RESET.\n\nFor information about the RESET PERSIST statement that removes\npersisted global system variables, see [HELP RESET PERSIST].\n\nRESET acts as a stronger version of the FLUSH statement. See [HELP\nFLUSH].\n\nThe RESET statement causes an implicit commit. See\nhttps://dev.mysql.com/doc/refman/8.0/en/implicit-commit.html.\n\nThe following list describes the permitted RESET statement reset_option\nvalues:\n\no RESET MASTER\n\n  Deletes all binary logs listed in the index file, resets the binary\n  log index file to be empty, and creates a new binary log file.\n\no RESET REPLICA | SLAVE\n\n  Makes the replica forget its replication position in the source\n  binary logs. Also resets the relay log by deleting any existing relay\n  log files and beginning a new one. Use RESET REPLICA in place of\n  RESET SLAVE from MySQL 8.0.22.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/reset.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/reset.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (691,3,'RESET PERSIST','Syntax:\nRESET PERSIST [[IF EXISTS] system_var_name]\n\nRESET PERSIST removes persisted global system variable settings from\nthe mysqld-auto.cnf option file in the data directory. Removing a\npersisted system variable causes the variable no longer to be\ninitialized from mysqld-auto.cnf at server startup. For more\ninformation about persisting system variables and the mysqld-auto.cnf\nfile, see\nhttps://dev.mysql.com/doc/refman/8.0/en/persisted-system-variables.html\n.\n\nThe privileges required for RESET PERSIST depend on the type of system\nvariable to be removed:\n\no For dynamic system variables, this statement requires the\n  SYSTEM_VARIABLES_ADMIN privilege (or the deprecated SUPER privilege).\n\no For read-only system variables, this statement requires the\n  SYSTEM_VARIABLES_ADMIN and PERSIST_RO_VARIABLES_ADMIN privileges.\n\nSee\nhttps://dev.mysql.com/doc/refman/8.0/en/system-variable-privileges.html\n.\n\nDepending on whether the variable name and IF EXISTS clauses are\npresent, the RESET PERSIST statement has these forms:\n\no To remove all persisted variables from mysqld-auto.cnf, use RESET\n  PERSIST without naming any system variable:\n\nRESET PERSIST;\n\n  You must have privileges for removing both dynamic and read-only\n  system variables if mysqld-auto.cnf contains both kinds of variables.\n\no To remove a specific persisted variable from mysqld-auto.cnf, name it\n  in the statement:\n\nRESET PERSIST system_var_name;\n\n  This includes plugin system variables, even if the plugin is not\n  currently installed. If the variable is not present in the file, an\n  error occurs.\n\no To remove a specific persisted variable from mysqld-auto.cnf, but\n  produce a warning rather than an error if the variable is not present\n  in the file, add an IF EXISTS clause to the previous syntax:\n\nRESET PERSIST IF EXISTS system_var_name;\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/reset-persist.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/reset-persist.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (692,3,'RESTART','Syntax:\nRESTART\n\nThis statement stops and restarts the MySQL server. It requires the\nSHUTDOWN privilege.\n\nOne use for RESTART is when it is not possible or convenient to gain\ncommand-line access to the MySQL server on the server host to restart\nit. For example, SET PERSIST_ONLY can be used at runtime to make\nconfiguration changes to system variables that can be set only at\nserver startup, but the server must still be restarted for those\nchanges to take effect. The RESTART statement provides a way to do so\nfrom within client sessions, without requiring command-line access on\nthe server host.\n\n*Note*:\n\nAfter executing a RESTART statement, the client can expect the current\nconnection to be lost. If auto-reconnect is enabled, the connection is\nreestablished after the server restarts. Otherwise, the connection must\nbe reestablished manually.\n\nA successful RESTART operation requires mysqld to be running in an\nenvironment that has a monitoring process available to detect a server\nshutdown performed for restart purposes:\n\no In the presence of a monitoring process, RESTART causes mysqld to\n  terminate such that the monitoring process can determine that it\n  should start a new mysqld instance.\n\no If no monitoring process is present, RESTART fails with an error.\n\nThese platforms provide the necessary monitoring support for the\nRESTART statement:\n\no Windows, when mysqld is started as a Windows service or standalone.\n  (mysqld forks, and one process acts as a monitor to the other, which\n  acts as the server.)\n\no Unix and Unix-like systems that use systemd or mysqld_safe to manage\n  mysqld.\n\nTo configure a monitoring environment such that mysqld enables the\nRESTART statement:\n\n1. Set the MYSQLD_PARENT_PID environment variable to the value of the\n   process ID of the process that starts mysqld, before starting\n   mysqld.\n\n2. When mysqld performs a shutdown due to use of the RESTART statement,\n   it returns exit code 16.\n\n3. When the monitoring process detects an exit code of 16, it starts\n   mysqld again. Otherwise, it exits.\n\nHere is a minimal example as implemented in the bash shell:\n\n#!/bin/bash\n\nexport MYSQLD_PARENT_PID=$$\n\nexport MYSQLD_RESTART_EXIT=16\n\nwhile true ; do\n  bin/mysqld mysqld options here\n  if [ $? -ne $MYSQLD_RESTART_EXIT ]; then\n    break\n  fi\ndone\n\nOn Windows, the forking used to implement RESTART makes determining the\nserver process to attach to for debugging more difficult. To alleviate\nthis, starting the server with --gdb suppresses forking, in addition to\nits other actions done to set up a debugging environment. In non-debug\nsettings, --no-monitor may be used for the sole purpose of suppressing\nforking the monitor process. For a server started with either --gdb or\n--no-monitor, executing RESTART causes the server to simply exit\nwithout restarting.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/restart.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/restart.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (693,3,'SHUTDOWN','Syntax:\nSHUTDOWN\n\nThis statement stops the MySQL server. It requires the SHUTDOWN\nprivilege.\n\nSHUTDOWN provides an SQL-level interface to the same functionality\navailable using the mysqladmin shutdown command or the mysql_shutdown()\n(https://dev.mysql.com/doc/c-api/8.0/en/mysql-shutdown.html) C API\nfunction.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/shutdown.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/shutdown.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (694,51,'EXPLAIN','Syntax:\n{EXPLAIN | DESCRIBE | DESC}\n    tbl_name [col_name | wild]\n\n{EXPLAIN | DESCRIBE | DESC}\n    [explain_type]\n    {explainable_stmt | FOR CONNECTION connection_id}\n\n{EXPLAIN | DESCRIBE | DESC} ANALYZE [FORMAT = TREE] select_statement\n\nexplain_type: {\n    FORMAT = format_name\n}\n\nformat_name: {\n    TRADITIONAL\n  | JSON\n  | TREE\n}\n\nexplainable_stmt: {\n    SELECT statement\n  | TABLE statement\n  | DELETE statement\n  | INSERT statement\n  | REPLACE statement\n  | UPDATE statement\n}\n\nThe DESCRIBE and EXPLAIN statements are synonyms. In practice, the\nDESCRIBE keyword is more often used to obtain information about table\nstructure, whereas EXPLAIN is used to obtain a query execution plan\n(that is, an explanation of how MySQL would execute a query).\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/explain.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/explain.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (695,51,'DESCRIBE','Syntax:\n{EXPLAIN | DESCRIBE | DESC}\n    tbl_name [col_name | wild]\n\n{EXPLAIN | DESCRIBE | DESC}\n    [explain_type]\n    {explainable_stmt | FOR CONNECTION connection_id}\n\n{EXPLAIN | DESCRIBE | DESC} ANALYZE [FORMAT = TREE] select_statement\n\nexplain_type: {\n    FORMAT = format_name\n}\n\nformat_name: {\n    TRADITIONAL\n  | JSON\n  | TREE\n}\n\nexplainable_stmt: {\n    SELECT statement\n  | TABLE statement\n  | DELETE statement\n  | INSERT statement\n  | REPLACE statement\n  | UPDATE statement\n}\n\nThe DESCRIBE and EXPLAIN statements are synonyms. In practice, the\nDESCRIBE keyword is more often used to obtain information about table\nstructure, whereas EXPLAIN is used to obtain a query execution plan\n(that is, an explanation of how MySQL would execute a query).\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/explain.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/explain.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (696,51,'DESC','Syntax:\n{EXPLAIN | DESCRIBE | DESC}\n    tbl_name [col_name | wild]\n\n{EXPLAIN | DESCRIBE | DESC}\n    [explain_type]\n    {explainable_stmt | FOR CONNECTION connection_id}\n\n{EXPLAIN | DESCRIBE | DESC} ANALYZE [FORMAT = TREE] select_statement\n\nexplain_type: {\n    FORMAT = format_name\n}\n\nformat_name: {\n    TRADITIONAL\n  | JSON\n  | TREE\n}\n\nexplainable_stmt: {\n    SELECT statement\n  | TABLE statement\n  | DELETE statement\n  | INSERT statement\n  | REPLACE statement\n  | UPDATE statement\n}\n\nThe DESCRIBE and EXPLAIN statements are synonyms. In practice, the\nDESCRIBE keyword is more often used to obtain information about table\nstructure, whereas EXPLAIN is used to obtain a query execution plan\n(that is, an explanation of how MySQL would execute a query).\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/explain.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/explain.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (697,51,'HELP STATEMENT','Syntax:\nHELP \'search_string\'\n\nThe HELP statement returns online information from the MySQL Reference\nManual. Its proper operation requires that the help tables in the mysql\ndatabase be initialized with help topic information (see\nhttps://dev.mysql.com/doc/refman/8.0/en/server-side-help-support.html).\n\nThe HELP statement searches the help tables for the given search string\nand displays the result of the search. The search string is not\ncase-sensitive.\n\nThe search string can contain the wildcard characters % and _. These\nhave the same meaning as for pattern-matching operations performed with\nthe LIKE operator. For example, HELP \'rep%\' returns a list of topics\nthat begin with rep.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/help.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/help.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (698,51,'USE','Syntax:\nUSE db_name\n\nThe USE statement tells MySQL to use the named database as the default\n(current) database for subsequent statements. This statement requires\nsome privilege for the database or some object within it.\n\nThe named database remains the default until the end of the session or\nanother USE statement is issued:\n\nUSE db1;\nSELECT COUNT(*) FROM mytable;   # selects from db1.mytable\nUSE db2;\nSELECT COUNT(*) FROM mytable;   # selects from db2.mytable\n\nThe database name must be specified on a single line. Newlines in\ndatabase names are not supported.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/use.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/use.html');
-INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (699,52,'MERGE','The MERGE storage engine, also known as the MRG_MyISAM engine, is a\ncollection of identical MyISAM tables that can be used as one.\n"Identical" means that all tables have identical column data types and\nindex information. You cannot merge MyISAM tables in which the columns\nare listed in a different order, do not have exactly the same data\ntypes in corresponding columns, or have the indexes in different order.\nHowever, any or all of the MyISAM tables can be compressed with\nmyisampack. See\nhttps://dev.mysql.com/doc/refman/8.0/en/myisampack.html. Differences\nbetween tables such as these do not matter:\n\no Names of corresponding columns and indexes can differ.\n\no Comments for tables, columns, and indexes can differ.\n\no Table options such as AVG_ROW_LENGTH, MAX_ROWS, or PACK_KEYS can\n  differ.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/merge-storage-engine.html\n\n','mysql> CREATE TABLE t1 (\n    ->    a INT NOT NULL AUTO_INCREMENT PRIMARY KEY,\n    ->    message CHAR(20)) ENGINE=MyISAM;\nmysql> CREATE TABLE t2 (\n    ->    a INT NOT NULL AUTO_INCREMENT PRIMARY KEY,\n    ->    message CHAR(20)) ENGINE=MyISAM;\nmysql> INSERT INTO t1 (message) VALUES (\'Testing\'),(\'table\'),(\'t1\');\nmysql> INSERT INTO t2 (message) VALUES (\'Testing\'),(\'table\'),(\'t2\');\nmysql> CREATE TABLE total (\n    ->    a INT NOT NULL AUTO_INCREMENT,\n    ->    message CHAR(20), INDEX(a))\n    ->    ENGINE=MERGE UNION=(t1,t2) INSERT_METHOD=LAST;\n','https://dev.mysql.com/doc/refman/8.0/en/merge-storage-engine.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (497,39,'SOURCE_POS_WAIT','Syntax:\nSOURCE_POS_WAIT(log_name,log_pos[,timeout][,channel])\n\nThis function is for control of source/replica synchronization. It\nblocks until the replica has read and applied all updates up to the\nspecified position in the source\'s binary log. From MySQL 8.0.26, use\nSOURCE_POS_WAIT() in place of MASTER_POS_WAIT(), which is deprecated\nfrom that release. In releases before MySQL 8.0.26, use\nMASTER_POS_WAIT().\n\nThe return value is the number of log events the replica had to wait\nfor to advance to the specified position. The function returns NULL if\nthe replication SQL thread is not started, the replica\'s source\ninformation is not initialized, the arguments are incorrect, or an\nerror occurs. It returns -1 if the timeout has been exceeded. If the\nreplication SQL thread stops while SOURCE_POS_WAIT() is waiting, the\nfunction returns NULL. If the replica is past the specified position,\nthe function returns immediately.\n\nOn a multithreaded replica, the function waits until expiry of the\nlimit set by the replica_checkpoint_group or replica_checkpoint_period\nsystem variable, when the checkpoint operation is called to update the\nstatus of the replica. Depending on the setting for the system\nvariables, the function might therefore return some time after the\nspecified position was reached.\n\nIf binary log transaction compression is in use and the transaction\npayload at the specified position is compressed (as a\nTransaction_payload_event), the function waits until the whole\ntransaction has been read and applied, and the positions have updated.\n\nIf a timeout value is specified, SOURCE_POS_WAIT() stops waiting when\ntimeout seconds have elapsed. timeout must be greater than 0; a zero or\nnegative timeout means no timeout.\n\nThe optional channel value enables you to name which replication\nchannel the function applies to. See\nhttps://dev.mysql.com/doc/refman/8.0/en/replication-channels.html for\nmore information.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/miscellaneous-functions.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/miscellaneous-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (498,39,'UUID','Syntax:\nUUID()\n\nReturns a Universal Unique Identifier (UUID) generated according to RFC\n4122, "A Universally Unique IDentifier (UUID) URN Namespace"\n(http://www.ietf.org/rfc/rfc4122.txt).\n\nA UUID is designed as a number that is globally unique in space and\ntime. Two calls to UUID() are expected to generate two different\nvalues, even if these calls are performed on two separate devices not\nconnected to each other.\n\n*Warning*:\n\nAlthough UUID() values are intended to be unique, they are not\nnecessarily unguessable or unpredictable. If unpredictability is\nrequired, UUID values should be generated some other way.\n\nUUID() returns a value that conforms to UUID version 1 as described in\nRFC 4122. The value is a 128-bit number represented as a utf8 string of\nfive hexadecimal numbers in aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee\nformat:\n\no The first three numbers are generated from the low, middle, and high\n  parts of a timestamp. The high part also includes the UUID version\n  number.\n\no The fourth number preserves temporal uniqueness in case the timestamp\n  value loses monotonicity (for example, due to daylight saving time).\n\no The fifth number is an IEEE 802 node number that provides spatial\n  uniqueness. A random number is substituted if the latter is not\n  available (for example, because the host device has no Ethernet card,\n  or it is unknown how to find the hardware address of an interface on\n  the host operating system). In this case, spatial uniqueness cannot\n  be guaranteed. Nevertheless, a collision should have very low\n  probability.\n\n  The MAC address of an interface is taken into account only on\n  FreeBSD, Linux, and Windows. On other operating systems, MySQL uses a\n  randomly generated 48-bit number.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/miscellaneous-functions.html\n\n','mysql> SELECT UUID();\n        -> \'6ccd780c-baba-1026-9564-5b8c656024db\'\n','https://dev.mysql.com/doc/refman/8.0/en/miscellaneous-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (499,39,'UUID_SHORT','Syntax:\nUUID_SHORT()\n\nReturns a "short" universal identifier as a 64-bit unsigned integer.\nValues returned by UUID_SHORT() differ from the string-format 128-bit\nidentifiers returned by the UUID() function and have different\nuniqueness properties. The value of UUID_SHORT() is guaranteed to be\nunique if the following conditions hold:\n\no The server_id value of the current server is between 0 and 255 and is\n  unique among your set of source and replica servers\n\no You do not set back the system time for your server host between\n  mysqld restarts\n\no You invoke UUID_SHORT() on average fewer than 16 million times per\n  second between mysqld restarts\n\nThe UUID_SHORT() return value is constructed this way:\n\n  (server_id & 255) << 56\n+ (server_startup_time_in_seconds << 24)\n+ incremented_variable++;\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/miscellaneous-functions.html\n\n','mysql> SELECT UUID_SHORT();\n        -> 92395783831158784\n','https://dev.mysql.com/doc/refman/8.0/en/miscellaneous-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (500,39,'UUID_TO_BIN','Syntax:\nUUID_TO_BIN(string_uuid), UUID_TO_BIN(string_uuid, swap_flag)\n\nConverts a string UUID to a binary UUID and returns the result. (The\nIS_UUID() function description lists the permitted string UUID\nformats.) The return binary UUID is a VARBINARY(16) value. If the UUID\nargument is NULL, the return value is NULL. If any argument is invalid,\nan error occurs.\n\nUUID_TO_BIN() takes one or two arguments:\n\no The one-argument form takes a string UUID value. The binary result is\n  in the same order as the string argument.\n\no The two-argument form takes a string UUID value and a flag value:\n\n  o If swap_flag is 0, the two-argument form is equivalent to the\n    one-argument form. The binary result is in the same order as the\n    string argument.\n\n  o If swap_flag is 1, the format of the return value differs: The\n    time-low and time-high parts (the first and third groups of\n    hexadecimal digits, respectively) are swapped. This moves the more\n    rapidly varying part to the right and can improve indexing\n    efficiency if the result is stored in an indexed column.\n\nTime-part swapping assumes the use of UUID version 1 values, such as\nare generated by the UUID() function. For UUID values produced by other\nmeans that do not follow version 1 format, time-part swapping provides\nno benefit. For details about version 1 format, see the UUID() function\ndescription.\n\nSuppose that you have the following string UUID value:\n\nmysql> SET @uuid = \'6ccd780c-baba-1026-9564-5b8c656024db\';\n\nTo convert the string UUID to binary with or without time-part\nswapping, use UUID_TO_BIN():\n\nmysql> SELECT HEX(UUID_TO_BIN(@uuid));\n+----------------------------------+\n| HEX(UUID_TO_BIN(@uuid))          |\n+----------------------------------+\n| 6CCD780CBABA102695645B8C656024DB |\n+----------------------------------+\nmysql> SELECT HEX(UUID_TO_BIN(@uuid, 0));\n+----------------------------------+\n| HEX(UUID_TO_BIN(@uuid, 0))       |\n+----------------------------------+\n| 6CCD780CBABA102695645B8C656024DB |\n+----------------------------------+\nmysql> SELECT HEX(UUID_TO_BIN(@uuid, 1));\n+----------------------------------+\n| HEX(UUID_TO_BIN(@uuid, 1))       |\n+----------------------------------+\n| 1026BABA6CCD780C95645B8C656024DB |\n+----------------------------------+\n\nTo convert a binary UUID returned by UUID_TO_BIN() to a string UUID,\nuse BIN_TO_UUID(). If you produce a binary UUID by calling\nUUID_TO_BIN() with a second argument of 1 to swap time parts, you\nshould also pass a second argument of 1 to BIN_TO_UUID() to unswap the\ntime parts when converting the binary UUID back to a string UUID:\n\nmysql> SELECT BIN_TO_UUID(UUID_TO_BIN(@uuid));\n+--------------------------------------+\n| BIN_TO_UUID(UUID_TO_BIN(@uuid))      |\n+--------------------------------------+\n| 6ccd780c-baba-1026-9564-5b8c656024db |\n+--------------------------------------+\nmysql> SELECT BIN_TO_UUID(UUID_TO_BIN(@uuid,0),0);\n+--------------------------------------+\n| BIN_TO_UUID(UUID_TO_BIN(@uuid,0),0)  |\n+--------------------------------------+\n| 6ccd780c-baba-1026-9564-5b8c656024db |\n+--------------------------------------+\nmysql> SELECT BIN_TO_UUID(UUID_TO_BIN(@uuid,1),1);\n+--------------------------------------+\n| BIN_TO_UUID(UUID_TO_BIN(@uuid,1),1)  |\n+--------------------------------------+\n| 6ccd780c-baba-1026-9564-5b8c656024db |\n+--------------------------------------+\n\nIf the use of time-part swapping is not the same for the conversion in\nboth directions, the original UUID is not recovered properly:\n\nmysql> SELECT BIN_TO_UUID(UUID_TO_BIN(@uuid,0),1);\n+--------------------------------------+\n| BIN_TO_UUID(UUID_TO_BIN(@uuid,0),1)  |\n+--------------------------------------+\n| baba1026-780c-6ccd-9564-5b8c656024db |\n+--------------------------------------+\nmysql> SELECT BIN_TO_UUID(UUID_TO_BIN(@uuid,1),0);\n+--------------------------------------+\n| BIN_TO_UUID(UUID_TO_BIN(@uuid,1),0)  |\n+--------------------------------------+\n| 1026baba-6ccd-780c-9564-5b8c656024db |\n+--------------------------------------+\n\nIf UUID_TO_BIN() is invoked from within the mysql client, binary\nstrings display using hexadecimal notation, depending on the value of\nthe --binary-as-hex. For more information about that option, see\nhttps://dev.mysql.com/doc/refman/8.0/en/mysql.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/miscellaneous-functions.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/miscellaneous-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (501,39,'VALUES','Syntax:\nVALUES(col_name)\n\nIn an INSERT ... ON DUPLICATE KEY UPDATE statement, you can use the\nVALUES(col_name) function in the UPDATE clause to refer to column\nvalues from the INSERT portion of the statement. In other words,\nVALUES(col_name) in the UPDATE clause refers to the value of col_name\nthat would be inserted, had no duplicate-key conflict occurred. This\nfunction is especially useful in multiple-row inserts. The VALUES()\nfunction is meaningful only in the ON DUPLICATE KEY UPDATE clause of\nINSERT statements and returns NULL otherwise. See\nhttps://dev.mysql.com/doc/refman/8.0/en/insert-on-duplicate.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/miscellaneous-functions.html\n\n','mysql> INSERT INTO table (a,b,c) VALUES (1,2,3),(4,5,6)\n    -> ON DUPLICATE KEY UPDATE c=VALUES(a)+VALUES(b);\n','https://dev.mysql.com/doc/refman/8.0/en/miscellaneous-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (502,40,'ALTER DATABASE','Syntax:\nALTER {DATABASE | SCHEMA} [db_name]\n    alter_option ...\n\nalter_option: {\n    [DEFAULT] CHARACTER SET [=] charset_name\n  | [DEFAULT] COLLATE [=] collation_name\n  | [DEFAULT] ENCRYPTION [=] {\'Y\' | \'N\'}\n  | READ ONLY [=] {DEFAULT | 0 | 1}\n}\n\nALTER DATABASE enables you to change the overall characteristics of a\ndatabase. These characteristics are stored in the data dictionary. This\nstatement requires the ALTER privilege on the database. ALTER SCHEMA is\na synonym for ALTER DATABASE.\n\nIf the database name is omitted, the statement applies to the default\ndatabase. In that case, an error occurs if there is no default\ndatabase.\n\nFor any alter_option omitted from the statement, the database retains\nits current option value, with the exception that changing the\ncharacter set may change the collation and vice versa.\n\no https://dev.mysql.com/doc/refman/8.0/en/alter-database.html#alter-dat\n  abase-charset\n\no https://dev.mysql.com/doc/refman/8.0/en/alter-database.html#alter-dat\n  abase-encryption\n\no https://dev.mysql.com/doc/refman/8.0/en/alter-database.html#alter-dat\n  abase-read-only\n\nCharacter Set and Collation Options\n\nThe CHARACTER SET option changes the default database character set.\nThe COLLATE option changes the default database collation. For\ninformation about character set and collation names, see\nhttps://dev.mysql.com/doc/refman/8.0/en/charset.html.\n\nTo see the available character sets and collations, use the SHOW\nCHARACTER SET and SHOW COLLATION statements, respectively. See [HELP\nSHOW CHARACTER SET], and [HELP SHOW COLLATION].\n\nA stored routine that uses the database defaults when the routine is\ncreated includes those defaults as part of its definition. (In a stored\nroutine, variables with character data types use the database defaults\nif the character set or collation are not specified explicitly. See\n[HELP CREATE PROCEDURE].) If you change the default character set or\ncollation for a database, any stored routines that are to use the new\ndefaults must be dropped and recreated.\n\nEncryption Option\n\nThe ENCRYPTION option, introduced in MySQL 8.0.16, defines the default\ndatabase encryption, which is inherited by tables created in the\ndatabase. The permitted values are \'Y\' (encryption enabled) and \'N\'\n(encryption disabled). Only newly created tables inherit the default\ndatabase encryption. For existing tables associated with the database,\ntheir encryption remains unchanged. If the\ntable_encryption_privilege_check system variable is enabled, the\nTABLE_ENCRYPTION_ADMIN privilege is required to specify a default\nencryption setting that differs from the value of the\ndefault_table_encryption system variable. For more information, see\nhttps://dev.mysql.com/doc/refman/8.0/en/innodb-data-encryption.html#inn\nodb-schema-tablespace-encryption-default.\n\nRead Only Option\n\nThe READ ONLY option, introduced in MySQL 8.0.22, controls whether to\npermit modification of the database and objects within it. The\npermitted values are DEFAULT or 0 (not read only) and 1 (read only).\nThis option is useful for database migration because a database for\nwhich READ ONLY is enabled can be migrated to another MySQL instance\nwithout concern that the database might be changed during the\noperation.\n\nWith NDB Cluster, making a database read only on one mysqld server is\nsynchronized to other mysqld servers in the same cluster, so that the\ndatabase becomes read only on all mysqld servers.\n\nThe READ ONLY option, if enabled, is displayed in the\nINFORMATION_SCHEMA SCHEMATA_EXTENSIONS table. See\nhttps://dev.mysql.com/doc/refman/8.0/en/information-schema-schemata-ext\nensions-table.html.\n\nThe READ ONLY option cannot be enabled for these system schemas: mysql,\ninformation_schema, performance_schema.\n\nIn ALTER DATABASE statements, the READ ONLY option interacts with other\ninstances of itself and with other options as follows:\n\no An error occurs if multiple instances of READ ONLY conflict (for\n  example, READ ONLY = 1 READ ONLY = 0).\n\no An ALTER DATABASE statement that contains only (nonconflicting) READ\n  ONLY options is permitted even for a read-only database.\n\no A mix of (nonconflicting) READ ONLY options with other options is\n  permitted if the read-only state of the database either before or\n  after the statement permits modifications. If the read-only state\n  both before and after prohibits changes, an error occurs.\n\n  This statement succeeds whether or not the database is read only:\n\nALTER DATABASE mydb READ ONLY = 0 DEFAULT COLLATE utf8mb4_bin;\n\n  This statement succeeds if the database is not read only, but fails\n  if it is already read only:\n\nALTER DATABASE mydb READ ONLY = 1 DEFAULT COLLATE utf8mb4_bin;\n\nEnabling READ ONLY affects all users of the database, with these\nexceptions that are not subject to read-only checks:\n\no Statements executed by the server as part of server initialization,\n  restart, upgrade, or replication.\n\no Statements in a file named at server startup by the init_file system\n  variable.\n\no TEMPORARY tables; it is possible to create, alter, drop, and write to\n  TEMPORARY tables in a read-only database.\n\no NDB Cluster non-SQL inserts and updates.\n\nOther than for the excepted operations just listed, enabling READ ONLY\nprohibits write operations to the database and its objects, including\ntheir definitions, data, and metadata. The following list details\naffected SQL statements and operations:\n\no The database itself:\n\n  o CREATE DATABASE\n\n  o ALTER DATABASE (except to change the READ ONLY option)\n\n  o DROP DATABASE\n\no Views:\n\n  o CREATE VIEW\n\n  o ALTER VIEW\n\n  o DROP VIEW\n\n  o Selecting from views that invoke functions with side effects.\n\n  o Updating updatable views.\n\n  o Statements that create or drop objects in a writable database are\n    rejected if they affect metadata of a view in a read-only database\n    (for example, by making the view valid or invalid).\n\no Stored routines:\n\n  o CREATE PROCEDURE\n\n  o DROP PROCEDURE\n\n  o CALL (of procedures with side effects)\n\n  o CREATE FUNCTION\n\n  o DROP FUNCTION\n\n  o SELECT (of functions with side effects)\n\n  o For procedures and functions, read-only checks follow prelocking\n    behavior. For CALL statements, read-only checks are done on a\n    per-statement basis, so if some conditionally executed statement\n    writing to a read-only database does not actually execute, the call\n    still succeeds. On the other hand, for a function called within a\n    SELECT, execution of the function body happens in prelocked mode.\n    As long as a some statement within the function writes to a\n    read-only database, execution of the function fails with an error\n    regardless of whether the statement actually executes.\n\no Triggers:\n\n  o CREATE TRIGGER\n\n  o DROP TRIGGER\n\n  o Trigger invocation.\n\no Events:\n\n  o CREATE EVENT\n\n  o ALTER EVENT\n\n  o DROP EVENT\n\n  o Event execution:\n\n    o Executing an event in the database fails because that would\n      change the last-execution timestamp, which is event metadata\n      stored in the data dictionary. Failure of event execution also\n      has the effect of causing the event scheduler to stop.\n\n    o If an event writes to an object in a read-only database,\n      execution of the event fails with an error, but the event\n      scheduler is not stopped.\n\no Tables:\n\n  o CREATE TABLE\n\n  o ALTER TABLE\n\n  o CREATE INDEX\n\n  o DROP INDEX\n\n  o RENAME TABLE\n\n  o TRUNCATE TABLE\n\n  o DROP TABLE\n\n  o DELETE\n\n  o INSERT\n\n  o IMPORT TABLE\n\n  o LOAD DATA\n\n  o LOAD XML\n\n  o REPLACE\n\n  o UPDATE\n\n  o For cascading foreign keys where the child table is in a read-only\n    database, updates and deletes on the parent are rejected even if\n    the child table is not directly affected.\n\n  o For a MERGE table such as CREATE TABLE s1.t(i int) ENGINE MERGE\n    UNION (s2.t, s3.t), INSERT_METHOD=..., the following behavior\n    applies:\n\n    o Inserting into the MERGE table (INSERT into s1.t) fails if at\n      least one of s1, s2, s3 is read only, regardless of insert\n      method. The insert is refused even if it would actually end up in\n      a writable table.\n\n    o Dropping the MERGE table (DROP TABLE s1.t) succeeds as long as s1\n      is not read only. It is permitted to drop a MERGE table that\n      refers to a read-only database.\n\nAn ALTER DATABASE statement blocks until all concurrent transactions\nthat have already accessed an object in the database being altered have\ncommitted. Conversely, a write transaction accessing an object in a\ndatabase being altered in a concurrent ALTER DATABASE blocks until the\nALTER DATABASE has committed.\n\nIf the Clone plugin is used to clone a local or remote data directory,\nthe databases in the clone retain the read-only state they had in the\nsource data directory. The read-only state does not affect the cloning\nprocess itself. If it is not desirable to have the same database\nread-only state in the clone, the option must be changed explicitly for\nthe clone after the cloning process has finished, using ALTER DATABASE\noperations on the clone.\n\nWhen cloning from a donor to a recipient, if the recipient has a user\ndatabase that is read only, cloning fails with an error message.\nCloning may be retried after making the database writable.\n\nREAD ONLY is permitted for ALTER DATABASE, but not for CREATE DATABASE.\nHowever, for a read-only database, the statement produced by SHOW\nCREATE DATABASE does include READ ONLY=1 within a comment to indicate\nits read-only status:\n\nmysql> ALTER DATABASE mydb READ ONLY = 1;\nmysql> SHOW CREATE DATABASE mydb\\G\n*************************** 1. row ***************************\n       Database: mydb\nCreate Database: CREATE DATABASE `mydb`\n                 /*!40100 DEFAULT CHARACTER SET utf8mb4\n                          COLLATE utf8mb4_0900_ai_ci */\n                 /*!80016 DEFAULT ENCRYPTION=\'N\' */\n                 /* READ ONLY = 1 */\n\nIf the server executes a CREATE DATABASE statement containing such a\ncomment, the server ignores the comment and the READ ONLY option is not\nprocessed. This has implications for mysqldump and mysqlpump, which use\nSHOW CREATE DATABASE to produce CREATE DATABASE statements in dump\noutput:\n\no In a dump file, the CREATE DATABASE statement for a read-only\n  database contains the commented READ ONLY option.\n\no The dump file can be restored as usual, but because the server\n  ignores the commented READ ONLY option, the restored database is not\n  read only. If the database is to be read ony after being restored,\n  you must execute ALTER DATABASE manually to make it so.\n\nSuppose that mydb is read only and you dump it as follows:\n\nshell> mysqldump --databases mydb > mydb.sql\n\nA restore operation later must be followed by ALTER DATABASE if mydb\nshould still be read only:\n\nshell> mysql\nmysql> SOURCE mydb.sql;\nmysql> ALTER DATABASE mydb READ ONLY = 1;\n\nMySQL Enterprise Backup is not subject to this issue. It backs up and\nrestores a read-only database like any other, but enables the READ ONLY\noption at restore time if it was enabled at backup time.\n\nALTER DATABASE is written to the binary log, so a change to the READ\nONLY option on a replication source server also affects replicas. To\nprevent this from happening, binary logging must be disabled prior to\nexecution of the ALTER DATABASE statement. For example, to prepare for\nmigrating a database without affecting replicas, perform these\noperations:\n\n1. Within a single session, disable binary logging and enable READ ONLY\n   for the database:\n\nmysql> SET sql_log_bin = OFF;\nmysql> ALTER DATABASE mydb READ ONLY = 1;\n\n2. Dump the database, for example, with mysqldump or mysqlpump:\n\nshell> mysqldump --databases mydb > mydb.sql\n\n3. Within a single session, disable binary logging and disable READ\n   ONLY for the database:\n\nmysql> SET sql_log_bin = OFF;\nmysql> ALTER DATABASE mydb READ ONLY = 0;\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/alter-database.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/alter-database.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (503,40,'ALTER SCHEMA','Syntax:\nALTER {DATABASE | SCHEMA} [db_name]\n    alter_option ...\n\nalter_option: {\n    [DEFAULT] CHARACTER SET [=] charset_name\n  | [DEFAULT] COLLATE [=] collation_name\n  | [DEFAULT] ENCRYPTION [=] {\'Y\' | \'N\'}\n  | READ ONLY [=] {DEFAULT | 0 | 1}\n}\n\nALTER DATABASE enables you to change the overall characteristics of a\ndatabase. These characteristics are stored in the data dictionary. This\nstatement requires the ALTER privilege on the database. ALTER SCHEMA is\na synonym for ALTER DATABASE.\n\nIf the database name is omitted, the statement applies to the default\ndatabase. In that case, an error occurs if there is no default\ndatabase.\n\nFor any alter_option omitted from the statement, the database retains\nits current option value, with the exception that changing the\ncharacter set may change the collation and vice versa.\n\no https://dev.mysql.com/doc/refman/8.0/en/alter-database.html#alter-dat\n  abase-charset\n\no https://dev.mysql.com/doc/refman/8.0/en/alter-database.html#alter-dat\n  abase-encryption\n\no https://dev.mysql.com/doc/refman/8.0/en/alter-database.html#alter-dat\n  abase-read-only\n\nCharacter Set and Collation Options\n\nThe CHARACTER SET option changes the default database character set.\nThe COLLATE option changes the default database collation. For\ninformation about character set and collation names, see\nhttps://dev.mysql.com/doc/refman/8.0/en/charset.html.\n\nTo see the available character sets and collations, use the SHOW\nCHARACTER SET and SHOW COLLATION statements, respectively. See [HELP\nSHOW CHARACTER SET], and [HELP SHOW COLLATION].\n\nA stored routine that uses the database defaults when the routine is\ncreated includes those defaults as part of its definition. (In a stored\nroutine, variables with character data types use the database defaults\nif the character set or collation are not specified explicitly. See\n[HELP CREATE PROCEDURE].) If you change the default character set or\ncollation for a database, any stored routines that are to use the new\ndefaults must be dropped and recreated.\n\nEncryption Option\n\nThe ENCRYPTION option, introduced in MySQL 8.0.16, defines the default\ndatabase encryption, which is inherited by tables created in the\ndatabase. The permitted values are \'Y\' (encryption enabled) and \'N\'\n(encryption disabled). Only newly created tables inherit the default\ndatabase encryption. For existing tables associated with the database,\ntheir encryption remains unchanged. If the\ntable_encryption_privilege_check system variable is enabled, the\nTABLE_ENCRYPTION_ADMIN privilege is required to specify a default\nencryption setting that differs from the value of the\ndefault_table_encryption system variable. For more information, see\nhttps://dev.mysql.com/doc/refman/8.0/en/innodb-data-encryption.html#inn\nodb-schema-tablespace-encryption-default.\n\nRead Only Option\n\nThe READ ONLY option, introduced in MySQL 8.0.22, controls whether to\npermit modification of the database and objects within it. The\npermitted values are DEFAULT or 0 (not read only) and 1 (read only).\nThis option is useful for database migration because a database for\nwhich READ ONLY is enabled can be migrated to another MySQL instance\nwithout concern that the database might be changed during the\noperation.\n\nWith NDB Cluster, making a database read only on one mysqld server is\nsynchronized to other mysqld servers in the same cluster, so that the\ndatabase becomes read only on all mysqld servers.\n\nThe READ ONLY option, if enabled, is displayed in the\nINFORMATION_SCHEMA SCHEMATA_EXTENSIONS table. See\nhttps://dev.mysql.com/doc/refman/8.0/en/information-schema-schemata-ext\nensions-table.html.\n\nThe READ ONLY option cannot be enabled for these system schemas: mysql,\ninformation_schema, performance_schema.\n\nIn ALTER DATABASE statements, the READ ONLY option interacts with other\ninstances of itself and with other options as follows:\n\no An error occurs if multiple instances of READ ONLY conflict (for\n  example, READ ONLY = 1 READ ONLY = 0).\n\no An ALTER DATABASE statement that contains only (nonconflicting) READ\n  ONLY options is permitted even for a read-only database.\n\no A mix of (nonconflicting) READ ONLY options with other options is\n  permitted if the read-only state of the database either before or\n  after the statement permits modifications. If the read-only state\n  both before and after prohibits changes, an error occurs.\n\n  This statement succeeds whether or not the database is read only:\n\nALTER DATABASE mydb READ ONLY = 0 DEFAULT COLLATE utf8mb4_bin;\n\n  This statement succeeds if the database is not read only, but fails\n  if it is already read only:\n\nALTER DATABASE mydb READ ONLY = 1 DEFAULT COLLATE utf8mb4_bin;\n\nEnabling READ ONLY affects all users of the database, with these\nexceptions that are not subject to read-only checks:\n\no Statements executed by the server as part of server initialization,\n  restart, upgrade, or replication.\n\no Statements in a file named at server startup by the init_file system\n  variable.\n\no TEMPORARY tables; it is possible to create, alter, drop, and write to\n  TEMPORARY tables in a read-only database.\n\no NDB Cluster non-SQL inserts and updates.\n\nOther than for the excepted operations just listed, enabling READ ONLY\nprohibits write operations to the database and its objects, including\ntheir definitions, data, and metadata. The following list details\naffected SQL statements and operations:\n\no The database itself:\n\n  o CREATE DATABASE\n\n  o ALTER DATABASE (except to change the READ ONLY option)\n\n  o DROP DATABASE\n\no Views:\n\n  o CREATE VIEW\n\n  o ALTER VIEW\n\n  o DROP VIEW\n\n  o Selecting from views that invoke functions with side effects.\n\n  o Updating updatable views.\n\n  o Statements that create or drop objects in a writable database are\n    rejected if they affect metadata of a view in a read-only database\n    (for example, by making the view valid or invalid).\n\no Stored routines:\n\n  o CREATE PROCEDURE\n\n  o DROP PROCEDURE\n\n  o CALL (of procedures with side effects)\n\n  o CREATE FUNCTION\n\n  o DROP FUNCTION\n\n  o SELECT (of functions with side effects)\n\n  o For procedures and functions, read-only checks follow prelocking\n    behavior. For CALL statements, read-only checks are done on a\n    per-statement basis, so if some conditionally executed statement\n    writing to a read-only database does not actually execute, the call\n    still succeeds. On the other hand, for a function called within a\n    SELECT, execution of the function body happens in prelocked mode.\n    As long as a some statement within the function writes to a\n    read-only database, execution of the function fails with an error\n    regardless of whether the statement actually executes.\n\no Triggers:\n\n  o CREATE TRIGGER\n\n  o DROP TRIGGER\n\n  o Trigger invocation.\n\no Events:\n\n  o CREATE EVENT\n\n  o ALTER EVENT\n\n  o DROP EVENT\n\n  o Event execution:\n\n    o Executing an event in the database fails because that would\n      change the last-execution timestamp, which is event metadata\n      stored in the data dictionary. Failure of event execution also\n      has the effect of causing the event scheduler to stop.\n\n    o If an event writes to an object in a read-only database,\n      execution of the event fails with an error, but the event\n      scheduler is not stopped.\n\no Tables:\n\n  o CREATE TABLE\n\n  o ALTER TABLE\n\n  o CREATE INDEX\n\n  o DROP INDEX\n\n  o RENAME TABLE\n\n  o TRUNCATE TABLE\n\n  o DROP TABLE\n\n  o DELETE\n\n  o INSERT\n\n  o IMPORT TABLE\n\n  o LOAD DATA\n\n  o LOAD XML\n\n  o REPLACE\n\n  o UPDATE\n\n  o For cascading foreign keys where the child table is in a read-only\n    database, updates and deletes on the parent are rejected even if\n    the child table is not directly affected.\n\n  o For a MERGE table such as CREATE TABLE s1.t(i int) ENGINE MERGE\n    UNION (s2.t, s3.t), INSERT_METHOD=..., the following behavior\n    applies:\n\n    o Inserting into the MERGE table (INSERT into s1.t) fails if at\n      least one of s1, s2, s3 is read only, regardless of insert\n      method. The insert is refused even if it would actually end up in\n      a writable table.\n\n    o Dropping the MERGE table (DROP TABLE s1.t) succeeds as long as s1\n      is not read only. It is permitted to drop a MERGE table that\n      refers to a read-only database.\n\nAn ALTER DATABASE statement blocks until all concurrent transactions\nthat have already accessed an object in the database being altered have\ncommitted. Conversely, a write transaction accessing an object in a\ndatabase being altered in a concurrent ALTER DATABASE blocks until the\nALTER DATABASE has committed.\n\nIf the Clone plugin is used to clone a local or remote data directory,\nthe databases in the clone retain the read-only state they had in the\nsource data directory. The read-only state does not affect the cloning\nprocess itself. If it is not desirable to have the same database\nread-only state in the clone, the option must be changed explicitly for\nthe clone after the cloning process has finished, using ALTER DATABASE\noperations on the clone.\n\nWhen cloning from a donor to a recipient, if the recipient has a user\ndatabase that is read only, cloning fails with an error message.\nCloning may be retried after making the database writable.\n\nREAD ONLY is permitted for ALTER DATABASE, but not for CREATE DATABASE.\nHowever, for a read-only database, the statement produced by SHOW\nCREATE DATABASE does include READ ONLY=1 within a comment to indicate\nits read-only status:\n\nmysql> ALTER DATABASE mydb READ ONLY = 1;\nmysql> SHOW CREATE DATABASE mydb\\G\n*************************** 1. row ***************************\n       Database: mydb\nCreate Database: CREATE DATABASE `mydb`\n                 /*!40100 DEFAULT CHARACTER SET utf8mb4\n                          COLLATE utf8mb4_0900_ai_ci */\n                 /*!80016 DEFAULT ENCRYPTION=\'N\' */\n                 /* READ ONLY = 1 */\n\nIf the server executes a CREATE DATABASE statement containing such a\ncomment, the server ignores the comment and the READ ONLY option is not\nprocessed. This has implications for mysqldump and mysqlpump, which use\nSHOW CREATE DATABASE to produce CREATE DATABASE statements in dump\noutput:\n\no In a dump file, the CREATE DATABASE statement for a read-only\n  database contains the commented READ ONLY option.\n\no The dump file can be restored as usual, but because the server\n  ignores the commented READ ONLY option, the restored database is not\n  read only. If the database is to be read ony after being restored,\n  you must execute ALTER DATABASE manually to make it so.\n\nSuppose that mydb is read only and you dump it as follows:\n\nshell> mysqldump --databases mydb > mydb.sql\n\nA restore operation later must be followed by ALTER DATABASE if mydb\nshould still be read only:\n\nshell> mysql\nmysql> SOURCE mydb.sql;\nmysql> ALTER DATABASE mydb READ ONLY = 1;\n\nMySQL Enterprise Backup is not subject to this issue. It backs up and\nrestores a read-only database like any other, but enables the READ ONLY\noption at restore time if it was enabled at backup time.\n\nALTER DATABASE is written to the binary log, so a change to the READ\nONLY option on a replication source server also affects replicas. To\nprevent this from happening, binary logging must be disabled prior to\nexecution of the ALTER DATABASE statement. For example, to prepare for\nmigrating a database without affecting replicas, perform these\noperations:\n\n1. Within a single session, disable binary logging and enable READ ONLY\n   for the database:\n\nmysql> SET sql_log_bin = OFF;\nmysql> ALTER DATABASE mydb READ ONLY = 1;\n\n2. Dump the database, for example, with mysqldump or mysqlpump:\n\nshell> mysqldump --databases mydb > mydb.sql\n\n3. Within a single session, disable binary logging and disable READ\n   ONLY for the database:\n\nmysql> SET sql_log_bin = OFF;\nmysql> ALTER DATABASE mydb READ ONLY = 0;\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/alter-database.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/alter-database.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (504,40,'ALTER EVENT','Syntax:\nALTER\n    [DEFINER = user]\n    EVENT event_name\n    [ON SCHEDULE schedule]\n    [ON COMPLETION [NOT] PRESERVE]\n    [RENAME TO new_event_name]\n    [ENABLE | DISABLE | DISABLE ON SLAVE]\n    [COMMENT \'string\']\n    [DO event_body]\n\nThe ALTER EVENT statement changes one or more of the characteristics of\nan existing event without the need to drop and recreate it. The syntax\nfor each of the DEFINER, ON SCHEDULE, ON COMPLETION, COMMENT, ENABLE /\nDISABLE, and DO clauses is exactly the same as when used with CREATE\nEVENT. (See [HELP CREATE EVENT].)\n\nAny user can alter an event defined on a database for which that user\nhas the EVENT privilege. When a user executes a successful ALTER EVENT\nstatement, that user becomes the definer for the affected event.\n\nALTER EVENT works only with an existing event:\n\nmysql> ALTER EVENT no_such_event \n     >     ON SCHEDULE \n     >       EVERY \'2:3\' DAY_HOUR;\nERROR 1517 (HY000): Unknown event \'no_such_event\'\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/alter-event.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/alter-event.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (505,40,'ALTER FUNCTION','Syntax:\nALTER FUNCTION func_name [characteristic ...]\n\ncharacteristic: {\n    COMMENT \'string\'\n  | LANGUAGE SQL\n  | { CONTAINS SQL | NO SQL | READS SQL DATA | MODIFIES SQL DATA }\n  | SQL SECURITY { DEFINER | INVOKER }\n}\n\nThis statement can be used to change the characteristics of a stored\nfunction. More than one change may be specified in an ALTER FUNCTION\nstatement. However, you cannot change the parameters or body of a\nstored function using this statement; to make such changes, you must\ndrop and re-create the function using DROP FUNCTION and CREATE\nFUNCTION.\n\nYou must have the ALTER ROUTINE privilege for the function. (That\nprivilege is granted automatically to the function creator.) If binary\nlogging is enabled, the ALTER FUNCTION statement might also require the\nSUPER privilege, as described in\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-programs-logging.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/alter-function.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/alter-function.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (506,40,'ALTER INSTANCE','Syntax:\nALTER INSTANCE instance_action\n\ninstance_action: {\n  | {ENABLE|DISABLE} INNODB REDO_LOG\n  | ROTATE INNODB MASTER KEY\n  | ROTATE BINLOG MASTER KEY\n  | RELOAD TLS\n      [FOR CHANNEL {mysql_main | mysql_admin}]\n      [NO ROLLBACK ON ERROR]\n  | RELOAD KEYRING\n}\n\nALTER INSTANCE defines actions applicable to a MySQL server instance.\nThe statement supports these actions:\n\no ALTER INSTANCE {ENABLE | DISABLE} INNODB REDO_LOG\n\n  This action enables or disables InnoDB redo logging. Redo logging is\n  enabled by default. This feature is intended only for loading data\n  into a new MySQL instance. The statement is not written to the binary\n  log. This action was introduced in MySQL 8.0.21.\n\n  *Warning*:\n\n  Do not disable redo logging on a production system. While it is\n  permitted to shutdown and restart the server while redo logging is\n  disabled, an unexpected server stoppage while redo logging is\n  disabled can cause data loss and instance corruption.\n\n  An ALTER INSTANCE [ENABLE|DISABLE] INNODB REDO_LOG operation requires\n  an exclusive backup lock, which prevents other ALTER INSTANCE\n  operations from executing concurrently. Other ALTER INSTANCE\n  operations must wait for the lock to be released before executing.\n\n  For more information, see\n  https://dev.mysql.com/doc/refman/8.0/en/innodb-redo-log.html#innodb-d\n  isable-redo-logging.\n\no ALTER INSTANCE ROTATE INNODB MASTER KEY\n\n  This action rotates the master encryption key used for InnoDB\n  tablespace encryption. Key rotation requires the ENCRYPTION_KEY_ADMIN\n  or SUPER privilege. To perform this action, a keyring plugin must be\n  installed and configured. For instructions, see\n  https://dev.mysql.com/doc/refman/8.0/en/keyring.html.\n\n  ALTER INSTANCE ROTATE INNODB MASTER KEY supports concurrent DML.\n  However, it cannot be run concurrently with CREATE TABLE ...\n  ENCRYPTION or ALTER TABLE ... ENCRYPTION operations, and locks are\n  taken to prevent conflicts that could arise from concurrent execution\n  of these statements. If one of the conflicting statements is running,\n  it must complete before another can proceed.\n\n  ALTER INSTANCE ROTATE INNODB MASTER KEY statements are written to the\n  binary log so that they can be executed on replicated servers.\n\n  For additional ALTER INSTANCE ROTATE INNODB MASTER KEY usage\n  information, see\n  https://dev.mysql.com/doc/refman/8.0/en/innodb-data-encryption.html.\n\no ALTER INSTANCE ROTATE BINLOG MASTER KEY\n\n  This action rotates the binary log master key used for binary log\n  encryption. Key rotation for the binary log master key requires the\n  BINLOG_ENCRYPTION_ADMIN or SUPER privilege. The statement cannot be\n  used if the binlog_encryption system variable is set to OFF. To\n  perform this action, a keyring plugin must be installed and\n  configured. For instructions, see\n  https://dev.mysql.com/doc/refman/8.0/en/keyring.html.\n\n  ALTER INSTANCE ROTATE BINLOG MASTER KEY actions are not written to\n  the binary log and are not executed on replicas. Binary log master\n  key rotation can therefore be carried out in replication environments\n  including a mix of MySQL versions. To schedule regular rotation of\n  the binary log master key on all applicable source and replica\n  servers, you can enable the MySQL Event Scheduler on each server and\n  issue the ALTER INSTANCE ROTATE BINLOG MASTER KEY statement using a\n  CREATE EVENT statement. If you rotate the binary log master key\n  because you suspect that the current or any of the previous binary\n  log master keys might have been compromised, issue the statement on\n  every applicable source and replica server, which enables you to\n  verify immediate compliance.\n\n  For additional ALTER INSTANCE ROTATE BINLOG MASTER KEY usage\n  information, including what to do if the process does not complete\n  correctly or is interrupted by an unexpected server halt, see\n  https://dev.mysql.com/doc/refman/8.0/en/replication-binlog-encryption\n  .html.\n\no ALTER INSTANCE RELOAD TLS\n\n  This action reconfigures a TLS context from the current values of the\n  system variables that define the context. It also updates the status\n  variables that reflect the active context values. This action\n  requires the CONNECTION_ADMIN privilege. For additional information\n  about reconfiguring the TLS context, including which system and\n  status variables are context-related, see\n  https://dev.mysql.com/doc/refman/8.0/en/using-encrypted-connections.h\n  tml#using-encrypted-connections-server-side-runtime-configuration.\n\n  By default, the statement reloads the TLS context for the main\n  connection interface. If the FOR CHANNEL clause (available as of\n  MySQL 8.0.21) is given, the statement reloads the TLS context for the\n  named channel: mysql_main for the main connection interface,\n  mysql_admin for the administrative connection interface. For\n  information about the different interfaces, see\n  https://dev.mysql.com/doc/refman/8.0/en/connection-interfaces.html.\n  The updated TLS context properties are exposed in the Performance\n  Schema tls_channel_status table. See\n  https://dev.mysql.com/doc/refman/8.0/en/performance-schema-tls-channe\n  l-status-table.html.\n\n  Updating the TLS context for the main interface may also affect the\n  administrative interface because unless some nondefault TLS value is\n  configured for that interface, it uses the same TLS context as the\n  main interface.\n\n  By default, the RELOAD TLS action rolls back with an error and has no\n  effect if the configuration values do not permit creation of the new\n  TLS context. The previous context values continue to be used for new\n  connections. If the optional NO ROLLBACK ON ERROR clause is given and\n  the new context cannot be created, rollback does not occur. Instead,\n  a warning is generated and encryption is disabled for new connections\n  on the interface to which the statement applies.\n\n  ALTER INSTANCE RELOAD TLS statements are not written to the binary\n  log (and thus are not replicated). TLS configuration is local and\n  depends on local files not necessarily present on all servers\n  involved.\n\no ALTER INSTANCE RELOAD KEYRING\n\n  If a keyring component is installed, this action tells the component\n  to re-read its configuration file and reinitialize any keyring\n  in-memory data. If you modify the component configuration at runtime,\n  the new configuration does not take effect until you perform this\n  action. Keyring reloading requires the ENCRYPTION_KEY_ADMIN\n  privilege. This action was added in MySQL 8.0.24.\n\n  This action enables reconfiguring only the currently installed\n  keyring component. It does not enable changing which component is\n  installed. For example, if you change the configuration for the\n  installed keyring component, ALTER INSTANCE RELOAD KEYRING causes the\n  new configuration to take effect. On the other hand, if you change\n  the keyring component named in the server manifest file, ALTER\n  INSTANCE RELOAD KEYRING has no effect and the current component\n  remains installed.\n\n  ALTER INSTANCE RELOAD KEYRING statements are not written to the\n  binary log (and thus are not replicated).\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/alter-instance.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/alter-instance.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (507,40,'ALTER LOGFILE GROUP','Syntax:\nALTER LOGFILE GROUP logfile_group\n    ADD UNDOFILE \'file_name\'\n    [INITIAL_SIZE [=] size]\n    [WAIT]\n    ENGINE [=] engine_name\n\nThis statement adds an UNDO file named \'file_name\' to an existing log\nfile group logfile_group. An ALTER LOGFILE GROUP statement has one and\nonly one ADD UNDOFILE clause. No DROP UNDOFILE clause is currently\nsupported.\n\n*Note*:\n\nAll NDB Cluster Disk Data objects share the same namespace. This means\nthat each Disk Data object must be uniquely named (and not merely each\nDisk Data object of a given type). For example, you cannot have a\ntablespace and an undo log file with the same name, or an undo log file\nand a data file with the same name.\n\nThe optional INITIAL_SIZE parameter sets the UNDO file\'s initial size\nin bytes; if not specified, the initial size defaults to 134217728 (128\nMB). You may optionally follow size with a one-letter abbreviation for\nan order of magnitude, similar to those used in my.cnf. Generally, this\nis one of the letters M (megabytes) or G (gigabytes). (Bug #13116514,\nBug #16104705, Bug #62858)\n\nOn 32-bit systems, the maximum supported value for INITIAL_SIZE is\n4294967296 (4 GB). (Bug #29186)\n\nThe minimum allowed value for INITIAL_SIZE is 1048576 (1 MB). (Bug\n#29574)\n\n*Note*:\n\nWAIT is parsed but otherwise ignored. This keyword currently has no\neffect, and is intended for future expansion.\n\nThe ENGINE parameter (required) determines the storage engine which is\nused by this log file group, with engine_name being the name of the\nstorage engine. Currently, the only accepted values for engine_name are\n"NDBCLUSTER" and "NDB". The two values are equivalent.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/alter-logfile-group.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/alter-logfile-group.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (508,40,'ALTER PROCEDURE','Syntax:\nALTER PROCEDURE proc_name [characteristic ...]\n\ncharacteristic: {\n    COMMENT \'string\'\n  | LANGUAGE SQL\n  | { CONTAINS SQL | NO SQL | READS SQL DATA | MODIFIES SQL DATA }\n  | SQL SECURITY { DEFINER | INVOKER }\n}\n\nThis statement can be used to change the characteristics of a stored\nprocedure. More than one change may be specified in an ALTER PROCEDURE\nstatement. However, you cannot change the parameters or body of a\nstored procedure using this statement; to make such changes, you must\ndrop and re-create the procedure using DROP PROCEDURE and CREATE\nPROCEDURE.\n\nYou must have the ALTER ROUTINE privilege for the procedure. By\ndefault, that privilege is granted automatically to the procedure\ncreator. This behavior can be changed by disabling the\nautomatic_sp_privileges system variable. See\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-routines-privileges.html\n.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/alter-procedure.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/alter-procedure.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (509,40,'ALTER SERVER','Syntax:\nALTER SERVER  server_name\n    OPTIONS (option [, option] ...)\n\nAlters the server information for server_name, adjusting any of the\noptions permitted in the CREATE SERVER statement. The corresponding\nfields in the mysql.servers table are updated accordingly. This\nstatement requires the SUPER privilege.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/alter-server.html\n\n','ALTER SERVER s OPTIONS (USER \'sally\');\n','https://dev.mysql.com/doc/refman/8.0/en/alter-server.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (510,40,'ALTER TABLE','Syntax:\nALTER TABLE tbl_name\n    [alter_option [, alter_option] ...]\n    [partition_options]\n\nalter_option: {\n    table_options\n  | ADD [COLUMN] col_name column_definition\n        [FIRST | AFTER col_name]\n  | ADD [COLUMN] (col_name column_definition,...)\n  | ADD {INDEX | KEY} [index_name]\n        [index_type] (key_part,...) [index_option] ...\n  | ADD {FULLTEXT | SPATIAL} [INDEX | KEY] [index_name]\n        (key_part,...) [index_option] ...\n  | ADD [CONSTRAINT [symbol]] PRIMARY KEY\n        [index_type] (key_part,...)\n        [index_option] ...\n  | ADD [CONSTRAINT [symbol]] UNIQUE [INDEX | KEY]\n        [index_name] [index_type] (key_part,...)\n        [index_option] ...\n  | ADD [CONSTRAINT [symbol]] FOREIGN KEY\n        [index_name] (col_name,...)\n        reference_definition\n  | ADD [CONSTRAINT [symbol]] CHECK (expr) [[NOT] ENFORCED]\n  | DROP {CHECK | CONSTRAINT} symbol\n  | ALTER {CHECK | CONSTRAINT} symbol [NOT] ENFORCED\n  | ALGORITHM [=] {DEFAULT | INSTANT | INPLACE | COPY}\n  | ALTER [COLUMN] col_name {\n        SET DEFAULT {literal | (expr)}\n      | SET {VISIBLE | INVISIBLE}\n      | DROP DEFAULT\n    }\n  | ALTER INDEX index_name {VISIBLE | INVISIBLE}\n  | CHANGE [COLUMN] old_col_name new_col_name column_definition\n        [FIRST | AFTER col_name]\n  | [DEFAULT] CHARACTER SET [=] charset_name [COLLATE [=] collation_name]\n  | CONVERT TO CHARACTER SET charset_name [COLLATE collation_name]\n  | {DISABLE | ENABLE} KEYS\n  | {DISCARD | IMPORT} TABLESPACE\n  | DROP [COLUMN] col_name\n  | DROP {INDEX | KEY} index_name\n  | DROP PRIMARY KEY\n  | DROP FOREIGN KEY fk_symbol\n  | FORCE\n  | LOCK [=] {DEFAULT | NONE | SHARED | EXCLUSIVE}\n  | MODIFY [COLUMN] col_name column_definition\n        [FIRST | AFTER col_name]\n  | ORDER BY col_name [, col_name] ...\n  | RENAME COLUMN old_col_name TO new_col_name\n  | RENAME {INDEX | KEY} old_index_name TO new_index_name\n  | RENAME [TO | AS] new_tbl_name\n  | {WITHOUT | WITH} VALIDATION\n}\n\npartition_options:\n    partition_option [partition_option] ...\n\npartition_option: {\n    ADD PARTITION (partition_definition)\n  | DROP PARTITION partition_names\n  | DISCARD PARTITION {partition_names | ALL} TABLESPACE\n  | IMPORT PARTITION {partition_names | ALL} TABLESPACE\n  | TRUNCATE PARTITION {partition_names | ALL}\n  | COALESCE PARTITION number\n  | REORGANIZE PARTITION partition_names INTO (partition_definitions)\n  | EXCHANGE PARTITION partition_name WITH TABLE tbl_name [{WITH | WITHOUT} VALIDATION]\n  | ANALYZE PARTITION {partition_names | ALL}\n  | CHECK PARTITION {partition_names | ALL}\n  | OPTIMIZE PARTITION {partition_names | ALL}\n  | REBUILD PARTITION {partition_names | ALL}\n  | REPAIR PARTITION {partition_names | ALL}\n  | REMOVE PARTITIONING\n}\n\nkey_part: {col_name [(length)] | (expr)} [ASC | DESC]\n\nindex_type:\n    USING {BTREE | HASH}\n\nindex_option: {\n    KEY_BLOCK_SIZE [=] value\n  | index_type\n  | WITH PARSER parser_name\n  | COMMENT \'string\'\n  | {VISIBLE | INVISIBLE}\n}\n\ntable_options:\n    table_option [[,] table_option] ...\n\ntable_option: {\n    AUTOEXTEND_SIZE [=] value\n  | AUTO_INCREMENT [=] value\n  | AVG_ROW_LENGTH [=] value\n  | [DEFAULT] CHARACTER SET [=] charset_name\n  | CHECKSUM [=] {0 | 1}\n  | [DEFAULT] COLLATE [=] collation_name\n  | COMMENT [=] \'string\'\n  | COMPRESSION [=] {\'ZLIB\' | \'LZ4\' | \'NONE\'}\n  | CONNECTION [=] \'connect_string\'\n  | {DATA | INDEX} DIRECTORY [=] \'absolute path to directory\'\n  | DELAY_KEY_WRITE [=] {0 | 1}\n  | ENCRYPTION [=] {\'Y\' | \'N\'}\n  | ENGINE [=] engine_name\n  | ENGINE_ATTRIBUTE [=] \'string\'\n  | INSERT_METHOD [=] { NO | FIRST | LAST }\n  | KEY_BLOCK_SIZE [=] value\n  | MAX_ROWS [=] value\n  | MIN_ROWS [=] value\n  | PACK_KEYS [=] {0 | 1 | DEFAULT}\n  | PASSWORD [=] \'string\'\n  | ROW_FORMAT [=] {DEFAULT | DYNAMIC | FIXED | COMPRESSED | REDUNDANT | COMPACT}\n  | SECONDARY_ENGINE_ATTRIBUTE [=] \'string\'\n  | STATS_AUTO_RECALC [=] {DEFAULT | 0 | 1}\n  | STATS_PERSISTENT [=] {DEFAULT | 0 | 1}\n  | STATS_SAMPLE_PAGES [=] value\n  | TABLESPACE tablespace_name [STORAGE {DISK | MEMORY}]\n  | UNION [=] (tbl_name[,tbl_name]...)\n}\n\npartition_options:\n    (see CREATE TABLE options)\n\nALTER TABLE changes the structure of a table. For example, you can add\nor delete columns, create or destroy indexes, change the type of\nexisting columns, or rename columns or the table itself. You can also\nchange characteristics such as the storage engine used for the table or\nthe table comment.\n\no To use ALTER TABLE, you need ALTER, CREATE, and INSERT privileges for\n  the table. Renaming a table requires ALTER and DROP on the old table,\n  ALTER, CREATE, and INSERT on the new table.\n\no Following the table name, specify the alterations to be made. If none\n  are given, ALTER TABLE does nothing.\n\no The syntax for many of the permissible alterations is similar to\n  clauses of the CREATE TABLE statement. column_definition clauses use\n  the same syntax for ADD and CHANGE as for CREATE TABLE. For more\n  information, see [HELP CREATE TABLE].\n\no The word COLUMN is optional and can be omitted, except for RENAME\n  COLUMN (to distinguish a column-renaming operation from the RENAME\n  table-renaming operation).\n\no Multiple ADD, ALTER, DROP, and CHANGE clauses are permitted in a\n  single ALTER TABLE statement, separated by commas. This is a MySQL\n  extension to standard SQL, which permits only one of each clause per\n  ALTER TABLE statement. For example, to drop multiple columns in a\n  single statement, do this:\n\nALTER TABLE t2 DROP COLUMN c, DROP COLUMN d;\n\no If a storage engine does not support an attempted ALTER TABLE\n  operation, a warning may result. Such warnings can be displayed with\n  SHOW WARNINGS. See [HELP SHOW WARNINGS]. For information on\n  troubleshooting ALTER TABLE, see\n  https://dev.mysql.com/doc/refman/8.0/en/alter-table-problems.html.\n\no For information about generated columns, see\n  https://dev.mysql.com/doc/refman/8.0/en/alter-table-generated-columns\n  .html.\n\no For usage examples, see\n  https://dev.mysql.com/doc/refman/8.0/en/alter-table-examples.html.\n\no InnoDB in MySQL 8.0.17 and later supports addition of multi-valued\n  indexes on JSON columns using a key_part specification can take the\n  form (CAST json_path AS type ARRAY). See\n  https://dev.mysql.com/doc/refman/8.0/en/create-index.html#create-inde\n  x-multi-valued, for detailed information regarding multi-valued index\n  creation and usage of, as well as restrictions and limitations on\n  multi-valued indexes.\n\no With the mysql_info()\n  (https://dev.mysql.com/doc/c-api/8.0/en/mysql-info.html) C API\n  function, you can find out how many rows were copied by ALTER TABLE.\n  See mysql_info()\n  (https://dev.mysql.com/doc/c-api/8.0/en/mysql-info.html).\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/alter-table.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/alter-table.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (511,40,'ALTER TABLESPACE','Syntax:\nALTER [UNDO] TABLESPACE tablespace_name\n  NDB only:\n    {ADD | DROP} DATAFILE \'file_name\'\n    [INITIAL_SIZE [=] size]\n    [WAIT]\n  InnoDB and NDB:\n    [RENAME TO tablespace_name]\n  InnoDB only:\n    [AUTOEXTEND_SIZE [=] \'value\']\n    [SET {ACTIVE | INACTIVE}]\n    [ENCRYPTION [=] {\'Y\' | \'N\'}]\n  InnoDB and NDB:\n    [ENGINE [=] engine_name]\n  Reserved for future use:\n    [ENGINE_ATTRIBUTE [=] \'string\']\n\nThis statement is used with NDB and InnoDB tablespaces. It can be used\nto add a new data file to, or to drop a data file from an NDB\ntablespace. It can also be used to rename an NDB Cluster Disk Data\ntablespace, rename an InnoDB general tablespace, encrypt an InnoDB\ngeneral tablespace, or mark an InnoDB undo tablespace as active or\ninactive.\n\nThe UNDO keyword, introduced in MySQL 8.0.14, is used with the SET\n{ACTIVE | INACTIVE} clause to mark an InnoDB undo tablespace as active\nor inactive. For more information, see\nhttps://dev.mysql.com/doc/refman/8.0/en/innodb-undo-tablespaces.html.\n\nThe ADD DATAFILE variant enables you to specify an initial size for an\nNDB Disk Data tablespace using an INITIAL_SIZE clause, where size is\nmeasured in bytes; the default value is 134217728 (128 MB). You may\noptionally follow size with a one-letter abbreviation for an order of\nmagnitude, similar to those used in my.cnf. Generally, this is one of\nthe letters M (megabytes) or G (gigabytes).\n\nOn 32-bit systems, the maximum supported value for INITIAL_SIZE is\n4294967296 (4 GB). (Bug #29186)\n\nINITIAL_SIZE is rounded, explicitly, as for CREATE TABLESPACE.\n\nOnce a data file has been created, its size cannot be changed; however,\nyou can add more data files to an NDB tablespace using additional ALTER\nTABLESPACE ... ADD DATAFILE statements.\n\nWhen ALTER TABLESPACE ... ADD DATAFILE is used with ENGINE = NDB, a\ndata file is created on each Cluster data node, but only one row is\ngenerated in the INFORMATION_SCHEMA.FILES table. See the description of\nthis table, as well as\nhttps://dev.mysql.com/doc/refman/8.0/en/mysql-cluster-disk-data-objects\n.html, for more information. ADD DATAFILE is not supported with InnoDB\ntablespaces.\n\nUsing DROP DATAFILE with ALTER TABLESPACE drops the data file\n\'file_name\' from an NDB tablespace. You cannot drop a data file from a\ntablespace which is in use by any table; in other words, the data file\nmust be empty (no extents used). See\nhttps://dev.mysql.com/doc/refman/8.0/en/mysql-cluster-disk-data-objects\n.html. In addition, any data file to be dropped must previously have\nbeen added to the tablespace with CREATE TABLESPACE or ALTER\nTABLESPACE. DROP DATAFILE is not supported with InnoDB tablespaces.\n\nWAIT is parsed but otherwise ignored. It is intended for future\nexpansion.\n\nThe ENGINE clause, which specifies the storage engine used by the\ntablespace, is deprecated; expect it to be removed in a future release.\nThe tablespace storage engine is known by the data dictionary, making\nthe ENGINE clause obsolete. If the storage engine is specified, it must\nmatch the tablespace storage engine defined in the data dictionary. The\nonly values for engine_name compatible with NDB tablespaces are NDB and\nNDBCLUSTER.\n\nRENAME TO operations are implicitly performed in autocommit mode,\nregardless of the autocommit setting.\n\nA RENAME TO operation cannot be performed while LOCK TABLES or FLUSH\nTABLES WITH READ LOCK is in effect for tables that reside in the\ntablespace.\n\nExclusive metadata locks are taken on tables that reside in a general\ntablespace while the tablespace is renamed, which prevents concurrent\nDDL. Concurrent DML is supported.\n\nThe CREATE TABLESPACE privilege is required to rename an InnoDB general\ntablespace.\n\nThe AUTOEXTEND_SIZE option defines the amount by which InnoDB extends\nthe size of a tablespace when it becomes full. Introduced in MySQL\n8.0.23. The setting must be a multiple of 4MB. The default setting is\n0, which causes the tablespace to be extended according to the implicit\ndefault behavior. For more information, see\nhttps://dev.mysql.com/doc/refman/8.0/en/innodb-tablespace-autoextend-si\nze.html.\n\nThe ENCRYPTION clause enables or disables page-level data encryption\nfor an InnoDB general tablespace or the mysql system tablespace.\nEncryption support for general tablespaces was introduced in MySQL\n8.0.13. Encryption support for the mysql system tablespace was\nintroduced in MySQL 8.0.16.\n\nA keyring plugin must be installed and configured before encryption can\nbe enabled.\n\nAs of MySQL 8.0.16, if the table_encryption_privilege_check variable is\nenabled, the TABLE_ENCRYPTION_ADMIN privilege is required to alter a\ngeneral tablespace with an ENCRYPTION clause setting that differs from\nthe default_table_encryption setting.\n\nEnabling encryption for a general tablespace fails if any table in the\ntablespace belongs to a schema defined with DEFAULT ENCRYPTION=\'N\'.\nSimilarly, disabling encryption fails if any table in the general\ntablespace belongs to a schema defined with DEFAULT ENCRYPTION=\'Y\'. The\nDEFAULT ENCRYPTION schema option was introduced in MySQL 8.0.16.\n\nIf an ALTER TABLESPACE statement executed on a general tablespace does\nnot include an ENCRYPTION clause, the tablespace retains its current\nencryption status, regardless of the default_table_encryption setting.\n\nWhen a general tablespace or the mysql system tablespace is encrypted,\nall tables residing in the tablespace are encrypted. Likewise, a table\ncreated in an encrypted tablespace is encrypted.\n\nThe INPLACE algorithm is used when altering the ENCRYPTION attribute of\na general tablespace or the mysql system tablespace. The INPLACE\nalgorithm permits concurrent DML on tables that reside in the\ntablespace. Concurrent DDL is blocked.\n\nFor more information, see\nhttps://dev.mysql.com/doc/refman/8.0/en/innodb-data-encryption.html.\n\nThe ENGINE_ATTRIBUTE option (available as of MySQL 8.0.21) is used to\nspecify tablespace attributes for primary storage engines. The option\nis reserved for future use.\n\nPermitted values are a string literal containing a valid JSON document\nor an empty string (\'\'). Invalid JSON is rejected.\n\nALTER TABLESPACE ts1 ENGINE_ATTRIBUTE=\'{"key":"value"}\';\n\nENGINE_ATTRIBUTE values can be repeated without error. In this case,\nthe last specified value is used.\n\nENGINE_ATTRIBUTE values are not checked by the server, nor are they\ncleared when the table\'s storage engine is changed.\n\nIt is not permitted to alter an individual element of a JSON attribute\nvalue. You can only add or replace an attribute.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/alter-tablespace.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/alter-tablespace.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (512,40,'ALTER VIEW','Syntax:\nALTER\n    [ALGORITHM = {UNDEFINED | MERGE | TEMPTABLE}]\n    [DEFINER = user]\n    [SQL SECURITY { DEFINER | INVOKER }]\n    VIEW view_name [(column_list)]\n    AS select_statement\n    [WITH [CASCADED | LOCAL] CHECK OPTION]\n\nThis statement changes the definition of a view, which must exist. The\nsyntax is similar to that for CREATE VIEW see [HELP CREATE VIEW]). This\nstatement requires the CREATE VIEW and DROP privileges for the view,\nand some privilege for each column referred to in the SELECT statement.\nALTER VIEW is permitted only to the definer or users with the\nSET_USER_ID privilege (or the deprecated SUPER privilege).\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/alter-view.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/alter-view.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (513,40,'CREATE DATABASE','Syntax:\nCREATE {DATABASE | SCHEMA} [IF NOT EXISTS] db_name\n    [create_option] ...\n\ncreate_option: [DEFAULT] {\n    CHARACTER SET [=] charset_name\n  | COLLATE [=] collation_name\n  | ENCRYPTION [=] {\'Y\' | \'N\'}\n}\n\nCREATE DATABASE creates a database with the given name. To use this\nstatement, you need the CREATE privilege for the database. CREATE\nSCHEMA is a synonym for CREATE DATABASE.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/create-database.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/create-database.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (514,40,'CREATE SCHEMA','Syntax:\nCREATE {DATABASE | SCHEMA} [IF NOT EXISTS] db_name\n    [create_option] ...\n\ncreate_option: [DEFAULT] {\n    CHARACTER SET [=] charset_name\n  | COLLATE [=] collation_name\n  | ENCRYPTION [=] {\'Y\' | \'N\'}\n}\n\nCREATE DATABASE creates a database with the given name. To use this\nstatement, you need the CREATE privilege for the database. CREATE\nSCHEMA is a synonym for CREATE DATABASE.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/create-database.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/create-database.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (515,40,'CREATE EVENT','Syntax:\nCREATE\n    [DEFINER = user]\n    EVENT\n    [IF NOT EXISTS]\n    event_name\n    ON SCHEDULE schedule\n    [ON COMPLETION [NOT] PRESERVE]\n    [ENABLE | DISABLE | DISABLE ON SLAVE]\n    [COMMENT \'string\']\n    DO event_body;\n\nschedule: {\n    AT timestamp [+ INTERVAL interval] ...\n  | EVERY interval\n    [STARTS timestamp [+ INTERVAL interval] ...]\n    [ENDS timestamp [+ INTERVAL interval] ...]\n}\n\ninterval:\n    quantity {YEAR | QUARTER | MONTH | DAY | HOUR | MINUTE |\n              WEEK | SECOND | YEAR_MONTH | DAY_HOUR | DAY_MINUTE |\n              DAY_SECOND | HOUR_MINUTE | HOUR_SECOND | MINUTE_SECOND}\n\nThis statement creates and schedules a new event. The event does not\nrun unless the Event Scheduler is enabled. For information about\nchecking Event Scheduler status and enabling it if necessary, see\nhttps://dev.mysql.com/doc/refman/8.0/en/events-configuration.html.\n\nCREATE EVENT requires the EVENT privilege for the schema in which the\nevent is to be created. If the DEFINER clause is present, the\nprivileges required depend on the user value, as discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-objects-security.html.\n\nThe minimum requirements for a valid CREATE EVENT statement are as\nfollows:\n\no The keywords CREATE EVENT plus an event name, which uniquely\n  identifies the event in a database schema.\n\no An ON SCHEDULE clause, which determines when and how often the event\n  executes.\n\no A DO clause, which contains the SQL statement to be executed by an\n  event.\n\nThis is an example of a minimal CREATE EVENT statement:\n\nCREATE EVENT myevent\n    ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 1 HOUR\n    DO\n      UPDATE myschema.mytable SET mycol = mycol + 1;\n\nThe previous statement creates an event named myevent. This event\nexecutes once---one hour following its creation---by running an SQL\nstatement that increments the value of the myschema.mytable table\'s\nmycol column by 1.\n\nThe event_name must be a valid MySQL identifier with a maximum length\nof 64 characters. Event names are not case-sensitive, so you cannot\nhave two events named myevent and MyEvent in the same schema. In\ngeneral, the rules governing event names are the same as those for\nnames of stored routines. See\nhttps://dev.mysql.com/doc/refman/8.0/en/identifiers.html.\n\nAn event is associated with a schema. If no schema is indicated as part\nof event_name, the default (current) schema is assumed. To create an\nevent in a specific schema, qualify the event name with a schema using\nschema_name.event_name syntax.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/create-event.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/create-event.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (516,40,'CREATE INDEX','Syntax:\nCREATE [UNIQUE | FULLTEXT | SPATIAL] INDEX index_name\n    [index_type]\n    ON tbl_name (key_part,...)\n    [index_option]\n    [algorithm_option | lock_option] ...\n\nkey_part: {col_name [(length)] | (expr)} [ASC | DESC]\n\nindex_option: {\n    KEY_BLOCK_SIZE [=] value\n  | index_type\n  | WITH PARSER parser_name\n  | COMMENT \'string\'\n  | {VISIBLE | INVISIBLE}\n  | ENGINE_ATTRIBUTE [=] \'string\'\n  | SECONDARY_ENGINE_ATTRIBUTE [=] \'string\'\n}\n\nindex_type:\n    USING {BTREE | HASH}\n\nalgorithm_option:\n    ALGORITHM [=] {DEFAULT | INPLACE | COPY}\n\nlock_option:\n    LOCK [=] {DEFAULT | NONE | SHARED | EXCLUSIVE}\n\nNormally, you create all indexes on a table at the time the table\nitself is created with CREATE TABLE. See [HELP CREATE TABLE]. This\nguideline is especially important for InnoDB tables, where the primary\nkey determines the physical layout of rows in the data file. CREATE\nINDEX enables you to add indexes to existing tables.\n\nCREATE INDEX is mapped to an ALTER TABLE statement to create indexes.\nSee [HELP ALTER TABLE]. CREATE INDEX cannot be used to create a PRIMARY\nKEY; use ALTER TABLE instead. For more information about indexes, see\nhttps://dev.mysql.com/doc/refman/8.0/en/mysql-indexes.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/create-index.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/create-index.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (517,40,'CREATE LOGFILE GROUP','Syntax:\nCREATE LOGFILE GROUP logfile_group\n    ADD UNDOFILE \'undo_file\'\n    [INITIAL_SIZE [=] initial_size]\n    [UNDO_BUFFER_SIZE [=] undo_buffer_size]\n    [REDO_BUFFER_SIZE [=] redo_buffer_size]\n    [NODEGROUP [=] nodegroup_id]\n    [WAIT]\n    [COMMENT [=] \'string\']\n    ENGINE [=] engine_name\n\nThis statement creates a new log file group named logfile_group having\na single UNDO file named \'undo_file\'. A CREATE LOGFILE GROUP statement\nhas one and only one ADD UNDOFILE clause. For rules covering the naming\nof log file groups, see\nhttps://dev.mysql.com/doc/refman/8.0/en/identifiers.html.\n\n*Note*:\n\nAll NDB Cluster Disk Data objects share the same namespace. This means\nthat each Disk Data object must be uniquely named (and not merely each\nDisk Data object of a given type). For example, you cannot have a\ntablespace and a log file group with the same name, or a tablespace and\na data file with the same name.\n\nThere can be only one log file group per NDB Cluster instance at any\ngiven time.\n\nThe optional INITIAL_SIZE parameter sets the UNDO file\'s initial size;\nif not specified, it defaults to 128M (128 megabytes). The optional\nUNDO_BUFFER_SIZE parameter sets the size used by the UNDO buffer for\nthe log file group; The default value for UNDO_BUFFER_SIZE is 8M (eight\nmegabytes); this value cannot exceed the amount of system memory\navailable. Both of these parameters are specified in bytes. You may\noptionally follow either or both of these with a one-letter\nabbreviation for an order of magnitude, similar to those used in\nmy.cnf. Generally, this is one of the letters M (for megabytes) or G\n(for gigabytes).\n\nMemory used for UNDO_BUFFER_SIZE comes from the global pool whose size\nis determined by the value of the SharedGlobalMemory data node\nconfiguration parameter. This includes any default value implied for\nthis option by the setting of the InitialLogFileGroup data node\nconfiguration parameter.\n\nThe maximum permitted for UNDO_BUFFER_SIZE is 629145600 (600 MB).\n\nOn 32-bit systems, the maximum supported value for INITIAL_SIZE is\n4294967296 (4 GB). (Bug #29186)\n\nThe minimum allowed value for INITIAL_SIZE is 1048576 (1 MB).\n\nThe ENGINE option determines the storage engine to be used by this log\nfile group, with engine_name being the name of the storage engine. In\nMySQL 8.0, this must be NDB (or NDBCLUSTER). If ENGINE is not set,\nMySQL tries to use the engine specified by the default_storage_engine\nserver system variable (formerly storage_engine\n(https://dev.mysql.com/doc/refman/5.6/en/server-system-variables.html#s\nysvar_storage_engine)). In any case, if the engine is not specified as\nNDB or NDBCLUSTER, the CREATE LOGFILE GROUP statement appears to\nsucceed but actually fails to create the log file group, as shown here:\n\nmysql> CREATE LOGFILE GROUP lg1\n    ->     ADD UNDOFILE \'undo.dat\' INITIAL_SIZE = 10M;\nQuery OK, 0 rows affected, 1 warning (0.00 sec)\n\nmysql> SHOW WARNINGS;\n+-------+------+------------------------------------------------------------------------------------------------+\n| Level | Code | Message                                                                                        |\n+-------+------+------------------------------------------------------------------------------------------------+\n| Error | 1478 | Table storage engine \'InnoDB\' does not support the create option \'TABLESPACE or LOGFILE GROUP\' |\n+-------+------+------------------------------------------------------------------------------------------------+\n1 row in set (0.00 sec)\n\nmysql> DROP LOGFILE GROUP lg1 ENGINE = NDB;\nERROR 1529 (HY000): Failed to drop LOGFILE GROUP\n\nmysql> CREATE LOGFILE GROUP lg1\n    ->     ADD UNDOFILE \'undo.dat\' INITIAL_SIZE = 10M\n    ->     ENGINE = NDB;\nQuery OK, 0 rows affected (2.97 sec)\n\nThe fact that the CREATE LOGFILE GROUP statement does not actually\nreturn an error when a non-NDB storage engine is named, but rather\nappears to succeed, is a known issue which we hope to address in a\nfuture release of NDB Cluster.\n\nREDO_BUFFER_SIZE, NODEGROUP, WAIT, and COMMENT are parsed but ignored,\nand so have no effect in MySQL 8.0. These options are intended for\nfuture expansion.\n\nWhen used with ENGINE [=] NDB, a log file group and associated UNDO log\nfile are created on each Cluster data node. You can verify that the\nUNDO files were created and obtain information about them by querying\nthe INFORMATION_SCHEMA.FILES table. For example:\n\nmysql> SELECT LOGFILE_GROUP_NAME, LOGFILE_GROUP_NUMBER, EXTRA\n    -> FROM INFORMATION_SCHEMA.FILES\n    -> WHERE FILE_NAME = \'undo_10.dat\';\n+--------------------+----------------------+----------------+\n| LOGFILE_GROUP_NAME | LOGFILE_GROUP_NUMBER | EXTRA          |\n+--------------------+----------------------+----------------+\n| lg_3               |                   11 | CLUSTER_NODE=3 |\n| lg_3               |                   11 | CLUSTER_NODE=4 |\n+--------------------+----------------------+----------------+\n2 rows in set (0.06 sec)\n\nCREATE LOGFILE GROUP is useful only with Disk Data storage for NDB\nCluster. See\nhttps://dev.mysql.com/doc/refman/8.0/en/mysql-cluster-disk-data.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/create-logfile-group.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/create-logfile-group.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (518,40,'CREATE PROCEDURE','Syntax:\nCREATE\n    [DEFINER = user]\n    PROCEDURE sp_name ([proc_parameter[,...]])\n    [characteristic ...] routine_body\n\nCREATE\n    [DEFINER = user]\n    FUNCTION sp_name ([func_parameter[,...]])\n    RETURNS type\n    [characteristic ...] routine_body\n\nproc_parameter:\n    [ IN | OUT | INOUT ] param_name type\n\nfunc_parameter:\n    param_name type\n\ntype:\n    Any valid MySQL data type\n\ncharacteristic: {\n    COMMENT \'string\'\n  | LANGUAGE SQL\n  | [NOT] DETERMINISTIC\n  | { CONTAINS SQL | NO SQL | READS SQL DATA | MODIFIES SQL DATA }\n  | SQL SECURITY { DEFINER | INVOKER }\n}\n\nroutine_body:\n    Valid SQL routine statement\n\nThese statements are used to create a stored routine (a stored\nprocedure or function). That is, the specified routine becomes known to\nthe server. By default, a stored routine is associated with the default\ndatabase. To associate the routine explicitly with a given database,\nspecify the name as db_name.sp_name when you create it.\n\nThe CREATE FUNCTION statement is also used in MySQL to support loadable\nfunctions. See [HELP CREATE FUNCTION loadable function]. A loadable\nfunction can be regarded as an external stored function. Stored\nfunctions share their namespace with loadable functions. See\nhttps://dev.mysql.com/doc/refman/8.0/en/function-resolution.html, for\nthe rules describing how the server interprets references to different\nkinds of functions.\n\nTo invoke a stored procedure, use the CALL statement (see [HELP CALL]).\nTo invoke a stored function, refer to it in an expression. The function\nreturns a value during expression evaluation.\n\nCREATE PROCEDURE and CREATE FUNCTION require the CREATE ROUTINE\nprivilege. If the DEFINER clause is present, the privileges required\ndepend on the user value, as discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-objects-security.html.\nIf binary logging is enabled, CREATE FUNCTION might require the SUPER\nprivilege, as discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-programs-logging.html.\n\nBy default, MySQL automatically grants the ALTER ROUTINE and EXECUTE\nprivileges to the routine creator. This behavior can be changed by\ndisabling the automatic_sp_privileges system variable. See\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-routines-privileges.html\n.\n\nThe DEFINER and SQL SECURITY clauses specify the security context to be\nused when checking access privileges at routine execution time, as\ndescribed later in this section.\n\nIf the routine name is the same as the name of a built-in SQL function,\na syntax error occurs unless you use a space between the name and the\nfollowing parenthesis when defining the routine or invoking it later.\nFor this reason, avoid using the names of existing SQL functions for\nyour own stored routines.\n\nThe IGNORE_SPACE SQL mode applies to built-in functions, not to stored\nroutines. It is always permissible to have spaces after a stored\nroutine name, regardless of whether IGNORE_SPACE is enabled.\n\nThe parameter list enclosed within parentheses must always be present.\nIf there are no parameters, an empty parameter list of () should be\nused. Parameter names are not case-sensitive.\n\nEach parameter is an IN parameter by default. To specify otherwise for\na parameter, use the keyword OUT or INOUT before the parameter name.\n\n*Note*:\n\nSpecifying a parameter as IN, OUT, or INOUT is valid only for a\nPROCEDURE. For a FUNCTION, parameters are always regarded as IN\nparameters.\n\nAn IN parameter passes a value into a procedure. The procedure might\nmodify the value, but the modification is not visible to the caller\nwhen the procedure returns. An OUT parameter passes a value from the\nprocedure back to the caller. Its initial value is NULL within the\nprocedure, and its value is visible to the caller when the procedure\nreturns. An INOUT parameter is initialized by the caller, can be\nmodified by the procedure, and any change made by the procedure is\nvisible to the caller when the procedure returns.\n\nFor each OUT or INOUT parameter, pass a user-defined variable in the\nCALL statement that invokes the procedure so that you can obtain its\nvalue when the procedure returns. If you are calling the procedure from\nwithin another stored procedure or function, you can also pass a\nroutine parameter or local routine variable as an OUT or INOUT\nparameter. If you are calling the procedure from within a trigger, you\ncan also pass NEW.col_name as an OUT or INOUT parameter.\n\nFor information about the effect of unhandled conditions on procedure\nparameters, see\nhttps://dev.mysql.com/doc/refman/8.0/en/conditions-and-parameters.html.\n\nRoutine parameters cannot be referenced in statements prepared within\nthe routine; see\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-program-restrictions.htm\nl.\n\nThe following example shows a simple stored procedure that, given a\ncountry code, counts the number of cities for that country that appear\nin the city table of the world database. The country code is passed\nusing an IN parameter, and the city count is returned using an OUT\nparameter:\n\nmysql> delimiter //\n\nmysql> CREATE PROCEDURE citycount (IN country CHAR(3), OUT cities INT)\n       BEGIN\n         SELECT COUNT(*) INTO cities FROM world.city\n         WHERE CountryCode = country;\n       END//\nQuery OK, 0 rows affected (0.01 sec)\n\nmysql> delimiter ;\n\nmysql> CALL citycount(\'JPN\', @cities); -- cities in Japan\nQuery OK, 1 row affected (0.00 sec)\n\nmysql> SELECT @cities;\n+---------+\n| @cities |\n+---------+\n|     248 |\n+---------+\n1 row in set (0.00 sec)\n\nmysql> CALL citycount(\'FRA\', @cities); -- cities in France\nQuery OK, 1 row affected (0.00 sec)\n\nmysql> SELECT @cities;\n+---------+\n| @cities |\n+---------+\n|      40 |\n+---------+\n1 row in set (0.00 sec)\n\nThe example uses the mysql client delimiter command to change the\nstatement delimiter from ; to // while the procedure is being defined.\nThis enables the ; delimiter used in the procedure body to be passed\nthrough to the server rather than being interpreted by mysql itself.\nSee\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-programs-defining.html.\n\nThe RETURNS clause may be specified only for a FUNCTION, for which it\nis mandatory. It indicates the return type of the function, and the\nfunction body must contain a RETURN value statement. If the RETURN\nstatement returns a value of a different type, the value is coerced to\nthe proper type. For example, if a function specifies an ENUM or SET\nvalue in the RETURNS clause, but the RETURN statement returns an\ninteger, the value returned from the function is the string for the\ncorresponding ENUM member of set of SET members.\n\nThe following example function takes a parameter, performs an operation\nusing an SQL function, and returns the result. In this case, it is\nunnecessary to use delimiter because the function definition contains\nno internal ; statement delimiters:\n\nmysql> CREATE FUNCTION hello (s CHAR(20))\nmysql> RETURNS CHAR(50) DETERMINISTIC\n       RETURN CONCAT(\'Hello, \',s,\'!\');\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> SELECT hello(\'world\');\n+----------------+\n| hello(\'world\') |\n+----------------+\n| Hello, world!  |\n+----------------+\n1 row in set (0.00 sec)\n\nParameter types and function return types can be declared to use any\nvalid data type. The COLLATE attribute can be used if preceded by a\nCHARACTER SET specification.\n\nThe routine_body consists of a valid SQL routine statement. This can be\na simple statement such as SELECT or INSERT, or a compound statement\nwritten using BEGIN and END. Compound statements can contain\ndeclarations, loops, and other control structure statements. The syntax\nfor these statements is described in\nhttps://dev.mysql.com/doc/refman/8.0/en/sql-compound-statements.html.\nIn practice, stored functions tend to use compound statements, unless\nthe body consists of a single RETURN statement.\n\nMySQL permits routines to contain DDL statements, such as CREATE and\nDROP. MySQL also permits stored procedures (but not stored functions)\nto contain SQL transaction statements such as COMMIT. Stored functions\nmay not contain statements that perform explicit or implicit commit or\nrollback. Support for these statements is not required by the SQL\nstandard, which states that each DBMS vendor may decide whether to\npermit them.\n\nStatements that return a result set can be used within a stored\nprocedure but not within a stored function. This prohibition includes\nSELECT statements that do not have an INTO var_list clause and other\nstatements such as SHOW, EXPLAIN, and CHECK TABLE. For statements that\ncan be determined at function definition time to return a result set, a\nNot allowed to return a result set from a function error occurs\n(ER_SP_NO_RETSET\n(https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference.h\ntml#error_er_sp_no_retset)). For statements that can be determined only\nat runtime to return a result set, a PROCEDURE %s can\'t return a result\nset in the given context error occurs (ER_SP_BADSELECT\n(https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference.h\ntml#error_er_sp_badselect)).\n\nUSE statements within stored routines are not permitted. When a routine\nis invoked, an implicit USE db_name is performed (and undone when the\nroutine terminates). The causes the routine to have the given default\ndatabase while it executes. References to objects in databases other\nthan the routine default database should be qualified with the\nappropriate database name.\n\nFor additional information about statements that are not permitted in\nstored routines, see\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-program-restrictions.htm\nl.\n\nFor information about invoking stored procedures from within programs\nwritten in a language that has a MySQL interface, see [HELP CALL].\n\nMySQL stores the sql_mode system variable setting in effect when a\nroutine is created or altered, and always executes the routine with\nthis setting in force, regardless of the current server SQL mode when\nthe routine begins executing.\n\nThe switch from the SQL mode of the invoker to that of the routine\noccurs after evaluation of arguments and assignment of the resulting\nvalues to routine parameters. If you define a routine in strict SQL\nmode but invoke it in nonstrict mode, assignment of arguments to\nroutine parameters does not take place in strict mode. If you require\nthat expressions passed to a routine be assigned in strict SQL mode,\nyou should invoke the routine with strict mode in effect.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/create-procedure.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/create-procedure.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (519,40,'CREATE FUNCTION','Syntax:\nCREATE\n    [DEFINER = user]\n    PROCEDURE sp_name ([proc_parameter[,...]])\n    [characteristic ...] routine_body\n\nCREATE\n    [DEFINER = user]\n    FUNCTION sp_name ([func_parameter[,...]])\n    RETURNS type\n    [characteristic ...] routine_body\n\nproc_parameter:\n    [ IN | OUT | INOUT ] param_name type\n\nfunc_parameter:\n    param_name type\n\ntype:\n    Any valid MySQL data type\n\ncharacteristic: {\n    COMMENT \'string\'\n  | LANGUAGE SQL\n  | [NOT] DETERMINISTIC\n  | { CONTAINS SQL | NO SQL | READS SQL DATA | MODIFIES SQL DATA }\n  | SQL SECURITY { DEFINER | INVOKER }\n}\n\nroutine_body:\n    Valid SQL routine statement\n\nThese statements are used to create a stored routine (a stored\nprocedure or function). That is, the specified routine becomes known to\nthe server. By default, a stored routine is associated with the default\ndatabase. To associate the routine explicitly with a given database,\nspecify the name as db_name.sp_name when you create it.\n\nThe CREATE FUNCTION statement is also used in MySQL to support loadable\nfunctions. See [HELP CREATE FUNCTION loadable function]. A loadable\nfunction can be regarded as an external stored function. Stored\nfunctions share their namespace with loadable functions. See\nhttps://dev.mysql.com/doc/refman/8.0/en/function-resolution.html, for\nthe rules describing how the server interprets references to different\nkinds of functions.\n\nTo invoke a stored procedure, use the CALL statement (see [HELP CALL]).\nTo invoke a stored function, refer to it in an expression. The function\nreturns a value during expression evaluation.\n\nCREATE PROCEDURE and CREATE FUNCTION require the CREATE ROUTINE\nprivilege. If the DEFINER clause is present, the privileges required\ndepend on the user value, as discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-objects-security.html.\nIf binary logging is enabled, CREATE FUNCTION might require the SUPER\nprivilege, as discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-programs-logging.html.\n\nBy default, MySQL automatically grants the ALTER ROUTINE and EXECUTE\nprivileges to the routine creator. This behavior can be changed by\ndisabling the automatic_sp_privileges system variable. See\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-routines-privileges.html\n.\n\nThe DEFINER and SQL SECURITY clauses specify the security context to be\nused when checking access privileges at routine execution time, as\ndescribed later in this section.\n\nIf the routine name is the same as the name of a built-in SQL function,\na syntax error occurs unless you use a space between the name and the\nfollowing parenthesis when defining the routine or invoking it later.\nFor this reason, avoid using the names of existing SQL functions for\nyour own stored routines.\n\nThe IGNORE_SPACE SQL mode applies to built-in functions, not to stored\nroutines. It is always permissible to have spaces after a stored\nroutine name, regardless of whether IGNORE_SPACE is enabled.\n\nThe parameter list enclosed within parentheses must always be present.\nIf there are no parameters, an empty parameter list of () should be\nused. Parameter names are not case-sensitive.\n\nEach parameter is an IN parameter by default. To specify otherwise for\na parameter, use the keyword OUT or INOUT before the parameter name.\n\n*Note*:\n\nSpecifying a parameter as IN, OUT, or INOUT is valid only for a\nPROCEDURE. For a FUNCTION, parameters are always regarded as IN\nparameters.\n\nAn IN parameter passes a value into a procedure. The procedure might\nmodify the value, but the modification is not visible to the caller\nwhen the procedure returns. An OUT parameter passes a value from the\nprocedure back to the caller. Its initial value is NULL within the\nprocedure, and its value is visible to the caller when the procedure\nreturns. An INOUT parameter is initialized by the caller, can be\nmodified by the procedure, and any change made by the procedure is\nvisible to the caller when the procedure returns.\n\nFor each OUT or INOUT parameter, pass a user-defined variable in the\nCALL statement that invokes the procedure so that you can obtain its\nvalue when the procedure returns. If you are calling the procedure from\nwithin another stored procedure or function, you can also pass a\nroutine parameter or local routine variable as an OUT or INOUT\nparameter. If you are calling the procedure from within a trigger, you\ncan also pass NEW.col_name as an OUT or INOUT parameter.\n\nFor information about the effect of unhandled conditions on procedure\nparameters, see\nhttps://dev.mysql.com/doc/refman/8.0/en/conditions-and-parameters.html.\n\nRoutine parameters cannot be referenced in statements prepared within\nthe routine; see\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-program-restrictions.htm\nl.\n\nThe following example shows a simple stored procedure that, given a\ncountry code, counts the number of cities for that country that appear\nin the city table of the world database. The country code is passed\nusing an IN parameter, and the city count is returned using an OUT\nparameter:\n\nmysql> delimiter //\n\nmysql> CREATE PROCEDURE citycount (IN country CHAR(3), OUT cities INT)\n       BEGIN\n         SELECT COUNT(*) INTO cities FROM world.city\n         WHERE CountryCode = country;\n       END//\nQuery OK, 0 rows affected (0.01 sec)\n\nmysql> delimiter ;\n\nmysql> CALL citycount(\'JPN\', @cities); -- cities in Japan\nQuery OK, 1 row affected (0.00 sec)\n\nmysql> SELECT @cities;\n+---------+\n| @cities |\n+---------+\n|     248 |\n+---------+\n1 row in set (0.00 sec)\n\nmysql> CALL citycount(\'FRA\', @cities); -- cities in France\nQuery OK, 1 row affected (0.00 sec)\n\nmysql> SELECT @cities;\n+---------+\n| @cities |\n+---------+\n|      40 |\n+---------+\n1 row in set (0.00 sec)\n\nThe example uses the mysql client delimiter command to change the\nstatement delimiter from ; to // while the procedure is being defined.\nThis enables the ; delimiter used in the procedure body to be passed\nthrough to the server rather than being interpreted by mysql itself.\nSee\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-programs-defining.html.\n\nThe RETURNS clause may be specified only for a FUNCTION, for which it\nis mandatory. It indicates the return type of the function, and the\nfunction body must contain a RETURN value statement. If the RETURN\nstatement returns a value of a different type, the value is coerced to\nthe proper type. For example, if a function specifies an ENUM or SET\nvalue in the RETURNS clause, but the RETURN statement returns an\ninteger, the value returned from the function is the string for the\ncorresponding ENUM member of set of SET members.\n\nThe following example function takes a parameter, performs an operation\nusing an SQL function, and returns the result. In this case, it is\nunnecessary to use delimiter because the function definition contains\nno internal ; statement delimiters:\n\nmysql> CREATE FUNCTION hello (s CHAR(20))\nmysql> RETURNS CHAR(50) DETERMINISTIC\n       RETURN CONCAT(\'Hello, \',s,\'!\');\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> SELECT hello(\'world\');\n+----------------+\n| hello(\'world\') |\n+----------------+\n| Hello, world!  |\n+----------------+\n1 row in set (0.00 sec)\n\nParameter types and function return types can be declared to use any\nvalid data type. The COLLATE attribute can be used if preceded by a\nCHARACTER SET specification.\n\nThe routine_body consists of a valid SQL routine statement. This can be\na simple statement such as SELECT or INSERT, or a compound statement\nwritten using BEGIN and END. Compound statements can contain\ndeclarations, loops, and other control structure statements. The syntax\nfor these statements is described in\nhttps://dev.mysql.com/doc/refman/8.0/en/sql-compound-statements.html.\nIn practice, stored functions tend to use compound statements, unless\nthe body consists of a single RETURN statement.\n\nMySQL permits routines to contain DDL statements, such as CREATE and\nDROP. MySQL also permits stored procedures (but not stored functions)\nto contain SQL transaction statements such as COMMIT. Stored functions\nmay not contain statements that perform explicit or implicit commit or\nrollback. Support for these statements is not required by the SQL\nstandard, which states that each DBMS vendor may decide whether to\npermit them.\n\nStatements that return a result set can be used within a stored\nprocedure but not within a stored function. This prohibition includes\nSELECT statements that do not have an INTO var_list clause and other\nstatements such as SHOW, EXPLAIN, and CHECK TABLE. For statements that\ncan be determined at function definition time to return a result set, a\nNot allowed to return a result set from a function error occurs\n(ER_SP_NO_RETSET\n(https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference.h\ntml#error_er_sp_no_retset)). For statements that can be determined only\nat runtime to return a result set, a PROCEDURE %s can\'t return a result\nset in the given context error occurs (ER_SP_BADSELECT\n(https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference.h\ntml#error_er_sp_badselect)).\n\nUSE statements within stored routines are not permitted. When a routine\nis invoked, an implicit USE db_name is performed (and undone when the\nroutine terminates). The causes the routine to have the given default\ndatabase while it executes. References to objects in databases other\nthan the routine default database should be qualified with the\nappropriate database name.\n\nFor additional information about statements that are not permitted in\nstored routines, see\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-program-restrictions.htm\nl.\n\nFor information about invoking stored procedures from within programs\nwritten in a language that has a MySQL interface, see [HELP CALL].\n\nMySQL stores the sql_mode system variable setting in effect when a\nroutine is created or altered, and always executes the routine with\nthis setting in force, regardless of the current server SQL mode when\nthe routine begins executing.\n\nThe switch from the SQL mode of the invoker to that of the routine\noccurs after evaluation of arguments and assignment of the resulting\nvalues to routine parameters. If you define a routine in strict SQL\nmode but invoke it in nonstrict mode, assignment of arguments to\nroutine parameters does not take place in strict mode. If you require\nthat expressions passed to a routine be assigned in strict SQL mode,\nyou should invoke the routine with strict mode in effect.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/create-procedure.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/create-procedure.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (520,40,'CREATE SERVER','Syntax:\nCREATE SERVER server_name\n    FOREIGN DATA WRAPPER wrapper_name\n    OPTIONS (option [, option] ...)\n\noption: {\n    HOST character-literal\n  | DATABASE character-literal\n  | USER character-literal\n  | PASSWORD character-literal\n  | SOCKET character-literal\n  | OWNER character-literal\n  | PORT numeric-literal\n}\n\nThis statement creates the definition of a server for use with the\nFEDERATED storage engine. The CREATE SERVER statement creates a new row\nin the servers table in the mysql database. This statement requires the\nSUPER privilege.\n\nThe server_name should be a unique reference to the server. Server\ndefinitions are global within the scope of the server, it is not\npossible to qualify the server definition to a specific database.\nserver_name has a maximum length of 64 characters (names longer than 64\ncharacters are silently truncated), and is case-insensitive. You may\nspecify the name as a quoted string.\n\nThe wrapper_name is an identifier and may be quoted with single\nquotation marks.\n\nFor each option you must specify either a character literal or numeric\nliteral. Character literals are UTF-8, support a maximum length of 64\ncharacters and default to a blank (empty) string. String literals are\nsilently truncated to 64 characters. Numeric literals must be a number\nbetween 0 and 9999, default value is 0.\n\n*Note*:\n\nThe OWNER option is currently not applied, and has no effect on the\nownership or operation of the server connection that is created.\n\nThe CREATE SERVER statement creates an entry in the mysql.servers table\nthat can later be used with the CREATE TABLE statement when creating a\nFEDERATED table. The options that you specify are used to populate the\ncolumns in the mysql.servers table. The table columns are Server_name,\nHost, Db, Username, Password, Port and Socket.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/create-server.html\n\n','CREATE SERVER s\nFOREIGN DATA WRAPPER mysql\nOPTIONS (USER \'Remote\', HOST \'198.51.100.106\', DATABASE \'test\');\n','https://dev.mysql.com/doc/refman/8.0/en/create-server.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (521,40,'CREATE SPATIAL REFERENCE SYSTEM','Syntax:\nCREATE OR REPLACE SPATIAL REFERENCE SYSTEM\n    srid srs_attribute ...\n\nCREATE SPATIAL REFERENCE SYSTEM\n    [IF NOT EXISTS]\n    srid srs_attribute ...\n\nsrs_attribute: {\n    NAME \'srs_name\'\n  | DEFINITION \'definition\'\n  | ORGANIZATION \'org_name\' IDENTIFIED BY org_id\n  | DESCRIPTION \'description\'\n}\n\nsrid, org_id: 32-bit unsigned integer\n\nThis statement creates a spatial reference system (SRS) definition and\nstores it in the data dictionary. It requires the SUPER privilege. The\nresulting data dictionary entry can be inspected using the\nINFORMATION_SCHEMA ST_SPATIAL_REFERENCE_SYSTEMS table.\n\nSRID values must be unique, so if neither OR REPLACE nor IF NOT EXISTS\nis specified, an error occurs if an SRS definition with the given srid\nvalue already exists.\n\nWith CREATE OR REPLACE syntax, any existing SRS definition with the\nsame SRID value is replaced, unless the SRID value is used by some\ncolumn in an existing table. In that case, an error occurs. For\nexample:\n\nmysql> CREATE OR REPLACE SPATIAL REFERENCE SYSTEM 4326 ...;\nERROR 3716 (SR005): Can\'t modify SRID 4326. There is at\nleast one column depending on it.\n\nTo identify which column or columns use the SRID, use this query,\nreplacing 4326 with the SRID of the definition you are trying to\ncreate:\n\nSELECT * FROM INFORMATION_SCHEMA.ST_GEOMETRY_COLUMNS WHERE SRS_ID=4326;\n\nWith CREATE ... IF NOT EXISTS syntax, any existing SRS definition with\nthe same SRID value causes the new definition to be ignored and a\nwarning occurs.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/create-spatial-reference-system.html\n\n','CREATE SPATIAL REFERENCE SYSTEM 4120\nNAME \'Greek\'\nORGANIZATION \'EPSG\' IDENTIFIED BY 4120\nDEFINITION\n  \'GEOGCS["Greek",DATUM["Greek",SPHEROID["Bessel 1841",\n  6377397.155,299.1528128,AUTHORITY["EPSG","7004"]],\n  AUTHORITY["EPSG","6120"]],PRIMEM["Greenwich",0,\n  AUTHORITY["EPSG","8901"]],UNIT["degree",0.017453292519943278,\n  AUTHORITY["EPSG","9122"]],AXIS["Lat",NORTH],AXIS["Lon",EAST],\n  AUTHORITY["EPSG","4120"]]\';\n','https://dev.mysql.com/doc/refman/8.0/en/create-spatial-reference-system.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (522,40,'CREATE TABLE','Syntax:\nCREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name\n    (create_definition,...)\n    [table_options]\n    [partition_options]\n\nCREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name\n    [(create_definition,...)]\n    [table_options]\n    [partition_options]\n    [IGNORE | REPLACE]\n    [AS] query_expression\n\nCREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name\n    { LIKE old_tbl_name | (LIKE old_tbl_name) }\n\ncreate_definition: {\n    col_name column_definition\n  | {INDEX | KEY} [index_name] [index_type] (key_part,...)\n      [index_option] ...\n  | {FULLTEXT | SPATIAL} [INDEX | KEY] [index_name] (key_part,...)\n      [index_option] ...\n  | [CONSTRAINT [symbol]] PRIMARY KEY\n      [index_type] (key_part,...)\n      [index_option] ...\n  | [CONSTRAINT [symbol]] UNIQUE [INDEX | KEY]\n      [index_name] [index_type] (key_part,...)\n      [index_option] ...\n  | [CONSTRAINT [symbol]] FOREIGN KEY\n      [index_name] (col_name,...)\n      reference_definition\n  | check_constraint_definition\n}\n\ncolumn_definition: {\n    data_type [NOT NULL | NULL] [DEFAULT {literal | (expr)} ]\n      [VISIBLE | INVISIBLE]\n      [AUTO_INCREMENT] [UNIQUE [KEY]] [[PRIMARY] KEY]\n      [COMMENT \'string\']\n      [COLLATE collation_name]\n      [COLUMN_FORMAT {FIXED | DYNAMIC | DEFAULT}]\n      [ENGINE_ATTRIBUTE [=] \'string\']\n      [SECONDARY_ENGINE_ATTRIBUTE [=] \'string\']\n      [STORAGE {DISK | MEMORY}]\n      [reference_definition]\n      [check_constraint_definition]\n  | data_type\n      [COLLATE collation_name]\n      [GENERATED ALWAYS] AS (expr)\n      [VIRTUAL | STORED] [NOT NULL | NULL]\n      [VISIBLE | INVISIBLE]\n      [UNIQUE [KEY]] [[PRIMARY] KEY]\n      [COMMENT \'string\']\n      [reference_definition]\n      [check_constraint_definition]\n}\n\ndata_type:\n    (see https://dev.mysql.com/doc/refman/8.0/en/data-types.html)\n\nkey_part: {col_name [(length)] | (expr)} [ASC | DESC]\n\nindex_type:\n    USING {BTREE | HASH}\n\nindex_option: {\n    KEY_BLOCK_SIZE [=] value\n  | index_type\n  | WITH PARSER parser_name\n  | COMMENT \'string\'\n  | {VISIBLE | INVISIBLE}\n  |ENGINE_ATTRIBUTE [=] \'string\'\n  |SECONDARY_ENGINE_ATTRIBUTE [=] \'string\'\n}\n\ncheck_constraint_definition:\n    [CONSTRAINT [symbol]] CHECK (expr) [[NOT] ENFORCED]\n\nreference_definition:\n    REFERENCES tbl_name (key_part,...)\n      [MATCH FULL | MATCH PARTIAL | MATCH SIMPLE]\n      [ON DELETE reference_option]\n      [ON UPDATE reference_option]\n\nreference_option:\n    RESTRICT | CASCADE | SET NULL | NO ACTION | SET DEFAULT\n\ntable_options:\n    table_option [[,] table_option] ...\n\ntable_option: {\n    AUTOEXTEND_SIZE [=] value\n  | AUTO_INCREMENT [=] value\n  | AVG_ROW_LENGTH [=] value\n  | [DEFAULT] CHARACTER SET [=] charset_name\n  | CHECKSUM [=] {0 | 1}\n  | [DEFAULT] COLLATE [=] collation_name\n  | COMMENT [=] \'string\'\n  | COMPRESSION [=] {\'ZLIB\' | \'LZ4\' | \'NONE\'}\n  | CONNECTION [=] \'connect_string\'\n  | {DATA | INDEX} DIRECTORY [=] \'absolute path to directory\'\n  | DELAY_KEY_WRITE [=] {0 | 1}\n  | ENCRYPTION [=] {\'Y\' | \'N\'}\n  | ENGINE [=] engine_name\n  | ENGINE_ATTRIBUTE [=] \'string\'\n  | INSERT_METHOD [=] { NO | FIRST | LAST }\n  | KEY_BLOCK_SIZE [=] value\n  | MAX_ROWS [=] value\n  | MIN_ROWS [=] value\n  | PACK_KEYS [=] {0 | 1 | DEFAULT}\n  | PASSWORD [=] \'string\'\n  | ROW_FORMAT [=] {DEFAULT | DYNAMIC | FIXED | COMPRESSED | REDUNDANT | COMPACT}\n  | SECONDARY_ENGINE_ATTRIBUTE [=] \'string\'\n  | STATS_AUTO_RECALC [=] {DEFAULT | 0 | 1}\n  | STATS_PERSISTENT [=] {DEFAULT | 0 | 1}\n  | STATS_SAMPLE_PAGES [=] value\n  | TABLESPACE tablespace_name [STORAGE {DISK | MEMORY}]\n  | UNION [=] (tbl_name[,tbl_name]...)\n}\n\npartition_options:\n    PARTITION BY\n        { [LINEAR] HASH(expr)\n        | [LINEAR] KEY [ALGORITHM={1 | 2}] (column_list)\n        | RANGE{(expr) | COLUMNS(column_list)}\n        | LIST{(expr) | COLUMNS(column_list)} }\n    [PARTITIONS num]\n    [SUBPARTITION BY\n        { [LINEAR] HASH(expr)\n        | [LINEAR] KEY [ALGORITHM={1 | 2}] (column_list) }\n      [SUBPARTITIONS num]\n    ]\n    [(partition_definition [, partition_definition] ...)]\n\npartition_definition:\n    PARTITION partition_name\n        [VALUES\n            {LESS THAN {(expr | value_list) | MAXVALUE}\n            |\n            IN (value_list)}]\n        [[STORAGE] ENGINE [=] engine_name]\n        [COMMENT [=] \'string\' ]\n        [DATA DIRECTORY [=] \'data_dir\']\n        [INDEX DIRECTORY [=] \'index_dir\']\n        [MAX_ROWS [=] max_number_of_rows]\n        [MIN_ROWS [=] min_number_of_rows]\n        [TABLESPACE [=] tablespace_name]\n        [(subpartition_definition [, subpartition_definition] ...)]\n\nsubpartition_definition:\n    SUBPARTITION logical_name\n        [[STORAGE] ENGINE [=] engine_name]\n        [COMMENT [=] \'string\' ]\n        [DATA DIRECTORY [=] \'data_dir\']\n        [INDEX DIRECTORY [=] \'index_dir\']\n        [MAX_ROWS [=] max_number_of_rows]\n        [MIN_ROWS [=] min_number_of_rows]\n        [TABLESPACE [=] tablespace_name]\n\nquery_expression:\n    SELECT ...   (Some valid select or union statement)\n\nCREATE TABLE creates a table with the given name. You must have the\nCREATE privilege for the table.\n\nBy default, tables are created in the default database, using the\nInnoDB storage engine. An error occurs if the table exists, if there is\nno default database, or if the database does not exist.\n\nMySQL has no limit on the number of tables. The underlying file system\nmay have a limit on the number of files that represent tables.\nIndividual storage engines may impose engine-specific constraints.\nInnoDB permits up to 4 billion tables.\n\nFor information about the physical representation of a table, see\nhttps://dev.mysql.com/doc/refman/8.0/en/create-table-files.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/create-table.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/create-table.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (523,40,'FOREIGN KEY','MySQL supports foreign keys, which permit cross-referencing related\ndata across tables, and foreign key constraints, which help keep the\nrelated data consistent.\n\nA foreign key relationship involves a parent table that holds the\ninitial column values, and a child table with column values that\nreference the parent column values. A foreign key constraint is defined\non the child table.\n\nThe essential syntax for a defining a foreign key constraint in a\nCREATE TABLE or ALTER TABLE statement includes the following:\n\n[CONSTRAINT [symbol]] FOREIGN KEY\n    [index_name] (col_name, ...)\n    REFERENCES tbl_name (col_name,...)\n    [ON DELETE reference_option]\n    [ON UPDATE reference_option]\n\nreference_option:\n    RESTRICT | CASCADE | SET NULL | NO ACTION | SET DEFAULT\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/create-table-foreign-keys.html\n\n','CREATE TABLE product (\n    category INT NOT NULL, id INT NOT NULL,\n    price DECIMAL,\n    PRIMARY KEY(category, id)\n)   ENGINE=INNODB;\n\nCREATE TABLE customer (\n    id INT NOT NULL,\n    PRIMARY KEY (id)\n)   ENGINE=INNODB;\n\nCREATE TABLE product_order (\n    no INT NOT NULL AUTO_INCREMENT,\n    product_category INT NOT NULL,\n    product_id INT NOT NULL,\n    customer_id INT NOT NULL,\n\n    PRIMARY KEY(no),\n    INDEX (product_category, product_id),\n    INDEX (customer_id),\n\n    FOREIGN KEY (product_category, product_id)\n      REFERENCES product(category, id)\n      ON UPDATE CASCADE ON DELETE RESTRICT,\n\n    FOREIGN KEY (customer_id)\n      REFERENCES customer(id)\n)   ENGINE=INNODB;\n','https://dev.mysql.com/doc/refman/8.0/en/create-table-foreign-keys.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (524,40,'CREATE TABLESPACE','Syntax:\nCREATE [UNDO] TABLESPACE tablespace_name\n\n  InnoDB and NDB:\n    [ADD DATAFILE \'file_name\']\n    [AUTOEXTEND_SIZE [=] value]\n\n  InnoDB only:\n    [FILE_BLOCK_SIZE = value]\n    [ENCRYPTION [=] {\'Y\' | \'N\'}]\n\n  NDB only:\n    USE LOGFILE GROUP logfile_group\n    [EXTENT_SIZE [=] extent_size]\n    [INITIAL_SIZE [=] initial_size]\n    [MAX_SIZE [=] max_size]\n    [NODEGROUP [=] nodegroup_id]\n    [WAIT]\n    [COMMENT [=] \'string\']\n\n  InnoDB and NDB:\n    [ENGINE [=] engine_name]\n\n  Reserved for future use:\n    [ENGINE_ATTRIBUTE [=] \'string\']\n\nThis statement is used to create a tablespace. The precise syntax and\nsemantics depend on the storage engine used. In standard MySQL\nreleases, this is always an InnoDB tablespace. MySQL NDB Cluster also\nsupports tablespaces using the NDB storage engine.\n\no https://dev.mysql.com/doc/refman/8.0/en/create-tablespace.html#create\n  -tablespace-innodb\n\no https://dev.mysql.com/doc/refman/8.0/en/create-tablespace.html#create\n  -tablespace-ndb\n\no https://dev.mysql.com/doc/refman/8.0/en/create-tablespace.html#create\n  -tablespace-options\n\no https://dev.mysql.com/doc/refman/8.0/en/create-tablespace.html#create\n  -tablespace-notes\n\no https://dev.mysql.com/doc/refman/8.0/en/create-tablespace.html#create\n  -tablespace-innodb-examples\n\no https://dev.mysql.com/doc/refman/8.0/en/create-tablespace.html#create\n  -tablespace-ndb-examples\n\nConsiderations for InnoDB\n\nCREATE TABLESPACE syntax is used to create general tablespaces or undo\ntablespaces. The UNDO keyword, introduced in MySQL 8.0.14, must be\nspecified to create an undo tablespace.\n\nA general tablespace is a shared tablespace. It can hold multiple\ntables, and supports all table row formats. General tablespaces can be\ncreated in a location relative to or independent of the data directory.\n\nAfter creating an InnoDB general tablespace, use CREATE TABLE tbl_name\n... TABLESPACE [=] tablespace_name or ALTER TABLE tbl_name TABLESPACE\n[=] tablespace_name to add tables to the tablespace. For more\ninformation, see\nhttps://dev.mysql.com/doc/refman/8.0/en/general-tablespaces.html.\n\nUndo tablespaces contain undo logs. Undo tablespaces can be created in\na chosen location by specifying a fully qualified data file path. For\nmore information, see\nhttps://dev.mysql.com/doc/refman/8.0/en/innodb-undo-tablespaces.html.\n\nConsiderations for NDB Cluster\n\nThis statement is used to create a tablespace, which can contain one or\nmore data files, providing storage space for NDB Cluster Disk Data\ntables (see\nhttps://dev.mysql.com/doc/refman/8.0/en/mysql-cluster-disk-data.html).\nOne data file is created and added to the tablespace using this\nstatement. Additional data files may be added to the tablespace by\nusing the ALTER TABLESPACE statement (see [HELP ALTER TABLESPACE]).\n\n*Note*:\n\nAll NDB Cluster Disk Data objects share the same namespace. This means\nthat each Disk Data object must be uniquely named (and not merely each\nDisk Data object of a given type). For example, you cannot have a\ntablespace and a log file group with the same name, or a tablespace and\na data file with the same name.\n\nA log file group of one or more UNDO log files must be assigned to the\ntablespace to be created with the USE LOGFILE GROUP clause.\nlogfile_group must be an existing log file group created with CREATE\nLOGFILE GROUP (see [HELP CREATE LOGFILE GROUP]). Multiple tablespaces\nmay use the same log file group for UNDO logging.\n\nWhen setting EXTENT_SIZE or INITIAL_SIZE, you may optionally follow the\nnumber with a one-letter abbreviation for an order of magnitude,\nsimilar to those used in my.cnf. Generally, this is one of the letters\nM (for megabytes) or G (for gigabytes).\n\nINITIAL_SIZE and EXTENT_SIZE are subject to rounding as follows:\n\no EXTENT_SIZE is rounded up to the nearest whole multiple of 32K.\n\no INITIAL_SIZE is rounded down to the nearest whole multiple of 32K;\n  this result is rounded up to the nearest whole multiple of\n  EXTENT_SIZE (after any rounding).\n\n*Note*:\n\nNDB reserves 4% of a tablespace for data node restart operations. This\nreserved space cannot be used for data storage.\n\nThe rounding just described is done explicitly, and a warning is issued\nby the MySQL Server when any such rounding is performed. The rounded\nvalues are also used by the NDB kernel for calculating\nINFORMATION_SCHEMA.FILES column values and other purposes. However, to\navoid an unexpected result, we suggest that you always use whole\nmultiples of 32K in specifying these options.\n\nWhen CREATE TABLESPACE is used with ENGINE [=] NDB, a tablespace and\nassociated data file are created on each Cluster data node. You can\nverify that the data files were created and obtain information about\nthem by querying the INFORMATION_SCHEMA.FILES table. (See the example\nlater in this section.)\n\n(See\nhttps://dev.mysql.com/doc/refman/8.0/en/information-schema-files-table.\nhtml.)\n\nOptions\n\no ADD DATAFILE: Defines the name of a tablespace data file. This option\n  is always required when creating an NDB tablespace; for InnoDB in\n  MySQL 8.0.14 and later, it is required only when creating an undo\n  tablespace. The file_name, including any specified path, must be\n  quoted with single or double quotation marks. File names (not\n  counting the file extension) and directory names must be at least one\n  byte in length. Zero length file names and directory names are not\n  supported.\n\n  Because there are considerable differences in how InnoDB and NDB\n  treat data files, the two storage engines are covered separately in\n  the discussion that follows.\n\n  InnoDB data files An InnoDB tablespace supports only a single data\n  file, whose name must include a .ibd extension.\n\n  To place an InnoDB general tablespace data file in a location outside\n  of the data directory, include a fully qualified path or a path\n  relative to the data directory. Only a fully qualified path is\n  permitted for undo tablespaces. If you do not specify a path, a\n  general tablespace is created in the data directory. An undo\n  tablespace created without specifying a path is created in the\n  directory defined by the innodb_undo_directory variable. If the\n  innodb_undo_directory variable is undefined, undo tablespaces are\n  created in the data directory.\n\n  To avoid conflicts with implicitly created file-per-table\n  tablespaces, creating an InnoDB general tablespace in a subdirectory\n  under the data directory is not supported. When creating a general\n  tablespace or undo tablespace outside of the data directory, the\n  directory must exist and must be known to InnoDB prior to creating\n  the tablespace. To make a directory known to InnoDB, add it to the\n  innodb_directories value or to one of the variables whose values are\n  appended to the innodb_directories value. innodb_directories is a\n  read-only variable. Configuring it requires restarting the server.\n\n  If the ADD DATAFILE clause is not specified when creating an InnoDB\n  tablespace, a tablespace data file with a unique file name is created\n  implicitly. The unique file name is a 128 bit UUID formatted into\n  five groups of hexadecimal numbers separated by dashes\n  (aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee). A file extension is added if\n  required by the storage engine. An .ibd file extension is added for\n  InnoDB general tablespace data files. In a replication environment,\n  the data file name created on the replication source server is not\n  the same as the data file name created on the replica.\n\n  As of MySQL 8.0.17, the ADD DATAFILE clause does not permit circular\n  directory references when creating an InnoDB tablespace. For example,\n  the circular directory reference (/../) in the following statement is\n  not permitted:\n\nCREATE TABLESPACE ts1 ADD DATAFILE ts1.ibd \'any_directory/../ts1.ibd\';\n\n  An exception to this restriction exists on Linux, where a circular\n  directory reference is permitted if the preceding directory is a\n  symbolic link. For example, the data file path in the example above\n  is permitted if any_directory is a symbolic link. (It is still\n  permitted for data file paths to begin with \'../\'.)\n\n  NDB data files An NDB tablespace supports multiple data files which\n  can have any legal file names; more data files can be added to an NDB\n  Cluster tablespace following its creation by using an ALTER\n  TABLESPACE statement.\n\n  An NDB tablespace data file is created by default in the data node\n  file system directory---that is, the directory named ndb_nodeid_fs/TS\n  under the data node\'s data directory (DataDir), where nodeid is the\n  data node\'s NodeId. To place the data file in a location other than\n  the default, include an absolute directory path or a path relative to\n  the default location. If the directory specified does not exist, NDB\n  attempts to create it; the system user account under which the data\n  node process is running must have the appropriate permissions to do\n  so.\n\n  *Note*:\n\n  When determining the path used for a data file, NDB does not expand\n  the ~ (tilde) character.\n\n  When multiple data nodes are run on the same physical host, the\n  following considerations apply:\n\n  o You cannot specify an absolute path when creating a data file.\n\n  o It is not possible to create tablespace data files outside the data\n    node file system directory, unless each data node has a separate\n    data directory.\n\n  o If each data node has its own data directory, data files can be\n    created anywhere within this directory.\n\n  o If each data node has its own data directory, it may also be\n    possible to create a data file outside the node\'s data directory\n    using a relative path, as long as this path resolves to a unique\n    location on the host file system for each data node running on that\n    host.\n\no FILE_BLOCK_SIZE: This option---which is specific to InnoDB general\n  tablespaces, and is ignored by NDB---defines the block size for the\n  tablespace data file. Values can be specified in bytes or kilobytes.\n  For example, an 8 kilobyte file block size can be specified as 8192\n  or 8K. If you do not specify this option, FILE_BLOCK_SIZE defaults to\n  the innodb_page_size value. FILE_BLOCK_SIZE is required when you\n  intend to use the tablespace for storing compressed InnoDB tables\n  (ROW_FORMAT=COMPRESSED). In this case, you must define the tablespace\n  FILE_BLOCK_SIZE when creating the tablespace.\n\n  If FILE_BLOCK_SIZE is equal the innodb_page_size value, the\n  tablespace can contain only tables having an uncompressed row format\n  (COMPACT, REDUNDANT, and DYNAMIC). Tables with a COMPRESSED row\n  format have a different physical page size than uncompressed tables.\n  Therefore, compressed tables cannot coexist in the same tablespace as\n  uncompressed tables.\n\n  For a general tablespace to contain compressed tables,\n  FILE_BLOCK_SIZE must be specified, and the FILE_BLOCK_SIZE value must\n  be a valid compressed page size in relation to the innodb_page_size\n  value. Also, the physical page size of the compressed table\n  (KEY_BLOCK_SIZE) must be equal to FILE_BLOCK_SIZE/1024. For example,\n  if innodb_page_size=16K, and FILE_BLOCK_SIZE=8K, the KEY_BLOCK_SIZE\n  of the table must be 8. For more information, see\n  https://dev.mysql.com/doc/refman/8.0/en/general-tablespaces.html.\n\no USE LOGFILE GROUP: Required for NDB, this is the name of a log file\n  group previously created using CREATE LOGFILE GROUP. Not supported\n  for InnoDB, where it fails with an error.\n\no EXTENT_SIZE: This option is specific to NDB, and is not supported by\n  InnoDB, where it fails with an error. EXTENT_SIZE sets the size, in\n  bytes, of the extents used by any files belonging to the tablespace.\n  The default value is 1M. The minimum size is 32K, and theoretical\n  maximum is 2G, although the practical maximum size depends on a\n  number of factors. In most cases, changing the extent size does not\n  have any measurable effect on performance, and the default value is\n  recommended for all but the most unusual situations.\n\n  An extent is a unit of disk space allocation. One extent is filled\n  with as much data as that extent can contain before another extent is\n  used. In theory, up to 65,535 (64K) extents may used per data file;\n  however, the recommended maximum is 32,768 (32K). The recommended\n  maximum size for a single data file is 32G---that is, 32K extents x 1\n  MB per extent. In addition, once an extent is allocated to a given\n  partition, it cannot be used to store data from a different\n  partition; an extent cannot store data from more than one partition.\n  This means, for example that a tablespace having a single datafile\n  whose INITIAL_SIZE (described in the following item) is 256 MB and\n  whose EXTENT_SIZE is 128M has just two extents, and so can be used to\n  store data from at most two different disk data table partitions.\n\n  You can see how many extents remain free in a given data file by\n  querying the INFORMATION_SCHEMA.FILES table, and so derive an\n  estimate for how much space remains free in the file. For further\n  discussion and examples, see\n  https://dev.mysql.com/doc/refman/8.0/en/information-schema-files-tabl\n  e.html.\n\no INITIAL_SIZE: This option is specific to NDB, and is not supported by\n  InnoDB, where it fails with an error.\n\n  The INITIAL_SIZE parameter sets the total size in bytes of the data\n  file that was specific using ADD DATATFILE. Once this file has been\n  created, its size cannot be changed; however, you can add more data\n  files to the tablespace using ALTER TABLESPACE ... ADD DATAFILE.\n\n  INITIAL_SIZE is optional; its default value is 134217728 (128 MB).\n\n  On 32-bit systems, the maximum supported value for INITIAL_SIZE is\n  4294967296 (4 GB).\n\no AUTOEXTEND_SIZE: Ignored by MySQL prior to MySQL 8.0.23; From MySQL\n  8.0.23, defines the amount by which InnoDB extends the size of the\n  tablespace when it becomes full. The setting must be a multiple of\n  4MB. The default setting is 0, which causes the tablespace to be\n  extended according to the implicit default behavior. For more\n  information, see\n  https://dev.mysql.com/doc/refman/8.0/en/innodb-tablespace-autoextend-\n  size.html.\n\n  Has no effect in any release of MySQL NDB Cluster 8.0, regardless of\n  the storage engine used.\n\no MAX_SIZE: Currently ignored by MySQL; reserved for possible future\n  use. Has no effect in any release of MySQL 8.0 or MySQL NDB Cluster\n  8.0, regardless of the storage engine used.\n\no NODEGROUP: Currently ignored by MySQL; reserved for possible future\n  use. Has no effect in any release of MySQL 8.0 or MySQL NDB Cluster\n  8.0, regardless of the storage engine used.\n\no WAIT: Currently ignored by MySQL; reserved for possible future use.\n  Has no effect in any release of MySQL 8.0 or MySQL NDB Cluster 8.0,\n  regardless of the storage engine used.\n\no COMMENT: Currently ignored by MySQL; reserved for possible future\n  use. Has no effect in any release of MySQL 8.0 or MySQL NDB Cluster\n  8.0, regardless of the storage engine used.\n\no The ENCRYPTION clause enables or disables page-level data encryption\n  for an InnoDB general tablespace. Encryption support for general\n  tablespaces was introduced in MySQL 8.0.13.\n\n  As of MySQL 8.0.16, if the ENCRYPTION clause is not specified, the\n  default_table_encryption setting controls whether encryption is\n  enabled. The ENCRYPTION clause overrides the default_table_encryption\n  setting. However, if the table_encryption_privilege_check variable is\n  enabled, the TABLE_ENCRYPTION_ADMIN privilege is required to use an\n  ENCRYPTION clause setting that differs from the\n  default_table_encryption setting.\n\n  A keyring plugin must be installed and configured before an\n  encryption-enabled tablespace can be created.\n\n  When a general tablespace is encrypted, all tables residing in the\n  tablespace are encrypted. Likewise, a table created in an encrypted\n  tablespace is encrypted.\n\n  For more information, see\n  https://dev.mysql.com/doc/refman/8.0/en/innodb-data-encryption.html\n\no ENGINE: Defines the storage engine which uses the tablespace, where\n  engine_name is the name of the storage engine. Currently, only the\n  InnoDB storage engine is supported by standard MySQL 8.0 releases.\n  MySQL NDB Cluster supports both NDB and InnoDB tablespaces. The value\n  of the default_storage_engine system variable is used for ENGINE if\n  the option is not specified.\n\no The ENGINE_ATTRIBUTE option (available as of MySQL 8.0.21) is used to\n  specify tablespace attributes for primary storage engines. The option\n  is reserved for future use.\n\n  Permitted values are a string literal containing a valid JSON\n  document or an empty string (\'\'). Invalid JSON is rejected.\n\nCREATE TABLESPACE ts1 ENGINE_ATTRIBUTE=\'{"key":"value"}\';\n\n  ENGINE_ATTRIBUTE values can be repeated without error. In this case,\n  the last specified value is used.\n\n  ENGINE_ATTRIBUTE values are not checked by the server, nor are they\n  cleared when the table\'s storage engine is changed.\n\nNotes\n\no For the rules covering the naming of MySQL tablespaces, see\n  https://dev.mysql.com/doc/refman/8.0/en/identifiers.html. In addition\n  to these rules, the slash character ("/") is not permitted, nor can\n  you use names beginning with innodb_, as this prefix is reserved for\n  system use.\n\no Creation of temporary general tablespaces is not supported.\n\no General tablespaces do not support temporary tables.\n\no The TABLESPACE option may be used with CREATE TABLE or ALTER TABLE to\n  assign an InnoDB table partition or subpartition to a file-per-table\n  tablespace. All partitions must belong to the same storage engine.\n  Assigning table partitions to shared InnoDB tablespaces is not\n  supported. Shared tablespaces include the InnoDB system tablespace\n  and general tablespaces.\n\no General tablespaces support the addition of tables of any row format\n  using CREATE TABLE ... TABLESPACE. innodb_file_per_table does not\n  need to be enabled.\n\no innodb_strict_mode is not applicable to general tablespaces.\n  Tablespace management rules are strictly enforced independently of\n  innodb_strict_mode. If CREATE TABLESPACE parameters are incorrect or\n  incompatible, the operation fails regardless of the\n  innodb_strict_mode setting. When a table is added to a general\n  tablespace using CREATE TABLE ... TABLESPACE or ALTER TABLE ...\n  TABLESPACE, innodb_strict_mode is ignored but the statement is\n  evaluated as if innodb_strict_mode is enabled.\n\no Use DROP TABLESPACE to remove a tablespace. All tables must be\n  dropped from a tablespace using DROP TABLE prior to dropping the\n  tablespace. Before dropping an NDB Cluster tablespace you must also\n  remove all its data files using one or more ALTER TABLESPACE ... DROP\n  DATATFILE statements. See\n  https://dev.mysql.com/doc/refman/8.0/en/mysql-cluster-disk-data-objec\n  ts.html.\n\no All parts of an InnoDB table added to an InnoDB general tablespace\n  reside in the general tablespace, including indexes and BLOB pages.\n\n  For an NDB table assigned to a tablespace, only those columns which\n  are not indexed are stored on disk, and actually use the tablespace\n  data files. Indexes and indexed columns for all NDB tables are always\n  kept in memory.\n\no Similar to the system tablespace, truncating or dropping tables\n  stored in a general tablespace creates free space internally in the\n  general tablespace .ibd data file which can only be used for new\n  InnoDB data. Space is not released back to the operating system as it\n  is for file-per-table tablespaces.\n\no A general tablespace is not associated with any database or schema.\n\no ALTER TABLE ... DISCARD TABLESPACE and ALTER TABLE ...IMPORT\n  TABLESPACE are not supported for tables that belong to a general\n  tablespace.\n\no The server uses tablespace-level metadata locking for DDL that\n  references general tablespaces. By comparison, the server uses\n  table-level metadata locking for DDL that references file-per-table\n  tablespaces.\n\no A generated or existing tablespace cannot be changed to a general\n  tablespace.\n\no There is no conflict between general tablespace names and\n  file-per-table tablespace names. The "/" character, which is present\n  in file-per-table tablespace names, is not permitted in general\n  tablespace names.\n\no mysqldump and mysqlpump do not dump InnoDB CREATE TABLESPACE\n  statements.\n\nInnoDB Examples\n\nThis example demonstrates creating a general tablespace and adding\nthree uncompressed tables of different row formats.\n\nmysql> CREATE TABLESPACE `ts1` ADD DATAFILE \'ts1.ibd\' ENGINE=INNODB;\n\nmysql> CREATE TABLE t1 (c1 INT PRIMARY KEY) TABLESPACE ts1 ROW_FORMAT=REDUNDANT;\n\nmysql> CREATE TABLE t2 (c1 INT PRIMARY KEY) TABLESPACE ts1 ROW_FORMAT=COMPACT;\n\nmysql> CREATE TABLE t3 (c1 INT PRIMARY KEY) TABLESPACE ts1 ROW_FORMAT=DYNAMIC;\n\nThis example demonstrates creating a general tablespace and adding a\ncompressed table. The example assumes a default innodb_page_size value\nof 16K. The FILE_BLOCK_SIZE of 8192 requires that the compressed table\nhave a KEY_BLOCK_SIZE of 8.\n\nmysql> CREATE TABLESPACE `ts2` ADD DATAFILE \'ts2.ibd\' FILE_BLOCK_SIZE = 8192 Engine=InnoDB;\n\nmysql> CREATE TABLE t4 (c1 INT PRIMARY KEY) TABLESPACE ts2 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;\n\nThis example demonstrates creating a general tablespace without\nspecifying the ADD DATAFILE clause, which is optional as of MySQL\n8.0.14.\n\nmysql> CREATE TABLESPACE `ts3` ENGINE=INNODB;\n\nThis example demonstrates creating an undo tablespace.\n\nmysql> CREATE UNDO TABLESPACE undo_003 ADD DATAFILE \'undo_003.ibu\';\n\nNDB Example\n\nSuppose that you wish to create an NDB Cluster Disk Data tablespace\nnamed myts using a datafile named mydata-1.dat. An NDB tablespace\nalways requires the use of a log file group consisting of one or more\nundo log files. For this example, we first create a log file group\nnamed mylg that contains one undo long file named myundo-1.dat, using\nthe CREATE LOGFILE GROUP statement shown here:\n\nmysql> CREATE LOGFILE GROUP myg1\n    ->     ADD UNDOFILE \'myundo-1.dat\'\n    ->     ENGINE=NDB;\nQuery OK, 0 rows affected (3.29 sec)\n\nNow you can create the tablespace previously described using the\nfollowing statement:\n\nmysql> CREATE TABLESPACE myts\n    ->     ADD DATAFILE \'mydata-1.dat\'\n    ->     USE LOGFILE GROUP mylg\n    ->     ENGINE=NDB;\nQuery OK, 0 rows affected (2.98 sec)\n\nYou can now create a Disk Data table using a CREATE TABLE statement\nwith the TABLESPACE and STORAGE DISK options, similar to what is shown\nhere:\n\nmysql> CREATE TABLE mytable (\n    ->     id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,\n    ->     lname VARCHAR(50) NOT NULL,\n    ->     fname VARCHAR(50) NOT NULL,\n    ->     dob DATE NOT NULL,\n    ->     joined DATE NOT NULL,\n    ->     INDEX(last_name, first_name)\n    -> )\n    ->     TABLESPACE myts STORAGE DISK\n    ->     ENGINE=NDB;\nQuery OK, 0 rows affected (1.41 sec)\n\nIt is important to note that only the dob and joined columns from\nmytable are actually stored on disk, due to the fact that the id,\nlname, and fname columns are all indexed.\n\nAs mentioned previously, when CREATE TABLESPACE is used with ENGINE [=]\nNDB, a tablespace and associated data file are created on each NDB\nCluster data node. You can verify that the data files were created and\nobtain information about them by querying the INFORMATION_SCHEMA.FILES\ntable, as shown here:\n\nmysql> SELECT FILE_NAME, FILE_TYPE, LOGFILE_GROUP_NAME, STATUS, EXTRA\n    ->     FROM INFORMATION_SCHEMA.FILES\n    ->     WHERE TABLESPACE_NAME = \'myts\';\n\n+--------------+------------+--------------------+--------+----------------+\n| file_name    | file_type  | logfile_group_name | status | extra          |\n+--------------+------------+--------------------+--------+----------------+\n| mydata-1.dat | DATAFILE   | mylg               | NORMAL | CLUSTER_NODE=5 |\n| mydata-1.dat | DATAFILE   | mylg               | NORMAL | CLUSTER_NODE=6 |\n| NULL         | TABLESPACE | mylg               | NORMAL | NULL           |\n+--------------+------------+--------------------+--------+----------------+\n3 rows in set (0.01 sec)\n\nFor additional information and examples, see\nhttps://dev.mysql.com/doc/refman/8.0/en/mysql-cluster-disk-data-objects\n.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/create-tablespace.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/create-tablespace.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (525,40,'CREATE TRIGGER','Syntax:\nCREATE\n    [DEFINER = user]\n    TRIGGER trigger_name\n    trigger_time trigger_event\n    ON tbl_name FOR EACH ROW\n    [trigger_order]\n    trigger_body\n\ntrigger_time: { BEFORE | AFTER }\n\ntrigger_event: { INSERT | UPDATE | DELETE }\n\ntrigger_order: { FOLLOWS | PRECEDES } other_trigger_name\n\nThis statement creates a new trigger. A trigger is a named database\nobject that is associated with a table, and that activates when a\nparticular event occurs for the table. The trigger becomes associated\nwith the table named tbl_name, which must refer to a permanent table.\nYou cannot associate a trigger with a TEMPORARY table or a view.\n\nTrigger names exist in the schema namespace, meaning that all triggers\nmust have unique names within a schema. Triggers in different schemas\ncan have the same name.\n\nThis section describes CREATE TRIGGER syntax. For additional\ndiscussion, see\nhttps://dev.mysql.com/doc/refman/8.0/en/trigger-syntax.html.\n\nCREATE TRIGGER requires the TRIGGER privilege for the table associated\nwith the trigger. If the DEFINER clause is present, the privileges\nrequired depend on the user value, as discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-objects-security.html.\nIf binary logging is enabled, CREATE TRIGGER might require the SUPER\nprivilege, as discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-programs-logging.html.\n\nThe DEFINER clause determines the security context to be used when\nchecking access privileges at trigger activation time, as described\nlater in this section.\n\ntrigger_time is the trigger action time. It can be BEFORE or AFTER to\nindicate that the trigger activates before or after each row to be\nmodified.\n\nBasic column value checks occur prior to trigger activation, so you\ncannot use BEFORE triggers to convert values inappropriate for the\ncolumn type to valid values.\n\ntrigger_event indicates the kind of operation that activates the\ntrigger. These trigger_event values are permitted:\n\no INSERT: The trigger activates whenever a new row is inserted into the\n  table (for example, through INSERT, LOAD DATA, and REPLACE\n  statements).\n\no UPDATE: The trigger activates whenever a row is modified (for\n  example, through UPDATE statements).\n\no DELETE: The trigger activates whenever a row is deleted from the\n  table (for example, through DELETE and REPLACE statements). DROP\n  TABLE and TRUNCATE TABLE statements on the table do not activate this\n  trigger, because they do not use DELETE. Dropping a partition does\n  not activate DELETE triggers, either.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/create-trigger.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/create-trigger.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (526,40,'CREATE VIEW','Syntax:\nCREATE\n    [OR REPLACE]\n    [ALGORITHM = {UNDEFINED | MERGE | TEMPTABLE}]\n    [DEFINER = user]\n    [SQL SECURITY { DEFINER | INVOKER }]\n    VIEW view_name [(column_list)]\n    AS select_statement\n    [WITH [CASCADED | LOCAL] CHECK OPTION]\n\nThe CREATE VIEW statement creates a new view, or replaces an existing\nview if the OR REPLACE clause is given. If the view does not exist,\nCREATE OR REPLACE VIEW is the same as CREATE VIEW. If the view does\nexist, CREATE OR REPLACE VIEW replaces it.\n\nFor information about restrictions on view use, see\nhttps://dev.mysql.com/doc/refman/8.0/en/view-restrictions.html.\n\nThe select_statement is a SELECT statement that provides the definition\nof the view. (Selecting from the view selects, in effect, using the\nSELECT statement.) The select_statement can select from base tables,\nother views. Beginning with MySQL 8.0.19, the SELECT statement can use\na VALUES statement as its source, or can be replaced with a TABLE\nstatement, as with CREATE TABLE ... SELECT.\n\nThe view definition is "frozen" at creation time and is not affected by\nsubsequent changes to the definitions of the underlying tables. For\nexample, if a view is defined as SELECT * on a table, new columns added\nto the table later do not become part of the view, and columns dropped\nfrom the table result in an error when selecting from the view.\n\nThe ALGORITHM clause affects how MySQL processes the view. The DEFINER\nand SQL SECURITY clauses specify the security context to be used when\nchecking access privileges at view invocation time. The WITH CHECK\nOPTION clause can be given to constrain inserts or updates to rows in\ntables referenced by the view. These clauses are described later in\nthis section.\n\nThe CREATE VIEW statement requires the CREATE VIEW privilege for the\nview, and some privilege for each column selected by the SELECT\nstatement. For columns used elsewhere in the SELECT statement, you must\nhave the SELECT privilege. If the OR REPLACE clause is present, you\nmust also have the DROP privilege for the view. If the DEFINER clause\nis present, the privileges required depend on the user value, as\ndiscussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-objects-security.html.\n\nWhen a view is referenced, privilege checking occurs as described later\nin this section.\n\nA view belongs to a database. By default, a new view is created in the\ndefault database. To create the view explicitly in a given database,\nuse db_name.view_name syntax to qualify the view name with the database\nname:\n\nCREATE VIEW test.v AS SELECT * FROM t;\n\nUnqualified table or view names in the SELECT statement are also\ninterpreted with respect to the default database. A view can refer to\ntables or views in other databases by qualifying the table or view name\nwith the appropriate database name.\n\nWithin a database, base tables and views share the same namespace, so a\nbase table and a view cannot have the same name.\n\nColumns retrieved by the SELECT statement can be simple references to\ntable columns, or expressions that use functions, constant values,\noperators, and so forth.\n\nA view must have unique column names with no duplicates, just like a\nbase table. By default, the names of the columns retrieved by the\nSELECT statement are used for the view column names. To define explicit\nnames for the view columns, specify the optional column_list clause as\na list of comma-separated identifiers. The number of names in\ncolumn_list must be the same as the number of columns retrieved by the\nSELECT statement.\n\nA view can be created from many kinds of SELECT statements. It can\nrefer to base tables or other views. It can use joins, UNION, and\nsubqueries. The SELECT need not even refer to any tables:\n\nCREATE VIEW v_today (today) AS SELECT CURRENT_DATE;\n\nThe following example defines a view that selects two columns from\nanother table as well as an expression calculated from those columns:\n\nmysql> CREATE TABLE t (qty INT, price INT);\nmysql> INSERT INTO t VALUES(3, 50);\nmysql> CREATE VIEW v AS SELECT qty, price, qty*price AS value FROM t;\nmysql> SELECT * FROM v;\n+------+-------+-------+\n| qty  | price | value |\n+------+-------+-------+\n|    3 |    50 |   150 |\n+------+-------+-------+\n\nA view definition is subject to the following restrictions:\n\no The SELECT statement cannot refer to system variables or user-defined\n  variables.\n\no Within a stored program, the SELECT statement cannot refer to program\n  parameters or local variables.\n\no The SELECT statement cannot refer to prepared statement parameters.\n\no Any table or view referred to in the definition must exist. If, after\n  the view has been created, a table or view that the definition refers\n  to is dropped, use of the view results in an error. To check a view\n  definition for problems of this kind, use the CHECK TABLE statement.\n\no The definition cannot refer to a TEMPORARY table, and you cannot\n  create a TEMPORARY view.\n\no You cannot associate a trigger with a view.\n\no Aliases for column names in the SELECT statement are checked against\n  the maximum column length of 64 characters (not the maximum alias\n  length of 256 characters).\n\nORDER BY is permitted in a view definition, but it is ignored if you\nselect from a view using a statement that has its own ORDER BY.\n\nFor other options or clauses in the definition, they are added to the\noptions or clauses of the statement that references the view, but the\neffect is undefined. For example, if a view definition includes a LIMIT\nclause, and you select from the view using a statement that has its own\nLIMIT clause, it is undefined which limit applies. This same principle\napplies to options such as ALL, DISTINCT, or SQL_SMALL_RESULT that\nfollow the SELECT keyword, and to clauses such as INTO, FOR UPDATE, FOR\nSHARE, LOCK IN SHARE MODE, and PROCEDURE.\n\nThe results obtained from a view may be affected if you change the\nquery processing environment by changing system variables:\n\nmysql> CREATE VIEW v (mycol) AS SELECT \'abc\';\nQuery OK, 0 rows affected (0.01 sec)\n\nmysql> SET sql_mode = \'\';\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> SELECT "mycol" FROM v;\n+-------+\n| mycol |\n+-------+\n| mycol |\n+-------+\n1 row in set (0.01 sec)\n\nmysql> SET sql_mode = \'ANSI_QUOTES\';\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> SELECT "mycol" FROM v;\n+-------+\n| mycol |\n+-------+\n| abc   |\n+-------+\n1 row in set (0.00 sec)\n\nThe DEFINER and SQL SECURITY clauses determine which MySQL account to\nuse when checking access privileges for the view when a statement is\nexecuted that references the view. The valid SQL SECURITY\ncharacteristic values are DEFINER (the default) and INVOKER. These\nindicate that the required privileges must be held by the user who\ndefined or invoked the view, respectively.\n\nIf the DEFINER clause is present, the user value should be a MySQL\naccount specified as \'user_name\'@\'host_name\', CURRENT_USER, or\nCURRENT_USER(). The permitted user values depend on the privileges you\nhold, as discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-objects-security.html.\nAlso see that section for additional information about view security.\n\nIf the DEFINER clause is omitted, the default definer is the user who\nexecutes the CREATE VIEW statement. This is the same as specifying\nDEFINER = CURRENT_USER explicitly.\n\nWithin a view definition, the CURRENT_USER function returns the view\'s\nDEFINER value by default. For views defined with the SQL SECURITY\nINVOKER characteristic, CURRENT_USER returns the account for the view\'s\ninvoker. For information about user auditing within views, see\nhttps://dev.mysql.com/doc/refman/8.0/en/account-activity-auditing.html.\n\nWithin a stored routine that is defined with the SQL SECURITY DEFINER\ncharacteristic, CURRENT_USER returns the routine\'s DEFINER value. This\nalso affects a view defined within such a routine, if the view\ndefinition contains a DEFINER value of CURRENT_USER.\n\nMySQL checks view privileges like this:\n\no At view definition time, the view creator must have the privileges\n  needed to use the top-level objects accessed by the view. For\n  example, if the view definition refers to table columns, the creator\n  must have some privilege for each column in the select list of the\n  definition, and the SELECT privilege for each column used elsewhere\n  in the definition. If the definition refers to a stored function,\n  only the privileges needed to invoke the function can be checked. The\n  privileges required at function invocation time can be checked only\n  as it executes: For different invocations, different execution paths\n  within the function might be taken.\n\no The user who references a view must have appropriate privileges to\n  access it (SELECT to select from it, INSERT to insert into it, and so\n  forth.)\n\no When a view has been referenced, privileges for objects accessed by\n  the view are checked against the privileges held by the view DEFINER\n  account or invoker, depending on whether the SQL SECURITY\n  characteristic is DEFINER or INVOKER, respectively.\n\no If reference to a view causes execution of a stored function,\n  privilege checking for statements executed within the function depend\n  on whether the function SQL SECURITY characteristic is DEFINER or\n  INVOKER. If the security characteristic is DEFINER, the function runs\n  with the privileges of the DEFINER account. If the characteristic is\n  INVOKER, the function runs with the privileges determined by the\n  view\'s SQL SECURITY characteristic.\n\nExample: A view might depend on a stored function, and that function\nmight invoke other stored routines. For example, the following view\ninvokes a stored function f():\n\nCREATE VIEW v AS SELECT * FROM t WHERE t.id = f(t.name);\n\nSuppose that f() contains a statement such as this:\n\nIF name IS NULL then\n  CALL p1();\nELSE\n  CALL p2();\nEND IF;\n\nThe privileges required for executing statements within f() need to be\nchecked when f() executes. This might mean that privileges are needed\nfor p1() or p2(), depending on the execution path within f(). Those\nprivileges must be checked at runtime, and the user who must possess\nthe privileges is determined by the SQL SECURITY values of the view v\nand the function f().\n\nThe DEFINER and SQL SECURITY clauses for views are extensions to\nstandard SQL. In standard SQL, views are handled using the rules for\nSQL SECURITY DEFINER. The standard says that the definer of the view,\nwhich is the same as the owner of the view\'s schema, gets applicable\nprivileges on the view (for example, SELECT) and may grant them. MySQL\nhas no concept of a schema "owner", so MySQL adds a clause to identify\nthe definer. The DEFINER clause is an extension where the intent is to\nhave what the standard has; that is, a permanent record of who defined\nthe view. This is why the default DEFINER value is the account of the\nview creator.\n\nThe optional ALGORITHM clause is a MySQL extension to standard SQL. It\naffects how MySQL processes the view. ALGORITHM takes three values:\nMERGE, TEMPTABLE, or UNDEFINED. For more information, see\nhttps://dev.mysql.com/doc/refman/8.0/en/view-algorithms.html, as well\nas\nhttps://dev.mysql.com/doc/refman/8.0/en/derived-table-optimization.html\n.\n\nSome views are updatable. That is, you can use them in statements such\nas UPDATE, DELETE, or INSERT to update the contents of the underlying\ntable. For a view to be updatable, there must be a one-to-one\nrelationship between the rows in the view and the rows in the\nunderlying table. There are also certain other constructs that make a\nview nonupdatable.\n\nA generated column in a view is considered updatable because it is\npossible to assign to it. However, if such a column is updated\nexplicitly, the only permitted value is DEFAULT. For information about\ngenerated columns, see\nhttps://dev.mysql.com/doc/refman/8.0/en/create-table-generated-columns.\nhtml.\n\nThe WITH CHECK OPTION clause can be given for an updatable view to\nprevent inserts or updates to rows except those for which the WHERE\nclause in the select_statement is true.\n\nIn a WITH CHECK OPTION clause for an updatable view, the LOCAL and\nCASCADED keywords determine the scope of check testing when the view is\ndefined in terms of another view. The LOCAL keyword restricts the CHECK\nOPTION only to the view being defined. CASCADED causes the checks for\nunderlying views to be evaluated as well. When neither keyword is\ngiven, the default is CASCADED.\n\nFor more information about updatable views and the WITH CHECK OPTION\nclause, see\nhttps://dev.mysql.com/doc/refman/8.0/en/view-updatability.html, and\nhttps://dev.mysql.com/doc/refman/8.0/en/view-check-option.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/create-view.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/create-view.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (527,40,'DROP DATABASE','Syntax:\nDROP {DATABASE | SCHEMA} [IF EXISTS] db_name\n\nDROP DATABASE drops all tables in the database and deletes the\ndatabase. Be very careful with this statement! To use DROP DATABASE,\nyou need the DROP privilege on the database. DROP SCHEMA is a synonym\nfor DROP DATABASE.\n\n*Important*:\n\nWhen a database is dropped, privileges granted specifically for the\ndatabase are not automatically dropped. They must be dropped manually.\nSee [HELP GRANT].\n\nIF EXISTS is used to prevent an error from occurring if the database\ndoes not exist.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/drop-database.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/drop-database.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (528,40,'DROP SCHEMA','Syntax:\nDROP {DATABASE | SCHEMA} [IF EXISTS] db_name\n\nDROP DATABASE drops all tables in the database and deletes the\ndatabase. Be very careful with this statement! To use DROP DATABASE,\nyou need the DROP privilege on the database. DROP SCHEMA is a synonym\nfor DROP DATABASE.\n\n*Important*:\n\nWhen a database is dropped, privileges granted specifically for the\ndatabase are not automatically dropped. They must be dropped manually.\nSee [HELP GRANT].\n\nIF EXISTS is used to prevent an error from occurring if the database\ndoes not exist.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/drop-database.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/drop-database.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (529,40,'DROP EVENT','Syntax:\nDROP EVENT [IF EXISTS] event_name\n\nThis statement drops the event named event_name. The event immediately\nceases being active, and is deleted completely from the server.\n\nIf the event does not exist, the error ERROR 1517 (HY000): Unknown\nevent \'event_name\' results. You can override this and cause the\nstatement to generate a warning for nonexistent events instead using IF\nEXISTS.\n\nThis statement requires the EVENT privilege for the schema to which the\nevent to be dropped belongs.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/drop-event.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/drop-event.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (530,40,'DROP INDEX','Syntax:\nDROP INDEX index_name ON tbl_name\n    [algorithm_option | lock_option] ...\n\nalgorithm_option:\n    ALGORITHM [=] {DEFAULT | INPLACE | COPY}\n\nlock_option:\n    LOCK [=] {DEFAULT | NONE | SHARED | EXCLUSIVE}\n\nDROP INDEX drops the index named index_name from the table tbl_name.\nThis statement is mapped to an ALTER TABLE statement to drop the index.\nSee [HELP ALTER TABLE].\n\nTo drop a primary key, the index name is always PRIMARY, which must be\nspecified as a quoted identifier because PRIMARY is a reserved word:\n\nDROP INDEX `PRIMARY` ON t;\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/drop-index.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/drop-index.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (531,40,'DROP PROCEDURE','Syntax:\nDROP {PROCEDURE | FUNCTION} [IF EXISTS] sp_name\n\nThese statements are used to drop a stored routine (a stored procedure\nor function). That is, the specified routine is removed from the\nserver. (DROP FUNCTION is also used to drop loadable functions; see\n[HELP DROP FUNCTION loadable function].)\n\nTo drop a stored routine, you must have the ALTER ROUTINE privilege for\nit. (If the automatic_sp_privileges system variable is enabled, that\nprivilege and EXECUTE are granted automatically to the routine creator\nwhen the routine is created and dropped from the creator when the\nroutine is dropped. See\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-routines-privileges.html\n.)\n\nThe IF EXISTS clause is a MySQL extension. It prevents an error from\noccurring if the procedure or function does not exist. A warning is\nproduced that can be viewed with SHOW WARNINGS.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/drop-procedure.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/drop-procedure.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (532,40,'DROP FUNCTION','Syntax:\nDROP {PROCEDURE | FUNCTION} [IF EXISTS] sp_name\n\nThese statements are used to drop a stored routine (a stored procedure\nor function). That is, the specified routine is removed from the\nserver. (DROP FUNCTION is also used to drop loadable functions; see\n[HELP DROP FUNCTION loadable function].)\n\nTo drop a stored routine, you must have the ALTER ROUTINE privilege for\nit. (If the automatic_sp_privileges system variable is enabled, that\nprivilege and EXECUTE are granted automatically to the routine creator\nwhen the routine is created and dropped from the creator when the\nroutine is dropped. See\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-routines-privileges.html\n.)\n\nThe IF EXISTS clause is a MySQL extension. It prevents an error from\noccurring if the procedure or function does not exist. A warning is\nproduced that can be viewed with SHOW WARNINGS.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/drop-procedure.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/drop-procedure.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (533,40,'DROP SERVER','Syntax:\nDROP SERVER [ IF EXISTS ] server_name\n\nDrops the server definition for the server named server_name. The\ncorresponding row in the mysql.servers table is deleted. This statement\nrequires the SUPER privilege.\n\nDropping a server for a table does not affect any FEDERATED tables that\nused this connection information when they were created. See [HELP\nCREATE SERVER].\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/drop-server.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/drop-server.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (534,40,'DROP SPATIAL REFERENCE SYSTEM','Syntax:\nDROP SPATIAL REFERENCE SYSTEM\n    [IF EXISTS]\n    srid\n\nsrid: 32-bit unsigned integer\n\nThis statement removes a spatial reference system (SRS) definition from\nthe data dictionary. It requires the SUPER privilege.\n\nExample:\n\nDROP SPATIAL REFERENCE SYSTEM 4120;\n\nIf no SRS definition with the SRID value exists, an error occurs unless\nIF EXISTS is specified. In that case, a warning occurs rather than an\nerror.\n\nIf the SRID value is used by some column in an existing table, an error\noccurs. For example:\n\nmysql> DROP SPATIAL REFERENCE SYSTEM 4326;\nERROR 3716 (SR005): Can\'t modify SRID 4326. There is at\nleast one column depending on it.\n\nTo identify which column or columns use the SRID, use this query:\n\nSELECT * FROM INFORMATION_SCHEMA.ST_GEOMETRY_COLUMNS WHERE SRS_ID=4326;\n\nSRID values must be in the range of 32-bit unsigned integers, with\nthese restrictions:\n\no SRID 0 is a valid SRID but cannot be used with DROP SPATIAL REFERENCE\n  SYSTEM.\n\no If the value is in a reserved SRID range, a warning occurs. Reserved\n  ranges are [0, 32767] (reserved by EPSG), [60,000,000, 69,999,999]\n  (reserved by EPSG), and [2,000,000,000, 2,147,483,647] (reserved by\n  MySQL). EPSG stands for the European Petroleum Survey Group\n  (http://epsg.org).\n\no Users should not drop SRSs with SRIDs in the reserved ranges. If\n  system-installed SRSs are dropped, the SRS definitions may be\n  recreated for MySQL upgrades.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/drop-spatial-reference-system.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/drop-spatial-reference-system.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (535,40,'DROP TABLE','Syntax:\nDROP [TEMPORARY] TABLE [IF EXISTS]\n    tbl_name [, tbl_name] ...\n    [RESTRICT | CASCADE]\n\nDROP TABLE removes one or more tables. You must have the DROP privilege\nfor each table.\n\nBe careful with this statement! For each table, it removes the table\ndefinition and all table data. If the table is partitioned, the\nstatement removes the table definition, all its partitions, all data\nstored in those partitions, and all partition definitions associated\nwith the dropped table.\n\nDropping a table also drops any triggers for the table.\n\nDROP TABLE causes an implicit commit, except when used with the\nTEMPORARY keyword. See\nhttps://dev.mysql.com/doc/refman/8.0/en/implicit-commit.html.\n\n*Important*:\n\nWhen a table is dropped, privileges granted specifically for the table\nare not automatically dropped. They must be dropped manually. See [HELP\nGRANT].\n\nIf any tables named in the argument list do not exist, DROP TABLE\nbehavior depends on whether the IF EXISTS clause is given:\n\no Without IF EXISTS, the statement fails with an error indicating which\n  nonexisting tables it was unable to drop, and no changes are made.\n\no With IF EXISTS, no error occurs for nonexisting tables. The statement\n  drops all named tables that do exist, and generates a NOTE diagnostic\n  for each nonexistent table. These notes can be displayed with SHOW\n  WARNINGS. See [HELP SHOW WARNINGS].\n\nIF EXISTS can also be useful for dropping tables in unusual\ncircumstances under which there is an entry in the data dictionary but\nno table managed by the storage engine. (For example, if an abnormal\nserver exit occurs after removal of the table from the storage engine\nbut before removal of the data dictionary entry.)\n\nThe TEMPORARY keyword has the following effects:\n\no The statement drops only TEMPORARY tables.\n\no The statement does not cause an implicit commit.\n\no No access rights are checked. A TEMPORARY table is visible only with\n  the session that created it, so no check is necessary.\n\nIncluding the TEMPORARY keyword is a good way to prevent accidentally\ndropping non-TEMPORARY tables.\n\nThe RESTRICT and CASCADE keywords do nothing. They are permitted to\nmake porting easier from other database systems.\n\nDROP TABLE is not supported with all innodb_force_recovery settings.\nSee\nhttps://dev.mysql.com/doc/refman/8.0/en/forcing-innodb-recovery.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/drop-table.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/drop-table.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (536,40,'DROP TABLESPACE','Syntax:\nDROP [UNDO] TABLESPACE tablespace_name\n    [ENGINE [=] engine_name]\n\nThis statement drops a tablespace that was previously created using\nCREATE TABLESPACE. It is supported by the NDB and InnoDB storage\nengines.\n\nThe UNDO keyword, introduced in MySQL 8.0.14, must be specified to drop\nan undo tablespace. Only undo tablespaces created using CREATE UNDO\nTABLESPACE syntax can be dropped. An undo tablespace must be in an\nempty state before it can be dropped. For more information, see\nhttps://dev.mysql.com/doc/refman/8.0/en/innodb-undo-tablespaces.html.\n\nENGINE sets the storage engine that uses the tablespace, where\nengine_name is the name of the storage engine. Currently, the values\nInnoDB and NDB are supported. If not set, the value of\ndefault_storage_engine is used. If it is not the same as the storage\nengine used to create the tablespace, the DROP TABLESPACE statement\nfails.\n\ntablespace_name is a case-sensitive identifier in MySQL.\n\nFor an InnoDB general tablespace, all tables must be dropped from the\ntablespace prior to a DROP TABLESPACE operation. If the tablespace is\nnot empty, DROP TABLESPACE returns an error.\n\nAn NDB tablespace to be dropped must not contain any data files; in\nother words, before you can drop an NDB tablespace, you must first drop\neach of its data files using ALTER TABLESPACE ... DROP DATAFILE.\n\nNotes\n\no A general InnoDB tablespace is not deleted automatically when the\n  last table in the tablespace is dropped. The tablespace must be\n  dropped explicitly using DROP TABLESPACE tablespace_name.\n\no A DROP DATABASE operation can drop tables that belong to a general\n  tablespace but it cannot drop the tablespace, even if the operation\n  drops all tables that belong to the tablespace. The tablespace must\n  be dropped explicitly using DROP TABLESPACE tablespace_name.\n\no Similar to the system tablespace, truncating or dropping tables\n  stored in a general tablespace creates free space internally in the\n  general tablespace .ibd data file which can only be used for new\n  InnoDB data. Space is not released back to the operating system as it\n  is for file-per-table tablespaces.\n\nInnoDB Examples\n\nThis example demonstrates how to drop an InnoDB general tablespace. The\ngeneral tablespace ts1 is created with a single table. Before dropping\nthe tablespace, the table must be dropped.\n\nmysql> CREATE TABLESPACE `ts1` ADD DATAFILE \'ts1.ibd\' Engine=InnoDB;\n\nmysql> CREATE TABLE t1 (c1 INT PRIMARY KEY) TABLESPACE ts1 Engine=InnoDB;\n\nmysql> DROP TABLE t1;\n\nmysql> DROP TABLESPACE ts1;\n\nThis example demonstrates dropping an undo tablespace. An undo\ntablespace must be in an empty state before it can be dropped. For more\ninformation, see\nhttps://dev.mysql.com/doc/refman/8.0/en/innodb-undo-tablespaces.html.\n\nmysql> DROP UNDO TABLESPACE undo_003;\n\nNDB Example\n\nThis example shows how to drop an NDB tablespace myts having a data\nfile named mydata-1.dat after first creating the tablespace, and\nassumes the existence of a log file group named mylg (see [HELP CREATE\nLOGFILE GROUP]).\n\nmysql> CREATE TABLESPACE myts\n    ->     ADD DATAFILE \'mydata-1.dat\'\n    ->     USE LOGFILE GROUP mylg\n    ->     ENGINE=NDB;\n\nYou must remove all data files from the tablespace using ALTER\nTABLESPACE, as shown here, before it can be dropped:\n\nmysql> ALTER TABLESPACE myts\n    ->     DROP DATAFILE \'mydata-1.dat\'\n    ->     ENGINE=NDB;\n\nmysql> DROP TABLESPACE myts;\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/drop-tablespace.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/drop-tablespace.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (537,40,'DROP TRIGGER','Syntax:\nDROP TRIGGER [IF EXISTS] [schema_name.]trigger_name\n\nThis statement drops a trigger. The schema (database) name is optional.\nIf the schema is omitted, the trigger is dropped from the default\nschema. DROP TRIGGER requires the TRIGGER privilege for the table\nassociated with the trigger.\n\nUse IF EXISTS to prevent an error from occurring for a trigger that\ndoes not exist. A NOTE is generated for a nonexistent trigger when\nusing IF EXISTS. See [HELP SHOW WARNINGS].\n\nTriggers for a table are also dropped if you drop the table.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/drop-trigger.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/drop-trigger.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (538,40,'DROP VIEW','Syntax:\nDROP VIEW [IF EXISTS]\n    view_name [, view_name] ...\n    [RESTRICT | CASCADE]\n\nDROP VIEW removes one or more views. You must have the DROP privilege\nfor each view.\n\nIf any views named in the argument list do not exist, the statement\nfails with an error indicating by name which nonexisting views it was\nunable to drop, and no changes are made.\n\n*Note*:\n\nIn MySQL 5.7 and earlier, DROP VIEW returns an error if any views named\nin the argument list do not exist, but also drops all views in the list\nthat do exist. Due to the change in behavior in MySQL 8.0, a partially\ncompleted DROP VIEW operation on a MySQL 5.7 replication source server\nfails when replicated on a MySQL 8.0 replica. To avoid this failure\nscenario, use IF EXISTS syntax in DROP VIEW statements to prevent an\nerror from occurring for views that do not exist. For more information,\nsee https://dev.mysql.com/doc/refman/8.0/en/atomic-ddl.html.\n\nThe IF EXISTS clause prevents an error from occurring for views that\ndon\'t exist. When this clause is given, a NOTE is generated for each\nnonexistent view. See [HELP SHOW WARNINGS].\n\nRESTRICT and CASCADE, if given, are parsed and ignored.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/drop-view.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/drop-view.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (539,40,'RENAME TABLE','Syntax:\nRENAME TABLE\n    tbl_name TO new_tbl_name\n    [, tbl_name2 TO new_tbl_name2] ...\n\nRENAME TABLE renames one or more tables. You must have ALTER and DROP\nprivileges for the original table, and CREATE and INSERT privileges for\nthe new table.\n\nFor example, to rename a table named old_table to new_table, use this\nstatement:\n\nRENAME TABLE old_table TO new_table;\n\nThat statement is equivalent to the following ALTER TABLE statement:\n\nALTER TABLE old_table RENAME new_table;\n\nRENAME TABLE, unlike ALTER TABLE, can rename multiple tables within a\nsingle statement:\n\nRENAME TABLE old_table1 TO new_table1,\n             old_table2 TO new_table2,\n             old_table3 TO new_table3;\n\nRenaming operations are performed left to right. Thus, to swap two\ntable names, do this (assuming that a table with the intermediary name\ntmp_table does not already exist):\n\nRENAME TABLE old_table TO tmp_table,\n             new_table TO old_table,\n             tmp_table TO new_table;\n\nMetadata locks on tables are acquired in name order, which in some\ncases can make a difference in operation outcome when multiple\ntransactions execute concurrently. See\nhttps://dev.mysql.com/doc/refman/8.0/en/metadata-locking.html.\n\nAs of MySQL 8.0.13, you can rename tables locked with a LOCK TABLES\nstatement, provided that they are locked with a WRITE lock or are the\nproduct of renaming WRITE-locked tables from earlier steps in a\nmultiple-table rename operation. For example, this is permitted:\n\nLOCK TABLE old_table1 WRITE;\nRENAME TABLE old_table1 TO new_table1,\n             new_table1 TO new_table2;\n\nThis is not permitted:\n\nLOCK TABLE old_table1 READ;\nRENAME TABLE old_table1 TO new_table1,\n             new_table1 TO new_table2;\n\nPrior to MySQL 8.0.13, to execute RENAME TABLE, there must be no tables\nlocked with LOCK TABLES.\n\nWith the transaction table locking conditions satisfied, the rename\noperation is done atomically; no other session can access any of the\ntables while the rename is in progress.\n\nIf any errors occur during a RENAME TABLE, the statement fails and no\nchanges are made.\n\nYou can use RENAME TABLE to move a table from one database to another:\n\nRENAME TABLE current_db.tbl_name TO other_db.tbl_name;\n\nUsing this method to move all tables from one database to a different\none in effect renames the database (an operation for which MySQL has no\nsingle statement), except that the original database continues to\nexist, albeit with no tables.\n\nLike RENAME TABLE, ALTER TABLE ... RENAME can also be used to move a\ntable to a different database. Regardless of the statement used, if the\nrename operation would move the table to a database located on a\ndifferent file system, the success of the outcome is platform specific\nand depends on the underlying operating system calls used to move table\nfiles.\n\nIf a table has triggers, attempts to rename the table into a different\ndatabase fail with a Trigger in wrong schema (ER_TRG_IN_WRONG_SCHEMA\n(https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference.h\ntml#error_er_trg_in_wrong_schema)) error.\n\nAn unencrypted table can be moved to an encryption-enabled database and\nvice versa. However, if the table_encryption_privilege_check variable\nis enabled, the TABLE_ENCRYPTION_ADMIN privilege is required if the\ntable encryption setting differs from the default database encryption.\n\nTo rename TEMPORARY tables, RENAME TABLE does not work. Use ALTER TABLE\ninstead.\n\nRENAME TABLE works for views, except that views cannot be renamed into\na different database.\n\nAny privileges granted specifically for a renamed table or view are not\nmigrated to the new name. They must be changed manually.\n\nRENAME TABLE tbl_name TO new_tbl_name changes internally generated\nforeign key constraint names and user-defined foreign key constraint\nnames that begin with the string "tbl_name_ibfk_" to reflect the new\ntable name. InnoDB interprets foreign key constraint names that begin\nwith the string "tbl_name_ibfk_" as internally generated names.\n\nForeign key constraint names that point to the renamed table are\nautomatically updated unless there is a conflict, in which case the\nstatement fails with an error. A conflict occurs if the renamed\nconstraint name already exists. In such cases, you must drop and\nre-create the foreign keys for them to function properly.\n\nRENAME TABLE tbl_name TO new_tbl_name changes internally generated and\nuser-defined CHECK constraint names that begin with the string\n"tbl_name_chk_" to reflect the new table name. MySQL interprets CHECK\nconstraint names that begin with the string "tbl_name_chk_" as\ninternally generated names. Example:\n\nmysql> SHOW CREATE TABLE t1\\G\n*************************** 1. row ***************************\n       Table: t1\nCreate Table: CREATE TABLE `t1` (\n  `i1` int(11) DEFAULT NULL,\n  `i2` int(11) DEFAULT NULL,\n  CONSTRAINT `t1_chk_1` CHECK ((`i1` > 0)),\n  CONSTRAINT `t1_chk_2` CHECK ((`i2` < 0))\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci\n1 row in set (0.02 sec)\n\nmysql> RENAME TABLE t1 TO t3;\nQuery OK, 0 rows affected (0.03 sec)\n\nmysql> SHOW CREATE TABLE t3\\G\n*************************** 1. row ***************************\n       Table: t3\nCreate Table: CREATE TABLE `t3` (\n  `i1` int(11) DEFAULT NULL,\n  `i2` int(11) DEFAULT NULL,\n  CONSTRAINT `t3_chk_1` CHECK ((`i1` > 0)),\n  CONSTRAINT `t3_chk_2` CHECK ((`i2` < 0))\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci\n1 row in set (0.01 sec)\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/rename-table.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/rename-table.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (540,40,'TRUNCATE TABLE','Syntax:\nTRUNCATE [TABLE] tbl_name\n\nTRUNCATE TABLE empties a table completely. It requires the DROP\nprivilege. Logically, TRUNCATE TABLE is similar to a DELETE statement\nthat deletes all rows, or a sequence of DROP TABLE and CREATE TABLE\nstatements.\n\nTo achieve high performance, TRUNCATE TABLE bypasses the DML method of\ndeleting data. Thus, it does not cause ON DELETE triggers to fire, it\ncannot be performed for InnoDB tables with parent-child foreign key\nrelationships, and it cannot be rolled back like a DML operation.\nHowever, TRUNCATE TABLE operations on tables that use an atomic\nDDL-supported storage engine are either fully committed or rolled back\nif the server halts during their operation. For more information, see\nhttps://dev.mysql.com/doc/refman/8.0/en/atomic-ddl.html.\n\nAlthough TRUNCATE TABLE is similar to DELETE, it is classified as a DDL\nstatement rather than a DML statement. It differs from DELETE in the\nfollowing ways:\n\no Truncate operations drop and re-create the table, which is much\n  faster than deleting rows one by one, particularly for large tables.\n\no Truncate operations cause an implicit commit, and so cannot be rolled\n  back. See\n  https://dev.mysql.com/doc/refman/8.0/en/implicit-commit.html.\n\no Truncation operations cannot be performed if the session holds an\n  active table lock.\n\no TRUNCATE TABLE fails for an InnoDB table or NDB table if there are\n  any FOREIGN KEY constraints from other tables that reference the\n  table. Foreign key constraints between columns of the same table are\n  permitted.\n\no Truncation operations do not return a meaningful value for the number\n  of deleted rows. The usual result is "0 rows affected," which should\n  be interpreted as "no information."\n\no As long as the table definition is valid, the table can be re-created\n  as an empty table with TRUNCATE TABLE, even if the data or index\n  files have become corrupted.\n\no Any AUTO_INCREMENT value is reset to its start value. This is true\n  even for MyISAM and InnoDB, which normally do not reuse sequence\n  values.\n\no When used with partitioned tables, TRUNCATE TABLE preserves the\n  partitioning; that is, the data and index files are dropped and\n  re-created, while the partition definitions are unaffected.\n\no The TRUNCATE TABLE statement does not invoke ON DELETE triggers.\n\no Truncating a corrupted InnoDB table is supported.\n\nTRUNCATE TABLE is treated for purposes of binary logging and\nreplication as DDL rather than DML, and is always logged as a\nstatement.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/truncate-table.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/truncate-table.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (541,41,'CALL','Syntax:\nCALL sp_name([parameter[,...]])\nCALL sp_name[()]\n\nThe CALL statement invokes a stored procedure that was defined\npreviously with CREATE PROCEDURE.\n\nStored procedures that take no arguments can be invoked without\nparentheses. That is, CALL p() and CALL p are equivalent.\n\nCALL can pass back values to its caller using parameters that are\ndeclared as OUT or INOUT parameters. When the procedure returns, a\nclient program can also obtain the number of rows affected for the\nfinal statement executed within the routine: At the SQL level, call the\nROW_COUNT() function; from the C API, call the mysql_affected_rows()\n(https://dev.mysql.com/doc/c-api/8.0/en/mysql-affected-rows.html)\nfunction.\n\nFor information about the effect of unhandled conditions on procedure\nparameters, see\nhttps://dev.mysql.com/doc/refman/8.0/en/conditions-and-parameters.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/call.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/call.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (542,41,'DELETE','Syntax:\nDELETE is a DML statement that removes rows from a table.\n\nA DELETE statement can start with a WITH clause to define common table\nexpressions accessible within the DELETE. See\nhttps://dev.mysql.com/doc/refman/8.0/en/with.html.\n\nSingle-Table Syntax\n\nDELETE [LOW_PRIORITY] [QUICK] [IGNORE] FROM tbl_name [[AS] tbl_alias]\n    [PARTITION (partition_name [, partition_name] ...)]\n    [WHERE where_condition]\n    [ORDER BY ...]\n    [LIMIT row_count]\n\nThe DELETE statement deletes rows from tbl_name and returns the number\nof deleted rows. To check the number of deleted rows, call the\nROW_COUNT() function described in\nhttps://dev.mysql.com/doc/refman/8.0/en/information-functions.html.\n\nMain Clauses\n\nThe conditions in the optional WHERE clause identify which rows to\ndelete. With no WHERE clause, all rows are deleted.\n\nwhere_condition is an expression that evaluates to true for each row to\nbe deleted. It is specified as described in\nhttps://dev.mysql.com/doc/refman/8.0/en/select.html.\n\nIf the ORDER BY clause is specified, the rows are deleted in the order\nthat is specified. The LIMIT clause places a limit on the number of\nrows that can be deleted. These clauses apply to single-table deletes,\nbut not multi-table deletes.\n\nMultiple-Table Syntax\n\nDELETE [LOW_PRIORITY] [QUICK] [IGNORE]\n    tbl_name[.*] [, tbl_name[.*]] ...\n    FROM table_references\n    [WHERE where_condition]\n\nDELETE [LOW_PRIORITY] [QUICK] [IGNORE]\n    FROM tbl_name[.*] [, tbl_name[.*]] ...\n    USING table_references\n    [WHERE where_condition]\n\nPrivileges\n\nYou need the DELETE privilege on a table to delete rows from it. You\nneed only the SELECT privilege for any columns that are only read, such\nas those named in the WHERE clause.\n\nPerformance\n\nWhen you do not need to know the number of deleted rows, the TRUNCATE\nTABLE statement is a faster way to empty a table than a DELETE\nstatement with no WHERE clause. Unlike DELETE, TRUNCATE TABLE cannot be\nused within a transaction or if you have a lock on the table. See [HELP\nTRUNCATE TABLE] and [HELP LOCK TABLES].\n\nThe speed of delete operations may also be affected by factors\ndiscussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/delete-optimization.html.\n\nTo ensure that a given DELETE statement does not take too much time,\nthe MySQL-specific LIMIT row_count clause for DELETE specifies the\nmaximum number of rows to be deleted. If the number of rows to delete\nis larger than the limit, repeat the DELETE statement until the number\nof affected rows is less than the LIMIT value.\n\nSubqueries\n\nYou cannot delete from a table and select from the same table in a\nsubquery.\n\nPartitioned Table Support\n\nDELETE supports explicit partition selection using the PARTITION\nclause, which takes a list of the comma-separated names of one or more\npartitions or subpartitions (or both) from which to select rows to be\ndropped. Partitions not included in the list are ignored. Given a\npartitioned table t with a partition named p0, executing the statement\nDELETE FROM t PARTITION (p0) has the same effect on the table as\nexecuting ALTER TABLE t TRUNCATE PARTITION (p0); in both cases, all\nrows in partition p0 are dropped.\n\nPARTITION can be used along with a WHERE condition, in which case the\ncondition is tested only on rows in the listed partitions. For example,\nDELETE FROM t PARTITION (p0) WHERE c < 5 deletes rows only from\npartition p0 for which the condition c < 5 is true; rows in any other\npartitions are not checked and thus not affected by the DELETE.\n\nThe PARTITION clause can also be used in multiple-table DELETE\nstatements. You can use up to one such option per table named in the\nFROM option.\n\nFor more information and examples, see\nhttps://dev.mysql.com/doc/refman/8.0/en/partitioning-selection.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/delete.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/delete.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (543,41,'DO','Syntax:\nDO expr [, expr] ...\n\nDO executes the expressions but does not return any results. In most\nrespects, DO is shorthand for SELECT expr, ..., but has the advantage\nthat it is slightly faster when you do not care about the result.\n\nDO is useful primarily with functions that have side effects, such as\nRELEASE_LOCK().\n\nExample: This SELECT statement pauses, but also produces a result set:\n\nmysql> SELECT SLEEP(5);\n+----------+\n| SLEEP(5) |\n+----------+\n|        0 |\n+----------+\n1 row in set (5.02 sec)\n\nDO, on the other hand, pauses without producing a result set.:\n\nmysql> DO SLEEP(5);\nQuery OK, 0 rows affected (4.99 sec)\n\nThis could be useful, for example in a stored function or trigger,\nwhich prohibit statements that produce result sets.\n\nDO only executes expressions. It cannot be used in all cases where\nSELECT can be used. For example, DO id FROM t1 is invalid because it\nreferences a table.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/do.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/do.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (544,41,'HANDLER','Syntax:\nHANDLER tbl_name OPEN [ [AS] alias]\n\nHANDLER tbl_name READ index_name { = | <= | >= | < | > } (value1,value2,...)\n    [ WHERE where_condition ] [LIMIT ... ]\nHANDLER tbl_name READ index_name { FIRST | NEXT | PREV | LAST }\n    [ WHERE where_condition ] [LIMIT ... ]\nHANDLER tbl_name READ { FIRST | NEXT }\n    [ WHERE where_condition ] [LIMIT ... ]\n\nHANDLER tbl_name CLOSE\n\nThe HANDLER statement provides direct access to table storage engine\ninterfaces. It is available for InnoDB and MyISAM tables.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/handler.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/handler.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (545,41,'IMPORT TABLE','Syntax:\nIMPORT TABLE FROM sdi_file [, sdi_file] ...\n\nThe IMPORT TABLE statement imports MyISAM tables based on information\ncontained in .sdi (serialized dictionary information) metadata files.\nIMPORT TABLE requires the FILE privilege to read the .sdi and table\ncontent files, and the CREATE privilege for the table to be created.\n\nTables can be exported from one server using mysqldump to write a file\nof SQL statements and imported into another server using mysql to\nprocess the dump file. IMPORT TABLE provides a faster alternative using\nthe "raw" table files.\n\nPrior to import, the files that provide the table content must be\nplaced in the appropriate schema directory for the import server, and\nthe .sdi file must be located in a directory accessible to the server.\nFor example, the .sdi file can be placed in the directory named by the\nsecure_file_priv system variable, or (if secure_file_priv is empty) in\na directory under the server data directory.\n\nThe following example describes how to export MyISAM tables named\nemployees and managers from the hr schema of one server and import them\ninto the hr schema of another server. The example uses these\nassumptions (to perform a similar operation on your own system, modify\nthe path names as appropriate):\n\no For the export server, export_basedir represents its base directory,\n  and its data directory is export_basedir/data.\n\no For the import server, import_basedir represents its base directory,\n  and its data directory is import_basedir/data.\n\no Table files are exported from the export server into the /tmp/export\n  directory and this directory is secure (not accessible to other\n  users).\n\no The import server uses /tmp/mysql-files as the directory named by its\n  secure_file_priv system variable.\n\nTo export tables from the export server, use this procedure:\n\n1. Ensure a consistent snapshot by executing this statement to lock the\n   tables so that they cannot be modified during export:\n\nmysql> FLUSH TABLES hr.employees, hr.managers WITH READ LOCK;\n\n   While the lock is in effect, the tables can still be used, but only\n   for read access.\n\n2. At the file system level, copy the .sdi and table content files from\n   the hr schema directory to the secure export directory:\n\n  o The .sdi file is located in the hr schema directory, but might not\n    have exactly the same basename as the table name. For example, the\n    .sdi files for the employees and managers tables might be named\n    employees_125.sdi and managers_238.sdi.\n\n  o For a MyISAM table, the content files are its .MYD data file and\n    .MYI index file.\n\n   Given those file names, the copy commands look like this:\n\nshell> cd export_basedir/data/hr\nshell> cp employees_125.sdi /tmp/export\nshell> cp managers_238.sdi /tmp/export\nshell> cp employees.{MYD,MYI} /tmp/export\nshell> cp managers.{MYD,MYI} /tmp/export\n\n3. Unlock the tables:\n\nmysql> UNLOCK TABLES;\n\nTo import tables into the import server, use this procedure:\n\n1. The import schema must exist. If necessary, execute this statement\n   to create it:\n\nmysql> CREATE SCHEMA hr;\n\n2. At the file system level, copy the .sdi files to the import server\n   secure_file_priv directory, /tmp/mysql-files. Also, copy the table\n   content files to the hr schema directory:\n\nshell> cd /tmp/export\nshell> cp employees_125.sdi /tmp/mysql-files\nshell> cp managers_238.sdi /tmp/mysql-files\nshell> cp employees.{MYD,MYI} import_basedir/data/hr\nshell> cp managers.{MYD,MYI} import_basedir/data/hr\n\n3. Import the tables by executing an IMPORT TABLE statement that names\n   the .sdi files:\n\nmysql> IMPORT TABLE FROM\n       \'/tmp/mysql-files/employees.sdi\',\n       \'/tmp/mysql-files/managers.sdi\';\n\nThe .sdi file need not be placed in the import server directory named\nby the secure_file_priv system variable if that variable is empty; it\ncan be in any directory accessible to the server, including the schema\ndirectory for the imported table. If the .sdi file is placed in that\ndirectory, however, it may be rewritten; the import operation creates a\nnew .sdi file for the table, which overwrites the old .sdi file if the\noperation uses the same file name for the new file.\n\nEach sdi_file value must be a string literal that names the .sdi file\nfor a table or is a pattern that matches .sdi files. If the string is a\npattern, any leading directory path and the .sdi file name suffix must\nbe given literally. Pattern characters are permitted only in the base\nname part of the file name:\n\no ? matches any single character\n\no * matches any sequence of characters, including no characters\n\nUsing a pattern, the previous IMPORT TABLE statement could have been\nwritten like this (assuming that the /tmp/mysql-files directory\ncontains no other .sdi files matching the pattern):\n\nIMPORT TABLE FROM \'/tmp/mysql-files/*.sdi\';\n\nTo interpret the location of .sdi file path names, the server uses the\nsame rules for IMPORT TABLE as the server-side rules for LOAD DATA\n(that is, the non-LOCAL rules). See [HELP LOAD DATA], paying particular\nattention to the rules used to interpret relative path names.\n\nIMPORT TABLE fails if the .sdi or table files cannot be located. After\nimporting a table, the server attempts to open it and reports as\nwarnings any problems detected. To attempt a repair to correct any\nreported issues, use REPAIR TABLE.\n\nIMPORT TABLE is not written to the binary log.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/import-table.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/import-table.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (546,41,'INSERT','Syntax:\nINSERT [LOW_PRIORITY | DELAYED | HIGH_PRIORITY] [IGNORE]\n    [INTO] tbl_name\n    [PARTITION (partition_name [, partition_name] ...)]\n    [(col_name [, col_name] ...)]\n    { {VALUES | VALUE} (value_list) [, (value_list)] ...\n      |\n      VALUES row_constructor_list\n    }\n    [AS row_alias[(col_alias [, col_alias] ...)]]\n    [ON DUPLICATE KEY UPDATE assignment_list]\n\nINSERT [LOW_PRIORITY | DELAYED | HIGH_PRIORITY] [IGNORE]\n    [INTO] tbl_name\n    [PARTITION (partition_name [, partition_name] ...)]\n    [AS row_alias[(col_alias [, col_alias] ...)]]\n    SET assignment_list\n    [ON DUPLICATE KEY UPDATE assignment_list]\n\nINSERT [LOW_PRIORITY | HIGH_PRIORITY] [IGNORE]\n    [INTO] tbl_name\n    [PARTITION (partition_name [, partition_name] ...)]\n    [(col_name [, col_name] ...)]\n    [AS row_alias[(col_alias [, col_alias] ...)]]\n    {SELECT ... | TABLE table_name}\n    [ON DUPLICATE KEY UPDATE assignment_list]\n\nvalue:\n    {expr | DEFAULT}\n\nvalue_list:\n    value [, value] ...\n\nrow_constructor_list:\n    ROW(value_list)[, ROW(value_list)][, ...]\n\nassignment:\n    col_name = [row_alias.]value\n\nassignment_list:\n    assignment [, assignment] ...\n\nINSERT inserts new rows into an existing table. The INSERT ... VALUES,\nINSERT ... VALUES ROW(), and INSERT ... SET forms of the statement\ninsert rows based on explicitly specified values. The INSERT ... SELECT\nform inserts rows selected from another table or tables. You can also\nuse INSERT ... TABLE in MySQL 8.0.19 and later to insert rows from a\nsingle table. INSERT with an ON DUPLICATE KEY UPDATE clause enables\nexisting rows to be updated if a row to be inserted would cause a\nduplicate value in a UNIQUE index or PRIMARY KEY. In MySQL 8.0.19 and\nlater, a row alias with one or more optional column alises can be used\nwith ON DUPLICATE KEY UPDATE to refer to the row to be inserted.\n\nFor additional information about INSERT ... SELECT and INSERT ... ON\nDUPLICATE KEY UPDATE, see [HELP INSERT SELECT], and\nhttps://dev.mysql.com/doc/refman/8.0/en/insert-on-duplicate.html.\n\nIn MySQL 8.0, the DELAYED keyword is accepted but ignored by the\nserver. For the reasons for this, see [HELP INSERT DELAYED],\n\nInserting into a table requires the INSERT privilege for the table. If\nthe ON DUPLICATE KEY UPDATE clause is used and a duplicate key causes\nan UPDATE to be performed instead, the statement requires the UPDATE\nprivilege for the columns to be updated. For columns that are read but\nnot modified you need only the SELECT privilege (such as for a column\nreferenced only on the right hand side of an col_name=expr assignment\nin an ON DUPLICATE KEY UPDATE clause).\n\nWhen inserting into a partitioned table, you can control which\npartitions and subpartitions accept new rows. The PARTITION clause\ntakes a list of the comma-separated names of one or more partitions or\nsubpartitions (or both) of the table. If any of the rows to be inserted\nby a given INSERT statement do not match one of the partitions listed,\nthe INSERT statement fails with the error Found a row not matching the\ngiven partition set. For more information and examples, see\nhttps://dev.mysql.com/doc/refman/8.0/en/partitioning-selection.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/insert.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/insert.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (547,41,'INSERT SELECT','Syntax:\nINSERT [LOW_PRIORITY | HIGH_PRIORITY] [IGNORE]\n    [INTO] tbl_name\n    [PARTITION (partition_name [, partition_name] ...)]\n    [(col_name [, col_name] ...)]\n    {SELECT ... | TABLE table_name}\n    [ON DUPLICATE KEY UPDATE assignment_list]\n\nvalue:\n    {expr | DEFAULT}\n\nassignment:\n    col_name = value\n\nassignment_list:\n    assignment [, assignment] ...\n\nWith INSERT ... SELECT, you can quickly insert many rows into a table\nfrom the result of a SELECT statement, which can select from one or\nmany tables. For example:\n\nINSERT INTO tbl_temp2 (fld_id)\n  SELECT tbl_temp1.fld_order_id\n  FROM tbl_temp1 WHERE tbl_temp1.fld_order_id > 100;\n\nBeginning with MySQL 8.0.19, you can use a TABLE statement in place of\nSELECT, as shown here:\n\nINSERT INTO ta TABLE tb;\n\nTABLE tb is equivalent to SELECT * FROM tb. It can be useful when\ninserting all columns from the source table into the target table, and\nno filtering with WHERE is required. In addition, the rows from TABLE\ncan be ordered by one or more columns using ORDER BY, and the number of\nrows inserted can be limited using a LIMIT clause. For more\ninformation, see [HELP TABLE].\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/insert-select.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/insert-select.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (548,41,'INSERT DELAYED','Syntax:\nINSERT DELAYED ...\n\nThe DELAYED option for the INSERT statement is a MySQL extension to\nstandard SQL. In previous versions of MySQL, it can be used for certain\nkinds of tables (such as MyISAM), such that when a client uses INSERT\nDELAYED, it gets an okay from the server at once, and the row is queued\nto be inserted when the table is not in use by any other thread.\n\nDELAYED inserts and replaces were deprecated in MySQL 5.6. In MySQL\n8.0, DELAYED is not supported. The server recognizes but ignores the\nDELAYED keyword, handles the insert as a nondelayed insert, and\ngenerates an ER_WARN_LEGACY_SYNTAX_CONVERTED warning: INSERT DELAYED is\nno longer supported. The statement was converted to INSERT. The DELAYED\nkeyword is scheduled for removal in a future release.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/insert-delayed.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/insert-delayed.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (549,41,'LOAD DATA','Syntax:\nLOAD DATA\n    [LOW_PRIORITY | CONCURRENT] [LOCAL]\n    INFILE \'file_name\'\n    [REPLACE | IGNORE]\n    INTO TABLE tbl_name\n    [PARTITION (partition_name [, partition_name] ...)]\n    [CHARACTER SET charset_name]\n    [{FIELDS | COLUMNS}\n        [TERMINATED BY \'string\']\n        [[OPTIONALLY] ENCLOSED BY \'char\']\n        [ESCAPED BY \'char\']\n    ]\n    [LINES\n        [STARTING BY \'string\']\n        [TERMINATED BY \'string\']\n    ]\n    [IGNORE number {LINES | ROWS}]\n    [(col_name_or_user_var\n        [, col_name_or_user_var] ...)]\n    [SET col_name={expr | DEFAULT}\n        [, col_name={expr | DEFAULT}] ...]\n\nThe LOAD DATA statement reads rows from a text file into a table at a\nvery high speed. The file can be read from the server host or the\nclient host, depending on whether the LOCAL modifier is given. LOCAL\nalso affects data interpretation and error handling.\n\nLOAD DATA is the complement of SELECT ... INTO OUTFILE. (See\nhttps://dev.mysql.com/doc/refman/8.0/en/select-into.html.) To write\ndata from a table to a file, use SELECT ... INTO OUTFILE. To read the\nfile back into a table, use LOAD DATA. The syntax of the FIELDS and\nLINES clauses is the same for both statements.\n\nThe mysqlimport utility provides another way to load data files; it\noperates by sending a LOAD DATA statement to the server. See\nhttps://dev.mysql.com/doc/refman/8.0/en/mysqlimport.html.\n\nFor information about the efficiency of INSERT versus LOAD DATA and\nspeeding up LOAD DATA, see\nhttps://dev.mysql.com/doc/refman/8.0/en/insert-optimization.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/load-data.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/load-data.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (550,41,'LOAD XML','Syntax:\nLOAD XML\n    [LOW_PRIORITY | CONCURRENT] [LOCAL]\n    INFILE \'file_name\'\n    [REPLACE | IGNORE]\n    INTO TABLE [db_name.]tbl_name\n    [CHARACTER SET charset_name]\n    [ROWS IDENTIFIED BY \'<tagname>\']\n    [IGNORE number {LINES | ROWS}]\n    [(field_name_or_user_var\n        [, field_name_or_user_var] ...)]\n    [SET col_name={expr | DEFAULT}\n        [, col_name={expr | DEFAULT}] ...]\n\nThe LOAD XML statement reads data from an XML file into a table. The\nfile_name must be given as a literal string. The tagname in the\noptional ROWS IDENTIFIED BY clause must also be given as a literal\nstring, and must be surrounded by angle brackets (< and >).\n\nLOAD XML acts as the complement of running the mysql client in XML\noutput mode (that is, starting the client with the --xml option). To\nwrite data from a table to an XML file, you can invoke the mysql client\nwith the --xml and -e options from the system shell, as shown here:\n\nshell> mysql --xml -e \'SELECT * FROM mydb.mytable\' > file.xml\n\nTo read the file back into a table, use LOAD XML. By default, the <row>\nelement is considered to be the equivalent of a database table row;\nthis can be changed using the ROWS IDENTIFIED BY clause.\n\nThis statement supports three different XML formats:\n\no Column names as attributes and column values as attribute values:\n\n<row column1="value1" column2="value2" .../>\n\no Column names as tags and column values as the content of these tags:\n\n<row>\n  <column1>value1</column1>\n  <column2>value2</column2>\n</row>\n\no Column names are the name attributes of <field> tags, and values are\n  the contents of these tags:\n\n<row>\n  <field name=\'column1\'>value1</field>\n  <field name=\'column2\'>value2</field>\n</row>\n\n  This is the format used by other MySQL tools, such as mysqldump.\n\nAll three formats can be used in the same XML file; the import routine\nautomatically detects the format for each row and interprets it\ncorrectly. Tags are matched based on the tag or attribute name and the\ncolumn name.\n\nPrior to MySQL 8.0.21, LOAD XML did not support CDATA sections in the\nsource XML. (Bug #30753708, Bug #98199)\n\nThe following clauses work essentially the same way for LOAD XML as\nthey do for LOAD DATA:\n\no LOW_PRIORITY or CONCURRENT\n\no LOCAL\n\no REPLACE or IGNORE\n\no CHARACTER SET\n\no SET\n\nSee [HELP LOAD DATA], for more information about these clauses.\n\n(field_name_or_user_var, ...) is a list of one or more comma-separated\nXML fields or user variables. The name of a user variable used for this\npurpose must match the name of a field from the XML file, prefixed with\n@. You can use field names to select only desired fields. User\nvariables can be employed to store the corresponding field values for\nsubsequent re-use.\n\nThe IGNORE number LINES or IGNORE number ROWS clause causes the first\nnumber rows in the XML file to be skipped. It is analogous to the LOAD\nDATA statement\'s IGNORE ... LINES clause.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/load-xml.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/load-xml.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (551,41,'REPLACE','Syntax:\nREPLACE [LOW_PRIORITY | DELAYED]\n    [INTO] tbl_name\n    [PARTITION (partition_name [, partition_name] ...)]\n    [(col_name [, col_name] ...)]\n    { {VALUES | VALUE} (value_list) [, (value_list)] ...\n      |\n      VALUES row_constructor_list\n    }\n\nREPLACE [LOW_PRIORITY | DELAYED]\n    [INTO] tbl_name\n    [PARTITION (partition_name [, partition_name] ...)]\n    SET assignment_list\n\nREPLACE [LOW_PRIORITY | DELAYED]\n    [INTO] tbl_name\n    [PARTITION (partition_name [, partition_name] ...)]\n    [(col_name [, col_name] ...)]\n    {SELECT ... | TABLE table_name}\n\nvalue:\n    {expr | DEFAULT}\n\nvalue_list:\n    value [, value] ...\n\nrow_constructor_list:\n    ROW(value_list)[, ROW(value_list)][, ...]\n\nassignment:\n    col_name = value\n\nassignment_list:\n    assignment [, assignment] ...\n\nREPLACE works exactly like INSERT, except that if an old row in the\ntable has the same value as a new row for a PRIMARY KEY or a UNIQUE\nindex, the old row is deleted before the new row is inserted. See [HELP\nINSERT].\n\nREPLACE is a MySQL extension to the SQL standard. It either inserts, or\ndeletes and inserts. For another MySQL extension to standard SQL---that\neither inserts or updates---see\nhttps://dev.mysql.com/doc/refman/8.0/en/insert-on-duplicate.html.\n\nDELAYED inserts and replaces were deprecated in MySQL 5.6. In MySQL\n8.0, DELAYED is not supported. The server recognizes but ignores the\nDELAYED keyword, handles the replace as a nondelayed replace, and\ngenerates an ER_WARN_LEGACY_SYNTAX_CONVERTED warning: REPLACE DELAYED\nis no longer supported. The statement was converted to REPLACE. The\nDELAYED keyword is scheduled for removal in a future release. release.\n\n*Note*:\n\nREPLACE makes sense only if a table has a PRIMARY KEY or UNIQUE index.\nOtherwise, it becomes equivalent to INSERT, because there is no index\nto be used to determine whether a new row duplicates another.\n\nValues for all columns are taken from the values specified in the\nREPLACE statement. Any missing columns are set to their default values,\njust as happens for INSERT. You cannot refer to values from the current\nrow and use them in the new row. If you use an assignment such as SET\ncol_name = col_name + 1, the reference to the column name on the right\nhand side is treated as DEFAULT(col_name), so the assignment is\nequivalent to SET col_name = DEFAULT(col_name) + 1.\n\nIn MySQL 8.0.19 and later, you can specify the column values that\nREPLACE attempts to insert using VALUES ROW().\n\nTo use REPLACE, you must have both the INSERT and DELETE privileges for\nthe table.\n\nIf a generated column is replaced explicitly, the only permitted value\nis DEFAULT. For information about generated columns, see\nhttps://dev.mysql.com/doc/refman/8.0/en/create-table-generated-columns.\nhtml.\n\nREPLACE supports explicit partition selection using the PARTITION\nclause with a list of comma-separated names of partitions,\nsubpartitions, or both. As with INSERT, if it is not possible to insert\nthe new row into any of these partitions or subpartitions, the REPLACE\nstatement fails with the error Found a row not matching the given\npartition set. For more information and examples, see\nhttps://dev.mysql.com/doc/refman/8.0/en/partitioning-selection.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/replace.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/replace.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (552,41,'SELECT','Syntax:\nSELECT\n    [ALL | DISTINCT | DISTINCTROW ]\n    [HIGH_PRIORITY]\n    [STRAIGHT_JOIN]\n    [SQL_SMALL_RESULT] [SQL_BIG_RESULT] [SQL_BUFFER_RESULT]\n    [SQL_NO_CACHE] [SQL_CALC_FOUND_ROWS]\n    select_expr [, select_expr] ...\n    [into_option]\n    [FROM table_references\n      [PARTITION partition_list]]\n    [WHERE where_condition]\n    [GROUP BY {col_name | expr | position}, ... [WITH ROLLUP]]\n    [HAVING where_condition]\n    [WINDOW window_name AS (window_spec)\n        [, window_name AS (window_spec)] ...]\n    [ORDER BY {col_name | expr | position}\n      [ASC | DESC], ... [WITH ROLLUP]]\n    [LIMIT {[offset,] row_count | row_count OFFSET offset}]\n    [into_option]\n    [FOR {UPDATE | SHARE}\n        [OF tbl_name [, tbl_name] ...]\n        [NOWAIT | SKIP LOCKED]\n      | LOCK IN SHARE MODE]\n    [into_option]\n\ninto_option: {\n    INTO OUTFILE \'file_name\'\n        [CHARACTER SET charset_name]\n        export_options\n  | INTO DUMPFILE \'file_name\'\n  | INTO var_name [, var_name] ...\n}\n\nSELECT is used to retrieve rows selected from one or more tables, and\ncan include UNION statements and subqueries. See [HELP UNION], and\nhttps://dev.mysql.com/doc/refman/8.0/en/subqueries.html. A SELECT\nstatement can start with a WITH clause to define common table\nexpressions accessible within the SELECT. See\nhttps://dev.mysql.com/doc/refman/8.0/en/with.html.\n\nThe most commonly used clauses of SELECT statements are these:\n\no Each select_expr indicates a column that you want to retrieve. There\n  must be at least one select_expr.\n\no table_references indicates the table or tables from which to retrieve\n  rows. Its syntax is described in [HELP JOIN].\n\no SELECT supports explicit partition selection using the PARTITION\n  clause with a list of partitions or subpartitions (or both) following\n  the name of the table in a table_reference (see [HELP JOIN]). In this\n  case, rows are selected only from the partitions listed, and any\n  other partitions of the table are ignored. For more information and\n  examples, see\n  https://dev.mysql.com/doc/refman/8.0/en/partitioning-selection.html.\n\no The WHERE clause, if given, indicates the condition or conditions\n  that rows must satisfy to be selected. where_condition is an\n  expression that evaluates to true for each row to be selected. The\n  statement selects all rows if there is no WHERE clause.\n\n  In the WHERE expression, you can use any of the functions and\n  operators that MySQL supports, except for aggregate (group)\n  functions. See\n  https://dev.mysql.com/doc/refman/8.0/en/expressions.html, and\n  https://dev.mysql.com/doc/refman/8.0/en/functions.html.\n\nSELECT can also be used to retrieve rows computed without reference to\nany table.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/select.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/select.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (553,41,'DUAL','You are permitted to specify DUAL as a dummy table name in situations\nwhere no tables are referenced:\n\nmysql> SELECT 1 + 1 FROM DUAL;\n        -> 2\n\nDUAL is purely for the convenience of people who require that all\nSELECT statements should have FROM and possibly other clauses. MySQL\nmay ignore the clauses. MySQL does not require FROM DUAL if no tables\nare referenced.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/select.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/select.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (554,41,'JOIN','MySQL supports the following JOIN syntax for the table_references part\nof SELECT statements and multiple-table DELETE and UPDATE statements:\n\ntable_references:\n    escaped_table_reference [, escaped_table_reference] ...\n\nescaped_table_reference: {\n    table_reference\n  | { OJ table_reference }\n}\n\ntable_reference: {\n    table_factor\n  | joined_table\n}\n\ntable_factor: {\n    tbl_name [PARTITION (partition_names)]\n        [[AS] alias] [index_hint_list]\n  | [LATERAL] table_subquery [AS] alias [(col_list)]\n  | ( table_references )\n}\n\njoined_table: {\n    table_reference {[INNER | CROSS] JOIN | STRAIGHT_JOIN} table_factor [join_specification]\n  | table_reference {LEFT|RIGHT} [OUTER] JOIN table_reference join_specification\n  | table_reference NATURAL [INNER | {LEFT|RIGHT} [OUTER]] JOIN table_factor\n}\n\njoin_specification: {\n    ON search_condition\n  | USING (join_column_list)\n}\n\njoin_column_list:\n    column_name [, column_name] ...\n\nindex_hint_list:\n    index_hint [, index_hint] ...\n\nindex_hint: {\n    USE {INDEX|KEY}\n      [FOR {JOIN|ORDER BY|GROUP BY}] ([index_list])\n  | {IGNORE|FORCE} {INDEX|KEY}\n      [FOR {JOIN|ORDER BY|GROUP BY}] (index_list)\n}\n\nindex_list:\n    index_name [, index_name] ...\n\nA table reference is also known as a join expression.\n\nA table reference (when it refers to a partitioned table) may contain a\nPARTITION clause, including a list of comma-separated partitions,\nsubpartitions, or both. This option follows the name of the table and\nprecedes any alias declaration. The effect of this option is that rows\nare selected only from the listed partitions or subpartitions. Any\npartitions or subpartitions not named in the list are ignored. For more\ninformation and examples, see\nhttps://dev.mysql.com/doc/refman/8.0/en/partitioning-selection.html.\n\nThe syntax of table_factor is extended in MySQL in comparison with\nstandard SQL. The standard accepts only table_reference, not a list of\nthem inside a pair of parentheses.\n\nThis is a conservative extension if each comma in a list of\ntable_reference items is considered as equivalent to an inner join. For\nexample:\n\nSELECT * FROM t1 LEFT JOIN (t2, t3, t4)\n                 ON (t2.a = t1.a AND t3.b = t1.b AND t4.c = t1.c)\n\nis equivalent to:\n\nSELECT * FROM t1 LEFT JOIN (t2 CROSS JOIN t3 CROSS JOIN t4)\n                 ON (t2.a = t1.a AND t3.b = t1.b AND t4.c = t1.c)\n\nIn MySQL, JOIN, CROSS JOIN, and INNER JOIN are syntactic equivalents\n(they can replace each other). In standard SQL, they are not\nequivalent. INNER JOIN is used with an ON clause, CROSS JOIN is used\notherwise.\n\nIn general, parentheses can be ignored in join expressions containing\nonly inner join operations. MySQL also supports nested joins. See\nhttps://dev.mysql.com/doc/refman/8.0/en/nested-join-optimization.html.\n\nIndex hints can be specified to affect how the MySQL optimizer makes\nuse of indexes. For more information, see\nhttps://dev.mysql.com/doc/refman/8.0/en/index-hints.html. Optimizer\nhints and the optimizer_switch system variable are other ways to\ninfluence optimizer use of indexes. See\nhttps://dev.mysql.com/doc/refman/8.0/en/optimizer-hints.html, and\nhttps://dev.mysql.com/doc/refman/8.0/en/switchable-optimizations.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/join.html\n\n','SELECT left_tbl.*\n  FROM left_tbl LEFT JOIN right_tbl ON left_tbl.id = right_tbl.id\n  WHERE right_tbl.id IS NULL;\n','https://dev.mysql.com/doc/refman/8.0/en/join.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (555,41,'UNION','Syntax:\nSELECT ...\nUNION [ALL | DISTINCT] SELECT ...\n[UNION [ALL | DISTINCT] SELECT ...]\n\nUNION combines the result from multiple SELECT statements into a single\nresult set. Example:\n\nmysql> SELECT 1, 2;\n+---+---+\n| 1 | 2 |\n+---+---+\n| 1 | 2 |\n+---+---+\nmysql> SELECT \'a\', \'b\';\n+---+---+\n| a | b |\n+---+---+\n| a | b |\n+---+---+\nmysql> SELECT 1, 2 UNION SELECT \'a\', \'b\';\n+---+---+\n| 1 | 2 |\n+---+---+\n| 1 | 2 |\n| a | b |\n+---+---+\n\no https://dev.mysql.com/doc/refman/8.0/en/union.html#union-result-set\n\no https://dev.mysql.com/doc/refman/8.0/en/union.html#union-table\n\no https://dev.mysql.com/doc/refman/8.0/en/union.html#union-distinct-all\n\no https://dev.mysql.com/doc/refman/8.0/en/union.html#union-order-by-lim\n  it\n\no https://dev.mysql.com/doc/refman/8.0/en/union.html#union-restrictions\n\no https://dev.mysql.com/doc/refman/8.0/en/union.html#union-8-0-versus-5\n  -7\n\nResult Set Column Names and Data Types\n\nThe column names for a UNION result set are taken from the column names\nof the first SELECT statement.\n\nSelected columns listed in corresponding positions of each SELECT\nstatement should have the same data type. For example, the first column\nselected by the first statement should have the same type as the first\ncolumn selected by the other statements. If the data types of\ncorresponding SELECT columns do not match, the types and lengths of the\ncolumns in the UNION result take into account the values retrieved by\nall the SELECT statements. For example, consider the following, where\nthe column length is not constrained to the length of the value from\nthe first SELECT:\n\nmysql> SELECT REPEAT(\'a\',1) UNION SELECT REPEAT(\'b\',20);\n+----------------------+\n| REPEAT(\'a\',1)        |\n+----------------------+\n| a                    |\n| bbbbbbbbbbbbbbbbbbbb |\n+----------------------+\n\nTABLE in Unions\n\nBeginning with MySQL 8.0.19, you can also use a TABLE statement or\nVALUES statement in a UNION wherever you can employ the equivalent\nSELECT statement. Assume that tables t1 and t2 are created and\npopulated as shown here:\n\nCREATE TABLE t1 (x INT, y INT);\nINSERT INTO t1 VALUES ROW(4,-2),ROW(5,9);\n\nCREATE TABLE t2 (a INT, b INT);\nINSERT INTO t2 VALUES ROW(1,2),ROW(3,4);\n\nThe preceding being the case, and disregarding the column names in the\noutput of the queries beginning with VALUES, all of the following UNION\nqueries yield the same result:\n\nSELECT * FROM t1 UNION SELECT * FROM t2;\nTABLE t1 UNION SELECT * FROM t2;\nVALUES ROW(4,-2), ROW(5,9) UNION SELECT * FROM t2;\nSELECT * FROM t1 UNION TABLE t2;\nTABLE t1 UNION TABLE t2;\nVALUES ROW(4,-2), ROW(5,9) UNION TABLE t2;\nSELECT * FROM t1 UNION VALUES ROW(4,-2),ROW(5,9);\nTABLE t1 UNION VALUES ROW(4,-2),ROW(5,9);\nVALUES ROW(4,-2), ROW(5,9) UNION VALUES ROW(4,-2),ROW(5,9);\n\nTo force the column names to be the same, wrap the VALUES on the left\nhand side in a SELECT and use aliases, like this:\n\nSELECT * FROM (VALUES ROW(4,-2), ROW(5,9)) AS t(x,y)\n  UNION TABLE t2;\nSELECT * FROM (VALUES ROW(4,-2), ROW(5,9)) AS t(x,y)\n  UNION VALUES ROW(4,-2),ROW(5,9);\n\nUNION DISTINCT and UNION ALL\n\nBy default, duplicate rows are removed from UNION results. The optional\nDISTINCT keyword has the same effect but makes it explicit. With the\noptional ALL keyword, duplicate-row removal does not occur and the\nresult includes all matching rows from all the SELECT statements.\n\nYou can mix UNION ALL and UNION DISTINCT in the same query. Mixed UNION\ntypes are treated such that a DISTINCT union overrides any ALL union to\nits left. A DISTINCT union can be produced explicitly by using UNION\nDISTINCT or implicitly by using UNION with no following DISTINCT or ALL\nkeyword.\n\nIn MySQL 8.0.19 and later, UNION ALL and UNION DISTINCT work the same\nway when one or more TABLE statements are used in the union.\n\nORDER BY and LIMIT in Unions\n\nTo apply an ORDER BY or LIMIT clause to an individual SELECT,\nparenthesize the SELECT and place the clause inside the parentheses:\n\n(SELECT a FROM t1 WHERE a=10 AND B=1 ORDER BY a LIMIT 10)\nUNION\n(SELECT a FROM t2 WHERE a=11 AND B=2 ORDER BY a LIMIT 10);\n\nUse of ORDER BY for individual SELECT statements implies nothing about\nthe order in which the rows appear in the final result because UNION by\ndefault produces an unordered set of rows. Therefore, ORDER BY in this\ncontext typically is used in conjunction with LIMIT, to determine the\nsubset of the selected rows to retrieve for the SELECT, even though it\ndoes not necessarily affect the order of those rows in the final UNION\nresult. If ORDER BY appears without LIMIT in a SELECT, it is optimized\naway because it has no effect in any case.\n\nTo use an ORDER BY or LIMIT clause to sort or limit the entire UNION\nresult, parenthesize the individual SELECT statements and place the\nORDER BY or LIMIT after the last one:\n\n(SELECT a FROM t1 WHERE a=10 AND B=1)\nUNION\n(SELECT a FROM t2 WHERE a=11 AND B=2)\nORDER BY a LIMIT 10;\n\nA statement without parentheses is equivalent to one parenthesized as\njust shown.\n\nBeginning with MySQL 8.0.19, you can use ORDER BY and LIMIT with TABLE\nin unions in the same way as just shown, bearing in mind that TABLE\ndoes not support a WHERE clause.\n\nThis kind of ORDER BY cannot use column references that include a table\nname (that is, names in tbl_name.col_name format). Instead, provide a\ncolumn alias in the first SELECT statement and refer to the alias in\nthe ORDER BY. (Alternatively, refer to the column in the ORDER BY using\nits column position. However, use of column positions is deprecated.)\n\nAlso, if a column to be sorted is aliased, the ORDER BY clause must\nrefer to the alias, not the column name. The first of the following\nstatements is permitted, but the second fails with an Unknown column\n\'a\' in \'order clause\' error:\n\n(SELECT a AS b FROM t) UNION (SELECT ...) ORDER BY b;\n(SELECT a AS b FROM t) UNION (SELECT ...) ORDER BY a;\n\nTo cause rows in a UNION result to consist of the sets of rows\nretrieved by each SELECT one after the other, select an additional\ncolumn in each SELECT to use as a sort column and add an ORDER BY that\nsorts on that column following the last SELECT:\n\n(SELECT 1 AS sort_col, col1a, col1b, ... FROM t1)\nUNION\n(SELECT 2, col2a, col2b, ... FROM t2) ORDER BY sort_col;\n\nTo additionally maintain sort order within individual SELECT results,\nadd a secondary column to the ORDER BY clause:\n\n(SELECT 1 AS sort_col, col1a, col1b, ... FROM t1)\nUNION\n(SELECT 2, col2a, col2b, ... FROM t2) ORDER BY sort_col, col1a;\n\nUse of an additional column also enables you to determine which SELECT\neach row comes from. Extra columns can provide other identifying\ninformation as well, such as a string that indicates a table name.\n\nUNION Restrictions\n\nIn a UNION, the SELECT statements are normal select statements, but\nwith the following restrictions:\n\no HIGH_PRIORITY in the first SELECT has no effect. HIGH_PRIORITY in any\n  subsequent SELECT produces a syntax error.\n\no Only the last SELECT statement can use an INTO clause. However, the\n  entire UNION result is written to the INTO output destination.\n\nAs of MySQL 8.0.20, these two UNION variants containing INTO are\ndeprecated and you should expect support for them to be removed in a\nfuture version of MySQL:\n\no In the trailing query block of a query expression, use of INTO before\n  FROM produces a warning. Example:\n\n... UNION SELECT * INTO OUTFILE \'file_name\' FROM table_name;\n\no In a parenthesized trailing block of a query expression, use of INTO\n  (regardless of its position relative to FROM) produces a warning.\n  Example:\n\n... UNION (SELECT * INTO OUTFILE \'file_name\' FROM table_name);\n\n  Those variants are deprecated because they are confusing, as if they\n  collect information from the named table rather than the entire query\n  expression (the UNION).\n\nUNION queries with an aggregate function in an ORDER BY clause are\nrejected with an ER_AGGREGATE_ORDER_FOR_UNION\n(https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference.h\ntml#error_er_aggregate_order_for_union) error. Example:\n\nSELECT 1 AS foo UNION SELECT 2 ORDER BY MAX(1);\n\nUNION Handing in MySQL 8.0 Compared to MySQL 5.7\n\nIn MySQL 8.0, the parser rules for SELECT and UNION were refactored to\nbe more consistent (the same SELECT syntax applies uniformly in each\nsuch context) and reduce duplication. Compared to MySQL 5.7, several\nuser-visible effects resulted from this work, which may require\nrewriting of certain statements:\n\no NATURAL JOIN permits an optional INNER keyword (NATURAL INNER JOIN),\n  in compliance with standard SQL.\n\no Right-deep joins without parentheses are permitted (for example, ...\n  JOIN ... JOIN ... ON ... ON), in compliance with standard SQL.\n\no STRAIGHT_JOIN now permits a USING clause, similar to other inner\n  joins.\n\no The parser accepts parentheses around query expressions. For example,\n  (SELECT ... UNION SELECT ...) is permitted. See also [HELP\n  parenthesized query expressions].\n\no The parser better conforms to the documented permitted placement of\n  the SQL_CACHE and SQL_NO_CACHE query modifiers.\n\no Left-hand nesting of unions, previously permitted only in subqueries,\n  is now permitted in top-level statements. For example, this statement\n  is now accepted as valid:\n\n(SELECT 1 UNION SELECT 1) UNION SELECT 1;\n\no Locking clauses (FOR UPDATE, LOCK IN SHARE MODE) are allowed only in\n  non-UNION queries. This means that parentheses must be used for\n  SELECT statements containing locking clauses. This statement is no\n  longer accepted as valid:\n\nSELECT 1 FOR UPDATE UNION SELECT 1 FOR UPDATE;\n\n  Instead, write the statement like this:\n\n(SELECT 1 FOR UPDATE) UNION (SELECT 1 FOR UPDATE);\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/union.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/union.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (556,41,'PARENTHESIZED QUERY EXPRESSIONS','Syntax:\nparenthesized_query_expression:\n    ( query_expression [order_by_clause] [limit_clause] )\n      [order_by_clause]\n      [limit_clause]\n      [into_clause]\n\nquery_expression:\n    query_block [UNION query_block [UNION query_block ...]]\n      [order_by_clause]\n      [limit_clause]\n      [into_clause]\n\nquery_block:\n    SELECT ...             (see )\n\norder_by_clause:\n    ORDER BY as for SELECT (see )\n\nlimit_clause:\n    LIMIT as for SELECT    (see )\n\ninto_clause:\n    INTO as for SELECT     (see )\n\nMySQL 8.0.22 and higher supports parenthesized query expressions\naccording to the preceding syntax. At its simplest, a parenthesized\nquery expression contains a single SELECT and no following optional\nclauses:\n\n(SELECT 1);\n(SELECT * FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = \'mysql\');\n\nA parenthesized query expression can also contain a UNION comprising\nmultiple SELECT statements, and end with any or all of the optional\nclauses:\n\nmysql> (SELECT 1 AS result UNION SELECT 2);\n+--------+\n| result |\n+--------+\n|      1 |\n|      2 |\n+--------+\nmysql> (SELECT 1 AS result UNION SELECT 2) LIMIT 1;\n+--------+\n| result |\n+--------+\n|      1 |\n+--------+\nmysql> (SELECT 1 AS result UNION SELECT 2) LIMIT 1 OFFSET 1;\n+--------+\n| result |\n+--------+\n|      2 |\n+--------+\nmysql> (SELECT 1 AS result UNION SELECT 2)\n       ORDER BY result DESC LIMIT 1;\n+--------+\n| result |\n+--------+\n|      2 |\n+--------+\nmysql> (SELECT 1 AS result UNION SELECT 2)\n       ORDER BY result DESC LIMIT 1 OFFSET 1;\n+--------+\n| result |\n+--------+\n|      1 |\n+--------+\nmysql> (SELECT 1 AS result UNION SELECT 3 UNION SELECT 2)\n       ORDER BY result LIMIT 1 OFFSET 1 INTO @var;\nmysql> SELECT @var;\n+------+\n| @var |\n+------+\n|    2 |\n+------+\n\nParenthesized query expressions are also used as query expressions, so\na query expression, usually composed of query blocks, may also consist\nof parenthesized query expressions:\n\n(SELECT * FROM t1 ORDER BY a) UNION (SELECT * FROM t2 ORDER BY b) ORDER BY z;\n\nQuery blocks may have trailing ORDER BY and LIMIT clauses, which are\napplied before the outer UNION and ORDER BY and LIMIT.\n\nYou cannot have a query block with a trailing ORDER BY or LIMIT,\nwithout wrapping it in parentheses, but parentheses may be used for\nenforcement in various ways:\n\no To enforce LIMIT on each query block:\n\n(SELECT 1 LIMIT 1) UNION (SELECT 2 LIMIT 1);\n\no To enforce LIMIT on both query blocks and the entire query\n  expression:\n\n(SELECT 1 LIMIT 1) UNION (SELECT 2 LIMIT 1) LIMIT 1;\n\no To enforce LIMIT on the entire query expression (with no\n  parentheses):\n\nSELECT 1 UNION SELECT 2 LIMIT 1;\n\no Hybrid enforcement: LIMIT on the first query block and on the entire\n  query expression:\n\n(SELECT 1 LIMIT 1) UNION SELECT 2 LIMIT 1;\n\nThe syntax described in this section is subject to certain\nrestrictions:\n\no If ORDER BY occurs within a parenthesized query expression and also\n  is applied in the outer query, the results are undefined and may\n  change in a future version of MySQL. The same is true if LIMIT occurs\n  within a parenthesized query expression and also is applied in the\n  outer query.\n\no A trailing INTO clause for a query expression is not permitted if\n  there is another INTO clause inside parentheses.\n\no Parenthesized query expressions do not permit multiple levels of\n  ORDER BY or LIMIT operations. For example:\n\nmysql> (SELECT \'a\' UNION SELECT \'b\' LIMIT 1) LIMIT 2;\nERROR 1235 (42000): This version of MySQL doesn\'t yet support \'parenthesized\nquery expression with more than one external level of ORDER/LIMIT operations\'\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/parenthesized-query-expressions.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/parenthesized-query-expressions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (557,41,'TABLE','Syntax:\nTABLE is a DML statement introduced in MySQL 8.0.19 which returns rows\nand columns of the named table.\n\nTABLE table_name [ORDER BY column_name] [LIMIT number [OFFSET number]]\n\nThe TABLE statement in some ways acts like SELECT. Given the existance\nof a table named t, the following two statements produce identical\noutput:\n\nTABLE t;\n\nSELECT * FROM t;\n\nYou can order and limit the number of rows produced by TABLE using\nORDER BY and LIMIT clauses, respectively. These function identically to\nthe same clauses when used with SELECT (including an optional OFFSET\nclause with LIMIT), as you can see here:\n\nmysql> TABLE t;\n+----+----+\n| a  | b  |\n+----+----+\n|  1 |  2 |\n|  6 |  7 |\n|  9 |  5 |\n| 10 | -4 |\n| 11 | -1 |\n| 13 |  3 |\n| 14 |  6 |\n+----+----+\n7 rows in set (0.00 sec)\n\nmysql> TABLE t ORDER BY b;\n+----+----+\n| a  | b  |\n+----+----+\n| 10 | -4 |\n| 11 | -1 |\n|  1 |  2 |\n| 13 |  3 |\n|  9 |  5 |\n| 14 |  6 |\n|  6 |  7 |\n+----+----+\n7 rows in set (0.00 sec)\n\nmysql> TABLE t LIMIT 3;\n+---+---+\n| a | b |\n+---+---+\n| 1 | 2 |\n| 6 | 7 |\n| 9 | 5 |\n+---+---+\n3 rows in set (0.00 sec)\n\nmysql> TABLE t ORDER BY b LIMIT 3;\n+----+----+\n| a  | b  |\n+----+----+\n| 10 | -4 |\n| 11 | -1 |\n|  1 |  2 |\n+----+----+\n3 rows in set (0.00 sec)\n\nmysql> TABLE t ORDER BY b LIMIT 3 OFFSET 2;\n+----+----+\n| a  | b  |\n+----+----+\n|  1 |  2 |\n| 13 |  3 |\n|  9 |  5 |\n+----+----+\n3 rows in set (0.00 sec)\n\nTABLE differs from SELECT in two key respects:\n\no TABLE always displays all columns of the table.\n\no TABLE does not allow for any arbitrary filtering of rows; that is,\n  TABLE does not support any WHERE clause.\n\nFor limiting which table columns are returned, filtering rows beyond\nwhat can be accomplished using ORDER BY and LIMIT, or both, use SELECT.\n\nTABLE can be used with temporary tables.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/table.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/table.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (558,41,'UPDATE','Syntax:\nUPDATE is a DML statement that modifies rows in a table.\n\nAn UPDATE statement can start with a WITH clause to define common table\nexpressions accessible within the UPDATE. See\nhttps://dev.mysql.com/doc/refman/8.0/en/with.html.\n\nSingle-table syntax:\n\nUPDATE [LOW_PRIORITY] [IGNORE] table_reference\n    SET assignment_list\n    [WHERE where_condition]\n    [ORDER BY ...]\n    [LIMIT row_count]\n\nvalue:\n    {expr | DEFAULT}\n\nassignment:\n    col_name = value\n\nassignment_list:\n    assignment [, assignment] ...\n\nMultiple-table syntax:\n\nUPDATE [LOW_PRIORITY] [IGNORE] table_references\n    SET assignment_list\n    [WHERE where_condition]\n\nFor the single-table syntax, the UPDATE statement updates columns of\nexisting rows in the named table with new values. The SET clause\nindicates which columns to modify and the values they should be given.\nEach value can be given as an expression, or the keyword DEFAULT to set\na column explicitly to its default value. The WHERE clause, if given,\nspecifies the conditions that identify which rows to update. With no\nWHERE clause, all rows are updated. If the ORDER BY clause is\nspecified, the rows are updated in the order that is specified. The\nLIMIT clause places a limit on the number of rows that can be updated.\n\nFor the multiple-table syntax, UPDATE updates rows in each table named\nin table_references that satisfy the conditions. Each matching row is\nupdated once, even if it matches the conditions multiple times. For\nmultiple-table syntax, ORDER BY and LIMIT cannot be used.\n\nFor partitioned tables, both the single-single and multiple-table forms\nof this statement support the use of a PARTITION clause as part of a\ntable reference. This option takes a list of one or more partitions or\nsubpartitions (or both). Only the partitions (or subpartitions) listed\nare checked for matches, and a row that is not in any of these\npartitions or subpartitions is not updated, whether it satisfies the\nwhere_condition or not.\n\n*Note*:\n\nUnlike the case when using PARTITION with an INSERT or REPLACE\nstatement, an otherwise valid UPDATE ... PARTITION statement is\nconsidered successful even if no rows in the listed partitions (or\nsubpartitions) match the where_condition.\n\nFor more information and examples, see\nhttps://dev.mysql.com/doc/refman/8.0/en/partitioning-selection.html.\n\nwhere_condition is an expression that evaluates to true for each row to\nbe updated. For expression syntax, see\nhttps://dev.mysql.com/doc/refman/8.0/en/expressions.html.\n\ntable_references and where_condition are specified as described in\nhttps://dev.mysql.com/doc/refman/8.0/en/select.html.\n\nYou need the UPDATE privilege only for columns referenced in an UPDATE\nthat are actually updated. You need only the SELECT privilege for any\ncolumns that are read but not modified.\n\nThe UPDATE statement supports the following modifiers:\n\no With the LOW_PRIORITY modifier, execution of the UPDATE is delayed\n  until no other clients are reading from the table. This affects only\n  storage engines that use only table-level locking (such as MyISAM,\n  MEMORY, and MERGE).\n\no With the IGNORE modifier, the update statement does not abort even if\n  errors occur during the update. Rows for which duplicate-key\n  conflicts occur on a unique key value are not updated. Rows updated\n  to values that would cause data conversion errors are updated to the\n  closest valid values instead. For more information, see\n  https://dev.mysql.com/doc/refman/8.0/en/sql-mode.html#ignore-effect-o\n  n-execution.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/update.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/update.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (559,41,'VALUES STATEMENT','Syntax:\nVALUES row_constructor_list [ORDER BY column_designator] [LIMIT BY number]\n\nrow_constructor_list:\n    ROW(value_list)[, ROW(value_list)][, ...]\n\nvalue_list:\n    value[, value][, ...]\n\ncolumn_designator:\n    column_index\n\nThe VALUES statement consists of the VALUES keyword followed by a list\nof one or more row constructors, separated by commas. A row constructor\nconsists of the ROW() row constructor clause with a value list of one\nor more scalar values enclosed in the parentheses. A value can be a\nliteral of any MySQL data type or an expression that resolves to a\nscalar value.\n\nROW() cannot be empty (but each of the supplied scalar values can be\nNULL). Each ROW() in the same VALUES statement must have the same\nnumber of values in its value list.\n\nThe DEFAULT keyword is not supported by VALUES and causes a syntax\nerror, except when it is used to supply values in an INSERT statement.\n\nThe output of VALUES is a table:\n\nmysql> VALUES ROW(1,-2,3), ROW(5,7,9), ROW(4,6,8);\n+----------+----------+----------+\n| column_0 | column_1 | column_2 |\n+----------+----------+----------+\n|        1 |       -2 |        3 |\n|        5 |        7 |        9 |\n|        4 |        6 |        8 |\n+----------+----------+----------+\n3 rows in set (0.00 sec)\n\nThe columns of the table output from VALUES have the implicitly named\ncolumns column_0, column_1, column_2, and so on, always beginning with\n0. This fact can be used to order the rows by column using an optional\nORDER BY clause in the same way that this clause works with a SELECT\nstatement, as shown here:\n\nmysql> VALUES ROW(1,-2,3), ROW(5,7,9), ROW(4,6,8) ORDER BY column_1;\n+----------+----------+----------+\n| column_0 | column_1 | column_2 |\n+----------+----------+----------+\n|        1 |       -2 |        3 |\n|        4 |        6 |        8 |\n|        5 |        7 |        9 |\n+----------+----------+----------+\n3 rows in set (0.00 sec)\n\nThe VALUES statement also supports a LIMIT clause for limiting the\nnumber of rows in the output.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/values.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/values.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (560,42,'START TRANSACTION','Syntax:\nSTART TRANSACTION\n    [transaction_characteristic [, transaction_characteristic] ...]\n\ntransaction_characteristic: {\n    WITH CONSISTENT SNAPSHOT\n  | READ WRITE\n  | READ ONLY\n}\n\nBEGIN [WORK]\nCOMMIT [WORK] [AND [NO] CHAIN] [[NO] RELEASE]\nROLLBACK [WORK] [AND [NO] CHAIN] [[NO] RELEASE]\nSET autocommit = {0 | 1}\n\nThese statements provide control over use of transactions:\n\no START TRANSACTION or BEGIN start a new transaction.\n\no COMMIT commits the current transaction, making its changes permanent.\n\no ROLLBACK rolls back the current transaction, canceling its changes.\n\no SET autocommit disables or enables the default autocommit mode for\n  the current session.\n\nBy default, MySQL runs with autocommit mode enabled. This means that,\nwhen not otherwise inside a transaction, each statement is atomic, as\nif it were surrounded by START TRANSACTION and COMMIT. You cannot use\nROLLBACK to undo the effect; however, if an error occurs during\nstatement execution, the statement is rolled back.\n\nTo disable autocommit mode implicitly for a single series of\nstatements, use the START TRANSACTION statement:\n\nSTART TRANSACTION;\nSELECT @A:=SUM(salary) FROM table1 WHERE type=1;\nUPDATE table2 SET summary=@A WHERE type=1;\nCOMMIT;\n\nWith START TRANSACTION, autocommit remains disabled until you end the\ntransaction with COMMIT or ROLLBACK. The autocommit mode then reverts\nto its previous state.\n\nSTART TRANSACTION permits several modifiers that control transaction\ncharacteristics. To specify multiple modifiers, separate them by\ncommas.\n\no The WITH CONSISTENT SNAPSHOT modifier starts a consistent read for\n  storage engines that are capable of it. This applies only to InnoDB.\n  The effect is the same as issuing a START TRANSACTION followed by a\n  SELECT from any InnoDB table. See\n  https://dev.mysql.com/doc/refman/8.0/en/innodb-consistent-read.html.\n  The WITH CONSISTENT SNAPSHOT modifier does not change the current\n  transaction isolation level, so it provides a consistent snapshot\n  only if the current isolation level is one that permits a consistent\n  read. The only isolation level that permits a consistent read is\n  REPEATABLE READ. For all other isolation levels, the WITH CONSISTENT\n  SNAPSHOT clause is ignored. A warning is generated when the WITH\n  CONSISTENT SNAPSHOT clause is ignored.\n\no The READ WRITE and READ ONLY modifiers set the transaction access\n  mode. They permit or prohibit changes to tables used in the\n  transaction. The READ ONLY restriction prevents the transaction from\n  modifying or locking both transactional and nontransactional tables\n  that are visible to other transactions; the transaction can still\n  modify or lock temporary tables.\n\n  MySQL enables extra optimizations for queries on InnoDB tables when\n  the transaction is known to be read-only. Specifying READ ONLY\n  ensures these optimizations are applied in cases where the read-only\n  status cannot be determined automatically. See\n  https://dev.mysql.com/doc/refman/8.0/en/innodb-performance-ro-txn.htm\n  l for more information.\n\n  If no access mode is specified, the default mode applies. Unless the\n  default has been changed, it is read/write. It is not permitted to\n  specify both READ WRITE and READ ONLY in the same statement.\n\n  In read-only mode, it remains possible to change tables created with\n  the TEMPORARY keyword using DML statements. Changes made with DDL\n  statements are not permitted, just as with permanent tables.\n\n  For additional information about transaction access mode, including\n  ways to change the default mode, see [HELP SET TRANSACTION].\n\n  If the read_only system variable is enabled, explicitly starting a\n  transaction with START TRANSACTION READ WRITE requires the\n  CONNECTION_ADMIN privilege (or the deprecated SUPER privilege).\n\n*Important*:\n\nMany APIs used for writing MySQL client applications (such as JDBC)\nprovide their own methods for starting transactions that can (and\nsometimes should) be used instead of sending a START TRANSACTION\nstatement from the client. See\nhttps://dev.mysql.com/doc/refman/8.0/en/connectors-apis.html, or the\ndocumentation for your API, for more information.\n\nTo disable autocommit mode explicitly, use the following statement:\n\nSET autocommit=0;\n\nAfter disabling autocommit mode by setting the autocommit variable to\nzero, changes to transaction-safe tables (such as those for InnoDB or\nNDB) are not made permanent immediately. You must use COMMIT to store\nyour changes to disk or ROLLBACK to ignore the changes.\n\nautocommit is a session variable and must be set for each session. To\ndisable autocommit mode for each new connection, see the description of\nthe autocommit system variable at\nhttps://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html.\n\nBEGIN and BEGIN WORK are supported as aliases of START TRANSACTION for\ninitiating a transaction. START TRANSACTION is standard SQL syntax, is\nthe recommended way to start an ad-hoc transaction, and permits\nmodifiers that BEGIN does not.\n\nThe BEGIN statement differs from the use of the BEGIN keyword that\nstarts a BEGIN ... END compound statement. The latter does not begin a\ntransaction. See [HELP BEGIN END].\n\n*Note*:\n\nWithin all stored programs (stored procedures and functions, triggers,\nand events), the parser treats BEGIN [WORK] as the beginning of a BEGIN\n... END block. Begin a transaction in this context with START\nTRANSACTION instead.\n\nThe optional WORK keyword is supported for COMMIT and ROLLBACK, as are\nthe CHAIN and RELEASE clauses. CHAIN and RELEASE can be used for\nadditional control over transaction completion. The value of the\ncompletion_type system variable determines the default completion\nbehavior. See\nhttps://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html.\n\nThe AND CHAIN clause causes a new transaction to begin as soon as the\ncurrent one ends, and the new transaction has the same isolation level\nas the just-terminated transaction. The new transaction also uses the\nsame access mode (READ WRITE or READ ONLY) as the just-terminated\ntransaction. The RELEASE clause causes the server to disconnect the\ncurrent client session after terminating the current transaction.\nIncluding the NO keyword suppresses CHAIN or RELEASE completion, which\ncan be useful if the completion_type system variable is set to cause\nchaining or release completion by default.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/commit.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/commit.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (561,42,'BEGIN','Syntax:\nSTART TRANSACTION\n    [transaction_characteristic [, transaction_characteristic] ...]\n\ntransaction_characteristic: {\n    WITH CONSISTENT SNAPSHOT\n  | READ WRITE\n  | READ ONLY\n}\n\nBEGIN [WORK]\nCOMMIT [WORK] [AND [NO] CHAIN] [[NO] RELEASE]\nROLLBACK [WORK] [AND [NO] CHAIN] [[NO] RELEASE]\nSET autocommit = {0 | 1}\n\nThese statements provide control over use of transactions:\n\no START TRANSACTION or BEGIN start a new transaction.\n\no COMMIT commits the current transaction, making its changes permanent.\n\no ROLLBACK rolls back the current transaction, canceling its changes.\n\no SET autocommit disables or enables the default autocommit mode for\n  the current session.\n\nBy default, MySQL runs with autocommit mode enabled. This means that,\nwhen not otherwise inside a transaction, each statement is atomic, as\nif it were surrounded by START TRANSACTION and COMMIT. You cannot use\nROLLBACK to undo the effect; however, if an error occurs during\nstatement execution, the statement is rolled back.\n\nTo disable autocommit mode implicitly for a single series of\nstatements, use the START TRANSACTION statement:\n\nSTART TRANSACTION;\nSELECT @A:=SUM(salary) FROM table1 WHERE type=1;\nUPDATE table2 SET summary=@A WHERE type=1;\nCOMMIT;\n\nWith START TRANSACTION, autocommit remains disabled until you end the\ntransaction with COMMIT or ROLLBACK. The autocommit mode then reverts\nto its previous state.\n\nSTART TRANSACTION permits several modifiers that control transaction\ncharacteristics. To specify multiple modifiers, separate them by\ncommas.\n\no The WITH CONSISTENT SNAPSHOT modifier starts a consistent read for\n  storage engines that are capable of it. This applies only to InnoDB.\n  The effect is the same as issuing a START TRANSACTION followed by a\n  SELECT from any InnoDB table. See\n  https://dev.mysql.com/doc/refman/8.0/en/innodb-consistent-read.html.\n  The WITH CONSISTENT SNAPSHOT modifier does not change the current\n  transaction isolation level, so it provides a consistent snapshot\n  only if the current isolation level is one that permits a consistent\n  read. The only isolation level that permits a consistent read is\n  REPEATABLE READ. For all other isolation levels, the WITH CONSISTENT\n  SNAPSHOT clause is ignored. A warning is generated when the WITH\n  CONSISTENT SNAPSHOT clause is ignored.\n\no The READ WRITE and READ ONLY modifiers set the transaction access\n  mode. They permit or prohibit changes to tables used in the\n  transaction. The READ ONLY restriction prevents the transaction from\n  modifying or locking both transactional and nontransactional tables\n  that are visible to other transactions; the transaction can still\n  modify or lock temporary tables.\n\n  MySQL enables extra optimizations for queries on InnoDB tables when\n  the transaction is known to be read-only. Specifying READ ONLY\n  ensures these optimizations are applied in cases where the read-only\n  status cannot be determined automatically. See\n  https://dev.mysql.com/doc/refman/8.0/en/innodb-performance-ro-txn.htm\n  l for more information.\n\n  If no access mode is specified, the default mode applies. Unless the\n  default has been changed, it is read/write. It is not permitted to\n  specify both READ WRITE and READ ONLY in the same statement.\n\n  In read-only mode, it remains possible to change tables created with\n  the TEMPORARY keyword using DML statements. Changes made with DDL\n  statements are not permitted, just as with permanent tables.\n\n  For additional information about transaction access mode, including\n  ways to change the default mode, see [HELP SET TRANSACTION].\n\n  If the read_only system variable is enabled, explicitly starting a\n  transaction with START TRANSACTION READ WRITE requires the\n  CONNECTION_ADMIN privilege (or the deprecated SUPER privilege).\n\n*Important*:\n\nMany APIs used for writing MySQL client applications (such as JDBC)\nprovide their own methods for starting transactions that can (and\nsometimes should) be used instead of sending a START TRANSACTION\nstatement from the client. See\nhttps://dev.mysql.com/doc/refman/8.0/en/connectors-apis.html, or the\ndocumentation for your API, for more information.\n\nTo disable autocommit mode explicitly, use the following statement:\n\nSET autocommit=0;\n\nAfter disabling autocommit mode by setting the autocommit variable to\nzero, changes to transaction-safe tables (such as those for InnoDB or\nNDB) are not made permanent immediately. You must use COMMIT to store\nyour changes to disk or ROLLBACK to ignore the changes.\n\nautocommit is a session variable and must be set for each session. To\ndisable autocommit mode for each new connection, see the description of\nthe autocommit system variable at\nhttps://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html.\n\nBEGIN and BEGIN WORK are supported as aliases of START TRANSACTION for\ninitiating a transaction. START TRANSACTION is standard SQL syntax, is\nthe recommended way to start an ad-hoc transaction, and permits\nmodifiers that BEGIN does not.\n\nThe BEGIN statement differs from the use of the BEGIN keyword that\nstarts a BEGIN ... END compound statement. The latter does not begin a\ntransaction. See [HELP BEGIN END].\n\n*Note*:\n\nWithin all stored programs (stored procedures and functions, triggers,\nand events), the parser treats BEGIN [WORK] as the beginning of a BEGIN\n... END block. Begin a transaction in this context with START\nTRANSACTION instead.\n\nThe optional WORK keyword is supported for COMMIT and ROLLBACK, as are\nthe CHAIN and RELEASE clauses. CHAIN and RELEASE can be used for\nadditional control over transaction completion. The value of the\ncompletion_type system variable determines the default completion\nbehavior. See\nhttps://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html.\n\nThe AND CHAIN clause causes a new transaction to begin as soon as the\ncurrent one ends, and the new transaction has the same isolation level\nas the just-terminated transaction. The new transaction also uses the\nsame access mode (READ WRITE or READ ONLY) as the just-terminated\ntransaction. The RELEASE clause causes the server to disconnect the\ncurrent client session after terminating the current transaction.\nIncluding the NO keyword suppresses CHAIN or RELEASE completion, which\ncan be useful if the completion_type system variable is set to cause\nchaining or release completion by default.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/commit.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/commit.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (562,42,'COMMIT','Syntax:\nSTART TRANSACTION\n    [transaction_characteristic [, transaction_characteristic] ...]\n\ntransaction_characteristic: {\n    WITH CONSISTENT SNAPSHOT\n  | READ WRITE\n  | READ ONLY\n}\n\nBEGIN [WORK]\nCOMMIT [WORK] [AND [NO] CHAIN] [[NO] RELEASE]\nROLLBACK [WORK] [AND [NO] CHAIN] [[NO] RELEASE]\nSET autocommit = {0 | 1}\n\nThese statements provide control over use of transactions:\n\no START TRANSACTION or BEGIN start a new transaction.\n\no COMMIT commits the current transaction, making its changes permanent.\n\no ROLLBACK rolls back the current transaction, canceling its changes.\n\no SET autocommit disables or enables the default autocommit mode for\n  the current session.\n\nBy default, MySQL runs with autocommit mode enabled. This means that,\nwhen not otherwise inside a transaction, each statement is atomic, as\nif it were surrounded by START TRANSACTION and COMMIT. You cannot use\nROLLBACK to undo the effect; however, if an error occurs during\nstatement execution, the statement is rolled back.\n\nTo disable autocommit mode implicitly for a single series of\nstatements, use the START TRANSACTION statement:\n\nSTART TRANSACTION;\nSELECT @A:=SUM(salary) FROM table1 WHERE type=1;\nUPDATE table2 SET summary=@A WHERE type=1;\nCOMMIT;\n\nWith START TRANSACTION, autocommit remains disabled until you end the\ntransaction with COMMIT or ROLLBACK. The autocommit mode then reverts\nto its previous state.\n\nSTART TRANSACTION permits several modifiers that control transaction\ncharacteristics. To specify multiple modifiers, separate them by\ncommas.\n\no The WITH CONSISTENT SNAPSHOT modifier starts a consistent read for\n  storage engines that are capable of it. This applies only to InnoDB.\n  The effect is the same as issuing a START TRANSACTION followed by a\n  SELECT from any InnoDB table. See\n  https://dev.mysql.com/doc/refman/8.0/en/innodb-consistent-read.html.\n  The WITH CONSISTENT SNAPSHOT modifier does not change the current\n  transaction isolation level, so it provides a consistent snapshot\n  only if the current isolation level is one that permits a consistent\n  read. The only isolation level that permits a consistent read is\n  REPEATABLE READ. For all other isolation levels, the WITH CONSISTENT\n  SNAPSHOT clause is ignored. A warning is generated when the WITH\n  CONSISTENT SNAPSHOT clause is ignored.\n\no The READ WRITE and READ ONLY modifiers set the transaction access\n  mode. They permit or prohibit changes to tables used in the\n  transaction. The READ ONLY restriction prevents the transaction from\n  modifying or locking both transactional and nontransactional tables\n  that are visible to other transactions; the transaction can still\n  modify or lock temporary tables.\n\n  MySQL enables extra optimizations for queries on InnoDB tables when\n  the transaction is known to be read-only. Specifying READ ONLY\n  ensures these optimizations are applied in cases where the read-only\n  status cannot be determined automatically. See\n  https://dev.mysql.com/doc/refman/8.0/en/innodb-performance-ro-txn.htm\n  l for more information.\n\n  If no access mode is specified, the default mode applies. Unless the\n  default has been changed, it is read/write. It is not permitted to\n  specify both READ WRITE and READ ONLY in the same statement.\n\n  In read-only mode, it remains possible to change tables created with\n  the TEMPORARY keyword using DML statements. Changes made with DDL\n  statements are not permitted, just as with permanent tables.\n\n  For additional information about transaction access mode, including\n  ways to change the default mode, see [HELP SET TRANSACTION].\n\n  If the read_only system variable is enabled, explicitly starting a\n  transaction with START TRANSACTION READ WRITE requires the\n  CONNECTION_ADMIN privilege (or the deprecated SUPER privilege).\n\n*Important*:\n\nMany APIs used for writing MySQL client applications (such as JDBC)\nprovide their own methods for starting transactions that can (and\nsometimes should) be used instead of sending a START TRANSACTION\nstatement from the client. See\nhttps://dev.mysql.com/doc/refman/8.0/en/connectors-apis.html, or the\ndocumentation for your API, for more information.\n\nTo disable autocommit mode explicitly, use the following statement:\n\nSET autocommit=0;\n\nAfter disabling autocommit mode by setting the autocommit variable to\nzero, changes to transaction-safe tables (such as those for InnoDB or\nNDB) are not made permanent immediately. You must use COMMIT to store\nyour changes to disk or ROLLBACK to ignore the changes.\n\nautocommit is a session variable and must be set for each session. To\ndisable autocommit mode for each new connection, see the description of\nthe autocommit system variable at\nhttps://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html.\n\nBEGIN and BEGIN WORK are supported as aliases of START TRANSACTION for\ninitiating a transaction. START TRANSACTION is standard SQL syntax, is\nthe recommended way to start an ad-hoc transaction, and permits\nmodifiers that BEGIN does not.\n\nThe BEGIN statement differs from the use of the BEGIN keyword that\nstarts a BEGIN ... END compound statement. The latter does not begin a\ntransaction. See [HELP BEGIN END].\n\n*Note*:\n\nWithin all stored programs (stored procedures and functions, triggers,\nand events), the parser treats BEGIN [WORK] as the beginning of a BEGIN\n... END block. Begin a transaction in this context with START\nTRANSACTION instead.\n\nThe optional WORK keyword is supported for COMMIT and ROLLBACK, as are\nthe CHAIN and RELEASE clauses. CHAIN and RELEASE can be used for\nadditional control over transaction completion. The value of the\ncompletion_type system variable determines the default completion\nbehavior. See\nhttps://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html.\n\nThe AND CHAIN clause causes a new transaction to begin as soon as the\ncurrent one ends, and the new transaction has the same isolation level\nas the just-terminated transaction. The new transaction also uses the\nsame access mode (READ WRITE or READ ONLY) as the just-terminated\ntransaction. The RELEASE clause causes the server to disconnect the\ncurrent client session after terminating the current transaction.\nIncluding the NO keyword suppresses CHAIN or RELEASE completion, which\ncan be useful if the completion_type system variable is set to cause\nchaining or release completion by default.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/commit.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/commit.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (563,42,'ROLLBACK','Syntax:\nSTART TRANSACTION\n    [transaction_characteristic [, transaction_characteristic] ...]\n\ntransaction_characteristic: {\n    WITH CONSISTENT SNAPSHOT\n  | READ WRITE\n  | READ ONLY\n}\n\nBEGIN [WORK]\nCOMMIT [WORK] [AND [NO] CHAIN] [[NO] RELEASE]\nROLLBACK [WORK] [AND [NO] CHAIN] [[NO] RELEASE]\nSET autocommit = {0 | 1}\n\nThese statements provide control over use of transactions:\n\no START TRANSACTION or BEGIN start a new transaction.\n\no COMMIT commits the current transaction, making its changes permanent.\n\no ROLLBACK rolls back the current transaction, canceling its changes.\n\no SET autocommit disables or enables the default autocommit mode for\n  the current session.\n\nBy default, MySQL runs with autocommit mode enabled. This means that,\nwhen not otherwise inside a transaction, each statement is atomic, as\nif it were surrounded by START TRANSACTION and COMMIT. You cannot use\nROLLBACK to undo the effect; however, if an error occurs during\nstatement execution, the statement is rolled back.\n\nTo disable autocommit mode implicitly for a single series of\nstatements, use the START TRANSACTION statement:\n\nSTART TRANSACTION;\nSELECT @A:=SUM(salary) FROM table1 WHERE type=1;\nUPDATE table2 SET summary=@A WHERE type=1;\nCOMMIT;\n\nWith START TRANSACTION, autocommit remains disabled until you end the\ntransaction with COMMIT or ROLLBACK. The autocommit mode then reverts\nto its previous state.\n\nSTART TRANSACTION permits several modifiers that control transaction\ncharacteristics. To specify multiple modifiers, separate them by\ncommas.\n\no The WITH CONSISTENT SNAPSHOT modifier starts a consistent read for\n  storage engines that are capable of it. This applies only to InnoDB.\n  The effect is the same as issuing a START TRANSACTION followed by a\n  SELECT from any InnoDB table. See\n  https://dev.mysql.com/doc/refman/8.0/en/innodb-consistent-read.html.\n  The WITH CONSISTENT SNAPSHOT modifier does not change the current\n  transaction isolation level, so it provides a consistent snapshot\n  only if the current isolation level is one that permits a consistent\n  read. The only isolation level that permits a consistent read is\n  REPEATABLE READ. For all other isolation levels, the WITH CONSISTENT\n  SNAPSHOT clause is ignored. A warning is generated when the WITH\n  CONSISTENT SNAPSHOT clause is ignored.\n\no The READ WRITE and READ ONLY modifiers set the transaction access\n  mode. They permit or prohibit changes to tables used in the\n  transaction. The READ ONLY restriction prevents the transaction from\n  modifying or locking both transactional and nontransactional tables\n  that are visible to other transactions; the transaction can still\n  modify or lock temporary tables.\n\n  MySQL enables extra optimizations for queries on InnoDB tables when\n  the transaction is known to be read-only. Specifying READ ONLY\n  ensures these optimizations are applied in cases where the read-only\n  status cannot be determined automatically. See\n  https://dev.mysql.com/doc/refman/8.0/en/innodb-performance-ro-txn.htm\n  l for more information.\n\n  If no access mode is specified, the default mode applies. Unless the\n  default has been changed, it is read/write. It is not permitted to\n  specify both READ WRITE and READ ONLY in the same statement.\n\n  In read-only mode, it remains possible to change tables created with\n  the TEMPORARY keyword using DML statements. Changes made with DDL\n  statements are not permitted, just as with permanent tables.\n\n  For additional information about transaction access mode, including\n  ways to change the default mode, see [HELP SET TRANSACTION].\n\n  If the read_only system variable is enabled, explicitly starting a\n  transaction with START TRANSACTION READ WRITE requires the\n  CONNECTION_ADMIN privilege (or the deprecated SUPER privilege).\n\n*Important*:\n\nMany APIs used for writing MySQL client applications (such as JDBC)\nprovide their own methods for starting transactions that can (and\nsometimes should) be used instead of sending a START TRANSACTION\nstatement from the client. See\nhttps://dev.mysql.com/doc/refman/8.0/en/connectors-apis.html, or the\ndocumentation for your API, for more information.\n\nTo disable autocommit mode explicitly, use the following statement:\n\nSET autocommit=0;\n\nAfter disabling autocommit mode by setting the autocommit variable to\nzero, changes to transaction-safe tables (such as those for InnoDB or\nNDB) are not made permanent immediately. You must use COMMIT to store\nyour changes to disk or ROLLBACK to ignore the changes.\n\nautocommit is a session variable and must be set for each session. To\ndisable autocommit mode for each new connection, see the description of\nthe autocommit system variable at\nhttps://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html.\n\nBEGIN and BEGIN WORK are supported as aliases of START TRANSACTION for\ninitiating a transaction. START TRANSACTION is standard SQL syntax, is\nthe recommended way to start an ad-hoc transaction, and permits\nmodifiers that BEGIN does not.\n\nThe BEGIN statement differs from the use of the BEGIN keyword that\nstarts a BEGIN ... END compound statement. The latter does not begin a\ntransaction. See [HELP BEGIN END].\n\n*Note*:\n\nWithin all stored programs (stored procedures and functions, triggers,\nand events), the parser treats BEGIN [WORK] as the beginning of a BEGIN\n... END block. Begin a transaction in this context with START\nTRANSACTION instead.\n\nThe optional WORK keyword is supported for COMMIT and ROLLBACK, as are\nthe CHAIN and RELEASE clauses. CHAIN and RELEASE can be used for\nadditional control over transaction completion. The value of the\ncompletion_type system variable determines the default completion\nbehavior. See\nhttps://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html.\n\nThe AND CHAIN clause causes a new transaction to begin as soon as the\ncurrent one ends, and the new transaction has the same isolation level\nas the just-terminated transaction. The new transaction also uses the\nsame access mode (READ WRITE or READ ONLY) as the just-terminated\ntransaction. The RELEASE clause causes the server to disconnect the\ncurrent client session after terminating the current transaction.\nIncluding the NO keyword suppresses CHAIN or RELEASE completion, which\ncan be useful if the completion_type system variable is set to cause\nchaining or release completion by default.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/commit.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/commit.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (564,42,'SAVEPOINT','Syntax:\nSAVEPOINT identifier\nROLLBACK [WORK] TO [SAVEPOINT] identifier\nRELEASE SAVEPOINT identifier\n\nInnoDB supports the SQL statements SAVEPOINT, ROLLBACK TO SAVEPOINT,\nRELEASE SAVEPOINT and the optional WORK keyword for ROLLBACK.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/savepoint.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/savepoint.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (565,42,'ROLLBACK TO SAVEPOINT','Syntax:\nSAVEPOINT identifier\nROLLBACK [WORK] TO [SAVEPOINT] identifier\nRELEASE SAVEPOINT identifier\n\nInnoDB supports the SQL statements SAVEPOINT, ROLLBACK TO SAVEPOINT,\nRELEASE SAVEPOINT and the optional WORK keyword for ROLLBACK.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/savepoint.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/savepoint.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (566,42,'RELEASE SAVEPOINT','Syntax:\nSAVEPOINT identifier\nROLLBACK [WORK] TO [SAVEPOINT] identifier\nRELEASE SAVEPOINT identifier\n\nInnoDB supports the SQL statements SAVEPOINT, ROLLBACK TO SAVEPOINT,\nRELEASE SAVEPOINT and the optional WORK keyword for ROLLBACK.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/savepoint.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/savepoint.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (567,42,'LOCK INSTANCE FOR BACKUP','Syntax:\nLOCK INSTANCE FOR BACKUP\n\nUNLOCK INSTANCE\n\nLOCK INSTANCE FOR BACKUP acquires an instance-level backup lock that\npermits DML during an online backup while preventing operations that\ncould result in an inconsistent snapshot.\n\nExecuting the LOCK INSTANCE FOR BACKUP statement requires the\nBACKUP_ADMIN privilege. The BACKUP_ADMIN privilege is automatically\ngranted to users with the RELOAD privilege when performing an in-place\nupgrade to MySQL 8.0 from an earlier version.\n\nMultiple sessions can hold a backup lock simultaneously.\n\nUNLOCK INSTANCE releases a backup lock held by the current session. A\nbackup lock held by a session is also released if the session is\nterminated.\n\nLOCK INSTANCE FOR BACKUP prevents files from being created, renamed, or\nremoved. REPAIR TABLE TRUNCATE TABLE, OPTIMIZE TABLE, and account\nmanagement statements are blocked. See\nhttps://dev.mysql.com/doc/refman/8.0/en/account-management-statements.h\ntml. Operations that modify InnoDB files that are not recorded in the\nInnoDB redo log are also blocked.\n\nLOCK INSTANCE FOR BACKUP permits DDL operations that only affect\nuser-created temporary tables. In effect, files that belong to\nuser-created temporary tables can be created, renamed, or removed while\na backup lock is held. Creation of binary log files is also permitted.\n\nA backup lock acquired by LOCK INSTANCE FOR BACKUP is independent of\ntransactional locks and locks taken by FLUSH TABLES tbl_name [,\ntbl_name] ... WITH READ LOCK, and the following sequences of statements\nare permitted:\n\nLOCK INSTANCE FOR BACKUP;\nFLUSH TABLES tbl_name [, tbl_name] ... WITH READ LOCK;\nUNLOCK TABLES;\nUNLOCK INSTANCE;\n\nFLUSH TABLES tbl_name [, tbl_name] ... WITH READ LOCK;\nLOCK INSTANCE FOR BACKUP;\nUNLOCK INSTANCE;\nUNLOCK TABLES;\n\nThe lock_wait_timeout setting defines the amount of time that a LOCK\nINSTANCE FOR BACKUP statement waits to acquire a lock before giving up.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/lock-instance-for-backup.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/lock-instance-for-backup.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (568,42,'LOCK TABLES','Syntax:\nLOCK TABLES\n    tbl_name [[AS] alias] lock_type\n    [, tbl_name [[AS] alias] lock_type] ...\n\nlock_type: {\n    READ [LOCAL]\n  | [LOW_PRIORITY] WRITE\n}\n\nUNLOCK TABLES\n\nMySQL enables client sessions to acquire table locks explicitly for the\npurpose of cooperating with other sessions for access to tables, or to\nprevent other sessions from modifying tables during periods when a\nsession requires exclusive access to them. A session can acquire or\nrelease locks only for itself. One session cannot acquire locks for\nanother session or release locks held by another session.\n\nLocks may be used to emulate transactions or to get more speed when\nupdating tables. This is explained in more detail in\nhttps://dev.mysql.com/doc/refman/8.0/en/lock-tables.html#lock-tables-re\nstrictions.\n\nLOCK TABLES explicitly acquires table locks for the current client\nsession. Table locks can be acquired for base tables or views. You must\nhave the LOCK TABLES privilege, and the SELECT privilege for each\nobject to be locked.\n\nFor view locking, LOCK TABLES adds all base tables used in the view to\nthe set of tables to be locked and locks them automatically. For tables\nunderlying any view being locked, LOCK TABLES checks that the view\ndefiner (for SQL SECURITY DEFINER views) or invoker (for all views) has\nthe proper privileges on the tables.\n\nIf you lock a table explicitly with LOCK TABLES, any tables used in\ntriggers are also locked implicitly, as described in\nhttps://dev.mysql.com/doc/refman/8.0/en/lock-tables.html#lock-tables-an\nd-triggers.\n\nIf you lock a table explicitly with LOCK TABLES, any tables related by\na foreign key constraint are opened and locked implicitly. For foreign\nkey checks, a shared read-only lock (LOCK TABLES READ) is taken on\nrelated tables. For cascading updates, a shared-nothing write lock\n(LOCK TABLES WRITE) is taken on related tables that are involved in the\noperation.\n\nUNLOCK TABLES explicitly releases any table locks held by the current\nsession. LOCK TABLES implicitly releases any table locks held by the\ncurrent session before acquiring new locks.\n\nAnother use for UNLOCK TABLES is to release the global read lock\nacquired with the FLUSH TABLES WITH READ LOCK statement, which enables\nyou to lock all tables in all databases. See [HELP FLUSH]. (This is a\nvery convenient way to get backups if you have a file system such as\nVeritas that can take snapshots in time.)\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/lock-tables.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/lock-tables.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (569,42,'SET TRANSACTION','Syntax:\nSET [GLOBAL | SESSION] TRANSACTION\n    transaction_characteristic [, transaction_characteristic] ...\n\ntransaction_characteristic: {\n    ISOLATION LEVEL level\n  | access_mode\n}\n\nlevel: {\n     REPEATABLE READ\n   | READ COMMITTED\n   | READ UNCOMMITTED\n   | SERIALIZABLE\n}\n\naccess_mode: {\n     READ WRITE\n   | READ ONLY\n}\n\nThis statement specifies transaction characteristics. It takes a list\nof one or more characteristic values separated by commas. Each\ncharacteristic value sets the transaction isolation level or access\nmode. The isolation level is used for operations on InnoDB tables. The\naccess mode specifies whether transactions operate in read/write or\nread-only mode.\n\nIn addition, SET TRANSACTION can include an optional GLOBAL or SESSION\nkeyword to indicate the scope of the statement.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/set-transaction.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/set-transaction.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (570,42,'XA','Syntax:\nXA {START|BEGIN} xid [JOIN|RESUME]\n\nXA END xid [SUSPEND [FOR MIGRATE]]\n\nXA PREPARE xid\n\nXA COMMIT xid [ONE PHASE]\n\nXA ROLLBACK xid\n\nXA RECOVER [CONVERT XID]\n\nFor XA START, the JOIN and RESUME clauses are recognized but have no\neffect.\n\nFor XA END the SUSPEND [FOR MIGRATE] clause is recognized but has no\neffect.\n\nEach XA statement begins with the XA keyword, and most of them require\nan xid value. An xid is an XA transaction identifier. It indicates\nwhich transaction the statement applies to. xid values are supplied by\nthe client, or generated by the MySQL server. An xid value has from one\nto three parts:\n\nxid: gtrid [, bqual [, formatID ]]\n\ngtrid is a global transaction identifier, bqual is a branch qualifier,\nand formatID is a number that identifies the format used by the gtrid\nand bqual values. As indicated by the syntax, bqual and formatID are\noptional. The default bqual value is \'\' if not given. The default\nformatID value is 1 if not given.\n\ngtrid and bqual must be string literals, each up to 64 bytes (not\ncharacters) long. gtrid and bqual can be specified in several ways. You\ncan use a quoted string (\'ab\'), hex string (X\'6162\', 0x6162), or bit\nvalue (b\'nnnn\').\n\nformatID is an unsigned integer.\n\nThe gtrid and bqual values are interpreted in bytes by the MySQL\nserver\'s underlying XA support routines. However, while an SQL\nstatement containing an XA statement is being parsed, the server works\nwith some specific character set. To be safe, write gtrid and bqual as\nhex strings.\n\nxid values typically are generated by the Transaction Manager. Values\ngenerated by one TM must be different from values generated by other\nTMs. A given TM must be able to recognize its own xid values in a list\nof values returned by the XA RECOVER statement.\n\nXA START xid starts an XA transaction with the given xid value. Each XA\ntransaction must have a unique xid value, so the value must not\ncurrently be used by another XA transaction. Uniqueness is assessed\nusing the gtrid and bqual values. All following XA statements for the\nXA transaction must be specified using the same xid value as that given\nin the XA START statement. If you use any of those statements but\nspecify an xid value that does not correspond to some existing XA\ntransaction, an error occurs.\n\nOne or more XA transactions can be part of the same global transaction.\nAll XA transactions within a given global transaction must use the same\ngtrid value in the xid value. For this reason, gtrid values must be\nglobally unique so that there is no ambiguity about which global\ntransaction a given XA transaction is part of. The bqual part of the\nxid value must be different for each XA transaction within a global\ntransaction. (The requirement that bqual values be different is a\nlimitation of the current MySQL XA implementation. It is not part of\nthe XA specification.)\n\nThe XA RECOVER statement returns information for those XA transactions\non the MySQL server that are in the PREPARED state. (See\nhttps://dev.mysql.com/doc/refman/8.0/en/xa-states.html.) The output\nincludes a row for each such XA transaction on the server, regardless\nof which client started it.\n\nXA RECOVER requires the XA_RECOVER_ADMIN privilege. This privilege\nrequirement prevents users from discovering the XID values for\noutstanding prepared XA transactions other than their own. It does not\naffect normal commit or rollback of an XA transaction because the user\nwho started it knows its XID.\n\nXA RECOVER output rows look like this (for an example xid value\nconsisting of the parts \'abc\', \'def\', and 7):\n\nmysql> XA RECOVER;\n+----------+--------------+--------------+--------+\n| formatID | gtrid_length | bqual_length | data   |\n+----------+--------------+--------------+--------+\n|        7 |            3 |            3 | abcdef |\n+----------+--------------+--------------+--------+\n\nThe output columns have the following meanings:\n\no formatID is the formatID part of the transaction xid\n\no gtrid_length is the length in bytes of the gtrid part of the xid\n\no bqual_length is the length in bytes of the bqual part of the xid\n\no data is the concatenation of the gtrid and bqual parts of the xid\n\nXID values may contain nonprintable characters. XA RECOVER permits an\noptional CONVERT XID clause so that clients can request XID values in\nhexadecimal.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/xa-statements.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/xa-statements.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (571,43,'PURGE BINARY LOGS','Syntax:\nPURGE { BINARY | MASTER } LOGS {\n    TO \'log_name\'\n  | BEFORE datetime_expr\n}\n\nThe binary log is a set of files that contain information about data\nmodifications made by the MySQL server. The log consists of a set of\nbinary log files, plus an index file (see\nhttps://dev.mysql.com/doc/refman/8.0/en/binary-log.html).\n\nThe PURGE BINARY LOGS statement deletes all the binary log files listed\nin the log index file prior to the specified log file name or date.\nBINARY and MASTER are synonyms. Deleted log files also are removed from\nthe list recorded in the index file, so that the given log file becomes\nthe first in the list.\n\nPURGE BINARY LOGS requires the BINLOG_ADMIN privilege. This statement\nhas no effect if the server was not started with the --log-bin option\nto enable binary logging.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/purge-binary-logs.html\n\n','PURGE BINARY LOGS TO \'mysql-bin.010\';\nPURGE BINARY LOGS BEFORE \'2019-04-02 22:46:26\';\n','https://dev.mysql.com/doc/refman/8.0/en/purge-binary-logs.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (572,43,'PURGE MASTER LOGS','Syntax:\nPURGE { BINARY | MASTER } LOGS {\n    TO \'log_name\'\n  | BEFORE datetime_expr\n}\n\nThe binary log is a set of files that contain information about data\nmodifications made by the MySQL server. The log consists of a set of\nbinary log files, plus an index file (see\nhttps://dev.mysql.com/doc/refman/8.0/en/binary-log.html).\n\nThe PURGE BINARY LOGS statement deletes all the binary log files listed\nin the log index file prior to the specified log file name or date.\nBINARY and MASTER are synonyms. Deleted log files also are removed from\nthe list recorded in the index file, so that the given log file becomes\nthe first in the list.\n\nPURGE BINARY LOGS requires the BINLOG_ADMIN privilege. This statement\nhas no effect if the server was not started with the --log-bin option\nto enable binary logging.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/purge-binary-logs.html\n\n','PURGE BINARY LOGS TO \'mysql-bin.010\';\nPURGE BINARY LOGS BEFORE \'2019-04-02 22:46:26\';\n','https://dev.mysql.com/doc/refman/8.0/en/purge-binary-logs.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (573,43,'RESET MASTER','Syntax:\nRESET MASTER [TO binary_log_file_index_number]\n\n*Warning*:\n\nUse this statement with caution to ensure you do not lose any wanted\nbinary log file data and GTID execution history.\n\nRESET MASTER requires the RELOAD privilege.\n\nFor a server where binary logging is enabled (log_bin is ON), RESET\nMASTER deletes all existing binary log files and resets the binary log\nindex file, resetting the server to its state before binary logging was\nstarted. A new empty binary log file is created so that binary logging\ncan be restarted.\n\nFor a server where GTIDs are in use (gtid_mode is ON), issuing RESET\nMASTER resets the GTID execution history. The value of the gtid_purged\nsystem variable is set to an empty string (\'\'), the global value (but\nnot the session value) of the gtid_executed system variable is set to\nan empty string, and the mysql.gtid_executed table is cleared (see\nhttps://dev.mysql.com/doc/refman/8.0/en/replication-gtids-concepts.html\n#replication-gtids-gtid-executed-table). If the GTID-enabled server has\nbinary logging enabled, RESET MASTER also resets the binary log as\ndescribed above. Note that RESET MASTER is the method to reset the GTID\nexecution history even if the GTID-enabled server is a replica where\nbinary logging is disabled; RESET REPLICA has no effect on the GTID\nexecution history. For more information on resetting the GTID execution\nhistory, see\nhttps://dev.mysql.com/doc/refman/8.0/en/replication-gtids-lifecycle.htm\nl#replication-gtids-execution-history.\n\nIssuing RESET MASTER without the optional TO clause deletes all binary\nlog files listed in the index file, resets the binary log index file to\nbe empty, and creates a new binary log file starting at 1. Use the\noptional TO clause to start the binary log file index from a number\nother than 1 after the reset.\n\nUsing RESET MASTER with the TO clause to specify a binary log file\nindex number to start from simplifies failover by providing a single\nstatement alternative to the FLUSH BINARY LOGS and PURGE BINARY LOGS TO\nstatements. Check that you are using a reasonable value for the index\nnumber. If you enter an incorrect value, you can correct this by\nissuing another RESET MASTER statement with or without the TO clause.\nIf you do not correct a value that is out of range, the server cannot\nbe restarted.\n\nThe following example demonstrates TO clause usage:\n\nRESET MASTER TO 1234;\n\nSHOW BINARY LOGS;\n+-------------------+-----------+-----------+\n| Log_name          | File_size | Encrypted |\n+-------------------+-----------+-----------+\n| source-bin.001234 |       154 | No        |\n+-------------------+-----------+-----------+\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/reset-master.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/reset-master.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (574,43,'SET SQL_LOG_BIN','Syntax:\nSET sql_log_bin = {OFF|ON}\n\nThe sql_log_bin variable controls whether logging to the binary log is\nenabled for the current session (assuming that the binary log itself is\nenabled). The default value is ON. To disable or enable binary logging\nfor the current session, set the session sql_log_bin variable to OFF or\nON.\n\nSet this variable to OFF for a session to temporarily disable binary\nlogging while making changes to the source that you do not want\nreplicated to the replica.\n\nSetting the session value of this system variable is a restricted\noperation. The session user must have privileges sufficient to set\nrestricted session variables. See\nhttps://dev.mysql.com/doc/refman/8.0/en/system-variable-privileges.html\n.\n\nIt is not possible to set the session value of sql_log_bin within a\ntransaction or subquery.\n\nSetting this variable to OFF prevents new GTIDs from being assigned to\ntransactions in the binary log. If you are using GTIDs for replication,\nthis means that even when binary logging is later enabled again, the\nGTIDs written into the log from this point do not account for any\ntransactions that occurred in the meantime, so in effect those\ntransactions are lost.\n\nmysqldump adds a SET @@SESSION.sql_log_bin=0 statement to a dump file\nfrom a server where GTIDs are in use, which disables binary logging\nwhile the dump file is being reloaded. The statement prevents new GTIDs\nfrom being generated and assigned to the transactions in the dump file\nas they are executed, so that the original GTIDs for the transactions\nare used.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/set-sql-log-bin.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/set-sql-log-bin.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (575,43,'CHANGE MASTER TO','Syntax:\nCHANGE MASTER TO option [, option] ... [ channel_option ]\n\noption: {\n    MASTER_BIND = \'interface_name\'\n  | MASTER_HOST = \'host_name\'\n  | MASTER_USER = \'user_name\'\n  | MASTER_PASSWORD = \'password\'\n  | MASTER_PORT = port_num\n  | PRIVILEGE_CHECKS_USER = {\'account\' | NULL}\n  | REQUIRE_ROW_FORMAT = {0|1}\n  | REQUIRE_TABLE_PRIMARY_KEY_CHECK = {STREAM | ON | OFF}\n  | ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS = {OFF | LOCAL | uuid}\n  | MASTER_LOG_FILE = \'source_log_name\'\n  | MASTER_LOG_POS = source_log_pos\n  | MASTER_AUTO_POSITION = {0|1}\n  | RELAY_LOG_FILE = \'relay_log_name\'\n  | RELAY_LOG_POS = relay_log_pos\n  | MASTER_HEARTBEAT_PERIOD = interval\n  | MASTER_CONNECT_RETRY = interval\n  | MASTER_RETRY_COUNT = count\n  | SOURCE_CONNECTION_AUTO_FAILOVER = {0|1}\n  | MASTER_DELAY = interval\n  | MASTER_COMPRESSION_ALGORITHMS = \'value\'\n  | MASTER_ZSTD_COMPRESSION_LEVEL = level\n  | MASTER_SSL = {0|1}\n  | MASTER_SSL_CA = \'ca_file_name\'\n  | MASTER_SSL_CAPATH = \'ca_directory_name\'\n  | MASTER_SSL_CERT = \'cert_file_name\'\n  | MASTER_SSL_CRL = \'crl_file_name\'\n  | MASTER_SSL_CRLPATH = \'crl_directory_name\'\n  | MASTER_SSL_KEY = \'key_file_name\'\n  | MASTER_SSL_CIPHER = \'cipher_list\'\n  | MASTER_SSL_VERIFY_SERVER_CERT = {0|1}\n  | MASTER_TLS_VERSION = \'protocol_list\'\n  | MASTER_TLS_CIPHERSUITES = \'ciphersuite_list\'\n  | MASTER_PUBLIC_KEY_PATH = \'key_file_name\'\n  | GET_MASTER_PUBLIC_KEY = {0|1}\n  | NETWORK_NAMESPACE = \'namespace\'\n  | IGNORE_SERVER_IDS = (server_id_list)\n}\n\nchannel_option:\n    FOR CHANNEL channel\n\nserver_id_list:\n    [server_id [, server_id] ... ]\n\nCHANGE MASTER TO changes the parameters that the replica server uses\nfor connecting to the source and for reading data from the source. It\nalso updates the contents of the replication metadata repositories (see\nhttps://dev.mysql.com/doc/refman/8.0/en/replica-logs.html). From MySQL\n8.0.23, use CHANGE REPLICATION SOURCE TO in place of CHANGE MASTER TO,\nwhich is deprecated from that release. In releases before MySQL 8.0.23,\nuse CHANGE MASTER TO.\n\nYou can issue CHANGE MASTER TO statements on a running replica without\nfirst stopping it, depending on the states of the replication SQL\nthread and replication I/O (receiver) thread. The rules governing such\nuse are provided later in this section. CHANGE MASTER TO requires the\nREPLICATION_SLAVE_ADMIN privilege (or the deprecated SUPER privilege).\n\nWhen using a multithreaded replica (replica_parallel_workers or\nslave_parallel_workers > 0), stopping the replica can cause gaps in the\nsequence of transactions that have been executed from the relay log,\nregardless of whether the replica was stopped intentionally or\notherwise. When such gaps exist, issuing CHANGE MASTER TO fails. The\nsolution in this situation is to issue START REPLICA UNTIL\nSQL_AFTER_MTS_GAPS which ensures that the gaps are closed. From MySQL\n8.0.26, the process of checking for gaps in the sequence of\ntransactions is skipped entirely when GTID-based replication and GTID\nauto-positioning are in use, because gaps in transactions can be\nresolved using GTID auto-positioning. In that situation, CHANGE MASTER\nTO can still be used.\n\nThe optional FOR CHANNEL channel clause enables you to name which\nreplication channel the statement applies to. Providing a FOR CHANNEL\nchannel clause applies the CHANGE MASTER TO statement to a specific\nreplication channel, and is used to add a new channel or modify an\nexisting channel. For example, to add a new channel called channel2:\n\nCHANGE MASTER TO MASTER_HOST=host1, MASTER_PORT=3002 FOR CHANNEL \'channel2\'\n\nIf no clause is named and no extra channels exist, the statement\napplies to the default channel.\n\nWhen using multiple replication channels, if a CHANGE MASTER TO\nstatement does not name a channel using a FOR CHANNEL channel clause,\nan error occurs. See\nhttps://dev.mysql.com/doc/refman/8.0/en/replication-channels.html for\nmore information.\n\nValues used for MASTER_HOST and other CHANGE MASTER TO options are\nchecked for linefeed (\\n or 0x0A) characters. The presence of such\ncharacters in these values causes the statement to fail with\nER_MASTER_INFO\n(https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference.h\ntml#error_er_master_info).\n\nInvoking CHANGE MASTER TO causes the previous values for MASTER_HOST,\nMASTER_PORT, MASTER_LOG_FILE, and MASTER_LOG_POS to be written to the\nerror log, along with other information about the replica\'s state prior\nto execution.\n\nCHANGE MASTER TO causes an implicit commit of an ongoing transaction.\nSee https://dev.mysql.com/doc/refman/8.0/en/implicit-commit.html.\n\nFor some of the options of the CHANGE MASTER TO statement, you must\nissue a STOP REPLICA statement prior to issuing a CHANGE MASTER TO\nstatement (and a START REPLICA statement afterwards). Sometimes, you\nonly need to stop the replication SQL (applier) thread or the\nreplication I/O (receiver) thread, not both:\n\no When the SQL thread is stopped, you can execute CHANGE MASTER TO\n  using any combination that is otherwise allowed of RELAY_LOG_FILE,\n  RELAY_LOG_POS, and MASTER_DELAY options, even if the replication I/O\n  (receiver) thread is running. No other options may be used with this\n  statement when the receiver thread is running.\n\no When the receiver thread is stopped, you can execute CHANGE MASTER TO\n  using any of the options for this statement (in any allowed\n  combination) except RELAY_LOG_FILE, RELAY_LOG_POS, MASTER_DELAY, or\n  MASTER_AUTO_POSITION = 1 even when the SQL thread is running.\n\no Both the applier thread and the receiver thread must be stopped\n  before issuing a CHANGE MASTER TO statement that employs\n  MASTER_AUTO_POSITION = 1 or ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS.\n\nYou can check the current state of the replication applier thread and\nreplication receiver thread using SHOW REPLICA STATUS. Note that the\nGroup Replication applier channel (group_replication_applier) has no\nreceiver thread, only an applier thread.\n\nFor more information, see\nhttps://dev.mysql.com/doc/refman/8.0/en/replication-solutions-switch.ht\nml.\n\nIf you are using statement-based replication and temporary tables, it\nis possible for a CHANGE MASTER TO statement following a STOP REPLICA\nstatement to leave behind temporary tables on the replica. A warning\n(ER_WARN_OPEN_TEMP_TABLES_MUST_BE_ZERO\n(https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference.h\ntml#error_er_warn_open_temp_tables_must_be_zero)) is now issued\nwhenever this occurs. You can avoid this in such cases by making sure\nthat the value of the Replica_open_temp_tables or\nSlave_open_temp_tables system status variable is equal to 0 prior to\nexecuting such a CHANGE MASTER TO statement.\n\nCHANGE MASTER TO is useful for setting up a replica when you have the\nsnapshot of the source and have recorded the source\'s binary log\ncoordinates corresponding to the time of the snapshot. After loading\nthe snapshot into the replica to synchronize it with the source, you\ncan run CHANGE MASTER TO MASTER_LOG_FILE=\'log_name\',\nMASTER_LOG_POS=log_pos on the replica to specify the coordinates at\nwhich the replica should begin reading the source\'s binary log.\n\nThe following example changes the source server the replica uses and\nestablishes the source\'s binary log coordinates from which the replica\nbegins reading:\n\nCHANGE MASTER TO\n  MASTER_HOST=\'source2.example.com\',\n  MASTER_USER=\'replication\',\n  MASTER_PASSWORD=\'password\',\n  MASTER_PORT=3306,\n  MASTER_LOG_FILE=\'source2-bin.001\',\n  MASTER_LOG_POS=4,\n  MASTER_CONNECT_RETRY=10;\n\nThe next example shows an operation that is less frequently employed.\nIt is used when the replica has relay log files that you want it to\nexecute again for some reason. To do this, the source need not be\nreachable. You need only use CHANGE MASTER TO and start the SQL thread\n(START REPLICA SQL_THREAD):\n\nCHANGE MASTER TO\n  RELAY_LOG_FILE=\'replica-relay-bin.006\',\n  RELAY_LOG_POS=4025;\n\nOptions that you do not specify on a CHANGE MASTER TO statement retain\ntheir value, except as indicated in the following discussion. Thus, in\nmost cases, there is no need to specify options that do not change.\n\no ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS\n\n  Makes the replication channel assign a GTID to replicated\n  transactions that do not have one, enabling replication from a source\n  that does not use GTID-based replication, to a replica that does. For\n  a multi-source replica, you can have a mix of channels that use\n  ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS, and channels that do not. The\n  default is OFF, meaning that the feature is not used.\n\n  LOCAL assigns a GTID including the replica\'s own UUID (the\n  server_uuid setting). uuid assigns a GTID including the specified\n  UUID, such as the server_uuid setting for the replication source\n  server. Using a nonlocal UUID lets you differentiate between\n  transactions that originated on the replica and transactions that\n  originated on the source, and for a multi-source replica, between\n  transactions that originated on different sources. The UUID you\n  choose only has significance for the replica\'s own use. If any of the\n  transactions sent by the source do have a GTID already, that GTID is\n  retained.\n\n  Channels specific to Group Replication cannot use\n  ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS, but an asynchronous\n  replication channel for another source on a server instance that is a\n  Group Replication group member can do so. In that case, do not\n  specify the Group Replication group name as the UUID for creating the\n  GTIDs.\n\n  To set ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS to LOCAL or uuid, the\n  replica must have gtid_mode=ON set, and this cannot be changed\n  afterwards. This option is for use with a source that has binary log\n  file position based replication, so MASTER_AUTO_POSITION=1 cannot be\n  set for the channel. Both the replication SQL thread and the\n  replication I/O (receiver) thread must be stopped before setting this\n  option.\n\n  *Important*:\n\n  A replica set up with ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS on any\n  channel cannot be promoted to replace the replication source server\n  in the event that a failover is required, and a backup taken from the\n  replica cannot be used to restore the replication source server. The\n  same restriction applies to replacing or restoring other replicas\n  that use ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS on any channel.\n\n  For further restrictions and information, see\n  https://dev.mysql.com/doc/refman/8.0/en/replication-gtids-assign-anon\n  .html.\n\no GET_MASTER_PUBLIC_KEY\n\n  Enables RSA key pair-based password exchange by requesting the public\n  key from the source. This option applies to replicas that\n  authenticate with the caching_sha2_password authentication plugin.\n  For connections by accounts that authenticate using this plugin, the\n  source does not send the public key unless requested, so it must be\n  requested or specified in the client. If MASTER_PUBLIC_KEY_PATH is\n  given and specifies a valid public key file, it takes precedence over\n  GET_MASTER_PUBLIC_KEY. If you are using a replication user account\n  that authenticates with the caching_sha2_password plugin (which is\n  the default from MySQL 8.0), and you are not using a secure\n  connection, you must specify either this option or the\n  MASTER_PUBLIC_KEY_PATH option to provide the RSA public key to the\n  replica.\n\no IGNORE_SERVER_IDS\n\n  Makes the replica ignore events originating from the specified\n  servers. The option takes a comma-separated list of 0 or more server\n  IDs. Log rotation and deletion events from the servers are not\n  ignored, and are recorded in the relay log.\n\n  In circular replication, the originating server normally acts as the\n  terminator of its own events, so that they are not applied more than\n  once. Thus, this option is useful in circular replication when one of\n  the servers in the circle is removed. Suppose that you have a\n  circular replication setup with 4 servers, having server IDs 1, 2, 3,\n  and 4, and server 3 fails. When bridging the gap by starting\n  replication from server 2 to server 4, you can include\n  IGNORE_SERVER_IDS = (3) in the CHANGE MASTER TO statement that you\n  issue on server 4 to tell it to use server 2 as its source instead of\n  server 3. Doing so causes it to ignore and not to propagate any\n  statements that originated with the server that is no longer in use.\n\n  If IGNORE_SERVER_IDS contains the server\'s own ID and the server was\n  started with the --replicate-same-server-id option enabled, an error\n  results.\n\n  *Note*:\n\n  When global transaction identifiers (GTIDs) are used for replication,\n  transactions that have already been applied are automatically\n  ignored, so the IGNORE_SERVER_IDS function is not required and is\n  deprecated. If gtid_mode=ON is set for the server, a deprecation\n  warning is issued if you include the IGNORE_SERVER_IDS option in a\n  CHANGE MASTER TO statement.\n\n  The source metadata repository and the output of SHOW REPLICA STATUS\n  provide the list of servers that are currently ignored. For more\n  information, see\n  https://dev.mysql.com/doc/refman/8.0/en/replica-logs-status.html, and\n  [HELP SHOW REPLICA STATUS].\n\n  If a CHANGE MASTER TO statement is issued without any\n  IGNORE_SERVER_IDS option, any existing list is preserved. To clear\n  the list of ignored servers, it is necessary to use the option with\n  an empty list:\n\nCHANGE MASTER TO IGNORE_SERVER_IDS = ();\n\n  RESET REPLICA ALL clears IGNORE_SERVER_IDS.\n\n  *Note*:\n\n  A deprecation warning is issued if SET GTID_MODE=ON is issued when\n  any channel has existing server IDs set with IGNORE_SERVER_IDS.\n  Before starting GTID-based replication, check for and clear all\n  ignored server ID lists on the servers involved. The SHOW REPLICA\n  STATUS statement displays the list of ignored IDs, if there is one.\n  If you do receive the deprecation warning, you can still clear a list\n  after gtid_mode=ON is set by issuing a CHANGE MASTER TO statement\n  containing the IGNORE_SERVER_IDS option with an empty list.\n\no MASTER_AUTO_POSITION\n\n  Makes the replica attempt to connect to the source using the\n  auto-positioning feature of GTID-based replication, rather than a\n  binary log file based position. This option can be used with CHANGE\n  MASTER TO only if both the replication SQL (applier) thread and\n  replication I/O (receiver) thread are stopped.\n\n  Both the replica and the source must have GTIDs enabled\n  (GTID_MODE=ON, ON_PERMISSIVE, or OFF_PERMISSIVE on the replica, and\n  GTID_MODE=ON on the source). MASTER_LOG_FILE, MASTER_LOG_POS,\n  RELAY_LOG_FILE, and RELAY_LOG_POS cannot be specified together with\n  MASTER_AUTO_POSITION = 1. If multi-source replication is enabled on\n  the replica, you need to set the MASTER_AUTO_POSITION = 1 option for\n  each applicable replication channel.\n\n  With MASTER_AUTO_POSITION = 1 set, in the initial connection\n  handshake, the replica sends a GTID set containing the transactions\n  that it has already received, committed, or both. The source responds\n  by sending all transactions recorded in its binary log whose GTID is\n  not included in the GTID set sent by the replica. This exchange\n  ensures that the source only sends the transactions with a GTID that\n  the replica has not already recorded or committed. If the replica\n  receives transactions from more than one source, as in the case of a\n  diamond topology, the auto-skip function ensures that the\n  transactions are not applied twice. For details of how the GTID set\n  sent by the replica is computed, see\n  https://dev.mysql.com/doc/refman/8.0/en/replication-gtids-auto-positi\n  oning.html.\n\n  If any of the transactions that should be sent by the source have\n  been purged from the source\'s binary log, or added to the set of\n  GTIDs in the gtid_purged system variable by another method, the\n  source sends the error ER_MASTER_HAS_PURGED_REQUIRED_GTIDS to the\n  replica, and replication does not start. The GTIDs of the missing\n  purged transactions are identified and listed in the source\'s error\n  log in the warning message ER_FOUND_MISSING_GTIDS. Also, if during\n  the exchange of transactions it is found that the replica has\n  recorded or committed transactions with the source\'s UUID in the\n  GTID, but the source itself has not committed them, the source sends\n  the error ER_SLAVE_HAS_MORE_GTIDS_THAN_MASTER to the replica and\n  replication does not start. For information on how to handle these\n  situations, see\n  https://dev.mysql.com/doc/refman/8.0/en/replication-gtids-auto-positi\n  oning.html.\n\n  You can see whether replication is running with GTID auto-positioning\n  enabled by checking the Performance Schema\n  replication_connection_status table or the output of SHOW REPLICA\n  STATUS. Disabling the MASTER_AUTO_POSITION option again makes the\n  replica revert to file-based replication.\n\no MASTER_BIND\n\n  Determines which of the replica\'s network interfaces is chosen for\n  connecting to the source, for use on replicas that have multiple\n  network interfaces. The address configured with this option, if any,\n  can be seen in the Master_Bind column of the output from SHOW REPLICA\n  STATUS. In the source metadata repository table\n  mysql.slave_master_info, the value can be seen as the Master_bind\n  column. The ability to bind a replica to a specific network interface\n  is also supported by NDB Cluster.\n\no MASTER_COMPRESSION_ALGORITHMS\n\n  Specifies the permitted compression algorithms for connections to the\n  replication source server. The available algorithms are the same as\n  for the protocol_compression_algorithms system variable. The default\n  value is uncompressed. MASTER_COMPRESSION_ALGORITHMS is available as\n  of MySQL 8.0.18.\n\n  The value of MASTER_COMPRESSION_ALGORITHMS applies only if the\n  replica_compressed_protocol or slave_compressed_protocol system\n  variable is disabled. If replica_compressed_protocol or\n  slave_compressed_protocol is enabled, it takes precedence over\n  MASTER_COMPRESSION_ALGORITHMS and connections to the source use zlib\n  compression if both source and replica support that algorithm. For\n  more information, see\n  https://dev.mysql.com/doc/refman/8.0/en/connection-compression-contro\n  l.html.\n\n  Binary log transaction compression (available as of MySQL 8.0.20),\n  which is activated by the binlog_transaction_compression system\n  variable, can also be used to save bandwidth. If you do this in\n  combination with connection compression, connection compression has\n  less opportunity to act on the data, but can still compress headers\n  and those events and transaction payloads that are uncompressed. For\n  more information on binary log transaction compression, see\n  https://dev.mysql.com/doc/refman/8.0/en/binary-log-transaction-compre\n  ssion.html.\n\no MASTER_CONNECT_RETRY\n\n  Specifies the interval between the reconnection attempts that the\n  replica makes after the connection to the source times out. The\n  attempts are limited by the MASTER_RETRY_COUNT option. If both the\n  default settings are used, the replica waits 60 seconds between\n  reconnection attempts (MASTER_CONNECT_RETRY=60), and keeps attempting\n  to reconnect at this rate for 60 days (MASTER_RETRY_COUNT=86400).\n  These values are recorded in the source metadata repository and shown\n  in the replication_connection_configuration Performance Schema table.\n\no MASTER_DELAY\n\n  Specifies how many seconds behind the source the replica must lag. An\n  event received from the source is not executed until at least\n  interval seconds later than its execution on the source. The default\n  is 0. An error occurs if interval is not a nonnegative integer in the\n  range from 0 to 231−1. For more information, see\n  https://dev.mysql.com/doc/refman/8.0/en/replication-delayed.html. A\n  CHANGE MASTER TO statement employing the MASTER_DELAY option can be\n  executed on a running replica when the replication SQL thread is\n  stopped.\n\no MASTER_HEARTBEAT_PERIOD\n\n  Controls the heartbeat interval, which stops the connection timeout\n  occurring in the absence of data if the connection is still good. A\n  heartbeat signal is sent to the replica after that number of seconds,\n  and the waiting period is reset whenever the source\'s binary log is\n  updated with an event. Heartbeats are therefore sent by the source\n  only if there are no unsent events in the binary log file for a\n  period longer than this.\n\n  The heartbeat interval interval is a decimal value having the range 0\n  to 4294967 seconds and a resolution in milliseconds; the smallest\n  nonzero value is 0.001. Setting interval to 0 disables heartbeats\n  altogether. The heartbeat interval defaults to half the value of the\n  replica_net_timeout or slave_net_timeout system variable. It is\n  recorded in the source metadata repository and shown in the\n  replication_connection_configuration Performance Schema table.\n  Issuing RESET REPLICA resets the heartbeat interval to the default\n  value.\n\n  The system variable replica_net_timeout (from MySQL 8.0.26) or\n  slave_net_timeout (before MySQL 8.0.26) specifies the number of\n  seconds that the replica waits for either more data or a heartbeat\n  signal from the source, before the replica considers the connection\n  broken, aborts the read, and tries to reconnect. The default value is\n  60 seconds (one minute). Note that a change to the value or default\n  setting of replica_net_timeout or slave_net_timeout does not\n  automatically change the heartbeat interval, whether that has been\n  set explicitly or is using a previously calculated default. A warning\n  is issued if you set the global value of replica_net_timeout or\n  slave_net_timeout to a value less than that of the current heartbeat\n  interval. If replica_net_timeout or slave_net_timeout is changed, you\n  must also issue CHANGE MASTER TO to adjust the heartbeat interval to\n  an appropriate value so that the heartbeat signal occurs before the\n  connection timeout. If you do not do this, the heartbeat signal has\n  no effect, and if no data is received from the source, the replica\n  can make repeated reconnection attempts, creating zombie dump\n  threads.\n\no MASTER_HOST\n\n  The host name or IP address of the replication source server. The\n  replica uses this to connect to the source.\n\n  If you specify MASTER_HOST or MASTER_PORT, the replica assumes that\n  the source server is different from before (even if the option value\n  is the same as its current value.) In this case, the old values for\n  the source\'s binary log file name and position are considered no\n  longer applicable, so if you do not specify MASTER_LOG_FILE and\n  MASTER_LOG_POS in the statement, MASTER_LOG_FILE=\'\' and\n  MASTER_LOG_POS=4 are silently appended to it.\n\n  Setting MASTER_HOST=\'\' (that is, setting its value explicitly to an\n  empty string) is not the same as not setting MASTER_HOST at all.\n  Trying to set MASTER_HOST to an empty string fails with an error.\n\no MASTER_LOG_FILE, MASTER_LOG_POS\n\n  The binary log file name, and the location in that file, at which the\n  replication I/O (receiver) thread begins reading from the source\'s\n  binary log the next time the thread starts. Specify these options if\n  you are using binary log file position based replication.\n  MASTER_LOG_FILE must include the numeric suffix of a specific binary\n  log file that is available on the source server, for example,\n  MASTER_LOG_FILE=\'binlog.000145\'. MASTER_LOG_POS is the numeric\n  position for the replica to start reading in that file.\n  MASTER_LOG_POS=4 represents the start of the events in a binary log\n  file.\n\n  If you specify either of MASTER_LOG_FILE or MASTER_LOG_POS, you\n  cannot specify MASTER_AUTO_POSITION = 1, which is for GTID-based\n  replication.\n\n  If neither of MASTER_LOG_FILE or MASTER_LOG_POS is specified, the\n  replica uses the last coordinates of the replication SQL (applier_\n  thread before CHANGE MASTER TO was issued. This ensures that there is\n  no discontinuity in replication, even if the replication SQL\n  (applier) thread was late compared to the replication I/O (receiver)\n  thread.\n\no MASTER_PASSWORD\n\n  The password for the replication user account to use for connecting\n  to the replication source server. If you specify MASTER_PASSWORD,\n  MASTER_USER is also required.\n\n  The password used for a replication user account in a CHANGE MASTER\n  TO statement is limited to 32 characters in length. Trying to use a\n  password of more than 32 characters causes CHANGE MASTER TO to fail.\n\no MASTER_PORT\n\n  The TCP/IP port number that the replica uses to connect to the\n  replication source server.\n\n  *Note*:\n\n  Replication cannot use Unix socket files. You must be able to connect\n  to the replication source server using TCP/IP.\n\n  If you specify MASTER_HOST or MASTER_PORT, the replica assumes that\n  the source server is different from before (even if the option value\n  is the same as its current value.) In this case, the old values for\n  the source\'s binary log file name and position are considered no\n  longer applicable, so if you do not specify MASTER_LOG_FILE and\n  MASTER_LOG_POS in the statement, MASTER_LOG_FILE=\'\' and\n  MASTER_LOG_POS=4 are silently appended to it.\n\no MASTER_PUBLIC_KEY_PATH\n\n  Enables RSA key pair-based password exchange by providing the path\n  name to a file containing a replica-side copy of the public key\n  required by the source. The file must be in PEM format. This option\n  applies to replicas that authenticate with the sha256_password or\n  caching_sha2_password authentication plugin. (For sha256_password,\n  MASTER_PUBLIC_KEY_PATH can be used only if MySQL was built using\n  OpenSSL.) If you are using a replication user account that\n  authenticates with the caching_sha2_password plugin (which is the\n  default from MySQL 8.0), and you are not using a secure connection,\n  you must specify either this option or the GET_MASTER_PUBLIC_KEY=1\n  option to provide the RSA public key to the replica.\n\no MASTER_RETRY_COUNT\n\n  Sets the maximum number of reconnection attempts that the replica\n  makes after the connection to the source times out, as determined by\n  the replica_net_timeout or slave_net_timeout system variable. If the\n  replica does need to reconnect, the first retry occurs immediately\n  after the timeout. The interval between the attempts is specified by\n  the MASTER_CONNECT_RETRY option.\n\n  If both the default settings are used, the replica waits 60 seconds\n  between reconnection attempts (MASTER_CONNECT_RETRY=60), and keeps\n  attempting to reconnect at this rate for 60 days\n  (MASTER_RETRY_COUNT=86400). A setting of 0 for MASTER_RETRY_COUNT\n  means that there is no limit on the number of reconnection attempts,\n  so the replica keeps trying to reconnect indefinitely.\n\n  The values for MASTER_CONNECT_RETRY and MASTER_RETRY_COUNT are\n  recorded in the source metadata repository and shown in the\n  replication_connection_configuration Performance Schema table.\n  MASTER_RETRY_COUNT supersedes the --master-retry-count server startup\n  option.\n\no MASTER_SSL_xxx, MASTER_TLS_xxx\n\n  Specify how the replica uses encryption and ciphers to secure the\n  replication connection. These options can be changed even on replicas\n  that are compiled without SSL support. They are saved to the source\n  metadata repository, but are ignored if the replica does not have SSL\n  support enabled. The MASTER_SSL_xxx and MASTER_TLS_xxx options\n  perform the same functions as the --ssl-xxx and --tls-xxx client\n  options described in\n  https://dev.mysql.com/doc/refman/8.0/en/connection-options.html#encry\n  pted-connection-options. The correspondence between the two sets of\n  options, and the use of the MASTER_SSL_xxx and MASTER_TLS_xxx options\n  to set up a secure connection, is explained in\n  https://dev.mysql.com/doc/refman/8.0/en/replication-solutions-encrypt\n  ed-connections.html.\n\no MASTER_USER\n\n  The user name for the replication user account to use for connecting\n  to the replication source server.\n\n  *Important*:\n\n  To connect to the source using a replication user account that\n  authenticates with the caching_sha2_password plugin, you must either\n  set up a secure connection as described in\n  https://dev.mysql.com/doc/refman/8.0/en/replication-solutions-encrypt\n  ed-connections.html, or enable the unencrypted connection to support\n  password exchange using an RSA key pair. The caching_sha2_password\n  authentication plugin is the default for new users created from MySQL\n  8.0 (for details, see\n  https://dev.mysql.com/doc/refman/8.0/en/caching-sha2-pluggable-authen\n  tication.html). If the user account that you create or use for\n  replication uses this authentication plugin, and you are not using a\n  secure connection, you must enable RSA key pair-based password\n  exchange for a successful connection. You can do this using either\n  the MASTER_PUBLIC_KEY_PATH option or the GET_MASTER_PUBLIC_KEY=1\n  option for this statement.\n\n  It is possible to set an empty user name by specifying\n  MASTER_USER=\'\', but the replication channel cannot be started with an\n  empty user name. In releases before MySQL 8.0.21, only set an empty\n  MASTER_USER user name if you need to clear previously used\n  credentials from the replication metadata repositories for security\n  purposes. Do not use the channel afterwards, due to a bug in these\n  releases that can substitute a default user name if an empty user\n  name is read from the repositories (for example, during an automatic\n  restart of a Group Replication channel). From MySQL 8.0.21, it is\n  valid to set an empty MASTER_USER user name and use the channel\n  afterwards if you always provide user credentials using the START\n  REPLICA statement or START GROUP_REPLICATION statement that starts\n  the replication channel. This approach means that the replication\n  channel always needs operator intervention to restart, but the user\n  credentials are not recorded in the replication metadata\n  repositories.\n\n  The text of a running CHANGE MASTER TO statement, including values\n  for MASTER_USER and MASTER_PASSWORD, can be seen in the output of a\n  concurrent SHOW PROCESSLIST statement. (The complete text of a START\n  REPLICA statement is also visible to SHOW PROCESSLIST.)\n\no MASTER_ZSTD_COMPRESSION_LEVEL\n\n  The compression level to use for connections to the replication\n  source server that use the zstd compression algorithm. The permitted\n  levels are from 1 to 22, with larger values indicating increasing\n  levels of compression. The default zstd compression level is 3. The\n  compression level setting has no effect on connections that do not\n  use zstd compression. MASTER_ZSTD_COMPRESSION_LEVEL is available as\n  of MySQL 8.0.18. For more information, see\n  https://dev.mysql.com/doc/refman/8.0/en/connection-compression-contro\n  l.html.\n\no NETWORK_NAMESPACE\n\n  The network namespace to use for TCP/IP connections to the\n  replication source server. If this option is omitted, connections\n  from the replica use the default (global) namespace. On platforms\n  that do not implement network namespace support, failure occurs when\n  the replica attempts to connect to the source. For information about\n  network namespaces, see\n  https://dev.mysql.com/doc/refman/8.0/en/network-namespace-support.htm\n  l. NETWORK_NAMESPACE is available as of MySQL 8.0.22.\n\no PRIVILEGE_CHECKS_USER\n\n  Names a user account that supplies a security context for the\n  specified channel. NULL, which is the default, means no security\n  context is used. PRIVILEGE_CHECKS_USER is available as of MySQL\n  8.0.18.\n\n  The user name and host name for the user account must follow the\n  syntax described in\n  https://dev.mysql.com/doc/refman/8.0/en/account-names.html, and the\n  user must not be an anonymous user (with a blank user name) or the\n  CURRENT_USER. The account must have the REPLICATION_APPLIER\n  privilege, plus the required privileges to execute the transactions\n  replicated on the channel. For details of the privileges required by\n  the account, see\n  https://dev.mysql.com/doc/refman/8.0/en/replication-privilege-checks.\n  html. When you restart the replication channel, the privilege checks\n  are applied from that point on. If you do not specify a channel and\n  no other channels exist, the statement is applied to the default\n  channel.\n\n  The use of row-based binary logging is strongly recommended when\n  PRIVILEGE_CHECKS_USER is set, and you can set REQUIRE_ROW_FORMAT to\n  enforce this. For example, to start privilege checks on the channel\n  channel_1 on a running replica, issue the following statements:\n\nmysql> STOP REPLICA FOR CHANNEL \'channel_1\';\nmysql> CHANGE MASTER TO\n         PRIVILEGE_CHECKS_USER = \'priv_repl\'@\'%.example.com\',\n         REQUIRE_ROW_FORMAT = 1,\n         FOR CHANNEL \'channel_1\';\nmysql> START REPLICA FOR CHANNEL \'channel_1\';\n\n  For releases from MySQL 8.0.22, use START/STOP REPLICA, and for\n  releases before MySQL 8.0.22, use START/STOP SLAVE. The statements\n  work in the same way, only the terminology has changed\n\no RELAY_LOG_FILE, RELAY_LOG_POS\n\n  The relay log file name, and the location in that file, at which the\n  replication SQL thread begins reading from the replica\'s relay log\n  the next time the thread starts. RELAY_LOG_FILE can use either an\n  absolute or relative path, and uses the same base name as\n  MASTER_LOG_FILE.\n\n  A CHANGE MASTER TO statement using RELAY_LOG_FILE, RELAY_LOG_POS, or\n  both options can be executed on a running replica when the\n  replication SQL thread is stopped. Relay logs are preserved if at\n  least one of the replication SQL (applier) thread and the replication\n  I/O (receiver) thread is running. If both threads are stopped, all\n  relay log files are deleted unless at least one of RELAY_LOG_FILE or\n  RELAY_LOG_POS is specified. For the Group Replication applier channel\n  (group_replication_applier), which only has an applier thread and no\n  receiver thread, this is the case if the applier thread is stopped,\n  but with that channel you cannot use the RELAY_LOG_FILE and\n  RELAY_LOG_POS options.\n\no REQUIRE_ROW_FORMAT\n\n  Permits only row-based replication events to be processed by the\n  replication channel. This option prevents the replication applier\n  from taking actions such as creating temporary tables and executing\n  LOAD DATA INFILE requests, which increases the security of the\n  channel. Group Replication channels are automatically created with\n  REQUIRE_ROW_FORMAT set, and you cannot change the option for those\n  channels. For more information, see\n  https://dev.mysql.com/doc/refman/8.0/en/replication-privilege-checks.\n  html. REQUIRE_ROW_FORMAT is available as of MySQL 8.0.19.\n\no REQUIRE_TABLE_PRIMARY_KEY_CHECK\n\n  Enables a replica to select its own policy for primary key checks.\n  When the option is set to ON for a replication channel, the replica\n  always uses the value ON for the sql_require_primary_key system\n  variable in replication operations, requiring a primary key. When the\n  option is set to OFF, the replica always uses the value OFF for the\n  sql_require_primary_key system variable in replication operations, so\n  that a primary key is never required, even if the source required\n  one. When the REQUIRE_TABLE_PRIMARY_KEY_CHECK option is set to\n  STREAM, which is the default, the replica uses whatever value is\n  replicated from the source for each transaction.\n  REQUIRE_TABLE_PRIMARY_KEY_CHECK is available as of MySQL 8.0.20.\n\n  For multisource replication, setting REQUIRE_TABLE_PRIMARY_KEY_CHECK\n  to ON or OFF enables a replica to normalize behavior across the\n  replication channels for different sources, and keep a consistent\n  setting for the sql_require_primary_key system variable. Using ON\n  safeguards against the accidental loss of primary keys when multiple\n  sources update the same set of tables. Using OFF allows sources that\n  can manipulate primary keys to work alongside sources that cannot.\n\n  When PRIVILEGE_CHECKS_USER is set, setting\n  REQUIRE_TABLE_PRIMARY_KEY_CHECK to ON or OFF means that the user\n  account does not need session administration level privileges to set\n  restricted session variables, which are required to change the value\n  of sql_require_primary_key to match the source\'s setting for each\n  transaction. For more information, see\n  https://dev.mysql.com/doc/refman/8.0/en/replication-privilege-checks.\n  html.\n\no SOURCE_CONNECTION_AUTO_FAILOVER\n\n  Activates the asynchronous connection failover mechanism for a\n  replication channel if one or more alternative replication source\n  servers are available (so when there are multiple MySQL servers or\n  groups of servers that share the replicated data).\n  SOURCE_CONNECTION_AUTO_FAILOVER is available as of MySQL 8.0.22. The\n  asynchronous connection failover mechanism takes over after the\n  reconnection attempts controlled by MASTER_CONNECT_RETRY and\n  MASTER_RETRY_COUNT are exhausted. It reconnects the replica to an\n  alternative source chosen from a specified source list, which you\n  manage using the asynchronous_connection_failover_add_source and\n  asynchronous_connection_failover_delete_source functions. To add and\n  remove managed groups of servers, use the\n  asynchronous_connection_failover_add_managed and\n  asynchronous_connection_failover_delete_managed functions instead.\n  For more information, see\n  https://dev.mysql.com/doc/refman/8.0/en/replication-asynchronous-conn\n  ection-failover.html.\n\n  *Important*:\n\n   1. You can only set SOURCE_CONNECTION_AUTO_FAILOVER = 1 when GTID\n      auto-positioning is in use (MASTER_AUTO_POSITION = 1).\n\n   2. When you set SOURCE_CONNECTION_AUTO_FAILOVER = 1, set\n      MASTER_RETRY_COUNT and MASTER_CONNECT_RETRY to minimal numbers\n      that just allow a few retry attempts with the same source in a\n      short time, in case the connection failure is caused by a\n      transient network outage. Otherwise the asynchronous connection\n      failover mechanism cannot be activated promptly. Suitable values\n      are MASTER_RETRY_COUNT=3 and MASTER_CONNECT_RETRY=10, which make\n      the replica retry the connection 3 times with 10-second intervals\n      between.\n\n   3. When you set SOURCE_CONNECTION_AUTO_FAILOVER = 1, the replication\n      metadata repositories must contain the credentials for a\n      replication user account that can be used to connect to all the\n      servers on the source list for the replication channel. These\n      credentials can be set using the CHANGE REPLICATION SOURCE TO\n      statement with the MASTER_USER and MASTER_PASSWORD options. For\n      more information, see\n      https://dev.mysql.com/doc/refman/8.0/en/replication-asynchronous-\n      connection-failover.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/change-master-to.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/change-master-to.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (576,43,'CHANGE REPLICATION FILTER','Syntax:\nCHANGE REPLICATION FILTER filter[, filter]\n	[, ...] [FOR CHANNEL channel]\n\nfilter: {\n    REPLICATE_DO_DB = (db_list)\n  | REPLICATE_IGNORE_DB = (db_list)\n  | REPLICATE_DO_TABLE = (tbl_list)\n  | REPLICATE_IGNORE_TABLE = (tbl_list)\n  | REPLICATE_WILD_DO_TABLE = (wild_tbl_list)\n  | REPLICATE_WILD_IGNORE_TABLE = (wild_tbl_list)\n  | REPLICATE_REWRITE_DB = (db_pair_list)\n}\n\ndb_list:\n    db_name[, db_name][, ...]\n\ntbl_list:\n    db_name.table_name[, db_name.table_name][, ...]\nwild_tbl_list:\n    \'db_pattern.table_pattern\'[, \'db_pattern.table_pattern\'][, ...]\n\ndb_pair_list:\n    (db_pair)[, (db_pair)][, ...]\n\ndb_pair:\n    from_db, to_db\n\nCHANGE REPLICATION FILTER sets one or more replication filtering rules\non the replica in the same way as starting the replica mysqld with\nreplication filtering options such as --replicate-do-db or\n--replicate-wild-ignore-table. Unlike the case with the server options,\nthis statement does not require restarting the server to take effect,\nonly that the replication SQL thread be stopped using STOP REPLICA\nSQL_THREAD first (and restarted with START REPLICA SQL_THREAD\nafterwards). CHANGE REPLICATION FILTER requires the\nREPLICATION_SLAVE_ADMIN privilege (or the deprecated SUPER privilege).\nUse the FOR CHANNEL channel clause to make a replication filter\nspecific to a replication channel, for example on a multi-source\nreplica. Filters applied without a specific FOR CHANNEL clause are\nconsidered global filters, meaning that they are applied to all\nreplication channels.\n\nGlobal replication filters cannot be set on a MySQL server instance\nthat is configured for Group Replication, because filtering\ntransactions on some servers would make the group unable to reach\nagreement on a consistent state. Channel specific replication filters\ncan be set on replication channels that are not directly involved with\nGroup Replication, such as where a group member also acts as a replica\nto a source that is outside the group. They cannot be set on the\ngroup_replication_applier or group_replication_recovery channels.\n\nThe following list shows the CHANGE REPLICATION FILTER options and how\nthey relate to --replicate-* server options:\n\no REPLICATE_DO_DB: Include updates based on database name. Equivalent\n  to --replicate-do-db.\n\no REPLICATE_IGNORE_DB: Exclude updates based on database name.\n  Equivalent to --replicate-ignore-db.\n\no REPLICATE_DO_TABLE: Include updates based on table name. Equivalent\n  to --replicate-do-table.\n\no REPLICATE_IGNORE_TABLE: Exclude updates based on table name.\n  Equivalent to --replicate-ignore-table.\n\no REPLICATE_WILD_DO_TABLE: Include updates based on wildcard pattern\n  matching table name. Equivalent to --replicate-wild-do-table.\n\no REPLICATE_WILD_IGNORE_TABLE: Exclude updates based on wildcard\n  pattern matching table name. Equivalent to\n  --replicate-wild-ignore-table.\n\no REPLICATE_REWRITE_DB: Perform updates on replica after substituting\n  new name on replica for specified database on source. Equivalent to\n  --replicate-rewrite-db.\n\nThe precise effects of REPLICATE_DO_DB and REPLICATE_IGNORE_DB filters\nare dependent on whether statement-based or row-based replication is in\neffect. See\nhttps://dev.mysql.com/doc/refman/8.0/en/replication-rules.html, for\nmore information.\n\nMultiple replication filtering rules can be created in a single CHANGE\nREPLICATION FILTER statement by separating the rules with commas, as\nshown here:\n\nCHANGE REPLICATION FILTER\n    REPLICATE_DO_DB = (d1), REPLICATE_IGNORE_DB = (d2);\n\nIssuing the statement just shown is equivalent to starting the replica\nmysqld with the options --replicate-do-db=d1 --replicate-ignore-db=d2.\n\nOn a multi-source replica, which uses multiple replication channels to\nprocess transaction from different sources, use the FOR CHANNEL channel\nclause to set a replication filter on a replication channel:\n\nCHANGE REPLICATION FILTER REPLICATE_DO_DB = (d1) FOR CHANNEL channel_1;\n\nThis enables you to create a channel specific replication filter to\nfilter out selected data from a source. When a FOR CHANNEL clause is\nprovided, the replication filter statement acts on that replication\nchannel, removing any existing replication filter which has the same\nfilter type as the specified replication filters, and replacing them\nwith the specified filter. Filter types not explicitly listed in the\nstatement are not modified. If issued against a replication channel\nwhich is not configured, the statement fails with an\nER_SLAVE_CONFIGURATION error. If issued against Group Replication\nchannels, the statement fails with an\nER_SLAVE_CHANNEL_OPERATION_NOT_ALLOWED error.\n\nOn a replica with multiple replication channels configured, issuing\nCHANGE REPLICATION FILTER with no FOR CHANNEL clause configures the\nreplication filter for every configured replication channel, and for\nthe global replication filters. For every filter type, if the filter\ntype is listed in the statement, then any existing filter rules of that\ntype are replaced by the filter rules specified in the most recently\nissued statement, otherwise the old value of the filter type is\nretained. For more information see\nhttps://dev.mysql.com/doc/refman/8.0/en/replication-rules-channel-based\n-filters.html.\n\nIf the same filtering rule is specified multiple times, only the last\nsuch rule is actually used. For example, the two statements shown here\nhave exactly the same effect, because the first REPLICATE_DO_DB rule in\nthe first statement is ignored:\n\nCHANGE REPLICATION FILTER\n    REPLICATE_DO_DB = (db1, db2), REPLICATE_DO_DB = (db3, db4);\n\nCHANGE REPLICATION FILTER\n    REPLICATE_DO_DB = (db3, db4);\n\n*Caution*:\n\nThis behavior differs from that of the --replicate-* filter options\nwhere specifying the same option multiple times causes the creation of\nmultiple filter rules.\n\nNames of tables and database not containing any special characters need\nnot be quoted. Values used with REPLICATION_WILD_TABLE and\nREPLICATION_WILD_IGNORE_TABLE are string expressions, possibly\ncontaining (special) wildcard characters, and so must be quoted. This\nis shown in the following example statements:\n\nCHANGE REPLICATION FILTER\n    REPLICATE_WILD_DO_TABLE = (\'db1.old%\');\n\nCHANGE REPLICATION FILTER\n    REPLICATE_WILD_IGNORE_TABLE = (\'db1.new%\', \'db2.new%\');\n\nValues used with REPLICATE_REWRITE_DB represent pairs of database\nnames; each such value must be enclosed in parentheses. The following\nstatement rewrites statements occurring on database db1 on the source\nto database db2 on the replica:\n\nCHANGE REPLICATION FILTER REPLICATE_REWRITE_DB = ((db1, db2));\n\nThe statement just shown contains two sets of parentheses, one\nenclosing the pair of database names, and the other enclosing the\nentire list. This is perhaps more easily seen in the following example,\nwhich creates two rewrite-db rules, one rewriting database dbA to dbB,\nand one rewriting database dbC to dbD:\n\nCHANGE REPLICATION FILTER\n  REPLICATE_REWRITE_DB = ((dbA, dbB), (dbC, dbD));\n\nThe CHANGE REPLICATION FILTER statement replaces replication filtering\nrules only for the filter types and replication channels affected by\nthe statement, and leaves other rules and channels unchanged. If you\nwant to unset all filters of a given type, set the filter\'s value to an\nexplicitly empty list, as shown in this example, which removes all\nexisting REPLICATE_DO_DB and REPLICATE_IGNORE_DB rules:\n\nCHANGE REPLICATION FILTER\n    REPLICATE_DO_DB = (), REPLICATE_IGNORE_DB = ();\n\nSetting a filter to empty in this way removes all existing rules, does\nnot create any new ones, and does not restore any rules set at mysqld\nstartup using --replicate-* options on the command line or in the\nconfiguration file.\n\nThe RESET REPLICA ALL statement removes channel specific replication\nfilters that were set on channels deleted by the statement. When the\ndeleted channel or channels are recreated, any global replication\nfilters specified for the replica are copied to them, and no channel\nspecific replication filters are applied.\n\nFor more information, see\nhttps://dev.mysql.com/doc/refman/8.0/en/replication-rules.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/change-replication-filter.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/change-replication-filter.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (577,43,'CHANGE REPLICATION SOURCE TO','Syntax:\nCHANGE REPLICATION SOURCE TO option [, option] ... [ channel_option ]\n\noption: {\n    SOURCE_BIND = \'interface_name\'\n  | SOURCE_HOST = \'host_name\'\n  | SOURCE_USER = \'user_name\'\n  | SOURCE_PASSWORD = \'password\'\n  | SOURCE_PORT = port_num\n  | PRIVILEGE_CHECKS_USER = {\'account\' | NULL}\n  | REQUIRE_ROW_FORMAT = {0|1}\n  | REQUIRE_TABLE_PRIMARY_KEY_CHECK = {STREAM | ON | OFF}\n  | ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS = {OFF | LOCAL | uuid}\n  | SOURCE_LOG_FILE = \'source_log_name\'\n  | SOURCE_LOG_POS = source_log_pos\n  | SOURCE_AUTO_POSITION = {0|1}\n  | RELAY_LOG_FILE = \'relay_log_name\'\n  | RELAY_LOG_POS = relay_log_pos\n  | SOURCE_HEARTBEAT_PERIOD = interval\n  | SOURCE_CONNECT_RETRY = interval\n  | SOURCE_RETRY_COUNT = count\n  | SOURCE_CONNECTION_AUTO_FAILOVER = {0|1}\n  | SOURCE_DELAY = interval\n  | SOURCE_COMPRESSION_ALGORITHMS = \'value\'\n  | SOURCE_ZSTD_COMPRESSION_LEVEL = level\n  | SOURCE_SSL = {0|1}\n  | SOURCE_SSL_CA = \'ca_file_name\'\n  | SOURCE_SSL_CAPATH = \'ca_directory_name\'\n  | SOURCE_SSL_CERT = \'cert_file_name\'\n  | SOURCE_SSL_CRL = \'crl_file_name\'\n  | SOURCE_SSL_CRLPATH = \'crl_directory_name\'\n  | SOURCE_SSL_KEY = \'key_file_name\'\n  | SOURCE_SSL_CIPHER = \'cipher_list\'\n  | SOURCE_SSL_VERIFY_SERVER_CERT = {0|1}\n  | SOURCE_TLS_VERSION = \'protocol_list\'\n  | SOURCE_TLS_CIPHERSUITES = \'ciphersuite_list\'\n  | SOURCE_PUBLIC_KEY_PATH = \'key_file_name\'\n  | GET_SOURCE_PUBLIC_KEY = {0|1}\n  | NETWORK_NAMESPACE = \'namespace\'\n  | IGNORE_SERVER_IDS = (server_id_list)\n}\n\nchannel_option:\n    FOR CHANNEL channel\n\nserver_id_list:\n    [server_id [, server_id] ... ]\n\nCHANGE REPLICATION SOURCE TO changes the parameters that the replica\nserver uses for connecting to the source and for reading data from the\nsource. It also updates the contents of the replication metadata\nrepositories (see\nhttps://dev.mysql.com/doc/refman/8.0/en/replica-logs.html). From MySQL\n8.0.23, use CHANGE REPLICATION SOURCE TO in place of CHANGE MASTER TO,\nwhich is deprecated from that release. In releases before MySQL 8.0.23,\nuse CHANGE MASTER TO.\n\nYou can issue CHANGE REPLICATION SOURCE TO statements on a running\nreplica without first stopping it, depending on the states of the\nreplication SQL (applier) thread and replication I/O (receiver) thread.\nThe rules governing such use are provided later in this section. CHANGE\nREPLICATION SOURCE TO requires the REPLICATION_SLAVE_ADMIN privilege\n(or the deprecated SUPER privilege).\n\nWhen using a multithreaded replica (replica_parallel_workers or\nslave_parallel_workers > 0), stopping the replica can cause gaps in the\nsequence of transactions that have been executed from the relay log,\nregardless of whether the replica was stopped intentionally or\notherwise. When such gaps exist, issuing CHANGE REPLICATION SOURCE TO\nfails. The solution in this situation is to issue START REPLICA UNTIL\nSQL_AFTER_MTS_GAPS which ensures that the gaps are closed. From MySQL\n8.0.26, the process of checking for gaps in the sequence of\ntransactions is skipped entirely when GTID-based replication and GTID\nauto-positioning are in use, because gaps in transactions can be\nresolved using GTID auto-positioning. In that situation, CHANGE\nREPLICATION SOURCE TO can still be used.\n\nThe optional FOR CHANNEL channel clause enables you to name which\nreplication channel the statement applies to. Providing a FOR CHANNEL\nchannel clause applies the CHANGE REPLICATION SOURCE TO statement to a\nspecific replication channel, and is used to add a new channel or\nmodify an existing channel. For example, to add a new channel called\nchannel2:\n\nCHANGE REPLICATION SOURCE TO SOURCE_HOST=host1, SOURCE_PORT=3002 FOR CHANNEL \'channel2\'\n\nIf no clause is named and no extra channels exist, the statement\napplies to the default channel.\n\nWhen using multiple replication channels, if a CHANGE REPLICATION\nSOURCE TO statement does not name a channel using a FOR CHANNEL channel\nclause, an error occurs. See\nhttps://dev.mysql.com/doc/refman/8.0/en/replication-channels.html for\nmore information.\n\nValues used for SOURCE_HOST and other CHANGE REPLICATION SOURCE TO\noptions are checked for linefeed (\\n or 0x0A) characters. The presence\nof such characters in these values causes the statement to fail with\nER_MASTER_INFO\n(https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference.h\ntml#error_er_master_info).\n\nInvoking CHANGE REPLICATION SOURCE TO causes the previous values for\nSOURCE_HOST, SOURCE_PORT, SOURCE_LOG_FILE, and SOURCE_LOG_POS to be\nwritten to the error log, along with other information about the\nreplica\'s state prior to execution.\n\nCHANGE REPLICATION SOURCE TO causes an implicit commit of an ongoing\ntransaction. See\nhttps://dev.mysql.com/doc/refman/8.0/en/implicit-commit.html.\n\nFor some of the options of the CHANGE REPLICATION SOURCE TO statement,\nyou must issue a STOP REPLICA statement prior to issuing a CHANGE\nREPLICATION SOURCE TO statement (and a START REPLICA statement\nafterwards). Sometimes, you only need to stop the replication SQL\n(applier) thread or the replication I/O (receiver) thread, not both:\n\no When the applier thread is stopped, you can execute CHANGE\n  REPLICATION SOURCE TO using any combination that is otherwise allowed\n  of RELAY_LOG_FILE, RELAY_LOG_POS, and SOURCE_DELAY options, even if\n  the replication receiver thread is running. No other options may be\n  used with this statement when the receiver thread is running.\n\no When the receiver thread is stopped, you can execute CHANGE\n  REPLICATION SOURCE TO using any of the options for this statement (in\n  any allowed combination) except RELAY_LOG_FILE, RELAY_LOG_POS,\n  SOURCE_DELAY, or SOURCE_AUTO_POSITION = 1 even when the applier\n  thread is running.\n\no Both the receiver thread and the applier thread must be stopped\n  before issuing a CHANGE REPLICATION SOURCE TO statement that employs\n  SOURCE_AUTO_POSITION = 1 or ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS.\n\nYou can check the current state of the replication applier thread and\nreplication receiver thread using SHOW REPLICA STATUS. Note that the\nGroup Replication applier channel (group_replication_applier) has no\nreceiver thread, only an applier thread.\n\nFor more information, see\nhttps://dev.mysql.com/doc/refman/8.0/en/replication-solutions-switch.ht\nml.\n\nIf you are using statement-based replication and temporary tables, it\nis possible for a CHANGE REPLICATION SOURCE TO statement following a\nSTOP REPLICA statement to leave behind temporary tables on the replica.\nA warning (ER_WARN_OPEN_TEMP_TABLES_MUST_BE_ZERO\n(https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference.h\ntml#error_er_warn_open_temp_tables_must_be_zero)) is now issued\nwhenever this occurs. You can avoid this in such cases by making sure\nthat the value of the Replica_open_temp_tables or\nSlave_open_temp_tables system status variable is equal to 0 prior to\nexecuting such a CHANGE REPLICATION SOURCE TO statement.\n\nCHANGE REPLICATION SOURCE TO is useful for setting up a replica when\nyou have the snapshot of the source and have recorded the source\'s\nbinary log coordinates corresponding to the time of the snapshot. After\nloading the snapshot into the replica to synchronize it with the\nsource, you can run CHANGE REPLICATION SOURCE TO\nSOURCE_LOG_FILE=\'log_name\', SOURCE_LOG_POS=log_pos on the replica to\nspecify the coordinates at which the replica should begin reading the\nsource\'s binary log.\n\nThe following example changes the source server the replica uses and\nestablishes the source\'s binary log coordinates from which the replica\nbegins reading:\n\nCHANGE REPLICATION SOURCE TO\n  SOURCE_HOST=\'source2.example.com\',\n  SOURCE_USER=\'replication\',\n  SOURCE_PASSWORD=\'password\',\n  SOURCE_PORT=3306,\n  SOURCE_LOG_FILE=\'source2-bin.001\',\n  SOURCE_LOG_POS=4,\n  SOURCE_CONNECT_RETRY=10;\n\nThe next example shows an operation that is less frequently employed.\nIt is used when the replica has relay log files that you want it to\nexecute again for some reason. To do this, the source need not be\nreachable. You need only use CHANGE REPLICATION SOURCE TO and start the\nSQL thread (START REPLICA SQL_THREAD):\n\nCHANGE REPLICATION SOURCE TO\n  RELAY_LOG_FILE=\'replica-relay-bin.006\',\n  RELAY_LOG_POS=4025;\n\nOptions that you do not specify on a CHANGE REPLICATION SOURCE TO\nstatement retain their value, except as indicated in the following\ndiscussion. Thus, in most cases, there is no need to specify options\nthat do not change.\n\no ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS\n\n  Makes the replication channel assign a GTID to replicated\n  transactions that do not have one, enabling replication from a source\n  that does not use GTID-based replication, to a replica that does. For\n  a multi-source replica, you can have a mix of channels that use\n  ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS, and channels that do not. The\n  default is OFF, meaning that the feature is not used.\n\n  LOCAL assigns a GTID including the replica\'s own UUID (the\n  server_uuid setting). uuid assigns a GTID including the specified\n  UUID, such as the server_uuid setting for the replication source\n  server. Using a nonlocal UUID lets you differentiate between\n  transactions that originated on the replica and transactions that\n  originated on the source, and for a multi-source replica, between\n  transactions that originated on different sources. The UUID you\n  choose only has significance for the replica\'s own use. If any of the\n  transactions sent by the source do have a GTID already, that GTID is\n  retained.\n\n  Channels specific to Group Replication cannot use\n  ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS, but an asynchronous\n  replication channel for another source on a server instance that is a\n  Group Replication group member can do so. In that case, do not\n  specify the Group Replication group name as the UUID for creating the\n  GTIDs.\n\n  To set ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS to LOCAL or uuid, the\n  replica must have gtid_mode=ON set, and this cannot be changed\n  afterwards. This option is for use with a source that has binary log\n  file position based replication, so MASTER_AUTO_POSITION=1 cannot be\n  set for the channel. Both the replication SQL thread and the\n  replication I/O (receiver) thread must be stopped before setting this\n  option.\n\n  *Important*:\n\n  A replica set up with ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS on any\n  channel cannot be promoted to replace the replication source server\n  in the event that a failover is required, and a backup taken from the\n  replica cannot be used to restore the replication source server. The\n  same restriction applies to replacing or restoring other replicas\n  that use ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS on any channel.\n\n  For further restrictions and information, see\n  https://dev.mysql.com/doc/refman/8.0/en/replication-gtids-assign-anon\n  .html.\n\no GET_SOURCE_PUBLIC_KEY\n\n  Enables RSA key pair-based password exchange by requesting the public\n  key from the source. This option applies to replicas that\n  authenticate with the caching_sha2_password authentication plugin.\n  For connections by accounts that authenticate using this plugin, the\n  source does not send the public key unless requested, so it must be\n  requested or specified in the client. If SOURCE_PUBLIC_KEY_PATH is\n  given and specifies a valid public key file, it takes precedence over\n  GET_SOURCE_PUBLIC_KEY. If you are using a replication user account\n  that authenticates with the caching_sha2_password plugin (which is\n  the default from MySQL 8.0), and you are not using a secure\n  connection, you must specify either this option or the\n  SOURCE_PUBLIC_KEY_PATH option to provide the RSA public key to the\n  replica.\n\no IGNORE_SERVER_IDS\n\n  Makes the replica ignore events originating from the specified\n  servers. The option takes a comma-separated list of 0 or more server\n  IDs. Log rotation and deletion events from the servers are not\n  ignored, and are recorded in the relay log.\n\n  In circular replication, the originating server normally acts as the\n  terminator of its own events, so that they are not applied more than\n  once. Thus, this option is useful in circular replication when one of\n  the servers in the circle is removed. Suppose that you have a\n  circular replication setup with 4 servers, having server IDs 1, 2, 3,\n  and 4, and server 3 fails. When bridging the gap by starting\n  replication from server 2 to server 4, you can include\n  IGNORE_SERVER_IDS = (3) in the CHANGE REPLICATION SOURCE TO statement\n  that you issue on server 4 to tell it to use server 2 as its source\n  instead of server 3. Doing so causes it to ignore and not to\n  propagate any statements that originated with the server that is no\n  longer in use.\n\n  If IGNORE_SERVER_IDS contains the server\'s own ID and the server was\n  started with the --replicate-same-server-id option enabled, an error\n  results.\n\n  *Note*:\n\n  When global transaction identifiers (GTIDs) are used for replication,\n  transactions that have already been applied are automatically\n  ignored, so the IGNORE_SERVER_IDS function is not required and is\n  deprecated. If gtid_mode=ON is set for the server, a deprecation\n  warning is issued if you include the IGNORE_SERVER_IDS option in a\n  CHANGE REPLICATION SOURCE TO statement.\n\n  The source metadata repository and the output of SHOW REPLICA STATUS\n  provide the list of servers that are currently ignored. For more\n  information, see\n  https://dev.mysql.com/doc/refman/8.0/en/replica-logs-status.html, and\n  [HELP SHOW REPLICA STATUS].\n\n  If a CHANGE REPLICATION SOURCE TO statement is issued without any\n  IGNORE_SERVER_IDS option, any existing list is preserved. To clear\n  the list of ignored servers, it is necessary to use the option with\n  an empty list:\n\nCHANGE REPLICATION SOURCE TO IGNORE_SERVER_IDS = ();\n\n  RESET REPLICA ALL clears IGNORE_SERVER_IDS.\n\n  *Note*:\n\n  A deprecation warning is issued if SET GTID_MODE=ON is issued when\n  any channel has existing server IDs set with IGNORE_SERVER_IDS.\n  Before starting GTID-based replication, check for and clear all\n  ignored server ID lists on the servers involved. The SHOW REPLICA\n  STATUS statement displays the list of ignored IDs, if there is one.\n  If you do receive the deprecation warning, you can still clear a list\n  after gtid_mode=ON is set by issuing a CHANGE REPLICATION SOURCE TO\n  statement containing the IGNORE_SERVER_IDS option with an empty list.\n\no NETWORK_NAMESPACE\n\n  The network namespace to use for TCP/IP connections to the\n  replication source server. If this option is omitted, connections\n  from the replica use the default (global) namespace. On platforms\n  that do not implement network namespace support, failure occurs when\n  the replica attempts to connect to the source. For information about\n  network namespaces, see\n  https://dev.mysql.com/doc/refman/8.0/en/network-namespace-support.htm\n  l. NETWORK_NAMESPACE is available as of MySQL 8.0.22.\n\no PRIVILEGE_CHECKS_USER\n\n  Names a user account that supplies a security context for the\n  specified channel. NULL, which is the default, means no security\n  context is used. PRIVILEGE_CHECKS_USER is available as of MySQL\n  8.0.18.\n\n  The user name and host name for the user account must follow the\n  syntax described in\n  https://dev.mysql.com/doc/refman/8.0/en/account-names.html, and the\n  user must not be an anonymous user (with a blank user name) or the\n  CURRENT_USER. The account must have the REPLICATION_APPLIER\n  privilege, plus the required privileges to execute the transactions\n  replicated on the channel. For details of the privileges required by\n  the account, see\n  https://dev.mysql.com/doc/refman/8.0/en/replication-privilege-checks.\n  html. When you restart the replication channel, the privilege checks\n  are applied from that point on. If you do not specify a channel and\n  no other channels exist, the statement is applied to the default\n  channel.\n\n  The use of row-based binary logging is strongly recommended when\n  PRIVILEGE_CHECKS_USER is set, and you can set REQUIRE_ROW_FORMAT to\n  enforce this. For example, to start privilege checks on the channel\n  channel_1 on a running replica, issue the following statements:\n\nmysql> STOP REPLICA FOR CHANNEL \'channel_1\';\nmysql> CHANGE REPLICATION SOURCE TO\n         PRIVILEGE_CHECKS_USER = \'priv_repl\'@\'%.example.com\',\n         REQUIRE_ROW_FORMAT = 1,\n         FOR CHANNEL \'channel_1\';\nmysql> START REPLICA FOR CHANNEL \'channel_1\';\n\no RELAY_LOG_FILE, RELAY_LOG_POS\n\n  The relay log file name, and the location in that file, at which the\n  replication SQL thread begins reading from the replica\'s relay log\n  the next time the thread starts. RELAY_LOG_FILE can use either an\n  absolute or relative path, and uses the same base name as\n  SOURCE_LOG_FILE.\n\n  A CHANGE REPLICATION SOURCE TO statement using RELAY_LOG_FILE,\n  RELAY_LOG_POS, or both options can be executed on a running replica\n  when the replication SQL (applier) thread is stopped. Relay logs are\n  preserved if at least one of the replication applier thread and the\n  replication I/O (receiver) thread is running. If both threads are\n  stopped, all relay log files are deleted unless at least one of\n  RELAY_LOG_FILE or RELAY_LOG_POS is specified. For the Group\n  Replication applier channel (group_replication_applier), which only\n  has an applier thread and no receiver thread, this is the case if the\n  applier thread is stopped, but with that channel you cannot use the\n  RELAY_LOG_FILE and RELAY_LOG_POS options.\n\no REQUIRE_ROW_FORMAT\n\n  Permits only row-based replication events to be processed by the\n  replication channel. This option prevents the replication applier\n  from taking actions such as creating temporary tables and executing\n  LOAD DATA INFILE requests, which increases the security of the\n  channel. Group Replication channels are automatically created with\n  REQUIRE_ROW_FORMAT set, and you cannot change the option for those\n  channels. For more information, see\n  https://dev.mysql.com/doc/refman/8.0/en/replication-privilege-checks.\n  html. REQUIRE_ROW_FORMAT is available as of MySQL 8.0.19.\n\no REQUIRE_TABLE_PRIMARY_KEY_CHECK\n\n  Enables a replica to select its own policy for primary key checks.\n  When the option is set to ON for a replication channel, the replica\n  always uses the value ON for the sql_require_primary_key system\n  variable in replication operations, requiring a primary key. When the\n  option is set to OFF, the replica always uses the value OFF for the\n  sql_require_primary_key system variable in replication operations, so\n  that a primary key is never required, even if the source required\n  one. When the REQUIRE_TABLE_PRIMARY_KEY_CHECK option is set to\n  STREAM, which is the default, the replica uses whatever value is\n  replicated from the source for each transaction.\n  REQUIRE_TABLE_PRIMARY_KEY_CHECK is available as of MySQL 8.0.20.\n\n  For multisource replication, setting REQUIRE_TABLE_PRIMARY_KEY_CHECK\n  to ON or OFF enables a replica to normalize behavior across the\n  replication channels for different sources, and keep a consistent\n  setting for the sql_require_primary_key system variable. Using ON\n  safeguards against the accidental loss of primary keys when multiple\n  sources update the same set of tables. Using OFF allows sources that\n  can manipulate primary keys to work alongside sources that cannot.\n\n  When PRIVILEGE_CHECKS_USER is set, setting\n  REQUIRE_TABLE_PRIMARY_KEY_CHECK to ON or OFF means that the user\n  account does not need session administration level privileges to set\n  restricted session variables, which are required to change the value\n  of sql_require_primary_key to match the source\'s setting for each\n  transaction. For more information, see\n  https://dev.mysql.com/doc/refman/8.0/en/replication-privilege-checks.\n  html.\n\no SOURCE_AUTO_POSITION\n\n  Makes the replica attempt to connect to the source using the\n  auto-positioning feature of GTID-based replication, rather than a\n  binary log file based position. This option can be used with CHANGE\n  REPLICATION SOURCE TO only if both the replication SQL (applier)\n  thread and replication I/O (receiver) thread are stopped.\n\n  Both the replica and the source must have GTIDs enabled\n  (GTID_MODE=ON, ON_PERMISSIVE, or OFF_PERMISSIVE on the replica, and\n  GTID_MODE=ON on the source). SOURCE_LOG_FILE, SOURCE_LOG_POS,\n  RELAY_LOG_FILE, and RELAY_LOG_POS cannot be specified together with\n  SOURCE_AUTO_POSITION = 1. If multi-source replication is enabled on\n  the replica, you need to set the SOURCE_AUTO_POSITION = 1 option for\n  each applicable replication channel.\n\n  With SOURCE_AUTO_POSITION = 1 set, in the initial connection\n  handshake, the replica sends a GTID set containing the transactions\n  that it has already received, committed, or both. The source responds\n  by sending all transactions recorded in its binary log whose GTID is\n  not included in the GTID set sent by the replica. This exchange\n  ensures that the source only sends the transactions with a GTID that\n  the replica has not already recorded or committed. If the replica\n  receives transactions from more than one source, as in the case of a\n  diamond topology, the auto-skip function ensures that the\n  transactions are not applied twice. For details of how the GTID set\n  sent by the replica is computed, see\n  https://dev.mysql.com/doc/refman/8.0/en/replication-gtids-auto-positi\n  oning.html.\n\n  If any of the transactions that should be sent by the source have\n  been purged from the source\'s binary log, or added to the set of\n  GTIDs in the gtid_purged system variable by another method, the\n  source sends the error ER_MASTER_HAS_PURGED_REQUIRED_GTIDS to the\n  replica, and replication does not start. The GTIDs of the missing\n  purged transactions are identified and listed in the source\'s error\n  log in the warning message ER_FOUND_MISSING_GTIDS. Also, if during\n  the exchange of transactions it is found that the replica has\n  recorded or committed transactions with the source\'s UUID in the\n  GTID, but the source itself has not committed them, the source sends\n  the error ER_SLAVE_HAS_MORE_GTIDS_THAN_MASTER to the replica and\n  replication does not start. For information on how to handle these\n  situations, see\n  https://dev.mysql.com/doc/refman/8.0/en/replication-gtids-auto-positi\n  oning.html.\n\n  You can see whether replication is running with GTID auto-positioning\n  enabled by checking the Performance Schema\n  replication_connection_status table or the output of SHOW REPLICA\n  STATUS. Disabling the SOURCE_AUTO_POSITION option again makes the\n  replica revert to file-based replication.\n\no SOURCE_BIND\n\n  Determines which of the replica\'s network interfaces is chosen for\n  connecting to the source, for use on replicas that have multiple\n  network interfaces. The address configured with this option, if any,\n  can be seen in the Source_Bind column of the output from SHOW REPLICA\n  STATUS. In the source metadata repository table\n  mysql.slave_master_info, the value can be seen as the Source_bind\n  column. The ability to bind a replica to a specific network interface\n  is also supported by NDB Cluster.\n\no SOURCE_COMPRESSION_ALGORITHMS\n\n  Specifies the permitted compression algorithms for connections to the\n  replication source server. The available algorithms are the same as\n  for the protocol_compression_algorithms system variable. The default\n  value is uncompressed. SOURCE_COMPRESSION_ALGORITHMS is available as\n  of MySQL 8.0.18.\n\n  The value of SOURCE_COMPRESSION_ALGORITHMS applies only if the\n  replica_compressed_protocol or slave_compressed_protocol system\n  variable is disabled. If replica_compressed_protocol or\n  slave_compressed_protocol is enabled, it takes precedence over\n  SOURCE_COMPRESSION_ALGORITHMS and connections to the source use zlib\n  compression if both source and replica support that algorithm. For\n  more information, see\n  https://dev.mysql.com/doc/refman/8.0/en/connection-compression-contro\n  l.html.\n\n  Binary log transaction compression (available as of MySQL 8.0.20),\n  which is activated by the binlog_transaction_compression system\n  variable, can also be used to save bandwidth. If you do this in\n  combination with connection compression, connection compression has\n  less opportunity to act on the data, but can still compress headers\n  and those events and transaction payloads that are uncompressed. For\n  more information on binary log transaction compression, see\n  https://dev.mysql.com/doc/refman/8.0/en/binary-log-transaction-compre\n  ssion.html.\n\no SOURCE_CONNECT_RETRY\n\n  Specifies the interval between the reconnection attempts that the\n  replica makes after the connection to the source times out. The\n  attempts are limited by the SOURCE_RETRY_COUNT option. If both the\n  default settings are used, the replica waits 60 seconds between\n  reconnection attempts (SOURCE_CONNECT_RETRY=60), and keeps attempting\n  to reconnect at this rate for 60 days (SOURCE_RETRY_COUNT=86400).\n  These values are recorded in the source metadata repository and shown\n  in the replication_connection_configuration Performance Schema table.\n\no SOURCE_CONNECTION_AUTO_FAILOVER\n\n  Activates the asynchronous connection failover mechanism for a\n  replication channel if one or more alternative replication source\n  servers are available (so when there are multiple MySQL servers or\n  groups of servers that share the replicated data).\n  SOURCE_CONNECTION_AUTO_FAILOVER is available as of MySQL 8.0.22. The\n  asynchronous connection failover mechanism takes over after the\n  reconnection attempts controlled by SOURCE_CONNECT_RETRY and\n  SOURCE_RETRY_COUNT are exhausted. It reconnects the replica to an\n  alternative source chosen from a specified source list, which you\n  manage using the asynchronous_connection_failover_add_source and\n  asynchronous_connection_failover_delete_source functions. To add and\n  remove managed groups of servers, use the\n  asynchronous_connection_failover_add_managed and\n  asynchronous_connection_failover_delete_managed functions instead.\n  For more information, see\n  https://dev.mysql.com/doc/refman/8.0/en/replication-asynchronous-conn\n  ection-failover.html.\n\n  *Important*:\n\n   1. You can only set SOURCE_CONNECTION_AUTO_FAILOVER = 1 when GTID\n      auto-positioning is in use (SOURCE_AUTO_POSITION = 1).\n\n   2. When you set SOURCE_CONNECTION_AUTO_FAILOVER = 1, set\n      SOURCE_RETRY_COUNT and SOURCE_CONNECT_RETRY to minimal numbers\n      that just allow a few retry attempts with the same source, in\n      case the connection failure is caused by a transient network\n      outage. Otherwise the asynchronous connection failover mechanism\n      cannot be activated promptly. Suitable values are\n      SOURCE_RETRY_COUNT=3 and SOURCE_CONNECT_RETRY=10, which make the\n      replica retry the connection 3 times with 10-second intervals\n      between.\n\n   3. When you set SOURCE_CONNECTION_AUTO_FAILOVER = 1, the replication\n      metadata repositories must contain the credentials for a\n      replication user account that can be used to connect to all the\n      servers on the source list for the replication channel. The\n      account must also have SELECT permissions on the Performance\n      Schema tables. These credentials can be set using the CHANGE\n      REPLICATION SOURCE TO statement with the SOURCE_USER and\n      SOURCE_PASSWORD options. For more information, see\n      https://dev.mysql.com/doc/refman/8.0/en/replication-asynchronous-\n      connection-failover.html.\n\no SOURCE_DELAY\n\n  Specifies how many seconds behind the source the replica must lag. An\n  event received from the source is not executed until at least\n  interval seconds later than its execution on the source. The default\n  is 0. An error occurs if interval is not a nonnegative integer in the\n  range from 0 to 231−1. For more information, see\n  https://dev.mysql.com/doc/refman/8.0/en/replication-delayed.html. A\n  CHANGE REPLICATION SOURCE TO statement using the SOURCE_DELAY option\n  can be executed on a running replica when the replication SQL thread\n  is stopped.\n\no SOURCE_HEARTBEAT_PERIOD\n\n  Controls the heartbeat interval, which stops the connection timeout\n  occurring in the absence of data if the connection is still good. A\n  heartbeat signal is sent to the replica after that number of seconds,\n  and the waiting period is reset whenever the source\'s binary log is\n  updated with an event. Heartbeats are therefore sent by the source\n  only if there are no unsent events in the binary log file for a\n  period longer than this.\n\n  The heartbeat interval interval is a decimal value having the range 0\n  to 4294967 seconds and a resolution in milliseconds; the smallest\n  nonzero value is 0.001. Setting interval to 0 disables heartbeats\n  altogether. The heartbeat interval defaults to half the value of the\n  replica_net_timeout or slave_net_timeout system variable. It is\n  recorded in the source metadata repository and shown in the\n  replication_connection_configuration Performance Schema table.\n  Issuing RESET REPLICA resets the heartbeat interval to the default\n  value.\n\n  The system variable replica_net_timeout (from MySQL 8.0.26) or\n  slave_net_timeout (before MySQL 8.0.26) specifies the number of\n  seconds that the replica waits for either more data or a heartbeat\n  signal from the source, before the replica considers the connection\n  broken, aborts the read, and tries to reconnect. The default value is\n  60 seconds (one minute). Note that a change to the value or default\n  setting of replica_net_timeout or slave_net_timeout does not\n  automatically change the heartbeat interval, whether that has been\n  set explicitly or is using a previously calculated default. A warning\n  is issued if you set the global value of replica_net_timeout or\n  slave_net_timeout to a value less than that of the current heartbeat\n  interval. If replica_net_timeout or slave_net_timeout is changed, you\n  must also issue CHANGE REPLICATION SOURCE TO to adjust the heartbeat\n  interval to an appropriate value so that the heartbeat signal occurs\n  before the connection timeout. If you do not do this, the heartbeat\n  signal has no effect, and if no data is received from the source, the\n  replica can make repeated reconnection attempts, creating zombie dump\n  threads.\n\no SOURCE_HOST\n\n  The host name or IP address of the replication source server. The\n  replica uses this to connect to the source.\n\n  If you specify SOURCE_HOST or SOURCE_PORT, the replica assumes that\n  the source server is different from before (even if the option value\n  is the same as its current value.) In this case, the old values for\n  the source\'s binary log file name and position are considered no\n  longer applicable, so if you do not specify SOURCE_LOG_FILE and\n  SOURCE_LOG_POS in the statement, SOURCE_LOG_FILE=\'\' and\n  SOURCE_LOG_POS=4 are silently appended to it.\n\n  Setting SOURCE_HOST=\'\' (that is, setting its value explicitly to an\n  empty string) is not the same as not setting SOURCE_HOST at all.\n  Trying to set SOURCE_HOST to an empty string fails with an error.\n\no SOURCE_LOG_FILE, SOURCE_LOG_POS\n\n  The binary log file name, and the location in that file, at which the\n  replication I/O (receiver) thread begins reading from the source\'s\n  binary log the next time the thread starts. Specify these options if\n  you are using binary log file position based replication.\n  SOURCE_LOG_FILE must include the numeric suffix of a specific binary\n  log file that is available on the source server, for example,\n  SOURCE_LOG_FILE=\'binlog.000145\'. SOURCE_LOG_POS is the numeric\n  position for the replica to start reading in that file.\n  SOURCE_LOG_POS=4 represents the start of the events in a binary log\n  file.\n\n  If you specify either of SOURCE_LOG_FILE or SOURCE_LOG_POS, you\n  cannot specify SOURCE_AUTO_POSITION = 1, which is for GTID-based\n  replication.\n\n  If neither of SOURCE_LOG_FILE or SOURCE_LOG_POS is specified, the\n  replica uses the last coordinates of the replication SQL thread\n  before CHANGE REPLICATION SOURCE TO was issued. This ensures that\n  there is no discontinuity in replication, even if the replication SQL\n  (applier) thread was late compared to the replication I/O (receiver)\n  thread.\n\no SOURCE_PASSWORD\n\n  The password for the replication user account to use for connecting\n  to the replication source server. If you specify SOURCE_PASSWORD,\n  SOURCE_USER is also required.\n\n  The password used for a replication user account in a CHANGE\n  REPLICATION SOURCE TO statement is limited to 32 characters in\n  length. Trying to use a password of more than 32 characters causes\n  CHANGE REPLICATION SOURCE TO to fail.\n\no SOURCE_PORT\n\n  The TCP/IP port number that the replica uses to connect to the\n  replication source server.\n\n  *Note*:\n\n  Replication cannot use Unix socket files. You must be able to connect\n  to the replication source server using TCP/IP.\n\n  If you specify SOURCE_HOST or SOURCE_PORT, the replica assumes that\n  the source server is different from before (even if the option value\n  is the same as its current value.) In this case, the old values for\n  the source\'s binary log file name and position are considered no\n  longer applicable, so if you do not specify SOURCE_LOG_FILE and\n  SOURCE_LOG_POS in the statement, SOURCE_LOG_FILE=\'\' and\n  SOURCE_LOG_POS=4 are silently appended to it.\n\no SOURCE_PUBLIC_KEY_PATH\n\n  Enables RSA key pair-based password exchange by providing the path\n  name to a file containing a replica-side copy of the public key\n  required by the source. The file must be in PEM format. This option\n  applies to replicas that authenticate with the sha256_password or\n  caching_sha2_password authentication plugin. (For sha256_password,\n  SOURCE_PUBLIC_KEY_PATH can be used only if MySQL was built using\n  OpenSSL.) If you are using a replication user account that\n  authenticates with the caching_sha2_password plugin (which is the\n  default from MySQL 8.0), and you are not using a secure connection,\n  you must specify either this option or the GET_SOURCE_PUBLIC_KEY=1\n  option to provide the RSA public key to the replica.\n\no SOURCE_RETRY_COUNT\n\n  Sets the maximum number of reconnection attempts that the replica\n  makes after the connection to the source times out, as determined by\n  the replica_net_timeout or slave_net_timeout system variable. If the\n  replica does need to reconnect, the first retry occurs immediately\n  after the timeout.\n\n  The interval between the attempts is specified by the\n  SOURCE_CONNECT_RETRY option. If both the default settings are used,\n  the replica waits 60 seconds between reconnection attempts\n  (SOURCE_CONNECT_RETRY=60), and keeps attempting to reconnect at this\n  rate for 60 days (SOURCE_RETRY_COUNT=86400). A setting of 0 for\n  SOURCE_RETRY_COUNT means that there is no limit on the number of\n  reconnection attempts, so the replica keeps trying to reconnect\n  indefinitely.\n\n  The values for SOURCE_CONNECT_RETRY and SOURCE_RETRY_COUNT are\n  recorded in the source metadata repository and shown in the\n  replication_connection_configuration Performance Schema table.\n  SOURCE_RETRY_COUNT supersedes the --master-retry-count server startup\n  option.\n\no SOURCE_SSL_xxx, SOURCE_TLS_xxx\n\n  Specify how the replica uses encryption and ciphers to secure the\n  replication connection. These options can be changed even on replicas\n  that are compiled without SSL support. They are saved to the source\n  metadata repository, but are ignored if the replica does not have SSL\n  support enabled. The SOURCE_SSL_xxx and SOURCE_TLS_xxx options\n  perform the same functions as the --ssl-xxx and --tls-xxx client\n  options described in\n  https://dev.mysql.com/doc/refman/8.0/en/connection-options.html#encry\n  pted-connection-options. The correspondence between the two sets of\n  options, and the use of the SOURCE_SSL_xxx and SOURCE_TLS_xxx options\n  to set up a secure connection, is explained in\n  https://dev.mysql.com/doc/refman/8.0/en/replication-solutions-encrypt\n  ed-connections.html.\n\no SOURCE_USER\n\n  The user name for the replication user account to use for connecting\n  to the replication source server.\n\n  *Important*:\n\n  To connect to the source using a replication user account that\n  authenticates with the caching_sha2_password plugin, you must either\n  set up a secure connection as described in\n  https://dev.mysql.com/doc/refman/8.0/en/replication-solutions-encrypt\n  ed-connections.html, or enable the unencrypted connection to support\n  password exchange using an RSA key pair. The caching_sha2_password\n  authentication plugin is the default for new users created from MySQL\n  8.0 (for details, see\n  https://dev.mysql.com/doc/refman/8.0/en/caching-sha2-pluggable-authen\n  tication.html). If the user account that you create or use for\n  replication uses this authentication plugin, and you are not using a\n  secure connection, you must enable RSA key pair-based password\n  exchange for a successful connection. You can do this using either\n  the SOURCE_PUBLIC_KEY_PATH option or the GET_SOURCE_PUBLIC_KEY=1\n  option for this statement.\n\n  It is possible to set an empty user name by specifying\n  SOURCE_USER=\'\', but the replication channel cannot be started with an\n  empty user name. In releases before MySQL 8.0.21, only set an empty\n  SOURCE_USER user name if you need to clear previously used\n  credentials from the replication metadata repositories for security\n  purposes. Do not use the channel afterwards, due to a bug in these\n  releases that can substitute a default user name if an empty user\n  name is read from the repositories (for example, during an automatic\n  restart of a Group Replication channel). From MySQL 8.0.21, it is\n  valid to set an empty SOURCE_USER user name and use the channel\n  afterwards if you always provide user credentials using the START\n  REPLICA statement or START GROUP_REPLICATION statement that starts\n  the replication channel. This approach means that the replication\n  channel always needs operator intervention to restart, but the user\n  credentials are not recorded in the replication metadata\n  repositories.\n\n  The text of a running CHANGE REPLICATION SOURCE TO statement,\n  including values for SOURCE_USER and SOURCE_PASSWORD, can be seen in\n  the output of a concurrent SHOW PROCESSLIST statement. (The complete\n  text of a START REPLICA statement is also visible to SHOW\n  PROCESSLIST.)\n\no SOURCE_ZSTD_COMPRESSION_LEVEL\n\n  The compression level to use for connections to the replication\n  source server that use the zstd compression algorithm. The permitted\n  levels are from 1 to 22, with larger values indicating increasing\n  levels of compression. The default zstd compression level is 3. The\n  compression level setting has no effect on connections that do not\n  use zstd compression. SOURCE_ZSTD_COMPRESSION_LEVEL is available as\n  of MySQL 8.0.18. For more information, see\n  https://dev.mysql.com/doc/refman/8.0/en/connection-compression-contro\n  l.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/change-replication-source-to.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/change-replication-source-to.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (578,43,'RESET REPLICA','Syntax:\nRESET REPLICA [ALL] [channel_option]\n\nchannel_option:\n    FOR CHANNEL channel\n\nRESET REPLICA makes the replica forget its position in the source\'s\nbinary log. From MySQL 8.0.22, use RESET REPLICA in place of RESET\nSLAVE, which is deprecated from that release. In releases before MySQL\n8.0.22, use RESET SLAVE.\n\nThis statement is meant to be used for a clean start; it clears the\nreplication metadata repositories, deletes all the relay log files, and\nstarts a new relay log file. It also resets to 0 the replication delay\nspecified with the SOURCE_DELAY | MASTER_DELAY option of the CHANGE\nREPLICATION SOURCE TO statement (from MySQL 8.0.23) or CHANGE MASTER TO\nstatement (before MySQL 8.0.23).\n\n*Note*:\n\nAll relay log files are deleted, even if they have not been completely\nexecuted by the replication SQL thread. (This is a condition likely to\nexist on a replica if you have issued a STOP REPLICA statement or if\nthe replica is highly loaded.)\n\nFor a server where GTIDs are in use (gtid_mode is ON), issuing RESET\nREPLICA has no effect on the GTID execution history. The statement does\nnot change the values of gtid_executed or gtid_purged, or the\nmysql.gtid_executed table. If you need to reset the GTID execution\nhistory, use RESET MASTER, even if the GTID-enabled server is a replica\nwhere binary logging is disabled.\n\nRESET REPLICA requires the RELOAD privilege.\n\nTo use RESET REPLICA, the replication SQL thread and replication I/O\n(receiver) thread must be stopped, so on a running replica use STOP\nREPLICA before issuing RESET REPLICA. To use RESET REPLICA on a Group\nReplication group member, the member status must be OFFLINE, meaning\nthat the plugin is loaded but the member does not currently belong to\nany group. A group member can be taken offline by using a STOP GROUP\nREPLICATION statement.\n\nThe optional FOR CHANNEL channel clause enables you to name which\nreplication channel the statement applies to. Providing a FOR CHANNEL\nchannel clause applies the RESET REPLICA statement to a specific\nreplication channel. Combining a FOR CHANNEL channel clause with the\nALL option deletes the specified channel. If no channel is named and no\nextra channels exist, the statement applies to the default channel.\nIssuing a RESET REPLICA ALL statement without a FOR CHANNEL channel\nclause when multiple replication channels exist deletes all replication\nchannels and recreates only the default channel. See\nhttps://dev.mysql.com/doc/refman/8.0/en/replication-channels.html for\nmore information.\n\nRESET REPLICA does not change any replication connection parameters,\nwhich include the source\'s host name and port, the replication user\naccount and its password, the PRIVILEGE_CHECKS_USER account, the\nREQUIRE_ROW_FORMAT option, the REQUIRE_TABLE_PRIMARY_KEY_CHECK option,\nand the ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS option. If you want to\nchange any of the replication connection parameters, you can do this\nusing a CHANGE REPLICATION SOURCE TO statement (from MySQL 8.0.23) or\nCHANGE MASTER TO statement (before MySQL 8.0.23) after the server\nstart. If you want to remove all of the replication connection\nparameters, use RESET REPLICA ALL. RESET REPLICA ALL also clears the\nIGNORE_SERVER_IDS list set by CHANGE REPLICATION SOURCE TO | CHANGE\nMASTER TO. When you have used RESET REPLICA ALL, if you want to use the\ninstance as a replica again, you need to issue a CHANGE REPLICATION\nSOURCE TO | CHANGE MASTER TO statement after the server start to\nspecify new connection parameters.\n\nIn the event of an unexpected server exit or deliberate restart after\nissuing RESET REPLICA but before issuing START REPLICA, retention of\nthe replication connection parameters depends on the repository used\nfor the replication metadata:\n\no When master_info_repository=TABLE and relay_log_info_repository=TABLE\n  are set on the server (which are the default settings from MySQL\n  8.0), replication connection parameters are preserved in the\n  crash-safe InnoDB tables mysql.slave_master_info and\n  mysql.slave_relay_log_info as part of the RESET REPLICA operation.\n  They are also retained in memory. In the event of an unexpected\n  server exit or deliberate restart after issuing RESET REPLICA but\n  before issuing START REPLICA, the replication connection parameters\n  are retrieved from the tables and reapplied to the channel. This\n  situation applies from MySQL 8.0.13 for the connection metadata\n  repository, and from MySQL 8.0.19 for the applier metadata\n  repository.\n\no If master_info_repository=FILE and relay_log_info_repository=FILE are\n  set on the server, which is deprecated from MySQL 8.0, or the MySQL\n  Server release is earlier than those specified above, replication\n  connection parameters are only retained in memory. If the replica\n  mysqld is restarted immediately after issuing RESET REPLICA due to an\n  unexpected server exit or deliberate restart, the connection\n  parameters are lost. In that case, you must issue a CHANGE\n  REPLICATION SOURCE TO statement (from MySQL 8.0.23) or CHANGE MASTER\n  TO statement (before MySQL 8.0.23) after the server start to\n  respecify the connection parameters before issuing START REPLICA.\n\nRESET REPLICA does not change any replication filter settings (such as\n--replicate-ignore-table) for channels affected by the statement.\nHowever, RESET REPLICA ALL removes the replication filters that were\nset on the channels deleted by the statement. When the deleted channel\nor channels are recreated, any global replication filters specified for\nthe replica are copied to them, and no channel specific replication\nfilters are applied. For more information see\nhttps://dev.mysql.com/doc/refman/8.0/en/replication-rules-channel-based\n-filters.html.\n\nRESET REPLICA causes an implicit commit of an ongoing transaction. See\nhttps://dev.mysql.com/doc/refman/8.0/en/implicit-commit.html.\n\nIf the replication SQL thread was in the middle of replicating\ntemporary tables when it was stopped, and RESET REPLICA is issued,\nthese replicated temporary tables are deleted on the replica.\n\nRESET REPLICA does not reset the heartbeat period or\nSSL_VERIFY_SERVER_CERT.\n\n*Note*:\n\nWhen used on an NDB Cluster replica SQL node, RESET REPLICA clears the\nmysql.ndb_apply_status table. You should keep in mind when using this\nstatement that ndb_apply_status uses the NDB storage engine and so is\nshared by all SQL nodes attached to the cluster.\n\nYou can override this behavior by issuing SET GLOBAL\n@@ndb_clear_apply_status=OFF prior to executing RESET REPLICA, which\nkeeps the replica from purging the ndb_apply_status table in such\ncases.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/reset-replica.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/reset-replica.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (579,43,'RESET SLAVE','Syntax:\nRESET {SLAVE | REPLICA} [ALL] [channel_option]\n\nchannel_option:\n    FOR CHANNEL channel\n\nMakes the replica forget its position in the source\'s binary log. From\nMySQL 8.0.22, RESET SLAVE is deprecated and the alias RESET REPLICA\nshould be used instead. In releases before MySQL 8.0.22, use RESET\nSLAVE. The statement works in the same way as before, only the\nterminology used for the statement and its output has changed. Both\nversions of the statement update the same status variables when used.\nPlease see the documentation for RESET REPLICA for a description of the\nstatement.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/reset-slave.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/reset-slave.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (580,43,'START REPLICA','Syntax:\nSTART REPLICA [thread_types] [until_option] [connection_options] [channel_option]\n\nthread_types:\n    [thread_type [, thread_type] ... ]\n\nthread_type:\n    IO_THREAD | SQL_THREAD\n\nuntil_option:\n    UNTIL {   {SQL_BEFORE_GTIDS | SQL_AFTER_GTIDS} = gtid_set\n          |   MASTER_LOG_FILE = \'log_name\', MASTER_LOG_POS = log_pos\n          |   SOURCE_LOG_FILE = \'log_name\', SOURCE_LOG_POS = log_pos\n          |   RELAY_LOG_FILE = \'log_name\', RELAY_LOG_POS = log_pos\n          |   SQL_AFTER_MTS_GAPS  }\n\nconnection_options:\n    [USER=\'user_name\'] [PASSWORD=\'user_pass\'] [DEFAULT_AUTH=\'plugin_name\'] [PLUGIN_DIR=\'plugin_dir\']\n\n\nchannel_option:\n    FOR CHANNEL channel\n\ngtid_set:\n    uuid_set [, uuid_set] ...\n    | \'\'\n\nuuid_set:\n    uuid:interval[:interval]...\n\nuuid:\n    hhhhhhhh-hhhh-hhhh-hhhh-hhhhhhhhhhhh\n\nh:\n    [0-9,A-F]\n\ninterval:\n    n[-n]\n\n    (n >= 1)\n\nSTART REPLICA starts one or both of the replication threads. From MySQL\n8.0.22, use START REPLICA in place of START SLAVE, which is deprecated\nfrom that release. In releases before MySQL 8.0.22, use START SLAVE.\n\nSTART REPLICA with no thread_type options starts both of the\nreplication threads. The replication I/O (receiver) thread reads events\nfrom the source server and stores them in the relay log. The\nreplication SQL (applier) thread reads events from the relay log and\nexecutes them. START REPLICA requires the REPLICATION_SLAVE_ADMIN\nprivilege (or the deprecated SUPER privilege).\n\nIf START REPLICA succeeds in starting the replication threads, it\nreturns without any error. However, even in that case, it might be that\nthe replication threads start and then later stop (for example, because\nthey do not manage to connect to the source or read its binary log, or\nsome other problem). START REPLICA does not warn you about this. You\nmust check the replica\'s error log for error messages generated by the\nreplication threads, or check that they are running satisfactorily with\nSHOW REPLICA STATUS.\n\nSTART REPLICA causes an implicit commit of an ongoing transaction. See\nhttps://dev.mysql.com/doc/refman/8.0/en/implicit-commit.html.\n\ngtid_next must be set to AUTOMATIC before issuing this statement.\n\nThe optional FOR CHANNEL channel clause enables you to name which\nreplication channel the statement applies to. Providing a FOR CHANNEL\nchannel clause applies the START REPLICA statement to a specific\nreplication channel. If no clause is named and no extra channels exist,\nthe statement applies to the default channel. If a START REPLICA\nstatement does not have a channel defined when using multiple channels,\nthis statement starts the specified threads for all channels. This\nstatement is disallowed for the group_replication_recovery channel. See\nhttps://dev.mysql.com/doc/refman/8.0/en/replication-channels.html for\nmore information.\n\nYou can add IO_THREAD and SQL_THREAD options to the statement to name\nwhich of the threads to start. Note that the Group Replication applier\nchannel (group_replication_applier) has no I/O (receiver) thread, only\nan SQL (applier) thread. Specifying the IO_THREAD or SQL_THREAD options\nwhen you start this channel has no benefit.\n\nSTART REPLICA supports pluggable user-password authentication with the\nUSER, PASSWORD, DEFAULT_AUTH and PLUGIN_DIR options, as described in\nthe following list:\n\no USER: User name. Cannot be set to an empty or null string, or left\n  unset if PASSWORD is used.\n\no PASSWORD: Password.\n\no DEFAULT_AUTH: Name of plugin; default is MySQL native authentication.\n\no PLUGIN_DIR: Location of plugin.\n\nYou cannot use the SQL_THREAD option when specifying any of USER,\nPASSWORD, DEFAULT_AUTH, or PLUGIN_DIR, unless the IO_THREAD option is\nalso provided.\n\nFor more information, see\nhttps://dev.mysql.com/doc/refman/8.0/en/pluggable-authentication.html.\n\nIf an insecure connection is used with any these options, the server\nissues the warning Sending passwords in plain text without SSL/TLS is\nextremely insecure.\n\nSTART REPLICA ... UNTIL supports two additional options for use with\nglobal transaction identifiers (GTIDs) (see\nhttps://dev.mysql.com/doc/refman/8.0/en/replication-gtids.html). Each\nof these takes a set of one or more global transaction identifiers\ngtid_set as an argument (see\nhttps://dev.mysql.com/doc/refman/8.0/en/replication-gtids-concepts.html\n#replication-gtids-concepts-gtid-sets, for more information).\n\nWhen no thread_type is specified, START REPLICA UNTIL SQL_BEFORE_GTIDS\ncauses the replication SQL thread to process transactions until it has\nreached the first transaction whose GTID is listed in the gtid_set.\nSTART REPLICA UNTIL SQL_AFTER_GTIDS causes the replication threads to\nprocess all transactions until the last transaction in the gtid_set has\nbeen processed by both threads. In other words, START REPLICA UNTIL\nSQL_BEFORE_GTIDS causes the replication SQL thread to process all\ntransactions occurring before the first GTID in the gtid_set is\nreached, and START REPLICA UNTIL SQL_AFTER_GTIDS causes the replication\nthreads to handle all transactions, including those whose GTIDs are\nfound in gtid_set, until each has encountered a transaction whose GTID\nis not part of the set. SQL_BEFORE_GTIDS and SQL_AFTER_GTIDS each\nsupport the SQL_THREAD and IO_THREAD options, although using IO_THREAD\nwith them currently has no effect.\n\nFor example, START REPLICA SQL_THREAD UNTIL SQL_BEFORE_GTIDS =\n3E11FA47-71CA-11E1-9E33-C80AA9429562:11-56 causes the replication SQL\nthread to process all transactions originating from the source whose\nserver_uuid is 3E11FA47-71CA-11E1-9E33-C80AA9429562 until it encounters\nthe transaction having sequence number 11; it then stops without\nprocessing this transaction. In other words, all transactions up to and\nincluding the transaction with sequence number 10 are processed.\nExecuting START REPLICA SQL_THREAD UNTIL SQL_AFTER_GTIDS =\n3E11FA47-71CA-11E1-9E33-C80AA9429562:11-56, on the other hand, would\ncause the replication SQL thread to obtain all transactions just\nmentioned from the source, including all of the transactions having the\nsequence numbers 11 through 56, and then to stop without processing any\nadditional transactions; that is, the transaction having sequence\nnumber 56 would be the last transaction fetched by the replication SQL\nthread.\n\nWhen using a multithreaded replica with slave_preserve_commit_order=0\nset, there is a chance of gaps in the sequence of transactions that\nhave been executed from the relay log in the following cases:\n\no killing the coordinator thread\n\no after an error occurs in the applier threads\n\no mysqld shuts down unexpectedly\n\nUse the START REPLICA UNTIL SQL_AFTER_MTS_GAPS statement to cause a\nmultithreaded replica\'s worker threads to only run until no more gaps\nare found in the relay log, and then to stop. This statement can take\nan SQL_THREAD option, but the effects of the statement remain\nunchanged. It has no effect on the replication I/O (receiver) thread\n(and cannot be used with the IO_THREAD option).\n\nBefore MySQL 8.0.26, issuing START REPLICA on a multithreaded replica\nwith gaps in the sequence of transactions executed from the relay log\ngenerates a warning. In such a situation, the solution is to use START\nREPLICA UNTIL SQL_AFTER_MTS_GAPS, then issue RESET REPLICA to remove\nany remaining relay logs. From MySQL 8.0.26, the process of checking\nfor gaps in the sequence of transactions is skipped entirely when\nGTID-based replication and GTID auto-positioning are in use, because\ngaps in transactions can be resolved using GTID auto-positioning. In\nthat situation, START REPLICA UNTIL SQL_AFTER_MTS_GAPS just stops the\napplier thread when it finds the first event to execute, and does not\nattempt to check for gaps in the sequence of transactions. See\nhttps://dev.mysql.com/doc/refman/8.0/en/replication-features-transactio\nn-inconsistencies.html for more information.\n\nTo change a failed multithreaded replica to single-threaded mode, you\ncan issue the following series of statements, in the order shown:\n\nSTART SLAVE UNTIL SQL_AFTER_MTS_GAPS;\nSET @@GLOBAL.slave_parallel_workers = 0;\nSTART SLAVE SQL_THREAD;\n\nOr from MySQL 8.0.26:\nSTART REPLICA UNTIL SQL_AFTER_MTS_GAPS;\nSET @@GLOBAL.replica_parallel_workers = 0;\nSTART REPLICA SQL_THREAD;\n\n*Note*:\n\nIt is possible to view the entire text of a running START REPLICA\nstatement, including any USER or PASSWORD values used, in the output of\nSHOW PROCESSLIST. This is also true for the text of a running CHANGE\nREPLICATION SOURCE TO | CHANGE MASTER TO statement, including any\nvalues it employs for SOURCE_USER | MASTER_USER or SOURCE_PASSWORD |\nMASTER_PASSWORD.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/start-replica.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/start-replica.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (581,43,'START SLAVE','Syntax:\nSTART {SLAVE | REPLICA} [thread_types] [until_option] [connection_options] [channel_option]\n\nthread_types:\n    [thread_type [, thread_type] ... ]\n\nthread_type:\n    IO_THREAD | SQL_THREAD\n\nuntil_option:\n    UNTIL {   {SQL_BEFORE_GTIDS | SQL_AFTER_GTIDS} = gtid_set\n          |   MASTER_LOG_FILE = \'log_name\', MASTER_LOG_POS = log_pos\n          |   SOURCE_LOG_FILE = \'log_name\', SOURCE_LOG_POS = log_pos\n          |   RELAY_LOG_FILE = \'log_name\', RELAY_LOG_POS = log_pos\n          |   SQL_AFTER_MTS_GAPS  }\n\nconnection_options:\n    [USER=\'user_name\'] [PASSWORD=\'user_pass\'] [DEFAULT_AUTH=\'plugin_name\'] [PLUGIN_DIR=\'plugin_dir\']\n\n\nchannel_option:\n    FOR CHANNEL channel\n\ngtid_set:\n    uuid_set [, uuid_set] ...\n    | \'\'\n\nuuid_set:\n    uuid:interval[:interval]...\n\nuuid:\n    hhhhhhhh-hhhh-hhhh-hhhh-hhhhhhhhhhhh\n\nh:\n    [0-9,A-F]\n\ninterval:\n    n[-n]\n\n    (n >= 1)\n\nStarts the replication threads. From MySQL 8.0.22, START SLAVE is\ndeprecated and the alias START REPLICA should be used instead. The\nstatement works in the same way as before, only the terminology used\nfor the statement and its output has changed. Both versions of the\nstatement update the same status variables when used. Please see the\ndocumentation for START REPLICA for a description of the statement.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/start-slave.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/start-slave.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (582,43,'STOP REPLICA','Syntax:\nSTOP REPLICA [thread_types] [channel_option]\n\nthread_types:\n    [thread_type [, thread_type] ... ]\n\nthread_type: IO_THREAD | SQL_THREAD\n\nchannel_option:\n    FOR CHANNEL channel\n\nStops the replication threads. From MySQL 8.0.22, use STOP REPLICA in\nplace of STOP SLAVE, which is now deprecated. In releases before MySQL\n8.0.22, use STOP SLAVE.\n\nSTOP REPLICA requires the REPLICATION_SLAVE_ADMIN privilege (or the\ndeprecated SUPER privilege). Recommended best practice is to execute\nSTOP REPLICA on the replica before stopping the replica server (see\nhttps://dev.mysql.com/doc/refman/8.0/en/server-shutdown.html, for more\ninformation).\n\nLike START REPLICA, this statement may be used with the IO_THREAD and\nSQL_THREAD options to name the replication thread or threads to be\nstopped. Note that the Group Replication applier channel\n(group_replication_applier) has no replication I/O (receiver) thread,\nonly a replication SQL (applier) thread. Using the SQL_THREAD option\ntherefore stops this channel completely.\n\nSTOP REPLICA causes an implicit commit of an ongoing transaction. See\nhttps://dev.mysql.com/doc/refman/8.0/en/implicit-commit.html.\n\ngtid_next must be set to AUTOMATIC before issuing this statement.\n\nYou can control how long STOP REPLICA waits before timing out by\nsetting the system variable rpl_stop_replica_timeout (from MySQL\n8.0.26) or rpl_stop_slave_timeout (before MySQL 8.0.26). This can be\nused to avoid deadlocks between STOP REPLICA and other SQL statements\nusing different client connections to the replica. When the timeout\nvalue is reached, the issuing client returns an error message and stops\nwaiting, but the STOP REPLICA instruction remains in effect. Once the\nreplication threads are no longer busy, the STOP REPLICA statement is\nexecuted and the replica stops.\n\nSome CHANGE REPLICATION SOURCE TO | CHANGE MASTER TO statements are\nallowed while the replica is running, depending on the states of the\nreplication threads. However, using STOP REPLICA prior to executing a\nCHANGE REPLICATION SOURCE TO | CHANGE MASTER TO statement in such cases\nis still supported. See [HELP CHANGE REPLICATION SOURCE TO], [HELP\nCHANGE MASTER TO], and\nhttps://dev.mysql.com/doc/refman/8.0/en/replication-solutions-switch.ht\nml, for more information.\n\nThe optional FOR CHANNEL channel clause enables you to name which\nreplication channel the statement applies to. Providing a FOR CHANNEL\nchannel clause applies the STOP REPLICA statement to a specific\nreplication channel. If no channel is named and no extra channels\nexist, the statement applies to the default channel. If a STOP REPLICA\nstatement does not name a channel when using multiple channels, this\nstatement stops the specified threads for all channels. This statement\ncannot be used with the group_replication_recovery channel. See\nhttps://dev.mysql.com/doc/refman/8.0/en/replication-channels.html for\nmore information.\n\nWhen the replica is multithreaded (replica_parallel_workers or\nslave_parallel_workers is a nonzero value), any gaps in the sequence of\ntransactions executed from the relay log are closed as part of stopping\nthe worker threads. If the replica is stopped unexpectedly (for example\ndue to an error in a worker thread, or another thread issuing KILL)\nwhile a STOP REPLICA statement is executing, the sequence of executed\ntransactions from the relay log may become inconsistent. See\nhttps://dev.mysql.com/doc/refman/8.0/en/replication-features-transactio\nn-inconsistencies.html, for more information.\n\nWhen the source is using the row-based binary logging format, you\nshould execute STOP REPLICA or STOP REPLICA SQL_THREAD on the replica\nprior to shutting down the replica server if you are replicating any\ntables that use a nontransactional storage engine. If the current\nreplication event group has modified one or more nontransactional\ntables, STOP REPLICA waits for up to 60 seconds for the event group to\ncomplete, unless you issue a KILL QUERY or KILL CONNECTION statement\nfor the replication SQL thread. If the event group remains incomplete\nafter the timeout, an error message is logged.\n\nWhen the source is using the statement-based binary logging format,\nchanging the source while it has open temporary tables is potentially\nunsafe. This is one of the reasons why statement-based replication of\ntemporary tables is not recommended. You can find out whether there are\nany temporary tables on the replica by checking the value of\nReplica_open_temp_tables or Slave_open_temp_tables. When using\nstatement-based replication, this value should be 0 before executing\nCHANGE REPLICATION SOURCE TO | CHANGE MASTER TO. If there are any\ntemporary tables open on the replica, issuing a CHANGE REPLICATION\nSOURCE TO | CHANGE MASTER TO statement after issuing a STOP REPLICA\ncauses an ER_WARN_OPEN_TEMP_TABLES_MUST_BE_ZERO\n(https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference.h\ntml#error_er_warn_open_temp_tables_must_be_zero) warning.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/stop-replica.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/stop-replica.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (583,43,'STOP SLAVE','Syntax:\nSTOP {SLAVE | REPLICA} [thread_types] [channel_option]\n\nthread_types:\n    [thread_type [, thread_type] ... ]\n\nthread_type: IO_THREAD | SQL_THREAD\n\nchannel_option:\n    FOR CHANNEL channel\n\nStops the replication threads. From MySQL 8.0.22, STOP SLAVE is\ndeprecated and the alias STOP REPLICA should be used instead. The\nstatement works in the same way as before, only the terminology used\nfor the statement and its output has changed. Both versions of the\nstatement update the same status variables when used. Please see the\ndocumentation for STOP REPLICA for a description of the statement.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/stop-slave.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/stop-slave.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (584,44,'PREPARE','Syntax:\nPREPARE stmt_name FROM preparable_stmt\n\nThe PREPARE statement prepares a SQL statement and assigns it a name,\nstmt_name, by which to refer to the statement later. The prepared\nstatement is executed with EXECUTE and released with DEALLOCATE\nPREPARE. For examples, see\nhttps://dev.mysql.com/doc/refman/8.0/en/sql-prepared-statements.html.\n\nStatement names are not case-sensitive. preparable_stmt is either a\nstring literal or a user variable that contains the text of the SQL\nstatement. The text must represent a single statement, not multiple\nstatements. Within the statement, ? characters can be used as parameter\nmarkers to indicate where data values are to be bound to the query\nlater when you execute it. The ? characters should not be enclosed\nwithin quotation marks, even if you intend to bind them to string\nvalues. Parameter markers can be used only where data values should\nappear, not for SQL keywords, identifiers, and so forth.\n\nIf a prepared statement with the given name already exists, it is\ndeallocated implicitly before the new statement is prepared. This means\nthat if the new statement contains an error and cannot be prepared, an\nerror is returned and no statement with the given name exists.\n\nThe scope of a prepared statement is the session within which it is\ncreated, which as several implications:\n\no A prepared statement created in one session is not available to other\n  sessions.\n\no When a session ends, whether normally or abnormally, its prepared\n  statements no longer exist. If auto-reconnect is enabled, the client\n  is not notified that the connection was lost. For this reason,\n  clients may wish to disable auto-reconnect. See Automatic\n  Reconnection Control\n  (https://dev.mysql.com/doc/c-api/8.0/en/c-api-auto-reconnect.html).\n\no A prepared statement created within a stored program continues to\n  exist after the program finishes executing and can be executed\n  outside the program later.\n\no A statement prepared in stored program context cannot refer to stored\n  procedure or function parameters or local variables because they go\n  out of scope when the program ends and would be unavailable were the\n  statement to be executed later outside the program. As a workaround,\n  refer instead to user-defined variables, which also have session\n  scope; see\n  https://dev.mysql.com/doc/refman/8.0/en/user-variables.html.\n\nBeginning with MySQL 8.0.22, a parameter used in a prepared statement\nhas its type determined when the statement is first prepared, and\nretains this type whenever EXECUTE is invoked for this prepared\nstatement (unless the statement is reprepared, as explained later in\nthis section). Rules for determining a parameter\'s type are listed\nhere:\n\no A parameter which is an operand of a binary arithmetic operator has\n  the same data type as the other operand.\n\no If both operands of a binary arithmetic operator are parameters, the\n  type of the parameters is decided by the context of the operator.\n\no If a parameter is the operand of a unary arithmetic operator, the\n  parameter\'s type is decided by the context of the operator.\n\no If an arithmetic operator has no type-determining context, the\n  derived type for any parameters involved is DOUBLE PRECISION. This\n  can happen, for example, when the parameter is a top-level node in a\n  SELECT list, or when it is part of a comparison operator.\n\no A parameter which is an operand of a character string operator has\n  the same derived type as the aggregated type of the other operands.\n  If all operands of the operator are parameters, the derived type is\n  VARCHAR; its collation is determined by the value of\n  collation_connection.\n\no A parameter which is an operand of a temporal operator has type\n  DATETIME if the operator returns a DATETIME, TIME if the operator\n  returns a TIME, and DATE if the operator returns a DATE.\n\no A parameter which is an operand of a binary comparison operator has\n  the same derived type as the other operand of the comparison.\n\no A parameter that is an operand of a ternary comparison operator such\n  as BETWEEN has the same derived type as the aggregated type of the\n  other operands.\n\no If all operands of a comparison operator are parameters, the derived\n  type for each of them is VARCHAR, with collation determined by the\n  value of collation_connection.\n\no A parameter that is an output operand of any of CASE, COALESCE, IF,\n  IFNULL, or NULLIF has the same derived type as the aggregated type of\n  the operator\'s other output operands.\n\no If all output operands of any of CASE, COALESCE, IF, IFNULL, or\n  NULLIF are parameters, or they are all NULL, the type of the\n  parameter is decided by the context of the operator.\n\no If the parameter is an operand of any of of CASE, COALESCE(), IF, or\n  IFNULL, and has no type-determining context, the derived type for\n  each of the parameters involved is VARCHAR, and its collation is\n  determined by the value of collation_connection.\n\no A parameter which is the operand of a CAST() has the same type as\n  specified by the CAST().\n\no If a parameter is an immediate member of a SELECT list that is not\n  part of an INSERT statement, the derived type of the parameter is\n  VARCHAR, and its collation is determined by the value of\n  collation_connection.\n\no If a parameter is an immediate member of a SELECT list that is part\n  of an INSERT statement, the derived type of the parameter is the type\n  of the corresponding column into which the parameter is inserted.\n\no If a parameter is used as source for an assignment in a SET clause of\n  an UPDATE statement or in the ON DUPLICATE KEY UPDATE clause of an\n  INSERT statement, the derived type of the parameter is the type of\n  the corresponding column which is updated by the SET or ON DUPLICATE\n  KEY UPDATE clause.\n\no If a parameter is an argument of a function, the derived type depends\n  on the function\'s return type.\n\nFor some combinations of actual type and derived type, an automatic\nrepreparation of the statement is triggered, to ensure closer\ncompatibility with previous versions of MySQL. Repreparation does not\noccur if any of the following conditions are true:\n\no NULL is used as the actual parameter value.\n\no A parameter is an operand of a CAST(). (Instead, a cast to the\n  derived type is attempted, and an exception raised if the cast\n  fails.)\n\no A parameter is a string. (In this case, an implicit CAST(? AS\n  derived_type) is performed.)\n\no The derived type and actual type of the parameter are both INTEGER\n  and have the same sign.\n\no The parameter\'s derived type is DECIMAL and its actual type is either\n  DECIMAL or INTEGER.\n\no The derived type is DOUBLE and the actual type is any numeric type.\n\no Both the derived type and the actual type are string types.\n\no If the derived type is temporal and the actual type is temporal.\n  Exceptions: The derived type is TIME and the actual type is not TIME;\n  the derived type is DATE and the actual type is not DATE.\n\no The derived type is temporal and the actual type is numeric.\n\nFor cases other than those just listed, the statement is reprepared and\nthe actual parameter types are used instead of the derived parameter\ntypes.\n\nThese rules also apply to a user variable referenced in a prepared\nstatement.\n\nUsing a different data type for a given parameter or user variable\nwithin a prepared statement for executions of the statement subsequent\nto the first execution causes the statement to be reprepared. This is\nless efficient; it may also lead to the parameter\'s (or variable\'s)\nactual type to vary, and thus for results to be inconsistent, with\nsubsequent executions of the prepared statement. For these reasons, it\nis advisable to use the same data type for a given parameter when\nre-executing a prepared statement.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/prepare.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/prepare.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (585,44,'EXECUTE STATEMENT','Syntax:\nEXECUTE stmt_name\n    [USING @var_name [, @var_name] ...]\n\nAfter preparing a statement with PREPARE, you execute it with an\nEXECUTE statement that refers to the prepared statement name. If the\nprepared statement contains any parameter markers, you must supply a\nUSING clause that lists user variables containing the values to be\nbound to the parameters. Parameter values can be supplied only by user\nvariables, and the USING clause must name exactly as many variables as\nthe number of parameter markers in the statement.\n\nYou can execute a given prepared statement multiple times, passing\ndifferent variables to it or setting the variables to different values\nbefore each execution.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/execute.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/execute.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (586,44,'DEALLOCATE PREPARE','Syntax:\n{DEALLOCATE | DROP} PREPARE stmt_name\n\nTo deallocate a prepared statement produced with PREPARE, use a\nDEALLOCATE PREPARE statement that refers to the prepared statement\nname. Attempting to execute a prepared statement after deallocating it\nresults in an error. If too many prepared statements are created and\nnot deallocated by either the DEALLOCATE PREPARE statement or the end\nof the session, you might encounter the upper limit enforced by the\nmax_prepared_stmt_count system variable.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/deallocate-prepare.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/deallocate-prepare.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (587,44,'DROP PREPARE','Syntax:\n{DEALLOCATE | DROP} PREPARE stmt_name\n\nTo deallocate a prepared statement produced with PREPARE, use a\nDEALLOCATE PREPARE statement that refers to the prepared statement\nname. Attempting to execute a prepared statement after deallocating it\nresults in an error. If too many prepared statements are created and\nnot deallocated by either the DEALLOCATE PREPARE statement or the end\nof the session, you might encounter the upper limit enforced by the\nmax_prepared_stmt_count system variable.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/deallocate-prepare.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/deallocate-prepare.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (588,45,'BEGIN END','Syntax:\n[begin_label:] BEGIN\n    [statement_list]\nEND [end_label]\n\nBEGIN ... END syntax is used for writing compound statements, which can\nappear within stored programs (stored procedures and functions,\ntriggers, and events). A compound statement can contain multiple\nstatements, enclosed by the BEGIN and END keywords. statement_list\nrepresents a list of one or more statements, each terminated by a\nsemicolon (;) statement delimiter. The statement_list itself is\noptional, so the empty compound statement (BEGIN END) is legal.\n\nBEGIN ... END blocks can be nested.\n\nUse of multiple statements requires that a client is able to send\nstatement strings containing the ; statement delimiter. In the mysql\ncommand-line client, this is handled with the delimiter command.\nChanging the ; end-of-statement delimiter (for example, to //) permit ;\nto be used in a program body. For an example, see\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-programs-defining.html.\n\nA BEGIN ... END block can be labeled. See [HELP labels].\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/begin-end.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/begin-end.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (589,45,'LABELS','Syntax:\n[begin_label:] BEGIN\n    [statement_list]\nEND [end_label]\n\n[begin_label:] LOOP\n    statement_list\nEND LOOP [end_label]\n\n[begin_label:] REPEAT\n    statement_list\nUNTIL search_condition\nEND REPEAT [end_label]\n\n[begin_label:] WHILE search_condition DO\n    statement_list\nEND WHILE [end_label]\n\nLabels are permitted for BEGIN ... END blocks and for the LOOP, REPEAT,\nand WHILE statements. Label use for those statements follows these\nrules:\n\no begin_label must be followed by a colon.\n\no begin_label can be given without end_label. If end_label is present,\n  it must be the same as begin_label.\n\no end_label cannot be given without begin_label.\n\no Labels at the same nesting level must be distinct.\n\no Labels can be up to 16 characters long.\n\nTo refer to a label within the labeled construct, use an ITERATE or\nLEAVE statement. The following example uses those statements to\ncontinue iterating or terminate the loop:\n\nCREATE PROCEDURE doiterate(p1 INT)\nBEGIN\n  label1: LOOP\n    SET p1 = p1 + 1;\n    IF p1 < 10 THEN ITERATE label1; END IF;\n    LEAVE label1;\n  END LOOP label1;\nEND;\n\nThe scope of a block label does not include the code for handlers\ndeclared within the block. For details, see [HELP DECLARE HANDLER].\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/statement-labels.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/statement-labels.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (590,45,'DECLARE VARIABLE','Syntax:\nDECLARE var_name [, var_name] ... type [DEFAULT value]\n\nThis statement declares local variables within stored programs. To\nprovide a default value for a variable, include a DEFAULT clause. The\nvalue can be specified as an expression; it need not be a constant. If\nthe DEFAULT clause is missing, the initial value is NULL.\n\nLocal variables are treated like stored routine parameters with respect\nto data type and overflow checking. See [HELP CREATE PROCEDURE].\n\nVariable declarations must appear before cursor or handler\ndeclarations.\n\nLocal variable names are not case-sensitive. Permissible characters and\nquoting rules are the same as for other identifiers, as described in\nhttps://dev.mysql.com/doc/refman/8.0/en/identifiers.html.\n\nThe scope of a local variable is the BEGIN ... END block within which\nit is declared. The variable can be referred to in blocks nested within\nthe declaring block, except those blocks that declare a variable with\nthe same name.\n\nFor examples of variable declarations, see\nhttps://dev.mysql.com/doc/refman/8.0/en/local-variable-scope.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/declare-local-variable.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/declare-local-variable.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (591,45,'CASE STATEMENT','Syntax:\nCASE case_value\n    WHEN when_value THEN statement_list\n    [WHEN when_value THEN statement_list] ...\n    [ELSE statement_list]\nEND CASE\n\nOr:\n\nCASE\n    WHEN search_condition THEN statement_list\n    [WHEN search_condition THEN statement_list] ...\n    [ELSE statement_list]\nEND CASE\n\nThe CASE statement for stored programs implements a complex conditional\nconstruct.\n\n*Note*:\n\nThere is also a CASE operator, which differs from the CASE statement\ndescribed here. See\nhttps://dev.mysql.com/doc/refman/8.0/en/flow-control-functions.html.\nThe CASE statement cannot have an ELSE NULL clause, and it is\nterminated with END CASE instead of END.\n\nFor the first syntax, case_value is an expression. This value is\ncompared to the when_value expression in each WHEN clause until one of\nthem is equal. When an equal when_value is found, the corresponding\nTHEN clause statement_list executes. If no when_value is equal, the\nELSE clause statement_list executes, if there is one.\n\nThis syntax cannot be used to test for equality with NULL because NULL\n= NULL is false. See\nhttps://dev.mysql.com/doc/refman/8.0/en/working-with-null.html.\n\nFor the second syntax, each WHEN clause search_condition expression is\nevaluated until one is true, at which point its corresponding THEN\nclause statement_list executes. If no search_condition is equal, the\nELSE clause statement_list executes, if there is one.\n\nIf no when_value or search_condition matches the value tested and the\nCASE statement contains no ELSE clause, a Case not found for CASE\nstatement error results.\n\nEach statement_list consists of one or more SQL statements; an empty\nstatement_list is not permitted.\n\nTo handle situations where no value is matched by any WHEN clause, use\nan ELSE containing an empty BEGIN ... END block, as shown in this\nexample. (The indentation used here in the ELSE clause is for purposes\nof clarity only, and is not otherwise significant.)\n\nDELIMITER |\n\nCREATE PROCEDURE p()\n  BEGIN\n    DECLARE v INT DEFAULT 1;\n\n    CASE v\n      WHEN 2 THEN SELECT v;\n      WHEN 3 THEN SELECT 0;\n      ELSE\n        BEGIN\n        END;\n    END CASE;\n  END;\n  |\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/case.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/case.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (592,45,'IF STATEMENT','Syntax:\nIF search_condition THEN statement_list\n    [ELSEIF search_condition THEN statement_list] ...\n    [ELSE statement_list]\nEND IF\n\nThe IF statement for stored programs implements a basic conditional\nconstruct.\n\n*Note*:\n\nThere is also an IF() function, which differs from the IF statement\ndescribed here. See\nhttps://dev.mysql.com/doc/refman/8.0/en/flow-control-functions.html.\nThe IF statement can have THEN, ELSE, and ELSEIF clauses, and it is\nterminated with END IF.\n\nIf a given search_condition evaluates to true, the corresponding THEN\nor ELSEIF clause statement_list executes. If no search_condition\nmatches, the ELSE clause statement_list executes.\n\nEach statement_list consists of one or more SQL statements; an empty\nstatement_list is not permitted.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/if.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/if.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (593,45,'ITERATE','Syntax:\nITERATE label\n\nITERATE can appear only within LOOP, REPEAT, and WHILE statements.\nITERATE means "start the loop again."\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/iterate.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/iterate.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (594,45,'LEAVE','Syntax:\nLEAVE label\n\nThis statement is used to exit the flow control construct that has the\ngiven label. If the label is for the outermost stored program block,\nLEAVE exits the program.\n\nLEAVE can be used within BEGIN ... END or loop constructs (LOOP,\nREPEAT, WHILE).\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/leave.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/leave.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (595,45,'LOOP','Syntax:\n[begin_label:] LOOP\n    statement_list\nEND LOOP [end_label]\n\nLOOP implements a simple loop construct, enabling repeated execution of\nthe statement list, which consists of one or more statements, each\nterminated by a semicolon (;) statement delimiter. The statements\nwithin the loop are repeated until the loop is terminated. Usually,\nthis is accomplished with a LEAVE statement. Within a stored function,\nRETURN can also be used, which exits the function entirely.\n\nNeglecting to include a loop-termination statement results in an\ninfinite loop.\n\nA LOOP statement can be labeled. For the rules regarding label use, see\n[HELP labels].\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/loop.html\n\n','CREATE PROCEDURE doiterate(p1 INT)\nBEGIN\n  label1: LOOP\n    SET p1 = p1 + 1;\n    IF p1 < 10 THEN\n      ITERATE label1;\n    END IF;\n    LEAVE label1;\n  END LOOP label1;\n  SET @x = p1;\nEND;\n','https://dev.mysql.com/doc/refman/8.0/en/loop.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (596,45,'REPEAT LOOP','Syntax:\n[begin_label:] REPEAT\n    statement_list\nUNTIL search_condition\nEND REPEAT [end_label]\n\nThe statement list within a REPEAT statement is repeated until the\nsearch_condition expression is true. Thus, a REPEAT always enters the\nloop at least once. statement_list consists of one or more statements,\neach terminated by a semicolon (;) statement delimiter.\n\nA REPEAT statement can be labeled. For the rules regarding label use,\nsee [HELP labels].\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/repeat.html\n\n','mysql> delimiter //\n\nmysql> CREATE PROCEDURE dorepeat(p1 INT)\n       BEGIN\n         SET @x = 0;\n         REPEAT\n           SET @x = @x + 1;\n         UNTIL @x > p1 END REPEAT;\n       END\n       //\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> CALL dorepeat(1000)//\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> SELECT @x//\n+------+\n| @x   |\n+------+\n| 1001 |\n+------+\n1 row in set (0.00 sec)\n','https://dev.mysql.com/doc/refman/8.0/en/repeat.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (597,45,'RETURN','Syntax:\nRETURN expr\n\nThe RETURN statement terminates execution of a stored function and\nreturns the value expr to the function caller. There must be at least\none RETURN statement in a stored function. There may be more than one\nif the function has multiple exit points.\n\nThis statement is not used in stored procedures, triggers, or events.\nThe LEAVE statement can be used to exit a stored program of those\ntypes.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/return.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/return.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (598,45,'WHILE','Syntax:\n[begin_label:] WHILE search_condition DO\n    statement_list\nEND WHILE [end_label]\n\nThe statement list within a WHILE statement is repeated as long as the\nsearch_condition expression is true. statement_list consists of one or\nmore SQL statements, each terminated by a semicolon (;) statement\ndelimiter.\n\nA WHILE statement can be labeled. For the rules regarding label use,\nsee [HELP labels].\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/while.html\n\n','CREATE PROCEDURE dowhile()\nBEGIN\n  DECLARE v1 INT DEFAULT 5;\n\n  WHILE v1 > 0 DO\n    ...\n    SET v1 = v1 - 1;\n  END WHILE;\nEND;\n','https://dev.mysql.com/doc/refman/8.0/en/while.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (599,45,'CLOSE','Syntax:\nCLOSE cursor_name\n\nThis statement closes a previously opened cursor. For an example, see\nhttps://dev.mysql.com/doc/refman/8.0/en/cursors.html.\n\nAn error occurs if the cursor is not open.\n\nIf not closed explicitly, a cursor is closed at the end of the BEGIN\n... END block in which it was declared.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/close.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/close.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (600,45,'DECLARE CURSOR','Syntax:\nDECLARE cursor_name CURSOR FOR select_statement\n\nThis statement declares a cursor and associates it with a SELECT\nstatement that retrieves the rows to be traversed by the cursor. To\nfetch the rows later, use a FETCH statement. The number of columns\nretrieved by the SELECT statement must match the number of output\nvariables specified in the FETCH statement.\n\nThe SELECT statement cannot have an INTO clause.\n\nCursor declarations must appear before handler declarations and after\nvariable and condition declarations.\n\nA stored program may contain multiple cursor declarations, but each\ncursor declared in a given block must have a unique name. For an\nexample, see https://dev.mysql.com/doc/refman/8.0/en/cursors.html.\n\nFor information available through SHOW statements, it is possible in\nmany cases to obtain equivalent information by using a cursor with an\nINFORMATION_SCHEMA table.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/declare-cursor.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/declare-cursor.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (601,45,'FETCH','Syntax:\nFETCH [[NEXT] FROM] cursor_name INTO var_name [, var_name] ...\n\nThis statement fetches the next row for the SELECT statement associated\nwith the specified cursor (which must be open), and advances the cursor\npointer. If a row exists, the fetched columns are stored in the named\nvariables. The number of columns retrieved by the SELECT statement must\nmatch the number of output variables specified in the FETCH statement.\n\nIf no more rows are available, a No Data condition occurs with SQLSTATE\nvalue \'02000\'. To detect this condition, you can set up a handler for\nit (or for a NOT FOUND condition). For an example, see\nhttps://dev.mysql.com/doc/refman/8.0/en/cursors.html.\n\nBe aware that another operation, such as a SELECT or another FETCH, may\nalso cause the handler to execute by raising the same condition. If it\nis necessary to distinguish which operation raised the condition, place\nthe operation within its own BEGIN ... END block so that it can be\nassociated with its own handler.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/fetch.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/fetch.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (602,45,'OPEN','Syntax:\nOPEN cursor_name\n\nThis statement opens a previously declared cursor. For an example, see\nhttps://dev.mysql.com/doc/refman/8.0/en/cursors.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/open.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/open.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (603,45,'DECLARE CONDITION','Syntax:\nDECLARE condition_name CONDITION FOR condition_value\n\ncondition_value: {\n    mysql_error_code\n  | SQLSTATE [VALUE] sqlstate_value\n}\n\nThe DECLARE ... CONDITION statement declares a named error condition,\nassociating a name with a condition that needs specific handling. The\nname can be referred to in a subsequent DECLARE ... HANDLER statement\n(see [HELP DECLARE HANDLER]).\n\nCondition declarations must appear before cursor or handler\ndeclarations.\n\nThe condition_value for DECLARE ... CONDITION indicates the specific\ncondition or class of conditions to associate with the condition name.\nIt can take the following forms:\n\no mysql_error_code: An integer literal indicating a MySQL error code.\n\n  Do not use MySQL error code 0 because that indicates success rather\n  than an error condition. For a list of MySQL error codes, see Server\n  Error Message Reference\n  (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference\n  .html).\n\no SQLSTATE [VALUE] sqlstate_value: A 5-character string literal\n  indicating an SQLSTATE value.\n\n  Do not use SQLSTATE values that begin with \'00\' because those\n  indicate success rather than an error condition. For a list of\n  SQLSTATE values, see Server Error Message Reference\n  (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference\n  .html).\n\nCondition names referred to in SIGNAL or use RESIGNAL statements must\nbe associated with SQLSTATE values, not MySQL error codes.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/declare-condition.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/declare-condition.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (604,45,'DECLARE HANDLER','Syntax:\nDECLARE handler_action HANDLER\n    FOR condition_value [, condition_value] ...\n    statement\n\nhandler_action: {\n    CONTINUE\n  | EXIT\n  | UNDO\n}\n\ncondition_value: {\n    mysql_error_code\n  | SQLSTATE [VALUE] sqlstate_value\n  | condition_name\n  | SQLWARNING\n  | NOT FOUND\n  | SQLEXCEPTION\n}\n\nThe DECLARE ... HANDLER statement specifies a handler that deals with\none or more conditions. If one of these conditions occurs, the\nspecified statement executes. statement can be a simple statement such\nas SET var_name = value, or a compound statement written using BEGIN\nand END (see [HELP BEGIN END]).\n\nHandler declarations must appear after variable or condition\ndeclarations.\n\nThe handler_action value indicates what action the handler takes after\nexecution of the handler statement:\n\no CONTINUE: Execution of the current program continues.\n\no EXIT: Execution terminates for the BEGIN ... END compound statement\n  in which the handler is declared. This is true even if the condition\n  occurs in an inner block.\n\no UNDO: Not supported.\n\nThe condition_value for DECLARE ... HANDLER indicates the specific\ncondition or class of conditions that activates the handler. It can\ntake the following forms:\n\no mysql_error_code: An integer literal indicating a MySQL error code,\n  such as 1051 to specify "unknown table":\n\nDECLARE CONTINUE HANDLER FOR 1051\n  BEGIN\n    -- body of handler\n  END;\n\n  Do not use MySQL error code 0 because that indicates success rather\n  than an error condition. For a list of MySQL error codes, see Server\n  Error Message Reference\n  (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference\n  .html).\n\no SQLSTATE [VALUE] sqlstate_value: A 5-character string literal\n  indicating an SQLSTATE value, such as \'42S01\' to specify "unknown\n  table":\n\nDECLARE CONTINUE HANDLER FOR SQLSTATE \'42S02\'\n  BEGIN\n    -- body of handler\n  END;\n\n  Do not use SQLSTATE values that begin with \'00\' because those\n  indicate success rather than an error condition. For a list of\n  SQLSTATE values, see Server Error Message Reference\n  (https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference\n  .html).\n\no condition_name: A condition name previously specified with DECLARE\n  ... CONDITION. A condition name can be associated with a MySQL error\n  code or SQLSTATE value. See [HELP DECLARE CONDITION].\n\no SQLWARNING: Shorthand for the class of SQLSTATE values that begin\n  with \'01\'.\n\nDECLARE CONTINUE HANDLER FOR SQLWARNING\n  BEGIN\n    -- body of handler\n  END;\n\no NOT FOUND: Shorthand for the class of SQLSTATE values that begin with\n  \'02\'. This is relevant within the context of cursors and is used to\n  control what happens when a cursor reaches the end of a data set. If\n  no more rows are available, a No Data condition occurs with SQLSTATE\n  value \'02000\'. To detect this condition, you can set up a handler for\n  it or for a NOT FOUND condition.\n\nDECLARE CONTINUE HANDLER FOR NOT FOUND\n  BEGIN\n    -- body of handler\n  END;\n\n  For another example, see\n  https://dev.mysql.com/doc/refman/8.0/en/cursors.html. The NOT FOUND\n  condition also occurs for SELECT ... INTO var_list statements that\n  retrieve no rows.\n\no SQLEXCEPTION: Shorthand for the class of SQLSTATE values that do not\n  begin with \'00\', \'01\', or \'02\'.\n\nDECLARE CONTINUE HANDLER FOR SQLEXCEPTION\n  BEGIN\n    -- body of handler\n  END;\n\nFor information about how the server chooses handlers when a condition\noccurs, see https://dev.mysql.com/doc/refman/8.0/en/handler-scope.html.\n\nIf a condition occurs for which no handler has been declared, the\naction taken depends on the condition class:\n\no For SQLEXCEPTION conditions, the stored program terminates at the\n  statement that raised the condition, as if there were an EXIT\n  handler. If the program was called by another stored program, the\n  calling program handles the condition using the handler selection\n  rules applied to its own handlers.\n\no For SQLWARNING conditions, the program continues executing, as if\n  there were a CONTINUE handler.\n\no For NOT FOUND conditions, if the condition was raised normally, the\n  action is CONTINUE. If it was raised by SIGNAL or RESIGNAL, the\n  action is EXIT.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/declare-handler.html\n\n','mysql> CREATE TABLE test.t (s1 INT, PRIMARY KEY (s1));\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> delimiter //\n\nmysql> CREATE PROCEDURE handlerdemo ()\n       BEGIN\n         DECLARE CONTINUE HANDLER FOR SQLSTATE \'23000\' SET @x2 = 1;\n         SET @x = 1;\n         INSERT INTO test.t VALUES (1);\n         SET @x = 2;\n         INSERT INTO test.t VALUES (1);\n         SET @x = 3;\n       END;\n       //\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> CALL handlerdemo()//\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> SELECT @x//\n    +------+\n    | @x   |\n    +------+\n    | 3    |\n    +------+\n    1 row in set (0.00 sec)\n','https://dev.mysql.com/doc/refman/8.0/en/declare-handler.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (605,45,'GET DIAGNOSTICS','Syntax:\nGET [CURRENT | STACKED] DIAGNOSTICS {\n    statement_information_item\n    [, statement_information_item] ...\n  | CONDITION condition_number\n    condition_information_item\n    [, condition_information_item] ...\n}\n\nstatement_information_item:\n    target = statement_information_item_name\n\ncondition_information_item:\n    target = condition_information_item_name\n\nstatement_information_item_name: {\n    NUMBER\n  | ROW_COUNT\n}\n\ncondition_information_item_name: {\n    CLASS_ORIGIN\n  | SUBCLASS_ORIGIN\n  | RETURNED_SQLSTATE\n  | MESSAGE_TEXT\n  | MYSQL_ERRNO\n  | CONSTRAINT_CATALOG\n  | CONSTRAINT_SCHEMA\n  | CONSTRAINT_NAME\n  | CATALOG_NAME\n  | SCHEMA_NAME\n  | TABLE_NAME\n  | COLUMN_NAME\n  | CURSOR_NAME\n}\n\ncondition_number, target:\n    (see following discussion)\n\nSQL statements produce diagnostic information that populates the\ndiagnostics area. The GET DIAGNOSTICS statement enables applications to\ninspect this information. (You can also use SHOW WARNINGS or SHOW\nERRORS to see conditions or errors.)\n\nNo special privileges are required to execute GET DIAGNOSTICS.\n\nThe keyword CURRENT means to retrieve information from the current\ndiagnostics area. The keyword STACKED means to retrieve information\nfrom the second diagnostics area, which is available only if the\ncurrent context is a condition handler. If neither keyword is given,\nthe default is to use the current diagnostics area.\n\nThe GET DIAGNOSTICS statement is typically used in a handler within a\nstored program. It is a MySQL extension that GET [CURRENT] DIAGNOSTICS\nis permitted outside handler context to check the execution of any SQL\nstatement. For example, if you invoke the mysql client program, you can\nenter these statements at the prompt:\n\nmysql> DROP TABLE test.no_such_table;\nERROR 1051 (42S02): Unknown table \'test.no_such_table\'\nmysql> GET DIAGNOSTICS CONDITION 1\n         @p1 = RETURNED_SQLSTATE, @p2 = MESSAGE_TEXT;\nmysql> SELECT @p1, @p2;\n+-------+------------------------------------+\n| @p1   | @p2                                |\n+-------+------------------------------------+\n| 42S02 | Unknown table \'test.no_such_table\' |\n+-------+------------------------------------+\n\nThis extension applies only to the current diagnostics area. It does\nnot apply to the second diagnostics area because GET STACKED\nDIAGNOSTICS is permitted only if the current context is a condition\nhandler. If that is not the case, a GET STACKED DIAGNOSTICS when\nhandler not active error occurs.\n\nFor a description of the diagnostics area, see\nhttps://dev.mysql.com/doc/refman/8.0/en/diagnostics-area.html. Briefly,\nit contains two kinds of information:\n\no Statement information, such as the number of conditions that occurred\n  or the affected-rows count.\n\no Condition information, such as the error code and message. If a\n  statement raises multiple conditions, this part of the diagnostics\n  area has a condition area for each one. If a statement raises no\n  conditions, this part of the diagnostics area is empty.\n\nFor a statement that produces three conditions, the diagnostics area\ncontains statement and condition information like this:\n\nStatement information:\n  row count\n  ... other statement information items ...\nCondition area list:\n  Condition area 1:\n    error code for condition 1\n    error message for condition 1\n    ... other condition information items ...\n  Condition area 2:\n    error code for condition 2:\n    error message for condition 2\n    ... other condition information items ...\n  Condition area 3:\n    error code for condition 3\n    error message for condition 3\n    ... other condition information items ...\n\nGET DIAGNOSTICS can obtain either statement or condition information,\nbut not both in the same statement:\n\no To obtain statement information, retrieve the desired statement items\n  into target variables. This instance of GET DIAGNOSTICS assigns the\n  number of available conditions and the rows-affected count to the\n  user variables @p1 and @p2:\n\nGET DIAGNOSTICS @p1 = NUMBER, @p2 = ROW_COUNT;\n\no To obtain condition information, specify the condition number and\n  retrieve the desired condition items into target variables. This\n  instance of GET DIAGNOSTICS assigns the SQLSTATE value and error\n  message to the user variables @p3 and @p4:\n\nGET DIAGNOSTICS CONDITION 1\n  @p3 = RETURNED_SQLSTATE, @p4 = MESSAGE_TEXT;\n\nThe retrieval list specifies one or more target = item_name\nassignments, separated by commas. Each assignment names a target\nvariable and either a statement_information_item_name or\ncondition_information_item_name designator, depending on whether the\nstatement retrieves statement or condition information.\n\nValid target designators for storing item information can be stored\nprocedure or function parameters, stored program local variables\ndeclared with DECLARE, or user-defined variables.\n\nValid condition_number designators can be stored procedure or function\nparameters, stored program local variables declared with DECLARE,\nuser-defined variables, system variables, or literals. A character\nliteral may include a _charset introducer. A warning occurs if the\ncondition number is not in the range from 1 to the number of condition\nareas that have information. In this case, the warning is added to the\ndiagnostics area without clearing it.\n\nWhen a condition occurs, MySQL does not populate all condition items\nrecognized by GET DIAGNOSTICS. For example:\n\nmysql> GET DIAGNOSTICS CONDITION 1\n         @p5 = SCHEMA_NAME, @p6 = TABLE_NAME;\nmysql> SELECT @p5, @p6;\n+------+------+\n| @p5  | @p6  |\n+------+------+\n|      |      |\n+------+------+\n\nIn standard SQL, if there are multiple conditions, the first condition\nrelates to the SQLSTATE value returned for the previous SQL statement.\nIn MySQL, this is not guaranteed. To get the main error, you cannot do\nthis:\n\nGET DIAGNOSTICS CONDITION 1 @errno = MYSQL_ERRNO;\n\nInstead, retrieve the condition count first, then use it to specify\nwhich condition number to inspect:\n\nGET DIAGNOSTICS @cno = NUMBER;\nGET DIAGNOSTICS CONDITION @cno @errno = MYSQL_ERRNO;\n\nFor information about permissible statement and condition information\nitems, and which ones are populated when a condition occurs, see\nhttps://dev.mysql.com/doc/refman/8.0/en/diagnostics-area.html#diagnosti\ncs-area-information-items.\n\nHere is an example that uses GET DIAGNOSTICS and an exception handler\nin stored procedure context to assess the outcome of an insert\noperation. If the insert was successful, the procedure uses GET\nDIAGNOSTICS to get the rows-affected count. This shows that you can use\nGET DIAGNOSTICS multiple times to retrieve information about a\nstatement as long as the current diagnostics area has not been cleared.\n\nCREATE PROCEDURE do_insert(value INT)\nBEGIN\n  -- Declare variables to hold diagnostics area information\n  DECLARE code CHAR(5) DEFAULT \'00000\';\n  DECLARE msg TEXT;\n  DECLARE nrows INT;\n  DECLARE result TEXT;\n  -- Declare exception handler for failed insert\n  DECLARE CONTINUE HANDLER FOR SQLEXCEPTION\n    BEGIN\n      GET DIAGNOSTICS CONDITION 1\n        code = RETURNED_SQLSTATE, msg = MESSAGE_TEXT;\n    END;\n\n  -- Perform the insert\n  INSERT INTO t1 (int_col) VALUES(value);\n  -- Check whether the insert was successful\n  IF code = \'00000\' THEN\n    GET DIAGNOSTICS nrows = ROW_COUNT;\n    SET result = CONCAT(\'insert succeeded, row count = \',nrows);\n  ELSE\n    SET result = CONCAT(\'insert failed, error = \',code,\', message = \',msg);\n  END IF;\n  -- Say what happened\n  SELECT result;\nEND;\n\nSuppose that t1.int_col is an integer column that is declared as NOT\nNULL. The procedure produces these results when invoked to insert\nnon-NULL and NULL values, respectively:\n\nmysql> CALL do_insert(1);\n+---------------------------------+\n| result                          |\n+---------------------------------+\n| insert succeeded, row count = 1 |\n+---------------------------------+\n\nmysql> CALL do_insert(NULL);\n+-------------------------------------------------------------------------+\n| result                                                                  |\n+-------------------------------------------------------------------------+\n| insert failed, error = 23000, message = Column \'int_col\' cannot be null |\n+-------------------------------------------------------------------------+\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/get-diagnostics.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/get-diagnostics.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (606,45,'RESIGNAL','Syntax:\nRESIGNAL [condition_value]\n    [SET signal_information_item\n    [, signal_information_item] ...]\n\ncondition_value: {\n    SQLSTATE [VALUE] sqlstate_value\n  | condition_name\n}\n\nsignal_information_item:\n    condition_information_item_name = simple_value_specification\n\ncondition_information_item_name: {\n    CLASS_ORIGIN\n  | SUBCLASS_ORIGIN\n  | MESSAGE_TEXT\n  | MYSQL_ERRNO\n  | CONSTRAINT_CATALOG\n  | CONSTRAINT_SCHEMA\n  | CONSTRAINT_NAME\n  | CATALOG_NAME\n  | SCHEMA_NAME\n  | TABLE_NAME\n  | COLUMN_NAME\n  | CURSOR_NAME\n}\n\ncondition_name, simple_value_specification:\n    (see following discussion)\n\nRESIGNAL passes on the error condition information that is available\nduring execution of a condition handler within a compound statement\ninside a stored procedure or function, trigger, or event. RESIGNAL may\nchange some or all information before passing it on. RESIGNAL is\nrelated to SIGNAL, but instead of originating a condition as SIGNAL\ndoes, RESIGNAL relays existing condition information, possibly after\nmodifying it.\n\nRESIGNAL makes it possible to both handle an error and return the error\ninformation. Otherwise, by executing an SQL statement within the\nhandler, information that caused the handler\'s activation is destroyed.\nRESIGNAL also can make some procedures shorter if a given handler can\nhandle part of a situation, then pass the condition "up the line" to\nanother handler.\n\nNo privileges are required to execute the RESIGNAL statement.\n\nAll forms of RESIGNAL require that the current context be a condition\nhandler. Otherwise, RESIGNAL is illegal and a RESIGNAL when handler not\nactive error occurs.\n\nTo retrieve information from the diagnostics area, use the GET\nDIAGNOSTICS statement (see [HELP GET DIAGNOSTICS]). For information\nabout the diagnostics area, see\nhttps://dev.mysql.com/doc/refman/8.0/en/diagnostics-area.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/resignal.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/resignal.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (607,45,'SIGNAL','Syntax:\nSIGNAL condition_value\n    [SET signal_information_item\n    [, signal_information_item] ...]\n\ncondition_value: {\n    SQLSTATE [VALUE] sqlstate_value\n  | condition_name\n}\n\nsignal_information_item:\n    condition_information_item_name = simple_value_specification\n\ncondition_information_item_name: {\n    CLASS_ORIGIN\n  | SUBCLASS_ORIGIN\n  | MESSAGE_TEXT\n  | MYSQL_ERRNO\n  | CONSTRAINT_CATALOG\n  | CONSTRAINT_SCHEMA\n  | CONSTRAINT_NAME\n  | CATALOG_NAME\n  | SCHEMA_NAME\n  | TABLE_NAME\n  | COLUMN_NAME\n  | CURSOR_NAME\n}\n\ncondition_name, simple_value_specification:\n    (see following discussion)\n\nSIGNAL is the way to "return" an error. SIGNAL provides error\ninformation to a handler, to an outer portion of the application, or to\nthe client. Also, it provides control over the error\'s characteristics\n(error number, SQLSTATE value, message). Without SIGNAL, it is\nnecessary to resort to workarounds such as deliberately referring to a\nnonexistent table to cause a routine to return an error.\n\nNo privileges are required to execute the SIGNAL statement.\n\nTo retrieve information from the diagnostics area, use the GET\nDIAGNOSTICS statement (see [HELP GET DIAGNOSTICS]). For information\nabout the diagnostics area, see\nhttps://dev.mysql.com/doc/refman/8.0/en/diagnostics-area.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/signal.html\n\n','CREATE PROCEDURE p (pval INT)\nBEGIN\n  DECLARE specialty CONDITION FOR SQLSTATE \'45000\';\n  IF pval = 0 THEN\n    SIGNAL SQLSTATE \'01000\';\n  ELSEIF pval = 1 THEN\n    SIGNAL SQLSTATE \'45000\'\n      SET MESSAGE_TEXT = \'An error occurred\';\n  ELSEIF pval = 2 THEN\n    SIGNAL specialty\n      SET MESSAGE_TEXT = \'An error occurred\';\n  ELSE\n    SIGNAL SQLSTATE \'01000\'\n      SET MESSAGE_TEXT = \'A warning occurred\', MYSQL_ERRNO = 1000;\n    SIGNAL SQLSTATE \'45000\'\n      SET MESSAGE_TEXT = \'An error occurred\', MYSQL_ERRNO = 1001;\n  END IF;\nEND;\n','https://dev.mysql.com/doc/refman/8.0/en/signal.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (608,46,'ALTER USER','Syntax:\nALTER USER [IF EXISTS]\n    user [auth_option] [, user [auth_option]] ...\n    [REQUIRE {NONE | tls_option [[AND] tls_option] ...}]\n    [WITH resource_option [resource_option] ...]\n    [password_option | lock_option] ...\n    [COMMENT \'comment_string\' | ATTRIBUTE \'json_object\']\n\nALTER USER [IF EXISTS] USER() user_func_auth_option\n\nALTER USER [IF EXISTS]\n    user DEFAULT ROLE\n    {NONE | ALL | role [, role ] ...}\n\nuser:\n    (see )\n\nauth_option: {\n    IDENTIFIED BY \'auth_string\'\n        [REPLACE \'current_auth_string\']\n        [RETAIN CURRENT PASSWORD]\n  | IDENTIFIED BY RANDOM PASSWORD\n        [REPLACE \'current_auth_string\']\n        [RETAIN CURRENT PASSWORD]\n  | IDENTIFIED WITH auth_plugin\n  | IDENTIFIED WITH auth_plugin BY \'auth_string\'\n        [REPLACE \'current_auth_string\']\n        [RETAIN CURRENT PASSWORD]\n  | IDENTIFIED WITH auth_plugin BY RANDOM PASSWORD\n        [REPLACE \'current_auth_string\']\n        [RETAIN CURRENT PASSWORD]\n  | IDENTIFIED WITH auth_plugin AS \'auth_string\'\n  | DISCARD OLD PASSWORD\n}\n\nuser_func_auth_option: {\n    IDENTIFIED BY \'auth_string\'\n        [REPLACE \'current_auth_string\']\n        [RETAIN CURRENT PASSWORD]\n  | DISCARD OLD PASSWORD\n}\n\ntls_option: {\n   SSL\n | X509\n | CIPHER \'cipher\'\n | ISSUER \'issuer\'\n | SUBJECT \'subject\'\n}\n\nresource_option: {\n    MAX_QUERIES_PER_HOUR count\n  | MAX_UPDATES_PER_HOUR count\n  | MAX_CONNECTIONS_PER_HOUR count\n  | MAX_USER_CONNECTIONS count\n}\n\npassword_option: {\n    PASSWORD EXPIRE [DEFAULT | NEVER | INTERVAL N DAY]\n  | PASSWORD HISTORY {DEFAULT | N}\n  | PASSWORD REUSE INTERVAL {DEFAULT | N DAY}\n  | PASSWORD REQUIRE CURRENT [DEFAULT | OPTIONAL]\n  | FAILED_LOGIN_ATTEMPTS N\n  | PASSWORD_LOCK_TIME {N | UNBOUNDED}\n}\n\nlock_option: {\n    ACCOUNT LOCK\n  | ACCOUNT UNLOCK\n}\n\nThe ALTER USER statement modifies MySQL accounts. It enables\nauthentication, role, SSL/TLS, resource-limit, password-management,\ncomment, and attribute properties to be modified for existing accounts.\nIt can also be used to lock and unlock accounts.\n\nIn most cases, ALTER USER requires the global CREATE USER privilege, or\nthe UPDATE privilege for the mysql system schema. The exceptions are:\n\no Any client who connects to the server using a nonanonymous account\n  can change the password for that account. (In particular, you can\n  change your own password.) To see which account the server\n  authenticated you as, invoke the CURRENT_USER() function:\n\nSELECT CURRENT_USER();\n\no For DEFAULT ROLE syntax, ALTER USER requires these privileges:\n\n  o Setting the default roles for another user requires the global\n    CREATE USER privilege, or the UPDATE privilege for the\n    mysql.default_roles system table.\n\n  o Setting the default roles for yourself requires no special\n    privileges, as long as the roles you want as the default have been\n    granted to you.\n\no Statements that modify secondary passwords require these privileges:\n\n  o The APPLICATION_PASSWORD_ADMIN privilege is required to use the\n    RETAIN CURRENT PASSWORD or DISCARD OLD PASSWORD clause for ALTER\n    USER statements that apply to your own account. The privilege is\n    required to manipulate your own secondary password because most\n    users require only one password.\n\n  o If an account is to be permitted to manipulate secondary passwords\n    for all accounts, it requires the CREATE USER privilege rather than\n    APPLICATION_PASSWORD_ADMIN.\n\nWhen the read_only system variable is enabled, ALTER USER additionally\nrequires the CONNECTION_ADMIN privilege (or the deprecated SUPER\nprivilege).\n\nBy default, an error occurs if you try to modify a user that does not\nexist. If the IF EXISTS clause is given, the statement produces a\nwarning for each named user that does not exist, rather than an error.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/alter-user.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/alter-user.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (609,46,'CREATE ROLE','Syntax:\nCREATE ROLE [IF NOT EXISTS] role [, role ] ...\n\nCREATE ROLE creates one or more roles, which are named collections of\nprivileges. To use this statement, you must have the global CREATE ROLE\nor CREATE USER privilege. When the read_only system variable is\nenabled, CREATE ROLE additionally requires the CONNECTION_ADMIN\nprivilege (or the deprecated SUPER privilege).\n\nA role when created is locked, has no password, and is assigned the\ndefault authentication plugin. (These role attributes can be changed\nlater with the ALTER USER statement, by users who have the global\nCREATE USER privilege.)\n\nCREATE ROLE either succeeds for all named roles or rolls back and has\nno effect if any error occurs. By default, an error occurs if you try\nto create a role that already exists. If the IF NOT EXISTS clause is\ngiven, the statement produces a warning for each named role that\nalready exists, rather than an error.\n\nThe statement is written to the binary log if it succeeds, but not if\nit fails; in that case, rollback occurs and no changes are made. A\nstatement written to the binary log includes all named roles. If the IF\nNOT EXISTS clause is given, this includes even roles that already exist\nand were not created.\n\nEach role name uses the format described in\nhttps://dev.mysql.com/doc/refman/8.0/en/role-names.html. For example:\n\nCREATE ROLE \'admin\', \'developer\';\nCREATE ROLE \'webapp\'@\'localhost\';\n\nThe host name part of the role name, if omitted, defaults to \'%\'.\n\nFor role usage examples, see\nhttps://dev.mysql.com/doc/refman/8.0/en/roles.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/create-role.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/create-role.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (610,46,'CREATE USER','Syntax:\nCREATE USER [IF NOT EXISTS]\n    user [auth_option] [, user [auth_option]] ...\n    DEFAULT ROLE role [, role ] ...\n    [REQUIRE {NONE | tls_option [[AND] tls_option] ...}]\n    [WITH resource_option [resource_option] ...]\n    [password_option | lock_option] ...\n    [COMMENT \'comment_string\' | ATTRIBUTE \'json_object\']\n\nuser:\n    (see )\n\nauth_option: {\n    IDENTIFIED BY \'auth_string\'\n  | IDENTIFIED BY RANDOM PASSWORD\n  | IDENTIFIED WITH auth_plugin\n  | IDENTIFIED WITH auth_plugin BY \'auth_string\'\n  | IDENTIFIED WITH auth_plugin BY RANDOM PASSWORD\n  | IDENTIFIED WITH auth_plugin AS \'auth_string\'\n}\n\ntls_option: {\n   SSL\n | X509\n | CIPHER \'cipher\'\n | ISSUER \'issuer\'\n | SUBJECT \'subject\'\n}\n\nresource_option: {\n    MAX_QUERIES_PER_HOUR count\n  | MAX_UPDATES_PER_HOUR count\n  | MAX_CONNECTIONS_PER_HOUR count\n  | MAX_USER_CONNECTIONS count\n}\n\npassword_option: {\n    PASSWORD EXPIRE [DEFAULT | NEVER | INTERVAL N DAY]\n  | PASSWORD HISTORY {DEFAULT | N}\n  | PASSWORD REUSE INTERVAL {DEFAULT | N DAY}\n  | PASSWORD REQUIRE CURRENT [DEFAULT | OPTIONAL]\n  | FAILED_LOGIN_ATTEMPTS N\n  | PASSWORD_LOCK_TIME {N | UNBOUNDED}\n}\n\nlock_option: {\n    ACCOUNT LOCK\n  | ACCOUNT UNLOCK\n}\n\nThe CREATE USER statement creates new MySQL accounts. It enables\nauthentication, role, SSL/TLS, resource-limit, password-management,\ncomment, and attribute properties to be established for new accounts.\nIt also controls whether accounts are initially locked or unlocked.\n\nTo use CREATE USER, you must have the global CREATE USER privilege, or\nthe INSERT privilege for the mysql system schema. When the read_only\nsystem variable is enabled, CREATE USER additionally requires the\nCONNECTION_ADMIN privilege (or the deprecated SUPER privilege).\n\nAs of MySQL 8.0.22, CREATE USER fails with an error if any account to\nbe created is named as the DEFINER attribute for any stored object.\n(That is, the statement fails if creating an account would cause the\naccount to adopt a currently orphaned stored object.) To perform the\noperation anyway, you must have the SET_USER_ID privilege; in this\ncase, the statement succeeds with a warning rather than failing with an\nerror. Without SET_USER_ID, to perform the user-creation operation,\ndrop the orphan objects, create the account and grant its privileges,\nand then re-create the dropped objects. For additional information,\nincluding how to identify which objects name a given account as the\nDEFINER attribute, see\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-objects-security.html#st\nored-objects-security-orphan-objects.\n\nCREATE USER either succeeds for all named users or rolls back and has\nno effect if any error occurs. By default, an error occurs if you try\nto create a user that already exists. If the IF NOT EXISTS clause is\ngiven, the statement produces a warning for each named user that\nalready exists, rather than an error.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/create-user.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/create-user.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (611,46,'DROP ROLE','Syntax:\nDROP ROLE [IF EXISTS] role [, role ] ...\n\nDROP ROLE removes one or more roles (named collections of privileges).\nTo use this statement, you must have the global DROP ROLE or CREATE\nUSER privilege. When the read_only system variable is enabled, DROP\nROLE additionally requires the CONNECTION_ADMIN privilege (or the\ndeprecated SUPER privilege).\n\nAs of MySQL 8.0.16, users who have the CREATE USER privilege can use\nthis statement to drop accounts that are locked or unlocked. Users who\nhave the DROP ROLE privilege can use this statement only to drop\naccounts that are locked (unlocked accounts are presumably user\naccounts used to log in to the server and not just as roles).\n\nRoles named in the mandatory_roles system variable value cannot be\ndropped.\n\nDROP ROLE either succeeds for all named roles or rolls back and has no\neffect if any error occurs. By default, an error occurs if you try to\ndrop a role that does not exist. If the IF EXISTS clause is given, the\nstatement produces a warning for each named role that does not exist,\nrather than an error.\n\nThe statement is written to the binary log if it succeeds, but not if\nit fails; in that case, rollback occurs and no changes are made. A\nstatement written to the binary log includes all named roles. If the IF\nEXISTS clause is given, this includes even roles that do not exist and\nwere not dropped.\n\nEach role name uses the format described in\nhttps://dev.mysql.com/doc/refman/8.0/en/role-names.html. For example:\n\nDROP ROLE \'admin\', \'developer\';\nDROP ROLE \'webapp\'@\'localhost\';\n\nThe host name part of the role name, if omitted, defaults to \'%\'.\n\nA dropped role is automatically revoked from any user account (or role)\nto which the role was granted. Within any current session for such an\naccount, its adjusted privileges apply beginning with the next\nstatement executed.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/drop-role.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/drop-role.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (612,46,'DROP USER','Syntax:\nDROP USER [IF EXISTS] user [, user] ...\n\nThe DROP USER statement removes one or more MySQL accounts and their\nprivileges. It removes privilege rows for the account from all grant\ntables.\n\nRoles named in the mandatory_roles system variable value cannot be\ndropped.\n\nTo use DROP USER, you must have the global CREATE USER privilege, or\nthe DELETE privilege for the mysql system schema. When the read_only\nsystem variable is enabled, DROP USER additionally requires the\nCONNECTION_ADMIN privilege (or the deprecated SUPER privilege).\n\nAs of MySQL 8.0.22, DROP USER fails with an error if any account to be\ndropped is named as the DEFINER attribute for any stored object. (That\nis, the statement fails if dropping an account would cause a stored\nobject to become orphaned.) To perform the operation anyway, you must\nhave the SET_USER_ID privilege; in this case, the statement succeeds\nwith a warning rather than failing with an error. For additional\ninformation, including how to identify which objects name a given\naccount as the DEFINER attribute, see\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-objects-security.html#st\nored-objects-security-orphan-objects.\n\nDROP USER either succeeds for all named users or rolls back and has no\neffect if any error occurs. By default, an error occurs if you try to\ndrop a user that does not exist. If the IF EXISTS clause is given, the\nstatement produces a warning for each named user that does not exist,\nrather than an error.\n\nThe statement is written to the binary log if it succeeds, but not if\nit fails; in that case, rollback occurs and no changes are made. A\nstatement written to the binary log includes all named users. If the IF\nEXISTS clause is given, this includes even users that do not exist and\nwere not dropped.\n\nEach account name uses the format described in\nhttps://dev.mysql.com/doc/refman/8.0/en/account-names.html. For\nexample:\n\nDROP USER \'jeffrey\'@\'localhost\';\n\nThe host name part of the account name, if omitted, defaults to \'%\'.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/drop-user.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/drop-user.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (613,46,'GRANT','Syntax:\nGRANT\n    priv_type [(column_list)]\n      [, priv_type [(column_list)]] ...\n    ON [object_type] priv_level\n    TO user_or_role [, user_or_role] ...\n    [WITH GRANT OPTION]\n    [AS user\n        [WITH ROLE\n            DEFAULT\n          | NONE\n          | ALL\n          | ALL EXCEPT role [, role ] ...\n          | role [, role ] ...\n        ]\n    ]\n}\n\nGRANT PROXY ON user_or_role\n    TO user_or_role [, user_or_role] ...\n    [WITH GRANT OPTION]\n\nGRANT role [, role] ...\n    TO user_or_role [, user_or_role] ...\n    [WITH ADMIN OPTION]\n\nobject_type: {\n    TABLE\n  | FUNCTION\n  | PROCEDURE\n}\n\npriv_level: {\n    *\n  | *.*\n  | db_name.*\n  | db_name.tbl_name\n  | tbl_name\n  | db_name.routine_name\n}\n\nuser_or_role: {\n    user (see https://dev.mysql.com/doc/refman/8.0/en/account-names.html)\n  | role (see https://dev.mysql.com/doc/refman/8.0/en/role-names.html)\n}\n\nThe GRANT statement enables system administrators to grant privileges\nand roles, which can be granted to user accounts and roles. These\nsyntax restrictions apply:\n\no GRANT cannot mix granting both privileges and roles in the same\n  statement. A given GRANT statement must grant either privileges or\n  roles.\n\no The ON clause distinguishes whether the statement grants privileges\n  or roles:\n\n  o With ON, the statement grants privileges.\n\n  o Without ON, the statement grants roles.\n\n  o It is permitted to assign both privileges and roles to an account,\n    but you must use separate GRANT statements, each with syntax\n    appropriate to what is to be granted.\n\nFor more information about roles, see\nhttps://dev.mysql.com/doc/refman/8.0/en/roles.html.\n\nTo grant a privilege with GRANT, you must have the GRANT OPTION\nprivilege, and you must have the privileges that you are granting.\n(Alternatively, if you have the UPDATE privilege for the grant tables\nin the mysql system schema, you can grant any account any privilege.)\nWhen the read_only system variable is enabled, GRANT additionally\nrequires the CONNECTION_ADMIN privilege (or the deprecated SUPER\nprivilege).\n\nGRANT either succeeds for all named users and roles or rolls back and\nhas no effect if any error occurs. The statement is written to the\nbinary log only if it succeeds for all named users and roles.\n\nThe REVOKE statement is related to GRANT and enables administrators to\nremove account privileges. See [HELP REVOKE].\n\nEach account name uses the format described in\nhttps://dev.mysql.com/doc/refman/8.0/en/account-names.html. Each role\nname uses the format described in\nhttps://dev.mysql.com/doc/refman/8.0/en/role-names.html. For example:\n\nGRANT ALL ON db1.* TO \'jeffrey\'@\'localhost\';\nGRANT \'role1\', \'role2\' TO \'user1\'@\'localhost\', \'user2\'@\'localhost\';\nGRANT SELECT ON world.* TO \'role3\';\n\nThe host name part of the account or role name, if omitted, defaults to\n\'%\'.\n\nNormally, a database administrator first uses CREATE USER to create an\naccount and define its nonprivilege characteristics such as its\npassword, whether it uses secure connections, and limits on access to\nserver resources, then uses GRANT to define its privileges. ALTER USER\nmay be used to change the nonprivilege characteristics of existing\naccounts. For example:\n\nCREATE USER \'jeffrey\'@\'localhost\' IDENTIFIED BY \'password\';\nGRANT ALL ON db1.* TO \'jeffrey\'@\'localhost\';\nGRANT SELECT ON db2.invoice TO \'jeffrey\'@\'localhost\';\nALTER USER \'jeffrey\'@\'localhost\' WITH MAX_QUERIES_PER_HOUR 90;\n\nFrom the mysql program, GRANT responds with Query OK, 0 rows affected\nwhen executed successfully. To determine what privileges result from\nthe operation, use SHOW GRANTS. See [HELP SHOW GRANTS].\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/grant.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/grant.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (614,46,'RENAME USER','Syntax:\nRENAME USER old_user TO new_user\n    [, old_user TO new_user] ...\n\nThe RENAME USER statement renames existing MySQL accounts. An error\noccurs for old accounts that do not exist or new accounts that already\nexist.\n\nTo use RENAME USER, you must have the global CREATE USER privilege, or\nthe UPDATE privilege for the mysql system schema. When the read_only\nsystem variable is enabled, RENAME USER additionally requires the\nCONNECTION_ADMIN privilege (or the deprecated SUPER privilege).\n\nAs of MySQL 8.0.22, RENAME USER fails with an error if any account to\nbe renamed is named as the DEFINER attribute for any stored object.\n(That is, the statement fails if renaming an account would cause a\nstored object to become orphaned.) To perform the operation anyway, you\nmust have the SET_USER_ID privilege; in this case, the statement\nsucceeds with a warning rather than failing with an error. For\nadditional information, including how to identify which objects name a\ngiven account as the DEFINER attribute, see\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-objects-security.html#st\nored-objects-security-orphan-objects.\n\nEach account name uses the format described in\nhttps://dev.mysql.com/doc/refman/8.0/en/account-names.html. For\nexample:\n\nRENAME USER \'jeffrey\'@\'localhost\' TO \'jeff\'@\'127.0.0.1\';\n\nThe host name part of the account name, if omitted, defaults to \'%\'.\n\nRENAME USER causes the privileges held by the old user to be those held\nby the new user. However, RENAME USER does not automatically drop or\ninvalidate databases or objects within them that the old user created.\nThis includes stored programs or views for which the DEFINER attribute\nnames the old user. Attempts to access such objects may produce an\nerror if they execute in definer security context. (For information\nabout security context, see\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-objects-security.html.)\n\nThe privilege changes take effect as indicated in\nhttps://dev.mysql.com/doc/refman/8.0/en/privilege-changes.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/rename-user.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/rename-user.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (615,46,'REVOKE','Syntax:\nREVOKE\n    priv_type [(column_list)]\n      [, priv_type [(column_list)]] ...\n    ON [object_type] priv_level\n    FROM user_or_role [, user_or_role] ...\n\nREVOKE ALL [PRIVILEGES], GRANT OPTION\n    FROM user_or_role [, user_or_role] ...\n\nREVOKE PROXY ON user_or_role\n    FROM user_or_role [, user_or_role] ...\n\nREVOKE role [, role ] ...\n    FROM user_or_role [, user_or_role ] ...\n\nuser_or_role: {\n    user (see https://dev.mysql.com/doc/refman/8.0/en/account-names.html)\n  | role (see https://dev.mysql.com/doc/refman/8.0/en/role-names.html.\n}\n\nThe REVOKE statement enables system administrators to revoke privileges\nand roles, which can be revoked from user accounts and roles.\n\nFor details on the levels at which privileges exist, the permissible\npriv_type, priv_level, and object_type values, and the syntax for\nspecifying users and passwords, see [HELP GRANT].\n\nFor information about roles, see\nhttps://dev.mysql.com/doc/refman/8.0/en/roles.html.\n\nWhen the read_only system variable is enabled, REVOKE requires the\nCONNECTION_ADMIN or privilege (or the deprecated SUPER privilege), in\naddition to any other required privileges described in the following\ndiscussion.\n\nREVOKE either succeeds for all named users and roles or rolls back and\nhas no effect if any error occurs. The statement is written to the\nbinary log only if it succeeds for all named users and roles.\n\nEach account name uses the format described in\nhttps://dev.mysql.com/doc/refman/8.0/en/account-names.html. Each role\nname uses the format described in\nhttps://dev.mysql.com/doc/refman/8.0/en/role-names.html. For example:\n\nREVOKE INSERT ON *.* FROM \'jeffrey\'@\'localhost\';\nREVOKE \'role1\', \'role2\' FROM \'user1\'@\'localhost\', \'user2\'@\'localhost\';\nREVOKE SELECT ON world.* FROM \'role3\';\n\nThe host name part of the account or role name, if omitted, defaults to\n\'%\'.\n\nTo use the first REVOKE syntax, you must have the GRANT OPTION\nprivilege, and you must have the privileges that you are revoking.\n\nTo revoke all privileges, use the second syntax, which drops all\nglobal, database, table, column, and routine privileges for the named\nusers or roles:\n\nREVOKE ALL PRIVILEGES, GRANT OPTION\n  FROM user_or_role [, user_or_role] ...\n\nREVOKE ALL PRIVILEGES, GRANT OPTION does not revoke any roles.\n\nTo use this REVOKE syntax, you must have the global CREATE USER\nprivilege, or the UPDATE privilege for the mysql system schema.\n\nThe syntax for which the REVOKE keyword is followed by one or more role\nnames takes a FROM clause indicating one or more users or roles from\nwhich to revoke the roles.\n\nRoles named in the mandatory_roles system variable value cannot be\nrevoked.\n\nA revoked role immediately affects any user account from which it was\nrevoked, such that within any current session for the account, its\nprivileges are adjusted for the next statement executed.\n\nRevoking a role revokes the role itself, not the privileges that it\nrepresents. Suppose that an account is granted a role that includes a\ngiven privilege, and is also granted the privilege explicitly or\nanother role that includes the privilege. In this case, the account\nstill possesses that privilege if the first role is revoked. For\nexample, if an account is granted two roles that each include SELECT,\nthe account still can select after either role is revoked.\n\nREVOKE ALL ON *.* (at the global level) revokes all granted static\nglobal privileges and all granted dynamic privileges.\n\nUser accounts and roles from which privileges and roles are to be\nrevoked must exist, but the privileges and roles to be revoked need not\nbe currently granted to them.\n\nA revoked privilege that is granted but not known to the server is\nrevoked with a warning. This situtation can occur for dynamic\nprivileges. For example, a dynamic privilege can be granted while the\ncomponent that registers it is installed, but if that component is\nsubsequently uninstalled, the privilege becomes unregistered, although\naccounts that possess the privilege still possess it and it can be\nrevoked from them.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/revoke.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/revoke.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (616,46,'SET DEFAULT ROLE','Syntax:\nSET DEFAULT ROLE\n    {NONE | ALL | role [, role ] ...}\n    TO user [, user ] ...\n\nFor each user named immediately after the TO keyword, this statement\ndefines which roles become active when the user connects to the server\nand authenticates, or when the user executes the SET ROLE DEFAULT\nstatement during a session.\n\nSET DEFAULT ROLE is alternative syntax for ALTER USER ... DEFAULT ROLE\n(see [HELP ALTER USER]). However, ALTER USER can set the default for\nonly a single user, whereas SET DEFAULT ROLE can set the default for\nmultiple users. On the other hand, you can specify CURRENT_USER as the\nuser name for the ALTER USER statement, whereas you cannot for SET\nDEFAULT ROLE.\n\nSET DEFAULT ROLE requires these privileges:\n\no Setting the default roles for another user requires the global CREATE\n  USER privilege, or the UPDATE privilege for the mysql.default_roles\n  system table.\n\no Setting the default roles for yourself requires no special\n  privileges, as long as the roles you want as the default have been\n  granted to you.\n\nEach role name uses the format described in\nhttps://dev.mysql.com/doc/refman/8.0/en/role-names.html. For example:\n\nSET DEFAULT ROLE \'admin\', \'developer\' TO \'joe\'@\'10.0.0.1\';\n\nThe host name part of the role name, if omitted, defaults to \'%\'.\n\nThe clause following the DEFAULT ROLE keywords permits these values:\n\no NONE: Set the default to NONE (no roles).\n\no ALL: Set the default to all roles granted to the account.\n\no role [, role ] ...: Set the default to the named roles, which must\n  exist and be granted to the account at the time SET DEFAULT ROLE is\n  executed.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/set-default-role.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/set-default-role.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (617,46,'SET PASSWORD','Syntax:\nSET PASSWORD [FOR user] auth_option\n    [REPLACE \'current_auth_string\']\n    [RETAIN CURRENT PASSWORD]\n\nauth_option: {\n    = \'auth_string\'\n  | TO RANDOM\n}\n\nThe SET PASSWORD statement assigns a password to a MySQL user account.\nThe password may be either explicitly specified in the statement or\nrandomly generated by MySQL. The statement may also include a\npassword-verification clause that specifies the account current\npassword to be replaced, and a clause that manages whether an account\nhas a secondary password. \'auth_string\' and \'current_auth_string\' each\nrepresent a cleartext (unencrypted) password.\n\n*Note*:\n\nRather than using SET PASSWORD to assign passwords, ALTER USER is the\npreferred statement for account alterations, including assigning\npasswords. For example:\n\nALTER USER user IDENTIFIED BY \'auth_string\';\n\n*Note*:\n\nClauses for random password generation, password verification, and\nsecondary passwords apply only to accounts that use an authentication\nplugin that stores credentials internally to MySQL. For accounts that\nuse a plugin that performs authentication against a credentials system\nthat is external to MySQL, password management must be handled\nexternally against that system as well. For more information about\ninternal credentials storage, see\nhttps://dev.mysql.com/doc/refman/8.0/en/password-management.html.\n\nThe REPLACE \'current_auth_string\' clause performs password verification\nand is available as of MySQL 8.0.13. If given:\n\no REPLACE specifies the account current password to be replaced, as a\n  cleartext (unencrypted) string.\n\no The clause must be given if password changes for the account are\n  required to specify the current password, as verification that the\n  user attempting to make the change actually knows the current\n  password.\n\no The clause is optional if password changes for the account may but\n  need not specify the current password.\n\no The statement fails if the clause is given but does not match the\n  current password, even if the clause is optional.\n\no REPLACE can be specified only when changing the account password for\n  the current user.\n\nFor more information about password verification by specifying the\ncurrent password, see\nhttps://dev.mysql.com/doc/refman/8.0/en/password-management.html.\n\nThe RETAIN CURRENT PASSWORD clause implements dual-password capability\nand is available as of MySQL 8.0.14. If given:\n\no RETAIN CURRENT PASSWORD retains an account current password as its\n  secondary password, replacing any existing secondary password. The\n  new password becomes the primary password, but clients can use the\n  account to connect to the server using either the primary or\n  secondary password. (Exception: If the new password specified by the\n  SET PASSWORD statement is empty, the secondary password becomes empty\n  as well, even if RETAIN CURRENT PASSWORD is given.)\n\no If you specify RETAIN CURRENT PASSWORD for an account that has an\n  empty primary password, the statement fails.\n\no If an account has a secondary password and you change its primary\n  password without specifying RETAIN CURRENT PASSWORD, the secondary\n  password remains unchanged.\n\nFor more information about use of dual passwords, see\nhttps://dev.mysql.com/doc/refman/8.0/en/password-management.html.\n\nSET PASSWORD permits these auth_option syntaxes:\n\no = \'auth_string\'\n\n  Assigns the account the given literal password.\n\no TO RANDOM\n\n  Assigns the account a password randomly generated by MySQL. The\n  statement also returns the cleartext password in a result set to make\n  it available to the user or application executing the statement.\n\n  For details about the result set and characteristics of randomly\n  generated passwords, see\n  https://dev.mysql.com/doc/refman/8.0/en/password-management.html#rand\n  om-password-generation.\n\n  Random password generation is available as of MySQL 8.0.18.\n\n*Important*:\n\nUnder some circumstances, SET PASSWORD may be recorded in server logs\nor on the client side in a history file such as ~/.mysql_history, which\nmeans that cleartext passwords may be read by anyone having read access\nto that information. For information about the conditions under which\nthis occurs for the server logs and how to control it, see\nhttps://dev.mysql.com/doc/refman/8.0/en/password-logging.html. For\nsimilar information about client-side logging, see\nhttps://dev.mysql.com/doc/refman/8.0/en/mysql-logging.html.\n\nSET PASSWORD can be used with or without a FOR clause that explicitly\nnames a user account:\n\no With a FOR user clause, the statement sets the password for the named\n  account, which must exist:\n\nSET PASSWORD FOR \'jeffrey\'@\'localhost\' = \'auth_string\';\n\no With no FOR user clause, the statement sets the password for the\n  current user:\n\nSET PASSWORD = \'auth_string\';\n\n  Any client who connects to the server using a nonanonymous account\n  can change the password for that account. (In particular, you can\n  change your own password.) To see which account the server\n  authenticated you as, invoke the CURRENT_USER() function:\n\nSELECT CURRENT_USER();\n\nIf a FOR user clause is given, the account name uses the format\ndescribed in\nhttps://dev.mysql.com/doc/refman/8.0/en/account-names.html. For\nexample:\n\nSET PASSWORD FOR \'bob\'@\'%.example.org\' = \'auth_string\';\n\nThe host name part of the account name, if omitted, defaults to \'%\'.\n\nSET PASSWORD interprets the string as a cleartext string, passes it to\nthe authentication plugin associated with the account, and stores the\nresult returned by the plugin in the account row in the mysql.user\nsystem table. (The plugin is given the opportunity to hash the value\ninto the encryption format it expects. The plugin may use the value as\nspecified, in which case no hashing occurs.)\n\nSetting the password for a named account (with a FOR clause) requires\nthe UPDATE privilege for the mysql system schema. Setting the password\nfor yourself (for a nonanonymous account with no FOR clause) requires\nno special privileges.\n\nStatements that modify secondary passwords require these privileges:\n\no The APPLICATION_PASSWORD_ADMIN privilege is required to use the\n  RETAIN CURRENT PASSWORD clause for SET PASSWORD statements that apply\n  to your own account. The privilege is required to manipulate your own\n  secondary password because most users require only one password.\n\no If an account is to be permitted to manipulate secondary passwords\n  for all accounts, it should be granted the CREATE USER privilege\n  rather than APPLICATION_PASSWORD_ADMIN.\n\nWhen the read_only system variable is enabled, SET PASSWORD requires\nthe CONNECTION_ADMIN privilege (or the deprecated SUPER privilege), in\naddition to any other required privileges.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/set-password.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/set-password.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (618,46,'SET ROLE','Syntax:\nSET ROLE {\n    DEFAULT\n  | NONE\n  | ALL\n  | ALL EXCEPT role [, role ] ...\n  | role [, role ] ...\n}\n\nSET ROLE modifies the current user\'s effective privileges within the\ncurrent session by specifying which of its granted roles are active.\nGranted roles include those granted explicitly to the user and those\nnamed in the mandatory_roles system variable value.\n\nExamples:\n\nSET ROLE DEFAULT;\nSET ROLE \'role1\', \'role2\';\nSET ROLE ALL;\nSET ROLE ALL EXCEPT \'role1\', \'role2\';\n\nEach role name uses the format described in\nhttps://dev.mysql.com/doc/refman/8.0/en/role-names.html. The host name\npart of the role name, if omitted, defaults to \'%\'.\n\nPrivileges that the user has been granted directly (rather than through\nroles) remain unaffected by changes to the active roles.\n\nThe statement permits these role specifiers:\n\no DEFAULT: Activate the account default roles. Default roles are those\n  specified with SET DEFAULT ROLE.\n\n  When a user connects to the server and authenticates successfully,\n  the server determines which roles to activate as the default roles.\n  If the activate_all_roles_on_login system variable is enabled, the\n  server activates all granted roles. Otherwise, the server executes\n  SET ROLE DEFAULT implicitly. The server activates only default roles\n  that can be activated. The server writes warnings to its error log\n  for default roles that cannot be activated, but the client receives\n  no warnings.\n\n  If a user executes SET ROLE DEFAULT during a session, an error occurs\n  if any default role cannot be activated (for example, if it does not\n  exist or is not granted to the user). In this case, the current\n  active roles are not changed.\n\no NONE: Set the active roles to NONE (no active roles).\n\no ALL: Activate all roles granted to the account.\n\no ALL EXCEPT role [, role ] ...: Activate all roles granted to the\n  account except those named. The named roles need not exist or be\n  granted to the account.\n\no role [, role ] ...: Activate the named roles, which must be granted\n  to the account.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/set-role.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/set-role.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (619,46,'ALTER RESOURCE GROUP','Syntax:\nALTER RESOURCE GROUP group_name\n    [VCPU [=] vcpu_spec [, vcpu_spec] ...]\n    [THREAD_PRIORITY [=] N]\n    [ENABLE|DISABLE [FORCE]]\n\nvcpu_spec: {N | M - N}\n\nALTER RESOURCE GROUP is used for resource group management (see\nhttps://dev.mysql.com/doc/refman/8.0/en/resource-groups.html). This\nstatement alters modifiable attributes of an existing resource group.\nIt requires the RESOURCE_GROUP_ADMIN privilege.\n\ngroup_name identifies which resource group to alter. If the group does\nnot exist, an error occurs.\n\nThe attributes for CPU affinity, priority, and whether the group is\nenabled can be modified with ALTER RESOURCE GROUP. These attributes are\nspecified the same way as described for CREATE RESOURCE GROUP (see\n[HELP CREATE RESOURCE GROUP]). Only the attributes specified are\naltered. Unspecified attributes retain their current values.\n\nThe FORCE modifier is used with DISABLE. It determines statement\nbehavior if the resource group has any threads assigned to it:\n\no If FORCE is not given, existing threads in the group continue to run\n  until they terminate, but new threads cannot be assigned to the\n  group.\n\no If FORCE is given, existing threads in the group are moved to their\n  respective default group (system threads to SYS_default, user threads\n  to USR_default).\n\nThe name and type attributes are set at group creation time and cannot\nbe modified thereafter with ALTER RESOURCE GROUP.\n\nExamples:\n\no Alter a group CPU affinity:\n\nALTER RESOURCE GROUP rg1 VCPU = 0-63;\n\no Alter a group thread priority:\n\nALTER RESOURCE GROUP rg2 THREAD_PRIORITY = 5;\n\no Disable a group, moving any threads assigned to it to the default\n  groups:\n\nALTER RESOURCE GROUP rg3 DISABLE FORCE;\n\nResource group management is local to the server on which it occurs.\nALTER RESOURCE GROUP statements are not written to the binary log and\nare not replicated.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/alter-resource-group.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/alter-resource-group.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (620,46,'CREATE RESOURCE GROUP','Syntax:\nCREATE RESOURCE GROUP group_name\n    TYPE = {SYSTEM|USER}\n    [VCPU [=] vcpu_spec [, vcpu_spec] ...]\n    [THREAD_PRIORITY [=] N]\n    [ENABLE|DISABLE]\n\nvcpu_spec: {N | M - N}\n\nCREATE RESOURCE GROUP is used for resource group management (see\nhttps://dev.mysql.com/doc/refman/8.0/en/resource-groups.html). This\nstatement creates a new resource group and assigns its initial\nattribute values. It requires the RESOURCE_GROUP_ADMIN privilege.\n\ngroup_name identifies which resource group to create. If the group\nalready exists, an error occurs.\n\nThe TYPE attribute is required. It should be SYSTEM for a system\nresource group, USER for a user resource group. The group type affects\npermitted THREAD_PRIORITY values, as described later.\n\nThe VCPU attribute indicates the CPU affinity; that is, the set of\nvirtual CPUs the group can use:\n\no If VCPU is not given, the resource group has no CPU affinity and can\n  use all available CPUs.\n\no If VCPU is given, the attribute value is a list of comma-separated\n  CPU numbers or ranges:\n\n  o Each number must be an integer in the range from 0 to the number of\n    CPUs − 1. For example, on a system with 64 CPUs, the number can\n    range from 0 to 63.\n\n  o A range is given in the form M − N, where M is less than or equal\n    to N and both numbers are in the CPU range.\n\n  o If a CPU number is an integer outside the permitted range or is not\n    an integer, an error occurs.\n\nExample VCPU specifiers (these are all equivalent):\n\nVCPU = 0,1,2,3,9,10\nVCPU = 0-3,9-10\nVCPU = 9,10,0-3\nVCPU = 0,10,1,9,3,2\n\nThe THREAD_PRIORITY attribute indicates the priority for threads\nassigned to the group:\n\no If THREAD_PRIORITY is not given, the default priority is 0.\n\no If THREAD_PRIORITY is given, the attribute value must be in the range\n  from -20 (highest priority) to 19 (lowest priority). The priority for\n  system resource groups must be in the range from -20 to 0. The\n  priority for user resource groups must be in the range from 0 to 19.\n  Use of different ranges for system and user groups ensures that user\n  threads never have a higher priority than system threads.\n\nENABLE and DISABLE specify that the resource group is initially enabled\nor disabled. If neither is specified, the group is enabled by default.\nA disabled group cannot have threads assigned to it.\n\nExamples:\n\no Create an enabled user group that has a single CPU and the lowest\n  priority:\n\nCREATE RESOURCE GROUP rg1\n  TYPE = USER\n  VCPU = 0\n  THREAD_PRIORITY = 19;\n\no Create a disabled system group that has no CPU affinity (can use all\n  CPUs) and the highest priority:\n\nCREATE RESOURCE GROUP rg2\n  TYPE = SYSTEM\n  THREAD_PRIORITY = -20\n  DISABLE;\n\nResource group management is local to the server on which it occurs.\nCREATE RESOURCE GROUP statements are not written to the binary log and\nare not replicated.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/create-resource-group.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/create-resource-group.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (621,46,'DROP RESOURCE GROUP','Syntax:\nDROP RESOURCE GROUP group_name [FORCE]\n\nDROP RESOURCE GROUP is used for resource group management (see\nhttps://dev.mysql.com/doc/refman/8.0/en/resource-groups.html). This\nstatement drops a resource group. It requires the RESOURCE_GROUP_ADMIN\nprivilege.\n\ngroup_name identifies which resource group to drop. If the group does\nnot exist, an error occurs.\n\nThe FORCE modifier determines statement behavior if the resource group\nhas any threads assigned to it:\n\no If FORCE is not given and any threads are assigned to the group, an\n  error occurs.\n\no If FORCE is given, existing threads in the group are moved to their\n  respective default group (system threads to SYS_default, user threads\n  to USR_default).\n\nExamples:\n\no Drop a group, failing if the group contains any threads:\n\nDROP RESOURCE GROUP rg1;\n\no Drop a group and move existing threads to the default groups:\n\nDROP RESOURCE GROUP rg2 FORCE;\n\nResource group management is local to the server on which it occurs.\nDROP RESOURCE GROUP statements are not written to the binary log and\nare not replicated.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/drop-resource-group.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/drop-resource-group.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (622,46,'SET RESOURCE GROUP','Syntax:\nSET RESOURCE GROUP group_name\n    [FOR thread_id [, thread_id] ...]\n\nSET RESOURCE GROUP is used for resource group management (see\nhttps://dev.mysql.com/doc/refman/8.0/en/resource-groups.html). This\nstatement assigns threads to a resource group. It requires the\nRESOURCE_GROUP_ADMIN or RESOURCE_GROUP_USER privilege.\n\ngroup_name identifies which resource group to be assigned. Any\nthread_id values indicate threads to assign to the group. Thread IDs\ncan be determined from the Performance Schema threads table. If the\nresource group or any named thread ID does not exist, an error occurs.\n\nWith no FOR clause, the statement assigns the current thread for the\nsession to the resource group.\n\nWith a FOR clause that names thread IDs, the statement assigns those\nthreads to the resource group.\n\nFor attempts to assign a system thread to a user resource group or a\nuser thread to a system resource group, a warning occurs.\n\nExamples:\n\no Assign the current session thread to a group:\n\nSET RESOURCE GROUP rg1;\n\no Assign the named threads to a group:\n\nSET RESOURCE GROUP rg2 FOR 14, 78, 4;\n\nResource group management is local to the server on which it occurs.\nSET RESOURCE GROUP statements are not written to the binary log and are\nnot replicated.\n\nAn alternative to SET RESOURCE GROUP is the RESOURCE_GROUP optimizer\nhint, which assigns individual statements to a resource group. See\nhttps://dev.mysql.com/doc/refman/8.0/en/optimizer-hints.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/set-resource-group.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/set-resource-group.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (623,47,'ANALYZE TABLE','Syntax:\nANALYZE [NO_WRITE_TO_BINLOG | LOCAL]\n    TABLE tbl_name [, tbl_name] ...\n\nANALYZE [NO_WRITE_TO_BINLOG | LOCAL]\n    TABLE tbl_name\n    UPDATE HISTOGRAM ON col_name [, col_name] ...\n        [WITH N BUCKETS]\n\nANALYZE [NO_WRITE_TO_BINLOG | LOCAL]\n    TABLE tbl_name\n    DROP HISTOGRAM ON col_name [, col_name] ...\n\nANALYZE TABLE generates table statistics:\n\no ANALYZE TABLE without either HISTOGRAM clause performs a key\n  distribution analysis and stores the distribution for the named table\n  or tables. For MyISAM tables, ANALYZE TABLE for key distribution\n  analysis is equivalent to using myisamchk --analyze.\n\no ANALYZE TABLE with the UPDATE HISTOGRAM clause generates histogram\n  statistics for the named table columns and stores them in the data\n  dictionary. Only one table name is permitted for this syntax.\n\no ANALYZE TABLE with the DROP HISTOGRAM clause removes histogram\n  statistics for the named table columns from the data dictionary. Only\n  one table name is permitted for this syntax.\n\nThis statement requires SELECT and INSERT privileges for the table.\n\nANALYZE TABLE works with InnoDB, NDB, and MyISAM tables. It does not\nwork with views.\n\nIf the innodb_read_only system variable is enabled, ANALYZE TABLE may\nfail because it cannot update statistics tables in the data dictionary,\nwhich use InnoDB. For ANALYZE TABLE operations that update the key\ndistribution, failure may occur even if the operation updates the table\nitself (for example, if it is a MyISAM table). To obtain the updated\ndistribution statistics, set information_schema_stats_expiry=0.\n\nANALYZE TABLE is supported for partitioned tables, and you can use\nALTER TABLE ... ANALYZE PARTITION to analyze one or more partitions;\nfor more information, see [HELP ALTER TABLE], and\nhttps://dev.mysql.com/doc/refman/8.0/en/partitioning-maintenance.html.\n\nDuring the analysis, the table is locked with a read lock for InnoDB\nand MyISAM.\n\nANALYZE TABLE removes the table from the table definition cache, which\nrequires a flush lock. If there are long running statements or\ntransactions still using the table, subsequent statements and\ntransactions must wait for those operations to finish before the flush\nlock is released. Because ANALYZE TABLE itself typically finishes\nquickly, it may not be apparent that delayed transactions or statements\ninvolving the same table are due to the remaining flush lock.\n\nBy default, the server writes ANALYZE TABLE statements to the binary\nlog so that they replicate to replicas. To suppress logging, specify\nthe optional NO_WRITE_TO_BINLOG keyword or its alias LOCAL.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/analyze-table.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/analyze-table.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (624,47,'CHECK TABLE','Syntax:\nCHECK TABLE tbl_name [, tbl_name] ... [option] ...\n\noption: {\n    FOR UPGRADE\n  | QUICK\n  | FAST\n  | MEDIUM\n  | EXTENDED\n  | CHANGED\n}\n\nCHECK TABLE checks a table or tables for errors. CHECK TABLE can also\ncheck views for problems, such as tables that are referenced in the\nview definition that no longer exist.\n\nTo check a table, you must have some privilege for it.\n\nCHECK TABLE works for InnoDB, MyISAM, ARCHIVE, and CSV tables.\n\nBefore running CHECK TABLE on InnoDB tables, see\nhttps://dev.mysql.com/doc/refman/8.0/en/check-table.html#check-table-in\nnodb.\n\nCHECK TABLE is supported for partitioned tables, and you can use ALTER\nTABLE ... CHECK PARTITION to check one or more partitions; for more\ninformation, see [HELP ALTER TABLE], and\nhttps://dev.mysql.com/doc/refman/8.0/en/partitioning-maintenance.html.\n\nCHECK TABLE ignores virtual generated columns that are not indexed.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/check-table.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/check-table.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (625,47,'CHECKSUM TABLE','Syntax:\nCHECKSUM TABLE tbl_name [, tbl_name] ... [QUICK | EXTENDED]\n\nCHECKSUM TABLE reports a checksum for the contents of a table. You can\nuse this statement to verify that the contents are the same before and\nafter a backup, rollback, or other operation that is intended to put\nthe data back to a known state.\n\nThis statement requires the SELECT privilege for the table.\n\nThis statement is not supported for views. If you run CHECKSUM TABLE\nagainst a view, the Checksum value is always NULL, and a warning is\nreturned.\n\nFor a nonexistent table, CHECKSUM TABLE returns NULL and generates a\nwarning.\n\nDuring the checksum operation, the table is locked with a read lock for\nInnoDB and MyISAM.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/checksum-table.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/checksum-table.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (626,47,'OPTIMIZE TABLE','Syntax:\nOPTIMIZE [NO_WRITE_TO_BINLOG | LOCAL]\n    TABLE tbl_name [, tbl_name] ...\n\nOPTIMIZE TABLE reorganizes the physical storage of table data and\nassociated index data, to reduce storage space and improve I/O\nefficiency when accessing the table. The exact changes made to each\ntable depend on the storage engine used by that table.\n\nUse OPTIMIZE TABLE in these cases, depending on the type of table:\n\no After doing substantial insert, update, or delete operations on an\n  InnoDB table that has its own .ibd file because it was created with\n  the innodb_file_per_table option enabled. The table and indexes are\n  reorganized, and disk space can be reclaimed for use by the operating\n  system.\n\no After doing substantial insert, update, or delete operations on\n  columns that are part of a FULLTEXT index in an InnoDB table. Set the\n  configuration option innodb_optimize_fulltext_only=1 first. To keep\n  the index maintenance period to a reasonable time, set the\n  innodb_ft_num_word_optimize option to specify how many words to\n  update in the search index, and run a sequence of OPTIMIZE TABLE\n  statements until the search index is fully updated.\n\no After deleting a large part of a MyISAM or ARCHIVE table, or making\n  many changes to a MyISAM or ARCHIVE table with variable-length rows\n  (tables that have VARCHAR, VARBINARY, BLOB, or TEXT columns). Deleted\n  rows are maintained in a linked list and subsequent INSERT operations\n  reuse old row positions. You can use OPTIMIZE TABLE to reclaim the\n  unused space and to defragment the data file. After extensive changes\n  to a table, this statement may also improve performance of statements\n  that use the table, sometimes significantly.\n\nThis statement requires SELECT and INSERT privileges for the table.\n\nOPTIMIZE TABLE works for InnoDB, MyISAM, and ARCHIVE tables. OPTIMIZE\nTABLE is also supported for dynamic columns of in-memory NDB tables. It\ndoes not work for fixed-width columns of in-memory tables, nor does it\nwork for Disk Data tables. The performance of OPTIMIZE on NDB Cluster\ntables can be tuned using --ndb-optimization-delay, which controls the\nlength of time to wait between processing batches of rows by OPTIMIZE\nTABLE. For more information, see\nhttps://dev.mysql.com/doc/refman/8.0/en/mysql-cluster-limitations-resol\nved.html.\n\nFor NDB Cluster tables, OPTIMIZE TABLE can be interrupted by (for\nexample) killing the SQL thread performing the OPTIMIZE operation.\n\nBy default, OPTIMIZE TABLE does not work for tables created using any\nother storage engine and returns a result indicating this lack of\nsupport. You can make OPTIMIZE TABLE work for other storage engines by\nstarting mysqld with the --skip-new option. In this case, OPTIMIZE\nTABLE is just mapped to ALTER TABLE.\n\nThis statement does not work with views.\n\nOPTIMIZE TABLE is supported for partitioned tables. For information\nabout using this statement with partitioned tables and table\npartitions, see\nhttps://dev.mysql.com/doc/refman/8.0/en/partitioning-maintenance.html.\n\nBy default, the server writes OPTIMIZE TABLE statements to the binary\nlog so that they replicate to replicas. To suppress logging, specify\nthe optional NO_WRITE_TO_BINLOG keyword or its alias LOCAL.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/optimize-table.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/optimize-table.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (627,47,'REPAIR TABLE','Syntax:\nREPAIR [NO_WRITE_TO_BINLOG | LOCAL]\n    TABLE tbl_name [, tbl_name] ...\n    [QUICK] [EXTENDED] [USE_FRM]\n\nREPAIR TABLE repairs a possibly corrupted table, for certain storage\nengines only.\n\nThis statement requires SELECT and INSERT privileges for the table.\n\nAlthough normally you should never have to run REPAIR TABLE, if\ndisaster strikes, this statement is very likely to get back all your\ndata from a MyISAM table. If your tables become corrupted often, try to\nfind the reason for it, to eliminate the need to use REPAIR TABLE. See\nhttps://dev.mysql.com/doc/refman/8.0/en/crashing.html, and\nhttps://dev.mysql.com/doc/refman/8.0/en/myisam-table-problems.html.\n\nREPAIR TABLE checks the table to see whether an upgrade is required. If\nso, it performs the upgrade, following the same rules as CHECK TABLE\n... FOR UPGRADE. See [HELP CHECK TABLE], for more information.\n\n*Important*:\n\no Make a backup of a table before performing a table repair operation;\n  under some circumstances the operation might cause data loss.\n  Possible causes include but are not limited to file system errors.\n  See https://dev.mysql.com/doc/refman/8.0/en/backup-and-recovery.html.\n\no If the server exits during a REPAIR TABLE operation, it is essential\n  after restarting it that you immediately execute another REPAIR TABLE\n  statement for the table before performing any other operations on it.\n  In the worst case, you might have a new clean index file without\n  information about the data file, and then the next operation you\n  perform could overwrite the data file. This is an unlikely but\n  possible scenario that underscores the value of making a backup\n  first.\n\no In the event that a table on the source becomes corrupted and you run\n  REPAIR TABLE on it, any resulting changes to the original table are\n  not propagated to replicas.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/repair-table.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/repair-table.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (628,48,'CREATE FUNCTION LOADABLE FUNCTION','Syntax:\nCREATE [AGGREGATE] FUNCTION function_name\n    RETURNS {STRING|INTEGER|REAL|DECIMAL}\n    SONAME shared_library_name\n\nThis statement loads the loadable function named function_name. (CREATE\nFUNCTION is also used to created stored functions; see [HELP CREATE\nPROCEDURE].)\n\nA loadable function is a way to extend MySQL with a new function that\nworks like a native (built-in) MySQL function such as ABS() or\nCONCAT(). See Adding a Loadable Function\n(https://dev.mysql.com/doc/extending-mysql/8.0/en/adding-loadable-funct\nion.html).\n\nfunction_name is the name that should be used in SQL statements to\ninvoke the function. The RETURNS clause indicates the type of the\nfunction\'s return value. DECIMAL is a legal value after RETURNS, but\ncurrently DECIMAL functions return string values and should be written\nlike STRING functions.\n\nThe AGGREGATE keyword, if given, signifies that the function is an\naggregate (group) function. An aggregate function works exactly like a\nnative MySQL aggregate function such as SUM() or COUNT().\n\nshared_library_name is the base name of the shared library file\ncontaining the code that implements the function. The file must be\nlocated in the plugin directory. This directory is given by the value\nof the plugin_dir system variable. For more information, see\nhttps://dev.mysql.com/doc/refman/8.0/en/function-loading.html.\n\nCREATE FUNCTION requires the INSERT privilege for the mysql system\nschema because it adds a row to the mysql.func system table to register\nthe function.\n\nCREATE FUNCTION also adds the function to the Performance Schema\nuser_defined_functions table that provides runtime information about\ninstalled loadable functions. See\nhttps://dev.mysql.com/doc/refman/8.0/en/performance-schema-user-defined\n-functions-table.html.\n\n*Note*:\n\nLike the mysql.func system table, the Performance Schema\nuser_defined_functions table lists loadable functions installed using\nCREATE FUNCTION. Unlike the mysql.func table, the\nuser_defined_functions table also lists loadable functions installed\nautomatically by server components or plugins. This difference makes\nuser_defined_functions preferable to mysql.func for checking which\nloadable functions are installed.\n\nDuring the normal startup sequence, the server loads functions\nregistered in the mysql.func table. If the server is started with the\n--skip-grant-tables option, functions registered in the table are not\nloaded and are unavailable.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/create-function-loadable.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/create-function-loadable.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (629,48,'DROP FUNCTION LOADABLE FUNCTION','Syntax:\nDROP FUNCTION [IF EXISTS] function_name\n\nThis statement drops the loadable function named function_name. (DROP\nFUNCTION is also used to drop stored functions; see [HELP DROP\nPROCEDURE].)\n\nDROP FUNCTION is the complement of CREATE FUNCTION. It requires the\nDELETE privilege for the mysql system schema because it removes the row\nfrom the mysql.func system table that registers the function.\n\nDROP FUNCTION also removes the function from the Performance Schema\nuser_defined_functions table that provides runtime information about\ninstalled loadable functions. See\nhttps://dev.mysql.com/doc/refman/8.0/en/performance-schema-user-defined\n-functions-table.html.\n\nDuring the normal startup sequence, the server loads functions\nregistered in the mysql.func table. Because DROP FUNCTION removes the\nmysql.func row for the dropped function, the server does not load the\nfunction during subsequent restarts.\n\nDROP FUNCTION cannot be used to drop a loadable function that is\ninstalled automatically by components or plugins rather than by using\nCREATE FUNCTION. Such a function is also dropped automatically, when\nthe component or plugin that installed it is uninstalled.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/drop-function-loadable.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/drop-function-loadable.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (630,49,'INSTALL COMPONENT','Syntax:\nINSTALL COMPONENT component_name [, component_name ] ...\n\nThis statement installs one or more components, which become active\nimmediately. A component provides services that are available to the\nserver and other components; see\nhttps://dev.mysql.com/doc/refman/8.0/en/components.html. INSTALL\nCOMPONENT requires the INSERT privilege for the mysql.component system\ntable because it adds a row to that table to register the component.\n\nExample:\n\nINSTALL COMPONENT \'file://component1\', \'file://component2\';\n\nA component is named using a URN that begins with file:// and indicates\nthe base name of the library file that implements the component,\nlocated in the directory named by the plugin_dir system variable.\nComponent names do not include any platform-dependent file name suffix\nsuch as .so or .dll. (These naming details are subject to change\nbecause component name interpretation is itself performed by a service\nand the component infrastructure makes it possible to replace the\ndefault service implementation with alternative implementations.)\n\nIf any error occurs, the statement fails and has no effect. For\nexample, this happens if a component name is erroneous, a named\ncomponent does not exist or is already installed, or component\ninitialization fails.\n\nA loader service handles component loading, which includes adding\ninstalled components to the mysql.component system table that serves as\na registry. For subsequent server restarts, any components listed in\nmysql.component are loaded by the loader service during the startup\nsequence. This occurs even if the server is started with the\n--skip-grant-tables option.\n\nIf a component depends on services not present in the registry and you\nattempt to install the component without also installing the component\nor components that provide the services on which it depends, an error\noccurs:\n\nERROR 3527 (HY000): Cannot satisfy dependency for service \'component_a\'\nrequired by component \'component_b\'.\n\nTo avoid this problem, either install all components in the same\nstatement, or install the dependent component after installing any\ncomponents on which it depends.\n\n*Note*:\n\nFor keyring components, do not use INSTALL COMPONENT. Instead,\nconfigure keyring component loading using a manifest file. See\nhttps://dev.mysql.com/doc/refman/8.0/en/keyring-component-installation.\nhtml.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/install-component.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/install-component.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (631,50,'INSTALL PLUGIN','Syntax:\nINSTALL PLUGIN plugin_name SONAME \'shared_library_name\'\n\nThis statement installs a server plugin. It requires the INSERT\nprivilege for the mysql.plugin system table because it adds a row to\nthat table to register the plugin.\n\nplugin_name is the name of the plugin as defined in the plugin\ndescriptor structure contained in the library file (see Plugin Data\nStructures\n(https://dev.mysql.com/doc/extending-mysql/8.0/en/plugin-data-structure\ns.html)). Plugin names are not case-sensitive. For maximal\ncompatibility, plugin names should be limited to ASCII letters, digits,\nand underscore because they are used in C source files, shell command\nlines, M4 and Bourne shell scripts, and SQL environments.\n\nshared_library_name is the name of the shared library that contains the\nplugin code. The name includes the file name extension (for example,\nlibmyplugin.so, libmyplugin.dll, or libmyplugin.dylib).\n\nThe shared library must be located in the plugin directory (the\ndirectory named by the plugin_dir system variable). The library must be\nin the plugin directory itself, not in a subdirectory. By default,\nplugin_dir is the plugin directory under the directory named by the\npkglibdir configuration variable, but it can be changed by setting the\nvalue of plugin_dir at server startup. For example, set its value in a\nmy.cnf file:\n\n[mysqld]\nplugin_dir=/path/to/plugin/directory\n\nIf the value of plugin_dir is a relative path name, it is taken to be\nrelative to the MySQL base directory (the value of the basedir system\nvariable).\n\nINSTALL PLUGIN loads and initializes the plugin code to make the plugin\navailable for use. A plugin is initialized by executing its\ninitialization function, which handles any setup that the plugin must\nperform before it can be used. When the server shuts down, it executes\nthe deinitialization function for each plugin that is loaded so that\nthe plugin has a chance to perform any final cleanup.\n\nINSTALL PLUGIN also registers the plugin by adding a line that\nindicates the plugin name and library file name to the mysql.plugin\nsystem table. During the normal startup sequence, the server loads and\ninitializes plugins registered in mysql.plugin. This means that a\nplugin is installed with INSTALL PLUGIN only once, not every time the\nserver starts. If the server is started with the --skip-grant-tables\noption, plugins registered in the mysql.plugin table are not loaded and\nare unavailable.\n\nA plugin library can contain multiple plugins. For each of them to be\ninstalled, use a separate INSTALL PLUGIN statement. Each statement\nnames a different plugin, but all of them specify the same library\nname.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/install-plugin.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/install-plugin.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (632,49,'UNINSTALL COMPONENT','Syntax:\nUNINSTALL COMPONENT component_name [, component_name ] ...\n\nThis statement deactivates and uninstalls one or more components. A\ncomponent provides services that are available to the server and other\ncomponents; see\nhttps://dev.mysql.com/doc/refman/8.0/en/components.html. UNINSTALL\nCOMPONENT is the complement of INSTALL COMPONENT. It requires the\nDELETE privilege for the mysql.component system table because it\nremoves the row from that table that registers the component.\n\nExample:\n\nUNINSTALL COMPONENT \'file://component1\', \'file://component2\';\n\nFor information about component naming, see [HELP INSTALL COMPONENT].\n\nIf any error occurs, the statement fails and has no effect. For\nexample, this happens if a component name is erroneous, a named\ncomponent is not installed, or cannot be uninstalled because other\ninstalled components depend on it.\n\nA loader service handles component unloading, which includes removing\nuninstalled components from the mysql.component system table that\nserves as a registry. As a result, unloaded components are not loaded\nduring the startup sequence for subsequent server restarts.\n\n*Note*:\n\nThis statement has no effect for keyring components, which are loaded\nusing a manifest file and cannot be uninstalled. See\nhttps://dev.mysql.com/doc/refman/8.0/en/keyring-component-installation.\nhtml.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/uninstall-component.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/uninstall-component.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (633,49,'UNINSTALL PLUGIN','Syntax:\nUNINSTALL PLUGIN plugin_name\n\nThis statement removes an installed server plugin. UNINSTALL PLUGIN is\nthe complement of INSTALL PLUGIN. It requires the DELETE privilege for\nthe mysql.plugin system table because it removes the row from that\ntable that registers the plugin.\n\nplugin_name must be the name of some plugin that is listed in the\nmysql.plugin table. The server executes the plugin\'s deinitialization\nfunction and removes the row for the plugin from the mysql.plugin\nsystem table, so that subsequent server restarts do not load and\ninitialize the plugin. UNINSTALL PLUGIN does not remove the plugin\'s\nshared library file.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/uninstall-plugin.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/uninstall-plugin.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (634,49,'CLONE','Syntax:\nCLONE clone_action\n\nclone_action: {\n    LOCAL DATA DIRECTORY [=] \'clone_dir\';\n  | INSTANCE FROM \'user\'@\'host\':port\n    IDENTIFIED BY \'password\'\n    [DATA DIRECTORY [=] \'clone_dir\']\n    [REQUIRE [NO] SSL]\n}\n\nThe CLONE statement is used to clone data locally or from a remote\nMySQL server instance. To use CLONE syntax, the clone plugin must be\ninstalled. See\nhttps://dev.mysql.com/doc/refman/8.0/en/clone-plugin.html.\n\nCLONE LOCAL DATA DIRECTORY syntax clones data from the local MySQL data\ndirectory to a directory on the same server or node where the MySQL\nserver instance runs. The \'clone_dir\' directory is the full path of the\nlocal directory that data is cloned to. An absolute path is required.\nThe specified directory must not exist, but the specified path must be\nan existent path. The MySQL server requires the necessary write access\nto create the specified directory. For more information, see\nhttps://dev.mysql.com/doc/refman/8.0/en/clone-plugin-local.html.\n\nCLONE INSTANCE syntax clones data from a remote MySQL server instance\n(the donor) and transfers it to the MySQL instance where the cloning\noperation was initiated (the recipient).\n\no user is the clone user on the donor MySQL server instance.\n\no host is the hostname address of the donor MySQL server instance.\n  Internet Protocol version 6 (IPv6) address format is not supported.\n  An alias to the IPv6 address can be used instead. An IPv4 address can\n  be used as is.\n\no port is the port number of the donor MySQL server instance. (The X\n  Protocol port specified by mysqlx_port is not supported. Connecting\n  to the donor MySQL server instance through MySQL Router is also not\n  supported.)\n\no IDENTIFIED BY \'password\' specifies the password of the clone user on\n  the donor MySQL server instance.\n\no DATA DIRECTORY [=] \'clone_dir\' is an optional clause used to specify\n  a directory on the recipient for the data you are cloning. Use this\n  option if you do not want to remove existing data in the recipient\n  data directory. An absolute path is required, and the directory must\n  not exist. The MySQL server must have the necessary write access to\n  create the directory.\n\n  When the optional DATA DIRECTORY [=] \'clone_dir\' clause is not used,\n  a cloning operation removes existing data in the recipient data\n  directory, replaces it with the cloned data, and automatically\n  restarts the server afterward.\n\no [REQUIRE [NO] SSL] explicitly specifies whether an encrypted\n  connection is to be used or not when transferring cloned data over\n  the network. An error is returned if the explicit specification\n  cannot be satisfied. If an SSL clause is not specified, clone\n  attempts to establish an encrypted connection by default, falling\n  back to an insecure connection if the secure connection attempt\n  fails. A secure connection is required when cloning encrypted data\n  regardless of whether this clause is specified. For more information,\n  see\n  https://dev.mysql.com/doc/refman/8.0/en/clone-plugin-remote.html#clon\n  e-plugin-remote-ssl.\n\nFor additional information about cloning data from a remote MySQL\nserver instance, see\nhttps://dev.mysql.com/doc/refman/8.0/en/clone-plugin-remote.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/clone.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/clone.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (635,3,'SET','Syntax:\nSET variable = expr [, variable = expr] ...\n\nvariable: {\n    user_var_name\n  | param_name\n  | local_var_name\n  | {GLOBAL | @@GLOBAL.} system_var_name\n  | {PERSIST | @@PERSIST.} system_var_name\n  | {PERSIST_ONLY | @@PERSIST_ONLY.} system_var_name\n  | [SESSION | @@SESSION. | @@] system_var_name\n}\n\nSET syntax for variable assignment enables you to assign values to\ndifferent types of variables that affect the operation of the server or\nclients:\n\no User-defined variables. See\n  https://dev.mysql.com/doc/refman/8.0/en/user-variables.html.\n\no Stored procedure and function parameters, and stored program local\n  variables. See\n  https://dev.mysql.com/doc/refman/8.0/en/stored-program-variables.html\n  .\n\no System variables. See\n  https://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html.\n  System variables also can be set at server startup, as described in\n  https://dev.mysql.com/doc/refman/8.0/en/using-system-variables.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/set-variable.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/set-variable.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (636,3,'SET CHARACTER SET','Syntax:\nSET {CHARACTER SET | CHARSET}\n    {\'charset_name\' | DEFAULT}\n\nThis statement maps all strings sent between the server and the current\nclient with the given mapping. SET CHARACTER SET sets three session\nsystem variables: character_set_client and character_set_results are\nset to the given character set, and character_set_connection to the\nvalue of character_set_database. See\nhttps://dev.mysql.com/doc/refman/8.0/en/charset-connection.html.\n\ncharset_name may be quoted or unquoted.\n\nThe default character set mapping can be restored by using the value\nDEFAULT. The default depends on the server configuration.\n\nSome character sets cannot be used as the client character set.\nAttempting to use them with SET CHARACTER SET produces an error. See\nhttps://dev.mysql.com/doc/refman/8.0/en/charset-connection.html#charset\n-connection-impermissible-client-charset.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/set-character-set.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/set-character-set.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (637,3,'SET CHARSET','Syntax:\nSET {CHARACTER SET | CHARSET}\n    {\'charset_name\' | DEFAULT}\n\nThis statement maps all strings sent between the server and the current\nclient with the given mapping. SET CHARACTER SET sets three session\nsystem variables: character_set_client and character_set_results are\nset to the given character set, and character_set_connection to the\nvalue of character_set_database. See\nhttps://dev.mysql.com/doc/refman/8.0/en/charset-connection.html.\n\ncharset_name may be quoted or unquoted.\n\nThe default character set mapping can be restored by using the value\nDEFAULT. The default depends on the server configuration.\n\nSome character sets cannot be used as the client character set.\nAttempting to use them with SET CHARACTER SET produces an error. See\nhttps://dev.mysql.com/doc/refman/8.0/en/charset-connection.html#charset\n-connection-impermissible-client-charset.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/set-character-set.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/set-character-set.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (638,3,'SET NAMES','Syntax:\nSET NAMES {\'charset_name\'\n    [COLLATE \'collation_name\'] | DEFAULT}\n\nThis statement sets the three session system variables\ncharacter_set_client, character_set_connection, and\ncharacter_set_results to the given character set. Setting\ncharacter_set_connection to charset_name also sets collation_connection\nto the default collation for charset_name. See\nhttps://dev.mysql.com/doc/refman/8.0/en/charset-connection.html.\n\nThe optional COLLATE clause may be used to specify a collation\nexplicitly. If given, the collation must one of the permitted\ncollations for charset_name.\n\ncharset_name and collation_name may be quoted or unquoted.\n\nThe default mapping can be restored by using a value of DEFAULT. The\ndefault depends on the server configuration.\n\nSome character sets cannot be used as the client character set.\nAttempting to use them with SET NAMES produces an error. See\nhttps://dev.mysql.com/doc/refman/8.0/en/charset-connection.html#charset\n-connection-impermissible-client-charset.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/set-names.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/set-names.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (639,3,'SHOW','SHOW has many forms that provide information about databases, tables,\ncolumns, or status information about the server. This section describes\nthose following:\n\nSHOW {BINARY | MASTER} LOGS\nSHOW BINLOG EVENTS [IN \'log_name\'] [FROM pos] [LIMIT [offset,] row_count]\nSHOW CHARACTER SET [like_or_where]\nSHOW COLLATION [like_or_where]\nSHOW [FULL] COLUMNS FROM tbl_name [FROM db_name] [like_or_where]\nSHOW CREATE DATABASE db_name\nSHOW CREATE EVENT event_name\nSHOW CREATE FUNCTION func_name\nSHOW CREATE PROCEDURE proc_name\nSHOW CREATE TABLE tbl_name\nSHOW CREATE TRIGGER trigger_name\nSHOW CREATE VIEW view_name\nSHOW DATABASES [like_or_where]\nSHOW ENGINE engine_name {STATUS | MUTEX}\nSHOW [STORAGE] ENGINES\nSHOW ERRORS [LIMIT [offset,] row_count]\nSHOW EVENTS\nSHOW FUNCTION CODE func_name\nSHOW FUNCTION STATUS [like_or_where]\nSHOW GRANTS FOR user\nSHOW INDEX FROM tbl_name [FROM db_name]\nSHOW MASTER STATUS\nSHOW OPEN TABLES [FROM db_name] [like_or_where]\nSHOW PLUGINS\nSHOW PROCEDURE CODE proc_name\nSHOW PROCEDURE STATUS [like_or_where]\nSHOW PRIVILEGES\nSHOW [FULL] PROCESSLIST\nSHOW PROFILE [types] [FOR QUERY n] [OFFSET n] [LIMIT n]\nSHOW PROFILES\nSHOW RELAYLOG EVENTS [IN \'log_name\'] [FROM pos] [LIMIT [offset,] row_count]\nSHOW {REPLICAS | SLAVE HOSTS}\nSHOW {REPLICA | SLAVE} STATUS [FOR CHANNEL channel]\nSHOW [GLOBAL | SESSION] STATUS [like_or_where]\nSHOW TABLE STATUS [FROM db_name] [like_or_where]\nSHOW [FULL] TABLES [FROM db_name] [like_or_where]\nSHOW TRIGGERS [FROM db_name] [like_or_where]\nSHOW [GLOBAL | SESSION] VARIABLES [like_or_where]\nSHOW WARNINGS [LIMIT [offset,] row_count]\n\nlike_or_where: {\n    LIKE \'pattern\'\n  | WHERE expr\n}\n\nIf the syntax for a given SHOW statement includes a LIKE \'pattern\'\npart, \'pattern\' is a string that can contain the SQL % and _ wildcard\ncharacters. The pattern is useful for restricting statement output to\nmatching values.\n\nSeveral SHOW statements also accept a WHERE clause that provides more\nflexibility in specifying which rows to display. See\nhttps://dev.mysql.com/doc/refman/8.0/en/extended-show.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (640,3,'SHOW BINARY LOGS','Syntax:\nSHOW BINARY LOGS\nSHOW MASTER LOGS\n\nLists the binary log files on the server. This statement is used as\npart of the procedure described in [HELP PURGE BINARY LOGS], that shows\nhow to determine which logs can be purged. SHOW BINARY LOGS requires\nthe REPLICATION CLIENT privilege (or the deprecated SUPER privilege).\n\nEncrypted binary log files have a 512-byte file header that stores\ninformation required for encryption and decryption of the file. This is\nincluded in the file size displayed by SHOW BINARY LOGS. The Encrypted\ncolumn shows whether or not the binary log file is encrypted. Binary\nlog encryption is active if binlog_encryption=ON is set for the server.\nExisting binary log files are not encrypted or decrypted if binary log\nencryption is activated or deactivated while the server is running.\n\nmysql> SHOW BINARY LOGS;\n+---------------+-----------+-----------+\n| Log_name      | File_size | Encrypted |\n+---------------+-----------+-----------+\n| binlog.000015 |    724935 |       Yes |\n| binlog.000016 |    733481 |       Yes |\n+---------------+-----------+-----------+\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-binary-logs.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-binary-logs.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (641,3,'SHOW MASTER LOGS','Syntax:\nSHOW BINARY LOGS\nSHOW MASTER LOGS\n\nLists the binary log files on the server. This statement is used as\npart of the procedure described in [HELP PURGE BINARY LOGS], that shows\nhow to determine which logs can be purged. SHOW BINARY LOGS requires\nthe REPLICATION CLIENT privilege (or the deprecated SUPER privilege).\n\nEncrypted binary log files have a 512-byte file header that stores\ninformation required for encryption and decryption of the file. This is\nincluded in the file size displayed by SHOW BINARY LOGS. The Encrypted\ncolumn shows whether or not the binary log file is encrypted. Binary\nlog encryption is active if binlog_encryption=ON is set for the server.\nExisting binary log files are not encrypted or decrypted if binary log\nencryption is activated or deactivated while the server is running.\n\nmysql> SHOW BINARY LOGS;\n+---------------+-----------+-----------+\n| Log_name      | File_size | Encrypted |\n+---------------+-----------+-----------+\n| binlog.000015 |    724935 |       Yes |\n| binlog.000016 |    733481 |       Yes |\n+---------------+-----------+-----------+\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-binary-logs.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-binary-logs.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (642,3,'SHOW BINLOG EVENTS','Syntax:\nSHOW BINLOG EVENTS\n   [IN \'log_name\']\n   [FROM pos]\n   [LIMIT [offset,] row_count]\n\nShows the events in the binary log. If you do not specify \'log_name\',\nthe first binary log is displayed. SHOW BINLOG EVENTS requires the\nREPLICATION SLAVE privilege.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-binlog-events.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-binlog-events.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (643,3,'SHOW CHARACTER SET','Syntax:\nSHOW CHARACTER SET\n    [LIKE \'pattern\' | WHERE expr]\n\nThe SHOW CHARACTER SET statement shows all available character sets.\nThe LIKE clause, if present, indicates which character set names to\nmatch. The WHERE clause can be given to select rows using more general\nconditions, as discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/extended-show.html. For\nexample:\n\nmysql> SHOW CHARACTER SET LIKE \'latin%\';\n+---------+-----------------------------+-------------------+--------+\n| Charset | Description                 | Default collation | Maxlen |\n+---------+-----------------------------+-------------------+--------+\n| latin1  | cp1252 West European        | latin1_swedish_ci |      1 |\n| latin2  | ISO 8859-2 Central European | latin2_general_ci |      1 |\n| latin5  | ISO 8859-9 Turkish          | latin5_turkish_ci |      1 |\n| latin7  | ISO 8859-13 Baltic          | latin7_general_ci |      1 |\n+---------+-----------------------------+-------------------+--------+\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-character-set.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-character-set.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (644,3,'SHOW COLLATION','Syntax:\nSHOW COLLATION\n    [LIKE \'pattern\' | WHERE expr]\n\nThis statement lists collations supported by the server. By default,\nthe output from SHOW COLLATION includes all available collations. The\nLIKE clause, if present, indicates which collation names to match. The\nWHERE clause can be given to select rows using more general conditions,\nas discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/extended-show.html. For\nexample:\n\nmysql> SHOW COLLATION WHERE Charset = \'latin1\';\n+-------------------+---------+----+---------+----------+---------+\n| Collation         | Charset | Id | Default | Compiled | Sortlen |\n+-------------------+---------+----+---------+----------+---------+\n| latin1_german1_ci | latin1  |  5 |         | Yes      |       1 |\n| latin1_swedish_ci | latin1  |  8 | Yes     | Yes      |       1 |\n| latin1_danish_ci  | latin1  | 15 |         | Yes      |       1 |\n| latin1_german2_ci | latin1  | 31 |         | Yes      |       2 |\n| latin1_bin        | latin1  | 47 |         | Yes      |       1 |\n| latin1_general_ci | latin1  | 48 |         | Yes      |       1 |\n| latin1_general_cs | latin1  | 49 |         | Yes      |       1 |\n| latin1_spanish_ci | latin1  | 94 |         | Yes      |       1 |\n+-------------------+---------+----+---------+----------+---------+\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-collation.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-collation.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (645,3,'SHOW COLUMNS','Syntax:\nSHOW [EXTENDED] [FULL] {COLUMNS | FIELDS}\n    {FROM | IN} tbl_name\n    [{FROM | IN} db_name]\n    [LIKE \'pattern\' | WHERE expr]\n\nSHOW COLUMNS displays information about the columns in a given table.\nIt also works for views. SHOW COLUMNS displays information only for\nthose columns for which you have some privilege.\n\nmysql> SHOW COLUMNS FROM City;\n+-------------+----------+------+-----+---------+----------------+\n| Field       | Type     | Null | Key | Default | Extra          |\n+-------------+----------+------+-----+---------+----------------+\n| ID          | int(11)  | NO   | PRI | NULL    | auto_increment |\n| Name        | char(35) | NO   |     |         |                |\n| CountryCode | char(3)  | NO   | MUL |         |                |\n| District    | char(20) | NO   |     |         |                |\n| Population  | int(11)  | NO   |     | 0       |                |\n+-------------+----------+------+-----+---------+----------------+\n\nAn alternative to tbl_name FROM db_name syntax is db_name.tbl_name.\nThese two statements are equivalent:\n\nSHOW COLUMNS FROM mytable FROM mydb;\nSHOW COLUMNS FROM mydb.mytable;\n\nThe optional EXTENDED keyword causes the output to include information\nabout hidden columns that MySQL uses internally and are not accessible\nby users.\n\nThe optional FULL keyword causes the output to include the column\ncollation and comments, as well as the privileges you have for each\ncolumn.\n\nThe LIKE clause, if present, indicates which column names to match. The\nWHERE clause can be given to select rows using more general conditions,\nas discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/extended-show.html.\n\nThe data types may differ from what you expect them to be based on a\nCREATE TABLE statement because MySQL sometimes changes data types when\nyou create or alter a table. The conditions under which this occurs are\ndescribed in\nhttps://dev.mysql.com/doc/refman/8.0/en/silent-column-changes.html.\n\nSHOW COLUMNS displays the following values for each table column:\n\no Field\n\n  The name of the column.\n\no Type\n\n  The column data type.\n\no Collation\n\n  The collation for nonbinary string columns, or NULL for other\n  columns. This value is displayed only if you use the FULL keyword.\n\no Null\n\n  The column nullability. The value is YES if NULL values can be stored\n  in the column, NO if not.\n\no Key\n\n  Whether the column is indexed:\n\n  o If Key is empty, the column either is not indexed or is indexed\n    only as a secondary column in a multiple-column, nonunique index.\n\n  o If Key is PRI, the column is a PRIMARY KEY or is one of the columns\n    in a multiple-column PRIMARY KEY.\n\n  o If Key is UNI, the column is the first column of a UNIQUE index. (A\n    UNIQUE index permits multiple NULL values, but you can tell whether\n    the column permits NULL by checking the Null field.)\n\n  o If Key is MUL, the column is the first column of a nonunique index\n    in which multiple occurrences of a given value are permitted within\n    the column.\n\n  If more than one of the Key values applies to a given column of a\n  table, Key displays the one with the highest priority, in the order\n  PRI, UNI, MUL.\n\n  A UNIQUE index may be displayed as PRI if it cannot contain NULL\n  values and there is no PRIMARY KEY in the table. A UNIQUE index may\n  display as MUL if several columns form a composite UNIQUE index;\n  although the combination of the columns is unique, each column can\n  still hold multiple occurrences of a given value.\n\no Default\n\n  The default value for the column. This is NULL if the column has an\n  explicit default of NULL, or if the column definition includes no\n  DEFAULT clause.\n\no Extra\n\n  Any additional information that is available about a given column.\n  The value is nonempty in these cases:\n\n  o auto_increment for columns that have the AUTO_INCREMENT attribute.\n\n  o on update CURRENT_TIMESTAMP for TIMESTAMP or DATETIME columns that\n    have the ON UPDATE CURRENT_TIMESTAMP attribute.\n\n  o VIRTUAL GENERATED or STORED GENERATED for generated columns.\n\n  o DEFAULT_GENERATED for columns that have an expression default\n    value.\n\no Privileges\n\n  The privileges you have for the column. This value is displayed only\n  if you use the FULL keyword.\n\no Comment\n\n  Any comment included in the column definition. This value is\n  displayed only if you use the FULL keyword.\n\nTable column information is also available from the INFORMATION_SCHEMA\nCOLUMNS table. See\nhttps://dev.mysql.com/doc/refman/8.0/en/information-schema-columns-tabl\ne.html. The extended information about hidden columns is available only\nusing SHOW EXTENDED COLUMNS; it cannot be obtained from the COLUMNS\ntable.\n\nYou can list a table\'s columns with the mysqlshow db_name tbl_name\ncommand.\n\nThe DESCRIBE statement provides information similar to SHOW COLUMNS.\nSee https://dev.mysql.com/doc/refman/8.0/en/describe.html.\n\nThe SHOW CREATE TABLE, SHOW TABLE STATUS, and SHOW INDEX statements\nalso provide information about tables. See [HELP SHOW].\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-columns.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-columns.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (646,3,'SHOW FIELDS','Syntax:\nSHOW [EXTENDED] [FULL] {COLUMNS | FIELDS}\n    {FROM | IN} tbl_name\n    [{FROM | IN} db_name]\n    [LIKE \'pattern\' | WHERE expr]\n\nSHOW COLUMNS displays information about the columns in a given table.\nIt also works for views. SHOW COLUMNS displays information only for\nthose columns for which you have some privilege.\n\nmysql> SHOW COLUMNS FROM City;\n+-------------+----------+------+-----+---------+----------------+\n| Field       | Type     | Null | Key | Default | Extra          |\n+-------------+----------+------+-----+---------+----------------+\n| ID          | int(11)  | NO   | PRI | NULL    | auto_increment |\n| Name        | char(35) | NO   |     |         |                |\n| CountryCode | char(3)  | NO   | MUL |         |                |\n| District    | char(20) | NO   |     |         |                |\n| Population  | int(11)  | NO   |     | 0       |                |\n+-------------+----------+------+-----+---------+----------------+\n\nAn alternative to tbl_name FROM db_name syntax is db_name.tbl_name.\nThese two statements are equivalent:\n\nSHOW COLUMNS FROM mytable FROM mydb;\nSHOW COLUMNS FROM mydb.mytable;\n\nThe optional EXTENDED keyword causes the output to include information\nabout hidden columns that MySQL uses internally and are not accessible\nby users.\n\nThe optional FULL keyword causes the output to include the column\ncollation and comments, as well as the privileges you have for each\ncolumn.\n\nThe LIKE clause, if present, indicates which column names to match. The\nWHERE clause can be given to select rows using more general conditions,\nas discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/extended-show.html.\n\nThe data types may differ from what you expect them to be based on a\nCREATE TABLE statement because MySQL sometimes changes data types when\nyou create or alter a table. The conditions under which this occurs are\ndescribed in\nhttps://dev.mysql.com/doc/refman/8.0/en/silent-column-changes.html.\n\nSHOW COLUMNS displays the following values for each table column:\n\no Field\n\n  The name of the column.\n\no Type\n\n  The column data type.\n\no Collation\n\n  The collation for nonbinary string columns, or NULL for other\n  columns. This value is displayed only if you use the FULL keyword.\n\no Null\n\n  The column nullability. The value is YES if NULL values can be stored\n  in the column, NO if not.\n\no Key\n\n  Whether the column is indexed:\n\n  o If Key is empty, the column either is not indexed or is indexed\n    only as a secondary column in a multiple-column, nonunique index.\n\n  o If Key is PRI, the column is a PRIMARY KEY or is one of the columns\n    in a multiple-column PRIMARY KEY.\n\n  o If Key is UNI, the column is the first column of a UNIQUE index. (A\n    UNIQUE index permits multiple NULL values, but you can tell whether\n    the column permits NULL by checking the Null field.)\n\n  o If Key is MUL, the column is the first column of a nonunique index\n    in which multiple occurrences of a given value are permitted within\n    the column.\n\n  If more than one of the Key values applies to a given column of a\n  table, Key displays the one with the highest priority, in the order\n  PRI, UNI, MUL.\n\n  A UNIQUE index may be displayed as PRI if it cannot contain NULL\n  values and there is no PRIMARY KEY in the table. A UNIQUE index may\n  display as MUL if several columns form a composite UNIQUE index;\n  although the combination of the columns is unique, each column can\n  still hold multiple occurrences of a given value.\n\no Default\n\n  The default value for the column. This is NULL if the column has an\n  explicit default of NULL, or if the column definition includes no\n  DEFAULT clause.\n\no Extra\n\n  Any additional information that is available about a given column.\n  The value is nonempty in these cases:\n\n  o auto_increment for columns that have the AUTO_INCREMENT attribute.\n\n  o on update CURRENT_TIMESTAMP for TIMESTAMP or DATETIME columns that\n    have the ON UPDATE CURRENT_TIMESTAMP attribute.\n\n  o VIRTUAL GENERATED or STORED GENERATED for generated columns.\n\n  o DEFAULT_GENERATED for columns that have an expression default\n    value.\n\no Privileges\n\n  The privileges you have for the column. This value is displayed only\n  if you use the FULL keyword.\n\no Comment\n\n  Any comment included in the column definition. This value is\n  displayed only if you use the FULL keyword.\n\nTable column information is also available from the INFORMATION_SCHEMA\nCOLUMNS table. See\nhttps://dev.mysql.com/doc/refman/8.0/en/information-schema-columns-tabl\ne.html. The extended information about hidden columns is available only\nusing SHOW EXTENDED COLUMNS; it cannot be obtained from the COLUMNS\ntable.\n\nYou can list a table\'s columns with the mysqlshow db_name tbl_name\ncommand.\n\nThe DESCRIBE statement provides information similar to SHOW COLUMNS.\nSee https://dev.mysql.com/doc/refman/8.0/en/describe.html.\n\nThe SHOW CREATE TABLE, SHOW TABLE STATUS, and SHOW INDEX statements\nalso provide information about tables. See [HELP SHOW].\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-columns.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-columns.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (647,3,'SHOW CREATE DATABASE','Syntax:\nSHOW CREATE {DATABASE | SCHEMA} [IF NOT EXISTS] db_name\n\nShows the CREATE DATABASE statement that creates the named database. If\nthe SHOW statement includes an IF NOT EXISTS clause, the output too\nincludes such a clause. SHOW CREATE SCHEMA is a synonym for SHOW CREATE\nDATABASE.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-create-database.html\n\n','mysql> SHOW CREATE DATABASE test\\G\n*************************** 1. row ***************************\n       Database: test\nCreate Database: CREATE DATABASE `test` /*!40100 DEFAULT CHARACTER SET utf8mb4\n                 COLLATE utf8mb4_0900_ai_ci */ /*!80014 DEFAULT ENCRYPTION=\'N\' */\n\nmysql> SHOW CREATE SCHEMA test\\G\n*************************** 1. row ***************************\n       Database: test\nCreate Database: CREATE DATABASE `test` /*!40100 DEFAULT CHARACTER SET utf8mb4\n                 COLLATE utf8mb4_0900_ai_ci */ /*!80014 DEFAULT ENCRYPTION=\'N\' */\n','https://dev.mysql.com/doc/refman/8.0/en/show-create-database.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (648,3,'SHOW CREATE SCHEMA','Syntax:\nSHOW CREATE {DATABASE | SCHEMA} [IF NOT EXISTS] db_name\n\nShows the CREATE DATABASE statement that creates the named database. If\nthe SHOW statement includes an IF NOT EXISTS clause, the output too\nincludes such a clause. SHOW CREATE SCHEMA is a synonym for SHOW CREATE\nDATABASE.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-create-database.html\n\n','mysql> SHOW CREATE DATABASE test\\G\n*************************** 1. row ***************************\n       Database: test\nCreate Database: CREATE DATABASE `test` /*!40100 DEFAULT CHARACTER SET utf8mb4\n                 COLLATE utf8mb4_0900_ai_ci */ /*!80014 DEFAULT ENCRYPTION=\'N\' */\n\nmysql> SHOW CREATE SCHEMA test\\G\n*************************** 1. row ***************************\n       Database: test\nCreate Database: CREATE DATABASE `test` /*!40100 DEFAULT CHARACTER SET utf8mb4\n                 COLLATE utf8mb4_0900_ai_ci */ /*!80014 DEFAULT ENCRYPTION=\'N\' */\n','https://dev.mysql.com/doc/refman/8.0/en/show-create-database.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (649,3,'SHOW CREATE EVENT','Syntax:\nSHOW CREATE EVENT event_name\n\nThis statement displays the CREATE EVENT statement needed to re-create\na given event. It requires the EVENT privilege for the database from\nwhich the event is to be shown. For example (using the same event\ne_daily defined and then altered in [HELP SHOW EVENTS]):\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-create-event.html\n\n','mysql> SHOW CREATE EVENT myschema.e_daily\\G\n*************************** 1. row ***************************\n               Event: e_daily\n            sql_mode: ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,\n                      NO_ZERO_IN_DATE,NO_ZERO_DATE,\n                      ERROR_FOR_DIVISION_BY_ZERO,\n                      NO_ENGINE_SUBSTITUTION\n           time_zone: SYSTEM\n        Create Event: CREATE DEFINER=`jon`@`ghidora` EVENT `e_daily`\n                        ON SCHEDULE EVERY 1 DAY\n                        STARTS CURRENT_TIMESTAMP + INTERVAL 6 HOUR\n                        ON COMPLETION NOT PRESERVE\n                        ENABLE\n                        COMMENT \'Saves total number of sessions then\n                                clears the table each day\'\n                        DO BEGIN\n                          INSERT INTO site_activity.totals (time, total)\n                            SELECT CURRENT_TIMESTAMP, COUNT(*)\n                              FROM site_activity.sessions;\n                          DELETE FROM site_activity.sessions;\n                        END\ncharacter_set_client: utf8mb4\ncollation_connection: utf8mb4_0900_ai_ci\n  Database Collation: utf8mb4_0900_ai_ci\n','https://dev.mysql.com/doc/refman/8.0/en/show-create-event.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (650,3,'SHOW CREATE FUNCTION','Syntax:\nSHOW CREATE FUNCTION func_name\n\nThis statement is similar to SHOW CREATE PROCEDURE but for stored\nfunctions. See [HELP SHOW CREATE PROCEDURE].\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-create-function.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-create-function.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (651,3,'SHOW CREATE PROCEDURE','Syntax:\nSHOW CREATE PROCEDURE proc_name\n\nThis statement is a MySQL extension. It returns the exact string that\ncan be used to re-create the named stored procedure. A similar\nstatement, SHOW CREATE FUNCTION, displays information about stored\nfunctions (see [HELP SHOW CREATE FUNCTION]).\n\nTo use either statement, you must be the user named as the routine\nDEFINER, have the SHOW_ROUTINE privilege, have the SELECT privilege at\nthe global level, or have the CREATE ROUTINE, ALTER ROUTINE, or EXECUTE\nprivilege granted at a scope that includes the routine. The value\ndisplayed for the Create Procedure or Create Function field is NULL if\nyou have only CREATE ROUTINE, ALTER ROUTINE, or EXECUTE.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-create-procedure.html\n\n','mysql> SHOW CREATE PROCEDURE test.citycount\\G\n*************************** 1. row ***************************\n           Procedure: citycount\n            sql_mode: ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,\n                      NO_ZERO_IN_DATE,NO_ZERO_DATE,\n                      ERROR_FOR_DIVISION_BY_ZERO,\n                      NO_ENGINE_SUBSTITUTION\n    Create Procedure: CREATE DEFINER=`me`@`localhost`\n                      PROCEDURE `citycount`(IN country CHAR(3), OUT cities INT)\n                      BEGIN\n                        SELECT COUNT(*) INTO cities FROM world.city\n                        WHERE CountryCode = country;\n                      END\ncharacter_set_client: utf8mb4\ncollation_connection: utf8mb4_0900_ai_ci\n  Database Collation: utf8mb4_0900_ai_ci\n\nmysql> SHOW CREATE FUNCTION test.hello\\G\n*************************** 1. row ***************************\n            Function: hello\n            sql_mode: ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,\n                      NO_ZERO_IN_DATE,NO_ZERO_DATE,\n                      ERROR_FOR_DIVISION_BY_ZERO,\n                      NO_ENGINE_SUBSTITUTION\n     Create Function: CREATE DEFINER=`me`@`localhost`\n                      FUNCTION `hello`(s CHAR(20))\n                      RETURNS char(50) CHARSET utf8mb4\n                      DETERMINISTIC\n                      RETURN CONCAT(\'Hello, \',s,\'!\')\ncharacter_set_client: utf8mb4\ncollation_connection: utf8mb4_0900_ai_ci\n  Database Collation: utf8mb4_0900_ai_ci\n','https://dev.mysql.com/doc/refman/8.0/en/show-create-procedure.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (652,3,'SHOW CREATE TABLE','Syntax:\nSHOW CREATE TABLE tbl_name\n\nShows the CREATE TABLE statement that creates the named table. To use\nthis statement, you must have some privilege for the table. This\nstatement also works with views.\n\nAs of MySQL 8.0.16, MySQL implements CHECK constraints and SHOW CREATE\nTABLE displays them. All CHECK constraints are displayed as table\nconstraints. That is, a CHECK constraint originally specified as part\nof a column definition displays as a separate clause not part of the\ncolumn definition. Example:\n\nmysql> CREATE TABLE t1 (\n         i1 INT CHECK (i1 <> 0),      -- column constraint\n         i2 INT,\n         CHECK (i2 > i1),             -- table constraint\n         CHECK (i2 <> 0) NOT ENFORCED -- table constraint, not enforced\n       );\n\nmysql> SHOW CREATE TABLE t1\\G\n*************************** 1. row ***************************\n       Table: t1\nCreate Table: CREATE TABLE `t1` (\n  `i1` int(11) DEFAULT NULL,\n  `i2` int(11) DEFAULT NULL,\n  CONSTRAINT `t1_chk_1` CHECK ((`i1` <> 0)),\n  CONSTRAINT `t1_chk_2` CHECK ((`i2` > `i1`)),\n  CONSTRAINT `t1_chk_3` CHECK ((`i2` <> 0)) /*!80016 NOT ENFORCED */\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci\n\nSHOW CREATE TABLE quotes table and column names according to the value\nof the sql_quote_show_create option. See\nhttps://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html.\n\nWhen altering the storage engine of a table, table options that are not\napplicable to the new storage engine are retained in the table\ndefinition to enable reverting the table with its previously defined\noptions to the original storage engine, if necessary. For example, when\nchanging the storage engine from InnoDB to MyISAM, InnoDB-specific\noptions such as ROW_FORMAT=COMPACT are retained.\n\nmysql> CREATE TABLE t1 (c1 INT PRIMARY KEY) ROW_FORMAT=COMPACT ENGINE=InnoDB;\nmysql> ALTER TABLE t1 ENGINE=MyISAM;\nmysql> SHOW CREATE TABLE t1\\G\n*************************** 1. row ***************************\n       Table: t1\nCreate Table: CREATE TABLE `t1` (\n  `c1` int NOT NULL,\n  PRIMARY KEY (`c1`)\n) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=COMPACT\n\nWhen creating a table with strict mode disabled, the storage engine\'s\ndefault row format is used if the specified row format is not\nsupported. The actual row format of the table is reported in the\nRow_format column in response to SHOW TABLE STATUS. SHOW CREATE TABLE\nshows the row format that was specified in the CREATE TABLE statement.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-create-table.html\n\n','mysql> SHOW CREATE TABLE t\\G\n*************************** 1. row ***************************\n       Table: t\nCreate Table: CREATE TABLE `t` (\n  `id` int(11) NOT NULL AUTO_INCREMENT,\n  `s` char(60) DEFAULT NULL,\n  PRIMARY KEY (`id`)\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4\n','https://dev.mysql.com/doc/refman/8.0/en/show-create-table.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (653,3,'SHOW CREATE TRIGGER','Syntax:\nSHOW CREATE TRIGGER trigger_name\n\nThis statement shows the CREATE TRIGGER statement that creates the\nnamed trigger. This statement requires the TRIGGER privilege for the\ntable associated with the trigger.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-create-trigger.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-create-trigger.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (654,3,'SHOW CREATE USER','Syntax:\nSHOW CREATE USER user\n\nThis statement shows the CREATE USER statement that creates the named\nuser. An error occurs if the user does not exist. The statement\nrequires the SELECT privilege for the mysql system schema, except to\nsee information for the current user. For the current user, the SELECT\nprivilege for the mysql.user system table is required for display of\nthe password hash in the IDENTIFIED AS clause; otherwise, the hash\ndisplays as <secret>.\n\nTo name the account, use the format described in\nhttps://dev.mysql.com/doc/refman/8.0/en/account-names.html. The host\nname part of the account name, if omitted, defaults to \'%\'. It is also\npossible to specify CURRENT_USER or CURRENT_USER() to refer to the\naccount associated with the current session.\n\nPassword hash values displayed in the IDENTIFIED WITH clause of output\nfrom SHOW CREATE USER may contain unprintable characters that have\nadverse effects on terminal displays and in other environments.\nEnabling the print_identified_with_as_hex system variable (available as\nof MySQL 8.0.17) causes SHOW CREATE USER to display such hash values as\nhexadecimal strings rather than as regular string literals. Hash values\nthat do not contain unprintable characters still display as regular\nstring literals, even with this variable enabled.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-create-user.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-create-user.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (655,3,'SHOW CREATE VIEW','Syntax:\nSHOW CREATE VIEW view_name\n\nThis statement shows the CREATE VIEW statement that creates the named\nview.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-create-view.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-create-view.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (656,3,'SHOW DATABASES','Syntax:\nSHOW {DATABASES | SCHEMAS}\n    [LIKE \'pattern\' | WHERE expr]\n\nSHOW DATABASES lists the databases on the MySQL server host. SHOW\nSCHEMAS is a synonym for SHOW DATABASES. The LIKE clause, if present,\nindicates which database names to match. The WHERE clause can be given\nto select rows using more general conditions, as discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/extended-show.html.\n\nYou see only those databases for which you have some kind of privilege,\nunless you have the global SHOW DATABASES privilege. You can also get\nthis list using the mysqlshow command.\n\nIf the server was started with the --skip-show-database option, you\ncannot use this statement at all unless you have the SHOW DATABASES\nprivilege.\n\nMySQL implements databases as directories in the data directory, so\nthis statement simply lists directories in that location. However, the\noutput may include names of directories that do not correspond to\nactual databases.\n\nDatabase information is also available from the INFORMATION_SCHEMA\nSCHEMATA table. See\nhttps://dev.mysql.com/doc/refman/8.0/en/information-schema-schemata-tab\nle.html.\n\n*Caution*:\n\nBecause any static global privilege is considered a privilege for all\ndatabases, any static global privilege enables a user to see all\ndatabase names with SHOW DATABASES or by examining the SCHEMATA table\nof INFORMATION_SCHEMA, except databases that have been restricted at\nthe database level by partial revokes.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-databases.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-databases.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (657,3,'SHOW SCHEMAS','Syntax:\nSHOW {DATABASES | SCHEMAS}\n    [LIKE \'pattern\' | WHERE expr]\n\nSHOW DATABASES lists the databases on the MySQL server host. SHOW\nSCHEMAS is a synonym for SHOW DATABASES. The LIKE clause, if present,\nindicates which database names to match. The WHERE clause can be given\nto select rows using more general conditions, as discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/extended-show.html.\n\nYou see only those databases for which you have some kind of privilege,\nunless you have the global SHOW DATABASES privilege. You can also get\nthis list using the mysqlshow command.\n\nIf the server was started with the --skip-show-database option, you\ncannot use this statement at all unless you have the SHOW DATABASES\nprivilege.\n\nMySQL implements databases as directories in the data directory, so\nthis statement simply lists directories in that location. However, the\noutput may include names of directories that do not correspond to\nactual databases.\n\nDatabase information is also available from the INFORMATION_SCHEMA\nSCHEMATA table. See\nhttps://dev.mysql.com/doc/refman/8.0/en/information-schema-schemata-tab\nle.html.\n\n*Caution*:\n\nBecause any static global privilege is considered a privilege for all\ndatabases, any static global privilege enables a user to see all\ndatabase names with SHOW DATABASES or by examining the SCHEMATA table\nof INFORMATION_SCHEMA, except databases that have been restricted at\nthe database level by partial revokes.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-databases.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-databases.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (658,3,'SHOW ENGINE','Syntax:\nSHOW ENGINE engine_name {STATUS | MUTEX}\n\nSHOW ENGINE displays operational information about a storage engine. It\nrequires the PROCESS privilege. The statement has these variants:\n\nSHOW ENGINE INNODB STATUS\nSHOW ENGINE INNODB MUTEX\nSHOW ENGINE PERFORMANCE_SCHEMA STATUS\n\nSHOW ENGINE INNODB STATUS displays extensive information from the\nstandard InnoDB Monitor about the state of the InnoDB storage engine.\nFor information about the standard monitor and other InnoDB Monitors\nthat provide information about InnoDB processing, see\nhttps://dev.mysql.com/doc/refman/8.0/en/innodb-monitors.html.\n\nSHOW ENGINE INNODB MUTEX displays InnoDB mutex and rw-lock statistics.\n\n*Note*:\n\nInnoDB mutexes and rwlocks can also be monitored using Performance\nSchema tables. See\nhttps://dev.mysql.com/doc/refman/8.0/en/monitor-innodb-mutex-waits-perf\normance-schema.html.\n\nMutex statistics collection is configured dynamically using the\nfollowing options:\n\no To enable the collection of mutex statistics, run:\n\nSET GLOBAL innodb_monitor_enable=\'latch\';\n\no To reset mutex statistics, run:\n\nSET GLOBAL innodb_monitor_reset=\'latch\';\n\no To disable the collection of mutex statistics, run:\n\nSET GLOBAL innodb_monitor_disable=\'latch\';\n\nCollection of mutex statistics for SHOW ENGINE INNODB MUTEX can also be\nenabled by setting innodb_monitor_enable=\'all\', or disabled by setting\ninnodb_monitor_disable=\'all\'.\n\nSHOW ENGINE INNODB MUTEX output has these columns:\n\no Type\n\n  Always InnoDB.\n\no Name\n\n  For mutexes, the Name field reports only the mutex name. For rwlocks,\n  the Name field reports the source file where the rwlock is\n  implemented, and the line number in the file where the rwlock is\n  created. The line number is specific to your version of MySQL.\n\no Status\n\n  The mutex status. This field reports the number of spins, waits, and\n  calls. Statistics for low-level operating system mutexes, which are\n  implemented outside of InnoDB, are not reported.\n\n  o spins indicates the number of spins.\n\n  o waits indicates the number of mutex waits.\n\n  o calls indicates how many times the mutex was requested.\n\nSHOW ENGINE INNODB MUTEX does not list mutexes and rw-locks for each\nbuffer pool block, as the amount of output would be overwhelming on\nsystems with a large buffer pool. SHOW ENGINE INNODB MUTEX does,\nhowever, print aggregate BUF_BLOCK_MUTEX spin, wait, and call values\nfor buffer pool block mutexes and rw-locks. SHOW ENGINE INNODB MUTEX\nalso does not list any mutexes or rw-locks that have never been waited\non (os_waits=0). Thus, SHOW ENGINE INNODB MUTEX only displays\ninformation about mutexes and rw-locks outside of the buffer pool that\nhave caused at least one OS-level wait.\n\nUse SHOW ENGINE PERFORMANCE_SCHEMA STATUS to inspect the internal\noperation of the Performance Schema code:\n\nmysql> SHOW ENGINE PERFORMANCE_SCHEMA STATUS\\G\n...\n*************************** 3. row ***************************\n  Type: performance_schema\n  Name: events_waits_history.size\nStatus: 76\n*************************** 4. row ***************************\n  Type: performance_schema\n  Name: events_waits_history.count\nStatus: 10000\n*************************** 5. row ***************************\n  Type: performance_schema\n  Name: events_waits_history.memory\nStatus: 760000\n...\n*************************** 57. row ***************************\n  Type: performance_schema\n  Name: performance_schema.memory\nStatus: 26459600\n...\n\nThis statement is intended to help the DBA understand the effects that\ndifferent Performance Schema options have on memory requirements.\n\nName values consist of two parts, which name an internal buffer and a\nbuffer attribute, respectively. Interpret buffer names as follows:\n\no An internal buffer that is not exposed as a table is named within\n  parentheses. Examples: (pfs_cond_class).size,\n  (pfs_mutex_class).memory.\n\no An internal buffer that is exposed as a table in the\n  performance_schema database is named after the table, without\n  parentheses. Examples: events_waits_history.size,\n  mutex_instances.count.\n\no A value that applies to the Performance Schema as a whole begins with\n  performance_schema. Example: performance_schema.memory.\n\nBuffer attributes have these meanings:\n\no size is the size of the internal record used by the implementation,\n  such as the size of a row in a table. size values cannot be changed.\n\no count is the number of internal records, such as the number of rows\n  in a table. count values can be changed using Performance Schema\n  configuration options.\n\no For a table, tbl_name.memory is the product of size and count. For\n  the Performance Schema as a whole, performance_schema.memory is the\n  sum of all the memory used (the sum of all other memory values).\n\nIn some cases, there is a direct relationship between a Performance\nSchema configuration parameter and a SHOW ENGINE value. For example,\nevents_waits_history_long.count corresponds to\nperformance_schema_events_waits_history_long_size. In other cases, the\nrelationship is more complex. For example, events_waits_history.count\ncorresponds to performance_schema_events_waits_history_size (the number\nof rows per thread) multiplied by\nperformance_schema_max_thread_instances ( the number of threads).\n\nSHOW ENGINE NDB STATUS If the server has the NDB storage engine\nenabled, SHOW ENGINE NDB STATUS displays cluster status information\nsuch as the number of connected data nodes, the cluster connectstring,\nand cluster binary log epochs, as well as counts of various Cluster API\nobjects created by the MySQL Server when connected to the cluster.\nSample output from this statement is shown here:\n\nmysql> SHOW ENGINE NDB STATUS;\n+------------+-----------------------+--------------------------------------------------+\n| Type       | Name                  | Status                                           |\n+------------+-----------------------+--------------------------------------------------+\n| ndbcluster | connection            | cluster_node_id=7,\n  connected_host=198.51.100.103, connected_port=1186, number_of_data_nodes=4,\n  number_of_ready_data_nodes=3, connect_count=0                                         |\n| ndbcluster | NdbTransaction        | created=6, free=0, sizeof=212                    |\n| ndbcluster | NdbOperation          | created=8, free=8, sizeof=660                    |\n| ndbcluster | NdbIndexScanOperation | created=1, free=1, sizeof=744                    |\n| ndbcluster | NdbIndexOperation     | created=0, free=0, sizeof=664                    |\n| ndbcluster | NdbRecAttr            | created=1285, free=1285, sizeof=60               |\n| ndbcluster | NdbApiSignal          | created=16, free=16, sizeof=136                  |\n| ndbcluster | NdbLabel              | created=0, free=0, sizeof=196                    |\n| ndbcluster | NdbBranch             | created=0, free=0, sizeof=24                     |\n| ndbcluster | NdbSubroutine         | created=0, free=0, sizeof=68                     |\n| ndbcluster | NdbCall               | created=0, free=0, sizeof=16                     |\n| ndbcluster | NdbBlob               | created=1, free=1, sizeof=264                    |\n| ndbcluster | NdbReceiver           | created=4, free=0, sizeof=68                     |\n| ndbcluster | binlog                | latest_epoch=155467, latest_trans_epoch=148126,\n  latest_received_binlog_epoch=0, latest_handled_binlog_epoch=0,\n  latest_applied_binlog_epoch=0                                                         |\n+------------+-----------------------+--------------------------------------------------+\n\nThe Status column in each of these rows provides information about the\nMySQL server\'s connection to the cluster and about the cluster binary\nlog\'s status, respectively. The Status information is in the form of\ncomma-delimited set of name/value pairs.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-engine.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-engine.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (659,3,'SHOW ENGINES','Syntax:\nSHOW [STORAGE] ENGINES\n\nSHOW ENGINES displays status information about the server\'s storage\nengines. This is particularly useful for checking whether a storage\nengine is supported, or to see what the default engine is.\n\nFor information about MySQL storage engines, see\nhttps://dev.mysql.com/doc/refman/8.0/en/innodb-storage-engine.html, and\nhttps://dev.mysql.com/doc/refman/8.0/en/storage-engines.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-engines.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-engines.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (660,3,'SHOW ERRORS','Syntax:\nSHOW ERRORS [LIMIT [offset,] row_count]\nSHOW COUNT(*) ERRORS\n\nSHOW ERRORS is a diagnostic statement that is similar to SHOW WARNINGS,\nexcept that it displays information only for errors, rather than for\nerrors, warnings, and notes.\n\nThe LIMIT clause has the same syntax as for the SELECT statement. See\nhttps://dev.mysql.com/doc/refman/8.0/en/select.html.\n\nThe SHOW COUNT(*) ERRORS statement displays the number of errors. You\ncan also retrieve this number from the error_count variable:\n\nSHOW COUNT(*) ERRORS;\nSELECT @@error_count;\n\nSHOW ERRORS and error_count apply only to errors, not warnings or\nnotes. In other respects, they are similar to SHOW WARNINGS and\nwarning_count. In particular, SHOW ERRORS cannot display information\nfor more than max_error_count messages, and error_count can exceed the\nvalue of max_error_count if the number of errors exceeds\nmax_error_count.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-errors.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-errors.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (661,3,'SHOW EVENTS','Syntax:\nSHOW EVENTS\n    [{FROM | IN} schema_name]\n    [LIKE \'pattern\' | WHERE expr]\n\nThis statement displays information about Event Manager events, which\nare discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/event-scheduler.html. It\nrequires the EVENT privilege for the database from which the events are\nto be shown.\n\nIn its simplest form, SHOW EVENTS lists all of the events in the\ncurrent schema:\n\nmysql> SELECT CURRENT_USER(), SCHEMA();\n+----------------+----------+\n| CURRENT_USER() | SCHEMA() |\n+----------------+----------+\n| jon@ghidora    | myschema |\n+----------------+----------+\n1 row in set (0.00 sec)\n\nmysql> SHOW EVENTS\\G\n*************************** 1. row ***************************\n                  Db: myschema\n                Name: e_daily\n             Definer: jon@ghidora\n           Time zone: SYSTEM\n                Type: RECURRING\n          Execute at: NULL\n      Interval value: 1\n      Interval field: DAY\n              Starts: 2018-08-08 11:06:34\n                Ends: NULL\n              Status: ENABLED\n          Originator: 1\ncharacter_set_client: utf8mb4\ncollation_connection: utf8mb4_0900_ai_ci\n  Database Collation: utf8mb4_0900_ai_ci\n\nTo see events for a specific schema, use the FROM clause. For example,\nto see events for the test schema, use the following statement:\n\nSHOW EVENTS FROM test;\n\nThe LIKE clause, if present, indicates which event names to match. The\nWHERE clause can be given to select rows using more general conditions,\nas discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/extended-show.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-events.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-events.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (662,3,'SHOW FUNCTION CODE','Syntax:\nSHOW FUNCTION CODE func_name\n\nThis statement is similar to SHOW PROCEDURE CODE but for stored\nfunctions. See [HELP SHOW PROCEDURE CODE].\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-function-code.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-function-code.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (663,3,'SHOW FUNCTION STATUS','Syntax:\nSHOW FUNCTION STATUS\n    [LIKE \'pattern\' | WHERE expr]\n\nThis statement is similar to SHOW PROCEDURE STATUS but for stored\nfunctions. See [HELP SHOW PROCEDURE STATUS].\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-function-status.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-function-status.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (664,3,'SHOW GRANTS','Syntax:\nSHOW GRANTS\n    [FOR user_or_role\n        [USING role [, role] ...]]\n\nuser_or_role: {\n    user (see )\n  | role (see .\n}\n\nThis statement displays the privileges and roles that are assigned to a\nMySQL user account or role, in the form of GRANT statements that must\nbe executed to duplicate the privilege and role assignments.\n\n*Note*:\n\nTo display nonprivilege information for MySQL accounts, use the SHOW\nCREATE USER statement. See [HELP SHOW CREATE USER].\n\nSHOW GRANTS requires the SELECT privilege for the mysql system schema,\nexcept to display privileges and roles for the current user.\n\nTo name the account or role for SHOW GRANTS, use the same format as for\nthe GRANT statement (for example, \'jeffrey\'@\'localhost\'):\n\nmysql> SHOW GRANTS FOR \'jeffrey\'@\'localhost\';\n+------------------------------------------------------------------+\n| Grants for jeffrey@localhost                                     |\n+------------------------------------------------------------------+\n| GRANT USAGE ON *.* TO `jeffrey`@`localhost`                      |\n| GRANT SELECT, INSERT, UPDATE ON `db1`.* TO `jeffrey`@`localhost` |\n+------------------------------------------------------------------+\n\nThe host part, if omitted, defaults to \'%\'. For additional information\nabout specifying account and role names, see\nhttps://dev.mysql.com/doc/refman/8.0/en/account-names.html, and\nhttps://dev.mysql.com/doc/refman/8.0/en/role-names.html.\n\nTo display the privileges granted to the current user (the account you\nare using to connect to the server), you can use any of the following\nstatements:\n\nSHOW GRANTS;\nSHOW GRANTS FOR CURRENT_USER;\nSHOW GRANTS FOR CURRENT_USER();\n\nIf SHOW GRANTS FOR CURRENT_USER (or any equivalent syntax) is used in\ndefiner context, such as within a stored procedure that executes with\ndefiner rather than invoker privileges, the grants displayed are those\nof the definer and not the invoker.\n\nIn MySQL 8.0 compared to previous series, SHOW GRANTS no longer\ndisplays ALL PRIVILEGES in its global-privileges output because the\nmeaning of ALL PRIVILEGES at the global level varies depending on which\ndynamic privileges are defined. Instead, SHOW GRANTS explictly lists\neach granted global privilege:\n\nmysql> SHOW GRANTS FOR \'root\'@\'localhost\';\n+---------------------------------------------------------------------+\n| Grants for root@localhost                                           |\n+---------------------------------------------------------------------+\n| GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD,         |\n| SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES,  |\n| SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION   |\n| SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE,  |\n| ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE,      |\n| CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT      |\n| OPTION                                                              |\n| GRANT PROXY ON \'\'@\'\' TO \'root\'@\'localhost\' WITH GRANT OPTION        |\n+---------------------------------------------------------------------+\n\nApplications that process SHOW GRANTS output should be adjusted\naccordingly.\n\nAt the global level, GRANT OPTION applies to all granted static global\nprivileges if granted for any of them, but applies individually to\ngranted dynamic privileges. SHOW GRANTS displays global privileges this\nway:\n\no One line listing all granted static privileges, if there are any,\n  including WITH GRANT OPTION if appropriate.\n\no One line listing all granted dynamic privileges for which GRANT\n  OPTION is granted, if there are any, including WITH GRANT OPTION.\n\no One line listing all granted dynamic privileges for which GRANT\n  OPTION is not granted, if there are any, without WITH GRANT OPTION.\n\nWith the optional USING clause, SHOW GRANTS enables you to examine the\nprivileges associated with roles for the user. Each role named in the\nUSING clause must be granted to the user.\n\nSuppose that user u1 is assigned roles r1 and r2, as follows:\n\nCREATE ROLE \'r1\', \'r2\';\nGRANT SELECT ON db1.* TO \'r1\';\nGRANT INSERT, UPDATE, DELETE ON db1.* TO \'r2\';\nCREATE USER \'u1\'@\'localhost\' IDENTIFIED BY \'u1pass\';\nGRANT \'r1\', \'r2\' TO \'u1\'@\'localhost\';\n\nSHOW GRANTS without USING shows the granted roles:\n\nmysql> SHOW GRANTS FOR \'u1\'@\'localhost\';\n+---------------------------------------------+\n| Grants for u1@localhost                     |\n+---------------------------------------------+\n| GRANT USAGE ON *.* TO `u1`@`localhost`      |\n| GRANT `r1`@`%`,`r2`@`%` TO `u1`@`localhost` |\n+---------------------------------------------+\n\nAdding a USING clause causes the statement to also display the\nprivileges associated with each role named in the clause:\n\nmysql> SHOW GRANTS FOR \'u1\'@\'localhost\' USING \'r1\';\n+---------------------------------------------+\n| Grants for u1@localhost                     |\n+---------------------------------------------+\n| GRANT USAGE ON *.* TO `u1`@`localhost`      |\n| GRANT SELECT ON `db1`.* TO `u1`@`localhost` |\n| GRANT `r1`@`%`,`r2`@`%` TO `u1`@`localhost` |\n+---------------------------------------------+\nmysql> SHOW GRANTS FOR \'u1\'@\'localhost\' USING \'r2\';\n+-------------------------------------------------------------+\n| Grants for u1@localhost                                     |\n+-------------------------------------------------------------+\n| GRANT USAGE ON *.* TO `u1`@`localhost`                      |\n| GRANT INSERT, UPDATE, DELETE ON `db1`.* TO `u1`@`localhost` |\n| GRANT `r1`@`%`,`r2`@`%` TO `u1`@`localhost`                 |\n+-------------------------------------------------------------+\nmysql> SHOW GRANTS FOR \'u1\'@\'localhost\' USING \'r1\', \'r2\';\n+---------------------------------------------------------------------+\n| Grants for u1@localhost                                             |\n+---------------------------------------------------------------------+\n| GRANT USAGE ON *.* TO `u1`@`localhost`                              |\n| GRANT SELECT, INSERT, UPDATE, DELETE ON `db1`.* TO `u1`@`localhost` |\n| GRANT `r1`@`%`,`r2`@`%` TO `u1`@`localhost`                         |\n+---------------------------------------------------------------------+\n\n*Note*:\n\nA privilege granted to an account is always in effect, but a role is\nnot. The active roles for an account can differ across and within\nsessions, depending on the value of the activate_all_roles_on_login\nsystem variable, the account default roles, and whether SET ROLE has\nbeen executed within a session.\n\nMySQL 8.0.16 and higher supports partial revokes of global privileges,\nsuch that a global privilege can be restricted from applying to\nparticular schemas (see\nhttps://dev.mysql.com/doc/refman/8.0/en/partial-revokes.html). To\nindicate which global schema privileges have been revoked for\nparticular schemas, SHOW GRANTS output includes REVOKE statements:\n\nmysql> SET PERSIST partial_revokes = ON;\nmysql> CREATE USER u1;\nmysql> GRANT SELECT, INSERT, DELETE ON *.* TO u1;\nmysql> REVOKE SELECT, INSERT ON mysql.* FROM u1;\nmysql> REVOKE DELETE ON world.* FROM u1;\nmysql> SHOW GRANTS FOR u1;\n+--------------------------------------------------+\n| Grants for u1@%                                  |\n+--------------------------------------------------+\n| GRANT SELECT, INSERT, DELETE ON *.* TO `u1`@`%`  |\n| REVOKE SELECT, INSERT ON `mysql`.* FROM `u1`@`%` |\n| REVOKE DELETE ON `world`.* FROM `u1`@`%`         |\n+--------------------------------------------------+\n\nSHOW GRANTS does not display privileges that are available to the named\naccount but are granted to a different account. For example, if an\nanonymous account exists, the named account might be able to use its\nprivileges, but SHOW GRANTS does not display them.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-grants.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-grants.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (665,3,'SHOW INDEX','Syntax:\nSHOW [EXTENDED] {INDEX | INDEXES | KEYS}\n    {FROM | IN} tbl_name\n    [{FROM | IN} db_name]\n    [WHERE expr]\n\nSHOW INDEX returns table index information. The format resembles that\nof the SQLStatistics call in ODBC. This statement requires some\nprivilege for any column in the table.\n\nmysql> SHOW INDEX FROM City\\G\n*************************** 1. row ***************************\n        Table: city\n   Non_unique: 0\n     Key_name: PRIMARY\n Seq_in_index: 1\n  Column_name: ID\n    Collation: A\n  Cardinality: 4188\n     Sub_part: NULL\n       Packed: NULL\n         Null:\n   Index_type: BTREE\n      Comment:\nIndex_comment:\n      Visible: YES\n   Expression: NULL\n*************************** 2. row ***************************\n        Table: city\n   Non_unique: 1\n     Key_name: CountryCode\n Seq_in_index: 1\n  Column_name: CountryCode\n    Collation: A\n  Cardinality: 232\n     Sub_part: NULL\n       Packed: NULL\n         Null:\n   Index_type: BTREE\n      Comment:\nIndex_comment:\n      Visible: YES\n   Expression: NULL\n\nAn alternative to tbl_name FROM db_name syntax is db_name.tbl_name.\nThese two statements are equivalent:\n\nSHOW INDEX FROM mytable FROM mydb;\nSHOW INDEX FROM mydb.mytable;\n\nThe optional EXTENDED keyword causes the output to include information\nabout hidden indexes that MySQL uses internally and are not accessible\nby users.\n\nThe WHERE clause can be given to select rows using more general\nconditions, as discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/extended-show.html.\n\nSHOW INDEX returns the following fields:\n\no Table\n\n  The name of the table.\n\no Non_unique\n\n  0 if the index cannot contain duplicates, 1 if it can.\n\no Key_name\n\n  The name of the index. If the index is the primary key, the name is\n  always PRIMARY.\n\no Seq_in_index\n\n  The column sequence number in the index, starting with 1.\n\no Column_name\n\n  The column name. See also the description for the Expression column.\n\no Collation\n\n  How the column is sorted in the index. This can have values A\n  (ascending), D (descending), or NULL (not sorted).\n\no Cardinality\n\n  An estimate of the number of unique values in the index. To update\n  this number, run ANALYZE TABLE or (for MyISAM tables) myisamchk -a.\n\n  Cardinality is counted based on statistics stored as integers, so the\n  value is not necessarily exact even for small tables. The higher the\n  cardinality, the greater the chance that MySQL uses the index when\n  doing joins.\n\no Sub_part\n\n  The index prefix. That is, the number of indexed characters if the\n  column is only partly indexed, NULL if the entire column is indexed.\n\n  *Note*:\n\n  Prefix limits are measured in bytes. However, prefix lengths for\n  index specifications in CREATE TABLE, ALTER TABLE, and CREATE INDEX\n  statements are interpreted as number of characters for nonbinary\n  string types (CHAR, VARCHAR, TEXT) and number of bytes for binary\n  string types (BINARY, VARBINARY, BLOB). Take this into account when\n  specifying a prefix length for a nonbinary string column that uses a\n  multibyte character set.\n\n  For additional information about index prefixes, see\n  https://dev.mysql.com/doc/refman/8.0/en/column-indexes.html, and\n  [HELP CREATE INDEX].\n\no Packed\n\n  Indicates how the key is packed. NULL if it is not.\n\no Null\n\n  Contains YES if the column may contain NULL values and \'\' if not.\n\no Index_type\n\n  The index method used (BTREE, FULLTEXT, HASH, RTREE).\n\no Comment\n\n  Information about the index not described in its own column, such as\n  disabled if the index is disabled.\n\no Index_comment\n\n  Any comment provided for the index with a COMMENT attribute when the\n  index was created.\n\no Visible\n\n  Whether the index is visible to the optimizer. See\n  https://dev.mysql.com/doc/refman/8.0/en/invisible-indexes.html.\n\no Expression\n\n  MySQL 8.0.13 and higher supports functional key parts (see\n  https://dev.mysql.com/doc/refman/8.0/en/create-index.html#create-inde\n  x-functional-key-parts), which affects both the Column_name and\n  Expression columns:\n\n  o For a nonfunctional key part, Column_name indicates the column\n    indexed by the key part and Expression is NULL.\n\n  o For a functional key part, Column_name column is NULL and\n    Expression indicates the expression for the key part.\n\nInformation about table indexes is also available from the\nINFORMATION_SCHEMA STATISTICS table. See\nhttps://dev.mysql.com/doc/refman/8.0/en/information-schema-statistics-t\nable.html. The extended information about hidden indexes is available\nonly using SHOW EXTENDED INDEX; it cannot be obtained from the\nSTATISTICS table.\n\nYou can list a table\'s indexes with the mysqlshow -k db_name tbl_name\ncommand.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-index.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-index.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (666,3,'SHOW MASTER STATUS','Syntax:\nSHOW MASTER STATUS\n\nThis statement provides status information about the binary log files\nof the source server. It requires the REPLICATION CLIENT privilege (or\nthe deprecated SUPER privilege).\n\nExample:\n\nmysql> SHOW MASTER STATUS\\G\n*************************** 1. row ***************************\n             File: source-bin.000002\n         Position: 1307\n     Binlog_Do_DB: test\n Binlog_Ignore_DB: manual, mysql\nExecuted_Gtid_Set: 3E11FA47-71CA-11E1-9E33-C80AA9429562:1-5\n1 row in set (0.00 sec)\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-master-status.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-master-status.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (667,3,'SHOW OPEN TABLES','Syntax:\nSHOW OPEN TABLES\n    [{FROM | IN} db_name]\n    [LIKE \'pattern\' | WHERE expr]\n\nSHOW OPEN TABLES lists the non-TEMPORARY tables that are currently open\nin the table cache. See\nhttps://dev.mysql.com/doc/refman/8.0/en/table-cache.html. The FROM\nclause, if present, restricts the tables shown to those present in the\ndb_name database. The LIKE clause, if present, indicates which table\nnames to match. The WHERE clause can be given to select rows using more\ngeneral conditions, as discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/extended-show.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-open-tables.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-open-tables.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (668,3,'SHOW PLUGINS','Syntax:\nSHOW PLUGINS\n\nSHOW PLUGINS displays information about server plugins.\n\nExample of SHOW PLUGINS output:\n\nmysql> SHOW PLUGINS\\G\n*************************** 1. row ***************************\n   Name: binlog\n Status: ACTIVE\n   Type: STORAGE ENGINE\nLibrary: NULL\nLicense: GPL\n*************************** 2. row ***************************\n   Name: CSV\n Status: ACTIVE\n   Type: STORAGE ENGINE\nLibrary: NULL\nLicense: GPL\n*************************** 3. row ***************************\n   Name: MEMORY\n Status: ACTIVE\n   Type: STORAGE ENGINE\nLibrary: NULL\nLicense: GPL\n*************************** 4. row ***************************\n   Name: MyISAM\n Status: ACTIVE\n   Type: STORAGE ENGINE\nLibrary: NULL\nLicense: GPL\n...\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-plugins.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-plugins.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (669,3,'SHOW PRIVILEGES','Syntax:\nSHOW PRIVILEGES\n\nSHOW PRIVILEGES shows the list of system privileges that the MySQL\nserver supports. The privileges displayed include all static\nprivileges, and all currently registered dynamic privileges.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-privileges.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-privileges.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (670,3,'SHOW PROCEDURE CODE','Syntax:\nSHOW PROCEDURE CODE proc_name\n\nThis statement is a MySQL extension that is available only for servers\nthat have been built with debugging support. It displays a\nrepresentation of the internal implementation of the named stored\nprocedure. A similar statement, SHOW FUNCTION CODE, displays\ninformation about stored functions (see [HELP SHOW FUNCTION CODE]).\n\nTo use either statement, you must be the user named as the routine\nDEFINER, have the SHOW_ROUTINE privilege, or have the SELECT privilege\nat the global level.\n\nIf the named routine is available, each statement produces a result\nset. Each row in the result set corresponds to one "instruction" in the\nroutine. The first column is Pos, which is an ordinal number beginning\nwith 0. The second column is Instruction, which contains an SQL\nstatement (usually changed from the original source), or a directive\nwhich has meaning only to the stored-routine handler.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-procedure-code.html\n\n','mysql> DELIMITER //\nmysql> CREATE PROCEDURE p1 ()\n       BEGIN\n         DECLARE fanta INT DEFAULT 55;\n         DROP TABLE t2;\n         LOOP\n           INSERT INTO t3 VALUES (fanta);\n           END LOOP;\n         END//\nQuery OK, 0 rows affected (0.01 sec)\n\nmysql> SHOW PROCEDURE CODE p1//\n+-----+----------------------------------------+\n| Pos | Instruction                            |\n+-----+----------------------------------------+\n|   0 | set fanta@0 55                         |\n|   1 | stmt 9 "DROP TABLE t2"                 |\n|   2 | stmt 5 "INSERT INTO t3 VALUES (fanta)" |\n|   3 | jump 2                                 |\n+-----+----------------------------------------+\n4 rows in set (0.00 sec)\n\nmysql> CREATE FUNCTION test.hello (s CHAR(20))\n       RETURNS CHAR(50) DETERMINISTIC\n       RETURN CONCAT(\'Hello, \',s,\'!\');\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> SHOW FUNCTION CODE test.hello;\n+-----+---------------------------------------+\n| Pos | Instruction                           |\n+-----+---------------------------------------+\n|   0 | freturn 254 concat(\'Hello, \',s@0,\'!\') |\n+-----+---------------------------------------+\n1 row in set (0.00 sec)\n','https://dev.mysql.com/doc/refman/8.0/en/show-procedure-code.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (671,3,'SHOW PROCEDURE STATUS','Syntax:\nSHOW PROCEDURE STATUS\n    [LIKE \'pattern\' | WHERE expr]\n\nThis statement is a MySQL extension. It returns characteristics of a\nstored procedure, such as the database, name, type, creator, creation\nand modification dates, and character set information. A similar\nstatement, SHOW FUNCTION STATUS, displays information about stored\nfunctions (see [HELP SHOW FUNCTION STATUS]).\n\nTo use either statement, you must be the user named as the routine\nDEFINER, have the SHOW_ROUTINE privilege, have the SELECT privilege at\nthe global level, or have the CREATE ROUTINE, ALTER ROUTINE, or EXECUTE\nprivilege granted at a scope that includes the routine.\n\nThe LIKE clause, if present, indicates which procedure or function\nnames to match. The WHERE clause can be given to select rows using more\ngeneral conditions, as discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/extended-show.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-procedure-status.html\n\n','mysql> SHOW PROCEDURE STATUS LIKE \'sp1\'\\G\n*************************** 1. row ***************************\n                  Db: test\n                Name: sp1\n                Type: PROCEDURE\n             Definer: testuser@localhost\n            Modified: 2018-08-08 13:54:11\n             Created: 2018-08-08 13:54:11\n       Security_type: DEFINER\n             Comment:\ncharacter_set_client: utf8mb4\ncollation_connection: utf8mb4_0900_ai_ci\n  Database Collation: utf8mb4_0900_ai_ci\n\nmysql> SHOW FUNCTION STATUS LIKE \'hello\'\\G\n*************************** 1. row ***************************\n                  Db: test\n                Name: hello\n                Type: FUNCTION\n             Definer: testuser@localhost\n            Modified: 2020-03-10 11:10:03\n             Created: 2020-03-10 11:10:03\n       Security_type: DEFINER\n             Comment:\ncharacter_set_client: utf8mb4\ncollation_connection: utf8mb4_0900_ai_ci\n  Database Collation: utf8mb4_0900_ai_ci\n','https://dev.mysql.com/doc/refman/8.0/en/show-procedure-status.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (672,3,'SHOW PROCESSLIST','Syntax:\nSHOW [FULL] PROCESSLIST\n\nThe MySQL process list indicates the operations currently being\nperformed by the set of threads executing within the server. The SHOW\nPROCESSLIST statement is one source of process information. For a\ncomparison of this statement with other sources, see\nhttps://dev.mysql.com/doc/refman/8.0/en/processlist-access.html#process\nlist-sources.\n\n*Note*:\n\nAs of MySQL 8.0.22, an alternative implementation for SHOW PROCESSLIST\nis available based on the Performance Schema processlist table, which,\nunlike the default SHOW PROCESSLIST implementation, does not require a\nmutex and has better performance characteristics. For details, see\nhttps://dev.mysql.com/doc/refman/8.0/en/performance-schema-processlist-\ntable.html.\n\nIf you have the PROCESS privilege, you can see all threads, even those\nbelonging to other users. Otherwise (without the PROCESS privilege),\nnonanonymous users have access to information about their own threads\nbut not threads for other users, and anonymous users have no access to\nthread information.\n\nWithout the FULL keyword, SHOW PROCESSLIST displays only the first 100\ncharacters of each statement in the Info field.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-processlist.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-processlist.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (673,3,'SHOW PROFILE','Syntax:\nSHOW PROFILE [type [, type] ... ]\n    [FOR QUERY n]\n    [LIMIT row_count [OFFSET offset]]\n\ntype: {\n    ALL\n  | BLOCK IO\n  | CONTEXT SWITCHES\n  | CPU\n  | IPC\n  | MEMORY\n  | PAGE FAULTS\n  | SOURCE\n  | SWAPS\n}\n\nThe SHOW PROFILE and SHOW PROFILES statements display profiling\ninformation that indicates resource usage for statements executed\nduring the course of the current session.\n\n*Note*:\n\nThe SHOW PROFILE and SHOW PROFILES statements are deprecated; expect\nthem to be removed in a future MySQL release. Use the Performance\nSchema instead; see\nhttps://dev.mysql.com/doc/refman/8.0/en/performance-schema-query-profil\ning.html.\n\nTo control profiling, use the profiling session variable, which has a\ndefault value of 0 (OFF). Enable profiling by setting profiling to 1 or\nON:\n\nmysql> SET profiling = 1;\n\nSHOW PROFILES displays a list of the most recent statements sent to the\nserver. The size of the list is controlled by the\nprofiling_history_size session variable, which has a default value of\n15. The maximum value is 100. Setting the value to 0 has the practical\neffect of disabling profiling.\n\nAll statements are profiled except SHOW PROFILE and SHOW PROFILES, so\nneither of those statements appears in the profile list. Malformed\nstatements are profiled. For example, SHOW PROFILING is an illegal\nstatement, and a syntax error occurs if you try to execute it, but it\nshows up in the profiling list.\n\nSHOW PROFILE displays detailed information about a single statement.\nWithout the FOR QUERY n clause, the output pertains to the most\nrecently executed statement. If FOR QUERY n is included, SHOW PROFILE\ndisplays information for statement n. The values of n correspond to the\nQuery_ID values displayed by SHOW PROFILES.\n\nThe LIMIT row_count clause may be given to limit the output to\nrow_count rows. If LIMIT is given, OFFSET offset may be added to begin\nthe output offset rows into the full set of rows.\n\nBy default, SHOW PROFILE displays Status and Duration columns. The\nStatus values are like the State values displayed by SHOW PROCESSLIST,\nalthough there might be some minor differences in interpretion for the\ntwo statements for some status values (see\nhttps://dev.mysql.com/doc/refman/8.0/en/thread-information.html).\n\nOptional type values may be specified to display specific additional\ntypes of information:\n\no ALL displays all information\n\no BLOCK IO displays counts for block input and output operations\n\no CONTEXT SWITCHES displays counts for voluntary and involuntary\n  context switches\n\no CPU displays user and system CPU usage times\n\no IPC displays counts for messages sent and received\n\no MEMORY is not currently implemented\n\no PAGE FAULTS displays counts for major and minor page faults\n\no SOURCE displays the names of functions from the source code, together\n  with the name and line number of the file in which the function\n  occurs\n\no SWAPS displays swap counts\n\nProfiling is enabled per session. When a session ends, its profiling\ninformation is lost.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-profile.html\n\n','mysql> SELECT @@profiling;\n+-------------+\n| @@profiling |\n+-------------+\n|           0 |\n+-------------+\n1 row in set (0.00 sec)\n\nmysql> SET profiling = 1;\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> DROP TABLE IF EXISTS t1;\nQuery OK, 0 rows affected, 1 warning (0.00 sec)\n\nmysql> CREATE TABLE T1 (id INT);\nQuery OK, 0 rows affected (0.01 sec)\n\nmysql> SHOW PROFILES;\n+----------+----------+--------------------------+\n| Query_ID | Duration | Query                    |\n+----------+----------+--------------------------+\n|        0 | 0.000088 | SET PROFILING = 1        |\n|        1 | 0.000136 | DROP TABLE IF EXISTS t1  |\n|        2 | 0.011947 | CREATE TABLE t1 (id INT) |\n+----------+----------+--------------------------+\n3 rows in set (0.00 sec)\n\nmysql> SHOW PROFILE;\n+----------------------+----------+\n| Status               | Duration |\n+----------------------+----------+\n| checking permissions | 0.000040 |\n| creating table       | 0.000056 |\n| After create         | 0.011363 |\n| query end            | 0.000375 |\n| freeing items        | 0.000089 |\n| logging slow query   | 0.000019 |\n| cleaning up          | 0.000005 |\n+----------------------+----------+\n7 rows in set (0.00 sec)\n\nmysql> SHOW PROFILE FOR QUERY 1;\n+--------------------+----------+\n| Status             | Duration |\n+--------------------+----------+\n| query end          | 0.000107 |\n| freeing items      | 0.000008 |\n| logging slow query | 0.000015 |\n| cleaning up        | 0.000006 |\n+--------------------+----------+\n4 rows in set (0.00 sec)\n\nmysql> SHOW PROFILE CPU FOR QUERY 2;\n+----------------------+----------+----------+------------+\n| Status               | Duration | CPU_user | CPU_system |\n+----------------------+----------+----------+------------+\n| checking permissions | 0.000040 | 0.000038 |   0.000002 |\n| creating table       | 0.000056 | 0.000028 |   0.000028 |\n| After create         | 0.011363 | 0.000217 |   0.001571 |\n| query end            | 0.000375 | 0.000013 |   0.000028 |\n| freeing items        | 0.000089 | 0.000010 |   0.000014 |\n| logging slow query   | 0.000019 | 0.000009 |   0.000010 |\n| cleaning up          | 0.000005 | 0.000003 |   0.000002 |\n+----------------------+----------+----------+------------+\n7 rows in set (0.00 sec)\n','https://dev.mysql.com/doc/refman/8.0/en/show-profile.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (674,3,'SHOW PROFILES','Syntax:\nSHOW PROFILES\n\nThe SHOW PROFILES statement, together with SHOW PROFILE, displays\nprofiling information that indicates resource usage for statements\nexecuted during the course of the current session. For more\ninformation, see [HELP SHOW PROFILE].\n\n*Note*:\n\nThe SHOW PROFILE and SHOW PROFILES statements are deprecated; expect it\nto be removed in a future MySQL release. Use the Performance Schema\ninstead; see\nhttps://dev.mysql.com/doc/refman/8.0/en/performance-schema-query-profil\ning.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-profiles.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-profiles.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (675,3,'SHOW RELAYLOG EVENTS','Syntax:\nSHOW RELAYLOG EVENTS\n    [IN \'log_name\']\n    [FROM pos]\n    [LIMIT [offset,] row_count]\n    [channel_option]\n\nchannel_option:\n    FOR CHANNEL channel\n\nShows the events in the relay log of a replica. If you do not specify\n\'log_name\', the first relay log is displayed. This statement has no\neffect on the source. SHOW RELAYLOG EVENTS requires the REPLICATION\nSLAVE privilege.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-relaylog-events.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-relaylog-events.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (676,3,'SHOW REPLICAS','Syntax:\n{SHOW REPLICAS}\n\nDisplays a list of replicas currently registered with the source. From\nMySQL 8.0.22, use SHOW REPLICAS in place of SHOW SLAVE HOSTS, which is\ndeprecated from that release. In releases before MySQL 8.0.22, use SHOW\nSLAVE HOSTS. SHOW REPLICAS requires the REPLICATION SLAVE privilege.\n\nSHOW REPLICAS should be executed on a server that acts as a replication\nsource. The statement displays information about servers that are or\nhave been connected as replicas, with each row of the result\ncorresponding to one replica server, as shown here:\n\nmysql> SHOW REPLICAS;\n+------------+-----------+------+-----------+--------------------------------------+\n| Server_id  | Host      | Port | Source_id | Replica_UUID                         |\n+------------+-----------+------+-----------+--------------------------------------+\n|         10 | iconnect2 | 3306 |         3 | 14cb6624-7f93-11e0-b2c0-c80aa9429562 |\n|         21 | athena    | 3306 |         3 | 07af4990-f41f-11df-a566-7ac56fdaf645 |\n+------------+-----------+------+-----------+--------------------------------------+\n\no Server_id: The unique server ID of the replica server, as configured\n  in the replica server\'s option file, or on the command line with\n  --server-id=value.\n\no Host: The host name of the replica server, as specified on the\n  replica with the --report-host option. This can differ from the\n  machine name as configured in the operating system.\n\no User: The replica server user name, as specified on the replica with\n  the --report-user option. Statement output includes this column only\n  if the source server is started with the --show-replica-auth-info or\n  --show-slave-auth-info option.\n\no Password: The replica server password, as specified on the replica\n  with the --report-password option. Statement output includes this\n  column only if the source server is started with the\n  --show-replica-auth-info or --show-slave-auth-info option.\n\no Port: The port on the source to which the replica server is\n  listening, as specified on the replica with the --report-port option.\n\n  A zero in this column means that the replica port (--report-port) was\n  not set.\n\no Source_id: The unique server ID of the source server that the replica\n  server is replicating from. This is the server ID of the server on\n  which SHOW REPLICAS is executed, so this same value is listed for\n  each row in the result.\n\no Replica_UUID: The globally unique ID of this replica, as generated on\n  the replica and found in the replica\'s auto.cnf file.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-replicas.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-replicas.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (677,3,'SHOW SLAVE HOSTS','Syntax:\n{SHOW SLAVE HOSTS | SHOW REPLICAS}\n\nDisplays a list of replicas currently registered with the source. From\nMySQL 8.0.22, SHOW SLAVE HOSTS is deprecated and the alias SHOW\nREPLICAS should be used instead. The statement works in the same way as\nbefore, only the terminology used for the statement and its output has\nchanged. Both versions of the statement update the same status\nvariables when used. Please see the documentation for SHOW REPLICAS for\na description of the statement.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-slave-hosts.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-slave-hosts.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (678,3,'SHOW REPLICA STATUS','Syntax:\nSHOW {REPLICA | SLAVE} STATUS [FOR CHANNEL channel]\n\nThis statement provides status information on essential parameters of\nthe replica threads. From MySQL 8.0.22, use SHOW REPLICA STATUS in\nplace of SHOW SLAVE STATUS, which is deprecated from that release. In\nreleases before MySQL 8.0.22, use SHOW SLAVE STATUS. The statement\nrequires the REPLICATION CLIENT privilege (or the deprecated SUPER\nprivilege).\n\nSHOW REPLICA STATUS is nonblocking. When run concurrently with STOP\nREPLICA, SHOW REPLICA STATUS returns without waiting for STOP REPLICA\nto finish shutting down the replication SQL (applier) thread or\nreplication I/O (receiver) thread (or both). This permits use in\nmonitoring and other applications where getting an immediate response\nfrom SHOW REPLICA STATUS is more important than ensuring that it\nreturned the latest data. The SLAVE keyword was replaced with REPLICA\nin MySQL 8.0.22.\n\nIf you issue this statement using the mysql client, you can use a \\G\nstatement terminator rather than a semicolon to obtain a more readable\nvertical layout:\n\nmysql> SHOW REPLICA STATUS\\G\n*************************** 1. row ***************************\n             Replica_IO_State: Waiting for source to send event\n                  Source_Host: localhost\n                  Source_User: repl\n                  Source_Port: 13000\n                Connect_Retry: 60\n              Source_Log_File: source-bin.000002\n          Read_Source_Log_Pos: 1307\n               Relay_Log_File: replica-relay-bin.000003\n                Relay_Log_Pos: 1508\n        Relay_Source_Log_File: source-bin.000002\n           Replica_IO_Running: Yes\n          Replica_SQL_Running: Yes\n              Replicate_Do_DB:\n          Replicate_Ignore_DB:\n           Replicate_Do_Table:\n       Replicate_Ignore_Table:\n      Replicate_Wild_Do_Table:\n  Replicate_Wild_Ignore_Table:\n                   Last_Errno: 0\n                   Last_Error:\n                 Skip_Counter: 0\n          Exec_Source_Log_Pos: 1307\n              Relay_Log_Space: 1858\n              Until_Condition: None\n               Until_Log_File:\n                Until_Log_Pos: 0\n           Source_SSL_Allowed: No\n           Source_SSL_CA_File:\n           Source_SSL_CA_Path:\n              Source_SSL_Cert:\n            Source_SSL_Cipher:\n               Source_SSL_Key:\n        Seconds_Behind_Source: 0\nSource_SSL_Verify_Server_Cert: No\n                Last_IO_Errno: 0\n                Last_IO_Error:\n               Last_SQL_Errno: 0\n               Last_SQL_Error:\n  Replicate_Ignore_Server_Ids:\n             Source_Server_Id: 1\n                  Source_UUID: 3e11fa47-71ca-11e1-9e33-c80aa9429562\n             Source_Info_File:\n                    SQL_Delay: 0\n          SQL_Remaining_Delay: NULL\n    Replica_SQL_Running_State: Reading event from the relay log\n           Source_Retry_Count: 10\n                  Source_Bind:\n      Last_IO_Error_Timestamp:\n     Last_SQL_Error_Timestamp:\n               Source_SSL_Crl:\n           Source_SSL_Crlpath:\n           Retrieved_Gtid_Set: 3e11fa47-71ca-11e1-9e33-c80aa9429562:1-5\n            Executed_Gtid_Set: 3e11fa47-71ca-11e1-9e33-c80aa9429562:1-5\n                Auto_Position: 1\n         Replicate_Rewrite_DB:\n                 Channel_name:\n           Source_TLS_Version: TLSv1.2\n       Source_public_key_path: public_key.pem\n        Get_source_public_key: 0\n            Network_Namespace:\n\nThe Performance Schema provides tables that expose replication\ninformation. This is similar to the information available from the SHOW\nREPLICA STATUS statement, but represented in table form. For details,\nsee\nhttps://dev.mysql.com/doc/refman/8.0/en/performance-schema-replication-\ntables.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-replica-status.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-replica-status.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (679,3,'SHOW SLAVE STATUS','Syntax:\nSHOW {SLAVE | REPLICA} STATUS [FOR CHANNEL channel]\n\nThis statement provides status information on essential parameters of\nthe replica threads. From MySQL 8.0.22, SHOW SLAVE STATUS is deprecated\nand the alias SHOW REPLICA STATUS should be used instead. The statement\nworks in the same way as before, only the terminology used for the\nstatement and its output has changed. Both versions of the statement\nupdate the same status variables when used. Please see the\ndocumentation for SHOW REPLICA STATUS for a description of the\nstatement.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-slave-status.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-slave-status.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (680,3,'SHOW STATUS','Syntax:\nSHOW [GLOBAL | SESSION] STATUS\n    [LIKE \'pattern\' | WHERE expr]\n\nSHOW STATUS provides server status information (see\nhttps://dev.mysql.com/doc/refman/8.0/en/server-status-variables.html).\nThis statement does not require any privilege. It requires only the\nability to connect to the server.\n\nStatus variable information is also available from these sources:\n\no Performance Schema tables. See\n  https://dev.mysql.com/doc/refman/8.0/en/performance-schema-status-var\n  iable-tables.html.\n\no The mysqladmin extended-status command. See\n  https://dev.mysql.com/doc/refman/8.0/en/mysqladmin.html.\n\nFor SHOW STATUS, a LIKE clause, if present, indicates which variable\nnames to match. A WHERE clause can be given to select rows using more\ngeneral conditions, as discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/extended-show.html.\n\nSHOW STATUS accepts an optional GLOBAL or SESSION variable scope\nmodifier:\n\no With a GLOBAL modifier, the statement displays the global status\n  values. A global status variable may represent status for some aspect\n  of the server itself (for example, Aborted_connects), or the\n  aggregated status over all connections to MySQL (for example,\n  Bytes_received and Bytes_sent). If a variable has no global value,\n  the session value is displayed.\n\no With a SESSION modifier, the statement displays the status variable\n  values for the current connection. If a variable has no session\n  value, the global value is displayed. LOCAL is a synonym for SESSION.\n\no If no modifier is present, the default is SESSION.\n\nThe scope for each status variable is listed at\nhttps://dev.mysql.com/doc/refman/8.0/en/server-status-variables.html.\n\nEach invocation of the SHOW STATUS statement uses an internal temporary\ntable and increments the global Created_tmp_tables value.\n\nWith a LIKE clause, the statement displays only rows for those\nvariables with names that match the pattern:\n\nmysql> SHOW STATUS LIKE \'Key%\';\n+--------------------+----------+\n| Variable_name      | Value    |\n+--------------------+----------+\n| Key_blocks_used    | 14955    |\n| Key_read_requests  | 96854827 |\n| Key_reads          | 162040   |\n| Key_write_requests | 7589728  |\n| Key_writes         | 3813196  |\n+--------------------+----------+\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-status.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-status.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (681,3,'SHOW TABLE STATUS','Syntax:\nSHOW TABLE STATUS\n    [{FROM | IN} db_name]\n    [LIKE \'pattern\' | WHERE expr]\n\nSHOW TABLE STATUS works likes SHOW TABLES, but provides a lot of\ninformation about each non-TEMPORARY table. You can also get this list\nusing the mysqlshow --status db_name command. The LIKE clause, if\npresent, indicates which table names to match. The WHERE clause can be\ngiven to select rows using more general conditions, as discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/extended-show.html.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-table-status.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-table-status.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (682,3,'SHOW TABLES','Syntax:\nSHOW [EXTENDED] [FULL] TABLES\n    [{FROM | IN} db_name]\n    [LIKE \'pattern\' | WHERE expr]\n\nSHOW TABLES lists the non-TEMPORARY tables in a given database. You can\nalso get this list using the mysqlshow db_name command. The LIKE\nclause, if present, indicates which table names to match. The WHERE\nclause can be given to select rows using more general conditions, as\ndiscussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/extended-show.html.\n\nMatching performed by the LIKE clause is dependent on the setting of\nthe lower_case_table_names system variable.\n\nThe optional EXTENDED modifier causes SHOW TABLES to list hidden tables\ncreated by failed ALTER TABLE statements. These temporary tables have\nnames beginning with #sql and can be dropped using DROP TABLE.\n\nThis statement also lists any views in the database. The optional FULL\nmodifier causes SHOW TABLES to display a second output column with\nvalues of BASE TABLE for a table, VIEW for a view, or SYSTEM VIEW for\nan INFORMATION_SCHEMA table.\n\nIf you have no privileges for a base table or view, it does not show up\nin the output from SHOW TABLES or mysqlshow db_name.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-tables.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-tables.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (683,3,'SHOW TRIGGERS','Syntax:\nSHOW TRIGGERS\n    [{FROM | IN} db_name]\n    [LIKE \'pattern\' | WHERE expr]\n\nSHOW TRIGGERS lists the triggers currently defined for tables in a\ndatabase (the default database unless a FROM clause is given). This\nstatement returns results only for databases and tables for which you\nhave the TRIGGER privilege. The LIKE clause, if present, indicates\nwhich table names (not trigger names) to match and causes the statement\nto display triggers for those tables. The WHERE clause can be given to\nselect rows using more general conditions, as discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/extended-show.html.\n\nFor the ins_sum trigger defined in\nhttps://dev.mysql.com/doc/refman/8.0/en/triggers.html, the output of\nSHOW TRIGGERS is as shown here:\n\nmysql> SHOW TRIGGERS LIKE \'acc%\'\\G\n*************************** 1. row ***************************\n             Trigger: ins_sum\n               Event: INSERT\n               Table: account\n           Statement: SET @sum = @sum + NEW.amount\n              Timing: BEFORE\n             Created: 2018-08-08 10:10:12.61\n            sql_mode: ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,\n                      NO_ZERO_IN_DATE,NO_ZERO_DATE,\n                      ERROR_FOR_DIVISION_BY_ZERO,\n                      NO_ENGINE_SUBSTITUTION\n             Definer: me@localhost\ncharacter_set_client: utf8mb4\ncollation_connection: utf8mb4_0900_ai_ci\n  Database Collation: utf8mb4_0900_ai_ci\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-triggers.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-triggers.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (684,3,'SHOW VARIABLES','Syntax:\nSHOW [GLOBAL | SESSION] VARIABLES\n    [LIKE \'pattern\' | WHERE expr]\n\nSHOW VARIABLES shows the values of MySQL system variables (see\nhttps://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html).\nThis statement does not require any privilege. It requires only the\nability to connect to the server.\n\nSystem variable information is also available from these sources:\n\no Performance Schema tables. See\n  https://dev.mysql.com/doc/refman/8.0/en/performance-schema-system-var\n  iable-tables.html.\n\no The mysqladmin variables command. See\n  https://dev.mysql.com/doc/refman/8.0/en/mysqladmin.html.\n\nFor SHOW VARIABLES, a LIKE clause, if present, indicates which variable\nnames to match. A WHERE clause can be given to select rows using more\ngeneral conditions, as discussed in\nhttps://dev.mysql.com/doc/refman/8.0/en/extended-show.html.\n\nSHOW VARIABLES accepts an optional GLOBAL or SESSION variable scope\nmodifier:\n\no With a GLOBAL modifier, the statement displays global system variable\n  values. These are the values used to initialize the corresponding\n  session variables for new connections to MySQL. If a variable has no\n  global value, no value is displayed.\n\no With a SESSION modifier, the statement displays the system variable\n  values that are in effect for the current connection. If a variable\n  has no session value, the global value is displayed. LOCAL is a\n  synonym for SESSION.\n\no If no modifier is present, the default is SESSION.\n\nThe scope for each system variable is listed at\nhttps://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html.\n\nSHOW VARIABLES is subject to a version-dependent display-width limit.\nFor variables with very long values that are not completely displayed,\nuse SELECT as a workaround. For example:\n\nSELECT @@GLOBAL.innodb_data_file_path;\n\nMost system variables can be set at server startup (read-only variables\nsuch as version_comment are exceptions). Many can be changed at runtime\nwith the SET statement. See\nhttps://dev.mysql.com/doc/refman/8.0/en/using-system-variables.html,\nand [HELP SET].\n\nWith a LIKE clause, the statement displays only rows for those\nvariables with names that match the pattern. To obtain the row for a\nspecific variable, use a LIKE clause as shown:\n\nSHOW VARIABLES LIKE \'max_join_size\';\nSHOW SESSION VARIABLES LIKE \'max_join_size\';\n\nTo get a list of variables whose name match a pattern, use the %\nwildcard character in a LIKE clause:\n\nSHOW VARIABLES LIKE \'%size%\';\nSHOW GLOBAL VARIABLES LIKE \'%size%\';\n\nWildcard characters can be used in any position within the pattern to\nbe matched. Strictly speaking, because _ is a wildcard that matches any\nsingle character, you should escape it as \\_ to match it literally. In\npractice, this is rarely necessary.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-variables.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-variables.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (685,3,'SHOW WARNINGS','Syntax:\nSHOW WARNINGS [LIMIT [offset,] row_count]\nSHOW COUNT(*) WARNINGS\n\nSHOW WARNINGS is a diagnostic statement that displays information about\nthe conditions (errors, warnings, and notes) resulting from executing a\nstatement in the current session. Warnings are generated for DML\nstatements such as INSERT, UPDATE, and LOAD DATA as well as DDL\nstatements such as CREATE TABLE and ALTER TABLE.\n\nThe LIMIT clause has the same syntax as for the SELECT statement. See\nhttps://dev.mysql.com/doc/refman/8.0/en/select.html.\n\nSHOW WARNINGS is also used following EXPLAIN, to display the extended\ninformation generated by EXPLAIN. See\nhttps://dev.mysql.com/doc/refman/8.0/en/explain-extended.html.\n\nSHOW WARNINGS displays information about the conditions resulting from\nexecution of the most recent nondiagnostic statement in the current\nsession. If the most recent statement resulted in an error during\nparsing, SHOW WARNINGS shows the resulting conditions, regardless of\nstatement type (diagnostic or nondiagnostic).\n\nThe SHOW COUNT(*) WARNINGS diagnostic statement displays the total\nnumber of errors, warnings, and notes. You can also retrieve this\nnumber from the warning_count system variable:\n\nSHOW COUNT(*) WARNINGS;\nSELECT @@warning_count;\n\nA difference in these statements is that the first is a diagnostic\nstatement that does not clear the message list. The second, because it\nis a SELECT statement is considered nondiagnostic and does clear the\nmessage list.\n\nA related diagnostic statement, SHOW ERRORS, shows only error\nconditions (it excludes warnings and notes), and SHOW COUNT(*) ERRORS\nstatement displays the total number of errors. See [HELP SHOW ERRORS].\nGET DIAGNOSTICS can be used to examine information for individual\nconditions. See [HELP GET DIAGNOSTICS].\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/show-warnings.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/show-warnings.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (686,3,'BINLOG','Syntax:\nBINLOG \'str\'\n\nBINLOG is an internal-use statement. It is generated by the mysqlbinlog\nprogram as the printable representation of certain events in binary log\nfiles. (See https://dev.mysql.com/doc/refman/8.0/en/mysqlbinlog.html.)\nThe \'str\' value is a base 64-encoded string the that server decodes to\ndetermine the data change indicated by the corresponding event.\n\nTo execute BINLOG statements when applying mysqlbinlog output, a user\naccount requires the BINLOG_ADMIN privilege (or the deprecated SUPER\nprivilege), or the REPLICATION_APPLIER privilege plus the appropriate\nprivileges to execute each log event.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/binlog.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/binlog.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (687,3,'CACHE INDEX','Syntax:\nCACHE INDEX {\n      tbl_index_list [, tbl_index_list] ...\n    | tbl_name PARTITION (partition_list)\n  }\n  IN key_cache_name\n\ntbl_index_list:\n  tbl_name [{INDEX|KEY} (index_name[, index_name] ...)]\n\npartition_list: {\n    partition_name[, partition_name] ...\n  | ALL\n}\n\nThe CACHE INDEX statement assigns table indexes to a specific key\ncache. It applies only to MyISAM tables, including partitioned MyISAM\ntables. After the indexes have been assigned, they can be preloaded\ninto the cache if desired with LOAD INDEX INTO CACHE.\n\nThe following statement assigns indexes from the tables t1, t2, and t3\nto the key cache named hot_cache:\n\nmysql> CACHE INDEX t1, t2, t3 IN hot_cache;\n+---------+--------------------+----------+----------+\n| Table   | Op                 | Msg_type | Msg_text |\n+---------+--------------------+----------+----------+\n| test.t1 | assign_to_keycache | status   | OK       |\n| test.t2 | assign_to_keycache | status   | OK       |\n| test.t3 | assign_to_keycache | status   | OK       |\n+---------+--------------------+----------+----------+\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/cache-index.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/cache-index.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (688,3,'FLUSH','Syntax:\nFLUSH [NO_WRITE_TO_BINLOG | LOCAL] {\n    flush_option [, flush_option] ...\n  | tables_option\n}\n\nflush_option: {\n    BINARY LOGS\n  | ENGINE LOGS\n  | ERROR LOGS\n  | GENERAL LOGS\n  | HOSTS\n  | LOGS\n  | PRIVILEGES\n  | OPTIMIZER_COSTS\n  | RELAY LOGS [FOR CHANNEL channel]\n  | SLOW LOGS\n  | STATUS\n  | USER_RESOURCES\n}\n\ntables_option: {\n    TABLES\n  | TABLES tbl_name [, tbl_name] ...\n  | TABLES WITH READ LOCK\n  | TABLES tbl_name [, tbl_name] ... WITH READ LOCK\n  | TABLES tbl_name [, tbl_name] ... FOR EXPORT\n}\n\nThe FLUSH statement has several variant forms that clear or reload\nvarious internal caches, flush tables, or acquire locks. Each FLUSH\noperation requires the privileges indicated in its description.\n\n*Note*:\n\nIt is not possible to issue FLUSH statements within stored functions or\ntriggers. However, you may use FLUSH in stored procedures, so long as\nthese are not called from stored functions or triggers. See\nhttps://dev.mysql.com/doc/refman/8.0/en/stored-program-restrictions.htm\nl.\n\nBy default, the server writes FLUSH statements to the binary log so\nthat they replicate to replicas. To suppress logging, specify the\noptional NO_WRITE_TO_BINLOG keyword or its alias LOCAL.\n\n*Note*:\n\nFLUSH LOGS, FLUSH BINARY LOGS, FLUSH TABLES WITH READ LOCK (with or\nwithout a table list), and FLUSH TABLES tbl_name ... FOR EXPORT are not\nwritten to the binary log in any case because they would cause problems\nif replicated to a replica.\n\nThe FLUSH statement causes an implicit commit. See\nhttps://dev.mysql.com/doc/refman/8.0/en/implicit-commit.html.\n\nThe mysqladmin utility provides a command-line interface to some flush\noperations, using commands such as flush-hosts, flush-logs,\nflush-privileges, flush-status, and flush-tables. See\nhttps://dev.mysql.com/doc/refman/8.0/en/mysqladmin.html.\n\nSending a SIGHUP or SIGUSR1 signal to the server causes several flush\noperations to occur that are similar to various forms of the FLUSH\nstatement. Signals can be sent by the root system account or the system\naccount that owns the server process. This enables the flush operations\nto be performed without having to connect to the server, which requires\na MySQL account that has privileges sufficient for those operations.\nSee https://dev.mysql.com/doc/refman/8.0/en/unix-signal-response.html.\n\nThe RESET statement is similar to FLUSH. See [HELP RESET], for\ninformation about using RESET with replication.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/flush.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/flush.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (689,3,'KILL','Syntax:\nKILL [CONNECTION | QUERY] processlist_id\n\nEach connection to mysqld runs in a separate thread. You can kill a\nthread with the KILL processlist_id statement.\n\nThread processlist identifiers can be determined from the ID column of\nthe INFORMATION_SCHEMA PROCESSLIST table, the Id column of SHOW\nPROCESSLIST output, and the PROCESSLIST_ID column of the Performance\nSchema threads table. The value for the current thread is returned by\nthe CONNECTION_ID() function.\n\nKILL permits an optional CONNECTION or QUERY modifier:\n\no KILL CONNECTION is the same as KILL with no modifier: It terminates\n  the connection associated with the given processlist_id, after\n  terminating any statement the connection is executing.\n\no KILL QUERY terminates the statement the connection is currently\n  executing, but leaves the connection itself intact.\n\nThe ability to see which threads are available to be killed depends on\nthe PROCESS privilege:\n\no Without PROCESS, you can see only your own threads.\n\no With PROCESS, you can see all threads.\n\nThe ability to kill threads and statements depends on the\nCONNECTION_ADMIN privilege and the deprecated SUPER privilege:\n\no Without CONNECTION_ADMIN or SUPER, you can kill only your own threads\n  and statements.\n\no With CONNECTION_ADMIN or SUPER, you can kill all threads and\n  statements, except that to affect a thread or statement that is\n  executing with the SYSTEM_USER privilege, your own session must\n  additionally have the SYSTEM_USER privilege.\n\nYou can also use the mysqladmin processlist and mysqladmin kill\ncommands to examine and kill threads.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/kill.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/kill.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (690,3,'LOAD INDEX','Syntax:\nLOAD INDEX INTO CACHE\n  tbl_index_list [, tbl_index_list] ...\n\ntbl_index_list:\n  tbl_name\n    [PARTITION (partition_list)]\n    [{INDEX|KEY} (index_name[, index_name] ...)]\n    [IGNORE LEAVES]\n\npartition_list: {\n    partition_name[, partition_name] ...\n  | ALL\n}\n\nThe LOAD INDEX INTO CACHE statement preloads a table index into the key\ncache to which it has been assigned by an explicit CACHE INDEX\nstatement, or into the default key cache otherwise.\n\nLOAD INDEX INTO CACHE applies only to MyISAM tables, including\npartitioned MyISAM tables. In addition, indexes on partitioned tables\ncan be preloaded for one, several, or all partitions.\n\nThe IGNORE LEAVES modifier causes only blocks for the nonleaf nodes of\nthe index to be preloaded.\n\nIGNORE LEAVES is also supported for partitioned MyISAM tables.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/load-index.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/load-index.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (691,3,'RESET','Syntax:\nRESET reset_option [, reset_option] ...\n\nreset_option: {\n    MASTER\n  | REPLICA\n  | SLAVE\n}\n\nThe RESET statement is used to clear the state of various server\noperations. You must have the RELOAD privilege to execute RESET.\n\nFor information about the RESET PERSIST statement that removes\npersisted global system variables, see [HELP RESET PERSIST].\n\nRESET acts as a stronger version of the FLUSH statement. See [HELP\nFLUSH].\n\nThe RESET statement causes an implicit commit. See\nhttps://dev.mysql.com/doc/refman/8.0/en/implicit-commit.html.\n\nThe following list describes the permitted RESET statement reset_option\nvalues:\n\no RESET MASTER\n\n  Deletes all binary logs listed in the index file, resets the binary\n  log index file to be empty, and creates a new binary log file.\n\no RESET REPLICA\n\n  Makes the replica forget its replication position in the source\n  binary logs. Also resets the relay log by deleting any existing relay\n  log files and beginning a new one. Use RESET REPLICA in place of\n  RESET SLAVE from MySQL 8.0.22.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/reset.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/reset.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (692,3,'RESET PERSIST','Syntax:\nRESET PERSIST [[IF EXISTS] system_var_name]\n\nRESET PERSIST removes persisted global system variable settings from\nthe mysqld-auto.cnf option file in the data directory. Removing a\npersisted system variable causes the variable no longer to be\ninitialized from mysqld-auto.cnf at server startup. For more\ninformation about persisting system variables and the mysqld-auto.cnf\nfile, see\nhttps://dev.mysql.com/doc/refman/8.0/en/persisted-system-variables.html\n.\n\nThe privileges required for RESET PERSIST depend on the type of system\nvariable to be removed:\n\no For dynamic system variables, this statement requires the\n  SYSTEM_VARIABLES_ADMIN privilege (or the deprecated SUPER privilege).\n\no For read-only system variables, this statement requires the\n  SYSTEM_VARIABLES_ADMIN and PERSIST_RO_VARIABLES_ADMIN privileges.\n\nSee\nhttps://dev.mysql.com/doc/refman/8.0/en/system-variable-privileges.html\n.\n\nDepending on whether the variable name and IF EXISTS clauses are\npresent, the RESET PERSIST statement has these forms:\n\no To remove all persisted variables from mysqld-auto.cnf, use RESET\n  PERSIST without naming any system variable:\n\nRESET PERSIST;\n\n  You must have privileges for removing both dynamic and read-only\n  system variables if mysqld-auto.cnf contains both kinds of variables.\n\no To remove a specific persisted variable from mysqld-auto.cnf, name it\n  in the statement:\n\nRESET PERSIST system_var_name;\n\n  This includes plugin system variables, even if the plugin is not\n  currently installed. If the variable is not present in the file, an\n  error occurs.\n\no To remove a specific persisted variable from mysqld-auto.cnf, but\n  produce a warning rather than an error if the variable is not present\n  in the file, add an IF EXISTS clause to the previous syntax:\n\nRESET PERSIST IF EXISTS system_var_name;\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/reset-persist.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/reset-persist.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (693,3,'RESTART','Syntax:\nRESTART\n\nThis statement stops and restarts the MySQL server. It requires the\nSHUTDOWN privilege.\n\nOne use for RESTART is when it is not possible or convenient to gain\ncommand-line access to the MySQL server on the server host to restart\nit. For example, SET PERSIST_ONLY can be used at runtime to make\nconfiguration changes to system variables that can be set only at\nserver startup, but the server must still be restarted for those\nchanges to take effect. The RESTART statement provides a way to do so\nfrom within client sessions, without requiring command-line access on\nthe server host.\n\n*Note*:\n\nAfter executing a RESTART statement, the client can expect the current\nconnection to be lost. If auto-reconnect is enabled, the connection is\nreestablished after the server restarts. Otherwise, the connection must\nbe reestablished manually.\n\nA successful RESTART operation requires mysqld to be running in an\nenvironment that has a monitoring process available to detect a server\nshutdown performed for restart purposes:\n\no In the presence of a monitoring process, RESTART causes mysqld to\n  terminate such that the monitoring process can determine that it\n  should start a new mysqld instance.\n\no If no monitoring process is present, RESTART fails with an error.\n\nThese platforms provide the necessary monitoring support for the\nRESTART statement:\n\no Windows, when mysqld is started as a Windows service or standalone.\n  (mysqld forks, and one process acts as a monitor to the other, which\n  acts as the server.)\n\no Unix and Unix-like systems that use systemd or mysqld_safe to manage\n  mysqld.\n\nTo configure a monitoring environment such that mysqld enables the\nRESTART statement:\n\n1. Set the MYSQLD_PARENT_PID environment variable to the value of the\n   process ID of the process that starts mysqld, before starting\n   mysqld.\n\n2. When mysqld performs a shutdown due to use of the RESTART statement,\n   it returns exit code 16.\n\n3. When the monitoring process detects an exit code of 16, it starts\n   mysqld again. Otherwise, it exits.\n\nHere is a minimal example as implemented in the bash shell:\n\n#!/bin/bash\n\nexport MYSQLD_PARENT_PID=$$\n\nexport MYSQLD_RESTART_EXIT=16\n\nwhile true ; do\n  bin/mysqld mysqld options here\n  if [ $? -ne $MYSQLD_RESTART_EXIT ]; then\n    break\n  fi\ndone\n\nOn Windows, the forking used to implement RESTART makes determining the\nserver process to attach to for debugging more difficult. To alleviate\nthis, starting the server with --gdb suppresses forking, in addition to\nits other actions done to set up a debugging environment. In non-debug\nsettings, --no-monitor may be used for the sole purpose of suppressing\nforking the monitor process. For a server started with either --gdb or\n--no-monitor, executing RESTART causes the server to simply exit\nwithout restarting.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/restart.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/restart.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (694,3,'SHUTDOWN','Syntax:\nSHUTDOWN\n\nThis statement stops the MySQL server. It requires the SHUTDOWN\nprivilege.\n\nSHUTDOWN provides an SQL-level interface to the same functionality\navailable using the mysqladmin shutdown command or the mysql_shutdown()\n(https://dev.mysql.com/doc/c-api/8.0/en/mysql-shutdown.html) C API\nfunction. A successful SHUTDOWN sequence consists of checking the\nprivileges, validating the arguments, and sending an OK packet to the\nclient. Then the server is shut down.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/shutdown.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/shutdown.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (695,51,'EXPLAIN','Syntax:\n{EXPLAIN | DESCRIBE | DESC}\n    tbl_name [col_name | wild]\n\n{EXPLAIN | DESCRIBE | DESC}\n    [explain_type]\n    {explainable_stmt | FOR CONNECTION connection_id}\n\n{EXPLAIN | DESCRIBE | DESC} ANALYZE [FORMAT = TREE] select_statement\n\nexplain_type: {\n    FORMAT = format_name\n}\n\nformat_name: {\n    TRADITIONAL\n  | JSON\n  | TREE\n}\n\nexplainable_stmt: {\n    SELECT statement\n  | TABLE statement\n  | DELETE statement\n  | INSERT statement\n  | REPLACE statement\n  | UPDATE statement\n}\n\nThe DESCRIBE and EXPLAIN statements are synonyms. In practice, the\nDESCRIBE keyword is more often used to obtain information about table\nstructure, whereas EXPLAIN is used to obtain a query execution plan\n(that is, an explanation of how MySQL would execute a query).\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/explain.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/explain.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (696,51,'DESCRIBE','Syntax:\n{EXPLAIN | DESCRIBE | DESC}\n    tbl_name [col_name | wild]\n\n{EXPLAIN | DESCRIBE | DESC}\n    [explain_type]\n    {explainable_stmt | FOR CONNECTION connection_id}\n\n{EXPLAIN | DESCRIBE | DESC} ANALYZE [FORMAT = TREE] select_statement\n\nexplain_type: {\n    FORMAT = format_name\n}\n\nformat_name: {\n    TRADITIONAL\n  | JSON\n  | TREE\n}\n\nexplainable_stmt: {\n    SELECT statement\n  | TABLE statement\n  | DELETE statement\n  | INSERT statement\n  | REPLACE statement\n  | UPDATE statement\n}\n\nThe DESCRIBE and EXPLAIN statements are synonyms. In practice, the\nDESCRIBE keyword is more often used to obtain information about table\nstructure, whereas EXPLAIN is used to obtain a query execution plan\n(that is, an explanation of how MySQL would execute a query).\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/explain.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/explain.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (697,51,'DESC','Syntax:\n{EXPLAIN | DESCRIBE | DESC}\n    tbl_name [col_name | wild]\n\n{EXPLAIN | DESCRIBE | DESC}\n    [explain_type]\n    {explainable_stmt | FOR CONNECTION connection_id}\n\n{EXPLAIN | DESCRIBE | DESC} ANALYZE [FORMAT = TREE] select_statement\n\nexplain_type: {\n    FORMAT = format_name\n}\n\nformat_name: {\n    TRADITIONAL\n  | JSON\n  | TREE\n}\n\nexplainable_stmt: {\n    SELECT statement\n  | TABLE statement\n  | DELETE statement\n  | INSERT statement\n  | REPLACE statement\n  | UPDATE statement\n}\n\nThe DESCRIBE and EXPLAIN statements are synonyms. In practice, the\nDESCRIBE keyword is more often used to obtain information about table\nstructure, whereas EXPLAIN is used to obtain a query execution plan\n(that is, an explanation of how MySQL would execute a query).\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/explain.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/explain.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (698,51,'HELP STATEMENT','Syntax:\nHELP \'search_string\'\n\nThe HELP statement returns online information from the MySQL Reference\nManual. Its proper operation requires that the help tables in the mysql\ndatabase be initialized with help topic information (see\nhttps://dev.mysql.com/doc/refman/8.0/en/server-side-help-support.html).\n\nThe HELP statement searches the help tables for the given search string\nand displays the result of the search. The search string is not\ncase-sensitive.\n\nThe search string can contain the wildcard characters % and _. These\nhave the same meaning as for pattern-matching operations performed with\nthe LIKE operator. For example, HELP \'rep%\' returns a list of topics\nthat begin with rep.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/help.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/help.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (699,51,'USE','Syntax:\nUSE db_name\n\nThe USE statement tells MySQL to use the named database as the default\n(current) database for subsequent statements. This statement requires\nsome privilege for the database or some object within it.\n\nThe named database remains the default until the end of the session or\nanother USE statement is issued:\n\nUSE db1;\nSELECT COUNT(*) FROM mytable;   # selects from db1.mytable\nUSE db2;\nSELECT COUNT(*) FROM mytable;   # selects from db2.mytable\n\nThe database name must be specified on a single line. Newlines in\ndatabase names are not supported.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/use.html\n\n','','https://dev.mysql.com/doc/refman/8.0/en/use.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (700,52,'MERGE','The MERGE storage engine, also known as the MRG_MyISAM engine, is a\ncollection of identical MyISAM tables that can be used as one.\n"Identical" means that all tables have identical column data types and\nindex information. You cannot merge MyISAM tables in which the columns\nare listed in a different order, do not have exactly the same data\ntypes in corresponding columns, or have the indexes in different order.\nHowever, any or all of the MyISAM tables can be compressed with\nmyisampack. See\nhttps://dev.mysql.com/doc/refman/8.0/en/myisampack.html. Differences\nbetween tables such as these do not matter:\n\no Names of corresponding columns and indexes can differ.\n\no Comments for tables, columns, and indexes can differ.\n\no Table options such as AVG_ROW_LENGTH, MAX_ROWS, or PACK_KEYS can\n  differ.\n\nURL: https://dev.mysql.com/doc/refman/8.0/en/merge-storage-engine.html\n\n','mysql> CREATE TABLE t1 (\n    ->    a INT NOT NULL AUTO_INCREMENT PRIMARY KEY,\n    ->    message CHAR(20)) ENGINE=MyISAM;\nmysql> CREATE TABLE t2 (\n    ->    a INT NOT NULL AUTO_INCREMENT PRIMARY KEY,\n    ->    message CHAR(20)) ENGINE=MyISAM;\nmysql> INSERT INTO t1 (message) VALUES (\'Testing\'),(\'table\'),(\'t1\');\nmysql> INSERT INTO t2 (message) VALUES (\'Testing\'),(\'table\'),(\'t2\');\nmysql> CREATE TABLE total (\n    ->    a INT NOT NULL AUTO_INCREMENT,\n    ->    message CHAR(20), INDEX(a))\n    ->    ENGINE=MERGE UNION=(t1,t2) INSERT_METHOD=LAST;\n','https://dev.mysql.com/doc/refman/8.0/en/merge-storage-engine.html');
 
 INSERT INTO help_keyword (help_keyword_id,name) VALUES (0,'HELP_DATE');
 INSERT INTO help_keyword (help_keyword_id,name) VALUES (1,'HELP_VERSION');
@@ -1056,11 +1057,11 @@
 INSERT INTO help_keyword (help_keyword_id,name) VALUES (253,'BINARY');
 INSERT INTO help_keyword (help_keyword_id,name) VALUES (254,'ARRAY');
 INSERT INTO help_keyword (help_keyword_id,name) VALUES (255,'CAST');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (256,'CONVERT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (257,'DATETIME');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (258,'TIMEZONE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (259,'JSON');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (260,'SIGNED');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (256,'DATETIME');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (257,'JSON');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (258,'SIGNED');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (259,'TIMEZONE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (260,'CONVERT');
 INSERT INTO help_keyword (help_keyword_id,name) VALUES (261,'EXTRACTVALUE');
 INSERT INTO help_keyword (help_keyword_id,name) VALUES (262,'UPDATEXML');
 INSERT INTO help_keyword (help_keyword_id,name) VALUES (263,'|');
@@ -1341,468 +1342,469 @@
 INSERT INTO help_keyword (help_keyword_id,name) VALUES (538,'MASTER_POS_WAIT');
 INSERT INTO help_keyword (help_keyword_id,name) VALUES (539,'NAME_CONST');
 INSERT INTO help_keyword (help_keyword_id,name) VALUES (540,'SLEEP');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (541,'UUID');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (542,'UUID_SHORT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (543,'UUID_TO_BIN');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (544,'VALUES');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (545,'COLLATE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (546,'ENCRYPTION');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (547,'ONLY');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (548,'READ');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (549,'SET');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (550,'COMMENT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (551,'COMPLETION');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (552,'DEFINER');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (553,'DISABLE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (554,'DO');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (555,'ENABLE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (556,'EVENT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (557,'ON');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (558,'PRESERVE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (559,'RENAME');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (560,'SCHEDULE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (561,'SLAVE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (562,'BINLOG');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (563,'CHANNEL');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (564,'ERROR');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (565,'FOR');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (566,'INNODB');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (567,'INSTANCE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (568,'KEYRING');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (569,'MASTER');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (570,'NO');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (571,'REDO_LOG');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (572,'RELOAD');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (573,'ROLLBACK');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (574,'TLS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (575,'GROUP');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (576,'LOGFILE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (577,'PROCEDURE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (578,'OPTIONS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (579,'SERVER');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (580,'AFTER');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (581,'ALGORITHM');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (582,'ANALYZE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (583,'AUTOEXTEND_SIZE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (584,'AUTO_INCREMENT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (585,'AVG_ROW_LENGTH');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (586,'CHANGE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (587,'CHECK');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (588,'CHECKSUM');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (589,'COLUMN');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (590,'COLUMNS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (591,'COMPRESSION');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (592,'CONNECTION');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (593,'CONSTRAINT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (594,'DATA');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (595,'DELAY_KEY_WRITE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (596,'DIRECTORY');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (597,'DISCARD');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (598,'DROP');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (599,'ENGINE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (600,'EXCHANGE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (601,'FIRST');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (602,'FOREIGN');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (603,'FULLTEXT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (604,'IMPORT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (605,'INSERT_METHOD');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (606,'INVISIBLE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (607,'KEYS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (608,'KEY_BLOCK_SIZE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (609,'LOCK');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (610,'MAX_ROWS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (611,'MIN_ROWS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (612,'MODIFY');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (613,'OPTIMIZE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (614,'PACK_KEYS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (615,'PARSER');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (616,'PARTITION');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (617,'PARTITIONING');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (618,'PASSWORD');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (619,'PRIMARY');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (620,'REBUILD');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (621,'REMOVE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (622,'REORGANIZE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (623,'REPAIR');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (624,'ROW_FORMAT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (625,'SPATIAL');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (626,'STATS_AUTO_RECALC');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (627,'STATS_PERSISTENT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (628,'STATS_SAMPLE_PAGES');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (629,'TABLESPACE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (630,'TYPE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (631,'UNION');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (632,'UNIQUE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (633,'UPGRADE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (634,'VISIBLE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (635,'DATAFILE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (636,'INITIAL_SIZE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (637,'TO');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (638,'UNDO');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (639,'WAIT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (640,'VIEW');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (641,'EXISTS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (642,'AT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (643,'ENDS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (644,'EVERY');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (645,'STARTS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (646,'BTREE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (647,'HOST');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (648,'OWNER');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (649,'PORT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (650,'SOCKET');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (651,'WRAPPER');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (652,'DEFINITION');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (653,'DESCRIPTION');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (654,'NAME');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (655,'ORGANIZATION');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (656,'REFERENCE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (657,'SYSTEM');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (658,'ACTION');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (659,'ARCHIVE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (660,'CASCADE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (661,'COMPACT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (662,'COMPRESSED');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (663,'CSV');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (664,'DELETE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (665,'DYNAMIC');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (666,'FEDERATED');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (667,'FULL');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (668,'HEAP');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (669,'MERGE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (670,'MRG_MYISAM');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (671,'MYISAM');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (672,'NDB');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (673,'NDBCLUSTER');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (674,'PARTIAL');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (675,'REDUNDANT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (676,'REFERENCES');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (677,'STORED');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (678,'VIRTUAL');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (679,'RESTRICT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (680,'UPDATE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (681,'EXTENT_SIZE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (682,'FILE_BLOCK_SIZE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (683,'MAX_SIZE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (684,'NODEGROUP');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (685,'USE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (686,'TRIGGER');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (687,'TEMPORARY');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (688,'CALL');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (689,'LIMIT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (690,'LOW_PRIORITY');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (691,'QUICK');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (692,'USING');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (693,'WHERE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (694,'CLOSE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (695,'HANDLER');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (696,'LAST');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (697,'NEXT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (698,'OPEN');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (699,'PREV');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (700,'DELAYED');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (701,'DUPLICATE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (702,'HIGH_PRIORITY');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (703,'IGNORE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (704,'INTO');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (705,'ROW');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (706,'SELECT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (707,'CONCURRENT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (708,'ENCLOSED');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (709,'ESCAPED');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (710,'FIELDS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (711,'INFILE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (712,'LINES');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (713,'LOAD');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (714,'LOCAL');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (715,'OPTIONALLY');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (716,'STARTING');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (717,'TERMINATED');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (718,'IDENTIFIED');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (719,'ROWS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (720,'ALL');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (721,'AS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (722,'DISTINCTROW');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (723,'DUMPFILE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (724,'HAVING');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (725,'JOIN');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (726,'MEMORY');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (727,'OFFSET');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (728,'OUTFILE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (729,'SHARE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (730,'SQL_BIG_RESULT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (731,'SQL_BUFFER_RESULT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (732,'SQL_CALC_FOUND_ROWS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (733,'SQL_NO_CACHE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (734,'SQL_SMALL_RESULT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (735,'STRAIGHT_JOIN');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (736,'DUAL');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (737,'CROSS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (738,'FORCE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (739,'INNER');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (740,'NATURAL');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (741,'OUTER');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (742,'AUTOCOMMIT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (743,'BEGIN');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (744,'CHAIN');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (745,'COMMIT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (746,'CONSISTENT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (747,'RELEASE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (748,'SNAPSHOT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (749,'START');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (750,'TRANSACTION');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (751,'WORK');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (752,'WRITE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (753,'SAVEPOINT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (754,'BACKUP');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (755,'UNLOCK');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (756,'TABLES');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (757,'COMMITTED');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (758,'GLOBAL');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (759,'ISOLATION');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (760,'LEVEL');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (761,'REPEATABLE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (762,'SERIALIZABLE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (763,'SESSION');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (764,'UNCOMMITTED');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (765,'PREPARE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (766,'RECOVER');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (767,'XA');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (768,'BEFORE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (769,'LOGS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (770,'PURGE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (771,'RESET');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (772,'SQL_LOG_BIN');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (773,'ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (774,'IGNORE_SERVER_IDS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (775,'MASTER_AUTO_POSITION');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (776,'MASTER_BIND');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (777,'MASTER_COMPRESSION_ALGORITHMS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (778,'MASTER_CONNECT_RETRY');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (779,'MASTER_HEARTBEAT_PERIOD');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (780,'MASTER_HOST');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (781,'MASTER_LOG_FILE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (782,'MASTER_LOG_POS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (783,'MASTER_PASSWORD');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (784,'MASTER_PORT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (785,'MASTER_RETRY_COUNT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (786,'MASTER_SSL');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (787,'MASTER_SSL_CA');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (788,'MASTER_SSL_CERT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (789,'MASTER_SSL_CIPHER');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (790,'MASTER_SSL_CRL');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (791,'MASTER_SSL_CRLPATH');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (792,'MASTER_SSL_KEY');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (793,'MASTER_SSL_VERIFY_SERVER_CERT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (794,'MASTER_TLS_CIPHERSUITES');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (795,'MASTER_TLS_VERSION');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (796,'MASTER_USER');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (797,'MASTER_ZSTD_COMPRESSION_LEVEL');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (798,'NETWORK_NAMESPACE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (799,'PRIVILEGE_CHECKS_USER');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (800,'RELAY_LOG_FILE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (801,'RELAY_LOG_POS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (802,'FILTER');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (803,'REPLICATE_DO_DB');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (804,'REPLICATE_DO_TABLE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (805,'REPLICATE_IGNORE_DB');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (806,'REPLICATE_IGNORE_TABLE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (807,'REPLICATE_REWRITE_DB');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (808,'REPLICATE_WILD_DO_TABLE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (809,'REPLICATE_WILD_IGNORE_TABLE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (810,'REPLICATION');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (811,'SOURCE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (812,'SOURCE_AUTO_POSITION');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (813,'SOURCE_BIND');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (814,'SOURCE_COMPRESSION_ALGORITHMS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (815,'SOURCE_CONNECT_RETRY');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (816,'SOURCE_HEARTBEAT_PERIOD');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (817,'SOURCE_HOST');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (818,'SOURCE_LOG_FILE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (819,'SOURCE_LOG_POS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (820,'SOURCE_PASSWORD');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (821,'SOURCE_PORT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (822,'SOURCE_RETRY_COUNT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (823,'SOURCE_SSL');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (824,'SOURCE_SSL_CA');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (825,'SOURCE_SSL_CERT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (826,'SOURCE_SSL_CIPHER');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (827,'SOURCE_SSL_CRL');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (828,'SOURCE_SSL_CRLPATH');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (829,'SOURCE_SSL_KEY');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (830,'SOURCE_SSL_VERIFY_SERVER_CERT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (831,'SOURCE_TLS_CIPHERSUITES');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (832,'SOURCE_TLS_VERSION');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (833,'SOURCE_USER');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (834,'SOURCE_ZSTD_COMPRESSION_LEVEL');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (835,'REPLICA');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (836,'DEFAULT_AUTH');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (837,'IO_THREAD');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (838,'PLUGIN_DIR');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (839,'SQL_AFTER_GTIDS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (840,'SQL_AFTER_MTS_GAPS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (841,'SQL_BEFORE_GTIDS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (842,'SQL_THREAD');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (843,'STOP');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (844,'EXECUTE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (845,'DEALLOCATE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (846,'DECLARE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (847,'ELSEIF');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (848,'ITERATE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (849,'LEAVE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (850,'LOOP');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (851,'UNTIL');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (852,'RETURN');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (853,'WHILE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (854,'CURSOR');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (855,'FETCH');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (856,'CONDITION');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (857,'CONTINUE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (858,'EXIT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (859,'CATALOG_NAME');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (860,'CLASS_ORIGIN');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (861,'COLUMN_NAME');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (862,'CONSTRAINT_CATALOG');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (863,'CONSTRAINT_NAME');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (864,'CONSTRAINT_SCHEMA');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (865,'CURSOR_NAME');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (866,'DIAGNOSTICS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (867,'GET');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (868,'MESSAGE_TEXT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (869,'MYSQL_ERRNO');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (870,'NUMBER');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (871,'RETURNED_SQLSTATE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (872,'SCHEMA_NAME');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (873,'SUBCLASS_ORIGIN');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (874,'TABLE_NAME');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (875,'RESIGNAL');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (876,'SQLSTATE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (877,'SIGNAL');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (878,'ACCOUNT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (879,'ATTRIBUTE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (880,'CIPHER');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (881,'CURRENT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (882,'EXPIRE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (883,'FAILED_LOGIN_ATTEMPTS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (884,'HISTORY');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (885,'ISSUER');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (886,'MAX_CONNECTIONS_PER_HOUR');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (887,'MAX_QUERIES_PER_HOUR');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (888,'MAX_UPDATES_PER_HOUR');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (889,'MAX_USER_CONNECTIONS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (890,'NEVER');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (891,'NONE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (892,'OLD');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (893,'OPTIONAL');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (894,'PASSWORD_LOCK_TIME');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (895,'RANDOM');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (896,'REQUIRE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (897,'RETAIN');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (898,'REUSE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (899,'ROLE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (900,'SSL');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (901,'SUBJECT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (902,'UNBOUNDED');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (903,'X509');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (904,'ADMIN');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (905,'CLIENT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (906,'FILE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (907,'GRANT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (908,'OPTION');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (909,'PRIVILEGES');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (910,'PROCESS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (911,'SHUTDOWN');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (912,'SUPER');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (913,'USAGE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (914,'PROXY');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (915,'REVOKE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (916,'EXCEPT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (917,'RESOURCE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (918,'THREAD_PRIORITY');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (919,'VCPU');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (920,'NO_WRITE_TO_BINLOG');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (921,'FAST');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (922,'MEDIUM');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (923,'EXTENDED');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (924,'USE_FRM');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (925,'AGGREGATE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (926,'RETURNS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (927,'SONAME');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (928,'STRING');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (929,'COMPONENT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (930,'INSTALL');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (931,'PLUGIN');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (932,'UNINSTALL');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (933,'CLONE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (934,'PERSIST');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (935,'PERSIST_ONLY');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (936,'VARIABLE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (937,'NAMES');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (938,'DATABASES');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (939,'ENGINES');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (940,'ERRORS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (941,'GRANTS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (942,'HOSTS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (943,'INDEXES');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (944,'MUTEX');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (945,'PROCESSLIST');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (946,'SCHEMAS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (947,'SHOW');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (948,'STATUS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (949,'TRIGGERS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (950,'VARIABLES');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (951,'WARNINGS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (952,'EVENTS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (953,'STORAGE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (954,'CODE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (955,'PLUGINS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (956,'PROFILE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (957,'PROFILES');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (958,'RELAYLOG');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (959,'REPLICAS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (960,'CACHE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (961,'EXPORT');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (962,'FLUSH');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (963,'GENERAL');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (964,'OPTIMIZER_COSTS');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (965,'RELAY');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (966,'SLOW');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (967,'USER_RESOURCES');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (968,'KILL');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (969,'LEAVES');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (970,'RESTART');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (971,'DESCRIBE');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (972,'EXPLAIN');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (973,'TRADITIONAL');
-INSERT INTO help_keyword (help_keyword_id,name) VALUES (974,'TREE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (541,'SOURCE_POS_WAIT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (542,'UUID');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (543,'UUID_SHORT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (544,'UUID_TO_BIN');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (545,'VALUES');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (546,'COLLATE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (547,'ENCRYPTION');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (548,'ONLY');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (549,'READ');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (550,'SET');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (551,'COMMENT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (552,'COMPLETION');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (553,'DEFINER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (554,'DISABLE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (555,'DO');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (556,'ENABLE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (557,'EVENT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (558,'ON');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (559,'PRESERVE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (560,'RENAME');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (561,'SCHEDULE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (562,'SLAVE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (563,'BINLOG');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (564,'CHANNEL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (565,'ERROR');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (566,'FOR');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (567,'INNODB');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (568,'INSTANCE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (569,'KEYRING');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (570,'MASTER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (571,'NO');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (572,'REDO_LOG');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (573,'RELOAD');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (574,'ROLLBACK');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (575,'TLS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (576,'GROUP');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (577,'LOGFILE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (578,'PROCEDURE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (579,'OPTIONS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (580,'SERVER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (581,'AFTER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (582,'ALGORITHM');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (583,'ANALYZE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (584,'AUTOEXTEND_SIZE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (585,'AUTO_INCREMENT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (586,'AVG_ROW_LENGTH');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (587,'CHANGE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (588,'CHECK');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (589,'CHECKSUM');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (590,'COLUMN');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (591,'COLUMNS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (592,'COMPRESSION');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (593,'CONNECTION');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (594,'CONSTRAINT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (595,'DATA');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (596,'DELAY_KEY_WRITE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (597,'DIRECTORY');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (598,'DISCARD');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (599,'DROP');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (600,'ENGINE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (601,'EXCHANGE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (602,'FIRST');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (603,'FOREIGN');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (604,'FULLTEXT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (605,'IMPORT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (606,'INSERT_METHOD');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (607,'INVISIBLE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (608,'KEYS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (609,'KEY_BLOCK_SIZE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (610,'LOCK');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (611,'MAX_ROWS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (612,'MIN_ROWS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (613,'MODIFY');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (614,'OPTIMIZE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (615,'PACK_KEYS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (616,'PARSER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (617,'PARTITION');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (618,'PARTITIONING');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (619,'PASSWORD');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (620,'PRIMARY');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (621,'REBUILD');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (622,'REMOVE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (623,'REORGANIZE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (624,'REPAIR');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (625,'ROW_FORMAT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (626,'SPATIAL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (627,'STATS_AUTO_RECALC');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (628,'STATS_PERSISTENT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (629,'STATS_SAMPLE_PAGES');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (630,'TABLESPACE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (631,'TYPE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (632,'UNION');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (633,'UNIQUE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (634,'UPGRADE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (635,'VISIBLE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (636,'DATAFILE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (637,'INITIAL_SIZE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (638,'TO');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (639,'UNDO');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (640,'WAIT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (641,'VIEW');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (642,'EXISTS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (643,'AT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (644,'ENDS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (645,'EVERY');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (646,'STARTS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (647,'BTREE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (648,'HOST');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (649,'OWNER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (650,'PORT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (651,'SOCKET');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (652,'WRAPPER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (653,'DEFINITION');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (654,'DESCRIPTION');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (655,'NAME');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (656,'ORGANIZATION');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (657,'REFERENCE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (658,'SYSTEM');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (659,'ACTION');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (660,'ARCHIVE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (661,'CASCADE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (662,'COMPACT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (663,'COMPRESSED');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (664,'CSV');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (665,'DELETE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (666,'DYNAMIC');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (667,'FEDERATED');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (668,'FULL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (669,'HEAP');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (670,'MERGE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (671,'MRG_MYISAM');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (672,'MYISAM');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (673,'NDB');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (674,'NDBCLUSTER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (675,'PARTIAL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (676,'REDUNDANT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (677,'REFERENCES');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (678,'STORED');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (679,'VIRTUAL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (680,'RESTRICT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (681,'UPDATE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (682,'EXTENT_SIZE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (683,'FILE_BLOCK_SIZE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (684,'MAX_SIZE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (685,'NODEGROUP');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (686,'USE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (687,'TRIGGER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (688,'TEMPORARY');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (689,'CALL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (690,'LIMIT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (691,'LOW_PRIORITY');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (692,'QUICK');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (693,'USING');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (694,'WHERE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (695,'CLOSE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (696,'HANDLER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (697,'LAST');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (698,'NEXT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (699,'OPEN');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (700,'PREV');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (701,'DELAYED');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (702,'DUPLICATE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (703,'HIGH_PRIORITY');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (704,'IGNORE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (705,'INTO');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (706,'ROW');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (707,'SELECT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (708,'CONCURRENT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (709,'ENCLOSED');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (710,'ESCAPED');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (711,'FIELDS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (712,'INFILE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (713,'LINES');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (714,'LOAD');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (715,'LOCAL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (716,'OPTIONALLY');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (717,'STARTING');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (718,'TERMINATED');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (719,'IDENTIFIED');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (720,'ROWS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (721,'ALL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (722,'AS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (723,'DISTINCTROW');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (724,'DUMPFILE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (725,'HAVING');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (726,'JOIN');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (727,'MEMORY');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (728,'OFFSET');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (729,'OUTFILE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (730,'SHARE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (731,'SQL_BIG_RESULT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (732,'SQL_BUFFER_RESULT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (733,'SQL_CALC_FOUND_ROWS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (734,'SQL_NO_CACHE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (735,'SQL_SMALL_RESULT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (736,'STRAIGHT_JOIN');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (737,'DUAL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (738,'CROSS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (739,'FORCE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (740,'INNER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (741,'NATURAL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (742,'OUTER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (743,'AUTOCOMMIT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (744,'BEGIN');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (745,'CHAIN');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (746,'COMMIT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (747,'CONSISTENT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (748,'RELEASE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (749,'SNAPSHOT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (750,'START');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (751,'TRANSACTION');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (752,'WORK');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (753,'WRITE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (754,'SAVEPOINT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (755,'BACKUP');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (756,'UNLOCK');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (757,'TABLES');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (758,'COMMITTED');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (759,'GLOBAL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (760,'ISOLATION');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (761,'LEVEL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (762,'REPEATABLE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (763,'SERIALIZABLE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (764,'SESSION');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (765,'UNCOMMITTED');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (766,'PREPARE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (767,'RECOVER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (768,'XA');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (769,'BEFORE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (770,'LOGS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (771,'PURGE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (772,'RESET');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (773,'SQL_LOG_BIN');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (774,'ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (775,'IGNORE_SERVER_IDS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (776,'MASTER_AUTO_POSITION');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (777,'MASTER_BIND');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (778,'MASTER_COMPRESSION_ALGORITHMS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (779,'MASTER_CONNECT_RETRY');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (780,'MASTER_HEARTBEAT_PERIOD');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (781,'MASTER_HOST');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (782,'MASTER_LOG_FILE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (783,'MASTER_LOG_POS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (784,'MASTER_PASSWORD');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (785,'MASTER_PORT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (786,'MASTER_RETRY_COUNT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (787,'MASTER_SSL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (788,'MASTER_SSL_CA');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (789,'MASTER_SSL_CERT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (790,'MASTER_SSL_CIPHER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (791,'MASTER_SSL_CRL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (792,'MASTER_SSL_CRLPATH');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (793,'MASTER_SSL_KEY');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (794,'MASTER_SSL_VERIFY_SERVER_CERT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (795,'MASTER_TLS_CIPHERSUITES');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (796,'MASTER_TLS_VERSION');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (797,'MASTER_USER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (798,'MASTER_ZSTD_COMPRESSION_LEVEL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (799,'NETWORK_NAMESPACE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (800,'PRIVILEGE_CHECKS_USER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (801,'RELAY_LOG_FILE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (802,'RELAY_LOG_POS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (803,'FILTER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (804,'REPLICATE_DO_DB');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (805,'REPLICATE_DO_TABLE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (806,'REPLICATE_IGNORE_DB');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (807,'REPLICATE_IGNORE_TABLE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (808,'REPLICATE_REWRITE_DB');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (809,'REPLICATE_WILD_DO_TABLE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (810,'REPLICATE_WILD_IGNORE_TABLE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (811,'REPLICATION');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (812,'SOURCE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (813,'SOURCE_AUTO_POSITION');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (814,'SOURCE_BIND');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (815,'SOURCE_COMPRESSION_ALGORITHMS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (816,'SOURCE_CONNECT_RETRY');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (817,'SOURCE_HEARTBEAT_PERIOD');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (818,'SOURCE_HOST');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (819,'SOURCE_LOG_FILE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (820,'SOURCE_LOG_POS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (821,'SOURCE_PASSWORD');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (822,'SOURCE_PORT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (823,'SOURCE_RETRY_COUNT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (824,'SOURCE_SSL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (825,'SOURCE_SSL_CA');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (826,'SOURCE_SSL_CERT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (827,'SOURCE_SSL_CIPHER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (828,'SOURCE_SSL_CRL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (829,'SOURCE_SSL_CRLPATH');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (830,'SOURCE_SSL_KEY');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (831,'SOURCE_SSL_VERIFY_SERVER_CERT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (832,'SOURCE_TLS_CIPHERSUITES');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (833,'SOURCE_TLS_VERSION');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (834,'SOURCE_USER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (835,'SOURCE_ZSTD_COMPRESSION_LEVEL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (836,'REPLICA');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (837,'DEFAULT_AUTH');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (838,'IO_THREAD');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (839,'PLUGIN_DIR');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (840,'SQL_AFTER_GTIDS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (841,'SQL_AFTER_MTS_GAPS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (842,'SQL_BEFORE_GTIDS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (843,'SQL_THREAD');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (844,'STOP');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (845,'EXECUTE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (846,'DEALLOCATE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (847,'DECLARE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (848,'ELSEIF');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (849,'ITERATE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (850,'LEAVE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (851,'LOOP');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (852,'UNTIL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (853,'RETURN');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (854,'WHILE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (855,'CURSOR');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (856,'FETCH');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (857,'CONDITION');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (858,'CONTINUE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (859,'EXIT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (860,'CATALOG_NAME');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (861,'CLASS_ORIGIN');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (862,'COLUMN_NAME');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (863,'CONSTRAINT_CATALOG');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (864,'CONSTRAINT_NAME');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (865,'CONSTRAINT_SCHEMA');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (866,'CURSOR_NAME');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (867,'DIAGNOSTICS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (868,'GET');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (869,'MESSAGE_TEXT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (870,'MYSQL_ERRNO');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (871,'NUMBER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (872,'RETURNED_SQLSTATE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (873,'SCHEMA_NAME');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (874,'SUBCLASS_ORIGIN');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (875,'TABLE_NAME');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (876,'RESIGNAL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (877,'SQLSTATE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (878,'SIGNAL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (879,'ACCOUNT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (880,'ATTRIBUTE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (881,'CIPHER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (882,'CURRENT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (883,'EXPIRE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (884,'FAILED_LOGIN_ATTEMPTS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (885,'HISTORY');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (886,'ISSUER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (887,'MAX_CONNECTIONS_PER_HOUR');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (888,'MAX_QUERIES_PER_HOUR');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (889,'MAX_UPDATES_PER_HOUR');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (890,'MAX_USER_CONNECTIONS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (891,'NEVER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (892,'NONE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (893,'OLD');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (894,'OPTIONAL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (895,'PASSWORD_LOCK_TIME');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (896,'RANDOM');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (897,'REQUIRE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (898,'RETAIN');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (899,'REUSE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (900,'ROLE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (901,'SSL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (902,'SUBJECT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (903,'UNBOUNDED');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (904,'X509');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (905,'ADMIN');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (906,'CLIENT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (907,'FILE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (908,'GRANT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (909,'OPTION');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (910,'PRIVILEGES');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (911,'PROCESS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (912,'SHUTDOWN');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (913,'SUPER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (914,'USAGE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (915,'PROXY');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (916,'REVOKE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (917,'EXCEPT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (918,'RESOURCE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (919,'THREAD_PRIORITY');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (920,'VCPU');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (921,'NO_WRITE_TO_BINLOG');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (922,'FAST');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (923,'MEDIUM');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (924,'EXTENDED');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (925,'USE_FRM');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (926,'AGGREGATE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (927,'RETURNS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (928,'SONAME');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (929,'STRING');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (930,'COMPONENT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (931,'INSTALL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (932,'PLUGIN');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (933,'UNINSTALL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (934,'CLONE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (935,'PERSIST');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (936,'PERSIST_ONLY');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (937,'VARIABLE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (938,'NAMES');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (939,'DATABASES');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (940,'ENGINES');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (941,'ERRORS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (942,'GRANTS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (943,'HOSTS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (944,'INDEXES');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (945,'MUTEX');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (946,'PROCESSLIST');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (947,'SCHEMAS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (948,'SHOW');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (949,'STATUS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (950,'TRIGGERS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (951,'VARIABLES');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (952,'WARNINGS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (953,'EVENTS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (954,'STORAGE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (955,'CODE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (956,'PLUGINS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (957,'PROFILE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (958,'PROFILES');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (959,'RELAYLOG');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (960,'REPLICAS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (961,'CACHE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (962,'EXPORT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (963,'FLUSH');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (964,'GENERAL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (965,'OPTIMIZER_COSTS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (966,'RELAY');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (967,'SLOW');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (968,'USER_RESOURCES');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (969,'KILL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (970,'LEAVES');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (971,'RESTART');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (972,'DESCRIBE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (973,'EXPLAIN');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (974,'TRADITIONAL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (975,'TREE');
 
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (0,0);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (1,1);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (501,2);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (502,2);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,2);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,2);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (503,2);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,2);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,2);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (2,2);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (512,2);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (513,2);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,2);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,2);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (589,2);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (483,2);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (514,2);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,2);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (545,2);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (550,2);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (615,2);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (617,2);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,2);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (590,2);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (483,2);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (523,2);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (546,2);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,2);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (616,2);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (618,2);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (2,3);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,3);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,3);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (2,4);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (545,4);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (550,4);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (605,4);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (546,4);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,4);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (606,4);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,4);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (3,5);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (697,5);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (698,5);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (4,6);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (5,7);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (6,8);
@@ -1822,7 +1824,7 @@
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (16,18);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (16,19);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (22,20);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (243,20);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (242,20);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (23,20);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (26,20);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (25,20);
@@ -1838,135 +1840,135 @@
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (19,23);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (19,24);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (20,25);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (243,26);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (627,26);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (242,26);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (628,26);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (20,26);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (22,27);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (23,28);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,29);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,29);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (23,29);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (23,30);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (243,31);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (627,31);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (242,31);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (628,31);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (24,31);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (25,32);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (26,33);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (26,34);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (627,35);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (628,35);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (26,35);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (243,36);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (242,36);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (28,36);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (129,36);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (131,36);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (30,37);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (165,37);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (243,38);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (242,38);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (31,38);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (163,38);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (501,39);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (502,39);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,39);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (503,39);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,39);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (33,39);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (512,39);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (513,39);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,39);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (548,39);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (514,39);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,39);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (549,39);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,39);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (635,39);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (550,39);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (552,39);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (636,39);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,39);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (642,39);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (637,39);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,39);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (643,39);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (35,39);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (33,40);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (35,40);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (33,41);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (34,42);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (242,43);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (34,43);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (184,43);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (243,43);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (35,44);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (35,45);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (35,46);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (44,47);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (44,48);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,49);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,49);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (523,49);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (511,49);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (524,49);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (53,49);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (501,50);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (503,50);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (502,50);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (504,50);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (505,50);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (506,50);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (507,50);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (618,50);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (502,50);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (508,50);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (619,50);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (503,50);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,50);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,50);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,50);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (511,50);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (612,50);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,50);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (512,50);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (613,50);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (53,50);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (512,51);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (514,51);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (518,51);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (627,51);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (513,51);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (515,51);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (519,51);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (628,51);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (516,51);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (517,51);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (619,51);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,51);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (513,51);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (519,51);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (518,51);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (620,51);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,51);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (514,51);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (520,51);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,51);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (523,51);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,51);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (524,51);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,51);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (525,51);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,51);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (646,51);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (648,51);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,51);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (526,51);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,51);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (647,51);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (649,51);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (650,51);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (647,51);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (651,51);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (653,51);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (648,51);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (652,51);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (654,51);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (53,51);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,52);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (686,52);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (515,52);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,52);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (529,52);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (553,52);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (689,52);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,52);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (664,52);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,52);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (687,52);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (516,52);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,52);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (530,52);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (554,52);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (690,52);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,52);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (665,52);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (53,52);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,53);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,53);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,53);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,53);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (545,53);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (523,53);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (546,53);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (53,53);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,54);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (622,54);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,54);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (623,54);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (624,54);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,54);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (534,54);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (544,54);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (546,54);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (625,54);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (538,54);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,54);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (535,54);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (545,54);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (547,54);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (626,54);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,54);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (651,54);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (680,54);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (53,54);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (556,54);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (539,54);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (627,54);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,54);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (652,54);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (681,54);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (53,54);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (557,54);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (540,54);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (54,55);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (79,55);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (55,56);
@@ -1980,85 +1982,85 @@
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (61,63);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (62,63);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (74,64);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (512,64);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (514,64);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,64);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (513,64);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (520,64);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (515,64);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,64);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (514,64);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,64);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,64);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (69,64);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (71,64);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (62,64);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (66,64);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (232,64);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (234,64);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,65);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,65);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (63,65);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (64,66);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (65,67);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (240,67);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (66,67);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,67);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (641,67);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (644,67);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (552,67);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (642,67);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (645,67);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (664,67);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (674,67);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,68);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (514,68);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,68);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (646,67);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (665,67);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (675,67);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,68);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (515,68);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,68);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (131,68);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (67,68);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (68,69);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (69,69);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (71,69);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (70,69);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,70);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (523,70);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (71,70);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (70,70);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (72,71);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (73,72);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (520,73);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,73);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (76,73);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (77,74);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (78,75);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (80,76);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (590,76);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (591,76);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (80,77);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (590,77);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (587,78);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (591,77);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (588,78);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (80,78);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (590,78);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (591,78);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (594,78);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (592,78);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (595,78);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (597,78);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (569,78);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (596,78);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (598,78);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (570,78);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (80,79);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (590,79);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (591,79);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (592,79);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (80,80);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (590,80);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,81);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (512,81);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (514,81);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (591,80);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,81);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (513,81);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (520,81);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (515,81);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,81);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (526,81);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (528,81);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (628,81);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (514,81);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,81);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,81);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (527,81);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (532,81);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (529,81);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (629,81);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (611,81);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (528,81);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (533,81);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (534,81);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (611,81);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (537,81);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (535,81);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (612,81);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (538,81);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (81,81);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (591,81);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (691,81);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (592,81);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (692,81);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (82,82);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (83,83);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (84,84);
@@ -2098,9 +2100,9 @@
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (117,116);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (118,117);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (119,118);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,119);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,119);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (120,119);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (539,119);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (540,119);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (121,120);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (122,121);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (123,122);
@@ -2113,8 +2115,8 @@
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (131,129);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (131,130);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (133,130);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,131);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,131);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,131);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,131);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (131,131);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (134,131);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (131,132);
@@ -2131,7 +2133,7 @@
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (151,140);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (131,141);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (157,141);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (243,142);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (242,142);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (131,142);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (179,142);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (131,143);
@@ -2160,18 +2162,18 @@
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (160,166);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (161,167);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (162,168);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (504,169);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (505,169);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (519,169);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (628,169);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (518,169);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (627,169);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (517,169);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (532,169);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (629,169);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (531,169);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (628,169);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (530,169);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (214,169);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,169);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (649,169);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (661,169);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,169);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (650,169);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (662,169);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (663,169);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (163,169);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (165,169);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (164,170);
@@ -2200,19 +2202,19 @@
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (190,193);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (191,194);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (192,195);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (697,196);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (696,196);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (695,196);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (694,196);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (193,196);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (194,197);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (195,198);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (545,199);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (547,199);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (196,199);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (546,199);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (548,199);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (196,199);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (547,199);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (197,200);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (198,201);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (553,202);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (554,202);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (199,202);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (200,203);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (201,204);
@@ -2228,24 +2230,24 @@
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (211,214);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (212,215);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (213,216);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (595,216);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,217);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (520,217);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (548,217);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (596,216);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,217);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,217);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (549,217);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (550,217);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,217);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (214,217);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (616,217);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (617,217);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (215,218);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (553,219);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (554,219);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (216,219);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (217,220);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (218,221);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (219,222);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (232,223);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,223);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (644,223);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,223);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (645,223);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (646,223);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (220,223);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (220,224);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (221,225);
@@ -2254,15 +2256,15 @@
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (224,228);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (225,229);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (226,230);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (541,231);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (544,231);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,231);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,231);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (641,231);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (644,231);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (542,231);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (545,231);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (552,231);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,231);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (642,231);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (645,231);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (664,231);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (674,231);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (646,231);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (665,231);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (675,231);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (226,231);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (226,232);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (226,233);
@@ -2283,35 +2285,33 @@
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (240,248);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (240,249);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (240,250);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,250);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (688,251);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (552,250);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (689,251);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (240,251);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,252);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,252);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (515,252);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,252);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,252);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (687,252);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (612,252);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,252);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,252);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (516,252);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,252);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,252);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (688,252);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (613,252);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (240,252);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (241,253);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (243,253);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (687,253);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (570,253);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (242,253);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (688,253);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (571,253);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,253);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (572,253);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (640,253);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (641,253);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (242,254);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (242,255);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (242,256);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (243,256);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (242,257);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (243,257);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (697,257);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (696,257);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (695,257);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (242,258);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (243,259);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (696,259);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (695,259);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (694,259);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (242,259);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (243,260);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (244,261);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (245,262);
@@ -2342,55 +2342,55 @@
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (269,287);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (270,288);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (271,289);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (635,289);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (636,289);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (637,289);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (272,290);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (273,291);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,291);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (643,291);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,291);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (644,291);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (274,292);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (275,293);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (503,294);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (514,294);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (504,294);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (515,294);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (276,294);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (501,295);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (502,295);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (512,295);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (503,295);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (513,295);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (519,295);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (514,295);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (520,295);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (277,295);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (526,295);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (527,295);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,295);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (646,295);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (528,295);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,295);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (647,295);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (648,295);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (278,296);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (279,297);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (280,298);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (281,299);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (604,300);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (605,300);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (282,300);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (501,301);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (502,301);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (512,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (503,301);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (513,301);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (526,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (514,301);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (527,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (528,301);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (283,301);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,301);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (646,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,301);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (647,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (648,301);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (284,302);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (285,303);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,304);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (619,304);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (519,304);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,304);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (611,304);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (613,304);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (653,304);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (579,304);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,304);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (620,304);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (520,304);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,304);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (612,304);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (614,304);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (654,304);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (580,304);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (581,304);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (286,304);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (287,305);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (288,306);
@@ -2552,43 +2552,43 @@
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (424,459);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (427,459);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (428,459);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,459);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (552,459);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (433,459);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (554,459);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (555,459);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (419,460);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (420,461);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (421,462);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (422,463);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (423,463);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (659,463);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (684,463);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (660,463);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (685,463);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (424,464);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,464);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,465);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,465);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,465);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,465);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (541,465);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (552,464);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,465);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,465);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,465);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,465);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (542,465);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (424,465);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (548,465);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (549,465);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (555,465);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,465);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (557,465);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (550,465);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (556,465);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (552,465);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (558,465);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (697,466);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (696,466);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (695,466);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (694,466);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (424,466);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,466);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (552,466);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (424,467);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,468);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (541,468);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,468);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (542,468);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (424,468);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (555,468);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,468);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (556,468);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (552,468);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (557,468);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (558,468);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (559,468);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (424,469);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (425,470);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (426,471);
@@ -2664,1145 +2664,1146 @@
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (497,541);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (498,542);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (499,543);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (545,544);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (550,544);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (500,544);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (558,544);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (546,545);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,545);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (501,545);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (502,545);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,545);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (512,545);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (513,545);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,545);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (501,546);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (559,545);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (502,546);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,546);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (512,546);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (503,546);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,546);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (513,546);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,546);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (501,547);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (514,546);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,546);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (502,547);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (560,547);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (561,547);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (562,547);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (568,547);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (559,547);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (569,547);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (501,548);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (503,547);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,547);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (513,547);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (514,547);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,547);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (502,548);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (560,548);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (503,548);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (561,548);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (687,548);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (543,548);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (567,548);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (562,548);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (568,548);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (559,548);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (563,548);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (569,548);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (501,549);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (560,548);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (570,548);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (502,549);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,549);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (560,549);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (503,549);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (561,549);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (512,549);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (513,549);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,549);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,549);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (545,549);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (548,549);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (549,549);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (550,549);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (605,549);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (562,549);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,549);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (634,549);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (635,549);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (636,549);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (615,549);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (637,549);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (616,549);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (621,549);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (617,549);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (573,549);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,549);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (642,549);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (606,549);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (559,549);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (557,549);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (688,549);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (544,549);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (568,549);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (563,549);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (569,549);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (560,549);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (570,549);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (502,550);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (503,550);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,550);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,550);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,550);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (561,550);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (562,550);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (513,550);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (514,550);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (515,550);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,550);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,550);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (523,550);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,550);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (503,551);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (514,551);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (503,552);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (514,552);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (503,553);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (618,553);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,553);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (514,553);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (619,553);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (503,554);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (514,554);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (542,554);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (597,554);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (503,555);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (618,555);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,555);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (514,555);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (619,555);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (503,556);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (514,556);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (528,556);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (648,556);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (503,557);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (505,557);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (514,557);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,557);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (553,557);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (503,558);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (514,558);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (503,559);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,559);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,559);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (538,559);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (613,559);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (503,560);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (514,560);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (503,561);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (514,561);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (690,561);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (578,561);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (676,561);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (678,561);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (580,561);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (582,561);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (505,562);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (685,562);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (641,562);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (505,563);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (574,563);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,563);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (687,563);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,563);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (578,563);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (674,563);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (677,563);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (678,563);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (579,563);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (580,563);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (581,563);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (582,563);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (505,564);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (687,564);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (505,565);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (574,565);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,565);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (602,565);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (599,565);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (603,565);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (696,565);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (695,565);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (694,565);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (687,565);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,565);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (578,565);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,565);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (616,565);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (621,565);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,565);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (674,565);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (677,565);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (678,565);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (579,565);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (580,565);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (581,565);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (582,565);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (505,566);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,566);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,566);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (505,567);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (566,567);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (505,568);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (505,569);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (574,569);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (570,569);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (571,569);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (690,569);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (572,569);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,569);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (640,569);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (665,569);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (505,570);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,570);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,570);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (505,571);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (505,572);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (612,572);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (505,573);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (560,573);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (561,573);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (565,573);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (562,573);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (564,573);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (563,573);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (559,573);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (569,573);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (505,574);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (546,550);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (549,550);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (550,550);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,550);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (606,550);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (563,550);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (552,550);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (635,550);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (636,550);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (637,550);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (616,550);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,550);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (617,550);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (622,550);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (618,550);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (574,550);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,550);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (643,550);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,550);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (560,550);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (558,550);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (504,551);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,551);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,551);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (515,551);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (516,551);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,551);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (524,551);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,551);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (504,552);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (515,552);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (504,553);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (515,553);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (504,554);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (619,554);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,554);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (515,554);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (620,554);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (504,555);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (515,555);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (543,555);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (598,555);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (504,556);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (619,556);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,556);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (515,556);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (620,556);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (504,557);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (515,557);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (529,557);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (649,557);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (504,558);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (506,558);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (515,558);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (523,558);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (554,558);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (504,559);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (515,559);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (504,560);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,560);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (511,560);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (539,560);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (614,560);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (504,561);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (515,561);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (504,562);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (515,562);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (691,562);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (579,562);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (677,562);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (679,562);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (581,562);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (583,562);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (506,563);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (686,563);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (642,563);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (506,564);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,564);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,564);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (688,564);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (578,564);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (579,564);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (675,564);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (678,564);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (679,564);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (580,564);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (581,564);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (582,564);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (583,564);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (506,565);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (688,565);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (506,566);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,566);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,566);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (603,566);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (600,566);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (604,566);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (697,566);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (696,566);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (695,566);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (688,566);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (578,566);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (579,566);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (552,566);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (617,566);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (622,566);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,566);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (675,566);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (678,566);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (679,566);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (580,566);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (581,566);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (582,566);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (583,566);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (506,567);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,567);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,567);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (506,568);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (567,568);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (506,569);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (506,570);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,570);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (571,570);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (572,570);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (691,570);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (573,570);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (640,570);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (641,570);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (666,570);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (506,571);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,571);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (523,571);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (506,572);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (506,573);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (613,573);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (506,574);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (561,574);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (562,574);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (566,574);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (563,574);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (565,574);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (564,574);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (560,574);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (570,574);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (506,575);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (618,575);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (516,575);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (619,575);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (523,575);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (620,575);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,575);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (621,575);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (506,576);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (516,576);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (523,576);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (507,576);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (619,576);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (517,576);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (620,576);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (524,576);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (621,576);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (552,576);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (622,576);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (507,577);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (518,577);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (517,577);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (531,577);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (530,577);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,577);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (650,577);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (669,577);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (670,577);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (524,577);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (508,578);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (519,578);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (508,579);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (519,579);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (532,579);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (518,578);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (532,578);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (531,578);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,578);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (651,578);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (670,578);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (671,578);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,579);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (520,579);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,580);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,581);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,582);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (622,582);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (696,582);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (695,582);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (694,582);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,583);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (520,580);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (533,580);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,581);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,582);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,583);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,583);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (523,583);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,584);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,585);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,585);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,586);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (574,586);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,586);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,586);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,587);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (623,587);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,587);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,588);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (623,583);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (697,583);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (696,583);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (695,583);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,584);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (511,584);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,584);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (524,584);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,585);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,586);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,586);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,587);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,587);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,587);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,587);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,588);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (624,588);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,588);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,589);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,590);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,590);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (548,590);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,590);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (644,590);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (645,590);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,591);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,591);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,592);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,592);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (696,592);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (695,592);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (694,592);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (688,592);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,593);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,593);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,594);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (519,594);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,594);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (548,594);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,595);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,595);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,596);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,596);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,597);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,597);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,598);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,588);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,589);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (625,589);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,589);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,590);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,591);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,591);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (549,591);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,591);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (645,591);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (646,591);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,592);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,592);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,593);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,593);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (697,593);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (696,593);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (695,593);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (689,593);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,594);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,594);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,595);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (520,595);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,595);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (549,595);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,596);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,596);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,597);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,597);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,598);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (585,598);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (526,598);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (528,598);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (531,598);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (628,598);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (529,598);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (586,598);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (530,598);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (620,598);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,598);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (527,598);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (532,598);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (533,598);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (534,598);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (535,598);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (536,598);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (611,598);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (537,598);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,599);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,598);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,599);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,599);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (523,599);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (511,599);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (586,599);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (527,599);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (529,599);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (532,599);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (629,599);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (530,599);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (587,599);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (531,599);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (621,599);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (611,599);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (528,599);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (533,599);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (534,599);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (535,599);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (687,599);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,599);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (657,599);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,600);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,601);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,601);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (543,601);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,602);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (519,602);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,602);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (536,599);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (537,599);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (612,599);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (538,599);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,600);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (511,600);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,600);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (524,600);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (536,600);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (688,600);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,600);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (658,600);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,601);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,602);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,602);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,603);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (515,603);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,603);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,604);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (544,604);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (548,604);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,605);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,605);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,606);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (515,606);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,606);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,607);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,607);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (664,607);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,608);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,608);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,609);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,609);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,609);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (687,609);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (566,609);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (567,609);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,609);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,610);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,610);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,611);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,611);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,612);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,613);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (625,613);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,614);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,614);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,615);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (515,615);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,615);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,616);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (686,616);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,616);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (541,616);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (545,616);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (553,616);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (548,616);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (689,616);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (550,616);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,616);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,617);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,618);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,618);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (519,618);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,618);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (616,618);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (579,618);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (580,618);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,619);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,620);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,621);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,622);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,623);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (626,623);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,624);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,624);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,625);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (515,625);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (520,625);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (533,625);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,626);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (544,602);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,603);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (520,603);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,603);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (523,603);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,604);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (516,604);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,604);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,605);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (545,605);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (549,605);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,606);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,606);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,607);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (516,607);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,607);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,608);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,608);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (665,608);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,609);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,609);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,610);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,610);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,610);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (688,610);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (567,610);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (568,610);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (552,610);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,611);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,611);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,612);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,612);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,613);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,614);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (626,614);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,615);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,615);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,616);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (516,616);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,616);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,617);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (687,617);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,617);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (542,617);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (546,617);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (554,617);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (549,617);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (690,617);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,617);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (552,617);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,618);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,619);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,619);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (520,619);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,619);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (617,619);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (580,619);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (581,619);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,620);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,621);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,622);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,623);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,624);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (627,624);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,625);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,625);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,626);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (516,626);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,626);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,627);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,627);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,628);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,628);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,629);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (534,626);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,627);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,627);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,628);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,628);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,629);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (523,629);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (535,629);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,630);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (619,630);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,631);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (555,631);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (554,631);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,632);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,633);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (623,633);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (509,634);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (515,634);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,634);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,629);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,630);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (511,630);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (524,630);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (536,630);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,631);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (620,631);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,632);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (556,632);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (555,632);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,633);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,634);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (624,634);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,635);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (523,635);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,636);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (523,636);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,637);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (574,637);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,637);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (570,637);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (571,637);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (565,637);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (564,637);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (563,637);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (616,637);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,638);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (523,638);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (603,638);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (535,638);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (510,639);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (523,639);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (516,635);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,635);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (511,636);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (524,636);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (511,637);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (524,637);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (511,638);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,638);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,638);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (571,638);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (572,638);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (566,638);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (565,638);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (564,638);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (617,638);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (511,639);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (524,639);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (604,639);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (536,639);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (511,640);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (525,640);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (537,640);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,641);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (524,640);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (512,641);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (514,641);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,641);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (513,641);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (520,641);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,641);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (526,641);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (528,641);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (628,641);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,641);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (527,641);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (532,641);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (533,641);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (534,641);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (611,641);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (537,641);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (691,641);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (538,641);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,642);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (513,642);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (515,642);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,642);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (514,642);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (514,643);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (514,644);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (514,645);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,642);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,642);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (527,642);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (529,642);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (629,642);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (611,642);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (528,642);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (533,642);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (534,642);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (535,642);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (612,642);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (538,642);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (692,642);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (515,643);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (515,644);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (515,645);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (515,646);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (519,647);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (519,648);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (519,649);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (519,650);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (519,651);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (516,647);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (520,648);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (520,649);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (520,650);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (520,651);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (520,652);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (520,653);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (520,654);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (520,655);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (520,656);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (533,656);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (619,657);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (520,657);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (533,657);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,653);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,654);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,655);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,656);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,657);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (534,657);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (620,658);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,658);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,658);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,659);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,660);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (534,660);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (537,660);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (534,658);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,659);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (523,659);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,660);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,661);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,662);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,663);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (548,663);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,664);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (541,664);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,661);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (535,661);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (538,661);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (523,661);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,662);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,663);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,664);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,665);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,666);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,667);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,667);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (644,667);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (645,667);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (671,667);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (681,667);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,668);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,669);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,670);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,671);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,672);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,673);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,674);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,675);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,676);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (549,664);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,665);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (542,665);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (523,665);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,666);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,667);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,668);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,668);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (645,668);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (646,668);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (672,668);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (682,668);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,669);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,670);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,671);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,672);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,673);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,674);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,675);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,676);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (612,676);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,677);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (521,678);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (534,679);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (537,679);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,677);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (523,677);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (613,677);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,678);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,679);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (522,680);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (545,680);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,680);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (557,680);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (535,680);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (538,680);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (523,680);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (523,681);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (523,682);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (523,683);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (523,684);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (523,685);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (553,685);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (698,685);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (546,681);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (552,681);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (558,681);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (524,682);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (524,683);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (524,684);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (524,685);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (524,686);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (536,686);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,686);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (534,687);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (540,688);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (554,686);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (699,686);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (525,687);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (537,687);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,687);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (535,688);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (541,689);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (543,689);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (555,689);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,689);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (641,689);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (674,689);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (556,689);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (557,689);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (558,689);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (541,690);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (545,690);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (548,690);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (549,690);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (567,690);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (550,690);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (542,690);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (544,690);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (556,690);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (552,690);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (642,690);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (675,690);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (557,690);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (623,691);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (541,691);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (626,691);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (541,692);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (584,692);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (553,692);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (663,692);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (541,693);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (543,693);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (644,693);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (645,693);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (558,690);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (559,690);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (542,691);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (546,691);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (549,691);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (550,691);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (568,691);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,691);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (558,691);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (624,692);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (542,692);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (627,692);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (542,693);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (585,693);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (554,693);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (664,693);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (557,693);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (598,694);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (543,694);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (603,695);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (543,695);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (543,696);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (543,697);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (543,698);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (601,698);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,698);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (666,698);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (543,699);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (545,700);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (547,700);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (550,700);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (545,701);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (545,702);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,702);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (545,703);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (553,703);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (548,703);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (689,703);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (549,703);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,703);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (557,703);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (545,704);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (689,704);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (555,704);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (542,694);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (544,694);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (645,694);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (646,694);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (665,694);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (558,694);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (599,695);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (544,695);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (604,696);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (544,696);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (544,697);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (544,698);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (544,699);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (602,699);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,699);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (667,699);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (544,700);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (546,701);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (548,701);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,701);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (546,702);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (546,703);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (552,703);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (546,704);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (554,704);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (549,704);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (690,704);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (550,704);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,704);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (545,705);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (558,705);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (696,706);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (695,706);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (694,706);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (545,706);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (552,704);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (558,704);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (546,705);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (690,705);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (556,705);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,705);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (552,705);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (546,706);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (555,706);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (550,706);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,706);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (548,707);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (549,707);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (548,708);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (548,709);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (548,710);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,710);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (644,710);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (645,710);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (548,711);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (559,706);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (697,707);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (696,707);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (695,707);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (546,707);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (547,707);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (556,707);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,707);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (552,707);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (549,708);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (550,708);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (549,709);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (549,710);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (549,711);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (548,712);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,711);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (645,711);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (646,711);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (549,712);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (548,713);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (689,713);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (622,714);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (687,714);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (548,714);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (550,712);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (549,713);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (550,713);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (549,714);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (567,714);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (625,714);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (626,714);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (548,715);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (548,716);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (548,717);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,718);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,718);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (690,714);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (623,715);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (688,715);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (549,715);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (550,715);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (568,715);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (626,715);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (627,715);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (549,716);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (549,717);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (549,718);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (549,719);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,720);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (686,720);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (612,720);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (689,720);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,720);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (578,720);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (614,720);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,720);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (615,720);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (617,720);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (554,720);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,721);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,721);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (612,721);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (553,721);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (567,721);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,721);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,722);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,723);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,724);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (553,725);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,725);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,726);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,727);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,728);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,729);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,730);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,731);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,732);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,733);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,734);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (553,735);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (551,735);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,719);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,719);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (550,719);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (550,720);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,721);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (687,721);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (613,721);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (690,721);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (578,721);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (579,721);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (615,721);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (552,721);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (616,721);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (618,721);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (555,721);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,722);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,722);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (613,722);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (554,722);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (568,722);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (552,722);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (552,723);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (552,724);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (552,725);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (554,726);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (552,726);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (552,727);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (552,728);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (552,729);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (552,730);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (552,731);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (552,732);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (552,733);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (552,734);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (552,735);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (554,736);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (552,736);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (553,737);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (618,738);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (620,738);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (553,738);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (553,739);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (553,740);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (553,741);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (560,742);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (561,742);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (562,742);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (559,742);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (560,743);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (587,743);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (554,738);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (619,739);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (621,739);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (554,739);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (554,740);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (554,741);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (554,742);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (561,743);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (562,743);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (559,743);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (569,743);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (560,744);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (563,743);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (560,743);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (561,744);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (588,744);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (562,744);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (559,744);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (560,745);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (563,744);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (560,744);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (570,744);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (561,745);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (562,745);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (559,745);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (569,745);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (560,746);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (563,745);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (560,745);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (561,746);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (562,746);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (559,746);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (569,746);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (560,747);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (563,746);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (560,746);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (570,746);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (561,747);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (565,747);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (562,747);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (564,747);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (563,747);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (559,747);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (569,747);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (560,748);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (560,747);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (570,747);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (561,748);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (562,748);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (559,748);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (569,748);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (560,749);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (566,748);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (563,748);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (565,748);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (564,748);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (560,748);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (570,748);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (561,749);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (562,749);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (579,749);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (580,749);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (559,749);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (569,749);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (560,750);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (563,749);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (560,749);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (570,749);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (561,750);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (562,750);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (568,750);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (559,750);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (560,751);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (563,750);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (580,750);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (581,750);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (560,750);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (570,750);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (561,751);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (562,751);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (559,751);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (560,752);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (563,751);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (569,751);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (560,751);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (561,752);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (567,752);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (562,752);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (568,752);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (559,752);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (569,752);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (565,753);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (564,753);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (563,752);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (560,752);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (561,753);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (562,753);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (568,753);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (563,753);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (569,753);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (560,753);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (570,753);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (566,754);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,755);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,755);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (566,755);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (565,754);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (564,754);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (567,755);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (687,756);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,756);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,756);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (567,756);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,756);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (666,756);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (681,756);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (568,756);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (688,757);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (568,757);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (634,758);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (568,758);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (679,758);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (683,758);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (568,759);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (568,760);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (568,761);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (568,762);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (634,763);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (568,763);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (679,763);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (683,763);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (568,764);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (585,765);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (586,765);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (583,765);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,757);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (667,757);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (682,757);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (569,758);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (635,759);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (569,759);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (680,759);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (684,759);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (569,760);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (569,761);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (569,762);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (569,763);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (635,764);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (569,764);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (680,764);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (684,764);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (569,765);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (569,766);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (569,767);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (586,766);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (587,766);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (584,766);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (570,766);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (570,767);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (570,768);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (571,768);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (687,769);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (570,769);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (571,769);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,769);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,769);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (640,769);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (570,770);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (572,769);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (688,770);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (571,770);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (690,771);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (572,770);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,770);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (640,770);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (641,770);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (571,771);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (572,771);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (691,771);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,771);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (578,771);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (691,772);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (573,772);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (692,772);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (578,772);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (579,772);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (574,773);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,773);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (574,774);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,774);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (574,775);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (574,776);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (574,777);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (574,778);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (574,779);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (574,780);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (574,781);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (574,782);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (574,783);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (574,784);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (574,785);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (574,786);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (574,787);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (574,788);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (574,789);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (574,790);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (574,791);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (574,792);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (574,793);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (574,794);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (574,795);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (574,796);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (574,797);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (574,798);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,798);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (574,799);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,799);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (574,800);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,800);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (574,801);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,801);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,774);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,774);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,775);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,775);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,776);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,777);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,778);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,779);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,780);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,781);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,782);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,783);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,784);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,785);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,786);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,787);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,788);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,789);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,790);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,791);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,792);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,793);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,794);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,795);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,796);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,797);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,798);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,799);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,799);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,800);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,800);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,801);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,801);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,802);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,803);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,804);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,805);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,806);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,807);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,808);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,809);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (575,810);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,802);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,803);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,804);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,805);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,806);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,807);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,808);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,809);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,810);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (612,810);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,811);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,812);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,813);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,814);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,815);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,816);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,817);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,818);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,819);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,820);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,821);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,822);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,823);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,824);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,825);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,826);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,827);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,828);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,829);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,830);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,831);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,832);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,833);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (576,834);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (690,835);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,811);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (613,811);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,812);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,813);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,814);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,815);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,816);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,817);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,818);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,819);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,820);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,821);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,822);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,823);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,824);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,825);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,826);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,827);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,828);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,829);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,830);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,831);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,832);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,833);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,834);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (577,835);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (677,835);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (579,835);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (581,835);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (579,836);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (691,836);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (578,836);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (678,836);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (580,836);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (579,837);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (582,836);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (580,837);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (581,837);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (582,837);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (579,838);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (580,838);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (579,839);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (581,838);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (582,838);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (583,838);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (580,839);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (579,840);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (581,839);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (580,840);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (579,841);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (581,840);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (580,841);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (579,842);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (581,841);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (580,842);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (581,842);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (582,842);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (580,843);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (581,843);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (582,843);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (584,844);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (612,844);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (583,843);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (582,844);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (583,844);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (585,845);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (586,845);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (602,846);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (599,846);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (603,846);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (589,846);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (591,847);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (613,845);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (586,846);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (587,846);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (603,847);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (600,847);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (604,847);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (590,847);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (592,848);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (593,849);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (594,850);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (595,851);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (596,852);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (597,853);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (599,854);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (598,854);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (600,855);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (602,856);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (601,856);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (603,857);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (603,858);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (604,858);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (604,859);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (605,859);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (606,859);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (604,860);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (605,860);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (606,860);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (604,861);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,860);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (605,861);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (606,861);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (604,862);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,861);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (605,862);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (606,862);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (604,863);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,862);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (605,863);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (606,863);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (604,864);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,863);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (605,864);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (606,864);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (604,865);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,864);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (605,865);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (606,865);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (604,866);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (604,867);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (604,868);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,865);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (605,866);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (606,866);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,866);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (605,867);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (605,868);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (606,868);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (604,869);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (605,869);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (606,869);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (604,870);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (604,871);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (604,872);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,869);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (605,870);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (606,870);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,870);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (605,871);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (605,872);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (606,872);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (604,873);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (605,873);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (606,873);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (604,874);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,873);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (605,874);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (606,874);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,874);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (605,875);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (605,876);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (606,875);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,875);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (606,876);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (606,877);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,877);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,878);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,878);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,879);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,879);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,880);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,880);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,881);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,881);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (616,881);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,882);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,882);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,883);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,883);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,884);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,884);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,885);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,885);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,886);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,886);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,887);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,887);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,888);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,888);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,889);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,889);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,890);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,890);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,891);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (612,891);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (615,891);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (617,891);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,892);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,893);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,893);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,894);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,894);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,895);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,895);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (616,895);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,896);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,896);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,897);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (616,897);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,898);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,898);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,899);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,879);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,879);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,880);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,880);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,881);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,881);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,882);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,882);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (617,882);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,883);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,883);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,884);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,884);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,885);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,885);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,886);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,886);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,887);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,887);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,888);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,888);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,889);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,889);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,890);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,890);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,891);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,891);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,892);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (613,892);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (616,892);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (618,892);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,893);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,894);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,894);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,895);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,895);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,896);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,896);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (617,896);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,897);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,897);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,898);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (617,898);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,899);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,899);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,899);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (612,899);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (615,899);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (617,899);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,900);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,900);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,900);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,901);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,901);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,902);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,902);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (607,903);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (609,903);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (612,904);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (612,905);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (612,906);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (612,907);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (614,907);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (612,908);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (614,908);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (687,909);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (612,909);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (614,909);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (668,909);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (612,910);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (612,911);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (693,911);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (612,912);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (612,913);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (614,914);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (614,915);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (617,916);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,900);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (611,900);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (613,900);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (616,900);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (618,900);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,901);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,901);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,902);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,902);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,903);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,903);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (608,904);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (610,904);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (613,905);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (613,906);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (613,907);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (613,908);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (615,908);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (613,909);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (615,909);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (688,910);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (613,910);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (615,910);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (669,910);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (613,911);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (613,912);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (694,912);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (613,913);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (613,914);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (615,915);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (615,916);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (618,917);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (619,917);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (620,917);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (621,917);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (618,918);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (619,918);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (618,919);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (620,918);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (621,918);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (622,918);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (619,919);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (622,920);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (687,920);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (625,920);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (626,920);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (620,919);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (619,920);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (620,920);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (623,921);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (623,922);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (626,923);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (644,923);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (645,923);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (664,923);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (681,923);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (626,924);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (688,921);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (626,921);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (627,921);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (624,922);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (624,923);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (627,924);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (645,924);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (646,924);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (665,924);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (682,924);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (627,925);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (627,926);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (627,927);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (627,928);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (629,929);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (631,929);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (629,930);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (628,926);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (628,927);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (628,928);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (628,929);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (630,930);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (632,930);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (630,931);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,931);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (632,931);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (631,931);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (631,932);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (632,932);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,932);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (633,932);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (632,933);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (633,933);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (691,934);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (634,934);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (634,935);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (634,936);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (637,937);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (692,935);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (635,935);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (635,936);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (635,937);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,938);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (655,938);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (656,938);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,939);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (658,939);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,940);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,939);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (656,939);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (657,939);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,940);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (659,940);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,941);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (663,941);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (687,942);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,942);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (676,942);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,943);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,944);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (657,944);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,945);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (671,945);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,946);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (655,946);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (656,946);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,947);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,941);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (660,941);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,942);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (664,942);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (688,943);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,943);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (677,943);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,944);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,945);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (658,945);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,946);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (672,946);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (641,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (642,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (643,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (644,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (646,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (648,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (649,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (650,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (647,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (651,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (653,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (655,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (657,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (658,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (659,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (660,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (645,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (661,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (662,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (663,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (664,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (640,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (665,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (666,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (667,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (668,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (669,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (670,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (671,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (672,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (673,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (674,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (677,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (675,947);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (656,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (676,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (678,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (679,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (680,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (681,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (682,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (683,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (684,947);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (687,948);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,948);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (657,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (657,947);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (640,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (642,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (643,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (644,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (645,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (647,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (649,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (650,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (651,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (648,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (652,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (654,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (656,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (658,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (659,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (660,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (661,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (646,948);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (662,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (663,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (664,948);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (665,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (641,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (666,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (667,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (668,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (669,948);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (670,948);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (677,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (671,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (672,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (673,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (674,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (675,948);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (678,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (676,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (657,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (677,948);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (679,948);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (680,948);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,949);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (682,949);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,950);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (681,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (682,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (683,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (684,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (685,948);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (688,949);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,949);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (658,949);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (663,949);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (666,949);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (671,949);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (678,949);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (679,949);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (680,949);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (681,949);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,950);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (683,950);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (638,951);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,951);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (684,951);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (641,952);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (660,952);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (674,952);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (658,953);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (661,954);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (669,954);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (667,955);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (672,956);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (639,952);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (685,952);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (642,953);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (661,953);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (675,953);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (659,954);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (662,955);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (670,955);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (668,956);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (673,957);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (674,958);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (675,959);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (686,960);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (689,960);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (676,960);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (687,961);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (687,962);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (687,963);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (687,964);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (687,965);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (687,966);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (687,967);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (690,961);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (688,962);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (688,963);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (688,964);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (688,965);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (688,966);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (688,967);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (688,968);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (689,969);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (692,970);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (696,971);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (695,971);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (694,971);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (690,970);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (693,971);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (697,972);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (696,972);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (695,972);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (694,972);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (697,973);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (696,973);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (695,973);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (694,973);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (697,974);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (696,974);
 INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (695,974);
-INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (694,974);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (697,975);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (696,975);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (695,975);
 
 
 COMMIT;
diff -Nru mysql-8.0-8.0.26/scripts/mysqlclient.pc.in mysql-8.0-8.0.27/scripts/mysqlclient.pc.in
--- mysql-8.0-8.0.26/scripts/mysqlclient.pc.in	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/scripts/mysqlclient.pc.in	2021-09-28 11:46:34.000000000 +0000
@@ -29,5 +29,5 @@
 Version: @LIBMYSQL_OS_SHLIB_VERSION@
 Cflags: -I${includedir} @CFLAGS@
 Libs: -L${libdir}@RPATH_OPTION_PC@ -l@LIBMYSQL_OS_OUTPUT_NAME@
-Libs.private: @QUOTED_CMAKE_CXX_LINK_FLAGS@ @CONFIG_LIBS_PRIVATE@
+Libs.private: @CONFIG_LIBS_PRIVATE@
 Requires.private: @CONFIG_REQUIRES_PRIVATE@
diff -Nru mysql-8.0-8.0.26/scripts/mysql_config.sh mysql-8.0-8.0.27/scripts/mysql_config.sh
--- mysql-8.0-8.0.26/scripts/mysql_config.sh	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/scripts/mysql_config.sh	2021-09-28 11:46:34.000000000 +0000
@@ -117,7 +117,7 @@
 fi
 
 # Create options 
-libs="@QUOTED_CMAKE_CXX_LINK_FLAGS@-L$pkglibdir@RPATH_OPTION@"
+libs="-L$pkglibdir@RPATH_OPTION@"
 libs="$libs -l@LIBMYSQL_OS_OUTPUT_NAME@ @CONFIG_CLIENT_LIBS@"
 
 cflags="-I$pkgincludedir @CFLAGS@"
diff -Nru mysql-8.0-8.0.26/scripts/mysql_system_tables_data_fix.sql mysql-8.0-8.0.27/scripts/mysql_system_tables_data_fix.sql
--- mysql-8.0-8.0.26/scripts/mysql_system_tables_data_fix.sql	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/scripts/mysql_system_tables_data_fix.sql	2021-09-28 11:46:34.000000000 +0000
@@ -5190,5 +5190,6 @@
 
 START TRANSACTION;
 INSERT IGNORE INTO mysql.replication_group_member_actions (name, event, enabled, type, priority, error_handling) VALUES ("mysql_disable_super_read_only_if_primary", "AFTER_PRIMARY_ELECTION", 1, "INTERNAL", 1, "IGNORE");
+INSERT IGNORE INTO mysql.replication_group_member_actions (name, event, enabled, type, priority, error_handling) VALUES ("mysql_start_failover_channels_if_primary", "AFTER_PRIMARY_ELECTION", 1, "INTERNAL", 10, "CRITICAL");
 INSERT IGNORE INTO mysql.replication_group_configuration_version (name, version) VALUES ("replication_group_member_actions", 1);
 COMMIT;
diff -Nru mysql-8.0-8.0.26/scripts/mysql_system_tables_data.sql mysql-8.0-8.0.27/scripts/mysql_system_tables_data.sql
--- mysql-8.0-8.0.26/scripts/mysql_system_tables_data.sql	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/scripts/mysql_system_tables_data.sql	2021-09-28 11:46:34.000000000 +0000
@@ -5184,5 +5184,6 @@
 
 START TRANSACTION;
 INSERT INTO mysql.replication_group_member_actions (name, event, enabled, type, priority, error_handling) VALUES ("mysql_disable_super_read_only_if_primary", "AFTER_PRIMARY_ELECTION", 1, "INTERNAL", 1, "IGNORE");
+INSERT INTO mysql.replication_group_member_actions (name, event, enabled, type, priority, error_handling) VALUES ("mysql_start_failover_channels_if_primary", "AFTER_PRIMARY_ELECTION", 1, "INTERNAL", 10, "CRITICAL");
 INSERT INTO mysql.replication_group_configuration_version (name, version) VALUES ("replication_group_member_actions", 1);
 COMMIT;
diff -Nru mysql-8.0-8.0.26/scripts/mysql_system_tables_fix.sql mysql-8.0-8.0.27/scripts/mysql_system_tables_fix.sql
--- mysql-8.0-8.0.26/scripts/mysql_system_tables_fix.sql	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/scripts/mysql_system_tables_fix.sql	2021-09-28 11:46:34.000000000 +0000
@@ -795,6 +795,20 @@
 FROM mysql.user WHERE select_priv = 'Y' AND @hadShowRoutinePriv = 0 AND user NOT IN ('mysql.infoschema','mysql.session','mysql.sys');
 COMMIT;
 
+-- Add the privilege AUTHENTICATION_POLICY_ADMIN for every user who has the SYSTEM_VARIABLES_ADMIN privilege
+-- provided that there isn't a user who already has the privilege AUTHENTICATION_POLICY_ADMIN.
+SET @hadAuthenticationPolicyAdminPriv = (SELECT COUNT(*) FROM global_grants WHERE priv = 'AUTHENTICATION_POLICY_ADMIN');
+INSERT INTO global_grants SELECT mu.user, mu.host, 'AUTHENTICATION_POLICY_ADMIN', IF(grant_priv = 'Y', 'Y', 'N')
+FROM mysql.user mu, global_grants gg WHERE mu.user = gg.user AND gg.priv = 'SYSTEM_VARIABLES_ADMIN' AND @hadAuthenticationPolicyAdminPriv = 0;
+COMMIT;
+
+-- Add the privilege PASSWORDLESS_USER_ADMIN for every user who has the privilege CREATE USER
+-- provided that there isn't a user who already has the privilege PASSWORDLESS_USER_ADMIN.
+SET @hadPasswordlessUserAdminPriv = (SELECT COUNT(*) FROM global_grants WHERE priv = 'PASSWORDLESS_USER_ADMIN');
+INSERT INTO global_grants SELECT user, host, 'PASSWORDLESS_USER_ADMIN', IF(grant_priv = 'Y', 'Y', 'N')
+FROM mysql.user WHERE Create_user_priv = 'Y' AND @hadPasswordlessUserAdminPriv = 0;
+COMMIT;
+
 # Activate the new, possible modified privilege tables
 # This should not be needed, but gives us some extra testing that the above
 # changes was correct
@@ -852,6 +866,8 @@
 
 ALTER TABLE slave_master_info ADD Source_connection_auto_failover BOOLEAN NOT NULL DEFAULT FALSE COMMENT 'Indicates whether the channel connection failover is enabled.';
 
+ALTER TABLE slave_master_info ADD Gtid_only BOOLEAN NOT NULL DEFAULT FALSE COMMENT 'Indicates if this channel only uses GTIDs and does not persist positions.';
+
 -- This would add the Managed_name column to
 -- replication_asynchronous_connection_failover table on upgrade from older
 -- mysql version.
diff -Nru mysql-8.0-8.0.26/scripts/mysql_system_tables.sql mysql-8.0-8.0.27/scripts/mysql_system_tables.sql
--- mysql-8.0-8.0.26/scripts/mysql_system_tables.sql	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/scripts/mysql_system_tables.sql	2021-09-28 11:46:34.000000000 +0000
@@ -389,6 +389,7 @@
   Master_zstd_compression_level INTEGER UNSIGNED NOT NULL COMMENT 'Compression level associated with zstd compression algorithm.',
   Tls_ciphersuites TEXT CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL COMMENT 'Ciphersuites used for TLS 1.3 communication with the master server.',
   Source_connection_auto_failover BOOLEAN NOT NULL DEFAULT FALSE COMMENT 'Indicates whether the channel connection failover is enabled.',
+  Gtid_only BOOLEAN NOT NULL DEFAULT FALSE COMMENT 'Indicates if this channel only uses GTIDs and does not persist positions.',
   PRIMARY KEY(Channel_name)) DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT 'Master Information'";
 
 SET @str=IF(@have_innodb <> 0, CONCAT(@cmd, ' ENGINE= INNODB ROW_FORMAT=DYNAMIC TABLESPACE=mysql ENCRYPTION=\'', @is_mysql_encrypted,'\''), CONCAT(@cmd, ' ENGINE= MYISAM'));
diff -Nru mysql-8.0-8.0.26/share/messages_to_clients.txt mysql-8.0-8.0.27/share/messages_to_clients.txt
--- mysql-8.0-8.0.26/share/messages_to_clients.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/share/messages_to_clients.txt	2021-09-28 11:46:34.000000000 +0000
@@ -7700,7 +7700,7 @@
   eng "Cannot create index on virtual column whose base column has foreign constraint."
 
 ER_ERROR_ON_MODIFYING_GTID_EXECUTED_TABLE
-  eng "Please do not modify the %s table with an XA transaction. This is an internal system table used to store GTIDs for committed transactions. Although modifying it can lead to an inconsistent GTID state, if neccessary you can modify it with a non-XA transaction."
+  eng "Please do not modify the %s table with an XA transaction. This is an internal system table used to store GTIDs for committed transactions. Although modifying it can lead to an inconsistent GTID state, if necessary you can modify it with a non-XA transaction."
 
 ER_LOCK_REFUSED_BY_ENGINE
   eng "Lock acquisition refused by storage engine."
@@ -9441,7 +9441,7 @@
 ER_DA_CANT_OPEN_ERROR_LOG
   eng "Could not open file '%s' for error logging%s%s"
 
-ER_USER_REFERENCED_AS_DEFINER  
+ER_USER_REFERENCED_AS_DEFINER
   eng "User %.256s is referenced as a definer account in %s."
 
 ER_CANNOT_USER_REFERENCED_AS_DEFINER
@@ -9583,6 +9583,75 @@
 ER_WARN_AUDIT_LOG_FORMAT_UNIX_TIMESTAMP_ONLY_WHEN_JSON
   eng "audit_log_format_unix_timestamp is applicable only when audit_log_format = JSON."
 
+ER_INVALID_MFA_PLUGIN_SPECIFIED
+  eng "Invalid plugin \"%s\" specified as %d factor during \"%s\"."D
+
+ER_IDENTIFIED_BY_UNSUPPORTED
+  eng "IDENTIFIED BY clause during \"%s\" not supported for plugin \"%s\"."
+
+ER_INVALID_PLUGIN_FOR_REGISTRATION
+  eng "This operation is not supported for plugin \"%s\"."
+
+ER_PLUGIN_REQUIRES_REGISTRATION
+  eng "Authentication plugin requires registration. Please refer ALTER USER syntax or set --fido-register-factor command line option to do registration."
+
+ER_MFA_METHOD_EXISTS
+  eng "%d factor authentication method exists. Please do ALTER USER... DROP %d factor before doing this operation OR do ALTER USER... MODIFY %d factor... to modify existing %d factor authentication method."
+
+ER_MFA_METHOD_NOT_EXISTS
+  eng "%d factor authentication method doesn't exist. Please do ALTER USER... ADD %d factor... before doing this operation."
+
+ER_AUTHENTICATION_POLICY_MISMATCH
+  eng "%d factor authentication method does not match against authentication policy. Please refer @@authentication_policy system variable."
+
+ER_PLUGIN_REGISTRATION_DONE
+  eng "The registration for %d factor authentication method is already completed. You cannot perform registration multiple times."
+
+ER_INVALID_USER_FOR_REGISTRATION
+  eng "The registration operation is not allowed for user '%s'@'%s'. The operation can only be performed in user's own session."
+
+ER_USER_REGISTRATION_FAILED
+  eng "Authentication plugin's registration failed."
+
+ER_MFA_METHODS_INVALID_ORDER
+  eng "%d factor authentication method should be added before %d factor authentication method."
+
+ER_MFA_METHODS_IDENTICAL
+  eng "Authentication factor should be different."
+
+ER_INVALID_MFA_OPERATIONS_FOR_PASSWORDLESS_USER
+  eng "The operation \"%s\" cannot be performed for user '%s'@'%s' configured to connect without a password."
+
+ER_CHANGE_REPLICATION_SOURCE_NO_OPTIONS_FOR_GTID_ONLY
+  eng "GTID_ONLY cannot be enabled for replication channel '%.192s'. You need GTID_MODE = ON, SOURCE_AUTO_POSITION = 1 and REQUIRE_ROW_FORMAT = 1."
+
+ER_CHANGE_REP_SOURCE_CANT_DISABLE_REQ_ROW_FORMAT_WITH_GTID_ONLY
+  eng "REQUIRE_ROW_FORMAT cannot be disabled for replication channel '%.192s' when GTID_ONLY=1."
+
+ER_CHANGE_REP_SOURCE_CANT_DISABLE_AUTO_POSITION_WITH_GTID_ONLY
+  eng "SOURCE_AUTO_POSITION cannot be disabled for replication channel '%.192s' when GTID_ONLY=1."
+
+ER_CHANGE_REP_SOURCE_CANT_DISABLE_GTID_ONLY_WITHOUT_POSITIONS
+  eng "When disabling GTID_ONLY and SOURCE_AUTO_POSITION FOR CHANNEL '%.192s' you must provide SOURCE_LOG_FILE and SOURCE_LOG_POS as source positions are invalid."
+
+ER_CHANGE_REP_SOURCE_CANT_DISABLE_AUTO_POS_WITHOUT_POSITIONS
+  eng "When disabling SOURCE_AUTO_POSITION FOR CHANNEL '%.192s' you must provide SOURCE_LOG_FILE and SOURCE_LOG_POS as source positions are invalid."
+
+ER_CHANGE_REP_SOURCE_GR_CHANNEL_WITH_GTID_MODE_NOT_ON
+  eng "When configuring a group replication channel you must do it when GTID_MODE = ON."
+
+ER_CANT_USE_GTID_ONLY_WITH_GTID_MODE_NOT_ON
+  eng "Replication cannot start%.192s with GTID_ONLY = 1 as this server uses @@GLOBAL.GTID_MODE <> ON."
+
+ER_WARN_C_DISABLE_GTID_ONLY_WITH_SOURCE_AUTO_POS_INVALID_POS
+  eng "The replication positions relative to the source may be out-of-date on channel '%.192s', due to the use of GTID_ONLY=1. The out-of-date positions can still be used in some cases so, in order to update them, we suggest that you start the replication to receive and apply at least one transaction, which will set the positions to valid values."
+
+ER_DA_SSL_FIPS_MODE_ERROR
+  eng "SSL fips mode error: %s"
+
+ER_VALUE_OUT_OF_RANGE
+  eng "%s=%llu is outside the valid range [%llu,%llu]. %llu will be used."
+
 #
 #  End of 8.0 error messages (server-to-client).
 #  Do NOT add messages intended for the error log above!
diff -Nru mysql-8.0-8.0.26/share/messages_to_error_log.txt mysql-8.0-8.0.27/share/messages_to_error_log.txt
--- mysql-8.0-8.0.26/share/messages_to_error_log.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/share/messages_to_error_log.txt	2021-09-28 11:46:34.000000000 +0000
@@ -4484,7 +4484,7 @@
 ER_GRP_RPL_RECEIVED_SET_MISSING_GTIDS
   eng "There was an error when filling the missing GTIDs on the applier channel received set. Despite not critical, on the long run this may cause performance issues."
 
-ER_GRP_RPL_SKIP_COMPUTATION_TRANS_COMMITTED
+OBSOLETE_ER_GRP_RPL_SKIP_COMPUTATION_TRANS_COMMITTED
   eng "Skipping the computation of the Transactions_committed_all_members field as an older instance of this computation is still ongoing."
 
 ER_GRP_RPL_NULL_PACKET
@@ -4607,7 +4607,7 @@
 ER_GRP_RPL_MEMBER_ALREADY_EXISTS
   eng "There is already a member with server_uuid %s. The member will now exit the group."
 
-ER_GRP_RPL_GRP_CHANGE_INFO_EXTRACT_ERROR
+OBSOLETE_ER_GRP_RPL_GRP_CHANGE_INFO_EXTRACT_ERROR
   eng "Error when extracting information for group change. Operations and checks made to group joiners may be incomplete."
 
 ER_GRP_RPL_GTID_EXECUTED_EXTRACT_ERROR
@@ -5139,7 +5139,7 @@
   eng "group_replication_force_members can only be updated when Group Replication is running and a majority of the members are unreachable"
 
 ER_GRP_RPL_GRP_COMMUNICATION_INIT_WITH_CONF
-  eng "Initialized group communication with configuration: group_replication_group_name: '%s'; group_replication_local_address: '%s'; group_replication_group_seeds: '%s'; group_replication_bootstrap_group: '%s'; group_replication_poll_spin_loops: %lu; group_replication_compression_threshold: %lu; group_replication_ip_allowlist: '%s'; group_replication_communication_debug_options: '%s'; group_replication_member_expel_timeout: '%lu'; group_replication_communication_max_message_size: %lu; group_replication_message_cache_size: '%luu'"
+  eng "Initialized group communication with configuration: group_replication_group_name: '%s'; group_replication_local_address: '%s'; group_replication_group_seeds: '%s'; group_replication_bootstrap_group: '%s'; group_replication_poll_spin_loops: %lu; group_replication_compression_threshold: %lu; group_replication_ip_allowlist: '%s'; group_replication_communication_debug_options: '%s'; group_replication_member_expel_timeout: '%lu'; group_replication_communication_max_message_size: %lu; group_replication_message_cache_size: '%luu; group_replication_communication_stack: '%lu'"
 
 ER_GRP_RPL_UNKNOWN_GRP_RPL_APPLIER_PIPELINE_REQUESTED
   eng "Unknown group replication applier pipeline requested"
@@ -11404,6 +11404,159 @@
 ER_PREPARE_FOR_PRIMARY_ENGINE
   eng "Retry the statement using the primary storage engine."
 
+ER_IB_MSG_PAR_RSEG_INIT_COMPLETE_MSG
+  eng "Parallel initialization of rseg complete"
+
+ER_IB_MSG_PAR_RSEG_INIT_TIME_MSG
+  eng "Time taken to initialize rseg using %u thread: %u ms."
+
+ER_DDL_MSG_1
+  eng "DDL failed to create a thread to load an index, fall back to single thread"
+
+ER_MTR_MSG_1
+  eng "Debug_check_no_latching failed, slot->type=%d"
+
+ER_GRP_RPL_MYSQL_NETWORK_PROVIDER_CLIENT_ERROR_CONN_ERR
+  eng "Failed to establish MySQL client connection in Group Replication. Error establishing connection. Please refer to the manual to make sure that you configured Group Replication properly to work with MySQL Protocol connections."
+
+ER_GRP_RPL_MYSQL_NETWORK_PROVIDER_CLIENT_ERROR_COMMAND_ERR
+  eng "Failed to establish MySQL client connection in Group Replication. Error sending connection delegation command. Please refer to the manual to make sure that you configured Group Replication properly to work with MySQL Protocol connections."
+
+ER_GRP_RPL_FAILOVER_CONF_GET_EXCHANGEABLE_DATA
+  eng "Unable to read the replication failover channels configuration during group membership change. Please check the tables 'mysql.replication_asynchronous_connection_failover', 'mysql.replication_asynchronous_connection_failover_managed' and 'mysql.replication_group_configuration_version'."
+
+ER_GRP_RPL_FAILOVER_CONF_DEFAULT_CONFIGURATION
+  eng "This member joined a group on which all members do not support replication failover channels integration on Group Replication, as such it did reset its replication failover channels configuration to the default one."
+
+ER_GRP_RPL_FAILOVER_CONF_UNABLE_TO_SET_DEFAULT_CONFIGURATION
+  eng "Unable to reset to replication failover channels default configuration on member join. Please check the tables 'mysql.replication_asynchronous_connection_failover', 'mysql.replication_asynchronous_connection_failover_managed' and 'mysql.replication_group_configuration_version'."
+
+ER_GRP_RPL_FAILOVER_CONF_PARSE_ON_MEMBER_JOIN
+  eng "Unable to parse the replication failover channels configuration sent by the group on member join."
+
+ER_GRP_RPL_FAILOVER_CONF_CHANNEL_DOES_NOT_EXIST
+  eng "Unable to set SOURCE_CONNECTION_AUTO_FAILOVER on a non-existent or misconfigured replication channel '%s', please create the channel and rejoin the server to the group."
+
+ER_GRP_RPL_FAILOVER_REGISTER_MESSAGE_LISTENER_SERVICE
+  eng "Unable to register the listener 'replication_asynchronous_connection_failover_configuration' to the service 'group_replication_message_service_recv'."
+
+ER_GRP_RPL_FAILOVER_PRIMARY_WITHOUT_MAJORITY
+  eng "This server is not able to reach a majority of members in the group. This server will skip the replication failover channels handling until this server is back to the group majority."
+
+ER_GRP_RPL_FAILOVER_PRIMARY_BACK_TO_MAJORITY
+  eng "This server is back to the group majority. Replication failover channels handling is resumed."
+
+ER_RPL_INCREMENTING_MEMBER_ACTION_VERSION
+  eng "Error incrementing member action configuration version for %s.%s table."
+
+ER_GRP_RPL_SLAVE_THREAD_ERROR_ON_SECONDARY_MEMBER
+  eng "The '%s' thread of channel '%s' will error out as this server is a group secondary."
+
+ER_IB_MSG_CLONE_DDL_NTFN
+  eng "Clone DDL Notification: %s"
+
+ER_IB_MSG_CLONE_DDL_APPLY
+  eng "Clone DDL APPLY: %s"
+
+ER_IB_MSG_CLONE_DDL_INVALIDATE
+  eng "Clone DDL Invalidate : %s"
+
+ER_IB_MSG_UNDO_ENCRYPTION_INFO_LOADED
+  eng "Encryption key is loaded for undo tablespace '%s'."
+
+ER_IB_WRN_ENCRYPTION_INFO_SIZE_MISMATCH
+  eng "Ignoring encryption INFO size in redo log: %zu, expected: %zu"
+
+ER_INVALID_AUTHENTICATION_POLICY
+  eng "Option --authentication-policy is set to an invalid value. Please check if the specified authentication plugins are valid."
+
+ER_AUTHENTICATION_PLUGIN_REGISTRATION_FAILED
+  eng "Signature verification failed during registration."
+
+ER_AUTHENTICATION_PLUGIN_REGISTRATION_INSUFFICIENT_BUFFER
+  eng "Buffer too small to hold registration challenge response."
+
+ER_AUTHENTICATION_PLUGIN_AUTH_DATA_CORRUPT
+  eng "FIDO device authenticator data corrupt."
+
+ER_AUTHENTICATION_PLUGIN_SIGNATURE_CORRUPT
+  eng "FIDO device signature corrupt."
+
+ER_AUTHENTICATION_PLUGIN_VERIFY_SIGNATURE_FAILED
+  eng "Signature verification failed during authentication."
+
+ER_AUTHENTICATION_PLUGIN_OOM
+  eng "Out of memory."
+
+ER_AUTHENTICATION_PLUGIN_LOG
+  eng "Can't initialize logging service".
+
+ER_WARN_REPLICA_GTID_ONLY_AND_GTID_MODE_NOT_ON
+  eng "Replication channel '%.192s' is configured with GTID_ONLY=1, which is invalid when GTID_MODE <> ON. If you intend to disable GTIDs in the replication topology, change GTID_ONLY to 0."
+
+ER_WARN_L_DISABLE_GTID_ONLY_WITH_SOURCE_AUTO_POS_INVALID_POS
+  eng "The replication positions relative to the source may be out-of-date on channel '%.192s', due to the use of GTID_ONLY=1. The out-of-date positions can still be used in some cases so, in order to update them, we suggest that you start the replication to receive and apply at least one transaction, which will set the positions to valid values."
+
+ER_RPL_CANNOT_OPEN_RELAY_LOG
+  eng "Could not open relay log: %s"
+
+ER_AUTHENTICATION_OCI_PLUGIN_NOT_INITIALIZED
+  eng "Authentication plugin not initialized."
+
+ER_AUTHENTICATION_OCI_PRIVATE_KEY_ERROR
+  eng "Cannot use the generated private key file."
+
+ER_AUTHENTICATION_OCI_DOWNLOAD_PUBLIC_KEY
+  eng "Unavailable public key with fingerprint %s for user %s in tenancy %s ."
+
+ER_AUTHENTICATION_OCI_IMDS
+  eng "Cannot obtain the OCI configuration from the IMDS service."
+
+ER_AUTHENTICATION_OCI_IAM
+  eng "Cannot initialize the IAM service."
+
+ER_AUTHENTICATION_OCI_INVALID_AUTHENTICATION_STRING
+  eng "Invalid authentication string details for user: `%s`@`%s`."
+
+ER_AUTHENTICATION_OCI_NO_MATCHING_GROUPS
+  eng "None of the groups returned by IAM matches any of the entries from authentication string."
+
+ER_AUTHENTICATION_OCI_NO_GROUPS_FOUND
+  eng "User is not part of any groups. However, account is configured to use group mapping."
+
+ER_AUTHENTICATION_OCI_NONCE
+  eng "Public/private key mismatch (fingerprint %s) while authenticating user %s in tenancy %s ."
+
+ER_HEALTH_WARNING_MEMORY_USAGE_LEVEL_1
+  eng "%s: Warning Level 1 (%llu MiB): available=%llu MiB, total=%llu MiB, used=%.2f%%, mysqld=%llu MiB"
+
+ER_HEALTH_WARNING_MEMORY_USAGE_LEVEL_2
+  eng "%s: Warning Level 2 (%llu MiB): available=%llu MiB, total=%llu MiB, used=%.2f%%, mysqld=%llu MiB"
+
+ER_HEALTH_WARNING_MEMORY_USAGE_LEVEL_3
+  eng "%s: Warning Level 3 (%llu MiB): available=%llu MiB, total=%llu MiB, used=%.2f%%, mysqld=%llu MiB"
+
+ER_GRP_RPL_SET_SINGLE_CONSENSUS_LEADER
+  eng "The member %s:%u, with UUID: %s, was set as the single preferred consensus leader."
+
+ER_GRP_RPL_ERROR_SET_SINGLE_CONSENSUS_LEADER
+  eng "Something went wrong trying to set the member %s:%u, with UUID: %s, as the single preferred consensus leader. Please query the performance_schema.replication_group_communication_information table to see whether the operation took effect, i.e. whether the preferred consensus leader matches the current primary. If not, consider electing a different primary to try again. Please check the error log and GCS_DEBUG_TRACE for more information that may help understanding what went wrong."
+
+ER_GRP_RPL_SET_MULTI_CONSENSUS_LEADER
+  eng "All members were set as consensus leaders."
+
+ER_GRP_RPL_ERROR_SET_MULTI_CONSENSUS_LEADER
+  eng "Something went wrong trying to set all members as consensus leaders. Please query the performance_schema.replication_group_communication_information table to see whether the operation took effect, i.e. whether the consensus leaders match all members. If not, consider resetting the group communication protocol to a version < 8.0.22, or switch to single-primary mode and back again to multi-primary mode, to try again. Please check the error log and GCS_DEBUG_TRACE for more information that may help understanding what went wrong."
+
+ER_GRP_RPL_PAXOS_SINGLE_LEADER_DIFF_FROM_GRP
+  eng "This member is configured with a group_replication_paxos_single_leader option value of '%d' that is different from the group's value ('%d'). This member will now exit the group."
+
+ER_MFA_USER_ATTRIBUTES_CORRUPT
+  eng "Invalid and/or corrupted multi factor authentication methods in User_attributes column in mysql.user table. \"%s\"."
+
+ER_MFA_PLUGIN_NOT_LOADED
+  eng "Plugin \'%-.192s\' is not loaded; Ignoring user"
+
 # DO NOT add server-to-client messages here;
 # they go in messages_to_clients.txt
 # in the same directory as this file.
diff -Nru mysql-8.0-8.0.26/sql/abstract_query_plan.cc mysql-8.0-8.0.27/sql/abstract_query_plan.cc
--- mysql-8.0-8.0.26/sql/abstract_query_plan.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/abstract_query_plan.cc	2021-09-28 11:46:34.000000000 +0000
@@ -33,7 +33,7 @@
 #include "sql/handler.h"
 #include "sql/item.h"
 #include "sql/key.h"
-#include "sql/opt_range.h"  // QUICK_SELECT_I
+#include "sql/range_optimizer/range_optimizer.h"  // QUICK_SELECT_I
 #include "sql/sql_const.h"
 #include "sql/sql_executor.h"  // QEP_TAB
 #include "sql/sql_opt_exec_shared.h"
@@ -270,11 +270,10 @@
 
           // Temporary assert as we are still investigation the relation between
           // 'quick->index == MAX_KEY' and the different quick_types
-          assert(
-              (quick->index == MAX_KEY) ==
-              ((quick->get_type() == QUICK_SELECT_I::QS_TYPE_INDEX_MERGE) ||
-               (quick->get_type() == QUICK_SELECT_I::QS_TYPE_ROR_INTERSECT) ||
-               (quick->get_type() == QUICK_SELECT_I::QS_TYPE_ROR_UNION)));
+          assert((quick->index == MAX_KEY) ==
+                 (quick->get_type() == QS_TYPE_INDEX_MERGE ||
+                  quick->get_type() == QS_TYPE_ROR_INTERSECT ||
+                  quick->get_type() == QS_TYPE_ROR_UNION));
 
           // JT_INDEX_MERGE: We have a set of qualifying PKs as root of pushed
           // joins
@@ -406,13 +405,6 @@
   const QEP_TAB *qep_tab = get_qep_tab();
   return (qep_tab->get_sj_strategy() == SJ_OPT_FIRST_MATCH);
 }
-int Table_access::get_firstmatch_return() const {
-  const int last_sj_inner = get_last_sj_inner();
-  if (last_sj_inner < 0) return -1;
-
-  const QEP_TAB *last_sj_inner_tab = m_join_plan->get_qep_tab(last_sj_inner);
-  return last_sj_inner_tab->firstmatch_return;
-}
 
 bool Table_access::is_antijoin() const {
   return get_table()->reginfo.not_exists_optimize;
diff -Nru mysql-8.0-8.0.26/sql/abstract_query_plan.h mysql-8.0-8.0.27/sql/abstract_query_plan.h
--- mysql-8.0-8.0.26/sql/abstract_query_plan.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/abstract_query_plan.h	2021-09-28 11:46:34.000000000 +0000
@@ -110,20 +110,20 @@
 */
 class Equal_set_iterator {
  public:
-  explicit Equal_set_iterator(Item_equal &item_equal)
-      : m_iterator(item_equal) {}
-
-  const Item_field *next() { return m_iterator++; }
+  explicit Equal_set_iterator(const Item_equal &item_equal)
+      : m_iterator(item_equal.get_fields().begin()),
+        m_end(item_equal.get_fields().end()) {}
+
+  const Item_field *next() {
+    if (m_iterator == m_end) {
+      return nullptr;
+    } else {
+      return &*m_iterator++;
+    }
+  }
 
  private:
-  /**
-    This class is implemented in terms of this mysqld internal class.
-   */
-  Item_equal_iterator m_iterator;
-
-  // No copying.
-  Equal_set_iterator(const Equal_set_iterator &);
-  Equal_set_iterator &operator=(const Equal_set_iterator &);
+  List_STL_Iterator<const Item_field> m_iterator, m_end;
 };
 // class Equal_set_iterator
 
@@ -208,8 +208,6 @@
 
   // Is member of a firstMatch sj_nest?
   bool is_sj_firstmatch() const;
-  // Get the upper-table we skip out to upon a firstMatch
-  int get_firstmatch_return() const;
 
   bool is_antijoin() const;
 
diff -Nru mysql-8.0-8.0.26/sql/auth/acl_change_notification.h mysql-8.0-8.0.27/sql/auth/acl_change_notification.h
--- mysql-8.0-8.0.26/sql/auth/acl_change_notification.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/auth/acl_change_notification.h	2021-09-28 11:46:34.000000000 +0000
@@ -24,13 +24,16 @@
 #ifndef ACL_CHANGE_NOTIFICATION_INCLUDED
 #define ACL_CHANGE_NOTIFICATION_INCLUDED
 
-#include "my_sqlcommand.h"  // enum_sql_command
-#include "sql/table.h"      // LEX_USER, LEX_CSTRING, List
-
-class Rewrite_params;  // forward declaration
+#include "my_sqlcommand.h"    // enum_sql_command
+#include "sql/sql_rewrite.h"  // User_params
+#include "sql/table.h"        // LEX_USER, LEX_CSTRING, List
 
 class Acl_change_notification {
  public:
+  struct Priv : public std::string {
+    Priv(const LEX_CSTRING &lex_priv)
+        : std::string{lex_priv.str, lex_priv.length} {}
+  };
   struct User {
     std::string name;
     std::string host;
@@ -38,27 +41,29 @@
         : name(lex_user.user.str, lex_user.user.length),
           host(lex_user.host.str, lex_user.host.length) {}
   };
-
-  Acl_change_notification(class THD *thd, enum_sql_command op,
+  Acl_change_notification(THD *thd, enum_sql_command op,
                           const List<LEX_USER> *users,
-                          Rewrite_params *rewrite_params,
+                          std::set<LEX_USER *> *rewrite_params,
                           const List<LEX_CSTRING> *dynamic_privs);
 
  private:
-  enum_sql_command operation;
-  std::string db;
-  std::vector<User> user_list;
-  std::vector<std::string> dynamic_privilege_list;
-  Rewrite_params *rewrite_params;
+  const std::string db;
+  const enum_sql_command operation;
+  const List<LEX_USER> empty_users;
+  const List<LEX_USER> &users;
+  const User_params rewrite_user_params;
+  const List<LEX_CSTRING> empty_dynamic_privs;
+  const List<LEX_CSTRING> &dynamic_privs;
 
  public:
   enum_sql_command get_operation() const { return operation; }
   const std::string &get_db() const { return db; }
-  const std::vector<User> &get_user_list() const { return user_list; }
-  const std::vector<std::string> &get_dynamic_privilege_list() const {
-    return dynamic_privilege_list;
+  auto &get_user_list() const { return users; }
+  auto &get_dynamic_privilege_list() const { return dynamic_privs; }
+  const User_params *get_rewrite_params() const {
+    if (rewrite_user_params.users == nullptr) return nullptr;
+    return &rewrite_user_params;
   }
-  Rewrite_params *get_rewrite_params() const { return rewrite_params; }
 };
 
 #endif
diff -Nru mysql-8.0-8.0.26/sql/auth/acl_table_user.cc mysql-8.0-8.0.27/sql/auth/acl_table_user.cc
--- mysql-8.0-8.0.26/sql/auth/acl_table_user.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/auth/acl_table_user.cc	2021-09-28 11:46:34.000000000 +0000
@@ -110,6 +110,9 @@
 /** comment tag */
 const std::string json_comment_tag("comment");
 
+/** multi factor authentication methods */
+const std::string json_multi_factor_authentication(
+    "multi_factor_authentication");
 }  // namespace consts
 
 bool replace_user_metadata(THD *thd, const std::string &json_blob,
@@ -124,7 +127,9 @@
         {User_attribute_type::RESTRICTIONS, consts::Restrictions},
         {User_attribute_type::PASSWORD_LOCKING, consts::Password_locking},
         {User_attribute_type::METADATA, consts::json_metadata_tag},
-        {User_attribute_type::COMMENT, consts::json_comment_tag}};
+        {User_attribute_type::COMMENT, consts::json_comment_tag},
+        {User_attribute_type::MULTI_FACTOR_AUTHENTICATION_DATA,
+         consts::json_multi_factor_authentication}};
 
 Acl_user_attributes::Acl_user_attributes(MEM_ROOT *mem_root,
                                          bool read_restrictions,
@@ -136,14 +141,17 @@
       m_restrictions(),
       m_global_privs(global_privs),
       m_password_lock(),
+      m_mfa(nullptr),
       m_user_attributes_json(nullptr) {}
 
 Acl_user_attributes::Acl_user_attributes(MEM_ROOT *mem_root,
                                          bool read_restrictions,
                                          Auth_id &auth_id,
-                                         Restrictions *restrictions)
+                                         Restrictions *restrictions,
+                                         I_multi_factor_auth *mfa)
     : Acl_user_attributes(mem_root, read_restrictions, auth_id, ~NO_ACCESS) {
   if (restrictions) m_restrictions = *restrictions;
+  m_mfa = mfa;
 }
 
 Acl_user_attributes::~Acl_user_attributes() { m_restrictions.clear_db(); }
@@ -202,6 +210,29 @@
   db_restrictions.remove(0);
 }
 
+bool Acl_user_attributes::deserialize_multi_factor(
+    const Json_object &json_object) {
+  Json_dom *mfa = json_object.get(
+      attribute_type_to_str
+          [User_attribute_type::MULTI_FACTOR_AUTHENTICATION_DATA]);
+  if (mfa) {
+    if (mfa->json_type() != enum_json_type::J_ARRAY) return true;
+    Json_array *mfa_arr = down_cast<Json_array *>(mfa);
+    I_multi_factor_auth *i_mfa =
+        (mfa_arr->size() ? new (&global_acl_memory)
+                               Multi_factor_auth_list(&global_acl_memory)
+                         : nullptr);
+    for (uint i = 0; i < mfa_arr->size(); i++) {
+      i_mfa->add_factor(new (&global_acl_memory)
+                            Multi_factor_auth_info(&global_acl_memory));
+      Json_dom *mfa_arr_obj = (*mfa_arr)[i];
+      if (i_mfa->deserialize(i, mfa_arr_obj)) return true;
+    }
+    set_mfa(i_mfa);
+  }
+  return false;
+}
+
 bool Acl_user_attributes::deserialize_password_lock(
     const Json_object &json_object) {
   /* password locking */
@@ -277,7 +308,10 @@
     m_restrictions.set_db(db_restrictions);
   }
 
-  return deserialize_password_lock(json_object);
+  if (deserialize_password_lock(json_object)) return true;
+  if (deserialize_multi_factor(json_object)) return true;
+
+  return false;
 }
 
 bool Acl_user_attributes::serialize(Json_object &json_object) const {
@@ -321,7 +355,14 @@
     Json_object *obj = down_cast<Json_object *>(m_user_attributes_json.get());
     obj->remove(attribute_type_to_str[User_attribute_type::PASSWORD_LOCKING]);
   }
-
+  if (m_mfa) {
+    Json_array mfa_arr;
+    if (m_mfa->serialize(mfa_arr)) return true;
+    json_object.add_clone(
+        attribute_type_to_str
+            [User_attribute_type::MULTI_FACTOR_AUTHENTICATION_DATA],
+        &mfa_arr);
+  }
   if (m_user_attributes_json) {
     Json_dom_ptr copy_attributes = m_user_attributes_json->clone();
     Json_object_ptr tmp(down_cast<Json_object *>(copy_attributes.release()));
@@ -400,7 +441,8 @@
       password_change_timestamp(consts::BEGIN_TIMESTAMP),
       second_cred(consts::empty_string),
       restrictions(),
-      password_lock() {}
+      password_lock(),
+      multi_factor(nullptr) {}
 
 /**
   mysql.user table writer constructor
@@ -415,11 +457,13 @@
   @param [in] can_create_user  Whether user has ability to create new user
   @param [in] what_to_update   Things to be updated
   @param [in] restrictions     Restrictions of the user, if there is any
+  @param [in] mfa              Interface pointer to Multi factor authentication
+  methods
 */
 Acl_table_user_writer::Acl_table_user_writer(
     THD *thd, TABLE *table, LEX_USER *combo, ulong rights, bool revoke_grant,
     bool can_create_user, Pod_user_what_to_update what_to_update,
-    Restrictions *restrictions = nullptr)
+    Restrictions *restrictions = nullptr, I_multi_factor_auth *mfa = nullptr)
     : Acl_table(thd, table, acl_table::Acl_table_operation::OP_INSERT),
       m_has_user_application_user_metadata(false),
       m_combo(combo),
@@ -428,7 +472,8 @@
       m_can_create_user(can_create_user),
       m_what_to_update(what_to_update),
       m_table_schema(nullptr),
-      m_restrictions(restrictions) {
+      m_restrictions(restrictions),
+      m_mfa(mfa) {
   if (table) {
     User_table_schema_factory user_table_schema_factory;
     m_table_schema = user_table_schema_factory.get_user_table_schema(table);
@@ -483,6 +528,14 @@
       (m_what_to_update.m_user_attributes & USER_ATTRIBUTE_RETAIN_PASSWORD))
     current_password = get_current_credentials();
 
+  /*
+    Set in memory copy of Multi factor authentication details. In case ALTER
+    USER is executed to alter Multi factor authentication attributes,
+    update_user_attributes call will modify the needed data structures, else in
+    case of GRANT/REVOKE in memory copy is returned.
+  */
+  if (m_mfa) return_value.multi_factor = m_mfa;
+
   if (update_authentication_info(return_value) ||
       update_privileges(return_value) || update_ssl_properties() ||
       update_user_attributes(current_password, return_value) ||
@@ -581,8 +634,10 @@
           return true;
         }
 
-        optimize_plugin_compare_by_pointer(&m_combo->plugin);
-        builtin_plugin = auth_plugin_is_built_in(m_combo->plugin.str);
+        optimize_plugin_compare_by_pointer(
+            &m_combo->first_factor_auth_info.plugin);
+        builtin_plugin =
+            auth_plugin_is_built_in(m_combo->first_factor_auth_info.plugin.str);
 
         /* The user record was neither present nor the intention was to
          * create it */
@@ -739,10 +794,12 @@
     bool builtin_plugin;
     if (m_table->s->fields >= m_table_schema->plugin_idx()) {
       m_table->field[m_table_schema->plugin_idx()]->store(
-          m_combo->plugin.str, m_combo->plugin.length, system_charset_info);
+          m_combo->first_factor_auth_info.plugin.str,
+          m_combo->first_factor_auth_info.plugin.length, system_charset_info);
       m_table->field[m_table_schema->plugin_idx()]->set_notnull();
       m_table->field[m_table_schema->authentication_string_idx()]->store(
-          m_combo->auth.str, m_combo->auth.length, &my_charset_utf8_bin);
+          m_combo->first_factor_auth_info.auth.str,
+          m_combo->first_factor_auth_info.auth.length, &my_charset_utf8_bin);
       m_table->field[m_table_schema->authentication_string_idx()]
           ->set_notnull();
     } else {
@@ -750,8 +807,9 @@
       return true;
     }
     /* If we change user plugin then check if it is builtin plugin */
-    optimize_plugin_compare_by_pointer(&m_combo->plugin);
-    builtin_plugin = auth_plugin_is_built_in(m_combo->plugin.str);
+    optimize_plugin_compare_by_pointer(&m_combo->first_factor_auth_info.plugin);
+    builtin_plugin =
+        auth_plugin_is_built_in(m_combo->first_factor_auth_info.plugin.str);
     /*
       we update the password last changed field whenever there is change
       in auth str and plugin is built in
@@ -1129,7 +1187,7 @@
       Acl_user_attributes user_attributes(
           m_thd->mem_root,
           !(m_what_to_update.m_user_attributes & USER_ATTRIBUTE_RESTRICTIONS),
-          auth_id, m_restrictions);
+          auth_id, m_restrictions, m_mfa);
       if (m_operation == Acl_table_operation::OP_UPDATE &&
           parse_user_attributes(m_thd, m_table, m_table_schema,
                                 user_attributes))
@@ -1172,6 +1230,13 @@
             m_combo->alter_status.password_lock_time;
       user_attributes.set_password_lock(return_value.password_lock);
 
+      if (m_what_to_update.m_user_attributes & USER_ATTRIBUTE_UPDATE_MFA) {
+        user_attributes.set_mfa(m_mfa);
+        if (m_mfa) {
+          if (user_attributes.get_mfa()->update_user_attributes()) return true;
+        }
+      }
+      return_value.multi_factor = user_attributes.get_mfa();
       /* Update the column in the table */
       if (write_user_attributes_column(user_attributes)) return true;
 
@@ -1186,7 +1251,7 @@
     }
   }
   return false;
-}
+}  // namespace acl_table
 
 /**
   Send the function for updating the user metadata JSON code
@@ -1287,7 +1352,7 @@
 Acl_table_user_reader::~Acl_table_user_reader() {
   if (m_table_schema) delete m_table_schema;
   if (m_restrictions) delete m_restrictions;
-  free_root(&m_mem_root, MYF(0));
+  m_mem_root.Clear();
 }
 
 /**
@@ -1317,7 +1382,7 @@
 */
 bool Acl_table_user_reader::setup_table(bool &is_old_db_layout) {
   DBUG_TRACE;
-  m_iterator = init_table_iterator(m_thd, m_table, nullptr,
+  m_iterator = init_table_iterator(m_thd, m_table,
                                    /*ignore_not_found_rows=*/false,
                                    /*count_examined_rows=*/false);
   if (m_iterator == nullptr) return true;
@@ -1856,6 +1921,7 @@
                                       MYSQL_AUTHENTICATION_PLUGIN);
       if (plugin) {
         st_mysql_auth *auth = (st_mysql_auth *)plugin_decl(plugin)->info;
+
         if (auth->validate_authentication_string(
                 const_cast<char *>(
                     user.credentials[SECOND_CRED].m_auth_string.str),
@@ -1876,6 +1942,9 @@
     user.password_locked_state.set_parameters(
         user_attributes.get_password_lock_time_days(),
         user_attributes.get_failed_login_attempts());
+    // details of Multi factor authentication user attributes
+    I_multi_factor_auth *m = user_attributes.get_mfa();
+    user.set_mfa(nullptr, m);
   } else {
     user.credentials[SECOND_CRED].m_auth_string = EMPTY_CSTR;
   }
@@ -1919,12 +1988,13 @@
   password_life.password_lock_time =
       user.password_locked_state.get_password_lock_time_days();
   password_life.update_password_lock_time = true;
+
   acl_users_add_one(user.user, user.host.get_host(), user.ssl_type,
                     user.ssl_cipher, user.x509_issuer, user.x509_subject,
                     &user.user_resource, user.access, user.plugin, auth,
                     second_auth, user.password_last_changed, password_life,
                     false, *m_restrictions, password_life.failed_login_attempts,
-                    password_life.password_lock_time, m_thd);
+                    password_life.password_lock_time, user.m_mfa, m_thd);
 }
 
 /**
@@ -2032,6 +2102,7 @@
   std::swap(password_lock_time_days, other.password_lock_time_days);
   std::swap(failed_login_attempts, other.failed_login_attempts);
 }
+
 }  // namespace acl_table
 
 /**
@@ -2046,6 +2117,8 @@
   @param [in] what_to_update   Bitmap indicating which attributes need to be
                                updated.
   @param [in] restrictions     Restrictions handle if there is any
+  @param [in] mfa              Interface pointer to Multi factor authentication
+  methods
 
   @return  Operation result
   @retval  0    OK.
@@ -2057,10 +2130,12 @@
 int replace_user_table(THD *thd, TABLE *table, LEX_USER *combo, ulong rights,
                        bool revoke_grant, bool can_create_user,
                        acl_table::Pod_user_what_to_update &what_to_update,
-                       Restrictions *restrictions /*= nullptr*/) {
-  acl_table::Acl_table_user_writer user_table(thd, table, combo, rights,
-                                              revoke_grant, can_create_user,
-                                              what_to_update, restrictions);
+                       Restrictions *restrictions /*= nullptr*/,
+                       I_multi_factor_auth *mfa /*= nullptr*/) {
+  acl_table::Acl_table_user_writer user_table(
+      thd, table, combo, rights, revoke_grant, can_create_user, what_to_update,
+      restrictions, mfa);
+
   LEX *lex = thd->lex;
   if (lex->alter_user_attribute !=
       enum_alter_user_attribute::ALTER_USER_COMMENT_NOT_USED) {
@@ -2090,7 +2165,8 @@
   if (!(return_value.error || return_value.skip_cache_update)) {
     bool old_row_exists = (user_table.get_operation_mode() ==
                            acl_table::Acl_table_operation::OP_UPDATE);
-    bool builtin_plugin = auth_plugin_is_built_in(combo->plugin.str);
+    bool builtin_plugin =
+        auth_plugin_is_built_in(combo->first_factor_auth_info.plugin.str);
     bool update_password = (what_to_update.m_what & PLUGIN_ATTR);
 
     /*
@@ -2107,22 +2183,25 @@
       password_change_time.time_type = MYSQL_TIMESTAMP_ERROR;
     clear_and_init_db_cache(); /* Clear privilege cache */
     if (old_row_exists) {
-      acl_update_user(combo->user.str, combo->host.str, lex->ssl_type,
-                      lex->ssl_cipher, lex->x509_issuer, lex->x509_subject,
-                      &lex->mqh, return_value.updated_rights, combo->plugin,
-                      combo->auth, return_value.second_cred,
-                      password_change_time, combo->alter_status,
-                      return_value.restrictions, what_to_update,
-                      return_value.password_lock.failed_login_attempts,
-                      return_value.password_lock.password_lock_time_days);
+      acl_update_user(
+          combo->user.str, combo->host.str, lex->ssl_type, lex->ssl_cipher,
+          lex->x509_issuer, lex->x509_subject, &lex->mqh,
+          return_value.updated_rights, combo->first_factor_auth_info.plugin,
+          combo->first_factor_auth_info.auth, return_value.second_cred,
+          password_change_time, combo->alter_status, return_value.restrictions,
+          what_to_update, return_value.password_lock.failed_login_attempts,
+          return_value.password_lock.password_lock_time_days,
+          return_value.multi_factor);
     } else
       acl_insert_user(thd, combo->user.str, combo->host.str, lex->ssl_type,
                       lex->ssl_cipher, lex->x509_issuer, lex->x509_subject,
-                      &lex->mqh, return_value.updated_rights, combo->plugin,
-                      combo->auth, password_change_time, combo->alter_status,
-                      return_value.restrictions,
+                      &lex->mqh, return_value.updated_rights,
+                      combo->first_factor_auth_info.plugin,
+                      combo->first_factor_auth_info.auth, password_change_time,
+                      combo->alter_status, return_value.restrictions,
                       return_value.password_lock.failed_login_attempts,
-                      return_value.password_lock.password_lock_time_days);
+                      return_value.password_lock.password_lock_time_days,
+                      return_value.multi_factor);
   }
   return return_value.error;
 }
@@ -2277,10 +2356,9 @@
 bool read_user_application_user_metadata_from_table(
     const LEX_CSTRING user, const LEX_CSTRING host, String *metadata_str,
     TABLE *table, bool mode_no_backslash_escapes) {
-  MEM_ROOT tmp_mem;
+  MEM_ROOT tmp_mem(PSI_NOT_INSTRUMENTED, 256);
   char null_token[5] = {'n', 'u', 'l', 'l', '\0'};
   uchar user_key[MAX_KEY_LENGTH];
-  init_alloc_root(PSI_NOT_INSTRUMENTED, &tmp_mem, 256, 0);
   if (table->file->ha_index_init(0, false)) {
     my_error(ER_TABLE_CORRUPT, MYF(0), table->s->db.str,
              table->s->table_name.str);
diff -Nru mysql-8.0-8.0.26/sql/auth/acl_table_user.h mysql-8.0-8.0.27/sql/auth/acl_table_user.h
--- mysql-8.0-8.0.26/sql/auth/acl_table_user.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/auth/acl_table_user.h	2021-09-28 11:46:34.000000000 +0000
@@ -38,6 +38,7 @@
 #include "my_alloc.h"
 #include "sql/auth/acl_table_base.h"
 #include "sql/auth/partial_revokes.h"
+#include "sql/auth/sql_mfa.h" /* I_multi_factor_auth */
 #include "sql/auth/user_table.h"
 #include "sql/json_dom.h"
 
@@ -54,7 +55,8 @@
   RESTRICTIONS,
   PASSWORD_LOCKING,
   METADATA,
-  COMMENT
+  COMMENT,
+  MULTI_FACTOR_AUTHENTICATION_DATA
 };
 
 struct Password_lock {
@@ -91,7 +93,8 @@
                       Auth_id &auth_id, ulong global_privs);
 
   Acl_user_attributes(MEM_ROOT *mem_root, bool read_restrictions,
-                      Auth_id &auth_id, Restrictions *m_restrictions);
+                      Auth_id &auth_id, Restrictions *m_restrictions,
+                      I_multi_factor_auth *mfa);
 
   ~Acl_user_attributes();
 
@@ -161,6 +164,9 @@
     m_password_lock = password_lock;
   }
 
+  I_multi_factor_auth *get_mfa() { return m_mfa; }
+  void set_mfa(I_multi_factor_auth *mfa) { m_mfa = mfa; }
+
   /**
     Take over ownership of the json pointer.
     @return Error state
@@ -174,6 +180,7 @@
       DB_restrictions &db_restrictions, ulong mask, enum loglevel level,
       ulonglong errcode);
   bool deserialize_password_lock(const Json_object &json_object);
+  bool deserialize_multi_factor(const Json_object &json_object);
 
  private:
   /** Mem root */
@@ -190,6 +197,8 @@
   ulong m_global_privs;
   /** password locking */
   Password_lock m_password_lock;
+  /** multi factor auth info */
+  I_multi_factor_auth *m_mfa;
   /** Save the original json object */
   Json_dom_ptr m_user_attributes_json;
 };
@@ -207,14 +216,16 @@
   Acl_table_user_writer_status();
   Acl_table_user_writer_status(bool skip, ulong rights, Table_op_error_code err,
                                struct timeval pwd_timestamp, std::string cred,
-                               Password_lock &password_lock)
+                               Password_lock &password_lock,
+                               I_multi_factor_auth *multi_factor)
       : skip_cache_update(skip),
         updated_rights(rights),
         error(err),
         password_change_timestamp(pwd_timestamp),
         second_cred(cred),
         restrictions(),
-        password_lock(password_lock) {}
+        password_lock(password_lock),
+        multi_factor(multi_factor) {}
 
   bool skip_cache_update;
   ulong updated_rights;
@@ -223,6 +234,7 @@
   std::string second_cred;
   Restrictions restrictions;
   Password_lock password_lock;
+  I_multi_factor_auth *multi_factor;
 };
 
 class Acl_table_user_writer : public Acl_table {
@@ -230,7 +242,7 @@
   Acl_table_user_writer(THD *thd, TABLE *table, LEX_USER *combo, ulong rights,
                         bool revoke_grant, bool can_create_user,
                         Pod_user_what_to_update what_to_update,
-                        Restrictions *restrictions);
+                        Restrictions *restrictions, I_multi_factor_auth *mfa);
   ~Acl_table_user_writer() override;
   Acl_table_op_status finish_operation(Table_op_error_code &error) override;
   Acl_table_user_writer_status driver();
@@ -266,6 +278,7 @@
   Pod_user_what_to_update m_what_to_update;
   User_table_schema *m_table_schema;
   Restrictions *m_restrictions;
+  I_multi_factor_auth *m_mfa;
   std::function<bool(TABLE *table)> m_user_application_user_metadata;
 };
 
diff -Nru mysql-8.0-8.0.26/sql/auth/auth_common.cc mysql-8.0-8.0.27/sql/auth/auth_common.cc
--- mysql-8.0-8.0.26/sql/auth/auth_common.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/auth/auth_common.cc	2021-09-28 11:46:34.000000000 +0000
@@ -168,4 +168,4 @@
     thd->set_system_user(sctx->has_global_grant(consts::system_user.c_str(),
                                                 consts::system_user.length())
                              .first);
-}
+}
\ No newline at end of file
diff -Nru mysql-8.0-8.0.26/sql/auth/auth_common.h mysql-8.0-8.0.27/sql/auth/auth_common.h
--- mysql-8.0-8.0.26/sql/auth/auth_common.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/auth/auth_common.h	2021-09-28 11:46:34.000000000 +0000
@@ -762,6 +762,8 @@
 bool check_acl_tables_intact(THD *thd, TABLE_LIST *tables);
 void notify_flush_event(THD *thd);
 bool wildcard_db_grant_exists();
+void append_auth_id_string(const THD *thd, const char *user, size_t user_len,
+                           const char *host, size_t host_len, String *str);
 
 /* sql_authorization */
 bool skip_grant_tables();
@@ -1097,11 +1099,21 @@
 static constexpr int USER_HOST_BUFF_SIZE =
     HOSTNAME_LENGTH + USERNAME_LENGTH + 2;
 
+struct random_password_info {
+  std::string user;
+  std::string host;
+  std::string password;
+  unsigned int authentication_factor;
+};
+
 void generate_random_password(std::string *password, uint32_t);
-typedef std::list<std::vector<std::string>> Userhostpassword_list;
+typedef std::list<random_password_info> Userhostpassword_list;
 bool send_password_result_set(THD *thd,
                               const Userhostpassword_list &generated_passwords);
 bool lock_and_get_mandatory_roles(std::vector<Role_id> *mandatory_roles);
 bool mysql_alter_user_comment(THD *thd, const List<LEX_USER> *users,
                               const std::string &json_blob, bool expect_text);
+
+/* helper method to check if sandbox mode should be turned off or not */
+bool turn_off_sandbox_mode(THD *thd, LEX_USER *user);
 #endif /* AUTH_COMMON_INCLUDED */
diff -Nru mysql-8.0-8.0.26/sql/auth/auth_internal.h mysql-8.0-8.0.27/sql/auth/auth_internal.h
--- mysql-8.0-8.0.26/sql/auth/auth_internal.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/auth/auth_internal.h	2021-09-28 11:46:34.000000000 +0000
@@ -34,6 +34,7 @@
 #include "sql/auth/auth_common.h"
 #include "sql/auth/dynamic_privilege_table.h"
 #include "sql/auth/partitioned_rwlock.h"
+#include "sql/auth/sql_mfa.h" /* I_multi_factor_auth */
 #include "sql/auth/user_table.h"
 #include "sql/sql_audit.h"
 #include "sql/table.h"
@@ -138,7 +139,8 @@
                      const MYSQL_TIME &password_change_time,
                      const LEX_ALTER &password_life, Restrictions &restrictions,
                      acl_table::Pod_user_what_to_update &what_to_update,
-                     uint failed_login_attempts, int password_lock_time);
+                     uint failed_login_attempts, int password_lock_time,
+                     const I_multi_factor_auth *mfa);
 void acl_users_add_one(const char *user, const char *host,
                        enum SSL_type ssl_type, const char *ssl_cipher,
                        const char *x509_issuer, const char *x509_subject,
@@ -148,7 +150,8 @@
                        const MYSQL_TIME &password_change_time,
                        const LEX_ALTER &password_life, bool add_role_vertex,
                        Restrictions &restrictions, uint failed_login_attempts,
-                       int password_lock_time, THD *thd MY_ATTRIBUTE((unused)));
+                       int password_lock_time, const I_multi_factor_auth *mfa,
+                       THD *thd [[maybe_unused]]);
 void acl_insert_user(THD *thd, const char *user, const char *host,
                      enum SSL_type ssl_type, const char *ssl_cipher,
                      const char *x509_issuer, const char *x509_subject,
@@ -156,7 +159,8 @@
                      const LEX_CSTRING &plugin, const LEX_CSTRING &auth,
                      const MYSQL_TIME &password_change_time,
                      const LEX_ALTER &password_life, Restrictions &restrictions,
-                     uint failed_login_attempts, int password_lock_time);
+                     uint failed_login_attempts, int password_lock_time,
+                     const I_multi_factor_auth *mfa);
 void acl_update_proxy_user(ACL_PROXY_USER *new_value, bool is_revoke);
 void acl_update_db(const char *user, const char *host, const char *db,
                    ulong privileges);
@@ -173,6 +177,7 @@
 bool grant_reload(THD *thd, bool mdl_locked);
 void clean_user_cache();
 bool set_user_salt(ACL_USER *acl_user);
+void append_auth_id(const THD *thd, ACL_USER *acl_user, String *str);
 
 /* sql_user_table */
 ulong get_access(TABLE *form, uint fieldnr, uint *next_field);
@@ -300,7 +305,8 @@
 bool set_and_validate_user_attributes(
     THD *thd, LEX_USER *Str, acl_table::Pod_user_what_to_update &what_to_set,
     bool is_privileged_user, bool is_role, TABLE_LIST *history_table,
-    bool *history_check_done, const char *cmd, Userhostpassword_list &);
+    bool *history_check_done, const char *cmd, Userhostpassword_list &,
+    I_multi_factor_auth **mfa = nullptr);
 typedef std::pair<std::string, bool> Grant_privilege;
 typedef std::unordered_multimap<const Role_id, Grant_privilege, role_id_hash>
     User_to_dynamic_privileges_map;
diff -Nru mysql-8.0-8.0.26/sql/auth/dynamic_privileges_impl.cc mysql-8.0-8.0.27/sql/auth/dynamic_privileges_impl.cc
--- mysql-8.0-8.0.26/sql/auth/dynamic_privileges_impl.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/auth/dynamic_privileges_impl.cc	2021-09-28 11:46:34.000000000 +0000
@@ -39,7 +39,7 @@
 #include "sql/auth/sql_auth_cache.h"
 #include "sql/auth/sql_security_ctx.h"
 #include "sql/current_thd.h"
-#include "sql/sql_thd_internal_api.h"  // create_thd
+#include "sql/sql_thd_internal_api.h"  // create_internal_thd
 
 class THD;
 
@@ -62,7 +62,7 @@
         without attaching to the Global_THD_manager, and without setting
         an OS thread ID.
       */
-      m_tmp_thd = create_thd(false, true, false, PSI_NOT_INSTRUMENTED);
+      m_tmp_thd = create_internal_thd();
       return m_tmp_thd;
     } else if (m_thd == nullptr) {
       return m_tmp_thd;
@@ -75,7 +75,7 @@
   */
   ~Thd_creator() {
     if (m_thd == nullptr && m_tmp_thd != nullptr) {
-      destroy_thd(m_tmp_thd);
+      destroy_internal_thd(m_tmp_thd);
     }
   }
 
@@ -223,6 +223,12 @@
       ret +=
           service->register_privilege(STRING_WITH_LEN("FLUSH_USER_RESOURCES"));
       ret += service->register_privilege(STRING_WITH_LEN("FLUSH_TABLES"));
+      ret += service->register_privilege(
+          STRING_WITH_LEN("GROUP_REPLICATION_STREAM"));
+      ret += service->register_privilege(
+          STRING_WITH_LEN("AUTHENTICATION_POLICY_ADMIN"));
+      ret += service->register_privilege(
+          STRING_WITH_LEN("PASSWORDLESS_USER_ADMIN"));
     }
   }  // exist scope
   mysql_plugin_registry_release(r);
diff -Nru mysql-8.0-8.0.26/sql/auth/dynamic_privilege_table.cc mysql-8.0-8.0.27/sql/auth/dynamic_privilege_table.cc
--- mysql-8.0-8.0.26/sql/auth/dynamic_privilege_table.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/auth/dynamic_privilege_table.cc	2021-09-28 11:46:34.000000000 +0000
@@ -96,16 +96,16 @@
 
   TABLE *table = tablelst[0].table;
   table->use_all_columns();
-  unique_ptr_destroy_only<RowIterator> iterator = init_table_iterator(
-      thd, table, nullptr,
-      /*ignore_not_found_rows=*/false, /*count_examined_rows=*/false);
+  unique_ptr_destroy_only<RowIterator> iterator =
+      init_table_iterator(thd, table, /*ignore_not_found_rows=*/false,
+                          /*count_examined_rows=*/false);
   if (iterator == nullptr) {
     my_error(ER_TABLE_CORRUPT, MYF(0), table->s->db.str,
              table->s->table_name.str);
     return true;
   }
   int read_rec_errcode;
-  MEM_ROOT tmp_mem;
+  MEM_ROOT tmp_mem(PSI_NOT_INSTRUMENTED, 256);
   char percentile_character[2] = {'%', '\0'};
   char empty_str = '\0';
   /*
@@ -119,7 +119,6 @@
     if (!service.is_valid()) {
       return true;
     }
-    init_alloc_root(PSI_NOT_INSTRUMENTED, &tmp_mem, 256, 0);
     while (!error && !(read_rec_errcode = iterator->Read())) {
       char *host =
           get_field(&tmp_mem, table->field[MYSQL_DYNAMIC_PRIV_FIELD_HOST]);
diff -Nru mysql-8.0-8.0.26/sql/auth/partitioned_rwlock.h mysql-8.0-8.0.27/sql/auth/partitioned_rwlock.h
--- mysql-8.0-8.0.26/sql/auth/partitioned_rwlock.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/auth/partitioned_rwlock.h	2021-09-28 11:46:34.000000000 +0000
@@ -58,7 +58,7 @@
   bool init(uint parts
 #ifdef HAVE_PSI_INTERFACE
             ,
-            PSI_rwlock_key psi_key MY_ATTRIBUTE((unused))
+            PSI_rwlock_key psi_key [[maybe_unused]]
 #endif
   ) {
     m_parts = parts;
diff -Nru mysql-8.0-8.0.26/sql/auth/roles.cc mysql-8.0-8.0.27/sql/auth/roles.cc
--- mysql-8.0-8.0.26/sql/auth/roles.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/auth/roles.cc	2021-09-28 11:46:34.000000000 +0000
@@ -84,7 +84,7 @@
       set_role_status = activate_role_name();
       break;
     case role_enum::ROLE_NONE:
-      // Fall through
+      [[fallthrough]];
     default:
       set_role_status = activate_role_none();
   }
diff -Nru mysql-8.0-8.0.26/sql/auth/role_tables.cc mysql-8.0-8.0.27/sql/auth/role_tables.cc
--- mysql-8.0-8.0.26/sql/auth/role_tables.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/auth/role_tables.cc	2021-09-28 11:46:34.000000000 +0000
@@ -211,7 +211,7 @@
 
   {
     roles_edges_table->use_all_columns();
-    iterator = init_table_iterator(thd, roles_edges_table, nullptr,
+    iterator = init_table_iterator(thd, roles_edges_table,
                                    /*ignore_not_found_rows=*/false,
                                    /*count_examined_rows=*/false);
     if (iterator == nullptr) {
@@ -223,8 +223,7 @@
     ACL_USER *acl_role;
     ACL_USER *acl_user;
     int read_rec_errcode;
-    MEM_ROOT tmp_mem;
-    init_alloc_root(PSI_NOT_INSTRUMENTED, &tmp_mem, 128, 0);
+    MEM_ROOT tmp_mem(PSI_NOT_INSTRUMENTED, 128);
     g_authid_to_vertex->clear();
     g_granted_roles->clear();
     while (!(read_rec_errcode = iterator->Read())) {
@@ -271,7 +270,7 @@
 
     default_role_table->use_all_columns();
 
-    iterator = init_table_iterator(thd, default_role_table, nullptr,
+    iterator = init_table_iterator(thd, default_role_table,
                                    /*ignore_not_found_rows=*/false,
                                    /*count_examined_rows=*/false);
     DBUG_EXECUTE_IF("dbug_fail_in_role_cache_reinit", iterator = nullptr;);
diff -Nru mysql-8.0-8.0.26/sql/auth/service_security_context.cc mysql-8.0-8.0.27/sql/auth/service_security_context.cc
--- mysql-8.0-8.0.26/sql/auth/service_security_context.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/auth/service_security_context.cc	2021-09-28 11:46:34.000000000 +0000
@@ -36,7 +36,7 @@
 #include "sql/current_thd.h"
 #include "sql/protocol_classic.h"
 #include "sql/sql_class.h"
-#include "sql/sql_thd_internal_api.h"  // create_thd
+#include "sql/sql_thd_internal_api.h"  // create_internal_thd
 
 #define MY_SVC_TRUE 1
 #define MY_SVC_FALSE 0
@@ -176,7 +176,7 @@
   THD *tmp_thd = nullptr;
   bool retval;
   if (current_thd == nullptr) {
-    tmp_thd = create_thd(false, true, false, PSI_NOT_INSTRUMENTED);
+    tmp_thd = create_internal_thd();
     if (!tmp_thd) return true;
   }
 
@@ -191,7 +191,7 @@
   if (sctx_thd) set_system_user_flag(sctx_thd);
 
   if (tmp_thd) {
-    destroy_thd(tmp_thd);
+    destroy_internal_thd(tmp_thd);
     tmp_thd = nullptr;
   }
   return retval;
diff -Nru mysql-8.0-8.0.26/sql/auth/sha2_password.cc mysql-8.0-8.0.27/sql/auth/sha2_password.cc
--- mysql-8.0-8.0.26/sql/auth/sha2_password.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/auth/sha2_password.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1194,10 +1194,11 @@
   @returns Always returns success (0)
 */
 
-static int caching_sha2_password_salt(
-    const char *password MY_ATTRIBUTE((unused)),
-    unsigned int password_len MY_ATTRIBUTE((unused)),
-    unsigned char *salt MY_ATTRIBUTE((unused)), unsigned char *salt_len) {
+static int caching_sha2_password_salt(const char *password [[maybe_unused]],
+                                      unsigned int password_len
+                                      [[maybe_unused]],
+                                      unsigned char *salt [[maybe_unused]],
+                                      unsigned char *salt_len) {
   DBUG_TRACE;
   *salt_len = 0;
   return 0;
@@ -1232,8 +1233,7 @@
   @returns Always returns success
 */
 
-static int caching_sha2_authentication_deinit(
-    void *arg MY_ATTRIBUTE((unused))) {
+static int caching_sha2_authentication_deinit(void *arg [[maybe_unused]]) {
   DBUG_TRACE;
   if (g_caching_sha2_password) {
     delete g_caching_sha2_password;
@@ -1305,9 +1305,11 @@
   @param [out] var Status variable structure
   @param [in]  buff Value buffer
 */
-static int show_caching_sha2_password_rsa_public_key(
-    MYSQL_THD thd MY_ATTRIBUTE((unused)), SHOW_VAR *var,
-    char *buff MY_ATTRIBUTE((unused))) {
+static int show_caching_sha2_password_rsa_public_key(MYSQL_THD thd
+                                                     [[maybe_unused]],
+                                                     SHOW_VAR *var,
+                                                     char *buff
+                                                     [[maybe_unused]]) {
   var->type = SHOW_CHAR;
   var->value =
       const_cast<char *>(g_caching_sha2_rsa_keys->get_public_key_as_pem());
@@ -1437,13 +1439,13 @@
     }};
 
 /** Init function for sha2_cache_cleaner */
-static int caching_sha2_cache_cleaner_init(
-    MYSQL_PLUGIN plugin_info MY_ATTRIBUTE((unused))) {
+static int caching_sha2_cache_cleaner_init(MYSQL_PLUGIN plugin_info
+                                           [[maybe_unused]]) {
   return 0;
 }
 
 /** Deinit function for sha2_cache_cleaner */
-static int caching_sha2_cache_cleaner_deinit(void *arg MY_ATTRIBUTE((unused))) {
+static int caching_sha2_cache_cleaner_deinit(void *arg [[maybe_unused]]) {
   return 0;
 }
 
diff -Nru mysql-8.0-8.0.26/sql/auth/sha2_password_common.cc mysql-8.0-8.0.27/sql/auth/sha2_password_common.cc
--- mysql-8.0-8.0.26/sql/auth/sha2_password_common.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/auth/sha2_password_common.cc	2021-09-28 11:46:34.000000000 +0000
@@ -433,9 +433,9 @@
 */
 
 bool validate_sha256_scramble(const unsigned char *scramble,
-                              size_t scramble_size MY_ATTRIBUTE((unused)),
+                              size_t scramble_size [[maybe_unused]],
                               const unsigned char *known,
-                              size_t known_size MY_ATTRIBUTE((unused)),
+                              size_t known_size [[maybe_unused]],
                               const unsigned char *rnd, size_t rnd_size) {
   DBUG_TRACE;
 
diff -Nru mysql-8.0-8.0.26/sql/auth/sql_auth_cache.cc mysql-8.0-8.0.27/sql/auth/sql_auth_cache.cc
--- mysql-8.0-8.0.26/sql/auth/sql_auth_cache.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/auth/sql_auth_cache.cc	2021-09-28 11:46:34.000000000 +0000
@@ -365,6 +365,7 @@
   password_reuse_interval = 0;
   use_default_password_reuse_interval = false;
   password_require_current = Lex_acl_attrib_udyn::DEFAULT;
+  m_mfa = nullptr;
   /* Acl_credentials is initialized by its constructor */
 }
 
@@ -474,6 +475,7 @@
   dst->host.update_hostname(safe_strdup_root(root, host.get_host()));
   dst->password_require_current = password_require_current;
   dst->password_locked_state = password_locked_state;
+  dst->set_mfa(root, m_mfa);
   return dst;
 }
 
@@ -485,6 +487,24 @@
   set_hostname(&host, host_arg, mem);
 }
 
+void ACL_USER::set_mfa(MEM_ROOT *mem, I_multi_factor_auth *m) {
+  if (mem && m) {
+    m_mfa = new (mem) Multi_factor_auth_list(mem);
+    Multi_factor_auth_list *auth_list = m->get_multi_factor_auth_list();
+    /*
+      iterate over list of auth factors and make a new copy of each
+      individual auth factors
+    */
+    for (auto m_it : auth_list->get_mfa_list()) {
+      Multi_factor_auth_info *af = m_it->get_multi_factor_auth_info();
+      m_mfa->add_factor(new (mem)
+                            Multi_factor_auth_info(mem, af->get_lex_mfa()));
+    }
+  } else {
+    m_mfa = m;
+  }
+}
+
 void ACL_PROXY_USER::init(const char *host_arg, const char *user_arg,
                           const char *proxied_host_arg,
                           const char *proxied_user_arg, bool with_grant_arg) {
@@ -583,17 +603,14 @@
                              grant->proxied_host.get_host());
 }
 
-void ACL_PROXY_USER::print_grant(String *str) {
-  str->append(STRING_WITH_LEN("GRANT PROXY ON '"));
-  if (proxied_user) str->append(proxied_user, strlen(proxied_user));
-  str->append(STRING_WITH_LEN("'@'"));
-  if (proxied_host.get_host())
-    str->append(proxied_host.get_host(), strlen(proxied_host.get_host()));
-  str->append(STRING_WITH_LEN("' TO '"));
-  if (user) str->append(user, strlen(user));
-  str->append(STRING_WITH_LEN("'@'"));
-  if (host.get_host()) str->append(host.get_host(), strlen(host.get_host()));
-  str->append(STRING_WITH_LEN("'"));
+void ACL_PROXY_USER::print_grant(THD *thd, String *str) {
+  str->append(STRING_WITH_LEN("GRANT PROXY ON "));
+  append_auth_id_string(thd, proxied_user, get_proxied_user_length(),
+                        proxied_host.get_host(), proxied_host.get_host_len(),
+                        str);
+  str->append(STRING_WITH_LEN(" TO "));
+  append_auth_id_string(thd, user, get_user_length(), host.get_host(),
+                        host.get_host_len(), str);
   if (with_grant) str->append(STRING_WITH_LEN(" WITH GRANT OPTION"));
 }
 
@@ -665,6 +682,38 @@
 }
 
 /**
+  Append the authorization id for the user
+
+  @param [in]       thd     The THD to find the SQL mode
+  @param [in]       user    ACL User to retrieve the user information
+  @param [in, out]  str     The string in which authID is suffixed
+*/
+void append_auth_id(const THD *thd, ACL_USER *acl_user, String *str) {
+  assert(thd);
+  append_auth_id_string(thd, acl_user->user, acl_user->get_username_length(),
+                        acl_user->host.get_host(),
+                        acl_user->host.get_host_len(), str);
+}
+
+/**
+  Append the user@host to the str
+
+  @param [in]       thd      The THD to find the SQL mode
+  @param [in]       user     Username to append to authID
+  @param [in]       user_len Length of Username
+  @param [in]       host     hostname to append to authID
+  @param [in]       host_len Length of hostname
+  @param [in, out]  str      The string in which authID is suffixed
+*/
+void append_auth_id_string(const THD *thd, const char *user, size_t user_len,
+                           const char *host, size_t host_len, String *str) {
+  assert(thd);
+  append_identifier(thd, str, user, user_len);
+  str->append(STRING_WITH_LEN("@"));
+  append_identifier(thd, str, host, host_len);
+}
+
+/**
   Performs wildcard matching, aka globbing, on the input string with
   the given wildcard pattern, and the specified wildcard characters.
   This method does case insensitive comparisons.
@@ -1805,7 +1854,7 @@
   /*
     Prepare reading from the mysql.db table
   */
-  iterator = init_table_iterator(thd, table = tables[1].table, nullptr,
+  iterator = init_table_iterator(thd, table = tables[1].table,
                                  /*ignore_not_found_rows=*/false,
                                  /*count_examined_rows=*/false);
   if (iterator == nullptr) goto end;
@@ -1862,7 +1911,7 @@
   acl_proxy_users->clear();
 
   if (tables[2].table) {
-    iterator = init_table_iterator(thd, table = tables[2].table, nullptr,
+    iterator = init_table_iterator(thd, table = tables[2].table,
                                    /*ignore_not_found_rows=*/false,
                                    /*count_examined_rows=*/false);
     if (iterator == nullptr) goto end;
@@ -1944,7 +1993,7 @@
       acl_cache_initialized = false;
     }
   }
-  free_root(&global_acl_memory, MYF(0));
+  global_acl_memory.Clear();
 }
 
 bool check_engine_type_for_acl_table(THD *thd, bool mdl_locked) {
@@ -2237,7 +2286,7 @@
     delete old_dyn_priv_map;
     // Delete the old role caches
     delete_old_role_cache();
-    free_root(&old_mem, MYF(0));
+    old_mem.Clear();
   }
 
 end:
@@ -2272,7 +2321,7 @@
   column_priv_hash.reset();
   proc_priv_hash.reset();
   func_priv_hash.reset();
-  free_root(&memex, MYF(0));
+  memex.Clear();
 }
 
 /**
@@ -2649,11 +2698,11 @@
                            &tables[2])))) {  // Error. Revert to old hash
       DBUG_PRINT("error", ("Reverting to old privileges"));
       column_priv_hash = move(old_column_priv_hash); /* purecov: deadcode */
-      free_root(&memex, MYF(0));
+      memex.Clear();
       memex = move(old_mem); /* purecov: deadcode */
     } else {                 // Reload successful
       old_column_priv_hash.reset();
-      free_root(&old_mem, MYF(0));
+      old_mem.Clear();
       grant_version++;
       get_global_acl_cache()->increase_version();
     }
@@ -2675,7 +2724,8 @@
                      const MYSQL_TIME &password_change_time,
                      const LEX_ALTER &password_life, Restrictions &restrictions,
                      acl_table::Pod_user_what_to_update &what_to_update,
-                     uint failed_login_attempts, int password_lock_time) {
+                     uint failed_login_attempts, int password_lock_time,
+                     const I_multi_factor_auth *mfa) {
   DBUG_TRACE;
   assert(assert_acl_cache_write_lock(current_thd));
   for (ACL_USER *acl_user = acl_users->begin(); acl_user != acl_users->end();
@@ -2818,7 +2868,8 @@
           acl_user->password_require_current =
               password_life.update_password_require_current;
         }
-
+        /* get details of Multi factor authentication */
+        acl_user->set_mfa(nullptr, const_cast<I_multi_factor_auth *>(mfa));
         /* search complete: */
         break;
       }
@@ -2835,8 +2886,8 @@
                        const MYSQL_TIME &password_change_time,
                        const LEX_ALTER &password_life, bool add_role_vertex,
                        Restrictions &restrictions, uint failed_login_attempts,
-                       int password_lock_time,
-                       THD *thd MY_ATTRIBUTE((unused))) {
+                       int password_lock_time, const I_multi_factor_auth *mfa,
+                       THD *thd [[maybe_unused]]) {
   DBUG_TRACE;
   ACL_USER acl_user;
 
@@ -2924,6 +2975,9 @@
 
   acl_user.password_locked_state.set_parameters(password_lock_time,
                                                 failed_login_attempts);
+  /* get details of Multi factor authentication */
+  acl_user.set_mfa(nullptr, const_cast<I_multi_factor_auth *>(mfa));
+
   acl_users->push_back(acl_user);
   if (acl_user.host.check_allow_all_hosts())
     allow_all_hosts = true;  // Anyone can connect /* purecov: tested */
@@ -2936,7 +2990,7 @@
   }
 }
 
-void acl_insert_user(THD *thd MY_ATTRIBUTE((unused)), const char *user,
+void acl_insert_user(THD *thd [[maybe_unused]], const char *user,
                      const char *host, enum SSL_type ssl_type,
                      const char *ssl_cipher, const char *x509_issuer,
                      const char *x509_subject, USER_RESOURCES *mqh,
@@ -2944,12 +2998,13 @@
                      const LEX_CSTRING &auth,
                      const MYSQL_TIME &password_change_time,
                      const LEX_ALTER &password_life, Restrictions &restrictions,
-                     uint failed_login_attempts, int password_lock_time) {
+                     uint failed_login_attempts, int password_lock_time,
+                     const I_multi_factor_auth *mfa) {
   DBUG_TRACE;
   acl_users_add_one(user, host, ssl_type, ssl_cipher, x509_issuer, x509_subject,
                     mqh, privileges, plugin, auth, EMPTY_CSTR,
                     password_change_time, password_life, true, restrictions,
-                    failed_login_attempts, password_lock_time, thd);
+                    failed_login_attempts, password_lock_time, mfa, thd);
   /*
     acl_users_add_one() has added new entry as the last element in array,
     let us move it to the position which is correct according to sort order.
@@ -3413,11 +3468,11 @@
     @param [in] msg           Message string. Unused.
   */
 
-  bool handle_condition(THD *thd MY_ATTRIBUTE((unused)), uint sql_errno,
-                        const char *sqlstate MY_ATTRIBUTE((unused)),
+  bool handle_condition(THD *thd [[maybe_unused]], uint sql_errno,
+                        const char *sqlstate [[maybe_unused]],
                         Sql_condition::enum_severity_level *level
-                            MY_ATTRIBUTE((unused)),
-                        const char *msg MY_ATTRIBUTE((unused))) override {
+                        [[maybe_unused]],
+                        const char *msg [[maybe_unused]]) override {
     return (sql_errno == ER_LOCK_DEADLOCK ||
             sql_errno == ER_LOCK_WAIT_TIMEOUT ||
             sql_errno == ER_QUERY_INTERRUPTED || sql_errno == ER_QUERY_TIMEOUT);
diff -Nru mysql-8.0-8.0.26/sql/auth/sql_auth_cache.h mysql-8.0-8.0.27/sql/auth/sql_auth_cache.h
--- mysql-8.0-8.0.26/sql/auth/sql_auth_cache.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/auth/sql_auth_cache.h	2021-09-28 11:46:34.000000000 +0000
@@ -304,6 +304,7 @@
 
   void set_user(MEM_ROOT *mem, const char *user_arg);
   void set_host(MEM_ROOT *mem, const char *host_arg);
+  void set_mfa(MEM_ROOT *mem, I_multi_factor_auth *m);
   size_t get_username_length() const { return user ? strlen(user) : 0; }
   class Password_locked_state {
    public:
@@ -341,6 +342,7 @@
     /** The day the account is locked, 0 if not locked */
     long m_daynr_locked;
   } password_locked_state;
+  I_multi_factor_auth *m_mfa;
 };
 
 class ACL_DB : public ACL_ACCESS {
@@ -406,7 +408,7 @@
          (host.get_host() && host_arg && !strcmp(host.get_host(), host_arg))));
   }
 
-  void print_grant(String *str);
+  void print_grant(THD *thd, String *str);
 
   void set_data(ACL_PROXY_USER *grant) { with_grant = grant->with_grant; }
 
@@ -421,6 +423,12 @@
                                const LEX_CSTRING &proxied_host,
                                const LEX_CSTRING &proxied_user, bool with_grant,
                                const char *grantor);
+
+  size_t get_user_length() const { return user ? strlen(user) : 0; }
+
+  size_t get_proxied_user_length() const {
+    return proxied_user ? strlen(proxied_user) : 0;
+  }
 };
 
 class acl_entry {
@@ -487,13 +495,12 @@
   };
 
   template <class U>
-  Acl_cache_allocator(
-      const Acl_cache_allocator<U> &other MY_ATTRIBUTE((unused)))
+  Acl_cache_allocator(const Acl_cache_allocator<U> &other [[maybe_unused]])
       : Malloc_allocator<T>(key_memory_acl_cache) {}
 
   template <class U>
-  Acl_cache_allocator &operator=(
-      const Acl_cache_allocator<U> &other MY_ATTRIBUTE((unused))) {}
+  Acl_cache_allocator &operator=(const Acl_cache_allocator<U> &other
+                                 [[maybe_unused]]) {}
 };
 typedef Acl_cache_allocator<ACL_USER *> Acl_user_ptr_allocator;
 typedef std::list<ACL_USER *, Acl_user_ptr_allocator> Acl_user_ptr_list;
diff -Nru mysql-8.0-8.0.26/sql/auth/sql_authentication.cc mysql-8.0-8.0.27/sql/auth/sql_authentication.cc
--- mysql-8.0-8.0.26/sql/auth/sql_authentication.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/auth/sql_authentication.cc	2021-09-28 11:46:34.000000000 +0000
@@ -154,8 +154,21 @@
   "Authentication method switch" --> [ Client does not know requested auth method ] DISCONNECT
   "Authentication method switch" --> "Authentication exchange continuation"
 
+  "Authentication exchange continuation" --> [ No more factors to authenticate] OK
+  "Authentication exchange continuation" --> ERR
+
+  "Server Response" --> "Authenticate 2nd Factor"
+  "Client Response" --> "Authentication exchange continuation"
+
+  "Authentication exchange continuation" --> [ No more factors to authenticate] OK
+  "Authentication exchange continuation" --> ERR
+
+  "Server Response" --> "Authenticate 3rd Factor"
+  "Client Response" --> "Authentication exchange continuation"
+
   "Authentication exchange continuation" --> OK
   "Authentication exchange continuation" --> ERR
+
   @enduml
 
   @section sect_protocol_connection_phase_initial_handshake Initial Handshake
@@ -627,6 +640,7 @@
   @sa unknown_accounts
   @subpage page_protocol_connection_phase_packets
   @subpage page_protocol_connection_phase_authentication_methods
+  @subpage page_protocol_multi_factor_authentication_methods
 */
 
 
@@ -751,6 +765,7 @@
    @subpage page_caching_sha2_authentication_exchanges
    @subpage page_protocol_connection_phase_authentication_methods_clear_text_password
    @subpage page_protocol_connection_phase_authentication_methods_authentication_windows
+   @subpage page_fido_authentication_exchanges
 */
 
 /**
@@ -782,6 +797,169 @@
   @subpage page_protocol_connection_phase_packets_protocol_old_auth_switch_request
   @subpage page_protocol_connection_phase_packets_protocol_auth_switch_response
   @subpage page_protocol_connection_phase_packets_protocol_auth_more_data
+  @subpage page_protocol_connection_phase_packets_protocol_auth_next_factor_request
+*/
+
+/**
+  @page page_fido_authentication_exchanges authentication_fido information
+
+  @section sect_fido_definition Definition
+  <ul>
+  <li>
+  The server side plugin name is *authentication_fido*
+  </li>
+  <li>
+  The client side plugin name is *authentication_fido_client*
+  </li>
+  <li>
+  Account - user account (user-host combination)
+  </li>
+  <li>
+  authentication_string - Transformation of key handle stored in mysql.user table
+  </li>
+  <li>
+  relying party ID - Unique name assigned to server by authentication_fido plugin
+  </li>
+  <li>
+  FIDO authenticator - A hardware token device
+  </li>
+  <li>
+  Nonce - 32 byte long random data
+  </li>
+  <li>
+  Registration mode - Refers to state of connection where only ALTER USER is allowed
+  to do registration steps.
+  </li>
+  </ul>
+
+  @section sect_fido_info How authentication_fido works?
+
+  Plugin authentication_fido works in two phases.
+  <ul>
+   <li>
+    Registration of hardware token device
+   </li>
+   <li>
+    Authentication process
+   </li>
+  </ul>
+
+  Registration process:
+  This is a 2 step process for a given user account.
+  <ul>
+   <li>
+    Initiate registration step.
+   </li>
+   <li>
+    Finish registration step.
+   </li>
+  </ul>
+
+  Initiate registration:
+  User account created with authentication_fido method should first connect to
+  server and initiate the registration step.
+
+  <ol>
+   <li>
+    Client executes ALTER USER .. INITIATE REGISTRATION;
+   </li>
+   <li>
+   Server sends a random challenge, user id, relying party ID to client.
+   </li>
+   <li>
+   Client receives it and saves in MySQL struct.
+   </li>
+  </ol>
+
+  Finish registration:
+  <ol>
+   <li>
+    Client executes ALTER USER .. FINISH REGISTRATION;
+   </li>
+   <li>
+    Client sends random challenge, user id, relying party ID to FIDO authenticator.
+   </li>
+   <li>
+    Once physical human user gesture action (touching the token) is performed,
+    FIDO authenticator generates a public/private key pair, a credential ID(
+    X.509 certificate, signature) and authenticator data.
+   </li>
+   <li>
+    Client sends public key and credential ID to server.
+   </li>
+   <li>
+    Server side fido authentication plugin verifies the signature and responds
+    with an @ref page_protocol_basic_ok_packet or rejects with
+    @ref page_protocol_basic_err_packet
+   </li>
+  </ol>
+       @startuml
+         title Registration
+
+         participant server as "MySQL server"
+         participant client as "Client"
+         participant authenticator as "FIDO authenticator"
+
+         == Initiate registration ==
+
+         client -> server : connect
+         server -> client : OK packet. Connection is in registration mode where only ALTER USER command is allowed
+         client -> server : ALTER USER USER() nth FACTOR INITIATE REGISTRATION
+         server -> client : random challenge, user id, relying party ID
+
+         == Finish registration ==
+
+         client -> server : ALTER USER USER() nth FACTOR FINISH REGISTRATION SET CHALLENGE_RESPONSE = '?'
+         client -> authenticator : random challenge, user id, relying party ID
+         authenticator -> client : public key, credential ID (X.509 certificate, signature), authenticator data
+         client -> server : public key, credential ID, authenticator data
+         server -> client : Ok packet upon successfull verification of signature
+       @enduml
+
+  Authentication process:
+  Once initial authentication methods defined for user account are successful,
+  server initiates fido authentication process. This includes following steps:
+   <ol>
+    <li>
+     Server sends a random challenge, relying party ID, credential ID to client.
+    </li>
+    <li>
+     Client receives it and sends to FIDO authenticator.
+    </li>
+    <li>
+     FIDO authenticator prompts physical human user to perform gesture action.
+    </li>
+    <li>
+     FIDO authenticator extracts the private key based on relying party ID and
+     signs the challenge.
+    </li>
+    <li>
+     Client sends signed challenge to server.
+    </li>
+    <li>
+     Server side fido authentication plugin verifies the signature with the
+     public key and responds with an @ref page_protocol_basic_ok_packet or with
+     @ref page_protocol_basic_err_packet
+    </li>
+   </ol>
+       @startuml
+         title Authentication
+
+         participant server as "MySQL server"
+         participant client as "Client"
+         participant authenticator as "FIDO authenticator"
+
+         == Authentication ==
+
+         client -> server : connect
+         server -> client : OK packet
+         server -> client : send client side fido authentication plugin name in OK packet
+         server -> client : sends random challenge, relying party ID, credential ID
+         client -> authenticator : sends random challenge, relying party ID, credential ID
+         authenticator -> client : signed challenge
+         client -> server : signed challenge
+         server -> client : verify signed challenge and send OK or ERR packet
+       @enduml
 */
 /* clang-format on */
 
@@ -1147,6 +1325,10 @@
           PLUGIN_CACHING_SHA2_PASSWORD, default_auth_plugin_name))
     return 1;
 
+  if (!Cached_authentication_plugins::compare_plugin(
+          PLUGIN_CACHING_SHA2_PASSWORD, default_auth_plugin_name))
+    LogErr(WARNING_LEVEL, ER_DEPRECATE_MSG_WITH_REPLACEMENT,
+           "default_authentication_plugin", "authentication_policy");
   return 0;
 }
 /**
@@ -1613,6 +1795,37 @@
   @sa wrap_plguin_data_into_proper_command, server_mpvio_write_packet,
   client_mpvio_read_packet
 */
+
+/**
+  @page page_protocol_connection_phase_packets_protocol_auth_next_factor_request Protocol::AuthNextFactor:
+
+  Next Authentication method Packet in @ref page_protocol_multi_factor_authentication_methods
+
+  If both server and the client support @ref MULTI_FACTOR_AUTHENTICATION capability,
+  server can send this packet to ask client to initiate next authentication method
+  in @ref page_protocol_multi_factor_authentication_methods process.
+
+  <table>
+  <caption>Payload</caption>
+  <tr><th>Type</th><th>Name</th><th>Description</th></tr>
+  <tr><td>@ref a_protocol_type_int1 "int&lt;1&gt;"</td>
+    <td>0x02 </td>
+    <td>packet type</td></tr>
+  <tr><td>@ref sect_protocol_basic_dt_string_null "string[NUL]"</td>
+    <td>plugin name</td>
+    <td>name of the client authentication plugin </td></tr>
+  <tr><td>@ref sect_protocol_basic_dt_string_eof "string[EOF]"</td>
+    <td>plugin provided data</td>
+    <td>Initial authentication data for that client plugin</td></tr>
+  </table>
+
+  @return @ref page_protocol_connection_phase_packets_protocol_auth_next_factor_request
+  or closing the connection.
+
+  @sa send_auth_next_factor_packet(), client_mpvio_read_packet()
+  @ref send_auth_next_factor_packet(), client_mpvio_read_packet()
+*/
+
 /* clang-format on */
 
 /**
@@ -1682,6 +1895,48 @@
       data_len);
 }
 
+/**
+  Sends a @ref
+  page_protocol_connection_phase_packets_protocol_auth_next_factor_request
+
+  Used by the server to request that a client should initiate authentication
+  for next authentication methods in the plugin chain of user definition.
+
+  See @ref
+  page_protocol_connection_phase_packets_protocol_auth_next_factor_request for
+  more details.
+
+  @param [in] mpvio      The communications channel
+  @param [in] data       Client plugin data
+  @param [in] data_len   Length of client plugin data
+
+  @retval false ok
+  @retval true error
+*/
+static bool send_auth_next_factor_packet(MPVIO_EXT *mpvio, const uchar *data,
+                                         uint data_len) {
+  static uchar auth_next_factor_request_buf[] = {2};
+  DBUG_TRACE;
+
+  /* Send the client side authentication plugin name */
+  std::string client_auth_plugin(
+      ((st_mysql_auth *)(plugin_decl(mpvio->plugin)->info))
+          ->client_auth_plugin);
+  assert(client_auth_plugin.c_str());
+  if (!(mpvio->protocol->has_client_capability(MULTI_FACTOR_AUTHENTICATION)))
+    return false;
+
+  DBUG_PRINT("info",
+             ("requesting client to initiate %s plugin's authentication",
+              client_auth_plugin.c_str()));
+
+  return net_write_command(
+      mpvio->protocol->get_net(), auth_next_factor_request_buf[0],
+      pointer_cast<const uchar *>(client_auth_plugin.c_str()),
+      client_auth_plugin.size() + 1, pointer_cast<const uchar *>(data),
+      data_len);
+}
+
 /* Return true if there is no users that can match the given host */
 
 bool acl_check_host(THD *thd, const char *host, const char *ip) {
@@ -1746,6 +2001,7 @@
   user->password_history_length = 0;
   user->password_require_current = Lex_acl_attrib_udyn::DEFAULT;
   user->password_locked_state.set_parameters(0, 0);
+  user->m_mfa = nullptr;
 
   if (is_initialized) {
     Auth_id key(user);
@@ -1862,9 +2118,9 @@
     return true;
   }
 
-  mpvio->auth_info.auth_string =
+  mpvio->auth_info.multi_factor_auth_info[0].auth_string =
       mpvio->acl_user->credentials[PRIMARY_CRED].m_auth_string.str;
-  mpvio->auth_info.auth_string_length =
+  mpvio->auth_info.multi_factor_auth_info[0].auth_string_length =
       (unsigned long)mpvio->acl_user->credentials[PRIMARY_CRED]
           .m_auth_string.length;
   if (mpvio->acl_user->credentials[SECOND_CRED].m_auth_string.length) {
@@ -1879,17 +2135,49 @@
   }
   strmake(mpvio->auth_info.authenticated_as,
           mpvio->acl_user->user ? mpvio->acl_user->user : "", USERNAME_LENGTH);
+
+  /* auth_string references to 1st factor auth plugin credential details */
+  mpvio->auth_info.auth_string =
+      mpvio->auth_info.multi_factor_auth_info[0].auth_string;
+  mpvio->auth_info.auth_string_length =
+      mpvio->auth_info.multi_factor_auth_info[0].auth_string_length;
+
   DBUG_PRINT("info",
              ("exit: user=%s, auth_string=%s, authenticated as=%s"
-              ", plugin=%s",
+              ", plugin=%s, authentication factor=%d",
               mpvio->auth_info.user_name, mpvio->auth_info.auth_string,
-              mpvio->auth_info.authenticated_as, mpvio->acl_user->plugin.str));
+              mpvio->auth_info.authenticated_as, mpvio->acl_user->plugin.str,
+              mpvio->auth_info.current_auth_factor));
+
+  /* Copy 2nd and 3rd factor auth string and registration flag into mpvio */
+  if (mpvio->acl_user->m_mfa) {
+    Multi_factor_auth_list *auth_factor =
+        mpvio->acl_user->m_mfa->get_multi_factor_auth_list();
+    uint f = 1;
+    for (auto m_it : auth_factor->get_mfa_list()) {
+      Multi_factor_auth_info *af = m_it->get_multi_factor_auth_info();
+      mpvio->auth_info.multi_factor_auth_info[f].auth_string =
+          af->get_auth_str();
+      mpvio->auth_info.multi_factor_auth_info[f].auth_string_length =
+          af->get_auth_str_len();
+      mpvio->auth_info.multi_factor_auth_info[f].is_registration_required =
+          af->get_requires_registration();
+      DBUG_PRINT(
+          "info",
+          ("exit: user=%s, auth_string=%s, plugin=%s, authentication factor=%d",
+           mpvio->auth_info.user_name,
+           mpvio->auth_info.multi_factor_auth_info[f].auth_string,
+           af->get_plugin_str(), f));
+      f++;
+    }
+  }
+
   return false;
 }
 
 static bool read_client_connect_attrs(THD *thd, char **ptr,
                                       size_t *max_bytes_available,
-                                      MPVIO_EXT *mpvio MY_ATTRIBUTE((unused))) {
+                                      MPVIO_EXT *mpvio [[maybe_unused]]) {
   size_t length, length_length;
   char *ptr_save;
 
@@ -2885,6 +3173,13 @@
       return -1;  // Crash here.
     });
     res = send_plugin_request_packet(mpvio, packet, packet_len);
+  } else if (mpvio->status == MPVIO_EXT::START_MFA) {
+    res = send_auth_next_factor_packet(mpvio, packet, packet_len);
+    /*
+      reset the status to avoid sending AuthNextFactor again for the
+      same factor authentication.
+    */
+    mpvio->status = MPVIO_EXT::FAILURE;
   } else
     res = wrap_plguin_data_into_proper_command(protocol->get_net(), packet,
                                                packet_len);
@@ -2931,6 +3226,7 @@
       and a client has used the correct plugin, then we can return the
       cached data straight away and avoid one round trip.
     */
+
     auto client_auth_plugin_name = client_plugin_name(mpvio->plugin);
     if (client_auth_plugin_name == nullptr ||
         my_strcasecmp(system_charset_info, mpvio->cached_client_reply.plugin,
@@ -2949,7 +3245,6 @@
       pkt_len = packet_error;
       goto err;
     }
-
     /*
       But if the client has used the wrong plugin, the cached data are
       useless. Furthermore, we have to send a "change plugin" request
@@ -2961,6 +3256,14 @@
       protocol->read_packet();
       pkt_len = protocol->get_packet_length();
     }
+  } else if (mpvio->status == MPVIO_EXT::START_MFA) {
+    /* Send AuthNextFactor packet to client and change mpvio status */
+    if (mpvio->write_packet(mpvio, nullptr, 0)) {
+      pkt_len = packet_error;
+    } else {
+      protocol->read_packet();
+      pkt_len = protocol->get_packet_length();
+    }
   } else {
     protocol->read_packet();
     pkt_len = protocol->get_packet_length();
@@ -3047,6 +3350,142 @@
   return res;
 }
 
+/* clang-format off */
+/**
+  @page page_protocol_multi_factor_authentication_methods Multi Factor Authentication
+
+  Assume the client wants to log in via user account U and that user account is defined
+  with multiple authentication methods namely X,Y,Z. Assume default authentication method
+  on both server and client is X.
+
+  @section sect_protocol_multi_factor_authentication_phase Authentication
+
+  A successful authentication path looks as follows:
+
+  1. The client connects to the server
+  2. The server sends @ref page_protocol_connection_phase_packets_protocol_handshake
+  3. The client responds with
+     @ref page_protocol_connection_phase_packets_protocol_handshake_response
+  4. X authentication method packets are exchanged
+  5. The server responds with an @ref page_protocol_connection_phase_packets_protocol_auth_next_factor_request
+     containing client side plugin name and plugin data of plugin Y.
+  6. Client reads plugin name and plugin data from AuthNextFactor packet and loads corresponding client side plugin.
+  7. Y authentication method packets are exchanged
+  8. The server responds with an @ref page_protocol_connection_phase_packets_protocol_auth_next_factor_request
+     containing client side plugin name and plugin data of plugin Z.
+  9. Client reads plugin name and plugin data from AuthNextFactor packet and loads corresponding client side plugin.
+  10.Z authentication method packets are exchanged
+  11.The server responds with an @ref page_protocol_basic_ok_packet
+
+
+  @startuml
+  Client -> Server: Connect
+  Server -> Client: Initial Handshake Packet
+  Client -> Server: Handshake Response Packet
+
+  == X authentication method packets are exchanged ==
+
+  Server -> Client: AuthNextFactor packet containing plugin name/data of plugin Y
+
+  == Y authentication method packets are exchanged ==
+
+  Server -> Client: AuthNextFactor packet containing plugin name/data of plugin Z
+
+  == Z authentication method packets are exchanged ==
+
+  Server -> Client: OK packet
+
+  == Client and server enter Command Phase ==
+  @enduml
+*/
+/* clang-format on */
+
+/**
+  Perform 2nd and 3rd factor authentication.
+
+  Once 1FA method succeeds, server checks if connecting user requires more
+  authentication methods to do the authentication.
+
+  Refer to @ref page_protocol_multi_factor_authentication_methods
+  for server-client communication in various cases
+
+  @param thd            thread handle
+  @param mpvio          the communications channel
+
+  @retval 0  success
+  @retval 1  error
+*/
+static int do_multi_factor_auth(THD *thd, MPVIO_EXT *mpvio) {
+  DBUG_TRACE;
+  int res = CR_OK;
+  /* user is not configured with Multi factor authentication */
+  if (!mpvio->acl_user->m_mfa) return res;
+  /*
+    If an old client connects to server with user account created with Multi
+    factor authentication methods, then return error.
+  */
+  if (!mpvio->protocol->has_client_capability(MULTI_FACTOR_AUTHENTICATION))
+    return CR_AUTH_USER_CREDENTIALS;
+
+  Multi_factor_auth_list *auth_factor =
+      mpvio->acl_user->m_mfa->get_multi_factor_auth_list();
+  for (auto m_it : auth_factor->get_mfa_list()) {
+    Multi_factor_auth_info *af = m_it->get_multi_factor_auth_info();
+    if (af->get_factor() == nthfactor::SECOND_FACTOR)
+      mpvio->auth_info.current_auth_factor = 1;
+    else if (af->get_factor() == nthfactor::THIRD_FACTOR)
+      mpvio->auth_info.current_auth_factor = 2;
+    plugin_ref plugin = my_plugin_lock_by_name(thd, af->plugin_name(),
+                                               MYSQL_AUTHENTICATION_PLUGIN);
+    if (plugin) {
+      mpvio->plugin = plugin;
+      /*
+        Update auth_string, to refer to corresponding factors auth plugin
+        credentials
+      */
+      mpvio->auth_info.auth_string =
+          mpvio->auth_info
+              .multi_factor_auth_info[mpvio->auth_info.current_auth_factor]
+              .auth_string;
+      mpvio->auth_info.auth_string_length =
+          mpvio->auth_info
+              .multi_factor_auth_info[mpvio->auth_info.current_auth_factor]
+              .auth_string_length;
+      mpvio->status = MPVIO_EXT::START_MFA;
+      st_mysql_auth *auth = (st_mysql_auth *)plugin_decl(plugin)->info;
+      res = auth->authenticate_user(mpvio, &mpvio->auth_info);
+      if (res == CR_OK_AUTH_IN_SANDBOX_MODE) {
+        /*
+          Server allows user account to connect in case registration is
+          required, and set server in sandbox mode.
+        */
+        if (af->get_requires_registration())
+          thd->security_context()->set_registration_sandbox_mode(true);
+        assert(af->get_requires_registration());
+        plugin_unlock(thd, plugin);
+        return CR_OK;
+      }
+
+      plugin_unlock(thd, plugin);
+      if (res != CR_OK) {
+        mpvio->status = MPVIO_EXT::FAILURE;
+        break;
+      } else {
+        mpvio->status = MPVIO_EXT::SUCCESS;
+      }
+    } else {
+      /* Server cannot load the required plugin. */
+      Host_errors errors;
+      errors.m_no_auth_plugin = 1;
+      inc_host_errors(mpvio->ip, &errors);
+      my_error(ER_PLUGIN_IS_NOT_LOADED, MYF(0), af->get_plugin_str());
+      res = CR_ERROR;
+      break;
+    }
+  }
+  return res;
+}
+
 static void server_mpvio_initialize(THD *thd, MPVIO_EXT *mpvio,
                                     Thd_charset_adapter *charset_adapter) {
   LEX_CSTRING sctx_host_or_ip = thd->security_context()->host_or_ip();
@@ -3060,6 +3499,7 @@
   mpvio->auth_info.host_or_ip = sctx_host_or_ip.str;
   mpvio->auth_info.host_or_ip_length = sctx_host_or_ip.length;
   mpvio->auth_info.password_used = PASSWORD_USED_NO;
+  mpvio->auth_info.current_auth_factor = 0;
 
   Vio *vio = thd->get_protocol_classic()->get_vio();
   if (vio->ssl_arg)
@@ -3077,6 +3517,10 @@
   mpvio->host = thd->security_context()->host().str;
   mpvio->charset_adapter = charset_adapter;
   mpvio->restrictions = new (mpvio->mem_root) Restrictions();
+
+  mpvio->auth_info.multi_factor_auth_info =
+      new (mpvio->mem_root) auth_factor_desc[MAX_AUTH_FACTORS];
+  memset(mpvio->auth_info.multi_factor_auth_info, 0, sizeof(auth_factor_desc));
 }
 
 static void server_mpvio_update_thd(THD *thd, MPVIO_EXT *mpvio) {
@@ -3368,6 +3812,10 @@
     res = do_auth_once(thd, auth_plugin_name, &mpvio);
   }
 
+  if (res == CR_OK) {
+    res = do_multi_factor_auth(thd, &mpvio);
+  }
+
   server_mpvio_update_thd(thd, &mpvio);
 
   check_and_update_password_lock_state(mpvio, thd, res);
@@ -3818,9 +4266,9 @@
   return 1;
 }
 
-static int set_sha256_salt(const char *password MY_ATTRIBUTE((unused)),
-                           unsigned int password_len MY_ATTRIBUTE((unused)),
-                           unsigned char *salt MY_ATTRIBUTE((unused)),
+static int set_sha256_salt(const char *password [[maybe_unused]],
+                           unsigned int password_len [[maybe_unused]],
+                           unsigned char *salt [[maybe_unused]],
                            unsigned char *salt_len) {
   *salt_len = 0;
   return 0;
@@ -4045,7 +4493,7 @@
   The unused parameters must be here due to function pointer casting
   in sql_show.cc.
 */
-int show_rsa_public_key(THD *, SHOW_VAR *var MY_ATTRIBUTE((unused)), char *) {
+int show_rsa_public_key(THD *, SHOW_VAR *var [[maybe_unused]], char *) {
   var->type = SHOW_CHAR;
   var->value = const_cast<char *>(g_sha256_rsa_keys->get_public_key_as_pem());
   return 0;
@@ -5328,7 +5776,8 @@
     validate_native_password_hash,
     set_native_salt,
     AUTH_FLAG_USES_INTERNAL_STORAGE,
-    compare_native_password_with_hash};
+    compare_native_password_with_hash,
+};
 
 static struct st_mysql_auth sha256_password_handler = {
     MYSQL_AUTHENTICATION_INTERFACE_VERSION,
@@ -5338,7 +5787,8 @@
     validate_sha256_password_hash,
     set_sha256_salt,
     AUTH_FLAG_USES_INTERNAL_STORAGE,
-    compare_sha256_password_with_hash};
+    compare_sha256_password_with_hash,
+};
 
 mysql_declare_plugin(mysql_password){
     MYSQL_AUTHENTICATION_PLUGIN, /* type constant    */
diff -Nru mysql-8.0-8.0.26/sql/auth/sql_authentication.h mysql-8.0-8.0.27/sql/auth/sql_authentication.h
--- mysql-8.0-8.0.26/sql/auth/sql_authentication.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/auth/sql_authentication.h	2021-09-28 11:46:34.000000000 +0000
@@ -75,7 +75,7 @@
   } cached_server_packet;
   int packets_read, packets_written;  ///< counters for send/received packets
   /** when plugin returns a failure this tells us what really happened */
-  enum { SUCCESS, FAILURE, RESTART } status;
+  enum { SUCCESS, FAILURE, RESTART, START_MFA } status;
 
   /* encapsulation members */
   char *scramble;
diff -Nru mysql-8.0-8.0.26/sql/auth/sql_authorization.cc mysql-8.0-8.0.27/sql/auth/sql_authorization.cc
--- mysql-8.0-8.0.26/sql/auth/sql_authorization.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/auth/sql_authorization.cc	2021-09-28 11:46:34.000000000 +0000
@@ -532,8 +532,8 @@
     @retval false User was removed
 */
 
-bool revoke_role_helper(THD *thd MY_ATTRIBUTE((unused)),
-                        std::string &authid_role, std::string &authid_user,
+bool revoke_role_helper(THD *thd [[maybe_unused]], std::string &authid_role,
+                        std::string &authid_user,
                         Role_vertex_descriptor *user_vert,
                         Role_vertex_descriptor *role_vert) {
   DBUG_TRACE;
@@ -600,7 +600,7 @@
     has changed. As a consequence we now need to rebuild the authid_to_vertex
     index.
 */
-void rebuild_vertex_index(THD *thd MY_ATTRIBUTE((unused))) {
+void rebuild_vertex_index(THD *thd [[maybe_unused]]) {
   assert(assert_acl_cache_write_lock(thd));
   for (auto &acl_user : *acl_users) {
     create_role_vertex(&acl_user);
@@ -985,11 +985,7 @@
     }
   }
   global->append(STRING_WITH_LEN(" ON *.* TO "));
-  size_t len = acl_user->get_username_length();
-  append_identifier(thd, global, acl_user->user, len);
-  global->append('@');
-  append_identifier(thd, global, acl_user->host.get_host(),
-                    acl_user->host.get_host_len());
+  append_auth_id(thd, acl_user, global);
   if (want_access & GRANT_ACL)
     global->append(STRING_WITH_LEN(" WITH GRANT OPTION"));
 }
@@ -1042,11 +1038,7 @@
       db.append(STRING_WITH_LEN(" ON "));
       append_identifier(thd, &db, db_name.c_str(), db_name.length());
       db.append(STRING_WITH_LEN(".* TO "));
-      append_identifier(thd, &db, role->user, role->get_username_length());
-      db.append('@');
-      // host and lex_user->host are equal except for case
-      append_identifier(thd, &db, role->host.get_host(),
-                        role->host.get_host_len());
+      append_auth_id(thd, role, &db);
       if (want_access & GRANT_ACL)
         db.append(STRING_WITH_LEN(" WITH GRANT OPTION"));
       protocol->start_row();
@@ -1089,12 +1081,7 @@
         append_identifier(thd, &db, rl_itr.first.c_str(),
                           rl_itr.first.length());
         db.append(STRING_WITH_LEN(".* FROM "));
-        append_identifier(thd, &db, acl_user->user,
-                          acl_user->get_username_length());
-        db.append('@');
-        // host and lex_user->host are equal except for case
-        append_identifier(thd, &db, acl_user->host.get_host(),
-                          acl_user->host.get_host_len());
+        append_auth_id(thd, acl_user, &db);
         protocol->start_row();
         protocol->store_string(db.ptr(), db.length(), db.charset());
         protocol->end_row();
@@ -1117,14 +1104,14 @@
 
 */
 
-void make_proxy_privilege_statement(THD *thd MY_ATTRIBUTE((unused)),
-                                    ACL_USER *user, Protocol *protocol) {
+void make_proxy_privilege_statement(THD *thd [[maybe_unused]], ACL_USER *user,
+                                    Protocol *protocol) {
   assert(assert_acl_cache_read_lock(thd));
   for (ACL_PROXY_USER *proxy = acl_proxy_users->begin();
        proxy != acl_proxy_users->end(); ++proxy) {
     if (proxy->granted_on(user->host.get_host(), user->user)) {
       String global;
-      proxy->print_grant(&global);
+      proxy->print_grant(thd, &global);
       protocol->start_row();
       protocol->store_string(global.ptr(), global.length(), global.charset());
       protocol->end_row();
@@ -1179,11 +1166,7 @@
       db.append(STRING_WITH_LEN("FUNCTION "));
     db.append(sp_name.c_str(), sp_name.length());
     db.append(STRING_WITH_LEN(" TO "));
-    append_identifier(thd, &db, role->user, role->get_username_length());
-    db.append(STRING_WITH_LEN("@"));
-    // host and lex_user->host are equal except for case
-    append_identifier(thd, &db, role->host.get_host(),
-                      role->host.get_host_len());
+    append_auth_id(thd, role, &db);
     if (want_access & GRANT_ACL)
       db.append(STRING_WITH_LEN(" WITH GRANT OPTION"));
     protocol->start_row();
@@ -1221,11 +1204,7 @@
   }
   if (found) {
     global.append(STRING_WITH_LEN(" TO "));
-    append_identifier(thd, &global, acl_user->user,
-                      acl_user->get_username_length());
-    global.append('@');
-    append_identifier(thd, &global, acl_user->host.get_host(),
-                      acl_user->host.get_host_len());
+    append_auth_id(thd, acl_user, &global);
     global.append(" WITH ADMIN OPTION");
 
     protocol->start_row();
@@ -1257,14 +1236,7 @@
     if (found) {
       /* Dynamic privileges are always applied on global level */
       global.append(STRING_WITH_LEN(" ON *.* TO "));
-      if (role->user != nullptr)
-        append_identifier(thd, &global, role->user,
-                          role->get_username_length());
-      else
-        global.append(STRING_WITH_LEN("''"));
-      global.append('@');
-      append_identifier(thd, &global, role->host.get_host(),
-                        role->host.get_host_len());
+      append_auth_id(thd, role, &global);
       if (grant_option) global.append(" WITH GRANT OPTION");
       protocol->start_row();
       protocol->store_string(global.ptr(), global.length(), global.charset());
@@ -1302,21 +1274,16 @@
     if (got_more_granted_roles && !it->second &&
         !(got_more_mandatory_roles && *it2 < it->first)) {
       if (found) global.append(',');
-      append_identifier(thd, &global, it->first.user().c_str(),
-                        it->first.user().length());
-      global.append('@');
-      append_identifier(thd, &global, it->first.host().c_str(),
-                        it->first.host().length());
+      append_auth_id_string(thd, it->first.user().c_str(),
+                            it->first.user().length(), it->first.host().c_str(),
+                            it->first.host().length(), &global);
       found = true;
       if (got_more_mandatory_roles && it->first == *it2) ++it2;
       ++it;
     } else if (got_more_mandatory_roles) {
       if (found) global.append(',');
-      append_identifier(thd, &global, it2->user().c_str(),
-                        it2->user().length());
-      global.append('@');
-      append_identifier(thd, &global, it2->host().c_str(),
-                        it2->host().length());
+      append_auth_id_string(thd, it2->user().c_str(), it2->user().length(),
+                            it2->host().c_str(), it2->host().length(), &global);
       found = true;
       ++it2;
     } else
@@ -1326,10 +1293,7 @@
   }  // end while
   if (found) {
     global.append(STRING_WITH_LEN(" TO "));
-    append_identifier(thd, &global, role->user, role->get_username_length());
-    global.append('@');
-    append_identifier(thd, &global, role->host.get_host(),
-                      role->host.get_host_len());
+    append_auth_id(thd, role, &global);
     protocol->start_row();
     protocol->store_string(global.ptr(), global.length(), global.charset());
     protocol->end_row();
@@ -1398,11 +1362,7 @@
     global.append(STRING_WITH_LEN(" ON "));
     global.append(qualified_table_name.c_str(), qualified_table_name.length());
     global.append(STRING_WITH_LEN(" TO "));
-    append_identifier(thd, &global, role->user, role->get_username_length());
-    global.append('@');
-    // host and lex_user->host are equal except for case
-    append_identifier(thd, &global, role->host.get_host(),
-                      role->host.get_host_len());
+    append_auth_id(thd, role, &global);
     if (agg.table_access & GRANT_ACL)
       global.append(STRING_WITH_LEN(" WITH GRANT OPTION"));
     protocol->start_row();
@@ -2876,8 +2836,8 @@
           mysql_audit_notify(
               thd, AUDIT_EVENT(MYSQL_AUDIT_AUTHENTICATION_CREDENTIAL_CHANGE),
               thd->is_error(), existing_user->user.str, existing_user->host.str,
-              existing_user->plugin.str, is_role_id(existing_user), nullptr,
-              nullptr);
+              existing_user->first_factor_auth_info.plugin.str,
+              is_role_id(existing_user), nullptr, nullptr);
       }
     }
     get_global_acl_cache()->increase_version();
@@ -3059,8 +3019,8 @@
           mysql_audit_notify(
               thd, AUDIT_EVENT(MYSQL_AUDIT_AUTHENTICATION_CREDENTIAL_CHANGE),
               thd->is_error(), existing_user->user.str, existing_user->host.str,
-              existing_user->plugin.str, is_role_id(existing_user), nullptr,
-              nullptr);
+              existing_user->first_factor_auth_info.plugin.str,
+              is_role_id(existing_user), nullptr, nullptr);
       }
     }
     get_global_acl_cache()->increase_version();
@@ -3351,6 +3311,7 @@
       }
       while ((role = roles_it++) && !errors) {
         ACL_USER *acl_role;
+        // keep the check in sync with check_authorization_id_string
         if (role->user.length == 0 || *(role->user.str) == '\0') {
           /* Anonymous roles aren't allowed */
           errors = true;
@@ -3510,9 +3471,10 @@
       if (this_user && (what_to_set.m_what & PLUGIN_ATTR))
         existing_users.insert(target_user);
       what_to_set.m_what |= ACCESS_RIGHTS_ATTR;
-      if ((ret = replace_user_table(thd, tables[ACL_TABLES::TABLE_USER].table,
-                                    user, (!db ? rights : 0), revoke_grant,
-                                    false, what_to_set, &restrictions))) {
+      if ((ret = replace_user_table(
+               thd, tables[ACL_TABLES::TABLE_USER].table, user,
+               (!db ? rights : 0), revoke_grant, false, what_to_set,
+               &restrictions, (this_user ? this_user->m_mfa : nullptr)))) {
         error = true;
         if (ret < 0) break;
 
@@ -3678,8 +3640,8 @@
           mysql_audit_notify(
               thd, AUDIT_EVENT(MYSQL_AUDIT_AUTHENTICATION_CREDENTIAL_CHANGE),
               thd->is_error(), existing_user->user.str, existing_user->host.str,
-              existing_user->plugin.str, is_role_id(existing_user), nullptr,
-              nullptr);
+              existing_user->first_factor_auth_info.plugin.str,
+              is_role_id(existing_user), nullptr, nullptr);
       }
     }
 
@@ -3807,11 +3769,6 @@
       if (any_combination_will_do && (aggr.cols != 0 || aggr.table_access != 0))
         continue;
 
-      /*
-        For SHOW COLUMNS, SHOW INDEX it is enough to have some
-        privileges on any column combination on the table.
-      */
-      if (any_combination_will_do) continue;
       t_ref->grant.privilege |= aggr.table_access;
       if (!(~t_ref->grant.privilege & want_access)) {
         DBUG_PRINT("info",
@@ -5165,9 +5122,9 @@
             acl_table::USER_ATTRIBUTE_RESTRICTIONS;
         restrictions.set_db(db_restrictions);
       }
-      if ((ret = replace_user_table(thd, tables[ACL_TABLES::TABLE_USER].table,
-                                    lex_user, rights, true, false,
-                                    what_to_update, &restrictions))) {
+      if ((ret = replace_user_table(
+               thd, tables[ACL_TABLES::TABLE_USER].table, lex_user, rights,
+               true, false, what_to_update, &restrictions, acl_user->m_mfa))) {
         result = true;
         if (ret < 0) break;
 
@@ -5502,7 +5459,7 @@
 }
 
 bool acl_check_proxy_grant_access(THD *thd, const char *host, const char *user,
-                                  bool with_grant MY_ATTRIBUTE((unused))) {
+                                  bool with_grant [[maybe_unused]]) {
   DBUG_TRACE;
   DBUG_PRINT("info",
              ("user=%s host=%s with_grant=%d", user, host, (int)with_grant));
@@ -5972,7 +5929,7 @@
     switch (schema_access->check(LOCK_TABLES_ACL, &dummy)) {
       case ACL_INTERNAL_ACCESS_DENIED:
         *fake_lock_tables_acl = true;
-        // Fall through.
+        [[fallthrough]];
       case ACL_INTERNAL_ACCESS_GRANTED:
         want_access &= ~LOCK_TABLES_ACL;
         break;
@@ -5983,7 +5940,7 @@
           switch (table_access->check(LOCK_TABLES_ACL, &dummy)) {
             case ACL_INTERNAL_ACCESS_DENIED:
               *fake_lock_tables_acl = true;
-              // Fall through.
+              [[fallthrough]];
             case ACL_INTERNAL_ACCESS_GRANTED:
               want_access &= ~LOCK_TABLES_ACL;
               break;
@@ -7200,7 +7157,8 @@
     iterate_comma_separated_quoted_string(
         authid_str, [&thd, &error, &mandatory_roles](const std::string item) {
           auto el = get_authid_from_quoted_string(item);
-          if (el.second != "" && el.first == "")
+          // Don't accept anonymous users. Keep in sync with mysql_grant_role()
+          if (el.first == "")  // don't accept anonymous users
             error = true;
           else if (thd->security_context()
                        ->has_global_grant({el.first, el.second},
@@ -7292,8 +7250,7 @@
   @retval true an error occurred
   @retval false success
 */
-bool Default_local_authid::precheck(
-    Security_context *sctx MY_ATTRIBUTE((unused))) {
+bool Default_local_authid::precheck(Security_context *sctx [[maybe_unused]]) {
   return false;
 }
 
@@ -7304,8 +7261,7 @@
   @retval true an error occurred
   @retval false success
 */
-bool Default_local_authid::create(
-    Security_context *sctx MY_ATTRIBUTE((unused))) {
+bool Default_local_authid::create(Security_context *sctx [[maybe_unused]]) {
   return false;
 }
 
@@ -7313,8 +7269,8 @@
     const THD *thd, std::vector<std::string> privs)
     : m_thd(thd), m_privs(std::move(privs)) {}
 
-bool Grant_temporary_dynamic_privileges::precheck(
-    Security_context *sctx MY_ATTRIBUTE((unused))) {
+bool Grant_temporary_dynamic_privileges::precheck(Security_context *sctx
+                                                  [[maybe_unused]]) {
   return false;
 }
 
@@ -7340,8 +7296,8 @@
     const THD *thd, ulong privs)
     : m_thd(thd), m_privs(privs) {}
 
-bool Grant_temporary_static_privileges::precheck(
-    Security_context *sctx MY_ATTRIBUTE((unused))) {
+bool Grant_temporary_static_privileges::precheck(Security_context *sctx
+                                                 [[maybe_unused]]) {
   return false;
 }
 
diff -Nru mysql-8.0-8.0.26/sql/auth/sql_mfa.cc mysql-8.0-8.0.27/sql/auth/sql_mfa.cc
--- mysql-8.0-8.0.26/sql/auth/sql_mfa.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/auth/sql_mfa.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,1265 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include <mysql/components/my_service.h>
+#include <mysql/components/services/mysql_authentication_registration.h>
+
+#include "base64.h" /* base64_encode */
+
+#include "mysql/components/services/log_builtins.h"
+#include "mysql/plugin_auth.h"
+#include "sql/auth/sql_mfa.h"
+#include "sql/derror.h" /* ER_THD */
+#include "sql/mysqld.h"
+#include "sql/sql_lex.h"
+#include "sql/strfunc.h" /* lex_string_strmake */
+
+#include "mysqld_error.h"
+
+namespace mfa_consts {
+constexpr const char requires_registration[] = "requires_registration";
+constexpr const char passwordless[] = "passwordless";
+constexpr const char auth_string[] = "authentication_string";
+constexpr const char auth_plugin[] = "plugin";
+}  // namespace mfa_consts
+
+Multi_factor_auth_list::Multi_factor_auth_list(MEM_ROOT *mem_root)
+    : m_factor(Mem_root_allocator<I_multi_factor_auth *>(mem_root)) {}
+
+Multi_factor_auth_list::~Multi_factor_auth_list() { m_factor.clear(); }
+
+/**
+  This method checks MFA methods present in ACL_USER against new factor
+  specified as part of ALTER USER sql.
+
+  @param [in]  thd       Connection handler
+  @param [in]  user      Handler to LEX_USER whose Multi Factor Auth methods
+  will being added/dropped or modified
+
+  @returns status of the validation
+    @retval false Success ALTER USER can proceed further
+    @retval true  Failure report error for ALTER USER
+*/
+bool Multi_factor_auth_list::is_alter_allowed(THD *thd, LEX_USER *user) {
+  List<LEX_MFA> &list = user->mfa_list;
+  List_iterator<LEX_MFA> lex_mfa_list(list);
+  LEX_MFA *new_factor = nullptr;
+  while ((new_factor = lex_mfa_list++)) {
+    if (get_mfa_list_size() == 0) {
+      if (new_factor->add_factor) {
+        /* ensure MFA methods are added in an order. */
+        if ((list.size() == 1) && new_factor->nth_factor > 2) {
+          /* create user u1;
+             alter user u1 add 3 factor ... is not allowed. */
+          auto n = new_factor->nth_factor - 1;
+          my_error(ER_MFA_METHOD_NOT_EXISTS, MYF(0), n, n);
+          return true;
+        }
+        if ((list.size() == 2) && !lex_mfa_list.is_last()) {
+          LEX_MFA *next_factor = (LEX_MFA *)lex_mfa_list.next();
+          /*
+            create user u1;
+            alter user u1 add 3 factor .. add 2 factor ..;
+            is not allowed.
+          */
+          if (new_factor->nth_factor > next_factor->nth_factor) {
+            my_error(ER_MFA_METHODS_INVALID_ORDER, MYF(0),
+                     next_factor->nth_factor, new_factor->nth_factor);
+            return true;
+          }
+        }
+      } else {
+        /*
+          This user does not have any MFA methods defined, thus only allowed
+          operation should be ADD, else report error.
+        */
+        auto n = new_factor->nth_factor;
+        my_error(ER_MFA_METHOD_NOT_EXISTS, MYF(0), n, n);
+        return true;
+      }
+    } else {
+      if (new_factor->add_factor) {
+        /* check for MFA method which already exists */
+        for (auto m_it : get_mfa_list()) {
+          Multi_factor_auth_info *acl_mfa_info =
+              m_it->get_multi_factor_auth_info();
+          /*
+            user account configured with passwordless auth methods should not
+            be allowed to perform ADD/DROP operations.
+          */
+          if (acl_mfa_info->is_passwordless()) {
+            auto s = acl_mfa_info->get_command_string(thd->lex->sql_command);
+            s.append("... ADD ");
+            my_error(ER_INVALID_MFA_OPERATIONS_FOR_PASSWORDLESS_USER, MYF(0),
+                     s.c_str(), user->user.str, user->host.str);
+            return true;
+          }
+          if (new_factor->nth_factor == acl_mfa_info->get_nth_factor()) {
+            auto n = acl_mfa_info->get_nth_factor();
+            my_error(ER_MFA_METHOD_EXISTS, MYF(0), n, n, n, n);
+            return true;
+          }
+        }
+      } else if (new_factor->drop_factor || new_factor->unregister ||
+                 new_factor->modify_factor) {
+        bool exists = false;
+        /*
+          check if MFA method we are dropping/modify does exists, else report
+          error
+        */
+        for (auto m_it : get_mfa_list()) {
+          if (exists) break;
+          Multi_factor_auth_info *acl_mfa_info =
+              m_it->get_multi_factor_auth_info();
+          /*
+            FINISH REGISTRATION step for user account configured with
+            passwordless auth methods is binlogged as
+            ALTER USER .. MODIFY 2 FACTOR IDENTIFIED WITH ... AS 'blob'
+            Thus allow MODIFY operation only if user has PASSWORDLESS_USER_ADMIN
+            privilege.
+          */
+          if (acl_mfa_info->is_passwordless()) {
+            bool priv_exist = thd->security_context()
+                                  ->has_global_grant(STRING_WITH_LEN(
+                                      "PASSWORDLESS_USER_ADMIN"))
+                                  .first;
+            if (!(priv_exist && new_factor->modify_factor)) {
+              auto s = acl_mfa_info->get_command_string(thd->lex->sql_command);
+              if (new_factor->add_factor)
+                s.append("... ADD ");
+              else if (new_factor->drop_factor)
+                s.append("... DROP ");
+              else if (new_factor->unregister)
+                s.append("... UNREGISTER ");
+              my_error(ER_INVALID_MFA_OPERATIONS_FOR_PASSWORDLESS_USER, MYF(0),
+                       s.c_str(), user->user.str, user->host.str);
+              return true;
+            }
+            /* ensure that plugin is still fido */
+            if (my_strcasecmp(system_charset_info,
+                              acl_mfa_info->get_plugin_str(),
+                              new_factor->plugin.str)) {
+              my_error(ER_INVALID_MFA_OPERATIONS_FOR_PASSWORDLESS_USER, MYF(0),
+                       "ALTER USER ... MODIFY ", user->user.str,
+                       user->host.str);
+              return true;
+            }
+          }
+          if (new_factor->nth_factor == acl_mfa_info->get_nth_factor()) {
+            exists = true;
+          }
+        }
+        if (!exists) {
+          auto n = new_factor->nth_factor;
+          my_error(ER_MFA_METHOD_NOT_EXISTS, MYF(0), n, n);
+          return true;
+        }
+      } else if (new_factor->requires_registration) {
+        for (auto m_it : get_mfa_list()) {
+          Multi_factor_auth_info *acl_mfa_info =
+              m_it->get_multi_factor_auth_info();
+          /* MFA method exists and we are doing registration */
+          if (new_factor->nth_factor == acl_mfa_info->get_nth_factor()) {
+            /* in case registration is already done, report error */
+            if (!acl_mfa_info->get_requires_registration()) {
+              my_error(ER_PLUGIN_REGISTRATION_DONE, MYF(0),
+                       acl_mfa_info->get_nth_factor());
+              return true;
+            }
+          }
+        }
+      }
+    }
+  }
+  return false;
+}
+
+/**
+  This method modifies the Multi factor authentication interface based on ALTER
+  USER sql. This method refers to Multi factor authentication interface present
+  in ACL_USER against the new interface which is passed as an input and updates
+  the nth factor method in new interface by either adding or dropping the nth
+  factor methods. An expression like new_mfa_interface = ACL_USER::m_mfa;
+
+  @param [in, out]  m      handler to new Multi factor authentication interface
+*/
+void Multi_factor_auth_list::alter_mfa(I_multi_factor_auth *m) {
+  /* this pointer holds in memory copy, m holds new factor to be modified */
+  Multi_factor_auth_list *lhs = m->get_multi_factor_auth_list();
+
+  bool drop_2nd_factor = false;
+  bool drop_3rd_factor = false;
+
+  for (auto new_it : lhs->m_factor) {
+    Multi_factor_auth_info *new_factor = new_it->get_multi_factor_auth_info();
+    if (new_factor->is_add_factor()) {
+      /* append in memory copy to new factor */
+      for (auto m_it : this->m_factor) {
+        Multi_factor_auth_info *acl_factor = m_it->get_multi_factor_auth_info();
+        lhs->add_factor(acl_factor);
+        lhs->sort_mfa();
+      }
+    } else if (new_factor->is_drop_factor()) {
+      /*
+        when iterating through mfa list its not possible to modify the the list
+        to perform a drop operation, thus make a note of what factors need to
+        be dropped and add them to lhs, so that factors can be dropped later
+      */
+      for (auto m_it : this->m_factor) {
+        Multi_factor_auth_info *acl_factor = m_it->get_multi_factor_auth_info();
+        if (new_factor->get_factor() == acl_factor->get_factor()) {
+          if (new_factor->get_factor() == nthfactor::SECOND_FACTOR)
+            drop_2nd_factor = true;
+          else if (new_factor->get_factor() == nthfactor::THIRD_FACTOR)
+            drop_3rd_factor = true;
+        } else {
+          /* add factors to lhs */
+          if (lhs->get_mfa_list_size() < this->get_mfa_list_size()) {
+            lhs->add_factor(acl_factor);
+            lhs->sort_mfa();
+          }
+        }
+      }
+    } else if (new_factor->get_requires_registration()) {
+      for (auto m_it : this->m_factor) {
+        Multi_factor_auth_info *acl_factor = m_it->get_multi_factor_auth_info();
+        if (new_factor->get_factor() == acl_factor->get_factor())
+          *new_factor = *acl_factor;
+        else {
+          lhs->add_factor(acl_factor);
+          lhs->sort_mfa();
+        }
+      }
+    } else if (new_factor->get_unregister()) {
+      for (auto m_it : this->m_factor) {
+        Multi_factor_auth_info *acl_factor = m_it->get_multi_factor_auth_info();
+        if (new_factor->get_factor() == acl_factor->get_factor())
+          *new_factor = *acl_factor;
+        else {
+          if (lhs->get_mfa_list_size() < this->get_mfa_list_size()) {
+            lhs->add_factor(acl_factor);
+            lhs->sort_mfa();
+          }
+        }
+      }
+    } else if (new_factor->is_modify_factor()) {
+      for (auto m_it : this->m_factor) {
+        Multi_factor_auth_info *acl_factor = m_it->get_multi_factor_auth_info();
+        if (acl_factor->is_passwordless()) {
+          new_factor->set_passwordless(true);
+          break;
+        }
+        if (lhs->get_mfa_list_size() == this->get_mfa_list_size()) break;
+        if (new_factor->get_factor() != acl_factor->get_factor()) {
+          lhs->add_factor(acl_factor);
+          lhs->sort_mfa();
+        }
+      }
+    }
+  }
+  /*
+    at this point lhs has all auth factors, based on which factor to
+    drop do needed action.
+  */
+  if (drop_2nd_factor && drop_3rd_factor) {
+    lhs->m_factor.clear();
+  } else {
+    uint sz = lhs->m_factor.size();
+    if (sz == 2) {
+      auto sf = lhs->m_factor[0];
+      auto tf = lhs->m_factor[1];
+      /* drop 2nd factor and overwrite 2nd with 3rd factor */
+      if (drop_2nd_factor) {
+        lhs->m_factor.clear();
+        Multi_factor_auth_info *t = tf->get_multi_factor_auth_info();
+        t->set_factor(nthfactor::SECOND_FACTOR);
+        lhs->add_factor(tf);
+      } else if (drop_3rd_factor) {
+        lhs->m_factor.clear();
+        lhs->add_factor(sf);
+      }
+    } else if (sz == 1 && (drop_2nd_factor || drop_3rd_factor)) {
+      lhs->m_factor.clear();
+    }
+  }
+}
+
+/**
+  This method checks the modified Multi factor authentication interface methods
+  based on ALTER USER sql against authentication policy.
+
+  @param thd          connection handle
+
+  @returns status of the validation
+    @retval false Success (modified mfa methods match policy)
+    @retval true  Failure (authentication policy is vioalted)
+*/
+bool Multi_factor_auth_list::validate_against_authentication_policy(THD *thd) {
+  bool policy_priv_exist =
+      thd->security_context()
+          ->has_global_grant(STRING_WITH_LEN("AUTHENTICATION_POLICY_ADMIN"))
+          .first;
+  uint nth_factor = 1;
+  mysql_mutex_lock(&LOCK_authentication_policy);
+  std::vector<std::string> &list = authentication_policy_list;
+  mysql_mutex_unlock(&LOCK_authentication_policy);
+  auto acl_it = m_factor.begin();
+  auto policy_list = list.begin();
+  /* skip first factor plugin name in policy list */
+  policy_list++;
+  for (; (acl_it != m_factor.end() && policy_list != list.end());
+       ++policy_list, ++acl_it) {
+    Multi_factor_auth_info *acl_factor =
+        (*acl_it)->get_multi_factor_auth_info();
+    nth_factor = acl_factor->get_nth_factor();
+    /* mfa plugin method is optional so allow */
+    if (policy_list->length() == 0) continue;
+    /* mfa plugin method can be anything so allow */
+    if (policy_list->compare("*") == 0) continue;
+    /* mfa plugin method does not match against policy */
+    if (policy_list->compare(acl_factor->get_plugin_str())) goto error;
+  }
+  nth_factor++;
+  /* if more plugin exists in policy check that its optional only */
+  while (policy_list != list.end()) {
+    if (policy_list->length()) goto error;
+    policy_list++;
+  }
+  return false;
+error:
+  if (policy_priv_exist) {
+    push_warning_printf(
+        thd, Sql_condition::SL_WARNING, ER_AUTHENTICATION_POLICY_MISMATCH,
+        ER_THD(thd, ER_AUTHENTICATION_POLICY_MISMATCH), nth_factor);
+    return false;
+  }
+  my_error(ER_AUTHENTICATION_POLICY_MISMATCH, MYF(0), nth_factor);
+  return true;
+}
+
+/**
+  Helper method to sort nth factor methods in Multi factor authentication
+  interface such that 2nd factor method always preceeds 3rd factor method.
+*/
+void Multi_factor_auth_list::sort_mfa() {
+  assert(m_factor.size() == 2);
+  Multi_factor_auth_info *sf = m_factor[0]->get_multi_factor_auth_info();
+  Multi_factor_auth_info *tf = m_factor[1]->get_multi_factor_auth_info();
+  if (sf->get_nth_factor() > tf->get_nth_factor()) {
+    /* swap elements. */
+    m_factor[0] = tf;
+    m_factor[1] = sf;
+  }
+}
+
+/**
+  Interface method to validate the auth plugin chain before updating
+  the user_attributes in mysql.user table.
+
+  @param [in]  thd              Connection handler
+
+  @returns status of the validation
+    @retval false Success
+    @retval true  Failure
+*/
+bool Multi_factor_auth_list::validate_plugins_in_auth_chain(THD *thd) {
+  for (auto m : m_factor) {
+    if (m->validate_plugins_in_auth_chain(thd)) return true;
+  }
+  return false;
+}
+
+/**
+  Interface method to update user_attributes.
+
+  @returns status of update operation
+    @retval false Success
+    @retval true  Failure
+*/
+bool Multi_factor_auth_list::update_user_attributes() {
+  for (auto m : m_factor) {
+    if (m->update_user_attributes()) return true;
+  }
+  return false;
+}
+
+/**
+  Interface method to convert this interface into a valid
+  JSON object.
+
+  @param [in, out]  mfa_arr      A json array into which nth factor
+  Multi factor authentication methods needs to be added.
+
+  @returns status of serialization
+    @retval false Success
+    @retval true  Failure
+*/
+bool Multi_factor_auth_list::serialize(Json_array &mfa_arr) {
+  for (auto m : m_factor) {
+    if (m->serialize(mfa_arr)) return true;
+  }
+  return false;
+}
+
+/**
+  Interface method to convert a valid JSON object into this interface.
+
+  @param [in]  nth_factor Refers to which factor needs to be deserialized
+  @param [in]  mfa_dom    JSON dom object which should be deserialized
+
+  @returns status of deserialization
+    @retval false Success
+    @retval true  Failure
+*/
+bool Multi_factor_auth_list::deserialize(uint nth_factor, Json_dom *mfa_dom) {
+  if (m_factor[nth_factor]->deserialize(nth_factor, mfa_dom)) return true;
+  return false;
+}
+
+/**
+  Interface method to initiate registration.
+
+  @param [in]       thd        Connection handler
+  @param [in]       nth_factor Refers to which factor needs registration
+
+  @returns status of registration step
+    @retval false Success
+    @retval true  Failure
+*/
+bool Multi_factor_auth_list::init_registration(THD *thd, uint nth_factor) {
+  for (auto m : m_factor) {
+    if (m->init_registration(thd, nth_factor)) return true;
+  }
+  return false;
+}
+
+/**
+  Interface method to finish registration step.
+
+  @param [in]       thd        Connection handler
+  @param [in]       user_name  Handler to LEX_USER
+  @param [in]       nth_factor Refers to which factor needs registration
+
+  @returns status of registration step
+    @retval false Success
+    @retval true  Failure
+*/
+bool Multi_factor_auth_list::finish_registration(THD *thd, LEX_USER *user_name,
+                                                 uint nth_factor) {
+  for (auto m : m_factor) {
+    if (m->finish_registration(thd, user_name, nth_factor)) return true;
+  }
+  return false;
+}
+
+/**
+  Interface method to check if registration step in for passwordless
+  authentication method.
+
+  @returns
+    @retval false Success
+    @retval true  Failure
+*/
+bool Multi_factor_auth_list::is_passwordless() {
+  bool v = false;
+  for (auto m : m_factor) {
+    v |= m->is_passwordless();
+  }
+  return v;
+}
+
+/**
+  Interface method to fill in Multi factor authentication method details
+  during query rewrite
+
+  @param [in]       thd        Connection handler
+  @param [in]       user_name  Handler to LEX_USER
+*/
+void Multi_factor_auth_list::get_info_for_query_rewrite(THD *thd,
+                                                        LEX_USER *user_name) {
+  for (auto m : m_factor) {
+    m->get_info_for_query_rewrite(thd, user_name);
+  }
+}
+
+/**
+  Interface method to fill in generated passwords from Multi factor
+  authentication methods
+
+  @param [out]  gp        List holding all generated passwords.
+  @param [in]   u         Name of user
+  @param [in]   h         Host name
+
+*/
+void Multi_factor_auth_list::get_generated_passwords(Userhostpassword_list &gp,
+                                                     const char *u,
+                                                     const char *h) {
+  for (auto m : m_factor) {
+    m->get_generated_passwords(gp, u, h);
+  }
+}
+
+/**
+  Interface method to fill in generated server challenge from init
+  registration step.
+
+  @param [out]   sc       Buffer to hold server challenge
+
+*/
+void Multi_factor_auth_list::get_server_challenge(
+    std::vector<std::string> &sc) {
+  for (auto m : m_factor) {
+    m->get_server_challenge(sc);
+  }
+}
+
+my_vector<I_multi_factor_auth *> &Multi_factor_auth_list::get_mfa_list() {
+  return m_factor;
+}
+
+size_t Multi_factor_auth_list::get_mfa_list_size() { return m_factor.size(); }
+
+Multi_factor_auth_info::Multi_factor_auth_info(MEM_ROOT *mem_root)
+    : m_mem_root(mem_root) {
+  m_multi_factor_auth = new (m_mem_root) LEX_MFA;
+  m_multi_factor_auth->reset();
+}
+
+Multi_factor_auth_info::Multi_factor_auth_info(MEM_ROOT *mem_root, LEX_MFA *m)
+    : m_mem_root(mem_root) {
+  m_multi_factor_auth = new (m_mem_root) LEX_MFA;
+  m_multi_factor_auth->reset();
+  m_multi_factor_auth->copy(m, m_mem_root);
+}
+
+/**
+  This method validates nth factor authentication plugin during
+  ALTER/CREATE USER sql.
+
+  @param [in]  thd              Connection handler
+
+  @returns status of the validation
+    @retval false Success
+    @retval true  Failure
+*/
+bool Multi_factor_auth_info::validate_plugins_in_auth_chain(THD *thd) {
+  if (is_identified_by() && !is_identified_with()) {
+    /* get plugin name from @@authentication_policy */
+    mysql_mutex_lock(&LOCK_authentication_policy);
+    std::vector<std::string> &list = authentication_policy_list;
+    mysql_mutex_unlock(&LOCK_authentication_policy);
+    auto s = list[get_nth_factor() - 1];
+    set_plugin_str(s.c_str(), s.length());
+  }
+  plugin_ref plugin = my_plugin_lock_by_name(nullptr, plugin_name(),
+                                             MYSQL_AUTHENTICATION_PLUGIN);
+  /* check if plugin is loaded */
+  if (!plugin) {
+    my_error(ER_PLUGIN_IS_NOT_LOADED, MYF(0), get_plugin_str());
+    return (true);
+  }
+  st_mysql_auth *auth = (st_mysql_auth *)plugin_decl(plugin)->info;
+  if ((auth->authentication_flags & AUTH_FLAG_USES_INTERNAL_STORAGE) ||
+      (auth->authentication_flags &
+       AUTH_FLAG_PRIVILEGED_USER_FOR_PASSWORD_CHANGE)) {
+    /*
+      Auth plugin which supports registration process can only be used to create
+      passwordless user account.
+    */
+    if (is_passwordless()) {
+      my_error(ER_INVALID_PLUGIN_FOR_REGISTRATION, MYF(0), get_plugin_str());
+      plugin_unlock(nullptr, plugin);
+      return (true);
+    }
+    /*
+      If it is a registration step or de-registration step ensure
+      plugin does support registration process.
+    */
+    if (m_multi_factor_auth->requires_registration ||
+        m_multi_factor_auth->unregister) {
+      my_error(ER_INVALID_PLUGIN_FOR_REGISTRATION, MYF(0), get_plugin_str());
+      plugin_unlock(nullptr, plugin);
+      return (true);
+    } else {
+      if (auth->authentication_flags & AUTH_FLAG_USES_INTERNAL_STORAGE) {
+        /*
+          2nd and 3rd factor auth plugin should not store passwords
+          internally
+        */
+        my_error(ER_INVALID_MFA_PLUGIN_SPECIFIED, MYF(0), get_plugin_str(),
+                 m_multi_factor_auth->nth_factor,
+                 get_command_string(thd->lex->sql_command).c_str());
+        plugin_unlock(nullptr, plugin);
+        return (true);
+      }
+    }
+  } else if (auth->authentication_flags & AUTH_FLAG_REQUIRES_REGISTRATION) {
+    if (!get_auth_str_len()) set_requires_registration(true);
+    if (is_identified_by()) {
+      /*
+        IDENTIFIED BY not allowed for plugins which require registration
+      */
+      my_error(ER_IDENTIFIED_BY_UNSUPPORTED, MYF(0),
+               get_command_string(thd->lex->sql_command).c_str(),
+               get_plugin_str());
+      plugin_unlock(nullptr, plugin);
+      return (true);
+    }
+  }
+  /* generate auth string */
+  if (is_identified_by()) {
+    const char *inbuf = get_auth_str();
+    unsigned int inbuflen = (unsigned)get_auth_str_len();
+    char outbuf[MAX_FIELD_WIDTH] = {0};
+    unsigned int buflen = MAX_FIELD_WIDTH;
+    const char *password = nullptr;
+    std::string gen_password;
+    if (m_multi_factor_auth->has_password_generator) {
+      thd->m_disable_password_validation = true;
+      generate_random_password(&gen_password,
+                               thd->variables.generated_random_password_length);
+      inbuf = gen_password.c_str();
+      inbuflen = gen_password.length();
+      set_generated_password(gen_password.c_str(), gen_password.length());
+    }
+    if (auth->generate_authentication_string(outbuf, &buflen, inbuf,
+                                             inbuflen)) {
+      plugin_unlock(nullptr, plugin);
+      return (true);
+    }
+    if (buflen) {
+      password = strmake_root(m_mem_root, outbuf, buflen);
+    } else {
+      password = const_cast<char *>("");
+    }
+    if (inbuflen > 0) memset(const_cast<char *>(inbuf), 0, inbuflen);
+    /* Use the authentication_string field as password */
+    set_auth_str(password, buflen);
+  }
+  plugin_unlock(nullptr, plugin);
+  return false;
+}
+
+/**
+  Interface method to validate the auth plugin chain if user_attributes in
+  mysql.user table is modified using INSERT, UPDATE sql.
+
+  @returns status of row validation
+    @retval false Success
+    @retval true  Failure
+*/
+bool Multi_factor_auth_info::validate_row() {
+  /* validate all inputs */
+  plugin_ref plugin = my_plugin_lock_by_name(nullptr, plugin_name(),
+                                             MYSQL_AUTHENTICATION_PLUGIN);
+  /* check if plugin is loaded */
+  if (!plugin) {
+    LogErr(WARNING_LEVEL, ER_MFA_PLUGIN_NOT_LOADED, get_plugin_str());
+    return (true);
+  }
+  st_mysql_auth *auth = (st_mysql_auth *)plugin_decl(plugin)->info;
+  if (auth->authentication_flags & AUTH_FLAG_USES_INTERNAL_STORAGE) {
+    /* if registration flag is set then user_attributes is corrupt */
+    if (get_requires_registration()) {
+      char msg[64];
+      sprintf(msg, "Please check requires_registration flag for %d factor",
+              get_nth_factor());
+      LogErr(WARNING_LEVEL, ER_MFA_USER_ATTRIBUTES_CORRUPT, msg);
+    } else {
+      /* 2nd and 3rd factor auth plugin should not store passwords internally */
+      char msg[256];
+      sprintf(msg, "Please check authentication plugin for %s factor",
+              get_plugin_str());
+      LogErr(WARNING_LEVEL, ER_MFA_USER_ATTRIBUTES_CORRUPT, msg);
+    }
+    plugin_unlock(nullptr, plugin);
+    return (true);
+  }
+  plugin_unlock(nullptr, plugin);
+  return false;
+}
+
+/**
+  Method to update User_attributes column in mysql.user table.
+
+  @returns status of the operation
+    @retval false Success
+    @retval true  Failure
+*/
+bool Multi_factor_auth_info::update_user_attributes() {
+  /* update details of Multi factor authentication method */
+  m_update.m_what |= USER_ATTRIBUTES;
+  m_update.m_user_attributes = acl_table::USER_ATTRIBUTE_NONE;
+  if (m_multi_factor_auth->unregister) {
+    set_auth_str(nullptr, 0);
+    set_requires_registration(true);
+  }
+  return false;
+}
+
+/**
+  Helper function to convert an instance of Multi_factor_auth_info
+  into a JSON object.
+
+  @param [out]  mfa_arr       Json Array holding details about Multi factor
+  authentication methods.
+
+  @returns
+    @retval false Success
+    @retval true  Failure
+*/
+bool Multi_factor_auth_info::serialize(Json_array &mfa_arr) {
+  if (m_update.m_user_attributes & acl_table::USER_ATTRIBUTE_NONE) return false;
+  Json_object auth_factor;
+
+  Json_int rr(m_multi_factor_auth->requires_registration ? 1 : 0);
+  auth_factor.add_clone(mfa_consts::requires_registration, &rr);
+
+  Json_int pl(m_multi_factor_auth->passwordless ? 1 : 0);
+  auth_factor.add_clone(mfa_consts::passwordless, &pl);
+
+  const std::string auth_plugin(this->get_plugin_str(),
+                                this->get_plugin_str_len());
+  Json_string auth_plugin_str(auth_plugin);
+  auth_factor.add_clone(mfa_consts::auth_plugin, &auth_plugin_str);
+
+  const std::string auth_string(this->get_auth_str(), this->get_auth_str_len());
+  Json_string auth_str(auth_string);
+  auth_factor.add_clone(mfa_consts::auth_string, &auth_str);
+
+  mfa_arr.append_clone(&auth_factor);
+  return false;
+}
+
+/**
+  Helper function to read details from Json object representing Multi factor
+  authentication methods and filling details in Multi_factor_auth_info
+  instance.
+
+  @param [in]   nth_factor Number referring to nth factor.
+  @param [out]  mfa_dom    Json object holding details about Multi factor
+  authentication method.
+
+  @returns
+    @retval false Success
+    @retval true  Failure
+*/
+bool Multi_factor_auth_info::deserialize(uint nth_factor, Json_dom *mfa_dom) {
+  if (mfa_dom->json_type() != enum_json_type::J_OBJECT) return true;
+  (nth_factor ? set_factor(nthfactor::THIRD_FACTOR)
+              : set_factor(nthfactor::SECOND_FACTOR));
+  Json_object *with_fa_obj = down_cast<Json_object *>(mfa_dom);
+  Json_dom *rr_dom = with_fa_obj->get(mfa_consts::requires_registration);
+  if (rr_dom) {
+    if (rr_dom->json_type() != enum_json_type::J_INT) return true;
+    Json_int *rr_val = down_cast<Json_int *>(rr_dom);
+    set_requires_registration((rr_val->value() ? true : false));
+  }
+  Json_dom *pl_dom = with_fa_obj->get(mfa_consts::passwordless);
+  if (pl_dom) {
+    if (pl_dom->json_type() != enum_json_type::J_INT) return true;
+    Json_int *pl_val = down_cast<Json_int *>(pl_dom);
+    set_passwordless((pl_val->value() ? true : false));
+  }
+  Json_dom *auth_str_dom = with_fa_obj->get(mfa_consts::auth_string);
+  if (auth_str_dom) {
+    if (auth_str_dom->json_type() != enum_json_type::J_STRING) return true;
+    Json_string *auth_str = down_cast<Json_string *>(auth_str_dom);
+    set_auth_str(auth_str->value().c_str(), auth_str->size());
+  }
+  Json_dom *auth_plugin_dom = with_fa_obj->get(mfa_consts::auth_plugin);
+  if (auth_plugin_dom) {
+    if (auth_plugin_dom->json_type() != enum_json_type::J_STRING) return true;
+    Json_string *auth_plugin = down_cast<Json_string *>(auth_plugin_dom);
+    set_plugin_str(auth_plugin->value().c_str(), auth_plugin->size());
+  }
+  /* validate details of Multi factor authentication methods read from row */
+  if (validate_row()) return true;
+  return false;
+}
+
+/**
+  This method initiates registration step. This method calls plugin
+  specific registration method to get details needed to do registration.
+  This method further appends user name to it. This method will do nothing
+  in case init registration is already done.
+
+  @param [in]  thd        THD handle
+  @param [in]  nth_factor Number representing which factor to init
+  registration step
+
+  Format of buffer is a length encoded string.
+  [salt length][random salt][relying party ID length][relying party ID]
+  [user name length][user name]
+
+  @return registration status
+    @retval false Success
+    @retval true  Failure
+*/
+bool Multi_factor_auth_info::init_registration(THD *thd, uint nth_factor) {
+  /* check if we are registerting correct Multi factor authentication method */
+  if (get_nth_factor() != nth_factor) return false;
+  /*
+    incase init registration is done, then server challenge will be
+    in auth string
+  */
+  if (get_auth_str_len()) return false;
+  plugin_ref plugin = my_plugin_lock_by_name(nullptr, plugin_name(),
+                                             MYSQL_AUTHENTICATION_PLUGIN);
+  /* check if plugin is loaded */
+  if (!plugin) {
+    my_error(ER_PLUGIN_IS_NOT_LOADED, MYF(0), get_plugin_str());
+    return (true);
+  }
+  st_mysql_auth *auth = (st_mysql_auth *)plugin_decl(plugin)->info;
+  if (!(auth->authentication_flags & AUTH_FLAG_REQUIRES_REGISTRATION)) {
+    my_error(ER_INVALID_PLUGIN_FOR_REGISTRATION, MYF(0), get_plugin_str());
+    plugin_unlock(nullptr, plugin);
+    return (true);
+  }
+  unsigned char *plugin_buf = nullptr;
+  unsigned int plugin_buf_len = 0;
+
+  std::string service_name("mysql_authentication_registration.");
+  service_name.append(get_plugin_str());
+
+  my_h_service h_reg_svc = nullptr;
+  SERVICE_TYPE(mysql_authentication_registration) * mysql_auth_reg_service;
+
+  if (!srv_registry->acquire(service_name.c_str(), &h_reg_svc)) {
+    mysql_auth_reg_service =
+        reinterpret_cast<SERVICE_TYPE(mysql_authentication_registration) *>(
+            h_reg_svc);
+
+    mysql_auth_reg_service->get_challenge_length(&plugin_buf_len);
+    /* buffer allocated by server before passing to component service */
+    plugin_buf = new unsigned char[plugin_buf_len];
+    if (mysql_auth_reg_service->init(&plugin_buf, plugin_buf_len)) {
+      delete[] plugin_buf;
+      srv_registry->release(h_reg_svc);
+      return true;
+    }
+  }
+  srv_registry->release(h_reg_svc);
+
+  size_t user_name_len = thd->security_context()->user().length +
+                         thd->security_context()->host().length;
+
+  /* append user name to random challenge(32bit salt + RP id). */
+  size_t buflen =
+      plugin_buf_len + user_name_len + net_length_size(user_name_len);
+  unsigned char *buf = new unsigned char[buflen];
+  unsigned char *pos = buf;
+
+  memcpy(pos, plugin_buf, plugin_buf_len);
+  pos += plugin_buf_len;
+
+  if (plugin_buf) delete[] plugin_buf;
+
+  pos = net_store_length(pos, user_name_len);
+  memcpy(pos, thd->security_context()->user().str,
+         thd->security_context()->user().length);
+  pos += thd->security_context()->user().length;
+  memcpy(pos, thd->security_context()->host().str,
+         thd->security_context()->host().length);
+  pos += thd->security_context()->host().length;
+
+  assert(buflen == (uint)(pos - buf));
+
+  /* convert auth string to base64 to be stored in mysql.user table */
+  char outbuf[MAX_FIELD_WIDTH] = {0};
+  unsigned int outbuflen = MAX_FIELD_WIDTH;
+  if (auth->generate_authentication_string(
+          outbuf, &outbuflen, reinterpret_cast<char *>(buf), buflen)) {
+    if (buf) delete[] buf;
+    plugin_unlock(nullptr, plugin);
+    return (true);
+  }
+  if (buf) delete[] buf;
+  /* turn OFF init registration flag */
+  set_init_registration(false);
+
+  /* save buffer in auth_string */
+  set_auth_str(reinterpret_cast<const char *>(outbuf), outbuflen);
+  plugin_unlock(nullptr, plugin);
+  return false;
+}
+
+/**
+  This method reads the credential details received from FIDO device
+  and saves in user_attributes column of mysql.user table.
+
+  @param [in]  thd        Connection handler
+  @param [in]  user_name  Handler to LEX_USER
+  @param [in]  nth_factor Number referrering to nth factor
+
+  @return
+    @retval false Success
+    @retval true  Failure
+*/
+bool Multi_factor_auth_info::finish_registration(THD *thd, LEX_USER *user_name,
+                                                 uint nth_factor) {
+  if (get_nth_factor() != nth_factor) return false;
+  plugin_ref plugin = my_plugin_lock_by_name(nullptr, plugin_name(),
+                                             MYSQL_AUTHENTICATION_PLUGIN);
+  /* check if plugin is loaded */
+  if (!plugin) {
+    my_error(ER_PLUGIN_IS_NOT_LOADED, MYF(0), get_plugin_str());
+    return (true);
+  }
+  st_mysql_auth *auth = (st_mysql_auth *)plugin_decl(plugin)->info;
+  if (!(auth->authentication_flags & AUTH_FLAG_REQUIRES_REGISTRATION)) {
+    my_error(ER_INVALID_PLUGIN_FOR_REGISTRATION, MYF(0), get_plugin_str());
+    plugin_unlock(nullptr, plugin);
+    return (true);
+  }
+
+  LEX_MFA *tmp_lex_mfa;
+  List_iterator<LEX_MFA> mfa_list_it(user_name->mfa_list);
+  unsigned char *signed_challenge = nullptr;
+  unsigned int signed_challenge_len = 0;
+  /* get challenge response */
+  while ((tmp_lex_mfa = mfa_list_it++)) {
+    signed_challenge = reinterpret_cast<unsigned char *>(
+        const_cast<char *>(tmp_lex_mfa->challenge_response.str));
+    signed_challenge_len = tmp_lex_mfa->challenge_response.length;
+  }
+
+  /* key handle should not exceed more than 256 bytes */
+  unsigned int challenge_response_len = 256;
+  unsigned char *challenge_response = new unsigned char[challenge_response_len];
+
+  std::string service_name("mysql_authentication_registration.");
+  service_name.append(get_plugin_str());
+
+  my_h_service h_reg_svc = nullptr;
+  SERVICE_TYPE(mysql_authentication_registration) * mysql_auth_reg_service;
+
+  if (!srv_registry->acquire(service_name.c_str(), &h_reg_svc)) {
+    mysql_auth_reg_service =
+        reinterpret_cast<SERVICE_TYPE(mysql_authentication_registration) *>(
+            h_reg_svc);
+
+    if (mysql_auth_reg_service->finish(
+            signed_challenge, signed_challenge_len,
+            reinterpret_cast<const unsigned char *>(get_auth_str()),
+            get_auth_str_len(), challenge_response, &challenge_response_len)) {
+      my_error(ER_USER_REGISTRATION_FAILED, MYF(0));
+      srv_registry->release(h_reg_svc);
+      plugin_unlock(nullptr, plugin);
+      return (true);
+    }
+  }
+  /* release the service */
+  srv_registry->release(h_reg_svc);
+  /* convert auth string to base64 to be stored in mysql.user table */
+  char outbuf[MAX_FIELD_WIDTH] = {0};
+  unsigned int outbuflen = MAX_FIELD_WIDTH;
+  if (auth->generate_authentication_string(
+          outbuf, &outbuflen, reinterpret_cast<char *>(challenge_response),
+          challenge_response_len)) {
+    plugin_unlock(nullptr, plugin);
+    return (true);
+  }
+  /* turn OFF finish registration flag */
+  set_finish_registration(false);
+  if (is_passwordless()) {
+    /*
+      In below case:
+      CREATE USER u1 IDENTIFIED WITH authentication_fido INITIAL
+          AUTHENTICATION BY 'pass';
+      server for above ddl will interchange 1FA and 2FA so that user,
+      for first time is expected to authenticate with an initial
+      password to perform registration.
+
+      Before registration:
+      SELECT user,plugin,user_attributes FROM mysql.user WHERE
+      user='u1'\G
+      *************************** 1. row ***************************
+      user: u1
+      plugin: caching_sha2_password
+      user_attributes: {"Multi_factor_authentication": [{"plugin":
+          "authentication_fido", "passwordless": 1,
+      "authentication_string":
+          "", "requires_registration": 1}]}
+
+      After registration:
+      SELECT user,plugin,authentication_string,user_attributes FROM
+      mysql.user WHERE user='u1'\G
+      *************************** 1. row ***************************
+      user: u1
+      plugin: authentication_fido
+      authentication_string: <fido credentials>
+      user_attributes: NULL
+    */
+    lex_string_strmake(thd->mem_root, &user_name->first_factor_auth_info.plugin,
+                       reinterpret_cast<const char *>(get_plugin_str()),
+                       get_plugin_str_len());
+    lex_string_strmake(thd->mem_root, &user_name->first_factor_auth_info.auth,
+                       reinterpret_cast<const char *>(outbuf), outbuflen);
+  } else {
+    set_auth_str(reinterpret_cast<const char *>(outbuf), outbuflen);
+  }
+  delete[] challenge_response;
+  set_requires_registration(false);
+
+  plugin_unlock(nullptr, plugin);
+  return false;
+}
+
+/**
+  This method will fill in missing details like plugin name or
+  authentication string, during CREATE/ALTER user sql so that
+  binlog is logged with correct Multi factor authentication methods.
+
+  @param [in]  thd        connection handler
+  @param [in]  user_name  Handler to LEX_USER
+*/
+void Multi_factor_auth_info::get_info_for_query_rewrite(THD *thd,
+                                                        LEX_USER *user_name) {
+  List_iterator<LEX_MFA> mfa_list_it(user_name->mfa_list);
+  LEX_MFA *tmp_mfa = nullptr;
+  while ((tmp_mfa = mfa_list_it++)) {
+    if (tmp_mfa->nth_factor == get_nth_factor()) break;
+  }
+  /* SHOW CREATE USER mfa list is empty */
+  if (tmp_mfa == nullptr) {
+    if (thd->lex->sql_command == SQLCOM_CREATE_USER ||
+        thd->lex->sql_command == SQLCOM_SHOW_CREATE_USER) {
+      LEX_MFA *lm = (LEX_MFA *)thd->alloc(sizeof(LEX_MFA));
+      lm->reset();
+      lm->plugin.str = get_plugin_str();
+      lm->plugin.length = get_plugin_str_len();
+      lm->auth.str = get_auth_str();
+      lm->auth.length = get_auth_str_len();
+      lm->init_registration = get_init_registration();
+      lm->finish_registration = get_finish_registration();
+      lm->passwordless = is_passwordless();
+      user_name->mfa_list.push_back(lm);
+      return;
+    }
+  } else {
+    if (!tmp_mfa->plugin.length)
+      lex_string_strmake(thd->mem_root, &tmp_mfa->plugin,
+                         reinterpret_cast<const char *>(get_plugin_str()),
+                         get_plugin_str_len());
+    if (!tmp_mfa->auth.length) {
+      /*
+        if it is passwordless user, copy fido credentials saved as part of
+        first factor.
+      */
+      if (is_passwordless()) {
+        lex_string_strmake(thd->mem_root, &tmp_mfa->auth,
+                           user_name->first_factor_auth_info.auth.str,
+                           user_name->first_factor_auth_info.auth.length);
+      } else {
+        lex_string_strmake(thd->mem_root, &tmp_mfa->auth, get_auth_str(),
+                           get_auth_str_len());
+      }
+    }
+  }
+}
+
+/**
+  This method will return randomly generated passwords as part of
+  IDENTIFIED BY RANDOM PASSWORD clause, so that it can be sent to
+  client.
+
+  @param [out]  gp        List holding all generated passwords.
+  @param [in]   u         Name of user
+  @param [in]   h         Host name
+*/
+void Multi_factor_auth_info::get_generated_passwords(Userhostpassword_list &gp,
+                                                     const char *u,
+                                                     const char *h) {
+  if (m_multi_factor_auth->has_password_generator) {
+    random_password_info p{std::string(u), std::string(h),
+                           std::string(get_generated_password_str()),
+                           get_nth_factor()};
+    gp.push_back(p);
+    /* Once password is returned turn off the flag */
+    m_multi_factor_auth->has_password_generator = false;
+  }
+}
+
+/**
+  This method will return randomly generated server challenge as part of
+  ALTER USER .. INITIATE REGISTRATION clause, so that it can be sent to
+  client.
+
+  @param [out]   sc        List holding all generated server challenges.
+*/
+void Multi_factor_auth_info::get_server_challenge(
+    std::vector<std::string> &sc) {
+  if (get_requires_registration() && get_auth_str_len()) {
+    sc.push_back({std::string(get_auth_str(), get_auth_str_len())});
+  }
+}
+
+Multi_factor_auth_info &Multi_factor_auth_info::operator=(
+    Multi_factor_auth_info &new_af) {
+  if (this != &new_af) {
+    if (new_af.get_plugin_str_len()) /* copy plugin name */
+      set_plugin_str(new_af.get_plugin_str(), new_af.get_plugin_str_len());
+    if (new_af.get_auth_str_len()) /* copy auth str */
+      set_auth_str(new_af.get_auth_str(), new_af.get_auth_str_len());
+    set_passwordless(new_af.is_passwordless());
+    set_requires_registration(new_af.get_requires_registration());
+  }
+  return *this;
+}
+
+void Multi_factor_auth_list::add_factor(I_multi_factor_auth *m) {
+  m_factor.push_back(m);
+}
+
+bool Multi_factor_auth_info::is_identified_by() {
+  return m_multi_factor_auth->uses_identified_by_clause;
+}
+bool Multi_factor_auth_info::is_identified_with() {
+  return m_multi_factor_auth->uses_identified_with_clause;
+}
+
+LEX_CSTRING &Multi_factor_auth_info::plugin_name() {
+  return m_multi_factor_auth->plugin;
+}
+
+const char *Multi_factor_auth_info::get_auth_str() {
+  return m_multi_factor_auth->auth.str;
+}
+
+size_t Multi_factor_auth_info::get_auth_str_len() {
+  return m_multi_factor_auth->auth.length;
+}
+
+const char *Multi_factor_auth_info::get_generated_password_str() {
+  return m_multi_factor_auth->generated_password.str;
+}
+
+size_t Multi_factor_auth_info::get_generated_password_len() {
+  return m_multi_factor_auth->generated_password.length;
+}
+
+const char *Multi_factor_auth_info::get_plugin_str() {
+  return m_multi_factor_auth->plugin.str;
+}
+size_t Multi_factor_auth_info::get_plugin_str_len() {
+  return m_multi_factor_auth->plugin.length;
+}
+
+nthfactor Multi_factor_auth_info::get_factor() {
+  if (m_multi_factor_auth->nth_factor == 2)
+    return nthfactor::SECOND_FACTOR;
+  else if (m_multi_factor_auth->nth_factor == 3)
+    return nthfactor::THIRD_FACTOR;
+  else
+    return nthfactor::NONE;
+}
+
+unsigned int Multi_factor_auth_info::get_nth_factor() {
+  return m_multi_factor_auth->nth_factor;
+}
+
+bool Multi_factor_auth_info::is_add_factor() {
+  return m_multi_factor_auth->add_factor;
+}
+
+bool Multi_factor_auth_info::is_drop_factor() {
+  return m_multi_factor_auth->drop_factor;
+}
+bool Multi_factor_auth_info::is_modify_factor() {
+  return m_multi_factor_auth->modify_factor;
+}
+
+bool Multi_factor_auth_info::is_passwordless() {
+  return m_multi_factor_auth->passwordless;
+}
+
+bool Multi_factor_auth_info::get_init_registration() {
+  return m_multi_factor_auth->init_registration;
+}
+
+bool Multi_factor_auth_info::get_finish_registration() {
+  return m_multi_factor_auth->finish_registration;
+}
+
+bool Multi_factor_auth_info::get_requires_registration() {
+  return m_multi_factor_auth->requires_registration;
+}
+
+bool Multi_factor_auth_info::get_unregister() {
+  return m_multi_factor_auth->unregister;
+}
+
+LEX_MFA *Multi_factor_auth_info::get_lex_mfa() { return m_multi_factor_auth; }
+
+void Multi_factor_auth_info::set_auth_str(const char *str, size_t l) {
+  lex_string_strmake(m_mem_root, &m_multi_factor_auth->auth, str, l);
+}
+
+void Multi_factor_auth_info::set_plugin_str(const char *str, size_t l) {
+  lex_string_strmake(m_mem_root, &m_multi_factor_auth->plugin, str, l);
+}
+
+void Multi_factor_auth_info::set_generated_password(const char *str, size_t l) {
+  lex_string_strmake(m_mem_root, &m_multi_factor_auth->generated_password, str,
+                     l);
+}
+
+void Multi_factor_auth_info::set_factor(nthfactor f) {
+  if (f == nthfactor::SECOND_FACTOR)
+    m_multi_factor_auth->nth_factor = 2;
+  else if (f == nthfactor::THIRD_FACTOR)
+    m_multi_factor_auth->nth_factor = 3;
+  else
+    m_multi_factor_auth->nth_factor = 0;
+}
+
+void Multi_factor_auth_info::set_passwordless(int v) {
+  m_multi_factor_auth->passwordless = (v ? true : false);
+}
+
+void Multi_factor_auth_info::set_init_registration(bool v) {
+  m_multi_factor_auth->init_registration = v;
+}
+
+void Multi_factor_auth_info::set_finish_registration(bool v) {
+  m_multi_factor_auth->finish_registration = v;
+}
+
+void Multi_factor_auth_info::set_requires_registration(int v) {
+  m_multi_factor_auth->requires_registration = (v ? true : false);
+}
+
+std::string Multi_factor_auth_info::get_command_string(
+    enum_sql_command sql_command) {
+  switch (sql_command) {
+    case SQLCOM_CREATE_USER:
+      return std::string("CREATE USER");
+      break;
+    case SQLCOM_ALTER_USER:
+      return std::string("ALTER USER");
+      break;
+    default:
+      assert(0);
+  }
+  return std::string();
+}
diff -Nru mysql-8.0-8.0.26/sql/auth/sql_mfa.h mysql-8.0-8.0.27/sql/auth/sql_mfa.h
--- mysql-8.0-8.0.26/sql/auth/sql_mfa.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/auth/sql_mfa.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,222 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef SQL_MFA_INCLUDED
+#define SQL_MFA_INCLUDED
+
+#include <string>
+#include <vector>
+
+#include "sql/auth/user_table.h"
+#include "sql/json_dom.h"  // Json_array
+#include "sql/mem_root_allocator.h"
+#include "sql/sql_class.h"
+#include "sql/table.h"
+
+enum class nthfactor { NONE = 1, SECOND_FACTOR, THIRD_FACTOR };
+
+class Multi_factor_auth_list;
+class Multi_factor_auth_info;
+
+/**
+  An interface to access information about Multi factor authentication
+  methods. This interface represents a chain of authentication plugins
+  for a given user account.
+*/
+class I_multi_factor_auth {
+ public:
+  virtual ~I_multi_factor_auth() = default;
+  /**
+    Helper methods to verify and update ALTER USER sql
+    when altering Multi factor authentication methods.
+  */
+  virtual bool is_alter_allowed(THD *, LEX_USER *) { return false; }
+  virtual void alter_mfa(I_multi_factor_auth *) {}
+  /**
+    Helper method to validate Multi factor authentication methods.
+  */
+  virtual bool validate_plugins_in_auth_chain(THD *thd) = 0;
+  /**
+    Helper method to validate Multi factor authentication methods are
+    correct compared to authentication policy.
+  */
+  virtual bool validate_against_authentication_policy(THD *) { return false; }
+  /**
+    method to add/delete Multi factor authentication methods in user_attributes
+    column.
+  */
+  virtual bool update_user_attributes() = 0;
+  virtual void add_factor(I_multi_factor_auth *m MY_ATTRIBUTE((unused))) {}
+  /**
+    Helper methods to convert this interface into a valid JSON object
+    and vice versa.
+  */
+  virtual bool serialize(Json_array &mfa_arr) = 0;
+  virtual bool deserialize(uint f, Json_dom *mfa_dom) = 0;
+  /**
+    Helper methods to do registration step.
+  */
+  virtual bool init_registration(THD *, uint) = 0;
+  virtual bool finish_registration(THD *, LEX_USER *, uint) = 0;
+  virtual bool is_passwordless() = 0;
+
+  /**
+    Fill needed info in LEX_USER::mfa_list for query rewrite
+  */
+  virtual void get_info_for_query_rewrite(THD *, LEX_USER *) = 0;
+  /**
+    Fill in generated passwords from respective Multi factor authentication
+    methods
+  */
+  virtual void get_generated_passwords(Userhostpassword_list &gp, const char *u,
+                                       const char *h) = 0;
+  /**
+    Fill in server challenge generated as part of initiate registration step.
+  */
+  virtual void get_server_challenge(std::vector<std::string> &sc) = 0;
+  /**
+    Get methods.
+  */
+  Multi_factor_auth_list *get_multi_factor_auth_list() {
+    return down_cast<Multi_factor_auth_list *>(this);
+  }
+
+  Multi_factor_auth_info *get_multi_factor_auth_info() {
+    return down_cast<Multi_factor_auth_info *>(this);
+  }
+};
+
+template <typename T>
+using my_vector = std::vector<T, Mem_root_allocator<T>>;
+
+class Multi_factor_auth_list : public I_multi_factor_auth {
+ private:
+  /* multi_factor_auth hierarchy */
+  my_vector<I_multi_factor_auth *> m_factor;
+
+ public:
+  Multi_factor_auth_list(MEM_ROOT *);
+  ~Multi_factor_auth_list() override;
+  my_vector<I_multi_factor_auth *> &get_mfa_list();
+  size_t get_mfa_list_size();
+  bool is_alter_allowed(THD *, LEX_USER *) override;
+  void alter_mfa(I_multi_factor_auth *) override;
+  bool validate_plugins_in_auth_chain(THD *thd) override;
+  bool validate_against_authentication_policy(THD *thd) override;
+  bool update_user_attributes() override;
+  void add_factor(I_multi_factor_auth *m) override;
+  bool serialize(Json_array &mfa_arr) override;
+  bool deserialize(uint f, Json_dom *mfa_dom) override;
+  bool init_registration(THD *, uint) override;
+  bool finish_registration(THD *, LEX_USER *, uint) override;
+  bool is_passwordless() override;
+  void get_info_for_query_rewrite(THD *, LEX_USER *) override;
+  void get_generated_passwords(Userhostpassword_list &gp, const char *u,
+                               const char *h) override;
+  void get_server_challenge(std::vector<std::string> &sc) override;
+
+ private:
+  /*
+    This methods ensures that hierarchy of m_factor is always
+    2FA followed by 3FA.
+  */
+  void sort_mfa();
+};
+
+/*
+  This class represents each individual factor from chain of
+  authentication plugins for a given user account.
+*/
+class Multi_factor_auth_info : public I_multi_factor_auth {
+ private:
+  MEM_ROOT *m_mem_root;
+  LEX_MFA *m_multi_factor_auth;
+  acl_table::Pod_user_what_to_update m_update;
+
+ public:
+  Multi_factor_auth_info(MEM_ROOT *mem_root);
+  Multi_factor_auth_info(MEM_ROOT *mem_root, LEX_MFA *m);
+  ~Multi_factor_auth_info() override {}
+  /* validate Multi factor authentication plugins during ACL DDL */
+  bool validate_plugins_in_auth_chain(THD *thd) override;
+  /* update user attributes */
+  bool update_user_attributes() override;
+  /* construct json object out of user attributes column */
+  bool serialize(Json_array &mfa_arr) override;
+  bool deserialize(uint f, Json_dom *mfa_dom) override;
+  /* helper methods to do registration */
+  bool init_registration(THD *, uint) override;
+  bool finish_registration(THD *, LEX_USER *, uint) override;
+  bool is_passwordless() override;
+  void get_info_for_query_rewrite(THD *, LEX_USER *) override;
+  void get_generated_passwords(Userhostpassword_list &gp, const char *u,
+                               const char *h) override;
+  void get_server_challenge(std::vector<std::string> &sc) override;
+
+  /* during ALTER USER copy attributes from ACL_USER */
+  Multi_factor_auth_info &operator=(Multi_factor_auth_info &new_af);
+
+ private:
+  /*
+    validate Multi factor authentication attributes read from row of
+    mysql.user table
+  */
+  bool validate_row();
+
+ public:
+  bool is_identified_by();
+  bool is_identified_with();
+  LEX_CSTRING &plugin_name();
+
+  const char *get_auth_str();
+  size_t get_auth_str_len();
+
+  const char *get_plugin_str();
+  size_t get_plugin_str_len();
+
+  const char *get_generated_password_str();
+  size_t get_generated_password_len();
+
+  nthfactor get_factor();
+  unsigned int get_nth_factor();
+  bool is_add_factor();
+  bool is_drop_factor();
+  bool is_modify_factor();
+
+  bool get_init_registration();
+  bool get_finish_registration();
+  bool get_requires_registration();
+  bool get_unregister();
+  LEX_MFA *get_lex_mfa();
+
+  void set_auth_str(const char *, size_t);
+  void set_plugin_str(const char *, size_t);
+  void set_generated_password(const char *, size_t);
+  void set_factor(nthfactor f);
+  void set_passwordless(int v);
+  void set_init_registration(bool v);
+  void set_finish_registration(bool v);
+  void set_requires_registration(int v);
+
+  std::string get_command_string(enum_sql_command sql_command);
+};
+
+#endif /* SQL_MFA_INCLUDED */
diff -Nru mysql-8.0-8.0.26/sql/auth/sql_security_ctx.cc mysql-8.0-8.0.27/sql/auth/sql_security_ctx.cc
--- mysql-8.0-8.0.26/sql/auth/sql_security_ctx.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/auth/sql_security_ctx.cc	2021-09-28 11:46:34.000000000 +0000
@@ -93,6 +93,7 @@
   m_is_skip_grants_user = false;
   m_has_drop_policy = false;
   m_executed_drop_policy = false;
+  m_registration_sandbox_mode = false;
 }
 
 void Security_context::logout() {
@@ -159,6 +160,7 @@
   m_password_expired = false;
   m_is_skip_grants_user = false;
   clear_db_restrictions();
+  m_registration_sandbox_mode = false;
 }
 
 /**
diff -Nru mysql-8.0-8.0.26/sql/auth/sql_security_ctx.h mysql-8.0-8.0.27/sql/auth/sql_security_ctx.h
--- mysql-8.0-8.0.26/sql/auth/sql_security_ctx.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/auth/sql_security_ctx.h	2021-09-28 11:46:34.000000000 +0000
@@ -299,6 +299,9 @@
 
   void clear_db_restrictions();
 
+  bool is_in_registration_sandbox_mode();
+  void set_registration_sandbox_mode(bool v);
+
   void set_thd(THD *thd);
 
   THD *get_thd();
@@ -382,6 +385,18 @@
   bool m_has_drop_policy;
   std::unique_ptr<std::function<void(Security_context *)>> m_drop_policy;
   Restrictions m_restrictions;
+  /**
+    This flag tracks if server should be in sandbox mode or not.
+    When user account connects to server, with any of its authentication
+    plugin's registration step pending, in that case, the connection is
+    set in sandbox(or registration) mode i.e m_registration_sandbox_mode is set
+    to TRUE.
+    During this time only ALTER USER, SET PASSWORD statements are allowed.
+    Once user finishes the registration steps for the authentication plugin
+    via an ALTER USER statement, m_registration_sandbox_mode is set to FALSE,
+    making a full fledged connection, where user can execute any sql statement.
+  */
+  bool m_registration_sandbox_mode;
 
   /**
     m_thd - Thread handle, set to nullptr if this does not belong to any THD yet
@@ -485,6 +500,14 @@
   m_restrictions.clear_db();
 }
 
+inline bool Security_context::is_in_registration_sandbox_mode() {
+  return m_registration_sandbox_mode;
+}
+
+inline void Security_context::set_registration_sandbox_mode(bool v) {
+  m_registration_sandbox_mode = v;
+}
+
 inline void Security_context::set_thd(THD *thd) { m_thd = thd; }
 
 inline THD *Security_context::get_thd() { return m_thd; }
diff -Nru mysql-8.0-8.0.26/sql/auth/sql_user.cc mysql-8.0-8.0.27/sql/auth/sql_user.cc
--- mysql-8.0-8.0.26/sql/auth/sql_user.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/auth/sql_user.cc	2021-09-28 11:46:34.000000000 +0000
@@ -34,6 +34,7 @@
 #include "m_ctype.h"
 #include "m_string.h"
 #include "map_helpers.h"
+#include "mutex_lock.h"  // Mutex_lock
 #include "my_alloc.h"
 #include "my_base.h"
 #include "my_compiler.h"
@@ -96,6 +97,7 @@
 #include "sql/auth/auth_internal.h"
 #include "sql/auth/sql_auth_cache.h"
 #include "sql/auth/sql_authentication.h"
+#include "sql/auth/sql_mfa.h"
 #include "sql/auth/sql_user_table.h"
 #include "sql/current_thd.h"
 #include "sql/derror.h" /* ER_THD */
@@ -115,9 +117,12 @@
  */
 void log_user(THD *thd, String *str, LEX_USER *user, bool comma = true) {
   String from_user(user->user.str, user->user.length, system_charset_info);
-  String from_plugin(user->plugin.str, user->plugin.length,
+  String from_plugin(user->first_factor_auth_info.plugin.str,
+                     user->first_factor_auth_info.plugin.length,
                      system_charset_info);
-  String from_auth(user->auth.str, user->auth.length, system_charset_info);
+  String from_auth(user->first_factor_auth_info.auth.str,
+                   user->first_factor_auth_info.auth.length,
+                   system_charset_info);
   String from_host(user->host.str, user->host.length, system_charset_info);
 
   if (comma) str->append(',');
@@ -302,16 +307,20 @@
     return true;
   }
   /* fill in plugin, auth_str from acl_user */
-  user_name->auth.str = acl_user->credentials[PRIMARY_CRED].m_auth_string.str;
-  user_name->auth.length =
+  user_name->first_factor_auth_info.auth.str =
+      acl_user->credentials[PRIMARY_CRED].m_auth_string.str;
+  user_name->first_factor_auth_info.auth.length =
       acl_user->credentials[PRIMARY_CRED].m_auth_string.length;
-  user_name->plugin = acl_user->plugin;
-  user_name->uses_identified_by_clause = true;
-  user_name->uses_identified_with_clause = false;
-  user_name->uses_authentication_string_clause = false;
+  user_name->first_factor_auth_info.plugin = acl_user->plugin;
+  user_name->first_factor_auth_info.uses_identified_by_clause = true;
+  user_name->first_factor_auth_info.uses_identified_with_clause = false;
+  user_name->first_factor_auth_info.uses_authentication_string_clause = false;
   user_name->retain_current_password = false;
   user_name->discard_old_password = false;
 
+  /* fill in details related to MFA methods */
+  if (acl_user->m_mfa)
+    acl_user->m_mfa->get_info_for_query_rewrite(thd, user_name);
   /* make a copy of user resources, ssl and password expire attributes */
   tmp_user_resource = lex->mqh;
   lex->mqh = acl_user->user_resource;
@@ -946,20 +955,23 @@
   meta_data.push_back(new Item_string("host", 4, system_charset_info));
   meta_data.push_back(
       new Item_string("generated password", 18, system_charset_info));
+  meta_data.push_back(new Item_uint(NAME_STRING("auth_factor"), 1, 12));
   mem_root_deque<Item *> item_list(thd->mem_root);
   Query_result_send output;
   if (output.send_result_set_metadata(
           thd, meta_data, Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
     return true;
   for (auto password : generated_passwords) {
-    Item *item = new Item_string(password[0].c_str(), password[0].length(),
+    Item *item = new Item_string(password.user.c_str(), password.user.length(),
                                  system_charset_info);
     item_list.push_back(item);
-    item = new Item_string(password[1].c_str(), password[1].length(),
+    item = new Item_string(password.host.c_str(), password.host.length(),
                            system_charset_info);
     item_list.push_back(item);
-    item = new Item_string(password[2].c_str(), password[2].length(),
-                           system_charset_info);
+    item = new Item_string(password.password.c_str(),
+                           password.password.length(), system_charset_info);
+    item_list.push_back(item);
+    item = new Item_uint(password.authentication_factor);
     item_list.push_back(item);
     if (output.send_data(thd, item_list)) {
       return true;
@@ -972,6 +984,229 @@
 }
 
 /**
+  Helper method to turn off sandbox mode once registration step is complete
+
+  @param thd       connection handle
+  @param user      user account for which registration is completed
+
+  @retval false registration successfull
+  @retval true  error
+*/
+bool turn_off_sandbox_mode(THD *thd, LEX_USER *user) {
+  Acl_cache_lock_guard acl_cache_lock{thd, Acl_cache_lock_mode::READ_MODE};
+  if (!acl_cache_lock.lock(false)) return true;
+  ACL_USER *acl_user = find_acl_user(user->host.str, user->user.str, true);
+  bool should_sandbox_mode_be_on = false;
+  if (acl_user->m_mfa) {
+    Multi_factor_auth_list *acl_factor =
+        acl_user->m_mfa->get_multi_factor_auth_list();
+
+    for (auto m_it : acl_factor->get_mfa_list()) {
+      Multi_factor_auth_info *af = m_it->get_multi_factor_auth_info();
+      should_sandbox_mode_be_on |= af->get_requires_registration();
+    }
+  }
+  Security_context *sctx = thd->security_context();
+  const bool is_self [[maybe_unused]] =
+      !strcmp(sctx->user().str, user->user.str) &&
+      !my_strcasecmp(system_charset_info, user->host.str,
+                     sctx->priv_host().str);
+  assert(is_self);
+  sctx->set_registration_sandbox_mode(should_sandbox_mode_be_on);
+  return false;
+}
+
+/**
+  Helper method to compare plugin name with authentication_policy for the
+  nth factor.
+
+  @param factor    nth factor which needs to be checked.
+  @param plugin    plugin name for nth factor.
+  @param list      authentication_policy value
+
+  @retval false if plugin matches the policy at nth_factor
+  @retval true  if plugin names does not match
+*/
+static bool compare_plugin_with_policy(const uint factor,
+                                       const std::string plugin,
+                                       std::vector<std::string> &list) {
+  /* if policy does not allow factor factors to be defined report error. */
+  if (list.size() < factor) return true;
+  /*
+    if plugin name is specified then it must be an exact match against policy
+    or should match *.
+  */
+  if (plugin.length()) {
+    if (list[factor - 1].length() && list[factor - 1].compare("*") &&
+        my_strcasecmp(system_charset_info, list[factor - 1].c_str(),
+                      plugin.c_str()))
+      return true;
+  } else {
+    /*
+      if IDENTIFIED BY is specified and plugin length is 0, then policies nth
+      factor should contain concrete value.
+    */
+    if (list[factor - 1].length() == 0 || list[factor - 1].compare("*") == 0)
+      return true;
+  }
+  return false;
+}
+
+/**
+  Method to validate CREATE/ALTER USER sql against authentication policy.
+  Authentication policy holds list of atmost 3 auth plugin names where each
+  plugin name should match against nth factor in CREATE/ALTER USER.
+  Value * in policy indicates any plugin is allowed.
+  Value 'empty string' indicates an optional value.
+
+  @param thd          connection handle
+  @param user_name    user on which authentication policy has to be verified
+  @param command      sql command to refer to CREATE or ALTER USER
+  @param mfa          handler to mfa attributes for given user_name
+
+  @retval false success allow CREATE/ALTER user
+  @retval true  failure CREATE/ALTER user should report error
+*/
+static bool check_for_authentication_policy(THD *thd, LEX_USER *user_name,
+                                            enum_sql_command command,
+                                            I_multi_factor_auth *mfa) {
+  bool policy_priv_exist =
+      thd->security_context()
+          ->has_global_grant(STRING_WITH_LEN("AUTHENTICATION_POLICY_ADMIN"))
+          .first;
+  mysql_mutex_lock(&LOCK_authentication_policy);
+  std::vector<std::string> &auth_policy_list = authentication_policy_list;
+  mysql_mutex_unlock(&LOCK_authentication_policy);
+  List_iterator<LEX_MFA> mfa_list_it(user_name->mfa_list);
+  LEX_MFA *tmp_mfa = nullptr;
+  LEX_MFA *second_factor = nullptr;
+  LEX_MFA *third_factor = nullptr;
+  const char *second_factor_plugin_name = nullptr;
+  const char *third_factor_plugin_name = nullptr;
+  Multi_factor_auth_list *mfa_list =
+      (mfa ? mfa->get_multi_factor_auth_list() : nullptr);
+
+  DBUG_TRACE;
+  assert(!auth_policy_list.empty());
+
+  uint nth_factor = user_name->first_factor_auth_info.nth_factor;
+  /* check 1FA method */
+  if (user_name->first_factor_auth_info.uses_identified_by_clause ||
+      user_name->first_factor_auth_info.uses_identified_with_clause ||
+      command == SQLCOM_CREATE_USER) {
+    if (compare_plugin_with_policy(nth_factor,
+                                   user_name->first_factor_auth_info.plugin.str,
+                                   auth_policy_list))
+      goto error;
+  }
+  while ((tmp_mfa = mfa_list_it++)) {
+    if (!second_factor)
+      second_factor = tmp_mfa;
+    else
+      third_factor = tmp_mfa;
+    nth_factor = tmp_mfa->nth_factor;
+    /* ensure plugin method matches against the policy */
+    if (tmp_mfa->add_factor || tmp_mfa->modify_factor ||
+        command == SQLCOM_CREATE_USER) {
+      if (compare_plugin_with_policy(nth_factor, tmp_mfa->plugin.str,
+                                     auth_policy_list))
+        goto error;
+    } else if (tmp_mfa->drop_factor) {
+      if (nth_factor == 2) {
+        if (mfa_list && mfa_list->get_mfa_list_size() > 1) {
+          /*
+            dropping 2nd factor is like replacing 2nd factor method with 3rd
+            factor if 3rd factor exists.
+          */
+          third_factor_plugin_name = mfa_list->get_mfa_list()[1]
+                                         ->get_multi_factor_auth_info()
+                                         ->get_plugin_str();
+          if (compare_plugin_with_policy(nth_factor, third_factor_plugin_name,
+                                         auth_policy_list))
+            goto error;
+        } else if (auth_policy_list.size() >= nth_factor &&
+                   auth_policy_list[nth_factor - 1].length())
+          goto error;
+      } else {
+        /*
+          3rd factor can be dropped only when authentication policy has an
+          empty value in 3rd placeholder or policy list size is 1
+        */
+        if ((auth_policy_list.size() == nth_factor &&
+             auth_policy_list[nth_factor - 1].length()) ||
+            auth_policy_list.size() == (nth_factor - 2))
+          goto error;
+      }
+    } else if (nth_factor == 2 && mfa_list && mfa_list->is_passwordless()) {
+      /*
+        For passwordless users, registration step will replace first factor
+        with fido method, thus ensure that auth_policy_list[0] has *.
+      */
+      second_factor_plugin_name = mfa_list->get_mfa_list()[0]
+                                      ->get_multi_factor_auth_info()
+                                      ->get_plugin_str();
+      if (compare_plugin_with_policy(nth_factor - 1, second_factor_plugin_name,
+                                     auth_policy_list)) {
+        nth_factor = 1;
+        goto error;
+      }
+    }
+  }
+  /*
+    create user specified with missing auth methods should be checks against
+    policy
+  */
+  if (command == SQLCOM_CREATE_USER) {
+    if (auth_policy_list.size() > nth_factor && !second_factor) {
+      nth_factor = 2;
+      if (auth_policy_list[1].length()) goto error;
+    }
+    if (auth_policy_list.size() > nth_factor && !third_factor) {
+      nth_factor = 3;
+      if (auth_policy_list[2].length()) goto error;
+    }
+  }
+  /*
+    special case where both factors are being dropped and we need to do
+    necessary checks based on how policy is defined.
+  */
+  if (second_factor && third_factor) {
+    if (second_factor->drop_factor && third_factor->drop_factor) {
+      if (auth_policy_list.size() == 3) {
+        if (auth_policy_list[1].length()) {
+          nth_factor = 2;
+          goto error;
+        } else if (auth_policy_list[2].length()) {
+          nth_factor = 3;
+          goto error;
+        }
+      }
+      if (auth_policy_list.size() == 2) {
+        if (auth_policy_list[1].length()) {
+          nth_factor = 2;
+          goto error;
+        }
+      }
+    }
+  }
+  return false;
+error:
+  if (policy_priv_exist) {
+    /*
+      if connected user has AUTHENTICATION_POLICY_ADMIN privilege and ACL DDL
+      violates authentication policy, report a warning
+    */
+    push_warning_printf(
+        thd, Sql_condition::SL_WARNING, ER_AUTHENTICATION_POLICY_MISMATCH,
+        ER_THD(thd, ER_AUTHENTICATION_POLICY_MISMATCH), nth_factor);
+
+    return false;
+  }
+  my_error(ER_AUTHENTICATION_POLICY_MISMATCH, MYF(0), nth_factor);
+  return true;
+}
+
+/**
   This function does following:
    1. Convert plain text password to hash and update the same in
       user definition.
@@ -1000,6 +1235,7 @@
   @param cmd          Command information
   @param[out] generated_passwords A list of generated random passwords. Depends
   on LEX_USER.
+  @param[out] i_mfa Interface to Multi factor authentication methods.
 
   @retval 0 ok
   @retval 1 ERROR;
@@ -1009,7 +1245,7 @@
     THD *thd, LEX_USER *Str, acl_table::Pod_user_what_to_update &what_to_set,
     bool is_privileged_user, bool is_role, TABLE_LIST *history_table,
     bool *history_check_done, const char *cmd,
-    Userhostpassword_list &generated_passwords) {
+    Userhostpassword_list &generated_passwords, I_multi_factor_auth **i_mfa) {
   bool user_exists = false;
   ACL_USER *acl_user;
   plugin_ref plugin = nullptr;
@@ -1027,8 +1263,9 @@
 
   if (history_check_done) *history_check_done = false;
   /* update plugin,auth str attributes */
-  if (Str->uses_identified_by_clause || Str->uses_identified_with_clause ||
-      Str->uses_authentication_string_clause)
+  if (Str->first_factor_auth_info.uses_identified_by_clause ||
+      Str->first_factor_auth_info.uses_identified_with_clause ||
+      Str->first_factor_auth_info.uses_authentication_string_clause)
     what_to_set.m_what |= PLUGIN_ATTR;
   else
     what_to_set.m_what |= DEFAULT_AUTH_ATTR;
@@ -1068,7 +1305,8 @@
   if (Str->alter_status.update_account_locked_column)
     what_to_set.m_what |= ACCOUNT_LOCK_ATTR;
 
-  if (Str->plugin.length) optimize_plugin_compare_by_pointer(&Str->plugin);
+  if (Str->first_factor_auth_info.plugin.length)
+    optimize_plugin_compare_by_pointer(&Str->first_factor_auth_info.plugin);
 
   if (user_exists) {
     switch (command) {
@@ -1079,17 +1317,19 @@
           we need to use default plugin to generate password
           so that binlog entry is correct.
         */
-        if (!Str->uses_identified_with_clause)
-          Str->plugin = default_auth_plugin_name;
+        if (!Str->first_factor_auth_info.uses_identified_with_clause)
+          Str->first_factor_auth_info.plugin = default_auth_plugin_name;
         break;
       }
       case SQLCOM_ALTER_USER: {
-        if (!Str->uses_identified_with_clause) {
+        if (!Str->first_factor_auth_info.uses_identified_with_clause) {
           /* If no plugin is given, get existing plugin */
-          Str->plugin = acl_user->plugin;
-        } else if (!(Str->uses_identified_by_clause ||
-                     Str->uses_authentication_string_clause) &&
-                   auth_plugin_supports_expiration(Str->plugin.str)) {
+          Str->first_factor_auth_info.plugin = acl_user->plugin;
+        } else if (!(Str->first_factor_auth_info.uses_identified_by_clause ||
+                     Str->first_factor_auth_info
+                         .uses_authentication_string_clause) &&
+                   auth_plugin_supports_expiration(
+                       Str->first_factor_auth_info.plugin.str)) {
           /*
             This is an attempt to change existing users authentication plugin
             without specifying any password. In such cases, expire user's
@@ -1106,7 +1346,7 @@
           what_to_set.m_what |= PASSWORD_EXPIRE_ATTR;
 
         /* detect changes in the plugin name */
-        if (Str->plugin.str != acl_user->plugin.str) {
+        if (Str->first_factor_auth_info.plugin.str != acl_user->plugin.str) {
           what_to_set.m_what |= DIFFERENT_PLUGIN_ATTR;
           if (Str->retain_current_password) {
             my_error(ER_PASSWORD_CANNOT_BE_RETAINED_ON_PLUGIN_CHANGE, MYF(0),
@@ -1154,35 +1394,33 @@
         GRANT and REVOKE.
        */
       case SQLCOM_GRANT:
-        /* fall through */
+        [[fallthrough]];
       case SQLCOM_REVOKE:
         what_to_set.m_what = NONE_ATTR;
-        Str->plugin = acl_user->plugin;
-        Str->auth.str = acl_user->credentials[PRIMARY_CRED].m_auth_string.str;
-        Str->auth.length =
+        Str->first_factor_auth_info.plugin = acl_user->plugin;
+        Str->first_factor_auth_info.auth.str =
+            acl_user->credentials[PRIMARY_CRED].m_auth_string.str;
+        Str->first_factor_auth_info.auth.length =
             acl_user->credentials[PRIMARY_CRED].m_auth_string.length;
         break;
-
       default: {
-        /*
-          If we are here, authentication related information can be provided
-          only if GRANT statement was used to change user's credentials.
-        */
-
-        if (!Str->uses_identified_with_clause) {
+        if (!Str->first_factor_auth_info.uses_identified_with_clause) {
           /* if IDENTIFIED WITH is not specified set plugin from cache */
-          Str->plugin = acl_user->plugin;
+          Str->first_factor_auth_info.plugin = acl_user->plugin;
           /* set auth str from cache when not specified for existing user */
-          if (!(Str->uses_identified_by_clause ||
-                Str->uses_authentication_string_clause)) {
-            Str->auth.str =
+          if (!(Str->first_factor_auth_info.uses_identified_by_clause ||
+                Str->first_factor_auth_info
+                    .uses_authentication_string_clause)) {
+            Str->first_factor_auth_info.auth.str =
                 acl_user->credentials[PRIMARY_CRED].m_auth_string.str;
-            Str->auth.length =
+            Str->first_factor_auth_info.auth.length =
                 acl_user->credentials[PRIMARY_CRED].m_auth_string.length;
           }
-        } else if (!(Str->uses_identified_by_clause ||
-                     Str->uses_authentication_string_clause) &&
-                   auth_plugin_supports_expiration(Str->plugin.str)) {
+        } else if (!(Str->first_factor_auth_info.uses_identified_by_clause ||
+                     Str->first_factor_auth_info
+                         .uses_authentication_string_clause) &&
+                   auth_plugin_supports_expiration(
+                       Str->first_factor_auth_info.plugin.str)) {
           /*
             This is an attempt to change existing users authentication plugin
             without specifying any password. In such cases, expire user's
@@ -1216,9 +1454,29 @@
             acl_user->password_reuse_interval;
     }
   } else {
-    /* set default plugin for new users if not specified */
-    if (!Str->uses_identified_with_clause)
-      Str->plugin = default_auth_plugin_name;
+    /*
+      when authentication_policy = 'mysql_native_password,,' and
+      --default-authentication-plugin = 'caching_sha2_password'
+      set default as mysql_native_password.
+      --authentication_policy has precedence over
+      --default-authentication-plugin with 1 exception as below:
+      when authentication_policy = '*,,' and
+      --default-authentication-plugin = 'mysql_native_password'
+      set default as mysql_native_password
+      in case no concrete plugin can be extracted from --authentication_policy
+      for first factor, server picks plugin name from
+      --default-authentication-plugin
+    */
+    if (!Str->first_factor_auth_info.uses_identified_with_clause) {
+      mysql_mutex_lock(&LOCK_authentication_policy);
+      if (authentication_policy_list[0].compare("*") == 0)
+        Str->first_factor_auth_info.plugin = default_auth_plugin_name;
+      else
+        lex_string_strmake(thd->mem_root, &Str->first_factor_auth_info.plugin,
+                           authentication_policy_list[0].c_str(),
+                           authentication_policy_list[0].length());
+      mysql_mutex_unlock(&LOCK_authentication_policy);
+    }
 
     if (command == SQLCOM_GRANT) {
       my_error(ER_CANT_CREATE_USER_WITH_GRANT, MYF(0));
@@ -1226,7 +1484,7 @@
     }
   }
 
-  optimize_plugin_compare_by_pointer(&Str->plugin);
+  optimize_plugin_compare_by_pointer(&Str->first_factor_auth_info.plugin);
 
   /*
     Check if non-default password expiraition option
@@ -1236,19 +1494,22 @@
   if (Str->alter_status.update_password_expired_fields &&
       !Str->alter_status.use_default_password_lifetime &&
       Str->alter_status.expire_after_days != 0 &&
-      !auth_plugin_supports_expiration(Str->plugin.str)) {
+      !auth_plugin_supports_expiration(
+          Str->first_factor_auth_info.plugin.str)) {
     my_error(ER_PASSWORD_EXPIRATION_NOT_SUPPORTED_BY_AUTH_METHOD, MYF(0),
-             Str->plugin.length, Str->plugin.str);
+             Str->first_factor_auth_info.plugin.length,
+             Str->first_factor_auth_info.plugin.str);
     return true;
   }
 
-  plugin =
-      my_plugin_lock_by_name(nullptr, Str->plugin, MYSQL_AUTHENTICATION_PLUGIN);
+  plugin = my_plugin_lock_by_name(nullptr, Str->first_factor_auth_info.plugin,
+                                  MYSQL_AUTHENTICATION_PLUGIN);
 
   /* check if plugin is loaded */
   if (!plugin) {
     what_to_set.m_what = NONE_ATTR;
-    my_error(ER_PLUGIN_IS_NOT_LOADED, MYF(0), Str->plugin.str);
+    my_error(ER_PLUGIN_IS_NOT_LOADED, MYF(0),
+             Str->first_factor_auth_info.plugin.str);
     return (true);
   }
 
@@ -1318,25 +1579,44 @@
       Str->alter_status.use_default_password_reuse_interval = true;
     }
   }
+
+  if ((auth->authentication_flags & AUTH_FLAG_REQUIRES_REGISTRATION) &&
+      command == SQLCOM_CREATE_USER) {
+    /*
+      Plugin which requires registration step is not allowed as part of first
+      factor auth method if user does not have PASSWORDLESS_USER_ADMIN privilege
+    */
+    if (!(thd->security_context()
+              ->has_global_grant(STRING_WITH_LEN("PASSWORDLESS_USER_ADMIN"))
+              .first)) {
+      my_error(ER_SPECIFIC_ACCESS_DENIED_ERROR, MYF(0),
+               "PASSWORDLESS_USER_ADMIN");
+      plugin_unlock(nullptr, plugin);
+      what_to_set.m_what = NONE_ATTR;
+      return (false);
+    }
+  }
   /*
     If auth string is specified, change it to hash.
     Validate empty credentials for new user ex: CREATE USER u1;
     We skip authentication string generation if the issued statement was
     CREATE ROLE.
   */
-  if (!is_role && (Str->uses_identified_by_clause ||
-                   (Str->auth.length == 0 && !user_exists))) {
-    inbuf = Str->auth.str;
-    inbuflen = (unsigned)Str->auth.length;
+  if (!is_role &&
+      (Str->first_factor_auth_info.uses_identified_by_clause ||
+       (Str->first_factor_auth_info.auth.length == 0 && !user_exists))) {
+    inbuf = Str->first_factor_auth_info.auth.str;
+    inbuflen = (unsigned)Str->first_factor_auth_info.auth.length;
     std::string gen_password;
-    if (Str->has_password_generator) {
+    if (Str->first_factor_auth_info.has_password_generator) {
       thd->m_disable_password_validation = true;
       generate_random_password(&gen_password,
                                thd->variables.generated_random_password_length);
       inbuf = gen_password.c_str();
       inbuflen = gen_password.length();
-      generated_passwords.push_back({std::string(Str->user.str),
-                                     std::string(Str->host.str), gen_password});
+      random_password_info p{std::string(Str->user.str),
+                             std::string(Str->host.str), gen_password, 1};
+      generated_passwords.push_back(p);
     }
     if (auth->generate_authentication_string(outbuf, &buflen, inbuf,
                                              inbuflen) ||
@@ -1369,12 +1649,12 @@
        Erase in memory copy of plain text password, unless we need it
        later to send to client as a result set.
     */
-    if (Str->auth.length > 0)
-      memset(const_cast<char *>(Str->auth.str), 0, Str->auth.length);
+    if (Str->first_factor_auth_info.auth.length > 0)
+      memset(const_cast<char *>(Str->first_factor_auth_info.auth.str), 0,
+             Str->first_factor_auth_info.auth.length);
     /* Use the authentication_string field as password */
-    Str->auth.str = password;
-    Str->auth.length = buflen;
-    new_password_empty = Str->auth.length ? false : true;
+    Str->first_factor_auth_info.auth = {password, buflen};
+    new_password_empty = buflen ? false : true;
   }
 
   /* Check iff the REPLACE clause is specified correctly for the user */
@@ -1387,7 +1667,7 @@
   }
 
   /* Validate hash string */
-  if (Str->uses_authentication_string_clause) {
+  if (Str->first_factor_auth_info.uses_authentication_string_clause) {
     /*
       The statement CREATE ROLE calls mysql_create_user() with a set of
       lexicographic parameters: users_identified_by_password_caluse= false etc
@@ -1397,8 +1677,9 @@
       interdependencies if mysql_create_user() is refactored.
     */
     assert(!is_role);
-    if (auth->validate_authentication_string(const_cast<char *>(Str->auth.str),
-                                             (unsigned)Str->auth.length)) {
+    if (auth->validate_authentication_string(
+            const_cast<char *>(Str->first_factor_auth_info.auth.str),
+            (unsigned)Str->first_factor_auth_info.auth.length)) {
       my_error(ER_PASSWORD_FORMAT, MYF(0));
       plugin_unlock(nullptr, plugin);
       what_to_set.m_what = NONE_ATTR;
@@ -1412,12 +1693,13 @@
       Covers replication scenario too since the IDENTIFIED BY will get
       rewritten to IDENTIFIED ... WITH ... AS
     */
-    if (auth_verify_password_history(thd, &Str->user, &Str->host,
-                                     Str->alter_status.password_history_length,
-                                     Str->alter_status.password_reuse_interval,
-                                     auth, nullptr, 0, Str->auth.str,
-                                     (unsigned)Str->auth.length, history_table,
-                                     what_to_set.m_what)) {
+    if (auth_verify_password_history(
+            thd, &Str->user, &Str->host,
+            Str->alter_status.password_history_length,
+            Str->alter_status.password_reuse_interval, auth, nullptr, 0,
+            Str->first_factor_auth_info.auth.str,
+            (unsigned)Str->first_factor_auth_info.auth.length, history_table,
+            what_to_set.m_what)) {
       /* we should have an error generated here already */
       plugin_unlock(nullptr, plugin);
       what_to_set.m_what = NONE_ATTR;
@@ -1470,7 +1752,8 @@
     }
   }
 
-  if (user_exists && (what_to_set.m_what & PLUGIN_ATTR) && !Str->auth.length &&
+  if (user_exists && (what_to_set.m_what & PLUGIN_ATTR) &&
+      !Str->first_factor_auth_info.auth.length &&
       (auth->authentication_flags & AUTH_FLAG_USES_INTERNAL_STORAGE)) {
     if (acl_user->credentials[SECOND_CRED].m_auth_string.length) {
       what_to_set.m_what |= USER_ATTRIBUTES;
@@ -1489,6 +1772,7 @@
     what_to_set.m_user_attributes |=
         acl_table::USER_ATTRIBUTE_PASSWORD_LOCK_TIME;
   }
+
   /*
     We issued a ALTER USER x ATTRIBUTE or COMMENT statement and need
     to update the user attributes.
@@ -1498,6 +1782,99 @@
     what_to_set.m_what |= USER_ATTRIBUTES;
   }
   plugin_unlock(nullptr, plugin);
+
+  if (check_for_authentication_policy(thd, Str, command,
+                                      (acl_user ? acl_user->m_mfa : nullptr)))
+    return true;
+
+  /* initialize MFA */
+  if (Str->mfa_list.size()) {
+    if (user_exists && command == SQLCOM_CREATE_USER) return false;
+    /* Update Multi factor authentication details */
+    I_multi_factor_auth *mfa = *i_mfa;
+    LEX_MFA *tmp_lex_mfa;
+    List_iterator<LEX_MFA> mfa_list_it(Str->mfa_list);
+    mfa = new (&global_acl_memory) Multi_factor_auth_list(&global_acl_memory);
+    while ((tmp_lex_mfa = mfa_list_it++))
+      mfa->add_factor(new (&global_acl_memory) Multi_factor_auth_info(
+          &global_acl_memory, tmp_lex_mfa));
+
+    if (user_exists) {
+      if (acl_user->m_mfa) {
+        if (acl_user->m_mfa->is_alter_allowed(thd, Str)) return true;
+        /*
+          copy attributes from in memory copy of ACL_USER::m_mfa to new Multi
+          factor authentication method interface.
+        */
+        acl_user->m_mfa->alter_mfa(mfa);
+      } else {
+        MEM_ROOT mr;
+        init_sql_alloc(PSI_NOT_INSTRUMENTED, &mr, 256, 0);
+        I_multi_factor_auth *tmp = new (&mr) Multi_factor_auth_list(&mr);
+        if (tmp->is_alter_allowed(thd, Str)) {
+          mr.Clear();
+          return true;
+        }
+      }
+      /* perform regestration step */
+      mfa_list_it = Str->mfa_list;
+      while ((tmp_lex_mfa = mfa_list_it++)) {
+        if (tmp_lex_mfa->init_registration) {
+          /* initiate registration step */
+          if (mfa->init_registration(thd, tmp_lex_mfa->nth_factor)) return true;
+          break;
+        } else if (tmp_lex_mfa->finish_registration) {
+          /* finish registration step */
+          if (mfa->finish_registration(thd, Str, tmp_lex_mfa->nth_factor))
+            return true;
+        }
+        if (mfa->is_passwordless()) {
+          /* save auth string in LEX_USER::mfa_list before replacing */
+          mfa->get_info_for_query_rewrite(thd, Str);
+          /*
+            On replica, ALTER USER ... FINISH REGISTRATION is converted to
+            ALTER USER .. MODIFY 2 FACTOR IDENTIFIED WITH ..., thus copy
+            plugin and auth string into first factor auth method
+          */
+          if (tmp_lex_mfa->modify_factor) {
+            lex_string_strmake(
+                thd->mem_root, &Str->first_factor_auth_info.plugin,
+                tmp_lex_mfa->plugin.str, tmp_lex_mfa->plugin.length);
+            lex_string_strmake(thd->mem_root, &Str->first_factor_auth_info.auth,
+                               tmp_lex_mfa->auth.str, tmp_lex_mfa->auth.length);
+          }
+          what_to_set.m_what |= PLUGIN_ATTR;
+          mfa = nullptr;
+        }
+      }
+      /* if no mfa methods exists, set mfa to nullptr */
+      if (mfa && mfa->get_multi_factor_auth_list()->get_mfa_list_size() == 0)
+        mfa = nullptr;
+    }
+    if (mfa) {
+      /* validate auth plugins in Multi factor authentication methods */
+      if (mfa->validate_plugins_in_auth_chain(thd)) return true;
+      /*
+        Once alter is done check that new mfa methods are inline with
+        authentication policy.
+      */
+      if (command == SQLCOM_ALTER_USER &&
+          mfa->validate_against_authentication_policy(thd))
+        return true;
+      /*
+        Fill in details related to Multi factor authentication methods into
+        LEX_USER::mfa_list, to be consumed by query rewrite methods.
+      */
+      mfa->get_info_for_query_rewrite(thd, Str);
+    }
+    *i_mfa = mfa;
+    /* update MFA details in user attributes */
+    what_to_set.m_what |= USER_ATTRIBUTES;
+    what_to_set.m_user_attributes |= acl_table::USER_ATTRIBUTE_UPDATE_MFA;
+  } else {
+    /* Update i_mfa in case Multi factor auth methods are not touched */
+    if (user_exists && i_mfa) *i_mfa = acl_user->m_mfa;
+  }
   return (false);
 }
 
@@ -1582,34 +1959,35 @@
     assert(acl_user->plugin.length != 0);
     is_role = acl_user->is_role;
 
-    if (!(combo = (LEX_USER *)thd->alloc(sizeof(LEX_USER)))) return true;
+    if (!(combo = (LEX_USER *)LEX_USER::alloc(thd))) return true;
 
     combo->user.str = lex_user->user.str;
     combo->host.str = lex_user->host.str;
     combo->user.length = lex_user->user.length;
     combo->host.length = lex_user->host.length;
-    combo->plugin.str = acl_user->plugin.str;
-    combo->plugin.length = acl_user->plugin.length;
+    combo->first_factor_auth_info.plugin.str = acl_user->plugin.str;
+    combo->first_factor_auth_info.plugin.length = acl_user->plugin.length;
 
     lex_string_strmake(thd->mem_root, &combo->user, combo->user.str,
                        strlen(combo->user.str));
     lex_string_strmake(thd->mem_root, &combo->host, combo->host.str,
                        strlen(combo->host.str));
-    lex_string_strmake(thd->mem_root, &combo->plugin, combo->plugin.str,
-                       strlen(combo->plugin.str));
-    optimize_plugin_compare_by_pointer(&combo->plugin);
-    combo->auth.str = new_password;
-    combo->auth.length = new_password_len;
+    lex_string_strmake(thd->mem_root, &combo->first_factor_auth_info.plugin,
+                       combo->first_factor_auth_info.plugin.str,
+                       strlen(combo->first_factor_auth_info.plugin.str));
+    optimize_plugin_compare_by_pointer(&combo->first_factor_auth_info.plugin);
+    combo->first_factor_auth_info.auth.str = new_password;
+    combo->first_factor_auth_info.auth.length = new_password_len;
     combo->current_auth.str = current_password;
     combo->current_auth.length =
         (current_password) ? strlen(current_password) : 0;
-    combo->uses_identified_by_clause = true;
-    combo->uses_identified_with_clause = false;
-    combo->uses_authentication_string_clause = false;
+    combo->first_factor_auth_info.uses_identified_by_clause = true;
+    combo->first_factor_auth_info.uses_identified_with_clause = false;
+    combo->first_factor_auth_info.uses_authentication_string_clause = false;
     combo->uses_replace_clause = (current_password) ? true : false;
     combo->retain_current_password = retain_current_password;
     combo->discard_old_password = false;
-    combo->has_password_generator = false;
+    combo->first_factor_auth_info.has_password_generator = false;
 
     /* set default values */
     thd->lex->ssl_type = SSL_TYPE_NOT_SPECIFIED;
@@ -1632,7 +2010,7 @@
             thd, combo, what_to_set, is_privileged_user, false,
             &tables[ACL_TABLES::TABLE_PASSWORD_HISTORY], nullptr,
             "SET PASSWORD", dummy)) {
-      authentication_plugin.assign(combo->plugin.str);
+      authentication_plugin.assign(combo->first_factor_auth_info.plugin.str);
       result = true;
       goto end;
     }
@@ -1642,10 +2020,11 @@
     // plain text password will live on in the calling function for the
     // purpose of returning it to the client.
     thd->lex->contains_plaintext_password = false;
-    authentication_plugin.assign(combo->plugin.str);
+    authentication_plugin.assign(combo->first_factor_auth_info.plugin.str);
     thd->variables.sql_mode &= ~MODE_PAD_CHAR_TO_FULL_LENGTH;
 
-    ret = replace_user_table(thd, table, combo, 0, false, false, what_to_set);
+    ret = replace_user_table(thd, table, combo, 0, false, false, what_to_set,
+                             nullptr, acl_user->m_mfa);
     thd->variables.sql_mode = old_sql_mode;
 
     if (ret) {
@@ -2262,7 +2641,7 @@
   acl_table::Pod_user_what_to_update what_to_update;
   bool is_anonymous_user = false;
   std::set<LEX_USER *> extra_users;
-  std::set<LEX_USER *> reset_users;
+  std::set<LEX_USER *> processed_users;
   Userhostpassword_list generated_passwords;
   DBUG_TRACE;
 
@@ -2292,9 +2671,9 @@
       commit_and_close_mysql_tables(thd);
       return true;
     }
-
     while ((tmp_user_name = user_list++)) {
       bool history_check_done = false;
+      I_multi_factor_auth *mfa = nullptr;
       /*
         Ignore the current user as it already exists.
       */
@@ -2306,7 +2685,7 @@
       if (set_and_validate_user_attributes(
               thd, user_name, what_to_update, true, is_role,
               &tables[ACL_TABLES::TABLE_PASSWORD_HISTORY], &history_check_done,
-              "CREATE USER", generated_passwords)) {
+              "CREATE USER", generated_passwords, &mfa)) {
         result = 1;
         log_user(thd, &wrong_users, user_name, wrong_users.length() > 0);
         continue;
@@ -2360,7 +2739,8 @@
       }
 
       ret = replace_user_table(thd, tables[ACL_TABLES::TABLE_USER].table,
-                               user_name, 0, false, true, what_to_update);
+                               user_name, 0, false, true, what_to_update,
+                               nullptr, mfa);
 
       if (ret) {
         result = 1;
@@ -2462,8 +2842,8 @@
               default_roles);
       }
 
-      /* For connection resources */
-      reset_users.insert(tmp_user_name);
+      /* Track processed users to reset connection resources */
+      processed_users.insert(tmp_user_name);
 
     }  // END while tmp_user_name= user_lists++
 
@@ -2483,11 +2863,25 @@
   } /* Critical section */
 
   if (!result) {
-    LEX_USER *reset_user;
+    LEX_USER *processed_user;
     DEBUG_SYNC(thd, "before_reset_mqh_in_create_user");
-    for (LEX_USER *one_user : reset_users) {
-      if ((reset_user = get_current_user(thd, one_user))) {
-        reset_mqh(thd, reset_user, false);
+    for (LEX_USER *one_user : processed_users) {
+      if ((processed_user = get_current_user(thd, one_user))) {
+        /* reset connection resources for processed users */
+        reset_mqh(thd, processed_user, false);
+        Acl_cache_lock_guard acl_cache_lock{thd,
+                                            Acl_cache_lock_mode::READ_MODE};
+        if (!acl_cache_lock.lock(false)) return true;
+        ACL_USER *acl_user = find_acl_user(processed_user->host.str,
+                                           processed_user->user.str, true);
+        if (acl_user && acl_user->m_mfa) {
+          acl_user->m_mfa->get_generated_passwords(
+              generated_passwords,
+              (processed_user->user.length ? processed_user->user.str
+                                           : pointer_cast<const char *>("")),
+              (processed_user->host.length ? processed_user->host.str
+                                           : pointer_cast<const char *>("")));
+        }
       }
     }
     /* Notify storage engines */
@@ -2646,7 +3040,8 @@
           mysql_audit_notify(
               thd, AUDIT_EVENT(MYSQL_AUDIT_AUTHENTICATION_AUTHID_DROP),
               thd->is_error(), audit_user->user.str, audit_user->host.str,
-              audit_user->plugin.str, is_role_id(audit_user), nullptr, nullptr);
+              audit_user->first_factor_auth_info.plugin.str,
+              is_role_id(audit_user), nullptr, nullptr);
       }
     }
   } /* Critical section */
@@ -2842,8 +3237,8 @@
         mysql_audit_notify(
             thd, AUDIT_EVENT(MYSQL_AUDIT_AUTHENTICATION_AUTHID_RENAME),
             thd->is_error(), user_from->user.str, user_from->host.str,
-            user_from->plugin.str, is_role_id(user_from), user_to->user.str,
-            user_to->user.str);
+            user_from->first_factor_auth_info.plugin.str, is_role_id(user_from),
+            user_to->user.str, user_to->user.str);
     }
   } /* Critical section */
 
@@ -2871,6 +3266,7 @@
 bool mysql_alter_user(THD *thd, List<LEX_USER> &list, bool if_exists) {
   int result = 0;
   bool is_anonymous_user = false;
+  bool write_to_binlog = true;
   String wrong_users;
   LEX_USER *user_from, *tmp_user_from;
   List_iterator<LEX_USER> user_list(list);
@@ -2882,7 +3278,9 @@
   bool password_expire_undo = false;
   std::set<LEX_USER *> audit_users;
   std::set<LEX_USER *> reset_users;
+  std::set<LEX_USER *> mfa_users;
   Userhostpassword_list generated_passwords;
+  std::vector<std::string> server_challenge;
   DBUG_TRACE;
 
   /*
@@ -2908,7 +3306,6 @@
       commit_and_close_mysql_tables(thd);
       return true;
     }
-
     is_privileged_user = is_privileged_user_for_credential_change(thd);
 
     while ((tmp_user_from = user_list++)) {
@@ -2918,7 +3315,14 @@
       bool history_check_done = false;
       TABLE *history_tbl = nullptr;
       bool dummy_row_existed = false;
+      I_multi_factor_auth *mfa = nullptr;
 
+      LEX_MFA *tmp_lex_mfa;
+      List_iterator<LEX_MFA> mfa_list_it(tmp_user_from->mfa_list);
+      while ((tmp_lex_mfa = mfa_list_it++)) {
+        /* do not write INITIATE REGISTRATION step to binlog. */
+        if (tmp_lex_mfa->init_registration) write_to_binlog = false;
+      }
       /* add the defaults where needed */
       if (!(user_from = get_current_user(thd, tmp_user_from))) {
         log_user(thd, &wrong_users, tmp_user_from, wrong_users.length() > 0);
@@ -2932,17 +3336,17 @@
       if (set_and_validate_user_attributes(
               thd, user_from, what_to_alter, is_privileged_user, false,
               &tables[ACL_TABLES::TABLE_PASSWORD_HISTORY], &history_check_done,
-              "ALTER USER", generated_passwords)) {
+              "ALTER USER", generated_passwords, &mfa)) {
         result = 1;
         continue;
       }
-
       /*
         Check if the user's authentication method supports expiration only
         if PASSWORD EXPIRE attribute is specified
       */
       if (user_from->alter_status.update_password_expired_column &&
-          !auth_plugin_supports_expiration(user_from->plugin.str)) {
+          !auth_plugin_supports_expiration(
+              user_from->first_factor_auth_info.plugin.str)) {
         result = 1;
         log_user(thd, &wrong_users, user_from, wrong_users.length() > 0);
         continue;
@@ -3009,7 +3413,8 @@
 
       /* update the mysql.user table */
       ret = replace_user_table(thd, tables[ACL_TABLES::TABLE_USER].table,
-                               user_from, 0, false, false, what_to_alter);
+                               user_from, 0, false, false, what_to_alter,
+                               nullptr, mfa);
       if (ret) {
         if (ret < 0) {
           result = 1;
@@ -3050,6 +3455,12 @@
 
       if (what_to_alter.m_what & RESOURCE_ATTR)
         reset_users.insert(tmp_user_from);
+      /*
+        keep track of list of users for which Multi Factor auth methods are
+        changed.
+      */
+      if (what_to_alter.m_what & USER_ATTRIBUTES)
+        mfa_users.insert(tmp_user_from);
     }
 
     // We must not have plain text password for any user at this point.
@@ -3070,7 +3481,7 @@
 
     User_params user_params(&extra_users);
     result = log_and_commit_acl_ddl(thd, transactional_tables, &extra_users,
-                                    &user_params);
+                                    &user_params, false, write_to_binlog);
     /* Notify audit plugin. We will ignore the return value. */
     LEX_USER *audit_user;
     for (LEX_USER *one_user : audit_users) {
@@ -3078,7 +3489,8 @@
         mysql_audit_notify(
             thd, AUDIT_EVENT(MYSQL_AUDIT_AUTHENTICATION_CREDENTIAL_CHANGE),
             thd->is_error(), audit_user->user.str, audit_user->host.str,
-            audit_user->plugin.str, is_role_id(audit_user), nullptr, nullptr);
+            audit_user->first_factor_auth_info.plugin.str,
+            is_role_id(audit_user), nullptr, nullptr);
     }
   } /* Critical section */
 
@@ -3090,15 +3502,56 @@
         reset_mqh(thd, extra_user, false);
       }
     }
+  }
+  if (!result) {
+    LEX_USER *user;
+    for (LEX_USER *one_user : mfa_users) {
+      if ((user = get_current_user(thd, one_user))) {
+        Acl_cache_lock_guard acl_cache_lock{thd,
+                                            Acl_cache_lock_mode::READ_MODE};
+        if (!acl_cache_lock.lock(false)) return true;
+        ACL_USER *acl_user =
+            find_acl_user(user->host.str, user->user.str, true);
+        if (acl_user && acl_user->m_mfa) {
+          acl_user->m_mfa->get_generated_passwords(
+              generated_passwords,
+              (user->user.length ? user->user.str
+                                 : pointer_cast<const char *>("")),
+              (user->host.length ? user->host.str
+                                 : pointer_cast<const char *>("")));
+          acl_user->m_mfa->get_server_challenge(server_challenge);
+        }
+      }
+    }
     /* Notify storage engines (including rewrite list) */
     acl_notify_htons(thd, SQLCOM_ALTER_USER, &list, &extra_users);
   }
 
   if (result == 0) {
-    if (generated_passwords.size() == 0) {
+    if (generated_passwords.size() == 0 && server_challenge.size() == 0) {
       my_ok(thd);
-    } else if (send_password_result_set(thd, generated_passwords)) {
-      result = 1;
+    } else {
+      if (generated_passwords.size() &&
+          send_password_result_set(thd, generated_passwords)) {
+        result = 1;
+      } else if (server_challenge.size()) {
+        mem_root_deque<Item *> field_list(thd->mem_root);
+        field_list.push_back(
+            new Item_string("Server_challenge", 16, system_charset_info));
+        Query_result_send output;
+        if (output.send_result_set_metadata(thd, field_list,
+                                            Protocol::SEND_NUM_ROWS))
+          result = 1;
+        mem_root_deque<Item *> item_list(thd->mem_root);
+        for (auto sc : server_challenge) {
+          Item *item =
+              new Item_string(sc.c_str(), sc.length(), system_charset_info);
+          item_list.push_back(item);
+          if (output.send_data(thd, item_list)) result = 1;
+          item_list.clear();
+        }
+        my_eof(thd);
+      }
     }
   }  // end if
   return result;
diff -Nru mysql-8.0-8.0.26/sql/auth/sql_user_table.cc mysql-8.0-8.0.27/sql/auth/sql_user_table.cc
--- mysql-8.0-8.0.26/sql/auth/sql_user_table.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/auth/sql_user_table.cc	2021-09-28 11:46:34.000000000 +0000
@@ -574,45 +574,22 @@
 */
 Acl_change_notification::Acl_change_notification(
     THD *thd, enum_sql_command op, const List<LEX_USER> *users,
-    Rewrite_params *rewrite, const List<LEX_CSTRING> *dynamic_privs)
-    : operation(op),
-      db(thd->db().str, thd->db().length),
-      rewrite_params(rewrite) {
-  if (users) {
-    /* Copy data out of List<LEX_USER> */
-    user_list.reserve(users->size());
-    for (const LEX_USER &lex_user : *users) {
-      user_list.emplace_back(lex_user);
-    }
-  }
-  if (dynamic_privs) {
-    /* Copy data from dynamic_privs to dynamic_privilege_list */
-    dynamic_privilege_list.reserve(dynamic_privs->elements);
-    for (const LEX_CSTRING &priv : *dynamic_privs) {
-      dynamic_privilege_list.emplace_back(priv.str, priv.length);
-    }
-  }
-}
-
-void acl_notify_htons(
-    THD *thd MY_ATTRIBUTE((unused)),
-    enum_sql_command operation MY_ATTRIBUTE((unused)),
-    const List<LEX_USER> *users MY_ATTRIBUTE((unused)),
-    std::set<LEX_USER *> *rewrite_users MY_ATTRIBUTE((unused)),
-    const List<LEX_CSTRING> *dynamic_privs MY_ATTRIBUTE((unused))) {
+    std::set<LEX_USER *> *rewrite_users, const List<LEX_CSTRING> *dynamic_privs)
+    : db{thd->db().str, thd->db().length},
+      operation(op),
+      users(users ? *users : empty_users),
+      rewrite_user_params(rewrite_users),
+      dynamic_privs(dynamic_privs ? *dynamic_privs : empty_dynamic_privs) {}
+
+void acl_notify_htons(THD *thd, enum_sql_command operation,
+                      const List<LEX_USER> *users,
+                      std::set<LEX_USER *> *rewrite_users,
+                      const List<LEX_CSTRING> *dynamic_privs) {
   DBUG_TRACE;
   DBUG_PRINT("enter", ("db: %s query: '%s'", thd->db().str, thd->query().str));
-#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
-  /*
-    The Acl_change_notification is used only by the ndbcluster SE.
-    So, instantiate it and send a notification only if the Server is
-    built with ndbcluster SE.
-  */
-  User_params rewrite_user_params(rewrite_users);
-  User_params *rewrite = rewrite_users ? &rewrite_user_params : nullptr;
-  Acl_change_notification notice(thd, operation, users, rewrite, dynamic_privs);
+  Acl_change_notification notice(thd, operation, users, rewrite_users,
+                                 dynamic_privs);
   ha_acl_notify(thd, &notice);
-#endif
 }
 
 /**
@@ -755,9 +732,11 @@
               2. If SQLCOM_ALTER_USER, IDENTIFIED WITH clause is not used
               but IDENTIFIED BY is used.
             */
-            if (!extra_user->uses_identified_with_clause &&
+            if (!extra_user->first_factor_auth_info
+                     .uses_identified_with_clause &&
                 (command == SQLCOM_CREATE_USER ||
-                 extra_user->uses_identified_by_clause)) {
+                 extra_user->first_factor_auth_info
+                     .uses_identified_by_clause)) {
               log_user(thd, &warn_user, extra_user, comma);
               comma = true;
               log_warning = true;
@@ -1765,11 +1744,11 @@
     @param [in] msg           Message string. Unused.
   */
 
-  virtual bool handle_condition(
-      THD *thd MY_ATTRIBUTE((unused)), uint sql_errno,
-      const char *sqlstate MY_ATTRIBUTE((unused)),
-      Sql_condition::enum_severity_level *level MY_ATTRIBUTE((unused)),
-      const char *msg MY_ATTRIBUTE((unused))) override {
+  virtual bool handle_condition(THD *thd [[maybe_unused]], uint sql_errno,
+                                const char *sqlstate [[maybe_unused]],
+                                Sql_condition::enum_severity_level *level
+                                [[maybe_unused]],
+                                const char *msg [[maybe_unused]]) override {
     m_hit_deadlock = (sql_errno == ER_LOCK_DEADLOCK);
     return m_hit_deadlock;
   }
diff -Nru mysql-8.0-8.0.26/sql/auth/user_table.h mysql-8.0-8.0.27/sql/auth/user_table.h
--- mysql-8.0-8.0.26/sql/auth/user_table.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/auth/user_table.h	2021-09-28 11:46:34.000000000 +0000
@@ -26,6 +26,7 @@
 #include "my_inttypes.h"
 
 // Forward declarations
+class I_multi_factor_auth;
 class Restrictions;
 class THD;
 struct LEX_USER;
@@ -40,6 +41,8 @@
 const ulong USER_ATTRIBUTE_FAILED_LOGIN_ATTEMPTS = (1L << 4);
 const ulong USER_ATTRIBUTE_PASSWORD_LOCK_TIME = (1L << 5);
 
+const ulong USER_ATTRIBUTE_UPDATE_MFA = (1L << 6);
+
 class Pod_user_what_to_update {
  public:
   Pod_user_what_to_update() : m_what(0L), m_user_attributes(0L) {}
@@ -51,7 +54,8 @@
 int replace_user_table(THD *thd, TABLE *table, LEX_USER *combo, ulong rights,
                        bool revoke_grant, bool can_create_user,
                        acl_table::Pod_user_what_to_update &what_to_update,
-                       Restrictions *restrictions = nullptr);
+                       Restrictions *restrictions = nullptr,
+                       I_multi_factor_auth *mfa = nullptr);
 
 bool read_user_table(THD *thd, TABLE *table);
 #endif /* USER_TABLE_INCLUDED */
diff -Nru mysql-8.0-8.0.26/sql/auto_thd.cc mysql-8.0-8.0.27/sql/auto_thd.cc
--- mysql-8.0-8.0.26/sql/auto_thd.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/auto_thd.cc	2021-09-28 11:46:34.000000000 +0000
@@ -27,12 +27,12 @@
 #include "mysql/components/services/log_shared.h"
 #include "sql/log.h"
 #include "sql/sql_class.h"             // THD
-#include "sql/sql_thd_internal_api.h"  // create_thd / destroy_thd
+#include "sql/sql_thd_internal_api.h"  // create_internal_thd
 
 /**
   Create THD object and initialize internal variables.
 */
-Auto_THD::Auto_THD() : thd(create_thd(false, true, false, 0)) {
+Auto_THD::Auto_THD() : thd(create_internal_thd()) {
   thd->push_internal_handler(this);
 }
 
@@ -41,7 +41,7 @@
 */
 Auto_THD::~Auto_THD() {
   thd->pop_internal_handler();
-  destroy_thd(thd);
+  destroy_internal_thd(thd);
 }
 
 /**
@@ -55,10 +55,11 @@
 
   @return This function always return false.
 */
-bool Auto_THD::handle_condition(
-    THD *thd MY_ATTRIBUTE((unused)), uint sql_errno, const char *sqlstate,
-    Sql_condition::enum_severity_level *level MY_ATTRIBUTE((unused)),
-    const char *msg) {
+bool Auto_THD::handle_condition(THD *thd [[maybe_unused]], uint sql_errno,
+                                const char *sqlstate,
+                                Sql_condition::enum_severity_level *level
+                                [[maybe_unused]],
+                                const char *msg) {
   int log_err_level = 0;
 
   if (*level == Sql_condition::SL_WARNING)
diff -Nru mysql-8.0-8.0.26/sql/auto_thd.h mysql-8.0-8.0.27/sql/auto_thd.h
--- mysql-8.0-8.0.26/sql/auto_thd.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/auto_thd.h	2021-09-28 11:46:34.000000000 +0000
@@ -55,11 +55,11 @@
 
     @return This function always return false.
   */
-  bool handle_condition(class THD *thd MY_ATTRIBUTE((unused)),
-                        uint sql_errno MY_ATTRIBUTE((unused)),
-                        const char *sqlstate MY_ATTRIBUTE((unused)),
+  bool handle_condition(class THD *thd [[maybe_unused]],
+                        uint sql_errno [[maybe_unused]],
+                        const char *sqlstate [[maybe_unused]],
                         Sql_condition::enum_severity_level *level
-                            MY_ATTRIBUTE((unused)),
+                        [[maybe_unused]],
                         const char *msg) override;
 
   /** Thd associated with the object. */
diff -Nru mysql-8.0-8.0.26/sql/basic_istream.cc mysql-8.0-8.0.27/sql/basic_istream.cc
--- mysql-8.0-8.0.26/sql/basic_istream.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/basic_istream.cc	2021-09-28 11:46:34.000000000 +0000
@@ -32,11 +32,9 @@
 
 bool IO_CACHE_istream::open(
 #ifdef HAVE_PSI_INTERFACE
-    PSI_file_key log_file_key MY_ATTRIBUTE((unused)),
-    PSI_file_key log_cache_key,
+    PSI_file_key log_file_key [[maybe_unused]], PSI_file_key log_cache_key,
 #endif
-    const char *file_name, myf flags MY_ATTRIBUTE((unused)),
-    size_t cache_size) {
+    const char *file_name, myf flags [[maybe_unused]], size_t cache_size) {
   File file = -1;
 
   file = mysql_file_open(log_file_key, file_name, O_RDONLY, MYF(MY_WME));
diff -Nru mysql-8.0-8.0.26/sql/basic_ostream.cc mysql-8.0-8.0.27/sql/basic_ostream.cc
--- mysql-8.0-8.0.26/sql/basic_ostream.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/basic_ostream.cc	2021-09-28 11:46:34.000000000 +0000
@@ -32,7 +32,7 @@
 
 bool IO_CACHE_ostream::open(
 #ifdef HAVE_PSI_INTERFACE
-    PSI_file_key log_file_key MY_ATTRIBUTE((unused)),
+    PSI_file_key log_file_key [[maybe_unused]],
 #endif
     const char *file_name, myf flags) {
   File file = -1;
diff -Nru mysql-8.0-8.0.26/sql/basic_row_iterators.h mysql-8.0-8.0.27/sql/basic_row_iterators.h
--- mysql-8.0-8.0.26/sql/basic_row_iterators.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/basic_row_iterators.h	2021-09-28 11:46:34.000000000 +0000
@@ -334,7 +334,7 @@
     }
   }
 
-  void SetNullRowFlag(bool is_null_row MY_ATTRIBUTE((unused))) override {
+  void SetNullRowFlag(bool is_null_row [[maybe_unused]]) override {
     assert(!is_null_row);
   }
 
diff -Nru mysql-8.0-8.0.26/sql/binlog.cc mysql-8.0-8.0.27/sql/binlog.cc
--- mysql-8.0-8.0.26/sql/binlog.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/binlog.cc	2021-09-28 11:46:34.000000000 +0000
@@ -4282,7 +4282,7 @@
                    ? true
                    : all_gtids != nullptr || first_gtid != nullptr);
       }
-      // Fall through.
+        [[fallthrough]];
       default:
         // if we found any other event type without finding a
         // previous_gtids_log_event, then the rest of this binlog
@@ -4336,10 +4336,25 @@
   return ret;
 }
 
+bool MYSQL_BIN_LOG::find_first_log(std::string &binlog_file_name,
+                                   std::string &errmsg) {
+  auto log_index = this->get_log_index();
+  std::list<std::string> filename_list = log_index.second;
+
+  list<string>::iterator fit = filename_list.begin();
+  if (fit != filename_list.end()) {
+    binlog_file_name.assign(*fit);
+  } else {
+    errmsg.assign("Could not find the first log file name in the index file");
+    return true;
+  }
+  return false;
+}
+
 bool MYSQL_BIN_LOG::find_first_log_not_in_gtid_set(char *binlog_file_name,
                                                    const Gtid_set *gtid_set,
                                                    Gtid *first_gtid,
-                                                   const char **errmsg) {
+                                                   std::string &errmsg) {
   DBUG_TRACE;
   LOG_INFO linfo;
   auto log_index = this->get_log_index();
@@ -4349,19 +4364,19 @@
   Gtid_set binlog_previous_gtid_set{gtid_set->get_sid_map()};
 
   if (error != LOG_INFO_EOF) {
-    *errmsg =
+    errmsg.assign(
         "Failed to read the binary log index file while "
         "looking for the oldest binary log that contains any GTID "
-        "that is not in the given gtid set";
+        "that is not in the given gtid set");
     error = -1;
     goto end;
   }
 
   if (filename_list.empty()) {
-    *errmsg =
+    errmsg.assign(
         "Could not find first log file name in binary log index file "
         "while looking for the oldest binary log that contains any GTID "
-        "that is not in the given gtid set";
+        "that is not in the given gtid set");
     error = -2;
     goto end;
   }
@@ -4390,17 +4405,17 @@
                                    binlog_previous_gtid_set.get_sid_map(),
                                    opt_source_verify_checksum, is_relay_log)) {
       case ERROR:
-        *errmsg =
+        errmsg.assign(
             "Error reading header of binary log while looking for "
             "the oldest binary log that contains any GTID that is not in "
-            "the given gtid set";
+            "the given gtid set");
         error = -3;
         goto end;
       case NO_GTIDS:
-        *errmsg =
+        errmsg.assign(
             "Found old binary log without GTIDs while looking for "
             "the oldest binary log that contains any GTID that is not in "
-            "the given gtid set";
+            "the given gtid set");
         error = -4;
         goto end;
       case GOT_GTIDS:
@@ -4428,7 +4443,7 @@
   }
 
 end:
-  if (error) DBUG_PRINT("error", ("'%s'", *errmsg));
+  if (error) DBUG_PRINT("error", ("'%s'", errmsg.c_str()));
   filename_list.clear();
   DBUG_PRINT("info", ("returning %d", error));
   return error != 0 ? true : false;
@@ -4565,7 +4580,7 @@
             assert(lost_gtids->is_empty());
             goto end;
           }
-          /*FALLTHROUGH*/
+          [[fallthrough]];
         }
         case TRUNCATED: {
           break;
@@ -4686,7 +4701,7 @@
           verify_checksum, is_relay_log)) {
         case ERROR: {
           error = 1;
-          /*FALLTHROUGH*/
+          [[fallthrough]];
         }
         case GOT_GTIDS: {
           goto end;
@@ -4707,7 +4722,7 @@
             read any more binary logs.
           */
           if (binlog_gtid_simple_recovery) goto end;
-          /*FALLTHROUGH*/
+          [[fallthrough]];
         }
         case TRUNCATED: {
           break;
@@ -7338,9 +7353,9 @@
   return error;
 }
 
-bool MYSQL_BIN_LOG::write_dml_directly(THD *thd, const char *stmt,
-                                       size_t stmt_len,
-                                       enum_sql_command sql_command) {
+bool MYSQL_BIN_LOG::write_stmt_directly(THD *thd, const char *stmt,
+                                        size_t stmt_len,
+                                        enum_sql_command sql_command) {
   bool ret = false;
   /* backup the original command */
   enum_sql_command save_sql_command = thd->lex->sql_command;
@@ -8444,7 +8459,7 @@
 };
 #endif
 
-bool MYSQL_BIN_LOG::change_stage(THD *thd MY_ATTRIBUTE((unused)),
+bool MYSQL_BIN_LOG::change_stage(THD *thd [[maybe_unused]],
                                  Commit_stage_manager::StageID stage,
                                  THD *queue, mysql_mutex_t *leave_mutex,
                                  mysql_mutex_t *enter_mutex) {
@@ -9125,7 +9140,7 @@
 }
 
 void MYSQL_BIN_LOG::report_missing_purged_gtids(
-    const Gtid_set *slave_executed_gtid_set, const char **errmsg) {
+    const Gtid_set *slave_executed_gtid_set, std::string &errmsg) {
   DBUG_TRACE;
   THD *thd = current_thd;
   Gtid_set gtid_missing(gtid_state->get_lost_gtids()->get_sid_map());
@@ -9163,11 +9178,11 @@
   std::ostringstream gtid_info;
   gtid_info << "The GTID set sent by the slave is '" << slave_executed_gtids
             << "', and the missing transactions are '" << missing_gtids << "'";
-  *errmsg = ER_THD(thd, ER_MASTER_HAS_PURGED_REQUIRED_GTIDS);
+  errmsg.assign(ER_THD(thd, ER_MASTER_HAS_PURGED_REQUIRED_GTIDS));
 
   /* Don't consider the "%s" in the format string. Subtract 2 from the
      total length */
-  int total_length = (strlen(*errmsg) - 2 + gtid_info.str().length());
+  int total_length = (errmsg.length() - 2 + gtid_info.str().length());
 
   DBUG_EXECUTE_IF("simulate_long_missing_gtids",
                   { total_length = MYSQL_ERRMSG_SIZE + 1; });
@@ -9180,9 +9195,9 @@
         " GTID_SUBTRACT");
 
   /* Buffer for formatting the message about the missing GTIDs. */
-  static char buff[MYSQL_ERRMSG_SIZE];
-  snprintf(buff, MYSQL_ERRMSG_SIZE, *errmsg, gtid_info.str().c_str());
-  *errmsg = const_cast<const char *>(buff);
+  char buff[MYSQL_ERRMSG_SIZE] = {0};
+  snprintf(buff, MYSQL_ERRMSG_SIZE, errmsg.c_str(), gtid_info.str().c_str());
+  errmsg.assign(buff);
 
   my_free(missing_gtids);
   my_free(slave_executed_gtids);
@@ -9190,7 +9205,7 @@
 
 void MYSQL_BIN_LOG::report_missing_gtids(
     const Gtid_set *previous_gtid_set, const Gtid_set *slave_executed_gtid_set,
-    const char **errmsg) {
+    std::string &errmsg) {
   DBUG_TRACE;
   THD *thd = current_thd;
   char *missing_gtids = nullptr;
@@ -9228,20 +9243,21 @@
   std::ostringstream gtid_info;
   gtid_info << "The GTID set sent by the slave is '" << slave_executed_gtids
             << "', and the missing transactions are '" << missing_gtids << "'";
-  *errmsg = ER_THD(thd, ER_MASTER_HAS_PURGED_REQUIRED_GTIDS);
+  errmsg.assign(ER_THD(thd, ER_MASTER_HAS_PURGED_REQUIRED_GTIDS));
 
   /* Don't consider the "%s" in the format string. Subtract 2 from the
      total length */
-  if ((strlen(*errmsg) - 2 + gtid_info.str().length()) > MYSQL_ERRMSG_SIZE)
+  if ((errmsg.length() - 2 + gtid_info.str().length()) > MYSQL_ERRMSG_SIZE)
     gtid_info.str(
         "The GTID sets and the missing purged transactions are too"
         " long to print in this message. For more information,"
         " please see the master's error log or the manual for"
         " GTID_SUBTRACT");
   /* Buffer for formatting the message about the missing GTIDs. */
-  static char buff[MYSQL_ERRMSG_SIZE];
-  snprintf(buff, MYSQL_ERRMSG_SIZE, *errmsg, gtid_info.str().c_str());
-  *errmsg = const_cast<const char *>(buff);
+  char buff[MYSQL_ERRMSG_SIZE] = {0};
+  snprintf(buff, MYSQL_ERRMSG_SIZE, errmsg.c_str(), gtid_info.str().c_str());
+  errmsg.assign(buff);
+
   my_free(missing_gtids);
   my_free(slave_executed_gtids);
 }
@@ -11489,7 +11505,7 @@
       DBUG_PRINT("debug", ("is_current_stmt_binlog_format_row: %d",
                            is_current_stmt_binlog_format_row()));
       if (is_current_stmt_binlog_format_row()) return 0;
-      /* Fall through */
+      [[fallthrough]];
 
       /*
         STMT_QUERY_TYPE means that the query must be logged in statement
diff -Nru mysql-8.0-8.0.26/sql/binlog.h mysql-8.0-8.0.27/sql/binlog.h
--- mysql-8.0-8.0.26/sql/binlog.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/binlog.h	2021-09-28 11:46:34.000000000 +0000
@@ -360,6 +360,16 @@
   Transaction_dependency_tracker m_dependency_tracker;
 
   /**
+    Find the oldest binary log referenced by the index file
+
+    @param[out] binlog_file_name the file name of oldest log found
+    @param[out] errmsg the error message outputted, which is left untouched
+                if the function returns false
+    @return false on success, true on error.
+  */
+  bool find_first_log(std::string &binlog_file_name, std::string &errmsg);
+
+  /**
     Find the oldest binary log that contains any GTID that
     is not in the given gtid set.
 
@@ -373,7 +383,7 @@
   */
   bool find_first_log_not_in_gtid_set(char *binlog_file_name,
                                       const Gtid_set *gtid_set,
-                                      Gtid *first_gtid, const char **errmsg);
+                                      Gtid *first_gtid, std::string &errmsg);
 
   /**
     Reads the set of all GTIDs in the binary/relay log, and the set
@@ -717,7 +727,7 @@
      Gtid_log_event and BEGIN, COMMIT automatically.
 
      It is aimed to handle cases of "background" logging where a statement is
-     logged indirectly, like "DELETE FROM a_memory_table". So don't use it on
+     logged indirectly, like "TRUNCATE TABLE a_memory_table". So don't use it on
      any normal statement.
 
      @param[in] thd  the THD object of current thread.
@@ -727,8 +737,8 @@
 
      @return Returns false if succeeds, otherwise true is returned.
   */
-  bool write_dml_directly(THD *thd, const char *stmt, size_t stmt_len,
-                          enum enum_sql_command sql_command);
+  bool write_stmt_directly(THD *thd, const char *stmt, size_t stmt_len,
+                           enum enum_sql_command sql_command);
 
   void report_cache_write_error(THD *thd, bool is_transactional);
   bool check_write_error(const THD *thd);
@@ -846,7 +856,7 @@
     @param errmsg                      Pointer to the error message
   */
   void report_missing_purged_gtids(const Gtid_set *slave_executed_gtid_set,
-                                   const char **errmsg);
+                                   std::string &errmsg);
 
   /**
     Function to report the missing GTIDs.
@@ -870,7 +880,7 @@
   */
   void report_missing_gtids(const Gtid_set *previous_gtid_set,
                             const Gtid_set *slave_executed_gtid_set,
-                            const char **errmsg);
+                            std::string &errmsg);
   static const int MAX_RETRIES_FOR_DELETE_RENAME_FAILURE = 5;
   /*
     It is called by the threads (e.g. dump thread, applier thread) which want
diff -Nru mysql-8.0-8.0.26/sql/binlog_ostream.h mysql-8.0-8.0.27/sql/binlog_ostream.h
--- mysql-8.0-8.0.26/sql/binlog_ostream.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/binlog_ostream.h	2021-09-28 11:46:34.000000000 +0000
@@ -93,7 +93,7 @@
   bool truncate(my_off_t offset) override;
   /* purecov: inspected */
   /* binlog cache doesn't need seek operation. Setting true to return error */
-  bool seek(my_off_t offset MY_ATTRIBUTE((unused))) override { return true; }
+  bool seek(my_off_t offset [[maybe_unused]]) override { return true; }
   /**
      Reset status and drop all data. It looks like a cache never was used after
      reset.
diff -Nru mysql-8.0-8.0.26/sql/bka_iterator.cc mysql-8.0-8.0.27/sql/bka_iterator.cc
--- mysql-8.0-8.0.26/sql/bka_iterator.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/bka_iterator.cc	2021-09-28 11:46:34.000000000 +0000
@@ -132,9 +132,8 @@
       m_has_row_from_previous_batch = false;
       LoadBufferRowIntoTableBuffers(
           m_outer_input_tables,
-          hash_join_buffer::Key(
-              pointer_cast<const uchar *>(m_outer_row_buffer.ptr()),
-              m_outer_row_buffer.length()));
+          hash_join_buffer::Key(m_outer_row_buffer.ptr(),
+                                m_outer_row_buffer.length()));
     } else {
       int result = m_outer_input->Read();
       if (result == 1) {
@@ -177,7 +176,7 @@
       break;
     }
 
-    uchar *row = m_mem_root.ArrayAlloc<uchar>(row_size);
+    char *row = m_mem_root.ArrayAlloc<char>(row_size);
     if (row == nullptr) {
       return 1;
     }
@@ -254,7 +253,8 @@
     } else {
       // Return a NULL-complemented row. (Our table already has the NULL flag
       // set.)
-      LoadIntoTableBuffers(m_outer_input_tables, m_current_pos->data());
+      LoadIntoTableBuffers(m_outer_input_tables,
+                           pointer_cast<const uchar *>(m_current_pos->data()));
       ++m_current_pos;
       return 0;
     }
@@ -303,7 +303,7 @@
           break;
         }
       }
-      // Fall through.
+        [[fallthrough]];
       case State::RETURNING_NULL_COMPLEMENTED_ROWS: {
         int err = MakeNullComplementedRow();
         if (err != -1) {
@@ -441,7 +441,8 @@
     // See bug #30594210.
   } while (m_join_type == JoinType::SEMI && RowHasBeenRead(rec_ptr));
 
-  LoadIntoTableBuffers(m_outer_input_tables, rec_ptr->data());
+  LoadIntoTableBuffers(m_outer_input_tables,
+                       pointer_cast<const uchar *>(rec_ptr->data()));
 
   m_last_row_returned = rec_ptr;
 
diff -Nru mysql-8.0-8.0.26/sql/bootstrap.cc mysql-8.0-8.0.27/sql/bootstrap.cc
--- mysql-8.0-8.0.26/sql/bootstrap.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/bootstrap.cc	2021-09-28 11:46:34.000000000 +0000
@@ -181,15 +181,14 @@
 }
 
 static int process_iterator(THD *thd, Command_iterator *it,
-                            bool enforce_invariants MY_ATTRIBUTE((unused))) {
+                            bool enforce_invariants [[maybe_unused]]) {
   std::string query;
   Key_length_error_handler error_handler;
   bool error = false;
 
-  const bool saved_sql_log_bin MY_ATTRIBUTE((unused)) =
-      thd->variables.sql_log_bin;
-  const ulonglong invariant_bits MY_ATTRIBUTE((unused)) = OPTION_BIN_LOG;
-  const ulonglong saved_option_bits MY_ATTRIBUTE((unused)) =
+  const bool saved_sql_log_bin [[maybe_unused]] = thd->variables.sql_log_bin;
+  const ulonglong invariant_bits [[maybe_unused]] = OPTION_BIN_LOG;
+  const ulonglong saved_option_bits [[maybe_unused]] =
       thd->variables.option_bits & invariant_bits;
 
   it->begin();
@@ -269,7 +268,7 @@
       break;
     }
 
-    free_root(thd->mem_root, MYF(MY_KEEP_PREALLOC));
+    thd->mem_root->ClearForReuse();
 
     /*
       Make sure bootstrap statements do not change binlog options.
diff -Nru mysql-8.0-8.0.26/sql/bounded_queue.h mysql-8.0-8.0.27/sql/bounded_queue.h
--- mysql-8.0-8.0.26/sql/bounded_queue.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/bounded_queue.h	2021-09-28 11:46:34.000000000 +0000
@@ -115,14 +115,18 @@
 
     if (m_queue.size() == m_queue.capacity()) {
       const Key_type &pq_top = m_queue.top();
-      const uint MY_ATTRIBUTE((unused)) rec_sz =
+      [[maybe_unused]] const uint rec_sz =
           m_sort_param->make_sortkey(pq_top, element_size, opaque);
-      assert(rec_sz <= m_element_size);
+      // UINT_MAX means error, but we do not want to add a dependency
+      // on class THD here, as in current_thd->is_error().
+      assert(rec_sz <= m_element_size || rec_sz == UINT_MAX);
       m_queue.update_top();
     } else {
-      const uint MY_ATTRIBUTE((unused)) rec_sz = m_sort_param->make_sortkey(
+      [[maybe_unused]] const uint rec_sz = m_sort_param->make_sortkey(
           m_sort_keys[m_queue.size()], element_size, opaque);
-      assert(rec_sz <= m_element_size);
+      // UINT_MAX means error, but we do not want to add a dependency
+      // on class THD here, as in current_thd->is_error().
+      assert(rec_sz <= m_element_size || rec_sz == UINT_MAX);
       m_queue.push(m_sort_keys[m_queue.size()]);
     }
   }
diff -Nru mysql-8.0-8.0.26/sql/changestreams/apply/constants.h mysql-8.0-8.0.27/sql/changestreams/apply/constants.h
--- mysql-8.0-8.0.26/sql/changestreams/apply/constants.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/changestreams/apply/constants.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,33 @@
+/*
+   Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef CHANGE_STREAM_APPLY_CONSTANTS_H_
+#define CHANGE_STREAM_APPLY_CONSTANTS_H_
+
+/* masks for start/stop operations on io and sql slave threads */
+static constexpr unsigned long SLAVE_IO = 1;
+static constexpr unsigned long SLAVE_SQL = 2;
+// We also have SLAVE_FORCE_ALL 4
+static constexpr unsigned long SLAVE_MONITOR = 8;
+
+#endif /* CHANGE_STREAM_APPLY_CONSTANTS_H_ */
diff -Nru mysql-8.0-8.0.26/sql/changestreams/apply/replication_thread_status.cc mysql-8.0-8.0.27/sql/changestreams/apply/replication_thread_status.cc
--- mysql-8.0-8.0.26/sql/changestreams/apply/replication_thread_status.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/changestreams/apply/replication_thread_status.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,70 @@
+/*
+   Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include "sql/changestreams/apply/replication_thread_status.h"
+#include "sql/changestreams/apply/constants.h"
+#include "sql/rpl_io_monitor.h"
+
+void lock_slave_threads(Master_info *mi) {
+  DBUG_TRACE;
+
+  // protection against mixed locking order (see rpl_slave.cc header)
+  mi->channel_assert_some_wrlock();
+
+  // TODO: see if we can do this without dual mutex
+  mysql_mutex_lock(&mi->run_lock);
+  mysql_mutex_lock(&mi->rli->run_lock);
+}
+
+void unlock_slave_threads(Master_info *mi) {
+  DBUG_TRACE;
+
+  // TODO: see if we can do this without dual mutex
+  mysql_mutex_unlock(&mi->rli->run_lock);
+  mysql_mutex_unlock(&mi->run_lock);
+}
+
+void init_thread_mask(int *mask, Master_info *mi, bool inverse,
+                      bool ignore_monitor_thread) {
+  bool set_io = mi->slave_running, set_sql = mi->rli->slave_running;
+  bool set_monitor{
+      Source_IO_monitor::get_instance()->is_monitoring_process_running()};
+  int tmp_mask{0};
+  DBUG_TRACE;
+
+  if (set_io) tmp_mask |= SLAVE_IO;
+  if (set_sql) tmp_mask |= SLAVE_SQL;
+  if (!ignore_monitor_thread && set_monitor &&
+      mi->is_source_connection_auto_failover()) {
+    tmp_mask |= SLAVE_MONITOR;
+  }
+
+  if (inverse) {
+    tmp_mask ^= (SLAVE_IO | SLAVE_SQL);
+    if (!ignore_monitor_thread && mi->is_source_connection_auto_failover()) {
+      tmp_mask ^= SLAVE_MONITOR;
+    }
+  }
+
+  *mask = tmp_mask;
+}
diff -Nru mysql-8.0-8.0.26/sql/changestreams/apply/replication_thread_status.h mysql-8.0-8.0.27/sql/changestreams/apply/replication_thread_status.h
--- mysql-8.0-8.0.26/sql/changestreams/apply/replication_thread_status.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/changestreams/apply/replication_thread_status.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,67 @@
+/*
+   Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef CHANGE_STREAM_REPLICATION_THREAD_STATUS_H_
+#define CHANGE_STREAM_REPLICATION_THREAD_STATUS_H_
+
+#include "sql/rpl_mi.h"
+
+/**
+  This method locks both (in this order)
+    mi->run_lock
+    rli->run_lock
+
+  @param mi The associated master info object
+
+  @note this method shall be invoked while locking mi->m_channel_lock
+  for writes. This is due to the mixed order in which these locks are released
+  and acquired in such method as the slave threads start and stop methods.
+*/
+void lock_slave_threads(Master_info *mi);
+
+/**
+  Unlock replica master and relay log info locks.
+
+  @param mi the repo info object that contains the lock
+*/
+void unlock_slave_threads(Master_info *mi);
+
+/**
+  Find out which replications threads are running
+
+  @param mask                   Return value here
+  @param mi                     master_info for slave
+  @param inverse                If set, returns which threads are not running
+  @param ignore_monitor_thread  If set, ignores monitor io thread
+
+  IMPLEMENTATION
+    Get a bit mask for which threads are running.
+
+  @return
+            If inverse == 0, running threads
+            If inverse == 1, stopped threads
+*/
+void init_thread_mask(int *mask, Master_info *mi, bool inverse,
+                      bool ignore_monitor_thread = false);
+
+#endif /* CHANGE_STREAM_REPLICATION_THREAD_STATUS_H_ */
diff -Nru mysql-8.0-8.0.26/sql/check_stack.cc mysql-8.0-8.0.27/sql/check_stack.cc
--- mysql-8.0-8.0.26/sql/check_stack.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/check_stack.cc	2021-09-28 11:46:34.000000000 +0000
@@ -63,18 +63,23 @@
   @returns false if success, true if error (reported).
 
   @note
-  Note: The 'buf' parameter is necessary, even if it is unused here.
-  - fix_fields functions has a "dummy" buffer large enough for the
-    corresponding exec. (Thus we only have to check in fix_fields.)
-  - Passing to check_stack_overrun() prevents the compiler from removing it.
+  Note: The 'buf' parameter is necessary, and we must have code which uses it.
+  - Some of the fix_fields functions have a "dummy" buffer large enough for the
+    corresponding execution. (Thus we only have to check in fix_fields.)
+  - Passing the buffer to check_stack_overrun() prevents the compiler from
+    removing it.
+  - For -flto builds, the dummy buffer may be optimized away,
+    so we need to write something into it.
 */
-bool check_stack_overrun(const THD *thd, long margin,
-                         unsigned char *buf MY_ATTRIBUTE((unused))) {
+bool check_stack_overrun(const THD *thd, long margin, unsigned char *buf) {
   assert(thd == current_thd);
   long stack_used =
       used_stack(thd->thread_stack, reinterpret_cast<char *>(&stack_used));
   if (stack_used >= static_cast<long>(my_thread_stack_size - margin) ||
       DBUG_EVALUATE_IF("simulate_stack_overrun", true, false)) {
+    // Touch the buffer, so that it is not optimized away by -flto.
+    if (buf != nullptr) buf[0] = '\0';
+
     /*
       Do not use stack for the message buffer to ensure correct
       behaviour in cases we have close to no stack left.
diff -Nru mysql-8.0-8.0.26/sql/client_settings.h mysql-8.0-8.0.27/sql/client_settings.h
--- mysql-8.0-8.0.26/sql/client_settings.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/client_settings.h	2021-09-28 11:46:34.000000000 +0000
@@ -33,11 +33,12 @@
  When adding capabilities here, consider if they should be also added to
  the libmysql version.
 */
-#define CLIENT_CAPABILITIES                                        \
-  (CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | CLIENT_TRANSACTIONS | \
-   CLIENT_PROTOCOL_41 | CLIENT_RESERVED2 | CLIENT_PLUGIN_AUTH |    \
-   CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA | CLIENT_CONNECT_ATTRS |  \
-   CLIENT_SESSION_TRACK | CLIENT_DEPRECATE_EOF | CLIENT_QUERY_ATTRIBUTES)
+#define CLIENT_CAPABILITIES                                                \
+  (CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | CLIENT_TRANSACTIONS |         \
+   CLIENT_PROTOCOL_41 | CLIENT_RESERVED2 | CLIENT_PLUGIN_AUTH |            \
+   CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA | CLIENT_CONNECT_ATTRS |          \
+   CLIENT_SESSION_TRACK | CLIENT_DEPRECATE_EOF | CLIENT_QUERY_ATTRIBUTES | \
+   MULTI_FACTOR_AUTHENTICATION)
 
 #define read_user_name(A) \
   {}
diff -Nru mysql-8.0-8.0.26/sql/clone_handler.cc mysql-8.0-8.0.27/sql/clone_handler.cc
--- mysql-8.0-8.0.26/sql/clone_handler.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/clone_handler.cc	2021-09-28 11:46:34.000000000 +0000
@@ -290,6 +290,20 @@
   return clone_handle->init();
 }
 
+int clone_handle_check_drop(MYSQL_PLUGIN plugin_info) {
+  auto plugin = static_cast<st_plugin_int *>(plugin_info);
+  int error = 0;
+
+  mysql_mutex_lock(&LOCK_plugin);
+  assert(plugin->state == PLUGIN_IS_DYING);
+
+  if (plugin->ref_count > 0) {
+    error = ER_PLUGIN_CANNOT_BE_UNINSTALLED; /* purecov: inspected */
+  }
+  mysql_mutex_unlock(&LOCK_plugin);
+  return error;
+}
+
 int clone_handle_drop() {
   if (clone_handle == nullptr) {
     return 1;
diff -Nru mysql-8.0-8.0.26/sql/CMakeLists.txt mysql-8.0-8.0.27/sql/CMakeLists.txt
--- mysql-8.0-8.0.26/sql/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -74,7 +74,10 @@
 
 MY_CHECK_CXX_COMPILER_WARNING("-Wmissing-profile" HAS_MISSING_PROFILE)
 IF(HAS_MISSING_PROFILE)
-  ADD_COMPILE_FLAGS(gen_lex_token.cc COMPILE_FLAGS ${HAS_MISSING_PROFILE})
+  ADD_COMPILE_FLAGS(
+    binlog_reader.cc  # In case we did not profile replication.
+    gen_lex_token.cc  # This is a compile-time tool.
+    COMPILE_FLAGS ${HAS_MISSING_PROFILE})
 ENDIF()
 
 ADD_CUSTOM_COMMAND(
@@ -102,8 +105,11 @@
 
 # ICU headers for WIN32 need extra info about their libs state
 IF(WIN32)
-  ADD_COMPILE_DEFINITIONS(gen_keyword_list.cc COMPILE_DEFINITIONS
+  MY_ADD_COMPILE_DEFINITIONS(gen_keyword_list.cc COMPILE_DEFINITIONS
     U_STATIC_IMPLEMENTATION)
+
+  # Activate necessary dllexport/dllimport declarations.
+  ADD_DEFINITIONS(-DPROTOBUF_USE_DLLS)
 ENDIF()
 
 ADD_CUSTOM_COMMAND(
@@ -114,6 +120,7 @@
 
 ADD_DEFINITIONS(-DMYSQL_SERVER)
 ADD_SUBDIRECTORY(server_component)
+ADD_SUBDIRECTORY(protobuf)
 
 SET(DD_SOURCES
   dd/collection.cc
@@ -289,7 +296,6 @@
 )
 
 SET(SQL_GIS_SOURCES
-  geometry_rtree.cc
   gis/area.cc
   gis/buffer.cc
   gis/covered_by.cc
@@ -305,6 +311,8 @@
   gis/gc_utils.cc
   gis/geometries.cc
   gis/hausdorff_distance.cc
+  gis/intersection.cc
+  gis/intersection_functor.cc
   gis/intersects.cc
   gis/is_simple.cc
   gis/is_valid.cc
@@ -319,6 +327,8 @@
   gis/srs/srs.cc
   gis/srs/wkt_parser.cc
   gis/st_units_of_measure.cc
+  gis/symdifference.cc
+  gis/symdifference_functor.cc
   gis/touches.cc
   gis/transform.cc
   gis/union.cc
@@ -331,8 +341,6 @@
   item_geofunc_buffer.cc
   item_geofunc_internal.cc
   item_geofunc_relchecks.cc
-  item_geofunc_relchecks_bgwrap.cc
-  item_geofunc_setops.cc
   options_parser.cc
 )
 
@@ -346,6 +354,7 @@
   auth/sql_authentication.cc
   auth/sql_auth_cache.cc
   auth/sql_authorization.cc
+  auth/sql_mfa.cc
   auth/sql_user_table.cc
   auth/sql_user.cc
   auth/partial_revokes.cc
@@ -410,13 +419,19 @@
   item_xmlfunc.cc
   item_inetfunc.cc
   join_optimizer/access_path.cc
+  join_optimizer/build_interesting_orders.cc
+  join_optimizer/common_subexpression_elimination.cc
+  join_optimizer/cost_model.cc
   join_optimizer/estimate_selectivity.cc
   join_optimizer/explain_access_path.cc
+  join_optimizer/finalize_plan.cc
   join_optimizer/hypergraph.cc
   join_optimizer/interesting_orders.cc
   join_optimizer/join_optimizer.cc
   join_optimizer/make_join_hypergraph.cc
+  join_optimizer/overflow_bitset.cc
   join_optimizer/print_utils.cc
+  join_optimizer/replace_item.cc
   json_binary.cc
   json_diff.cc
   json_dom.cc
@@ -445,7 +460,6 @@
   opt_explain_traditional.cc
   opt_explain_json.cc
   opt_hints.cc
-  opt_range.cc
   opt_statistics.cc
   opt_sum.cc
   opt_trace.cc
@@ -468,6 +482,22 @@
   protocol_classic.cc
   psi_memory_key.cc
   query_result.cc
+  range_optimizer/geometry.cc
+  range_optimizer/group_min_max.cc
+  range_optimizer/group_min_max_plan.cc
+  range_optimizer/index_merge.cc
+  range_optimizer/index_merge_plan.cc
+  range_optimizer/partition_pruning.cc
+  range_optimizer/range_analysis.cc
+  range_optimizer/range_optimizer.cc
+  range_optimizer/range_scan.cc
+  range_optimizer/range_scan_desc.cc
+  range_optimizer/range_scan_plan.cc
+  range_optimizer/rowid_ordered_retrieval.cc
+  range_optimizer/rowid_ordered_retrieval_plan.cc
+  range_optimizer/skip_scan.cc
+  range_optimizer/skip_scan_plan.cc
+  range_optimizer/tree.cc
   records.cc
   regexp/errors.cc
   regexp/regexp_engine.cc
@@ -597,7 +627,19 @@
   window_iterators.cc
   xa.cc
   daemon_proxy_keyring/daemon_proxy_keyring.cc
-)
+  )
+
+IF(BUILD_IS_SINGLE_CONFIG)
+  GET_PROPERTY(CWD_DEFINITIONS DIRECTORY PROPERTY COMPILE_DEFINITIONS)
+  IF(NOT CMAKE_CXX_FLAGS MATCHES "DENABLED_DEBUG_SYNC" AND
+      NOT CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE_UPPER} MATCHES "DENABLED_DEBUG_SYNC" AND
+      NOT CWD_DEFINITIONS MATCHES "ENABLED_DEBUG_SYNC")
+    # This has ifdef ENABLED_DEBUG_SYNC
+    LIST(REMOVE_ITEM SQL_SHARED_SOURCES
+      debug_sync.cc
+      )
+  ENDIF()
+ENDIF()
 
 # BISON_TARGET(<Name> <YaccInput> <CodeOutput>
 #              [COMPILE_FLAGS <flags>]
@@ -718,6 +760,8 @@
   ../sql-common/my_path_permissions.cc
   ../sql-common/net_ns.cc
   ../sql-common/net_serv.cc
+  ../sql-common/oci/signing_key.cc
+  ../sql-common/oci/ssl.cc
   ../sql-common/sql_string.cc
   ../sql-common/bind_params.cc
   command_service.cc
@@ -742,6 +786,10 @@
   srv_session_service.cc
   )
 
+IF(NOT HAVE_SETNS)
+  LIST(REMOVE_ITEM SQL_SOURCE ../sql-common/net_ns.cc)
+ENDIF()
+
 IF(NOT WIN32)
   LIST(APPEND SQL_SOURCE mysqld_daemon.cc)
 ENDIF()
@@ -755,14 +803,7 @@
       )
 ENDIF()
 
-# Segfault in boost::geometry code at high optimization levels
-IF(CMAKE_CXX_COMPILER_ID MATCHES "SunPro")
-  IF(CMAKE_BUILD_TYPE_UPPER MATCHES "REL")
-    ADD_COMPILE_FLAGS(item_geofunc_buffer.cc COMPILE_FLAGS "-xO2")
-  ENDIF()
-ENDIF()
-
-ADD_COMPILE_DEFINITIONS(
+MY_ADD_COMPILE_DEFINITIONS(
   ${BUNDLED_LZ4_PATH}/xxhash.c
   COMPILE_DEFINITIONS XXH_NAMESPACE=MY_
   )
@@ -780,13 +821,13 @@
     gis/difference.cc
     gis/difference_functor.cc
     gis/intersection_functor.cc
+    gis/symdifference_functor.cc
     gis/touches.cc
     gis/union.cc
     gis/union_functor.cc
     gis/within.cc
     item_geofunc.cc
     item_geofunc_relchecks.cc
-    item_geofunc_setops.cc
     COMPILE_FLAGS "/bigobj")
 ENDIF()
 
@@ -796,7 +837,6 @@
   IF(HAS_WARN_FLAG)
     ADD_COMPILE_FLAGS(
       geometry_rtree.cc
-      item_geofunc_relchecks_bgwrap.cc
       COMPILE_FLAGS ${HAS_WARN_FLAG}
       )
   ENDIF()
@@ -865,28 +905,6 @@
   ENDIF()
 ENDIF()
 
-# A class with a reference member lacks a user-defined constructor,
-# which can lead to errors.
-# Constexpr function return type is not a literal type.
-IF(MY_COMPILER_IS_SUNPRO)
-  SET_TARGET_PROPERTIES(sql_gis PROPERTIES
-    COMPILE_FLAGS "-erroff=refmemnoconstr,w_constexprnonlitret")
-  ADD_COMPILE_FLAGS(
-    item_geofunc_setops.cc
-    COMPILE_FLAGS "-erroff=refmemnoconstr")
-ENDIF()
-
-# -g0 is the same as -g, except that inlining is enabled.
-# With Studio 12.6 we may get linking errors for large binaries,
-# so we add -g0 here to enable inlining of boost/geometry.
-# This also cuts link time by almost one hour for large binaries ....
-IF(MY_COMPILER_IS_SUNPRO)
-  ADD_COMPILE_FLAGS(
-    ${SQL_GIS_SOURCES}
-    sql_exception_handler.cc
-    COMPILE_FLAGS " -g0 -xdebuginfo=no%decl")
-ENDIF()
-
 ADD_LIBRARY(sql_dd STATIC ${DD_SOURCES})
 ADD_DEPENDENCIES(sql_dd GenFixPrivs)
 ADD_DEPENDENCIES(sql_dd GenServerSource)
@@ -906,7 +924,7 @@
   ADD_DEFINITIONS(-DAUTHENTICATION_WIN)
   TARGET_LINK_LIBRARIES(sql_main auth_win_client)
   IF(OPENSSL_APPLINK_C)
-    ADD_COMPILE_DEFINITIONS(
+    MY_ADD_COMPILE_DEFINITIONS(
       ../sql-common/client_authentication.cc
       COMPILE_DEFINITIONS HAVE_OPENSSL_APPLINK_C)
   ENDIF()
@@ -962,6 +980,7 @@
 SET (SLAVE_SOURCE
   dynamic_ids.cc
   changestreams/apply/commit_order_queue.cc
+  changestreams/apply/replication_thread_status.cc
   rpl_applier_reader.cc
   rpl_async_conn_failover.cc
   rpl_async_conn_failover_table_operations.cc
@@ -969,6 +988,8 @@
   rpl_async_conn_failover_add_source_udf.cc
   rpl_async_conn_failover_delete_managed_udf.cc
   rpl_async_conn_failover_delete_source_udf.cc
+  rpl_async_conn_failover_configuration_propagation.cc
+  rpl_async_conn_failover_reset_udf.cc
   rpl_channel_service_interface.cc
   rpl_channel_credentials.cc
   rpl_info.cc
@@ -998,7 +1019,15 @@
   )
 ADD_LIBRARY(slave STATIC ${SLAVE_SOURCE})
 ADD_DEPENDENCIES(slave GenError)
-TARGET_LINK_LIBRARIES(slave binlog sql_main)
+TARGET_LINK_LIBRARIES(slave
+  binlog sql_main ${PROTOBUF_LITE_LIBRARY} ${RPL_PROTOBUF_LITE_LIB})
+
+# Includes code generated by protobuf, and version 3.12 will generate extra ';'.
+MY_CHECK_CXX_COMPILER_WARNING("-Wextra-semi" HAS_WARN_FLAG)
+IF(HAS_WARN_FLAG)
+  TARGET_COMPILE_OPTIONS(slave PRIVATE "${HAS_WARN_FLAG}")
+  ADD_COMPILE_FLAGS(mysqld.cc COMPILE_FLAGS ${HAS_WARN_FLAG})
+ENDIF()
 
 # All these libraries depend on each other.
 TARGET_LINK_LIBRARIES(sql_main rpl master slave binlog)
@@ -1016,7 +1045,7 @@
   ${MYSQLD_SOURCE} DESTINATION ${INSTALL_SBINDIR} COMPONENT Server
   )
 
-# We depend on protobuf because of the mysqlx plugin.
+# We depend on protobuf because of the mysqlx plugin and replication.
 IF(UNIX_INSTALL_RPATH_ORIGIN_PRIV_LIBDIR)
   ADD_INSTALL_RPATH_FOR_PROTOBUF(mysqld)
 ENDIF()
@@ -1041,7 +1070,7 @@
     TARGET_LINK_LIBRARIES(mysqld ${CORESERVICES})
   ENDIF()
   IF(APPLE_XCODE)
-    ADD_COMPILE_DEFINITIONS(mysqld.cc COMPILE_DEFINITIONS APPLE_XCODE)
+    MY_ADD_COMPILE_DEFINITIONS(mysqld.cc COMPILE_DEFINITIONS APPLE_XCODE)
   ENDIF()
 ENDIF()
 
@@ -1144,20 +1173,13 @@
   TARGET_LINK_LIBRARIES(mysqld ${LDAP_LIBRARY})
 ENDIF()
 
+IF(SOLARIS)
+  TARGET_LINK_LIBRARIES(mysqld mtmalloc)
+ENDIF()
+
 # Remove transitive link dependencies when linking plugins
 SET_TARGET_PROPERTIES(mysqld PROPERTIES INTERFACE_LINK_LIBRARIES "")
 
-SET(WITH_MYSQLD_LDFLAGS "" CACHE STRING "Additional linker flags for mysqld")
-MARK_AS_ADVANCED(WITH_MYSQLD_LDFLAGS)
-IF(WITH_MYSQLD_LDFLAGS)
-  GET_TARGET_PROPERTY(MYSQLD_LINK_FLAGS mysqld LINK_FLAGS)
-  IF(NOT MYSQLD_LINK_FLAGS)
-    SET(MYSQLD_LINK_FLAGS)
-  ENDIF()
-  SET_TARGET_PROPERTIES(mysqld PROPERTIES LINK_FLAGS
-     "${MYSQLD_LINK_FLAGS} ${WITH_MYSQLD_LDFLAGS}")
-ENDIF()
-
 # See DEBUG_EXTNAME above: mysqld may already have name mysqld-debug,
 # and the rename is a no-op. If it is called 'mysqld' we rename it.
 INSTALL_DEBUG_TARGET(mysqld
diff -Nru mysql-8.0-8.0.26/sql/composite_iterators.cc mysql-8.0-8.0.27/sql/composite_iterators.cc
--- mysql-8.0-8.0.26/sql/composite_iterators.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/composite_iterators.cc	2021-09-28 11:46:34.000000000 +0000
@@ -192,6 +192,20 @@
     return true;
   }
 
+  // If we have a HAVING after us, it needs to be evaluated within the context
+  // of the slice we're in (unless we're in the hypergraph optimizer, which
+  // doesn't use slices). However, we might have a sort before us, and
+  // SortingIterator doesn't set the slice except on Init(); it just keeps
+  // whatever was already set. When there is a temporary table after the HAVING,
+  // the slice coming from there might be wrongly set on Read(), and thus,
+  // we need to properly restore it before returning any rows.
+  //
+  // This is a hack. It would be good to get rid of the slice system altogether
+  // (the hypergraph join optimizer does not use it).
+  if (!m_join->implicit_grouping && !thd()->lex->using_hypergraph_optimizer) {
+    m_output_slice = m_join->get_ref_item_slice();
+  }
+
   m_seen_eof = false;
   m_save_nullinfo = 0;
 
@@ -247,6 +261,9 @@
           for (Item_sum **item = m_join->sum_funcs; *item != nullptr; ++item) {
             (*item)->clear();
           }
+          if (m_output_slice != -1) {
+            m_join->set_ref_item_slice(m_output_slice);
+          }
           return 0;
         }
       }
@@ -259,7 +276,7 @@
 
       m_last_unchanged_group_item_idx = 0;
     }
-      // Fall through.
+      [[fallthrough]];
 
     case LAST_ROW_STARTED_NEW_GROUP:
       SetRollupLevel(m_join->send_group_parts);
@@ -308,6 +325,9 @@
             SetRollupLevel(m_join->send_group_parts);
             m_state = DONE_OUTPUTTING_ROWS;
           }
+          if (m_output_slice != -1) {
+            m_join->set_ref_item_slice(m_output_slice);
+          }
           return 0;
         }
 
@@ -349,6 +369,9 @@
             m_last_unchanged_group_item_idx = 0;
             m_state = LAST_ROW_STARTED_NEW_GROUP;
           }
+          if (m_output_slice != -1) {
+            m_join->set_ref_item_slice(m_output_slice);
+          }
           return 0;
         }
 
@@ -382,6 +405,9 @@
         }
       }
 
+      if (m_output_slice != -1) {
+        m_join->set_ref_item_slice(m_output_slice);
+      }
       return 0;
 
     case DONE_OUTPUTTING_ROWS:
@@ -849,7 +875,9 @@
     // create_ondisk_from_heap will generate error if needed.
     if (!table()->file->is_ignorable_error(error)) {
       bool is_duplicate;
-      if (create_ondisk_from_heap(thd(), table(), error, true, &is_duplicate))
+      if (create_ondisk_from_heap(thd(), table(), error,
+                                  /*insert_last_record=*/true,
+                                  /*ignore_last_dup=*/true, &is_duplicate))
         return true; /* purecov: inspected */
       // Table's engine changed; index is not initialized anymore.
       if (table()->hash_field) table()->file->ha_index_init(0, false);
@@ -992,6 +1020,31 @@
   return 0;
 }
 
+/**
+  Move the in-memory temporary table to disk.
+
+  @param[in] error_code The error code because of which the table
+                        is being moved to disk.
+  @param[in] was_insert True, if the table is moved to disk during
+                        an insert operation.
+
+  @returns true if error.
+*/
+bool TemptableAggregateIterator::move_table_to_disk(int error_code,
+                                                    bool was_insert) {
+  if (create_ondisk_from_heap(thd(), table(), error_code, was_insert,
+                              /*ignore_last_dup=*/false,
+                              /*is_duplicate=*/nullptr)) {
+    return true;
+  }
+  int error = table()->file->ha_index_init(0, false);
+  if (error != 0) {
+    PrintError(error);
+    return true;
+  }
+  return false;
+}
+
 TemptableAggregateIterator::TemptableAggregateIterator(
     THD *thd, unique_ptr_destroy_only<RowIterator> subquery_iterator,
     Temp_table_param *temp_table_param, TABLE *table,
@@ -1091,11 +1144,47 @@
       if (thd()->is_error()) {
         return true;
       }
+      DBUG_EXECUTE_IF("simulate_temp_storage_engine_full",
+                      DBUG_SET("+d,temptable_allocator_record_file_full"););
       int error =
           table()->file->ha_update_row(table()->record[1], table()->record[0]);
+
+      DBUG_EXECUTE_IF("simulate_temp_storage_engine_full",
+                      DBUG_SET("-d,temptable_allocator_record_file_full"););
+      /*
+        The agrregation can result in a row update with the same values,
+        ignore the error. In case the temporary table has exhausted the memory
+        (error HA_ERR_RECORD_FILE_FULL checked in create_ondisk_from_heap()),
+        move the table to disk and retry the update operation.
+      */
       if (error != 0 && error != HA_ERR_RECORD_IS_THE_SAME) {
-        PrintError(error);
-        return true;
+        if (move_table_to_disk(error, /*insert_operation=*/false)) {
+          end_unique_index.commit();
+          return true;
+        }
+        /*
+          The key of the temporary table can be a hash of the group-by columns
+          or the group-by columns themselves. Find the row to be updated in the
+          newly created table.
+        */
+        const uchar *key;
+        if (using_hash_key()) {
+          key = table()->hash_field->field_ptr();
+        } else {
+          key = m_temp_table_param->group_buff;
+        }
+        // Read the record to be updated.
+        if (table()->file->ha_index_read_map(table()->record[1], key,
+                                             HA_WHOLE_KEY, HA_READ_KEY_EXACT)) {
+          return true;
+        }
+        // Retry the update on the newly created on-disk table.
+        error = table()->file->ha_update_row(table()->record[1],
+                                             table()->record[0]);
+        if (error != 0 && error != HA_ERR_RECORD_IS_THE_SAME) {
+          PrintError(error);
+          return true;
+        }
       }
       continue;
     }
@@ -1159,15 +1248,9 @@
           }
         }
       }
-      if (create_ondisk_from_heap(thd(), table(), error, false, nullptr)) {
-        end_unique_index.commit();
-        return true;  // Not a table_is_full error.
-      }
-      // Table's engine changed, index is not initialized anymore
-      error = table()->file->ha_index_init(0, false);
-      if (error != 0) {
+
+      if (move_table_to_disk(error, /*insert_operation=*/true)) {
         end_unique_index.commit();
-        PrintError(error);
         return true;
       }
     }
diff -Nru mysql-8.0-8.0.26/sql/composite_iterators.h mysql-8.0-8.0.27/sql/composite_iterators.h
--- mysql-8.0-8.0.26/sql/composite_iterators.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/composite_iterators.h	2021-09-28 11:46:34.000000000 +0000
@@ -295,6 +295,12 @@
    */
   String m_first_row_next_group;
 
+  /**
+    The slice we're setting when returning rows. See the comment in the
+    constructor.
+   */
+  int m_output_slice = -1;
+
   void SetRollupLevel(int level);
 };
 
@@ -725,6 +731,8 @@
 
   // See MaterializeIterator::doing_hash_deduplication().
   bool using_hash_key() const { return table()->hash_field; }
+
+  bool move_table_to_disk(int error, bool was_insert);
 };
 
 /**
diff -Nru mysql-8.0-8.0.26/sql/conn_handler/connection_handler_per_thread.cc mysql-8.0-8.0.27/sql/conn_handler/connection_handler_per_thread.cc
--- mysql-8.0-8.0.26/sql/conn_handler/connection_handler_per_thread.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/conn_handler/connection_handler_per_thread.cc	2021-09-28 11:46:34.000000000 +0000
@@ -247,7 +247,7 @@
   Connection_handler_manager *handler_manager =
       Connection_handler_manager::get_instance();
   Channel_info *channel_info = static_cast<Channel_info *>(arg);
-  bool pthread_reused MY_ATTRIBUTE((unused)) = false;
+  bool pthread_reused [[maybe_unused]] = false;
 
   if (my_thread_init()) {
     connection_errors_internal++;
@@ -276,6 +276,7 @@
         and attach it to this running pthread.
       */
       PSI_thread *psi = PSI_THREAD_CALL(new_thread)(key_thread_one_connection,
+                                                    0 /* no sequence number */,
                                                     thd, thd->thread_id());
       PSI_THREAD_CALL(set_thread_os_id)(psi);
       PSI_THREAD_CALL(set_thread)(psi);
diff -Nru mysql-8.0-8.0.26/sql/conn_handler/init_net_server_extension.cc mysql-8.0-8.0.27/sql/conn_handler/init_net_server_extension.cc
--- mysql-8.0-8.0.26/sql/conn_handler/init_net_server_extension.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/conn_handler/init_net_server_extension.cc	2021-09-28 11:46:34.000000000 +0000
@@ -49,8 +49,8 @@
 PSI_statement_info stmt_info_new_packet;
 #endif
 
-static void net_before_header_psi(NET *net MY_ATTRIBUTE((unused)),
-                                  void *user_data, size_t /* unused: count */) {
+static void net_before_header_psi(NET *net [[maybe_unused]], void *user_data,
+                                  size_t /* unused: count */) {
   THD *thd;
   thd = static_cast<THD *>(user_data);
   assert(thd != nullptr);
@@ -68,9 +68,8 @@
   }
 }
 
-static void net_after_header_psi(NET *net MY_ATTRIBUTE((unused)),
-                                 void *user_data, size_t /* unused: count */,
-                                 bool rc) {
+static void net_after_header_psi(NET *net [[maybe_unused]], void *user_data,
+                                 size_t /* unused: count */, bool rc) {
   THD *thd;
   thd = static_cast<THD *>(user_data);
   assert(thd != nullptr);
diff -Nru mysql-8.0-8.0.26/sql/create_field.cc mysql-8.0-8.0.27/sql/create_field.cc
--- mysql-8.0-8.0.26/sql/create_field.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/create_field.cc	2021-09-28 11:46:34.000000000 +0000
@@ -31,6 +31,7 @@
 #include "template_utils.h"
 
 #include <cmath>
+#include <optional>
 
 /**
     Constructs a column definition from an object representing an actual
@@ -189,7 +190,7 @@
     List<String> *fld_interval_list, const CHARSET_INFO *fld_charset,
     bool has_explicit_collation, uint fld_geom_type,
     Value_generator *fld_gcol_info, Value_generator *fld_default_val_expr,
-    Nullable<gis::srid_t> srid, dd::Column::enum_hidden_type hidden,
+    std::optional<gis::srid_t> srid, dd::Column::enum_hidden_type hidden,
     bool is_array_arg) {
   uint sign_len, allowed_type_modifier = 0;
   ulong max_field_charlength = MAX_FIELD_CHARLENGTH;
@@ -461,7 +462,7 @@
     case MYSQL_TYPE_TIMESTAMP:
       /* Add flags for TIMESTAMP for 4.0 MYD and 4.0 InnoDB compatibility */
       flags |= ZEROFILL_FLAG | UNSIGNED_FLAG;
-      /* Fall through */
+      [[fallthrough]];
     case MYSQL_TYPE_TIMESTAMP2:
       if (display_width_in_codepoints == nullptr) {
         m_max_display_width_in_codepoints =
@@ -491,7 +492,7 @@
     case MYSQL_TYPE_DATE:
       /* Old date type. */
       sql_type = MYSQL_TYPE_NEWDATE;
-      /* fall through */
+      [[fallthrough]];
     case MYSQL_TYPE_NEWDATE:
       m_max_display_width_in_codepoints = MAX_DATE_WIDTH;
       break;
diff -Nru mysql-8.0-8.0.26/sql/create_field.h mysql-8.0-8.0.27/sql/create_field.h
--- mysql-8.0-8.0.26/sql/create_field.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/create_field.h	2021-09-28 11:46:34.000000000 +0000
@@ -23,12 +23,13 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
+#include <optional>
+
 #include "field_types.h"
 #include "lex_string.h"
 #include "m_ctype.h"
 #include "my_alloc.h"
 #include "my_base.h"
-#include "nullable.h"
 #include "sql/dd/types/column.h"
 #include "sql/field.h"
 #include "sql/gis/srid.h"
@@ -173,7 +174,7 @@
 
   /// Holds the expression to be used to generate default values.
   Value_generator *m_default_val_expr{nullptr};
-  Nullable<gis::srid_t> m_srid;
+  std::optional<gis::srid_t> m_srid;
 
   // Whether the field is actually an array of the field's type;
   bool is_array{false};
@@ -221,8 +222,8 @@
             List<String> *interval_list, const CHARSET_INFO *cs,
             bool has_explicit_collation, uint uint_geom_type,
             Value_generator *gcol_info, Value_generator *default_val_expr,
-            Nullable<gis::srid_t> srid, dd::Column::enum_hidden_type hidden,
-            bool is_array = false);
+            std::optional<gis::srid_t> srid,
+            dd::Column::enum_hidden_type hidden, bool is_array = false);
 
   ha_storage_media field_storage_type() const {
     return (ha_storage_media)((flags >> FIELD_FLAGS_STORAGE_MEDIA) & 3);
diff -Nru mysql-8.0-8.0.26/sql/dd/cache/dictionary_client.h mysql-8.0-8.0.27/sql/dd/cache/dictionary_client.h
--- mysql-8.0-8.0.26/sql/dd/cache/dictionary_client.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/dd/cache/dictionary_client.h	2021-09-28 11:46:34.000000000 +0000
@@ -298,8 +298,8 @@
   */
 
   template <typename K, typename T>
-  bool acquire(const K &key, const T **object, bool *local_committed,
-               bool *local_uncommitted) MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool acquire(const K &key, const T **object,
+                             bool *local_committed, bool *local_uncommitted);
 
   /**
     Get an uncommitted dictionary object that can be modified safely.
@@ -487,8 +487,8 @@
   */
 
   template <typename Object_type>
-  bool fetch(Const_ptr_vec<Object_type> *coll, const Object_key *object_key)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool fetch(Const_ptr_vec<Object_type> *coll,
+                           const Object_key *object_key);
 
   /**
     Auxiliary function to retrieve an object by its object id without caching
@@ -527,8 +527,7 @@
   MY_COMPILER_DIAGNOSTIC_POP()
 
   template <typename T>
-  bool acquire(Object_id id, const T **object)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool acquire(Object_id id, const T **object);
 
   /**
     Retrieve an object by its object id.
@@ -544,8 +543,7 @@
   */
 
   template <typename T>
-  bool acquire_for_modification(Object_id id, T **object)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool acquire_for_modification(Object_id id, T **object);
 
   /**
     Retrieve an object by its object id without caching it.
@@ -564,8 +562,7 @@
    */
 
   template <typename T>
-  bool acquire_uncached(Object_id id, T **object)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool acquire_uncached(Object_id id, T **object);
 
   /**
     Retrieve an object by its object id without caching it.
@@ -583,8 +580,8 @@
     @retval       true    Error (from reading the dictionary tables).
   */
   template <typename T>
-  bool acquire_uncached(Object_id id, std::unique_ptr<T> *object_ptr)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool acquire_uncached(Object_id id,
+                                      std::unique_ptr<T> *object_ptr);
 
   /**
     Retrieve a possibly uncommitted object by its object id without caching it.
@@ -607,8 +604,7 @@
    */
 
   template <typename T>
-  bool acquire_uncached_uncommitted(Object_id id, T **object)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool acquire_uncached_uncommitted(Object_id id, T **object);
 
   /**
     Retrieve a possibly uncommitted object by its object id without caching it.
@@ -630,9 +626,8 @@
     @retval       true    Error (from reading the dictionary tables).
   */
   template <typename T>
-  bool acquire_uncached_uncommitted(Object_id id,
-                                    std::unique_ptr<T> *object_ptr)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool acquire_uncached_uncommitted(
+      Object_id id, std::unique_ptr<T> *object_ptr);
 
   /**
     Retrieve an object by its name.
@@ -646,8 +641,7 @@
   */
 
   template <typename T>
-  bool acquire(const String_type &object_name, const T **object)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool acquire(const String_type &object_name, const T **object);
 
   /**
     Retrieve an object by its name.
@@ -663,8 +657,8 @@
   */
 
   template <typename T>
-  bool acquire_for_modification(const String_type &object_name, T **object)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool acquire_for_modification(const String_type &object_name,
+                                              T **object);
 
   /**
     Retrieve an object by its schema- and object name.
@@ -689,8 +683,8 @@
   */
 
   template <typename T>
-  bool acquire(const String_type &schema_name, const String_type &object_name,
-               const T **object) MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool acquire(const String_type &schema_name,
+                             const String_type &object_name, const T **object);
 
   /**
     Retrieve an object by its schema- and object name.
@@ -717,9 +711,9 @@
   */
 
   template <typename T>
-  bool acquire_for_modification(const String_type &schema_name,
-                                const String_type &object_name, T **object)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool acquire_for_modification(const String_type &schema_name,
+                                              const String_type &object_name,
+                                              T **object);
 
   /**
     Retrieve an object by its schema- and object name.
@@ -750,9 +744,9 @@
   */
 
   template <typename T>
-  bool acquire(const String_type &schema_name, const String_type &object_name,
-               const typename T::Cache_partition **object)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool acquire(const String_type &schema_name,
+                             const String_type &object_name,
+                             const typename T::Cache_partition **object);
 
   /**
     Retrieve an object by its schema- and object name.
@@ -785,10 +779,9 @@
   */
 
   template <typename T>
-  bool acquire_for_modification(const String_type &schema_name,
-                                const String_type &object_name,
-                                typename T::Cache_partition **object)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool acquire_for_modification(
+      const String_type &schema_name, const String_type &object_name,
+      typename T::Cache_partition **object);
 
   /**
     Retrieve a table object by its se private id.
@@ -807,10 +800,8 @@
                                  object of a wrong type was found).
   */
 
-  bool acquire_uncached_table_by_se_private_id(const String_type &engine,
-                                               Object_id se_private_id,
-                                               Table **table)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool acquire_uncached_table_by_se_private_id(
+      const String_type &engine, Object_id se_private_id, Table **table);
 
   /**
     Retrieve a table object by its partition se private id.
@@ -823,9 +814,8 @@
     @retval      true     Error (from handling a cache miss).
   */
 
-  bool acquire_uncached_table_by_partition_se_private_id(
-      const String_type &engine, Object_id se_partition_id, Table **table)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool acquire_uncached_table_by_partition_se_private_id(
+      const String_type &engine, Object_id se_partition_id, Table **table);
 
   /**
     Retrieve schema and table name by the se private id of the table.
@@ -841,11 +831,10 @@
     @retval      true     Error.
   */
 
-  bool get_table_name_by_se_private_id(const String_type &engine,
-                                       Object_id se_private_id,
-                                       String_type *schema_name,
-                                       String_type *table_name)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool get_table_name_by_se_private_id(const String_type &engine,
+                                                     Object_id se_private_id,
+                                                     String_type *schema_name,
+                                                     String_type *table_name);
 
   /**
     Retrieve schema and table name by the se private id of the partition.
@@ -861,11 +850,9 @@
     @retval      true     Error.
   */
 
-  bool get_table_name_by_partition_se_private_id(const String_type &engine,
-                                                 Object_id se_partition_id,
-                                                 String_type *schema_name,
-                                                 String_type *table_name)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool get_table_name_by_partition_se_private_id(
+      const String_type &engine, Object_id se_partition_id,
+      String_type *schema_name, String_type *table_name);
 
   /**
     Retrieve a table name of a given trigger name and schema.
@@ -880,10 +867,9 @@
     @retval      true     Error.
   */
 
-  bool get_table_name_by_trigger_name(const Schema &schema,
-                                      const String_type &trigger_name,
-                                      String_type *table_name)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool get_table_name_by_trigger_name(
+      const Schema &schema, const String_type &trigger_name,
+      String_type *table_name);
 
   /**
     Check if schema contains foreign key with specified name.
@@ -898,10 +884,8 @@
     @retval      true     Error.
   */
 
-  bool check_foreign_key_exists(const Schema &schema,
-                                const String_type &foreign_key_name,
-                                bool *exists)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool check_foreign_key_exists(
+      const Schema &schema, const String_type &foreign_key_name, bool *exists);
 
   /**
     Check if schema contains check constraint with specified name.
@@ -933,9 +917,8 @@
   */
 
   template <typename T>
-  bool fetch_schema_component_names(const Schema *schema,
-                                    std::vector<String_type> *names) const
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool fetch_schema_component_names(
+      const Schema *schema, std::vector<String_type> *names) const;
 
   /**
     Fetch the names of the tables in the schema belonging to specific
@@ -950,10 +933,9 @@
     @return      false  Success.
   */
 
-  bool fetch_schema_table_names_by_engine(const Schema *schema,
-                                          const String_type &engine,
-                                          std::vector<String_type> *names) const
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool fetch_schema_table_names_by_engine(
+      const Schema *schema, const String_type &engine,
+      std::vector<String_type> *names) const;
 
   /**
     Fetch the names of the server tables in the schema.  Ignore tables
@@ -966,9 +948,8 @@
     @return      false  Success.
   */
 
-  bool fetch_schema_table_names_not_hidden_by_se(
-      const Schema *schema, std::vector<String_type> *names) const
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool fetch_schema_table_names_not_hidden_by_se(
+      const Schema *schema, std::vector<String_type> *names) const;
 
   /**
     Fetch all global component ids of the given type.
@@ -981,8 +962,8 @@
   */
 
   template <typename T>
-  bool fetch_global_component_ids(std::vector<Object_id> *ids) const
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool fetch_global_component_ids(
+      std::vector<Object_id> *ids) const;
 
   /**
     Fetch all global component names of the given type.
@@ -995,8 +976,8 @@
   */
 
   template <typename T>
-  bool fetch_global_component_names(std::vector<String_type> *names) const
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool fetch_global_component_names(
+      std::vector<String_type> *names) const;
 
   /**
     Execute the submitted lambda function for each entity of the given type
@@ -1012,9 +993,10 @@
   */
 
   template <typename Object_type>
-  bool foreach (const Object_key *object_key,
-                std::function<bool(std::unique_ptr<Object_type> &)> const
-                    &processor) const MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool foreach (
+      const Object_key *object_key,
+      std::function<bool(std::unique_ptr<Object_type> &)> const &processor)
+      const;
 
   /**
     Fetch all components in the schema.
@@ -1028,8 +1010,8 @@
   */
 
   template <typename T>
-  bool fetch_schema_components(const Schema *schema, Const_ptr_vec<T> *coll)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool fetch_schema_components(const Schema *schema,
+                                             Const_ptr_vec<T> *coll);
 
   /**
     Fetch all global components of the given type.
@@ -1042,8 +1024,7 @@
   */
 
   template <typename T>
-  bool fetch_global_components(Const_ptr_vec<T> *coll)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool fetch_global_components(Const_ptr_vec<T> *coll);
 
   /**
      Check if a user is referenced as definer by some object of the given type.
@@ -1057,8 +1038,8 @@
      @return      false  Success.
    */
   template <typename T>
-  bool is_user_definer(const LEX_USER &user, bool *is_definer) const
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool is_user_definer(const LEX_USER &user,
+                                     bool *is_definer) const;
 
   /**
     Fetch Object ids of all the views referencing base table/ view/ stored
@@ -1077,10 +1058,9 @@
     @return      false  Success.
   */
   template <typename T>
-  bool fetch_referencing_views_object_id(const char *schema,
-                                         const char *tbl_or_sf_name,
-                                         std::vector<Object_id> *view_ids) const
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool fetch_referencing_views_object_id(
+      const char *schema, const char *tbl_or_sf_name,
+      std::vector<Object_id> *view_ids) const;
 
   /**
     Fetch the names of tables (children) which have foreign keys
@@ -1104,13 +1084,11 @@
           DROP TABLE or DROP FOREIGN KEY.
   */
 
-  bool fetch_fk_children_uncached(const String_type &parent_schema,
-                                  const String_type &parent_name,
-                                  const String_type &parent_engine,
-                                  bool uncommitted,
-                                  std::vector<String_type> *children_schemas,
-                                  std::vector<String_type> *children_names)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool fetch_fk_children_uncached(
+      const String_type &parent_schema, const String_type &parent_name,
+      const String_type &parent_engine, bool uncommitted,
+      std::vector<String_type> *children_schemas,
+      std::vector<String_type> *children_names);
 
   /**
      Invalidate a cache entry.
@@ -1128,8 +1106,8 @@
                                   failing to get an MDL lock).
    */
 
-  bool invalidate(const String_type &schema_name, const String_type &table_name)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool invalidate(const String_type &schema_name,
+                                const String_type &table_name);
 
   /**
     Invalidate a cache entry.
@@ -1181,7 +1159,7 @@
   */
 
   template <typename T>
-  bool drop(const T *object) MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool drop(const T *object);
 
   /**
     Store a new dictionary object.
@@ -1209,7 +1187,7 @@
   */
 
   template <typename T>
-  bool store(T *object) MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool store(T *object);
 
   /**
     Update a persisted dictionary object, but keep the shared cache unchanged.
@@ -1237,7 +1215,7 @@
   */
 
   template <typename T>
-  bool update(T *new_object) MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool update(T *new_object);
 
   /**
     Remove the uncommitted objects from the client.
@@ -1272,9 +1250,8 @@
     @return true  - on failure
     @return false - on success
   */
-  bool remove_table_dynamic_statistics(const String_type &schema_name,
-                                       const String_type &table_name)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool remove_table_dynamic_statistics(
+      const String_type &schema_name, const String_type &table_name);
 
   /**
     Debug dump of a partition of the client and its registry to stderr.
diff -Nru mysql-8.0-8.0.26/sql/dd/dd_table.cc mysql-8.0-8.0.27/sql/dd/dd_table.cc
--- mysql-8.0-8.0.26/sql/dd/dd_table.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/dd/dd_table.cc	2021-09-28 11:46:34.000000000 +0000
@@ -2459,10 +2459,10 @@
 }
 #endif
 
-bool rename_foreign_keys(THD *thd MY_ATTRIBUTE((unused)),
-                         const char *old_db MY_ATTRIBUTE((unused)),
+bool rename_foreign_keys(THD *thd [[maybe_unused]],
+                         const char *old_db [[maybe_unused]],
                          const char *old_table_name, handlerton *hton,
-                         const char *new_db MY_ATTRIBUTE((unused)),
+                         const char *new_db [[maybe_unused]],
                          dd::Table *new_tab) {
   // With LCTN = 2, we are using lower-case tablename for FK name.
   char old_table_name_norm[NAME_LEN + 1];
diff -Nru mysql-8.0-8.0.26/sql/dd/dd_view.cc mysql-8.0-8.0.27/sql/dd/dd_view.cc
--- mysql-8.0-8.0.26/sql/dd/dd_view.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/dd/dd_view.cc	2021-09-28 11:46:34.000000000 +0000
@@ -314,7 +314,7 @@
       Field *from_field, *default_field;
       tmp_field = create_tmp_field(thd, &table, item, item->type(), nullptr,
                                    &from_field, &default_field, false, false,
-                                   false, false, false);
+                                   false, false);
     }
     if (!tmp_field) {
       my_error(ER_OUT_OF_RESOURCES, MYF(ME_FATALERROR));
diff -Nru mysql-8.0-8.0.26/sql/dd/dictionary.h mysql-8.0-8.0.27/sql/dd/dictionary.h
--- mysql-8.0-8.0.26/sql/dd/dictionary.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/dd/dictionary.h	2021-09-28 11:46:34.000000000 +0000
@@ -23,7 +23,6 @@
 #ifndef DD__DICTIONARY_INCLUDED
 #define DD__DICTIONARY_INCLUDED
 
-#include "my_compiler.h"
 #include "sql/dd/string_type.h"  // dd::String_type
 #include "sql/dd/types/tablespace.h"
 
@@ -188,10 +187,10 @@
                           upon successful lock attempt.
 
 */
-bool acquire_shared_table_mdl(THD *thd, const char *schema_name,
-                              const char *table_name, bool no_wait,
-                              MDL_ticket **out_mdl_ticket)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool acquire_shared_table_mdl(THD *thd, const char *schema_name,
+                                            const char *table_name,
+                                            bool no_wait,
+                                            MDL_ticket **out_mdl_ticket);
 
 /**
   Predicate to check if we have a shared meta data lock on the
@@ -240,11 +239,9 @@
   @retval      false          Successful lock acquisition.
 */
 
-bool acquire_exclusive_tablespace_mdl(THD *thd, const char *tablespace_name,
-                                      bool no_wait,
-                                      MDL_ticket **ticket = nullptr,
-                                      bool for_trx = true)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool acquire_exclusive_tablespace_mdl(
+    THD *thd, const char *tablespace_name, bool no_wait,
+    MDL_ticket **ticket = nullptr, bool for_trx = true);
 
 /**
   Acquire a shared metadata lock on the given tablespace name with
@@ -262,10 +259,11 @@
   @retval      true           Failure, e.g. a lock wait timeout.
   @retval      false          Successful lock acquisition.
 */
-bool acquire_shared_tablespace_mdl(THD *thd, const char *tablespace_name,
-                                   bool no_wait, MDL_ticket **ticket = nullptr,
-                                   bool for_trx = true)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool acquire_shared_tablespace_mdl(THD *thd,
+                                                 const char *tablespace_name,
+                                                 bool no_wait,
+                                                 MDL_ticket **ticket = nullptr,
+                                                 bool for_trx = true);
 
 /**
   Predicate to check if we have a shared meta data lock on the
@@ -307,10 +305,11 @@
                                attempt.
 */
 
-bool acquire_exclusive_table_mdl(THD *thd, const char *schema_name,
-                                 const char *table_name, bool no_wait,
-                                 MDL_ticket **out_mdl_ticket)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool acquire_exclusive_table_mdl(THD *thd,
+                                               const char *schema_name,
+                                               const char *table_name,
+                                               bool no_wait,
+                                               MDL_ticket **out_mdl_ticket);
 
 /**
   Acquire exclusive metadata lock on the given table name with
@@ -324,11 +323,9 @@
                                 attempt.
 */
 
-bool acquire_exclusive_table_mdl(THD *thd, const char *schema_name,
-                                 const char *table_name,
-                                 unsigned long int lock_wait_timeout,
-                                 MDL_ticket **out_mdl_ticket)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool acquire_exclusive_table_mdl(
+    THD *thd, const char *schema_name, const char *table_name,
+    unsigned long int lock_wait_timeout, MDL_ticket **out_mdl_ticket);
 
 /**
   Acquire exclusive metadata lock on the given schema name with
@@ -343,9 +340,10 @@
                                attempt.
 */
 
-bool acquire_exclusive_schema_mdl(THD *thd, const char *schema_name,
-                                  bool no_wait, MDL_ticket **out_mdl_ticket)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool acquire_exclusive_schema_mdl(THD *thd,
+                                                const char *schema_name,
+                                                bool no_wait,
+                                                MDL_ticket **out_mdl_ticket);
 
 /**
   @brief
diff -Nru mysql-8.0-8.0.26/sql/dd/impl/cache/cache_element.h mysql-8.0-8.0.27/sql/dd/impl/cache/cache_element.h
--- mysql-8.0-8.0.26/sql/dd/impl/cache/cache_element.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/dd/impl/cache/cache_element.h	2021-09-28 11:46:34.000000000 +0000
@@ -197,7 +197,7 @@
 
   // Debug dump of the element to stderr.
   /* purecov: begin inspected */
-  void dump(const String_type &prefix MY_ATTRIBUTE((unused)) = "      ") const {
+  void dump(const String_type &prefix [[maybe_unused]] = "      ") const {
 #ifndef NDEBUG
     fprintf(stderr, "%sobj: %p, id: %llu, cnt: %u", prefix.c_str(), m_object,
             m_object ? m_object->id() : 0, m_ref_counter);
diff -Nru mysql-8.0-8.0.26/sql/dd/impl/cache/storage_adapter.cc mysql-8.0-8.0.27/sql/dd/impl/cache/storage_adapter.cc
--- mysql-8.0-8.0.26/sql/dd/impl/cache/storage_adapter.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/dd/impl/cache/storage_adapter.cc	2021-09-28 11:46:34.000000000 +0000
@@ -211,8 +211,7 @@
 
 // Drop a dictionary object from core storage.
 template <typename T>
-void Storage_adapter::core_drop(THD *thd MY_ATTRIBUTE((unused)),
-                                const T *object) {
+void Storage_adapter::core_drop(THD *thd [[maybe_unused]], const T *object) {
   assert(s_use_fake_storage || thd->is_dd_system_thread());
   assert(bootstrap::DD_bootstrap_ctx::instance().get_stage() <=
          bootstrap::Stage::CREATED_TABLES);
diff -Nru mysql-8.0-8.0.26/sql/dd/impl/dictionary_impl.cc mysql-8.0-8.0.27/sql/dd/impl/dictionary_impl.cc
--- mysql-8.0-8.0.26/sql/dd/impl/dictionary_impl.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/dd/impl/dictionary_impl.cc	2021-09-28 11:46:34.000000000 +0000
@@ -212,7 +212,7 @@
 uint Dictionary_impl::get_actual_dd_version(THD *thd) {
   bool exists = false;
   uint version = 0;
-  bool error MY_ATTRIBUTE((unused)) = tables::DD_properties::instance().get(
+  bool error [[maybe_unused]] = tables::DD_properties::instance().get(
       thd, "DD_VERSION", &version, &exists);
   assert(!error);
   assert(exists);
@@ -230,7 +230,7 @@
 uint Dictionary_impl::get_actual_I_S_version(THD *thd) {
   bool exists = false;
   uint version = 0;
-  bool error MY_ATTRIBUTE((unused)) = tables::DD_properties::instance().get(
+  bool error [[maybe_unused]] = tables::DD_properties::instance().get(
       thd, "IS_VERSION", &version, &exists);
   assert(!error);
   assert(exists);
@@ -252,7 +252,7 @@
 uint Dictionary_impl::get_actual_P_S_version(THD *thd) {
   bool exists = false;
   uint version = 0;
-  bool error MY_ATTRIBUTE((unused)) = tables::DD_properties::instance().get(
+  bool error [[maybe_unused]] = tables::DD_properties::instance().get(
       thd, "PS_VERSION", &version, &exists);
   assert(!error);
   assert(exists);
diff -Nru mysql-8.0-8.0.26/sql/dd/impl/sdi.cc mysql-8.0-8.0.27/sql/dd/impl/sdi.cc
--- mysql-8.0-8.0.26/sql/dd/impl/sdi.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/dd/impl/sdi.cc	2021-09-28 11:46:34.000000000 +0000
@@ -185,9 +185,8 @@
   return (wctx.error() ? empty_ : String_type(buf.GetString(), buf.GetSize()));
 }
 
-const String_type &lookup_tablespace_name(
-    Sdi_wcontext *wctx MY_ATTRIBUTE((unused)),
-    dd::Object_id id MY_ATTRIBUTE((unused))) {
+const String_type &lookup_tablespace_name(Sdi_wcontext *wctx [[maybe_unused]],
+                                          dd::Object_id id [[maybe_unused]]) {
   if (wctx->thd() == nullptr || id == INVALID_OBJECT_ID) {
     return empty_;
   }
@@ -413,11 +412,11 @@
 }
 
 template <class Dd_type>
-bool generic_deserialize(
-    THD *thd, const Sdi_type &sdi,
-    const String_type &object_type_name MY_ATTRIBUTE((unused)), Dd_type *dst,
-    const SdiCompatibilityChecker &comp_checker,
-    String_type *schema_name_from_sdi) {
+bool generic_deserialize(THD *thd, const Sdi_type &sdi,
+                         const String_type &object_type_name [[maybe_unused]],
+                         Dd_type *dst,
+                         const SdiCompatibilityChecker &comp_checker,
+                         String_type *schema_name_from_sdi) {
   RJ_Document doc;
   doc.Parse<0>(sdi.c_str());
   if (doc.HasParseError()) {
diff -Nru mysql-8.0-8.0.26/sql/dd/impl/sdi.h mysql-8.0-8.0.27/sql/dd/impl/sdi.h
--- mysql-8.0-8.0.26/sql/dd/impl/sdi.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/dd/impl/sdi.h	2021-09-28 11:46:34.000000000 +0000
@@ -230,8 +230,7 @@
  */
 
 template <class DDT>
-inline bool store(THD *thd MY_ATTRIBUTE((unused)),
-                  const DDT *ddo MY_ATTRIBUTE((unused))) {
+inline bool store(THD *thd [[maybe_unused]], const DDT *ddo [[maybe_unused]]) {
   return false;
 }
 
@@ -281,7 +280,7 @@
  */
 
 template <class DDT>
-inline bool drop(THD *thd MY_ATTRIBUTE((unused)), const DDT *) {
+inline bool drop(THD *thd [[maybe_unused]], const DDT *) {
   return false;
 }
 
@@ -317,9 +316,9 @@
  */
 
 template <class DDT>
-inline bool drop_after_update(THD *thd MY_ATTRIBUTE((unused)),
-                              const DDT *old_ddo MY_ATTRIBUTE((unused)),
-                              const DDT *new_ddo MY_ATTRIBUTE((unused))) {
+inline bool drop_after_update(THD *thd [[maybe_unused]],
+                              const DDT *old_ddo [[maybe_unused]],
+                              const DDT *new_ddo [[maybe_unused]]) {
   return false;
 }
 
diff -Nru mysql-8.0-8.0.26/sql/dd/impl/sdi_tablespace.cc mysql-8.0-8.0.27/sql/dd/impl/sdi_tablespace.cc
--- mysql-8.0-8.0.26/sql/dd/impl/sdi_tablespace.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/dd/impl/sdi_tablespace.cc	2021-09-28 11:46:34.000000000 +0000
@@ -133,7 +133,7 @@
 namespace sdi_tablespace {
 bool store_tbl_sdi(THD *thd, handlerton *hton, const dd::Sdi_type &sdi,
                    const dd::Table &table,
-                   const dd::Schema &schema MY_ATTRIBUTE((unused))) {
+                   const dd::Schema &schema [[maybe_unused]]) {
   auto res = fetch_tablespace(thd, fetch_first_tablespace_id(table));
   if (res.error) {
     return true;
@@ -166,7 +166,7 @@
 }
 
 bool drop_tbl_sdi(THD *thd, const handlerton &hton, const Table &table,
-                  const Schema &schema MY_ATTRIBUTE((unused))) {
+                  const Schema &schema [[maybe_unused]]) {
   DBUG_PRINT("ddsdi",
              ("drop_tbl_sdi(Schema" ENTITY_FMT ", Table" ENTITY_FMT ")",
               ENTITY_VAL(schema), ENTITY_VAL(table)));
diff -Nru mysql-8.0-8.0.26/sql/dd/impl/sdi_tablespace.h mysql-8.0-8.0.27/sql/dd/impl/sdi_tablespace.h
--- mysql-8.0-8.0.26/sql/dd/impl/sdi_tablespace.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/dd/impl/sdi_tablespace.h	2021-09-28 11:46:34.000000000 +0000
@@ -75,7 +75,7 @@
   charset for the schema).
  */
 bool drop_tbl_sdi(THD *thd, const handlerton &hton, const Table &table,
-                  const Schema &schema MY_ATTRIBUTE((unused)));
+                  const Schema &schema [[maybe_unused]]);
 
 /**
   Deletes all SDIs with SDI_TYPE_TABLE from the table tablespace. In case of
diff -Nru mysql-8.0-8.0.26/sql/dd/impl/types/column_impl.h mysql-8.0-8.0.27/sql/dd/impl/types/column_impl.h
--- mysql-8.0-8.0.26/sql/dd/impl/types/column_impl.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/dd/impl/types/column_impl.h	2021-09-28 11:46:34.000000000 +0000
@@ -28,8 +28,8 @@
 #include <sys/types.h>
 #include <memory>  // std::unique_ptr
 #include <new>
+#include <optional>
 
-#include "nullable.h"
 #include "sql/dd/impl/properties_impl.h"           // Properties_impl
 #include "sql/dd/impl/types/entity_object_impl.h"  // dd::Entity_object_impl
 #include "sql/dd/impl/types/weak_object_impl.h"
@@ -42,8 +42,6 @@
 #include "sql/gis/srid.h"                      // gis::srid_t
 #include "sql/strfunc.h"
 
-using Mysql::Nullable;
-
 namespace dd {
 
 ///////////////////////////////////////////////////////////////////////////
@@ -419,9 +417,11 @@
   /////////////////////////////////////////////////////////////////////////
   // Spatial reference system ID
   /////////////////////////////////////////////////////////////////////////
-  void set_srs_id(Nullable<gis::srid_t> srs_id) override { m_srs_id = srs_id; }
+  void set_srs_id(std::optional<gis::srid_t> srs_id) override {
+    m_srs_id = srs_id;
+  }
 
-  Nullable<gis::srid_t> srs_id() const override { return m_srs_id; }
+  std::optional<gis::srid_t> srs_id() const override { return m_srs_id; }
 
   /////////////////////////////////////////////////////////////////////////
   // Elements.
@@ -548,7 +548,7 @@
 
   enum_column_key m_column_key;
 
-  Nullable<gis::srid_t> m_srs_id;
+  std::optional<gis::srid_t> m_srs_id;
 };
 
 ///////////////////////////////////////////////////////////////////////////
diff -Nru mysql-8.0-8.0.26/sql/dd/impl/types/column_statistics_impl.h mysql-8.0-8.0.27/sql/dd/impl/types/column_statistics_impl.h
--- mysql-8.0-8.0.26/sql/dd/impl/types/column_statistics_impl.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/dd/impl/types/column_statistics_impl.h	2021-09-28 11:46:34.000000000 +0000
@@ -58,7 +58,7 @@
  public:
   Column_statistics_impl()
       : m_schema_name(), m_table_name(), m_column_name(), m_histogram(nullptr) {
-    init_alloc_root(key_memory_DD_column_statistics, &m_mem_root, 256, 0);
+    ::new ((void *)&m_mem_root) MEM_ROOT(key_memory_DD_column_statistics, 256);
   }
 
  private:
@@ -69,7 +69,7 @@
         m_table_name(column_statistics.m_table_name),
         m_column_name(column_statistics.m_column_name),
         m_histogram(nullptr) {
-    init_alloc_root(key_memory_DD_column_statistics, &m_mem_root, 256, 0);
+    ::new ((void *)&m_mem_root) MEM_ROOT(key_memory_DD_column_statistics, 256);
 
     if (column_statistics.m_histogram != nullptr)
       m_histogram = column_statistics.m_histogram->clone(&m_mem_root);
@@ -114,7 +114,7 @@
 
   void set_histogram(const histograms::Histogram *histogram) override {
     // Free any existing histogram data
-    free_root(&m_mem_root, MYF(0));
+    m_mem_root.Clear();
 
     // Take responsibility for the MEM_ROOT of the histogram provided
     m_mem_root = std::move(*histogram->get_mem_root());
diff -Nru mysql-8.0-8.0.26/sql/dd/impl/types/schema_impl.cc mysql-8.0-8.0.27/sql/dd/impl/types/schema_impl.cc
--- mysql-8.0-8.0.26/sql/dd/impl/types/schema_impl.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/dd/impl/types/schema_impl.cc	2021-09-28 11:46:34.000000000 +0000
@@ -287,7 +287,7 @@
 
 ///////////////////////////////////////////////////////////////////////////
 
-View *Schema_impl::create_system_view(THD *thd MY_ATTRIBUTE((unused))) const {
+View *Schema_impl::create_system_view(THD *thd [[maybe_unused]]) const {
 // Creating system views requires an IX meta data lock on the schema name.
 #ifndef NDEBUG
   char name_buf[NAME_LEN + 1];
diff -Nru mysql-8.0-8.0.26/sql/dd/impl/types/spatial_reference_system_impl.cc mysql-8.0-8.0.27/sql/dd/impl/types/spatial_reference_system_impl.cc
--- mysql-8.0-8.0.26/sql/dd/impl/types/spatial_reference_system_impl.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/dd/impl/types/spatial_reference_system_impl.cc	2021-09-28 11:46:34.000000000 +0000
@@ -24,6 +24,8 @@
 
 #include <stdint.h>
 
+#include <optional>
+
 #include "my_rapidjson_size_t.h"  // IWYU pragma: keep
 
 #include <rapidjson/document.h>
@@ -144,25 +146,25 @@
   Entity_object_impl::deserialize(rctx, val);
   read(&m_last_altered, val, "last_altered");
   read(&m_created, val, "created");
-  bool is_null;
+  bool is_null{false};
   read(&is_null, val, "organization_null");
   if (!is_null) {
     String_type s;
     read(&s, val, "organization");
-    m_organization = Mysql::Nullable<String_type>(s);
+    m_organization = std::optional<String_type>(s);
   }
   read(&is_null, val, "organization_coordsys_id_null");
   if (!is_null) {
     gis::srid_t id = 0;
     read(&id, val, "organization_coordsys_id");
-    m_organization_coordsys_id = Mysql::Nullable<gis::srid_t>(id);
+    m_organization_coordsys_id = std::optional<gis::srid_t>(id);
   }
   read(&m_definition, val, "definition");
   read(&is_null, val, "description_null");
   if (!is_null) {
     String_type s;
     read(&s, val, "description");
-    m_description = Mysql::Nullable<String_type>(s);
+    m_description = std::optional<String_type>(s);
   }
 
   return parse_definition();
diff -Nru mysql-8.0-8.0.26/sql/dd/impl/types/spatial_reference_system_impl.h mysql-8.0-8.0.27/sql/dd/impl/types/spatial_reference_system_impl.h
--- mysql-8.0-8.0.26/sql/dd/impl/types/spatial_reference_system_impl.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/dd/impl/types/spatial_reference_system_impl.h	2021-09-28 11:46:34.000000000 +0000
@@ -29,9 +29,9 @@
 #include <cstddef>  // std::nullptr_t
 #include <memory>   // std::unique_ptr
 #include <new>
+#include <optional>
 
 #include "my_inttypes.h"
-#include "nullable.h"
 #include "sql/dd/impl/types/entity_object_impl.h"  // dd::Entity_object_impl
 #include "sql/dd/impl/types/weak_object_impl.h"
 #include "sql/dd/object_id.h"
@@ -130,35 +130,34 @@
   // organization
   /////////////////////////////////////////////////////////////////////////
 
-  const Mysql::Nullable<String_type> &organization() const override {
+  const std::optional<String_type> &organization() const override {
     return m_organization;
   }
 
   void set_organization(const String_type &organization) override {
-    m_organization = Mysql::Nullable<String_type>(organization);
+    m_organization = std::optional<String_type>(organization);
   }
 
   void set_organization(std::nullptr_t) override {
-    m_organization = Mysql::Nullable<String_type>();
+    m_organization = std::optional<String_type>();
   }
 
   /////////////////////////////////////////////////////////////////////////
   // organization_coordsys_id
   /////////////////////////////////////////////////////////////////////////
 
-  const Mysql::Nullable<gis::srid_t> &organization_coordsys_id()
-      const override {
+  const std::optional<gis::srid_t> &organization_coordsys_id() const override {
     return m_organization_coordsys_id;
   }
 
   void set_organization_coordsys_id(
       gis::srid_t organization_coordsys_id) override {
     m_organization_coordsys_id =
-        Mysql::Nullable<gis::srid_t>(organization_coordsys_id);
+        std::optional<gis::srid_t>(organization_coordsys_id);
   }
 
   void set_organization_coordsys_id(std::nullptr_t) override {
-    m_organization_coordsys_id = Mysql::Nullable<gis::srid_t>();
+    m_organization_coordsys_id = std::optional<gis::srid_t>();
   }
 
   /////////////////////////////////////////////////////////////////////////
@@ -315,16 +314,16 @@
   // description
   /////////////////////////////////////////////////////////////////////////
 
-  const Mysql::Nullable<String_type> &description() const override {
+  const std::optional<String_type> &description() const override {
     return m_description;
   }
 
   void set_description(const String_type &description) override {
-    m_description = Mysql::Nullable<String_type>(description);
+    m_description = std::optional<String_type>(description);
   }
 
   void set_description(std::nullptr_t) override {
-    m_description = Mysql::Nullable<String_type>();
+    m_description = std::optional<String_type>();
   }
 
   // Fix "inherits ... via dominance" warnings
@@ -357,11 +356,11 @@
   // Fields
   ulonglong m_created;
   ulonglong m_last_altered;
-  Mysql::Nullable<String_type> m_organization;
-  Mysql::Nullable<gis::srid_t> m_organization_coordsys_id;
+  std::optional<String_type> m_organization;
+  std::optional<gis::srid_t> m_organization_coordsys_id;
   String_type m_definition;
   std::unique_ptr<gis::srs::Spatial_reference_system> m_parsed_definition;
-  Mysql::Nullable<String_type> m_description;
+  std::optional<String_type> m_description;
 
   Spatial_reference_system *clone() const override {
     return new Spatial_reference_system_impl(*this);
diff -Nru mysql-8.0-8.0.26/sql/dd/impl/upgrade/server.cc mysql-8.0-8.0.27/sql/dd/impl/upgrade/server.cc
--- mysql-8.0-8.0.26/sql/dd/impl/upgrade/server.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/dd/impl/upgrade/server.cc	2021-09-28 11:46:34.000000000 +0000
@@ -446,7 +446,6 @@
 
   const char **query_ptr;
   LogErr(INFORMATION_LEVEL, ER_SERVER_UPGRADE_SYS_SCHEMA);
-  thd->user_var_events_alloc = thd->mem_root;
   for (query_ptr = &mysql_sys_schema[0]; *query_ptr != nullptr; query_ptr++)
     if (ignore_error_and_execute(thd, *query_ptr)) return true;
   thd->mem_root->Clear();
@@ -808,7 +807,8 @@
   Server_option_guard<bool> acl_guard(&opt_noacl, true);
   Server_option_guard<bool> general_log_guard(&opt_general_log, false);
   Server_option_guard<bool> slow_log_guard(&opt_slow_log, false);
-  Server_option_guard<bool> bin_log_guard(&thd->variables.sql_log_bin, false);
+  Disable_binlog_guard disable_binlog(thd);
+  Disable_sql_log_bin_guard disable_sql_log_bin(thd);
 
   uint server_version = MYSQL_VERSION_ID;
   bool exists_version = false;
diff -Nru mysql-8.0-8.0.26/sql/dd/properties.cc mysql-8.0-8.0.27/sql/dd/properties.cc
--- mysql-8.0-8.0.26/sql/dd/properties.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/dd/properties.cc	2021-09-28 11:46:34.000000000 +0000
@@ -133,6 +133,9 @@
 
 template bool Properties::get<bool>(const String_type &, bool *) const;
 
+template bool Properties::get<unsigned short>(const String_type &,
+                                              unsigned short *) const;
+
 template bool Properties::get<unsigned int>(const String_type &,
                                             unsigned int *) const;
 
@@ -150,6 +153,8 @@
                                                  MYSQL_LEX_CSTRING *,
                                                  MEM_ROOT *) const;
 
+template bool Properties::get<short>(const String_type &, short *) const;
+
 template bool Properties::get<int>(const String_type &, int *) const;
 
 template bool Properties::get<long>(const String_type &, long *) const;
@@ -157,6 +162,11 @@
 template bool Properties::get<long long>(const String_type &,
                                          long long *) const;
 
+template bool Properties::from_str<short>(const String_type &, short *);
+
+template bool Properties::from_str<unsigned short>(const String_type &,
+                                                   unsigned short *);
+
 template bool Properties::from_str<int>(const String_type &, int *);
 
 template bool Properties::from_str<unsigned int>(const String_type &,
@@ -172,26 +182,28 @@
 template bool Properties::from_str<unsigned long long>(const String_type &,
                                                        unsigned long long *);
 
-template String_type Properties::to_str<int>(int);
+template String_type Properties::to_str<bool>(bool);
 
-template String_type Properties::to_str<Field::geometry_type>(
-    Field::geometry_type);
+template String_type Properties::to_str<short>(short);
+
+template String_type Properties::to_str<int>(int);
 
 template String_type Properties::to_str<long>(long);
 
 template String_type Properties::to_str<long long>(long long);
 
-template String_type Properties::to_str<unsigned long long>(unsigned long long);
-
-template String_type Properties::to_str<bool>(bool);
+template String_type Properties::to_str<unsigned short>(unsigned short);
 
 template String_type Properties::to_str<unsigned int>(unsigned int);
 
 template String_type Properties::to_str<unsigned long>(unsigned long);
 
+template String_type Properties::to_str<unsigned long long>(unsigned long long);
+
 template String_type Properties::to_str<char const *>(char const *);
 
-template String_type Properties::to_str<unsigned short>(unsigned short);
+template String_type Properties::to_str<Field::geometry_type>(
+    Field::geometry_type);
 
 template String_type Properties::to_str<row_type>(row_type);
 
diff -Nru mysql-8.0-8.0.26/sql/dd/types/column.h mysql-8.0-8.0.27/sql/dd/types/column.h
--- mysql-8.0-8.0.26/sql/dd/types/column.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/dd/types/column.h	2021-09-28 11:46:34.000000000 +0000
@@ -23,17 +23,16 @@
 #ifndef DD__COLUMN_INCLUDED
 #define DD__COLUMN_INCLUDED
 
+#include <optional>
+
 #include "lex_string.h"  // LEX_CSTRING
 #include "my_inttypes.h"
-#include "nullable.h"
 #include "sql/dd/collection.h"           // dd::Collection
 #include "sql/dd/sdi_fwd.h"              // RJ_Document
 #include "sql/dd/types/entity_object.h"  // dd::Entity_object
 
 #include "sql/gis/srid.h"
 
-using Mysql::Nullable;
-
 namespace dd {
 
 ///////////////////////////////////////////////////////////////////////////
@@ -185,8 +184,8 @@
   // srid
   /////////////////////////////////////////////////////////////////////////
 
-  virtual void set_srs_id(Nullable<gis::srid_t> srs_id) = 0;
-  virtual Nullable<gis::srid_t> srs_id() const = 0;
+  virtual void set_srs_id(std::optional<gis::srid_t> srs_id) = 0;
+  virtual std::optional<gis::srid_t> srs_id() const = 0;
 
   /////////////////////////////////////////////////////////////////////////
   // numeric_scale.
diff -Nru mysql-8.0-8.0.26/sql/dd/types/object_table.h mysql-8.0-8.0.27/sql/dd/types/object_table.h
--- mysql-8.0-8.0.26/sql/dd/types/object_table.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/dd/types/object_table.h	2021-09-28 11:46:34.000000000 +0000
@@ -176,11 +176,7 @@
   virtual void set_hidden(bool hidden) = 0;
 
  public:
-#ifdef __SUNPRO_CC
-  virtual ~Object_table() {}
-#else
   virtual ~Object_table() = default;
-#endif
 };
 
 ///////////////////////////////////////////////////////////////////////////
diff -Nru mysql-8.0-8.0.26/sql/dd/types/spatial_reference_system.h mysql-8.0-8.0.27/sql/dd/types/spatial_reference_system.h
--- mysql-8.0-8.0.26/sql/dd/types/spatial_reference_system.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/dd/types/spatial_reference_system.h	2021-09-28 11:46:34.000000000 +0000
@@ -24,9 +24,9 @@
 #define DD__SPATIAL_REFERENCE_SYSTEM_INCLUDED
 
 #include <cstddef>  // std::nullptr_t
+#include <optional>
 
 #include "my_inttypes.h"
-#include "nullable.h"
 #include "sql/dd/impl/raw/object_keys.h"  // IWYU pragma: keep
 #include "sql/dd/types/entity_object.h"   // dd::Entity_object
 #include "sql/gis/geometries.h"           // gis::Coordinate_system
@@ -94,7 +94,7 @@
   // organization
   /////////////////////////////////////////////////////////////////////////
 
-  virtual const Mysql::Nullable<String_type> &organization() const = 0;
+  virtual const std::optional<String_type> &organization() const = 0;
   virtual void set_organization(const String_type &organization) = 0;
   virtual void set_organization(std::nullptr_t) = 0;
 
@@ -102,7 +102,7 @@
   // organization_coordsys_id
   /////////////////////////////////////////////////////////////////////////
 
-  virtual const Mysql::Nullable<gis::srid_t> &organization_coordsys_id()
+  virtual const std::optional<gis::srid_t> &organization_coordsys_id()
       const = 0;
   virtual void set_organization_coordsys_id(
       gis::srid_t organization_coordsys_id) = 0;
@@ -225,7 +225,7 @@
   // description
   /////////////////////////////////////////////////////////////////////////
 
-  virtual const Mysql::Nullable<String_type> &description() const = 0;
+  virtual const std::optional<String_type> &description() const = 0;
   virtual void set_description(const String_type &description) = 0;
   virtual void set_description(std::nullptr_t) = 0;
 
diff -Nru mysql-8.0-8.0.26/sql/dd/types/system_view.h mysql-8.0-8.0.27/sql/dd/types/system_view.h
--- mysql-8.0-8.0.26/sql/dd/types/system_view.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/dd/types/system_view.h	2021-09-28 11:46:34.000000000 +0000
@@ -37,11 +37,7 @@
 
 class System_view {
  public:
-#ifdef __SUNPRO_CC
-  virtual ~System_view() {}
-#else
   virtual ~System_view() = default;
-#endif
 
   /*
     Get name of system view.
diff -Nru mysql-8.0-8.0.26/sql/dd/types/weak_object.h mysql-8.0-8.0.27/sql/dd/types/weak_object.h
--- mysql-8.0-8.0.26/sql/dd/types/weak_object.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/dd/types/weak_object.h	2021-09-28 11:46:34.000000000 +0000
@@ -48,11 +48,7 @@
 
   Weak_object(const Weak_object &) = default;
 
-#ifdef __SUNPRO_CC
-  virtual ~Weak_object() {}
-#else
   virtual ~Weak_object() = default;
-#endif
 };
 
 ///////////////////////////////////////////////////////////////////////////
diff -Nru mysql-8.0-8.0.26/sql/dd/upgrade_57/event.cc mysql-8.0-8.0.27/sql/dd/upgrade_57/event.cc
--- mysql-8.0-8.0.26/sql/dd/upgrade_57/event.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/dd/upgrade_57/event.cc	2021-09-28 11:46:34.000000000 +0000
@@ -507,7 +507,6 @@
   // Holders for user name and host name used in parse user.
   char definer_user_name_holder[USERNAME_LENGTH + 1];
   char definer_host_name_holder[HOSTNAME_LENGTH + 1];
-  memset(&user_info, 0, sizeof(LEX_USER));
   user_info.user = {definer_user_name_holder, USERNAME_LENGTH};
   user_info.host = {definer_host_name_holder, HOSTNAME_LENGTH};
 
diff -Nru mysql-8.0-8.0.26/sql/dd/upgrade_57/routine.cc mysql-8.0-8.0.27/sql/dd/upgrade_57/routine.cc
--- mysql-8.0-8.0.26/sql/dd/upgrade_57/routine.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/dd/upgrade_57/routine.cc	2021-09-28 11:46:34.000000000 +0000
@@ -372,7 +372,6 @@
   // Holders for user name and host name used in parse user.
   char definer_user_name_holder[USERNAME_LENGTH + 1];
   char definer_host_name_holder[HOSTNAME_LENGTH + 1];
-  memset(&user_info, 0, sizeof(LEX_USER));
   user_info.user = {definer_user_name_holder, USERNAME_LENGTH};
   user_info.host = {definer_host_name_holder, HOSTNAME_LENGTH};
 
diff -Nru mysql-8.0-8.0.26/sql/dd/upgrade_57/table.cc mysql-8.0-8.0.27/sql/dd/upgrade_57/table.cc
--- mysql-8.0-8.0.26/sql/dd/upgrade_57/table.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/dd/upgrade_57/table.cc	2021-09-28 11:46:34.000000000 +0000
@@ -585,7 +585,8 @@
   bool acquire_lock_tablespace(Tablespace_hash_set *tablespace_names) {
     m_tablespace_lock = true;
     return lock_tablespace_names(m_thd, tablespace_names,
-                                 m_thd->variables.lock_wait_timeout);
+                                 m_thd->variables.lock_wait_timeout,
+                                 m_thd->mem_root);
   }
 
   Upgrade_MDL_guard(THD *thd)
diff -Nru mysql-8.0-8.0.26/sql/dd/upgrade_57/upgrade.cc mysql-8.0-8.0.27/sql/dd/upgrade_57/upgrade.cc
--- mysql-8.0-8.0.26/sql/dd/upgrade_57/upgrade.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/dd/upgrade_57/upgrade.cc	2021-09-28 11:46:34.000000000 +0000
@@ -635,7 +635,7 @@
   assert(m_file);
 
   enum_stage stage = enum_stage::NONE;
-  size_t items_read MY_ATTRIBUTE((unused));
+  size_t items_read [[maybe_unused]];
 
   if (!feof(m_file)) items_read = fread(&stage, sizeof(int), 1, m_file);
 
diff -Nru mysql-8.0-8.0.26/sql/dd_table_share.cc mysql-8.0-8.0.27/sql/dd_table_share.cc
--- mysql-8.0-8.0.26/sql/dd_table_share.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/dd_table_share.cc	2021-09-28 11:46:34.000000000 +0000
@@ -26,6 +26,7 @@
 
 #include <string.h>
 #include <algorithm>
+#include <optional>
 #include <string>
 #include <type_traits>
 
@@ -47,7 +48,6 @@
 #include "mysql/udf_registration_types.h"
 #include "mysql_com.h"
 #include "mysqld_error.h"
-#include "nullable.h"
 #include "sql/dd/collection.h"
 #include "sql/dd/dd_table.h"       // dd::FIELD_NAME_SEPARATOR_CHAR
 #include "sql/dd/dd_tablespace.h"  // dd::get_tablespace_name
@@ -260,7 +260,6 @@
 static bool prepare_share(THD *thd, TABLE_SHARE *share,
                           const dd::Table *table_def) {
   my_bitmap_map *bitmaps;
-  bool use_hash;
   handler *handler_file = nullptr;
 
   // Mark 'system' tables (tables with one row) to help the Optimizer.
@@ -269,18 +268,6 @@
 
   bool use_extended_sk = ha_check_storage_engine_flag(
       share->db_type(), HTON_SUPPORTS_EXTENDED_KEYS);
-  // Setup name_hash for quick look-up
-  use_hash = share->fields >= MAX_FIELDS_BEFORE_HASH;
-  if (use_hash) {
-    Field **field_ptr = share->field;
-    share->name_hash = new collation_unordered_map<std::string, Field **>(
-        system_charset_info, PSI_INSTRUMENT_ME);
-    share->name_hash->reserve(share->fields);
-
-    for (uint i = 0; i < share->fields; i++, field_ptr++) {
-      share->name_hash->emplace((*field_ptr)->field_name, field_ptr);
-    }
-  }
 
   share->m_histograms =
       new malloc_unordered_map<uint, const histograms::Histogram *>(
@@ -1126,7 +1113,7 @@
   share->gen_def_field_count = 0;
 
   // Iterate through all the columns.
-  uchar *null_flags MY_ATTRIBUTE((unused));
+  uchar *null_flags [[maybe_unused]];
   uchar *null_pos, *rec_pos;
   null_flags = null_pos = share->default_values;
   rec_pos = share->default_values + share->null_bytes;
@@ -1932,26 +1919,26 @@
     case dd::Table::PT_RANGE_COLUMNS:
       part_info->column_list = true;
       part_info->list_of_part_fields = true;
-      // Fall through.
+      [[fallthrough]];
     case dd::Table::PT_RANGE:
       part_info->part_type = partition_type::RANGE;
       break;
     case dd::Table::PT_LIST_COLUMNS:
       part_info->column_list = true;
       part_info->list_of_part_fields = true;
-      // Fall through.
+      [[fallthrough]];
     case dd::Table::PT_LIST:
       part_info->part_type = partition_type::LIST;
       break;
     case dd::Table::PT_LINEAR_HASH:
       part_info->linear_hash_ind = true;
-      // Fall through.
+      [[fallthrough]];
     case dd::Table::PT_HASH:
       part_info->part_type = partition_type::HASH;
       break;
     case dd::Table::PT_LINEAR_KEY_51:
       part_info->linear_hash_ind = true;
-      // Fall through.
+      [[fallthrough]];
     case dd::Table::PT_KEY_51:
       part_info->key_algorithm = enum_key_algorithm::KEY_ALGORITHM_51;
       part_info->list_of_part_fields = true;
@@ -1959,7 +1946,7 @@
       break;
     case dd::Table::PT_LINEAR_KEY_55:
       part_info->linear_hash_ind = true;
-      // Fall through.
+      [[fallthrough]];
     case dd::Table::PT_KEY_55:
       part_info->key_algorithm = enum_key_algorithm::KEY_ALGORITHM_55;
       part_info->list_of_part_fields = true;
@@ -1967,7 +1954,7 @@
       break;
     case dd::Table::PT_AUTO_LINEAR:
       part_info->linear_hash_ind = true;
-      // Fall through.
+      [[fallthrough]];
     case dd::Table::PT_AUTO:
       part_info->key_algorithm = enum_key_algorithm::KEY_ALGORITHM_55;
       part_info->part_type = partition_type::HASH;
@@ -1986,13 +1973,13 @@
       break;
     case dd::Table::ST_LINEAR_HASH:
       part_info->linear_hash_ind = true;
-      // Fall through.
+      [[fallthrough]];
     case dd::Table::ST_HASH:
       part_info->subpart_type = partition_type::HASH;
       break;
     case dd::Table::ST_LINEAR_KEY_51:
       part_info->linear_hash_ind = true;
-      // Fall through.
+      [[fallthrough]];
     case dd::Table::ST_KEY_51:
       part_info->key_algorithm = enum_key_algorithm::KEY_ALGORITHM_51;
       part_info->list_of_subpart_fields = true;
@@ -2000,7 +1987,7 @@
       break;
     case dd::Table::ST_LINEAR_KEY_55:
       part_info->linear_hash_ind = true;
-      // Fall through.
+      [[fallthrough]];
     case dd::Table::ST_KEY_55:
       part_info->key_algorithm = enum_key_algorithm::KEY_ALGORITHM_55;
       part_info->list_of_subpart_fields = true;
diff -Nru mysql-8.0-8.0.26/sql/debug_lock_order.cc mysql-8.0-8.0.27/sql/debug_lock_order.cc
--- mysql-8.0-8.0.26/sql/debug_lock_order.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/debug_lock_order.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1697,7 +1697,7 @@
 #define LO_MAX_THREAD_CLASS 100
 #define LO_MAX_MUTEX_CLASS 300
 #define LO_MAX_RWLOCK_CLASS 100
-#define LO_MAX_COND_CLASS 100
+#define LO_MAX_COND_CLASS 150
 #define LO_MAX_FILE_CLASS 100
 
 /*
@@ -3113,7 +3113,7 @@
                             const char *to_class_name, bool recursive,
                             const char *to_operation_name,
                             const LO_node *to_node,
-                            const LO_lock *new_lock MY_ATTRIBUTE((unused))) {
+                            const LO_lock *new_lock [[maybe_unused]]) {
   assert(thread != nullptr);
   assert(from_class_name != nullptr);
   /* from_state_name can be null. */
@@ -4727,8 +4727,8 @@
 }
 
 LO_node *LO_mutex_class::get_operation_node_by_name(
-    bool recursive MY_ATTRIBUTE((unused)),
-    const char *state MY_ATTRIBUTE((unused)), const char *operation) const {
+    bool recursive [[maybe_unused]], const char *state [[maybe_unused]],
+    const char *operation) const {
   if (operation == nullptr) {
     return m_node;
   }
@@ -5473,8 +5473,7 @@
   set_locked(op, src_file, src_line);
 }
 
-bool LO_rwlock_lock_pr::set_unlocked(
-    PSI_rwlock_operation op MY_ATTRIBUTE((unused))) {
+bool LO_rwlock_lock_pr::set_unlocked(PSI_rwlock_operation op [[maybe_unused]]) {
   assert(op == PSI_RWLOCK_UNLOCK);
   if (m_read_count > 0) {
     m_read_count--;
@@ -5563,8 +5562,7 @@
   set_locked(op, src_file, src_line);
 }
 
-bool LO_rwlock_lock_rw::set_unlocked(
-    PSI_rwlock_operation op MY_ATTRIBUTE((unused))) {
+bool LO_rwlock_lock_rw::set_unlocked(PSI_rwlock_operation op [[maybe_unused]]) {
   assert(op == PSI_RWLOCK_UNLOCK);
   if (m_read_count > 0) {
     m_read_count--;
@@ -5775,8 +5773,8 @@
 }
 
 LO_node *LO_cond_class::get_operation_node_by_name(
-    bool recursive MY_ATTRIBUTE((unused)),
-    const char *state MY_ATTRIBUTE((unused)), const char *operation) const {
+    bool recursive [[maybe_unused]], const char *state [[maybe_unused]],
+    const char *operation) const {
   if (operation == nullptr) {
     return m_node;
   }
@@ -5944,8 +5942,8 @@
 }
 
 LO_node *LO_file_class::get_operation_node_by_name(
-    bool recursive MY_ATTRIBUTE((unused)),
-    const char *state MY_ATTRIBUTE((unused)), const char *operation) const {
+    bool recursive [[maybe_unused]], const char *state [[maybe_unused]],
+    const char *operation) const {
   if (operation == nullptr) {
     return m_node;
   }
@@ -6472,7 +6470,8 @@
   return nullptr;
 }
 
-static int lo_spawn_thread(PSI_thread_key key, my_thread_handle *thread,
+static int lo_spawn_thread(PSI_thread_key key, PSI_thread_seqnum seqnum,
+                           my_thread_handle *thread,
                            const my_thread_attr_t *attr,
                            void *(*start_routine)(void *), void *arg) {
   LO_spawn_thread_arg *psi_arg;
@@ -6499,7 +6498,7 @@
     result = my_thread_create(thread, attr, lo_spawn_thread_fct, psi_arg);
   } else {
     /* [1] Start the thread in the chained instrumentation. */
-    result = g_thread_chain->spawn_thread(chain_key, thread, attr,
+    result = g_thread_chain->spawn_thread(chain_key, seqnum, thread, attr,
                                           lo_spawn_thread_fct, psi_arg);
   }
 
@@ -6509,7 +6508,8 @@
   return result;
 }
 
-static PSI_thread *lo_new_thread(PSI_thread_key key, const void *identity,
+static PSI_thread *lo_new_thread(PSI_thread_key key, PSI_thread_seqnum seqnum,
+                                 const void *identity,
                                  ulonglong processlist_id) {
   native_mutex_lock(&serialize);
 
@@ -6522,8 +6522,8 @@
     LO_thread::g_threads.push_back(lo);
 
     if (g_thread_chain != nullptr) {
-      lo->m_chain = g_thread_chain->new_thread(klass->get_chain_key(), identity,
-                                               processlist_id);
+      lo->m_chain = g_thread_chain->new_thread(klass->get_chain_key(), seqnum,
+                                               identity, processlist_id);
     }
   }
 
@@ -7563,7 +7563,7 @@
 }
 
 static void lo_start_file_rename_wait(PSI_file_locker *locker,
-                                      size_t count MY_ATTRIBUTE((unused)),
+                                      size_t count [[maybe_unused]],
                                       const char *old_name,
                                       const char *new_name,
                                       const char *src_file, uint src_line) {
@@ -7719,7 +7719,7 @@
   }
 }
 
-PSI_thread_service_v4 LO_thread_v4 = {lo_register_thread,
+PSI_thread_service_v5 LO_thread_v5 = {lo_register_thread,
                                       lo_spawn_thread,
                                       lo_new_thread,
                                       lo_set_thread_id,
@@ -7763,7 +7763,9 @@
     case PSI_THREAD_VERSION_3:
       return nullptr;
     case PSI_THREAD_VERSION_4:
-      return &LO_thread_v4;
+      return nullptr;
+    case PSI_THREAD_VERSION_5:
+      return &LO_thread_v5;
     default:
       return nullptr;
   }
diff -Nru mysql-8.0-8.0.26/sql/event_data_objects.cc mysql-8.0-8.0.27/sql/event_data_objects.cc
--- mysql-8.0-8.0.26/sql/event_data_objects.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/event_data_objects.cc	2021-09-28 11:46:34.000000000 +0000
@@ -235,7 +235,7 @@
 
 Event_basic::~Event_basic() {
   DBUG_TRACE;
-  free_root(&mem_root, MYF(0));
+  mem_root.Clear();
 }
 
 /*
diff -Nru mysql-8.0-8.0.26/sql/event_queue.cc mysql-8.0-8.0.27/sql/event_queue.cc
--- mysql-8.0-8.0.26/sql/event_queue.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/event_queue.cc	2021-09-28 11:46:34.000000000 +0000
@@ -490,7 +490,7 @@
       now  Current timestamp
 */
 
-void Event_queue::dbug_dump_queue(time_t now MY_ATTRIBUTE((unused))) {
+void Event_queue::dbug_dump_queue(time_t now [[maybe_unused]]) {
 #ifndef NDEBUG
   DBUG_TRACE;
   DBUG_PRINT("info", ("Dumping queue . Elements=%u",
diff -Nru mysql-8.0-8.0.26/sql/events.cc mysql-8.0-8.0.27/sql/events.cc
--- mysql-8.0-8.0.26/sql/events.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/events.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1016,9 +1016,10 @@
 PSI_thread_key key_thread_event_scheduler, key_thread_event_worker;
 
 static PSI_thread_info all_events_threads[] = {
-    {&key_thread_event_scheduler, "event_scheduler", PSI_FLAG_SINGLETON, 0,
-     PSI_DOCUMENT_ME},
-    {&key_thread_event_worker, "event_worker", 0, 0, PSI_DOCUMENT_ME}};
+    {&key_thread_event_scheduler, "event_scheduler", "evt_sched",
+     PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME},
+    {&key_thread_event_worker, "event_worker", "evt_wkr", 0, 0,
+     PSI_DOCUMENT_ME}};
 #endif /* HAVE_PSI_INTERFACE */
 
 PSI_stage_info stage_waiting_on_empty_queue = {0, "Waiting on empty queue", 0,
diff -Nru mysql-8.0-8.0.26/sql/field.cc mysql-8.0-8.0.27/sql/field.cc
--- mysql-8.0-8.0.26/sql/field.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/field.cc	2021-09-28 11:46:34.000000000 +0000
@@ -36,13 +36,14 @@
 #include <algorithm>
 #include <cmath>   // isnan
 #include <memory>  // unique_ptr
+#include <optional>
 
 #include "decimal.h"
 #include "m_string.h"
 #include "my_alloc.h"
-#include "my_bit.h"
 #include "my_byteorder.h"
 #include "my_compare.h"
+#include "my_compiler.h"
 #include "my_dbug.h"
 #include "my_double2ulonglong.h"
 #include "my_sqlcommand.h"
@@ -79,8 +80,10 @@
 #include "sql/sql_time.h"       // str_to_datetime_with_warn
 #include "sql/sql_tmp_table.h"  // create_tmp_field
 #include "sql/srs_fetcher.h"
+#include "sql/stateless_allocator.h"
 #include "sql/strfunc.h"  // find_type2
 #include "sql/system_variables.h"
+#include "sql/time_zone_common.h"
 #include "sql/transaction_info.h"
 #include "sql/tztime.h"      // Time_zone
 #include "template_utils.h"  // pointer_cast
@@ -1733,7 +1736,7 @@
   switch (m_check_for_truncated_fields_saved) {
     case CHECK_FIELD_WARN:
       set_warning(Sql_condition::SL_WARNING, mysql_errno, 1);
-      /* fall through */
+      [[fallthrough]];
     case CHECK_FIELD_IGNORE:
       return TYPE_OK;
     case CHECK_FIELD_ERROR_FOR_NULL:
@@ -2889,7 +2892,8 @@
         thd, Sql_condition::SL_WARNING, ER_TRUNCATED_WRONG_VALUE_FOR_FIELD,
         ER_THD(thd, ER_TRUNCATED_WRONG_VALUE_FOR_FIELD), "decimal",
         errmsg.ptr(), field_name, da->current_row_for_condition());
-    return decimal_err_to_type_conv_status(err);
+    return err != E_DEC_BAD_NUM ? decimal_err_to_type_conv_status(err)
+                                : store_value(&decimal_value);
   }
 
   if (err != 0) {
@@ -2903,7 +2907,9 @@
 #endif
 
   type_conversion_status store_stat = store_value(&decimal_value);
-  return err != 0 ? decimal_err_to_type_conv_status(err) : store_stat;
+  return (err != 0 && err != E_DEC_BAD_NUM)
+             ? decimal_err_to_type_conv_status(err)
+             : store_stat;
 }
 
 type_conversion_status store_internal_with_error_check(Field_new_decimal *field,
@@ -3284,7 +3290,7 @@
 }
 
 size_t Field_tiny::make_sort_key(uchar *to,
-                                 size_t length MY_ATTRIBUTE((unused))) const {
+                                 size_t length [[maybe_unused]]) const {
   assert(length == 1);
   if (is_unsigned())
     *to = *ptr;
@@ -3463,7 +3469,7 @@
 }
 
 size_t Field_short::make_sort_key(uchar *to,
-                                  size_t length MY_ATTRIBUTE((unused))) const {
+                                  size_t length [[maybe_unused]]) const {
   assert(length == 2);
 #ifdef WORDS_BIGENDIAN
   if (!table->s->db_low_byte_first) {
@@ -3622,7 +3628,7 @@
 }
 
 size_t Field_medium::make_sort_key(uchar *to,
-                                   size_t length MY_ATTRIBUTE((unused))) const {
+                                   size_t length [[maybe_unused]]) const {
   assert(length == 3);
   if (is_unsigned())
     to[0] = ptr[2];
@@ -3804,7 +3810,7 @@
 }
 
 size_t Field_long::make_sort_key(uchar *to,
-                                 size_t length MY_ATTRIBUTE((unused))) const {
+                                 size_t length [[maybe_unused]]) const {
   assert(length == 4);
 #ifdef WORDS_BIGENDIAN
   if (!table->s->db_low_byte_first) {
@@ -4139,7 +4145,7 @@
 }
 
 size_t Field_float::make_sort_key(uchar *to,
-                                  size_t length MY_ATTRIBUTE((unused))) const {
+                                  size_t length [[maybe_unused]]) const {
   assert(length == sizeof(float));
   float nr;
   if (table->s->db_low_byte_first)
@@ -5082,8 +5088,8 @@
   return ((uint32)a < (uint32)b) ? -1 : ((uint32)a > (uint32)b) ? 1 : 0;
 }
 
-size_t Field_timestamp::make_sort_key(
-    uchar *to, size_t length MY_ATTRIBUTE((unused))) const {
+size_t Field_timestamp::make_sort_key(uchar *to,
+                                      size_t length [[maybe_unused]]) const {
   assert(length == 4);
 #ifdef WORDS_BIGENDIAN
   if (!table || !table->s->db_low_byte_first) {
@@ -5392,7 +5398,7 @@
 }
 
 size_t Field_time::make_sort_key(uchar *to,
-                                 size_t length MY_ATTRIBUTE((unused))) const {
+                                 size_t length [[maybe_unused]]) const {
   assert(length == 3);
   to[0] = (uchar)(ptr[2] ^ 128);
   to[1] = ptr[1];
@@ -6332,7 +6338,7 @@
   }
 
   assert(char_length_cache == char_length());
-  size_t tmp MY_ATTRIBUTE((unused)) = field_charset->coll->strnxfrm(
+  size_t tmp [[maybe_unused]] = field_charset->coll->strnxfrm(
       field_charset, to, length, char_length_cache, ptr, input_length,
       MY_STRXFRM_PAD_TO_MAXLEN);
   assert(tmp == length);
@@ -7494,8 +7500,9 @@
     gis::srid_t geometry_srid = uint4korr(from);
     if (geometry_srid != get_srid().value()) {
       Field_blob::reset();
-      my_error(ER_WRONG_SRID_FOR_COLUMN, MYF(0), field_name, geometry_srid,
-               get_srid().value());
+      my_error(ER_WRONG_SRID_FOR_COLUMN, MYF(0), field_name,
+               static_cast<unsigned long>(geometry_srid),
+               static_cast<unsigned long>(get_srid().value()));
       return TYPE_ERR_BAD_VALUE;
     }
   }
@@ -9235,7 +9242,7 @@
                   TYPELIB *interval, const char *field_name, bool is_nullable,
                   bool is_zerofill, bool is_unsigned, uint decimals,
                   bool treat_bit_as_char, uint pack_length_override,
-                  Nullable<gis::srid_t> srid, bool is_array) {
+                  std::optional<gis::srid_t> srid, bool is_array) {
   uchar *bit_ptr = nullptr;
   uchar bit_offset = 0;
   assert(mem_root);
@@ -10115,8 +10122,8 @@
 
 // Byteswaps and/or truncates int24 values; used for both pack() and unpack().
 static inline void handle_int24(uchar *to, const uchar *from, size_t max_length,
-                                bool low_byte_first_from MY_ATTRIBUTE((unused)),
-                                bool low_byte_first_to MY_ATTRIBUTE((unused))) {
+                                bool low_byte_first_from [[maybe_unused]],
+                                bool low_byte_first_to [[maybe_unused]]) {
   int32 val;
   uchar buf[3];
 #ifdef WORDS_BIGENDIAN
@@ -10169,8 +10176,8 @@
 
 // Byteswaps and/or truncates int64 values; used for both pack() and unpack().
 static inline void handle_int64(uchar *to, const uchar *from, size_t max_length,
-                                bool low_byte_first_from MY_ATTRIBUTE((unused)),
-                                bool low_byte_first_to MY_ATTRIBUTE((unused))) {
+                                bool low_byte_first_from [[maybe_unused]],
+                                bool low_byte_first_to [[maybe_unused]]) {
   int64 val;
   uchar buf[sizeof(val)];
 #ifdef WORDS_BIGENDIAN
@@ -10347,7 +10354,7 @@
     Field *from_field, *default_field;
     tmp_table_field = create_tmp_field(thd, tmp_table, item, item->type(),
                                        nullptr, &from_field, &default_field,
-                                       false, false, false, false, false);
+                                       false, false, false, false);
   }
 
   if (!tmp_table_field) {
diff -Nru mysql-8.0-8.0.26/sql/field_conv.cc mysql-8.0-8.0.27/sql/field_conv.cc
--- mysql-8.0-8.0.26/sql/field_conv.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/field_conv.cc	2021-09-28 11:46:34.000000000 +0000
@@ -29,6 +29,7 @@
 #include <string.h>
 #include <sys/types.h>
 #include <algorithm>
+#include <optional>
 
 #include "field_types.h"
 #include "m_ctype.h"
@@ -43,7 +44,6 @@
 #include "mysql_com.h"
 #include "mysql_time.h"
 #include "mysqld_error.h"
-#include "nullable.h"
 #include "sql/current_thd.h"
 #include "sql/field.h"
 #include "sql/item_timefunc.h"  // Item_func_now_local
@@ -87,15 +87,6 @@
     } else {
       to_field->set_notnull();
     }
-  } else {
-    // This is used in the case of window functions, where
-    // bring_back_frame_row() may want to set TABLE::null_row to be what it was
-    // when the row was buffered.
-    if (is_null) {
-      to_field->table->set_null_row();
-    } else {
-      to_field->table->reset_null_row();
-    }
   }
 }
 
@@ -129,7 +120,7 @@
   switch (current_thd->check_for_truncated_fields) {
     case CHECK_FIELD_WARN:
       field->set_warning(Sql_condition::SL_WARNING, WARN_DATA_TRUNCATED, 1);
-      /* fall through */
+      [[fallthrough]];
     case CHECK_FIELD_IGNORE:
       return TYPE_OK;
     case CHECK_FIELD_ERROR_FOR_NULL:
@@ -223,7 +214,7 @@
   switch (thd->check_for_truncated_fields) {
     case CHECK_FIELD_WARN:
       field->set_warning(Sql_condition::SL_WARNING, ER_BAD_NULL_ERROR, 1);
-      /* fall through */
+      [[fallthrough]];
     case CHECK_FIELD_IGNORE:
       if (field->type() == MYSQL_TYPE_BLOB) {
         /*
diff -Nru mysql-8.0-8.0.26/sql/field.h mysql-8.0-8.0.27/sql/field.h
--- mysql-8.0-8.0.26/sql/field.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/field.h	2021-09-28 11:46:34.000000000 +0000
@@ -23,6 +23,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
+#include <assert.h>
 #include <limits.h>
 #include <stddef.h>
 #include <stdio.h>
@@ -31,6 +32,7 @@
 #include <sys/types.h>
 
 #include <algorithm>
+#include <optional>
 
 #include "decimal.h"      // E_DEC_OOM
 #include "field_types.h"  // enum_field_types
@@ -40,8 +42,8 @@
 #include "my_alloc.h"
 #include "my_base.h"  // ha_storage_media
 #include "my_bitmap.h"
-#include "my_compiler.h"
 #include "my_dbug.h"
+#include "my_double2ulonglong.h"
 #include "my_inttypes.h"
 #include "my_sys.h"
 #include "my_time.h"  // MYSQL_TIME_NOTE_TRUNCATED
@@ -49,7 +51,6 @@
 #include "mysql_com.h"
 #include "mysql_time.h"
 #include "mysqld_error.h"  // ER_*
-#include "nullable.h"
 #include "sql/dd/types/column.h"
 #include "sql/field_common_properties.h"
 #include "sql/gis/srid.h"
@@ -108,8 +109,6 @@
 struct TYPELIB;
 struct timeval;
 
-using Mysql::Nullable;
-
 /*
   Inside an in-memory data record, memory pointers to pieces of the
   record (like BLOBs) are stored in their native byte order and in
@@ -886,12 +885,7 @@
   Field(uchar *ptr_arg, uint32 length_arg, uchar *null_ptr_arg,
         uchar null_bit_arg, uchar auto_flags_arg, const char *field_name_arg);
 
-#ifdef __SUNPRO_CC
-  // Several mock classes in unit tests need this.
-  virtual ~Field() {}
-#else
   virtual ~Field() = default;
-#endif
 
   void reset_warnings() { m_warnings_pushed = 0; }
 
@@ -1093,8 +1087,7 @@
     Useful only for variable length datatypes where it's overloaded.
     By default assume the length is constant.
   */
-  virtual uint32 data_length(
-      ptrdiff_t row_offset MY_ATTRIBUTE((unused)) = 0) const {
+  virtual uint32 data_length(ptrdiff_t row_offset [[maybe_unused]] = 0) const {
     return pack_length();
   }
 
@@ -1198,12 +1191,12 @@
   }
   int cmp(const uchar *str) const { return cmp(ptr, str); }
   virtual int cmp_max(const uchar *a, const uchar *b,
-                      uint max_len MY_ATTRIBUTE((unused))) const {
+                      uint max_len [[maybe_unused]]) const {
     return cmp(a, b);
   }
   virtual int cmp(const uchar *, const uchar *) const = 0;
   virtual int cmp_binary(const uchar *a, const uchar *b,
-                         uint32 max_length MY_ATTRIBUTE((unused)) = ~0L) const {
+                         uint32 max_length [[maybe_unused]] = ~0L) const {
     return memcmp(a, b, pack_length());
   }
   virtual int cmp_offset(ptrdiff_t row_offset) const {
@@ -1215,8 +1208,7 @@
   virtual int key_cmp(const uchar *a, const uchar *b) const {
     return cmp(a, b);
   }
-  virtual int key_cmp(const uchar *str,
-                      uint length MY_ATTRIBUTE((unused))) const {
+  virtual int key_cmp(const uchar *str, uint length [[maybe_unused]]) const {
     return cmp(ptr, str);
   }
   virtual uint decimals() const { return 0; }
@@ -1433,7 +1425,7 @@
   */
 
   virtual size_t get_key_image(uchar *buff, size_t length,
-                               imagetype type MY_ATTRIBUTE((unused))) const {
+                               imagetype type [[maybe_unused]]) const {
     get_image(buff, length, &my_charset_bin);
     return length;
   }
@@ -1554,8 +1546,8 @@
 
     @retval false The field was written.
   */
-  virtual bool pack_diff(uchar **to MY_ATTRIBUTE((unused)),
-                         ulonglong value_options MY_ATTRIBUTE((unused))) const {
+  virtual bool pack_diff(uchar **to [[maybe_unused]],
+                         ulonglong value_options [[maybe_unused]]) const {
     return true;
   }
 
@@ -1700,8 +1692,8 @@
   }
 
   /* Validate the value stored in a field */
-  virtual type_conversion_status validate_stored_val(
-      THD *thd MY_ATTRIBUTE((unused))) {
+  virtual type_conversion_status validate_stored_val(THD *thd
+                                                     [[maybe_unused]]) {
     return TYPE_OK;
   }
 
@@ -1830,8 +1822,8 @@
 
      @returns 0 no bytes written.
   */
-  virtual int do_save_field_metadata(
-      uchar *metadata_ptr MY_ATTRIBUTE((unused))) const {
+  virtual int do_save_field_metadata(uchar *metadata_ptr
+                                     [[maybe_unused]]) const {
     return 0;
   }
 
@@ -2220,7 +2212,7 @@
   }
 
   const uchar *unpack(uchar *to, const uchar *from,
-                      uint param_data MY_ATTRIBUTE((unused))) final {
+                      uint param_data [[maybe_unused]]) final {
     *to = *from;
     return from + 1;
   }
@@ -2271,7 +2263,7 @@
   }
 
   const uchar *unpack(uchar *to, const uchar *from,
-                      uint param_data MY_ATTRIBUTE((unused))) final {
+                      uint param_data [[maybe_unused]]) final {
     return unpack_int16(to, from);
   }
 
@@ -2361,7 +2353,7 @@
     return pack_int32(to, from, max_length);
   }
   const uchar *unpack(uchar *to, const uchar *from,
-                      uint param_data MY_ATTRIBUTE((unused))) final {
+                      uint param_data [[maybe_unused]]) final {
     return unpack_int32(to, from);
   }
 
@@ -2411,7 +2403,7 @@
     return pack_int64(to, from, max_length);
   }
   const uchar *unpack(uchar *to, const uchar *from,
-                      uint param_data MY_ATTRIBUTE((unused))) final {
+                      uint param_data [[maybe_unused]]) final {
     return unpack_int64(to, from);
   }
 
@@ -2672,8 +2664,7 @@
 
     @note STRICT mode can convert warnings to error.
    */
-  bool set_warnings(const ErrConvString &str, int warnings)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool set_warnings(const ErrConvString &str, int warnings);
 
   /**
     Flags that are passed as "flag" argument to
@@ -2688,8 +2679,7 @@
     @param  thd  THD
     @retval      sql_mode flags mixed with the field type flags.
   */
-  virtual my_time_flags_t date_flags(
-      const THD *thd MY_ATTRIBUTE((unused))) const {
+  virtual my_time_flags_t date_flags(const THD *thd [[maybe_unused]]) const {
     return 0;
   }
 
@@ -2717,11 +2707,10 @@
     truncated fields counter if check_for_truncated_fields == FIELD_CHECK_IGNORE
       for current thread.
   */
-  bool set_datetime_warning(Sql_condition::enum_severity_level level, uint code,
-                            const ErrConvString &val,
-                            enum_mysql_timestamp_type ts_type,
-                            int truncate_increment)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool set_datetime_warning(
+      Sql_condition::enum_severity_level level, uint code,
+      const ErrConvString &val, enum_mysql_timestamp_type ts_type,
+      int truncate_increment);
 
  public:
   /**
@@ -2971,7 +2960,7 @@
     return pack_int32(to, from, max_length);
   }
   const uchar *unpack(uchar *to, const uchar *from,
-                      uint param_data MY_ATTRIBUTE((unused))) final {
+                      uint param_data [[maybe_unused]]) final {
     return unpack_int32(to, from);
   }
   /* Validate the value stored in a field */
@@ -3345,7 +3334,7 @@
     return pack_int64(to, from, max_length);
   }
   const uchar *unpack(uchar *to, const uchar *from,
-                      uint param_data MY_ATTRIBUTE((unused))) final {
+                      uint param_data [[maybe_unused]]) final {
     return unpack_int64(to, from);
   }
 };
@@ -3893,7 +3882,7 @@
 
 class Field_geom final : public Field_blob {
  private:
-  const Nullable<gis::srid_t> m_srid;
+  const std::optional<gis::srid_t> m_srid;
 
   type_conversion_status store_internal(const char *from, size_t length,
                                         const CHARSET_INFO *cs) final;
@@ -3904,13 +3893,13 @@
   Field_geom(uchar *ptr_arg, uchar *null_ptr_arg, uint null_bit_arg,
              uchar auto_flags_arg, const char *field_name_arg,
              TABLE_SHARE *share, uint blob_pack_length,
-             enum geometry_type geom_type_arg, Nullable<gis::srid_t> srid)
+             enum geometry_type geom_type_arg, std::optional<gis::srid_t> srid)
       : Field_blob(ptr_arg, null_ptr_arg, null_bit_arg, auto_flags_arg,
                    field_name_arg, share, blob_pack_length, &my_charset_bin),
         m_srid(srid),
         geom_type(geom_type_arg) {}
   Field_geom(uint32 len_arg, bool is_nullable_arg, const char *field_name_arg,
-             enum geometry_type geom_type_arg, Nullable<gis::srid_t> srid)
+             enum geometry_type geom_type_arg, std::optional<gis::srid_t> srid)
       : Field_blob(len_arg, is_nullable_arg, field_name_arg, &my_charset_bin,
                    false),
         m_srid(srid),
@@ -3945,7 +3934,7 @@
   }
   uint is_equal(const Create_field *new_field) const final;
 
-  Nullable<gis::srid_t> get_srid() const { return m_srid; }
+  std::optional<gis::srid_t> get_srid() const { return m_srid; }
 };
 
 /// A field that stores a JSON value.
@@ -4546,7 +4535,7 @@
                   TYPELIB *interval, const char *field_name, bool is_nullable,
                   bool is_zerofill, bool is_unsigned, uint decimals,
                   bool treat_bit_as_char, uint pack_length_override,
-                  Nullable<gis::srid_t> srid, bool is_array);
+                  std::optional<gis::srid_t> srid, bool is_array);
 
 /**
   Instantiates a Field object with the given name and record buffer values.
@@ -4643,9 +4632,9 @@
   void invoke_do_copy(bool reverse = false);
   void invoke_do_copy2(const Field *from_field, Field *to_field);
 
-  Field *from_field() { return m_from_field; }
+  Field *from_field() const { return m_from_field; }
 
-  Field *to_field() { return m_to_field; }
+  Field *to_field() const { return m_to_field; }
 };
 
 enum_field_types get_blob_type_from_length(size_t length);
diff -Nru mysql-8.0-8.0.26/sql/filesort.cc mysql-8.0-8.0.27/sql/filesort.cc
--- mysql-8.0-8.0.26/sql/filesort.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/filesort.cc	2021-09-28 11:46:34.000000000 +0000
@@ -46,6 +46,7 @@
 #include <atomic>
 #include <memory>
 #include <new>
+#include <optional>
 #include <vector>
 
 #include "add_with_saturate.h"
@@ -69,7 +70,6 @@
 #include "mysql/udf_registration_types.h"
 #include "mysql_com.h"
 #include "mysqld_error.h"
-#include "nullable.h"
 #include "priority_queue.h"
 #include "sql/auth/sql_security_ctx.h"
 #include "sql/bounded_queue.h"
@@ -112,7 +112,6 @@
 #include "sql_string.h"
 #include "template_utils.h"
 
-using Mysql::Nullable;
 using std::max;
 using std::min;
 
@@ -218,7 +217,6 @@
                                    const Mem_root_array<TABLE *> &tables,
                                    ha_rows maxrows, bool remove_duplicates) {
   m_fixed_sort_length = sortlen;
-  m_force_stable_sort = file_sort->m_force_stable_sort;
   m_remove_duplicates = remove_duplicates;
   sum_ref_length = 0;
   for (TABLE *table : tables) {
@@ -671,16 +669,14 @@
 
 Filesort::Filesort(THD *thd, Mem_root_array<TABLE *> tables_arg,
                    bool keep_buffers_arg, ORDER *order, ha_rows limit_arg,
-                   bool force_stable_sort, bool remove_duplicates,
-                   bool sort_positions, bool unwrap_rollup)
+                   bool remove_duplicates, bool sort_positions,
+                   bool unwrap_rollup)
     : m_thd(thd),
       tables(std::move(tables_arg)),
       keep_buffers(keep_buffers_arg),
       limit(limit_arg),
       sortorder(nullptr),
       using_pq(false),
-      m_force_stable_sort(
-          force_stable_sort),  // keep relative order of equiv. elts
       m_remove_duplicates(remove_duplicates),
       m_force_sort_positions(sort_positions),
       m_sort_order_length(make_sortorder(order, unwrap_rollup)) {}
@@ -857,6 +853,7 @@
     if (sort_key_buf.array() == nullptr) return true;
     const uint rec_sz =
         param->make_sortkey(sort_key_buf, tables, longest_addons);
+    if (current_thd->is_error()) return true;
     if (rec_sz > sort_key_buf.size()) {
       // The record wouldn't fit. Try again, asking for a larger buffer.
       min_bytes = sort_key_buf.size() + 1;
@@ -1017,9 +1014,12 @@
       pq->push(tables);
     else {
       size_t key_length;
-      bool out_of_mem = alloc_and_make_sortkey(
+      bool out_of_mem_or_error = alloc_and_make_sortkey(
           param, fs_info, tables, &key_length, &longest_addon_so_far);
-      if (out_of_mem) {
+      if (out_of_mem_or_error) {
+        if (thd->is_error()) {
+          return HA_POS_ERROR;
+        }
         // Out of room, so flush chunk to disk (if there's anything to flush).
         if (num_records_this_chunk > 0) {
           if (write_keys(param, fs_info, num_records_this_chunk, chunk_file,
@@ -1031,12 +1031,15 @@
           fs_info->reset();
 
           // Now we should have room for a new row.
-          out_of_mem = alloc_and_make_sortkey(
+          out_of_mem_or_error = alloc_and_make_sortkey(
               param, fs_info, tables, &key_length, &longest_addon_so_far);
         }
 
         // If we're still out of memory after flushing to disk, give up.
-        if (out_of_mem) {
+        if (out_of_mem_or_error) {
+          if (thd->is_error()) {
+            return HA_POS_ERROR;
+          }
           my_error(ER_OUT_OF_SORTMEMORY, ME_FATALERROR);
           LogErr(ERROR_LEVEL, ER_SERVER_OUT_OF_SORTMEMORY);
           return HA_POS_ERROR;
@@ -1234,9 +1237,9 @@
   or UINT_MAX if the value would not provably fit within the given bounds.
 */
 size_t make_sortkey_from_item(Item *item, Item_result result_type,
-                              Nullable<size_t> dst_length, String *tmp_buffer,
-                              uchar *to, uchar *to_end, bool *maybe_null,
-                              ulonglong *hash) {
+                              std::optional<size_t> dst_length,
+                              String *tmp_buffer, uchar *to, uchar *to_end,
+                              bool *maybe_null, ulonglong *hash) {
   bool is_varlen = !dst_length.has_value();
 
   uchar *null_indicator = nullptr;
@@ -1333,6 +1336,9 @@
     case DECIMAL_RESULT: {
       assert(!is_varlen);
       my_decimal dec_buf, *dec_val = item->val_decimal(&dec_buf);
+      if (current_thd->is_error()) {
+        return UINT_MAX;
+      }
       /*
         Note: item->null_value can't be trusted alone here; there are cases
         where we can have item->null_value set without maybe_null being set!
@@ -1405,7 +1411,7 @@
     }
 
     bool maybe_null;
-    Nullable<size_t> dst_length;
+    std::optional<size_t> dst_length;
     if (!sort_field->is_varlen) dst_length = sort_field->length;
     uint actual_length;
     Item *item = sort_field->item;
@@ -1499,7 +1505,10 @@
     if (addon_fields->using_packed_addons()) {
       for (const Sort_addon_field &addonf : *addon_fields) {
         Field *field = addonf.field;
-        if (field->table->has_null_row()) continue;
+        if (field->table->has_null_row()) {
+          assert(field->table->is_nullable());
+          continue;
+        }
         if (addonf.null_bit && field->is_null()) {
           nulls[addonf.null_offset] |= addonf.null_bit;
         } else {
@@ -1517,7 +1526,7 @@
         if (addonf.null_bit && field->is_null()) {
           nulls[addonf.null_offset] |= addonf.null_bit;
         } else {
-          uchar *ptr MY_ATTRIBUTE((unused)) =
+          uchar *ptr [[maybe_unused]] =
               field->pack(to, field->field_ptr(), to_end - to);
           assert(ptr <= to + addonf.max_length);
         }
diff -Nru mysql-8.0-8.0.26/sql/filesort.h mysql-8.0-8.0.27/sql/filesort.h
--- mysql-8.0-8.0.26/sql/filesort.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/filesort.h	2021-09-28 11:46:34.000000000 +0000
@@ -62,8 +62,6 @@
   st_sort_field *sortorder;
   /// true means we are using Priority Queue for order by with limit.
   bool using_pq;
-  /// true means force stable sorting
-  bool m_force_stable_sort;
   bool m_remove_duplicates;
   // If true, we will always sort references to rows on table (and crucially,
   // the result iterators used will always position the underlying table on
@@ -76,9 +74,8 @@
   // some semijoin tables are missing from query_block->leaf_tables,
   // so we can't do that yet.
   Filesort(THD *thd, Mem_root_array<TABLE *> tables, bool keep_buffers,
-           ORDER *order, ha_rows limit_arg, bool force_stable_sort,
-           bool remove_duplicates, bool force_sort_positions,
-           bool unwrap_rollup);
+           ORDER *order, ha_rows limit_arg, bool remove_duplicates,
+           bool force_sort_positions, bool unwrap_rollup);
 
   Addon_fields *get_addon_fields(Addon_fields_status *addon_fields_status,
                                  uint *plength, uint *ppackable_length);
diff -Nru mysql-8.0-8.0.26/sql/filesort_utils.cc mysql-8.0-8.0.27/sql/filesort_utils.cc
--- mysql-8.0-8.0.26/sql/filesort_utils.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/filesort_utils.cc	2021-09-28 11:46:34.000000000 +0000
@@ -78,12 +78,7 @@
  public:
   explicit Mem_compare(size_t n) : m_size(n) {}
   bool operator()(const uchar *s1, const uchar *s2) const {
-#ifdef __SUNPRO_CC
-    // The native memcmp is faster on SUN.
-    return memcmp(s1, s2, m_size) < 0;
-#else
     return my_mem_compare(s1, s2, m_size);
-#endif
   }
 
  private:
@@ -94,12 +89,7 @@
  public:
   explicit Mem_compare_longkey(size_t n) : m_size(n) {}
   bool operator()(const uchar *s1, const uchar *s2) const {
-#ifdef __SUNPRO_CC
-    // The native memcmp is faster on SUN.
-    return memcmp(s1, s2, m_size) < 0;
-#else
     return my_mem_compare_longkey(s1, s2, m_size);
-#endif
   }
 
  private:
@@ -139,7 +129,6 @@
 
 size_t Filesort_buffer::sort_buffer(Sort_param *param, size_t num_input_rows,
                                     size_t max_output_rows) {
-  const bool force_stable_sort = param->m_force_stable_sort;
   param->m_sort_algorithm = Sort_param::FILESORT_ALG_NONE;
 
   if (max_output_rows == 0) return max_output_rows;
@@ -155,8 +144,7 @@
   // win for small k. nth_element() isn't guaranteed to be a stable sort,
   // though, so we can only use it if an unstable one is okay.
   const bool prefilter_nth_element =
-      (max_output_rows < num_input_rows / 2 && !param->m_remove_duplicates &&
-       !force_stable_sort);
+      max_output_rows < num_input_rows / 2 && !param->m_remove_duplicates;
 
   if (param->using_varlen_keys()) {
     const Mem_compare_varlen_key comp(param->local_sortorder, param->use_hash);
@@ -164,15 +152,10 @@
       nth_element(it_begin, it_begin + max_output_rows - 1, it_end, comp);
       it_end = it_begin + max_output_rows;
     }
-    if (force_stable_sort) {
-      param->m_sort_algorithm = Sort_param::FILESORT_ALG_STD_STABLE;
-      stable_sort(it_begin, it_end, comp);
-    } else {
-      // TODO: Make more elaborate heuristics than just always picking
-      // std::sort.
-      param->m_sort_algorithm = Sort_param::FILESORT_ALG_STD_SORT;
-      sort(it_begin, it_end, comp);
-    }
+    // TODO: Make more elaborate heuristics than just always picking
+    // std::sort.
+    param->m_sort_algorithm = Sort_param::FILESORT_ALG_STD_SORT;
+    sort(it_begin, it_end, comp);
     if (param->m_remove_duplicates) {
       num_input_rows =
           unique(it_begin, it_end,
@@ -197,7 +180,7 @@
     than quicksort seems to be somewhere around 10 to 40 records.
     So we're a bit conservative, and stay with quicksort up to 100 records.
   */
-  if (num_input_rows <= 100 && !force_stable_sort) {
+  if (num_input_rows <= 100) {
     if (key_len < 10) {
       param->m_sort_algorithm = Sort_param::FILESORT_ALG_STD_SORT;
       if (prefilter_nth_element) {
diff -Nru mysql-8.0-8.0.26/sql/gis/geometries_cs.h mysql-8.0-8.0.27/sql/gis/geometries_cs.h
--- mysql-8.0-8.0.26/sql/gis/geometries_cs.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/gis/geometries_cs.h	2021-09-28 11:46:34.000000000 +0000
@@ -175,9 +175,6 @@
 /// A Cartesian 2d linear ring.
 class Cartesian_linearring : public Cartesian_linestring, public Linearring {
  public:
-#if defined(__SUNPRO_CC)
-  ~Cartesian_linearring() override = default;
-#endif
   Geometry_type type() const override { return Linearring::type(); }
   Coordinate_system coordinate_system() const override {
     return Coordinate_system::kCartesian;
@@ -224,9 +221,6 @@
 /// A geographic (ellipsoidal) 2d linear ring.
 class Geographic_linearring : public Geographic_linestring, public Linearring {
  public:
-#if defined(__SUNPRO_CC)
-  ~Geographic_linearring() override = default;
-#endif
   Geometry_type type() const override { return Linearring::type(); }
   Coordinate_system coordinate_system() const override {
     return Coordinate_system::kGeographic;
diff -Nru mysql-8.0-8.0.26/sql/gis/geometries.h mysql-8.0-8.0.27/sql/gis/geometries.h
--- mysql-8.0-8.0.26/sql/gis/geometries.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/gis/geometries.h	2021-09-28 11:46:34.000000000 +0000
@@ -318,9 +318,6 @@
 /// enforced, by the implementation).
 class Linearring : public Linestring {
  public:
-#if defined(__SUNPRO_CC)
-  ~Linearring() override = default;
-#endif
   bool accept(Geometry_visitor *v) override = 0;
 
   /// Creates a subclass of Linearring from a Coordinate_system
diff -Nru mysql-8.0-8.0.26/sql/gis/intersection.cc mysql-8.0-8.0.27/sql/gis/intersection.cc
--- mysql-8.0-8.0.26/sql/gis/intersection.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/gis/intersection.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,65 @@
+// Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+//
+// 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,
+// as published by the Free Software Foundation.
+//
+// This program is also distributed with certain software (including
+// but not limited to OpenSSL) that is licensed under separate terms,
+// as designated in a particular file or component or in included license
+// documentation.  The authors of MySQL hereby grant you an additional
+// permission to link the program and your derivative works with the
+// separately licensed software that they have included with MySQL.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License, version 2.0, for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA.
+
+/// @file
+///
+/// This file implements the intersection function.
+
+#include <memory>  // std::unique_ptr
+
+#include "sql/gis/intersection_functor.h"
+#include "sql/gis/setops.h"
+#include "sql/sql_exception_handler.h"  // handle_gis_exception
+
+namespace gis {
+
+bool intersection(const dd::Spatial_reference_system *srs, const Geometry *g1,
+                  const Geometry *g2, const char *func_name,
+                  std::unique_ptr<Geometry> *result) noexcept {
+  try {
+    assert(g1 && g2 && g1->coordinate_system() == g2->coordinate_system());
+    assert(((srs == nullptr || srs->is_cartesian()) &&
+            g1->coordinate_system() == Coordinate_system::kCartesian) ||
+           (srs && srs->is_geographic() &&
+            g1->coordinate_system() == Coordinate_system::kGeographic));
+
+    Intersection intersection_func(srs ? srs->semi_major_axis() : 0.0,
+                                   srs ? srs->semi_minor_axis() : 0.0);
+    *result = intersection_func(g1, g2);
+
+    if (result->get()->type() != Geometry_type::kGeometrycollection &&
+        result->get()->is_empty()) {
+      if (result->get()->coordinate_system() == Coordinate_system::kCartesian) {
+        *result = std::make_unique<Cartesian_geometrycollection>();
+      } else {
+        *result = std::make_unique<Geographic_geometrycollection>();
+      }
+    }
+
+  } catch (...) {
+    handle_gis_exception(func_name);
+    return true;
+  }
+  return false;
+}
+
+}  // namespace gis
diff -Nru mysql-8.0-8.0.26/sql/gis/intersection_functor.cc mysql-8.0-8.0.27/sql/gis/intersection_functor.cc
--- mysql-8.0-8.0.26/sql/gis/intersection_functor.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/gis/intersection_functor.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,824 @@
+// Copyright (c) 2020, Oracle 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,
+// as published by the Free Software Foundation.
+//
+// This program is also distributed with certain software (including
+// but not limited to OpenSSL) that is licensed under separate terms,
+// as designated in a particular file or component or in included license
+// documentation.  The authors of MySQL hereby grant you an additional
+// permission to link the program and your derivative works with the
+// separately licensed software that they have included with MySQL.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License, version 2.0, for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA.
+
+/// @file
+///
+/// This file implements the intersection functor.
+
+#include <memory>  // std::unique_ptr
+
+#include <boost/geometry.hpp>
+
+#include "sql/gis/gc_utils.h"
+#include "sql/gis/geometries.h"
+#include "sql/gis/geometries_traits.h"
+#include "sql/gis/intersection_functor.h"
+#include "sql/gis/so_utils.h"
+#include "sql/gis/union_functor.h"
+
+namespace bg = boost::geometry;
+
+namespace gis {
+
+static bool is_collection(const Geometry *g) {
+  switch (g->type()) {
+    case Geometry_type::kPoint:
+    case Geometry_type::kLinestring:
+    case Geometry_type::kPolygon:
+      return false;
+    default:
+      return true;
+  }
+}
+
+template <typename MPt, typename MLs>
+static auto remove_overlapping_mpt_mls(MPt const &mpt, MLs const &mls,
+                                       Geometrycollection &result) {
+  std::unique_ptr<MPt> difference = std::make_unique<MPt>();
+  bg::difference(mpt, mls, *difference);
+  for (auto ls : mls) result.push_back(ls);
+  for (auto pt : *difference) result.push_back(pt);
+}
+
+template <typename MPt, typename MLs, typename MPy>
+static auto remove_overlapping_mpt_mls_mpy(MPt const &mpt, MLs const &mls,
+                                           MPy const &mpy,
+                                           Geometrycollection &result) {
+  std::unique_ptr<MPt> mpt_mls_difference = std::make_unique<MPt>();
+  bg::difference(mpt, mls, *mpt_mls_difference);
+
+  std::unique_ptr<MPt> mpt_mls_mpy_difference = std::make_unique<MPt>();
+  bg::difference(*mpt_mls_difference, mpy, *mpt_mls_mpy_difference);
+
+  if (!mpt_mls_mpy_difference->is_empty()) {
+    if (mpt_mls_mpy_difference->size() == 1) {
+      result.push_back((*mpt_mls_mpy_difference)[0]);
+    } else {
+      result.push_back(*mpt_mls_mpy_difference);
+    }
+  }
+
+  std::unique_ptr<MLs> mls_mpy_difference = std::make_unique<MLs>();
+  bg::difference(mls, mpy, *mls_mpy_difference);
+
+  if (!mls_mpy_difference->is_empty()) {
+    if (mls_mpy_difference->size() == 1) {
+      result.push_back((*mls_mpy_difference)[0]);
+    } else {
+      result.push_back(*mls_mpy_difference);
+    }
+  }
+
+  if (!mpy.is_empty()) {
+    if (mpy.size() == 1) {
+      result.push_back(mpy[0]);
+    } else {
+      result.push_back(mpy);
+    }
+  }
+}
+
+template <typename MPt, typename MLs, typename MPy, typename Geometry1,
+          typename Geometry2>
+static auto apply_bg_intersection(Geometry1 const &g1, Geometry2 const &g2) {
+  std::unique_ptr<gis::Geometrycollection> result(
+      gis::Geometrycollection::create_geometrycollection(
+          g1.coordinate_system()));
+
+  std::tuple<MPt, MLs, MPy> bg_result;
+
+  bg::intersection(g1, g2, bg_result);
+
+  remove_overlapping_mpt_mls_mpy(std::get<0>(bg_result), std::get<1>(bg_result),
+                                 std::get<2>(bg_result), *result);
+
+  return result;
+}
+
+template <typename MPt, typename MLs, typename MPy, typename Geometry1,
+          typename Geometry2, typename Strategy>
+static auto apply_bg_intersection(Geometry1 const &g1, Geometry2 const &g2,
+                                  Strategy const &strategy) {
+  std::unique_ptr<gis::Geometrycollection> result(
+      gis::Geometrycollection::create_geometrycollection(
+          g1.coordinate_system()));
+
+  std::tuple<MPt, MLs, MPy> bg_result;
+
+  bg::intersection(g1, g2, bg_result, strategy);
+
+  remove_overlapping_mpt_mls_mpy(std::get<0>(bg_result), std::get<1>(bg_result),
+                                 std::get<2>(bg_result), *result);
+
+  return result;
+}
+
+template <typename MPt, typename MLs, typename Geometry1, typename Geometry2>
+static auto apply_bg_brute_force_intersection(Geometry1 const &g1,
+                                              Geometry2 const &g2) {
+  std::unique_ptr<gis::Geometrycollection> result(
+      gis::Geometrycollection::create_geometrycollection(
+          g1.coordinate_system()));
+
+  MPt bg_result_mp;
+  bg::intersection(g1, g2, bg_result_mp);
+
+  MLs bg_result_ml;
+  bg::intersection(g1, g2, bg_result_ml);
+
+  remove_overlapping_mpt_mls(bg_result_mp, bg_result_ml, *result);
+
+  return result;
+}
+
+template <typename MPt, typename MLs, typename Geometry1, typename Geometry2,
+          typename Strategy>
+static auto apply_bg_brute_force_intersection(Geometry1 const &g1,
+                                              Geometry2 const &g2,
+                                              Strategy const &strategy) {
+  std::unique_ptr<gis::Geometrycollection> result(
+      gis::Geometrycollection::create_geometrycollection(
+          g1.coordinate_system()));
+
+  MPt bg_result_mp;
+  bg::intersection(g1, g2, bg_result_mp, strategy);
+
+  MLs bg_result_ml;
+  bg::intersection(g1, g2, bg_result_ml, strategy);
+
+  remove_overlapping_mpt_mls(bg_result_mp, bg_result_ml, *result);
+
+  return result;
+}
+
+template <typename GC, typename MPt, typename MLs, typename MPy>
+static std::unique_ptr<Geometry> typed_geometry_collection_apply_intersection(
+    const Intersection &f, const Geometrycollection *g1, const Geometry *g2) {
+  std::unique_ptr<GC> result = std::make_unique<GC>();
+  if (g1->is_empty() || g2->is_empty()) return std::make_unique<GC>(*result);
+
+  std::unique_ptr<Multipoint> mpt;
+  std::unique_ptr<Multilinestring> mls;
+  std::unique_ptr<Multipolygon> mpy;
+  split_gc(g1, &mpt, &mls, &mpy);
+  gc_union(f.semi_major(), f.semi_minor(), &mpt, &mls, &mpy);
+
+  if (!mpy->is_empty()) {
+    std::unique_ptr<Geometry> mpy_result = f(mpy.get(), g2);
+    if (mpt->is_empty() && mls->is_empty()) {
+      return mpy_result;
+    }
+    if (is_collection(mpy_result.get())) {
+      Geometrycollection *gc_mpy_result =
+          down_cast<Geometrycollection *>(mpy_result.get());
+      for (size_t i = 0; i < gc_mpy_result->size(); i++)
+        result->push_back((*gc_mpy_result)[i]);
+    } else
+      result->push_back(*mpy_result);
+  }
+
+  if (!mls->is_empty()) {
+    std::unique_ptr<Geometry> mls_result = f(mls.get(), g2);
+    if (mpy->is_empty() && mpt->is_empty()) {
+      return mls_result;
+    }
+    if (is_collection(mls_result.get())) {
+      Geometrycollection *gc_mls_result =
+          down_cast<Geometrycollection *>(mls_result.get());
+      for (size_t i = 0; i < gc_mls_result->size(); i++)
+        result->push_back((*gc_mls_result)[i]);
+    } else
+      result->push_back(*mls_result);
+  }
+
+  if (!mpt->is_empty()) {
+    std::unique_ptr<Geometry> mpt_result = f(mpt.get(), g2);
+    if (mpy->is_empty() && mls->is_empty()) {
+      return mpt_result;
+    }
+    if (is_collection(mpt_result.get())) {
+      Geometrycollection *gc_mpt_result =
+          down_cast<Geometrycollection *>(mpt_result.get());
+      for (size_t i = 0; i < gc_mpt_result->size(); i++)
+        result->push_back((*gc_mpt_result)[i]);
+    } else
+      result->push_back(*mpt_result);
+  }
+
+  return std::make_unique<GC>(*result);
+}
+
+/// Apply a Intersection functor to two geometries, where at least one is a
+/// geometry collection. Return the intersection of the two geometries.
+///
+/// @param f Functor to apply.
+/// @param g1 First geometry, of type Geometrycollection.
+/// @param g2 Second geometry.
+///
+/// @retval unique pointer to a Geometry.
+static std::unique_ptr<Geometry> geometry_collection_apply_intersection(
+    const Intersection &f, const Geometrycollection *g1, const Geometry *g2) {
+  switch (g1->coordinate_system()) {
+    case Coordinate_system::kCartesian: {
+      return typed_geometry_collection_apply_intersection<
+          Cartesian_geometrycollection, Cartesian_multipoint,
+          Cartesian_multilinestring, Cartesian_multipolygon>(f, g1, g2);
+    }
+    case Coordinate_system::kGeographic: {
+      return typed_geometry_collection_apply_intersection<
+          Geographic_geometrycollection, Geographic_multipoint,
+          Geographic_multilinestring, Geographic_multipolygon>(f, g1, g2);
+    }
+  }
+  assert(false);
+  // This should never happen.
+  throw not_implemented_exception::for_non_projected(*g1);
+}
+
+Intersection::Intersection(double semi_major, double semi_minor)
+    : m_semi_major(semi_major),
+      m_semi_minor(semi_minor),
+      m_geographic_pl_pa_strategy(
+          bg::srs::spheroid<double>(semi_major, semi_minor)),
+      m_geographic_ll_la_aa_strategy(
+          bg::srs::spheroid<double>(semi_major, semi_minor)) {}
+
+std::unique_ptr<Geometry> Intersection::operator()(const Geometry *g1,
+                                                   const Geometry *g2) const {
+  std::unique_ptr<Geometry> result = apply(*this, g1, g2);
+  remove_duplicates(this->semi_major(), this->semi_minor(), &result);
+  narrow_geometry(&result);
+  return result;
+}
+
+std::unique_ptr<Geometry> Intersection::eval(const Geometry *g1,
+                                             const Geometry *g2) const {
+  assert(false);
+  throw not_implemented_exception::for_non_projected(*g1, *g2);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+// intersection(Cartesian_point, *)
+
+std::unique_ptr<Geometry> Intersection::eval(const Cartesian_point *g1,
+                                             const Cartesian_point *g2) const {
+  return apply_bg_intersection<Cartesian_multipoint, Cartesian_multilinestring,
+                               Cartesian_multipolygon>(*g1, *g2);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Cartesian_point *g1, const Cartesian_linestring *g2) const {
+  return apply_bg_intersection<Cartesian_multipoint, Cartesian_multilinestring,
+                               Cartesian_multipolygon>(*g1, *g2);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Cartesian_point *g1, const Cartesian_polygon *g2) const {
+  return apply_bg_intersection<Cartesian_multipoint, Cartesian_multilinestring,
+                               Cartesian_multipolygon>(*g1, *g2);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Cartesian_point *g1, const Cartesian_multipoint *g2) const {
+  return apply_bg_intersection<Cartesian_multipoint, Cartesian_multilinestring,
+                               Cartesian_multipolygon>(*g1, *g2);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Cartesian_point *g1, const Cartesian_multilinestring *g2) const {
+  return apply_bg_intersection<Cartesian_multipoint, Cartesian_multilinestring,
+                               Cartesian_multipolygon>(*g1, *g2);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Cartesian_point *g1, const Cartesian_multipolygon *g2) const {
+  return apply_bg_intersection<Cartesian_multipoint, Cartesian_multilinestring,
+                               Cartesian_multipolygon>(*g1, *g2);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+// intersection(Cartesian_linestring, *)
+
+std::unique_ptr<Geometry> Intersection::eval(const Cartesian_linestring *g1,
+                                             const Cartesian_point *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Cartesian_linestring *g1, const Cartesian_linestring *g2) const {
+  return apply_bg_intersection<Cartesian_multipoint, Cartesian_multilinestring,
+                               Cartesian_multipolygon>(*g1, *g2);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Cartesian_linestring *g1, const Cartesian_polygon *g2) const {
+  // TODO: fix this in boost geometry
+  return apply_bg_brute_force_intersection<Cartesian_multipoint,
+                                           Cartesian_multilinestring>(*g1, *g2);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Cartesian_linestring *g1, const Cartesian_multipoint *g2) const {
+  return apply_bg_intersection<Cartesian_multipoint, Cartesian_multilinestring,
+                               Cartesian_multipolygon>(*g1, *g2);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Cartesian_linestring *g1, const Cartesian_multilinestring *g2) const {
+  return apply_bg_intersection<Cartesian_multipoint, Cartesian_multilinestring,
+                               Cartesian_multipolygon>(*g1, *g2);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Cartesian_linestring *g1, const Cartesian_multipolygon *g2) const {
+  // TODO: fix in boost geometry
+  return apply_bg_brute_force_intersection<Cartesian_multipoint,
+                                           Cartesian_multilinestring>(*g1, *g2);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+// intersection(Cartesian_polygon, *)
+
+std::unique_ptr<Geometry> Intersection::eval(const Cartesian_polygon *g1,
+                                             const Cartesian_point *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Cartesian_polygon *g1, const Cartesian_linestring *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Cartesian_polygon *g1, const Cartesian_polygon *g2) const {
+  return apply_bg_intersection<Cartesian_multipoint, Cartesian_multilinestring,
+                               Cartesian_multipolygon>(*g1, *g2);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Cartesian_polygon *g1, const Cartesian_multipoint *g2) const {
+  return apply_bg_intersection<Cartesian_multipoint, Cartesian_multilinestring,
+                               Cartesian_multipolygon>(*g1, *g2);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Cartesian_polygon *g1, const Cartesian_multilinestring *g2) const {
+  // TODO: fix in boost geometry
+  return apply_bg_brute_force_intersection<Cartesian_multipoint,
+                                           Cartesian_multilinestring>(*g1, *g2);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Cartesian_polygon *g1, const Cartesian_multipolygon *g2) const {
+  return apply_bg_intersection<Cartesian_multipoint, Cartesian_multilinestring,
+                               Cartesian_multipolygon>(*g1, *g2);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+// intersection(Cartesian_geometrycollection, *)
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Cartesian_geometrycollection *g1, const Geometry *g2) const {
+  return geometry_collection_apply_intersection(*this, g1, g2);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Geometry *g1, const Cartesian_geometrycollection *g2) const {
+  return geometry_collection_apply_intersection(*this, g2, g1);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Cartesian_geometrycollection *g1,
+    const Cartesian_geometrycollection *g2) const {
+  return geometry_collection_apply_intersection(*this, g1, g2);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+// intersection(Cartesian_multipoint, *)
+
+std::unique_ptr<Geometry> Intersection::eval(const Cartesian_multipoint *g1,
+                                             const Cartesian_point *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Cartesian_multipoint *g1, const Cartesian_linestring *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Cartesian_multipoint *g1, const Cartesian_polygon *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Cartesian_multipoint *g1, const Cartesian_multipoint *g2) const {
+  return apply_bg_intersection<Cartesian_multipoint, Cartesian_multilinestring,
+                               Cartesian_multipolygon>(*g1, *g2);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Cartesian_multipoint *g1, const Cartesian_multilinestring *g2) const {
+  return apply_bg_intersection<Cartesian_multipoint, Cartesian_multilinestring,
+                               Cartesian_multipolygon>(*g1, *g2);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Cartesian_multipoint *g1, const Cartesian_multipolygon *g2) const {
+  return apply_bg_intersection<Cartesian_multipoint, Cartesian_multilinestring,
+                               Cartesian_multipolygon>(*g1, *g2);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+// intersection(Cartesian_multilinestring, *)
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Cartesian_multilinestring *g1, const Cartesian_point *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Cartesian_multilinestring *g1, const Cartesian_linestring *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Cartesian_multilinestring *g1, const Cartesian_polygon *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Cartesian_multilinestring *g1, const Cartesian_multipoint *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Cartesian_multilinestring *g1,
+    const Cartesian_multilinestring *g2) const {
+  return apply_bg_intersection<Cartesian_multipoint, Cartesian_multilinestring,
+                               Cartesian_multipolygon>(*g1, *g2);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Cartesian_multilinestring *g1,
+    const Cartesian_multipolygon *g2) const {
+  // TODO: fix this in boost geometry
+  return apply_bg_brute_force_intersection<Cartesian_multipoint,
+                                           Cartesian_multilinestring>(*g1, *g2);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+// intersection(Cartesian_multipolygon, *)
+
+std::unique_ptr<Geometry> Intersection::eval(const Cartesian_multipolygon *g1,
+                                             const Cartesian_point *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Cartesian_multipolygon *g1, const Cartesian_linestring *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Cartesian_multipolygon *g1, const Cartesian_polygon *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Cartesian_multipolygon *g1, const Cartesian_multipoint *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Cartesian_multipolygon *g1,
+    const Cartesian_multilinestring *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Cartesian_multipolygon *g1, const Cartesian_multipolygon *g2) const {
+  return apply_bg_intersection<Cartesian_multipoint, Cartesian_multilinestring,
+                               Cartesian_multipolygon>(*g1, *g2);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+// intersection(Geographic_point, *)
+
+std::unique_ptr<Geometry> Intersection::eval(const Geographic_point *g1,
+                                             const Geographic_point *g2) const {
+  return apply_bg_intersection<Geographic_multipoint,
+                               Geographic_multilinestring,
+                               Geographic_multipolygon>(*g1, *g2);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Geographic_point *g1, const Geographic_linestring *g2) const {
+  return apply_bg_intersection<Geographic_multipoint,
+                               Geographic_multilinestring,
+                               Geographic_multipolygon>(
+      *g1, *g2, m_geographic_pl_pa_strategy);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Geographic_point *g1, const Geographic_polygon *g2) const {
+  return apply_bg_intersection<Geographic_multipoint,
+                               Geographic_multilinestring,
+                               Geographic_multipolygon>(
+      *g1, *g2, m_geographic_pl_pa_strategy);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Geographic_point *g1, const Geographic_multipoint *g2) const {
+  return apply_bg_intersection<Geographic_multipoint,
+                               Geographic_multilinestring,
+                               Geographic_multipolygon>(*g1, *g2);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Geographic_point *g1, const Geographic_multilinestring *g2) const {
+  return apply_bg_intersection<Geographic_multipoint,
+                               Geographic_multilinestring,
+                               Geographic_multipolygon>(
+      *g1, *g2, m_geographic_pl_pa_strategy);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Geographic_point *g1, const Geographic_multipolygon *g2) const {
+  return apply_bg_intersection<Geographic_multipoint,
+                               Geographic_multilinestring,
+                               Geographic_multipolygon>(
+      *g1, *g2, m_geographic_pl_pa_strategy);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+// intersection(Geographic_linestring, *)
+
+std::unique_ptr<Geometry> Intersection::eval(const Geographic_linestring *g1,
+                                             const Geographic_point *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Geographic_linestring *g1, const Geographic_linestring *g2) const {
+  return apply_bg_intersection<Geographic_multipoint,
+                               Geographic_multilinestring,
+                               Geographic_multipolygon>(
+      *g1, *g2, m_geographic_ll_la_aa_strategy);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Geographic_linestring *g1, const Geographic_polygon *g2) const {
+  // TODO: fix this in boost geometry
+  return apply_bg_brute_force_intersection<Geographic_multipoint,
+                                           Geographic_multilinestring>(
+      *g1, *g2, m_geographic_ll_la_aa_strategy);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Geographic_linestring *g1, const Geographic_multipoint *g2) const {
+  return apply_bg_intersection<Geographic_multipoint,
+                               Geographic_multilinestring,
+                               Geographic_multipolygon>(
+      *g1, *g2, m_geographic_pl_pa_strategy);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Geographic_linestring *g1,
+    const Geographic_multilinestring *g2) const {
+  return apply_bg_intersection<Geographic_multipoint,
+                               Geographic_multilinestring,
+                               Geographic_multipolygon>(
+      *g1, *g2, m_geographic_ll_la_aa_strategy);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Geographic_linestring *g1, const Geographic_multipolygon *g2) const {
+  // TODO: fix this in boost geometry
+  return apply_bg_brute_force_intersection<Geographic_multipoint,
+                                           Geographic_multilinestring>(
+      *g1, *g2, m_geographic_ll_la_aa_strategy);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+// intersection(Geographic_polygon, *)
+
+std::unique_ptr<Geometry> Intersection::eval(const Geographic_polygon *g1,
+                                             const Geographic_point *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Geographic_polygon *g1, const Geographic_linestring *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Geographic_polygon *g1, const Geographic_polygon *g2) const {
+  return apply_bg_intersection<Geographic_multipoint,
+                               Geographic_multilinestring,
+                               Geographic_multipolygon>(
+      *g1, *g2, m_geographic_ll_la_aa_strategy);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Geographic_polygon *g1, const Geographic_multipoint *g2) const {
+  return apply_bg_intersection<Geographic_multipoint,
+                               Geographic_multilinestring,
+                               Geographic_multipolygon>(
+      *g1, *g2, m_geographic_pl_pa_strategy);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Geographic_polygon *g1, const Geographic_multilinestring *g2) const {
+  // TODO: fix this in boost geometry
+  return apply_bg_brute_force_intersection<Geographic_multipoint,
+                                           Geographic_multilinestring>(
+      *g1, *g2, m_geographic_ll_la_aa_strategy);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Geographic_polygon *g1, const Geographic_multipolygon *g2) const {
+  return apply_bg_intersection<Geographic_multipoint,
+                               Geographic_multilinestring,
+                               Geographic_multipolygon>(
+      *g1, *g2, m_geographic_ll_la_aa_strategy);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+// intersection(Geographic_geometrycollection, *)
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Geographic_geometrycollection *g1, const Geometry *g2) const {
+  return geometry_collection_apply_intersection(*this, g1, g2);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Geometry *g1, const Geographic_geometrycollection *g2) const {
+  return geometry_collection_apply_intersection(*this, g2, g1);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Geographic_geometrycollection *g1,
+    const Geographic_geometrycollection *g2) const {
+  return geometry_collection_apply_intersection(*this, g1, g2);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+// intersection(Geographic_multipoint, *)
+
+std::unique_ptr<Geometry> Intersection::eval(const Geographic_multipoint *g1,
+                                             const Geographic_point *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Geographic_multipoint *g1, const Geographic_linestring *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Geographic_multipoint *g1, const Geographic_polygon *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Geographic_multipoint *g1, const Geographic_multipoint *g2) const {
+  return apply_bg_intersection<Geographic_multipoint,
+                               Geographic_multilinestring,
+                               Geographic_multipolygon>(
+      *g1, *g2, m_geographic_pl_pa_strategy);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Geographic_multipoint *g1,
+    const Geographic_multilinestring *g2) const {
+  return apply_bg_intersection<Geographic_multipoint,
+                               Geographic_multilinestring,
+                               Geographic_multipolygon>(
+      *g1, *g2, m_geographic_pl_pa_strategy);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Geographic_multipoint *g1, const Geographic_multipolygon *g2) const {
+  return apply_bg_intersection<Geographic_multipoint,
+                               Geographic_multilinestring,
+                               Geographic_multipolygon>(
+      *g1, *g2, m_geographic_pl_pa_strategy);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+// intersection(Geographic_multilinestring, *)
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Geographic_multilinestring *g1, const Geographic_point *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Geographic_multilinestring *g1,
+    const Geographic_linestring *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Geographic_multilinestring *g1, const Geographic_polygon *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Geographic_multilinestring *g1,
+    const Geographic_multipoint *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Geographic_multilinestring *g1,
+    const Geographic_multilinestring *g2) const {
+  return apply_bg_intersection<Geographic_multipoint,
+                               Geographic_multilinestring,
+                               Geographic_multipolygon>(
+      *g1, *g2, m_geographic_ll_la_aa_strategy);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Geographic_multilinestring *g1,
+    const Geographic_multipolygon *g2) const {
+  // TODO: fix this in boost geometry
+  return apply_bg_brute_force_intersection<Geographic_multipoint,
+                                           Geographic_multilinestring>(
+      *g1, *g2, m_geographic_ll_la_aa_strategy);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+// intersection(Geographic_multipolygon, *)
+
+std::unique_ptr<Geometry> Intersection::eval(const Geographic_multipolygon *g1,
+                                             const Geographic_point *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Geographic_multipolygon *g1, const Geographic_linestring *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Geographic_multipolygon *g1, const Geographic_polygon *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Geographic_multipolygon *g1, const Geographic_multipoint *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Geographic_multipolygon *g1,
+    const Geographic_multilinestring *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> Intersection::eval(
+    const Geographic_multipolygon *g1,
+    const Geographic_multipolygon *g2) const {
+  return apply_bg_intersection<Geographic_multipoint,
+                               Geographic_multilinestring,
+                               Geographic_multipolygon>(
+      *g1, *g2, m_geographic_ll_la_aa_strategy);
+}
+
+}  // namespace gis
diff -Nru mysql-8.0-8.0.26/sql/gis/intersection_functor.h mysql-8.0-8.0.27/sql/gis/intersection_functor.h
--- mysql-8.0-8.0.26/sql/gis/intersection_functor.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/gis/intersection_functor.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,299 @@
+#ifndef SQL_GIS_INTERSECTION_FUNCTOR_H_INCLUDED
+#define SQL_GIS_INTERSECTION_FUNCTOR_H_INCLUDED
+
+// Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+//
+// 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,
+// as published by the Free Software Foundation.
+//
+// This program is also distributed with certain software (including
+// but not limited to OpenSSL) that is licensed under separate terms,
+// as designated in a particular file or component or in included license
+// documentation.  The authors of MySQL hereby grant you an additional
+// permission to link the program and your derivative works with the
+// separately licensed software that they have included with MySQL.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License, version 2.0, for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA.
+
+/// @file
+///
+/// This file declares the intersection functor interface.
+///
+/// The functor is not intended for use directly by MySQL code. It should be
+/// used indirectly through the gis::intersection() function.
+///
+/// @see gis::intersection
+
+#include <boost/geometry.hpp>
+
+#include "sql/gis/functor.h"
+#include "sql/gis/geometries.h"
+#include "sql/gis/geometries_traits.h"
+
+namespace gis {
+
+/// Intersection functor that calls Boost.Geometry with the correct parameter
+/// types.
+///
+/// The functor throws exceptions and is therefore only intended used to
+/// implement intersection or other geographic functions. It should not be used
+/// directly by other MySQL code.
+class Intersection : public Functor<std::unique_ptr<Geometry>> {
+ private:
+  /// Semi-major axis of ellipsoid.
+  double m_semi_major;
+  /// Semi-minor axis of ellipsoid.
+  double m_semi_minor;
+  /// Strategy used for P/L and P/A.
+  boost::geometry::strategy::within::geographic_winding<Geographic_point>
+      m_geographic_pl_pa_strategy;
+  /// Strategy used for L/L, L/A and A/A.
+  boost::geometry::strategy::intersection::geographic_segments<>
+      m_geographic_ll_la_aa_strategy;
+
+ public:
+  Intersection(double semi_major, double semi_minor);
+  double semi_minor() const { return m_semi_minor; }
+  double semi_major() const { return m_semi_major; }
+  std::unique_ptr<Geometry> operator()(const Geometry *g1,
+                                       const Geometry *g2) const override;
+  std::unique_ptr<Geometry> eval(const Geometry *g1, const Geometry *g2) const;
+
+  //////////////////////////////////////////////////////////////////////////////
+
+  // intersection(Cartesian_point, *)
+
+  std::unique_ptr<Geometry> eval(const Cartesian_point *g1,
+                                 const Cartesian_point *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_point *g1,
+                                 const Cartesian_linestring *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_point *g1,
+                                 const Cartesian_polygon *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_point *g1,
+                                 const Cartesian_multipoint *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_point *g1,
+                                 const Cartesian_multilinestring *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_point *g1,
+                                 const Cartesian_multipolygon *g2) const;
+
+  //////////////////////////////////////////////////////////////////////////////
+
+  // intersection(Cartesian_linestring, *)
+
+  std::unique_ptr<Geometry> eval(const Cartesian_linestring *g1,
+                                 const Cartesian_point *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_linestring *g1,
+                                 const Cartesian_linestring *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_linestring *g1,
+                                 const Cartesian_polygon *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_linestring *g1,
+                                 const Cartesian_multipoint *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_linestring *g1,
+                                 const Cartesian_multilinestring *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_linestring *g1,
+                                 const Cartesian_multipolygon *g2) const;
+
+  //////////////////////////////////////////////////////////////////////////////
+
+  // intersection(Cartesian_polygon, *)
+
+  std::unique_ptr<Geometry> eval(const Cartesian_polygon *g1,
+                                 const Cartesian_point *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_polygon *g1,
+                                 const Cartesian_linestring *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_polygon *g1,
+                                 const Cartesian_polygon *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_polygon *g1,
+                                 const Cartesian_multipoint *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_polygon *g1,
+                                 const Cartesian_multilinestring *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_polygon *g1,
+                                 const Cartesian_multipolygon *g2) const;
+
+  //////////////////////////////////////////////////////////////////////////////
+
+  // intersection(Cartesian_geometrycollection, *)
+
+  std::unique_ptr<Geometry> eval(const Cartesian_geometrycollection *g1,
+                                 const Geometry *g2) const;
+  std::unique_ptr<Geometry> eval(const Geometry *g1,
+                                 const Cartesian_geometrycollection *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_geometrycollection *g1,
+                                 const Cartesian_geometrycollection *g2) const;
+
+  //////////////////////////////////////////////////////////////////////////////
+
+  // intersection(Cartesian_multipoint, *)
+
+  std::unique_ptr<Geometry> eval(const Cartesian_multipoint *g1,
+                                 const Cartesian_point *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_multipoint *g1,
+                                 const Cartesian_linestring *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_multipoint *g1,
+                                 const Cartesian_polygon *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_multipoint *g1,
+                                 const Cartesian_multipoint *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_multipoint *g1,
+                                 const Cartesian_multilinestring *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_multipoint *g1,
+                                 const Cartesian_multipolygon *g2) const;
+
+  //////////////////////////////////////////////////////////////////////////////
+
+  // intersection(Cartesian_multilinestring, *)
+
+  std::unique_ptr<Geometry> eval(const Cartesian_multilinestring *g1,
+                                 const Cartesian_point *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_multilinestring *g1,
+                                 const Cartesian_linestring *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_multilinestring *g1,
+                                 const Cartesian_polygon *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_multilinestring *g1,
+                                 const Cartesian_multipoint *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_multilinestring *g1,
+                                 const Cartesian_multilinestring *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_multilinestring *g1,
+                                 const Cartesian_multipolygon *g2) const;
+
+  //////////////////////////////////////////////////////////////////////////////
+
+  // intersection(Cartesian_multipolygon, *)
+
+  std::unique_ptr<Geometry> eval(const Cartesian_multipolygon *g1,
+                                 const Cartesian_point *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_multipolygon *g1,
+                                 const Cartesian_linestring *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_multipolygon *g1,
+                                 const Cartesian_polygon *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_multipolygon *g1,
+                                 const Cartesian_multipoint *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_multipolygon *g1,
+                                 const Cartesian_multilinestring *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_multipolygon *g1,
+                                 const Cartesian_multipolygon *g2) const;
+
+  //////////////////////////////////////////////////////////////////////////////
+
+  // intersection(Geographic_point, *)
+
+  std::unique_ptr<Geometry> eval(const Geographic_point *g1,
+                                 const Geographic_point *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_point *g1,
+                                 const Geographic_linestring *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_point *g1,
+                                 const Geographic_polygon *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_point *g1,
+                                 const Geographic_multipoint *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_point *g1,
+                                 const Geographic_multilinestring *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_point *g1,
+                                 const Geographic_multipolygon *g2) const;
+
+  //////////////////////////////////////////////////////////////////////////////
+
+  // intersection(Geographic_linestring, *)
+
+  std::unique_ptr<Geometry> eval(const Geographic_linestring *g1,
+                                 const Geographic_point *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_linestring *g1,
+                                 const Geographic_linestring *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_linestring *g1,
+                                 const Geographic_polygon *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_linestring *g1,
+                                 const Geographic_multipoint *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_linestring *g1,
+                                 const Geographic_multilinestring *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_linestring *g1,
+                                 const Geographic_multipolygon *g2) const;
+
+  //////////////////////////////////////////////////////////////////////////////
+
+  // intersection(Geographic_polygon, *)
+
+  std::unique_ptr<Geometry> eval(const Geographic_polygon *g1,
+                                 const Geographic_point *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_polygon *g1,
+                                 const Geographic_linestring *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_polygon *g1,
+                                 const Geographic_polygon *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_polygon *g1,
+                                 const Geographic_multipoint *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_polygon *g1,
+                                 const Geographic_multilinestring *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_polygon *g1,
+                                 const Geographic_multipolygon *g2) const;
+
+  //////////////////////////////////////////////////////////////////////////////
+
+  // intersection(Geographic_geometrycollection, *)
+
+  std::unique_ptr<Geometry> eval(const Geographic_geometrycollection *g1,
+                                 const Geographic_geometrycollection *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_geometrycollection *g1,
+                                 const Geometry *g2) const;
+  std::unique_ptr<Geometry> eval(const Geometry *g1,
+                                 const Geographic_geometrycollection *g2) const;
+
+  //////////////////////////////////////////////////////////////////////////////
+
+  // intersection(Geographic_multipoint, *)
+
+  std::unique_ptr<Geometry> eval(const Geographic_multipoint *g1,
+                                 const Geographic_point *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_multipoint *g1,
+                                 const Geographic_linestring *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_multipoint *g1,
+                                 const Geographic_polygon *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_multipoint *g1,
+                                 const Geographic_multipoint *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_multipoint *g1,
+                                 const Geographic_multilinestring *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_multipoint *g1,
+                                 const Geographic_multipolygon *g2) const;
+
+  //////////////////////////////////////////////////////////////////////////////
+
+  // intersection(Geographic_multilinestring, *)
+
+  std::unique_ptr<Geometry> eval(const Geographic_multilinestring *g1,
+                                 const Geographic_point *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_multilinestring *g1,
+                                 const Geographic_linestring *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_multilinestring *g1,
+                                 const Geographic_polygon *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_multilinestring *g1,
+                                 const Geographic_multipoint *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_multilinestring *g1,
+                                 const Geographic_multilinestring *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_multilinestring *g1,
+                                 const Geographic_multipolygon *g2) const;
+
+  //////////////////////////////////////////////////////////////////////////////
+
+  // intersection(Geographic_multipolygon, *)
+
+  std::unique_ptr<Geometry> eval(const Geographic_multipolygon *g1,
+                                 const Geographic_point *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_multipolygon *g1,
+                                 const Geographic_linestring *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_multipolygon *g1,
+                                 const Geographic_polygon *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_multipolygon *g1,
+                                 const Geographic_multipoint *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_multipolygon *g1,
+                                 const Geographic_multilinestring *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_multipolygon *g1,
+                                 const Geographic_multipolygon *g2) const;
+};
+
+}  // namespace gis
+
+#endif  // SQL_GIS_INTERSECTION_FUNCTOR_H_INCLUDED
diff -Nru mysql-8.0-8.0.26/sql/gis/mbr_utils.cc mysql-8.0-8.0.27/sql/gis/mbr_utils.cc
--- mysql-8.0-8.0.26/sql/gis/mbr_utils.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/gis/mbr_utils.cc	2021-09-28 11:46:34.000000000 +0000
@@ -149,7 +149,7 @@
             break;
           case Geometry_type::kGeometry:
             assert(false);
-            throw new std::exception();
+            throw std::exception();
         }
 
         // Cartesian_boxxes around empty geometries contain NaN in all
@@ -172,7 +172,7 @@
       break;
     case Geometry_type::kGeometry:
       assert(false);
-      throw new std::exception();
+      throw std::exception();
       break;
   }
 }
@@ -234,7 +234,7 @@
             break;
           case Geometry_type::kGeometry:
             assert(false);
-            throw new std::exception();
+            throw std::exception();
         }
 
         // Geographic_boxxes around empty geometries contain NaN in all
@@ -259,7 +259,7 @@
       break;
     case Geometry_type::kGeometry:
       assert(false);
-      throw new std::exception();
+      throw std::exception();
       break;
   }
 }
diff -Nru mysql-8.0-8.0.26/sql/gis/rtree_support.cc mysql-8.0-8.0.27/sql/gis/rtree_support.cc
--- mysql-8.0-8.0.26/sql/gis/rtree_support.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/gis/rtree_support.cc	2021-09-28 11:46:34.000000000 +0000
@@ -257,7 +257,7 @@
 }
 
 void mbr_join(const dd::Spatial_reference_system *srs, double *a,
-              const double *b, int n_dim MY_ATTRIBUTE((unused))) {
+              const double *b, int n_dim [[maybe_unused]]) {
   assert(n_dim == 2);
 
   try {
@@ -291,7 +291,7 @@
 }
 
 double mbr_join_area(const dd::Spatial_reference_system *srs, const double *a,
-                     const double *b, int n_dim MY_ATTRIBUTE((unused))) {
+                     const double *b, int n_dim [[maybe_unused]]) {
   assert(n_dim == 2);
 
   double area = 0.0;
@@ -325,7 +325,7 @@
 }
 
 double compute_area(const dd::Spatial_reference_system *srs, const double *a,
-                    int n_dim MY_ATTRIBUTE((unused))) {
+                    int n_dim [[maybe_unused]]) {
   assert(n_dim == 2);
 
   double area = 0.0;
@@ -352,7 +352,7 @@
 
 int get_mbr_from_store(const dd::Spatial_reference_system *srs,
                        const uchar *store, uint size,
-                       uint n_dims MY_ATTRIBUTE((unused)), double *mbr,
+                       uint n_dims [[maybe_unused]], double *mbr,
                        gis::srid_t *srid) {
   assert(n_dims == 2);
   // The SRS should match the SRID of the geometry, with one exception: For
@@ -419,8 +419,7 @@
 
 double rtree_area_increase(const dd::Spatial_reference_system *srs,
                            const uchar *mbr_a, const uchar *mbr_b,
-                           int mbr_len MY_ATTRIBUTE((unused)),
-                           double *ab_area) {
+                           int mbr_len [[maybe_unused]], double *ab_area) {
   assert(mbr_len == sizeof(double) * 4);
 
   double a_xmin = float8get(mbr_a);
@@ -476,7 +475,7 @@
 
 double rtree_area_overlapping(const dd::Spatial_reference_system *srs,
                               const uchar *mbr_a, const uchar *mbr_b,
-                              int mbr_len MY_ATTRIBUTE((unused))) {
+                              int mbr_len [[maybe_unused]]) {
   assert(mbr_len == sizeof(double) * 4);
 
   double a_xmin = float8get(mbr_a);
diff -Nru mysql-8.0-8.0.26/sql/gis/setops.h mysql-8.0-8.0.27/sql/gis/setops.h
--- mysql-8.0-8.0.26/sql/gis/setops.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/gis/setops.h	2021-09-28 11:46:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2020, Oracle and/or its affiliates.
+/* Copyright (c) 2020, 2021, Oracle 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,
@@ -51,6 +51,21 @@
                 const Geometry *g2, const char *func_name,
                 std::unique_ptr<Geometry> *result) noexcept;
 
+/// Finds the symdifference between two geometries.
+///
+/// @param[in] srs The spatial reference system.
+/// @param[in] g1 Input geometry.
+/// @param[in] g2 Input geometry.
+/// @param[in] func_name Function name used in error reporting.
+/// @param[out] result Result.
+///
+/// @retval false Success.
+/// @retval true An error has occured. The error has been reported with
+/// my_error().
+bool symdifference(const dd::Spatial_reference_system *srs, const Geometry *g1,
+                   const Geometry *g2, const char *func_name,
+                   std::unique_ptr<Geometry> *result) noexcept;
+
 /// Finds the union of two geometries.
 ///
 /// @param[in] srs The spatial reference system.
@@ -67,6 +82,21 @@
             const Geometry *g2, const char *func_name,
             std::unique_ptr<Geometry> *result, bool *result_null) noexcept;
 
+/// Finds the intersection between two geometries.
+///
+/// @param[in] srs The spatial reference system.
+/// @param[in] g1 Input geometry.
+/// @param[in] g2 Input geometry.
+/// @param[in] func_name Function name used in error reporting.
+/// @param[out] result Result.
+///
+/// @retval false Success.
+/// @retval true An error has occured. The error has been reported with
+/// my_error().
+bool intersection(const dd::Spatial_reference_system *srs, const Geometry *g1,
+                  const Geometry *g2, const char *func_name,
+                  std::unique_ptr<Geometry> *result) noexcept;
+
 }  // namespace gis
 
 #endif  // SQL_GIS_SETOPS_H_INCLUDED
diff -Nru mysql-8.0-8.0.26/sql/gis/so_utils.cc mysql-8.0-8.0.27/sql/gis/so_utils.cc
--- mysql-8.0-8.0.26/sql/gis/so_utils.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/gis/so_utils.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1,4 +1,4 @@
-// Copyright (c) 2020, Oracle and/or its affiliates.
+// Copyright (c) 2020, 2021, Oracle 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,
@@ -26,9 +26,6 @@
 /// (union, intersection, difference, symdifference).
 
 #include "sql/gis/so_utils.h"
-
-#include <boost/geometry.hpp>  // boost::geometry::equals
-
 #include "sql/gis/equals_functor.h"
 #include "sql/gis/geometries.h"
 #include "sql/gis/geometries_cs.h"
@@ -94,6 +91,7 @@
     case Geometry_type::kGeometrycollection: {
       std::unique_ptr<GC> gc = std::make_unique<GC>();
       for (auto g1 : *down_cast<GC *>(g->get())) {
+        if (g1->is_empty()) continue;
         std::unique_ptr<Geometry> g1_ptr(g1->clone());
         typed_remove_duplicates<MPt, MLs, MPy, GC>(semi_major, semi_minor,
                                                    &g1_ptr);
diff -Nru mysql-8.0-8.0.26/sql/gis/symdifference.cc mysql-8.0-8.0.27/sql/gis/symdifference.cc
--- mysql-8.0-8.0.26/sql/gis/symdifference.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/gis/symdifference.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,65 @@
+// Copyright (c) 2021, Oracle 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,
+// as published by the Free Software Foundation.
+//
+// This program is also distributed with certain software (including
+// but not limited to OpenSSL) that is licensed under separate terms,
+// as designated in a particular file or component or in included license
+// documentation.  The authors of MySQL hereby grant you an additional
+// permission to link the program and your derivative works with the
+// separately licensed software that they have included with MySQL.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License, version 2.0, for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA.
+
+/// @file
+///
+/// This file implements the symdifference function.
+
+#include <memory>  // std::unique_ptr
+
+#include "sql/gis/setops.h"
+#include "sql/gis/symdifference_functor.h"
+#include "sql/sql_exception_handler.h"  // handle_gis_exception
+
+namespace gis {
+
+bool symdifference(const dd::Spatial_reference_system *srs, const Geometry *g1,
+                   const Geometry *g2, const char *func_name,
+                   std::unique_ptr<Geometry> *result) noexcept {
+  try {
+    assert(g1 && g2 && g1->coordinate_system() == g2->coordinate_system());
+    assert(((srs == nullptr || srs->is_cartesian()) &&
+            g1->coordinate_system() == Coordinate_system::kCartesian) ||
+           (srs && srs->is_geographic() &&
+            g1->coordinate_system() == Coordinate_system::kGeographic));
+
+    SymDifference symdifference_func(srs ? srs->semi_major_axis() : 0.0,
+                                     srs ? srs->semi_minor_axis() : 0.0);
+    *result = symdifference_func(g1, g2);
+
+    if (result->get()->type() != Geometry_type::kGeometrycollection &&
+        result->get()->is_empty()) {
+      if (result->get()->coordinate_system() == Coordinate_system::kCartesian) {
+        *result = std::make_unique<Cartesian_geometrycollection>();
+      } else {
+        *result = std::make_unique<Geographic_geometrycollection>();
+      }
+    }
+
+  } catch (...) {
+    handle_gis_exception(func_name);
+    return true;
+  }
+  return false;
+}
+
+}  // namespace gis
diff -Nru mysql-8.0-8.0.26/sql/gis/symdifference_functor.cc mysql-8.0-8.0.27/sql/gis/symdifference_functor.cc
--- mysql-8.0-8.0.26/sql/gis/symdifference_functor.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/gis/symdifference_functor.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,893 @@
+// Copyright (c) 2021, Oracle 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,
+// as published by the Free Software Foundation.
+//
+// This program is also distributed with certain software (including
+// but not limited to OpenSSL) that is licensed under separate terms,
+// as designated in a particular file or component or in included license
+// documentation.  The authors of MySQL hereby grant you an additional
+// permission to link the program and your derivative works with the
+// separately licensed software that they have included with MySQL.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License, version 2.0, for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA.
+
+/// @file
+///
+/// This file implements the symdifference functor.
+
+#include <memory>  // std::unique_ptr
+
+#include <boost/geometry.hpp>
+
+#include "sql/gis/gc_utils.h"
+#include "sql/gis/geometries.h"
+#include "sql/gis/geometries_traits.h"
+#include "sql/gis/so_utils.h"
+#include "sql/gis/symdifference_functor.h"
+
+namespace bg = boost::geometry;
+
+namespace gis {
+
+template <typename PointLike, typename Geometry,
+          typename std::enable_if_t<
+              std::is_same<PointLike, Cartesian_point>::value ||
+              std::is_same<PointLike, Cartesian_multipoint>::value> * = nullptr>
+bool call_bg_disjoint(const PointLike &g1, const Geometry &g2,
+                      const SymDifference &) {
+  return bg::disjoint(g1, g2);
+}
+
+template <
+    typename PointLike, typename Geometry,
+    typename std::enable_if_t<
+        std::is_same<PointLike, Geographic_point>::value ||
+        std::is_same<PointLike, Geographic_multipoint>::value> * = nullptr>
+bool call_bg_disjoint(const PointLike &g1, const Geometry &g2,
+                      const SymDifference &f) {
+  return bg::disjoint(g1, g2, f.get_pl_pa_strategy());
+}
+
+template <typename MultipointOrLinear, typename Geometry, typename GeometryOut,
+          typename std::enable_if_t<
+              std::is_same<MultipointOrLinear, Cartesian_linestring>::value ||
+              std::is_same<MultipointOrLinear, Cartesian_multipoint>::value ||
+              std::is_same<MultipointOrLinear,
+                           Cartesian_multilinestring>::value> * = nullptr>
+void call_bg_difference(const MultipointOrLinear &g1, const Geometry &g2,
+                        GeometryOut &gout, const SymDifference &) {
+  bg::difference(g1, g2, gout);
+}
+
+template <typename Geometry, typename GeometryOut>
+void call_bg_difference(const Geographic_multipoint &g1, const Geometry &g2,
+                        GeometryOut &gout, const SymDifference &f) {
+  bg::difference(g1, g2, gout, f.get_pl_pa_strategy());
+}
+
+template <
+    typename Linear, typename Geometry, typename GeometryOut,
+    typename std::enable_if_t<
+        std::is_same<Linear, Geographic_linestring>::value ||
+        std::is_same<Linear, Geographic_multilinestring>::value> * = nullptr>
+void call_bg_difference(const Linear &g1, const Geometry &g2, GeometryOut &gout,
+                        const SymDifference &f) {
+  bg::difference(g1, g2, gout, f.get_ll_la_aa_strategy());
+}
+
+template <typename MultiPointType, typename Geometry1, typename Geometry2>
+static auto symdifference_pointlike_pointlike(Geometry1 g1, Geometry2 g2) {
+  std::unique_ptr<MultiPointType> result = std::make_unique<MultiPointType>();
+  std::unique_ptr<MultiPointType> result_union =
+      std::make_unique<MultiPointType>();
+  std::unique_ptr<MultiPointType> result_intersection =
+      std::make_unique<MultiPointType>();
+  bg::union_(*g1, *g2, *result_union);
+  bg::intersection(*g1, *g2, *result_intersection);
+  bg::difference(*result_union, *result_intersection, *result);
+  return result;
+}
+
+template <typename GCType, typename Geometry1, typename Geometry2>
+static auto symdifference_multipoint_linear_or_areal(const SymDifference &f,
+                                                     Geometry1 g1,
+                                                     Geometry2 g2) {
+  std::unique_ptr<GCType> result = std::make_unique<GCType>();
+  if (!g2->is_empty()) result->push_back(*g2);
+  for (auto p : *g1) {
+    if (call_bg_disjoint(p, *g2, f)) result->push_back(p);
+  }
+  return result;
+}
+
+template <typename GCType, typename Geometry1, typename Geometry2>
+static auto symdifference_point_linear_or_areal(const SymDifference &f,
+                                                Geometry1 g1, Geometry2 g2) {
+  std::unique_ptr<GCType> result = std::make_unique<GCType>();
+  if (!g2->is_empty()) result->push_back(*g2);
+  if (call_bg_disjoint(*g1, *g2, f)) result->push_back(*g1);
+  return result;
+}
+
+template <typename MlsType, typename GCType, typename Linear, typename Areal>
+static auto symdifference_linear_areal(const SymDifference &f, Linear g1,
+                                       Areal g2) {
+  std::unique_ptr<MlsType> difference = std::make_unique<MlsType>();
+  call_bg_difference(*g1, *g2, *difference, f);
+  std::unique_ptr<GCType> result = std::make_unique<GCType>();
+  if (!g2->is_empty()) result->push_back(*g2);
+  for (auto ls : *difference) result->push_back(ls);
+  return result;
+}
+
+template <typename MptType, typename MlsType, typename MpyType, typename PtMpt,
+          typename GC>
+std::unique_ptr<Geometry> symdifference_pointlike_geomcol(
+    const SymDifference &f, PtMpt g1, GC *g2) {
+  if (g2->is_empty())
+    return std::make_unique<typename std::decay<decltype(*g1)>::type>(*g1);
+  std::unique_ptr<Multipoint> mpt;
+  std::unique_ptr<Multilinestring> mls;
+  std::unique_ptr<Multipolygon> mpy;
+  split_gc(g2, &mpt, &mls, &mpy);
+  gc_union(f.semi_major(), f.semi_minor(), &mpt, &mls, &mpy);
+
+  std::unique_ptr<MptType> mpt_typed =
+      std::make_unique<MptType>(*down_cast<MptType *>(mpt.get()));
+
+  using GCType = typename std::decay<decltype(*g2)>::type;
+  std::unique_ptr<GCType> result = std::make_unique<GCType>();
+
+  std::unique_ptr<MptType> mpt_result =
+      symdifference_pointlike_pointlike<MptType>(g1, mpt_typed.get());
+
+  std::unique_ptr<MptType> mls_result = std::make_unique<MptType>();
+  call_bg_difference(*mpt_result, *down_cast<MlsType *>(mls.get()), *mls_result,
+                     f);
+
+  std::unique_ptr<MptType> mpy_result = std::make_unique<MptType>();
+  call_bg_difference(*mls_result, *down_cast<MpyType *>(mpy.get()), *mpy_result,
+                     f);
+
+  if (!mpy_result->is_empty()) result->push_back(*mpy_result);
+  if (!mls->is_empty()) result->push_back(*mls);
+  if (!mpy->is_empty()) result->push_back(*mpy);
+
+  return result;
+}
+
+template <typename MptType, typename MlsType, typename MpyType, typename Linear,
+          typename GC>
+std::unique_ptr<Geometry> symdifference_linear_geomcol(const SymDifference &f,
+                                                       Linear g1, GC *g2) {
+  if (g2->is_empty())
+    return std::make_unique<typename std::decay<decltype(*g1)>::type>(*g1);
+  std::unique_ptr<Multipoint> mpt;
+  std::unique_ptr<Multilinestring> mls;
+  std::unique_ptr<Multipolygon> mpy;
+  split_gc(g2, &mpt, &mls, &mpy);
+  gc_union(f.semi_major(), f.semi_minor(), &mpt, &mls, &mpy);
+
+  using GCType = typename std::decay<decltype(*g2)>::type;
+  std::unique_ptr<GCType> result = std::make_unique<GCType>();
+
+  if (!mpy->is_empty()) result->push_back(*mpy);
+
+  std::unique_ptr<MlsType> mls_result = std::make_unique<MlsType>();
+  call_bg_difference(*g1, *down_cast<MpyType *>(mpy.get()), *mls_result, f);
+
+  auto mls_symdiff_result = f(mls.get(), mls_result.get());
+  if (!mls_symdiff_result->is_empty()) result->push_back(*mls_symdiff_result);
+
+  std::unique_ptr<MptType> mpt_result = std::make_unique<MptType>();
+  call_bg_difference(*down_cast<MptType *>(mpt.get()), *g1, *mpt_result, f);
+  if (!mpt_result->is_empty()) result->push_back(*mpt_result);
+
+  return result;
+}
+
+template <typename MptType, typename MlsType, typename Areal, typename GC>
+std::unique_ptr<Geometry> symdifference_areal_geomcol(const SymDifference &f,
+                                                      Areal g1, GC *g2) {
+  if (g2->is_empty())
+    return std::make_unique<typename std::decay<decltype(*g1)>::type>(*g1);
+  std::unique_ptr<Multipoint> mpt;
+  std::unique_ptr<Multilinestring> mls;
+  std::unique_ptr<Multipolygon> mpy;
+  split_gc(g2, &mpt, &mls, &mpy);
+  gc_union(f.semi_major(), f.semi_minor(), &mpt, &mls, &mpy);
+
+  using GCType = typename std::decay<decltype(*g2)>::type;
+  std::unique_ptr<GCType> result = std::make_unique<GCType>();
+
+  auto mpy_result = f(g1, mpy.get());
+  if (!mpy_result->is_empty()) result->push_back(*mpy_result);
+
+  std::unique_ptr<MlsType> mls_result = std::make_unique<MlsType>();
+
+  call_bg_difference(*down_cast<MlsType *>(mls.get()), *g1, *mls_result, f);
+  if (!mls_result->is_empty()) result->push_back(*mls_result);
+
+  std::unique_ptr<MptType> mpt_result = std::make_unique<MptType>();
+  call_bg_difference(*down_cast<MptType *>(mpt.get()), *g1, *mpt_result, f);
+  if (!mpt_result->is_empty()) result->push_back(*mpt_result);
+
+  return result;
+}
+
+SymDifference::SymDifference(double semi_major, double semi_minor)
+    : m_semi_major(semi_major),
+      m_semi_minor(semi_minor),
+      m_geographic_pl_pa_strategy(
+          bg::srs::spheroid<double>(semi_major, semi_minor)),
+      m_geographic_ll_la_aa_strategy(
+          bg::srs::spheroid<double>(semi_major, semi_minor)) {}
+
+std::unique_ptr<Geometry> SymDifference::operator()(const Geometry *g1,
+                                                    const Geometry *g2) const {
+  std::unique_ptr<Geometry> result = apply(*this, g1, g2);
+  if (!result->is_empty()) {
+    remove_duplicates(this->semi_major(), this->semi_minor(), &result);
+    narrow_geometry(&result);
+  }
+  return result;
+}
+
+std::unique_ptr<Geometry> SymDifference::eval(const Geometry *g1,
+                                              const Geometry *g2) const {
+  assert(false);
+  throw not_implemented_exception::for_non_projected(*g1, *g2);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+// symdifference(Cartesian_point, *)
+
+std::unique_ptr<Cartesian_multipoint> SymDifference::eval(
+    const Cartesian_point *g1, const Cartesian_point *g2) const {
+  return symdifference_pointlike_pointlike<Cartesian_multipoint>(g1, g2);
+}
+
+std::unique_ptr<Cartesian_geometrycollection> SymDifference::eval(
+    const Cartesian_point *g1, const Cartesian_linestring *g2) const {
+  return symdifference_point_linear_or_areal<Cartesian_geometrycollection>(
+      *this, g1, g2);
+}
+
+std::unique_ptr<Cartesian_geometrycollection> SymDifference::eval(
+    const Cartesian_point *g1, const Cartesian_polygon *g2) const {
+  return symdifference_point_linear_or_areal<Cartesian_geometrycollection>(
+      *this, g1, g2);
+}
+
+std::unique_ptr<Cartesian_multipoint> SymDifference::eval(
+    const Cartesian_point *g1, const Cartesian_multipoint *g2) const {
+  return symdifference_pointlike_pointlike<Cartesian_multipoint>(g1, g2);
+}
+
+std::unique_ptr<Cartesian_geometrycollection> SymDifference::eval(
+    const Cartesian_point *g1, const Cartesian_multilinestring *g2) const {
+  return symdifference_point_linear_or_areal<Cartesian_geometrycollection>(
+      *this, g1, g2);
+}
+
+std::unique_ptr<Cartesian_geometrycollection> SymDifference::eval(
+    const Cartesian_point *g1, const Cartesian_multipolygon *g2) const {
+  return symdifference_point_linear_or_areal<Cartesian_geometrycollection>(
+      *this, g1, g2);
+}
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Cartesian_point *g1, const Cartesian_geometrycollection *g2) const {
+  return symdifference_pointlike_geomcol<
+      Cartesian_multipoint, Cartesian_multilinestring, Cartesian_multipolygon>(
+      *this, g1, g2);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+// symdifference(Cartesian_linestring, *)
+
+std::unique_ptr<Geometry> SymDifference::eval(const Cartesian_linestring *g1,
+                                              const Cartesian_point *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Cartesian_multilinestring> SymDifference::eval(
+    const Cartesian_linestring *g1, const Cartesian_linestring *g2) const {
+  std::unique_ptr<Cartesian_multilinestring> result =
+      std::make_unique<Cartesian_multilinestring>();
+  bg::sym_difference(*g1, *g2, *result);
+  return result;
+}
+
+std::unique_ptr<Cartesian_geometrycollection> SymDifference::eval(
+    const Cartesian_linestring *g1, const Cartesian_polygon *g2) const {
+  return symdifference_linear_areal<Cartesian_multilinestring,
+                                    Cartesian_geometrycollection>(*this, g1,
+                                                                  g2);
+}
+
+std::unique_ptr<Cartesian_geometrycollection> SymDifference::eval(
+    const Cartesian_linestring *g1, const Cartesian_multipoint *g2) const {
+  return symdifference_multipoint_linear_or_areal<Cartesian_geometrycollection>(
+      *this, g2, g1);
+}
+
+std::unique_ptr<Cartesian_multilinestring> SymDifference::eval(
+    const Cartesian_linestring *g1, const Cartesian_multilinestring *g2) const {
+  std::unique_ptr<Cartesian_multilinestring> result =
+      std::make_unique<Cartesian_multilinestring>();
+  bg::sym_difference(*g1, *g2, *result);
+  return result;
+}
+
+std::unique_ptr<Cartesian_geometrycollection> SymDifference::eval(
+    const Cartesian_linestring *g1, const Cartesian_multipolygon *g2) const {
+  return symdifference_linear_areal<Cartesian_multilinestring,
+                                    Cartesian_geometrycollection>(*this, g1,
+                                                                  g2);
+}
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Cartesian_linestring *g1,
+    const Cartesian_geometrycollection *g2) const {
+  return symdifference_linear_geomcol<
+      Cartesian_multipoint, Cartesian_multilinestring, Cartesian_multipolygon>(
+      *this, g1, g2);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+// symdifference(Cartesian_polygon, *)
+
+std::unique_ptr<Geometry> SymDifference::eval(const Cartesian_polygon *g1,
+                                              const Cartesian_point *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Cartesian_polygon *g1, const Cartesian_linestring *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Cartesian_multipolygon> SymDifference::eval(
+    const Cartesian_polygon *g1, const Cartesian_polygon *g2) const {
+  std::unique_ptr<Cartesian_multipolygon> result =
+      std::make_unique<Cartesian_multipolygon>();
+  bg::sym_difference(*g1, *g2, *result);
+  return result;
+}
+
+std::unique_ptr<Cartesian_geometrycollection> SymDifference::eval(
+    const Cartesian_polygon *g1, const Cartesian_multipoint *g2) const {
+  return symdifference_multipoint_linear_or_areal<Cartesian_geometrycollection>(
+      *this, g2, g1);
+}
+
+std::unique_ptr<Cartesian_geometrycollection> SymDifference::eval(
+    const Cartesian_polygon *g1, const Cartesian_multilinestring *g2) const {
+  return symdifference_linear_areal<Cartesian_multilinestring,
+                                    Cartesian_geometrycollection>(*this, g2,
+                                                                  g1);
+}
+
+std::unique_ptr<Cartesian_multipolygon> SymDifference::eval(
+    const Cartesian_polygon *g1, const Cartesian_multipolygon *g2) const {
+  std::unique_ptr<Cartesian_multipolygon> result =
+      std::make_unique<Cartesian_multipolygon>();
+  bg::sym_difference(*g1, *g2, *result);
+  return result;
+}
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Cartesian_polygon *g1, const Cartesian_geometrycollection *g2) const {
+  return symdifference_areal_geomcol<Cartesian_multipoint,
+                                     Cartesian_multilinestring>(*this, g1, g2);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+// symdifference(Cartesian_geometrycollection, *)
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Cartesian_geometrycollection *g1,
+    const Cartesian_geometrycollection *g2) const {
+  if (g1->is_empty()) {
+    if (g2->is_empty()) {
+      return std::make_unique<Cartesian_geometrycollection>();
+    }
+    return std::make_unique<Cartesian_geometrycollection>(*g2);
+  }
+
+  std::unique_ptr<Multipoint> mpt;
+  std::unique_ptr<Multilinestring> mls;
+  std::unique_ptr<Multipolygon> mpy;
+  split_gc(g1, &mpt, &mls, &mpy);
+  gc_union(this->semi_major(), this->semi_minor(), &mpt, &mls, &mpy);
+
+  auto mpy_result = (*this)(mpy.get(), g2);
+  auto mls_result = (*this)(mls.get(), mpy_result.get());
+  auto mpt_result = (*this)(mpt.get(), mls_result.get());
+
+  return mpt_result;
+}
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Cartesian_geometrycollection *g1, const Geometry *g2) const {
+  return (*this)(g2, g1);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+// symdifference(Cartesian_multipoint, *)
+
+std::unique_ptr<Geometry> SymDifference::eval(const Cartesian_multipoint *g1,
+                                              const Cartesian_point *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Cartesian_multipoint *g1, const Cartesian_linestring *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Cartesian_multipoint *g1, const Cartesian_polygon *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Cartesian_multipoint> SymDifference::eval(
+    const Cartesian_multipoint *g1, const Cartesian_multipoint *g2) const {
+  return symdifference_pointlike_pointlike<Cartesian_multipoint>(g1, g2);
+}
+
+std::unique_ptr<Cartesian_geometrycollection> SymDifference::eval(
+    const Cartesian_multipoint *g1, const Cartesian_multilinestring *g2) const {
+  return symdifference_multipoint_linear_or_areal<Cartesian_geometrycollection>(
+      *this, g1, g2);
+}
+
+std::unique_ptr<Cartesian_geometrycollection> SymDifference::eval(
+    const Cartesian_multipoint *g1, const Cartesian_multipolygon *g2) const {
+  return symdifference_multipoint_linear_or_areal<Cartesian_geometrycollection>(
+      *this, g1, g2);
+}
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Cartesian_multipoint *g1,
+    const Cartesian_geometrycollection *g2) const {
+  return symdifference_pointlike_geomcol<
+      Cartesian_multipoint, Cartesian_multilinestring, Cartesian_multipolygon>(
+      *this, g1, g2);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+// symdifference(Cartesian_multilinestring, *)
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Cartesian_multilinestring *g1, const Cartesian_point *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Cartesian_multilinestring *g1, const Cartesian_linestring *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Cartesian_multilinestring *g1, const Cartesian_polygon *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Cartesian_multilinestring *g1, const Cartesian_multipoint *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Cartesian_multilinestring> SymDifference::eval(
+    const Cartesian_multilinestring *g1,
+    const Cartesian_multilinestring *g2) const {
+  std::unique_ptr<Cartesian_multilinestring> result(
+      new Cartesian_multilinestring());
+  bg::sym_difference(*g1, *g2, *result);
+  return result;
+}
+
+std::unique_ptr<Cartesian_geometrycollection> SymDifference::eval(
+    const Cartesian_multilinestring *g1,
+    const Cartesian_multipolygon *g2) const {
+  return symdifference_linear_areal<Cartesian_multilinestring,
+                                    Cartesian_geometrycollection>(*this, g1,
+                                                                  g2);
+}
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Cartesian_multilinestring *g1,
+    const Cartesian_geometrycollection *g2) const {
+  return symdifference_linear_geomcol<
+      Cartesian_multipoint, Cartesian_multilinestring, Cartesian_multipolygon>(
+      *this, g1, g2);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+// symdifference(Cartesian_multipolygon, *)
+
+std::unique_ptr<Geometry> SymDifference::eval(const Cartesian_multipolygon *g1,
+                                              const Cartesian_point *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Cartesian_multipolygon *g1, const Cartesian_linestring *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Cartesian_multipolygon *g1, const Cartesian_polygon *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Cartesian_multipolygon *g1, const Cartesian_multipoint *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Cartesian_multipolygon *g1,
+    const Cartesian_multilinestring *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Cartesian_multipolygon> SymDifference::eval(
+    const Cartesian_multipolygon *g1, const Cartesian_multipolygon *g2) const {
+  std::unique_ptr<Cartesian_multipolygon> result =
+      std::make_unique<Cartesian_multipolygon>();
+  bg::sym_difference(*g1, *g2, *result);
+  return result;
+}
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Cartesian_multipolygon *g1,
+    const Cartesian_geometrycollection *g2) const {
+  return symdifference_areal_geomcol<Cartesian_multipoint,
+                                     Cartesian_multilinestring>(*this, g1, g2);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+// symdifference(Geographic_point, *)
+
+std::unique_ptr<Geographic_multipoint> SymDifference::eval(
+    const Geographic_point *g1, const Geographic_point *g2) const {
+  return symdifference_pointlike_pointlike<Geographic_multipoint>(g1, g2);
+}
+
+std::unique_ptr<Geographic_geometrycollection> SymDifference::eval(
+    const Geographic_point *g1, const Geographic_linestring *g2) const {
+  return symdifference_point_linear_or_areal<Geographic_geometrycollection>(
+      *this, g1, g2);
+}
+
+std::unique_ptr<Geographic_geometrycollection> SymDifference::eval(
+    const Geographic_point *g1, const Geographic_polygon *g2) const {
+  return symdifference_point_linear_or_areal<Geographic_geometrycollection>(
+      *this, g1, g2);
+}
+
+std::unique_ptr<Geographic_multipoint> SymDifference::eval(
+    const Geographic_point *g1, const Geographic_multipoint *g2) const {
+  return symdifference_pointlike_pointlike<Geographic_multipoint>(g1, g2);
+}
+
+std::unique_ptr<Geographic_geometrycollection> SymDifference::eval(
+    const Geographic_point *g1, const Geographic_multilinestring *g2) const {
+  return symdifference_point_linear_or_areal<Geographic_geometrycollection>(
+      *this, g1, g2);
+}
+
+std::unique_ptr<Geographic_geometrycollection> SymDifference::eval(
+    const Geographic_point *g1, const Geographic_multipolygon *g2) const {
+  return symdifference_point_linear_or_areal<Geographic_geometrycollection>(
+      *this, g1, g2);
+}
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Geographic_point *g1, const Geographic_geometrycollection *g2) const {
+  return symdifference_pointlike_geomcol<Geographic_multipoint,
+                                         Geographic_multilinestring,
+                                         Geographic_multipolygon>(*this, g1,
+                                                                  g2);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+// symdifference(Geographic_linestring, *)
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Geographic_linestring *g1, const Geographic_point *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geographic_multilinestring> SymDifference::eval(
+    const Geographic_linestring *g1, const Geographic_linestring *g2) const {
+  std::unique_ptr<Geographic_multilinestring> result =
+      std::make_unique<Geographic_multilinestring>();
+  bg::sym_difference(*g1, *g2, *result, m_geographic_ll_la_aa_strategy);
+  return result;
+}
+
+std::unique_ptr<Geographic_geometrycollection> SymDifference::eval(
+    const Geographic_linestring *g1, const Geographic_polygon *g2) const {
+  return symdifference_linear_areal<Geographic_multilinestring,
+                                    Geographic_geometrycollection>(*this, g1,
+                                                                   g2);
+}
+
+std::unique_ptr<Geographic_geometrycollection> SymDifference::eval(
+    const Geographic_linestring *g1, const Geographic_multipoint *g2) const {
+  return symdifference_multipoint_linear_or_areal<
+      Geographic_geometrycollection>(*this, g2, g1);
+}
+
+std::unique_ptr<Geographic_multilinestring> SymDifference::eval(
+    const Geographic_linestring *g1,
+    const Geographic_multilinestring *g2) const {
+  std::unique_ptr<Geographic_multilinestring> result =
+      std::make_unique<Geographic_multilinestring>();
+  bg::sym_difference(*g1, *g2, *result, m_geographic_ll_la_aa_strategy);
+  return result;
+}
+
+std::unique_ptr<Geographic_geometrycollection> SymDifference::eval(
+    const Geographic_linestring *g1, const Geographic_multipolygon *g2) const {
+  return symdifference_linear_areal<Geographic_multilinestring,
+                                    Geographic_geometrycollection>(*this, g1,
+                                                                   g2);
+}
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Geographic_linestring *g1,
+    const Geographic_geometrycollection *g2) const {
+  return symdifference_linear_geomcol<Geographic_multipoint,
+                                      Geographic_multilinestring,
+                                      Geographic_multipolygon>(*this, g1, g2);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+// symdifference(Geographic_polygon, *)
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Geographic_polygon *g1, const Geographic_point *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Geographic_polygon *g1, const Geographic_linestring *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geographic_multipolygon> SymDifference::eval(
+    const Geographic_polygon *g1, const Geographic_polygon *g2) const {
+  std::unique_ptr<Geographic_multipolygon> result =
+      std::make_unique<Geographic_multipolygon>();
+  bg::sym_difference(*g1, *g2, *result, m_geographic_ll_la_aa_strategy);
+  return result;
+}
+
+std::unique_ptr<Geographic_geometrycollection> SymDifference::eval(
+    const Geographic_polygon *g1, const Geographic_multipoint *g2) const {
+  return symdifference_multipoint_linear_or_areal<
+      Geographic_geometrycollection>(*this, g2, g1);
+}
+
+std::unique_ptr<Geographic_geometrycollection> SymDifference::eval(
+    const Geographic_polygon *g1, const Geographic_multilinestring *g2) const {
+  return symdifference_linear_areal<Geographic_multilinestring,
+                                    Geographic_geometrycollection>(*this, g2,
+                                                                   g1);
+}
+
+std::unique_ptr<Geographic_multipolygon> SymDifference::eval(
+    const Geographic_polygon *g1, const Geographic_multipolygon *g2) const {
+  std::unique_ptr<Geographic_multipolygon> result =
+      std::make_unique<Geographic_multipolygon>();
+  bg::sym_difference(*g1, *g2, *result, m_geographic_ll_la_aa_strategy);
+  return result;
+}
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Geographic_polygon *g1,
+    const Geographic_geometrycollection *g2) const {
+  return symdifference_areal_geomcol<Geographic_multipoint,
+                                     Geographic_multilinestring>(*this, g1, g2);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+// symdifference(Geographic_geometrycollection, *)
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Geographic_geometrycollection *g1,
+    const Geographic_geometrycollection *g2) const {
+  if (g1->is_empty()) {
+    if (g2->is_empty()) {
+      return std::make_unique<Geographic_geometrycollection>();
+    }
+    return std::make_unique<Geographic_geometrycollection>(*g2);
+  }
+
+  std::unique_ptr<Multipoint> mpt;
+  std::unique_ptr<Multilinestring> mls;
+  std::unique_ptr<Multipolygon> mpy;
+  split_gc(g1, &mpt, &mls, &mpy);
+  gc_union(this->semi_major(), this->semi_minor(), &mpt, &mls, &mpy);
+
+  auto mpy_result = (*this)(mpy.get(), g2);
+  auto mls_result = (*this)(mls.get(), mpy_result.get());
+  auto mpt_result = (*this)(mpt.get(), mls_result.get());
+
+  return mpt_result;
+}
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Geographic_geometrycollection *g1, const Geometry *g2) const {
+  return (*this)(g2, g1);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+// symdifference(Geographic_multipoint, *)
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Geographic_multipoint *g1, const Geographic_point *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Geographic_multipoint *g1, const Geographic_linestring *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Geographic_multipoint *g1, const Geographic_polygon *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geographic_multipoint> SymDifference::eval(
+    const Geographic_multipoint *g1, const Geographic_multipoint *g2) const {
+  return symdifference_pointlike_pointlike<Geographic_multipoint>(g1, g2);
+}
+
+std::unique_ptr<Geographic_geometrycollection> SymDifference::eval(
+    const Geographic_multipoint *g1,
+    const Geographic_multilinestring *g2) const {
+  return symdifference_multipoint_linear_or_areal<
+      Geographic_geometrycollection>(*this, g1, g2);
+}
+
+std::unique_ptr<Geographic_geometrycollection> SymDifference::eval(
+    const Geographic_multipoint *g1, const Geographic_multipolygon *g2) const {
+  return symdifference_multipoint_linear_or_areal<
+      Geographic_geometrycollection>(*this, g1, g2);
+}
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Geographic_multipoint *g1,
+    const Geographic_geometrycollection *g2) const {
+  return symdifference_pointlike_geomcol<Geographic_multipoint,
+                                         Geographic_multilinestring,
+                                         Geographic_multipolygon>(*this, g1,
+                                                                  g2);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+// symdifference(Geographic_multilinestring, *)
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Geographic_multilinestring *g1, const Geographic_point *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Geographic_multilinestring *g1,
+    const Geographic_linestring *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Geographic_multilinestring *g1, const Geographic_polygon *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Geographic_multilinestring *g1,
+    const Geographic_multipoint *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geographic_multilinestring> SymDifference::eval(
+    const Geographic_multilinestring *g1,
+    const Geographic_multilinestring *g2) const {
+  std::unique_ptr<Geographic_multilinestring> result(
+      new Geographic_multilinestring());
+  bg::sym_difference(*g1, *g2, *result, m_geographic_ll_la_aa_strategy);
+  return result;
+}
+
+std::unique_ptr<Geographic_geometrycollection> SymDifference::eval(
+    const Geographic_multilinestring *g1,
+    const Geographic_multipolygon *g2) const {
+  return symdifference_linear_areal<Geographic_multilinestring,
+                                    Geographic_geometrycollection>(*this, g1,
+                                                                   g2);
+}
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Geographic_multilinestring *g1,
+    const Geographic_geometrycollection *g2) const {
+  return symdifference_linear_geomcol<Geographic_multipoint,
+                                      Geographic_multilinestring,
+                                      Geographic_multipolygon>(*this, g1, g2);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+// symdifference(Geographic_multipolygon, *)
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Geographic_multipolygon *g1, const Geographic_point *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Geographic_multipolygon *g1, const Geographic_linestring *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Geographic_multipolygon *g1, const Geographic_polygon *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Geographic_multipolygon *g1, const Geographic_multipoint *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Geographic_multipolygon *g1,
+    const Geographic_multilinestring *g2) const {
+  return (*this)(g2, g1);
+}
+
+std::unique_ptr<Geographic_multipolygon> SymDifference::eval(
+    const Geographic_multipolygon *g1,
+    const Geographic_multipolygon *g2) const {
+  std::unique_ptr<Geographic_multipolygon> result =
+      std::make_unique<Geographic_multipolygon>();
+  bg::sym_difference(*g1, *g2, *result, m_geographic_ll_la_aa_strategy);
+  return result;
+}
+
+std::unique_ptr<Geometry> SymDifference::eval(
+    const Geographic_multipolygon *g1,
+    const Geographic_geometrycollection *g2) const {
+  return symdifference_areal_geomcol<Geographic_multipoint,
+                                     Geographic_multilinestring>(*this, g1, g2);
+}
+
+}  // namespace gis
diff -Nru mysql-8.0-8.0.26/sql/gis/symdifference_functor.h mysql-8.0-8.0.27/sql/gis/symdifference_functor.h
--- mysql-8.0-8.0.26/sql/gis/symdifference_functor.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/gis/symdifference_functor.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,335 @@
+#ifndef SQL_GIS_SYMDIFFERENCE_FUNCTOR_H_INCLUDED
+#define SQL_GIS_SYMDIFFERENCE_FUNCTOR_H_INCLUDED
+
+// Copyright (c) 2021, Oracle 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,
+// as published by the Free Software Foundation.
+//
+// This program is also distributed with certain software (including
+// but not limited to OpenSSL) that is licensed under separate terms,
+// as designated in a particular file or component or in included license
+// documentation.  The authors of MySQL hereby grant you an additional
+// permission to link the program and your derivative works with the
+// separately licensed software that they have included with MySQL.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License, version 2.0, for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA.
+
+/// @file
+///
+/// This file declares the symdifference functor interface.
+///
+/// The functor is not intended for use directly by MySQL code. It should be
+/// used indirectly through the gis::symdifference() function.
+///
+/// @see gis::symdifference
+
+#include <boost/geometry.hpp>
+
+#include "sql/gis/functor.h"
+#include "sql/gis/geometries.h"
+#include "sql/gis/geometries_traits.h"
+
+namespace gis {
+
+/// SymDifference functor that calls Boost.Geometry with the correct parameter
+/// types.
+///
+/// The functor throws exceptions and is therefore only intended used to
+/// implement symdifference or other geographic functions. It should not be used
+/// directly by other MySQL code.
+class SymDifference : public Functor<std::unique_ptr<Geometry>> {
+ private:
+  /// Semi-major axis of ellipsoid.
+  double m_semi_major;
+  /// Semi-minor axis of ellipsoid.
+  double m_semi_minor;
+  /// Strategy used for P/L and P/A.
+  boost::geometry::strategy::within::geographic_winding<>
+      m_geographic_pl_pa_strategy;
+  /// Strategy used for L/L, L/A and A/A.
+  boost::geometry::strategy::intersection::geographic_segments<>
+      m_geographic_ll_la_aa_strategy;
+
+ public:
+  SymDifference(double semi_major, double semi_minor);
+  double semi_minor() const { return m_semi_minor; }
+  double semi_major() const { return m_semi_major; }
+  auto get_pl_pa_strategy() const { return m_geographic_pl_pa_strategy; }
+  boost::geometry::strategy::intersection::geographic_segments<>
+  get_ll_la_aa_strategy() const {
+    return m_geographic_ll_la_aa_strategy;
+  }
+  std::unique_ptr<Geometry> operator()(const Geometry *g1,
+                                       const Geometry *g2) const override;
+  std::unique_ptr<Geometry> eval(const Geometry *g1, const Geometry *g2) const;
+
+  //////////////////////////////////////////////////////////////////////////////
+
+  // symdifference(Cartesian_point, *)
+
+  std::unique_ptr<Cartesian_multipoint> eval(const Cartesian_point *g1,
+                                             const Cartesian_point *g2) const;
+  std::unique_ptr<Cartesian_geometrycollection> eval(
+      const Cartesian_point *g1, const Cartesian_linestring *g2) const;
+  std::unique_ptr<Cartesian_geometrycollection> eval(
+      const Cartesian_point *g1, const Cartesian_polygon *g2) const;
+  std::unique_ptr<Cartesian_multipoint> eval(
+      const Cartesian_point *g1, const Cartesian_multipoint *g2) const;
+  std::unique_ptr<Cartesian_geometrycollection> eval(
+      const Cartesian_point *g1, const Cartesian_multilinestring *g2) const;
+  std::unique_ptr<Cartesian_geometrycollection> eval(
+      const Cartesian_point *g1, const Cartesian_multipolygon *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_point *g1,
+                                 const Cartesian_geometrycollection *g2) const;
+
+  //////////////////////////////////////////////////////////////////////////////
+
+  // symdifference(Cartesian_linestring, *)
+
+  std::unique_ptr<Geometry> eval(const Cartesian_linestring *g1,
+                                 const Cartesian_point *g2) const;
+  std::unique_ptr<Cartesian_multilinestring> eval(
+      const Cartesian_linestring *g1, const Cartesian_linestring *g2) const;
+  std::unique_ptr<Cartesian_geometrycollection> eval(
+      const Cartesian_linestring *g1, const Cartesian_polygon *g2) const;
+  std::unique_ptr<Cartesian_geometrycollection> eval(
+      const Cartesian_linestring *g1, const Cartesian_multipoint *g2) const;
+  std::unique_ptr<Cartesian_multilinestring> eval(
+      const Cartesian_linestring *g1,
+      const Cartesian_multilinestring *g2) const;
+  std::unique_ptr<Cartesian_geometrycollection> eval(
+      const Cartesian_linestring *g1, const Cartesian_multipolygon *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_linestring *g1,
+                                 const Cartesian_geometrycollection *g2) const;
+
+  //////////////////////////////////////////////////////////////////////////////
+
+  // symdifference(Cartesian_polygon, *)
+
+  std::unique_ptr<Geometry> eval(const Cartesian_polygon *g1,
+                                 const Cartesian_point *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_polygon *g1,
+                                 const Cartesian_linestring *g2) const;
+  std::unique_ptr<Cartesian_multipolygon> eval(
+      const Cartesian_polygon *g1, const Cartesian_polygon *g2) const;
+  std::unique_ptr<Cartesian_geometrycollection> eval(
+      const Cartesian_polygon *g1, const Cartesian_multipoint *g2) const;
+  std::unique_ptr<Cartesian_geometrycollection> eval(
+      const Cartesian_polygon *g1, const Cartesian_multilinestring *g2) const;
+  std::unique_ptr<Cartesian_multipolygon> eval(
+      const Cartesian_polygon *g1, const Cartesian_multipolygon *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_polygon *g1,
+                                 const Cartesian_geometrycollection *g2) const;
+
+  //////////////////////////////////////////////////////////////////////////////
+
+  // symdifference(Cartesian_geometrycollection, *)
+
+  std::unique_ptr<Geometry> eval(const Cartesian_geometrycollection *g1,
+                                 const Cartesian_geometrycollection *g2) const;
+
+  std::unique_ptr<Geometry> eval(const Cartesian_geometrycollection *g1,
+                                 const Geometry *g2) const;
+
+  //////////////////////////////////////////////////////////////////////////////
+
+  // symdifference(Cartesian_multipoint, *)
+
+  std::unique_ptr<Geometry> eval(const Cartesian_multipoint *g1,
+                                 const Cartesian_point *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_multipoint *g1,
+                                 const Cartesian_linestring *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_multipoint *g1,
+                                 const Cartesian_polygon *g2) const;
+  std::unique_ptr<Cartesian_multipoint> eval(
+      const Cartesian_multipoint *g1, const Cartesian_multipoint *g2) const;
+  std::unique_ptr<Cartesian_geometrycollection> eval(
+      const Cartesian_multipoint *g1,
+      const Cartesian_multilinestring *g2) const;
+  std::unique_ptr<Cartesian_geometrycollection> eval(
+      const Cartesian_multipoint *g1, const Cartesian_multipolygon *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_multipoint *g1,
+                                 const Cartesian_geometrycollection *g2) const;
+
+  //////////////////////////////////////////////////////////////////////////////
+
+  // symdifference(Cartesian_multilinestring, *)
+
+  std::unique_ptr<Geometry> eval(const Cartesian_multilinestring *g1,
+                                 const Cartesian_point *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_multilinestring *g1,
+                                 const Cartesian_linestring *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_multilinestring *g1,
+                                 const Cartesian_polygon *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_multilinestring *g1,
+                                 const Cartesian_multipoint *g2) const;
+  std::unique_ptr<Cartesian_multilinestring> eval(
+      const Cartesian_multilinestring *g1,
+      const Cartesian_multilinestring *g2) const;
+  std::unique_ptr<Cartesian_geometrycollection> eval(
+      const Cartesian_multilinestring *g1,
+      const Cartesian_multipolygon *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_multilinestring *g1,
+                                 const Cartesian_geometrycollection *g2) const;
+
+  //////////////////////////////////////////////////////////////////////////////
+
+  // symdifference(Cartesian_multipolygon, *)
+
+  std::unique_ptr<Geometry> eval(const Cartesian_multipolygon *g1,
+                                 const Cartesian_point *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_multipolygon *g1,
+                                 const Cartesian_linestring *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_multipolygon *g1,
+                                 const Cartesian_polygon *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_multipolygon *g1,
+                                 const Cartesian_multipoint *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_multipolygon *g1,
+                                 const Cartesian_multilinestring *g2) const;
+  std::unique_ptr<Cartesian_multipolygon> eval(
+      const Cartesian_multipolygon *g1, const Cartesian_multipolygon *g2) const;
+  std::unique_ptr<Geometry> eval(const Cartesian_multipolygon *g1,
+                                 const Cartesian_geometrycollection *g2) const;
+
+  //////////////////////////////////////////////////////////////////////////////
+
+  // symdifference(Geographic_point, *)
+
+  std::unique_ptr<Geographic_multipoint> eval(const Geographic_point *g1,
+                                              const Geographic_point *g2) const;
+  std::unique_ptr<Geographic_geometrycollection> eval(
+      const Geographic_point *g1, const Geographic_linestring *g2) const;
+  std::unique_ptr<Geographic_geometrycollection> eval(
+      const Geographic_point *g1, const Geographic_polygon *g2) const;
+  std::unique_ptr<Geographic_multipoint> eval(
+      const Geographic_point *g1, const Geographic_multipoint *g2) const;
+  std::unique_ptr<Geographic_geometrycollection> eval(
+      const Geographic_point *g1, const Geographic_multilinestring *g2) const;
+  std::unique_ptr<Geographic_geometrycollection> eval(
+      const Geographic_point *g1, const Geographic_multipolygon *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_point *g1,
+                                 const Geographic_geometrycollection *g2) const;
+
+  //////////////////////////////////////////////////////////////////////////////
+
+  // symdifference(Geographic_linestring, *)
+
+  std::unique_ptr<Geometry> eval(const Geographic_linestring *g1,
+                                 const Geographic_point *g2) const;
+  std::unique_ptr<Geographic_multilinestring> eval(
+      const Geographic_linestring *g1, const Geographic_linestring *g2) const;
+  std::unique_ptr<Geographic_geometrycollection> eval(
+      const Geographic_linestring *g1, const Geographic_polygon *g2) const;
+  std::unique_ptr<Geographic_geometrycollection> eval(
+      const Geographic_linestring *g1, const Geographic_multipoint *g2) const;
+  std::unique_ptr<Geographic_multilinestring> eval(
+      const Geographic_linestring *g1,
+      const Geographic_multilinestring *g2) const;
+  std::unique_ptr<Geographic_geometrycollection> eval(
+      const Geographic_linestring *g1, const Geographic_multipolygon *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_linestring *g1,
+                                 const Geographic_geometrycollection *g2) const;
+
+  //////////////////////////////////////////////////////////////////////////////
+
+  // symdifference(Geographic_polygon, *)
+
+  std::unique_ptr<Geometry> eval(const Geographic_polygon *g1,
+                                 const Geographic_point *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_polygon *g1,
+                                 const Geographic_linestring *g2) const;
+  std::unique_ptr<Geographic_multipolygon> eval(
+      const Geographic_polygon *g1, const Geographic_polygon *g2) const;
+  std::unique_ptr<Geographic_geometrycollection> eval(
+      const Geographic_polygon *g1, const Geographic_multipoint *g2) const;
+  std::unique_ptr<Geographic_geometrycollection> eval(
+      const Geographic_polygon *g1, const Geographic_multilinestring *g2) const;
+  std::unique_ptr<Geographic_multipolygon> eval(
+      const Geographic_polygon *g1, const Geographic_multipolygon *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_polygon *g1,
+                                 const Geographic_geometrycollection *g2) const;
+
+  //////////////////////////////////////////////////////////////////////////////
+
+  // symdifference(Geographic_geometrycollection, *)
+
+  std::unique_ptr<Geometry> eval(const Geographic_geometrycollection *g1,
+                                 const Geographic_geometrycollection *g2) const;
+
+  std::unique_ptr<Geometry> eval(const Geographic_geometrycollection *g1,
+                                 const Geometry *g2) const;
+
+  //////////////////////////////////////////////////////////////////////////////
+
+  // symdifference(Geographic_multipoint, *)
+
+  std::unique_ptr<Geometry> eval(const Geographic_multipoint *g1,
+                                 const Geographic_point *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_multipoint *g1,
+                                 const Geographic_linestring *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_multipoint *g1,
+                                 const Geographic_polygon *g2) const;
+  std::unique_ptr<Geographic_multipoint> eval(
+      const Geographic_multipoint *g1, const Geographic_multipoint *g2) const;
+  std::unique_ptr<Geographic_geometrycollection> eval(
+      const Geographic_multipoint *g1,
+      const Geographic_multilinestring *g2) const;
+  std::unique_ptr<Geographic_geometrycollection> eval(
+      const Geographic_multipoint *g1, const Geographic_multipolygon *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_multipoint *g1,
+                                 const Geographic_geometrycollection *g2) const;
+
+  //////////////////////////////////////////////////////////////////////////////
+
+  // symdifference(Geographic_multilinestring, *)
+
+  std::unique_ptr<Geometry> eval(const Geographic_multilinestring *g1,
+                                 const Geographic_point *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_multilinestring *g1,
+                                 const Geographic_linestring *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_multilinestring *g1,
+                                 const Geographic_polygon *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_multilinestring *g1,
+                                 const Geographic_multipoint *g2) const;
+  std::unique_ptr<Geographic_multilinestring> eval(
+      const Geographic_multilinestring *g1,
+      const Geographic_multilinestring *g2) const;
+  std::unique_ptr<Geographic_geometrycollection> eval(
+      const Geographic_multilinestring *g1,
+      const Geographic_multipolygon *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_multilinestring *g1,
+                                 const Geographic_geometrycollection *g2) const;
+
+  //////////////////////////////////////////////////////////////////////////////
+
+  // symdifference(Geographic_multipolygon, *)
+
+  std::unique_ptr<Geometry> eval(const Geographic_multipolygon *g1,
+                                 const Geographic_point *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_multipolygon *g1,
+                                 const Geographic_linestring *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_multipolygon *g1,
+                                 const Geographic_polygon *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_multipolygon *g1,
+                                 const Geographic_multipoint *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_multipolygon *g1,
+                                 const Geographic_multilinestring *g2) const;
+  std::unique_ptr<Geographic_multipolygon> eval(
+      const Geographic_multipolygon *g1,
+      const Geographic_multipolygon *g2) const;
+  std::unique_ptr<Geometry> eval(const Geographic_multipolygon *g1,
+                                 const Geographic_geometrycollection *g2) const;
+};
+
+}  // namespace gis
+
+#endif  // SQL_GIS_SYMDIFFERENCE_FUNCTOR_H_INCLUDED
diff -Nru mysql-8.0-8.0.26/sql/handler.cc mysql-8.0-8.0.27/sql/handler.cc
--- mysql-8.0-8.0.26/sql/handler.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/handler.cc	2021-09-28 11:46:34.000000000 +0000
@@ -535,7 +535,7 @@
       if (db_type > DB_TYPE_UNKNOWN && db_type < DB_TYPE_DEFAULT &&
           (plugin = ha_lock_engine(thd, installed_htons[db_type])))
         return plugin_data<handlerton *>(plugin);
-      /* fall through */
+      [[fallthrough]];
     case DB_TYPE_UNKNOWN:
       return nullptr;
   }
@@ -828,7 +828,7 @@
       if (hton->prepare) total_ha_2pc++;
       break;
     }
-      /* fall through */
+      [[fallthrough]];
     default:
       hton->state = SHOW_OPTION_DISABLED;
       break;
@@ -1270,7 +1270,7 @@
 
 */
 void trans_register_ha(THD *thd, bool all, handlerton *ht_arg,
-                       const ulonglong *trxid MY_ATTRIBUTE((unused))) {
+                       const ulonglong *trxid [[maybe_unused]]) {
   Ha_trx_info *ha_info;
   Transaction_ctx *trn_ctx = thd->get_transaction();
   Transaction_ctx::enum_trx_scope trx_scope =
@@ -1310,15 +1310,15 @@
 
   trn_ctx->xid_state()->set_query_id(thd->query_id);
 /*
-  Register transaction start in performance schema if not done already.
-  By doing this, we handle cases when the transaction is started implicitly in
-  autocommit=0 mode, and cases when we are in normal autocommit=1 mode and the
-  executed statement is a single-statement transaction.
+        Register transaction start in performance schema if not done already.
+        By doing this, we handle cases when the transaction is started
+   implicitly in autocommit=0 mode, and cases when we are in normal autocommit=1
+   mode and the executed statement is a single-statement transaction.
 
-  Explicitly started transactions are handled in trans_begin().
+        Explicitly started transactions are handled in trans_begin().
 
-  Do not register transactions in which binary log is the only participating
-  transactional storage engine.
+        Do not register transactions in which binary log is the only
+   participating transactional storage engine.
 */
 #ifdef HAVE_PSI_TRANSACTION_INTERFACE
   if (thd->m_transaction_psi == nullptr && ht_arg->db_type != DB_TYPE_BINLOG &&
@@ -1617,7 +1617,12 @@
     enclosing 'all' transaction is rolled back.
   */
   bool is_real_trans = all || !trn_ctx->is_active(Transaction_ctx::SESSION);
-
+#ifndef NDEBUG
+  bool transaction_to_skip = false;
+  DBUG_EXECUTE_IF("replica_crash_after_commit", {
+    transaction_to_skip = is_already_logged_transaction(thd);
+  });
+#endif  // NDEBUG
   Ha_trx_info *ha_info = trn_ctx->ha_trx_info(trx_scope);
   XID_STATE *xid_state = trn_ctx->xid_state();
 
@@ -1763,8 +1768,8 @@
     goto end;
   }
 /*
-  Mark multi-statement (any autocommit mode) or single-statement
-  (autocommit=1) transaction as rolled back
+        Mark multi-statement (any autocommit mode) or single-statement
+        (autocommit=1) transaction as rolled back
 */
 #ifdef HAVE_PSI_TRANSACTION_INTERFACE
   if (is_real_trans && thd->m_transaction_psi != nullptr) {
@@ -1828,7 +1833,7 @@
           thd->rli_slave->current_event->get_type_code() ==
               binary_log::XID_EVENT &&
           !thd->is_operating_substatement_implicitly &&
-          !thd->is_operating_gtid_table_implicitly)
+          !thd->is_operating_gtid_table_implicitly && !transaction_to_skip)
         DBUG_SUICIDE();
     });
   }
@@ -3087,16 +3092,14 @@
   return result;
 }
 
-int handler::sample_init(void *&scan_ctx MY_ATTRIBUTE((unused)), double, int,
+int handler::sample_init(void *&scan_ctx [[maybe_unused]], double, int,
                          enum_sampling_method, const bool) {
   return rnd_init(true);
 }
 
-int handler::sample_end(void *scan_ctx MY_ATTRIBUTE((unused))) {
-  return rnd_end();
-}
+int handler::sample_end(void *scan_ctx [[maybe_unused]]) { return rnd_end(); }
 
-int handler::sample_next(void *scan_ctx MY_ATTRIBUTE((unused)), uchar *buf) {
+int handler::sample_next(void *scan_ctx [[maybe_unused]], uchar *buf) {
   // Temporary set inited to RND, since we are calling rnd_next().
   int res = rnd_next(buf);
 
@@ -3920,11 +3923,11 @@
   reserved to "positive infinite".
 */
 
-void handler::get_auto_increment(
-    ulonglong offset MY_ATTRIBUTE((unused)),
-    ulonglong increment MY_ATTRIBUTE((unused)),
-    ulonglong nb_desired_values MY_ATTRIBUTE((unused)), ulonglong *first_value,
-    ulonglong *nb_reserved_values) {
+void handler::get_auto_increment(ulonglong offset [[maybe_unused]],
+                                 ulonglong increment [[maybe_unused]],
+                                 ulonglong nb_desired_values [[maybe_unused]],
+                                 ulonglong *first_value,
+                                 ulonglong *nb_reserved_values) {
   ulonglong nr;
   int error;
   DBUG_TRACE;
@@ -4105,10 +4108,10 @@
   // Catch errors that are not fatal
   switch (error) {
     /*
-      Deadlock and lock timeout cause transaction/statement rollback so that
-      THD::is_fatal_sub_stmt_error will be set. This means that they will not
-      be possible to handle by stored program handlers inside stored functions
-      and triggers even if non-fatal.
+            Deadlock and lock timeout cause transaction/statement rollback so
+       that THD::is_fatal_sub_stmt_error will be set. This means that they will
+       not be possible to handle by stored program handlers inside stored
+       functions and triggers even if non-fatal.
     */
     case HA_ERR_LOCK_WAIT_TIMEOUT:
     case HA_ERR_LOCK_DEADLOCK:
@@ -4427,8 +4430,8 @@
   @return
     Returns true if this is a temporary error
 */
-bool handler::get_error_message(int error MY_ATTRIBUTE((unused)),
-                                String *buf MY_ATTRIBUTE((unused))) {
+bool handler::get_error_message(int error [[maybe_unused]],
+                                String *buf [[maybe_unused]]) {
   return false;
 }
 
@@ -4590,9 +4593,8 @@
 }
 
 int handler::rename_table(const char *from, const char *to,
-                          const dd::Table *from_table_def
-                              MY_ATTRIBUTE((unused)),
-                          dd::Table *to_table_def MY_ATTRIBUTE((unused))) {
+                          const dd::Table *from_table_def [[maybe_unused]],
+                          dd::Table *to_table_def [[maybe_unused]]) {
   int error = 0;
   const char **ext, **start_ext;
 
@@ -4889,8 +4891,7 @@
 */
 
 enum_alter_inplace_result handler::check_if_supported_inplace_alter(
-    TABLE *altered_table MY_ATTRIBUTE((unused)),
-    Alter_inplace_info *ha_alter_info) {
+    TABLE *altered_table [[maybe_unused]], Alter_inplace_info *ha_alter_info) {
   DBUG_TRACE;
 
   HA_CREATE_INFO *create_info = ha_alter_info->create_info;
@@ -5008,6 +5009,8 @@
 
 /**
  * Loads a table into its defined secondary storage engine: public interface.
+ * This call may downgrade the table lock. Do not make any assumptions on the
+ * MDL.
  *
  * @param table The table to load into the secondary engine. Its read_set tells
  * which columns to load.
@@ -5991,7 +5994,7 @@
 }
 
 Cost_estimate handler::index_scan_cost(uint index,
-                                       double ranges MY_ATTRIBUTE((unused)),
+                                       double ranges [[maybe_unused]],
                                        double rows) {
   /*
     This function returns a Cost_estimate object. The function should be
@@ -6092,10 +6095,11 @@
                   contain scan parameters.
 */
 
-ha_rows handler::multi_range_read_info_const(
-    uint keyno, RANGE_SEQ_IF *seq, void *seq_init_param,
-    uint n_ranges_arg MY_ATTRIBUTE((unused)), uint *bufsz, uint *flags,
-    Cost_estimate *cost) {
+ha_rows handler::multi_range_read_info_const(uint keyno, RANGE_SEQ_IF *seq,
+                                             void *seq_init_param,
+                                             uint n_ranges_arg [[maybe_unused]],
+                                             uint *bufsz, uint *flags,
+                                             Cost_estimate *cost) {
   KEY_MULTI_RANGE range;
   range_seq_t seq_it;
   ha_rows rows, total_rows = 0;
@@ -6298,7 +6302,7 @@
 int handler::multi_range_read_init(RANGE_SEQ_IF *seq_funcs,
                                    void *seq_init_param, uint n_ranges,
                                    uint mode,
-                                   HANDLER_BUFFER *buf MY_ATTRIBUTE((unused))) {
+                                   HANDLER_BUFFER *buf [[maybe_unused]]) {
   DBUG_TRACE;
   mrr_iter = seq_funcs->init(seq_init_param, n_ranges, mode);
   mrr_funcs = *seq_funcs;
@@ -6761,7 +6765,7 @@
 */
 ha_rows DsMrr_impl::dsmrr_info(uint keyno, uint n_ranges, uint rows,
                                uint *bufsz, uint *flags, Cost_estimate *cost) {
-  ha_rows res MY_ATTRIBUTE((unused));
+  ha_rows res [[maybe_unused]];
   uint def_flags = *flags;
   uint def_bufsz = *bufsz;
 
@@ -7202,7 +7206,7 @@
 */
 int handler::read_range_first(const key_range *start_key,
                               const key_range *end_key, bool eq_range_arg,
-                              bool sorted MY_ATTRIBUTE((unused))) {
+                              bool sorted [[maybe_unused]]) {
   int result;
   DBUG_TRACE;
 
diff -Nru mysql-8.0-8.0.26/sql/handler.h mysql-8.0-8.0.27/sql/handler.h
--- mysql-8.0-8.0.26/sql/handler.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/handler.h	2021-09-28 11:46:34.000000000 +0000
@@ -36,6 +36,7 @@
 #include <bitset>
 #include <functional>
 #include <map>
+#include <optional>
 #include <random>  // std::mt19937
 #include <set>
 #include <string>
@@ -58,7 +59,6 @@
 #include "my_table_map.h"
 #include "my_thread_local.h"  // my_errno
 #include "mysql/components/services/psi_table_bits.h"
-#include "nullable.h"          // Nullable
 #include "sql/dd/object_id.h"  // dd::Object_id
 #include "sql/dd/string_type.h"
 #include "sql/dd/types/object_table.h"  // dd::Object_table
@@ -863,7 +863,7 @@
   ulonglong undo_buffer_size = 8 * 1024 * 1024;  // Default 8 MByte
   ulonglong redo_buffer_size = 8 * 1024 * 1024;  // Default 8 MByte
   ulonglong initial_size = 128 * 1024 * 1024;    // Default 128 MByte
-  Mysql::Nullable<ulonglong> autoextend_size;    // No autoextension as default
+  std::optional<ulonglong> autoextend_size;      // No autoextension as default
   ulonglong max_size = 0;         // Max size == initial size => no extension
   ulonglong file_block_size = 0;  // 0=default or must be a valid Page Size
   uint nodegroup_id = UNDEF_NODEGROUP;
@@ -2897,8 +2897,8 @@
  public:
   inplace_alter_handler_ctx() = default;
 
-  virtual void set_shared_data(
-      const inplace_alter_handler_ctx *ctx MY_ATTRIBUTE((unused))) {}
+  virtual void set_shared_data(const inplace_alter_handler_ctx *ctx
+                               [[maybe_unused]]) {}
   virtual ~inplace_alter_handler_ctx() = default;
 };
 
@@ -3685,7 +3685,7 @@
   struct ft_hints hints;
 
  public:
-  Ft_hints(uint ft_flags) {
+  explicit Ft_hints(uint ft_flags) {
     hints.flags = ft_flags;
     hints.op_type = FT_OP_UNDEFINED;
     hints.op_value = 0.0;
@@ -3722,28 +3722,28 @@
 
     @return Ft_hints limit
   */
-  ha_rows get_limit() { return hints.limit; }
+  ha_rows get_limit() const { return hints.limit; }
 
   /**
     Get Ft_hints operation value.
 
     @return operation value
   */
-  double get_op_value() { return hints.op_value; }
+  double get_op_value() const { return hints.op_value; }
 
   /**
     Get Ft_hints operation type.
 
     @return operation type
   */
-  enum ft_operation get_op_type() { return hints.op_type; }
+  enum ft_operation get_op_type() const { return hints.op_type; }
 
   /**
     Get Ft_hints flags.
 
     @return Ft_hints flags
   */
-  uint get_flags() { return hints.flags; }
+  uint get_flags() const { return hints.flags; }
 
   /**
      Get ft_hints struct.
@@ -4536,10 +4536,9 @@
     @return error code
     @retval 0 on success
   */
-  virtual int parallel_scan_init(void *&scan_ctx MY_ATTRIBUTE((unused)),
-                                 size_t *num_threads MY_ATTRIBUTE((unused)),
-                                 bool use_reserved_threads
-                                     MY_ATTRIBUTE((unused))) {
+  virtual int parallel_scan_init(void *&scan_ctx [[maybe_unused]],
+                                 size_t *num_threads [[maybe_unused]],
+                                 bool use_reserved_threads [[maybe_unused]]) {
     return 0;
   }
 
@@ -4601,11 +4600,11 @@
     @return error code
     @retval 0 on success
   */
-  virtual int parallel_scan(void *scan_ctx MY_ATTRIBUTE((unused)),
-                            void **thread_ctxs MY_ATTRIBUTE((unused)),
-                            Load_init_cbk init_fn MY_ATTRIBUTE((unused)),
-                            Load_cbk load_fn MY_ATTRIBUTE((unused)),
-                            Load_end_cbk end_fn MY_ATTRIBUTE((unused))) {
+  virtual int parallel_scan(void *scan_ctx [[maybe_unused]],
+                            void **thread_ctxs [[maybe_unused]],
+                            Load_init_cbk init_fn [[maybe_unused]],
+                            Load_cbk load_fn [[maybe_unused]],
+                            Load_end_cbk end_fn [[maybe_unused]]) {
     return 0;
   }
 
@@ -4613,9 +4612,7 @@
     End of the parallel scan.
     @param[in]      scan_ctx      A scan context created by parallel_scan_init.
   */
-  virtual void parallel_scan_end(void *scan_ctx MY_ATTRIBUTE((unused))) {
-    return;
-  }
+  virtual void parallel_scan_end(void *scan_ctx [[maybe_unused]]) { return; }
 
   /**
     Submit a dd::Table object representing a core DD table having
@@ -4703,7 +4700,7 @@
     using an index by calling it using read_time(index, 1, table_size).
   */
 
-  virtual double read_time(uint index MY_ATTRIBUTE((unused)), uint ranges,
+  virtual double read_time(uint index [[maybe_unused]], uint ranges,
                            ha_rows rows) {
     return rows2double(ranges + rows);
   }
@@ -5046,7 +5043,7 @@
     @retval  0           Success
     @retval  >0          Error code
   */
-  virtual int exec_bulk_update(uint *dup_key_found MY_ATTRIBUTE((unused))) {
+  virtual int exec_bulk_update(uint *dup_key_found [[maybe_unused]]) {
     assert(false);
     return HA_ERR_WRONG_COMMAND;
   }
@@ -5139,9 +5136,9 @@
   int compare_key_icp(const key_range *range) const;
   int compare_key_in_buffer(const uchar *buf) const;
   virtual int ft_init() { return HA_ERR_WRONG_COMMAND; }
-  virtual FT_INFO *ft_init_ext(uint flags MY_ATTRIBUTE((unused)),
-                               uint inx MY_ATTRIBUTE((unused)),
-                               String *key MY_ATTRIBUTE((unused))) {
+  virtual FT_INFO *ft_init_ext(uint flags [[maybe_unused]],
+                               uint inx [[maybe_unused]],
+                               String *key [[maybe_unused]]) {
     return nullptr;
   }
   virtual FT_INFO *ft_init_ext_with_hints(uint inx, String *key,
@@ -5194,9 +5191,9 @@
     @return Number of rows in range.
   */
 
-  virtual ha_rows records_in_range(uint inx MY_ATTRIBUTE((unused)),
-                                   key_range *min_key MY_ATTRIBUTE((unused)),
-                                   key_range *max_key MY_ATTRIBUTE((unused))) {
+  virtual ha_rows records_in_range(uint inx [[maybe_unused]],
+                                   key_range *min_key [[maybe_unused]],
+                                   key_range *max_key [[maybe_unused]]) {
     return (ha_rows)10;
   }
   /*
@@ -5235,8 +5232,8 @@
   */
 
   virtual int info(uint flag) = 0;
-  virtual uint32 calculate_key_hash_value(
-      Field **field_array MY_ATTRIBUTE((unused))) {
+  virtual uint32 calculate_key_hash_value(Field **field_array
+                                          [[maybe_unused]]) {
     assert(0);
     return 0;
   }
@@ -5262,13 +5259,13 @@
       0     on success
       error otherwise
   */
-  virtual int extra(enum ha_extra_function operation MY_ATTRIBUTE((unused))) {
+  virtual int extra(enum ha_extra_function operation [[maybe_unused]]) {
     return 0;
   }
 
  public:
   virtual int extra_opt(enum ha_extra_function operation,
-                        ulong cache_size MY_ATTRIBUTE((unused))) {
+                        ulong cache_size [[maybe_unused]]) {
     return extra(operation);
   }
 
@@ -5289,7 +5286,7 @@
       0     on success
       error otherwise
   */
-  virtual int engine_push(AQP::Table_access *table MY_ATTRIBUTE((unused))) {
+  virtual int engine_push(AQP::Table_access *table [[maybe_unused]]) {
     return 0;
   }
 
@@ -5386,8 +5383,8 @@
     @retval    0                 Success.
   */
 
-  virtual int start_stmt(THD *thd MY_ATTRIBUTE((unused)),
-                         thr_lock_type lock_type MY_ATTRIBUTE((unused))) {
+  virtual int start_stmt(THD *thd [[maybe_unused]],
+                         thr_lock_type lock_type [[maybe_unused]]) {
     return 0;
   }
   virtual void get_auto_increment(ulonglong offset, ulonglong increment,
@@ -5424,8 +5421,8 @@
     @param    create_info         Create info from ALTER TABLE.
   */
 
-  virtual void update_create_info(
-      HA_CREATE_INFO *create_info MY_ATTRIBUTE((unused))) {}
+  virtual void update_create_info(HA_CREATE_INFO *create_info
+                                  [[maybe_unused]]) {}
   virtual int assign_to_keycache(THD *, HA_CHECK_OPT *) {
     return HA_ADMIN_NOT_IMPLEMENTED;
   }
@@ -5442,7 +5439,7 @@
   */
 
   virtual int indexes_are_disabled(void) { return 0; }
-  virtual void append_create_info(String *packet MY_ATTRIBUTE((unused))) {}
+  virtual void append_create_info(String *packet [[maybe_unused]]) {}
   virtual void init_table_handle_for_HANDLER() {
     return;
   } /* prepare InnoDB for HANDLER */
@@ -5471,11 +5468,11 @@
   virtual uint max_supported_keys() const { return 0; }
   virtual uint max_supported_key_parts() const { return MAX_REF_PARTS; }
   virtual uint max_supported_key_length() const { return MAX_KEY_LENGTH; }
-  virtual uint max_supported_key_part_length(
-      HA_CREATE_INFO *create_info MY_ATTRIBUTE((unused))) const {
+  virtual uint max_supported_key_part_length(HA_CREATE_INFO *create_info
+                                             [[maybe_unused]]) const {
     return 255;
   }
-  virtual uint min_record_length(uint options MY_ATTRIBUTE((unused))) const {
+  virtual uint min_record_length(uint options [[maybe_unused]]) const {
     return 1;
   }
 
@@ -5583,8 +5580,6 @@
 
     @param  cond          Condition to be pushed. The condition tree
                           must not be modified by the caller.
-    @param  other_tbls_ok Are other tables than than 'this' allowed to
-                          be referred by the condition terms being pushed.
 
     @return
       The 'remainder' condition that caller must use to filter out records.
@@ -5596,8 +5591,7 @@
     Calls to rnd_init/rnd_end, index_init/index_end etc do not affect the
     pushed conditions.
   */
-  virtual const Item *cond_push(const Item *cond,
-                                bool other_tbls_ok MY_ATTRIBUTE((unused))) {
+  virtual const Item *cond_push(const Item *cond) {
     assert(pushed_cond == nullptr);
     return cond;
   }
@@ -5627,8 +5621,7 @@
             not to evaluate
    */
 
-  virtual Item *idx_cond_push(uint keyno MY_ATTRIBUTE((unused)),
-                              Item *idx_cond) {
+  virtual Item *idx_cond_push(uint keyno [[maybe_unused]], Item *idx_cond) {
     return idx_cond;
   }
 
@@ -5677,9 +5670,9 @@
   /**
     Part of old, deprecated in-place ALTER API.
   */
-  virtual bool check_if_incompatible_data(
-      HA_CREATE_INFO *create_info MY_ATTRIBUTE((unused)),
-      uint table_changes MY_ATTRIBUTE((unused))) {
+  virtual bool check_if_incompatible_data(HA_CREATE_INFO *create_info
+                                          [[maybe_unused]],
+                                          uint table_changes [[maybe_unused]]) {
     return COMPATIBLE_DATA_NO;
   }
 
@@ -5928,10 +5921,10 @@
      @retval   false             Success
   */
   virtual bool prepare_inplace_alter_table(
-      TABLE *altered_table MY_ATTRIBUTE((unused)),
-      Alter_inplace_info *ha_alter_info MY_ATTRIBUTE((unused)),
-      const dd::Table *old_table_def MY_ATTRIBUTE((unused)),
-      dd::Table *new_table_def MY_ATTRIBUTE((unused))) {
+      TABLE *altered_table [[maybe_unused]],
+      Alter_inplace_info *ha_alter_info [[maybe_unused]],
+      const dd::Table *old_table_def [[maybe_unused]],
+      dd::Table *new_table_def [[maybe_unused]]) {
     return false;
   }
 
@@ -5964,11 +5957,12 @@
      @retval   true              Error
      @retval   false             Success
   */
-  virtual bool inplace_alter_table(
-      TABLE *altered_table MY_ATTRIBUTE((unused)),
-      Alter_inplace_info *ha_alter_info MY_ATTRIBUTE((unused)),
-      const dd::Table *old_table_def MY_ATTRIBUTE((unused)),
-      dd::Table *new_table_def MY_ATTRIBUTE((unused))) {
+  virtual bool inplace_alter_table(TABLE *altered_table [[maybe_unused]],
+                                   Alter_inplace_info *ha_alter_info
+                                   [[maybe_unused]],
+                                   const dd::Table *old_table_def
+                                   [[maybe_unused]],
+                                   dd::Table *new_table_def [[maybe_unused]]) {
     return false;
   }
 
@@ -6021,12 +6015,14 @@
      @retval   true              Error
      @retval   false             Success
   */
-  virtual bool commit_inplace_alter_table(
-      TABLE *altered_table MY_ATTRIBUTE((unused)),
-      Alter_inplace_info *ha_alter_info MY_ATTRIBUTE((unused)),
-      bool commit MY_ATTRIBUTE((unused)),
-      const dd::Table *old_table_def MY_ATTRIBUTE((unused)),
-      dd::Table *new_table_def MY_ATTRIBUTE((unused))) {
+  virtual bool commit_inplace_alter_table(TABLE *altered_table [[maybe_unused]],
+                                          Alter_inplace_info *ha_alter_info
+                                          [[maybe_unused]],
+                                          bool commit [[maybe_unused]],
+                                          const dd::Table *old_table_def
+                                          [[maybe_unused]],
+                                          dd::Table *new_table_def
+                                          [[maybe_unused]]) {
     /* Nothing to commit/rollback, mark all handlers committed! */
     ha_alter_info->group_commit_ctx = nullptr;
     return false;
@@ -6049,8 +6045,8 @@
            the old schema and table name in this method for some reason it
            has to use ha_alter_info object to figure it out.
   */
-  virtual void notify_table_changed(
-      Alter_inplace_info *ha_alter_info MY_ATTRIBUTE((unused))) {}
+  virtual void notify_table_changed(Alter_inplace_info *ha_alter_info
+                                    [[maybe_unused]]) {}
 
  public:
   /* End of On-line/in-place ALTER TABLE interface. */
@@ -6128,7 +6124,7 @@
   virtual int open(const char *name, int mode, uint test_if_locked,
                    const dd::Table *table_def) = 0;
   virtual int close(void) = 0;
-  virtual int index_init(uint idx, bool sorted MY_ATTRIBUTE((unused))) {
+  virtual int index_init(uint idx, bool sorted [[maybe_unused]]) {
     active_index = idx;
     return 0;
   }
@@ -6166,7 +6162,7 @@
       @retval    0  Success.
       @retval != 0  Error code.
   */
-  virtual int write_row(uchar *buf MY_ATTRIBUTE((unused))) {
+  virtual int write_row(uchar *buf [[maybe_unused]]) {
     return HA_ERR_WRONG_COMMAND;
   }
 
@@ -6178,12 +6174,12 @@
     the columns required for the error message are not read, the error
     message will contain garbage.
   */
-  virtual int update_row(const uchar *old_data MY_ATTRIBUTE((unused)),
-                         uchar *new_data MY_ATTRIBUTE((unused))) {
+  virtual int update_row(const uchar *old_data [[maybe_unused]],
+                         uchar *new_data [[maybe_unused]]) {
     return HA_ERR_WRONG_COMMAND;
   }
 
-  virtual int delete_row(const uchar *buf MY_ATTRIBUTE((unused))) {
+  virtual int delete_row(const uchar *buf [[maybe_unused]]) {
     return HA_ERR_WRONG_COMMAND;
   }
   /**
@@ -6227,8 +6223,8 @@
     @return  non-0 in case of failure, 0 in case of success.
     When lock_type is F_UNLCK, the return value is ignored.
   */
-  virtual int external_lock(THD *thd MY_ATTRIBUTE((unused)),
-                            int lock_type MY_ATTRIBUTE((unused))) {
+  virtual int external_lock(THD *thd [[maybe_unused]],
+                            int lock_type [[maybe_unused]]) {
     return 0;
   }
   virtual void release_auto_increment() { return; }
@@ -6270,10 +6266,10 @@
   }
 
   // Set se_private_id and se_private_data during upgrade
-  virtual bool upgrade_table(THD *thd MY_ATTRIBUTE((unused)),
-                             const char *dbname MY_ATTRIBUTE((unused)),
-                             const char *table_name MY_ATTRIBUTE((unused)),
-                             dd::Table *dd_table MY_ATTRIBUTE((unused))) {
+  virtual bool upgrade_table(THD *thd [[maybe_unused]],
+                             const char *dbname [[maybe_unused]],
+                             const char *table_name [[maybe_unused]],
+                             dd::Table *dd_table [[maybe_unused]]) {
     return false;
   }
 
@@ -6310,7 +6306,7 @@
    *
    * @return 0 if success, error code otherwise.
    */
-  virtual int load_table(const TABLE &table MY_ATTRIBUTE((unused))) {
+  virtual int load_table(const TABLE &table [[maybe_unused]]) {
     /* purecov: begin inspected */
     assert(false);
     return HA_ERR_WRONG_COMMAND;
@@ -6329,9 +6325,9 @@
    *                            should not prevent dropping the whole table.
    * @return 0 if success, error code otherwise.
    */
-  virtual int unload_table(const char *db_name MY_ATTRIBUTE((unused)),
-                           const char *table_name MY_ATTRIBUTE((unused)),
-                           bool error_if_not_loaded MY_ATTRIBUTE((unused))) {
+  virtual int unload_table(const char *db_name [[maybe_unused]],
+                           const char *table_name [[maybe_unused]],
+                           bool error_if_not_loaded [[maybe_unused]]) {
     /* purecov: begin inspected */
     assert(false);
     return HA_ERR_WRONG_COMMAND;
@@ -6339,16 +6335,15 @@
   }
 
  protected:
-  virtual int index_read(uchar *buf MY_ATTRIBUTE((unused)),
-                         const uchar *key MY_ATTRIBUTE((unused)),
-                         uint key_len MY_ATTRIBUTE((unused)),
-                         enum ha_rkey_function find_flag
-                             MY_ATTRIBUTE((unused))) {
+  virtual int index_read(uchar *buf [[maybe_unused]],
+                         const uchar *key [[maybe_unused]],
+                         uint key_len [[maybe_unused]],
+                         enum ha_rkey_function find_flag [[maybe_unused]]) {
     return HA_ERR_WRONG_COMMAND;
   }
-  virtual int index_read_last(uchar *buf MY_ATTRIBUTE((unused)),
-                              const uchar *key MY_ATTRIBUTE((unused)),
-                              uint key_len MY_ATTRIBUTE((unused))) {
+  virtual int index_read_last(uchar *buf [[maybe_unused]],
+                              const uchar *key [[maybe_unused]],
+                              uint key_len [[maybe_unused]]) {
     set_my_errno(HA_ERR_WRONG_COMMAND);
     return HA_ERR_WRONG_COMMAND;
   }
@@ -6370,9 +6365,9 @@
     @param    dup_key_found  Number of duplicate keys found
 
   */
-  virtual int bulk_update_row(const uchar *old_data MY_ATTRIBUTE((unused)),
-                              uchar *new_data MY_ATTRIBUTE((unused)),
-                              uint *dup_key_found MY_ATTRIBUTE((unused))) {
+  virtual int bulk_update_row(const uchar *old_data [[maybe_unused]],
+                              uchar *new_data [[maybe_unused]],
+                              uint *dup_key_found [[maybe_unused]]) {
     assert(false);
     return HA_ERR_WRONG_COMMAND;
   }
@@ -6422,7 +6417,7 @@
             to data-dictionary only if storage engine supports atomic DDL
             (i.e. has HTON_SUPPORTS_ATOMIC_DDL flag set).
   */
-  virtual int truncate(dd::Table *table_def MY_ATTRIBUTE((unused))) {
+  virtual int truncate(dd::Table *table_def [[maybe_unused]]) {
     return HA_ERR_WRONG_COMMAND;
   }
   virtual int optimize(THD *, HA_CHECK_OPT *) {
@@ -6443,9 +6438,7 @@
     @note Called if open_table_from_share fails and is_crashed().
   */
 
-  virtual bool check_and_repair(THD *thd MY_ATTRIBUTE((unused))) {
-    return true;
-  }
+  virtual bool check_and_repair(THD *thd [[maybe_unused]]) { return true; }
 
   /**
     Disable indexes for a while.
@@ -6456,7 +6449,7 @@
     @retval   != 0                      Error.
   */
 
-  virtual int disable_indexes(uint mode MY_ATTRIBUTE((unused))) {
+  virtual int disable_indexes(uint mode [[maybe_unused]]) {
     return HA_ERR_WRONG_COMMAND;
   }
 
@@ -6469,7 +6462,7 @@
     @retval   != 0                      Error.
   */
 
-  virtual int enable_indexes(uint mode MY_ATTRIBUTE((unused))) {
+  virtual int enable_indexes(uint mode [[maybe_unused]]) {
     return HA_ERR_WRONG_COMMAND;
   }
 
@@ -6488,9 +6481,9 @@
     @retval   != 0  Error.
   */
 
-  virtual int discard_or_import_tablespace(bool discard MY_ATTRIBUTE((unused)),
+  virtual int discard_or_import_tablespace(bool discard [[maybe_unused]],
                                            dd::Table *table_def
-                                               MY_ATTRIBUTE((unused))) {
+                                           [[maybe_unused]]) {
     set_my_errno(HA_ERR_WRONG_COMMAND);
     return HA_ERR_WRONG_COMMAND;
   }
@@ -6519,8 +6512,8 @@
   virtual int create(const char *name, TABLE *form, HA_CREATE_INFO *info,
                      dd::Table *table_def) = 0;
 
-  virtual bool get_se_private_data(dd::Table *dd_table MY_ATTRIBUTE((unused)),
-                                   bool reset MY_ATTRIBUTE((unused))) {
+  virtual bool get_se_private_data(dd::Table *dd_table [[maybe_unused]],
+                                   bool reset [[maybe_unused]]) {
     return false;
   }
 
@@ -6543,11 +6536,10 @@
     @retval  non-0  Error.
   */
   virtual int get_extra_columns_and_keys(
-      const HA_CREATE_INFO *create_info MY_ATTRIBUTE((unused)),
-      const List<Create_field> *create_list MY_ATTRIBUTE((unused)),
-      const KEY *key_info MY_ATTRIBUTE((unused)),
-      uint key_count MY_ATTRIBUTE((unused)),
-      dd::Table *table_obj MY_ATTRIBUTE((unused))) {
+      const HA_CREATE_INFO *create_info [[maybe_unused]],
+      const List<Create_field> *create_list [[maybe_unused]],
+      const KEY *key_info [[maybe_unused]], uint key_count [[maybe_unused]],
+      dd::Table *table_obj [[maybe_unused]]) {
     return 0;
   }
 
diff -Nru mysql-8.0-8.0.26/sql/hash_join_buffer.cc mysql-8.0-8.0.27/sql/hash_join_buffer.cc
--- mysql-8.0-8.0.26/sql/hash_join_buffer.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/hash_join_buffer.cc	2021-09-28 11:46:34.000000000 +0000
@@ -102,9 +102,9 @@
 // pointer for us.
 void LoadBufferRowIntoTableBuffers(const TableCollection &tables,
                                    BufferRow row) {
-  const uchar *end MY_ATTRIBUTE((unused)) =
-      LoadIntoTableBuffers(tables, row.data());
-  assert(end == row.data() + row.size());
+  const uchar *data = pointer_cast<const uchar *>(row.data());
+  const uchar *end [[maybe_unused]] = LoadIntoTableBuffers(tables, data);
+  assert(end == data + row.size());
 }
 
 void LoadImmutableStringIntoTableBuffers(const TableCollection &tables,
diff -Nru mysql-8.0-8.0.26/sql/hash_join_buffer.h mysql-8.0-8.0.27/sql/hash_join_buffer.h
--- mysql-8.0-8.0.26/sql/hash_join_buffer.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/hash_join_buffer.h	2021-09-28 11:46:34.000000000 +0000
@@ -42,8 +42,7 @@
 /// the hash table key will be the value found in "t2.key", since that is the
 /// join condition that belongs to t2. If we have multiple equalities, they
 /// will be concatenated together in order to form the hash table key. The hash
-/// table key is bascially an std::string_view, and should be replaced when we
-/// go to C++17.
+/// table key is a std::string_view.
 ///
 /// In order to store a row, we use the function StoreFromTableBuffers. See the
 /// comments attached to the function for more details.
@@ -105,32 +104,7 @@
 /// buffer, the data must have the same lifetime as the row buffer itself.
 /// When using the Key class for lookups in the row buffer, the same lifetime is
 /// not needed; the key object is only needed when the lookup is done.
-///
-/// When we move to C++17, this class should most likely be replaced with
-/// std::string_view.
-class Key {
- public:
-  /// Note that data can be nullptr if size is 0.
-  Key(const uchar *data, size_t size) : m_data(data), m_size(size) {}
-
-  bool operator==(const Key &other) const {
-    if (other.size() != size()) {
-      return false;
-    } else if (size() == 0) {
-      return true;
-    }
-
-    return memcmp(other.data(), data(), size()) == 0;
-  }
-
-  const uchar *data() const { return m_data; }
-
-  size_t size() const { return m_size; }
-
- private:
-  const uchar *m_data;
-  const size_t m_size;
-};
+using Key = std::string_view;
 
 class KeyEquals {
  public:
@@ -142,14 +116,7 @@
 
   bool operator()(const Key &str1,
                   const ImmutableStringWithLength &other) const {
-    ImmutableStringWithLength::Decoded str2 = other.Decode();
-    if (str1.size() != str2.size) {
-      return false;
-    } else if (str1.size() == 0) {
-      return true;
-    } else {
-      return memcmp(str1.data(), str2.data, str1.size()) == 0;
-    }
+    return str1 == other.Decode();
   }
 
   bool operator()(const ImmutableStringWithLength &str1,
@@ -158,9 +125,7 @@
   }
 };
 
-// A row in the hash join buffer is generally the same as the Key class. In
-// C++17, both of them should most likely be replaced with std::string_view. For
-// now, we create an alias to distinguish between Key and a row.
+// A row in the hash join buffer is the same as the Key class.
 using BufferRow = Key;
 
 class KeyHasher {
@@ -176,8 +141,8 @@
   }
 
   size_t operator()(ImmutableStringWithLength key) const {
-    ImmutableStringWithLength::Decoded decoded = key.Decode();
-    return robin_hood::hash_bytes(decoded.data, decoded.size);
+    std::string_view decoded = key.Decode();
+    return robin_hood::hash_bytes(decoded.data(), decoded.size());
   }
 };
 
diff -Nru mysql-8.0-8.0.26/sql/hash_join_chunk.cc mysql-8.0-8.0.27/sql/hash_join_chunk.cc
--- mysql-8.0-8.0.26/sql/hash_join_chunk.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/hash_join_chunk.cc	2021-09-28 11:46:34.000000000 +0000
@@ -152,7 +152,7 @@
   }
 
   hash_join_buffer::LoadBufferRowIntoTableBuffers(
-      m_tables, {pointer_cast<const uchar *>(buffer->ptr()), buffer->length()});
+      m_tables, {buffer->ptr(), buffer->length()});
 
   return false;
 }
diff -Nru mysql-8.0-8.0.26/sql/hash_join_iterator.cc mysql-8.0-8.0.27/sql/hash_join_iterator.cc
--- mysql-8.0-8.0.26/sql/hash_join_iterator.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/hash_join_iterator.cc	2021-09-28 11:46:34.000000000 +0000
@@ -880,9 +880,8 @@
     return;
   }
 
-  hash_join_buffer::Key key{
-      pointer_cast<uchar *>(m_temporary_row_and_join_key_buffer.ptr()),
-      m_temporary_row_and_join_key_buffer.length()};
+  hash_join_buffer::Key key{m_temporary_row_and_join_key_buffer.ptr(),
+                            m_temporary_row_and_join_key_buffer.length()};
 
   auto it = m_row_buffer.find(key);
   if (it == m_row_buffer.end()) {
diff -Nru mysql-8.0-8.0.26/sql/histograms/histogram.cc mysql-8.0-8.0.27/sql/histograms/histogram.cc
--- mysql-8.0-8.0.26/sql/histograms/histogram.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/histograms/histogram.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1025,8 +1025,7 @@
       The MEM_ROOT is transferred to the dictionary object when
       histogram->store_histogram is called.
     */
-    MEM_ROOT local_mem_root;
-    init_alloc_root(key_memory_histograms, &local_mem_root, 256, 0);
+    MEM_ROOT local_mem_root(key_memory_histograms, 256);
 
     std::string col_name(field->field_name);
     histograms::Histogram *histogram =
diff -Nru mysql-8.0-8.0.26/sql/histograms/value_map.cc mysql-8.0-8.0.27/sql/histograms/value_map.cc
--- mysql-8.0-8.0.26/sql/histograms/value_map.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/histograms/value_map.cc	2021-09-28 11:46:34.000000000 +0000
@@ -77,9 +77,8 @@
     : m_sampling_rate(sampling_rate),
       m_charset(charset),
       m_num_null_values(0),
-      m_data_type(data_type) {
-  init_alloc_root(key_memory_histograms, &m_mem_root, 256, 0);
-}
+      m_data_type(data_type),
+      m_mem_root(key_memory_histograms, 256) {}
 
 template <class T>
 bool Value_map_base::add_values(const T &value, const ha_rows count) {
diff -Nru mysql-8.0-8.0.26/sql/hostname_cache.cc mysql-8.0-8.0.27/sql/hostname_cache.cc
--- mysql-8.0-8.0.26/sql/hostname_cache.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/hostname_cache.cc	2021-09-28 11:46:34.000000000 +0000
@@ -925,7 +925,7 @@
     char ip_buffer[HOST_ENTRY_KEY_SIZE];
 
     {
-      bool err_status MY_ATTRIBUTE((unused));
+      bool err_status [[maybe_unused]];
       err_status = vio_get_normalized_ip_string(addr_info->ai_addr,
                                                 addr_info->ai_addrlen,
                                                 ip_buffer, sizeof(ip_buffer));
diff -Nru mysql-8.0-8.0.26/sql/immutable_string.h mysql-8.0-8.0.27/sql/immutable_string.h
--- mysql-8.0-8.0.26/sql/immutable_string.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/immutable_string.h	2021-09-28 11:46:34.000000000 +0000
@@ -39,6 +39,7 @@
 #include <stdint.h>
 
 #include <limits>
+#include <string_view>
 
 #include "my_compiler.h"
 
@@ -60,15 +61,10 @@
  */
 class ImmutableStringWithLength {
  public:
-  // TODO(sgunders): Replace with std::string_view when we get C++17.
-  struct Decoded {
-    const char *data;
-    size_t size;
-  };
   ImmutableStringWithLength() = default;
   explicit ImmutableStringWithLength(const char *encoded) : m_ptr(encoded) {}
 
-  inline Decoded Decode() const;
+  inline std::string_view Decode() const;
 
   /// Encode the given string as an ImmutableStringWithLength, and returns
   /// a new object pointing to it. *dst must contain at least the number
@@ -130,12 +126,10 @@
   return tmp.first;
 }
 
-ImmutableStringWithLength::Decoded ImmutableStringWithLength::Decode() const {
-  ImmutableStringWithLength::Decoded decoded;
+std::string_view ImmutableStringWithLength::Decode() const {
   uint64_t size;
-  decoded.data = VarintParse64(m_ptr, &size);
-  decoded.size = size;
-  return decoded;
+  const char *data = VarintParse64(m_ptr, &size);
+  return {data, static_cast<size_t>(size)};
 }
 
 ImmutableStringWithLength ImmutableStringWithLength::Encode(const char *data,
@@ -156,15 +150,7 @@
 
 bool ImmutableStringWithLength::operator==(
     ImmutableStringWithLength other) const {
-  ImmutableStringWithLength::Decoded str1 = Decode();
-  ImmutableStringWithLength::Decoded str2 = other.Decode();
-  if (str1.size != str2.size) {
-    return false;
-  } else if (str1.size == 0) {
-    return true;
-  } else {
-    return memcmp(str1.data, str2.data, str1.size) == 0;
-  }
+  return Decode() == other.Decode();
 }
 
 /**
diff -Nru mysql-8.0-8.0.26/sql/item_buff.cc mysql-8.0-8.0.27/sql/item_buff.cc
--- mysql-8.0-8.0.26/sql/item_buff.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/item_buff.cc	2021-09-28 11:46:34.000000000 +0000
@@ -58,7 +58,7 @@
         return new (thd->mem_root) Cached_item_temporal(item);
       if (item->data_type() == MYSQL_TYPE_JSON)
         return new (thd->mem_root) Cached_item_json(item);
-      return new (thd->mem_root) Cached_item_str(thd, item);
+      return new (thd->mem_root) Cached_item_str(item);
     case INT_RESULT:
       return new (thd->mem_root) Cached_item_int(item);
     case REAL_RESULT:
@@ -72,13 +72,11 @@
   }
 }
 
-Cached_item::~Cached_item() = default;
-
-Cached_item_str::Cached_item_str(THD *thd, Item *arg)
+Cached_item_str::Cached_item_str(Item *arg)
     : Cached_item(arg),
-      value_max_length(
-          min<uint32>(arg->max_length, thd->variables.max_sort_length)),
-      value(value_max_length) {}
+      // Make sure value.data() is never nullptr, as not all collation functions
+      // are prepared for that (even with empty strings).
+      value(16) {}
 
 /**
   Compare with old value and replace value with new value.
@@ -87,14 +85,12 @@
     Return true if values have changed
 */
 bool Cached_item_str::cmp(void) {
-  String *res;
   bool tmp;
 
   DBUG_TRACE;
   assert(!item->is_temporal());
   assert(item->data_type() != MYSQL_TYPE_JSON);
-  if ((res = item->val_str(&tmp_value)))
-    res->length(min(res->length(), static_cast<size_t>(value_max_length)));
+  String *res = item->val_str(&tmp_value);
   DBUG_PRINT("info", ("old: %s, new: %s", value.c_ptr_safe(),
                       res ? res->c_ptr_safe() : ""));
   if (null_value != item->null_value) {
@@ -154,10 +150,6 @@
   return true;
 }
 
-void Cached_item_json::copy_to_Item_cache(Item_cache *i_c) {
-  down_cast<Item_cache_json *>(i_c)->store_value(item, m_value);
-}
-
 bool Cached_item_real::cmp(void) {
   DBUG_TRACE;
   double nr = item->val_real();
@@ -200,26 +192,6 @@
   my_decimal_set_zero(&value);
 }
 
-void Cached_item_real::copy_to_Item_cache(Item_cache *i_c) {
-  down_cast<Item_cache_real *>(i_c)->store_value(item, value);
-}
-
-void Cached_item_int::copy_to_Item_cache(Item_cache *i_c) {
-  down_cast<Item_cache_int *>(i_c)->store_value(item, value);
-}
-
-void Cached_item_temporal::copy_to_Item_cache(Item_cache *i_c) {
-  down_cast<Item_cache_datetime *>(i_c)->store_value(item, value);
-}
-
-void Cached_item_str::copy_to_Item_cache(Item_cache *i_c) {
-  down_cast<Item_cache_str *>(i_c)->store_value(item, value);
-}
-
-void Cached_item_decimal::copy_to_Item_cache(Item_cache *i_c) {
-  down_cast<Item_cache_decimal *>(i_c)->store_value(item, &value);
-}
-
 bool Cached_item_decimal::cmp() {
   my_decimal tmp;
   my_decimal *ptmp = item->val_decimal(&tmp);
diff -Nru mysql-8.0-8.0.26/sql/item.cc mysql-8.0-8.0.27/sql/item.cc
--- mysql-8.0-8.0.26/sql/item.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/item.cc	2021-09-28 11:46:34.000000000 +0000
@@ -33,6 +33,7 @@
 #endif
 #include <stddef.h>
 #include <algorithm>
+#include <optional>
 #include <utility>
 
 #include "decimal.h"
@@ -203,6 +204,10 @@
       derived_used(false),
       m_accum_properties(0) {}
 
+bool Item::may_eval_const_item(const THD *thd) const {
+  return !thd->lex->is_view_context_analysis() || basic_const_item();
+}
+
 /**
   @todo
     Make this functions class dependent
@@ -2748,7 +2753,7 @@
         the column.
       */
       new_max_length += 1;
-      /* fall through */
+      [[fallthrough]];
     case MYSQL_TYPE_LONG:
     case MYSQL_TYPE_TINY:
     case MYSQL_TYPE_SHORT:
@@ -2794,7 +2799,7 @@
     table_name = m_orig_table_name;
   }
 
-  field_name = field_par->field_name;
+  m_orig_field_name = field_par->field_name;
   collation.set(field_par->charset(), field_par->derivation(),
                 field_par->repertoire());
   set_data_type(field_par->type());
@@ -2825,22 +2830,25 @@
 }
 
 const char *Item_ident::full_name() const {
+  const char *f_name =
+      m_orig_field_name != nullptr ? m_orig_field_name : field_name;
   char *tmp;
-  if (!table_name || !field_name)
-    return field_name ? field_name
-                      : item_name.is_set() ? item_name.ptr() : "tmp_field";
+  if (table_name == nullptr || f_name == nullptr)
+    return f_name != nullptr
+               ? f_name
+               : item_name.is_set() ? item_name.ptr() : "tmp_field";
   if (db_name && db_name[0]) {
-    tmp = (char *)(*THR_MALLOC)
-              ->Alloc(strlen(db_name) + strlen(table_name) +
-                      strlen(field_name) + 3);
-    strxmov(tmp, db_name, ".", table_name, ".", field_name, NullS);
+    tmp = pointer_cast<char *>(
+        (*THR_MALLOC)
+            ->Alloc(strlen(db_name) + strlen(table_name) + strlen(f_name) + 3));
+    strxmov(tmp, db_name, ".", table_name, ".", f_name, NullS);
   } else {
     if (table_name[0]) {
-      tmp = (char *)(*THR_MALLOC)
-                ->Alloc(strlen(table_name) + strlen(field_name) + 2);
-      strxmov(tmp, table_name, ".", field_name, NullS);
+      tmp = pointer_cast<char *>(
+          (*THR_MALLOC)->Alloc(strlen(table_name) + strlen(f_name) + 2));
+      strxmov(tmp, table_name, ".", f_name, NullS);
     } else
-      return field_name;
+      return f_name;
   }
   return tmp;
 }
@@ -2849,7 +2857,10 @@
                        const char *db_name_arg,
                        const char *table_name_arg) const {
   char d_name_buff[MAX_ALIAS_NAME], t_name_buff[MAX_ALIAS_NAME];
-  const char *d_name = db_name_arg, *t_name = table_name_arg;
+  const char *d_name = db_name_arg;
+  const char *t_name = table_name_arg;
+  const char *f_name =
+      m_orig_field_name != nullptr ? m_orig_field_name : field_name;
 
   if (lower_case_table_names == 1 ||
       // mode '2' does not apply to aliases:
@@ -2866,15 +2877,15 @@
     }
   }
 
-  if (!table_name_arg || !field_name || !field_name[0]) {
-    const char *nm = (field_name && field_name[0])
-                         ? field_name
+  if (table_name_arg == nullptr || f_name == nullptr || !f_name[0]) {
+    const char *nm = (f_name != nullptr && f_name[0])
+                         ? f_name
                          : item_name.is_set() ? item_name.ptr() : "tmp_field";
     append_identifier(thd, str, nm, strlen(nm));
     return;
   }
 
-  if (db_name_arg && db_name_arg[0] && !(query_type & QT_NO_DB) &&
+  if (!(query_type & QT_NO_DB) && db_name_arg && db_name_arg[0] &&
       !alias_name_used()) {
     const size_t d_name_len = strlen(d_name);
     if (!((query_type & QT_NO_DEFAULT_DB) &&
@@ -2883,11 +2894,11 @@
       str->append('.');
     }
   }
-  if (table_name_arg[0] && !(query_type & QT_NO_TABLE)) {
+  if (!(query_type & QT_NO_TABLE) && table_name_arg[0]) {
     append_identifier(thd, str, t_name, strlen(t_name));
     str->append('.');
   }
-  append_identifier(thd, str, field_name, strlen(field_name));
+  append_identifier(thd, str, f_name, strlen(f_name));
 }
 
 TYPELIB *Item_field::get_typelib() const {
@@ -2974,7 +2985,7 @@
 }
 
 bool Item_field::eq(const Item *item, bool) const {
-  const Item *real_item = const_cast<Item *>(item)->real_item();
+  const Item *real_item = item->real_item();
   if (real_item->type() != FIELD_ITEM) return false;
 
   const Item_field *item_field = down_cast<const Item_field *>(real_item);
@@ -3054,7 +3065,13 @@
   assert(context->query_block != removed_query_block);
 
   if (context->query_block == parent_query_block) {
-    if (parent_query_block == depended_from) depended_from = nullptr;
+    if (parent_query_block == depended_from) {
+      depended_from = nullptr;
+      // Update the context of this field to that of the parent query
+      // block since the resolver place is now lifted from the abandoned
+      // query block to this one.
+      context = &parent_query_block->context;
+    }
   } else {
     /*
       The definition scope of this field item reference is inner to the removed
@@ -3497,8 +3514,8 @@
 */
 
 static void default_set_param_func(Item_param *param,
-                                   uchar **pos MY_ATTRIBUTE((unused)),
-                                   ulong len MY_ATTRIBUTE((unused))) {
+                                   uchar **pos [[maybe_unused]],
+                                   ulong len [[maybe_unused]]) {
   param->set_param_state(Item_param::NO_VALUE);
 }
 
@@ -5397,7 +5414,7 @@
   } else if (thd->mark_used_columns != MARK_COLUMNS_NONE) {
     TABLE *table = field->table;
     MY_BITMAP *current_bitmap;
-    MY_BITMAP *other_bitmap MY_ATTRIBUTE((unused));
+    MY_BITMAP *other_bitmap [[maybe_unused]];
     if (thd->mark_used_columns == MARK_COLUMNS_READ) {
       current_bitmap = table->read_set;
       other_bitmap = table->write_set;
@@ -5463,10 +5480,9 @@
   if (table_ref != nullptr && table_ref->table == nullptr) return;
   if (field == nullptr) {
     field = result_field = table_ref->table->field[field_index];
+    m_orig_field_name = field->field_name;
   }
   if (table_name == nullptr) table_name = *field->table_name;
-  if (field_name == item_name.ptr() || field_name == nullptr)
-    field_name = field->field_name;
 }
 
 Item *Item_field::safe_charset_converter(THD *thd, const CHARSET_INFO *tocs) {
@@ -5480,12 +5496,16 @@
 
   Item_ident::cleanup();
   /*
-    When TABLE is detached from TABLE_LIST, field pointers are invalid.
-    Unless field objects are created as part of statement (placeholder tables).
+    When TABLE is detached from TABLE_LIST, field pointers are invalid,
+    unless field objects are created as part of statement (placeholder tables).
+    Also invalidate the orginal field name, since it is usually determined
+    from the field name in the Field object.
   */
   if (table_ref != nullptr && !table_ref->is_view_or_derived() &&
-      !table_ref->is_recursive_reference())
+      !table_ref->is_recursive_reference()) {
     field = nullptr;
+    m_orig_field_name = nullptr;
+  }
 
   // Restore result field back to the initial value
   result_field = field;
@@ -5496,19 +5516,6 @@
   */
   if (table_ref == nullptr) table_name = nullptr;
 
-  /*
-    Schema tables are created per execution, so field names must be reassigned.
-    Ordinary base tables have stable metadata as long as version is not bumped
-    (which causes a reprepare).
-    However, DD tables may have MYSQL_OPEN_IGNORE_FLUSH which means metadata
-    is still unstable.
-    To preserve as much of the plan as possible while not within execution,
-    set field_name to be the same as item name here. It is restored in
-    Item_field::bind_fields().
-  */
-  if (table_ref != nullptr) {
-    field_name = item_name.ptr();
-  }
   // Reset field before next optimization (multiple equality analysis)
   item_equal = nullptr;
   item_equal_all_join_nests = nullptr;
@@ -5521,12 +5528,12 @@
   @todo refactor CREATE TABLE so this is no longer needed.
 */
 void Item_field::reset_field() {
+  assert(table_ref == nullptr);
   fixed = false;
   context = nullptr;
   db_name = m_orig_db_name;
   table_name = m_orig_table_name;
-  field_name = m_orig_field_name;
-  table_ref = nullptr;
+  m_orig_field_name = field_name;
   field = nullptr;
 }
 
@@ -5663,8 +5670,13 @@
     e.g. <bin_col> = <int_col> AND <bin_col> = <hex_string>) since
     Items don't know the context they are in and there are functions like
     IF (<hex_string>, 'yes', 'no').
+
+    Also, disable const propagation if the constant is nullable and this item is
+    not. If we were to allow propagation in this case, we would also need to
+    propagate the new nullability up to the parents of this item.
   */
-  if (!item || !has_compatible_context(item))
+  if (item == nullptr || !has_compatible_context(item) ||
+      (item->is_nullable() && !is_nullable()))
     item = this;
   else if (field && field->is_flag_set(ZEROFILL_FLAG) &&
            IS_NUM(field->type())) {
@@ -5894,7 +5906,7 @@
   else if (data_type() == MYSQL_TYPE_GEOMETRY) {
     field = new (*THR_MALLOC)
         Field_geom(max_length, m_nullable, item_name.ptr(),
-                   Field::GEOM_GEOMETRY, Nullable<gis::srid_t>());
+                   Field::GEOM_GEOMETRY, std::optional<gis::srid_t>());
   } else if (max_length / collation.collation->mbmaxlen >
              CONVERT_IF_BIGGER_TO_BLOB)
     field = new (*THR_MALLOC) Field_blob(
@@ -6000,6 +6012,7 @@
         break;
       }
       /* Fall through to make_string_field() */
+      [[fallthrough]];
     case MYSQL_TYPE_ENUM:
     case MYSQL_TYPE_SET:
     case MYSQL_TYPE_VAR_STRING:
@@ -6255,6 +6268,7 @@
     char buff[MAX_FIELD_WIDTH];  // Alloc buffer for small columns
     str_value.set_quick(buff, sizeof(buff), cs);
     result = val_str(&str_value);
+    if (current_thd->is_error()) return TYPE_ERR_BAD_VALUE;
     if (null_value) {
       str_value.set_quick(nullptr, 0, cs);
       return set_field_to_null_with_conversions(field, no_conversions);
@@ -6352,8 +6366,9 @@
   @retval !TYPE_OK  Warning/error as indicated by type_conversion_status enum
                     value
 */
-type_conversion_status Item_int::save_in_field_inner(
-    Field *field, bool no_conversions MY_ATTRIBUTE((unused))) {
+type_conversion_status Item_int::save_in_field_inner(Field *field,
+                                                     bool no_conversions
+                                                     [[maybe_unused]]) {
   return save_int_value_in_field(field, val_int(), null_value, unsigned_flag);
 }
 
@@ -6636,7 +6651,7 @@
         push_warning_printf(
             thd, Sql_condition::SL_WARNING, ER_TRUNCATED_WRONG_VALUE,
             ER_THD(thd, ER_TRUNCATED_WRONG_VALUE), "BINARY", errbuff);
-        return -1;
+        return 0;
       }
   }
 
@@ -7020,7 +7035,8 @@
     if (const_for_execution() &&
         !(basic_const_item() || item->basic_const_item() ||
           item->type() == Item::FIELD_ITEM || item->type() == SUBSELECT_ITEM ||
-          item->type() == ROW_ITEM || item->type() == CACHE_ITEM))
+          item->type() == ROW_ITEM || item->type() == CACHE_ITEM ||
+          item->type() == PARAM_ITEM))
       /*
         Note that we use cache_item as a flag (NULL vs non-NULL), but we
         are storing the pointer so that we can assert that we cache the
@@ -7074,7 +7090,7 @@
 }
 
 bool Item::can_be_substituted_for_gc(bool array) const {
-  switch (type()) {
+  switch (real_item()->type()) {
     case FUNC_ITEM:
     case COND_ITEM:
       return true;
@@ -7356,7 +7372,7 @@
 }
 
 bool Item_field::send(Protocol *protocol, String *) {
-  return protocol->store_field(result_field);
+  return protocol->store_field(field);
 }
 
 /**
@@ -7882,7 +7898,6 @@
 }
 
 bool Item_ref::send(Protocol *prot, String *tmp) {
-  if (result_field != nullptr) return prot->store_field(result_field);
   return (*ref)->send(prot, tmp);
 }
 
@@ -7991,12 +8006,12 @@
   Item_field *item = new Item_field(result_field);
   if (item == nullptr) return nullptr;
 
-  item->set_orig_db_name(m_orig_db_name);
+  item->set_orignal_db_name(m_orig_db_name);
   item->db_name = db_name;
   item->table_name = table_name;
   if (real_item()->type() == Item::FIELD_ITEM)
-    item->set_orig_table_name(
-        down_cast<Item_field *>(real_item())->orig_table_name());
+    item->set_original_table_name(
+        down_cast<Item_field *>(real_item())->original_table_name());
 
   return item;
 }
@@ -8246,11 +8261,11 @@
   auto *info = pointer_cast<Collect_item_fields_or_view_refs *>(arg);
   if (info->is_stopped(this)) return false;
   // We collect this view ref
-  // If it's qualifying table is in the transformed query block - (1)
-  // If it's underlying field's qualifying table is in the transformed
-  // query block - (2)
-  // If this view ref is an outer reference dependent on the
-  // transformed query block - (3)
+  // (1) If its qualifying table is in the transformed query block
+  // (2) If its underlying field's qualifying table is in the transformed
+  // query block
+  // (3) If this view ref is an outer reference dependent on the
+  // transformed query block
   Item *item = nullptr;
   item = (context->query_block == info->m_transformed_block)  // 1
              ? this
@@ -8379,11 +8394,15 @@
   // Needs cached_table for some Item traversal functions:
   cached_table = table_ref;
 
+  // Use same field name as the underlying field:
+  assert(field_name == nullptr);
+  field_name = arg->item_name.ptr();
+
   return false;
 }
 
 void Item_default_value::bind_fields() {
-  if (arg == nullptr) return;
+  if (!fixed || arg == nullptr) return;
 
   field->move_field_offset(
       (ptrdiff_t)(field->table->s->default_values - m_rowbuffer_saved));
@@ -8511,6 +8530,10 @@
 
     set_field(def_field);
 
+    // Use same field name as the underlying field:
+    assert(field_name == nullptr);
+    field_name = arg->item_name.ptr();
+
     // The VALUES function is deprecated.
     if (m_is_values_function)
       push_deprecated_warn(
@@ -8605,7 +8628,7 @@
     set field_idx properly.
   */
   (void)find_field_in_table(table_triggers->get_subject_table(), field_name,
-                            strlen(field_name), false, &field_idx);
+                            false, &field_idx);
   triggers = table_triggers;
   table_grants = table_grant_info;
 }
@@ -9005,7 +9028,10 @@
 }
 
 void Item_cache::store(Item *item) {
-  example = item;
+  if (current_thd->lex->is_exec_started())
+    current_thd->change_item_tree(&example, item);
+  else
+    example = item;
   if (!item) {
     assert(is_nullable());
     null_value = true;
@@ -9625,8 +9651,8 @@
   return true;
 }
 
-void Item_cache_row::illegal_method_call(
-    const char *method MY_ATTRIBUTE((unused))) const {
+void Item_cache_row::illegal_method_call(const char *method
+                                         [[maybe_unused]]) const {
   DBUG_TRACE;
   DBUG_PRINT("error", ("!!! %s method was called for row item", method));
   assert(0);
@@ -10003,7 +10029,7 @@
 
 bool Item_values_column::eq(const Item *item, bool binary_cmp) const {
   assert(false);
-  const Item *it = const_cast<Item *>(item)->real_item();
+  const Item *it = item->real_item();
   return m_value_ref && m_value_ref->eq(it, binary_cmp);
 }
 
@@ -10301,19 +10327,16 @@
   // fields in the multi-equality and find the first that is within our reach.
   // The table_map provided in 'reachable_tables' defines the tables within our
   // reach.
-  Item_equal_iterator item_equal_iterator(
-      *item_field->item_equal_all_join_nests);
-  Item_field *it;
-
-  while ((it = item_equal_iterator++)) {
-    if (it->field == item_field->field) {
+  for (Item_field &other_item_field :
+       item_field->item_equal_all_join_nests->get_fields()) {
+    if (other_item_field.field == item_field->field) {
       continue;
     }
 
-    table_map item_field_used_tables = it->used_tables();
+    table_map item_field_used_tables = other_item_field.used_tables();
     if ((item_field_used_tables & reachable_tables) == item_field_used_tables) {
       Item_field *new_item_field = new Item_field(current_thd, item_field);
-      new_item_field->reset_field(it->field);
+      new_item_field->reset_field(other_item_field.field);
       return new_item_field;
     }
   }
@@ -10335,8 +10358,8 @@
 }
 
 bool ItemsAreEqual(const Item *a, const Item *b, bool binary_cmp) {
-  const Item *real_a = const_cast<Item *>(a)->real_item();
-  const Item *real_b = const_cast<Item *>(b)->real_item();
+  const Item *real_a = a->real_item();
+  const Item *real_b = b->real_item();
 
   // Unwrap caches, as they may not be added consistently
   // to both sides.
diff -Nru mysql-8.0-8.0.26/sql/item_cmpfunc.cc mysql-8.0-8.0.27/sql/item_cmpfunc.cc
--- mysql-8.0-8.0.26/sql/item_cmpfunc.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/item_cmpfunc.cc	2021-09-28 11:46:34.000000000 +0000
@@ -653,7 +653,7 @@
     return true;
 
   // Make a special case of compare with fields to get nicer DATE comparisons
-  if (!(thd->lex->context_analysis_only & CONTEXT_ANALYSIS_ONLY_VIEW)) {
+  if (!(thd->lex->is_view_context_analysis())) {
     bool cvt1, cvt2;
     if (convert_constant_arg(thd, args[0], &args[1], &cvt1) ||
         convert_constant_arg(thd, args[1], &args[0], &cvt2))
@@ -1201,10 +1201,11 @@
       DTCollation::set() may have chosen a charset that's a superset of both
       and "left" and "right", so we need to convert both items.
      */
-    if (agg_item_set_converter(coll, owner->func_name(), left, 1,
-                               MY_COLL_CMP_CONV, 1, true) ||
-        agg_item_set_converter(coll, owner->func_name(), right, 1,
-                               MY_COLL_CMP_CONV, 1, true))
+    const char *func_name = owner ? owner->func_name() : "";
+    if (agg_item_set_converter(coll, func_name, left, 1, MY_COLL_CMP_CONV, 1,
+                               true) ||
+        agg_item_set_converter(coll, func_name, right, 1, MY_COLL_CMP_CONV, 1,
+                               true))
       return true;
   } else if (try_year_cmp_func(type)) {
     return false;
@@ -1241,6 +1242,13 @@
   return set_cmp_func(owner_arg, left_arg, right_arg, item_result);
 }
 
+bool Arg_comparator::set_cmp_func(Item_result_field *owner_arg, Item **left_arg,
+                                  Item **right_arg, bool set_null_arg,
+                                  Item_result type) {
+  set_null = set_null_arg;
+  return set_cmp_func(owner_arg, left_arg, right_arg, type);
+}
+
 /**
    Wraps the item into a CAST function to the type provided as argument
    @param item - the item to be wrapped
@@ -1367,6 +1375,11 @@
         return wrap_in_cast(left, MYSQL_TYPE_DATETIME) ||
                wrap_in_cast(right, MYSQL_TYPE_DATETIME);
       }
+      if (left_is_datetime && right_is_datetime) {
+        // E.g., DATETIME = TIMESTAMP. We allow this (we could even produce it
+        // ourselves by the logic below).
+        return false;
+      }
       // one is DATETIME the other one is not
       return left_is_datetime ? wrap_in_cast(right, MYSQL_TYPE_DATETIME)
                               : wrap_in_cast(left, MYSQL_TYPE_DATETIME);
@@ -1710,10 +1723,6 @@
   if (set_null) owner->null_value = false;
   size_t l1 = res1->length();
   size_t l2 = res2->length();
-  if (m_max_str_length > 0) {  // Truncate to imposed maximum length
-    if (l1 > m_max_str_length) l1 = m_max_str_length;
-    if (l2 > m_max_str_length) l2 = m_max_str_length;
-  }
   // Compare the two strings
   return cs->coll->strnncollsp(cs, pointer_cast<const uchar *>(res1->ptr()), l1,
                                pointer_cast<const uchar *>(res2->ptr()), l2);
@@ -1735,21 +1744,12 @@
   if ((res1 = (*left)->val_str(&value1))) {
     if ((res2 = (*right)->val_str(&value2))) {
       if (set_null) owner->null_value = false;
-      auto orig_len1 = res1->length();
-      auto orig_len2 = res2->length();
-      auto new_len1 = orig_len1, new_len2 = orig_len2;
-      if (m_max_str_length > 0) {
-        if (orig_len1 > m_max_str_length)
-          res1->length(new_len1 = m_max_str_length);
-        if (orig_len2 > m_max_str_length)
-          res2->length(new_len2 = m_max_str_length);
-      }
-      size_t min_length = min(new_len1, new_len2);
+      size_t len1 = res1->length();
+      size_t len2 = res2->length();
+      size_t min_length = min(len1, len2);
       int cmp =
           min_length == 0 ? 0 : memcmp(res1->ptr(), res2->ptr(), min_length);
-      auto rc = cmp ? cmp : (int)(new_len1 - new_len2);
-      res1->length(orig_len1);
-      res2->length(orig_len2);
+      auto rc = cmp ? cmp : (int)(len1 - len2);
       return rc;
     }
   }
@@ -2456,7 +2456,7 @@
   return (this->*transformer)(arg_t);
 }
 
-void Item_in_optimizer::set_arg_resolve(THD *thd, uint i MY_ATTRIBUTE((unused)),
+void Item_in_optimizer::set_arg_resolve(THD *thd, uint i [[maybe_unused]],
                                         Item *newp) {
   assert(i == 0);
   // Maintain the invariant described in this class's comment
@@ -2654,12 +2654,14 @@
   const CHARSET_INFO *cs = cmp.cmp_collation.collation;
   String *a = eval_string_arg(cs, args[0], &cmp.value1);
   if (a == nullptr) {
+    if (current_thd->is_error()) return error_int();
     null_value = true;
     return 0;
   }
 
   String *b = eval_string_arg(cs, args[1], &cmp.value2);
   if (b == nullptr) {
+    if (current_thd->is_error()) return error_int();
     null_value = true;
     return 0;
   }
@@ -2994,7 +2996,9 @@
       }
 
       if (args[0]->is_temporal() && args[1]->is_temporal() &&
-          args[2]->is_temporal()) {
+          args[2]->is_temporal() && args[0]->data_type() != MYSQL_TYPE_YEAR &&
+          args[1]->data_type() != MYSQL_TYPE_YEAR &&
+          args[2]->data_type() != MYSQL_TYPE_YEAR) {
         /*
           An expression:
             time_or_datetime_field
@@ -3495,8 +3499,9 @@
 }
 
 bool Item_func_nullif::resolve_type(THD *thd) {
-  // If 1. argument has no type, type of this operator cannot be determined yet
-  if (args[0]->data_type() == MYSQL_TYPE_INVALID) {
+  // If no arguments have a type, type of this operator cannot be determined yet
+  if (args[0]->data_type() == MYSQL_TYPE_INVALID &&
+      args[1]->data_type() == MYSQL_TYPE_INVALID) {
     /*
       Due to inheritance from Item_bool_func2, data_type() is LONGLONG.
       Ensure propagate_type() is called for this class:
@@ -3513,13 +3518,13 @@
   set_nullable(true);
   set_data_type_from_item(args[0]);
   cached_result_type = args[0]->result_type();
-  if (cached_result_type == STRING_RESULT &&
-      agg_arg_charsets_for_comparison(cmp.cmp_collation, args, arg_count))
-    return true;
 
   // This class does not implement temporal data types
-  if (is_temporal()) set_data_type_string(args[0]->max_length);
-
+  if (is_temporal()) {
+    set_data_type_string(args[0]->max_length);
+    if (agg_arg_charsets_for_comparison(cmp.cmp_collation, args, arg_count))
+      return true;
+  }
   return false;
 }
 
@@ -4324,7 +4329,7 @@
 
 void in_string::set(uint pos, Item *item) {
   String *str = base_pointers[pos];
-  String *res = item->val_str(str);
+  String *res = eval_string_arg(collation, item, str);
   if (res && res != str) {
     if (res->uses_buffer_owned_by(str)) res->copy();
     if (item->type() == Item::FUNC_ITEM)
@@ -5294,6 +5299,7 @@
     const int rc = in_item->cmp(args[i]);
     if (rc == false) return (longlong)(!negated);
     have_null |= (rc == UNKNOWN);
+    if (current_thd->is_error()) return error_int();
   }
 
   null_value = have_null;
@@ -7406,8 +7412,8 @@
   // collation. This is given by the Arg_comparator, so we call strnxfrm
   // to make the string values memcmp-able.
   StringBuffer<STRING_BUFFER_USUAL_SIZE> str_buffer;
-  String *str = comparand->val_str(&str_buffer);
 
+  String *str = eval_string_arg(character_set, comparand, &str_buffer);
   if (comparand->null_value || str == nullptr) {
     return true;
   }
diff -Nru mysql-8.0-8.0.26/sql/item_cmpfunc.h mysql-8.0-8.0.27/sql/item_cmpfunc.h
--- mysql-8.0-8.0.26/sql/item_cmpfunc.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/item_cmpfunc.h	2021-09-28 11:46:34.000000000 +0000
@@ -133,7 +133,7 @@
   Item **left{nullptr};
   Item **right{nullptr};
   arg_cmp_func func{nullptr};
-  Item_result_field *owner;
+  Item_result_field *owner{nullptr};
   Arg_comparator *comparators{nullptr};  // used only for compare_row()
   uint16 comparator_count{0};
   double precision{0.0};
@@ -154,12 +154,6 @@
   */
   Json_scalar_holder *json_scalar{nullptr};
 
-  /**
-     When comparing strings, compare at most these many bytes.
-     A value of zero means "no limit".
-  */
-  size_t m_max_str_length{0};
-
  public:
   DTCollation cmp_collation;
   /* Allow owner function to use string buffers. */
@@ -175,6 +169,9 @@
 
   bool set_cmp_func(Item_result_field *owner_arg, Item **left, Item **right,
                     bool set_null_arg);
+
+  bool set_cmp_func(Item_result_field *owner_arg, Item **left, Item **right,
+                    bool set_null_arg, Item_result type);
   /**
      Comparison function are expected to operate on arguments having the
      same data types. Since MySQL has very loosened up rules, it accepts
@@ -203,11 +200,6 @@
   */
   bool inject_cast_nodes();
 
-  /**
-     When comparing strings, compare at most max_length bytes.
-     @param max_length how much to compare
-  */
-  void set_max_str_length(size_t max_length) { m_max_str_length = max_length; }
   inline int compare() { return (this->*func)(); }
 
   int compare_string();         // compare args[0] & args[1]
@@ -261,6 +253,9 @@
   longlong extract_value_from_argument(THD *thd, Item *item, bool left_argument,
                                        bool *is_null) const;
 
+  Item **get_left_ptr() const { return left; }
+  Item *get_right() const { return *right; }
+
  private:
   /// A function pointer that is used for retrieving the value from argument
   /// "left". This function is only used when we are comparing in a datetime
@@ -291,21 +286,35 @@
 
 class Item_bool_func : public Item_int_func {
  protected:
-  Item_bool_func() : Item_int_func() {}
-  explicit Item_bool_func(const POS &pos) : Item_int_func(pos) {}
+  Item_bool_func() : Item_int_func() { set_data_type_bool(); }
+  explicit Item_bool_func(const POS &pos) : Item_int_func(pos) {
+    set_data_type_bool();
+  }
 
-  explicit Item_bool_func(Item *a) : Item_int_func(a) {}
-  Item_bool_func(const POS &pos, Item *a) : Item_int_func(pos, a) {}
+  explicit Item_bool_func(Item *a) : Item_int_func(a) { set_data_type_bool(); }
+  Item_bool_func(const POS &pos, Item *a) : Item_int_func(pos, a) {
+    set_data_type_bool();
+  }
 
-  Item_bool_func(Item *a, Item *b, Item *c) : Item_int_func(a, b, c) {}
-  Item_bool_func(Item *a, Item *b) : Item_int_func(a, b) {}
-  Item_bool_func(const POS &pos, Item *a, Item *b) : Item_int_func(pos, a, b) {}
+  Item_bool_func(Item *a, Item *b, Item *c) : Item_int_func(a, b, c) {
+    set_data_type_bool();
+  }
+  Item_bool_func(Item *a, Item *b) : Item_int_func(a, b) {
+    set_data_type_bool();
+  }
+  Item_bool_func(const POS &pos, Item *a, Item *b) : Item_int_func(pos, a, b) {
+    set_data_type_bool();
+  }
   Item_bool_func(const POS &pos, Item *a, Item *b, Item *c)
-      : Item_int_func(pos, a, b, c) {}
+      : Item_int_func(pos, a, b, c) {
+    set_data_type_bool();
+  }
 
   Item_bool_func(THD *thd, Item_bool_func *item)
       : Item_int_func(thd, item),
-        m_created_by_in2exists(item->m_created_by_in2exists) {}
+        m_created_by_in2exists(item->m_created_by_in2exists) {
+    set_data_type_bool();
+  }
 
  public:
   bool is_bool_func() const override { return true; }
@@ -551,7 +560,7 @@
 
 class Equal_creator : public Linear_comp_creator {
  public:
-  const char *symbol(bool invert MY_ATTRIBUTE((unused))) const override {
+  const char *symbol(bool invert [[maybe_unused]]) const override {
     // This will never be called with true.
     assert(!invert);
     return "<=>";
@@ -632,13 +641,8 @@
 
  public:
   bool resolve_type(THD *) override;
-  bool set_cmp_func() { return cmp.set_cmp_func(this, args, args + 1, true); }
-  /**
-     When comparing strings, compare at most max_str_length bytes.
-     @param max_str_length how much to compare
-  */
-  void set_max_str_length(size_t max_str_length) {
-    return cmp.set_max_str_length(max_str_length);
+  bool set_cmp_func() {
+    return cmp.set_cmp_func(this, args, args + 1, is_nullable());
   }
   optimize_type select_optimize(const THD *) override { return OPTIMIZE_OP; }
   /// @returns an operator REV_OP so that "B REV_OP A" is equivalent to
@@ -749,9 +753,9 @@
   a predicate. The overridden functions implemented in this class generally
   forward all evaluation to the underlying object.
 */
-class Item_func_match_predicate : public Item_bool_func {
+class Item_func_match_predicate final : public Item_bool_func {
  public:
-  Item_func_match_predicate(Item *a) : Item_bool_func(a) {}
+  explicit Item_func_match_predicate(Item *a) : Item_bool_func(a) {}
 
   longlong val_int() override { return args[0]->val_int(); }
   enum Functype functype() const override { return MATCH_FUNC; }
@@ -1046,6 +1050,15 @@
   /// we save a list of all of the fields that were considered equal.
   void ensure_multi_equality_fields_are_available(table_map left_side_tables,
                                                   table_map right_side_tables);
+
+  // If this equality originally came from a multi-equality, this documents
+  // which one it came from (otherwise nullptr). It is used during planning:
+  // For selectivity estimates and for not pushing down the same multi-equality
+  // to the same join more than once (see IsBadJoinForCondition()).
+  //
+  // This is used only in the hypergraph optimizer; the pre-hypergraph optimizer
+  // uses COND_EQUAL to find this instead.
+  Item_equal *source_multiple_equality = nullptr;
 };
 
 /**
@@ -1152,8 +1165,7 @@
   longlong val_int() override;
   const char *func_name() const override { return "reject_if"; }
   /// Redefine to avoid pushing into derived table
-  bool check_column_from_derived_table(
-      uchar *arg MY_ATTRIBUTE((unused))) override {
+  bool check_column_from_derived_table(uchar *arg [[maybe_unused]]) override {
     return true;
   }
   float get_filtering_effect(THD *thd, table_map filter_for_table,
@@ -1303,9 +1315,12 @@
              enum_query_type query_type) const override {
     Item_func::print(thd, str, query_type);
   }
+  // We derive (indirectly) from Item_bool_func, but this is not a true boolean.
+  // Override length and unsigned_flag set by set_data_type_bool().
   bool resolve_type(THD *thd) override {
     if (Item_bool_func2::resolve_type(thd)) return true;
     fix_char_length(2);  // returns "1" or "0" or "-1"
+    unsigned_flag = false;
     return false;
   }
 };
@@ -2474,7 +2489,7 @@
   Item_equal(Item *c, Item_field *f);
   Item_equal(Item_equal *item_equal);
 
-  inline Item *get_const() { return const_item; }
+  Item *get_const() const { return const_item; }
   void set_const(Item *c) { const_item = c; }
   bool compare_const(THD *thd, Item *c);
   bool add(THD *thd, Item *c, Item_field *f);
@@ -2502,6 +2517,9 @@
     assert(false);
     return false;
   }
+  bool contains_only_equi_join_condition() const override {
+    return get_const() == nullptr;
+  }
 
   /**
     Order field items in multiple equality according to a sorting criteria.
@@ -2522,7 +2540,48 @@
   void sort(Node_cmp_func compare) {
     fields.sort(compare);
   }
-  friend class Item_equal_iterator;
+
+  // A class to iterate over fields without exposing fields directly.
+  class FieldProxy {
+   public:
+    explicit FieldProxy(Item_equal *item) : m_fields(&item->fields) {}
+    List_STL_Iterator<Item_field> begin() { return m_fields->begin(); }
+    List_STL_Iterator<Item_field> end() { return m_fields->end(); }
+    List_STL_Iterator<const Item_field> begin() const {
+      return m_fields->cbegin();
+    }
+    List_STL_Iterator<const Item_field> end() const { return m_fields->cend(); }
+    List_STL_Iterator<const Item_field> cbegin() const {
+      return m_fields->cbegin();
+    }
+    List_STL_Iterator<const Item_field> cend() const {
+      return m_fields->cend();
+    }
+
+   private:
+    List<Item_field> *m_fields;
+  };
+  class ConstFieldProxy {
+   public:
+    explicit ConstFieldProxy(const Item_equal *item)
+        : m_fields(&item->fields) {}
+    List_STL_Iterator<const Item_field> begin() const {
+      return m_fields->cbegin();
+    }
+    List_STL_Iterator<const Item_field> end() const { return m_fields->cend(); }
+    List_STL_Iterator<const Item_field> cbegin() const {
+      return m_fields->cbegin();
+    }
+    List_STL_Iterator<const Item_field> cend() const {
+      return m_fields->cend();
+    }
+
+   private:
+    const List<Item_field> *m_fields;
+  };
+  FieldProxy get_fields() { return FieldProxy(this); }
+  ConstFieldProxy get_fields() const { return ConstFieldProxy(this); }
+
   bool resolve_type(THD *) override;
   bool fix_fields(THD *thd, Item **ref) override;
   void update_used_tables() override;
@@ -2557,17 +2616,6 @@
   COND_EQUAL() { upper_levels = nullptr; }
 };
 
-class Item_equal_iterator : public List_iterator_fast<Item_field> {
- public:
-  inline Item_equal_iterator(Item_equal &item_equal)
-      : List_iterator_fast<Item_field>(item_equal.fields) {}
-  inline Item_field *operator++(int) {
-    Item_field *item = (*(List_iterator_fast<Item_field> *)this)++;
-    return item;
-  }
-  inline void rewind(void) { List_iterator_fast<Item_field>::rewind(); }
-};
-
 class Item_cond_and final : public Item_cond {
  public:
   COND_EQUAL cond_equal; /* contains list of Item_equal objects for
diff -Nru mysql-8.0-8.0.26/sql/item_func.cc mysql-8.0-8.0.27/sql/item_func.cc
--- mysql-8.0-8.0.26/sql/item_func.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/item_func.cc	2021-09-28 11:46:34.000000000 +0000
@@ -245,7 +245,7 @@
 */
 
 String *eval_string_arg(const CHARSET_INFO *to_cs, Item *arg, String *buffer) {
-  StringBuffer<STRING_BUFFER_USUAL_SIZE> local_string(nullptr);
+  StringBuffer<STRING_BUFFER_USUAL_SIZE> local_string(nullptr, 0, to_cs);
 
   size_t offset;
   const bool convert =
@@ -1018,6 +1018,7 @@
 
 Item_field *get_gc_for_expr(const Item *func, Field *fld, Item_result type,
                             Field **found) {
+  func = func->real_item();
   Item *expr = fld->gcol_info->expr_item;
 
   /*
@@ -1314,11 +1315,11 @@
       Item_result type = args[0]->result_type();
       /*
         Check whether MEMBER OF is applicable for optimization:
-        1) 1st arg is a constant
+        1) 1st arg is constant for execution
         2) .. and it isn't NULL, as MEMBER OF can't be used to lookup NULLs
         3) 2nd arg can be substituted for a GC
       */
-      if (args[0]->const_item() &&                               // 1
+      if (args[0]->const_for_execution() &&                      // 1
           !args[0]->is_null() &&                                 // 2
           args[1]->can_be_substituted_for_gc(/*array=*/true)) {  // 3
         if (substitute_gc_expression(args + 1, args, gc_fields, type, this))
@@ -1332,12 +1333,12 @@
       /*
         Check whether JSON_CONTAINS is applicable for optimization:
         1) 1st arg can be substituted with a generated column
-        2) value to lookup is a constant
+        2) value to lookup is constant for execution
         3) value to lookup is a proper JSON doc
         4) value to lookup is an array or scalar
       */
       if (!args[0]->can_be_substituted_for_gc(/*array=*/true) ||  // 1
-          !args[1]->real_item()->const_item())                    // 2
+          !args[1]->const_for_execution())                        // 2
         break;
       if (get_json_wrapper(args, 1, &str, func_name(), &vals_wr) ||  // 3
           args[1]->null_value ||
@@ -1352,17 +1353,17 @@
 
       /*
         Check whether JSON_OVERLAPS is applicable for optimization:
-        1) One argument is a constant
+        1) One argument is constant for execution
         2) The other argument can be substituted with a generated column
         3) value to lookup is a proper JSON doc
         4) value to lookup is an array or scalar
       */
       if (args[0]->can_be_substituted_for_gc(/*array=*/true) &&  // 2
-          args[1]->const_item()) {                               // 1
+          args[1]->const_for_execution()) {                      // 1
         func = args;
         vals = 1;
       } else if (args[1]->can_be_substituted_for_gc(/*array=*/true) &&  // 2
-                 args[0]->const_item()) {                               // 1
+                 args[0]->const_for_execution()) {                      // 1
         func = args + 1;
         vals = 0;
       } else {
@@ -2331,8 +2332,8 @@
                                                             unsigned_flag);
 }
 
-double Item_func_div::real_op() {
-  assert(fixed == 1);
+double Item_func_div_base::real_op() {
+  assert(fixed);
   double val1 = args[0]->val_real();
   if (current_thd->is_error()) return error_real();
   double val2 = args[1]->val_real();
@@ -2346,7 +2347,7 @@
   return check_float_overflow(val1 / val2);
 }
 
-my_decimal *Item_func_div::decimal_op(my_decimal *decimal_value) {
+my_decimal *Item_func_div_base::decimal_op(my_decimal *decimal_value) {
   my_decimal value1, *val1;
   my_decimal value2, *val2;
   int err;
@@ -2358,7 +2359,7 @@
 
   if ((err = check_decimal_overflow(
            my_decimal_div(E_DEC_FATAL_ERROR & ~E_DEC_OVERFLOW & ~E_DEC_DIV_ZERO,
-                          decimal_value, val1, val2, prec_increment))) > 3) {
+                          decimal_value, val1, val2, m_prec_increment))) > 3) {
     if (err == E_DEC_DIV_ZERO) signal_divide_by_null();
     return error_decimal(decimal_value);
   }
@@ -2367,7 +2368,7 @@
 
 void Item_func_div::result_precision() {
   uint precision = min<uint>(
-      args[0]->decimal_precision() + args[1]->decimals + prec_increment,
+      args[0]->decimal_precision() + args[1]->decimals + m_prec_increment,
       DECIMAL_MAX_PRECISION);
 
   if (result_type() == DECIMAL_RESULT) assert(precision > 0);
@@ -2377,19 +2378,39 @@
     unsigned_flag = args[0]->unsigned_flag | args[1]->unsigned_flag;
   else
     unsigned_flag = args[0]->unsigned_flag & args[1]->unsigned_flag;
-  decimals = min<uint>(args[0]->decimals + prec_increment, DECIMAL_MAX_SCALE);
+  decimals = min<uint>(args[0]->decimals + m_prec_increment, DECIMAL_MAX_SCALE);
   max_length = my_decimal_precision_to_length_no_truncation(precision, decimals,
                                                             unsigned_flag);
 }
 
+void Item_func_div_int::result_precision() {
+  assert(result_type() == INT_RESULT);
+
+  // Integer operations keep unsigned_flag if one of arguments is unsigned
+  unsigned_flag = args[0]->unsigned_flag | args[1]->unsigned_flag;
+
+  uint arg0_decimals = args[0]->decimals;
+  if (arg0_decimals == DECIMAL_NOT_SPECIFIED) arg0_decimals = 0;
+  uint arg1_decimals = args[1]->decimals;
+  if (arg1_decimals == DECIMAL_NOT_SPECIFIED)
+    arg1_decimals = args[1]->decimal_precision();
+
+  uint precision =
+      min<uint>(args[0]->decimal_precision() - arg0_decimals + arg1_decimals,
+                MY_INT64_NUM_DECIMAL_DIGITS);
+
+  max_length =
+      my_decimal_precision_to_length_no_truncation(precision, 0, unsigned_flag);
+}
+
 bool Item_func_div::resolve_type(THD *thd) {
   DBUG_TRACE;
-  prec_increment = thd->variables.div_precincrement;
+  m_prec_increment = thd->variables.div_precincrement;
   if (Item_num_op::resolve_type(thd)) return true;
 
   switch (hybrid_type) {
     case REAL_RESULT: {
-      decimals = max(args[0]->decimals, args[1]->decimals) + prec_increment;
+      decimals = max(args[0]->decimals, args[1]->decimals) + m_prec_increment;
       decimals = min(decimals, uint8(DECIMAL_NOT_SPECIFIED));
       uint tmp = float_length(decimals);
       if (decimals == DECIMAL_NOT_SPECIFIED)
@@ -2416,9 +2437,8 @@
   return false;
 }
 
-/* Integer division */
-longlong Item_func_int_div::val_int() {
-  assert(fixed == 1);
+longlong Item_func_div_base::int_op() {
+  assert(fixed);
 
   /*
     Perform division using DECIMAL math if either of the operands has a
@@ -2477,15 +2497,21 @@
   return check_integer_overflow(res, !res_negative);
 }
 
-bool Item_func_int_div::resolve_type(THD *thd) {
+bool Item_func_div_int::resolve_type(THD *thd) {
+  // Integer division forces result to be integer, so force arguments
+  // that are parameters to be integer as well.
   if (param_type_uses_non_param(thd, MYSQL_TYPE_LONGLONG)) return true;
-  uint precision = args[0]->decimal_precision();
-  unsigned_flag = args[0]->unsigned_flag | args[1]->unsigned_flag;
 
-  fix_char_length(my_decimal_precision_to_length(precision, 0, unsigned_flag));
+  if (Item_func_div_base::resolve_type(thd)) return true;
+  set_nullable(true);  // division by zero
 
-  set_nullable(true);
-  return reject_geometry_args(arg_count, args, this);
+  return false;
+}
+
+void Item_func_div_int::set_numeric_type() {
+  set_data_type_longlong();
+  hybrid_type = INT_RESULT;
+  result_precision();
 }
 
 longlong Item_func_mod::int_op() {
@@ -2553,7 +2579,7 @@
       return decimal_value;
     case E_DEC_DIV_ZERO:
       signal_divide_by_null();
-      // Fall through.
+      [[fallthrough]];
     default:
       null_value = true;
       return nullptr;
@@ -2562,7 +2588,12 @@
 
 void Item_func_mod::result_precision() {
   decimals = max(args[0]->decimals, args[1]->decimals);
-  max_length = max(args[0]->max_length, args[1]->max_length);
+  uint precision =
+      max(args[0]->decimal_precision(), args[1]->decimal_precision());
+
+  max_length = my_decimal_precision_to_length_no_truncation(precision, decimals,
+                                                            unsigned_flag);
+
   // Increase max_length if we have: signed % unsigned(precision == scale)
   if (!args[0]->unsigned_flag && args[1]->unsigned_flag &&
       args[0]->max_length <= args[1]->max_length &&
@@ -2623,7 +2654,8 @@
     Use val() to get value as arg_type doesn't mean that item is
     Item_int or Item_real due to existence of Item_param.
   */
-  if (hybrid_type == INT_RESULT && args[0]->const_item()) {
+  if (hybrid_type == INT_RESULT && args[0]->const_item() &&
+      args[0]->may_eval_const_item(thd)) {
     longlong val = args[0]->val_int();
     if ((ulonglong)val >= (ulonglong)LLONG_MIN &&
         ((ulonglong)val != (ulonglong)LLONG_MIN ||
@@ -2632,7 +2664,8 @@
         Ensure that result is converted to DECIMAL, as longlong can't hold
         the negated number
       */
-      set_data_type(MYSQL_TYPE_NEWDECIMAL);
+      unsigned_flag = false;
+      set_data_type_decimal(args[0]->decimal_precision(), 0);
       hybrid_type = DECIMAL_RESULT;
       DBUG_PRINT("info", ("Type changed: DECIMAL_RESULT"));
     }
@@ -3313,9 +3346,10 @@
         Example: ROUND(99.999, 2). Here, the type of the argument is
         DECIMAL(5, 3). The type of the result is DECIMAL(5,2), since the
         result of this operation is 100.00.
+        Also make sure that precision is greater than zero.
       */
       longlong val1;
-      if (args[1]->const_item()) {
+      if (args[1]->const_item() && args[1]->may_eval_const_item(thd)) {
         val1 = args[1]->val_int();
         if ((null_value = args[1]->is_null())) {
           val1 = 0;
@@ -3342,6 +3376,7 @@
         if (!truncate) precision += 1;
         new_scale = val1;
       }
+      if (precision == 0) precision = 1;
       set_data_type_decimal(precision, new_scale);
       hybrid_type = DECIMAL_RESULT;
       break;
@@ -4156,15 +4191,17 @@
   if (param_type_is_default(thd, 0, -1)) return true;
   max_length = 3;  // 1-999
 
-  if (args[0]->const_item() && args[1]->type() == FIELD_ITEM) {
-    Field *field = ((Item_field *)args[1])->field;
+  if (args[0]->const_item() && args[1]->type() == FIELD_ITEM &&
+      args[0]->may_eval_const_item(thd)) {
+    Field *field = down_cast<Item_field *>(args[1])->field;
     if (field->real_type() == MYSQL_TYPE_SET) {
       String *find = args[0]->val_str(&value);
-      if (find) {
+      if (thd->is_error()) return true;
+      if (find != nullptr) {
         // find is not NULL pointer so args[0] is not a null-value
         assert(!args[0]->null_value);
-        enum_value = find_type(((Field_enum *)field)->typelib, find->ptr(),
-                               find->length(), false);
+        enum_value = find_type(down_cast<Field_enum *>(field)->typelib,
+                               find->ptr(), find->length(), false);
         enum_bit = 0;
         if (enum_value) enum_bit = 1LL << (enum_value - 1);
       }
@@ -4295,8 +4332,10 @@
   if (thd->stmt_arena->is_stmt_prepare() && thd->stmt_arena->is_repreparing)
     return;
 
-  if (u_d->func_deinit != nullptr) (*u_d->func_deinit)(&initid);
-
+  if (m_init_func_called && u_d->func_deinit != nullptr) {
+    (*u_d->func_deinit)(&initid);
+    m_init_func_called = false;
+  }
   DEBUG_SYNC(current_thd, "udf_handler_destroy_sync");
   free_handler();
 }
@@ -4438,9 +4477,11 @@
   initid.ptr = nullptr;
   initid.extension = &m_return_value_extension;
 
-  if (thd->stmt_arena->is_stmt_prepare() && !thd->stmt_arena->is_repreparing)
+  if (thd->stmt_arena->is_stmt_prepare() && !thd->stmt_arena->is_repreparing &&
+      !initid.const_item) {
+    udf_fun_guard.defer();
     return false;
-
+  }
   if (u_d->func_init) {
     if (call_init_func()) {
       return true;
@@ -4517,6 +4558,7 @@
     my_error(ER_CANT_INITIALIZE_UDF, MYF(0), u_d->name.str, init_msg_buff);
     return true;
   }
+  m_init_func_called = true;
   return false;
 }
 
@@ -6242,7 +6284,7 @@
       break;
     case DECIMAL_RESULT:
       str_set_decimal(E_DEC_FATAL_ERROR, pointer_cast<my_decimal *>(m_ptr), str,
-                      collation.collation);
+                      collation.collation, decimals);
       break;
     case STRING_RESULT:
       if (str->copy(m_ptr, m_length, collation.collation))
@@ -6690,13 +6732,21 @@
   *out_entry = var_entry;
 
   /*
+    In cases when this function is called for a sub-statement, we can't
+    rely on OPTION_BIN_LOG flag in THD::variables.option_bits bitmap
+    to determine whether binary logging is turned on, as this bit can be
+    cleared before executing sub-statement. So instead we have to look
+    at THD::variables::sql_log_bin member.
+  */
+  bool log_on = mysql_bin_log.is_open() && thd->variables.sql_log_bin;
+
+  /*
     Any reference to user-defined variable which is done from stored
     function or trigger affects their execution and the execution of the
     calling statement. We must log all such variables even if they are
     not involved in table-updating statements.
   */
-  if (!(opt_bin_log && (is_update_query(sql_command) || thd->in_sub_stmt)))
-    return 0;
+  if (!(log_on && (is_update_query(sql_command) || thd->in_sub_stmt))) return 0;
 
   if (var_entry == nullptr) {
     /*
diff -Nru mysql-8.0-8.0.26/sql/item_func.h mysql-8.0-8.0.27/sql/item_func.h
--- mysql-8.0-8.0.26/sql/item_func.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/item_func.h	2021-09-28 11:46:34.000000000 +0000
@@ -259,6 +259,8 @@
     NULLIF_FUNC,
     CASE_FUNC,
     YEAR_FUNC,
+    YEARWEEK_FUNC,
+    MAKEDATE_FUNC,
     MONTH_FUNC,
     MONTHNAME_FUNC,
     DAY_FUNC,
@@ -602,8 +604,7 @@
     @retval true   arg can be cached
     @retval false  otherwise
   */
-  virtual enum_const_item_cache can_cache_json_arg(
-      Item *arg MY_ATTRIBUTE((unused))) {
+  virtual enum_const_item_cache can_cache_json_arg(Item *arg [[maybe_unused]]) {
     return CACHE_NONE;
   }
 
@@ -695,8 +696,7 @@
     }
     return false;
   }
-  bool check_column_from_derived_table(
-      uchar *arg MY_ATTRIBUTE((unused))) override {
+  bool check_column_from_derived_table(uchar *arg [[maybe_unused]]) override {
     return false;
   }
   bool check_column_in_window_functions(uchar *arg) override;
@@ -1121,36 +1121,41 @@
   enum Functype functype() const override { return MUL_FUNC; }
 };
 
-class Item_func_div final : public Item_num_op {
+class Item_func_div_base : public Item_num_op {
  public:
-  uint prec_increment;
-  Item_func_div(const POS &pos, Item *a, Item *b) : Item_num_op(pos, a, b) {}
-  longlong int_op() override {
-    assert(false);
-    return 0;
-  }
+  Item_func_div_base(const POS &pos, Item *a, Item *b)
+      : Item_num_op(pos, a, b) {}
+  Item_func_div_base(Item *a, Item *b) : Item_num_op(a, b) {}
+  longlong int_op() override;
   double real_op() override;
   my_decimal *decimal_op(my_decimal *) override;
+  enum Functype functype() const override { return DIV_FUNC; }
+
+ protected:
+  uint m_prec_increment;
+};
+
+class Item_func_div final : public Item_func_div_base {
+ public:
+  Item_func_div(const POS &pos, Item *a, Item *b)
+      : Item_func_div_base(pos, a, b) {}
   const char *func_name() const override { return "/"; }
   bool resolve_type(THD *thd) override;
   void result_precision() override;
-  enum Functype functype() const override { return DIV_FUNC; }
 };
 
-class Item_func_int_div final : public Item_int_func {
+class Item_func_div_int final : public Item_func_div_base {
  public:
-  Item_func_int_div(Item *a, Item *b) : Item_int_func(a, b) {}
-  Item_func_int_div(const POS &pos, Item *a, Item *b)
-      : Item_int_func(pos, a, b) {}
-  longlong val_int() override;
+  Item_func_div_int(Item *a, Item *b) : Item_func_div_base(a, b) {}
+  Item_func_div_int(const POS &pos, Item *a, Item *b)
+      : Item_func_div_base(pos, a, b) {}
   const char *func_name() const override { return "DIV"; }
-  bool resolve_type(THD *thd) override;
-
-  void print(const THD *thd, String *str,
-             enum_query_type query_type) const override {
-    print_op(thd, str, query_type);
+  enum_field_types default_data_type() const override {
+    return MYSQL_TYPE_LONGLONG;
   }
-
+  bool resolve_type(THD *thd) override;
+  void result_precision() override;
+  void set_numeric_type() override;
   bool check_partition_func_processor(uchar *) override { return false; }
   bool check_function_as_value_generator(uchar *) override { return false; }
 };
@@ -1975,7 +1980,6 @@
   bool resolve_type(THD *thd) override {
     if (param_type_is_default(thd, 0, 1, MYSQL_TYPE_LONGLONG)) return true;
     unsigned_flag = true;
-    if (arg_count) max_length = args[0]->max_length;
     return false;
   }
   bool check_function_as_value_generator(uchar *checker_args) override {
@@ -3492,6 +3496,7 @@
     if (master == nullptr && ft_handler != nullptr) {
       ft_handler->please->close_search(ft_handler);
     }
+    score_from_index_scan = false;
     ft_handler = nullptr;
     concat_ws = nullptr;
     return;
diff -Nru mysql-8.0-8.0.26/sql/item_geofunc_buffer.cc mysql-8.0-8.0.27/sql/item_geofunc_buffer.cc
--- mysql-8.0-8.0.26/sql/item_geofunc_buffer.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/item_geofunc_buffer.cc	2021-09-28 11:46:34.000000000 +0000
@@ -344,334 +344,3 @@
   memset(settings, 0, sizeof(settings));
   memset(strategies, 0, sizeof(strategies));
 }
-
-namespace bgst = boost::geometry::strategy::buffer;
-
-String *Item_func_buffer::val_str(String *str_value_arg) {
-  DBUG_TRACE;
-  assert(fixed == 1);
-  String strat_bufs[side_strategy + 1];
-
-  String *obj = args[0]->val_str(&tmp_value);
-  if (!obj || args[0]->null_value) return error_str();
-
-  double dist = args[1]->val_real();
-  if (args[1]->null_value) return error_str();
-
-  Geometry_buffer buffer;
-  Geometry *geom;
-  String *str_result = str_value_arg;
-
-  null_value = false;
-  bg_resbuf_mgr.free_result_buffer();
-
-  // Reset the two arrays, set_strategies() requires the settings array to
-  // be brand new on every ST_Buffer() call.
-  memset(settings, 0, sizeof(settings));
-  memset(strategies, 0, sizeof(strategies));
-
-  // Strategies options start from 3rd argument, the 1st two arguments are
-  // never strategies: the 1st is input geometry, and the 2nd is distance.
-  num_strats = arg_count - 2;
-  for (uint i = 2; i < arg_count; i++) {
-    strategies[i - 2] = args[i]->val_str(&strat_bufs[i]);
-    if (strategies[i - 2] == nullptr || args[i]->null_value) return error_str();
-  }
-
-  /*
-    Do this before simplify_multi_geometry() in order to exclude invalid
-    WKB/WKT data.
-   */
-  if (!(geom = Geometry::construct(&buffer, obj))) {
-    my_error(ER_GIS_INVALID_DATA, MYF(0), func_name());
-    return error_str();
-  }
-
-  if (geom->get_srid() != 0) {
-    THD *thd = current_thd;
-    std::unique_ptr<dd::cache::Dictionary_client::Auto_releaser> releaser(
-        new dd::cache::Dictionary_client::Auto_releaser(thd->dd_client()));
-    Srs_fetcher fetcher(thd);
-    const dd::Spatial_reference_system *srs = nullptr;
-    if (fetcher.acquire(geom->get_srid(), &srs))
-      return error_str();  // Error has already been flagged.
-
-    if (srs == nullptr) {
-      my_error(ER_SRS_NOT_FOUND, MYF(0), geom->get_srid());
-      return error_str();
-    }
-
-    if (!srs->is_cartesian()) {
-      assert(srs->is_geographic());
-      std::string parameters(geom->get_class_info()->m_name.str);
-      parameters.append(", ...");
-      my_error(ER_NOT_IMPLEMENTED_FOR_GEOGRAPHIC_SRS, MYF(0), func_name(),
-               parameters.c_str());
-      return error_str();
-    }
-  }
-
-  /*
-    If the input geometry is a multi-geometry or geometry collection that has
-    only one component, extract that component as input argument.
-  */
-  Geometry::wkbType geom_type = geom->get_type();
-  if (geom_type == Geometry::wkb_multipoint ||
-      geom_type == Geometry::wkb_multipolygon ||
-      geom_type == Geometry::wkb_multilinestring ||
-      geom_type == Geometry::wkb_geometrycollection) {
-    /*
-      Make a copy of the geometry byte string argument to work on it,
-      don't modify the original one since it is assumed to be stable.
-      Simplifying the argument is worth the effort because buffer computation
-      is less expensive with simplified geometry.
-
-      The copy's buffer may be directly returned as result so it has to be a
-      data member.
-
-      Here we assume that if obj->is_alloced() is false, obj's referring to some
-      geometry data stored somewhere else so here we cache the simplified
-      version into m_tmp_geombuf without modifying obj's original referred copy;
-      otherwise we believe the geometry data
-      is solely owned by obj and that each call of this ST_Buffer() is given
-      a valid GEOMETRY byte string, i.e. it is structually valid and if it was
-      simplified before, the obj->m_length was correctly set to the new length
-      after the simplification operation.
-     */
-    const bool use_buffer = !obj->is_alloced();
-    if (simplify_multi_geometry(obj, (use_buffer ? &m_tmp_geombuf : nullptr)) &&
-        use_buffer)
-      obj = &m_tmp_geombuf;
-
-    if (!(geom = Geometry::construct(&buffer, obj))) {
-      my_error(ER_GIS_INVALID_DATA, MYF(0), func_name());
-      return error_str();
-    }
-  }
-
-  /*
-    If distance passed to ST_Buffer is too small, then we return the
-    original geometry as its buffer. This is needed to avoid division
-    overflow in buffer calculation, as well as for performance purposes.
-  */
-  if (std::abs(dist) <= GIS_ZERO || is_empty_geocollection(geom)) {
-    null_value = false;
-    str_result = obj;
-    return str_result;
-  }
-
-  Geometry::wkbType gtype = geom->get_type();
-  if (dist < 0 && gtype != Geometry::wkb_polygon &&
-      gtype != Geometry::wkb_multipolygon &&
-      gtype != Geometry::wkb_geometrycollection) {
-    my_error(ER_WRONG_ARGUMENTS, MYF(0), func_name());
-    return error_str();
-  }
-
-  set_strategies();
-  if (null_value) return error_str();
-
-  /*
-    str_result will refer to BG object's memory directly if any, here we remove
-    last call's remainings so that if this call doesn't produce any result,
-    this call won't note down last address(already freed above) and
-    next call won't free already free'd memory.
-  */
-  str_result->set(NullS, 0, &my_charset_bin);
-  bool had_except = false;
-
-  try {
-    Strategy_setting ss1 = settings[end_strategy];
-    Strategy_setting ss2 = settings[join_strategy];
-    Strategy_setting ss3 = settings[point_strategy];
-
-    const bool is_pts =
-        (gtype == Geometry::wkb_point || gtype == Geometry::wkb_multipoint);
-
-    const bool is_plygn =
-        (gtype == Geometry::wkb_polygon || gtype == Geometry::wkb_multipolygon);
-    const bool is_ls = (gtype == Geometry::wkb_linestring ||
-                        gtype == Geometry::wkb_multilinestring);
-
-    /*
-      Some strategies can be applied to only part of the geometry types and
-      coordinate systems. For now we only have cartesian coordinate system
-      so no check for them.
-    */
-    if ((is_pts && (ss1.strategy != invalid_strategy ||
-                    ss2.strategy != invalid_strategy)) ||
-        (is_plygn && (ss1.strategy != invalid_strategy ||
-                      ss3.strategy != invalid_strategy)) ||
-        (is_ls && ss3.strategy != invalid_strategy)) {
-      my_error(ER_WRONG_ARGUMENTS, MYF(0), func_name());
-      return error_str();
-    }
-
-    bgst::distance_symmetric<double> dist_strat(dist);
-    bgst::side_straight side_strat;
-    bgst::end_round bgst_end_round(
-        ss1.strategy == invalid_strategy ? 32 : ss1.value);
-    bgst::end_flat bgst_end_flat;
-    bgst::join_round bgst_join_round(
-        ss2.strategy == invalid_strategy ? 32 : ss2.value);
-    bgst::join_miter bgst_join_miter(ss2.value);
-    bgst::point_circle bgst_point_circle(
-        ss3.strategy == invalid_strategy ? 32 : ss3.value);
-    bgst::point_square bgst_point_square;
-
-    /*
-      Default strategies if not specified:
-      end_round(32), join_round(32), point_circle(32)
-      The order of enum items in enum enum_buffer_strategies is crucial for
-      this setting to be correct, don't modify it.
-
-      Although point strategy isn't needed for linear and areal geometries,
-      we have to specify it because of bg::buffer interface, and BG will
-      silently ignore it. Similarly for other strategies.
-    */
-    int strats_combination = 0;
-    if (ss1.strategy == end_flat) strats_combination |= 1;
-    if (ss2.strategy == join_miter) strats_combination |= 2;
-    if (ss3.strategy == point_square) strats_combination |= 4;
-
-    BG_models<bgcs::cartesian>::Multipolygon result;
-    result.set_srid(geom->get_srid());
-
-    if (geom->get_type() != Geometry::wkb_geometrycollection) {
-      bool ret = false;
-      switch (strats_combination) {
-        case 0:
-          CALL_BG_BUFFER(ret, geom, result, dist_strat, side_strat,
-                         bgst_join_round, bgst_end_round, bgst_point_circle);
-          break;
-        case 1:
-          CALL_BG_BUFFER(ret, geom, result, dist_strat, side_strat,
-                         bgst_join_round, bgst_end_flat, bgst_point_circle);
-          break;
-        case 2:
-          CALL_BG_BUFFER(ret, geom, result, dist_strat, side_strat,
-                         bgst_join_miter, bgst_end_round, bgst_point_circle);
-          break;
-        case 3:
-          CALL_BG_BUFFER(ret, geom, result, dist_strat, side_strat,
-                         bgst_join_miter, bgst_end_flat, bgst_point_circle);
-          break;
-        case 4:
-          CALL_BG_BUFFER(ret, geom, result, dist_strat, side_strat,
-                         bgst_join_round, bgst_end_round, bgst_point_square);
-          break;
-        case 5:
-          CALL_BG_BUFFER(ret, geom, result, dist_strat, side_strat,
-                         bgst_join_round, bgst_end_flat, bgst_point_square);
-          break;
-        case 6:
-          CALL_BG_BUFFER(ret, geom, result, dist_strat, side_strat,
-                         bgst_join_miter, bgst_end_round, bgst_point_square);
-          break;
-        case 7:
-          CALL_BG_BUFFER(ret, geom, result, dist_strat, side_strat,
-                         bgst_join_miter, bgst_end_flat, bgst_point_square);
-          break;
-        default:
-          assert(false);
-          break;
-      }
-
-      if (ret) return error_str();
-
-      if (result.size() == 0) {
-        str_result->reserve(GEOM_HEADER_SIZE + 4);
-        write_geometry_header(str_result, geom->get_srid(),
-                              Geometry::wkb_geometrycollection, 0);
-        return str_result;
-      } else if (post_fix_result(&bg_resbuf_mgr, result, str_result))
-        return error_str();
-      bg_resbuf_mgr.set_result_buffer(str_result->ptr());
-    } else {
-      // Compute buffer for a geometry collection(GC). We first compute buffer
-      // for each component of the GC, and put the buffer polygons into another
-      // collection, finally merge components of the collection.
-      BG_geometry_collection bggc, bggc2;
-      bggc.fill(geom);
-
-      for (BG_geometry_collection::Geometry_list::iterator i =
-               bggc.get_geometries().begin();
-           i != bggc.get_geometries().end(); ++i) {
-        BG_models<bgcs::cartesian>::Multipolygon res;
-        String temp_result;
-
-        res.set_srid((*i)->get_srid());
-        Geometry::wkbType g_type = (*i)->get_type();
-        if (dist < 0 && g_type != Geometry::wkb_multipolygon &&
-            g_type != Geometry::wkb_polygon) {
-          my_error(ER_WRONG_ARGUMENTS, MYF(0), func_name());
-          return error_str();
-        }
-
-        bool ret = false;
-        switch (strats_combination) {
-          case 0:
-            CALL_BG_BUFFER(ret, *i, res, dist_strat, side_strat,
-                           bgst_join_round, bgst_end_round, bgst_point_circle);
-            break;
-          case 1:
-            CALL_BG_BUFFER(ret, *i, res, dist_strat, side_strat,
-                           bgst_join_round, bgst_end_flat, bgst_point_circle);
-            break;
-          case 2:
-            CALL_BG_BUFFER(ret, *i, res, dist_strat, side_strat,
-                           bgst_join_miter, bgst_end_round, bgst_point_circle);
-            break;
-          case 3:
-            CALL_BG_BUFFER(ret, *i, res, dist_strat, side_strat,
-                           bgst_join_miter, bgst_end_flat, bgst_point_circle);
-            break;
-          case 4:
-            CALL_BG_BUFFER(ret, *i, res, dist_strat, side_strat,
-                           bgst_join_round, bgst_end_round, bgst_point_square);
-            break;
-          case 5:
-            CALL_BG_BUFFER(ret, *i, res, dist_strat, side_strat,
-                           bgst_join_round, bgst_end_flat, bgst_point_square);
-            break;
-          case 6:
-            CALL_BG_BUFFER(ret, *i, res, dist_strat, side_strat,
-                           bgst_join_miter, bgst_end_round, bgst_point_square);
-            break;
-          case 7:
-            CALL_BG_BUFFER(ret, *i, res, dist_strat, side_strat,
-                           bgst_join_miter, bgst_end_flat, bgst_point_square);
-            break;
-          default:
-            assert(false);
-            break;
-        }
-
-        if (ret) return error_str();
-        if (res.size() == 0) continue;
-        if (post_fix_result(&bg_resbuf_mgr, res, &temp_result))
-          return error_str();
-
-        // A single component's buffer is computed above and stored here.
-        bggc2.fill(&res);
-      }
-
-      // Merge the accumulated polygons because they may overlap.
-      bggc2.merge_components<bgcs::cartesian>(&null_value);
-      Gis_geometry_collection *gc = bggc2.as_geometry_collection(str_result);
-      delete gc;
-    }
-
-    /*
-      If the result geometry is a multi-geometry or geometry collection that has
-      only one component, extract that component as result.
-    */
-    simplify_multi_geometry(str_result, nullptr);
-  } catch (...) {
-    had_except = true;
-    handle_gis_exception("st_buffer");
-  }
-
-  if (had_except) return error_str();
-  return str_result;
-}
diff -Nru mysql-8.0-8.0.26/sql/item_geofunc.cc mysql-8.0-8.0.27/sql/item_geofunc.cc
--- mysql-8.0-8.0.26/sql/item_geofunc.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/item_geofunc.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1864,7 +1864,7 @@
         return true;
       }
     }
-      // Fall through.
+      [[fallthrough]];
     case 2: {
       // Validate options argument
       if (args[1]->propagate_type(thd, MYSQL_TYPE_LONGLONG)) return true;
@@ -1873,7 +1873,7 @@
         return true;
       }
     }
-      // Fall through.
+      [[fallthrough]];
     case 1: {
       /*
         Validate GeoJSON argument type. We do not allow binary data as GeoJSON
@@ -3659,7 +3659,7 @@
     }
   }
 
-  void on_wkb_end(const void *wkb MY_ATTRIBUTE((unused))) override {
+  void on_wkb_end(const void *wkb [[maybe_unused]]) override {
     if (pt_start)
       assert(static_cast<const char *>(pt_start) + POINT_DATA_SIZE == wkb);
 
@@ -4738,8 +4738,7 @@
 
   String backing_arg_wkb;
   String *arg_wkb = args[0]->val_str(&backing_arg_wkb);
-
-  // Note: Item.null_value is valid only after Item.val_* has been invoked.
+  if (current_thd->is_error()) return error_int();
 
   if (args[0]->null_value) {
     null_value = true;
@@ -4806,6 +4805,7 @@
 
   String tmp;
   String *swkb = args[0]->val_str(&tmp);
+  if (current_thd->is_error()) return error_int();
 
   if ((null_value = args[0]->null_value)) {
     assert(is_nullable());
@@ -4993,6 +4993,7 @@
   assert(fixed);
   String tmp_str;
   String *swkb = args[0]->val_str(&tmp_str);
+  if (current_thd->is_error()) return error_real();
 
   if ((null_value = (args[0]->null_value))) {
     assert(is_nullable());
@@ -5736,11 +5737,11 @@
 
   String backing_arg_wkb1;
   String *arg_wkb1 = args[0]->val_str(&backing_arg_wkb1);
+  if (current_thd->is_error()) return error_real();
 
   String backing_arg_wkb2;
   String *arg_wkb2 = args[1]->val_str(&backing_arg_wkb2);
-
-  // Note: Item.null_value is valid only after Item.val_* has been invoked.
+  if (current_thd->is_error()) return error_real();
 
   if (args[0]->null_value || args[1]->null_value) {
     null_value = true;
@@ -5827,6 +5828,70 @@
   return result;
 }
 
+String *Item_func_st_intersection::val_str(String *str) {
+  assert(fixed);
+  String temp_str1;
+  String temp_str2;
+  String *swkb1 = args[0]->val_str(&temp_str1);
+  String *swkb2 = args[1]->val_str(&temp_str2);
+  if (args[0]->null_value || args[1]->null_value) {
+    return null_return_str();
+  }
+  if (!swkb1 || !swkb2) {
+    /*
+    We've already found out that args[0]->null_value and args[1]->null_value are
+    false. Therefore, this should never happen.
+    */
+    assert(false);
+    my_error(ER_GIS_INVALID_DATA, MYF(0), func_name());
+    return error_str();
+  }
+  std::unique_ptr<dd::cache::Dictionary_client::Auto_releaser> releaser(
+      new dd::cache::Dictionary_client::Auto_releaser(
+          current_thd->dd_client()));
+  const dd::Spatial_reference_system *srs1 = nullptr;
+  const dd::Spatial_reference_system *srs2 = nullptr;
+  std::unique_ptr<gis::Geometry> g1;
+  std::unique_ptr<gis::Geometry> g2;
+  if (gis::parse_geometry(current_thd, func_name(), swkb1, &srs1, &g1) ||
+      gis::parse_geometry(current_thd, func_name(), swkb2, &srs2, &g2)) {
+    assert(current_thd->is_error());
+    return error_str();
+  }
+  assert(g1);
+  assert(g2);
+  // The two geometry operand must be in the same coordinate system.
+  gis::srid_t srid1 = srs1 == nullptr ? 0 : srs1->id();
+  gis::srid_t srid2 = srs2 == nullptr ? 0 : srs2->id();
+  if (srid1 != srid2) {
+    my_error(ER_GIS_DIFFERENT_SRIDS, MYF(0), func_name(), srid1, srid2);
+    return error_str();
+  }
+  // Currently not supporting geographic SRS
+  if (srs1 && srs1->is_geographic()) {
+    std::string parameters(gis::type_to_name(g1->type()));
+    parameters.append(", ").append(gis::type_to_name(g2->type()));
+    my_error(ER_NOT_IMPLEMENTED_FOR_GEOGRAPHIC_SRS, MYF(0), func_name(),
+             parameters.c_str());
+    return error_str();
+  }
+  std::unique_ptr<gis::Geometry> result_g;
+  if (gis::intersection(srs1, g1.get(), g2.get(), func_name(), &result_g)) {
+    assert(current_thd->is_error());
+    return error_str();
+  }
+  if (result_g.get() == nullptr) {
+    // There should always be an output geometry for valid input.
+    my_error(ER_GIS_INVALID_DATA, MYF(0), func_name());
+    return error_str();
+  }
+  if (write_geometry(srs1, *result_g, str)) {
+    assert(current_thd->is_error());
+    return error_str();
+  }
+  return str;
+}
+
 String *Item_func_lineinterpolate::val_str(String *str) {
   String *swkb = args[0]->val_str(str);
   const double distance = args[1]->val_real();
@@ -5898,6 +5963,71 @@
   return str;
 }
 
+String *Item_func_st_symdifference::val_str(String *str) {
+  assert(fixed);
+  String temp_str1;
+  String temp_str2;
+  String *swkb1 = args[0]->val_str(&temp_str1);
+  String *swkb2 = args[1]->val_str(&temp_str2);
+
+  if (args[0]->null_value || args[1]->null_value) {
+    return null_return_str();
+  }
+
+  if (!swkb1 || !swkb2) {
+    /*
+    We've already found out that args[0]->null_value and args[1]->null_value are
+    false. Therefore, this should never happen.
+    */
+    assert(false);
+    my_error(ER_GIS_INVALID_DATA, MYF(0), func_name());
+    return error_str();
+  }
+
+  std::unique_ptr<dd::cache::Dictionary_client::Auto_releaser> releaser(
+      new dd::cache::Dictionary_client::Auto_releaser(
+          current_thd->dd_client()));
+  const dd::Spatial_reference_system *srs1 = nullptr;
+  const dd::Spatial_reference_system *srs2 = nullptr;
+  std::unique_ptr<gis::Geometry> g1;
+  std::unique_ptr<gis::Geometry> g2;
+  if (gis::parse_geometry(current_thd, func_name(), swkb1, &srs1, &g1) ||
+      gis::parse_geometry(current_thd, func_name(), swkb2, &srs2, &g2)) {
+    assert(current_thd->is_error());
+    return error_str();
+  }
+
+  assert(g1);
+  assert(g2);
+
+  // The two geometry operand must be in the same coordinate system.
+  gis::srid_t srid1 = srs1 == nullptr ? 0 : srs1->id();
+  gis::srid_t srid2 = srs2 == nullptr ? 0 : srs2->id();
+  if (srid1 != srid2) {
+    my_error(ER_GIS_DIFFERENT_SRIDS, MYF(0), func_name(), srid1, srid2);
+    return error_str();
+  }
+
+  std::unique_ptr<gis::Geometry> result_g;
+  if (gis::symdifference(srs1, g1.get(), g2.get(), func_name(), &result_g)) {
+    assert(current_thd->is_error());
+    return error_str();
+  }
+
+  if (result_g.get() == nullptr) {
+    // There should always be an output geometry for valid input.
+    my_error(ER_GIS_INVALID_DATA, MYF(0), func_name());
+    return error_str();
+  }
+
+  if (write_geometry(srs1, *result_g, str)) {
+    assert(current_thd->is_error());
+    return error_str();
+  }
+
+  return str;
+}
+
 String *Item_func_st_transform::val_str(String *str) {
   assert(fixed);
   String *source_swkb = args[0]->val_str(str);
diff -Nru mysql-8.0-8.0.26/sql/item_geofunc.h mysql-8.0-8.0.27/sql/item_geofunc.h
--- mysql-8.0-8.0.26/sql/item_geofunc.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/item_geofunc.h	2021-09-28 11:46:34.000000000 +0000
@@ -179,12 +179,7 @@
             boost::geometry::cs.
     @param[out] pnull_value takes back null_value set during the operation.
    */
-  template <typename Coordsys>
-  void merge_components(bool *pnull_value);
-
  private:
-  template <typename Coordsys>
-  bool merge_one_run(Item_func_st_union *ifsu, bool *pnull_value);
   bool store_geometry(const Geometry *geo, bool break_multi_geom);
   Geometry *store(const Geometry *geo);
 };
@@ -980,59 +975,6 @@
   }
 };
 
-class Item_func_spatial_rel : public Item_bool_func2 {
- public:
-  Item_func_spatial_rel(const POS &pos, Item *a, Item *b)
-      : Item_bool_func2(pos, a, b) {}
-  longlong val_int() override;
-
-  // Use is not restricted to subclasses. Also used by setops,
-  // BG_geometry_collection::merge_one_run() and
-  // linear_areal_intersect_infinite().
-  static int bg_geo_relation_check(Geometry *g1, Geometry *g2,
-                                   Functype relchk_type, bool *);
-
- private:
-  template <typename Geom_types>
-  friend class BG_wrap;
-
-  template <typename Geotypes>
-  static int within_check(Geometry *g1, Geometry *g2, bool *pnull_value);
-  template <typename Geotypes>
-  static int equals_check(Geometry *g1, Geometry *g2, bool *pnull_value);
-  template <typename Geotypes>
-  static int disjoint_check(Geometry *g1, Geometry *g2, bool *pnull_value);
-  template <typename Geotypes>
-  static int intersects_check(Geometry *g1, Geometry *g2, bool *pnull_value);
-  template <typename Geotypes>
-  static int overlaps_check(Geometry *g1, Geometry *g2, bool *pnull_value);
-  template <typename Geotypes>
-  static int touches_check(Geometry *g1, Geometry *g2, bool *pnull_value);
-  template <typename Geotypes>
-  static int crosses_check(Geometry *g1, Geometry *g2, bool *pnull_value);
-
-  template <typename Coordsys>
-  int multipoint_within_geometry_collection(
-      Gis_multi_point *mpts,
-      const typename BG_geometry_collection::Geometry_list *gv2,
-      const void *prtree);
-
-  template <typename Coordsys>
-  int geocol_relation_check(Geometry *g1, Geometry *g2);
-  int geocol_relcheck_intersect_disjoint(
-      const BG_geometry_collection::Geometry_list *gv1,
-      const BG_geometry_collection::Geometry_list *gv2);
-  template <typename Coordsys>
-  int geocol_relcheck_within(
-      const typename BG_geometry_collection::Geometry_list *gv1,
-      const typename BG_geometry_collection::Geometry_list *gv2,
-      Functype spatial_rel);
-  template <typename Coordsys>
-  int geocol_equals_check(
-      const typename BG_geometry_collection::Geometry_list *gv1,
-      const typename BG_geometry_collection::Geometry_list *gv2);
-};
-
 class Item_func_spatial_relation : public Item_bool_func2 {
  public:
   Item_func_spatial_relation(const POS &pos, Item *a, Item *b)
@@ -1268,76 +1210,11 @@
   Spatial operations
 */
 class Item_func_spatial_operation : public Item_geometry_func {
- public:
-  String *val_str(String *) override;
-
  protected:
-  enum op_type {
-    op_union = 0x10000000,
-    op_intersection = 0x20000000,
-    op_symdifference = 0x30000000,
-    op_difference = 0x40000000,
-  };
-
-  Item_func_spatial_operation(const POS &pos, Item *a, Item *b, op_type sp_op)
-      : Item_geometry_func(pos, a, b), m_spatial_op(sp_op) {}
+  Item_func_spatial_operation(const POS &pos, Item *a, Item *b)
+      : Item_geometry_func(pos, a, b) {}
 
  private:
-  // It will call the protected member functions in this class,
-  // no data member accessed directly.
-  template <typename Geotypes>
-  friend class BG_setop_wrapper;
-
-  // Calls bg_geo_set_op.
-  friend class BG_geometry_collection;
-
-  template <typename Coordsys>
-  Geometry *bg_geo_set_op(Geometry *g1, Geometry *g2, String *result);
-
-  template <typename Coordsys>
-  Geometry *combine_sub_results(Geometry *g1, Geometry *g2,
-                                gis::srid_t default_srid, String *result);
-  Geometry *simplify_multilinestring(Gis_multi_line_string *mls,
-                                     String *result);
-
-  template <typename Coordsys>
-  Geometry *geometry_collection_set_operation(Geometry *g1, Geometry *g2,
-                                              String *result);
-
-  Geometry *empty_result(String *str, gis::srid_t srid);
-
-  bool assign_result(Geometry *geo, String *result);
-
-  template <typename Geotypes>
-  Geometry *intersection_operation(Geometry *g1, Geometry *g2, String *result);
-  template <typename Geotypes>
-  Geometry *union_operation(Geometry *g1, Geometry *g2, String *result);
-  template <typename Geotypes>
-  Geometry *difference_operation(Geometry *g1, Geometry *g2, String *result);
-  template <typename Geotypes>
-  Geometry *symdifference_operation(Geometry *g1, Geometry *g2, String *result);
-  template <typename Coordsys>
-  Geometry *geocol_symdifference(const BG_geometry_collection &bggc1,
-                                 const BG_geometry_collection &bggc2,
-                                 String *result);
-  template <typename Coordsys>
-  Geometry *geocol_difference(const BG_geometry_collection &bggc1,
-                              const BG_geometry_collection &bggc2,
-                              String *result);
-  template <typename Coordsys>
-  Geometry *geocol_intersection(const BG_geometry_collection &bggc1,
-                                const BG_geometry_collection &bggc2,
-                                String *result);
-  template <typename Coordsys>
-  Geometry *geocol_union(const BG_geometry_collection &bggc1,
-                         const BG_geometry_collection &bggc2, String *result);
-
-  op_type m_spatial_op;
-  String m_result_buffer;
-  String m_tmp_value1;
-  String m_tmp_value2;
-  BG_result_buf_mgr m_bg_resbuf_mgr;
-
   bool resolve_type(THD *thd) override {
     if (param_type_is_default(thd, 0, -1, MYSQL_TYPE_GEOMETRY)) return true;
     return Item_geometry_func::resolve_type(thd);
@@ -1347,7 +1224,7 @@
 class Item_func_st_difference final : public Item_func_spatial_operation {
  public:
   Item_func_st_difference(const POS &pos, Item *a, Item *b)
-      : Item_func_spatial_operation(pos, a, b, op_difference) {}
+      : Item_func_spatial_operation(pos, a, b) {}
   String *val_str(String *) override;
   const char *func_name() const override { return "st_difference"; }
 };
@@ -1355,21 +1232,23 @@
 class Item_func_st_intersection final : public Item_func_spatial_operation {
  public:
   Item_func_st_intersection(const POS &pos, Item *a, Item *b)
-      : Item_func_spatial_operation(pos, a, b, op_intersection) {}
+      : Item_func_spatial_operation(pos, a, b) {}
+  String *val_str(String *) override;
   const char *func_name() const override { return "st_intersection"; }
 };
 
 class Item_func_st_symdifference final : public Item_func_spatial_operation {
  public:
   Item_func_st_symdifference(const POS &pos, Item *a, Item *b)
-      : Item_func_spatial_operation(pos, a, b, op_symdifference) {}
+      : Item_func_spatial_operation(pos, a, b) {}
+  String *val_str(String *) override;
   const char *func_name() const override { return "st_symdifference"; }
 };
 
 class Item_func_st_union final : public Item_func_spatial_operation {
  public:
   Item_func_st_union(const POS &pos, Item *a, Item *b)
-      : Item_func_spatial_operation(pos, a, b, op_union) {}
+      : Item_func_spatial_operation(pos, a, b) {}
   String *val_str(String *) override;
   const char *func_name() const override { return "st_union"; }
 };
@@ -1443,7 +1322,6 @@
  public:
   Item_func_buffer(const POS &pos, PT_item_list *ilist);
   const char *func_name() const override { return "st_buffer"; }
-  String *val_str(String *) override;
 };
 
 class Item_func_buffer_strategy : public Item_str_func {
diff -Nru mysql-8.0-8.0.26/sql/item_geofunc_internal.cc mysql-8.0-8.0.27/sql/item_geofunc_internal.cc
--- mysql-8.0-8.0.26/sql/item_geofunc_internal.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/item_geofunc_internal.cc	2021-09-28 11:46:34.000000000 +0000
@@ -107,152 +107,6 @@
   return false;
 }
 
-template <typename Coordsys>
-void BG_geometry_collection::merge_components(bool *pnull_value) {
-  if (is_comp_no_overlapped()) return;
-
-  POS pos{{nullptr, nullptr}, {nullptr, nullptr}};
-  Item_func_st_union ifsu(pos, nullptr, nullptr);
-  bool do_again = true;
-  uint32 last_composition[6] = {0}, num_unchanged_composition = 0;
-  size_t last_num_geos = 0;
-
-  /*
-    After each merge_one_run call, see whether the two indicators change:
-    1. total number of geometry components;
-    2. total number of each of the 6 types of geometries
-
-    If they don't change for N*N/4 times, break out of the loop. Here N is
-    the total number of geometry components.
-
-    There is the rationale:
-
-    Given a geometry collection, it's likely that one effective merge_one_run
-    merges a polygon P and the linestring that crosses it (L) to a
-    polygon P'(the same one) and another linestring L', the 2 indicators above
-    don't change but the merge is actually done. If we merge P'
-    and L' again, they should not be considered cross, but given certain data
-    BG somehow believes L` still crosses P` even the P and P` are valid, and
-    it will give us a L'' and P'' which is different from L' and P'
-    respectively, and L'' is still considered crossing P'',
-    hence the loop here never breaks out.
-
-    If the collection has N components, and we have X [multi]linestrings and
-    N-X polygons, the number of pairs that can be merged is Y = X * (N-X),
-    so the largest Y is N*N/4. If the above 2 indicators stay unchanged more
-    than N*N/4 times the loop runs, we believe all possible combinations in
-    the collection are enumerated and no effective merge is being done any more.
-
-    Note that the L'' and P'' above is different from L' and P' so we can't
-    compare GEOMETRY byte string, and geometric comparison is expensive and may
-    still compare unequal and we would still be stuck in the endless loop.
-  */
-  while (!*pnull_value && do_again) {
-    do_again = merge_one_run<Coordsys>(&ifsu, pnull_value);
-    if (!*pnull_value && do_again) {
-      const size_t num_geos = m_geos.size();
-      uint32 composition[6] = {0};
-
-      for (size_t i = 0; i < num_geos; ++i)
-        composition[m_geos[i]->get_type() - 1]++;
-
-      if (num_geos != last_num_geos ||
-          memcmp(composition, last_composition, sizeof(composition))) {
-        memcpy(last_composition, composition, sizeof(composition));
-        last_num_geos = num_geos;
-        num_unchanged_composition = 0;
-      } else
-        num_unchanged_composition++;
-
-      if (num_unchanged_composition > (last_num_geos * last_num_geos / 4 + 2))
-        break;
-    }
-  }
-}
-
-// Explicit template instantiation
-template void BG_geometry_collection::merge_components<
-    boost::geometry::cs::cartesian>(bool *);
-
-template <typename Coordsys>
-inline bool linestring_overlaps_polygon_outerring(const Gis_line_string &ls,
-                                                  const Gis_polygon &plgn) {
-  Gis_polygon_ring &oring = plgn.outer();
-  Gis_line_string ls2(oring.get_ptr(), oring.get_nbytes(), oring.get_flags(),
-                      oring.get_srid());
-  return boost::geometry::overlaps(ls, ls2);
-}
-
-template <typename Coordsys>
-bool linear_areal_intersect_infinite(Geometry *g1, Geometry *g2,
-                                     bool *pnull_value) {
-  bool res = false;
-
-  /*
-    If crosses check succeeds, make sure g2 is a valid [multi]polygon, invalid
-    ones can be accepted by BG and the cross check would be considered true,
-    we should reject such result and return false in this case.
-  */
-  if (Item_func_spatial_rel::bg_geo_relation_check(
-          g1, g2, Item_func::SP_CROSSES_FUNC, pnull_value) &&
-      !*pnull_value) {
-    Geometry::wkbType g2_type = g2->get_type();
-    if (g2_type == Geometry::wkb_polygon) {
-      Gis_polygon plgn(g2->get_data_ptr(), g2->get_data_size(), g2->get_flags(),
-                       g2->get_srid());
-      res = bg::is_valid(plgn);
-    } else if (g2_type == Geometry::wkb_multipolygon) {
-      Gis_multi_polygon mplgn(g2->get_data_ptr(), g2->get_data_size(),
-                              g2->get_flags(), g2->get_srid());
-      res = bg::is_valid(mplgn);
-    } else
-      assert(false);
-
-    return res;
-  }
-
-  if (*pnull_value) return false;
-
-  if (g1->get_type() == Geometry::wkb_linestring) {
-    Gis_line_string ls(g1->get_data_ptr(), g1->get_data_size(), g1->get_flags(),
-                       g1->get_srid());
-    if (g2->get_type() == Geometry::wkb_polygon) {
-      Gis_polygon plgn(g2->get_data_ptr(), g2->get_data_size(), g2->get_flags(),
-                       g2->get_srid());
-      res = linestring_overlaps_polygon_outerring<Coordsys>(ls, plgn);
-    } else {
-      Gis_multi_polygon mplgn(g2->get_data_ptr(), g2->get_data_size(),
-                              g2->get_flags(), g2->get_srid());
-      for (size_t i = 0; i < mplgn.size(); i++) {
-        if (linestring_overlaps_polygon_outerring<Coordsys>(ls, mplgn[i]))
-          return true;
-      }
-    }
-  } else {
-    Gis_multi_line_string mls(g1->get_data_ptr(), g1->get_data_size(),
-                              g1->get_flags(), g1->get_srid());
-    if (g2->get_type() == Geometry::wkb_polygon) {
-      Gis_polygon plgn(g2->get_data_ptr(), g2->get_data_size(), g2->get_flags(),
-                       g2->get_srid());
-      for (size_t i = 0; i < mls.size(); i++) {
-        if (linestring_overlaps_polygon_outerring<Coordsys>(mls[i], plgn))
-          return true;
-      }
-    } else {
-      Gis_multi_polygon mplgn(g2->get_data_ptr(), g2->get_data_size(),
-                              g2->get_flags(), g2->get_srid());
-      for (size_t j = 0; j < mls.size(); j++) {
-        for (size_t i = 0; i < mplgn.size(); i++) {
-          if (linestring_overlaps_polygon_outerring<Coordsys>(mls[j], mplgn[i]))
-            return true;
-        }
-      }
-    }
-  }
-
-  return res;
-}
-
 /**
   Create this class for exception safety --- destroy the objects referenced
   by the pointers in the set when destroying the container.
@@ -287,201 +141,6 @@
   }
 };
 
-/**
-  One run of merging components.
-
-  @tparam Coordsys Coordinate system type, specified using those defined in
-          boost::geometry::cs.
-  @param ifsu the Item_func_spatial_operation object, we here rely on it to
-         do union operation.
-  @param[out] pnull_value takes back null_value set during the operation.
-  @return whether need another call of this function.
- */
-template <typename Coordsys>
-bool BG_geometry_collection::merge_one_run(Item_func_st_union *ifsu,
-                                           bool *pnull_value) {
-  Geometry *gres = nullptr;
-  bool has_new = false;
-  bool &null_value = *pnull_value;
-  Pointer_vector<Geometry> added;
-  std::vector<String> added_wkbbufs;
-
-  added.reserve(16);
-  added_wkbbufs.reserve(16);
-
-  Rtree_index rtree;
-  make_rtree(m_geos, &rtree);
-  Rtree_result rtree_result;
-
-  for (Geometry_list::iterator i = m_geos.begin(); i != m_geos.end(); ++i) {
-    if (*i == NULL) continue;
-
-    BG_box box;
-    make_bg_box(*i, &box);
-    if (!is_box_valid(box)) continue;
-
-    rtree_result.clear();
-    rtree.query(bgi::intersects(box), std::back_inserter(rtree_result));
-    /*
-      Normally the rtree should be non-empty because at least there is *i
-      itself. But if box has NaN coordinates, the rtree can be empty since
-      all coordinate comparisons with NaN numbers are false. also if the
-      min corner point have greater coordinates than the max corner point,
-      the box isn't valid and the rtree can be empty.
-     */
-    assert(rtree_result.size() != 0);
-
-    // Sort rtree_result by Rtree_entry::second in order to make
-    // components in fixed order.
-    Rtree_entry_compare rtree_entry_compare;
-    std::sort(rtree_result.begin(), rtree_result.end(), rtree_entry_compare);
-
-    // Used to stop the nested loop.
-    bool stop_it = false;
-
-    for (Rtree_result::iterator j = rtree_result.begin();
-         j != rtree_result.end(); ++j) {
-      Geometry *geom2 = m_geos[j->second];
-      if (*i == geom2 || geom2 == nullptr) continue;
-
-      // Equals is much easier and faster to check, so check it first.
-      if (Item_func_spatial_rel::bg_geo_relation_check(
-              geom2, *i, Item_func::SP_EQUALS_FUNC, &null_value) &&
-          !null_value) {
-        *i = NULL;
-        break;
-      }
-
-      if (null_value) {
-        stop_it = true;
-        break;
-      }
-
-      if (Item_func_spatial_rel::bg_geo_relation_check(
-              *i, geom2, Item_func::SP_WITHIN_FUNC, &null_value) &&
-          !null_value) {
-        *i = NULL;
-        break;
-      }
-
-      if (null_value) {
-        stop_it = true;
-        break;
-      }
-
-      if (Item_func_spatial_rel::bg_geo_relation_check(
-              geom2, *i, Item_func::SP_WITHIN_FUNC, &null_value) &&
-          !null_value) {
-        m_geos[j->second] = nullptr;
-        continue;
-      }
-
-      if (null_value) {
-        stop_it = true;
-        break;
-      }
-
-      /*
-        If *i and geom2 is a polygon and a linestring that intersect only
-        finite number of points, the union result is the same as the two
-        geometries, and we would be stuck in an infinite loop. So we must
-        detect and exclude this case. All other argument type combinations
-        always will get a geometry different from the two arguments.
-      */
-      char d11 = (*i)->feature_dimension();
-      char d12 = geom2->feature_dimension();
-      Geometry *geom_d1 = nullptr;
-      Geometry *geom_d2 = nullptr;
-      bool is_linear_areal = false;
-
-      if (((d11 == 1 && d12 == 2) || (d12 == 1 && d11 == 2))) {
-        geom_d1 = (d11 == 1 ? *i : geom2);
-        geom_d2 = (d11 == 2 ? *i : geom2);
-        if (d11 != 1) {
-          const char tmp_dim = d11;
-          d11 = d12;
-          d12 = tmp_dim;
-        }
-        is_linear_areal = true;
-      }
-
-      /*
-        As said above, if one operand is linear, the other is areal, then we
-        only proceed the union of them if they intersect infinite number of
-        points, i.e. L crosses A or L touches A's outer ring. Note that if L
-        touches some of A's inner rings, L must be crossing A, so not gonna
-        check the inner rings.
-      */
-      if ((!is_linear_areal &&
-           Item_func_spatial_rel::bg_geo_relation_check(
-               *i, geom2, Item_func::SP_INTERSECTS_FUNC, &null_value) &&
-           !null_value) ||
-          (is_linear_areal && linear_areal_intersect_infinite<Coordsys>(
-                                  geom_d1, geom_d2, &null_value))) {
-        String wkbres;
-
-        if (null_value) {
-          stop_it = true;
-          break;
-        }
-
-        gres = ifsu->bg_geo_set_op<Coordsys>(*i, geom2, &wkbres);
-        null_value = ifsu->null_value;
-
-        if (null_value) {
-          if (gres != nullptr && gres != *i && gres != geom2) delete gres;
-          stop_it = true;
-          break;
-        }
-
-        if (gres != *i) *i = NULL;
-        if (gres != geom2) m_geos[j->second] = nullptr;
-        if (gres != nullptr && gres != *i && gres != geom2) {
-          added.push_back(gres);
-          String tmp_wkbbuf;
-          added_wkbbufs.push_back(tmp_wkbbuf);
-          added_wkbbufs.back().takeover(wkbres);
-          has_new = true;
-          gres = nullptr;
-        }
-        /*
-          Done with *i, it's either adopted, or removed or merged to a new
-          geometry.
-         */
-        break;
-      }  // intersects
-
-      if (null_value) {
-        stop_it = true;
-        break;
-      }
-
-    }  // for (*j)
-
-    if (stop_it) break;
-
-  }  // for (*i)
-
-  // Remove deleted Geometry object pointers, then append new components if any.
-  Is_target_geometry pred(nullptr);
-  Geometry_list::iterator jj =
-      std::remove_if(m_geos.begin(), m_geos.end(), pred);
-  m_geos.resize(jj - m_geos.begin());
-
-  for (Pointer_vector<Geometry>::iterator i = added.begin(); i != added.end();
-       ++i) {
-    /*
-      Fill rather than directly use *i for consistent memory management.
-      The objects pointed by pointers in added will be automatically destroyed.
-     */
-    fill(*i);
-  }
-
-  // The added and added_wkbbufs arrays are destroyed and the Geometry objects
-  // in 'added' are freed, and memory buffers in added_wkbbufs are freed too.
-  return has_new;
-}
-
 inline void reassemble_geometry(Geometry *g) {
   Geometry::wkbType gtype = g->get_geotype();
   if (gtype == Geometry::wkb_polygon)
diff -Nru mysql-8.0-8.0.26/sql/item_geofunc_internal.h mysql-8.0-8.0.27/sql/item_geofunc_internal.h
--- mysql-8.0-8.0.26/sql/item_geofunc_internal.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/item_geofunc_internal.h	2021-09-28 11:46:34.000000000 +0000
@@ -51,8 +51,6 @@
 
 #define GIS_ZERO 0.00000000001
 
-extern bool simplify_multi_geometry(String *str, String *result_buffer);
-
 /// A wrapper and interface for all geometry types used here. Make these
 /// types as localized as possible. It's used as a type interface.
 /// @tparam CoordinateSystemType Coordinate system type, specified using
@@ -173,36 +171,6 @@
   }
 };
 
-/**
-  Utility class, reset specified variable 'valref' to specified 'oldval' when
-  val_resetter<valtype> instance is destroyed.
-  @tparam Valtype Variable type to reset.
- */
-template <typename Valtype>
-class Var_resetter {
- private:
-  Valtype *valref;
-  Valtype oldval;
-
-  // Forbid use, to eliminate a warning: oldval may be used uninitialized.
-  Var_resetter(const Var_resetter &o);
-  Var_resetter &operator=(const Var_resetter &);
-
- public:
-  Var_resetter() : valref(nullptr) {}
-
-  Var_resetter(Valtype *v, const Valtype &oval) : valref(v), oldval(oval) {}
-
-  ~Var_resetter() {
-    if (valref) *valref = oldval;
-  }
-
-  void set(Valtype *v, const Valtype &oldval) {
-    valref = v;
-    this->oldval = oldval;
-  }
-};
-
 /**
   For every Geometry object write-accessed by a boost geometry function, i.e.
   those passed as out parameter into set operation functions, call this
diff -Nru mysql-8.0-8.0.26/sql/item_geofunc_relchecks_bgwrap.cc mysql-8.0-8.0.27/sql/item_geofunc_relchecks_bgwrap.cc
--- mysql-8.0-8.0.26/sql/item_geofunc_relchecks_bgwrap.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/item_geofunc_relchecks_bgwrap.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,1499 +0,0 @@
-/* Copyright (c) 2015, 2021, Oracle 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,
-   as published by the Free Software Foundation.
-
-   This program is also distributed with certain software (including
-   but not limited to OpenSSL) that is licensed under separate terms,
-   as designated in a particular file or component or in included license
-   documentation.  The authors of MySQL hereby grant you an additional
-   permission to link the program and your derivative works with the
-   separately licensed software that they have included with MySQL.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License, version 2.0, for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
-
-#include "sql/item_geofunc_relchecks_bgwrap.h"
-
-#include <assert.h>
-#include <algorithm>
-#include <boost/concept/usage.hpp>
-#include <boost/geometry/algorithms/equals.hpp>
-#include <boost/geometry/algorithms/intersects.hpp>
-#include <boost/geometry/algorithms/touches.hpp>
-#include <boost/geometry/algorithms/within.hpp>
-#include <boost/geometry/geometries/box.hpp>
-#include <boost/geometry/index/rtree.hpp>
-#include <boost/geometry/strategies/strategies.hpp>
-#include <utility>
-
-#include "sql/item_geofunc_internal.h"
-#include "sql/spatial.h"
-
-/**
-  Dispatcher for 'point WITHIN xxx'.
-
-  @tparam Geom_types Geometry types definitions.
-  @param g1 First Geometry operand, a point.
-  @param g2 Second Geometry operand, not a geometry collection.
-  @param[out] pnull_value Returns whether error occurred duirng the computation.
-  @return 0 if specified relation doesn't hold for the given operands,
-                otherwise returns none 0.
- */
-template <typename Geom_types>
-int BG_wrap<Geom_types>::point_within_geometry(Geometry *g1, Geometry *g2,
-                                               bool *pnull_value) {
-  int result = 0;
-  Geometry::wkbType gt2 = g2->get_type();
-
-  if (gt2 == Geometry::wkb_polygon)
-    BGCALL(result, within, Point, g1, Polygon, g2, pnull_value);
-  else if (gt2 == Geometry::wkb_multipolygon)
-    BGCALL(result, within, Point, g1, Multipolygon, g2, pnull_value);
-  else if (gt2 == Geometry::wkb_point)
-    BGCALL(result, within, Point, g1, Point, g2, pnull_value);
-  else if (gt2 == Geometry::wkb_multipoint)
-    BGCALL(result, within, Point, g1, Multipoint, g2, pnull_value);
-  else if (gt2 == Geometry::wkb_linestring)
-    BGCALL(result, within, Point, g1, Linestring, g2, pnull_value);
-  else if (gt2 == Geometry::wkb_multilinestring)
-    BGCALL(result, within, Point, g1, Multilinestring, g2, pnull_value);
-  else
-    assert(false);
-
-  return result;
-}
-
-/**
-  Dispatcher for 'multipoint WITHIN xxx'.
-
-  @tparam Geom_types Geometry types definitions.
-  @param g1 First Geometry operand, a multipoint.
-  @param g2 Second Geometry operand, not a geometry collection.
-  @param[out] pnull_value Returns whether error occurred duirng the computation.
-  @return 0 if specified relation doesn't hold for the given operands,
-                otherwise returns none 0.
- */
-template <typename Geom_types>
-int BG_wrap<Geom_types>::multipoint_within_geometry(Geometry *g1, Geometry *g2,
-                                                    bool *pnull_value) {
-  int result = 0;
-  Geometry::wkbType gt2 = g2->get_type();
-  const void *data_ptr = nullptr;
-
-  Multipoint mpts(g1->get_data_ptr(), g1->get_data_size(), g1->get_flags(),
-                  g1->get_srid());
-  if (gt2 == Geometry::wkb_polygon) {
-    data_ptr = g2->normalize_ring_order();
-    if (data_ptr == nullptr) {
-      my_error(ER_GIS_INVALID_DATA, MYF(0), "st_within");
-      *pnull_value = true;
-      return result;
-    }
-
-    Polygon plg(data_ptr, g2->get_data_size(), g2->get_flags(), g2->get_srid());
-
-    result = multipoint_within_geometry_internal(mpts, plg);
-  } else if (gt2 == Geometry::wkb_multipolygon) {
-    data_ptr = g2->normalize_ring_order();
-    if (data_ptr == nullptr) {
-      *pnull_value = true;
-      my_error(ER_GIS_INVALID_DATA, MYF(0), "st_within");
-      return result;
-    }
-
-    Multipolygon mplg(data_ptr, g2->get_data_size(), g2->get_flags(),
-                      g2->get_srid());
-
-    /*
-      One may want to build the rtree index on mpts when mpts has more
-      components than mplg, but then one would have to track the points that
-      are already known to be in one of mplg's polygons and avoid checking
-      again (which may fail and cause false alarm) for other polygon components.
-      Such maintenance brings extra cost and performance test prooves that
-      it's not desirable.
-      The containers tried for such maintenance including std::vector<bool>,
-      std::set<array_index>, mpts[i].set_props().
-
-      Also, even if the mplg has only one polygon, i.e. the worst case for
-      building rtree index on mplg, the performance is still very very close to
-      the linear search done in multipoint_within_geometry_internal.
-
-      So always build index on mplg as below.
-    */
-    result = multipoint_within_multipolygon(mpts, mplg);
-  } else if (gt2 == Geometry::wkb_point) {
-    /* There may be duplicate Points, thus use a set to make them unique*/
-    Point_set ptset1(mpts.begin(), mpts.end());
-    Point pt(g2->get_data_ptr(), g2->get_data_size(), g2->get_flags(),
-             g2->get_srid());
-    result =
-        ((ptset1.size() == 1) && boost::geometry::equals(*ptset1.begin(), pt));
-  } else if (gt2 == Geometry::wkb_multipoint) {
-    /* There may be duplicate Points, thus use a set to make them unique*/
-    Point_set ptset1(mpts.begin(), mpts.end());
-    Multipoint mpts2(g2->get_data_ptr(), g2->get_data_size(), g2->get_flags(),
-                     g2->get_srid());
-    Point_set ptset2(mpts2.begin(), mpts2.end());
-    Point_vector respts;
-    typename Point_vector::iterator endpos;
-    respts.resize(std::max(ptset1.size(), ptset2.size()));
-    endpos = std::set_intersection(ptset1.begin(), ptset1.end(), ptset2.begin(),
-                                   ptset2.end(), respts.begin(), bgpt_lt());
-    result = (ptset1.size() == static_cast<size_t>(endpos - respts.begin()));
-  } else if (gt2 == Geometry::wkb_linestring) {
-    Linestring ls(g2->get_data_ptr(), g2->get_data_size(), g2->get_flags(),
-                  g2->get_srid());
-    result = multipoint_within_geometry_internal(mpts, ls);
-  } else if (gt2 == Geometry::wkb_multilinestring) {
-    Multilinestring mls(g2->get_data_ptr(), g2->get_data_size(),
-                        g2->get_flags(), g2->get_srid());
-    /*
-      Here we can't separate linestrings of a multilinstring MLS to do within
-      check one by one because if N (N > 1) linestrings share the same boundary
-      point P, P may or may not be a boundary point of MLS, depending on N%2,
-      if N is an even number P is an internal point of MLS, otherwise P is a
-      boundary point of MLS.
-    */
-    result = multipoint_within_geometry_internal(mpts, mls);
-  } else
-    assert(false);
-
-  return result;
-}
-
-template <typename Geom_types>
-template <typename GeomType>
-int BG_wrap<Geom_types>::multipoint_within_geometry_internal(
-    const Multipoint &mpts, const GeomType &geom) {
-  bool has_inner = false;
-
-  for (typename Multipoint::iterator i = mpts.begin(); i != mpts.end(); ++i) {
-    /*
-      Checking for intersects is faster than within, so if there is at least
-      one point within geom, only check that the rest points intersects geom.
-     */
-    if (!has_inner && (has_inner = boost::geometry::within(*i, geom))) continue;
-
-    if (!boost::geometry::intersects(*i, geom)) return 0;
-  }
-
-  return has_inner;
-}
-
-template <typename Geom_types>
-int BG_wrap<Geom_types>::multipoint_within_multipolygon(
-    const Multipoint &mpts, const Multipolygon &mplgn) {
-  bool has_inner = false;
-
-  Rtree_index rtree;
-  make_rtree_bggeom(mplgn, &rtree);
-  BG_box box;
-
-  for (typename Multipoint::iterator i = mpts.begin(); i != mpts.end(); ++i) {
-    bool already_in = false;
-    // Search for polygons that may intersect *i point using the rtree index.
-    boost::geometry::envelope(*i, box);
-    Rtree_index::const_query_iterator j = rtree.qbegin(bgi::intersects(box));
-    if (j == rtree.qend()) return 0;
-    /*
-      All polygons that possibly intersect *i point are given by the
-      rtree iteration below.
-    */
-    for (; j != rtree.qend(); ++j) {
-      /*
-        Checking for intersects is faster than within, so if there is at least
-        one point within geom, only check that the rest points intersects geom.
-      */
-      const Polygon &plgn = mplgn[j->second];
-      /*
-        If we don't have a point in mpts that's within mplgn yet,
-        check whether *i is within plgn.
-        If *i is within plgn, it's already in the multipolygon, so no need
-        for more checks.
-      */
-      if (!has_inner && (has_inner = boost::geometry::within(*i, plgn))) {
-        already_in = true;
-        break;
-      }
-
-      /*
-        If we already have a point within mplgn, OR if *i is checked above to
-        be not within plgn, check whether *i intersects plgn.
-        *i has to intersect one of the components in this loop, otherwise *i
-        is out of mplgn.
-       */
-      if (boost::geometry::intersects(*i, plgn)) {
-        already_in = true;
-        /*
-          It's likely that *i is within another plgn, so only stop the
-          iteration if we already have a point that's within the multipolygon,
-          in order not to miss the polygon containing *i.
-        */
-        if (has_inner) break;
-      }
-    }
-
-    /*
-      The *i point isn't within or intersects any polygon of mplgn,
-      so mpts isn't within geom.
-    */
-    if (!already_in) return 0;
-  }
-
-  /*
-    All points in mpts at least intersects geom, so the result is determined
-    by whether there is at least one point in mpts that's within geom.
-  */
-  return has_inner;
-}
-
-template <typename Geom_types>
-int BG_wrap<Geom_types>::linestring_within_geometry(Geometry *g1, Geometry *g2,
-                                                    bool *pnull_value) {
-  int result = 0;
-  Geometry::wkbType gt2 = g2->get_type();
-
-  if (gt2 == Geometry::wkb_polygon)
-    BGCALL(result, within, Linestring, g1, Polygon, g2, pnull_value);
-  else if (gt2 == Geometry::wkb_multipolygon)
-    BGCALL(result, within, Linestring, g1, Multipolygon, g2, pnull_value);
-  else if (gt2 == Geometry::wkb_point || gt2 == Geometry::wkb_multipoint)
-    return 0;
-  else if (gt2 == Geometry::wkb_linestring)
-    BGCALL(result, within, Linestring, g1, Linestring, g2, pnull_value);
-  else if (gt2 == Geometry::wkb_multilinestring)
-    BGCALL(result, within, Linestring, g1, Multilinestring, g2, pnull_value);
-  else
-    assert(false);
-
-  return result;
-}
-
-template <typename Geom_types>
-int BG_wrap<Geom_types>::multilinestring_within_geometry(Geometry *g1,
-                                                         Geometry *g2,
-                                                         bool *pnull_value) {
-  int result = 0;
-  Geometry::wkbType gt2 = g2->get_type();
-
-  if (gt2 == Geometry::wkb_polygon)
-    BGCALL(result, within, Multilinestring, g1, Polygon, g2, pnull_value);
-  else if (gt2 == Geometry::wkb_multipolygon)
-    BGCALL(result, within, Multilinestring, g1, Multipolygon, g2, pnull_value);
-  else if (gt2 == Geometry::wkb_point || gt2 == Geometry::wkb_multipoint)
-    return 0;
-  else if (gt2 == Geometry::wkb_linestring)
-    BGCALL(result, within, Multilinestring, g1, Linestring, g2, pnull_value);
-  else if (gt2 == Geometry::wkb_multilinestring)
-    BGCALL(result, within, Multilinestring, g1, Multilinestring, g2,
-           pnull_value);
-  else
-    assert(false);
-
-  return result;
-}
-
-template <typename Geom_types>
-int BG_wrap<Geom_types>::polygon_within_geometry(Geometry *g1, Geometry *g2,
-                                                 bool *pnull_value) {
-  int result = 0;
-  Geometry::wkbType gt2 = g2->get_type();
-
-  if (gt2 == Geometry::wkb_polygon)
-    BGCALL(result, within, Polygon, g1, Polygon, g2, pnull_value);
-  else if (gt2 == Geometry::wkb_multipolygon)
-    BGCALL(result, within, Polygon, g1, Multipolygon, g2, pnull_value);
-  else if (gt2 == Geometry::wkb_point || gt2 == Geometry::wkb_multipoint ||
-           gt2 == Geometry::wkb_linestring ||
-           gt2 == Geometry::wkb_multilinestring)
-    return 0;
-  else
-    assert(false);
-
-  return result;
-}
-
-template <typename Geom_types>
-int BG_wrap<Geom_types>::multipolygon_within_geometry(Geometry *g1,
-                                                      Geometry *g2,
-                                                      bool *pnull_value) {
-  int result = 0;
-  Geometry::wkbType gt2 = g2->get_type();
-
-  if (gt2 == Geometry::wkb_polygon)
-    BGCALL(result, within, Multipolygon, g1, Polygon, g2, pnull_value);
-  else if (gt2 == Geometry::wkb_multipolygon)
-    BGCALL(result, within, Multipolygon, g1, Multipolygon, g2, pnull_value);
-  else if (gt2 == Geometry::wkb_point || gt2 == Geometry::wkb_multipoint ||
-           gt2 == Geometry::wkb_linestring ||
-           gt2 == Geometry::wkb_multilinestring)
-    return 0;
-  else
-    assert(false);
-
-  return result;
-}
-
-/**
-  Dispatcher for 'multipoint EQUALS xxx'.
-
-  @tparam Geom_types Geometry types definitions.
-  @param g1 First Geometry operand, a multipoint.
-  @param g2 Second Geometry operand, not a geometry collection.
-  @param[out] pnull_value Returns whether error occurred duirng the computation.
-  @return 0 if specified relation doesn't hold for the given operands,
-                otherwise returns none 0.
- */
-template <typename Geom_types>
-int BG_wrap<Geom_types>::multipoint_equals_geometry(Geometry *g1, Geometry *g2,
-                                                    bool *pnull_value) {
-  int result = 0;
-  Geometry::wkbType gt2 = g2->get_type();
-
-  switch (gt2) {
-    case Geometry::wkb_point:
-      result = Ifsr::equals_check<Geom_types>(g2, g1, pnull_value);
-      break;
-    case Geometry::wkb_multipoint: {
-      Multipoint mpts1(g1->get_data_ptr(), g1->get_data_size(), g1->get_flags(),
-                       g1->get_srid());
-      Multipoint mpts2(g2->get_data_ptr(), g2->get_data_size(), g2->get_flags(),
-                       g2->get_srid());
-
-      Point_set ptset1(mpts1.begin(), mpts1.end());
-      Point_set ptset2(mpts2.begin(), mpts2.end());
-      result =
-          (ptset1.size() == ptset2.size() &&
-           std::equal(ptset1.begin(), ptset1.end(), ptset2.begin(), bgpt_eq()));
-    } break;
-    default:
-      result = 0;
-      break;
-  }
-  return result;
-}
-
-/**
-  Dispatcher for 'multipoint disjoint xxx'.
-
-  @tparam Geom_types Geometry types definitions.
-  @param g1 First Geometry operand, a multipoint.
-  @param g2 Second Geometry operand, not a geometry collection.
-  @param[out] pnull_value Returns whether error occurred duirng the computation.
-  @return 0 if specified relation doesn't hold for the given operands,
-                otherwise returns none 0.
- */
-template <typename Geom_types>
-int BG_wrap<Geom_types>::multipoint_disjoint_geometry(Geometry *g1,
-                                                      Geometry *g2,
-                                                      bool *pnull_value) {
-  int result = 0;
-  Geometry::wkbType gt2 = g2->get_type();
-  const void *data_ptr = nullptr;
-
-  Multipoint mpts1(g1->get_data_ptr(), g1->get_data_size(), g1->get_flags(),
-                   g1->get_srid());
-  switch (gt2) {
-    case Geometry::wkb_point:
-      result = point_disjoint_geometry(g2, g1, pnull_value);
-      break;
-    case Geometry::wkb_multipoint: {
-      Multipoint mpts2(g2->get_data_ptr(), g2->get_data_size(), g2->get_flags(),
-                       g2->get_srid());
-      Point_set ptset1(mpts1.begin(), mpts1.end());
-      Point_set ptset2(mpts2.begin(), mpts2.end());
-      Point_vector respts;
-      typename Point_vector::iterator endpos;
-      size_t ptset1sz = ptset1.size(), ptset2sz = ptset2.size();
-
-      respts.resize(ptset1sz > ptset2sz ? ptset1sz : ptset2sz);
-      endpos =
-          std::set_intersection(ptset1.begin(), ptset1.end(), ptset2.begin(),
-                                ptset2.end(), respts.begin(), bgpt_lt());
-      result = (endpos == respts.begin());
-    } break;
-    case Geometry::wkb_polygon: {
-      data_ptr = g2->normalize_ring_order();
-      if (data_ptr == nullptr) {
-        *pnull_value = true;
-        my_error(ER_GIS_INVALID_DATA, MYF(0), "st_disjoint");
-        return result;
-      }
-
-      Polygon plg(data_ptr, g2->get_data_size(), g2->get_flags(),
-                  g2->get_srid());
-      result = multipoint_disjoint_geometry_internal(mpts1, plg);
-    } break;
-    case Geometry::wkb_multipolygon: {
-      data_ptr = g2->normalize_ring_order();
-      if (data_ptr == nullptr) {
-        *pnull_value = true;
-        my_error(ER_GIS_INVALID_DATA, MYF(0), "st_disjoint");
-        return result;
-      }
-
-      Multipolygon mplg(data_ptr, g2->get_data_size(), g2->get_flags(),
-                        g2->get_srid());
-      result = multipoint_disjoint_multi_geometry(mpts1, mplg);
-    } break;
-    case Geometry::wkb_linestring: {
-      Linestring ls(g2->get_data_ptr(), g2->get_data_size(), g2->get_flags(),
-                    g2->get_srid());
-      result = multipoint_disjoint_geometry_internal(mpts1, ls);
-    } break;
-    case Geometry::wkb_multilinestring: {
-      Multilinestring mls(g2->get_data_ptr(), g2->get_data_size(),
-                          g2->get_flags(), g2->get_srid());
-      result = multipoint_disjoint_multi_geometry(mpts1, mls);
-    } break;
-    default:
-      assert(false);
-      break;
-  }
-
-  return result;
-}
-
-template <typename Geom_types>
-template <typename Geom_type>
-int BG_wrap<Geom_types>::multipoint_disjoint_geometry_internal(
-    const Multipoint &mpts, const Geom_type &geom) {
-  for (typename Multipoint::iterator i = mpts.begin(); i != mpts.end(); ++i) {
-    if (!boost::geometry::disjoint(*i, geom)) return 0;
-  }
-
-  return 1;
-}
-
-template <typename Geom_types>
-template <typename Geom_type>
-int BG_wrap<Geom_types>::multipoint_disjoint_multi_geometry(
-    const Multipoint &mpts, const Geom_type &geom) {
-  Rtree_index rtree;
-
-  // Choose the one with more components to build rtree index on, to get more
-  // performance improvement.
-  if (mpts.size() > geom.size()) {
-    make_rtree_bggeom(mpts, &rtree);
-    for (typename Geom_type::iterator j = geom.begin(); j != geom.end(); ++j) {
-      BG_box box;
-      boost::geometry::envelope(*j, box);
-
-      /*
-        For each component *j in geom, find points in mpts who intersect
-        with MBR(*j), such points are likely to intersect *j, the rest are
-        for sure disjoint *j thus no need to check precisely.
-      */
-      for (Rtree_index::const_query_iterator i =
-               rtree.qbegin(bgi::intersects(box));
-           i != rtree.qend(); ++i) {
-        /*
-          If *i really intersect *j, we have the result as false;
-          If no *i intersects *j, *j disjoint mpts.
-          And if no *j intersect mpts, we can conclude that mpts disjoint geom.
-        */
-        if (!boost::geometry::disjoint(mpts[i->second], *j)) return 0;
-      }
-    }
-  } else {
-    make_rtree_bggeom(geom, &rtree);
-    for (typename Multipoint::iterator j = mpts.begin(); j != mpts.end(); ++j) {
-      BG_box box;
-      boost::geometry::envelope(*j, box);
-
-      /*
-        For each point *j in mpts, find components *i in geom such that
-        MBR(*i) intersect *j, such *i are likely to intersect *j, the rest are
-        for sure disjoint *j thus no need to check precisely.
-      */
-      for (Rtree_index::const_query_iterator i =
-               rtree.qbegin(bgi::intersects(box));
-           i != rtree.qend(); ++i) {
-        /*
-          If *i really intersect *j, we have the result as false;
-          If no *i intersects *j, *j disjoint geom.
-          And if no *j intersect geom, we can conclude that mpts disjoint geom.
-        */
-        if (!boost::geometry::disjoint(geom[i->second], *j)) return 0;
-      }
-    }
-  }
-
-  return 1;
-}
-
-/**
-  Dispatcher for 'linestring disjoint xxx'.
-
-  @tparam Geom_types Geometry types definitions.
-  @param g1 First Geometry operand, a linestring.
-  @param g2 Second Geometry operand, not a geometry collection.
-  @param[out] pnull_value Returns whether error occurred duirng the computation.
-  @return 0 if specified relation doesn't hold for the given operands,
-                otherwise returns none 0.
- */
-template <typename Geom_types>
-int BG_wrap<Geom_types>::linestring_disjoint_geometry(Geometry *g1,
-                                                      Geometry *g2,
-                                                      bool *pnull_value) {
-  int result = 0;
-  Geometry::wkbType gt2 = g2->get_type();
-
-  if (gt2 == Geometry::wkb_linestring)
-    BGCALL(result, disjoint, Linestring, g1, Linestring, g2, pnull_value);
-  else if (gt2 == Geometry::wkb_multilinestring)
-    BGCALL(result, disjoint, Linestring, g1, Multilinestring, g2, pnull_value);
-  else if (gt2 == Geometry::wkb_point)
-    BGCALL(result, disjoint, Linestring, g1, Point, g2, pnull_value);
-  else if (gt2 == Geometry::wkb_multipoint)
-    result = multipoint_disjoint_geometry(g2, g1, pnull_value);
-  else if (gt2 == Geometry::wkb_polygon)
-    BGCALL(result, disjoint, Linestring, g1, Polygon, g2, pnull_value);
-  else if (gt2 == Geometry::wkb_multipolygon)
-    BGCALL(result, disjoint, Linestring, g1, Multipolygon, g2, pnull_value);
-  else
-    assert(false);
-  return result;
-}
-
-/**
-  Dispatcher for 'multilinestring disjoint xxx'.
-
-  @tparam Geom_types Geometry types definitions.
-  @param g1 First Geometry operand, a multilinestring.
-  @param g2 Second Geometry operand, not a geometry collection.
-  @param[out] pnull_value Returns whether error occurred duirng the computation.
-  @return 0 if specified relation doesn't hold for the given operands,
-                otherwise returns none 0.
- */
-template <typename Geom_types>
-int BG_wrap<Geom_types>::multilinestring_disjoint_geometry(Geometry *g1,
-                                                           Geometry *g2,
-                                                           bool *pnull_value) {
-  int result = 0;
-  Geometry::wkbType gt2 = g2->get_type();
-
-  if (gt2 == Geometry::wkb_linestring)
-    result =
-        BG_wrap<Geom_types>::linestring_disjoint_geometry(g2, g1, pnull_value);
-  else if (gt2 == Geometry::wkb_multilinestring)
-    BGCALL(result, disjoint, Multilinestring, g1, Multilinestring, g2,
-           pnull_value);
-  else if (gt2 == Geometry::wkb_point)
-    BGCALL(result, disjoint, Multilinestring, g1, Point, g2, pnull_value);
-  else if (gt2 == Geometry::wkb_multipoint)
-    result = multipoint_disjoint_geometry(g2, g1, pnull_value);
-  else if (gt2 == Geometry::wkb_polygon)
-    BGCALL(result, disjoint, Multilinestring, g1, Polygon, g2, pnull_value);
-  else if (gt2 == Geometry::wkb_multipolygon)
-    BGCALL(result, disjoint, Multilinestring, g1, Multipolygon, g2,
-           pnull_value);
-  else
-    assert(false);
-
-  return result;
-}
-
-/**
-  Dispatcher for 'point disjoint xxx'.
-
-  @tparam Geom_types Geometry types definitions.
-  @param g1 First Geometry operand, a point.
-  @param g2 Second Geometry operand, not a geometry collection.
-  @param[out] pnull_value Returns whether error occurred duirng the computation.
-  @return 0 if specified relation doesn't hold for the given operands,
-                otherwise returns none 0.
- */
-template <typename Geom_types>
-int BG_wrap<Geom_types>::point_disjoint_geometry(Geometry *g1, Geometry *g2,
-                                                 bool *pnull_value) {
-  int result = 0;
-  Geometry::wkbType gt2 = g2->get_type();
-
-  switch (gt2) {
-    case Geometry::wkb_point:
-      BGCALL(result, disjoint, Point, g1, Point, g2, pnull_value);
-      break;
-    case Geometry::wkb_polygon:
-      BGCALL(result, disjoint, Point, g1, Polygon, g2, pnull_value);
-      break;
-    case Geometry::wkb_multipolygon:
-      BGCALL(result, disjoint, Point, g1, Multipolygon, g2, pnull_value);
-      break;
-    case Geometry::wkb_multipoint: {
-      Multipoint mpts(g2->get_data_ptr(), g2->get_data_size(), g2->get_flags(),
-                      g2->get_srid());
-      Point pt(g1->get_data_ptr(), g1->get_data_size(), g1->get_flags(),
-               g1->get_srid());
-
-      Point_set ptset(mpts.begin(), mpts.end());
-      result = (ptset.find(pt) == ptset.end());
-    } break;
-    case Geometry::wkb_linestring:
-      BGCALL(result, disjoint, Point, g1, Linestring, g2, pnull_value);
-      break;
-    case Geometry::wkb_multilinestring:
-      BGCALL(result, disjoint, Point, g1, Multilinestring, g2, pnull_value);
-      break;
-    default:
-      assert(false);
-      break;
-  }
-  return result;
-}
-
-/**
-  Dispatcher for 'polygon disjoint xxx'.
-
-  @tparam Geom_types Geometry types definitions.
-  @param g1 First Geometry operand, a polygon.
-  @param g2 Second Geometry operand, not a geometry collection.
-  @param[out] pnull_value Returns whether error occurred duirng the computation.
-  @return 0 if specified relation doesn't hold for the given operands,
-                otherwise returns none 0.
- */
-template <typename Geom_types>
-int BG_wrap<Geom_types>::polygon_disjoint_geometry(Geometry *g1, Geometry *g2,
-                                                   bool *pnull_value) {
-  int result = 0;
-  Geometry::wkbType gt2 = g2->get_type();
-
-  switch (gt2) {
-    case Geometry::wkb_point:
-      BGCALL(result, disjoint, Polygon, g1, Point, g2, pnull_value);
-      break;
-    case Geometry::wkb_multipoint:
-      result = multipoint_disjoint_geometry(g2, g1, pnull_value);
-      break;
-    case Geometry::wkb_polygon:
-      BGCALL(result, disjoint, Polygon, g1, Polygon, g2, pnull_value);
-      break;
-    case Geometry::wkb_multipolygon:
-      BGCALL(result, disjoint, Polygon, g1, Multipolygon, g2, pnull_value);
-      break;
-    case Geometry::wkb_linestring:
-      BGCALL(result, disjoint, Polygon, g1, Linestring, g2, pnull_value);
-      break;
-    case Geometry::wkb_multilinestring:
-      BGCALL(result, disjoint, Polygon, g1, Multilinestring, g2, pnull_value);
-      break;
-    default:
-      assert(false);
-      break;
-  }
-  return result;
-}
-
-/**
-  Dispatcher for 'multipolygon disjoint xxx'.
-
-  @tparam Geom_types Geometry types definitions.
-  @param g1 First Geometry operand, a multipolygon.
-  @param g2 Second Geometry operand, not a geometry collection.
-  @param[out] pnull_value Returns whether error occurred duirng the computation.
-  @return 0 if specified relation doesn't hold for the given operands,
-                otherwise returns none 0.
- */
-template <typename Geom_types>
-int BG_wrap<Geom_types>::multipolygon_disjoint_geometry(Geometry *g1,
-                                                        Geometry *g2,
-                                                        bool *pnull_value) {
-  int result = 0;
-  Geometry::wkbType gt2 = g2->get_type();
-
-  switch (gt2) {
-    case Geometry::wkb_point:
-      BGCALL(result, disjoint, Multipolygon, g1, Point, g2, pnull_value);
-      break;
-    case Geometry::wkb_multipoint:
-      result = multipoint_disjoint_geometry(g2, g1, pnull_value);
-      break;
-    case Geometry::wkb_polygon:
-      BGCALL(result, disjoint, Multipolygon, g1, Polygon, g2, pnull_value);
-      break;
-    case Geometry::wkb_multipolygon:
-      BGCALL(result, disjoint, Multipolygon, g1, Multipolygon, g2, pnull_value);
-      break;
-    case Geometry::wkb_linestring:
-      BGCALL(result, disjoint, Multipolygon, g1, Linestring, g2, pnull_value);
-      break;
-    case Geometry::wkb_multilinestring:
-      BGCALL(result, disjoint, Multipolygon, g1, Multilinestring, g2,
-             pnull_value);
-      break;
-    default:
-      assert(false);
-      break;
-  }
-
-  return result;
-}
-
-/**
-  Dispatcher for 'point intersects xxx'.
-
-  @tparam Geom_types Geometry types definitions.
-  @param g1 First Geometry operand, a point.
-  @param g2 Second Geometry operand, not a geometry collection.
-  @param[out] pnull_value Returns whether error occurred duirng the computation.
-  @return 0 if specified relation doesn't hold for the given operands,
-                otherwise returns none 0.
- */
-template <typename Geom_types>
-int BG_wrap<Geom_types>::point_intersects_geometry(Geometry *g1, Geometry *g2,
-                                                   bool *pnull_value) {
-  int result = 0;
-  Geometry::wkbType gt2 = g2->get_type();
-
-  switch (gt2) {
-    case Geometry::wkb_point:
-      BGCALL(result, intersects, Point, g1, Point, g2, pnull_value);
-      break;
-    case Geometry::wkb_multipoint:
-    case Geometry::wkb_linestring:
-    case Geometry::wkb_multilinestring:
-      result = !point_disjoint_geometry(g1, g2, pnull_value);
-      break;
-    case Geometry::wkb_polygon:
-      BGCALL(result, intersects, Point, g1, Polygon, g2, pnull_value);
-      break;
-    case Geometry::wkb_multipolygon:
-      BGCALL(result, intersects, Point, g1, Multipolygon, g2, pnull_value);
-      break;
-    default:
-      assert(false);
-      break;
-  }
-  return result;
-}
-
-/**
-  Dispatcher for 'multipoint intersects xxx'.
-
-  @tparam Geom_types Geometry types definitions.
-  @param g1 First Geometry operand, a multipoint.
-  @param g2 Second Geometry operand, not a geometry collection.
-  @param[out] pnull_value Returns whether error occurred duirng the computation.
-  @return 0 if specified relation doesn't hold for the given operands,
-                otherwise returns none 0.
- */
-template <typename Geom_types>
-int BG_wrap<Geom_types>::multipoint_intersects_geometry(Geometry *g1,
-                                                        Geometry *g2,
-                                                        bool *pnull_value) {
-  return !multipoint_disjoint_geometry(g1, g2, pnull_value);
-}
-
-/**
-  Dispatcher for 'linestring intersects xxx'.
-
-  @tparam Geom_types Geometry types definitions.
-  @param g1 First Geometry operand, a linestring.
-  @param g2 Second Geometry operand, not a geometry collection.
-  @param[out] pnull_value Returns whether error occurred duirng the computation.
-  @return 0 if specified relation doesn't hold for the given operands,
-                otherwise returns none 0.
- */
-template <typename Geom_types>
-int BG_wrap<Geom_types>::linestring_intersects_geometry(Geometry *g1,
-                                                        Geometry *g2,
-                                                        bool *pnull_value) {
-  int result = 0;
-  Geometry::wkbType gt2 = g2->get_type();
-
-  if (gt2 == Geometry::wkb_point)
-    BGCALL(result, intersects, Linestring, g1, Point, g2, pnull_value);
-  else if (gt2 == Geometry::wkb_multipoint)
-    result = multipoint_intersects_geometry(g2, g1, pnull_value);
-  else if (gt2 == Geometry::wkb_linestring)
-    BGCALL(result, intersects, Linestring, g1, Linestring, g2, pnull_value);
-  else if (gt2 == Geometry::wkb_multilinestring)
-    BGCALL(result, intersects, Linestring, g1, Multilinestring, g2,
-           pnull_value);
-  else if (gt2 == Geometry::wkb_polygon)
-    BGCALL(result, intersects, Linestring, g1, Polygon, g2, pnull_value);
-  else if (gt2 == Geometry::wkb_multipolygon)
-    BGCALL(result, intersects, Linestring, g1, Multipolygon, g2, pnull_value);
-  else
-    assert(false);
-
-  return result;
-}
-
-/**
-  Dispatcher for 'multilinestring intersects xxx'.
-
-  @tparam Geom_types Geometry types definitions.
-  @param g1 First Geometry operand, a multilinestring.
-  @param g2 Second Geometry operand, not a geometry collection.
-  @param[out] pnull_value Returns whether error occurred duirng the computation.
-  @return 0 if specified relation doesn't hold for the given operands,
-                otherwise returns none 0.
- */
-template <typename Geom_types>
-int BG_wrap<Geom_types>::multilinestring_intersects_geometry(
-    Geometry *g1, Geometry *g2, bool *pnull_value) {
-  int result = 0;
-  Geometry::wkbType gt2 = g2->get_type();
-
-  if (gt2 == Geometry::wkb_point)
-    BGCALL(result, intersects, Multilinestring, g1, Point, g2, pnull_value);
-  else if (gt2 == Geometry::wkb_multipoint)
-    result = multipoint_intersects_geometry(g2, g1, pnull_value);
-  else if (gt2 == Geometry::wkb_linestring)
-    BGCALL(result, intersects, Multilinestring, g1, Linestring, g2,
-           pnull_value);
-  else if (gt2 == Geometry::wkb_multilinestring)
-    BGCALL(result, intersects, Multilinestring, g1, Multilinestring, g2,
-           pnull_value);
-  else if (gt2 == Geometry::wkb_polygon)
-    BGCALL(result, intersects, Multilinestring, g1, Polygon, g2, pnull_value);
-  else if (gt2 == Geometry::wkb_multipolygon)
-    BGCALL(result, intersects, Multilinestring, g1, Multipolygon, g2,
-           pnull_value);
-  else
-    assert(false);
-
-  return result;
-}
-
-/**
-  Dispatcher for 'polygon intersects xxx'.
-
-  @tparam Geom_types Geometry types definitions.
-  @param g1 First Geometry operand, a polygon.
-  @param g2 Second Geometry operand, not a geometry collection.
-  @param[out] pnull_value Returns whether error occurred duirng the computation.
-  @return 0 if specified relation doesn't hold for the given operands,
-                otherwise returns none 0.
- */
-template <typename Geom_types>
-int BG_wrap<Geom_types>::polygon_intersects_geometry(Geometry *g1, Geometry *g2,
-                                                     bool *pnull_value) {
-  int result = 0;
-  Geometry::wkbType gt2 = g2->get_type();
-
-  switch (gt2) {
-    case Geometry::wkb_point:
-      BGCALL(result, intersects, Polygon, g1, Point, g2, pnull_value);
-      break;
-    case Geometry::wkb_multipoint:
-      result = !multipoint_disjoint_geometry(g2, g1, pnull_value);
-      break;
-    case Geometry::wkb_polygon:
-      BGCALL(result, intersects, Polygon, g1, Polygon, g2, pnull_value);
-      break;
-    case Geometry::wkb_multipolygon:
-      BGCALL(result, intersects, Polygon, g1, Multipolygon, g2, pnull_value);
-      break;
-    case Geometry::wkb_linestring:
-      BGCALL(result, intersects, Polygon, g1, Linestring, g2, pnull_value);
-      break;
-    case Geometry::wkb_multilinestring:
-      BGCALL(result, intersects, Polygon, g1, Multilinestring, g2, pnull_value);
-      break;
-    default:
-      assert(false);
-      break;
-  }
-
-  return result;
-}
-
-/**
-  Dispatcher for 'multipolygon intersects xxx'.
-
-  @tparam Geom_types Geometry types definitions.
-  @param g1 First Geometry operand, a multipolygon.
-  @param g2 Second Geometry operand, not a geometry collection.
-  @param[out] pnull_value Returns whether error occurred duirng the computation.
-  @return 0 if specified relation doesn't hold for the given operands,
-                otherwise returns none 0.
- */
-template <typename Geom_types>
-int BG_wrap<Geom_types>::multipolygon_intersects_geometry(Geometry *g1,
-                                                          Geometry *g2,
-                                                          bool *pnull_value) {
-  int result = 0;
-  Geometry::wkbType gt2 = g2->get_type();
-
-  switch (gt2) {
-    case Geometry::wkb_point:
-      BGCALL(result, intersects, Multipolygon, g1, Point, g2, pnull_value);
-      break;
-    case Geometry::wkb_multipoint:
-      result = !multipoint_disjoint_geometry(g2, g1, pnull_value);
-      break;
-    case Geometry::wkb_polygon:
-      BGCALL(result, intersects, Multipolygon, g1, Polygon, g2, pnull_value);
-      break;
-    case Geometry::wkb_multipolygon:
-      BGCALL(result, intersects, Multipolygon, g1, Multipolygon, g2,
-             pnull_value);
-      break;
-    case Geometry::wkb_linestring:
-      BGCALL(result, intersects, Multipolygon, g1, Linestring, g2, pnull_value);
-      break;
-    case Geometry::wkb_multilinestring:
-      BGCALL(result, intersects, Multipolygon, g1, Multilinestring, g2,
-             pnull_value);
-      break;
-    default:
-      assert(false);
-      break;
-  }
-  return result;
-}
-
-/**
-  Dispatcher for 'linestring crosses xxx'.
-
-  @tparam Geom_types Geometry types definitions.
-  @param g1 First Geometry operand, a linestring.
-  @param g2 Second Geometry operand, not a geometry collection.
-  @param[out] pnull_value Returns whether error occurred duirng the computation.
-  @return 0 if specified relation doesn't hold for the given operands,
-                otherwise returns none 0.
- */
-template <typename Geom_types>
-int BG_wrap<Geom_types>::linestring_crosses_geometry(Geometry *g1, Geometry *g2,
-                                                     bool *pnull_value) {
-  int result = 0;
-  Geometry::wkbType gt2 = g2->get_type();
-
-  switch (gt2) {
-    case Geometry::wkb_linestring:
-      BGCALL(result, crosses, Linestring, g1, Linestring, g2, pnull_value);
-      break;
-    case Geometry::wkb_multilinestring:
-      BGCALL(result, crosses, Linestring, g1, Multilinestring, g2, pnull_value);
-      break;
-    case Geometry::wkb_polygon:
-      BGCALL(result, crosses, Linestring, g1, Polygon, g2, pnull_value);
-      break;
-    case Geometry::wkb_multipolygon:
-      BGCALL(result, crosses, Linestring, g1, Multipolygon, g2, pnull_value);
-      break;
-    default:
-      assert(false);
-      break;
-  }
-
-  return result;
-}
-
-/**
-  Dispatcher for 'multilinestring crosses xxx'.
-
-  @tparam Geom_types Geometry types definitions.
-  @param g1 First Geometry operand, a multilinestring.
-  @param g2 Second Geometry operand, not a geometry collection.
-  @param[out] pnull_value Returns whether error occurred duirng the computation.
-  @return 0 if specified relation doesn't hold for the given operands,
-                otherwise returns none 0.
- */
-template <typename Geom_types>
-int BG_wrap<Geom_types>::multilinestring_crosses_geometry(Geometry *g1,
-                                                          Geometry *g2,
-                                                          bool *pnull_value) {
-  int result = 0;
-  Geometry::wkbType gt2 = g2->get_type();
-
-  switch (gt2) {
-    case Geometry::wkb_linestring:
-      BGCALL(result, crosses, Multilinestring, g1, Linestring, g2, pnull_value);
-      break;
-    case Geometry::wkb_multilinestring:
-      BGCALL(result, crosses, Multilinestring, g1, Multilinestring, g2,
-             pnull_value);
-      break;
-    case Geometry::wkb_polygon:
-      BGCALL(result, crosses, Multilinestring, g1, Polygon, g2, pnull_value);
-      break;
-    case Geometry::wkb_multipolygon:
-      BGCALL(result, crosses, Multilinestring, g1, Multipolygon, g2,
-             pnull_value);
-      break;
-    default:
-      assert(false);
-      break;
-  }
-  return result;
-}
-
-/**
-  Dispatcher for 'multipoint crosses xxx'.
-
-  @tparam Geom_types Geometry types definitions.
-  @param g1 First Geometry operand, a multipoint.
-  @param g2 Second Geometry operand, not a geometry collection.
-  @param[out] pnull_value Returns whether error occurred duirng the computation.
-  @return 0 if specified relation doesn't hold for the given operands,
-                otherwise returns none 0.
- */
-template <typename Geom_types>
-int BG_wrap<Geom_types>::multipoint_crosses_geometry(Geometry *g1, Geometry *g2,
-                                                     bool *pnull_value) {
-  int result = 0;
-  Geometry::wkbType gt2 = g2->get_type();
-
-  switch (gt2) {
-    case Geometry::wkb_linestring:
-    case Geometry::wkb_multilinestring:
-    case Geometry::wkb_polygon:
-    case Geometry::wkb_multipolygon: {
-      bool has_in = false, has_out = false;
-      int res = 0;
-
-      Multipoint mpts(g1->get_data_ptr(), g1->get_data_size(), g1->get_flags(),
-                      g1->get_srid());
-      /*
-        According to OGC's definition to crosses, if some Points of
-        g1 is in g2 and some are not, g1 crosses g2, otherwise not.
-       */
-      for (typename Multipoint::iterator i = mpts.begin();
-           i != mpts.end() && !(has_in && has_out); ++i) {
-        if (!has_out) {
-          res = point_disjoint_geometry(&(*i), g2, pnull_value);
-
-          if (!*pnull_value) {
-            has_out = res;
-            if (has_out) continue;
-          } else
-            return 0;
-        }
-
-        if (!has_in) {
-          res = point_within_geometry(&(*i), g2, pnull_value);
-          if (!*pnull_value)
-            has_in = res;
-          else
-            return 0;
-        }
-      }
-
-      result = (has_in && has_out);
-    } break;
-    default:
-      assert(false);
-      break;
-  }
-
-  return result;
-}
-
-/**
-  Dispatcher for 'multipoint crosses xxx'.
-
-  @tparam Geom_types Geometry types definitions.
-  @param g1 First Geometry operand, a multipoint.
-  @param g2 Second Geometry operand, not a geometry collection.
-  @return 0 if specified relation doesn't hold for the given operands,
-                otherwise returns none 0.
- */
-template <typename Geom_types>
-int BG_wrap<Geom_types>::multipoint_overlaps_multipoint(Geometry *g1,
-                                                        Geometry *g2) {
-  int result = 0;
-
-  Multipoint mpts1(g1->get_data_ptr(), g1->get_data_size(), g1->get_flags(),
-                   g1->get_srid());
-  Multipoint mpts2(g2->get_data_ptr(), g2->get_data_size(), g2->get_flags(),
-                   g2->get_srid());
-  Point_set ptset1, ptset2;
-
-  ptset1.insert(mpts1.begin(), mpts1.end());
-  ptset2.insert(mpts2.begin(), mpts2.end());
-
-  // They overlap if they intersect and also each has some points that the other
-  // one doesn't have.
-  Point_vector respts;
-  typename Point_vector::iterator endpos;
-  size_t ptset1sz = ptset1.size(), ptset2sz = ptset2.size(), resptssz;
-
-  respts.resize(ptset1sz > ptset2sz ? ptset1sz : ptset2sz);
-  endpos = std::set_intersection(ptset1.begin(), ptset1.end(), ptset2.begin(),
-                                 ptset2.end(), respts.begin(), bgpt_lt());
-  resptssz = endpos - respts.begin();
-  if (resptssz > 0 && resptssz < ptset1.size() && resptssz < ptset2.size())
-    result = 1;
-  else
-    result = 0;
-
-  return result;
-}
-
-/**
-  Dispatcher for 'multilinestring touches polygon'.
-
-  @tparam Geom_types Geometry types definitions.
-  @param g1 First Geometry operand, a multilinestring.
-  @param g2 Second Geometry operand, a polygon.
-  @param[out] pnull_value Returns whether error occurred duirng the computation.
-  @return 0 if specified relation doesn't hold for the given operands,
-                otherwise returns none 0.
- */
-template <typename Geom_types>
-int BG_wrap<Geom_types>::multilinestring_touches_polygon(Geometry *g1,
-                                                         Geometry *g2,
-                                                         bool *pnull_value) {
-  const void *data_ptr = g2->normalize_ring_order();
-  if (data_ptr == nullptr) {
-    *pnull_value = true;
-    my_error(ER_GIS_INVALID_DATA, MYF(0), "st_touches");
-    return 0;
-  }
-
-  Polygon plgn(data_ptr, g2->get_data_size(), g2->get_flags(), g2->get_srid());
-  Multilinestring mls(g1->get_data_ptr(), g1->get_data_size(), g1->get_flags(),
-                      g1->get_srid());
-
-  Multipolygon mplgn;
-  mplgn.push_back(plgn);
-
-  int result = boost::geometry::touches(mls, mplgn);
-
-  return result;
-}
-
-/**
-  Dispatcher for 'point touches geometry'.
-
-  @tparam Geom_types Geometry types definitions.
-  @param g1 First Geometry operand, a point.
-  @param g2 Second Geometry operand, a geometry other than geometry collection.
-  @param[out] pnull_value Returns whether error occurred duirng the computation.
-  @return 0 if specified relation doesn't hold for the given operands,
-                otherwise returns none 0.
- */
-template <typename Geom_types>
-int BG_wrap<Geom_types>::point_touches_geometry(Geometry *g1, Geometry *g2,
-                                                bool *pnull_value) {
-  int result = 0;
-  Geometry::wkbType gt2 = g2->get_type();
-
-  switch (gt2) {
-    case Geometry::wkb_linestring:
-      BGCALL(result, touches, Point, g1, Linestring, g2, pnull_value);
-      break;
-    case Geometry::wkb_multilinestring:
-      BGCALL(result, touches, Point, g1, Multilinestring, g2, pnull_value);
-      break;
-    case Geometry::wkb_polygon:
-      BGCALL(result, touches, Point, g1, Polygon, g2, pnull_value);
-      break;
-    case Geometry::wkb_multipolygon:
-      BGCALL(result, touches, Point, g1, Multipolygon, g2, pnull_value);
-      break;
-    default:
-      assert(false);
-      break;
-  }
-
-  return result;
-}
-
-/**
-  Dispatcher for 'multipoint touches geometry'.
-
-  @tparam Geom_types Geometry types definitions.
-  @param g1 First Geometry operand, a multipoint.
-  @param g2 Second Geometry operand, a geometry other than geometry collection.
-  @param[out] pnull_value Returns whether error occurred duirng the computation.
-  @return 0 if specified relation doesn't hold for the given operands,
-                otherwise returns none 0.
- */
-template <typename Geom_types>
-int BG_wrap<Geom_types>::multipoint_touches_geometry(Geometry *g1, Geometry *g2,
-                                                     bool *pnull_value) {
-  int has_touches = 0;
-
-  Multipoint mpts(g1->get_data_ptr(), g1->get_data_size(), g1->get_flags(),
-                  g1->get_srid());
-  for (typename Multipoint::iterator i = mpts.begin(); i != mpts.end(); ++i) {
-    int ptg = point_touches_geometry(&(*i), g2, pnull_value);
-    if (*pnull_value) return 0;
-    if (ptg)
-      has_touches = 1;
-    else if (!point_disjoint_geometry(&(*i), g2, pnull_value))
-      return 0;
-  }
-
-  return has_touches;
-}
-
-/**
-  Dispatcher for 'linestring touches geometry'.
-
-  @tparam Geom_types Geometry types definitions.
-  @param g1 First Geometry operand, a linestring.
-  @param g2 Second Geometry operand, a geometry other than geometry collection.
-  @param[out] pnull_value Returns whether error occurred duirng the computation.
-  @return 0 if specified relation doesn't hold for the given operands,
-                otherwise returns none 0.
- */
-template <typename Geom_types>
-int BG_wrap<Geom_types>::linestring_touches_geometry(Geometry *g1, Geometry *g2,
-                                                     bool *pnull_value) {
-  int result = 0;
-  Geometry::wkbType gt2 = g2->get_type();
-
-  switch (gt2) {
-    case Geometry::wkb_point:
-      BGCALL(result, touches, Linestring, g1, Point, g2, pnull_value);
-      break;
-    case Geometry::wkb_multipoint:
-      result = multipoint_touches_geometry(g2, g1, pnull_value);
-      break;
-    case Geometry::wkb_linestring:
-      BGCALL(result, touches, Linestring, g1, Linestring, g2, pnull_value);
-      break;
-    case Geometry::wkb_multilinestring:
-      BGCALL(result, touches, Linestring, g1, Multilinestring, g2, pnull_value);
-      break;
-    case Geometry::wkb_polygon:
-      BGCALL(result, touches, Linestring, g1, Polygon, g2, pnull_value);
-      break;
-    case Geometry::wkb_multipolygon:
-      BGCALL(result, touches, Linestring, g1, Multipolygon, g2, pnull_value);
-      break;
-    default:
-      assert(false);
-      break;
-  }
-  return result;
-}
-
-/**
-  Dispatcher for 'multilinestring touches geometry'.
-
-  @tparam Geom_types Geometry types definitions.
-  @param g1 First Geometry operand, a multilinestring.
-  @param g2 Second Geometry operand, a geometry other than geometry collection.
-  @param[out] pnull_value Returns whether error occurred duirng the computation.
-  @return 0 if specified relation doesn't hold for the given operands,
-                otherwise returns none 0.
- */
-template <typename Geom_types>
-int BG_wrap<Geom_types>::multilinestring_touches_geometry(Geometry *g1,
-                                                          Geometry *g2,
-                                                          bool *pnull_value) {
-  int result = 0;
-  Geometry::wkbType gt2 = g2->get_type();
-
-  switch (gt2) {
-    case Geometry::wkb_point:
-      BGCALL(result, touches, Multilinestring, g1, Point, g2, pnull_value);
-      break;
-    case Geometry::wkb_multipoint:
-      result = multipoint_touches_geometry(g2, g1, pnull_value);
-      break;
-    case Geometry::wkb_linestring:
-      BGCALL(result, touches, Multilinestring, g1, Linestring, g2, pnull_value);
-      break;
-    case Geometry::wkb_multilinestring:
-      BGCALL(result, touches, Multilinestring, g1, Multilinestring, g2,
-             pnull_value);
-      break;
-    case Geometry::wkb_polygon:
-      result = BG_wrap<Geom_types>::multilinestring_touches_polygon(
-          g1, g2, pnull_value);
-      break;
-    case Geometry::wkb_multipolygon:
-      BGCALL(result, touches, Multilinestring, g1, Multipolygon, g2,
-             pnull_value);
-      break;
-    default:
-      assert(false);
-      break;
-  }
-  return result;
-}
-
-/**
-  Dispatcher for 'polygon touches geometry'.
-
-  @tparam Geom_types Geometry types definitions.
-  @param g1 First Geometry operand, a polygon.
-  @param g2 Second Geometry operand, a geometry other than geometry collection.
-  @param[out] pnull_value Returns whether error occurred duirng the computation.
-  @return 0 if specified relation doesn't hold for the given operands,
-                otherwise returns none 0.
- */
-template <typename Geom_types>
-int BG_wrap<Geom_types>::polygon_touches_geometry(Geometry *g1, Geometry *g2,
-                                                  bool *pnull_value) {
-  int result = 0;
-  Geometry::wkbType gt2 = g2->get_type();
-
-  switch (gt2) {
-    case Geometry::wkb_point:
-      BGCALL(result, touches, Polygon, g1, Point, g2, pnull_value);
-      break;
-    case Geometry::wkb_multipoint:
-      result = multipoint_touches_geometry(g2, g1, pnull_value);
-      break;
-    case Geometry::wkb_polygon:
-      BGCALL(result, touches, Polygon, g1, Polygon, g2, pnull_value);
-      break;
-    case Geometry::wkb_multipolygon:
-      BGCALL(result, touches, Polygon, g1, Multipolygon, g2, pnull_value);
-      break;
-    case Geometry::wkb_linestring:
-      BGCALL(result, touches, Polygon, g1, Linestring, g2, pnull_value);
-      break;
-    case Geometry::wkb_multilinestring:
-      result = BG_wrap<Geom_types>::multilinestring_touches_polygon(
-          g2, g1, pnull_value);
-      break;
-    default:
-      assert(false);
-      break;
-  }
-  return result;
-}
-
-/**
-  Dispatcher for 'multipolygon touches geometry'.
-
-  @tparam Geom_types Geometry types definitions.
-  @param g1 First Geometry operand, a multipolygon.
-  @param g2 Second Geometry operand, a geometry other than geometry collection.
-  @param[out] pnull_value Returns whether error occurred duirng the computation.
-  @return 0 if specified relation doesn't hold for the given operands,
-                otherwise returns none 0.
- */
-template <typename Geom_types>
-int BG_wrap<Geom_types>::multipolygon_touches_geometry(Geometry *g1,
-                                                       Geometry *g2,
-                                                       bool *pnull_value) {
-  int result = 0;
-  Geometry::wkbType gt2 = g2->get_type();
-
-  switch (gt2) {
-    case Geometry::wkb_point:
-      BGCALL(result, touches, Multipolygon, g1, Point, g2, pnull_value);
-      break;
-    case Geometry::wkb_multipoint:
-      result = multipoint_touches_geometry(g2, g1, pnull_value);
-      break;
-    case Geometry::wkb_polygon:
-      BGCALL(result, touches, Multipolygon, g1, Polygon, g2, pnull_value);
-      break;
-    case Geometry::wkb_multipolygon:
-      BGCALL(result, touches, Multipolygon, g1, Multipolygon, g2, pnull_value);
-      break;
-    case Geometry::wkb_linestring:
-      BGCALL(result, touches, Multipolygon, g1, Linestring, g2, pnull_value);
-      break;
-    case Geometry::wkb_multilinestring:
-      BGCALL(result, touches, Multipolygon, g1, Multilinestring, g2,
-             pnull_value);
-      break;
-    default:
-      assert(false);
-      break;
-  }
-
-  return result;
-}
-
-/*
-  Explicit template instantiations are needed here.
-  Templates were moved to separate file in order to avoid
-  inlining and out-of-memory problems in optmized mode on gcc/solaris/intel.
- */
-template int
-BG_wrap<BG_models<boost::geometry::cs::cartesian>>::point_within_geometry(
-    Geometry *g1, Geometry *g2, bool *pnull_value);
-template int
-BG_wrap<BG_models<boost::geometry::cs::cartesian>>::multipoint_within_geometry(
-    Geometry *g1, Geometry *g2, bool *pnull_value);
-template int
-BG_wrap<BG_models<boost::geometry::cs::cartesian>>::linestring_within_geometry(
-    Geometry *g1, Geometry *g2, bool *pnull_value);
-template int BG_wrap<BG_models<boost::geometry::cs::cartesian>>::
-    multilinestring_within_geometry(Geometry *g1, Geometry *g2,
-                                    bool *pnull_value);
-template int
-BG_wrap<BG_models<boost::geometry::cs::cartesian>>::polygon_within_geometry(
-    Geometry *g1, Geometry *g2, bool *pnull_value);
-template int BG_wrap<BG_models<boost::geometry::cs::cartesian>>::
-    multipolygon_within_geometry(Geometry *g1, Geometry *g2, bool *pnull_value);
-template int
-BG_wrap<BG_models<boost::geometry::cs::cartesian>>::multipoint_equals_geometry(
-    Geometry *g1, Geometry *g2, bool *pnull_value);
-template int
-BG_wrap<BG_models<boost::geometry::cs::cartesian>>::point_disjoint_geometry(
-    Geometry *g1, Geometry *g2, bool *pnull_value);
-template int BG_wrap<BG_models<boost::geometry::cs::cartesian>>::
-    multipoint_disjoint_geometry(Geometry *g1, Geometry *g2, bool *pnull_value);
-template int BG_wrap<BG_models<boost::geometry::cs::cartesian>>::
-    linestring_disjoint_geometry(Geometry *g1, Geometry *g2, bool *pnull_value);
-template int BG_wrap<BG_models<boost::geometry::cs::cartesian>>::
-    multilinestring_disjoint_geometry(Geometry *g1, Geometry *g2,
-                                      bool *pnull_value);
-template int
-BG_wrap<BG_models<boost::geometry::cs::cartesian>>::polygon_disjoint_geometry(
-    Geometry *g1, Geometry *g2, bool *pnull_value);
-template int BG_wrap<BG_models<boost::geometry::cs::cartesian>>::
-    multipolygon_disjoint_geometry(Geometry *g1, Geometry *g2,
-                                   bool *pnull_value);
-template int
-BG_wrap<BG_models<boost::geometry::cs::cartesian>>::point_intersects_geometry(
-    Geometry *g1, Geometry *g2, bool *pnull_value);
-template int BG_wrap<BG_models<boost::geometry::cs::cartesian>>::
-    multipoint_intersects_geometry(Geometry *g1, Geometry *g2,
-                                   bool *pnull_value);
-template int BG_wrap<BG_models<boost::geometry::cs::cartesian>>::
-    linestring_intersects_geometry(Geometry *g1, Geometry *g2,
-                                   bool *pnull_value);
-template int BG_wrap<BG_models<boost::geometry::cs::cartesian>>::
-    multilinestring_intersects_geometry(Geometry *g1, Geometry *g2,
-                                        bool *pnull_value);
-template int
-BG_wrap<BG_models<boost::geometry::cs::cartesian>>::polygon_intersects_geometry(
-    Geometry *g1, Geometry *g2, bool *pnull_value);
-template int BG_wrap<BG_models<boost::geometry::cs::cartesian>>::
-    multipolygon_intersects_geometry(Geometry *g1, Geometry *g2,
-                                     bool *pnull_value);
-template int
-BG_wrap<BG_models<boost::geometry::cs::cartesian>>::linestring_crosses_geometry(
-    Geometry *g1, Geometry *g2, bool *pnull_value);
-template int
-BG_wrap<BG_models<boost::geometry::cs::cartesian>>::multipoint_crosses_geometry(
-    Geometry *g1, Geometry *g2, bool *pnull_value);
-template int BG_wrap<BG_models<boost::geometry::cs::cartesian>>::
-    multilinestring_crosses_geometry(Geometry *g1, Geometry *g2,
-                                     bool *pnull_value);
-template int BG_wrap<BG_models<boost::geometry::cs::cartesian>>::
-    multipoint_overlaps_multipoint(Geometry *g1, Geometry *g2);
-template int
-BG_wrap<BG_models<boost::geometry::cs::cartesian>>::point_touches_geometry(
-    Geometry *g1, Geometry *g2, bool *pnull_value);
-template int
-BG_wrap<BG_models<boost::geometry::cs::cartesian>>::multipoint_touches_geometry(
-    Geometry *g1, Geometry *g2, bool *pnull_value);
-template int
-BG_wrap<BG_models<boost::geometry::cs::cartesian>>::linestring_touches_geometry(
-    Geometry *g1, Geometry *g2, bool *pnull_value);
-template int BG_wrap<BG_models<boost::geometry::cs::cartesian>>::
-    multilinestring_touches_polygon(Geometry *g1, Geometry *g2,
-                                    bool *pnull_value);
-template int BG_wrap<BG_models<boost::geometry::cs::cartesian>>::
-    multilinestring_touches_geometry(Geometry *g1, Geometry *g2,
-                                     bool *pnull_value);
-template int
-BG_wrap<BG_models<boost::geometry::cs::cartesian>>::polygon_touches_geometry(
-    Geometry *g1, Geometry *g2, bool *pnull_value);
-template int BG_wrap<BG_models<boost::geometry::cs::cartesian>>::
-    multipolygon_touches_geometry(Geometry *g1, Geometry *g2,
-                                  bool *pnull_value);
diff -Nru mysql-8.0-8.0.26/sql/item_geofunc_relchecks_bgwrap.h mysql-8.0-8.0.27/sql/item_geofunc_relchecks_bgwrap.h
--- mysql-8.0-8.0.26/sql/item_geofunc_relchecks_bgwrap.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/item_geofunc_relchecks_bgwrap.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,174 +0,0 @@
-/* Copyright (c) 2015, 2021, Oracle 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,
-   as published by the Free Software Foundation.
-
-   This program is also distributed with certain software (including
-   but not limited to OpenSSL) that is licensed under separate terms,
-   as designated in a particular file or component or in included license
-   documentation.  The authors of MySQL hereby grant you an additional
-   permission to link the program and your derivative works with the
-   separately licensed software that they have included with MySQL.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License, version 2.0, for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
-
-#ifndef ITEM_GEOFUNC_BGWRAP_INCLUDED
-#define ITEM_GEOFUNC_BGWRAP_INCLUDED
-
-/**
-  Wraps and dispatches type specific BG function calls according to operation
-  type and both operands' types.
-
-  We want to isolate boost header file inclusion only inside this file, so we
-  put this class declaration in an internal header file. And we want to make the
-  methods static since no state is needed here.
-
-  @tparam Geom_types Geometry types definitions.
-*/
-
-#include <stddef.h>
-#include <string.h>  // Boost expects ::memset to be already present.
-#include <set>
-#include <string>  // Boost expects std::string to be already present.
-#include <vector>
-
-#include <boost/geometry/algorithms/crosses.hpp>
-#include <boost/geometry/algorithms/intersects.hpp>
-#include <boost/geometry/algorithms/touches.hpp>
-#include <boost/geometry/algorithms/within.hpp>
-
-#include "my_inttypes.h"
-#include "my_sys.h"
-#include "mysqld_error.h"
-#include "sql/item_geofunc.h"
-
-class Geometry;
-struct bgpt_lt;
-
-template <typename Geom_types>
-class BG_wrap {
- public:
-  typedef typename Geom_types::Point Point;
-  typedef typename Geom_types::Linestring Linestring;
-  typedef typename Geom_types::Polygon Polygon;
-  typedef typename Geom_types::Multipoint Multipoint;
-  typedef typename Geom_types::Multilinestring Multilinestring;
-  typedef typename Geom_types::Multipolygon Multipolygon;
-  typedef typename Geom_types::Coordinate_type Coord_type;
-  typedef typename Geom_types::Coordinate_system Coordsys;
-
-  // For abbrievation.
-  typedef Item_func_spatial_rel Ifsr;
-  typedef std::set<Point, bgpt_lt> Point_set;
-  typedef std::vector<Point> Point_vector;
-
-  static int point_within_geometry(Geometry *g1, Geometry *g2,
-                                   bool *pnull_value);
-
-  static int multipoint_within_geometry(Geometry *g1, Geometry *g2,
-                                        bool *pnull_value);
-
-  static int linestring_within_geometry(Geometry *g1, Geometry *g2,
-                                        bool *pnull_value);
-  static int multilinestring_within_geometry(Geometry *g1, Geometry *g2,
-                                             bool *pnull_value);
-  static int polygon_within_geometry(Geometry *g1, Geometry *g2,
-                                     bool *pnull_value);
-  static int multipolygon_within_geometry(Geometry *g1, Geometry *g2,
-                                          bool *pnull_value);
-
-  static int multipoint_equals_geometry(Geometry *g1, Geometry *g2,
-                                        bool *pnull_value);
-
-  static int point_disjoint_geometry(Geometry *g1, Geometry *g2,
-                                     bool *pnull_value);
-  static int multipoint_disjoint_geometry(Geometry *g1, Geometry *g2,
-                                          bool *pnull_value);
-
-  static int linestring_disjoint_geometry(Geometry *g1, Geometry *g2,
-                                          bool *pnull_value);
-  static int multilinestring_disjoint_geometry(Geometry *g1, Geometry *g2,
-                                               bool *pnull_value);
-  static int polygon_disjoint_geometry(Geometry *g1, Geometry *g2,
-                                       bool *pnull_value);
-  static int multipolygon_disjoint_geometry(Geometry *g1, Geometry *g2,
-                                            bool *pnull_value);
-  static int point_intersects_geometry(Geometry *g1, Geometry *g2,
-                                       bool *pnull_value);
-  static int multipoint_intersects_geometry(Geometry *g1, Geometry *g2,
-                                            bool *pnull_value);
-  static int linestring_intersects_geometry(Geometry *g1, Geometry *g2,
-                                            bool *pnull_value);
-  static int multilinestring_intersects_geometry(Geometry *g1, Geometry *g2,
-                                                 bool *pnull_value);
-  static int polygon_intersects_geometry(Geometry *g1, Geometry *g2,
-                                         bool *pnull_value);
-  static int multipolygon_intersects_geometry(Geometry *g1, Geometry *g2,
-                                              bool *pnull_value);
-  static int linestring_crosses_geometry(Geometry *g1, Geometry *g2,
-                                         bool *pnull_value);
-  static int multipoint_crosses_geometry(Geometry *g1, Geometry *g2,
-                                         bool *pnull_value);
-  static int multilinestring_crosses_geometry(Geometry *g1, Geometry *g2,
-                                              bool *pnull_value);
-  static int multipoint_overlaps_multipoint(Geometry *g1, Geometry *g2);
-  static int point_touches_geometry(Geometry *g1, Geometry *g2,
-                                    bool *pnull_value);
-  static int multipoint_touches_geometry(Geometry *g1, Geometry *g2,
-                                         bool *pnull_value);
-  static int linestring_touches_geometry(Geometry *g1, Geometry *g2,
-                                         bool *pnull_value);
-  static int multilinestring_touches_polygon(Geometry *g1, Geometry *g2,
-                                             bool *pnull_value);
-  static int multilinestring_touches_geometry(Geometry *g1, Geometry *g2,
-                                              bool *pnull_value);
-  static int polygon_touches_geometry(Geometry *g1, Geometry *g2,
-                                      bool *pnull_value);
-  static int multipolygon_touches_geometry(Geometry *g1, Geometry *g2,
-                                           bool *pnull_value);
-
- private:
-  template <typename Geom_type>
-  static int multipoint_disjoint_geometry_internal(const Multipoint &mpts1,
-                                                   const Geom_type &geom);
-  template <typename Geom_type>
-  static int multipoint_disjoint_multi_geometry(const Multipoint &mpts,
-                                                const Geom_type &geom);
-  template <typename GeomType>
-  static int multipoint_within_geometry_internal(const Multipoint &mpts,
-                                                 const GeomType &geom);
-  static int multipoint_within_multipolygon(const Multipoint &mpts,
-                                            const Multipolygon &mplgn);
-};  // BG_wrap
-
-/*
-  Call a BG function with specified types of operands. We have to create
-  geo1 and geo2 because operands g1 and g2 are created without their WKB data
-  parsed, so not suitable for BG to use. geo1 will share the same copy of WKB
-  data with g1, also true for geo2.
- */
-#define BGCALL(res, bgfunc, GeoType1, g1, GeoType2, g2, pnullval) \
-  do {                                                            \
-    const void *pg1 = g1->normalize_ring_order();                 \
-    const void *pg2 = g2->normalize_ring_order();                 \
-    if (pg1 != NULL && pg2 != NULL) {                             \
-      GeoType1 geo1(pg1, g1->get_data_size(), g1->get_flags(),    \
-                    g1->get_srid());                              \
-      GeoType2 geo2(pg2, g2->get_data_size(), g2->get_flags(),    \
-                    g2->get_srid());                              \
-      res = boost::geometry::bgfunc(geo1, geo2);                  \
-    } else {                                                      \
-      my_error(ER_GIS_INVALID_DATA, MYF(0), "st_" #bgfunc);       \
-      (*(pnullval)) = 1;                                          \
-    }                                                             \
-  } while (0)
-
-#endif  // ITEM_GEOFUNC_BGWRAP_INCLUDED
diff -Nru mysql-8.0-8.0.26/sql/item_geofunc_relchecks.cc mysql-8.0-8.0.27/sql/item_geofunc_relchecks.cc
--- mysql-8.0-8.0.26/sql/item_geofunc_relchecks.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/item_geofunc_relchecks.cc	2021-09-28 11:46:34.000000000 +0000
@@ -49,7 +49,6 @@
 #include "sql/item_func.h"
 #include "sql/item_geofunc.h"
 #include "sql/item_geofunc_internal.h"
-#include "sql/item_geofunc_relchecks_bgwrap.h"
 #include "sql/spatial.h"
 #include "sql/sql_class.h"  // THD
 #include "sql/sql_error.h"
@@ -65,1054 +64,6 @@
 }  // namespace geometry
 }  // namespace boost
 
-/*
-  Functions for spatial relations
-*/
-
-longlong Item_func_spatial_rel::val_int() {
-  DBUG_TRACE;
-  assert(fixed == 1);
-  String tmp_value1;
-  String tmp_value2;
-  String *res1 = nullptr;
-  String *res2 = nullptr;
-  Geometry_buffer buffer1, buffer2;
-  Geometry *g1 = nullptr, *g2 = nullptr;
-  int tres = 0;
-  bool had_except = false;
-  bool had_error = false;
-  String wkt1, wkt2;
-
-  res1 = args[0]->val_str(&tmp_value1);
-  res2 = args[1]->val_str(&tmp_value2);
-  if ((null_value =
-           (!res1 || args[0]->null_value || !res2 || args[1]->null_value)))
-    goto exit;
-  if (!(g1 = Geometry::construct(&buffer1, res1)) ||
-      !(g2 = Geometry::construct(&buffer2, res2))) {
-    my_error(ER_GIS_INVALID_DATA, MYF(0), func_name());
-    tres = error_int();
-    goto exit;
-  }
-
-  // The two geometry operands must be in the same coordinate system.
-  if (g1->get_srid() != g2->get_srid()) {
-    my_error(ER_GIS_DIFFERENT_SRIDS, MYF(0), func_name(), g1->get_srid(),
-             g2->get_srid());
-    tres = error_int();
-    goto exit;
-  }
-
-  if (g1->get_srid() != 0) {
-    bool srs_exists = false;
-    if (Srs_fetcher::srs_exists(current_thd, g1->get_srid(), &srs_exists))
-      return error_int();  // Error has already been flagged.
-
-    if (!srs_exists) {
-      push_warning_printf(
-          current_thd, Sql_condition::SL_WARNING, ER_WARN_SRS_NOT_FOUND,
-          ER_THD(current_thd, ER_WARN_SRS_NOT_FOUND), g1->get_srid());
-    }
-  }
-
-  /*
-    Catch all exceptions to make sure no exception can be thrown out of
-    current function. Put all and any code that calls Boost.Geometry functions,
-    STL functions into this try block. Code out of the try block should never
-    throw any exception.
-  */
-  try {
-    if (g1->get_type() != Geometry::wkb_geometrycollection &&
-        g2->get_type() != Geometry::wkb_geometrycollection) {
-      // Must use double, otherwise may lose valid result, not only precision.
-      tres = bg_geo_relation_check(g1, g2, functype(), &had_error);
-    } else
-      tres = geocol_relation_check<bgcs::cartesian>(g1, g2);
-  } catch (...) {
-    had_except = true;
-    handle_gis_exception(func_name());
-  }
-
-  if (had_except || had_error || null_value) return error_int();
-
-exit:
-  return tres;
-}
-
-/**
-  Do geometry collection relation check. Boost geometry doesn't support
-  geometry collections directly, we have to treat them as a collection of basic
-  geometries and use BG features to compute.
-  @tparam Coordsys Coordinate system type, specified using those defined in
-          boost::geometry::cs.
-  @param g1 the 1st geometry collection parameter.
-  @param g2 the 2nd geometry collection parameter.
-  @return whether g1 and g2 satisfy the specified relation, 0 for negative,
-                none 0 for positive.
- */
-template <typename Coordsys>
-int Item_func_spatial_rel::geocol_relation_check(Geometry *g1, Geometry *g2) {
-  String gcbuf;
-  Geometry *tmpg = nullptr;
-  int tres = 0;
-  const typename BG_geometry_collection::Geometry_list *gv1 = nullptr,
-                                                       *gv2 = nullptr;
-  BG_geometry_collection bggc1, bggc2;
-  bool empty1 = is_empty_geocollection(g1);
-  bool empty2 = is_empty_geocollection(g2);
-  Var_resetter<enum Functype> resetter;
-  enum Functype spatial_rel = functype();
-
-  /*
-    An empty geometry collection is an empty point set, according to OGC
-    specifications and set theory we make below conclusion.
-   */
-  if (empty1 || empty2) {
-    if (spatial_rel == SP_DISJOINT_FUNC)
-      tres = 1;
-    else if (empty1 && empty2 && spatial_rel == SP_EQUALS_FUNC)
-      tres = 1;
-    return tres;
-  }
-
-  if (spatial_rel == SP_CONTAINS_FUNC) {
-    tmpg = g2;
-    g2 = g1;
-    g1 = tmpg;
-    spatial_rel = SP_WITHIN_FUNC;
-    resetter.set(&spatial_rel, SP_CONTAINS_FUNC);
-  }
-
-  bggc1.fill(g1);
-  bggc2.fill(g2);
-
-  /*
-    When checking GC1 within GC2, we want GC1 to be disintegrated pieces
-    rather than merging its components to larger pieces, because a
-    multi-geometry of GC1 may consist of multiple components which are within
-    different components of GC2, but if merged, it would not be within any
-    component of GC2.
-   */
-  if (spatial_rel != SP_WITHIN_FUNC)
-    bggc1.merge_components<Coordsys>(&null_value);
-  if (null_value) return tres;
-  bggc2.merge_components<Coordsys>(&null_value);
-  if (null_value) return tres;
-
-  gv1 = &(bggc1.get_geometries());
-  gv2 = &(bggc2.get_geometries());
-
-  if (gv1->size() == 0 || gv2->size() == 0) {
-    null_value = true;
-    return tres;
-  } else if (gv1->size() == 1 && gv2->size() == 1) {
-    tres = bg_geo_relation_check(*(gv1->begin()), *(gv2->begin()), spatial_rel,
-                                 &null_value);
-    return tres;
-  }
-
-  if (spatial_rel == SP_OVERLAPS_FUNC || spatial_rel == SP_CROSSES_FUNC ||
-      spatial_rel == SP_TOUCHES_FUNC) {
-    /*
-      OGC says this is not applicable, and we always return false for
-      inapplicable situations.
-    */
-    return 0;
-  }
-
-  if (spatial_rel == SP_DISJOINT_FUNC || spatial_rel == SP_INTERSECTS_FUNC)
-    tres = geocol_relcheck_intersect_disjoint(gv1, gv2);
-  else if (spatial_rel == SP_WITHIN_FUNC)
-    tres = geocol_relcheck_within<Coordsys>(gv1, gv2, spatial_rel);
-  else if (spatial_rel == SP_EQUALS_FUNC)
-    tres = geocol_equals_check<Coordsys>(gv1, gv2);
-  else
-    assert(false);
-
-  /* If doing contains check, need to switch back the two operands. */
-  if (tmpg) {
-    assert(spatial_rel == SP_WITHIN_FUNC);
-    tmpg = g2;
-    g2 = g1;
-    g1 = tmpg;
-  }
-
-  return tres;
-}
-
-/**
-  Geometry collection relation checks for disjoint and intersects operations.
-
-  @param gv1 the 1st geometry collection parameter.
-  @param gv2 the 2nd geometry collection parameter.
-  @return whether @p gv1 and @p gv2 satisfy the specified relation, 0 for
-  negative, none 0 for positive.
- */
-int Item_func_spatial_rel::geocol_relcheck_intersect_disjoint(
-    const BG_geometry_collection::Geometry_list *gv1,
-    const BG_geometry_collection::Geometry_list *gv2) {
-  int tres = 0;
-
-  assert(functype() == SP_DISJOINT_FUNC || functype() == SP_INTERSECTS_FUNC);
-  const BG_geometry_collection::Geometry_list *gv = nullptr, *gvr = nullptr;
-
-  if (gv1->size() > gv2->size()) {
-    gv = gv2;
-    gvr = gv1;
-  } else {
-    gv = gv1;
-    gvr = gv2;
-  }
-
-  Rtree_index rtree;
-  make_rtree(*gvr, &rtree);
-
-  for (BG_geometry_collection::Geometry_list::const_iterator i = gv->begin();
-       i != gv->end(); ++i) {
-    tres = 0;
-
-    BG_box box;
-    make_bg_box(*i, &box);
-    for (Rtree_index::const_query_iterator j =
-             rtree.qbegin(bgi::intersects(box));
-         j != rtree.qend(); ++j) {
-      bool had_except = false;
-      bool had_error = false;
-
-      try {
-        tres = bg_geo_relation_check(*i, (*gvr)[j->second], functype(),
-                                     &had_error);
-      } catch (...) {
-        had_except = true;
-        handle_gis_exception(func_name());
-      }
-
-      if (had_except || had_error) return error_int();
-
-      if (null_value) return tres;
-
-      /*
-        If a pair of geometry intersect or don't disjoint, the two
-        geometry collections intersect or don't disjoint, in both cases the
-        check is completed.
-       */
-      if ((functype() == SP_INTERSECTS_FUNC && tres) ||
-          (functype() == SP_DISJOINT_FUNC && !tres))
-        return tres;
-    }
-  }
-
-  /*
-    When we arrive here, the disjoint check must have succeeded and
-    intersects check must have failed, otherwise control would
-    have gone out of this function.
-
-    The reason we can derive the relation check result is that if
-    any two geometries from the two collections intersect, the two
-    geometry collections intersect; and disjoint is true
-    only when any(and every) combination of geometries from
-    the two collections are disjoint.
-
-    tres can be either true or false for DISJOINT check because the inner
-    loop may never executed and tres woule be false.
-   */
-  assert(functype() == SP_DISJOINT_FUNC ||
-         (!tres && functype() == SP_INTERSECTS_FUNC));
-  return tres;
-}
-
-/**
-  Multipoint need special handling because for a multipoint MP to be
-  within geometry G, only one point in MP has to be 'within' G,
-  the rest only need to intersect G.
-
-  @param pmpts the multipoint to check.
-  @param gv2 the geometry collection's component list.
-  @param prtree the rtree index built on gv2. We can't expose the
-  Rtree_index type in item_geofunc.h so have to use the generic void* type.
-  This function is called where an rtree index on gv2 is already built so
-  we want to pass it in to avoid unnecessarily build the same one again.
- */
-template <typename Coordsys>
-int Item_func_spatial_rel::multipoint_within_geometry_collection(
-    Gis_multi_point *pmpts,
-    const typename BG_geometry_collection::Geometry_list *gv2,
-    const void *prtree) {
-  int has_inner = 0;
-  int tres = 0;
-  bool had_error = false;
-
-  const Rtree_index &rtree = *static_cast<const Rtree_index *>(prtree);
-
-  typename BG_models<Coordsys>::Multipoint mpts(
-      pmpts->get_data_ptr(), pmpts->get_data_size(), pmpts->get_flags(),
-      pmpts->get_srid());
-
-  for (typename BG_models<Coordsys>::Multipoint::iterator k = mpts.begin();
-       k != mpts.end(); ++k) {
-    bool already_in = false;
-    BG_box box;
-    make_bg_box(&(*k), &box);
-
-    /*
-      Search for geometries in gv2 that may intersect *k point using the
-      rtree index.
-      All geometries that possibly intersect *k point are given by the
-      rtree iteration below.
-    */
-    for (Rtree_index::const_query_iterator j =
-             rtree.qbegin(bgi::intersects(box));
-         j != rtree.qend(); ++j) {
-      /*
-        If we don't have a point in mpts that's within a component of gv2 yet,
-        check whether *k is within *j.
-        If *k is within *j, it's already in the geometry collection gv2,
-        so no need for more checks for the point *k, get out of the iteration.
-      */
-      if (!has_inner) {
-        tres = bg_geo_relation_check(&(*k), (*gv2)[j->second], SP_WITHIN_FUNC,
-                                     &had_error);
-        if (had_error || null_value) return error_int();
-        if ((has_inner = tres)) {
-          already_in = true;
-          break;
-        }
-      }
-
-      /*
-        If we already have a point within gv2, OR if *k is checked above to
-        be not within *j, check whether *k intersects *j.
-        *k has to intersect one of the components in this loop, otherwise *k
-        is out of gv2.
-       */
-      tres = bg_geo_relation_check(&(*k), (*gv2)[j->second], SP_INTERSECTS_FUNC,
-                                   &had_error);
-      if (had_error || null_value) return error_int();
-
-      if (tres) {
-        already_in = true;
-        /*
-          It's likely that *k is within another geometry, so only stop the
-          iteration if we already have a point that's within gv2,
-          in order not to miss the potential geometry containing *k.
-        */
-        if (has_inner) break;
-      }
-    }
-
-    /*
-      The *k point isn't within or intersects any geometry compoennt of gv2,
-      so mpts isn't within geom.
-    */
-    if (!already_in) return 0;
-  }
-
-  /*
-    All points in mpts at least intersects geom, so the result is determined
-    by whether there is at least one point in mpts that's within geom.
-  */
-  return has_inner;
-}
-
-/**
-  Geometry collection relation checks for within and equals(half) checks.
-
-  @tparam Coordsys Coordinate system type, specified using those defined in
-          boost::geometry::cs.
-  @param gv1 the 1st geometry collection parameter.
-  @param gv2 the 2nd geometry collection parameter.
-  @param spatial_rel The spatial relational operator to test (within or equals).
-  @return whether @p gv1 and @p gv2 satisfy the specified relation, 0 for
-  negative, none 0 for positive.
- */
-template <typename Coordsys>
-int Item_func_spatial_rel::geocol_relcheck_within(
-    const typename BG_geometry_collection::Geometry_list *gv1,
-    const typename BG_geometry_collection::Geometry_list *gv2,
-    enum Functype spatial_rel MY_ATTRIBUTE((unused))) {
-  int tres = 0;
-
-  /*
-    When this function is called by geocol_equals_check,this is true:
-    spatial_rel == SP_EQUALS_FUNC
-    But even in this case, in this function we still want to check each
-    component of gv1 is within gv2, so in this function we always assume
-    with check and and use SP_WITHIN_FUNC.
-  */
-  assert(spatial_rel == SP_WITHIN_FUNC || spatial_rel == SP_EQUALS_FUNC);
-
-  // Within isn't symetric so we have to always build rtree tndex on gv2.
-  Rtree_index rtree;
-  make_rtree(*gv2, &rtree);
-
-  BG_geometry_collection bggc;
-  bool no_fill = true;
-
-  /*
-    We have to break any multi-geometry into its components before the within
-    check, because the components of some multi-geometry MG in gv1 may be in
-    different geometries of gv2, and in all the MG is still in gv2.
-    Without the disintegration, MG would be seen as not within gv2.
-
-    Multipoint need special handling because for a multipoint MP to be within
-    geometry G, only one point in MP has to be 'within' G, the rest only need
-    to intersect G.
-  */
-  for (size_t i = 0; i < gv1->size(); i++) {
-    Geometry::wkbType gtype = (*gv1)[i]->get_type();
-    if (gtype == Geometry::wkb_multipolygon ||
-        gtype == Geometry::wkb_multilinestring) {
-      if (no_fill) {
-        for (size_t j = 0; j < i; j++) bggc.fill((*gv1)[j]);
-        no_fill = false;
-      }
-
-      bggc.fill((*gv1)[i], true /* break multi-geometry. */);
-    } else if (!no_fill)
-      bggc.fill((*gv1)[i]);
-  }
-
-  if (!no_fill) gv1 = &(bggc.get_geometries());
-
-  for (BG_geometry_collection::Geometry_list::const_iterator i = gv1->begin();
-       i != gv1->end(); ++i) {
-    bool innerOK = false;
-    tres = 0;
-
-    if ((*i)->get_type() == Geometry::wkb_multipoint) {
-      Gis_multi_point *mpts = static_cast<Gis_multi_point *>(*i);
-      tres = multipoint_within_geometry_collection<Coordsys>(mpts, gv2, &rtree);
-      if (null_value) return error_int();
-      if (tres)
-        continue;
-      else
-        return tres;
-    }
-
-    /*
-      Why it works to scan rtree index for within check? Because of the below
-      conclusions.
-
-      1. g1 within g2 => MBR(g1) within MBR(g2)
-      Proof:
-      Suppose MBR(g1) not within MBR(g2), then there exists a point P in g1
-      such that either P.x not in MBR(g2)'s horizontal range, or P.y not in
-      MBR(g2)'s vertical range. Since both ranges are limits of g2 too,
-      that means P isn't in g2. Similarly we can have below conclusion for
-      contains.
-
-      2. g1 contains g2 => MBR(g1) contains MBR(g2)
-
-      That is to say, MBR(g1) within/contains MBR(g2) is the necessary but not
-      sufficient condition for g1 within/contains g2. All possible final result
-      are in the ones returned by the rtree query.
-     */
-
-    BG_box box;
-    make_bg_box(*i, &box);
-
-    /*
-      Above theory makes sure all results are in rtree search result, the logic
-      here is sufficient when the result is empty.
-    */
-    for (Rtree_index::const_query_iterator j = rtree.qbegin(bgi::covers(box));
-         j != rtree.qend(); ++j) {
-      bool had_except = false;
-      bool had_error = false;
-
-      try {
-        tres = bg_geo_relation_check(*i, (*gv2)[j->second], SP_WITHIN_FUNC,
-                                     &had_error);
-      } catch (...) {
-        had_except = true;
-        handle_gis_exception(func_name());
-      }
-
-      if (had_except || had_error || null_value) return error_int();
-
-      /*
-        We've found a geometry j in gv2 so that current geometry element i
-        in gv1 is within j, or i is equal to j. This means i in gv1
-        passes the test, proceed to next geometry in gv1.
-       */
-      if (tres) {
-        innerOK = true;
-        break;
-      }
-    }
-
-    /*
-      For within and equals check, if we can't find a geometry j in gv2
-      so that current geometry element i in gv1 is with j or i is equal to j,
-      gv1 is not within or equal to gv2.
-     */
-    if (!innerOK) {
-      assert(tres == 0);
-      return tres;
-    }
-  }
-
-  /*
-    When we arrive here, within or equals checks must have
-    succeeded, otherwise control would go out of this function.
-    The reason we can derive the relation check result is that
-    within and equals are true only when any(and every) combination of
-    geometries from the two collections are true for the relation check.
-   */
-  assert(tres);
-
-  return tres;
-}
-
-/**
-  Geometry collection equality check.
-  @tparam Coordsys Coordinate system type, specified using those defined in
-          boost::geometry::cs.
-  @param gv1 the 1st geometry collection parameter.
-  @param gv2 the 2nd geometry collection parameter.
-  @return whether @p gv1 and @p gv2 satisfy the specified relation, 0 for
-  negative, none 0 for positive.
- */
-template <typename Coordsys>
-int Item_func_spatial_rel::geocol_equals_check(
-    const typename BG_geometry_collection::Geometry_list *gv1,
-    const typename BG_geometry_collection::Geometry_list *gv2) {
-  int tres = 0, num_try = 0;
-  assert(functype() == SP_EQUALS_FUNC);
-
-  do {
-    tres = geocol_relcheck_within<Coordsys>(gv1, gv2, functype());
-    if (!tres || null_value) return tres;
-    /*
-      Two sets A and B are equal means A is a subset of B and B is a
-      subset of A. Thus we need to check twice, each successful check
-      means half truth. Switch gv1 and gv2 for 2nd check.
-     */
-    std::swap(gv1, gv2);
-    num_try++;
-  } while (num_try < 2);
-
-  return tres;
-}
-
-/**
-  Do within relation check of two geometries.
-
-  @tparam Geom_types Geometry types definitions.
-  @param g1 First Geometry operand, not a geometry collection.
-  @param g2 Second Geometry operand, not a geometry collection.
-  @param[out] pnull_value Returns whether error occurred duirng the computation.
-  @return 0 if specified relation doesn't hold for the given operands,
-                otherwise returns none 0.
-*/
-template <typename Geom_types>
-int Item_func_spatial_rel::within_check(Geometry *g1, Geometry *g2,
-                                        bool *pnull_value) {
-  Geometry::wkbType gt1;
-  int result = 0;
-
-  gt1 = g1->get_type();
-
-  if (gt1 == Geometry::wkb_point)
-    result = BG_wrap<Geom_types>::point_within_geometry(g1, g2, pnull_value);
-  else if (gt1 == Geometry::wkb_multipoint)
-    result =
-        BG_wrap<Geom_types>::multipoint_within_geometry(g1, g2, pnull_value);
-  else if (gt1 == Geometry::wkb_linestring)
-    result =
-        BG_wrap<Geom_types>::linestring_within_geometry(g1, g2, pnull_value);
-  else if (gt1 == Geometry::wkb_multilinestring)
-    result = BG_wrap<Geom_types>::multilinestring_within_geometry(g1, g2,
-                                                                  pnull_value);
-  else if (gt1 == Geometry::wkb_polygon)
-    result = BG_wrap<Geom_types>::polygon_within_geometry(g1, g2, pnull_value);
-  else if (gt1 == Geometry::wkb_multipolygon)
-    result =
-        BG_wrap<Geom_types>::multipolygon_within_geometry(g1, g2, pnull_value);
-  else
-    assert(false);
-  return result;
-}
-
-/**
-  Do equals relation check of two geometries.
-  Dispatch to specific BG functions according to operation type, and 1st or
-  both operand types.
-
-  @tparam Geom_types Geometry types definitions.
-  @param g1 First Geometry operand, not a geometry collection.
-  @param g2 Second Geometry operand, not a geometry collection.
-  @param[out] pnull_value Returns whether error occurred duirng the computation.
-  @return 0 if specified relation doesn't hold for the given operands,
-                otherwise returns none 0.
-*/
-template <typename Geom_types>
-int Item_func_spatial_rel::equals_check(Geometry *g1, Geometry *g2,
-                                        bool *pnull_value) {
-  typedef typename Geom_types::Point Point;
-  typedef typename Geom_types::Linestring Linestring;
-  typedef typename Geom_types::Multilinestring Multilinestring;
-  typedef typename Geom_types::Polygon Polygon;
-  typedef typename Geom_types::Multipoint Multipoint;
-  typedef typename Geom_types::Multipolygon Multipolygon;
-  typedef std::set<Point, bgpt_lt> Point_set;
-
-  int result = 0;
-  Geometry::wkbType gt1 = g1->get_type();
-  Geometry::wkbType gt2 = g2->get_type();
-
-  /*
-    Only geometries of the same base type can be equal, any other
-    combinations always result as false. This is different from all other types
-    of geometry relation checks.
-   */
-  if (gt1 == Geometry::wkb_point) {
-    if (gt2 == Geometry::wkb_point)
-      BGCALL(result, equals, Point, g1, Point, g2, pnull_value);
-    else if (gt2 == Geometry::wkb_multipoint) {
-      Point pt(g1->get_data_ptr(), g1->get_data_size(), g1->get_flags(),
-               g1->get_srid());
-      Multipoint mpts(g2->get_data_ptr(), g2->get_data_size(), g2->get_flags(),
-                      g2->get_srid());
-
-      Point_set ptset(mpts.begin(), mpts.end());
-
-      result =
-          (ptset.size() == 1 && boost::geometry::equals(pt, *ptset.begin()));
-    } else
-      result = 0;
-  } else if (gt1 == Geometry::wkb_multipoint)
-    result =
-        BG_wrap<Geom_types>::multipoint_equals_geometry(g1, g2, pnull_value);
-  else if (gt1 == Geometry::wkb_linestring && gt2 == Geometry::wkb_linestring)
-    BGCALL(result, equals, Linestring, g1, Linestring, g2, pnull_value);
-  else if (gt1 == Geometry::wkb_linestring &&
-           gt2 == Geometry::wkb_multilinestring)
-    BGCALL(result, equals, Linestring, g1, Multilinestring, g2, pnull_value);
-  else if (gt2 == Geometry::wkb_linestring &&
-           gt1 == Geometry::wkb_multilinestring)
-    BGCALL(result, equals, Multilinestring, g1, Linestring, g2, pnull_value);
-  else if (gt2 == Geometry::wkb_multilinestring &&
-           gt1 == Geometry::wkb_multilinestring)
-    BGCALL(result, equals, Multilinestring, g1, Multilinestring, g2,
-           pnull_value);
-  else if (gt1 == Geometry::wkb_polygon && gt2 == Geometry::wkb_polygon)
-    BGCALL(result, equals, Polygon, g1, Polygon, g2, pnull_value);
-  else if (gt1 == Geometry::wkb_polygon && gt2 == Geometry::wkb_multipolygon)
-    BGCALL(result, equals, Polygon, g1, Multipolygon, g2, pnull_value);
-  else if (gt1 == Geometry::wkb_multipolygon && gt2 == Geometry::wkb_polygon)
-    BGCALL(result, equals, Multipolygon, g1, Polygon, g2, pnull_value);
-  else if (gt1 == Geometry::wkb_multipolygon &&
-           gt2 == Geometry::wkb_multipolygon)
-    BGCALL(result, equals, Multipolygon, g1, Multipolygon, g2, pnull_value);
-  else
-    /* This branch covers all the unequal dimension combinations. */
-    result = 0;
-  return result;
-}
-
-/**
-  Do disjoint relation check of two geometries.
-  Dispatch to specific BG functions according to operation type, and 1st or
-  both operand types.
-
-  @tparam Geom_types Geometry types definitions.
-  @param g1 First Geometry operand, not a geometry collection.
-  @param g2 Second Geometry operand, not a geometry collection.
-  @param[out] pnull_value Returns whether error occurred duirng the computation.
-  @return 0 if specified relation doesn't hold for the given operands,
-                otherwise returns none 0.
-*/
-template <typename Geom_types>
-int Item_func_spatial_rel::disjoint_check(Geometry *g1, Geometry *g2,
-                                          bool *pnull_value) {
-  Geometry::wkbType gt1;
-  int result = 0;
-
-  gt1 = g1->get_type();
-
-  switch (gt1) {
-    case Geometry::wkb_point:
-      result =
-          BG_wrap<Geom_types>::point_disjoint_geometry(g1, g2, pnull_value);
-      break;
-    case Geometry::wkb_multipoint:
-      result = BG_wrap<Geom_types>::multipoint_disjoint_geometry(g1, g2,
-                                                                 pnull_value);
-      break;
-    case Geometry::wkb_linestring:
-      result = BG_wrap<Geom_types>::linestring_disjoint_geometry(g1, g2,
-                                                                 pnull_value);
-      break;
-    case Geometry::wkb_multilinestring:
-      result = BG_wrap<Geom_types>::multilinestring_disjoint_geometry(
-          g1, g2, pnull_value);
-      break;
-    case Geometry::wkb_polygon:
-      result =
-          BG_wrap<Geom_types>::polygon_disjoint_geometry(g1, g2, pnull_value);
-      break;
-    case Geometry::wkb_multipolygon:
-      result = BG_wrap<Geom_types>::multipolygon_disjoint_geometry(g1, g2,
-                                                                   pnull_value);
-      break;
-    default:
-      assert(false);
-      break;
-  }
-
-  /*
-    Note: need disjoint(point, Linestring) and disjoint(linestring, Polygon)
-   */
-  return result;
-}
-
-/**
-  Do interesects relation check of two geometries.
-  Dispatch to specific BG functions according to operation type, and 1st or
-  both operand types.
-
-  @tparam Geom_types Geometry types definitions.
-  @param g1 First Geometry operand, not a geometry collection.
-  @param g2 Second Geometry operand, not a geometry collection.
-  @param[out] pnull_value Returns whether error occurred duirng the computation.
-  @return 0 if specified relation doesn't hold for the given operands,
-                otherwise returns none 0.
-*/
-template <typename Geom_types>
-int Item_func_spatial_rel::intersects_check(Geometry *g1, Geometry *g2,
-                                            bool *pnull_value) {
-  Geometry::wkbType gt1;
-  int result = 0;
-
-  gt1 = g1->get_type();
-  /*
-    According to OGC SFA, intersects is identical to !disjoint, but
-    boost geometry has functions to compute intersects, so we still call
-    them.
-   */
-  switch (gt1) {
-    case Geometry::wkb_point:
-      result =
-          BG_wrap<Geom_types>::point_intersects_geometry(g1, g2, pnull_value);
-      break;
-    case Geometry::wkb_multipoint:
-      result = BG_wrap<Geom_types>::multipoint_intersects_geometry(g1, g2,
-                                                                   pnull_value);
-      break;
-    case Geometry::wkb_linestring:
-      result = BG_wrap<Geom_types>::linestring_intersects_geometry(g1, g2,
-                                                                   pnull_value);
-      break;
-    case Geometry::wkb_multilinestring:
-      result = BG_wrap<Geom_types>::multilinestring_intersects_geometry(
-          g1, g2, pnull_value);
-      break;
-    case Geometry::wkb_polygon:
-      result =
-          BG_wrap<Geom_types>::polygon_intersects_geometry(g1, g2, pnull_value);
-      break;
-    case Geometry::wkb_multipolygon:
-      result = BG_wrap<Geom_types>::multipolygon_intersects_geometry(
-          g1, g2, pnull_value);
-      break;
-    default:
-      assert(false);
-      break;
-  }
-  /*
-    Note: need intersects(pnt, lstr), (lstr, plgn)
-   */
-  return result;
-}
-
-/**
-  Do overlaps relation check of two geometries.
-  Dispatch to specific BG functions according to operation type, and 1st or
-  both operand types.
-
-  @tparam Geom_types Geometry types definitions.
-  @param g1 First Geometry operand, not a geometry collection.
-  @param g2 Second Geometry operand, not a geometry collection.
-  @param[out] pnull_value Returns whether error occurred duirng the computation.
-  @return 0 if specified relation doesn't hold for the given operands,
-                otherwise returns none 0.
-*/
-template <typename Geom_types>
-int Item_func_spatial_rel::overlaps_check(Geometry *g1, Geometry *g2,
-                                          bool *pnull_value) {
-  typedef typename Geom_types::Linestring Linestring;
-  typedef typename Geom_types::Multilinestring Multilinestring;
-  typedef typename Geom_types::Polygon Polygon;
-  typedef typename Geom_types::Multipolygon Multipolygon;
-
-  int result = 0;
-  Geometry::wkbType gt1 = g1->get_type();
-  Geometry::wkbType gt2 = g2->get_type();
-
-  if (g1->feature_dimension() != g2->feature_dimension()) {
-    /*
-      OGC says this is not applicable, and we always return false for
-      inapplicable situations.
-    */
-    return 0;
-  }
-
-  if (gt1 == Geometry::wkb_point || gt2 == Geometry::wkb_point) return 0;
-
-  if (gt1 == Geometry::wkb_multipoint && gt2 == Geometry::wkb_multipoint) {
-    result = BG_wrap<Geom_types>::multipoint_overlaps_multipoint(g1, g2);
-    return result;
-  }
-
-  switch (gt1) {
-    case Geometry::wkb_linestring: {
-      switch (gt2) {
-        case Geometry::wkb_linestring:
-          BGCALL(result, overlaps, Linestring, g1, Linestring, g2, pnull_value);
-          break;
-        case Geometry::wkb_multilinestring:
-          BGCALL(result, overlaps, Linestring, g1, Multilinestring, g2,
-                 pnull_value);
-          break;
-        default:
-          assert(false);
-          break;
-      }
-      break;
-    }
-    case Geometry::wkb_multilinestring: {
-      switch (gt2) {
-        case Geometry::wkb_linestring:
-          BGCALL(result, overlaps, Multilinestring, g1, Linestring, g2,
-                 pnull_value);
-          break;
-        case Geometry::wkb_multilinestring:
-          BGCALL(result, overlaps, Multilinestring, g1, Multilinestring, g2,
-                 pnull_value);
-          break;
-        default:
-          assert(false);
-          break;
-      }
-      break;
-    }
-    case Geometry::wkb_polygon: {
-      switch (gt2) {
-        case Geometry::wkb_polygon:
-          BGCALL(result, overlaps, Polygon, g1, Polygon, g2, pnull_value);
-          break;
-        case Geometry::wkb_multipolygon:
-          BGCALL(result, overlaps, Polygon, g1, Multipolygon, g2, pnull_value);
-          break;
-        default:
-          assert(false);
-          break;
-      }
-      break;
-    }
-    case Geometry::wkb_multipolygon: {
-      switch (gt2) {
-        case Geometry::wkb_polygon:
-          BGCALL(result, overlaps, Multipolygon, g1, Polygon, g2, pnull_value);
-          break;
-        case Geometry::wkb_multipolygon:
-          BGCALL(result, overlaps, Multipolygon, g1, Multipolygon, g2,
-                 pnull_value);
-          break;
-        default:
-          assert(false);
-          break;
-      }
-      break;
-    }
-    default:
-      assert(false);
-      break;
-  }
-
-  return result;
-}
-
-/**
-  Do touches relation check of two geometries.
-  Dispatch to specific BG functions according to operation type, and 1st or
-  both operand types.
-
-  @tparam Geom_types Geometry types definitions.
-  @param g1 First Geometry operand, not a geometry collection.
-  @param g2 Second Geometry operand, not a geometry collection.
-  @param[out] pnull_value Returns whether error occurred duirng the computation.
-  @return 0 if specified relation doesn't hold for the given operands,
-                otherwise returns none 0.
-*/
-template <typename Geom_types>
-int Item_func_spatial_rel::touches_check(Geometry *g1, Geometry *g2,
-                                         bool *pnull_value) {
-  int result = 0;
-  Geometry::wkbType gt1 = g1->get_type();
-  Geometry::wkbType gt2 = g2->get_type();
-
-  if ((gt1 == Geometry::wkb_point || gt1 == Geometry::wkb_multipoint) &&
-      (gt2 == Geometry::wkb_point || gt2 == Geometry::wkb_multipoint)) {
-    /*
-      OGC says this is not applicable, and we always return false for
-      inapplicable situations.
-    */
-    return 0;
-  }
-  /*
-    Touches is symetric, and one argument is allowed to be a point/multipoint.
-   */
-  switch (gt1) {
-    case Geometry::wkb_point:
-      result = BG_wrap<Geom_types>::point_touches_geometry(g1, g2, pnull_value);
-      break;
-    case Geometry::wkb_multipoint:
-      result =
-          BG_wrap<Geom_types>::multipoint_touches_geometry(g1, g2, pnull_value);
-      break;
-    case Geometry::wkb_linestring:
-      result =
-          BG_wrap<Geom_types>::linestring_touches_geometry(g1, g2, pnull_value);
-      break;
-    case Geometry::wkb_multilinestring:
-      result = BG_wrap<Geom_types>::multilinestring_touches_geometry(
-          g1, g2, pnull_value);
-      break;
-    case Geometry::wkb_polygon:
-      result =
-          BG_wrap<Geom_types>::polygon_touches_geometry(g1, g2, pnull_value);
-      break;
-    case Geometry::wkb_multipolygon:
-      result = BG_wrap<Geom_types>::multipolygon_touches_geometry(g1, g2,
-                                                                  pnull_value);
-      break;
-    default:
-      assert(false);
-      break;
-  }
-  return result;
-}
-
-/**
-  Do crosses relation check of two geometries.
-  Dispatch to specific BG functions according to operation type, and 1st or
-  both operand types.
-
-  @tparam Geom_types Geometry types definitions.
-  @param g1 First Geometry operand, not a geometry collection.
-  @param g2 Second Geometry operand, not a geometry collection.
-  @param[out] pnull_value Returns whether error occurred duirng the computation.
-  @return 0 if specified relation doesn't hold for the given operands,
-                otherwise returns none 0.
-*/
-template <typename Geom_types>
-int Item_func_spatial_rel::crosses_check(Geometry *g1, Geometry *g2,
-                                         bool *pnull_value) {
-  int result = 0;
-  Geometry::wkbType gt1 = g1->get_type();
-  Geometry::wkbType gt2 = g2->get_type();
-
-  if (gt1 == Geometry::wkb_polygon || gt2 == Geometry::wkb_point ||
-      (gt1 == Geometry::wkb_multipolygon || gt2 == Geometry::wkb_multipoint)) {
-    /*
-      OGC says this is not applicable, and we always return false for
-      inapplicable situations.
-    */
-    return 0;
-  }
-
-  if (gt1 == Geometry::wkb_point) {
-    result = 0;
-    return result;
-  }
-
-  switch (gt1) {
-    case Geometry::wkb_multipoint:
-      result =
-          BG_wrap<Geom_types>::multipoint_crosses_geometry(g1, g2, pnull_value);
-      break;
-    case Geometry::wkb_linestring:
-      result =
-          BG_wrap<Geom_types>::linestring_crosses_geometry(g1, g2, pnull_value);
-      break;
-    case Geometry::wkb_multilinestring:
-      result = BG_wrap<Geom_types>::multilinestring_crosses_geometry(
-          g1, g2, pnull_value);
-      break;
-    default:
-      assert(false);
-      break;
-  }
-
-  return result;
-}
-
-/**
-  Entry point to call Boost Geometry functions to check geometry relations.
-  This function is static so that it can be called without the
-  Item_func_spatial_rel object --- we do so to implement a few functionality
-  for other classes in this file, e.g. Item_func_spatial_operation::val_str.
-
-  @param g1 First Geometry operand, not a geometry collection.
-  @param g2 Second Geometry operand, not a geometry collection.
-  @param relchk_type The type of relation check.
-  @param[out] pnull_value Returns whether error occurred duirng the computation.
-  @return 0 if specified relation doesn't hold for the given operands,
-                otherwise returns none 0.
- */
-int Item_func_spatial_rel::bg_geo_relation_check(Geometry *g1, Geometry *g2,
-                                                 Functype relchk_type,
-                                                 bool *pnull_value) {
-  int result = 0;
-
-  typedef BG_models<boost::geometry::cs::cartesian> Geom_types;
-
-  /*
-    Dispatch calls to all specific type combinations for each relation check
-    function.
-
-    Boost.Geometry doesn't have dynamic polymorphism,
-    e.g. the above Point, Linestring, and Polygon templates don't have a common
-    base class template, so we have to dispatch by types.
-
-    The checking functions should set null_value to true if there is error.
-   */
-
-  switch (relchk_type) {
-    case SP_CONTAINS_FUNC:
-      result = within_check<Geom_types>(g2, g1, pnull_value);
-      break;
-    case SP_WITHIN_FUNC:
-      result = within_check<Geom_types>(g1, g2, pnull_value);
-      break;
-    case SP_EQUALS_FUNC:
-      result = equals_check<Geom_types>(g1, g2, pnull_value);
-      break;
-    case SP_DISJOINT_FUNC:
-      result = disjoint_check<Geom_types>(g1, g2, pnull_value);
-      break;
-    case SP_INTERSECTS_FUNC:
-      result = intersects_check<Geom_types>(g1, g2, pnull_value);
-      break;
-    case SP_OVERLAPS_FUNC:
-      result = overlaps_check<Geom_types>(g1, g2, pnull_value);
-      break;
-    case SP_TOUCHES_FUNC:
-      result = touches_check<Geom_types>(g1, g2, pnull_value);
-      break;
-    case SP_CROSSES_FUNC:
-      result = crosses_check<Geom_types>(g1, g2, pnull_value);
-      break;
-    default:
-      assert(false);
-      break;
-  }
-
-  return result;
-}
-
 longlong Item_func_spatial_relation::val_int() {
   DBUG_TRACE;
   assert(fixed);
diff -Nru mysql-8.0-8.0.26/sql/item_geofunc_setops.cc mysql-8.0-8.0.27/sql/item_geofunc_setops.cc
--- mysql-8.0-8.0.26/sql/item_geofunc_setops.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/item_geofunc_setops.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,3301 +0,0 @@
-/* Copyright (c) 2014, 2021, Oracle 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,
-   as published by the Free Software Foundation.
-
-   This program is also distributed with certain software (including
-   but not limited to OpenSSL) that is licensed under separate terms,
-   as designated in a particular file or component or in included license
-   documentation.  The authors of MySQL hereby grant you an additional
-   permission to link the program and your derivative works with the
-   separately licensed software that they have included with MySQL.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License, version 2.0, for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
-
-#include <stddef.h>
-#include <string.h>
-#include <algorithm>
-#include <boost/concept/usage.hpp>
-#include <boost/geometry/algorithms/difference.hpp>
-#include <boost/geometry/algorithms/sym_difference.hpp>
-#include <boost/geometry/algorithms/union.hpp>
-#include <boost/geometry/geometries/box.hpp>
-#include <boost/geometry/index/rtree.hpp>
-#include <boost/iterator/iterator_facade.hpp>
-#include <iterator>
-#include <memory>
-#include <set>
-#include <utility>
-#include <vector>
-
-#include "m_ctype.h"
-#include "m_string.h"
-#include "my_byteorder.h"
-#include "my_dbug.h"
-#include "my_inttypes.h"
-#include "my_sys.h"
-#include "mysql/components/services/bits/psi_bits.h"
-#include "mysqld_error.h"
-#include "sql/current_thd.h"
-#include "sql/dd/cache/dictionary_client.h"
-#include "sql/dd/types/spatial_reference_system.h"
-#include "sql/derror.h"  // ER_THD
-#include "sql/gis/srid.h"
-#include "sql/inplace_vector.h"
-#include "sql/item.h"
-#include "sql/item_func.h"
-#include "sql/item_geofunc.h"
-#include "sql/item_geofunc_internal.h"
-#include "sql/spatial.h"
-#include "sql/sql_class.h"  // THD
-#include "sql/sql_error.h"
-#include "sql/sql_exception_handler.h"
-#include "sql/srs_fetcher.h"
-#include "sql_string.h"
-#include "template_utils.h"
-
-template <typename Geom_types>
-class BG_setop_wrapper;
-
-namespace boost {
-namespace geometry {
-namespace cs {
-struct cartesian;
-}  // namespace cs
-}  // namespace geometry
-}  // namespace boost
-
-#define BGOPCALL(GeoOutType, geom_out, bgop, GeoType1, g1, GeoType2, g2,       \
-                 wkbres, nullval)                                              \
-  do {                                                                         \
-    const void *pg1 = g1->normalize_ring_order();                              \
-    const void *pg2 = g2->normalize_ring_order();                              \
-    geom_out = NULL;                                                           \
-    if (pg1 != NULL && pg2 != NULL) {                                          \
-      GeoType1 geo1(pg1, g1->get_data_size(), g1->get_flags(),                 \
-                    g1->get_srid());                                           \
-      GeoType2 geo2(pg2, g2->get_data_size(), g2->get_flags(),                 \
-                    g2->get_srid());                                           \
-      std::unique_ptr<GeoOutType> geout(new GeoOutType());                     \
-      geout->set_srid(g1->get_srid());                                         \
-      boost::geometry::bgop(geo1, geo2, *geout);                               \
-      (nullval) = false;                                                       \
-      if (geout->size() == 0 ||                                                \
-          (nullval =                                                           \
-               post_fix_result(&(m_ifso->m_bg_resbuf_mgr), *geout, wkbres))) { \
-        if (nullval) return NULL;                                              \
-      } else                                                                   \
-        geom_out = geout.release();                                            \
-    } else {                                                                   \
-      (nullval) = true;                                                        \
-      my_error(ER_GIS_INVALID_DATA, MYF(0), "st_" #bgop);                      \
-      return NULL;                                                             \
-    }                                                                          \
-  } while (0)
-
-/*
-  Write an empty geometry collection's wkb encoding into str, and create a
-  geometry object for this empty geometry colletion.
- */
-Geometry *Item_func_spatial_operation::empty_result(String *str,
-                                                    gis::srid_t srid) {
-  if ((null_value = str->reserve(GEOM_HEADER_SIZE + 4 + 16, 256)))
-    return nullptr;
-
-  write_geometry_header(str, srid, Geometry::wkb_geometrycollection, 0);
-  Gis_geometry_collection *gcol = new Gis_geometry_collection();
-  gcol->set_data_ptr(str->ptr() + GEOM_HEADER_SIZE, 4);
-  gcol->has_geom_header_space(true);
-  return gcol;
-}
-
-/**
-  Wraps and dispatches type specific BG function calls according to operation
-  type and the 1st or both operand type(s), depending on code complexity.
-
-  We want to isolate boost header file inclusion only inside this file, so we
-  can't put this class declaration in any header file. And we want to make the
-  methods static since no state is needed here.
-  @tparam Geom_types A wrapper for all geometry types.
-*/
-template <typename Geom_types>
-class BG_setop_wrapper {
-  // Some computation in this class may rely on functions in
-  // Item_func_spatial_operation.
-  Item_func_spatial_operation *m_ifso;
-  bool null_value;  // Whether computation has error.
-
-  // Some computation in this class may rely on functions in
-  // Item_func_spatial_operation, after each call of its functions, copy its
-  // null_value, we don't want to miss errors.
-  void copy_ifso_state() { null_value = m_ifso->null_value; }
-
- public:
-  typedef typename Geom_types::Point Point;
-  typedef typename Geom_types::Linestring Linestring;
-  typedef typename Geom_types::Polygon Polygon;
-  typedef typename Geom_types::Polygon::ring_type Polygon_ring;
-  typedef typename Geom_types::Multipoint Multipoint;
-  typedef typename Geom_types::Multilinestring Multilinestring;
-  typedef typename Geom_types::Multipolygon Multipolygon;
-  typedef typename Geom_types::Coordinate_type Coord_type;
-  typedef typename Geom_types::Coordinate_system Coordsys;
-  typedef Item_func_spatial_rel Ifsr;
-  typedef Item_func_spatial_operation Ifso;
-  typedef std::set<Point, bgpt_lt> Point_set;
-  typedef std::vector<Point> Point_vector;
-
-  BG_setop_wrapper(Item_func_spatial_operation *ifso) {
-    m_ifso = ifso;
-    null_value = false;
-  }
-
-  bool get_null_value() const { return null_value; }
-
-  /**
-    Do point insersection point operation.
-    @param g1 First geometry operand, must be a point.
-    @param g2 Second geometry operand, must be a point.
-    @param[out] result Holds WKB data of the result.
-    @return the result Geometry whose WKB data is in result.
-    */
-  Geometry *point_intersection_point(Geometry *g1, Geometry *g2,
-                                     String *result) {
-    Geometry *retgeo = nullptr;
-
-    Point pt1(g1->get_data_ptr(), g1->get_data_size(), g1->get_flags(),
-              g1->get_srid());
-    Point pt2(g2->get_data_ptr(), g2->get_data_size(), g2->get_flags(),
-              g2->get_srid());
-
-    if (bgpt_eq()(pt1, pt2)) {
-      retgeo = g1;
-      null_value = retgeo->as_geometry(result, true);
-    } else {
-      retgeo = m_ifso->empty_result(result, g1->get_srid());
-      copy_ifso_state();
-    }
-    return retgeo;
-  }
-
-  /*
-    Do point intersection Multipoint operation.
-    The parameters and return value has identical/similar meaning as to above
-    function, which can be inferred from the function name, we won't repeat
-    here or for the rest of the functions in this class.
-  */
-  Geometry *point_intersection_multipoint(Geometry *g1, Geometry *g2,
-                                          String *result) {
-    Geometry *retgeo = nullptr;
-
-    Point pt(g1->get_data_ptr(), g1->get_data_size(), g1->get_flags(),
-             g1->get_srid());
-    Multipoint mpts(g2->get_data_ptr(), g2->get_data_size(), g2->get_flags(),
-                    g2->get_srid());
-    Point_set ptset(mpts.begin(), mpts.end());
-
-    if (ptset.find(pt) != ptset.end()) {
-      retgeo = g1;
-      null_value = retgeo->as_geometry(result, true);
-    } else {
-      retgeo = m_ifso->empty_result(result, g1->get_srid());
-      copy_ifso_state();
-    }
-    return retgeo;
-  }
-
-  Geometry *point_intersection_geometry(Geometry *g1, Geometry *g2,
-                                        String *result) {
-#if !defined(NDEBUG)
-    Geometry::wkbType gt2 = g2->get_type();
-#endif
-    Geometry *retgeo = nullptr;
-
-    bool is_out = !Ifsr::bg_geo_relation_check(g1, g2, Ifsr::SP_DISJOINT_FUNC,
-                                               &null_value);
-
-    assert(gt2 == Geometry::wkb_linestring || gt2 == Geometry::wkb_polygon ||
-           gt2 == Geometry::wkb_multilinestring ||
-           gt2 == Geometry::wkb_multipolygon);
-    if (!null_value) {
-      if (is_out) {
-        null_value = g1->as_geometry(result, true);
-        retgeo = g1;
-      } else {
-        retgeo = m_ifso->empty_result(result, g1->get_srid());
-        copy_ifso_state();
-      }
-    }
-    return retgeo;
-  }
-
-  Geometry *multipoint_intersection_multipoint(Geometry *g1, Geometry *g2,
-                                               String *result) {
-    Geometry *retgeo = nullptr;
-    Point_set ptset1, ptset2;
-    Multipoint *mpts = new Multipoint();
-    std::unique_ptr<Multipoint> guard(mpts);
-
-    mpts->set_srid(g1->get_srid());
-
-    Multipoint mpts1(g1->get_data_ptr(), g1->get_data_size(), g1->get_flags(),
-                     g1->get_srid());
-    Multipoint mpts2(g2->get_data_ptr(), g2->get_data_size(), g2->get_flags(),
-                     g2->get_srid());
-
-    ptset1.insert(mpts1.begin(), mpts1.end());
-    ptset2.insert(mpts2.begin(), mpts2.end());
-
-    Point_vector respts;
-    typename Point_vector::iterator endpos;
-    size_t ptset1sz = ptset1.size(), ptset2sz = ptset2.size();
-    respts.resize(ptset1sz > ptset2sz ? ptset1sz : ptset2sz);
-
-    endpos = std::set_intersection(ptset1.begin(), ptset1.end(), ptset2.begin(),
-                                   ptset2.end(), respts.begin(), bgpt_lt());
-    std::copy(respts.begin(), endpos, std::back_inserter(*mpts));
-    if (mpts->size() > 0) {
-      null_value = m_ifso->assign_result(mpts, result);
-      retgeo = mpts;
-      guard.release();
-    } else {
-      retgeo = m_ifso->empty_result(result, g1->get_srid());
-      copy_ifso_state();
-    }
-
-    return retgeo;
-  }
-
-  Geometry *multipoint_intersection_geometry(Geometry *g1, Geometry *g2,
-                                             String *result) {
-    Geometry *retgeo = nullptr;
-#if !defined(NDEBUG)
-    Geometry::wkbType gt2 = g2->get_type();
-#endif
-    Point_set ptset;
-    Multipoint mpts(g1->get_data_ptr(), g1->get_data_size(), g1->get_flags(),
-                    g1->get_srid());
-    Multipoint *mpts2 = new Multipoint();
-    std::unique_ptr<Multipoint> guard(mpts2);
-
-    mpts2->set_srid(g1->get_srid());
-
-    assert(gt2 == Geometry::wkb_linestring || gt2 == Geometry::wkb_polygon ||
-           gt2 == Geometry::wkb_multilinestring ||
-           gt2 == Geometry::wkb_multipolygon);
-    ptset.insert(mpts.begin(), mpts.end());
-
-    for (typename Point_set::iterator i = ptset.begin(); i != ptset.end();
-         ++i) {
-      Point &pt = const_cast<Point &>(*i);
-      if (!Ifsr::bg_geo_relation_check(&pt, g2, Ifsr::SP_DISJOINT_FUNC,
-                                       &null_value) &&
-          !null_value) {
-        mpts2->push_back(pt);
-      }
-
-      if (null_value) return nullptr;
-    }
-
-    if (mpts2->size() > 0) {
-      null_value = m_ifso->assign_result(mpts2, result);
-      retgeo = mpts2;
-      guard.release();
-    } else {
-      retgeo = m_ifso->empty_result(result, g1->get_srid());
-      copy_ifso_state();
-    }
-
-    return retgeo;
-  }
-
-  Geometry *linestring_intersection_linestring(Geometry *g1, Geometry *g2,
-                                               String *result) {
-    Multilinestring *res = nullptr;
-    Geometry *retgeo = nullptr;
-
-    // BG will return all intersection lines and points in a
-    // multilinestring. Intersection points are represented as lines
-    // with the same start and end points.
-    BGOPCALL(Multilinestring, res, intersection, Linestring, g1, Linestring, g2,
-             nullptr, null_value);
-
-    if (res == nullptr) return m_ifso->empty_result(result, g1->get_srid());
-
-    retgeo = m_ifso->simplify_multilinestring(res, result);
-    delete res;
-    return retgeo;
-  }
-
-  Geometry *linestring_intersection_polygon(Geometry *g1, Geometry *g2,
-                                            String *result) {
-    Geometry::wkbType gt2 = g2->get_type();
-    Geometry *retgeo = nullptr, *tmp1 = nullptr, *tmp2 = nullptr;
-    // It is likely for there to be discrete intersection Points.
-    if (gt2 == Geometry::wkb_multipolygon) {
-      BGOPCALL(Multilinestring, tmp1, intersection, Linestring, g1,
-               Multipolygon, g2, nullptr, null_value);
-      BGOPCALL(Multipoint, tmp2, intersection, Linestring, g1, Multipolygon, g2,
-               nullptr, null_value);
-    } else {
-      BGOPCALL(Multilinestring, tmp1, intersection, Linestring, g1, Polygon, g2,
-               nullptr, null_value);
-      BGOPCALL(Multipoint, tmp2, intersection, Linestring, g1, Polygon, g2,
-               nullptr, null_value);
-    }
-
-    // Need merge, exclude Points that are on the result Linestring.
-    retgeo = m_ifso->combine_sub_results<Coordsys>(tmp1, tmp2, g1->get_srid(),
-                                                   result);
-    copy_ifso_state();
-
-    return retgeo;
-  }
-
-  Geometry *linestring_intersection_multilinestring(Geometry *g1, Geometry *g2,
-                                                    String *result) {
-    Multilinestring *res = nullptr;
-    Geometry *retgeo = nullptr;
-
-    // BG will return all intersection lines and points in a
-    // multilinestring. Intersection points are represented as lines
-    // with the same start and end points.
-    BGOPCALL(Multilinestring, res, intersection, Linestring, g1,
-             Multilinestring, g2, nullptr, null_value);
-
-    if (res == nullptr || res->size() == 0)
-      return m_ifso->empty_result(result, g1->get_srid());
-
-    retgeo = m_ifso->simplify_multilinestring(res, result);
-    delete res;
-    return retgeo;
-  }
-
-  Geometry *polygon_intersection_multilinestring(Geometry *g1, Geometry *g2,
-                                                 String *result) {
-    Geometry *retgeo = nullptr, *tmp1 = nullptr;
-    Multipoint *tmp2 = nullptr;
-    std::unique_ptr<Geometry> guard1;
-
-    BGOPCALL(Multilinestring, tmp1, intersection, Polygon, g1, Multilinestring,
-             g2, nullptr, null_value);
-    guard1.reset(tmp1);
-
-    Multilinestring mlstr(g2->get_data_ptr(), g2->get_data_size(),
-                          g2->get_flags(), g2->get_srid());
-    Multipoint mpts;
-    Point_set ptset;
-
-    const void *data_ptr = g1->normalize_ring_order();
-    if (data_ptr == nullptr) {
-      null_value = true;
-      my_error(ER_GIS_INVALID_DATA, MYF(0), "st_intersection");
-      return nullptr;
-    }
-
-    Polygon plgn(data_ptr, g1->get_data_size(), g1->get_flags(),
-                 g1->get_srid());
-
-    for (typename Multilinestring::iterator i = mlstr.begin(); i != mlstr.end();
-         ++i) {
-      boost::geometry::intersection(plgn, *i, mpts);
-      if (mpts.size() > 0) {
-        ptset.insert(mpts.begin(), mpts.end());
-        mpts.clear();
-      }
-    }
-
-    std::unique_ptr<Multipoint> guard2;
-    if (ptset.size() > 0) {
-      tmp2 = new Multipoint;
-      tmp2->set_srid(g1->get_srid());
-      guard2.reset(tmp2);
-      std::copy(ptset.begin(), ptset.end(), std::back_inserter(*tmp2));
-    }
-
-    retgeo = m_ifso->combine_sub_results<Coordsys>(
-        guard1.release(), guard2.release(), g1->get_srid(), result);
-    copy_ifso_state();
-
-    return retgeo;
-  }
-
-  /**
-    Compute the multilinestring result if any for intersection of two polygons.
-    First get the multilinestrings mls1 and mls2 from polygons, then compute
-    mls3 = mls1 intersection mls2, and finally return mls3 - mls4 as result,
-    where mls4 is got from rings of the multipolygon intersection result of
-    plgn1 and plgn2.
-
-    @param plgn1 the 1st polygon operand
-    @param plgn2 the 2nd polygon operand
-    @param mplgn the areal intersection result of plgn1 and plgn2
-    @param [out] mls the result multilinestring
-   */
-  template <typename Polygon_type1, typename Polygon_type2>
-  void plgn_intersection_plgn_mls(const Polygon_type1 &plgn1,
-                                  const Polygon_type2 &plgn2,
-                                  const Multipolygon &mplgn,
-                                  Multilinestring &mls) {
-    if (mplgn.size() > 0) {
-      /*
-        Remove the linestring parts that are part of the result polygon rings.
-        The discrete intersection points that are also removed here.
-      */
-      Multilinestring mls3;
-      bg::intersection(plgn1, plgn2, mls3);
-      bg::detail::boundary_view<Multipolygon const> view(mplgn);
-      bg::difference(mls3, view, mls);
-    } else
-      bg::intersection(plgn1, plgn2, mls);
-  }
-
-  Geometry *polygon_intersection_polygon(Geometry *g1, Geometry *g2,
-                                         String *result) {
-    Geometry::wkbType gt2 = g2->get_type();
-    Geometry *retgeo = nullptr;
-
-    const void *pg1 = g1->normalize_ring_order();
-    const void *pg2 = g2->normalize_ring_order();
-    if (pg1 == nullptr || pg2 == nullptr) {
-      null_value = true;
-      my_error(ER_GIS_INVALID_DATA, MYF(0), "st_intersection");
-      return nullptr;
-    }
-
-    Multilinestring mls;
-    Polygon plgn1(pg1, g1->get_data_size(), g1->get_flags(), g1->get_srid());
-
-    std::unique_ptr<Multipolygon> mplgn_result(new Multipolygon());
-    mplgn_result->set_srid(g1->get_srid());
-
-    if (gt2 == Geometry::wkb_polygon) {
-      Polygon plgn2(pg2, g2->get_data_size(), g2->get_flags(), g2->get_srid());
-      bg::intersection(plgn1, plgn2, *mplgn_result);
-      plgn_intersection_plgn_mls(plgn1, plgn2, *mplgn_result, mls);
-    } else {
-      Multipolygon mplgn2(pg2, g2->get_data_size(), g2->get_flags(),
-                          g2->get_srid());
-      bg::intersection(plgn1, mplgn2, *mplgn_result);
-      plgn_intersection_plgn_mls(plgn1, mplgn2, *mplgn_result, mls);
-    }
-
-    retgeo = combine_mls_mplgn_results(&mls, mplgn_result.get(), result);
-    if (retgeo == mplgn_result.get()) mplgn_result.release();
-    copy_ifso_state();
-
-    return retgeo;
-  }
-
-  Geometry *combine_mls_mplgn_results(Multilinestring *mls,
-                                      Multipolygon *mplgn_result,
-                                      String *result) {
-    Geometry *geom = nullptr, *retgeo = nullptr;
-    assert(mls != nullptr);
-
-    if (mls->size() > 0) geom = m_ifso->simplify_multilinestring(mls, result);
-
-    if (mplgn_result->size() > 0) {
-      if (mls->size() == 0) {
-        // The multipolygon is the only result.
-        assert(result->length() == 0);
-        null_value =
-            post_fix_result(&(m_ifso->m_bg_resbuf_mgr), *mplgn_result, result);
-        if (null_value)
-          return nullptr;
-        else
-          retgeo = mplgn_result;
-      } else {
-        String mplgn_resbuf;
-        null_value = post_fix_result(&(m_ifso->m_bg_resbuf_mgr), *mplgn_result,
-                                     &mplgn_resbuf);
-        if (null_value) return nullptr;
-        if (geom->get_type() == Geometry::wkb_geometrycollection) {
-          down_cast<Gis_geometry_collection *>(geom)->append_geometry(
-              &(*mplgn_result), result);
-          retgeo = geom;
-        } else {
-          /*
-            The geom created from mls isn't a GC, so we have to create a GC to
-            hole both geom and mplgn_result.
-           */
-          String tmp_mls_resbuf;
-          tmp_mls_resbuf.takeover(*result);
-
-          Gis_geometry_collection *tmp_gc =
-              new Gis_geometry_collection(&(*mplgn_result), result);
-          tmp_gc->append_geometry(geom, result);
-          retgeo = tmp_gc;
-          delete geom;
-        }
-      }
-    } else
-      retgeo = geom;
-
-    if (retgeo == nullptr)
-      retgeo = m_ifso->empty_result(result, mplgn_result->get_srid());
-
-    return retgeo;
-  }
-
-  Geometry *multilinestring_intersection_multilinestring(Geometry *g1,
-                                                         Geometry *g2,
-                                                         String *result) {
-    Multilinestring *res = nullptr;
-    Geometry *retgeo = nullptr;
-
-    // BG will return all intersection lines and points in a
-    // multilinestring. Intersection points are represented as lines
-    // with the same start and end points.
-    BGOPCALL(Multilinestring, res, intersection, Multilinestring, g1,
-             Multilinestring, g2, nullptr, null_value);
-
-    if (res == nullptr) return m_ifso->empty_result(result, g1->get_srid());
-
-    retgeo = m_ifso->simplify_multilinestring(res, result);
-    delete res;
-    return retgeo;
-  }
-
-  Geometry *multilinestring_intersection_multipolygon(Geometry *g1,
-                                                      Geometry *g2,
-                                                      String *result) {
-    Geometry *retgeo = nullptr, *tmp1 = nullptr;
-    Multipoint *tmp2 = nullptr;
-
-    std::unique_ptr<Geometry> guard1;
-    BGOPCALL(Multilinestring, tmp1, intersection, Multilinestring, g1,
-             Multipolygon, g2, nullptr, null_value);
-    guard1.reset(tmp1);
-
-    Multilinestring mlstr(g1->get_data_ptr(), g1->get_data_size(),
-                          g1->get_flags(), g1->get_srid());
-    Multipoint mpts;
-
-    const void *data_ptr = g2->normalize_ring_order();
-    if (data_ptr == nullptr) {
-      null_value = true;
-      my_error(ER_GIS_INVALID_DATA, MYF(0), "st_intersection");
-      return nullptr;
-    }
-
-    Multipolygon mplgn(data_ptr, g2->get_data_size(), g2->get_flags(),
-                       g2->get_srid());
-    Point_set ptset;
-
-    for (typename Multilinestring::iterator i = mlstr.begin(); i != mlstr.end();
-         ++i) {
-      boost::geometry::intersection(*i, mplgn, mpts);
-      if (mpts.size() > 0) {
-        ptset.insert(mpts.begin(), mpts.end());
-        mpts.clear();
-      }
-    }
-
-    std::unique_ptr<Multipoint> guard2;
-    if (ptset.empty() == false) {
-      tmp2 = new Multipoint;
-      tmp2->set_srid(g1->get_srid());
-      guard2.reset(tmp2);
-      std::copy(ptset.begin(), ptset.end(), std::back_inserter(*tmp2));
-    }
-
-    retgeo = m_ifso->combine_sub_results<Coordsys>(
-        guard1.release(), guard2.release(), g1->get_srid(), result);
-    copy_ifso_state();
-
-    return retgeo;
-  }
-
-  Geometry *multipolygon_intersection_multipolygon(Geometry *g1, Geometry *g2,
-                                                   String *result) {
-    Geometry *retgeo = nullptr;
-
-    const void *pg1 = g1->normalize_ring_order();
-    const void *pg2 = g2->normalize_ring_order();
-    if (pg1 == nullptr || pg2 == nullptr) {
-      null_value = true;
-      my_error(ER_GIS_INVALID_DATA, MYF(0), "st_intersection");
-      return nullptr;
-    }
-
-    Multilinestring mls;
-    Multipolygon mplgn1(pg1, g1->get_data_size(), g1->get_flags(),
-                        g1->get_srid());
-
-    std::unique_ptr<Multipolygon> mplgn_result(new Multipolygon());
-    mplgn_result->set_srid(g1->get_srid());
-
-    Multipolygon mplgn2(pg2, g2->get_data_size(), g2->get_flags(),
-                        g2->get_srid());
-    bg::intersection(mplgn1, mplgn2, *mplgn_result);
-    plgn_intersection_plgn_mls(mplgn1, mplgn2, *mplgn_result, mls);
-    retgeo = combine_mls_mplgn_results(&mls, mplgn_result.get(), result);
-    if (retgeo == mplgn_result.get()) mplgn_result.release();
-
-    copy_ifso_state();
-
-    return retgeo;
-  }
-
-  Geometry *point_union_point(Geometry *g1, Geometry *g2, String *result) {
-    Geometry *retgeo = nullptr;
-    Geometry::wkbType gt2 = g2->get_type();
-    Point_set ptset;  // Use set to make Points unique.
-
-    Point pt1(g1->get_data_ptr(), g1->get_data_size(), g1->get_flags(),
-              g1->get_srid());
-    Multipoint *mpts = new Multipoint();
-    std::unique_ptr<Multipoint> guard(mpts);
-
-    mpts->set_srid(g1->get_srid());
-    ptset.insert(pt1);
-    if (gt2 == Geometry::wkb_point) {
-      Point pt2(g2->get_data_ptr(), g2->get_data_size(), g2->get_flags(),
-                g2->get_srid());
-      ptset.insert(pt2);
-    } else {
-      Multipoint mpts2(g2->get_data_ptr(), g2->get_data_size(), g2->get_flags(),
-                       g2->get_srid());
-      ptset.insert(mpts2.begin(), mpts2.end());
-    }
-
-    std::copy(ptset.begin(), ptset.end(), std::back_inserter(*mpts));
-    if (mpts->size() > 0) {
-      retgeo = mpts;
-      null_value = m_ifso->assign_result(mpts, result);
-      guard.release();
-    } else {
-      if (!null_value) {
-        retgeo = m_ifso->empty_result(result, g1->get_srid());
-        copy_ifso_state();
-      }
-    }
-    return retgeo;
-  }
-
-  Geometry *point_union_geometry(Geometry *g1, Geometry *g2, String *result) {
-    Geometry *retgeo = nullptr;
-#if !defined(NDEBUG)
-    Geometry::wkbType gt2 = g2->get_type();
-#endif
-    assert(gt2 == Geometry::wkb_linestring || gt2 == Geometry::wkb_polygon ||
-           gt2 == Geometry::wkb_multilinestring ||
-           gt2 == Geometry::wkb_multipolygon);
-    if (Ifsr::bg_geo_relation_check(g1, g2, Ifsr::SP_DISJOINT_FUNC,
-                                    &null_value) &&
-        !null_value) {
-      Gis_geometry_collection *geocol = new Gis_geometry_collection(g2, result);
-      null_value = (geocol == nullptr || geocol->append_geometry(g1, result));
-      retgeo = geocol;
-    } else if (null_value) {
-      retgeo = nullptr;
-      return nullptr;
-    } else {
-      retgeo = g2;
-      null_value = retgeo->as_geometry(result, true);
-    }
-
-    return retgeo;
-  }
-
-  Geometry *linestring_union_linestring(Geometry *g1, Geometry *g2,
-                                        String *result) {
-    Linestring ls1(g1->get_data_ptr(), g1->get_data_size(), g1->get_flags(),
-                   g1->get_srid());
-    Linestring ls2(g2->get_data_ptr(), g2->get_data_size(), g2->get_flags(),
-                   g2->get_srid());
-    std::unique_ptr<Multilinestring> res(new Multilinestring());
-    res->set_srid(g1->get_srid());
-
-    boost::geometry::union_(ls1, ls2, *res);
-    assert(res.get() != nullptr);
-    assert(res->size() != 0);
-    if (post_fix_result(&m_ifso->m_bg_resbuf_mgr, *res, result)) {
-      my_error(ER_GIS_UNKNOWN_ERROR, MYF(0), m_ifso->func_name());
-      null_value = true;
-      return nullptr;
-    }
-
-    return res.release();
-  }
-
-  Geometry *linestring_union_polygon(Geometry *g1, Geometry *g2,
-                                     String *result) {
-    Geometry *retgeo = nullptr;
-    const void *g2_wkb = g2->normalize_ring_order();
-    if (g2_wkb == nullptr) {
-      // Invalid polygon
-      my_error(ER_GIS_INVALID_DATA, MYF(0), m_ifso->func_name());
-      null_value = true;
-      return nullptr;
-    }
-
-    Linestring ls1(g1->get_data_ptr(), g1->get_data_size(), g1->get_flags(),
-                   g1->get_srid());
-    Polygon py2(g2_wkb, g2->get_data_size(), g2->get_flags(), g2->get_srid());
-    std::unique_ptr<Multilinestring> linestrings(new Multilinestring());
-    linestrings->set_srid(g1->get_srid());
-
-    // Union(LineString, Polygon) isn't supported by BG, but it's
-    // equivalent to GeometryCollection(Polygon, Difference(LineString,
-    // Polygon)).
-    boost::geometry::difference(ls1, py2, *linestrings);
-    assert(linestrings.get() != nullptr);
-    if (post_fix_result(&m_ifso->m_bg_resbuf_mgr, *linestrings, nullptr) &&
-        linestrings->size() > 0) {
-      my_error(ER_GIS_UNKNOWN_ERROR, MYF(0), m_ifso->func_name());
-      null_value = true;
-      return nullptr;
-    }
-
-    // Return the simplest result possible.
-    if (linestrings->size() == 0) {
-      // Polygon result.
-      g2->as_geometry(result, true);
-      retgeo = g2;
-    } else {
-      // GeometryCollection result containing one Polygon and one or
-      // more LineStrings.
-      Gis_geometry_collection *collection = new Gis_geometry_collection();
-      py2.to_wkb_unparsed();
-      collection->append_geometry(&py2, result);
-      if (linestrings->size() > 1) {
-        collection->append_geometry(&(*linestrings), result);
-      } else {
-        collection->append_geometry(&(*linestrings)[0], result);
-      }
-      collection->set_ownmem(false);
-      retgeo = collection;
-    }
-
-    return retgeo;
-  }
-
-  Geometry *linestring_union_multilinestring(Geometry *g1, Geometry *g2,
-                                             String *result) {
-    Linestring ls1(g1->get_data_ptr(), g1->get_data_size(), g1->get_flags(),
-                   g1->get_srid());
-    Multilinestring mls2(g2->get_data_ptr(), g2->get_data_size(),
-                         g2->get_flags(), g2->get_srid());
-    std::unique_ptr<Multilinestring> res(new Multilinestring);
-    res->set_srid(g1->get_srid());
-
-    boost::geometry::union_(ls1, mls2, *res);
-    assert(res.get() != nullptr);
-    assert(res->size() != 0);
-    if (post_fix_result(&m_ifso->m_bg_resbuf_mgr, *res, result)) {
-      my_error(ER_GIS_UNKNOWN_ERROR, MYF(0), m_ifso->func_name());
-      null_value = true;
-      return nullptr;
-    }
-
-    return res.release();
-  }
-
-  Geometry *linestring_union_multipolygon(Geometry *g1, Geometry *g2,
-                                          String *result) {
-    Geometry *retgeo = nullptr;
-    const void *g2_wkb = g2->normalize_ring_order();
-    if (g2_wkb == nullptr) {
-      // Invalid polygon
-      my_error(ER_GIS_INVALID_DATA, MYF(0), m_ifso->func_name());
-      null_value = true;
-      return nullptr;
-    }
-
-    Linestring ls1(g1->get_data_ptr(), g1->get_data_size(), g1->get_flags(),
-                   g1->get_srid());
-    Multipolygon mpy2(g2_wkb, g2->get_data_size(), g2->get_flags(),
-                      g2->get_srid());
-    std::unique_ptr<Multilinestring> linestrings(new Multilinestring());
-    linestrings->set_srid(g1->get_srid());
-
-    // Union(LineString, MultiPolygon) isn't supported by BG, but it's
-    // equivalent to GeometryCollection(MultiPolygon,
-    // Difference(LineString, MultiPolygon)).
-    boost::geometry::difference(ls1, mpy2, *linestrings);
-    assert(linestrings.get() != nullptr);
-    if (post_fix_result(&m_ifso->m_bg_resbuf_mgr, *linestrings, nullptr) &&
-        linestrings->size() > 0) {
-      my_error(ER_GIS_UNKNOWN_ERROR, MYF(0), m_ifso->func_name());
-      null_value = true;
-      return nullptr;
-    }
-
-    // Return the simplest result possible.
-    if (linestrings->size() == 0) {
-      // MultiPolygon result.
-      g2->as_geometry(result, true);
-      retgeo = g2;
-    } else {
-      // GeometryCollection result containing one or more Polygons and
-      // one or more LineStrings.
-      Gis_geometry_collection *collection = new Gis_geometry_collection();
-      collection->set_srid(g1->get_srid());
-
-      if (mpy2.size() > 1) {
-        collection->append_geometry(&mpy2, result);
-      } else {
-        mpy2[0].to_wkb_unparsed();
-        mpy2[0].set_srid(g1->get_srid());
-        collection->append_geometry(&mpy2[0], result);
-      }
-
-      if (linestrings->size() > 1) {
-        collection->append_geometry(&(*linestrings), result);
-      } else {
-        (*linestrings)[0].set_srid(g1->get_srid());
-        collection->append_geometry(&(*linestrings)[0], result);
-      }
-
-      collection->set_ownmem(false);
-      retgeo = collection;
-    }
-
-    return retgeo;
-  }
-
-  Geometry *polygon_union_multilinestring(Geometry *g1, Geometry *g2,
-                                          String *result) {
-    Geometry *retgeo = nullptr;
-    const void *g1_wkb = g1->normalize_ring_order();
-    if (g1_wkb == nullptr) {
-      // Invalid polygon
-      my_error(ER_GIS_INVALID_DATA, MYF(0), m_ifso->func_name());
-      null_value = true;
-      return nullptr;
-    }
-
-    Polygon py1(g1_wkb, g1->get_data_size(), g1->get_flags(), g1->get_srid());
-    Multilinestring mls2(g2->get_data_ptr(), g2->get_data_size(),
-                         g2->get_flags(), g2->get_srid());
-    std::unique_ptr<Multilinestring> linestrings(new Multilinestring());
-    linestrings->set_srid(g1->get_srid());
-
-    // Union(Polygon, MultiLineString) isn't supported by BG, but it's
-    // equivalent to GeometryCollection(Polygon,
-    // Difference(MultiLineString, Polygon)).
-    boost::geometry::difference(mls2, py1, *linestrings);
-    assert(linestrings.get() != nullptr);
-    if (post_fix_result(&m_ifso->m_bg_resbuf_mgr, *linestrings, nullptr) &&
-        linestrings->size() > 0) {
-      my_error(ER_GIS_UNKNOWN_ERROR, MYF(0), m_ifso->func_name());
-      null_value = true;
-      return nullptr;
-    }
-
-    // Return the simplest result possible.
-    if (linestrings->size() == 0) {
-      // Polygon result.
-      g2->as_geometry(result, true);
-      retgeo = g2;
-    } else {
-      // GeometryCollection result containing one Polygon and one or
-      // more LineStrings.
-      Gis_geometry_collection *collection = new Gis_geometry_collection();
-      py1.to_wkb_unparsed();
-      collection->append_geometry(&py1, result);
-      if (linestrings->size() > 1) {
-        collection->append_geometry(&(*linestrings), result);
-      } else {
-        collection->append_geometry(&(*linestrings)[0], result);
-      }
-      collection->set_ownmem(false);
-      retgeo = collection;
-    }
-
-    return retgeo;
-  }
-
-  Geometry *multipoint_union_multipoint(Geometry *g1, Geometry *g2,
-                                        String *result) {
-    Geometry *retgeo = nullptr;
-    Point_set ptset;
-    Multipoint *mpts = new Multipoint();
-    std::unique_ptr<Multipoint> guard(mpts);
-
-    mpts->set_srid(g1->get_srid());
-    Multipoint mpts1(g1->get_data_ptr(), g1->get_data_size(), g1->get_flags(),
-                     g1->get_srid());
-    Multipoint mpts2(g2->get_data_ptr(), g2->get_data_size(), g2->get_flags(),
-                     g2->get_srid());
-
-    ptset.insert(mpts1.begin(), mpts1.end());
-    ptset.insert(mpts2.begin(), mpts2.end());
-    std::copy(ptset.begin(), ptset.end(), std::back_inserter(*mpts));
-
-    if (mpts->size() > 0) {
-      retgeo = mpts;
-      null_value = m_ifso->assign_result(mpts, result);
-      guard.release();
-    } else {
-      if (!null_value) {
-        retgeo = m_ifso->empty_result(result, g1->get_srid());
-        copy_ifso_state();
-      }
-    }
-    return retgeo;
-  }
-
-  Geometry *multipoint_union_geometry(Geometry *g1, Geometry *g2,
-                                      String *result) {
-    Geometry *retgeo = nullptr;
-#if !defined(NDEBUG)
-    Geometry::wkbType gt2 = g2->get_type();
-#endif
-    Point_set ptset;
-    Multipoint mpts(g1->get_data_ptr(), g1->get_data_size(), g1->get_flags(),
-                    g1->get_srid());
-
-    assert(gt2 == Geometry::wkb_linestring || gt2 == Geometry::wkb_polygon ||
-           gt2 == Geometry::wkb_multilinestring ||
-           gt2 == Geometry::wkb_multipolygon);
-    ptset.insert(mpts.begin(), mpts.end());
-
-    Gis_geometry_collection *geocol = new Gis_geometry_collection(g2, result);
-    std::unique_ptr<Gis_geometry_collection> guard(geocol);
-    bool added = false;
-
-    for (typename Point_set::iterator i = ptset.begin(); i != ptset.end();
-         ++i) {
-      Point &pt = const_cast<Point &>(*i);
-      if (Ifsr::bg_geo_relation_check(&pt, g2, Ifsr::SP_DISJOINT_FUNC,
-                                      &null_value)) {
-        if (null_value || (null_value = geocol->append_geometry(&pt, result)))
-          break;
-        added = true;
-      }
-    }
-
-    if (null_value) return nullptr;
-
-    if (added) {
-      // Result is already filled above.
-      retgeo = geocol;
-      guard.release();
-    } else {
-      retgeo = g2;
-      null_value = g2->as_geometry(result, true);
-    }
-
-    return retgeo;
-  }
-
-  Geometry *multilinestring_union_multilinestring(Geometry *g1, Geometry *g2,
-                                                  String *result) {
-    Multilinestring mls1(g1->get_data_ptr(), g1->get_data_size(),
-                         g1->get_flags(), g1->get_srid());
-    Multilinestring mls2(g2->get_data_ptr(), g2->get_data_size(),
-                         g2->get_flags(), g2->get_srid());
-    std::unique_ptr<Multilinestring> res(new Multilinestring());
-    res->set_srid(g1->get_srid());
-
-    boost::geometry::union_(mls1, mls2, *res);
-    assert(res.get() != nullptr);
-    assert(res->size() != 0);
-    if (post_fix_result(&m_ifso->m_bg_resbuf_mgr, *res, result)) {
-      my_error(ER_GIS_UNKNOWN_ERROR, MYF(0), m_ifso->func_name());
-      null_value = true;
-      return nullptr;
-    }
-
-    return res.release();
-  }
-
-  Geometry *multilinestring_union_multipolygon(Geometry *g1, Geometry *g2,
-                                               String *result) {
-    Geometry *retgeo = nullptr;
-    const void *g2_wkb = g2->normalize_ring_order();
-    if (g2_wkb == nullptr) {
-      // Invalid polygon
-      my_error(ER_GIS_INVALID_DATA, MYF(0), m_ifso->func_name());
-      null_value = true;
-      return nullptr;
-    }
-
-    Multilinestring mls1(g1->get_data_ptr(), g1->get_data_size(),
-                         g1->get_flags(), g1->get_srid());
-    Multipolygon mpy2(g2_wkb, g2->get_data_size(), g2->get_flags(),
-                      g2->get_srid());
-    std::unique_ptr<Multilinestring> linestrings(new Multilinestring());
-    linestrings->set_srid(g1->get_srid());
-
-    // Union(MultiLineString, MultiPolygon) isn't supported by BG, but
-    // it's equivalent to GeometryCollection(MultiPolygon,
-    // Difference(MultiLineString, MultiPolygon)).
-    boost::geometry::difference(mls1, mpy2, *linestrings);
-    assert(linestrings.get() != nullptr);
-    if (post_fix_result(&m_ifso->m_bg_resbuf_mgr, *linestrings, nullptr) &&
-        linestrings->size() > 0) {
-      my_error(ER_GIS_UNKNOWN_ERROR, MYF(0), m_ifso->func_name());
-      null_value = true;
-      return nullptr;
-    }
-
-    // Return the simplest result possible.
-    if (linestrings->size() == 0) {
-      // MultiPolygon result.
-      g2->as_geometry(result, true);
-      retgeo = g2;
-    } else {
-      // GeometryCollection result containing one or more Polygons and
-      // one or more LineStrings.
-      Gis_geometry_collection *collection = new Gis_geometry_collection();
-      collection->set_srid(g1->get_srid());
-
-      if (mpy2.size() > 1) {
-        collection->append_geometry(&mpy2, result);
-      } else {
-        mpy2[0].to_wkb_unparsed();
-        mpy2[0].set_srid(g1->get_srid());
-        collection->append_geometry(&mpy2[0], result);
-      }
-
-      if (linestrings->size() > 1) {
-        collection->append_geometry(&(*linestrings), result);
-      } else {
-        (*linestrings)[0].set_srid(g1->get_srid());
-        collection->append_geometry(&(*linestrings)[0], result);
-      }
-
-      collection->set_ownmem(false);
-      retgeo = collection;
-    }
-
-    return retgeo;
-  }
-
-  Geometry *polygon_union_polygon(Geometry *g1, Geometry *g2, String *result) {
-    Geometry *retgeo = nullptr;
-    const void *g1_wkb = g1->normalize_ring_order();
-    const void *g2_wkb = g2->normalize_ring_order();
-    if (g1_wkb == nullptr || g2_wkb == nullptr) {
-      // Invalid polygon
-      my_error(ER_GIS_INVALID_DATA, MYF(0), m_ifso->func_name());
-      null_value = true;
-      return nullptr;
-    }
-
-    Polygon py1(g1->get_data_ptr(), g1->get_data_size(), g1->get_flags(),
-                g1->get_srid());
-    Polygon py2(g2_wkb, g2->get_data_size(), g2->get_flags(), g2->get_srid());
-    std::unique_ptr<Multipolygon> res(new Multipolygon());
-    res->set_srid(g1->get_srid());
-
-    boost::geometry::union_(py1, py2, *res);
-    if (post_fix_result(&m_ifso->m_bg_resbuf_mgr, *res, result) &&
-        res->size() > 0) {
-      my_error(ER_GIS_UNKNOWN_ERROR, MYF(0), m_ifso->func_name());
-      null_value = true;
-      return nullptr;
-    }
-
-    if (res->size() == 0) {
-      // Invalid polygon
-      my_error(ER_GIS_INVALID_DATA, MYF(0), m_ifso->func_name());
-      null_value = true;
-      return nullptr;
-    }
-
-    retgeo = res.release();
-    return retgeo;
-  }
-
-  Geometry *polygon_union_multipolygon(Geometry *g1, Geometry *g2,
-                                       String *result) {
-    Geometry *retgeo = nullptr;
-
-    BGOPCALL(Multipolygon, retgeo, union_, Polygon, g1, Multipolygon, g2,
-             result, null_value);
-    return retgeo;
-  }
-
-  Geometry *multipolygon_union_multipolygon(Geometry *g1, Geometry *g2,
-                                            String *result) {
-    Geometry *retgeo = nullptr;
-
-    BGOPCALL(Multipolygon, retgeo, union_, Multipolygon, g1, Multipolygon, g2,
-             result, null_value);
-
-    return retgeo;
-  }
-
-  Geometry *point_difference_geometry(Geometry *g1, Geometry *g2,
-                                      String *result) {
-    Geometry *retgeo = nullptr;
-    bool is_out = Ifsr::bg_geo_relation_check(g1, g2, Ifsr::SP_DISJOINT_FUNC,
-                                              &null_value);
-
-    if (!null_value) {
-      if (is_out) {
-        retgeo = g1;
-        null_value = retgeo->as_geometry(result, true);
-      } else {
-        retgeo = m_ifso->empty_result(result, g1->get_srid());
-        copy_ifso_state();
-      }
-    }
-    return retgeo;
-  }
-
-  Geometry *multipoint_difference_geometry(Geometry *g1, Geometry *g2,
-                                           String *result) {
-    Geometry *retgeo = nullptr;
-    Multipoint *mpts = new Multipoint();
-    std::unique_ptr<Multipoint> guard(mpts);
-
-    mpts->set_srid(g1->get_srid());
-    Multipoint mpts1(g1->get_data_ptr(), g1->get_data_size(), g1->get_flags(),
-                     g1->get_srid());
-    Point_set ptset;
-
-    for (typename Multipoint::iterator i = mpts1.begin(); i != mpts1.end();
-         ++i) {
-      if (Ifsr::bg_geo_relation_check(&(*i), g2, Ifsr::SP_DISJOINT_FUNC,
-                                      &null_value)) {
-        if (null_value) return nullptr;
-        ptset.insert(*i);
-      }
-    }
-
-    if (ptset.empty() == false) {
-      std::copy(ptset.begin(), ptset.end(), std::back_inserter(*mpts));
-      null_value = m_ifso->assign_result(mpts, result);
-      retgeo = mpts;
-      guard.release();
-    } else {
-      if (!null_value) {
-        retgeo = m_ifso->empty_result(result, g1->get_srid());
-        copy_ifso_state();
-      }
-    }
-    return retgeo;
-  }
-
-  Geometry *linestring_difference_linestring(Geometry *g1, Geometry *g2,
-                                             String *result) {
-    Geometry *retgeo = nullptr;
-    Linestring ls1(g1->get_data_ptr(), g1->get_data_size(), g1->get_flags(),
-                   g1->get_srid());
-    Linestring ls2(g2->get_data_ptr(), g2->get_data_size(), g2->get_flags(),
-                   g2->get_srid());
-    std::unique_ptr<Multilinestring> res(new Multilinestring());
-    res->set_srid(g1->get_srid());
-
-    boost::geometry::difference(ls1, ls2, *res);
-
-    // The call to ls->set_ptr() below assumes that result->length()
-    // is the length of the LineString, which is only true if result
-    // is empty to begin with.
-    assert(result->length() == 0);
-
-    if (res->size() == 0) {
-      post_fix_result(&m_ifso->m_bg_resbuf_mgr, *res, result);
-      retgeo = m_ifso->empty_result(result, g1->get_srid());
-    } else if (res->size() == 1) {
-      if (post_fix_result(&m_ifso->m_bg_resbuf_mgr, *res, nullptr)) {
-        my_error(ER_GIS_UNKNOWN_ERROR, MYF(0), m_ifso->func_name());
-        null_value = true;
-        return nullptr;
-      }
-      Linestring *ls = new Linestring();
-      res->begin()->as_geometry(result, false);
-      ls->set_ptr(result->ptr() + GEOM_HEADER_SIZE,
-                  result->length() - GEOM_HEADER_SIZE);
-      ls->set_ownmem(false);
-      retgeo = ls;
-    } else {
-      if (post_fix_result(&m_ifso->m_bg_resbuf_mgr, *res, result)) {
-        my_error(ER_GIS_UNKNOWN_ERROR, MYF(0), m_ifso->func_name());
-        null_value = true;
-        return nullptr;
-      }
-      retgeo = res.release();
-    }
-
-    return retgeo;
-  }
-
-  Geometry *linestring_difference_polygon(Geometry *g1, Geometry *g2,
-                                          String *result) {
-    Geometry *retgeo = nullptr;
-
-    BGOPCALL(Multilinestring, retgeo, difference, Linestring, g1, Polygon, g2,
-             result, null_value);
-
-    if (!retgeo && !null_value) {
-      retgeo = m_ifso->empty_result(result, g1->get_srid());
-      copy_ifso_state();
-    }
-
-    return retgeo;
-  }
-
-  Geometry *linestring_difference_multilinestring(Geometry *g1, Geometry *g2,
-                                                  String *result) {
-    Geometry *retgeo = nullptr;
-    Linestring ls1(g1->get_data_ptr(), g1->get_data_size(), g1->get_flags(),
-                   g1->get_srid());
-    Multilinestring mls2(g2->get_data_ptr(), g2->get_data_size(),
-                         g2->get_flags(), g2->get_srid());
-    std::unique_ptr<Multilinestring> res(new Multilinestring());
-    res->set_srid(g1->get_srid());
-
-    boost::geometry::difference(ls1, mls2, *res);
-
-    // The call to ls->set_ptr() below assumes that result->length()
-    // is the length of the LineString, which is only true if result
-    // is empty to begin with.
-    assert(result->length() == 0);
-
-    if (res->size() == 0) {
-      post_fix_result(&m_ifso->m_bg_resbuf_mgr, *res, result);
-      retgeo = m_ifso->empty_result(result, g1->get_srid());
-    } else if (res->size() == 1) {
-      if (post_fix_result(&m_ifso->m_bg_resbuf_mgr, *res, nullptr)) {
-        my_error(ER_GIS_UNKNOWN_ERROR, MYF(0), m_ifso->func_name());
-        null_value = true;
-        return nullptr;
-      }
-      Linestring *ls = new Linestring();
-      res->begin()->as_geometry(result, false);
-      ls->set_ptr(result->ptr() + GEOM_HEADER_SIZE,
-                  result->length() - GEOM_HEADER_SIZE);
-      ls->set_ownmem(false);
-      retgeo = ls;
-    } else {
-      if (post_fix_result(&m_ifso->m_bg_resbuf_mgr, *res, result)) {
-        my_error(ER_GIS_UNKNOWN_ERROR, MYF(0), m_ifso->func_name());
-        null_value = true;
-        return nullptr;
-      }
-      retgeo = res.release();
-    }
-
-    return retgeo;
-  }
-
-  Geometry *linestring_difference_multipolygon(Geometry *g1, Geometry *g2,
-                                               String *result) {
-    Geometry *retgeo = nullptr;
-
-    BGOPCALL(Multilinestring, retgeo, difference, Linestring, g1, Multipolygon,
-             g2, result, null_value);
-
-    if (!retgeo && !null_value) {
-      retgeo = m_ifso->empty_result(result, g1->get_srid());
-      copy_ifso_state();
-    }
-    return retgeo;
-  }
-
-  Geometry *polygon_difference_polygon(Geometry *g1, Geometry *g2,
-                                       String *result) {
-    Geometry *retgeo = nullptr;
-
-    BGOPCALL(Multipolygon, retgeo, difference, Polygon, g1, Polygon, g2, result,
-             null_value);
-
-    if (!retgeo && !null_value) {
-      retgeo = m_ifso->empty_result(result, g1->get_srid());
-      copy_ifso_state();
-    }
-    return retgeo;
-  }
-
-  Geometry *polygon_difference_multipolygon(Geometry *g1, Geometry *g2,
-                                            String *result) {
-    Geometry *retgeo = nullptr;
-
-    BGOPCALL(Multipolygon, retgeo, difference, Polygon, g1, Multipolygon, g2,
-             result, null_value);
-
-    if (!retgeo && !null_value) {
-      retgeo = m_ifso->empty_result(result, g1->get_srid());
-      copy_ifso_state();
-    }
-    return retgeo;
-  }
-
-  Geometry *multilinestring_difference_linestring(Geometry *g1, Geometry *g2,
-                                                  String *result) {
-    Geometry *retgeo = nullptr;
-    Multilinestring mls1(g1->get_data_ptr(), g1->get_data_size(),
-                         g1->get_flags(), g1->get_srid());
-    Linestring ls2(g2->get_data_ptr(), g2->get_data_size(), g2->get_flags(),
-                   g2->get_srid());
-    std::unique_ptr<Multilinestring> res(new Multilinestring());
-    res->set_srid(g1->get_srid());
-
-    boost::geometry::difference(mls1, ls2, *res);
-
-    // The call to ls->set_ptr() below assumes that result->length()
-    // is the length of the LineString, which is only true if result
-    // is empty to begin with.
-    assert(result->length() == 0);
-
-    if (res->size() == 0) {
-      post_fix_result(&m_ifso->m_bg_resbuf_mgr, *res, result);
-      retgeo = m_ifso->empty_result(result, g1->get_srid());
-    } else if (res->size() == 1) {
-      if (post_fix_result(&m_ifso->m_bg_resbuf_mgr, *res, nullptr)) {
-        my_error(ER_GIS_UNKNOWN_ERROR, MYF(0), m_ifso->func_name());
-        null_value = true;
-        return nullptr;
-      }
-      Linestring *ls = new Linestring();
-      res->begin()->as_geometry(result, false);
-      ls->set_ptr(result->ptr() + GEOM_HEADER_SIZE,
-                  result->length() - GEOM_HEADER_SIZE);
-      ls->set_ownmem(false);
-      retgeo = ls;
-    } else {
-      if (post_fix_result(&m_ifso->m_bg_resbuf_mgr, *res, result)) {
-        my_error(ER_GIS_UNKNOWN_ERROR, MYF(0), m_ifso->func_name());
-        null_value = true;
-        return nullptr;
-      }
-      retgeo = res.release();
-    }
-
-    return retgeo;
-  }
-
-  Geometry *multilinestring_difference_polygon(Geometry *g1, Geometry *g2,
-                                               String *result) {
-    Geometry *retgeo = nullptr;
-
-    BGOPCALL(Multilinestring, retgeo, difference, Multilinestring, g1, Polygon,
-             g2, result, null_value);
-
-    if (!retgeo && !null_value) {
-      retgeo = m_ifso->empty_result(result, g1->get_srid());
-      copy_ifso_state();
-    }
-    return retgeo;
-  }
-
-  Geometry *multilinestring_difference_multilinestring(Geometry *g1,
-                                                       Geometry *g2,
-                                                       String *result) {
-    Geometry *retgeo = nullptr;
-    Multilinestring mls1(g1->get_data_ptr(), g1->get_data_size(),
-                         g1->get_flags(), g1->get_srid());
-    Multilinestring mls2(g2->get_data_ptr(), g2->get_data_size(),
-                         g2->get_flags(), g2->get_srid());
-    std::unique_ptr<Multilinestring> res(new Multilinestring());
-    res->set_srid(g1->get_srid());
-
-    boost::geometry::difference(mls1, mls2, *res);
-
-    // The call to ls->set_ptr() below assumes that result->length()
-    // is the length of the LineString, which is only true if result
-    // is empty to begin with.
-    assert(result->length() == 0);
-
-    if (res->size() == 0) {
-      post_fix_result(&m_ifso->m_bg_resbuf_mgr, *res, result);
-      retgeo = m_ifso->empty_result(result, g1->get_srid());
-    } else if (res->size() == 1) {
-      if (post_fix_result(&m_ifso->m_bg_resbuf_mgr, *res, nullptr)) {
-        my_error(ER_GIS_UNKNOWN_ERROR, MYF(0), m_ifso->func_name());
-        null_value = true;
-        return nullptr;
-      }
-      Linestring *ls = new Linestring();
-      res->begin()->as_geometry(result, false);
-      ls->set_ptr(result->ptr() + GEOM_HEADER_SIZE,
-                  result->length() - GEOM_HEADER_SIZE);
-      ls->set_ownmem(false);
-      retgeo = ls;
-    } else {
-      if (post_fix_result(&m_ifso->m_bg_resbuf_mgr, *res, result)) {
-        my_error(ER_GIS_UNKNOWN_ERROR, MYF(0), m_ifso->func_name());
-        null_value = true;
-        return nullptr;
-      }
-      retgeo = res.release();
-    }
-
-    return retgeo;
-  }
-
-  Geometry *multilinestring_difference_multipolygon(Geometry *g1, Geometry *g2,
-                                                    String *result) {
-    Geometry *retgeo = nullptr;
-
-    BGOPCALL(Multilinestring, retgeo, difference, Multilinestring, g1,
-             Multipolygon, g2, result, null_value);
-
-    if (!retgeo && !null_value) {
-      retgeo = m_ifso->empty_result(result, g1->get_srid());
-      copy_ifso_state();
-    }
-    return retgeo;
-  }
-
-  Geometry *multipolygon_difference_polygon(Geometry *g1, Geometry *g2,
-                                            String *result) {
-    Geometry *retgeo = nullptr;
-
-    BGOPCALL(Multipolygon, retgeo, difference, Multipolygon, g1, Polygon, g2,
-             result, null_value);
-
-    if (!retgeo && !null_value) {
-      retgeo = m_ifso->empty_result(result, g1->get_srid());
-      copy_ifso_state();
-    }
-    return retgeo;
-  }
-
-  Geometry *multipolygon_difference_multipolygon(Geometry *g1, Geometry *g2,
-                                                 String *result) {
-    Geometry *retgeo = nullptr;
-
-    BGOPCALL(Multipolygon, retgeo, difference, Multipolygon, g1, Multipolygon,
-             g2, result, null_value);
-
-    if (!retgeo && !null_value) {
-      retgeo = m_ifso->empty_result(result, g1->get_srid());
-      copy_ifso_state();
-    }
-    return retgeo;
-  }
-
-  Geometry *linestring_symdifference_linestring(Geometry *g1, Geometry *g2,
-                                                String *result) {
-    Geometry *retgeo = nullptr;
-    Linestring ls1(g1->get_data_ptr(), g1->get_data_size(), g1->get_flags(),
-                   g1->get_srid());
-    Linestring ls2(g2->get_data_ptr(), g2->get_data_size(), g2->get_flags(),
-                   g2->get_srid());
-    std::unique_ptr<Multilinestring> res(new Multilinestring());
-    res->set_srid(g1->get_srid());
-
-    boost::geometry::sym_difference(ls1, ls2, *res);
-    assert(res.get() != nullptr);
-    if (post_fix_result(&m_ifso->m_bg_resbuf_mgr, *res, result) &&
-        res->size() > 0) {
-      my_error(ER_GIS_UNKNOWN_ERROR, MYF(0), m_ifso->func_name());
-      null_value = true;
-      return nullptr;
-    }
-
-    if (res->size() == 0) {
-      retgeo = m_ifso->empty_result(result, g1->get_srid());
-    } else {
-      retgeo = res.release();
-    }
-
-    return retgeo;
-  }
-
-  Geometry *linestring_symdifference_multilinestring(Geometry *g1, Geometry *g2,
-                                                     String *result) {
-    Geometry *retgeo = nullptr;
-    Linestring ls1(g1->get_data_ptr(), g1->get_data_size(), g1->get_flags(),
-                   g1->get_srid());
-    Multilinestring mls2(g2->get_data_ptr(), g2->get_data_size(),
-                         g2->get_flags(), g2->get_srid());
-    std::unique_ptr<Multilinestring> res(new Multilinestring());
-    res->set_srid(g1->get_srid());
-
-    boost::geometry::sym_difference(ls1, mls2, *res);
-    assert(res.get() != nullptr);
-    if (post_fix_result(&m_ifso->m_bg_resbuf_mgr, *res, result) &&
-        res->size() > 0) {
-      my_error(ER_GIS_UNKNOWN_ERROR, MYF(0), m_ifso->func_name());
-      null_value = true;
-      return nullptr;
-    }
-
-    if (res->size() == 0) {
-      retgeo = m_ifso->empty_result(result, g1->get_srid());
-    } else {
-      retgeo = res.release();
-    }
-
-    return retgeo;
-  }
-
-  Geometry *polygon_symdifference_polygon(Geometry *g1, Geometry *g2,
-                                          String *result) {
-    Geometry *retgeo = nullptr;
-
-    BGOPCALL(Multipolygon, retgeo, sym_difference, Polygon, g1, Polygon, g2,
-             result, null_value);
-
-    if (!retgeo && !null_value) {
-      retgeo = m_ifso->empty_result(result, g1->get_srid());
-      copy_ifso_state();
-    }
-    return retgeo;
-  }
-
-  Geometry *polygon_symdifference_multipolygon(Geometry *g1, Geometry *g2,
-                                               String *result) {
-    Geometry *retgeo = nullptr;
-
-    BGOPCALL(Multipolygon, retgeo, sym_difference, Polygon, g1, Multipolygon,
-             g2, result, null_value);
-
-    if (!retgeo && !null_value) {
-      retgeo = m_ifso->empty_result(result, g1->get_srid());
-      copy_ifso_state();
-    }
-    return retgeo;
-  }
-
-  Geometry *multilinestring_symdifference_multilinestring(Geometry *g1,
-                                                          Geometry *g2,
-                                                          String *result) {
-    Geometry *retgeo = nullptr;
-    Multilinestring mls1(g1->get_data_ptr(), g1->get_data_size(),
-                         g1->get_flags(), g1->get_srid());
-    Multilinestring mls2(g2->get_data_ptr(), g2->get_data_size(),
-                         g2->get_flags(), g2->get_srid());
-    std::unique_ptr<Multilinestring> res(new Multilinestring());
-    res->set_srid(g1->get_srid());
-
-    boost::geometry::sym_difference(mls1, mls2, *res);
-    assert(res.get() != nullptr);
-    if (post_fix_result(&m_ifso->m_bg_resbuf_mgr, *res, result) &&
-        res->size() > 0) {
-      my_error(ER_GIS_UNKNOWN_ERROR, MYF(0), m_ifso->func_name());
-      null_value = true;
-      return nullptr;
-    }
-
-    if (res->size() == 0) {
-      retgeo = m_ifso->empty_result(result, g1->get_srid());
-    } else {
-      retgeo = res.release();
-    }
-
-    return retgeo;
-  }
-
-  Geometry *multipolygon_symdifference_polygon(Geometry *g1, Geometry *g2,
-                                               String *result) {
-    Geometry *retgeo = nullptr;
-
-    BGOPCALL(Multipolygon, retgeo, sym_difference, Multipolygon, g1, Polygon,
-             g2, result, null_value);
-
-    if (!retgeo && !null_value) {
-      retgeo = m_ifso->empty_result(result, g1->get_srid());
-      copy_ifso_state();
-    }
-    return retgeo;
-  }
-
-  Geometry *multipolygon_symdifference_multipolygon(Geometry *g1, Geometry *g2,
-                                                    String *result) {
-    Geometry *retgeo = nullptr;
-
-    BGOPCALL(Multipolygon, retgeo, sym_difference, Multipolygon, g1,
-             Multipolygon, g2, result, null_value);
-
-    if (!retgeo && !null_value) {
-      retgeo = m_ifso->empty_result(result, g1->get_srid());
-      copy_ifso_state();
-    }
-    return retgeo;
-  }
-};
-
-/**
-  Do intersection operation for two geometries, dispatch to specific BG
-  function wrapper calls according to set operation type, and the 1st or
-  both operand types.
-
-  @tparam Geom_types A wrapper for all geometry types.
-  @param g1 First Geometry operand, not a geometry collection.
-  @param g2 Second Geometry operand, not a geometry collection.
-  @param[out] result Holds WKB data of the result.
-  @return The result geometry whose WKB data is held in result.
- */
-template <typename Geom_types>
-Geometry *Item_func_spatial_operation::intersection_operation(Geometry *g1,
-                                                              Geometry *g2,
-                                                              String *result) {
-  BG_setop_wrapper<Geom_types> wrap(this);
-  Geometry *retgeo = nullptr;
-  Geometry::wkbType gt1 = g1->get_type();
-  Geometry::wkbType gt2 = g2->get_type();
-
-  switch (gt1) {
-    case Geometry::wkb_point:
-      switch (gt2) {
-        case Geometry::wkb_point:
-          retgeo = wrap.point_intersection_point(g1, g2, result);
-          break;
-        case Geometry::wkb_multipoint:
-          retgeo = wrap.point_intersection_multipoint(g1, g2, result);
-          break;
-        case Geometry::wkb_linestring:
-        case Geometry::wkb_polygon:
-        case Geometry::wkb_multilinestring:
-        case Geometry::wkb_multipolygon:
-          retgeo = wrap.point_intersection_geometry(g1, g2, result);
-          break;
-        default:
-          break;
-      }
-
-      break;
-    case Geometry::wkb_multipoint:
-      switch (gt2) {
-        case Geometry::wkb_point:
-          retgeo = wrap.point_intersection_multipoint(g2, g1, result);
-          break;
-
-        case Geometry::wkb_multipoint:
-          retgeo = wrap.multipoint_intersection_multipoint(g1, g2, result);
-          break;
-        case Geometry::wkb_linestring:
-        case Geometry::wkb_polygon:
-        case Geometry::wkb_multilinestring:
-        case Geometry::wkb_multipolygon:
-          retgeo = wrap.multipoint_intersection_geometry(g1, g2, result);
-          break;
-        default:
-          break;
-      }
-      break;
-    case Geometry::wkb_linestring:
-      switch (gt2) {
-        case Geometry::wkb_point:
-        case Geometry::wkb_multipoint:
-          retgeo = intersection_operation<Geom_types>(g2, g1, result);
-          break;
-        case Geometry::wkb_linestring:
-          retgeo = wrap.linestring_intersection_linestring(g1, g2, result);
-          break;
-        case Geometry::wkb_multilinestring:
-          retgeo = wrap.linestring_intersection_multilinestring(g1, g2, result);
-          break;
-        case Geometry::wkb_polygon:
-        case Geometry::wkb_multipolygon:
-          retgeo = wrap.linestring_intersection_polygon(g1, g2, result);
-          break;
-        default:
-          break;
-      }
-      break;
-    case Geometry::wkb_polygon:
-      switch (gt2) {
-        case Geometry::wkb_point:
-        case Geometry::wkb_multipoint:
-        case Geometry::wkb_linestring:
-          retgeo = intersection_operation<Geom_types>(g2, g1, result);
-          break;
-        case Geometry::wkb_multilinestring:
-          retgeo = wrap.polygon_intersection_multilinestring(g1, g2, result);
-          break;
-        case Geometry::wkb_polygon:
-        case Geometry::wkb_multipolygon:
-          // Note: for now BG's set operations don't allow returning a
-          // Multilinestring, thus this result isn't complete.
-          retgeo = wrap.polygon_intersection_polygon(g1, g2, result);
-          break;
-        default:
-          break;
-      }
-      break;
-    case Geometry::wkb_multilinestring:
-      switch (gt2) {
-        case Geometry::wkb_point:
-        case Geometry::wkb_multipoint:
-        case Geometry::wkb_linestring:
-        case Geometry::wkb_polygon:
-          retgeo = intersection_operation<Geom_types>(g2, g1, result);
-          break;
-        case Geometry::wkb_multilinestring:
-          retgeo =
-              wrap.multilinestring_intersection_multilinestring(g1, g2, result);
-          break;
-
-        case Geometry::wkb_multipolygon:
-          retgeo =
-              wrap.multilinestring_intersection_multipolygon(g1, g2, result);
-          break;
-        default:
-          break;
-      }
-      break;
-    case Geometry::wkb_multipolygon:
-      switch (gt2) {
-        case Geometry::wkb_point:
-        case Geometry::wkb_multipoint:
-        case Geometry::wkb_linestring:
-        case Geometry::wkb_multilinestring:
-        case Geometry::wkb_polygon:
-          retgeo = intersection_operation<Geom_types>(g2, g1, result);
-          break;
-        case Geometry::wkb_multipolygon:
-          retgeo = wrap.multipolygon_intersection_multipolygon(g1, g2, result);
-          break;
-        default:
-          break;
-      }
-      break;
-    default:
-      break;
-  }
-
-  if (!null_value) null_value = wrap.get_null_value();
-  return retgeo;
-}
-
-/**
-  Do union operation for two geometries, dispatch to specific BG
-  function wrapper calls according to set operation type, and the 1st or
-  both operand types.
-
-  @tparam Geom_types A wrapper for all geometry types.
-  @param g1 First Geometry operand, not a geometry collection.
-  @param g2 Second Geometry operand, not a geometry collection.
-  @param[out] result Holds WKB data of the result.
-  @return The result geometry whose WKB data is held in result.
- */
-template <typename Geom_types>
-Geometry *Item_func_spatial_operation::union_operation(Geometry *g1,
-                                                       Geometry *g2,
-                                                       String *result) {
-  BG_setop_wrapper<Geom_types> wrap(this);
-  Geometry *retgeo = nullptr;
-  Geometry::wkbType gt1 = g1->get_type();
-  Geometry::wkbType gt2 = g2->get_type();
-
-  // Note that union can't produce empty point set unless given two empty
-  // point set arguments.
-  switch (gt1) {
-    case Geometry::wkb_point:
-      switch (gt2) {
-        case Geometry::wkb_point:
-        case Geometry::wkb_multipoint:
-          retgeo = wrap.point_union_point(g1, g2, result);
-          break;
-        case Geometry::wkb_linestring:
-        case Geometry::wkb_multilinestring:
-        case Geometry::wkb_polygon:
-        case Geometry::wkb_multipolygon:
-          retgeo = wrap.point_union_geometry(g1, g2, result);
-          break;
-        default:
-          break;
-      }
-      break;
-    case Geometry::wkb_multipoint:
-      switch (gt2) {
-        case Geometry::wkb_point:
-          retgeo = wrap.point_union_point(g2, g1, result);
-          break;
-        case Geometry::wkb_multipoint:
-          retgeo = wrap.multipoint_union_multipoint(g1, g2, result);
-          break;
-        case Geometry::wkb_linestring:
-        case Geometry::wkb_multilinestring:
-        case Geometry::wkb_polygon:
-        case Geometry::wkb_multipolygon:
-          retgeo = wrap.multipoint_union_geometry(g1, g2, result);
-          break;
-        default:
-          break;
-      }
-      break;
-    case Geometry::wkb_linestring:
-      switch (gt2) {
-        case Geometry::wkb_point:
-        case Geometry::wkb_multipoint:
-          retgeo = union_operation<Geom_types>(g2, g1, result);
-          break;
-        case Geometry::wkb_linestring:
-          retgeo = wrap.linestring_union_linestring(g1, g2, result);
-          break;
-        case Geometry::wkb_multilinestring:
-          retgeo = wrap.linestring_union_multilinestring(g1, g2, result);
-          break;
-        case Geometry::wkb_polygon:
-          retgeo = wrap.linestring_union_polygon(g1, g2, result);
-          break;
-        case Geometry::wkb_multipolygon:
-          retgeo = wrap.linestring_union_multipolygon(g1, g2, result);
-          break;
-        default:
-          break;
-      }
-      break;
-    case Geometry::wkb_polygon:
-      switch (gt2) {
-        case Geometry::wkb_point:
-        case Geometry::wkb_multipoint:
-        case Geometry::wkb_linestring:
-          retgeo = union_operation<Geom_types>(g2, g1, result);
-          break;
-        case Geometry::wkb_multilinestring:
-          retgeo = wrap.polygon_union_multilinestring(g1, g2, result);
-          break;
-        case Geometry::wkb_polygon:
-          retgeo = wrap.polygon_union_polygon(g1, g2, result);
-          break;
-        case Geometry::wkb_multipolygon:
-          retgeo = wrap.polygon_union_multipolygon(g1, g2, result);
-          break;
-        default:
-          break;
-      }
-      break;
-    case Geometry::wkb_multilinestring:
-      switch (gt2) {
-        case Geometry::wkb_point:
-        case Geometry::wkb_multipoint:
-        case Geometry::wkb_linestring:
-        case Geometry::wkb_polygon:
-          retgeo = union_operation<Geom_types>(g2, g1, result);
-          break;
-          break;
-        case Geometry::wkb_multilinestring:
-          retgeo = wrap.multilinestring_union_multilinestring(g1, g2, result);
-          break;
-        case Geometry::wkb_multipolygon:
-          retgeo = wrap.multilinestring_union_multipolygon(g1, g2, result);
-          break;
-        default:
-          break;
-      }
-      break;
-    case Geometry::wkb_multipolygon:
-      switch (gt2) {
-        case Geometry::wkb_point:
-        case Geometry::wkb_multipoint:
-        case Geometry::wkb_linestring:
-        case Geometry::wkb_polygon:
-        case Geometry::wkb_multilinestring:
-          retgeo = union_operation<Geom_types>(g2, g1, result);
-          break;
-        case Geometry::wkb_multipolygon:
-          retgeo = wrap.multipolygon_union_multipolygon(g1, g2, result);
-          break;
-        default:
-          break;
-      }
-      break;
-    default:
-      break;
-  }
-
-  if (!null_value) null_value = wrap.get_null_value() && is_nullable();
-  if (!null_value && retgeo == nullptr) {
-    my_error(ER_GIS_INVALID_DATA, MYF(0), func_name());
-    error_str();
-    return nullptr;
-  }
-  return retgeo;
-}
-
-/**
-  Do difference operation for two geometries, dispatch to specific BG
-  function wrapper calls according to set operation type, and the 1st or
-  both operand types.
-
-  @tparam Geom_types A wrapper for all geometry types.
-  @param g1 First Geometry operand, not a geometry collection.
-  @param g2 Second Geometry operand, not a geometry collection.
-  @param[out] result Holds WKB data of the result.
-  @return The result geometry whose WKB data is held in result.
- */
-template <typename Geom_types>
-Geometry *Item_func_spatial_operation::difference_operation(Geometry *g1,
-                                                            Geometry *g2,
-                                                            String *result) {
-  BG_setop_wrapper<Geom_types> wrap(this);
-  Geometry *retgeo = nullptr;
-  Geometry::wkbType gt1 = g1->get_type();
-  Geometry::wkbType gt2 = g2->get_type();
-
-  /*
-    Given two geometries g1 and g2, where g1.dimension < g2.dimension, then
-    g2 - g1 is equal to g2, this is always true. This is how postgis works.
-    Below implementation uses this fact.
-   */
-  switch (gt1) {
-    case Geometry::wkb_point:
-      switch (gt2) {
-        case Geometry::wkb_point:
-        case Geometry::wkb_multipoint:
-        case Geometry::wkb_linestring:
-        case Geometry::wkb_polygon:
-        case Geometry::wkb_multilinestring:
-        case Geometry::wkb_multipolygon:
-          retgeo = wrap.point_difference_geometry(g1, g2, result);
-          break;
-        default:
-          break;
-      }
-      break;
-    case Geometry::wkb_multipoint:
-      switch (gt2) {
-        case Geometry::wkb_point:
-        case Geometry::wkb_multipoint:
-        case Geometry::wkb_linestring:
-        case Geometry::wkb_polygon:
-        case Geometry::wkb_multilinestring:
-        case Geometry::wkb_multipolygon:
-          retgeo = wrap.multipoint_difference_geometry(g1, g2, result);
-          break;
-        default:
-          break;
-      }
-      break;
-    case Geometry::wkb_linestring:
-      switch (gt2) {
-        case Geometry::wkb_point:
-        case Geometry::wkb_multipoint:
-          retgeo = g1;
-          null_value = g1->as_geometry(result, true);
-          break;
-        case Geometry::wkb_linestring:
-          retgeo = wrap.linestring_difference_linestring(g1, g2, result);
-          break;
-        case Geometry::wkb_polygon:
-          retgeo = wrap.linestring_difference_polygon(g1, g2, result);
-          break;
-        case Geometry::wkb_multilinestring:
-          retgeo = wrap.linestring_difference_multilinestring(g1, g2, result);
-          break;
-        case Geometry::wkb_multipolygon:
-          retgeo = wrap.linestring_difference_multipolygon(g1, g2, result);
-          break;
-        default:
-          break;
-      }
-      break;
-    case Geometry::wkb_polygon:
-      switch (gt2) {
-        case Geometry::wkb_point:
-        case Geometry::wkb_multipoint:
-        case Geometry::wkb_linestring:
-        case Geometry::wkb_multilinestring:
-          retgeo = g1;
-          null_value = g1->as_geometry(result, true);
-          break;
-        case Geometry::wkb_polygon:
-          retgeo = wrap.polygon_difference_polygon(g1, g2, result);
-          break;
-        case Geometry::wkb_multipolygon:
-          retgeo = wrap.polygon_difference_multipolygon(g1, g2, result);
-          break;
-        default:
-          break;
-      }
-      break;
-    case Geometry::wkb_multilinestring:
-      switch (gt2) {
-        case Geometry::wkb_point:
-        case Geometry::wkb_multipoint:
-          retgeo = g1;
-          null_value = g1->as_geometry(result, true);
-          break;
-        case Geometry::wkb_linestring:
-          retgeo = wrap.multilinestring_difference_linestring(g1, g2, result);
-          break;
-        case Geometry::wkb_polygon:
-          retgeo = wrap.multilinestring_difference_polygon(g1, g2, result);
-          break;
-        case Geometry::wkb_multilinestring:
-          retgeo =
-              wrap.multilinestring_difference_multilinestring(g1, g2, result);
-          break;
-        case Geometry::wkb_multipolygon:
-          retgeo = wrap.multilinestring_difference_multipolygon(g1, g2, result);
-          break;
-        default:
-          break;
-      }
-      break;
-    case Geometry::wkb_multipolygon:
-      switch (gt2) {
-        case Geometry::wkb_point:
-        case Geometry::wkb_multipoint:
-        case Geometry::wkb_linestring:
-        case Geometry::wkb_multilinestring:
-          retgeo = g1;
-          null_value = g1->as_geometry(result, true);
-          break;
-        case Geometry::wkb_polygon:
-          retgeo = wrap.multipolygon_difference_polygon(g1, g2, result);
-          break;
-        case Geometry::wkb_multipolygon:
-          retgeo = wrap.multipolygon_difference_multipolygon(g1, g2, result);
-          break;
-        default:
-          break;
-      }
-      break;
-    default:
-      break;
-  }
-
-  if (!null_value) null_value = wrap.get_null_value();
-  return retgeo;
-}
-
-/**
-  Do symdifference operation for two geometries, dispatch to specific BG
-  function wrapper calls according to set operation type, and the 1st or
-  both operand types.
-
-  @tparam Geom_types A wrapper for all geometry types.
-  @param g1 First Geometry operand, not a geometry collection.
-  @param g2 Second Geometry operand, not a geometry collection.
-  @param[out] result Holds WKB data of the result.
-  @return The result geometry whose WKB data is held in result.
- */
-template <typename Geom_types>
-Geometry *Item_func_spatial_operation::symdifference_operation(Geometry *g1,
-                                                               Geometry *g2,
-                                                               String *result) {
-  typedef typename Geom_types::Coordinate_system Coordsys;
-
-  BG_setop_wrapper<Geom_types> wrap(this);
-  Geometry *retgeo = nullptr;
-  Geometry::wkbType gt1 = g1->get_type();
-  Geometry::wkbType gt2 = g2->get_type();
-
-  /*
-    SymDifference(L, A) isn't supported by BG, but it's equivalent
-    to
-
-        GeometryCollection(Difference(A, L), Difference(L, A))
-
-    Since geometries must be closed, Difference(A, L) is equivalent
-    to A, so we can simplify to
-
-        GeometryCollection(A, Difference(L, A))
-
-    This is equivalent to Union(L, A), so we reuse that implementation.
-   */
-  bool do_geocol_setop = false;
-
-  switch (gt1) {
-    case Geometry::wkb_linestring:
-      switch (gt2) {
-        case Geometry::wkb_linestring:
-          retgeo = wrap.linestring_symdifference_linestring(g1, g2, result);
-          break;
-        case Geometry::wkb_polygon:
-          retgeo = wrap.linestring_union_polygon(g1, g2, result);
-          break;
-        case Geometry::wkb_multilinestring:
-          retgeo =
-              wrap.linestring_symdifference_multilinestring(g1, g2, result);
-          break;
-        case Geometry::wkb_multipolygon:
-          retgeo = wrap.linestring_union_multipolygon(g1, g2, result);
-          break;
-        default:
-          do_geocol_setop = true;
-          break;
-      }
-      break;
-    case Geometry::wkb_polygon:
-
-      switch (gt2) {
-        case Geometry::wkb_linestring:
-          retgeo = wrap.linestring_union_polygon(g2, g1, result);
-          break;
-        case Geometry::wkb_polygon:
-          retgeo = wrap.polygon_symdifference_polygon(g1, g2, result);
-          break;
-        case Geometry::wkb_multilinestring:
-          retgeo = wrap.polygon_union_multilinestring(g1, g2, result);
-          break;
-        case Geometry::wkb_multipolygon:
-          retgeo = wrap.polygon_symdifference_multipolygon(g1, g2, result);
-          break;
-        default:
-          do_geocol_setop = true;
-          break;
-      }
-      break;
-    case Geometry::wkb_multilinestring:
-      switch (gt2) {
-        case Geometry::wkb_linestring:
-          retgeo =
-              wrap.linestring_symdifference_multilinestring(g2, g1, result);
-          break;
-        case Geometry::wkb_polygon:
-          retgeo = wrap.polygon_union_multilinestring(g2, g1, result);
-          break;
-        case Geometry::wkb_multilinestring:
-          retgeo = wrap.multilinestring_symdifference_multilinestring(g1, g2,
-                                                                      result);
-          break;
-        case Geometry::wkb_multipolygon:
-          retgeo = wrap.multilinestring_union_multipolygon(g1, g2, result);
-          break;
-        default:
-          do_geocol_setop = true;
-          break;
-      }
-      break;
-    case Geometry::wkb_multipolygon:
-      switch (gt2) {
-        case Geometry::wkb_linestring:
-          retgeo = wrap.linestring_union_multipolygon(g2, g1, result);
-          break;
-        case Geometry::wkb_polygon:
-          retgeo = wrap.multipolygon_symdifference_polygon(g1, g2, result);
-          break;
-        case Geometry::wkb_multilinestring:
-          retgeo = wrap.multilinestring_union_multipolygon(g2, g1, result);
-          break;
-        case Geometry::wkb_multipolygon:
-          retgeo = wrap.multipolygon_symdifference_multipolygon(g1, g2, result);
-          break;
-        default:
-          do_geocol_setop = true;
-          break;
-      }
-      break;
-    default:
-      do_geocol_setop = true;
-      break;
-  }
-
-  if (do_geocol_setop)
-    retgeo = geometry_collection_set_operation<Coordsys>(g1, g2, result);
-  else if (!null_value)
-    null_value = wrap.get_null_value();
-  return retgeo;
-}
-
-/**
-  Call boost geometry set operations to compute set operation result, and
-  returns the result as a Geometry object.
-
-  @tparam Coordsys Coordinate system type, specified using those defined in
-          boost::geometry::cs.
-  @param g1 First Geometry operand, not a geometry collection.
-  @param g2 Second Geometry operand, not a geometry collection.
-  @param[out] result buffer containing the GEOMETRY byte string of
-  the returned geometry.
-
-  @return If the set operation results in an empty point set, return a
-  geometry collection containing 0 objects. If null_value is set to
-  true, always returns 0. The returned geometry object can be used in the same
-  val_str call.
- */
-template <typename Coordsys>
-Geometry *Item_func_spatial_operation::bg_geo_set_op(Geometry *g1, Geometry *g2,
-                                                     String *result) {
-  typedef BG_models<Coordsys> Geom_types;
-
-  Geometry *retgeo = nullptr;
-
-  if (g1->get_coordsys() != g2->get_coordsys()) return nullptr;
-
-  switch (m_spatial_op) {
-    case op_intersection:
-      retgeo = intersection_operation<Geom_types>(g1, g2, result);
-      break;
-    case op_union:
-      retgeo = union_operation<Geom_types>(g1, g2, result);
-      break;
-    case op_difference:
-      retgeo = difference_operation<Geom_types>(g1, g2, result);
-      break;
-    case op_symdifference:
-      retgeo = symdifference_operation<Geom_types>(g1, g2, result);
-      break;
-    default:
-      // Other operations are not set operations.
-      assert(false);
-      break;
-  }
-
-  /*
-    null_value is set in above xxx_operatoin calls if error occurred.
-  */
-  if (null_value) {
-    error_str();
-    assert(retgeo == nullptr);
-  }
-
-  // If we got effective result, the wkb encoding is written to 'result', and
-  // the retgeo is effective geometry object whose data points into
-  // 'result''s data.
-  return retgeo;
-}
-
-/**
-  Combine sub-results of set operation into a geometry collection.
-  This function eliminates points in geo2 that are within
-  geo1(polygons or linestrings). We have to do so
-  because BG set operations return results in 3 forms --- multipolygon,
-  multilinestring and multipoint, however given a type of set operation and
-  the operands, the returned 3 types of results may intersect, and we want to
-  eliminate the points already in the polygons/linestrings. And in future we
-  also need to remove the linestrings that are already in the polygons, this
-  isn't done now because there are no such set operation results to combine.
-
-  @tparam Coordsys Coordinate system type, specified using those defined in
-          boost::geometry::cs.
-  @param geo1 First operand, a Multipolygon or Multilinestring object
-              computed by BG set operation.
-  @param geo2 Second operand, a Multipoint object
-              computed by BG set operation.
-  @param[in] default_srid The SRID to use when returning an empty result.
-  @param result Holds result geometry's WKB data in GEOMETRY format.
-  @return A geometry combined from geo1 and geo2. Either or both of
-  geo1 and geo2 can be NULL, so we may end up with a multipoint,
-  a multipolygon/multilinestring, a geometry collection, or an
-  empty geometry collection.
- */
-template <typename Coordsys>
-Geometry *Item_func_spatial_operation::combine_sub_results(
-    Geometry *geo1, Geometry *geo2, gis::srid_t default_srid, String *result) {
-  typedef BG_models<Coordsys> Geom_types;
-  typedef typename Geom_types::Multipoint Multipoint;
-  Geometry *retgeo = nullptr;
-  bool isin = false, added = false;
-
-  if (null_value) {
-    delete geo1;
-    delete geo2;
-    return nullptr;
-  }
-
-  std::unique_ptr<Geometry> guard1(geo1), guard2(geo2);
-
-  Gis_geometry_collection *geocol = nullptr;
-  if (geo1 == nullptr && geo2 == nullptr)
-    retgeo = empty_result(result, default_srid);
-  else if (geo1 != nullptr && geo2 == nullptr) {
-    retgeo = geo1;
-    null_value = assign_result(geo1, result);
-    guard1.release();
-  } else if (geo1 == nullptr && geo2 != nullptr) {
-    retgeo = geo2;
-    null_value = assign_result(geo2, result);
-    guard2.release();
-  }
-
-  if (geo1 == nullptr || geo2 == nullptr) {
-    if (null_value) retgeo = nullptr;
-    return retgeo;
-  }
-
-  assert((geo1->get_type() == Geometry::wkb_multilinestring ||
-          geo1->get_type() == Geometry::wkb_multipolygon) &&
-         geo2->get_type() == Geometry::wkb_multipoint);
-  Multipoint mpts(geo2->get_data_ptr(), geo2->get_data_size(),
-                  geo2->get_flags(), geo2->get_srid());
-  geocol = new Gis_geometry_collection(geo1, result);
-  geocol->set_components_no_overlapped(geo1->is_components_no_overlapped());
-  std::unique_ptr<Gis_geometry_collection> guard3(geocol);
-  bool had_error = false;
-
-  for (typename Multipoint::iterator i = mpts.begin(); i != mpts.end(); ++i) {
-    isin = !Item_func_spatial_rel::bg_geo_relation_check(
-        &(*i), geo1, SP_DISJOINT_FUNC, &had_error);
-
-    if (had_error) {
-      error_str();
-      return nullptr;
-    }
-
-    if (!isin) {
-      geocol->append_geometry(&(*i), result);
-      added = true;
-    }
-  }
-
-  if (added) {
-    retgeo = geocol;
-    guard3.release();
-  } else {
-    retgeo = geo1;
-    guard1.release();
-    null_value = assign_result(geo1, result);
-  }
-
-  if (null_value) error_str();
-
-  return retgeo;
-}
-
-/**
-  Simplify a multilinestring result from the BG intersection function.
-
-  The multilinestring may contain linestrings with two points where
-  both points are the same. Those are intersection points that should
-  be returned to the user as points. This function loops through the
-  multilinestring, separating true linestrings and linestring-encoded
-  points, and returns the simplest geometric result possible: point,
-  linestring, multilinestring, multipoint, or geometry collection.
-
-  @param mls The multilinestring to simplify
-  @param[out] result The GEOMETRY string (SRID+WKB) of the returned object
-  @return The simplest geometry type representing the input.
-*/
-Geometry *Item_func_spatial_operation::simplify_multilinestring(
-    Gis_multi_line_string *mls, String *result) {
-  // Null values are handled by caller.
-  assert(mls != nullptr);
-  Geometry *retgeo;
-
-  // Loop through the multilinestring and separate true linestrings
-  // from points.
-  std::unique_ptr<Gis_multi_line_string> linestrings(
-      new Gis_multi_line_string());
-  std::unique_ptr<Gis_multi_point> points(new Gis_multi_point());
-  linestrings->set_srid(mls->get_srid());
-  points->set_srid(mls->get_srid());
-  // BG may return duplicate points, so use a point set to get unique
-  // points before storing them into 'points'.
-  typedef std::set<Gis_point, bgpt_lt> Point_set;
-  Point_set point_set(points->begin(), points->end());
-  Gis_point prev_point;
-  bool has_prev_point = false;
-
-  for (Gis_multi_line_string::iterator i = mls->begin(); i != mls->end(); ++i) {
-    i->set_srid(mls->get_srid());
-    if (i->size() != 2) {
-      assert(i->size() > 2);
-      linestrings->push_back(*i);
-      continue;
-    }
-
-    (*i)[0].set_srid(mls->get_srid());
-    (*i)[1].set_srid(mls->get_srid());
-    const Gis_point &start = (*i)[0];
-    const Gis_point &end = (*i)[1];
-    if (start == end) {
-      if (!has_prev_point || prev_point != start) {
-        has_prev_point = true;
-        prev_point = start;
-        point_set.insert(start);
-      }
-    } else
-      linestrings->push_back(*i);
-  }
-
-  for (Point_set::iterator i = point_set.begin(); i != point_set.end(); ++i) {
-    /*
-      When computing [m]ls intersection [m]ls, BG may return points that are
-      on the linestrings, so here we have to exclude such points.
-    */
-    if (bg::disjoint(*i, *linestrings)) points->push_back(*i);
-  }
-
-  String dummy;
-  post_fix_result(&m_bg_resbuf_mgr, *linestrings, &dummy);
-  post_fix_result(&m_bg_resbuf_mgr, *points, &dummy);
-
-  // Return the simplest type possible
-  if (points->size() == 0 && linestrings->size() == 1) {
-    // Linestring result
-    Gis_line_string *linestringresult = new Gis_line_string();
-    linestringresult->set_srid(mls->get_srid());
-    size_t oldlength = result->length();
-    linestrings->begin()->as_geometry(result, false);
-    size_t newlength = result->length();
-    linestringresult->set_ptr(result->ptr() + oldlength + GEOM_HEADER_SIZE,
-                              (newlength - oldlength) - GEOM_HEADER_SIZE);
-    linestringresult->set_ownmem(false);
-    retgeo = linestringresult;
-  } else if (points->size() == 0 && linestrings->size() > 1) {
-    // Multilinestring result
-    linestrings->as_geometry(result, false);
-    linestrings->set_ownmem(false);
-    retgeo = linestrings.release();
-  } else if (points->size() == 1 && linestrings->size() == 0) {
-    // Point result
-    Gis_point *pointresult = new Gis_point();
-    pointresult->set_srid(mls->get_srid());
-    size_t oldlength = result->length();
-    points->begin()->as_geometry(result, false);
-    size_t newlength = result->length();
-    pointresult->set_ptr(result->ptr() + oldlength + GEOM_HEADER_SIZE,
-                         (newlength - oldlength) - GEOM_HEADER_SIZE);
-    pointresult->set_ownmem(false);
-    retgeo = pointresult;
-  } else if (points->size() > 1 && linestrings->size() == 0) {
-    // Multipoint result
-    points->as_geometry(result, false);
-    points->set_ownmem(false);
-    retgeo = points.release();
-  } else {
-    // GeometryCollection result
-    Gis_geometry_collection *collection = new Gis_geometry_collection();
-    collection->set_srid(mls->get_srid());
-
-    if (points->size() > 1) {
-      collection->append_geometry(&(*points), result);
-    } else {
-      collection->append_geometry(&(*points)[0], result);
-    }
-
-    if (linestrings->size() > 1) {
-      collection->append_geometry(&(*linestrings), result);
-    } else {
-      collection->append_geometry(&(*linestrings)[0], result);
-    }
-
-    collection->set_ownmem(false);
-    retgeo = collection;
-  }
-
-  return retgeo;
-}
-
-/**
-  Extract a basic geometry component from a multi geometry or a geometry
-  collection, if it's the only one in it.
- */
-class Singleton_extractor : public WKB_scanner_event_handler {
-  /*
-    If we see the nested geometries as a forest, seeing the outmost one as the
-    ground where the trees grow, and seeing each of its components
-    as a tree, then the search for a singleton in a geometry collection(GC) or
-    multi-geometry(i.e. multipoint, multilinestring, multipolygon) is identical
-    to searching on the ground to see if there is only one tree on the ground,
-    if so we also need to record its starting address within the root node's
-    memory buffer.
-
-    Some details complicate the problem:
-    1. GCs can be nested into another GC, a nested GC should be see also as
-       the 'ground' rather than a tree.
-    2. A single multi-geometry contained in a GC may be a singleton or not.
-       a. When it has only one component in itself, that component is
-          the singleton;
-       b. Otherwise itself is the singleton.
-    3. Basic geometries are always atomic(undevidible).
-    4. A multi-geometry can't be nested into another multigeometry, it can
-       only be a component of a GC.
-
-    Below comment for the data members are based on this context information.
-  */
-  // The number of trees on the ground.
-  int ntrees;
-  // The number of trees inside all multi-geometries.
-  int nsubtrees;
-  // Current tree travasal stack depth, i.e. tree height.
-  int depth;
-  // The depth of the multi-geometry, if any.
-  int mg_depth;
-  // The effective stack depth, i.e. excludes the nested GCs.
-  int levels;
-  // The stack depth of heighest GC in current ground.
-  int gc_depth;
-  // Starting and ending address of tree on ground.
-  const char *start, *end;
-  // Starting address of and type of the basic geometry which is on top of the
-  // multi-geometry.
-  const char *bg_start;
-  Geometry::wkbType bg_type;
-
-  // The type of the geometry on the ground.
-  Geometry::wkbType gtype;
-
- public:
-  Singleton_extractor() {
-    ntrees = nsubtrees = depth = mg_depth = levels = gc_depth = 0;
-    bg_start = start = end = nullptr;
-    bg_type = gtype = Geometry::wkb_invalid_type;
-  }
-
-  static bool is_basic_type(const Geometry::wkbType t) {
-    return t == Geometry::wkb_point || t == Geometry::wkb_linestring ||
-           t == Geometry::wkb_polygon;
-  }
-
-  bool has_single_component() const { return ntrees == 1; }
-
-  // Functions to get singleton information.
-
-  /*
-    Returns start of singleton. If only one sub-tree, the basic geometry
-    is returned instead of the multi-geometry, otherwise the multi-geometry
-    is returned.
-   */
-  const char *get_start() const { return nsubtrees == 1 ? bg_start : start; }
-
-  /*
-    Returns the end of the singleton geometry. For a singleton,
-    its end is always also the end of the root geometry, so this function
-    is correct only when the root geometry really contains a singleton.
-   */
-  const char *get_end() const { return end; }
-
-  Geometry::wkbType get_type() const {
-    return nsubtrees == 1 ? bg_type : gtype;
-  }
-
-  void on_wkb_start(Geometry::wkbByteOrder, Geometry::wkbType geotype,
-                    const void *wkb, uint32 len, bool) override {
-    if (geotype != Geometry::wkb_geometrycollection) {
-      if (gc_depth == 0) {
-        gc_depth = depth;
-        start = static_cast<const char *>(wkb);
-        end = start + len;
-        gtype = geotype;
-      }
-
-      if (!is_basic_type(geotype)) mg_depth = depth;
-
-      if (mg_depth + 1 == depth) {
-        bg_type = geotype;
-        bg_start = static_cast<const char *>(wkb);
-      }
-
-      levels++;
-    } else
-      gc_depth = 0;
-
-    depth++;
-  }
-
-  void on_wkb_end(const void *wkb) override {
-    depth--;
-    assert(depth >= 0);
-
-    if (levels > 0) {
-      levels--;
-      if (levels == 0) {
-        assert(depth == gc_depth);
-        ntrees++;
-        end = static_cast<const char *>(wkb);
-        mg_depth = 0;
-        gc_depth = 0;
-      }
-    }
-
-    // The subtree is either a multi-geometry or a basic geometry.
-    if (mg_depth != 0 && levels == 1) nsubtrees++;
-  }
-};
-
-inline Geometry::wkbType base_type(Geometry::wkbType gt) {
-  Geometry::wkbType ret;
-
-  switch (gt) {
-    case Geometry::wkb_multipoint:
-      ret = Geometry::wkb_point;
-      break;
-    case Geometry::wkb_multilinestring:
-      ret = Geometry::wkb_linestring;
-      break;
-    case Geometry::wkb_multipolygon:
-      ret = Geometry::wkb_polygon;
-      break;
-    default:
-      ret = gt;
-  }
-  return ret;
-}
-
-/**
-  Simplify multi-geometry data. If str contains a multi-geometry or geometry
-  collection with one component, the component is made as content of str.
-  If str contains a nested geometry collection, the effective concrete geometry
-  object is returned.
-  @param str A string buffer containing a GEOMETRY byte string.
-  @param [out] result_buffer if not NULL and if a simplification is to be done,
-               we will copy the GEOMETRY byte string from str into result_buffer
-               and simplify the one stored in result_buffer, and the one in str
-               is intact. If there is any data in result_buffer before calling
-               this function, it is overwritten; If no simplification done, the
-               result_buffer is intact if it is provided.
-  @return whether the geometry is simplified or not.
- */
-bool simplify_multi_geometry(String *str, String *result_buffer) {
-  if (str->length() < GEOM_HEADER_SIZE) return false;
-
-  char *p = str->ptr();
-  Geometry::wkbType gtype = get_wkb_geotype(p + 5);
-  bool ret = false;
-
-  if (gtype == Geometry::wkb_multipoint ||
-      gtype == Geometry::wkb_multilinestring ||
-      gtype == Geometry::wkb_multipolygon) {
-    if (uint4korr(p + GEOM_HEADER_SIZE) == 1) {
-      if (result_buffer) {
-        result_buffer->length(0);
-        result_buffer->append(*str);
-        p = result_buffer->ptr();
-        str = result_buffer;
-      }
-      assert((str->length() - GEOM_HEADER_SIZE - 4 - WKB_HEADER_SIZE) > 0);
-      int4store(p + 5, static_cast<uint32>(base_type(gtype)));
-      memmove(p + GEOM_HEADER_SIZE, p + GEOM_HEADER_SIZE + 4 + WKB_HEADER_SIZE,
-              str->length() - GEOM_HEADER_SIZE - 4 - WKB_HEADER_SIZE);
-      str->length(str->length() - 4 - WKB_HEADER_SIZE);
-      ret = true;
-    }
-  } else if (gtype == Geometry::wkb_geometrycollection) {
-    Singleton_extractor ex;
-    uint32 wkb_len = str->length() - GEOM_HEADER_SIZE;
-    wkb_scanner(current_thd, p + GEOM_HEADER_SIZE, &wkb_len,
-                Geometry::wkb_geometrycollection, false, &ex);
-    if (ex.has_single_component()) {
-      if (result_buffer) {
-        result_buffer->length(0);
-        result_buffer->append(*str);
-        p = result_buffer->ptr();
-        str = result_buffer;
-      }
-      p = write_wkb_header(p + 4, ex.get_type());
-      ptrdiff_t len = ex.get_end() - ex.get_start();
-      assert(len > 0);
-      memmove(p, ex.get_start(), len);
-      str->length(GEOM_HEADER_SIZE + len);
-      ret = true;
-    }
-  }
-
-  return ret;
-}
-
-/*
-  Do set operations on geometries.
-  Writes geometry set operation result into str_value_arg in wkb format.
- */
-String *Item_func_spatial_operation::val_str(String *str_value_arg) {
-  DBUG_TRACE;
-  assert(fixed == 1);
-
-  m_tmp_value1.length(0);
-  m_tmp_value2.length(0);
-  String *res1 = args[0]->val_str(&m_tmp_value1);
-  String *res2 = args[1]->val_str(&m_tmp_value2);
-  Geometry_buffer buffer1, buffer2;
-  Geometry *g1 = nullptr, *g2 = nullptr, *gres = nullptr;
-  bool had_except1 = false, had_except2 = false;
-  bool result_is_args = false;
-
-  // Release last call's result buffer.
-  m_bg_resbuf_mgr.free_result_buffer();
-
-  if ((null_value =
-           (!res1 || args[0]->null_value || !res2 || args[1]->null_value)))
-    return nullptr;
-
-  if (!(g1 = Geometry::construct(&buffer1, res1)) ||
-      !(g2 = Geometry::construct(&buffer2, res2))) {
-    my_error(ER_GIS_INVALID_DATA, MYF(0), func_name());
-    return error_str();
-  }
-
-  // The two geometry operand must be in the same coordinate system.
-  if (g1->get_srid() != g2->get_srid()) {
-    my_error(ER_GIS_DIFFERENT_SRIDS, MYF(0), func_name(), g1->get_srid(),
-             g2->get_srid());
-    return error_str();
-  }
-
-  if (g1->get_srid() != 0) {
-    THD *thd = current_thd;
-    std::unique_ptr<dd::cache::Dictionary_client::Auto_releaser> releaser(
-        new dd::cache::Dictionary_client::Auto_releaser(thd->dd_client()));
-    Srs_fetcher fetcher(thd);
-    const dd::Spatial_reference_system *srs = nullptr;
-    if (fetcher.acquire(g1->get_srid(), &srs))
-      return error_str();  // Error has already been flagged.
-
-    if (srs == nullptr) {
-      my_error(ER_SRS_NOT_FOUND, MYF(0), g1->get_srid());
-      return error_str();
-    }
-
-    if (!srs->is_cartesian()) {
-      assert(srs->is_geographic());
-      std::string parameters(g1->get_class_info()->m_name.str);
-      parameters.append(", ").append(g2->get_class_info()->m_name.str);
-      my_error(ER_NOT_IMPLEMENTED_FOR_GEOGRAPHIC_SRS, MYF(0), func_name(),
-               parameters.c_str());
-      return error_str();
-    }
-  }
-
-  // Use a local String here, since a BG_result_buf_mgr owns the buffer.
-  String str_value;
-
-  /*
-    Catch all exceptions to make sure no exception can be thrown out of
-    current function. Put all and any code that calls Boost.Geometry functions,
-    STL functions into this try block. Code out of the try block should never
-    throw any exception.
-  */
-  try {
-    if (g1->get_type() != Geometry::wkb_geometrycollection &&
-        g2->get_type() != Geometry::wkb_geometrycollection)
-      gres = bg_geo_set_op<bgcs::cartesian>(g1, g2, &str_value);
-    else
-      gres = geometry_collection_set_operation<bgcs::cartesian>(g1, g2,
-                                                                &str_value);
-
-  } catch (...) {
-    had_except1 = true;
-    handle_gis_exception(func_name());
-  }
-
-  try {
-    /*
-      The buffers in res1 and res2 either belong to argument Item_xxx objects
-      or simply belong to m_tmp_value1 or m_tmp_value2, they will be deleted
-      properly by their owners, not by our m_bg_resbuf_mgr, so here we must
-      forget them in order not to free the buffers before the Item_xxx
-      owner nodes are destroyed.
-    */
-    m_bg_resbuf_mgr.forget_buffer(res1->ptr());
-    m_bg_resbuf_mgr.forget_buffer(res2->ptr());
-    m_bg_resbuf_mgr.forget_buffer(m_tmp_value1.ptr());
-    m_bg_resbuf_mgr.forget_buffer(m_tmp_value2.ptr());
-
-    /*
-      Release intermediate geometry data buffers accumulated during execution
-      of this set operation.
-    */
-    if (!str_value.is_alloced() && gres != g1 && gres != g2)
-      m_bg_resbuf_mgr.set_result_buffer(str_value.ptr());
-    m_bg_resbuf_mgr.free_intermediate_result_buffers();
-  } catch (...) {
-    had_except2 = true;
-    handle_gis_exception(func_name());
-  }
-
-  if (had_except1 || had_except2 || null_value) {
-    if (gres != nullptr && gres != g1 && gres != g2) {
-      delete gres;
-      gres = nullptr;
-    }
-    return error_str();
-  }
-
-  assert(gres != nullptr && !null_value && str_value.length() > 0);
-
-  /*
-    There are 4 ways to create the result geometry object and allocate
-    memory for the result String object:
-    1. Created in BGOPCALL and allocated by BG code using gis_wkb_alloc
-       functions; The geometry result object's memory is took over by
-       str_value, thus not allocated by str_value.
-    2. Created as a new geometry object and allocated by
-       str_value's String member functions.
-    3. One of g1 or g2 used as result and g1/g2's String object is used as
-       final result without duplicating their byte strings. Also, g1 and/or
-       g2 may be used as intermediate result and their byte strings are
-       assigned to intermediate String objects without giving the ownerships
-       to them, so they are always owned by m_tmp_value1 and/or m_tmp_value2.
-    4. A geometry duplicated from a component of BG_geometry_collection.
-       when both GCs have 1 member, we do set operation for the two members
-       directly, and if such a component is the result we have to duplicate
-       it and its WKB String buffer.
-
-    Among above 4 ways, #1, #2 and #4 write the byte string only once without
-    any data copying, #3 doesn't write any byte strings.
-
-    And here we always have a GEOMETRY byte string in str_value, although
-    in some cases gres->has_geom_header_space() is false.
-   */
-  if (!str_value.is_alloced() && gres != g1 && gres != g2) {
-    assert(gres->has_geom_header_space() || gres->is_bg_adapter());
-  } else {
-    assert(gres->has_geom_header_space() || (gres == g1 || gres == g2));
-    if (gres == g1) {
-      str_value.copy(*res1);
-      result_is_args = true;
-    } else if (gres == g2) {
-      str_value.copy(*res2);
-      result_is_args = true;
-    }
-  }
-
-  /*
-    We can not modify the geometry argument because it is assumed to be stable.
-    So if returning one of the arguments as result directly, make sure the
-    simplification is done in a separate buffer.
-  */
-  if (simplify_multi_geometry(&str_value,
-                              (result_is_args ? &m_result_buffer : nullptr)) &&
-      result_is_args)
-    str_value.copy(m_result_buffer);
-
-  if (gres != g1 && gres != g2 && gres != nullptr) delete gres;
-  // Result and argument SRIDs must be the same.
-  assert(null_value || uint4korr(str_value.ptr()) == uint4korr(res1->ptr()));
-
-  if (null_value) return nullptr;
-
-  str_value_arg->copy(str_value);
-  return str_value_arg;
-}
-
-inline bool is_areal(const Geometry *g) {
-  return g != nullptr && (g->get_type() == Geometry::wkb_polygon ||
-                          g->get_type() == Geometry::wkb_multipolygon);
-}
-
-/**
-  Do set operation on geometry collections.
-  BG doesn't directly support geometry collections in any function, so we
-  have to do so by computing the set operation result of all two operands'
-  components, which must be the 6 basic types of geometries, and then we
-  combine the sub-results.
-
-  This function dispatches to specific set operation types.
-
-  @tparam Coordsys Coordinate system type, specified using those defined in
-          boost::geometry::cs.
-  @param g1 First geometry operand, a geometry collection.
-  @param g2 Second geometry operand, a geometry collection.
-  @param[out] result Holds WKB data of the result, which must be a
-                geometry collection.
-  @return The set operation result, whose WKB data is stored in 'result'.
- */
-template <typename Coordsys>
-Geometry *Item_func_spatial_operation::geometry_collection_set_operation(
-    Geometry *g1, Geometry *g2, String *result) {
-  Geometry *gres = nullptr;
-  BG_geometry_collection bggc1, bggc2;
-
-  bggc1.set_srid(g1->get_srid());
-  bggc2.set_srid(g2->get_srid());
-  bool empty1 = is_empty_geocollection(g1);
-  bool empty2 = is_empty_geocollection(g2);
-
-  /* Short cut for either one operand being empty. */
-  if (empty1 || empty2) {
-    if (m_spatial_op == op_intersection ||
-        (empty1 && empty2 &&
-         (m_spatial_op == op_symdifference || m_spatial_op == op_union)) ||
-        (empty1 && m_spatial_op == op_difference)) {
-      return empty_result(result, g1->get_srid());
-    }
-
-    // If m_spatial_op is op_union or op_symdifference and one of g1/g2 is
-    // empty, we will continue in order to merge components in the argument.
-
-    if (empty2 && m_spatial_op == op_difference) {
-      null_value = g1->as_geometry(result, true /* shallow copy */);
-      return g1;
-    }
-  }
-
-  bggc1.fill(g1);
-  bggc2.fill(g2);
-  if (m_spatial_op != op_union) {
-    bggc1.merge_components<Coordsys>(&null_value);
-    if (null_value) return gres;
-    bggc2.merge_components<Coordsys>(&null_value);
-    if (null_value) return gres;
-  }
-
-  BG_geometry_collection::Geometry_list &gv1 = bggc1.get_geometries();
-  BG_geometry_collection::Geometry_list &gv2 = bggc2.get_geometries();
-
-  /*
-    If there is only one component in one argument and the other is empty,
-    no merge is possible.
-  */
-  if (m_spatial_op == op_union || m_spatial_op == op_symdifference) {
-    if (gv1.size() == 0 && gv2.size() == 1) {
-      null_value = g2->as_geometry(result, true /* shallow copy */);
-      return g2;
-    }
-
-    if (gv1.size() == 1 && gv2.size() == 0) {
-      null_value = g1->as_geometry(result, true /* shallow copy */);
-      return g1;
-    }
-  }
-
-  /*
-    If both collections have only one basic component, do basic set operation.
-    The exception is symdifference with at least one operand being not a
-    polygon or multipolygon, in which case this exact function is called to
-    perform symdifference for the two basic components.
-   */
-  if (gv1.size() == 1 && gv2.size() == 1 &&
-      (m_spatial_op != op_symdifference ||
-       (is_areal(*(gv1.begin())) && is_areal(*(gv2.begin()))))) {
-    gres = bg_geo_set_op<Coordsys>(*(gv1.begin()), *(gv2.begin()), result);
-    if (null_value) return nullptr;
-    if (gres == nullptr && !null_value) {
-      gres = empty_result(result, g1->get_srid());
-      return gres;
-    }
-
-    /*
-      If this set operation gives us a gres that's a component/member of either
-      bggc1 or bggc2, we have to duplicate the object and its buffer because
-      they will be destroyed when bggc1/bggc2 goes out of scope.
-     */
-    bool do_dup = false;
-    for (BG_geometry_collection::Geometry_list::iterator i = gv1.begin();
-         i != gv1.end(); ++i)
-      if (*i == gres) do_dup = true;
-    if (!do_dup)
-      for (BG_geometry_collection::Geometry_list::iterator i = gv2.begin();
-           i != gv2.end(); ++i)
-        if (*i == gres) do_dup = true;
-
-    if (do_dup) {
-      String tmpres;
-      Geometry *gres2 = nullptr;
-      tmpres.append(result->ptr(), result->length());
-      const void *data_start = tmpres.ptr() + GEOM_HEADER_SIZE;
-
-      switch (gres->get_geotype()) {
-        case Geometry::wkb_point:
-          gres2 = new Gis_point;
-          break;
-        case Geometry::wkb_linestring:
-          gres2 = new Gis_line_string;
-          break;
-        case Geometry::wkb_polygon:
-          gres2 = new Gis_polygon;
-          break;
-        case Geometry::wkb_multipoint:
-          gres2 = new Gis_multi_point;
-          break;
-        case Geometry::wkb_multilinestring:
-          gres2 = new Gis_multi_line_string;
-          break;
-        case Geometry::wkb_multipolygon:
-          gres2 = new Gis_multi_polygon;
-          break;
-        default:
-          assert(false);
-      }
-
-      gres2->set_data_ptr(data_start, tmpres.length() - GEOM_HEADER_SIZE);
-      gres2->has_geom_header_space(true);
-      gres2->set_bg_adapter(false);
-      result->takeover(tmpres);
-      gres = gres2;
-    }
-
-    return gres;
-  }
-
-  switch (m_spatial_op) {
-    case op_intersection:
-      gres = geocol_intersection<Coordsys>(bggc1, bggc2, result);
-      break;
-    case op_union:
-      gres = geocol_union<Coordsys>(bggc1, bggc2, result);
-      break;
-    case op_difference:
-      gres = geocol_difference<Coordsys>(bggc1, bggc2, result);
-      break;
-    case op_symdifference:
-      gres = geocol_symdifference<Coordsys>(bggc1, bggc2, result);
-      break;
-    default:
-      /* Only above four supported. */
-      assert(false);
-      break;
-  }
-
-  if (gres == nullptr && !null_value)
-    gres = empty_result(result, g1->get_srid());
-  return gres;
-}
-
-/**
-  Do intersection operation on geometry collections. We do intersection for
-  all pairs of components in g1 and g2, put the results in a geometry
-  collection. If all subresults can be computed successfully, the geometry
-  collection is our result.
-
-  @tparam Coordsys Coordinate system type, specified using those defined in
-          boost::geometry::cs.
-  @param bggc1 First geometry operand, a geometry collection.
-  @param bggc2 Second geometry operand, a geometry collection.
-  @param[out] result Holds WKB data of the result, which must be a
-                geometry collection.
-  @return The intersection result, whose WKB data is stored in 'result'.
- */
-template <typename Coordsys>
-Geometry *Item_func_spatial_operation::geocol_intersection(
-    const BG_geometry_collection &bggc1, const BG_geometry_collection &bggc2,
-    String *result) {
-  Geometry *gres = nullptr;
-  String wkbres;
-  Geometry *g0 = nullptr;
-  BG_geometry_collection bggc;
-  const BG_geometry_collection::Geometry_list &gv1 = bggc1.get_geometries();
-  const BG_geometry_collection::Geometry_list &gv2 = bggc2.get_geometries();
-  bggc.set_srid(bggc1.get_srid());
-
-  if (gv1.size() == 0 || gv2.size() == 0) {
-    return empty_result(result, bggc1.get_srid());
-  }
-
-  const typename BG_geometry_collection::Geometry_list *gv = nullptr,
-                                                       *gvr = nullptr;
-
-  if (gv1.size() > gv2.size()) {
-    gv = &gv2;
-    gvr = &gv1;
-  } else {
-    gv = &gv1;
-    gvr = &gv2;
-  }
-
-  Rtree_index rtree;
-  make_rtree(*gvr, &rtree);
-
-  for (BG_geometry_collection::Geometry_list::const_iterator i = gv->begin();
-       i != gv->end(); ++i) {
-    BG_box box;
-    make_bg_box(*i, &box);
-
-    Rtree_index::const_query_iterator j = rtree.qbegin(bgi::intersects(box));
-    if (j == rtree.qend()) continue;
-
-    for (; j != rtree.qend(); ++j) {
-      Geometry *geom = (*gvr)[j->second];
-      // Free before using it, wkbres may have WKB data from last execution.
-      wkbres.mem_free();
-      wkbres.length(0);
-      g0 = bg_geo_set_op<Coordsys>(*i, geom, &wkbres);
-
-      if (null_value) {
-        if (g0 != nullptr && g0 != *i && g0 != geom) delete g0;
-        return nullptr;
-      }
-
-      if (g0 && !is_empty_geocollection(wkbres)) bggc.fill(g0);
-      if (g0 != nullptr && g0 != *i && g0 != geom) {
-        delete g0;
-        g0 = nullptr;
-      }
-    }
-  }
-
-  /*
-    Note: result unify and merge
-
-    The result may have geometry elements that overlap, caused by overlap
-    geos in either or both gc1 and/or gc2. Also, there may be geometries
-    that can be merged into a larger one of the same type in the result.
-    We will need to figure out how to make such enhancements.
-   */
-  bggc.merge_components<Coordsys>(&null_value);
-  if (null_value) return nullptr;
-  gres = bggc.as_geometry_collection(result);
-
-  return gres;
-}
-
-/**
-  Do union operation on geometry collections. We do union for
-  all pairs of components in g1 and g2, whenever a union can be done, we do
-  so and put the results in a geometry collection GC and remove the two
-  components from g1 and g2 respectively. Finally no components in g1 and g2
-  overlap and GC is our result.
-
-  @tparam Coordsys Coordinate system type, specified using those defined in
-          boost::geometry::cs.
-  @param bggc1 First geometry operand, a geometry collection.
-  @param bggc2 Second geometry operand, a geometry collection.
-  @param[out] result Holds WKB data of the result, which must be a
-                geometry collection.
-  @return The union result, whose WKB data is stored in 'result'.
- */
-template <typename Coordsys>
-Geometry *Item_func_spatial_operation::geocol_union(
-    const BG_geometry_collection &bggc1, const BG_geometry_collection &bggc2,
-    String *result) {
-  Geometry *gres = nullptr;
-  BG_geometry_collection bggc;
-  BG_geometry_collection::Geometry_list &gv = bggc.get_geometries();
-  gv.insert(gv.end(), bggc1.get_geometries().begin(),
-            bggc1.get_geometries().end());
-  gv.insert(gv.end(), bggc2.get_geometries().begin(),
-            bggc2.get_geometries().end());
-  bggc.set_srid(bggc1.get_srid());
-
-  // It's likely that there are overlapping components in bggc because it
-  // has components from both bggc1 and bggc2.
-  bggc.merge_components<Coordsys>(&null_value);
-  if (!null_value) gres = bggc.as_geometry_collection(result);
-
-  return gres;
-}
-
-/**
-  Do difference operation on geometry collections. For each component CX in g1,
-  we do CX:= CX difference CY for all components CY in g2. When at last CX isn't
-  empty, it's put into result geometry collection GC.
-  If all subresults can be computed successfully, the geometry
-  collection GC is our result.
-
-  @tparam Coordsys Coordinate system type, specified using those defined in
-          boost::geometry::cs.
-  @param bggc1 First geometry operand, a geometry collection.
-  @param bggc2 Second geometry operand, a geometry collection.
-  @param[out] result Holds WKB data of the result, which must be a
-                geometry collection.
-  @return The difference result, whose WKB data is stored in 'result'.
- */
-template <typename Coordsys>
-Geometry *Item_func_spatial_operation::geocol_difference(
-    const BG_geometry_collection &bggc1, const BG_geometry_collection &bggc2,
-    String *result) {
-  Geometry *gres = nullptr;
-  String *wkbres = nullptr;
-  BG_geometry_collection bggc;
-  const BG_geometry_collection::Geometry_list *gv1 = &(bggc1.get_geometries());
-  const BG_geometry_collection::Geometry_list *gv2 = &(bggc2.get_geometries());
-
-  bggc.set_srid(bggc1.get_srid());
-
-  // Difference isn't symetric so we have to always build rtree tndex on gv2.
-  Rtree_index rtree;
-  make_rtree(*gv2, &rtree);
-
-  for (BG_geometry_collection::Geometry_list::const_iterator i = gv1->begin();
-       i != gv1->end(); ++i) {
-    bool g11_isempty = false;
-    std::unique_ptr<Geometry> guard11;
-    Geometry *g11 = nullptr;
-    g11 = *i;
-    Inplace_vector<String> wkbstrs(PSI_INSTRUMENT_ME);
-
-    BG_box box;
-    make_bg_box(*i, &box);
-
-    /*
-      Above theory makes sure all results are in rtree_result, the logic
-      here is sufficient when rtree_result is empty.
-    */
-    for (Rtree_index::const_query_iterator j =
-             rtree.qbegin(bgi::intersects(box));
-         j != rtree.qend(); ++j) {
-      Geometry *geom = (*gv2)[j->second];
-
-      wkbres = wkbstrs.append_object();
-      if (wkbres == nullptr) {
-        null_value = true;
-        return nullptr;
-      }
-      Geometry *g0 = bg_geo_set_op<Coordsys>(g11, geom, wkbres);
-      std::unique_ptr<Geometry> guard0(g0);
-
-      if (null_value) {
-        if (!(g0 != nullptr && g0 != *i && g0 != geom)) guard0.release();
-        if (!(g11 != nullptr && g11 != g0 && g11 != *i && g11 != geom))
-          guard11.release();
-        return nullptr;
-      }
-
-      if (g0 != nullptr && !is_empty_geocollection(*wkbres)) {
-        if (g11 != nullptr && g11 != *i && g11 != geom && g11 != g0)
-          delete guard11.release();
-        else
-          guard11.release();
-        guard0.release();
-        g11 = g0;
-        if (g0 != nullptr && g0 != *i && g0 != geom) guard11.reset(g11);
-      } else {
-        g11_isempty = true;
-        if (!(g0 != nullptr && g0 != *i && g0 != geom && g0 != g11))
-          guard0.release();
-        break;
-      }
-    }
-
-    if (!g11_isempty) bggc.fill(g11);
-    if (!(g11 != nullptr && g11 != *i))
-      guard11.release();
-    else
-      guard11.reset(nullptr);
-  }
-
-  bggc.merge_components<Coordsys>(&null_value);
-  if (null_value) return nullptr;
-  gres = bggc.as_geometry_collection(result);
-
-  return gres;
-}
-
-/**
-  Symmetric difference of geometry collections.
-
-  Symdifference(g1, g2) is implemented as
-  union(difference(g1, g2), difference(g2, g1)).
-
-  @tparam Coordsys Coordinate system type, specified using those defined in
-          boost::geometry::cs.
-  @param bggc1 First geometry operand, a geometry collection.
-  @param bggc2 Second geometry operand, a geometry collection.
-  @param[out] result Holds WKB data of the result, which must be a
-                geometry collection.
-  @return The symdifference result, whose WKB data is stored in 'result'.
- */
-template <typename Coordsys>
-Geometry *Item_func_spatial_operation::geocol_symdifference(
-    const BG_geometry_collection &bggc1, const BG_geometry_collection &bggc2,
-    String *result) {
-  Geometry *res = nullptr;
-  std::unique_ptr<Geometry> diff12;
-  std::unique_ptr<Geometry> diff21;
-  String diff12_wkb;
-  String diff21_wkb;
-
-  Var_resetter<op_type> var_reset(&m_spatial_op, op_symdifference);
-
-  m_spatial_op = op_difference;
-  diff12.reset(geocol_difference<Coordsys>(bggc1, bggc2, &diff12_wkb));
-  if (null_value) return nullptr;
-  assert(diff12.get() != nullptr);
-
-  diff21.reset(geocol_difference<Coordsys>(bggc2, bggc1, &diff21_wkb));
-  if (null_value) return nullptr;
-  assert(diff21.get() != nullptr);
-
-  m_spatial_op = op_union;
-  res = geometry_collection_set_operation<Coordsys>(diff12.get(), diff21.get(),
-                                                    result);
-  if (diff12.get() == res) {
-    result->takeover(diff12_wkb);
-    diff12.release();
-  } else if (diff21.get() == res) {
-    result->takeover(diff21_wkb);
-    diff21.release();
-  }
-
-  if (null_value) {
-    if (res != nullptr) delete res;
-    return nullptr;
-  }
-
-  return res;
-}
-
-bool Item_func_spatial_operation::assign_result(Geometry *geo, String *result) {
-  assert(geo->has_geom_header_space());
-  char *p = geo->get_cptr() - GEOM_HEADER_SIZE;
-  write_geometry_header(p, geo->get_srid(), geo->get_geotype());
-  result->set(p, GEOM_HEADER_SIZE + geo->get_nbytes(), &my_charset_bin);
-  m_bg_resbuf_mgr.add_buffer(p);
-  geo->set_ownmem(false);
-
-  return false;
-}
diff -Nru mysql-8.0-8.0.26/sql/item.h mysql-8.0-8.0.27/sql/item.h
--- mysql-8.0-8.0.26/sql/item.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/item.h	2021-09-28 11:46:34.000000000 +0000
@@ -33,6 +33,7 @@
 #include <memory>
 #include <new>
 #include <string>
+#include <type_traits>
 #include <vector>
 
 #include "decimal.h"
@@ -672,7 +673,7 @@
                       MODE_OUT   - UPDATE_ACL
                       MODE_INOUT - SELECT_ACL | UPDATE_ACL
   */
-  virtual void set_required_privilege(ulong privilege MY_ATTRIBUTE((unused))) {}
+  virtual void set_required_privilege(ulong privilege [[maybe_unused]]) {}
 
   /*
     Set parameter value.
@@ -690,7 +691,7 @@
   */
   virtual bool set_value(THD *thd, sp_rcontext *ctx, Item **it) = 0;
 
-  virtual void set_out_param_info(Send_field *info MY_ATTRIBUTE((unused))) {}
+  virtual void set_out_param_info(Send_field *info [[maybe_unused]]) {}
 
   virtual const Send_field *get_out_param_info() const { return nullptr; }
 };
@@ -822,13 +823,13 @@
     return (*THR_MALLOC)->Alloc(size);
   }
   static void *operator new(size_t size, MEM_ROOT *mem_root,
-                            const std::nothrow_t &arg MY_ATTRIBUTE((unused)) =
-                                std::nothrow) noexcept {
+                            const std::nothrow_t &arg
+                            [[maybe_unused]] = std::nothrow) noexcept {
     return mem_root->Alloc(size);
   }
 
-  static void operator delete(void *ptr MY_ATTRIBUTE((unused)),
-                              size_t size MY_ATTRIBUTE((unused))) {
+  static void operator delete(void *ptr [[maybe_unused]],
+                              size_t size [[maybe_unused]]) {
     TRASH(ptr, size);
   }
   static void operator delete(void *, MEM_ROOT *,
@@ -1134,9 +1135,10 @@
     @param removed_query_block query_block that tables are moved away from,
                           child of parent_query_block.
   */
-  virtual void fix_after_pullout(
-      Query_block *parent_query_block MY_ATTRIBUTE((unused)),
-      Query_block *removed_query_block MY_ATTRIBUTE((unused))) {}
+  virtual void fix_after_pullout(Query_block *parent_query_block
+                                 [[maybe_unused]],
+                                 Query_block *removed_query_block
+                                 [[maybe_unused]]) {}
   /*
     should be used in case where we are sure that we do not need
     complete fix_fields() procedure.
@@ -1153,9 +1155,8 @@
 
     @returns false if success, true if error
   */
-  virtual bool propagate_type(THD *thd MY_ATTRIBUTE((unused)),
-                              const Type_properties &type
-                                  MY_ATTRIBUTE((unused))) {
+  virtual bool propagate_type(THD *thd [[maybe_unused]],
+                              const Type_properties &type [[maybe_unused]]) {
     return false;
   }
 
@@ -1330,9 +1331,10 @@
   }
 
   inline void set_data_type_bool() {
-    set_data_type(MYSQL_TYPE_LONG);
+    set_data_type(MYSQL_TYPE_LONGLONG);
     collation.set_numeric();
     max_length = 1;
+    unsigned_flag = true;
   }
 
   /**
@@ -1351,14 +1353,14 @@
     The unsigned property must have been set before calling this function.
 
     @param precision Number of digits of precision
-    @param dec       Number of digits after decimal point.
+    @param scale     Number of digits after decimal point.
   */
-  inline void set_data_type_decimal(uint8 precision, uint8 dec) {
+  inline void set_data_type_decimal(uint8 precision, uint8 scale) {
     set_data_type(MYSQL_TYPE_NEWDECIMAL);
     collation.set_numeric();
-    decimals = dec;
+    decimals = scale;
     fix_char_length(my_decimal_precision_to_length_no_truncation(
-        precision, dec, unsigned_flag));
+        precision, scale, unsigned_flag));
   }
 
   /// Set the data type of the Item to be double precision floating point.
@@ -1631,8 +1633,8 @@
         - If the value of the function is NULL then the bound is the
           smallest possible value of LLONG_MIN
   */
-  virtual longlong val_int_endpoint(bool left_endp MY_ATTRIBUTE((unused)),
-                                    bool *incl_endp MY_ATTRIBUTE((unused))) {
+  virtual longlong val_int_endpoint(bool left_endp [[maybe_unused]],
+                                    bool *incl_endp [[maybe_unused]]) {
     assert(0);
     return 0;
   }
@@ -1853,7 +1855,7 @@
     @return false if successful, true on failure
   */
   /* purecov: begin deadcode */
-  virtual bool val_json(Json_wrapper *result MY_ATTRIBUTE((unused))) {
+  virtual bool val_json(Json_wrapper *result [[maybe_unused]]) {
     assert(false);
     my_error(ER_NOT_SUPPORTED_YET, MYF(0), "item type for JSON");
     return error_json();
@@ -1881,12 +1883,13 @@
     @return                  the filtering effect (between 0 and 1) this
                              Item contributes with.
   */
-  virtual float get_filtering_effect(
-      THD *thd MY_ATTRIBUTE((unused)),
-      table_map filter_for_table MY_ATTRIBUTE((unused)),
-      table_map read_tables MY_ATTRIBUTE((unused)),
-      const MY_BITMAP *fields_to_ignore MY_ATTRIBUTE((unused)),
-      double rows_in_table MY_ATTRIBUTE((unused))) {
+  virtual float get_filtering_effect(THD *thd [[maybe_unused]],
+                                     table_map filter_for_table
+                                     [[maybe_unused]],
+                                     table_map read_tables [[maybe_unused]],
+                                     const MY_BITMAP *fields_to_ignore
+                                     [[maybe_unused]],
+                                     double rows_in_table [[maybe_unused]]) {
     // Filtering effect cannot be calculated for a table already read.
     assert((read_tables & filter_for_table) == 0);
     return COND_FILTER_ALLPASS;
@@ -2122,6 +2125,13 @@
   */
   virtual bool basic_const_item() const { return false; }
   /**
+    @returns true when a const item may be evaluated during resolving.
+             Only const items that are basic const items are evaluated when
+             resolving CREATE VIEW statements. For other statements, all
+             const items may be evaluated during resolving.
+  */
+  bool may_eval_const_item(const THD *thd) const;
+  /**
     @return cloned item if it is constant
       @retval nullptr  if this is not const
   */
@@ -2299,7 +2309,13 @@
   virtual void no_rows_in_result() {}
   virtual Item *copy_or_same(THD *) { return this; }
   virtual Item *copy_andor_structure(THD *) { return this; }
+  /**
+    @returns the "real item" underlying the owner object. Used to strip away
+             Item_ref objects.
+    @note remember to implement both real_item() functions in sub classes!
+  */
   virtual Item *real_item() { return this; }
+  virtual const Item *real_item() const { return this; }
   /**
     If an Item is materialized in a temporary table, a different Item may have
     to be used in the part of the query that runs after the materialization.
@@ -2345,15 +2361,21 @@
                        by agreement, an error may have been reported
   */
 
-  virtual bool walk(Item_processor processor,
-                    enum_walk walk MY_ATTRIBUTE((unused)), uchar *arg) {
+  virtual bool walk(Item_processor processor, enum_walk walk [[maybe_unused]],
+                    uchar *arg) {
     return (this->*processor)(arg);
   }
 
-  /** @see WalkItem */
+  /** @see WalkItem, CompileItem */
   template <class T>
-  bool walk_helper_thunk(uchar *arg) {
-    return (*reinterpret_cast<T *>(arg))(this);
+  auto walk_helper_thunk(uchar *arg) {
+    return (*reinterpret_cast<std::remove_reference_t<T> *>(arg))(this);
+  }
+
+  /** See CompileItem */
+  template <class T>
+  auto analyze_helper_thunk(uchar **arg) {
+    return (*reinterpret_cast<std::remove_reference_t<T> *>(*arg))(this);
   }
 
   /**
@@ -2513,7 +2535,7 @@
      @param arg  A MY_BITMAP* cast to unsigned char*, where the bits represent
                  Field::field_index values.
    */
-  virtual bool remove_column_from_bitmap(uchar *arg MY_ATTRIBUTE((unused))) {
+  virtual bool remove_column_from_bitmap(uchar *arg [[maybe_unused]]) {
     return false;
   }
   virtual bool find_item_in_field_list_processor(uchar *) { return false; }
@@ -2531,9 +2553,7 @@
 
     @param arg        Mark_field object
   */
-  virtual bool mark_field_in_map(uchar *arg MY_ATTRIBUTE((unused))) {
-    return false;
-  }
+  virtual bool mark_field_in_map(uchar *arg [[maybe_unused]]) { return false; }
 
   /// Traverse the item tree and replace fields that are outside of reach with
   /// fields that are within reach. This is used by hash join when it detects
@@ -2570,9 +2590,7 @@
     @param arg   pointing to a bool which, if true, says to reset state
                  for framing window function, else for non-framing
   */
-  virtual bool reset_wf_state(uchar *arg MY_ATTRIBUTE((unused))) {
-    return false;
-  }
+  virtual bool reset_wf_state(uchar *arg [[maybe_unused]]) { return false; }
 
   /**
     Return used table information for the specified query block (level).
@@ -2588,7 +2606,7 @@
     @note This function is used to update used tables information after
           merging a query block (a subquery) with its parent.
   */
-  virtual bool used_tables_for_level(uchar *arg MY_ATTRIBUTE((unused))) {
+  virtual bool used_tables_for_level(uchar *arg [[maybe_unused]]) {
     return false;
   }
   /**
@@ -2596,7 +2614,7 @@
 
     @param thd   thread handle
   */
-  virtual bool check_column_privileges(uchar *thd MY_ATTRIBUTE((unused))) {
+  virtual bool check_column_privileges(uchar *thd [[maybe_unused]]) {
     return false;
   }
   virtual bool inform_item_in_cond_of_tab(uchar *) { return false; }
@@ -2804,8 +2822,8 @@
 
     @returns false if the function is not DEFAULT(args), otherwise true.
   */
-  virtual bool check_gcol_depend_default_processor(
-      uchar *args MY_ATTRIBUTE((unused))) {
+  virtual bool check_gcol_depend_default_processor(uchar *args
+                                                   [[maybe_unused]]) {
     return false;
   }
   /**
@@ -2813,8 +2831,7 @@
     derived table. Used in determining if a condition can be pushed
     down to derived table.
   */
-  virtual bool check_column_from_derived_table(
-      uchar *arg MY_ATTRIBUTE((unused))) {
+  virtual bool check_column_from_derived_table(uchar *arg [[maybe_unused]]) {
     // A generic item cannot be pushed down unless constant.
     return !const_item();
   }
@@ -2824,8 +2841,7 @@
     in PARTITION clause of window functions of the derived table.
     Used in checking if a condition can be pushed down to derived table.
   */
-  virtual bool check_column_in_window_functions(
-      uchar *arg MY_ATTRIBUTE((unused))) {
+  virtual bool check_column_in_window_functions(uchar *arg [[maybe_unused]]) {
     return false;
   }
   /**
@@ -2833,7 +2849,7 @@
     in GROUP BY clause of the derived table. Used in checking if
     a condition can be pushed down to derived table.
   */
-  virtual bool check_column_in_group_by(uchar *arg MY_ATTRIBUTE((unused))) {
+  virtual bool check_column_in_group_by(uchar *arg [[maybe_unused]]) {
     return false;
   }
   /**
@@ -2843,7 +2859,7 @@
     in the derived table's definition. We replace with a clone, because the
     condition can be pushed further down in case of nested derived tables.
   */
-  virtual Item *replace_with_derived_expr(uchar *arg MY_ATTRIBUTE((unused))) {
+  virtual Item *replace_with_derived_expr(uchar *arg [[maybe_unused]]) {
     return this;
   }
   /**
@@ -2854,8 +2870,7 @@
     clone is not used because HAVING condition will not be pushed further
     down in case of nested derived tables.
   */
-  virtual Item *replace_with_derived_expr_ref(
-      uchar *arg MY_ATTRIBUTE((unused))) {
+  virtual Item *replace_with_derived_expr_ref(uchar *arg [[maybe_unused]]) {
     return this;
   }
   /**
@@ -2865,8 +2880,7 @@
     We replace with a clone, because the referenced item in a view reference
     is shared by all the view references to that expression.
   */
-  virtual Item *replace_view_refs_with_clone(
-      uchar *arg MY_ATTRIBUTE((unused))) {
+  virtual Item *replace_view_refs_with_clone(uchar *arg [[maybe_unused]]) {
     return this;
   }
   /*
@@ -2900,8 +2914,8 @@
     @param thd   Thread handle
     @param test  Truth test
   */
-  virtual Item *truth_transformer(THD *thd MY_ATTRIBUTE((unused)),
-                                  Bool_test test MY_ATTRIBUTE((unused))) {
+  virtual Item *truth_transformer(THD *thd [[maybe_unused]],
+                                  Bool_test test [[maybe_unused]]) {
     return nullptr;
   }
   virtual Item *update_value_transformer(uchar *) { return this; }
@@ -3062,6 +3076,13 @@
     return max_len;
   }
 
+  uint32 max_char_length(const CHARSET_INFO *cs) const {
+    if (cs == &my_charset_bin && result_type() == STRING_RESULT) {
+      return max_length;
+    }
+    return max_char_length();
+  }
+
   inline void fix_char_length(uint32 max_char_length_arg) {
     max_length = char_to_byte_length_safe(max_char_length_arg,
                                           collation.collation->mbmaxlen);
@@ -3198,7 +3219,7 @@
 
     @param arg  Keep track of whether an Item_ref refers to an Item_field.
   */
-  virtual bool repoint_const_outer_ref(uchar *arg MY_ATTRIBUTE((unused))) {
+  virtual bool repoint_const_outer_ref(uchar *arg [[maybe_unused]]) {
     return false;
   }
   virtual bool strip_db_table_name_processor(uchar *) { return false; }
@@ -3390,8 +3411,8 @@
     @return true if this expression can be used for partial update,
       false otherwise
   */
-  virtual bool supports_partial_update(
-      const Field_json *field MY_ATTRIBUTE((unused))) const {
+  virtual bool supports_partial_update(const Field_json *field
+                                       [[maybe_unused]]) const {
     return false;
   }
 
@@ -3436,6 +3457,21 @@
                     reinterpret_cast<uchar *>(&functor));
 }
 
+/**
+  Same as WalkItem, but for Item::compile(). Use as e.g.:
+
+  Item *item = CompileItem(root_item,
+     [](Item *item) { return true; },   // Analyzer.
+     [](Item *item) { return item; });  // Transformer.
+ */
+template <class T, class U>
+inline Item *CompileItem(Item *item, T &&analyzer, U &&transformer) {
+  uchar *analyzer_ptr = reinterpret_cast<uchar *>(&analyzer);
+  return item->compile(&Item::analyze_helper_thunk<T>, &analyzer_ptr,
+                       &Item::walk_helper_thunk<U>,
+                       reinterpret_cast<uchar *>(&transformer));
+}
+
 class sp_head;
 
 class Item_basic_constant : public Item {
@@ -3505,8 +3541,7 @@
     // ZEROFILL attribute.
     return this_item()->send(protocol, str);
   }
-  bool check_column_from_derived_table(
-      uchar *arg MY_ATTRIBUTE((unused))) override {
+  bool check_column_from_derived_table(uchar *arg [[maybe_unused]]) override {
     // It is ok to push down a condition like "column > SP_variable"
     return false;
   }
@@ -3793,6 +3828,13 @@
     If column is from a non-aliased base table or view, the name of the
     column in that base table or view.
     If column is from an expression, a string generated from that expression.
+
+    Notice that a column can be aliased in two ways:
+    1. With an explicit column alias, or <as clause>, or
+    2. With only a column name specified, which differs from the table's
+       column name due to case insensitivity.
+    In both cases field_name will differ from m_orig_field_name.
+    field_name is normally identical to Item::item_name.
   */
   const char *field_name;
 
@@ -3854,15 +3896,16 @@
   bool itemize(Parse_context *pc, Item **res) override;
 
   const char *full_name() const override;
-  void set_orig_db_name(const char *name_arg) { m_orig_db_name = name_arg; }
-  void set_orig_table_name(const char *name_arg) {
+  void set_orignal_db_name(const char *name_arg) { m_orig_db_name = name_arg; }
+  void set_original_table_name(const char *name_arg) {
     m_orig_table_name = name_arg;
   }
-  void set_orig_field_name(const char *name_arg) {
+  void set_original_field_name(const char *name_arg) {
     m_orig_field_name = name_arg;
   }
-  const char *orig_db_name() const { return m_orig_db_name; }
-  const char *orig_table_name() const { return m_orig_table_name; }
+  const char *original_db_name() const { return m_orig_db_name; }
+  const char *original_table_name() const { return m_orig_table_name; }
+  const char *original_field_name() const { return m_orig_field_name; }
   void fix_after_pullout(Query_block *parent_query_block,
                          Query_block *removed_query_block) override;
   bool aggregate_check_distinct(uchar *arg) override;
@@ -4661,8 +4704,7 @@
     func_arg->err_code = func_arg->get_unnamed_function_error_code();
     return true;
   }
-  bool check_column_from_derived_table(
-      uchar *arg MY_ATTRIBUTE((unused))) override {
+  bool check_column_from_derived_table(uchar *arg [[maybe_unused]]) override {
     // It is ok to push down a condition like "column > PS_parameter"
     return false;
   }
@@ -5531,7 +5573,7 @@
         ref(item->ref) {}
   enum Type type() const override { return REF_ITEM; }
   bool eq(const Item *item, bool binary_cmp) const override {
-    const Item *it = const_cast<Item *>(item)->real_item();
+    const Item *it = item->real_item();
     return ref && (*ref)->eq(it, binary_cmp);
   }
   double val_real() override;
@@ -5588,6 +5630,10 @@
   bool is_result_field() const override { return true; }
   Field *get_result_field() const override { return result_field; }
   Item *real_item() override { return ref ? (*ref)->real_item() : this; }
+  const Item *real_item() const override {
+    return ref ? (*ref)->real_item() : this;
+  }
+
   bool walk(Item_processor processor, enum_walk walk, uchar *arg) override {
     return ((walk & enum_walk::PREFIX) && (this->*processor)(arg)) ||
            // For having clauses 'ref' will consistently =NULL.
@@ -5941,6 +5987,7 @@
   }
   Item *clone_item() const override;
   Item *real_item() override { return ref; }
+  const Item *real_item() const override { return ref; }
 };
 
 /*
@@ -6089,30 +6136,27 @@
 class Cached_item {
  protected:
   Item *item;  ///< The item whose value to cache.
+  explicit Cached_item(Item *i) : item(i), null_value(false) {}
+
  public:
   bool null_value;
-  Cached_item(Item *i) : item(i), null_value(false) {}
+  virtual ~Cached_item() = default;
   /**
     If cached value is different from item's, returns true and updates
     cached value with item's.
   */
   virtual bool cmp() = 0;
-  virtual ~Cached_item(); /*line -e1509 */
   Item *get_item() { return item; }
-  virtual void copy_to_Item_cache(Item_cache *i_c MY_ATTRIBUTE((unused))) {
-    assert(false); /* purecov: inspected */
-  }
+  Item **get_item_ptr() { return &item; }
 };
 
 class Cached_item_str : public Cached_item {
-  uint32 value_max_length;
   String value, tmp_value;
 
  public:
-  Cached_item_str(THD *thd, Item *arg);
+  explicit Cached_item_str(Item *arg);
   bool cmp() override;
   ~Cached_item_str() override;  // Deallocate String:s
-  void copy_to_Item_cache(Item_cache *i_c) override;
 };
 
 /// Cached_item subclass for JSON values.
@@ -6122,7 +6166,6 @@
   explicit Cached_item_json(Item *item);
   ~Cached_item_json() override;
   bool cmp() override;
-  void copy_to_Item_cache(Item_cache *i_c) override;
 };
 
 class Cached_item_real : public Cached_item {
@@ -6131,7 +6174,6 @@
  public:
   Cached_item_real(Item *item_par) : Cached_item(item_par), value(0.0) {}
   bool cmp() override;
-  void copy_to_Item_cache(Item_cache *i_c) override;
 };
 
 class Cached_item_int : public Cached_item {
@@ -6140,7 +6182,6 @@
  public:
   Cached_item_int(Item *item_par) : Cached_item(item_par), value(0) {}
   bool cmp() override;
-  void copy_to_Item_cache(Item_cache *i_c) override;
 };
 
 class Cached_item_temporal : public Cached_item {
@@ -6149,7 +6190,6 @@
  public:
   Cached_item_temporal(Item *item_par) : Cached_item(item_par), value(0) {}
   bool cmp() override;
-  void copy_to_Item_cache(Item_cache *i_c) override;
 };
 
 class Cached_item_decimal : public Cached_item {
@@ -6158,7 +6198,6 @@
  public:
   Cached_item_decimal(Item *item_par);
   bool cmp() override;
-  void copy_to_Item_cache(Item_cache *i_c) override;
 };
 
 class Item_default_value final : public Item_field {
diff -Nru mysql-8.0-8.0.26/sql/item_inetfunc.cc mysql-8.0-8.0.27/sql/item_inetfunc.cc
--- mysql-8.0-8.0.26/sql/item_inetfunc.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/item_inetfunc.cc	2021-09-28 11:46:34.000000000 +0000
@@ -100,9 +100,10 @@
     */
     switch (dot_count) {
       case 1:
-        result <<= 8; /* Fall through */
+        result <<= 8;
+        [[fallthrough]];
       case 2:
-        result <<= 8; /* Fall through */
+        result <<= 8;
     }
     if (dot_count > 3)  // Too many groups
       goto err;
diff -Nru mysql-8.0-8.0.26/sql/item_regexp_func.cc mysql-8.0-8.0.27/sql/item_regexp_func.cc
--- mysql-8.0-8.0.26/sql/item_regexp_func.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/item_regexp_func.cc	2021-09-28 11:46:34.000000000 +0000
@@ -31,15 +31,14 @@
 
 #include "sql/item_regexp_func.h"
 
+#include <optional>
+
 #include "my_dbug.h"
-#include "mysql_com.h"  // MAX_BLOB_WIDTH
-#include "nullable.h"
+#include "mysql_com.h"      // MAX_BLOB_WIDTH
 #include "sql/item_func.h"  // agg_arg_charsets_for_comparison()
 #include "sql/sql_class.h"  // THD
 #include "sql/sql_lex.h"    // Disable_semijoin_flattening
 
-using Mysql::Nullable;
-
 /**
   Transforms a textual option string from the user to a bitmask of ICU flags.
   The match_parameter is a string of characters where each character controls
@@ -179,18 +178,23 @@
 longlong Item_func_regexp_instr::val_int() {
   DBUG_TRACE;
   assert(fixed);
-  Nullable<int> pos = position();
-  Nullable<int> occ = occurrence();
-  Nullable<int> retopt = return_option();
+  std::optional<int> pos = position();
+  std::optional<int> occ = occurrence();
+  std::optional<int> retopt = return_option();
 
   if (set_pattern() || !pos.has_value() || !occ.has_value() ||
       !retopt.has_value()) {
     return error_int();
   }
 
-  Nullable<int32_t> result =
+  std::optional<int32_t> result =
       m_facade->Find(subject(), pos.value(), occ.value(), retopt.value());
-  if (result.has_value()) return result.value();
+  if (current_thd->is_error()) return error_int();
+
+  if (result.has_value()) {
+    null_value = false;
+    return result.value();
+  }
   null_value = true;
   return 0;
 }
@@ -207,12 +211,16 @@
     REGEXP_LIKE() does not take position and occurence arguments, so we trust
     that the calls to their accessors below will return the default values.
   */
-  Nullable<bool> result =
+  std::optional<bool> result =
       m_facade->Matches(subject(), position().value(), occurrence().value());
-  null_value = !result.has_value();
-  if (null_value) return 0;
+  if (current_thd->is_error()) return error_int();
 
-  return result.value();
+  if (result.has_value()) {
+    null_value = false;
+    return result.value();
+  }
+  null_value = true;
+  return 0;
 }
 
 bool Item_func_regexp_like::resolve_type(THD *thd) {
@@ -252,8 +260,8 @@
 String *Item_func_regexp_replace::val_str(String *buf) {
   assert(fixed);
 
-  Nullable<int> pos = position();
-  Nullable<int> occ = occurrence();
+  std::optional<int> pos = position();
+  std::optional<int> occ = occurrence();
 
   if (set_pattern() || !pos.has_value() || !occ.has_value()) {
     return error_str();
@@ -267,6 +275,8 @@
   buf->set_charset(collation.collation);
   String *result = m_facade->Replace(subject(), replacement(), pos.value(),
                                      occ.value(), buf);
+  if (current_thd->is_error()) return error_str();
+
   null_value = (result == nullptr);
   return result;
 }
@@ -283,18 +293,20 @@
 
 String *Item_func_regexp_substr::val_str(String *buf) {
   assert(fixed);
-  Nullable<int> pos = position();
-  Nullable<int> occ = occurrence();
+  std::optional<int> pos = position();
+  std::optional<int> occ = occurrence();
 
   if (set_pattern() || !pos.has_value() || !occ.has_value()) {
     return null_return_str();
   }
   if (pos.value() < 1) {
     my_error(ER_WRONG_PARAMETERS_TO_NATIVE_FCT, MYF(0), func_name());
-    return null_return_str();
+    return error_str();
   }
   buf->set_charset(collation.collation);
   String *result = m_facade->Substr(subject(), pos.value(), occ.value(), buf);
+  if (current_thd->is_error()) return error_str();
+
   null_value = (result == nullptr);
   return result;
 }
diff -Nru mysql-8.0-8.0.26/sql/item_regexp_func.h mysql-8.0-8.0.27/sql/item_regexp_func.h
--- mysql-8.0-8.0.26/sql/item_regexp_func.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/item_regexp_func.h	2021-09-28 11:46:34.000000000 +0000
@@ -61,6 +61,7 @@
 #include <assert.h>
 #include <unicode/uregex.h>
 
+#include <optional>
 #include <string>
 
 // assert
@@ -71,6 +72,12 @@
 #include "sql/regexp/regexp_facade.h"
 #include "sql_string.h"  // String
 
+// GCC bug 80635.
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
+
 /**
   Base class for all regular expression function classes. Is responsible for
   creating the Regexp_facade object.
@@ -103,7 +110,7 @@
   Item *pattern() const { return args[1]; }
 
   /// The value of the `position` argument, or its default if absent.
-  Mysql::Nullable<int> position() const {
+  std::optional<int> position() const {
     int the_index = pos_arg_pos();
     if (the_index != -1 && arg_count >= static_cast<uint>(the_index) + 1) {
       int value = args[the_index]->val_int();
@@ -114,7 +121,7 @@
         but until that happens, we need to have a more conservative check.
       */
       if (args[the_index]->is_nullable() && args[the_index]->null_value)
-        return Mysql::Nullable<int>();
+        return {};
       else
         return value;
     }
@@ -122,7 +129,7 @@
   }
 
   /// The value of the `occurrence` argument, or its default if absent.
-  Mysql::Nullable<int> occurrence() const {
+  std::optional<int> occurrence() const {
     int the_index = occ_arg_pos();
     if (the_index != -1 && arg_count >= static_cast<uint>(the_index) + 1) {
       int value = args[the_index]->val_int();
@@ -133,7 +140,7 @@
         but until that happens, we need to have a more conservative check.
       */
       if (args[the_index]->is_nullable() && args[the_index]->null_value)
-        return Mysql::Nullable<int>();
+        return {};
       else
         return value;
     }
@@ -141,7 +148,7 @@
   }
 
   /// The value of the `match_parameter` argument, or an empty string if absent.
-  Mysql::Nullable<std::string> match_parameter() const {
+  std::optional<std::string> match_parameter() const {
     int the_index = match_arg_pos();
     if (the_index != -1 && arg_count >= static_cast<uint>(the_index) + 1) {
       StringBuffer<5> buf;  // Longer match_parameter doesn't make sense.
@@ -149,7 +156,7 @@
       if (s != nullptr)
         return to_string(*s);
       else
-        return Mysql::Nullable<std::string>();
+        return {};
     }
     return std::string{};
   }
@@ -237,12 +244,12 @@
   const char *func_name() const override { return "regexp_instr"; }
 
   /// The value of the `return_option` argument, or its default if absent.
-  Mysql::Nullable<int> return_option() const {
+  std::optional<int> return_option() const {
     int the_index = retopt_arg_pos();
     if (the_index != -1 && arg_count >= static_cast<uint>(the_index) + 1) {
       int value = args[the_index]->val_int();
       if (args[the_index]->null_value)
-        return Mysql::Nullable<int>();
+        return std::optional<int>();
       else
         return value;
     }
@@ -401,4 +408,8 @@
   bool itemize(Parse_context *pc, Item **res) override;
 };
 
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic pop
+#endif
+
 #endif  // SQL_ITEM_REGEXP_FUNC_H_
diff -Nru mysql-8.0-8.0.26/sql/item_row.cc mysql-8.0-8.0.27/sql/item_row.cc
--- mysql-8.0-8.0.26/sql/item_row.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/item_row.cc	2021-09-28 11:46:34.000000000 +0000
@@ -83,8 +83,7 @@
   return false;
 }
 
-void Item_row::illegal_method_call(
-    const char *method MY_ATTRIBUTE((unused))) const {
+void Item_row::illegal_method_call(const char *method [[maybe_unused]]) const {
   DBUG_TRACE;
   DBUG_PRINT("error", ("!!! %s method was called for row item", method));
   assert(0);
diff -Nru mysql-8.0-8.0.26/sql/item_strfunc.cc mysql-8.0-8.0.27/sql/item_strfunc.cc
--- mysql-8.0-8.0.26/sql/item_strfunc.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/item_strfunc.cc	2021-09-28 11:46:34.000000000 +0000
@@ -188,8 +188,8 @@
     int retval = compute_md5_hash((char *)digest, sptr->ptr(), sptr->length());
     if (retval == 1) {
       push_warning_printf(current_thd, Sql_condition::SL_WARNING,
-                          ER_SSL_FIPS_MODE_ERROR,
-                          ER_THD(current_thd, ER_SSL_FIPS_MODE_ERROR),
+                          ER_DA_SSL_FIPS_MODE_ERROR,
+                          ER_THD(current_thd, ER_DA_SSL_FIPS_MODE_ERROR),
                           "FIPS mode ON/STRICT: MD5 digest is not supported.");
     }
     if (str->alloc(32))  // Ensure that memory is free
@@ -342,7 +342,7 @@
   if (param_type_is_default(thd, 1, 2, MYSQL_TYPE_LONGLONG)) return true;
   set_nullable(true);
   longlong sha_variant;
-  if (args[1]->const_item()) {
+  if (args[1]->const_item() && args[1]->may_eval_const_item(thd)) {
     sha_variant = args[1]->val_int();
     // Give error message in switch below.
     if (args[1]->null_value) sha_variant = -1;
@@ -501,8 +501,8 @@
   ulong aes_opmode = thd->variables.my_aes_mode;
   assert(aes_opmode <= MY_AES_END);
 
-  set_data_type_string((uint)my_aes_get_size(args[0]->max_length,
-                                             (enum my_aes_opmode)aes_opmode));
+  set_data_type_string(static_cast<ulonglong>(
+      my_aes_get_size(args[0]->max_length, (enum my_aes_opmode)aes_opmode)));
   return false;
 }
 
@@ -896,7 +896,7 @@
   {
     THD *thd = current_thd;
     Thd_parse_modifier thd_mod(thd, m_token_buffer);
-    const CHARSET_INFO *cs = args[0]->charset_for_protocol();
+    const CHARSET_INFO *cs = statement_string->charset();
     if (!is_supported_parser_charset(cs)) {
       my_error(ER_FUNCTION_DOES_NOT_SUPPORT_CHARACTER_SET, myf(0), func_name(),
                cs->name);
@@ -905,7 +905,7 @@
     if (parse(thd, args[0], statement_string)) return error_str();
     compute_digest_hash(&thd->m_digest->m_digest_storage, digest);
   }
-
+  assert(buf->charset() != nullptr);
   if (buf->reserve(DIGEST_HASH_TO_STRING_LENGTH)) return error_str();
   buf->length(DIGEST_HASH_TO_STRING_LENGTH);
   DIGEST_HASH_TO_STRING(digest, buf->c_ptr_quick());
@@ -932,7 +932,7 @@
 
   THD *thd = current_thd;
   Thd_parse_modifier thd_mod(thd, m_token_buffer);
-  const CHARSET_INFO *cs = args[0]->charset_for_protocol();
+  const CHARSET_INFO *cs = statement_string->charset();
   if (!is_supported_parser_charset(cs)) {
     my_error(ER_FUNCTION_DOES_NOT_SUPPORT_CHARACTER_SET, myf(0), func_name(),
              cs->name);
@@ -940,6 +940,7 @@
   }
   if (parse(thd, args[0], statement_string)) return error_str();
 
+  assert(buf->charset() != nullptr);
   compute_digest_text(&thd->m_digest->m_digest_storage, buf);
 
   return buf;
@@ -981,7 +982,7 @@
     return true;
 
   for (uint i = 0; i < arg_count; i++)
-    char_length += args[i]->max_char_length();
+    char_length += args[i]->max_char_length(collation.collation);
 
   set_data_type_string(char_length);
   set_nullable(is_nullable() || max_length > thd->variables.max_allowed_packet);
@@ -1035,9 +1036,10 @@
     return true;
 
   assert(arg_count >= 2);
-  char_length = (ulonglong)args[0]->max_char_length() * (arg_count - 2);
+  char_length = (ulonglong)args[0]->max_char_length(collation.collation) *
+                (arg_count - 2);
   for (uint i = 1; i < arg_count; i++)
-    char_length += args[i]->max_char_length();
+    char_length += args[i]->max_char_length(collation.collation);
 
   set_data_type_string(char_length);
   set_nullable(is_nullable() || max_length > thd->variables.max_allowed_packet);
@@ -1104,8 +1106,10 @@
   tmp_value_res.set_charset(collation.collation);
   String *result = &tmp_value_res;
 
-  StringBuffer<STRING_BUFFER_USUAL_SIZE> res2_converted(nullptr);
-  StringBuffer<STRING_BUFFER_USUAL_SIZE> res3_converted(nullptr);
+  StringBuffer<STRING_BUFFER_USUAL_SIZE> res2_converted(nullptr, 0,
+                                                        collation.collation);
+  StringBuffer<STRING_BUFFER_USUAL_SIZE> res3_converted(nullptr, 0,
+                                                        collation.collation);
 
   String *res2 = eval_string_arg(collation.collation, args[1], &res2_converted);
   if (res2 == nullptr) return error_str();
@@ -1152,16 +1156,17 @@
 bool Item_func_replace::resolve_type(THD *thd) {
   if (param_type_is_default(thd, 0, 3)) return true;
 
-  ulonglong char_length = args[0]->max_char_length();
-  int diff = (int)(args[2]->max_char_length() - args[1]->max_char_length());
-  if (diff > 0 && args[1]->max_char_length()) {  // Calculate of maxreplaces
-    ulonglong max_substrs = char_length / args[1]->max_char_length();
-    char_length += max_substrs * (uint)diff;
-  }
-
   // We let the first argument (only) determine the character set of the result.
   // REPLACE(str, from_str, to_str)
   if (agg_arg_charsets_for_string_result(collation, args, 1)) return true;
+
+  ulonglong char_length = args[0]->max_char_length(collation.collation);
+  ulonglong replace_length = args[2]->max_char_length(collation.collation);
+
+  if (replace_length > 1ULL) {
+    char_length = char_length * (replace_length - 1ULL);
+  }
+
   set_data_type_string(char_length);
   set_nullable(is_nullable() || max_length > thd->variables.max_allowed_packet);
   return false;
@@ -1227,8 +1232,8 @@
   // Character set of result is based on first argument
   if (agg_arg_charsets_for_string_result(collation, args, 1)) return true;
   if (simplify_string_args(thd, collation, args + 3, 1)) return true;
-  ulonglong length = ulonglong{args[0]->max_char_length()} +
-                     ulonglong{args[3]->max_char_length()};
+  ulonglong length = ulonglong{args[0]->max_char_length(collation.collation)} +
+                     ulonglong{args[3]->max_char_length(collation.collation)};
   set_data_type_string(length);
   set_nullable(is_nullable() || max_length > thd->variables.max_allowed_packet);
   return false;
@@ -1309,9 +1314,9 @@
   return &tmp_value;
 }
 
-void Item_str_func::left_right_max_length() {
+void Item_str_func::left_right_max_length(THD *thd) {
   uint32 char_length = args[0]->max_char_length();
-  if (args[1]->const_item()) {
+  if (args[1]->const_item() && args[1]->may_eval_const_item(thd)) {
     longlong length = args[1]->val_int();
     if (args[1]->null_value) goto end;
 
@@ -1341,7 +1346,7 @@
   if (param_type_is_default(thd, 1, 2, MYSQL_TYPE_LONGLONG)) return true;
   if (agg_arg_charsets_for_string_result(collation, args, 1)) return true;
   assert(collation.collation != nullptr);
-  left_right_max_length();
+  left_right_max_length(thd);
   return false;
 }
 
@@ -1373,7 +1378,7 @@
   if (agg_arg_charsets_for_string_result(collation, args, 1)) return true;
 
   assert(collation.collation != nullptr);
-  left_right_max_length();
+  left_right_max_length(thd);
   return false;
 }
 
@@ -1430,7 +1435,7 @@
 
   set_data_type_string(0U);
   assert(collation.collation != nullptr);
-  if (args[1]->const_item()) {
+  if (args[1]->const_item() && args[1]->may_eval_const_item(thd)) {
     longlong start = args[1]->val_int();
     if (args[1]->null_value) goto end;
     Integer_value start_val(start, args[1]->unsigned_flag);
@@ -1444,7 +1449,8 @@
         max_char_length -= min(static_cast<uint32>(start - 1), max_char_length);
     }
   }
-  if (arg_count == 3 && args[2]->const_item()) {
+  if (arg_count == 3 && args[2]->const_item() &&
+      args[2]->may_eval_const_item(thd)) {
     longlong length = args[2]->val_int();
     if (args[2]->null_value) goto end;
     Integer_value length_val(length, args[2]->unsigned_flag);
@@ -1485,7 +1491,8 @@
 
   res->set_charset(collation.collation);
 
-  StringBuffer<STRING_BUFFER_USUAL_SIZE> delimiter_converted(nullptr);
+  StringBuffer<STRING_BUFFER_USUAL_SIZE> delimiter_converted(
+      nullptr, 0, collation.collation);
   String *delimiter =
       eval_string_arg(collation.collation, args[1], &delimiter_converted);
   if (delimiter == nullptr) return error_str();
@@ -1597,7 +1604,8 @@
   String tmp(buff, sizeof(buff), system_charset_info);
   String *remove_str = &remove;  // Default value.
 
-  StringBuffer<STRING_BUFFER_USUAL_SIZE> remove_converted(nullptr);
+  StringBuffer<STRING_BUFFER_USUAL_SIZE> remove_converted(nullptr, 0,
+                                                          collation.collation);
 
   if (arg_count == 2) {
     remove_str =
@@ -2393,7 +2401,7 @@
 
   if (agg_arg_charsets_for_string_result(collation, args, 1)) return true;
   assert(collation.collation != nullptr);
-  if (args[1]->const_item()) {
+  if (args[1]->const_item() && args[1]->may_eval_const_item(thd)) {
     /* must be longlong to avoid truncation */
     longlong count = args[1]->val_int();
     if (args[1]->null_value) goto end;
@@ -2475,45 +2483,50 @@
   if (param_type_is_default(thd, 0, 1, MYSQL_TYPE_LONGLONG)) return true;
 
   collation.set(default_charset(), DERIVATION_COERCIBLE, MY_REPERTOIRE_ASCII);
-  if (args[0]->const_item()) {
+  if (args[0]->const_item() && args[0]->may_eval_const_item(thd)) {
     /* must be longlong to avoid truncation */
     longlong count = args[0]->val_int();
-    if (args[0]->null_value) goto end;
+    if (thd->is_error()) return true;
+
+    if (args[0]->null_value) count = 0;
     /*
      Assumes that the maximum length of a String is < INT_MAX32.
      Set here so that rest of code sees out-of-bound value as such.
     */
-    if (count > INT_MAX32) count = INT_MAX32;
+    Integer_value count_val(count, args[0]->unsigned_flag);
+    if (count_val.is_negative())
+      count = 0;
+    else if (Integer_value(INT_MAX32, false) < count_val)
+      count = INT_MAX32;
+
     set_data_type_string(ulonglong(count));
     set_nullable(is_nullable() ||
                  max_length > thd->variables.max_allowed_packet);
     return false;
   }
 
-end:
   set_data_type_string(uint32(MAX_BLOB_WIDTH));
   set_nullable(true);
   return false;
 }
 
 String *Item_func_space::val_str(String *str) {
-  uint tot_length;
   longlong count = args[0]->val_int();
   const CHARSET_INFO *cs = collation.collation;
 
-  if (args[0]->null_value) return error_str();  // string and/or delim are null
+  if (args[0]->null_value) return null_return_str();
   null_value = false;
 
-  if (count <= 0 && (count == 0 || !args[0]->unsigned_flag))
+  if (count == 0 || Integer_value(count, args[0]->unsigned_flag).is_negative())
     return make_empty_result();
   /*
    Assumes that the maximum length of a String is < INT_MAX32.
    Bounds check on count:  If this is triggered, we will error.
   */
-  if ((ulonglong)count > INT_MAX32) count = INT_MAX32;
+  if (static_cast<ulonglong>(count) > INT_MAX32) count = INT_MAX32;
 
   // Safe length check
-  tot_length = (uint)count * cs->mbminlen;
+  ulonglong tot_length = count * cs->mbminlen;
   if (tot_length > current_thd->variables.max_allowed_packet) {
     return push_packet_overflow_warning(current_thd, func_name());
   }
@@ -2532,7 +2545,7 @@
   // Handle character set for args[0] and args[2].
   if (agg_arg_charsets_for_string_result(collation, &args[0], 2, 2))
     return true;
-  if (args[1]->const_item()) {
+  if (args[1]->const_item() && args[1]->may_eval_const_item(thd)) {
     ulonglong char_length = args[1]->val_uint();
     if (args[1]->null_value) goto end;
     assert(collation.collation->mbmaxlen > 0);
@@ -2659,7 +2672,7 @@
   if (agg_arg_charsets_for_string_result(collation, &args[0], 2, 2))
     return true;
 
-  if (args[1]->const_item()) {
+  if (args[1]->const_item() && args[1]->may_eval_const_item(thd)) {
     ulonglong char_length = args[1]->val_uint();
     if (args[1]->null_value) goto end;
     assert(collation.collation->mbmaxlen > 0);
@@ -2971,7 +2984,7 @@
 bool Item_func_conv_charset::resolve_type(THD *thd) {
   if (Item_str_func::resolve_type(thd)) return true;
   collation.set(conv_charset, DERIVATION_IMPLICIT);
-  set_data_type_string(args[0]->max_char_length());
+  set_data_type_string(args[0]->max_char_length(collation.collation));
   return false;
 }
 
@@ -3005,7 +3018,9 @@
 bool Item_func_set_collation::resolve_type(THD *) {
   CHARSET_INFO *set_collation;
   const char *colname;
-  String tmp, *str = args[1]->val_str(&tmp);
+  String tmp;
+  assert(args[1]->basic_const_item());
+  String *str = args[1]->val_str(&tmp);
   colname = str->c_ptr();
   if (colname == binary_keyword)
     set_collation = get_charset_by_csname(args[0]->collation.collation->csname,
@@ -3014,7 +3029,7 @@
     if (!(set_collation = mysqld_collation_get_by_name(colname))) return true;
   }
 
-  if (!set_collation ||
+  if (set_collation == nullptr ||
       (!my_charset_same(args[0]->collation.collation, set_collation) &&
        args[0]->collation.derivation != DERIVATION_NUMERIC)) {
     my_error(ER_COLLATION_CHARSET_MISMATCH, MYF(0), colname,
@@ -3120,7 +3135,8 @@
     len = result_length;
   } else {
     len = cs->coll->strnxfrmlen(
-        cs, cs->mbmaxlen * max(args[0]->max_char_length(), num_codepoints));
+        cs, cs->mbmaxlen * max(args[0]->max_char_length(collation.collation),
+                               num_codepoints));
   }
 
   // Due to the filesort logic in val_str(), we could return an int;
@@ -3468,6 +3484,12 @@
                 : args[0]->collation.collation;
 
   collation.set(cast_cs, DERIVATION_IMPLICIT);
+  if (cast_length >= 0 &&
+      cast_length > MAX_FIELD_BLOBLENGTH / cast_cs->mbmaxlen) {
+    my_error(ER_DATA_OUT_OF_RANGE, MYF(0), "char(n)", func_name());
+    return true;
+  }
+  // cast_length can be -1, see validate_cast_type_and_extract_length().
   set_data_type_string((uint32)(cast_length >= 0
                                     ? cast_length
                                     : cast_cs == &my_charset_bin
@@ -3591,7 +3613,7 @@
       if (num_set_values > 64) num_set_values = 64;
       if (current_thd->is_error() || args[4]->null_value) return error_str();
 
-      /* Fall through */
+      [[fallthrough]];
     case 4:
       sep = eval_string_arg(collation.collation, args[3], &sep_buf);
       if (sep == nullptr) return error_str();
@@ -3636,13 +3658,15 @@
   if (param_type_is_default(thd, 1, 4)) return true;
   if (param_type_is_default(thd, 4, 5, MYSQL_TYPE_LONGLONG)) return true;
 
-  ulonglong length =
-      max(args[1]->max_char_length(), args[2]->max_char_length());
-  ulonglong sep_length = (arg_count > 3 ? args[3]->max_char_length() : 1);
-
   if (agg_arg_charsets_for_string_result(collation, args + 1,
                                          min(4U, arg_count) - 1))
     return true;
+
+  ulonglong length = max(args[1]->max_char_length(collation.collation),
+                         args[2]->max_char_length(collation.collation));
+  ulonglong sep_length =
+      (arg_count > 3 ? args[3]->max_char_length(collation.collation) : 1);
+
   set_data_type_string(length * 64U + sep_length * 63U);
   set_nullable(is_nullable() || max_length > thd->variables.max_allowed_packet);
   return false;
@@ -3878,9 +3902,16 @@
                      res->length());
 }
 
+bool Item_func_compress::resolve_type(THD *thd) {
+  if (Item_str_func::resolve_type(thd)) return true;
+  // Adding 5 for length and one possible extra byte. See val_str().
+  set_data_type_string(
+      5ULL + static_cast<ulonglong>(compressBound(args[0]->max_length)));
+  return false;
+}
+
 String *Item_func_compress::val_str(String *str) {
   int err = Z_OK, code;
-  ulong new_size;
   String *res;
   Byte *body;
   char *last_char;
@@ -3893,16 +3924,7 @@
   null_value = false;
   if (res->is_empty()) return res;
 
-  /*
-    Citation from zlib.h (comment for compress function):
-
-    Compresses the source buffer into the destination buffer.  sourceLen is
-    the byte length of the source buffer. Upon entry, destLen is the total
-    size of the destination buffer, which must be at least 0.1% larger than
-    sourceLen plus 12 bytes.
-    We assume here that the buffer can't grow more than .25 %.
-  */
-  new_size = res->length() + res->length() / 5 + 12;
+  ulong new_size = compressBound(res->length());
 
   // Check new_size overflow: new_size <= res->length()
   if (((new_size + 5) <= res->length()) ||
diff -Nru mysql-8.0-8.0.26/sql/item_strfunc.h mysql-8.0-8.0.27/sql/item_strfunc.h
--- mysql-8.0-8.0.26/sql/item_strfunc.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/item_strfunc.h	2021-09-28 11:46:34.000000000 +0000
@@ -119,7 +119,7 @@
     return get_time_from_string(ltime);
   }
   enum Item_result result_type() const override { return STRING_RESULT; }
-  void left_right_max_length();
+  void left_right_max_length(THD *thd);
   bool fix_fields(THD *thd, Item **ref) override;
   bool resolve_type(THD *thd) override {
     if (param_type_is_default(thd, 0, -1)) return true;
@@ -1169,11 +1169,7 @@
 
  public:
   Item_func_compress(const POS &pos, Item *a) : Item_str_func(pos, a) {}
-  bool resolve_type(THD *thd) override {
-    if (Item_str_func::resolve_type(thd)) return true;
-    set_data_type_string((args[0]->max_length * 120U) / 100U + 12U);
-    return false;
-  }
+  bool resolve_type(THD *thd) override;
   const char *func_name() const override { return "compress"; }
   String *val_str(String *str) override;
 };
diff -Nru mysql-8.0-8.0.26/sql/item_subselect.cc mysql-8.0-8.0.27/sql/item_subselect.cc
--- mysql-8.0-8.0.26/sql/item_subselect.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/item_subselect.cc	2021-09-28 11:46:34.000000000 +0000
@@ -307,9 +307,19 @@
   return Item_subselect::OTHER_ENGINE;
 }
 
-const QEP_TAB *Item_subselect::get_qep_tab() const {
+const TABLE *Item_subselect::get_table() const {
   return down_cast<subselect_hash_sj_engine *>(indexsubquery_engine)
-      ->get_qep_tab();
+      ->get_table();
+}
+
+const TABLE_REF &Item_subselect::get_table_ref() const {
+  return down_cast<subselect_hash_sj_engine *>(indexsubquery_engine)
+      ->get_table_ref();
+}
+
+join_type Item_subselect::get_join_type() const {
+  return down_cast<subselect_hash_sj_engine *>(indexsubquery_engine)
+      ->get_join_type();
 }
 
 void Item_subselect::cleanup() {
@@ -381,6 +391,10 @@
   if (unit->set_limit(thd, unit->global_parameters()))
     return true; /* purecov: inspected */
 
+  if (unit->finalize(thd)) {
+    return true;
+  }
+
   query_block->join->allow_outer_refs = true;  // for JOIN::set_prefix_tables()
   strategy = Subquery_strategy::SUBQ_EXISTS;
   return false;
@@ -449,6 +463,9 @@
   // This part is only relevant for the hypergraph optimizer.
   unit->change_to_access_path_without_in2exists(thd);
   assert(!in2exists_info->dependent_before);
+  if (unit->finalize(thd)) {
+    return true;
+  }
 
   join->query_block->uncacheable &= ~UNCACHEABLE_DEPENDENT;
   unit->uncacheable &= ~UNCACHEABLE_DEPENDENT;
@@ -492,7 +509,7 @@
         unit->first_query_block()->uncacheable |= UNCACHEABLE_DEPENDENT;
         unit->uncacheable |= UNCACHEABLE_DEPENDENT;
       }
-      // fall through
+      [[fallthrough]];
     case Subquery_strategy::SUBQ_EXISTS:
       /*
         Back to EXISTS_OR_MAT, so that next execution of this statement can
@@ -667,14 +684,24 @@
   // Normally, the unit would be optimized here, but statements like DO and SET
   // may still rely on lazy optimization. Also, we might not have iterators,
   // so make sure to create them if they're missing.
-  if (unit->is_optimized()) {
-    if (should_create_iterators) {
-      if (unit->force_create_iterators(thd)) return true;
-    }
-  } else {
+  if (!unit->is_optimized()) {
     if (unit->optimize(thd, /*materialize_destination=*/nullptr,
-                       should_create_iterators))
+                       /*create_iterators=*/false,
+                       /*finalize_access_paths=*/false))
       return true;
+
+    // NOTE: We defer finalization and creating iterators to the statements
+    // below; asking optimize() to finalize a plan with two choices
+    // (materialization and exists) rightfully causes a failed assertion. We
+    // should probably have made a cost-based choice between the two here, but
+    // as it stands, we will always implicitly choose in2exists in these cases
+    // (DO/SET).
+  }
+  if (should_create_iterators && unit->root_access_path() != nullptr) {
+    if (unit->finalize(thd)) {
+      return true;
+    }
+    if (unit->force_create_iterators(thd)) return true;
   }
   if (indexsubquery_engine != nullptr) {
     return indexsubquery_engine->exec(thd);
@@ -1091,6 +1118,21 @@
 
   Item *single_field = select->single_visible_field();
 
+  if (single_field != nullptr &&
+      single_field->type() == Item::VALUES_COLUMN_ITEM) {
+    /*
+      A subquery that is a VALUES clause can be used as a scalar subquery.
+      But VALUES clauses with a single row are transformed to their simple
+      components and will not be shown as VALUES_COLUMN_ITEM here.
+    */
+    assert(select->row_value_list->size() > 1);
+    /*
+      Since scalar subqueries can have at most one row, reject VALUES
+      clauses (with more than one row) immediately:
+    */
+    my_error(ER_SUBQUERY_NO_1_ROW, MYF(0));
+    return RES_ERROR;
+  }
   if (!unit->is_union() && !select->table_list.elements &&
       single_field != nullptr && !single_field->has_aggregation() &&
       !single_field->has_wf() && !select->where_cond() &&
@@ -1218,7 +1260,7 @@
     return retval;
   } else {
     reset();
-    return nullptr;
+    return error_decimal(decimal_value);
   }
 }
 
@@ -1493,7 +1535,7 @@
 */
 bool Item_exists_subselect::choose_semijoin_or_antijoin() {
   can_do_aj = false;
-  bool MY_ATTRIBUTE((unused)) might_do_sj = false, might_do_aj = false;
+  [[maybe_unused]] bool might_do_sj = false, might_do_aj = false;
   bool null_problem = false;
   switch (value_transform) {
     case BOOL_IS_TRUE:
@@ -2160,7 +2202,8 @@
   uint cols_num = left_expr->cols();
   bool is_having_used = select->having_cond() || select->with_sum_func ||
                         select->group_list.first ||
-                        !select->table_list.elements;
+                        !select->table_list.elements ||
+                        select->m_windows.elements > 0;
 
   DBUG_TRACE;
   OPT_TRACE_TRANSFORM(&thd->opt_trace, oto0, oto1, select->select_number,
@@ -2735,6 +2778,10 @@
                                            Item_singlerow_subselect *subquery) {
   int item_idx = 0;
   for (Item *item : select->visible_fields()) {
+    // All comparisons are done after unwrapping rollup group item.
+    // base_ref_items might be without rollup wrappers while the fields
+    // might be.
+    item = unwrap_rollup_group(item);
     if (item == subquery) {
       assert(select->base_ref_items[item_idx] == item);
       return &select->base_ref_items[item_idx];
@@ -3053,17 +3100,16 @@
 
 void subselect_indexsubquery_engine::print(const THD *thd, String *str,
                                            enum_query_type query_type) {
-  const bool unique = tab->type() == JT_EQ_REF;
-  const bool check_null = tab->type() == JT_REF_OR_NULL;
+  const bool unique = type == JT_EQ_REF;
+  const bool check_null = type == JT_REF_OR_NULL;
 
   if (unique)
     str->append(STRING_WITH_LEN("<primary_index_lookup>("));
   else
     str->append(STRING_WITH_LEN("<index_lookup>("));
-  tab->ref().items[0]->print(thd, str, query_type);
+  ref.items[0]->print(thd, str, query_type);
   str->append(STRING_WITH_LEN(" in "));
-  TABLE *const table = tab->table();
-  if (tab->table_ref && tab->table_ref->uses_materialization()) {
+  if (table_ref && table_ref->uses_materialization()) {
     /*
       For materialized derived tables/views use table/view alias instead of
       temporary table name, as it changes on each run and not acceptable for
@@ -3075,7 +3121,7 @@
     str->append(STRING_WITH_LEN("<temporary table>"));
   } else
     str->append(table->s->table_name.str, table->s->table_name.length);
-  KEY *key_info = table->key_info + tab->ref().key;
+  KEY *key_info = table->key_info + ref.key;
   str->append(STRING_WITH_LEN(" on "));
   str->append(key_info->name);
   if (check_null) str->append(STRING_WITH_LEN(" checking NULL"));
@@ -3129,8 +3175,8 @@
     the index allows at most one NULL row.
   - Create a new result sink that sends the result stream of the subquery to
     the temporary table,
-  - Create and initialize a new JOIN_TAB, and TABLE_REF objects to perform
-    lookups into the indexed temporary table.
+  - Create and initialize TABLE_REF objects to perform lookups into the
+    indexed temporary table.
 
   @param thd          thread handle
   @param tmp_columns  columns of temporary table
@@ -3198,32 +3244,25 @@
   /* 2. Create/initialize execution related objects. */
 
   /*
-    Create and initialize the JOIN_TAB that represents an index lookup
-    plan operator into the materialized subquery result. Notice that:
-    - this JOIN_TAB has no corresponding JOIN (and doesn't need one), and
-    - here we initialize only those members that are used by
-      subselect_indexsubquery_engine, so these objects are incomplete.
-  */
-
-  QEP_TAB_standalone *tmp_tab_st = new (thd->mem_root) QEP_TAB_standalone;
-  if (tmp_tab_st == nullptr) return true;
-  tab = &tmp_tab_st->as_QEP_TAB();
-  tab->set_table(tmp_table);
-  tab->ref().key = 0; /* The only temp table index. */
-  tab->ref().key_length = tmp_key->key_length;
-  tab->set_type((tmp_table->key_info[0].flags & HA_NOSAME) ? JT_EQ_REF
-                                                           : JT_REF);
-  if (!(tab->ref().key_buff = (uchar *)thd->mem_calloc(key_length)) ||
-      !(tab->ref().key_copy =
+    Create and initialize the TABLE_REF used by the index lookup
+    iterator into the materialized subquery result.
+  */
+
+  table = tmp_table;
+  ref.key = 0; /* The only temp table index. */
+  ref.key_length = tmp_key->key_length;
+  type = (tmp_table->key_info[0].flags & HA_NOSAME) ? JT_EQ_REF : JT_REF;
+  if (!(ref.key_buff = (uchar *)thd->mem_calloc(key_length)) ||
+      !(ref.key_copy =
             (store_key **)thd->alloc((sizeof(store_key *) * tmp_key_parts))) ||
-      !(tab->ref().items = (Item **)thd->alloc(sizeof(Item *) * tmp_key_parts)))
+      !(ref.items = (Item **)thd->alloc(sizeof(Item *) * tmp_key_parts)))
     return true;
 
   if (tmp_table->hash_field) {
-    tab->ref().keypart_hash = &hash;
+    ref.keypart_hash = &hash;
   }
 
-  uchar *cur_ref_buff = tab->ref().key_buff;
+  uchar *cur_ref_buff = ref.key_buff;
 
   /*
     Create an artificial condition to post-filter those rows matched by index
@@ -3262,13 +3301,12 @@
     Item_field *right_col_item;
     Field *field = tmp_table->visible_field_ptr()[part_no];
     const bool nullable = field->is_nullable();
-    tab->ref().items[part_no] = item->left_expr->element_index(part_no);
+    ref.items[part_no] = item->left_expr->element_index(part_no);
 
     if (!(right_col_item =
               new Item_field(thd, &tmp_table_ref->query_block->context,
                              tmp_table_ref, field)) ||
-        !(eq_cond =
-              new Item_func_eq(tab->ref().items[part_no], right_col_item)) ||
+        !(eq_cond = new Item_func_eq(ref.items[part_no], right_col_item)) ||
         ((Item_cond_and *)cond)->add(eq_cond)) {
       delete cond;
       cond = nullptr;
@@ -3276,11 +3314,11 @@
     }
 
     if (tmp_table->hash_field) {
-      tab->ref().key_copy[part_no] = new (thd->mem_root) store_key_hash_item(
-          thd, field, cur_ref_buff, nullptr, field->pack_length(),
-          tab->ref().items[part_no], &hash);
+      ref.key_copy[part_no] = new (thd->mem_root)
+          store_key_hash_item(thd, field, cur_ref_buff, nullptr,
+                              field->pack_length(), ref.items[part_no], &hash);
     } else {
-      tab->ref().key_copy[part_no] = new (thd->mem_root) store_key_item(
+      ref.key_copy[part_no] = new (thd->mem_root) store_key(
           thd, field,
           /* TODO:
              the NULL byte is taken into account in
@@ -3289,7 +3327,7 @@
              use that information instead.
            */
           cur_ref_buff + (nullable ? 1 : 0), nullable ? cur_ref_buff : nullptr,
-          key_parts[part_no].length, tab->ref().items[part_no]);
+          key_parts[part_no].length, ref.items[part_no]);
     }
     if (nullable &&  // nullable column in tmp table,
                      // and UNKNOWN should not be interpreted as FALSE
@@ -3297,10 +3335,10 @@
       // It must be the single column, or we wouldn't be here
       assert(tmp_key_parts == 1);
       // Be ready to search for NULL into inner column:
-      tab->ref().null_ref_key = cur_ref_buff;
+      ref.null_ref_key = cur_ref_buff;
       mat_table_has_nulls = NEX_UNKNOWN;
     } else {
-      tab->ref().null_ref_key = nullptr;
+      ref.null_ref_key = nullptr;
       mat_table_has_nulls = NEX_IRRELEVANT_OR_FALSE;
     }
 
@@ -3310,9 +3348,9 @@
       cur_ref_buff += key_parts[part_no].store_length;
   }
   tmp_table->pos_in_table_list = nullptr;
-  tab->ref().key_err = true;
-  tab->ref().key_parts = tmp_key_parts;
-  tab->table_ref = tmp_table_ref;
+  ref.key_err = true;
+  ref.key_parts = tmp_key_parts;
+  table_ref = tmp_table_ref;
 
   if (cond->fix_fields(thd, &cond)) return true;
 
@@ -3341,12 +3379,12 @@
   // (which would require the AlternativeIterator); subqueries with
   // JT_REF_OR_NULL are always transformed with IN-to-EXISTS, and thus,
   // their artificial HAVING rejects NULL values.
-  assert(tab->type() != JT_REF_OR_NULL);
-  AccessPath *path = NewRefAccessPath(thd, tab->table(), &tab->ref(),
+  assert(type != JT_REF_OR_NULL);
+  AccessPath *path = NewRefAccessPath(thd, table, &ref,
                                       /*use_order=*/false, /*reverse=*/false,
                                       /*count_examined_rows=*/false);
 
-  if (tab->type() == JT_EQ_REF && (cond != nullptr || having != nullptr)) {
+  if (type == JT_EQ_REF && (cond != nullptr || having != nullptr)) {
     path = NewLimitOffsetAccessPath(thd, path, /*limit=*/1, /*offset=*/0,
                                     /*count_all_rows=*/false,
                                     /* reject_multiple_rows=*/false,
@@ -3366,16 +3404,19 @@
     However, it works for the time being (partially because TABLE object's
     pos_in_table_list is nullptr).
   */
-  tab->table_ref->set_derived_query_expression(unit);
-  if (tab->table_ref->is_table_function()) {
+  table_ref->set_derived_query_expression(unit);
+  if (table_ref->is_table_function()) {
     path = NewMaterializedTableFunctionAccessPath(
-        thd, tab->table(), tab->table_ref->table_function, path);
+        thd, table, table_ref->table_function, path);
   } else {
-    path = GetAccessPathForDerivedTable(thd, tab, path);
+    path = GetAccessPathForDerivedTable(
+        thd, table_ref, table, /*rematerialize=*/false,
+        /*invalidators=*/nullptr, /*need_rowid=*/false, path);
   }
 
   m_root_access_path = path;
   JOIN *join = unit->is_union() ? nullptr : unit->first_query_block()->join;
+  unit->finalize(thd);
   m_iterator = CreateIteratorFromAccessPath(thd, path, join,
                                             /*eligible_for_batch_mode=*/true);
 
@@ -3385,7 +3426,7 @@
 
 subselect_hash_sj_engine::~subselect_hash_sj_engine() {
   /* Assure that cleanup has been called for this engine. */
-  assert(!tab);
+  assert(!table);
 
   destroy(result);
 }
@@ -3402,18 +3443,25 @@
   DEBUG_SYNC(thd, "before_index_end_in_subselect");
   m_root_access_path = nullptr;
   m_iterator.reset();
-  if (tab != nullptr) {
-    TABLE *const table = tab->table();
+  if (table != nullptr) {
     if (table->file->inited)
       table->file->ha_index_end();  // Close the scan over the index
     close_tmp_table(table);
     free_tmp_table(table);
     // Note that tab->qep_cleanup() is not called
-    tab = nullptr;
+    table = nullptr;
   }
   if (unit->is_executed()) unit->reset_executed();
 }
 
+static int safe_index_read(TABLE *table, const TABLE_REF &ref) {
+  int error = table->file->ha_index_read_map(
+      table->record[0], ref.key_buff, make_prev_keypart_map(ref.key_parts),
+      HA_READ_KEY_EXACT);
+  if (error) return report_handler_error(table, error);
+  return 0;
+}
+
 /**
   Execute a subquery IN predicate via materialization.
 
@@ -3425,7 +3473,6 @@
 */
 
 bool subselect_hash_sj_engine::exec(THD *thd) {
-  TABLE *const table = tab->table();
   DBUG_TRACE;
 
   /*
@@ -3516,12 +3563,12 @@
     if (mat_table_has_nulls == NEX_UNKNOWN)  // We do not know yet
     {
       // Search for NULL inside tmp table, and remember the outcome.
-      *tab->ref().null_ref_key = 1;
+      *ref.null_ref_key = 1;
       if (!table->file->inited &&
-          table->file->ha_index_init(tab->ref().key, false /* sorted */))
+          table->file->ha_index_init(ref.key, false /* sorted */))
         return true;
-      if (safe_index_read(tab) == 1) return true;
-      *tab->ref().null_ref_key = 0;  // prepare for next searches of non-NULL
+      if (safe_index_read(table, ref) == 1) return true;
+      *ref.null_ref_key = 0;  // prepare for next searches of non-NULL
       mat_table_has_nulls =
           table->has_row() ? NEX_TRUE : NEX_IRRELEVANT_OR_FALSE;
     }
@@ -3548,7 +3595,7 @@
   str->append(STRING_WITH_LEN(" <materialize> ("));
   unit->print(thd, str, query_type);
   str->append(STRING_WITH_LEN(" ), "));
-  if (tab)
+  if (table)
     subselect_indexsubquery_engine::print(thd, str, query_type);
   else
     str->append(
diff -Nru mysql-8.0-8.0.26/sql/item_subselect.h mysql-8.0-8.0.27/sql/item_subselect.h
--- mysql-8.0-8.0.26/sql/item_subselect.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/item_subselect.h	2021-09-28 11:46:34.000000000 +0000
@@ -47,6 +47,7 @@
 #include "sql/parse_tree_node_base.h"
 #include "sql/row_iterator.h"  // IWYU pragma: keep
 #include "sql/sql_const.h"
+#include "sql/sql_opt_exec_shared.h"
 #include "template_utils.h"
 
 class Comp_creator;
@@ -56,7 +57,6 @@
 class JOIN;
 class Json_wrapper;
 class PT_subquery;
-class QEP_TAB;
 class Query_result_interceptor;
 class Query_result_subquery;
 class Query_result_union;
@@ -117,7 +117,9 @@
   enum_engine_type engine_type() const;
 
   // For EXPLAIN. Only valid if engine_type() == HASH_SJ_ENGINE.
-  const QEP_TAB *get_qep_tab() const;
+  const TABLE *get_table() const;
+  const TABLE_REF &get_table_ref() const;
+  join_type get_join_type() const;
 
   void create_iterators(THD *thd);
   virtual AccessPath *root_access_path() const { return nullptr; }
@@ -797,7 +799,10 @@
  protected:
   Query_result_union *result = nullptr; /* results storage class */
   /// Table which is read, using one of eq_ref, ref, ref_or_null.
-  QEP_TAB *tab;
+  TABLE *table{nullptr};
+  TABLE_LIST *table_ref{nullptr};
+  TABLE_REF ref;
+  join_type type{JT_UNKNOWN};
   Item *cond;     /* The WHERE condition of subselect */
   ulonglong hash; /* Hash value calculated by RefIterator, when needed. */
   /*
@@ -817,9 +822,17 @@
  public:
   enum enum_engine_type { INDEXSUBQUERY_ENGINE, HASH_SJ_ENGINE };
 
-  subselect_indexsubquery_engine(QEP_TAB *tab_arg, Item_in_subselect *subs,
-                                 Item *where, Item *having_arg)
-      : tab(tab_arg), cond(where), having(having_arg), item(subs) {}
+  subselect_indexsubquery_engine(TABLE *table, TABLE_LIST *table_ref,
+                                 const TABLE_REF &ref, enum join_type join_type,
+                                 Item_in_subselect *subs, Item *where,
+                                 Item *having_arg)
+      : table(table),
+        table_ref(table_ref),
+        ref(ref),
+        type(join_type),
+        cond(where),
+        having(having_arg),
+        item(subs) {}
   virtual ~subselect_indexsubquery_engine() = default;
   virtual bool exec(THD *thd);
   virtual void print(const THD *thd, String *str, enum_query_type query_type);
@@ -873,7 +886,8 @@
  public:
   subselect_hash_sj_engine(Item_in_subselect *in_predicate,
                            Query_expression *unit_arg)
-      : subselect_indexsubquery_engine(nullptr, in_predicate, nullptr, nullptr),
+      : subselect_indexsubquery_engine(nullptr, nullptr, {}, JT_UNKNOWN,
+                                       in_predicate, nullptr, nullptr),
         is_materialized(false),
         unit(unit_arg) {}
   ~subselect_hash_sj_engine() override;
@@ -884,7 +898,9 @@
   void print(const THD *thd, String *str, enum_query_type query_type) override;
   enum_engine_type engine_type() const override { return HASH_SJ_ENGINE; }
 
-  const QEP_TAB *get_qep_tab() const { return tab; }
+  TABLE *get_table() const { return table; }
+  const TABLE_REF &get_table_ref() const { return ref; }
+  enum join_type get_join_type() const { return type; }
   AccessPath *root_access_path() const { return m_root_access_path; }
   void create_iterators(THD *thd) override;
 };
diff -Nru mysql-8.0-8.0.26/sql/item_sum.cc mysql-8.0-8.0.27/sql/item_sum.cc
--- mysql-8.0-8.0.26/sql/item_sum.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/item_sum.cc	2021-09-28 11:46:34.000000000 +0000
@@ -33,6 +33,7 @@
 #include <bitset>
 #include <cstring>
 #include <functional>
+#include <optional>
 #include <string>
 #include <utility>  // std::forward
 
@@ -313,6 +314,18 @@
     return true;
   }
 
+  for (uint i = 0; i < arg_count; i++) {
+    if (args[i]->has_aggregation() &&
+        WalkItem(args[i], enum_walk::SUBQUERY_POSTFIX, [this](Item *subitem) {
+          if (subitem->type() != Item::SUM_FUNC_ITEM) return false;
+          Item_sum *si = down_cast<Item_sum *>(subitem);
+          return si->aggr_query_block == this->aggr_query_block;
+        })) {
+      my_error(ER_INVALID_GROUP_FUNC_USE, MYF(0));
+      return true;
+    }
+  }
+
   if (aggr_query_block != base_query_block) {
     referenced_by[0] = ref;
     /*
@@ -546,6 +559,17 @@
       if (aggr_query_block->inner_sum_func_list == this)
         aggr_query_block->inner_sum_func_list = prev;
     }
+    // Replace the removed item with a NULL value. Perform a replace rather
+    // than a removal so that the size of the array stays the same. A hidden
+    // NULL value will not affect processing of the query block.
+    for (size_t i = 0; i < aggr_query_block->fields.size(); i++) {
+      if (aggr_query_block->fields[i] == this) {
+        Item_null *null_item = new Item_null();
+        null_item->hidden = true;
+        aggr_query_block->fields[i] = null_item;
+        break;
+      }
+    }
   }
 
   return false;
@@ -826,7 +850,7 @@
   forced_const = false;
 }
 
-bool Item_sum::fix_fields(THD *thd, Item **ref MY_ATTRIBUTE((unused))) {
+bool Item_sum::fix_fields(THD *thd, Item **ref [[maybe_unused]]) {
   assert(fixed == 0);
   if (m_window != nullptr) {
     if (m_window_resolved) return false;
@@ -939,7 +963,7 @@
       break;
     case INT_RESULT:
       table_field_type = MYSQL_TYPE_LONGLONG;
-      /* fallthrough */
+      [[fallthrough]];
     case DECIMAL_RESULT:
       if (table_field_type != MYSQL_TYPE_LONGLONG)
         table_field_type = MYSQL_TYPE_NEWDECIMAL;
@@ -2697,6 +2721,11 @@
   m_saved_last_value_at = 0;
 }
 
+void Item_sum_hybrid::update_after_wf_arguments_changed(THD *) {
+  value->setup(args[0]);
+  arg_cache->setup(args[0]);
+}
+
 bool Item_sum_hybrid::check_wf_semantics1(THD *thd, Query_block *select,
                                           Window_evaluation_requirements *r) {
   bool result = Item_sum::check_wf_semantics1(thd, select, r);
@@ -2965,7 +2994,7 @@
     replaced with aggregate ref's in split_sum_func. So need to redo the cache
     setup.
   */
-  arg_cache->setup(args[0]);
+  update_after_wf_arguments_changed(thd);
 }
 
 void Item_sum_hybrid::cleanup() {
@@ -4003,7 +4032,7 @@
   Append data from current leaf to item->result.
 */
 
-int dump_leaf_key(void *key_arg, element_count count MY_ATTRIBUTE((unused)),
+int dump_leaf_key(void *key_arg, element_count count [[maybe_unused]],
                   void *item_arg) {
   DBUG_TRACE;
   Item_func_group_concat *item = (Item_func_group_concat *)item_arg;
@@ -4653,6 +4682,19 @@
 
 void Item_row_number::clear() { m_ctr = 0; }
 
+void Item_rank::update_after_wf_arguments_changed(THD *thd) {
+  const PT_order_list *order = m_window->effective_order_by();
+  if (!order) return;
+  ORDER *o = order->value.first;
+  for (unsigned i = 0; i < m_previous.size(); ++i, o = o->next) {
+    if (thd->lex->is_exec_started())
+      thd->change_item_tree(m_previous[i]->get_item_ptr(),
+                            (*o->item)->real_item());
+    else
+      *m_previous[i]->get_item_ptr() = (*o->item)->real_item();
+  }
+}
+
 bool Item_rank::check_wf_semantics1(THD *thd, Query_block *select,
                                     Window_evaluation_requirements *) {
   const PT_order_list *order = m_window->effective_order_by();
@@ -4679,14 +4721,11 @@
 
   bool change = false;
   if (m_window->has_windowing_steps()) {
-    List_iterator<Cached_item> li(m_previous);
-    Cached_item *item;
-
     /*
       Check if any of the ORDER BY expressions have changed. If so, we
       need to update the rank, considering any duplicates.
     */
-    while ((item = li++)) {
+    for (Cached_item *item : m_previous) {
       change |= item->cmp();
     }
   }
@@ -4724,19 +4763,15 @@
 
   // Reset comparator
   if (m_window->has_windowing_steps()) {
-    List_iterator<Cached_item> li(m_previous);
-    Cached_item *item;
-    while ((item = li++)) {
+    for (Cached_item *item : m_previous) {
       item->cmp();  // set baseline
     }
   }  // if no windowing steps, no comparison needed.
 }
 
 Item_rank::~Item_rank() {
-  List_iterator<Cached_item> li(m_previous);
-  Cached_item *ci;
-  while ((ci = li++)) {
-    ci->~Cached_item();
+  for (Cached_item *ci : m_previous) {
+    destroy(ci);
   }
   m_previous.clear();
 }
@@ -5011,7 +5046,7 @@
                                            mem_root_deque<Item *> *fields) {
   super::split_sum_func(thd, ref_item_array, fields);
   // Need to redo this now:
-  m_value->setup(args[0]);
+  update_after_wf_arguments_changed(thd);
 }
 
 bool Item_first_last_value::setup_first_last() {
@@ -5031,6 +5066,10 @@
   cnt = 0;
 }
 
+void Item_first_last_value::update_after_wf_arguments_changed(THD *) {
+  m_value->setup(args[0]);
+}
+
 bool Item_first_last_value::compute() {
   cnt++;
 
@@ -5182,7 +5221,7 @@
                                     mem_root_deque<Item *> *fields) {
   super::split_sum_func(thd, ref_item_array, fields);
   // If function was set up, need to redo this now:
-  m_value->setup(args[0]);
+  update_after_wf_arguments_changed(thd);
 }
 
 bool Item_nth_value::setup_nth() {
@@ -5202,6 +5241,10 @@
   m_cnt = 0;
 }
 
+void Item_nth_value::update_after_wf_arguments_changed(THD *) {
+  m_value->setup(args[0]);
+}
+
 bool Item_nth_value::check_wf_semantics1(THD *thd, Query_block *select,
                                          Window_evaluation_requirements *r) {
   if (super::check_wf_semantics1(thd, select, r)) return true;
@@ -5423,8 +5466,7 @@
                                    mem_root_deque<Item *> *fields) {
   super::split_sum_func(thd, ref_item_array, fields);
   // If function was set up, need to redo these now:
-  m_value->setup(args[0]);
-  if (m_default != nullptr) m_default->setup(args[2]);
+  update_after_wf_arguments_changed(thd);
 }
 
 bool Item_lead_lag::setup_lead_lag() {
@@ -5443,9 +5485,9 @@
   return false;
 }
 
-bool Item_lead_lag::check_wf_semantics1(
-    THD *thd MY_ATTRIBUTE((unused)), Query_block *select MY_ATTRIBUTE((unused)),
-    Window_evaluation_requirements *r) {
+bool Item_lead_lag::check_wf_semantics1(THD *thd [[maybe_unused]],
+                                        Query_block *select [[maybe_unused]],
+                                        Window_evaluation_requirements *r) {
   if (m_null_treatment == NT_IGNORE_NULLS) {
     my_error(ER_NOT_SUPPORTED_YET, MYF(0), "IGNORE NULLS");
     return true;
@@ -5462,6 +5504,11 @@
   m_use_default = false;
 }
 
+void Item_lead_lag::update_after_wf_arguments_changed(THD *) {
+  m_value->setup(args[0]);
+  if (m_default != nullptr) m_default->setup(args[2]);
+}
+
 longlong Item_lead_lag::val_int() {
   if (wf_common_init()) return 0;
 
@@ -6306,7 +6353,7 @@
 void Item_sum_collect::clear() {
   m_geometrycollection.reset();
   null_value = true;
-  srid = Mysql::Nullable<gis::srid_t>{};
+  srid = std::optional<gis::srid_t>{};
 }
 
 bool Item_sum_collect::add() {
diff -Nru mysql-8.0-8.0.26/sql/item_sum.h mysql-8.0-8.0.27/sql/item_sum.h
--- mysql-8.0-8.0.26/sql/item_sum.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/item_sum.h	2021-09-28 11:46:34.000000000 +0000
@@ -33,6 +33,7 @@
 #include <cstdio>
 #include <map>
 #include <memory>
+#include <optional>
 #include <string>
 #include <vector>
 
@@ -50,7 +51,6 @@
 #include "mysql/udf_registration_types.h"
 #include "mysql_time.h"
 #include "mysqld_error.h"
-#include "nullable.h"
 #include "sql/enum_query_type.h"
 #include "sql/gis/geometries_cs.h"
 #include "sql/gis/wkb.h"
@@ -568,10 +568,10 @@
     Item_field *item = new Item_field(field);
     if (item == nullptr) return nullptr;
     // Aggregated fields have no reference to an underlying table
-    assert(item->orig_db_name() == nullptr &&
-           item->orig_table_name() == nullptr);
+    assert(item->original_db_name() == nullptr &&
+           item->original_table_name() == nullptr);
     // Break the connection to the original field since this is an aggregation
-    item->set_orig_field_name(nullptr);
+    item->set_original_field_name(nullptr);
     return item;
   }
   table_map used_tables() const override {
@@ -645,6 +645,18 @@
   bool fix_fields(THD *thd, Item **ref) override;
 
   /**
+    Signal to the function that its arguments may have changed,
+    and that any internal caches etc. based on those arguments
+    must be updated accordingly.
+
+    This is used by the hypergraph optimizer when it rewrites
+    arguments to window functions to take into account that they
+    have been materialized into temporary tables, or that they
+    should read their values from the framebuffer.
+  */
+  virtual void update_after_wf_arguments_changed(THD *) {}
+
+  /**
     Called to initialize the aggregator.
   */
 
@@ -700,8 +712,8 @@
     input parameters which can be '?' and must be >=0: value isn't known
     before execution phase).
   */
-  virtual bool check_wf_semantics2(
-      Window_evaluation_requirements *reqs MY_ATTRIBUTE((unused))) {
+  virtual bool check_wf_semantics2(Window_evaluation_requirements *reqs
+                                   [[maybe_unused]]) {
     return false;
   }
 
@@ -710,6 +722,7 @@
 
   void cleanup() override;
 
+  Window *window() { return m_window; }
   const Window *window() const { return m_window; }
   bool reset_wf_state(uchar *arg) override;
 
@@ -1627,6 +1640,7 @@
  public:
   bool fix_fields(THD *, Item **) override;
   void clear() override;
+  void update_after_wf_arguments_changed(THD *thd) override;
   void split_sum_func(THD *thd, Ref_item_array ref_item_array,
                       mem_root_deque<Item *> *fields) override;
   double val_real() override;
@@ -2060,7 +2074,7 @@
                                        const void *key2);
 int group_concat_key_cmp_with_order(const void *arg, const void *key1,
                                     const void *key2);
-int dump_leaf_key(void *key_arg, element_count count MY_ATTRIBUTE((unused)),
+int dump_leaf_key(void *key_arg, element_count count [[maybe_unused]],
                   void *item_arg);
 
 class Item_func_group_concat final : public Item_sum {
@@ -2116,8 +2130,7 @@
                                                 const void *key2);
   friend int group_concat_key_cmp_with_order(const void *arg, const void *key1,
                                              const void *key2);
-  friend int dump_leaf_key(void *key_arg,
-                           element_count count MY_ATTRIBUTE((unused)),
+  friend int dump_leaf_key(void *key_arg, element_count count [[maybe_unused]],
                            void *item_arg);
 
  public:
@@ -2235,7 +2248,7 @@
   const char *func_name() const override { return "row_number"; }
   enum Sumfunctype sum_func() const override { return ROW_NUMBER_FUNC; }
 
-  bool resolve_type(THD *thd MY_ATTRIBUTE((unused))) override {
+  bool resolve_type(THD *thd [[maybe_unused]]) override {
     set_data_type_longlong();
     return false;
   }
@@ -2265,16 +2278,15 @@
   // Execution state variables
   ulonglong m_rank_ctr;    ///< Increment when window order columns change
   ulonglong m_duplicates;  ///< Needed to make RANK different from DENSE_RANK
-  List<Cached_item> m_previous;  ///< Values of previous row's ORDER BY items
+  Mem_root_array<Cached_item *>
+      m_previous;  ///< Values of previous row's ORDER BY items
  public:
   Item_rank(const POS &pos, bool dense, PT_window *w)
       : Item_non_framing_wf(pos, w),
         m_dense(dense),
         m_rank_ctr(0),
         m_duplicates(0),
-        m_previous()
-
-  {
+        m_previous(*THR_MALLOC) {
     unsigned_flag = true;
   }
 
@@ -2288,7 +2300,7 @@
     return m_dense ? DENSE_RANK_FUNC : RANK_FUNC;
   }
 
-  bool resolve_type(THD *thd MY_ATTRIBUTE((unused))) override {
+  bool resolve_type(THD *thd [[maybe_unused]]) override {
     set_data_type_longlong();
     return false;
   }
@@ -2298,6 +2310,7 @@
   my_decimal *val_decimal(my_decimal *buff) override;
   String *val_str(String *) override;
 
+  void update_after_wf_arguments_changed(THD *thd) override;
   bool check_wf_semantics1(THD *thd, Query_block *select,
                            Window_evaluation_requirements *reqs) override;
   /**
@@ -2319,7 +2332,7 @@
   const char *func_name() const override { return "cume_dist"; }
   enum Sumfunctype sum_func() const override { return CUME_DIST_FUNC; }
 
-  bool resolve_type(THD *thd MY_ATTRIBUTE((unused))) override {
+  bool resolve_type(THD *thd [[maybe_unused]]) override {
     set_data_type_double();
     return false;
   }
@@ -2360,7 +2373,7 @@
   const char *func_name() const override { return "percent_rank"; }
   enum Sumfunctype sum_func() const override { return PERCENT_RANK_FUNC; }
 
-  bool resolve_type(THD *thd MY_ATTRIBUTE((unused))) override {
+  bool resolve_type(THD *thd [[maybe_unused]]) override {
     set_data_type_double();
     return false;
   }
@@ -2458,6 +2471,7 @@
 
   bool resolve_type(THD *thd) override;
   bool fix_fields(THD *thd, Item **items) override;
+  void update_after_wf_arguments_changed(THD *thd) override;
   void clear() override;
   bool check_wf_semantics1(THD *thd, Query_block *select,
                            Window_evaluation_requirements *reqs) override;
@@ -2534,6 +2548,7 @@
 
   bool resolve_type(THD *thd) override;
   bool fix_fields(THD *thd, Item **items) override;
+  void update_after_wf_arguments_changed(THD *thd) override;
   void clear() override;
   bool check_wf_semantics1(THD *thd, Query_block *select,
                            Window_evaluation_requirements *reqs) override;
@@ -2600,6 +2615,7 @@
 
   bool resolve_type(THD *thd) override;
   bool fix_fields(THD *thd, Item **items) override;
+  void update_after_wf_arguments_changed(THD *thd) override;
   bool setup_nth();
   void clear() override;
 
@@ -2681,6 +2697,7 @@
     base_query_block = master()->base_query_block;
     aggr_query_block = master()->aggr_query_block;
     hidden = master()->hidden;
+    set_nullable(master()->is_nullable());
     set_distinct(master()->has_with_distinct());
     set_data_type_from_item(master());
   }
@@ -2758,7 +2775,7 @@
 
 class Item_sum_collect : public Item_sum {
  private:
-  Mysql::Nullable<gis::srid_t> srid;
+  std::optional<gis::srid_t> srid;
   std::unique_ptr<gis::Geometrycollection> m_geometrycollection;
   void pop_front();
 
diff -Nru mysql-8.0-8.0.26/sql/item_timefunc.cc mysql-8.0-8.0.27/sql/item_timefunc.cc
--- mysql-8.0-8.0.26/sql/item_timefunc.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/item_timefunc.cc	2021-09-28 11:46:34.000000000 +0000
@@ -277,7 +277,7 @@
         case 'I':
         case 'l':
           usa_time = true;
-          /* fall through */
+          [[fallthrough]];
         case 'k':
         case 'H':
           tmp = val + min(2, val_len);
@@ -2133,8 +2133,9 @@
     Converts current time in my_time_t to MYSQL_TIME represenatation for local
     time zone. Defines time zone (local) used for whole SYSDATE function.
 */
-bool Item_func_sysdate_local::get_date(
-    MYSQL_TIME *now_time, my_time_flags_t fuzzy_date MY_ATTRIBUTE((unused))) {
+bool Item_func_sysdate_local::get_date(MYSQL_TIME *now_time,
+                                       my_time_flags_t fuzzy_date
+                                       [[maybe_unused]]) {
   THD *thd = current_thd;
   ulonglong tmp = my_micro_time();
   thd->time_zone()->gmt_sec_to_TIME(now_time, (my_time_t)(tmp / 1000000));
@@ -2334,8 +2335,9 @@
   return false;
 }
 
-bool Item_func_from_unixtime::get_date(
-    MYSQL_TIME *ltime, my_time_flags_t fuzzy_date MY_ATTRIBUTE((unused))) {
+bool Item_func_from_unixtime::get_date(MYSQL_TIME *ltime,
+                                       my_time_flags_t fuzzy_date
+                                       [[maybe_unused]]) {
   THD *thd = current_thd;
   lldiv_t lld;
   if (decimals) {
@@ -2384,8 +2386,9 @@
   return false;
 }
 
-bool Item_func_convert_tz::get_date(
-    MYSQL_TIME *ltime, my_time_flags_t fuzzy_date MY_ATTRIBUTE((unused))) {
+bool Item_func_convert_tz::get_date(MYSQL_TIME *ltime,
+                                    my_time_flags_t fuzzy_date
+                                    [[maybe_unused]]) {
   my_time_t my_time_tmp;
   String str;
   THD *thd = current_thd;
@@ -3491,7 +3494,7 @@
   set_data_type_datetime(DATETIME_MAX_DECIMALS);
   sql_mode = thd->variables.sql_mode &
              (MODE_NO_ZERO_DATE | MODE_NO_ZERO_IN_DATE | MODE_INVALID_DATES);
-  if (args[1]->const_item()) {
+  if (args[1]->const_item() && args[1]->may_eval_const_item(thd)) {
     char format_buff[64];
     String format_str(format_buff, sizeof(format_buff), &my_charset_bin);
     String *format = args[1]->val_str(&format_str);
diff -Nru mysql-8.0-8.0.26/sql/item_timefunc.h mysql-8.0-8.0.27/sql/item_timefunc.h
--- mysql-8.0-8.0.26/sql/item_timefunc.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/item_timefunc.h	2021-09-28 11:46:34.000000000 +0000
@@ -269,6 +269,7 @@
       : Item_int_func(pos, a, b) {}
   longlong val_int() override;
   const char *func_name() const override { return "yearweek"; }
+  enum Functype functype() const override { return YEARWEEK_FUNC; }
   bool resolve_type(THD *thd) override;
   bool check_partition_func_processor(uchar *) override { return false; }
   bool check_valid_arguments_processor(uchar *) override {
@@ -1491,6 +1492,7 @@
   }
   const char *func_name() const override { return "makedate"; }
   bool get_date(MYSQL_TIME *ltime, my_time_flags_t fuzzy_date) override;
+  enum Functype functype() const override { return MAKEDATE_FUNC; }
   bool resolve_type(THD *thd) override {
     if (param_type_is_default(thd, 0, -1, MYSQL_TYPE_LONGLONG)) return true;
     return Item_date_func::resolve_type(thd);
diff -Nru mysql-8.0-8.0.26/sql/item_xmlfunc.cc mysql-8.0-8.0.27/sql/item_xmlfunc.cc
--- mysql-8.0-8.0.26/sql/item_xmlfunc.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/item_xmlfunc.cc	2021-09-28 11:46:34.000000000 +0000
@@ -2037,7 +2037,7 @@
         xpath->item = new Item_func_mul(prev, xpath->item);
         break;
       case MY_XPATH_LEX_DIV:
-        xpath->item = new Item_func_int_div(prev, xpath->item);
+        xpath->item = new Item_func_div_int(prev, xpath->item);
         break;
       case MY_XPATH_LEX_MOD:
         xpath->item = new Item_func_mod(prev, xpath->item);
diff -Nru mysql-8.0-8.0.26/sql/join_optimizer/access_path.cc mysql-8.0-8.0.27/sql/join_optimizer/access_path.cc
--- mysql-8.0-8.0.26/sql/join_optimizer/access_path.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/join_optimizer/access_path.cc	2021-09-28 11:46:34.000000000 +0000
@@ -106,29 +106,42 @@
   }
 }
 
-table_map GetUsedTableMap(const AccessPath *path) {
+table_map GetUsedTableMap(const AccessPath *path, bool include_pruned_tables) {
   table_map tmap = 0;
-  WalkTablesUnderAccessPath(const_cast<AccessPath *>(path),
-                            [&tmap](TABLE *table) {
-                              if (table->pos_in_table_list == nullptr) {
-                                // Materialization within a JOIN (e.g., for
-                                // sorting). The table won't have a map, so the
-                                // caller will need to find the table manually.
-                                tmap |= RAND_TABLE_BIT;
-                              } else {
-                                tmap |= table->pos_in_table_list->map();
-                              }
-                              return false;
-                            });
+  WalkTablesUnderAccessPath(
+      const_cast<AccessPath *>(path),
+      [&tmap](TABLE *table) {
+        if (table->pos_in_table_list == nullptr) {
+          // Materialization within a JOIN (e.g., for sorting). The table won't
+          // have a map, so the caller will need to find the table manually.
+          tmap |= RAND_TABLE_BIT;
+        } else {
+          tmap |= table->pos_in_table_list->map();
+        }
+        return false;
+      },
+      include_pruned_tables);
   return tmap;
 }
 
-static Prealloced_array<TABLE *, 4> GetUsedTables(AccessPath *child) {
+static Prealloced_array<TABLE *, 4> GetUsedTables(AccessPath *child,
+                                                  bool include_pruned_tables) {
   Prealloced_array<TABLE *, 4> tables{PSI_NOT_INSTRUMENTED};
-  WalkTablesUnderAccessPath(child, [&tables](TABLE *table) {
-    tables.push_back(table);
-    return false;
-  });
+  WalkTablesUnderAccessPath(
+      child,
+      [&tables](TABLE *table) {
+        tables.push_back(table);
+        return false;
+      },
+      include_pruned_tables);
+  return tables;
+}
+
+Mem_root_array<TABLE *> CollectTables(THD *thd, AccessPath *root_path) {
+  Mem_root_array<TABLE *> tables(thd->mem_root);
+  WalkTablesUnderAccessPath(
+      root_path, [&tables](TABLE *table) { return tables.push_back(table); },
+      /*include_pruned_tables=*/true);
   return tables;
 }
 
@@ -164,12 +177,12 @@
   }
 }
 
-void FinalizeMaterializedSubqueries(THD *thd, JOIN *join, AccessPath *path) {
+bool FinalizeMaterializedSubqueries(THD *thd, JOIN *join, AccessPath *path) {
   if (path->type != AccessPath::FILTER ||
       !path->filter().materialize_subqueries) {
-    return;
+    return false;
   }
-  WalkItem(
+  return WalkItem(
       path->filter().condition, enum_walk::POSTFIX, [thd, join](Item *item) {
         if (!IsItemInSubSelect(item)) {
           return false;
@@ -180,8 +193,10 @@
                                                         join->query_block)) {
           return false;
         }
-        item_subs->finalize_materialization_transform(thd,
-                                                      subquery_block->join);
+        if (item_subs->finalize_materialization_transform(
+                thd, subquery_block->join)) {
+          return true;
+        }
         item_subs->create_iterators(thd);
         return false;
       });
@@ -189,7 +204,12 @@
 
 unique_ptr_destroy_only<RowIterator> CreateIteratorFromAccessPath(
     THD *thd, AccessPath *path, JOIN *join, bool eligible_for_batch_mode) {
-  FinalizeMaterializedSubqueries(thd, join, path);
+  if (join != nullptr) {
+    assert(!join->needs_finalize);
+  }
+  if (FinalizeMaterializedSubqueries(thd, join, path)) {
+    return nullptr;
+  }
 
   unique_ptr_destroy_only<RowIterator> iterator;
 
@@ -255,7 +275,7 @@
       const auto &param = path->full_text_search();
       iterator = NewIterator<FullTextSearchIterator>(
           thd, param.table, param.ref, param.ft_func, param.use_order,
-          examined_rows);
+          param.use_limit, examined_rows);
       break;
     }
     case AccessPath::CONST_TABLE: {
@@ -269,8 +289,8 @@
       const auto &bka_param = param.bka_path->bka_join();
       iterator = NewIterator<MultiRangeRowIterator>(
           thd, param.table, param.ref, param.mrr_flags, bka_param.join_type,
-          GetUsedTables(bka_param.outer), bka_param.store_rowids,
-          bka_param.tables_to_get_rowid_for);
+          GetUsedTables(bka_param.outer, /*include_pruned_tables=*/true),
+          bka_param.store_rowids, bka_param.tables_to_get_rowid_for);
       break;
     }
     case AccessPath::FOLLOW_TAIL: {
@@ -304,11 +324,14 @@
       break;
     case AccessPath::ZERO_ROWS: {
       const auto &param = path->zero_rows();
-      unique_ptr_destroy_only<RowIterator> child =
-          param.child != nullptr
-              ? CreateIteratorFromAccessPath(thd, param.child, join,
-                                             /*eligible_for_batch_mode=*/false)
-              : nullptr;
+      unique_ptr_destroy_only<RowIterator> child;
+      if (param.child != nullptr) {
+        child = CreateIteratorFromAccessPath(thd, param.child, join,
+                                             /*eligible_for_batch_mode=*/false);
+        if (child == nullptr) {
+          return nullptr;
+        }
+      }
       iterator = NewIterator<ZeroRowsIterator>(thd, move(child));
       break;
     }
@@ -321,6 +344,9 @@
       unique_ptr_destroy_only<RowIterator> table_iterator =
           CreateIteratorFromAccessPath(thd, param.table_path, join,
                                        eligible_for_batch_mode);
+      if (table_iterator == nullptr) {
+        return nullptr;
+      }
       iterator = NewIterator<MaterializedTableFunctionIterator>(
           thd, param.table_function, param.table, move(table_iterator));
       break;
@@ -332,8 +358,14 @@
       const auto &param = path->nested_loop_join();
       unique_ptr_destroy_only<RowIterator> outer = CreateIteratorFromAccessPath(
           thd, param.outer, join, /*eligible_for_batch_mode=*/false);
+      if (outer == nullptr) {
+        return nullptr;
+      }
       unique_ptr_destroy_only<RowIterator> inner = CreateIteratorFromAccessPath(
           thd, param.inner, join, eligible_for_batch_mode);
+      if (inner == nullptr) {
+        return nullptr;
+      }
       iterator = NewIterator<NestedLoopIterator>(
           thd, move(outer), move(inner), param.join_type, param.pfs_batch_mode);
       break;
@@ -342,8 +374,14 @@
       const auto &param = path->nested_loop_semijoin_with_duplicate_removal();
       unique_ptr_destroy_only<RowIterator> outer = CreateIteratorFromAccessPath(
           thd, param.outer, join, /*eligible_for_batch_mode=*/false);
+      if (outer == nullptr) {
+        return nullptr;
+      }
       unique_ptr_destroy_only<RowIterator> inner = CreateIteratorFromAccessPath(
           thd, param.inner, join, eligible_for_batch_mode);
+      if (inner == nullptr) {
+        return nullptr;
+      }
       iterator = NewIterator<NestedLoopSemiJoinWithDuplicateRemovalIterator>(
           thd, move(outer), move(inner), param.table, param.key, param.key_len);
       break;
@@ -356,13 +394,20 @@
 
       unique_ptr_destroy_only<RowIterator> outer = CreateIteratorFromAccessPath(
           thd, param.outer, join, /*eligible_for_batch_mode=*/false);
+      if (outer == nullptr) {
+        return nullptr;
+      }
       unique_ptr_destroy_only<RowIterator> inner = CreateIteratorFromAccessPath(
           thd, param.inner, join, /*eligible_for_batch_mode=*/false);
+      if (inner == nullptr) {
+        return nullptr;
+      }
       MultiRangeRowIterator *mrr_iterator = down_cast<MultiRangeRowIterator *>(
           mrr_path->iterator->real_iterator());
       iterator = NewIterator<BKAIterator>(
-          thd, move(outer), GetUsedTables(param.outer), move(inner),
-          thd->variables.join_buff_size, param.mrr_length_per_rec,
+          thd, move(outer),
+          GetUsedTables(param.outer, /*include_pruned_tables=*/true),
+          move(inner), thd->variables.join_buff_size, param.mrr_length_per_rec,
           param.rec_per_key, param.store_rowids, param.tables_to_get_rowid_for,
           mrr_iterator, param.join_type);
       break;
@@ -372,8 +417,14 @@
       const JoinPredicate *join_predicate = param.join_predicate;
       unique_ptr_destroy_only<RowIterator> outer = CreateIteratorFromAccessPath(
           thd, param.outer, join, eligible_for_batch_mode);
+      if (outer == nullptr) {
+        return nullptr;
+      }
       unique_ptr_destroy_only<RowIterator> inner = CreateIteratorFromAccessPath(
           thd, param.inner, join, /*eligible_for_batch_mode=*/true);
+      if (inner == nullptr) {
+        return nullptr;
+      }
       vector<HashJoinCondition> conditions;
       for (Item_func_eq *cond : join_predicate->expr->equijoin_conditions) {
         conditions.emplace_back(HashJoinCondition(cond, thd->mem_root));
@@ -424,10 +475,13 @@
                                             : nullptr;
 
       iterator = NewIterator<HashJoinIterator>(
-          thd, move(inner), GetUsedTables(param.inner), estimated_build_rows,
-          move(outer), GetUsedTables(param.outer), param.store_rowids,
-          param.tables_to_get_rowid_for, thd->variables.join_buff_size,
-          move(conditions), param.allow_spill_to_disk, join_type,
+          thd, move(inner),
+          GetUsedTables(param.inner, /*include_pruned_tables=*/true),
+          estimated_build_rows, move(outer),
+          GetUsedTables(param.outer, /*include_pruned_tables=*/true),
+          param.store_rowids, param.tables_to_get_rowid_for,
+          thd->variables.join_buff_size, move(conditions),
+          param.allow_spill_to_disk, join_type,
           join_predicate->expr->join_conditions, probe_input_batch_mode,
           hash_table_generation);
       break;
@@ -436,6 +490,9 @@
       const auto &param = path->filter();
       unique_ptr_destroy_only<RowIterator> child = CreateIteratorFromAccessPath(
           thd, param.child, join, eligible_for_batch_mode);
+      if (child == nullptr) {
+        return nullptr;
+      }
       iterator = NewIterator<FilterIterator>(thd, move(child), param.condition);
       break;
     }
@@ -443,6 +500,9 @@
       const auto &param = path->sort();
       unique_ptr_destroy_only<RowIterator> child = CreateIteratorFromAccessPath(
           thd, param.child, join, /*eligible_for_batch_mode=*/true);
+      if (child == nullptr) {
+        return nullptr;
+      }
       ha_rows num_rows_estimate = param.child->num_output_rows < 0.0
                                       ? HA_POS_ERROR
                                       : lrint(param.child->num_output_rows);
@@ -463,7 +523,11 @@
       const auto &param = path->aggregate();
       unique_ptr_destroy_only<RowIterator> child = CreateIteratorFromAccessPath(
           thd, param.child, join, eligible_for_batch_mode);
-      Prealloced_array<TABLE *, 4> tables = GetUsedTables(param.child);
+      if (child == nullptr) {
+        return nullptr;
+      }
+      Prealloced_array<TABLE *, 4> tables =
+          GetUsedTables(param.child, /*include_pruned_tables=*/true);
       iterator = NewIterator<AggregateIterator>(
           thd, move(child), join,
           TableCollection(tables, /*store_rowids=*/false,
@@ -476,9 +540,15 @@
       unique_ptr_destroy_only<RowIterator> subquery_iterator =
           CreateIteratorFromAccessPath(thd, param.subquery_path, join,
                                        /*eligible_for_batch_mode=*/true);
+      if (subquery_iterator == nullptr) {
+        return nullptr;
+      }
       unique_ptr_destroy_only<RowIterator> table_iterator =
           CreateIteratorFromAccessPath(thd, param.table_path, join,
                                        eligible_for_batch_mode);
+      if (table_iterator == nullptr) {
+        return nullptr;
+      }
       iterator = NewIterator<TemptableAggregateIterator>(
           thd, move(subquery_iterator), param.temp_table_param, param.table,
           move(table_iterator), join, param.ref_slice);
@@ -488,6 +558,9 @@
       const auto &param = path->limit_offset();
       unique_ptr_destroy_only<RowIterator> child = CreateIteratorFromAccessPath(
           thd, param.child, join, eligible_for_batch_mode);
+      if (child == nullptr) {
+        return nullptr;
+      }
       ha_rows *send_records = nullptr;
       if (param.send_records_override != nullptr) {
         send_records = param.send_records_override;
@@ -503,15 +576,30 @@
       const auto &param = path->stream();
       unique_ptr_destroy_only<RowIterator> child = CreateIteratorFromAccessPath(
           thd, param.child, param.join, eligible_for_batch_mode);
+      if (child == nullptr) {
+        return nullptr;
+      }
       iterator = NewIterator<StreamingIterator>(
           thd, move(child), param.temp_table_param, param.table,
           param.provide_rowid, param.join, param.ref_slice);
       break;
     }
     case AccessPath::MATERIALIZE: {
+      // The table access path should be a single iterator, not a tree.
+      // (ALTERNATIVE counts as a single iterator in this regard.)
+      assert(path->materialize().table_path->type == AccessPath::TABLE_SCAN ||
+             path->materialize().table_path->type == AccessPath::REF ||
+             path->materialize().table_path->type == AccessPath::REF_OR_NULL ||
+             path->materialize().table_path->type == AccessPath::EQ_REF ||
+             path->materialize().table_path->type == AccessPath::ALTERNATIVE ||
+             path->materialize().table_path->type == AccessPath::CONST_TABLE);
+
       unique_ptr_destroy_only<RowIterator> table_iterator =
           CreateIteratorFromAccessPath(thd, path->materialize().table_path,
                                        join, eligible_for_batch_mode);
+      if (table_iterator == nullptr) {
+        return nullptr;
+      }
       MaterializePathParameters *param = path->materialize().param;
 
       Mem_root_array<MaterializeIterator::QueryBlock> query_blocks(
@@ -523,6 +611,9 @@
         to.subquery_iterator =
             CreateIteratorFromAccessPath(thd, from.subquery_path, from.join,
                                          /*eligible_for_batch_mode=*/true);
+        if (to.subquery_iterator == nullptr) {
+          return nullptr;
+        }
         to.select_number = from.select_number;
         to.join = from.join;
         to.disable_deduplication_by_hash_field =
@@ -573,6 +664,9 @@
       unique_ptr_destroy_only<RowIterator> table_iterator =
           CreateIteratorFromAccessPath(thd, param.table_path, join,
                                        eligible_for_batch_mode);
+      if (table_iterator == nullptr) {
+        return nullptr;
+      }
       iterator = NewIterator<MaterializeInformationSchemaTableIterator>(
           thd, move(table_iterator), param.table_list, param.condition);
       break;
@@ -584,6 +678,9 @@
       for (const AppendPathParameters &child : *param.children) {
         children.push_back(CreateIteratorFromAccessPath(
             thd, child.path, child.join, /*eligible_for_batch_mode=*/true));
+        if (children.back() == nullptr) {
+          return nullptr;
+        }
       }
       iterator = NewIterator<AppendIterator>(thd, move(children));
       break;
@@ -592,6 +689,9 @@
       const auto &param = path->window();
       unique_ptr_destroy_only<RowIterator> child = CreateIteratorFromAccessPath(
           thd, param.child, join, eligible_for_batch_mode);
+      if (child == nullptr) {
+        return nullptr;
+      }
       if (param.needs_buffering) {
         iterator = NewIterator<BufferingWindowIterator>(
             thd, move(child), param.temp_table_param, join, param.ref_slice);
@@ -605,6 +705,9 @@
       const auto &param = path->weedout();
       unique_ptr_destroy_only<RowIterator> child = CreateIteratorFromAccessPath(
           thd, param.child, join, eligible_for_batch_mode);
+      if (child == nullptr) {
+        return nullptr;
+      }
       iterator = NewIterator<WeedoutIterator>(
           thd, move(child), param.weedout_table, param.tables_to_get_rowid_for);
       break;
@@ -613,6 +716,9 @@
       const auto &param = path->remove_duplicates();
       unique_ptr_destroy_only<RowIterator> child = CreateIteratorFromAccessPath(
           thd, param.child, join, eligible_for_batch_mode);
+      if (child == nullptr) {
+        return nullptr;
+      }
       iterator = NewIterator<RemoveDuplicatesIterator>(
           thd, move(child), join, param.group_items, param.group_items_size);
       break;
@@ -621,6 +727,9 @@
       const auto &param = path->remove_duplicates_on_index();
       unique_ptr_destroy_only<RowIterator> child = CreateIteratorFromAccessPath(
           thd, param.child, join, eligible_for_batch_mode);
+      if (child == nullptr) {
+        return nullptr;
+      }
       iterator = NewIterator<RemoveDuplicatesOnIndexIterator>(
           thd, move(child), param.table, param.key, param.loosescan_key_len);
       break;
@@ -629,9 +738,15 @@
       const auto &param = path->alternative();
       unique_ptr_destroy_only<RowIterator> child = CreateIteratorFromAccessPath(
           thd, param.child, join, eligible_for_batch_mode);
+      if (child == nullptr) {
+        return nullptr;
+      }
       unique_ptr_destroy_only<RowIterator> table_scan_iterator =
           CreateIteratorFromAccessPath(thd, param.table_scan_path, join,
                                        eligible_for_batch_mode);
+      if (table_scan_iterator == nullptr) {
+        return nullptr;
+      }
       iterator = NewIterator<AlternativeIterator>(
           thd, param.table_scan_path->table_scan().table, move(child),
           move(table_scan_iterator), param.used_ref);
@@ -641,6 +756,9 @@
       const auto &param = path->cache_invalidator();
       unique_ptr_destroy_only<RowIterator> child = CreateIteratorFromAccessPath(
           thd, param.child, join, eligible_for_batch_mode);
+      if (child == nullptr) {
+        return nullptr;
+      }
       iterator =
           NewIterator<CacheInvalidatorIterator>(thd, move(child), param.name);
       break;
@@ -659,11 +777,13 @@
     if (path == subpath) return false;  // Skip ourselves.
     switch (subpath->type) {
       case AccessPath::HASH_JOIN:
-        handled_by_others |= GetUsedTableMap(subpath);
+        handled_by_others |=
+            GetUsedTableMap(subpath, /*include_pruned_tables=*/true);
         FindTablesToGetRowidFor(subpath);
         return true;  // Don't double-traverse.
       case AccessPath::BKA_JOIN:
-        handled_by_others |= GetUsedTableMap(subpath->bka_join().outer);
+        handled_by_others |= GetUsedTableMap(subpath->bka_join().outer,
+                                             /*include_pruned_tables=*/true);
         FindTablesToGetRowidFor(subpath);
         return true;  // Don't double-traverse.
       case AccessPath::STREAM: {
@@ -692,7 +812,8 @@
                       add_tables_handled_by_others);
       path->hash_join().store_rowids = true;
       path->hash_join().tables_to_get_rowid_for =
-          GetUsedTableMap(path) & ~handled_by_others;
+          GetUsedTableMap(path, /*include_pruned_tables=*/true) &
+          ~handled_by_others;
       break;
     case AccessPath::BKA_JOIN:
       WalkAccessPaths(path->bka_join().outer, /*join=*/nullptr,
@@ -700,21 +821,25 @@
                       add_tables_handled_by_others);
       path->bka_join().store_rowids = true;
       path->bka_join().tables_to_get_rowid_for =
-          GetUsedTableMap(path->bka_join().outer) & ~handled_by_others;
+          GetUsedTableMap(path->bka_join().outer,
+                          /*include_pruned_tables=*/true) &
+          ~handled_by_others;
       break;
     case AccessPath::WEEDOUT:
       WalkAccessPaths(path, /*join=*/nullptr,
                       WalkAccessPathPolicy::STOP_AT_MATERIALIZATION,
                       add_tables_handled_by_others);
       path->weedout().tables_to_get_rowid_for =
-          GetUsedTableMap(path) & ~handled_by_others;
+          GetUsedTableMap(path, /*include_pruned_tables=*/true) &
+          ~handled_by_others;
       break;
     case AccessPath::SORT:
       WalkAccessPaths(path, /*join=*/nullptr,
                       WalkAccessPathPolicy::STOP_AT_MATERIALIZATION,
                       add_tables_handled_by_others);
       path->sort().tables_to_get_rowid_for =
-          GetUsedTableMap(path) & ~handled_by_others;
+          GetUsedTableMap(path, /*include_pruned_tables=*/true) &
+          ~handled_by_others;
       break;
     default:
       abort();
@@ -722,53 +847,51 @@
 }
 
 static Item *ConditionFromFilterPredicates(
-    const Mem_root_array<Predicate> &predicates, uint64_t mask) {
-  if (IsSingleBitSet(mask)) {
-    return predicates[FindLowestBitSet(mask)].condition;
-  } else {
-    List<Item> items;
-    for (int pred_idx : BitsSetIn(mask)) {
-      items.push_back(predicates[pred_idx].condition);
-    }
-    Item *condition = new Item_cond_and(items);
-    condition->quick_fix_field();
-    condition->update_used_tables();
-    condition->apply_is_true();
-    return condition;
+    const Mem_root_array<Predicate> &predicates, OverflowBitset mask,
+    int num_where_predicates) {
+  List<Item> items;
+  for (int pred_idx : BitsSetIn(mask)) {
+    if (pred_idx >= num_where_predicates) break;
+    items.push_back(predicates[pred_idx].condition);
   }
+  return CreateConjunction(&items);
 }
 
 void ExpandSingleFilterAccessPath(THD *thd, AccessPath *path,
                                   const Mem_root_array<Predicate> &predicates,
                                   unsigned num_where_predicates) {
-  uint64_t filter_predicates =
-      path->filter_predicates & BitsBetween(0, num_where_predicates);
-  if (filter_predicates != 0) {
-    Item *condition =
-        ConditionFromFilterPredicates(predicates, filter_predicates);
-    AccessPath *new_path = new (thd->mem_root) AccessPath(*path);
-    new_path->filter_predicates = 0;
-    new_path->num_output_rows = path->num_output_rows_before_filter;
-    new_path->cost = path->cost_before_filter;
-
-    // We don't really know how much of init_cost comes from the filter,
-    // but we need to heed the invariant that cost >= init_cost
-    // also for the new (non-filter) path we're creating, even if it's
-    // just for display. Heuristically allocate as much as possible to
-    // the filter.
-    double filter_only_cost = path->cost - path->cost_before_filter;
-    new_path->init_cost = std::max(new_path->init_cost - filter_only_cost, 0.0);
-    new_path->init_once_cost =
-        std::max(new_path->init_once_cost - filter_only_cost, 0.0);
-    assert(new_path->cost >= new_path->init_cost);
-    assert(new_path->init_cost >= new_path->init_once_cost);
-
-    path->type = AccessPath::FILTER;
-    path->filter().condition = condition;
-    path->filter().child = new_path;
-    path->filter().materialize_subqueries = false;
-    path->filter_predicates = 0;
+  Item *condition = ConditionFromFilterPredicates(
+      predicates, path->filter_predicates, num_where_predicates);
+  if (condition == nullptr) {
+    return;
   }
+  AccessPath *new_path = new (thd->mem_root) AccessPath(*path);
+  new_path->filter_predicates.Clear();
+  new_path->num_output_rows = path->num_output_rows_before_filter;
+  new_path->cost = path->cost_before_filter;
+
+  // We don't really know how much of init_cost comes from the filter,
+  // but we need to heed the invariant that cost >= init_cost
+  // also for the new (non-filter) path we're creating, even if it's
+  // just for display. Heuristically allocate as much as possible to
+  // the filter.
+  double filter_only_cost = path->cost - path->cost_before_filter;
+  new_path->init_cost = std::max(new_path->init_cost - filter_only_cost, 0.0);
+  new_path->init_once_cost =
+      std::max(new_path->init_once_cost - filter_only_cost, 0.0);
+  assert(new_path->cost >= new_path->init_cost);
+  assert(new_path->init_cost >= new_path->init_once_cost);
+
+  path->type = AccessPath::FILTER;
+  path->filter().condition = condition;
+  path->filter().child = new_path;
+  path->filter().materialize_subqueries = false;
+
+  // Clear filter_predicates, but keep applied_sargable_join_predicates.
+  MutableOverflowBitset applied_sargable_join_predicates =
+      path->applied_sargable_join_predicates().Clone(thd->mem_root);
+  applied_sargable_join_predicates.ClearBits(0, num_where_predicates);
+  path->filter_predicates = std::move(applied_sargable_join_predicates);
 }
 
 void ExpandFilterAccessPaths(THD *thd, AccessPath *path_arg, const JOIN *join,
diff -Nru mysql-8.0-8.0.26/sql/join_optimizer/access_path.h mysql-8.0-8.0.27/sql/join_optimizer/access_path.h
--- mysql-8.0-8.0.26/sql/join_optimizer/access_path.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/join_optimizer/access_path.h	2021-09-28 11:46:34.000000000 +0000
@@ -33,6 +33,7 @@
 #include "sql/join_optimizer/interesting_orders_defs.h"
 #include "sql/join_optimizer/materialize_path_parameters.h"
 #include "sql/join_optimizer/node_map.h"
+#include "sql/join_optimizer/overflow_bitset.h"
 #include "sql/join_type.h"
 #include "sql/mem_root_array.h"
 #include "sql/sql_class.h"
@@ -49,6 +50,7 @@
 class SJ_TMP_TABLE;
 class Table_function;
 class Temp_table_param;
+class Window;
 struct AccessPath;
 struct ORDER;
 struct POSITION;
@@ -63,7 +65,7 @@
   live inside the “expr� object, as does the join type etc.
  */
 struct JoinPredicate {
-  const RelationalExpression *expr;
+  RelationalExpression *expr;
   double selectivity;
 
   // If this join is made using a hash join, estimates the width
@@ -106,6 +108,9 @@
 struct Predicate {
   Item *condition;
 
+  // condition->used_tables(), converted to a NodeMap.
+  hypergraph::NodeMap used_nodes;
+
   // tables referred to by the condition, plus any tables whose values
   // can null any of those tables. (Even when reordering outer joins,
   // at least one of those tables will still be present on the
@@ -117,6 +122,25 @@
 
   double selectivity;
 
+  // Whether this predicate is a join condition after all; it was promoted
+  // to a WHERE predicate since it was part of a cycle (see the comment in
+  // AddCycleEdges()). If it is, it is usually ignored so that we don't
+  // double-apply join conditions -- but if the join in question was not
+  // applied (because the cycle was broken at this point), the predicate
+  // would come into play. This is normally registered on the join itself
+  // (see RelationalExpression::join_predicate_bitmap), but having the bit
+  // on the predicate itself is used to avoid trying to push it down as a
+  // sargable predicate.
+  bool was_join_condition = false;
+
+  // If this is a join condition that came from a multiple equality,
+  // and we have decided to create a mesh from that multiple equality,
+  // returns the index of it into the “multiple_equalities� array
+  // in MakeJoinHypergraph(). (You don't actually need the array to
+  // use this; it's just an opaque index to deduplicate between different
+  // predicates.) Otherwise, -1.
+  int source_multiple_equality_idx = -1;
+
   // See the equivalent fields in JoinPredicate.
   FunctionalDependencySet functional_dependencies;
   Mem_root_array<int> functional_dependencies_idx;
@@ -203,6 +227,34 @@
   /// and which ones do not, so the only canonical reference is the tests.
   bool count_examined_rows = false;
 
+  /// A general enum to describe the safety of a given operation.
+  /// Currently we only use this to describe row IDs, but it can easily
+  /// be reused for safety of updating a table we're reading from
+  /// (the Halloween problem), or just generally unreproducible results
+  /// (e.g. a TABLESAMPLE changing due to external factors).
+  ///
+  /// Less safe values have higher numerical values.
+  enum Safety : uint8_t {
+    /// The given operation is always safe on this access path.
+    SAFE = 0,
+
+    /// The given operation is safe if this access path is scanned once,
+    /// but not if it's scanned multiple times (e.g. used on the inner side
+    /// of a nested-loop join). A typical example of this is a derived table
+    /// or CTE that is rematerialized on each scan, so that references to
+    /// the old values (such as row IDs) are no longer valid.
+    SAFE_IF_SCANNED_ONCE = 1,
+
+    /// The given operation is unsafe on this access path, no matter how many
+    /// or few times it's scanned. Often, it may help to materialize it
+    /// (assuming the materialization itself doesn't use the operation
+    /// in question).
+    UNSAFE = 2
+  };
+
+  /// Whether it is safe to get row IDs (for sorting) from this access path.
+  Safety safe_for_rowid = SAFE;
+
   /// Which ordering the rows produced by this path follow, if any
   /// (see interesting_orders.h). This is really a LogicalOrderings::StateIndex,
   /// but we don't want to add a dependency on interesting_orders.h from
@@ -246,66 +298,65 @@
   /// init_cost is always the same (filters have zero initialization cost).
   double num_output_rows_before_filter{-1.0}, cost_before_filter{-1.0};
 
-  union {
-    /// Bitmap of WHERE predicates that we are including on this access path,
-    /// referring to the “predicates� array internal to the join optimizer.
-    /// Since bit masks are much cheaper to deal with than creating Item
-    /// objects, and we don't invent new conditions during join optimization
-    /// (all of them are known when we begin optimization), we stick to
-    /// manipulating bit masks during optimization, saying which filters will be
-    /// applied at this node (a 1-bit means the filter will be applied here; if
-    /// there are multiple ones, they are ANDed together).
-    ///
-    /// This is used during join optimization only; before iterators are
-    /// created, we will add FILTER access paths to represent these instead,
-    /// removing the dependency on the array. Said FILTER paths are by
-    /// convention created with materialize_subqueries = false, since the by far
-    /// most common case is that there are no subqueries in the predicate. In
-    /// other words, if you wish to represent a filter with
-    /// materialize_subqueries = true, you will nede to make an explicit FILTER
-    /// node.
-    ///
-    /// TODO(sgunders): Add some technique for “overflow bitset� to allow
-    /// having more than 64 predicates. (For now, we refuse queries that have
-    /// more.)
-    uint64_t filter_predicates{0};
-
-    /// Bitmap of sargable join predicates that have already been applied
-    /// in this access path by means of an index lookup (ref access),
-    /// again referring to “predicates�, and thus should not be counted again
-    /// for selectivity. Note that the filter may need to be applied
-    /// nevertheless (especially in case of type conversions); see
-    /// subsumed_sargable_join_predicates.
-    ///
-    /// Since these refer to the same array as filter_predicates, they will
-    /// never overlap with filter_predicates, and so we can reuse the same
-    /// memory using an union, even though the meaning is entirely separate.
-    /// If N = num_where_predictes in the hypergraph, then bits 0..(N-1)
-    /// belong to filter_predicates, and the rest to
-    /// applied_sargable_join_predicates.
-    uint64_t applied_sargable_join_predicates;
-  };
-
-  union {
-    /// Bitmap of WHERE predicates that we touch tables we have joined in,
-    /// but that we could not apply yet (for instance because they reference
-    /// other tables, or because because we could not push them down into
-    /// the nullable side of outer joins). Used during planning only
-    /// (see filter_predicates).
-    ///
-    /// TODO(sgunders): Add some technique for “overflow bitset� to allow
-    /// having more than 64 predicates. (For now, we refuse queries that have
-    /// more.)
-    uint64_t delayed_predicates{0};
-
-    /// Similar to applied_sargable_join_predicates, bitmap of sargable
-    /// join predicates that have been applied and will subsume the join
-    /// predicate entirely, ie., not only should the selectivity not be
-    /// double-counted, but the predicate itself is redundant and need not
-    /// be applied as a filter. (It is an error to have a bit set here but not
-    /// in applied_sargable_join_predicates.)
-    uint64_t subsumed_sargable_join_predicates;
-  };
+  /// Bitmap of WHERE predicates that we are including on this access path,
+  /// referring to the “predicates� array internal to the join optimizer.
+  /// Since bit masks are much cheaper to deal with than creating Item
+  /// objects, and we don't invent new conditions during join optimization
+  /// (all of them are known when we begin optimization), we stick to
+  /// manipulating bit masks during optimization, saying which filters will be
+  /// applied at this node (a 1-bit means the filter will be applied here; if
+  /// there are multiple ones, they are ANDed together).
+  ///
+  /// This is used during join optimization only; before iterators are
+  /// created, we will add FILTER access paths to represent these instead,
+  /// removing the dependency on the array. Said FILTER paths are by
+  /// convention created with materialize_subqueries = false, since the by far
+  /// most common case is that there are no subqueries in the predicate. In
+  /// other words, if you wish to represent a filter with
+  /// materialize_subqueries = true, you will nede to make an explicit FILTER
+  /// node.
+  OverflowBitset filter_predicates{0};
+
+  /// Bitmap of sargable join predicates that have already been applied
+  /// in this access path by means of an index lookup (ref access),
+  /// again referring to “predicates�, and thus should not be counted again
+  /// for selectivity. Note that the filter may need to be applied
+  /// nevertheless (especially in case of type conversions); see
+  /// subsumed_sargable_join_predicates.
+  ///
+  /// Since these refer to the same array as filter_predicates, they will
+  /// never overlap with filter_predicates, and so we can reuse the same
+  /// memory using an alias (a union would not be allowed, since OverflowBitset
+  /// is a class with non-trivial default constructor), even though the meaning
+  /// is entirely separate. If N = num_where_predictes in the hypergraph, then
+  /// bits 0..(N-1) belong to filter_predicates, and the rest to
+  /// applied_sargable_join_predicates.
+  OverflowBitset &applied_sargable_join_predicates() {
+    return filter_predicates;
+  }
+  const OverflowBitset &applied_sargable_join_predicates() const {
+    return filter_predicates;
+  }
+
+  /// Bitmap of WHERE predicates that touch tables we have joined in,
+  /// but that we could not apply yet (for instance because they reference
+  /// other tables, or because because we could not push them down into
+  /// the nullable side of outer joins). Used during planning only
+  /// (see filter_predicates).
+  OverflowBitset delayed_predicates{0};
+
+  /// Similar to applied_sargable_join_predicates, bitmap of sargable
+  /// join predicates that have been applied and will subsume the join
+  /// predicate entirely, ie., not only should the selectivity not be
+  /// double-counted, but the predicate itself is redundant and need not
+  /// be applied as a filter. (It is an error to have a bit set here but not
+  /// in applied_sargable_join_predicates.)
+  OverflowBitset &subsumed_sargable_join_predicates() {
+    return delayed_predicates;
+  }
+  const OverflowBitset &subsumed_sargable_join_predicates() const {
+    return delayed_predicates;
+  }
 
   /// If nonzero, a bitmap of other tables whose joined-in rows must already be
   /// loaded when rows from this access path are evaluated; that is, this
@@ -678,6 +729,7 @@
       TABLE *table;
       TABLE_REF *ref;
       bool use_order;
+      bool use_limit;
       Item_func_match *ft_func;
     } full_text_search;
     struct {
@@ -782,6 +834,7 @@
       ORDER *order;
       bool remove_duplicates;
       bool unwrap_rollup;
+      bool use_limit;
     } sort;
     struct {
       AccessPath *child;
@@ -813,6 +866,9 @@
       int ref_slice;
     } stream;
     struct {
+      // NOTE: The only legal access paths within table_path are
+      // TABLE_SCAN, REF, REF_OR_NULL, EQ_REF, ALTERNATIVE and
+      // CONST_TABLE (the latter is somewhat nonsensical).
       AccessPath *table_path;
 
       // Large, and has nontrivial destructors, so split out
@@ -829,6 +885,8 @@
     } append;
     struct {
       AccessPath *child;
+      Window *window;
+      TABLE *temp_table;
       Temp_table_param *temp_table_param;
       int ref_slice;
       bool needs_buffering;
@@ -878,6 +936,7 @@
   to->init_cost = from.init_cost;
   to->init_once_cost = from.init_once_cost;
   to->parameter_tables = from.parameter_tables;
+  to->safe_for_rowid = from.safe_for_rowid;
   to->ordering_state = from.ordering_state;
 }
 
@@ -959,7 +1018,7 @@
 inline AccessPath *NewFullTextSearchAccessPath(THD *thd, TABLE *table,
                                                TABLE_REF *ref,
                                                Item_func_match *ft_func,
-                                               bool use_order,
+                                               bool use_order, bool use_limit,
                                                bool count_examined_rows) {
   AccessPath *path = new (thd->mem_root) AccessPath;
   path->type = AccessPath::FULL_TEXT_SEARCH;
@@ -967,6 +1026,7 @@
   path->full_text_search().table = table;
   path->full_text_search().ref = ref;
   path->full_text_search().use_order = use_order;
+  path->full_text_search().use_limit = use_limit;
   path->full_text_search().ft_func = ft_func;
   return path;
 }
@@ -1256,6 +1316,12 @@
   path->type = AccessPath::MATERIALIZE;
   path->materialize().table_path = table_path;
   path->materialize().param = param;
+  if (rematerialize) {
+    path->safe_for_rowid = AccessPath::SAFE_IF_SCANNED_ONCE;
+  } else {
+    // The default; this is just to be explicit in the code.
+    path->safe_for_rowid = AccessPath::SAFE;
+  }
   return path;
 }
 
@@ -1366,7 +1432,7 @@
   irrevocably be materialized, even if that is not the optimal plan given B.
   Thus, this is done when creating iterators.
  */
-void FinalizeMaterializedSubqueries(THD *thd, JOIN *join, AccessPath *path);
+bool FinalizeMaterializedSubqueries(THD *thd, JOIN *join, AccessPath *path);
 
 unique_ptr_destroy_only<RowIterator> CreateIteratorFromAccessPath(
     THD *thd, AccessPath *path, JOIN *join, bool eligible_for_batch_mode);
@@ -1385,8 +1451,21 @@
   RAND_TABLE_BIT will be set as a convention and none of that access path's
   children will be included in the map. In this case, the caller will need to
   manually go in and find said access path, to ask it for its TABLE object.
+
+  If include_pruned_tables = true, tables that are hidden under a ZERO_ROWS
+  access path (ie., pruned away due to impossible join conditions) will be
+  included in the map. This is normally what you want, as those tables need to
+  be included whenever you store NULL flags and the likes, but if you don't
+  want them (perhaps to specifically check for conditions referring to pruned
+  tables), you can set it to false.
+ */
+table_map GetUsedTableMap(const AccessPath *path, bool include_pruned_tables);
+
+/**
+  Find the list of all tables used by this root, stopping at materializations.
+  Used for knowing which tables to sort.
  */
-table_map GetUsedTableMap(const AccessPath *path);
+Mem_root_array<TABLE *> CollectTables(THD *thd, AccessPath *root_path);
 
 /**
   For each access path in the (sub)tree rooted at “path�, expand any use of
diff -Nru mysql-8.0-8.0.26/sql/join_optimizer/bit_utils.h mysql-8.0-8.0.27/sql/join_optimizer/bit_utils.h
--- mysql-8.0-8.0.26/sql/join_optimizer/bit_utils.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/join_optimizer/bit_utils.h	2021-09-28 11:46:34.000000000 +0000
@@ -67,7 +67,7 @@
   const uint64_t m_initial_state;
 };
 
-static inline size_t FindLowestBitSet(uint64_t x) {
+inline size_t FindLowestBitSet(uint64_t x) {
   assert(x != 0);
 #ifdef _MSC_VER
   unsigned long idx;
@@ -127,8 +127,13 @@
   }
 };
 
-using BitsSetIn = BitIteratorAdaptor<CountBitsAscending>;
-using BitsSetInDescending = BitIteratorAdaptor<CountBitsDescending>;
+inline BitIteratorAdaptor<CountBitsAscending> BitsSetIn(uint64_t state) {
+  return BitIteratorAdaptor<CountBitsAscending>{state};
+}
+inline BitIteratorAdaptor<CountBitsDescending> BitsSetInDescending(
+    uint64_t state) {
+  return BitIteratorAdaptor<CountBitsDescending>{state};
+}
 
 // An iterator (for range-based for loops) that returns all non-zero subsets of
 // a given set. This includes the set itself.
@@ -155,7 +160,7 @@
       assert(m_set == other.m_set);
       return m_state != other.m_state;
     }
-    size_t operator*() const { return m_state; }
+    uint64_t operator*() const { return m_state; }
     iterator &operator++() {
       m_state = (m_state - m_set) & m_set;
       return *this;
@@ -182,7 +187,16 @@
 // Returns a bitmap representing the semi-open interval [start, end).
 inline uint64_t BitsBetween(unsigned start, unsigned end) {
   assert(end >= start);
-  return (uint64_t{1} << end) - (uint64_t{1} << start);
+  assert(end <= 64);
+  if (end == 64) {
+    if (start == 64) {
+      return 0;
+    } else {
+      return -(uint64_t{1} << start);
+    }
+  } else {
+    return (uint64_t{1} << end) - (uint64_t{1} << start);
+  }
 }
 
 // The same, just with a different name for clarity.
@@ -196,20 +210,25 @@
 // Suppress warning C4146 unary minus operator applied to unsigned type,
 // result still unsigned
 MY_COMPILER_MSVC_DIAGNOSTIC_IGNORE(4146)
-static inline uint64_t IsolateLowestBit(uint64_t x) { return x & (-x); }
+inline uint64_t IsolateLowestBit(uint64_t x) { return x & (-x); }
 MY_COMPILER_DIAGNOSTIC_POP()
 
 // Returns whether X is a subset of Y.
-static inline bool IsSubset(uint64_t x, uint64_t y) { return (x & y) == x; }
+inline bool IsSubset(uint64_t x, uint64_t y) { return (x & y) == x; }
 
 // Returns whether X and Y overlap. Symmetric.
-static inline bool Overlaps(uint64_t x, uint64_t y) { return (x & y) != 0; }
+inline bool Overlaps(uint64_t x, uint64_t y) { return (x & y) != 0; }
 
 // Returns whether X is a power of two.
-static inline bool IsSingleBitSet(uint64_t x) { return (x & (x - 1)) == 0; }
+inline bool IsSingleBitSet(uint64_t x) { return (x & (x - 1)) == 0; }
+
+// Returns whether the given bit is set in X.
+inline bool IsBitSet(int bit_num, uint64_t x) {
+  return Overlaps(x, uint64_t{1} << bit_num);
+}
 
 // Fairly slow implementation of population count (number of bits set).
-static inline int PopulationCount(uint64_t x) {
+inline int PopulationCount(uint64_t x) {
   int count = 0;
   while (x != 0) {
     x &= x - 1;
diff -Nru mysql-8.0-8.0.26/sql/join_optimizer/build_interesting_orders.cc mysql-8.0-8.0.27/sql/join_optimizer/build_interesting_orders.cc
--- mysql-8.0-8.0.26/sql/join_optimizer/build_interesting_orders.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/join_optimizer/build_interesting_orders.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,723 @@
+/* Copyright (c) 2020, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include "sql/join_optimizer/build_interesting_orders.h"
+
+#include <assert.h>
+#include <stdio.h>
+#include <algorithm>
+#include <string>
+#include <utility>
+
+#include "ft_global.h"
+#include "my_alloc.h"
+#include "my_base.h"
+#include "my_table_map.h"
+#include "mysql/udf_registration_types.h"
+#include "sql/field.h"
+#include "sql/handler.h"
+#include "sql/item.h"
+#include "sql/item_cmpfunc.h"
+#include "sql/item_func.h"
+#include "sql/item_row.h"
+#include "sql/join_optimizer/access_path.h"
+#include "sql/join_optimizer/bit_utils.h"
+#include "sql/join_optimizer/interesting_orders.h"
+#include "sql/join_optimizer/interesting_orders_defs.h"
+#include "sql/join_optimizer/make_join_hypergraph.h"
+#include "sql/join_optimizer/relational_expression.h"
+#include "sql/key.h"
+#include "sql/key_spec.h"
+#include "sql/mem_root_array.h"
+#include "sql/sql_array.h"
+#include "sql/sql_bitmap.h"
+#include "sql/sql_class.h"
+#include "sql/sql_const.h"
+#include "sql/sql_executor.h"
+#include "sql/sql_lex.h"
+#include "sql/sql_list.h"
+#include "sql/sql_optimizer.h"
+#include "sql/sql_resolver.h"
+#include "sql/sql_select.h"
+#include "sql/table.h"
+#include "sql/window.h"
+#include "template_utils.h"
+
+using hypergraph::NodeMap;
+using std::string;
+using std::swap;
+
+/**
+  Helper for CollectFunctionalDependenciesFromPredicates(); also used for
+  non-equijoin predicates in CollectFunctionalDependenciesFromJoins().
+ */
+static int AddFunctionalDependencyFromCondition(THD *thd, Item *condition,
+                                                bool always_active,
+                                                LogicalOrderings *orderings) {
+  if (condition->type() != Item::FUNC_ITEM) {
+    return -1;
+  }
+
+  // We treat IS NULL as item = const.
+  if (down_cast<Item_func *>(condition)->functype() == Item_func::ISNULL_FUNC) {
+    Item_func_isnull *isnull = down_cast<Item_func_isnull *>(condition);
+
+    FunctionalDependency fd;
+    fd.type = FunctionalDependency::FD;
+    fd.head = Bounds_checked_array<ItemHandle>();
+    fd.tail = orderings->GetHandle(isnull->arguments()[0]);
+    fd.always_active = always_active;
+
+    return orderings->AddFunctionalDependency(thd, fd);
+  }
+
+  if (down_cast<Item_func *>(condition)->functype() != Item_func::EQ_FUNC) {
+    // We only deal with equalities.
+    return -1;
+  }
+  Item_func_eq *eq = down_cast<Item_func_eq *>(condition);
+  Item *left = eq->arguments()[0];
+  Item *right = eq->arguments()[1];
+  if (left->const_for_execution()) {
+    if (right->const_for_execution()) {
+      // Ignore const = const.
+      return -1;
+    }
+    swap(left, right);
+  }
+  if (equality_determines_uniqueness(eq, left, right)) {
+    // item = const.
+    FunctionalDependency fd;
+    fd.type = FunctionalDependency::FD;
+    fd.head = Bounds_checked_array<ItemHandle>();
+    fd.tail = orderings->GetHandle(left);
+    fd.always_active = always_active;
+
+    return orderings->AddFunctionalDependency(thd, fd);
+  } else if (!equality_has_no_implicit_casts(eq, left, right)) {
+    // This is not a true equivalence; there is an implicit cast involved
+    // that is potentially information-losing, so ordering by one will not
+    // necessarily be the same as ordering by the other.
+    // TODO(sgunders): Revisit this when we have explicit casts for
+    // all comparisons, where we can generate potentially useful equivalences
+    // involving the casts.
+    return -1;
+  } else {
+    // item = item.
+    FunctionalDependency fd;
+    fd.type = FunctionalDependency::EQUIVALENCE;
+    ItemHandle head = orderings->GetHandle(left);
+    fd.head = Bounds_checked_array<ItemHandle>(&head, 1);
+    fd.tail = orderings->GetHandle(right);
+    fd.always_active = always_active;
+
+    // Takes a copy if needed, so the stack reference is safe.
+    return orderings->AddFunctionalDependency(thd, fd);
+  }
+}
+
+/**
+  Collect functional dependencies from joins. Currently, we apply
+  item = item only, and only on inner joins and semijoins. Outer joins do not
+  enforce their equivalences unconditionally (e.g. with an outer join on
+  t1.a = t2.b, t1.a = t2.b does not hold afterwards; t2.b could be NULL).
+  Semijoins do, and even though the attributes from the inner side are
+  inaccessible afterwards, there could still be interesting constant FDs
+  that are applicable to the outer side after equivalences.
+
+  It is possible to generate a weaker form of FDs for outer joins,
+  as described in sql/aggregate_check.h (and done for GROUP BY);
+  e.g. from the join condition t1.x=t2.x AND t1.y=t2.y, one can infer a
+  functional dependency {t1.x,t1.y} → t2.x and similar for t2.y.
+  However, do note the comment about FD propagation in the calling function.
+ */
+static void CollectFunctionalDependenciesFromJoins(
+    THD *thd, JoinHypergraph *graph, LogicalOrderings *orderings) {
+  for (JoinPredicate &pred : graph->edges) {
+    const RelationalExpression *expr = pred.expr;
+    if (expr->type != RelationalExpression::INNER_JOIN &&
+        expr->type != RelationalExpression::STRAIGHT_INNER_JOIN &&
+        expr->type != RelationalExpression::SEMIJOIN) {
+      continue;
+    }
+    pred.functional_dependencies_idx.init(thd->mem_root);
+    pred.functional_dependencies_idx.reserve(expr->equijoin_conditions.size() +
+                                             expr->join_conditions.size());
+    for (Item_func_eq *join_condition : expr->equijoin_conditions) {
+      int fd_idx = AddFunctionalDependencyFromCondition(
+          thd, join_condition, /*always_active=*/false, orderings);
+      if (fd_idx != -1) {
+        pred.functional_dependencies_idx.push_back(fd_idx);
+      }
+    }
+    for (Item *join_condition : expr->join_conditions) {
+      int fd_idx = AddFunctionalDependencyFromCondition(
+          thd, join_condition, /*always_active=*/false, orderings);
+      if (fd_idx != -1) {
+        pred.functional_dependencies_idx.push_back(fd_idx);
+      }
+    }
+  }
+}
+
+/**
+  Collect functional dependencies from non-join predicates.
+  Again, we only do item = item, and more interesting; we only take the
+  raw items, where we could have been much more sophisticated.
+  Imagine a predicate like a = b + c; we will add a FD saying exactly
+  that (which may or may not be useful, if b + c shows up in ORDER BY),
+  but we should probably also have added {b,c} → a, if b and c could
+  be generated somehow.
+
+  However, we _do_ special-case item = const, since they are so useful;
+  they become {} → item instead.
+ */
+static void CollectFunctionalDependenciesFromPredicates(
+    THD *thd, JoinHypergraph *graph, LogicalOrderings *orderings) {
+  for (Predicate &pred : graph->predicates) {
+    bool always_active =
+        !Overlaps(pred.total_eligibility_set, PSEUDO_TABLE_BITS) &&
+        IsSingleBitSet(pred.total_eligibility_set);
+    int fd_idx = AddFunctionalDependencyFromCondition(thd, pred.condition,
+                                                      always_active, orderings);
+    if (fd_idx != -1) {
+      pred.functional_dependencies_idx.push_back(fd_idx);
+    }
+  }
+}
+
+static void CollectFunctionalDependenciesFromUniqueIndexes(
+    THD *thd, JoinHypergraph *graph, LogicalOrderings *orderings) {
+  // Collect functional dependencies from unique indexes.
+  for (JoinHypergraph::Node &node : graph->nodes) {
+    TABLE *table = node.table;
+    for (unsigned key_idx = 0; key_idx < table->s->keys; ++key_idx) {
+      KEY *key = &table->key_info[key_idx];
+      if (!Overlaps(actual_key_flags(key), HA_NOSAME)) {
+        // Not a unique index.
+        continue;
+      }
+      if (Overlaps(actual_key_flags(key), HA_NULL_PART_KEY)) {
+        // Some part of the index could be NULL,
+        // with special semantics; so ignore it.
+        continue;
+      }
+
+      FunctionalDependency fd;
+      fd.type = FunctionalDependency::FD;
+      fd.head = Bounds_checked_array<ItemHandle>::Alloc(thd->mem_root,
+                                                        actual_key_parts(key));
+      for (unsigned keypart_idx = 0; keypart_idx < actual_key_parts(key);
+           ++keypart_idx) {
+        fd.head[keypart_idx] = orderings->GetHandle(
+            new Item_field(key->key_part[keypart_idx].field));
+      }
+      fd.always_active = true;
+
+      // Add a FD for each field in the table that is not part of the key.
+      for (unsigned field_idx = 0; field_idx < table->s->fields; ++field_idx) {
+        Field *field = table->field[field_idx];
+        bool in_key = false;
+        for (unsigned keypart_idx = 0; keypart_idx < actual_key_parts(key);
+             ++keypart_idx) {
+          if (field->eq(key->key_part[keypart_idx].field)) {
+            in_key = true;
+            break;
+          }
+        }
+        if (!in_key) {
+          fd.tail = orderings->GetHandle(new Item_field(field));
+          orderings->AddFunctionalDependency(thd, fd);
+        }
+      }
+    }
+  }
+}
+
+static Ordering CollectInterestingOrder(THD *thd, ORDER *order, int order_len,
+                                        bool unwrap_rollup,
+                                        LogicalOrderings *orderings) {
+  Ordering ordering = Ordering::Alloc(thd->mem_root, order_len);
+  int i = 0;
+  for (; order != nullptr; order = order->next, ++i) {
+    Item *item = *order->item;
+    if (unwrap_rollup) {
+      item = unwrap_rollup_group(item);
+    }
+    ordering[i].item = orderings->GetHandle(item);
+    ordering[i].direction = order->direction;
+  }
+  return ordering;
+}
+
+// A convenience form of the above.
+static Ordering CollectInterestingOrder(THD *thd,
+                                        const SQL_I_List<ORDER> &order_list,
+                                        bool unwrap_rollup,
+                                        LogicalOrderings *orderings) {
+  return CollectInterestingOrder(thd, order_list.first, order_list.size(),
+                                 unwrap_rollup, orderings);
+}
+
+// Build an ORDER * that we can give to Filesort. It is only suitable for
+// sort-ahead, since it assumes no temporary tables have been inserted.
+// Call ReplaceOrderItemsWithTempTableFields() on the ordering if you wish
+// to use it after the temporary table.
+ORDER *BuildSortAheadOrdering(THD *thd, const LogicalOrderings *orderings,
+                              Ordering ordering) {
+  ORDER *order = nullptr;
+  ORDER *last_order = nullptr;
+  for (OrderElement element : ordering) {
+    ORDER *new_ptr = new (thd->mem_root) ORDER;
+    new_ptr->item_initial = orderings->item(element.item);
+    new_ptr->item = &new_ptr->item_initial;
+    new_ptr->direction = element.direction;
+
+    if (order == nullptr) {
+      order = new_ptr;
+    }
+    if (last_order != nullptr) {
+      last_order->next = new_ptr;
+    }
+    last_order = new_ptr;
+  }
+  return order;
+}
+
+static int AddOrdering(THD *thd, Ordering ordering, bool used_at_end,
+                       table_map homogenize_tables,
+                       LogicalOrderings *orderings) {
+  if (ordering.empty()) {
+    return 0;
+  }
+
+  return orderings->AddOrdering(thd, ordering, /*interesting=*/true,
+                                used_at_end, homogenize_tables);
+}
+
+static void CanonicalizeGrouping(Ordering *ordering) {
+  for (OrderElement &elem : *ordering) {
+    elem.direction = ORDER_NOT_RELEVANT;
+  }
+  std::sort(ordering->begin(), ordering->end(),
+            [](const OrderElement &a, const OrderElement &b) {
+              return a.item < b.item;
+            });
+  ordering->resize(std::unique(ordering->begin(), ordering->end()) -
+                   ordering->begin());
+}
+
+void BuildInterestingOrders(
+    THD *thd, JoinHypergraph *graph, Query_block *query_block,
+    LogicalOrderings *orderings,
+    Mem_root_array<SortAheadOrdering> *sort_ahead_orderings,
+    int *order_by_ordering_idx, int *group_by_ordering_idx,
+    int *distinct_ordering_idx, Mem_root_array<ActiveIndexInfo> *active_indexes,
+    Mem_root_array<FullTextIndexInfo> *fulltext_searches, string *trace) {
+  // Collect ordering from ORDER BY.
+  if (query_block->is_ordered()) {
+    Ordering ordering =
+        CollectInterestingOrder(thd, query_block->order_list,
+                                /*unwrap_rollup=*/false, orderings);
+    *order_by_ordering_idx =
+        AddOrdering(thd, ordering,
+                    /*used_at_end=*/true, /*homogenize_tables=*/0, orderings);
+  }
+
+  // Collect grouping from GROUP BY.
+  if (query_block->is_explicitly_grouped()) {
+    Ordering ordering =
+        CollectInterestingOrder(thd, query_block->group_list,
+                                /*unwrap_rollup=*/true, orderings);
+    CanonicalizeGrouping(&ordering);
+
+    *group_by_ordering_idx =
+        AddOrdering(thd, ordering,
+                    /*used_at_end=*/true, /*homogenize_tables=*/0, orderings);
+  }
+
+  // Collect orderings/groupings from window functions.
+  //
+  // Note that window functions may contain hybrid groupings/orderings,
+  // e.g. PARTITION BY a,b ORDER BY c,d. In this case, several orderings
+  // (eight of them) would satisfy the query:
+  //
+  //   1. (a,b,c,d)
+  //   2. (b,a,c,d)
+  //   3. (a↓,b,c,d)
+  //   4. (b↓,a↓,c,d)
+  //   5. etc..
+  //
+  // However, since we don't support hybrid groupings/orderings,
+  // just pure groupings or pure orderings, we only accept #1 here.
+  // For PARTITION BY with no ORDER BY, we use a grouping as usual.
+  for (Window &window : query_block->join->m_windows) {
+    ORDER *order = window.sorting_order(thd);
+    if (order == nullptr) {
+      window.m_ordering_idx = 0;
+      continue;
+    }
+
+    const bool mixed_grouping = (window.effective_order_by() != nullptr &&
+                                 window.effective_partition_by() != nullptr);
+    int order_len = 0;
+    for (ORDER *ptr = order; ptr != nullptr; ptr = ptr->next) {
+      if (mixed_grouping && ptr->direction == ORDER_NOT_RELEVANT) {
+        ptr->direction = ORDER_ASC;
+      }
+      ++order_len;
+    }
+
+    Ordering ordering =
+        CollectInterestingOrder(thd, order, order_len,
+                                /*unwrap_rollup=*/false, orderings);
+    if (window.effective_order_by() == nullptr) {
+      CanonicalizeGrouping(&ordering);
+    }
+    window.m_ordering_idx =
+        AddOrdering(thd, ordering,
+                    /*used_at_end=*/true, /*homogenize_tables=*/0, orderings);
+  }
+
+  // Collect grouping from DISTINCT.
+  //
+  // Note that we don't give in the ORDER BY ordering here, and thus also don't
+  // care about all_order_by_fields_used (which says whether the DISTINCT
+  // ordering was able to also satisfy the ORDER BY); group coverings will be
+  // dealt with by the more general intesting order framework, which can also
+  // combine e.g. GROUP BY groupings with ORDER BY.
+  if (query_block->join->select_distinct) {
+    bool all_order_fields_used = false;
+    ORDER *order = create_order_from_distinct(
+        thd, Ref_item_array(), /*order=*/nullptr, query_block->join->fields,
+        /*skip_aggregates=*/false, /*convert_bit_fields_to_long=*/false,
+        &all_order_fields_used);
+
+    int order_len = 0;
+    for (ORDER *ptr = order; ptr != nullptr; ptr = ptr->next) {
+      ++order_len;
+    }
+
+    Ordering ordering =
+        CollectInterestingOrder(thd, order, order_len,
+                                /*unwrap_rollup=*/false, orderings);
+
+    CanonicalizeGrouping(&ordering);
+    *distinct_ordering_idx =
+        AddOrdering(thd, ordering,
+                    /*used_at_end=*/true, /*homogenize_tables=*/0, orderings);
+  }
+
+  // Collect groupings from semijoins (because we might want to do duplicate
+  // removal on the inner side, which will allow us to convert the join to an
+  // inner join and invert it).
+  for (JoinPredicate &pred : graph->edges) {
+    if (pred.expr->type != RelationalExpression::SEMIJOIN) {
+      continue;
+    }
+    if (!pred.expr->join_conditions.empty()) {
+      // Most semijoins (e.g. from IN) are pure equijoins, but due to
+      // outer references, there may also be non-equijoin conditions
+      // involved. If so, we can no longer rewrite to a regular inner
+      // join (at least not in the general case), so skip these.
+      continue;
+    }
+    const table_map inner_tables = pred.expr->right->tables_in_subtree;
+    Ordering ordering =
+        Ordering::Alloc(thd->mem_root, pred.expr->equijoin_conditions.size());
+    table_map used_tables = 0;
+    bool contains_row_item = false;
+    for (size_t i = 0; i < pred.expr->equijoin_conditions.size(); ++i) {
+      Item *item = pred.expr->equijoin_conditions[i]->get_arg(1);
+      if (!IsSubset(item->used_tables() & ~PSEUDO_TABLE_BITS, inner_tables)) {
+        item = pred.expr->equijoin_conditions[i]->get_arg(0);
+        assert(
+            IsSubset(item->used_tables() & ~PSEUDO_TABLE_BITS, inner_tables));
+      }
+      if (item->result_type() == ROW_RESULT) {
+        // In rare cases, the optimizer may set up semijoins where the
+        // items themselves are ROW() items. RemoveDuplicatesIterator
+        // isn't ready for ROW_RESULT type, so we unwrap the simple ones
+        // and simply ignore semijoins over more complex row-type items.
+        if (item->type() == Item::ROW_ITEM && item->cols() == 1) {
+          item = down_cast<Item_row *>(item)->element_index(0);
+        } else {
+          contains_row_item = true;
+          break;
+        }
+      }
+      ordering[i].item = orderings->GetHandle(item);
+      used_tables |= item->used_tables();
+    }
+    if (contains_row_item) {
+      continue;
+    }
+    CanonicalizeGrouping(&ordering);
+
+    pred.ordering_idx_needed_for_semijoin_rewrite = AddOrdering(
+        thd, ordering,
+        /*used_at_end=*/false, /*homogenize_tables=*/inner_tables, orderings);
+  }
+
+  // Collect list of all active indexes. We will be needing this for ref access
+  // and full-text index search even if we don't have any interesting orders.
+  for (unsigned node_idx = 0; node_idx < graph->nodes.size(); ++node_idx) {
+    TABLE *table = graph->nodes[node_idx].table;
+    for (unsigned key_idx = 0; key_idx < table->s->keys; ++key_idx) {
+      // NOTE: visible_index claims to contain “visible and enabled� indexes,
+      // but we still need to check keys_in_use to ignore disabled indexes.
+      if (!table->keys_in_use_for_query.is_set(key_idx)) {
+        continue;
+      }
+      ActiveIndexInfo index_info;
+      index_info.table = table;
+      index_info.key_idx = key_idx;
+      active_indexes->push_back(index_info);
+    }
+  }
+
+  // Collect list of full-text searches that can be satisfied by an active
+  // full-text index.
+  if (query_block->has_ft_funcs()) {
+    for (const ActiveIndexInfo &index_info : *active_indexes) {
+      const TABLE *table = index_info.table;
+      const unsigned key_idx = index_info.key_idx;
+      const KEY &key = table->key_info[key_idx];
+
+      if (!Overlaps(key.flags, HA_FULLTEXT)) continue;
+
+      for (Item_func_match &ftfunc : *query_block->ftfunc_list) {
+        if (ftfunc.get_master() == &ftfunc &&
+            ftfunc.table_ref->table == table && ftfunc.key == key_idx) {
+          fulltext_searches->push_back(FullTextIndexInfo{&ftfunc, 0});
+        }
+      }
+    }
+  }
+
+  // Early exit if we don't have any interesting orderings.
+  if (orderings->num_orderings() <= 1) {
+    if (trace != nullptr) {
+      *trace +=
+          "\nNo interesting orders found. Not collecting functional "
+          "dependencies.\n\n";
+    }
+    orderings->Build(thd, trace);
+    return;
+  }
+
+  // Collect orderings from indexes. Note that these are not interesting
+  // in themselves, so they will be rapidly pruned away if they cannot lead
+  // to an interesting order.
+  for (ActiveIndexInfo &index_info : *active_indexes) {
+    TABLE *table = index_info.table;
+    KEY *key = &table->key_info[index_info.key_idx];
+
+    // Find out how many usable keyparts there are. We have to stop
+    // at the first that is partial (if any), or if the index is
+    // nonorderable (e.g. a hash index), which we can seemingly only
+    // query by keypart.
+    int sortable_key_parts = 0;
+    for (unsigned keypart_idx = 0; keypart_idx < actual_key_parts(key);
+         ++keypart_idx, ++sortable_key_parts) {
+      if (Overlaps(key->key_part[keypart_idx].key_part_flag, HA_PART_KEY_SEG) ||
+          !Overlaps(
+              table->file->index_flags(index_info.key_idx, keypart_idx, true),
+              HA_READ_ORDER)) {
+        break;
+      }
+    }
+
+    // First add the forward order.
+    Ordering ordering = Ordering::Alloc(thd->mem_root, sortable_key_parts);
+    for (int keypart_idx = 0; keypart_idx < sortable_key_parts; ++keypart_idx) {
+      const KEY_PART_INFO &key_part = key->key_part[keypart_idx];
+      ordering[keypart_idx].item =
+          orderings->GetHandle(new Item_field(key_part.field));
+      ordering[keypart_idx].direction =
+          Overlaps(key_part.key_part_flag, HA_REVERSE_SORT) ? ORDER_DESC
+                                                            : ORDER_ASC;
+    }
+    index_info.forward_order =
+        orderings->AddOrdering(thd, ordering, /*interesting=*/false,
+                               /*used_at_end=*/true, /*homogenize_tables=*/0);
+
+    // And now the reverse, if the index allows it.
+    if (Overlaps(table->file->index_flags(index_info.key_idx,
+                                          sortable_key_parts - 1, true),
+                 HA_READ_PREV)) {
+      for (int keypart_idx = 0; keypart_idx < sortable_key_parts;
+           ++keypart_idx) {
+        if (ordering[keypart_idx].direction == ORDER_ASC) {
+          ordering[keypart_idx].direction = ORDER_DESC;
+        } else {
+          ordering[keypart_idx].direction = ORDER_ASC;
+        }
+      }
+      index_info.reverse_order =
+          orderings->AddOrdering(thd, ordering, /*interesting=*/false,
+                                 /*used_at_end=*/true, /*homogenize_tables=*/0);
+    }
+  }
+
+  // Collect orderings from full-text indexes. Note that these are not
+  // interesting in themselves, so they will be rapidly pruned away if they
+  // cannot lead to an interesting order. Full-text indexes can only provide
+  // results ordered descending on the result returned by MATCH ... AGAINST.
+  for (FullTextIndexInfo &info : *fulltext_searches) {
+    // MyISAM does not support ordering on queries in boolean mode.
+    if (Overlaps(info.match->flags, FT_BOOL) &&
+        !Overlaps(info.match->table_ref->table->file->ha_table_flags(),
+                  HA_CAN_FULLTEXT_EXT)) {
+      continue;
+    }
+
+    ItemHandle item = orderings->GetHandle(info.match);
+    OrderElement order_element{item, ORDER_DESC};
+    Ordering ordering{&order_element, 1};
+    info.order = orderings->AddOrdering(thd, ordering, /*interesting=*/false,
+                                        /*used_at_end=*/true,
+                                        /*homogenize_tables=*/0);
+  }
+
+  // Collect functional dependencies. Currently, there are many kinds
+  // we don't do; see sql/aggregate_check.h. In particular, we don't
+  // collect FDs from:
+  //
+  //  - Unique indexes that are nullable, but that are made non-nullable
+  //    by WHERE predicates.
+  //  - Generated columns. [*]
+  //  - Join conditions from outer joins. [*]
+  //  - Non-merged derived tables (including views and CTEs). [*]
+  //
+  // Note that the points marked with [*] introduce special problems related
+  // to propagation of FDs; aggregate_check.h contains more details around
+  // so-called “NULL-friendly functional dependencies�. If we include any
+  // of them, we need to take more care about propagating them through joins.
+  //
+  // We liberally insert FDs here, even if they are not obviously related
+  // to interesting orders; they may be useful at a later stage, when
+  // other FDs can use them as a stepping stone. Optimization in Build()
+  // will remove them if they are indeed not useful.
+  CollectFunctionalDependenciesFromJoins(thd, graph, orderings);
+  CollectFunctionalDependenciesFromPredicates(thd, graph, orderings);
+  CollectFunctionalDependenciesFromUniqueIndexes(thd, graph, orderings);
+
+  // Collect the GROUP BY expression, which will be used by
+  // AddFDsFromAggregateItems() later.
+  if (query_block->is_explicitly_grouped()) {
+    auto head = Bounds_checked_array<ItemHandle>::Alloc(
+        thd->mem_root, query_block->group_list.size());
+    int idx = 0;
+    for (ORDER *group = query_block->group_list.first; group != nullptr;
+         group = group->next, ++idx) {
+      head[idx] = orderings->GetHandle(*group->item);
+    }
+    orderings->SetHeadForAggregates(head);
+  }
+  orderings->SetRollup(query_block->join->rollup_state !=
+                       JOIN::RollupState::NONE);
+
+  orderings->Build(thd, trace);
+
+  if (*order_by_ordering_idx != -1) {
+    *order_by_ordering_idx =
+        orderings->RemapOrderingIndex(*order_by_ordering_idx);
+  }
+  if (*group_by_ordering_idx != -1) {
+    *group_by_ordering_idx =
+        orderings->RemapOrderingIndex(*group_by_ordering_idx);
+  }
+  if (*distinct_ordering_idx != -1) {
+    *distinct_ordering_idx =
+        orderings->RemapOrderingIndex(*distinct_ordering_idx);
+  }
+  for (Window &window : query_block->join->m_windows) {
+    if (window.m_ordering_idx != -1) {
+      window.m_ordering_idx =
+          orderings->RemapOrderingIndex(window.m_ordering_idx);
+    }
+  }
+
+  for (JoinPredicate &pred : graph->edges) {
+    for (int fd_idx : pred.functional_dependencies_idx) {
+      pred.functional_dependencies |= orderings->GetFDSet(fd_idx);
+    }
+  }
+  for (Predicate &pred : graph->predicates) {
+    for (int fd_idx : pred.functional_dependencies_idx) {
+      pred.functional_dependencies |= orderings->GetFDSet(fd_idx);
+    }
+  }
+
+  for (JoinPredicate &pred : graph->edges) {
+    if (pred.ordering_idx_needed_for_semijoin_rewrite != -1) {
+      pred.ordering_idx_needed_for_semijoin_rewrite =
+          orderings->RemapOrderingIndex(
+              pred.ordering_idx_needed_for_semijoin_rewrite);
+
+      // Set up the elements to deduplicate against. Note that we don't do this
+      // before after Build(), because Build() may have simplified away some
+      // (or all) elements using functional dependencies.
+      Ordering grouping =
+          orderings->ordering(pred.ordering_idx_needed_for_semijoin_rewrite);
+      pred.semijoin_group_size = grouping.size();
+      if (!grouping.empty()) {
+        pred.semijoin_group =
+            thd->mem_root->ArrayAlloc<Item *>(grouping.size());
+        for (size_t i = 0; i < grouping.size(); ++i) {
+          pred.semijoin_group[i] = orderings->item(grouping[i].item);
+        }
+      }
+    }
+  }
+
+  for (FullTextIndexInfo &info : *fulltext_searches) {
+    info.order = orderings->RemapOrderingIndex(info.order);
+  }
+
+  // Now collect all orderings we have that we can try as sort-ahead,
+  // including both the orderings we originally added, group covers,
+  // and homogenized orders.
+  for (int ordering_idx = 0; ordering_idx < orderings->num_orderings();
+       ++ordering_idx) {
+    if (!orderings->ordering_is_relevant_for_sortahead(ordering_idx)) {
+      continue;
+    }
+
+    table_map used_tables = 0;
+    bool aggregates_required = false;
+    for (OrderElement element : orderings->ordering(ordering_idx)) {
+      Item *item = orderings->item(element.item);
+      used_tables |= item->used_tables();
+      aggregates_required |= (item->has_aggregation() || item->has_wf());
+    }
+    NodeMap required_nodes = GetNodeMapFromTableMap(
+        used_tables & ~(INNER_TABLE_BIT | OUTER_REF_TABLE_BIT),
+        graph->table_num_to_node_num);
+
+    ORDER *order = BuildSortAheadOrdering(thd, orderings,
+                                          orderings->ordering(ordering_idx));
+    sort_ahead_orderings->push_back(SortAheadOrdering{
+        ordering_idx, required_nodes, aggregates_required, order});
+  }
+}
diff -Nru mysql-8.0-8.0.26/sql/join_optimizer/build_interesting_orders.h mysql-8.0-8.0.27/sql/join_optimizer/build_interesting_orders.h
--- mysql-8.0-8.0.26/sql/join_optimizer/build_interesting_orders.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/join_optimizer/build_interesting_orders.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,117 @@
+/* Copyright (c) 2020, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef SQL_JOIN_OPTIMIZER_BUILD_INTERESTING_ORDERS_H_
+#define SQL_JOIN_OPTIMIZER_BUILD_INTERESTING_ORDERS_H_
+
+#include "sql/join_optimizer/interesting_orders.h"
+#include "sql/join_optimizer/node_map.h"
+
+#include <string>
+
+class Item_func_match;
+template <class T>
+class Mem_root_array;
+class Query_block;
+class THD;
+struct JoinHypergraph;
+struct ORDER;
+struct TABLE;
+
+// An ordering that we could be doing sort-ahead by; typically either an
+// interesting ordering or an ordering homogenized from one. It also includes
+// orderings that are used for sort-for-grouping, i.e. for GROUP BY,
+// PARTITION BY or DISTINCT.
+struct SortAheadOrdering {
+  // Pointer to an ordering in LogicalOrderings.
+  int ordering_idx;
+
+  // Which tables must be present in the join before one can apply
+  // this sort (usually because the elements we sort by are contained
+  // in these tables).
+  //
+  // The presence of RAND_TABLE_BIT means that the ordering contains
+  // at least one nondeterminstic item; we never allow pushing such
+  // orderings into the join (implicitly: sortahead during joins check
+  // required_nodes, and never include RAND_TABLE_BIT). This makes sure that we
+  // cannot push e.g. ORDER BY rand() into the left side of a join, which would
+  // make rows shuffled on that table only, which isn't what the user would
+  // expect. We also have special logic to disallow satisfying nondeterministic
+  // groupings/orderings others (both in the logic for group covers, and in NFSM
+  // construction), so that
+  //
+  //   GROUP BY a ORDER BY a, func()
+  //
+  // cannot be done by evaluating func() too early, but we do allow exact
+  // matches, so that e.g. GROUP BY func() ORDER BY func() can be done as only
+  // one sort (which isn't too unreasonable). This may be a bit conservative
+  // or it may be a bit aggressive, depending on who you ask.
+  hypergraph::NodeMap required_nodes;
+
+  // Whether aggregates must be computed before one can apply this sort
+  // (because it includes at least one aggregate).
+  bool aggregates_required;
+
+  // The ordering expressed in a form that filesort can use.
+  ORDER *order;
+};
+
+// An index that we can use in the query, either for index lookup (ref access)
+// or for scanning along to get an interesting ordering.
+struct ActiveIndexInfo {
+  TABLE *table;
+  int key_idx;
+  LogicalOrderings::StateIndex forward_order = 0, reverse_order = 0;
+};
+
+// A full-text index that we can use in the query, either for index lookup or
+// for scanning along to get an interesting order.
+struct FullTextIndexInfo {
+  Item_func_match *match;
+  LogicalOrderings::StateIndex order = 0;
+};
+
+/**
+  Build all structures we need for keeping track of interesting orders.
+  We collect the actual relevant orderings (e.g. from ORDER BY) and any
+  functional dependencies we can find, then ask LogicalOrderings to create
+  its state machine (as defined in interesting_orders.h). The result is
+  said state machine, a list of potential sort-ahead orderings,
+  and a list of what indexes we can use to scan each table (including
+  what orderings they yield, if they are interesting).
+ */
+void BuildInterestingOrders(
+    THD *thd, JoinHypergraph *graph, Query_block *query_block,
+    LogicalOrderings *orderings,
+    Mem_root_array<SortAheadOrdering> *sort_ahead_orderings,
+    int *order_by_ordering_idx, int *group_by_ordering_idx,
+    int *distinct_ordering_idx, Mem_root_array<ActiveIndexInfo> *active_indexes,
+    Mem_root_array<FullTextIndexInfo> *fulltext_searches, std::string *trace);
+
+// Build an ORDER * that we can give to Filesort. It is only suitable for
+// sort-ahead, since it assumes no temporary tables have been inserted.
+// Call ReplaceOrderItemsWithTempTableFields() on the ordering if you wish
+// to use it after the temporary table.
+ORDER *BuildSortAheadOrdering(THD *thd, const LogicalOrderings *orderings,
+                              Ordering ordering);
+
+#endif  // SQL_JOIN_OPTIMIZER_BUILD_INTERESTING_ORDERS_H_
diff -Nru mysql-8.0-8.0.26/sql/join_optimizer/common_subexpression_elimination.cc mysql-8.0-8.0.27/sql/join_optimizer/common_subexpression_elimination.cc
--- mysql-8.0-8.0.26/sql/join_optimizer/common_subexpression_elimination.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/join_optimizer/common_subexpression_elimination.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,226 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include <assert.h>
+
+#include "sql/item.h"
+#include "sql/item_cmpfunc.h"
+#include "sql/item_func.h"
+#include "sql/sql_executor.h"
+#include "sql/sql_list.h"
+#include "template_utils.h"
+
+namespace {
+
+Item *OrGroupWithSomeRemoved(Item_cond_or *or_item,
+                             const List<Item> &items_to_remove);
+
+bool IsAnd(const Item *item) {
+  return item->type() == Item::COND_ITEM &&
+         down_cast<const Item_cond *>(item)->functype() ==
+             Item_func::COND_AND_FUNC;
+}
+
+bool IsOr(const Item *item) {
+  return item->type() == Item::COND_ITEM &&
+         down_cast<const Item_cond *>(item)->functype() ==
+             Item_func::COND_OR_FUNC;
+}
+
+/**
+  Check if “item� is necessary to make the expression true.
+  This is case if “expr� is either:
+
+   - The same as “item�, or
+   - (something necessary) OR (something necessary)
+   - (something necessary) AND anything
+
+  A typical case would be of the latter would be
+
+    (item AND x) OR (item AND y) OR (z AND w AND item)
+ */
+bool AlwaysPresent(Item *expr, const Item *item) {
+  if (expr->eq(item, /*binary_cmp=*/true)) {
+    return true;
+  }
+
+  // (something necessary) AND (anything), e.g. item AND x AND y.
+  if (IsAnd(expr)) {
+    for (Item &sub_item : *down_cast<Item_cond_and *>(expr)->argument_list()) {
+      if (AlwaysPresent(&sub_item, item)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  // (something necessary) OR (something necessary),
+  // e.g. item AND (item OR x).
+  if (IsOr(expr)) {
+    for (Item &sub_item : *down_cast<Item_cond_or *>(expr)->argument_list()) {
+      if (!AlwaysPresent(&sub_item, item)) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  // Something else.
+  return false;
+}
+
+/// Check if “item� matches any item in “items�.
+bool MatchesAny(Item *item, const List<Item> &items) {
+  for (const Item &other_item : items) {
+    if (item->eq(&other_item, /*binary_cmp=*/true)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+/**
+  For all items in an AND conjunction, add those (possibly none) that are not in
+  “items_to_remove�. E.g., for a AND b AND c, and items_to_remove=(b),
+  adds a and c to “output�.
+ */
+void ExtractItemsExceptSome(Item_cond_and *and_item,
+                            const List<Item> &items_to_remove,
+                            List<Item> *output) {
+  for (Item &item : *and_item->argument_list()) {
+    if (MatchesAny(&item, items_to_remove)) {
+      continue;
+    }
+
+    if (IsAnd(&item)) {
+      ExtractItemsExceptSome(down_cast<Item_cond_and *>(&item), items_to_remove,
+                             output);
+    } else if (IsOr(&item)) {
+      Item *new_item = OrGroupWithSomeRemoved(down_cast<Item_cond_or *>(&item),
+                                              items_to_remove);
+      if (new_item != nullptr) {
+        output->push_back(new_item);
+      }
+    } else {
+      output->push_back(&item);
+    }
+  }
+}
+
+/**
+  For an OR disjunction, return a new disjunction with elements from
+  “items_to_remove� logically set to TRUE (ie., removed). If any of the
+  AND-within-OR groups become empty, the expression is always true and nullptr
+  is returned. E.g.:
+
+    (a AND b) OR (c AND d), remove (b)   => a OR (c AND d)
+    (a AND b) OR (c AND d), remove (b,c) => a OR d
+    (a AND b) OR (c AND d), remove (a,b) => nullptr
+ */
+Item *OrGroupWithSomeRemoved(Item_cond_or *or_item,
+                             const List<Item> &items_to_remove) {
+  List<Item> new_args;
+  for (Item &item : *or_item->argument_list()) {
+    if (MatchesAny(&item, items_to_remove)) {
+      // Always true.
+      return nullptr;
+    } else if (IsAnd(&item)) {
+      List<Item> and_args;
+      ExtractItemsExceptSome(down_cast<Item_cond_and *>(&item), items_to_remove,
+                             &and_args);
+      if (and_args.is_empty()) {
+        // True.
+        return nullptr;
+      } else {
+        new_args.push_back(CreateConjunction(&and_args));
+      }
+    } else if (IsOr(&item)) {
+      Item *new_item = OrGroupWithSomeRemoved(down_cast<Item_cond_or *>(&item),
+                                              items_to_remove);
+      if (new_item == nullptr) {
+        // x OR TRUE => TRUE.
+        return nullptr;
+      }
+      new_args.push_back(new_item);
+    } else {
+      new_args.push_back(&item);
+    }
+  }
+
+  assert(!new_args.is_empty());
+  if (new_args.size() == 1) {
+    // Should never really happen.
+    return new_args.head();
+  } else {
+    Item_cond_or *item_or = new Item_cond_or(new_args);
+    item_or->update_used_tables();
+    item_or->quick_fix_field();
+    return item_or;
+  }
+}
+
+}  // namespace
+
+Item *CommonSubexpressionElimination(Item *cond) {
+  if (!IsOr(cond)) {
+    // Not an OR expression, but we could have something within it.
+    return cond;
+  }
+
+  // Find all items in the first AND of the OR group (or first Item,
+  // if it's not an AND conjunction). For each of them, we check
+  // if they exist in all the other ANDs as well.
+  //
+  // NOTE: AlwaysPresent() is doing a little bit of wasted work here,
+  // since it doesn't skip the first group.
+  Item_cond_or *or_item = down_cast<Item_cond_or *>(cond);
+  List<Item> common_items;
+  Item *first_group = or_item->argument_list()->head();
+  if (IsAnd(first_group)) {
+    Item_cond_and *and_group = down_cast<Item_cond_and *>(first_group);
+    for (Item &and_arg : *and_group->argument_list()) {
+      if (AlwaysPresent(or_item, &and_arg)) {
+        common_items.push_back(&and_arg);
+      }
+    }
+  } else {
+    if (AlwaysPresent(or_item, first_group)) {
+      common_items.push_back(first_group);
+    }
+  }
+
+  if (common_items.is_empty()) {
+    // No common items, so no CSE is possible.
+    return cond;
+  }
+
+  // Add all the original OR groups at the end, but with the common items
+  // removed. They may be effectively empty (equivalent to TRUE), though,
+  // and in that case, we can ignore them. But we'll always have either at least
+  // one common element or at least one remainder.
+  Item *remainder = OrGroupWithSomeRemoved(or_item, common_items);
+  if (remainder != nullptr) {
+    common_items.push_back(remainder);
+  }
+  assert(!common_items.is_empty());
+  return CreateConjunction(&common_items);
+}
diff -Nru mysql-8.0-8.0.26/sql/join_optimizer/common_subexpression_elimination.h mysql-8.0-8.0.27/sql/join_optimizer/common_subexpression_elimination.h
--- mysql-8.0-8.0.26/sql/join_optimizer/common_subexpression_elimination.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/join_optimizer/common_subexpression_elimination.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,52 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef SQL_JOIN_OPTIMIZER_COMMON_SUBEXPRESSION_ELIMINATION
+#define SQL_JOIN_OPTIMIZER_COMMON_SUBEXPRESSION_ELIMINATION 1
+
+class Item;
+
+/**
+  Do simple CSE (common subexpression elimination) on “item�, and return
+  the answer. The CSE done is exclusively moving common expressions out
+  of conjunctions-of-disjunctions, ie. it rewrites
+
+    (a AND b) OR (a AND c)
+
+  into
+
+    a AND (b OR c)
+
+  The primary motivation is that such split-out items are more versatile;
+  they can be pushed independently, be made into hash join conditions etc.
+  However, an added bonus is that the expressions will simply execute faster.
+
+  This function does not descend into subexpressions that are not AND/OR
+  conjunctions, so e.g. an expression like
+
+    1 + ((a AND b) OR (a AND c))
+
+  will be left as-is.
+ */
+Item *CommonSubexpressionElimination(Item *cond);
+
+#endif  // SQL_JOIN_OPTIMIZER_COMMON_SUBEXPRESSION_ELIMINATION
diff -Nru mysql-8.0-8.0.26/sql/join_optimizer/cost_model.cc mysql-8.0-8.0.27/sql/join_optimizer/cost_model.cc
--- mysql-8.0-8.0.26/sql/join_optimizer/cost_model.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/join_optimizer/cost_model.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,266 @@
+/* Copyright (c) 2020, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include "sql/join_optimizer/cost_model.h"
+
+#include <math.h>
+#include <stdio.h>
+#include <algorithm>
+
+#include "mem_root_deque.h"
+#include "my_base.h"
+#include "sql/handler.h"
+#include "sql/item.h"
+#include "sql/item_subselect.h"
+#include "sql/join_optimizer/access_path.h"
+#include "sql/join_optimizer/bit_utils.h"
+#include "sql/join_optimizer/join_optimizer.h"
+#include "sql/join_optimizer/materialize_path_parameters.h"
+#include "sql/join_optimizer/relational_expression.h"
+#include "sql/mem_root_array.h"
+#include "sql/mysqld.h"
+#include "sql/opt_costmodel.h"
+#include "sql/sql_class.h"
+#include "sql/sql_const.h"
+#include "sql/sql_lex.h"
+#include "sql/sql_optimizer.h"
+#include "sql/sql_planner.h"
+#include "sql/system_variables.h"
+#include "sql/table.h"
+#include "template_utils.h"
+
+using std::min;
+
+double EstimateCostForRefAccess(THD *thd, TABLE *table, unsigned key_idx,
+                                double num_output_rows) {
+  // When asking the cost model for costs, the API takes in a double,
+  // but truncates it to an unsigned integer. This means that if we
+  // expect an index lookup to give e.g. 0.9 rows on average, the cost
+  // model will assume we get back 0 -- and even worse, InnoDB's
+  // cost model gives a cost of exactly zero for this case, ignoring
+  // entirely the startup cost! Obviously, a cost of zero would make
+  // it very attractive to line up a bunch of such lookups in a nestloop
+  // and nestloop-join against them, crowding out pretty much any other
+  // way to do a join, so to counteract both of these issues, we
+  // explicitly round up here. This can be removed if InnoDB's
+  // cost model is tuned better for this case.
+  const double hacked_num_output_rows = ceil(num_output_rows);
+
+  const double table_scan_cost = table->file->table_scan_cost().total_cost();
+  const double worst_seeks = find_worst_seeks(
+      table->cost_model(), hacked_num_output_rows, table_scan_cost);
+  return find_cost_for_ref(thd, table, key_idx, hacked_num_output_rows,
+                           worst_seeks);
+}
+
+void EstimateSortCost(AccessPath *path, ha_rows limit_rows) {
+  AccessPath *child = path->sort().child;
+  const double num_input_rows = child->num_output_rows;
+  const double num_output_rows =
+      path->sort().use_limit ? std::min<double>(num_input_rows, limit_rows)
+                             : num_input_rows;
+
+  double sort_cost;
+  if (num_input_rows <= 1.0) {
+    // Avoid NaNs from log2().
+    sort_cost = kSortOneRowCost;
+  } else {
+    // Filesort's complexity is O(n + k log k) with a limit, or O(n log n)
+    // without. See comment in Filesort_buffer::sort_buffer(). We can use the
+    // same calculation for both. If n = k (no limit, or the limit is higher
+    // than the number of input rows), O(n + k log k) is the same as
+    // O(n + n log n), which is equivalent to O(n log n) because n < n log n for
+    // large values of n. So we always calculate it as n + k log k:
+    sort_cost = kSortOneRowCost *
+                (num_input_rows +
+                 num_output_rows * std::max(log2(num_output_rows), 1.0));
+  }
+
+  path->num_output_rows = num_output_rows;
+  path->cost = path->init_cost = child->cost + sort_cost;
+  path->init_once_cost = 0.0;
+  path->num_output_rows_before_filter = path->num_output_rows;
+  path->cost_before_filter = path->cost;
+}
+
+// Estimate the width of each row produced by “query_block�,
+// for temporary table materialization.
+//
+// See EstimateRowWidth() in make_join_hypergraph.cc.
+static size_t EstimateRowWidth(const Query_block &query_block) {
+  size_t ret = 0;
+  for (const Item *item : query_block.fields) {
+    ret += min<size_t>(item->max_length, 4096);
+  }
+  return ret;
+}
+
+FilterCost EstimateFilterCost(THD *thd, double num_rows, Item *condition,
+                              Query_block *outer_query_block) {
+  FilterCost cost{0.0, 0.0, 0.0};
+  cost.cost_if_not_materialized = num_rows * kApplyOneFilterCost;
+  cost.cost_if_materialized = num_rows * kApplyOneFilterCost;
+  WalkItem(condition, enum_walk::POSTFIX,
+           [thd, num_rows, outer_query_block, &cost](Item *item) {
+             if (!IsItemInSubSelect(item)) {
+               return false;
+             }
+             Item_in_subselect *item_subs =
+                 down_cast<Item_in_subselect *>(item);
+
+             // TODO(sgunders): Respect subquery hints, which can force the
+             // strategy to be materialize.
+             Query_block *query_block = item_subs->unit->first_query_block();
+             const bool materializeable =
+                 item_subs->subquery_allows_materialization(
+                     thd, query_block, outer_query_block) &&
+                 query_block->subquery_strategy(thd) ==
+                     Subquery_strategy::CANDIDATE_FOR_IN2EXISTS_OR_MAT;
+
+             AccessPath *path = item_subs->unit->root_access_path();
+             if (path == nullptr) {
+               // In rare situations involving IN subqueries on the left side of
+               // other IN subqueries, the query block may not be part of the
+               // parent query block's list of inner query blocks. If so, it has
+               // not been optimized here. Since this is a rare case, we'll just
+               // skip it and assign it zero cost.
+               return false;
+             }
+
+             cost.cost_if_not_materialized += num_rows * path->cost;
+             if (materializeable) {
+               // We can't ask the handler for costs at this stage, since that
+               // requires an actual TABLE, and we don't want to be creating
+               // them every time we're evaluating a cost. Thus, instead,
+               // we ask the cost model for an estimate. Longer-term, these two
+               // estimates should really be guaranteed to be the same somehow.
+               Cost_model_server::enum_tmptable_type tmp_table_type;
+               if (EstimateRowWidth(*query_block) * num_rows <
+                   thd->variables.max_heap_table_size) {
+                 tmp_table_type = Cost_model_server::MEMORY_TMPTABLE;
+               } else {
+                 tmp_table_type = Cost_model_server::DISK_TMPTABLE;
+               }
+               cost.cost_if_materialized +=
+                   thd->cost_model()->tmptable_readwrite_cost(
+                       tmp_table_type, /*write_rows=*/0,
+                       /*read_rows=*/num_rows);
+               cost.cost_to_materialize +=
+                   path->cost + kMaterializeOneRowCost * path->num_output_rows;
+             } else {
+               cost.cost_if_materialized += num_rows * path->cost;
+             }
+             return false;
+           });
+  return cost;
+}
+
+// Very rudimentary (assuming no deduplication; it's better to overestimate
+// than to understimate), so that we get something that isn't “unknown�.
+void EstimateMaterializeCost(THD *thd, AccessPath *path) {
+  AccessPath *table_path = path->materialize().table_path;
+
+  path->cost = 0;
+  path->num_output_rows = 0;
+  double cost_for_cacheable = 0.0;
+  for (const MaterializePathParameters::QueryBlock &block :
+       path->materialize().param->query_blocks) {
+    if (block.subquery_path->num_output_rows >= 0.0) {
+      path->num_output_rows += block.subquery_path->num_output_rows;
+      path->cost += block.subquery_path->cost;
+      if (block.join != nullptr && block.join->query_block->is_cacheable()) {
+        cost_for_cacheable += block.subquery_path->cost;
+      }
+    }
+  }
+  path->cost += kMaterializeOneRowCost * path->num_output_rows;
+
+  if (table_path->type == AccessPath::TABLE_SCAN) {
+    table_path->num_output_rows = path->num_output_rows;
+    table_path->init_cost = table_path->init_once_cost = 0.0;
+
+    if (Overlaps(test_flags, TEST_NO_TEMP_TABLES)) {
+      // Unit tests don't load any temporary table engines,
+      // so just make up a number.
+      table_path->cost = path->num_output_rows * 0.1;
+    } else {
+      TABLE dummy_table;
+      TABLE *temp_table = table_path->table_scan().table;
+      if (temp_table == nullptr) {
+        // We need a dummy TABLE object to get estimates.
+        handlerton *handlerton = ha_default_temp_handlerton(thd);
+        dummy_table.file =
+            handlerton->create(handlerton, /*share=*/nullptr,
+                               /*partitioned=*/false, thd->mem_root);
+        dummy_table.file->set_ha_table(&dummy_table);
+        dummy_table.init_cost_model(thd->cost_model());
+        temp_table = &dummy_table;
+      }
+
+      // Try to get usable estimates. Ignored by InnoDB, but used by
+      // TempTable.
+      temp_table->file->stats.records = path->num_output_rows;
+      table_path->cost = temp_table->file->table_scan_cost().total_cost();
+    }
+  }
+
+  path->init_cost = path->cost + std::max(table_path->init_cost, 0.0);
+  path->init_once_cost = cost_for_cacheable;
+  path->cost = path->cost + std::max(table_path->cost, 0.0);
+}
+
+void EstimateAggregateCost(AccessPath *path) {
+  AccessPath *child = path->aggregate().child;
+
+  // TODO(sgunders): How do we estimate how many rows aggregation
+  // will be reducing the output by?
+  path->num_output_rows = child->num_output_rows;
+  path->init_cost = child->init_cost;
+  path->init_once_cost = child->init_once_cost;
+  path->cost = child->cost + kAggregateOneRowCost * child->num_output_rows;
+  path->num_output_rows_before_filter = path->num_output_rows;
+  path->cost_before_filter = path->cost;
+  path->ordering_state = child->ordering_state;
+}
+
+double FindOutputRowsForJoin(AccessPath *left_path, AccessPath *right_path,
+                             const JoinPredicate *edge,
+                             double already_applied_selectivity) {
+  const double outer_rows = left_path->num_output_rows;
+  const double inner_rows = right_path->num_output_rows;
+  const double selectivity = edge->selectivity / already_applied_selectivity;
+  if (edge->expr->type == RelationalExpression::ANTIJOIN) {
+    return outer_rows * (1.0 - selectivity);
+  } else {
+    double num_output_rows = outer_rows * inner_rows * selectivity;
+    if (edge->expr->type == RelationalExpression::LEFT_JOIN) {
+      num_output_rows = std::max(num_output_rows, outer_rows);
+    }
+    if (edge->expr->type == RelationalExpression::SEMIJOIN) {
+      num_output_rows =
+          std::min(num_output_rows, outer_rows / already_applied_selectivity);
+      num_output_rows =
+          std::min(num_output_rows, inner_rows / already_applied_selectivity);
+    }
+    return num_output_rows;
+  }
+}
diff -Nru mysql-8.0-8.0.26/sql/join_optimizer/cost_model.h mysql-8.0-8.0.27/sql/join_optimizer/cost_model.h
--- mysql-8.0-8.0.26/sql/join_optimizer/cost_model.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/join_optimizer/cost_model.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,79 @@
+/* Copyright (c) 2020, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef SQL_JOIN_OPTIMIZER_COST_MODEL_H_
+#define SQL_JOIN_OPTIMIZER_COST_MODEL_H_
+
+#include "my_base.h"
+
+struct AccessPath;
+class Item;
+struct JoinPredicate;
+class Query_block;
+class THD;
+struct TABLE;
+
+// These are extremely arbitrary cost model constants. We should revise them
+// based on actual query times (possibly using linear regression?), and then
+// put them into the cost model to make them user-tunable.
+constexpr double kApplyOneFilterCost = 0.1;
+constexpr double kAggregateOneRowCost = 0.1;
+constexpr double kSortOneRowCost = 0.1;
+constexpr double kHashBuildOneRowCost = 0.1;
+constexpr double kHashProbeOneRowCost = 0.1;
+constexpr double kHashReturnOneRowCost = 0.07;
+constexpr double kMaterializeOneRowCost = 0.1;
+constexpr double kWindowOneRowCost = 0.1;
+
+/// See EstimateFilterCost.
+struct FilterCost {
+  // Cost of evaluating the filter if nothing in particular is done with it.
+  double cost_if_not_materialized;
+
+  // Cost of evaluating the filter if all subqueries in it have been
+  // materialized beforehand. If there are no subqueries in the condition,
+  // equals cost_if_not_materialized.
+  double cost_if_materialized;
+
+  // Cost of materializing all subqueries present in the filter.
+  // If there are no subqueries in the condition, equals zero.
+  double cost_to_materialize;
+};
+
+/**
+  Estimate the cost of evaluating “condition�, “num_rows� times.
+  This is a fairly rudimentary estimation, _but_ it includes the cost
+  of any subqueries that may be present and that need evaluation.
+ */
+FilterCost EstimateFilterCost(THD *thd, double num_rows, Item *condition,
+                              Query_block *outer_query_block);
+
+double EstimateCostForRefAccess(THD *thd, TABLE *table, unsigned key_idx,
+                                double num_output_rows);
+void EstimateSortCost(AccessPath *path, ha_rows limit_rows = HA_POS_ERROR);
+void EstimateMaterializeCost(THD *thd, AccessPath *path);
+void EstimateAggregateCost(AccessPath *path);
+double FindOutputRowsForJoin(AccessPath *left_path, AccessPath *right_path,
+                             const JoinPredicate *edge,
+                             double already_applied_selectivity);
+
+#endif  // SQL_JOIN_OPTIMIZER_COST_MODEL_H_
diff -Nru mysql-8.0-8.0.26/sql/join_optimizer/estimate_filter_cost.h mysql-8.0-8.0.27/sql/join_optimizer/estimate_filter_cost.h
--- mysql-8.0-8.0.26/sql/join_optimizer/estimate_filter_cost.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/join_optimizer/estimate_filter_cost.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-/* Copyright (c) 2020, Oracle 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,
-   as published by the Free Software Foundation.
-
-   This program is also distributed with certain software (including
-   but not limited to OpenSSL) that is licensed under separate terms,
-   as designated in a particular file or component or in included license
-   documentation.  The authors of MySQL hereby grant you an additional
-   permission to link the program and your derivative works with the
-   separately licensed software that they have included with MySQL.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License, version 2.0, for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
-
-#ifndef SQL_JOIN_OPTIMIZER_ESTIMATE_FILTER_COST_H
-#define SQL_JOIN_OPTIMIZER_ESTIMATE_FILTER_COST_H
-
-class Item;
-class Query_block;
-class THD;
-
-/// See EstimateFilterCost.
-struct FilterCost {
-  // Cost of evaluating the filter if nothing in particular is done with it.
-  double cost_if_not_materialized;
-
-  // Cost of evaluating the filter if all subqueries in it have been
-  // materialized beforehand. If there are no subqueries in the condition,
-  // equals cost_if_not_materialized.
-  double cost_if_materialized;
-
-  // Cost of materializing all subqueries present in the filter.
-  // If there are no subqueries in the condition, equals zero.
-  double cost_to_materialize;
-};
-
-/**
-  Estimate the cost of evaluating “condition�, “num_rows� times.
-  This is a fairly rudimentary estimation, _but_ it includes the cost
-  of any subqueries that may be present and that need evaluation.
- */
-FilterCost EstimateFilterCost(THD *thd, double num_rows, Item *condition,
-                              Query_block *outer_query_block);
-
-#endif  // SQL_JOIN_OPTIMIZER_ESTIMATE_FILTER_COST_H
diff -Nru mysql-8.0-8.0.26/sql/join_optimizer/estimate_selectivity.cc mysql-8.0-8.0.27/sql/join_optimizer/estimate_selectivity.cc
--- mysql-8.0-8.0.26/sql/join_optimizer/estimate_selectivity.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/join_optimizer/estimate_selectivity.cc	2021-09-28 11:46:34.000000000 +0000
@@ -53,33 +53,55 @@
   when joining a row from some other table against this one, 25% of the records
   will match (equal distribution, zero correlation).
 
+  If there are multiple ones, we choose the one with the largest
+  selectivity (least selective). There are two main reasons for this:
+
+   - Databases generally tend to underestimate join cardinality
+     (due to assuming uncorrelated relations); if we're wrong, it would
+     better be towards overestimation to try to compensate.
+   - Overestimating the number of rows generally leads to safer choices
+     that are a little slower for few rows (e.g., hash join).
+     Underestimating, however, leads to choices that can be catastrophic
+     for many rows (e.g., nested loop against table scans). We should
+     clearly prefer the least risky choice here.
+
   Returns -1.0 if no index was found. Lifted from
   Item_equal::get_filtering_effect.
  */
-static double EstimateFieldSelectivity(Field *field) {
+static double EstimateFieldSelectivity(Field *field, string *trace) {
   const TABLE *table = field->table;
+  double selectivity = -1.0;
   for (uint j = 0; j < table->s->keys; j++) {
     if (field->key_start.is_set(j) &&
         table->key_info[j].has_records_per_key(0)) {
-      double selectivity =
-          table->key_info[j].records_per_key(0) / table->file->stats.records;
-
-      /*
-        Since rec_per_key and rows_per_table are calculated at
-        different times, their values may not be in synch and thus
-        it is possible that cur_filter is greater than 1.0 if
-        rec_per_key is outdated. Force the filter to 1.0 in such
-        cases.
-       */
-      return std::min(selectivity, 1.0);
+      double field_selectivity =
+          static_cast<double>(table->key_info[j].records_per_key(0)) /
+          table->file->stats.records;
+      if (trace != nullptr) {
+        *trace +=
+            StringPrintf(" - found candidate index %s with selectivity %f\n",
+                         table->key_info[j].name, field_selectivity);
+      }
+      selectivity = std::max(selectivity, field_selectivity);
     }
   }
-  return -1.0;
+
+  /*
+    Since rec_per_key and rows_per_table are calculated at
+    different times, their values may not be in synch and thus
+    it is possible that selectivity is greater than 1.0 if
+    rec_per_key is outdated. Force the filter to 1.0 in such
+    cases.
+   */
+  return std::min(selectivity, 1.0);
 }
 
 /**
   For the given condition, to try estimate its filtering selectivity,
   on a 0..1 scale (where 1.0 lets all records through).
+
+  TODO(sgunders): In some cases, composite indexes might allow us to do better
+  for joins with multiple predicates.
  */
 double EstimateSelectivity(THD *thd, Item *condition, string *trace) {
   // If the item is a true constant, we can say immediately whether it passes
@@ -91,38 +113,84 @@
 
   // For field = field (e.g. t1.x = t2.y), we try to use index information
   // to find a better selectivity estimate. We look for indexes on both
-  // fields. If there are multiple ones, we arbitrarily choose the first one;
-  // we have no reason to believe that one is better than the other.
-  // (This means that t1.x = t2.y might get a different estimate from
-  // t2.y = t1.x, but at least we call EstimateSelectivity() only once per
-  // is only called once per join edge.)
-  //
-  // For get_filtering_effect(), there is similar code in Item_func_equal,
-  // but as we currently don't support multiple equalities in the hypergraph
-  // join optimizer, it will never be called.
+  // fields, and pick the least selective (see EstimateFieldSelectivity()
+  // for why).
   if (condition->type() == Item::FUNC_ITEM &&
       down_cast<Item_func *>(condition)->functype() == Item_func::EQ_FUNC) {
     Item_func_eq *eq = down_cast<Item_func_eq *>(condition);
     Item *left = eq->arguments()[0];
     Item *right = eq->arguments()[1];
     if (left->type() == Item::FIELD_ITEM && right->type() == Item::FIELD_ITEM) {
+      double selectivity = -1.0;
       for (Field *field : {down_cast<Item_field *>(left)->field,
                            down_cast<Item_field *>(right)->field}) {
-        double field_selectivity = EstimateFieldSelectivity(field);
-        if (field_selectivity >= 0.0) {
-          if (trace != nullptr) {
-            *trace += StringPrintf(
-                " - found an index in %s.%s for %s, selectivity = %.3f\n",
-                field->table->alias, field->field_name,
-                ItemToString(condition).c_str(), field_selectivity);
-          }
-          return field_selectivity;
+        selectivity =
+            std::max(selectivity, EstimateFieldSelectivity(field, trace));
+      }
+      if (selectivity >= 0.0) {
+        if (trace != nullptr) {
+          *trace +=
+              StringPrintf(" - used an index for %s, selectivity = %.3f\n",
+                           ItemToString(condition).c_str(), selectivity);
         }
+        return selectivity;
+      }
+    }
+  }
+
+  // For multi-equalities, we do the same thing. This is maybe surprising;
+  // one would think that there are more degrees of freedom with more joins.
+  // However, given that we want the cardinality of the join ABC to be the
+  // same no matter what the join order is and which predicates we select,
+  // we can see that
+  //
+  //   |ABC| = |A| * |B| * |C| * S_ab * S_ac
+  //   |ACB| = |A| * |C| * |B| * S_ac * S_bc
+  //
+  // (where S_ab means selectivity of joining A with B, etc.)
+  // which immediately gives S_ac = S_bc, and similar equations give
+  // S_ab = S_ac and so on.
+  //
+  // So all the selectivities in the multi-equality must be the same!
+  // However, if you go to a database with real-world data, you will see that
+  // they actually differ, despite the mathematics disagreeing.
+  // The mystery, however, is resolved when we realize where we've made a
+  // simplification; the _real_ cardinality is given by:
+  //
+  //   |ABC| = (|A| * |B| * S_ab) * |C| * S_{ab,c}
+  //
+  // The selectivity of joining AB with C is not the same as the selectivity
+  // of joining B with C (since the correlation, which we do not model,
+  // differs), but we've approximated the former by the latter. And when we do
+  // this approximation, we also collapse all the degrees of freedom, and can
+  // have only one selectivity.
+  //
+  // If we get more sophisticated cardinality estimation, e.g. by histograms
+  // or the likes, we need to revisit this assumption, and potentially adjust
+  // our model here.
+  if (condition->type() == Item::FUNC_ITEM &&
+      down_cast<Item_func *>(condition)->functype() ==
+          Item_func::MULT_EQUAL_FUNC) {
+    Item_equal *equal = down_cast<Item_equal *>(condition);
+
+    // These should have been expanded early, before we get here.
+    assert(equal->get_const() == nullptr);
+
+    double selectivity = -1.0;
+    for (Item_field &field : equal->get_fields()) {
+      selectivity =
+          std::max(selectivity, EstimateFieldSelectivity(field.field, trace));
+    }
+    if (selectivity >= 0.0) {
+      if (trace != nullptr) {
+        *trace += StringPrintf(" - used an index for %s, selectivity = %.3f\n",
+                               ItemToString(condition).c_str(), selectivity);
       }
+      return selectivity;
     }
   }
 
-  // No such thing, so use Item::get_filtering_effect().
+  // Index information did not help us, so use Item::get_filtering_effect().
   //
   // There is a challenge in that the Item::get_filtering_effect() API
   // is intrinsically locked to the old join optimizer's way of thinking,
diff -Nru mysql-8.0-8.0.26/sql/join_optimizer/explain_access_path.cc mysql-8.0-8.0.27/sql/join_optimizer/explain_access_path.cc
--- mysql-8.0-8.0.26/sql/join_optimizer/explain_access_path.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/join_optimizer/explain_access_path.cc	2021-09-28 11:46:34.000000000 +0000
@@ -29,7 +29,7 @@
 #include "sql/hash_join_iterator.h"
 #include "sql/item_sum.h"
 #include "sql/join_optimizer/relational_expression.h"
-#include "sql/opt_range.h"
+#include "sql/range_optimizer/range_optimizer.h"
 #include "sql/ref_row_iterators.h"
 #include "sql/sorting_iterator.h"
 #include "sql/sql_optimizer.h"
@@ -134,6 +134,9 @@
                "Select #%d (subquery in %s; run only once)",
                query_block->select_number, source_text);
     }
+    if (query_block->join->needs_finalize) {
+      subselect->unit->finalize(current_thd);
+    }
     AccessPath *path;
     if (subselect->unit->root_access_path() != nullptr) {
       path = subselect->unit->root_access_path();
@@ -171,12 +174,9 @@
 
 ExplainData ExplainAccessPath(const AccessPath *path, JOIN *join);
 
-// The table iterator could be a whole string of iterators
-// (sort, filter, etc.) due to add_sorting_to_table(), so show them all.
-//
-// TODO(sgunders): Make the optimizer put these on top of the
-// MaterializeIterator instead (or perhaps better yet, on the subquery
-// iterator), so that table_iterator is always just a single basic iterator.
+// The table iterator could be a slightly more complicated iterator than
+// the basic iterators (in particular, ALTERNATIVE), so show the entire
+// thing.
 static void AddTableIteratorDescription(const AccessPath *path, JOIN *join,
                                         vector<string> *description) {
   const AccessPath *subpath = path;
@@ -184,7 +184,7 @@
     ExplainData explain = ExplainAccessPath(subpath, join);
     for (string str : explain.description) {
       if (explain.children.size() > 1) {
-        // This can happen if e.g. a filter has subqueries in it.
+        // This can happen if we have AlternativeIterator.
         // TODO(sgunders): Consider having a RowIterator::parent(),
         // so that we can show the entire tree.
         str += " [other sub-iterators not shown]";
@@ -336,8 +336,9 @@
       assert(table->file->pushed_idx_cond == nullptr);
 
       const KEY *key = &table->key_info[path->index_scan().idx];
-      string str =
-          string("Index scan on ") + table->alias + " using " + key->name;
+      string str = string(table->key_read ? "Covering index scan on "
+                                          : "Index scan on ") +
+                   table->alias + " using " + key->name;
       if (path->index_scan().reverse) {
         str += " (reverse)";
       }
@@ -350,8 +351,9 @@
     case AccessPath::REF: {
       TABLE *table = path->ref().table;
       const KEY *key = &table->key_info[path->ref().ref->key];
-      string str = string("Index lookup on ") + table->alias + " using " +
-                   key->name + " (" +
+      string str = string(table->key_read ? "Covering index lookup on "
+                                          : "Index lookup on ") +
+                   table->alias + " using " + key->name + " (" +
                    RefToString(*path->ref().ref, key, /*include_nulls=*/false);
       if (path->ref().reverse) {
         str += "; iterate backwards";
@@ -370,8 +372,9 @@
       TABLE *table = path->ref_or_null().table;
       const KEY *key = &table->key_info[path->ref_or_null().ref->key];
       string str =
-          string("Index lookup on ") + table->alias + " using " + key->name +
-          " (" +
+          string(table->key_read ? "Covering index lookup on "
+                                 : "Index lookup on ") +
+          table->alias + " using " + key->name + " (" +
           RefToString(*path->ref_or_null().ref, key, /*include_nulls=*/true) +
           ")";
       if (table->file->pushed_idx_cond != nullptr) {
@@ -387,8 +390,9 @@
       TABLE *table = path->eq_ref().table;
       const KEY *key = &table->key_info[path->eq_ref().ref->key];
       string str =
-          string("Single-row index lookup on ") + table->alias + " using " +
-          key->name + " (" +
+          string(table->key_read ? "Single-row covering index lookup on "
+                                 : "Single-row index lookup on ") +
+          table->alias + " using " + key->name + " (" +
           RefToString(*path->eq_ref().ref, key, /*include_nulls=*/false) + ")";
       if (table->file->pushed_idx_cond != nullptr) {
         str += ", with index condition: " +
@@ -405,9 +409,10 @@
       const KEY *key = &table->key_info[path->pushed_join_ref().ref->key];
       string str;
       if (path->pushed_join_ref().is_unique) {
-        str = string("Single-row index");
+        str =
+            table->key_read ? "Single-row covering index" : "Single-row index";
       } else {
-        str = string("Index");
+        str = table->key_read ? "Covering index" : "Index";
       }
       str += " lookup on " + string(table->alias) + " using " + key->name +
              " (" +
@@ -421,7 +426,9 @@
       TABLE *table = path->full_text_search().table;
       assert(table->file->pushed_idx_cond == nullptr);
       const KEY *key = &table->key_info[path->full_text_search().ref->key];
-      description.push_back(string("Indexed full text search on ") +
+      description.push_back(string(table->key_read
+                                       ? "Full-text covering index search on "
+                                       : "Full-text index search on ") +
                             table->alias + " using " + key->name + " (" +
                             RefToString(*path->full_text_search().ref, key,
                                         /*include_nulls=*/false) +
@@ -438,10 +445,11 @@
     case AccessPath::MRR: {
       TABLE *table = path->mrr().table;
       const KEY *key = &table->key_info[path->mrr().ref->key];
-      string str = string("Multi-range index lookup on ") + table->alias +
-                   " using " + key->name + " (" +
-                   RefToString(*path->mrr().ref, key, /*include_nulls=*/false) +
-                   ")";
+      string str =
+          string(table->key_read ? "Multi-range covering index lookup on "
+                                 : "Multi-range index lookup on ") +
+          table->alias + " using " + key->name + " (" +
+          RefToString(*path->mrr().ref, key, /*include_nulls=*/false) + ")";
       if (table->file->pushed_idx_cond != nullptr) {
         str += ", with index condition: " +
                ItemToString(table->file->pushed_idx_cond);
@@ -462,8 +470,9 @@
       // get better outputs here (similar to dbug_dump()).
       String str;
       path->index_range_scan().quick->add_info_string(&str);
-      string ret = string("Index range scan on ") + table->alias + " using " +
-                   to_string(str);
+      string ret = string(table->key_read ? "Covering index range scan on "
+                                          : "Index range scan on ") +
+                   table->alias + " using " + to_string(str);
       if (table->file->pushed_idx_cond != nullptr) {
         ret += ", with index condition: " +
                ItemToString(table->file->pushed_idx_cond);
@@ -478,8 +487,9 @@
       // TODO(sgunders): Convert QUICK_SELECT_I to RowIterator so that we can
       // get better outputs here (similar to dbug_dump()), although it might get
       // tricky when there are many alternatives.
-      string str = string("Index range scan on ") + table->alias +
-                   " (re-planned for each iteration)";
+      string str = string(table->key_read ? "Covering index range scan on "
+                                          : "Index range scan on ") +
+                   table->alias + " (re-planned for each iteration)";
       if (table->file->pushed_idx_cond != nullptr) {
         str += ", with index condition: " +
                ItemToString(table->file->pushed_idx_cond);
@@ -872,9 +882,21 @@
     ++level;
   }
 
+  // If we are crossing into a different query block, but there's a streaming
+  // or materialization node in the way, don't count it as the root; we want
+  // any SELECT printouts to be on the actual root node.
+  // TODO(sgunders): This gives the wrong result if a query block ends in a
+  // materialization.
+  bool delayed_root_of_join = false;
+  if (path->type == AccessPath::STREAM ||
+      path->type == AccessPath::MATERIALIZE) {
+    delayed_root_of_join = is_root_of_join;
+    is_root_of_join = false;
+  }
+
   for (const ExplainData::Child &child : explain.children) {
     JOIN *subjoin = child.join != nullptr ? child.join : join;
-    bool child_is_root_of_join = subjoin != join;
+    bool child_is_root_of_join = subjoin != join || delayed_root_of_join;
     if (!child.description.empty()) {
       ret.append(level * 4, ' ');
       ret.append("-> ");
diff -Nru mysql-8.0-8.0.26/sql/join_optimizer/finalize_plan.cc mysql-8.0-8.0.27/sql/join_optimizer/finalize_plan.cc
--- mysql-8.0-8.0.26/sql/join_optimizer/finalize_plan.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/join_optimizer/finalize_plan.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,626 @@
+/* Copyright (c) 2020, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include <assert.h>
+#include <list>
+#include <utility>
+
+#include "mem_root_deque.h"
+#include "my_alloc.h"
+#include "my_base.h"
+#include "my_inttypes.h"
+#include "my_sqlcommand.h"
+#include "prealloced_array.h"
+#include "sql/filesort.h"
+#include "sql/item.h"
+#include "sql/item_sum.h"
+#include "sql/join_optimizer/access_path.h"
+#include "sql/join_optimizer/join_optimizer.h"
+#include "sql/join_optimizer/materialize_path_parameters.h"
+#include "sql/join_optimizer/node_map.h"
+#include "sql/join_optimizer/relational_expression.h"
+#include "sql/join_optimizer/replace_item.h"
+#include "sql/join_optimizer/walk_access_paths.h"
+#include "sql/mem_root_array.h"
+#include "sql/sql_class.h"
+#include "sql/sql_executor.h"
+#include "sql/sql_insert.h"
+#include "sql/sql_lex.h"
+#include "sql/sql_list.h"
+#include "sql/sql_optimizer.h"
+#include "sql/sql_resolver.h"
+#include "sql/sql_select.h"
+#include "sql/sql_tmp_table.h"
+#include "sql/table.h"
+#include "sql/temp_table_param.h"
+#include "sql/visible_fields.h"
+#include "sql/window.h"
+#include "template_utils.h"
+
+/**
+  Replaces field references in an ON DUPLICATE KEY UPDATE clause with references
+  to corresponding fields in a temporary table. The changes will be rolled back
+  at the end of execution and will have to be redone during optimization in the
+  next execution.
+ */
+static void ReplaceUpdateValuesWithTempTableFields(
+    Sql_cmd_insert_select *sql_cmd, Query_block *query_block,
+    const mem_root_deque<Item *> &original_fields,
+    const mem_root_deque<Item *> &temp_table_fields) {
+  assert(CountVisibleFields(original_fields) ==
+         CountVisibleFields(temp_table_fields));
+
+  if (sql_cmd->update_value_list.empty()) return;
+
+  auto tmp_field_it = VisibleFields(temp_table_fields).begin();
+  for (Item *orig_field : VisibleFields(original_fields)) {
+    Item *tmp_field = *tmp_field_it++;
+    if (orig_field->type() == Item::FIELD_ITEM) {
+      Item::Item_field_replacement replacement(
+          down_cast<Item_field *>(orig_field)->field,
+          down_cast<Item_field *>(tmp_field), query_block);
+      for (Item *&orig_item : sql_cmd->update_value_list) {
+        uchar *dummy;
+        Item *new_item = orig_item->compile(
+            &Item::visit_all_analyzer, &dummy, &Item::replace_item_field,
+            pointer_cast<uchar *>(&replacement));
+        if (new_item != orig_item) {
+          query_block->join->thd->change_item_tree(&orig_item, new_item);
+        }
+      }
+    }
+  }
+}
+
+/**
+  Creates a temporary table with columns matching the SELECT list of the given
+  query block. (In FinalizePlanForQueryBlock(), the SELECT list of the
+  query block is updated to point to the fields in the temporary table, but not
+  here.)
+
+  This function is used for materializing the query result, either as an
+  intermediate step before sorting the final result if the sort requires the
+  rows to come from a single table instead of a join, or as the last step if the
+  SQL_BUFFER_RESULT query option has been specified. It is also used for setting
+  up the output temporary table for window functions.
+
+  NOTE: If after_aggregation = true, it is impossible to call this function
+  again later with after_aggregation = false, as count_field_types() will
+  remove item->has_aggregation() once called. Thus, we need to set up all
+  these temporary tables in FinalizePlanForQueryBlock(), in the right order.
+ */
+static TABLE *CreateTemporaryTableFromSelectList(
+    THD *thd, Query_block *query_block, Window *window,
+    Temp_table_param **temp_table_param_arg, bool after_aggregation) {
+  JOIN *join = query_block->join;
+
+  Temp_table_param *temp_table_param = new (thd->mem_root) Temp_table_param;
+  *temp_table_param_arg = temp_table_param;
+  assert(!temp_table_param->precomputed_group_by);
+  assert(!temp_table_param->skip_create_table);
+  temp_table_param->m_window = window;
+  count_field_types(query_block, temp_table_param, *join->fields,
+                    /*reset_with_sum_func=*/after_aggregation,
+                    /*save_sum_fields=*/after_aggregation);
+
+  TABLE *temp_table = create_tmp_table(
+      thd, temp_table_param, *join->fields,
+      /*group=*/nullptr, /*distinct=*/false,
+      /*save_sum_fields=*/after_aggregation, query_block->active_options(),
+      /*rows_limit=*/HA_POS_ERROR, "<temporary>");
+
+  if (after_aggregation) {
+    // Most items have been added to items_to_copy in create_tmp_field(), but
+    // not non-window aggregate functions, so add them here.
+    //
+    // Note that MIN/MAX in the presence of an index have special semantics
+    // where they are filled out elsewhere and may not have a result field,
+    // so we need to skip those that don't have one.
+    for (Item *item : *join->fields) {
+      if (item->type() == Item::SUM_FUNC_ITEM &&
+          !item->real_item()->m_is_window_function &&
+          item->get_result_field() != nullptr) {
+        temp_table_param->items_to_copy->push_back(
+            Func_ptr{item, item->get_result_field()});
+      }
+
+      // Verify that all non-constant, non-window-related items
+      // have been added to items_to_copy.
+      assert(item->const_for_execution() || item->has_wf() ||
+             std::any_of(
+                 temp_table_param->items_to_copy->begin(),
+                 temp_table_param->items_to_copy->end(),
+                 [item](const Func_ptr &ptr) { return ptr.func() == item; }));
+    }
+  } else {
+    // create_tmp_table() doesn't understand that rollup group items
+    // are not materializable before aggregation has run, so we simply
+    // take them out of the copy, and the replacement logic will do the rest
+    // (e.g. rollup_group_item(t1.x)+2 -> rollup_group_item(<temporary>.x)+2).
+    // This works because the base fields are always included. The logic is
+    // very similar to what happens in change_to_use_tmp_fields_except_sums().
+    //
+    // TODO: Consider removing the rollup group items on the inner levels,
+    // similar to what change_to_use_tmp_fields_except_sums() does.
+    auto new_end = std::remove_if(
+        temp_table_param->items_to_copy->begin(),
+        temp_table_param->items_to_copy->end(),
+        [](const Func_ptr &func) { return func.func()->has_rollup_expr(); });
+    temp_table_param->items_to_copy->erase(
+        new_end, temp_table_param->items_to_copy->end());
+  }
+
+  // We made a new table, so make sure it gets properly cleaned up
+  // at the end of execution.
+  join->temp_tables.push_back(
+      JOIN::TemporaryTableToCleanup{temp_table, temp_table_param});
+
+  return temp_table;
+}
+
+/**
+  Replaces the items in the SELECT list with items that point to fields in a
+  temporary table. See FinalizePlanForQueryBlock() for more information.
+ */
+static void ReplaceSelectListWithTempTableFields(
+    THD *thd, JOIN *join, const Func_ptr_array &items_to_copy) {
+  auto fields = new (thd->mem_root) mem_root_deque<Item *>(thd->mem_root);
+  for (Item *item : *join->fields) {
+    fields->push_back(
+        FindReplacementOrReplaceMaterializedItems(thd, item, items_to_copy,
+                                                  /*need_exact_match=*/true));
+  }
+  join->fields = fields;
+}
+
+void ReplaceOrderItemsWithTempTableFields(THD *thd, ORDER *order,
+                                          const Func_ptr_array &items_to_copy) {
+  for (; order != nullptr; order = order->next) {
+    Item *temp_field_item = FindReplacementOrReplaceMaterializedItems(
+        thd, *order->item, items_to_copy, /*need_exact_match=*/true);
+    if (temp_field_item != *order->item) {
+      // *order->item points into a memory area (the “base ref slice�)
+      // where HAVING might expect to find items _not_ pointing into the
+      // temporary table (if there is true materialization, it should run
+      // before it to minimize the size of the sorted input), so in order to
+      // not disturb it, we create a whole new place for the Item pointer
+      // to live.
+      //
+      // TODO(sgunders): When we get rid of slices altogether,
+      // we can skip this.
+      thd->change_item_tree(pointer_cast<Item **>(&order->item),
+                            pointer_cast<Item *>(new (thd->mem_root) Item *));
+      thd->change_item_tree(order->item, temp_field_item);
+    }
+  }
+}
+
+// If the AccessPath is an operation that copies items into a temporary
+// table (MATERIALIZE, STREAM or WINDOW) within the same query block,
+// returns the items it's copying (in the form of temporary table parameters).
+// If not, return nullptr.
+static Temp_table_param *GetItemsToCopy(AccessPath *path) {
+  if (path->type == AccessPath::STREAM) {
+    if (path->stream().table->pos_in_table_list != nullptr) {
+      // Materializes a different query block.
+      return nullptr;
+    }
+    return path->stream().temp_table_param;
+  }
+  if (path->type == AccessPath::MATERIALIZE) {
+    const MaterializePathParameters *param = path->materialize().param;
+    if (param->table->pos_in_table_list != nullptr) {
+      // Materializes a different query block.
+      return nullptr;
+    }
+    assert(param->query_blocks.size() == 1);
+    if (!param->query_blocks[0].copy_items) {
+      return nullptr;
+    }
+    return param->query_blocks[0].temp_table_param;
+  }
+  if (path->type == AccessPath::WINDOW) {
+    return path->window().temp_table_param;
+  }
+  return nullptr;
+}
+
+/// See FinalizePlanForQueryBlock().
+static void UpdateReferencesToMaterializedItems(
+    THD *thd, Query_block *query_block, AccessPath *path,
+    bool after_aggregation,
+    Mem_root_array<const Func_ptr_array *> *applied_replacements) {
+  JOIN *join = query_block->join;
+  const mem_root_deque<Item *> *original_fields = join->fields;
+  Temp_table_param *temp_table_param = GetItemsToCopy(path);
+  if (temp_table_param != nullptr) {
+    // Update source references in this materialization.
+    for (const Func_ptr_array *earlier_replacement : *applied_replacements) {
+      for (Func_ptr &func : *temp_table_param->items_to_copy) {
+        func.set_func(FindReplacementOrReplaceMaterializedItems(
+            thd, func.func(), *earlier_replacement,
+            /*need_exact_match=*/true));
+      }
+    }
+    applied_replacements->push_back(temp_table_param->items_to_copy);
+
+    // Update SELECT list and IODKU references.
+    ReplaceSelectListWithTempTableFields(thd, join,
+                                         *temp_table_param->items_to_copy);
+    if (thd->lex->sql_command == SQLCOM_INSERT_SELECT) {
+      ReplaceUpdateValuesWithTempTableFields(
+          down_cast<Sql_cmd_insert_select *>(thd->lex->m_sql_cmd), query_block,
+          *original_fields, *join->fields);
+    }
+    if (after_aggregation) {
+      // Due to the use of Item_aggregate_ref, we can effectively sometimes have
+      // sum_func(rollup_wrapper(rollup_wrapper(x), n), n)), and
+      // ReplaceSelectListWithTempTableFields() will only be able to remove the
+      // inner one. This can be problematic for buffering window functions,
+      // which need to be able to load back old values for x and reevaluate
+      // the expression -- but it is not able to load back the state of the
+      // rollup functions, so we get inconsistency.
+      //
+      // Thus, unwrap the remaining layer here.
+      const auto replace_functor = [](Item *sub_item, Item *,
+                                      unsigned) -> ReplaceResult {
+        if (is_rollup_group_wrapper(sub_item)) {
+          return {ReplaceResult::REPLACE, unwrap_rollup_group(sub_item)};
+        } else {
+          return {ReplaceResult::KEEP_TRAVERSING, nullptr};
+        }
+      };
+      for (Item *item : *join->fields) {
+        WalkAndReplace(thd, item, replace_functor);
+      }
+    }
+  } else if (path->type == AccessPath::SORT) {
+    assert(path->sort().filesort == nullptr);
+    for (const Func_ptr_array *earlier_replacement : *applied_replacements) {
+      ReplaceOrderItemsWithTempTableFields(thd, path->sort().order,
+                                           *earlier_replacement);
+    }
+
+    // Set up a Filesort object for this sort.
+    Mem_root_array<TABLE *> tables = CollectTables(thd, path);
+    const ha_rows limit_rows = path->sort().use_limit
+                                   ? join->query_expression()->select_limit_cnt
+                                   : HA_POS_ERROR;
+    path->sort().filesort = new (thd->mem_root)
+        Filesort(thd, std::move(tables),
+                 /*keep_buffers=*/false, path->sort().order, limit_rows,
+                 path->sort().remove_duplicates, /*force_sort_positions=*/false,
+                 path->sort().unwrap_rollup);
+    join->filesorts_to_cleanup.push_back(path->sort().filesort);
+    if (!path->sort().filesort->using_addon_fields()) {
+      FindTablesToGetRowidFor(path);
+    }
+  } else if (path->type == AccessPath::FILTER) {
+    // Only really relevant for in2exists filters that run after
+    // windowing.
+    for (const Func_ptr_array *earlier_replacement : *applied_replacements) {
+      path->filter().condition = FindReplacementOrReplaceMaterializedItems(
+          thd, path->filter().condition, *earlier_replacement,
+          /*need_exact_match=*/true);
+    }
+  } else if (path->type == AccessPath::REMOVE_DUPLICATES) {
+    Item **group_items = path->remove_duplicates().group_items;
+    for (int i = 0; i < path->remove_duplicates().group_items_size; ++i) {
+      for (const Func_ptr_array *earlier_replacement : *applied_replacements) {
+        group_items[i] = FindReplacementOrReplaceMaterializedItems(
+            thd, group_items[i], *earlier_replacement,
+            /*need_exact_match=*/true);
+      }
+    }
+  }
+}
+
+/**
+  If the given access path needs a temporary table, it instantiates
+  said table (we cannot do this until we have a final access path
+  list, where we know which temporary tables are created and in which order).
+  For window functions, it also needs to forward this information to the
+  materialization access path coming right after this window, if any,
+  so it uses last_window_temp_table as a buffer to hold this.
+ */
+static void DelayedCreateTemporaryTable(THD *thd, Query_block *query_block,
+                                        AccessPath *path,
+                                        bool after_aggregation,
+                                        TABLE **last_window_temp_table,
+                                        unsigned *num_windows_seen) {
+  if (path->type == AccessPath::WINDOW) {
+    // Create the temporary table and parameters.
+    Window *window = path->window().window;
+    assert(path->window().temp_table == nullptr);
+    assert(path->window().temp_table_param == nullptr);
+    ++*num_windows_seen;
+    window->set_is_last(*num_windows_seen ==
+                        query_block->join->m_windows.size());
+    path->window().temp_table = CreateTemporaryTableFromSelectList(
+        thd, query_block, window, &path->window().temp_table_param,
+        /*after_aggregation=*/true);
+    path->window().temp_table_param->m_window = window;
+    *last_window_temp_table = path->window().temp_table;
+  } else if (path->type == AccessPath::MATERIALIZE) {
+    if (path->materialize().param->table == nullptr) {
+      if (*last_window_temp_table != nullptr) {
+        // A materialization that comes directly after a window;
+        // it's intended to materialize the output of that window.
+        path->materialize().param->table =
+            path->materialize().table_path->table_scan().table =
+                *last_window_temp_table;
+      } else {
+        // All other materializations are of the SELECT list.
+        assert(path->materialize().param->query_blocks.size() == 1);
+        TABLE *table = CreateTemporaryTableFromSelectList(
+            thd, query_block, nullptr,
+            &path->materialize().param->query_blocks[0].temp_table_param,
+            after_aggregation);
+        path->materialize().param->table =
+            path->materialize().table_path->table_scan().table = table;
+      }
+      EstimateMaterializeCost(thd, path);
+    }
+    *last_window_temp_table = nullptr;
+  } else if (path->type == AccessPath::STREAM) {
+    if (path->stream().table == nullptr) {
+      path->stream().table = CreateTemporaryTableFromSelectList(
+          thd, query_block, nullptr, &path->stream().temp_table_param,
+          after_aggregation);
+    }
+    *last_window_temp_table = nullptr;
+  } else {
+    *last_window_temp_table = nullptr;
+  }
+}
+
+/// See FinalizePlanForQueryBlock().
+static void FinalizeWindowPath(
+    THD *thd, Query_block *query_block,
+    const mem_root_deque<Item *> &original_fields,
+    const Mem_root_array<const Func_ptr_array *> &applied_replacements,
+    AccessPath *path) {
+  JOIN *join = query_block->join;
+  Temp_table_param *temp_table_param = path->window().temp_table_param;
+  Window *window = path->window().window;
+  for (const Func_ptr_array *earlier_replacement : applied_replacements) {
+    window->apply_temp_table(thd, *earlier_replacement);
+  }
+  if (path->window().needs_buffering) {
+    // Create the framebuffer. Note that it could exist already
+    // (with an identical structure) if we are planning twice,
+    // for in2exists.
+    if (window->frame_buffer() == nullptr) {
+      CreateFramebufferTable(thd, *path->window().temp_table_param,
+                             *query_block, original_fields, *join->fields,
+                             temp_table_param->items_to_copy, window);
+    }
+  } else {
+    for (Func_ptr &func : *temp_table_param->items_to_copy) {
+      // Even without buffering, some window functions will read
+      // their arguments out of the output table, so we need to apply
+      // our own temporary table to them. (For cases with buffering,
+      // this replacement, or a less strict version, is done in
+      // CreateFramebufferTable().)
+      if (func.should_copy(CFT_HAS_WF) || func.should_copy(CFT_WF)) {
+        ReplaceMaterializedItems(thd, func.func(),
+                                 *temp_table_param->items_to_copy,
+                                 /*need_exact_match=*/true);
+      }
+    }
+  }
+  window->make_special_rows_cache(thd, path->window().temp_table);
+}
+
+static bool ContainsMaterialization(AccessPath *path) {
+  bool found = false;
+  WalkAccessPaths(path, /*join=*/nullptr,
+                  WalkAccessPathPolicy::STOP_AT_MATERIALIZATION,
+                  [&found](AccessPath *sub_path, JOIN *) {
+                    if (sub_path->type == AccessPath::MATERIALIZE) {
+                      found = true;
+                    }
+                    return found;
+                  });
+  return found;
+}
+
+static Item *AddCachesAroundConstantConditions(Item *item) {
+  cache_const_expr_arg cache_arg;
+  cache_const_expr_arg *analyzer_arg = &cache_arg;
+  return item->compile(
+      &Item::cache_const_expr_analyzer, pointer_cast<uchar **>(&analyzer_arg),
+      &Item::cache_const_expr_transformer, pointer_cast<uchar *>(&cache_arg));
+}
+
+[[nodiscard]] static bool AddCachesAroundConstantConditionsInPath(
+    AccessPath *path) {
+  // TODO(sgunders): We could probably also add on sort and GROUP BY
+  // expressions, even though most of them should have been removed by the
+  // interesting order framework. The same with the SELECT list and
+  // expressions used in materializations.
+  switch (path->type) {
+    case AccessPath::FILTER:
+      path->filter().condition =
+          AddCachesAroundConstantConditions(path->filter().condition);
+      return path->filter().condition == nullptr;
+    case AccessPath::HASH_JOIN:
+      for (Item *&item :
+           path->hash_join().join_predicate->expr->join_conditions) {
+        item = AddCachesAroundConstantConditions(item);
+        if (item == nullptr) {
+          return true;
+        }
+      }
+      return false;
+    default:
+      return false;
+  }
+}
+
+/*
+  Do the final touchups of the access path tree, once we have selected a final
+  plan (ie., there are no more alternatives). There are currently two major
+  tasks to do here: Account for materializations (because we cannot do it until
+  we have the entire plan), and set up filesorts (because it involves
+  constructing new objects, so we don't want to do it for unused candidates).
+  The former also influences the latter.
+
+  Materializations in particular are a bit tricky due to the way our item system
+  works; expression evaluation cares intimately about _where_ values come from,
+  not just what they are (i.e., all non-leaf Items carry references to other
+  Items, and pull data only from there). Thus, whenever an Item is materialized,
+  references to that Item need to be modified to instead point into the correct
+  field in the temporary table. We traverse the tree bottom-up and keep track of
+  which materializations are active, and modify the appropriate Item lists at
+  any given point, so that they point to the right place. We currently modify:
+
+    - The SELECT list. (There is only one, so we can update it as we go.)
+    - Referenced fields for INSERT ... ON DUPLICATE KEY UPDATE (IODKU);
+      also updated as we go.
+    - Sort keys (e.g. for ORDER BY).
+    - The HAVING clause, if the materialize node is below an aggregate node.
+      (If the materialization is above aggregation, the HAVING clause has
+      already accomplished its mission of filtering out the uninteresting
+      results, and will not be evaluated anymore.)
+
+  Surprisingly enough, we also need to update the materialization parameters
+  themselves. Say that we first have a materialization that copies
+  t1.x -> <temp1>.x. After that, we have a materialization that copies
+  t1.x -> <temp2>.x. For this to work properly, we obviously need to go in
+  and modify the second one so that it instead says <temp1>.x -> <temp2>.x,
+  ie., the copy is done from the correct source.
+
+  You cannot yet insert temporary tables in arbitrary places in the query;
+  in particular, we do not yet handle these rewrites (although they would
+  very likely be possible):
+
+    - Group elements for aggregations (GROUP BY). Do note that
+      create_tmp_table() will replace elements within aggregate functions
+      if you set save_sum_funcs=false; you may also want to supplant
+      this mechanism.
+    - Filters (e.g. WHERE predicates); do note that partial pushdown may
+      present its own challenges.
+    - Join conditions.
+ */
+bool FinalizePlanForQueryBlock(THD *thd, Query_block *query_block,
+                               AccessPath *root_path) {
+  assert(query_block->join->needs_finalize);
+
+  Query_block *old_query_block = thd->lex->current_query_block();
+  thd->lex->set_current_query_block(query_block);
+
+  // If we have a sort node (e.g. for GROUP BY) with a materialization under it,
+  // we need to make sure that what we sort on is included in the
+  // materialization. (We do this by putting it into the field list, and then
+  // removing it at the end of the function.) This is a bit overconservative
+  // (e.g., we don't need to include it in later materializations, too), but the
+  // situation should be fairly rare.
+  Mem_root_array<std::pair<Item *, bool>> extra_fields_needed(thd->mem_root);
+  mem_root_deque<Item *> *base_fields = query_block->join->fields;
+  WalkAccessPaths(
+      root_path, query_block->join, WalkAccessPathPolicy::ENTIRE_QUERY_BLOCK,
+      [&extra_fields_needed](AccessPath *path, JOIN *join) {
+        if (path->type == AccessPath::SORT && ContainsMaterialization(path)) {
+          for (ORDER *order = path->sort().order; order != nullptr;
+               order = order->next) {
+            Item *item = *order->item;
+            if (std::none_of(join->fields->begin(), join->fields->end(),
+                             [item](Item *other_item) {
+                               return item->eq(other_item, /*binary_cmp=*/true);
+                             })) {
+              extra_fields_needed.push_back(std::make_pair(item, item->hidden));
+              item->hidden = true;
+              join->fields->push_front(item);
+            }
+          }
+        }
+        return false;
+      });
+
+  Mem_root_array<const Func_ptr_array *> applied_replacements(thd->mem_root);
+  TABLE *last_window_temp_table = nullptr;
+  unsigned num_windows_seen = 0;
+  bool error = false;
+  bool after_aggregation = false;
+  WalkAccessPaths(
+      root_path, query_block->join, WalkAccessPathPolicy::ENTIRE_QUERY_BLOCK,
+      [thd, query_block, &applied_replacements, &last_window_temp_table,
+       &num_windows_seen, &error,
+       &after_aggregation](AccessPath *path, JOIN *join) {
+        if (error) return true;
+        DelayedCreateTemporaryTable(thd, query_block, path, after_aggregation,
+                                    &last_window_temp_table, &num_windows_seen);
+
+        const mem_root_deque<Item *> *original_fields = join->fields;
+        UpdateReferencesToMaterializedItems(
+            thd, query_block, path, after_aggregation, &applied_replacements);
+        if (path->type == AccessPath::WINDOW) {
+          FinalizeWindowPath(thd, query_block, *original_fields,
+                             applied_replacements, path);
+        } else if (path->type == AccessPath::AGGREGATE) {
+          for (Cached_item &ci : join->group_fields) {
+            for (const Func_ptr_array *earlier_replacement :
+                 applied_replacements) {
+              thd->change_item_tree(
+                  ci.get_item_ptr(),
+                  FindReplacementOrReplaceMaterializedItems(
+                      thd, ci.get_item(), *earlier_replacement,
+                      /*need_exact_match=*/true));
+            }
+          }
+
+          // Set up aggregators, now that fields point into the right temporary
+          // table.
+          const bool need_distinct =
+              true;  // We don't support loose index scan yet.
+          for (Item_sum **func_ptr = join->sum_funcs; *func_ptr != nullptr;
+               ++func_ptr) {
+            Item_sum *func = *func_ptr;
+            Aggregator::Aggregator_type type =
+                need_distinct && func->has_with_distinct()
+                    ? Aggregator::DISTINCT_AGGREGATOR
+                    : Aggregator::SIMPLE_AGGREGATOR;
+            if (func->set_aggregator(type) || func->aggregator_setup(thd)) {
+              error = true;
+              return true;
+            }
+          }
+          after_aggregation = true;
+        }
+        if (AddCachesAroundConstantConditionsInPath(path)) {
+          error = true;
+          return true;
+        }
+        return false;
+      },
+      /*post_order_traversal=*/true);
+
+  for (const std::pair<Item *, bool> &item_and_hidden : extra_fields_needed) {
+    item_and_hidden.first->hidden = item_and_hidden.second;
+    base_fields->pop_front();
+  }
+
+  query_block->join->needs_finalize = false;
+  thd->lex->set_current_query_block(old_query_block);
+  return error;
+}
diff -Nru mysql-8.0-8.0.26/sql/join_optimizer/finalize_plan.h mysql-8.0-8.0.27/sql/join_optimizer/finalize_plan.h
--- mysql-8.0-8.0.26/sql/join_optimizer/finalize_plan.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/join_optimizer/finalize_plan.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,47 @@
+/* Copyright (c) 2020, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef SQL_JOIN_OPTIMIZER_FINALIZE_PLAN_H_
+#define SQL_JOIN_OPTIMIZER_FINALIZE_PLAN_H_
+
+#include "sql/mem_root_array.h"
+
+struct AccessPath;
+class Func_ptr;
+struct ORDER;
+class Query_block;
+class THD;
+
+using Func_ptr_array = Mem_root_array<Func_ptr>;
+
+// See comment in .cc file.
+bool FinalizePlanForQueryBlock(THD *thd, Query_block *query_block,
+                               AccessPath *root_path);
+
+// Change all items in the ORDER list to point to the temporary table.
+// This isn't important for streaming (the items would get the correct
+// value anyway -- although possibly with some extra calculations),
+// but it is for materialization.
+void ReplaceOrderItemsWithTempTableFields(THD *thd, ORDER *order,
+                                          const Func_ptr_array &items_to_copy);
+
+#endif  // SQL_JOIN_OPTIMIZER_FINALIZE_PLAN_H_
diff -Nru mysql-8.0-8.0.26/sql/join_optimizer/hypergraph.h mysql-8.0-8.0.27/sql/join_optimizer/hypergraph.h
--- mysql-8.0-8.0.26/sql/join_optimizer/hypergraph.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/join_optimizer/hypergraph.h	2021-09-28 11:46:34.000000000 +0000
@@ -48,7 +48,7 @@
 struct Node {
   // List of edges (indexes into the hypergraph's “edges� array) that touch this
   // node. We split these into simple edges (only one node on each side) and
-  // complex edges (all others), becaues we can often quickly discard all simple
+  // complex edges (all others), because we can often quickly discard all simple
   // edges by testing the set of interesting nodes against the
   // “simple_neighborhood� bitmap.
   //
diff -Nru mysql-8.0-8.0.26/sql/join_optimizer/interesting_orders.cc mysql-8.0-8.0.27/sql/join_optimizer/interesting_orders.cc
--- mysql-8.0-8.0.26/sql/join_optimizer/interesting_orders.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/join_optimizer/interesting_orders.cc	2021-09-28 11:46:34.000000000 +0000
@@ -22,13 +22,17 @@
 
 #include "sql/join_optimizer/interesting_orders.h"
 #include <algorithm>
+#include <functional>
 #include <type_traits>
 #include "sql/item.h"
 #include "sql/item_func.h"
+#include "sql/item_sum.h"
 #include "sql/join_optimizer/bit_utils.h"
 #include "sql/join_optimizer/print_utils.h"
+#include "sql/parse_tree_nodes.h"
 #include "sql/sql_class.h"
 
+using std::bind;
 using std::distance;
 using std::equal;
 using std::fill;
@@ -36,15 +40,39 @@
 using std::make_pair;
 using std::max;
 using std::move;
+using std::none_of;
 using std::pair;
 using std::sort;
 using std::string;
 using std::swap;
 using std::unique;
 using std::upper_bound;
+using std::placeholders::_1;
+using std::placeholders::_2;
 
 namespace {
 
+// Set some maximum limits on the size of the FSMs, in order to prevent runaway
+// computation on pathological queries. As rough reference: As of 8.0.26,
+// there is a single query in the test suite hitting these limits (it wants 8821
+// NFSM states and an estimated 2^50 DFSM states). Excluding that query, the
+// test suite contains the following largest FSMs:
+//
+//  - Largest NFSM: 63 NFSM states => 2 DFSM states
+//  - Largest DFSM: 37 NFSM states => 152 DFSM states
+//
+// And for DBT-3:
+//
+//  - Largest NFSM: 43 NFSM states => 3 DFSM states
+//  - Largest DFSM: 8 NFSM states => 8 DFSM states
+//
+// We could make system variables out of these if needed, but they would
+// probably have to be settable by superusers only, in order to prevent runaway
+// unabortable queries from taking down the server. Having them as fixed limits
+// is good enough for now.
+constexpr int kMaxNFSMStates = 200;
+constexpr int kMaxDFSMStates = 2000;
+
 template <class T>
 Bounds_checked_array<T> DuplicateArray(THD *thd,
                                        Bounds_checked_array<T> array) {
@@ -103,6 +131,13 @@
       assert(order[i].item > order[i - 1].item);
       assert(order[i].direction == ORDER_NOT_RELEVANT);
     }
+
+    // Verify that none of the items are of ROW_RESULT,
+    // as RemoveDuplicatesIterator cannot handle them.
+    // (They would theoretically be fine for orderings.)
+    for (size_t i = 0; i < order.size(); ++i) {
+      assert(m_items[order[i].item].item->result_type() != ROW_RESULT);
+    }
   }
 #endif
 
@@ -168,8 +203,10 @@
 
 void LogicalOrderings::Build(THD *thd, string *trace) {
   BuildEquivalenceClasses();
+  RecanonicalizeGroupings();
   AddFDsFromComputedItems(thd);
   AddFDsFromConstItems(thd);
+  AddFDsFromAggregateItems(thd);
   PreReduceOrderings(thd);
   CreateOrderingsFromGroupings(thd);
   CreateHomogenizedOrderings(thd);
@@ -186,6 +223,9 @@
   if (trace != nullptr) {
     *trace += "NFSM for interesting orders, before pruning:\n";
     PrintNFSMDottyGraph(trace);
+    if (m_states.size() >= kMaxNFSMStates) {
+      *trace += "NOTE: NFSM is incomplete, because it became too big.\n";
+    }
   }
   PruneNFSM(thd);
   if (trace != nullptr) {
@@ -196,6 +236,11 @@
   if (trace != nullptr) {
     *trace += "\nDFSM for interesting orders:\n";
     PrintDFSMDottyGraph(trace);
+    if (m_dfsm_states.size() >= kMaxDFSMStates) {
+      *trace +=
+          "NOTE: DFSM does not contain all NFSM states, because it became too "
+          "big.\n";
+    }
   }
   FindInitialStatesForOrdering();
   m_built = true;
@@ -402,6 +447,47 @@
   } while (done_anything);
 }
 
+// Put all groupings into a canonical form that we can compare them
+// as orderings without further logic. (It needs to be on a form that
+// does not change markedly after applying equivalences, and it needs
+// to be deterministic, but apart from that, the order is pretty arbitrary.)
+// We can only do this after BuildEquivalenceClasses().
+void LogicalOrderings::RecanonicalizeGroupings() {
+  for (OrderingWithInfo &ordering : m_orderings) {
+    if (IsGrouping(ordering.ordering)) {
+      sort(ordering.ordering.begin(), ordering.ordering.end(),
+           bind(&LogicalOrderings::ItemBeforeInGroup, this, _1, _2));
+    }
+  }
+}
+
+// Window functions depend on both the function argument and on the PARTITION BY
+// clause, so we need to add both to the functional dependency's head.
+// The order of elements is arbitrary.
+Bounds_checked_array<ItemHandle>
+LogicalOrderings::CollectHeadForStaticWindowFunction(THD *thd,
+                                                     ItemHandle argument_item,
+                                                     Window *window) {
+  const PT_order_list *partition_by = window->effective_partition_by();
+  int partition_len = 0;
+  if (partition_by != nullptr) {
+    for (ORDER *order = partition_by->value.first; order != nullptr;
+         order = order->next) {
+      ++partition_len;
+    }
+  }
+  auto head =
+      Bounds_checked_array<ItemHandle>::Alloc(thd->mem_root, partition_len + 1);
+  if (partition_by != nullptr) {
+    for (ORDER *order = partition_by->value.first; order != nullptr;
+         order = order->next) {
+      head[partition_len--] = GetHandle(*order->item);
+    }
+  }
+  head[0] = argument_item;
+  return head;
+}
+
 /**
   Try to add new FDs from items that are not base items; e.g., if we have
   an item (a + 1), we add {a} → (a + 1) (since addition is deterministic).
@@ -432,17 +518,35 @@
       continue;
     }
 
-    // We only want to look at items that are not already Item_field,
-    // and that are generated from a single field. Some quick heuristics
-    // will eliminate most of these for us.
+    // We only want to look at items that are not already Item_field
+    // or aggregate functions (the latter are handled in
+    // AddFDsFromAggregateItems()), and that are generated from a single field.
+    // Some quick heuristics will eliminate most of these for us.
     Item *item = m_items[item_idx].item;
     const table_map used_tables = item->used_tables();
-    if (item->type() == Item::FIELD_ITEM || used_tables == 0 ||
-        Overlaps(used_tables, PSEUDO_TABLE_BITS) ||
+    if (item->type() == Item::FIELD_ITEM || item->has_aggregation() ||
+        used_tables == 0 || Overlaps(used_tables, PSEUDO_TABLE_BITS) ||
         !IsSingleBitSet(used_tables)) {
       continue;
     }
 
+    // Window functions have much more state than just the parameter,
+    // so we cannot say that e.g. {a} → SUM(a) OVER (...), unless we
+    // know that the function is over the entire frame (unbounded).
+    //
+    // TODO(sgunders): We could also add FDs for window functions
+    // where could guarantee that the partition is only one row.
+    bool is_static_wf = false;
+    if (item->has_wf()) {
+      if (item->m_is_window_function &&
+          down_cast<Item_sum *>(item)->framing() &&
+          down_cast<Item_sum *>(item)->window()->static_aggregates()) {
+        is_static_wf = true;
+      } else {
+        continue;
+      }
+    }
+
     Item_field *base_field = nullptr;
     bool error =
         WalkItem(item, enum_walk::POSTFIX, [&base_field](Item *sub_item) {
@@ -482,18 +586,26 @@
     ItemHandle head_item = GetHandle(base_field);
     FunctionalDependency fd;
     fd.type = FunctionalDependency::FD;
-    fd.head = Bounds_checked_array<ItemHandle>(&head_item, 1);
+    if (is_static_wf) {
+      fd.head = CollectHeadForStaticWindowFunction(
+          thd, head_item, down_cast<Item_sum *>(item)->window());
+    } else {
+      fd.head = Bounds_checked_array<ItemHandle>(&head_item, 1);
+    }
     fd.tail = item_idx;
+    fd.always_active = true;
     AddFunctionalDependency(thd, fd);
 
-    // Extend existing FDs transitively (see function comment).
-    // E.g. if we have S → base, also add S → item.
-    for (int fd_idx = 0; fd_idx < num_original_fds; ++fd_idx) {
-      if (m_fds[fd_idx].type == FunctionalDependency::FD &&
-          m_fds[fd_idx].tail == head_item && m_fds[fd_idx].always_active) {
-        fd = m_fds[fd_idx];
-        fd.tail = item_idx;
-        AddFunctionalDependency(thd, fd);
+    if (fd.head.size() == 1) {
+      // Extend existing FDs transitively (see function comment).
+      // E.g. if we have S → base, also add S → item.
+      for (int fd_idx = 0; fd_idx < num_original_fds; ++fd_idx) {
+        if (m_fds[fd_idx].type == FunctionalDependency::FD &&
+            m_fds[fd_idx].tail == head_item && m_fds[fd_idx].always_active) {
+          fd = m_fds[fd_idx];
+          fd.tail = item_idx;
+          AddFunctionalDependency(thd, fd);
+        }
       }
     }
   }
@@ -531,6 +643,44 @@
   }
 }
 
+void LogicalOrderings::AddFDsFromAggregateItems(THD *thd) {
+  // If ROLLUP is active, and we have nullable GROUP BY expressions, we could
+  // get two different NULL groups with different aggregates; one for the actual
+  // NULL value, and one for the rollup group. If so, these FDs no longer hold,
+  // and we cannot add them.
+  if (m_rollup) {
+    for (ItemHandle item : m_aggregate_head) {
+      if (m_items[item].item->is_nullable()) {
+        return;
+      }
+    }
+  }
+
+  int num_original_items = m_items.size();
+  for (int item_idx = 0; item_idx < num_original_items; ++item_idx) {
+    // We only care about items that are used in some ordering,
+    // not any used as base in FDs or the likes.
+    const ItemHandle canonical_idx = m_items[item_idx].canonical_item;
+    if (!m_items[canonical_idx].used_asc && !m_items[canonical_idx].used_desc &&
+        !m_items[canonical_idx].used_in_grouping) {
+      continue;
+    }
+
+    if (m_items[item_idx].item->has_aggregation() &&
+        !m_items[item_idx].item->has_wf()) {
+      // Add {all GROUP BY items} → item.
+      // Note that the head might be empty, for implicit grouping,
+      // which means all aggregate items are constant (there is only one row).
+      FunctionalDependency fd;
+      fd.type = FunctionalDependency::FD;
+      fd.head = m_aggregate_head;
+      fd.tail = item_idx;
+      fd.always_active = true;
+      AddFunctionalDependency(thd, fd);
+    }
+  }
+}
+
 void LogicalOrderings::FindElementsThatCanBeAddedByFDs() {
   for (const FunctionalDependency &fd : m_fds) {
     m_items[m_items[fd.tail].canonical_item].can_be_added_by_fd = true;
@@ -920,9 +1070,7 @@
   if (IsGrouping(reduced_ordering)) {
     // We've replaced some items, so we need to re-sort.
     sort(tmpbuf, tmpbuf + length,
-         [](const OrderElement &a, const OrderElement &b) {
-           return a.item < b.item;
-         });
+         bind(&LogicalOrderings::ItemBeforeInGroup, this, _1, _2));
   }
 
   AddOrderingInternal(thd, Ordering(tmpbuf, length),
@@ -983,7 +1131,9 @@
       continue;
     }
 
-    // Since groupings are ordered by item, we can use the same comparison
+    // Since groupings are ordered by item (actually canonical item;
+    // see RecanonicalizeGroupings(), ItemBeforeInGroup() and
+    // the GroupReordering unit test), we can use the same comparison
     // for ordering-ordering and grouping-grouping comparisons.
     bool match = true;
     for (size_t i = 0, j = 0;
@@ -1121,24 +1271,44 @@
   OrderElement *tmpbuf2 =
       thd->mem_root->ArrayAlloc<OrderElement>(m_longest_ordering);
   for (size_t state_idx = 0; state_idx < m_states.size(); ++state_idx) {
-    {
-      Ordering old_ordering = m_states[state_idx].satisfied_ordering;
-      if (!IsGrouping(old_ordering)) {
-        // Apply the special decay FD; first to shorten the ordering,
-        // then to convert it to a grouping.
-        if (old_ordering.size() > 1) {
-          AddEdge(thd, state_idx, /*required_fd_idx=*/0,
-                  old_ordering.without_back());
-        }
-        if (!old_ordering.empty()) {
-          AddGroupingFromOrdering(thd, state_idx, old_ordering, tmpbuf);
-        }
-      }
+    // Refuse to apply FDs for nondeterministic orderings other than possibly
+    // ordering -> grouping; ie., (a) can _not_ be satisfied by (a, rand()).
+    // This is to avoid evaluating such a nondeterministic function unexpectedly
+    // early, e.g. in GROUP BY when the user didn't expect it to be used in
+    // ORDER BY. (We still allow it on exact matches, though.See also comments
+    // on RAND_TABLE_BIT in SortAheadOrdering.)
+    Ordering old_ordering = m_states[state_idx].satisfied_ordering;
+    const bool deterministic = none_of(
+        old_ordering.begin(), old_ordering.end(), [this](OrderElement element) {
+          return Overlaps(m_items[element.item].item->used_tables(),
+                          RAND_TABLE_BIT);
+        });
+
+    // Apply the special decay FD; first to convert it into a grouping
+    // (which we always allow, even for nondeterministic items),
+    // then to shorten the ordering.
+    if (!IsGrouping(old_ordering) && !old_ordering.empty()) {
+      AddGroupingFromOrdering(thd, state_idx, old_ordering, tmpbuf);
+    }
+    if (!deterministic) {
+      continue;
+    }
+    if (!IsGrouping(old_ordering) && old_ordering.size() > 1) {
+      AddEdge(thd, state_idx, /*required_fd_idx=*/0,
+              old_ordering.without_back());
+    }
+
+    if (m_states.size() >= kMaxNFSMStates) {
+      // Stop expanding new functional dependencies, causing us to end fairly
+      // soon. We won't necessarily find the optimal query, but we'll keep all
+      // essential information, and not throw away any of the information we
+      // have already gathered (unless the DFSM gets too large, too;
+      // see ConvertNFSMToDFSM()).
+      continue;
     }
 
     for (size_t fd_idx = 1; fd_idx < m_fds.size(); ++fd_idx) {
       const FunctionalDependency &fd = m_fds[fd_idx];
-      Ordering old_ordering = m_states[state_idx].satisfied_ordering;
 
       int start_point;
       if (!FunctionalDependencyApplies(fd, old_ordering, &start_point)) {
@@ -1148,6 +1318,7 @@
       ItemHandle item_to_add = fd.tail;
 
       // On a = b, try to replace a with b or b with a.
+      Ordering base_ordering;
       if (fd.type == FunctionalDependency::EQUIVALENCE) {
         Ordering new_ordering{tmpbuf, old_ordering.size()};
         memcpy(tmpbuf, &old_ordering[0],
@@ -1169,15 +1340,17 @@
         // adbc or adcb. Also, we'll fall through afterwards
         // to _not_ replacing but just adding d, e.g. abdc and abcd.
         // So fall through.
-        old_ordering = new_ordering;
+        base_ordering = new_ordering;
         item_to_add = other_item;
+      } else {
+        base_ordering = old_ordering;
       }
 
       // On S -> b, try to add b everywhere after the last element of S.
-      if (IsGrouping(old_ordering)) {
+      if (IsGrouping(base_ordering)) {
         if (m_items[m_items[item_to_add].canonical_item].used_in_grouping) {
           TryAddingOrderWithElementInserted(
-              thd, state_idx, fd_idx, old_ordering, /*start_point=*/0,
+              thd, state_idx, fd_idx, base_ordering, /*start_point=*/0,
               item_to_add, ORDER_NOT_RELEVANT, tmpbuf2);
         }
       } else {
@@ -1188,12 +1361,12 @@
         bool add_desc = m_items[m_items[item_to_add].canonical_item].used_desc;
         if (add_asc) {
           TryAddingOrderWithElementInserted(thd, state_idx, fd_idx,
-                                            old_ordering, start_point + 1,
+                                            base_ordering, start_point + 1,
                                             item_to_add, ORDER_ASC, tmpbuf2);
         }
         if (add_desc) {
           TryAddingOrderWithElementInserted(thd, state_idx, fd_idx,
-                                            old_ordering, start_point + 1,
+                                            base_ordering, start_point + 1,
                                             item_to_add, ORDER_DESC, tmpbuf2);
         }
       }
@@ -1213,9 +1386,7 @@
     }
   }
   sort(tmpbuf, tmpbuf + ordering.size(),
-       [](const OrderElement &a, const OrderElement &b) {
-         return a.item < b.item;
-       });
+       bind(&LogicalOrderings::ItemBeforeInGroup, this, _1, _2));
   AddEdge(thd, state_idx, /*required_fd_idx=*/0,
           Ordering(tmpbuf, ordering.size()));
 }
@@ -1231,19 +1402,21 @@
   for (size_t add_pos = start_point; add_pos <= old_ordering.size();
        ++add_pos) {
     if (direction == ORDER_NOT_RELEVANT) {
-      // For groupings, we just deduplicate right away.
-      if (add_pos < old_ordering.size() &&
-          old_ordering[add_pos].item == item_to_add) {
-        break;
-      }
-
       // For groupings, only insert in the sorted sequence.
       // (If we have found the right insertion spot, we immediately
       // exit after this at the end of the loop.)
       if (add_pos < old_ordering.size() &&
-          old_ordering[add_pos].item < item_to_add) {
+          ItemHandleBeforeInGroup(old_ordering[add_pos].item, item_to_add)) {
         continue;
       }
+
+      // For groupings, we just deduplicate right away.
+      // TODO(sgunders): When we get C++20, use operator<=> so that we
+      // can use a == b here instead of !(a < b) && !(b < a) as we do now.
+      if (add_pos < old_ordering.size() &&
+          !ItemHandleBeforeInGroup(item_to_add, old_ordering[add_pos].item)) {
+        break;
+      }
     }
 
     if (add_pos > 0) {
@@ -1514,6 +1687,14 @@
       }
     }
 
+    if (m_dfsm_states.size() >= kMaxDFSMStates) {
+      // Stop creating new states, causing us to end fairly soon (same as the
+      // cutoff in BuildNFSM()). Note that since the paths representing explicit
+      // sorts are put first, they will never be lost unless kMaxDFSMStates is
+      // set extremely low.
+      continue;
+    }
+
     {
       // Sort and deduplicate the edges. Note that we sort on FD first,
       // since we'll be grouping on that when creating new m_states.
diff -Nru mysql-8.0-8.0.26/sql/join_optimizer/interesting_orders.h mysql-8.0-8.0.27/sql/join_optimizer/interesting_orders.h
--- mysql-8.0-8.0.26/sql/join_optimizer/interesting_orders.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/join_optimizer/interesting_orders.h	2021-09-28 11:46:34.000000000 +0000
@@ -152,6 +152,8 @@
 // and usually lives on the MEM_ROOT.
 using Ordering = Bounds_checked_array<OrderElement>;
 
+class Window;
+
 struct FunctionalDependency {
   enum {
     // A special “empty� kind of edge in the FSM that signifies
@@ -236,9 +238,10 @@
   // active. This enables reducing the ordering more (which can in
   // some cases help with better sortahead or the likes), but is not
   // correct if the ordering wants to be used earlier on, e.g.
-  // in merge join or for semijoin duplicate removal. If it is true,
+  // in merge join or for semijoin duplicate removal. If it is false,
   // then it is also only attempted homogenized onto the given set
-  // of tables (otherwise, it is ignored).
+  // of tables (otherwise, it is ignored, and homogenization is over
+  // all tables).
   //
   // The empty ordering/grouping is always index 0.
   int AddOrdering(THD *thd, Ordering order, bool interesting, bool used_at_end,
@@ -268,6 +271,24 @@
   // NOTE: Will include the decay (epsilon) FD.
   int num_fds() const { return m_fds.size(); }
 
+  // Set the list of GROUP BY expressions, if any. This is used as the
+  // head of the functional dependencies for all aggregate functions
+  // (which by definition are functionally dependent on the GROUP BY
+  // expressions, unless ROLLUP is active -- see below), and must be
+  // valid (ie., not freed or modified) until Build() has run.
+  //
+  // If none is set, and there are aggregates present in orderings,
+  // implicit aggregation is assumed (ie., all aggregate functions
+  // are constant).
+  void SetHeadForAggregates(Bounds_checked_array<ItemHandle> head) {
+    m_aggregate_head = head;
+  }
+
+  // Set whether ROLLUP is active; if so, we can no longer assume that
+  // aggregate functions are functionally dependent on (nullable)
+  // GROUP BY expressions, as two NULLs may be for different reasons.
+  void SetRollup(bool rollup) { m_rollup = rollup; }
+
   // Builds the actual FSMs; all information about orderings and FDs is locked,
   // optimized and then the state machine is built. After this, you can no
   // longer add new orderings or FDs, ie., you are moving into the actual
@@ -419,6 +440,15 @@
   // and indexed by ItemHandle.
   Mem_root_array<ItemInfo> m_items;
 
+  // Head for all FDs generated for aggregate functions.
+  // See SetHeadForAggregates().
+  Bounds_checked_array<ItemHandle> m_aggregate_head;
+
+  // Whether rollup is active; if so, we need to take care not to create
+  // FDs for aggregates in some cases. See SetHeadForAggregates() and
+  // SetRollup().
+  bool m_rollup = false;
+
   struct NFSMState {
     enum { INTERESTING, ARTIFICIAL, DELETED } type;
     Mem_root_array<int> outgoing_edges;
@@ -527,7 +557,7 @@
 
     bool used_at_end;
 
-    // Only used if used_at_end = true (see AddOrdering()).
+    // Only used if used_at_end = false (see AddOrdering()).
     table_map homogenize_tables = 0;
 
     // Which initial state to use for this ordering (in SetOrder()).
@@ -556,6 +586,24 @@
   // After PruneFDs() has run, maps from the old indexes to the new indexes.
   Bounds_checked_array<int> m_optimized_fd_mapping;
 
+  // The canonical order for two items in a grouping
+  // (after BuildEquivalenceClasses() has run; enforced by
+  // RecanonicalizeGroupings()). The reason why we sort by
+  // canonical_item first is so that switching out one element
+  // with an equivalent one (ie., applying an EQUIVALENCE
+  // functional dependency) does not change the order of the
+  // elements in the grouing, which could give false negatives
+  // in CouldBecomeInterestingOrdering().
+  inline bool ItemHandleBeforeInGroup(ItemHandle a, ItemHandle b) {
+    if (m_items[a].canonical_item != m_items[b].canonical_item)
+      return m_items[a].canonical_item < m_items[b].canonical_item;
+    return a < b;
+  }
+
+  inline bool ItemBeforeInGroup(const OrderElement &a, const OrderElement &b) {
+    return ItemHandleBeforeInGroup(a.item, b.item);
+  }
+
   // Helper for AddOrdering().
   int AddOrderingInternal(THD *thd, Ordering order, OrderingWithInfo::Type type,
                           bool used_at_end, table_map homogenize_tables);
@@ -574,9 +622,19 @@
   void BuildEquivalenceClasses();
 
   // See comment in .cc file.
+  void RecanonicalizeGroupings();
+
+  // See comment in .cc file.
   void AddFDsFromComputedItems(THD *thd);
 
   // See comment in .cc file.
+  void AddFDsFromAggregateItems(THD *thd);
+
+  // See comment in .cc file.
+  Bounds_checked_array<ItemHandle> CollectHeadForStaticWindowFunction(
+      THD *thd, ItemHandle argument_item, Window *window);
+
+  // See comment in .cc file.
   void AddFDsFromConstItems(THD *thd);
 
   // Populates ItemInfo::can_be_added_by_fd.
diff -Nru mysql-8.0-8.0.26/sql/join_optimizer/join_optimizer.cc mysql-8.0-8.0.27/sql/join_optimizer/join_optimizer.cc
--- mysql-8.0-8.0.26/sql/join_optimizer/join_optimizer.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/join_optimizer/join_optimizer.cc	2021-09-28 11:46:34.000000000 +0000
@@ -20,63 +20,85 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
+#include "sql/join_optimizer/join_optimizer.h"
+
 #include <assert.h>
 #include <math.h>
 #include <stdint.h>
 #include <stdio.h>
+#include <string.h>
 #include <algorithm>
 #include <array>
+#include <bitset>
+#include <functional>
 #include <initializer_list>
 #include <string>
 #include <unordered_map>
 #include <utility>
 #include <vector>
 
+#include "ft_global.h"
+#include "map_helpers.h"
+#include "mem_root_deque.h"
 #include "my_alloc.h"
 #include "my_base.h"
-#include "my_bit.h"
+#include "my_bitmap.h"
 #include "my_inttypes.h"
-#include "my_sqlcommand.h"
 #include "my_sys.h"
 #include "my_table_map.h"
 #include "mysql/components/services/bits/psi_bits.h"
+#include "mysql/udf_registration_types.h"
 #include "mysqld_error.h"
 #include "prealloced_array.h"
+#include "sql/field.h"
 #include "sql/filesort.h"
 #include "sql/handler.h"
 #include "sql/item.h"
 #include "sql/item_cmpfunc.h"
+#include "sql/item_func.h"
 #include "sql/item_sum.h"
 #include "sql/join_optimizer/access_path.h"
 #include "sql/join_optimizer/bit_utils.h"
-#include "sql/join_optimizer/estimate_filter_cost.h"
+#include "sql/join_optimizer/build_interesting_orders.h"
+#include "sql/join_optimizer/cost_model.h"
 #include "sql/join_optimizer/estimate_selectivity.h"
-#include "sql/join_optimizer/explain_access_path.h"
-#include "sql/join_optimizer/hypergraph.h"
 #include "sql/join_optimizer/interesting_orders.h"
-#include "sql/join_optimizer/join_optimizer.h"
+#include "sql/join_optimizer/interesting_orders_defs.h"
 #include "sql/join_optimizer/make_join_hypergraph.h"
+#include "sql/join_optimizer/node_map.h"
+#include "sql/join_optimizer/overflow_bitset.h"
 #include "sql/join_optimizer/print_utils.h"
 #include "sql/join_optimizer/relational_expression.h"
 #include "sql/join_optimizer/subgraph_enumeration.h"
 #include "sql/join_optimizer/walk_access_paths.h"
+#include "sql/join_type.h"
+#include "sql/key.h"
 #include "sql/mem_root_array.h"
-#include "sql/opt_range.h"
 #include "sql/query_options.h"
+#include "sql/range_optimizer/range_optimizer.h"
+#include "sql/sql_array.h"
+#include "sql/sql_bitmap.h"
 #include "sql/sql_class.h"
 #include "sql/sql_cmd.h"
 #include "sql/sql_const.h"
 #include "sql/sql_executor.h"
-#include "sql/sql_insert.h"
 #include "sql/sql_lex.h"
 #include "sql/sql_list.h"
+#include "sql/sql_opt_exec_shared.h"
 #include "sql/sql_optimizer.h"
-#include "sql/sql_planner.h"
-#include "sql/sql_resolver.h"
 #include "sql/sql_select.h"
 #include "sql/sql_tmp_table.h"
+#include "sql/system_variables.h"
 #include "sql/table.h"
 #include "sql/table_function.h"
+#include "sql/temp_table_param.h"
+#include "sql/window.h"
+#include "template_utils.h"
+
+namespace hypergraph {
+struct Hyperedge;
+struct Hypergraph;
+}  // namespace hypergraph
 
 using hypergraph::Hyperedge;
 using hypergraph::Hypergraph;
@@ -86,59 +108,18 @@
 using std::min;
 using std::string;
 using std::swap;
-using std::vector;
 
 namespace {
 
-// These are extremely arbitrary cost model constants. We should revise them
-// based on actual query times (possibly using linear regression?), and then
-// put them into the cost model to make them user-tunable. However, until
-// we've fixed some glaring omissions such as lack of understanding of initial
-// cost, any such estimation will be dominated by outliers/noise.
-constexpr double kApplyOneFilterCost = 0.1;
-constexpr double kAggregateOneRowCost = 0.1;
-constexpr double kSortOneRowCost = 0.1;
-constexpr double kHashBuildOneRowCost = 0.1;
-constexpr double kHashProbeOneRowCost = 0.1;
-constexpr double kMaterializeOneRowCost = 0.1;
-
 using OrderingSet = std::bitset<kMaxSupportedOrderings>;
 
-TABLE *CreateTemporaryTableFromSelectList(
-    THD *thd, Query_block *query_block,
-    Temp_table_param **temp_table_param_arg);
-
-void ReplaceSelectListWithTempTableFields(THD *thd, JOIN *join,
-                                          Temp_table_param *temp_table_param);
-void ReplaceOrderItemsWithTempTableFields(THD *thd, ORDER *order,
-                                          Temp_table_param *temp_table_param);
-
 AccessPath *CreateMaterializationPath(THD *thd, JOIN *join, AccessPath *path,
                                       TABLE *temp_table,
-                                      Temp_table_param *temp_table_param);
-
-// An ordering that we could be doing sort-ahead by; typically either an
-// interesting ordering or an ordering homogenized from one.
-struct SortAheadOrdering {
-  // Pointer to an ordering in LogicalOrderings.
-  int ordering_idx;
-
-  // Which tables must be present in the join before one can apply
-  // this sort (usually because the elements we sort by are contained
-  // in these tables).
-  NodeMap required_nodes;
-
-  // The ordering expressed in a form that filesort can use.
-  ORDER *order;
-};
+                                      Temp_table_param *temp_table_param,
+                                      bool copy_items);
 
-// An index that we can use in the query, either for index lookup (ref access)
-// or for scanning along to get an interesting ordering.
-struct ActiveIndexInfo {
-  TABLE *table;
-  int key_idx;
-  LogicalOrderings::StateIndex forward_order = 0, reverse_order = 0;
-};
+AccessPath *GetSafePathToSort(THD *thd, JOIN *join, AccessPath *path,
+                              bool need_rowid);
 
 /**
   CostingReceiver contains the main join planning logic, selecting access paths
@@ -163,8 +144,10 @@
       THD *thd, Query_block *query_block, const JoinHypergraph &graph,
       const LogicalOrderings *orderings,
       const Mem_root_array<SortAheadOrdering> *sort_ahead_orderings,
-      const Mem_root_array<ActiveIndexInfo> *active_indexes, bool need_rowid,
-      SecondaryEngineFlags engine_flags,
+      const Mem_root_array<ActiveIndexInfo> *active_indexes,
+      const Mem_root_array<FullTextIndexInfo> *fulltext_searches,
+      NodeMap fulltext_tables, uint64_t sargable_fulltext_predicates,
+      bool need_rowid, SecondaryEngineFlags engine_flags,
       secondary_engine_modify_access_path_cost_t secondary_engine_cost_hook,
       string *trace)
       : m_thd(thd),
@@ -173,6 +156,9 @@
         m_orderings(orderings),
         m_sort_ahead_orderings(sort_ahead_orderings),
         m_active_indexes(active_indexes),
+        m_fulltext_searches(fulltext_searches),
+        m_fulltext_tables(fulltext_tables),
+        m_sargable_fulltext_predicates(sargable_fulltext_predicates),
         m_need_rowid(need_rowid),
         m_engine_flags(engine_flags),
         m_secondary_engine_cost_hook(secondary_engine_cost_hook),
@@ -262,6 +248,13 @@
    */
   std::unordered_map<NodeMap, AccessPathSet> m_access_paths;
 
+  /**
+    How many subgraph pairs we've seen so far. Used to give up
+    if we end up allocating too many resources (prompting us to
+    create a simpler join graph and try again).
+   */
+  int m_num_seen_subgraph_pairs = 0;
+
   /// The graph we are running over.
   const JoinHypergraph &m_graph;
 
@@ -278,6 +271,21 @@
   /// for index-only scans, or to get interesting orderings.
   const Mem_root_array<ActiveIndexInfo> *m_active_indexes;
 
+  /// List of all active full-text indexes that we can apply in this query.
+  const Mem_root_array<FullTextIndexInfo> *m_fulltext_searches;
+
+  /// A map of tables that are referenced by a MATCH function (those tables that
+  /// have TABLE_LIST::is_fulltext_searched() == true). It is used for
+  /// preventing hash joins involving tables that are full-text searched.
+  const NodeMap m_fulltext_tables = 0;
+
+  /// The set of WHERE predicates which are on a form that can be satisfied by a
+  /// full-text index scan. This includes calls to MATCH with no comparison
+  /// operator, and predicates on the form MATCH > const or MATCH >= const
+  /// (where const must be high enough to make the comparison return false for
+  /// documents with zero score).
+  const uint64_t m_sargable_fulltext_predicates = 0;
+
   /// Whether we will be needing row IDs from our tables, typically for
   /// a later sort. If this happens, derived tables cannot use streaming,
   /// but need an actual materialization, since filesort expects to be
@@ -327,6 +335,11 @@
   void ProposeAccessPathForBaseTable(int node_idx,
                                      const char *description_for_trace,
                                      AccessPath *path);
+  void ProposeAccessPathForIndex(int node_idx,
+                                 OverflowBitset applied_predicates,
+                                 OverflowBitset subsumed_predicates,
+                                 const char *description_for_trace,
+                                 AccessPath *path);
   void ProposeAccessPathWithOrderings(NodeMap nodes,
                                       FunctionalDependencySet fd_set,
                                       OrderingSet obsolete_orderings,
@@ -339,6 +352,13 @@
   bool ProposeRefAccess(TABLE *table, int node_idx, unsigned key_idx,
                         bool reverse, table_map allowed_parameter_tables,
                         int ordering_idx);
+  bool AlreadyAppliedThroughSargable(
+      Item_func_eq *cond, OverflowBitset applied_sargable_join_predicates,
+      NodeMap left, NodeMap right);
+  bool ProposeAllFullTextIndexScans(TABLE *table, int node_idx);
+  bool ProposeFullTextIndexScan(TABLE *table, int node_idx,
+                                Item_func_match *match, int predicate_idx,
+                                int ordering_idx);
   void ProposeNestedLoopJoin(NodeMap left, NodeMap right, AccessPath *left_path,
                              AccessPath *right_path, const JoinPredicate *edge,
                              bool rewrite_semi_to_inner,
@@ -349,17 +369,17 @@
                        FunctionalDependencySet new_fd_set,
                        OrderingSet new_obsolete_orderings,
                        bool rewrite_semi_to_inner, bool *wrote_trace);
-  void ApplyPredicatesForBaseTable(int node_idx, uint64_t applied_predicates,
-                                   uint64_t subsumed_predicates,
+  void ApplyPredicatesForBaseTable(int node_idx,
+                                   OverflowBitset applied_predicates,
+                                   OverflowBitset subsumed_predicates,
                                    bool materialize_subqueries,
                                    AccessPath *path,
                                    FunctionalDependencySet *new_fd_set);
-  void ApplyDelayedPredicatesAfterJoin(NodeMap left, NodeMap right,
-                                       const AccessPath *left_path,
-                                       const AccessPath *right_path,
-                                       bool materialize_subqueries,
-                                       AccessPath *join_path,
-                                       FunctionalDependencySet *new_fd_set);
+  void ApplyDelayedPredicatesAfterJoin(
+      NodeMap left, NodeMap right, const AccessPath *left_path,
+      const AccessPath *right_path, int join_predicate_first,
+      int join_predicate_last, bool materialize_subqueries,
+      AccessPath *join_path, FunctionalDependencySet *new_fd_set);
 };
 
 /// Lists the current secondary engine flags in use. If there is no secondary
@@ -387,6 +407,56 @@
   }
 }
 
+bool IsFullTextFunction(const Item *item) {
+  return item->type() == Item::FUNC_ITEM &&
+         down_cast<const Item_func *>(item)->functype() == Item_func::FT_FUNC;
+}
+
+bool HasFullTextFunction(Item *item) {
+  return WalkItem(item, enum_walk::PREFIX, IsFullTextFunction);
+}
+
+/// Returns the MATCH function of a predicate that can be pushed down to a
+/// full-text index. This can be done if the predicate is a MATCH function,
+/// or in some cases (see IsSargableFullTextIndexPredicate() for details)
+/// where the predicate is a comparison function which compares the result
+/// of MATCH with a constant. For example, predicates on this form could be
+/// pushed down to a full-text index:
+///
+///   WHERE MATCH (x) AGAINST ('search string') AND <more predicates>
+///
+///   WHERE MATCH (x) AGAINST ('search string') > 0.5 AND <more predicates>
+///
+/// Since full-text index scans return documents with positive scores only, an
+/// index scan can only be used if the predicate excludes negative or zero
+/// scores.
+Item_func_match *GetSargableFullTextPredicate(const Predicate &predicate) {
+  Item_func *func = down_cast<Item_func *>(predicate.condition);
+  switch (func->functype()) {
+    case Item_func::MATCH_FUNC:
+      // The predicate is MATCH (x) AGAINST ('search string'), which can be
+      // pushed to the index.
+      return down_cast<Item_func_match *>(func->get_arg(0))->get_master();
+    case Item_func::LT_FUNC:
+    case Item_func::LE_FUNC:
+      // The predicate is const < MATCH or const <= MATCH, with a constant value
+      // which makes it pushable.
+      assert(func->get_arg(0)->const_item());
+      return down_cast<Item_func_match *>(func->get_arg(1))->get_master();
+    case Item_func::GT_FUNC:
+    case Item_func::GE_FUNC:
+      // The predicate is MATCH > const or MATCH >= const, with a constant value
+      // which makes it pushable.
+      assert(func->get_arg(1)->const_item());
+      return down_cast<Item_func_match *>(func->get_arg(0))->get_master();
+    default:
+      // The predicate is not on a form that can be pushed to a full-text index
+      // scan. We should not get here.
+      assert(false);
+      return nullptr;
+  }
+}
+
 /**
   Called for each table in the query block, at some arbitrary point before we
   start seeing subsets where it's joined to other tables.
@@ -480,6 +550,12 @@
         }
       }
     }
+
+    if (tl->is_fulltext_searched()) {
+      if (ProposeAllFullTextIndexScans(table, node_idx)) {
+        return true;
+      }
+    }
   }
 
   return false;
@@ -570,10 +646,11 @@
           !(sp.field->cmp_type() == STRING_RESULT &&
             sp.field->match_collation_to_optimize_range() &&
             sp.field->charset() != item->compare_collation())) {
-        // x = const. (And true const or an outer reference,
-        // just not const_for_execution(); so no execution
-        // of queries during optimization.)
-        if (sp.other_side->const_item() ||
+        // x = const. (And true const; no execution of queries
+        // or stored procedures during optimization.)
+        if ((sp.other_side->const_for_execution() &&
+             !sp.other_side->has_subquery() &&
+             !sp.other_side->is_expensive()) ||
             sp.other_side->used_tables() == OUTER_REF_TABLE_BIT) {
           matched_this_keypart = true;
           keyparts[keypart_idx].field = sp.field;
@@ -674,8 +751,10 @@
 
   double num_output_rows = table->file->stats.records;
 
-  uint64_t applied_predicates = 0;
-  uint64_t subsumed_predicates = 0;
+  MutableOverflowBitset applied_predicates{m_thd->mem_root,
+                                           m_graph.predicates.size()};
+  MutableOverflowBitset subsumed_predicates{m_thd->mem_root,
+                                            m_graph.predicates.size()};
   for (size_t i = 0; i < m_graph.predicates.size(); ++i) {
     int keypart_idx = WasPushedDownToRef(m_graph.predicates[i].condition,
                                          keyparts, matched_keyparts);
@@ -683,8 +762,17 @@
       continue;
     }
 
+    if (m_graph.predicates[i].was_join_condition) {
+      // This predicate was promoted from a join condition to a WHERE predicate,
+      // since it was part of a cycle. For purposes of sargable predicates,
+      // we always see all relevant join conditions, so skip it this time
+      // so that we don't double-count its selectivity.
+      applied_predicates.SetBit(i);
+      continue;
+    }
+
     num_output_rows *= m_graph.predicates[i].selectivity;
-    applied_predicates |= uint64_t{1} << i;
+    applied_predicates.SetBit(i);
 
     const KeypartForRef &keypart = keyparts[keypart_idx];
     if (ref_lookup_subsumes_comparison(keypart.field, keypart.val)) {
@@ -694,7 +782,7 @@
                          ItemToString(m_graph.predicates[i].condition).c_str(),
                          table->alias, keypart.field->field_name);
       }
-      subsumed_predicates |= uint64_t{1} << i;
+      subsumed_predicates.SetBit(i);
     } else {
       if (m_trace != nullptr) {
         *m_trace += StringPrintf(
@@ -722,24 +810,8 @@
     num_output_rows = std::min(num_output_rows, 1.0);
   }
 
-  // When asking the cost model for costs, the API takes in a double,
-  // but truncates it to an unsigned integer. This means that if we
-  // expect an index lookup to give e.g. 0.9 rows on average, the cost
-  // model will assume we get back 0 -- and even worse, InnoDB's
-  // cost model gives a cost of exactly zero for this case, ignoring
-  // entirely the startup cost! Obviously, a cost of zero would make
-  // it very attractive to line up a bunch of such lookups in a nestloop
-  // and nestloop-join against them, crowding out pretty much any other
-  // way to do a join, so to counteract both of these issues, we
-  // explicitly round up here. This can be removed if InnoDB's
-  // cost model is tuned better for this case.
-  const double hacked_num_output_rows = ceil(num_output_rows);
-
-  const double table_scan_cost = table->file->table_scan_cost().total_cost();
-  const double worst_seeks = find_worst_seeks(
-      table->cost_model(), hacked_num_output_rows, table_scan_cost);
-  const double cost = find_cost_for_ref(m_thd, table, key_idx,
-                                        hacked_num_output_rows, worst_seeks);
+  const double cost =
+      EstimateCostForRefAccess(m_thd, table, key_idx, num_output_rows);
 
   AccessPath path;
   if (single_row) {
@@ -772,29 +844,50 @@
       parameter_tables & ~table->pos_in_table_list->map(),
       m_graph.table_num_to_node_num);
 
+  ProposeAccessPathForIndex(node_idx, std::move(applied_predicates),
+                            std::move(subsumed_predicates), key->name, &path);
+  return false;
+}
+
+void CostingReceiver::ProposeAccessPathForIndex(
+    int node_idx, OverflowBitset applied_predicates,
+    OverflowBitset subsumed_predicates, const char *description_for_trace,
+    AccessPath *path) {
+  MutableOverflowBitset applied_sargable_join_predicates_tmp =
+      applied_predicates.Clone(m_thd->mem_root);
+  applied_sargable_join_predicates_tmp.ClearBits(0,
+                                                 m_graph.num_where_predicates);
+  OverflowBitset applied_sargable_join_predicates =
+      std::move(applied_sargable_join_predicates_tmp);
+
+  MutableOverflowBitset subsumed_sargable_join_predicates_tmp =
+      subsumed_predicates.Clone(m_thd->mem_root);
+  subsumed_sargable_join_predicates_tmp.ClearBits(0,
+                                                  m_graph.num_where_predicates);
+  OverflowBitset subsumed_sargable_join_predicates =
+      std::move(subsumed_sargable_join_predicates_tmp);
   for (bool materialize_subqueries : {false, true}) {
     FunctionalDependencySet new_fd_set;
     ApplyPredicatesForBaseTable(node_idx, applied_predicates,
                                 subsumed_predicates, materialize_subqueries,
-                                &path, &new_fd_set);
-    path.ordering_state =
-        m_orderings->ApplyFDs(path.ordering_state, new_fd_set);
-    path.applied_sargable_join_predicates |=
-        applied_predicates & ~BitsBetween(0, m_graph.num_where_predicates);
-    path.subsumed_sargable_join_predicates |=
-        subsumed_predicates & ~BitsBetween(0, m_graph.num_where_predicates);
-
+                                path, &new_fd_set);
+    path->ordering_state =
+        m_orderings->ApplyFDs(path->ordering_state, new_fd_set);
+    path->applied_sargable_join_predicates() = OverflowBitset::Or(
+        m_thd->mem_root, path->applied_sargable_join_predicates(),
+        applied_sargable_join_predicates);
+    path->subsumed_sargable_join_predicates() = OverflowBitset::Or(
+        m_thd->mem_root, path->subsumed_sargable_join_predicates(),
+        subsumed_sargable_join_predicates);
     ProposeAccessPathWithOrderings(
-        TableBitmap(node_idx), new_fd_set, /*new_obsolete_orderings=*/0, &path,
-        materialize_subqueries ? "mat. subq" : key->name);
+        TableBitmap(node_idx), new_fd_set, /*new_obsolete_orderings=*/0, path,
+        materialize_subqueries ? "mat. subq" : description_for_trace);
 
-    if (!Overlaps(path.filter_predicates, m_graph.materializable_predicates)) {
+    if (!Overlaps(path->filter_predicates, m_graph.materializable_predicates)) {
       // Nothing to try to materialize.
       break;
     }
   }
-
-  return false;
 }
 
 bool CostingReceiver::ProposeTableScan(TABLE *table, int node_idx,
@@ -862,7 +955,8 @@
     materialize_path->cost = path.cost;
     materialize_path->filter_predicates = path.filter_predicates;
     materialize_path->delayed_predicates = path.delayed_predicates;
-    new_path->filter_predicates = new_path->delayed_predicates = 0;
+    new_path->filter_predicates.Clear();
+    new_path->delayed_predicates.Clear();
 
     // Some information schema tables have zero as estimate, which can lead
     // to completely wild plans. Add a placeholder to make sure we have
@@ -919,17 +1013,25 @@
       materialize_path->parameter_tables =
           GetNodeMapFromTableMap(tl->derived_query_expression()->m_lateral_deps,
                                  m_graph.table_num_to_node_num);
+
+      // If we don't need row IDs, we also don't care about row ID safety.
+      // This keeps us from retaining many extra unneeded paths.
+      if (!m_need_rowid) {
+        materialize_path->safe_for_rowid = AccessPath::SAFE;
+      }
     }
 
     materialize_path->filter_predicates = path.filter_predicates;
     materialize_path->delayed_predicates = path.delayed_predicates;
-    stable_path->filter_predicates = stable_path->delayed_predicates = 0;
+    stable_path->filter_predicates.Clear();
+    stable_path->delayed_predicates.Clear();
     path = *materialize_path;
     assert(path.cost >= 0.0);
   }
   assert(path.cost >= 0.0);
 
-  ProposeAccessPathForBaseTable(node_idx, /*description_for_trace=*/"", &path);
+  ProposeAccessPathForBaseTable(node_idx,
+                                /*description_for_trace=*/"", &path);
   return false;
 }
 
@@ -981,13 +1083,276 @@
   return false;
 }
 
+// Checks if a given predicate can be subsumed by a full-text index. It can
+// be subsumed if it returns TRUE for all documents returned by the full-text
+// index, and FALSE for all other documents. Since a full-text index scan
+// returns the documents with a positive score, predicates that are either a
+// standalone call to MATCH, a comparison of MATCH > 0, or a comparison of
+// 0 < MATCH, are considered subsumable.
+//
+// We assume that this function is only called on predicates for which
+// IsSargableFullTextIndexPredicate() has returned true, so that we
+// already know the predicate is a standalone MATCH function or a <, <=, >
+// or >= comparing match to a constant.
+bool IsSubsumableFullTextPredicate(Item_func *condition) {
+  switch (condition->functype()) {
+    case Item_func::MATCH_FUNC: {
+      // WHERE MATCH (col) AGAINST ('search string') is subsumable.
+      return true;
+    }
+    case Item_func::GT_FUNC: {
+      // WHERE MATCH (col) AGAINST ('search string') > 0 is subsumable.
+      assert(IsFullTextFunction(condition->get_arg(0)));
+      assert(condition->get_arg(1)->const_item());
+      const double value = condition->get_arg(1)->val_real();
+      assert(!condition->get_arg(1)->null_value);
+      return value == 0;
+    }
+    case Item_func::LT_FUNC: {
+      // WHERE 0 < MATCH (col) AGAINST ('search string') subsumable.
+      assert(condition->get_arg(0)->const_item());
+      assert(IsFullTextFunction(condition->get_arg(1)));
+      const double value = condition->get_arg(0)->val_real();
+      assert(!condition->get_arg(0)->null_value);
+      return value == 0;
+    }
+    case Item_func::GE_FUNC:
+      // WHERE MATCH >= const is not subsumable, but assert the predicate is on
+      // the expected form.
+      assert(IsFullTextFunction(condition->get_arg(0)));
+      assert(condition->get_arg(1)->const_item());
+      return false;
+    case Item_func::LE_FUNC:
+      // WHERE const <= MATCH is not subsumable, but assert the predicate is on
+      // the expected form.
+      assert(condition->get_arg(0)->const_item());
+      assert(IsFullTextFunction(condition->get_arg(1)));
+      return false;
+    default:
+      // Not a sargable full-text predicate, so we don't expect to be called on
+      // it.
+      assert(false);
+      return false;
+  }
+}
+
+// Assuming that we have chosen a full-text index scan on the given predicate,
+// can we pass the LIMIT of the query block as a hint to the storage engine?
+//
+// We can do this if we know that the number of rows seen before the LIMIT
+// clause is processed, is the same number of rows as returned by the index
+// scan. This is the case when:
+//
+// 1) It is a single-table query. No joins.
+//
+// 2) There is no aggregation or DISTINCT which could reduce the number of rows.
+//
+// 3) There is no filtering of the rows returned from the index. That is, there
+// is no HAVING clause, and the WHERE clause contains no predicates apart from
+// those that can be subsumed by the index.
+bool IsLimitHintPushableToFullTextSearch(const Item_func_match *match,
+                                         const JoinHypergraph &graph,
+                                         uint64_t fulltext_predicates) {
+  const Query_block *query_block = graph.query_block();
+  assert(query_block->has_ft_funcs());
+
+  // The query has a LIMIT clause.
+  if (query_block->join->m_select_limit == HA_POS_ERROR) {
+    return false;
+  }
+
+  // A single table, no joins.
+  if (graph.nodes.size() != 1) {
+    return false;
+  }
+
+  // No aggregation, DISTINCT or HAVING.
+  if (query_block->is_grouped() || query_block->is_distinct() ||
+      query_block->join->having_cond != nullptr) {
+    return false;
+  }
+
+  // The WHERE clause contains full-text predicates only.
+  if (fulltext_predicates != BitsBetween(0, graph.predicates.size())) {
+    return false;
+  }
+
+  // And all the full-text predicates must be subsumed by the index scan.
+  for (const Predicate &predicate : graph.predicates) {
+    Item_func_match *cond = GetSargableFullTextPredicate(predicate);
+    if (cond != match || !IsSubsumableFullTextPredicate(
+                             down_cast<Item_func *>(predicate.condition))) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+// Propose full-text index scans for all full-text predicates found in the
+// WHERE clause, if any. If an interesting order can be satisfied by an ordered
+// full-text index scan using one of the predicates, propose an ordered scan.
+// Otherwise, propose an unordered scan. (For completeness, we should have
+// proposed both an ordered and an unordered scan when we have an interesting
+// order. But we don't have a good estimate for the extra cost of making the
+// scan ordered, so we only propose the ordered scan for simplicity. InnoDB, for
+// example, uses an ordered scan regardless of whether we request it, so an
+// explicitly ordered scan is no more expensive than an implicitly ordered scan,
+// and it could potentially avoid a sort higher up in the query plan.)
+bool CostingReceiver::ProposeAllFullTextIndexScans(TABLE *table, int node_idx) {
+  for (const FullTextIndexInfo &info : *m_fulltext_searches) {
+    if (info.match->table_ref != table->pos_in_table_list) {
+      continue;
+    }
+
+    // Propose a full-text index scan for each predicate that uses the MATCH
+    // function given by info.match. Note that several predicates can use the
+    // same MATCH function, due to Item_func_match's linking equivalent callers
+    // to one canonical Item_func_match object (via set_master()/get_master()).
+    //
+    // For example, we may have:
+    //
+    //   WHERE MATCH (col) AGAINST ('string') AND
+    //         MATCH (col) AGAINST ('string') > 0.3
+    //
+    // Both MATCH invocations have the same canonical Item_func_match object,
+    // since they have the same set of columns and search for the same string.
+    // In this case, we want to propose two index scans, and let the optimizer
+    // pick the one that gives the plan with the lowest estimated cost.
+    for (size_t i : BitsSetIn(m_sargable_fulltext_predicates)) {
+      Item_func_match *match =
+          GetSargableFullTextPredicate(m_graph.predicates[i]);
+      assert(match != nullptr);
+      if (match != info.match) continue;
+      if (ProposeFullTextIndexScan(table, node_idx, match, i, info.order)) {
+        return true;
+      }
+    }
+
+    // Even if we have no predicates, we may use a full-text index scan if it is
+    // possible to pass the LIMIT clause to the index scan, and the LIMIT is no
+    // greater than the number of documents returned by the index scan. We only
+    // do this if the index scan produces rows in an interesting order. And only
+    // if the storage engine supports the extended full-text API, which is
+    // required for counting the matches in the index.
+    if (m_graph.predicates.empty() && info.order != 0 &&
+        IsLimitHintPushableToFullTextSearch(info.match, m_graph,
+                                            m_sargable_fulltext_predicates) &&
+        Overlaps(table->file->ha_table_flags(), HA_CAN_FULLTEXT_EXT)) {
+      // The full-text function must be initialized before get_count() is
+      // called. Even though we call init_search() on it again after the final
+      // plan has been chosen, this does not mean the search is performed twice.
+      if (info.match->init_search(m_thd)) {
+        return true;
+      }
+      if (m_query_block->join->m_select_limit <= info.match->get_count()) {
+        if (ProposeFullTextIndexScan(table, node_idx, info.match,
+                                     /*predicate_idx=*/-1, info.order)) {
+          return true;
+        }
+      }
+    }
+  }
+
+  return false;
+}
+
+bool CostingReceiver::ProposeFullTextIndexScan(TABLE *table, int node_idx,
+                                               Item_func_match *match,
+                                               int predicate_idx,
+                                               int ordering_idx) {
+  const unsigned key_idx = match->key;
+  TABLE_REF *ref = new (m_thd->mem_root) TABLE_REF;
+  if (init_ref(m_thd, /*keyparts=*/1, /*length=*/0, key_idx, ref)) {
+    return true;
+  }
+  ref->items[0] = match->key_item();
+
+  const Predicate *predicate =
+      predicate_idx == -1 ? nullptr : &m_graph.predicates[predicate_idx];
+  assert(predicate_idx == -1 ||
+         match == GetSargableFullTextPredicate(*predicate));
+
+  MutableOverflowBitset applied_predicates{m_thd->mem_root,
+                                           m_graph.predicates.size()};
+  MutableOverflowBitset subsumed_predicates{m_thd->mem_root,
+                                            m_graph.predicates.size()};
+  double num_output_rows_from_index;
+  double num_output_rows_from_filter;
+  if (predicate == nullptr) {
+    // We have no predicate. The index is used only for ordering. We only do
+    // this if we have a limit.
+    assert(m_query_block->join->m_select_limit != HA_POS_ERROR);
+    num_output_rows_from_index = num_output_rows_from_filter =
+        m_query_block->join->m_select_limit;
+  } else {
+    // The full-text predicate is both passed to the index and in a filter node
+    // on top of the index scan. Find out how much of the selectivity to apply
+    // on each node.
+    double index_selectivity;
+    if (IsSubsumableFullTextPredicate(
+            down_cast<Item_func *>(predicate->condition))) {
+      // The predicate can be fully subsumed by the index. Apply the full
+      // selectivity on the index scan and mark the predicate as subsumed.
+      index_selectivity = predicate->selectivity;
+      subsumed_predicates.SetBit(predicate_idx);
+    } else {
+      // The predicate uses <, <=, > or >=, and it cannot be subsumed. For
+      // example MATCH(...) AGAINST(...) > 0.5. In this case, the selectivity of
+      // the MATCH function is used to estimate the number of rows that come out
+      // of the index, and the selectivity of the greater-than function is used
+      // to estimate the number of rows returned by the filter.
+      index_selectivity = EstimateSelectivity(m_thd, match, m_trace);
+
+      // The selectivity of the predicate is applied manually to
+      // num_output_rows_from_index and num_output_rows_from_filter below, so
+      // mark the predicate as applied to avoid double-counting of the
+      // selectivity.
+      applied_predicates.SetBit(predicate_idx);
+    }
+
+    num_output_rows_from_index = table->file->stats.records * index_selectivity;
+    num_output_rows_from_filter =
+        std::min(num_output_rows_from_index,
+                 table->file->stats.records * predicate->selectivity);
+  }
+
+  const double cost = EstimateCostForRefAccess(m_thd, table, key_idx,
+                                               num_output_rows_from_index);
+
+  const LogicalOrderings::StateIndex ordering_state =
+      m_orderings->SetOrder(ordering_idx);
+
+  const bool use_order = ordering_state != 0;
+
+  AccessPath *path = NewFullTextSearchAccessPath(
+      m_thd, table, ref, match, use_order,
+      IsLimitHintPushableToFullTextSearch(match, m_graph,
+                                          m_sargable_fulltext_predicates),
+      /*count_examined_rows=*/true);
+  path->num_output_rows_before_filter = num_output_rows_from_index;
+  path->num_output_rows = num_output_rows_from_filter;
+  path->cost = path->cost_before_filter = cost;
+  path->init_cost = path->init_once_cost = 0;
+  path->ordering_state = ordering_state;
+
+  ProposeAccessPathForIndex(node_idx, std::move(applied_predicates),
+                            std::move(subsumed_predicates),
+                            table->key_info[key_idx].name, path);
+  return false;
+}
+
 void CostingReceiver::ProposeAccessPathForBaseTable(
     int node_idx, const char *description_for_trace, AccessPath *path) {
   for (bool materialize_subqueries : {false, true}) {
     FunctionalDependencySet new_fd_set;
-    ApplyPredicatesForBaseTable(node_idx, /*applied_predicates=*/0,
-                                /*subsumed_predicates=*/0,
-                                materialize_subqueries, path, &new_fd_set);
+    ApplyPredicatesForBaseTable(
+        node_idx,
+        /*applied_predicates=*/
+        MutableOverflowBitset{m_thd->mem_root, m_graph.predicates.size()},
+        /*subsumed_predicates=*/
+        MutableOverflowBitset{m_thd->mem_root, m_graph.predicates.size()},
+        materialize_subqueries, path, &new_fd_set);
     path->ordering_state =
         m_orderings->ApplyFDs(path->ordering_state, new_fd_set);
     ProposeAccessPathWithOrderings(
@@ -1022,19 +1387,21 @@
     non-materialized subqueries.
  */
 void CostingReceiver::ApplyPredicatesForBaseTable(
-    int node_idx, uint64_t applied_predicates, uint64_t subsumed_predicates,
-    bool materialize_subqueries, AccessPath *path,
-    FunctionalDependencySet *new_fd_set) {
+    int node_idx, OverflowBitset applied_predicates,
+    OverflowBitset subsumed_predicates, bool materialize_subqueries,
+    AccessPath *path, FunctionalDependencySet *new_fd_set) {
   double materialize_cost = 0.0;
 
   const NodeMap my_map = TableBitmap(node_idx);
   path->num_output_rows = path->num_output_rows_before_filter;
   path->cost = path->cost_before_filter;
-  path->filter_predicates = 0;
-  path->delayed_predicates = 0;
+  MutableOverflowBitset filter_predicates{m_thd->mem_root,
+                                          m_graph.predicates.size()};
+  MutableOverflowBitset delayed_predicates{m_thd->mem_root,
+                                           m_graph.predicates.size()};
   new_fd_set->reset();
   for (size_t i = 0; i < m_graph.num_where_predicates; ++i) {
-    if (subsumed_predicates & (uint64_t{1} << i)) {
+    if (IsBitSet(i, subsumed_predicates)) {
       // Apply functional dependencies for the base table, but no others;
       // this ensures we get the same functional dependencies set no matter what
       // access path we choose. (The ones that refer to multiple tables,
@@ -1049,12 +1416,12 @@
         // The other side of the join will mark it as delayed, so we
         // need to do so, too. Otherwise, we would never apply the
         // associated functional dependency at the right time.
-        path->delayed_predicates |= uint64_t{1} << i;
+        delayed_predicates.SetBit(i);
       }
       continue;
     }
     if (m_graph.predicates[i].total_eligibility_set == my_map) {
-      path->filter_predicates |= uint64_t{1} << i;
+      filter_predicates.SetBit(i);
       FilterCost cost =
           EstimateFilterCost(m_thd, path->num_output_rows,
                              m_graph.predicates[i].condition, m_query_block);
@@ -1064,7 +1431,7 @@
       } else {
         path->cost += cost.cost_if_not_materialized;
       }
-      if (applied_predicates & (uint64_t{1} << i)) {
+      if (IsBitSet(i, applied_predicates)) {
         // We already factored in this predicate when calculating
         // the selectivity of the ref access, so don't do it again.
       } else {
@@ -1072,9 +1439,11 @@
       }
       *new_fd_set |= m_graph.predicates[i].functional_dependencies;
     } else if (Overlaps(m_graph.predicates[i].total_eligibility_set, my_map)) {
-      path->delayed_predicates |= uint64_t{1} << i;
+      delayed_predicates.SetBit(i);
     }
   }
+  path->filter_predicates = std::move(filter_predicates);
+  path->delayed_predicates = std::move(delayed_predicates);
 
   if (materialize_subqueries) {
     ExpandSingleFilterAccessPath(m_thd, path, m_graph.predicates,
@@ -1105,6 +1474,12 @@
                                         int edge_idx) {
   if (m_thd->is_error()) return true;
 
+  if (++m_num_seen_subgraph_pairs > 100000) {
+    // Bail out; we're going to be needing graph simplification
+    // (a separate worklog).
+    return true;
+  }
+
   assert(left != 0);
   assert(right != 0);
   assert((left & right) == 0);
@@ -1166,8 +1541,29 @@
 
   bool wrote_trace = false;
 
-  for (AccessPath *left_path : left_it->second.paths) {
-    for (AccessPath *right_path : right_it->second.paths) {
+  for (AccessPath *right_path : right_it->second.paths) {
+    if (edge->expr->join_conditions_reject_all_rows &&
+        edge->expr->type != RelationalExpression::FULL_OUTER_JOIN) {
+      // If the join condition can never be true, we also don't need to read the
+      // right side. For inner joins and semijoins, we can actually just skip
+      // reading the left side as well, but if so, the join condition would be
+      // pulled up into a WHERE condition (or into the join condition of the
+      // next higher non-inner join), so we'll never see that in practice,
+      // and thus, don't care particularly about the case. We also don't need to
+      // care much about the ordering, since we don't propagate the right-hand
+      // ordering properties through joins.
+      AccessPath *zero_path = NewZeroRowsAccessPath(
+          m_thd, right_path, "Join condition rejects all rows");
+      MutableOverflowBitset applied_sargable_join_predicates =
+          right_path->applied_sargable_join_predicates().Clone(m_thd->mem_root);
+      applied_sargable_join_predicates.ClearBits(0,
+                                                 m_graph.num_where_predicates);
+      zero_path->filter_predicates =
+          std::move(applied_sargable_join_predicates);
+      zero_path->delayed_predicates = right_path->delayed_predicates;
+      right_path = zero_path;
+    }
+    for (AccessPath *left_path : left_it->second.paths) {
       // For inner joins and full outer joins, the order does not matter.
       // In lieu of a more precise cost model, always keep the one that hashes
       // the fewest amount of rows. (This has lower initial cost, and the same
@@ -1205,40 +1601,11 @@
             /*rewrite_semi_to_inner=*/can_rewrite_semi_to_inner, new_fd_set,
             new_obsolete_orderings);
       }
-
-      if (m_access_paths.size() > 100000) {
-        // Bail out; we're going to be needing graph simplification
-        // (a separate worklog).
-        return true;
-      }
     }
   }
   return false;
 }
 
-double FindOutputRowsForJoin(AccessPath *left_path, AccessPath *right_path,
-                             const JoinPredicate *edge,
-                             double already_applied_selectivity) {
-  const double outer_rows = left_path->num_output_rows;
-  const double inner_rows = right_path->num_output_rows;
-  const double selectivity = edge->selectivity / already_applied_selectivity;
-  if (edge->expr->type == RelationalExpression::ANTIJOIN) {
-    return outer_rows * (1.0 - selectivity);
-  } else {
-    double num_output_rows = outer_rows * inner_rows * selectivity;
-    if (edge->expr->type == RelationalExpression::LEFT_JOIN) {
-      num_output_rows = std::max(num_output_rows, outer_rows);
-    }
-    if (edge->expr->type == RelationalExpression::SEMIJOIN) {
-      num_output_rows =
-          std::min(num_output_rows, outer_rows / already_applied_selectivity);
-      num_output_rows =
-          std::min(num_output_rows, inner_rows / already_applied_selectivity);
-    }
-    return num_output_rows;
-  }
-}
-
 /**
   Build an access path that deduplicates its input on a certain grouping.
   This is used for converting semijoins to inner joins. If the grouping is
@@ -1278,6 +1645,22 @@
     return;
   }
 
+  if (Overlaps(left | right, m_fulltext_tables)) {
+    // Evaluation of a full-text function requires that the underlying scan is
+    // positioned on the row that contains the value to be searched. It is not
+    // enough that table->record[0] contains the row; the handler needs to be
+    // actually positioned on the row. This does not work so well with hash
+    // joins, since they may return rows in a different order than that of the
+    // underlying scan.
+    //
+    // For now, be conservative and don't propose a hash join if either side of
+    // the join contains a full-text searched table. It is possible to be more
+    // lenient and allow hash joins if all the full-text search functions on the
+    // accessed tables have been fully pushed down to the table/index scan and
+    // don't need to be evaluated again outside of the join.
+    return;
+  }
+
   AccessPath join_path;
   join_path.type = AccessPath::HASH_JOIN;
   join_path.parameter_tables =
@@ -1314,9 +1697,9 @@
   // TODO(sgunders): Add estimates for spill-to-disk costs.
   const double build_cost =
       right_path->cost + right_path->num_output_rows * kHashBuildOneRowCost;
-  double cost =
-      left_path->cost + build_cost +
-      (left_path->num_output_rows + num_output_rows) * kHashProbeOneRowCost;
+  double cost = left_path->cost + build_cost +
+                left_path->num_output_rows * kHashProbeOneRowCost +
+                num_output_rows * kHashReturnOneRowCost;
 
   // Note: This isn't strictly correct if the non-equijoin conditions
   // have selectivities far from 1.0; the cost should be calculated
@@ -1342,6 +1725,16 @@
   }
   join_path.cost = cost;
 
+  // For each scan, hash join will read the left side once and the right side
+  // once, so we are as safe as the least safe of the two. (This isn't true
+  // if we set spill_to_disk = false, but we never do that in the hypergraph
+  // optimizer.) Note that if the right side fits entirely in RAM, we don't
+  // scan it the second time (so we could make the operation _more_ safe
+  // than the right side, and we should consider both ways of doing
+  // an inner join), but we cannot know that when planning.
+  join_path.safe_for_rowid =
+      std::max(left_path->safe_for_rowid, right_path->safe_for_rowid);
+
   // Only trace once; the rest ought to be identical.
   if (m_trace != nullptr && !*wrote_trace) {
     *m_trace += StringPrintf(
@@ -1358,9 +1751,10 @@
 
   {
     FunctionalDependencySet filter_fd_set;
-    ApplyDelayedPredicatesAfterJoin(left, right, left_path, right_path,
-                                    /*materialize_subqueries=*/false,
-                                    &join_path, &filter_fd_set);
+    ApplyDelayedPredicatesAfterJoin(
+        left, right, left_path, right_path, edge->expr->join_predicate_first,
+        edge->expr->join_predicate_last,
+        /*materialize_subqueries=*/false, &join_path, &filter_fd_set);
     // Hash join destroys all ordering information (even from the left side,
     // since we may have spill-to-disk).
     join_path.ordering_state = m_orderings->ApplyFDs(
@@ -1373,9 +1767,10 @@
   if (Overlaps(join_path.filter_predicates,
                m_graph.materializable_predicates)) {
     FunctionalDependencySet filter_fd_set;
-    ApplyDelayedPredicatesAfterJoin(left, right, left_path, right_path,
-                                    /*materialize_subqueries=*/true, &join_path,
-                                    &filter_fd_set);
+    ApplyDelayedPredicatesAfterJoin(
+        left, right, left_path, right_path, edge->expr->join_predicate_first,
+        edge->expr->join_predicate_last,
+        /*materialize_subqueries=*/true, &join_path, &filter_fd_set);
     // Hash join destroys all ordering information (even from the left side,
     // since we may have spill-to-disk).
     join_path.ordering_state = m_orderings->ApplyFDs(
@@ -1390,44 +1785,108 @@
 // ones that need to be delayed further.
 void CostingReceiver::ApplyDelayedPredicatesAfterJoin(
     NodeMap left, NodeMap right, const AccessPath *left_path,
-    const AccessPath *right_path, bool materialize_subqueries,
-    AccessPath *join_path, FunctionalDependencySet *new_fd_set) {
+    const AccessPath *right_path, int join_predicate_first,
+    int join_predicate_last, bool materialize_subqueries, AccessPath *join_path,
+    FunctionalDependencySet *new_fd_set) {
   // We build up a new FD set each time; it should be the same for the same
   // left/right pair, so it is somewhat redundant, but it allows us to verify
   // that property through the assert in ProposeAccessPathWithOrderings().
   new_fd_set->reset();
 
+  // Keep track of which multiple equalities we have created predicates for
+  // so far. We use this to avoid applying redundant predicates, ie. predicates
+  // that have already been checked. (This is not only to avoid unneeded work,
+  // but to avoid double-counting the selectivity.)
+  //
+  // Avoiding redundant predicates for a multi-equality is equivalent to never
+  // applying those that would cause loops in the subgraph induced by the tables
+  // involved in the multi-equality. (In other words, we are building spanning
+  // trees in the induced subgraph.) In general, every time we connect two
+  // subgraphs, we must apply every relevant multi-equality exactly once,
+  // and ignore the others. (This is vaguely reminiscent of Kruskal's algorithm
+  // for constructing minimum spanning trees.)
+  //
+  // DPhyp only ever connects subgraphs that are not already connected
+  // (ie., it already constructs spanning trees), so we know that the join
+  // conditions applied earlier are never redundant wrt. the rest of the graph.
+  // Thus, we only need to test the delayed predicates below; they _may_ contain
+  // a multiple equality we haven't already applied, but they may also be new,
+  // e.g. in this graph:
+  //
+  //     b
+  //    /|\ .
+  //   a | d
+  //    \|/
+  //     c
+  //
+  // If we have a multiple equality over {b,c,d}, and connect a-b and then a-c,
+  // the edge b-c will come into play and contain a multi-equality that was not
+  // applied before. We will need to apply that multi-equality (we will
+  // only get one of d-b and d-c). However, if we instead connected d-b
+  // and d-c, the edge b-c will now be redundant and must be ignored
+  // (except for functional dependencies). We simply track which ones have been
+  // applied this iteration by keeping a bitmap of them.
+  uint64_t multiple_equality_bitmap = 0;
+  for (int pred_idx = join_predicate_first; pred_idx < join_predicate_last;
+       ++pred_idx) {
+    const Predicate &pred = m_graph.predicates[pred_idx];
+    if (pred.source_multiple_equality_idx != -1) {
+      multiple_equality_bitmap |= uint64_t{1}
+                                  << pred.source_multiple_equality_idx;
+    }
+  }
+
   double materialize_cost = 0.0;
 
-  // Keep the information about applied_sargable_join_predicates,
-  // but reset the one pertaining to filter_predicates.
-  join_path->applied_sargable_join_predicates =
-      (left_path->applied_sargable_join_predicates |
-       right_path->applied_sargable_join_predicates) &
-      ~TablesBetween(0, m_graph.num_where_predicates);
-  join_path->delayed_predicates =
-      left_path->delayed_predicates ^ right_path->delayed_predicates;
+  // filter_predicates holds both filter_predicates and
+  // applied_sargable_join_predicates. Keep the information about the latter,
+  // but reset the one pertaining to the former.
+  MutableOverflowBitset filter_predicates = OverflowBitset::Or(
+      m_thd->mem_root, left_path->applied_sargable_join_predicates(),
+      right_path->applied_sargable_join_predicates());
+  filter_predicates.ClearBits(0, m_graph.num_where_predicates);
+
+  // Predicates we are still delaying.
+  MutableOverflowBitset delayed_predicates =
+      OverflowBitset::Xor(m_thd->mem_root, left_path->delayed_predicates,
+                          right_path->delayed_predicates);
+  delayed_predicates.ClearBits(join_predicate_first, join_predicate_last);
+
+  // Predicates that were delayed, but that we need to check now.
+  MutableOverflowBitset ready_predicates =
+      OverflowBitset::And(m_thd->mem_root, left_path->delayed_predicates,
+                          right_path->delayed_predicates);
+  ready_predicates.ClearBits(join_predicate_first, join_predicate_last);
+
   const NodeMap ready_tables = left | right;
-  for (int pred_idx : BitsSetIn(left_path->delayed_predicates &
-                                right_path->delayed_predicates)) {
-    if (IsSubset(m_graph.predicates[pred_idx].total_eligibility_set,
-                 ready_tables)) {
-      join_path->filter_predicates |= uint64_t{1} << pred_idx;
-      FilterCost cost = EstimateFilterCost(
-          m_thd, join_path->num_output_rows,
-          m_graph.predicates[pred_idx].condition, m_query_block);
-      if (materialize_subqueries) {
-        join_path->cost += cost.cost_if_materialized;
-        materialize_cost += cost.cost_to_materialize;
-      } else {
-        join_path->cost += cost.cost_if_not_materialized;
+  for (int pred_idx : BitsSetIn(std::move(ready_predicates))) {
+    const Predicate &pred = m_graph.predicates[pred_idx];
+    if (IsSubset(pred.total_eligibility_set, ready_tables)) {
+      if (pred.source_multiple_equality_idx == -1 ||
+          !IsBitSet(pred.source_multiple_equality_idx,
+                    multiple_equality_bitmap)) {
+        filter_predicates.SetBit(pred_idx);
+        FilterCost cost = EstimateFilterCost(m_thd, join_path->num_output_rows,
+                                             pred.condition, m_query_block);
+        if (materialize_subqueries) {
+          join_path->cost += cost.cost_if_materialized;
+          materialize_cost += cost.cost_to_materialize;
+        } else {
+          join_path->cost += cost.cost_if_not_materialized;
+        }
+        join_path->num_output_rows *= pred.selectivity;
+        if (pred.source_multiple_equality_idx != -1) {
+          multiple_equality_bitmap |= uint64_t{1}
+                                      << pred.source_multiple_equality_idx;
+        }
       }
-      join_path->num_output_rows *= m_graph.predicates[pred_idx].selectivity;
-      *new_fd_set |= m_graph.predicates[pred_idx].functional_dependencies;
+      *new_fd_set |= pred.functional_dependencies;
     } else {
-      join_path->delayed_predicates |= uint64_t{1} << pred_idx;
+      delayed_predicates.SetBit(pred_idx);
     }
   }
+  join_path->filter_predicates = std::move(filter_predicates);
+  join_path->delayed_predicates = std::move(delayed_predicates);
 
   if (materialize_subqueries) {
     ExpandSingleFilterAccessPath(m_thd, join_path, m_graph.predicates,
@@ -1444,6 +1903,59 @@
 static string PrintCost(const AccessPath &path, const JoinHypergraph &graph,
                         const char *description_for_trace);
 
+/**
+  Check if we're about to apply a join condition that would be redundant
+  with regards to an already-applied sargable predicate, ie., whether our
+  join condition and the sargable predicate applies the same multiple equality.
+  E.g. if we try to join {t1,t2} and {t3} along t1=t3, but the access path
+  for t3 already has applied the join condition t2=t3, and these are from the
+  same multiple equality, return true.
+
+  Even though this is totally _legal_, having such a situation is bad, because
+
+    a) It double-counts the selectivity, causing the overall row estimate
+       to become too low.
+    b) It causes unneeded work by adding a redundant filter.
+
+  b) would normally cause the path to be pruned out due to cost, except that
+  the artifically low row count due to a) could make the path attractive as a
+  subplan of a larger join. Thus, we simply reject these joins; we'll see a
+  different alternative for this join at some point that is not redundant
+  (e.g., in the given example, we'd see the t2=t3 join).
+ */
+bool CostingReceiver::AlreadyAppliedThroughSargable(
+    Item_func_eq *join_cond, OverflowBitset applied_sargable_join_predicates,
+    NodeMap left, NodeMap right) {
+  if (join_cond->source_multiple_equality == nullptr) {
+    return false;
+  }
+  for (size_t predicate_idx : BitsSetIn(applied_sargable_join_predicates)) {
+    const Predicate &pred = m_graph.predicates[predicate_idx];
+
+    // Don't deduplicate against ourselves (in case we're sargable).
+    if (pred.condition == join_cond) {
+      continue;
+    }
+
+    // Must be an equijoin condition that comes from the same multiple equality
+    // as the one we're trying to join in.
+    if (pred.condition->type() != Item::FUNC_ITEM ||
+        down_cast<Item_func *>(pred.condition)->functype() !=
+            Item_func::EQ_FUNC ||
+        down_cast<Item_func_eq *>(pred.condition)->source_multiple_equality !=
+            join_cond->source_multiple_equality) {
+      continue;
+    }
+
+    // The sargable condition must work as a join condition for this join
+    // (not between tables we've already joined in).
+    if (Overlaps(pred.used_nodes, left) && Overlaps(pred.used_nodes, right)) {
+      return true;
+    }
+  }
+  return false;
+}
+
 void CostingReceiver::ProposeNestedLoopJoin(
     NodeMap left, NodeMap right, AccessPath *left_path, AccessPath *right_path,
     const JoinPredicate *edge, bool rewrite_semi_to_inner,
@@ -1501,16 +2013,20 @@
         static_cast<JoinType>(edge->expr->type);
   }
 
-  const uint64_t applied_sargable_join_predicates =
-      left_path->applied_sargable_join_predicates |
-      right_path->applied_sargable_join_predicates;
-  const uint64_t subsumed_sargable_join_predicates =
-      left_path->subsumed_sargable_join_predicates |
-      right_path->subsumed_sargable_join_predicates;
+  const OverflowBitset applied_sargable_join_predicates = OverflowBitset::Or(
+      m_thd->mem_root, left_path->applied_sargable_join_predicates(),
+      right_path->applied_sargable_join_predicates());
+  const OverflowBitset subsumed_sargable_join_predicates = OverflowBitset::Or(
+      m_thd->mem_root, left_path->subsumed_sargable_join_predicates(),
+      right_path->subsumed_sargable_join_predicates());
 
   double already_applied_selectivity = 1.0;
-  if (edge->expr->equijoin_conditions.size() != 0 ||
-      edge->expr->join_conditions.size() != 0) {
+  if (edge->expr->join_conditions_reject_all_rows) {
+    // We've already taken out all rows from the right-hand side
+    // (by means of a ZeroRowsIterator), so no need to add filters;
+    // they'd only clutter the EXPLAIN.
+  } else if (!edge->expr->equijoin_conditions.empty() ||
+             !edge->expr->join_conditions.empty()) {
     // Apply join filters. Don't update num_output_rows, as the join's
     // selectivity will already be applied in FindOutputRowsForJoin().
     // NOTE(sgunders): We don't model the effect of short-circuiting filters on
@@ -1534,15 +2050,23 @@
       const auto it = m_graph.sargable_join_predicates.find(condition);
       bool subsumed = false;
       if (it != m_graph.sargable_join_predicates.end() &&
-          Overlaps(applied_sargable_join_predicates,
-                   uint64_t{1} << it->second)) {
+          IsBitSet(it->second, applied_sargable_join_predicates)) {
         // This predicate was already applied as a ref access earlier.
         // Make sure not to double-count its selectivity, and also
         // that we don't reapply it if it was subsumed by the ref access.
         already_applied_selectivity *=
             m_graph.predicates[it->second].selectivity;
-        subsumed = Overlaps(subsumed_sargable_join_predicates,
-                            uint64_t{1} << it->second);
+        subsumed = IsBitSet(it->second, subsumed_sargable_join_predicates);
+      } else if (AlreadyAppliedThroughSargable(condition,
+                                               applied_sargable_join_predicates,
+                                               left, right)) {
+        if (m_trace != nullptr) {
+          *m_trace +=
+              " - " + PrintCost(*right_path, m_graph, "") +
+              " has a sargable predicate that is redundant with our join "
+              "predicate, skipping\n";
+          return;
+        }
       }
       if (!subsumed) {
         items.push_back(condition);
@@ -1599,11 +2123,21 @@
   join_path.ordering_state =
       m_orderings->ApplyFDs(left_path->ordering_state, new_fd_set);
 
+  // We may scan the right side several times, but the left side maybe once.
+  // So if the right side is not safe to scan for row IDs after multiple scans,
+  // neither are we. But if it's safe, we're exactly as safe as the left side.
+  if (right_path->safe_for_rowid != AccessPath::SAFE) {
+    join_path.safe_for_rowid = AccessPath::UNSAFE;
+  } else {
+    join_path.safe_for_rowid = left_path->safe_for_rowid;
+  }
+
   {
     FunctionalDependencySet filter_fd_set;
-    ApplyDelayedPredicatesAfterJoin(left, right, left_path, right_path,
-                                    /*materialize_subqueries=*/false,
-                                    &join_path, &filter_fd_set);
+    ApplyDelayedPredicatesAfterJoin(
+        left, right, left_path, right_path, edge->expr->join_predicate_first,
+        edge->expr->join_predicate_last,
+        /*materialize_subqueries=*/false, &join_path, &filter_fd_set);
     join_path.ordering_state = m_orderings->ApplyFDs(
         join_path.ordering_state, new_fd_set | filter_fd_set);
     ProposeAccessPathWithOrderings(
@@ -1615,9 +2149,10 @@
   if (Overlaps(join_path.filter_predicates,
                m_graph.materializable_predicates)) {
     FunctionalDependencySet filter_fd_set;
-    ApplyDelayedPredicatesAfterJoin(left, right, left_path, right_path,
-                                    /*materialize_subqueries=*/true, &join_path,
-                                    &filter_fd_set);
+    ApplyDelayedPredicatesAfterJoin(
+        left, right, left_path, right_path, edge->expr->join_predicate_first,
+        edge->expr->join_predicate_last,
+        /*materialize_subqueries=*/true, &join_path, &filter_fd_set);
     join_path.ordering_state = m_orderings->ApplyFDs(
         join_path.ordering_state, new_fd_set | filter_fd_set);
     ProposeAccessPathWithOrderings(left | right, new_fd_set | filter_fd_set,
@@ -1709,6 +2244,16 @@
     b_is_better = true;
   }
 
+  // If one path is safe for row IDs and another one is not,
+  // that is also something we need to take into account.
+  // Safer values have lower numerical values, so we can compare them
+  // as integers.
+  if (a.safe_for_rowid < b.safe_for_rowid) {
+    a_is_better = true;
+  } else if (b.safe_for_rowid < a.safe_for_rowid) {
+    b_is_better = true;
+  }
+
   if (!a_is_better && !b_is_better) {
     return PathComparisonResult::IDENTICAL;
   } else if (a_is_better && !b_is_better) {
@@ -1751,6 +2296,12 @@
     str += StringPrintf(", order=%d", path.ordering_state);
   }
 
+  if (path.safe_for_rowid == AccessPath::SAFE_IF_SCANNED_ONCE) {
+    str += StringPrintf(", safe_for_rowid_once");
+  } else if (path.safe_for_rowid == AccessPath::UNSAFE) {
+    str += StringPrintf(", unsafe_for_rowid");
+  }
+
   if (strcmp(description_for_trace, "") == 0) {
     return str + "}";
   } else {
@@ -1758,24 +2309,6 @@
   }
 }
 
-void EstimateSortCost(AccessPath *path) {
-  AccessPath *child = path->sort().child;
-  const double num_rows = child->num_output_rows;
-  double sort_cost;
-  if (num_rows <= 1.0) {
-    // Avoid NaNs from log2().
-    sort_cost = kSortOneRowCost;
-  } else {
-    sort_cost = kSortOneRowCost * num_rows * std::max(log2(num_rows), 1.0);
-  }
-
-  path->num_output_rows = num_rows;
-  path->cost = path->init_cost = child->cost + sort_cost;
-  path->init_once_cost = 0.0;
-  path->num_output_rows_before_filter = path->num_output_rows;
-  path->cost_before_filter = path->cost;
-}
-
 /**
   Propose the given access path as an alternative to the existing access paths
   for the same task (assuming any exist at all), and hold a “tournament� to find
@@ -1816,7 +2349,7 @@
     }
     assert(!m_thd->is_error());
     assert(path->init_cost <= path->cost);
-    if (path->filter_predicates != 0) {
+    if (!IsEmpty(path->filter_predicates)) {
       assert(path->num_output_rows <= path->num_output_rows_before_filter);
       assert(path->cost_before_filter <= path->cost);
       assert(path->init_cost <= path->cost_before_filter);
@@ -1926,6 +2459,33 @@
   return;
 }
 
+AccessPath MakeSortPathWithoutFilesort(THD *thd, AccessPath *child,
+                                       ORDER *order, int ordering_state,
+                                       int num_where_predicates) {
+  AccessPath sort_path;
+  sort_path.type = AccessPath::SORT;
+  sort_path.ordering_state = ordering_state;
+  if (!child->applied_sargable_join_predicates()
+           .empty()) {  // Will be empty after grouping.
+    MutableOverflowBitset applied_sargable_join_predicates =
+        child->applied_sargable_join_predicates().Clone(thd->mem_root);
+    applied_sargable_join_predicates.ClearBits(0, num_where_predicates);
+    sort_path.applied_sargable_join_predicates() =
+        std::move(applied_sargable_join_predicates);
+  }
+  sort_path.delayed_predicates = child->delayed_predicates;
+  sort_path.count_examined_rows = false;
+  sort_path.sort().child = child;
+  sort_path.sort().filesort = nullptr;
+  sort_path.sort().tables_to_get_rowid_for = 0;
+  sort_path.sort().order = order;
+  sort_path.sort().remove_duplicates = false;
+  sort_path.sort().unwrap_rollup = true;
+  sort_path.sort().use_limit = false;
+  EstimateSortCost(&sort_path);
+  return sort_path;
+}
+
 void CostingReceiver::ProposeAccessPathWithOrderings(
     NodeMap nodes, FunctionalDependencySet fd_set,
     OrderingSet obsolete_orderings, AccessPath *path,
@@ -1969,6 +2529,8 @@
     return;
   }
 
+  path = GetSafePathToSort(m_thd, m_query_block->join, path, m_need_rowid);
+
   // Try sort-ahead for all interesting orderings.
   // (For the final sort, this might not be so much _ahead_, but still
   // potentially useful, if there are multiple orderings where one is a
@@ -1978,6 +2540,11 @@
     if (!IsSubset(sort_ahead_ordering.required_nodes, nodes)) {
       continue;
     }
+    if (sort_ahead_ordering.aggregates_required) {
+      // For sort-ahead, we don't have any aggregates yet
+      // (since we never group-ahead).
+      continue;
+    }
 
     LogicalOrderings::StateIndex new_state = m_orderings->ApplyFDs(
         m_orderings->SetOrder(sort_ahead_ordering.ordering_idx), fd_set);
@@ -1991,21 +2558,9 @@
       path_is_on_heap = true;
     }
 
-    AccessPath sort_path;
-    sort_path.type = AccessPath::SORT;
-    sort_path.ordering_state = new_state;
-    sort_path.applied_sargable_join_predicates =
-        path->applied_sargable_join_predicates &
-        ~BitsBetween(0, m_graph.num_where_predicates);
-    sort_path.delayed_predicates = path->delayed_predicates;
-    sort_path.count_examined_rows = false;
-    sort_path.sort().child = path;
-    sort_path.sort().filesort = nullptr;
-    sort_path.sort().tables_to_get_rowid_for = 0;
-    sort_path.sort().order = sort_ahead_ordering.order;
-    sort_path.sort().remove_duplicates = false;
-    sort_path.sort().unwrap_rollup = true;
-    EstimateSortCost(&sort_path);
+    AccessPath sort_path =
+        MakeSortPathWithoutFilesort(m_thd, path, sort_ahead_ordering.order,
+                                    new_state, m_graph.num_where_predicates);
 
     char buf[256];
     if (m_trace != nullptr) {
@@ -2022,22 +2577,7 @@
   }
 }
 
-/**
-  Find the list of all tables used by this root, stopping at materializations.
-  Used for knowing which tables to sort.
- */
-Mem_root_array<TABLE *> CollectTables(THD *thd, AccessPath *root_path) {
-  Mem_root_array<TABLE *> tables(thd->mem_root);
-  WalkTablesUnderAccessPath(
-      root_path, [&tables](TABLE *table) { return tables.push_back(table); });
-  return tables;
-}
-
-bool CheckSupportedQuery(THD *thd, JOIN *join) {
-  if (join->query_block->has_ft_funcs()) {
-    my_error(ER_HYPERGRAPH_NOT_SUPPORTED_YET, MYF(0), "fulltext search");
-    return true;
-  }
+bool CheckSupportedQuery(THD *thd) {
   if (thd->lex->m_sql_cmd->using_secondary_storage_engine() &&
       !Overlaps(EngineFlags(thd),
                 MakeSecondaryEngineFlags(
@@ -2047,224 +2587,31 @@
              "the secondary engine in use");
     return true;
   }
-  if (join->query_block->has_windows()) {
-    my_error(ER_HYPERGRAPH_NOT_SUPPORTED_YET, MYF(0), "windowing functions");
-    return true;
-  }
   return false;
 }
 
 /**
-  Replaces field references in an ON DUPLICATE KEY UPDATE clause with references
-  to corresponding fields in a temporary table. The changes will be rolled back
-  at the end of execution and will have to be redone during optimization in the
-  next execution.
- */
-void ReplaceUpdateValuesWithTempTableFields(
-    Sql_cmd_insert_select *sql_cmd, Query_block *query_block,
-    const mem_root_deque<Item *> &original_fields,
-    const mem_root_deque<Item *> &temp_table_fields) {
-  assert(CountVisibleFields(original_fields) ==
-         CountVisibleFields(temp_table_fields));
-
-  if (sql_cmd->update_value_list.empty()) return;
-
-  auto tmp_field_it = VisibleFields(temp_table_fields).begin();
-  for (Item *orig_field : VisibleFields(original_fields)) {
-    Item *tmp_field = *tmp_field_it++;
-    if (orig_field->type() == Item::FIELD_ITEM) {
-      Item::Item_field_replacement replacement(
-          down_cast<Item_field *>(orig_field)->field,
-          down_cast<Item_field *>(tmp_field), query_block);
-      for (Item *&orig_item : sql_cmd->update_value_list) {
-        uchar *dummy;
-        Item *new_item = orig_item->compile(
-            &Item::visit_all_analyzer, &dummy, &Item::replace_item_field,
-            pointer_cast<uchar *>(&replacement));
-        if (new_item != orig_item) {
-          query_block->join->thd->change_item_tree(&orig_item, new_item);
-        }
-      }
-    }
-  }
-}
-
-/**
-  Creates a temporary table with columns matching the SELECT list of the given
-  query block. The SELECT list of the query block is updated to point to the
-  fields in the temporary table, and the same is done for the ON DUPLICATE KEY
-  UPDATE clause of INSERT SELECT statements, if they have one.
-
-  This function is used for materializing the query result, either as an
-  intermediate step before sorting the final result if the sort requires the
-  rows to come from a single table instead of a join, or as the last step if the
-  SQL_BUFFER_RESULT query option has been specified.
- */
-TABLE *CreateTemporaryTableFromSelectList(
-    THD *thd, Query_block *query_block,
-    Temp_table_param **temp_table_param_arg) {
-  JOIN *join = query_block->join;
-
-  Temp_table_param *temp_table_param = new (thd->mem_root) Temp_table_param;
-  *temp_table_param_arg = temp_table_param;
-  assert(!temp_table_param->precomputed_group_by);
-  assert(!temp_table_param->skip_create_table);
-  count_field_types(query_block, temp_table_param, *join->fields,
-                    /*reset_with_sum_func=*/true, /*save_sum_fields=*/true);
-
-  TABLE *temp_table = create_tmp_table(
-      thd, temp_table_param, *join->fields,
-      /*group=*/nullptr, /*distinct=*/false, /*save_sum_fields=*/true,
-      query_block->active_options(), /*rows_limit=*/HA_POS_ERROR, "");
-  temp_table->alias = "<temporary>";
-
-  // Most items have been added to items_to_copy in create_tmp_field(), but not
-  // aggregate funtions, so add them here.
-  for (Item *item : *join->fields) {
-    if (item->type() == Item::SUM_FUNC_ITEM) {
-      temp_table_param->items_to_copy->push_back(
-          Func_ptr{item, item->get_result_field()});
-    }
-
-    // Verify that all non-constant items have been added to items_to_copy.
-    assert(item->const_for_execution() ||
-           std::any_of(
-               temp_table_param->items_to_copy->begin(),
-               temp_table_param->items_to_copy->end(),
-               [item](const Func_ptr &ptr) { return ptr.func() == item; }));
-  }
-
-  // We made a new table, so make sure it gets properly cleaned up
-  // at the end of execution.
-  join->temp_tables.push_back(
-      JOIN::TemporaryTableToCleanup{temp_table, temp_table_param});
-
-  return temp_table;
-}
-
-/**
-  Check what field the given item will be materialized into under the given
-  temporary table parameters.
-
-  If the item is materialized (ie., found in items_to_copy), we return a
-  canonical Item_field for that field; ie., the same every time. This means
-  that you can do the same replacement in a SELECT list and then in
-  items_to_copy itself, and still have them match. This is used in particular
-  when updating Temp_table_param itself, in FinalizePlanForQueryBlock().
- */
-Item_field *FindReplacementItem(Item *item,
-                                Temp_table_param *temp_table_param) {
-  for (const Func_ptr &func : *temp_table_param->items_to_copy) {
-    if (func.func() == item) {
-      Item_field *item_field = func.result_item();
-      if (item_field == nullptr) return nullptr;
-      item_field->hidden = item->hidden;
-      return item_field;
-    }
-  }
-  return nullptr;
-}
-
-/**
-  Return a new item that is to be used after materialization (as given by
-  temp_table_param->items_to_copy). There are three main cases:
-
-    1. The item isn't touched by materialization (e.g., because it's constant,
-       or because we're not ready to compute it yet).
-    2. The item is directly in the items_to_copy list, so it has its own field
-       in the resulting temporary table; the corresponding new Item_field
-       is returned.
-    3. A _part_ of the item is in the items_to_copy list; e.g. say that we
-       have an item (t1.x + 1), and t1.x is materialized into <temporary>.x.
-       (In particular, this happens when having expressions that contain
-       aggregate functions _and_ non-aggregates.) In this case, we go in and
-       modify the item in-place, so that the appropriate sub-expressions are
-       replaced; in this case, to (<temporary>.x + 1). This assumes that we
-       never use the same item before and after a materialization in the
-       query plan!
- */
-Item *FindOrModifyReplacementItem(THD *thd, Item *item,
-                                  Temp_table_param *temp_table_param) {
-  const auto replace_functor = [temp_table_param](Item *sub_item, Item *,
-                                                  unsigned) -> ReplaceResult {
-    if (sub_item->const_for_execution()) {
-      // Stop traversing (which we do with a fake replacement with ourselves).
-      return {ReplaceResult::REPLACE, sub_item};
-    }
-    Item *replacement =
-        FindReplacementItem(sub_item->real_item(), temp_table_param);
-    if (replacement != nullptr) {
-      return {ReplaceResult::REPLACE, replacement};
-    } else {
-      return {ReplaceResult::KEEP_TRAVERSING, nullptr};
-    }
-  };
-
-  if (item->const_for_execution()) {
-    return item;
-  }
-
-  Item *replacement = FindReplacementItem(item, temp_table_param);
-  if (replacement != nullptr) {
-    return replacement;
-  } else {
-    WalkAndReplace(thd, item, std::move(replace_functor));
-    return item;
-  }
-}
-
-/**
-  Replaces the items in the SELECT list with items that point to fields in a
-  temporary table. See FinalizePlanForQueryBlock() for more information.
- */
-void ReplaceSelectListWithTempTableFields(THD *thd, JOIN *join,
-                                          Temp_table_param *temp_table_param) {
-  auto fields = new (thd->mem_root) mem_root_deque<Item *>(thd->mem_root);
-  for (Item *item : *join->fields) {
-    fields->push_back(FindOrModifyReplacementItem(thd, item, temp_table_param));
-  }
-  join->fields = fields;
-}
-
-// Change all items in the ORDER list to point to the temporary table.
-// This isn't important for streaming (the items would get the correct
-// value anyway -- although possibly with some extra calculations),
-// but it is for materialization.
-void ReplaceOrderItemsWithTempTableFields(THD *thd, ORDER *order,
-                                          Temp_table_param *temp_table_param) {
-  for (; order != nullptr; order = order->next) {
-    Item *temp_field_item =
-        FindOrModifyReplacementItem(thd, *order->item, temp_table_param);
-    if (temp_field_item != *order->item) {
-      // *order->item points into a memory area (the “base ref slice�)
-      // where HAVING might expect to find items _not_ pointing into the
-      // temporary table (if there is true materialization, it should run
-      // before it to minimize the size of the sorted input), so in order to
-      // not disturb it, we create a whole new place for the Item pointer
-      // to live.
-      //
-      // TODO(sgunders): When we get rid of slices altogether,
-      // we can skip this.
-      thd->change_item_tree(pointer_cast<Item **>(&order->item),
-                            pointer_cast<Item *>(new (thd->mem_root) Item *));
-      thd->change_item_tree(order->item, temp_field_item);
-    }
-  }
-}
-
-/**
   Set up an access path for streaming or materializing through a temporary
-  table.
+  table. If none is needed (because earlier iterators already materialize
+  what needs to be done), returns the path itself.
+
+  The actual temporary table will be created and filled out during finalization.
  */
-AccessPath *CreateMaterializationOrStreamingPath(
-    THD *thd, JOIN *join, AccessPath *path, TABLE *temp_table,
-    Temp_table_param *temp_table_param) {
+AccessPath *CreateMaterializationOrStreamingPath(THD *thd, JOIN *join,
+                                                 AccessPath *path,
+                                                 bool need_rowid,
+                                                 bool copy_items) {
   // See if later sorts will need row IDs from us or not.
-  if (!SortWillBeOnRowId(temp_table)) {
+  if (!need_rowid) {
     // The common case; we can use streaming.
-    AccessPath *stream_path =
-        NewStreamingAccessPath(thd, path, join, temp_table_param, temp_table,
-                               /*ref_slice=*/-1);
+    if (!copy_items) {
+      // StreamingIterator exists only to copy items, so we don't need an
+      // iterator here at all.
+      return path;
+    }
+    AccessPath *stream_path = NewStreamingAccessPath(
+        thd, path, join, /*temp_table_param=*/nullptr, /*temp_table=*/nullptr,
+        /*ref_slice=*/-1);
     stream_path->num_output_rows = path->num_output_rows;
     stream_path->cost = path->cost;
     stream_path->init_cost = path->init_cost;
@@ -2273,6 +2620,7 @@
     stream_path->num_output_rows_before_filter = stream_path->num_output_rows;
     stream_path->cost_before_filter = stream_path->cost;
     stream_path->ordering_state = path->ordering_state;
+    stream_path->safe_for_rowid = path->safe_for_rowid;
     return stream_path;
   } else {
     // Filesort needs sort by row ID, possibly because large blobs are
@@ -2280,8 +2628,21 @@
     // smaller temporary table at the expense of more seeks, we could
     // materialize only aggregate functions and do a multi-table sort
     // by docid, but this situation is rare, so we go for simplicity.)
-    return CreateMaterializationPath(thd, join, path, temp_table,
-                                     temp_table_param);
+    return CreateMaterializationPath(thd, join, path, /*temp_table=*/nullptr,
+                                     /*temp_table_param=*/nullptr, copy_items);
+  }
+}
+
+AccessPath *GetSafePathToSort(THD *thd, JOIN *join, AccessPath *path,
+                              bool need_rowid) {
+  if (need_rowid && path->safe_for_rowid == AccessPath::UNSAFE) {
+    // We need to materialize this path before we can sort it,
+    // since it might not give us stable row IDs.
+    return CreateMaterializationOrStreamingPath(
+        thd, join, new (thd->mem_root) AccessPath(*path), need_rowid,
+        /*copy_items=*/true);
+  } else {
+    return path;
   }
 }
 
@@ -2291,18 +2652,19 @@
  */
 AccessPath *CreateMaterializationPath(THD *thd, JOIN *join, AccessPath *path,
                                       TABLE *temp_table,
-                                      Temp_table_param *temp_table_param) {
+                                      Temp_table_param *temp_table_param,
+                                      bool copy_items) {
   AccessPath *table_path =
       NewTableScanAccessPath(thd, temp_table, /*count_examined_rows=*/false);
   AccessPath *materialize_path = NewMaterializeAccessPath(
       thd,
       SingleMaterializeQueryBlock(thd, path, /*select_number=*/-1, join,
-                                  /*copy_items=*/true, temp_table_param),
+                                  copy_items, temp_table_param),
       /*invalidators=*/nullptr, temp_table, table_path, /*cte=*/nullptr,
       /*unit=*/nullptr, /*ref_slice=*/-1, /*rematerialize=*/true,
       /*limit_rows=*/HA_POS_ERROR, /*reject_multiple_rows=*/false);
 
-  EstimateMaterializeCost(materialize_path);
+  EstimateMaterializeCost(thd, materialize_path);
   materialize_path->ordering_state = path->ordering_state;
   return materialize_path;
 }
@@ -2318,134 +2680,401 @@
   }
 }
 
-// Estimate the width of each row produced by “query_block�,
-// for temporary table materialization.
-//
-// See EstimateRowWidth() in make_join_hypergraph.cc.
-size_t EstimateRowWidth(const Query_block &query_block) {
-  size_t ret = 0;
-  for (const Item *item : query_block.fields) {
-    ret += min<size_t>(item->max_length, 4096);
-  }
-  return ret;
+/**
+  Goes through an item tree and collects all the sub-items that should be
+  materialized if full-text search is used in combination with sort-based
+  aggregation.
+
+  This means all expressions in the SELECT list, GROUP BY clause, ORDER BY
+  clause and HAVING clause that are possible to evaluate before aggregation.
+
+  The reason why this materialization is needed, is that
+  Item_func_match::val_real() can only be evaluated if the underlying scan is
+  positioned on the row for which the full-text search score is to be retrieved.
+  In the sort-based aggregation performed by AggregateIterator, the rows are
+  returned with the underlying scan positioned on some other row (typically one
+  in the next group). Even though AggregateIterator restores the contents of the
+  record buffers to what they had when the scan was positioned on that row, it
+  is not enough; the handler needs to be repositioned to make Item_func_match
+  give the correct result. To avoid this, we materialize the results of the
+  MATCH functions before they are seen by AggregateIterator.
+
+  The most important thing to materialize is the MATCH function, but
+  AggregateIterator is not currently prepared for reading some data from a
+  materialized source and other data directly from the base tables, so we have
+  to materialize all expressions that are to be used as input to
+  AggregateIterator.
+
+  The old optimizer does not have special code for materializing MATCH
+  functions. In most cases it does not need it, because it usually performs
+  aggregation by materializing all expressions (not only MATCH) in the SELECT
+  list, the GROUP BY clause and the ORDER BY clause anyway. It does not,
+  however, materialize the non-aggregated expressions in the HAVING clause, so
+  calls to the MATCH function in the HAVING clause may give wrong results with
+  the old optimizer.
+
+  The old optimizer uses the same sort-based aggregation as the hypergraph
+  optimizer for ROLLUP. The lack of materialization of MATCH expressions leads
+  to wrong results also when MATCH is used in the SELECT list or the ORDER BY
+  clause of a ROLLUP query.
+
+  The materialization performed by this function makes the hypergraph optimizer
+  produce correct results for the above mentioned cases where the old optimizer
+  produces wrong results.
+ */
+void CollectItemsToMaterializeForFullTextAggregation(
+    Item *root, mem_root_deque<Item *> *items) {
+  // Walk through the item and materialize those sub-expressions that don't
+  // depend on aggregation. We use CompileItem instead of WalkItem, because the
+  // former allows skipping sub-trees. This is useful, so that we don't need to
+  // materialize every sub-expression if a non-leaf item can be materialized.
+  // We don't use the transformation capability of CompileItem, hence the
+  // transformer argument is a simple identity function.
+  CompileItem(
+      root,
+      [items](Item *item) {
+        // First, unconditionally materialize any call to the MATCH function.
+        // This would usually be done anyways by the "else" branch in the if
+        // statement below. But not if the argument of the MATCH function is a
+        // rollup group item. When the argument is a rollup item, we can either
+        // materialize the inside of the rollup item and get right result for
+        // the rollup group (but not the other groups), or materialize the MATCH
+        // function and get the right result for the non-rollup groups (but not
+        // for the rollup group). We cannot get both right currently. The old
+        // optimizer has the same problem, see bug#32996762.
+        if (item->type() == Item::FUNC_ITEM) {
+          Item_func::Functype type = down_cast<Item_func *>(item)->functype();
+          if (type == Item_func::FT_FUNC || type == Item_func::MATCH_FUNC) {
+            items->push_back(item);
+            return false;
+          }
+        }
+
+        if (item->has_aggregation()) {
+          // Since we materialize before aggregation, we cannot materialize
+          // items that depend on an aggregated value. But we can look inside
+          // the item and materialize those parts of the tree that don't depend
+          // on aggregation.
+          return true;
+        } else if (item->has_rollup_expr()) {
+          // Similarly, we cannot materialize items depending on rollup items,
+          // but we can possibly materialize items inside the rollup item, so
+          // keep looking.
+          return true;
+        } else if (item->type() == Item::REF_ITEM) {
+          // Skip past Item_ref and look at its "real" item.
+          return true;
+        } else if (item->const_for_execution()) {
+          // Constant items don't need materialization (and often they are
+          // materialized/cached in an Item_cache anyways), so we skip such
+          // items and also skip their sub-items.
+          return false;
+        } else {
+          // Otherwise, we have an expression that does not depend on
+          // aggregation to have happened, so we materialize the full expression
+          // and don't look further inside of it.
+          items->push_back(item);
+          return false;
+        }
+      },
+      [](Item *item) { return item; });
 }
 
-}  // namespace
+/**
+  Creates a temporary table which materializes the results of all full-text
+  functions that need to be accessible after aggregation. This is needed for
+  sort-based aggregation on full-text searched tables if the full-text search
+  score is accessed in the SELECT list, GROUP BY clause, ORDER BY clause or
+  HAVING clause. See #CollectItemsToMaterializeForFullTextAggregation() for more
+  details.
+
+  @param thd the session object
+  @param query_block the query block
+  @param[out] temp_table the created temporary table,
+    or nullptr if there are no MATCH functions that need materialization
+  @param[out] temp_table_param the parameters of the created temporary table
+
+  @returns false on success, true if an error was raised
+ */
+bool CreateTemporaryTableForFullTextFunctions(
+    THD *thd, Query_block *query_block, TABLE **temp_table,
+    Temp_table_param **temp_table_param) {
+  JOIN *join = query_block->join;
+
+  mem_root_deque<Item *> items_to_materialize(thd->mem_root);
+
+  // Materialize all non-aggregate expressions in the SELECT list and
+  // GROUP BY clause.
+  for (Item *item : *join->fields) {
+    CollectItemsToMaterializeForFullTextAggregation(item,
+                                                    &items_to_materialize);
+  }
+
+  // Materialize all non-aggregate expressions in the HAVING clause.
+  if (join->having_cond != nullptr) {
+    CollectItemsToMaterializeForFullTextAggregation(join->having_cond,
+                                                    &items_to_materialize);
+  }
+
+  // Materialize all non-aggregate expressions in the ORDER BY clause.
+  for (ORDER *order = query_block->order_list.first; order != nullptr;
+       order = order->next) {
+    CollectItemsToMaterializeForFullTextAggregation(*order->item,
+                                                    &items_to_materialize);
+  }
+
+  // If we didn't find any full-text functions that needed materialization, we
+  // don't need a temporary table.
+  if (std::none_of(items_to_materialize.begin(), items_to_materialize.end(),
+                   HasFullTextFunction)) {
+    *temp_table = nullptr;
+    return false;
+  }
+
+  *temp_table_param = new (thd->mem_root) Temp_table_param;
+  if (*temp_table_param == nullptr) return true;
+  count_field_types(query_block, *temp_table_param, items_to_materialize,
+                    /*reset_with_sum_func=*/false, /*save_sum_fields=*/false);
+
+  *temp_table =
+      create_tmp_table(thd, *temp_table_param, items_to_materialize,
+                       /*group=*/nullptr, /*distinct=*/false,
+                       /*save_sum_fields=*/false, query_block->active_options(),
+                       /*rows_limit=*/HA_POS_ERROR, "<temporary>");
+  if (*temp_table == nullptr) return true;
+
+  // We made a new table, so make sure it gets properly cleaned up
+  // at the end of execution.
+  join->temp_tables.push_back(
+      JOIN::TemporaryTableToCleanup{*temp_table, *temp_table_param});
+
+  return false;
+}
+
+// Returns a map containing the node indexes of all tables referenced by a
+// full-text MATCH function.
+NodeMap FindFullTextSearchedTables(const JoinHypergraph &graph) {
+  NodeMap tables = 0;
+  for (size_t i = 0; i < graph.nodes.size(); ++i) {
+    if (graph.nodes[i].table->pos_in_table_list->is_fulltext_searched()) {
+      tables |= TableBitmap(i);
+    }
+  }
+  return tables;
+}
+
+// Checks if an item represents a full-text predicate which can be satisfied by
+// a full-text index scan. This can be done if the predicate is on one of the
+// following forms:
+//
+//    MATCH(col) AGAINST ('search string')
+//    MATCH(col) AGAINST ('search string') > const, where const >= 0
+//    MATCH(col) AGAINST ('search string') >= const, where const > 0
+//    const < MATCH(col) AGAINST ('search string'), where const >= 0
+//    const <= MATCH(col) AGAINST ('search string'), where const > 0
+//
+// That is, the predicate must return FALSE if MATCH returns zero. The predicate
+// cannot be pushed to an index scan if it returns TRUE when MATCH returns zero,
+// because a full-text index scan only returns documents with a positive score.
+//
+// If the item is sargable, the function returns true.
+bool IsSargableFullTextIndexPredicate(Item *condition) {
+  if (condition->type() != Item::FUNC_ITEM) {
+    return false;
+  }
+
+  Item_func *func = down_cast<Item_func *>(condition);
+  int const_arg_idx = -1;
+  bool is_greater_than_op;
+  switch (func->functype()) {
+    case Item_func::MATCH_FUNC:
+      // A standalone MATCH in WHERE is pushable to a full-text index.
+      return true;
+    case Item_func::GT_FUNC:
+      // MATCH > const is pushable to a full-text index if const >= 0. Checked
+      // after the switch.
+      const_arg_idx = 1;
+      is_greater_than_op = true;
+      break;
+    case Item_func::GE_FUNC:
+      // MATCH >= const is pushable to a full-text index if const > 0. Checked
+      // after the switch.
+      const_arg_idx = 1;
+      is_greater_than_op = false;
+      break;
+    case Item_func::LT_FUNC:
+      // Normalize const < MATCH to MATCH > const.
+      const_arg_idx = 0;
+      is_greater_than_op = true;
+      break;
+    case Item_func::LE_FUNC:
+      // Normalize const <= MATCH to MATCH >= const.
+      const_arg_idx = 0;
+      is_greater_than_op = false;
+      break;
+    default:
+      // Other kinds of predicates are not pushable to a full-text index.
+      return false;
+  }
+
+  assert(func->argument_count() == 2);
+  assert(const_arg_idx == 0 || const_arg_idx == 1);
+
+  // Only pushable if we have a MATCH function greater-than(-or-equal) a
+  // constant value.
+  Item *const_arg = func->get_arg(const_arg_idx);
+  Item *match_arg = func->get_arg(1 - const_arg_idx);
+  if (!IsFullTextFunction(match_arg) || !const_arg->const_item()) {
+    return false;
+  }
 
-static ORDER *BuildSortAheadOrdering(THD *thd,
-                                     const LogicalOrderings *orderings,
-                                     Ordering ordering);
-
-FilterCost EstimateFilterCost(THD *thd, double num_rows, Item *condition,
-                              Query_block *outer_query_block) {
-  FilterCost cost{0.0, 0.0, 0.0};
-  cost.cost_if_not_materialized = num_rows * kApplyOneFilterCost;
-  cost.cost_if_materialized = num_rows * kApplyOneFilterCost;
-  WalkItem(condition, enum_walk::POSTFIX,
-           [thd, num_rows, outer_query_block, &cost](Item *item) {
-             if (!IsItemInSubSelect(item)) {
-               return false;
-             }
-             Item_in_subselect *item_subs =
-                 down_cast<Item_in_subselect *>(item);
-
-             // TODO(sgunders): Respect subquery hints, which can force the
-             // strategy to be materialize.
-             Query_block *query_block = item_subs->unit->first_query_block();
-             const bool materializeable =
-                 item_subs->subquery_allows_materialization(
-                     thd, query_block, outer_query_block) &&
-                 query_block->subquery_strategy(thd) ==
-                     Subquery_strategy::CANDIDATE_FOR_IN2EXISTS_OR_MAT;
-
-             AccessPath *path = item_subs->unit->root_access_path();
-             if (path == nullptr) {
-               // In rare situations involving IN subqueries on the left side of
-               // other IN subqueries, the query block may not be part of the
-               // parent query block's list of inner query blocks. If so, it has
-               // not been optimized here. Since this is a rare case, we'll just
-               // skip it and assign it zero cost.
-               return false;
-             }
-
-             cost.cost_if_not_materialized += num_rows * path->cost;
-             if (materializeable) {
-               // We can't ask the handler for costs at this stage, since that
-               // requires an actual TABLE, and we don't want to be creating
-               // them every time we're evaluating a cost. Thus, instead,
-               // we ask the cost model for an estimate. Longer-term, these two
-               // estimates should really be guaranteed to be the same somehow.
-               Cost_model_server::enum_tmptable_type tmp_table_type;
-               if (EstimateRowWidth(*query_block) * num_rows <
-                   thd->variables.max_heap_table_size) {
-                 tmp_table_type = Cost_model_server::MEMORY_TMPTABLE;
-               } else {
-                 tmp_table_type = Cost_model_server::DISK_TMPTABLE;
-               }
-               cost.cost_if_materialized +=
-                   thd->cost_model()->tmptable_readwrite_cost(
-                       tmp_table_type, /*write_rows=*/0,
-                       /*read_rows=*/num_rows);
-               cost.cost_to_materialize +=
-                   path->cost + kMaterializeOneRowCost * path->num_output_rows;
-             } else {
-               cost.cost_if_materialized += num_rows * path->cost;
-             }
-             return false;
-           });
-  return cost;
-}
-
-// Very rudimentary (assuming no deduplication; it's better to overestimate
-// than to understimate), so that we get something that isn't “unknown�.
-void EstimateMaterializeCost(AccessPath *path) {
-  AccessPath *table_path = path->materialize().table_path;
-
-  path->cost = 0;
-  path->num_output_rows = 0;
-  double cost_for_cacheable = 0.0;
-  for (const MaterializePathParameters::QueryBlock &block :
-       path->materialize().param->query_blocks) {
-    if (block.subquery_path->num_output_rows >= 0.0) {
-      path->num_output_rows += block.subquery_path->num_output_rows;
-      path->cost += block.subquery_path->cost;
-      if (block.join != nullptr && block.join->query_block->is_cacheable()) {
-        cost_for_cacheable += block.subquery_path->cost;
-      }
-    }
-  }
-  path->cost += kMaterializeOneRowCost * path->num_output_rows;
-
-  // Try to get usable estimates. Ignored by InnoDB, but used by
-  // TempTable.
-  if (table_path->type == AccessPath::TABLE_SCAN) {
-    TABLE *temp_table = table_path->table_scan().table;
-    temp_table->file->stats.records = path->num_output_rows;
-
-    table_path->num_output_rows = path->num_output_rows;
-    table_path->init_cost = table_path->init_once_cost = 0.0;
-    table_path->cost = temp_table->file->table_scan_cost().total_cost();
-  }
-
-  path->init_cost = path->cost + std::max(table_path->init_cost, 0.0);
-  path->init_once_cost = cost_for_cacheable;
-  path->cost = path->cost + std::max(table_path->cost, 0.0);
-}
-
-void EstimateAggregateCost(AccessPath *path) {
-  AccessPath *child = path->aggregate().child;
-
-  // TODO(sgunders): How do we estimate how many rows aggregation
-  // will be reducing the output by?
-  path->num_output_rows = child->num_output_rows;
-  path->init_cost = child->init_cost;
-  path->init_once_cost = child->init_once_cost;
-  path->cost = child->cost + kAggregateOneRowCost * child->num_output_rows;
-  path->num_output_rows_before_filter = path->num_output_rows;
-  path->cost_before_filter = path->cost;
-  path->ordering_state = child->ordering_state;
+  // Evaluate the constant.
+  const double value = const_arg->val_real();
+  if (const_arg->null_value) {
+    // MATCH <op> NULL cannot be pushed to a full-text index.
+    return false;
+  }
+
+  // Check if the constant is high enough to exclude MATCH = 0, which is the1
+  // requirement for being pushable to a full-text index.
+  if (is_greater_than_op) {
+    return value >= 0;
+  } else {
+    return value > 0;
+  }
+}
+
+// Finds all the WHERE predicates that can be satisfied by a full-text index
+// scan, and returns a bitmap of those predicates. See
+// IsSargableFullTextIndexPredicate() for a description of which predicates are
+// sargable.
+uint64_t FindSargableFullTextPredicates(const JoinHypergraph &graph) {
+  uint64_t fulltext_predicates = 0;
+  for (size_t i = 0; i < graph.num_where_predicates; ++i) {
+    const Predicate &predicate = graph.predicates[i];
+    if (IsSargableFullTextIndexPredicate(predicate.condition)) {
+      fulltext_predicates |= uint64_t{1} << i;
+
+      // If the predicate is a standalone MATCH function, flag it as such. This
+      // is used by Item_func_match::can_skip_ranking() to determine if ranking
+      // is needed. (We could also have set other operation hints here, like
+      // FT_OP_GT and FT_OP_GE. These hints are currently not used by any of the
+      // storage engines, so we don't set them for now.)
+      Item_func *predicate_func = down_cast<Item_func *>(predicate.condition);
+      if (predicate_func->functype() == Item_func::MATCH_FUNC) {
+        Item_func_match *parent =
+            down_cast<Item_func_match *>(predicate_func->get_arg(0))
+                ->get_master();
+        List<Item_func_match> *funcs =
+            parent->table_ref->query_block->ftfunc_list;
+        // We only set the hint if this is the only reference to the MATCH
+        // function. If it is used other places (for example in the SELECT list
+        // or in other predicates) we may still need ranking.
+        if (std::none_of(funcs->begin(), funcs->end(),
+                         [parent](const Item_func_match &match) {
+                           return match.master == parent;
+                         })) {
+          parent->set_hints_op(FT_OP_NO, 0.0);
+        }
+      }
+    }
+  }
+  return fulltext_predicates;
+}
+
+// Checks if any of the full-text indexes are covering for a table. If the query
+// only needs the document ID and the rank, there is no need to access table
+// rows. Index-only access can only be used if there is an FTS_DOC_ID column in
+// the table, and no other columns must be accessed. All covering full-text
+// indexes that are found, are added to TABLE::covering_keys.
+void EnableFullTextCoveringIndexes(const Query_block *query_block) {
+  for (Item_func_match &match : *query_block->ftfunc_list) {
+    TABLE *table = match.table_ref->table;
+    if (match.master == nullptr && match.key != NO_SUCH_KEY &&
+        table->fts_doc_id_field != nullptr &&
+        bitmap_is_set(table->read_set,
+                      table->fts_doc_id_field->field_index()) &&
+        bitmap_bits_set(table->read_set) == 1) {
+      table->covering_keys.set_bit(match.key);
+    }
+  }
+}
+
+// If we are planned using in2exists, and our SELECT list has a window
+// function, the HAVING condition may include parts that refer to window
+// functions. (This cannot happen in standard SQL, but we add such conditions
+// as part of in2exists processing.) Split them here.
+void SplitHavingCondition(THD *thd, Item *cond, Item **having_cond,
+                          Item **having_cond_wf) {
+  if (cond == nullptr || !cond->has_wf()) {
+    *having_cond = cond;
+    *having_cond_wf = nullptr;
+    return;
+  }
+
+  // If we have a IN-to-EXISTS with window functions and multiple columns,
+  // we cannot safely push even the ones that are not dependent on the
+  // window functions, as some of them would come before the window functions
+  // and change their input data incorrectly. So if so, we need to delay
+  // all of them.
+  const bool delay_all_in2exists = cond->has_wf();
+
+  Mem_root_array<Item *> cond_parts(thd->mem_root);
+  ExtractConditions(cond, &cond_parts);
+
+  List<Item> cond_parts_wf;
+  List<Item> cond_parts_normal;
+  for (Item *item : cond_parts) {
+    if (item->has_wf() ||
+        (delay_all_in2exists && item->created_by_in2exists())) {
+      cond_parts_wf.push_back(item);
+    } else {
+      cond_parts_normal.push_back(item);
+    }
+  }
+  *having_cond = CreateConjunction(&cond_parts_normal);
+  *having_cond_wf = CreateConjunction(&cond_parts_wf);
 }
 
+void ApplyHavingCondition(THD *thd, Item *having_cond, Query_block *query_block,
+                          const char *description_for_trace, string *trace,
+                          Prealloced_array<AccessPath *, 4> *root_candidates,
+                          CostingReceiver *receiver) {
+  if (having_cond == nullptr) {
+    return;
+  }
+
+  if (trace != nullptr) {
+    *trace += description_for_trace;
+  }
+
+  Prealloced_array<AccessPath *, 4> new_root_candidates(PSI_NOT_INSTRUMENTED);
+  for (AccessPath *root_path : *root_candidates) {
+    AccessPath filter_path;
+    filter_path.type = AccessPath::FILTER;
+    filter_path.filter().child = root_path;
+    filter_path.filter().condition = having_cond;
+    // We don't currently bother with materializing subqueries
+    // in HAVING, as they should be rare.
+    filter_path.filter().materialize_subqueries = false;
+    filter_path.num_output_rows = root_path->num_output_rows *
+                                  EstimateSelectivity(thd, having_cond, trace);
+    filter_path.init_cost = root_path->init_cost;
+    filter_path.init_once_cost = root_path->init_once_cost;
+    filter_path.cost =
+        root_path->cost + EstimateFilterCost(thd, root_path->num_output_rows,
+                                             having_cond, query_block)
+                              .cost_if_not_materialized;
+    filter_path.num_output_rows_before_filter = filter_path.num_output_rows;
+    filter_path.cost_before_filter = filter_path.cost;
+    receiver->ProposeAccessPath(&filter_path, &new_root_candidates,
+                                /*obsolete_orderings=*/0, "");
+  }
+  *root_candidates = std::move(new_root_candidates);
+}
+
+}  // namespace
+
 JoinHypergraph::Node *FindNodeWithTable(JoinHypergraph *graph, TABLE *table) {
   for (JoinHypergraph::Node &node : graph->nodes) {
     if (node.table == table) {
@@ -2472,14 +3101,14 @@
   }
 
   // If we have both ORDER BY and GROUP BY, we need a materialization step
-  // after the grouping -- although in most cases, we only need to
-  // materialize one row at a time (streaming), so the performance loss
-  // should be very slight. This is because when filesort only really deals
-  // with fields, not values; when it is to “output� a row, it puts back the
-  // contents of the sorted table's (or tables') row buffer(s). For
-  // expressions that only depend on the current row, such as (f1 + 1),
-  // this is fine, but aggregate functions (Item_sum) depend on multiple
-  // rows, so we need a field where filesort can put back its value
+  // after the grouping (if windowing hasn't already given us one) -- although
+  // in most cases, we only need to materialize one row at a time (streaming),
+  // so the performance loss should be very slight. This is because when
+  // filesort only really deals with fields, not values; when it is to “output�
+  // a row, it puts back the contents of the sorted table's (or tables')
+  // row buffer(s). For expressions that only depend on the current row, such as
+  // (f1 + 1), this is fine, but aggregate functions (Item_sum) depend on
+  // multiple rows, so we need a field where filesort can put back its value
   // (and of course, subsequent readers need to read from that field
   // instead of trying to evaluate the Item_sum). A temporary table provides
   // just that, so we create one based on the current field list;
@@ -2500,16 +3129,15 @@
   //
   // NOTE: If we elide the sort due to interesting orderings, this might
   // be redundant. It is fairly harmless, though.
-  if (query_block->is_explicitly_grouped() &&
-      (*join->sum_funcs != nullptr ||
-       join->rollup_state != JOIN::RollupState::NONE || need_rowid)) {
-    Temp_table_param *temp_table_param = nullptr;
-    TABLE *temp_table =
-        CreateTemporaryTableFromSelectList(thd, query_block, &temp_table_param);
+  if ((query_block->is_explicitly_grouped() &&
+       (*join->sum_funcs != nullptr ||
+        join->rollup_state != JOIN::RollupState::NONE || need_rowid)) &&
+      join->m_windows.is_empty()) {
     Prealloced_array<AccessPath *, 4> new_root_candidates(PSI_NOT_INSTRUMENTED);
     for (AccessPath *root_path : root_candidates) {
-      root_path = CreateMaterializationOrStreamingPath(
-          thd, join, root_path, temp_table, temp_table_param);
+      root_path =
+          CreateMaterializationOrStreamingPath(thd, join, root_path, need_rowid,
+                                               /*copy_items=*/true);
       receiver.ProposeAccessPath(root_path, &new_root_candidates,
                                  /*obsolete_orderings=*/0, "");
     }
@@ -2525,7 +3153,7 @@
     Prealloced_array<AccessPath *, 4> new_root_candidates(PSI_NOT_INSTRUMENTED);
     for (AccessPath *root_path : root_candidates) {
       Ordering grouping = orderings.ordering(distinct_ordering_idx);
-      if (!aggregation_is_unordered && grouping.empty()) {
+      if (grouping.empty()) {
         // Only const fields.
         AccessPath *limit_path = NewLimitOffsetAccessPath(
             thd, root_path, /*limit=*/1, /*offset=*/0, join->calc_found_rows,
@@ -2552,6 +3180,9 @@
                                    /*obsolete_orderings=*/0, "sort elided");
         continue;
       }
+
+      root_path = GetSafePathToSort(thd, join, root_path, need_rowid);
+
       // We need to sort. Try all sort-ahead, not just the one directly
       // derived from DISTINCT clause, because a broader one might help us
       // elide ORDER BY later.
@@ -2569,6 +3200,7 @@
         sort_path.sort().filesort = nullptr;
         sort_path.sort().remove_duplicates = true;
         sort_path.sort().unwrap_rollup = false;
+        sort_path.sort().use_limit = false;
 
         if (aggregation_is_unordered) {
           // Even though we create a sort node for the distinct operation,
@@ -2584,9 +3216,6 @@
             orderings.ordering(sort_ahead_ordering.ordering_idx));
         sort_path.sort().order = order_copy;
 
-        if (need_rowid) {
-          FindTablesToGetRowidFor(&sort_path);
-        }
         EstimateSortCost(&sort_path);
         receiver.ProposeAccessPath(&sort_path, &new_root_candidates,
                                    /*obsolete_orderings=*/0, "");
@@ -2603,13 +3232,31 @@
       *trace += "Applying sort for ORDER BY\n";
     }
 
+    // If we have LIMIT or OFFSET, we apply them here. This is done so that we
+    // can push the LIMIT clause down to the SORT node in order to let Filesort
+    // take advantage of it.
+    const Query_expression *query_expression = join->query_expression();
+    const ha_rows limit_rows = query_expression->select_limit_cnt;
+    const ha_rows offset_rows = query_expression->offset_limit_cnt;
+
     Prealloced_array<AccessPath *, 4> new_root_candidates(PSI_NOT_INSTRUMENTED);
     for (AccessPath *root_path : root_candidates) {
       if (orderings.DoesFollowOrder(root_path->ordering_state,
                                     order_by_ordering_idx)) {
+        if (limit_rows != HA_POS_ERROR || offset_rows != 0) {
+          root_path = NewLimitOffsetAccessPath(
+              thd, root_path, limit_rows, offset_rows, join->calc_found_rows,
+              /*reject_multiple_rows=*/false,
+              /*send_records_override=*/nullptr);
+        }
         receiver.ProposeAccessPath(root_path, &new_root_candidates,
                                    /*obsolete_orderings=*/0, "sort elided");
       } else {
+        const bool push_limit_to_filesort =
+            limit_rows != HA_POS_ERROR && !join->calc_found_rows;
+
+        root_path = GetSafePathToSort(thd, join, root_path, need_rowid);
+
         AccessPath *sort_path = new (thd->mem_root) AccessPath;
         sort_path->type = AccessPath::SORT;
         sort_path->count_examined_rows = false;
@@ -2617,9 +3264,21 @@
         sort_path->sort().filesort = nullptr;
         sort_path->sort().remove_duplicates = false;
         sort_path->sort().unwrap_rollup = false;
+        sort_path->sort().use_limit = push_limit_to_filesort;
         sort_path->sort().order = query_block->order_list.first;
-        EstimateSortCost(sort_path);
+        EstimateSortCost(sort_path,
+                         push_limit_to_filesort ? limit_rows : HA_POS_ERROR);
 
+        // If we have a LIMIT clause that is not pushed down to the filesort, or
+        // if we have an OFFSET clause, we need to add a LIMIT_OFFSET path on
+        // top of the SORT node.
+        if ((limit_rows != HA_POS_ERROR && !push_limit_to_filesort) ||
+            offset_rows != 0) {
+          sort_path = NewLimitOffsetAccessPath(
+              thd, sort_path, limit_rows, offset_rows, join->calc_found_rows,
+              /*reject_multiple_rows=*/false,
+              /*send_records_override=*/nullptr);
+        }
         receiver.ProposeAccessPath(sort_path, &new_root_candidates,
                                    /*obsolete_orderings=*/0, "");
       }
@@ -2629,6 +3288,360 @@
   return root_candidates;
 }
 
+static AccessPath *ApplyWindow(THD *thd, AccessPath *root_path, Window *window,
+                               JOIN *join, bool need_rowid_for_window) {
+  AccessPath *window_path =
+      NewWindowAccessPath(thd, root_path, /*temp_table_param=*/nullptr,
+                          /*ref_slice=*/-1, window->needs_buffering());
+  window_path->window().temp_table = nullptr;
+  window_path->window().window = window;
+  CopyBasicProperties(*root_path, window_path);
+  window_path->cost += kWindowOneRowCost * window_path->num_output_rows;
+
+  // NOTE: copy_items = false, because the window iterator does the copying
+  // itself.
+  return CreateMaterializationOrStreamingPath(thd, join, window_path,
+                                              need_rowid_for_window,
+                                              /*copy_items=*/false);
+}
+
+/**
+  Find the ordering that allows us to process the most unprocessed windows.
+  If specified, we can also demand that the ordering satisfies one or two
+  later orderings (for DISTINCT and/or ORDER BY).
+
+  Our priorities are, in strict order:
+
+    1. Satisfying both DISTINCT and ORDER BY (if both are given;
+       but see below).
+    2. Satisfying the first operation after windowing
+       (which is either DISTINCT or ORDER BY).
+    3. Satisfying as many windows as possible.
+    4. The shortest possible ordering (as a tie-breaker).
+
+  If first_ordering_idx is given, #2 is mandatory. #4 is so that we don't
+  get strange situations where the user specifies e.g. OVER (ORDER BY i)
+  and we choose an ordering i,j,k,l,... because it happened to be given
+  somewhere else.
+
+  Note that normally, it is very hard to satisfy DISTINCT for a window
+  function, because generally, it isn't constant for a given input
+  (by nature, it also depends on other rows). But it can happen if the
+  window frame is static; see main.window_functions_interesting_orders.
+
+  @param join                    Contains the list of windows.
+  @param orderings               Logical orderings in the query block.
+  @param sort_ahead_orderings    Candidate orderings to consider.
+  @param fd_set                  Active functional dependencies.
+  @param finished_windows        Windows to ignore.
+  @param tmp_buffer              Temporary space for keeping the best list
+                                 of windows so far; must be as large as
+                                 the number of values.
+  @param first_ordering_idx      The first ordering after the query block
+                                 that we need to satisfy (-1 if none).
+  @param second_ordering_idx     The second ordering after the query block
+                                 that we would like to satisfy (-1 if none).
+  @param [out] included_windows  Which windows can be sorted using the given
+                                 ordering.
+
+  @return An index into sort_ahead_orderings, or -1 if no ordering could
+    be found that sorts at least one window (plus, if first_ordering_idx
+    is set, follows that ordering).
+ */
+static int FindBestOrderingForWindow(
+    JOIN *join, const LogicalOrderings &orderings,
+    FunctionalDependencySet fd_set,
+    const Mem_root_array<SortAheadOrdering> &sort_ahead_orderings,
+    Bounds_checked_array<bool> finished_windows,
+    Bounds_checked_array<bool> tmp_buffer, int first_ordering_idx,
+    int second_ordering_idx, Bounds_checked_array<bool> included_windows) {
+  if (first_ordering_idx == -1) {
+    assert(second_ordering_idx == -1);
+  }
+
+  int best_ordering_idx = -1;
+  bool best_following_both_orders = false;
+  int best_num_matching_windows = 0;
+  for (size_t i = 0; i < sort_ahead_orderings.size(); ++i) {
+    const int ordering_idx = sort_ahead_orderings[i].ordering_idx;
+    LogicalOrderings::StateIndex ordering_state =
+        orderings.ApplyFDs(orderings.SetOrder(ordering_idx), fd_set);
+
+    bool following_both_orders = false;
+    if (first_ordering_idx != -1) {
+      if (!orderings.DoesFollowOrder(ordering_state, first_ordering_idx)) {
+        // Following one is mandatory.
+        continue;
+      }
+      if (second_ordering_idx != -1) {
+        if (orderings.DoesFollowOrder(ordering_state, second_ordering_idx)) {
+          following_both_orders = true;
+        } else if (best_following_both_orders) {
+          continue;
+        }
+      }
+    }
+
+    // If we are doing sortahead for DISTINCT/ORDER BY:
+    // Find windows that are referred to by DISTINCT/ORDER BY,
+    // and disallow them. E.g., if we have
+    //
+    //   SELECT FOO() OVER w1 AS a ... ORDER BY a,
+    //
+    // we cannot put w1 in the group of windows that are to be sorted
+    // together with ORDER BY.
+    for (Window &window : join->m_windows) {
+      window.m_mark = false;
+    }
+    Ordering ordering = orderings.ordering(ordering_idx);
+    bool any_wf = false;
+    for (OrderElement elem : ordering) {
+      WalkItem(orderings.item(elem.item), enum_walk::PREFIX,
+               [&any_wf](Item *item) {
+                 if (item->m_is_window_function) {
+                   down_cast<Item_sum *>(item)->window()->m_mark = true;
+                   any_wf = true;
+                 }
+                 return false;
+               });
+      if (first_ordering_idx == -1 && any_wf) {
+        break;
+      }
+    }
+
+    // If we are doing sorts _before_ DISTINCT/ORDER BY, simply disallow
+    // any sorts on window functions. There should be better options
+    // available for us.
+    if (first_ordering_idx == -1 && any_wf) {
+      continue;
+    }
+
+    // Now find out which windows can be processed under this order.
+    // We use tmp_buffer to hold which one we selected,
+    // and then copy it into included_windows if we are the best so far.
+    int num_matching_windows = 0;
+    for (size_t window_idx = 0; window_idx < join->m_windows.size();
+         ++window_idx) {
+      Window *window = join->m_windows[window_idx];
+      if (window->m_mark || finished_windows[window_idx] ||
+          !orderings.DoesFollowOrder(ordering_state, window->m_ordering_idx)) {
+        tmp_buffer[window_idx] = false;
+        continue;
+      }
+      tmp_buffer[window_idx] = true;
+      ++num_matching_windows;
+    }
+    if (num_matching_windows == 0) {
+      continue;
+    }
+
+    bool is_best;
+    if (best_ordering_idx == -1) {
+      is_best = true;
+    } else if (following_both_orders < best_following_both_orders) {
+      is_best = false;
+    } else if (following_both_orders > best_following_both_orders) {
+      is_best = true;
+    } else if (num_matching_windows < best_num_matching_windows) {
+      is_best = false;
+    } else if (num_matching_windows > best_num_matching_windows) {
+      is_best = true;
+    } else if (orderings.ordering(ordering_idx).size() <
+               orderings
+                   .ordering(
+                       sort_ahead_orderings[best_ordering_idx].ordering_idx)
+                   .size()) {
+      is_best = true;
+    } else {
+      is_best = false;
+    }
+    if (is_best) {
+      best_ordering_idx = i;
+      best_following_both_orders = following_both_orders;
+      best_num_matching_windows = num_matching_windows;
+      memcpy(included_windows.array(), tmp_buffer.array(),
+             sizeof(bool) * included_windows.size());
+    }
+  }
+  return best_ordering_idx;
+}
+
+/**
+  Apply window functions.
+
+  Ordering of window functions is a tricky topic. We can apply window functions
+  in any order that we'd like, but we would like to do as few sorts as possible.
+  In its most general form, this would entail solving an instance of the
+  traveling salesman problem (TSP), and although the number of windows is
+  typically small (one or two in most queries), this can blow up for large
+  numbers of windows.
+
+  Thankfully, window functions never add or remove rows. We also assume that all
+  sorts are equally expensive (which isn't really true, as ones on more columns
+  take more processing time and buffer, but it's close enough in practice),
+  and we also ignore the fact that as we compute more buffers, the temporary
+  tables and sort buffers will get more columns. These assumptions, combined
+  with some reasonable assumptions about ordering transitivity (if an ordering A
+  is more sorted than an ordering B, and B > C, then also A > C -- the only
+  thing that can disturb this is groupings, which we ignore for the sake of
+  simplicity), mean that we need to care _only_ about the number of sorts, and
+  can do them greedily. Thus, at any point, we pick the ordering that allows us
+  to process the largest number of windows, process them, remove them from
+  consideration, and repeat until there are none left.
+
+  There is one more ordering complication; after windowing, we may have DISTINCT
+  and/or ORDER BY, which may also benefit from groupings/orderings we leave
+  after the last window. Thus, first of all, we see if there's an ordering that
+  can satisfy them (ideally both if possible) _and_ at least one window; if so,
+  we save that ordering and those windows for last.
+
+  Temporary tables are set up in FinalizePlanForQueryBlock(). This is so that
+  it is easier to have multiple different orderings for the temporary table
+  parameters later.
+ */
+static Prealloced_array<AccessPath *, 4> ApplyWindowFunctions(
+    THD *thd, const CostingReceiver &receiver,
+    const LogicalOrderings &orderings, FunctionalDependencySet fd_set,
+    bool aggregation_is_unordered, int order_by_ordering_idx,
+    int distinct_ordering_idx, const JoinHypergraph &graph,
+    const Mem_root_array<SortAheadOrdering> &sort_ahead_orderings,
+    Query_block *query_block, int num_where_predicates, bool need_rowid,
+    Prealloced_array<AccessPath *, 4> root_candidates, string *trace) {
+  JOIN *join = query_block->join;
+
+  // Figure out if windows need row IDs or not; we won't create
+  // the temporary tables before later (since the optimal ordering
+  // of windows is cost-based), so this is a conservative check.
+  bool need_rowid_for_window = need_rowid;
+  if (!need_rowid) {
+    for (Item *item : *join->fields) {
+      if (item->m_is_window_function && item->is_blob_field()) {
+        need_rowid_for_window = true;
+        break;
+      }
+    }
+  }
+
+  // Windows we're done processing, or have reserved for the last block.
+  auto finished_windows =
+      Bounds_checked_array<bool>::Alloc(thd->mem_root, join->m_windows.size());
+
+  // Windows we've reserved for the last block (see function comment).
+  auto reserved_windows =
+      Bounds_checked_array<bool>::Alloc(thd->mem_root, join->m_windows.size());
+
+  // Temporary space for FindBestOrderingForWindow().
+  auto tmp =
+      Bounds_checked_array<bool>::Alloc(thd->mem_root, join->m_windows.size());
+
+  // Windows we're doing in this pass.
+  auto included_windows =
+      Bounds_checked_array<bool>::Alloc(thd->mem_root, join->m_windows.size());
+
+  if (trace) {
+    *trace += "\n";
+  }
+  Prealloced_array<AccessPath *, 4> new_root_candidates(PSI_NOT_INSTRUMENTED);
+  for (AccessPath *root_path : root_candidates) {
+    if (trace) {
+      *trace += "Considering window order on top of " +
+                PrintCost(*root_path, graph, "") + "\n";
+    }
+
+    // First, go through and check which windows we can do without
+    // any reordering, just based on the input ordering we get.
+    int num_windows_left = join->m_windows.size();
+    for (size_t window_idx = 0; window_idx < join->m_windows.size();
+         ++window_idx) {
+      Window *window = join->m_windows[window_idx];
+      if (window->m_ordering_idx == -1 || join->implicit_grouping ||
+          orderings.DoesFollowOrder(root_path->ordering_state,
+                                    window->m_ordering_idx)) {
+        if (trace) {
+          *trace += std::string(" - window ") + window->printable_name() +
+                    " does not need further sorting\n";
+        }
+        root_path =
+            ApplyWindow(thd, root_path, window, join, need_rowid_for_window);
+        finished_windows[window_idx] = true;
+        --num_windows_left;
+      } else {
+        finished_windows[window_idx] = false;
+      }
+    }
+
+    // Now, see if we can find an ordering that allows us to process
+    // at least one window _and_ an operation after the windowing
+    // (DISTINCT, ORDER BY). If so, that ordering will be our last.
+    int final_sort_ahead_ordering_idx = -1;
+    if ((!aggregation_is_unordered || distinct_ordering_idx == -1) &&
+        (distinct_ordering_idx != -1 || order_by_ordering_idx != -1)) {
+      int first_ordering_idx, second_ordering_idx;
+      if (distinct_ordering_idx == -1) {
+        first_ordering_idx = order_by_ordering_idx;
+        second_ordering_idx = -1;
+      } else {
+        first_ordering_idx = distinct_ordering_idx;
+        second_ordering_idx = order_by_ordering_idx;
+      }
+      final_sort_ahead_ordering_idx = FindBestOrderingForWindow(
+          join, orderings, fd_set, sort_ahead_orderings, finished_windows, tmp,
+          first_ordering_idx, second_ordering_idx, reserved_windows);
+      for (size_t window_idx = 0; window_idx < join->m_windows.size();
+           ++window_idx) {
+        finished_windows[window_idx] |= reserved_windows[window_idx];
+      }
+    }
+
+    // Now all the other orderings, eventually reaching all windows.
+    while (num_windows_left > 0) {
+      int sort_ahead_ordering_idx = FindBestOrderingForWindow(
+          join, orderings, fd_set, sort_ahead_orderings, finished_windows, tmp,
+          /*first_ordering_idx=*/-1,
+          /*second_ordering_idx=*/-1, included_windows);
+      Bounds_checked_array<bool> windows_this_iteration = included_windows;
+      if (sort_ahead_ordering_idx == -1) {
+        // None left, so take the one we've saved for last.
+        sort_ahead_ordering_idx = final_sort_ahead_ordering_idx;
+        windows_this_iteration = reserved_windows;
+        final_sort_ahead_ordering_idx = -1;
+      }
+      if (sort_ahead_ordering_idx == -1) {
+        // Should never happen.
+        assert(false);
+        break;
+      }
+
+      AccessPath sort_path = MakeSortPathWithoutFilesort(
+          thd, root_path, sort_ahead_orderings[sort_ahead_ordering_idx].order,
+          /*ordering_state=*/0, num_where_predicates);
+      sort_path.ordering_state = orderings.ApplyFDs(
+          orderings.SetOrder(
+              sort_ahead_orderings[sort_ahead_ordering_idx].ordering_idx),
+          fd_set);
+      root_path = new (thd->mem_root) AccessPath(sort_path);
+
+      for (size_t window_idx = 0; window_idx < join->m_windows.size();
+           ++window_idx) {
+        if (!windows_this_iteration[window_idx]) {
+          continue;
+        }
+        root_path = ApplyWindow(thd, root_path, join->m_windows[window_idx],
+                                join, need_rowid_for_window);
+        finished_windows[window_idx] = true;
+        --num_windows_left;
+      }
+    }
+
+    receiver.ProposeAccessPath(root_path, &new_root_candidates,
+                               /*obsolete_orderings=*/0, "");
+  }
+  if (trace) {
+    *trace += "\n";
+  }
+  return new_root_candidates;
+}
+
 /**
   Find out whether “item� is a sargable condition; if so, add it to:
 
@@ -2694,6 +3707,9 @@
       Predicate p;
       p.condition = eq_item;
       p.selectivity = EstimateSelectivity(thd, eq_item, trace);
+      p.used_nodes =
+          GetNodeMapFromTableMap(eq_item->used_tables() & ~PSEUDO_TABLE_BITS,
+                                 graph->table_num_to_node_num);
       p.total_eligibility_set =
           ~0;  // Should never be applied as a WHERE predicate.
       p.functional_dependencies_idx.init(thd->mem_root);
@@ -2706,699 +3722,34 @@
   }
 }
 
-/**
-  Helper for CollectFunctionalDependenciesFromPredicates(); also used for
-  non-equijoin predicates in CollectFunctionalDependenciesFromJoins().
- */
-static int AddFunctionalDependencyFromCondition(THD *thd, Item *condition,
-                                                bool always_active,
-                                                LogicalOrderings *orderings) {
-  if (condition->type() != Item::FUNC_ITEM) {
-    return -1;
-  }
-
-  // We treat IS NULL as item = const.
-  if (down_cast<Item_func *>(condition)->functype() == Item_func::ISNULL_FUNC) {
-    Item_func_isnull *isnull = down_cast<Item_func_isnull *>(condition);
-
-    FunctionalDependency fd;
-    fd.type = FunctionalDependency::FD;
-    fd.head = Bounds_checked_array<ItemHandle>();
-    fd.tail = orderings->GetHandle(isnull->arguments()[0]);
-    fd.always_active = always_active;
-
-    return orderings->AddFunctionalDependency(thd, fd);
-  }
-
-  if (down_cast<Item_func *>(condition)->functype() != Item_func::EQ_FUNC) {
-    // We only deal with equalities.
-    return -1;
-  }
-  Item_func_eq *eq = down_cast<Item_func_eq *>(condition);
-  Item *left = eq->arguments()[0];
-  Item *right = eq->arguments()[1];
-  if (left->const_for_execution()) {
-    if (right->const_for_execution()) {
-      // Ignore const = const.
-      return -1;
-    }
-    swap(left, right);
-  }
-  if (equality_determines_uniqueness(eq, left, right)) {
-    // item = const.
-    FunctionalDependency fd;
-    fd.type = FunctionalDependency::FD;
-    fd.head = Bounds_checked_array<ItemHandle>();
-    fd.tail = orderings->GetHandle(left);
-    fd.always_active = always_active;
-
-    return orderings->AddFunctionalDependency(thd, fd);
-  } else if (!equality_has_no_implicit_casts(eq, left, right)) {
-    // This is not a true equivalence; there is an implicit cast involved
-    // that is potentially information-losing, so ordering by one will not
-    // necessarily be the same as ordering by the other.
-    // TODO(sgunders): Revisit this when we have explicit casts for
-    // all comparisons, where we can generate potentially useful equivalences
-    // involving the casts.
-    return -1;
-  } else {
-    // item = item.
-    FunctionalDependency fd;
-    fd.type = FunctionalDependency::EQUIVALENCE;
-    ItemHandle head = orderings->GetHandle(left);
-    fd.head = Bounds_checked_array<ItemHandle>(&head, 1);
-    fd.tail = orderings->GetHandle(right);
-    fd.always_active = always_active;
-
-    // Takes a copy if needed, so the stack reference is safe.
-    return orderings->AddFunctionalDependency(thd, fd);
-  }
-}
-
-/**
-  Collect functional dependencies from joins. Currently, we apply
-  item = item only, and only on inner joins and semijoins. Outer joins do not
-  enforce their equivalences unconditionally (e.g. with an outer join on
-  t1.a = t2.b, t1.a = t2.b does not hold afterwards; t2.b could be NULL).
-  Semijoins do, and even though the attributes from the inner side are
-  inaccessible afterwards, there could still be interesting constant FDs
-  that are applicable to the outer side after equivalences.
-
-  It is possible to generate a weaker form of FDs for outer joins,
-  as described in sql/aggregate_check.h (and done for GROUP BY);
-  e.g. from the join condition t1.x=t2.x AND t1.y=t2.y, one can infer a
-  functional dependency {t1.x,t1.y} → t2.x and similar for t2.y.
-  However, do note the comment about FD propagation in the calling function.
- */
-static void CollectFunctionalDependenciesFromJoins(
-    THD *thd, JoinHypergraph *graph, LogicalOrderings *orderings) {
-  for (JoinPredicate &pred : graph->edges) {
-    const RelationalExpression *expr = pred.expr;
-    if (expr->type != RelationalExpression::INNER_JOIN &&
-        expr->type != RelationalExpression::STRAIGHT_INNER_JOIN &&
-        expr->type != RelationalExpression::SEMIJOIN) {
-      continue;
-    }
-    pred.functional_dependencies_idx.init(thd->mem_root);
-    pred.functional_dependencies_idx.reserve(expr->equijoin_conditions.size() +
-                                             expr->join_conditions.size());
-    for (Item_func_eq *join_condition : expr->equijoin_conditions) {
-      int fd_idx = AddFunctionalDependencyFromCondition(
-          thd, join_condition, /*always_active=*/false, orderings);
-      if (fd_idx != -1) {
-        pred.functional_dependencies_idx.push_back(fd_idx);
-      }
-    }
-    for (Item *join_condition : expr->join_conditions) {
-      int fd_idx = AddFunctionalDependencyFromCondition(
-          thd, join_condition, /*always_active=*/false, orderings);
-      if (fd_idx != -1) {
-        pred.functional_dependencies_idx.push_back(fd_idx);
-      }
-    }
+// Find sargable predicates, ie., those that we can push down into indexes.
+// See add_key_field().
+//
+// TODO(sgunders): Include x=y OR NULL predicates, <=> and IS NULL predicates,
+// and the special case of COLLATION accepted in add_key_field().
+//
+// TODO(sgunders): Integrate with the range optimizer, or find some other way
+// of accepting <, >, <= and >= predicates.
+void FindSargablePredicates(THD *thd, string *trace, JoinHypergraph *graph) {
+  if (trace != nullptr) {
+    *trace += "\n";
   }
-}
-
-/**
-  Collect functional dependencies from non-join predicates.
-  Again, we only do item = item, and more interesting; we only take the
-  raw items, where we could have been much more sophisticated.
-  Imagine a predicate like a = b + c; we will add a FD saying exactly
-  that (which may or may not be useful, if b + c shows up in ORDER BY),
-  but we should probably also have added {b,c} → a, if b and c could
-  be generated somehow.
-
-  However, we _do_ special-case item = const, since they are so useful;
-  they become {} → item instead.
- */
-static void CollectFunctionalDependenciesFromPredicates(
-    THD *thd, JoinHypergraph *graph, LogicalOrderings *orderings) {
-  for (Predicate &pred : graph->predicates) {
-    bool always_active =
-        !Overlaps(pred.total_eligibility_set, PSEUDO_TABLE_BITS) &&
-        IsSingleBitSet(pred.total_eligibility_set);
-    int fd_idx = AddFunctionalDependencyFromCondition(thd, pred.condition,
-                                                      always_active, orderings);
-    if (fd_idx != -1) {
-      pred.functional_dependencies_idx.push_back(fd_idx);
+  for (unsigned i = 0; i < graph->num_where_predicates; ++i) {
+    if (IsSingleBitSet(graph->predicates[i].total_eligibility_set)) {
+      PossiblyAddSargableCondition(thd, graph->predicates[i].condition,
+                                   /*force_table=*/nullptr, i,
+                                   /*is_join_condition=*/false, graph, trace);
     }
   }
-}
-
-static void CollectFunctionalDependenciesFromUniqueIndexes(
-    THD *thd, JoinHypergraph *graph, LogicalOrderings *orderings) {
-  // Collect functional dependencies from unique indexes.
   for (JoinHypergraph::Node &node : graph->nodes) {
-    TABLE *table = node.table;
-    for (unsigned key_idx = 0; key_idx < table->s->keys; ++key_idx) {
-      KEY *key = &table->key_info[key_idx];
-      if (!Overlaps(actual_key_flags(key), HA_NOSAME)) {
-        // Not a unique index.
-        continue;
-      }
-      if (Overlaps(actual_key_flags(key), HA_NULL_PART_KEY)) {
-        // Some part of the index could be NULL,
-        // with special semantics; so ignore it.
-        continue;
-      }
-
-      FunctionalDependency fd;
-      fd.type = FunctionalDependency::FD;
-      fd.head = Bounds_checked_array<ItemHandle>::Alloc(thd->mem_root,
-                                                        actual_key_parts(key));
-      for (unsigned keypart_idx = 0; keypart_idx < actual_key_parts(key);
-           ++keypart_idx) {
-        fd.head[keypart_idx] = orderings->GetHandle(
-            new Item_field(key->key_part[keypart_idx].field));
-      }
-      fd.always_active = true;
-
-      // Add a FD for each field in the table that is not part of the key.
-      for (unsigned field_idx = 0; field_idx < table->s->fields; ++field_idx) {
-        Field *field = table->field[field_idx];
-        bool in_key = false;
-        for (unsigned keypart_idx = 0; keypart_idx < actual_key_parts(key);
-             ++keypart_idx) {
-          if (field->eq(key->key_part[keypart_idx].field)) {
-            in_key = true;
-            break;
-          }
-        }
-        if (!in_key) {
-          fd.tail = orderings->GetHandle(new Item_field(field));
-          orderings->AddFunctionalDependency(thd, fd);
-        }
-      }
-    }
-  }
-}
-
-static Ordering CollectInterestingOrder(THD *thd, ORDER *order, int order_len,
-                                        bool unwrap_rollup,
-                                        LogicalOrderings *orderings,
-                                        table_map *used_tables) {
-  Ordering ordering = Ordering::Alloc(thd->mem_root, order_len);
-  int i = 0;
-  *used_tables = 0;
-  for (; order != nullptr; order = order->next, ++i) {
-    Item *item = *order->item;
-    if (unwrap_rollup) {
-      item = unwrap_rollup_group(item);
-    }
-    ordering[i].item = orderings->GetHandle(item);
-    ordering[i].direction = order->direction;
-    *used_tables |= item->used_tables();
-  }
-  return ordering;
-}
-
-// A convenience form of the above.
-static Ordering CollectInterestingOrder(THD *thd,
-                                        const SQL_I_List<ORDER> &order_list,
-                                        bool unwrap_rollup,
-                                        LogicalOrderings *orderings,
-                                        table_map *used_tables) {
-  return CollectInterestingOrder(thd, order_list.first, order_list.size(),
-                                 unwrap_rollup, orderings, used_tables);
-}
-
-// Build an ORDER * that we can give to Filesort. It is only suitable for
-// sort-ahead, since it assumes no temporary tables have been inserted.
-// Call ReplaceOrderItemsWithTempTableFields() on the ordering if you wish
-// to use it after the temporary table.
-static ORDER *BuildSortAheadOrdering(THD *thd,
-                                     const LogicalOrderings *orderings,
-                                     Ordering ordering) {
-  ORDER *order = nullptr;
-  ORDER *last_order = nullptr;
-  for (OrderElement element : ordering) {
-    ORDER *new_ptr = new (thd->mem_root) ORDER;
-    new_ptr->item_initial = orderings->item(element.item);
-    new_ptr->item = &new_ptr->item_initial;
-    new_ptr->direction = element.direction;
-
-    if (order == nullptr) {
-      order = new_ptr;
-    }
-    if (last_order != nullptr) {
-      last_order->next = new_ptr;
-    }
-    last_order = new_ptr;
-  }
-  return order;
-}
-
-static int AddOrdering(
-    THD *thd, const JoinHypergraph *graph, Ordering ordering,
-    ORDER *order_for_filesort, bool used_at_end, table_map homogenize_tables,
-    table_map used_tables, LogicalOrderings *orderings,
-    Mem_root_array<SortAheadOrdering> *sort_ahead_orderings) {
-  if (ordering.empty()) {
-    return 0;
-  }
-
-  const int ordering_idx = orderings->AddOrdering(
-      thd, ordering, /*interesting=*/true, used_at_end, homogenize_tables);
-
-  // See if we can use this for sort-ahead. (For groupings, LogicalOrderings
-  // will create its own sort-ahead orderings for us, so we shouldn't do it
-  // here.)
-  if (!Overlaps(used_tables, RAND_TABLE_BIT) && !IsGrouping(ordering)) {
-    NodeMap required_nodes = GetNodeMapFromTableMap(
-        used_tables & ~PSEUDO_TABLE_BITS, graph->table_num_to_node_num);
-    if (order_for_filesort == nullptr) {
-      order_for_filesort = BuildSortAheadOrdering(thd, orderings, ordering);
-    }
-    sort_ahead_orderings->push_back(
-        SortAheadOrdering{ordering_idx, required_nodes, order_for_filesort});
-  }
-
-  return ordering_idx;
-}
-
-static void CanonicalizeGrouping(Ordering *ordering) {
-  for (OrderElement &elem : *ordering) {
-    elem.direction = ORDER_NOT_RELEVANT;
-  }
-  std::sort(ordering->begin(), ordering->end(),
-            [](const OrderElement &a, const OrderElement &b) {
-              return a.item < b.item;
-            });
-  ordering->resize(std::unique(ordering->begin(), ordering->end()) -
-                   ordering->begin());
-}
-
-/**
-  Build all structures we need for keeping track of interesting orders.
-  We collect the actual relevant orderings (e.g. from ORDER BY) and any
-  functional dependencies we can find, then ask LogicalOrderings to create
-  its state machine. The result is said state machine, a list of potential
-  sort-ahead orderings, and a list of what indexes we can use to scan
-  each table (including what orderings they yield, if they are interesting).
- */
-static void BuildInterestingOrders(
-    THD *thd, JoinHypergraph *graph, Query_block *query_block,
-    LogicalOrderings *orderings,
-    Mem_root_array<SortAheadOrdering> *sort_ahead_orderings,
-    int *order_by_ordering_idx, int *group_by_ordering_idx,
-    int *distinct_ordering_idx, Mem_root_array<ActiveIndexInfo> *active_indexes,
-    string *trace) {
-  // Collect ordering from ORDER BY.
-  if (query_block->is_ordered()) {
-    table_map used_tables;
-    Ordering ordering = CollectInterestingOrder(thd, query_block->order_list,
-                                                /*unwrap_rollup=*/false,
-                                                orderings, &used_tables);
-    *order_by_ordering_idx =
-        AddOrdering(thd, graph, ordering,
-                    /*order_for_filesort=*/nullptr,
-                    /*used_at_end=*/true, /*homogenize_tables=*/0, used_tables,
-                    orderings, sort_ahead_orderings);
-  }
-
-  // Collect grouping from GROUP BY.
-  if (query_block->is_explicitly_grouped()) {
-    table_map used_tables;
-    Ordering ordering = CollectInterestingOrder(thd, query_block->group_list,
-                                                /*unwrap_rollup=*/true,
-                                                orderings, &used_tables);
-    CanonicalizeGrouping(&ordering);
-
-    *group_by_ordering_idx =
-        AddOrdering(thd, graph, ordering, query_block->group_list.first,
-                    /*used_at_end=*/true, /*homogenize_tables=*/0, used_tables,
-                    orderings, sort_ahead_orderings);
-  }
-
-  // Collect grouping from DISTINCT.
-  //
-  // Note that we don't give in the ORDER BY ordering here, and thus also don't
-  // care about all_order_by_fields_used (which says whether the DISTINCT
-  // ordering was able to also satisfy the ORDER BY); group coverings will be
-  // dealt with by the more general intesting order framework, which can also
-  // combine e.g. GROUP BY groupings with ORDER BY.
-  if (query_block->join->select_distinct) {
-    bool all_order_fields_used = false;
-    ORDER *order = create_order_from_distinct(
-        thd, Ref_item_array(), /*order=*/nullptr, query_block->join->fields,
-        /*skip_aggregates=*/false, /*convert_bit_fields_to_long=*/false,
-        &all_order_fields_used);
-
-    int order_len = 0;
-    for (ORDER *ptr = order; ptr != nullptr; ptr = ptr->next) {
-      ++order_len;
-    }
-
-    table_map used_tables;
-    Ordering ordering = CollectInterestingOrder(thd, order, order_len,
-                                                /*unwrap_rollup=*/false,
-                                                orderings, &used_tables);
-
-    CanonicalizeGrouping(&ordering);
-    *distinct_ordering_idx =
-        AddOrdering(thd, graph, ordering,
-                    /*order_for_filesort=*/order,
-                    /*used_at_end=*/true, /*homogenize_tables=*/0, used_tables,
-                    orderings, sort_ahead_orderings);
-  }
-
-  // Collect groupings from semijoins (because we might want to do duplicate
-  // removal on the inner side, which will allow us to convert the join to an
-  // inner join and invert it).
-  for (JoinPredicate &pred : graph->edges) {
-    if (pred.expr->type != RelationalExpression::SEMIJOIN) {
-      continue;
-    }
-    if (!pred.expr->join_conditions.empty()) {
-      // Most semijoins (e.g. from IN) are pure equijoins, but due to
-      // outer references, there may also be non-equijoin conditions
-      // involved. If so, we can no longer rewrite to a regular inner
-      // join (at least not in the general case), so skip these.
-      continue;
-    }
-    const table_map inner_tables = pred.expr->right->tables_in_subtree;
-    Ordering ordering =
-        Ordering::Alloc(thd->mem_root, pred.expr->equijoin_conditions.size());
-    table_map used_tables = 0;
-    for (size_t i = 0; i < pred.expr->equijoin_conditions.size(); ++i) {
-      Item *item = pred.expr->equijoin_conditions[i]->get_arg(1);
-      if (!IsSubset(item->used_tables() & ~PSEUDO_TABLE_BITS, inner_tables)) {
-        item = pred.expr->equijoin_conditions[i]->get_arg(0);
-        assert(
-            IsSubset(item->used_tables() & ~PSEUDO_TABLE_BITS, inner_tables));
-      }
-      ordering[i].item = orderings->GetHandle(item);
-      used_tables |= item->used_tables();
-    }
-    CanonicalizeGrouping(&ordering);
-
-    pred.ordering_idx_needed_for_semijoin_rewrite =
-        AddOrdering(thd, graph, ordering, /*order_for_filesort=*/nullptr,
-                    /*used_at_end=*/false, /*homogenize_tables=*/inner_tables,
-                    used_tables, orderings, sort_ahead_orderings);
-  }
-
-  // Collect list of all active indexes. We will be needing this for ref access
-  // even if we don't have any interesting orders.
-  for (unsigned node_idx = 0; node_idx < graph->nodes.size(); ++node_idx) {
-    TABLE *table = graph->nodes[node_idx].table;
-    for (unsigned key_idx = 0; key_idx < table->s->keys; ++key_idx) {
-      // NOTE: visible_index claims to contain “visible and enabled� indexes,
-      // but we still need to check keys_in_use to ignore disabled indexes.
-      if (!table->keys_in_use_for_query.is_set(key_idx)) {
-        continue;
-      }
-      ActiveIndexInfo index_info;
-      index_info.table = table;
-      index_info.key_idx = key_idx;
-      active_indexes->push_back(index_info);
-    }
-  }
-
-  // Early exit if we don't have any interesting orderings.
-  if (orderings->num_orderings() <= 1) {
-    if (trace != nullptr) {
-      *trace +=
-          "\nNo interesting orders found. Not collecting functional "
-          "dependencies.\n\n";
-    }
-    orderings->Build(thd, trace);
-    return;
-  }
-
-  // Collect orderings from indexes. Note that these are not interesting
-  // in themselves, so they will be rapidly pruned away if they cannot lead
-  // to an interesting order.
-  for (ActiveIndexInfo &index_info : *active_indexes) {
-    TABLE *table = index_info.table;
-    KEY *key = &table->key_info[index_info.key_idx];
-
-    // Find out how many usable keyparts there are. We have to stop
-    // at the first that is partial (if any), or if the index is
-    // nonorderable (e.g. a hash index), which we can seemingly only
-    // query by keypart.
-    int sortable_key_parts = 0;
-    for (unsigned keypart_idx = 0; keypart_idx < actual_key_parts(key);
-         ++keypart_idx, ++sortable_key_parts) {
-      if (Overlaps(key->key_part[keypart_idx].key_part_flag, HA_PART_KEY_SEG) ||
-          !Overlaps(
-              table->file->index_flags(index_info.key_idx, keypart_idx, true),
-              HA_READ_ORDER)) {
-        break;
-      }
-    }
-
-    // First add the forward order.
-    Ordering ordering = Ordering::Alloc(thd->mem_root, sortable_key_parts);
-    for (int keypart_idx = 0; keypart_idx < sortable_key_parts; ++keypart_idx) {
-      const KEY_PART_INFO &key_part = key->key_part[keypart_idx];
-      ordering[keypart_idx].item =
-          orderings->GetHandle(new Item_field(key_part.field));
-      ordering[keypart_idx].direction =
-          Overlaps(key_part.key_part_flag, HA_REVERSE_SORT) ? ORDER_DESC
-                                                            : ORDER_ASC;
-    }
-    index_info.forward_order =
-        orderings->AddOrdering(thd, ordering, /*interesting=*/false,
-                               /*used_at_end=*/true, /*homogenize_tables=*/0);
-
-    // And now the reverse, if the index allows it.
-    if (Overlaps(table->file->index_flags(index_info.key_idx,
-                                          sortable_key_parts - 1, true),
-                 HA_READ_PREV)) {
-      for (int keypart_idx = 0; keypart_idx < sortable_key_parts;
-           ++keypart_idx) {
-        if (ordering[keypart_idx].direction == ORDER_ASC) {
-          ordering[keypart_idx].direction = ORDER_DESC;
-        } else {
-          ordering[keypart_idx].direction = ORDER_ASC;
-        }
-      }
-      index_info.reverse_order =
-          orderings->AddOrdering(thd, ordering, /*interesting=*/false,
-                                 /*used_at_end=*/true, /*homogenize_tables=*/0);
-    }
-  }
-
-  // Collect functional dependencies. Currently, there are many kinds
-  // we don't do; see sql/aggregate_check.h. In particular, we don't
-  // collect FDs from:
-  //
-  //  - Deterministic functions ({x} → f(x) for relevant items f(x)).
-  //  - Unique indexes that are nullable, but that are made non-nullable
-  //    by WHERE predicates.
-  //  - Generated columns. [*]
-  //  - Join conditions from outer joins. [*]
-  //  - Non-merged derived tables (including views and CTEs). [*]
-  //
-  // Note that the points marked with [*] introduce special problems related
-  // to propagation of FDs; aggregate_check.h contains more details around
-  // so-called “NULL-friendly functional dependencies�. If we include any
-  // of them, we need to take more care about propagating them through joins.
-  //
-  // We liberally insert FDs here, even if they are not obviously related
-  // to interesting orders; they may be useful at a later stage, when
-  // other FDs can use them as a stepping stone. Optimization in Build()
-  // will remove them if they are indeed not useful.
-  CollectFunctionalDependenciesFromJoins(thd, graph, orderings);
-  CollectFunctionalDependenciesFromPredicates(thd, graph, orderings);
-  CollectFunctionalDependenciesFromUniqueIndexes(thd, graph, orderings);
-
-  orderings->Build(thd, trace);
-
-  if (*order_by_ordering_idx != -1) {
-    *order_by_ordering_idx =
-        orderings->RemapOrderingIndex(*order_by_ordering_idx);
-  }
-  if (*group_by_ordering_idx != -1) {
-    *group_by_ordering_idx =
-        orderings->RemapOrderingIndex(*group_by_ordering_idx);
-  }
-  if (*distinct_ordering_idx != -1) {
-    *distinct_ordering_idx =
-        orderings->RemapOrderingIndex(*distinct_ordering_idx);
-  }
-
-  for (JoinPredicate &pred : graph->edges) {
-    for (int fd_idx : pred.functional_dependencies_idx) {
-      pred.functional_dependencies |= orderings->GetFDSet(fd_idx);
-    }
-  }
-  for (Predicate &pred : graph->predicates) {
-    for (int fd_idx : pred.functional_dependencies_idx) {
-      pred.functional_dependencies |= orderings->GetFDSet(fd_idx);
-    }
-  }
-
-  // Get the updated ordering indexes, since Build() may have moved them around.
-  for (SortAheadOrdering &ordering : *sort_ahead_orderings) {
-    ordering.ordering_idx =
-        orderings->RemapOrderingIndex(ordering.ordering_idx);
-  }
-
-  for (JoinPredicate &pred : graph->edges) {
-    if (pred.ordering_idx_needed_for_semijoin_rewrite != -1) {
-      pred.ordering_idx_needed_for_semijoin_rewrite =
-          orderings->RemapOrderingIndex(
-              pred.ordering_idx_needed_for_semijoin_rewrite);
-
-      // Set up the elements to deduplicate against. Note that we don't do this
-      // before after Build(), because Build() may have simplified away some
-      // (or all) elements using functional dependencies.
-      Ordering grouping =
-          orderings->ordering(pred.ordering_idx_needed_for_semijoin_rewrite);
-      pred.semijoin_group_size = grouping.size();
-      if (!grouping.empty()) {
-        pred.semijoin_group =
-            thd->mem_root->ArrayAlloc<Item *>(grouping.size());
-        for (size_t i = 0; i < grouping.size(); ++i) {
-          pred.semijoin_group[i] = orderings->item(grouping[i].item);
-        }
-      }
-    }
-  }
-
-  // After Build(), there may be more interesting orders that we can try
-  // as sort-ahead; in particular homogenized orderings. (The ones we already
-  // added will not have moved around, as per the contract.) Scan for them,
-  // create orders that filesort can use, and add them to the list.
-  for (int ordering_idx = sort_ahead_orderings->size();
-       ordering_idx < orderings->num_orderings(); ++ordering_idx) {
-    if (!orderings->ordering_is_relevant_for_sortahead(ordering_idx)) {
-      continue;
-    }
-
-    table_map used_tables = 0;
-    for (OrderElement element : orderings->ordering(ordering_idx)) {
-      used_tables |= orderings->item(element.item)->used_tables();
-    }
-    NodeMap required_nodes = GetNodeMapFromTableMap(
-        used_tables & ~PSEUDO_TABLE_BITS, graph->table_num_to_node_num);
-
-    ORDER *order = BuildSortAheadOrdering(thd, orderings,
-                                          orderings->ordering(ordering_idx));
-    sort_ahead_orderings->push_back(
-        SortAheadOrdering{ordering_idx, required_nodes, order});
-  }
-}
-
-// If the AccessPath is a materialization (MATERIALIZE or STREAM)
-// within the same query block, returns its temporary table parameters.
-// If not, return nullptr.
-Temp_table_param *GetMaterialization(AccessPath *path) {
-  if (path->type == AccessPath::STREAM) {
-    if (path->stream().table->pos_in_table_list != nullptr) {
-      // Materializes a different query block.
-      return nullptr;
-    }
-    return path->stream().temp_table_param;
-  }
-  if (path->type == AccessPath::MATERIALIZE) {
-    const MaterializePathParameters *param = path->materialize().param;
-    if (param->table->pos_in_table_list != nullptr) {
-      // Materializes a different query block.
-      return nullptr;
+    for (Item *cond : node.join_conditions_pushable_to_this) {
+      const auto it = graph->sargable_join_predicates.find(cond);
+      int predicate_index =
+          (it == graph->sargable_join_predicates.end()) ? -1 : it->second;
+      PossiblyAddSargableCondition(thd, cond, node.table, predicate_index,
+                                   /*is_join_condition=*/true, graph, trace);
     }
-    assert(param->query_blocks.size() == 1);
-    return param->query_blocks[0].temp_table_param;
   }
-  return nullptr;
-}
-
-/*
-  Do the final touchups of the access path tree, once we have selected a final
-  plan (ie., there are no more alternatives). There are currently two major
-  tasks to do here: Account for materializations (because we cannot do it until
-  we have the entire plan), and set up filesorts (because it involves
-  constructing new objects, so we don't want to do it for unused candidates).
-  The former also influences the latter.
-
-  Materializations in particular are a bit tricky due to the way our item system
-  works; expression evaluation cares intimately about _where_ values come from,
-  not just what they are (i.e., all non-leaf Items carry references to other
-  Items, and pull data only from there). Thus, whenever an Item is materialized,
-  references to that Item need to be modified to instead point into the correct
-  field in the temporary table. We traverse the tree bottom-up and keep track of
-  which materializations are active, and modify the appropriate Item lists at
-  any given point, so that they point to the right place. We currently modify:
-
-    - The SELECT list. (There is only one, so we can update it as we go.)
-    - Referenced fields for INSERT ... ON DUPLICATE KEY UPDATE (IODKU);
-      also updated as we go.
-    - Sort keys (e.g. for ORDER BY).
-
-  Surprisingly enough, we also need to update the materialization parameters
-  themselves. Say that we first have a materialization that copies
-  t1.x -> <temp1>.x. After that, we have a materialization that copies
-  t1.x -> <temp2>.x. For this to work properly, we obviously need to go in
-  and modify the second one so that it instead says <temp1>.x -> <temp2>.x,
-  ie., the copy is done from the correct source.
-
-  You cannot yet insert temporary tables in arbitrary places in the query;
-  in particular, we do not yet handle these rewrites (although they would
-  very likely be possible):
-
-    - Group elements for aggregations (GROUP BY). Do note that
-      create_tmp_table() will replace elements within aggregate functions
-      if you set save_sum_funcs=false; you may also want to supplant
-      this mechanism.
-    - Filters (e.g. WHERE predicates); do note that partial pushdown may
-      present its own challenges.
-    - Join conditions.
- */
-void FinalizePlanForQueryBlock(THD *thd, Query_block *query_block,
-                               AccessPath *root_path) {
-  Mem_root_array<Temp_table_param *> applied_temp_tables(thd->mem_root);
-  WalkAccessPaths(
-      root_path, query_block->join, WalkAccessPathPolicy::ENTIRE_QUERY_BLOCK,
-      [thd, query_block, &applied_temp_tables](AccessPath *path,
-                                               const JOIN *join) {
-        Temp_table_param *temp_table_param = GetMaterialization(path);
-        if (temp_table_param != nullptr) {
-          // Update source references in this materialization.
-          for (Temp_table_param *earlier_temp_table_param :
-               applied_temp_tables) {
-            for (Func_ptr &func : *temp_table_param->items_to_copy) {
-              func.set_func(FindOrModifyReplacementItem(
-                  thd, func.func(), earlier_temp_table_param));
-            }
-          }
-          applied_temp_tables.push_back(temp_table_param);
-
-          // Update SELECT list and IODKU references.
-          const mem_root_deque<Item *> *original_fields = join->fields;
-          ReplaceSelectListWithTempTableFields(thd, const_cast<JOIN *>(join),
-                                               temp_table_param);
-          if (thd->lex->sql_command == SQLCOM_INSERT_SELECT) {
-            ReplaceUpdateValuesWithTempTableFields(
-                down_cast<Sql_cmd_insert_select *>(thd->lex->m_sql_cmd),
-                query_block, *original_fields, *join->fields);
-          }
-        } else if (path->type == AccessPath::SORT) {
-          assert(path->sort().filesort == nullptr);
-          for (Temp_table_param *earlier_temp_table_param :
-               applied_temp_tables) {
-            ReplaceOrderItemsWithTempTableFields(thd, path->sort().order,
-                                                 earlier_temp_table_param);
-          }
-
-          // Set up a Filesort object for this sort.
-          Mem_root_array<TABLE *> tables = CollectTables(thd, path);
-          path->sort().filesort = new (thd->mem_root) Filesort(
-              thd, std::move(tables),
-              /*keep_buffers=*/false, path->sort().order,
-              /*limit_arg=*/HA_POS_ERROR,
-              /*force_stable_sort=*/false, path->sort().remove_duplicates,
-              /*force_sort_positions=*/false, path->sort().unwrap_rollup);
-          query_block->join->filesorts_to_cleanup.push_back(
-              path->sort().filesort);
-          if (!path->sort().filesort->using_addon_fields()) {
-            FindTablesToGetRowidFor(path);
-          }
-        }
-        return false;
-      },
-      /*post_order_traversal=*/true);
 }
 
 /**
@@ -3411,7 +3762,7 @@
     3. GROUP BY (it is sometimes possible to push this down into #1,
        but we don't have the functionality to do so).
     4. HAVING.
-    5. Window functions (not supported yet).
+    5. Window functions.
     6. DISTINCT.
     7. ORDER BY.
     8. LIMIT.
@@ -3431,7 +3782,12 @@
 AccessPath *FindBestQueryPlan(THD *thd, Query_block *query_block,
                               string *trace) {
   JOIN *join = query_block->join;
-  if (CheckSupportedQuery(thd, join)) return nullptr;
+  if (CheckSupportedQuery(thd)) return nullptr;
+
+  // The hypergraph optimizer does not do const tables,
+  // nor does it evaluate subqueries during optimization.
+  query_block->add_active_options(OPTION_NO_CONST_TABLES |
+                                  OPTION_NO_SUBQUERY_DURING_OPTIMIZATION);
 
   // In the case of rollup (only): After the base slice list was made, we may
   // have modified the field list to add rollup group items and sum switchers.
@@ -3458,69 +3814,62 @@
   if (MakeJoinHypergraph(thd, trace, &graph)) {
     return nullptr;
   }
-
-  // Find sargable predicates, ie., those that we can push down into indexes.
-  // See add_key_field().
-  //
-  // TODO(sgunders): Include x=y OR NULL predicates, <=> and IS NULL predicates,
-  // and the special case of COLLATION accepted in add_key_field().
-  //
-  // TODO(sgunders): Integrate with the range optimizer, or find some other way
-  // of accepting <, >, <= and >= predicates.
-  if (trace != nullptr) {
-    *trace += "\n";
-  }
-  for (unsigned i = 0; i < graph.num_where_predicates; ++i) {
-    if (IsSingleBitSet(graph.predicates[i].total_eligibility_set)) {
-      PossiblyAddSargableCondition(thd, graph.predicates[i].condition,
-                                   /*force_table=*/nullptr, i,
-                                   /*is_join_condition=*/false, &graph, trace);
-    }
-  }
-  for (JoinHypergraph::Node &node : graph.nodes) {
-    for (Item *cond : node.join_conditions_pushable_to_this) {
-      const auto it = graph.sargable_join_predicates.find(cond);
-      int predicate_index =
-          (it == graph.sargable_join_predicates.end()) ? -1 : it->second;
-      PossiblyAddSargableCondition(thd, cond, node.table, predicate_index,
-                                   /*is_join_condition=*/true, &graph, trace);
-    }
-  }
+  FindSargablePredicates(thd, trace, &graph);
 
   // Figure out if any later sort will need row IDs.
   bool need_rowid = false;
   if (query_block->is_explicitly_grouped() || query_block->is_ordered() ||
-      join->select_distinct) {
-    for (TABLE_LIST *tl = query_block->leaf_tables; tl != nullptr;
-         tl = tl->next_leaf) {
-      if (SortWillBeOnRowId(tl->table)) {
+      join->select_distinct || !join->m_windows.is_empty()) {
+    // NOTE: This is distinct from SortWillBeOnRowId(), as it also checks blob
+    // fields arising from blob-generating functions on non-blob fields.
+    for (Item *item : *join->fields) {
+      if (item->is_blob_field()) {
         need_rowid = true;
         break;
       }
     }
+    for (TABLE_LIST *tl = query_block->leaf_tables;
+         tl != nullptr && !need_rowid; tl = tl->next_leaf) {
+      if (SortWillBeOnRowId(tl->table)) {
+        need_rowid = true;
+      }
+    }
   }
 
   // Find out which predicates contain subqueries.
-  graph.materializable_predicates = 0;
+  MutableOverflowBitset materializable_predicates{thd->mem_root,
+                                                  graph.predicates.size()};
   for (unsigned i = 0; i < graph.predicates.size(); ++i) {
     if (ContainsSubqueries(graph.predicates[i].condition)) {
-      graph.materializable_predicates |= uint64_t{1} << i;
+      materializable_predicates.SetBit(i);
     }
   }
+  graph.materializable_predicates = std::move(materializable_predicates);
+
+  NodeMap fulltext_tables = 0;
+  uint64_t sargable_fulltext_predicates = 0;
+  if (query_block->has_ft_funcs()) {
+    fulltext_tables = FindFullTextSearchedTables(graph);
 
-  // Collect interesting orders from ORDER BY, GROUP BY and semijoins.
+    // Check if we have full-text indexes that can be used.
+    sargable_fulltext_predicates = FindSargableFullTextPredicates(graph);
+    EnableFullTextCoveringIndexes(query_block);
+  }
+
+  // Collect interesting orders from ORDER BY, GROUP BY, semijoins and windows.
   // See BuildInterestingOrders() for more detailed information.
   SecondaryEngineFlags engine_flags = EngineFlags(thd);
   LogicalOrderings orderings(thd);
   Mem_root_array<SortAheadOrdering> sort_ahead_orderings(thd->mem_root);
   Mem_root_array<ActiveIndexInfo> active_indexes(thd->mem_root);
+  Mem_root_array<FullTextIndexInfo> fulltext_searches(thd->mem_root);
   int order_by_ordering_idx = -1;
   int group_by_ordering_idx = -1;
   int distinct_ordering_idx = -1;
   BuildInterestingOrders(thd, &graph, query_block, &orderings,
                          &sort_ahead_orderings, &order_by_ordering_idx,
                          &group_by_ordering_idx, &distinct_ordering_idx,
-                         &active_indexes, trace);
+                         &active_indexes, &fulltext_searches, trace);
 
   // Run the actual join optimizer algorithm. This creates an access path
   // for the join as a whole (with lowest possible cost, and thus also
@@ -3534,7 +3883,9 @@
   const secondary_engine_modify_access_path_cost_t secondary_engine_cost_hook =
       SecondaryEngineCostHook(thd);
   CostingReceiver receiver(thd, query_block, graph, &orderings,
-                           &sort_ahead_orderings, &active_indexes, need_rowid,
+                           &sort_ahead_orderings, &active_indexes,
+                           &fulltext_searches, fulltext_tables,
+                           sargable_fulltext_predicates, need_rowid,
                            EngineFlags(thd), secondary_engine_cost_hook, trace);
   if (EnumerateAllConnectedPartitions(graph.graph, &receiver) &&
       !thd->is_error()) {
@@ -3596,6 +3947,9 @@
         AccessPath path = *root_path;
         double init_once_cost = 0.0;
 
+        MutableOverflowBitset filter_predicates =
+            path.filter_predicates.Clone(thd->mem_root);
+
         // Apply any predicates that don't belong to any
         // specific table, or which are nondeterministic.
         for (size_t i = 0; i < graph.num_where_predicates; ++i) {
@@ -3603,7 +3957,7 @@
                         TablesBetween(0, graph.nodes.size())) ||
               Overlaps(graph.predicates[i].total_eligibility_set,
                        RAND_TABLE_BIT)) {
-            path.filter_predicates |= uint64_t{1} << i;
+            filter_predicates.SetBit(i);
             FilterCost cost =
                 EstimateFilterCost(thd, root_path->num_output_rows,
                                    graph.predicates[i].condition, query_block);
@@ -3618,6 +3972,7 @@
         }
         path.ordering_state = orderings.ApplyFDs(path.ordering_state, fd_set);
 
+        path.filter_predicates = std::move(filter_predicates);
         const bool contains_subqueries =
             Overlaps(path.filter_predicates, graph.materializable_predicates);
 
@@ -3663,6 +4018,25 @@
       *trace += "Applying aggregation for GROUP BY\n";
     }
 
+    // Create a temporary table for materializing the results of full-text
+    // functions, if needed.
+    //
+    // The full-text MATCH function requires the handler to be positioned on the
+    // row that holds the value to perform the full-text search on. It is not
+    // enough to have all the required column values in the record buffer. Since
+    // sort-based aggregation has moved off the original row when a group is
+    // returned, we add a temporary table which materializes the results of any
+    // calls to MATCH that will be needed after aggregation, and stream the rows
+    // through this table before aggregation.
+    TABLE *fulltext_table = nullptr;
+    Temp_table_param *fulltext_param = nullptr;
+    if (query_block->has_ft_funcs()) {
+      if (CreateTemporaryTableForFullTextFunctions(
+              thd, query_block, &fulltext_table, &fulltext_param)) {
+        return nullptr;
+      }
+    }
+
     Prealloced_array<AccessPath *, 4> new_root_candidates(PSI_NOT_INSTRUMENTED);
     for (AccessPath *root_path : root_candidates) {
       const bool rollup = (join->rollup_state != JOIN::RollupState::NONE);
@@ -3670,10 +4044,21 @@
           query_block->is_explicitly_grouped() && !aggregation_is_unordered &&
           !orderings.DoesFollowOrder(root_path->ordering_state,
                                      group_by_ordering_idx);
+
       if (!group_needs_sort) {
+        AccessPath *child_path = root_path;
+        if (fulltext_table != nullptr) {
+          // Add a streaming path for materializing results from full-text
+          // functions before aggregation.
+          child_path =
+              NewStreamingAccessPath(thd, root_path, join, fulltext_param,
+                                     fulltext_table, /*ref_slice=*/-1);
+          CopyBasicProperties(*root_path, child_path);
+        }
+
         // TODO(sgunders): We don't need to allocate this on the MEM_ROOT.
         AccessPath *aggregate_path =
-            NewAggregateAccessPath(thd, root_path, rollup);
+            NewAggregateAccessPath(thd, child_path, rollup);
         EstimateAggregateCost(aggregate_path);
 
         receiver.ProposeAccessPath(aggregate_path, &new_root_candidates,
@@ -3681,6 +4066,8 @@
         continue;
       }
 
+      root_path = GetSafePathToSort(thd, join, root_path, need_rowid);
+
       // We need to sort. Try all sort-ahead, not just the one directly derived
       // from GROUP BY clause, because a broader one might help us elide ORDER
       // BY or DISTINCT later.
@@ -3691,6 +4078,10 @@
         if (!orderings.DoesFollowOrder(ordering_state, group_by_ordering_idx)) {
           continue;
         }
+        if (sort_ahead_ordering.aggregates_required) {
+          // We can't sort by an aggregate before we've aggregated.
+          continue;
+        }
 
         Mem_root_array<TABLE *> tables = CollectTables(thd, root_path);
         AccessPath *sort_path = new (thd->mem_root) AccessPath;
@@ -3700,14 +4091,25 @@
         sort_path->sort().filesort = nullptr;
         sort_path->sort().remove_duplicates = false;
         sort_path->sort().unwrap_rollup = true;
+        sort_path->sort().use_limit = false;
         sort_path->sort().order = sort_ahead_ordering.order;
         EstimateSortCost(sort_path);
         assert(!aggregation_is_unordered);
         sort_path->ordering_state = ordering_state;
 
+        AccessPath *child_path = sort_path;
+        if (fulltext_table != nullptr) {
+          // Add a streaming path for materializing results from full-text
+          // functions before aggregation.
+          child_path =
+              NewStreamingAccessPath(thd, sort_path, join, fulltext_param,
+                                     fulltext_table, /*ref_slice=*/-1);
+          CopyBasicProperties(*sort_path, child_path);
+        }
+
         // TODO(sgunders): We don't need to allocate this on the MEM_ROOT.
         AccessPath *aggregate_path =
-            NewAggregateAccessPath(thd, sort_path, rollup);
+            NewAggregateAccessPath(thd, child_path, rollup);
         EstimateAggregateCost(aggregate_path);
 
         char description[256];
@@ -3721,55 +4123,52 @@
     }
     root_candidates = std::move(new_root_candidates);
 
-    Item_sum **func_ptr = join->sum_funcs;
-    Item_sum *func;
-    bool need_distinct = true;  // We don't support loose index scan yet.
-    while ((func = *(func_ptr++))) {
-      Aggregator::Aggregator_type type =
-          need_distinct && func->has_with_distinct()
-              ? Aggregator::DISTINCT_AGGREGATOR
-              : Aggregator::SIMPLE_AGGREGATOR;
-      if (func->set_aggregator(type) || func->aggregator_setup(thd)) {
-        return nullptr;
-      }
-    }
     if (make_group_fields(join, join)) {
       return nullptr;
     }
-  }
 
-  // Apply HAVING, if applicable.
-  if (join->having_cond != nullptr) {
-    if (trace != nullptr) {
-      *trace += "Applying filter for HAVING\n";
-    }
+    // Final setup will be done in FinalizePlanForQueryBlock(),
+    // when we have all materialization done.
+  }
 
+  // Apply HAVING, if applicable (sans any window-related in2exists parts,
+  // which we apply below).
+  Item *having_cond;
+  Item *having_cond_wf;
+  SplitHavingCondition(thd, join->having_cond, &having_cond, &having_cond_wf);
+  ApplyHavingCondition(thd, having_cond, query_block,
+                       "Applying filter for HAVING\n", trace, &root_candidates,
+                       &receiver);
+
+  // If we have GROUP BY followed by a window function (which might include
+  // ORDER BY), we might need to materialize before the first ordering -- see
+  // the comment near the top of ApplyDistinctAndOrder() for why.
+  if (query_block->is_explicitly_grouped() && !join->m_windows.is_empty()) {
     Prealloced_array<AccessPath *, 4> new_root_candidates(PSI_NOT_INSTRUMENTED);
     for (AccessPath *root_path : root_candidates) {
-      AccessPath filter_path;
-      filter_path.type = AccessPath::FILTER;
-      filter_path.filter().child = root_path;
-      filter_path.filter().condition = join->having_cond;
-      // We don't currently bother with materializing subqueries
-      // in HAVING, as they should be rare.
-      filter_path.filter().materialize_subqueries = false;
-      filter_path.num_output_rows =
-          root_path->num_output_rows *
-          EstimateSelectivity(thd, join->having_cond, trace);
-      filter_path.init_cost = root_path->init_cost;
-      filter_path.init_once_cost = root_path->init_once_cost;
-      filter_path.cost =
-          root_path->cost + EstimateFilterCost(thd, root_path->num_output_rows,
-                                               join->having_cond, query_block)
-                                .cost_if_not_materialized;
-      filter_path.num_output_rows_before_filter = filter_path.num_output_rows;
-      filter_path.cost_before_filter = filter_path.cost;
-      receiver.ProposeAccessPath(&filter_path, &new_root_candidates,
+      root_path =
+          CreateMaterializationOrStreamingPath(thd, join, root_path, need_rowid,
+                                               /*copy_items=*/true);
+      receiver.ProposeAccessPath(root_path, &new_root_candidates,
                                  /*obsolete_orderings=*/0, "");
     }
     root_candidates = std::move(new_root_candidates);
   }
 
+  join->m_windowing_steps = !join->m_windows.is_empty();
+  if (join->m_windowing_steps) {
+    root_candidates = ApplyWindowFunctions(
+        thd, receiver, orderings, fd_set, aggregation_is_unordered,
+        order_by_ordering_idx, distinct_ordering_idx, graph,
+        sort_ahead_orderings, query_block, graph.num_where_predicates,
+        need_rowid, std::move(root_candidates), trace);
+  }
+
+  ApplyHavingCondition(
+      thd, having_cond_wf, query_block,
+      "Applying filter for window function in2exists conditions\n", trace,
+      &root_candidates, &receiver);
+
   if (join->select_distinct || query_block->is_ordered()) {
     root_candidates = ApplyDistinctAndOrder(
         thd, receiver, orderings, aggregation_is_unordered,
@@ -3777,10 +4176,12 @@
         fd_set, query_block, need_rowid, std::move(root_candidates), trace);
   }
 
-  // Apply LIMIT, if applicable.
+  // Apply LIMIT and OFFSET, if applicable. If the query block is ordered, they
+  // are already applied by ApplyDistinctAndOrder().
   Query_expression *query_expression = join->query_expression();
-  if (query_expression->select_limit_cnt != HA_POS_ERROR ||
-      query_expression->offset_limit_cnt != 0) {
+  if (!query_block->is_ordered() &&
+      (query_expression->select_limit_cnt != HA_POS_ERROR ||
+       query_expression->offset_limit_cnt != 0)) {
     if (trace != nullptr) {
       *trace += "Applying LIMIT\n";
     }
@@ -3826,11 +4227,13 @@
       *trace += "Adding temporary table for SQL_BUFFER_RESULT.\n";
     }
 
-    Temp_table_param *temp_table_param = nullptr;
-    TABLE *buffer_temp_table =
-        CreateTemporaryTableFromSelectList(thd, query_block, &temp_table_param);
-    root_path = CreateMaterializationPath(thd, join, root_path,
-                                          buffer_temp_table, temp_table_param);
+    // If we have windows, we may need to add a materialization for the last
+    // window here, or create_tmp_table() will not create fields for its window
+    // functions. (All other windows have already been materialized.)
+    bool copy_items = join->m_windows.is_empty();
+    root_path =
+        CreateMaterializationPath(thd, join, root_path, /*temp_table=*/nullptr,
+                                  /*temp_table_param=*/nullptr, copy_items);
   }
 
   if (trace != nullptr) {
@@ -3846,8 +4249,7 @@
                   });
 #endif
 
-  FinalizePlanForQueryBlock(thd, query_block, root_path);
-
+  join->needs_finalize = true;
   join->best_rowcount = lrint(root_path->num_output_rows);
   join->best_read = root_path->cost;
 
diff -Nru mysql-8.0-8.0.26/sql/join_optimizer/join_optimizer.h mysql-8.0-8.0.27/sql/join_optimizer/join_optimizer.h
--- mysql-8.0-8.0.26/sql/join_optimizer/join_optimizer.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/join_optimizer/join_optimizer.h	2021-09-28 11:46:34.000000000 +0000
@@ -34,13 +34,13 @@
 
   It is intended to eventually take over completely from the older join
   optimizer based on prefix search (sql_planner.cc and related code),
-  but is currently in early alpha stage with a very simplistic cost model
-  and a large number of limitations: The most notable ones are that
-  we do not support:
+  and is nearly feature complete, but is currently in the early stages
+  with a very simplistic cost model and certain limitations.
+  The most notable ones are that we do not support:
 
-    - Some SQL features: recursive CTE, window functions.
     - Hints (except STRAIGHT_JOIN).
     - TRADITIONAL and JSON formats for EXPLAIN (use FORMAT=tree).
+    - Too large queries (too many possible subgraphs).
 
   For unsupported queries, we will return an error; every valid SQL
   query should either give such an error a correct result set.
@@ -48,8 +48,6 @@
   There are also have many optimization features it does not yet support;
   among them:
 
-    - Multiple equalities; they are simplified to simple equalities
-      before optimization (so some legal join orderings will be missed).
     - Aggregation through a temporary table.
     - Queries with a very large amount of possible orderings, e.g. 30-way
       star joins. (Less extreme queries, such as 30-way chain joins,
@@ -59,9 +57,11 @@
 
 #include <string>
 
-struct AccessPath;
-class THD;
 class Query_block;
+class THD;
+struct AccessPath;
+struct JoinHypergraph;
+struct TABLE;
 
 /**
   The main entry point for the hypergraph join optimizer; takes in a query
@@ -128,6 +128,14 @@
   materialize a subquery, though it may be suboptimal.
 
 
+  Note that the access path returned by FindBestQueryPlan() is not ready
+  for immediate conversion to iterators; see FinalizePlanForQueryBlock().
+  You may call FindBestQueryPlan() any number of times for a query block,
+  but FinalizePlanForQueryBlock() only once, as finalization generates
+  temporary tables and may rewrite expressions in ways that are incompatible
+  with future planning. The difference is most striking with the planning
+  done twice by in2exists (see above).
+
   @param thd Thread handle.
   @param query_block The query block to find a plan for.
   @param trace If not nullptr, will be filled with human-readable optimizer
@@ -136,7 +144,15 @@
 AccessPath *FindBestQueryPlan(THD *thd, Query_block *query_block,
                               std::string *trace);
 
+// See comment in .cc file.
+bool FinalizePlanForQueryBlock(THD *thd, Query_block *query_block,
+                               AccessPath *root_path);
+
+// Exposed for unit testing only.
+void FindSargablePredicates(THD *thd, std::string *trace,
+                            JoinHypergraph *graph);
+
 void EstimateAggregateCost(AccessPath *path);
-void EstimateMaterializeCost(AccessPath *path);
+void EstimateMaterializeCost(THD *thd, AccessPath *path);
 
 #endif  // SQL_JOIN_OPTIMIZER_JOIN_OPTIMIZER_H
diff -Nru mysql-8.0-8.0.26/sql/join_optimizer/make_join_hypergraph.cc mysql-8.0-8.0.27/sql/join_optimizer/make_join_hypergraph.cc
--- mysql-8.0-8.0.26/sql/join_optimizer/make_join_hypergraph.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/join_optimizer/make_join_hypergraph.cc	2021-09-28 11:46:34.000000000 +0000
@@ -34,6 +34,7 @@
 #include "limits.h"
 #include "mem_root_deque.h"
 #include "my_alloc.h"
+#include "my_bit.h"
 #include "my_inttypes.h"
 #include "my_sys.h"
 #include "my_table_map.h"
@@ -44,6 +45,7 @@
 #include "sql/item_func.h"
 #include "sql/join_optimizer/access_path.h"
 #include "sql/join_optimizer/bit_utils.h"
+#include "sql/join_optimizer/common_subexpression_elimination.h"
 #include "sql/join_optimizer/estimate_selectivity.h"
 #include "sql/join_optimizer/hypergraph.h"
 #include "sql/join_optimizer/print_utils.h"
@@ -71,6 +73,112 @@
 
 RelationalExpression *MakeRelationalExpressionFromJoinList(
     THD *thd, const mem_root_deque<TABLE_LIST *> &join_list);
+bool EarlyNormalizeConditions(THD *thd, Mem_root_array<Item *> *conditions);
+
+inline bool IsMultipleEquals(Item *cond) {
+  return cond->type() == Item::FUNC_ITEM &&
+         down_cast<Item_func *>(cond)->functype() == Item_func::MULT_EQUAL_FUNC;
+}
+
+/**
+  For a multiple equality, split out any conditions that refer to the
+  same table, without touching the multi-equality; e.g. for equal(t1.a, t2.a,
+  t2.b, t3.a), will return t2.a=t2.b AND (original item). This means that later
+  stages can ignore such duplicates, and also that we can push these parts
+  independently of the multiple equality as a whole.
+ */
+Item *ExpandSameTableFromMultipleEquals(Item_equal *equal) {
+  List<Item> eq_items;
+
+  // Look for pairs of items that touch the same table.
+  for (auto it1 = equal->get_fields().begin(); it1 != equal->get_fields().end();
+       ++it1) {
+    for (auto it2 = std::next(it1); it2 != equal->get_fields().end(); ++it2) {
+      if (it1->field->table == it2->field->table) {
+        Item_func_eq *eq_item = new Item_func_eq(&*it1, &*it2);
+        eq_item->set_cmp_func();
+        eq_item->update_used_tables();
+        eq_item->quick_fix_field();
+        eq_item->source_multiple_equality = equal;
+        eq_items.push_back(eq_item);
+
+        // If there are more, i.e., *it2 = *it3, they will be dealt with
+        // in a future iteration of the outer loop; so stop now to avoid
+        // duplicates.
+        break;
+      }
+    }
+  }
+  if (eq_items.is_empty()) {
+    return equal;
+  } else {
+    eq_items.push_back(equal);
+    Item_cond_and *item_and = new Item_cond_and(eq_items);
+    item_and->update_used_tables();
+    item_and->quick_fix_field();
+    return item_and;
+  }
+}
+
+/**
+  Expand multiple equalities that can (and should) be expanded before join
+  pushdown. These are the ones that only touch less than three tables, or that
+  are against a constant. They can be expanded unambiguously; no matter the join
+  order, they will be the same. Fields on tables not in “tables_in_subtree� are
+  assumed to be irrelevant to the equality and ignored (see the comment on
+  PushDownCondition() for more details).
+
+  For multi-equalities that are kept, split out any conditions that refer to the
+  same table. See ExpandSameTableFromMultipleEquals().
+
+  The return value is an AND conjunction, so most likely, it needs to be split.
+ */
+Item *EarlyExpandMultipleEquals(Item *condition, table_map tables_in_subtree) {
+  return CompileItem(
+      condition, [](Item *) { return true; },
+      [tables_in_subtree](Item *item) -> Item * {
+        if (!IsMultipleEquals(item)) {
+          return item;
+        }
+        Item_equal *equal = down_cast<Item_equal *>(item);
+        if (equal->get_const() == nullptr &&
+            my_count_bits(equal->used_tables() & tables_in_subtree) > 2) {
+          // Only look at partial expansion.
+          return ExpandSameTableFromMultipleEquals(equal);
+        }
+        List<Item> eq_items;
+        Item *base_item = equal->get_const();
+        for (Item_field &field : equal->get_fields()) {
+          if (!IsSubset(field.used_tables(), tables_in_subtree)) {
+            continue;
+          }
+          if (base_item == nullptr) {
+            base_item = &field;
+            continue;
+          }
+
+          // Aesthetically, we want <field> = <const>, but keep
+          // <field1> = <field2> the way the user wrote it.
+          Item_func_eq *eq_item = equal->get_const() != nullptr
+                                      ? new Item_func_eq(&field, base_item)
+                                      : new Item_func_eq(base_item, &field);
+          eq_item->set_cmp_func();
+          eq_item->update_used_tables();
+          eq_item->quick_fix_field();
+          eq_item->source_multiple_equality = equal;
+          eq_items.push_back(eq_item);
+        }
+        assert(!eq_items.is_empty());
+        if (eq_items.size() == 1) {
+          return eq_items.head();
+        } else {
+          Item_cond_and *item_and = new Item_cond_and(eq_items);
+          item_and->update_used_tables();
+          item_and->quick_fix_field();
+          return item_and;
+        }
+      });
+}
 
 RelationalExpression *MakeRelationalExpression(THD *thd, const TABLE_LIST *tl) {
   if (tl->nested_join == nullptr) {
@@ -122,29 +230,269 @@
         join->type = RelationalExpression::INNER_JOIN;
       }
     }
+    join->tables_in_subtree =
+        join->left->tables_in_subtree | join->right->tables_in_subtree;
     if (tl->is_aj_nest()) {
       assert(tl->join_cond() != nullptr);
     }
     if (tl->join_cond() != nullptr) {
-      ExtractConditions(tl->join_cond(), &join->join_conditions);
+      Item *join_cond =
+          EarlyExpandMultipleEquals(tl->join_cond(), join->tables_in_subtree);
+      ExtractConditions(join_cond, &join->join_conditions);
+      EarlyNormalizeConditions(thd, &join->join_conditions);
     }
-    join->tables_in_subtree =
-        join->left->tables_in_subtree | join->right->tables_in_subtree;
     ret = join;
   }
   return ret;
 }
 
+void ComputeCompanionSets(RelationalExpression *expr, int current_set,
+                          int *num_companion_sets,
+                          int table_num_to_companion_set[MAX_TABLES]) {
+  switch (expr->type) {
+    case RelationalExpression::TABLE:
+      expr->companion_set = current_set;
+      table_num_to_companion_set[expr->table->tableno()] = current_set;
+      return;
+    case RelationalExpression::STRAIGHT_INNER_JOIN:
+    case RelationalExpression::FULL_OUTER_JOIN:
+      ComputeCompanionSets(expr->left, /*current_set=*/-1, num_companion_sets,
+                           table_num_to_companion_set);
+      ComputeCompanionSets(expr->right, /*current_set=*/-1, num_companion_sets,
+                           table_num_to_companion_set);
+      break;
+    case RelationalExpression::INNER_JOIN:
+      if (current_set == -1) {
+        // Start a new set.
+        current_set = (*num_companion_sets)++;
+      }
+      ComputeCompanionSets(expr->left, current_set, num_companion_sets,
+                           table_num_to_companion_set);
+      ComputeCompanionSets(expr->right, current_set, num_companion_sets,
+                           table_num_to_companion_set);
+      break;
+    case RelationalExpression::LEFT_JOIN:
+    case RelationalExpression::SEMIJOIN:
+    case RelationalExpression::ANTIJOIN:
+      if (current_set == -1) {
+        // Start a new set.
+        current_set = (*num_companion_sets)++;
+      }
+      ComputeCompanionSets(expr->left, current_set, num_companion_sets,
+                           table_num_to_companion_set);
+      ComputeCompanionSets(expr->right, /*current_set=*/-1, num_companion_sets,
+                           table_num_to_companion_set);
+      break;
+    case RelationalExpression::MULTI_INNER_JOIN:
+      assert(false);
+  }
+}
+
+/**
+  Convert a multi-join into a simple inner join. expr must already have
+  the correct companion set filled out.
+
+  Only the top level will be converted, so there may still be a multi-join
+  below the modified node, e.g.:
+
+  MULTIJOIN(a, b) -> a JOIN b
+  MULTIJOIN(a, b, c, ...) -> a JOIN MULTIJOIN(b, c, ...)
+
+  If you want full unflattening, call UnflattenInnerJoins(), which calls this
+  function recursively.
+ */
+void CreateInnerJoinFromChildList(
+    Mem_root_array<RelationalExpression *> children,
+    RelationalExpression *expr) {
+  expr->type = RelationalExpression::INNER_JOIN;
+  expr->tables_in_subtree = 0;
+  expr->nodes_in_subtree = 0;
+  for (RelationalExpression *child : children) {
+    expr->tables_in_subtree |= child->tables_in_subtree;
+    expr->nodes_in_subtree |= child->nodes_in_subtree;
+  }
+
+  if (children.size() == 2) {
+    expr->left = children[0];
+    expr->right = children[1];
+  } else {
+    // Split arbitrarily.
+    expr->right = children.back();
+    children.pop_back();
+
+    RelationalExpression *left =
+        new (current_thd->mem_root) RelationalExpression(current_thd);
+    left->type = RelationalExpression::MULTI_INNER_JOIN;
+    left->tables_in_subtree = 0;
+    left->nodes_in_subtree = 0;
+    left->companion_set = expr->companion_set;
+    for (RelationalExpression *child : children) {
+      left->tables_in_subtree |= child->tables_in_subtree;
+      left->nodes_in_subtree |= child->nodes_in_subtree;
+    }
+    left->multi_children = std::move(children);
+    expr->left = left;
+  }
+  expr->multi_children.clear();
+}
+
+/**
+  Find all inner joins under “expr� without a join condition, and convert them
+  to a flattened join (MULTI_INNER_JOIN). We do this even for the joins that
+  have only two children, as it makes it easier to absorb them into higher
+  multi-joins.
+
+  The primary motivation for flattening is more flexible pushdown; when there is
+  a large multi-way join, we can push pretty much any equality condition down
+  to it, no matter how the join tree was written by the user.
+  See PartiallyUnflattenJoinForCondition() for details.
+
+  Note that this (currently) does not do any rewrites to flatten even more.
+  E.g., for the tree (a JOIN (b LEFT JOIN c)), it would be beneficial to use
+  associativity to rewrite into (a JOIN b) LEFT JOIN c (assuming a and b
+  could be combined further with other joins). This also means that there may
+  be items in the companion set that are not part of the same multi-join.
+ */
+void FlattenInnerJoins(RelationalExpression *expr) {
+  if (expr->type == RelationalExpression::MULTI_INNER_JOIN) {
+    // Already flattened, but grandchildren might need re-flattening.
+    for (RelationalExpression *child : expr->multi_children) {
+      FlattenInnerJoins(child);
+      assert(child->type != RelationalExpression::MULTI_INNER_JOIN);
+    }
+    return;
+  }
+  if (expr->type != RelationalExpression::TABLE) {
+    FlattenInnerJoins(expr->left);
+    FlattenInnerJoins(expr->right);
+  }
+  assert(expr->equijoin_conditions
+             .empty());  // MakeHashJoinConditions() has not run yet.
+  if (expr->type == RelationalExpression::INNER_JOIN &&
+      expr->join_conditions.empty()) {
+    // Collect and flatten children.
+    assert(expr->multi_children.empty());
+    expr->type = RelationalExpression::MULTI_INNER_JOIN;
+    if (expr->left->type == RelationalExpression::MULTI_INNER_JOIN) {
+      for (RelationalExpression *child : expr->left->multi_children) {
+        expr->multi_children.push_back(child);
+      }
+    } else {
+      expr->multi_children.push_back(expr->left);
+    }
+    if (expr->right->type == RelationalExpression::MULTI_INNER_JOIN) {
+      for (RelationalExpression *child : expr->right->multi_children) {
+        expr->multi_children.push_back(child);
+      }
+    } else {
+      expr->multi_children.push_back(expr->right);
+    }
+    expr->left = nullptr;
+    expr->right = nullptr;
+  }
+}
+
+/**
+  The opposite of FlattenInnerJoins(); converts all flattened joins to
+  a series of (right-deep) binary joins.
+ */
+void UnflattenInnerJoins(RelationalExpression *expr) {
+  if (expr->type == RelationalExpression::TABLE) {
+    return;
+  }
+  if (expr->type == RelationalExpression::MULTI_INNER_JOIN) {
+    // Peel off one table, then recurse. We could probably be
+    // somewhat more efficient than this if it's important.
+    CreateInnerJoinFromChildList(std::move(expr->multi_children), expr);
+  }
+  UnflattenInnerJoins(expr->left);
+  UnflattenInnerJoins(expr->right);
+}
+
+/**
+  For the given flattened join (multi-join), pull out (only) the parts we need
+  to push the given condition, and make a binary join for it. For instance,
+  if we have
+
+    MULTIJOIN(t1, t2, t3, t4 LJ t5)
+
+  and we have a condition t2.x = t5.x, we need to pull out the parts referring
+  to t2 and t5, partially exploding the multi-join:
+
+    MULTIJOIN(t1, t3, t2 JOIN (t4 LJ t5))
+
+  The newly created child will be returned, and the condition can be pushed
+  onto it. Note that there may be flattened joins under it; it is only the
+  returned node itself that is guaranteed to be a binary join.
+
+  If the condition touches all tables in the flattened join, the newly created
+  binary node will completely replace the former. (The simplest case of this is
+  a multi-join with only two nodes, and a condition referring to both of them.)
+  For instance, given
+
+    MULTIJOIN(t1, t2, t3)
+
+  and a condition t1.x = t2.x + t3.x, the entire node will be replaced by
+
+    t1 JOIN MULTIJOIN(t2, t3)
+
+  on which it is possible to push the condition. Which node is pulled out to
+  the left side is undefined.
+
+  See also CreateInnerJoinFromChildList().
+ */
+RelationalExpression *PartiallyUnflattenJoinForCondition(
+    table_map used_tables, RelationalExpression *expr) {
+  Mem_root_array<RelationalExpression *> affected_children(
+      current_thd->mem_root);
+  for (RelationalExpression *child : expr->multi_children) {
+    if (Overlaps(used_tables, child->tables_in_subtree) ||
+        Overlaps(used_tables, RAND_TABLE_BIT)) {
+      affected_children.push_back(child);
+    }
+  }
+  assert(affected_children.size() > 1);
+
+  if (affected_children.size() == expr->multi_children.size()) {
+    // We need all of the nodes, so replace ourself entirely.
+    CreateInnerJoinFromChildList(std::move(affected_children), expr);
+    return expr;
+  }
+
+  RelationalExpression *new_expr =
+      new (current_thd->mem_root) RelationalExpression(current_thd);
+  new_expr->companion_set = expr->companion_set;
+  CreateInnerJoinFromChildList(std::move(affected_children), new_expr);
+
+  // Insert the new node as one of the children, and take out
+  // the ones we've moved down into it.
+  auto new_end =
+      std::remove_if(expr->multi_children.begin(), expr->multi_children.end(),
+                     [used_tables](const RelationalExpression *child) {
+                       return Overlaps(used_tables, child->tables_in_subtree) ||
+                              Overlaps(used_tables, RAND_TABLE_BIT);
+                     });
+  expr->multi_children.erase(new_end, expr->multi_children.end());
+  expr->multi_children.push_back(new_expr);
+  return new_expr;
+}
+
 string PrintRelationalExpression(RelationalExpression *expr, int level) {
   string result;
   for (int i = 0; i < level * 2; ++i) result += ' ';
 
   switch (expr->type) {
     case RelationalExpression::TABLE:
-      result += StringPrintf("* %s\n", expr->table->alias);
+      if (expr->companion_set != -1) {
+        result += StringPrintf("* %s [companion set %d]\n", expr->table->alias,
+                               expr->companion_set);
+      } else {
+        result += StringPrintf("* %s\n", expr->table->alias);
+      }
       // Do not try to descend further.
       return result;
     case RelationalExpression::INNER_JOIN:
+    case RelationalExpression::MULTI_INNER_JOIN:
       result += "* Inner join";
       break;
     case RelationalExpression::STRAIGHT_INNER_JOIN:
@@ -163,8 +511,19 @@
       result += "* Full outer join";
       break;
   }
-  if (expr->equijoin_conditions.empty() && expr->join_conditions.empty()) {
-    result += " (no join conditions)";
+  if (expr->type == RelationalExpression::MULTI_INNER_JOIN) {
+    // Should only exist before pushdown.
+    assert(expr->equijoin_conditions.empty() && expr->join_conditions.empty());
+    result += " (flattened)\n";
+    for (RelationalExpression *child : expr->multi_children) {
+      result += PrintRelationalExpression(child, level + 1);
+    }
+    return result;
+  }
+  if (!expr->equijoin_conditions.empty() && !expr->join_conditions.empty()) {
+    result += StringPrintf(" (equijoin condition = %s, extra = %s)",
+                           ItemsToString(expr->equijoin_conditions).c_str(),
+                           ItemsToString(expr->join_conditions).c_str());
   } else if (!expr->equijoin_conditions.empty()) {
     result += StringPrintf(" (equijoin condition = %s)",
                            ItemsToString(expr->equijoin_conditions).c_str());
@@ -172,9 +531,7 @@
     result += StringPrintf(" (extra join condition = %s)",
                            ItemsToString(expr->join_conditions).c_str());
   } else {
-    result += StringPrintf(" (equijoin condition = %s, extra = %s)",
-                           ItemsToString(expr->equijoin_conditions).c_str(),
-                           ItemsToString(expr->join_conditions).c_str());
+    result += " (no join conditions)";
   }
   result += '\n';
 
@@ -207,7 +564,8 @@
 
 bool IsInnerJoin(RelationalExpression::Type type) {
   return type == RelationalExpression::INNER_JOIN ||
-         type == RelationalExpression::STRAIGHT_INNER_JOIN;
+         type == RelationalExpression::STRAIGHT_INNER_JOIN ||
+         type == RelationalExpression::MULTI_INNER_JOIN;
 }
 
 // Returns true if (t1 <a> t2) <b> t3 === t1 <a> (t2 <b> t3).
@@ -368,6 +726,9 @@
   Find a bitmap of used tables for all conditions on \<expr\>.
   Note that after all conditions have been pushed, you can check
   expr.conditions_used_tables instead (see FindConditionsUsedTables()).
+
+  NOTE: The map might be wider than expr.tables_in_subtree due to
+  multiple equalities; you should normally just ignore those bits.
  */
 table_map UsedTablesForCondition(const RelationalExpression &expr) {
   assert(expr.equijoin_conditions
@@ -380,6 +741,152 @@
 }
 
 /**
+  Like UsedTablesForCondition(), but multiple equalities set no bits unless
+  they're certain, i.e., cannot be avoided no matter how we break up the
+  multiple equality. This is the case for tables that are the only ones on
+  their side of the join. E.g.: For a multiple equality {A,C,D} on a join
+  (A,B) JOIN (C,D), A is certain; either A=C or A=D has to be included
+  no matter what.
+ */
+table_map CertainlyUsedTablesForCondition(const RelationalExpression &expr) {
+  assert(expr.equijoin_conditions
+             .empty());  // MakeHashJoinConditions() has not run yet.
+  table_map used_tables = 0;
+  for (Item *cond : expr.join_conditions) {
+    table_map this_used_tables = cond->used_tables();
+    if (IsMultipleEquals(cond)) {
+      table_map left_bits = this_used_tables & expr.left->tables_in_subtree;
+      table_map right_bits = this_used_tables & expr.right->tables_in_subtree;
+      if (IsSingleBitSet(left_bits)) {
+        used_tables |= left_bits;
+      }
+      if (IsSingleBitSet(right_bits)) {
+        used_tables |= right_bits;
+      }
+    } else {
+      used_tables |= this_used_tables;
+    }
+  }
+  return used_tables;
+}
+
+/**
+  For a given set of tables, find the companion set they are part of (see
+  RelationalExpression::companion_set for an explanation of companion sets).
+  Returns -1 if the tables are in different (ie., incompatible) companion sets;
+  if so, a condition using this set of tables can _not_ induce a new (cycle)
+  edge in the hypergraph, as there are non-inner joins in the way.
+ */
+int CompanionSetUsedByCondition(
+    table_map tables, const int table_num_to_companion_set[MAX_TABLES]) {
+  assert(tables != 0);
+
+  int ret = -1;
+  for (int table_num : BitsSetIn(tables)) {
+    if (table_num >= int{MAX_TABLES} ||
+        table_num_to_companion_set[table_num] == -1) {
+      // This table is not part of a companion set.
+      return -1;
+    }
+    if (ret == -1) {
+      // First table.
+      ret = table_num_to_companion_set[table_num];
+    } else if (ret != table_num_to_companion_set[table_num]) {
+      // Incompatible sets.
+      return -1;
+    }
+  }
+  return ret;
+}
+
+/**
+  Check whether we are allowed to make an extra join edge with the given
+  condition, instead of pushing the condition onto the given point in the
+  join tree (which we have presumably found out that we don't want).
+ */
+bool IsCandidateForCycle(RelationalExpression *expr, Item *cond,
+                         const int table_num_to_companion_set[MAX_TABLES]) {
+  if (cond->type() != Item::FUNC_ITEM) {
+    return false;
+  }
+  if (Overlaps(cond->used_tables(), PSEUDO_TABLE_BITS)) {
+    return false;
+  }
+  Item_func *func_item = down_cast<Item_func *>(cond);
+  if (!IsMultipleEquals(func_item)) {
+    // Don't try to make cycle edges out of hyperpredicates, at least for now;
+    // simple equalities and multi-equalities only.
+    if (!func_item->contains_only_equi_join_condition()) {
+      return false;
+    }
+    if (my_count_bits(cond->used_tables()) != 2) {
+      return false;
+    }
+  }
+
+  // Check that we are not combining together anything that is not part of
+  // the same companion set (either by means of the condition, or by making
+  // a cycle through an already-existing condition).
+  table_map used_tables = cond->used_tables();
+  assert(expr->equijoin_conditions
+             .empty());  // MakeHashJoinConditions() has not run yet.
+  for (Item *other_cond : expr->join_conditions) {
+    used_tables |= other_cond->used_tables();
+  }
+  return CompanionSetUsedByCondition(used_tables & expr->tables_in_subtree,
+                                     table_num_to_companion_set) != -1;
+}
+
+bool ComesFromMultipleEquality(Item *item, Item_equal *equal) {
+  return item->type() == Item::FUNC_ITEM &&
+         down_cast<Item_func *>(item)->functype() == Item_func::EQ_FUNC &&
+         down_cast<Item_func_eq *>(item)->source_multiple_equality == equal;
+}
+
+int FindSourceMultipleEquality(Item *item,
+                               const Mem_root_array<Item_equal *> &equals) {
+  if (item->type() != Item::FUNC_ITEM ||
+      down_cast<Item_func *>(item)->functype() != Item_func::EQ_FUNC) {
+    return -1;
+  }
+  Item_func_eq *eq = down_cast<Item_func_eq *>(item);
+  for (size_t equals_idx = 0; equals_idx < equals.size(); ++equals_idx) {
+    if (eq->source_multiple_equality == equals[equals_idx]) {
+      return static_cast<int>(equals_idx);
+    }
+  }
+  return -1;
+}
+
+bool MultipleEqualityAlreadyExistsOnJoin(Item_equal *equal,
+                                         const RelationalExpression &expr) {
+  // Could be called both before and after MakeHashJoinConditions(),
+  // so check for join_conditions and equijoin_conditions.
+  for (Item *item : expr.join_conditions) {
+    if (ComesFromMultipleEquality(item, equal)) {
+      return true;
+    }
+  }
+  for (Item_func_eq *item : expr.equijoin_conditions) {
+    if (item->source_multiple_equality == equal) {
+      return true;
+    }
+  }
+  return false;
+}
+
+bool AlreadyExistsOnJoin(Item *cond, const RelationalExpression &expr) {
+  assert(expr.equijoin_conditions
+             .empty());  // MakeHashJoinConditions() has not run yet.
+  for (Item *item : expr.join_conditions) {
+    if (cond->eq(item, /*binary_eq=*/true)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+/**
   Returns whether adding “cond� to the given join would unduly enlarge
   the number of tables it references, or create a degenerate join.
   The former is suboptimal since it would create a wider hyperedge
@@ -402,12 +909,51 @@
     return true;
   }
 
-  if (expr.join_conditions.empty()) {
+  const table_map already_used_tables = CertainlyUsedTablesForCondition(expr);
+  if (already_used_tables == 0) {
     // Making a Cartesian join into a proper join is good.
     return false;
   }
 
-  return !IsSubset(used_tables, UsedTablesForCondition(expr));
+  if (IsMultipleEquals(cond)) {
+    // Don't apply the same multi-equality twice on the same join. This fixes an
+    // issue that goes roughly like this:
+    //
+    // 1. A multi-equality, e.g. (t1.x, t2.x, t3.x), is pushed on the lower
+    //    level of a join like t1 JOIN (t2 JOIN (t3 JOIN t4)), and concretized
+    //    to t2.x = t3.x (we happen to push the lower levels before the higher
+    //    levels).
+    // 2. Now we want to push the same multi-equality on the higher level,
+    //    but assume there's already a condition there that makes it a bad join
+    //    for us, e.g. t1.y = t4.y already exists. This causes us to try an
+    //    associative rewrite to (t1 JOIN t2) JOIN (t3 JOIN t4). Note that
+    //    the top join still carries the t2.x = t3.x condition.
+    // 3. Now we see that we can reliably push the multi-equality onto the
+    //    top join again without extending the join condition -- by concretizing
+    //    it to t2.x = t3.x!
+    //
+    // This obviously subverts the requirement that we have (N-1) different
+    // concretizations of the multi-equality, since two are the same. Thus,
+    // we have this explicit check here.
+    //
+    // See the unit test MultipleEqualityIsNotPushedMultipleTimes for an example
+    // that goes horribly wrong without this.
+    if (MultipleEqualityAlreadyExistsOnJoin(down_cast<Item_equal *>(cond),
+                                            expr)) {
+      return true;
+    }
+
+    // For multi-equalities, we can pick any table from the left and any table
+    // from the right, so see if we can make any such choice that doesn't
+    // broaden the condition.
+    const table_map candidate_tables = used_tables & already_used_tables;
+    if (Overlaps(candidate_tables, expr.left->tables_in_subtree) &&
+        Overlaps(candidate_tables, expr.right->tables_in_subtree)) {
+      return false;
+    }
+  }
+
+  return !IsSubset(used_tables, already_used_tables);
 }
 
 /**
@@ -468,10 +1014,158 @@
 }
 
 /**
+  From “cond�, create exactly one simple equality that will connect the
+  left and right sides of “expr�. E.g. for joining (A,B) and (C,D),
+  and given the multi-equality (A.x,B.x,D.x), it may pick A.x = D.x
+  or B.x = D.x (but never A.x = B.x).
+ */
+Item_func_eq *ConcretizeMultipleEquals(Item_equal *cond,
+                                       const RelationalExpression &expr) {
+  const table_map already_used_tables = CertainlyUsedTablesForCondition(expr);
+
+  Item_field *left = nullptr;
+  Item_field *right = nullptr;
+
+  // Go through and pick a candidate for each side of the equality.
+  // This is fairly arbitrary (we will add cycles later), but if there is
+  // already a condition present, we prefer to pick one that refers to an
+  // already-used table.
+  for (Item_field &item_field : cond->get_fields()) {
+    if (Overlaps(item_field.used_tables(), expr.left->tables_in_subtree)) {
+      if (left == nullptr ||
+          !Overlaps(left->used_tables(), already_used_tables)) {
+        left = &item_field;
+      }
+    } else if (Overlaps(item_field.used_tables(),
+                        expr.right->tables_in_subtree)) {
+      if (right == nullptr ||
+          !Overlaps(right->used_tables(), already_used_tables)) {
+        right = &item_field;
+      }
+    }
+  }
+  assert(left != nullptr);
+  assert(right != nullptr);
+
+  Item_func_eq *eq_item = new Item_func_eq(left, right);
+  eq_item->set_cmp_func();
+  eq_item->update_used_tables();
+  eq_item->quick_fix_field();
+  eq_item->source_multiple_equality = cond;
+  return eq_item;
+}
+
+/**
+  From “cond�, create exactly as many simple equalities that are needed
+  to connect all tables in “allowed_tables�. E.g. for joining (A,B) and (C,D)
+  (ie., allowed_tables={A,B,C,D}), and given the multi-equality
+  (A.x, B.x, D.x, E.x), it will generate A.x = B.x and B.x = D.x
+  (E.x is ignored).
+
+  The given container must support push_back(Item_func_eq *).
+ */
+template <class T>
+static void FullyConcretizeMultipleEquals(Item_equal *cond,
+                                          table_map allowed_tables, T *result) {
+  Item_field *last_field = nullptr;
+  table_map seen_tables = 0;
+  for (Item_field &field : cond->get_fields()) {
+    if (!Overlaps(field.used_tables(), allowed_tables)) {
+      // From outside this join.
+      continue;
+    }
+    if (Overlaps(field.used_tables(), seen_tables)) {
+      // We've already seen something from this table,
+      // which has been dealt with in ExpandSameTableFromMultipleEquals().
+      continue;
+    }
+    if (last_field != nullptr) {
+      Item_func_eq *eq_item = new Item_func_eq(last_field, &field);
+      eq_item->set_cmp_func();
+      eq_item->update_used_tables();
+      eq_item->quick_fix_field();
+      eq_item->source_multiple_equality = cond;
+      result->push_back(eq_item);
+    }
+    last_field = &field;
+    seen_tables |= field.used_tables();
+  }
+}
+
+/**
+  Finalize a condition (join condition or WHERE predicate); resolve any
+  remaining multiple equalities, and add casts to comparisons where needed.
+  Caches around constant arguments are not added here but during finalize,
+  since we might plan two times, and the caches from the first time may confuse
+  remove_eq_cond() in the second.
+ */
+Item *CanonicalizeCondition(Item *condition, table_map allowed_tables) {
+  // Convert any remaining (unpushed) multiple equals to a series of equijoins.
+  // Note this is a last-ditch resort, and should almost never happen;
+  // thus, it's fine just to fully expand the multi-equality, even though it
+  // might mean adding conditions that have already been dealt with further down
+  // the tree. This is also the only place that we expand multi-equalities
+  // within OR conjunctions or the likes.
+  condition = CompileItem(
+      condition, [](Item *) { return true; },
+      [allowed_tables](Item *item) -> Item * {
+        if (!IsMultipleEquals(item)) {
+          return item;
+        }
+        Item_equal *equal = down_cast<Item_equal *>(item);
+        assert(equal->get_const() == nullptr);
+        List<Item> eq_items;
+        FullyConcretizeMultipleEquals(equal, allowed_tables, &eq_items);
+        assert(!eq_items.is_empty());
+        if (eq_items.size() == 1) {
+          return eq_items.head();
+        } else {
+          Item_cond_and *item_and = new Item_cond_and(eq_items);
+          item_and->update_used_tables();
+          item_and->quick_fix_field();
+          return item_and;
+        }
+      });
+
+  // Account for tables not in allowed_tables having been removed.
+  condition->update_used_tables();
+
+  condition->walk(&Item::cast_incompatible_args, enum_walk::POSTFIX, nullptr);
+  return condition;
+}
+
+// Calls CanonicalizeCondition() for each condition in the given array.
+bool CanonicalizeConditions(THD *thd, table_map tables_in_subtree,
+                            Mem_root_array<Item *> *conditions) {
+  bool need_resplit = false;
+  for (Item *&condition : *conditions) {
+    condition = CanonicalizeCondition(condition, tables_in_subtree);
+    if (condition == nullptr) {
+      return true;
+    }
+    if (condition->type() == Item::COND_ITEM &&
+        down_cast<Item_cond *>(condition)->functype() ==
+            Item_func::COND_AND_FUNC) {
+      // Canonicalization converted something (probably an Item_equal) to a
+      // conjunction, which we need to split back to new conditions again.
+      need_resplit = true;
+    }
+  }
+  if (need_resplit) {
+    Mem_root_array<Item *> new_join_conditions(thd->mem_root);
+    for (Item *condition : *conditions) {
+      ExtractConditions(condition, &new_join_conditions);
+    }
+    *conditions = std::move(new_join_conditions);
+  }
+  return false;
+}
+
+/**
   Add “cond� as a join condition to “expr�, but if it would enlarge the set
   of referenced tables, try to rewrite the join tree using associativity
-  (either left or right) and commutativity to be able to put the condition
-  on a more favorable node. (See IsBadJoinForCondition().) As an example:
+  (either left or right) to be able to put the condition on a more favorable
+  node. (See IsBadJoinForCondition().)
 
     a JOIN (b JOIN c ON TRUE) ON a.x=b.x WHERE a.y=c.y
 
@@ -483,14 +1177,10 @@
 
     (a JOIN b ON a.x=b.x) JOIN c ON a.y=c.y
 
-  These rewrites frequently crop up in queries without explicit joins,
-  e.g.
-
-    SELECT ... FROM a,b,c WHERE a.x=b.x AND a.y=c.y
-
-  They don't solve all situations; in particular, we don't deal with
-  situations that should create cycles in the hypergraph. But it gets us
-  out of the most common ones.
+  Note that with flattening, we don't need this for inner joins (flattening
+  solves all inner-join cases without needing this machinery), so this is only
+  ever called when outer joins are involved (inner joins are used in the example
+  above for ease of exposition).
 
   This function works recursively, and returns true if the condition
   was pushed.
@@ -498,12 +1188,21 @@
 bool AddJoinConditionPossiblyWithRewrite(RelationalExpression *expr, Item *cond,
                                          AssociativeRewritesAllowed allowed,
                                          bool used_commutativity,
-                                         string *trace) {
+                                         bool *need_flatten, string *trace) {
+  // We should never reach this from a top-level caller, and due to the call
+  // to UnflattenInnerJoins() below, we should also never see it through
+  // rotates.
+  assert(expr->type != RelationalExpression::MULTI_INNER_JOIN);
+
   // We can only promote filters to join conditions on inner joins and
   // semijoins, but having a left join doesn't stop us from doing the rewrites
   // below. Due to special semijoin rules in MySQL (see comments in
   // PushDownCondition()), we also disallow making join conditions on semijoins.
   if (!IsBadJoinForCondition(*expr, cond) && IsInnerJoin(expr->type)) {
+    if (IsMultipleEquals(cond)) {
+      cond = ConcretizeMultipleEquals(down_cast<Item_equal *>(cond), *expr);
+    }
+
     expr->join_conditions.push_back(cond);
     if (trace != nullptr && allowed != AssociativeRewritesAllowed::ANY) {
       *trace += StringPrintf(
@@ -514,6 +1213,16 @@
     return true;
   }
 
+  // Flattening in itself causes some headaches (it's not obvious how to do
+  // rotates), so before any such rewrites, we unflatten the tree. This isn't
+  // particularly efficient, and it may also cause us to miss some rewrites,
+  // but it's an OK tradeoff. The top-level caller will have to flatten again.
+  //
+  // NOTE: When/if we support rotating through flattened joins, we can
+  // drop all the commutativity code.
+  UnflattenInnerJoins(expr);
+  *need_flatten = true;
+
   // Try (where ABC are arbitrary expressions, and <op1> is expr):
   //
   //   A <op1> (B <op2> C) => (A <op1> B) <op2> C
@@ -523,12 +1232,16 @@
   if (allowed != AssociativeRewritesAllowed::LEFT_ONLY &&
       expr->right->type != RelationalExpression::TABLE &&
       OperatorsAreAssociative(*expr, *expr->right)) {
+    // Note that we need to use the conservative check here
+    // (UsedTablesForCondition() instead of CertainlyUsedTablesForCondition()),
+    // in order not to do possibly illegal rewrites. (It should only matter
+    // for the rare case where we have unpushed multiple equalities.)
     if (!Overlaps(UsedTablesForCondition(*expr),
                   expr->right->right->tables_in_subtree)) {
       RotateRight(expr);
       if (AddJoinConditionPossiblyWithRewrite(
               expr, cond, AssociativeRewritesAllowed::RIGHT_ONLY,
-              used_commutativity, trace)) {
+              used_commutativity, need_flatten, trace)) {
         return true;
       }
       // It failed, so undo what we did.
@@ -541,7 +1254,7 @@
       RotateRight(expr);
       if (AddJoinConditionPossiblyWithRewrite(
               expr, cond, AssociativeRewritesAllowed::RIGHT_ONLY,
-              /*used_commutativity=*/false, trace)) {
+              /*used_commutativity=*/false, need_flatten, trace)) {
         return true;
       }
       // It failed, so undo what we did.
@@ -563,7 +1276,7 @@
       RotateLeft(expr);
       if (AddJoinConditionPossiblyWithRewrite(
               expr, cond, AssociativeRewritesAllowed::LEFT_ONLY,
-              used_commutativity, trace)) {
+              used_commutativity, need_flatten, trace)) {
         return true;
       }
       // It failed, so undo what we did.
@@ -576,7 +1289,7 @@
       RotateLeft(expr);
       if (AddJoinConditionPossiblyWithRewrite(
               expr, cond, AssociativeRewritesAllowed::LEFT_ONLY,
-              /*used_commutativity=*/true, trace)) {
+              /*used_commutativity=*/true, need_flatten, trace)) {
         return true;
       }
       // It failed, so undo what we did.
@@ -594,32 +1307,15 @@
   (is_join_condition_for_expr=true), or a filter which is applied at some point
   after expr (...=false).
 
-  Returns false if cond was pushed down and stored as a join condition on some
-  lower place than it started, ie., the caller no longer needs to worry about
-  it.
-
-  Since PushDownAsMuchAsPossible() only calls us for join conditions, there are
-  only two ways we can push down something onto a single table (which naturally
-  has no concept of “join condition�). Neither of them affect the return
-  condition. These are:
-
-  1. Sargable join conditions.
-
-  Equijoin conditions can often be pushed down into indexes; e.g. t1.x = t2.x
-  could be pushed down into an index on t1.x. When we have pushed such a
-  condition all the way down onto the t1/t2 join, we are ostensibly done
-  (and would return true), but before that, we push down the condition down
-  onto both sides if possible. (E.g.: If the join was a left join, we could
-  push it down to t2, but not to t1.) When we hit a table in such a push,
-  we store the conditions in “join_conditions_pushable_to_this“ for the table
-  to signal that it should be investigated when we consider the table during
-  join optimization. This push happens with parameter_tables set to a bitmap
-  of the table(s) on the other side of the join, e.g. the push to t1 happens
-  with t2 in the bitmap. A push with nonzero parameter_tables is not subject
-  to being left as a join condition as would usually be the case; if it is
-  not pushable all the way down to a table, it is simply discarded.
-
-  2. Partial pushdown.
+  If the condition was not pushable, ie., it couldn't be stored as a join
+  condition on some lower place than it started, it will push it onto
+  “remaining_parts�. remaining_parts can be nullptr, in which case the condition
+  is simply dropped.
+
+  Since PushDownAsMuchAsPossible() only calls us for join conditions, there is
+  only one way we can push down something onto a single table (which naturally
+  has no concept of “join condition�), and it does not affect the return
+  condition. That is partial pushdown:
 
   In addition to regular pushdown, PushDownCondition() will do partial pushdown
   if appropriate. Some expressions cannot be fully pushed down, but we can
@@ -636,26 +1332,76 @@
   down to a table, we store the condition in “table_filters�. These are
   conditions that can be evaluated directly on the given table, without any
   concern for what is joined in before (ie., TES = SES).
+
+
+  Multiple equalities
+  ===================
+
+  Pushing down multiple equalities is somewhat tricky. To recap, a multiple
+  equality (Item_equal) is a set of N fields (a,b,c,...) that are all assumed
+  to be equal to each other. As part of pushdown, we concretize these into
+  (N-1) regular equalities (where every field is referred to at least once);
+  this is enough for query correctness, and the remaining options will be added
+  to the query graph later. E.g., if we have multiple equals (a,b,c), we could
+  add a=b AND b=c, or equivalently a=c AND b=c. But for (a,b,c,d), we couldn't
+  do with a=b AND a=c AND b=c; even though it would be (N-1) equalities,
+  d still needs to be in the mix.
+
+  We solve this by pushing down multiple equalities as usual down the tree until
+  it becomes a join condition at the current node (ie., it refers to tables from
+  both sides). At that point, we can pick an arbitrary table from each sides to
+  create an equality. E.g. for (a,b,c,d) pushed onto (a,b) JOIN (c,d), we can
+  choose an equality a=c, or a=d, or similar. However, this only resolves one
+  equality; we need to keep pushing it down on both sides. This will create the
+  (N-1) ones we want in the end. But at this point, the multiple equality will
+  refer to tables not part of the join; e.g. trying to push down equals(a,b,c,d)
+  onto a JOIN b. If so, we simply ignore the fields belonging to tables not part
+  of the join, so we create a=b (the only possibility).
+
+  If we at some point end up with a multiple equality we cannot push
+  (e.g., because it hit an outer join), we will resolve it at the latest
+  in CanonicalizeCondition().
  */
-bool PushDownCondition(Item *cond, RelationalExpression *expr,
+void PushDownCondition(Item *cond, RelationalExpression *expr,
                        bool is_join_condition_for_expr,
-                       table_map parameter_tables,
-                       Mem_root_array<Item *> *table_filters, string *trace) {
+                       const int table_num_to_companion_set[MAX_TABLES],
+                       Mem_root_array<Item *> *table_filters,
+                       Mem_root_array<Item *> *cycle_inducing_edges,
+                       Mem_root_array<Item *> *remaining_parts, string *trace) {
   if (expr->type == RelationalExpression::TABLE) {
-    if (parameter_tables == 0) {
-      table_filters->push_back(cond);
-    } else {
-      expr->join_conditions_pushable_to_this.push_back(cond);
+    assert(!IsMultipleEquals(cond));
+    table_filters->push_back(cond);
+    if (remaining_parts != nullptr) {
+      remaining_parts->push_back(cond);
     }
-    return true;
+    return;
+  }
+  const table_map used_tables =
+      cond->used_tables() & (expr->tables_in_subtree | RAND_TABLE_BIT);
+
+  if (expr->type == RelationalExpression::MULTI_INNER_JOIN) {
+    // See if we can push this condition down to a single child.
+    for (RelationalExpression *child : expr->multi_children) {
+      if (IsSubset(used_tables, child->tables_in_subtree)) {
+        PushDownCondition(cond, child,
+                          /*is_join_condition_for_expr=*/false,
+                          table_num_to_companion_set, table_filters,
+                          cycle_inducing_edges, remaining_parts, trace);
+        return;
+      }
+    }
+
+    // We couldn't, so we'll need to unflatten the join (either partially
+    // or completely) to get a place where we can store the condition.
+    expr = PartiallyUnflattenJoinForCondition(used_tables, expr);
+
+    // Fall through, presumably storing the condition as a join condition
+    // on the given node.
   }
 
   assert(
       !Overlaps(expr->left->tables_in_subtree, expr->right->tables_in_subtree));
 
-  table_map used_tables =
-      cond->used_tables() & ~(OUTER_REF_TABLE_BIT | INNER_TABLE_BIT);
-
   // See if we can push down into the left side, ie., it only touches
   // tables on the left side of the join.
   //
@@ -668,13 +1414,18 @@
       (IsInnerJoin(expr->type) ||
        expr->type == RelationalExpression::SEMIJOIN ||
        !is_join_condition_for_expr);
-  if (IsSubset(used_tables, expr->left->tables_in_subtree | parameter_tables)) {
+  if (IsSubset(used_tables, expr->left->tables_in_subtree)) {
     if (!can_push_into_left) {
-      return true;
+      if (remaining_parts != nullptr) {
+        remaining_parts->push_back(cond);
+      }
+      return;
     }
-    return PushDownCondition(cond, expr->left,
-                             /*is_join_condition_for_expr=*/false,
-                             parameter_tables, table_filters, trace);
+    PushDownCondition(cond, expr->left,
+                      /*is_join_condition_for_expr=*/false,
+                      table_num_to_companion_set, table_filters,
+                      cycle_inducing_edges, remaining_parts, trace);
+    return;
   }
 
   // See if we can push down into the right side. For inner joins,
@@ -694,80 +1445,106 @@
       (IsInnerJoin(expr->type) ||
        expr->type == RelationalExpression::SEMIJOIN ||
        is_join_condition_for_expr);
-  if (IsSubset(used_tables,
-               expr->right->tables_in_subtree | parameter_tables)) {
+  if (IsSubset(used_tables, expr->right->tables_in_subtree)) {
     if (!can_push_into_right) {
-      return true;
+      if (remaining_parts != nullptr) {
+        remaining_parts->push_back(cond);
+      }
+      return;
     }
-    return PushDownCondition(cond, expr->right,
-                             /*is_join_condition_for_expr=*/false,
-                             parameter_tables, table_filters, trace);
+    PushDownCondition(cond, expr->right,
+                      /*is_join_condition_for_expr=*/false,
+                      table_num_to_companion_set, table_filters,
+                      cycle_inducing_edges, remaining_parts, trace);
+    return;
   }
 
   // It's not a subset of left, it's not a subset of right, so it's a
   // filter that must either stay after this join, or it can be promoted
   // to a join condition for it.
 
+  if (AlreadyExistsOnJoin(cond, *expr) &&
+      !(expr->type == RelationalExpression::LEFT_JOIN ||
+        expr->type == RelationalExpression::ANTIJOIN)) {
+    // Redundant, so we can just forget about it.
+    // (WHERE conditions are not pushable to outer joins or antijoins,
+    // and thus not redundant, because post-join filters are not equivalent to
+    // join conditions for those types. For outer joins, NULL-complemented rows
+    // would need re-filtering, and for antijoins, the antijoin condition
+    // repeated as a filter afterwards would simply return zero rows,
+    // by definition.)
+    return;
+  }
+
   // Try partial pushdown into the left side (see function comment).
-  if (can_push_into_left) {
+  if (can_push_into_left &&
+      Overlaps(used_tables, expr->left->tables_in_subtree)) {
     Item *partial_cond = make_cond_for_table(
         current_thd, cond, expr->left->tables_in_subtree, /*used_table=*/0,
         /*exclude_expensive_cond=*/true);
     if (partial_cond != nullptr) {
       PushDownCondition(partial_cond, expr->left,
-                        /*is_join_condition_for_expr=*/false, parameter_tables,
-                        table_filters, trace);
+                        /*is_join_condition_for_expr=*/false,
+                        table_num_to_companion_set, table_filters,
+                        cycle_inducing_edges, /*remaining_parts=*/nullptr,
+                        trace);
     }
   }
 
   // Then the right side, if it's allowed.
-  if (can_push_into_right) {
+  if (can_push_into_right &&
+      Overlaps(used_tables, expr->right->tables_in_subtree)) {
     Item *partial_cond = make_cond_for_table(
         current_thd, cond, expr->right->tables_in_subtree, /*used_table=*/0,
         /*exclude_expensive_cond=*/true);
     if (partial_cond != nullptr) {
       PushDownCondition(partial_cond, expr->right,
-                        /*is_join_condition_for_expr=*/false, parameter_tables,
-                        table_filters, trace);
+                        /*is_join_condition_for_expr=*/false,
+                        table_num_to_companion_set, table_filters,
+                        cycle_inducing_edges, /*remaining_parts=*/nullptr,
+                        trace);
     }
   }
 
-  // Push join conditions further down each side to see if they are sargable
-  // (see the function comment).
-  if (can_push_into_left) {
-    table_map left_tables = cond->used_tables() & expr->left->tables_in_subtree;
-    if (left_tables == 0) {
-      // Degenerate condition, so add everything just to be safe.
-      left_tables = expr->left->tables_in_subtree;
-    }
-    PushDownCondition(cond, expr->left,
-                      /*is_join_condition_for_expr=*/false,
-                      parameter_tables | left_tables, table_filters, trace);
-  }
-  if (can_push_into_right) {
-    table_map right_tables =
-        cond->used_tables() & expr->right->tables_in_subtree;
-    if (right_tables == 0) {
-      // Degenerate condition, so add everything just to be safe.
-      right_tables = expr->right->tables_in_subtree;
-    }
-    PushDownCondition(cond, expr->right,
-                      /*is_join_condition_for_expr=*/false,
-                      parameter_tables | right_tables, table_filters, trace);
-  }
-
-  if (parameter_tables != 0) {
-    // If this is pushdown for a sargable condition, we need to stop
-    // here, or we'd add extra join conditions. The return value
-    // doesn't matter much.
-    return false;
+  // For multiple equalities, if there are multiple referred-to tables on one
+  // side, then we must keep pushing down; there are still equalities left to
+  // resolve. E.g. if we have equal(t1.x, t2.x, t3.x) and have (t1,t2) on the
+  // left side and t3 on the right, we would pick e.g. t1.x=t3.x for this join,
+  // but need to keep pushing down on the left side to get the t1.x=t2.x
+  // condition further down.
+  //
+  // We can ignore the special case of a multi-equality referring to several
+  // fields in the same table, as ExpandSameTableFromMultipleEquals()
+  // has dealt with those for us.
+  if (IsMultipleEquals(cond)) {
+    table_map left_tables = cond->used_tables() & expr->left->tables_in_subtree;
+    table_map right_tables =
+        cond->used_tables() & expr->right->tables_in_subtree;
+    if (my_count_bits(left_tables) >= 2 && can_push_into_left) {
+      PushDownCondition(cond, expr->left,
+                        /*is_join_condition_for_expr=*/false,
+                        table_num_to_companion_set, table_filters,
+                        cycle_inducing_edges, remaining_parts, trace);
+    }
+    if (my_count_bits(right_tables) >= 2 && can_push_into_right) {
+      PushDownCondition(cond, expr->right,
+                        /*is_join_condition_for_expr=*/false,
+                        table_num_to_companion_set, table_filters,
+                        cycle_inducing_edges, remaining_parts, trace);
+    }
   }
 
   // Now that any partial pushdown has been done, see if we can promote
   // the original filter to a join condition.
   if (is_join_condition_for_expr) {
     // We were already a join condition on this join, so there's nothing to do.
-    return true;
+    // (We leave any multiple equalities for LateConcretizeMultipleEqualities();
+    // see comments there. We should also not push them further, unlike WHERE
+    // conditions that induce inner joins.)
+    if (remaining_parts != nullptr) {
+      remaining_parts->push_back(cond);
+    }
+    return;
   }
 
   // We cannot promote filters to join conditions for outer joins
@@ -776,9 +1553,18 @@
       expr->type == RelationalExpression::ANTIJOIN) {
     // See if we can promote it by rewriting; if not, it has to be left
     // as a filter.
-    return !AddJoinConditionPossiblyWithRewrite(
-        expr, cond, AssociativeRewritesAllowed::ANY,
-        /*used_commutativity=*/false, trace);
+    bool need_flatten = false;
+    if (!AddJoinConditionPossiblyWithRewrite(
+            expr, cond, AssociativeRewritesAllowed::ANY,
+            /*used_commutativity=*/false, &need_flatten, trace)) {
+      if (remaining_parts != nullptr) {
+        remaining_parts->push_back(cond);
+      }
+    }
+    if (need_flatten) {
+      FlattenInnerJoins(expr);
+    }
+    return;
   }
 
   // Promote the filter to a join condition on this join.
@@ -791,24 +1577,128 @@
     // are not really WHERE conditions, and must not be handled as such
     // (they cannot be moved to being conditions on inner joins).
     // See the comment about pushability of these above.
+    // (Any multiple equalities should be simplified in
+    // LateConcretizeMultipleEqualities(), but not pushed further,
+    // unlike WHERE conditions that induce inner joins.)
     expr->join_conditions.push_back(cond);
-    return false;
+    return;
   }
 
+  bool need_flatten = false;
   if (!AddJoinConditionPossiblyWithRewrite(
           expr, cond, AssociativeRewritesAllowed::ANY,
-          /*used_commutativity=*/false, trace)) {
-    // Rewrite failed, so give up and push it where we originally intended.
+          /*used_commutativity=*/false, &need_flatten, trace)) {
+    if (expr->type == RelationalExpression::INNER_JOIN &&
+        IsCandidateForCycle(expr, cond, table_num_to_companion_set)) {
+      // We couldn't push the condition to this join without broadening its
+      // hyperedge, but we could add a simple edge (or multiple simple edges,
+      // in the case of multiple equalities -- we defer the meshing of those
+      // to later) to create a cycle, so we'll take it out now and then add such
+      // an edge in AddCycleEdges().
+      if (IsMultipleEquals(cond)) {
+        // Some of these may induce cycles and some may not.
+        // We need to split and push them separately.
+        if (trace != nullptr) {
+          *trace += StringPrintf(
+              "- condition %s may induce hypergraph cycles, splitting\n",
+              ItemToString(cond).c_str());
+        }
+        Mem_root_array<Item *> possible_cycle_edges(current_thd->mem_root);
+        FullyConcretizeMultipleEquals(down_cast<Item_equal *>(cond),
+                                      expr->tables_in_subtree,
+                                      &possible_cycle_edges);
+        for (Item *sub_cond : possible_cycle_edges) {
+          PushDownCondition(sub_cond, expr,
+                            /*is_join_condition_for_expr=*/false,
+                            table_num_to_companion_set, table_filters,
+                            cycle_inducing_edges, remaining_parts, trace);
+        }
+      } else {
+        if (trace != nullptr) {
+          *trace += StringPrintf("- condition %s induces a hypergraph cycle\n",
+                                 ItemToString(cond).c_str());
+        }
+        cycle_inducing_edges->push_back(
+            CanonicalizeCondition(cond, expr->tables_in_subtree));
+      }
+      if (need_flatten) {
+        FlattenInnerJoins(expr);
+      }
+      return;
+    }
     if (trace != nullptr) {
       *trace += StringPrintf(
           "- condition %s makes join reference more relations, "
           "but could not do anything about it\n",
           ItemToString(cond).c_str());
     }
-    expr->join_conditions.push_back(cond);
+
+    if (IsMultipleEquals(cond) && !MultipleEqualityAlreadyExistsOnJoin(
+                                      down_cast<Item_equal *>(cond), *expr)) {
+      expr->join_conditions.push_back(
+          ConcretizeMultipleEquals(down_cast<Item_equal *>(cond), *expr));
+    } else {
+      expr->join_conditions.push_back(cond);
+    }
   }
+  if (need_flatten) {
+    FlattenInnerJoins(expr);
+  }
+}
 
-  return false;
+/**
+  Try to push down conditions (like PushDownCondition()), but with the intent
+  of pushing join conditions down to sargable conditions on tables.
+
+  Equijoin conditions can often be pushed down into indexes; e.g. t1.x = t2.x
+  could be pushed down into an index on t1.x. When we have pushed such a
+  condition all the way down onto the t1/t2 join, we are ostensibly done
+  with regular push (in PushDownCondition()), but here, we would push down the
+  condition onto both sides if possible. (E.g.: If the join was a left join, we
+  could push it down to t2, but not to t1.) When we hit a table in such a push,
+  we store the conditions in “join_conditions_pushable_to_this“ for the table
+  to signal that it should be investigated when we consider the table during
+  join optimization.
+ */
+void PushDownToSargableCondition(Item *cond, RelationalExpression *expr,
+                                 bool is_join_condition_for_expr) {
+  if (expr->type == RelationalExpression::TABLE) {
+    // We don't try to make sargable join predicates out of subqueries;
+    // it is quite marginal, and our machinery for dealing with materializing
+    // subqueries is not ready for it.
+    if (cond->has_subquery()) {
+      return;
+    }
+    expr->join_conditions_pushable_to_this.push_back(cond);
+    return;
+  }
+
+  assert(
+      !Overlaps(expr->left->tables_in_subtree, expr->right->tables_in_subtree));
+
+  const table_map used_tables =
+      cond->used_tables() & (expr->tables_in_subtree | RAND_TABLE_BIT);
+
+  // See PushDownCondition() for explanation of can_push_into_{left,right}.
+  const bool can_push_into_left =
+      (IsInnerJoin(expr->type) ||
+       expr->type == RelationalExpression::SEMIJOIN ||
+       !is_join_condition_for_expr);
+  const bool can_push_into_right =
+      (IsInnerJoin(expr->type) ||
+       expr->type == RelationalExpression::SEMIJOIN ||
+       is_join_condition_for_expr);
+
+  if (can_push_into_left &&
+      !IsSubset(used_tables, expr->right->tables_in_subtree)) {
+    PushDownToSargableCondition(cond, expr->left,
+                                /*is_join_condition_for_expr=*/false);
+  }
+  if (can_push_into_right &&
+      !IsSubset(used_tables, expr->left->tables_in_subtree)) {
+    PushDownToSargableCondition(cond, expr->right,
+                                /*is_join_condition_for_expr=*/false);
+  }
 }
 
 /**
@@ -824,8 +1714,10 @@
  */
 Mem_root_array<Item *> PushDownAsMuchAsPossible(
     THD *thd, Mem_root_array<Item *> conditions, RelationalExpression *expr,
-    bool is_join_condition_for_expr, Mem_root_array<Item *> *table_filters,
-    string *trace) {
+    bool is_join_condition_for_expr,
+    const int table_num_to_companion_set[MAX_TABLES],
+    Mem_root_array<Item *> *table_filters,
+    Mem_root_array<Item *> *cycle_inducing_edges, string *trace) {
   Mem_root_array<Item *> remaining_parts(thd->mem_root);
   for (Item *item : conditions) {
     if (IsSingleBitSet(item->used_tables() & ~PSEUDO_TABLE_BITS)) {
@@ -833,12 +1725,16 @@
       // as we handle them separately in FoundSingleNode() and
       // FoundSubgraphPair().
       remaining_parts.push_back(item);
+    } else if (is_join_condition_for_expr &&
+               !IsSubset(item->used_tables() & ~PSEUDO_TABLE_BITS,
+                         expr->tables_in_subtree)) {
+      // Condition refers to tables outside this subtree, so it can not be
+      // pushed (this can only happen with semijoins).
+      remaining_parts.push_back(item);
     } else {
-      if (PushDownCondition(item, expr, is_join_condition_for_expr,
-                            /*parameter_tables=*/0, table_filters, trace)) {
-        // Pushdown failed.
-        remaining_parts.push_back(item);
-      }
+      PushDownCondition(item, expr, is_join_condition_for_expr,
+                        table_num_to_companion_set, table_filters,
+                        cycle_inducing_edges, &remaining_parts, trace);
     }
   }
 
@@ -866,7 +1762,9 @@
   join condition down again.
  */
 void PushDownJoinConditions(THD *thd, RelationalExpression *expr,
+                            const int table_num_to_companion_set[MAX_TABLES],
                             Mem_root_array<Item *> *table_filters,
+                            Mem_root_array<Item *> *cycle_inducing_edges,
                             string *trace) {
   if (expr->type == RelationalExpression::TABLE) {
     return;
@@ -876,10 +1774,208 @@
   if (!expr->join_conditions.empty()) {
     expr->join_conditions = PushDownAsMuchAsPossible(
         thd, std::move(expr->join_conditions), expr,
-        /*is_join_condition_for_expr=*/true, table_filters, trace);
+        /*is_join_condition_for_expr=*/true, table_num_to_companion_set,
+        table_filters, cycle_inducing_edges, trace);
+  }
+  if (expr->type == RelationalExpression::MULTI_INNER_JOIN) {
+    for (RelationalExpression *child : expr->multi_children) {
+      PushDownJoinConditions(thd, child, table_num_to_companion_set,
+                             table_filters, cycle_inducing_edges, trace);
+    }
+  } else {
+    PushDownJoinConditions(thd, expr->left, table_num_to_companion_set,
+                           table_filters, cycle_inducing_edges, trace);
+    PushDownJoinConditions(thd, expr->right, table_num_to_companion_set,
+                           table_filters, cycle_inducing_edges, trace);
+  }
+}
+
+/**
+  Similar to PushDownJoinConditions(), but for push of sargable conditions
+  (see PushDownJoinConditionsForSargable()). The reason this is a separate
+  function, is that we want to run sargable push after all join conditions
+  have been finalized; in particular, that multiple equalities have been
+  concretized into single equalities. (We don't recognize multi-equalities
+  as sargable predicates in their multi-form, since they could be matching
+  multiple targets and generally are more complicated. It is much simpler
+  to wait until they are concretized.)
+ */
+void PushDownJoinConditionsForSargable(THD *thd, RelationalExpression *expr) {
+  if (expr->type == RelationalExpression::TABLE) {
+    return;
+  }
+  assert(expr->equijoin_conditions
+             .empty());  // MakeHashJoinConditions() has not run yet.
+  for (Item *item : expr->join_conditions) {
+    // These are the same conditions as PushDownAsMuchAsPossible();
+    // not filters (which shouldn't be here anyway), and not tables
+    // outside the subtree.
+    if (!IsSingleBitSet(item->used_tables() & ~PSEUDO_TABLE_BITS) &&
+        IsSubset(item->used_tables() & ~PSEUDO_TABLE_BITS,
+                 expr->tables_in_subtree)) {
+      PushDownToSargableCondition(item, expr,
+                                  /*is_join_condition_for_expr=*/true);
+    }
+  }
+  PushDownJoinConditionsForSargable(thd, expr->left);
+  PushDownJoinConditionsForSargable(thd, expr->right);
+}
+
+/**
+  Do a final pass of unexpanded (and non-degenerate) multiple equalities on join
+  conditions, deciding on what equalities to concretize them into right before
+  pushing join conditions to sargable predicates. The reason for doing it after
+  all other pushing is that we want to make sure not to expand the hyperedges
+  any more than necessary, and we don't know what “necessary� is before
+  everything else is pushed.
+
+  This is only relevant for antijoins and semijoins; inner joins (and partially
+  left joins) get concretized as we push, since they can resolve such conflicts
+  by associative rewrites and/or creating cycles in the graph. Normally,
+  we probably wouldn't worry about such a narrow case, but there are specific
+  benchmark queries that happen to exhibit this problem.
+
+  There may still be remaining ones afterwards, such as those that are
+  degenerate or within more complex expressions; CanonicalizeJoinConditions()
+  will deal with them.
+ */
+void LateConcretizeMultipleEqualities(THD *thd, RelationalExpression *expr) {
+  if (expr->type == RelationalExpression::TABLE) {
+    return;
+  }
+  assert(expr->equijoin_conditions
+             .empty());  // MakeHashJoinConditions() has not run yet.
+
+  for (Item *&item : expr->join_conditions) {
+    if (IsMultipleEquals(item) &&
+        Overlaps(item->used_tables(), expr->left->tables_in_subtree) &&
+        Overlaps(item->used_tables(), expr->right->tables_in_subtree)) {
+      item = ConcretizeMultipleEquals(down_cast<Item_equal *>(item), *expr);
+    }
+  }
+  LateConcretizeMultipleEqualities(thd, expr->left);
+  LateConcretizeMultipleEqualities(thd, expr->right);
+}
+
+// Find tables that are guaranteed to either return zero or only NULL rows.
+table_map FindNullGuaranteedTables(const RelationalExpression *expr) {
+  if (expr->type == RelationalExpression::TABLE) {
+    return 0;
+  }
+  if (expr->join_conditions_reject_all_rows) {
+    switch (expr->type) {
+      case RelationalExpression::INNER_JOIN:
+      case RelationalExpression::STRAIGHT_INNER_JOIN:
+      case RelationalExpression::FULL_OUTER_JOIN:
+      case RelationalExpression::SEMIJOIN:
+        return expr->tables_in_subtree;
+      case RelationalExpression::LEFT_JOIN:
+        return expr->right->tables_in_subtree;
+      case RelationalExpression::ANTIJOIN:
+        return FindNullGuaranteedTables(expr->left);
+      case RelationalExpression::TABLE:
+      case RelationalExpression::MULTI_INNER_JOIN:
+        assert(false);
+    }
+  }
+  return FindNullGuaranteedTables(expr->left) |
+         FindNullGuaranteedTables(expr->right);
+}
+
+// For joins where we earlier found that the join conditions would reject
+// all rows, clear the equijoins (which we know is safe from side effects).
+// Also propagate this property up the tree wherever we have other equijoins
+// referring to the now-pruned tables.
+void ClearImpossibleJoinConditions(RelationalExpression *expr) {
+  if (expr->type == RelationalExpression::TABLE) {
+    return;
+  }
+
+  // Go through the equijoin conditions and check that all of them still
+  // refer to tables that exist. If some table was pruned away, but the
+  // equijoin condition still refers to it, it could become degenerate:
+  // The only rows it could ever see would be NULL-complemented rows,
+  // which would never match. In this case, we can remove the entire build path
+  // and propagate the zero-row property to our own join. This matches what we
+  // do in CreateHashJoinAccessPath() in the old executor; see the code there
+  // for some more comments.
+  if (!expr->join_conditions_reject_all_rows) {
+    const table_map pruned_tables = FindNullGuaranteedTables(expr);
+    for (Item *item : expr->equijoin_conditions) {
+      if (Overlaps(item->used_tables(), pruned_tables)) {
+        expr->join_conditions_reject_all_rows = true;
+        break;
+      }
+    }
+  }
+  if (expr->join_conditions_reject_all_rows) {
+    expr->equijoin_conditions.clear();
+  }
+  ClearImpossibleJoinConditions(expr->left);
+  ClearImpossibleJoinConditions(expr->right);
+}
+
+/**
+  Find out whether we should create mesh edges (all-to-all) for this multiple
+  equality. Currently, we only support full mesh, ie., those where all tables
+  involved in the multi-equality are part of the same companion set. One could
+  imagine a multi-equality where not all tables are possible to mesh, e.g.
+  {t1,t2,t3,t4} where {t1,t2,t3} are on the left side of an outer join and t4 is
+  on the right side (and thus not part of the same companion set); if so, we
+  could have created a mesh of the three first ones, but we don't currently.
+ */
+bool ShouldCompleteMeshForCondition(
+    Item_equal *item_equal, const int table_num_to_companion_set[MAX_TABLES]) {
+  if (CompanionSetUsedByCondition(item_equal->used_tables(),
+                                  table_num_to_companion_set) == -1) {
+    return false;
+  }
+  if (item_equal->get_const() != nullptr) {
+    return false;
+  }
+  return true;
+}
+
+// Extract multiple equalities that we should create mesh edges for.
+// See ShouldCompleteMeshForCondition().
+void ExtractCycleMultipleEqualities(
+    const Mem_root_array<Item *> &conditions,
+    const int table_num_to_companion_set[MAX_TABLES],
+    Mem_root_array<Item_equal *> *multiple_equalities) {
+  for (Item *item : conditions) {
+    assert(!IsMultipleEquals(item));  // Should have been canonicalized earlier.
+    if (item->type() == Item::FUNC_ITEM &&
+        down_cast<Item_func *>(item)->functype() == Item_func::EQ_FUNC) {
+      Item_func_eq *eq_item = down_cast<Item_func_eq *>(item);
+      if (eq_item->source_multiple_equality != nullptr &&
+          ShouldCompleteMeshForCondition(eq_item->source_multiple_equality,
+                                         table_num_to_companion_set)) {
+        multiple_equalities->push_back(eq_item->source_multiple_equality);
+      }
+    }
+  }
+}
+
+// Extract multiple equalities that we should create mesh edges for.
+// See ShouldCompleteMeshForCondition().
+void ExtractCycleMultipleEqualitiesFromJoinConditions(
+    const RelationalExpression *expr,
+    const int table_num_to_companion_set[MAX_TABLES],
+    Mem_root_array<Item_equal *> *multiple_equalities) {
+  if (expr->type == RelationalExpression::TABLE) {
+    return;
+  }
+  for (Item_func_eq *eq_item : expr->equijoin_conditions) {
+    if (eq_item->source_multiple_equality != nullptr &&
+        ShouldCompleteMeshForCondition(eq_item->source_multiple_equality,
+                                       table_num_to_companion_set)) {
+      multiple_equalities->push_back(eq_item->source_multiple_equality);
+    }
   }
-  PushDownJoinConditions(thd, expr->left, table_filters, trace);
-  PushDownJoinConditions(thd, expr->right, table_filters, trace);
+  ExtractCycleMultipleEqualitiesFromJoinConditions(
+      expr->left, table_num_to_companion_set, multiple_equalities);
+  ExtractCycleMultipleEqualitiesFromJoinConditions(
+      expr->right, table_num_to_companion_set, multiple_equalities);
 }
 
 /**
@@ -895,18 +1991,32 @@
   }
   assert(expr->equijoin_conditions
              .empty());  // MakeHashJoinConditions() has not run yet.
-  for (Item *&condition : expr->join_conditions) {
-    condition->walk(&Item::cast_incompatible_args, enum_walk::POSTFIX, nullptr);
+  if (CanonicalizeConditions(thd, expr->tables_in_subtree,
+                             &expr->join_conditions)) {
+    return true;
+  }
 
-    cache_const_expr_arg cache_arg;
-    cache_const_expr_arg *analyzer_arg = &cache_arg;
-    condition = condition->compile(
-        &Item::cache_const_expr_analyzer, pointer_cast<uchar **>(&analyzer_arg),
-        &Item::cache_const_expr_transformer, pointer_cast<uchar *>(&cache_arg));
-    if (condition == nullptr) {
-      return true;
+  // Find out if any of the conditions are plain “false�.
+  // Note that we don't actually try to remove any of the other conditions
+  // if so (although they may have been optimized away earlier);
+  // Cartesian products make for very restrictive join edges, so it's actually
+  // more flexible to leave them be, until after the hypergraph construction
+  // (in ClearImpossibleJoinConditions(), where we also propagate this
+  // property up the tree).
+  for (Item *cond : expr->join_conditions) {
+    if (cond->has_subquery() || cond->is_expensive()) {
+      continue;
+    }
+    if (cond->const_for_execution() && cond->val_int() == 0) {
+      expr->join_conditions_reject_all_rows = true;
+      break;
     }
   }
+  if (thd->is_error()) {
+    // val_int() above failed.
+    return true;
+  }
+
   return CanonicalizeJoinConditions(thd, expr->left) ||
          CanonicalizeJoinConditions(thd, expr->right);
 }
@@ -976,13 +2086,33 @@
 }
 
 /**
-  Convert multi-equalities to simple equalities. This is a hack until we get
-  real handling of multi-equalities (in which case it would be done much later,
-  after the join order has been determined); however, note that
-  remove_eq_conds() also does some constant conversion/folding work that is
-  important for correctness in general.
+  Run simple CSE on all conditions (see CommonSubexpressionElimination()).
+ */
+void CSEConditions(THD *thd, Mem_root_array<Item *> *conditions) {
+  bool need_resplit = false;
+  for (Item *&item : *conditions) {
+    Item *new_item = CommonSubexpressionElimination(item);
+    if (new_item != item) {
+      need_resplit = true;
+      item = new_item;
+    }
+  }
+  if (need_resplit) {
+    Mem_root_array<Item *> new_join_conditions(thd->mem_root);
+    for (Item *condition : *conditions) {
+      ExtractConditions(condition, &new_join_conditions);
+    }
+    *conditions = std::move(new_join_conditions);
+  }
+}
+
+/**
+  Do some constant conversion/folding work needed for correctness.
+  We also move more expensive functions last in the conjunction,
+  as a heuristic so that they are less likely to be evaluated.
  */
-bool ConcretizeMultipleEquals(THD *thd, Mem_root_array<Item *> *conditions) {
+bool EarlyNormalizeConditions(THD *thd, Mem_root_array<Item *> *conditions) {
+  CSEConditions(thd, conditions);
   for (auto it = conditions->begin(); it != conditions->end();) {
     Item::cond_result res;
     if (remove_eq_conds(thd, *it, &*it, &res)) {
@@ -999,26 +2129,15 @@
       ++it;
     }
   }
-  return false;
-}
 
-/**
-  Convert all multi-equalities in join conditions under “expr� into simple
-  equalities. See ConcretizeMultipleEquals() for more information.
- */
-bool ConcretizeAllMultipleEquals(THD *thd, RelationalExpression *expr,
-                                 Mem_root_array<Item *> *where_conditions,
-                                 string *trace) {
-  if (expr->type == RelationalExpression::TABLE) {
-    return false;
-  }
-  assert(expr->equijoin_conditions
-             .empty());  // MakeHashJoinConditions() has not run yet.
-  if (ConcretizeMultipleEquals(thd, &expr->join_conditions)) {
-    return true;
-  }
-  PushDownJoinConditions(thd, expr->left, where_conditions, trace);
-  PushDownJoinConditions(thd, expr->right, where_conditions, trace);
+  // Put potentially expensive functions last: First everything normal,
+  // then subqueries (which can be expensive), then stored procedures
+  // (which are unknown, so potentially _very_ expensive).
+  std::stable_partition(conditions->begin(), conditions->end(),
+                        [](Item *item) { return !item->has_subquery(); });
+  std::stable_partition(conditions->begin(), conditions->end(),
+                        [](Item *item) { return !item->is_expensive(); });
+
   return false;
 }
 
@@ -1062,7 +2181,7 @@
   NOTE: This returns a table_map, which is later converted to a NodeMap.
  */
 table_map FindTESForCondition(table_map used_tables,
-                              RelationalExpression *expr) {
+                              const RelationalExpression *expr) {
   if (expr->type == RelationalExpression::TABLE) {
     // We're at the bottom of an inner join stack; nothing to see here.
     // (We could just as well return 0, but this at least makes sure the
@@ -1174,14 +2293,19 @@
       label += "}]";
     }
 
+    // Draw inner joins as undirected; it is less confusing.
+    // When we get full outer joins, maybe we should have double arrows here?
+    const char *arrowhead_str =
+        expr->type == RelationalExpression::INNER_JOIN ? ",arrowhead=none" : "";
+
     // Output the edge.
     if (IsSingleBitSet(e.left) && IsSingleBitSet(e.right)) {
       // Simple edge.
       int left_node = FindLowestBitSet(e.left);
       int right_node = FindLowestBitSet(e.right);
-      digraph += StringPrintf("  %s -> %s [label=\"%s\"]\n",
-                              aliases[left_node].c_str(),
-                              aliases[right_node].c_str(), label.c_str());
+      digraph += StringPrintf(
+          "  %s -> %s [label=\"%s\"%s]\n", aliases[left_node].c_str(),
+          aliases[right_node].c_str(), label.c_str(), arrowhead_str);
     } else {
       // Hyperedge; draw it as a tiny “virtual node�.
       digraph += StringPrintf(
@@ -1206,9 +2330,9 @@
 
       // Right side of the edge.
       for (int right_node : BitsSetIn(e.right)) {
-        digraph +=
-            StringPrintf("  e%zu -> %s [label=\"%s\"]\n", edge_idx,
-                         aliases[right_node].c_str(), right_label.c_str());
+        digraph += StringPrintf("  e%zu -> %s [label=\"%s\"%s]\n", edge_idx,
+                                aliases[right_node].c_str(),
+                                right_label.c_str(), arrowhead_str);
         right_label = "";
       }
     }
@@ -1455,6 +2579,230 @@
   return ret;
 }
 
+/**
+  Add the given predicate to the list of WHERE predicates, doing some
+  bookkeeping that such predicates need.
+ */
+int AddPredicate(THD *thd, Item *condition, bool was_join_condition,
+                 int source_multiple_equality_idx,
+                 const RelationalExpression *root, JoinHypergraph *graph,
+                 string *trace) {
+  if (source_multiple_equality_idx != -1) {
+    assert(was_join_condition);
+  }
+
+  Predicate pred;
+  pred.condition = condition;
+
+  table_map used_tables =
+      condition->used_tables() & ~(INNER_TABLE_BIT | OUTER_REF_TABLE_BIT);
+  pred.used_nodes =
+      GetNodeMapFromTableMap(used_tables, graph->table_num_to_node_num);
+
+  table_map total_eligibility_set;
+  if (was_join_condition) {
+    total_eligibility_set = used_tables;
+  } else {
+    total_eligibility_set = FindTESForCondition(used_tables, root) &
+                            ~(INNER_TABLE_BIT | OUTER_REF_TABLE_BIT);
+  }
+  pred.total_eligibility_set = GetNodeMapFromTableMap(
+      total_eligibility_set, graph->table_num_to_node_num);
+  pred.selectivity = EstimateSelectivity(thd, condition, trace);
+  pred.was_join_condition = was_join_condition;
+  pred.source_multiple_equality_idx = source_multiple_equality_idx;
+  pred.functional_dependencies_idx.init(thd->mem_root);
+  graph->predicates.push_back(std::move(pred));
+
+  if (trace != nullptr) {
+    *trace += StringPrintf("Total eligibility set for %s: {",
+                           ItemToString(condition).c_str());
+    bool first = true;
+    for (TABLE_LIST *tl = graph->query_block()->leaf_tables; tl != nullptr;
+         tl = tl->next_leaf) {
+      if (tl->map() & total_eligibility_set) {
+        if (!first) *trace += ',';
+        *trace += tl->alias;
+        first = false;
+      }
+    }
+    *trace += "}\n";
+  }
+
+  return graph->predicates.size() - 1;
+}
+
+/**
+  Return whether we can find a path from “source� to “destination�, without
+  using forbidden_edge_idx.
+ */
+bool AreNodesConnected(const Hypergraph &graph, int source, int destination,
+                       int forbidden_edge_idx, NodeMap *seen_nodes) {
+  if (source == destination) {
+    return true;
+  }
+  if (Overlaps(*seen_nodes, TableBitmap(source))) {
+    // We've been here before and not found anything, so drop out.
+    // This also keeps us from getting stuck in other cycles.
+    return false;
+  }
+  *seen_nodes |= TableBitmap(source);
+  for (int edge_idx : graph.nodes[source].simple_edges) {
+    if (edge_idx != forbidden_edge_idx) {
+      if (AreNodesConnected(graph,
+                            *BitsSetIn(graph.edges[edge_idx].right).begin(),
+                            destination, forbidden_edge_idx, seen_nodes)) {
+        return true;
+      }
+    }
+  }
+  for (int edge_idx : graph.nodes[source].complex_edges) {
+    if (edge_idx != forbidden_edge_idx) {
+      for (int middle : BitsSetIn(graph.edges[edge_idx].right)) {
+        if (AreNodesConnected(graph, middle, destination, forbidden_edge_idx,
+                              seen_nodes)) {
+          return true;
+        }
+      }
+    }
+  }
+  return false;
+}
+
+/**
+  Returns whether the given edge is part of a graph cycle; if so, its join
+  condition might not actually get evaluated as part of the regular structure,
+  and we need to take special precautions (make backup WHERE conditions for
+  them).
+
+  Edges that are _not_ part of a cycle are called “bridges� in graph theory.
+  There are efficient algorithms for finding all bridges in a graph (see e.g.
+  Schmidt: “A Simple Test on 2-Vertex- and 2-Edge-Connectivity�), but our graph
+  is small, so we opt for simplicity by simply doing a depth-first search for
+  all edges. We only need to consider the part of the subgraph given by inner
+  joins (the companion set) -- but we cannot ignore hyperedges, since we
+  determine companion sets before we know all the join predicates.
+ */
+bool IsPartOfCycle(const JoinHypergraph *graph, int edge_idx) {
+  const RelationalExpression *expr = graph->edges[edge_idx / 2].expr;
+  if (expr->type != RelationalExpression::INNER_JOIN) {
+    // Outer joins are always a bridge; we also ignore straight joins
+    // (they are a sign the user doesn't want a different ordering anyway).
+    return false;
+  }
+
+  const Hyperedge &edge = graph->graph.edges[edge_idx];
+
+  // If we can find a path from one end of an edge to the other,
+  // ignoring this specific edge, then we have a cycle (pretty much
+  // by definition).
+  for (int left_idx : BitsSetIn(edge.left)) {
+    for (int right_idx : BitsSetIn(edge.right)) {
+      NodeMap seen_nodes = 0;
+      if (AreNodesConnected(graph->graph, left_idx, right_idx, edge_idx,
+                            &seen_nodes)) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
+/**
+  For each of the given join conditions, add a cycle-inducing edge to the
+  hypergraph.
+ */
+void AddCycleEdges(THD *thd, const Mem_root_array<Item *> &cycle_inducing_edges,
+                   JoinHypergraph *graph, string *trace) {
+  for (Item *cond : cycle_inducing_edges) {
+    const NodeMap used_nodes = GetNodeMapFromTableMap(
+        cond->used_tables(), graph->table_num_to_node_num);
+    const NodeMap left = IsolateLowestBit(used_nodes);  // Arbitrary.
+    const NodeMap right = used_nodes & ~left;
+    graph->graph.AddEdge(left, right);
+
+    RelationalExpression *expr = new (thd->mem_root) RelationalExpression(thd);
+    expr->type = RelationalExpression::INNER_JOIN;
+    if (cond->type() == Item::FUNC_ITEM &&
+        down_cast<Item_func *>(cond)->functype() == Item_func::EQ_FUNC) {
+      expr->equijoin_conditions.push_back(down_cast<Item_func_eq *>(cond));
+    } else {
+      expr->join_conditions.push_back(cond);
+    }
+
+    // TODO(sgunders): This does not really make much sense, but
+    // estimated_bytes_per_row doesn't make that much sense to begin with; it
+    // will depend on the join order. See if we can replace it with a per-table
+    // width calculation that we can sum up in the join optimizer.
+    expr->tables_in_subtree = cond->used_tables();
+    expr->nodes_in_subtree = GetNodeMapFromTableMap(
+        cond->used_tables() & ~PSEUDO_TABLE_BITS, graph->table_num_to_node_num);
+    double selectivity = EstimateSelectivity(thd, cond, trace);
+    const size_t estimated_bytes_per_row = EstimateRowWidth(*graph, expr);
+    graph->edges.push_back(JoinPredicate{
+        expr, selectivity, estimated_bytes_per_row,
+        /*functional_dependencies=*/0, /*functional_dependencies_idx=*/{}});
+
+    // Make this predicate potentially sargable (cycle edges are always
+    // simple equalities).
+    assert(IsSingleBitSet(left));
+    assert(IsSingleBitSet(right));
+    const int left_node_idx = *BitsSetIn(left).begin();
+    const int right_node_idx = *BitsSetIn(right).begin();
+    graph->nodes[left_node_idx].join_conditions_pushable_to_this.push_back(
+        cond);
+    graph->nodes[right_node_idx].join_conditions_pushable_to_this.push_back(
+        cond);
+  }
+}
+
+/**
+  Promote join predicates that became part of (newly-formed) cycles to
+  WHERE predicates.
+
+  The reason for this is that when we have cycles in the graph, we can no
+  longer guarantee that all join predicates will be seen; e.g. if we have a
+  cycle A - B - C - A, and choose to complete the join by using the A-B and
+  C-A edges, we would miss the B-C join predicate. Thus, we promote all join
+  edges involved in cycles to WHERE predicates; however, we mark them as coming
+  from a join condition, and we also note in the join edge what the indexes of
+  the added predicate are. Thus, for A-B and C-A in the given example, we would
+  ignore the corresponding WHERE predicates so they do not get double-applied.
+
+  We need to mark which predicates came from which multiple equalities,
+  so that they are not added when they are redundant; see the comment on top of
+  CostingReceiver::ApplyDelayedPredicatesAfterJoin().
+
+  Note that join predicates may actually get added as predicates a second
+  time, if they are found to be sargable. However, in that case they are not
+  counted as WHERE predicates (they are never automatically applied), so this
+  is a separate use.
+ */
+void PromoteCycleJoinPredicates(
+    THD *thd, const RelationalExpression *root,
+    const Mem_root_array<Item_equal *> &multiple_equalities,
+    JoinHypergraph *graph, string *trace) {
+  for (size_t edge_idx = 0; edge_idx < graph->graph.edges.size();
+       edge_idx += 2) {
+    if (!IsPartOfCycle(graph, edge_idx)) {
+      continue;
+    }
+    RelationalExpression *expr = graph->edges[edge_idx / 2].expr;
+    expr->join_predicate_first = graph->predicates.size();
+    for (Item *condition : expr->equijoin_conditions) {
+      AddPredicate(thd, condition, /*was_join_condition=*/true,
+                   FindSourceMultipleEquality(condition, multiple_equalities),
+                   root, graph, trace);
+    }
+    for (Item *condition : expr->join_conditions) {
+      AddPredicate(thd, condition, /*was_join_condition=*/true,
+                   FindSourceMultipleEquality(condition, multiple_equalities),
+                   root, graph, trace);
+    }
+    expr->join_predicate_last = graph->predicates.size();
+  }
+}
+
 }  // namespace
 
 /**
@@ -1524,9 +2872,13 @@
 }
 
 NodeMap GetNodeMapFromTableMap(
-    table_map table_map, const array<int, MAX_TABLES> &table_num_to_node_num) {
+    table_map map, const array<int, MAX_TABLES> &table_num_to_node_num) {
   NodeMap ret = 0;
-  for (int table_num : BitsSetIn(table_map)) {
+  if (Overlaps(map, RAND_TABLE_BIT)) {  // Special case.
+    ret |= RAND_TABLE_BIT;
+    map &= ~RAND_TABLE_BIT;
+  }
+  for (int table_num : BitsSetIn(map)) {
     assert(table_num < int(MAX_TABLES));
     assert(table_num_to_node_num[table_num] != -1);
     ret |= TableBitmap(table_num_to_node_num[table_num]);
@@ -1534,6 +2886,100 @@
   return ret;
 }
 
+void AddMultipleEqualityPredicate(THD *thd, Item_equal *item_equal,
+                                  Item_field *left_field, int left_table_idx,
+                                  Item_field *right_field, int right_table_idx,
+                                  double selectivity, JoinHypergraph *graph) {
+  const int left_node_idx = graph->table_num_to_node_num[left_table_idx];
+  const int right_node_idx = graph->table_num_to_node_num[right_table_idx];
+
+  // See if there is already an edge between these two tables.
+  // Since the tables are in the same companion set, they are not
+  // outerjoined to each other, so it's enough to check the simple
+  // neighborhood.
+  RelationalExpression *expr = nullptr;
+  if (IsSubset(TableBitmap(right_node_idx),
+               graph->graph.nodes[left_node_idx].simple_neighborhood)) {
+    for (int edge_idx : graph->graph.nodes[left_node_idx].simple_edges) {
+      if (graph->graph.edges[edge_idx].right == TableBitmap(right_node_idx)) {
+        expr = graph->edges[edge_idx / 2].expr;
+        if (MultipleEqualityAlreadyExistsOnJoin(item_equal, *expr)) {
+          return;
+        }
+        graph->edges[edge_idx / 2].selectivity *= selectivity;
+        break;
+      }
+    }
+    assert(expr != nullptr);
+  } else {
+    // There was none, so create a new one.
+    graph->graph.AddEdge(TableBitmap(left_node_idx),
+                         TableBitmap(right_node_idx));
+    expr = new (thd->mem_root) RelationalExpression(thd);
+    expr->type = RelationalExpression::INNER_JOIN;
+
+    // TODO(sgunders): This does not really make much sense, but
+    // estimated_bytes_per_row doesn't make that much sense to begin with;
+    // it will depend on the join order. See if we can replace it with a
+    // per-table width calculation that we can sum up in the join
+    // optimizer.
+    expr->tables_in_subtree =
+        TableBitmap(left_table_idx) | TableBitmap(right_table_idx);
+    expr->nodes_in_subtree =
+        TableBitmap(left_node_idx) | TableBitmap(right_node_idx);
+    const size_t estimated_bytes_per_row = EstimateRowWidth(*graph, expr);
+    graph->edges.push_back(JoinPredicate{expr, selectivity,
+                                         estimated_bytes_per_row,
+                                         /*functional_dependencies=*/0,
+                                         /*functional_dependencies_idx=*/{}});
+  }
+
+  Item_func_eq *eq_item = new Item_func_eq(left_field, right_field);
+  eq_item->source_multiple_equality = item_equal;
+  eq_item->set_cmp_func();
+  eq_item->update_used_tables();
+  eq_item->quick_fix_field();
+  expr->equijoin_conditions.push_back(
+      eq_item);  // NOTE: We run after MakeHashJoinConditions().
+
+  // Make this predicate potentially sargable.
+  graph->nodes[left_node_idx].join_conditions_pushable_to_this.push_back(
+      eq_item);
+  graph->nodes[right_node_idx].join_conditions_pushable_to_this.push_back(
+      eq_item);
+}
+
+/**
+  For each relevant multiple equality, add edges so that there are direct
+  connections between all the involved tables (full mesh). The tables must
+  all be in the same companion set (ie., no outer joins in the way).
+
+  Must run after equijoin conditions are extracted. _Should_ be run after
+  trivial conditions have been removed.
+ */
+void CompleteFullMeshForMultipleEqualities(
+    THD *thd, const Mem_root_array<Item_equal *> &multiple_equalities,
+    JoinHypergraph *graph, string *trace) {
+  for (Item_equal *item_equal : multiple_equalities) {
+    double selectivity = EstimateSelectivity(thd, item_equal, trace);
+    for (Item_field &left_field : item_equal->get_fields()) {
+      const int left_table_idx =
+          left_field.field->table->pos_in_table_list->tableno();
+      for (Item_field &right_field : item_equal->get_fields()) {
+        const int right_table_idx =
+            right_field.field->table->pos_in_table_list->tableno();
+        if (right_table_idx <= left_table_idx) {
+          continue;
+        }
+
+        AddMultipleEqualityPredicate(thd, item_equal, &left_field,
+                                     left_table_idx, &right_field,
+                                     right_table_idx, selectivity, graph);
+      }
+    }
+  }
+}
+
 const JOIN *JoinHypergraph::join() const { return m_query_block->join; }
 
 bool MakeJoinHypergraph(THD *thd, string *trace, JoinHypergraph *graph) {
@@ -1551,6 +2997,11 @@
 
   RelationalExpression *root =
       MakeRelationalExpressionFromJoinList(thd, query_block->top_join_list);
+  int num_companion_sets = 0;
+  int table_num_to_companion_set[MAX_TABLES];
+  ComputeCompanionSets(root, /*current_set=*/-1, &num_companion_sets,
+                       table_num_to_companion_set);
+  FlattenInnerJoins(root);
 
   if (trace != nullptr) {
     // TODO(sgunders): Same question as above; perhaps the version after
@@ -1567,10 +3018,9 @@
   }
 
   Mem_root_array<Item *> table_filters(thd->mem_root);
-  if (ConcretizeAllMultipleEquals(thd, root, &table_filters, trace)) {
-    return true;
-  }
-  PushDownJoinConditions(thd, root, &table_filters, trace);
+  Mem_root_array<Item *> cycle_inducing_edges(thd->mem_root);
+  PushDownJoinConditions(thd, root, table_num_to_companion_set, &table_filters,
+                         &cycle_inducing_edges, trace);
 
   // Split up WHERE conditions, and push them down into the tree as much as
   // we can. (They have earlier been hoisted up as far as possible; see
@@ -1580,15 +3030,46 @@
   // them later.
   Mem_root_array<Item *> where_conditions(thd->mem_root);
   if (join->where_cond != nullptr) {
-    ExtractConditions(join->where_cond, &where_conditions);
-    if (ConcretizeMultipleEquals(thd, &where_conditions)) {
+    Item *where_cond = EarlyExpandMultipleEquals(join->where_cond,
+                                                 /*tables_in_subtree=*/~0);
+    ExtractConditions(where_cond, &where_conditions);
+    if (EarlyNormalizeConditions(thd, &where_conditions)) {
       return true;
     }
     where_conditions = PushDownAsMuchAsPossible(
         thd, std::move(where_conditions), root,
-        /*is_join_condition_for_expr=*/false, &table_filters, trace);
+        /*is_join_condition_for_expr=*/false, table_num_to_companion_set,
+        &table_filters, &cycle_inducing_edges, trace);
+
+    // We're done pushing, so unflatten so that the rest of the algorithms
+    // don't need to worry about it.
+    UnflattenInnerJoins(root);
+
+    if (CanonicalizeConditions(thd, /*tables_in_subtree=*/~0,
+                               &where_conditions)) {
+      return true;
+    }
+
+    // See if we can push remaining WHERE conditions to sargable predicates.
+    for (Item *item : where_conditions) {
+      PushDownToSargableCondition(item, root,
+                                  /*is_join_condition_for_expr=*/false);
+    }
+  } else {
+    // We're done pushing, so unflatten so that the rest of the algorithms
+    // don't need to worry about it.
+    UnflattenInnerJoins(root);
   }
 
+  // Now that everything is pushed, we can concretize any multiple equalities
+  // that are left on antijoins and semijoins.
+  LateConcretizeMultipleEqualities(thd, root);
+
+  // Now see if we can push down join conditions to sargable predicates.
+  // We do this after we're done pushing, since pushing can change predicates
+  // (in particular, it can concretize multiple equalities).
+  PushDownJoinConditionsForSargable(thd, root);
+
   if (CanonicalizeJoinConditions(thd, root)) {
     return true;
   }
@@ -1612,6 +3093,37 @@
 #endif
   MakeJoinGraphFromRelationalExpression(thd, root, trace, graph);
 
+  // Now that we have the hypergraph construction done, it no longer hurts
+  // to remove impossible conditions.
+  ClearImpossibleJoinConditions(root);
+
+  // Add cycles.
+  size_t old_graph_edges = graph->graph.edges.size();
+  if (!cycle_inducing_edges.empty()) {
+    AddCycleEdges(thd, cycle_inducing_edges, graph, trace);
+  }
+  // Now that all trivial conditions have been removed and all equijoin
+  // conditions extracted, go ahead and extract all the multiple
+  // equalities that are in actual use, and present as part of the base
+  // conjunctions (ie., not OR-ed with anything).
+  Mem_root_array<Item_equal *> multiple_equalities(thd->mem_root);
+  ExtractCycleMultipleEqualitiesFromJoinConditions(
+      root, table_num_to_companion_set, &multiple_equalities);
+  ExtractCycleMultipleEqualities(where_conditions, table_num_to_companion_set,
+                                 &multiple_equalities);
+  if (multiple_equalities.size() > 64) {
+    multiple_equalities.resize(64);
+  }
+  std::sort(multiple_equalities.begin(), multiple_equalities.end());
+  multiple_equalities.erase(
+      std::unique(multiple_equalities.begin(), multiple_equalities.end()),
+      multiple_equalities.end());
+  CompleteFullMeshForMultipleEqualities(thd, multiple_equalities, graph, trace);
+  if (graph->graph.edges.size() != old_graph_edges) {
+    // We added at least one cycle-inducing edge.
+    PromoteCycleJoinPredicates(thd, root, multiple_equalities, graph, trace);
+  }
+
   if (trace != nullptr) {
     *trace += "\nConstructed hypergraph:\n";
     *trace += PrintDottyHypergraph(*graph);
@@ -1631,43 +3143,17 @@
   // Find TES and selectivity for each WHERE predicate that was not pushed
   // down earlier.
   for (Item *condition : where_conditions) {
-    Predicate pred;
-    pred.condition = condition;
-    table_map total_eligibility_set =
-        FindTESForCondition(condition->used_tables(), root) &
-        ~(INNER_TABLE_BIT | OUTER_REF_TABLE_BIT);
-    pred.total_eligibility_set =
-        GetNodeMapFromTableMap(total_eligibility_set & ~RAND_TABLE_BIT,
-                               graph->table_num_to_node_num) |
-        (total_eligibility_set & RAND_TABLE_BIT);
-    pred.selectivity = EstimateSelectivity(thd, condition, trace);
-    pred.functional_dependencies_idx.init(thd->mem_root);
-    graph->predicates.push_back(std::move(pred));
-
-    if (trace != nullptr) {
-      *trace += StringPrintf("Total eligibility set for %s: {",
-                             ItemToString(condition).c_str());
-      bool first = true;
-      for (TABLE_LIST *tl = query_block->leaf_tables; tl != nullptr;
-           tl = tl->next_leaf) {
-        if (tl->map() & total_eligibility_set) {
-          if (!first) *trace += ',';
-          *trace += tl->alias;
-          first = false;
-        }
-      }
-      *trace += "}\n";
-    }
+    AddPredicate(thd, condition, /*was_join_condition=*/false,
+                 /*source_multiple_equality_idx=*/-1, root, graph, trace);
   }
 
   // Table filters should be applied at the bottom, without extending the TES.
   for (Item *condition : table_filters) {
     Predicate pred;
     pred.condition = condition;
-    pred.total_eligibility_set =
-        GetNodeMapFromTableMap(condition->used_tables() & ~PSEUDO_TABLE_BITS,
-                               graph->table_num_to_node_num) |
-        (condition->used_tables() & RAND_TABLE_BIT);
+    pred.used_nodes = pred.total_eligibility_set = GetNodeMapFromTableMap(
+        condition->used_tables() & ~(INNER_TABLE_BIT | OUTER_REF_TABLE_BIT),
+        graph->table_num_to_node_num);
     assert(IsSingleBitSet(pred.total_eligibility_set));
     pred.selectivity = EstimateSelectivity(thd, condition, trace);
     pred.functional_dependencies_idx.init(thd->mem_root);
@@ -1677,24 +3163,13 @@
   // Cache constant expressions in predicates, and add cast nodes if there are
   // incompatible arguments in comparisons. (We did join conditions earlier.)
   for (Predicate &predicate : graph->predicates) {
-    predicate.condition->walk(&Item::cast_incompatible_args, enum_walk::POSTFIX,
-                              nullptr);
-
-    cache_const_expr_arg cache_arg;
-    cache_const_expr_arg *analyzer_arg = &cache_arg;
-    predicate.condition = predicate.condition->compile(
-        &Item::cache_const_expr_analyzer, pointer_cast<uchar **>(&analyzer_arg),
-        &Item::cache_const_expr_transformer, pointer_cast<uchar *>(&cache_arg));
+    predicate.condition =
+        CanonicalizeCondition(predicate.condition, /*allowed_tables=*/~0);
     if (predicate.condition == nullptr) {
       return true;
     }
   }
 
-  if (graph->predicates.size() > sizeof(table_map) * CHAR_BIT) {
-    my_error(ER_HYPERGRAPH_NOT_SUPPORTED_YET, MYF(0),
-             "more than 64 WHERE/ON predicates");
-    return true;
-  }
   graph->num_where_predicates = graph->predicates.size();
 
   return false;
diff -Nru mysql-8.0-8.0.26/sql/join_optimizer/make_join_hypergraph.h mysql-8.0-8.0.27/sql/join_optimizer/make_join_hypergraph.h
--- mysql-8.0-8.0.26/sql/join_optimizer/make_join_hypergraph.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/join_optimizer/make_join_hypergraph.h	2021-09-28 11:46:34.000000000 +0000
@@ -120,7 +120,7 @@
 
   // A bitmap over predicates that are, or contain, at least one
   // materializable subquery.
-  uint64_t materializable_predicates = 0;
+  OverflowBitset materializable_predicates{0};
 
   // For each sargable join condition, maps into its index in “predicates�.
   // We need the predicate index when applying the join to figure out whether
diff -Nru mysql-8.0-8.0.26/sql/join_optimizer/overflow_bitset.cc mysql-8.0-8.0.27/sql/join_optimizer/overflow_bitset.cc
--- mysql-8.0-8.0.26/sql/join_optimizer/overflow_bitset.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/join_optimizer/overflow_bitset.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,137 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include "sql/join_optimizer/overflow_bitset.h"
+
+#include <stdint.h>
+#include <string.h>
+
+#include "my_alloc.h"
+#include "template_utils.h"
+
+void OverflowBitset::InitOverflow(MEM_ROOT *mem_root, size_t capacity) {
+  size_t num_blocks = (capacity + 63) / 64;
+  m_ext = pointer_cast<Ext *>(
+      mem_root->Alloc(sizeof(Ext) + sizeof(uint64_t) * (num_blocks - 1)));
+  m_ext->m_num_blocks = num_blocks;
+  memset(m_ext->m_bits, 0, sizeof(uint64_t) * num_blocks);
+  assert(!is_inline());
+}
+
+MutableOverflowBitset OverflowBitset::OrOverflow(MEM_ROOT *mem_root,
+                                                 OverflowBitset a,
+                                                 OverflowBitset b) {
+  assert(!a.is_inline());
+  assert(!b.is_inline());
+  assert(a.capacity() == b.capacity());
+  MutableOverflowBitset ret{mem_root, a.capacity()};
+  for (unsigned i = 0; i < a.m_ext->m_num_blocks; ++i) {
+    ret.m_ext->m_bits[i] = a.m_ext->m_bits[i] | b.m_ext->m_bits[i];
+  }
+  return ret;
+}
+
+MutableOverflowBitset OverflowBitset::AndOverflow(MEM_ROOT *mem_root,
+                                                  OverflowBitset a,
+                                                  OverflowBitset b) {
+  assert(!a.is_inline());
+  assert(!b.is_inline());
+  assert(a.capacity() == b.capacity());
+  MutableOverflowBitset ret{mem_root, a.capacity()};
+  for (unsigned i = 0; i < a.m_ext->m_num_blocks; ++i) {
+    ret.m_ext->m_bits[i] = a.m_ext->m_bits[i] & b.m_ext->m_bits[i];
+  }
+  return ret;
+}
+
+MutableOverflowBitset OverflowBitset::XorOverflow(MEM_ROOT *mem_root,
+                                                  OverflowBitset a,
+                                                  OverflowBitset b) {
+  assert(!a.is_inline());
+  assert(!b.is_inline());
+  assert(a.capacity() == b.capacity());
+  MutableOverflowBitset ret{mem_root, a.capacity()};
+  for (unsigned i = 0; i < a.m_ext->m_num_blocks; ++i) {
+    ret.m_ext->m_bits[i] = a.m_ext->m_bits[i] ^ b.m_ext->m_bits[i];
+  }
+  return ret;
+}
+
+void MutableOverflowBitset::SetBitOverflow(int bit_num) {
+  assert(!is_inline());
+  assert(bit_num >= 0);
+  assert(static_cast<size_t>(bit_num) < capacity());
+  m_ext->m_bits[bit_num / 64] |= uint64_t{1} << (bit_num % 64);
+}
+
+void MutableOverflowBitset::ClearBitsOverflow(int begin_bit_num,
+                                              int end_bit_num) {
+  assert(!is_inline());
+  assert(begin_bit_num >= 0);
+  assert(end_bit_num >= 0);
+  assert(begin_bit_num <= end_bit_num);
+  assert(static_cast<size_t>(begin_bit_num) <= capacity());
+  assert(static_cast<size_t>(end_bit_num) <= capacity());
+
+  if (begin_bit_num / 64 == end_bit_num / 64) {
+    // Begin and end are in the same block.
+    m_ext->m_bits[begin_bit_num / 64] &=
+        ~BitsBetween(begin_bit_num % 64, end_bit_num % 64);
+    return;
+  }
+
+  // Schematically, where x is untouched bits and 0 are the bits to clear
+  // (shown here with 8-bit blocks instead of 64 for brevity):
+  //
+  // xxxxx000 [ 00000000 00000000 ... ] 00000xxx
+  if (begin_bit_num % 64 != 0) {
+    m_ext->m_bits[begin_bit_num / 64] &= ~BitsBetween(begin_bit_num % 64, 64);
+    begin_bit_num += 64 - (begin_bit_num % 64);
+  }
+  if (end_bit_num % 64 != 0) {
+    m_ext->m_bits[end_bit_num / 64] &= ~BitsBetween(0, end_bit_num % 64);
+    end_bit_num &= ~63;
+  }
+  for (int block_num = begin_bit_num / 64; block_num < end_bit_num / 64;
+       ++block_num) {
+    m_ext->m_bits[block_num] = 0;
+  }
+}
+
+bool OverlapsOverflow(OverflowBitset a, OverflowBitset b) {
+  assert(!a.is_inline());
+  assert(!b.is_inline());
+  assert(a.capacity() == b.capacity());
+  for (unsigned i = 0; i < a.m_ext->m_num_blocks; ++i) {
+    if (Overlaps(a.m_ext->m_bits[i], b.m_ext->m_bits[i])) {
+      return true;
+    }
+  }
+  return false;
+}
+
+bool IsBitSetOverflow(int bit_num, OverflowBitset x) {
+  assert(!x.is_inline());
+  assert(bit_num >= 0);
+  assert(static_cast<size_t>(bit_num) < x.capacity());
+  return Overlaps(x.m_ext->m_bits[bit_num / 64], uint64_t{1} << (bit_num % 64));
+}
diff -Nru mysql-8.0-8.0.26/sql/join_optimizer/overflow_bitset.h mysql-8.0-8.0.27/sql/join_optimizer/overflow_bitset.h
--- mysql-8.0-8.0.26/sql/join_optimizer/overflow_bitset.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/join_optimizer/overflow_bitset.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,403 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef SQL_JOIN_OPTIMIZER_OVERFLOW_BITSET_H
+#define SQL_JOIN_OPTIMIZER_OVERFLOW_BITSET_H
+
+/**
+  @file
+
+  OverflowBitset is a fixed-size (once allocated) bitmap that is optimized for
+  the common case of few elements, yet can support an arbitrary number.
+  For 63 bits or fewer, it fits into a simple 64-bit machine word; for more,
+  it instead “overflows� to a pointer to externally-allocated storage
+  (typically on a MEM_ROOT). In other words, one loses only 1 bit for the common
+  (small) case. For small (“inline�) bit sets, most operations are simple
+  bit-twiddling operations, adding only a small and easily-predicatable test to
+  each of them.
+
+  This is possible because a pointer to external storage of 64-bit values
+  will (must) be aligned to 8 bytes, so the lowest bit of the address
+  cannot be 1. We can use this to distinguish between inline and non-inline
+  sets.
+
+  There are two classes: OverflowBitset is an immutable (const) bitset with
+  value semantics; it can be freely assigned, copied, stored in AccessPath
+  (which also has value semantics), etc. with no worries, but not modified.
+  (The storage is never freed; it is presumed to live on a MEM_ROOT.)
+  MutableOverflowBitset can be modified, but it is move-only; this avoids
+  the problem where one takes a copy of a (non-inline) bit set and then
+  modify one of them, not expecting that modification to also affect
+  the other one. (Ie., it avoids the design mistake in String, where the
+  copy constructor unexpectedly can become a shallow copy, but not always.)
+  MutableOverflowBitset can be converted to OverflowBitset by means of a
+  move, at which point it is effectively frozen and cannot be changed further.
+
+  For simplicity, most operations over OverflowBitset require the two
+  bit sets to be of the same size. The exception is that an all-zero inline
+  bit set can be tested against others in Overlaps(); this is useful so that we
+  don't need to initialize bit sets in AccessPath that never have any filters
+  set (the default constructor makes them inline and all-zero).
+ */
+
+#include <assert.h>
+#include <limits.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+
+#include "sql/join_optimizer/bit_utils.h"
+
+struct MEM_ROOT;
+class MutableOverflowBitset;
+
+class OverflowBitset {
+ public:
+  // Default is to zero-initialize.
+  OverflowBitset() : m_bits(1) {}
+
+  explicit OverflowBitset(uint32_t bits) : m_bits((uintptr_t{bits} << 1) | 1) {
+    // Check that we didn't overflow on 32-bit platforms.
+    assert((m_bits >> 1) == bits);
+  }
+
+  // Reset the entire bitset to an inline all-zero bitset.
+  // This is distinct from ClearBits(), which only clears a given number
+  // of bits, and does not change the capacity.
+  void Clear() { m_bits = 1; }
+
+  // Value semantics, so:
+  OverflowBitset(const OverflowBitset &) = default;
+  OverflowBitset(OverflowBitset &&) = default;
+  OverflowBitset &operator=(const OverflowBitset &) = default;
+  OverflowBitset &operator=(OverflowBitset &&) = default;
+
+  // Can move-convert MutableOverflowBitset into OverflowBitset.
+  inline OverflowBitset(MutableOverflowBitset &&);
+  inline OverflowBitset &operator=(MutableOverflowBitset &&);
+
+  bool is_inline() const { return m_bits & 1; }
+  bool empty() { return m_bits == 1; }
+
+  size_t capacity() const {
+    if (is_inline()) {
+      return kInlineBits;
+    } else {
+      return m_ext->m_num_blocks * sizeof(uint64_t) * CHAR_BIT;
+    }
+  }
+
+  inline MutableOverflowBitset Clone(MEM_ROOT *mem_root) const;
+
+  // NOTE: These could also be made to take in MutableOverflowBitset(),
+  // simply by templating them (due to the private inheritance).
+  static inline MutableOverflowBitset Or(MEM_ROOT *mem_root, OverflowBitset a,
+                                         OverflowBitset b);
+  static inline MutableOverflowBitset And(MEM_ROOT *mem_root, OverflowBitset a,
+                                          OverflowBitset b);
+  static inline MutableOverflowBitset Xor(MEM_ROOT *mem_root, OverflowBitset a,
+                                          OverflowBitset b);
+
+ protected:
+  struct Ext {
+    size_t m_num_blocks;
+    uint64_t m_bits[1];
+  };
+  static_assert(alignof(Ext) % 2 == 0, "The lowest bit must be zero.");
+
+  union {
+    uintptr_t m_bits;  // Lowest bit must be 1.
+    Ext *m_ext;
+  };
+  static constexpr int kInlineBits = sizeof(m_bits) * CHAR_BIT - 1;
+
+  void InitOverflow(MEM_ROOT *mem_root, size_t capacity);
+  static MutableOverflowBitset OrOverflow(MEM_ROOT *mem_root, OverflowBitset a,
+                                          OverflowBitset b);
+  static MutableOverflowBitset AndOverflow(MEM_ROOT *mem_root, OverflowBitset a,
+                                           OverflowBitset b);
+  static MutableOverflowBitset XorOverflow(MEM_ROOT *mem_root, OverflowBitset a,
+                                           OverflowBitset b);
+
+  friend bool Overlaps(OverflowBitset a, OverflowBitset b);
+  friend bool OverlapsOverflow(OverflowBitset a, OverflowBitset b);
+  friend bool IsBitSet(int bit_num, OverflowBitset x);
+  friend bool IsBitSetOverflow(int bit_num, OverflowBitset x);
+  friend bool IsEmpty(OverflowBitset x);
+  friend class OverflowBitsetBitsIn;
+  friend class MutableOverflowBitset;
+};
+static_assert(
+    sizeof(OverflowBitset) <= sizeof(uint64_t),
+    "OverflowBitset is intended to be as compact as a regular 64-bit set.");
+
+// Private inheritance, so that the only way of converting to OverflowBitset
+// for external callers is by a move-convert.
+class MutableOverflowBitset : private OverflowBitset {
+ public:
+  // NOTE: Will round up the given capacity to either 31/63 (for anything
+  // smaller than 32/64), or to the next multiple of 64 (for anything else).
+  MutableOverflowBitset(MEM_ROOT *mem_root, size_t capacity) {
+    if (capacity <= kInlineBits) {
+      m_bits = 1;
+    } else {
+      InitOverflow(mem_root, capacity);
+    }
+  }
+
+  // Move-only, so that we don't inadvertently modify aliases.
+  MutableOverflowBitset(const MutableOverflowBitset &) = delete;
+  MutableOverflowBitset &operator=(const MutableOverflowBitset &) = delete;
+  MutableOverflowBitset(MutableOverflowBitset &&other) {
+    m_bits = other.m_bits;
+    other.m_bits = 1;
+  }
+  MutableOverflowBitset &operator=(MutableOverflowBitset &&other) {
+    m_bits = other.m_bits;
+    other.m_bits = 1;
+    return *this;
+  }
+
+  void SetBit(int bit_num) {
+    if (is_inline()) {
+      assert(bit_num < 63);
+      m_bits |= uint64_t{1} << (bit_num + 1);
+    } else {
+      SetBitOverflow(bit_num);
+    }
+  }
+
+  void ClearBits(int begin_bit_num, int end_bit_num) {
+    assert(begin_bit_num >= 0);
+    assert(end_bit_num >= 0);
+    assert(begin_bit_num <= end_bit_num);
+    assert(static_cast<size_t>(begin_bit_num) <= capacity());
+    assert(static_cast<size_t>(end_bit_num) <= capacity());
+    if (is_inline()) {
+      m_bits &= ~BitsBetween(begin_bit_num + 1, end_bit_num + 1);
+    } else {
+      ClearBitsOverflow(begin_bit_num, end_bit_num);
+    }
+  }
+
+  inline MutableOverflowBitset Clone(MEM_ROOT *mem_root) const {
+    return OverflowBitset::Clone(mem_root);
+  }
+
+ private:
+  void SetBitOverflow(int bit_num);
+  void ClearBitsOverflow(int begin_bit_num, int end_bit_num);
+
+  friend class OverflowBitset;
+};
+
+inline OverflowBitset::OverflowBitset(MutableOverflowBitset &&other) {
+  m_bits = other.m_bits;
+  other.m_bits = 1;
+}
+
+inline OverflowBitset &OverflowBitset::operator=(
+    MutableOverflowBitset &&other) {
+  m_bits = other.m_bits;
+  other.m_bits = 1;
+  return *this;
+}
+
+inline MutableOverflowBitset OverflowBitset::Clone(MEM_ROOT *mem_root) const {
+  MutableOverflowBitset ret(mem_root, capacity());
+  if (is_inline()) {
+    ret.m_bits = m_bits;
+  } else {
+    memcpy(ret.m_ext, m_ext,
+           sizeof(m_ext->m_num_blocks) +
+               m_ext->m_num_blocks * sizeof(m_ext->m_bits));
+  }
+  return ret;
+}
+
+inline MutableOverflowBitset OverflowBitset::Or(MEM_ROOT *mem_root,
+                                                OverflowBitset a,
+                                                OverflowBitset b) {
+  assert(a.is_inline() == b.is_inline());
+  assert(a.capacity() == b.capacity());
+  if (a.is_inline()) {
+    MutableOverflowBitset ret{mem_root, 63};
+    ret.m_bits = a.m_bits | b.m_bits;
+    return ret;
+  } else {
+    return OrOverflow(mem_root, a, b);
+  }
+}
+
+inline MutableOverflowBitset OverflowBitset::And(MEM_ROOT *mem_root,
+                                                 OverflowBitset a,
+                                                 OverflowBitset b) {
+  assert(a.is_inline() == b.is_inline());
+  assert(a.capacity() == b.capacity());
+  if (a.is_inline()) {
+    MutableOverflowBitset ret{mem_root, 63};
+    ret.m_bits = a.m_bits & b.m_bits;
+    return ret;
+  } else {
+    return AndOverflow(mem_root, a, b);
+  }
+}
+
+inline MutableOverflowBitset OverflowBitset::Xor(MEM_ROOT *mem_root,
+                                                 OverflowBitset a,
+                                                 OverflowBitset b) {
+  assert(a.is_inline() == b.is_inline());
+  assert(a.capacity() == b.capacity());
+  if (a.is_inline()) {
+    MutableOverflowBitset ret{mem_root, 63};
+    ret.m_bits = (a.m_bits ^ b.m_bits) | 1;
+    return ret;
+  } else {
+    return XorOverflow(mem_root, a, b);
+  }
+}
+
+// Definitions overloading utility functions in bit_utils.h,
+// making it generally possible to use OverflowBitset as we use
+// regular uint64_t bitsets (e.g. NodeMap).
+
+class OverflowBitsetBitsIn {
+ public:
+  class iterator {
+   private:
+    uint64_t m_state;
+    const uint64_t *m_next;
+    const uint64_t *const m_end;
+    int m_base;
+
+   public:
+    // For inline bitsets.
+    explicit iterator(uint64_t state)
+        : m_state(state), m_next(nullptr), m_end(nullptr), m_base(0) {}
+
+    // For overflow bitsets.
+    iterator(const uint64_t *begin, const uint64_t *end)
+        : m_state(0), m_next(begin), m_end(end), m_base(-64) {
+      while (m_state == 0 && m_next != m_end) {
+        m_state = *m_next++;
+        m_base += 64;
+      }
+    }
+
+    bool operator==(const iterator &other) const {
+      assert(m_end == other.m_end);
+      return m_state == other.m_state && m_next == other.m_next;
+    }
+    bool operator!=(const iterator &other) const {
+      assert(m_end == other.m_end);
+      return m_state != other.m_state || m_next != other.m_next;
+    }
+    size_t operator*() const { return FindLowestBitSet(m_state) + m_base; }
+    iterator &operator++() {
+      // Clear the lowest set bit.
+      assert(m_state != 0);
+      m_state = m_state & (m_state - 1);
+
+      while (m_state == 0 && m_next != m_end) {
+        m_state = *m_next++;
+        m_base += 64;
+      }
+      return *this;
+    }
+  };
+
+  explicit OverflowBitsetBitsIn(OverflowBitset bitset) : m_bitset(bitset) {}
+
+  iterator begin() const {
+    if (m_bitset.is_inline()) {
+      return iterator{m_bitset.m_bits >> 1};
+    } else {
+      const uint64_t *end =
+          m_bitset.m_ext->m_bits + m_bitset.m_ext->m_num_blocks;
+      return iterator{m_bitset.m_ext->m_bits, end};
+    }
+  }
+  iterator end() const {
+    if (m_bitset.is_inline()) {
+      return iterator{0};
+    } else {
+      const uint64_t *end =
+          m_bitset.m_ext->m_bits + m_bitset.m_ext->m_num_blocks;
+      return iterator{end, end};
+    }
+  }
+
+ private:
+  const OverflowBitset m_bitset;
+};
+
+inline OverflowBitsetBitsIn BitsSetIn(OverflowBitset bitset) {
+  return OverflowBitsetBitsIn{bitset};
+}
+
+bool OverlapsOverflow(OverflowBitset a, OverflowBitset b);
+
+inline bool Overlaps(OverflowBitset a, OverflowBitset b) {
+  if (a.m_bits == 1 || b.m_bits == 1) {
+    // Empty and inline, so nothing overlaps.
+    // This is a special case that does not require the two
+    // sets to be of the same size (see file comment).
+    return false;
+  }
+  assert(a.is_inline() == b.is_inline());
+  assert(a.capacity() == b.capacity());
+  if (a.is_inline()) {
+    return (a.m_bits & b.m_bits) != 1;
+  } else {
+    return OverlapsOverflow(a, b);
+  }
+}
+
+bool IsBitSetOverflow(int bit_num, OverflowBitset x);
+
+inline bool IsBitSet(int bit_num, OverflowBitset x) {
+  assert(bit_num >= 0);
+  assert(static_cast<size_t>(bit_num) < x.capacity());
+  if (x.is_inline()) {
+    return Overlaps(x.m_bits, uint64_t{1} << (bit_num + 1));
+  } else {
+    return IsBitSetOverflow(bit_num, x);
+  }
+}
+
+// This is used only to guard a few asserts, so it's better that it's
+// completely visible, so that the compiler can remove it totally
+// in optimized mode.
+inline bool IsEmpty(OverflowBitset x) {
+  if (x.is_inline()) {
+    return x.m_bits == 1;
+  } else {
+    for (unsigned i = 0; i < x.m_ext->m_num_blocks; ++i) {
+      if (x.m_ext->m_bits[i] != 0) {
+        return false;
+      }
+    }
+    return true;
+  }
+}
+
+#endif  // SQL_JOIN_OPTIMIZER_OVERFLOW_BITSET_H
diff -Nru mysql-8.0-8.0.26/sql/join_optimizer/print_utils.cc mysql-8.0-8.0.27/sql/join_optimizer/print_utils.cc
--- mysql-8.0-8.0.26/sql/join_optimizer/print_utils.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/join_optimizer/print_utils.cc	2021-09-28 11:46:34.000000000 +0000
@@ -69,6 +69,7 @@
 
   string label = ItemsToString(all_join_conditions);
   switch (expr->type) {
+    case RelationalExpression::MULTI_INNER_JOIN:
     case RelationalExpression::TABLE:
       assert(false);
     case RelationalExpression::INNER_JOIN:
diff -Nru mysql-8.0-8.0.26/sql/join_optimizer/relational_expression.h mysql-8.0-8.0.27/sql/join_optimizer/relational_expression.h
--- mysql-8.0-8.0.26/sql/join_optimizer/relational_expression.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/join_optimizer/relational_expression.h	2021-09-28 11:46:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2020, Oracle and/or its affiliates.
+/* Copyright (c) 2020, 2021, Oracle 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,
@@ -27,6 +27,7 @@
 
 #include "sql/join_optimizer/bit_utils.h"
 #include "sql/join_optimizer/node_map.h"
+#include "sql/join_optimizer/overflow_bitset.h"
 #include "sql/join_type.h"
 #include "sql/mem_root_array.h"
 #include "sql/sql_class.h"
@@ -60,7 +61,9 @@
  */
 struct RelationalExpression {
   explicit RelationalExpression(THD *thd)
-      : join_conditions(thd->mem_root), equijoin_conditions(thd->mem_root) {}
+      : multi_children(thd->mem_root),
+        join_conditions(thd->mem_root),
+        equijoin_conditions(thd->mem_root) {}
 
   enum Type {
     INNER_JOIN = static_cast<int>(JoinType::INNER),
@@ -80,6 +83,13 @@
     // tests).
     FULL_OUTER_JOIN = static_cast<int>(JoinType::FULL_OUTER),
 
+    // An inner join between two _or more_ tables, with no join conditions.
+    // This is a special form used only during pushdown, for increased
+    // flexibility in reordering. MULTI_INNER_JOIN nodes do not use
+    // left and right, but rather store all its children in multi_children
+    // (which is empty for all other types).
+    MULTI_INNER_JOIN = 102,
+
     TABLE = 100
   } type;
   table_map tables_in_subtree;
@@ -92,14 +102,36 @@
   // If type == TABLE.
   const TABLE_LIST *table;
   Mem_root_array<Item *> join_conditions_pushable_to_this;
+  // Tables in the same companion set are those that are inner-joined
+  // against each other; we use this to see in what parts of the graph
+  // we allow cycles. (Within companion sets, we are also allowed to
+  // add Cartesian products if we deem that an advantage, but we don't
+  // do it currently.) -1 means that the table is not part of a companion
+  // set, e.g. because it only participates in outer joins. Tables may
+  // also be alone in their companion sets, which essentially means
+  // the same thing as -1. The companion sets are just opaque identifiers;
+  // the number itself doesn't mean much.
+  int companion_set{-1};
 
   // If type != TABLE. Note that equijoin_conditions will be split off
   // from join_conditions fairly late (at CreateHashJoinConditions()),
   // so often, you will see equijoin conditions in join_condition..
   RelationalExpression *left, *right;
+  Mem_root_array<RelationalExpression *>
+      multi_children;  // See MULTI_INNER_JOIN.
   Mem_root_array<Item *> join_conditions;
   Mem_root_array<Item_func_eq *> equijoin_conditions;
+  // If true, at least one condition under “join_conditions� is a false (0)
+  // constant. (Such conditions can never be under “equijoin_conditions�.)
+  bool join_conditions_reject_all_rows{false};
   table_map conditions_used_tables{0};
+  // If the join conditions were also added as predicates due to cycles
+  // in the graph (see comment in AddCycleEdges()), contains a range of
+  // which indexes they got in the predicate list. This is so that we know that
+  // they are redundant and don't have to apply them if we actually apply this
+  // join (as opposed to getting the edge implicitly by means of joining the
+  // tables along some other way in the cycle).
+  int join_predicate_first{0}, join_predicate_last{0};
 
   // Conflict rules that must be checked before making a subgraph
   // out of this join; this is in addition to the regular connectivity
diff -Nru mysql-8.0-8.0.26/sql/join_optimizer/replace_item.cc mysql-8.0-8.0.27/sql/join_optimizer/replace_item.cc
--- mysql-8.0-8.0.26/sql/join_optimizer/replace_item.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/join_optimizer/replace_item.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,124 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include "sql/join_optimizer/replace_item.h"
+#include "sql/item.h"
+#include "sql/sql_resolver.h"
+#include "sql/temp_table_param.h"
+
+/**
+  Check what field the given item will be materialized into under the given
+  temporary table parameters.
+
+  If the item is materialized (ie., found in items_to_copy), we return a
+  canonical Item_field for that field; ie., the same every time. This means
+  that you can do the same replacement in a SELECT list and then in
+  items_to_copy itself, and still have them match. This is used in particular
+  when updating Temp_table_param itself, in FinalizePlanForQueryBlock().
+
+  Normally, we want to search for only the same item, up to references
+  (need_exact_match=true). However, in ORDER BY specifications of windows,
+  we can sometimes have the same field referred to by different Item_field,
+  and the callers may need to set need_exact_match=false, which compares
+  using Item::eq() instead. This also disables the behavior of checking
+  and propagating Item::hidden.
+ */
+static Item *FindReplacementItem(Item *item,
+                                 const Func_ptr_array &items_to_copy,
+                                 bool need_exact_match) {
+  if (item->const_for_execution()) {
+    // Stop traversing (which we do with a fake replacement with ourselves).
+    // This is the only case where we can return an Item that is not an
+    // Item_field.
+    return item;
+  }
+
+  for (const Func_ptr &func : items_to_copy) {
+    bool match;
+    if (need_exact_match) {
+      // For nearly all cases, just comparing the items (by pointer) would
+      // be sufficent, but in rare cases involving CTEs (see e.g. the test for
+      // bug #26907753), we can have a ref in func.func(), so we need to call
+      // real_item() before comparing.
+      match = func.func()->hidden == item->hidden &&
+              func.func()->real_item() == item->real_item();
+    } else {
+      match =
+          func.func()->real_item() == item->real_item() ||
+          func.func()->real_item()->eq(item->real_item(), /*binary_cmp=*/true);
+    }
+    if (match) {
+      Item_field *item_field = func.result_item();
+      if (item_field == nullptr) return nullptr;
+      if (need_exact_match) {
+        item_field->hidden = item->hidden;
+      }
+      return item_field;
+    }
+  }
+  return nullptr;
+}
+
+Item *FindReplacementOrReplaceMaterializedItems(
+    THD *thd, Item *item, const Func_ptr_array &items_to_copy,
+    bool need_exact_match) {
+  Item *replacement =
+      FindReplacementItem(item, items_to_copy, need_exact_match);
+  if (replacement != nullptr) {
+    return replacement;
+  } else {
+    // We don't need to care about the hidden flag when modifying the arguments
+    // to an item (ie., the item itself isn't in the SELECT list). Non-exact
+    // matches are important when modifying arguments within rollup group
+    // wrappers, since e.g. rollup_group_item(t1.a) will create a hidden item
+    // t1.a, and if we materialize t1.a -> <temporary>.a, we'll need to modify
+    // the argument to the rollup group wrapper as well.
+    ReplaceMaterializedItems(thd, item, items_to_copy,
+                             /*need_exact_match=*/false);
+    return item;
+  }
+}
+
+void ReplaceMaterializedItems(THD *thd, Item *item,
+                              const Func_ptr_array &items_to_copy,
+                              bool need_exact_match) {
+  bool modified = false;
+  const auto replace_functor = [&modified, &items_to_copy, need_exact_match](
+                                   Item *sub_item, Item *,
+                                   unsigned) -> ReplaceResult {
+    Item *replacement = FindReplacementItem(sub_item->real_item(),
+                                            items_to_copy, need_exact_match);
+    if (replacement != nullptr) {
+      modified = true;
+      return {ReplaceResult::REPLACE, replacement};
+    } else {
+      return {ReplaceResult::KEEP_TRAVERSING, nullptr};
+    }
+  };
+  WalkAndReplace(thd, item, std::move(replace_functor));
+
+  // If the item was modified to reference temporary tables, we need to update
+  // its used tables to account for that.
+  if (modified) {
+    item->update_used_tables();
+  }
+}
diff -Nru mysql-8.0-8.0.26/sql/join_optimizer/replace_item.h mysql-8.0-8.0.27/sql/join_optimizer/replace_item.h
--- mysql-8.0-8.0.26/sql/join_optimizer/replace_item.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/join_optimizer/replace_item.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,66 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef SQL_JOIN_OPTIMIZER_REPLACE_ITEM_H
+#define SQL_JOIN_OPTIMIZER_REPLACE_ITEM_H
+
+class Func_ptr;
+class Item;
+class Item_field;
+template <class T>
+class Mem_root_array;
+class THD;
+using Func_ptr_array = Mem_root_array<Func_ptr>;
+
+/*
+  Return a new item that is to be used after materialization (as given by
+  items_to_copy). There are three main cases:
+
+    1. The item isn't touched by materialization (e.g., because it's constant,
+       or because we're not ready to compute it yet).
+    2. The item is directly in the items_to_copy list, so it has its own field
+       in the resulting temporary table; the corresponding new Item_field
+       is returned.
+    3. A _part_ of the item is in the items_to_copy list; e.g. say that we
+       have an item (t1.x + 1), and t1.x is materialized into <temporary>.x.
+       (In particular, this happens when having expressions that contain
+       aggregate functions _and_ non-aggregates.) In this case, we go in and
+       modify the item in-place, so that the appropriate sub-expressions are
+       replaced; in this case, to (<temporary>.x + 1). This assumes that we
+       never use the same item before and after a materialization in the
+       query plan!
+ */
+Item *FindReplacementOrReplaceMaterializedItems(
+    THD *thd, Item *item, const Func_ptr_array &items_to_copy,
+    bool need_exact_match);
+
+/**
+  Like FindReplacementOrReplaceMaterializedItems, but only search _below_ the
+  item, ie. ignore point 2 above. This can be useful if doing self-replacement,
+  ie., we are replacing source items in items_to_copy and don't want to
+  replace an item with its own output.
+ */
+void ReplaceMaterializedItems(THD *thd, Item *item,
+                              const Func_ptr_array &items_to_copy,
+                              bool need_exact_match);
+
+#endif  // SQL_JOIN_OPTIMIZER_REPLACE_ITEM_H
diff -Nru mysql-8.0-8.0.26/sql/join_optimizer/walk_access_paths.h mysql-8.0-8.0.27/sql/join_optimizer/walk_access_paths.h
--- mysql-8.0-8.0.26/sql/join_optimizer/walk_access_paths.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/join_optimizer/walk_access_paths.h	2021-09-28 11:46:34.000000000 +0000
@@ -23,6 +23,8 @@
 #ifndef SQL_JOIN_OPTIMIZER_WALK_ACCESS_PATHS_H
 #define SQL_JOIN_OPTIMIZER_WALK_ACCESS_PATHS_H
 
+#include <type_traits>
+
 #include "sql/join_optimizer/access_path.h"
 
 enum class WalkAccessPathPolicy {
@@ -49,15 +51,17 @@
   will give the correct value to the func() callback. It is only used by
   WalkAccesspath() itself if the policy is ENTIRE_QUERY_BLOCK; if not, it is
   only used for the func() callback, and you can set it to nullptr if you wish.
-  func() must have signature func(AccessPath *, const JOIN *).
-
-  Nothing currently uses post-order traversal, but it has been requested for
-  future use.
+  func() must have signature func(AccessPath *, const JOIN *), or it could be
+  JOIN * if a non-const JOIN is given in.
  */
-template <class Func>
-void WalkAccessPaths(AccessPath *path, const JOIN *join,
+template <class Func, class JoinPtr>
+void WalkAccessPaths(AccessPath *path, JoinPtr join,
                      WalkAccessPathPolicy cross_query_blocks, Func &&func,
                      bool post_order_traversal = false) {
+  static_assert(
+      std::is_convertible<JoinPtr, const JOIN *>::value,
+      "The “join� argument must be JOIN * or const JOIN * (or nullptr).");
+
   if (cross_query_blocks == WalkAccessPathPolicy::ENTIRE_QUERY_BLOCK) {
     assert(join != nullptr);
   }
@@ -87,7 +91,7 @@
     case AccessPath::MATERIALIZED_TABLE_FUNCTION:
     case AccessPath::UNQUALIFIED_COUNT:
       // No children.
-      return;
+      break;
     case AccessPath::NESTED_LOOP_JOIN:
       WalkAccessPaths(path->nested_loop_join().outer, join, cross_query_blocks,
                       std::forward<Func &&>(func), post_order_traversal);
@@ -216,7 +220,8 @@
   func() must have signature func(TABLE *), and return true upon error.
  */
 template <class Func>
-void WalkTablesUnderAccessPath(AccessPath *root_path, Func &&func) {
+void WalkTablesUnderAccessPath(AccessPath *root_path, Func &&func,
+                               bool include_pruned_tables) {
   WalkAccessPaths(
       root_path, /*join=*/nullptr,
       WalkAccessPathPolicy::STOP_AT_MATERIALIZATION,
@@ -260,6 +265,14 @@
             // WalkTablesUnderAccessPath().
             assert(false);
             return true;
+          case AccessPath::ZERO_ROWS:
+            if (include_pruned_tables) {
+              WalkTablesUnderAccessPath(path->zero_rows().child, func,
+                                        include_pruned_tables);
+            }
+            return false;
+          case AccessPath::WINDOW:
+            return func(path->window().temp_table);
           case AccessPath::AGGREGATE:
           case AccessPath::APPEND:
           case AccessPath::BKA_JOIN:
@@ -277,8 +290,6 @@
           case AccessPath::TABLE_VALUE_CONSTRUCTOR:
           case AccessPath::TEMPTABLE_AGGREGATE:
           case AccessPath::WEEDOUT:
-          case AccessPath::WINDOW:
-          case AccessPath::ZERO_ROWS:
           case AccessPath::ZERO_ROWS_AGGREGATED:
             return false;
         }
diff -Nru mysql-8.0-8.0.26/sql/json_binary.cc mysql-8.0-8.0.27/sql/json_binary.cc
--- mysql-8.0-8.0.26/sql/json_binary.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/json_binary.cc	2021-09-28 11:46:34.000000000 +0000
@@ -2068,7 +2068,7 @@
     case OPAQUE:
       if (m_field_type != val.m_field_type)
         return m_field_type < val.m_field_type ? -1 : 1;
-      /* Fall through */
+      [[fallthrough]];
     case STRING: {
       uint cmp_length = std::min(get_data_length(), val.get_data_length());
       int res;
diff -Nru mysql-8.0-8.0.26/sql/json_dom.cc mysql-8.0-8.0.27/sql/json_dom.cc
--- mysql-8.0-8.0.26/sql/json_dom.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/json_dom.cc	2021-09-28 11:46:34.000000000 +0000
@@ -106,11 +106,7 @@
     Json_object_ptr right_object(down_cast<Json_object *>(right.release()));
     if (left_object->consume(std::move(right_object)))
       return nullptr; /* purecov: inspected */
-#ifdef __SUNPRO_CC
-    return std::move(left_object);
-#else
     return left_object;
-#endif
   }
 
   Json_array_ptr left_array = wrap_in_array(std::move(left));
@@ -119,11 +115,7 @@
       left_array->consume(std::move(right_array)))
     return nullptr; /* purecov: inspected */
 
-#ifdef __SUNPRO_CC
-  return std::move(left_array);
-#else
   return left_array;
-#endif
 }
 #endif  // ifdef MYSQL_SERVER
 
@@ -903,7 +895,7 @@
 }
 
 template <typename Key>
-static Json_dom *json_object_get(const Json_dom *object MY_ATTRIBUTE((unused)),
+static Json_dom *json_object_get(const Json_dom *object [[maybe_unused]],
                                  const Json_object_map &map, const Key &key) {
   const Json_object_map::const_iterator iter = map.find(key);
 
@@ -956,11 +948,7 @@
       return nullptr; /* purecov: inspected */
   }
 
-#ifdef __SUNPRO_CC
-  return std::move(o);
-#else
   return o;
-#endif
 }
 
 bool Json_object::merge_patch(Json_object_ptr patch) {
@@ -1104,11 +1092,7 @@
     if (vv->append_clone(child.get())) return nullptr; /* purecov: inspected */
   }
 
-#ifdef __SUNPRO_CC
-  return std::move(vv);
-#else
   return vv;
-#endif
 }
 
 #ifdef MYSQL_SERVER
@@ -1411,9 +1395,7 @@
 }
 
 Json_wrapper::Json_wrapper(Json_dom *dom_value, bool alias)
-    : m_dom_value(dom_value), m_is_dom(true) {
-  // Workaround for Solaris Studio, initialize in CTOR body
-  m_dom_alias = alias;
+    : m_dom_value(dom_value), m_dom_alias(alias), m_is_dom(true) {
   if (!dom_value) {
     m_dom_alias = true;  //!< no deallocation, make us empty
   }
@@ -1797,8 +1779,7 @@
   return wrapper_to_string(*this, buffer, true, true, func_name, 0);
 }
 
-void Json_wrapper::dbug_print(
-    const char *message MY_ATTRIBUTE((unused))) const {
+void Json_wrapper::dbug_print(const char *message [[maybe_unused]]) const {
 #ifndef NDEBUG
   StringBuffer<STRING_BUFFER_USUAL_SIZE> buf;
   if (to_string(&buf, false, "Json_wrapper::dbug_print"))
@@ -3008,7 +2989,7 @@
           !status.warnings)
         break;
     }
-    /* Fall through */
+      [[fallthrough]];
     default:
       handle_coercion_error(cr_error, "DATE/TIME/DATETIME/TIMESTAMP",
                             ER_INVALID_JSON_VALUE_FOR_CAST, msgnam);
@@ -3032,7 +3013,7 @@
           !status.warnings)
         break;
     }
-    /* Fall through */
+      [[fallthrough]];
     default:
       handle_coercion_error(cr_error, "DATE/TIME/DATETIME/TIMESTAMP",
                             ER_INVALID_JSON_VALUE_FOR_CAST, msgnam);
diff -Nru mysql-8.0-8.0.26/sql/json_dom.h mysql-8.0-8.0.27/sql/json_dom.h
--- mysql-8.0-8.0.26/sql/json_dom.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/json_dom.h	2021-09-28 11:46:34.000000000 +0000
@@ -1195,10 +1195,7 @@
   /**
     Create an empty wrapper. Cf #empty().
   */
-  Json_wrapper() : m_dom_value(nullptr), m_is_dom(true) {
-    // Workaround for Solaris Studio, initialize in CTOR body.
-    m_dom_alias = true;
-  }
+  Json_wrapper() : m_dom_value(nullptr), m_dom_alias(true), m_is_dom(true) {}
 
   /**
     Wrap the supplied DOM value (no copy taken). The wrapper takes
@@ -1374,7 +1371,7 @@
     @param[in] message If given, the JSON document is prefixed with
     this message.
   */
-  void dbug_print(const char *message MY_ATTRIBUTE((unused)) = "") const;
+  void dbug_print(const char *message [[maybe_unused]] = "") const;
 
   /**
     Format the JSON value to an external JSON string in buffer in the format of
diff -Nru mysql-8.0-8.0.26/sql/json_path.h mysql-8.0-8.0.27/sql/json_path.h
--- mysql-8.0-8.0.26/sql/json_path.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/json_path.h	2021-09-28 11:46:34.000000000 +0000
@@ -415,7 +415,7 @@
     for (const auto ptr : m_path_legs) ptr->~Json_path_leg();
     m_path_legs.clear();
     // Mark the memory as ready for reuse.
-    free_root(&m_mem_root, MYF(MY_MARK_BLOCKS_FREE));
+    m_mem_root.ClearForReuse();
   }
 
   /**
diff -Nru mysql-8.0-8.0.26/sql/key.cc mysql-8.0-8.0.27/sql/key.cc
--- mysql-8.0-8.0.26/sql/key.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/key.cc	2021-09-28 11:46:34.000000000 +0000
@@ -496,7 +496,7 @@
   @see key_cmp()
 */
 int key_cmp2(KEY_PART_INFO *key_part, const uchar *key1, uint key1_length,
-             const uchar *key2, uint key2_length MY_ATTRIBUTE((unused))) {
+             const uchar *key2, uint key2_length [[maybe_unused]]) {
   assert(key_part && key1 && key2);
   assert((key1_length == key2_length) && key1_length != 0);
   uint store_length;
diff -Nru mysql-8.0-8.0.26/sql/lex.h mysql-8.0-8.0.27/sql/lex.h
--- mysql-8.0-8.0.26/sql/lex.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/lex.h	2021-09-28 11:46:34.000000000 +0000
@@ -95,6 +95,7 @@
     {SYM("ASENSITIVE", ASENSITIVE_SYM)},
     {SYM("AT", AT_SYM)},
     {SYM("ATTRIBUTE", ATTRIBUTE_SYM)},
+    {SYM("AUTHENTICATION", AUTHENTICATION_SYM)},
     {SYM("AUTO_INCREMENT", AUTO_INC)},
     {SYM("AUTOEXTEND_SIZE", AUTOEXTEND_SIZE_SYM)},
     {SYM("AVG", AVG_SYM)},
@@ -123,6 +124,7 @@
     {SYM("CASE", CASE_SYM)},
     {SYM("CATALOG_NAME", CATALOG_NAME_SYM)},
     {SYM("CHAIN", CHAIN_SYM)},
+    {SYM("CHALLENGE_RESPONSE", CHALLENGE_RESPONSE_SYM)},
     {SYM("CHANGE", CHANGE)},
     {SYM("CHANGED", CHANGED)},
     {SYM("CHANNEL", CHANNEL_SYM)},
@@ -250,6 +252,7 @@
     {SYM("EXPLAIN", DESCRIBE)},
     {SYM("EXTENDED", EXTENDED_SYM)},
     {SYM("EXTENT_SIZE", EXTENT_SIZE_SYM)},
+    {SYM("FACTOR", FACTOR_SYM)},
     {SYM("FAILED_LOGIN_ATTEMPTS", FAILED_LOGIN_ATTEMPTS_SYM)},
     {SYM("FALSE", FALSE_SYM)},
     {SYM("FAST", FAST_SYM)},
@@ -259,6 +262,7 @@
     {SYM("FILE", FILE_SYM)},
     {SYM("FILE_BLOCK_SIZE", FILE_BLOCK_SIZE_SYM)},
     {SYM("FILTER", FILTER_SYM)},
+    {SYM("FINISH", FINISH_SYM)},
     {SYM("FIRST", FIRST_SYM)},
     {SYM("FIRST_VALUE", FIRST_VALUE_SYM)},
     {SYM("FIXED", FIXED_SYM)},
@@ -293,6 +297,7 @@
     {SYM("GROUP", GROUP_SYM)},
     {SYM("GROUPING", GROUPING_SYM)},
     {SYM("GROUPS", GROUPS_SYM)},
+    {SYM("GTID_ONLY", GTID_ONLY_SYM)},
     {SYM("HANDLER", HANDLER_SYM)},
     {SYM("HASH", HASH_SYM)},
     {SYM("HAVING", HAVING)},
@@ -316,7 +321,9 @@
     {SYM("INDEX", INDEX_SYM)},
     {SYM("INDEXES", INDEXES)},
     {SYM("INFILE", INFILE)},
+    {SYM("INITIAL", INITIAL_SYM)},
     {SYM("INITIAL_SIZE", INITIAL_SIZE_SYM)},
+    {SYM("INITIATE", INITIATE_SYM)},
     {SYM("INNER", INNER_SYM)},
     {SYM("INOUT", INOUT_SYM)},
     {SYM("INSENSITIVE", INSENSITIVE_SYM)},
@@ -550,6 +557,7 @@
     {SYM("REFERENCE", REFERENCE_SYM)},
     {SYM("REFERENCES", REFERENCES)},
     {SYM("REGEXP", REGEXP)},
+    {SYM("REGISTRATION", REGISTRATION_SYM)},
     {SYM("RELAY", RELAY)},
     {SYM("RELAYLOG", RELAYLOG_SYM)},
     {SYM("RELAY_LOG_FILE", RELAY_LOG_FILE_SYM)},
@@ -762,6 +770,7 @@
     {SYM("UNKNOWN", UNKNOWN_SYM)},
     {SYM("UNLOCK", UNLOCK_SYM)},
     {SYM("UNINSTALL", UNINSTALL_SYM)},
+    {SYM("UNREGISTER", UNREGISTER_SYM)},
     {SYM("UNSIGNED", UNSIGNED_SYM)},
     {SYM("UNTIL", UNTIL_SYM)},
     {SYM("UPGRADE", UPGRADE_SYM)},
diff -Nru mysql-8.0-8.0.26/sql/lock.cc mysql-8.0-8.0.27/sql/lock.cc
--- mysql-8.0-8.0.26/sql/lock.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/lock.cc	2021-09-28 11:46:34.000000000 +0000
@@ -781,12 +781,14 @@
   @param thd               - Thread invoking this function.
   @param tablespace_set    - Set of tablespace names to be lock.
   @param lock_wait_timeout - Lock timeout.
+  @param mem_root          - Memory root on which MDL_request objects
+                             can be allocated.
 
   @return true - On failure
   @return false - On Success.
 */
 bool lock_tablespace_names(THD *thd, Tablespace_hash_set *tablespace_set,
-                           ulong lock_wait_timeout) {
+                           ulong lock_wait_timeout, MEM_ROOT *mem_root) {
   // Stop if we have nothing to lock
   if (tablespace_set->empty()) return false;
 
@@ -795,7 +797,7 @@
   for (const std::string &tablespace : *tablespace_set) {
     assert(!tablespace.empty());
 
-    MDL_request *tablespace_request = new (thd->mem_root) MDL_request;
+    MDL_request *tablespace_request = new (mem_root) MDL_request;
     if (tablespace_request == nullptr) return true;
     MDL_REQUEST_INIT(tablespace_request, MDL_key::TABLESPACE, "",
                      tablespace.c_str(), MDL_INTENTION_EXCLUSIVE,
diff -Nru mysql-8.0-8.0.26/sql/locked_tables_list.cc mysql-8.0-8.0.27/sql/locked_tables_list.cc
--- mysql-8.0-8.0.26/sql/locked_tables_list.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/locked_tables_list.cc	2021-09-28 11:46:34.000000000 +0000
@@ -164,7 +164,7 @@
     After closing tables we can free memory used for storing lock
     request for metadata locks and TABLE_LIST elements.
   */
-  free_root(&m_locked_tables_root, MYF(0));
+  m_locked_tables_root.Clear();
   m_locked_tables = nullptr;
   m_locked_tables_last = &m_locked_tables;
   m_reopen_array = nullptr;
diff -Nru mysql-8.0-8.0.26/sql/lock.h mysql-8.0-8.0.27/sql/lock.h
--- mysql-8.0-8.0.26/sql/lock.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/lock.h	2021-09-28 11:46:34.000000000 +0000
@@ -57,7 +57,7 @@
 
 // Lock tablespace names.
 bool lock_tablespace_names(THD *thd, Tablespace_hash_set *tablespace_set,
-                           ulong lock_wait_timeout);
+                           ulong lock_wait_timeout, MEM_ROOT *mem_root);
 
 /* Lock based on stored routine name */
 bool lock_object_name(THD *thd, MDL_key::enum_mdl_namespace mdl_type,
diff -Nru mysql-8.0-8.0.26/sql/log.cc mysql-8.0-8.0.27/sql/log.cc
--- mysql-8.0-8.0.26/sql/log.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/log.cc	2021-09-28 11:46:34.000000000 +0000
@@ -2063,7 +2063,7 @@
                                         LOG_ITEM_* tag, [[key], value]
   @retval          int                  return value of log_line_submit()
 */
-int log_vmessage(int log_type MY_ATTRIBUTE((unused)), va_list fili) {
+int log_vmessage(int log_type [[maybe_unused]], va_list fili) {
   char buff[LOG_BUFF_MAX];
   log_item_class lic;
   log_line ll;
diff -Nru mysql-8.0-8.0.26/sql/log_event.cc mysql-8.0-8.0.27/sql/log_event.cc
--- mysql-8.0-8.0.26/sql/log_event.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/log_event.cc	2021-09-28 11:46:34.000000000 +0000
@@ -551,7 +551,7 @@
 
       Note that HA_ERR_RECORD_DELETED is not in the list since
       do_exec_row() should not return that error code.
-    */
+     */
     case HA_ERR_RECORD_CHANGED:
     case HA_ERR_KEY_NOT_FOUND:
     case HA_ERR_END_OF_FILE:
@@ -1396,7 +1396,7 @@
 */
 
 void Log_event::print_header(IO_CACHE *file, PRINT_EVENT_INFO *print_event_info,
-                             bool is_more MY_ATTRIBUTE((unused))) const {
+                             bool is_more [[maybe_unused]]) const {
   char llbuff[22];
   my_off_t hexdump_from = print_event_info->hexdump_from;
   DBUG_TRACE;
@@ -3058,7 +3058,7 @@
       That concludes the memroot reset can't harm anything in SQL thread roles
       after Coordinator has finished its current scheduling.
     */
-    free_root(thd->mem_root, MYF(MY_KEEP_PREALLOC));
+    thd->mem_root->ClearForReuse();
 
 #ifndef NDEBUG
     w_rr++;
@@ -4553,6 +4553,9 @@
           is preferable at a common with other event pre-execution point
   */
   clear_all_errors(thd, const_cast<Relay_log_info *>(rli));
+  thd->get_stmt_da()->reset_diagnostics_area();
+  thd->get_stmt_da()->reset_statement_cond_count();
+
   if (strcmp("COMMIT", query) == 0 && rli->tables_to_lock != nullptr) {
     /*
       Cleaning-up the last statement context:
@@ -4567,8 +4570,9 @@
           ERROR_LEVEL, error,
           "Error in cleaning up after an event preceding the commit; "
           "the group log file/position: %s %s",
-          const_cast<Relay_log_info *>(rli)->get_group_master_log_name(),
-          llstr(const_cast<Relay_log_info *>(rli)->get_group_master_log_pos(),
+          const_cast<Relay_log_info *>(rli)->get_group_master_log_name_info(),
+          llstr(const_cast<Relay_log_info *>(rli)
+                    ->get_group_master_log_pos_info(),
                 llbuff));
     }
     /*
@@ -4805,6 +4809,7 @@
       /* Execute the query (note that we bypass dispatch_command()) */
       Parser_state parser_state;
       if (!parser_state.init(thd, thd->query().str, thd->query().length)) {
+        parser_state.m_input.m_has_digest = true;
         assert(thd->m_digest == nullptr);
         thd->m_digest = &thd->m_digest_state;
         assert(thd->m_statement_psi == nullptr);
@@ -5066,21 +5071,27 @@
 
   {
     /**
-      The following failure injecion works in cooperation with tests
+      The following failure injection works in cooperation with tests
       setting @@global.debug= 'd,stop_replica_middle_group'.
       The sql thread receives the killed status and will proceed
       to shutdown trying to finish incomplete events group.
-    */
+     */
 
     // TODO: address the middle-group killing in MTS case
 
-    DBUG_EXECUTE_IF(
-        "stop_replica_middle_group",
-        if (strcmp("COMMIT", query) != 0 && strcmp("BEGIN", query) != 0) {
-          if (thd->get_transaction()->cannot_safely_rollback(
-                  Transaction_ctx::SESSION))
-            const_cast<Relay_log_info *>(rli)->abort_slave = 1;
-        };);
+    DBUG_EXECUTE_IF("stop_replica_middle_group", {
+      if (strcmp("COMMIT", query) != 0 && strcmp("BEGIN", query) != 0) {
+        if (thd->get_transaction()->cannot_safely_rollback(
+                Transaction_ctx::SESSION)) {
+          auto thd_rli = (thd->system_thread == SYSTEM_THREAD_SLAVE_SQL
+                              ? const_cast<Relay_log_info *>(rli)
+                              : static_cast<Slave_worker *>(
+                                    const_cast<Relay_log_info *>(rli))
+                                    ->c_rli);
+          thd_rli->abort_slave = 1;
+        }
+      }
+    };);
   }
 
 end:
@@ -5122,7 +5133,7 @@
   thd->first_successful_insert_id_in_prev_stmt_for_binlog = 0;
   thd->first_successful_insert_id_in_prev_stmt = 0;
   thd->stmt_depends_on_first_successful_insert_id_in_prev_stmt = false;
-  free_root(thd->mem_root, MYF(MY_KEEP_PREALLOC));
+  thd->mem_root->ClearForReuse();
   return thd->is_slave_error;
 }
 
@@ -5132,7 +5143,7 @@
   DBUG_EXECUTE_IF(
       "crash_after_commit_and_update_pos", if (!strcmp("COMMIT", query)) {
         sql_print_information("Crashing crash_after_commit_and_update_pos.");
-        rli->flush_info(true);
+        rli->flush_info(Relay_log_info::RLI_FLUSH_IGNORE_SYNC_OPT);
         ha_flush_logs(0);
         DBUG_SUICIDE();
       });
@@ -5766,7 +5777,7 @@
       happens from Query_log_event::do_apply_event or
       Rows_log_event::do_apply_event when they find end of the group event).
     */
-    if (server_id == 0) free_root(thd->mem_root, MYF(MY_KEEP_PREALLOC));
+    if (server_id == 0) thd->mem_root->ClearForReuse();
   } else
     rli->inc_event_relay_log_pos();
 
@@ -6132,6 +6143,10 @@
                   sql_print_information("Crashing crash_before_update_pos.");
                   DBUG_SUICIDE(););
 
+  DBUG_EXECUTE_IF("simulate_commit_failure", {
+    thd->get_transaction()->xid_state()->set_state(XID_STATE::XA_IDLE);
+  });
+
   ulong gaq_idx = mts_group_idx;
   Slave_job_group *ptr_group = coordinator_gaq->get_job_group(gaq_idx);
 
@@ -6164,8 +6179,15 @@
   error = do_commit(thd);
   if (error) {
     if (!skipped_commit_pos) w->rollback_positions(ptr_group);
-  } else if (skipped_commit_pos)
-    error = w->commit_positions(this, ptr_group, w->is_transactional());
+  } else {
+    DBUG_EXECUTE_IF(
+        "crash_after_commit_before_update_pos",
+        sql_print_information("Crashing "
+                              "crash_after_commit_before_update_pos.");
+        DBUG_SUICIDE(););
+    if (skipped_commit_pos)
+      error = w->commit_positions(this, ptr_group, w->is_transactional());
+  }
 err:
   return error;
 }
@@ -6243,7 +6265,9 @@
    */
   if (!thd->get_transaction()->xid_state()->check_in_xa(false) &&
       rli_ptr->is_transactional()) {
-    if ((error = rli_ptr->flush_info(true))) goto err;
+    if ((error =
+             rli_ptr->flush_info(Relay_log_info::RLI_FLUSH_IGNORE_SYNC_OPT)))
+      goto err;
   }
 
   DBUG_PRINT(
@@ -6327,7 +6351,8 @@
       Where as for non transactional rli repository the positions are flushed
       only on succesful commit.
      */
-    if (!rli_ptr->is_transactional()) rli_ptr->flush_info(false);
+    if (!rli_ptr->is_transactional())
+      rli_ptr->flush_info(Relay_log_info::RLI_FLUSH_NO_OPTION);
   }
 err:
   // This is Bug#24588741 fix:
@@ -6841,7 +6866,7 @@
   e->update_hash(val, val_len, (Item_result)type, charset, DERIVATION_IMPLICIT,
                  (flags & binary_log::User_var_event::UNSIGNED_F));
   if (!is_deferred())
-    free_root(thd->mem_root, 0);
+    thd->mem_root->Clear();
   else
     current_thd->query_id = sav_query_id; /* restore current query's context */
 
@@ -6926,7 +6951,7 @@
     rli->inc_event_relay_log_pos();
   else {
     error_inc = rli->inc_group_relay_log_pos(0, true /*need_data_lock=true*/);
-    error_flush = rli->flush_info(true);
+    error_flush = rli->flush_info(Relay_log_info::RLI_FLUSH_IGNORE_SYNC_OPT);
   }
   return (error_inc || error_flush);
 }
@@ -8464,6 +8489,10 @@
               m_table->next_number_field->field_index()) >= m_width);
 }
 
+bool Rows_log_event::is_trx_retryable_upon_engine_error(int error) {
+  return (error == HA_ERR_LOCK_DEADLOCK || error == HA_ERR_LOCK_WAIT_TIMEOUT);
+}
+
 /*
   Compares table->record[0] and table->record[1]
 
@@ -8768,8 +8797,10 @@
             m_key = *m_itr;
             m_itr++;
             first_read = true;
-          } else
-            error = HA_ERR_KEY_NOT_FOUND;
+          } else {
+            if (!is_trx_retryable_upon_engine_error(error))
+              error = HA_ERR_KEY_NOT_FOUND;
+          }
         }
       }
     }
@@ -8778,7 +8809,8 @@
       if ((error = table->file->ha_index_read_map(
                table->record[0], m_key, HA_WHOLE_KEY, HA_READ_KEY_EXACT))) {
         DBUG_PRINT("info", ("no record matching the key found in the table"));
-        error = HA_ERR_KEY_NOT_FOUND;
+        if (!is_trx_retryable_upon_engine_error(error))
+          error = HA_ERR_KEY_NOT_FOUND;
       }
   }
 
@@ -9147,12 +9179,12 @@
     store_record(m_table, record[1]);
 
     /*
-     This is the situation after hashing the BI:
+      This is the situation after hashing the BI:
 
-     ===|=== before image ====|=== after image ===|===
-        ^                     ^
-        m_curr_row            m_curr_row_end
-   */
+      ===|=== before image ====|=== after image ===|===
+         ^                     ^
+         m_curr_row            m_curr_row_end
+     */
 
     /* Set the position to the start of the record to be unpacked. */
     m_curr_row = m_curr_row_end;
@@ -9168,7 +9200,7 @@
       ===|=== before image ====|=== after image ===|===
                                ^                   ^
                                m_curr_row          m_curr_row_end
-    */
+     */
 
     /* Restore back the copy of the BI. */
     restore_record(m_table, record[1]);
@@ -10005,17 +10037,24 @@
     */
     thd->variables.sql_mode = saved_sql_mode;
 
-    { /*
-          The following failure injecion works in cooperation with tests
-          setting @@global.debug= 'd,stop_replica_middle_group'.
-          The sql thread receives the killed status and will proceed
-          to shutdown trying to finish incomplete events group.
-      */
-      DBUG_EXECUTE_IF(
-          "stop_replica_middle_group",
-          if (thd->get_transaction()->cannot_safely_rollback(
-                  Transaction_ctx::SESSION)) const_cast<Relay_log_info *>(rli)
-              ->abort_slave = 1;);
+    {
+      /*
+        The following failure injecion works in cooperation with tests
+        setting @@global.debug= 'd,stop_replica_middle_group'.
+        The sql thread receives the killed status and will proceed
+        to shutdown trying to finish incomplete events group.
+       */
+      DBUG_EXECUTE_IF("stop_replica_middle_group", {
+        if (thd->get_transaction()->cannot_safely_rollback(
+                Transaction_ctx::SESSION)) {
+          auto thd_rli = (thd->system_thread == SYSTEM_THREAD_SLAVE_SQL
+                              ? const_cast<Relay_log_info *>(rli)
+                              : static_cast<Slave_worker *>(
+                                    const_cast<Relay_log_info *>(rli))
+                                    ->c_rli);
+          thd_rli->abort_slave = 1;
+        }
+      };);
     }
 
     if ((error = do_after_row_operations(rli, error)) &&
@@ -10078,7 +10117,7 @@
       *not* try to free the memory here. It will be done latter
       in dispatch_command() after command execution is completed.
      */
-    if (thd->slave_thread) free_root(thd->mem_root, MYF(MY_KEEP_PREALLOC));
+    if (thd->slave_thread) thd->mem_root->ClearForReuse();
   }
   return error;
 }
@@ -10856,7 +10895,7 @@
   /*
     Store the size of the field metadata.
   */
-  uchar mbuf[sizeof(m_field_metadata_size)];
+  uchar mbuf[2 * sizeof(m_field_metadata_size)];
   uchar *const mbuf_end = net_store_length(mbuf, m_field_metadata_size);
 
   return (wrapper_my_b_safe_write(ostream, dbuf, sizeof(dbuf)) ||
@@ -10883,7 +10922,7 @@
  */
 static inline void store_compressed_length(String &str_buf, ulonglong length) {
   // Store Type and packed length
-  uchar buf[4];
+  uchar buf[16];
   uchar *buf_ptr = net_store_length(buf, length);
 
   str_buf.append(reinterpret_cast<char *>(buf), buf_ptr - buf);
@@ -11709,8 +11748,7 @@
 
 bool Write_rows_log_event::binlog_row_logging_function(
     THD *thd_arg, TABLE *table, bool is_transactional,
-    const uchar *before_record MY_ATTRIBUTE((unused)),
-    const uchar *after_record) {
+    const uchar *before_record [[maybe_unused]], const uchar *after_record) {
   return thd_arg->binlog_write_row(table, is_transactional, after_record,
                                    nullptr);
 }
@@ -12199,8 +12237,7 @@
 
 bool Delete_rows_log_event::binlog_row_logging_function(
     THD *thd_arg, TABLE *table, bool is_transactional,
-    const uchar *before_record,
-    const uchar *after_record MY_ATTRIBUTE((unused))) {
+    const uchar *before_record, const uchar *after_record [[maybe_unused]]) {
   return thd_arg->binlog_delete_row(table, is_transactional, before_record,
                                     nullptr);
 }
@@ -13768,8 +13805,9 @@
 }
 
 #ifdef MYSQL_SERVER
-uint8 Transaction_payload_log_event::get_mts_dbs(
-    Mts_db_names *arg, Rpl_filter *rpl_filter MY_ATTRIBUTE((unused))) {
+uint8 Transaction_payload_log_event::get_mts_dbs(Mts_db_names *arg,
+                                                 Rpl_filter *rpl_filter
+                                                 [[maybe_unused]]) {
   Mts_db_names &mts_dbs = m_applier_ctx.get_mts_db_names();
   if (mts_dbs.num == OVER_MAX_DBS_IN_EVENT_MTS) {
     arg->name[0] = 0;
@@ -13836,7 +13874,7 @@
         thread terminates.
       */
 
-      /* fall through */
+      [[fallthrough]];
     case binary_log::ROWS_QUERY_LOG_EVENT:
       /*
          ROWS_QUERY_LOG_EVENT is destroyed at the end of the current statement
diff -Nru mysql-8.0-8.0.26/sql/log_event.h mysql-8.0-8.0.27/sql/log_event.h
--- mysql-8.0-8.0.26/sql/log_event.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/log_event.h	2021-09-28 11:46:34.000000000 +0000
@@ -1155,7 +1155,7 @@
                  databases the event accesses.
   */
   virtual uint8 get_mts_dbs(Mts_db_names *arg,
-                            Rpl_filter *rpl_filter MY_ATTRIBUTE((unused))) {
+                            Rpl_filter *rpl_filter [[maybe_unused]]) {
     arg->name[0] = get_db();
 
     return arg->num = mts_number_dbs();
@@ -1260,7 +1260,7 @@
     @retval 0     Event applied successfully
     @retval errno Error code if event application failed
   */
-  virtual int do_apply_event(Relay_log_info const *rli MY_ATTRIBUTE((unused))) {
+  virtual int do_apply_event(Relay_log_info const *rli [[maybe_unused]]) {
     return 0; /* Default implementation does nothing */
   }
 
@@ -2968,6 +2968,16 @@
             columns, false otherwise.
    */
   bool is_auto_inc_in_extra_columns();
+
+  /**
+    Helper function to check whether the storage engine error
+    allows for the transaction to be retried or not.
+
+    @param error Storage engine error
+    @retval true if the error is retryable.
+    @retval false if the error is non-retryable.
+   */
+  static bool is_trx_retryable_upon_engine_error(int error);
 #endif
 
   bool is_rbr_logging_format() const override { return true; }
@@ -3098,9 +3108,10 @@
     @retval 0 Success
     @retval ER_* Error code returned by unpack_current_row
   */
-  virtual int skip_after_image_for_update_event(
-      const Relay_log_info *rli MY_ATTRIBUTE((unused)),
-      const uchar *curr_bi_start MY_ATTRIBUTE((unused))) {
+  virtual int skip_after_image_for_update_event(const Relay_log_info *rli
+                                                [[maybe_unused]],
+                                                const uchar *curr_bi_start
+                                                [[maybe_unused]]) {
     return 0;
   }
 
@@ -3227,10 +3238,11 @@
   Write_rows_log_event(const char *buf,
                        const Format_description_event *description_event);
 #if defined(MYSQL_SERVER)
-  static bool binlog_row_logging_function(
-      THD *thd, TABLE *table, bool is_transactional,
-      const uchar *before_record MY_ATTRIBUTE((unused)),
-      const uchar *after_record);
+  static bool binlog_row_logging_function(THD *thd, TABLE *table,
+                                          bool is_transactional,
+                                          const uchar *before_record
+                                          [[maybe_unused]],
+                                          const uchar *after_record);
   bool read_write_bitmaps_cmp(const TABLE *table) const override {
     return bitmap_cmp(get_cols(), table->write_set);
   }
@@ -3430,9 +3442,11 @@
   Delete_rows_log_event(const char *buf,
                         const Format_description_event *description_event);
 #ifdef MYSQL_SERVER
-  static bool binlog_row_logging_function(
-      THD *thd, TABLE *table, bool is_transactional, const uchar *before_record,
-      const uchar *after_record MY_ATTRIBUTE((unused)));
+  static bool binlog_row_logging_function(THD *thd, TABLE *table,
+                                          bool is_transactional,
+                                          const uchar *before_record,
+                                          const uchar *after_record
+                                          [[maybe_unused]]);
   bool read_write_bitmaps_cmp(const TABLE *table) const override {
     return bitmap_cmp(get_cols(), table->read_set);
   }
diff -Nru mysql-8.0-8.0.26/sql/log.h mysql-8.0-8.0.27/sql/log.h
--- mysql-8.0-8.0.26/sql/log.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/log.h	2021-09-28 11:46:34.000000000 +0000
@@ -1443,12 +1443,12 @@
   Make and return an ISO 8601 / RFC 3339 compliant timestamp.
   Accepts the log_timestamps global variable in its third parameter.
 
-  @param         buf         A buffer of at least 26 bytes to store
-                             the timestamp in (19 + tzinfo tail + \0)
-  @param         utime       Microseconds since the epoch
-  @param         mode        if 0, use UTC; if 1, use local time
+  @param buf       A buffer of at least iso8601_size bytes to store
+                   the timestamp in. The timestamp will be \0 terminated.
+  @param utime     Microseconds since the epoch
+  @param mode      if 0, use UTC; if 1, use local time
 
-  @retval                    length of timestamp (excluding \0)
+  @retval          length of timestamp (excluding \0)
 */
 int make_iso8601_timestamp(char *buf, ulonglong utime,
                            enum enum_iso8601_tzmode mode);
diff -Nru mysql-8.0-8.0.26/sql/malloc_allocator.h mysql-8.0-8.0.27/sql/malloc_allocator.h
--- mysql-8.0-8.0.26/sql/malloc_allocator.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/malloc_allocator.h	2021-09-28 11:46:34.000000000 +0000
@@ -80,17 +80,16 @@
   explicit Malloc_allocator(PSI_memory_key key) : m_key(key) {}
 
   template <class U>
-  Malloc_allocator(const Malloc_allocator<U> &other MY_ATTRIBUTE((unused)))
+  Malloc_allocator(const Malloc_allocator<U> &other [[maybe_unused]])
       : m_key(other.psi_key()) {}
 
   template <class U>
-  Malloc_allocator &operator=(
-      const Malloc_allocator<U> &other MY_ATTRIBUTE((unused))) {
+  Malloc_allocator &operator=(const Malloc_allocator<U> &other
+                              [[maybe_unused]]) {
     assert(m_key == other.psi_key());  // Don't swap key.
   }
 
-  pointer allocate(size_type n,
-                   const_pointer hint MY_ATTRIBUTE((unused)) = nullptr) {
+  pointer allocate(size_type n, const_pointer hint [[maybe_unused]] = nullptr) {
     if (n == 0) return nullptr;
     if (n > max_size()) throw std::bad_alloc();
 
diff -Nru mysql-8.0-8.0.26/sql/mdl.cc mysql-8.0-8.0.27/sql/mdl.cc
--- mysql-8.0-8.0.26/sql/mdl.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/mdl.cc	2021-09-28 11:46:34.000000000 +0000
@@ -135,7 +135,7 @@
 void MDL_key::init_psi_keys() {
   int i;
   int count;
-  PSI_stage_info *info MY_ATTRIBUTE((unused));
+  PSI_stage_info *info [[maybe_unused]];
 
   count =
       static_cast<int>(array_elements(MDL_key::m_namespace_to_wait_state_name));
diff -Nru mysql-8.0-8.0.26/sql/mdl.h mysql-8.0-8.0.27/sql/mdl.h
--- mysql-8.0-8.0.26/sql/mdl.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/mdl.h	2021-09-28 11:46:34.000000000 +0000
@@ -821,8 +821,8 @@
 
  public:
   static void *operator new(size_t size, MEM_ROOT *mem_root,
-                            const std::nothrow_t &arg MY_ATTRIBUTE((unused)) =
-                                std::nothrow) noexcept {
+                            const std::nothrow_t &arg
+                            [[maybe_unused]] = std::nothrow) noexcept {
     return mem_root->Alloc(size);
   }
 
@@ -1755,7 +1755,7 @@
     m_exists to true is enough.
   */
 
-  void visit_context(const MDL_context *ctx MY_ATTRIBUTE((unused))) override {
+  void visit_context(const MDL_context *ctx [[maybe_unused]]) override {
     m_exists = true;
   }
 
diff -Nru mysql-8.0-8.0.26/sql/memory/unique_ptr.h mysql-8.0-8.0.27/sql/memory/unique_ptr.h
--- mysql-8.0-8.0.26/sql/memory/unique_ptr.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/memory/unique_ptr.h	2021-09-28 11:46:34.000000000 +0000
@@ -39,16 +39,6 @@
 #include "sql/memory/aligned_atomic.h"  // memory::cache_line_size
 #include "sql/memory/ref_ptr.h"         // memory::Ref_ptr
 
-#if defined(__SUNPRO_CC)
-namespace memory {
-template <typename T, typename A = std::nullptr_t>
-using Unique_ptr = std::unique_ptr<T>;
-template <typename T, typename... Args>
-Unique_ptr<T> make_unique(Args &&... args) {
-  return std::make_unique<T>(args...);
-}
-}  // namespace memory
-#else
 namespace memory {
 namespace traits {
 /**
@@ -814,5 +804,4 @@
 }
 #endif
 
-#endif  // Is solaris
 #endif  // MEMORY_UNIQUE_PTR_INCLUDED
diff -Nru mysql-8.0-8.0.26/sql/mem_root_allocator.h mysql-8.0-8.0.27/sql/mem_root_allocator.h
--- mysql-8.0-8.0.26/sql/mem_root_allocator.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/mem_root_allocator.h	2021-09-28 11:46:34.000000000 +0000
@@ -33,10 +33,10 @@
 /**
   Mem_root_allocator is a C++ STL memory allocator based on MEM_ROOT.
 
-  No deallocation is done by this allocator. Calling init_sql_alloc()
-  and free_root() on the supplied MEM_ROOT is the responsibility of
-  the caller. Do *not* call free_root() until the destructor of any
-  objects using this allocator has completed. This includes iterators.
+  No deallocation is done by this allocator. Calling the constructor
+  and destructor on the supplied MEM_ROOT is the responsibility of
+  the caller. Do *not* call Clear() or ~MEM_ROOT until the destructor
+  of any objects using this allocator has completed. This includes iterators.
 
   Example of use:
   vector<int, Mem_root_allocator<int> > v((Mem_root_allocator<int>(&mem_root)));
@@ -91,13 +91,12 @@
       : m_memroot(other.memroot()) {}
 
   template <class U>
-  Mem_root_allocator &operator=(
-      const Mem_root_allocator<U> &other MY_ATTRIBUTE((unused))) {
+  Mem_root_allocator &operator=(const Mem_root_allocator<U> &other
+                                [[maybe_unused]]) {
     assert(m_memroot == other.memroot());  // Don't swap memroot.
   }
 
-  pointer allocate(size_type n,
-                   const_pointer hint MY_ATTRIBUTE((unused)) = nullptr) {
+  pointer allocate(size_type n, const_pointer hint [[maybe_unused]] = nullptr) {
     if (n == 0) return nullptr;
     if (n > max_size()) throw std::bad_alloc();
 
diff -Nru mysql-8.0-8.0.26/sql/mf_iocache.cc mysql-8.0-8.0.27/sql/mf_iocache.cc
--- mysql-8.0-8.0.26/sql/mf_iocache.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/mf_iocache.cc	2021-09-28 11:46:34.000000000 +0000
@@ -58,7 +58,7 @@
 */
 
 int _my_b_net_read(IO_CACHE *info, uchar *Buffer,
-                   size_t Count MY_ATTRIBUTE((unused))) {
+                   size_t Count [[maybe_unused]]) {
   ulong read_length;
   NET *net = current_thd->get_protocol_classic()->get_net();
   DBUG_TRACE;
diff -Nru mysql-8.0-8.0.26/sql/my_decimal.cc mysql-8.0-8.0.27/sql/my_decimal.cc
--- mysql-8.0-8.0.26/sql/my_decimal.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/my_decimal.cc	2021-09-28 11:46:34.000000000 +0000
@@ -149,6 +149,7 @@
   @param[in]   val         the decimal to print
   @param[out]  str         where to store the resulting string
   @param[in]   cs          character set
+  @param[in]   decimals    round to desired number of decimals
 
   @return error code
     @retval E_DEC_OK
@@ -161,9 +162,14 @@
   my_decimal.h from sql_string.h and sql_string.cc, which is not desirable.
 */
 bool str_set_decimal(uint mask, const my_decimal *val, String *str,
-                     const CHARSET_INFO *cs) {
+                     const CHARSET_INFO *cs, uint decimals) {
+  my_decimal dec_buf;
   if (!(cs->state & MY_CS_NONASCII)) {
     /* For ASCII-compatible character sets we can use my_decimal2string */
+    if (static_cast<int>(decimals) < val->frac) {
+      my_decimal_round(E_DEC_FATAL_ERROR, val, decimals, false, &dec_buf);
+      val = &dec_buf;
+    }
     my_decimal2string(mask, val, str);
     str->set_charset(cs);
     return false;
@@ -175,6 +181,10 @@
       with help of str->copy().
     */
     StringBuffer<DECIMAL_MAX_STR_LENGTH + 1> tmp(&my_charset_latin1);
+    if (static_cast<int>(decimals) < val->frac) {
+      my_decimal_round(E_DEC_FATAL_ERROR, val, decimals, false, &dec_buf);
+      val = &dec_buf;
+    }
     my_decimal2string(mask, val, &tmp);
     uint errors;
     return str->copy(tmp.ptr(), tmp.length(), &my_charset_latin1, cs, &errors);
diff -Nru mysql-8.0-8.0.26/sql/my_decimal.h mysql-8.0-8.0.27/sql/my_decimal.h
--- mysql-8.0-8.0.26/sql/my_decimal.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/my_decimal.h	2021-09-28 11:46:34.000000000 +0000
@@ -177,7 +177,7 @@
 #endif
 
 bool str_set_decimal(uint mask, const my_decimal *val, String *str,
-                     const CHARSET_INFO *cs);
+                     const CHARSET_INFO *cs, uint decimals);
 
 extern my_decimal decimal_zero;
 
@@ -225,6 +225,7 @@
   assert(precision || !scale);
   uint32 retval = (uint32)(precision + (scale > 0 ? 1 : 0) +
                            (unsigned_flag || !precision ? 0 : 1));
+  if (retval == 0) return 1;
   return retval;
 }
 
diff -Nru mysql-8.0-8.0.26/sql/mysqld.cc mysql-8.0-8.0.27/sql/mysqld.cc
--- mysql-8.0-8.0.26/sql/mysqld.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/mysqld.cc	2021-09-28 11:46:34.000000000 +0000
@@ -96,12 +96,17 @@
   follow when writing new code.
 
   New MySQL code uses the Google C++ coding style
-  (https://google.github.io/styleguide/cppguide.html), with one
-  exception:
+  (https://google.github.io/styleguide/cppguide.html), with two
+  exceptions:
 
   - Member variable names: Do not use foo_. Instead, use
     m_foo (non-static) or s_foo (static).
 
+  - Do not use non-const references as function parameters, even if they
+    are optional. Instead, use pointers for in/out and output parameters.
+    (This matches an older version of the Google style guide.) Do not use
+    references, whether const or non-const, as struct or class members.
+
   Old projects and modifications to old code use an older MySQL-specific
   style for the time being. Since 8.0, MySQL style uses the same formatting
   rules as Google coding style (e.g., brace placement, indentation, line
@@ -696,6 +701,7 @@
 #include "my_base.h"
 #include "my_bitmap.h"  // MY_BITMAP
 #include "my_command.h"
+#include "my_compiler.h"
 #include "my_dbug.h"
 #include "my_default.h"  // print_defaults
 #include "my_dir.h"
@@ -788,12 +794,12 @@
 #include "sql/mdl_context_backup.h"  // mdl_context_backup_manager
 #include "sql/my_decimal.h"
 #include "sql/mysqld_daemon.h"
-#include "sql/mysqld_thd_manager.h"              // Global_THD_manager
-#include "sql/opt_costconstantcache.h"           // delete_optimizer_cost_module
-#include "sql/opt_range.h"                       // range_optimizer_init
-#include "sql/options_mysqld.h"                  // OPT_THREAD_CACHE_SIZE
-#include "sql/partitioning/partition_handler.h"  // partitioning_init
-#include "sql/persisted_variable.h"              // Persisted_variables_cache
+#include "sql/mysqld_thd_manager.h"     // Global_THD_manager
+#include "sql/opt_costconstantcache.h"  // delete_optimizer_cost_module
+#include "sql/range_optimizer/range_optimizer.h"  // range_optimizer_init
+#include "sql/options_mysqld.h"                   // OPT_THREAD_CACHE_SIZE
+#include "sql/partitioning/partition_handler.h"   // partitioning_init
+#include "sql/persisted_variable.h"               // Persisted_variables_cache
 #include "sql/plugin_table.h"
 #include "sql/protocol.h"
 #include "sql/psi_memory_key.h"  // key_memory_MYSQL_RELAY_LOG_index
@@ -803,6 +809,7 @@
 #ifdef _WIN32
 #include "sql/restart_monitor_win.h"
 #endif
+#include "sql/rpl_async_conn_failover_configuration_propagation.h"
 #include "sql/rpl_filter.h"
 #include "sql/rpl_gtid.h"
 #include "sql/rpl_gtid_persist.h"  // Gtid_table_persistor
@@ -922,8 +929,6 @@
 #include <atomic>
 #include <functional>
 #include <new>
-#include <string>
-#include <vector>
 
 #ifndef EMBEDDED_LIBRARY
 #ifdef WITH_LOCK_ORDER
@@ -968,7 +973,7 @@
 #define fpu_control_t unsigned int
 #define _FPU_EXTENDED 0x300
 #define _FPU_DOUBLE 0x200
-#if defined(__GNUC__) || defined(__SUNPRO_CC)
+#if defined(__GNUC__)
 #define _FPU_GETCW(cw) asm volatile("fnstcw %0" : "=m"(*&cw))
 #define _FPU_SETCW(cw) asm volatile("fldcw %0" : : "m"(*&cw))
 #else
@@ -1104,6 +1109,7 @@
 static PSI_mutex_key key_LOCK_admin_tls_ctx_options;
 static PSI_mutex_key key_LOCK_rotate_binlog_master_key;
 static PSI_mutex_key key_LOCK_partial_revokes;
+static PSI_mutex_key key_LOCK_authentication_policy;
 #endif /* HAVE_PSI_INTERFACE */
 
 /**
@@ -1464,6 +1470,15 @@
 const char *mysqld_unix_port;
 char *opt_mysql_tmpdir;
 
+char *opt_authentication_policy;
+std::vector<std::string> authentication_policy_list;
+/*
+  keep track of plugin_ref until plugins used in opt_authentication_policy
+  are properly validated and updated. This will ensure that plugin is not
+  unloaded in between check() and update() of authentication_policy variable
+*/
+std::vector<plugin_ref> authentication_policy_plugin_ref;
+
 /** name of reference on left expression in rewritten IN subquery */
 const char *in_left_expr_name = "<left expr>";
 
@@ -1484,6 +1499,7 @@
 
 Rpl_global_filter rpl_global_filter;
 Rpl_filter *binlog_filter;
+Rpl_acf_configuration_handler *rpl_acf_configuration_handler = nullptr;
 Source_IO_monitor *rpl_source_io_monitor = nullptr;
 Udf_load_service udf_load_service;
 
@@ -1567,6 +1583,12 @@
 */
 mysql_mutex_t LOCK_rotate_binlog_master_key;
 
+/*
+  The below lock protects to execute commands 'CREATE/ALTER USER' and
+  'SET @@GLOBAL.authentication_policy...' in parallel.
+*/
+mysql_mutex_t LOCK_authentication_policy;
+
 bool mysqld_server_started = false;
 /**
   Set to true to signal at startup if the process must die.
@@ -2505,6 +2527,8 @@
   udf_load_service.deinit();
   delete rpl_source_io_monitor;
   rpl_source_io_monitor = nullptr;
+  delete rpl_acf_configuration_handler;
+  rpl_acf_configuration_handler = nullptr;
 
   if (use_slave_mask) bitmap_free(&slave_error_mask);
   my_tz_free();
@@ -2664,6 +2688,7 @@
   mysql_mutex_destroy(&LOCK_rotate_binlog_master_key);
   mysql_mutex_destroy(&LOCK_admin_tls_ctx_options);
   mysql_mutex_destroy(&LOCK_partial_revokes);
+  mysql_mutex_destroy(&LOCK_authentication_policy);
 }
 
 /****************************************************************************
@@ -3328,7 +3353,7 @@
    To overcome, one could put a MessageBox, but this will not work in service.
    Better solution is to print error message and sleep some minutes
    until debugger is attached
- */
+*/
   wait_for_debugger(DEBUGGER_ATTACH_TIMEOUT);
 #endif /* DEBUG_UNHANDLED_EXCEPTION_FILTER */
   __try {
@@ -3375,7 +3400,7 @@
 #else  // !_WIN32
 
 extern "C" {
-static void empty_signal_handler(int sig MY_ATTRIBUTE((unused))) {}
+static void empty_signal_handler(int sig [[maybe_unused]]) {}
 }
 
 void my_init_signals() {
@@ -3494,7 +3519,7 @@
 /** This thread handles SIGTERM, SIGQUIT, SIGHUP, SIGUSR1 and SIGUSR2 signals.
  */
 /* ARGSUSED */
-extern "C" void *signal_hand(void *arg MY_ATTRIBUTE((unused))) {
+extern "C" void *signal_hand(void *arg [[maybe_unused]]) {
   my_thread_init();
 
   sigset_t set;
@@ -3551,7 +3576,7 @@
       case SIGUSR2:
         signal_hand_thr_exit_code = MYSQLD_RESTART_EXIT;
 #ifndef __APPLE__  // Mac OS doesn't have sigwaitinfo.
-        //  Log a note if mysqld is restarted via kill command.
+                   //  Log a note if mysqld is restarted via kill command.
         if (sig_info.si_pid != getpid()) {
           sql_print_information(
               "Received signal SIGUSR2."
@@ -3559,7 +3584,7 @@
               server_version);
         }
 #endif             // __APPLE__
-        // fall through
+        [[fallthrough]];
       case SIGTERM:
       case SIGQUIT:
 #ifndef __APPLE__  // Mac OS doesn't have sigwaitinfo.
@@ -4480,6 +4505,127 @@
 #endif
 
 /**
+  Parse @@authentication_policy variable value.
+
+  @param [in]  val            Buffer holding variable value.
+  @param [out] policy_list    Vector holding the parsed values.
+
+  @retval  false    OK
+  @retval  true     Error
+*/
+bool parse_authentication_policy(char *val,
+                                 std::vector<std::string> &policy_list) {
+  std::string token;
+  std::string policy_val(val);
+  std::stringstream policy_str(val);
+  bool is_empty = false;
+  /* count comma */
+  size_t comma_cnt = std::count(policy_val.begin(), policy_val.end(), ',');
+  if (comma_cnt >= MAX_AUTH_FACTORS) return true;
+  /*
+    While parsing ensure that an empty value which means an optional nth factor,
+    should be followed with an empty value only.
+    Below are some invalid values:
+    'caching_sha2_password,,authentication_fido'
+    ',authentication_fido,authentication_ldap_simple'
+    ',authentication_fido,'
+    ',,'
+  */
+  while (getline(policy_str, token, ',')) {
+    std::string s(token);
+    /* trim spaces */
+    s.erase(std::remove(s.begin(), s.end(), ' '), s.end());
+    if (s.length() && is_empty) {
+      policy_list.clear();
+      return true;
+    };
+    if (!s.length()) is_empty = true;
+    policy_list.push_back(s);
+  }
+  /*
+    Values like 'caching_sha2_password,authentication_fido,' or
+    'caching_sha2_password,,' will not capture the last empty value, thus append
+    an empty value to the list.
+  */
+  if ((comma_cnt == policy_list.size()) &&
+      policy_list.size() < MAX_AUTH_FACTORS)
+    policy_list.push_back("");
+
+  if (policy_list.size() > MAX_AUTH_FACTORS) {
+    policy_list.clear();
+    return true;
+  }
+  return false;
+}
+
+/**
+  Validate @@authentication_policy variable value.
+
+  @param [in]  val    Buffer holding variable value.
+
+  @retval  false    success
+  @retval  true     failure
+*/
+bool validate_authentication_policy(char *val) {
+  std::vector<std::string> list;
+  if (parse_authentication_policy(val, list)) return true;
+  for (auto it = list.begin(); it != list.end(); it++) {
+    /* plugin name in first place holder cannot be empty */
+    if (!it->length()) {
+      if (list.size() == 1 || it == list.begin()) return true;
+    }
+    /* skip special characters like * and <empty> string */
+    if (!it->length()) continue;
+    if (!it->compare("*")) continue;
+    /* validate plugin name */
+    plugin_ref p = my_plugin_lock_by_name(nullptr, to_lex_cstring(it->c_str()),
+                                          MYSQL_AUTHENTICATION_PLUGIN);
+    if (!p) goto error;
+    st_mysql_auth *auth = (st_mysql_auth *)plugin_decl(p)->info;
+    /*
+      ensure 2nd and 3rd factor auth plugins which store password in mysql
+      server are not allowed.
+    */
+    if (it != list.begin() &&
+        auth->authentication_flags & AUTH_FLAG_USES_INTERNAL_STORAGE) {
+      authentication_policy_plugin_ref.push_back(p);
+      goto error;
+    }
+    /*
+      ensure plugin name in first place holder cannot be auth plugin
+      which requires registration step.
+    */
+    if (it == list.begin() &&
+        auth->authentication_flags & AUTH_FLAG_REQUIRES_REGISTRATION) {
+      authentication_policy_plugin_ref.push_back(p);
+      goto error;
+    }
+    authentication_policy_plugin_ref.push_back(p);
+  }
+  return false;
+error:
+  for (auto p : authentication_policy_plugin_ref) plugin_unlock(nullptr, p);
+  authentication_policy_plugin_ref.clear();
+  return true;
+}
+
+/**
+  Update @@authentication_policy variable value.
+
+  @retval  false    success
+  @retval  true     failure
+*/
+bool update_authentication_policy() {
+  std::vector<std::string> list;
+  if (parse_authentication_policy(opt_authentication_policy, list)) return true;
+  /* update the actual policy list only after validation is successfull */
+  authentication_policy_list = list;
+  /* release plugin reference */
+  for (auto p : authentication_policy_plugin_ref) plugin_unlock(nullptr, p);
+  authentication_policy_plugin_ref.clear();
+  return false;
+}
+/**
   Create a replication file name or base for file names.
 
   @param     key Instrumentation key used to track allocations
@@ -4685,13 +4831,6 @@
       line or configuration file.
     */
     if (!log_replica_updates_supplied) opt_log_replica_updates = false;
-    /*
-      The replica-preserve-commit-order should be disabled if binary log is
-      disabled and --replica-preserve-commit-order option is not set
-      explicitly on command line or configuration file.
-    */
-    if (!replica_preserve_commit_order_supplied)
-      opt_replica_preserve_commit_order = false;
   }
 
   if (opt_protocol_compression_algorithms) {
@@ -4720,7 +4859,6 @@
   if (!is_help_or_validate_option()) {
     LogErr(INFORMATION_LEVEL, ER_BASEDIR_SET_TO, mysql_home);
   }
-
   if (!opt_validate_config && (opt_initialize || opt_initialize_insecure)) {
     LogErr(SYSTEM_LEVEL, ER_STARTING_INIT, my_progname, server_version,
            (ulong)getpid());
@@ -5116,6 +5254,8 @@
                    MY_MUTEX_INIT_FAST);
   mysql_mutex_init(key_LOCK_partial_revokes, &LOCK_partial_revokes,
                    MY_MUTEX_INIT_FAST);
+  mysql_mutex_init(key_LOCK_authentication_policy, &LOCK_authentication_policy,
+                   MY_MUTEX_INIT_FAST);
   return 0;
 }
 
@@ -5413,18 +5553,19 @@
 }
 
 static void setup_error_log() {
-/* Setup logs */
+  /* Setup logs */
+
+  /*
+    Enable old-fashioned error log, except when the user has requested
+    help information. Since the implementation of plugin server
+    variables the help output is now written much later.
+
+    log_error_dest can be:
+    disabled_my_option     --log-error was not used or --log-error=
+    ""                     --log-error without arguments (no '=')
+    filename               --log-error=filename
+   */
 
-/*
-  Enable old-fashioned error log, except when the user has requested
-  help information. Since the implementation of plugin server
-  variables the help output is now written much later.
-
-  log_error_dest can be:
-  disabled_my_option     --log-error was not used or --log-error=
-  ""                     --log-error without arguments (no '=')
-  filename               --log-error=filename
-*/
 #ifdef _WIN32
   /*
     Enable the error log file only if console option is not specified
@@ -5592,7 +5733,7 @@
         return 1;
       } /* purecov: end */
     }   // value was OK, but could not be set
-    // If we arrive here, the value was OK, and was set successfully.
+        // If we arrive here, the value was OK, and was set successfully.
   } else {
     /*
       We were given an illegal value at start-up, so the default was
@@ -6471,6 +6612,10 @@
 #endif
     locked_in_memory = false;
 
+  rpl_acf_configuration_handler = new Rpl_acf_configuration_handler();
+  if (rpl_acf_configuration_handler->init()) {
+    unireg_abort(MYSQLD_ABORT_EXIT);
+  }
   rpl_source_io_monitor = new Source_IO_monitor();
   udf_load_service.init();
 
@@ -6950,7 +7095,7 @@
 
 #ifdef HAVE_PSI_THREAD_INTERFACE
   /* Instrument the main thread */
-  PSI_thread *psi = PSI_THREAD_CALL(new_thread)(key_thread_main, nullptr, 0);
+  PSI_thread *psi = PSI_THREAD_CALL(new_thread)(key_thread_main, 0, nullptr, 0);
   PSI_THREAD_CALL(set_thread_os_id)(psi);
   PSI_THREAD_CALL(set_thread)(psi);
 #endif /* HAVE_PSI_THREAD_INTERFACE */
@@ -7500,9 +7645,17 @@
   //  Start signal handler thread.
   start_signal_handler();
 #endif
-
+  if (opt_authentication_policy &&
+      validate_authentication_policy(opt_authentication_policy)) {
+    /* --authentication_policy is set to invalid value */
+    LogErr(ERROR_LEVEL, ER_INVALID_AUTHENTICATION_POLICY);
+    return 1;
+  } else {
+    /* update the value */
+    update_authentication_policy();
+  }
   /* set all persistent options */
-  if (persisted_variables_cache.set_persist_options()) {
+  if (persisted_variables_cache.set_persist_options(false, true)) {
     LogErr(ERROR_LEVEL, ER_CANT_SET_UP_PERSISTED_VALUES);
     flush_error_log_messages();
     return 1;
@@ -8761,116 +8914,6 @@
 }
 #endif
 
-/**
-  After Multisource replication, this function only shows the value
-  of default channel.
-
-  To know the status of other channels, performance schema replication
-  tables comes to the rescue.
-
-  @todo  Any warning needed if multiple channels exist to request
-         the users to start using replication performance schema
-         tables.
-*/
-static int show_slave_running(THD *, SHOW_VAR *var, char *buff) {
-  channel_map.rdlock();
-  Master_info *mi = channel_map.get_default_channel_mi();
-
-  if (mi) {
-    var->type = SHOW_MY_BOOL;
-    var->value = buff;
-    *((bool *)buff) =
-        (bool)(mi && mi->slave_running == MYSQL_SLAVE_RUN_CONNECT &&
-               mi->rli->slave_running);
-  } else
-    var->type = SHOW_UNDEF;
-
-  channel_map.unlock();
-  return 0;
-}
-
-/**
-  This status variable is also exclusively (look comments on
-  show_slave_running()) for default channel.
-*/
-static int show_slave_retried_trans(THD *, SHOW_VAR *var, char *buff) {
-  channel_map.rdlock();
-  Master_info *mi = channel_map.get_default_channel_mi();
-
-  if (mi) {
-    var->type = SHOW_LONG;
-    var->value = buff;
-    *((long *)buff) = (long)mi->rli->retried_trans;
-  } else
-    var->type = SHOW_UNDEF;
-
-  channel_map.unlock();
-  return 0;
-}
-
-/**
-  Only for default channel. Refer to comments on show_slave_running()
-*/
-static int show_slave_received_heartbeats(THD *, SHOW_VAR *var, char *buff) {
-  channel_map.rdlock();
-  Master_info *mi = channel_map.get_default_channel_mi();
-
-  if (mi) {
-    var->type = SHOW_LONGLONG;
-    var->value = buff;
-    *((longlong *)buff) = mi->received_heartbeats;
-  } else
-    var->type = SHOW_UNDEF;
-
-  channel_map.unlock();
-  return 0;
-}
-
-/**
-  Only for default channel. Refer to comments on show_slave_running()
-*/
-static int show_slave_last_heartbeat(THD *thd, SHOW_VAR *var, char *buff) {
-  MYSQL_TIME received_heartbeat_time;
-
-  channel_map.rdlock();
-  Master_info *mi = channel_map.get_default_channel_mi();
-
-  if (mi) {
-    var->type = SHOW_CHAR;
-    var->value = buff;
-    if (mi->last_heartbeat == 0)
-      buff[0] = '\0';
-    else {
-      thd->variables.time_zone->gmt_sec_to_TIME(
-          &received_heartbeat_time,
-          static_cast<my_time_t>(mi->last_heartbeat / 1000000));
-      my_datetime_to_str(received_heartbeat_time, buff, 0);
-    }
-  } else
-    var->type = SHOW_UNDEF;
-
-  channel_map.unlock();
-  return 0;
-}
-
-/**
-  Only for default channel. For details, refer to show_slave_running()
-*/
-static int show_heartbeat_period(THD *, SHOW_VAR *var, char *buff) {
-  channel_map.rdlock();
-  Master_info *mi = channel_map.get_default_channel_mi();
-
-  if (mi) {
-    var->type = SHOW_CHAR;
-    var->value = buff;
-    sprintf(buff, "%.3f", mi->heartbeat_period);
-  } else
-    var->type = SHOW_UNDEF;
-
-  channel_map.unlock();
-  return 0;
-}
-
 #ifndef NDEBUG
 static int show_replica_rows_last_search_algorithm_used(THD *, SHOW_VAR *var,
                                                         char *buff) {
@@ -9247,21 +9290,11 @@
      SHOW_LONGLONG_STATUS, SHOW_SCOPE_ALL},
     {"Slave_open_temp_tables", (char *)&show_replica_open_temp_tables,
      SHOW_FUNC, SHOW_SCOPE_GLOBAL},
-    {"Slave_retried_transactions", (char *)&show_slave_retried_trans, SHOW_FUNC,
-     SHOW_SCOPE_GLOBAL},
-    {"Slave_heartbeat_period", (char *)&show_heartbeat_period, SHOW_FUNC,
-     SHOW_SCOPE_GLOBAL},
-    {"Slave_received_heartbeats", (char *)&show_slave_received_heartbeats,
-     SHOW_FUNC, SHOW_SCOPE_GLOBAL},
-    {"Slave_last_heartbeat", (char *)&show_slave_last_heartbeat, SHOW_FUNC,
-     SHOW_SCOPE_GLOBAL},
 #ifndef NDEBUG
     {"Slave_rows_last_search_algorithm_used",
      (char *)&show_replica_rows_last_search_algorithm_used, SHOW_FUNC,
      SHOW_SCOPE_GLOBAL},
 #endif
-    {"Slave_running", (char *)&show_slave_running, SHOW_FUNC,
-     SHOW_SCOPE_GLOBAL},
     {"Slow_launch_threads",
      (char *)&Per_thread_connection_handler::slow_launch_threads, SHOW_LONG,
      SHOW_SCOPE_ALL},
@@ -9436,8 +9469,7 @@
 }
 
 static void print_help() {
-  MEM_ROOT mem_root;
-  init_alloc_root(key_memory_help, &mem_root, 4096, 4096);
+  MEM_ROOT mem_root(key_memory_help, 4096);
 
   all_options.pop_back();
   sys_var_add_options(&all_options, sys_var::PARSE_EARLY);
@@ -9451,7 +9483,7 @@
   my_print_help(&all_options[0]);
   my_print_variables(&all_options[0]);
 
-  free_root(&mem_root, MYF(0));
+  mem_root.Clear();
   vector<my_option>().swap(all_options);  // Deletes the vector contents.
 }
 
@@ -9719,7 +9751,7 @@
 }
 
 bool mysqld_get_one_option(int optid,
-                           const struct my_option *opt MY_ATTRIBUTE((unused)),
+                           const struct my_option *opt [[maybe_unused]],
                            char *argument) {
   Rpl_filter *rpl_filter = nullptr;
   char *filter_val;
@@ -9798,7 +9830,7 @@
       break;
     case 'L':
       push_deprecated_warn(nullptr, "--language/-l", "'--lc-messages-dir'");
-      /* Note:  fall-through */
+      [[fallthrough]];
     case OPT_LC_MESSAGES_DIRECTORY:
       strmake(lc_messages_dir, argument, sizeof(lc_messages_dir) - 1);
       lc_messages_dir_ptr = lc_messages_dir;
@@ -10096,7 +10128,7 @@
       break;
     case OPT_PLUGIN_LOAD:
       free_list(opt_plugin_load_list_ptr);
-      /* fall through */
+      [[fallthrough]];
     case OPT_PLUGIN_LOAD_ADD:
       opt_plugin_load_list_ptr->push_back(new i_string(argument));
       break;
@@ -10534,8 +10566,8 @@
 #endif
 
 static void set_server_version(void) {
-  char *end MY_ATTRIBUTE((unused)) = strxmov(
-      server_version, MYSQL_SERVER_VERSION, MYSQL_SERVER_SUFFIX_STR, NullS);
+  char *end [[maybe_unused]] = strxmov(server_version, MYSQL_SERVER_VERSION,
+                                       MYSQL_SERVER_SUFFIX_STR, NullS);
 #ifndef NDEBUG
   if (!strstr(MYSQL_SERVER_SUFFIX_STR, "-debug"))
     end = my_stpcpy(end, "-debug");
@@ -11119,6 +11151,8 @@
 PSI_mutex_key key_commit_order_manager_mutex;
 PSI_mutex_key key_mutex_replica_worker_hash;
 PSI_mutex_key key_monitor_info_run_lock;
+PSI_mutex_key key_LOCK_delegate_connection_mutex;
+PSI_mutex_key key_LOCK_group_replication_connection_mutex;
 
 /* clang-format off */
 static PSI_mutex_info all_server_mutexes[]=
@@ -11205,7 +11239,10 @@
   { &key_LOCK_tls_ctx_options, "LOCK_tls_ctx_options", 0, 0, "A lock to control all of the --ssl-* CTX related command line options for client server connection port"},
   { &key_LOCK_admin_tls_ctx_options, "LOCK_admin_tls_ctx_options", 0, 0, "A lock to control all of the --ssl-* CTX related command line options for administrative connection port"},
   { &key_LOCK_rotate_binlog_master_key, "LOCK_rotate_binlog_master_key", PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME},
-  { &key_monitor_info_run_lock, "Source_IO_monitor::run_lock", 0, 0, PSI_DOCUMENT_ME}
+  { &key_monitor_info_run_lock, "Source_IO_monitor::run_lock", 0, 0, PSI_DOCUMENT_ME},
+  { &key_LOCK_delegate_connection_mutex, "LOCK_delegate_connection_mutex", PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME},
+  { &key_LOCK_group_replication_connection_mutex, "LOCK_group_replication_connection_mutex", PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME},
+  { &key_LOCK_authentication_policy, "LOCK_authentication_policy", PSI_FLAG_SINGLETON, 0, "A lock to ensure execution of CREATE USER or ALTER USER sql and SET @@global.authentication_policy variable are serialized"}
 };
 /* clang-format on */
 
@@ -11275,6 +11312,8 @@
 PSI_cond_key key_commit_order_manager_cond;
 PSI_cond_key key_cond_slave_worker_hash;
 PSI_cond_key key_monitor_info_run_cond;
+PSI_cond_key key_COND_delegate_connection_cond_var;
+PSI_cond_key key_COND_group_replication_connection_cond_var;
 
 /* clang-format off */
 static PSI_cond_info all_server_conds[]=
@@ -11315,7 +11354,9 @@
   { &key_COND_compress_gtid_table, "COND_compress_gtid_table", PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME},
   { &key_commit_order_manager_cond, "Commit_order_manager::m_workers.cond", 0, 0, PSI_DOCUMENT_ME},
   { &key_cond_slave_worker_hash, "Relay_log_info::replica_worker_hash_cond", 0, 0, PSI_DOCUMENT_ME},
-  { &key_monitor_info_run_cond, "Source_IO_monitor::run_cond", 0, 0, PSI_DOCUMENT_ME}
+  { &key_monitor_info_run_cond, "Source_IO_monitor::run_cond", 0, 0, PSI_DOCUMENT_ME},
+  { &key_COND_delegate_connection_cond_var, "THD::COND_delegate_connection_cond_var", 0, 0, PSI_DOCUMENT_ME},
+  { &key_COND_group_replication_connection_cond_var, "THD::COND_group_replication_connection_cond_var", 0, 0, PSI_DOCUMENT_ME}
 };
 /* clang-format on */
 
@@ -11330,19 +11371,20 @@
 static PSI_thread_info all_server_threads[]=
 {
 #if defined (_WIN32)
-  { &key_thread_handle_con_namedpipes, "con_named_pipes", PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME},
-  { &key_thread_handle_con_sharedmem, "con_shared_mem", PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME},
-  { &key_thread_handle_con_sockets, "con_sockets", PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME},
-  { &key_thread_handle_shutdown_restart, "shutdown_restart", PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME},
+  { &key_thread_handle_con_namedpipes, "con_named_pipes", "con_pipe", PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME},
+  { &key_thread_handle_con_sharedmem, "con_shared_mem", "con_shm", PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME},
+  { &key_thread_handle_con_sockets, "con_sockets", "con_sock", PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME},
+  { &key_thread_handle_shutdown_restart, "shutdown_restart", "down_up", PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME},
 #endif /* _WIN32 */
-  { &key_thread_bootstrap, "bootstrap", PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME},
-  { &key_thread_handle_manager, "manager", PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME},
-  { &key_thread_main, "main", PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME},
-  { &key_thread_one_connection, "one_connection", PSI_FLAG_USER, 0, PSI_DOCUMENT_ME},
-  { &key_thread_signal_hand, "signal_handler", PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME},
-  { &key_thread_compress_gtid_table, "compress_gtid_table", PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME},
-  { &key_thread_parser_service, "parser_service", PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME},
-  { &key_thread_handle_con_admin_sockets, "admin_interface", PSI_FLAG_USER, 0, PSI_DOCUMENT_ME},
+  { &key_thread_bootstrap, "bootstrap", "boot", PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME},
+  { &key_thread_handle_manager, "manager", "handle_mgr", PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME},
+  { &key_thread_main, "main", "main", PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME},
+  { &key_thread_one_connection, "one_connection", "connection",
+PSI_FLAG_USER | PSI_FLAG_NO_SEQNUM, 0, PSI_DOCUMENT_ME},
+  { &key_thread_signal_hand, "signal_handler", "sig_handler", PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME},
+  { &key_thread_compress_gtid_table, "compress_gtid_table", "gtid_zip", PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME},
+  { &key_thread_parser_service, "parser_service", "parser_srv", PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME},
+  { &key_thread_handle_con_admin_sockets, "admin_interface", "con_admin", PSI_FLAG_USER, 0, PSI_DOCUMENT_ME},
 };
 /* clang-format on */
 
@@ -11503,6 +11545,7 @@
 PSI_stage_info stage_rpl_failover_fetching_source_member_details= { 0, "Fetching source member details from connected source", 0, PSI_DOCUMENT_ME};
 PSI_stage_info stage_rpl_failover_updating_source_member_details= { 0, "Updating fetched source member details on receiver", 0, PSI_DOCUMENT_ME};
 PSI_stage_info stage_rpl_failover_wait_before_next_fetch= { 0, "Wait before trying to fetch next membership changes from source", 0, PSI_DOCUMENT_ME};
+PSI_stage_info stage_communication_delegation= { 0, "Connection delegated to Group Replication", 0, PSI_DOCUMENT_ME};
 /* clang-format on */
 
 extern PSI_stage_info stage_waiting_for_disk_space;
@@ -11605,7 +11648,8 @@
     &stage_binlog_transaction_decompress,
     &stage_rpl_failover_fetching_source_member_details,
     &stage_rpl_failover_updating_source_member_details,
-    &stage_rpl_failover_wait_before_next_fetch};
+    &stage_rpl_failover_wait_before_next_fetch,
+    &stage_communication_delegation};
 
 PSI_socket_key key_socket_tcpip;
 PSI_socket_key key_socket_unix;
diff -Nru mysql-8.0-8.0.26/sql/mysqld.h mysql-8.0-8.0.27/sql/mysqld.h
--- mysql-8.0-8.0.26/sql/mysqld.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/mysqld.h	2021-09-28 11:46:34.000000000 +0000
@@ -30,13 +30,14 @@
 #include <sys/types.h>
 #include <time.h>
 #include <atomic>
+#include <string>
+#include <vector>
 
 #include <mysql/components/minimal_chassis.h>
 #include <mysql/components/services/dynamic_loader_scheme_file.h>
 #include "lex_string.h"
 #include "m_ctype.h"
 #include "my_command.h"
-#include "my_compiler.h"
 #include "my_compress.h"
 #include "my_getopt.h"
 #include "my_hostname.h"  // HOSTNAME_LENGTH
@@ -67,6 +68,7 @@
 #include "sql/sql_const.h"  // UUID_LENGTH
 
 class Rpl_global_filter;
+class Rpl_acf_configuration_handler;
 class Source_IO_monitor;
 class THD;
 class Time_zone;
@@ -103,6 +105,8 @@
 #define TEST_DO_QUICK_LEAK_CHECK       \
   4096 /**< Do Valgrind leak check for \
           each command. */
+#define TEST_NO_TEMP_TABLES \
+  8192 /**< No temp table engine is loaded, so use dummy costs. */
 
 #define SPECIAL_NO_NEW_FUNC 2     /* Skip new functions */
 #define SPECIAL_SKIP_SHOW_DB 4    /* Don't allow 'show db' */
@@ -173,6 +177,7 @@
 extern bool opt_replica_compressed_protocol;
 extern ulong replica_exec_mode_options;
 extern Rpl_global_filter rpl_global_filter;
+extern Rpl_acf_configuration_handler *rpl_acf_configuration_handler;
 extern Source_IO_monitor *rpl_source_io_monitor;
 extern int32_t opt_regexp_time_limit;
 extern int32_t opt_regexp_stack_limit;
@@ -338,6 +343,8 @@
   ABORT_SERVER = 1
 };
 extern const char *binlog_error_action_list[];
+extern char *opt_authentication_policy;
+extern std::vector<std::string> authentication_policy_list;
 
 extern ulong stored_program_cache_size;
 extern ulong back_log;
@@ -441,6 +448,8 @@
 extern PSI_mutex_key key_mta_gaq_LOCK;
 extern PSI_mutex_key key_thd_timer_mutex;
 extern PSI_mutex_key key_monitor_info_run_lock;
+extern PSI_mutex_key key_LOCK_delegate_connection_mutex;
+extern PSI_mutex_key key_LOCK_group_replication_connection_mutex;
 
 extern PSI_mutex_key key_commit_order_manager_mutex;
 extern PSI_mutex_key key_mutex_replica_worker_hash;
@@ -477,6 +486,7 @@
 extern PSI_cond_key key_COND_thr_lock;
 extern PSI_cond_key key_cond_slave_worker_hash;
 extern PSI_cond_key key_commit_order_manager_cond;
+extern PSI_cond_key key_COND_group_replication_connection_cond_var;
 extern PSI_thread_key key_thread_bootstrap;
 extern PSI_thread_key key_thread_handle_manager;
 extern PSI_thread_key key_thread_one_connection;
@@ -621,6 +631,7 @@
 extern PSI_stage_info stage_rpl_failover_fetching_source_member_details;
 extern PSI_stage_info stage_rpl_failover_updating_source_member_details;
 extern PSI_stage_info stage_rpl_failover_wait_before_next_fetch;
+extern PSI_stage_info stage_communication_delegation;
 #ifdef HAVE_PSI_STATEMENT_INTERFACE
 /**
   Statement instrumentation keys (sql).
@@ -697,6 +708,7 @@
 extern mysql_mutex_t LOCK_admin_tls_ctx_options;
 extern mysql_mutex_t LOCK_rotate_binlog_master_key;
 extern mysql_mutex_t LOCK_partial_revokes;
+extern mysql_mutex_t LOCK_authentication_policy;
 
 extern mysql_cond_t COND_server_started;
 extern mysql_cond_t COND_compress_gtid_table;
@@ -719,15 +731,14 @@
 char ***get_remaining_argv();
 
 /* increment query_id and return it.  */
-inline MY_ATTRIBUTE((warn_unused_result)) query_id_t next_query_id() {
+[[nodiscard]] inline query_id_t next_query_id() {
   return ++atomic_global_query_id;
 }
 
 #define ER(X) please_use_ER_THD_or_ER_DEFAULT_instead(X)
 
 /* Accessor function for _connection_events_loop_aborted flag */
-inline MY_ATTRIBUTE(
-    (warn_unused_result)) bool connection_events_loop_aborted() {
+[[nodiscard]] inline bool connection_events_loop_aborted() {
   return connection_events_loop_aborted_flag.load();
 }
 
@@ -781,6 +792,10 @@
 
 bool check_and_update_partial_revokes_sysvar(THD *thd);
 
+bool parse_authentication_policy(char *val,
+                                 std::vector<std::string> &policy_list);
+bool validate_authentication_policy(char *val);
+bool update_authentication_policy();
 #ifdef _WIN32
 
 bool is_windows_service();
diff -Nru mysql-8.0-8.0.26/sql/mysqld_thd_manager.cc mysql-8.0-8.0.27/sql/mysqld_thd_manager.cc
--- mysql-8.0-8.0.26/sql/mysqld_thd_manager.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/mysqld_thd_manager.cc	2021-09-28 11:46:34.000000000 +0000
@@ -58,11 +58,7 @@
 
 bool Find_thd_with_id::operator()(THD *thd) {
   if (thd->get_command() == COM_DAEMON) return false;
-  if (thd->thread_id() == m_thread_id) {
-    mysql_mutex_lock(&thd->LOCK_thd_data);
-    return true;
-  }
-  return false;
+  return (thd->thread_id() == m_thread_id);
 }
 
 /**
@@ -99,6 +95,35 @@
   Find_THD_Impl *m_impl;
 };
 
+THD_ptr::THD_ptr(THD *thd) : m_underlying(thd) {
+  if (m_underlying != nullptr) {
+    mysql_mutex_assert_not_owner(&m_underlying->LOCK_thd_data);
+    mysql_mutex_lock(&m_underlying->LOCK_thd_data);
+  }
+}
+
+THD_ptr::THD_ptr(THD_ptr &&thd_ptr) {
+  if (m_underlying != nullptr) mysql_mutex_unlock(&m_underlying->LOCK_thd_data);
+  m_underlying = thd_ptr.m_underlying;
+  thd_ptr.m_underlying = nullptr;
+}
+
+THD_ptr &THD_ptr::operator=(THD_ptr &&thd_ptr) {
+  if (m_underlying != nullptr) mysql_mutex_unlock(&m_underlying->LOCK_thd_data);
+  m_underlying = thd_ptr.m_underlying;
+  thd_ptr.m_underlying = nullptr;
+  return *this;
+}
+
+THD *THD_ptr::release() {
+  if (m_underlying == nullptr) return nullptr;
+
+  THD *tmp = m_underlying;
+  mysql_mutex_unlock(&m_underlying->LOCK_thd_data);
+  m_underlying = nullptr;
+  return tmp;
+}
+
 #ifdef HAVE_PSI_INTERFACE
 static PSI_mutex_key key_LOCK_thd_list;
 static PSI_mutex_key key_LOCK_thd_remove;
@@ -237,8 +262,7 @@
   if (thread_id == reserved_thread_id)
     return;  // Some temporary THDs are never given a proper ID.
   MUTEX_LOCK(lock, &LOCK_thread_ids);
-  const size_t num_erased MY_ATTRIBUTE((unused)) =
-      thread_ids.erase_unique(thread_id);
+  const size_t num_erased [[maybe_unused]] = thread_ids.erase_unique(thread_id);
   // Assert if the ID was not found in the list.
   assert(1 == num_erased);
 }
@@ -290,20 +314,24 @@
   }
 }
 
-THD *Global_THD_manager::find_thd(Find_THD_Impl *func) {
+THD_ptr Global_THD_manager::find_thd(Find_THD_Impl *func) {
   Find_THD find_thd(func);
   for (int i = 0; i < NUM_PARTITIONS; i++) {
     MUTEX_LOCK(lock, &LOCK_thd_list[i]);
     THD_array::const_iterator it =
         std::find_if(thd_list[i].begin(), thd_list[i].end(), find_thd);
-    if (it != thd_list[i].end()) return (*it);
+    if (it != thd_list[i].end()) {
+      THD_ptr thd_ptr(*it);
+      if (!thd_ptr->is_being_disposed()) return thd_ptr;
+      break;
+    }
   }
-  return nullptr;
+  return THD_ptr{nullptr};
 }
 
 // Optimized version of the above function for when we know
 // the thread_id of the THD we are looking for.
-THD *Global_THD_manager::find_thd(Find_thd_with_id *func) {
+THD_ptr Global_THD_manager::find_thd(Find_thd_with_id *func) {
   Find_THD find_thd(func);
   // Since we know the thread_id, we can check the correct
   // partition directly.
@@ -311,8 +339,11 @@
   MUTEX_LOCK(lock, &LOCK_thd_list[partition]);
   THD_array::const_iterator it = std::find_if(
       thd_list[partition].begin(), thd_list[partition].end(), find_thd);
-  if (it != thd_list[partition].end()) return (*it);
-  return nullptr;
+  if (it != thd_list[partition].end()) {
+    THD_ptr thd_ptr(*it);
+    if (!thd_ptr->is_being_disposed()) return thd_ptr;
+  }
+  return THD_ptr{nullptr};
 }
 
 void inc_thread_created() {
diff -Nru mysql-8.0-8.0.26/sql/mysqld_thd_manager.h mysql-8.0-8.0.27/sql/mysqld_thd_manager.h
--- mysql-8.0-8.0.26/sql/mysqld_thd_manager.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/mysqld_thd_manager.h	2021-09-28 11:46:34.000000000 +0000
@@ -42,6 +42,10 @@
 /**
   Base class to perform actions on all thds in the thd list.
   Users of do_for_all_thd() need to subclass this and override operator().
+
+  @note THD can be in the disposal state. Accessing resources freed in disposal
+        state is not safe. Before accessing any such resources in operator()
+        please check THD state.
 */
 
 class Do_THD_Impl {
@@ -74,9 +78,6 @@
 /**
   Callback function used by kill_one_thread and timer_notify functions
   to find "thd" based on the thread id.
-
-  @note It acquires LOCK_thd_data mutex when it finds matching thd.
-  It is the responsibility of the caller to release this mutex.
 */
 class Find_thd_with_id : public Find_THD_Impl {
  public:
@@ -87,6 +88,103 @@
 };
 
 /**
+  This class encapsulates THD instance, controls access to the actual THD.
+  It also ensures that THD::LOCK_thd_data mutex is acquired at instantiation and
+  released at destruction.
+*/
+class THD_ptr {
+ public:
+  /**
+    Default class constructor.
+  */
+  THD_ptr() = default;
+  /**
+    Constructor assigns THD instance to manage and acquires THD::LOCK_thd_data
+    mutex.
+    @param   thd   THD instance.
+  */
+  explicit THD_ptr(THD *thd);
+  /**
+    Delete copy constructor, THD_ptr copy is not allowed.
+  */
+  THD_ptr(THD_ptr const &) = delete;
+  /**
+    Move constructor.
+    @param  thd_ptr    THD_ptr instance to collect underlying THD instance.
+  */
+  THD_ptr(THD_ptr &&thd_ptr);
+
+  /**
+    Destructor to release underlying THD instance's control and release mutex
+    THD::LOCK_thd_data.
+  */
+  ~THD_ptr() { release(); }
+  /**
+    Release underlying THD instance's control and release THD::LOCK_thd_data.
+    @returns  underlying THD instance.
+  */
+  THD *release();
+
+  /**
+    Delete copy operator, THD_ptr copy is not allowed.
+  */
+  THD_ptr &operator=(THD_ptr const &) = delete;
+  /**
+    Move semantics assignment operator.
+    @param  thd_ptr    THD_ptr instance to collect underlying THD instance.
+  */
+  THD_ptr &operator=(THD_ptr &&thd_ptr);
+
+  /**
+    Access underlying THD instance.
+    returns pointer to underlying THD instance.
+  */
+  THD *get() { return m_underlying; }
+  /**
+    Access underlying THD instance.
+    returns pointer to underlying THD instance.
+  */
+  THD *operator->() { return m_underlying; }
+  /**
+    Access underlying THD instance.
+    returns reference to underlying THD instance.
+  */
+  THD &operator*() { return *m_underlying; }
+
+  /**
+    Check if there is an underlying THD instance.
+  */
+  operator bool() const { return m_underlying != nullptr; }
+
+  /**
+    Compare underlying THD pointer value with the "nullptr".
+    @returns true if underlying THD pointer value equals "nullptr".
+  */
+  bool operator==(std::nullptr_t) const { return m_underlying == nullptr; }
+  /**
+    Compare this instance with other THD_ptr instance.
+    @param  thd_ptr    Other THD_ptr instance for comparison.
+    @returns true if this instance equals other THD_ptr instance.
+  */
+  bool operator==(THD const *thd_ptr) const { return m_underlying == thd_ptr; }
+  /**
+    Compare underlying THD pointer value with the "nullptr".
+    @returns true if underlying THD pointer value *not* equals nullptr.
+  */
+  bool operator!=(std::nullptr_t) const { return m_underlying != nullptr; }
+  /**
+    Compare this instance with other THD_ptr instance.
+    @param  thd_ptr    Other THD_ptr instance for comparison.
+    @returns true if this instance differs from other THD_ptr instance.
+  */
+  bool operator!=(THD const *thd_ptr) const { return m_underlying != thd_ptr; }
+
+ private:
+  // Underlying THD instance to manage.
+  THD *m_underlying{nullptr};
+};
+
+/**
   This class maintains THD object of all registered threads.
   It provides interface to perform functions such as find, count,
   perform some action for each THD object in the list.
@@ -227,15 +325,16 @@
   void do_for_all_thd(Do_THD_Impl *func);
 
   /**
-    Returns a pointer to the first THD for which operator() returns true.
+    Returns a THD_ptr containing first THD for which operator() returns true.
+
     @param func Object of class which overrides operator()
-    @return THD
-      @retval THD* Matching THD
-      @retval NULL When THD is not found
+    @return THD_ptr
+      @retval THD_ptr{THD*}    When matching THD is found.
+      @retval THD_ptr{nullptr} When THD is *not* found.
   */
-  THD *find_thd(Find_THD_Impl *func);
+  THD_ptr find_thd(Find_THD_Impl *func);
 
-  THD *find_thd(Find_thd_with_id *func);
+  THD_ptr find_thd(Find_thd_with_id *func);
 
   // Declared static as it is referenced in handle_fatal_signal()
   static std::atomic<uint> atomic_global_thd_count;
diff -Nru mysql-8.0-8.0.26/sql/mysql_tzinfo_to_sql.cc mysql-8.0-8.0.27/sql/mysql_tzinfo_to_sql.cc
--- mysql-8.0-8.0.26/sql/mysql_tzinfo_to_sql.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/mysql_tzinfo_to_sql.cc	2021-09-28 11:46:34.000000000 +0000
@@ -305,14 +305,14 @@
           return true;
         }
       } else if (MY_S_ISREG(cur_dir->dir_entry[i].mystat->st_mode)) {
-        init_alloc_root(PSI_NOT_INSTRUMENTED, &tz_storage, 32768, 0);
+        ::new ((void *)&tz_storage) MEM_ROOT(PSI_NOT_INSTRUMENTED, 32768);
         if (!tz_load(fullname, &tz_info, &tz_storage))
           print_tz_as_sql(root_name_end + 1, &tz_info);
         else
           fprintf(stderr,
                   "Warning: Unable to load '%s' as time zone. Skipping it.\n",
                   fullname);
-        free_root(&tz_storage, MYF(0));
+        tz_storage.Clear();
       } else
         fprintf(stderr, "Warning: '%s' is not regular file or directory\n",
                 fullname);
@@ -354,7 +354,7 @@
     }
     printf("COMMIT;\n");
   } else {
-    init_alloc_root(PSI_NOT_INSTRUMENTED, &tz_storage, 32768, 0);
+    ::new ((void *)&tz_storage) MEM_ROOT(PSI_NOT_INSTRUMENTED, 32768);
 
     if (strcmp(argv[1], "--leap") == 0) {
       if (tz_load(argv[2], &tz_info, &tz_storage)) {
@@ -372,7 +372,7 @@
       printf("COMMIT;\n");
     }
 
-    free_root(&tz_storage, MYF(0));
+    tz_storage.Clear();
   }
 
   return 0;
diff -Nru mysql-8.0-8.0.26/sql/opt_costconstantcache.cc mysql-8.0-8.0.27/sql/opt_costconstantcache.cc
--- mysql-8.0-8.0.26/sql/opt_costconstantcache.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/opt_costconstantcache.cc	2021-09-28 11:46:34.000000000 +0000
@@ -249,9 +249,9 @@
   */
 
   // Prepare to read from the table
-  unique_ptr_destroy_only<RowIterator> iterator = init_table_iterator(
-      thd, table, nullptr,
-      /*ignore_not_found_rows=*/false, /*count_examined_rows=*/false);
+  unique_ptr_destroy_only<RowIterator> iterator =
+      init_table_iterator(thd, table, /*ignore_not_found_rows=*/false,
+                          /*count_examined_rows=*/false);
   if (iterator != nullptr) {
     table->use_all_columns();
 
@@ -314,9 +314,9 @@
   */
 
   // Prepare to read from the table
-  unique_ptr_destroy_only<RowIterator> iterator = init_table_iterator(
-      thd, table, nullptr,
-      /*ignore_not_found_rows=*/false, /*count_examined_rows=*/false);
+  unique_ptr_destroy_only<RowIterator> iterator =
+      init_table_iterator(thd, table, /*ignore_not_found_rows=*/false,
+                          /*count_examined_rows=*/false);
   if (iterator != nullptr) {
     table->use_all_columns();
 
diff -Nru mysql-8.0-8.0.26/sql/opt_explain.cc mysql-8.0-8.0.27/sql/opt_explain.cc
--- mysql-8.0-8.0.26/sql/opt_explain.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/opt_explain.cc	2021-09-28 11:46:34.000000000 +0000
@@ -65,6 +65,7 @@
 #include "sql/item.h"
 #include "sql/item_func.h"
 #include "sql/item_subselect.h"
+#include "sql/join_optimizer/bit_utils.h"
 #include "sql/join_optimizer/explain_access_path.h"
 #include "sql/join_optimizer/join_optimizer.h"
 #include "sql/key.h"
@@ -72,9 +73,11 @@
 #include "sql/mysqld_thd_manager.h"  // Global_THD_manager
 #include "sql/opt_costmodel.h"
 #include "sql/opt_explain_format.h"
-#include "sql/opt_range.h"  // QUICK_SELECT_I
 #include "sql/opt_trace.h"  // Opt_trace_*
 #include "sql/protocol.h"
+#include "sql/range_optimizer/group_min_max.h"
+#include "sql/range_optimizer/range_optimizer.h"  // QUICK_SELECT_I
+#include "sql/range_optimizer/rowid_ordered_retrieval.h"
 #include "sql/row_iterator.h"
 #include "sql/sql_bitmap.h"
 #include "sql/sql_class.h"
@@ -378,15 +381,24 @@
 
 class Explain_table_base : public Explain {
  protected:
-  const TABLE *table;
   /**
      The QEP_TAB which we are currently explaining. It is NULL for the
-     inserted table in INSERT/REPLACE SELECT.
-     @note that you should never read quick() or condition(), they may change
-     under your feet without holding the mutex ; read quick_optim() and
-     condition_optim() instead.
+     inserted table in INSERT/REPLACE SELECT, and single-table UPDATE/DELETE.
+     @note that you should never read quick() or condition() even for SELECT,
+     they may change under your feet without holding the mutex;
+     read quick and condition in this class instead.
   */
-  QEP_TAB *tab;
+  QEP_TAB *tab{nullptr};
+
+  const TABLE *table{nullptr};
+  join_type type{JT_UNKNOWN};
+  QUICK_SELECT_I *quick{nullptr};
+  Item *condition{nullptr};
+  bool dynamic_range{false};
+  TABLE_LIST *table_ref{nullptr};
+  bool skip_records_in_range{false};
+  bool reversed_access{false};
+
   Key_map usable_keys;
 
   Explain_table_base(enum_parsing_context context_type_arg,
@@ -395,8 +407,7 @@
                      TABLE *const table_arg = nullptr)
       : Explain(context_type_arg, explain_thd_arg, query_thd_arg,
                 query_block_arg),
-        table(table_arg),
-        tab(nullptr) {}
+        table(table_arg) {}
 
   bool explain_partitions() override;
   bool explain_possible_keys() override;
@@ -487,7 +498,8 @@
  public:
   Explain_table(THD *const explain_thd_arg, const THD *query_thd_arg,
                 Query_block *query_block_arg, TABLE *const table_arg,
-                QEP_TAB *tab_arg, uint key_arg, ha_rows limit_arg,
+                enum join_type type_arg, QUICK_SELECT_I *quick_arg,
+                Item *condition_arg, uint key_arg, ha_rows limit_arg,
                 bool need_tmp_table_arg, bool need_sort_arg,
                 enum_mod_type mod_type_arg, bool used_key_is_modified_arg,
                 const char *msg)
@@ -500,7 +512,9 @@
         mod_type(mod_type_arg),
         used_key_is_modified(used_key_is_modified_arg),
         message(msg) {
-    tab = tab_arg;
+    type = type_arg;
+    quick = quick_arg;
+    condition = condition_arg;
     usable_keys = table->possible_quick_keys;
     if (can_walk_clauses())
       order_list = (query_block_arg->order_list.elements != 0);
@@ -644,21 +658,19 @@
       fmt->entry()->col_table_name.set_const("<materialized_subquery>");
       fmt->entry()->using_temporary = true;
 
-      const QEP_TAB *const tmp_tab = unit->item->get_qep_tab();
-
-      fmt->entry()->col_join_type.set_const(join_type_str[tmp_tab->type()]);
+      fmt->entry()->col_join_type.set_const(
+          join_type_str[unit->item->get_join_type()]);
       fmt->entry()->col_key.set_const("<auto_key>");
 
       char buff_key_len[24];
       fmt->entry()->col_key_len.set(
           buff_key_len,
-          longlong10_to_str(tmp_tab->table()->key_info[0].key_length,
+          longlong10_to_str(unit->item->get_table()->key_info[0].key_length,
                             buff_key_len, 10) -
               buff_key_len);
 
-      if (explain_ref_key(fmt, tmp_tab->ref().key_parts,
-                          tmp_tab->ref().key_copy))
-        return true;
+      const TABLE_REF &ref = unit->item->get_table_ref();
+      if (explain_ref_key(fmt, ref.key_parts, ref.key_copy)) return true;
 
       fmt->entry()->col_rows.set(1);
       /*
@@ -930,13 +942,12 @@
       }
     }
     if (pushed_root == table) {
-      uint pushed_count = tab->table()->file->number_of_pushed_joins();
+      uint pushed_count = table->file->number_of_pushed_joins();
       len = snprintf(buf, sizeof(buf) - 1, "Parent of %d pushed join@%d",
                      pushed_count, pushed_id);
     } else {
       len = snprintf(buf, sizeof(buf) - 1, "Child of '%s' in pushed join@%d",
-                     tab->table()->file->parent_of_pushed_join()->alias,
-                     pushed_id);
+                     table->file->parent_of_pushed_join()->alias, pushed_id);
     }
 
     {
@@ -947,11 +958,11 @@
   }
 
   switch (quick_type) {
-    case QUICK_SELECT_I::QS_TYPE_ROR_UNION:
-    case QUICK_SELECT_I::QS_TYPE_ROR_INTERSECT:
-    case QUICK_SELECT_I::QS_TYPE_INDEX_MERGE: {
+    case QS_TYPE_ROR_UNION:
+    case QS_TYPE_ROR_INTERSECT:
+    case QS_TYPE_INDEX_MERGE: {
       StringBuffer<32> buff(cs);
-      tab->quick_optim()->add_info_string(&buff);
+      quick->add_info_string(&buff);
       if (fmt->is_hierarchical()) {
         /*
           We are replacing existing col_key value with a quickselect info,
@@ -967,30 +978,29 @@
     default:;
   }
 
-  if (tab) {
-    if (tab->table_ref && tab->table_ref->table_function) {
-      StringBuffer<64> str(cs);
-      str.append(tab->table_ref->table_function->func_name());
+  if (table_ref && table_ref->table_function) {
+    StringBuffer<64> str(cs);
+    str.append(table_ref->table_function->func_name());
 
-      if (push_extra(ET_TABLE_FUNCTION, str) || push_extra(ET_USING_TEMPORARY))
-        return true;
-    }
-    if (tab->dynamic_range()) {
-      StringBuffer<64> str(STRING_WITH_LEN("index map: 0x"), cs);
-      /* 4 bits per 1 hex digit + terminating '\0' */
-      char buf[MAX_KEY / 4 + 1];
-      str.append(tab->keys().print(buf));
-      if (push_extra(ET_RANGE_CHECKED_FOR_EACH_RECORD, str)) return true;
-    } else if (tab->condition_optim()) {
-      if (fmt->is_hierarchical() && can_print_clauses()) {
-        Lazy_condition *c =
-            new (explain_thd->mem_root) Lazy_condition(tab->condition_optim());
-        if (c == nullptr) return true;
-        fmt->entry()->col_attached_condition.set(c);
-      } else if (push_extra(ET_USING_WHERE))
-        return true;
-    }
+    if (push_extra(ET_TABLE_FUNCTION, str) || push_extra(ET_USING_TEMPORARY))
+      return true;
+  }
+  if (dynamic_range) {
+    StringBuffer<64> str(STRING_WITH_LEN("index map: 0x"), cs);
+    /* 4 bits per 1 hex digit + terminating '\0' */
+    char buf[MAX_KEY / 4 + 1];
+    str.append(tab->keys().print(buf));
+    if (push_extra(ET_RANGE_CHECKED_FOR_EACH_RECORD, str)) return true;
+  } else if (condition) {
+    if (fmt->is_hierarchical() && can_print_clauses()) {
+      Lazy_condition *c = new (explain_thd->mem_root) Lazy_condition(condition);
+      if (c == nullptr) return true;
+      fmt->entry()->col_attached_condition.set(c);
+    } else if (push_extra(ET_USING_WHERE))
+      return true;
+  }
 
+  {
     const Item *pushed_cond = table->file->pushed_cond;
     if (pushed_cond) {
       StringBuffer<64> buff(cs);
@@ -998,16 +1008,15 @@
         pushed_cond->print(explain_thd, &buff, cond_print_flags);
       if (push_extra(ET_USING_PUSHED_CONDITION, buff)) return true;
     }
-    if (((quick_type >= 0 && tab->quick_optim()->reverse_sorted()) ||
-         tab->reversed_access()) &&
+    if (((quick_type >= 0 && quick->reverse_sorted()) || reversed_access) &&
         push_extra(ET_BACKWARD_SCAN))
       return true;
   }
   if (table->reginfo.not_exists_optimize && push_extra(ET_NOT_EXISTS))
     return true;
 
-  if (quick_type == QUICK_SELECT_I::QS_TYPE_RANGE) {
-    uint mrr_flags = ((QUICK_RANGE_SELECT *)(tab->quick_optim()))->mrr_flags;
+  if (quick_type == QS_TYPE_RANGE) {
+    uint mrr_flags = down_cast<QUICK_RANGE_SELECT *>(quick)->get_mrr_flags();
 
     /*
       During normal execution of a query, multi_range_read_init() is
@@ -1025,7 +1034,7 @@
       return true;
   }
 
-  if (tab && tab->type() == JT_FT &&
+  if (type == JT_FT &&
       (table->file->ha_table_flags() & HA_CAN_FULLTEXT_HINTS)) {
     /*
       Print info about FT hints.
@@ -1081,8 +1090,8 @@
     EXPLAIN FORMAT=JSON FOR CONNECTION will mention clearly that index dive has
     been skipped.
   */
-  if (explain_thd->lex->sql_command == SQLCOM_EXPLAIN_OTHER && tab &&
-      fmt->is_hierarchical() && tab->skip_records_in_range())
+  if (explain_thd->lex->sql_command == SQLCOM_EXPLAIN_OTHER &&
+      fmt->is_hierarchical() && skip_records_in_range)
     push_extra(ET_SKIP_RECORDS_IN_RANGE);
 
   return false;
@@ -1290,6 +1299,13 @@
 
 bool Explain_join::explain_qep_tab(size_t tabnum) {
   tab = join->qep_tab + tabnum;
+  type = tab->type();
+  quick = tab->quick();
+  condition = tab->condition_optim();
+  dynamic_range = tab->dynamic_range();
+  skip_records_in_range = tab->skip_records_in_range();
+  reversed_access = tab->reversed_access();
+  table_ref = tab->table_ref;
   if (!tab->position()) return false;
   table = tab->table();
   usable_keys = tab->keys();
@@ -1297,8 +1313,8 @@
   quick_type = -1;
 
   if (tab->type() == JT_RANGE || tab->type() == JT_INDEX_MERGE) {
-    assert(tab->quick_optim());
-    quick_type = tab->quick_optim()->get_type();
+    assert(quick);
+    quick_type = quick->get_type();
   }
 
   if (tab->starts_weedout()) fmt->begin_context(CTX_DUPLICATES_WEEDOUT);
@@ -1330,8 +1346,7 @@
   }
 
   if (fmt->flush_entry() ||
-      (can_walk_clauses() &&
-       mark_subqueries(tab->condition_optim(), fmt->entry())))
+      (can_walk_clauses() && mark_subqueries(condition, fmt->entry())))
     return true;
 
   if (sjm && fmt->is_hierarchical()) {
@@ -1403,7 +1418,7 @@
 }
 
 bool Explain_join::explain_join_type() {
-  const join_type j_t = tab ? tab->type() : JT_ALL;
+  const join_type j_t = type == JT_UNKNOWN ? JT_ALL : type;
   const char *str = join_type_str[j_t];
   if ((j_t == JT_EQ_REF || j_t == JT_REF || j_t == JT_REF_OR_NULL) &&
       join->query_expression()->item) {
@@ -1426,12 +1441,11 @@
   if (tab->ref().key_parts)
     return explain_key_and_len_index(tab->ref().key, tab->ref().key_length,
                                      tab->ref().key_parts);
-  else if (tab->type() == JT_INDEX_SCAN || tab->type() == JT_FT)
+  else if (type == JT_INDEX_SCAN || type == JT_FT)
     return explain_key_and_len_index(tab->index());
-  else if (tab->type() == JT_RANGE || tab->type() == JT_INDEX_MERGE ||
-           ((tab->type() == JT_REF || tab->type() == JT_REF_OR_NULL) &&
-            tab->quick_optim()))
-    return explain_key_and_len_quick(tab->quick_optim());
+  else if (type == JT_RANGE || type == JT_INDEX_MERGE ||
+           ((type == JT_REF || type == JT_REF_OR_NULL) && quick))
+    return explain_key_and_len_quick(quick);
   return false;
 }
 
@@ -1446,7 +1460,7 @@
   POSITION *const pos = tab->position();
 
   if (explain_thd->lex->sql_command == SQLCOM_EXPLAIN_OTHER &&
-      tab->skip_records_in_range()) {
+      skip_records_in_range) {
     // Skipping col_rows, col_filtered, col_prefix_rows will set them to NULL.
     fmt->entry()->col_cond_cost.set(0);
     fmt->entry()->col_read_cost.set(0.0);
@@ -1496,15 +1510,14 @@
     if (tab->ref().key_parts)
       keyno = tab->ref().key;
     else if (tab->type() == JT_RANGE || tab->type() == JT_INDEX_MERGE)
-      keyno = tab->quick_optim()->index;
+      keyno = quick->index;
 
     if (explain_extra_common(quick_type, keyno)) return true;
 
     if (((tab->type() == JT_INDEX_SCAN || tab->type() == JT_CONST) &&
          table->covering_keys.is_set(tab->index())) ||
-        (quick_type == QUICK_SELECT_I::QS_TYPE_ROR_INTERSECT &&
-         !((QUICK_ROR_INTERSECT_SELECT *)tab->quick_optim())
-              ->need_to_fetch_row) ||
+        (quick_type == QS_TYPE_ROR_INTERSECT &&
+         !((QUICK_ROR_INTERSECT_SELECT *)quick)->need_to_fetch_row) ||
         /*
           Notice that table->key_read can change on the fly (grep
           for set_keyread); so EXPLAIN CONNECTION reads a changing variable,
@@ -1512,13 +1525,12 @@
           cannot be severe (at worst, wrong EXPLAIN).
         */
         table->key_read || tab->keyread_optim()) {
-      if (quick_type == QUICK_SELECT_I::QS_TYPE_GROUP_MIN_MAX) {
-        QUICK_GROUP_MIN_MAX_SELECT *qgs =
-            (QUICK_GROUP_MIN_MAX_SELECT *)tab->quick_optim();
+      if (quick_type == QS_TYPE_GROUP_MIN_MAX) {
+        QUICK_GROUP_MIN_MAX_SELECT *qgs = (QUICK_GROUP_MIN_MAX_SELECT *)quick;
         StringBuffer<64> buff(cs);
         qgs->append_loose_scan_type(&buff);
         if (push_extra(ET_USING_INDEX_FOR_GROUP_BY, buff)) return true;
-      } else if (quick_type == QUICK_SELECT_I::QS_TYPE_SKIP_SCAN) {
+      } else if (quick_type == QS_TYPE_SKIP_SCAN) {
         if (push_extra(ET_USING_INDEX_FOR_SKIP_SCAN)) return true;
       } else {
         if (push_extra(ET_USING_INDEX)) return true;
@@ -1555,19 +1567,18 @@
     }
 
     if (tab->lateral_derived_tables_depend_on_me) {
-      auto deps = tab->lateral_derived_tables_depend_on_me;
       StringBuffer<64> buff(cs);
       bool first = true;
-      for (QEP_TAB **tab2 = join->map2qep_tab; deps; tab2++, deps >>= 1) {
-        if (deps & 1) {
-          if (!first) buff.append(",");
-          first = false;
-          if (store_table_name((*tab2)->table_ref, fmt,
-                               [&](const char *name, size_t len) {
-                                 return buff.append(name, len);
-                               }))
-            return true;
-        }
+      for (int table_idx :
+           BitsSetIn(tab->lateral_derived_tables_depend_on_me)) {
+        QEP_TAB *tab2 = &join->qep_tab[table_idx];
+        if (!first) buff.append(",");
+        first = false;
+        if (store_table_name(tab2->table_ref, fmt,
+                             [&](const char *name, size_t len) {
+                               return buff.append(name, len);
+                             }))
+          return true;
       }
       if (push_extra(ET_REMATERIALIZE, buff)) return true;
     }
@@ -1674,8 +1685,8 @@
 
 bool Explain_table::explain_join_type() {
   join_type jt;
-  if (tab && tab->quick_optim())
-    jt = calc_join_type(tab->quick_optim()->get_type());
+  if (quick)
+    jt = calc_join_type(quick->get_type());
   else if (key != MAX_KEY)
     jt = JT_INDEX_SCAN;
   else
@@ -1686,8 +1697,8 @@
 }
 
 bool Explain_table::explain_ref() {
-  if (tab && tab->quick_optim()) {
-    int key_parts = tab->quick_optim()->used_key_parts;
+  if (quick) {
+    int key_parts = quick->used_key_parts;
     while (key_parts--) {
       fmt->entry()->col_ref.push_back("const");
     }
@@ -1696,8 +1707,8 @@
 }
 
 bool Explain_table::explain_key_and_len() {
-  if (tab && tab->quick_optim())
-    return explain_key_and_len_quick(tab->quick_optim());
+  if (quick)
+    return explain_key_and_len_quick(quick);
   else if (key != MAX_KEY)
     return explain_key_and_len_index(key);
   return false;
@@ -1727,9 +1738,9 @@
 
   uint keyno;
   int quick_type;
-  if (tab && tab->quick_optim()) {
-    keyno = tab->quick_optim()->index;
-    quick_type = tab->quick_optim()->get_type();
+  if (quick) {
+    keyno = quick->index;
+    quick_type = quick->get_type();
   } else {
     keyno = key;
     quick_type = -1;
@@ -1858,7 +1869,8 @@
       // Derived tables and const subqueries are already optimized
       if (!unit->is_optimized() &&
           unit->optimize(explain_thd, /*materialize_destination=*/nullptr,
-                         /*create_iterators=*/false))
+                         /*create_iterators=*/false,
+                         /*finalize_access_paths=*/true))
         return true; /* purecov: inspected */
     }
   }
@@ -1874,12 +1886,13 @@
         check_acl_for_explain(query_thd->query_plan.get_lex()->query_tables))
       ret = true;
     else
-      ret = Explain_table(explain_thd, query_thd, select, plan->table,
-                          plan->tab, plan->key, plan->limit,
-                          plan->need_tmp_table, plan->need_sort, plan->mod_type,
-                          plan->used_key_is_modified, plan->message)
-                .send() ||
-            explain_thd->is_error();
+      ret =
+          Explain_table(explain_thd, query_thd, select, plan->table, plan->type,
+                        plan->quick, plan->condition, plan->key, plan->limit,
+                        plan->need_tmp_table, plan->need_sort, plan->mod_type,
+                        plan->used_key_is_modified, plan->message)
+              .send() ||
+          explain_thd->is_error();
   }
   if (ret)
     result.abort_result_set(explain_thd);
@@ -1946,8 +1959,9 @@
         // INSERT/REPLACE SELECT ... FROM dual
         ret = Explain_table(
                   explain_thd, query_thd, query_block,
-                  query_plan->get_lex()->insert_table_leaf->table, nullptr,
-                  MAX_KEY, HA_POS_ERROR, false, false,
+                  query_plan->get_lex()->insert_table_leaf->table, JT_UNKNOWN,
+                  /*quick=*/nullptr, /*condition=*/nullptr, MAX_KEY,
+                  HA_POS_ERROR, false, false,
                   (query_plan->get_lex()->sql_command == SQLCOM_INSERT_SELECT
                        ? MT_INSERT
                        : MT_REPLACE),
@@ -2310,7 +2324,6 @@
   }
   bool operator()(THD *thd) override {
     if (thd->thread_id() == m_id) {
-      mysql_mutex_lock(&thd->LOCK_thd_data);
       thd->lock_query_plan();
       m_thd = thd;
       return true;
@@ -2330,10 +2343,8 @@
 */
 bool Sql_cmd_explain_other_thread::execute(THD *thd) {
   bool res = false;
-  THD *query_thd = nullptr;
   bool send_ok = false;
   const char *user;
-  bool unlock_thd_data = false;
   const std::string &db_name = thd->db().str ? thd->db().str : "";
   THD::Query_plan *qp;
   DEBUG_SYNC(thd, "before_explain_other");
@@ -2359,21 +2370,21 @@
 
   // Pick thread
   Find_thd_query_lock find_thd_query_lock(m_thread_id);
+  THD_ptr query_thd_ptr;
   if (!thd->killed) {
-    query_thd =
+    query_thd_ptr =
         Global_THD_manager::get_instance()->find_thd(&find_thd_query_lock);
-    if (query_thd) unlock_thd_data = true;
   }
 
-  if (!query_thd) {
+  if (!query_thd_ptr) {
     my_error(ER_NO_SUCH_THREAD, MYF(0), m_thread_id);
     goto err;
   }
 
-  qp = &query_thd->query_plan;
+  qp = &query_thd_ptr->query_plan;
 
-  if (query_thd->get_protocol()->connection_alive() &&
-      !query_thd->system_thread && qp->get_command() != SQLCOM_END) {
+  if (query_thd_ptr->get_protocol()->connection_alive() &&
+      !query_thd_ptr->system_thread && qp->get_command() != SQLCOM_END) {
     /*
       Don't explain:
       1) Prepared statements
@@ -2399,7 +2410,7 @@
         (!qp->get_lex()->m_sql_cmd ||
          qp->get_lex()->m_sql_cmd->is_prepared()))  // (4)
     {
-      Security_context *tmp_sctx = query_thd->security_context();
+      Security_context *tmp_sctx = query_thd_ptr->security_context();
       assert(tmp_sctx->user().str);
       if (user && strcmp(tmp_sctx->user().str, user)) {
         my_error(ER_ACCESS_DENIED_ERROR, MYF(0),
@@ -2408,8 +2419,6 @@
                  (thd->password ? ER_THD(thd, ER_YES) : ER_THD(thd, ER_NO)));
         goto err;
       }
-      mysql_mutex_unlock(&query_thd->LOCK_thd_data);
-      unlock_thd_data = false;
     } else {
       /*
         Note that we send "not supported" for a supported stmt (e.g. SELECT)
@@ -2427,14 +2436,12 @@
 
   if (qp->is_single_table_plan())
     res = explain_single_table_modification(
-        thd, query_thd, qp->get_modification_plan(),
+        thd, query_thd_ptr.get(), qp->get_modification_plan(),
         qp->get_lex()->unit->first_query_block());
   else
-    res = explain_query(thd, query_thd, qp->get_lex()->unit);
+    res = explain_query(thd, query_thd_ptr.get(), qp->get_lex()->unit);
 
 err:
-  if (unlock_thd_data) mysql_mutex_unlock(&query_thd->LOCK_thd_data);
-
   DEBUG_SYNC(thd, "after_explain_other");
   if (!res && send_ok) my_ok(thd, 0);
 
@@ -2459,7 +2466,10 @@
 
   @param thd_arg        owning thread
   @param mt             modification type - MT_INSERT/MT_UPDATE/etc
-  @param tab_arg        Table to modify
+  @param table_arg      Table to modify
+  @param type_arg       Access type (JT_*) for this table
+  @param quick_arg      Range index scan used, if any
+  @param condition_arg  Condition applied, if any
   @param key_arg        MAX_KEY or and index number of the key that was chosen
                         to access table data.
   @param limit_arg      HA_POS_ERROR or LIMIT value.
@@ -2472,16 +2482,17 @@
   @param rows           How many rows we plan to modify in the table.
 */
 
-Modification_plan::Modification_plan(THD *thd_arg, enum_mod_type mt,
-                                     QEP_TAB *tab_arg, uint key_arg,
-                                     ha_rows limit_arg, bool need_tmp_table_arg,
-                                     bool need_sort_arg,
-                                     bool used_key_is_modified_arg,
-                                     ha_rows rows)
+Modification_plan::Modification_plan(
+    THD *thd_arg, enum_mod_type mt, TABLE *table_arg, enum join_type type_arg,
+    QUICK_SELECT_I *quick_arg, Item *condition_arg, uint key_arg,
+    ha_rows limit_arg, bool need_tmp_table_arg, bool need_sort_arg,
+    bool used_key_is_modified_arg, ha_rows rows)
     : thd(thd_arg),
       mod_type(mt),
-      table(tab_arg->table()),
-      tab(tab_arg),
+      table(table_arg),
+      type(type_arg),
+      quick(quick_arg),
+      condition(condition_arg),
       key(key_arg),
       limit(limit_arg),
       need_tmp_table(need_tmp_table_arg),
@@ -2518,7 +2529,6 @@
     : thd(thd_arg),
       mod_type(mt),
       table(table_arg),
-      tab(nullptr),
       key(MAX_KEY),
       limit(HA_POS_ERROR),
       need_tmp_table(false),
diff -Nru mysql-8.0-8.0.26/sql/opt_explain_format.h mysql-8.0-8.0.27/sql/opt_explain_format.h
--- mysql-8.0-8.0.26/sql/opt_explain_format.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/opt_explain_format.h	2021-09-28 11:46:34.000000000 +0000
@@ -411,8 +411,8 @@
 
     @param subquery     WHERE clause subquery's unit
   */
-  virtual void register_where_subquery(
-      Query_expression *subquery MY_ATTRIBUTE((unused))) {}
+  virtual void register_where_subquery(Query_expression *subquery
+                                       [[maybe_unused]]) {}
 
   void format_extra(Opt_trace_object *obj);
 };
diff -Nru mysql-8.0-8.0.26/sql/opt_explain.h mysql-8.0-8.0.27/sql/opt_explain.h
--- mysql-8.0-8.0.26/sql/opt_explain.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/opt_explain.h	2021-09-28 11:46:34.000000000 +0000
@@ -61,6 +61,7 @@
 #include "sql/query_result.h"  // Query_result_send
 #include "sql/row_iterator.h"
 #include "sql/sql_cmd.h"  // Sql_cmd
+#include "sql/sql_opt_exec_shared.h"
 #include "sys/types.h"
 
 class Item;
@@ -73,6 +74,7 @@
 struct TABLE;
 template <class T>
 class List;
+class QUICK_SELECT_I;
 
 extern const char *join_type_str[];
 
@@ -84,7 +86,9 @@
       mod_type;  ///< Modification type - MT_INSERT/MT_UPDATE/etc
   TABLE *table;  ///< Table to modify
 
-  QEP_TAB *tab;               ///< QUICK access method + WHERE clause
+  enum join_type type = JT_UNKNOWN;
+  QUICK_SELECT_I *quick{nullptr};
+  Item *condition{nullptr};
   uint key;                   ///< Key to use
   ha_rows limit;              ///< Limit
   bool need_tmp_table;        ///< Whether tmp table needs to be used
@@ -94,10 +98,11 @@
   bool zero_result;           ///< true <=> plan will not be executed
   ha_rows examined_rows;  ///< # of rows expected to be examined in the table
 
-  Modification_plan(THD *thd_arg, enum_mod_type mt, QEP_TAB *qep_tab,
-                    uint key_arg, ha_rows limit_arg, bool need_tmp_table_arg,
-                    bool need_sort_arg, bool used_key_is_modified_arg,
-                    ha_rows rows);
+  Modification_plan(THD *thd_arg, enum_mod_type mt, TABLE *table_arg,
+                    enum join_type type_arg, QUICK_SELECT_I *quick_arg,
+                    Item *condition_arg, uint key_arg, ha_rows limit_arg,
+                    bool need_tmp_table_arg, bool need_sort_arg,
+                    bool used_key_is_modified_arg, ha_rows rows);
 
   Modification_plan(THD *thd_arg, enum_mod_type mt, TABLE *table_arg,
                     const char *message_arg, bool zero_result_arg,
diff -Nru mysql-8.0-8.0.26/sql/opt_explain_json.cc mysql-8.0-8.0.27/sql/opt_explain_json.cc
--- mysql-8.0-8.0.26/sql/opt_explain_json.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/opt_explain_json.cc	2021-09-28 11:46:34.000000000 +0000
@@ -300,9 +300,8 @@
     @retval false           Ok
     @retval true            Error
   */
-  virtual bool add_subquery(subquery_list_enum subquery_type
-                                MY_ATTRIBUTE((unused)),
-                            subquery_ctx *ctx MY_ATTRIBUTE((unused))) {
+  virtual bool add_subquery(subquery_list_enum subquery_type [[maybe_unused]],
+                            subquery_ctx *ctx [[maybe_unused]]) {
     assert(0);
     return true;
   }
@@ -314,8 +313,7 @@
     @retval false               Ok
     @retval true                Error
   */
-  virtual bool format_nested_loop(
-      Opt_trace_context *json MY_ATTRIBUTE((unused))) {
+  virtual bool format_nested_loop(Opt_trace_context *json [[maybe_unused]]) {
     assert(0);
     return true;
   }
@@ -328,7 +326,7 @@
     @retval false           Ok
     @retval true            Error
   */
-  virtual bool add_join_tab(joinable_ctx *ctx MY_ATTRIBUTE((unused))) {
+  virtual bool add_join_tab(joinable_ctx *ctx [[maybe_unused]]) {
     assert(0);
     return true;
   }
@@ -339,7 +337,7 @@
     @retval false               Ok
     @retval true                Error
   */
-  virtual void set_sort(sort_ctx *ctx MY_ATTRIBUTE((unused))) { assert(0); }
+  virtual void set_sort(sort_ctx *ctx [[maybe_unused]]) { assert(0); }
 
   /**
     Set nested WINDOW node to @c ctx
@@ -347,7 +345,7 @@
     @retval false               Ok
     @retval true                Error
   */
-  virtual void set_window(window_ctx *ctx MY_ATTRIBUTE((unused))) { assert(0); }
+  virtual void set_window(window_ctx *ctx [[maybe_unused]]) { assert(0); }
 
   /**
     Add a query specification node to the CTX_UNION node
@@ -357,7 +355,7 @@
     @retval false           Ok
     @retval true            Error
   */
-  virtual bool add_query_spec(context *ctx MY_ATTRIBUTE((unused))) {
+  virtual bool add_query_spec(context *ctx [[maybe_unused]]) {
     assert(0);
     return true;
   }
@@ -371,7 +369,7 @@
     @retval false       Can't associate: this node or its child nodes are not
                         derived from the subquery
   */
-  virtual bool find_and_set_derived(context *subquery MY_ATTRIBUTE((unused))) {
+  virtual bool find_and_set_derived(context *subquery [[maybe_unused]]) {
     assert(0);
     return false;
   }
@@ -387,9 +385,8 @@
        0   subqusery were added
        1   error occurred
   */
-  virtual int add_where_subquery(subquery_ctx *ctx MY_ATTRIBUTE((unused)),
-                                 Query_expression *subquery
-                                     MY_ATTRIBUTE((unused))) {
+  virtual int add_where_subquery(subquery_ctx *ctx [[maybe_unused]],
+                                 Query_expression *subquery [[maybe_unused]]) {
     assert(0);
     return false;
   }
@@ -1524,7 +1521,7 @@
 
     /*
       Currently K-REF/col_ref is not shown; it would always be "func", since
-      {subquery,semijoin} materialization use store_key_item; using
+      {subquery,semijoin} materialization use store_key; using
       get_store_key() instead would allow "const" and outer column's name,
       if applicable.
       The looked up expression can anyway be inferred from the condition:
diff -Nru mysql-8.0-8.0.26/sql/opt_hints.h mysql-8.0-8.0.27/sql/opt_hints.h
--- mysql-8.0-8.0.26/sql/opt_hints.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/opt_hints.h	2021-09-28 11:46:34.000000000 +0000
@@ -241,7 +241,7 @@
 
     @return  true if all hint objects are resolved, false otherwise.
   */
-  virtual bool is_resolved(opt_hints_enum type_arg MY_ATTRIBUTE((unused))) {
+  virtual bool is_resolved(opt_hints_enum type_arg [[maybe_unused]]) {
     return resolved;
   }
   /**
@@ -249,7 +249,7 @@
 
     @param type_arg  hint type
   */
-  virtual void set_unresolved(opt_hints_enum type_arg MY_ATTRIBUTE((unused))) {}
+  virtual void set_unresolved(opt_hints_enum type_arg [[maybe_unused]]) {}
   /**
     If ignore_print() returns true, hint is not printed
     in Opt_hints::print() function. Atm used for
@@ -261,8 +261,7 @@
     @return  true if the hint should not be printed
     in Opt_hints::print() function, false otherwise.
   */
-  virtual bool ignore_print(
-      opt_hints_enum type_arg MY_ATTRIBUTE((unused))) const {
+  virtual bool ignore_print(opt_hints_enum type_arg [[maybe_unused]]) const {
     return false;
   }
   void incr_resolved_children() { resolved_children++; }
@@ -284,8 +283,7 @@
 
     @return  pointer to complex hint for a given type.
   */
-  virtual PT_hint *get_complex_hints(
-      opt_hints_enum type MY_ATTRIBUTE((unused))) {
+  virtual PT_hint *get_complex_hints(opt_hints_enum type [[maybe_unused]]) {
     assert(0);
     return nullptr; /* error C4716: must return a value */
   }
@@ -340,8 +338,8 @@
     @param thd             pointer to THD object
     @param str             pointer to String object
   */
-  virtual void print_irregular_hints(const THD *thd MY_ATTRIBUTE((unused)),
-                                     String *str MY_ATTRIBUTE((unused))) {}
+  virtual void print_irregular_hints(const THD *thd [[maybe_unused]],
+                                     String *str [[maybe_unused]]) {}
 };
 
 /**
@@ -517,9 +515,8 @@
   bool is_set_key_map(uint i) { return key_map.is_set(i); }
   bool is_key_map_clear_all() { return key_map.is_clear_all(); }
   Key_map *get_key_map() { return &key_map; }
-  virtual bool is_hint_conflicting(
-      Opt_hints_table *table_hint MY_ATTRIBUTE((unused)),
-      Opt_hints_key *key_hint MY_ATTRIBUTE((unused))) {
+  virtual bool is_hint_conflicting(Opt_hints_table *table_hint [[maybe_unused]],
+                                   Opt_hints_key *key_hint [[maybe_unused]]) {
     return false;
   }
 };
diff -Nru mysql-8.0-8.0.26/sql/opt_range.cc mysql-8.0-8.0.27/sql/opt_range.cc
--- mysql-8.0-8.0.26/sql/opt_range.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/opt_range.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,15036 +0,0 @@
-/* Copyright (c) 2000, 2021, Oracle 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,
-   as published by the Free Software Foundation.
-
-   This program is also distributed with certain software (including
-   but not limited to OpenSSL) that is licensed under separate terms,
-   as designated in a particular file or component or in included license
-   documentation.  The authors of MySQL hereby grant you an additional
-   permission to link the program and your derivative works with the
-   separately licensed software that they have included with MySQL.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License, version 2.0, for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
-
-/*
-  TODO:
-  Fix that MAYBE_KEY are stored in the tree so that we can detect use
-  of full hash keys for queries like:
-
-  select s.id, kws.keyword_id from sites as s,kws where s.id=kws.site_id and
-  kws.keyword_id in (204,205);
-
-*/
-
-/*
-  This file contains:
-
-  RangeAnalysisModule
-    A module that accepts a condition, index (or partitioning) description,
-    and builds lists of intervals (in index/partitioning space), such that
-    all possible records that match the condition are contained within the
-    intervals.
-    The entry point for the range analysis module is get_mm_tree()
-    (mm=min_max) function.
-
-    The lists are returned in form of complicated structure of interlinked
-    SEL_TREE/SEL_IMERGE/SEL_ROOT/SEL_ARG objects.
-    See quick_range_seq_next, find_used_partitions for examples of how to walk
-    this structure.
-    All direct "users" of this module are located within this file, too.
-
-
-  PartitionPruningModule
-    A module that accepts a partitioned table, condition, and finds which
-    partitions we will need to use in query execution. Search down for
-    "PartitionPruningModule" for description.
-    The module has single entry point - prune_partitions() function.
-
-
-  Range/index_merge/groupby-minmax optimizer module
-    A module that accepts a table, condition, and returns
-     - a QUICK_*_SELECT object that can be used to retrieve rows that match
-       the specified condition, or a "no records will match the condition"
-       statement.
-
-    The module entry point is
-      test_quick_select()
-
-
-  Record retrieval code for range/index_merge/groupby-min-max.
-    Implementations of QUICK_*_SELECT classes.
-
-  KeyTupleFormat
-  ~~~~~~~~~~~~~~
-  The code in this file (and elsewhere) makes operations on key value tuples.
-  Those tuples are stored in the following format:
-
-  The tuple is a sequence of key part values. The length of key part value
-  depends only on its type (and not depends on the what value is stored)
-
-    KeyTuple: keypart1-data, keypart2-data, ...
-
-  The value of each keypart is stored in the following format:
-
-    keypart_data: [isnull_byte] keypart-value-bytes
-
-  If a keypart may have a NULL value (key_part->field->is_nullable() can
-  be used to check this), then the first byte is a NULL indicator with the
-  following valid values:
-    1  - keypart has NULL value.
-    0  - keypart has non-NULL value.
-
-  <questionable-statement> If isnull_byte==1 (NULL value), then the following
-  keypart->length bytes must be 0.
-  </questionable-statement>
-
-  keypart-value-bytes holds the value. Its format depends on the field type.
-  The length of keypart-value-bytes may or may not depend on the value being
-  stored. The default is that length is static and equal to
-  KEY_PART_INFO::length.
-
-  Key parts with (key_part_flag & HA_BLOB_PART) have length depending of the
-  value:
-
-     keypart-value-bytes: value_length value_bytes
-
-  The value_length part itself occupies HA_KEY_BLOB_LENGTH=2 bytes.
-
-  See key_copy() and key_restore() for code to move data between index tuple
-  and table record
-
-  CAUTION: the above description is only sergefp's understanding of the
-           subject and may omit some details.
-*/
-
-#include "sql/opt_range.h"
-#include "sql/opt_range_internal.h"
-
-#include <fcntl.h>
-#include <float.h>
-#include <stdio.h>
-#include <string.h>
-#include <algorithm>
-#include <atomic>
-#include <cmath>  // std::log2
-#include <limits>
-#include <memory>
-#include <new>
-#include <queue>
-#include <set>
-#include <utility>
-
-#include "field_types.h"  // enum_field_types
-#include "lex_string.h"
-#include "m_ctype.h"
-#include "map_helpers.h"
-#include "memory_debugging.h"
-#include "mf_wcomp.h"  // wild_compare
-#include "my_alloc.h"
-#include "my_byteorder.h"
-#include "my_compiler.h"
-#include "my_dbug.h"
-#include "my_loglevel.h"
-#include "my_macros.h"
-#include "my_sqlcommand.h"
-#include "my_sys.h"
-#include "mysql/components/services/bits/psi_bits.h"
-#include "mysql/components/services/log_builtins.h"
-#include "mysql/service_mysql_alloc.h"
-#include "mysql/udf_registration_types.h"
-#include "mysql_com.h"
-#include "mysqld_error.h"
-#include "mysys_err.h"  // EE_CAPACITY_EXCEEDED
-#include "sql/check_stack.h"
-#include "sql/current_thd.h"
-#include "sql/derror.h"         // ER_THD
-#include "sql/error_handler.h"  // Internal_error_handler
-#include "sql/item.h"
-#include "sql/item_cmpfunc.h"
-#include "sql/item_func.h"
-#include "sql/item_json_func.h"  // Item_func_json_contains
-#include "sql/item_row.h"
-#include "sql/item_sum.h"  // Item_sum
-#include "sql/json_dom.h"  // Json_wrapper
-#include "sql/key.h"       // is_key_used
-#include "sql/malloc_allocator.h"
-#include "sql/mem_root_array.h"
-#include "sql/mysqld.h"
-#include "sql/opt_costmodel.h"
-#include "sql/opt_hints.h"       // hint_key_state
-#include "sql/opt_statistics.h"  // guess_rec_per_key
-#include "sql/opt_trace.h"       // Opt_trace_array
-#include "sql/opt_trace_context.h"
-#include "sql/parser_yystype.h"
-#include "sql/partition_info.h"  // partition_info
-#include "sql/psi_memory_key.h"
-#include "sql/query_options.h"
-#include "sql/records.h"
-#include "sql/row_iterator.h"
-#include "sql/sql_base.h"   // free_io_cache
-#include "sql/sql_class.h"  // THD
-#include "sql/sql_error.h"
-#include "sql/sql_lex.h"
-#include "sql/sql_opt_exec_shared.h"  // QEP_shared_owner
-#include "sql/sql_optimizer.h"        // JOIN
-#include "sql/sql_partition.h"        // HA_USE_AUTO_PARTITION
-#include "sql/sql_select.h"
-#include "sql/sql_sort.h"
-#include "sql/system_variables.h"
-#include "sql/thr_malloc.h"
-#include "sql/uniques.h"  // Unique
-#include "template_utils.h"
-
-using std::max;
-using std::min;
-
-/*
-  Convert double value to #rows. Currently this does floor(), and we
-  might consider using round() instead.
-*/
-#define double2rows(x) ((ha_rows)(x))
-
-SEL_ARG *rb_delete_fixup(SEL_ARG *root, SEL_ARG *key, SEL_ARG *par);
-#ifndef NDEBUG
-int test_rb_tree(SEL_ARG *element, SEL_ARG *parent);
-#endif
-
-static uchar is_null_string[2] = {1, 0};
-
-class RANGE_OPT_PARAM;
-class SEL_ARG;
-
-/*
-  A construction block of the SEL_ARG-graph.
-
-  One SEL_ARG object represents an "elementary interval" in form
-
-      min_value <=?  table.keypartX  <=? max_value
-
-  The interval is a non-empty interval of any kind: with[out] minimum/maximum
-  bound, [half]open/closed, single-point interval, etc.
-
-  1. SEL_ARG GRAPH STRUCTURE
-
-  SEL_ARG objects are linked together in a graph, represented by the SEL_ROOT.
-  The meaning of the graph is better demonstrated by an example:
-
-     tree->keys[i]
-      |
-      |             $              $
-      |    part=1   $     part=2   $    part=3
-      |             $              $
-      |  +-------+  $   +-------+  $   +--------+
-      |  | kp1<1 |--$-->| kp2=5 |--$-->| kp3=10 |
-      |  +-------+  $   +-------+  $   +--------+
-      |      |      $              $       |
-      |      |      $              $   +--------+
-      |      |      $              $   | kp3=12 |
-      |      |      $              $   +--------+
-      |  +-------+  $              $
-      \->| kp1=2 |--$--------------$-+
-         +-------+  $              $ |   +--------+
-             |      $              $  ==>| kp3=11 |
-         +-------+  $              $ |   +--------+
-         | kp1=3 |--$--------------$-+       |
-         +-------+  $              $     +--------+
-             |      $              $     | kp3=14 |
-            ...     $              $     +--------+
-
-  The entire graph is partitioned into "interval lists".
-
-  An interval list is a sequence of ordered disjoint intervals over
-  the same key part. SEL_ARG are linked via "next" and "prev" pointers
-  with NULL as sentinel.
-
-    In the example pic, there are 4 interval lists:
-    "kp<1 OR kp1=2 OR kp1=3", "kp2=5", "kp3=10 OR kp3=12", "kp3=11 OR kp3=13".
-    The vertical lines represent SEL_ARG::next/prev pointers.
-
-  Additionally, all intervals in the list form a red-black (RB) tree,
-  linked via left/right/parent pointers with null_element as sentinel. The
-  red-black tree root SEL_ARG object will be further called "root of the
-  interval list".
-
-  A red-black tree with 7 SEL_ARGs will look similar to what is shown
-  below. Left/right/parent pointers are shown while next pointers go from a
-  node with number X to the node with number X+1 (and prev in the
-  opposite direction):
-
-                         Root
-                        +---+
-                        | 4 |
-                        +---+
-                   left/     \ right
-                    __/       \__
-                   /             \
-              +---+               +---+
-              | 2 |               | 6 |
-              +---+               +---+
-        left /     \ right  left /     \ right
-            |       |           |       |
-        +---+       +---+   +---+       +---+
-        | 1 |       | 3 |   | 5 |       | 7 |
-        +---+       +---+   +---+       +---+
-
-  In this tree,
-    * node1->prev == node7->next == NULL
-    * node1->left == node1->right ==
-      node3->left == ... node7->right == null_element
-
-  In an interval list, each member X may have SEL_ARG::next_key_part pointer
-  pointing to the root of another interval list Y. The pointed interval list
-  must cover a key part with greater number (i.e. Y->part > X->part).
-
-    In the example pic, the next_key_part pointers are represented by
-    horisontal lines.
-
-  2. SEL_ARG GRAPH SEMANTICS
-
-  It represents a condition in a special form (we don't have a name for it ATM)
-  The SEL_ARG::next/prev is "OR", and next_key_part is "AND".
-
-  For example, the picture represents the condition in form:
-   (kp1 < 1 AND kp2=5 AND (kp3=10 OR kp3=12)) OR
-   (kp1=2 AND (kp3=11 OR kp3=14)) OR
-   (kp1=3 AND (kp3=11 OR kp3=14))
-
-  In red-black tree form:
-
-                     +-------+                 +--------+
-                     | kp1=2 |.................| kp3=14 |
-                     +-------+                 +--------+
-                      /     \                     /
-             +---------+    +-------+     +--------+
-             | kp1 < 1 |    | kp1=3 |     | kp3=11 |
-             +---------+    +-------+     +--------+
-                 .               .
-            ......               .......
-            .                          .
-        +-------+                  +--------+
-        | kp2=5 |                  | kp3=14 |
-        +-------+                  +--------+
-            .                        /
-            .                   +--------+
-       (root of R-B tree        | kp3=11 |
-        for "kp3={10|12}")      +--------+
-
-
-  Where / and \ denote left and right pointers and ... denotes
-  next_key_part pointers to the root of the R-B tree of intervals for
-  consecutive key parts.
-
-  3. SEL_ARG GRAPH USE
-
-  Use get_mm_tree() to construct SEL_ARG graph from WHERE condition.
-  Then walk the SEL_ARG graph and get a list of dijsoint ordered key
-  intervals (i.e. intervals in form
-
-   (constA1, .., const1_K) < (keypart1,.., keypartK) < (constB1, .., constB_K)
-
-  Those intervals can be used to access the index. The uses are in:
-   - check_quick_select() - Walk the SEL_ARG graph and find an estimate of
-                            how many table records are contained within all
-                            intervals.
-   - get_quick_select()   - Walk the SEL_ARG, materialize the key intervals,
-                            and create QUICK_RANGE_SELECT object that will
-                            read records within these intervals.
-
-  4. SPACE COMPLEXITY NOTES
-
-    SEL_ARG graph is a representation of an ordered disjoint sequence of
-    intervals over the ordered set of index tuple values.
-
-    For multi-part keys, one can construct a WHERE expression such that its
-    list of intervals will be of combinatorial size. Here is an example:
-
-      (keypart1 IN (1,2, ..., n1)) AND
-      (keypart2 IN (1,2, ..., n2)) AND
-      (keypart3 IN (1,2, ..., n3))
-
-    For this WHERE clause the list of intervals will have n1*n2*n3 intervals
-    of form
-
-      (keypart1, keypart2, keypart3) = (k1, k2, k3), where 1 <= k{i} <= n{i}
-
-    SEL_ARG graph structure aims to reduce the amount of required space by
-    "sharing" the elementary intervals when possible (the pic at the
-    beginning of this comment has examples of such sharing). The sharing may
-    prevent combinatorial blowup:
-
-      There are WHERE clauses that have combinatorial-size interval lists but
-      will be represented by a compact SEL_ARG graph.
-      Example:
-        (keypartN IN (1,2, ..., n1)) AND
-        ...
-        (keypart2 IN (1,2, ..., n2)) AND
-        (keypart1 IN (1,2, ..., n3))
-
-    but not in all cases:
-
-    - There are WHERE clauses that do have a compact SEL_ARG-graph
-      representation but get_mm_tree() and its callees will construct a
-      graph of combinatorial size.
-      Example:
-        (keypart1 IN (1,2, ..., n1)) AND
-        (keypart2 IN (1,2, ..., n2)) AND
-        ...
-        (keypartN IN (1,2, ..., n3))
-
-    - There are WHERE clauses for which the minimal possible SEL_ARG graph
-      representation will have combinatorial size.
-      Example:
-        By induction: Let's take any interval on some keypart in the middle:
-
-           kp15=c0
-
-        Then let's AND it with this interval 'structure' from preceding and
-        following keyparts:
-
-          (kp14=c1 AND kp16=c3) OR keypart14=c2) (*)
-
-        We will obtain this SEL_ARG graph:
-
-             kp14     $      kp15      $      kp16
-                      $                $
-         +---------+  $   +---------+  $   +---------+
-         | kp14=c1 |--$-->| kp15=c0 |--$-->| kp16=c3 |
-         +---------+  $   +---------+  $   +---------+
-              |       $                $
-         +---------+  $   +---------+  $
-         | kp14=c2 |--$-->| kp15=c0 |  $
-         +---------+  $   +---------+  $
-                      $                $
-
-       Note that we had to duplicate "kp15=c0" and there was no way to avoid
-       that.
-       The induction step: AND the obtained expression with another "wrapping"
-       expression like (*).
-       When the process ends because of the limit on max. number of keyparts
-       we'll have:
-
-         WHERE clause length  is O(3*#max_keyparts)
-         SEL_ARG graph size   is O(2^(#max_keyparts/2))
-
-       (it is also possible to construct a case where instead of 2 in 2^n we
-        have a bigger constant, e.g. 4, and get a graph with 4^(31/2)= 2^31
-        nodes)
-
-    We avoid consuming too much memory by setting a limit on the number of
-    SEL_ARG object we can construct during one range analysis invocation.
-*/
-
-/*
-  Returns a number of keypart values appended to the key buffer
-  for min key and max key. This function is used by both Range
-  Analysis and Partition pruning. For partition pruning we have
-  to ensure that we don't store also subpartition fields. Thus
-  we have to stop at the last partition part and not step into
-  the subpartition fields. For Range Analysis we set last_part
-  to MAX_KEY which we should never reach.
-
-  Note: Caller of this function should take care of sending the
-  correct flags and correct key to be stored into.  In case of
-  ascending indexes, store_min_key() gets called to store the
-  min_value to range start_key. In case of descending indexes, it's
-  called for storing min_value to range end_key.
-*/
-
-int SEL_ROOT::store_min_key(KEY_PART *key, uchar **range_key,
-                            uint *range_key_flag, uint last_part,
-                            bool start_key) {
-  SEL_ARG *key_tree = root->first();
-  uint res = key_tree->store_min_value(key[key_tree->part].store_length,
-                                       range_key, *range_key_flag);
-  // We've stored min_value, so append min_flag
-  *range_key_flag |= key_tree->min_flag;
-  if (key_tree->next_key_part &&
-      key_tree->next_key_part->type == SEL_ROOT::Type::KEY_RANGE &&
-      key_tree->part != last_part &&
-      key_tree->next_key_part->root->part == key_tree->part + 1 &&
-      !(*range_key_flag & (NO_MIN_RANGE | NEAR_MIN))) {
-    const bool asc = key_tree->next_key_part->root->is_ascending;
-    if ((start_key && asc) || (!start_key && !asc))
-      res += key_tree->next_key_part->store_min_key(
-          key, range_key, range_key_flag, last_part, start_key);
-    else {
-      uint tmp_flag = invert_min_flag(*range_key_flag);
-      res += key_tree->next_key_part->store_max_key(key, range_key, &tmp_flag,
-                                                    last_part, start_key);
-      *range_key_flag = invert_max_flag(tmp_flag);
-    }
-  }
-  return res;
-}
-
-/*
-  Returns the number of keypart values appended to the key buffer.
-
-  Note: Caller of this function should take care of sending the
-  correct flags and correct key to be stored into.  In case of
-  ascending indexes, store_max_key() gets called while storing the
-  max_value into range end_key. In case of descending indexes,
-  its max_value to range start_key.
-*/
-
-int SEL_ROOT::store_max_key(KEY_PART *key, uchar **range_key,
-                            uint *range_key_flag, uint last_part,
-                            bool start_key) {
-  SEL_ARG *key_tree = root->last();
-  uint res = key_tree->store_max_value(key[key_tree->part].store_length,
-                                       range_key, *range_key_flag);
-  // We've stored max value, so return max_flag
-  (*range_key_flag) |= key_tree->max_flag;
-  if (key_tree->next_key_part &&
-      key_tree->next_key_part->type == SEL_ROOT::Type::KEY_RANGE &&
-      key_tree->part != last_part &&
-      key_tree->next_key_part->root->part == key_tree->part + 1 &&
-      !(*range_key_flag & (NO_MAX_RANGE | NEAR_MAX))) {
-    const bool asc = key_tree->next_key_part->root->is_ascending;
-    if ((!start_key && asc) || (start_key && !asc))
-      res += key_tree->next_key_part->store_max_key(
-          key, range_key, range_key_flag, last_part, start_key);
-    else {
-      uint tmp_flag = invert_max_flag(*range_key_flag);
-      res += key_tree->next_key_part->store_min_key(key, range_key, &tmp_flag,
-                                                    last_part, start_key);
-      *range_key_flag = invert_min_flag(tmp_flag);
-    }
-  }
-  return res;
-}
-
-void SEL_ROOT::free_tree() {
-  if (use_count == 0) {
-    for (SEL_ARG *pos = root->first(); pos; pos = pos->next) {
-      SEL_ROOT *root = pos->release_next_key_part();
-      if (root) root->free_tree();
-    }
-  }
-}
-
-/**
-  Helper function to compare two SEL_ROOTs.
-*/
-static bool all_same(const SEL_ROOT *sa1, const SEL_ROOT *sa2) {
-  if (sa1 == nullptr && sa2 == nullptr) return true;
-  if ((sa1 != nullptr && sa2 == nullptr) || (sa1 == nullptr && sa2 != nullptr))
-    return false;
-  if (sa1->type == SEL_ROOT::Type::KEY_RANGE &&
-      sa2->type == SEL_ROOT::Type::KEY_RANGE) {
-    const SEL_ARG *sa1_arg = sa1->root->first();
-    const SEL_ARG *sa2_arg = sa2->root->first();
-    for (; sa1_arg && sa2_arg && sa1_arg->is_same(sa2_arg);
-         sa1_arg = sa1_arg->next, sa2_arg = sa2_arg->next)
-      ;
-    if (sa1_arg || sa2_arg) return false;
-    return true;
-  } else
-    return sa1->type == sa2->type;
-}
-
-class SEL_IMERGE;
-struct ROR_SCAN_INFO;
-
-class PARAM : public RANGE_OPT_PARAM {
- public:
-  KEY_PART *key[MAX_KEY]; /* First key parts of keys used in the query */
-  longlong baseflag;
-  uint max_key_part;
-  /* Number of ranges in the last checked tree->key */
-  uint range_count;
-
-  bool quick;  // Don't calulate possible keys
-
-  uint fields_bitmap_size;
-  MY_BITMAP needed_fields; /* bitmask of fields needed by the query */
-  MY_BITMAP tmp_covered_fields;
-
-  Key_map *needed_reg; /* ptr to needed_reg argument of test_quick_select() */
-
-  // Buffer for index_merge cost estimates.
-  Unique::Imerge_cost_buf_type imerge_cost_buff;
-
-  /* true if last checked tree->key can be used for ROR-scan */
-  bool is_ror_scan;
-  /* true if last checked tree->key can be used for index-merge-scan */
-  bool is_imerge_scan;
-  /* Number of ranges in the last checked tree->key */
-  uint n_ranges;
-
-  /*
-     The sort order the range access method must be able
-     to provide. Three-value logic: asc/desc/don't care
-  */
-  enum_order order_direction;
-
-  /// Control whether the various index merge strategies are allowed
-  bool index_merge_allowed;
-  bool index_merge_union_allowed;
-  bool index_merge_sort_union_allowed;
-  bool index_merge_intersect_allowed;
-
-  /// Same value as JOIN_TAB::skip_records_in_range().
-  bool skip_records_in_range;
-};
-
-class TABLE_READ_PLAN;
-class TRP_GROUP_MIN_MAX;
-class TRP_RANGE;
-class TRP_ROR_INTERSECT;
-class TRP_SKIP_SCAN;
-
-static SEL_TREE *get_mm_parts(RANGE_OPT_PARAM *param, Item_func *cond_func,
-                              Field *field, Item_func::Functype type,
-                              Item *value);
-static SEL_ROOT *get_mm_leaf(RANGE_OPT_PARAM *param, Item *cond_func,
-                             Field *field, KEY_PART *key_part,
-                             Item_func::Functype type, Item *value);
-static bool is_key_scan_ror(PARAM *param, uint keynr, uint nparts);
-static ha_rows check_quick_select(PARAM *param, uint idx, bool index_only,
-                                  SEL_ROOT *tree, bool update_tbl_stats,
-                                  uint *mrr_flags, uint *bufsize,
-                                  Cost_estimate *cost);
-QUICK_RANGE_SELECT *get_quick_select(PARAM *param, uint index,
-                                     SEL_ROOT *key_tree, uint mrr_flags,
-                                     uint mrr_buf_size, MEM_ROOT *alloc,
-                                     uint num_key_parts = MAX_REF_PARTS);
-static TRP_RANGE *get_key_scans_params(PARAM *param, SEL_TREE *tree,
-                                       bool index_read_must_be_used,
-                                       bool update_tbl_stats,
-                                       const Cost_estimate *cost_est);
-static TRP_ROR_INTERSECT *get_best_ror_intersect(const PARAM *param,
-                                                 SEL_TREE *tree,
-                                                 const Cost_estimate *cost_est,
-                                                 bool force_index_merge_result);
-static TABLE_READ_PLAN *get_best_disjunct_quick(PARAM *param,
-                                                SEL_IMERGE *imerge,
-                                                const Cost_estimate *cost_est);
-static TRP_GROUP_MIN_MAX *get_best_group_min_max(PARAM *param, SEL_TREE *tree,
-                                                 const Cost_estimate *cost_est);
-static TRP_SKIP_SCAN *get_best_skip_scan(PARAM *param, SEL_TREE *tree,
-                                         bool force_skip_scan);
-#ifndef NDEBUG
-static void print_sel_tree(PARAM *param, SEL_TREE *tree, Key_map *tree_map,
-                           const char *msg);
-static void print_ror_scans_arr(TABLE *table, const char *msg,
-                                ROR_SCAN_INFO **start, ROR_SCAN_INFO **end);
-static void print_quick(QUICK_SELECT_I *quick, const Key_map *needed_reg);
-#endif
-
-#ifndef NDEBUG
-static inline void dbug_print_tree(const char *tree_name, SEL_TREE *tree,
-                                   const RANGE_OPT_PARAM *param);
-#else
-static inline void dbug_print_tree(const char *, SEL_TREE *,
-                                   const RANGE_OPT_PARAM *) {}
-#endif
-
-void print_tree(String *out, const char *tree_name, SEL_TREE *tree,
-                const RANGE_OPT_PARAM *param, const bool print_full)
-    MY_ATTRIBUTE((unused));
-
-/*
-  A null_sel_tree is used in get_func_mm_tree_from_in_predicate to pass
-  as an argument to tree_or. It is used only to influence the return
-  value from tree_or function.
-*/
-
-static MEM_ROOT null_root;
-static SEL_TREE null_sel_tree(SEL_TREE::IMPOSSIBLE, &null_root, 0);
-
-static SEL_ROOT *sel_add(SEL_ROOT *key1, SEL_ROOT *key2);
-static bool get_range(SEL_ARG **e1, SEL_ARG **e2, const SEL_ROOT *root1);
-bool get_quick_keys(PARAM *param, QUICK_RANGE_SELECT *quick, KEY_PART *key,
-                    SEL_ARG *key_tree, uchar *min_key, uint min_key_flag,
-                    uchar *max_key, uint max_key_flag, uint *desc_flag,
-                    uint num_key_parts);
-static bool eq_tree(const SEL_ROOT *a, const SEL_ROOT *b);
-static bool eq_tree(const SEL_ARG *a, const SEL_ARG *b);
-static bool eq_ranges_exceeds_limit(const SEL_ROOT *keypart, uint *count,
-                                    uint limit);
-
-namespace opt_range {
-SEL_ARG *null_element = nullptr;
-}
-using namespace opt_range;
-static bool null_part_in_key(KEY_PART *key_part, const uchar *key, uint length);
-static bool sel_trees_can_be_ored(SEL_TREE *tree1, SEL_TREE *tree2,
-                                  RANGE_OPT_PARAM *param);
-
-void range_optimizer_init() {
-  null_element = new SEL_ARG;
-  null_element->color =
-      SEL_ARG::BLACK;  // Don't trip up the test in test_rb_tree.
-}
-
-void range_optimizer_free() { delete null_element; }
-
-/*
-  Add SEL_TREE to this index_merge without any checks,
-
-  NOTES
-    This function implements the following:
-      (x_1||...||x_N) || t = (x_1||...||x_N||t), where x_i, t are SEL_TREEs
-
-  RETURN
-     0 - OK
-    -1 - Out of memory.
-*/
-
-int SEL_IMERGE::or_sel_tree(RANGE_OPT_PARAM *param, SEL_TREE *tree) {
-  if (trees_next == trees_end) {
-    const int realloc_ratio = 2; /* Double size for next round */
-    uint old_elements = static_cast<uint>(trees_end - trees);
-    uint old_size = sizeof(SEL_TREE **) * old_elements;
-    uint new_size = old_size * realloc_ratio;
-    SEL_TREE **new_trees;
-    if (!(new_trees = (SEL_TREE **)param->mem_root->Alloc(new_size))) return -1;
-    memcpy(new_trees, trees, old_size);
-    trees = new_trees;
-    trees_next = trees + old_elements;
-    trees_end = trees + old_elements * realloc_ratio;
-  }
-  *(trees_next++) = tree;
-  return 0;
-}
-
-/*
-  Perform OR operation on this SEL_IMERGE and supplied SEL_TREE new_tree,
-  combining new_tree with one of the trees in this SEL_IMERGE if they both
-  have SEL_ARGs for the same key.
-
-  SYNOPSIS
-    or_sel_tree_with_checks()
-      param    PARAM from test_quick_select
-      new_tree SEL_TREE with type KEY or KEY_SMALLER.
-
-  NOTES
-    This does the following:
-    (t_1||...||t_k)||new_tree =
-     either
-       = (t_1||...||t_k||new_tree)
-     or
-       = (t_1||....||(t_j|| new_tree)||...||t_k),
-
-     where t_i, y are SEL_TREEs.
-    new_tree is combined with the first t_j it has a SEL_ARG on common
-    key with. As a consequence of this, choice of keys to do index_merge
-    read may depend on the order of conditions in WHERE part of the query.
-
-  RETURN
-    0  OK
-    1  One of the trees was combined with new_tree to SEL_TREE::ALWAYS,
-       and (*this) should be discarded.
-   -1  An error occurred.
-*/
-
-int SEL_IMERGE::or_sel_tree_with_checks(RANGE_OPT_PARAM *param,
-                                        SEL_TREE *new_tree) {
-  DBUG_TRACE;
-  for (SEL_TREE **tree = trees; tree != trees_next; tree++) {
-    if (sel_trees_can_be_ored(*tree, new_tree, param)) {
-      *tree = tree_or(param, *tree, new_tree);
-      if (!*tree) return 1;
-      if (((*tree)->type == SEL_TREE::MAYBE) ||
-          ((*tree)->type == SEL_TREE::ALWAYS))
-        return 1;
-      /* SEL_TREE::IMPOSSIBLE is impossible here */
-      return 0;
-    }
-  }
-
-  /* New tree cannot be combined with any of existing trees. */
-  const int ret = or_sel_tree(param, new_tree);
-  return ret;
-}
-
-/*
-  Perform OR operation on this index_merge and supplied index_merge list.
-
-  RETURN
-    0 - OK
-    1 - One of conditions in result is always true and this SEL_IMERGE
-        should be discarded.
-   -1 - An error occurred
-*/
-
-int SEL_IMERGE::or_sel_imerge_with_checks(RANGE_OPT_PARAM *param,
-                                          SEL_IMERGE *imerge) {
-  for (SEL_TREE **tree = imerge->trees; tree != imerge->trees_next; tree++) {
-    if (or_sel_tree_with_checks(param, *tree)) return 1;
-  }
-  return 0;
-}
-
-SEL_TREE::SEL_TREE(SEL_TREE *arg, RANGE_OPT_PARAM *param)
-    : keys(param->mem_root, param->keys), n_ror_scans(0) {
-  keys_map = arg->keys_map;
-  type = arg->type;
-  for (uint idx = 0; idx < param->keys; idx++) {
-    if (arg->keys[idx]) {
-      set_key(idx, arg->keys[idx]->clone_tree(param));
-      if (!keys[idx]) break;
-    } else
-      set_key(idx, nullptr);
-  }
-
-  List_iterator<SEL_IMERGE> it(arg->merges);
-  for (SEL_IMERGE *el = it++; el; el = it++) {
-    SEL_IMERGE *merge = new (param->mem_root) SEL_IMERGE(el, param);
-    if (!merge || merge->trees == merge->trees_next || param->has_errors()) {
-      merges.clear();
-      return;
-    }
-    merges.push_back(merge);
-  }
-
-  /*
-    SEL_TREEs are only created by get_mm_tree() (and functions called
-    by get_mm_tree()). Index intersection is checked after
-    get_mm_tree() has constructed all ranges. In other words, there
-    should not be any ROR scans to copy when this ctor is called.
-  */
-  assert(n_ror_scans == 0);
-}
-
-SEL_IMERGE::SEL_IMERGE(SEL_IMERGE *arg, RANGE_OPT_PARAM *param) {
-  uint elements = static_cast<uint>(arg->trees_end - arg->trees);
-  if (elements > PREALLOCED_TREES) {
-    uint size = elements * sizeof(SEL_TREE **);
-    if (!(trees = (SEL_TREE **)param->mem_root->Alloc(size))) goto mem_err;
-  } else
-    trees = &trees_prealloced[0];
-
-  trees_next = trees;
-  trees_end = trees + elements;
-
-  for (SEL_TREE **tree = trees, **arg_tree = arg->trees; tree < trees_end;
-       tree++, arg_tree++) {
-    if (!(*tree = new (param->mem_root) SEL_TREE(*arg_tree, param)) ||
-        param->has_errors())
-      goto mem_err;
-  }
-
-  return;
-
-mem_err:
-  trees = &trees_prealloced[0];
-  trees_next = trees;
-  trees_end = trees;
-}
-
-/*
-  Perform AND operation on two index_merge lists and store result in *im1.
-*/
-
-inline void imerge_list_and_list(List<SEL_IMERGE> *im1, List<SEL_IMERGE> *im2) {
-  im1->concat(im2);
-}
-
-/*
-  Perform OR operation on 2 index_merge lists, storing result in first list.
-
-  NOTES
-    The following conversion is implemented:
-     (a_1 &&...&& a_N)||(b_1 &&...&& b_K) = AND_i,j(a_i || b_j) =>
-      => (a_1||b_1).
-
-    i.e. all conjuncts except the first one are currently dropped.
-    This is done to avoid producing N*K ways to do index_merge.
-
-    If (a_1||b_1) produce a condition that is always true, NULL is returned
-    and index_merge is discarded (while it is actually possible to try
-    harder).
-
-    As a consequence of this, choice of keys to do index_merge read may depend
-    on the order of conditions in WHERE part of the query.
-
-  RETURN
-    0     OK, result is stored in *im1
-    other Error, both passed lists are unusable
-*/
-
-static int imerge_list_or_list(RANGE_OPT_PARAM *param, List<SEL_IMERGE> *im1,
-                               List<SEL_IMERGE> *im2) {
-  SEL_IMERGE *imerge = im1->head();
-  im1->clear();
-  im1->push_back(imerge);
-
-  return imerge->or_sel_imerge_with_checks(param, im2->head());
-}
-
-/*
-  Perform OR operation on index_merge list and key tree.
-
-  RETURN
-    false     OK, result is stored in *im1.
-    true      Error
-*/
-
-static bool imerge_list_or_tree(RANGE_OPT_PARAM *param, List<SEL_IMERGE> *im1,
-                                SEL_TREE *tree) {
-  DBUG_TRACE;
-  SEL_IMERGE *imerge;
-  List_iterator<SEL_IMERGE> it(*im1);
-
-  uint remaining_trees = im1->elements;
-  while ((imerge = it++)) {
-    SEL_TREE *or_tree;
-    /*
-      Need to make a copy of 'tree' for all but the last OR operation
-      because or_sel_tree_with_checks() may change it.
-    */
-    if (--remaining_trees == 0)
-      or_tree = tree;
-    else {
-      or_tree = new (param->mem_root) SEL_TREE(tree, param);
-      if (!or_tree || param->has_errors()) return true;
-      if (or_tree->keys_map.is_clear_all() && or_tree->merges.is_empty())
-        return false;
-    }
-
-    int result_or = imerge->or_sel_tree_with_checks(param, or_tree);
-    if (result_or == 1)
-      it.remove();
-    else if (result_or == -1)
-      return true;
-  }
-  assert(remaining_trees == 0);
-  return im1->is_empty();
-}
-
-QUICK_SELECT_I::QUICK_SELECT_I()
-    : max_used_key_length(0), used_key_parts(0), forced_by_hint(false) {}
-
-void QUICK_SELECT_I::trace_quick_description(Opt_trace_context *trace) {
-  Opt_trace_object range_trace(trace, "range_details");
-
-  String range_info;
-  range_info.set_charset(system_charset_info);
-  add_info_string(&range_info);
-  range_trace.add_utf8("used_index", range_info.ptr(), range_info.length());
-}
-
-QUICK_RANGE_SELECT::QUICK_RANGE_SELECT(THD *thd, TABLE *table, uint key_nr,
-                                       bool no_alloc, MEM_ROOT *parent_alloc,
-                                       bool *create_error)
-    : ranges(key_memory_Quick_ranges),
-      free_file(false),
-      cur_range(nullptr),
-      last_range(nullptr),
-      mrr_flags(0),
-      mrr_buf_size(0),
-      mrr_buf_desc(nullptr),
-      dont_free(false) {
-  my_bitmap_map *bitmap;
-  DBUG_TRACE;
-
-  in_ror_merged_scan = false;
-  index = key_nr;
-  head = table;
-  key_part_info = head->key_info[index].key_part;
-
-  /* 'thd' is not accessible in QUICK_RANGE_SELECT::reset(). */
-  mrr_buf_size = thd->variables.read_rnd_buff_size;
-
-  if (!no_alloc && !parent_alloc) {
-    // Allocates everything through the internal memroot
-    alloc.reset(new MEM_ROOT);
-    init_sql_alloc(key_memory_quick_range_select_root, alloc.get(),
-                   thd->variables.range_alloc_block_size, 0);
-    thd->mem_root = alloc.get();
-  } else if (alloc != nullptr)
-    ::new (alloc.get()) MEM_ROOT(PSI_NOT_INSTRUMENTED, 0);
-  file = head->file;
-  record = head->record[0];
-
-  /* Allocate a bitmap for used columns (Q: why not on MEM_ROOT?) */
-  if (!(bitmap = (my_bitmap_map *)my_malloc(key_memory_my_bitmap_map,
-                                            head->s->column_bitmap_size,
-                                            MYF(MY_WME)))) {
-    column_bitmap.bitmap = nullptr;
-    *create_error = true;
-  } else
-    bitmap_init(&column_bitmap, bitmap, head->s->fields);
-}
-
-void QUICK_RANGE_SELECT::need_sorted_output() { mrr_flags |= HA_MRR_SORTED; }
-
-int QUICK_RANGE_SELECT::init() {
-  DBUG_TRACE;
-
-  if (file->inited) file->ha_index_or_rnd_end();
-  return false;
-}
-
-void QUICK_RANGE_SELECT::range_end() {
-  if (file->inited) file->ha_index_or_rnd_end();
-}
-
-QUICK_RANGE_SELECT::~QUICK_RANGE_SELECT() {
-  DBUG_TRACE;
-  if (head->key_info[index].flags & HA_MULTI_VALUED_KEY && file)
-    file->ha_extra(HA_EXTRA_DISABLE_UNIQUE_RECORD_FILTER);
-
-  if (!dont_free) {
-    /* file is NULL for CPK scan on covering ROR-intersection */
-    if (file) {
-      range_end();
-      if (free_file) {
-        DBUG_PRINT("info",
-                   ("Freeing separate handler %p (free: %d)", file, free_file));
-        file->ha_external_lock(current_thd, F_UNLCK);
-        file->ha_close();
-        destroy(file);
-      }
-    }
-    if (alloc != nullptr) free_root(alloc.get(), MYF(0));
-    my_free(column_bitmap.bitmap);
-  }
-  my_free(mrr_buf_desc);
-}
-
-QUICK_INDEX_MERGE_SELECT::QUICK_INDEX_MERGE_SELECT(THD *thd_param, TABLE *table)
-    : unique(nullptr), pk_quick_select(nullptr), thd(thd_param) {
-  DBUG_TRACE;
-  index = MAX_KEY;
-  head = table;
-  init_sql_alloc(key_memory_quick_index_merge_root, &alloc,
-                 thd->variables.range_alloc_block_size, 0);
-}
-
-int QUICK_INDEX_MERGE_SELECT::init() {
-  DBUG_TRACE;
-  return 0;
-}
-
-int QUICK_INDEX_MERGE_SELECT::reset() {
-  DBUG_TRACE;
-  const int retval = read_keys_and_merge();
-  return retval;
-}
-
-bool QUICK_INDEX_MERGE_SELECT::push_quick_back(
-    QUICK_RANGE_SELECT *quick_sel_range) {
-  /*
-    Save quick_select that does scan on clustered primary key as it will be
-    processed separately.
-  */
-  if (head->file->primary_key_is_clustered() &&
-      quick_sel_range->index == head->s->primary_key)
-    pk_quick_select = quick_sel_range;
-  else
-    return quick_selects.push_back(quick_sel_range);
-  return false;
-}
-
-QUICK_INDEX_MERGE_SELECT::~QUICK_INDEX_MERGE_SELECT() {
-  List_iterator_fast<QUICK_RANGE_SELECT> quick_it(quick_selects);
-  QUICK_RANGE_SELECT *quick;
-  DBUG_TRACE;
-  bool disable_unique_filter = false;
-  destroy(unique);
-  quick_it.rewind();
-  while ((quick = quick_it++)) {
-    // Normally it's disabled by dtor of QUICK_RANGE_SELECT, but it can't be
-    // done without table's handler
-    disable_unique_filter |=
-        (0 != (head->key_info[quick->index].flags & HA_MULTI_VALUED_KEY));
-    quick->file = nullptr;
-  }
-  quick_selects.delete_elements();
-  if (disable_unique_filter)
-    head->file->ha_extra(HA_EXTRA_DISABLE_UNIQUE_RECORD_FILTER);
-  delete pk_quick_select;
-  /* It's ok to call the next two even if they are already deinitialized */
-  read_record.reset();
-  free_io_cache(head);
-  free_root(&alloc, MYF(0));
-}
-
-QUICK_ROR_INTERSECT_SELECT::QUICK_ROR_INTERSECT_SELECT(THD *thd_param,
-                                                       TABLE *table,
-                                                       bool retrieve_full_rows,
-                                                       MEM_ROOT *parent_alloc)
-    : cpk_quick(nullptr),
-      thd(thd_param),
-      need_to_fetch_row(retrieve_full_rows),
-      scans_inited(false) {
-  index = MAX_KEY;
-  head = table;
-  record = head->record[0];
-  if (!parent_alloc)
-    init_sql_alloc(key_memory_quick_ror_intersect_select_root, &alloc,
-                   thd->variables.range_alloc_block_size, 0);
-  else
-    ::new (&alloc) MEM_ROOT(PSI_NOT_INSTRUMENTED, 0);
-  last_rowid = (uchar *)(parent_alloc ? parent_alloc : &alloc)
-                   ->Alloc(head->file->ref_length);
-}
-
-/*
-  Do post-constructor initialization.
-  SYNOPSIS
-    QUICK_ROR_INTERSECT_SELECT::init()
-
-  RETURN
-    0      OK
-    other  Error code
-*/
-
-int QUICK_ROR_INTERSECT_SELECT::init() {
-  DBUG_TRACE;
-  /* Check if last_rowid was successfully allocated in ctor */
-  return !last_rowid;
-}
-
-/*
-  Initialize this quick select to be a ROR-merged scan.
-
-  SYNOPSIS
-    QUICK_RANGE_SELECT::init_ror_merged_scan()
-      reuse_handler If true, use head->file, otherwise create a separate
-                    handler object
-
-  NOTES
-    This function creates and prepares for subsequent use a separate handler
-    object if it can't reuse head->file. The reason for this is that during
-    ROR-merge several key scans are performed simultaneously, and a single
-    handler is only capable of preserving context of a single key scan.
-
-    In ROR-merge the quick select doing merge does full records retrieval,
-    merged quick selects read only keys.
-
-  RETURN
-    0  ROR child scan initialized, ok to use.
-    1  error
-*/
-
-int QUICK_RANGE_SELECT::init_ror_merged_scan(bool reuse_handler) {
-  handler *save_file = file, *org_file;
-  MY_BITMAP *const save_read_set = head->read_set;
-  MY_BITMAP *const save_write_set = head->write_set;
-  DBUG_TRACE;
-
-  THD *thd = current_thd;
-
-  in_ror_merged_scan = true;
-  mrr_flags |= HA_MRR_SORTED;
-  if (reuse_handler) {
-    DBUG_PRINT("info", ("Reusing handler %p", file));
-    if (init() || reset()) {
-      return 1;
-    }
-    head->column_bitmaps_set(&column_bitmap, &column_bitmap);
-    file->ha_extra(HA_EXTRA_SECONDARY_SORT_ROWID);
-    goto end;
-  }
-
-  /* Create a separate handler object for this quick select */
-  if (free_file) {
-    /* already have own 'handler' object. */
-    return 0;
-  }
-
-  if (!(file =
-            head->file->clone(head->s->normalized_path.str, thd->mem_root))) {
-    /*
-      Manually set the error flag. Note: there seems to be quite a few
-      places where a failure could cause the server to "hang" the client by
-      sending no response to a query. ATM those are not real errors because
-      the storage engine calls in question happen to never fail with the
-      existing storage engines.
-    */
-    my_error(ER_OUT_OF_RESOURCES, MYF(0)); /* purecov: inspected */
-    /* Caller will free the memory */
-    goto failure; /* purecov: inspected */
-  }
-
-  head->column_bitmaps_set(&column_bitmap, &column_bitmap);
-
-  if (file->ha_external_lock(thd, head->file->get_lock_type())) goto failure;
-
-  if (init() || reset()) {
-    file->ha_external_lock(thd, F_UNLCK);
-    file->ha_close();
-    goto failure;
-  }
-  free_file = true;
-  last_rowid = file->ref;
-  file->ha_extra(HA_EXTRA_SECONDARY_SORT_ROWID);
-
-end:
-  /*
-    We are only going to read key fields and call position() on 'file'
-    The following sets head->tmp_set to only use this key and then updates
-    head->read_set and head->write_set to use this bitmap.
-    The now bitmap is stored in 'column_bitmap' which is used in ::get_next()
-  */
-  org_file = head->file;
-  head->file = file;
-  /* We don't have to set 'head->keyread' here as the 'file' is unique */
-  if (!head->no_keyread) head->mark_columns_used_by_index(index);
-  head->prepare_for_position();
-  head->file = org_file;
-  bitmap_copy(&column_bitmap, head->read_set);
-
-  /*
-    We have prepared a column_bitmap which get_next() will use. To do this we
-    used TABLE::read_set/write_set as playground; restore them to their
-    original value to not pollute other scans.
-  */
-  head->column_bitmaps_set(save_read_set, save_write_set);
-  bitmap_clear_all(&head->tmp_set);
-
-  return 0;
-
-failure:
-  head->column_bitmaps_set(save_read_set, save_write_set);
-  destroy(file);
-  file = save_file;
-  return 1;
-}
-
-/*
-  Initialize this quick select to be a part of a ROR-merged scan.
-  SYNOPSIS
-    QUICK_ROR_INTERSECT_SELECT::init_ror_merged_scan()
-      reuse_handler If true, use head->file, otherwise create separate
-                    handler object.
-  RETURN
-    0     OK
-    other error code
-*/
-int QUICK_ROR_INTERSECT_SELECT::init_ror_merged_scan(bool reuse_handler) {
-  List_iterator_fast<QUICK_RANGE_SELECT> quick_it(quick_selects);
-  QUICK_RANGE_SELECT *quick;
-  DBUG_TRACE;
-
-  /* Initialize all merged "children" quick selects */
-  assert(!need_to_fetch_row || reuse_handler);
-  if (!need_to_fetch_row && reuse_handler) {
-    quick = quick_it++;
-    /*
-      There is no use of this->file. Use it for the first of merged range
-      selects.
-    */
-    int error = quick->init_ror_merged_scan(true);
-    if (error) return error;
-    quick->file->ha_extra(HA_EXTRA_KEYREAD_PRESERVE_FIELDS);
-  }
-  while ((quick = quick_it++)) {
-#ifndef NDEBUG
-    const MY_BITMAP *const save_read_set = quick->head->read_set;
-    const MY_BITMAP *const save_write_set = quick->head->write_set;
-#endif
-    int error;
-    if ((error = quick->init_ror_merged_scan(false))) return error;
-    quick->file->ha_extra(HA_EXTRA_KEYREAD_PRESERVE_FIELDS);
-    // Sets are shared by all members of "quick_selects" so must not change
-    assert(quick->head->read_set == save_read_set);
-    assert(quick->head->write_set == save_write_set);
-    /* All merged scans share the same record buffer in intersection. */
-    quick->record = head->record[0];
-  }
-
-  /* Prepare for ha_rnd_pos calls if needed. */
-  int error;
-  if (need_to_fetch_row && (error = head->file->ha_rnd_init(false))) {
-    DBUG_PRINT("error", ("ROR index_merge rnd_init call failed"));
-    return error;
-  }
-  return 0;
-}
-
-/*
-  Initialize quick select for row retrieval.
-  SYNOPSIS
-    reset()
-  RETURN
-    0      OK
-    other  Error code
-*/
-
-int QUICK_ROR_INTERSECT_SELECT::reset() {
-  DBUG_TRACE;
-  if (!scans_inited && init_ror_merged_scan(true)) return 1;
-  scans_inited = true;
-  List_iterator_fast<QUICK_RANGE_SELECT> it(quick_selects);
-  QUICK_RANGE_SELECT *quick;
-  while ((quick = it++)) quick->reset();
-  return 0;
-}
-
-/*
-  Add a merged quick select to this ROR-intersection quick select.
-
-  SYNOPSIS
-    QUICK_ROR_INTERSECT_SELECT::push_quick_back()
-      quick Quick select to be added. The quick select must return
-            rows in rowid order.
-  NOTES
-    This call can only be made before init() is called.
-
-  RETURN
-    false OK
-    true  Out of memory.
-*/
-
-bool QUICK_ROR_INTERSECT_SELECT::push_quick_back(QUICK_RANGE_SELECT *quick) {
-  return quick_selects.push_back(quick);
-}
-
-QUICK_ROR_INTERSECT_SELECT::~QUICK_ROR_INTERSECT_SELECT() {
-  DBUG_TRACE;
-  quick_selects.delete_elements();
-  delete cpk_quick;
-  free_root(&alloc, MYF(0));
-  if (need_to_fetch_row && head->file->inited) head->file->ha_rnd_end();
-}
-
-QUICK_ROR_UNION_SELECT::QUICK_ROR_UNION_SELECT(THD *thd_param, TABLE *table)
-    : queue(Quick_ror_union_less(this),
-            Malloc_allocator<PSI_memory_key>(PSI_INSTRUMENT_ME)),
-      thd(thd_param),
-      scans_inited(false) {
-  index = MAX_KEY;
-  head = table;
-  rowid_length = table->file->ref_length;
-  record = head->record[0];
-  init_sql_alloc(key_memory_quick_ror_union_select_root, &alloc,
-                 thd->variables.range_alloc_block_size, 0);
-  thd_param->mem_root = &alloc;
-}
-
-/*
-  Do post-constructor initialization.
-  SYNOPSIS
-    QUICK_ROR_UNION_SELECT::init()
-
-  RETURN
-    0      OK
-    other  Error code
-*/
-
-int QUICK_ROR_UNION_SELECT::init() {
-  DBUG_TRACE;
-  if (queue.reserve(quick_selects.elements)) {
-    return 1;
-  }
-
-  if (!(cur_rowid = (uchar *)alloc.Alloc(2 * head->file->ref_length))) return 1;
-  prev_rowid = cur_rowid + head->file->ref_length;
-  return 0;
-}
-
-/*
-  Initialize quick select for row retrieval.
-  SYNOPSIS
-    reset()
-
-  RETURN
-    0      OK
-    other  Error code
-*/
-
-int QUICK_ROR_UNION_SELECT::reset() {
-  QUICK_SELECT_I *quick;
-  int error;
-  DBUG_TRACE;
-  have_prev_rowid = false;
-  if (!scans_inited) {
-    List_iterator_fast<QUICK_SELECT_I> it(quick_selects);
-    while ((quick = it++)) {
-      /*
-        Use mem_root of this "QUICK" as using the statement mem_root
-        might result in too many allocations when combined with
-        dynamic range access where range optimizer is invoked many times
-        for a single statement.
-      */
-      MEM_ROOT *saved_root = thd->mem_root;
-      thd->mem_root = &alloc;
-      error = quick->init_ror_merged_scan(false);
-      thd->mem_root = saved_root;
-      if (error) return 1;
-    }
-    scans_inited = true;
-  }
-  queue.clear();
-  /*
-    Initialize scans for merged quick selects and put all merged quick
-    selects into the queue.
-  */
-  List_iterator_fast<QUICK_SELECT_I> it(quick_selects);
-  while ((quick = it++)) {
-    if ((error = quick->reset())) return error;
-    if ((error = quick->get_next())) {
-      if (error == HA_ERR_END_OF_FILE) continue;
-      return error;
-    }
-    quick->save_last_pos();
-    queue.push(quick);
-  }
-
-  /* Prepare for ha_rnd_pos calls. */
-  if (head->file->inited && (error = head->file->ha_rnd_end())) {
-    DBUG_PRINT("error", ("ROR index_merge rnd_end call failed"));
-    return error;
-  }
-  if ((error = head->file->ha_rnd_init(false))) {
-    DBUG_PRINT("error", ("ROR index_merge rnd_init call failed"));
-    return error;
-  }
-
-  return 0;
-}
-
-bool QUICK_ROR_UNION_SELECT::push_quick_back(QUICK_SELECT_I *quick_sel_range) {
-  return quick_selects.push_back(quick_sel_range);
-}
-
-QUICK_ROR_UNION_SELECT::~QUICK_ROR_UNION_SELECT() {
-  DBUG_TRACE;
-  quick_selects.delete_elements();
-  if (head->file->inited) head->file->ha_rnd_end();
-  free_root(&alloc, MYF(0));
-}
-
-QUICK_RANGE::QUICK_RANGE()
-    : min_key(nullptr),
-      max_key(nullptr),
-      min_length(0),
-      max_length(0),
-      flag(NO_MIN_RANGE | NO_MAX_RANGE),
-      rkey_func_flag(HA_READ_INVALID),
-      min_keypart_map(0),
-      max_keypart_map(0) {}
-
-QUICK_RANGE::QUICK_RANGE(const uchar *min_key_arg, uint min_length_arg,
-                         key_part_map min_keypart_map_arg,
-                         const uchar *max_key_arg, uint max_length_arg,
-                         key_part_map max_keypart_map_arg, uint flag_arg,
-                         enum ha_rkey_function rkey_func_flag_arg)
-    : min_key(nullptr),
-      max_key(nullptr),
-      min_length((uint16)min_length_arg),
-      max_length((uint16)max_length_arg),
-      flag((uint16)flag_arg),
-      rkey_func_flag(rkey_func_flag_arg),
-      min_keypart_map(min_keypart_map_arg),
-      max_keypart_map(max_keypart_map_arg) {
-  min_key = static_cast<uchar *>(sql_memdup(min_key_arg, min_length_arg + 1));
-  max_key = static_cast<uchar *>(sql_memdup(max_key_arg, max_length_arg + 1));
-  // If we get is_null_string as argument, the memdup is undefined behavior.
-  assert(min_key_arg != is_null_string);
-  assert(max_key_arg != is_null_string);
-}
-
-SEL_ARG::SEL_ARG(SEL_ARG &arg)
-    : min_flag(arg.min_flag),
-      max_flag(arg.max_flag),
-      maybe_flag(arg.maybe_flag),
-      part(arg.part),
-      rkey_func_flag(arg.rkey_func_flag),
-      field(arg.field),
-      min_value(arg.min_value),
-      max_value(arg.max_value),
-      left(null_element),
-      right(null_element),
-      next(nullptr),
-      prev(nullptr),
-      next_key_part(arg.next_key_part),
-      is_ascending(arg.is_ascending) {
-  if (next_key_part) ++next_key_part->use_count;
-}
-
-SEL_ARG::SEL_ARG(Field *f, const uchar *min_value_arg,
-                 const uchar *max_value_arg, bool asc)
-    : part(0),
-      rkey_func_flag(HA_READ_INVALID),
-      field(f),
-      min_value(const_cast<uchar *>(min_value_arg)),
-      max_value(const_cast<uchar *>(max_value_arg)),
-      left(null_element),
-      right(null_element),
-      next(nullptr),
-      prev(nullptr),
-      parent(nullptr),
-      color(BLACK),
-      is_ascending(asc) {}
-
-SEL_ARG::SEL_ARG(Field *field_, uint8 part_, uchar *min_value_,
-                 uchar *max_value_, uint8 min_flag_, uint8 max_flag_,
-                 bool maybe_flag_, bool asc)
-    : min_flag(min_flag_),
-      max_flag(max_flag_),
-      maybe_flag(maybe_flag_),
-      part(part_),
-      rkey_func_flag(HA_READ_INVALID),
-      field(field_),
-      min_value(min_value_),
-      max_value(max_value_),
-      left(null_element),
-      right(null_element),
-      next(nullptr),
-      prev(nullptr),
-      parent(nullptr),
-      color(BLACK),
-      is_ascending(asc) {}
-
-SEL_ARG *SEL_ARG::clone(RANGE_OPT_PARAM *param, SEL_ARG *new_parent,
-                        SEL_ARG **next_arg) {
-  SEL_ARG *tmp;
-
-  if (param->has_errors()) return nullptr;
-
-  if (!(tmp = new (param->mem_root)
-            SEL_ARG(field, part, min_value, max_value, min_flag, max_flag,
-                    maybe_flag, is_ascending)))
-    return nullptr;  // OOM
-  tmp->parent = new_parent;
-  tmp->set_next_key_part(next_key_part);
-  if (left == null_element || left == nullptr) {
-    tmp->left = left;
-  } else {
-    if (!(tmp->left = left->clone(param, tmp, next_arg)))
-      return nullptr;  // OOM
-  }
-
-  tmp->prev = *next_arg;  // Link into next/prev chain
-  (*next_arg)->next = tmp;
-  (*next_arg) = tmp;
-
-  if (right == null_element || right == nullptr) {
-    tmp->right = right;
-  } else {
-    if (!(tmp->right = right->clone(param, tmp, next_arg)))
-      return nullptr;  // OOM
-  }
-  tmp->color = color;
-  return tmp;
-}
-
-/**
-  This gives the first SEL_ARG in the interval list, and the minimal element
-  in the red-black tree
-
-  @return
-  SEL_ARG   first SEL_ARG in the interval list
-*/
-SEL_ARG *SEL_ARG::first() {
-  SEL_ARG *next_arg = this;
-  if (!next_arg->left) return nullptr;  // MAYBE_KEY
-  while (next_arg->left != null_element) next_arg = next_arg->left;
-  return next_arg;
-}
-
-const SEL_ARG *SEL_ARG::first() const {
-  return const_cast<SEL_ARG *>(this)->first();
-}
-
-SEL_ARG *SEL_ARG::last() {
-  SEL_ARG *next_arg = this;
-  if (!next_arg->right) return nullptr;  // MAYBE_KEY
-  while (next_arg->right != null_element) next_arg = next_arg->right;
-  return next_arg;
-}
-
-/*
-  Check if a compare is ok, when one takes ranges in account
-  Returns -2 or 2 if the ranges where 'joined' like  < 2 and >= 2
-*/
-
-int sel_cmp(Field *field, uchar *a, uchar *b, uint8 a_flag, uint8 b_flag) {
-  int cmp;
-  /* First check if there was a compare to a min or max element */
-  if (a_flag & (NO_MIN_RANGE | NO_MAX_RANGE)) {
-    if ((a_flag & (NO_MIN_RANGE | NO_MAX_RANGE)) ==
-        (b_flag & (NO_MIN_RANGE | NO_MAX_RANGE)))
-      return 0;
-    return (a_flag & NO_MIN_RANGE) ? -1 : 1;
-  }
-  if (b_flag & (NO_MIN_RANGE | NO_MAX_RANGE))
-    return (b_flag & NO_MIN_RANGE) ? 1 : -1;
-
-  if (field->is_nullable())  // If null is part of key
-  {
-    if (*a != *b) {
-      return *a ? -1 : 1;
-    }
-    if (*a) goto end;  // NULL where equal
-    a++;
-    b++;  // Skip NULL marker
-  }
-  cmp = field->key_cmp(a, b);
-  if (cmp) return cmp < 0 ? -1 : 1;  // The values differed
-
-  // Check if the compared equal arguments was defined with open/closed range
-end:
-  if (a_flag & (NEAR_MIN | NEAR_MAX)) {
-    if ((a_flag & (NEAR_MIN | NEAR_MAX)) == (b_flag & (NEAR_MIN | NEAR_MAX)))
-      return 0;
-    if (!(b_flag & (NEAR_MIN | NEAR_MAX))) return (a_flag & NEAR_MIN) ? 2 : -2;
-    return (a_flag & NEAR_MIN) ? 1 : -1;
-  }
-  if (b_flag & (NEAR_MIN | NEAR_MAX)) return (b_flag & NEAR_MIN) ? -2 : 2;
-  return 0;  // The elements where equal
-}
-
-namespace {
-
-size_t count_elements(const SEL_ARG *arg) {
-  size_t elements = 1;
-  assert(arg->left);
-  assert(arg->right);
-  if (arg->left && arg->left != null_element)
-    elements += count_elements(arg->left);
-  if (arg->right && arg->right != null_element)
-    elements += count_elements(arg->right);
-  return elements;
-}
-
-}  // Namespace
-
-SEL_ROOT::SEL_ROOT(SEL_ARG *root_arg)
-    : type(Type::KEY_RANGE),
-      root(root_arg),
-      elements(count_elements(root_arg)) {}
-
-SEL_ROOT::SEL_ROOT(MEM_ROOT *mem_root, Type type_arg)
-    : type(type_arg), root(new (mem_root) SEL_ARG()), elements(1) {
-  assert(type_arg == Type::MAYBE_KEY || type_arg == Type::IMPOSSIBLE);
-  root->make_root();
-  if (type_arg == Type::MAYBE_KEY) {
-    // See todo for left/right pointers
-    root->left = root->right = nullptr;
-  }
-}
-
-inline bool SEL_ROOT::is_always() const {
-  return type == Type::KEY_RANGE && elements == 1 && !root->maybe_flag &&
-         (root->min_flag & NO_MIN_RANGE) && (root->max_flag & NO_MAX_RANGE);
-}
-
-SEL_ROOT *SEL_ROOT::clone_tree(RANGE_OPT_PARAM *param) const {
-  /*
-    Only SEL_ROOTs of type KEY_RANGE has any elements that need to be cloned.
-    For other types, just create a new SEL_ROOT object.
-  */
-  if (type != Type::KEY_RANGE)
-    return new (param->mem_root) SEL_ROOT(param->mem_root, type);
-
-  SEL_ARG tmp_link, *next_arg, *new_root;
-  SEL_ROOT *new_tree;
-  next_arg = &tmp_link;
-
-  // Clone the underlying SEL_ARG tree, starting from the root node.
-  if (!(new_root = root->clone(param, (SEL_ARG *)nullptr, &next_arg)) ||
-      (param && param->has_errors()))
-    return nullptr;
-
-  // Make the SEL_ROOT itself.
-  if (!(new_tree = new (param->mem_root) SEL_ROOT(new_root))) return nullptr;
-  new_tree->elements = elements;
-  next_arg->next = nullptr;       // Fix last link
-  tmp_link.next->prev = nullptr;  // Fix first link
-  new_tree->use_count = 0;
-  return new_tree;
-}
-
-/*
-  Table rows retrieval plan. Range optimizer creates QUICK_SELECT_I-derived
-  objects from table read plans.
-*/
-class TABLE_READ_PLAN {
- public:
-  /*
-    Plan read cost, with or without cost of full row retrieval, depending
-    on plan creation parameters.
-  */
-  Cost_estimate cost_est;
-  ha_rows records; /* estimate of #rows to be examined */
-
-  /*
-    If true, the scan returns rows in rowid order. This is used only for
-    scans that can be both ROR and non-ROR.
-  */
-  bool is_ror;
-
-  /*
-    If true, this plan can be used for index merge scan.
-  */
-  bool is_imerge;
-
-  /*
-    Create quick select for this plan.
-    SYNOPSIS
-     make_quick()
-       param               Parameter from test_quick_select
-       retrieve_full_rows  If true, created quick select will do full record
-                           retrieval.
-       parent_alloc        Memory pool to use, if any.
-
-    NOTES
-      retrieve_full_rows is ignored by some implementations.
-
-    RETURN
-      created quick select
-      NULL on any error.
-  */
-  virtual QUICK_SELECT_I *make_quick(PARAM *param, bool retrieve_full_rows,
-                                     MEM_ROOT *parent_alloc = nullptr) = 0;
-
-  /* Table read plans are allocated on MEM_ROOT and are never deleted */
-  static void *operator new(size_t size, MEM_ROOT *mem_root,
-                            const std::nothrow_t &arg MY_ATTRIBUTE((unused)) =
-                                std::nothrow) noexcept {
-    return mem_root->Alloc(size);
-  }
-  static void operator delete(void *ptr MY_ATTRIBUTE((unused)),
-                              size_t size MY_ATTRIBUTE((unused))) {
-    TRASH(ptr, size);
-  }
-  static void operator delete(
-      void *, MEM_ROOT *, const std::nothrow_t &) noexcept { /* Never called */
-  }
-  virtual ~TABLE_READ_PLAN() = default;
-
-  /**
-     Add basic info for this TABLE_READ_PLAN to the optimizer trace.
-
-     @param param        Parameters for range analysis of this table
-     @param trace_object The optimizer trace object the info is appended to
-  */
-  virtual void trace_basic_info(const PARAM *param,
-                                Opt_trace_object *trace_object) const = 0;
-  virtual bool is_forced_by_hint() { return false; }
-};
-
-/*
-  Plan for a QUICK_RANGE_SELECT scan.
-  TRP_RANGE::make_quick ignores retrieve_full_rows parameter because
-  QUICK_RANGE_SELECT doesn't distinguish between 'index only' scans and full
-  record retrieval scans.
-*/
-
-class TRP_RANGE : public TABLE_READ_PLAN {
- public:
-  /**
-    Root of red-black tree for intervals over key fields to be used in
-    "range" method retrieval. See SEL_ARG graph description.
-  */
-  SEL_ROOT *key;
-  uint key_idx; /* key number in PARAM::key and PARAM::real_keynr */
-  uint mrr_flags;
-  uint mrr_buf_size;
-
-  TRP_RANGE(SEL_ROOT *key_arg, uint idx_arg, uint mrr_flags_arg)
-      : key(key_arg), key_idx(idx_arg), mrr_flags(mrr_flags_arg) {}
-
-  QUICK_SELECT_I *make_quick(PARAM *param, bool,
-                             MEM_ROOT *parent_alloc) override {
-    DBUG_TRACE;
-    QUICK_RANGE_SELECT *quick;
-    if ((quick = get_quick_select(param, key_idx, key, mrr_flags, mrr_buf_size,
-                                  parent_alloc))) {
-      quick->records = records;
-      quick->cost_est = cost_est;
-    }
-    return quick;
-  }
-
-  void trace_basic_info(const PARAM *param,
-                        Opt_trace_object *trace_object) const override;
-};
-
-void TRP_RANGE::trace_basic_info(const PARAM *param,
-                                 Opt_trace_object *trace_object) const {
-  assert(param->using_real_indexes);
-  const uint keynr_in_table = param->real_keynr[key_idx];
-
-  const KEY &cur_key = param->table->key_info[keynr_in_table];
-  const KEY_PART_INFO *key_part = cur_key.key_part;
-
-  trace_object->add_alnum("type", "range_scan")
-      .add_utf8("index", cur_key.name)
-      .add("rows", records);
-
-  Opt_trace_array trace_range(&param->thd->opt_trace, "ranges");
-
-  // TRP_RANGE should not be created if there are no range intervals
-  assert(key);
-
-  String range_info;
-  range_info.set_charset(system_charset_info);
-  append_range_all_keyparts(&trace_range, nullptr, &range_info, key, key_part,
-                            false);
-}
-
-struct ROR_SCAN_INFO {
-  uint idx;         ///< # of used key in param->keys
-  uint keynr;       ///< # of used key in table
-  ha_rows records;  ///< estimate of # records this scan will return
-
-  /** Set of intervals over key fields that will be used for row retrieval. */
-  SEL_ROOT *sel_root;
-
-  /** Fields used in the query and covered by this ROR scan. */
-  MY_BITMAP covered_fields;
-  /**
-    Fields used in the query that are a) covered by this ROR scan and
-    b) not already covered by ROR scans ordered earlier in the merge
-    sequence.
-  */
-  MY_BITMAP covered_fields_remaining;
-  /** Number of fields in covered_fields_remaining (caching of
-   * bitmap_bits_set()) */
-  uint num_covered_fields_remaining;
-
-  /**
-    Cost of reading all index records with values in sel_arg intervals set
-    (assuming there is no need to access full table records)
-  */
-  Cost_estimate index_read_cost;
-};
-
-/* Plan for QUICK_ROR_INTERSECT_SELECT scan. */
-
-class TRP_ROR_INTERSECT : public TABLE_READ_PLAN {
-  bool forced_by_hint;
-
- public:
-  explicit TRP_ROR_INTERSECT(bool forced_by_hint_arg)
-      : forced_by_hint(forced_by_hint_arg) {}
-
-  QUICK_SELECT_I *make_quick(PARAM *param, bool retrieve_full_rows,
-                             MEM_ROOT *parent_alloc) override;
-
-  /* Array of pointers to ROR range scans used in this intersection */
-  ROR_SCAN_INFO **first_scan;
-  ROR_SCAN_INFO **last_scan; /* End of the above array */
-  ROR_SCAN_INFO *cpk_scan;   /* Clustered PK scan, if there is one */
-  bool is_covering;          /* true if no row retrieval phase is necessary */
-  Cost_estimate index_scan_cost; /* SUM(cost(index_scan)) */
-
-  void trace_basic_info(const PARAM *param,
-                        Opt_trace_object *trace_object) const override;
-};
-
-void TRP_ROR_INTERSECT::trace_basic_info(const PARAM *param,
-                                         Opt_trace_object *trace_object) const {
-  trace_object->add_alnum("type", "index_roworder_intersect")
-      .add("rows", records)
-      .add("cost", cost_est)
-      .add("covering", is_covering)
-      .add("clustered_pk_scan", cpk_scan != nullptr);
-
-  Opt_trace_context *const trace = &param->thd->opt_trace;
-  Opt_trace_array ota(trace, "intersect_of");
-  for (ROR_SCAN_INFO **cur_scan = first_scan; cur_scan != last_scan;
-       cur_scan++) {
-    const KEY &cur_key = param->table->key_info[(*cur_scan)->keynr];
-    const KEY_PART_INFO *key_part = cur_key.key_part;
-
-    Opt_trace_object trace_isect_idx(trace);
-    trace_isect_idx.add_alnum("type", "range_scan")
-        .add_utf8("index", cur_key.name)
-        .add("rows", (*cur_scan)->records);
-
-    Opt_trace_array trace_range(trace, "ranges");
-    for (const SEL_ARG *current = (*cur_scan)->sel_root->root->first(); current;
-         current = current->next) {
-      String range_info;
-      range_info.set_charset(system_charset_info);
-      for (const SEL_ARG *part = current; part;
-           part = part->next_key_part ? part->next_key_part->root : nullptr) {
-        const KEY_PART_INFO *cur_key_part = key_part + part->part;
-        append_range(&range_info, cur_key_part, part->min_value,
-                     part->max_value, part->min_flag | part->max_flag);
-      }
-      trace_range.add_utf8(range_info.ptr(), range_info.length());
-    }
-  }
-}
-
-/*
-  Plan for QUICK_ROR_UNION_SELECT scan.
-  QUICK_ROR_UNION_SELECT always retrieves full rows, so retrieve_full_rows
-  is ignored by make_quick.
-*/
-
-class TRP_ROR_UNION : public TABLE_READ_PLAN {
-  bool forced_by_hint;
-
- public:
-  explicit TRP_ROR_UNION(bool forced_by_hint_arg)
-      : forced_by_hint(forced_by_hint_arg) {}
-  QUICK_SELECT_I *make_quick(PARAM *param, bool retrieve_full_rows,
-                             MEM_ROOT *parent_alloc) override;
-  TABLE_READ_PLAN **first_ror; /* array of ptrs to plans for merged scans */
-  TABLE_READ_PLAN **last_ror;  /* end of the above array */
-
-  void trace_basic_info(const PARAM *param,
-                        Opt_trace_object *trace_object) const override;
-};
-
-void TRP_ROR_UNION::trace_basic_info(const PARAM *param,
-                                     Opt_trace_object *trace_object) const {
-  Opt_trace_context *const trace = &param->thd->opt_trace;
-  trace_object->add_alnum("type", "index_roworder_union");
-  Opt_trace_array ota(trace, "union_of");
-  for (TABLE_READ_PLAN **current = first_ror; current != last_ror; current++) {
-    Opt_trace_object trp_info(trace);
-    (*current)->trace_basic_info(param, &trp_info);
-  }
-}
-
-/*
-  Plan for QUICK_INDEX_MERGE_SELECT scan.
-  QUICK_ROR_INTERSECT_SELECT always retrieves full rows, so retrieve_full_rows
-  is ignored by make_quick.
-*/
-
-class TRP_INDEX_MERGE : public TABLE_READ_PLAN {
-  bool forced_by_hint;
-
- public:
-  explicit TRP_INDEX_MERGE(bool forced_by_hint_arg)
-      : forced_by_hint(forced_by_hint_arg) {}
-  QUICK_SELECT_I *make_quick(PARAM *param, bool retrieve_full_rows,
-                             MEM_ROOT *parent_alloc) override;
-  TRP_RANGE **range_scans;     /* array of ptrs to plans of merged scans */
-  TRP_RANGE **range_scans_end; /* end of the array */
-
-  void trace_basic_info(const PARAM *param,
-                        Opt_trace_object *trace_object) const override;
-};
-
-void TRP_INDEX_MERGE::trace_basic_info(const PARAM *param,
-                                       Opt_trace_object *trace_object) const {
-  Opt_trace_context *const trace = &param->thd->opt_trace;
-  trace_object->add_alnum("type", "index_merge");
-  Opt_trace_array ota(trace, "index_merge_of");
-  for (TRP_RANGE **current = range_scans; current != range_scans_end;
-       current++) {
-    Opt_trace_object trp_info(trace);
-    (*current)->trace_basic_info(param, &trp_info);
-  }
-}
-
-/*
-  Plan for a QUICK_GROUP_MIN_MAX_SELECT scan.
-*/
-
-class TRP_GROUP_MIN_MAX : public TABLE_READ_PLAN {
- private:
-  bool have_min;  ///< true if there is a MIN function
-  bool have_max;  ///< true if there is a MAX function
-  /**
-    true if there is an aggregate distinct function, e.g.
-    "COUNT(DISTINCT x)"
-  */
-  bool have_agg_distinct;
-  /**
-    The key_part of the only field used by all MIN/MAX functions.
-    Note that TRP_GROUP_MIN_MAX is not used if there are MIN/MAX
-    functions on more than one field.
-  */
-  KEY_PART_INFO *min_max_arg_part;
-  uint group_prefix_len;  ///< Length of all key parts in the group prefix
-  uint used_key_parts;    ///< Number of index key parts used for access
-  uint group_key_parts;   ///< Number of index key parts in the group prefix
-  KEY *index_info;        ///< The index chosen for data access
-  uint index;             ///< The id of the chosen index
-  uchar key_infix[MAX_KEY_LENGTH];  ///< Constants from equality predicates
-  uint key_infix_len;               ///< Length of key_infix
-  SEL_TREE *range_tree;  ///< Represents all range predicates in the query
-  SEL_ROOT *index_tree;  ///< The sub-tree corresponding to index_info
-  uint param_idx;        ///< Index of used key in param->key
-  bool is_index_scan;    ///< Use index_next() instead of random read
- public:
-  /** Number of records selected by the ranges in index_tree. */
-  ha_rows quick_prefix_records;
-
- public:
-  void trace_basic_info(const PARAM *param,
-                        Opt_trace_object *trace_object) const override;
-
-  TRP_GROUP_MIN_MAX(bool have_min_arg, bool have_max_arg,
-                    bool have_agg_distinct_arg,
-                    KEY_PART_INFO *min_max_arg_part_arg,
-                    uint group_prefix_len_arg, uint used_key_parts_arg,
-                    uint group_key_parts_arg, KEY *index_info_arg,
-                    uint index_arg, uint key_infix_len_arg, SEL_TREE *tree_arg,
-                    SEL_ROOT *index_tree_arg, uint param_idx_arg,
-                    ha_rows quick_prefix_records_arg)
-      : have_min(have_min_arg),
-        have_max(have_max_arg),
-        have_agg_distinct(have_agg_distinct_arg),
-        min_max_arg_part(min_max_arg_part_arg),
-        group_prefix_len(group_prefix_len_arg),
-        used_key_parts(used_key_parts_arg),
-        group_key_parts(group_key_parts_arg),
-        index_info(index_info_arg),
-        index(index_arg),
-        key_infix_len(key_infix_len_arg),
-        range_tree(tree_arg),
-        index_tree(index_tree_arg),
-        param_idx(param_idx_arg),
-        is_index_scan(false),
-        quick_prefix_records(quick_prefix_records_arg) {}
-
-  QUICK_SELECT_I *make_quick(PARAM *param, bool retrieve_full_rows,
-                             MEM_ROOT *parent_alloc) override;
-  void use_index_scan() { is_index_scan = true; }
-};
-
-void TRP_GROUP_MIN_MAX::trace_basic_info(const PARAM *param,
-                                         Opt_trace_object *trace_object) const {
-  trace_object->add_alnum("type", "index_group")
-      .add_utf8("index", index_info->name);
-  if (min_max_arg_part)
-    trace_object->add_utf8("group_attribute",
-                           min_max_arg_part->field->field_name);
-  else
-    trace_object->add_null("group_attribute");
-  trace_object->add("min_aggregate", have_min)
-      .add("max_aggregate", have_max)
-      .add("distinct_aggregate", have_agg_distinct)
-      .add("rows", records)
-      .add("cost", cost_est);
-
-  const KEY_PART_INFO *key_part = index_info->key_part;
-  Opt_trace_context *const trace = &param->thd->opt_trace;
-  {
-    Opt_trace_array trace_keyparts(trace, "key_parts_used_for_access");
-    for (uint partno = 0; partno < used_key_parts; partno++) {
-      const KEY_PART_INFO *cur_key_part = key_part + partno;
-      trace_keyparts.add_utf8(cur_key_part->field->field_name);
-    }
-  }
-  Opt_trace_array trace_range(trace, "ranges");
-
-  // can have group quick without ranges
-  if (index_tree) {
-    String range_info;
-    range_info.set_charset(system_charset_info);
-    append_range_all_keyparts(&trace_range, nullptr, &range_info, index_tree,
-                              key_part, false);
-  }
-}
-
-/*
-  Plan for a QUICK_SKIP_SCAN_SELECT scan.
-*/
-
-class TRP_SKIP_SCAN : public TABLE_READ_PLAN {
- private:
-  KEY *index_info;                ///< The index chosen for data access
-  uint index;                     ///< The id of the chosen index
-  uint eq_prefix_len;             ///< Length of the equality prefix
-  uint eq_prefix_parts;           ///< Number of parts in the equality prefix
-  KEY_PART_INFO *range_key_part;  ///< The key part corresponding to the range
-                                  ///< condition
-
-  /**
-    The sub-tree corresponding to the range condition
-    (on key part C - for more details see description of get_best_skip_scan()).
-  */
-  SEL_ARG *range_cond;
-  SEL_ROOT *index_range_tree;  ///< The sub-tree corresponding to index_info
-  uint used_key_parts;         ///< Number of index key parts used for access
-  bool forced_by_hint;  ///< TRUE if skip scan is forced by optimizer hint
-  bool has_aggregate_function;  ///< TRUE if there are aggregate functions.
-
- public:
-  void trace_basic_info(const PARAM *param,
-                        Opt_trace_object *trace_object) const override;
-
-  TRP_SKIP_SCAN(KEY *index_info, uint index, SEL_ROOT *index_range_tree,
-                uint eq_prefix_len, uint eq_prefix_parts,
-                KEY_PART_INFO *range_key_part, SEL_ARG *range_cond,
-                uint used_key_parts, bool forced_by_hint, ha_rows read_records,
-                bool has_aggregate_function)
-      : index_info(index_info),
-        index(index),
-        eq_prefix_len(eq_prefix_len),
-        eq_prefix_parts(eq_prefix_parts),
-        range_key_part(range_key_part),
-        range_cond(range_cond),
-        index_range_tree(index_range_tree),
-        used_key_parts(used_key_parts),
-        forced_by_hint(forced_by_hint),
-        has_aggregate_function(has_aggregate_function) {
-    records = read_records;
-  }
-
-  ~TRP_SKIP_SCAN() override = default;
-
-  QUICK_SELECT_I *make_quick(PARAM *param, bool retrieve_full_rows,
-                             MEM_ROOT *parent_alloc) override;
-  bool is_forced_by_hint() override { return forced_by_hint; }
-};
-
-void TRP_SKIP_SCAN::trace_basic_info(const PARAM *param,
-                                     Opt_trace_object *trace_object) const {
-  trace_object->add_alnum("type", "skip_scan")
-      .add_utf8("index", index_info->name);
-
-  const KEY_PART_INFO *key_part = index_info->key_part;
-  Opt_trace_context *const trace = &param->thd->opt_trace;
-  {
-    Opt_trace_array trace_keyparts(trace, "key_parts_used_for_access");
-    for (uint partno = 0; partno < used_key_parts; partno++) {
-      const KEY_PART_INFO *cur_key_part = key_part + partno;
-      trace_keyparts.add_utf8(cur_key_part->field->field_name);
-    }
-  }
-
-  if (index_range_tree && eq_prefix_parts > 0) {
-    Opt_trace_array trace_range(trace, "prefix ranges");
-    String range_info;
-    range_info.set_charset(system_charset_info);
-    append_range_all_keyparts(&trace_range, nullptr, &range_info,
-                              index_range_tree, key_part, false);
-  }
-
-  Opt_trace_array trace_range(trace, "range");
-  {
-    String range_info;
-    range_info.set_charset(system_charset_info);
-    const SEL_ARG *range_part = range_cond->first();
-    {
-      const KEY_PART_INFO *cur_key_part = key_part + range_part->part;
-      append_range(&range_info, cur_key_part, range_part->min_value,
-                   range_part->max_value,
-                   range_part->min_flag | range_part->max_flag);
-    }
-    trace_range.add_utf8(range_info.ptr(), range_info.length());
-  }
-}
-
-/*
-  Fill param->needed_fields with bitmap of fields used in the query.
-  SYNOPSIS
-    fill_used_fields_bitmap()
-      param Parameter from test_quick_select function.
-
-  NOTES
-    Clustered PK members are not put into the bitmap as they are implicitly
-    present in all keys (and it is impossible to avoid reading them).
-  RETURN
-    0  Ok
-    1  Out of memory.
-*/
-
-static int fill_used_fields_bitmap(PARAM *param) {
-  TABLE *table = param->table;
-  my_bitmap_map *tmp;
-  uint pk;
-  param->tmp_covered_fields.bitmap = nullptr;
-  param->fields_bitmap_size = table->s->column_bitmap_size;
-  if (!(tmp = (my_bitmap_map *)param->mem_root->Alloc(
-            param->fields_bitmap_size)) ||
-      bitmap_init(&param->needed_fields, tmp, table->s->fields))
-    return 1;
-
-  bitmap_copy(&param->needed_fields, table->read_set);
-  bitmap_union(&param->needed_fields, table->write_set);
-
-  pk = param->table->s->primary_key;
-  if (pk != MAX_KEY && param->table->file->primary_key_is_clustered()) {
-    /* The table uses clustered PK and it is not internally generated */
-    KEY_PART_INFO *key_part = param->table->key_info[pk].key_part;
-    KEY_PART_INFO *key_part_end =
-        key_part + param->table->key_info[pk].user_defined_key_parts;
-    for (; key_part != key_part_end; ++key_part)
-      bitmap_clear_bit(&param->needed_fields, key_part->fieldnr - 1);
-  }
-  return 0;
-}
-
-/*
-  Test if a key can be used in different ranges, and create the QUICK
-  access method (range, index merge etc) that is estimated to be
-  cheapest unless table/index scan is even cheaper (exception: @see
-  parameter force_quick_range).
-
-  SYNOPSIS
-    test_quick_select()
-      thd               Current thread
-      keys_to_use       Keys to use for range retrieval
-      prev_tables       Tables assumed to be already read when the scan is
-                        performed (but not read at the moment of this call)
-      limit             Query limit
-      force_quick_range Prefer to use range (instead of full table scan) even
-                        if it is more expensive.
-      interesting_order The sort order the range access method must be able
-                        to provide. Three-value logic: asc/desc/don't care
-      needed_reg        this info is used in make_join_query_block() even if
-  there is no quick. quick[out]        Calculated QUICK, or NULL.
-      ignore_table_scan Disregard table scan while looking for range.
-
-  NOTES
-    Updates the following:
-      needed_reg - Bits for keys with may be used if all prev regs are read
-
-    In the table struct the following information is updated:
-      quick_keys           - Which keys can be used
-      quick_rows           - How many rows the key matches
-      quick_condition_rows - E(# rows that will satisfy the table condition)
-
-  IMPLEMENTATION
-    quick_condition_rows value is obtained as follows:
-
-      It is a minimum of E(#output rows) for all considered table access
-      methods (range and index_merge accesses over various indexes).
-
-    The obtained value is not a true E(#rows that satisfy table condition)
-    but rather a pessimistic estimate. To obtain a true E(#...) one would
-    need to combine estimates of various access methods, taking into account
-    correlations between sets of rows they will return.
-
-    For example, if values of tbl.key1 and tbl.key2 are independent (a right
-    assumption if we have no information about their correlation) then the
-    correct estimate will be:
-
-      E(#rows("tbl.key1 < c1 AND tbl.key2 < c2")) =
-      = E(#rows(tbl.key1 < c1)) / total_rows(tbl) * E(#rows(tbl.key2 < c2)
-
-    which is smaller than
-
-       MIN(E(#rows(tbl.key1 < c1), E(#rows(tbl.key2 < c2)))
-
-    which is currently produced.
-
-  TODO
-   * Change the value returned in quick_condition_rows from a pessimistic
-     estimate to true E(#rows that satisfy table condition).
-     (we can re-use some of E(#rows) calcuation code from
-  index_merge/intersection for this)
-
-   * Check if this function really needs to modify keys_to_use, and change the
-     code to pass it by reference if it doesn't.
-
-   * In addition to force_quick_range other means can be (an usually are) used
-     to make this function prefer range over full table scan. Figure out if
-     force_quick_range is really needed.
-
-  RETURN
-   -1 if impossible select (i.e. certainly no rows will be selected)
-    0 if can't use quick_select
-    1 if found usable ranges and quick select has been successfully created.
-
-  @note After this call, caller may decide to really use the returned QUICK,
-  by calling QEP_TAB::set_quick() and updating tab->type() if appropriate.
-
-*/
-int test_quick_select(THD *thd, Key_map keys_to_use, table_map prev_tables,
-                      ha_rows limit, bool force_quick_range,
-                      const enum_order interesting_order,
-                      const QEP_shared_owner *tab, Item *cond,
-                      Key_map *needed_reg, QUICK_SELECT_I **quick,
-                      bool ignore_table_scan, Query_block *query_block) {
-  DBUG_TRACE;
-
-  *quick = nullptr;
-  needed_reg->clear_all();
-
-  if (keys_to_use.is_clear_all()) return 0;
-
-  table_map const_tables, read_tables;
-  if (tab->join()) {
-    const_tables = tab->join()->found_const_table_map;
-    read_tables = tab->join()->is_executed() ?
-                                             // in execution, range estimation
-                                             // is done for each row, so can
-                                             // access previous tables
-                      (tab->prefix_tables() & ~tab->added_tables())
-                                             : const_tables;
-  } else
-    const_tables = read_tables = 0;
-
-  DBUG_PRINT("enter", ("keys_to_use: %lu  prev_tables: %lu  const_tables: %lu",
-                       (ulong)keys_to_use.to_ulonglong(), (ulong)prev_tables,
-                       (ulong)const_tables));
-
-  bool force_skip_scan = false;
-  const Cost_model_server *const cost_model = thd->cost_model();
-  TABLE *const head = tab->table();
-  ha_rows records = head->file->stats.records;
-  if (!records) records++; /* purecov: inspected */
-  double scan_time =
-      cost_model->row_evaluate_cost(static_cast<double>(records)) + 1;
-  Cost_estimate cost_est = head->file->table_scan_cost();
-  cost_est.add_io(1.1);
-  cost_est.add_cpu(scan_time);
-  if (ignore_table_scan) {
-    scan_time = DBL_MAX;
-    cost_est.set_max_cost();
-  }
-  if (limit < records) {
-    cost_est.reset();
-    // Force to use index
-    cost_est.add_io(
-        head->cost_model()->page_read_cost(static_cast<double>(records)) + 1);
-    cost_est.add_cpu(scan_time);
-  } else if (cost_est.total_cost() <= 2.0 && !force_quick_range)
-    return 0; /* No need for quick select */
-
-  Opt_trace_context *const trace = &thd->opt_trace;
-  Opt_trace_object trace_range(trace, "range_analysis");
-  Opt_trace_object(trace, "table_scan")
-      .add("rows", head->file->stats.records)
-      .add("cost", cost_est);
-
-  keys_to_use.intersect(head->keys_in_use_for_query);
-  if (!keys_to_use.is_clear_all()) {
-    MEM_ROOT alloc;
-    SEL_TREE *tree = nullptr;
-    KEY_PART *key_parts;
-    KEY *key_info;
-    PARAM param;
-
-    /*
-      Use the 3 multiplier as range optimizer allocates big PARAM structure
-      and may evaluate a subquery expression
-      TODO During the optimization phase we should evaluate only inexpensive
-           single-lookup subqueries.
-    */
-    uchar buff[STACK_BUFF_ALLOC];
-    if (check_stack_overrun(thd, 3 * STACK_MIN_SIZE + sizeof(PARAM), buff))
-      return 0;  // Fatal error flag is set
-
-    /* set up parameter that is passed to all functions */
-    param.thd = thd;
-    param.baseflag = head->file->ha_table_flags();
-    param.prev_tables = prev_tables | const_tables | INNER_TABLE_BIT;
-    param.read_tables = read_tables | INNER_TABLE_BIT;
-    param.current_table = head->pos_in_table_list->map();
-    param.table = head;
-    param.query_block = query_block;
-    param.keys = 0;
-    param.is_ror_scan = false;
-    param.mem_root = &alloc;
-    param.old_root = thd->mem_root;
-    param.needed_reg = needed_reg;
-    param.imerge_cost_buff.reset();
-    param.using_real_indexes = true;
-    param.remove_jump_scans = true;
-    param.force_default_mrr = (interesting_order == ORDER_DESC);
-    param.order_direction = interesting_order;
-    param.use_index_statistics = false;
-    /*
-      Set index_merge_allowed from OPTIMIZER_SWITCH_INDEX_MERGE.
-      Notice also that OPTIMIZER_SWITCH_INDEX_MERGE disables all
-      index merge sub strategies.
-    */
-    param.index_merge_allowed =
-        thd->optimizer_switch_flag(OPTIMIZER_SWITCH_INDEX_MERGE);
-    param.index_merge_union_allowed =
-        param.index_merge_allowed &&
-        thd->optimizer_switch_flag(OPTIMIZER_SWITCH_INDEX_MERGE_UNION);
-    param.index_merge_sort_union_allowed =
-        param.index_merge_allowed &&
-        thd->optimizer_switch_flag(OPTIMIZER_SWITCH_INDEX_MERGE_SORT_UNION);
-    param.index_merge_intersect_allowed =
-        param.index_merge_allowed &&
-        thd->optimizer_switch_flag(OPTIMIZER_SWITCH_INDEX_MERGE_INTERSECT);
-
-    param.skip_records_in_range = tab->skip_records_in_range();
-
-    init_sql_alloc(key_memory_test_quick_select_exec, &alloc,
-                   thd->variables.range_alloc_block_size, 0);
-    alloc.set_max_capacity(thd->variables.range_optimizer_max_mem_size);
-    alloc.set_error_for_capacity_exceeded(true);
-    thd->push_internal_handler(&param.error_handler);
-    if (!(param.key_parts =
-              (KEY_PART *)alloc.Alloc(sizeof(KEY_PART) * head->s->key_parts)) ||
-        fill_used_fields_bitmap(&param)) {
-      thd->pop_internal_handler();
-      free_root(&alloc, MYF(0));  // Return memory & allocator
-      return 0;                   // Can't use range
-    }
-    key_parts = param.key_parts;
-    thd->mem_root = &alloc;
-
-    {
-      Opt_trace_array trace_idx(trace, "potential_range_indexes",
-                                Opt_trace_context::RANGE_OPTIMIZER);
-      /*
-        Make an array with description of all key parts of all table keys.
-        This is used in get_mm_parts function.
-      */
-      key_info = head->key_info;
-      for (uint idx = 0; idx < head->s->keys; idx++, key_info++) {
-        Opt_trace_object trace_idx_details(trace);
-        trace_idx_details.add_utf8("index", key_info->name);
-        KEY_PART_INFO *key_part_info;
-
-        if (!keys_to_use.is_set(idx)) {
-          trace_idx_details.add("usable", false)
-              .add_alnum("cause", "not_applicable");
-          continue;
-        }
-
-        if (hint_key_state(thd, head->pos_in_table_list, idx,
-                           NO_RANGE_HINT_ENUM, 0)) {
-          trace_idx_details.add("usable", false)
-              .add_alnum("cause", "no_range_optimization hint");
-          continue;
-        }
-
-        if (key_info->flags & HA_FULLTEXT) {
-          trace_idx_details.add("usable", false).add_alnum("cause", "fulltext");
-          continue;  // ToDo: ft-keys in non-ft ranges, if possible   SerG
-        }
-
-        trace_idx_details.add("usable", true);
-
-        param.key[param.keys] = key_parts;
-        key_part_info = key_info->key_part;
-        Opt_trace_array trace_keypart(trace, "key_parts");
-        for (uint part = 0; part < actual_key_parts(key_info);
-             part++, key_parts++, key_part_info++) {
-          key_parts->key = param.keys;
-          key_parts->part = part;
-          key_parts->length = key_part_info->length;
-          key_parts->store_length = key_part_info->store_length;
-          key_parts->field = key_part_info->field;
-          key_parts->null_bit = key_part_info->null_bit;
-          key_parts->image_type = (part < key_info->user_defined_key_parts &&
-                                   key_info->flags & HA_SPATIAL)
-                                      ? Field::itMBR
-                                      : Field::itRAW;
-          /* Only HA_PART_KEY_SEG is used */
-          key_parts->flag = key_part_info->key_part_flag;
-          trace_keypart.add_utf8(
-              get_field_name_or_expression(thd, key_part_info->field));
-        }
-        param.real_keynr[param.keys++] = idx;
-      }
-    }
-    param.key_parts_end = key_parts;
-
-    /* Calculate cost of full index read for the shortest covering index */
-    if (!head->covering_keys.is_clear_all()) {
-      int key_for_use = find_shortest_key(head, &head->covering_keys);
-      // find_shortest_key() should return a valid key:
-      assert(key_for_use != MAX_KEY);
-
-      Cost_estimate key_read_time = param.table->file->index_scan_cost(
-          key_for_use, 1, static_cast<double>(records));
-      key_read_time.add_cpu(
-          cost_model->row_evaluate_cost(static_cast<double>(records)));
-
-      bool chosen = false;
-      if (key_read_time < cost_est) {
-        cost_est = key_read_time;
-        chosen = true;
-      }
-
-      Opt_trace_object trace_cov(trace, "best_covering_index_scan",
-                                 Opt_trace_context::RANGE_OPTIMIZER);
-      trace_cov.add_utf8("index", head->key_info[key_for_use].name)
-          .add("cost", key_read_time)
-          .add("chosen", chosen);
-      if (!chosen) trace_cov.add_alnum("cause", "cost");
-    }
-
-    TABLE_READ_PLAN *best_trp = nullptr;
-    TRP_GROUP_MIN_MAX *group_trp;
-    TRP_SKIP_SCAN *skip_scan_trp;
-    Cost_estimate best_cost = cost_est;
-
-    if (cond) {
-      {
-        Opt_trace_array trace_setup_cond(trace, "setup_range_conditions");
-        tree = get_mm_tree(&param, cond);
-      }
-      if (tree) {
-        if (tree->type == SEL_TREE::IMPOSSIBLE) {
-          trace_range.add("impossible_range", true);
-          records = 0L; /* Return -1 from this function. */
-          cost_est.reset();
-          cost_est.add_io(static_cast<double>(HA_POS_ERROR));
-          goto free_mem;
-        }
-        /*
-          If the tree can't be used for range scans, proceed anyway, as we
-          can construct a group-min-max quick select
-        */
-        if (tree->type != SEL_TREE::KEY &&
-            tree->type != SEL_TREE::KEY_SMALLER) {
-          trace_range.add("range_scan_possible", false);
-          if (tree->type == SEL_TREE::ALWAYS)
-            trace_range.add_alnum("cause", "condition_always_true");
-
-          tree = nullptr;
-        }
-      }
-    }
-
-    /*
-      Try to construct a QUICK_GROUP_MIN_MAX_SELECT.
-      Notice that it can be constructed no matter if there is a range tree.
-    */
-    group_trp = get_best_group_min_max(&param, tree, &best_cost);
-    if (group_trp) {
-      DBUG_EXECUTE_IF("force_lis_for_group_by", group_trp->cost_est.reset(););
-      param.table->quick_condition_rows =
-          min(group_trp->records, head->file->stats.records);
-      Opt_trace_object grp_summary(trace, "best_group_range_summary",
-                                   Opt_trace_context::RANGE_OPTIMIZER);
-      if (unlikely(trace->is_started()))
-        group_trp->trace_basic_info(&param, &grp_summary);
-      if (group_trp->cost_est < best_cost) {
-        grp_summary.add("chosen", true);
-        best_trp = group_trp;
-        best_cost = best_trp->cost_est;
-      } else
-        grp_summary.add("chosen", false).add_alnum("cause", "cost");
-    }
-
-    force_skip_scan = hint_table_state(
-        param.thd, param.table->pos_in_table_list, SKIP_SCAN_HINT_ENUM, 0);
-
-    if (thd->optimizer_switch_flag(OPTIMIZER_SKIP_SCAN) || force_skip_scan) {
-      skip_scan_trp = get_best_skip_scan(&param, tree, force_skip_scan);
-      if (skip_scan_trp) {
-        param.table->quick_condition_rows =
-            min(skip_scan_trp->records, head->file->stats.records);
-        Opt_trace_object summary(trace, "best_skip_scan_summary",
-                                 Opt_trace_context::RANGE_OPTIMIZER);
-        if (unlikely(trace->is_started()))
-          skip_scan_trp->trace_basic_info(&param, &summary);
-
-        if (skip_scan_trp->cost_est < best_cost || force_skip_scan) {
-          summary.add("chosen", true);
-          best_trp = skip_scan_trp;
-          best_cost = best_trp->cost_est;
-        } else
-          summary.add("chosen", false).add_alnum("cause", "cost");
-      }
-    }
-
-    if (tree && (!best_trp || !best_trp->is_forced_by_hint())) {
-      /*
-        It is possible to use a range-based quick select (but it might be
-        slower than 'all' table scan).
-      */
-      dbug_print_tree("final_tree", tree, &param);
-
-      {
-        /*
-          Calculate cost of single index range scan and possible
-          intersections of these
-        */
-        Opt_trace_object trace_range_alt(trace, "analyzing_range_alternatives",
-                                         Opt_trace_context::RANGE_OPTIMIZER);
-        TRP_RANGE *range_trp;
-        TRP_ROR_INTERSECT *rori_trp;
-
-        /* Get best 'range' plan and prepare data for making other plans */
-        if ((range_trp =
-                 get_key_scans_params(&param, tree, false, true, &best_cost))) {
-          best_trp = range_trp;
-          best_cost = best_trp->cost_est;
-        }
-
-        /*
-          Simultaneous key scans and row deletes on several handler
-          objects are not allowed so don't use ROR-intersection for
-          table deletes. Also, ROR-intersection cannot return rows in
-          descending order
-        */
-        if ((thd->lex->sql_command != SQLCOM_DELETE) &&
-            (param.index_merge_allowed ||
-             hint_table_state(param.thd, param.table->pos_in_table_list,
-                              INDEX_MERGE_HINT_ENUM, 0)) &&
-            interesting_order != ORDER_DESC) {
-          /*
-            Get best non-covering ROR-intersection plan and prepare data for
-            building covering ROR-intersection.
-          */
-          if ((rori_trp =
-                   get_best_ror_intersect(&param, tree, &best_cost, true))) {
-            best_trp = rori_trp;
-            best_cost = best_trp->cost_est;
-          }
-        }
-      }
-
-      // Here we calculate cost of union index merge
-      if (!tree->merges.is_empty()) {
-        // Cannot return rows in descending order.
-        if ((param.index_merge_allowed ||
-             hint_table_state(param.thd, param.table->pos_in_table_list,
-                              INDEX_MERGE_HINT_ENUM, 0)) &&
-            interesting_order != ORDER_DESC &&
-            param.table->file->stats.records) {
-          /* Try creating index_merge/ROR-union scan. */
-          SEL_IMERGE *imerge;
-          TABLE_READ_PLAN *best_conj_trp = nullptr, *new_conj_trp = nullptr;
-          List_iterator_fast<SEL_IMERGE> it(tree->merges);
-          Opt_trace_array trace_idx_merge(trace, "analyzing_index_merge_union",
-                                          Opt_trace_context::RANGE_OPTIMIZER);
-          while ((imerge = it++)) {
-            new_conj_trp = get_best_disjunct_quick(&param, imerge, &best_cost);
-            if (new_conj_trp)
-              param.table->quick_condition_rows =
-                  min(param.table->quick_condition_rows, new_conj_trp->records);
-            if (!best_conj_trp ||
-                (new_conj_trp &&
-                 new_conj_trp->cost_est < best_conj_trp->cost_est)) {
-              best_conj_trp = new_conj_trp;
-            }
-          }
-          if (best_conj_trp) best_trp = best_conj_trp;
-        }
-      }
-    }
-
-    thd->mem_root = param.old_root;
-
-    /*
-      If we got a read plan, create a quick select from it.
-
-      Only create a quick select if the storage engine supports using indexes
-      for access.
-    */
-    if (best_trp && (head->file->ha_table_flags() & HA_NO_INDEX_ACCESS) == 0) {
-      QUICK_SELECT_I *qck;
-      records = best_trp->records;
-      if (!(qck = best_trp->make_quick(&param, true)) || qck->init())
-        qck = nullptr;
-      *quick = qck;
-    }
-
-  free_mem:
-    thd->pop_internal_handler();
-    if (unlikely(*quick && trace->is_started() && best_trp)) {
-      // best_trp cannot be NULL if quick is set, done to keep fortify happy
-      Opt_trace_object trace_range_summary(trace,
-                                           "chosen_range_access_summary");
-      {
-        Opt_trace_object trace_range_plan(trace, "range_access_plan");
-        best_trp->trace_basic_info(&param, &trace_range_plan);
-      }
-      trace_range_summary.add("rows_for_plan", (*quick)->records)
-          .add("cost_for_plan", (*quick)->cost_est)
-          .add("chosen", true);
-    }
-
-    free_root(&alloc, MYF(0));  // Return memory & allocator
-    thd->mem_root = param.old_root;
-
-    DBUG_EXECUTE("info", print_quick(*quick, needed_reg););
-  }
-
-  /*
-    Assume that if the user is using 'limit' we will only need to scan
-    limit rows if we are using a key
-  */
-  return records ? (*quick != nullptr) : -1;
-}
-
-/****************************************************************************
- * Partition pruning module
- ****************************************************************************/
-
-/*
-  PartitionPruningModule
-
-  This part of the code does partition pruning. Partition pruning solves the
-  following problem: given a query over partitioned tables, find partitions
-  that we will not need to access (i.e. partitions that we can assume to be
-  empty) when executing the query.
-  The set of partitions to prune doesn't depend on which query execution
-  plan will be used to execute the query.
-
-  HOW IT WORKS
-
-  Partition pruning module makes use of RangeAnalysisModule. The following
-  examples show how the problem of partition pruning can be reduced to the
-  range analysis problem:
-
-  EXAMPLE 1
-    Consider a query:
-
-      SELECT * FROM t1 WHERE (t1.a < 5 OR t1.a = 10) AND t1.a > 3 AND t1.b='z'
-
-    where table t1 is partitioned using PARTITION BY RANGE(t1.a).  An apparent
-    way to find the used (i.e. not pruned away) partitions is as follows:
-
-    1. analyze the WHERE clause and extract the list of intervals over t1.a
-       for the above query we will get this list: {(3 < t1.a < 5), (t1.a=10)}
-
-    2. for each interval I
-       {
-         find partitions that have non-empty intersection with I;
-         mark them as used;
-       }
-
-  EXAMPLE 2
-    Suppose the table is partitioned by HASH(part_func(t1.a, t1.b)). Then
-    we need to:
-
-    1. Analyze the WHERE clause and get a list of intervals over (t1.a, t1.b).
-       The list of intervals we'll obtain will look like this:
-       ((t1.a, t1.b) = (1,'foo')),
-       ((t1.a, t1.b) = (2,'bar')),
-       ((t1,a, t1.b) > (10,'zz'))
-
-    2. for each interval I
-       {
-         if (the interval has form "(t1.a, t1.b) = (const1, const2)" )
-         {
-           calculate HASH(part_func(t1.a, t1.b));
-           find which partition has records with this hash value and mark
-             it as used;
-         }
-         else
-         {
-           mark all partitions as used;
-           break;
-         }
-       }
-
-   For both examples the step #1 is exactly what RangeAnalysisModule could
-   be used to do, if it was provided with appropriate index description
-   (array of KEY_PART structures).
-   In example #1, we need to provide it with description of index(t1.a),
-   in example #2, we need to provide it with description of index(t1.a, t1.b).
-
-   These index descriptions are further called "partitioning index
-   descriptions". Note that it doesn't matter if such indexes really exist,
-   as range analysis module only uses the description.
-
-   Putting it all together, partitioning module works as follows:
-
-   prune_partitions() {
-     call create_partition_index_description();
-
-     call get_mm_tree(); // invoke the RangeAnalysisModule
-
-     // analyze the obtained interval list and get used partitions
-     call find_used_partitions();
-  }
-
-*/
-
-typedef void (*mark_full_part_func)(partition_info *, uint32);
-
-/*
-  Partition pruning operation context
-*/
-struct PART_PRUNE_PARAM {
-  RANGE_OPT_PARAM range_param; /* Range analyzer parameters */
-
-  /***************************************************************
-   Following fields are filled in based solely on partitioning
-   definition and not modified after that:
-   **************************************************************/
-  partition_info *part_info; /* Copy of table->part_info */
-  /* Function to get partition id from partitioning fields only */
-  get_part_id_func get_top_partition_id_func;
-  /* Function to mark a partition as used (w/all subpartitions if they exist)*/
-  mark_full_part_func mark_full_partition_used;
-
-  /* Partitioning 'index' description, array of key parts */
-  KEY_PART *key;
-
-  /*
-    Number of fields in partitioning 'index' definition created for
-    partitioning (0 if partitioning 'index' doesn't include partitioning
-    fields)
-  */
-  uint part_fields;
-  uint subpart_fields; /* Same as above for subpartitioning */
-
-  /*
-    Number of the last partitioning field keypart in the index, or -1 if
-    partitioning index definition doesn't include partitioning fields.
-  */
-  int last_part_partno;
-  int last_subpart_partno; /* Same as above for supartitioning */
-
-  /*
-    is_part_keypart[i] == test(keypart #i in partitioning index is a member
-                               used in partitioning)
-    Used to maintain current values of cur_part_fields and cur_subpart_fields
-  */
-  bool *is_part_keypart;
-  /* Same as above for subpartitioning */
-  bool *is_subpart_keypart;
-
-  bool ignore_part_fields; /* Ignore rest of partioning fields */
-
-  /***************************************************************
-   Following fields form find_used_partitions() recursion context:
-   **************************************************************/
-  SEL_ARG **arg_stack;     /* "Stack" of SEL_ARGs */
-  SEL_ARG **arg_stack_end; /* Top of the stack    */
-  /* Number of partitioning fields for which we have a SEL_ARG* in arg_stack */
-  uint cur_part_fields;
-  /* Same as cur_part_fields, but for subpartitioning */
-  uint cur_subpart_fields;
-
-  /* Iterator to be used to obtain the "current" set of used partitions */
-  PARTITION_ITERATOR part_iter;
-
-  /* Initialized bitmap of num_subparts size */
-  MY_BITMAP subparts_bitmap;
-
-  uchar *cur_min_key;
-  uchar *cur_max_key;
-
-  uint cur_min_flag, cur_max_flag;
-};
-
-static bool create_partition_index_description(PART_PRUNE_PARAM *prune_par);
-static int find_used_partitions(PART_PRUNE_PARAM *ppar, SEL_ROOT *key_tree);
-static int find_used_partitions(PART_PRUNE_PARAM *ppar, SEL_ROOT::Type type,
-                                SEL_ARG *key_tree);
-static int find_used_partitions_imerge(PART_PRUNE_PARAM *ppar,
-                                       SEL_IMERGE *imerge);
-static int find_used_partitions_imerge_list(PART_PRUNE_PARAM *ppar,
-                                            List<SEL_IMERGE> &merges);
-static void mark_all_partitions_as_used(partition_info *part_info);
-
-#ifndef NDEBUG
-static void print_partitioning_index(KEY_PART *parts, KEY_PART *parts_end);
-static void dbug_print_segment_range(SEL_ARG *arg, KEY_PART *part);
-static void dbug_print_singlepoint_range(SEL_ARG **start, uint num);
-#endif
-
-/**
-  Perform partition pruning for a given table and condition.
-
-  @param      thd            Thread handle
-  @param      table          Table to perform partition pruning for
-  @param      query_block     Query block the table is part of
-  @param      pprune_cond    Condition to use for partition pruning
-
-  @note This function assumes that lock_partitions are setup when it
-  is invoked. The function analyzes the condition, finds partitions that
-  need to be used to retrieve the records that match the condition, and
-  marks them as used by setting appropriate bit in part_info->read_partitions
-  In the worst case all partitions are marked as used. If the table is not
-  yet locked, it will also unset bits in part_info->lock_partitions that is
-  not set in read_partitions.
-
-  This function returns promptly if called for non-partitioned table.
-
-  @return Operation status
-    @retval true  Failure
-    @retval false Success
-*/
-
-bool prune_partitions(THD *thd, TABLE *table, Query_block *query_block,
-                      Item *pprune_cond) {
-  partition_info *part_info = table->part_info;
-  DBUG_TRACE;
-
-  /*
-    If the prepare stage already have completed pruning successfully,
-    it is no use of running prune_partitions() again on the same condition.
-    Since it will not be able to prune anything more than the previous call
-    from the prepare step.
-  */
-  if (part_info && part_info->is_pruning_completed) return false;
-
-  table->all_partitions_pruned_away = false;
-
-  if (!part_info) return false; /* not a partitioned table */
-
-  if (table->s->db_type()->partition_flags() & HA_USE_AUTO_PARTITION &&
-      part_info->is_auto_partitioned)
-    return false; /* Should not prune auto partitioned table */
-
-  if (!pprune_cond) {
-    mark_all_partitions_as_used(part_info);
-    return false;
-  }
-
-  /* No need to continue pruning if there is no more partitions to prune! */
-  if (bitmap_is_clear_all(&part_info->lock_partitions))
-    bitmap_clear_all(&part_info->read_partitions);
-  if (bitmap_is_clear_all(&part_info->read_partitions)) {
-    table->all_partitions_pruned_away = true;
-    return false;
-  }
-
-  PART_PRUNE_PARAM prune_param;
-  MEM_ROOT alloc;
-  RANGE_OPT_PARAM *range_par = &prune_param.range_param;
-  my_bitmap_map *old_sets[2];
-
-  prune_param.part_info = part_info;
-  init_sql_alloc(key_memory_partitions_prune_exec, &alloc,
-                 thd->variables.range_alloc_block_size, 0);
-  alloc.set_max_capacity(thd->variables.range_optimizer_max_mem_size);
-  alloc.set_error_for_capacity_exceeded(true);
-  thd->push_internal_handler(&range_par->error_handler);
-  range_par->mem_root = &alloc;
-  range_par->old_root = thd->mem_root;
-
-  if (create_partition_index_description(&prune_param)) {
-    mark_all_partitions_as_used(part_info);
-    thd->pop_internal_handler();
-    free_root(&alloc, MYF(0));  // Return memory & allocator
-    return false;
-  }
-
-  dbug_tmp_use_all_columns(table, old_sets, table->read_set, table->write_set);
-  range_par->thd = thd;
-  range_par->table = table;
-  range_par->query_block = query_block;
-  /* range_par->cond doesn't need initialization */
-  range_par->prev_tables = range_par->read_tables = INNER_TABLE_BIT;
-  range_par->current_table = table->pos_in_table_list->map();
-
-  range_par->keys = 1;  // one index
-  range_par->using_real_indexes = false;
-  range_par->remove_jump_scans = false;
-  range_par->real_keynr[0] = 0;
-
-  thd->mem_root = &alloc;
-
-  bitmap_clear_all(&part_info->read_partitions);
-
-  prune_param.key = prune_param.range_param.key_parts;
-  SEL_TREE *tree;
-  int res;
-
-  tree = get_mm_tree(range_par, pprune_cond);
-  if (!tree) goto all_used;
-
-  if (tree->type == SEL_TREE::IMPOSSIBLE) {
-    /* Cannot improve the pruning any further. */
-    part_info->is_pruning_completed = true;
-    goto end;
-  }
-
-  if (tree->type != SEL_TREE::KEY && tree->type != SEL_TREE::KEY_SMALLER)
-    goto all_used;
-
-  if (tree->merges.is_empty()) {
-    /* Range analysis has produced a single list of intervals. */
-    prune_param.arg_stack_end = prune_param.arg_stack;
-    prune_param.cur_part_fields = 0;
-    prune_param.cur_subpart_fields = 0;
-
-    prune_param.cur_min_key = prune_param.range_param.min_key;
-    prune_param.cur_max_key = prune_param.range_param.max_key;
-    prune_param.cur_min_flag = prune_param.cur_max_flag = 0;
-
-    init_all_partitions_iterator(part_info, &prune_param.part_iter);
-    if (!tree->keys[0] ||
-        (-1 == (res = find_used_partitions(&prune_param, tree->keys[0]))))
-      goto all_used;
-  } else {
-    if (tree->merges.elements == 1) {
-      /*
-        Range analysis has produced a "merge" of several intervals lists, a
-        SEL_TREE that represents an expression in form
-          sel_imerge = (tree1 OR tree2 OR ... OR treeN)
-        that cannot be reduced to one tree. This can only happen when
-        partitioning index has several keyparts and the condition is OR of
-        conditions that refer to different key parts. For example, we'll get
-        here for "partitioning_field=const1 OR subpartitioning_field=const2"
-      */
-      if (-1 == (res = find_used_partitions_imerge(&prune_param,
-                                                   tree->merges.head())))
-        goto all_used;
-    } else {
-      /*
-        Range analysis has produced a list of several imerges, i.e. a
-        structure that represents a condition in form
-        imerge_list= (sel_imerge1 AND sel_imerge2 AND ... AND sel_imergeN)
-        This is produced for complicated WHERE clauses that range analyzer
-        can't really analyze properly.
-      */
-      if (-1 ==
-          (res = find_used_partitions_imerge_list(&prune_param, tree->merges)))
-        goto all_used;
-    }
-  }
-
-  /*
-    Decide if the current pruning attempt is the final one.
-
-    During the prepare phase, before locking, subqueries and stored programs
-    are not evaluated. So we need to run prune_partitions() a second time in
-    the optimize phase to prune partitions for reading, when subqueries and
-    stored programs may be evaluated.
-
-    The upcoming pruning attempt will be the final one when:
-    - condition is constant, or
-    - condition may vary for every row (so there is nothing to prune) or
-    - evaluation is in execution phase.
-  */
-  if (pprune_cond->const_item() || !pprune_cond->const_for_execution() ||
-      thd->lex->is_query_tables_locked())
-    part_info->is_pruning_completed = true;
-  goto end;
-
-all_used:
-  mark_all_partitions_as_used(prune_param.part_info);
-end:
-  thd->pop_internal_handler();
-  dbug_tmp_restore_column_maps(table->read_set, table->write_set, old_sets);
-
-  thd->mem_root = range_par->old_root;
-  free_root(&alloc, MYF(0));  // Return memory & allocator
-  /* If an error occurred we can return failure after freeing the memroot. */
-  if (thd->is_error()) {
-    return true;
-  }
-  /*
-    Must be a subset of the locked partitions.
-    lock_partitions contains the partitions marked by explicit partition
-    selection (... t PARTITION (pX) ...) and we must only use partitions
-    within that set.
-  */
-  bitmap_intersect(&prune_param.part_info->read_partitions,
-                   &prune_param.part_info->lock_partitions);
-  /*
-    If not yet locked, also prune partitions to lock if not UPDATEing
-    partition key fields. This will also prune lock_partitions if we are under
-    LOCK TABLES, so prune away calls to start_stmt().
-    TODO: enhance this prune locking to also allow pruning of
-    'UPDATE t SET part_key = const WHERE cond_is_prunable' so it adds
-    a lock for part_key partition.
-  */
-  if (!thd->lex->is_query_tables_locked() &&
-      !partition_key_modified(table, table->write_set)) {
-    bitmap_copy(&prune_param.part_info->lock_partitions,
-                &prune_param.part_info->read_partitions);
-  }
-  if (bitmap_is_clear_all(&(prune_param.part_info->read_partitions)))
-    table->all_partitions_pruned_away = true;
-  return false;
-}
-
-/*
-  Store field key image to table record
-
-  SYNOPSIS
-    store_key_image_to_rec()
-      field  Field which key image should be stored
-      ptr    Field value in key format
-      len    Length of the value, in bytes
-
-  DESCRIPTION
-    Copy the field value from its key image to the table record. The source
-    is the value in key image format, occupying len bytes in buffer pointed
-    by ptr. The destination is table record, in "field value in table record"
-    format.
-*/
-
-void store_key_image_to_rec(Field *field, uchar *ptr, uint len) {
-  /* Do the same as print_key_value() does */
-  my_bitmap_map *old_map;
-
-  if (field->is_nullable()) {
-    if (*ptr) {
-      field->set_null();
-      return;
-    }
-    field->set_notnull();
-    ptr++;
-  }
-  old_map = dbug_tmp_use_all_columns(field->table, field->table->write_set);
-  field->set_key_image(ptr, len);
-  dbug_tmp_restore_column_map(field->table->write_set, old_map);
-}
-
-/*
-  For SEL_ARG* array, store sel_arg->min values into table record buffer
-
-  SYNOPSIS
-    store_selargs_to_rec()
-      ppar   Partition pruning context
-      start  Array of SEL_ARG* for which the minimum values should be stored
-      num    Number of elements in the array
-
-  DESCRIPTION
-    For each SEL_ARG* interval in the specified array, store the left edge
-    field value (sel_arg->min, key image format) into the table record.
-*/
-
-static void store_selargs_to_rec(PART_PRUNE_PARAM *ppar, SEL_ARG **start,
-                                 int num) {
-  KEY_PART *parts = ppar->range_param.key_parts;
-  for (SEL_ARG **end = start + num; start != end; start++) {
-    SEL_ARG *sel_arg = (*start);
-    store_key_image_to_rec(sel_arg->field, sel_arg->min_value,
-                           parts[sel_arg->part].length);
-  }
-}
-
-/* Mark a partition as used in the case when there are no subpartitions */
-static void mark_full_partition_used_no_parts(partition_info *part_info,
-                                              uint32 part_id) {
-  DBUG_TRACE;
-  DBUG_PRINT("enter", ("Mark partition %u as used", part_id));
-  bitmap_set_bit(&part_info->read_partitions, part_id);
-}
-
-/* Mark a partition as used in the case when there are subpartitions */
-static void mark_full_partition_used_with_parts(partition_info *part_info,
-                                                uint32 part_id) {
-  uint32 start = part_id * part_info->num_subparts;
-  uint32 end = start + part_info->num_subparts;
-  DBUG_TRACE;
-
-  for (; start != end; start++) {
-    DBUG_PRINT("info", ("1:Mark subpartition %u as used", start));
-    bitmap_set_bit(&part_info->read_partitions, start);
-  }
-}
-
-/*
-  Find the set of used partitions for List<SEL_IMERGE>
-  SYNOPSIS
-    find_used_partitions_imerge_list
-      ppar      Partition pruning context.
-      key_tree  Intervals tree to perform pruning for.
-
-  DESCRIPTION
-    List<SEL_IMERGE> represents "imerge1 AND imerge2 AND ...".
-    The set of used partitions is an intersection of used partitions sets
-    for imerge_{i}.
-    We accumulate this intersection in a separate bitmap.
-
-  RETURN
-    See find_used_partitions()
-*/
-
-static int find_used_partitions_imerge_list(PART_PRUNE_PARAM *ppar,
-                                            List<SEL_IMERGE> &merges) {
-  MY_BITMAP all_merges;
-  uint bitmap_bytes;
-  my_bitmap_map *bitmap_buf;
-  uint n_bits = ppar->part_info->read_partitions.n_bits;
-  bitmap_bytes = bitmap_buffer_size(n_bits);
-  if (!(bitmap_buf =
-            (my_bitmap_map *)ppar->range_param.mem_root->Alloc(bitmap_bytes))) {
-    /*
-      Fallback, process just the first SEL_IMERGE. This can leave us with more
-      partitions marked as used then actually needed.
-    */
-    return find_used_partitions_imerge(ppar, merges.head());
-  }
-  bitmap_init(&all_merges, bitmap_buf, n_bits);
-  bitmap_set_prefix(&all_merges, n_bits);
-
-  List_iterator<SEL_IMERGE> it(merges);
-  SEL_IMERGE *imerge;
-  while ((imerge = it++)) {
-    int res = find_used_partitions_imerge(ppar, imerge);
-    if (!res) {
-      /* no used partitions on one ANDed imerge => no used partitions at all */
-      return 0;
-    }
-
-    if (res != -1)
-      bitmap_intersect(&all_merges, &ppar->part_info->read_partitions);
-
-    if (bitmap_is_clear_all(&all_merges)) return 0;
-
-    bitmap_clear_all(&ppar->part_info->read_partitions);
-  }
-  memcpy(ppar->part_info->read_partitions.bitmap, all_merges.bitmap,
-         bitmap_bytes);
-  return 1;
-}
-
-/*
-  Find the set of used partitions for SEL_IMERGE structure
-  SYNOPSIS
-    find_used_partitions_imerge()
-      ppar      Partition pruning context.
-      key_tree  Intervals tree to perform pruning for.
-
-  DESCRIPTION
-    SEL_IMERGE represents "tree1 OR tree2 OR ...". The implementation is
-    trivial - just use mark used partitions for each tree and bail out early
-    if for some tree_{i} all partitions are used.
-
-  RETURN
-    See find_used_partitions().
-*/
-
-static int find_used_partitions_imerge(PART_PRUNE_PARAM *ppar,
-                                       SEL_IMERGE *imerge) {
-  int res = 0;
-  for (SEL_TREE **ptree = imerge->trees; ptree < imerge->trees_next; ptree++) {
-    ppar->arg_stack_end = ppar->arg_stack;
-    ppar->cur_part_fields = 0;
-    ppar->cur_subpart_fields = 0;
-
-    ppar->cur_min_key = ppar->range_param.min_key;
-    ppar->cur_max_key = ppar->range_param.max_key;
-    ppar->cur_min_flag = ppar->cur_max_flag = 0;
-
-    init_all_partitions_iterator(ppar->part_info, &ppar->part_iter);
-    SEL_ROOT *key_tree = (*ptree)->keys[0];
-    if (!key_tree || (-1 == (res |= find_used_partitions(ppar, key_tree))))
-      return -1;
-  }
-  return res;
-}
-
-/*
-  Collect partitioning ranges for the SEL_ARG tree and mark partitions as used
-
-  SYNOPSIS
-    find_used_partitions()
-      ppar      Partition pruning context.
-      key_tree  SEL_ARG range (sub)tree to perform pruning for
-
-  DESCRIPTION
-    This function
-      * recursively walks the SEL_ARG* tree collecting partitioning "intervals"
-      * finds the partitions one needs to use to get rows in these intervals
-      * marks these partitions as used.
-    The next session desribes the process in greater detail.
-
-  IMPLEMENTATION
-    TYPES OF RESTRICTIONS THAT WE CAN OBTAIN PARTITIONS FOR
-    We can find out which [sub]partitions to use if we obtain restrictions on
-    [sub]partitioning fields in the following form:
-    1.  "partition_field1=const1 AND ... AND partition_fieldN=constN"
-    1.1  Same as (1) but for subpartition fields
-
-    If partitioning supports interval analysis (i.e. partitioning is a
-    function of a single table field, and partition_info::
-    get_part_iter_for_interval != NULL), then we can also use condition in
-    this form:
-    2.  "const1 <=? partition_field <=? const2"
-    2.1  Same as (2) but for subpartition_field
-
-    INFERRING THE RESTRICTIONS FROM SEL_ARG TREE
-
-    The below is an example of what SEL_ARG tree may represent:
-
-    (start)
-     |                           $
-     |   Partitioning keyparts   $  subpartitioning keyparts
-     |                           $
-     |     ...          ...      $
-     |      |            |       $
-     | +---------+  +---------+  $  +-----------+  +-----------+
-     \-| par1=c1 |--| par2=c2 |-----| subpar1=c3|--| subpar2=c5|
-       +---------+  +---------+  $  +-----------+  +-----------+
-            |                    $        |             |
-            |                    $        |        +-----------+
-            |                    $        |        | subpar2=c6|
-            |                    $        |        +-----------+
-            |                    $        |
-            |                    $  +-----------+  +-----------+
-            |                    $  | subpar1=c4|--| subpar2=c8|
-            |                    $  +-----------+  +-----------+
-            |                    $
-            |                    $
-       +---------+               $  +------------+  +------------+
-       | par1=c2 |------------------| subpar1=c10|--| subpar2=c12|
-       +---------+               $  +------------+  +------------+
-            |                    $
-           ...                   $
-
-    The up-down connections are connections via SEL_ARG::left and
-    SEL_ARG::right. A horizontal connection to the right is the
-    SEL_ARG::next_key_part connection.
-
-    find_used_partitions() traverses the entire tree via recursion on
-     * SEL_ARG::next_key_part (from left to right on the picture)
-     * SEL_ARG::left|right (up/down on the pic). Left-right recursion is
-       performed for each depth level.
-
-    Recursion descent on SEL_ARG::next_key_part is used to accumulate (in
-    ppar->arg_stack) constraints on partitioning and subpartitioning fields.
-    For the example in the above picture, one of stack states is:
-      in find_used_partitions(key_tree = "subpar2=c5") (***)
-      in find_used_partitions(key_tree = "subpar1=c3")
-      in find_used_partitions(key_tree = "par2=c2")   (**)
-      in find_used_partitions(key_tree = "par1=c1")
-      in prune_partitions(...)
-    We apply partitioning limits as soon as possible, e.g. when we reach the
-    depth (**), we find which partition(s) correspond to "par1=c1 AND par2=c2",
-    and save them in ppar->part_iter.
-    When we reach the depth (***), we find which subpartition(s) correspond to
-    "subpar1=c3 AND subpar2=c5", and then mark appropriate subpartitions in
-    appropriate subpartitions as used.
-
-    It is possible that constraints on some partitioning fields are missing.
-    For the above example, consider this stack state:
-      in find_used_partitions(key_tree = "subpar2=c12") (***)
-      in find_used_partitions(key_tree = "subpar1=c10")
-      in find_used_partitions(key_tree = "par1=c2")
-      in prune_partitions(...)
-    Here we don't have constraints for all partitioning fields. Since we've
-    never set the ppar->part_iter to contain used set of partitions, we use
-    its default "all partitions" value.  We get  subpartition id for
-    "subpar1=c3 AND subpar2=c5", and mark that subpartition as used in every
-    partition.
-
-    The inverse is also possible: we may get constraints on partitioning
-    fields, but not constraints on subpartitioning fields. In that case,
-    calls to find_used_partitions() with depth below (**) will return -1,
-    and we will mark entire partition as used.
-
-  TODO
-    Replace recursion on SEL_ARG::left and SEL_ARG::right with a loop
-
-  RETURN
-    1   OK, one or more [sub]partitions are marked as used.
-    0   The passed condition doesn't match any partitions
-   -1   Couldn't infer any partition pruning "intervals" from the passed
-        SEL_ARG* tree (which means that all partitions should be marked as
-        used) Marking partitions as used is the responsibility of the caller.
-*/
-
-static int find_used_partitions(PART_PRUNE_PARAM *ppar,
-                                SEL_ROOT::Type key_tree_type,
-                                SEL_ARG *key_tree) {
-  int res, left_res = 0, right_res = 0;
-  int key_tree_part = (int)key_tree->part;
-  bool set_full_part_if_bad_ret = false;
-  bool ignore_part_fields = ppar->ignore_part_fields;
-  bool did_set_ignore_part_fields = false;
-  RANGE_OPT_PARAM *range_par = &(ppar->range_param);
-
-  if (check_stack_overrun(range_par->thd, 3 * STACK_MIN_SIZE, nullptr))
-    return -1;
-
-  if (key_tree->left != null_element) {
-    if (-1 ==
-        (left_res = find_used_partitions(ppar, key_tree_type, key_tree->left)))
-      return -1;
-  }
-
-  /* Push SEL_ARG's to stack to enable looking backwards as well */
-  ppar->cur_part_fields += ppar->is_part_keypart[key_tree_part];
-  ppar->cur_subpart_fields += ppar->is_subpart_keypart[key_tree_part];
-  *(ppar->arg_stack_end++) = key_tree;
-
-  if (ignore_part_fields) {
-    /*
-      We come here when a condition on the first partitioning
-      fields led to evaluating the partitioning condition
-      (due to finding a condition of the type a < const or
-      b > const). Thus we must ignore the rest of the
-      partitioning fields but we still want to analyse the
-      subpartitioning fields.
-    */
-    if (key_tree->next_key_part)
-      res = find_used_partitions(ppar, key_tree->next_key_part);
-    else
-      res = -1;
-    goto pop_and_go_right;
-  }
-
-  /*
-    TODO: It seems that key_tree_type is _always_ KEY_RANGE in practice,
-    so maybe this if is redundant and should be replaced with an assert?
-  */
-  if (key_tree_type == SEL_ROOT::Type::KEY_RANGE) {
-    if (ppar->part_info->get_part_iter_for_interval &&
-        key_tree->part <= ppar->last_part_partno) {
-      /* Collect left and right bound, their lengths and flags */
-      uchar *min_key = ppar->cur_min_key;
-      uchar *max_key = ppar->cur_max_key;
-      uchar *tmp_min_key = min_key;
-      uchar *tmp_max_key = max_key;
-      key_tree->store_min_value(ppar->key[key_tree->part].store_length,
-                                &tmp_min_key, ppar->cur_min_flag);
-      key_tree->store_max_value(ppar->key[key_tree->part].store_length,
-                                &tmp_max_key, ppar->cur_max_flag);
-      uint flag;
-      if (key_tree->next_key_part &&
-          key_tree->next_key_part->root->part == key_tree->part + 1 &&
-          key_tree->next_key_part->root->part <= ppar->last_part_partno &&
-          key_tree->next_key_part->type == SEL_ROOT::Type::KEY_RANGE) {
-        /*
-          There are more key parts for partition pruning to handle
-          This mainly happens when the condition is an equality
-          condition.
-        */
-        if ((tmp_min_key - min_key) == (tmp_max_key - max_key) &&
-            (memcmp(min_key, max_key, (uint)(tmp_max_key - max_key)) == 0) &&
-            !key_tree->min_flag && !key_tree->max_flag) {
-          /* Set 'parameters' */
-          ppar->cur_min_key = tmp_min_key;
-          ppar->cur_max_key = tmp_max_key;
-          uint save_min_flag = ppar->cur_min_flag;
-          uint save_max_flag = ppar->cur_max_flag;
-
-          ppar->cur_min_flag |= key_tree->min_flag;
-          ppar->cur_max_flag |= key_tree->max_flag;
-
-          res = find_used_partitions(ppar, key_tree->next_key_part);
-
-          /* Restore 'parameters' back */
-          ppar->cur_min_key = min_key;
-          ppar->cur_max_key = max_key;
-
-          ppar->cur_min_flag = save_min_flag;
-          ppar->cur_max_flag = save_max_flag;
-          goto pop_and_go_right;
-        }
-        /* We have arrived at the last field in the partition pruning */
-        uint tmp_min_flag = key_tree->min_flag,
-             tmp_max_flag = key_tree->max_flag;
-        if (!tmp_min_flag)
-          key_tree->next_key_part->store_min_key(ppar->key, &tmp_min_key,
-                                                 &tmp_min_flag,
-                                                 ppar->last_part_partno, true);
-        if (!tmp_max_flag)
-          key_tree->next_key_part->store_max_key(ppar->key, &tmp_max_key,
-                                                 &tmp_max_flag,
-                                                 ppar->last_part_partno, false);
-        flag = tmp_min_flag | tmp_max_flag;
-      } else
-        flag = key_tree->min_flag | key_tree->max_flag;
-
-      if (tmp_min_key != range_par->min_key)
-        flag &= ~NO_MIN_RANGE;
-      else
-        flag |= NO_MIN_RANGE;
-      if (tmp_max_key != range_par->max_key)
-        flag &= ~NO_MAX_RANGE;
-      else
-        flag |= NO_MAX_RANGE;
-
-      /*
-        We need to call the interval mapper if we have a condition which
-        makes sense to prune on. In the example of COLUMNS on a and
-        b it makes sense if we have a condition on a, or conditions on
-        both a and b. If we only have conditions on b it might make sense
-        but this is a harder case we will solve later. For the harder case
-        this clause then turns into use of all partitions and thus we
-        simply set res= -1 as if the mapper had returned that.
-        TODO: What to do here is defined in WL#4065.
-      */
-      if (ppar->arg_stack[0]->part == 0) {
-        uint32 i;
-        uint32 store_length_array[MAX_KEY];
-        uint32 num_keys = ppar->part_fields;
-
-        for (i = 0; i < num_keys; i++)
-          store_length_array[i] = ppar->key[i].store_length;
-        res = ppar->part_info->get_part_iter_for_interval(
-            ppar->part_info, false, store_length_array, range_par->min_key,
-            range_par->max_key, tmp_min_key - range_par->min_key,
-            tmp_max_key - range_par->max_key, flag, &ppar->part_iter);
-        if (!res)
-          goto pop_and_go_right; /* res==0 --> no satisfying partitions */
-      } else
-        res = -1;
-
-      if (res == -1) {
-        /* get a full range iterator */
-        init_all_partitions_iterator(ppar->part_info, &ppar->part_iter);
-      }
-      /*
-        Save our intent to mark full partition as used if we will not be able
-        to obtain further limits on subpartitions
-      */
-      if (key_tree_part < ppar->last_part_partno) {
-        /*
-          We need to ignore the rest of the partitioning fields in all
-          evaluations after this
-        */
-        did_set_ignore_part_fields = true;
-        ppar->ignore_part_fields = true;
-      }
-      set_full_part_if_bad_ret = true;
-      goto process_next_key_part;
-    }
-
-    if (key_tree_part == ppar->last_subpart_partno &&
-        (nullptr != ppar->part_info->get_subpart_iter_for_interval)) {
-      PARTITION_ITERATOR subpart_iter;
-      DBUG_EXECUTE("info",
-                   dbug_print_segment_range(key_tree, range_par->key_parts););
-      res = ppar->part_info->get_subpart_iter_for_interval(
-          ppar->part_info, true, nullptr, /* Currently not used here */
-          key_tree->min_value, key_tree->max_value, 0,
-          0, /* Those are ignored here */
-          key_tree->min_flag | key_tree->max_flag, &subpart_iter);
-      if (res == 0) {
-        /*
-           The only case where we can get "no satisfying subpartitions"
-           returned from the above call is when an error has occurred.
-        */
-        assert(range_par->thd->is_error());
-        return 0;
-      }
-
-      if (res == -1) goto pop_and_go_right; /* all subpartitions satisfy */
-
-      uint32 subpart_id;
-      bitmap_clear_all(&ppar->subparts_bitmap);
-      while ((subpart_id = subpart_iter.get_next(&subpart_iter)) !=
-             NOT_A_PARTITION_ID)
-        bitmap_set_bit(&ppar->subparts_bitmap, subpart_id);
-
-      /* Mark each partition as used in each subpartition.  */
-      uint32 part_id;
-      while ((part_id = ppar->part_iter.get_next(&ppar->part_iter)) !=
-             NOT_A_PARTITION_ID) {
-        for (uint i = 0; i < ppar->part_info->num_subparts; i++)
-          if (bitmap_is_set(&ppar->subparts_bitmap, i))
-            bitmap_set_bit(&ppar->part_info->read_partitions,
-                           part_id * ppar->part_info->num_subparts + i);
-      }
-      goto pop_and_go_right;
-    }
-
-    if (key_tree->is_singlepoint()) {
-      if (key_tree_part == ppar->last_part_partno &&
-          ppar->cur_part_fields == ppar->part_fields &&
-          ppar->part_info->get_part_iter_for_interval == nullptr) {
-        /*
-          Ok, we've got "fieldN<=>constN"-type SEL_ARGs for all partitioning
-          fields. Save all constN constants into table record buffer.
-        */
-        store_selargs_to_rec(ppar, ppar->arg_stack, ppar->part_fields);
-        DBUG_EXECUTE("info", dbug_print_singlepoint_range(ppar->arg_stack,
-                                                          ppar->part_fields););
-        uint32 part_id;
-        longlong func_value;
-        /* Find in which partition the {const1, ...,constN} tuple goes */
-        if (ppar->get_top_partition_id_func(ppar->part_info, &part_id,
-                                            &func_value)) {
-          res = 0; /* No satisfying partitions */
-          goto pop_and_go_right;
-        }
-        /* Rembember the limit we got - single partition #part_id */
-        init_single_partition_iterator(part_id, &ppar->part_iter);
-
-        /*
-          If there are no subpartitions/we fail to get any limit for them,
-          then we'll mark full partition as used.
-        */
-        set_full_part_if_bad_ret = true;
-        goto process_next_key_part;
-      }
-
-      if (key_tree_part == ppar->last_subpart_partno &&
-          ppar->cur_subpart_fields == ppar->subpart_fields) {
-        /*
-          Ok, we've got "fieldN<=>constN"-type SEL_ARGs for all subpartitioning
-          fields. Save all constN constants into table record buffer.
-        */
-        store_selargs_to_rec(ppar, ppar->arg_stack_end - ppar->subpart_fields,
-                             ppar->subpart_fields);
-        DBUG_EXECUTE("info", dbug_print_singlepoint_range(
-                                 ppar->arg_stack_end - ppar->subpart_fields,
-                                 ppar->subpart_fields););
-        /* Find the subpartition (it's HASH/KEY so we always have one) */
-        partition_info *part_info = ppar->part_info;
-        uint32 part_id, subpart_id;
-
-        if (part_info->get_subpartition_id(part_info, &subpart_id)) return 0;
-
-        /* Mark this partition as used in each subpartition. */
-        while ((part_id = ppar->part_iter.get_next(&ppar->part_iter)) !=
-               NOT_A_PARTITION_ID) {
-          bitmap_set_bit(&part_info->read_partitions,
-                         part_id * part_info->num_subparts + subpart_id);
-        }
-        res = 1; /* Some partitions were marked as used */
-        goto pop_and_go_right;
-      }
-    } else {
-      /*
-        Can't handle condition on current key part. If we're that deep that
-        we're processing subpartititoning's key parts, this means we'll not be
-        able to infer any suitable condition, so bail out.
-      */
-      if (key_tree_part >= ppar->last_part_partno) {
-        res = -1;
-        goto pop_and_go_right;
-      }
-      /*
-        No meaning in continuing with rest of partitioning key parts.
-        Will try to continue with subpartitioning key parts.
-      */
-      ppar->ignore_part_fields = true;
-      did_set_ignore_part_fields = true;
-      goto process_next_key_part;
-    }
-  }
-
-process_next_key_part:
-  if (key_tree->next_key_part)
-    res = find_used_partitions(ppar, key_tree->next_key_part);
-  else
-    res = -1;
-
-  if (did_set_ignore_part_fields) {
-    /*
-      We have returned from processing all key trees linked to our next
-      key part. We are ready to be moving down (using right pointers) and
-      this tree is a new evaluation requiring its own decision on whether
-      to ignore partitioning fields.
-    */
-    ppar->ignore_part_fields = false;
-  }
-  if (set_full_part_if_bad_ret) {
-    if (res == -1) {
-      /* Got "full range" for subpartitioning fields */
-      uint32 part_id;
-      bool found = false;
-      while ((part_id = ppar->part_iter.get_next(&ppar->part_iter)) !=
-             NOT_A_PARTITION_ID) {
-        ppar->mark_full_partition_used(ppar->part_info, part_id);
-        found = true;
-      }
-      res = found;
-    }
-    /*
-      Restore the "used partitions iterator" to the default setting that
-      specifies iteration over all partitions.
-    */
-    init_all_partitions_iterator(ppar->part_info, &ppar->part_iter);
-  }
-
-pop_and_go_right:
-  /* Pop this key part info off the "stack" */
-  ppar->arg_stack_end--;
-  ppar->cur_part_fields -= ppar->is_part_keypart[key_tree_part];
-  ppar->cur_subpart_fields -= ppar->is_subpart_keypart[key_tree_part];
-
-  if (res == -1) return -1;
-  if (key_tree->right != null_element) {
-    if (-1 == (right_res =
-                   find_used_partitions(ppar, key_tree_type, key_tree->right)))
-      return -1;
-  }
-  return (left_res || right_res || res);
-}
-
-static int find_used_partitions(PART_PRUNE_PARAM *ppar, SEL_ROOT *key_tree) {
-  return find_used_partitions(ppar, key_tree->type, key_tree->root);
-}
-
-static void mark_all_partitions_as_used(partition_info *part_info) {
-  bitmap_copy(&(part_info->read_partitions), &(part_info->lock_partitions));
-}
-
-/*
-  Check if field types allow to construct partitioning index description
-
-  SYNOPSIS
-    fields_ok_for_partition_index()
-      pfield  NULL-terminated array of pointers to fields.
-
-  DESCRIPTION
-    For an array of fields, check if we can use all of the fields to create
-    partitioning index description.
-
-    We can't process GEOMETRY fields - for these fields singlepoint intervals
-    cant be generated, and non-singlepoint are "special" kinds of intervals
-    to which our processing logic can't be applied.
-
-    It is not known if we could process ENUM fields, so they are disabled to be
-    on the safe side.
-
-  RETURN
-    true   Yes, fields can be used in partitioning index
-    false  Otherwise
-*/
-
-static bool fields_ok_for_partition_index(Field **pfield) {
-  if (!pfield) return false;
-  for (; (*pfield); pfield++) {
-    enum_field_types ftype = (*pfield)->real_type();
-    if (ftype == MYSQL_TYPE_ENUM || ftype == MYSQL_TYPE_GEOMETRY) return false;
-  }
-  return true;
-}
-
-/*
-  Create partition index description and fill related info in the context
-  struct
-
-  SYNOPSIS
-    create_partition_index_description()
-      prune_par  INOUT Partition pruning context
-
-  DESCRIPTION
-    Create partition index description. Partition index description is:
-
-      part_index(used_fields_list(part_expr), used_fields_list(subpart_expr))
-
-    If partitioning/sub-partitioning uses BLOB or Geometry fields, then
-    corresponding fields_list(...) is not included into index description
-    and we don't perform partition pruning for partitions/subpartitions.
-
-  RETURN
-    true   Out of memory or can't do partition pruning at all
-    false  OK
-*/
-
-static bool create_partition_index_description(PART_PRUNE_PARAM *ppar) {
-  RANGE_OPT_PARAM *range_par = &(ppar->range_param);
-  partition_info *part_info = ppar->part_info;
-  uint used_part_fields, used_subpart_fields;
-
-  used_part_fields = fields_ok_for_partition_index(part_info->part_field_array)
-                         ? part_info->num_part_fields
-                         : 0;
-  used_subpart_fields =
-      fields_ok_for_partition_index(part_info->subpart_field_array)
-          ? part_info->num_subpart_fields
-          : 0;
-
-  uint total_parts = used_part_fields + used_subpart_fields;
-
-  ppar->ignore_part_fields = false;
-  ppar->part_fields = used_part_fields;
-  ppar->last_part_partno = (int)used_part_fields - 1;
-
-  ppar->subpart_fields = used_subpart_fields;
-  ppar->last_subpart_partno =
-      used_subpart_fields ? (int)(used_part_fields + used_subpart_fields - 1)
-                          : -1;
-
-  if (part_info->is_sub_partitioned()) {
-    ppar->mark_full_partition_used = mark_full_partition_used_with_parts;
-    ppar->get_top_partition_id_func = part_info->get_part_partition_id;
-  } else {
-    ppar->mark_full_partition_used = mark_full_partition_used_no_parts;
-    ppar->get_top_partition_id_func = part_info->get_partition_id;
-  }
-
-  KEY_PART *key_part;
-  MEM_ROOT *alloc = range_par->mem_root;
-  if (!total_parts ||
-      !(key_part = (KEY_PART *)alloc->Alloc(sizeof(KEY_PART) * total_parts)) ||
-      !(ppar->arg_stack =
-            (SEL_ARG **)alloc->Alloc(sizeof(SEL_ARG *) * total_parts)) ||
-      !(ppar->is_part_keypart =
-            (bool *)alloc->Alloc(sizeof(bool) * total_parts)) ||
-      !(ppar->is_subpart_keypart =
-            (bool *)alloc->Alloc(sizeof(bool) * total_parts)))
-    return true;
-
-  if (ppar->subpart_fields) {
-    my_bitmap_map *buf;
-    uint32 bufsize = bitmap_buffer_size(ppar->part_info->num_subparts);
-    if (!(buf = (my_bitmap_map *)alloc->Alloc(bufsize))) return true;
-    bitmap_init(&ppar->subparts_bitmap, buf, ppar->part_info->num_subparts);
-  }
-  range_par->key_parts = key_part;
-  Field **field = (ppar->part_fields) ? part_info->part_field_array
-                                      : part_info->subpart_field_array;
-  bool in_subpart_fields = false;
-  for (uint part = 0; part < total_parts; part++, key_part++) {
-    key_part->key = 0;
-    key_part->part = part;
-    key_part->length = (uint16)(*field)->key_length();
-    key_part->store_length = (uint16)get_partition_field_store_length(*field);
-
-    DBUG_PRINT("info", ("part %u length %u store_length %u", part,
-                        key_part->length, key_part->store_length));
-
-    key_part->field = (*field);
-    key_part->image_type = Field::itRAW;
-    /*
-      We set keypart flag to 0 here as the only HA_PART_KEY_SEG is checked
-      in the RangeAnalysisModule.
-    */
-    key_part->flag = 0;
-    /* We don't set key_parts->null_bit as it will not be used */
-
-    ppar->is_part_keypart[part] = !in_subpart_fields;
-    ppar->is_subpart_keypart[part] = in_subpart_fields;
-
-    /*
-      Check if this was last field in this array, in this case we
-      switch to subpartitioning fields. (This will only happens if
-      there are subpartitioning fields to cater for).
-    */
-    if (!*(++field)) {
-      field = part_info->subpart_field_array;
-      in_subpart_fields = true;
-    }
-  }
-  range_par->key_parts_end = key_part;
-
-  DBUG_EXECUTE("info", print_partitioning_index(range_par->key_parts,
-                                                range_par->key_parts_end););
-  return false;
-}
-
-#ifndef NDEBUG
-
-static void print_partitioning_index(KEY_PART *parts, KEY_PART *parts_end) {
-  DBUG_TRACE;
-  DBUG_LOCK_FILE;
-  fprintf(DBUG_FILE, "partitioning INDEX(");
-  for (KEY_PART *p = parts; p != parts_end; p++) {
-    fprintf(DBUG_FILE, "%s%s", p == parts ? "" : " ,", p->field->field_name);
-  }
-  fputs(");\n", DBUG_FILE);
-  DBUG_UNLOCK_FILE;
-}
-
-/* Print a "c1 < keypartX < c2" - type interval into debug trace. */
-static void dbug_print_segment_range(SEL_ARG *arg, KEY_PART *part) {
-  DBUG_TRACE;
-  DBUG_LOCK_FILE;
-  if (!(arg->min_flag & NO_MIN_RANGE)) {
-    store_key_image_to_rec(part->field, arg->min_value, part->length);
-    part->field->dbug_print();
-    if (arg->min_flag & NEAR_MIN)
-      fputs(" < ", DBUG_FILE);
-    else
-      fputs(" <= ", DBUG_FILE);
-  }
-
-  fprintf(DBUG_FILE, "%s", part->field->field_name);
-
-  if (!(arg->max_flag & NO_MAX_RANGE)) {
-    if (arg->max_flag & NEAR_MAX)
-      fputs(" < ", DBUG_FILE);
-    else
-      fputs(" <= ", DBUG_FILE);
-    store_key_image_to_rec(part->field, arg->max_value, part->length);
-    part->field->dbug_print();
-  }
-  fputs("\n", DBUG_FILE);
-  DBUG_UNLOCK_FILE;
-}
-
-/*
-  Print a singlepoint multi-keypart range interval to debug trace
-
-  SYNOPSIS
-    dbug_print_singlepoint_range()
-      start  Array of SEL_ARG* ptrs representing conditions on key parts
-      num    Number of elements in the array.
-
-  DESCRIPTION
-    This function prints a "keypartN=constN AND ... AND keypartK=constK"-type
-    interval to debug trace.
-*/
-
-static void dbug_print_singlepoint_range(SEL_ARG **start, uint num) {
-  DBUG_TRACE;
-  DBUG_LOCK_FILE;
-  SEL_ARG **end = start + num;
-
-  for (SEL_ARG **arg = start; arg != end; arg++) {
-    Field *field = (*arg)->field;
-    fprintf(DBUG_FILE, "%s%s=", (arg == start) ? "" : ", ", field->field_name);
-    field->dbug_print();
-  }
-  fputs("\n", DBUG_FILE);
-  DBUG_UNLOCK_FILE;
-}
-#endif
-
-/****************************************************************************
- * Partition pruning code ends
- ****************************************************************************/
-
-/*
-  Get best plan for a SEL_IMERGE disjunctive expression.
-  SYNOPSIS
-    get_best_disjunct_quick()
-      param     Parameter from check_quick_select function
-      imerge    Expression to use
-      cost_est  Don't create scans with cost > cost_est
-
-  NOTES
-    index_merge cost is calculated as follows:
-    index_merge_cost =
-      cost(index_reads) +         (see #1)
-      cost(rowid_to_row_scan) +   (see #2)
-      cost(unique_use)            (see #3)
-
-    1. cost(index_reads) =SUM_i(cost(index_read_i))
-       For non-CPK scans,
-         cost(index_read_i) = {cost of ordinary 'index only' scan}
-       For CPK scan,
-         cost(index_read_i) = {cost of non-'index only' scan}
-
-    2. cost(rowid_to_row_scan)
-      If table PK is clustered then
-        cost(rowid_to_row_scan) =
-          {cost of ordinary clustered PK scan with n_ranges=n_rows}
-
-      Otherwise, we use the following model to calculate costs:
-      We need to retrieve n_rows rows from file that occupies n_blocks blocks.
-      We assume that offsets of rows we need are independent variates with
-      uniform distribution in [0..max_file_offset] range.
-
-      We'll denote block as "busy" if it contains row(s) we need to retrieve
-      and "empty" if doesn't contain rows we need.
-
-      Probability that a block is empty is (1 - 1/n_blocks)^n_rows (this
-      applies to any block in file). Let x_i be a variate taking value 1 if
-      block #i is empty and 0 otherwise.
-
-      Then E(x_i) = (1 - 1/n_blocks)^n_rows;
-
-      E(n_empty_blocks) = E(sum(x_i)) = sum(E(x_i)) =
-        = n_blocks * ((1 - 1/n_blocks)^n_rows) =
-       ~= n_blocks * exp(-n_rows/n_blocks).
-
-      E(n_busy_blocks) = n_blocks*(1 - (1 - 1/n_blocks)^n_rows) =
-       ~= n_blocks * (1 - exp(-n_rows/n_blocks)).
-
-      Average size of "hole" between neighbor non-empty blocks is
-           E(hole_size) = n_blocks/E(n_busy_blocks).
-
-      The total cost of reading all needed blocks in one "sweep" is:
-
-        E(n_busy_blocks) * disk_seek_cost(n_blocks/E(n_busy_blocks))
-
-      This cost estimate is calculated in get_sweep_read_cost().
-
-    3. Cost of Unique use is calculated in Unique::get_use_cost function.
-
-  ROR-union cost is calculated in the same way index_merge, but instead of
-  Unique a priority queue is used.
-
-  RETURN
-    Created read plan
-    NULL - Out of memory or no read scan could be built.
-*/
-
-static TABLE_READ_PLAN *get_best_disjunct_quick(PARAM *param,
-                                                SEL_IMERGE *imerge,
-                                                const Cost_estimate *cost_est) {
-  SEL_TREE **ptree;
-  TRP_INDEX_MERGE *imerge_trp = nullptr;
-  uint n_child_scans = imerge->trees_next - imerge->trees;
-  TRP_RANGE **range_scans;
-  TRP_RANGE **cur_child;
-  TRP_RANGE **cpk_scan = nullptr;
-  bool imerge_too_expensive = false;
-  Cost_estimate imerge_cost;
-  ha_rows cpk_scan_records = 0;
-  ha_rows non_cpk_scan_records = 0;
-  bool pk_is_clustered = param->table->file->primary_key_is_clustered();
-  bool all_scans_ror_able = true;
-  bool all_scans_rors = true;
-  size_t unique_calc_buff_size;
-  TABLE_READ_PLAN **roru_read_plans;
-  TABLE_READ_PLAN **cur_roru_plan;
-  ha_rows roru_total_records;
-  double roru_intersect_part = 1.0;
-  const Cost_model_table *const cost_model = param->table->cost_model();
-  Cost_estimate read_cost = *cost_est;
-
-  DBUG_TRACE;
-  DBUG_PRINT("info", ("Full table scan cost: %g", cost_est->total_cost()));
-
-  assert(param->table->file->stats.records);
-
-  const bool force_index_merge = hint_table_state(
-      param->thd, param->table->pos_in_table_list, INDEX_MERGE_HINT_ENUM, 0);
-
-  Opt_trace_context *const trace = &param->thd->opt_trace;
-  Opt_trace_object trace_best_disjunct(trace);
-  if (!(range_scans = (TRP_RANGE **)param->mem_root->Alloc(sizeof(TRP_RANGE *) *
-                                                           n_child_scans)))
-    return nullptr;
-  // Note: to_merge.end() is called to close this object after this for-loop.
-  Opt_trace_array to_merge(trace, "indexes_to_merge");
-  /*
-    Collect best 'range' scan for each of disjuncts, and, while doing so,
-    analyze possibility of ROR scans. Also calculate some values needed by
-    other parts of the code.
-  */
-  for (ptree = imerge->trees, cur_child = range_scans;
-       ptree != imerge->trees_next; ptree++, cur_child++) {
-    DBUG_EXECUTE("info", print_sel_tree(param, *ptree, &(*ptree)->keys_map,
-                                        "tree in SEL_IMERGE"););
-    Opt_trace_object trace_idx(trace);
-    if (!(*cur_child =
-              get_key_scans_params(param, *ptree, true, false, &read_cost))) {
-      /*
-        One of index scans in this index_merge is more expensive than entire
-        table read for another available option. The entire index_merge (and
-        any possible ROR-union) will be more expensive then, too. We continue
-        here only to update SQL_SELECT members.
-      */
-      imerge_too_expensive = true;
-    }
-
-    if (imerge_too_expensive) {
-      trace_idx.add("chosen", false).add_alnum("cause", "cost");
-      continue;
-    }
-
-    if (!((*cur_child)->is_imerge)) {
-      trace_idx.add("chosen", false)
-          .add_alnum("cause", "index has DESC key part");
-      continue;
-    }
-
-    const uint keynr_in_table = param->real_keynr[(*cur_child)->key_idx];
-    imerge_cost += (*cur_child)->cost_est;
-    all_scans_ror_able &= ((*ptree)->n_ror_scans > 0);
-    all_scans_rors &= (*cur_child)->is_ror;
-    if (pk_is_clustered && keynr_in_table == param->table->s->primary_key) {
-      cpk_scan = cur_child;
-      cpk_scan_records = (*cur_child)->records;
-    } else
-      non_cpk_scan_records += (*cur_child)->records;
-
-    trace_idx
-        .add_utf8("index_to_merge", param->table->key_info[keynr_in_table].name)
-        .add("cumulated_cost", imerge_cost);
-  }
-
-  // Note: to_merge trace object is closed here
-  to_merge.end();
-
-  trace_best_disjunct.add("cost_of_reading_ranges", imerge_cost);
-  if (imerge_too_expensive || (((imerge_cost > read_cost) ||
-                                ((non_cpk_scan_records + cpk_scan_records >=
-                                  param->table->file->stats.records) &&
-                                 !read_cost.is_max_cost())) &&
-                               !force_index_merge)) {
-    /*
-      Bail out if it is obvious that both index_merge and ROR-union will be
-      more expensive
-    */
-    DBUG_PRINT("info", ("Sum of index_merge scans is more expensive than "
-                        "full table scan, bailing out"));
-    trace_best_disjunct.add("chosen", false).add_alnum("cause", "cost");
-    return nullptr;
-  }
-
-  /*
-    If all scans happen to be ROR, proceed to generate a ROR-union plan (it's
-    guaranteed to be cheaper than non-ROR union), unless ROR-unions are
-    disabled in @@optimizer_switch
-  */
-  if (all_scans_rors &&
-      (param->index_merge_union_allowed || force_index_merge)) {
-    roru_read_plans = (TABLE_READ_PLAN **)range_scans;
-    trace_best_disjunct.add("use_roworder_union", true)
-        .add_alnum("cause", "always_cheaper_than_not_roworder_retrieval");
-    goto skip_to_ror_scan;
-  }
-
-  if (cpk_scan) {
-    /*
-      Add one rowid/key comparison for each row retrieved on non-CPK
-      scan. (it is done in QUICK_RANGE_SELECT::row_in_ranges)
-    */
-    const double rid_comp_cost =
-        cost_model->key_compare_cost(static_cast<double>(non_cpk_scan_records));
-    imerge_cost.add_cpu(rid_comp_cost);
-    trace_best_disjunct.add("cost_of_mapping_rowid_in_non_clustered_pk_scan",
-                            rid_comp_cost);
-  }
-
-  /* Calculate cost(rowid_to_row_scan) */
-  {
-    Cost_estimate sweep_cost;
-    JOIN *join = param->query_block->join;
-    const bool is_interrupted = join && join->tables != 1;
-    get_sweep_read_cost(param->table, non_cpk_scan_records, is_interrupted,
-                        &sweep_cost);
-    imerge_cost += sweep_cost;
-    trace_best_disjunct.add("cost_sort_rowid_and_read_disk", sweep_cost);
-  }
-  DBUG_PRINT("info", ("index_merge cost with rowid-to-row scan: %g",
-                      imerge_cost.total_cost()));
-  if ((imerge_cost > read_cost || !param->index_merge_sort_union_allowed) &&
-      !force_index_merge) {
-    trace_best_disjunct.add("use_roworder_index_merge", true)
-        .add_alnum("cause", "cost");
-    goto build_ror_index_merge;
-  }
-
-  /* Add Unique operations cost */
-  unique_calc_buff_size = Unique::get_cost_calc_buff_size(
-      (ulong)non_cpk_scan_records, param->table->file->ref_length,
-      param->thd->variables.sortbuff_size);
-  if (param->imerge_cost_buff.size() < unique_calc_buff_size) {
-    typedef Unique::Imerge_cost_buf_type::value_type element_type;
-    void *rawmem =
-        param->mem_root->Alloc(unique_calc_buff_size * sizeof(element_type));
-    if (!rawmem) return nullptr;
-    param->imerge_cost_buff = Unique::Imerge_cost_buf_type(
-        static_cast<element_type *>(rawmem), unique_calc_buff_size);
-  }
-
-  {
-    const double dup_removal_cost = Unique::get_use_cost(
-        param->imerge_cost_buff, (uint)non_cpk_scan_records,
-        param->table->file->ref_length, param->thd->variables.sortbuff_size,
-        cost_model);
-
-    trace_best_disjunct.add("cost_duplicate_removal", dup_removal_cost);
-    imerge_cost.add_cpu(dup_removal_cost);
-
-    trace_best_disjunct.add("total_cost", imerge_cost);
-    DBUG_PRINT("info", ("index_merge total cost: %g (wanted: less then %g)",
-                        imerge_cost.total_cost(), read_cost.total_cost()));
-  }
-  if (imerge_cost < read_cost || force_index_merge) {
-    if ((imerge_trp =
-             new (param->mem_root) TRP_INDEX_MERGE(force_index_merge))) {
-      imerge_trp->cost_est = imerge_cost;
-      imerge_trp->records = non_cpk_scan_records + cpk_scan_records;
-      imerge_trp->records =
-          min(imerge_trp->records, param->table->file->stats.records);
-      imerge_trp->range_scans = range_scans;
-      imerge_trp->range_scans_end = range_scans + n_child_scans;
-      read_cost = imerge_cost;
-    }
-  }
-
-build_ror_index_merge:
-  if (!all_scans_ror_able || param->thd->lex->sql_command == SQLCOM_DELETE ||
-      (!param->index_merge_union_allowed && !force_index_merge))
-    return imerge_trp;
-
-  /* Ok, it is possible to build a ROR-union, try it. */
-  if (!(roru_read_plans = (TABLE_READ_PLAN **)param->mem_root->Alloc(
-            sizeof(TABLE_READ_PLAN *) * n_child_scans)))
-    return imerge_trp;
-skip_to_ror_scan:
-  Cost_estimate roru_index_cost;
-  roru_total_records = 0;
-  cur_roru_plan = roru_read_plans;
-
-  /*
-    Note: trace_analyze_ror.end() is called to close this object after
-    this for-loop.
-  */
-  Opt_trace_array trace_analyze_ror(trace, "analyzing_roworder_scans");
-  /* Find 'best' ROR scan for each of trees in disjunction */
-  for (ptree = imerge->trees, cur_child = range_scans;
-       ptree != imerge->trees_next; ptree++, cur_child++, cur_roru_plan++) {
-    Opt_trace_object trp_info(trace);
-    if (unlikely(trace->is_started()))
-      (*cur_child)->trace_basic_info(param, &trp_info);
-
-    /*
-      Assume the best ROR scan is the one that has cheapest
-      full-row-retrieval scan cost.
-      Also accumulate index_only scan costs as we'll need them to
-      calculate overall index_intersection cost.
-    */
-    Cost_estimate scan_cost;
-    if ((*cur_child)->is_ror) {
-      /* Ok, we have index_only cost, now get full rows scan cost */
-      scan_cost = param->table->file->read_cost(
-          param->real_keynr[(*cur_child)->key_idx], 1,
-          static_cast<double>((*cur_child)->records));
-      scan_cost.add_cpu(
-          cost_model->row_evaluate_cost(rows2double((*cur_child)->records)));
-    } else
-      scan_cost = read_cost;
-
-    TABLE_READ_PLAN *prev_plan = *cur_child;
-    if (!(*cur_roru_plan =
-              get_best_ror_intersect(param, *ptree, &scan_cost, false))) {
-      if (prev_plan->is_ror)
-        *cur_roru_plan = prev_plan;
-      else
-        return imerge_trp;
-      roru_index_cost += (*cur_roru_plan)->cost_est;
-    } else {
-      roru_index_cost +=
-          ((TRP_ROR_INTERSECT *)(*cur_roru_plan))->index_scan_cost;
-    }
-    roru_total_records += (*cur_roru_plan)->records;
-    roru_intersect_part *=
-        (*cur_roru_plan)->records / param->table->file->stats.records;
-  }
-  // Note: trace_analyze_ror trace object is closed here
-  trace_analyze_ror.end();
-
-  /*
-    rows to retrieve=
-      SUM(rows_in_scan_i) - table_rows * PROD(rows_in_scan_i / table_rows).
-    This is valid because index_merge construction guarantees that conditions
-    in disjunction do not share key parts.
-  */
-  roru_total_records -=
-      (ha_rows)(roru_intersect_part * param->table->file->stats.records);
-  /* ok, got a ROR read plan for each of the disjuncts
-    Calculate cost:
-    cost(index_union_scan(scan_1, ... scan_n)) =
-      SUM_i(cost_of_index_only_scan(scan_i)) +
-      queue_use_cost(rowid_len, n) +
-      cost_of_row_retrieval
-    See get_merge_buffers_cost function for queue_use_cost formula derivation.
-  */
-  Cost_estimate roru_total_cost;
-  {
-    JOIN *join = param->query_block->join;
-    const bool is_interrupted = join && join->tables != 1;
-    get_sweep_read_cost(param->table, roru_total_records, is_interrupted,
-                        &roru_total_cost);
-    roru_total_cost += roru_index_cost;
-    roru_total_cost.add_cpu(cost_model->key_compare_cost(
-        rows2double(roru_total_records) * std::log2(n_child_scans)));
-  }
-
-  trace_best_disjunct.add("index_roworder_union_cost", roru_total_cost)
-      .add("members", n_child_scans);
-  TRP_ROR_UNION *roru;
-  if (roru_total_cost < read_cost || force_index_merge) {
-    if ((roru = new (param->mem_root) TRP_ROR_UNION(force_index_merge))) {
-      trace_best_disjunct.add("chosen", true);
-      roru->first_ror = roru_read_plans;
-      roru->last_ror = roru_read_plans + n_child_scans;
-      roru->cost_est = roru_total_cost;
-      roru->records = roru_total_records;
-      return roru;
-    }
-  }
-  trace_best_disjunct.add("chosen", false);
-
-  return imerge_trp;
-}
-
-/*
-  Create ROR_SCAN_INFO* structure with a single ROR scan on index idx using
-  sel_arg set of intervals.
-
-  SYNOPSIS
-    make_ror_scan()
-      param    Parameter from test_quick_select function
-      idx      Index of key in param->keys
-      sel_root Set of intervals for a given key
-
-  RETURN
-    NULL - out of memory
-    ROR scan structure containing a scan for {idx, sel_arg}
-*/
-
-static ROR_SCAN_INFO *make_ror_scan(const PARAM *param, int idx,
-                                    SEL_ROOT *sel_root) {
-  ROR_SCAN_INFO *ror_scan;
-  my_bitmap_map *bitmap_buf1;
-  my_bitmap_map *bitmap_buf2;
-  uint keynr;
-  DBUG_TRACE;
-
-  if (!(ror_scan =
-            (ROR_SCAN_INFO *)param->mem_root->Alloc(sizeof(ROR_SCAN_INFO))))
-    return nullptr;
-
-  ror_scan->idx = idx;
-  ror_scan->keynr = keynr = param->real_keynr[idx];
-  ror_scan->sel_root = sel_root;
-  ror_scan->records = param->table->quick_rows[keynr];
-
-  if (!(bitmap_buf1 =
-            (my_bitmap_map *)param->mem_root->Alloc(param->fields_bitmap_size)))
-    return nullptr;
-  if (!(bitmap_buf2 =
-            (my_bitmap_map *)param->mem_root->Alloc(param->fields_bitmap_size)))
-    return nullptr;
-
-  if (bitmap_init(&ror_scan->covered_fields, bitmap_buf1,
-                  param->table->s->fields))
-    return nullptr;
-  if (bitmap_init(&ror_scan->covered_fields_remaining, bitmap_buf2,
-                  param->table->s->fields))
-    return nullptr;
-
-  bitmap_clear_all(&ror_scan->covered_fields);
-
-  KEY_PART_INFO *key_part = param->table->key_info[keynr].key_part;
-  KEY_PART_INFO *key_part_end =
-      key_part + param->table->key_info[keynr].user_defined_key_parts;
-  for (; key_part != key_part_end; ++key_part) {
-    if (bitmap_is_set(&param->needed_fields, key_part->fieldnr - 1))
-      bitmap_set_bit(&ror_scan->covered_fields, key_part->fieldnr - 1);
-  }
-  bitmap_copy(&ror_scan->covered_fields_remaining, &ror_scan->covered_fields);
-
-  double rows = rows2double(param->table->quick_rows[ror_scan->keynr]);
-  ror_scan->index_read_cost =
-      param->table->file->index_scan_cost(ror_scan->keynr, 1, rows);
-  return ror_scan;
-}
-
-/**
-  Compare two ROR_SCAN_INFO* by
-    1. Number of fields in this index that are not already covered
-       by other indexes earlier in the intersect ordering: descending
-    2. E(Number of records): ascending
-
-  @param scan1   first ror scan to compare
-  @param scan2   second ror scan to compare
-
-  @return true if scan1 > scan2, false otherwise
-*/
-static bool is_better_intersect_match(const ROR_SCAN_INFO *scan1,
-                                      const ROR_SCAN_INFO *scan2) {
-  if (scan1 == scan2) return false;
-
-  if (scan1->num_covered_fields_remaining > scan2->num_covered_fields_remaining)
-    return false;
-
-  if (scan1->num_covered_fields_remaining < scan2->num_covered_fields_remaining)
-    return true;
-
-  return (scan1->records > scan2->records);
-}
-
-/**
-  Sort indexes in an order that is likely to be a good index merge
-  intersection order. After running this function, [start, ..., end-1]
-  is ordered according to this strategy:
-
-    1) Minimize the number of indexes that must be used in the
-       intersection. I.e., the index covering most fields not already
-       covered by other indexes earlier in the sort order is picked first.
-    2) When multiple indexes cover equally many uncovered fields, the
-       index with lowest E(Number of rows) is chosen.
-
-  Note that all permutations of index ordering are not tested, so this
-  function may not find the optimal order.
-
-  @param[in,out] start     Pointer to the start of indexes that may
-                           be used in index merge intersection
-  @param         end       Pointer past the last index that may be used.
-  @param         param     Parameter from test_quick_select function.
-*/
-static void find_intersect_order(ROR_SCAN_INFO **start, ROR_SCAN_INFO **end,
-                                 const PARAM *param) {
-  // nothing to sort if there are only zero or one ROR scans
-  if ((start == end) || (start + 1 == end)) return;
-
-  /*
-    Bitmap of fields we would like the ROR scans to cover. Will be
-    modified by the loop below so that when we're looking for a ROR
-    scan in position 'x' in the ordering, all fields covered by ROR
-    scans 0,...,x-1 have been removed.
-  */
-  MY_BITMAP fields_to_cover;
-  my_bitmap_map *map;
-  if (!(map =
-            (my_bitmap_map *)param->mem_root->Alloc(param->fields_bitmap_size)))
-    return;
-  bitmap_init(&fields_to_cover, map, param->needed_fields.n_bits);
-  bitmap_copy(&fields_to_cover, &param->needed_fields);
-
-  // Sort ROR scans in [start,...,end-1]
-  for (ROR_SCAN_INFO **place = start; place < (end - 1); place++) {
-    /* Placeholder for the best ROR scan found for position 'place' so far */
-    ROR_SCAN_INFO **best = place;
-    ROR_SCAN_INFO **current = place + 1;
-
-    {
-      /*
-        Calculate how many fields in 'fields_to_cover' not already
-        covered by [start,...,place-1] the 'best' index covers. The
-        result is used in is_better_intersect_match() and is valid
-        when finding the best ROR scan for position 'place' only.
-      */
-      bitmap_intersect(&(*best)->covered_fields_remaining, &fields_to_cover);
-      (*best)->num_covered_fields_remaining =
-          bitmap_bits_set(&(*best)->covered_fields_remaining);
-    }
-    for (; current < end; current++) {
-      {
-        /*
-          Calculate how many fields in 'fields_to_cover' not already
-          covered by [start,...,place-1] the 'current' index covers.
-          The result is used in is_better_intersect_match() and is
-          valid when finding the best ROR scan for position 'place' only.
-        */
-        bitmap_intersect(&(*current)->covered_fields_remaining,
-                         &fields_to_cover);
-        (*current)->num_covered_fields_remaining =
-            bitmap_bits_set(&(*current)->covered_fields_remaining);
-
-        /*
-          No need to compare with 'best' if 'current' does not
-          contribute with uncovered fields.
-        */
-        if ((*current)->num_covered_fields_remaining == 0) continue;
-      }
-
-      if (is_better_intersect_match(*best, *current)) best = current;
-    }
-
-    /*
-      'best' is now the ROR scan that will be sorted in position
-      'place'. When searching for the best ROR scans later in the sort
-      sequence we do not need coverage of the fields covered by 'best'
-    */
-    bitmap_subtract(&fields_to_cover, &(*best)->covered_fields);
-    if (best != place) std::swap(*best, *place);
-
-    if (bitmap_is_clear_all(&fields_to_cover))
-      return;  // No more fields to cover
-  }
-}
-
-/* Auxiliary structure for incremental ROR-intersection creation */
-typedef struct {
-  const PARAM *param;
-  MY_BITMAP covered_fields; /* union of fields covered by all scans */
-  /*
-    Fraction of table records that satisfies conditions of all scans.
-    This is the number of full records that will be retrieved if a
-    non-index_only index intersection will be employed.
-  */
-  double out_rows;
-  /* true if covered_fields is a superset of needed_fields */
-  bool is_covering;
-
-  ha_rows index_records;         /* sum(#records to look in indexes) */
-  Cost_estimate index_scan_cost; /* SUM(cost of 'index-only' scans) */
-  Cost_estimate total_cost;
-} ROR_INTERSECT_INFO;
-
-/*
-  Allocate a ROR_INTERSECT_INFO and initialize it to contain zero scans.
-
-  SYNOPSIS
-    ror_intersect_init()
-      param         Parameter from test_quick_select
-
-  RETURN
-    allocated structure
-    NULL on error
-*/
-
-static ROR_INTERSECT_INFO *ror_intersect_init(const PARAM *param) {
-  ROR_INTERSECT_INFO *info;
-  my_bitmap_map *buf;
-  if (!(info = (ROR_INTERSECT_INFO *)param->mem_root->Alloc(
-            sizeof(ROR_INTERSECT_INFO))))
-    return nullptr;
-  info->param = param;
-  if (!(buf =
-            (my_bitmap_map *)param->mem_root->Alloc(param->fields_bitmap_size)))
-    return nullptr;
-  if (bitmap_init(&info->covered_fields, buf, param->table->s->fields))
-    return nullptr;
-  info->is_covering = false;
-  info->index_scan_cost.reset();
-  info->total_cost.reset();
-  info->index_records = 0;
-  info->out_rows = (double)param->table->file->stats.records;
-  bitmap_clear_all(&info->covered_fields);
-  return info;
-}
-
-static void ror_intersect_cpy(ROR_INTERSECT_INFO *dst,
-                              const ROR_INTERSECT_INFO *src) {
-  dst->param = src->param;
-  memcpy(dst->covered_fields.bitmap, src->covered_fields.bitmap,
-         no_bytes_in_map(&src->covered_fields));
-  dst->out_rows = src->out_rows;
-  dst->is_covering = src->is_covering;
-  dst->index_records = src->index_records;
-  dst->index_scan_cost = src->index_scan_cost;
-  dst->total_cost = src->total_cost;
-}
-
-/*
-  Get selectivity of adding a ROR scan to the ROR-intersection.
-
-  SYNOPSIS
-    ror_scan_selectivity()
-      info  ROR-interection, an intersection of ROR index scans
-      scan  ROR scan that may or may not improve the selectivity
-            of 'info'
-
-  NOTES
-    Suppose we have conditions on several keys
-    cond=k_11=c_11 AND k_12=c_12 AND ...  // key_parts of first key in 'info'
-         k_21=c_21 AND k_22=c_22 AND ...  // key_parts of second key in 'info'
-          ...
-         k_n1=c_n1 AND k_n3=c_n3 AND ...  (1) //key_parts of 'scan'
-
-    where k_ij may be the same as any k_pq (i.e. keys may have common parts).
-
-    Note that for ROR retrieval, only equality conditions are usable so there
-    are no open ranges (e.g., k_ij > c_ij) in 'scan' or 'info'.
-    FIXME: This isn't true in practice; e.g. i_main.costmodel_planchange ends
-    up calling this function with an inequality condition, and thus the
-  estimation is probably wrong (since the code assumes only one element in the
-  tree).
-
-    A full row is retrieved if entire condition holds.
-
-    The recursive procedure for finding P(cond) is as follows:
-
-    First step:
-    Pick 1st part of 1st key and break conjunction (1) into two parts:
-      cond= (k_11=c_11 AND R)
-
-    Here R may still contain condition(s) equivalent to k_11=c_11.
-    Nevertheless, the following holds:
-
-      P(k_11=c_11 AND R) = P(k_11=c_11) * P(R | k_11=c_11).
-
-    Mark k_11 as fixed field (and satisfied condition) F, save P(F),
-    save R to be cond and proceed to recursion step.
-
-    Recursion step:
-    We have a set of fixed fields/satisfied conditions) F, probability P(F),
-    and remaining conjunction R
-    Pick next key part on current key and its condition "k_ij=c_ij".
-    We will add "k_ij=c_ij" into F and update P(F).
-    Lets denote k_ij as t,  R = t AND R1, where R1 may still contain t. Then
-
-     P((t AND R1)|F) = P(t|F) * P(R1|t|F) = P(t|F) * P(R1|(t AND F)) (2)
-
-    (where '|' mean conditional probability, not "or")
-
-    Consider the first multiplier in (2). One of the following holds:
-    a) F contains condition on field used in t (i.e. t AND F = F).
-      Then P(t|F) = 1
-
-    b) F doesn't contain condition on field used in t. Then F and t are
-     considered independent.
-
-     P(t|F) = P(t|(fields_before_t_in_key AND other_fields)) =
-          = P(t|fields_before_t_in_key).
-
-     P(t|fields_before_t_in_key) = #records(fields_before_t_in_key) /
-                                   #records(fields_before_t_in_key, t)
-
-    The second multiplier is calculated by applying this step recursively.
-
-  IMPLEMENTATION
-    This function calculates the result of application of the "recursion step"
-    described above for all fixed key members of a single key, accumulating set
-    of covered fields, selectivity, etc.
-
-    The calculation is conducted as follows:
-    Lets denote #records(keypart1, ... keypartK) as n_k. We need to calculate
-
-     n_{k1}      n_{k2}
-    --------- * ---------  * .... (3)
-     n_{k1-1}    n_{k2-1}
-
-    where k1,k2,... are key parts which fields were not yet marked as fixed
-    ( this is result of application of option b) of the recursion step for
-      parts of a single key).
-    Since it is reasonable to expect that most of the fields are not marked
-    as fixed, we calculate (3) as
-
-                                  n_{i1}      n_{i2}
-    (3) = n_{max_key_part}  / (   --------- * ---------  * ....  )
-                                  n_{i1-1}    n_{i2-1}
-
-    where i1,i2, .. are key parts that were already marked as fixed.
-
-    In order to minimize number of expensive records_in_range calls we
-    group and reduce adjacent fractions. Note that on the optimizer's
-    request, index statistics may be used instead of records_in_range
-    @see RANGE_OPT_PARAM::use_index_statistics.
-
-  RETURN
-    Selectivity of given ROR scan, a number between 0 and 1. 1 means that
-    adding 'scan' to the intersection does not improve the selectivity.
-*/
-
-static double ror_scan_selectivity(const ROR_INTERSECT_INFO *info,
-                                   const ROR_SCAN_INFO *scan) {
-  double selectivity_mult = 1.0;
-  const TABLE *const table = info->param->table;
-  const KEY_PART_INFO *const key_part = table->key_info[scan->keynr].key_part;
-  /**
-    key values tuple, used to store both min_range.key and
-    max_range.key. This function is only called for equality ranges;
-    open ranges (e.g. "min_value < X < max_value") cannot be used for
-    rowid ordered retrieval, so in this function we know that
-    min_range.key == max_range.key
-  */
-  uchar key_val[MAX_KEY_LENGTH + MAX_FIELD_WIDTH];
-  uchar *key_ptr = key_val;
-  SEL_ARG *tuple_arg = nullptr;
-  key_part_map keypart_map = 0;
-  bool cur_covered;
-  bool prev_covered =
-      bitmap_is_set(&info->covered_fields, key_part->fieldnr - 1);
-  key_range min_range;
-  key_range max_range;
-  min_range.key = key_val;
-  min_range.flag = HA_READ_KEY_EXACT;
-  max_range.key = key_val;
-  max_range.flag = HA_READ_AFTER_KEY;
-  ha_rows prev_records = table->file->stats.records;
-  DBUG_TRACE;
-
-  for (SEL_ROOT *sel_root = scan->sel_root; sel_root;
-       sel_root = sel_root->root->next_key_part) {
-    DBUG_PRINT("info", ("sel_root step"));
-    cur_covered = bitmap_is_set(&info->covered_fields,
-                                key_part[sel_root->root->part].fieldnr - 1);
-    if (cur_covered != prev_covered) {
-      /* create (part1val, ..., part{n-1}val) tuple. */
-      bool is_null_range = false;
-      ha_rows records;
-      if (!tuple_arg) {
-        tuple_arg = scan->sel_root->root;
-        /* Here we use the length of the first key part */
-        tuple_arg->store_min_value(key_part[0].store_length, &key_ptr, 0);
-        is_null_range |= tuple_arg->is_null_interval();
-        keypart_map = 1;
-      }
-      while (tuple_arg->next_key_part != sel_root) {
-        tuple_arg = tuple_arg->next_key_part->root;
-        tuple_arg->store_min_value(key_part[tuple_arg->part].store_length,
-                                   &key_ptr, 0);
-        is_null_range |= tuple_arg->is_null_interval();
-        keypart_map = (keypart_map << 1) | 1;
-      }
-      min_range.length = max_range.length = (size_t)(key_ptr - key_val);
-      min_range.keypart_map = max_range.keypart_map = keypart_map;
-
-      /*
-        Get the number of rows in this range. This is done by calling
-        records_in_range() unless all these are true:
-          1) The user has requested that index statistics should be used
-             for equality ranges to avoid the incurred overhead of
-             index dives in records_in_range()
-          2) The range is not on the form "x IS NULL". The reason is
-             that the number of rows with this value are likely to be
-             very different than the values in the index statistics
-          3) Index statistics is available.
-        @see key_val
-      */
-      if (!info->param->use_index_statistics ||  // (1)
-          is_null_range ||                       // (2)
-          !table->key_info[scan->keynr].has_records_per_key(
-              tuple_arg->part))  // (3)
-      {
-        DBUG_EXECUTE_IF("crash_records_in_range", DBUG_SUICIDE(););
-        assert(min_range.length > 0);
-        records =
-            table->file->records_in_range(scan->keynr, &min_range, &max_range);
-      } else {
-        // Use index statistics
-        records = static_cast<ha_rows>(
-            table->key_info[scan->keynr].records_per_key(tuple_arg->part));
-      }
-
-      if (cur_covered) {
-        /* uncovered -> covered */
-        double tmp = rows2double(records) / rows2double(prev_records);
-        DBUG_PRINT("info", ("Selectivity multiplier: %g", tmp));
-        selectivity_mult *= tmp;
-        prev_records = HA_POS_ERROR;
-      } else {
-        /* covered -> uncovered */
-        prev_records = records;
-      }
-    }
-    prev_covered = cur_covered;
-  }
-  if (!prev_covered) {
-    double tmp =
-        rows2double(table->quick_rows[scan->keynr]) / rows2double(prev_records);
-    DBUG_PRINT("info", ("Selectivity multiplier: %g", tmp));
-    selectivity_mult *= tmp;
-  }
-  // Todo: This assert fires in PB sysqa RQG tests.
-  // assert(selectivity_mult <= 1.0);
-  DBUG_PRINT("info", ("Returning multiplier: %g", selectivity_mult));
-  return selectivity_mult;
-}
-
-/*
-  Check if adding a ROR scan to a ROR-intersection reduces its cost of
-  ROR-intersection and if yes, update parameters of ROR-intersection,
-  including its cost.
-
-  SYNOPSIS
-    ror_intersect_add()
-      param        Parameter from test_quick_select
-      info         ROR-intersection structure to add the scan to.
-      ror_scan     ROR scan info to add.
-      is_cpk_scan  If true, add the scan as CPK scan (this can be inferred
-                   from other parameters and is passed separately only to
-                   avoid duplicating the inference code)
-      trace_costs  Optimizer trace object cost details are added to
-      ignore_cost  Ignore cost check due to use of INDEX_MERGE hint
-
-  NOTES
-    Adding a ROR scan to ROR-intersect "makes sense" iff the cost of ROR-
-    intersection decreases. The cost of ROR-intersection is calculated as
-    follows:
-
-    cost= SUM_i(key_scan_cost_i) + cost_of_full_rows_retrieval
-
-    When we add a scan the first increases and the second decreases.
-
-    cost_of_full_rows_retrieval=
-      (union of indexes used covers all needed fields) ?
-        cost_of_sweep_read(E(rows_to_retrieve), rows_in_table) :
-        0
-
-    E(rows_to_retrieve) = #rows_in_table * ror_scan_selectivity(null, scan1) *
-                           ror_scan_selectivity({scan1}, scan2) * ... *
-                           ror_scan_selectivity({scan1,...}, scanN).
-  RETURN
-    true   ROR scan added to ROR-intersection, cost updated.
-    false  It doesn't make sense to add this ROR scan to this ROR-intersection.
-*/
-
-static bool ror_intersect_add(ROR_INTERSECT_INFO *info, ROR_SCAN_INFO *ror_scan,
-                              bool is_cpk_scan, Opt_trace_object *trace_costs,
-                              bool ignore_cost) {
-  double selectivity_mult = 1.0;
-
-  DBUG_TRACE;
-  DBUG_PRINT("info", ("Current out_rows= %g", info->out_rows));
-  DBUG_PRINT("info", ("Adding scan on %s",
-                      info->param->table->key_info[ror_scan->keynr].name));
-  DBUG_PRINT("info", ("is_cpk_scan: %d", is_cpk_scan));
-
-  selectivity_mult = ror_scan_selectivity(info, ror_scan);
-  if (selectivity_mult == 1.0 && !ignore_cost) {
-    /* Don't add this scan if it doesn't improve selectivity. */
-    DBUG_PRINT("info", ("The scan doesn't improve selectivity."));
-    return false;
-  }
-
-  info->out_rows *= selectivity_mult;
-
-  if (is_cpk_scan) {
-    /*
-      CPK scan is used to filter out rows. We apply filtering for each
-      record of every scan. For each record we assume that one key
-      compare is done:
-    */
-    const Cost_model_table *const cost_model = info->param->table->cost_model();
-    const double idx_cost =
-        cost_model->key_compare_cost(rows2double(info->index_records));
-    info->index_scan_cost.add_cpu(idx_cost);
-    trace_costs->add("index_scan_cost", idx_cost);
-  } else {
-    info->index_records += info->param->table->quick_rows[ror_scan->keynr];
-    info->index_scan_cost += ror_scan->index_read_cost;
-    trace_costs->add("index_scan_cost", ror_scan->index_read_cost);
-    bitmap_union(&info->covered_fields, &ror_scan->covered_fields);
-    if (!info->is_covering &&
-        bitmap_is_subset(&info->param->needed_fields, &info->covered_fields)) {
-      DBUG_PRINT("info", ("ROR-intersect is covering now"));
-      info->is_covering = true;
-    }
-  }
-
-  info->total_cost = info->index_scan_cost;
-  trace_costs->add("cumulated_index_scan_cost", info->index_scan_cost);
-
-  if (!info->is_covering) {
-    Cost_estimate sweep_cost;
-    JOIN *join = info->param->query_block->join;
-    const bool is_interrupted = join && join->tables != 1;
-
-    get_sweep_read_cost(info->param->table, double2rows(info->out_rows),
-                        is_interrupted, &sweep_cost);
-    info->total_cost += sweep_cost;
-    trace_costs->add("disk_sweep_cost", sweep_cost);
-  } else
-    trace_costs->add("disk_sweep_cost", 0);
-
-  DBUG_PRINT("info", ("New out_rows: %g", info->out_rows));
-  DBUG_PRINT("info", ("New cost: %g, %scovering", info->total_cost.total_cost(),
-                      info->is_covering ? "" : "non-"));
-  return true;
-}
-
-/*
-  Get best ROR-intersection plan using non-covering ROR-intersection search
-  algorithm. The returned plan may be covering.
-
-  SYNOPSIS
-    get_best_ror_intersect()
-      param            Parameter from test_quick_select function.
-      tree             Transformed restriction condition to be used to look
-                       for ROR scans.
-      cost_est         Do not return read plans with cost > cost_est.
-      are_all_covering [out] set to true if union of all scans covers all
-                       fields needed by the query (and it is possible to build
-                       a covering ROR-intersection)
-      force_index_merge_result true if the function must return cheapest
-                               intersection object when INDEX_MERGE hint is
-                               used without specified indexes, false otherwise.
-
-  NOTES
-    get_key_scans_params must be called before this function can be called.
-
-    When this function is called by ROR-union construction algorithm it
-    assumes it is building an uncovered ROR-intersection (and thus # of full
-    records to be retrieved is wrong here). This is a hack.
-
-  IMPLEMENTATION
-    The approximate best non-covering plan search algorithm is as follows:
-
-    find_min_ror_intersection_scan()
-    {
-      R= select all ROR scans;
-      order R by (E(#records_matched) * key_record_length).
-
-      S= first(R); -- set of scans that will be used for ROR-intersection
-      R= R-first(S);
-      min_cost= cost(S);
-      min_scan= make_scan(S);
-      while (R is not empty)
-      {
-        firstR= R - first(R);
-        if (!selectivity(S + firstR < selectivity(S)))
-          continue;
-
-        S= S + first(R);
-        if (cost(S) < min_cost)
-        {
-          min_cost= cost(S);
-          min_scan= make_scan(S);
-        }
-      }
-      return min_scan;
-    }
-
-    See ror_intersect_add function for ROR intersection costs.
-
-    Special handling for Clustered PK scans
-    Clustered PK contains all table fields, so using it as a regular scan in
-    index intersection doesn't make sense: a range scan on CPK will be less
-    expensive in this case.
-    Clustered PK scan has special handling in ROR-intersection: it is not used
-    to retrieve rows, instead its condition is used to filter row references
-    we get from scans on other keys.
-
-  RETURN
-    ROR-intersection table read plan
-    NULL if out of memory or no suitable plan found.
-*/
-
-static TRP_ROR_INTERSECT *get_best_ror_intersect(
-    const PARAM *param, SEL_TREE *tree, const Cost_estimate *cost_est,
-    bool force_index_merge_result) {
-  uint idx;
-  Cost_estimate min_cost;
-  Opt_trace_context *const trace = &param->thd->opt_trace;
-  DBUG_TRACE;
-
-  bool use_cheapest_index_merge = false;
-  bool force_index_merge =
-      idx_merge_hint_state(param->thd, param->table, &use_cheapest_index_merge);
-
-  Opt_trace_object trace_ror(trace, "analyzing_roworder_intersect");
-
-  min_cost.set_max_cost();
-
-  if (tree->n_ror_scans < 2 || ((!param->table->file->stats.records ||
-                                 !param->index_merge_intersect_allowed) &&
-                                !force_index_merge)) {
-    trace_ror.add("usable", false);
-    if (tree->n_ror_scans < 2)
-      trace_ror.add_alnum("cause", "too_few_roworder_scans");
-    else
-      trace_ror.add("need_tracing", true);
-    return nullptr;
-  }
-
-  if (param->order_direction == ORDER_DESC) return nullptr;
-
-  /*
-    Step1: Collect ROR-able SEL_ARGs and create ROR_SCAN_INFO for each of
-    them. Also find and save clustered PK scan if there is one.
-  */
-  ROR_SCAN_INFO **cur_ror_scan;
-  ROR_SCAN_INFO *cpk_scan = nullptr;
-  uint cpk_no;
-  bool cpk_scan_used = false;
-
-  if (!(tree->ror_scans = (ROR_SCAN_INFO **)param->mem_root->Alloc(
-            sizeof(ROR_SCAN_INFO *) * param->keys)))
-    return nullptr;
-  cpk_no = ((param->table->file->primary_key_is_clustered())
-                ? param->table->s->primary_key
-                : MAX_KEY);
-
-  for (idx = 0, cur_ror_scan = tree->ror_scans; idx < param->keys; idx++) {
-    ROR_SCAN_INFO *scan;
-    if (!tree->ror_scans_map.is_set(idx)) continue;
-    if (!(scan = make_ror_scan(param, idx, tree->keys[idx]))) return nullptr;
-    if (param->real_keynr[idx] == cpk_no) {
-      cpk_scan = scan;
-      tree->n_ror_scans--;
-    } else
-      *(cur_ror_scan++) = scan;
-  }
-
-  tree->ror_scans_end = cur_ror_scan;
-  DBUG_EXECUTE("info",
-               print_ror_scans_arr(param->table, "original", tree->ror_scans,
-                                   tree->ror_scans_end););
-  /*
-    Ok, [ror_scans, ror_scans_end) is array of ptrs to initialized
-    ROR_SCAN_INFO's.
-    Step 2: Get best ROR-intersection using an approximate algorithm.
-  */
-  find_intersect_order(tree->ror_scans, tree->ror_scans_end, param);
-
-  DBUG_EXECUTE("info",
-               print_ror_scans_arr(param->table, "ordered", tree->ror_scans,
-                                   tree->ror_scans_end););
-
-  ROR_SCAN_INFO **intersect_scans; /* ROR scans used in index intersection */
-  ROR_SCAN_INFO **intersect_scans_end;
-  if (!(intersect_scans = (ROR_SCAN_INFO **)param->mem_root->Alloc(
-            sizeof(ROR_SCAN_INFO *) * tree->n_ror_scans)))
-    return nullptr;
-  intersect_scans_end = intersect_scans;
-
-  /* Create and incrementally update ROR intersection. */
-  ROR_INTERSECT_INFO *intersect, *intersect_best = nullptr;
-  if (!(intersect = ror_intersect_init(param)) ||
-      !(intersect_best = ror_intersect_init(param)))
-    return nullptr;
-
-  /* [intersect_scans,intersect_scans_best) will hold the best intersection */
-  ROR_SCAN_INFO **intersect_scans_best;
-  cur_ror_scan = tree->ror_scans;
-  intersect_scans_best = intersect_scans;
-  /*
-    Note: trace_isect_idx.end() is called to close this object after
-    this while-loop.
-  */
-  Opt_trace_array trace_isect_idx(trace, "intersecting_indexes");
-  while (cur_ror_scan != tree->ror_scans_end && !intersect->is_covering) {
-    Opt_trace_object trace_idx(trace);
-    trace_idx.add_utf8("index",
-                       param->table->key_info[(*cur_ror_scan)->keynr].name);
-
-    if (!compound_hint_key_enabled(param->table, (*cur_ror_scan)->keynr,
-                                   INDEX_MERGE_HINT_ENUM)) {
-      trace_idx.add("usable", false).add_alnum("cause", "index_merge_hint");
-      cur_ror_scan++;
-      continue;
-    }
-
-    /* S= S + first(R);  R= R - first(R); */
-    if (!ror_intersect_add(intersect, *cur_ror_scan, false, &trace_idx,
-                           force_index_merge && !use_cheapest_index_merge)) {
-      trace_idx.add("cumulated_total_cost", intersect->total_cost)
-          .add("usable", false)
-          .add_alnum("cause", "does_not_reduce_cost_of_intersect");
-      cur_ror_scan++;
-      continue;
-    }
-
-    trace_idx.add("cumulated_total_cost", intersect->total_cost)
-        .add("usable", true)
-        .add("matching_rows_now", intersect->out_rows)
-        .add("isect_covering_with_this_index", intersect->is_covering);
-
-    *(intersect_scans_end++) = *(cur_ror_scan++);
-
-    if (intersect->total_cost < min_cost ||
-        (force_index_merge &&
-         /*
-           If INDEX_MERGE hint is used without only specified index,
-           index merge is forced and the cheapest combination of indexes
-           will be chosen. Since ranges are sorted by index scan cost,
-           index merge is forced for first two ranges and next ranges are
-           added only if they reduce total cost and there is no clustered
-           primary key scan or intersection is covering. If there is
-           a range by clustered primary key and intersection is not covering,
-           combination of first index and primary key is considered as
-           a cheapest intersection.
-         */
-         ((intersect_scans_best - intersect_scans < 2 &&
-           force_index_merge_result && (!cpk_scan || intersect->is_covering)) ||
-          !use_cheapest_index_merge))) {
-      /* Local minimum found, save it */
-      ror_intersect_cpy(intersect_best, intersect);
-      intersect_scans_best = intersect_scans_end;
-      min_cost = intersect->total_cost;
-      trace_idx.add("chosen", true);
-    } else {
-      trace_idx.add("chosen", false).add_alnum("cause", "does_not_reduce_cost");
-    }
-  }
-  // Note: trace_isect_idx trace object is closed here
-  trace_isect_idx.end();
-
-  if (intersect_scans_best == intersect_scans) {
-    trace_ror.add("chosen", false)
-        .add_alnum("cause", "does_not_increase_selectivity");
-    DBUG_PRINT("info", ("None of scans increase selectivity"));
-    return nullptr;
-  }
-
-  DBUG_EXECUTE("info",
-               print_ror_scans_arr(param->table, "best ROR-intersection",
-                                   intersect_scans, intersect_scans_best););
-
-  uint best_num = intersect_scans_best - intersect_scans;
-  ror_intersect_cpy(intersect, intersect_best);
-
-  /*
-    Ok, found the best ROR-intersection of non-CPK key scans.
-    Check if we should add a CPK scan. If the obtained ROR-intersection is
-    covering, it doesn't make sense to add CPK scan.
-  */
-  {  // Scope for trace object
-    Opt_trace_object trace_cpk(trace, "clustered_pk");
-    if (cpk_scan && !intersect->is_covering &&
-        compound_hint_key_enabled(param->table, cpk_no,
-                                  INDEX_MERGE_HINT_ENUM)) {
-      if (ror_intersect_add(intersect, cpk_scan, true, &trace_cpk, true) &&
-          ((intersect->total_cost < min_cost) ||
-           (force_index_merge &&
-            (!use_cheapest_index_merge ||
-             (best_num == 1 && force_index_merge_result))))) {
-        trace_cpk.add("clustered_pk_scan_added_to_intersect", true)
-            .add("cumulated_cost", intersect->total_cost);
-        cpk_scan_used = true;
-        intersect_best = intersect;  // just set pointer here
-      } else
-        trace_cpk.add("clustered_pk_added_to_intersect", false)
-            .add_alnum("cause", "cost");
-    } else {
-      trace_cpk.add("clustered_pk_added_to_intersect", false)
-          .add_alnum("cause", cpk_scan ? "roworder_is_covering"
-                                       : "no_clustered_pk_index");
-    }
-  }
-  /* Ok, return ROR-intersect plan if we have found one */
-  TRP_ROR_INTERSECT *trp = nullptr;
-  if ((min_cost < *cost_est || force_index_merge) &&
-      (cpk_scan_used || best_num > 1)) {
-    if (!(trp = new (param->mem_root) TRP_ROR_INTERSECT(force_index_merge)))
-      return trp;
-    if (!(trp->first_scan = (ROR_SCAN_INFO **)param->mem_root->Alloc(
-              sizeof(ROR_SCAN_INFO *) * best_num)))
-      return nullptr;
-    memcpy(trp->first_scan, intersect_scans,
-           best_num * sizeof(ROR_SCAN_INFO *));
-    trp->last_scan = trp->first_scan + best_num;
-    trp->is_covering = intersect_best->is_covering;
-    trp->cost_est = intersect_best->total_cost;
-    /* Prevent divisons by zero */
-    ha_rows best_rows = double2rows(intersect_best->out_rows);
-    if (!best_rows) best_rows = 1;
-    param->table->quick_condition_rows =
-        min(param->table->quick_condition_rows, best_rows);
-    trp->records = best_rows;
-    trp->index_scan_cost = intersect_best->index_scan_cost;
-    trp->cpk_scan = cpk_scan_used ? cpk_scan : nullptr;
-
-    trace_ror.add("rows", trp->records)
-        .add("cost", trp->cost_est)
-        .add("covering", trp->is_covering)
-        .add("chosen", true);
-
-    DBUG_PRINT("info", ("Returning non-covering ROR-intersect plan:"
-                        "cost %g, records %lu",
-                        trp->cost_est.total_cost(), (ulong)trp->records));
-  } else {
-    trace_ror.add("chosen", false)
-        .add_alnum("cause", (*cost_est > min_cost) ? "too_few_indexes_to_merge"
-                                                   : "cost");
-  }
-  return trp;
-}
-
-/*
-  Get best "range" table read plan for given SEL_TREE, also update some info
-
-  SYNOPSIS
-    get_key_scans_params()
-      param                    Parameters from test_quick_select
-      tree                     Make range select for this SEL_TREE
-      index_read_must_be_used  true <=> assume 'index only' option will be set
-                               (except for clustered PK indexes)
-      update_tbl_stats         true <=> update table->quick_* with information
-                               about range scans we've evaluated.
-      cost_est                 Maximum cost. i.e. don't create read plans with
-                               cost > cost_est.
-
-  DESCRIPTION
-    Find the best "range" table read plan for given SEL_TREE.
-    The side effects are
-     - tree->ror_scans is updated to indicate which scans are ROR scans.
-     - if update_tbl_stats=true then table->quick_* is updated with info
-       about every possible range scan.
-
-  RETURN
-    Best range read plan
-    NULL if no plan found or error occurred
-*/
-
-static TRP_RANGE *get_key_scans_params(PARAM *param, SEL_TREE *tree,
-                                       bool index_read_must_be_used,
-                                       bool update_tbl_stats,
-                                       const Cost_estimate *cost_est) {
-  uint idx, best_idx = 0;
-  SEL_ROOT *key, *key_to_read = nullptr;
-  ha_rows best_records = 0; /* protected by key_to_read */
-  uint best_mrr_flags = 0, best_buf_size = 0;
-  TRP_RANGE *read_plan = nullptr;
-  Cost_estimate read_cost = *cost_est;
-  DBUG_TRACE;
-  Opt_trace_context *const trace = &param->thd->opt_trace;
-  /*
-    Note that there may be trees that have type SEL_TREE::KEY but contain no
-    key reads at all, e.g. tree for expression "key1 is not null" where key1
-    is defined as "not null".
-  */
-  DBUG_EXECUTE("info",
-               print_sel_tree(param, tree, &tree->keys_map, "tree scans"););
-  Opt_trace_array ota(trace, "range_scan_alternatives");
-
-  tree->ror_scans_map.clear_all();
-  tree->n_ror_scans = 0;
-  bool is_best_idx_imerge_scan = true;
-  bool use_cheapest_index_merge = false;
-  bool force_index_merge =
-      idx_merge_hint_state(param->thd, param->table, &use_cheapest_index_merge);
-
-  for (idx = 0; idx < param->keys; idx++) {
-    key = tree->keys[idx];
-    if (key) {
-      ha_rows found_records;
-      Cost_estimate cost;
-      uint mrr_flags = 0, buf_size = 0;
-      uint keynr = param->real_keynr[idx];
-      if (key->type == SEL_ROOT::Type::MAYBE_KEY || key->root->maybe_flag)
-        param->needed_reg->set_bit(keynr);
-
-      bool read_index_only =
-          index_read_must_be_used
-              ? true
-              : (bool)param->table->covering_keys.is_set(keynr);
-
-      Opt_trace_object trace_idx(trace);
-      trace_idx.add_utf8("index", param->table->key_info[keynr].name);
-      found_records =
-          check_quick_select(param, idx, read_index_only, key, update_tbl_stats,
-                             &mrr_flags, &buf_size, &cost);
-
-      if (!compound_hint_key_enabled(param->table, keynr,
-                                     INDEX_MERGE_HINT_ENUM)) {
-        trace_idx.add("chosen", false).add_alnum("cause", "index_merge_hint");
-        continue;
-      }
-
-      // check_quick_select() says don't use range if it returns HA_POS_ERROR
-      if (found_records != HA_POS_ERROR && param->thd->opt_trace.is_started()) {
-        Opt_trace_array trace_range(&param->thd->opt_trace, "ranges");
-
-        const KEY &cur_key = param->table->key_info[keynr];
-        const KEY_PART_INFO *key_part = cur_key.key_part;
-
-        String range_info;
-        range_info.set_charset(system_charset_info);
-        append_range_all_keyparts(&trace_range, nullptr, &range_info, key,
-                                  key_part, false);
-        trace_range.end();  // NOTE: ends the tracing scope
-
-        /// No cost calculation when index dive is skipped.
-        if (param->skip_records_in_range)
-          trace_idx.add_alnum("index_dives_for_range_access",
-                              "skipped_due_to_force_index");
-        else
-          trace_idx.add("index_dives_for_eq_ranges",
-                        !param->use_index_statistics);
-
-        trace_idx.add("rowid_ordered", param->is_ror_scan)
-            .add("using_mrr", !(mrr_flags & HA_MRR_USE_DEFAULT_IMPL))
-            .add("index_only", read_index_only);
-
-        if (param->skip_records_in_range) {
-          trace_idx.add_alnum("rows", "not applicable")
-              .add_alnum("cost", "not applicable");
-        } else {
-          trace_idx.add("rows", found_records).add("cost", cost);
-        }
-      }
-
-      if ((found_records != HA_POS_ERROR) && param->is_ror_scan) {
-        tree->n_ror_scans++;
-        tree->ror_scans_map.set_bit(idx);
-      }
-
-      if (found_records != HA_POS_ERROR &&
-          (read_cost > cost ||
-           /*
-             Ignore cost check if INDEX_MERGE hint is used with
-             explicitly specified indexes or if INDEX_MERGE hint
-             is used without any specified indexes and no best
-             index is chosen yet.
-           */
-           (force_index_merge &&
-            (!use_cheapest_index_merge || !key_to_read)))) {
-        trace_idx.add("chosen", true);
-        read_cost = cost;
-        best_records = found_records;
-        key_to_read = key;
-        best_idx = idx;
-        best_mrr_flags = mrr_flags;
-        best_buf_size = buf_size;
-        is_best_idx_imerge_scan = param->is_imerge_scan;
-      } else {
-        trace_idx.add("chosen", false);
-        if (found_records == HA_POS_ERROR)
-          if (key->type == SEL_ROOT::Type::MAYBE_KEY)
-            trace_idx.add_alnum("cause", "depends_on_unread_values");
-          else
-            trace_idx.add_alnum("cause", "no_valid_range_for_this_index");
-        else
-          trace_idx.add_alnum("cause", "cost");
-      }
-    }
-  }
-
-  DBUG_EXECUTE("info",
-               print_sel_tree(param, tree, &tree->ror_scans_map, "ROR scans"););
-
-  if (key_to_read) {
-    if ((read_plan = new (param->mem_root)
-             TRP_RANGE(key_to_read, best_idx, best_mrr_flags))) {
-      read_plan->records = best_records;
-      read_plan->is_ror = tree->ror_scans_map.is_set(best_idx);
-      read_plan->is_imerge = is_best_idx_imerge_scan;
-      read_plan->cost_est = read_cost;
-      read_plan->mrr_buf_size = best_buf_size;
-      DBUG_PRINT("info",
-                 ("Returning range plan for key %s, cost %g, records %lu",
-                  param->table->key_info[param->real_keynr[best_idx]].name,
-                  read_plan->cost_est.total_cost(), (ulong)read_plan->records));
-    }
-  } else
-    DBUG_PRINT("info", ("No 'range' table read plan found"));
-
-  return read_plan;
-}
-
-QUICK_SELECT_I *TRP_INDEX_MERGE::make_quick(PARAM *param, bool, MEM_ROOT *) {
-  QUICK_INDEX_MERGE_SELECT *quick_imerge;
-  QUICK_RANGE_SELECT *quick;
-  /* index_merge always retrieves full rows, ignore retrieve_full_rows */
-  if (!(quick_imerge = new QUICK_INDEX_MERGE_SELECT(param->thd, param->table)))
-    return nullptr;
-
-  quick_imerge->records = records;
-  quick_imerge->cost_est = cost_est;
-
-  for (TRP_RANGE **range_scan = range_scans; range_scan != range_scans_end;
-       range_scan++) {
-    if (!(quick =
-              (QUICK_RANGE_SELECT *)((*range_scan)
-                                         ->make_quick(param, false,
-                                                      &quick_imerge->alloc))) ||
-        quick_imerge->push_quick_back(quick)) {
-      delete quick;
-      delete quick_imerge;
-      return nullptr;
-    }
-  }
-  quick_imerge->forced_by_hint = forced_by_hint;
-  return quick_imerge;
-}
-
-QUICK_SELECT_I *TRP_ROR_INTERSECT::make_quick(PARAM *param,
-                                              bool retrieve_full_rows,
-                                              MEM_ROOT *parent_alloc) {
-  QUICK_ROR_INTERSECT_SELECT *quick_intrsect;
-  QUICK_RANGE_SELECT *quick;
-  DBUG_TRACE;
-  MEM_ROOT *alloc;
-
-  if ((quick_intrsect = new QUICK_ROR_INTERSECT_SELECT(
-           param->thd, param->table,
-           (retrieve_full_rows ? (!is_covering) : false), parent_alloc))) {
-    DBUG_EXECUTE("info",
-                 print_ror_scans_arr(param->table, "creating ROR-intersect",
-                                     first_scan, last_scan););
-    alloc = parent_alloc ? parent_alloc : &quick_intrsect->alloc;
-    for (ROR_SCAN_INFO **current = first_scan; current != last_scan;
-         current++) {
-      if (!(quick =
-                get_quick_select(param, (*current)->idx, (*current)->sel_root,
-                                 HA_MRR_SORTED, 0, alloc)) ||
-          quick_intrsect->push_quick_back(quick)) {
-        delete quick_intrsect;
-        return nullptr;
-      }
-    }
-    if (cpk_scan) {
-      if (!(quick = get_quick_select(param, cpk_scan->idx, cpk_scan->sel_root,
-                                     HA_MRR_SORTED, 0, alloc))) {
-        delete quick_intrsect;
-        return nullptr;
-      }
-      quick->file = nullptr;
-      quick_intrsect->cpk_quick = quick;
-    }
-    quick_intrsect->records = records;
-    quick_intrsect->cost_est = cost_est;
-  }
-  quick_intrsect->forced_by_hint = forced_by_hint;
-  return quick_intrsect;
-}
-
-QUICK_SELECT_I *TRP_ROR_UNION::make_quick(PARAM *param, bool, MEM_ROOT *) {
-  QUICK_ROR_UNION_SELECT *quick_roru;
-  TABLE_READ_PLAN **scan;
-  QUICK_SELECT_I *quick;
-  DBUG_TRACE;
-  /*
-    It is impossible to construct a ROR-union that will not retrieve full
-    rows, ignore retrieve_full_rows parameter.
-  */
-  if ((quick_roru = new QUICK_ROR_UNION_SELECT(param->thd, param->table))) {
-    for (scan = first_ror; scan != last_ror; scan++) {
-      if (!(quick = (*scan)->make_quick(param, false, &quick_roru->alloc)) ||
-          quick_roru->push_quick_back(quick))
-        return nullptr;
-    }
-    quick_roru->records = records;
-    quick_roru->cost_est = cost_est;
-  }
-  quick_roru->forced_by_hint = forced_by_hint;
-  return quick_roru;
-}
-
-/**
-   If EXPLAIN or if the --safe-updates option is enabled, add a warning that
-   the index cannot be used for range access due to either type conversion or
-   different collations on the field used for comparison
-
-   @param param              PARAM from test_quick_select
-   @param key_num            Key number
-   @param field              Field in the predicate
-*/
-static void warn_index_not_applicable(const RANGE_OPT_PARAM *param,
-                                      const uint key_num, const Field *field) {
-  THD *thd = param->thd;
-  if (param->using_real_indexes &&
-      (thd->lex->is_explain() ||
-       thd->variables.option_bits & OPTION_SAFE_UPDATES))
-    push_warning_printf(thd, Sql_condition::SL_WARNING,
-                        ER_WARN_INDEX_NOT_APPLICABLE,
-                        ER_THD(thd, ER_WARN_INDEX_NOT_APPLICABLE), "range",
-                        field->table->key_info[param->real_keynr[key_num]].name,
-                        field->field_name);
-}
-
-/*
-  Build a SEL_TREE for <> or NOT BETWEEN predicate
-
-  SYNOPSIS
-    get_ne_mm_tree()
-      param       PARAM from test_quick_select
-      cond_func   item for the predicate
-      field       field in the predicate
-      lt_value    constant that field should be smaller
-      gt_value    constant that field should be greaterr
-
-  RETURN
-    #  Pointer to tree built tree
-    0  on error
-*/
-static SEL_TREE *get_ne_mm_tree(RANGE_OPT_PARAM *param, Item_func *cond_func,
-                                Field *field, Item *lt_value, Item *gt_value) {
-  SEL_TREE *tree = nullptr;
-
-  if (param->has_errors()) return nullptr;
-
-  tree = get_mm_parts(param, cond_func, field, Item_func::LT_FUNC, lt_value);
-  if (tree) {
-    tree = tree_or(
-        param, tree,
-        get_mm_parts(param, cond_func, field, Item_func::GT_FUNC, gt_value));
-  }
-  return tree;
-}
-
-/**
-  Factory function to build a SEL_TREE from an @<in predicate@>
-
-  @param param      Information on 'just about everything'.
-  @param predicand  The @<in predicate's@> predicand, i.e. the left-hand
-                    side of the @<in predicate@> expression.
-  @param op         The 'in' operator itself.
-  @param is_negated If true, the operator is NOT IN, otherwise IN.
-*/
-static SEL_TREE *get_func_mm_tree_from_in_predicate(RANGE_OPT_PARAM *param,
-                                                    Item *predicand,
-                                                    Item_func_in *op,
-                                                    bool is_negated) {
-  if (param->has_errors()) return nullptr;
-
-  // Populate array as we need to examine its values here
-  if (op->array && !op->populated) op->populate_bisection(param->thd);
-
-  if (is_negated) {
-    // We don't support row constructors (multiple columns on lhs) here.
-    if (predicand->type() != Item::FIELD_ITEM) return nullptr;
-
-    Field *field = static_cast<Item_field *>(predicand)->field;
-
-    if (op->array && !op->array->is_row_result()) {
-      /*
-        We get here for conditions on the form "t.key NOT IN (c1, c2, ...)",
-        where c{i} are constants. Our goal is to produce a SEL_TREE that
-        represents intervals:
-
-        ($MIN<t.key<c1) OR (c1<t.key<c2) OR (c2<t.key<c3) OR ...    (*)
-
-        where $MIN is either "-inf" or NULL.
-
-        The most straightforward way to produce it is to convert NOT
-        IN into "(t.key != c1) AND (t.key != c2) AND ... " and let the
-        range analyzer build a SEL_TREE from that. The problem is that
-        the range analyzer will use O(N^2) memory (which is probably a
-        bug), and people who do use big NOT IN lists (e.g. see
-        BUG#15872, BUG#21282), will run out of memory.
-
-        Another problem with big lists like (*) is that a big list is
-        unlikely to produce a good "range" access, while considering
-        that range access will require expensive CPU calculations (and
-        for MyISAM even index accesses). In short, big NOT IN lists
-        are rarely worth analyzing.
-
-        Considering the above, we'll handle NOT IN as follows:
-
-        - if the number of entries in the NOT IN list is less than
-          NOT_IN_IGNORE_THRESHOLD, construct the SEL_TREE (*)
-          manually.
-
-        - Otherwise, don't produce a SEL_TREE.
-      */
-
-      const uint NOT_IN_IGNORE_THRESHOLD = 1000;
-      // If we have t.key NOT IN (null, null, ...) or the list is too long
-      if (op->array->used_count == 0 ||
-          op->array->used_count > NOT_IN_IGNORE_THRESHOLD)
-        return nullptr;
-
-      /*
-        Create one Item_type constant object. We'll need it as
-        get_mm_parts only accepts constant values wrapped in Item_Type
-        objects.
-        We create the Item on param->old_root which points to
-        per-statement mem_root (while thd->mem_root is currently pointing
-        to mem_root local to range optimizer).
-      */
-      Item_basic_constant *value_item = op->array->create_item(param->old_root);
-
-      if (!value_item) return nullptr;
-
-      /* Get a SEL_TREE for "(-inf|NULL) < X < c_0" interval.  */
-      uint i = 0;
-      SEL_TREE *tree = nullptr;
-      do {
-        op->array->value_to_item(i, value_item);
-        tree = get_mm_parts(param, op, field, Item_func::LT_FUNC, value_item);
-        if (!tree) break;
-        i++;
-      } while (i < op->array->used_count && tree->type == SEL_TREE::IMPOSSIBLE);
-
-      if (!tree || tree->type == SEL_TREE::IMPOSSIBLE)
-        /* We get here in cases like "t.unsigned NOT IN (-1,-2,-3) */
-        return nullptr;
-      SEL_TREE *tree2 = nullptr;
-      for (; i < op->array->used_count; i++) {
-        if (op->array->compare_elems(i, i - 1)) {
-          /* Get a SEL_TREE for "-inf < X < c_i" interval */
-          op->array->value_to_item(i, value_item);
-          tree2 =
-              get_mm_parts(param, op, field, Item_func::LT_FUNC, value_item);
-          if (!tree2) {
-            tree = nullptr;
-            break;
-          }
-
-          /* Change all intervals to be "c_{i-1} < X < c_i" */
-          for (uint idx = 0; idx < param->keys; idx++) {
-            SEL_ARG *last_val;
-            if (tree->keys[idx] && tree2->keys[idx] &&
-                ((last_val = tree->keys[idx]->root->last()))) {
-              SEL_ARG *new_interval = tree2->keys[idx]->root;
-              new_interval->min_value = last_val->max_value;
-              // We set the max value of the previous range as the beginning
-              // for this range interval. However we need values higher than
-              // this value:
-              // For ex: If the range is "not in (1,2)" we first construct
-              // X < 1 before this loop and add 1 < X < 2 in this loop and
-              // follow it up with X > 2 below.
-              // While fetching values for the second interval, we set
-              // "NEAR_MIN" flag so that we fetch values higher than "1".
-              // However, when the values specified are not compatible
-              // with the field that is being compared to, they are rounded
-              // off.
-              // For the example above, if the range given was "not in (0.9,
-              // 1.9)", range optimizer rounds of the values to (1,2). In such
-              // a case, setting the flag to "NEAR_MIN" is not right. Because
-              // we need values higher than "0.9" not "1". We check this
-              // before we set the flag below.
-              Item_basic_constant *val_item =
-                  op->array->create_item(param->old_root);
-              op->array->value_to_item(i - 1, val_item);
-              const int cmp_value =
-                  stored_field_cmp_to_item(param->thd, field, val_item);
-              if (cmp_value <= 0) new_interval->min_flag = NEAR_MIN;
-
-              /*
-                If the interval is over a partial keypart, the
-                interval must be "c_{i-1} <= X < c_i" instead of
-                "c_{i-1} < X < c_i". Reason:
-
-                Consider a table with a column "my_col VARCHAR(3)",
-                and an index with definition
-                "INDEX my_idx my_col(1)". If the table contains rows
-                with my_col values "f" and "foo", the index will not
-                distinguish the two rows.
-
-                Note that tree_or() below will effectively merge
-                this range with the range created for c_{i-1} and
-                we'll eventually end up with only one range:
-                "NULL < X".
-
-                Partitioning indexes are never partial.
-              */
-              if (param->using_real_indexes) {
-                const KEY key = param->table->key_info[param->real_keynr[idx]];
-                const KEY_PART_INFO *kpi = key.key_part + new_interval->part;
-
-                if (kpi->key_part_flag & HA_PART_KEY_SEG)
-                  new_interval->min_flag = 0;
-              }
-            }
-          }
-          /*
-            The following doesn't try to allocate memory so no need to
-            check for NULL.
-          */
-          tree = tree_or(param, tree, tree2);
-        }
-      }
-
-      if (tree && tree->type != SEL_TREE::IMPOSSIBLE) {
-        /*
-          Get the SEL_TREE for the last "c_last < X < +inf" interval
-          (value_item cotains c_last already)
-        */
-        tree2 = get_mm_parts(param, op, field, Item_func::GT_FUNC, value_item);
-        tree = tree_or(param, tree, tree2);
-      }
-      return tree;
-    } else {
-      SEL_TREE *tree = get_ne_mm_tree(param, op, field, op->arguments()[1],
-                                      op->arguments()[1]);
-      if (tree) {
-        Item **arg, **end;
-        for (arg = op->arguments() + 2, end = arg + op->argument_count() - 2;
-             arg < end; arg++) {
-          tree = tree_and(param, tree,
-                          get_ne_mm_tree(param, op, field, *arg, *arg));
-        }
-      }
-      return tree;
-    }
-    return nullptr;
-  }
-
-  // The expression is IN, not negated.
-  if (predicand->type() == Item::FIELD_ITEM) {
-    // The expression is (<column>) IN (...)
-    Field *field = static_cast<Item_field *>(predicand)->field;
-    SEL_TREE *tree =
-        get_mm_parts(param, op, field, Item_func::EQ_FUNC, op->arguments()[1]);
-    if (tree) {
-      Item **arg, **end;
-      for (arg = op->arguments() + 2, end = arg + op->argument_count() - 2;
-           arg < end; arg++) {
-        tree =
-            tree_or(param, tree,
-                    get_mm_parts(param, op, field, Item_func::EQ_FUNC, *arg));
-      }
-    }
-    return tree;
-  }
-  if (predicand->type() == Item::ROW_ITEM) {
-    /*
-      The expression is (<column>,...) IN (...)
-
-      We iterate over the rows on the rhs of the in predicate,
-      building an OR tree of ANDs, a.k.a. a DNF expression out of this. E.g:
-
-      (col1, col2) IN ((const1, const2), (const3, const4))
-      becomes
-      (col1 = const1 AND col2 = const2) OR (col1 = const3 AND col2 = const4)
-    */
-    SEL_TREE *or_tree = &null_sel_tree;
-    Item_row *row_predicand = static_cast<Item_row *>(predicand);
-
-    // Iterate over the rows on the rhs of the in predicate, building an OR.
-    for (uint i = 1; i < op->argument_count(); ++i) {
-      /*
-        We only support row value expressions. Some optimizations rewrite
-        the Item tree, and we don't handle that.
-      */
-      Item *in_list_item = op->arguments()[i];
-      if (in_list_item->type() != Item::ROW_ITEM) return nullptr;
-      Item_row *row = static_cast<Item_row *>(in_list_item);
-
-      // Iterate over the columns, building an AND tree.
-      SEL_TREE *and_tree = nullptr;
-      for (uint j = 0; j < row_predicand->cols(); ++j) {
-        Item *item = row_predicand->element_index(j);
-
-        // We only support columns in the row on the lhs of the in predicate.
-        if (item->type() != Item::FIELD_ITEM) return nullptr;
-        Field *field = static_cast<Item_field *>(item)->field;
-
-        Item *value = row->element_index(j);
-
-        SEL_TREE *and_expr =
-            get_mm_parts(param, op, field, Item_func::EQ_FUNC, value);
-
-        and_tree = tree_and(param, and_tree, and_expr);
-        /*
-          Short-circuit evaluation: If and_expr is NULL then no key part in
-          this disjunct can be used as a search key. Or in other words the
-          condition is always true. Hence the whole disjunction is always true.
-        */
-        if (and_tree == nullptr) return nullptr;
-      }
-      or_tree = tree_or(param, and_tree, or_tree);
-    }
-    return or_tree;
-  }
-  return nullptr;
-}
-
-/**
-  Factory function to build a SEL_TREE from a JSON_OVERLAPS or JSON_CONTAINS
-  functions
-
-  \verbatim
-    This function builds SEL_TREE out of JSON_OEVRLAPS() of form:
-      JSON_OVERLAPS(typed_array_field, "[<val>,...,<val>]")
-      JSON_OVERLAPS("[<val>,...,<val>]", typed_array_field)
-      JSON_CONTAINS(typed_array_field, "[<val>,...,<val>]")
-    where
-      typed_array_field is a field which has multi-valued index defined on it
-      <val>             each value in the array is coercible to the array's
-                        type
-    These conditions are pre-checked in substitute_gc().
-  \endverbatim
-  @param param      Information on 'just about everything'.
-  @param predicand  the typed array JSON_CONTAIN's argument
-  @param op         The 'JSON_OVERLAPS' operator itself.
-
-  @returns
-    non-NULL constructed SEL_TREE
-    NULL     in case of any error
-*/
-
-static SEL_TREE *get_func_mm_tree_from_json_overlaps_contains(
-    RANGE_OPT_PARAM *param, Item *predicand, Item_func *op) {
-  if (param->has_errors()) return nullptr;
-
-  // The expression is JSON_OVERLAPS(<array_field>,<JSON array/scalar>), or
-  // The expression is JSON_OVERLAPS(<JSON array/scalar>, <array_field>), or
-  // The expression is JSON_CONTAINS(<array_field>, <JSON array/scalar>)
-  if (predicand->type() == Item::FIELD_ITEM && predicand->returns_array()) {
-    Json_wrapper wr, elt;
-    String str;
-    uint values;
-    if (op->functype() == Item_func::JSON_OVERLAPS) {
-      // If the predicand is the 1st arg, then the values arg is 2nd.
-      values = (predicand == op->arguments()[0]) ? 1 : 0;
-    } else {
-      assert(op->functype() == Item_func::JSON_CONTAINS);
-      values = 1;
-    }
-    if (get_json_wrapper(op->arguments(), values, &str, op->func_name(), &wr))
-      return nullptr; /* purecov: inspected */
-
-    // Should be pre-checked already
-    assert(!(op->arguments()[values])->null_value &&
-           wr.type() != enum_json_type::J_OBJECT &&
-           wr.type() != enum_json_type::J_ERROR);
-    if (wr.length() == 0) return nullptr;
-
-    Field_typed_array *field = down_cast<Field_typed_array *>(
-        static_cast<Item_field *>(predicand)->field);
-    if (wr.type() == enum_json_type::J_ARRAY)
-      wr.remove_duplicates(
-          field->type() == MYSQL_TYPE_VARCHAR ? field->charset() : nullptr);
-    size_t i = 0;
-    const size_t len = (wr.type() == enum_json_type::J_ARRAY) ? wr.length() : 1;
-    // Skip leading JSON null values as they can't be indexed and thus doesn't
-    // exist in index.
-    while (i < len && wr[i].type() == enum_json_type::J_NULL) ++i;
-    // No non-null values were found.
-    if (i == len) return nullptr;
-
-    // Fake const table for get_mm_parts, as we're using constants from JSON
-    // array
-    const bool save_const = field->table->const_table;
-    field->table->const_table = true;
-
-    field->set_notnull();
-
-    // Get the SEL_ARG tree for the first non-null element..
-    elt = wr[i++];
-    field->coerce_json_value(&elt, true, nullptr);
-    SEL_TREE *tree = get_mm_parts(param, op, field, Item_func::EQ_FUNC,
-                                  static_cast<Item_field *>(predicand));
-    // .. and OR with others
-    if (tree) {
-      for (; i < len; i++) {
-        elt = wr[i];
-        field->coerce_json_value(&elt, true, nullptr);
-        tree = tree_or(param, tree,
-                       get_mm_parts(param, op, field, Item_func::EQ_FUNC,
-                                    static_cast<Item_field *>(predicand)));
-        if (!tree)  // OOM
-          break;
-      }
-    }
-    field->table->const_table = save_const;
-    return tree;
-  }
-  return nullptr;
-}
-
-/**
-  Build a SEL_TREE for a simple predicate.
-
-  @param param     PARAM from test_quick_select
-  @param predicand field in the predicate
-  @param cond_func item for the predicate
-  @param value     constant in the predicate
-  @param inv       true <> NOT cond_func is considered
-                  (makes sense only when cond_func is BETWEEN or IN)
-
-  @return Pointer to the built tree.
-
-  @todo Remove the appaling hack that 'value' can be a 1 cast to an Item*.
-*/
-
-static SEL_TREE *get_func_mm_tree(RANGE_OPT_PARAM *param, Item *predicand,
-                                  Item_func *cond_func, Item *value, bool inv) {
-  SEL_TREE *tree = nullptr;
-  DBUG_TRACE;
-
-  if (param->has_errors()) return nullptr;
-
-  switch (cond_func->functype()) {
-    case Item_func::XOR_FUNC:
-      return nullptr;  // Always true (don't use range access on XOR).
-      break;           // See WL#5800
-
-    case Item_func::NE_FUNC:
-      if (predicand->type() == Item::FIELD_ITEM) {
-        Field *field = static_cast<Item_field *>(predicand)->field;
-        tree = get_ne_mm_tree(param, cond_func, field, value, value);
-      }
-      break;
-
-    case Item_func::BETWEEN:
-      if (predicand->type() == Item::FIELD_ITEM) {
-        Field *field = static_cast<Item_field *>(predicand)->field;
-
-        if (!value) {
-          if (inv) {
-            tree = get_ne_mm_tree(param, cond_func, field,
-                                  cond_func->arguments()[1],
-                                  cond_func->arguments()[2]);
-          } else {
-            tree = get_mm_parts(param, cond_func, field, Item_func::GE_FUNC,
-                                cond_func->arguments()[1]);
-            if (tree) {
-              tree = tree_and(
-                  param, tree,
-                  get_mm_parts(param, cond_func, field, Item_func::LE_FUNC,
-                               cond_func->arguments()[2]));
-            }
-          }
-        } else
-          tree = get_mm_parts(
-              param, cond_func, field,
-              (inv ? (value == reinterpret_cast<Item *>(1) ? Item_func::GT_FUNC
-                                                           : Item_func::LT_FUNC)
-                   : (value == reinterpret_cast<Item *>(1)
-                          ? Item_func::LE_FUNC
-                          : Item_func::GE_FUNC)),
-              cond_func->arguments()[0]);
-      }
-      break;
-    case Item_func::IN_FUNC: {
-      Item_func_in *in_pred = down_cast<Item_func_in *>(cond_func);
-      tree = get_func_mm_tree_from_in_predicate(param, predicand, in_pred, inv);
-    } break;
-    case Item_func::JSON_CONTAINS:
-    case Item_func::JSON_OVERLAPS: {
-      tree = get_func_mm_tree_from_json_overlaps_contains(param, predicand,
-                                                          cond_func);
-    } break;
-    default:
-      if (predicand->type() == Item::FIELD_ITEM) {
-        Field *field = static_cast<Item_field *>(predicand)->field;
-
-        /*
-           Here the function for the following predicates are processed:
-           <, <=, =, >=, >, LIKE, IS NULL, IS NOT NULL and GIS functions.
-           If the predicate is of the form (value op field) it is handled
-           as the equivalent predicate (field rev_op value), e.g.
-           2 <= a is handled as a >= 2.
-        */
-        Item_func::Functype func_type =
-            (value != cond_func->arguments()[0])
-                ? cond_func->functype()
-                : ((Item_bool_func2 *)cond_func)->rev_functype();
-        tree = get_mm_parts(param, cond_func, field, func_type, value);
-      }
-  }
-
-  return tree;
-}
-
-/*
-  Build conjunction of all SEL_TREEs for a simple predicate applying equalities
-
-  SYNOPSIS
-    get_full_func_mm_tree()
-      param       PARAM from test_quick_select
-      predicand   column or row constructor in the predicate's left-hand side.
-      op          Item for the predicate operator
-      value       constant in the predicate (or a field already read from
-                  a table in the case of dynamic range access)
-                  For BETWEEN it contains the number of the field argument.
-      inv         If true, the predicate is negated, e.g. NOT IN.
-                  (makes sense only when cond_func is BETWEEN or IN)
-
-  DESCRIPTION
-    For a simple SARGable predicate of the form (f op c), where f is a field and
-    c is a constant, the function builds a conjunction of all SEL_TREES that can
-    be obtained by the substitution of f for all different fields equal to f.
-
-  NOTES
-    If the WHERE condition contains a predicate (fi op c),
-    then not only SELL_TREE for this predicate is built, but
-    the trees for the results of substitution of fi for
-    each fj belonging to the same multiple equality as fi
-    are built as well.
-    E.g. for WHERE t1.a=t2.a AND t2.a > 10
-    a SEL_TREE for t2.a > 10 will be built for quick select from t2
-    and
-    a SEL_TREE for t1.a > 10 will be built for quick select from t1.
-
-    A BETWEEN predicate of the form (fi [NOT] BETWEEN c1 AND c2) is treated
-    in a similar way: we build a conjuction of trees for the results
-    of all substitutions of fi for equal fj.
-    Yet a predicate of the form (c BETWEEN f1i AND f2i) is processed
-    differently. It is considered as a conjuction of two SARGable
-    predicates (f1i <= c) and (f2i <=c) and the function get_full_func_mm_tree
-    is called for each of them separately producing trees for
-       AND j (f1j <=c ) and AND j (f2j <= c)
-    After this these two trees are united in one conjunctive tree.
-    It's easy to see that the same tree is obtained for
-       AND j,k (f1j <=c AND f2k<=c)
-    which is equivalent to
-       AND j,k (c BETWEEN f1j AND f2k).
-    The validity of the processing of the predicate (c NOT BETWEEN f1i AND f2i)
-    which equivalent to (f1i > c OR f2i < c) is not so obvious. Here the
-    function get_full_func_mm_tree is called for (f1i > c) and (f2i < c)
-    producing trees for AND j (f1j > c) and AND j (f2j < c). Then this two
-    trees are united in one OR-tree. The expression
-      (AND j (f1j > c) OR AND j (f2j < c)
-    is equivalent to the expression
-      AND j,k (f1j > c OR f2k < c)
-    which is just a translation of
-      AND j,k (c NOT BETWEEN f1j AND f2k)
-
-    In the cases when one of the items f1, f2 is a constant c1 we do not create
-    a tree for it at all. It works for BETWEEN predicates but does not
-    work for NOT BETWEEN predicates as we have to evaluate the expression
-    with it. If it is true then the other tree can be completely ignored.
-    We do not do it now and no trees are built in these cases for
-    NOT BETWEEN predicates.
-
-    As to IN predicates only ones of the form (f IN (c1,...,cn)),
-    where f1 is a field and c1,...,cn are constant, are considered as
-    SARGable. We never try to narrow the index scan using predicates of
-    the form (c IN (c1,...,f,...,cn)).
-
-  RETURN
-    Pointer to the tree representing the built conjunction of SEL_TREEs
-*/
-
-static SEL_TREE *get_full_func_mm_tree(RANGE_OPT_PARAM *param, Item *predicand,
-                                       Item_func *op, Item *value, bool inv) {
-  SEL_TREE *tree = nullptr;
-  SEL_TREE *ftree = nullptr;
-  const table_map param_comp =
-      ~(param->prev_tables | param->read_tables | param->current_table);
-  DBUG_TRACE;
-
-  if (param->has_errors()) return nullptr;
-
-  /*
-    Here we compute a set of tables that we consider as constants
-    suppliers during execution of the SEL_TREE that we produce below.
-  */
-  table_map ref_tables = 0;
-  for (uint i = 0; i < op->arg_count; i++) {
-    Item *arg = op->arguments()[i]->real_item();
-    if (arg != predicand) ref_tables |= arg->used_tables();
-  }
-  if (predicand->type() == Item::FIELD_ITEM) {
-    Item_field *item_field = static_cast<Item_field *>(predicand);
-    Field *field = item_field->field;
-
-    if (!((ref_tables | item_field->table_ref->map()) & param_comp))
-      ftree = get_func_mm_tree(param, predicand, op, value, inv);
-    Item_equal *item_equal = item_field->item_equal;
-    if (item_equal != nullptr) {
-      Item_equal_iterator it(*item_equal);
-      Item_field *item;
-      while ((item = it++)) {
-        Field *f = item->field;
-        if (!field->eq(f) &&
-            !((ref_tables | item->table_ref->map()) & param_comp)) {
-          tree = get_func_mm_tree(param, item, op, value, inv);
-          ftree = !ftree ? tree : tree_and(param, ftree, tree);
-        }
-      }
-    }
-  } else if (predicand->type() == Item::ROW_ITEM) {
-    ftree = get_func_mm_tree(param, predicand, op, value, inv);
-    return ftree;
-  }
-  return ftree;
-}
-
-/**
-  The Range Analysis Module, which finds range access alternatives
-  applicable to single or multi-index (UNION) access. The function
-  does not calculate or care about the cost of the different
-  alternatives.
-
-  get_mm_tree() employs a relaxed boolean algebra where the solution
-  may be bigger than what the rules of boolean algebra accept. In
-  other words, get_mm_tree() may return range access plans that will
-  read more rows than the input conditions dictate. In it's simplest
-  form, consider a condition on two fields indexed by two different
-  indexes:
-
-     "WHERE fld1 > 'x' AND fld2 > 'y'"
-
-  In this case, there are two single-index range access alternatives.
-  No matter which access path is chosen, rows that are not in the
-  result set may be read.
-
-  In the case above, get_mm_tree() will create range access
-  alternatives for both indexes, so boolean algebra is still correct.
-  In other cases, however, the conditions are too complex to be used
-  without relaxing the rules. This typically happens when ORing a
-  conjunction to a multi-index disjunctions (@see e.g.
-  imerge_list_or_tree()). When this happens, the range optimizer may
-  choose to ignore conjunctions (any condition connected with AND). The
-  effect of this is that the result includes a "bigger" solution than
-  neccessary. This is OK since all conditions will be used as filters
-  after row retrieval.
-
-  @see SEL_TREE::keys and SEL_TREE::merges for details of how single
-  and multi-index range access alternatives are stored.
-*/
-SEL_TREE *get_mm_tree(RANGE_OPT_PARAM *param, Item *cond) {
-  SEL_TREE *tree = nullptr;
-  SEL_TREE *ftree = nullptr;
-  Item_field *field_item = nullptr;
-  bool inv = false;
-  Item *value = nullptr;
-  DBUG_TRACE;
-
-  if (param->has_errors()) return nullptr;
-
-  if (cond->type() == Item::COND_ITEM) {
-    List_iterator<Item> li(*((Item_cond *)cond)->argument_list());
-
-    if (((Item_cond *)cond)->functype() == Item_func::COND_AND_FUNC) {
-      tree = nullptr;
-      Item *item;
-      while ((item = li++)) {
-        SEL_TREE *new_tree = get_mm_tree(param, item);
-        if (param->has_errors()) return nullptr;
-        tree = tree_and(param, tree, new_tree);
-        dbug_print_tree("after_and", tree, param);
-        if (tree && tree->type == SEL_TREE::IMPOSSIBLE) break;
-      }
-    } else {  // Item OR
-      tree = get_mm_tree(param, li++);
-      if (param->has_errors()) return nullptr;
-      if (tree) {
-        Item *item;
-        while ((item = li++)) {
-          SEL_TREE *new_tree = get_mm_tree(param, item);
-          if (new_tree == nullptr || param->has_errors()) return nullptr;
-          tree = tree_or(param, tree, new_tree);
-          dbug_print_tree("after_or", tree, param);
-          if (tree == nullptr || tree->type == SEL_TREE::ALWAYS) break;
-        }
-      }
-    }
-    dbug_print_tree("tree_returned", tree, param);
-    return tree;
-  }
-  if (cond->const_item() && !cond->is_expensive()) {
-    /*
-      During the cond->val_int() evaluation we can come across a subselect
-      item which may allocate memory on the thd->mem_root and assumes
-      all the memory allocated has the same life span as the subselect
-      item itself. So we have to restore the thread's mem_root here.
-    */
-    MEM_ROOT *tmp_root = param->mem_root;
-    param->thd->mem_root = param->old_root;
-    const SEL_TREE::Type type =
-        cond->val_int() ? SEL_TREE::ALWAYS : SEL_TREE::IMPOSSIBLE;
-    tree = new (tmp_root) SEL_TREE(type, tmp_root, param->keys);
-
-    param->thd->mem_root = tmp_root;
-    if (param->has_errors()) return nullptr;
-    dbug_print_tree("tree_returned", tree, param);
-    return tree;
-  }
-
-  table_map ref_tables = 0;
-  table_map param_comp =
-      ~(param->prev_tables | param->read_tables | param->current_table);
-  if (cond->type() != Item::FUNC_ITEM) {  // Should be a field
-    ref_tables = cond->used_tables();
-    if ((ref_tables & param->current_table) ||
-        (ref_tables & ~(param->prev_tables | param->read_tables)))
-      return nullptr;
-    return new (param->mem_root)
-        SEL_TREE(SEL_TREE::MAYBE, param->mem_root, param->keys);
-  }
-
-  Item_func *cond_func = (Item_func *)cond;
-  if (cond_func->functype() == Item_func::BETWEEN ||
-      cond_func->functype() == Item_func::IN_FUNC)
-    inv = ((Item_func_opt_neg *)cond_func)->negated;
-  else {
-    /*
-      During the cond_func->select_optimize() evaluation we can come across a
-      subselect item which may allocate memory on the thd->mem_root and assumes
-      all the memory allocated has the same life span as the subselect item
-      itself. So we have to restore the thread's mem_root here.
-    */
-    MEM_ROOT *tmp_root = param->mem_root;
-    param->thd->mem_root = param->old_root;
-    Item_func::optimize_type opt_type = cond_func->select_optimize(param->thd);
-    param->thd->mem_root = tmp_root;
-    if (opt_type == Item_func::OPTIMIZE_NONE) return nullptr;
-  }
-
-  param->cond = cond;
-
-  /*
-    Notice that all fields that are outer references are const during
-    the execution and should not be considered for range analysis like
-    fields coming from the local query block are.
-  */
-  switch (cond_func->functype()) {
-    case Item_func::BETWEEN: {
-      Item *const arg_left = cond_func->arguments()[0];
-
-      if (!arg_left->is_outer_reference() &&
-          arg_left->real_item()->type() == Item::FIELD_ITEM) {
-        field_item = (Item_field *)arg_left->real_item();
-        ftree =
-            get_full_func_mm_tree(param, field_item, cond_func, nullptr, inv);
-      }
-
-      /*
-        Concerning the code below see the NOTES section in
-        the comments for the function get_full_func_mm_tree()
-      */
-      for (uint i = 1; i < cond_func->arg_count; i++) {
-        Item *const arg = cond_func->arguments()[i];
-
-        if (!arg->is_outer_reference() &&
-            arg->real_item()->type() == Item::FIELD_ITEM) {
-          field_item = (Item_field *)arg->real_item();
-          SEL_TREE *tmp = get_full_func_mm_tree(
-              param, field_item, cond_func, reinterpret_cast<Item *>(i), inv);
-          if (inv) {
-            tree = !tree ? tmp : tree_or(param, tree, tmp);
-            if (tree == nullptr) break;
-          } else
-            tree = tree_and(param, tree, tmp);
-        } else if (inv) {
-          tree = nullptr;
-          break;
-        }
-      }
-
-      ftree = tree_and(param, ftree, tree);
-      break;
-    }  // end case Item_func::BETWEEN
-
-    case Item_func::JSON_CONTAINS:
-    case Item_func::JSON_OVERLAPS:
-    case Item_func::IN_FUNC: {
-      Item *predicand = cond_func->key_item();
-      if (!predicand) return nullptr;
-      predicand = predicand->real_item();
-      if (predicand->type() != Item::FIELD_ITEM &&
-          predicand->type() != Item::ROW_ITEM)
-        return nullptr;
-      ftree = get_full_func_mm_tree(param, predicand, cond_func, nullptr, inv);
-      break;
-    }  // end case Item_func::IN_FUNC
-
-    case Item_func::MULT_EQUAL_FUNC: {
-      Item_equal *item_equal = (Item_equal *)cond;
-      if (!(value = item_equal->get_const())) return nullptr;
-      Item_equal_iterator it(*item_equal);
-      ref_tables = value->used_tables();
-      while ((field_item = it++)) {
-        Field *field = field_item->field;
-        if (!((ref_tables | field_item->table_ref->map()) & param_comp)) {
-          tree =
-              get_mm_parts(param, item_equal, field, Item_func::EQ_FUNC, value);
-          ftree = !ftree ? tree : tree_and(param, ftree, tree);
-        }
-      }
-
-      dbug_print_tree("tree_returned", ftree, param);
-      return ftree;
-    }  // end case Item_func::MULT_EQUAL_FUNC
-
-    default: {
-      Item *const arg_left = cond_func->arguments()[0];
-
-      assert(!ftree);
-      if (!arg_left->is_outer_reference() &&
-          arg_left->real_item()->type() == Item::FIELD_ITEM) {
-        field_item = (Item_field *)arg_left->real_item();
-        value = cond_func->arg_count > 1 ? cond_func->arguments()[1] : nullptr;
-        ftree = get_full_func_mm_tree(param, field_item, cond_func, value, inv);
-      }
-      /*
-        Even if get_full_func_mm_tree() was executed above and did not
-        return a range predicate it may still be possible to create one
-        by reversing the order of the operands. Note that this only
-        applies to predicates where both operands are fields. Example: A
-        query of the form
-
-           WHERE t1.a OP t2.b
-
-        In this case, arguments()[0] == t1.a and arguments()[1] == t2.b.
-        When creating range predicates for t2, get_full_func_mm_tree()
-        above will return NULL because 'field' belongs to t1 and only
-        predicates that applies to t2 are of interest. In this case a
-        call to get_full_func_mm_tree() with reversed operands (see
-        below) may succeed.
-      */
-      Item *arg_right;
-      if (!ftree && cond_func->have_rev_func() &&
-          (arg_right = cond_func->arguments()[1]) &&
-          !arg_right->is_outer_reference() &&
-          arg_right->real_item()->type() == Item::FIELD_ITEM) {
-        field_item = (Item_field *)arg_right->real_item();
-        value = arg_left;
-        ftree = get_full_func_mm_tree(param, field_item, cond_func, value, inv);
-      }
-    }  // end case default
-  }    // end switch
-
-  dbug_print_tree("tree_returned", ftree, param);
-  return ftree;
-}
-
-/**
-  Test whether a comparison operator is a spatial comparison
-  operator, i.e. Item_func::SP_*.
-
-  Used to check if range access using operator 'op_type' is applicable
-  for a non-spatial index.
-
-  @param   op_type  The comparison operator.
-  @return  true if 'op_type' is a spatial comparison operator, false otherwise.
-
-*/
-static bool is_spatial_operator(Item_func::Functype op_type) {
-  switch (op_type) {
-    case Item_func::SP_EQUALS_FUNC:
-    case Item_func::SP_DISJOINT_FUNC:
-    case Item_func::SP_INTERSECTS_FUNC:
-    case Item_func::SP_TOUCHES_FUNC:
-    case Item_func::SP_CROSSES_FUNC:
-    case Item_func::SP_WITHIN_FUNC:
-    case Item_func::SP_CONTAINS_FUNC:
-    case Item_func::SP_COVEREDBY_FUNC:
-    case Item_func::SP_COVERS_FUNC:
-    case Item_func::SP_OVERLAPS_FUNC:
-    case Item_func::SP_STARTPOINT:
-    case Item_func::SP_ENDPOINT:
-    case Item_func::SP_EXTERIORRING:
-    case Item_func::SP_POINTN:
-    case Item_func::SP_GEOMETRYN:
-    case Item_func::SP_INTERIORRINGN:
-      return true;
-    default:
-      return false;
-  }
-}
-
-bool comparable_in_index(Item *cond_func, const Field *field,
-                         const Field::imagetype itype,
-                         Item_func::Functype comp_type, const Item *value) {
-  /*
-    Usually an index cannot be used if the column collation differs
-    from the operation collation. However, a case insensitive index
-    may be used for some binary searches:
-
-       WHERE latin1_swedish_ci_column = 'a' COLLATE lati1_bin;
-       WHERE latin1_swedish_ci_colimn = BINARY 'a '
-  */
-  if ((field->result_type() == STRING_RESULT &&
-       field->match_collation_to_optimize_range() &&
-       value->result_type() == STRING_RESULT && itype == Field::itRAW &&
-       field->charset() != cond_func->compare_collation() &&
-       !((comp_type == Item_func::EQUAL_FUNC ||
-          comp_type == Item_func::EQ_FUNC) &&
-         cond_func->compare_collation()->state & MY_CS_BINSORT)))
-    return false;
-
-  /*
-    Temporal values: Cannot use range access if:
-       'indexed_varchar_column = temporal_value'
-    because there are many ways to represent the same date as a
-    string. A few examples: "01-01-2001", "1-1-2001", "2001-01-01",
-    "2001#01#01". The same problem applies to time. Thus, we cannot
-    create a useful range predicate for temporal values into VARCHAR
-    column indexes.
-  */
-  if (field->result_type() == STRING_RESULT &&
-      !is_temporal_type(field->type()) && value->is_temporal())
-    return false;
-
-  /*
-    Temporal values: Cannot use range access if IndexedTimeComparedToDate:
-       'indexed_time = temporal_value_with_date_part'
-    because:
-      - without index, a TIME column with value '48:00:00' is
-        equal to a DATETIME column with value
-        'CURDATE() + 2 days'
-      - with range access into the TIME column, CURDATE() + 2
-        days becomes "00:00:00" (Field_timef::store_internal()
-        simply extracts the time part from the datetime) which
-        is a lookup key which does not match "48:00:00". On the other
-        hand, we can do ref access for IndexedDatetimeComparedToTime
-        because Field_temporal_with_date::store_time() will convert
-        48:00:00 to CURDATE() + 2 days which is the correct lookup
-        key.
-  */
-  if (field_time_cmp_date(field, value)) return false;
-
-  /*
-    We can't always use indexes when comparing a string index to a
-    number. cmp_type() is checked to allow comparison of dates and
-    numbers.
-  */
-  if (field->result_type() == STRING_RESULT &&
-      value->result_type() != STRING_RESULT &&
-      field->cmp_type() != value->result_type())
-    return false;
-
-  /*
-    We can't use indexes when comparing to a JSON value. For example,
-    the string '{}' should compare equal to the JSON string "{}". If
-    we use a string index to compare the two strings, we will be
-    comparing '{}' and '"{}"', which don't compare equal.
-    The only exception is Item_json, which is a basic const item and is
-    used to contain value coerced to index's type.
-  */
-  if (value->result_type() == STRING_RESULT &&
-      value->data_type() == MYSQL_TYPE_JSON && !value->basic_const_item())
-    return false;
-
-  return true;
-}
-
-static SEL_TREE *get_mm_parts(RANGE_OPT_PARAM *param, Item_func *cond_func,
-                              Field *field, Item_func::Functype type,
-                              Item *value) {
-  DBUG_TRACE;
-
-  if (param->has_errors()) return nullptr;
-
-  if (field->table != param->table) return nullptr;
-
-  KEY_PART *key_part = param->key_parts;
-  KEY_PART *end = param->key_parts_end;
-  SEL_TREE *tree = nullptr;
-  if (value &&
-      value->used_tables() & ~(param->prev_tables | param->read_tables))
-    return nullptr;
-  for (; key_part != end; key_part++) {
-    if (field->eq(key_part->field)) {
-      /*
-        Cannot do range access for spatial operators when a
-        non-spatial index is used.
-      */
-      if (key_part->image_type != Field::itMBR &&
-          is_spatial_operator(cond_func->functype()))
-        continue;
-
-      SEL_ROOT *sel_root = nullptr;
-      if (!tree && !(tree = new (param->mem_root)
-                         SEL_TREE(param->mem_root, param->keys)))
-        return nullptr;  // OOM
-      if (!value || !(value->used_tables() & ~param->read_tables)) {
-        sel_root = get_mm_leaf(param, cond_func, key_part->field, key_part,
-                               type, value);
-        if (!sel_root) continue;
-        if (sel_root->type == SEL_ROOT::Type::IMPOSSIBLE) {
-          tree->type = SEL_TREE::IMPOSSIBLE;
-          return tree;
-        }
-      } else {
-        /*
-          The index may not be used by dynamic range access unless
-          'field' and 'value' are comparable.
-        */
-        if (!comparable_in_index(cond_func, key_part->field,
-                                 key_part->image_type, type, value)) {
-          warn_index_not_applicable(param, key_part->key, field);
-          return nullptr;
-        }
-
-        if (!(sel_root = new (param->mem_root)
-                  SEL_ROOT(param->mem_root, SEL_ROOT::Type::MAYBE_KEY)))
-          return nullptr;  // OOM
-      }
-      sel_root->root->part = (uchar)key_part->part;
-      tree->set_key(key_part->key,
-                    sel_add(tree->release_key(key_part->key), sel_root));
-      tree->keys_map.set_bit(key_part->key);
-    }
-  }
-
-  if (tree && tree->merges.is_empty() && tree->keys_map.is_clear_all())
-    tree = nullptr;
-  return tree;
-}
-
-/**
-  Saves 'value' in 'field' and handles potential type conversion
-  problems.
-
-  @param [out] tree                 The SEL_ROOT leaf under construction. If
-                                    an always false predicate is found it is
-                                    modified to point to a SEL_ROOT with
-                                    type == SEL_ROOT::Type::IMPOSSIBLE.
-  @param value                      The Item that contains a value that shall
-                                    be stored in 'field'.
-  @param comp_op                    Comparison operator: >, >=, <=> etc.
-  @param field                      The field that 'value' is stored into.
-  @param [out] impossible_cond_cause Set to a descriptive string if an
-                                    impossible condition is found.
-  @param memroot                    Memroot for creation of new SEL_ARG.
-  @param query_block                 Query block the field is part of
-
-  @retval false  if saving went fine and it makes sense to continue
-                 optimizing for this predicate.
-  @retval true   if always true/false predicate was found, in which
-                 case 'tree' has been modified to reflect this: NULL
-                 pointer if always true, SEL_ARG with type IMPOSSIBLE
-                 if always false.
-*/
-static bool save_value_and_handle_conversion(SEL_ROOT **tree, Item *value,
-                                             const Item_func::Functype comp_op,
-                                             Field *field,
-                                             const char **impossible_cond_cause,
-                                             MEM_ROOT *memroot,
-                                             Query_block *query_block) {
-  // A SEL_ARG should not have been created for this predicate yet.
-  assert(*tree == nullptr);
-
-  THD *const thd = current_thd;
-
-  if (!(value->const_item() || thd->lex->is_query_tables_locked())) {
-    /*
-      We cannot evaluate the value yet (i.e. required tables are not yet
-      locked.)
-      This is the case of prune_partitions() called during
-      Query_block::prepare().
-    */
-    return true;
-  }
-
-  /*
-    Don't evaluate subqueries during optimization if they are disabled. This
-    function can be called during execution when doing dynamic range access, and
-    we only want to disable subquery evaluation during optimization, so check if
-    we're in the optimization phase by calling Query_expression::is_optimized().
-  */
-  if (!query_block->master_query_expression()->is_optimized() &&
-      !evaluate_during_optimization(value, query_block))
-    return true;
-
-  // For comparison purposes allow invalid dates like 2000-01-32
-  const sql_mode_t orig_sql_mode = thd->variables.sql_mode;
-  thd->variables.sql_mode |= MODE_INVALID_DATES;
-
-  /*
-    We want to change "field > value" to "field OP V"
-    where:
-    * V is what is in "field" after we stored "value" in it via
-    save_in_field_no_warning() (such store operation may have done
-    rounding...)
-    * OP is > or >=, depending on what's correct.
-    For example, if c is an INT column,
-    "c > 2.9" is changed to "c OP 3"
-    where OP is ">=" (">" would not be correct, as 3 > 2.9, a comparison
-    done with stored_field_cmp_to_item()). And
-    "c > 3.1" is changed to "c OP 3" where OP is ">" (3 < 3.1...).
-  */
-
-  // Note that value may be a stored function call, executed here.
-  const type_conversion_status err =
-      value->save_in_field_no_warnings(field, true);
-  thd->variables.sql_mode = orig_sql_mode;
-
-  switch (err) {
-    case TYPE_OK:
-    case TYPE_NOTE_TRUNCATED:
-    case TYPE_WARN_TRUNCATED:
-      return false;
-    case TYPE_WARN_INVALID_STRING:
-      /*
-        An invalid string does not produce any rows when used with
-        equality operator.
-      */
-      if (comp_op == Item_func::EQUAL_FUNC || comp_op == Item_func::EQ_FUNC) {
-        *impossible_cond_cause = "invalid_characters_in_string";
-        goto impossible_cond;
-      }
-      /*
-        For other operations on invalid strings, we assume that the range
-        predicate is always true and let evaluate_join_record() decide
-        the outcome.
-      */
-      return true;
-    case TYPE_ERR_BAD_VALUE:
-      /*
-        In the case of incompatible values, MySQL's SQL dialect has some
-        strange interpretations. For example,
-
-            "int_col > 'foo'" is interpreted as "int_col > 0"
-
-        instead of always false. Because of this, we assume that the
-        range predicate is always true instead of always false and let
-        evaluate_join_record() decide the outcome.
-      */
-      return true;
-    case TYPE_ERR_NULL_CONSTRAINT_VIOLATION:
-      // Checking NULL value on a field that cannot contain NULL.
-      *impossible_cond_cause = "null_field_in_non_null_column";
-      goto impossible_cond;
-    case TYPE_WARN_OUT_OF_RANGE:
-      /*
-        value to store was either higher than field::max_value or lower
-        than field::min_value. The field's max/min value has been stored
-        instead.
-      */
-      if (comp_op == Item_func::EQUAL_FUNC || comp_op == Item_func::EQ_FUNC) {
-        /*
-          Independent of data type, "out_of_range_value =/<=> field" is
-          always false.
-        */
-        *impossible_cond_cause = "value_out_of_range";
-        goto impossible_cond;
-      }
-
-      // If the field is numeric, we can interpret the out of range value.
-      if ((field->type() != FIELD_TYPE_BIT) &&
-          (field->result_type() == REAL_RESULT ||
-           field->result_type() == INT_RESULT ||
-           field->result_type() == DECIMAL_RESULT)) {
-        /*
-          value to store was higher than field::max_value if
-             a) field has a value greater than 0, or
-             b) if field is unsigned and has a negative value (which, when
-                cast to unsigned, means some value higher than LLONG_MAX).
-        */
-        if ((field->val_int() > 0) ||                        // a)
-            (field->is_unsigned() && field->val_int() < 0))  // b)
-        {
-          if (comp_op == Item_func::LT_FUNC || comp_op == Item_func::LE_FUNC) {
-            /*
-              '<' or '<=' compared to a value higher than the field
-              can store is always true.
-            */
-            return true;
-          }
-          if (comp_op == Item_func::GT_FUNC || comp_op == Item_func::GE_FUNC) {
-            /*
-              '>' or '>=' compared to a value higher than the field can
-              store is always false.
-            */
-            *impossible_cond_cause = "value_out_of_range";
-            goto impossible_cond;
-          }
-        } else  // value is lower than field::min_value
-        {
-          if (comp_op == Item_func::GT_FUNC || comp_op == Item_func::GE_FUNC) {
-            /*
-              '>' or '>=' compared to a value lower than the field
-              can store is always true.
-            */
-            return true;
-          }
-          if (comp_op == Item_func::LT_FUNC || comp_op == Item_func::LE_FUNC) {
-            /*
-              '<' or '=' compared to a value lower than the field can
-              store is always false.
-            */
-            *impossible_cond_cause = "value_out_of_range";
-            goto impossible_cond;
-          }
-        }
-      }
-      /*
-        Value is out of range on a datatype where it can't be decided if
-        it was underflow or overflow. It is therefore not possible to
-        determine whether or not the condition is impossible or always
-        true and we have to assume always true.
-      */
-      return true;
-    case TYPE_NOTE_TIME_TRUNCATED:
-      if (field->type() == FIELD_TYPE_DATE &&
-          (comp_op == Item_func::GT_FUNC || comp_op == Item_func::GE_FUNC ||
-           comp_op == Item_func::LT_FUNC || comp_op == Item_func::LE_FUNC)) {
-        /*
-          We were saving DATETIME into a DATE column, the conversion went ok
-          but a non-zero time part was cut off.
-
-          In MySQL's SQL dialect, DATE and DATETIME are compared as datetime
-          values. Index over a DATE column uses DATE comparison. Changing
-          from one comparison to the other is possible:
-
-          datetime(date_col)< '2007-12-10 12:34:55' -> date_col<='2007-12-10'
-          datetime(date_col)<='2007-12-10 12:34:55' -> date_col<='2007-12-10'
-
-          datetime(date_col)> '2007-12-10 12:34:55' -> date_col>='2007-12-10'
-          datetime(date_col)>='2007-12-10 12:34:55' -> date_col>='2007-12-10'
-
-          but we'll need to convert '>' to '>=' and '<' to '<='. This will
-          be done together with other types at the end of get_mm_leaf()
-          (grep for stored_field_cmp_to_item)
-        */
-        return false;
-      }
-      if (comp_op == Item_func::EQ_FUNC || comp_op == Item_func::EQUAL_FUNC) {
-        // Equality comparison is always false when time info has been
-        // truncated.
-        goto impossible_cond;
-      }
-      return true;
-    case TYPE_ERR_OOM:
-      return true;
-      /*
-        No default here to avoid adding new conversion status codes that are
-        unhandled in this function.
-      */
-  }
-
-  assert(false);  // Should never get here.
-
-impossible_cond:
-  *tree = new (memroot) SEL_ROOT(memroot, SEL_ROOT::Type::IMPOSSIBLE);
-  return true;
-}
-
-#ifndef NDEBUG
-
-/**
-  Debugging function to print out a SEL_ROOT and everything it points to,
-  recursively. Used only when tracking bugs in the range optimizer
-  (for printf debugging); will not normally have any calls to it.
- */
-static void debug_print_tree(SEL_ROOT *origin) MY_ATTRIBUTE((unused));
-
-static void debug_print_tree(SEL_ROOT *origin) {
-  if (!origin) return;
-
-  std::set<SEL_ROOT *> seen;
-  std::queue<SEL_ROOT *> to_print;
-
-  to_print.push(origin);
-  while (!to_print.empty()) {
-    SEL_ROOT *key = to_print.front();
-    to_print.pop();
-    if (seen.count(key)) continue;
-
-    printf("Printing %p:\n", key);
-    for (SEL_ARG *arg = key->root->first(); arg; arg = arg->next) {
-      printf("  %p (next_key_part=%p)  ", arg, arg->next_key_part);
-      if (arg->next_key_part) to_print.push(arg->next_key_part);
-
-      String tmp;
-      tmp.length(0);
-      KEY_PART_INFO fake_key_part;
-      fake_key_part.field = arg->field;
-      fake_key_part.length = 0;
-      append_range(&tmp, &fake_key_part, arg->min_value, arg->max_value,
-                   arg->min_flag | arg->max_flag);
-      printf("%s\n", tmp.ptr());
-    }
-    printf("\n");
-  }
-}
-
-#endif  // !defined(NDEBUG)
-
-static SEL_ROOT *get_mm_leaf(RANGE_OPT_PARAM *param, Item *conf_func,
-                             Field *field, KEY_PART *key_part,
-                             Item_func::Functype type, Item *value) {
-  const size_t null_bytes = field->is_nullable() ? 1 : 0;
-  bool optimize_range;
-  SEL_ROOT *tree = nullptr;
-  MEM_ROOT *alloc = param->mem_root;
-  uchar *str;
-  const char *impossible_cond_cause = nullptr;
-  DBUG_TRACE;
-
-  if (param->has_errors()) goto end;
-
-  /*
-    We need to restore the runtime mem_root of the thread in this
-    function because it evaluates the value of its argument, while
-    the argument can be any, e.g. a subselect. The subselect
-    items, in turn, assume that all the memory allocated during
-    the evaluation has the same life span as the item itself.
-    TODO: opt_range.cc should not reset thd->mem_root at all.
-  */
-  param->thd->mem_root = param->old_root;
-  if (!value)  // IS NULL or IS NOT NULL
-  {
-    if (field->table->pos_in_table_list->outer_join)
-      /*
-        Range scan cannot be used to scan the inner table of an outer
-        join if the predicate is IS NULL.
-      */
-      goto end;
-    if (!field->is_nullable())  // NOT NULL column
-    {
-      if (type == Item_func::ISNULL_FUNC)
-        tree =
-            new (alloc) SEL_ROOT(param->mem_root, SEL_ROOT::Type::IMPOSSIBLE);
-      goto end;
-    }
-    uchar *null_string =
-        static_cast<uchar *>(alloc->Alloc(key_part->store_length + 1));
-    if (!null_string) goto end;  // out of memory
-
-    TRASH(null_string, key_part->store_length + 1);
-    memcpy(null_string, is_null_string, sizeof(is_null_string));
-
-    SEL_ARG *root;
-    if (!(root = new (alloc) SEL_ARG(field, null_string, null_string,
-                                     !(key_part->flag & HA_REVERSE_SORT))))
-      goto end;                                          // out of memory
-    if (!(tree = new (alloc) SEL_ROOT(root))) goto end;  // out of memory
-    if (type == Item_func::ISNOTNULL_FUNC) {
-      root->min_flag = NEAR_MIN; /* IS NOT NULL ->  X > NULL */
-      root->max_flag = NO_MAX_RANGE;
-    }
-    goto end;
-  }
-
-  /*
-    The range access method cannot be used unless 'field' and 'value'
-    are comparable in the index. Examples of non-comparable
-    field/values: different collation, DATETIME vs TIME etc.
-  */
-  if (!comparable_in_index(conf_func, field, key_part->image_type, type,
-                           value)) {
-    warn_index_not_applicable(param, key_part->key, field);
-    goto end;
-  }
-
-  if (key_part->image_type == Field::itMBR) {
-    // @todo: use is_spatial_operator() instead?
-    switch (type) {
-      case Item_func::SP_EQUALS_FUNC:
-      case Item_func::SP_DISJOINT_FUNC:
-      case Item_func::SP_INTERSECTS_FUNC:
-      case Item_func::SP_TOUCHES_FUNC:
-      case Item_func::SP_CROSSES_FUNC:
-      case Item_func::SP_WITHIN_FUNC:
-      case Item_func::SP_CONTAINS_FUNC:
-      case Item_func::SP_OVERLAPS_FUNC:
-        break;
-      default:
-        /*
-          We cannot involve spatial indexes for queries that
-          don't use MBREQUALS(), MBRDISJOINT(), etc. functions.
-        */
-        goto end;
-    }
-  }
-
-  if (param->using_real_indexes)
-    optimize_range =
-        field->optimize_range(param->real_keynr[key_part->key], key_part->part);
-  else
-    optimize_range = true;
-
-  if (type == Item_func::LIKE_FUNC) {
-    bool like_error;
-    char buff1[MAX_FIELD_WIDTH];
-    uchar *min_str, *max_str;
-    String tmp(buff1, sizeof(buff1), value->collation.collation), *res;
-    size_t length, offset, min_length, max_length;
-    size_t field_length = field->pack_length() + null_bytes;
-
-    if (!optimize_range) goto end;
-    if (!(res = value->val_str(&tmp))) {
-      tree = new (alloc) SEL_ROOT(param->mem_root, SEL_ROOT::Type::IMPOSSIBLE);
-      goto end;
-    }
-
-    /*
-      TODO:
-      Check if this was a function. This should have be optimized away
-      in the sql_select.cc
-    */
-    if (res != &tmp) {
-      tmp.copy(*res);  // Get own copy
-      res = &tmp;
-    }
-    if (field->cmp_type() != STRING_RESULT)
-      goto end;  // Can only optimize strings
-
-    offset = null_bytes;
-    length = key_part->store_length;
-
-    if (length != key_part->length + null_bytes) {
-      /* key packed with length prefix */
-      offset += HA_KEY_BLOB_LENGTH;
-      field_length = length - HA_KEY_BLOB_LENGTH;
-    } else {
-      if (unlikely(length < field_length)) {
-        /*
-          This can only happen in a table created with UNIREG where one key
-          overlaps many fields
-        */
-        length = field_length;
-      } else
-        field_length = length;
-    }
-    length += offset;
-    if (!(min_str = (uchar *)alloc->Alloc(length * 2))) goto end;
-
-    max_str = min_str + length;
-    if (field->is_nullable()) max_str[0] = min_str[0] = 0;
-
-    Item_func_like *like_func = down_cast<Item_func_like *>(param->cond);
-
-    // We can only optimize with LIKE if the escape string is known.
-    if (!like_func->escape_is_evaluated()) goto end;
-
-    field_length -= null_bytes;
-    like_error = my_like_range(
-        field->charset(), res->ptr(), res->length(), like_func->escape(),
-        wild_one, wild_many, field_length, (char *)min_str + offset,
-        (char *)max_str + offset, &min_length, &max_length);
-    if (like_error)  // Can't optimize with LIKE
-      goto end;
-
-    if (offset != null_bytes)  // BLOB or VARCHAR
-    {
-      int2store(min_str + null_bytes, static_cast<uint16>(min_length));
-      int2store(max_str + null_bytes, static_cast<uint16>(max_length));
-    }
-    SEL_ARG *root = new (alloc)
-        SEL_ARG(field, min_str, max_str, !(key_part->flag & HA_REVERSE_SORT));
-    if (!root || !(tree = new (alloc) SEL_ROOT(root)))
-      goto end;  // out of memory
-    goto end;
-  }
-
-  if (!optimize_range && type != Item_func::EQ_FUNC &&
-      type != Item_func::EQUAL_FUNC)
-    goto end;  // Can't optimize this
-
-  /*
-    Geometry operations may mix geometry types, e.g., we may be
-    checking ST_Contains(<polygon field>, <point>). In such cases,
-    field->geom_type will be a different type than the value we're
-    trying to store in it, and the conversion will fail. Therefore,
-    set the most general geometry type while saving, and revert to the
-    original geometry type afterwards.
-  */
-  {
-    const Field::geometry_type save_geom_type =
-        (field->type() == MYSQL_TYPE_GEOMETRY) ? field->get_geometry_type()
-                                               : Field::GEOM_GEOMETRY;
-    if (field->type() == MYSQL_TYPE_GEOMETRY) {
-      down_cast<Field_geom *>(field)->geom_type = Field::GEOM_GEOMETRY;
-    }
-
-    bool always_true_or_false = save_value_and_handle_conversion(
-        &tree, value, type, field, &impossible_cond_cause, alloc,
-        param->query_block);
-
-    if (field->type() == MYSQL_TYPE_GEOMETRY &&
-        save_geom_type != Field::GEOM_GEOMETRY) {
-      down_cast<Field_geom *>(field)->geom_type = save_geom_type;
-    }
-
-    if (always_true_or_false) goto end;
-  }
-
-  /*
-    Any sargable predicate except "<=>" involving NULL as a constant is always
-    false
-  */
-  if (type != Item_func::EQUAL_FUNC && field->is_real_null()) {
-    impossible_cond_cause = "comparison_with_null_always_false";
-    tree = new (alloc) SEL_ROOT(param->mem_root, SEL_ROOT::Type::IMPOSSIBLE);
-    goto end;
-  }
-
-  str = (uchar *)alloc->Alloc(key_part->store_length + 1);
-  if (!str) goto end;
-  if (field->is_nullable())
-    *str = (uchar)field->is_real_null();  // Set to 1 if null
-  field->get_key_image(str + null_bytes, key_part->length,
-                       key_part->image_type);
-  SEL_ARG *root;
-  root =
-      new (alloc) SEL_ARG(field, str, str, !(key_part->flag & HA_REVERSE_SORT));
-  if (!root || !(tree = new (alloc) SEL_ROOT(root))) goto end;  // out of memory
-  /*
-    Check if we are comparing an UNSIGNED integer with a negative constant.
-    In this case we know that:
-    (a) (unsigned_int [< | <=] negative_constant) == false
-    (b) (unsigned_int [> | >=] negative_constant) == true
-    In case (a) the condition is false for all values, and in case (b) it
-    is true for all values, so we can avoid unnecessary retrieval and condition
-    testing, and we also get correct comparison of unsinged integers with
-    negative integers (which otherwise fails because at query execution time
-    negative integers are cast to unsigned if compared with unsigned).
-  */
-  if (field->result_type() == INT_RESULT &&
-      value->result_type() == INT_RESULT &&
-      ((field->type() == FIELD_TYPE_BIT || field->is_unsigned()) &&
-       !(value)->unsigned_flag)) {
-    longlong item_val = value->val_int();
-    if (item_val < 0) {
-      if (type == Item_func::LT_FUNC || type == Item_func::LE_FUNC) {
-        impossible_cond_cause = "unsigned_int_cannot_be_negative";
-        tree->type = SEL_ROOT::Type::IMPOSSIBLE;
-        goto end;
-      }
-      if (type == Item_func::GT_FUNC || type == Item_func::GE_FUNC) {
-        tree = nullptr;
-        goto end;
-      }
-    }
-  }
-
-  switch (type) {
-    case Item_func::LT_FUNC:
-    case Item_func::LE_FUNC:
-      /* Don't use open ranges for partial key_segments */
-      if (!(key_part->flag & HA_PART_KEY_SEG)) {
-        /*
-          Set NEAR_MAX to read values lesser than the stored value.
-        */
-        const int cmp_value =
-            stored_field_cmp_to_item(param->thd, field, value);
-        if ((type == Item_func::LT_FUNC && cmp_value >= 0) ||
-            (type == Item_func::LE_FUNC && cmp_value > 0))
-          tree->root->max_flag = NEAR_MAX;
-      }
-      if (!field->is_nullable())
-        tree->root->min_flag = NO_MIN_RANGE; /* From start */
-      else {                                 // > NULL
-        if (!(tree->root->min_value = static_cast<uchar *>(
-                  alloc->Alloc(key_part->store_length + 1))))
-          goto end;
-        TRASH(tree->root->min_value, key_part->store_length + 1);
-        memcpy(tree->root->min_value, is_null_string, sizeof(is_null_string));
-        tree->root->min_flag = NEAR_MIN;
-      }
-      break;
-    case Item_func::GT_FUNC:
-    case Item_func::GE_FUNC:
-      /* Don't use open ranges for partial key_segments */
-      if (!(key_part->flag & HA_PART_KEY_SEG)) {
-        /*
-          Set NEAR_MIN to read values greater than the stored value.
-        */
-        const int cmp_value =
-            stored_field_cmp_to_item(param->thd, field, value);
-        if ((type == Item_func::GT_FUNC && cmp_value <= 0) ||
-            (type == Item_func::GE_FUNC && cmp_value < 0))
-          tree->root->min_flag = NEAR_MIN;
-      }
-      tree->root->max_flag = NO_MAX_RANGE;
-      break;
-    case Item_func::SP_EQUALS_FUNC:
-      tree->root->set_gis_index_read_function(HA_READ_MBR_EQUAL);
-      break;
-    case Item_func::SP_DISJOINT_FUNC:
-      tree->root->set_gis_index_read_function(HA_READ_MBR_DISJOINT);
-      break;
-    case Item_func::SP_INTERSECTS_FUNC:
-      tree->root->set_gis_index_read_function(HA_READ_MBR_INTERSECT);
-      break;
-    case Item_func::SP_TOUCHES_FUNC:
-      tree->root->set_gis_index_read_function(HA_READ_MBR_INTERSECT);
-      break;
-
-    case Item_func::SP_CROSSES_FUNC:
-      tree->root->set_gis_index_read_function(HA_READ_MBR_INTERSECT);
-      break;
-    case Item_func::SP_WITHIN_FUNC:
-      /*
-        Adjust the rkey_func_flag as it's assumed and observed that both
-        MyISAM and Innodb implement this function in reverse order.
-      */
-      tree->root->set_gis_index_read_function(HA_READ_MBR_CONTAIN);
-      break;
-
-    case Item_func::SP_CONTAINS_FUNC:
-      /*
-        Adjust the rkey_func_flag as it's assumed and observed that both
-        MyISAM and Innodb implement this function in reverse order.
-      */
-      tree->root->set_gis_index_read_function(HA_READ_MBR_WITHIN);
-      break;
-    case Item_func::SP_OVERLAPS_FUNC:
-      tree->root->set_gis_index_read_function(HA_READ_MBR_INTERSECT);
-      break;
-
-    default:
-      break;
-  }
-
-end:
-  if (impossible_cond_cause != nullptr) {
-    Opt_trace_object wrapper(&param->thd->opt_trace);
-    Opt_trace_object(&param->thd->opt_trace, "impossible_condition",
-                     Opt_trace_context::RANGE_OPTIMIZER)
-        .add_alnum("cause", impossible_cond_cause);
-  }
-  param->thd->mem_root = alloc;
-  return tree;
-}
-
-/**
-  Add a new key test to a key when scanning through all keys
-  This will never be called for same key parts.
-
-  @param key1 Old root of key
-  @param key2 Element to insert (must be a single element)
-  @return New root of key
-*/
-static SEL_ROOT *sel_add(SEL_ROOT *key1, SEL_ROOT *key2) {
-  if (!key1) return key2;
-  if (!key2) return key1;
-
-  // key2 is assumed to be a single element.
-  assert(!key2->root->next_key_part);
-
-  if (key2->root->part < key1->root->part) {
-    // key2 fits in the start of the list.
-    key2->root->set_next_key_part(key1);
-    return key2;
-  }
-
-  // Find out where in the chain in key1 to put key2.
-  SEL_ARG *node = key1->root;
-  while (node->next_key_part &&
-         node->next_key_part->root->part > key2->root->part)
-    node = node->next_key_part->root;
-
-  key2->root->set_next_key_part(node->release_next_key_part());
-  node->set_next_key_part(key2);
-
-  return key1;
-}
-
-SEL_TREE *tree_and(RANGE_OPT_PARAM *param, SEL_TREE *tree1, SEL_TREE *tree2) {
-  DBUG_TRACE;
-
-  if (param->has_errors()) return nullptr;
-
-  if (!tree1) return tree2;
-  if (!tree2) return tree1;
-  if (tree1->type == SEL_TREE::IMPOSSIBLE || tree2->type == SEL_TREE::ALWAYS)
-    return tree1;
-  if (tree2->type == SEL_TREE::IMPOSSIBLE || tree1->type == SEL_TREE::ALWAYS)
-    return tree2;
-  if (tree1->type == SEL_TREE::MAYBE) {
-    if (tree2->type == SEL_TREE::KEY) tree2->type = SEL_TREE::KEY_SMALLER;
-    return tree2;
-  }
-  if (tree2->type == SEL_TREE::MAYBE) {
-    tree1->type = SEL_TREE::KEY_SMALLER;
-    return tree1;
-  }
-
-  dbug_print_tree("tree1", tree1, param);
-  dbug_print_tree("tree2", tree2, param);
-
-  Key_map result_keys;
-
-  /* Join the trees key per key */
-  for (uint idx = 0; idx < param->keys; idx++) {
-    SEL_ROOT *key1 = tree1->release_key(idx);
-    SEL_ROOT *key2 = tree2->release_key(idx);
-
-    if (key1 || key2) {
-      SEL_ROOT *new_key = key_and(param, key1, key2);
-      tree1->set_key(idx, new_key);
-      if (new_key) {
-        if (new_key->type == SEL_ROOT::Type::IMPOSSIBLE) {
-          tree1->type = SEL_TREE::IMPOSSIBLE;
-          return tree1;
-        }
-        result_keys.set_bit(idx);
-#ifndef NDEBUG
-        /*
-          Do not test use_count if there is a large range tree created.
-          It takes too much time to traverse the tree.
-        */
-        if (param->mem_root->allocated_size() < 2097152)
-          new_key->test_use_count(new_key);
-#endif
-      }
-    }
-  }
-  tree1->keys_map = result_keys;
-
-  /* ok, both trees are index_merge trees */
-  imerge_list_and_list(&tree1->merges, &tree2->merges);
-  return tree1;
-}
-
-/*
-  Check if two SEL_TREES can be combined into one (i.e. a single key range
-  read can be constructed for "cond_of_tree1 OR cond_of_tree2" ) without
-  using index_merge.
-*/
-
-static bool sel_trees_can_be_ored(SEL_TREE *tree1, SEL_TREE *tree2,
-                                  RANGE_OPT_PARAM *param) {
-  Key_map common_keys = tree1->keys_map;
-  DBUG_TRACE;
-  common_keys.intersect(tree2->keys_map);
-
-  dbug_print_tree("tree1", tree1, param);
-  dbug_print_tree("tree2", tree2, param);
-
-  if (common_keys.is_clear_all()) return false;
-
-  /* trees have a common key, check if they refer to same key part */
-  for (uint key_no = 0; key_no < param->keys; key_no++) {
-    if (common_keys.is_set(key_no)) {
-      const SEL_ROOT *key1 = tree1->keys[key_no];
-      const SEL_ROOT *key2 = tree2->keys[key_no];
-      /* GIS_OPTIMIZER_FIXME: temp solution. key1 could be all nulls */
-      if (key1 && key2 && key1->root->part == key2->root->part) return true;
-    }
-  }
-  return false;
-}
-
-/*
-  Remove the trees that are not suitable for record retrieval.
-  SYNOPSIS
-    param  Range analysis parameter
-    tree   Tree to be processed, tree->type is KEY or KEY_SMALLER
-
-  DESCRIPTION
-    This function walks through tree->keys[] and removes the SEL_ARG* trees
-    that are not "maybe" trees (*) and cannot be used to construct quick range
-    selects.
-    (*) - have type MAYBE or MAYBE_KEY. Perhaps we should remove trees of
-          these types here as well.
-
-    A SEL_ARG* tree cannot be used to construct quick select if it has
-    tree->part != 0. (e.g. it could represent "keypart2 < const").
-
-    WHY THIS FUNCTION IS NEEDED
-
-    Normally we allow construction of SEL_TREE objects that have SEL_ARG
-    trees that do not allow quick range select construction. For example for
-    " keypart1=1 AND keypart2=2 " the execution will proceed as follows:
-    tree1= SEL_TREE { SEL_ARG{keypart1=1} }
-    tree2= SEL_TREE { SEL_ARG{keypart2=2} } -- can't make quick range select
-                                               from this
-    call tree_and(tree1, tree2) -- this joins SEL_ARGs into a usable SEL_ARG
-                                   tree.
-
-    There is an exception though: when we construct index_merge SEL_TREE,
-    any SEL_ARG* tree that cannot be used to construct quick range select can
-    be removed, because current range analysis code doesn't provide any way
-    that tree could be later combined with another tree.
-    Consider an example: we should not construct
-    st1 = SEL_TREE {
-      merges = SEL_IMERGE {
-                            SEL_TREE(t.key1part1 = 1),
-                            SEL_TREE(t.key2part2 = 2)   -- (*)
-                          }
-                   };
-    because
-     - (*) cannot be used to construct quick range select,
-     - There is no execution path that would cause (*) to be converted to
-       a tree that could be used.
-
-    The latter is easy to verify: first, notice that the only way to convert
-    (*) into a usable tree is to call tree_and(something, (*)).
-
-    Second look at what tree_and/tree_or function would do when passed a
-    SEL_TREE that has the structure like st1 tree has, and conlcude that
-    tree_and(something, (*)) will not be called.
-
-  RETURN
-    0  Ok, some suitable trees left
-    1  No tree->keys[] left.
-*/
-
-static bool remove_nonrange_trees(RANGE_OPT_PARAM *param, SEL_TREE *tree) {
-  bool res = false;
-  for (uint i = 0; i < param->keys; i++) {
-    if (tree->keys[i]) {
-      if (tree->keys[i]->root->part) {
-        tree->keys[i] = NULL;
-        tree->keys_map.clear_bit(i);
-      } else
-        res = true;
-    }
-  }
-  return !res;
-}
-
-SEL_TREE *tree_or(RANGE_OPT_PARAM *param, SEL_TREE *tree1, SEL_TREE *tree2) {
-  DBUG_TRACE;
-
-  if (param->has_errors()) return nullptr;
-
-  if (!tree1 || !tree2) return nullptr;
-  if (tree1->type == SEL_TREE::IMPOSSIBLE || tree2->type == SEL_TREE::ALWAYS)
-    return tree2;
-  if (tree2->type == SEL_TREE::IMPOSSIBLE || tree1->type == SEL_TREE::ALWAYS)
-    return tree1;
-  if (tree1->type == SEL_TREE::MAYBE) return tree1;  // Can't use this
-  if (tree2->type == SEL_TREE::MAYBE) return tree2;
-
-  /*
-    It is possible that a tree contains both
-    a) simple range predicates (in tree->keys[]) and
-    b) index merge range predicates (in tree->merges)
-
-    If a tree has both, they represent equally *valid* range
-    predicate alternatives; both will return all relevant rows from
-    the table but one may return more unnecessary rows than the
-    other (additional rows will be filtered later). However, doing
-    an OR operation on trees with both types of predicates is too
-    complex at the time. We therefore remove the index merge
-    predicates (if we have both types) before OR'ing the trees.
-
-    TODO: enable tree_or() for trees with both simple and index
-    merge range predicates.
-  */
-  if (!tree1->merges.is_empty()) {
-    for (uint i = 0; i < param->keys; i++)
-      if (tree1->keys[i] != NULL &&
-          tree1->keys[i]->type == SEL_ROOT::Type::KEY_RANGE) {
-        tree1->merges.clear();
-        break;
-      }
-  }
-  if (!tree2->merges.is_empty()) {
-    for (uint i = 0; i < param->keys; i++)
-      if (tree2->keys[i] != NULL &&
-          tree2->keys[i]->type == SEL_ROOT::Type::KEY_RANGE) {
-        tree2->merges.clear();
-        break;
-      }
-  }
-
-  SEL_TREE *result = nullptr;
-  Key_map result_keys;
-  if (sel_trees_can_be_ored(tree1, tree2, param)) {
-    /* Join the trees key per key */
-    for (uint idx = 0; idx < param->keys; idx++) {
-      SEL_ROOT *key1 = tree1->release_key(idx);
-      SEL_ROOT *key2 = tree2->release_key(idx);
-      SEL_ROOT *new_key = key_or(param, key1, key2);
-      tree1->set_key(idx, new_key);
-      if (new_key) {
-        result = tree1;  // Added to tree1
-        result_keys.set_bit(idx);
-#ifndef NDEBUG
-        /*
-          Do not test use count if there is a large range tree created.
-          It takes too much time to traverse the tree.
-        */
-        if (param->mem_root->allocated_size() < 2097152)
-          new_key->test_use_count(new_key);
-#endif
-      }
-    }
-    if (result) result->keys_map = result_keys;
-  } else {
-    /* ok, two trees have KEY type but cannot be used without index merge */
-    if (tree1->merges.is_empty() && tree2->merges.is_empty()) {
-      if (param->remove_jump_scans) {
-        bool no_trees = remove_nonrange_trees(param, tree1);
-        no_trees = no_trees || remove_nonrange_trees(param, tree2);
-        if (no_trees)
-          return new (param->mem_root)
-              SEL_TREE(SEL_TREE::ALWAYS, param->mem_root, param->keys);
-      }
-      SEL_IMERGE *merge;
-      /* both trees are "range" trees, produce new index merge structure */
-      if (!(result =
-                new (param->mem_root) SEL_TREE(param->mem_root, param->keys)) ||
-          !(merge = new (param->mem_root) SEL_IMERGE()) ||
-          (result->merges.push_back(merge)) ||
-          (merge->or_sel_tree(param, tree1)) ||
-          (merge->or_sel_tree(param, tree2)))
-        result = nullptr;
-      else
-        result->type = tree1->type;
-    } else if (!tree1->merges.is_empty() && !tree2->merges.is_empty()) {
-      if (imerge_list_or_list(param, &tree1->merges, &tree2->merges))
-        result = new (param->mem_root)
-            SEL_TREE(SEL_TREE::ALWAYS, param->mem_root, param->keys);
-      else
-        result = tree1;
-    } else {
-      /* one tree is index merge tree and another is range tree */
-      if (tree1->merges.is_empty()) std::swap(tree1, tree2);
-
-      if (param->remove_jump_scans && remove_nonrange_trees(param, tree2))
-        return new (param->mem_root)
-            SEL_TREE(SEL_TREE::ALWAYS, param->mem_root, param->keys);
-      /* add tree2 to tree1->merges, checking if it collapses to ALWAYS */
-      if (imerge_list_or_tree(param, &tree1->merges, tree2))
-        result = new (param->mem_root)
-            SEL_TREE(SEL_TREE::ALWAYS, param->mem_root, param->keys);
-      else
-        result = tree1;
-    }
-  }
-  return result;
-}
-
-/**
-  And key trees where key1->part < key2->part
-
-  key2 will be connected to every key in key1, and thus
-  have its use_count incremented many times. The returned node
-  will not have its use_count increased; you are supposed to do
-  that yourself when you connect it to a root.
-
-  @param param Range analysis context (needed to track if we have allocated
-               too many SEL_ARGs)
-  @param key1 Root of first tree to AND together
-  @param key2 Root of second tree to AND together
-  @return Root of (key1 AND key2)
-*/
-
-static SEL_ROOT *and_all_keys(RANGE_OPT_PARAM *param, SEL_ROOT *key1,
-                              SEL_ROOT *key2) {
-  SEL_ARG *next;
-
-  // We will be modifying key1, so clone it if we need to.
-  if (key1->use_count > 0) {
-    if (!(key1 = key1->clone_tree(param))) return nullptr;  // OOM
-  }
-
-  /*
-    We will be using key2 several times, so temporarily increase
-    its use_count artificially to keep key_and() below from modifying
-    it in-place.
-
-    Note that this makes test_use_count() fail since our use_count is
-    now higher than the actual number of references, but that is only ever
-    called from tree_and() and tree_or(), not from anything below this,
-    and we undo it below.
-  */
-  ++key2->use_count;
-
-  if (key1->type == SEL_ROOT::Type::MAYBE_KEY) {
-    // See todo for left/right pointers
-    assert(!key1->root->left);
-    assert(!key1->root->right);
-    key1->root->next = key1->root->prev = nullptr;
-  }
-  for (next = key1->root->first(); next; next = next->next) {
-    if (next->next_key_part) {
-      /*
-        The more complicated case; there's already another AND clause,
-        so we cannot connect key2 to key1 directly, but need to recurse.
-      */
-      SEL_ROOT *tmp = key_and(param, next->release_next_key_part(), key2);
-      next->set_next_key_part(tmp);
-      if (tmp && tmp->type == SEL_ROOT::Type::IMPOSSIBLE) {
-        key1->tree_delete(next);
-      }
-    } else {
-      // The trivial case.
-      next->set_next_key_part(key2);
-    }
-  }
-
-  // Undo the temporary use_count modification above.
-  --key2->use_count;
-
-  return key1;
-}
-
-/*
-  Produce a SEL_ARG graph that represents "key1 AND key2"
-
-  SYNOPSIS
-    key_and()
-      param   Range analysis context (needed to track if we have allocated
-              too many SEL_ARGs)
-      key1    First argument, root of its RB-tree
-      key2    Second argument, root of its RB-tree
-
-  key_and() does not modify key1 nor key2 if they are in use by other roots
-  (although typical use is that key1 has been disconnected from its root
-  and thus can be modified in-place). Thus, it does not change their use_count
-  in the typical case.
-
-  The returned node will not have its use_count increased; you are supposed
-  to do that yourself when you connect it to a root.
-
-  RETURN
-    RB-tree root of the resulting SEL_ARG graph.
-    NULL if the result of AND operation is an empty interval {0}.
-*/
-
-SEL_ROOT *key_and(RANGE_OPT_PARAM *param, SEL_ROOT *key1, SEL_ROOT *key2) {
-  if (param->has_errors()) return nullptr;
-
-  if (key1 == nullptr || key1->is_always()) {
-    if (key1) key1->free_tree();
-    return key2;
-  }
-  if (key2 == nullptr || key2->is_always()) {
-    if (key2) key2->free_tree();
-    return key1;
-  }
-
-  if (key1->root->part != key2->root->part) {
-    if (key1->root->part > key2->root->part) {
-      std::swap(key1, key2);
-    }
-    assert(key1->root->part < key2->root->part);
-    return and_all_keys(param, key1, key2);
-  }
-
-  if ((!key2->simple_key() && key1->simple_key() &&
-       key2->type != SEL_ROOT::Type::MAYBE_KEY) ||
-      key1->type == SEL_ROOT::Type::MAYBE_KEY) {  // Put simple key in key2
-    std::swap(key1, key2);
-  }
-
-  /* If one of the key is MAYBE_KEY then the found region may be smaller */
-  if (key2->type == SEL_ROOT::Type::MAYBE_KEY) {
-    if (key1->use_count > 0) {
-      // We are going to modify key1, so we need to clone it.
-      if (!(key1 = key1->clone_tree(param))) return nullptr;  // OOM
-    }
-    if (key1->type == SEL_ROOT::Type::MAYBE_KEY) {  // Both are maybe key
-      SEL_ROOT *new_part = key_and(param, key1->root->release_next_key_part(),
-                                   key2->root->next_key_part);
-      key1->root->set_next_key_part(new_part);
-      return key1;
-    } else {
-      key1->root->maybe_smaller();
-      if (key2->root->next_key_part) {
-        return and_all_keys(param, key1, key2);
-      } else {
-        /*
-          key2 is MAYBE_KEY and nothing more; simply discard it,
-          since we've now moved that information into key1's maybe_flag.
-        */
-        key2->free_tree();
-        return key1;
-      }
-    }
-    // Unreachable.
-    assert(false);
-    return nullptr;
-  }
-
-  if ((key1->root->min_flag | key2->root->min_flag) & GEOM_FLAG) {
-    /*
-      Cannot optimize geometry ranges. The next best thing is to keep
-      one of them.
-    */
-    key2->free_tree();
-    return key1;
-  }
-
-  SEL_ARG *e1 = key1->root->first(), *e2 = key2->root->first();
-  SEL_ROOT *new_tree = nullptr;
-
-  while (e1 && e2) {
-    int cmp = e1->cmp_min_to_min(e2);
-    if (cmp < 0) {
-      if (get_range(&e1, &e2, key1)) continue;
-    } else if (get_range(&e2, &e1, key2))
-      continue;
-    /*
-      NOTE: We don't destroy e1->next_key_part nor e2->next_key_part
-      (if used at all, the return value here goes into a brand new element;
-      it does not overwrite either of them), so we keep their use_counts
-      intact here.
-    */
-    SEL_ROOT *next = key_and(param, e1->next_key_part, e2->next_key_part);
-    if (next && next->type == SEL_ROOT::Type::IMPOSSIBLE)
-      next->free_tree();
-    else {
-      SEL_ARG *new_arg = e1->clone_and(e2, param->mem_root);
-      if (!new_arg) return nullptr;  // End of memory
-      new_arg->set_next_key_part(next);
-      if (!new_tree) {
-        new_tree = new (param->mem_root) SEL_ROOT(new_arg);
-      } else
-        new_tree->insert(new_arg);
-    }
-    if (e1->cmp_max_to_max(e2) < 0)
-      e1 = e1->next;  // e1 can't overlap next e2
-    else
-      e2 = e2->next;
-  }
-  key1->free_tree();
-  key2->free_tree();
-  if (!new_tree)
-    // Impossible range
-    return new (param->mem_root)
-        SEL_ROOT(param->mem_root, SEL_ROOT::Type::IMPOSSIBLE);
-  return new_tree;
-}
-
-static bool get_range(SEL_ARG **e1, SEL_ARG **e2, const SEL_ROOT *root1) {
-  (*e1) = root1->find_range(*e2);  // first e1->min < e2->min
-  if ((*e1)->cmp_max_to_min(*e2) < 0) {
-    if (!((*e1) = (*e1)->next)) return true;
-    if ((*e1)->cmp_min_to_max(*e2) > 0) {
-      (*e2) = (*e2)->next;
-      return true;
-    }
-  }
-  return false;
-}
-
-/**
-   Combine two range expression under a common OR. On a logical level, the
-   transformation is key_or( expr1, expr2 ) => expr1 OR expr2.
-
-   Both expressions are assumed to be in the SEL_ARG format. In a logic sense,
-   the format is reminiscent of DNF, since an expression such as the following
-
-   ( 1 < kp1 < 10 AND p1 ) OR ( 10 <= kp2 < 20 AND p2 )
-
-   where there is a key consisting of keyparts ( kp1, kp2, ..., kpn ) and p1
-   and p2 are valid SEL_ARG expressions over keyparts kp2 ... kpn, is a valid
-   SEL_ARG condition. The disjuncts appear ordered by the minimum endpoint of
-   the first range and ranges must not overlap. It follows that they are also
-   ordered by maximum endpoints. Thus
-
-   ( 1 < kp1 <= 2 AND ( kp2 = 2 OR kp2 = 3 ) ) OR kp1 = 3
-
-   Is a a valid SER_ARG expression for a key of at least 2 keyparts.
-
-   For simplicity, we will assume that expr2 is a single range predicate,
-   i.e. on the form ( a < x < b AND ... ). It is easy to generalize to a
-   disjunction of several predicates by subsequently call key_or for each
-   disjunct.
-
-   The algorithm iterates over each disjunct of expr1, and for each disjunct
-   where the first keypart's range overlaps with the first keypart's range in
-   expr2:
-
-   If the predicates are equal for the rest of the keyparts, or if there are
-   no more, the range in expr2 has its endpoints copied in, and the SEL_ARG
-   node in expr2 is deallocated. If more ranges became connected in expr1, the
-   surplus is also dealocated. If they differ, two ranges are created.
-
-   - The range leading up to the overlap. Empty if endpoints are equal.
-
-   - The overlapping sub-range. May be the entire range if they are equal.
-
-   Finally, there may be one more range if expr2's first keypart's range has a
-   greater maximum endpoint than the last range in expr1.
-
-   For the overlapping sub-range, we recursively call key_or. Thus in order to
-   compute key_or of
-
-     (1) ( 1 < kp1 < 10 AND 1 < kp2 < 10 )
-
-     (2) ( 2 < kp1 < 20 AND 4 < kp2 < 20 )
-
-   We create the ranges 1 < kp <= 2, 2 < kp1 < 10, 10 <= kp1 < 20. For the
-   first one, we simply hook on the condition for the second keypart from (1)
-   : 1 < kp2 < 10. For the second range 2 < kp1 < 10, key_or( 1 < kp2 < 10, 4
-   < kp2 < 20 ) is called, yielding 1 < kp2 < 20. For the last range, we reuse
-   the range 4 < kp2 < 20 from (2) for the second keypart. The result is thus
-
-   ( 1  <  kp1 <= 2 AND 1 < kp2 < 10 ) OR
-   ( 2  <  kp1 < 10 AND 1 < kp2 < 20 ) OR
-   ( 10 <= kp1 < 20 AND 4 < kp2 < 20 )
-
-   key_or() does not modify key1 nor key2 if they are in use by other roots
-   (although typical use is that key1 has been disconnected from its root
-   and thus can be modified in-place). Thus, it does not change their
-   use_count.
-
-   The returned node will not have its use_count increased; you are supposed
-   to do that yourself when you connect it to a root.
-
-   @param param    PARAM from test_quick_select
-   @param key1     Root of RB-tree of SEL_ARGs to be ORed with key2
-   @param key2     Root of RB-tree of SEL_ARGs to be ORed with key1
-*/
-SEL_ROOT *key_or(RANGE_OPT_PARAM *param, SEL_ROOT *key1, SEL_ROOT *key2) {
-  if (param->has_errors()) return nullptr;
-
-  if (key1 == nullptr || key1->is_always()) {
-    if (key2) key2->free_tree();
-    return key1;
-  }
-  if (key2 == nullptr || key2->is_always())
-    // Case is symmetric to the one above, just flip parameters.
-    return key_or(param, key2, key1);
-
-  if (key1->root->part != key2->root->part ||
-      (key1->root->min_flag | key2->root->min_flag) & GEOM_FLAG) {
-    key1->free_tree();
-    key2->free_tree();
-    return nullptr;  // Can't optimize this
-  }
-
-  // If one of the key is MAYBE_KEY then the found region may be bigger
-  if (key1->type == SEL_ROOT::Type::MAYBE_KEY) {
-    key2->free_tree();
-    return key1;
-  }
-  if (key2->type == SEL_ROOT::Type::MAYBE_KEY) {
-    key1->free_tree();
-    return key2;
-  }
-
-  // (cond) OR (IMPOSSIBLE) <=> (cond).
-  if (key1->type == SEL_ROOT::Type::IMPOSSIBLE) {
-    key1->free_tree();
-    return key2;
-  }
-  if (key2->type == SEL_ROOT::Type::IMPOSSIBLE) {
-    key2->free_tree();
-    return key1;
-  }
-
-  /*
-    We need to modify one of key1 or key2 (whichever we choose, we will
-    call it key1 afterwards). If either is used only by us (use_count == 0),
-    we can use that directly. If not, we need to clone one of them; we pick
-    the one with the fewest elements since that is the cheapest.
-  */
-  if (key1->use_count > 0) {
-    if (key2->use_count == 0 || key1->elements > key2->elements) {
-      std::swap(key1, key2);
-    }
-    if (key1->use_count > 0 && (key1 = key1->clone_tree(param)) == nullptr)
-      return nullptr;  // OOM
-  }
-  assert(key1->use_count == 0);
-
-  /*
-    Add tree at key2 to tree at key1. If key2 is used by nobody else,
-    we can cannibalize its nodes and add them directly into key1.
-    If not, we'll need to make copies of them.
-  */
-  const bool key2_shared = (key2->use_count != 0);
-  key1->root->maybe_flag |= key2->root->maybe_flag;
-
-  /*
-    Notation for illustrations used in the rest of this function:
-
-      Range: [--------]
-             ^        ^
-             start    stop
-
-      Two overlapping ranges:
-        [-----]               [----]            [--]
-            [---]     or    [---]       or   [-------]
-
-      Ambiguity: ***
-        The range starts or stops somewhere in the "***" range.
-        Example: a starts before b and may end before/the same place/after b
-        a: [----***]
-        b:   [---]
-
-      Adjacent ranges:
-        Ranges that meet but do not overlap. Example: a = "x < 3", b = "x >= 3"
-        a: ----]
-        b:      [----
-  */
-
-  SEL_ARG *cur_key2 = key2->root->first();
-  while (cur_key2) {
-    /*
-      key1 consists of one or more ranges. cur_key1 is the
-      range currently being handled.
-
-      initialize cur_key1 to the latest range in key1 that starts the
-      same place or before the range in cur_key2 starts
-
-      cur_key2:            [------]
-      key1:      [---] [-----] [----]
-                       ^
-                       cur_key1
-    */
-    SEL_ARG *cur_key1 = key1->find_range(cur_key2);
-
-    /*
-      Used to describe how two key values are positioned compared to
-      each other. Consider key_value_a.<cmp_func>(key_value_b):
-
-        -2: key_value_a is smaller than key_value_b, and they are adjacent
-        -1: key_value_a is smaller than key_value_b (not adjacent)
-         0: the key values are equal
-         1: key_value_a is bigger than key_value_b (not adjacent)
-         2: key_value_a is bigger than key_value_b, and they are adjacent
-
-      Example: "cmp= cur_key1->cmp_max_to_min(cur_key2)"
-
-      cur_key2:          [--------           (10 <= x ...  )
-      cur_key1:    -----]                    (  ... x <  10) => cmp==-2
-      cur_key1:    ----]                     (  ... x <   9) => cmp==-1
-      cur_key1:    ------]                   (  ... x <= 10) => cmp== 0
-      cur_key1:    --------]                 (  ... x <= 12) => cmp== 1
-      (cmp == 2 does not make sense for cmp_max_to_min())
-    */
-    int cmp = 0;
-
-    if (!cur_key1) {
-      /*
-        The range in cur_key2 starts before the first range in key1. Use
-        the first range in key1 as cur_key1.
-
-        cur_key2: [--------]
-        key1:            [****--] [----]   [-------]
-                         ^
-                         cur_key1
-      */
-      cur_key1 = key1->root->first();
-      cmp = -1;
-    } else if ((cmp = cur_key1->cmp_max_to_min(cur_key2)) < 0) {
-      /*
-        This is the case:
-        cur_key2:           [-------]
-        cur_key1:   [----**]
-      */
-      SEL_ARG *next_key1 = cur_key1->next;
-      if (cmp == -2 &&
-          eq_tree(cur_key1->next_key_part, cur_key2->next_key_part)) {
-        /*
-          Adjacent (cmp==-2) and equal next_key_parts => ranges can be merged
-
-          This is the case:
-          cur_key2:           [-------]
-          cur_key1:     [----]
-
-          Result:
-          cur_key2:     [-------------]     => inserted into key1 below
-          cur_key1:                         => deleted
-        */
-        SEL_ARG *next_key2 = cur_key2->next;
-        if (key2_shared) {
-          if (!(cur_key2 = new (param->mem_root) SEL_ARG(*cur_key2)))
-            return nullptr;            // out of memory
-          cur_key2->next = next_key2;  // New copy of cur_key2
-        }
-
-        if (cur_key2->copy_min(cur_key1)) {
-          // cur_key2 is full range: [-inf <= cur_key2 <= +inf]
-          key1->free_tree();
-          key2->free_tree();
-          if (key1->root->maybe_flag)
-            return new (param->mem_root)
-                SEL_ROOT(param->mem_root, SEL_ROOT::Type::MAYBE_KEY);
-          return nullptr;
-        }
-
-        key1->tree_delete(cur_key1);
-        if (key1->type == SEL_ROOT::Type::IMPOSSIBLE) {
-          /*
-            cur_key1 was the last range in key1; move the cur_key2
-            range that was merged above to key1
-          */
-          key1->insert(cur_key2);
-          cur_key2 = next_key2;
-          break;
-        }
-      }
-      // Move to next range in key1. Now cur_key1.min > cur_key2.min
-      if (!(cur_key1 = next_key1))
-        break;  // No more ranges in key1. Copy rest of key2
-    }
-
-    if (cmp < 0) {
-      /*
-        This is the case:
-        cur_key2:   [--***]
-        cur_key1:       [----]
-      */
-      int cur_key1_cmp;
-      if ((cur_key1_cmp = cur_key1->cmp_min_to_max(cur_key2)) > 0) {
-        /*
-          This is the case:
-          cur_key2:  [------**]
-          cur_key1:            [----]
-        */
-        if (cur_key1_cmp == 2 &&
-            eq_tree(cur_key1->next_key_part, cur_key2->next_key_part)) {
-          /*
-            Adjacent ranges with equal next_key_part. Merge like this:
-
-            This is the case:
-            cur_key2:    [------]
-            cur_key1:            [-----]
-
-            Result:
-            cur_key2:    [------]
-            cur_key1:    [-------------]
-
-            Then move on to next key2 range.
-          */
-          cur_key1->copy_min_to_min(cur_key2);
-          key1->root->merge_flags(cur_key2);  // should be cur_key1->merge...()
-                                              // ?
-          if (cur_key1->min_flag & NO_MIN_RANGE &&
-              cur_key1->max_flag & NO_MAX_RANGE) {
-            key1->free_tree();
-            key2->free_tree();
-            if (key1->root->maybe_flag)
-              return new (param->mem_root)
-                  SEL_ROOT(param->mem_root, SEL_ROOT::Type::MAYBE_KEY);
-            return nullptr;
-          }
-          cur_key2->release_next_key_part();  // Free not used tree
-          cur_key2 = cur_key2->next;
-          continue;
-        } else {
-          /*
-            cur_key2 not adjacent to cur_key1 or has different next_key_part.
-            Insert into key1 and move to next range in key2
-
-            This is the case:
-            cur_key2:   [------**]
-            cur_key1:             [----]
-
-            Result:
-            key1:       [------**][----]
-                        ^         ^
-                        insert    cur_key1
-          */
-          SEL_ARG *next_key2 = cur_key2->next;
-          if (key2_shared) {
-            SEL_ARG *cpy =
-                new (param->mem_root) SEL_ARG(*cur_key2);  // Must make copy
-            if (!cpy) return nullptr;                      // OOM
-            key1->insert(cpy);
-          } else
-            key1->insert(cur_key2);
-          cur_key2 = next_key2;
-          continue;
-        }
-      }
-    }
-
-    /*
-      The ranges in cur_key1 and cur_key2 are overlapping:
-
-      cur_key2:       [----------]
-      cur_key1:    [*****-----*****]
-
-      Corollary: cur_key1.min <= cur_key2.max
-    */
-    if (eq_tree(cur_key1->next_key_part, cur_key2->next_key_part)) {
-      // Merge overlapping ranges with equal next_key_part
-      if (cur_key1->is_same(cur_key2)) {
-        /*
-          cur_key1 covers exactly the same range as cur_key2
-          Use the relevant range in key1.
-        */
-        cur_key1->merge_flags(cur_key2);    // Copy maybe flags
-        cur_key2->release_next_key_part();  // Free not used tree
-      } else {
-        SEL_ARG *last = cur_key1;
-        SEL_ARG *first = cur_key1;
-
-        /*
-          Find the last range in key1 that overlaps cur_key2 and
-          where all ranges first...last have the same next_key_part as
-          cur_key2.
-
-          cur_key2:  [****----------------------*******]
-          key1:         [--]  [----] [---]  [-----] [xxxx]
-                        ^                   ^       ^
-                        first               last    different next_key_part
-
-          Since cur_key2 covers them, the ranges between first and last
-          are merged into one range by deleting first...last-1 from
-          the key1 tree. In the figure, this applies to first and the
-          two consecutive ranges. The range of last is then extended:
-            * last.min: Set to min(cur_key2.min, first.min)
-            * last.max: If there is a last->next that overlaps cur_key2
-                        (i.e., last->next has a different next_key_part):
-                                        Set adjacent to last->next.min
-                        Otherwise:      Set to max(cur_key2.max, last.max)
-
-          Result:
-          cur_key2:  [****----------------------*******]
-                        [--]  [----] [---]                 => deleted from key1
-          key1:      [**------------------------***][xxxx]
-                     ^                              ^
-                     cur_key1=last                  different next_key_part
-        */
-        while (last->next && last->next->cmp_min_to_max(cur_key2) <= 0 &&
-               eq_tree(last->next->next_key_part, cur_key2->next_key_part)) {
-          /*
-            last->next is covered by cur_key2 and has same next_key_part.
-            last can be deleted
-          */
-          SEL_ARG *save = last;
-          last = last->next;
-          key1->tree_delete(save);
-        }
-        // Redirect cur_key1 to last which will cover the entire range
-        cur_key1 = last;
-
-        /*
-          Extend last to cover the entire range of
-          [min(first.min_value,cur_key2.min_value)...last.max_value].
-          If this forms a full range (the range covers all possible
-          values) we return no SEL_ARG RB-tree.
-        */
-        bool full_range = last->copy_min(first);
-        if (!full_range) full_range = last->copy_min(cur_key2);
-
-        if (!full_range) {
-          if (last->next && cur_key2->cmp_max_to_min(last->next) >= 0) {
-            /*
-              This is the case:
-              cur_key2:   [-------------]
-              key1:     [***------]  [xxxx]
-                        ^            ^
-                        last         different next_key_part
-
-              Extend range of last up to last->next:
-              cur_key2:   [-------------]
-              key1:     [***--------][xxxx]
-            */
-            last->copy_min_to_max(last->next);
-          } else
-            /*
-              This is the case:
-              cur_key2:   [--------*****]
-              key1:     [***---------]    [xxxx]
-                        ^                 ^
-                        last              different next_key_part
-
-              Extend range of last up to max(last.max, cur_key2.max):
-              cur_key2:   [--------*****]
-              key1:     [***----------**] [xxxx]
-            */
-            full_range = last->copy_max(cur_key2);
-        }
-        if (full_range) {  // Full range
-          key1->free_tree();
-          cur_key2->release_next_key_part();
-          if (key1->root->maybe_flag)
-            return new (param->mem_root)
-                SEL_ROOT(param->mem_root, SEL_ROOT::Type::MAYBE_KEY);
-          return nullptr;
-        }
-      }
-    }
-
-    if (cmp >= 0 && cur_key1->cmp_min_to_min(cur_key2) < 0) {
-      /*
-        This is the case ("cmp>=0" means that cur_key1.max >= cur_key2.min):
-        cur_key2:                [-------]
-        cur_key1:         [----------*******]
-      */
-
-      if (!cur_key1->next_key_part) {
-        /*
-          cur_key1->next_key_part is empty: cut the range that
-          is covered by cur_key1 from cur_key2.
-          Reason: (cur_key2->next_key_part OR
-          cur_key1->next_key_part) will be empty and therefore
-          equal to cur_key1->next_key_part. Thus, this part of
-          the cur_key2 range is completely covered by cur_key1.
-        */
-        if (cur_key1->cmp_max_to_max(cur_key2) >= 0) {
-          /*
-            cur_key1 covers the entire range in cur_key2.
-            cur_key2:            [-------]
-            cur_key1:     [-----------------]
-
-            Move on to next range in key2
-          */
-          cur_key2 = cur_key2->next;
-          continue;
-        } else {
-          /*
-            This is the case:
-            cur_key2:            [-------]
-            cur_key1:     [---------]
-
-            Result:
-            cur_key2:                [---]
-            cur_key1:     [---------]
-          */
-          cur_key2->copy_max_to_min(cur_key1);
-          // FIXME: what if key2_shared?
-          continue;
-        }
-      }
-
-      /*
-        The ranges are overlapping but have not been merged because
-        next_key_part of cur_key1 and cur_key2 differ.
-        cur_key2:               [----]
-        cur_key1:     [------------*****]
-
-        Split cur_key1 in two where cur_key2 starts:
-        cur_key2:               [----]
-        key1:         [--------][--*****]
-                      ^         ^
-                      insert    cur_key1
-      */
-      SEL_ARG *new_arg = cur_key1->clone_first(cur_key2, param->mem_root);
-      if (!new_arg) return nullptr;  // OOM
-      new_arg->set_next_key_part(cur_key1->next_key_part);
-      cur_key1->copy_min_to_min(cur_key2);
-      key1->insert(new_arg);
-    }  // cur_key1.min >= cur_key2.min due to this if()
-
-    /*
-      Now cur_key2.min <= cur_key1.min <= cur_key2.max:
-      cur_key2:    [---------]
-      cur_key1:    [****---*****]
-    */
-
-    /*
-      Get a copy we can modify. Note that this will keep an extra reference
-      to its next_key_part (if any), but the destructor will clean that up
-      when we exit from the function. key2_cpy is ephemeral and will not be
-      inserted in any tree, although copies of it might be.
-    */
-    SEL_ARG key2_cpy(*cur_key2);
-
-    for (;;) {
-      if (cur_key1->cmp_min_to_min(&key2_cpy) > 0) {
-        /*
-          This is the case:
-          key2_cpy:    [------------]
-          key1:                 [-*****]
-                                ^
-                                cur_key1
-
-          Result:
-          key2_cpy:             [---]
-          key1:        [-------][-*****]
-                       ^        ^
-                       insert   cur_key1
-        */
-        SEL_ARG *new_arg = key2_cpy.clone_first(cur_key1, param->mem_root);
-        if (!new_arg) return nullptr;  // OOM
-        new_arg->set_next_key_part(key2_cpy.next_key_part);
-        key1->insert(new_arg);
-        key2_cpy.copy_min_to_min(cur_key1);
-      }
-      // Now key2_cpy.min == cur_key1.min
-
-      if ((cmp = cur_key1->cmp_max_to_max(&key2_cpy)) <= 0) {
-        /*
-          cur_key1.max <= key2_cpy.max:
-          key2_cpy:       a)  [-------]    or b)     [----]
-          cur_key1:           [----]                 [----]
-
-          Steps:
-
-           1) Update next_key_part of cur_key1: OR it with
-              key2_cpy->next_key_part.
-           2) If case a: Insert range [cur_key1.max, key2_cpy.max]
-              into key1 using next_key_part of key2_cpy
-
-           Result:
-           key1:          a)  [----][-]    or b)     [----]
-        */
-        cur_key1->maybe_flag |= key2_cpy.maybe_flag;
-        cur_key1->set_next_key_part(key_or(
-            param, cur_key1->release_next_key_part(), key2_cpy.next_key_part));
-
-        if (!cmp) break;  // case b: done with this key2 range
-
-        // Make key2_cpy the range [cur_key1.max, key2_cpy.max]
-        key2_cpy.copy_max_to_min(cur_key1);
-        if (!(cur_key1 = cur_key1->next)) {
-          /*
-            No more ranges in key1. Insert key2_cpy and go to "end"
-            label to insert remaining ranges in key2 if any.
-          */
-          SEL_ARG *new_key1_range = new (param->mem_root) SEL_ARG(key2_cpy);
-          if (!new_key1_range) return nullptr;  // OOM
-          key1->insert(new_key1_range);
-          cur_key2 = cur_key2->next;
-          goto end;
-        }
-        if (cur_key1->cmp_min_to_max(&key2_cpy) > 0) {
-          /*
-            The next range in key1 does not overlap with key2_cpy.
-            Insert this range into key1 and move on to the next range
-            in key2.
-          */
-          SEL_ARG *new_key1_range = new (param->mem_root) SEL_ARG(key2_cpy);
-          if (!new_key1_range) return nullptr;  // OOM
-          key1->insert(new_key1_range);
-          break;
-        }
-        /*
-          key2_cpy overlaps with the next range in key1 and the case
-          is now "cur_key2.min <= cur_key1.min <= cur_key2.max". Go back
-          to for(;;) to handle this situation.
-        */
-        continue;
-      } else {
-        /*
-          This is the case:
-          key2_cpy:        [-------]
-          cur_key1:        [------------]
-
-          Result:
-          key1:            [-------][---]
-                           ^        ^
-                           new_arg  cur_key1
-          Steps:
-
-           0) If cur_key1->next_key_part is empty: do nothing.
-              Reason: (key2_cpy->next_key_part OR
-              cur_key1->next_key_part) will be empty and
-              therefore equal to cur_key1->next_key_part. Thus,
-              the range in key2_cpy is completely covered by
-              cur_key1
-           1) Make new_arg with range [cur_key1.min, key2_cpy.max].
-              new_arg->next_key_part is OR between next_key_part of
-              cur_key1 and key2_cpy
-           2) Make cur_key1 the range [key2_cpy.max, cur_key1.max]
-           3) Insert new_arg into key1
-        */
-        if (!cur_key1->next_key_part)  // Step 0
-        {
-          key2_cpy.release_next_key_part();  // Free not used tree
-          break;
-        }
-        SEL_ARG *new_arg = cur_key1->clone_last(&key2_cpy, param->mem_root);
-        if (!new_arg) return nullptr;  // OOM
-        cur_key1->copy_max_to_min(&key2_cpy);
-
-        new_arg->set_next_key_part(
-            key_or(param, cur_key1->next_key_part, key2_cpy.next_key_part));
-        key1->insert(new_arg);
-        break;
-      }
-    }
-    // Move on to next range in key2
-    cur_key2 = cur_key2->next;
-  }
-
-end:
-  /*
-    Add key2 ranges that are non-overlapping with and higher than the
-    highest range in key1.
-  */
-  while (cur_key2) {
-    SEL_ARG *next = cur_key2->next;
-    if (key2_shared) {
-      SEL_ARG *key2_cpy =
-          new (param->mem_root) SEL_ARG(*cur_key2);  // Must make copy
-      if (!key2_cpy) return nullptr;
-      key1->insert(key2_cpy);
-    } else
-      key1->insert(cur_key2);
-    cur_key2 = next;
-  }
-
-  /*
-    TODO: We should call key2->free_tree() here, since this might be the
-    last reference to the tree (if !key2_shared). However, the tree might
-    be in an invalid state since we may have inserted nodes into key1 without
-    taking them out of key2, so we need to clean that up first. As a temporary
-    measure, we TRASH() it to expose any bugs where people hold on to it
-    where we thought they wouldn't.
-  */
-#ifndef NDEBUG
-  if (!key2_shared) TRASH(key2, sizeof(*key2));
-#endif
-  return key1;
-}
-
-/**
-  Compare if two trees are equal, recursively (not necessarily the same
-  elements, but in terms of structure and values in each leaf).
-
-  NOTE: The demand for the same structure means that some trees that are
-  equivalent could be deemed inequal by this function, depending on insertion
-  order.
-
-  @param a First tree to compare.
-  @param b Second tree to compare.
-
-  @return true iff they are equivalent.
-*/
-static bool eq_tree(const SEL_ROOT *a, const SEL_ROOT *b) {
-  if (a == b) return true;
-  if (!a || !b) return false;
-  if (a->type == SEL_ROOT::Type::KEY_RANGE &&
-      b->type == SEL_ROOT::Type::KEY_RANGE)
-    return eq_tree(a->root, b->root);
-  else
-    return a->type == b->type;
-}
-
-static bool eq_tree(const SEL_ARG *a, const SEL_ARG *b) {
-  if (a == b) return true;
-  if (!a || !b || !a->is_same(b)) return false;
-  if (a->left != null_element && b->left != null_element) {
-    if (!eq_tree(a->left, b->left)) return false;
-  } else if (a->left != null_element || b->left != null_element)
-    return false;
-  if (a->right != null_element && b->right != null_element) {
-    if (!eq_tree(a->right, b->right)) return false;
-  } else if (a->right != null_element || b->right != null_element)
-    return false;
-  if (a->next_key_part != b->next_key_part) {  // Sub range
-    if (!a->next_key_part != !b->next_key_part ||
-        !eq_tree(a->next_key_part, b->next_key_part))
-      return false;
-  }
-  return true;
-}
-
-void SEL_ROOT::insert(SEL_ARG *key) {
-  SEL_ARG *element, **par = nullptr, *last_element = nullptr;
-
-  if (type == Type::IMPOSSIBLE) {
-    /*
-      Used to be impossible, but now gets a new range; remove the dummy node
-      that exists in that kind of tree, and set this one as the root
-      (and sole element) instead.
-    */
-    root->release_next_key_part();
-    uint8 maybe_flag = root->maybe_flag;
-    root = key;
-    root->maybe_flag = maybe_flag;
-    root->make_root();
-    type = Type::KEY_RANGE;
-    return;
-  }
-
-  assert(type == Type::KEY_RANGE);
-  assert(root->parent == nullptr);
-  assert(root != null_element);
-  for (element = root; element != null_element;) {
-    last_element = element;
-    if (key->cmp_min_to_min(element) > 0) {
-      par = &element->right;
-      element = element->right;
-    } else {
-      par = &element->left;
-      element = element->left;
-    }
-  }
-  *par = key;
-  key->parent = last_element;
-  /* Link in list */
-  if (par == &last_element->left) {
-    key->next = last_element;
-    if ((key->prev = last_element->prev)) key->prev->next = key;
-    last_element->prev = key;
-  } else {
-    if ((key->next = last_element->next)) key->next->prev = key;
-    key->prev = last_element;
-    last_element->next = key;
-  }
-  key->left = key->right = null_element;
-  uint8 maybe_flag = root->maybe_flag;
-  root = root->rb_insert(key);  // rebalance tree
-  root->maybe_flag = maybe_flag;
-  ++elements;
-}
-
-SEL_ARG *SEL_ROOT::find_range(const SEL_ARG *key) const {
-  SEL_ARG *element = root, *found = nullptr;
-
-  for (;;) {
-    if (element == null_element) return found;
-    int cmp = element->cmp_min_to_min(key);
-    if (cmp == 0) return element;
-    if (cmp < 0) {
-      found = element;
-      element = element->right;
-    } else
-      element = element->left;
-  }
-}
-
-/*
-  Remove a element from the tree
-
-  SYNOPSIS
-    tree_delete()
-    key		Key that is to be deleted from tree (this)
-
-  NOTE
-    This also frees all sub trees that is used by the element
-
-*/
-
-void SEL_ROOT::tree_delete(SEL_ARG *key) {
-  enum SEL_ARG::leaf_color remove_color;
-  SEL_ARG *nod, **par, *fix_par;
-  DBUG_TRACE;
-
-  assert(this->type == Type::KEY_RANGE);
-  assert(this->root->parent == nullptr);
-
-  /*
-    If deleting the last element, we are now of type IMPOSSIBLE.
-    Keep the element around so that we have somewhere to store
-    next_key_part etc. if needed in the future.
-  */
-  if (elements == 1) {
-    assert(key == root);
-    type = Type::IMPOSSIBLE;
-    key->release_next_key_part();
-    return;
-  }
-
-  /* Unlink from list */
-  if (key->prev) key->prev->next = key->next;
-  if (key->next) key->next->prev = key->prev;
-  if (key->next_key_part) --key->next_key_part->use_count;
-  if (!key->parent)
-    par = &root;
-  else
-    par = key->parent_ptr();
-
-  if (key->left == null_element) {
-    *par = nod = key->right;
-    fix_par = key->parent;
-    if (nod != null_element) nod->parent = fix_par;
-    remove_color = key->color;
-  } else if (key->right == null_element) {
-    *par = nod = key->left;
-    nod->parent = fix_par = key->parent;
-    remove_color = key->color;
-  } else {
-    SEL_ARG *tmp = key->next;               // next bigger key (exist!)
-    nod = *tmp->parent_ptr() = tmp->right;  // unlink tmp from tree
-    fix_par = tmp->parent;
-    if (nod != null_element) nod->parent = fix_par;
-    remove_color = tmp->color;
-
-    tmp->parent = key->parent;  // Move node in place of key
-    (tmp->left = key->left)->parent = tmp;
-    if ((tmp->right = key->right) != null_element) tmp->right->parent = tmp;
-    tmp->color = key->color;
-    *par = tmp;
-    if (fix_par == key)  // key->right == key->next
-      fix_par = tmp;     // new parent of nod
-  }
-
-  --elements;
-  if (root == null_element) return;  // Maybe root later
-  if (remove_color == SEL_ARG::BLACK) {
-    uint8 maybe_flag = root->maybe_flag;
-    root = rb_delete_fixup(root, nod, fix_par);
-    root->maybe_flag = maybe_flag;
-  }
-#ifndef NDEBUG
-  test_rb_tree(root, root->parent);
-#endif
-}
-
-/* Functions to fix up the tree after insert and delete */
-
-static void left_rotate(SEL_ARG **root, SEL_ARG *leaf) {
-  SEL_ARG *y = leaf->right;
-  leaf->right = y->left;
-  if (y->left != null_element) y->left->parent = leaf;
-  if (!(y->parent = leaf->parent))
-    *root = y;
-  else
-    *leaf->parent_ptr() = y;
-  y->left = leaf;
-  leaf->parent = y;
-}
-
-static void right_rotate(SEL_ARG **root, SEL_ARG *leaf) {
-  SEL_ARG *y = leaf->left;
-  leaf->left = y->right;
-  if (y->right != null_element) y->right->parent = leaf;
-  if (!(y->parent = leaf->parent))
-    *root = y;
-  else
-    *leaf->parent_ptr() = y;
-  y->right = leaf;
-  leaf->parent = y;
-}
-
-SEL_ARG *SEL_ARG::rb_insert(SEL_ARG *leaf) {
-  SEL_ARG *y, *par, *par2, *root;
-  root = this;
-  assert(!root->parent);
-  assert(root->color == BLACK);
-
-  leaf->color = RED;
-  while (leaf != root && (par = leaf->parent)->color ==
-                             RED) {  // This can't be root or 1 level under
-    assert(leaf->parent->parent);
-    if (par == (par2 = leaf->parent->parent)->left) {
-      y = par2->right;
-      if (y->color == RED) {
-        par->color = BLACK;
-        y->color = BLACK;
-        leaf = par2;
-        leaf->color = RED; /* And the loop continues */
-      } else {
-        if (leaf == par->right) {
-          left_rotate(&root, leaf->parent);
-          par = leaf; /* leaf is now parent to old leaf */
-        }
-        par->color = BLACK;
-        par2->color = RED;
-        right_rotate(&root, par2);
-        break;
-      }
-    } else {
-      y = par2->left;
-      if (y->color == RED) {
-        par->color = BLACK;
-        y->color = BLACK;
-        leaf = par2;
-        leaf->color = RED; /* And the loop continues */
-      } else {
-        if (leaf == par->left) {
-          right_rotate(&root, par);
-          par = leaf;
-        }
-        par->color = BLACK;
-        par2->color = RED;
-        left_rotate(&root, par2);
-        break;
-      }
-    }
-  }
-  root->color = BLACK;
-#ifndef NDEBUG
-  test_rb_tree(root, root->parent);
-#endif
-  return root;
-}
-
-SEL_ARG *rb_delete_fixup(SEL_ARG *root, SEL_ARG *key, SEL_ARG *par) {
-  SEL_ARG *x, *w;
-  root->parent = nullptr;
-
-  x = key;
-  while (x != root && x->color == SEL_ARG::BLACK) {
-    if (x == par->left) {
-      w = par->right;
-      if (w->color == SEL_ARG::RED) {
-        w->color = SEL_ARG::BLACK;
-        par->color = SEL_ARG::RED;
-        left_rotate(&root, par);
-        w = par->right;
-      }
-      if (w->left->color == SEL_ARG::BLACK &&
-          w->right->color == SEL_ARG::BLACK) {
-        w->color = SEL_ARG::RED;
-        x = par;
-      } else {
-        if (w->right->color == SEL_ARG::BLACK) {
-          w->left->color = SEL_ARG::BLACK;
-          w->color = SEL_ARG::RED;
-          right_rotate(&root, w);
-          w = par->right;
-        }
-        w->color = par->color;
-        par->color = SEL_ARG::BLACK;
-        w->right->color = SEL_ARG::BLACK;
-        left_rotate(&root, par);
-        x = root;
-        break;
-      }
-    } else {
-      w = par->left;
-      if (w->color == SEL_ARG::RED) {
-        w->color = SEL_ARG::BLACK;
-        par->color = SEL_ARG::RED;
-        right_rotate(&root, par);
-        w = par->left;
-      }
-      if (w->right->color == SEL_ARG::BLACK &&
-          w->left->color == SEL_ARG::BLACK) {
-        w->color = SEL_ARG::RED;
-        x = par;
-      } else {
-        if (w->left->color == SEL_ARG::BLACK) {
-          w->right->color = SEL_ARG::BLACK;
-          w->color = SEL_ARG::RED;
-          left_rotate(&root, w);
-          w = par->left;
-        }
-        w->color = par->color;
-        par->color = SEL_ARG::BLACK;
-        w->left->color = SEL_ARG::BLACK;
-        right_rotate(&root, par);
-        x = root;
-        break;
-      }
-    }
-    par = x->parent;
-  }
-  x->color = SEL_ARG::BLACK;
-  return root;
-}
-
-#ifndef NDEBUG
-/* Test that the properties for a red-black tree hold */
-
-int test_rb_tree(SEL_ARG *element, SEL_ARG *parent) {
-  int count_l, count_r;
-
-  if (element == null_element) return 0;  // Found end of tree
-  if (element->parent != parent) {
-    LogErr(ERROR_LEVEL, ER_TREE_CORRUPT_PARENT_SHOULD_POINT_AT_PARENT);
-    return -1;
-  }
-  if (!parent && element->color != SEL_ARG::BLACK) {
-    LogErr(ERROR_LEVEL, ER_TREE_CORRUPT_ROOT_SHOULD_BE_BLACK);
-    return -1;
-  }
-  if (element->color == SEL_ARG::RED &&
-      (element->left->color == SEL_ARG::RED ||
-       element->right->color == SEL_ARG::RED)) {
-    LogErr(ERROR_LEVEL, ER_TREE_CORRUPT_2_CONSECUTIVE_REDS);
-    return -1;
-  }
-  if (element->left == element->right &&
-      element->left != null_element) {  // Dummy test
-    LogErr(ERROR_LEVEL, ER_TREE_CORRUPT_RIGHT_IS_LEFT);
-    return -1;
-  }
-  count_l = test_rb_tree(element->left, element);
-  count_r = test_rb_tree(element->right, element);
-  if (count_l >= 0 && count_r >= 0) {
-    if (count_l == count_r) return count_l + (element->color == SEL_ARG::BLACK);
-    LogErr(ERROR_LEVEL, ER_TREE_CORRUPT_INCORRECT_BLACK_COUNT, count_l,
-           count_r);
-  }
-  return -1;  // Error, no more warnings
-}
-#endif
-
-/**
-  Count how many times SEL_ARG graph "root" refers to its part "key" via
-  transitive closure.
-
-  @param root  An RB-Root node in a SEL_ARG graph.
-  @param key   Another RB-Root node in that SEL_ARG graph.
-  @param seen  Which SEL_ARGs we have already seen in this traversal.
-               Used for deduplication, so that we only count each
-               SEL_ARG once.
-
-  The passed "root" node may refer to "key" node via root->next_key_part,
-  root->next->n
-
-  This function counts how many times the node "key" is referred (via
-  SEL_ARG::next_key_part) by
-  - intervals of RB-tree pointed by "root",
-  - intervals of RB-trees that are pointed by SEL_ARG::next_key_part from
-  intervals of RB-tree pointed by "root",
-  - and so on.
-
-  Here is an example (horizontal links represent next_key_part pointers,
-  vertical links - next/prev prev pointers):
-
-         +----+               $
-         |root|-----------------+
-         +----+               $ |
-           |                  $ |
-           |                  $ |
-         +----+       +---+   $ |     +---+    Here the return value
-         |    |- ... -|   |---$-+--+->|key|    will be 4.
-         +----+       +---+   $ |  |  +---+
-           |                  $ |  |
-          ...                 $ |  |
-           |                  $ |  |
-         +----+   +---+       $ |  |
-         |    |---|   |---------+  |
-         +----+   +---+       $    |
-           |        |         $    |
-          ...     +---+       $    |
-                  |   |------------+
-                  +---+       $
-  @return
-  Number of links to "key" from nodes reachable from "root".
-*/
-
-static ulong count_key_part_usage(const SEL_ROOT *root, const SEL_ROOT *key,
-                                  std::set<const SEL_ROOT *> *seen) {
-  // Don't count paths from a given key twice.
-  if (seen->count(root)) return 0;
-  seen->insert(root);
-  ulong count = 0;
-  for (SEL_ARG *node = root->root->first(); node; node = node->next) {
-    if (node->next_key_part) {
-      if (node->next_key_part == key) count++;
-      if (node->next_key_part->root->part < key->root->part)
-        count += count_key_part_usage(node->next_key_part, key, seen);
-    }
-  }
-  return count;
-}
-
-bool SEL_ROOT::test_use_count(const SEL_ROOT *origin) const {
-  uint e_count = 0;
-  if (this == origin && use_count != 1) {
-    LogErr(INFORMATION_LEVEL, ER_WRONG_COUNT_FOR_ORIGIN, use_count, this);
-    assert(false);
-    return true;
-  }
-  if (type != SEL_ROOT::Type::KEY_RANGE) return false;
-  for (SEL_ARG *pos = root->first(); pos; pos = pos->next) {
-    e_count++;
-    if (pos->next_key_part) {
-      std::set<const SEL_ROOT *> seen;
-      ulong count = count_key_part_usage(origin, pos->next_key_part, &seen);
-      /*
-        This cannot be a strict equality test, since there might be
-        connections from the keys[] array that we don't see.
-      */
-      if (count > pos->next_key_part->use_count) {
-        LogErr(INFORMATION_LEVEL, ER_WRONG_COUNT_FOR_KEY, pos->next_key_part,
-               pos->next_key_part->use_count, count);
-        assert(false);
-        return true;
-      }
-      pos->next_key_part->test_use_count(origin);
-    }
-  }
-  if (e_count != elements) {
-    LogErr(WARNING_LEVEL, ER_WRONG_COUNT_OF_ELEMENTS, e_count, elements, this);
-    assert(false);
-    return true;
-  }
-  return false;
-}
-
-inline bool SEL_ROOT::simple_key() const {
-  return elements == 1 && !root->next_key_part;
-}
-
-/****************************************************************************
-  MRR Range Sequence Interface implementation that walks a SEL_ARG* tree.
- ****************************************************************************/
-
-/* MRR range sequence, SEL_ARG* implementation: stack entry */
-struct RANGE_SEQ_ENTRY {
-  /*
-    Pointers in min and max keys. They point to right-after-end of key
-    images. The 0-th entry has these pointing to key tuple start.
-  */
-  uchar *min_key, *max_key;
-
-  /*
-    Flags, for {keypart0, keypart1, ... this_keypart} subtuple.
-    min_key_flag may have NULL_RANGE set.
-  */
-  uint min_key_flag, max_key_flag;
-  enum ha_rkey_function rkey_func_flag;
-  /* Number of key parts */
-  uint min_key_parts, max_key_parts;
-  /**
-    Pointer into the R-B tree for this keypart. It points to the
-    currently active range for the keypart, so calling next on it will
-    get to the next range. sel_arg_range_seq_next() uses this to avoid
-    reparsing the R-B range trees each time a new range is fetched.
-  */
-  SEL_ARG *key_tree;
-};
-
-/*
-  MRR range sequence, SEL_ARG* implementation: SEL_ARG graph traversal context
-*/
-class Sel_arg_range_sequence {
- private:
-  /**
-    Stack of ranges for the curr_kp first keyparts. Used by
-    sel_arg_range_seq_next() so that if the next range is equal to the
-    previous one for the first x keyparts, stack[x-1] can be
-    accumulated with the new range in keyparts > x to quickly form
-    the next range to return.
-
-    Notation used below: "x:y" means a range where
-    "column_in_keypart_0=x" and "column_in_keypart_1=y". For
-    simplicity, only equality (no BETWEEN, < etc) is considered in the
-    example but the same principle applies to other range predicate
-    operators too.
-
-    Consider a query with these range predicates:
-      (kp0=1 and kp1=2 and kp2=3) or
-      (kp0=1 and kp1=2 and kp2=4) or
-      (kp0=1 and kp1=3 and kp2=5) or
-      (kp0=1 and kp1=3 and kp2=6)
-
-    1) sel_arg_range_seq_next() is called the first time
-       - traverse the R-B tree (see SEL_ARG) to find the first range
-       - returns range "1:2:3"
-       - values in stack after this: stack[1, 1:2, 1:2:3]
-    2) sel_arg_range_seq_next() is called second time
-       - keypart 2 has another range, so the next range in
-         keypart 2 is appended to stack[1] and saved
-         in stack[2]
-       - returns range "1:2:4"
-       - values in stack after this: stack[1, 1:2, 1:2:4]
-    3) sel_arg_range_seq_next() is called the third time
-       - no more ranges in keypart 2, but keypart 1 has
-         another range, so the next range in keypart 1 is
-         appended to stack[0] and saved in stack[1]. The first
-         range in keypart 2 is then appended to stack[1] and
-         saved in stack[2]
-       - returns range "1:3:5"
-       - values in stack after this: stack[1, 1:3, 1:3:5]
-    4) sel_arg_range_seq_next() is called the fourth time
-       - keypart 2 has another range, see 2)
-       - returns range "1:3:6"
-       - values in stack after this: stack[1, 1:3, 1:3:6]
-  */
-  RANGE_SEQ_ENTRY stack[MAX_REF_PARTS];
-  /*
-    Index of last used element in the above array. A value of -1 means
-    that the stack is empty.
-  */
-  int curr_kp;
-
- public:
-  uint keyno;      /* index of used tree in SEL_TREE structure */
-  uint real_keyno; /* Number of the index in tables */
-
-  PARAM *const param;
-  SEL_ARG *start; /* Root node of the traversed SEL_ARG* graph */
-
-  Sel_arg_range_sequence(PARAM *param_arg) : param(param_arg) { reset(); }
-
-  void reset() {
-    stack[0].key_tree = nullptr;
-    stack[0].min_key = (uchar *)param->min_key;
-    stack[0].min_key_flag = 0;
-    stack[0].min_key_parts = 0;
-    stack[0].rkey_func_flag = HA_READ_INVALID;
-
-    stack[0].max_key = (uchar *)param->max_key;
-    stack[0].max_key_flag = 0;
-    stack[0].max_key_parts = 0;
-    curr_kp = -1;
-  }
-
-  bool stack_empty() const { return (curr_kp == -1); }
-
-  void stack_push_range(SEL_ARG *key_tree);
-
-  void stack_pop_range() {
-    assert(!stack_empty());
-    if (curr_kp == 0)
-      reset();
-    else
-      curr_kp--;
-  }
-
-  int stack_size() const { return curr_kp + 1; }
-
-  RANGE_SEQ_ENTRY *stack_top() {
-    return stack_empty() ? nullptr : &stack[curr_kp];
-  }
-};
-
-/*
-  Range sequence interface, SEL_ARG* implementation: Initialize the traversal
-
-  SYNOPSIS
-    init()
-      init_params  SEL_ARG tree traversal context
-
-  RETURN
-    Value of init_param
-*/
-
-static range_seq_t sel_arg_range_seq_init(void *init_param, uint, uint) {
-  Sel_arg_range_sequence *seq =
-      static_cast<Sel_arg_range_sequence *>(init_param);
-  seq->reset();
-  return init_param;
-}
-
-void Sel_arg_range_sequence::stack_push_range(SEL_ARG *key_tree) {
-  assert((uint)curr_kp + 1 < MAX_REF_PARTS);
-
-  RANGE_SEQ_ENTRY *push_position = &stack[curr_kp + 1];
-  RANGE_SEQ_ENTRY *last_added_kp = stack_top();
-  if (stack_empty()) {
-    /*
-       If we get here this is either
-         a) the first time a range sequence is constructed for this
-            range access method (in which case stack[0] has not been
-            modified since the constructor was called), or
-         b) there are multiple ranges for the first keypart in the
-            condition (and we have called stack_pop_range() to empty
-            the stack).
-       In both cases, reset() has been called and all fields in
-       push_position have been reset. All we need to do is to copy the
-       min/max key flags from the predicate we're about to add to
-       stack[0].
-    */
-    push_position->min_key_flag = key_tree->get_min_flag();
-    push_position->max_key_flag = key_tree->get_max_flag();
-    push_position->rkey_func_flag = key_tree->rkey_func_flag;
-  } else {
-    push_position->min_key = last_added_kp->min_key;
-    push_position->max_key = last_added_kp->max_key;
-    push_position->min_key_parts = last_added_kp->min_key_parts;
-    push_position->max_key_parts = last_added_kp->max_key_parts;
-    push_position->min_key_flag =
-        last_added_kp->min_key_flag | key_tree->get_min_flag();
-    push_position->max_key_flag =
-        last_added_kp->max_key_flag | key_tree->get_max_flag();
-    push_position->rkey_func_flag = key_tree->rkey_func_flag;
-  }
-
-  push_position->key_tree = key_tree;
-  /* psergey-merge-done:
-  key_tree->store(arg->param->key[arg->keyno][key_tree->part].store_length,
-                  &cur->min_key, prev->min_key_flag,
-                  &cur->max_key, prev->max_key_flag);
-  */
-  key_tree->store_min_max_values(
-      param->key[keyno][key_tree->part].store_length, &push_position->min_key,
-      (last_added_kp ? last_added_kp->min_key_flag : 0),
-      &push_position->max_key,
-      (last_added_kp ? last_added_kp->max_key_flag : 0),
-      (int *)&push_position->min_key_parts,
-      (int *)&push_position->max_key_parts);
-  if (key_tree->is_null_interval()) push_position->min_key_flag |= NULL_RANGE;
-  curr_kp++;
-}
-
-/*
-  Range sequence interface, SEL_ARG* implementation: get the next interval
-  in the R-B tree
-
-  SYNOPSIS
-    sel_arg_range_seq_next()
-      rseq        Value returned from sel_arg_range_seq_init
-      range  OUT  Store information about the range here
-
-  DESCRIPTION
-    This is "get_next" function for Range sequence interface implementation
-    for SEL_ARG* tree.
-
-  IMPLEMENTATION
-    The traversal also updates those param members:
-      - is_ror_scan
-      - range_count
-      - max_key_part
-
-  RETURN
-    0  Ok
-    1  No more ranges in the sequence
-
-  NOTE: append_range_all_keyparts(), which is used to e.g. print
-  ranges to Optimizer Trace in a human readable format, mimics the
-  behavior of this function.
-*/
-
-// psergey-merge-todo: support check_quick_keys:max_keypart
-static uint sel_arg_range_seq_next(range_seq_t rseq, KEY_MULTI_RANGE *range) {
-  SEL_ARG *key_tree;
-  Sel_arg_range_sequence *seq = static_cast<Sel_arg_range_sequence *>(rseq);
-
-  if (seq->stack_empty()) {
-    /*
-      This is the first time sel_arg_range_seq_next is called.
-      seq->start points to the root of the R-B tree for the first
-      keypart
-    */
-    key_tree = seq->start;
-
-    /*
-      Move to the first range for the first keypart. Save this range
-      in seq->stack[0] and carry on to ranges in the next keypart if
-      any
-    */
-    key_tree = key_tree->first();
-    seq->stack_push_range(key_tree);
-  } else {
-    /*
-      This is not the first time sel_arg_range_seq_next is called, so
-      seq->stack is populated with the range the last call to this
-      function found. seq->stack[current_keypart].key_tree points to a
-      leaf in the R-B tree of the last keypart that was part of the
-      former range. This is the starting point for finding the next
-      range. @see Sel_arg_range_sequence::stack
-    */
-    // See if there are more ranges in this or any of the previous keyparts
-    while (true) {
-      key_tree = seq->stack_top()->key_tree;
-      seq->stack_pop_range();
-      if (key_tree->next) {
-        /* This keypart has more ranges */
-        assert(key_tree->next != null_element);
-        key_tree = key_tree->next;
-
-        /*
-          save the next range for this keypart and carry on to ranges in
-          the next keypart if any
-        */
-        seq->stack_push_range(key_tree);
-        seq->param->is_ror_scan = false;
-        break;
-      }
-
-      if (seq->stack_empty()) {
-        // There are no more ranges for the first keypart: we're done
-        return 1;
-      }
-      /*
-         There are no more ranges for the current keypart. Step back
-         to the previous keypart and see if there are more ranges
-         there.
-      */
-    }
-  }
-
-  assert(!seq->stack_empty());
-
-  /*
-    Add range info for the next keypart if
-      1) there is a range predicate for a later keypart
-      2) the range predicate is for the next keypart in the index: a
-         range predicate on keypartX+1 can only be used if there is a
-         range predicate on keypartX.
-      3) the range predicate on the next keypart is usable
-  */
-  while (key_tree->next_key_part &&                                    // 1)
-         key_tree->next_key_part->root != null_element &&              // 1)
-         key_tree->next_key_part->root->part == key_tree->part + 1 &&  // 2)
-         key_tree->next_key_part->type == SEL_ROOT::Type::KEY_RANGE)   // 3)
-  {
-    {
-      DBUG_PRINT("info", ("while(): key_tree->part %d", key_tree->part));
-      RANGE_SEQ_ENTRY *cur = seq->stack_top();
-      const size_t min_key_total_length = cur->min_key - seq->param->min_key;
-      const size_t max_key_total_length = cur->max_key - seq->param->max_key;
-
-      /*
-        Check if more ranges can be added. This is the case if all
-        predicates for keyparts handled so far are equality
-        predicates. If either of the following apply, there are
-        non-equality predicates in stack[]:
-
-        1) min_key_total_length != max_key_total_length (because
-           equality ranges are stored as "min_key = max_key = <value>")
-        2) memcmp(<min_key_values>,<max_key_values>) != 0 (same argument as 1)
-        3) A min or max flag has been set: Because flags denote ranges
-           ('<', '<=' etc), any value but 0 indicates a non-equality
-           predicate.
-      */
-
-      uchar *min_key_start;
-      uchar *max_key_start;
-      size_t cur_key_length;
-
-      if (seq->stack_size() == 1) {
-        min_key_start = seq->param->min_key;
-        max_key_start = seq->param->max_key;
-        cur_key_length = min_key_total_length;
-      } else {
-        const RANGE_SEQ_ENTRY prev = cur[-1];
-        min_key_start = prev.min_key;
-        max_key_start = prev.max_key;
-        cur_key_length = cur->min_key - prev.min_key;
-      }
-
-      if ((min_key_total_length != max_key_total_length) ||          // 1)
-          (memcmp(min_key_start, max_key_start, cur_key_length)) ||  // 2)
-          (key_tree->min_flag || key_tree->max_flag))                // 3)
-      {
-        DBUG_PRINT("info", ("while(): inside if()"));
-        /*
-          The range predicate up to and including the one in key_tree
-          is usable by range access but does not allow subranges made
-          up from predicates in later keyparts. This may e.g. be
-          because the predicate operator is "<". Since there are range
-          predicates on more keyparts, we use those to more closely
-          specify the start and stop locations for the range. Example:
-
-                "SELECT * FROM t1 WHERE a >= 2 AND b >= 3":
-
-                t1 content:
-                -----------
-                1 1
-                2 1     <- 1)
-                2 2
-                2 3     <- 2)
-                2 4
-                3 1
-                3 2
-                3 3
-
-          The predicate cannot be translated into something like
-             "(a=2 and b>=3) or (a=3 and b>=3) or ..."
-          I.e., it cannot be divided into subranges, but by storing
-          min/max key below we can at least start the scan from 2)
-          instead of 1)
-
-        */
-        seq->param->is_ror_scan = false;
-        key_tree->store_next_min_max_keys(
-            seq->param->key[seq->keyno], &cur->min_key, &cur->min_key_flag,
-            &cur->max_key, &cur->max_key_flag, (int *)&cur->min_key_parts,
-            (int *)&cur->max_key_parts);
-        break;
-      }
-    }
-
-    /*
-      There are usable range predicates for the next keypart and the
-      range predicate for the current keypart allows us to make use of
-      them. Move to the first range predicate for the next keypart.
-      Push this range predicate to seq->stack and move on to the next
-      keypart (if any). @see Sel_arg_range_sequence::stack
-    */
-    key_tree = key_tree->next_key_part->root->first();
-    seq->stack_push_range(key_tree);
-  }
-
-  assert(!seq->stack_empty() && (seq->stack_top() != nullptr));
-
-  // We now have a full range predicate in seq->stack_top()
-  RANGE_SEQ_ENTRY *cur = seq->stack_top();
-  PARAM *param = seq->param;
-  size_t min_key_length = cur->min_key - param->min_key;
-
-  if (cur->min_key_flag & GEOM_FLAG) {
-    range->range_flag = cur->min_key_flag;
-
-    /* Here minimum contains also function code bits, and maximum is +inf */
-    range->start_key.key = param->min_key;
-    range->start_key.length = min_key_length;
-    range->start_key.keypart_map = make_prev_keypart_map(cur->min_key_parts);
-    range->start_key.flag = cur->rkey_func_flag;
-    /*
-      Spatial operators are only allowed on spatial indexes, and no
-      spatial index can at the moment return rows in ROWID order
-    */
-    assert(!param->is_ror_scan);
-  } else {
-    const KEY *cur_key_info = &param->table->key_info[seq->real_keyno];
-    range->range_flag = cur->min_key_flag | cur->max_key_flag;
-
-    range->start_key.key = param->min_key;
-    range->start_key.length = cur->min_key - param->min_key;
-    range->start_key.keypart_map = make_prev_keypart_map(cur->min_key_parts);
-    range->start_key.flag =
-        (cur->min_key_flag & NEAR_MIN ? HA_READ_AFTER_KEY : HA_READ_KEY_EXACT);
-
-    range->end_key.key = param->max_key;
-    range->end_key.length = cur->max_key - param->max_key;
-    range->end_key.keypart_map = make_prev_keypart_map(cur->max_key_parts);
-    range->end_key.flag =
-        (cur->max_key_flag & NEAR_MAX ? HA_READ_BEFORE_KEY : HA_READ_AFTER_KEY);
-    /*
-      This is an equality range (keypart_0=X and ... and keypart_n=Z) if
-        1) There are no flags indicating open range (e.g.,
-           "keypart_x > y") or GIS.
-        2) The lower bound and the upper bound of the range has the
-           same value (min_key == max_key).
-    */
-    const uint is_open_range =
-        (NO_MIN_RANGE | NO_MAX_RANGE | NEAR_MIN | NEAR_MAX | GEOM_FLAG);
-    const bool is_eq_range_pred =
-        !(cur->min_key_flag & is_open_range) &&              // 1)
-        !(cur->max_key_flag & is_open_range) &&              // 1)
-        range->start_key.length == range->end_key.length &&  // 2)
-        !memcmp(param->min_key, param->max_key, range->start_key.length);
-
-    if (is_eq_range_pred) {
-      range->range_flag = EQ_RANGE;
-      /*
-        Use statistics instead of index dives for estimates of rows in
-        this range if the user requested it
-      */
-      if (param->use_index_statistics)
-        range->range_flag |= SKIP_RECORDS_IN_RANGE;
-
-      /*
-        An equality range is a unique range (0 or 1 rows in the range)
-        if the index is unique (1) and all keyparts are used (2).
-        Note that keys which are extended with PK parts have no
-        HA_NOSAME flag. So we can use user_defined_key_parts.
-      */
-      if (cur_key_info->flags & HA_NOSAME &&  // 1)
-          (uint)key_tree->part + 1 ==
-              cur_key_info->user_defined_key_parts)  // 2)
-        range->range_flag |= UNIQUE_RANGE | (cur->min_key_flag & NULL_RANGE);
-    }
-
-    if (param->is_ror_scan) {
-      const uint key_part_number = key_tree->part + 1;
-      /*
-        If we get here, the condition on the key was converted to form
-        "(keyXpart1 = c1) AND ... AND (keyXpart{key_tree->part - 1} = cN) AND
-          somecond(keyXpart{key_tree->part})"
-        Check if
-          somecond is "keyXpart{key_tree->part} = const" and
-          uncovered "tail" of KeyX parts is either empty or is identical to
-          first members of clustered primary key.
-
-        If last key part is PK part added to the key as an extension
-        and is_key_scan_ror() result is true then it's possible to
-        use ROR scan.
-      */
-      if ((!is_eq_range_pred &&
-           key_part_number <= cur_key_info->user_defined_key_parts) ||
-          !is_key_scan_ror(param, seq->real_keyno, key_part_number))
-        param->is_ror_scan = false;
-    }
-  }
-
-  seq->param->range_count++;
-  seq->param->max_key_part =
-      max<uint>(seq->param->max_key_part, key_tree->part);
-
-  if (seq->param->skip_records_in_range)
-    range->range_flag |= SKIP_RECORDS_IN_RANGE;
-
-  return 0;
-}
-
-/*
-  Calculate estimate of number records that will be retrieved by a range
-  scan on given index using given SEL_ARG intervals tree.
-
-  SYNOPSIS
-    check_quick_select()
-      param             Parameter from test_quick_select
-      idx               Number of index to use in PARAM::key SEL_TREE::key
-      index_only        true  - assume only index tuples will be accessed
-                        false - assume full table rows will be read
-      tree              Transformed selection condition, tree->key[idx] holds
-                        the intervals for the given index.
-      update_tbl_stats  true <=> update table->quick_* with information
-                        about range scan we've evaluated.
-      mrr_flags   INOUT MRR access flags
-      cost        OUT   Scan cost
-
-  NOTES
-    param->is_ror_scan is set to reflect if the key scan is a ROR (see
-    is_key_scan_ror function for more info)
-    param->table->quick_*, param->range_count (and maybe others) are
-    updated with data of given key scan, see quick_range_seq_next for details.
-
-  RETURN
-    Estimate # of records to be retrieved.
-    HA_POS_ERROR if estimate calculation failed due to table handler problems.
-*/
-
-static ha_rows check_quick_select(PARAM *param, uint idx, bool index_only,
-                                  SEL_ROOT *tree, bool update_tbl_stats,
-                                  uint *mrr_flags, uint *bufsize,
-                                  Cost_estimate *cost) {
-  Sel_arg_range_sequence seq(param);
-  RANGE_SEQ_IF seq_if = {sel_arg_range_seq_init, sel_arg_range_seq_next,
-                         nullptr};
-  handler *file = param->table->file;
-  ha_rows rows;
-  uint keynr = param->real_keynr[idx];
-  DBUG_TRACE;
-
-  /* Handle cases when we don't have a valid non-empty list of range */
-  if (!tree) return HA_POS_ERROR;
-  if (tree->type == SEL_ROOT::Type::IMPOSSIBLE) return 0L;
-  if (tree->type != SEL_ROOT::Type::KEY_RANGE || tree->root->part != 0)
-    return HA_POS_ERROR;  // Don't use tree
-
-  seq.keyno = idx;
-  seq.real_keyno = keynr;
-  seq.start = tree->root;
-
-  param->range_count = 0;
-  param->max_key_part = 0;
-
-  /*
-    If there are more equality ranges than specified by the
-    eq_range_index_dive_limit variable we switches from using index
-    dives to use statistics.
-  */
-  uint range_count = 0;
-  param->use_index_statistics = eq_ranges_exceeds_limit(
-      tree, &range_count, param->thd->variables.eq_range_index_dive_limit);
-  param->is_ror_scan = true;
-  param->is_imerge_scan = true;
-  if (file->index_flags(keynr, 0, true) & HA_KEY_SCAN_NOT_ROR)
-    param->is_ror_scan = false;
-
-  *mrr_flags = param->force_default_mrr ? HA_MRR_USE_DEFAULT_IMPL : 0;
-  *mrr_flags |= HA_MRR_NO_ASSOCIATION;
-  /*
-    Pass HA_MRR_SORTED to see if MRR implementation can handle sorting.
-  */
-  if (param->order_direction != ORDER_NOT_RELEVANT) *mrr_flags |= HA_MRR_SORTED;
-
-  bool pk_is_clustered = file->primary_key_is_clustered();
-  if (index_only &&
-      (file->index_flags(keynr, param->max_key_part, true) & HA_KEYREAD_ONLY) &&
-      !(pk_is_clustered && keynr == param->table->s->primary_key))
-    *mrr_flags |= HA_MRR_INDEX_ONLY;
-
-  if (current_thd->lex->sql_command != SQLCOM_SELECT)
-    *mrr_flags |= HA_MRR_SORTED;  // Assumed to give faster ins/upd/del
-
-  *bufsize = param->thd->variables.read_rnd_buff_size;
-  // Sets is_ror_scan to false for some queries, e.g. multi-ranges
-  rows = file->multi_range_read_info_const(keynr, &seq_if, (void *)&seq, 0,
-                                           bufsize, mrr_flags, cost);
-  if (rows != HA_POS_ERROR) {
-    param->table->quick_rows[keynr] = rows;
-    if (update_tbl_stats) {
-      param->table->quick_keys.set_bit(keynr);
-      param->table->quick_key_parts[keynr] = param->max_key_part + 1;
-      param->table->quick_n_ranges[keynr] = param->range_count;
-      param->table->quick_condition_rows =
-          min(param->table->quick_condition_rows, rows);
-    }
-    param->table->possible_quick_keys.set_bit(keynr);
-  }
-  /*
-    Check whether ROR scan could be used. It cannot be used if
-    1. Index algo is not HA_KEY_ALG_BTREE or HA_KEY_ALG_SE_SPECIFIC
-       (this mostly covers engines like Archive/Federated.)
-       TODO: Don't have this logic here, make table engines return
-       appropriate flags instead.
-    2. Any of the keyparts in the index chosen is descending. Desc
-       indexes do not work well for ROR scans, except for clustered PK.
-    3. SE states the index can't be used for ROR. We need 2nd check
-       here to avoid enabling it for a non-ROR PK.
-    4. Index contains virtual columns. QUICK_ROR_INTERSECT_SELECT
-       and QUICK_ROR_UNION_SELECT do read_set manipulations in reset(),
-       which breaks virtual generated column's computation logic, which
-       is used when reading index values. So, disable index merge
-       intersection/union for any index on such column.
-       @todo lift this implementation restriction
-  */
-  // Get the index key algorithm
-  enum ha_key_alg key_alg = param->table->key_info[seq.real_keyno].algorithm;
-
-  // Check if index has desc keypart
-  KEY_PART_INFO *key_part = param->table->key_info[keynr].key_part;
-  KEY_PART_INFO *key_part_end =
-      key_part + param->table->key_info[keynr].user_defined_key_parts;
-  for (; key_part != key_part_end; ++key_part) {
-    if (key_part->key_part_flag & HA_REVERSE_SORT) {
-      // ROR will be enabled again for clustered PK, see 'else if' below.
-      param->is_ror_scan = false;  // 2
-      param->is_imerge_scan = false;
-      break;
-    }
-  }
-  if (((key_alg != HA_KEY_ALG_BTREE) &&
-       (key_alg != HA_KEY_ALG_SE_SPECIFIC)) ||                      // 1
-      (file->index_flags(keynr, 0, true) & HA_KEY_SCAN_NOT_ROR) ||  // 3
-      param->table->index_contains_some_virtual_gcol(keynr))        // 4
-  {
-    param->is_ror_scan = false;
-  } else if (param->table->s->primary_key == keynr && pk_is_clustered) {
-    /*
-      Clustered PK scan is always a ROR scan (TODO: same as above).
-      This can enable ROR back if it was disabled by multi_range_read_info_const
-      call.
-    */
-    param->is_ror_scan = true;
-  }
-
-  DBUG_PRINT("exit", ("Records: %lu", (ulong)rows));
-  return rows;
-}
-
-/*
-  Check if key scan on given index with equality conditions on first n key
-  parts is a ROR scan.
-
-  SYNOPSIS
-    is_key_scan_ror()
-      param  Parameter from test_quick_select
-      keynr  Number of key in the table. The key must not be a clustered
-             primary key.
-      nparts Number of first key parts for which equality conditions
-             are present.
-
-  NOTES
-    ROR (Rowid Ordered Retrieval) key scan is a key scan that produces
-    ordered sequence of rowids (ha_xxx::cmp_ref is the comparison function)
-
-    This function is needed to handle a practically-important special case:
-    an index scan is a ROR scan if it is done using a condition in form
-
-        "key1_1=c_1 AND ... AND key1_n=c_n"
-
-    where the index is defined on (key1_1, ..., key1_N [,a_1, ..., a_n])
-
-    and the table has a clustered Primary Key defined as
-
-      PRIMARY KEY(a_1, ..., a_n, b1, ..., b_k)
-
-    i.e. the first key parts of it are identical to uncovered parts ot the
-    key being scanned. This function assumes that the index flags do not
-    include HA_KEY_SCAN_NOT_ROR flag (that is checked elsewhere).
-
-    Check (1) is made in quick_range_seq_next()
-
-  RETURN
-    true   The scan is ROR-scan
-    false  Otherwise
-*/
-
-static bool is_key_scan_ror(PARAM *param, uint keynr, uint nparts) {
-  KEY *table_key = param->table->key_info + keynr;
-
-  /*
-    Range predicates on hidden key parts do not change the fact
-    that a scan is rowid ordered, so we only care about user
-    defined keyparts
-  */
-  const uint user_defined_nparts =
-      std::min<uint>(nparts, table_key->user_defined_key_parts);
-
-  KEY_PART_INFO *key_part = table_key->key_part + user_defined_nparts;
-  KEY_PART_INFO *key_part_end =
-      (table_key->key_part + table_key->user_defined_key_parts);
-  uint pk_number;
-
-  for (KEY_PART_INFO *kp = table_key->key_part; kp < key_part; kp++) {
-    uint16 fieldnr = param->table->key_info[keynr]
-                         .key_part[kp - table_key->key_part]
-                         .fieldnr -
-                     1;
-    if (param->table->field[fieldnr]->key_length() != kp->length) return false;
-  }
-
-  if (key_part == key_part_end) return true;
-
-  key_part = table_key->key_part + user_defined_nparts;
-  pk_number = param->table->s->primary_key;
-  if (!param->table->file->primary_key_is_clustered() || pk_number == MAX_KEY)
-    return false;
-
-  KEY_PART_INFO *pk_part = param->table->key_info[pk_number].key_part;
-  KEY_PART_INFO *pk_part_end =
-      pk_part + param->table->key_info[pk_number].user_defined_key_parts;
-  for (; (key_part != key_part_end) && (pk_part != pk_part_end);
-       ++key_part, ++pk_part) {
-    if ((key_part->field != pk_part->field) ||
-        (key_part->length != pk_part->length))
-      return false;
-  }
-  return (key_part == key_part_end);
-}
-
-/*
-  Create a QUICK_RANGE_SELECT from given key and SEL_ARG tree for that key.
-
-  SYNOPSIS
-    get_quick_select()
-      param
-      idx            Index of used key in param->key.
-      key_tree       SEL_ARG tree for the used key
-      mrr_flags      MRR parameter for quick select
-      mrr_buf_size   MRR parameter for quick select
-      parent_alloc   If not NULL, use it to allocate memory for
-                     quick select data. Otherwise use quick->alloc.
-      num_key_parts  Number of key parts used for creating QUICK_RANGE_SELECT.
-                     Note: QUICK_GROUP_MIN_MAX creates ranges only for key parts
-                     on grouped columns. Rest of the scans create ranges using
-                     all usable keyparts. Hence the default is MAX_REF_PARTS.
-
-  NOTES
-    The caller must call QUICK_SELECT::init for returned quick select.
-
-    CAUTION! This function may change thd->mem_root to a MEM_ROOT which will be
-    deallocated when the returned quick select is deleted.
-
-  RETURN
-    NULL on error
-    otherwise created quick select
-*/
-
-QUICK_RANGE_SELECT *get_quick_select(PARAM *param, uint idx, SEL_ROOT *key_tree,
-                                     uint mrr_flags, uint mrr_buf_size,
-                                     MEM_ROOT *parent_alloc,
-                                     uint num_key_parts) {
-  QUICK_RANGE_SELECT *quick;
-  bool create_err = false;
-  DBUG_TRACE;
-
-  if (param->table->key_info[param->real_keynr[idx]].flags & HA_SPATIAL)
-    quick = new QUICK_RANGE_SELECT_GEOM(
-        param->thd, param->table, param->real_keynr[idx],
-        parent_alloc != nullptr, parent_alloc, &create_err);
-  else
-    quick =
-        new QUICK_RANGE_SELECT(param->thd, param->table, param->real_keynr[idx],
-                               parent_alloc != nullptr, nullptr, &create_err);
-
-  if (quick) {
-    assert(key_tree->type == SEL_ROOT::Type::KEY_RANGE ||
-           key_tree->type == SEL_ROOT::Type::IMPOSSIBLE);
-    if (key_tree->type == SEL_ROOT::Type::KEY_RANGE &&
-        (create_err ||
-         get_quick_keys(param, quick, param->key[idx], key_tree->root,
-                        param->min_key, 0, param->max_key, 0, nullptr,
-                        num_key_parts))) {
-      delete quick;
-      return nullptr;
-    } else {
-      quick->mrr_flags = mrr_flags;
-      quick->mrr_buf_size = mrr_buf_size;
-      quick->key_parts = (KEY_PART *)memdup_root(
-          parent_alloc ? parent_alloc : quick->alloc.get(),
-          (char *)param->key[idx],
-          sizeof(KEY_PART) *
-              actual_key_parts(
-                  &param->table->key_info[param->real_keynr[idx]]));
-    }
-  }
-  return quick;
-}
-
-/**
-  Generate key values for range select from given sel_arg tree
-
-  SYNOPSIS
-    get_quick_keys()
-
-  @param param          Range's param
-  @param quick          Quick range select to generate keys for
-  @param key            Generate key values for this key
-  @param key_tree       SEL_ARG tree
-  @param min_key        Min key buffer
-  @param min_key_flag   Min key's flags
-  @param max_key        Max key buffer
-  @param max_key_flag   Max key's flags
-  @param desc_flag      Desc flag of the first keypart
-  @param num_key_parts  Number of key parts that should be used for
-                        creating ranges (see get_quick_select() for details)
-
-  @note Fix this to get all possible sub_ranges
-
-  @returns
-    true    OOM
-    false   Ok
-*/
-
-bool get_quick_keys(PARAM *param, QUICK_RANGE_SELECT *quick, KEY_PART *key,
-                    SEL_ARG *key_tree, uchar *min_key, uint min_key_flag,
-                    uchar *max_key, uint max_key_flag, uint *desc_flag,
-                    uint num_key_parts) {
-  QUICK_RANGE *range;
-  uint flag = 0;
-  int min_part = key_tree->part - 1,  // # of keypart values in min_key buffer
-      max_part = key_tree->part - 1;  // # of keypart values in max_key buffer
-
-  const bool asc = key_tree->is_ascending;
-  SEL_ARG *cur_key_tree = asc ? key_tree->left : key_tree->right;
-  if (cur_key_tree != null_element)
-    if (get_quick_keys(param, quick, key, cur_key_tree, min_key, min_key_flag,
-                       max_key, max_key_flag, desc_flag, num_key_parts))
-      return true;
-  uchar *tmp_min_key = min_key, *tmp_max_key = max_key;
-  key_tree->store_min_max_values(key[key_tree->part].store_length, &tmp_min_key,
-                                 min_key_flag, &tmp_max_key, max_key_flag,
-                                 &min_part, &max_part);
-  if (!asc) flag |= DESC_FLAG;
-
-  // Stop processing key values if this is the last key part that needs to be
-  // looked into. See get_quick_select() for details.
-  if ((num_key_parts > 1) && key_tree->next_key_part &&
-      key_tree->next_key_part->type == SEL_ROOT::Type::KEY_RANGE &&
-      key_tree->next_key_part->root->part ==
-          key_tree->part + 1) {  // const key as prefix
-    if ((tmp_min_key - min_key) == (tmp_max_key - max_key) &&
-        memcmp(min_key, max_key, (uint)(tmp_max_key - max_key)) == 0 &&
-        key_tree->min_flag == 0 && key_tree->max_flag == 0) {
-      if (get_quick_keys(param, quick, key, key_tree->next_key_part->root,
-                         tmp_min_key, min_key_flag | key_tree->get_min_flag(),
-                         tmp_max_key, max_key_flag | key_tree->get_max_flag(),
-                         (desc_flag ? desc_flag : &flag), num_key_parts - 1))
-        return true;
-      goto end;  // Ugly, but efficient
-    }
-    {
-      uint tmp_min_flag = key_tree->get_min_flag();
-      uint tmp_max_flag = key_tree->get_max_flag();
-      key_tree->store_next_min_max_keys(key, &tmp_min_key, &tmp_min_flag,
-                                        &tmp_max_key, &tmp_max_flag, &min_part,
-                                        &max_part);
-      flag |= tmp_min_flag | tmp_max_flag;
-    }
-  } else {
-    if (asc)
-      flag = (key_tree->min_flag & GEOM_FLAG)
-                 ? key_tree->min_flag
-                 : key_tree->min_flag | key_tree->max_flag;
-    else {
-      // Invert flags for DESC keypart
-      flag |= invert_min_flag(key_tree->min_flag) |
-              invert_max_flag(key_tree->max_flag);
-    }
-  }
-
-  /*
-    Ensure that some part of min_key and max_key are used.  If not,
-    regard this as no lower/upper range
-  */
-  if ((flag & GEOM_FLAG) == 0) {
-    if (tmp_min_key != param->min_key)
-      flag &= ~NO_MIN_RANGE;
-    else
-      flag |= NO_MIN_RANGE;
-    if (tmp_max_key != param->max_key)
-      flag &= ~NO_MAX_RANGE;
-    else
-      flag |= NO_MAX_RANGE;
-  }
-  if ((flag & ~DESC_FLAG) == 0) {
-    uint length = (uint)(tmp_min_key - param->min_key);
-    if (length == (uint)(tmp_max_key - param->max_key) &&
-        !memcmp(param->min_key, param->max_key, length)) {
-      const KEY *table_key = quick->head->key_info + quick->index;
-      flag |= EQ_RANGE;
-      /*
-        Note that keys which are extended with PK parts have no
-        HA_NOSAME flag. So we can use user_defined_key_parts.
-      */
-      if ((table_key->flags & HA_NOSAME) &&
-          key_tree->part == table_key->user_defined_key_parts - 1) {
-        if ((table_key->flags & HA_NULL_PART_KEY) &&
-            null_part_in_key(key, param->min_key,
-                             (uint)(tmp_min_key - param->min_key)))
-          flag |= NULL_RANGE;
-        else
-          flag |= UNIQUE_RANGE;
-      }
-    }
-  }
-  /*
-    Set DESC flag. We need this flag set according to the first keypart.
-    Depending on it, key values will be scanned either forward or backward,
-    preserving the order or records in the index along multiple ranges.
-  */
-  if (desc_flag) flag = (flag & ~DESC_FLAG) | *desc_flag;
-
-  /* Get range for retrieving rows in QUICK_SELECT::get_next */
-  if (!(range = new (*THR_MALLOC)
-            QUICK_RANGE(param->min_key, (uint)(tmp_min_key - param->min_key),
-                        min_part >= 0 ? make_keypart_map(min_part) : 0,
-                        param->max_key, (uint)(tmp_max_key - param->max_key),
-                        max_part >= 0 ? make_keypart_map(max_part) : 0, flag,
-                        key_tree->rkey_func_flag)))
-    return true;  // out of memory
-
-  quick->max_used_key_length =
-      std::max(quick->max_used_key_length, uint(range->min_length));
-  quick->max_used_key_length =
-      std::max(quick->max_used_key_length, uint(range->max_length));
-  quick->used_key_parts =
-      std::max(quick->used_key_parts, uint(key_tree->part + 1));
-  if (quick->ranges.push_back(range)) return true;
-
-end:
-  cur_key_tree = asc ? key_tree->right : key_tree->left;
-  if (cur_key_tree != null_element)
-    return get_quick_keys(param, quick, key, cur_key_tree, min_key,
-                          min_key_flag, max_key, max_key_flag, desc_flag,
-                          num_key_parts);
-  return false;
-}
-
-/*
-  Return 1 if there is only one range and this uses the whole unique key
-*/
-
-bool QUICK_RANGE_SELECT::unique_key_range() {
-  if (ranges.size() == 1) {
-    QUICK_RANGE *tmp = ranges[0];
-    if ((tmp->flag & (EQ_RANGE | NULL_RANGE)) == EQ_RANGE) {
-      KEY *key = head->key_info + index;
-      return (key->flags & HA_NOSAME) && key->key_length == tmp->min_length;
-    }
-  }
-  return false;
-}
-
-/*
-  Return true if any part of the key is NULL
-
-  SYNOPSIS
-    null_part_in_key()
-      key_part  Array of key parts (index description)
-      key       Key values tuple
-      length    Length of key values tuple in bytes.
-
-  RETURN
-    true   The tuple has at least one "keypartX is NULL"
-    false  Otherwise
-*/
-
-static bool null_part_in_key(KEY_PART *key_part, const uchar *key,
-                             uint length) {
-  for (const uchar *end = key + length; key < end;
-       key += key_part++->store_length) {
-    if (key_part->null_bit && *key) return true;
-  }
-  return false;
-}
-
-bool QUICK_SELECT_I::is_keys_used(const MY_BITMAP *fields) {
-  return is_key_used(head, index, fields);
-}
-
-bool QUICK_INDEX_MERGE_SELECT::is_keys_used(const MY_BITMAP *fields) {
-  QUICK_RANGE_SELECT *quick;
-  List_iterator_fast<QUICK_RANGE_SELECT> it(quick_selects);
-  while ((quick = it++)) {
-    if (is_key_used(head, quick->index, fields)) return true;
-  }
-  return false;
-}
-
-bool QUICK_ROR_INTERSECT_SELECT::is_keys_used(const MY_BITMAP *fields) {
-  QUICK_RANGE_SELECT *quick;
-  List_iterator_fast<QUICK_RANGE_SELECT> it(quick_selects);
-  while ((quick = it++)) {
-    if (is_key_used(head, quick->index, fields)) return true;
-  }
-  return false;
-}
-
-bool QUICK_ROR_UNION_SELECT::is_keys_used(const MY_BITMAP *fields) {
-  QUICK_SELECT_I *quick;
-  List_iterator_fast<QUICK_SELECT_I> it(quick_selects);
-  while ((quick = it++)) {
-    if (quick->is_keys_used(fields)) return true;
-  }
-  return false;
-}
-
-/*
-  Perform key scans for all used indexes (except CPK), get rowids and merge
-  them into an ordered non-recurrent sequence of rowids.
-
-  The merge/duplicate removal is performed using Unique class. We put all
-  rowids into Unique, get the sorted sequence and destroy the Unique.
-
-  If table has a clustered primary key that covers all rows (true for bdb
-  and innodb currently) and one of the index_merge scans is a scan on PK,
-  then rows that will be retrieved by PK scan are not put into Unique and
-  primary key scan is not performed here, it is performed later separately.
-
-  RETURN
-    0     OK
-    other error
-*/
-
-int QUICK_INDEX_MERGE_SELECT::read_keys_and_merge() {
-  List_iterator_fast<QUICK_RANGE_SELECT> cur_quick_it(quick_selects);
-  QUICK_RANGE_SELECT *cur_quick;
-  int result;
-  handler *file = head->file;
-  DBUG_TRACE;
-
-  /* We're going to just read rowids. */
-  head->set_keyread(true);
-  head->prepare_for_position();
-
-  cur_quick_it.rewind();
-  cur_quick = cur_quick_it++;
-  assert(cur_quick != nullptr);
-
-  DBUG_EXECUTE_IF("simulate_bug13919180", {
-    my_error(ER_UNKNOWN_ERROR, MYF(0));
-    return 1;
-  });
-  /*
-    We reuse the same instance of handler so we need to call both init and
-    reset here.
-  */
-  if (cur_quick->init() || cur_quick->reset()) return 1;
-
-  size_t sort_buffer_size = thd->variables.sortbuff_size;
-#ifndef NDEBUG
-  if (DBUG_EVALUATE_IF("sortbuff_size_256", 1, 0)) sort_buffer_size = 256;
-#endif /* NDEBUG */
-
-  if (unique == nullptr) {
-    DBUG_EXECUTE_IF("index_merge_may_not_create_a_Unique", DBUG_ABORT(););
-    DBUG_EXECUTE_IF("only_one_Unique_may_be_created",
-                    DBUG_SET("+d,index_merge_may_not_create_a_Unique"););
-    unique = new (*THR_MALLOC) Unique(refpos_order_cmp, (void *)file,
-                                      file->ref_length, sort_buffer_size);
-  } else {
-    unique->reset();
-    head->unique_result.sorted_result.reset();
-    assert(!head->unique_result.sorted_result_in_fsbuf);
-    head->unique_result.sorted_result_in_fsbuf = false;
-
-    if (head->unique_result.io_cache) {
-      close_cached_file(head->unique_result.io_cache);
-      my_free(head->unique_result.io_cache);
-      head->unique_result.io_cache = nullptr;
-    }
-  }
-
-  assert(file->ref_length == unique->get_size());
-  assert(sort_buffer_size == unique->get_max_in_memory_size());
-
-  if (!unique) return 1;
-  for (;;) {
-    while ((result = cur_quick->get_next()) == HA_ERR_END_OF_FILE) {
-      cur_quick->range_end();
-      cur_quick = cur_quick_it++;
-      if (!cur_quick) break;
-
-      if (cur_quick->file->inited) cur_quick->file->ha_index_end();
-      if (cur_quick->init() || cur_quick->reset()) return 1;
-    }
-
-    if (result) {
-      if (result != HA_ERR_END_OF_FILE) {
-        cur_quick->range_end();
-        return result;
-      }
-      break;
-    }
-
-    if (thd->killed) return 1;
-
-    /* skip row if it will be retrieved by clustered PK scan */
-    if (pk_quick_select && pk_quick_select->row_in_ranges()) continue;
-
-    cur_quick->file->position(cur_quick->record);
-    result = unique->unique_add((char *)cur_quick->file->ref);
-    if (result) return 1;
-  }
-
-  /*
-    Ok all rowids are in the Unique now. The next call will initialize
-    head->sort structure so it can be used to iterate through the rowids
-    sequence.
-  */
-  result = unique->get(head);
-  doing_pk_scan = false;
-  /* index_merge currently doesn't support "using index" at all */
-  head->set_keyread(false);
-  read_record.reset();  // Clear out any previous iterator.
-  read_record = init_table_iterator(thd, head, nullptr,
-                                    /*ignore_not_found_rows=*/false,
-                                    /*count_examined_rows=*/false);
-  if (read_record == nullptr) return 1;
-  return result;
-}
-
-/*
-  Get next row for index_merge.
-  NOTES
-    The rows are read from
-      1. rowids stored in Unique.
-      2. QUICK_RANGE_SELECT with clustered primary key (if any).
-    The sets of rows retrieved in 1) and 2) are guaranteed to be disjoint.
-*/
-
-int QUICK_INDEX_MERGE_SELECT::get_next() {
-  int result;
-  DBUG_TRACE;
-
-  if (doing_pk_scan) return pk_quick_select->get_next();
-
-  if ((result = read_record->Read()) == -1) {
-    result = HA_ERR_END_OF_FILE;
-
-    // NOTE: destroying the RowIterator also clears
-    // head->unique_result.io_cache if it is initialized, since it
-    // owns the io_cache it is reading from.
-    read_record.reset();
-
-    /* All rows from Unique have been retrieved, do a clustered PK scan */
-    if (pk_quick_select) {
-      doing_pk_scan = true;
-      if ((result = pk_quick_select->init()) ||
-          (result = pk_quick_select->reset()))
-        return result;
-      return pk_quick_select->get_next();
-    }
-  }
-
-  return result;
-}
-
-/*
-  Retrieve next record.
-  SYNOPSIS
-     QUICK_ROR_INTERSECT_SELECT::get_next()
-
-  NOTES
-    Invariant on enter/exit: all intersected selects have retrieved all index
-    records with rowid <= some_rowid_val and no intersected select has
-    retrieved any index records with rowid > some_rowid_val.
-    We start fresh and loop until we have retrieved the same rowid in each of
-    the key scans or we got an error.
-
-    If a Clustered PK scan is present, it is used only to check if row
-    satisfies its condition (and never used for row retrieval).
-
-    Locking: to ensure that exclusive locks are only set on records that
-    are included in the final result we must release the lock
-    on all rows we read but do not include in the final result. This
-    must be done on each index that reads the record and the lock
-    must be released using the same handler (the same quick object) as
-    used when reading the record.
-
-  RETURN
-   0     - Ok
-   other - Error code if any error occurred.
-*/
-
-int QUICK_ROR_INTERSECT_SELECT::get_next() {
-  List_iterator_fast<QUICK_RANGE_SELECT> quick_it(quick_selects);
-  QUICK_RANGE_SELECT *quick;
-
-  /* quick that reads the given rowid first. This is needed in order
-  to be able to unlock the row using the same handler object that locked
-  it */
-  QUICK_RANGE_SELECT *quick_with_last_rowid;
-
-  int error, cmp;
-  uint last_rowid_count = 0;
-  DBUG_TRACE;
-
-  do {
-    /* Get a rowid for first quick and save it as a 'candidate' */
-    quick = quick_it++;
-    error = quick->get_next();
-    if (cpk_quick) {
-      while (!error && !cpk_quick->row_in_ranges()) {
-        quick->file->unlock_row(); /* row not in range; unlock */
-        error = quick->get_next();
-      }
-    }
-    if (error) return error;
-
-    quick->file->position(quick->record);
-    memcpy(last_rowid, quick->file->ref, head->file->ref_length);
-    last_rowid_count = 1;
-    quick_with_last_rowid = quick;
-
-    while (last_rowid_count < quick_selects.elements) {
-      if (!(quick = quick_it++)) {
-        quick_it.rewind();
-        quick = quick_it++;
-      }
-
-      do {
-        DBUG_EXECUTE_IF("innodb_quick_report_deadlock",
-                        DBUG_SET("+d,innodb_report_deadlock"););
-        if ((error = quick->get_next())) {
-          /* On certain errors like deadlock, trx might be rolled back.*/
-          if (!current_thd->transaction_rollback_request)
-            quick_with_last_rowid->file->unlock_row();
-          return error;
-        }
-        quick->file->position(quick->record);
-        cmp = head->file->cmp_ref(quick->file->ref, last_rowid);
-        if (cmp < 0) {
-          /* This row is being skipped.  Release lock on it. */
-          quick->file->unlock_row();
-        }
-      } while (cmp < 0);
-
-      /* Ok, current select 'caught up' and returned ref >= cur_ref */
-      if (cmp > 0) {
-        /* Found a row with ref > cur_ref. Make it a new 'candidate' */
-        if (cpk_quick) {
-          while (!cpk_quick->row_in_ranges()) {
-            quick->file->unlock_row(); /* row not in range; unlock */
-            if ((error = quick->get_next())) {
-              /* On certain errors like deadlock, trx might be rolled back.*/
-              if (!current_thd->transaction_rollback_request)
-                quick_with_last_rowid->file->unlock_row();
-              return error;
-            }
-          }
-          quick->file->position(quick->record);
-        }
-        memcpy(last_rowid, quick->file->ref, head->file->ref_length);
-        quick_with_last_rowid->file->unlock_row();
-        last_rowid_count = 1;
-        quick_with_last_rowid = quick;
-      } else {
-        /* current 'candidate' row confirmed by this select */
-        last_rowid_count++;
-      }
-    }
-
-    /* We get here if we got the same row ref in all scans. */
-    if (need_to_fetch_row)
-      error = head->file->ha_rnd_pos(head->record[0], last_rowid);
-  } while (error == HA_ERR_RECORD_DELETED);
-  return error;
-}
-
-/*
-  Retrieve next record.
-  SYNOPSIS
-    QUICK_ROR_UNION_SELECT::get_next()
-
-  NOTES
-    Enter/exit invariant:
-    For each quick select in the queue a {key,rowid} tuple has been
-    retrieved but the corresponding row hasn't been passed to output.
-
-  RETURN
-   0     - Ok
-   other - Error code if any error occurred.
-*/
-
-int QUICK_ROR_UNION_SELECT::get_next() {
-  int error, dup_row;
-  QUICK_SELECT_I *quick;
-  uchar *tmp;
-  DBUG_TRACE;
-
-  do {
-    do {
-      if (queue.empty()) return HA_ERR_END_OF_FILE;
-      /* Ok, we have a queue with >= 1 scans */
-
-      quick = queue.top();
-      memcpy(cur_rowid, quick->last_rowid, rowid_length);
-
-      /* put into queue rowid from the same stream as top element */
-      if ((error = quick->get_next())) {
-        if (error != HA_ERR_END_OF_FILE) return error;
-        queue.pop();
-      } else {
-        quick->save_last_pos();
-        queue.update_top();
-      }
-
-      if (!have_prev_rowid) {
-        /* No rows have been returned yet */
-        dup_row = false;
-        have_prev_rowid = true;
-      } else
-        dup_row = !head->file->cmp_ref(cur_rowid, prev_rowid);
-    } while (dup_row);
-
-    tmp = cur_rowid;
-    cur_rowid = prev_rowid;
-    prev_rowid = tmp;
-
-    error = head->file->ha_rnd_pos(quick->record, prev_rowid);
-  } while (error == HA_ERR_RECORD_DELETED);
-  return error;
-}
-
-int QUICK_RANGE_SELECT::reset() {
-  uint buf_size;
-  uchar *mrange_buff = nullptr;
-  int error;
-  HANDLER_BUFFER empty_buf;
-  DBUG_TRACE;
-  last_range = nullptr;
-  cur_range = ranges.begin();
-
-  /* set keyread to true if index is covering */
-  if (!head->no_keyread && head->covering_keys.is_set(index))
-    head->set_keyread(true);
-  else
-    head->set_keyread(false);
-  if (!file->inited) {
-    /*
-      read_set is set to the correct value for ror_merge_scan here as a
-      subquery execution during optimization might result in innodb not
-      initializing the read set in index_read() leading to wrong
-      results while merging.
-    */
-    MY_BITMAP *const save_read_set = head->read_set;
-    MY_BITMAP *const save_write_set = head->write_set;
-    const bool sorted = (mrr_flags & HA_MRR_SORTED);
-    DBUG_EXECUTE_IF("bug14365043_2", DBUG_SET("+d,ha_index_init_fail"););
-
-    /* Pass index specifc read set for ror_merged_scan */
-    if (in_ror_merged_scan) {
-      /*
-        We don't need to signal the bitmap change as the bitmap is always the
-        same for this head->file
-      */
-      head->column_bitmaps_set_no_signal(&column_bitmap, &column_bitmap);
-    }
-    if ((error = file->ha_index_init(index, sorted))) {
-      file->print_error(error, MYF(0));
-      return error;
-    }
-    if (in_ror_merged_scan) {
-      /* Restore bitmaps set on entry */
-      head->column_bitmaps_set_no_signal(save_read_set, save_write_set);
-    }
-  }
-  // Enable & reset unique record filter for multi-valued index
-  if (head->key_info[index].flags & HA_MULTI_VALUED_KEY) {
-    file->ha_extra(HA_EXTRA_ENABLE_UNIQUE_RECORD_FILTER);
-    // Add PK's fields to read_set as unique filter uses rowid to skip dups
-    if (head->s->primary_key != MAX_KEY)
-      head->mark_columns_used_by_index_no_reset(head->s->primary_key,
-                                                head->read_set);
-  }
-
-  /* Allocate buffer if we need one but haven't allocated it yet */
-  if (mrr_buf_size && !mrr_buf_desc) {
-    buf_size = mrr_buf_size;
-    while (buf_size &&
-           !my_multi_malloc(key_memory_QUICK_RANGE_SELECT_mrr_buf_desc,
-                            MYF(MY_WME), &mrr_buf_desc, sizeof(*mrr_buf_desc),
-                            &mrange_buff, buf_size, NullS)) {
-      /* Try to shrink the buffers until both are 0. */
-      buf_size /= 2;
-    }
-    if (!mrr_buf_desc) return HA_ERR_OUT_OF_MEM;
-
-    /* Initialize the handler buffer. */
-    mrr_buf_desc->buffer = mrange_buff;
-    mrr_buf_desc->buffer_end = mrange_buff + buf_size;
-    mrr_buf_desc->end_of_used_area = mrange_buff;
-  }
-
-  if (!mrr_buf_desc)
-    empty_buf.buffer = empty_buf.buffer_end = empty_buf.end_of_used_area =
-        nullptr;
-
-  RANGE_SEQ_IF seq_funcs = {quick_range_seq_init, quick_range_seq_next,
-                            nullptr};
-  error =
-      file->multi_range_read_init(&seq_funcs, this, ranges.size(), mrr_flags,
-                                  mrr_buf_desc ? mrr_buf_desc : &empty_buf);
-  return error;
-}
-
-/*
-  Range sequence interface implementation for array<QUICK_RANGE>: initialize
-
-  SYNOPSIS
-    quick_range_seq_init()
-      init_param  Caller-opaque paramenter: QUICK_RANGE_SELECT* pointer
-
-  RETURN
-    Opaque value to be passed to quick_range_seq_next
-*/
-
-range_seq_t quick_range_seq_init(void *init_param, uint, uint) {
-  QUICK_RANGE_SELECT *quick = static_cast<QUICK_RANGE_SELECT *>(init_param);
-  QUICK_RANGE **first = quick->ranges.begin();
-  QUICK_RANGE **last = quick->ranges.end();
-  quick->qr_traversal_ctx.first = first;
-  quick->qr_traversal_ctx.cur = first;
-  quick->qr_traversal_ctx.last = last;
-  return &quick->qr_traversal_ctx;
-}
-
-/*
-  Range sequence interface implementation for array<QUICK_RANGE>: get next
-
-  SYNOPSIS
-    quick_range_seq_next()
-      rseq        Value returned from quick_range_seq_init
-      range  OUT  Store information about the range here
-
-  @note This function return next range, and 'next' means next range in the
-  array of ranges relatively to the current one when the first keypart has
-  ASC sort order, or previous range - when key part has DESC sort order.
-  This is needed to preserve correct order of records in case of multiple
-  ranges over DESC keypart.
-
-  RETURN
-    0  Ok
-    1  No more ranges in the sequence
-*/
-
-uint quick_range_seq_next(range_seq_t rseq, KEY_MULTI_RANGE *range) {
-  QUICK_RANGE_SEQ_CTX *ctx = (QUICK_RANGE_SEQ_CTX *)rseq;
-
-  if (ctx->cur == ctx->last) return 1; /* no more ranges */
-
-  QUICK_RANGE *cur = *(ctx->cur);
-  key_range *start_key = &range->start_key;
-  key_range *end_key = &range->end_key;
-
-  start_key->key = cur->min_key;
-  start_key->length = cur->min_length;
-  start_key->keypart_map = cur->min_keypart_map;
-  start_key->flag =
-      ((cur->flag & NEAR_MIN)
-           ? HA_READ_AFTER_KEY
-           : (cur->flag & EQ_RANGE) ? HA_READ_KEY_EXACT : HA_READ_KEY_OR_NEXT);
-  end_key->key = cur->max_key;
-  end_key->length = cur->max_length;
-  end_key->keypart_map = cur->max_keypart_map;
-  /*
-    We use HA_READ_AFTER_KEY here because if we are reading on a key
-    prefix. We want to find all keys with this prefix.
-  */
-  end_key->flag =
-      (cur->flag & NEAR_MAX ? HA_READ_BEFORE_KEY : HA_READ_AFTER_KEY);
-  range->range_flag = cur->flag;
-  ctx->cur++;
-  assert(ctx->cur <= ctx->last);
-  return 0;
-}
-
-/*
-  Get next possible record using quick-struct.
-
-  SYNOPSIS
-    QUICK_RANGE_SELECT::get_next()
-
-  NOTES
-    Record is read into table->record[0]
-
-  RETURN
-    0			Found row
-    HA_ERR_END_OF_FILE	No (more) rows in range
-    #			Error code
-*/
-
-int QUICK_RANGE_SELECT::get_next() {
-  char *dummy;
-  MY_BITMAP *const save_read_set = head->read_set;
-  MY_BITMAP *const save_write_set = head->write_set;
-  DBUG_TRACE;
-
-  if (in_ror_merged_scan) {
-    /*
-      We don't need to signal the bitmap change as the bitmap is always the
-      same for this head->file
-    */
-    head->column_bitmaps_set_no_signal(&column_bitmap, &column_bitmap);
-  }
-
-  int result = file->ha_multi_range_read_next(&dummy);
-
-  if (in_ror_merged_scan) {
-    /* Restore bitmaps set on entry */
-    head->column_bitmaps_set_no_signal(save_read_set, save_write_set);
-  }
-  return result;
-}
-
-/*
-  Get the next record with a different prefix.
-
-  @param prefix_length   length of cur_prefix
-  @param group_key_parts The number of key parts in the group prefix
-  @param cur_prefix      prefix of a key to be searched for
-
-  Each subsequent call to the method retrieves the first record that has a
-  prefix with length prefix_length and which is different from cur_prefix,
-  such that the record with the new prefix is within the ranges described by
-  this->ranges. The record found is stored into the buffer pointed by
-  this->record. The method is useful for GROUP-BY queries with range
-  conditions to discover the prefix of the next group that satisfies the range
-  conditions.
-
-  @todo
-
-    This method is a modified copy of QUICK_RANGE_SELECT::get_next(), so both
-    methods should be unified into a more general one to reduce code
-    duplication.
-
-  @retval 0                  on success
-  @retval HA_ERR_END_OF_FILE if returned all keys
-  @retval other              if some error occurred
-*/
-
-int QUICK_RANGE_SELECT::get_next_prefix(uint prefix_length,
-                                        uint group_key_parts,
-                                        uchar *cur_prefix) {
-  DBUG_TRACE;
-  const key_part_map keypart_map = make_prev_keypart_map(group_key_parts);
-
-  for (;;) {
-    int result;
-    if (last_range) {
-      /* Read the next record in the same range with prefix after cur_prefix. */
-      assert(cur_prefix != nullptr);
-      result = file->ha_index_read_map(record, cur_prefix, keypart_map,
-                                       HA_READ_AFTER_KEY);
-      if (result || last_range->max_keypart_map == 0) return result;
-
-      key_range previous_endpoint;
-      last_range->make_max_endpoint(&previous_endpoint, prefix_length,
-                                    keypart_map);
-      if (file->compare_key(&previous_endpoint) <= 0) return 0;
-    }
-
-    const size_t count = ranges.size() - (cur_range - ranges.begin());
-    if (count == 0) {
-      /* Ranges have already been used up before. None is left for read. */
-      last_range = nullptr;
-      return HA_ERR_END_OF_FILE;
-    }
-    last_range = *(cur_range++);
-
-    key_range start_key, end_key;
-    last_range->make_min_endpoint(&start_key, prefix_length, keypart_map);
-    last_range->make_max_endpoint(&end_key, prefix_length, keypart_map);
-
-    const bool sorted = (mrr_flags & HA_MRR_SORTED);
-    result = file->ha_read_range_first(
-        last_range->min_keypart_map ? &start_key : nullptr,
-        last_range->max_keypart_map ? &end_key : nullptr,
-        last_range->flag & EQ_RANGE, sorted);
-    if ((last_range->flag & (UNIQUE_RANGE | EQ_RANGE)) ==
-        (UNIQUE_RANGE | EQ_RANGE))
-      last_range = nullptr;  // Stop searching
-
-    if (result != HA_ERR_END_OF_FILE) return result;
-    last_range = nullptr;  // No matching rows; go to next range
-  }
-}
-
-/* Get next for geometrical indexes */
-
-int QUICK_RANGE_SELECT_GEOM::get_next() {
-  DBUG_TRACE;
-
-  for (;;) {
-    int result;
-    if (last_range) {
-      // Already read through key
-      result = file->ha_index_next_same(record, last_range->min_key,
-                                        last_range->min_length);
-      if (result != HA_ERR_END_OF_FILE) return result;
-    }
-
-    const size_t count = ranges.size() - (cur_range - ranges.begin());
-    if (count == 0) {
-      /* Ranges have already been used up before. None is left for read. */
-      last_range = nullptr;
-      return HA_ERR_END_OF_FILE;
-    }
-    last_range = *(cur_range++);
-
-    result = file->ha_index_read_map(record, last_range->min_key,
-                                     last_range->min_keypart_map,
-                                     last_range->rkey_func_flag);
-    if (result != HA_ERR_KEY_NOT_FOUND && result != HA_ERR_END_OF_FILE)
-      return result;
-    last_range = nullptr;  // Not found, to next range
-  }
-}
-
-/*
-  Check if current row will be retrieved by this QUICK_RANGE_SELECT
-
-  NOTES
-    It is assumed that currently a scan is being done on another index
-    which reads all necessary parts of the index that is scanned by this
-    quick select.
-    The implementation does a binary search on sorted array of disjoint
-    ranges, without taking size of range into account.
-
-    This function is used to filter out clustered PK scan rows in
-    index_merge quick select.
-
-  RETURN
-    true  if current row will be retrieved by this quick select
-    false if not
-*/
-
-bool QUICK_RANGE_SELECT::row_in_ranges() {
-  if (ranges.empty()) return false;
-
-  QUICK_RANGE *res;
-  size_t min = 0;
-  size_t max = ranges.size() - 1;
-  size_t mid = (max + min) / 2;
-
-  while (min != max) {
-    if (cmp_next(ranges[mid])) {
-      /* current row value > mid->max */
-      min = mid + 1;
-    } else
-      max = mid;
-    mid = (min + max) / 2;
-  }
-  res = ranges[mid];
-  return (!cmp_next(res) && !cmp_prev(res));
-}
-
-/*
-  This is a hack: we inherit from QUICK_RANGE_SELECT so that we can use the
-  get_next() interface, but we have to hold a pointer to the original
-  QUICK_RANGE_SELECT because its data are used all over the place. What
-  should be done is to factor out the data that is needed into a base
-  class (QUICK_SELECT), and then have two subclasses (_ASC and _DESC)
-  which handle the ranges and implement the get_next() function.  But
-  for now, this seems to work right at least.
-*/
-
-QUICK_SELECT_DESC::QUICK_SELECT_DESC(QUICK_RANGE_SELECT *q,
-                                     uint used_key_parts_arg)
-    : QUICK_RANGE_SELECT(*q),
-      rev_it(rev_ranges),
-      m_used_key_parts(used_key_parts_arg) {
-  QUICK_RANGE *r;
-  /*
-    Use default MRR implementation for reverse scans. No table engine
-    currently can do an MRR scan with output in reverse index order.
-  */
-  mrr_buf_desc = nullptr;
-  mrr_flags |= HA_MRR_USE_DEFAULT_IMPL;
-  mrr_flags |= HA_MRR_SORTED;  // 'sorted' as internals use index_last/_prev
-  mrr_buf_size = 0;
-
-  Quick_ranges::const_iterator pr = ranges.begin();
-  Quick_ranges::const_iterator end_range = ranges.end();
-  for (; pr != end_range; pr++) {
-    rev_ranges.push_front(*pr);
-  }
-
-  /* Remove EQ_RANGE flag for keys that are not using the full key */
-  for (r = rev_it++; r; r = rev_it++) {
-    if ((r->flag & EQ_RANGE) &&
-        head->key_info[index].key_length != r->max_length)
-      r->flag &= ~EQ_RANGE;
-  }
-  rev_it.rewind();
-  q->dont_free = true;  // Don't free shared mem
-}
-
-int QUICK_SELECT_DESC::get_next() {
-  DBUG_TRACE;
-
-  /* The max key is handled as follows:
-   *   - if there is NO_MAX_RANGE, start at the end and move backwards
-   *   - if it is an EQ_RANGE (which means that max key covers the entire
-   *     key) and the query does not use any hidden key fields that are
-   *     not considered when the range optimzier sets EQ_RANGE (e.g. the
-   *     primary key added by InnoDB), then go directly to the key and
-   *     read through it (sorting backwards is same as sorting forwards).
-   *   - if it is NEAR_MAX, go to the key or next, step back once, and
-   *     move backwards
-   *   - otherwise (not NEAR_MAX == include the key), go after the key,
-   *     step back once, and move backwards
-   */
-
-  for (;;) {
-    int result;
-    if (last_range) {  // Already read through key
-      result =
-          ((last_range->flag & EQ_RANGE &&
-            m_used_key_parts <= head->key_info[index].user_defined_key_parts)
-               ? file->ha_index_next_same(record, last_range->min_key,
-                                          last_range->min_length)
-               : file->ha_index_prev(record));
-      if (!result) {
-        if (cmp_prev(*rev_it.ref()) == 0) return 0;
-      } else if (result != HA_ERR_END_OF_FILE)
-        return result;
-    }
-
-    if (!(last_range = rev_it++)) return HA_ERR_END_OF_FILE;  // All ranges used
-
-    // Case where we can avoid descending scan, see comment above
-    const bool eqrange_all_keyparts =
-        (last_range->flag & EQ_RANGE) &&
-        (m_used_key_parts <= head->key_info[index].user_defined_key_parts);
-
-    /*
-      If we have pushed an index condition (ICP) and this quick select
-      will use ha_index_prev() to read data, we need to let the
-      handler know where to end the scan in order to avoid that the
-      ICP implemention continues to read past the range boundary.
-    */
-    if (file->pushed_idx_cond) {
-      if (!eqrange_all_keyparts) {
-        key_range min_range;
-        last_range->make_min_endpoint(&min_range);
-        if (min_range.length > 0)
-          file->set_end_range(&min_range, handler::RANGE_SCAN_DESC);
-        else
-          file->set_end_range(nullptr, handler::RANGE_SCAN_DESC);
-      } else {
-        /*
-          Will use ha_index_next_same() for reading records. In case we have
-          set the end range for an earlier range, this need to be cleared.
-        */
-        file->set_end_range(nullptr, handler::RANGE_SCAN_ASC);
-      }
-    }
-
-    if (last_range->flag & NO_MAX_RANGE)  // Read last record
-    {
-      int local_error;
-      if ((local_error = file->ha_index_last(record))) {
-        /*
-          HA_ERR_END_OF_FILE is returned both when the table is empty and when
-          there are no qualifying records in the range (when using ICP).
-          Interpret this return value as "no qualifying rows in the range" to
-          avoid loss of records. If the error code truly meant "empty table"
-          the next iteration of the loop will exit.
-        */
-        if (local_error != HA_ERR_END_OF_FILE) return local_error;
-        last_range = nullptr;  // Go to next range
-        continue;
-      }
-
-      if (cmp_prev(last_range) == 0) return 0;
-      last_range = nullptr;  // No match; go to next range
-      continue;
-    }
-
-    if (eqrange_all_keyparts)
-
-    {
-      result = file->ha_index_read_map(record, last_range->max_key,
-                                       last_range->max_keypart_map,
-                                       HA_READ_KEY_EXACT);
-    } else {
-      assert(
-          last_range->flag & NEAR_MAX ||
-          (last_range->flag & EQ_RANGE &&
-           m_used_key_parts > head->key_info[index].user_defined_key_parts) ||
-          range_reads_after_key(last_range));
-      result = file->ha_index_read_map(
-          record, last_range->max_key, last_range->max_keypart_map,
-          ((last_range->flag & NEAR_MAX) ? HA_READ_BEFORE_KEY
-                                         : HA_READ_PREFIX_LAST_OR_PREV));
-    }
-    if (result) {
-      if (result != HA_ERR_KEY_NOT_FOUND && result != HA_ERR_END_OF_FILE)
-        return result;
-      last_range = nullptr;  // Not found, to next range
-      continue;
-    }
-    if (cmp_prev(last_range) == 0) {
-      if ((last_range->flag & (UNIQUE_RANGE | EQ_RANGE)) ==
-          (UNIQUE_RANGE | EQ_RANGE))
-        last_range = nullptr;  // Stop searching
-      return 0;                // Found key is in range
-    }
-    last_range = nullptr;  // To next range
-  }
-}
-
-/**
-  Create a compatible quick select with the result ordered in an opposite way
-
-  @param used_key_parts_arg  Number of used key parts
-
-  @retval NULL in case of errors (OOM etc)
-  @retval pointer to a newly created QUICK_SELECT_DESC if success
-*/
-
-QUICK_SELECT_I *QUICK_RANGE_SELECT::make_reverse(uint used_key_parts_arg) {
-  return new QUICK_SELECT_DESC(this, used_key_parts_arg);
-}
-
-/*
-  Compare if found key is over max-value
-  Returns 0 if key <= range->max_key
-  TODO: Figure out why can't this function be as simple as cmp_prev().
-  At least it could use key_cmp() from key.cc, it's almost identical.
-*/
-
-int QUICK_RANGE_SELECT::cmp_next(QUICK_RANGE *range_arg) {
-  int cmp;
-  if (range_arg->flag & NO_MAX_RANGE) return 0; /* key can't be to large */
-
-  cmp = key_cmp(key_part_info, range_arg->max_key, range_arg->max_length);
-  if (cmp < 0 || (cmp == 0 && !(range_arg->flag & NEAR_MAX))) return 0;
-  return 1;  // outside of range
-}
-
-/*
-  Returns 0 if found key is inside range (found key >= range->min_key).
-*/
-
-int QUICK_RANGE_SELECT::cmp_prev(QUICK_RANGE *range_arg) {
-  int cmp;
-  if (range_arg->flag & NO_MIN_RANGE) return 0; /* key can't be to small */
-
-  cmp = key_cmp(key_part_info, range_arg->min_key, range_arg->min_length);
-  if (cmp > 0 || (cmp == 0 && !(range_arg->flag & NEAR_MIN))) return 0;
-  return 1;  // outside of range
-}
-
-/*
-  true if this range will require using HA_READ_AFTER_KEY
-  See comment in get_next() about this
-*/
-
-bool QUICK_SELECT_DESC::range_reads_after_key(QUICK_RANGE *range_arg) {
-  return ((range_arg->flag & (NO_MAX_RANGE | NEAR_MAX)) ||
-          !(range_arg->flag & EQ_RANGE) ||
-          head->key_info[index].key_length != range_arg->max_length)
-             ? true
-             : false;
-}
-
-void QUICK_RANGE_SELECT::add_info_string(String *str) {
-  KEY *key_info = head->key_info + index;
-  str->append(key_info->name);
-}
-
-void QUICK_INDEX_MERGE_SELECT::add_info_string(String *str) {
-  QUICK_RANGE_SELECT *quick;
-  bool first = true;
-  List_iterator_fast<QUICK_RANGE_SELECT> it(quick_selects);
-  str->append(STRING_WITH_LEN("sort_union("));
-  while ((quick = it++)) {
-    if (!first)
-      str->append(',');
-    else
-      first = false;
-    quick->add_info_string(str);
-  }
-  if (pk_quick_select) {
-    str->append(',');
-    pk_quick_select->add_info_string(str);
-  }
-  str->append(')');
-}
-
-void QUICK_ROR_INTERSECT_SELECT::add_info_string(String *str) {
-  bool first = true;
-  QUICK_RANGE_SELECT *quick;
-  List_iterator_fast<QUICK_RANGE_SELECT> it(quick_selects);
-  str->append(STRING_WITH_LEN("intersect("));
-  while ((quick = it++)) {
-    KEY *key_info = head->key_info + quick->index;
-    if (!first)
-      str->append(',');
-    else
-      first = false;
-    str->append(key_info->name);
-  }
-  if (cpk_quick) {
-    KEY *key_info = head->key_info + cpk_quick->index;
-    str->append(',');
-    str->append(key_info->name);
-  }
-  str->append(')');
-}
-
-void QUICK_ROR_UNION_SELECT::add_info_string(String *str) {
-  bool first = true;
-  QUICK_SELECT_I *quick;
-  List_iterator_fast<QUICK_SELECT_I> it(quick_selects);
-  str->append(STRING_WITH_LEN("union("));
-  while ((quick = it++)) {
-    if (!first)
-      str->append(',');
-    else
-      first = false;
-    quick->add_info_string(str);
-  }
-  str->append(')');
-}
-
-void QUICK_GROUP_MIN_MAX_SELECT::add_info_string(String *str) {
-  str->append(STRING_WITH_LEN("index_for_group_by("));
-  str->append(index_info->name);
-  str->append(')');
-}
-
-void QUICK_SKIP_SCAN_SELECT::add_info_string(String *str) {
-  str->append(STRING_WITH_LEN("index_for_skip_scan("));
-  str->append(index_info->name);
-  str->append(')');
-}
-
-void QUICK_RANGE_SELECT::add_keys_and_lengths(String *key_names,
-                                              String *used_lengths) {
-  char buf[64];
-  size_t length;
-  KEY *key_info = head->key_info + index;
-  key_names->append(key_info->name);
-  length = longlong10_to_str(max_used_key_length, buf, 10) - buf;
-  used_lengths->append(buf, length);
-}
-
-void QUICK_INDEX_MERGE_SELECT::add_keys_and_lengths(String *key_names,
-                                                    String *used_lengths) {
-  char buf[64];
-  size_t length;
-  bool first = true;
-  QUICK_RANGE_SELECT *quick;
-
-  List_iterator_fast<QUICK_RANGE_SELECT> it(quick_selects);
-  while ((quick = it++)) {
-    if (first)
-      first = false;
-    else {
-      key_names->append(',');
-      used_lengths->append(',');
-    }
-
-    KEY *key_info = head->key_info + quick->index;
-    key_names->append(key_info->name);
-    length = longlong10_to_str(quick->max_used_key_length, buf, 10) - buf;
-    used_lengths->append(buf, length);
-  }
-  if (pk_quick_select) {
-    KEY *key_info = head->key_info + pk_quick_select->index;
-    key_names->append(',');
-    key_names->append(key_info->name);
-    length =
-        longlong10_to_str(pk_quick_select->max_used_key_length, buf, 10) - buf;
-    used_lengths->append(',');
-    used_lengths->append(buf, length);
-  }
-}
-
-void QUICK_ROR_INTERSECT_SELECT::add_keys_and_lengths(String *key_names,
-                                                      String *used_lengths) {
-  char buf[64];
-  size_t length;
-  bool first = true;
-  QUICK_RANGE_SELECT *quick;
-  List_iterator_fast<QUICK_RANGE_SELECT> it(quick_selects);
-  while ((quick = it++)) {
-    KEY *key_info = head->key_info + quick->index;
-    if (first)
-      first = false;
-    else {
-      key_names->append(',');
-      used_lengths->append(',');
-    }
-    key_names->append(key_info->name);
-    length = longlong10_to_str(quick->max_used_key_length, buf, 10) - buf;
-    used_lengths->append(buf, length);
-  }
-
-  if (cpk_quick) {
-    KEY *key_info = head->key_info + cpk_quick->index;
-    key_names->append(',');
-    key_names->append(key_info->name);
-    length = longlong10_to_str(cpk_quick->max_used_key_length, buf, 10) - buf;
-    used_lengths->append(',');
-    used_lengths->append(buf, length);
-  }
-}
-
-void QUICK_ROR_UNION_SELECT::add_keys_and_lengths(String *key_names,
-                                                  String *used_lengths) {
-  bool first = true;
-  QUICK_SELECT_I *quick;
-  List_iterator_fast<QUICK_SELECT_I> it(quick_selects);
-  while ((quick = it++)) {
-    if (first)
-      first = false;
-    else {
-      used_lengths->append(',');
-      key_names->append(',');
-    }
-    quick->add_keys_and_lengths(key_names, used_lengths);
-  }
-}
-
-/*******************************************************************************
- * Implementation of QUICK_GROUP_MIN_MAX_SELECT
- *******************************************************************************/
-
-static inline uint get_field_keypart(KEY *index, const Field *field);
-static inline SEL_ROOT *get_index_range_tree(uint index, SEL_TREE *range_tree,
-                                             PARAM *param);
-static bool get_sel_root_for_keypart(uint key_part_num,
-                                     SEL_ROOT *index_range_tree,
-                                     SEL_ROOT **cur_range);
-
-static bool check_key_infix(SEL_ROOT *index_range_tree,
-                            KEY_PART_INFO *first_non_group_part,
-                            KEY_PART_INFO *min_max_arg_part,
-                            KEY_PART_INFO *last_part, uint *key_infix_len,
-                            KEY_PART_INFO **first_non_infix_part,
-                            uint *infix_factor, KEY *index_info);
-
-static bool check_group_min_max_predicates(Item *cond,
-                                           Item_field *min_max_arg_item,
-                                           Field::imagetype image_type);
-
-static bool min_max_inspect_cond_for_fields(Item *cond,
-                                            Item_field *min_max_arg_item,
-                                            bool *min_max_arg_present,
-                                            bool *non_min_max_arg_present);
-
-static void cost_group_min_max(TABLE *table, uint key, uint used_key_parts,
-                               uint group_key_parts, SEL_TREE *range_tree,
-                               ha_rows quick_prefix_records, bool have_min,
-                               bool have_max, uint infix_factor,
-                               Cost_estimate *cost_est, ha_rows *records);
-
-/**
-  Test if this access method is applicable to a GROUP query with MIN/MAX
-  functions, and if so, construct a new TRP object.
-
-  DESCRIPTION
-    Test whether a query can be computed via a QUICK_GROUP_MIN_MAX_SELECT.
-    Queries computable via a QUICK_GROUP_MIN_MAX_SELECT must satisfy the
-    following conditions:
-    A) Table T has at least one compound index I of the form:
-       I = <A_1, ...,A_k, [B_1,..., B_m], C, [D_1,...,D_n]>
-    B) Query conditions:
-    B0. Q is over a single table T.
-    B1. The attributes referenced by Q are a subset of the attributes of I.
-    B2. All attributes QA in Q can be divided into 3 overlapping groups:
-        - SA = {S_1, ..., S_l, [C]} - from the SELECT clause, where C is
-          referenced by any number of MIN and/or MAX functions if present.
-        - WA = {W_1, ..., W_p} - from the WHERE clause
-        - GA = <G_1, ..., G_k> - from the GROUP BY clause (if any)
-             = SA              - if Q is a DISTINCT query (based on the
-                                 equivalence of DISTINCT and GROUP queries.
-        - NGA = QA - (GA union C) = {NG_1, ..., NG_m} - the ones not in
-          GROUP BY and not referenced by MIN/MAX functions.
-        with the following properties specified below.
-    B3. If Q has a GROUP BY WITH ROLLUP clause the access method is not
-        applicable.
-
-    SA1. There is at most one attribute in SA referenced by any number of
-         MIN and/or MAX functions which, which if present, is denoted as C.
-    SA2. The position of the C attribute in the index is after the last A_k.
-    SA3. The attribute C can be referenced in the WHERE clause only in
-         predicates of the forms:
-         - (C {< | <= | > | >= | =} const)
-         - (const {< | <= | > | >= | =} C)
-         - (C between const_i and const_j)
-         - C IS NULL
-         - C IS NOT NULL
-         - C != const
-    SA4. If Q has a GROUP BY clause, there are no other aggregate functions
-         except MIN and MAX. For queries with DISTINCT, aggregate functions
-         are allowed.
-    SA5. The select list in DISTINCT queries should not contain expressions.
-    SA6. Clustered index can not be used by GROUP_MIN_MAX quick select
-         for AGG_FUNC(DISTINCT ...) optimization because cursor position is
-         never stored after a unique key lookup in the clustered index and
-         furhter index_next/prev calls can not be used. So loose index scan
-         optimization can not be used in this case.
-    SA7. If Q has both AGG_FUNC(DISTINCT ...) and MIN/MAX() functions then this
-         access method is not used.
-         For above queries MIN/MAX() aggregation has to be done at
-         nested_loops_join (end_send_group). But with current design MIN/MAX()
-         is always set as part of loose index scan. Because of this mismatch
-         MIN() and MAX() values will be set incorrectly. For such queries to
-         work we need a new interface for loose index scan. This new interface
-         should only fetch records with min and max values and let
-         end_send_group to do aggregation. Until then do not use
-         loose_index_scan.
-    GA1. If Q has a GROUP BY clause, then GA is a prefix of I. That is, if
-         G_i = A_j => i = j.
-    GA2. If Q has a DISTINCT clause, then there is a permutation of SA that
-         forms a prefix of I. This permutation is used as the GROUP clause
-         when the DISTINCT query is converted to a GROUP query.
-    GA3. The attributes in GA may participate in arbitrary predicates, divided
-         into two groups:
-         - RNG(G_1,...,G_q ; where q <= k) is a range condition over the
-           attributes of a prefix of GA
-         - PA(G_i1,...G_iq) is an arbitrary predicate over an arbitrary subset
-           of GA. Since P is applied to only GROUP attributes it filters some
-           groups, and thus can be applied after the grouping.
-    GA4. There are no expressions among G_i, just direct column references.
-    NGA1.If in the index I there is a gap between the last GROUP attribute G_k,
-         and the MIN/MAX attribute C, then NGA must consist of exactly the
-         index attributes that constitute the gap. As a result there is a
-         permutation of NGA, BA=<B_1,...,B_m>, that coincides with the gap
-         in the index.
-    NGA2.If BA <> {}, then the WHERE clause must contain a conjunction EQ of
-         equality conditions for all NG_i of the form (NG_i = const) or
-         (const = NG_i), such that each NG_i is referenced in exactly one
-         conjunct. Informally, the predicates provide constants to fill the
-         gap in the index.
-    WA1. There are no other attributes in the WHERE clause except the ones
-         referenced in predicates RNG, PA, PC, EQ defined above. Therefore
-         WA is subset of (GA union NGA union C) for GA,NGA,C that pass the
-         above tests. By transitivity then it also follows that each WA_i
-         participates in the index I (if this was already tested for GA, NGA
-         and C).
-    WA2. If there is a predicate on C, then it must be in conjunction
-         to all predicates on all earlier keyparts in I.
-
-    C) Overall query form:
-       SELECT EXPR([A_1,...,A_k], [B_1,...,B_m], [MIN(C)], [MAX(C)])
-         FROM T
-        WHERE [RNG(A_1,...,A_p ; where p <= k)]
-         [AND EQ(B_1,...,B_m)]
-         [AND PC(C)]
-         [AND PA(A_i1,...,A_iq)]
-       GROUP BY A_1,...,A_k
-       [HAVING PH(A_1, ..., B_1,..., C)]
-    where EXPR(...) is an arbitrary expression over some or all SELECT fields,
-    or:
-       SELECT DISTINCT A_i1,...,A_ik
-         FROM T
-        WHERE [RNG(A_1,...,A_p ; where p <= k)]
-         [AND PA(A_i1,...,A_iq)];
-
-  NOTES
-    If the current query satisfies the conditions above, and if
-    (mem_root! = NULL), then the function constructs and returns a new TRP
-    object, that is later used to construct a new QUICK_GROUP_MIN_MAX_SELECT.
-    If (mem_root == NULL), then the function only tests whether the current
-    query satisfies the conditions above, and, if so, sets
-    is_applicable = true.
-
-    Queries with DISTINCT for which index access can be used are transformed
-    into equivalent group-by queries of the form:
-
-    SELECT A_1,...,A_k FROM T
-     WHERE [RNG(A_1,...,A_p ; where p <= k)]
-      [AND PA(A_i1,...,A_iq)]
-    GROUP BY A_1,...,A_k;
-
-    The group-by list is a permutation of the select attributes, according
-    to their order in the index.
-
-  TODO
-  - What happens if the query groups by the MIN/MAX field, and there is no
-    other field as in: "select min(a) from t1 group by a" ?
-  - We assume that the general correctness of the GROUP-BY query was checked
-    before this point. Is this correct, or do we have to check it completely?
-  - Lift the limitation in condition (B3), that is, make this access method
-    applicable to ROLLUP queries.
-
- @param  param     Parameter from test_quick_select
- @param  tree      Range tree generated by get_mm_tree
- @param  cost_est  Best cost so far (=table/index scan time)
- @return table read plan
-   @retval NULL  Loose index scan not applicable or mem_root == NULL
-   @retval !NULL Loose index scan table read plan
-*/
-
-static TRP_GROUP_MIN_MAX *get_best_group_min_max(
-    PARAM *param, SEL_TREE *tree, const Cost_estimate *cost_est) {
-  THD *thd = param->thd;
-  JOIN *join = param->query_block->join;
-  TABLE *table = param->table;
-  bool have_min = false; /* true if there is a MIN function. */
-  bool have_max = false; /* true if there is a MAX function. */
-  Item_field *min_max_arg_item =
-      nullptr;  // The argument of all MIN/MAX functions
-  KEY_PART_INFO *min_max_arg_part = nullptr; /* The corresponding keypart. */
-  uint group_prefix_len = 0; /* Length (in bytes) of the key prefix. */
-  KEY *index_info = nullptr; /* The index chosen for data access. */
-  uint index = 0;            /* The id of the chosen index. */
-  uint group_key_parts = 0;  // Number of index key parts in the group prefix.
-  uint used_key_parts = 0;   /* Number of index key parts used for access. */
-  uint key_infix_len = 0;    /* Length of key_infix. */
-  TRP_GROUP_MIN_MAX *read_plan = nullptr; /* The eventually constructed TRP. */
-  uint key_part_nr;
-  ORDER *tmp_group;
-  Item_field *item_field;
-  bool is_agg_distinct;
-  /* Cost-related variables for the best index so far. */
-  Cost_estimate best_read_cost;
-  ha_rows best_records = 0;
-  SEL_ROOT *best_index_tree = nullptr;
-  ha_rows best_quick_prefix_records = 0;
-  uint best_param_idx = 0;
-  Opt_trace_context *const trace = &param->thd->opt_trace;
-
-  DBUG_TRACE;
-
-  Opt_trace_object trace_group(trace, "group_index_range",
-                               Opt_trace_context::RANGE_OPTIMIZER);
-  const char *cause = nullptr;
-  best_read_cost.set_max_cost();
-
-  /* Perform few 'cheap' tests whether this access method is applicable. */
-  if (!join)
-    cause = "no_join";
-  else if (join->primary_tables != 1) /* Query must reference one table. */
-    cause = "not_single_table";
-  else if (join->query_block->olap == ROLLUP_TYPE) /* Check (B3) for ROLLUP */
-    cause = "rollup";
-  else if (table->s->keys == 0) /* There are no indexes to use. */
-    cause = "no_index";
-  else if (param->order_direction == ORDER_DESC)
-    cause = "cannot_do_reverse_ordering";
-  if (cause != nullptr) {
-    trace_group.add("chosen", false).add_alnum("cause", cause);
-    return nullptr;
-  }
-
-  /* Check (SA1,SA4) and store the only MIN/MAX argument - the C attribute.*/
-  mem_root_deque<Item_field *> agg_distinct_flds(thd->mem_root);
-  is_agg_distinct = is_indexed_agg_distinct(join, &agg_distinct_flds);
-
-  if (join->group_list.empty() && /* Neither GROUP BY nor a DISTINCT query. */
-      (!join->select_distinct) && !is_agg_distinct) {
-    trace_group.add("chosen", false)
-        .add_alnum("cause", "not_group_by_or_distinct");
-    return nullptr;
-  }
-  /* Analyze the query in more detail. */
-
-  if (join->sum_funcs[0]) {
-    Item_sum *min_max_item;
-    Item_sum **func_ptr = join->sum_funcs;
-    while ((min_max_item = *(func_ptr++))) {
-      if (min_max_item->sum_func() == Item_sum::MIN_FUNC)
-        have_min = true;
-      else if (min_max_item->sum_func() == Item_sum::MAX_FUNC)
-        have_max = true;
-      else if (is_agg_distinct &&
-               (min_max_item->sum_func() == Item_sum::COUNT_DISTINCT_FUNC ||
-                min_max_item->sum_func() == Item_sum::SUM_DISTINCT_FUNC ||
-                min_max_item->sum_func() == Item_sum::AVG_DISTINCT_FUNC))
-        continue;
-      else {
-        trace_group.add("chosen", false)
-            .add_alnum("cause", "not_applicable_aggregate_function");
-        return nullptr;
-      }
-
-      /* The argument of MIN/MAX. */
-      Item *expr = min_max_item->get_arg(0)->real_item();
-      if (expr->type() == Item::FIELD_ITEM) /* Is it an attribute? */
-      {
-        if (!min_max_arg_item)
-          min_max_arg_item = (Item_field *)expr;
-        else if (!min_max_arg_item->eq(expr, true))
-          return nullptr;
-      } else
-        return nullptr;
-    }
-  }
-
-  /**
-    Test (Part of WA2): Skip loose index scan on disjunctive WHERE clause which
-    results in null tree or merge tree.
-  */
-  if (tree && !tree->merges.is_empty()) {
-    /**
-      The tree structure contains multiple disjoint trees. This happens when
-      the WHERE clause can't be represented in a single range tree due to the
-      disjunctive nature of it but there exists indexes to perform index
-      merge scan.
-    */
-    trace_group.add("chosen", false)
-        .add_alnum("cause", "disjuntive_predicate_present");
-    return nullptr;
-  } else if (!tree && join->where_cond && min_max_arg_item) {
-    /**
-      Skip loose index scan if min_max attribute is present along with
-      at least one other attribute in the WHERE cluse when the tree is null.
-      There is no range tree if WHERE condition can't be represented in a
-      single range tree and index merge is not possible.
-    */
-    bool min_max_arg_present = false;
-    bool non_min_max_arg_present = false;
-    if (min_max_inspect_cond_for_fields(join->where_cond, min_max_arg_item,
-                                        &min_max_arg_present,
-                                        &non_min_max_arg_present)) {
-      trace_group.add("chosen", false)
-          .add_alnum("cause", "minmax_keypart_in_disjunctive_query");
-      return nullptr;
-    }
-  }
-
-  /* Check (SA7). */
-  if (is_agg_distinct && (have_max || have_min)) {
-    trace_group.add("chosen", false)
-        .add_alnum("cause", "have_both_agg_distinct_and_min_max");
-    return nullptr;
-  }
-
-  /* Check (SA5). */
-  if (join->select_distinct) {
-    trace_group.add("distinct_query", true);
-    for (Item *item : VisibleFields(*join->fields)) {
-      if (item->real_item()->type() != Item::FIELD_ITEM) return nullptr;
-    }
-  }
-
-  /* Check (GA4) - that there are no expressions among the group attributes. */
-  for (tmp_group = join->group_list.order; tmp_group;
-       tmp_group = tmp_group->next) {
-    if ((*tmp_group->item)->real_item()->type() != Item::FIELD_ITEM) {
-      trace_group.add("chosen", false)
-          .add_alnum("cause", "group_field_is_expression");
-      return nullptr;
-    }
-  }
-
-  /*
-    Check that table has at least one compound index such that the conditions
-    (GA1,GA2) are all true. If there is more than one such index, select the
-    first one. Here we set the variables: group_prefix_len and index_info.
-  */
-
-  const uint pk = param->table->s->primary_key;
-  SEL_ROOT *cur_index_tree = nullptr;
-  ha_rows cur_quick_prefix_records = 0;
-  Opt_trace_array trace_indexes(trace, "potential_group_range_indexes");
-  // We go through allowed indexes
-  for (uint cur_param_idx = 0; cur_param_idx < param->keys; ++cur_param_idx) {
-    const uint cur_index = param->real_keynr[cur_param_idx];
-    KEY *const cur_index_info = &table->key_info[cur_index];
-    Opt_trace_object trace_idx(trace);
-    trace_idx.add_utf8("index", cur_index_info->name);
-    KEY_PART_INFO *cur_part;
-    KEY_PART_INFO *end_part; /* Last part for loops. */
-    /* Last index part. */
-    KEY_PART_INFO *last_part;
-    KEY_PART_INFO *first_non_group_part;
-    KEY_PART_INFO *first_non_infix_part;
-    uint key_infix_parts;
-    uint cur_group_key_parts = 0;
-    uint cur_group_prefix_len = 0;
-    Cost_estimate cur_read_cost;
-    // Possible number of combination of infix ranges
-    uint cur_infix_factor = 1;
-    ha_rows cur_records;
-    Key_map used_key_parts_map;
-    uint max_key_part = 0;
-    uint cur_key_infix_len = 0;
-    uint cur_used_key_parts;
-    KEY_PART_INFO *cur_min_max_arg_part = nullptr;
-
-    /* Check (B1) - if current index is covering. */
-    if (!table->covering_keys.is_set(cur_index)) {
-      cause = "not_covering";
-      goto next_index;
-    }
-
-    /*
-      If the current storage manager is such that it appends the primary key to
-      each index, then the above condition is insufficient to check if the
-      index is covering. In such cases it may happen that some fields are
-      covered by the PK index, but not by the current index. Since we can't
-      use the concatenation of both indexes for index lookup, such an index
-      does not qualify as covering in our case. If this is the case, below
-      we check that all query fields are indeed covered by 'cur_index'.
-    */
-    if (pk < MAX_KEY && cur_index != pk &&
-        (table->file->ha_table_flags() & HA_PRIMARY_KEY_IN_READ_INDEX)) {
-      /* For each table field */
-      for (uint i = 0; i < table->s->fields; i++) {
-        Field *cur_field = table->field[i];
-        /*
-          If the field is used in the current query ensure that it's
-          part of 'cur_index'
-        */
-        if (bitmap_is_set(table->read_set, cur_field->field_index()) &&
-            !cur_field->is_part_of_actual_key(thd, cur_index, cur_index_info)) {
-          cause = "not_covering";
-          goto next_index;  // Field was not part of key
-        }
-      }
-    }
-    trace_idx.add("covering", true);
-
-    /*
-      Check (GA1) for GROUP BY queries.
-    */
-    if (!join->group_list.empty()) {
-      cur_part = cur_index_info->key_part;
-      end_part = cur_part + actual_key_parts(cur_index_info);
-      /* Iterate in parallel over the GROUP list and the index parts. */
-      for (tmp_group = join->group_list.order;
-           tmp_group && (cur_part != end_part);
-           tmp_group = tmp_group->next, cur_part++) {
-        /*
-          TODO:
-          tmp_group::item is an array of Item, is it OK to consider only the
-          first Item? If so, then why? What is the array for?
-        */
-        /* Above we already checked that all group items are fields. */
-        assert((*tmp_group->item)->real_item()->type() == Item::FIELD_ITEM);
-        Item_field *group_field = (Item_field *)(*tmp_group->item)->real_item();
-        if (group_field->field->eq(cur_part->field)) {
-          cur_group_prefix_len += cur_part->store_length;
-          ++cur_group_key_parts;
-          max_key_part = cur_part - cur_index_info->key_part + 1;
-          used_key_parts_map.set_bit(max_key_part);
-        } else {
-          cause = "group_attribute_not_prefix_in_index";
-          goto next_index;
-        }
-      }
-    }
-
-    /*
-      Check (GA2) if this is a DISTINCT query.
-      If GA2, then Store a new ORDER object in group_fields_array at the
-      position of the key part of item_field->field. Thus we get the ORDER
-      objects for each field ordered as the corresponding key parts.
-      Later group_fields_array of ORDER objects is used to convert the query
-      to a GROUP query.
-    */
-    if ((join->group_list.empty() && join->select_distinct) ||
-        is_agg_distinct) {
-      auto agg_distinct_flds_it = agg_distinct_flds.begin();
-      auto select_items_it = join->fields->begin();
-      while (is_agg_distinct ? (agg_distinct_flds_it != agg_distinct_flds.end())
-                             : (select_items_it != join->fields->end())) {
-        Item *item =
-            (is_agg_distinct ? static_cast<Item *>(*agg_distinct_flds_it++)
-                             : *select_items_it++);
-        if (item->hidden) continue;
-
-        /* (SA5) already checked above. */
-        item_field = (Item_field *)item->real_item();
-        assert(item->real_item()->type() == Item::FIELD_ITEM);
-
-        /* not doing loose index scan for derived tables */
-        if (!item_field->field) {
-          cause = "derived_table";
-          goto next_index;
-        }
-
-        /* Find the order of the key part in the index. */
-        key_part_nr = get_field_keypart(cur_index_info, item_field->field);
-        /*
-          Check if this attribute was already present in the select list.
-          If it was present, then its corresponding key part was alredy used.
-        */
-        if (used_key_parts_map.is_set(key_part_nr)) continue;
-        if (key_part_nr < 1 ||
-            (!is_agg_distinct &&
-             key_part_nr > CountVisibleFields(*join->fields))) {
-          cause = "select_attribute_not_prefix_in_index";
-          goto next_index;
-        }
-        cur_part = cur_index_info->key_part + key_part_nr - 1;
-        cur_group_prefix_len += cur_part->store_length;
-        used_key_parts_map.set_bit(key_part_nr);
-        ++cur_group_key_parts;
-        max_key_part = max(max_key_part, key_part_nr);
-      }
-      /*
-        Check that used key parts forms a prefix of the index.
-        To check this we compare bits in all_parts and cur_parts.
-        all_parts have all bits set from 0 to (max_key_part-1).
-        cur_parts have bits set for only used keyparts.
-      */
-      ulonglong all_parts, cur_parts;
-      all_parts = (1ULL << max_key_part) - 1;
-      cur_parts = used_key_parts_map.to_ulonglong() >> 1;
-      if (all_parts != cur_parts) goto next_index;
-    }
-
-    /* Check (SA2). */
-    if (min_max_arg_item) {
-      key_part_nr = get_field_keypart(cur_index_info, min_max_arg_item->field);
-      if (key_part_nr <= cur_group_key_parts) {
-        cause = "aggregate_column_not_suffix_in_idx";
-        goto next_index;
-      }
-      cur_min_max_arg_part = cur_index_info->key_part + key_part_nr - 1;
-    }
-
-    /* Check (SA6) if clustered key is used. */
-    if (is_agg_distinct && cur_index == table->s->primary_key &&
-        table->file->primary_key_is_clustered()) {
-      cause = "primary_key_is_clustered";
-      goto next_index;
-    }
-
-    /*
-      Check (NGA1, NGA2) and extract a sequence of constants to be used as part
-      of all search keys.
-    */
-
-    /*
-      If there is MIN/MAX, each keypart between the last group part and the
-      MIN/MAX part must participate in equalities with constants, and all
-      keyparts after the MIN/MAX part must not be referenced in the query.
-
-      If there is no MIN/MAX, the keyparts after the last group part can be
-      referenced only in equalities with constants, and the referenced keyparts
-      must form a sequence without any gaps that starts immediately after the
-      last group keypart.
-    */
-    last_part = cur_index_info->key_part + actual_key_parts(cur_index_info);
-    first_non_group_part =
-        (cur_group_key_parts < actual_key_parts(cur_index_info))
-            ? cur_index_info->key_part + cur_group_key_parts
-            : nullptr;
-    first_non_infix_part = cur_min_max_arg_part
-                               ? (cur_min_max_arg_part < last_part)
-                                     ? cur_min_max_arg_part
-                                     : nullptr
-                               : nullptr;
-    if (first_non_group_part &&
-        (!cur_min_max_arg_part ||
-         (cur_min_max_arg_part - first_non_group_part > 0))) {
-      if (tree) {
-        SEL_ROOT *index_range_tree =
-            get_index_range_tree(cur_index, tree, param);
-
-        if (!check_key_infix(index_range_tree, first_non_group_part,
-                             cur_min_max_arg_part, last_part,
-                             &cur_key_infix_len, &first_non_infix_part,
-                             &cur_infix_factor, cur_index_info)) {
-          cause = "non_equality_gap_attribute";
-          goto next_index;
-        }
-      } else if (cur_min_max_arg_part &&
-                 (cur_min_max_arg_part - first_non_group_part > 0)) {
-        /*
-          There is a gap but no range tree, thus no predicates at all for the
-          non-group keyparts.
-        */
-        cause = "no_nongroup_keypart_predicate";
-        goto next_index;
-      } else if (first_non_group_part && join->where_cond) {
-        /*
-          If there is no MIN/MAX function in the query, but some index
-          key part is referenced in the WHERE clause, then this index
-          cannot be used because the WHERE condition over the keypart's
-          field cannot be 'pushed' to the index (because there is no
-          range 'tree'), and the WHERE clause must be evaluated before
-          GROUP BY/DISTINCT.
-        */
-        /*
-          Store the first and last keyparts that need to be analyzed
-          into one array that can be passed as parameter.
-        */
-        KEY_PART_INFO *key_part_range[2];
-        key_part_range[0] = first_non_group_part;
-        key_part_range[1] = last_part;
-
-        /* Check if cur_part is referenced in the WHERE clause. */
-        if (join->where_cond->walk(&Item::find_item_in_field_list_processor,
-                                   enum_walk::SUBQUERY_POSTFIX,
-                                   (uchar *)key_part_range)) {
-          cause = "keypart_reference_from_where_clause";
-          goto next_index;
-        }
-      }
-    }
-
-    /*
-      Test (WA1) partially - that no other keypart after the last infix part is
-      referenced in the query.
-    */
-    if (first_non_infix_part) {
-      cur_part = first_non_infix_part +
-                 (cur_min_max_arg_part && (cur_min_max_arg_part < last_part));
-      for (; cur_part != last_part; cur_part++) {
-        if (bitmap_is_set(table->read_set, cur_part->field->field_index())) {
-          cause = "keypart_after_infix_in_query";
-          goto next_index;
-        }
-      }
-    }
-
-    /**
-      Test Part of WA2:If there are conditions on a column C participating in
-      MIN/MAX, those conditions must be conjunctions to all earlier
-      keyparts. Otherwise, Loose Index Scan cannot be used.
-    */
-    if (tree && min_max_arg_item) {
-      SEL_ROOT *index_range_tree = get_index_range_tree(cur_index, tree, param);
-      SEL_ROOT *cur_range = nullptr;
-      if (get_sel_root_for_keypart(
-              cur_min_max_arg_part - cur_index_info->key_part, index_range_tree,
-              &cur_range) ||
-          (cur_range && cur_range->type != SEL_ROOT::Type::KEY_RANGE)) {
-        cause = "minmax_keypart_in_disjunctive_query";
-        goto next_index;
-      }
-    }
-
-    /* If we got to this point, cur_index_info passes the test. */
-    key_infix_parts = cur_key_infix_len
-                          ? (uint)(first_non_infix_part - first_non_group_part)
-                          : 0;
-    cur_used_key_parts = cur_group_key_parts + key_infix_parts;
-
-    /* Compute the cost of using this index. */
-    if (tree) {
-      /* Find the SEL_ARG sub-tree that corresponds to the chosen index. */
-      cur_index_tree = get_index_range_tree(cur_index, tree, param);
-      /* Check if this range tree can be used for prefix retrieval. */
-      Cost_estimate dummy_cost;
-      uint mrr_flags = HA_MRR_SORTED;
-      uint mrr_bufsize = 0;
-      cur_quick_prefix_records = check_quick_select(
-          param, cur_param_idx, false /*don't care*/, cur_index_tree, true,
-          &mrr_flags, &mrr_bufsize, &dummy_cost);
-      if (unlikely(cur_index_tree && trace->is_started())) {
-        trace_idx.add("index_dives_for_eq_ranges",
-                      !param->use_index_statistics);
-        Opt_trace_array trace_range(trace, "ranges");
-
-        const KEY_PART_INFO *key_part = cur_index_info->key_part;
-
-        String range_info;
-        range_info.set_charset(system_charset_info);
-        append_range_all_keyparts(&trace_range, nullptr, &range_info,
-                                  cur_index_tree, key_part, false);
-      }
-    }
-    cost_group_min_max(table, cur_index, cur_used_key_parts,
-                       cur_group_key_parts, tree, cur_quick_prefix_records,
-                       have_min, have_max, cur_infix_factor, &cur_read_cost,
-                       &cur_records);
-    /*
-      If cur_read_cost is lower than best_read_cost use cur_index.
-      Do not compare doubles directly because they may have different
-      representations (64 vs. 80 bits).
-    */
-    trace_idx.add("rows", cur_records).add("cost", cur_read_cost);
-    {
-      Cost_estimate min_diff_cost = cur_read_cost;
-      min_diff_cost.multiply(DBL_EPSILON);
-      if (cur_read_cost < (best_read_cost - min_diff_cost)) {
-        index_info = cur_index_info;
-        index = cur_index;
-        best_read_cost = cur_read_cost;
-        best_records = cur_records;
-        best_index_tree = cur_index_tree;
-        best_quick_prefix_records = cur_quick_prefix_records;
-        best_param_idx = cur_param_idx;
-        group_key_parts = cur_group_key_parts;
-        group_prefix_len = cur_group_prefix_len;
-        key_infix_len = cur_key_infix_len;
-        used_key_parts = cur_used_key_parts;
-        min_max_arg_part = cur_min_max_arg_part;
-      }
-    }
-
-  next_index:
-    if (cause) {
-      trace_idx.add("usable", false).add_alnum("cause", cause);
-      cause = nullptr;
-    }
-  }
-  trace_indexes.end();
-
-  if (!index_info) /* No usable index found. */
-    return nullptr;
-
-  /* Check (SA3) for the where clause. */
-  if (join->where_cond && min_max_arg_item &&
-      !check_group_min_max_predicates(
-          join->where_cond, min_max_arg_item,
-          (index_info->flags & HA_SPATIAL) ? Field::itMBR : Field::itRAW)) {
-    trace_group.add("usable", false)
-        .add_alnum("cause", "unsupported_predicate_on_agg_attribute");
-    return nullptr;
-  }
-
-  /* The query passes all tests, so construct a new TRP object. */
-  read_plan = new (param->mem_root) TRP_GROUP_MIN_MAX(
-      have_min, have_max, is_agg_distinct, min_max_arg_part, group_prefix_len,
-      used_key_parts, group_key_parts, index_info, index, key_infix_len, tree,
-      best_index_tree, best_param_idx, best_quick_prefix_records);
-  if (read_plan) {
-    if (tree && read_plan->quick_prefix_records == 0) return nullptr;
-
-    read_plan->cost_est = best_read_cost;
-    read_plan->records = best_records;
-    if (*cost_est < best_read_cost && is_agg_distinct) {
-      trace_group.add("index_scan", true);
-      read_plan->cost_est.reset();
-      read_plan->use_index_scan();
-    }
-
-    DBUG_PRINT("info",
-               ("Returning group min/max plan: cost: %g, records: %lu",
-                read_plan->cost_est.total_cost(), (ulong)read_plan->records));
-  }
-
-  return read_plan;
-}
-
-/*
-  Check that the MIN/MAX attribute participates only in range predicates
-  with constants.
-
-  SYNOPSIS
-    check_group_min_max_predicates()
-    cond              tree (or subtree) describing all or part of the WHERE
-                      clause being analyzed
-    min_max_arg_item  the field referenced by the MIN/MAX function(s)
-    min_max_arg_part  the keypart of the MIN/MAX argument if any
-
-  DESCRIPTION
-    The function walks recursively over the cond tree representing a WHERE
-    clause, and checks condition (SA3) - if a field is referenced by a MIN/MAX
-    aggregate function, it is referenced only by one of the following
-    predicates: {=, !=, <, <=, >, >=, between, is null, is not null}.
-
-  RETURN
-    true  if cond passes the test
-    false o/w
-*/
-
-static bool check_group_min_max_predicates(Item *cond,
-                                           Item_field *min_max_arg_item,
-                                           Field::imagetype image_type) {
-  DBUG_TRACE;
-  assert(cond && min_max_arg_item);
-
-  cond = cond->real_item();
-  Item::Type cond_type = cond->type();
-  if (cond_type == Item::COND_ITEM) /* 'AND' or 'OR' */
-  {
-    DBUG_PRINT("info", ("Analyzing: %s", ((Item_func *)cond)->func_name()));
-    List_iterator_fast<Item> li(*((Item_cond *)cond)->argument_list());
-    Item *and_or_arg;
-    while ((and_or_arg = li++)) {
-      if (!check_group_min_max_predicates(and_or_arg, min_max_arg_item,
-                                          image_type))
-        return false;
-    }
-    return true;
-  }
-
-  /*
-    TODO:
-    This is a very crude fix to handle sub-selects in the WHERE clause
-    (Item_subselect objects). With the test below we rule out from the
-    optimization all queries with subselects in the WHERE clause. What has to
-    be done, is that here we should analyze whether the subselect references
-    the MIN/MAX argument field, and disallow the optimization only if this is
-    so.
-    Need to handle subselect in min_max_inspect_cond_for_fields() once this
-    is fixed.
-  */
-  if (cond_type == Item::SUBSELECT_ITEM) return false;
-
-  /*
-    Condition of the form 'field' is equivalent to 'field <> 0' and thus
-    satisfies the SA3 condition.
-  */
-  if (cond_type == Item::FIELD_ITEM) {
-    DBUG_PRINT("info", ("Analyzing: %s", cond->full_name()));
-    return true;
-  }
-
-  /*
-    At this point, we have weeded out most conditions other than
-    function items. However, there are cases like the following:
-
-      select 1 in (select max(c) from t1 where max(1) group by a)
-
-    Here the condition "where max(1)" is an Item_sum_max, not an
-    Item_func. In this particular case, the where clause should
-    be equivalent to "where max(1) <> 0". A where clause
-    phrased that way does not satisfy the SA3 condition of
-    get_best_group_min_max(). The "where max(1) = true" clause
-    causes this method to reject the access method
-    (i.e., to return false).
-
-    It's been suggested that it may be possible to use the access method
-    for a sub-family of cases when we're aggregating constants or
-    outer references. For the moment, we bale out and we reject
-    the access method for the query.
-
-    It's hard to prove that there are no other cases where the
-    condition is not an Item_func. So, for the moment, don't apply
-    the optimization if the condition is not a function item.
-  */
-  if (cond_type == Item::SUM_FUNC_ITEM) {
-    return false;
-  }
-
-  /*
-   If this is a debug server, then we want to know about
-   additional oddball cases which might benefit from this
-   optimization.
-  */
-  assert(cond_type == Item::FUNC_ITEM);
-  if (cond_type != Item::FUNC_ITEM) {
-    return false;
-  }
-
-  /* Test if cond references only group-by or non-group fields. */
-  Item_func *pred = (Item_func *)cond;
-  Item *cur_arg;
-  DBUG_PRINT("info", ("Analyzing: %s", pred->func_name()));
-  for (uint arg_idx = 0; arg_idx < pred->argument_count(); arg_idx++) {
-    Item **arguments = pred->arguments();
-    cur_arg = arguments[arg_idx]->real_item();
-    DBUG_PRINT("info", ("cur_arg: %s", cur_arg->full_name()));
-    if (cur_arg->type() == Item::FIELD_ITEM) {
-      if (min_max_arg_item->eq(cur_arg, true)) {
-        /*
-          If pred references the MIN/MAX argument, check whether pred is a range
-          condition that compares the MIN/MAX argument with a constant.
-        */
-        Item_func::Functype pred_type = pred->functype();
-        if (pred_type != Item_func::EQUAL_FUNC &&
-            pred_type != Item_func::LT_FUNC &&
-            pred_type != Item_func::LE_FUNC &&
-            pred_type != Item_func::GT_FUNC &&
-            pred_type != Item_func::GE_FUNC &&
-            pred_type != Item_func::BETWEEN &&
-            pred_type != Item_func::ISNULL_FUNC &&
-            pred_type != Item_func::ISNOTNULL_FUNC &&
-            pred_type != Item_func::EQ_FUNC && pred_type != Item_func::NE_FUNC)
-          return false;
-
-        /* Check that pred compares min_max_arg_item with a constant. */
-        Item *args[3];
-        memset(args, 0, 3 * sizeof(Item *));
-        bool inv;
-        /* Test if this is a comparison of a field and a constant. */
-        if (!is_simple_predicate(pred, args, &inv)) return false;
-
-        /* Check for compatible string comparisons - similar to get_mm_leaf. */
-        if (args[0] && args[1] && !args[2] &&  // this is a binary function
-            min_max_arg_item->result_type() == STRING_RESULT &&
-            /*
-              Don't use an index when comparing strings of different collations.
-            */
-            ((args[1]->result_type() == STRING_RESULT &&
-              image_type == Field::itRAW &&
-              min_max_arg_item->field->charset() !=
-                  pred->compare_collation()) ||
-             /*
-               We can't always use indexes when comparing a string index to a
-               number.
-             */
-             (args[1]->result_type() != STRING_RESULT &&
-              min_max_arg_item->field->cmp_type() != args[1]->result_type())))
-          return false;
-      }
-    } else if (cur_arg->type() == Item::FUNC_ITEM) {
-      if (!check_group_min_max_predicates(cur_arg, min_max_arg_item,
-                                          image_type))
-        return false;
-    } else if (cur_arg->const_item()) {
-      /*
-        For predicates of the form "const OP expr" we also have to check 'expr'
-        to make a decision.
-      */
-      continue;
-    } else
-      return false;
-  }
-
-  return true;
-}
-
-/**
-  Utility function used by min_max_inspect_cond_for_fields() for comparing
-  FILED item with given MIN/MAX item and setting appropriate out paramater.
-
-@param         item_field         Item field for comparison.
-@param         min_max_arg_item   The field referenced by the MIN/MAX
-                                  function(s).
-@param [out]   min_max_arg_present    This out parameter is set to true if
-                                      MIN/MAX argument is present in cond.
-@param [out]   non_min_max_arg_present This out parameter is set to true if
-                                       any field item other than MIN/MAX
-                                       argument is present in cond.
-*/
-static inline void util_min_max_inspect_item(Item *item_field,
-                                             Item_field *min_max_arg_item,
-                                             bool *min_max_arg_present,
-                                             bool *non_min_max_arg_present) {
-  if (item_field->type() == Item::FIELD_ITEM) {
-    if (min_max_arg_item->eq(item_field, true))
-      *min_max_arg_present = true;
-    else
-      *non_min_max_arg_present = true;
-  }
-}
-
-/**
-  This function detects the presents of MIN/MAX field along with at least
-  one non MIN/MAX field participation in the given condition. Subqueries
-  inspection is skipped as of now.
-
-  @param         cond   tree (or subtree) describing all or part of the WHERE
-                        clause being analyzed.
-  @param         min_max_arg_item   The field referenced by the MIN/MAX
-                                    function(s).
-  @param [out]   min_max_arg_present    This out parameter is set to true if
-                                        MIN/MAX argument is present in cond.
-  @param [out]   non_min_max_arg_present This out parameter is set to true if
-                                         any field item other than MIN/MAX
-                                         argument is present in cond.
-
-  @return  TRUE if both MIN/MAX field and non MIN/MAX field is present in cond.
-           FALSE o/w.
-
-  @todo: When the hack present in check_group_min_max_predicate() is removed,
-         subqueries needs to be inspected.
-*/
-
-static bool min_max_inspect_cond_for_fields(Item *cond,
-                                            Item_field *min_max_arg_item,
-                                            bool *min_max_arg_present,
-                                            bool *non_min_max_arg_present) {
-  DBUG_TRACE;
-  assert(cond && min_max_arg_item);
-
-  cond = cond->real_item();
-  Item::Type cond_type = cond->type();
-
-  switch (cond_type) {
-    case Item::COND_ITEM: {
-      DBUG_PRINT("info", ("Analyzing: %s", ((Item_func *)cond)->func_name()));
-      List_iterator_fast<Item> li(*((Item_cond *)cond)->argument_list());
-      Item *and_or_arg;
-      while ((and_or_arg = li++)) {
-        min_max_inspect_cond_for_fields(and_or_arg, min_max_arg_item,
-                                        min_max_arg_present,
-                                        non_min_max_arg_present);
-        if (*min_max_arg_present && *non_min_max_arg_present) return true;
-      }
-
-      return false;
-    }
-    case Item::FUNC_ITEM: {
-      /* Test if cond references both group-by and non-group fields. */
-      Item_func *pred = (Item_func *)cond;
-      Item *cur_arg;
-      DBUG_PRINT("info", ("Analyzing: %s", pred->func_name()));
-      for (uint arg_idx = 0; arg_idx < pred->argument_count(); arg_idx++) {
-        Item **arguments = pred->arguments();
-        cur_arg = arguments[arg_idx]->real_item();
-        DBUG_PRINT("info", ("cur_arg: %s", cur_arg->full_name()));
-
-        if (cur_arg->type() == Item::FUNC_ITEM) {
-          min_max_inspect_cond_for_fields(cur_arg, min_max_arg_item,
-                                          min_max_arg_present,
-                                          non_min_max_arg_present);
-        } else {
-          util_min_max_inspect_item(cur_arg, min_max_arg_item,
-                                    min_max_arg_present,
-                                    non_min_max_arg_present);
-        }
-
-        if (*min_max_arg_present && *non_min_max_arg_present) return true;
-      }
-
-      if (pred->functype() == Item_func::MULT_EQUAL_FUNC) {
-        /*
-          Analyze participating fields in a multiequal condition.
-        */
-        Item_equal_iterator it(*(Item_equal *)cond);
-
-        Item *item_field;
-        while ((item_field = it++)) {
-          util_min_max_inspect_item(item_field, min_max_arg_item,
-                                    min_max_arg_present,
-                                    non_min_max_arg_present);
-
-          if (*min_max_arg_present && *non_min_max_arg_present) return true;
-        }
-      }
-
-      break;
-    }
-    case Item::FIELD_ITEM: {
-      util_min_max_inspect_item(cond, min_max_arg_item, min_max_arg_present,
-                                non_min_max_arg_present);
-      DBUG_PRINT("info", ("Analyzing: %s", cond->full_name()));
-      return false;
-    }
-    default:
-      break;
-  }
-
-  return false;
-}
-
-/*
-  Get the SEL_ARG tree 'tree' for the keypart covering 'field', if
-  any. 'tree' must be a unique conjunction to ALL predicates in earlier
-  keyparts of 'keypart_tree'.
-
-  E.g., if 'keypart_tree' is for a composite index (kp1,kp2) and kp2
-  covers 'field', all these conditions satisfies the requirement:
-
-   1. "(kp1=2 OR kp1=3) AND kp2=10"    => returns "kp2=10"
-   2. "(kp1=2 AND kp2=10) OR (kp1=3 AND kp2=10)"  => returns "kp2=10"
-   3. "(kp1=2 AND (kp2=10 OR kp2=11)) OR (kp1=3 AND (kp2=10 OR kp2=11))"
-                                       => returns "kp2=10  OR kp2=11"
-
-   whereas these do not
-   1. "(kp1=2 AND kp2=10) OR kp1=3"
-   2. "(kp1=2 AND kp2=10) OR (kp1=3 AND kp2=11)"
-   3. "(kp1=2 AND kp2=10) OR (kp1=3 AND (kp2=10 OR kp2=11))"
-
-   This function effectively tests requirement WA2.
-
-  @param[in]   key_part_num   Key part number we want the SEL_ARG tree for
-  @param[in]   keypart_tree   The SEL_ARG* tree for the index
-  @param[out]  cur_range      The SEL_ARG tree, if any, for the keypart
-
-  @retval true   'keypart_tree' contained a predicate for key part that
-                  is not conjunction to all predicates on earlier keyparts
-  @retval false  otherwise
-*/
-
-static bool get_sel_root_for_keypart(uint key_part_num, SEL_ROOT *keypart_tree,
-                                     SEL_ROOT **cur_range) {
-  if (keypart_tree == nullptr) return false;
-  if (keypart_tree->type != SEL_ROOT::Type::KEY_RANGE) {
-    /*
-      A range predicate not usable by Loose Index Scan is found.
-      Predicates for keypart 'keypart_tree->root->part' and later keyparts
-      cannot be used.
-    */
-    *cur_range = keypart_tree;
-    return false;
-  }
-  if (keypart_tree->root->part == key_part_num) {
-    *cur_range = keypart_tree;
-    return false;
-  }
-
-  SEL_ROOT *tree_first_range = nullptr;
-  SEL_ARG *first_kp = keypart_tree->root->first();
-
-  for (SEL_ARG *cur_kp = first_kp; cur_kp; cur_kp = cur_kp->next) {
-    SEL_ROOT *curr_tree = nullptr;
-    if (cur_kp->next_key_part) {
-      if (get_sel_root_for_keypart(key_part_num, cur_kp->next_key_part,
-                                   &curr_tree))
-        return true;
-    }
-    /**
-      Check if the SEL_ARG tree for 'field' is identical for all ranges in
-      'keypart_tree'.
-    */
-    if (cur_kp == first_kp)
-      tree_first_range = curr_tree;
-    else if (!all_same(tree_first_range, curr_tree))
-      return true;
-  }
-  *cur_range = tree_first_range;
-  return false;
-}
-
-/*
-  Check for conjunction of equality predicates on the non-group key parts.
-
-  SYNOPSIS
-    check_key_infix()
-    index_range_tree       [in]  Range tree for the chosen index
-    first_non_group_part   [in]  First index part after group attribute parts
-    min_max_arg_part       [in]  The keypart of the MIN/MAX argument if any
-    last_part              [in]  Last keypart of the index
-    key_infix_len          [out] Lenghth of the infix
-    first_non_infix_part   [out] The first keypart after the infix (if any)
-    infix_factor           [out] The number of combinations of infixes
-                                 that can be possible.
-    index_info             [in]  Pointer to KEY object
-
-  DESCRIPTION
-    Test conditions (NGA1, NGA2) from get_best_group_min_max(). Namely,
-    for each keypart field NGF_i not in GROUP-BY, check that there is at least
-    one equality range predicate for each key part among conds with the form
-    (NGF_i = const_ci) or (const_ci = NGF_i).
-    Thus all the NGF_i attributes must fill the 'gap' between the last group-by
-    attribute and the MIN/MAX attribute in the index (if present). If these
-    conditions hold, update key_infix_len with the total length of the key
-    parts in key_infix. Increase the infix_factor by the number of ranges
-    present on NGF_i.
-
-  RETURN
-    true  if the index passes the test
-    false o/w
-*/
-
-static bool check_key_infix(SEL_ROOT *index_range_tree,
-                            KEY_PART_INFO *first_non_group_part,
-                            KEY_PART_INFO *min_max_arg_part,
-                            KEY_PART_INFO *last_part, uint *key_infix_len,
-                            KEY_PART_INFO **first_non_infix_part,
-                            uint *infix_factor, KEY *index_info) {
-  SEL_ROOT *cur_range;
-  KEY_PART_INFO *cur_part;
-  /* End part for the first loop below. */
-  KEY_PART_INFO *end_part = min_max_arg_part ? min_max_arg_part : last_part;
-
-  *key_infix_len = 0;
-  *infix_factor = 1;
-
-  for (cur_part = first_non_group_part; cur_part != end_part; cur_part++) {
-    cur_range = nullptr;
-    /*
-      get_sel_root_for_keypart gets the range tree for the key part and
-      also checks for a unique conjunction of this tree with all the
-      predicates on the earlier keyparts in the index.
-    */
-    if (get_sel_root_for_keypart(cur_part - index_info->key_part,
-                                 index_range_tree, &cur_range))
-      return false;
-
-    if (!cur_range || cur_range->type != SEL_ROOT::Type::KEY_RANGE) {
-      if (min_max_arg_part)
-        return false; /* The current keypart has no range predicates at all. */
-      else {
-        *first_non_infix_part = cur_part;
-        return true;
-      }
-    }
-
-    /*
-      Check if all ranges are equality or NULL ranges for key the current
-      key part.
-    */
-    SEL_ARG *tmp_range = cur_range->root->first();
-    while (tmp_range) {
-      if ((tmp_range->min_flag & NO_MIN_RANGE) ||
-          (tmp_range->max_flag & NO_MAX_RANGE) ||
-          (tmp_range->min_flag & NEAR_MIN) || (tmp_range->max_flag & NEAR_MAX))
-        return false;
-      if (!((tmp_range->maybe_null() && tmp_range->min_value[0] &&
-             tmp_range->max_value[0]) ||
-            memcmp(tmp_range->min_value, tmp_range->max_value,
-                   cur_part->store_length) == 0))
-        return false;
-      tmp_range = tmp_range->next;
-    }
-    *key_infix_len += cur_part->store_length;
-    *infix_factor *= cur_range->elements;
-  }
-
-  if (!min_max_arg_part && (cur_part == last_part))
-    *first_non_infix_part = last_part;
-
-  return true;
-}
-
-/*
-  Find the key part referenced by a field.
-
-  SYNOPSIS
-    get_field_keypart()
-    index  descriptor of an index
-    field  field that possibly references some key part in index
-
-  NOTES
-    The return value can be used to get a KEY_PART_INFO pointer by
-    part= index->key_part + get_field_keypart(...) - 1;
-
-  RETURN
-    Positive number which is the consecutive number of the key part, or
-    0 if field does not reference any index field.
-*/
-
-static inline uint get_field_keypart(KEY *index, const Field *field) {
-  KEY_PART_INFO *part, *end;
-
-  for (part = index->key_part, end = part + actual_key_parts(index); part < end;
-       part++) {
-    if (field->eq(part->field)) return part - index->key_part + 1;
-  }
-  return 0;
-}
-
-/*
-  Find the SEL_ROOT tree that corresponds to the chosen index.
-
-  SYNOPSIS
-    get_index_range_tree()
-    index     [in]  The ID of the index being looked for
-    range_tree[in]  Tree of ranges being searched
-    param     [in]  PARAM from test_quick_select
-
-  DESCRIPTION
-
-    A SEL_TREE contains range trees for all usable indexes. This procedure
-    finds the SEL_ROOT tree for 'index'. The members of a SEL_TREE are
-    ordered in the same way as the members of PARAM::key, thus we first find
-    the corresponding index in the array PARAM::key. This index is returned
-    through the variable param_idx, to be used later as argument of
-    check_quick_select().
-
-  RETURN
-    Pointer to the SEL_ROOT tree that corresponds to index.
-*/
-
-SEL_ROOT *get_index_range_tree(uint index, SEL_TREE *range_tree, PARAM *param) {
-  uint idx = 0; /* Index nr in param->key_parts */
-  while (idx < param->keys) {
-    if (index == param->real_keynr[idx]) break;
-    idx++;
-  }
-  return (range_tree->keys[idx]);
-}
-
-/*
-  Compute the cost of a quick_group_min_max_query_block for a particular index.
-
-  SYNOPSIS
-    cost_group_min_max()
-    table                [in] The table being accessed
-    key                  [in] The index used to access the table
-    used_key_parts       [in] Number of key parts used to access the index
-    group_key_parts      [in] Number of index key parts in the group prefix
-    range_tree           [in] Tree of ranges for all indexes
-    quick_prefix_records [in] Number of records retrieved by the internally
-                              used quick range select if any
-    have_min             [in] True if there is a MIN function
-    have_max             [in] True if there is a MAX function
-    infix_factor         [in] The number of combinations of infix ranges that
-                              can be possible (increases the number of groups).
-    cost_est            [out] The cost to retrieve rows via this quick select
-    records             [out] The number of rows retrieved
-
-  DESCRIPTION
-    This method computes the access cost of a TRP_GROUP_MIN_MAX instance and
-    the number of rows returned.
-
-  NOTES
-    The cost computation distinguishes several cases:
-    1) No equality predicates over non-group attributes (thus no key_infix).
-       If groups are bigger than blocks on the average, then we assume that it
-       is very unlikely that block ends are aligned with group ends, thus even
-       if we look for both MIN and MAX keys, all pairs of neighbor MIN/MAX
-       keys, except for the first MIN and the last MAX keys, will be in the
-       same block.  If groups are smaller than blocks, then we are going to
-       read all blocks.
-    2) There are equality predicates over non-group attributes.
-       In this case the group prefix is extended by additional constants, and
-       as a result the min/max values are inside sub-groups of the original
-       groups. The number of blocks that will be read depends on whether the
-       ends of these sub-groups will be contained in the same or in different
-       blocks. We compute the probability for the two ends of a subgroup to be
-       in two different blocks as the ratio of:
-       - the number of positions of the left-end of a subgroup inside a group,
-         such that the right end of the subgroup is past the end of the buffer
-         containing the left-end, and
-       - the total number of possible positions for the left-end of the
-         subgroup, which is the number of keys in the containing group.
-       We assume it is very unlikely that two ends of subsequent subgroups are
-       in the same block.
-    3) The are range predicates over the group attributes.
-       Then some groups may be filtered by the range predicates. We use the
-       selectivity of the range predicates to decide how many groups will be
-       filtered.
-
-  TODO
-     - Take into account the optional range predicates over the MIN/MAX
-       argument.
-     - Check if we have a PK index and we use all cols - then each key is a
-       group, and it will be better to use an index scan.
-     - quick_prefix_records used in calculating group prefix selectivity
-       is not the correct estimate always. When group prefix has equality
-       predicates, range optimizer uses infix ranges (if present) to get
-       possible number of rows that would be read from storage engine
-       (quick_prefix_records). But we just need the number of rows that
-       would be read when only group prefix predicates are used.
-       This needs fixing.
-     - When both min and max are present, LIS will make two reads per group
-       instead of one. Similarly when min and max functions are not present,
-       rows retrived are different. Cost model should reflect what happens
-       in QUICK_GROUP_MIN_MAX::get_next()
-
-  RETURN
-    None
-*/
-
-static void cost_group_min_max(TABLE *table, uint key, uint used_key_parts,
-                               uint group_key_parts, SEL_TREE *range_tree,
-                               ha_rows quick_prefix_records, bool have_min,
-                               bool have_max, uint infix_factor,
-                               Cost_estimate *cost_est, ha_rows *records) {
-  ha_rows table_records;
-  uint num_groups;
-  uint num_blocks;
-  uint keys_per_block;
-  rec_per_key_t keys_per_group;
-  double p_overlap; /* Probability that a sub-group overlaps two blocks. */
-  double quick_prefix_selectivity;
-  double io_blocks;  // Number of blocks to read from table
-  DBUG_TRACE;
-  assert(cost_est->is_zero());
-
-  const KEY *const index_info = &table->key_info[key];
-  table_records = table->file->stats.records;
-  keys_per_block = (table->file->stats.block_size / 2 /
-                        (index_info->key_length + table->file->ref_length) +
-                    1);
-  num_blocks = (uint)(table_records / keys_per_block) + 1;
-
-  /* Compute the number of keys in a group. */
-  if (index_info->has_records_per_key(group_key_parts - 1))
-    // Use index statistics
-    keys_per_group = index_info->records_per_key(group_key_parts - 1);
-  else
-    /* If there is no statistics try to guess */
-    keys_per_group = guess_rec_per_key(table, index_info, group_key_parts);
-
-  num_groups = (uint)(table_records / keys_per_group) + 1;
-
-  /* Apply the selectivity of the quick select for group prefixes. */
-  if (range_tree && (quick_prefix_records != HA_POS_ERROR)) {
-    quick_prefix_selectivity =
-        (double)quick_prefix_records / (double)table_records;
-    num_groups = (uint)rint(num_groups * quick_prefix_selectivity);
-    num_groups = std::max(num_groups, 1U);
-  }
-
-  if (used_key_parts > group_key_parts) {
-    // Average number of keys in sub-groups formed by a key infixes
-    rec_per_key_t keys_in_subgroup;
-    if (index_info->has_records_per_key(used_key_parts - 1))
-      // Use index statistics
-      keys_in_subgroup = index_info->records_per_key(used_key_parts - 1);
-    else {
-      // If no index statistics then we use a guessed records per key value.
-      keys_in_subgroup = guess_rec_per_key(table, index_info, used_key_parts);
-      keys_in_subgroup = std::min(keys_in_subgroup, keys_per_group);
-    }
-
-    /*
-      Compute the probability that two ends of subgroups are inside
-      different blocks. Keys in subgroup need to be increases by the number
-      of infix ranges possible.
-    */
-    keys_in_subgroup = keys_in_subgroup * infix_factor;
-    if (keys_in_subgroup >= keys_per_block) /* If a subgroup is bigger than */
-      p_overlap = 1.0; /* a block, it will overlap at least two blocks. */
-    else {
-      double blocks_per_group = (double)num_blocks / (double)num_groups;
-      p_overlap = (blocks_per_group * (keys_in_subgroup - 1)) / keys_per_group;
-      p_overlap = min(p_overlap, 1.0);
-    }
-    io_blocks = min<double>(num_groups * (1 + p_overlap), num_blocks);
-  } else
-    io_blocks = (keys_per_group > keys_per_block)
-                    ? (have_min && have_max) ? (double)(num_groups + 1)
-                                             : (double)num_groups
-                    : (double)num_blocks;
-
-  /*
-    Estimate IO cost.
-  */
-  const Cost_model_table *const cost_model = table->cost_model();
-  cost_est->add_io(cost_model->page_read_cost_index(key, io_blocks));
-
-  /* Infix factor increases the number of groups (rows) examined. */
-  num_groups *= infix_factor;
-  /*
-    CPU cost must be comparable to that of an index scan as computed
-    in test_quick_select(). When the groups are small,
-    e.g. for a unique index, using index scan will be cheaper since it
-    reads the next record without having to re-position to it on every
-    group. To make the CPU cost reflect this, we estimate the CPU cost
-    as the sum of:
-    1. Cost for evaluating the condition (similarly as for index scan).
-    2. Cost for navigating the index structure (assuming a b-tree).
-       Note: We only add the cost for one comparision per block. For a
-             b-tree the number of comparisons will be larger.
-       TODO: This cost should be provided by the storage engine.
-  */
-  if (keys_per_block <= 1) {
-    // Only one key per block? A *very* high tree.
-    cost_est->add_cpu(std::numeric_limits<double>::max());
-  } else {
-    const double tree_height =
-        table_records == 0
-            ? 1.0
-            : ceil(log(double(table_records)) / log(double(keys_per_block)));
-    const double tree_traversal_cost =
-        cost_model->key_compare_cost(tree_height);
-    const double cpu_cost =
-        num_groups * (tree_traversal_cost + cost_model->row_evaluate_cost(1.0));
-    cost_est->add_cpu(cpu_cost);
-  }
-  *records = num_groups;
-
-  DBUG_PRINT("info", ("table rows: %lu  keys/block: %u  keys/group: %.1f  "
-                      "result rows: %lu  blocks: %u",
-                      (ulong)table_records, keys_per_block, keys_per_group,
-                      (ulong)*records, num_blocks));
-}
-
-/*
-  Construct a new quick select object for queries with group by with min/max.
-
-  SYNOPSIS
-    TRP_GROUP_MIN_MAX::make_quick()
-    param              Parameter from test_quick_select
-    parent_alloc       Memory pool to use, if any.
-
-  NOTES
-    Make_quick ignores the retrieve_full_rows parameter because
-    QUICK_GROUP_MIN_MAX_SELECT always performs 'index only' scans.
-    The other parameter are ignored as well because all necessary
-    data to create the QUICK object is computed at this TRP creation
-    time.
-
-  RETURN
-    New QUICK_GROUP_MIN_MAX_SELECT object if successfully created,
-    NULL otherwise.
-*/
-
-QUICK_SELECT_I *TRP_GROUP_MIN_MAX::make_quick(PARAM *param, bool,
-                                              MEM_ROOT *parent_alloc) {
-  QUICK_GROUP_MIN_MAX_SELECT *quick;
-  DBUG_TRACE;
-
-  quick = new QUICK_GROUP_MIN_MAX_SELECT(
-      param->table, param->query_block->join, have_min, have_max,
-      have_agg_distinct, min_max_arg_part, group_prefix_len, group_key_parts,
-      used_key_parts, index_info, index, &cost_est, records, key_infix_len,
-      parent_alloc, is_index_scan);
-  if (!quick) return nullptr;
-
-  if (quick->init()) {
-    delete quick;
-    return nullptr;
-  }
-
-  if (range_tree) {
-    assert(quick_prefix_records > 0);
-    if (quick_prefix_records == HA_POS_ERROR)
-      quick->quick_prefix_query_block =
-          nullptr; /* Can't construct a quick select. */
-    else {
-      /* Make a QUICK_RANGE_SELECT to be used for group prefix retrieval. */
-      quick->quick_prefix_query_block =
-          get_quick_select(param, param_idx, index_tree, HA_MRR_SORTED, 0,
-                           &quick->alloc, group_key_parts);
-      if (!quick->quick_prefix_query_block) {
-        delete quick;
-        return nullptr;
-      }
-    }
-
-    // Populate key_infix_ranges from index_tree
-    if (key_infix_len > 0) {
-      uint num_infix_keyparts = used_key_parts - group_key_parts;
-      KEY_PART_INFO *infix_keypart = index_info->key_part + group_key_parts;
-
-      // Find the start of key infix ranges in the range tree
-      SEL_ARG *infix_key = index_tree->root;
-      while (infix_key) {
-        if (infix_key->field->eq(infix_keypart->field)) break;
-        infix_key = infix_key->next_key_part->root;
-      }
-
-      // Get ranges on infix keyparts
-      for (uint i = 0; i < num_infix_keyparts; i++) {
-        /*
-          Infix ranges are always contiguous. Get the next set of
-          infix ranges from the first one. infix_key tracks
-          current keypart while cur_range tracks current range
-          within a keypart.
-        */
-        bool is_ascending = infix_key->is_ascending;
-        SEL_ARG *cur_range =
-            is_ascending ? infix_key->first() : infix_key->last();
-        assert(cur_range->field->eq(infix_keypart[i].field));
-        // "Add the range to the QUICK_RANGE_SELECT created above.
-        while (cur_range) {
-          if (quick->add_range(cur_range, i)) {
-            delete quick;
-            return nullptr;
-          }
-          cur_range = is_ascending ? cur_range->next : cur_range->prev;
-        }
-        // Get the next infix key part.
-        if (infix_key->next_key_part)
-          infix_key = infix_key->next_key_part->root;
-      }
-    }
-
-    /*
-      Extract the SEL_ARG subtree that contains only ranges for the MIN/MAX
-      attribute, and create an array of QUICK_RANGES to be used by the
-      new quick select.
-    */
-    if (min_max_arg_part) {
-      const SEL_ROOT *min_max_range_root = index_tree;
-      while (min_max_range_root) /* Find the tree for the MIN/MAX key part. */
-      {
-        if (min_max_range_root->root->field->eq(min_max_arg_part->field)) break;
-        min_max_range_root = min_max_range_root->root->next_key_part;
-      }
-      if (min_max_range_root) {
-        /* Create an array of QUICK_RANGEs for the MIN/MAX argument. */
-        for (SEL_ARG *min_max_range = min_max_range_root->root->first();
-             min_max_range; min_max_range = min_max_range->next) {
-          // While adding ranges for the MIN/MAX argument, we pass -1 to
-          // differentiate from adding ranges on infix keyparts. Check
-          // add_range() for more details.
-          if (quick->add_range(min_max_range, -1)) {
-            delete quick;
-            return nullptr;
-          }
-        }
-      }
-    }
-  } else
-    quick->quick_prefix_query_block = nullptr;
-
-  quick->update_key_stat();
-  quick->adjust_prefix_ranges();
-
-  return quick;
-}
-
-/*
-  Construct new quick select for group queries with min/max.
-
-  SYNOPSIS
-    QUICK_GROUP_MIN_MAX_SELECT::QUICK_GROUP_MIN_MAX_SELECT()
-    table             The table being accessed
-    join              Descriptor of the current query
-    have_min          true if the query selects a MIN function
-    have_max          true if the query selects a MAX function
-    min_max_arg_part  The only argument field of all MIN/MAX functions
-    group_prefix_len  Length of all key parts in the group prefix
-    prefix_key_parts  All key parts in the group prefix
-    index_info        The index chosen for data access
-    use_index         The id of index_info
-    read_cost         Cost of this access method
-    records           Number of records returned
-    key_infix_len     Length of the key infix appended to the group prefix
-    key_infix         Infix of constants from equality predicates
-    parent_alloc      Memory pool for this and quick_prefix_query_block data
-    is_index_scan     get the next different key not by jumping on it via
-                      index read, but by scanning until the end of the
-                      rows with equal key value.
-
-  RETURN
-    None
-*/
-
-QUICK_GROUP_MIN_MAX_SELECT::QUICK_GROUP_MIN_MAX_SELECT(
-    TABLE *table, JOIN *join_arg, bool have_min_arg, bool have_max_arg,
-    bool have_agg_distinct_arg, KEY_PART_INFO *min_max_arg_part_arg,
-    uint group_prefix_len_arg, uint group_key_parts_arg,
-    uint used_key_parts_arg, KEY *index_info_arg, uint use_index,
-    const Cost_estimate *read_cost_arg, ha_rows records_arg,
-    uint key_infix_len_arg, MEM_ROOT *parent_alloc, bool is_index_scan_arg)
-    : join(join_arg),
-      index_info(index_info_arg),
-      group_prefix_len(group_prefix_len_arg),
-      group_key_parts(group_key_parts_arg),
-      have_min(have_min_arg),
-      have_max(have_max_arg),
-      have_agg_distinct(have_agg_distinct_arg),
-      seen_first_key(false),
-      min_max_arg_part(min_max_arg_part_arg),
-      key_infix_len(key_infix_len_arg),
-      min_max_ranges(PSI_INSTRUMENT_ME),
-      key_infix_ranges(PSI_INSTRUMENT_ME),
-      min_functions_it(nullptr),
-      max_functions_it(nullptr),
-      is_index_scan(is_index_scan_arg) {
-  head = table;
-  index = use_index;
-  record = head->record[0];
-  tmp_record = head->record[1];
-  cost_est = *read_cost_arg;
-  records = records_arg;
-  used_key_parts = used_key_parts_arg;
-  real_key_parts = used_key_parts_arg;
-  key_infix_parts = used_key_parts_arg - group_key_parts_arg;
-  real_prefix_len = group_prefix_len + key_infix_len;
-  group_prefix = nullptr;
-  min_max_arg_len = min_max_arg_part ? min_max_arg_part->store_length : 0;
-  min_max_keypart_asc =
-      min_max_arg_part ? !(min_max_arg_part->key_part_flag & HA_REVERSE_SORT)
-                       : false;
-  memset(cur_infix_range_position, 0, sizeof(cur_infix_range_position));
-
-  /*
-    We can't have parent_alloc set as the init function can't handle this case
-    yet.
-  */
-  assert(!parent_alloc);
-  if (!parent_alloc) {
-    init_sql_alloc(key_memory_quick_group_min_max_select_root, &alloc,
-                   join->thd->variables.range_alloc_block_size, 0);
-    join->thd->mem_root = &alloc;
-  } else
-    ::new (&alloc) MEM_ROOT;  // ensure that it's not used
-}
-
-/*
-  Do post-constructor initialization.
-
-  SYNOPSIS
-    QUICK_GROUP_MIN_MAX_SELECT::init()
-
-  DESCRIPTION
-    The method performs initialization that cannot be done in the constructor
-    such as memory allocations that may fail. It allocates memory for the
-    group prefix and inifix buffers, and for the lists of MIN/MAX item to be
-    updated during execution.
-
-  RETURN
-    0      OK
-    other  Error code
-*/
-
-int QUICK_GROUP_MIN_MAX_SELECT::init() {
-  if (group_prefix) /* Already initialized. */
-    return 0;
-
-  if (!(last_prefix = (uchar *)alloc.Alloc(group_prefix_len))) return 1;
-  /*
-    We may use group_prefix to store keys with all select fields, so allocate
-    enough space for it.
-  */
-  if (!(group_prefix = (uchar *)alloc.Alloc(real_prefix_len + min_max_arg_len)))
-    return 1;
-
-  if (key_infix_len > 0) {
-    /*
-      The memory location pointed to by key_infix will be deleted soon, so
-      allocate a new buffer and copy the key_infix into it.
-    */
-    for (uint i = 0; i < key_infix_parts; i++) {
-      Quick_ranges *tmp = new (std::nothrow) Quick_ranges(PSI_INSTRUMENT_ME);
-      key_infix_ranges.push_back(tmp);
-    }
-  }
-
-  if (min_max_arg_part) {
-    if (have_min) {
-      if (!(min_functions = new (*THR_MALLOC) List<Item_sum>)) return 1;
-    } else
-      min_functions = nullptr;
-    if (have_max) {
-      if (!(max_functions = new (*THR_MALLOC) List<Item_sum>)) return 1;
-    } else
-      max_functions = nullptr;
-
-    Item_sum *min_max_item;
-    Item_sum **func_ptr = join->sum_funcs;
-    while ((min_max_item = *(func_ptr++))) {
-      if (have_min && (min_max_item->sum_func() == Item_sum::MIN_FUNC))
-        min_functions->push_back(min_max_item);
-      else if (have_max && (min_max_item->sum_func() == Item_sum::MAX_FUNC))
-        max_functions->push_back(min_max_item);
-    }
-
-    if (have_min) {
-      if (!(min_functions_it = new List_iterator<Item_sum>(*min_functions)))
-        return 1;
-    }
-
-    if (have_max) {
-      if (!(max_functions_it = new List_iterator<Item_sum>(*max_functions)))
-        return 1;
-    }
-  }
-
-  return 0;
-}
-
-QUICK_GROUP_MIN_MAX_SELECT::~QUICK_GROUP_MIN_MAX_SELECT() {
-  DBUG_TRACE;
-  if (head->file->inited)
-    /*
-      We may have used this object for index access during
-      create_sort_index() and then switched to rnd access for the rest
-      of execution. Since we don't do cleanup until now, we must call
-      ha_*_end() for whatever is the current access method.
-    */
-    head->file->ha_index_or_rnd_end();
-
-  for (uint i = 0; i < key_infix_parts; i++) delete key_infix_ranges[i];
-  free_root(&alloc, MYF(0));
-  delete min_functions_it;
-  delete max_functions_it;
-  delete quick_prefix_query_block;
-}
-
-/*
-   Construct a new QUICK_RANGE object from a SEL_ARG object, and
-   add it to the either min_max_ranges or key_infix_ranges array.
-
-  SYNOPSIS
-    QUICK_GROUP_MIN_MAX_SELECT::add_range()
-    sel_range  Range object from which QUICK_RANGE object is created
-    idx        Index of the keypart for which ranges are being added.
-               It is negative for ranges on min/max keypart.
-
-  NOTES
-    If sel_arg is an infinite range, e.g. (x < 5 or x > 4),
-    then skip it and do not construct a quick range.
-
-  RETURN
-    false on success
-    true  otherwise
-*/
-
-bool QUICK_GROUP_MIN_MAX_SELECT::add_range(SEL_ARG *sel_range, int idx) {
-  QUICK_RANGE *range;
-  uint range_flag = sel_range->min_flag | sel_range->max_flag;
-
-  /* Skip (-inf,+inf) ranges, e.g. (x < 5 or x > 4). */
-  if ((range_flag & NO_MIN_RANGE) && (range_flag & NO_MAX_RANGE)) return false;
-
-  // -1 in the second argument to this function indicates that the incoming
-  // range should be added min_max_ranges. Else use the index passed to add the
-  // range to correct infix keypart ranges array.
-  Quick_ranges *range_array = nullptr;
-  uint key_length = 0;
-  if (idx < 0) {
-    range_array = &min_max_ranges;
-    key_length = min_max_arg_len;
-  } else {
-    assert((uint)idx < MAX_REF_PARTS);
-    KEY_PART_INFO *key_infix_part =
-        index_info->key_part + group_key_parts + idx;
-    range_array = key_infix_ranges[idx];
-    key_length = key_infix_part->store_length;
-  }
-
-  if (!(sel_range->min_flag & NO_MIN_RANGE) &&
-      !(sel_range->max_flag & NO_MAX_RANGE)) {
-    if (sel_range->maybe_null() && sel_range->min_value[0] &&
-        sel_range->max_value[0])
-      range_flag |= NULL_RANGE; /* IS NULL condition */
-    /*
-      Do not perform comparison if one of the argiment is NULL value.
-    */
-    else if (!sel_range->min_value[0] && !sel_range->max_value[0] &&
-             memcmp(sel_range->min_value, sel_range->max_value, key_length) ==
-                 0)
-      range_flag |= EQ_RANGE; /* equality condition */
-  }
-  range = new (*THR_MALLOC) QUICK_RANGE(
-      sel_range->min_value, key_length, make_keypart_map(sel_range->part),
-      sel_range->max_value, key_length, make_keypart_map(sel_range->part),
-      range_flag, HA_READ_INVALID);
-  if (!range) return true;
-  if (range_array->push_back(range)) return true;
-  return false;
-}
-
-/*
-  Opens the ranges if there are more conditions in quick_prefix_query_block than
-  the ones used for jumping through the prefixes.
-
-  SYNOPSIS
-    QUICK_GROUP_MIN_MAX_SELECT::adjust_prefix_ranges()
-
-  NOTES
-    quick_prefix_query_block is made over the conditions on the whole key.
-    It defines a number of ranges of length x.
-    However when jumping through the prefixes we use only the the first
-    few most significant keyparts in the range key. However if there
-    are more keyparts to follow the ones we are using we must make the
-    condition on the key inclusive (because x < "ab" means
-    x[0] < 'a' OR (x[0] == 'a' AND x[1] < 'b').
-    To achive the above we must turn off the NEAR_MIN/NEAR_MAX
-*/
-void QUICK_GROUP_MIN_MAX_SELECT::adjust_prefix_ranges() {
-  if (quick_prefix_query_block &&
-      group_prefix_len < quick_prefix_query_block->max_used_key_length) {
-    for (size_t ix = 0; ix < quick_prefix_query_block->ranges.size(); ++ix) {
-      QUICK_RANGE *range = quick_prefix_query_block->ranges[ix];
-      range->flag &= ~(NEAR_MIN | NEAR_MAX);
-    }
-  }
-}
-
-/*
-  Determine the total number and length of the keys that will be used for
-  index lookup.
-
-  SYNOPSIS
-    QUICK_GROUP_MIN_MAX_SELECT::update_key_stat()
-
-  DESCRIPTION
-    The total length of the keys used for index lookup depends on whether
-    there are any predicates referencing the min/max argument, and/or if
-    the min/max argument field can be NULL.
-    This function does an optimistic analysis whether the search key might
-    be extended by a constant for the min/max keypart. It is 'optimistic'
-    because during actual execution it may happen that a particular range
-    is skipped, and then a shorter key will be used. However this is data
-    dependent and can't be easily estimated here.
-
-  RETURN
-    None
-*/
-
-void QUICK_GROUP_MIN_MAX_SELECT::update_key_stat() {
-  max_used_key_length = real_prefix_len;
-  if (min_max_ranges.size() > 0) {
-    if (have_min) { /* Check if the right-most range has a lower boundary. */
-      QUICK_RANGE *rightmost_range = min_max_ranges[min_max_ranges.size() - 1];
-      if (!(rightmost_range->flag & NO_MIN_RANGE)) {
-        max_used_key_length += min_max_arg_len;
-        used_key_parts++;
-        return;
-      }
-    }
-    if (have_max) { /* Check if the left-most range has an upper boundary. */
-      QUICK_RANGE *leftmost_range = min_max_ranges[0];
-      if (!(leftmost_range->flag & NO_MAX_RANGE)) {
-        max_used_key_length += min_max_arg_len;
-        used_key_parts++;
-        return;
-      }
-    }
-  } else if (have_min && min_max_arg_part &&
-             min_max_arg_part->field->is_nullable()) {
-    /*
-      If a MIN argument value is NULL, we can quickly determine
-      that we're in the beginning of the next group, because NULLs
-      are always < any other value. This allows us to quickly
-      determine the end of the current group and jump to the next
-      group (see next_min()) and thus effectively increases the
-      usable key length(see next_min()).
-    */
-    max_used_key_length += min_max_arg_len;
-    used_key_parts++;
-  }
-}
-
-/*
-  Initialize a quick group min/max select for key retrieval.
-
-  SYNOPSIS
-    QUICK_GROUP_MIN_MAX_SELECT::reset()
-
-  DESCRIPTION
-    Initialize the index chosen for access and find and store the prefix
-    of the last group. The method is expensive since it performs disk access.
-
-  RETURN
-    0      OK
-    other  Error code
-*/
-
-int QUICK_GROUP_MIN_MAX_SELECT::reset(void) {
-  int result;
-  DBUG_TRACE;
-
-  seen_first_key = false;
-  head->set_keyread(true); /* We need only the key attributes */
-  /*
-    Request ordered index access as usage of ::index_last(),
-    ::index_first() within QUICK_GROUP_MIN_MAX_SELECT depends on it.
-  */
-  if (head->file->inited) head->file->ha_index_or_rnd_end();
-  if ((result = head->file->ha_index_init(index, true))) {
-    head->file->print_error(result, MYF(0));
-    return result;
-  }
-  if (quick_prefix_query_block && quick_prefix_query_block->reset()) return 1;
-
-  result = head->file->ha_index_last(record);
-  if (result != 0) {
-    if (result == HA_ERR_END_OF_FILE)
-      return 0;
-    else
-      return result;
-  }
-
-  /* Save the prefix of the last group. */
-  key_copy(last_prefix, record, index_info, group_prefix_len);
-
-  return 0;
-}
-
-/*
-  Get the next key containing the MIN and/or MAX key for the next group.
-
-  SYNOPSIS
-    QUICK_GROUP_MIN_MAX_SELECT::get_next()
-
-  DESCRIPTION
-    The method finds the next subsequent group of records that satisfies the
-    query conditions and finds the keys that contain the MIN/MAX values for
-    the key part referenced by the MIN/MAX function(s). Once a group and its
-    MIN/MAX values are found, store these values in the Item_sum objects for
-    the MIN/MAX functions. The rest of the values in the result row are stored
-    in the Item_field::result_field of each select field. If the query does
-    not contain MIN and/or MAX functions, then the function only finds the
-    group prefix, which is a query answer itself.
-
-  NOTES
-    If both MIN and MAX are computed, then we use the fact that if there is
-    no MIN key, there can't be a MAX key as well, so we can skip looking
-    for a MAX key in this case.
-
-  RETURN
-    0                  on success
-    HA_ERR_END_OF_FILE if returned all keys
-    other              if some error occurred
-*/
-
-int QUICK_GROUP_MIN_MAX_SELECT::get_next() {
-  int result;
-  int is_last_prefix = 0;
-
-  DBUG_TRACE;
-
-  /*
-    Loop until a group is found that satisfies all query conditions or the last
-    group is reached.
-  */
-  do {
-    result = next_prefix();
-    /*
-      Check if this is the last group prefix. Notice that at this point
-      this->record contains the current prefix in record format.
-    */
-    if (!result) {
-      is_last_prefix =
-          key_cmp(index_info->key_part, last_prefix, group_prefix_len);
-      assert(is_last_prefix <= 0);
-    } else {
-      if (result == HA_ERR_KEY_NOT_FOUND) continue;
-      break;
-    }
-
-    // Reset current infix range and min/max function as a new group is
-    // starting.
-    reset_group();
-    // TRUE if at least one group satisfied the prefix and infix condition is
-    // found.
-    bool found_result = false;
-    // Reset MIN/MAX value only for the first infix range.
-    bool reset_min_value = true;
-    bool reset_max_value = true;
-    while (!append_next_infix()) {
-      assert(!result || !is_index_access_error(result));
-      if (have_min || have_max) {
-        if (min_max_keypart_asc) {
-          if (have_min) {
-            if (!(result = next_min()))
-              update_min_result(&reset_min_value);
-            else {
-              DBUG_EXECUTE_IF("bug30769515_QUERY_INTERRUPTED",
-                              result = HA_ERR_QUERY_INTERRUPTED;);
-              if (is_index_access_error(result)) return result;
-              continue;  // Record is not found, no reason to call next_max()
-            }
-          }
-          if (have_max) {
-            if (!(result = next_max()))
-              update_max_result(&reset_max_value);
-            else if (is_index_access_error(result))
-              return result;
-          }
-        } else {
-          // Call next_max() first and then next_min() if
-          // MIN/MAX key part is descending.
-          if (have_max) {
-            if (!(result = next_max()))
-              update_max_result(&reset_max_value);
-            else {
-              DBUG_EXECUTE_IF("bug30769515_QUERY_INTERRUPTED",
-                              result = HA_ERR_QUERY_INTERRUPTED;);
-              if (is_index_access_error(result)) return result;
-              continue;  // Record is not found, no reason to call next_min()
-            }
-          }
-          if (have_min) {
-            if (!(result = next_min()))
-              update_min_result(&reset_min_value);
-            else if (is_index_access_error(result))
-              return result;
-          }
-        }
-        if (!result) found_result = true;
-      } else if (key_infix_len > 0) {
-        /*
-          If this is just a GROUP BY or DISTINCT without MIN or MAX and there
-          are equality predicates for the key parts after the group, find the
-          first sub-group with the extended prefix. There is no need to iterate
-          through the whole group to accumulate the MIN/MAX and returning just
-          the one distinct record is enough.
-        */
-        if (!(result = head->file->ha_index_read_map(
-                  record, group_prefix, make_prev_keypart_map(real_key_parts),
-                  HA_READ_KEY_EXACT)) ||
-            is_index_access_error(result))
-          return result;
-      }
-    }
-    if (seen_all_infix_ranges && found_result) return 0;
-  } while (!is_index_access_error(result) && is_last_prefix != 0);
-
-  if (result == HA_ERR_KEY_NOT_FOUND) result = HA_ERR_END_OF_FILE;
-
-  return result;
-}
-
-/*
-  Retrieve the minimal key in the next group.
-
-  SYNOPSIS
-    QUICK_GROUP_MIN_MAX_SELECT::next_min()
-
-  DESCRIPTION
-    Find the minimal key within this group such that the key satisfies the query
-    conditions and NULL semantics. The found key is loaded into this->record.
-
-  IMPLEMENTATION
-    Depending on the values of min_max_ranges.elements, key_infix_len, and
-    whether there is a  NULL in the MIN field, this function may directly
-    return without any data access. In this case we use the key loaded into
-    this->record by the call to this->next_prefix() just before this call.
-
-  RETURN
-    0                    on success
-    HA_ERR_KEY_NOT_FOUND if no MIN key was found that fulfills all conditions.
-    HA_ERR_END_OF_FILE   - "" -
-    other                if some error occurred
-*/
-
-int QUICK_GROUP_MIN_MAX_SELECT::next_min() {
-  int result = 0;
-  DBUG_TRACE;
-
-  /* Find the MIN key using the eventually extended group prefix. */
-  if (min_max_ranges.size() > 0) {
-    uchar key_buf[MAX_KEY_LENGTH];
-    key_copy(key_buf, record, index_info, max_used_key_length);
-    result = next_min_in_range();
-    if (result) key_restore(record, key_buf, index_info, max_used_key_length);
-  } else {
-    /*
-      Apply the constant equality conditions to the non-group select fields.
-      There is no reason to call handler method if MIN/MAX key part is
-      ascending since  MIN/MAX field points to min value after
-      next_prefix() call.
-    */
-    if (key_infix_len > 0 || !min_max_keypart_asc) {
-      if ((result = head->file->ha_index_read_map(
-               record, group_prefix, make_prev_keypart_map(real_key_parts),
-               min_max_keypart_asc ? HA_READ_KEY_EXACT : HA_READ_PREFIX_LAST)))
-        return result;
-    }
-
-    /*
-      If the min/max argument field is NULL, skip subsequent rows in the same
-      group with NULL in it. Notice that:
-      - if the first row in a group doesn't have a NULL in the field, no row
-      in the same group has (because NULL < any other value),
-      - min_max_arg_part->field->ptr points to some place in 'record'.
-    */
-    if (min_max_arg_part && min_max_arg_part->field->is_null()) {
-      uchar key_buf[MAX_KEY_LENGTH];
-
-      /* Find the first subsequent record without NULL in the MIN/MAX field. */
-      key_copy(key_buf, record, index_info, max_used_key_length);
-      result = head->file->ha_index_read_map(
-          record, key_buf, make_keypart_map(real_key_parts),
-          min_max_keypart_asc ? HA_READ_AFTER_KEY : HA_READ_BEFORE_KEY);
-      /*
-        Check if the new record belongs to the current group by comparing its
-        prefix with the group's prefix. If it is from the next group, then the
-        whole group has NULLs in the MIN/MAX field, so use the first record in
-        the group as a result.
-        TODO:
-        It is possible to reuse this new record as the result candidate for
-        the next call to next_min(), and to save one lookup in the next call.
-        For this add a new member 'this->next_group_prefix'.
-      */
-      if (!result) {
-        if (key_cmp(index_info->key_part, group_prefix, real_prefix_len))
-          key_restore(record, key_buf, index_info, 0);
-      } else if (result == HA_ERR_KEY_NOT_FOUND || result == HA_ERR_END_OF_FILE)
-        result = 0; /* There is a result in any case. */
-    }
-  }
-
-  /*
-    If the MIN attribute is non-nullable, this->record already contains the
-    MIN key in the group, so just return.
-  */
-  return result;
-}
-
-/*
-  Retrieve the maximal key in the next group.
-
-  SYNOPSIS
-    QUICK_GROUP_MIN_MAX_SELECT::next_max()
-
-  DESCRIPTION
-    Lookup the maximal key of the group, and store it into this->record.
-
-  RETURN
-    0                    on success
-    HA_ERR_KEY_NOT_FOUND if no MAX key was found that fulfills all conditions.
-    HA_ERR_END_OF_FILE	 - "" -
-    other                if some error occurred
-*/
-
-int QUICK_GROUP_MIN_MAX_SELECT::next_max() {
-  int result = 0;
-
-  DBUG_TRACE;
-
-  /* Get the last key in the (possibly extended) group. */
-  if (min_max_ranges.size() > 0) {
-    uchar key_buf[MAX_KEY_LENGTH];
-    key_copy(key_buf, record, index_info, max_used_key_length);
-    result = next_max_in_range();
-    if (result) key_restore(record, key_buf, index_info, max_used_key_length);
-  } else {
-    /*
-      There is no reason to call handler method if MIN/MAX key part is
-      descending since  MIN/MAX field points to max value after
-      next_prefix() call.
-    */
-    if (key_infix_len > 0 || min_max_keypart_asc)
-      result = head->file->ha_index_read_map(
-          record, group_prefix, make_prev_keypart_map(real_key_parts),
-          min_max_keypart_asc ? HA_READ_PREFIX_LAST : HA_READ_KEY_EXACT);
-  }
-  return result;
-}
-
-/**
-  Find the next different key value by skiping all the rows with the same key
-  value.
-
-  Implements a specialized loose index access method for queries
-  containing aggregate functions with distinct of the form:
-    SELECT [SUM|COUNT|AVG](DISTINCT a,...) FROM t
-  This method comes to replace the index scan + Unique class
-  (distinct selection) for loose index scan that visits all the rows of a
-  covering index instead of jumping in the begining of each group.
-  TODO: Placeholder function. To be replaced by a handler API call
-
-  @param is_index_scan     hint to use index scan instead of random index read
-                           to find the next different value.
-  @param file              table handler
-  @param key_part          group key to compare
-  @param record            row data
-  @param group_prefix      current key prefix data
-  @param group_prefix_len  length of the current key prefix data
-  @param group_key_parts   number of the current key prefix columns
-  @return status
-    @retval  0  success
-    @retval !0  failure
-*/
-
-static int index_next_different(bool is_index_scan, handler *file,
-                                KEY_PART_INFO *key_part, uchar *record,
-                                const uchar *group_prefix,
-                                uint group_prefix_len, uint group_key_parts) {
-  if (is_index_scan) {
-    int result = 0;
-
-    while (!key_cmp(key_part, group_prefix, group_prefix_len)) {
-      result = file->ha_index_next(record);
-      if (result) return (result);
-    }
-    return result;
-  } else
-    return file->ha_index_read_map(record, group_prefix,
-                                   make_prev_keypart_map(group_key_parts),
-                                   HA_READ_AFTER_KEY);
-}
-
-/*
-  Determine the prefix of the next group.
-
-  SYNOPSIS
-    QUICK_GROUP_MIN_MAX_SELECT::next_prefix()
-
-  DESCRIPTION
-    Determine the prefix of the next group that satisfies the query conditions.
-    If there is a range condition referencing the group attributes, use a
-    QUICK_RANGE_SELECT object to retrieve the *first* key that satisfies the
-    condition. The prefix is stored in this->group_prefix. The first key of
-    the found group is stored in this->record, on which relies this->next_min().
-
-  RETURN
-    0                    on success
-    HA_ERR_KEY_NOT_FOUND if there is no key with the formed prefix
-    HA_ERR_END_OF_FILE   if there are no more keys
-    other                if some error occurred
-*/
-int QUICK_GROUP_MIN_MAX_SELECT::next_prefix() {
-  int result;
-  DBUG_TRACE;
-
-  if (quick_prefix_query_block) {
-    uchar *cur_prefix = seen_first_key ? group_prefix : nullptr;
-    if ((result = quick_prefix_query_block->get_next_prefix(
-             group_prefix_len, group_key_parts, cur_prefix)))
-      return result;
-    seen_first_key = true;
-  } else {
-    if (!seen_first_key) {
-      result = head->file->ha_index_first(record);
-      if (result) return result;
-      seen_first_key = true;
-    } else {
-      /* Load the first key in this group into record. */
-      result = index_next_different(is_index_scan, head->file,
-                                    index_info->key_part, record, group_prefix,
-                                    group_prefix_len, group_key_parts);
-      if (result) return result;
-    }
-  }
-
-  /* Save the prefix of this group for subsequent calls. */
-  key_copy(group_prefix, record, index_info, group_prefix_len);
-  return 0;
-}
-
-/*
-  Determine and append the next infix.
-
-  SYNOPSIS
-    QUICK_GROUP_MIN_MAX_SELECT::append_next_infix()
-
-  DESCRIPTION
-    Appends the next infix onto this->group_prefix based on the current
-    position stored in cur_infix_range_position
-
-  RETURN
-    true                 No next infix exists
-    false                on success
-*/
-
-bool QUICK_GROUP_MIN_MAX_SELECT::append_next_infix() {
-  if (seen_all_infix_ranges) return true;
-
-  if (key_infix_len > 0) {
-    uchar *key_ptr = group_prefix + group_prefix_len;
-    // For each infix keypart, get the participating range for
-    // the next row retrieval. cur_key_infix_position determines
-    // which range needs to be used.
-    for (uint i = 0; i < key_infix_parts; i++) {
-      QUICK_RANGE *cur_range = nullptr;
-      assert(key_infix_ranges[i]->size() > 0);
-
-      Quick_ranges *infix_range_array = key_infix_ranges[i];
-      cur_range = infix_range_array->at(cur_infix_range_position[i]);
-      memcpy(key_ptr, cur_range->min_key, cur_range->min_length);
-      key_ptr += cur_range->min_length;
-    }
-
-    // cur_infix_range_position is updated with the next infix range
-    // position.
-    for (int i = key_infix_parts - 1; i >= 0; i--) {
-      cur_infix_range_position[i]++;
-      if (cur_infix_range_position[i] == key_infix_ranges[i]->size()) {
-        // All the ranges for infix keypart "i" is done
-        cur_infix_range_position[i] = 0;
-        if (i == 0) seen_all_infix_ranges = true;
-      } else
-        break;
-    }
-  } else
-    seen_all_infix_ranges = true;
-
-  return false;
-}
-
-/*
-  Reset all the variables that need to be updated for the new group.
-
-  SYNOPSIS
-    QUICK_GROUP_MIN_MAX_SELECT::reset_group()
-
-  DESCRIPTION
-    It is called before a new group is processed.
-
-  RETURN
-    None
-*/
-
-void QUICK_GROUP_MIN_MAX_SELECT::reset_group() {
-  // Reset the current infix range before a new group is processed.
-  seen_all_infix_ranges = false;
-  memset(cur_infix_range_position, 0, sizeof(cur_infix_range_position));
-
-  // Reset min/max aggregators
-  Item_sum *min_func, *max_func;
-
-  if (have_min) {
-    min_functions_it->rewind();
-    while ((min_func = (*min_functions_it)++)) {
-      min_func->aggregator_clear();
-    }
-  }
-
-  if (have_max) {
-    max_functions_it->rewind();
-    while ((max_func = (*max_functions_it)++)) {
-      max_func->aggregator_clear();
-    }
-  }
-}
-
-/**
-  Function returns search mode that needs to be used to read
-  the next record. It takes the type of the range, the
-  key part's order (ascending or descending) and if the
-  range is on MIN function or a MAX function to get the
-  right search mode.
-  For "MIN" functon:
-   - ASC keypart
-   We need to
-    1. Read the first key that matches the range
-       a) if a minimum value is not specified in the condition
-       b) if it is a equality or is NULL condition
-    2. Read the first key after a range value if range is like "a > 10"
-    3. Read the key that matches the condition or any key after
-       the range value for any other condition
-   - DESC keypart
-   We need to
-    4. Read the last value for the key prefix if there is no minimum
-       range specified.
-    5. Read the first key that matches the range if it is a equality
-       condition.
-    6. Read the first key before a range value if range is like "a > 10"
-    7. Read the key that matches the prefix or any key before for any
-       other condition
-  For MAX function:
-   - ASC keypart
-   We need to
-    8. Read the last value for the key prefix if there is no maximum
-       range specified
-    9. Read the first key that matches the range if it is a equality
-       condition
-   10. Read the first key before a range value if range is like "a < 10"
-   11. Read the key that matches the condition or any key before
-       the range value for any other condition
-   - DESC keypart
-   We need to
-   12. Read the first key that matches the range
-       a) if a minimum value is not specified in the condition
-       b) if it is a equality
-   13. Read the first key after a range value if range is like "a < 10"
-   14. Read the key that matches the prefix or any key after for
-       any other condition
-
-
-  @param cur_range         pointer to QUICK_RANGE.
-  @param is_asc            TRUE if key part is ascending,
-                           FALSE otherwise.
-  @param is_min            TRUE if the range is on MIN function.
-                           FALSE for MAX function.
-  @return search mode
-*/
-
-static ha_rkey_function get_search_mode(QUICK_RANGE *cur_range, bool is_asc,
-                                        bool is_min) {
-  // If MIN function
-  if (is_min) {
-    if (is_asc) {                          // key part is ascending
-      if (cur_range->flag & NO_MIN_RANGE)  // 1a
-        return HA_READ_KEY_EXACT;
-      else
-        return (cur_range->flag & (EQ_RANGE | NULL_RANGE))  // 1b
-                   ? HA_READ_KEY_EXACT
-                   : (cur_range->flag & NEAR_MIN) ? HA_READ_AFTER_KEY     // 2
-                                                  : HA_READ_KEY_OR_NEXT;  // 3
-    } else {  // key parts is descending
-      if (cur_range->flag & NO_MIN_RANGE)
-        return HA_READ_PREFIX_LAST;  // 4
-      else
-        return (cur_range->flag & EQ_RANGE)
-                   ? HA_READ_KEY_EXACT  // 5
-                   : (cur_range->flag & NEAR_MIN)
-                         ? HA_READ_BEFORE_KEY            // 6
-                         : HA_READ_PREFIX_LAST_OR_PREV;  // 7
-    }
-  }
-
-  // If max function
-  if (is_asc) {  // key parts is ascending
-    if (cur_range->flag & NO_MAX_RANGE)
-      return HA_READ_PREFIX_LAST;  // 8
-    else
-      return (cur_range->flag & EQ_RANGE)
-                 ? HA_READ_KEY_EXACT  // 9
-                 : (cur_range->flag & NEAR_MAX)
-                       ? HA_READ_BEFORE_KEY            // 10
-                       : HA_READ_PREFIX_LAST_OR_PREV;  // 11
-  } else {  // key parts is descending
-    if (cur_range->flag & NO_MAX_RANGE)
-      return HA_READ_KEY_EXACT;  // 12a
-    else
-      return (cur_range->flag & EQ_RANGE)
-                 ? HA_READ_KEY_EXACT                                    // 12b
-                 : (cur_range->flag & NEAR_MAX) ? HA_READ_AFTER_KEY     // 13
-                                                : HA_READ_KEY_OR_NEXT;  // 14
-  }
-}
-
-/*
-  Find the minimal key in a group that satisfies some range conditions for the
-  min/max argument field.
-
-  SYNOPSIS
-    QUICK_GROUP_MIN_MAX_SELECT::next_min_in_range()
-
-  DESCRIPTION
-    Given the sequence of ranges min_max_ranges, find the minimal key that is
-    in the left-most possible range. If there is no such key, then the current
-    group does not have a MIN key that satisfies the WHERE clause. If a key is
-    found, its value is stored in this->record.
-
-  RETURN
-    0                    on success
-    HA_ERR_KEY_NOT_FOUND if there is no key with the given prefix in any of
-                         the ranges
-    HA_ERR_END_OF_FILE   - "" -
-    other                if some error
-*/
-
-int QUICK_GROUP_MIN_MAX_SELECT::next_min_in_range() {
-  ha_rkey_function search_mode;
-  key_part_map keypart_map;
-  bool found_null = false;
-  int result = HA_ERR_KEY_NOT_FOUND;
-
-  assert(min_max_ranges.size() > 0);
-
-  /* Search from the left-most range to the right. */
-  for (Quick_ranges::const_iterator it = min_max_ranges.begin();
-       it != min_max_ranges.end(); ++it) {
-    QUICK_RANGE *cur_range = *it;
-    /*
-      If the current value for the min/max argument is bigger than the right
-      boundary of cur_range, there is no need to check this range.
-    */
-    if (it != min_max_ranges.begin() && !(cur_range->flag & NO_MAX_RANGE) &&
-        (key_cmp(min_max_arg_part, (const uchar *)cur_range->max_key,
-                 min_max_arg_len) == (min_max_keypart_asc ? 1 : -1)) &&
-        !result)
-      continue;
-
-    if (cur_range->flag & NO_MIN_RANGE) {
-      keypart_map = make_prev_keypart_map(real_key_parts);
-      search_mode = get_search_mode(cur_range, min_max_keypart_asc, true);
-    } else {
-      /* Extend the search key with the lower boundary for this range. */
-      memcpy(group_prefix + real_prefix_len, cur_range->min_key,
-             cur_range->min_length);
-      keypart_map = make_keypart_map(real_key_parts);
-      search_mode = get_search_mode(cur_range, min_max_keypart_asc, true);
-    }
-
-    result = head->file->ha_index_read_map(record, group_prefix, keypart_map,
-                                           search_mode);
-    if (result) {
-      if ((result == HA_ERR_KEY_NOT_FOUND || result == HA_ERR_END_OF_FILE) &&
-          (cur_range->flag & (EQ_RANGE | NULL_RANGE)))
-        continue; /* Check the next range. */
-
-      /*
-        In all other cases (HA_ERR_*, HA_READ_KEY_EXACT with NO_MIN_RANGE,
-        HA_READ_AFTER_KEY, HA_READ_KEY_OR_NEXT) if the lookup failed for this
-        range, it can't succeed for any other subsequent range.
-      */
-      break;
-    }
-
-    /* A key was found. */
-    if (cur_range->flag & EQ_RANGE)
-      break; /* No need to perform the checks below for equal keys. */
-
-    if (min_max_keypart_asc && cur_range->flag & NULL_RANGE) {
-      /*
-        Remember this key, and continue looking for a non-NULL key that
-        satisfies some other condition.
-      */
-      memcpy(tmp_record, record, head->s->rec_buff_length);
-      found_null = true;
-      continue;
-    }
-
-    /* Check if record belongs to the current group. */
-    if (key_cmp(index_info->key_part, group_prefix, real_prefix_len)) {
-      result = HA_ERR_KEY_NOT_FOUND;
-      continue;
-    }
-
-    /* If there is an upper limit, check if the found key is in the range. */
-    if (!(cur_range->flag & NO_MAX_RANGE)) {
-      /* Compose the MAX key for the range. */
-      uchar *max_key = (uchar *)my_alloca(real_prefix_len + min_max_arg_len);
-      memcpy(max_key, group_prefix, real_prefix_len);
-      memcpy(max_key + real_prefix_len, cur_range->max_key,
-             cur_range->max_length);
-      /* Compare the found key with max_key. */
-      int cmp_res = key_cmp(index_info->key_part, max_key,
-                            real_prefix_len + min_max_arg_len);
-      /*
-        The key is outside of the range if:
-        the interval is open and the key is equal to the maximum boundry
-        or
-        the key is greater than the maximum
-      */
-      if (((cur_range->flag & NEAR_MAX) && cmp_res == 0) ||
-          (min_max_keypart_asc ? (cmp_res > 0) : (cmp_res < 0))) {
-        result = HA_ERR_KEY_NOT_FOUND;
-        continue;
-      }
-    }
-    /* If we got to this point, the current key qualifies as MIN. */
-    assert(result == 0);
-    break;
-  }
-  /*
-    If there was a key with NULL in the MIN/MAX field, and there was no other
-    key without NULL from the same group that satisfies some other condition,
-    then use the key with the NULL.
-  */
-  if (found_null && result) {
-    memcpy(record, tmp_record, head->s->rec_buff_length);
-    result = 0;
-  }
-  return result;
-}
-
-/*
-  Find the maximal key in a group that satisfies some range conditions for the
-  min/max argument field.
-
-  SYNOPSIS
-    QUICK_GROUP_MIN_MAX_SELECT::next_max_in_range()
-
-  DESCRIPTION
-    Given the sequence of ranges min_max_ranges, find the maximal key that is
-    in the right-most possible range. If there is no such key, then the current
-    group does not have a MAX key that satisfies the WHERE clause. If a key is
-    found, its value is stored in this->record.
-
-  RETURN
-    0                    on success
-    HA_ERR_KEY_NOT_FOUND if there is no key with the given prefix in any of
-                         the ranges
-    HA_ERR_END_OF_FILE   - "" -
-    other                if some error
-*/
-
-int QUICK_GROUP_MIN_MAX_SELECT::next_max_in_range() {
-  ha_rkey_function search_mode;
-  key_part_map keypart_map;
-  int result = HA_ERR_KEY_NOT_FOUND;
-
-  assert(min_max_ranges.size() > 0);
-
-  /* Search from the right-most range to the left. */
-  for (Quick_ranges::const_iterator it = min_max_ranges.end();
-       it != min_max_ranges.begin(); --it) {
-    QUICK_RANGE *cur_range = *(it - 1);
-    /*
-      If the current value for the min/max argument is smaller than the left
-      boundary of cur_range, there is no need to check this range.
-    */
-    if (it != min_max_ranges.end() && !(cur_range->flag & NO_MIN_RANGE) &&
-        (key_cmp(min_max_arg_part, (const uchar *)cur_range->min_key,
-                 min_max_arg_len) == (min_max_keypart_asc ? -1 : 1)) &&
-        !result)
-      continue;
-
-    if (cur_range->flag & NO_MAX_RANGE) {
-      keypart_map = make_prev_keypart_map(real_key_parts);
-      search_mode = get_search_mode(cur_range, min_max_keypart_asc, false);
-    } else {
-      /* Extend the search key with the upper boundary for this range. */
-      memcpy(group_prefix + real_prefix_len, cur_range->max_key,
-             cur_range->max_length);
-      keypart_map = make_keypart_map(real_key_parts);
-      search_mode = get_search_mode(cur_range, min_max_keypart_asc, false);
-    }
-
-    result = head->file->ha_index_read_map(record, group_prefix, keypart_map,
-                                           search_mode);
-
-    if (result) {
-      if ((result == HA_ERR_KEY_NOT_FOUND || result == HA_ERR_END_OF_FILE) &&
-          (cur_range->flag & EQ_RANGE))
-        continue; /* Check the next range. */
-
-      /*
-        In no key was found with this upper bound, there certainly are no keys
-        in the ranges to the left.
-      */
-      return result;
-    }
-    /* A key was found. */
-    if (cur_range->flag & EQ_RANGE)
-      return 0; /* No need to perform the checks below for equal keys. */
-
-    /* Check if record belongs to the current group. */
-    if (key_cmp(index_info->key_part, group_prefix, real_prefix_len)) {
-      result = HA_ERR_KEY_NOT_FOUND;
-      continue;  // Row not found
-    }
-
-    /* If there is a lower limit, check if the found key is in the range. */
-    if (!(cur_range->flag & NO_MIN_RANGE)) {
-      /* Compose the MIN key for the range. */
-      uchar *min_key = (uchar *)my_alloca(real_prefix_len + min_max_arg_len);
-      memcpy(min_key, group_prefix, real_prefix_len);
-      memcpy(min_key + real_prefix_len, cur_range->min_key,
-             cur_range->min_length);
-      /* Compare the found key with min_key. */
-      int cmp_res = key_cmp(index_info->key_part, min_key,
-                            real_prefix_len + min_max_arg_len);
-      /*
-        The key is outside of the range if:
-        the interval is open and the key is equal to the minimum boundry
-        or
-        the key is less than the minimum
-      */
-      if (((cur_range->flag & NEAR_MIN) && cmp_res == 0) ||
-          (min_max_keypart_asc ? (cmp_res < 0) : (cmp_res > 0))) {
-        result = HA_ERR_KEY_NOT_FOUND;
-        continue;
-      }
-    }
-    /* If we got to this point, the current key qualifies as MAX. */
-    return result;
-  }
-  return HA_ERR_KEY_NOT_FOUND;
-}
-
-/*
-  Update all MIN function results with the newly found value.
-
-  SYNOPSIS
-    QUICK_GROUP_MIN_MAX_SELECT::update_min_result()
-
-  DESCRIPTION
-    The method iterates through all MIN functions and updates the result value
-    of each function by calling Item_sum::aggregator_add(), which in turn picks
-    the new result value from this->head->record[0], previously updated by
-    next_min(). The updated value is stored in a member variable of each of the
-    Item_sum objects, depending on the value type.
-
-  IMPLEMENTATION
-    The update must be done separately for MIN and MAX, immediately after
-    next_min() was called and before next_max() is called, because both MIN and
-    MAX take their result value from the same buffer this->head->record[0]
-    (i.e.  this->record).
-
-  @param  reset   IN/OUT reset MIN value if TRUE.
-
-  RETURN
-    None
-*/
-
-void QUICK_GROUP_MIN_MAX_SELECT::update_min_result(bool *reset) {
-  Item_sum *min_func;
-
-  min_functions_it->rewind();
-  while ((min_func = (*min_functions_it)++)) {
-    if (*reset) {
-      min_func->aggregator_clear();
-      *reset = false;
-    }
-    min_func->aggregator_add();
-  }
-}
-
-/*
-  Update all MAX function results with the newly found value.
-
-  SYNOPSIS
-    QUICK_GROUP_MIN_MAX_SELECT::update_max_result()
-
-  DESCRIPTION
-    The method iterates through all MAX functions and updates the result value
-    of each function by calling Item_sum::aggregator_add(), which in turn picks
-    the new result value from this->head->record[0], previously updated by
-    next_max(). The updated value is stored in a member variable of each of the
-    Item_sum objects, depending on the value type.
-
-  IMPLEMENTATION
-    The update must be done separately for MIN and MAX, immediately after
-    next_max() was called, because both MIN and MAX take their result value
-    from the same buffer this->head->record[0] (i.e.  this->record).
-
-  @param  reset   IN/OUT reset MAX value if TRUE.
-
-  RETURN
-    None
-*/
-
-void QUICK_GROUP_MIN_MAX_SELECT::update_max_result(bool *reset) {
-  Item_sum *max_func;
-
-  max_functions_it->rewind();
-  while ((max_func = (*max_functions_it)++)) {
-    if (*reset) {
-      max_func->aggregator_clear();
-      *reset = false;
-    }
-    max_func->aggregator_add();
-  }
-}
-
-/*
-  Append comma-separated list of keys this quick select uses to key_names;
-  append comma-separated list of corresponding used lengths to used_lengths.
-
-  SYNOPSIS
-    QUICK_GROUP_MIN_MAX_SELECT::add_keys_and_lengths()
-    key_names    [out] Names of used indexes
-    used_lengths [out] Corresponding lengths of the index names
-
-  DESCRIPTION
-    This method is used by select_describe to extract the names of the
-    indexes used by a quick select.
-
-*/
-
-void QUICK_GROUP_MIN_MAX_SELECT::add_keys_and_lengths(String *key_names,
-                                                      String *used_lengths) {
-  char buf[64];
-  size_t length;
-  key_names->append(index_info->name);
-  length = longlong10_to_str(max_used_key_length, buf, 10) - buf;
-  used_lengths->append(buf, length);
-}
-
-/**
-  Construct a new quick select object for queries doing skip scans.
-
-  SYNOPSIS
-    TRP_SKIP_SCAN::make_quick()
-    param              Parameter from test_quick_select
-    retrieve_full_rows ignored
-    parent_alloc       Memory pool to use
-
-  NOTES
-    Make_quick ignores the retrieve_full_rows parameter because
-    QUICK_SKIP_SCAN_SELECT always performs index only scans.
-
-  RETURN
-    New QUICK_SKIP_SCAN_SELECT object if successfully created,
-    NULL otherwise.
-*/
-
-QUICK_SELECT_I *TRP_SKIP_SCAN::make_quick(PARAM *param, bool,
-                                          MEM_ROOT *parent_alloc) {
-  QUICK_SKIP_SCAN_SELECT *quick = nullptr;
-  DBUG_TRACE;
-
-  quick = new QUICK_SKIP_SCAN_SELECT(
-      param->table, param->query_block->join, index_info, index, range_key_part,
-      index_range_tree, eq_prefix_len, eq_prefix_parts, used_key_parts,
-      &cost_est, records, parent_alloc, has_aggregate_function);
-
-  if (!quick) return nullptr;
-
-  if (quick->init()) {
-    delete quick;
-    return nullptr;
-  }
-
-  /* Set range populates a QUICK_RANGE object from range_cond. */
-  if (!quick->set_range(range_cond)) {
-    delete quick;
-    return nullptr;
-  }
-  quick->forced_by_hint = forced_by_hint;
-  return quick;
-}
-
-static void cost_skip_scan(TABLE *table, uint key, uint distinct_key_parts,
-                           ha_rows quick_prefix_records,
-                           Cost_estimate *cost_est, ha_rows *records,
-                           Item *where_cond, Opt_trace_object *trace_idx);
-
-/**
-  Test if skip scan is applicable and if so, construct a new TRP object.
-
-  DESCRIPTION
-    Test whether a query can be computed via a QUICK_SKIP_SCAN_SELECT.
-    The overall query form should look like this:
-
-       SELECT A_1,...,A_k, B_1,...,B_m, C
-         FROM T
-        WHERE
-         EQ(A_1,...,A_k)
-         AND RNG(C);
-
-    Queries computable via a QUICK_SKIP_SCAN_SELECT must satisfy the
-    following conditions:
-
-    A) Table T has at least one compound index I of the form:
-       I = <A_1,...,A_k, B_1,..., B_m, C ,[D_1,...,D_n]>
-       Keyparts A and D may be empty, but B and C must be non-empty.
-    B) Only one table referenced.
-    C) Cannot have group by/select distinct
-    D) Query must reference fields in the index only.
-    E) The predicates on A_1...A_k must be equality predicates and they need
-       to be constants. This includes the 'IN' operator.
-    F) The query must be a conjunctive query.
-       In other words, it is a AND of ORs:
-       (COND1(kp1) OR COND2(kp1)) AND (COND1(kp2) OR ...) AND ...
-       See get_sel_arg_for_keypart for details.
-    G) There must be a range condition on C.
-    H) Conditions on D columns are allowed. Conditions on D must be in
-       conjunction with range condition on C.
-
-  NOTES
-    If the current query satisfies the conditions above, and if
-    (mem_root! = NULL), then the function constructs and returns a new TRP
-    object, that is later used to construct a new QUICK_SKIP_SCAN_SELECT.
-
-  @param  param     Parameter from test_quick_select
-  @param  tree      Range tree generated by get_mm_tree
-  @param  force_skip_scan  TRUE if skip scan is forced by optimizer hint
-
-  @retval NULL, if skip index scan not applicable,
-          otherwise skip index scan table read plan.
-*/
-
-static TRP_SKIP_SCAN *get_best_skip_scan(PARAM *param, SEL_TREE *tree,
-                                         bool force_skip_scan) {
-  JOIN *join = param->query_block->join;
-  TABLE *table = param->table;
-  const char *cause = nullptr;
-  TRP_SKIP_SCAN *read_plan = nullptr;
-  Opt_trace_context *const trace = &param->thd->opt_trace;
-  Cost_estimate best_read_cost;
-  ha_rows best_records = 0;
-  bool has_aggregate_function = false;
-  DBUG_TRACE;
-  best_read_cost.set_max_cost();
-  Opt_trace_object trace_group(trace, "skip_scan_range",
-                               Opt_trace_context::RANGE_OPTIMIZER);
-
-  if (!join)
-    cause = "no_join";
-  else if (join->primary_tables != 1) /* Query must reference one table. */
-    cause = "not_single_table";
-  else if (table->s->keys == 0) /* There are no indexes to use. */
-    cause = "no_index";
-  else if (param->order_direction == ORDER_DESC)
-    cause = "cannot_do_reverse_ordering";
-  else if (!join->group_list.empty())
-    cause = "has_group_by";
-  else if (!tree)
-    cause = "disjuntive_predicate_present";
-  else if (join->select_distinct)
-    cause = "has_select_distinct";
-
-  if (cause != nullptr) {
-    trace_group.add("chosen", false).add_alnum("cause", cause);
-    return nullptr;
-  }
-
-  KEY *index_info = nullptr; /* The index chosen for data access. */
-  uint index = 0;
-  KEY_PART_INFO *range_key_part = nullptr;
-  SEL_ROOT *index_range_tree = nullptr;
-  SEL_ARG *cur_range = nullptr;
-  SEL_ARG *range_sel_arg = nullptr;
-  uint field_length;
-  uint eq_prefix_len = 0;
-  uint eq_prefix_parts = 0;
-  uint used_key_parts = 0;
-  Cost_estimate min_diff_cost;
-  Opt_trace_array trace_indices(trace, "potential_skip_scan_indexes");
-
-  if (join->sum_funcs[0]) {
-    Item_sum *min_max_item;
-    Item_sum **func_ptr = join->sum_funcs;
-    while ((min_max_item = *(func_ptr++))) {
-      /*
-        TODO: Investigate if this condition could be relaxed in
-        some cases.
-      */
-      if (min_max_item->sum_func() == Item_sum::COUNT_DISTINCT_FUNC ||
-          min_max_item->sum_func() == Item_sum::SUM_DISTINCT_FUNC ||
-          min_max_item->sum_func() == Item_sum::AVG_DISTINCT_FUNC) {
-        trace_group.add("chosen", false)
-            .add_alnum("cause", "has_aggregate_distinct");
-        return nullptr;
-      }
-    }
-    has_aggregate_function = true;
-  }
-
-  for (uint cur_param_idx = 0; cur_param_idx < param->keys; ++cur_param_idx) {
-    const uint cur_index = param->real_keynr[cur_param_idx];
-    KEY *const cur_index_info = &table->key_info[cur_index];
-
-    Opt_trace_object trace_idx(trace);
-    trace_idx.add_utf8("index", cur_index_info->name);
-    KEY_PART_INFO *cur_part;
-    KEY_PART_INFO *end_part;
-    Cost_estimate cur_read_cost;
-    ha_rows cur_records;
-    SEL_ARG *cur_range_sel_arg = nullptr;
-    SEL_ROOT *cur_index_range_tree = nullptr;
-    uint cur_eq_prefix_len = 0;
-    uint cur_eq_prefix_parts = 0;
-    KEY_PART_INFO *cur_range_key_part = nullptr;
-    enum {
-      EQUALITY_KEYPART = 0,
-      SKIPPED_KEYPART = 1,
-      RANGE_KEYPART = 2,
-      TRAILING_KEYPART = 3
-    };
-    uint keypart_stage = EQUALITY_KEYPART;
-    uint cur_used_key_parts = 0;
-    uint part = 0;
-    ha_rows quick_prefix_records;
-
-    if (!compound_hint_key_enabled(param->table, cur_index,
-                                   SKIP_SCAN_HINT_ENUM)) {
-      cause = "skip_scan_hint";
-      goto next_index;
-    }
-
-    cur_part = cur_index_info->key_part;
-    end_part = cur_part + actual_key_parts(cur_index_info);
-
-    if (!table->covering_keys.is_set(cur_index)) {
-      cause = "query_references_nonkey_column";
-      goto next_index;
-    }
-
-    /* Extract equality constants that form the prefix. */
-    cur_index_range_tree = get_index_range_tree(cur_index, tree, param);
-    if (cur_index_range_tree == nullptr) {
-      cause = "disjuntive_predicate_present";
-      goto next_index;
-    }
-    for (cur_part = cur_index_info->key_part; cur_part != end_part;
-         cur_part++, part++) {
-      SEL_ROOT *cur_range_root = nullptr;
-      if (get_sel_root_for_keypart(cur_part - cur_index_info->key_part,
-                                   cur_index_range_tree, &cur_range_root)) {
-        cause = "keypart_in_disjunctive_query";
-        goto next_index;
-      }
-
-      if (cur_range_root && cur_range_root->type != SEL_ROOT::Type::KEY_RANGE) {
-        cause = "not_a_key_range";
-        goto next_index;
-      }
-      // There is no range predicate on current key part.
-      if (cur_range_root == nullptr) {
-        if (keypart_stage == EQUALITY_KEYPART ||
-            keypart_stage == RANGE_KEYPART) {
-          keypart_stage++;
-        }
-        continue;
-      }
-
-      cur_range = cur_range_root->root;
-      // There exists a range predicate on the current key part.
-      if (keypart_stage == EQUALITY_KEYPART) {
-        field_length = cur_part->store_length;
-        for (cur_range = cur_range->first(); cur_range;
-             cur_range = cur_range->next) {
-          // NEAR_MIN/NEAR_MAX means a strict inequality.
-          if ((cur_range->min_flag & NO_MIN_RANGE) ||
-              (cur_range->max_flag & NO_MAX_RANGE) ||
-              (cur_range->min_flag & NEAR_MIN) ||
-              (cur_range->max_flag & NEAR_MAX)) {
-            cause = "prefix_not_const_equality";
-            goto next_index;
-          }
-
-          if (!(cur_range->maybe_null() && cur_range->min_value[0] &&
-                cur_range->max_value[0]) &&  // IS NOT NULL
-              memcmp(cur_range->min_value, cur_range->max_value,
-                     field_length) != 0)  // not equality
-          {
-            cause = "prefix_not_const_equality";
-            goto next_index;
-          }
-        }
-        cur_eq_prefix_len += field_length;
-        cur_eq_prefix_parts++;
-      } else if (keypart_stage == SKIPPED_KEYPART) {
-        if (cur_range_root->elements > 1) {
-          cause = "range_predicate_too_complex";
-          goto next_index;
-        }
-        cur_range_key_part = cur_part;
-        cur_range_sel_arg = cur_range;
-        cur_used_key_parts = part + 1;
-        keypart_stage++;
-      }
-    }
-
-    if (keypart_stage < RANGE_KEYPART) {
-      cause = "no_range_predicate";
-      goto next_index;
-    }
-
-    assert(cur_used_key_parts >= 2);
-    table->possible_quick_keys.set_bit(cur_index);
-
-    assert(cur_index_range_tree);
-    {
-      Cost_estimate dummy_cost;
-      uint mrr_flags = HA_MRR_SORTED;
-      uint mrr_bufsize = 0;
-      /*
-        Calculate number of records returned by prefix equality ranges.
-      */
-      quick_prefix_records =
-          check_quick_select(param, cur_param_idx, true, cur_index_range_tree,
-                             false, &mrr_flags, &mrr_bufsize, &dummy_cost);
-    }
-    cost_skip_scan(table, cur_index, cur_used_key_parts - 1,
-                   quick_prefix_records, &cur_read_cost, &cur_records,
-                   join->where_cond, &trace_idx);
-
-    trace_idx.add("rows", cur_records).add("cost", cur_read_cost);
-
-    min_diff_cost = cur_read_cost;
-    min_diff_cost.multiply(DBL_EPSILON);
-    if (cur_read_cost < (best_read_cost - min_diff_cost)) {
-      index_info = cur_index_info;
-      index = cur_index;
-      best_read_cost = cur_read_cost;
-      best_records = cur_records;
-
-      eq_prefix_len = cur_eq_prefix_len;
-      eq_prefix_parts = cur_eq_prefix_parts;
-      index_range_tree = cur_index_range_tree;
-
-      range_sel_arg = cur_range_sel_arg;
-      range_key_part = cur_range_key_part;
-      used_key_parts = cur_used_key_parts;
-    }
-  next_index:
-    if (cause) {
-      trace_idx.add("usable", false).add_alnum("cause", cause);
-      cause = nullptr;
-    }
-  }
-  trace_indices.end();
-
-  if (!index_info) /* No usable index found. */
-    return nullptr;
-
-  /* The query passes all tests, so construct a new TRP object. */
-  read_plan = new (param->mem_root) TRP_SKIP_SCAN(
-      index_info, index, index_range_tree, eq_prefix_len, eq_prefix_parts,
-      range_key_part, range_sel_arg, used_key_parts, force_skip_scan,
-      best_records, has_aggregate_function);
-  if (read_plan) {
-    read_plan->cost_est = best_read_cost;
-    read_plan->records = best_records;
-    DBUG_PRINT("info",
-               ("Returning skip scan: cost: %g, records: %lu",
-                read_plan->cost_est.total_cost(), (ulong)read_plan->records));
-  }
-  return read_plan;
-}
-
-/**
-  Compute the cost of a QUICK_SKIP_SCAN_SELECT for a particular index.
-
-  SYNOPSIS
-    cost_skip_scan()
-    table                [in] The table being accessed
-    key                  [in] The index used to access the table
-    distinct_key_parts   [in] Number of key_parts used to get distinct prefix
-    quick_prefix_records [in] Number of records processed by prefix ranges
-    cost_est             [out] The cost to retrieve rows via this quick select
-    records              [out] The number of rows retrieved
-    where_cond           [in] WHERE condition
-    trace_idx            [in] optimizer_trace object
-
-  DESCRIPTION
-    This method computes the access cost of a TRP_SKIP_SCAN instance and
-    the number of rows returned.
-
-  NOTES
-
-    To estimate the size of the groups to read, index statistics
-    from rec_per_key is used. Each equality range decreases
-    number of the groups to read. The total number of processed
-    records from all the groups will be quick_prefix_records if
-    there are equality ranges else it will be the entire table.
-    Number of distinct group is calculated by dividing the
-    number of processed record by the number keys in a group.
-
-    Number of processed records is calculated using following formula:
-
-    records = number_of_distinct_groups * records_per_group * filtering_effect
-
-    where filtering_effect is filtering effect of the range condition.
-
-  RETURN
-    None
-*/
-
-void cost_skip_scan(TABLE *table, uint key, uint distinct_key_parts,
-                    ha_rows quick_prefix_records, Cost_estimate *cost_est,
-                    ha_rows *records, Item *where_cond,
-                    Opt_trace_object *trace_idx) {
-  ha_rows table_records, skip_scan_records;
-  uint num_groups;
-  rec_per_key_t keys_per_group;
-  const KEY *const index_info = &table->key_info[key];
-  DBUG_TRACE;
-
-  table_records = table->file->stats.records;
-  if (quick_prefix_records == HA_POS_ERROR)
-    skip_scan_records = table_records;
-  else
-    skip_scan_records = quick_prefix_records;
-
-  /* Compute the number of keys in a group. */
-  if (index_info->has_records_per_key(distinct_key_parts - 1)) {
-    // Use index statistics
-    keys_per_group = index_info->records_per_key(distinct_key_parts - 1);
-    assert(keys_per_group >= 0);
-  } else
-    /* If there is no statistics try to guess */
-    keys_per_group = guess_rec_per_key(table, index_info, distinct_key_parts);
-
-  num_groups = (uint)(skip_scan_records / keys_per_group) + 1;
-  num_groups = std::max(num_groups, 1U);
-
-  /* Calculate filtering effect for the range condition */
-  {
-    rec_per_key_t keys_per_range;
-    table_map used_tables = 0;
-    char buf[MAX_FIELDS / 8];
-    my_bitmap_map *bitbuf =
-        static_cast<my_bitmap_map *>(static_cast<void *>(&buf));
-    MY_BITMAP ignored_fields;
-    bitmap_init(&ignored_fields, bitbuf, table->s->fields);
-    bitmap_set_all(&ignored_fields);
-    bitmap_clear_bit(
-        &ignored_fields,
-        index_info->key_part[distinct_key_parts].field->field_index());
-
-    /* Compute the number of records per group for the range. */
-    if (index_info->has_records_per_key(distinct_key_parts))
-      keys_per_range = index_info->records_per_key(distinct_key_parts);
-    else
-      keys_per_range =
-          guess_rec_per_key(table, index_info, distinct_key_parts + 1);
-    /*
-      Calculation of the filtering effect is based on
-      Item_field::get_cond_filter_default_probability() where
-      max distinct values is used as an argument. So number of
-      keys in distinct group is divided by keys_per_range.
-    */
-    double max_distinct_values = max(
-        1.0, static_cast<double>(uint(keys_per_group) / uint(keys_per_range)));
-    float filtering_effect = where_cond->get_filtering_effect(
-        current_thd, table->pos_in_table_list->map(), used_tables,
-        &ignored_fields, max_distinct_values);
-    *records = max(ha_rows(1), ha_rows(skip_scan_records * filtering_effect));
-  }
-
-  /* Estimate IO cost. */
-  const Cost_model_table *const cost_model = table->cost_model();
-  Cost_estimate cost_skip_scan =
-      table->file->index_scan_cost(key, num_groups, *records);
-
-  /* CPU cost*/
-  const double tree_height =
-      table_records == 0 ? 1.0 : ceil(log2(double(table_records)));
-  const double tree_traversal_cost = cost_model->key_compare_cost(tree_height);
-  /* Number of re-positions happens twice per group. */
-  trace_idx->add("tree_travel_cost", tree_traversal_cost)
-      .add("num_groups", num_groups);
-  const double cpu_cost =
-      tree_traversal_cost * num_groups * 2 +
-      cost_model->row_evaluate_cost(static_cast<double>(*records)) +
-      cost_model->key_compare_cost(static_cast<double>(*records));
-  cost_skip_scan.add_cpu(cpu_cost);
-
-  *cost_est = cost_skip_scan;
-
-  DBUG_PRINT("info",
-             ("table rows: %lu keys/group: %u result rows: %lu",
-              (ulong)table_records, (uint)keys_per_group, (ulong)*records));
-}
-
-/**
-  Construct new quick select for queries that can do skip scans.
-  See get_best_skip_scan() description for more details.
-
-  SYNOPSIS
-    QUICK_SKIP_SCAN_SELECT::QUICK_SKIP_SCAN_SELECT()
-    table              The table being accessed
-    join               Descriptor of the current query
-    index_info         The index chosen for data access
-    use_index          The id of index_info
-    range_part         The keypart belonging to the range condition C
-    index_range_tree   The complete range key
-    eq_prefix_len      Length of the equality prefix key
-    eq_prefix_parts    Number of keyparts in the equality prefix
-    used_key_parts_arg Total number of keyparts A_1,...,C
-    read_cost_arg      Cost of this access method
-    read_records       Number of records returned
-    parent_alloc       Memory pool for this class
-
-  RETURN
-    None
-*/
-
-QUICK_SKIP_SCAN_SELECT::QUICK_SKIP_SCAN_SELECT(
-    TABLE *table, JOIN *join, KEY *index_info, uint use_index,
-    KEY_PART_INFO *range_part, SEL_ROOT *index_range_tree, uint eq_prefix_len,
-    uint eq_prefix_parts, uint used_key_parts_arg,
-    const Cost_estimate *read_cost_arg, ha_rows read_records,
-    MEM_ROOT *parent_alloc, bool has_aggregate_function)
-    : join(join),
-      index_info(index_info),
-      index_range_tree(index_range_tree),
-      eq_prefix_len(eq_prefix_len),
-      eq_prefix_key_parts(eq_prefix_parts),
-      distinct_prefix(nullptr),
-      range_key_part(range_part),
-      seen_first_key(false),
-      min_range_key(nullptr),
-      max_range_key(nullptr),
-      min_search_key(nullptr),
-      max_search_key(nullptr),
-      has_aggregate_function(has_aggregate_function) {
-  head = table;
-  index = use_index;
-  record = head->record[0];
-  cost_est = *read_cost_arg;
-  records = read_records;
-
-  used_key_parts = used_key_parts_arg;
-  max_used_key_length = 0;
-  distinct_prefix_len = 0;
-  range_cond_flag = 0;
-  KEY_PART_INFO *p = index_info->key_part;
-
-  my_bitmap_map *bitmap;
-  if (!(bitmap = (my_bitmap_map *)my_malloc(key_memory_my_bitmap_map,
-                                            head->s->column_bitmap_size,
-                                            MYF(MY_WME)))) {
-    column_bitmap.bitmap = nullptr;
-  } else
-    bitmap_init(&column_bitmap, bitmap, head->s->fields);
-  bitmap_copy(&column_bitmap, head->read_set);
-
-  for (uint i = 0; i < used_key_parts; i++, p++) {
-    max_used_key_length += p->store_length;
-    /*
-      The last key part contains the subrange scan that we want to execute
-      for every distinct prefix. There is only ever one keypart, so just
-      exclude the last key from the distinct prefix.
-    */
-    if (i + 1 < used_key_parts) {
-      distinct_prefix_len += p->store_length;
-      bitmap_set_bit(&column_bitmap, p->field->field_index());
-    }
-  }
-  distinct_prefix_key_parts = used_key_parts - 1;
-
-  /*
-    See QUICK_GROUP_MIN_MAX_SELECT::QUICK_GROUP_MIN_MAX_SELECT
-    for why parent_alloc should be NULL.
-  */
-  assert(!parent_alloc);
-  if (!parent_alloc) {
-    init_sql_alloc(key_memory_quick_group_min_max_select_root, &alloc,
-                   join->thd->variables.range_alloc_block_size, 0);
-    join->thd->mem_root = &alloc;
-  } else
-    ::new (&alloc) MEM_ROOT;  // ensure that it's not used
-}
-
-/**
-  Do post-constructor initialization.
-
-  SYNOPSIS
-    QUICK_SKIP_SCAN_SELECT::init()
-
-  DESCRIPTION
-    The method performs initialization that cannot be done in the constructor
-    such as memory allocations that may fail. It allocates memory for the
-    equality prefix and distinct prefix buffers. It also extracts all equality
-    prefixes from index_range_tree, as well as allocates memory to store them.
-
-  RETURN
-    0      OK
-    other  Error code
-*/
-
-int QUICK_SKIP_SCAN_SELECT::init() {
-  if (distinct_prefix) return 0;
-
-  assert(distinct_prefix_key_parts > 0 && distinct_prefix_len > 0);
-  if (!(distinct_prefix = (uchar *)alloc.Alloc(distinct_prefix_len))) return 1;
-
-  if (eq_prefix_len > 0) {
-    eq_prefix = (uchar *)alloc.Alloc(eq_prefix_len);
-    if (!eq_prefix) return 1;
-  } else {
-    eq_prefix = nullptr;
-  }
-
-  if (eq_prefix_key_parts > 0) {
-    if (!(cur_eq_prefix =
-              (uint *)alloc.Alloc(eq_prefix_key_parts * sizeof(uint))))
-      return 1;
-    if (!(eq_key_prefixes =
-              (uchar ***)alloc.Alloc(eq_prefix_key_parts * sizeof(uchar **))))
-      return 1;
-    if (!(eq_prefix_elements =
-              (uint *)alloc.Alloc(eq_prefix_key_parts * sizeof(uint))))
-      return 1;
-
-    const SEL_ARG *cur_range = index_range_tree->root->first();
-    const SEL_ARG *first_range = nullptr;
-    const SEL_ROOT *cur_root = index_range_tree;
-    for (uint i = 0; i < eq_prefix_key_parts;
-         i++, cur_range = cur_range->next_key_part->root) {
-      cur_eq_prefix[i] = 0;
-      eq_prefix_elements[i] = cur_root->elements;
-      cur_root = cur_range->next_key_part;
-      assert(eq_prefix_elements[i] > 0);
-      if (!(eq_key_prefixes[i] =
-                (uchar **)alloc.Alloc(eq_prefix_elements[i] * sizeof(uchar *))))
-        return 1;
-
-      uint j = 0;
-      first_range = cur_range->first();
-      for (cur_range = first_range; cur_range;
-           j++, cur_range = cur_range->next) {
-        KEY_PART_INFO *keypart = index_info->key_part + i;
-        size_t field_length = keypart->store_length;
-        //  Store ranges in the reverse order if key part is descending.
-        uint pos = cur_range->is_ascending ? j : eq_prefix_elements[i] - j - 1;
-
-        if (!(eq_key_prefixes[i][pos] = (uchar *)alloc.Alloc(field_length)))
-          return 1;
-
-        if (cur_range->maybe_null() && cur_range->min_value[0] &&
-            cur_range->max_value[0]) {
-          assert(field_length > 0);
-          eq_key_prefixes[i][pos][0] = 0x1;
-        } else {
-          assert(memcmp(cur_range->min_value, cur_range->max_value,
-                        field_length) == 0);
-          memcpy(eq_key_prefixes[i][pos], cur_range->min_value, field_length);
-        }
-      }
-      cur_range = first_range;
-      assert(j == eq_prefix_elements[i]);
-    }
-  }
-
-  return 0;
-}
-
-QUICK_SKIP_SCAN_SELECT::~QUICK_SKIP_SCAN_SELECT() {
-  DBUG_TRACE;
-  if (head->file->inited) head->file->ha_index_or_rnd_end();
-
-  my_free(column_bitmap.bitmap);
-  free_root(&alloc, MYF(0));
-}
-
-/**
-  Setup fileds that hold the range condition on key part C.
-
-  SYNOPSIS
-    QUICK_SKIP_SCAN_SELECT::set_range()
-    sel_range  Range object from which the fields will be populated with.
-
-  NOTES
-    This is only the suffix of the whole key, that we use
-    to append to the prefix to get the full key later on.
-  RETURN
-    true on success
-    false otherwise
-*/
-
-bool QUICK_SKIP_SCAN_SELECT::set_range(SEL_ARG *sel_range) {
-  DBUG_TRACE;
-  uchar *min_value, *max_value;
-
-  if (!(sel_range->min_flag & NO_MIN_RANGE) &&
-      !(sel_range->max_flag & NO_MAX_RANGE)) {
-    // IS NULL condition
-    if (sel_range->maybe_null() && sel_range->min_value[0] &&
-        sel_range->max_value[0])
-      range_cond_flag |= NULL_RANGE;
-    // equality condition
-    else if (memcmp(sel_range->min_value, sel_range->max_value,
-                    range_key_part->store_length) == 0)
-      range_cond_flag |= EQ_RANGE;
-  }
-
-  if (sel_range->is_ascending) {
-    range_cond_flag |= sel_range->min_flag | sel_range->max_flag;
-    min_value = sel_range->min_value;
-    max_value = sel_range->max_value;
-  } else {
-    range_cond_flag |= invert_min_flag(sel_range->min_flag) |
-                       invert_max_flag(sel_range->max_flag);
-    min_value = sel_range->max_value;
-    max_value = sel_range->min_value;
-  }
-
-  range_key_len = range_key_part->store_length;
-
-  // Allocate storage for min/max key if they exist.
-  if (!(range_cond_flag & NO_MIN_RANGE)) {
-    if (!(min_range_key = (uchar *)alloc.Alloc(range_key_len))) return false;
-    if (!(min_search_key = (uchar *)alloc.Alloc(max_used_key_length)))
-      return false;
-
-    memcpy(min_range_key, min_value, range_key_len);
-  }
-  if (!(range_cond_flag & NO_MAX_RANGE)) {
-    if (!(max_range_key = (uchar *)alloc.Alloc(range_key_len))) return false;
-    if (!(max_search_key = (uchar *)alloc.Alloc(max_used_key_length)))
-      return false;
-
-    memcpy(max_range_key, max_value, range_key_len);
-  }
-
-  return true;
-}
-
-/**
-  Initialize a quick skip scan index select for key retrieval.
-
-  SYNOPSIS
-    QUICK_SKIP_SCAN_SELECT::reset()
-
-  DESCRIPTION
-    Initialize the index chosen for access and initialize what the first
-    equality key prefix should be.
-
-  RETURN
-    0      OK
-    other  Error code
-*/
-
-int QUICK_SKIP_SCAN_SELECT::reset(void) {
-  DBUG_TRACE;
-
-  int result;
-  seen_first_key = false;
-  head->set_keyread(true);  // This access path demands index-only reads.
-  MY_BITMAP *const save_read_set = head->read_set;
-
-  head->column_bitmaps_set_no_signal(&column_bitmap, head->write_set);
-  if ((result = head->file->ha_index_init(index, true))) {
-    head->file->print_error(result, MYF(0));
-    return result;
-  }
-
-  // Set the first equality prefix.
-  size_t offset = 0;
-  for (uint i = 0; i < eq_prefix_key_parts; i++) {
-    const uchar *key = eq_key_prefixes[i][0];
-    cur_eq_prefix[i] = 0;
-    uint part_length = (index_info->key_part + i)->store_length;
-    memcpy(eq_prefix + offset, key, part_length);
-    offset += part_length;
-    assert(offset <= eq_prefix_len);
-  }
-
-  head->column_bitmaps_set_no_signal(save_read_set, head->write_set);
-  return 0;
-}
-
-/**
-  Increments cur_prefix and sets what the next equality prefix should be.
-
-  SYNOPSIS
-    QUICK_SKIP_SCAN_SELECT::next_eq_prefix()
-
-  DESCRIPTION
-    Increments cur_prefix and sets what the next equality prefix should be.
-    This is done in index order, so the increment happens on the last keypart.
-    The key is written to eq_prefix.
-
-  RETURN
-    true   OK
-    false  No more equality key prefixes.
-*/
-
-bool QUICK_SKIP_SCAN_SELECT::next_eq_prefix() {
-  DBUG_TRACE;
-  /*
-    Counts at which position we're at in eq_prefix from the back of the
-    string.
-  */
-  size_t reverse_offset = 0;
-
-  // Increment the cur_prefix count.
-  for (uint i = 0; i < eq_prefix_key_parts; i++) {
-    uint part = eq_prefix_key_parts - i - 1;
-    assert(cur_eq_prefix[part] < eq_prefix_elements[part]);
-    uint part_length = (index_info->key_part + part)->store_length;
-    reverse_offset += part_length;
-
-    cur_eq_prefix[part]++;
-    const uchar *key =
-        eq_key_prefixes[part][cur_eq_prefix[part] % eq_prefix_elements[part]];
-    memcpy(eq_prefix + eq_prefix_len - reverse_offset, key, part_length);
-    if (cur_eq_prefix[part] == eq_prefix_elements[part]) {
-      cur_eq_prefix[part] = 0;
-      if (part == 0) {
-        // This is the last key part.
-        return false;
-      }
-    } else {
-      break;
-    }
-  }
-
-  return true;
-}
-
-/**
-  Get the next row for skip scan.
-
-  SYNOPSIS
-    QUICK_SKIP_SCAN_SELECT::get_next()
-
-  DESCRIPTION
-    Find the next record in the skip scan. The scan is broken into groups
-    based on distinct A_1,...,B_m. The strategy is to have an outer loop
-    going through all possible A_1,...,A_k. This work is done in
-    next_eq_prefix().
-
-    For each equality prefix that we get from "next_eq_prefix() we loop through
-    all distinct B_1,...,B_m within that prefix. And for each of those groups
-    we do a subrange scan on keypart C.
-
-    The high level algorithm is like so:
-    for (eq_prefix in eq_prefixes)       // (A_1,....A_k)
-      for (distinct_prefix in eq_prefix) // A_1-B_1,...,A_k-B_m
-        do subrange scan within distinct prefix
-          using range_cond               // A_1-B_1-C,...A_k-B_m-C
-
-    But since this is a iterator interface, state needs to be kept between
-    calls. State is stored in eq_prefix, cur_eq_prefix and distinct_prefix.
-
-  NOTES
-    We can be more memory efficient by combining some of these fields. For
-    example, eq_prefix will always be a prefix of distinct_prefix, and
-    distinct_prefix will always be a prefix of min_search_key/max_search_key.
-
-  RETURN
-    0                  on success
-    HA_ERR_END_OF_FILE if returned all keys
-    other              if some error occurred
-*/
-
-int QUICK_SKIP_SCAN_SELECT::get_next() {
-  DBUG_TRACE;
-  int result = HA_ERR_END_OF_FILE;
-  int past_eq_prefix = 0;
-  bool is_prefix_valid = seen_first_key;
-
-  assert(distinct_prefix_len + range_key_len == max_used_key_length);
-
-  MY_BITMAP *const save_read_set = head->read_set;
-  head->column_bitmaps_set_no_signal(&column_bitmap, head->write_set);
-  do {
-    if (!is_prefix_valid) {
-      if (!seen_first_key) {
-        if (eq_prefix_key_parts == 0) {
-          result = head->file->ha_index_first(record);
-        } else {
-          result = head->file->ha_index_read_map(
-              record, eq_prefix, make_prev_keypart_map(eq_prefix_key_parts),
-              HA_READ_KEY_OR_NEXT);
-        }
-        seen_first_key = true;
-      } else {
-        result = index_next_different(
-            false /* is_index_scan */, head->file, index_info->key_part, record,
-            distinct_prefix, distinct_prefix_len, distinct_prefix_key_parts);
-      }
-
-      if (result) goto exit;
-
-      // Save the prefix of this group for subsequent calls.
-      key_copy(distinct_prefix, record, index_info, distinct_prefix_len);
-
-      if (eq_prefix) {
-        past_eq_prefix =
-            key_cmp(index_info->key_part, eq_prefix, eq_prefix_len);
-        assert(past_eq_prefix >= 0);
-
-        // We are past the equality prefix, so get the next prefix.
-        if (past_eq_prefix > 0) {
-          bool has_next = next_eq_prefix();
-          if (has_next) {
-            /*
-              Reset seen_first_key so that we can determine the next distinct
-              prefix.
-            */
-            seen_first_key = false;
-            result = HA_ERR_END_OF_FILE;
-            continue;
-          }
-          result = HA_ERR_END_OF_FILE;
-          goto exit;
-        }
-      }
-
-      // We should not be doing a skip scan if there is no range predicate.
-      assert(!(range_cond_flag & NO_MIN_RANGE) ||
-             !(range_cond_flag & NO_MAX_RANGE));
-
-      if (!(range_cond_flag & NO_MIN_RANGE)) {
-        // If there is a minimum key, append to the distinct prefix.
-        memcpy(min_search_key, distinct_prefix, distinct_prefix_len);
-        memcpy(min_search_key + distinct_prefix_len, min_range_key,
-               range_key_len);
-        start_key.key = min_search_key;
-        start_key.length = max_used_key_length;
-        start_key.keypart_map = make_prev_keypart_map(used_key_parts);
-        start_key.flag = (range_cond_flag & (EQ_RANGE | NULL_RANGE))
-                             ? HA_READ_KEY_EXACT
-                             : (range_cond_flag & NEAR_MIN)
-                                   ? HA_READ_AFTER_KEY
-                                   : HA_READ_KEY_OR_NEXT;
-      } else {
-        // If there is no minimum key, just use the distinct prefix.
-        start_key.key = distinct_prefix;
-        start_key.length = distinct_prefix_len;
-        start_key.keypart_map = make_prev_keypart_map(used_key_parts - 1);
-        start_key.flag = HA_READ_KEY_OR_NEXT;
-      }
-
-      /*
-        It is not obvious what the semantics of HA_READ_BEFORE_KEY,
-        HA_READ_KEY_EXACT and HA_READ_AFTER_KEY are for end_key.
-
-        See handler::set_end_range for details on what they do.
-      */
-      if (!(range_cond_flag & NO_MAX_RANGE)) {
-        // If there is a maximum key, append to the distinct prefix.
-        memcpy(max_search_key, distinct_prefix, distinct_prefix_len);
-        memcpy(max_search_key + distinct_prefix_len, max_range_key,
-               range_key_len);
-        end_key.key = max_search_key;
-        end_key.length = max_used_key_length;
-        end_key.keypart_map = make_prev_keypart_map(used_key_parts);
-        //  See comment in quick_range_seq_next for why these flags are set.
-        end_key.flag = (range_cond_flag & NEAR_MAX) ? HA_READ_BEFORE_KEY
-                                                    : HA_READ_AFTER_KEY;
-      } else {
-        // If there is no maximum key, just use the distinct prefix.
-        end_key.key = distinct_prefix;
-        end_key.length = distinct_prefix_len;
-        end_key.keypart_map = make_prev_keypart_map(used_key_parts - 1);
-        end_key.flag = HA_READ_AFTER_KEY;
-      }
-      is_prefix_valid = true;
-
-      result = head->file->ha_read_range_first(
-          &start_key, &end_key, range_cond_flag & EQ_RANGE, true /* sorted */);
-      if (result) {
-        if (result == HA_ERR_END_OF_FILE) {
-          is_prefix_valid = false;
-          continue;
-        }
-        goto exit;
-      }
-    } else {
-      result = head->file->ha_read_range_next();
-      if (result) {
-        if (result == HA_ERR_END_OF_FILE) {
-          is_prefix_valid = false;
-          continue;
-        }
-        goto exit;
-      }
-    }
-  } while ((result == HA_ERR_KEY_NOT_FOUND || result == HA_ERR_END_OF_FILE));
-
-exit:
-  head->column_bitmaps_set_no_signal(save_read_set, head->write_set);
-
-  if (result == HA_ERR_KEY_NOT_FOUND) result = HA_ERR_END_OF_FILE;
-
-  return result;
-}
-
-/**
-  Append comma-separated list of keys this quick select uses to key_names;
-  append comma-separated list of corresponding used lengths to used_lengths.
-
-  SYNOPSIS
-    QUICK_SKIP_SCAN_SELECT::add_keys_and_lengths()
-    key_names    [out] Names of used indexes
-    used_lengths [out] Corresponding lengths of the index names
-
-  DESCRIPTION
-    This method is used by select_describe to extract the names of the
-    indexes used by a quick select.
-
-*/
-
-void QUICK_SKIP_SCAN_SELECT::add_keys_and_lengths(String *key_names,
-                                                  String *used_lengths) {
-  char buf[64];
-  uint length;
-  key_names->append(index_info->name);
-  length = longlong10_to_str(max_used_key_length, buf, 10) - buf;
-  used_lengths->append(buf, length);
-}
-
-/**
-  Traverse the R-B range tree for this and later keyparts to see if
-  there are at least as many equality ranges as defined by the limit.
-
-  @param keypart        The R-B tree of ranges for a given keypart.
-  @param [in,out] count The number of equality ranges found so far
-  @param limit          The number of ranges
-
-  @retval true if limit > 0 and 'limit' or more equality ranges have been
-          found in the range R-B trees
-  @retval false otherwise
-
-*/
-static bool eq_ranges_exceeds_limit(const SEL_ROOT *keypart, uint *count,
-                                    uint limit) {
-  // "Statistics instead of index dives" feature is turned off
-  if (limit == 0) return false;
-
-  /*
-    Optimization: if there is at least one equality range, index
-    statistics will be used when limit is 1. It's safe to return true
-    even without checking that there is an equality range because if
-    there are none, index statistics will not be used anyway.
-  */
-  if (limit == 1) return true;
-
-  for (SEL_ARG *keypart_range = keypart->root->first(); keypart_range;
-       keypart_range = keypart_range->next) {
-    /*
-      This is an equality range predicate and should be counted if:
-      1) the range for this keypart does not have a min/max flag
-         (which indicates <, <= etc), and
-      2) the lower and upper range boundaries have the same value
-         (it's not a "x BETWEEN a AND b")
-
-      Note, however, that if this is an "x IS NULL" condition we don't
-      count it because the number of NULL-values is likely to be off
-      the index statistics we plan to use.
-    */
-    if (!keypart_range->min_flag && !keypart_range->max_flag &&  // 1)
-        !keypart_range->cmp_max_to_min(keypart_range) &&         // 2)
-        !keypart_range->is_null_interval())                      // "x IS NULL"
-    {
-      /*
-         Count predicates in the next keypart, but only if that keypart
-         is the next in the index.
-      */
-      if (keypart_range->next_key_part &&
-          keypart_range->next_key_part->root->part == keypart_range->part + 1)
-        eq_ranges_exceeds_limit(keypart_range->next_key_part, count, limit);
-      else
-        // We've found a path of equlity predicates down to a keypart leaf
-        (*count)++;
-
-      if (*count >= limit) return true;
-    }
-  }
-  return false;
-}
-
-#ifndef NDEBUG
-
-static void print_sel_tree(PARAM *param, SEL_TREE *tree, Key_map *tree_map,
-                           const char *msg) {
-  char buff[1024];
-  DBUG_TRACE;
-
-  String tmp(buff, sizeof(buff), &my_charset_bin);
-  tmp.length(0);
-  for (uint idx = 0; idx < param->keys; idx++) {
-    if (tree_map->is_set(idx)) {
-      uint keynr = param->real_keynr[idx];
-      if (tmp.length()) tmp.append(',');
-      tmp.append(param->table->key_info[keynr].name);
-    }
-  }
-  if (!tmp.length()) tmp.append(STRING_WITH_LEN("(empty)"));
-
-  DBUG_PRINT("info", ("SEL_TREE: %p (%s)  scans: %s", tree, msg, tmp.ptr()));
-}
-
-static void print_ror_scans_arr(TABLE *table, const char *msg,
-                                ROR_SCAN_INFO **start, ROR_SCAN_INFO **end) {
-  DBUG_TRACE;
-
-  char buff[1024];
-  String tmp(buff, sizeof(buff), &my_charset_bin);
-  tmp.length(0);
-  for (; start != end; start++) {
-    if (tmp.length()) tmp.append(',');
-    tmp.append(table->key_info[(*start)->keynr].name);
-  }
-  if (!tmp.length()) tmp.append(STRING_WITH_LEN("(empty)"));
-  DBUG_PRINT("info", ("ROR key scans (%s): %s", msg, tmp.ptr()));
-  fprintf(DBUG_FILE, "ROR key scans (%s): %s", msg, tmp.ptr());
-}
-
-#endif /* !NDEBUG */
-
-/**
-  Print a key to a string
-
-  @param[out] out          String the key is appended to
-  @param[in]  key_part     Index components description
-  @param[in]  key          Key tuple
-*/
-static void print_key_value(String *out, const KEY_PART_INFO *key_part,
-                            const uchar *key) {
-  Field *field = key_part->field;
-
-  if (field->is_flag_set(BLOB_FLAG)) {
-    // Byte 0 of a nullable key is the null-byte. If set, key is NULL.
-    if (field->is_nullable() && *key)
-      out->append(STRING_WITH_LEN("NULL"));
-    else
-      (field->type() == MYSQL_TYPE_GEOMETRY)
-          ? out->append(STRING_WITH_LEN("unprintable_geometry_value"))
-          : out->append(STRING_WITH_LEN("unprintable_blob_value"));
-    return;
-  }
-
-  uint store_length = key_part->store_length;
-
-  if (field->is_nullable()) {
-    /*
-      Byte 0 of key is the null-byte. If set, key is NULL.
-      Otherwise, print the key value starting immediately after the
-      null-byte
-    */
-    if (*key) {
-      out->append(STRING_WITH_LEN("NULL"));
-      return;
-    }
-    key++;  // Skip null byte
-    store_length--;
-  }
-
-  /*
-    Binary data cannot be converted to UTF8 which is what the
-    optimizer trace expects. If the column is binary, the hex
-    representation is printed to the trace instead.
-  */
-  if (field->is_flag_set(BINARY_FLAG)) {
-    out->append("0x");
-    for (uint i = 0; i < store_length; i++) {
-      out->append(_dig_vec_lower[*(key + i) >> 4]);
-      out->append(_dig_vec_lower[*(key + i) & 0x0F]);
-    }
-    return;
-  }
-
-  char buff[128];
-  String tmp(buff, sizeof(buff), system_charset_info);
-  tmp.length(0);
-
-  TABLE *table = field->table;
-  my_bitmap_map *old_sets[2];
-
-  dbug_tmp_use_all_columns(table, old_sets, table->read_set, table->write_set);
-
-  field->set_key_image(key, key_part->length);
-  if (field->type() == MYSQL_TYPE_BIT)
-    (void)field->val_int_as_str(&tmp, true);  // may change tmp's charset
-  else
-    field->val_str(&tmp);  // may change tmp's charset
-  out->append(tmp.ptr(), tmp.length(), tmp.charset());
-
-  dbug_tmp_restore_column_maps(table->read_set, table->write_set, old_sets);
-}
-
-/**
-  Append range info for a key part to a string
-
-  @param[in,out] out          String the range info is appended to
-  @param[in]     key_part     Indexed column used in a range select
-  @param[in]     min_key      Key tuple describing lower bound of range
-  @param[in]     max_key      Key tuple describing upper bound of range
-  @param[in]     flag         Key range flags defining what min_key
-                              and max_key represent @see my_base.h
-*/
-void append_range(String *out, const KEY_PART_INFO *key_part,
-                  const uchar *min_key, const uchar *max_key, const uint flag) {
-  if (out->length() > 0) out->append(STRING_WITH_LEN(" AND "));
-
-  if (flag & GEOM_FLAG) {
-    /*
-      The flags of GEOM ranges do not work the same way as for other
-      range types, so printing "col < some_geom" doesn't make sense.
-      Just print the column name, not operator.
-    */
-    out->append(key_part->field->field_name);
-    out->append(STRING_WITH_LEN(" "));
-    print_key_value(out, key_part, min_key);
-    return;
-  }
-
-  if (!(flag & NO_MIN_RANGE)) {
-    print_key_value(out, key_part, min_key);
-    if (flag & NEAR_MIN)
-      out->append(STRING_WITH_LEN(" < "));
-    else
-      out->append(STRING_WITH_LEN(" <= "));
-  }
-
-  out->append(get_field_name_or_expression(current_thd, key_part->field));
-
-  if (!(flag & NO_MAX_RANGE)) {
-    if (flag & NEAR_MAX)
-      out->append(STRING_WITH_LEN(" < "));
-    else
-      out->append(STRING_WITH_LEN(" <= "));
-    print_key_value(out, key_part, max_key);
-  }
-}
-
-/**
-  Traverse an R-B tree of range conditions and append all ranges for
-  this keypart and consecutive keyparts to range_trace (if non-NULL)
-  or to range_string (if range_trace is NULL). See description of R-B
-  trees/SEL_ARG for details on how ranges are linked.
-
-  @param[in,out] range_trace   Optimizer trace array ranges are appended to
-  @param[in,out] range_string  The string where range predicates are
-                               appended when the last keypart has
-                               been reached.
-  @param         range_so_far  String containing ranges for keyparts prior
-                               to this keypart.
-  @param         keypart       The R-B tree containing intervals for this
-  keypart.
-  @param         key_parts     Index components description, used when adding
-                               information to the optimizer trace
-  @param         print_full    Whether or not ranges on unusable keyparts
-                               should be printed. Useful for debugging.
-
-  @note This function mimics the behavior of sel_arg_range_seq_next()
-*/
-void append_range_all_keyparts(Opt_trace_array *range_trace,
-                               String *range_string, String *range_so_far,
-                               SEL_ROOT *keypart,
-                               const KEY_PART_INFO *key_parts,
-                               const bool print_full) {
-  assert(keypart);
-  const SEL_ARG *const keypart_root = keypart->root;
-  assert(keypart_root && keypart_root != null_element);
-
-  const bool append_to_trace = (range_trace != nullptr);
-
-  // Either add info to range_string or to range_trace
-  assert(append_to_trace ? !range_string : (range_string != nullptr));
-
-  // Navigate to first interval in red-black tree
-  const KEY_PART_INFO *cur_key_part = key_parts + keypart_root->part;
-  const SEL_ARG *keypart_range = keypart_root->first();
-
-  const size_t save_range_so_far_length = range_so_far->length();
-
-  while (keypart_range) {
-    /*
-      Skip the rest of condition printing to avoid OOM if appending to
-      range_string and the string becomes too long. Printing very long
-      range conditions normally doesn't make sense either.
-    */
-    if (!append_to_trace && range_string->length() > 500) {
-      range_string->append(STRING_WITH_LEN("..."));
-      break;
-    }
-
-    // Append the current range predicate to the range String
-    switch (keypart->type) {
-      case SEL_ROOT::Type::KEY_RANGE:
-        append_range(range_so_far, cur_key_part, keypart_range->min_value,
-                     keypart_range->max_value,
-                     keypart_range->min_flag | keypart_range->max_flag);
-        break;
-      case SEL_ROOT::Type::MAYBE_KEY:
-        range_so_far->append("MAYBE_KEY");
-        break;
-      case SEL_ROOT::Type::IMPOSSIBLE:
-        range_so_far->append("IMPOSSIBLE");
-        break;
-      default:
-        assert(false);
-        break;
-    }
-
-    /*
-      Print range predicates for consecutive keyparts if
-      1) There are predicates for later keyparts, and
-      2) We explicitly requested to print even the ranges that will
-         not be usable by range access, or
-      3) There are no "holes" in the used keyparts (keypartX can only
-         be used if there is a range predicate on keypartX-1), and
-      4) The current range is an equality range
-    */
-    if (keypart_range->next_key_part &&  // 1
-        (print_full ||                   // 2
-         (keypart_range->next_key_part->root->part ==
-              keypart_range->part + 1 &&      // 3
-          keypart_range->is_singlepoint())))  // 4
-    {
-      append_range_all_keyparts(range_trace, range_string, range_so_far,
-                                keypart_range->next_key_part, key_parts,
-                                print_full);
-    } else {
-      /*
-        This is the last keypart with a usable range predicate. Print
-        full range info to the optimizer trace or to the string
-      */
-      if (append_to_trace)
-        range_trace->add_utf8(range_so_far->ptr(), range_so_far->length());
-      else {
-        if (range_string->length() == 0)
-          range_string->append(STRING_WITH_LEN("("));
-        else
-          range_string->append(STRING_WITH_LEN(" OR ("));
-
-        range_string->append(range_so_far->ptr(), range_so_far->length());
-        range_string->append(STRING_WITH_LEN(")"));
-      }
-    }
-    keypart_range = keypart_range->next;
-    /*
-      Now moving to next range for this keypart, so "reset"
-      range_so_far to include only range description of earlier
-      keyparts
-    */
-    range_so_far->length(save_range_so_far_length);
-  }
-}
-
-#ifndef NDEBUG
-/**
-  Print the ranges in a SEL_TREE to debug log.
-
-  @param tree_name   Descriptive name of the tree
-  @param tree        The SEL_TREE that will be printed to debug log
-  @param param       PARAM from test_quick_select
-*/
-static inline void dbug_print_tree(const char *tree_name, SEL_TREE *tree,
-                                   const RANGE_OPT_PARAM *param) {
-  if (_db_enabled_()) print_tree(nullptr, tree_name, tree, param, true);
-}
-#endif
-
-void print_tree(String *out, const char *tree_name, SEL_TREE *tree,
-                const RANGE_OPT_PARAM *param, const bool print_full) {
-  if (!param->using_real_indexes) {
-    if (out) {
-      out->append(tree_name);
-      out->append(" uses a partitioned index and cannot be printed");
-    } else
-      DBUG_PRINT("info", ("sel_tree: "
-                          "%s uses a partitioned index and cannot be printed",
-                          tree_name));
-    return;
-  }
-
-  if (!tree) {
-    if (out) {
-      out->append(tree_name);
-      out->append(" is NULL");
-    } else
-      DBUG_PRINT("info", ("sel_tree: %s is NULL", tree_name));
-    return;
-  }
-
-  if (tree->type == SEL_TREE::IMPOSSIBLE) {
-    if (out) {
-      out->append(tree_name);
-      out->append(" is IMPOSSIBLE");
-    } else
-      DBUG_PRINT("info", ("sel_tree: %s is IMPOSSIBLE", tree_name));
-    return;
-  }
-
-  if (tree->type == SEL_TREE::ALWAYS) {
-    if (out) {
-      out->append(tree_name);
-      out->append(" is ALWAYS");
-    } else
-      DBUG_PRINT("info", ("sel_tree: %s is ALWAYS", tree_name));
-    return;
-  }
-
-  if (tree->type == SEL_TREE::MAYBE) {
-    if (out) {
-      out->append(tree_name);
-      out->append(" is MAYBE");
-    } else
-      DBUG_PRINT("info", ("sel_tree: %s is MAYBE", tree_name));
-    return;
-  }
-
-  if (!tree->merges.is_empty()) {
-    if (out) {
-      out->append(tree_name);
-      out->append(" contains the following merges");
-    } else
-      DBUG_PRINT("info", ("sel_tree: "
-                          "%s contains the following merges",
-                          tree_name));
-
-    List_iterator<SEL_IMERGE> it(tree->merges);
-    int i = 1;
-    for (SEL_IMERGE *el = it++; el; el = it++, i++) {
-      if (out) {
-        out->append("\n--- alternative ");
-        char istr[22];
-        out->append(llstr(i, istr));
-        out->append(" ---\n");
-      } else
-        DBUG_PRINT("info", ("sel_tree: --- alternative %d ---", i));
-      for (SEL_TREE **current = el->trees; current != el->trees_next; current++)
-        print_tree(out, "  merge_tree", *current, param, print_full);
-    }
-  }
-
-  for (uint i = 0; i < param->keys; i++) {
-    if (tree->keys[i] == NULL) continue;
-
-    uint real_key_nr = param->real_keynr[i];
-
-    const KEY &cur_key = param->table->key_info[real_key_nr];
-    const KEY_PART_INFO *key_part = cur_key.key_part;
-
-    /*
-      String holding the final range description from
-      append_range_all_keyparts()
-    */
-    char buff1[512];
-    buff1[0] = '\0';
-    String range_result(buff1, sizeof(buff1), system_charset_info);
-    range_result.length(0);
-
-    /*
-      Range description up to a certain keypart - used internally in
-      append_range_all_keyparts()
-    */
-    char buff2[128];
-    String range_so_far(buff2, sizeof(buff2), system_charset_info);
-    range_so_far.length(0);
-
-    append_range_all_keyparts(nullptr, &range_result, &range_so_far,
-                              tree->keys[i], key_part, print_full);
-
-    if (out) {
-      char istr[22];
-
-      out->append(tree_name);
-      out->append(" keys[");
-      out->append(llstr(i, istr));
-      out->append("]: ");
-      out->append(range_result.ptr());
-      out->append("\n");
-    } else
-      DBUG_PRINT("info", ("sel_tree: %p, type=%d, %s->keys[%u(%u)]: %s",
-                          tree->keys[i], static_cast<int>(tree->keys[i]->type),
-                          tree_name, i, real_key_nr, range_result.ptr()));
-  }
-}
-
-/*****************************************************************************
-** Print a quick range for debugging
-** TODO:
-** This should be changed to use a String to store each row instead
-** of locking the DEBUG stream !
-*****************************************************************************/
-
-#ifndef NDEBUG
-
-static void print_multiple_key_values(KEY_PART *key_part, const uchar *key,
-                                      uint used_length) {
-  char buff[1024];
-  const uchar *key_end = key + used_length;
-  String tmp(buff, sizeof(buff), &my_charset_bin);
-  uint store_length;
-  TABLE *table = key_part->field->table;
-  my_bitmap_map *old_sets[2];
-
-  dbug_tmp_use_all_columns(table, old_sets, table->read_set, table->write_set);
-
-  for (; key < key_end; key += store_length, key_part++) {
-    Field *field = key_part->field;
-    if (field->is_array())
-      field = (down_cast<Field_typed_array *>(field))->get_conv_field();
-    store_length = key_part->store_length;
-
-    if (field->is_nullable()) {
-      if (*key) {
-        if (fwrite("NULL", sizeof(char), 4, DBUG_FILE) != 4) {
-          goto restore_col_map;
-        }
-        continue;
-      }
-      key++;  // Skip null byte
-      store_length--;
-    }
-    field->set_key_image(key, key_part->length);
-    if (field->type() == MYSQL_TYPE_BIT)
-      (void)field->val_int_as_str(&tmp, true);
-    else
-      field->val_str(&tmp);
-    if (fwrite(tmp.ptr(), sizeof(char), tmp.length(), DBUG_FILE) !=
-        tmp.length()) {
-      goto restore_col_map;
-    }
-    if (key + store_length < key_end) fputc('/', DBUG_FILE);
-  }
-restore_col_map:
-  dbug_tmp_restore_column_maps(table->read_set, table->write_set, old_sets);
-}
-
-static void print_quick(QUICK_SELECT_I *quick, const Key_map *needed_reg) {
-  char buf[MAX_KEY / 8 + 1];
-  TABLE *table;
-  my_bitmap_map *old_sets[2];
-  DBUG_TRACE;
-  if (!quick) return;
-  DBUG_LOCK_FILE;
-
-  table = quick->head;
-  dbug_tmp_use_all_columns(table, old_sets, table->read_set, table->write_set);
-  quick->dbug_dump(0, true);
-  dbug_tmp_restore_column_maps(table->read_set, table->write_set, old_sets);
-
-  fprintf(DBUG_FILE, "other_keys: 0x%s:\n", needed_reg->print(buf));
-
-  DBUG_UNLOCK_FILE;
-}
-
-void QUICK_RANGE_SELECT::dbug_dump(int indent, bool verbose) {
-  /* purecov: begin inspected */
-  fprintf(DBUG_FILE, "%*squick range select, key %s, length: %d\n", indent, "",
-          head->key_info[index].name, max_used_key_length);
-
-  if (verbose) {
-    for (size_t ix = 0; ix < ranges.size(); ++ix) {
-      fprintf(DBUG_FILE, "%*s", indent + 2, "");
-      QUICK_RANGE *range = ranges[ix];
-      if (!(range->flag & NO_MIN_RANGE)) {
-        print_multiple_key_values(key_parts, range->min_key, range->min_length);
-        if (range->flag & NEAR_MIN)
-          fputs(" < ", DBUG_FILE);
-        else
-          fputs(" <= ", DBUG_FILE);
-      }
-      fputs("X", DBUG_FILE);
-
-      if (!(range->flag & NO_MAX_RANGE)) {
-        if (range->flag & NEAR_MAX)
-          fputs(" < ", DBUG_FILE);
-        else
-          fputs(" <= ", DBUG_FILE);
-        print_multiple_key_values(key_parts, range->max_key, range->max_length);
-      }
-      fputs("\n", DBUG_FILE);
-    }
-  }
-  /* purecov: end */
-}
-
-void QUICK_INDEX_MERGE_SELECT::dbug_dump(int indent, bool verbose) {
-  List_iterator_fast<QUICK_RANGE_SELECT> it(quick_selects);
-  QUICK_RANGE_SELECT *quick;
-  fprintf(DBUG_FILE, "%*squick index_merge select\n", indent, "");
-  fprintf(DBUG_FILE, "%*smerged scans {\n", indent, "");
-  while ((quick = it++)) quick->dbug_dump(indent + 2, verbose);
-  if (pk_quick_select) {
-    fprintf(DBUG_FILE, "%*sclustered PK quick:\n", indent, "");
-    pk_quick_select->dbug_dump(indent + 2, verbose);
-  }
-  fprintf(DBUG_FILE, "%*s}\n", indent, "");
-}
-
-void QUICK_ROR_INTERSECT_SELECT::dbug_dump(int indent, bool verbose) {
-  List_iterator_fast<QUICK_RANGE_SELECT> it(quick_selects);
-  QUICK_RANGE_SELECT *quick;
-  fprintf(DBUG_FILE, "%*squick ROR-intersect select, %scovering\n", indent, "",
-          need_to_fetch_row ? "" : "non-");
-  fprintf(DBUG_FILE, "%*smerged scans {\n", indent, "");
-  while ((quick = it++)) quick->dbug_dump(indent + 2, verbose);
-  if (cpk_quick) {
-    fprintf(DBUG_FILE, "%*sclustered PK quick:\n", indent, "");
-    cpk_quick->dbug_dump(indent + 2, verbose);
-  }
-  fprintf(DBUG_FILE, "%*s}\n", indent, "");
-}
-
-void QUICK_ROR_UNION_SELECT::dbug_dump(int indent, bool verbose) {
-  List_iterator_fast<QUICK_SELECT_I> it(quick_selects);
-  QUICK_SELECT_I *quick;
-  fprintf(DBUG_FILE, "%*squick ROR-union select\n", indent, "");
-  fprintf(DBUG_FILE, "%*smerged scans {\n", indent, "");
-  while ((quick = it++)) quick->dbug_dump(indent + 2, verbose);
-  fprintf(DBUG_FILE, "%*s}\n", indent, "");
-}
-
-/*
-  Print quick select information to DBUG_FILE.
-
-  SYNOPSIS
-    QUICK_GROUP_MIN_MAX_SELECT::dbug_dump()
-    indent  Indentation offset
-    verbose If true show more detailed output.
-
-  DESCRIPTION
-    Print the contents of this quick select to DBUG_FILE. The method also
-    calls dbug_dump() for the used quick select if any.
-
-  IMPLEMENTATION
-    Caller is responsible for locking DBUG_FILE before this call and unlocking
-    it afterwards.
-
-  RETURN
-    None
-*/
-
-void QUICK_GROUP_MIN_MAX_SELECT::dbug_dump(int indent, bool verbose) {
-  fprintf(DBUG_FILE,
-          "%*squick_group_min_max_query_block: index %s (%d), length: %d\n",
-          indent, "", index_info->name, index, max_used_key_length);
-  if (key_infix_len > 0) {
-    fprintf(DBUG_FILE, "%*susing key_infix with length %d:\n", indent, "",
-            key_infix_len);
-  }
-  if (quick_prefix_query_block) {
-    fprintf(DBUG_FILE, "%*susing quick_range_query_block:\n", indent, "");
-    quick_prefix_query_block->dbug_dump(indent + 2, verbose);
-  }
-  if (min_max_ranges.size() > 0) {
-    fprintf(DBUG_FILE, "%*susing %d quick_ranges for MIN/MAX:\n", indent, "",
-            static_cast<int>(min_max_ranges.size()));
-  }
-}
-
-void QUICK_SKIP_SCAN_SELECT::dbug_dump(int indent, bool verbose) {
-  fprintf(DBUG_FILE,
-          "%*squick_skip_scan_query_block: index %s (%d), length: %d\n", indent,
-          "", index_info->name, index, max_used_key_length);
-  if (eq_prefix_len > 0) {
-    fprintf(DBUG_FILE, "%*susing eq_prefix with length %d:\n", indent, "",
-            eq_prefix_len);
-  }
-
-  if (verbose) {
-    char buff1[512];
-    buff1[0] = '\0';
-    String range_result(buff1, sizeof(buff1), system_charset_info);
-
-    if (index_range_tree && eq_prefix_key_parts > 0) {
-      range_result.length(0);
-      char buff2[128];
-      String range_so_far(buff2, sizeof(buff2), system_charset_info);
-      range_so_far.length(0);
-      append_range_all_keyparts(nullptr, &range_result, &range_so_far,
-                                index_range_tree, index_info->key_part, false);
-      fprintf(DBUG_FILE, "Prefix ranges: %s\n", range_result.c_ptr());
-    }
-
-    {
-      range_result.length(0);
-      append_range(&range_result, range_key_part, min_range_key, max_range_key,
-                   range_cond_flag);
-      fprintf(DBUG_FILE, "Range: %s\n", range_result.c_ptr());
-    }
-  }
-}
-
-#endif /* !NDEBUG */
diff -Nru mysql-8.0-8.0.26/sql/opt_range.h mysql-8.0-8.0.27/sql/opt_range.h
--- mysql-8.0-8.0.26/sql/opt_range.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/opt_range.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,1168 +0,0 @@
-/* Copyright (c) 2000, 2021, Oracle 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,
-   as published by the Free Software Foundation.
-
-   This program is also distributed with certain software (including
-   but not limited to OpenSSL) that is licensed under separate terms,
-   as designated in a particular file or component or in included license
-   documentation.  The authors of MySQL hereby grant you an additional
-   permission to link the program and your derivative works with the
-   separately licensed software that they have included with MySQL.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License, version 2.0, for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
-
-/* classes to use when handling where clause */
-
-#ifndef _opt_range_h
-#define _opt_range_h
-
-#include <sys/types.h>
-
-#include <algorithm>
-#include <memory>
-#include <vector>
-
-#include "m_string.h"
-#include "my_alloc.h"
-#include "my_base.h"
-#include "my_bitmap.h"
-#include "my_compiler.h"
-#include "my_dbug.h"
-#include "my_inttypes.h"
-#include "my_table_map.h"
-#include "prealloced_array.h"  // Prealloced_array
-#include "priority_queue.h"    // Priority_queue
-#include "sql/field.h"         // Field
-#include "sql/handler.h"
-#include "sql/item_func.h"
-#include "sql/key.h"
-#include "sql/key_spec.h"
-#include "sql/malloc_allocator.h"  // IWYU pragma: keep
-#include "sql/sql_bitmap.h"
-#include "sql/sql_const.h"
-#include "sql/sql_list.h"
-#include "sql/table.h"
-#include "sql_string.h"
-
-class Item;
-class Item_sum;
-class JOIN;
-class Opt_trace_context;
-class RowIterator;
-class THD;
-class Unique;
-
-struct KEY_PART {
-  uint16 key, part;
-  /* See KEY_PART_INFO for meaning of the next two: */
-  uint16 store_length, length;
-  uint8 null_bit;
-  /*
-    Keypart flags (0 when this structure is used by partition pruning code
-    for fake partitioning index description)
-  */
-  uint16 flag;
-  Field *field;
-  Field::imagetype image_type;
-};
-
-class QUICK_RANGE {
- public:
-  uchar *min_key, *max_key;
-  uint16 min_length, max_length;
-
-  /// Stores bitwise-or'ed bits defined in enum key_range_flags.
-  uint16 flag;
-
-  /**
-    Stores one of the HA_READ_MBR_XXX items in enum ha_rkey_function, only
-    effective when flag has a GEOM_FLAG bit.
-  */
-  enum ha_rkey_function rkey_func_flag;
-  key_part_map min_keypart_map,  // bitmap of used keyparts in min_key
-      max_keypart_map;           // bitmap of used keyparts in max_key
-
-  QUICK_RANGE(); /* Full range */
-  QUICK_RANGE(const uchar *min_key_arg, uint min_length_arg,
-              key_part_map min_keypart_map_arg, const uchar *max_key_arg,
-              uint max_length_arg, key_part_map max_keypart_map_arg,
-              uint flag_arg, enum ha_rkey_function rkey_func);
-
-  /**
-     Initalizes a key_range object for communication with storage engine.
-
-     This function facilitates communication with the Storage Engine API by
-     translating the minimum endpoint of the interval represented by this
-     QUICK_RANGE into an index range endpoint specifier for the engine.
-
-     @param kr Pointer to an uninitialized key_range C struct.
-
-     @param prefix_length The length of the search key prefix to be used for
-     lookup.
-
-     @param keypart_map A set (bitmap) of keyparts to be used.
-  */
-  void make_min_endpoint(key_range *kr, uint prefix_length,
-                         key_part_map keypart_map) {
-    make_min_endpoint(kr);
-    kr->length = std::min(kr->length, prefix_length);
-    kr->keypart_map &= keypart_map;
-  }
-
-  /**
-     Initalizes a key_range object for communication with storage engine.
-
-     This function facilitates communication with the Storage Engine API by
-     translating the minimum endpoint of the interval represented by this
-     QUICK_RANGE into an index range endpoint specifier for the engine.
-
-     @param kr Pointer to an uninitialized key_range C struct.
-  */
-  void make_min_endpoint(key_range *kr) {
-    kr->key = (const uchar *)min_key;
-    kr->length = min_length;
-    kr->keypart_map = min_keypart_map;
-    kr->flag = ((flag & NEAR_MIN) ? HA_READ_AFTER_KEY
-                                  : (flag & EQ_RANGE) ? HA_READ_KEY_EXACT
-                                                      : HA_READ_KEY_OR_NEXT);
-  }
-
-  /**
-     Initalizes a key_range object for communication with storage engine.
-
-     This function facilitates communication with the Storage Engine API by
-     translating the maximum endpoint of the interval represented by this
-     QUICK_RANGE into an index range endpoint specifier for the engine.
-
-     @param kr Pointer to an uninitialized key_range C struct.
-
-     @param prefix_length The length of the search key prefix to be used for
-     lookup.
-
-     @param keypart_map A set (bitmap) of keyparts to be used.
-  */
-  void make_max_endpoint(key_range *kr, uint prefix_length,
-                         key_part_map keypart_map) {
-    make_max_endpoint(kr);
-    kr->length = std::min(kr->length, prefix_length);
-    kr->keypart_map &= keypart_map;
-  }
-
-  /**
-     Initalizes a key_range object for communication with storage engine.
-
-     This function facilitates communication with the Storage Engine API by
-     translating the maximum endpoint of the interval represented by this
-     QUICK_RANGE into an index range endpoint specifier for the engine.
-
-     @param kr Pointer to an uninitialized key_range C struct.
-  */
-  void make_max_endpoint(key_range *kr) {
-    kr->key = (const uchar *)max_key;
-    kr->length = max_length;
-    kr->keypart_map = max_keypart_map;
-    /*
-      We use READ_AFTER_KEY here because if we are reading on a key
-      prefix we want to find all keys with this prefix
-    */
-    kr->flag = (flag & NEAR_MAX ? HA_READ_BEFORE_KEY : HA_READ_AFTER_KEY);
-  }
-};
-
-/*
-  Quick select interface.
-  This class is a parent for all QUICK_*_SELECT classes.
-
-  The usage scenario is as follows:
-  1. Create quick select
-    quick= new QUICK_XXX_SELECT(...);
-
-  2. Perform lightweight initialization. This can be done in 2 ways:
-  2.a: Regular initialization
-    if (quick->init())
-    {
-      //the only valid action after failed init() call is delete
-      delete quick;
-    }
-  2.b: Special initialization for quick selects merged by QUICK_ROR_*_SELECT
-    if (quick->init_ror_merged_scan())
-      delete quick;
-
-  3. Perform zero, one, or more scans.
-    while (...)
-    {
-      // initialize quick select for scan. This may allocate
-      // buffers and/or prefetch rows.
-      if (quick->reset())
-      {
-        //the only valid action after failed reset() call is delete
-        delete quick;
-        //abort query
-      }
-
-      // perform the scan
-      do
-      {
-        res= quick->get_next();
-      } while (res && ...)
-    }
-
-  4. Delete the select:
-    delete quick;
-
-  NOTE
-    quick select doesn't use MEM_ROOT allocation because "range
-    checked for each record" functionality may create/destroy
-    O(#records_in_some_table) quick selects during query execution.
-    See Bug#18684036 ELIMINATE LAST FEW HEAP USAGE FROM THE
-    RANGE OPTIMIZER.
-*/
-
-class QUICK_SELECT_I {
- public:
-  ha_rows records;         /* estimate of # of records to be retrieved */
-  Cost_estimate cost_est;  ///> cost to perform this retrieval
-  TABLE *head;
-  /*
-    Index this quick select uses, or MAX_KEY for quick selects
-    that use several indexes
-  */
-  uint index;
-
-  /*
-    Total length of first used_key_parts parts of the key.
-    Applicable if index!= MAX_KEY.
-  */
-  uint max_used_key_length;
-
-  /*
-    Max. number of (first) key parts this quick select uses for retrieval.
-    eg. for "(key1p1=c1 AND key1p2=c2) OR key1p1=c2" used_key_parts == 2.
-    Applicable if index!= MAX_KEY.
-
-    For QUICK_GROUP_MIN_MAX_SELECT it includes MIN/MAX argument keyparts.
-  */
-  uint used_key_parts;
-  /**
-    true if creation of the object is forced by the hint.
-    The flag is used to skip ref evaluation in find_best_ref() function.
-    It also enables using of QUICK_SELECT object in
-    Optimize_table_order::best_access_path() regardless of the evaluation cost.
-  */
-  bool forced_by_hint;
-
-  QUICK_SELECT_I();
-  QUICK_SELECT_I(const QUICK_SELECT_I &) = default;
-  virtual ~QUICK_SELECT_I() = default;
-
-  /*
-    Do post-constructor initialization.
-    SYNOPSIS
-      init()
-
-    init() performs initializations that should have been in constructor if
-    it was possible to return errors from constructors. The join optimizer may
-    create and then delete quick selects without retrieving any rows so init()
-    must not contain any IO or CPU intensive code.
-
-    If init() call fails the only valid action is to delete this quick select,
-    reset() and get_next() must not be called.
-
-    RETURN
-      0      OK
-      other  Error code
-  */
-  virtual int init() = 0;
-
-  /*
-    Initialize quick select for row retrieval.
-    SYNOPSIS
-      reset()
-
-    reset() should be called when it is certain that row retrieval will be
-    necessary. This call may do heavyweight initialization like buffering first
-    N records etc. If reset() call fails get_next() must not be called.
-    Note that reset() may be called several times if
-     * the quick select is executed in a subselect
-     * a JOIN buffer is used
-
-    RETURN
-      0      OK
-      other  Error code
-  */
-  virtual int reset(void) = 0;
-
-  virtual int get_next() = 0; /* get next record to retrieve */
-
-  /* Range end should be called when we have looped over the whole index */
-  virtual void range_end() {}
-
-  /**
-    Whether the range access method returns records in reverse order.
-  */
-  virtual bool reverse_sorted() const = 0;
-  /**
-    Whether the range access method is capable of returning records
-    in reverse order.
-  */
-  virtual bool reverse_sort_possible() const = 0;
-  virtual bool unique_key_range() { return false; }
-  virtual bool clustered_pk_range() { return false; }
-
-  /*
-    Request that this quick select produces sorted output.
-    Not all quick selects can provide sorted output, the caller is responsible
-    for calling this function only for those quick selects that can.
-    The implementation is also allowed to provide sorted output even if it
-    was not requested if benificial, or required by implementation
-    internals.
-  */
-  virtual void need_sorted_output() = 0;
-  enum {
-    QS_TYPE_RANGE = 0,
-    QS_TYPE_INDEX_MERGE = 1,
-    QS_TYPE_RANGE_DESC = 2,
-    QS_TYPE_FULLTEXT = 3,
-    QS_TYPE_ROR_INTERSECT = 4,
-    QS_TYPE_ROR_UNION = 5,
-    QS_TYPE_GROUP_MIN_MAX = 6,
-    QS_TYPE_SKIP_SCAN = 7
-  };
-
-  /* Get type of this quick select - one of the QS_TYPE_* values */
-  virtual int get_type() const = 0;
-  virtual bool is_loose_index_scan() const = 0;
-  virtual bool is_agg_loose_index_scan() const = 0;
-
-  /*
-    Initialize this quick select as a merged scan inside a ROR-union or a ROR-
-    intersection scan. The caller must not additionally call init() if this
-    function is called.
-    SYNOPSIS
-      init_ror_merged_scan()
-        reuse_handler  If true, the quick select may use table->handler,
-                       otherwise it must create and use a separate handler
-                       object.
-    RETURN
-      0     Ok
-      other Error
-  */
-  virtual int init_ror_merged_scan(bool reuse_handler MY_ATTRIBUTE((unused))) {
-    assert(0);
-    return 1;
-  }
-
-  /*
-    Save ROWID of last retrieved row in file->ref. This used in ROR-merging.
-  */
-  virtual void save_last_pos() {}
-
-  /*
-    Append comma-separated list of keys this quick select uses to key_names;
-    append comma-separated list of corresponding used lengths to used_lengths.
-    This is used by select_describe.
-  */
-  virtual void add_keys_and_lengths(String *key_names,
-                                    String *used_lengths) = 0;
-
-  /*
-    Append text representation of quick select structure (what and how is
-    merged) to str. The result is added to "Extra" field in EXPLAIN output.
-    This function is implemented only by quick selects that merge other quick
-    selects output and/or can produce output suitable for merging.
-  */
-  virtual void add_info_string(String *str MY_ATTRIBUTE((unused))) {}
-  /*
-    Return 1 if any index used by this quick select
-    uses field which is marked in passed bitmap.
-  */
-  virtual bool is_keys_used(const MY_BITMAP *fields);
-
-  /**
-    Simple sanity check that the quick select has been set up
-    correctly. Function is overridden by quick selects that merge
-    indices.
-   */
-  virtual bool is_valid() { return index != MAX_KEY; }
-
-  /*
-    rowid of last row retrieved by this quick select. This is used only when
-    doing ROR-index_merge selects
-  */
-  uchar *last_rowid;
-
-  /*
-    Table record buffer used by this quick select.
-  */
-  uchar *record;
-#ifndef NDEBUG
-  /*
-    Print quick select information to DBUG_FILE. Caller is responsible
-    for locking DBUG_FILE before this call and unlocking it afterwards.
-  */
-  virtual void dbug_dump(int indent, bool verbose) = 0;
-#endif
-
-  /*
-    Returns a QUICK_SELECT with reverse order of to the index.
-  */
-  virtual QUICK_SELECT_I *make_reverse(
-      uint used_key_parts_arg MY_ATTRIBUTE((unused))) {
-    return nullptr;
-  }
-  virtual void set_handler(handler *file_arg MY_ATTRIBUTE((unused))) {}
-
-  /**
-    Get the fields used by the range access method.
-
-    @param[out] used_fields Bitmap of fields that this range access
-                            method uses.
-  */
-  virtual void get_fields_used(MY_BITMAP *used_fields) = 0;
-  void trace_quick_description(Opt_trace_context *trace);
-};
-
-class PARAM;
-class SEL_ARG;
-class SEL_ROOT;
-
-typedef Prealloced_array<QUICK_RANGE *, 16> Quick_ranges;
-typedef Prealloced_array<Quick_ranges *, 16> Quick_ranges_array;
-
-/*
-  MRR range sequence, array<QUICK_RANGE> implementation: sequence traversal
-  context.
-*/
-struct QUICK_RANGE_SEQ_CTX {
-  Quick_ranges::const_iterator first;
-  Quick_ranges::const_iterator cur;
-  Quick_ranges::const_iterator last;
-};
-
-range_seq_t quick_range_seq_init(void *init_param, uint n_ranges, uint flags);
-uint quick_range_seq_next(range_seq_t rseq, KEY_MULTI_RANGE *range);
-
-/*
-  Quick select that does a range scan on a single key. The records are
-  returned in key order if ::need_sorted_output() has been called.
-*/
-class QUICK_RANGE_SELECT : public QUICK_SELECT_I {
- protected:
-  handler *file;
-  /* Members to deal with case when this quick select is a ROR-merged scan */
-  bool in_ror_merged_scan;
-
-  // TODO: pre-allocate space to avoid malloc/free for small number of columns.
-  MY_BITMAP column_bitmap;
-
-  friend class TRP_ROR_INTERSECT;
-  friend bool get_quick_keys(PARAM *param, QUICK_RANGE_SELECT *quick,
-                             KEY_PART *key, SEL_ARG *key_tree, uchar *min_key,
-                             uint min_key_flag, uchar *max_key,
-                             uint max_key_flag, uint *desc_flag,
-                             uint num_key_parts);
-  friend QUICK_RANGE_SELECT *get_quick_select(PARAM *, uint idx,
-                                              SEL_ROOT *key_tree,
-                                              uint mrr_flags, uint mrr_buf_size,
-                                              MEM_ROOT *alloc,
-                                              uint num_key_parts);
-  friend uint quick_range_seq_next(range_seq_t rseq, KEY_MULTI_RANGE *range);
-  friend range_seq_t quick_range_seq_init(void *init_param, uint n_ranges,
-                                          uint flags);
-  friend class QUICK_SELECT_DESC;
-  friend class QUICK_INDEX_MERGE_SELECT;
-  friend class QUICK_ROR_INTERSECT_SELECT;
-  friend class QUICK_GROUP_MIN_MAX_SELECT;
-
-  Quick_ranges ranges; /* ordered array of range ptrs */
-  bool free_file;      /* TRUE <=> this->file is "owned" by this quick select */
-
-  /* Range pointers to be used when not using MRR interface */
-  QUICK_RANGE **cur_range; /* current element in ranges  */
-  QUICK_RANGE *last_range;
-
-  /* Members needed to use the MRR interface */
-  QUICK_RANGE_SEQ_CTX qr_traversal_ctx;
-
- public:
-  uint mrr_flags; /* Flags to be used with MRR interface */
- protected:
-  uint mrr_buf_size; /* copy from thd->variables.read_rnd_buff_size */
-  HANDLER_BUFFER *mrr_buf_desc; /* the handler buffer */
-
-  /* Info about index we're scanning */
-  KEY_PART *key_parts;
-  KEY_PART_INFO *key_part_info;
-
-  bool dont_free; /* Used by QUICK_SELECT_DESC */
-
-  int cmp_next(QUICK_RANGE *range);
-  int cmp_prev(QUICK_RANGE *range);
-  bool row_in_ranges();
-
- public:
-  std::shared_ptr<MEM_ROOT> alloc;
-
-  QUICK_RANGE_SELECT(THD *thd, TABLE *table, uint index_arg, bool no_alloc,
-                     MEM_ROOT *parent_alloc, bool *create_error);
-  ~QUICK_RANGE_SELECT() override;
-
-  void need_sorted_output() override;
-  int init() override;
-  int reset(void) override;
-  int get_next() override;
-  void range_end() override;
-  int get_next_prefix(uint prefix_length, uint group_key_parts,
-                      uchar *cur_prefix);
-  bool reverse_sorted() const override { return false; }
-  bool reverse_sort_possible() const override { return true; }
-  bool unique_key_range() override;
-  int init_ror_merged_scan(bool reuse_handler) override;
-  void save_last_pos() override { file->position(record); }
-  int get_type() const override { return QS_TYPE_RANGE; }
-  bool is_loose_index_scan() const override { return false; }
-  bool is_agg_loose_index_scan() const override { return false; }
-  void add_keys_and_lengths(String *key_names, String *used_lengths) override;
-  void add_info_string(String *str) override;
-#ifndef NDEBUG
-  void dbug_dump(int indent, bool verbose) override;
-#endif
-  QUICK_SELECT_I *make_reverse(uint used_key_parts_arg) override;
-  void set_handler(handler *file_arg) override { file = file_arg; }
-
-  void get_fields_used(MY_BITMAP *used_fields) override {
-    for (uint i = 0; i < used_key_parts; i++)
-      bitmap_set_bit(used_fields, key_parts[i].field->field_index());
-  }
-
- private:
-  /* Default copy ctor used by QUICK_SELECT_DESC */
-  QUICK_RANGE_SELECT(const QUICK_RANGE_SELECT &) = default;
-};
-
-class QUICK_RANGE_SELECT_GEOM : public QUICK_RANGE_SELECT {
- public:
-  QUICK_RANGE_SELECT_GEOM(THD *thd, TABLE *table, uint index_arg, bool no_alloc,
-                          MEM_ROOT *parent_alloc, bool *create_error)
-      : QUICK_RANGE_SELECT(thd, table, index_arg, no_alloc, parent_alloc,
-                           create_error) {}
-  int get_next() override;
-};
-
-/*
-  QUICK_INDEX_MERGE_SELECT - index_merge access method quick select.
-
-    QUICK_INDEX_MERGE_SELECT uses
-     * QUICK_RANGE_SELECTs to get rows
-     * Unique class to remove duplicate rows
-
-  INDEX MERGE OPTIMIZER
-    Current implementation doesn't detect all cases where index_merge could
-    be used, in particular:
-     * index_merge will never be used if range scan is possible (even if
-       range scan is more expensive)
-
-     * index_merge+'using index' is not supported (this the consequence of
-       the above restriction)
-
-     * If WHERE part contains complex nested AND and OR conditions, some ways
-       to retrieve rows using index_merge will not be considered. The choice
-       of read plan may depend on the order of conjuncts/disjuncts in WHERE
-       part of the query, see comments near imerge_list_or_list and
-       SEL_IMERGE::or_sel_tree_with_checks functions for details.
-
-     * There is no "index_merge_ref" method (but index_merge on non-first
-       table in join is possible with 'range checked for each record').
-
-    See comments around SEL_IMERGE class and test_quick_select for more
-    details.
-
-  ROW RETRIEVAL ALGORITHM
-
-    index_merge uses Unique class for duplicates removal.  index_merge takes
-    advantage of Clustered Primary Key (CPK) if the table has one.
-    The index_merge algorithm consists of two phases:
-
-    Phase 1 (implemented in QUICK_INDEX_MERGE_SELECT::prepare_unique):
-    prepare()
-    {
-      activate 'index only';
-      while(retrieve next row for non-CPK scan)
-      {
-        if (there is a CPK scan and row will be retrieved by it)
-          skip this row;
-        else
-          put its rowid into Unique;
-      }
-      deactivate 'index only';
-    }
-
-    Phase 2 (implemented as sequence of QUICK_INDEX_MERGE_SELECT::get_next
-    calls):
-
-    fetch()
-    {
-      retrieve all rows from row pointers stored in Unique;
-      free Unique;
-      retrieve all rows for CPK scan;
-    }
-*/
-
-class QUICK_INDEX_MERGE_SELECT : public QUICK_SELECT_I {
-  Unique *unique;
-
- public:
-  QUICK_INDEX_MERGE_SELECT(THD *thd, TABLE *table);
-  ~QUICK_INDEX_MERGE_SELECT() override;
-
-  int init() override;
-  void need_sorted_output() override { assert(false); /* Can't do it */ }
-  int reset(void) override;
-  int get_next() override;
-  bool reverse_sorted() const override { return false; }
-  bool reverse_sort_possible() const override { return false; }
-  bool unique_key_range() override { return false; }
-  int get_type() const override { return QS_TYPE_INDEX_MERGE; }
-  bool is_loose_index_scan() const override { return false; }
-  bool is_agg_loose_index_scan() const override { return false; }
-  void add_keys_and_lengths(String *key_names, String *used_lengths) override;
-  void add_info_string(String *str) override;
-  bool is_keys_used(const MY_BITMAP *fields) override;
-#ifndef NDEBUG
-  void dbug_dump(int indent, bool verbose) override;
-#endif
-
-  bool push_quick_back(QUICK_RANGE_SELECT *quick_sel_range);
-
-  /* range quick selects this index_merge read consists of */
-  List<QUICK_RANGE_SELECT> quick_selects;
-
-  /* quick select that uses clustered primary key (NULL if none) */
-  QUICK_RANGE_SELECT *pk_quick_select;
-
-  /* true if this select is currently doing a clustered PK scan */
-  bool doing_pk_scan;
-
-  MEM_ROOT alloc;
-  THD *thd;
-  int read_keys_and_merge();
-
-  bool clustered_pk_range() override { return pk_quick_select; }
-
-  bool is_valid() override {
-    List_iterator_fast<QUICK_RANGE_SELECT> it(quick_selects);
-    QUICK_RANGE_SELECT *quick;
-    bool valid = true;
-    while ((quick = it++)) {
-      if (!quick->is_valid()) {
-        valid = false;
-        break;
-      }
-    }
-    return valid;
-  }
-
-  void get_fields_used(MY_BITMAP *used_fields) override {
-    List_iterator_fast<QUICK_RANGE_SELECT> it(quick_selects);
-    QUICK_RANGE_SELECT *quick;
-    while ((quick = it++)) quick->get_fields_used(used_fields);
-
-    if (pk_quick_select) pk_quick_select->get_fields_used(used_fields);
-  }
-
-  /* used to get rows collected in Unique */
-  unique_ptr_destroy_only<RowIterator> read_record;
-};
-
-/*
-  Rowid-Ordered Retrieval (ROR) index intersection quick select.
-  This quick select produces intersection of row sequences returned
-  by several QUICK_RANGE_SELECTs it "merges".
-
-  All merged QUICK_RANGE_SELECTs must return rowids in rowid order.
-  QUICK_ROR_INTERSECT_SELECT will return rows in rowid order, too.
-
-  All merged quick selects retrieve {rowid, covered_fields} tuples (not full
-  table records).
-  QUICK_ROR_INTERSECT_SELECT retrieves full records if it is not being used
-  by QUICK_ROR_INTERSECT_SELECT and all merged quick selects together don't
-  cover needed all fields.
-
-  If one of the merged quick selects is a Clustered PK range scan, it is
-  used only to filter rowid sequence produced by other merged quick selects.
-*/
-
-class QUICK_ROR_INTERSECT_SELECT : public QUICK_SELECT_I {
- public:
-  QUICK_ROR_INTERSECT_SELECT(THD *thd, TABLE *table, bool retrieve_full_rows,
-                             MEM_ROOT *parent_alloc);
-  ~QUICK_ROR_INTERSECT_SELECT() override;
-
-  int init() override;
-  void need_sorted_output() override { assert(false); /* Can't do it */ }
-  int reset(void) override;
-  int get_next() override;
-  bool reverse_sorted() const override { return false; }
-  bool reverse_sort_possible() const override { return false; }
-  bool unique_key_range() override { return false; }
-  int get_type() const override { return QS_TYPE_ROR_INTERSECT; }
-  bool is_loose_index_scan() const override { return false; }
-  bool is_agg_loose_index_scan() const override { return false; }
-  void add_keys_and_lengths(String *key_names, String *used_lengths) override;
-  void add_info_string(String *str) override;
-  bool is_keys_used(const MY_BITMAP *fields) override;
-#ifndef NDEBUG
-  void dbug_dump(int indent, bool verbose) override;
-#endif
-  int init_ror_merged_scan(bool reuse_handler) override;
-  bool push_quick_back(QUICK_RANGE_SELECT *quick_sel_range);
-
-  /*
-    Range quick selects this intersection consists of, not including
-    cpk_quick.
-  */
-  List<QUICK_RANGE_SELECT> quick_selects;
-
-  bool is_valid() override {
-    List_iterator_fast<QUICK_RANGE_SELECT> it(quick_selects);
-    QUICK_RANGE_SELECT *quick;
-    bool valid = true;
-    while ((quick = it++)) {
-      if (!quick->is_valid()) {
-        valid = false;
-        break;
-      }
-    }
-    return valid;
-  }
-
-  void get_fields_used(MY_BITMAP *used_fields) override {
-    List_iterator_fast<QUICK_RANGE_SELECT> it(quick_selects);
-    QUICK_RANGE_SELECT *quick;
-    while ((quick = it++)) quick->get_fields_used(used_fields);
-  }
-
-  /*
-    Merged quick select that uses Clustered PK, if there is one. This quick
-    select is not used for row retrieval, it is used for row retrieval.
-  */
-  QUICK_RANGE_SELECT *cpk_quick;
-
-  MEM_ROOT alloc; /* Memory pool for this and merged quick selects data. */
-  THD *thd;       /* current thread */
-  bool need_to_fetch_row; /* if true, do retrieve full table records. */
-  /* in top-level quick select, true if merged scans where initialized */
-  bool scans_inited;
-};
-
-/*
-  Comparison function to be used QUICK_ROR_UNION_SELECT::queue priority
-  queue.
-*/
-struct Quick_ror_union_less {
-  explicit Quick_ror_union_less(const QUICK_SELECT_I *me) : m_me(me) {}
-  bool operator()(QUICK_SELECT_I *a, QUICK_SELECT_I *b) {
-    return m_me->head->file->cmp_ref(a->last_rowid, b->last_rowid) > 0;
-  }
-  const QUICK_SELECT_I *m_me;
-};
-
-/*
-  Rowid-Ordered Retrieval index union select.
-  This quick select produces union of row sequences returned by several
-  quick select it "merges".
-
-  All merged quick selects must return rowids in rowid order.
-  QUICK_ROR_UNION_SELECT will return rows in rowid order, too.
-
-  All merged quick selects are set not to retrieve full table records.
-  ROR-union quick select always retrieves full records.
-
-*/
-
-class QUICK_ROR_UNION_SELECT : public QUICK_SELECT_I {
- public:
-  QUICK_ROR_UNION_SELECT(THD *thd, TABLE *table);
-  ~QUICK_ROR_UNION_SELECT() override;
-
-  int init() override;
-  void need_sorted_output() override { assert(false); /* Can't do it */ }
-  int reset(void) override;
-  int get_next() override;
-  bool reverse_sorted() const override { return false; }
-  bool reverse_sort_possible() const override { return false; }
-  bool unique_key_range() override { return false; }
-  int get_type() const override { return QS_TYPE_ROR_UNION; }
-  bool is_loose_index_scan() const override { return false; }
-  bool is_agg_loose_index_scan() const override { return false; }
-  void add_keys_and_lengths(String *key_names, String *used_lengths) override;
-  void add_info_string(String *str) override;
-  bool is_keys_used(const MY_BITMAP *fields) override;
-#ifndef NDEBUG
-  void dbug_dump(int indent, bool verbose) override;
-#endif
-
-  bool push_quick_back(QUICK_SELECT_I *quick_sel_range);
-
-  List<QUICK_SELECT_I> quick_selects; /* Merged quick selects */
-
-  bool is_valid() override {
-    List_iterator_fast<QUICK_SELECT_I> it(quick_selects);
-    QUICK_SELECT_I *quick;
-    bool valid = true;
-    while ((quick = it++)) {
-      if (!quick->is_valid()) {
-        valid = false;
-        break;
-      }
-    }
-    return valid;
-  }
-
-  void get_fields_used(MY_BITMAP *used_fields) override {
-    List_iterator_fast<QUICK_SELECT_I> it(quick_selects);
-    QUICK_SELECT_I *quick;
-    while ((quick = it++)) quick->get_fields_used(used_fields);
-  }
-
-  Priority_queue<
-      QUICK_SELECT_I *,
-      std::vector<QUICK_SELECT_I *, Malloc_allocator<QUICK_SELECT_I *>>,
-      Quick_ror_union_less>
-      queue;      /* Priority queue for merge operation */
-  MEM_ROOT alloc; /* Memory pool for this and merged quick selects data. */
-
-  THD *thd;             /* current thread */
-  uchar *cur_rowid;     /* buffer used in get_next() */
-  uchar *prev_rowid;    /* rowid of last row returned by get_next() */
-  bool have_prev_rowid; /* true if prev_rowid has valid data */
-  uint rowid_length;    /* table rowid length */
-
- private:
-  bool scans_inited;
-};
-
-/*
-  Index scan for GROUP-BY queries with MIN/MAX aggregate functions.
-
-  This class provides a specialized index access method for GROUP-BY queries
-  of the forms:
-
-       SELECT A_1,...,A_k, [B_1,...,B_m], [MIN(C)], [MAX(C)]
-         FROM T
-        WHERE [RNG(A_1,...,A_p ; where p <= k)]
-         [AND EQ(B_1,...,B_m)]
-         [AND PC(C)]
-         [AND PA(A_i1,...,A_iq)]
-       GROUP BY A_1,...,A_k;
-
-    or
-
-       SELECT DISTINCT A_i1,...,A_ik
-         FROM T
-        WHERE [RNG(A_1,...,A_p ; where p <= k)]
-         [AND PA(A_i1,...,A_iq)];
-
-  where all selected fields are parts of the same index.
-  The class of queries that can be processed by this quick select is fully
-  specified in the description of get_best_trp_group_min_max() in opt_range.cc.
-
-  The get_next() method directly produces result tuples, thus obviating the
-  need to call end_send_group() because all grouping is already done inside
-  get_next().
-
-  Since one of the requirements is that all select fields are part of the same
-  index, this class produces only index keys, and not complete records.
-*/
-
-class QUICK_GROUP_MIN_MAX_SELECT : public QUICK_SELECT_I {
- private:
-  JOIN *join;          /* Descriptor of the current query */
-  KEY *index_info;     /* The index chosen for data access */
-  uchar *tmp_record;   /* Temporary storage for next_min(), next_max(). */
-  uchar *group_prefix; /* Key prefix consisting of the GROUP fields. */
-  const uint group_prefix_len; /* Length of the group prefix. */
-  uint group_key_parts;        /* A number of keyparts in the group prefix */
-  uchar *last_prefix;          /* Prefix of the last group for detecting EOF. */
-  bool have_min;               /* Specify whether we are computing */
-  bool have_max;               /*   a MIN, a MAX, or both.         */
-  bool have_agg_distinct;      /*   aggregate_function(DISTINCT ...).  */
-  bool seen_first_key;         /* Denotes whether the first key was retrieved.*/
-  KEY_PART_INFO *min_max_arg_part; /* The keypart of the only argument field */
-                                   /* of all MIN/MAX functions.              */
-  uint min_max_arg_len;     /* The length of the MIN/MAX argument field */
-  bool min_max_keypart_asc; /* TRUE if min_max key part is ascending. */
-  uint key_infix_len;
-  uint key_infix_parts; /* Indicates the number infix attributes */
-  // The current infix range position (in key_infix_ranges) used for row
-  // retrieval.
-  uint cur_infix_range_position[MAX_REF_PARTS];
-  // Indicates if all infix ranges have been used to retrieve rows (all ranges
-  // in key_infix_ranges)
-  bool seen_all_infix_ranges;
-  Quick_ranges min_max_ranges; /* Array of range ptrs for the MIN/MAX field. */
-  Quick_ranges_array key_infix_ranges; /* Array of key infix range arrays.   */
-  uint real_prefix_len; /* Length of key prefix extended with key_infix. */
-  uint real_key_parts;  /* A number of keyparts in the above value.      */
-  List<Item_sum> *min_functions;
-  List<Item_sum> *max_functions;
-  List_iterator<Item_sum> *min_functions_it;
-  List_iterator<Item_sum> *max_functions_it;
-  /*
-    Use index scan to get the next different key instead of jumping into it
-    through index read
-  */
-  bool is_index_scan;
-
- public:
-  /*
-    The following two members are public to allow easy access from
-    TRP_GROUP_MIN_MAX::make_quick()
-  */
-  MEM_ROOT alloc; /* Memory pool for this and quick_prefix_query_block data. */
-  QUICK_RANGE_SELECT
-  *quick_prefix_query_block; /* For retrieval of group prefixes. */
- private:
-  int next_prefix();
-  bool append_next_infix();
-  void reset_group();
-  int next_min_in_range();
-  int next_max_in_range();
-  int next_min();
-  int next_max();
-  void update_min_result(bool *reset);
-  void update_max_result(bool *reset);
-
- public:
-  QUICK_GROUP_MIN_MAX_SELECT(TABLE *table, JOIN *join, bool have_min,
-                             bool have_max, bool have_agg_distinct,
-                             KEY_PART_INFO *min_max_arg_part,
-                             uint group_prefix_len, uint group_key_parts,
-                             uint used_key_parts, KEY *index_info,
-                             uint use_index, const Cost_estimate *cost_est,
-                             ha_rows records, uint key_infix_len,
-                             MEM_ROOT *parent_alloc, bool is_index_scan);
-  ~QUICK_GROUP_MIN_MAX_SELECT() override;
-  bool add_range(SEL_ARG *sel_range, int idx);
-  void update_key_stat();
-  void adjust_prefix_ranges();
-  int init() override;
-  void need_sorted_output() override { /* always do it */
-  }
-  int reset() override;
-  int get_next() override;
-  bool reverse_sorted() const override { return false; }
-  bool reverse_sort_possible() const override { return false; }
-  bool unique_key_range() override { return false; }
-  int get_type() const override { return QS_TYPE_GROUP_MIN_MAX; }
-  bool is_loose_index_scan() const override { return true; }
-  bool is_agg_loose_index_scan() const override { return is_agg_distinct(); }
-  void add_keys_and_lengths(String *key_names, String *used_lengths) override;
-#ifndef NDEBUG
-  void dbug_dump(int indent, bool verbose) override;
-#endif
-  bool is_agg_distinct() const { return have_agg_distinct; }
-  virtual void append_loose_scan_type(String *str) {
-    if (is_index_scan) str->append(STRING_WITH_LEN("scanning"));
-  }
-
-  void get_fields_used(MY_BITMAP *used_fields) override {
-    for (uint i = 0; i < used_key_parts; i++)
-      bitmap_set_bit(used_fields, index_info->key_part[i].field->field_index());
-  }
-  void add_info_string(String *str) override;
-};
-
-class QUICK_SELECT_DESC : public QUICK_RANGE_SELECT {
- public:
-  QUICK_SELECT_DESC(QUICK_RANGE_SELECT *q, uint used_key_parts);
-  int get_next() override;
-  bool reverse_sorted() const override { return true; }
-  bool reverse_sort_possible() const override { return true; }
-  int get_type() const override { return QS_TYPE_RANGE_DESC; }
-  bool is_loose_index_scan() const override { return false; }
-  bool is_agg_loose_index_scan() const override { return false; }
-  QUICK_SELECT_I *make_reverse(uint) override {
-    return this;  // is already reverse sorted
-  }
-
- private:
-  bool range_reads_after_key(QUICK_RANGE *range);
-  int reset(void) override {
-    rev_it.rewind();
-    return QUICK_RANGE_SELECT::reset();
-  }
-  List<QUICK_RANGE> rev_ranges;
-  List_iterator<QUICK_RANGE> rev_it;
-  uint m_used_key_parts;
-};
-
-/*
-  Index scan for range queries that can use skip scans.
-
-  This class provides a specialized index access method for the queries
-  of the forms:
-
-       SELECT A_1,...,A_k, B_1,...,B_m, C
-         FROM T
-        WHERE
-         EQ(A_1,...,A_k)
-         AND RNG(C);
-
-  where all selected fields are parts of the same index.
-  The class of queries that can be processed by this quick select is fully
-  specified in the description of get_best_skip_scan() in opt_range.cc.
-
-  Since one of the requirements is that all select fields are part of the same
-  index, this class produces only index keys, and not complete records.
-*/
-
-class QUICK_SKIP_SCAN_SELECT : public QUICK_SELECT_I {
- private:
-  JOIN *join;                 /* Pointer to JOIN object */
-  KEY *index_info;            /* Index for skip scan */
-  SEL_ROOT *index_range_tree; /* Range tree for skip scan */
-  MY_BITMAP column_bitmap;    /* Map of key parts to be read */
-  /*
-    This is an array of array of equality constants with length
-    eq_prefix_key_parts. The length of array eq_key_prefixes[i] is
-    eq_prefix_elements[i].
-
-    For example, an equality predicate like "a IN (1, 2) AND b IN (2, 3, 4)",
-    eq_key_prefixes will contain:
-
-    [
-      [ 1, 2 ],
-      [ 2, 3, 4 ]
-    ]
-
-    eq_prefix_elements will contain:
-    [ 2, 3 ]
-  */
-  uchar ***eq_key_prefixes;
-  uint *eq_prefix_elements;
-  const uint eq_prefix_len; /* Total length of the equality prefix. */
-  uint eq_prefix_key_parts; /* A number of keyparts in skip scan prefix */
-  uchar *eq_prefix;         /* Storage for current equality prefix. */
-
-  /*
-    During skip scan, we will have to iterate through all possible
-    equality prefixes. This is the product of all the elements in
-    eq_prefix_elements. In the above example, there are 2 x 3 = 6 possible
-    equality prefixes.
-
-    To track which prefix we are on, we use the cur_eq_prefix array.
-    For example, the array [1, 1] indicates that the current equality prefix
-    is (2, 3).
-  */
-  uint *cur_eq_prefix;
-  uchar *distinct_prefix; /* Storage for prefix A_1, ... B_m. */
-  uint distinct_prefix_len;
-  uint distinct_prefix_key_parts;
-
-  KEY_PART_INFO *range_key_part; /* The keypart of range condition 'C'. */
-  uint range_key_len;
-  /*
-    Denotes whether the first key for the current equality prefix was
-    retrieved.
-  */
-  bool seen_first_key;
-
-  /* Storage for full lookup key for use with handler::read_range_first/next */
-  uchar *min_range_key;
-  uchar *max_range_key;
-  uchar *min_search_key;
-  uchar *max_search_key;
-  uint range_cond_flag;
-
-  key_range start_key;
-  key_range end_key;
-
-  bool has_aggregate_function;
-
-  bool next_eq_prefix();
-
- public:
-  MEM_ROOT alloc; /* Memory pool for data in this class. */
- public:
-  QUICK_SKIP_SCAN_SELECT(TABLE *table, JOIN *join, KEY *index_info, uint index,
-                         KEY_PART_INFO *range_part, SEL_ROOT *index_range_tree,
-                         uint eq_prefix_len, uint eq_prefix_parts,
-                         uint used_key_parts,
-                         const Cost_estimate *read_cost_arg, ha_rows records,
-                         MEM_ROOT *parent_alloc, bool has_aggregate_function);
-  ~QUICK_SKIP_SCAN_SELECT() override;
-  bool set_range(SEL_ARG *sel_range);
-  int init() override;
-  void need_sorted_output() override {}
-  int reset() override;
-  int get_next() override;
-  bool reverse_sorted() const override { return false; }
-  bool reverse_sort_possible() const override { return false; }
-  bool unique_key_range() override { return false; }
-  int get_type() const override { return QS_TYPE_SKIP_SCAN; }
-  bool is_loose_index_scan() const override { return true; }
-  bool is_agg_loose_index_scan() const override {
-    return has_aggregate_function;
-  }
-  void add_keys_and_lengths(String *key_names, String *used_lengths) override;
-#ifndef NDEBUG
-  void dbug_dump(int indent, bool verbose) override;
-#endif
-  void get_fields_used(MY_BITMAP *used_fields) override {
-    for (uint i = 0; i < used_key_parts; i++)
-      bitmap_set_bit(used_fields, index_info->key_part[i].field->field_index());
-  }
-  void add_info_string(String *str) override;
-};
-
-class QEP_shared_owner;
-
-int test_quick_select(THD *thd, Key_map keys, table_map prev_tables,
-                      ha_rows limit, bool force_quick_range,
-                      const enum_order interesting_order,
-                      const QEP_shared_owner *tab, Item *cond,
-                      Key_map *needed_reg, QUICK_SELECT_I **quick,
-                      bool ignore_table_scan, Query_block *query_block);
-
-bool prune_partitions(THD *thd, TABLE *table, Query_block *query_block,
-                      Item *pprune_cond);
-void store_key_image_to_rec(Field *field, uchar *ptr, uint len);
-
-extern String null_string;
-
-/// Global initialization of the null_element. Call on server start.
-void range_optimizer_init();
-
-/// Global destruction of the null_element. Call on server stop.
-void range_optimizer_free();
-
-/**
-  Test if 'value' is comparable to 'field' when setting up range
-  access for predicate "field OP value". 'field' is a field in the
-  table being optimized for while 'value' is whatever 'field' is
-  compared to.
-
-  @param cond_func   the predicate item that compares 'field' with 'value'
-  @param field       field in the predicate
-  @param itype       itMBR if indexed field is spatial, itRAW otherwise
-  @param comp_type   comparator for the predicate
-  @param value       whatever 'field' is compared to
-
-  @return true if 'field' and 'value' are comparable, false otherwise
-*/
-
-bool comparable_in_index(Item *cond_func, const Field *field,
-                         const Field::imagetype itype,
-                         Item_func::Functype comp_type, const Item *value);
-
-#endif
diff -Nru mysql-8.0-8.0.26/sql/opt_range_internal.h mysql-8.0-8.0.27/sql/opt_range_internal.h
--- mysql-8.0-8.0.26/sql/opt_range_internal.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/opt_range_internal.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,1134 +0,0 @@
-/* Copyright (c) 2000, 2021, Oracle 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,
-   as published by the Free Software Foundation.
-
-   This program is also distributed with certain software (including
-   but not limited to OpenSSL) that is licensed under separate terms,
-   as designated in a particular file or component or in included license
-   documentation.  The authors of MySQL hereby grant you an additional
-   permission to link the program and your derivative works with the
-   separately licensed software that they have included with MySQL.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License, version 2.0, for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
-
-#ifndef OPT_RANGE_INTERNAL_INCLUDED
-#define OPT_RANGE_INTERNAL_INCLUDED
-
-#include "sql/opt_range.h"
-
-#include "mysys_err.h"          // EE_CAPACITY_EXCEEDED
-#include "sql/derror.h"         // ER_THD
-#include "sql/error_handler.h"  // Internal_error_handler
-#include "sql/sql_class.h"      // THD
-
-class RANGE_OPT_PARAM;
-struct ROR_SCAN_INFO;
-class SEL_IMERGE;
-class SEL_TREE;
-
-SEL_TREE *get_mm_tree(RANGE_OPT_PARAM *param, Item *cond);
-void print_tree(String *out, const char *tree_name, SEL_TREE *tree,
-                const RANGE_OPT_PARAM *param, const bool print_full)
-    MY_ATTRIBUTE((unused));
-
-// Note: tree1 and tree2 are not usable by themselves after tree_and() or
-// tree_or().
-SEL_TREE *tree_and(RANGE_OPT_PARAM *param, SEL_TREE *tree1, SEL_TREE *tree2);
-SEL_TREE *tree_or(RANGE_OPT_PARAM *param, SEL_TREE *tree1, SEL_TREE *tree2);
-int sel_cmp(Field *f, uchar *a, uchar *b, uint8 a_flag, uint8 b_flag);
-SEL_ROOT *key_or(RANGE_OPT_PARAM *param, SEL_ROOT *key1, SEL_ROOT *key2);
-SEL_ROOT *key_and(RANGE_OPT_PARAM *param, SEL_ROOT *key1, SEL_ROOT *key2);
-
-void append_range(String *out, const KEY_PART_INFO *key_parts,
-                  const uchar *min_key, const uchar *max_key, const uint flag);
-class Opt_trace_array;
-void append_range_all_keyparts(Opt_trace_array *range_trace,
-                               String *range_string, String *range_so_far,
-                               SEL_ROOT *keypart,
-                               const KEY_PART_INFO *key_parts,
-                               const bool print_full);
-
-/**
-  Shared sentinel node for all trees. Initialized by range_optimizer_init(),
-  destroyed by range_optimizer_free();
-  Put it in a namespace, to avoid possible conflicts with the global namespace.
-*/
-namespace opt_range {
-extern SEL_ARG *null_element;
-}
-
-/**
-  Error handling class for range optimizer. We handle only out of memory
-  error here. This is to give a hint to the user to
-  raise range_optimizer_max_mem_size if required.
-  Warning for the memory error is pushed only once. The consequent errors
-  will be ignored.
-*/
-class Range_optimizer_error_handler : public Internal_error_handler {
- public:
-  Range_optimizer_error_handler()
-      : m_has_errors(false), m_is_mem_error(false) {}
-
-  bool handle_condition(THD *thd, uint sql_errno, const char *,
-                        Sql_condition::enum_severity_level *level,
-                        const char *) override {
-    if (*level == Sql_condition::SL_ERROR) {
-      m_has_errors = true;
-      /* Out of memory error is reported only once. Return as handled */
-      if (m_is_mem_error && sql_errno == EE_CAPACITY_EXCEEDED) return true;
-      if (sql_errno == EE_CAPACITY_EXCEEDED) {
-        m_is_mem_error = true;
-        /* Convert the error into a warning. */
-        *level = Sql_condition::SL_WARNING;
-        push_warning_printf(
-            thd, Sql_condition::SL_WARNING, ER_CAPACITY_EXCEEDED,
-            ER_THD(thd, ER_CAPACITY_EXCEEDED),
-            (ulonglong)thd->variables.range_optimizer_max_mem_size,
-            "range_optimizer_max_mem_size",
-            ER_THD(thd, ER_CAPACITY_EXCEEDED_IN_RANGE_OPTIMIZER));
-        return true;
-      }
-    }
-    return false;
-  }
-
-  bool has_errors() const { return m_has_errors; }
-
- private:
-  bool m_has_errors;
-  bool m_is_mem_error;
-};
-
-/**
-  A helper function to invert min flags to max flags for DESC key parts.
-  It changes NEAR_MIN, NO_MIN_RANGE to NEAR_MAX, NO_MAX_RANGE appropriately
-*/
-
-static uint invert_min_flag(uint min_flag) {
-  uint max_flag_out = min_flag & ~(NEAR_MIN | NO_MIN_RANGE);
-  if (min_flag & NEAR_MIN) max_flag_out |= NEAR_MAX;
-  if (min_flag & NO_MIN_RANGE) max_flag_out |= NO_MAX_RANGE;
-  return max_flag_out;
-}
-
-/**
-  A helper function to invert max flags to min flags for DESC key parts.
-  It changes NEAR_MAX, NO_MAX_RANGE to NEAR_MIN, NO_MIN_RANGE appropriately
-*/
-
-static uint invert_max_flag(uint max_flag) {
-  uint min_flag_out = max_flag & ~(NEAR_MAX | NO_MAX_RANGE);
-  if (max_flag & NEAR_MAX) min_flag_out |= NEAR_MIN;
-  if (max_flag & NO_MAX_RANGE) min_flag_out |= NO_MIN_RANGE;
-  return min_flag_out;
-}
-
-class SEL_ARG;
-
-/**
-  A graph of (possible multiple) key ranges, represented as a red-black
-  binary tree. There are three types (see the Type enum); if KEY_RANGE,
-  we have zero or more SEL_ARGs, described in the documentation on SEL_ARG.
-
-  As a special case, a nullptr SEL_ROOT means a range that is always true.
-  This is true both for keys[] and next_key_part.
-*/
-class SEL_ROOT {
- public:
-  /**
-    Used to indicate if the range predicate for an index is always
-    true/false, depends on values from other tables or can be
-    evaluated as is.
-  */
-  enum class Type {
-    /** The range predicate for this index is always false. */
-    IMPOSSIBLE,
-    /**
-      There is a range predicate that refers to another table. The
-      range access method cannot be used on this index unless that
-      other table is earlier in the join sequence. The bit
-      representing the index is set in JOIN_TAB::needed_reg to
-      notify the join optimizer that there is a table dependency.
-      After deciding on join order, the optimizer may chose to rerun
-      the range optimizer for tables with such dependencies.
-    */
-    MAYBE_KEY,
-    /**
-      There is a range condition that can be used on this index. The
-      range conditions for this index in stored in the SEL_ARG tree.
-    */
-    KEY_RANGE
-  } type;
-
-  /**
-    Constructs a tree of type KEY_RANGE, using the given root.
-    (The root is allowed to have children.)
-  */
-  SEL_ROOT(SEL_ARG *root);
-
-  /**
-    Used to construct MAYBE_KEY and IMPOSSIBLE SEL_ARGs.
-  */
-  SEL_ROOT(MEM_ROOT *memroot, Type type_arg);
-
-  /**
-    Note that almost all SEL_ROOTs are created on the MEM_ROOT,
-    so this destructor will only rarely be called.
-  */
-  ~SEL_ROOT() { assert(use_count == 0); }
-
-  /**
-    Returns true iff we have a single node that has no max nor min.
-    Note that by convention, a nullptr SEL_ROOT means the same.
-  */
-  bool is_always() const;
-
-  /**
-    Returns a number of keypart values appended to the key buffer
-    for min key and max key. This function is used by both Range
-    Analysis and Partition pruning. For partition pruning we have
-    to ensure that we don't store also subpartition fields. Thus
-    we have to stop at the last partition part and not step into
-    the subpartition fields. For Range Analysis we set last_part
-    to MAX_KEY which we should never reach.
-  */
-  int store_min_key(KEY_PART *key, uchar **range_key, uint *range_key_flag,
-                    uint last_part, bool start_key);
-
-  /* returns a number of keypart values appended to the key buffer */
-  int store_max_key(KEY_PART *key, uchar **range_key, uint *range_key_flag,
-                    uint last_part, bool start_key);
-
-  /**
-    Signal to the tree that the caller will shortly be dropping it
-    on the floor; if others are still using it, this is a no-op,
-    but if the caller was the last one, it is now an orphan, and
-    references from it should not count.
-  */
-  void free_tree();
-
-  /**
-    Insert the given node into the tree, and update the root.
-
-    @param key The node to insert.
-  */
-  void insert(SEL_ARG *key);
-
-  /**
-    Delete the given node from the tree, and update the root.
-
-    @param key The node to delete. Must exist in the tree.
-  */
-  void tree_delete(SEL_ARG *key);
-
-  /**
-    Find best key with min <= given key.
-    Because of the call context, this should never return nullptr to get_range.
-
-    @param key The key to search for.
-  */
-  SEL_ARG *find_range(const SEL_ARG *key) const;
-
-  /**
-    Create a new tree that's a duplicate of this one.
-
-    @param param The parameters for the new tree. Used to find out which
-      MEM_ROOT to allocate the new nodes on.
-
-    @return The new tree, or nullptr in case of out of memory.
-  */
-  SEL_ROOT *clone_tree(RANGE_OPT_PARAM *param) const;
-
-  /**
-    Check if SEL_ROOT::use_count value is correct. See the definition
-    of use_count for what is "correct".
-
-    @param root The origin tree of the SEL_ARG graph (an RB-tree that
-      has the least value of root->sel_root->root->part in the
-      entire graph, and thus is the "origin" of the graph)
-
-    @return true iff an incorrect SEL_ARG::use_count is found.
-  */
-  bool test_use_count(const SEL_ROOT *root) const;
-
-  /** Returns true iff this is a single-element, single-field predicate. */
-  inline bool simple_key() const;
-
-  /**
-    The root node of the tree. Note that this may change as the result
-    of rotations during insertions or deletions, so pointers should be
-    to the SEL_ROOT, not individual SEL_ARG nodes.
-
-    This element can never be nullptr, but can be null_element
-    if type == KEY_RANGE and the tree is empty (which then means the same as
-    type == IMPOSSIBLE).
-
-    If type == IMPOSSIBLE or type == MAYBE_KEY, there's a single root
-    element which only serves to hold next_key_part (we don't really care
-    about root->part in this case); the actual min/max values etc.
-    do not matter and should not be accessed.
-  */
-  SEL_ARG *root;
-
-  /**
-    Number of references to this SEL_ARG tree. References may be from
-    SEL_ARG::next_key_part of SEL_ARGs from earlier keyparts or
-    SEL_TREE::keys[i].
-
-    The SEL_ARG trees are re-used in a lazy-copy manner based on this
-    reference counting.
-  */
-  ulong use_count{0};
-
-  /**
-    Number of nodes in the RB-tree, not including sentinels.
-  */
-  uint16 elements{0};
-};
-
-/*
-  A construction block of the SEL_ARG-graph.
-
-  One SEL_ARG object represents an "elementary interval" in form
-
-      min_value <=?  table.keypartX  <=? max_value
-
-  The interval is a non-empty interval of any kind: with[out] minimum/maximum
-  bound, [half]open/closed, single-point interval, etc.
-
-  1. SEL_ARG GRAPH STRUCTURE
-
-  SEL_ARG objects are linked together in a graph, represented by the SEL_ROOT.
-  The meaning of the graph is better demonstrated by an example:
-
-     tree->keys[i]
-      |
-      |             $              $
-      |    part=1   $     part=2   $    part=3
-      |             $              $
-      |  +-------+  $   +-------+  $   +--------+
-      |  | kp1<1 |--$-->| kp2=5 |--$-->| kp3=10 |
-      |  +-------+  $   +-------+  $   +--------+
-      |      |      $              $       |
-      |      |      $              $   +--------+
-      |      |      $              $   | kp3=12 |
-      |      |      $              $   +--------+
-      |  +-------+  $              $
-      \->| kp1=2 |--$--------------$-+
-         +-------+  $              $ |   +--------+
-             |      $              $  ==>| kp3=11 |
-         +-------+  $              $ |   +--------+
-         | kp1=3 |--$--------------$-+       |
-         +-------+  $              $     +--------+
-             |      $              $     | kp3=14 |
-            ...     $              $     +--------+
-
-  The entire graph is partitioned into "interval lists".
-
-  An interval list is a sequence of ordered disjoint intervals over
-  the same key part. SEL_ARG are linked via "next" and "prev" pointers
-  with NULL as sentinel.
-
-    In the example pic, there are 4 interval lists:
-    "kp<1 OR kp1=2 OR kp1=3", "kp2=5", "kp3=10 OR kp3=12", "kp3=11 OR kp3=13".
-    The vertical lines represent SEL_ARG::next/prev pointers.
-
-  Additionally, all intervals in the list form a red-black (RB) tree,
-  linked via left/right/parent pointers with null_element as sentinel. The
-  red-black tree root SEL_ARG object will be further called "root of the
-  interval list".
-
-  A red-black tree with 7 SEL_ARGs will look similar to what is shown
-  below. Left/right/parent pointers are shown while next pointers go from a
-  node with number X to the node with number X+1 (and prev in the
-  opposite direction):
-
-                         Root
-                        +---+
-                        | 4 |
-                        +---+
-                   left/     \ right
-                    __/       \__
-                   /             \
-              +---+               +---+
-              | 2 |               | 6 |
-              +---+               +---+
-        left /     \ right  left /     \ right
-            |       |           |       |
-        +---+       +---+   +---+       +---+
-        | 1 |       | 3 |   | 5 |       | 7 |
-        +---+       +---+   +---+       +---+
-
-  In this tree,
-    * node1->prev == node7->next == NULL
-    * node1->left == node1->right ==
-      node3->left == ... node7->right == null_element
-
-  In an interval list, each member X may have SEL_ARG::next_key_part pointer
-  pointing to the root of another interval list Y. The pointed interval list
-  must cover a key part with greater number (i.e. Y->part > X->part).
-
-    In the example pic, the next_key_part pointers are represented by
-    horisontal lines.
-
-  2. SEL_ARG GRAPH SEMANTICS
-
-  It represents a condition in a special form (we don't have a name for it ATM)
-  The SEL_ARG::next/prev is "OR", and next_key_part is "AND".
-
-  For example, the picture represents the condition in form:
-   (kp1 < 1 AND kp2=5 AND (kp3=10 OR kp3=12)) OR
-   (kp1=2 AND (kp3=11 OR kp3=14)) OR
-   (kp1=3 AND (kp3=11 OR kp3=14))
-
-  In red-black tree form:
-
-                     +-------+                 +--------+
-                     | kp1=2 |.................| kp3=14 |
-                     +-------+                 +--------+
-                      /     \                     /
-             +---------+    +-------+     +--------+
-             | kp1 < 1 |    | kp1=3 |     | kp3=11 |
-             +---------+    +-------+     +--------+
-                 .               .
-            ......               .......
-            .                          .
-        +-------+                  +--------+
-        | kp2=5 |                  | kp3=14 |
-        +-------+                  +--------+
-            .                        /
-            .                   +--------+
-       (root of R-B tree        | kp3=11 |
-        for "kp3={10|12}")      +--------+
-
-
-  Where / and \ denote left and right pointers and ... denotes
-  next_key_part pointers to the root of the R-B tree of intervals for
-  consecutive key parts.
-
-  3. SEL_ARG GRAPH USE
-
-  Use get_mm_tree() to construct SEL_ARG graph from WHERE condition.
-  Then walk the SEL_ARG graph and get a list of dijsoint ordered key
-  intervals (i.e. intervals in form
-
-   (constA1, .., const1_K) < (keypart1,.., keypartK) < (constB1, .., constB_K)
-
-  Those intervals can be used to access the index. The uses are in:
-   - check_quick_select() - Walk the SEL_ARG graph and find an estimate of
-                            how many table records are contained within all
-                            intervals.
-   - get_quick_select()   - Walk the SEL_ARG, materialize the key intervals,
-                            and create QUICK_RANGE_SELECT object that will
-                            read records within these intervals.
-
-  4. SPACE COMPLEXITY NOTES
-
-    SEL_ARG graph is a representation of an ordered disjoint sequence of
-    intervals over the ordered set of index tuple values.
-
-    For multi-part keys, one can construct a WHERE expression such that its
-    list of intervals will be of combinatorial size. Here is an example:
-
-      (keypart1 IN (1,2, ..., n1)) AND
-      (keypart2 IN (1,2, ..., n2)) AND
-      (keypart3 IN (1,2, ..., n3))
-
-    For this WHERE clause the list of intervals will have n1*n2*n3 intervals
-    of form
-
-      (keypart1, keypart2, keypart3) = (k1, k2, k3), where 1 <= k{i} <= n{i}
-
-    SEL_ARG graph structure aims to reduce the amount of required space by
-    "sharing" the elementary intervals when possible (the pic at the
-    beginning of this comment has examples of such sharing). The sharing may
-    prevent combinatorial blowup:
-
-      There are WHERE clauses that have combinatorial-size interval lists but
-      will be represented by a compact SEL_ARG graph.
-      Example:
-        (keypartN IN (1,2, ..., n1)) AND
-        ...
-        (keypart2 IN (1,2, ..., n2)) AND
-        (keypart1 IN (1,2, ..., n3))
-
-    but not in all cases:
-
-    - There are WHERE clauses that do have a compact SEL_ARG-graph
-      representation but get_mm_tree() and its callees will construct a
-      graph of combinatorial size.
-      Example:
-        (keypart1 IN (1,2, ..., n1)) AND
-        (keypart2 IN (1,2, ..., n2)) AND
-        ...
-        (keypartN IN (1,2, ..., n3))
-
-    - There are WHERE clauses for which the minimal possible SEL_ARG graph
-      representation will have combinatorial size.
-      Example:
-        By induction: Let's take any interval on some keypart in the middle:
-
-           kp15=c0
-
-        Then let's AND it with this interval 'structure' from preceding and
-        following keyparts:
-
-          (kp14=c1 AND kp16=c3) OR keypart14=c2) (*)
-
-        We will obtain this SEL_ARG graph:
-
-             kp14     $      kp15      $      kp16
-                      $                $
-         +---------+  $   +---------+  $   +---------+
-         | kp14=c1 |--$-->| kp15=c0 |--$-->| kp16=c3 |
-         +---------+  $   +---------+  $   +---------+
-              |       $                $
-         +---------+  $   +---------+  $
-         | kp14=c2 |--$-->| kp15=c0 |  $
-         +---------+  $   +---------+  $
-                      $                $
-
-       Note that we had to duplicate "kp15=c0" and there was no way to avoid
-       that.
-       The induction step: AND the obtained expression with another "wrapping"
-       expression like (*).
-       When the process ends because of the limit on max. number of keyparts
-       we'll have:
-
-         WHERE clause length  is O(3*#max_keyparts)
-         SEL_ARG graph size   is O(2^(#max_keyparts/2))
-
-       (it is also possible to construct a case where instead of 2 in 2^n we
-        have a bigger constant, e.g. 4, and get a graph with 4^(31/2)= 2^31
-        nodes)
-
-    We avoid consuming too much memory by setting a limit on the number of
-    SEL_ARG object we can construct during one range analysis invocation.
-*/
-
-class SEL_ARG {
- public:
-  uint8 min_flag{0}, max_flag{0};
-
-  /**
-    maybe_flag signals that this range is AND-ed with some unknown range
-    (a MAYBE_KEY node). This means that the range could be smaller than
-    what it would otherwise denote; e.g., a range such as
-
-      (0 < x < 3) AND x=( SELECT ... )
-
-    could in reality be e.g. (1 < x < 2), depending on what the subselect
-    returns (and we don't know that when planning), but it could never be
-    bigger.
-
-    FIXME: It's unclear if this is really kept separately per SEL_ARG or is
-    meaningful only at the root node, and thus should be moved to the
-    SEL_ROOT. Most code seems to assume the latter, but a few select places,
-    non-root nodes appear to be modified.
-  */
-  bool maybe_flag{false};
-
-  /*
-    Which key part. TODO: This is the same for all values in a SEL_ROOT,
-    so we should move it there.
-  */
-  uint8 part{0};
-
-  bool maybe_null() const { return field->is_nullable(); }
-
-  /**
-    The rtree index interval to scan, undefined unless
-    SEL_ARG::min_flag == GEOM_FLAG.
-  */
-  enum ha_rkey_function rkey_func_flag;
-
-  /*
-    TODO: This is the same for all values in a SEL_ROOT, so we should
-    move it there; however, be careful about cmp_* functions.
-    Note that this should never be nullptr except in the special case
-    where we have a dummy SEL_ARG to hold next_key_part only
-    (see SEL_ROOT::root for more information).
-  */
-  Field *field{nullptr};
-  uchar *min_value, *max_value;  // Pointer to range
-
-  /*
-    eq_tree(), first(), last() etc require that left == right == NULL
-    if the type is MAYBE_KEY. Todo: fix this so SEL_ARGs without R-B
-    children are handled consistently. See related WL#5894.
-  */
-  SEL_ARG *left, *right;    /* R-B tree children */
-  SEL_ARG *next, *prev;     /* Links for bi-directional interval list */
-  SEL_ARG *parent{nullptr}; /* R-B tree parent (nullptr for root) */
-  /*
-    R-B tree of intervals covering keyparts consecutive to this
-    SEL_ARG. See documentation of SEL_ARG GRAPH semantics for details.
-  */
-  SEL_ROOT *next_key_part{nullptr};
-
-  /**
-    Convenience function for removing the next_key_part. The typical
-    use for this function is to disconnect the next_key_part from the
-    root, send it to key_and() or key_or(), and then connect the
-    result of that function back to the SEL_ARG using set_next_key_part().
-
-    @return The previous value of next_key_part.
-  */
-  SEL_ROOT *release_next_key_part() {
-    SEL_ROOT *ret = next_key_part;
-    if (next_key_part) {
-      assert(next_key_part->use_count > 0);
-      --next_key_part->use_count;
-    }
-    next_key_part = nullptr;
-    return ret;
-  }
-
-  /**
-    Convenience function for changing next_key_part, including
-    updating the use_count. The argument is allowed to be nullptr.
-
-    @param next_key_part_arg New value for next_key_part.
-  */
-  void set_next_key_part(SEL_ROOT *next_key_part_arg) {
-    release_next_key_part();
-    next_key_part = next_key_part_arg;
-    if (next_key_part) ++next_key_part->use_count;
-  }
-
-  enum leaf_color { BLACK, RED } color;
-
-  bool is_ascending;  ///< true - ASC order, false - DESC
-
-  SEL_ARG() = default;
-  SEL_ARG(SEL_ARG &);
-  SEL_ARG(Field *, const uchar *, const uchar *, bool asc);
-  SEL_ARG(Field *field, uint8 part, uchar *min_value, uchar *max_value,
-          uint8 min_flag, uint8 max_flag, bool maybe_flag, bool asc);
-  /**
-    Note that almost all SEL_ARGs are created on the MEM_ROOT,
-    so this destructor will only rarely be called.
-  */
-  ~SEL_ARG() { release_next_key_part(); }
-
-  /**
-    returns true if a range predicate is equal. Use all_same()
-    to check for equality of all the predicates on this keypart.
-  */
-  inline bool is_same(const SEL_ARG *arg) const {
-    if (part != arg->part) return false;
-    return cmp_min_to_min(arg) == 0 && cmp_max_to_max(arg) == 0;
-  }
-
-  inline void merge_flags(SEL_ARG *arg) { maybe_flag |= arg->maybe_flag; }
-  inline void maybe_smaller() { maybe_flag = true; }
-  /* Return true iff it's a single-point null interval */
-  inline bool is_null_interval() { return maybe_null() && max_value[0] == 1; }
-  inline int cmp_min_to_min(const SEL_ARG *arg) const {
-    return sel_cmp(field, min_value, arg->min_value, min_flag, arg->min_flag);
-  }
-  inline int cmp_min_to_max(const SEL_ARG *arg) const {
-    return sel_cmp(field, min_value, arg->max_value, min_flag, arg->max_flag);
-  }
-  inline int cmp_max_to_max(const SEL_ARG *arg) const {
-    return sel_cmp(field, max_value, arg->max_value, max_flag, arg->max_flag);
-  }
-  inline int cmp_max_to_min(const SEL_ARG *arg) const {
-    return sel_cmp(field, max_value, arg->min_value, max_flag, arg->min_flag);
-  }
-  SEL_ARG *clone_and(SEL_ARG *arg,
-                     MEM_ROOT *mem_root) {  // Get intersection of ranges.
-    uchar *new_min, *new_max;
-    uint8 flag_min, flag_max;
-    if (cmp_min_to_min(arg) >= 0) {
-      new_min = min_value;
-      flag_min = min_flag;
-    } else {
-      new_min = arg->min_value;
-      flag_min = arg->min_flag; /* purecov: deadcode */
-    }
-    if (cmp_max_to_max(arg) <= 0) {
-      new_max = max_value;
-      flag_max = max_flag;
-    } else {
-      new_max = arg->max_value;
-      flag_max = arg->max_flag;
-    }
-    return new (mem_root)
-        SEL_ARG(field, part, new_min, new_max, flag_min, flag_max,
-                maybe_flag && arg->maybe_flag, is_ascending);
-  }
-  SEL_ARG *clone_first(SEL_ARG *arg,
-                       MEM_ROOT *mem_root) {  // arg->min <= X < arg->min
-    return new (mem_root)
-        SEL_ARG(field, part, min_value, arg->min_value, min_flag,
-                arg->min_flag & NEAR_MIN ? 0 : NEAR_MAX,
-                maybe_flag || arg->maybe_flag, is_ascending);
-  }
-  SEL_ARG *clone_last(SEL_ARG *arg,
-                      MEM_ROOT *mem_root) {  // arg->min <= X <= key_max
-    return new (mem_root)
-        SEL_ARG(field, part, min_value, arg->max_value, min_flag, arg->max_flag,
-                maybe_flag || arg->maybe_flag, is_ascending);
-  }
-  SEL_ARG *clone(RANGE_OPT_PARAM *param, SEL_ARG *new_parent, SEL_ARG **next);
-
-  bool copy_min(SEL_ARG *arg) {  // max(this->min, arg->min) <= x <= this->max
-    if (cmp_min_to_min(arg) > 0) {
-      min_value = arg->min_value;
-      min_flag = arg->min_flag;
-      if ((max_flag & NO_MAX_RANGE) && (min_flag & NO_MIN_RANGE))
-        return true;  // Full range
-    }
-    maybe_flag |= arg->maybe_flag;
-    return false;
-  }
-  bool copy_max(SEL_ARG *arg) {  // this->min <= x <= min(this->max, arg->max)
-    if (cmp_max_to_max(arg) <= 0) {
-      max_value = arg->max_value;
-      max_flag = arg->max_flag;
-      if ((max_flag & NO_MAX_RANGE) && (min_flag & NO_MIN_RANGE))
-        return true;  // Full range
-    }
-    maybe_flag |= arg->maybe_flag;
-    return false;
-  }
-
-  void copy_min_to_min(SEL_ARG *arg) {
-    min_value = arg->min_value;
-    min_flag = arg->min_flag;
-  }
-  void copy_min_to_max(SEL_ARG *arg) {
-    max_value = arg->min_value;
-    max_flag = arg->min_flag & NEAR_MIN ? 0 : NEAR_MAX;
-  }
-  void copy_max_to_min(SEL_ARG *arg) {
-    min_value = arg->max_value;
-    min_flag = arg->max_flag & NEAR_MAX ? 0 : NEAR_MIN;
-  }
-
-  /**
-    Set spatial index range scan parameters. This object will be used to do
-    spatial index range scan after this call.
-
-    @param rkey_func The scan function to perform. It must be one of the
-                     spatial index specific scan functions.
-  */
-  void set_gis_index_read_function(const enum ha_rkey_function rkey_func) {
-    assert(rkey_func >= HA_READ_MBR_CONTAIN && rkey_func <= HA_READ_MBR_EQUAL);
-    min_flag = GEOM_FLAG;
-    rkey_func_flag = rkey_func;
-    max_flag = NO_MAX_RANGE;
-  }
-
-  /* returns a number of keypart values (0 or 1) appended to the key buffer */
-  int store_min_value(uint length, uchar **min_key, uint min_key_flag) {
-    /* "(kp1 > c1) AND (kp2 OP c2) AND ..." -> (kp1 > c1) */
-    if ((min_flag & GEOM_FLAG) ||
-        (!(min_flag & NO_MIN_RANGE) &&
-         !(min_key_flag & (NO_MIN_RANGE | NEAR_MIN)))) {
-      if (maybe_null() && *min_value) {
-        **min_key = 1;
-        memset(*min_key + 1, 0, length - 1);
-      } else
-        memcpy(*min_key, min_value, length);
-      (*min_key) += length;
-      return 1;
-    }
-    return 0;
-  }
-  /* returns a number of keypart values (0 or 1) appended to the key buffer */
-  int store_max_value(uint length, uchar **max_key, uint max_key_flag) {
-    if (!(max_flag & NO_MAX_RANGE) &&
-        !(max_key_flag & (NO_MAX_RANGE | NEAR_MAX))) {
-      if (maybe_null() && *max_value) {
-        **max_key = 1;
-        memset(*max_key + 1, 0, length - 1);
-      } else
-        memcpy(*max_key, max_value, length);
-      (*max_key) += length;
-      return 1;
-    }
-    return 0;
-  }
-
-  /*
-    Returns a number of keypart values appended to the key buffer
-    for min key and max key. This function is used by both Range
-    Analysis and Partition pruning. For partition pruning we have
-    to ensure that we don't store also subpartition fields. Thus
-    we have to stop at the last partition part and not step into
-    the subpartition fields. For Range Analysis we set last_part
-    to MAX_KEY which we should never reach.
-
-    Note: Caller of this function should take care of sending the
-    correct flags and correct key to be stored into.  In case of
-    ascending indexes, store_min_key() gets called to store the
-    min_value to range start_key. In case of descending indexes, it's
-    called for storing min_value to range end_key.
-  */
-  /**
-    Helper function for storing min/max values of SEL_ARG taking into account
-    key part's order.
-  */
-  void store_min_max_values(uint length, uchar **min_key, uint min_flag,
-                            uchar **max_key, uint max_flag, int *min_part,
-                            int *max_part) {
-    if (is_ascending) {
-      *min_part += store_min_value(length, min_key, min_flag);
-      *max_part += store_max_value(length, max_key, max_flag);
-    } else {
-      *max_part += store_min_value(length, max_key, min_flag);
-      *min_part += store_max_value(length, min_key, max_flag);
-    }
-  }
-
-  /**
-    Helper function for storing min/max keys of next SEL_ARG taking into
-    account key part's order.
-
-    @note On checking min/max flags: Flags are used to track whether there's
-    a partial key in the key buffer. So for ASC key parts the flag
-    corresponding to the key being added to should be checked, not
-    corresponding to the value being added. I.e min_flag for min_key.
-    For DESC key parts it's opposite - max_flag for min_key. It's flag
-    of prev key part that should be checked.
-
-  */
-  void store_next_min_max_keys(KEY_PART *key, uchar **cur_min_key,
-                               uint *cur_min_flag, uchar **cur_max_key,
-                               uint *cur_max_flag, int *min_part,
-                               int *max_part) {
-    assert(next_key_part);
-    const bool asc = next_key_part->root->is_ascending;
-    if (!get_min_flag()) {
-      if (asc)
-        *min_part += next_key_part->store_min_key(key, cur_min_key,
-                                                  cur_min_flag, MAX_KEY, true);
-      else {
-        uint tmp_flag = invert_min_flag(*cur_min_flag);
-        *min_part += next_key_part->store_max_key(key, cur_min_key, &tmp_flag,
-                                                  MAX_KEY, true);
-        *cur_min_flag = invert_max_flag(tmp_flag);
-      }
-    }
-    if (!get_max_flag()) {
-      if (asc)
-        *max_part += next_key_part->store_max_key(key, cur_max_key,
-                                                  cur_max_flag, MAX_KEY, false);
-      else {
-        uint tmp_flag = invert_max_flag(*cur_max_flag);
-        *max_part += next_key_part->store_min_key(key, cur_max_key, &tmp_flag,
-                                                  MAX_KEY, false);
-        *cur_max_flag = invert_min_flag(tmp_flag);
-      }
-    }
-  }
-
-  SEL_ARG *rb_insert(SEL_ARG *leaf);
-  friend SEL_ARG *rb_delete_fixup(SEL_ARG *root, SEL_ARG *key, SEL_ARG *par);
-#ifndef NDEBUG
-  friend int test_rb_tree(SEL_ARG *element, SEL_ARG *parent);
-#endif
-  SEL_ARG *first();
-  const SEL_ARG *first() const;
-  SEL_ARG *last();
-  void make_root() {
-    left = right = opt_range::null_element;
-    color = BLACK;
-    parent = next = prev = nullptr;
-  }
-
-  inline SEL_ARG **parent_ptr() {
-    return parent->left == this ? &parent->left : &parent->right;
-  }
-
-  /*
-    Check if this SEL_ARG object represents a single-point interval
-
-    SYNOPSIS
-      is_singlepoint()
-
-    DESCRIPTION
-      Check if this SEL_ARG object (not tree) represents a single-point
-      interval, i.e. if it represents a "keypart = const" or
-      "keypart IS NULL".
-
-    RETURN
-      true   This SEL_ARG object represents a singlepoint interval
-      false  Otherwise
-  */
-
-  bool is_singlepoint() const {
-    /*
-      Check for NEAR_MIN ("strictly less") and NO_MIN_RANGE (-inf < field)
-      flags, and the same for right edge.
-    */
-    if (min_flag || max_flag) return false;
-    uchar *min_val = min_value;
-    uchar *max_val = max_value;
-
-    if (maybe_null()) {
-      /* First byte is a NULL value indicator */
-      if (*min_val != *max_val) return false;
-
-      if (*min_val) return true; /* This "x IS NULL" */
-      min_val++;
-      max_val++;
-    }
-    return !field->key_cmp(min_val, max_val);
-  }
-  /**
-    Return correct min_flag.
-
-    For DESC key parts max flag should be used as min flag, but in order to
-    be checked correctly, max flag should be flipped as code doesn't expect
-    e.g NEAR_MAX in min flag.
-  */
-  uint get_min_flag() {
-    return (is_ascending ? min_flag : invert_max_flag(max_flag));
-  }
-  /**
-    Return correct max_flag.
-
-    For DESC key parts min flag should be used as max flag, but in order to
-    be checked correctly, min flag should be flipped as code doesn't expect
-    e.g NEAR_MIN in max flag.
-  */
-  uint get_max_flag() {
-    return (is_ascending ? max_flag : invert_min_flag(min_flag));
-  }
-};
-
-class SEL_TREE {
- public:
-  /**
-    Starting an effort to document this field:
-
-    IMPOSSIBLE: if keys[i]->type == SEL_ROOT::Type::IMPOSSIBLE for some i,
-      then type == SEL_TREE::IMPOSSIBLE. Rationale: if the predicate for
-      one of the indexes is always false, then the full predicate is also
-      always false.
-
-    ALWAYS: if either (keys[i]->is_always()) or (keys[i] == NULL) for all i,
-      then type == SEL_TREE::ALWAYS. Rationale: the range access method
-      will not be able to filter out any rows when there are no range
-      predicates that can be used to filter on any index.
-
-    KEY: There are range predicates that can be used on at least one
-      index.
-
-    KEY_SMALLER: There are range predicates that can be used on at
-      least one index. In addition, there are predicates that cannot
-      be directly utilized by range access on key parts in the same
-      index. These unused predicates makes it probable that the row
-      estimate for range access on this index is too pessimistic.
-  */
-  enum Type { IMPOSSIBLE, ALWAYS, MAYBE, KEY, KEY_SMALLER } type;
-
-  SEL_TREE(enum Type type_arg, MEM_ROOT *root, size_t num_keys)
-      : type(type_arg), keys(root, num_keys), n_ror_scans(0) {}
-  SEL_TREE(MEM_ROOT *root, size_t num_keys)
-      : type(KEY), keys(root, num_keys), n_ror_scans(0) {}
-  /**
-    Constructor that performs deep-copy of the SEL_ARG trees in
-    'keys[]' and the index merge alternatives in 'merges'.
-
-    @param arg     The SEL_TREE to copy
-    @param param   Parameters for range analysis
-  */
-  SEL_TREE(SEL_TREE *arg, RANGE_OPT_PARAM *param);
-  /*
-    Possible ways to read rows using a single index because the
-    conditions of the query consists of single-index conjunctions:
-
-       (ranges_for_idx_1) AND (ranges_for_idx_2) AND ...
-
-    The SEL_ARG graph for each non-NULL element in keys[] may consist
-    of many single-index ranges (disjunctions), so ranges_for_idx_1
-    may e.g. be:
-
-       "idx_field1 = 1 OR (idx_field1 > 5 AND idx_field2 = 10)"
-
-    assuming that index1 is a composite index covering
-    (idx_field1,...,idx_field2,..)
-
-    Index merge intersection intersects ranges on SEL_ARGs from two or
-    more indexes.
-
-    Note: there may exist SEL_TREE objects with sel_tree->type=KEY and
-    keys[i]=0 for all i. (SergeyP: it is not clear whether there is any
-    merit in range analyzer functions (e.g. get_mm_parts) returning a
-    pointer to such SEL_TREE instead of NULL)
-
-    Note: If you want to set an element in keys[], use set_key()
-    or release_key() to make sure the SEL_ARG's use_count is correctly
-    updated.
-  */
-  Mem_root_array<SEL_ROOT *> keys;
-  Key_map keys_map; /* bitmask of non-NULL elements in keys */
-
-  /*
-    Possible ways to read rows using Index merge (sort) union.
-
-    Each element in 'merges' consists of multi-index disjunctions,
-    which means that Index merge (sort) union must be applied to read
-    rows. The nodes in the 'merges' list forms a conjunction of such
-    multi-index disjunctions.
-
-    The list is non-empty only if type==KEY.
-  */
-  List<SEL_IMERGE> merges;
-
-  /* The members below are filled/used only after get_mm_tree is done */
-  Key_map ror_scans_map; /* bitmask of ROR scan-able elements in keys */
-  uint n_ror_scans;      /* number of set bits in ror_scans_map */
-
-  ROR_SCAN_INFO **ror_scans;     /* list of ROR key scans */
-  ROR_SCAN_INFO **ror_scans_end; /* last ROR scan */
-  /* Note that #records for each key scan is stored in table->quick_rows */
-
-  /**
-    Convenience function for removing an element in keys[]. The typical
-    use for this function is to disconnect the next_key_part from the
-    root, send it to key_and() or key_or(), and then connect the
-    result of that function back to the SEL_ROOT using set_key().
-
-    @param index Which index slot to release.
-    @return The value in the slot (before removal).
-  */
-  SEL_ROOT *release_key(int index) {
-    SEL_ROOT *ret = keys[index];
-    if (keys[index]) {
-      assert(keys[index]->use_count > 0);
-      --keys[index]->use_count;
-    }
-    keys[index] = nullptr;
-    return ret;
-  }
-
-  /**
-    Convenience function for changing an element in keys[], including
-    updating the use_count.
-
-    @param index Which index slot to change.
-    @param key The new contents of the index slot. Is allowed to be nullptr.
-  */
-  void set_key(int index, SEL_ROOT *key) {
-    release_key(index);
-    keys[index] = key;
-    if (key) ++key->use_count;
-  }
-};
-
-class RANGE_OPT_PARAM {
- public:
-  THD *thd;                 /* Current thread handle */
-  TABLE *table;             /* Table being analyzed */
-  Query_block *query_block; /* Query block the table is part of */
-  Item *cond;               /* Used inside get_mm_tree(). */
-  table_map prev_tables;
-  table_map read_tables;
-  table_map current_table; /* Bit of the table being analyzed */
-
-  /* Array of parts of all keys for which range analysis is performed */
-  KEY_PART *key_parts;
-  KEY_PART *key_parts_end;
-  MEM_ROOT
-  *mem_root; /* Memory that will be freed when range analysis completes */
-  MEM_ROOT *old_root; /* Memory that will last until the query end */
-  /*
-    Number of indexes used in range analysis (In SEL_TREE::keys only first
-    #keys elements are not empty)
-  */
-  uint keys;
-
-  /*
-    If true, the index descriptions describe real indexes (and it is ok to
-    call field->optimize_range(real_keynr[...], ...).
-    Otherwise index description describes fake indexes, like a partitioning
-    expression.
-  */
-  bool using_real_indexes;
-
-  /*
-    Aggressively remove "scans" that do not have conditions on first
-    keyparts. Such scans are usable when doing partition pruning but not
-    regular range optimization.
-  */
-  bool remove_jump_scans;
-
-  /*
-    used_key_no -> table_key_no translation table. Only makes sense if
-    using_real_indexes==true
-  */
-  uint real_keynr[MAX_KEY];
-
-  /*
-    Used to store 'current key tuples', in both range analysis and
-    partitioning (list) analysis
-  */
-  uchar min_key[MAX_KEY_LENGTH + MAX_FIELD_WIDTH],
-      max_key[MAX_KEY_LENGTH + MAX_FIELD_WIDTH];
-
-  bool force_default_mrr;
-  /**
-    Whether index statistics or index dives should be used when
-    estimating the number of rows in an equality range. If true, index
-    statistics is used for these indexes.
-  */
-  bool use_index_statistics;
-
-  /// Error handler for this param.
-
-  Range_optimizer_error_handler error_handler;
-
-  bool has_errors() const { return (error_handler.has_errors()); }
-
-  virtual ~RANGE_OPT_PARAM() = default;
-};
-
-/*
-  SEL_IMERGE is a list of possible ways to do index merge, i.e. it is
-  a condition in the following form:
-   (t_1||t_2||...||t_N) && (next)
-
-  where all t_i are SEL_TREEs, next is another SEL_IMERGE and no pair
-  (t_i,t_j) contains SEL_ARGS for the same index.
-
-  SEL_TREE contained in SEL_IMERGE always has merges=NULL.
-
-  This class relies on memory manager to do the cleanup.
-*/
-
-class SEL_IMERGE {
-  enum { PREALLOCED_TREES = 10 };
-
- public:
-  SEL_TREE *trees_prealloced[PREALLOCED_TREES];
-  SEL_TREE **trees;      /* trees used to do index_merge   */
-  SEL_TREE **trees_next; /* last of these trees            */
-  SEL_TREE **trees_end;  /* end of allocated space         */
-
-  SEL_ARG ***best_keys; /* best keys to read in SEL_TREEs */
-
-  SEL_IMERGE()
-      : trees(&trees_prealloced[0]),
-        trees_next(trees),
-        trees_end(trees + PREALLOCED_TREES) {}
-  SEL_IMERGE(SEL_IMERGE *arg, RANGE_OPT_PARAM *param);
-  int or_sel_tree(RANGE_OPT_PARAM *param, SEL_TREE *tree);
-  int or_sel_tree_with_checks(RANGE_OPT_PARAM *param, SEL_TREE *new_tree);
-  int or_sel_imerge_with_checks(RANGE_OPT_PARAM *param, SEL_IMERGE *imerge);
-};
-
-#endif  // OPT_RANGE_INTERNAL_INCLUDED
diff -Nru mysql-8.0-8.0.26/sql/opt_sum.cc mysql-8.0-8.0.27/sql/opt_sum.cc
--- mysql-8.0-8.0.26/sql/opt_sum.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/opt_sum.cc	2021-09-28 11:46:34.000000000 +0000
@@ -629,10 +629,9 @@
     case 0:
       /* MULT_EQUAL_FUNC */
       {
-        Item_equal *item_equal = (Item_equal *)func_item;
-        Item_equal_iterator it(*item_equal);
-        args[0] = it++;
-        if (it++) return false;
+        Item_equal *item_equal = down_cast<Item_equal *>(func_item);
+        args[0] = item_equal->get_first();
+        if (item_equal->members() > 1) return false;
         if (!(args[1] = item_equal->get_const())) return false;
       }
       break;
@@ -766,7 +765,8 @@
 
   switch (((Item_func *)cond)->functype()) {
     case Item_func::ISNULL_FUNC:
-      is_null = true; /* fall through */
+      is_null = true;
+      [[fallthrough]];
     case Item_func::EQ_FUNC:
       eq_type = true;
       break;
@@ -774,12 +774,14 @@
       eq_type = is_null_safe_eq = true;
       break;
     case Item_func::LT_FUNC:
-      noeq_type = true; /* fall through */
+      noeq_type = true;
+      [[fallthrough]];
     case Item_func::LE_FUNC:
       less_fl = true;
       break;
     case Item_func::GT_FUNC:
-      noeq_type = true; /* fall through */
+      noeq_type = true;
+      [[fallthrough]];
     case Item_func::GE_FUNC:
       break;
     case Item_func::BETWEEN:
@@ -873,13 +875,24 @@
       Item *value = args[between && max_fl ? 2 : 1];
 
       /*
-        A perfect save is neccessary. Truncated / incorrect value can result
+        A perfect save is necessary. Truncated / incorrect value can result
         in an incorrect index lookup. Truncation of trailing space is ignored
-        since that is expected for strings even in other cases.
+        for strings with a PAD SPACE collation. (When trailing space has been
+        removed, TYPE_NOTE_TRUNCATED is returned. Not to be confused with
+        TYPE_WARN_TRUNCATED, which is returned when non-space has been removed.)
+
+        TODO(khatlen): It might be better if string literals that need
+        truncation are handled during constant folding, so that we only need to
+        check for TYPE_OK here. analyze_field_constant() does not yet handle
+        string constants.
       */
       type_conversion_status retval =
           value->save_in_field_no_warnings(part->field, true);
-      if (!(retval == TYPE_OK || retval == TYPE_NOTE_TRUNCATED)) return false;
+      if (!(retval == TYPE_OK ||
+            (retval == TYPE_NOTE_TRUNCATED && part->field->is_text_key_type() &&
+             part->field->charset()->pad_attribute == PAD_SPACE))) {
+        return false;
+      }
 
       if (part->null_bit) *key_ptr++ = (uchar)(part->field->is_null());
       part->field->get_key_image(key_ptr, part->length, Field::itRAW);
@@ -1081,7 +1094,7 @@
     case Item_func::LT_FUNC:
     case Item_func::LE_FUNC:
       less_fl = true;
-      // Fall through
+      [[fallthrough]];
     case Item_func::GT_FUNC:
     case Item_func::GE_FUNC: {
       Item *item = down_cast<Item_func *>(cond)->arguments()[1];
diff -Nru mysql-8.0-8.0.26/sql/opt_trace.cc mysql-8.0-8.0.27/sql/opt_trace.cc
--- mysql-8.0-8.0.26/sql/opt_trace.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/opt_trace.cc	2021-09-28 11:46:34.000000000 +0000
@@ -187,8 +187,7 @@
     return trace_buffer.alloced_length() + query_buffer.alloced_length();
   }
 
-  void assert_current_struct(
-      const Opt_trace_struct *s MY_ATTRIBUTE((unused))) const {
+  void assert_current_struct(const Opt_trace_struct *s [[maybe_unused]]) const {
     assert(current_struct == s);
   }
 
diff -Nru mysql-8.0-8.0.26/sql/parse_file.cc mysql-8.0-8.0.27/sql/parse_file.cc
--- mysql-8.0-8.0.26/sql/parse_file.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/parse_file.cc	2021-09-28 11:46:34.000000000 +0000
@@ -517,9 +517,10 @@
     true  Error
 */
 
-bool File_parser_dummy_hook::process_unknown_string(
-    const char *&unknown_key MY_ATTRIBUTE((unused)), uchar *, MEM_ROOT *,
-    const char *) {
+bool File_parser_dummy_hook::process_unknown_string(const char *&unknown_key
+                                                    [[maybe_unused]],
+                                                    uchar *, MEM_ROOT *,
+                                                    const char *) {
   DBUG_TRACE;
   DBUG_PRINT("info", ("Unknown key: '%60s'", unknown_key));
   return false;
diff -Nru mysql-8.0-8.0.26/sql/parser_service.cc mysql-8.0-8.0.27/sql/parser_service.cc
--- mysql-8.0-8.0.26/sql/parser_service.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/parser_service.cc	2021-09-28 11:46:34.000000000 +0000
@@ -250,6 +250,7 @@
   Parser_state parser_state;
   if (parser_state.init(thd, query.str, query.length)) return 1;
 
+  parser_state.m_input.m_has_digest = true;
   parser_state.m_input.m_compute_digest = true;
   thd->m_digest = &thd->m_digest_state;
   thd->m_digest->reset(thd->m_token_array, max_digest_length);
@@ -284,16 +285,20 @@
   switch (lex->sql_command) {
     case SQLCOM_SELECT:
       return STATEMENT_TYPE_SELECT;
-    case SQLCOM_UPDATE:  // Fall through
+    case SQLCOM_UPDATE:
+      [[fallthrough]];
     case SQLCOM_UPDATE_MULTI:
       return STATEMENT_TYPE_UPDATE;
-    case SQLCOM_INSERT:  // Fall through
+    case SQLCOM_INSERT:
+      [[fallthrough]];
     case SQLCOM_INSERT_SELECT:
       return STATEMENT_TYPE_INSERT;
-    case SQLCOM_REPLACE:  // Fall through
+    case SQLCOM_REPLACE:
+      [[fallthrough]];
     case SQLCOM_REPLACE_SELECT:
       return STATEMENT_TYPE_REPLACE;
-    case SQLCOM_DELETE:  // Fall through
+    case SQLCOM_DELETE:
+      [[fallthrough]];
     case SQLCOM_DELETE_MULTI:
       return STATEMENT_TYPE_DELETE;
     default:
diff -Nru mysql-8.0-8.0.26/sql/parser_yystype.h mysql-8.0-8.0.27/sql/parser_yystype.h
--- mysql-8.0-8.0.26/sql/parser_yystype.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/parser_yystype.h	2021-09-28 11:46:34.000000000 +0000
@@ -26,6 +26,8 @@
 #include <assert.h>
 #include <sys/types.h>  // TODO: replace with cstdint
 
+#include <optional>
+
 #include "field_types.h"
 #include "lex_string.h"
 #include "my_base.h"
@@ -367,6 +369,10 @@
   udf_func *udf;
   LEX_USER *lex_user;
   List<LEX_USER> *user_list;
+  LEX_MFA *lex_mfa;
+  struct {
+    LEX_MFA *mfa2, *mfa3;
+  } lex_mfas;
   sys_var_with_base variable;
   enum_var_type var_type;
   keytype key_type;
diff -Nru mysql-8.0-8.0.26/sql/parse_tree_column_attrs.h mysql-8.0-8.0.27/sql/parse_tree_column_attrs.h
--- mysql-8.0-8.0.26/sql/parse_tree_column_attrs.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/parse_tree_column_attrs.h	2021-09-28 11:46:34.000000000 +0000
@@ -26,6 +26,7 @@
 #include <assert.h>
 #include <sys/types.h>  // ulong, uint. TODO: replace with cstdint
 
+#include <optional>
 #include <type_traits>
 #include <vector>
 
@@ -40,7 +41,6 @@
 #include "my_sys.h"
 #include "mysql_com.h"
 #include "mysqld_error.h"
-#include "nullable.h"
 #include "sql/derror.h"
 #include "sql/field.h"
 #include "sql/gis/srid.h"
@@ -60,8 +60,6 @@
 #include "sql/sql_parse.h"
 #include "sql/system_variables.h"
 
-using Mysql::Nullable;
-
 class String;
 
 /**
@@ -96,14 +94,15 @@
   virtual void apply_default_value(Item **) const {}
   virtual void apply_gen_default_value(Value_generator **) {}
   virtual void apply_on_update_value(Item **) const {}
-  virtual void apply_srid_modifier(Nullable<gis::srid_t> *) const {}
-  virtual bool apply_collation(
-      Column_parse_context *, const CHARSET_INFO **to MY_ATTRIBUTE((unused)),
-      bool *has_explicit_collation MY_ATTRIBUTE((unused))) const {
+  virtual void apply_srid_modifier(std::optional<gis::srid_t> *) const {}
+  virtual bool apply_collation(Column_parse_context *,
+                               const CHARSET_INFO **to [[maybe_unused]],
+                               bool *has_explicit_collation
+                               [[maybe_unused]]) const {
     return false;
   }
   virtual bool add_check_constraints(
-      Sql_check_constraint_spec_list *check_const_list MY_ATTRIBUTE((unused))) {
+      Sql_check_constraint_spec_list *check_const_list [[maybe_unused]]) {
     return false;
   }
 
@@ -133,8 +132,7 @@
     @returns false if success, true if error (e.g. if [NOT] ENFORCED follows
              something other than the CHECK clause.)
   */
-  virtual bool set_constraint_enforcement(
-      bool enforced MY_ATTRIBUTE((unused))) {
+  virtual bool set_constraint_enforcement(bool enforced [[maybe_unused]]) {
     return true;  // error
   }
 };
@@ -467,7 +465,7 @@
  public:
   explicit PT_srid_column_attr(gis::srid_t srid) : m_srid(srid) {}
 
-  void apply_srid_modifier(Nullable<gis::srid_t> *srid) const override {
+  void apply_srid_modifier(std::optional<gis::srid_t> *srid) const override {
     *srid = m_srid;
   }
 };
@@ -892,7 +890,7 @@
   Value_generator *gcol_info;
   /// Holds the expression to generate default values
   Value_generator *default_val_info;
-  Nullable<gis::srid_t> m_srid;
+  std::optional<gis::srid_t> m_srid;
   // List of column check constraint's specification.
   Sql_check_constraint_spec_list *check_const_spec_list{nullptr};
 
diff -Nru mysql-8.0-8.0.26/sql/parse_tree_hints.h mysql-8.0-8.0.27/sql/parse_tree_hints.h
--- mysql-8.0-8.0.26/sql/parse_tree_hints.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/parse_tree_hints.h	2021-09-28 11:46:34.000000000 +0000
@@ -83,8 +83,8 @@
     @param thd             Pointer to THD object
     @param str             Pointer to String object
   */
-  virtual void append_args(const THD *thd MY_ATTRIBUTE((unused)),
-                           String *str MY_ATTRIBUTE((unused))) const {}
+  virtual void append_args(const THD *thd [[maybe_unused]],
+                           String *str [[maybe_unused]]) const {}
   bool supports_view() {
     /*
       Only index hints are supported to be used in views.
diff -Nru mysql-8.0-8.0.26/sql/parse_tree_node_base.h mysql-8.0-8.0.27/sql/parse_tree_node_base.h
--- mysql-8.0-8.0.26/sql/parse_tree_node_base.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/parse_tree_node_base.h	2021-09-28 11:46:34.000000000 +0000
@@ -114,12 +114,12 @@
   typedef Context context_t;
 
   static void *operator new(size_t size, MEM_ROOT *mem_root,
-                            const std::nothrow_t &arg MY_ATTRIBUTE((unused)) =
-                                std::nothrow) noexcept {
+                            const std::nothrow_t &arg
+                            [[maybe_unused]] = std::nothrow) noexcept {
     return mem_root->Alloc(size);
   }
-  static void operator delete(void *ptr MY_ATTRIBUTE((unused)),
-                              size_t size MY_ATTRIBUTE((unused))) {
+  static void operator delete(void *ptr [[maybe_unused]],
+                              size_t size [[maybe_unused]]) {
     TRASH(ptr, size);
   }
   static void operator delete(void *, MEM_ROOT *,
diff -Nru mysql-8.0-8.0.26/sql/parse_tree_nodes.cc mysql-8.0-8.0.27/sql/parse_tree_nodes.cc
--- mysql-8.0-8.0.26/sql/parse_tree_nodes.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/parse_tree_nodes.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1708,7 +1708,8 @@
              value->csname);
     return true;
   }
-  create_info->default_table_charset = value;
+  if ((create_info->used_fields & HA_CREATE_USED_DEFAULT_COLLATE) == 0)
+    create_info->default_table_charset = value;
   create_info->used_fields |= HA_CREATE_USED_DEFAULT_CHARSET;
   return false;
 }
diff -Nru mysql-8.0-8.0.26/sql/partition_info.cc mysql-8.0-8.0.27/sql/partition_info.cc
--- mysql-8.0-8.0.26/sql/partition_info.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/partition_info.cc	2021-09-28 11:46:34.000000000 +0000
@@ -500,9 +500,9 @@
     overhead. Not yet done, since mostly only one DEFAULT function per
     table, or at least very few such columns.
   */
-  if (info.function_defaults_apply_on_columns(&full_part_field_set))
-    info.set_function_defaults(table);
-
+  if (info.function_defaults_apply_on_columns(&full_part_field_set)) {
+    if (info.set_function_defaults(table)) return true;
+  }
   {
     /*
       This function is used in INSERT; 'values' are supplied by user,
@@ -2722,7 +2722,7 @@
   return true;
 }
 
-void partition_info::print_debug(const char *str MY_ATTRIBUTE((unused)),
+void partition_info::print_debug(const char *str [[maybe_unused]],
                                  uint *value) {
   DBUG_TRACE;
   if (value)
diff -Nru mysql-8.0-8.0.26/sql/partitioning/partition_handler.cc mysql-8.0-8.0.27/sql/partitioning/partition_handler.cc
--- mysql-8.0-8.0.26/sql/partitioning/partition_handler.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/partitioning/partition_handler.cc	2021-09-28 11:46:34.000000000 +0000
@@ -144,8 +144,8 @@
     @retval false Success.
 */
 
-bool Partition_share::init_auto_inc_mutex(
-    TABLE_SHARE *table_share MY_ATTRIBUTE((unused))) {
+bool Partition_share::init_auto_inc_mutex(TABLE_SHARE *table_share
+                                          [[maybe_unused]]) {
   DBUG_TRACE;
   assert(!auto_inc_mutex);
 #ifndef NDEBUG
@@ -171,7 +171,7 @@
   @param max_reserved    End of reserved auto inc range.
 */
 void Partition_share::release_auto_inc_if_possible(
-    THD *thd, TABLE_SHARE *table_share MY_ATTRIBUTE((unused)),
+    THD *thd, TABLE_SHARE *table_share [[maybe_unused]],
     const ulonglong next_insert_id, const ulonglong max_reserved) {
   assert(auto_inc_mutex);
 
@@ -479,7 +479,7 @@
     /*
       If we have failed to set the auto-increment value for this row,
       it is highly likely that we will not be able to insert it into
-      the correct partition. We must check and fail if neccessary.
+      the correct partition. We must check and fail if necessary.
     */
     if (error) return error;
 
@@ -2105,7 +2105,7 @@
 */
 
 int Partition_helper::ph_index_next_same(uchar *buf,
-                                         uint keylen MY_ATTRIBUTE((unused))) {
+                                         uint keylen [[maybe_unused]]) {
   DBUG_TRACE;
 
   assert(keylen == m_start_key.length);
diff -Nru mysql-8.0-8.0.26/sql/partitioning/partition_handler.h mysql-8.0-8.0.27/sql/partitioning/partition_handler.h
--- mysql-8.0-8.0.26/sql/partitioning/partition_handler.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/partitioning/partition_handler.h	2021-09-28 11:46:34.000000000 +0000
@@ -216,8 +216,8 @@
     @param info  Create info.
     @return Number of default partitions.
   */
-  virtual int get_default_num_partitions(
-      HA_CREATE_INFO *info MY_ATTRIBUTE((unused))) {
+  virtual int get_default_num_partitions(HA_CREATE_INFO *info
+                                         [[maybe_unused]]) {
     return 1;
   }
   /**
@@ -228,8 +228,8 @@
 
     @param[in,out] part_info  Partition object to setup.
   */
-  virtual void set_auto_partitions(
-      partition_info *part_info MY_ATTRIBUTE((unused))) {}
+  virtual void set_auto_partitions(partition_info *part_info [[maybe_unused]]) {
+  }
   /**
     Get number of partitions for table in SE
 
@@ -240,7 +240,7 @@
     @retval false for success
     @retval true for failure, for example table didn't exist in engine
   */
-  virtual bool get_num_parts(const char *name MY_ATTRIBUTE((unused)),
+  virtual bool get_num_parts(const char *name [[maybe_unused]],
                              uint *num_parts) {
     *num_parts = 0;
     return false;
@@ -302,9 +302,7 @@
 
     @return Supported alter table flags.
   */
-  virtual uint alter_flags(uint flags MY_ATTRIBUTE((unused))) const {
-    return 0;
-  }
+  virtual uint alter_flags(uint flags [[maybe_unused]]) const { return 0; }
 
   /**
     Get partition row type from SE
@@ -335,10 +333,10 @@
 
     @sa Partition_handler::exchange_partition().
   */
-  virtual int exchange_partition_low(
-      uint part_id MY_ATTRIBUTE((unused)),
-      dd::Table *part_table_def MY_ATTRIBUTE((unused)),
-      dd::Table *swap_table_def MY_ATTRIBUTE((unused))) {
+  virtual int exchange_partition_low(uint part_id [[maybe_unused]],
+                                     dd::Table *part_table_def [[maybe_unused]],
+                                     dd::Table *swap_table_def
+                                     [[maybe_unused]]) {
     return HA_ERR_WRONG_COMMAND;
   }
 
@@ -415,7 +413,7 @@
       @retval false success.
       @retval true  failure.
   */
-  bool init_partitioning(MEM_ROOT *mem_root MY_ATTRIBUTE((unused))) {
+  bool init_partitioning(MEM_ROOT *mem_root [[maybe_unused]]) {
 #ifndef NDEBUG
     m_key_not_found_partitions.bitmap = nullptr;
 #endif
@@ -827,7 +825,7 @@
   /** Release auto_increment in all underlying partitions. */
   virtual void release_auto_increment_all_parts() {}
   /** Save or persist the current max auto increment. */
-  virtual void save_auto_increment(ulonglong nr MY_ATTRIBUTE((unused))) {}
+  virtual void save_auto_increment(ulonglong nr [[maybe_unused]]) {}
   /**
     Per partition equivalent of rnd_* and index_* functions.
 
@@ -878,8 +876,8 @@
       @retval    0   Success.
       @retval != 0   Error code.
   */
-  virtual int init_record_priority_queue_for_parts(
-      uint used_parts MY_ATTRIBUTE((unused))) {
+  virtual int init_record_priority_queue_for_parts(uint used_parts
+                                                   [[maybe_unused]]) {
     return 0;
   }
   /**
@@ -892,8 +890,7 @@
 
     @param part_id  Partition to checksum.
   */
-  virtual ha_checksum checksum_in_part(
-      uint part_id MY_ATTRIBUTE((unused))) const {
+  virtual ha_checksum checksum_in_part(uint part_id [[maybe_unused]]) const {
     assert(0);
     return 0;
   }
diff -Nru mysql-8.0-8.0.26/sql/persisted_variable.cc mysql-8.0-8.0.27/sql/persisted_variable.cc
--- mysql-8.0-8.0.26/sql/persisted_variable.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/persisted_variable.cc	2021-09-28 11:46:34.000000000 +0000
@@ -129,8 +129,8 @@
 
 #ifdef HAVE_PSI_INTERFACE
 void my_init_persist_psi_keys(void) {
-  const char *category MY_ATTRIBUTE((unused)) = "persist";
-  int count MY_ATTRIBUTE((unused));
+  const char *category [[maybe_unused]] = "persist";
+  int count [[maybe_unused]];
 
 #ifdef HAVE_PSI_FILE_INTERFACE
   count = sizeof(all_persist_files) / sizeof(all_persist_files[0]);
@@ -207,7 +207,7 @@
 #endif
 
   int temp_argc = *argc;
-  MEM_ROOT alloc{PSI_NOT_INSTRUMENTED, 512};
+  MEM_ROOT alloc{key_memory_persisted_variables, 512};
   char *ptr, **res, *datadir = nullptr;
   char dir[FN_REFLEN] = {0}, local_datadir_buffer[FN_REFLEN] = {0};
   const char *dirs = NULL;
@@ -222,7 +222,6 @@
        0, nullptr, 0, nullptr}};
 
   /* create temporary args list and pass it to handle_options */
-  init_alloc_root(key_memory_persisted_variables, &alloc, 512, 0);
   if (!(ptr =
             (char *)alloc.Alloc(sizeof(alloc) + (*argc + 1) * sizeof(char *))))
     return 1;
@@ -233,11 +232,11 @@
   my_getopt_skip_unknown = true;
   if (my_handle_options(&temp_argc, &res, persist_options, nullptr, nullptr,
                         true)) {
-    free_root(&alloc, MYF(0));
+    alloc.Clear();
     return 1;
   }
   my_getopt_skip_unknown = false;
-  free_root(&alloc, MYF(0));
+  alloc.Clear();
 
   persisted_globals_load = persist_load;
 
@@ -449,10 +448,9 @@
   mysql_mutex_lock(&LOCK_global_system_variables);
   value = get_one_variable(thd, show, OPT_GLOBAL, show->type, nullptr, &fromcs,
                            val_buf, &val_length, is_null);
-  mysql_mutex_unlock(&LOCK_global_system_variables);
-
   /* convert the retrieved value to utf8mb4 */
   str->copy(value, val_length, fromcs, tocs, &dummy_err);
+  mysql_mutex_unlock(&LOCK_global_system_variables);
   return str;
 }
 
@@ -680,12 +678,14 @@
    @param [in] plugin_options      Flag which tells what options are being set.
                                    If set to false non plugin variables are set
                                    else plugin variables are set
-
+   @param [in] lock_vars           Lock @ref LOCK_system_variables_hash and
+  release if if true.
   @return Error state
     @retval true An error occurred
     @retval false Success
 */
-bool Persisted_variables_cache::set_persist_options(bool plugin_options) {
+bool Persisted_variables_cache::set_persist_options(bool plugin_options,
+                                                    bool lock_vars) {
   THD *thd;
   LEX lex_tmp, *sav_lex = nullptr;
   List<set_var_base> tmp_var_list;
@@ -743,6 +743,7 @@
   */
   lock();
   assert_lock_owner();
+  if (lock_vars) mysql_rwlock_rdlock(&LOCK_system_variables_hash);
   /*
     Based on plugin_options, we decide on what options to be set. If
     plugin_options is false we set all non plugin variables and then
@@ -914,6 +915,7 @@
   } else {
     thd->lex = sav_lex;
   }
+  if (lock_vars) mysql_rwlock_unlock(&LOCK_system_variables_hash);
   unlock();
   return result;
 }
@@ -1083,6 +1085,7 @@
         }
       };
   lock();
+  mysql_rwlock_rdlock(&LOCK_system_variables_hash);
 
   for (auto iter : var_set) {
     insert_alias(
@@ -1104,6 +1107,7 @@
         [&](st_persist_var &v) { m_persist_ro_variables[v.key] = v; },
         pair.second);
   }
+  mysql_rwlock_unlock(&LOCK_system_variables_hash);
   unlock();
 
   // Generate deprecation warnings
@@ -1206,12 +1210,10 @@
 bool Persisted_variables_cache::append_read_only_variables(
     int *argc, char ***argv, bool plugin_options) {
   Prealloced_array<char *, 100> my_args(key_memory_persisted_variables);
-  MEM_ROOT alloc;
+  MEM_ROOT alloc(key_memory_persisted_variables, 512);
 
   if (*argc < 2 || no_defaults || !persisted_globals_load) return false;
 
-  init_alloc_root(key_memory_persisted_variables, &alloc, 512, 0);
-
   /* create a set of values sorted by timestamp */
   std::multiset<st_persist_var, sort_tv_by_timestamp> sorted_vars;
   for (auto iter : m_persist_ro_variables) sorted_vars.insert(iter.second);
@@ -1340,8 +1342,14 @@
     if (erase_variable(name)) goto end;
 
     // If the variable has an alias, erase that too.
-    const char *alias = get_variable_alias(name);
-    if (alias && erase_variable(alias)) goto end;
+    std::string alias_name;
+    mysql_rwlock_rdlock(&LOCK_system_variables_hash);
+    {
+      const char *alias = get_variable_alias(name);
+      if (alias) alias_name.assign(alias);
+    }
+    mysql_rwlock_unlock(&LOCK_system_variables_hash);
+    if (!alias_name.empty() && erase_variable(alias_name.c_str())) goto end;
 
     if (!found) {
       /* if not present and IF EXISTS is specified, report warning */
@@ -1385,6 +1393,6 @@
 void Persisted_variables_cache::cleanup() {
   mysql_mutex_destroy(&m_LOCK_persist_variables);
   mysql_mutex_destroy(&m_LOCK_persist_file);
-  free_root(&ro_persisted_argv_alloc, MYF(0));
-  free_root(&ro_persisted_plugin_argv_alloc, MYF(0));
+  ro_persisted_argv_alloc.Clear();
+  ro_persisted_plugin_argv_alloc.Clear();
 }
diff -Nru mysql-8.0-8.0.26/sql/persisted_variable.h mysql-8.0-8.0.27/sql/persisted_variable.h
--- mysql-8.0-8.0.26/sql/persisted_variable.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/persisted_variable.h	2021-09-28 11:46:34.000000000 +0000
@@ -118,10 +118,7 @@
     Search for persisted config file and if found read persistent options
   */
   bool load_persist_file();
-  /**
-    Set persisted options
-  */
-  bool set_persist_options(bool plugin_options = false);
+  bool set_persist_options(bool plugin_options, bool lock_vars);
   /**
     Reset persisted options
   */
diff -Nru mysql-8.0-8.0.26/sql/protobuf/CMakeLists.txt mysql-8.0-8.0.27/sql/protobuf/CMakeLists.txt
--- mysql-8.0-8.0.26/sql/protobuf/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/protobuf/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,40 @@
+# Copyright (c) 2021, Oracle 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,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+INCLUDE(${CMAKE_SOURCE_DIR}/cmake/protobuf.cmake)
+
+SET(PROTOBUF_LITE_LIB_NAME rpl_protobuf_lite)
+
+SET(PROTOBUF_LITE_GENERATE_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated/protobuf_lite")
+FILE(MAKE_DIRECTORY ${PROTOBUF_LITE_GENERATE_DIR})
+
+SET(MY_PROTOBUF_PROTO_FILES
+  "${CMAKE_CURRENT_SOURCE_DIR}/replication_asynchronous_connection_failover.proto"
+)
+
+MYSQL_PROTOBUF_GENERATE_CPP_LIBRARY(
+  ${PROTOBUF_LITE_LIB_NAME}
+  ${MY_PROTOBUF_PROTO_FILES}
+  OUTPUT_DIRECTORY ${PROTOBUF_LITE_GENERATE_DIR}
+  ADDITIONAL_COMMENT "- lite version")
+
+SET(RPL_PROTOBUF_LITE_LIB ${PROTOBUF_LITE_LIB_NAME} PARENT_SCOPE)
diff -Nru mysql-8.0-8.0.26/sql/protobuf/replication_asynchronous_connection_failover.proto mysql-8.0-8.0.27/sql/protobuf/replication_asynchronous_connection_failover.proto
--- mysql-8.0-8.0.26/sql/protobuf/replication_asynchronous_connection_failover.proto	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/protobuf/replication_asynchronous_connection_failover.proto	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,77 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+syntax = "proto2";
+
+option optimize_for = LITE_RUNTIME;
+
+package protobuf_replication_asynchronous_connection_failover;
+
+message Source {
+  required string channel = 1;
+  required string host = 2;
+  required uint64 port = 3;
+  required string network_namespace = 4;
+  required uint64 weight = 5;
+  required string managed_name = 6;
+}
+
+message SourceList {
+  required string origin = 1;
+  required uint64 version = 2;
+  repeated Source source = 3;
+}
+
+message Managed {
+  required string channel = 1;
+  required string managed_name = 2;
+  required string managed_type = 3;
+  required string configuration = 4;
+}
+
+message ManagedList {
+  required string origin = 1;
+  required uint64 version = 2;
+  repeated Managed managed = 3;
+}
+
+message VariableStatus {
+  required string channel = 1;
+  required string key = 2;
+  required uint32 status = 3;
+}
+
+message VariableStatusList {
+  required string origin = 1;
+  required uint64 version = 2;
+  repeated VariableStatus status = 3;
+}
+
+message SourceAndManagedAndStatusList {
+  required string origin = 1;
+  required uint64 source_version = 2;
+  repeated Source source = 3;
+  required uint64 managed_version = 4;
+  repeated Managed managed = 5;
+  required uint64 status_version = 6;
+  repeated VariableStatus status = 7;
+}
diff -Nru mysql-8.0-8.0.26/sql/protocol_classic.cc mysql-8.0-8.0.27/sql/protocol_classic.cc
--- mysql-8.0-8.0.26/sql/protocol_classic.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/protocol_classic.cc	2021-09-28 11:46:34.000000000 +0000
@@ -760,6 +760,9 @@
 
   <table>
   <tr><th>Type</th><th>Name</th><th>Description</th></tr>
+  <tr><td>@ref a_protocol_type_int1 "int&lt;1&gt;"</td>
+      <td>mandatory flag</td>
+      <td>Defines if this tracker should be mandatory or not</td></tr>
   <tr><td>@ref sect_protocol_basic_dt_string_le "string&lt;lenenc&gt;"</td>
       <td>name</td>
       <td>name of the changed system variable</td></tr>
@@ -774,7 +777,7 @@
   <table><tr>
   <td>
   ~~~~~~~~~~~~~~~~~~~~~
-  00 0f1 0a 61 75 74 6f 63   6f 6d 6d 69 74 03 4f 46 46
+  00 00 0f1 0a 61 75 74 6f 63   6f 6d 6d 69 74 03 4f 46 46
   ~~~~~~~~~~~~~~~~~~~~~
   </td><td>
   ~~~~~~~~~~~~~~~~~~~~~
@@ -786,6 +789,9 @@
 
   <table>
   <tr><th>Type</th><th>Name</th><th>Description</th></tr>
+    <tr><td>@ref a_protocol_type_int1 "int&lt;1&gt;"</td>
+      <td>mandatory flag</td>
+      <td>Defines if this tracker should be mandatory or not</td></tr>
   <tr><td>@ref sect_protocol_basic_dt_string_le "string&lt;lenenc&gt;"</td>
       <td>name</td>
       <td>name of the changed schema</td></tr>
@@ -798,7 +804,7 @@
   <table><tr>
   <td>
   ~~~~~~~~~~~~~~~~~~~~~
-  01 05 04 74 65 73 74
+  01 00 05 04 74 65 73 74
   ~~~~~~~~~~~~~~~~~~~~~
   </td><td>
   ~~~~~~~~~~~~~~~~~~~~~
@@ -813,6 +819,9 @@
 
   <table>
   <tr><th>Type</th><th>Name</th><th>Description</th></tr>
+    <tr><td>@ref a_protocol_type_int1 "int&lt;1&gt;"</td>
+      <td>mandatory flag</td>
+      <td>Defines if this tracker should be mandatory or not</td></tr>
   <tr><td>@ref sect_protocol_basic_dt_string_le "string&lt;lenenc&gt;"</td>
   <td>is_tracked</td>
   <td>`0x31` ("1") if state tracking got enabled.</td></tr>
@@ -825,7 +834,7 @@
   <table><tr>
   <td>
   ~~~~~~~~~~~~~~~~~~~~~
-  03 02 01 31
+  03 02 00 01 31
   ~~~~~~~~~~~~~~~~~~~~~
   </td><td>
   ~~~~~~~~~~~~~~~~~~~~~
@@ -3512,7 +3521,7 @@
   if (pos == nullptr) return true;
 
   int string_length = DECIMAL_MAX_STR_LENGTH + 1;
-  int error MY_ATTRIBUTE((unused)) =
+  int error [[maybe_unused]] =
       decimal2string(d, pos + 1, &string_length, prec, dec);
 
   // decimal2string() can only fail with E_DEC_TRUNCATED or E_DEC_OVERFLOW.
diff -Nru mysql-8.0-8.0.26/sql/psi_memory_key.cc mysql-8.0-8.0.27/sql/psi_memory_key.cc
--- mysql-8.0-8.0.26/sql/psi_memory_key.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/psi_memory_key.cc	2021-09-28 11:46:34.000000000 +0000
@@ -67,7 +67,6 @@
 PSI_memory_key key_memory_Owned_gtids_to_string;
 PSI_memory_key key_memory_PROFILE;
 PSI_memory_key key_memory_QUICK_RANGE_SELECT_mrr_buf_desc;
-PSI_memory_key key_memory_Quick_ranges;
 PSI_memory_key key_memory_READ_INFO;
 PSI_memory_key key_memory_READ_RECORD_cache;
 PSI_memory_key key_memory_xa_recovered_transactions;
@@ -123,11 +122,6 @@
 PSI_memory_key key_memory_prepared_statement_main_mem_root;
 PSI_memory_key key_memory_partitions_prune_exec;
 PSI_memory_key key_memory_queue_item;
-PSI_memory_key key_memory_quick_group_min_max_select_root;
-PSI_memory_key key_memory_quick_index_merge_root;
-PSI_memory_key key_memory_quick_range_select_root;
-PSI_memory_key key_memory_quick_ror_intersect_select_root;
-PSI_memory_key key_memory_quick_ror_union_select_root;
 PSI_memory_key key_memory_rm_db_mdl_reqs_root;
 PSI_memory_key key_memory_rm_table_foreach_root;
 PSI_memory_key key_memory_rpl_filter;
@@ -192,16 +186,6 @@
      0, "Mem root for objects with same life time as stored program call."},
     {&key_memory_table_mapping_root, "table_mapping::m_mem_root", 0, 0,
      PSI_DOCUMENT_ME},
-    {&key_memory_quick_range_select_root, "QUICK_RANGE_SELECT::alloc",
-     PSI_FLAG_THREAD, 0, PSI_DOCUMENT_ME},
-    {&key_memory_quick_index_merge_root, "QUICK_INDEX_MERGE_SELECT::alloc",
-     PSI_FLAG_THREAD, 0, PSI_DOCUMENT_ME},
-    {&key_memory_quick_ror_intersect_select_root,
-     "QUICK_ROR_INTERSECT_SELECT::alloc", PSI_FLAG_THREAD, 0, PSI_DOCUMENT_ME},
-    {&key_memory_quick_ror_union_select_root, "QUICK_ROR_UNION_SELECT::alloc",
-     PSI_FLAG_THREAD, 0, PSI_DOCUMENT_ME},
-    {&key_memory_quick_group_min_max_select_root,
-     "QUICK_GROUP_MIN_MAX_SELECT::alloc", PSI_FLAG_THREAD, 0, PSI_DOCUMENT_ME},
     {&key_memory_test_quick_select_exec, "test_quick_select", PSI_FLAG_THREAD,
      0, PSI_DOCUMENT_ME},
     {&key_memory_partitions_prune_exec, "Partition::prune_exec", 0, 0,
@@ -359,7 +343,6 @@
     {&key_memory_READ_RECORD_cache, "READ_RECORD_cache", 0, 0, PSI_DOCUMENT_ME},
     {&key_memory_xa_recovered_transactions, "XA::recovered_transactions", 0, 0,
      "List infrastructure for recovered XA transactions."},
-    {&key_memory_Quick_ranges, "Quick_ranges", 0, 0, PSI_DOCUMENT_ME},
     {&key_memory_File_query_log_name, "File_query_log::name",
      PSI_FLAG_ONLY_GLOBAL_STAT, 0, PSI_DOCUMENT_ME},
     {&key_memory_thd_timer, "thd_timer", 0, 0, "Thread timer object."},
diff -Nru mysql-8.0-8.0.26/sql/psi_memory_key.h mysql-8.0-8.0.27/sql/psi_memory_key.h
--- mysql-8.0-8.0.26/sql/psi_memory_key.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/psi_memory_key.h	2021-09-28 11:46:34.000000000 +0000
@@ -91,7 +91,6 @@
 extern PSI_memory_key key_memory_Owned_gtids_to_string;
 extern PSI_memory_key key_memory_PROFILE;
 extern PSI_memory_key key_memory_QUICK_RANGE_SELECT_mrr_buf_desc;
-extern PSI_memory_key key_memory_Quick_ranges;
 extern PSI_memory_key key_memory_READ_INFO;
 extern PSI_memory_key key_memory_READ_RECORD_cache;
 extern PSI_memory_key key_memory_xa_recovered_transactions;
@@ -147,11 +146,6 @@
 extern PSI_memory_key key_memory_prepared_statement_main_mem_root;
 extern PSI_memory_key key_memory_partitions_prune_exec;
 extern PSI_memory_key key_memory_queue_item;
-extern PSI_memory_key key_memory_quick_group_min_max_select_root;
-extern PSI_memory_key key_memory_quick_index_merge_root;
-extern PSI_memory_key key_memory_quick_range_select_root;
-extern PSI_memory_key key_memory_quick_ror_intersect_select_root;
-extern PSI_memory_key key_memory_quick_ror_union_select_root;
 extern PSI_memory_key key_memory_rm_db_mdl_reqs_root;
 extern PSI_memory_key key_memory_rm_table_foreach_root;
 extern PSI_memory_key key_memory_rpl_filter;
diff -Nru mysql-8.0-8.0.26/sql/query_result.h mysql-8.0-8.0.27/sql/query_result.h
--- mysql-8.0-8.0.26/sql/query_result.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/query_result.h	2021-09-28 11:46:34.000000000 +0000
@@ -185,7 +185,7 @@
     @param t  TABLE to answer for
     @return   true if "on the fly"
   */
-  virtual bool immediate_update(TABLE_LIST *t MY_ATTRIBUTE((unused))) const {
+  virtual bool immediate_update(TABLE_LIST *t [[maybe_unused]]) const {
     assert(false);
     return false;
   }
diff -Nru mysql-8.0-8.0.26/sql/range_optimizer/geometry.cc mysql-8.0-8.0.27/sql/range_optimizer/geometry.cc
--- mysql-8.0-8.0.26/sql/range_optimizer/geometry.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/range_optimizer/geometry.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,61 @@
+/* Copyright (c) 2000, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include "sql/range_optimizer/geometry.h"
+
+#include <stddef.h>
+
+#include "my_base.h"
+#include "my_dbug.h"
+#include "sql/handler.h"
+#include "sql/range_optimizer/range_optimizer.h"
+
+/* Get next for geometrical indexes */
+
+int QUICK_RANGE_SELECT_GEOM::get_next() {
+  DBUG_TRACE;
+
+  for (;;) {
+    int result;
+    if (last_range) {
+      // Already read through key
+      result = file->ha_index_next_same(record, last_range->min_key,
+                                        last_range->min_length);
+      if (result != HA_ERR_END_OF_FILE) return result;
+    }
+
+    const size_t count = ranges.size() - (cur_range - ranges.begin());
+    if (count == 0) {
+      /* Ranges have already been used up before. None is left for read. */
+      last_range = nullptr;
+      return HA_ERR_END_OF_FILE;
+    }
+    last_range = *(cur_range++);
+
+    result = file->ha_index_read_map(record, last_range->min_key,
+                                     last_range->min_keypart_map,
+                                     last_range->rkey_func_flag);
+    if (result != HA_ERR_KEY_NOT_FOUND && result != HA_ERR_END_OF_FILE)
+      return result;
+    last_range = nullptr;  // Not found, to next range
+  }
+}
diff -Nru mysql-8.0-8.0.26/sql/range_optimizer/geometry.h mysql-8.0-8.0.27/sql/range_optimizer/geometry.h
--- mysql-8.0-8.0.26/sql/range_optimizer/geometry.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/range_optimizer/geometry.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,47 @@
+/* Copyright (c) 2000, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef SQL_RANGE_OPTIMIZER_GEOMETRY_H_
+#define SQL_RANGE_OPTIMIZER_GEOMETRY_H_
+
+#include <sys/types.h>
+
+#include "sql/range_optimizer/range_scan.h"
+
+class THD;
+struct MEM_ROOT;
+struct TABLE;
+
+class QUICK_RANGE_SELECT_GEOM : public QUICK_RANGE_SELECT {
+ public:
+  QUICK_RANGE_SELECT_GEOM(TABLE *table, uint index_arg,
+                          MEM_ROOT *return_mem_root, uint mrr_flags_arg,
+                          uint mrr_buf_size_arg, const KEY_PART *key,
+                          Bounds_checked_array<QUICK_RANGE *> ranges_arg,
+                          uint used_keyparts_arg)
+      : QUICK_RANGE_SELECT(table, index_arg, return_mem_root, mrr_flags_arg,
+                           mrr_buf_size_arg, key, ranges_arg,
+                           used_keyparts_arg) {}
+  int get_next() override;
+};
+
+#endif  // SQL_RANGE_OPTIMIZER_GEOMETRY_H_
diff -Nru mysql-8.0-8.0.26/sql/range_optimizer/group_min_max.cc mysql-8.0-8.0.27/sql/range_optimizer/group_min_max.cc
--- mysql-8.0-8.0.26/sql/range_optimizer/group_min_max.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/range_optimizer/group_min_max.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,1073 @@
+/* Copyright (c) 2000, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include "sql/range_optimizer/group_min_max.h"
+
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+#include <new>
+
+#include "my_dbug.h"
+#include "my_sys.h"
+#include "mysql/components/services/bits/psi_bits.h"
+#include "prealloced_array.h"
+#include "sql/handler.h"
+#include "sql/item_sum.h"
+#include "sql/psi_memory_key.h"
+#include "sql/range_optimizer/internal.h"
+#include "sql/range_optimizer/range_scan.h"
+#include "sql/range_optimizer/tree.h"
+#include "sql/sql_class.h"
+#include "sql/sql_list.h"
+#include "sql/sql_optimizer.h"
+#include "sql/system_variables.h"
+#include "sql/table.h"
+#include "sql/thr_malloc.h"
+
+void QUICK_GROUP_MIN_MAX_SELECT::add_info_string(String *str) {
+  str->append(STRING_WITH_LEN("index_for_group_by("));
+  str->append(index_info->name);
+  str->append(')');
+}
+
+/*
+  Construct new quick select for group queries with min/max.
+
+  SYNOPSIS
+    QUICK_GROUP_MIN_MAX_SELECT::QUICK_GROUP_MIN_MAX_SELECT()
+    table             The table being accessed
+    join              Descriptor of the current query
+    have_min          true if the query selects a MIN function
+    have_max          true if the query selects a MAX function
+    have_agg_distinct
+    min_max_arg_part  The only argument field of all MIN/MAX functions
+    group_prefix_len  Length of all key parts in the group prefix
+    used_key_parts    Number of key parts used, including the min_max key part
+    real_key_parts    Same, but excluding any min_max key part
+    max_used_key_length  Length of longest key
+    index_info        The index chosen for data access
+    use_index         The id of index_info
+    read_cost         Cost of this access method
+    records           Number of records returned
+    key_infix_len     Length of the key infix appended to the group prefix
+    return_mem_root   Memory pool for this and quick_prefix_query_block data
+    is_index_scan     get the next different key not by jumping on it via
+                      index read, but by scanning until the end of the
+                      rows with equal key value.
+    quick_prefix_query_block
+                      Child scan to get prefix keys
+    key_infix_ranges  Ranges to scan for the infix key part(s)
+    min_max_ranges    Ranges to scan for the MIN/MAX key part
+*/
+
+QUICK_GROUP_MIN_MAX_SELECT::QUICK_GROUP_MIN_MAX_SELECT(
+    TABLE *table, JOIN *join_arg, bool have_min_arg, bool have_max_arg,
+    bool have_agg_distinct_arg, KEY_PART_INFO *min_max_arg_part_arg,
+    uint group_prefix_len_arg, uint group_key_parts_arg,
+    uint used_key_parts_arg, uint real_key_parts_arg,
+    uint max_used_key_length_arg, KEY *index_info_arg, uint use_index,
+    const Cost_estimate *read_cost_arg, ha_rows records_arg,
+    uint key_infix_len_arg, MEM_ROOT *return_mem_root, bool is_index_scan_arg,
+    QUICK_RANGE_SELECT *quick_prefix_query_block_arg,
+    Quick_ranges_array key_infix_ranges_arg, Quick_ranges min_max_ranges_arg)
+    : join(join_arg),
+      index_info(index_info_arg),
+      group_prefix_len(group_prefix_len_arg),
+      group_key_parts(group_key_parts_arg),
+      have_min(have_min_arg),
+      have_max(have_max_arg),
+      have_agg_distinct(have_agg_distinct_arg),
+      seen_first_key(false),
+      min_max_arg_part(min_max_arg_part_arg),
+      key_infix_len(key_infix_len_arg),
+      min_max_ranges(std::move(min_max_ranges_arg)),
+      key_infix_ranges(std::move(key_infix_ranges_arg)),
+      is_index_scan(is_index_scan_arg),
+      mem_root(return_mem_root),
+      quick_prefix_query_block(quick_prefix_query_block_arg) {
+  m_table = table;
+  index = use_index;
+  record = m_table->record[0];
+  tmp_record = m_table->record[1];
+  cost_est = *read_cost_arg;
+  records = records_arg;
+  used_key_parts = used_key_parts_arg;
+  real_key_parts = real_key_parts_arg;
+  max_used_key_length = max_used_key_length_arg;
+  real_prefix_len = group_prefix_len + key_infix_len;
+  group_prefix = nullptr;
+  min_max_arg_len = min_max_arg_part ? min_max_arg_part->store_length : 0;
+  min_max_keypart_asc =
+      min_max_arg_part ? !(min_max_arg_part->key_part_flag & HA_REVERSE_SORT)
+                       : false;
+  memset(cur_infix_range_position, 0, sizeof(cur_infix_range_position));
+}
+
+/*
+  Do post-constructor initialization.
+
+  SYNOPSIS
+    QUICK_GROUP_MIN_MAX_SELECT::init()
+
+  DESCRIPTION
+    The method performs initialization that cannot be done in the constructor
+    such as memory allocations that may fail. It allocates memory for the
+    group prefix buffer, and for the lists of MIN/MAX item to be
+    updated during execution.
+
+  RETURN
+    0      OK
+    other  Error code
+*/
+
+int QUICK_GROUP_MIN_MAX_SELECT::init() {
+  if (group_prefix) /* Already initialized. */
+    return 0;
+
+  if (!(last_prefix = (uchar *)mem_root->Alloc(group_prefix_len))) return 1;
+  /*
+    We may use group_prefix to store keys with all select fields, so allocate
+    enough space for it.
+  */
+  if (!(group_prefix =
+            (uchar *)mem_root->Alloc(real_prefix_len + min_max_arg_len)))
+    return 1;
+
+  if (min_max_arg_part) {
+    Item_sum *min_max_item;
+    Item_sum **func_ptr = join->sum_funcs;
+    while ((min_max_item = *(func_ptr++))) {
+      if (have_min && (min_max_item->sum_func() == Item_sum::MIN_FUNC))
+        min_functions.push_back(min_max_item);
+      else if (have_max && (min_max_item->sum_func() == Item_sum::MAX_FUNC))
+        max_functions.push_back(min_max_item);
+    }
+  }
+
+  return 0;
+}
+
+QUICK_GROUP_MIN_MAX_SELECT::~QUICK_GROUP_MIN_MAX_SELECT() {
+  DBUG_TRACE;
+  if (m_table->file->inited)
+    /*
+      We may have used this object for index access during
+      create_sort_index() and then switched to rnd access for the rest
+      of execution. Since we don't do cleanup until now, we must call
+      ha_*_end() for whatever is the current access method.
+    */
+    m_table->file->ha_index_or_rnd_end();
+
+  for (Quick_ranges *ranges : key_infix_ranges) destroy(ranges);
+  destroy(quick_prefix_query_block);
+}
+
+/*
+  Initialize a quick group min/max select for key retrieval.
+
+  SYNOPSIS
+    QUICK_GROUP_MIN_MAX_SELECT::reset()
+
+  DESCRIPTION
+    Initialize the index chosen for access and find and store the prefix
+    of the last group. The method is expensive since it performs disk access.
+
+  RETURN
+    0      OK
+    other  Error code
+*/
+
+int QUICK_GROUP_MIN_MAX_SELECT::reset(void) {
+  int result;
+  DBUG_TRACE;
+
+  seen_first_key = false;
+  m_table->set_keyread(true); /* We need only the key attributes */
+  /*
+    Request ordered index access as usage of ::index_last(),
+    ::index_first() within QUICK_GROUP_MIN_MAX_SELECT depends on it.
+  */
+  if (m_table->file->inited) m_table->file->ha_index_or_rnd_end();
+  if ((result = m_table->file->ha_index_init(index, true))) {
+    m_table->file->print_error(result, MYF(0));
+    return result;
+  }
+  if (quick_prefix_query_block && quick_prefix_query_block->reset()) return 1;
+
+  result = m_table->file->ha_index_last(record);
+  if (result != 0) {
+    if (result == HA_ERR_END_OF_FILE)
+      return 0;
+    else
+      return result;
+  }
+
+  /* Save the prefix of the last group. */
+  key_copy(last_prefix, record, index_info, group_prefix_len);
+
+  return 0;
+}
+
+/*
+  Get the next key containing the MIN and/or MAX key for the next group.
+
+  SYNOPSIS
+    QUICK_GROUP_MIN_MAX_SELECT::get_next()
+
+  DESCRIPTION
+    The method finds the next subsequent group of records that satisfies the
+    query conditions and finds the keys that contain the MIN/MAX values for
+    the key part referenced by the MIN/MAX function(s). Once a group and its
+    MIN/MAX values are found, store these values in the Item_sum objects for
+    the MIN/MAX functions. The rest of the values in the result row are stored
+    in the Item_field::result_field of each select field. If the query does
+    not contain MIN and/or MAX functions, then the function only finds the
+    group prefix, which is a query answer itself.
+
+  NOTES
+    If both MIN and MAX are computed, then we use the fact that if there is
+    no MIN key, there can't be a MAX key as well, so we can skip looking
+    for a MAX key in this case.
+
+  RETURN
+    0                  on success
+    HA_ERR_END_OF_FILE if returned all keys
+    other              if some error occurred
+*/
+
+int QUICK_GROUP_MIN_MAX_SELECT::get_next() {
+  int result;
+  int is_last_prefix = 0;
+
+  DBUG_TRACE;
+
+  /*
+    Loop until a group is found that satisfies all query conditions or the last
+    group is reached.
+  */
+  do {
+    result = next_prefix();
+    /*
+      Check if this is the last group prefix. Notice that at this point
+      this->record contains the current prefix in record format.
+    */
+    if (!result) {
+      is_last_prefix =
+          key_cmp(index_info->key_part, last_prefix, group_prefix_len);
+      assert(is_last_prefix <= 0);
+    } else {
+      if (result == HA_ERR_KEY_NOT_FOUND) continue;
+      break;
+    }
+
+    // Reset current infix range and min/max function as a new group is
+    // starting.
+    reset_group();
+    // TRUE if at least one group satisfied the prefix and infix condition is
+    // found.
+    bool found_result = false;
+    // Reset MIN/MAX value only for the first infix range.
+    bool reset_min_value = true;
+    bool reset_max_value = true;
+    while (!append_next_infix()) {
+      assert(!result || !is_index_access_error(result));
+      if (have_min || have_max) {
+        if (min_max_keypart_asc) {
+          if (have_min) {
+            if (!(result = next_min()))
+              update_min_result(&reset_min_value);
+            else {
+              DBUG_EXECUTE_IF("bug30769515_QUERY_INTERRUPTED",
+                              result = HA_ERR_QUERY_INTERRUPTED;);
+              if (is_index_access_error(result)) return result;
+              continue;  // Record is not found, no reason to call next_max()
+            }
+          }
+          if (have_max) {
+            if (!(result = next_max()))
+              update_max_result(&reset_max_value);
+            else if (is_index_access_error(result))
+              return result;
+          }
+        } else {
+          // Call next_max() first and then next_min() if
+          // MIN/MAX key part is descending.
+          if (have_max) {
+            if (!(result = next_max()))
+              update_max_result(&reset_max_value);
+            else {
+              DBUG_EXECUTE_IF("bug30769515_QUERY_INTERRUPTED",
+                              result = HA_ERR_QUERY_INTERRUPTED;);
+              if (is_index_access_error(result)) return result;
+              continue;  // Record is not found, no reason to call next_min()
+            }
+          }
+          if (have_min) {
+            if (!(result = next_min()))
+              update_min_result(&reset_min_value);
+            else if (is_index_access_error(result))
+              return result;
+          }
+        }
+        if (!result) found_result = true;
+      } else if (key_infix_len > 0) {
+        /*
+          If this is just a GROUP BY or DISTINCT without MIN or MAX and there
+          are equality predicates for the key parts after the group, find the
+          first sub-group with the extended prefix. There is no need to iterate
+          through the whole group to accumulate the MIN/MAX and returning just
+          the one distinct record is enough.
+        */
+        if (!(result = m_table->file->ha_index_read_map(
+                  record, group_prefix, make_prev_keypart_map(real_key_parts),
+                  HA_READ_KEY_EXACT)) ||
+            is_index_access_error(result))
+          return result;
+      }
+    }
+    if (seen_all_infix_ranges && found_result) return 0;
+  } while (!is_index_access_error(result) && is_last_prefix != 0);
+
+  if (result == HA_ERR_KEY_NOT_FOUND) result = HA_ERR_END_OF_FILE;
+
+  return result;
+}
+
+/*
+  Retrieve the minimal key in the next group.
+
+  SYNOPSIS
+    QUICK_GROUP_MIN_MAX_SELECT::next_min()
+
+  DESCRIPTION
+    Find the minimal key within this group such that the key satisfies the query
+    conditions and NULL semantics. The found key is loaded into this->record.
+
+  IMPLEMENTATION
+    Depending on the values of min_max_ranges.elements, key_infix_len, and
+    whether there is a  NULL in the MIN field, this function may directly
+    return without any data access. In this case we use the key loaded into
+    this->record by the call to this->next_prefix() just before this call.
+
+  RETURN
+    0                    on success
+    HA_ERR_KEY_NOT_FOUND if no MIN key was found that fulfills all conditions.
+    HA_ERR_END_OF_FILE   - "" -
+    other                if some error occurred
+*/
+
+int QUICK_GROUP_MIN_MAX_SELECT::next_min() {
+  int result = 0;
+  DBUG_TRACE;
+
+  /* Find the MIN key using the eventually extended group prefix. */
+  if (min_max_ranges.size() > 0) {
+    uchar key_buf[MAX_KEY_LENGTH];
+    key_copy(key_buf, record, index_info, max_used_key_length);
+    result = next_min_in_range();
+    if (result) key_restore(record, key_buf, index_info, max_used_key_length);
+  } else {
+    /*
+      Apply the constant equality conditions to the non-group select fields.
+      There is no reason to call handler method if MIN/MAX key part is
+      ascending since  MIN/MAX field points to min value after
+      next_prefix() call.
+    */
+    if (key_infix_len > 0 || !min_max_keypart_asc) {
+      if ((result = m_table->file->ha_index_read_map(
+               record, group_prefix, make_prev_keypart_map(real_key_parts),
+               min_max_keypart_asc ? HA_READ_KEY_EXACT : HA_READ_PREFIX_LAST)))
+        return result;
+    }
+
+    /*
+      If the min/max argument field is NULL, skip subsequent rows in the same
+      group with NULL in it. Notice that:
+      - if the first row in a group doesn't have a NULL in the field, no row
+      in the same group has (because NULL < any other value),
+      - min_max_arg_part->field->ptr points to some place in 'record'.
+    */
+    if (min_max_arg_part && min_max_arg_part->field->is_null()) {
+      uchar key_buf[MAX_KEY_LENGTH];
+
+      /* Find the first subsequent record without NULL in the MIN/MAX field. */
+      key_copy(key_buf, record, index_info, max_used_key_length);
+      result = m_table->file->ha_index_read_map(
+          record, key_buf, make_keypart_map(real_key_parts),
+          min_max_keypart_asc ? HA_READ_AFTER_KEY : HA_READ_BEFORE_KEY);
+      /*
+        Check if the new record belongs to the current group by comparing its
+        prefix with the group's prefix. If it is from the next group, then the
+        whole group has NULLs in the MIN/MAX field, so use the first record in
+        the group as a result.
+        TODO:
+        It is possible to reuse this new record as the result candidate for
+        the next call to next_min(), and to save one lookup in the next call.
+        For this add a new member 'this->next_group_prefix'.
+      */
+      if (!result) {
+        if (key_cmp(index_info->key_part, group_prefix, real_prefix_len))
+          key_restore(record, key_buf, index_info, 0);
+      } else if (result == HA_ERR_KEY_NOT_FOUND || result == HA_ERR_END_OF_FILE)
+        result = 0; /* There is a result in any case. */
+    }
+  }
+
+  /*
+    If the MIN attribute is non-nullable, this->record already contains the
+    MIN key in the group, so just return.
+  */
+  return result;
+}
+
+/*
+  Retrieve the maximal key in the next group.
+
+  SYNOPSIS
+    QUICK_GROUP_MIN_MAX_SELECT::next_max()
+
+  DESCRIPTION
+    Lookup the maximal key of the group, and store it into this->record.
+
+  RETURN
+    0                    on success
+    HA_ERR_KEY_NOT_FOUND if no MAX key was found that fulfills all conditions.
+    HA_ERR_END_OF_FILE	 - "" -
+    other                if some error occurred
+*/
+
+int QUICK_GROUP_MIN_MAX_SELECT::next_max() {
+  int result = 0;
+
+  DBUG_TRACE;
+
+  /* Get the last key in the (possibly extended) group. */
+  if (min_max_ranges.size() > 0) {
+    uchar key_buf[MAX_KEY_LENGTH];
+    key_copy(key_buf, record, index_info, max_used_key_length);
+    result = next_max_in_range();
+    if (result) key_restore(record, key_buf, index_info, max_used_key_length);
+  } else {
+    /*
+      There is no reason to call handler method if MIN/MAX key part is
+      descending since  MIN/MAX field points to max value after
+      next_prefix() call.
+    */
+    if (key_infix_len > 0 || min_max_keypart_asc)
+      result = m_table->file->ha_index_read_map(
+          record, group_prefix, make_prev_keypart_map(real_key_parts),
+          min_max_keypart_asc ? HA_READ_PREFIX_LAST : HA_READ_KEY_EXACT);
+  }
+  return result;
+}
+
+/*
+  Determine the prefix of the next group.
+
+  SYNOPSIS
+    QUICK_GROUP_MIN_MAX_SELECT::next_prefix()
+
+  DESCRIPTION
+    Determine the prefix of the next group that satisfies the query conditions.
+    If there is a range condition referencing the group attributes, use a
+    QUICK_RANGE_SELECT object to retrieve the *first* key that satisfies the
+    condition. The prefix is stored in this->group_prefix. The first key of
+    the found group is stored in this->record, on which relies this->next_min().
+
+  RETURN
+    0                    on success
+    HA_ERR_KEY_NOT_FOUND if there is no key with the formed prefix
+    HA_ERR_END_OF_FILE   if there are no more keys
+    other                if some error occurred
+*/
+int QUICK_GROUP_MIN_MAX_SELECT::next_prefix() {
+  int result;
+  DBUG_TRACE;
+
+  if (quick_prefix_query_block) {
+    uchar *cur_prefix = seen_first_key ? group_prefix : nullptr;
+    if ((result = quick_prefix_query_block->get_next_prefix(
+             group_prefix_len, group_key_parts, cur_prefix)))
+      return result;
+    seen_first_key = true;
+  } else {
+    if (!seen_first_key) {
+      result = m_table->file->ha_index_first(record);
+      if (result) return result;
+      seen_first_key = true;
+    } else {
+      /* Load the first key in this group into record. */
+      result = index_next_different(is_index_scan, m_table->file,
+                                    index_info->key_part, record, group_prefix,
+                                    group_prefix_len, group_key_parts);
+      if (result) return result;
+    }
+  }
+
+  /* Save the prefix of this group for subsequent calls. */
+  key_copy(group_prefix, record, index_info, group_prefix_len);
+  return 0;
+}
+
+/*
+  Determine and append the next infix.
+
+  SYNOPSIS
+    QUICK_GROUP_MIN_MAX_SELECT::append_next_infix()
+
+  DESCRIPTION
+    Appends the next infix onto this->group_prefix based on the current
+    position stored in cur_infix_range_position
+
+  RETURN
+    true                 No next infix exists
+    false                on success
+*/
+
+bool QUICK_GROUP_MIN_MAX_SELECT::append_next_infix() {
+  if (seen_all_infix_ranges) return true;
+
+  if (key_infix_len > 0) {
+    uchar *key_ptr = group_prefix + group_prefix_len;
+    // For each infix keypart, get the participating range for
+    // the next row retrieval. cur_key_infix_position determines
+    // which range needs to be used.
+    for (uint i = 0; i < key_infix_ranges.size(); i++) {
+      QUICK_RANGE *cur_range = nullptr;
+      assert(key_infix_ranges[i]->size() > 0);
+
+      Quick_ranges *infix_range_array = key_infix_ranges[i];
+      cur_range = infix_range_array->at(cur_infix_range_position[i]);
+      memcpy(key_ptr, cur_range->min_key, cur_range->min_length);
+      key_ptr += cur_range->min_length;
+    }
+
+    // cur_infix_range_position is updated with the next infix range
+    // position.
+    for (int i = key_infix_ranges.size() - 1; i >= 0; i--) {
+      cur_infix_range_position[i]++;
+      if (cur_infix_range_position[i] == key_infix_ranges[i]->size()) {
+        // All the ranges for infix keypart "i" is done
+        cur_infix_range_position[i] = 0;
+        if (i == 0) seen_all_infix_ranges = true;
+      } else
+        break;
+    }
+  } else
+    seen_all_infix_ranges = true;
+
+  return false;
+}
+
+/*
+  Reset all the variables that need to be updated for the new group.
+
+  SYNOPSIS
+    QUICK_GROUP_MIN_MAX_SELECT::reset_group()
+
+  DESCRIPTION
+    It is called before a new group is processed.
+
+  RETURN
+    None
+*/
+
+void QUICK_GROUP_MIN_MAX_SELECT::reset_group() {
+  // Reset the current infix range before a new group is processed.
+  seen_all_infix_ranges = false;
+  memset(cur_infix_range_position, 0, sizeof(cur_infix_range_position));
+
+  if (have_min) {
+    for (Item_sum &min_func : min_functions) {
+      min_func.aggregator_clear();
+    }
+  }
+
+  if (have_max) {
+    for (Item_sum &max_func : max_functions) {
+      max_func.aggregator_clear();
+    }
+  }
+}
+
+/**
+  Function returns search mode that needs to be used to read
+  the next record. It takes the type of the range, the
+  key part's order (ascending or descending) and if the
+  range is on MIN function or a MAX function to get the
+  right search mode.
+  For "MIN" functon:
+   - ASC keypart
+   We need to
+    1. Read the first key that matches the range
+       a) if a minimum value is not specified in the condition
+       b) if it is a equality or is NULL condition
+    2. Read the first key after a range value if range is like "a > 10"
+    3. Read the key that matches the condition or any key after
+       the range value for any other condition
+   - DESC keypart
+   We need to
+    4. Read the last value for the key prefix if there is no minimum
+       range specified.
+    5. Read the first key that matches the range if it is a equality
+       condition.
+    6. Read the first key before a range value if range is like "a > 10"
+    7. Read the key that matches the prefix or any key before for any
+       other condition
+  For MAX function:
+   - ASC keypart
+   We need to
+    8. Read the last value for the key prefix if there is no maximum
+       range specified
+    9. Read the first key that matches the range if it is a equality
+       condition
+   10. Read the first key before a range value if range is like "a < 10"
+   11. Read the key that matches the condition or any key before
+       the range value for any other condition
+   - DESC keypart
+   We need to
+   12. Read the first key that matches the range
+       a) if a minimum value is not specified in the condition
+       b) if it is a equality
+   13. Read the first key after a range value if range is like "a < 10"
+   14. Read the key that matches the prefix or any key after for
+       any other condition
+
+
+  @param cur_range         pointer to QUICK_RANGE.
+  @param is_asc            TRUE if key part is ascending,
+                           FALSE otherwise.
+  @param is_min            TRUE if the range is on MIN function.
+                           FALSE for MAX function.
+  @return search mode
+*/
+
+static ha_rkey_function get_search_mode(QUICK_RANGE *cur_range, bool is_asc,
+                                        bool is_min) {
+  // If MIN function
+  if (is_min) {
+    if (is_asc) {                          // key part is ascending
+      if (cur_range->flag & NO_MIN_RANGE)  // 1a
+        return HA_READ_KEY_EXACT;
+      else
+        return (cur_range->flag & (EQ_RANGE | NULL_RANGE))  // 1b
+                   ? HA_READ_KEY_EXACT
+                   : (cur_range->flag & NEAR_MIN) ? HA_READ_AFTER_KEY     // 2
+                                                  : HA_READ_KEY_OR_NEXT;  // 3
+    } else {  // key parts is descending
+      if (cur_range->flag & NO_MIN_RANGE)
+        return HA_READ_PREFIX_LAST;  // 4
+      else
+        return (cur_range->flag & EQ_RANGE)
+                   ? HA_READ_KEY_EXACT  // 5
+                   : (cur_range->flag & NEAR_MIN)
+                         ? HA_READ_BEFORE_KEY            // 6
+                         : HA_READ_PREFIX_LAST_OR_PREV;  // 7
+    }
+  }
+
+  // If max function
+  if (is_asc) {  // key parts is ascending
+    if (cur_range->flag & NO_MAX_RANGE)
+      return HA_READ_PREFIX_LAST;  // 8
+    else
+      return (cur_range->flag & EQ_RANGE)
+                 ? HA_READ_KEY_EXACT  // 9
+                 : (cur_range->flag & NEAR_MAX)
+                       ? HA_READ_BEFORE_KEY            // 10
+                       : HA_READ_PREFIX_LAST_OR_PREV;  // 11
+  } else {  // key parts is descending
+    if (cur_range->flag & NO_MAX_RANGE)
+      return HA_READ_KEY_EXACT;  // 12a
+    else
+      return (cur_range->flag & EQ_RANGE)
+                 ? HA_READ_KEY_EXACT                                    // 12b
+                 : (cur_range->flag & NEAR_MAX) ? HA_READ_AFTER_KEY     // 13
+                                                : HA_READ_KEY_OR_NEXT;  // 14
+  }
+}
+
+/*
+  Find the minimal key in a group that satisfies some range conditions for the
+  min/max argument field.
+
+  SYNOPSIS
+    QUICK_GROUP_MIN_MAX_SELECT::next_min_in_range()
+
+  DESCRIPTION
+    Given the sequence of ranges min_max_ranges, find the minimal key that is
+    in the left-most possible range. If there is no such key, then the current
+    group does not have a MIN key that satisfies the WHERE clause. If a key is
+    found, its value is stored in this->record.
+
+  RETURN
+    0                    on success
+    HA_ERR_KEY_NOT_FOUND if there is no key with the given prefix in any of
+                         the ranges
+    HA_ERR_END_OF_FILE   - "" -
+    other                if some error
+*/
+
+int QUICK_GROUP_MIN_MAX_SELECT::next_min_in_range() {
+  ha_rkey_function search_mode;
+  key_part_map keypart_map;
+  bool found_null = false;
+  int result = HA_ERR_KEY_NOT_FOUND;
+
+  assert(min_max_ranges.size() > 0);
+
+  /* Search from the left-most range to the right. */
+  for (Quick_ranges::const_iterator it = min_max_ranges.begin();
+       it != min_max_ranges.end(); ++it) {
+    QUICK_RANGE *cur_range = *it;
+    /*
+      If the current value for the min/max argument is bigger than the right
+      boundary of cur_range, there is no need to check this range.
+    */
+    if (it != min_max_ranges.begin() && !(cur_range->flag & NO_MAX_RANGE) &&
+        (key_cmp(min_max_arg_part, (const uchar *)cur_range->max_key,
+                 min_max_arg_len) == (min_max_keypart_asc ? 1 : -1)) &&
+        !result)
+      continue;
+
+    if (cur_range->flag & NO_MIN_RANGE) {
+      keypart_map = make_prev_keypart_map(real_key_parts);
+      search_mode = get_search_mode(cur_range, min_max_keypart_asc, true);
+    } else {
+      /* Extend the search key with the lower boundary for this range. */
+      memcpy(group_prefix + real_prefix_len, cur_range->min_key,
+             cur_range->min_length);
+      keypart_map = make_keypart_map(real_key_parts);
+      search_mode = get_search_mode(cur_range, min_max_keypart_asc, true);
+    }
+
+    result = m_table->file->ha_index_read_map(record, group_prefix, keypart_map,
+                                              search_mode);
+    if (result) {
+      if ((result == HA_ERR_KEY_NOT_FOUND || result == HA_ERR_END_OF_FILE) &&
+          (cur_range->flag & (EQ_RANGE | NULL_RANGE)))
+        continue; /* Check the next range. */
+
+      /*
+        In all other cases (HA_ERR_*, HA_READ_KEY_EXACT with NO_MIN_RANGE,
+        HA_READ_AFTER_KEY, HA_READ_KEY_OR_NEXT) if the lookup failed for this
+        range, it can't succeed for any other subsequent range.
+      */
+      break;
+    }
+
+    /* A key was found. */
+    if (cur_range->flag & EQ_RANGE)
+      break; /* No need to perform the checks below for equal keys. */
+
+    if (min_max_keypart_asc && cur_range->flag & NULL_RANGE) {
+      /*
+        Remember this key, and continue looking for a non-NULL key that
+        satisfies some other condition.
+      */
+      memcpy(tmp_record, record, m_table->s->rec_buff_length);
+      found_null = true;
+      continue;
+    }
+
+    /* Check if record belongs to the current group. */
+    if (key_cmp(index_info->key_part, group_prefix, real_prefix_len)) {
+      result = HA_ERR_KEY_NOT_FOUND;
+      continue;
+    }
+
+    /* If there is an upper limit, check if the found key is in the range. */
+    if (!(cur_range->flag & NO_MAX_RANGE)) {
+      /* Compose the MAX key for the range. */
+      uchar *max_key = (uchar *)my_alloca(real_prefix_len + min_max_arg_len);
+      memcpy(max_key, group_prefix, real_prefix_len);
+      memcpy(max_key + real_prefix_len, cur_range->max_key,
+             cur_range->max_length);
+      /* Compare the found key with max_key. */
+      int cmp_res = key_cmp(index_info->key_part, max_key,
+                            real_prefix_len + min_max_arg_len);
+      /*
+        The key is outside of the range if:
+        the interval is open and the key is equal to the maximum boundry
+        or
+        the key is greater than the maximum
+      */
+      if (((cur_range->flag & NEAR_MAX) && cmp_res == 0) ||
+          (min_max_keypart_asc ? (cmp_res > 0) : (cmp_res < 0))) {
+        result = HA_ERR_KEY_NOT_FOUND;
+        continue;
+      }
+    }
+    /* If we got to this point, the current key qualifies as MIN. */
+    assert(result == 0);
+    break;
+  }
+  /*
+    If there was a key with NULL in the MIN/MAX field, and there was no other
+    key without NULL from the same group that satisfies some other condition,
+    then use the key with the NULL.
+  */
+  if (found_null && result) {
+    memcpy(record, tmp_record, m_table->s->rec_buff_length);
+    result = 0;
+  }
+  return result;
+}
+
+/*
+  Find the maximal key in a group that satisfies some range conditions for the
+  min/max argument field.
+
+  SYNOPSIS
+    QUICK_GROUP_MIN_MAX_SELECT::next_max_in_range()
+
+  DESCRIPTION
+    Given the sequence of ranges min_max_ranges, find the maximal key that is
+    in the right-most possible range. If there is no such key, then the current
+    group does not have a MAX key that satisfies the WHERE clause. If a key is
+    found, its value is stored in this->record.
+
+  RETURN
+    0                    on success
+    HA_ERR_KEY_NOT_FOUND if there is no key with the given prefix in any of
+                         the ranges
+    HA_ERR_END_OF_FILE   - "" -
+    other                if some error
+*/
+
+int QUICK_GROUP_MIN_MAX_SELECT::next_max_in_range() {
+  ha_rkey_function search_mode;
+  key_part_map keypart_map;
+  int result = HA_ERR_KEY_NOT_FOUND;
+
+  assert(min_max_ranges.size() > 0);
+
+  /* Search from the right-most range to the left. */
+  for (Quick_ranges::const_iterator it = min_max_ranges.end();
+       it != min_max_ranges.begin(); --it) {
+    QUICK_RANGE *cur_range = *(it - 1);
+    /*
+      If the current value for the min/max argument is smaller than the left
+      boundary of cur_range, there is no need to check this range.
+    */
+    if (it != min_max_ranges.end() && !(cur_range->flag & NO_MIN_RANGE) &&
+        (key_cmp(min_max_arg_part, (const uchar *)cur_range->min_key,
+                 min_max_arg_len) == (min_max_keypart_asc ? -1 : 1)) &&
+        !result)
+      continue;
+
+    if (cur_range->flag & NO_MAX_RANGE) {
+      keypart_map = make_prev_keypart_map(real_key_parts);
+      search_mode = get_search_mode(cur_range, min_max_keypart_asc, false);
+    } else {
+      /* Extend the search key with the upper boundary for this range. */
+      memcpy(group_prefix + real_prefix_len, cur_range->max_key,
+             cur_range->max_length);
+      keypart_map = make_keypart_map(real_key_parts);
+      search_mode = get_search_mode(cur_range, min_max_keypart_asc, false);
+    }
+
+    result = m_table->file->ha_index_read_map(record, group_prefix, keypart_map,
+                                              search_mode);
+
+    if (result) {
+      if ((result == HA_ERR_KEY_NOT_FOUND || result == HA_ERR_END_OF_FILE) &&
+          (cur_range->flag & EQ_RANGE))
+        continue; /* Check the next range. */
+
+      /*
+        In no key was found with this upper bound, there certainly are no keys
+        in the ranges to the left.
+      */
+      return result;
+    }
+    /* A key was found. */
+    if (cur_range->flag & EQ_RANGE)
+      return 0; /* No need to perform the checks below for equal keys. */
+
+    /* Check if record belongs to the current group. */
+    if (key_cmp(index_info->key_part, group_prefix, real_prefix_len)) {
+      result = HA_ERR_KEY_NOT_FOUND;
+      continue;  // Row not found
+    }
+
+    /* If there is a lower limit, check if the found key is in the range. */
+    if (!(cur_range->flag & NO_MIN_RANGE)) {
+      /* Compose the MIN key for the range. */
+      uchar *min_key = (uchar *)my_alloca(real_prefix_len + min_max_arg_len);
+      memcpy(min_key, group_prefix, real_prefix_len);
+      memcpy(min_key + real_prefix_len, cur_range->min_key,
+             cur_range->min_length);
+      /* Compare the found key with min_key. */
+      int cmp_res = key_cmp(index_info->key_part, min_key,
+                            real_prefix_len + min_max_arg_len);
+      /*
+        The key is outside of the range if:
+        the interval is open and the key is equal to the minimum boundry
+        or
+        the key is less than the minimum
+      */
+      if (((cur_range->flag & NEAR_MIN) && cmp_res == 0) ||
+          (min_max_keypart_asc ? (cmp_res < 0) : (cmp_res > 0))) {
+        result = HA_ERR_KEY_NOT_FOUND;
+        continue;
+      }
+    }
+    /* If we got to this point, the current key qualifies as MAX. */
+    return result;
+  }
+  return HA_ERR_KEY_NOT_FOUND;
+}
+
+/*
+  Update all MIN function results with the newly found value.
+
+  SYNOPSIS
+    QUICK_GROUP_MIN_MAX_SELECT::update_min_result()
+
+  DESCRIPTION
+    The method iterates through all MIN functions and updates the result value
+    of each function by calling Item_sum::aggregator_add(), which in turn picks
+    the new result value from this->m_table->record[0], previously updated by
+    next_min(). The updated value is stored in a member variable of each of the
+    Item_sum objects, depending on the value type.
+
+  IMPLEMENTATION
+    The update must be done separately for MIN and MAX, immediately after
+    next_min() was called and before next_max() is called, because both MIN and
+    MAX take their result value from the same buffer this->m_table->record[0]
+    (i.e.  this->record).
+
+  @param  reset   IN/OUT reset MIN value if TRUE.
+
+  RETURN
+    None
+*/
+
+void QUICK_GROUP_MIN_MAX_SELECT::update_min_result(bool *reset) {
+  for (Item_sum &min_func : min_functions) {
+    if (*reset) {
+      min_func.aggregator_clear();
+      *reset = false;
+    }
+    min_func.aggregator_add();
+  }
+}
+
+/*
+  Update all MAX function results with the newly found value.
+
+  SYNOPSIS
+    QUICK_GROUP_MIN_MAX_SELECT::update_max_result()
+
+  DESCRIPTION
+    The method iterates through all MAX functions and updates the result value
+    of each function by calling Item_sum::aggregator_add(), which in turn picks
+    the new result value from this->m_table->record[0], previously updated by
+    next_max(). The updated value is stored in a member variable of each of the
+    Item_sum objects, depending on the value type.
+
+  IMPLEMENTATION
+    The update must be done separately for MIN and MAX, immediately after
+    next_max() was called, because both MIN and MAX take their result value
+    from the same buffer this->m_table->record[0] (i.e.  this->record).
+
+  @param  reset   IN/OUT reset MAX value if TRUE.
+
+  RETURN
+    None
+*/
+
+void QUICK_GROUP_MIN_MAX_SELECT::update_max_result(bool *reset) {
+  for (Item_sum &max_func : max_functions) {
+    if (*reset) {
+      max_func.aggregator_clear();
+      *reset = false;
+    }
+    max_func.aggregator_add();
+  }
+}
+
+/*
+  Append comma-separated list of keys this quick select uses to key_names;
+  append comma-separated list of corresponding used lengths to used_lengths.
+
+  SYNOPSIS
+    QUICK_GROUP_MIN_MAX_SELECT::add_keys_and_lengths()
+    key_names    [out] Names of used indexes
+    used_lengths [out] Corresponding lengths of the index names
+
+  DESCRIPTION
+    This method is used by select_describe to extract the names of the
+    indexes used by a quick select.
+
+*/
+
+void QUICK_GROUP_MIN_MAX_SELECT::add_keys_and_lengths(String *key_names,
+                                                      String *used_lengths) {
+  char buf[64];
+  size_t length;
+  key_names->append(index_info->name);
+  length = longlong10_to_str(max_used_key_length, buf, 10) - buf;
+  used_lengths->append(buf, length);
+}
+
+#ifndef NDEBUG
+/*
+  Print quick select information to DBUG_FILE.
+
+  SYNOPSIS
+    QUICK_GROUP_MIN_MAX_SELECT::dbug_dump()
+    indent  Indentation offset
+    verbose If true show more detailed output.
+
+  DESCRIPTION
+    Print the contents of this quick select to DBUG_FILE. The method also
+    calls dbug_dump() for the used quick select if any.
+
+  IMPLEMENTATION
+    Caller is responsible for locking DBUG_FILE before this call and unlocking
+    it afterwards.
+
+  RETURN
+    None
+*/
+
+void QUICK_GROUP_MIN_MAX_SELECT::dbug_dump(int indent, bool verbose) {
+  fprintf(DBUG_FILE,
+          "%*squick_group_min_max_query_block: index %s (%d), length: %d\n",
+          indent, "", index_info->name, index, max_used_key_length);
+  if (key_infix_len > 0) {
+    fprintf(DBUG_FILE, "%*susing key_infix with length %d:\n", indent, "",
+            key_infix_len);
+  }
+  if (quick_prefix_query_block) {
+    fprintf(DBUG_FILE, "%*susing quick_range_query_block:\n", indent, "");
+    quick_prefix_query_block->dbug_dump(indent + 2, verbose);
+  }
+  if (min_max_ranges.size() > 0) {
+    fprintf(DBUG_FILE, "%*susing %d quick_ranges for MIN/MAX:\n", indent, "",
+            static_cast<int>(min_max_ranges.size()));
+  }
+}
+#endif
diff -Nru mysql-8.0-8.0.26/sql/range_optimizer/group_min_max.h mysql-8.0-8.0.27/sql/range_optimizer/group_min_max.h
--- mysql-8.0-8.0.26/sql/range_optimizer/group_min_max.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/range_optimizer/group_min_max.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,169 @@
+/* Copyright (c) 2000, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef SQL_RANGE_OPTIMIZER_GROUP_MIN_MAX_H_
+#define SQL_RANGE_OPTIMIZER_GROUP_MIN_MAX_H_
+
+#include <sys/types.h>
+
+#include "m_string.h"
+#include "my_alloc.h"
+#include "my_base.h"
+#include "my_bitmap.h"
+#include "my_inttypes.h"
+#include "sql/field.h"
+#include "sql/key.h"
+#include "sql/range_optimizer/range_optimizer.h"
+#include "sql/sql_const.h"
+#include "sql_string.h"
+
+class Cost_estimate;
+class Item_sum;
+class JOIN;
+class QUICK_RANGE_SELECT;
+class SEL_ARG;
+struct TABLE;
+template <class T>
+class List;
+template <class T>
+class List_iterator;
+
+/*
+  Index scan for GROUP-BY queries with MIN/MAX aggregate functions.
+
+  This class provides a specialized index access method for GROUP-BY queries
+  of the forms:
+
+       SELECT A_1,...,A_k, [B_1,...,B_m], [MIN(C)], [MAX(C)]
+         FROM T
+        WHERE [RNG(A_1,...,A_p ; where p <= k)]
+         [AND EQ(B_1,...,B_m)]
+         [AND PC(C)]
+         [AND PA(A_i1,...,A_iq)]
+       GROUP BY A_1,...,A_k;
+
+    or
+
+       SELECT DISTINCT A_i1,...,A_ik
+         FROM T
+        WHERE [RNG(A_1,...,A_p ; where p <= k)]
+         [AND PA(A_i1,...,A_iq)];
+
+  where all selected fields are parts of the same index.
+  The class of queries that can be processed by this quick select is fully
+  specified in the description of get_best_trp_group_min_max() in opt_range.cc.
+
+  The get_next() method directly produces result tuples, thus obviating the
+  need to call end_send_group() because all grouping is already done inside
+  get_next().
+
+  Since one of the requirements is that all select fields are part of the same
+  index, this class produces only index keys, and not complete records.
+*/
+
+class QUICK_GROUP_MIN_MAX_SELECT : public QUICK_SELECT_I {
+ private:
+  JOIN *join;          /* Descriptor of the current query */
+  KEY *index_info;     /* The index chosen for data access */
+  uchar *tmp_record;   /* Temporary storage for next_min(), next_max(). */
+  uchar *group_prefix; /* Key prefix consisting of the GROUP fields. */
+  const uint group_prefix_len; /* Length of the group prefix. */
+  uint group_key_parts;        /* A number of keyparts in the group prefix */
+  uchar *last_prefix;          /* Prefix of the last group for detecting EOF. */
+  bool have_min;               /* Specify whether we are computing */
+  bool have_max;               /*   a MIN, a MAX, or both.         */
+  bool have_agg_distinct;      /*   aggregate_function(DISTINCT ...).  */
+  bool seen_first_key;         /* Denotes whether the first key was retrieved.*/
+  KEY_PART_INFO *min_max_arg_part; /* The keypart of the only argument field */
+                                   /* of all MIN/MAX functions.              */
+  uint min_max_arg_len;     /* The length of the MIN/MAX argument field */
+  bool min_max_keypart_asc; /* TRUE if min_max key part is ascending. */
+  uint key_infix_len;
+  // The current infix range position (in key_infix_ranges) used for row
+  // retrieval.
+  uint cur_infix_range_position[MAX_REF_PARTS];
+  // Indicates if all infix ranges have been used to retrieve rows (all ranges
+  // in key_infix_ranges)
+  bool seen_all_infix_ranges;
+  Quick_ranges min_max_ranges; /* Array of range ptrs for the MIN/MAX field. */
+  Quick_ranges_array key_infix_ranges; /* Array of key infix range arrays.   */
+  uint real_prefix_len; /* Length of key prefix extended with key_infix. */
+  uint real_key_parts;  /* A number of keyparts in the above value.      */
+  List<Item_sum> min_functions;
+  List<Item_sum> max_functions;
+  /*
+    Use index scan to get the next different key instead of jumping into it
+    through index read
+  */
+  bool is_index_scan;
+  MEM_ROOT *mem_root;
+  QUICK_RANGE_SELECT
+  *quick_prefix_query_block; /* For retrieval of group prefixes. */
+  int next_prefix();
+  bool append_next_infix();
+  void reset_group();
+  int next_min_in_range();
+  int next_max_in_range();
+  int next_min();
+  int next_max();
+  void update_min_result(bool *reset);
+  void update_max_result(bool *reset);
+
+ public:
+  QUICK_GROUP_MIN_MAX_SELECT(
+      TABLE *table, JOIN *join, bool have_min, bool have_max,
+      bool have_agg_distinct, KEY_PART_INFO *min_max_arg_part,
+      uint group_prefix_len, uint group_key_parts, uint used_key_parts,
+      uint real_key_parts, uint max_used_key_length_arg, KEY *index_info,
+      uint use_index, const Cost_estimate *cost_est, ha_rows records,
+      uint key_infix_len, MEM_ROOT *return_mem_root, bool is_index_scan,
+      QUICK_RANGE_SELECT *quick_prefix_query_block_arg,
+      Quick_ranges_array key_infix_ranges, Quick_ranges min_max_ranges);
+  ~QUICK_GROUP_MIN_MAX_SELECT() override;
+  int init() override;
+  void need_sorted_output() override { /* always do it */
+  }
+  int reset() override;
+  int get_next() override;
+  bool reverse_sorted() const override { return false; }
+  bool reverse_sort_possible() const override { return false; }
+  bool unique_key_range() override { return false; }
+  RangeScanType get_type() const override { return QS_TYPE_GROUP_MIN_MAX; }
+  bool is_loose_index_scan() const override { return true; }
+  bool is_agg_loose_index_scan() const override { return is_agg_distinct(); }
+  void add_keys_and_lengths(String *key_names, String *used_lengths) override;
+#ifndef NDEBUG
+  void dbug_dump(int indent, bool verbose) override;
+#endif
+  bool is_agg_distinct() const { return have_agg_distinct; }
+  virtual void append_loose_scan_type(String *str) {
+    if (is_index_scan) str->append(STRING_WITH_LEN("scanning"));
+  }
+
+  void get_fields_used(MY_BITMAP *used_fields) override {
+    for (uint i = 0; i < used_key_parts; i++)
+      bitmap_set_bit(used_fields, index_info->key_part[i].field->field_index());
+  }
+  void add_info_string(String *str) override;
+};
+
+#endif  // SQL_RANGE_OPTIMIZER_GROUP_MIN_MAX_H_
diff -Nru mysql-8.0-8.0.26/sql/range_optimizer/group_min_max_plan.cc mysql-8.0-8.0.27/sql/range_optimizer/group_min_max_plan.cc
--- mysql-8.0-8.0.26/sql/range_optimizer/group_min_max_plan.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/range_optimizer/group_min_max_plan.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,1685 @@
+/* Copyright (c) 2000, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include "sql/range_optimizer/group_min_max_plan.h"
+
+#include <assert.h>
+#include <float.h>
+#include <math.h>
+#include <string.h>
+#include <algorithm>
+#include <limits>
+
+#include "m_ctype.h"
+#include "mem_root_deque.h"
+#include "my_bitmap.h"
+#include "my_compiler.h"
+#include "my_dbug.h"
+#include "mysql/udf_registration_types.h"
+#include "sql/field.h"
+#include "sql/handler.h"
+#include "sql/item.h"
+#include "sql/item_cmpfunc.h"
+#include "sql/item_func.h"
+#include "sql/item_sum.h"
+#include "sql/key.h"
+#include "sql/key_spec.h"
+#include "sql/opt_costmodel.h"
+#include "sql/opt_statistics.h"  // guess_rec_per_key
+#include "sql/opt_trace.h"
+#include "sql/opt_trace_context.h"
+#include "sql/parser_yystype.h"
+#include "sql/range_optimizer/group_min_max.h"
+#include "sql/range_optimizer/internal.h"
+#include "sql/range_optimizer/range_opt_param.h"
+#include "sql/range_optimizer/range_scan_plan.h"
+#include "sql/range_optimizer/tree.h"
+#include "sql/sql_bitmap.h"
+#include "sql/sql_class.h"
+#include "sql/sql_lex.h"
+#include "sql/sql_list.h"
+#include "sql/sql_optimizer.h"
+#include "sql/sql_select.h"
+#include "sql/table.h"
+#include "sql/visible_fields.h"
+#include "sql_string.h"
+#include "template_utils.h"
+
+class QUICK_SELECT_I;
+struct MEM_ROOT;
+
+using std::max;
+using std::min;
+
+void TRP_GROUP_MIN_MAX::trace_basic_info(THD *thd, const RANGE_OPT_PARAM *,
+                                         Opt_trace_object *trace_object) const {
+  trace_object->add_alnum("type", "index_group")
+      .add_utf8("index", index_info->name);
+  if (min_max_arg_part)
+    trace_object->add_utf8("group_attribute",
+                           min_max_arg_part->field->field_name);
+  else
+    trace_object->add_null("group_attribute");
+  trace_object->add("min_aggregate", have_min)
+      .add("max_aggregate", have_max)
+      .add("distinct_aggregate", have_agg_distinct)
+      .add("rows", records)
+      .add("cost", cost_est);
+
+  const KEY_PART_INFO *key_part = index_info->key_part;
+  Opt_trace_context *const trace = &thd->opt_trace;
+  {
+    Opt_trace_array trace_keyparts(trace, "key_parts_used_for_access");
+    for (uint partno = 0; partno < used_key_parts; partno++) {
+      const KEY_PART_INFO *cur_key_part = key_part + partno;
+      trace_keyparts.add_utf8(cur_key_part->field->field_name);
+    }
+  }
+  Opt_trace_array trace_range(trace, "ranges");
+
+  // can have group quick without ranges
+  if (index_tree) {
+    String range_info;
+    range_info.set_charset(system_charset_info);
+    append_range_all_keyparts(&trace_range, nullptr, &range_info, index_tree,
+                              key_part, false);
+  }
+}
+
+static inline uint get_field_keypart(KEY *index, const Field *field);
+
+static bool check_key_infix(SEL_ROOT *index_range_tree,
+                            KEY_PART_INFO *first_non_group_part,
+                            KEY_PART_INFO *min_max_arg_part,
+                            KEY_PART_INFO *last_part, uint *key_infix_len,
+                            KEY_PART_INFO **first_non_infix_part,
+                            uint *infix_factor, KEY *index_info);
+
+static bool check_group_min_max_predicates(Item *cond,
+                                           Item_field *min_max_arg_item,
+                                           Field::imagetype image_type);
+
+static bool min_max_inspect_cond_for_fields(Item *cond,
+                                            Item_field *min_max_arg_item,
+                                            bool *min_max_arg_present,
+                                            bool *non_min_max_arg_present);
+
+static void cost_group_min_max(TABLE *table, uint key, uint used_key_parts,
+                               uint group_key_parts, SEL_TREE *range_tree,
+                               ha_rows quick_prefix_records, bool have_min,
+                               bool have_max, uint infix_factor,
+                               Cost_estimate *cost_est, ha_rows *records,
+                               bool single_group);
+
+/**
+  Test if this access method is applicable to a GROUP query with MIN/MAX
+  functions, and if so, construct a new TRP object.
+
+  DESCRIPTION
+    Test whether a query can be computed via a QUICK_GROUP_MIN_MAX_SELECT.
+    Queries computable via a QUICK_GROUP_MIN_MAX_SELECT must satisfy the
+    following conditions:
+    A) Table T has at least one compound index I of the form:
+       I = <A_1, ...,A_k, [B_1,..., B_m], C, [D_1,...,D_n]>
+    B) Query conditions:
+    B0. Q is over a single table T.
+    B1. The attributes referenced by Q are a subset of the attributes of I.
+    B2. All attributes QA in Q can be divided into 3 overlapping groups:
+        - SA = {S_1, ..., S_l, [C]} - from the SELECT clause, where C is
+          referenced by any number of MIN and/or MAX functions if present.
+        - WA = {W_1, ..., W_p} - from the WHERE clause
+        - GA = <G_1, ..., G_k> - from the GROUP BY clause (if any)
+             = SA              - if Q is a DISTINCT query (based on the
+                                 equivalence of DISTINCT and GROUP queries.
+        - NGA = QA - (GA union C) = {NG_1, ..., NG_m} - the ones not in
+          GROUP BY and not referenced by MIN/MAX functions.
+        with the following properties specified below.
+    B3. If Q has a GROUP BY WITH ROLLUP clause the access method is not
+        applicable.
+
+    SA1. There is at most one attribute in SA referenced by any number of
+         MIN and/or MAX functions which, which if present, is denoted as C.
+    SA2. The position of the C attribute in the index is after the last A_k.
+    SA3. The attribute C can be referenced in the WHERE clause only in
+         predicates of the forms:
+         - (C {< | <= | > | >= | =} const)
+         - (const {< | <= | > | >= | =} C)
+         - (C between const_i and const_j)
+         - C IS NULL
+         - C IS NOT NULL
+         - C != const
+    SA4. If Q has a GROUP BY clause, there are no other aggregate functions
+         except MIN and MAX. For queries with DISTINCT, aggregate functions
+         are allowed.
+    SA5. The select list in DISTINCT queries should not contain expressions.
+    SA6. Clustered index can not be used by GROUP_MIN_MAX quick select
+         for AGG_FUNC(DISTINCT ...) optimization because cursor position is
+         never stored after a unique key lookup in the clustered index and
+         furhter index_next/prev calls can not be used. So loose index scan
+         optimization can not be used in this case.
+    SA7. If Q has both AGG_FUNC(DISTINCT ...) and MIN/MAX() functions then this
+         access method is not used.
+         For above queries MIN/MAX() aggregation has to be done at
+         nested_loops_join (end_send_group). But with current design MIN/MAX()
+         is always set as part of loose index scan. Because of this mismatch
+         MIN() and MAX() values will be set incorrectly. For such queries to
+         work we need a new interface for loose index scan. This new interface
+         should only fetch records with min and max values and let
+         end_send_group to do aggregation. Until then do not use
+         loose_index_scan.
+    GA1. If Q has a GROUP BY clause, then GA is a prefix of I. That is, if
+         G_i = A_j => i = j.
+    GA2. If Q has a DISTINCT clause, then there is a permutation of SA that
+         forms a prefix of I. This permutation is used as the GROUP clause
+         when the DISTINCT query is converted to a GROUP query.
+    GA3. The attributes in GA may participate in arbitrary predicates, divided
+         into two groups:
+         - RNG(G_1,...,G_q ; where q <= k) is a range condition over the
+           attributes of a prefix of GA
+         - PA(G_i1,...G_iq) is an arbitrary predicate over an arbitrary subset
+           of GA. Since P is applied to only GROUP attributes it filters some
+           groups, and thus can be applied after the grouping.
+    GA4. There are no expressions among G_i, just direct column references.
+    NGA1.If in the index I there is a gap between the last GROUP attribute G_k,
+         and the MIN/MAX attribute C, then NGA must consist of exactly the
+         index attributes that constitute the gap. As a result there is a
+         permutation of NGA, BA=<B_1,...,B_m>, that coincides with the gap
+         in the index.
+    NGA2.If BA <> {}, then the WHERE clause must contain a conjunction EQ of
+         equality conditions for all NG_i of the form (NG_i = const) or
+         (const = NG_i), such that each NG_i is referenced in exactly one
+         conjunct. Informally, the predicates provide constants to fill the
+         gap in the index.
+    WA1. There are no other attributes in the WHERE clause except the ones
+         referenced in predicates RNG, PA, PC, EQ defined above. Therefore
+         WA is subset of (GA union NGA union C) for GA,NGA,C that pass the
+         above tests. By transitivity then it also follows that each WA_i
+         participates in the index I (if this was already tested for GA, NGA
+         and C).
+    WA2. If there is a predicate on C, then it must be in conjunction
+         to all predicates on all earlier keyparts in I.
+
+    C) Overall query form:
+       SELECT EXPR([A_1,...,A_k], [B_1,...,B_m], [MIN(C)], [MAX(C)])
+         FROM T
+        WHERE [RNG(A_1,...,A_p ; where p <= k)]
+         [AND EQ(B_1,...,B_m)]
+         [AND PC(C)]
+         [AND PA(A_i1,...,A_iq)]
+       GROUP BY A_1,...,A_k
+       [HAVING PH(A_1, ..., B_1,..., C)]
+    where EXPR(...) is an arbitrary expression over some or all SELECT fields,
+    or:
+       SELECT DISTINCT A_i1,...,A_ik
+         FROM T
+        WHERE [RNG(A_1,...,A_p ; where p <= k)]
+         [AND PA(A_i1,...,A_iq)];
+
+  NOTES
+    If the current query satisfies the conditions above, and if
+    (mem_root! = NULL), then the function constructs and returns a new TRP
+    object, that is later used to construct a new QUICK_GROUP_MIN_MAX_SELECT.
+    If (mem_root == NULL), then the function only tests whether the current
+    query satisfies the conditions above, and, if so, sets
+    is_applicable = true.
+
+    Queries with DISTINCT for which index access can be used are transformed
+    into equivalent group-by queries of the form:
+
+    SELECT A_1,...,A_k FROM T
+     WHERE [RNG(A_1,...,A_p ; where p <= k)]
+      [AND PA(A_i1,...,A_iq)]
+    GROUP BY A_1,...,A_k;
+
+    The group-by list is a permutation of the select attributes, according
+    to their order in the index.
+
+  TODO
+  - What happens if the query groups by the MIN/MAX field, and there is no
+    other field as in: "select min(a) from t1 group by a" ?
+  - We assume that the general correctness of the GROUP-BY query was checked
+    before this point. Is this correct, or do we have to check it completely?
+  - Lift the limitation in condition (B3), that is, make this access method
+    applicable to ROLLUP queries.
+
+ @param  thd       Thread handle
+ @param  param     Parameter from test_quick_select
+ @param  tree      Range tree generated by get_mm_tree
+ @param  cost_est  Best cost so far (=table/index scan time)
+ @param  order_direction The sort order the range access method must be able
+                   to provide. Three-value logic: asc/desc/don't care
+ @param  skip_records_in_range  Same value as JOIN_TAB::skip_records_in_range().
+ @return table read plan
+   @retval NULL  Loose index scan not applicable or mem_root == NULL
+   @retval !NULL Loose index scan table read plan
+*/
+
+TRP_GROUP_MIN_MAX *get_best_group_min_max(THD *thd, RANGE_OPT_PARAM *param,
+                                          SEL_TREE *tree,
+                                          enum_order order_direction,
+                                          bool skip_records_in_range,
+                                          const Cost_estimate *cost_est) {
+  JOIN *join = param->query_block->join;
+  TABLE *table = param->table;
+  bool have_min = false; /* true if there is a MIN function. */
+  bool have_max = false; /* true if there is a MAX function. */
+  Item_field *min_max_arg_item =
+      nullptr;  // The argument of all MIN/MAX functions
+  KEY_PART_INFO *min_max_arg_part = nullptr; /* The corresponding keypart. */
+  uint group_prefix_len = 0; /* Length (in bytes) of the key prefix. */
+  KEY *index_info = nullptr; /* The index chosen for data access. */
+  uint index = 0;            /* The id of the chosen index. */
+  uint group_key_parts = 0;  // Number of index key parts in the group prefix.
+  uint used_key_parts = 0;   /* Number of index key parts used for access. */
+  uint key_infix_len = 0;    /* Length of key_infix. */
+  TRP_GROUP_MIN_MAX *read_plan = nullptr; /* The eventually constructed TRP. */
+  uint key_part_nr;
+  ORDER *tmp_group;
+  Item_field *item_field;
+  bool is_agg_distinct;
+  /* Cost-related variables for the best index so far. */
+  Cost_estimate best_read_cost;
+  ha_rows best_records = 0;
+  SEL_ROOT *best_index_tree = nullptr;
+  ha_rows best_quick_prefix_records = 0;
+  uint best_param_idx = 0;
+  Opt_trace_context *const trace = &thd->opt_trace;
+
+  DBUG_TRACE;
+
+  Opt_trace_object trace_group(trace, "group_index_range",
+                               Opt_trace_context::RANGE_OPTIMIZER);
+  const char *cause = nullptr;
+  best_read_cost.set_max_cost();
+
+  /* Perform few 'cheap' tests whether this access method is applicable. */
+  if (!join)
+    cause = "no_join";
+  else if (join->primary_tables != 1) /* Query must reference one table. */
+    cause = "not_single_table";
+  else if (join->query_block->olap == ROLLUP_TYPE) /* Check (B3) for ROLLUP */
+    cause = "rollup";
+  else if (table->s->keys == 0) /* There are no indexes to use. */
+    cause = "no_index";
+  else if (order_direction == ORDER_DESC)
+    cause = "cannot_do_reverse_ordering";
+  if (cause != nullptr) {
+    trace_group.add("chosen", false).add_alnum("cause", cause);
+    return nullptr;
+  }
+
+  /* Check (SA1,SA4) and store the only MIN/MAX argument - the C attribute.*/
+  mem_root_deque<Item_field *> agg_distinct_flds(param->temp_mem_root);
+  is_agg_distinct = is_indexed_agg_distinct(join, &agg_distinct_flds);
+
+  if (join->group_list.empty() && /* Neither GROUP BY nor a DISTINCT query. */
+      (!join->select_distinct) && !is_agg_distinct) {
+    trace_group.add("chosen", false)
+        .add_alnum("cause", "not_group_by_or_distinct");
+    return nullptr;
+  }
+  /* Analyze the query in more detail. */
+
+  if (join->sum_funcs[0]) {
+    Item_sum *min_max_item;
+    Item_sum **func_ptr = join->sum_funcs;
+    while ((min_max_item = *(func_ptr++))) {
+      if (min_max_item->sum_func() == Item_sum::MIN_FUNC)
+        have_min = true;
+      else if (min_max_item->sum_func() == Item_sum::MAX_FUNC)
+        have_max = true;
+      else if (is_agg_distinct &&
+               (min_max_item->sum_func() == Item_sum::COUNT_DISTINCT_FUNC ||
+                min_max_item->sum_func() == Item_sum::SUM_DISTINCT_FUNC ||
+                min_max_item->sum_func() == Item_sum::AVG_DISTINCT_FUNC))
+        continue;
+      else {
+        trace_group.add("chosen", false)
+            .add_alnum("cause", "not_applicable_aggregate_function");
+        return nullptr;
+      }
+
+      /* The argument of MIN/MAX. */
+      Item *expr = min_max_item->get_arg(0)->real_item();
+      if (expr->type() == Item::FIELD_ITEM) /* Is it an attribute? */
+      {
+        if (!min_max_arg_item)
+          min_max_arg_item = (Item_field *)expr;
+        else if (!min_max_arg_item->eq(expr, true))
+          return nullptr;
+      } else
+        return nullptr;
+    }
+  }
+
+  /**
+    Test (Part of WA2): Skip loose index scan on disjunctive WHERE clause which
+    results in null tree or merge tree.
+  */
+  if (tree && !tree->merges.is_empty()) {
+    /**
+      The tree structure contains multiple disjoint trees. This happens when
+      the WHERE clause can't be represented in a single range tree due to the
+      disjunctive nature of it but there exists indexes to perform index
+      merge scan.
+    */
+    trace_group.add("chosen", false)
+        .add_alnum("cause", "disjuntive_predicate_present");
+    return nullptr;
+  } else if (!tree && join->where_cond && min_max_arg_item) {
+    /**
+      Skip loose index scan if min_max attribute is present along with
+      at least one other attribute in the WHERE cluse when the tree is null.
+      There is no range tree if WHERE condition can't be represented in a
+      single range tree and index merge is not possible.
+    */
+    bool min_max_arg_present = false;
+    bool non_min_max_arg_present = false;
+    if (min_max_inspect_cond_for_fields(join->where_cond, min_max_arg_item,
+                                        &min_max_arg_present,
+                                        &non_min_max_arg_present)) {
+      trace_group.add("chosen", false)
+          .add_alnum("cause", "minmax_keypart_in_disjunctive_query");
+      return nullptr;
+    }
+  }
+
+  /* Check (SA7). */
+  if (is_agg_distinct && (have_max || have_min)) {
+    trace_group.add("chosen", false)
+        .add_alnum("cause", "have_both_agg_distinct_and_min_max");
+    return nullptr;
+  }
+
+  /* Check (SA5). */
+  if (join->select_distinct) {
+    trace_group.add("distinct_query", true);
+    for (Item *item : VisibleFields(*join->fields)) {
+      if (item->real_item()->type() != Item::FIELD_ITEM) return nullptr;
+    }
+  }
+
+  /* Check (GA4) - that there are no expressions among the group attributes. */
+  for (tmp_group = join->group_list.order; tmp_group;
+       tmp_group = tmp_group->next) {
+    if ((*tmp_group->item)->real_item()->type() != Item::FIELD_ITEM) {
+      trace_group.add("chosen", false)
+          .add_alnum("cause", "group_field_is_expression");
+      return nullptr;
+    }
+  }
+
+  /*
+    Check that table has at least one compound index such that the conditions
+    (GA1,GA2) are all true. If there is more than one such index, select the
+    first one. Here we set the variables: group_prefix_len and index_info.
+  */
+
+  const uint pk = param->table->s->primary_key;
+  SEL_ROOT *cur_index_tree = nullptr;
+  ha_rows cur_quick_prefix_records = 0;
+  Opt_trace_array trace_indexes(trace, "potential_group_range_indexes");
+  // We go through allowed indexes
+  for (uint cur_param_idx = 0; cur_param_idx < param->keys; ++cur_param_idx) {
+    const uint cur_index = param->real_keynr[cur_param_idx];
+    KEY *const cur_index_info = &table->key_info[cur_index];
+    Opt_trace_object trace_idx(trace);
+    trace_idx.add_utf8("index", cur_index_info->name);
+    KEY_PART_INFO *cur_part;
+    KEY_PART_INFO *end_part; /* Last part for loops. */
+    /* Last index part. */
+    KEY_PART_INFO *last_part;
+    KEY_PART_INFO *first_non_group_part;
+    KEY_PART_INFO *first_non_infix_part;
+    uint key_infix_parts;
+    uint cur_group_key_parts = 0;
+    uint cur_group_prefix_len = 0;
+    Cost_estimate cur_read_cost;
+    // Possible number of combination of infix ranges
+    uint cur_infix_factor = 1;
+    ha_rows cur_records;
+    Key_map used_key_parts_map;
+    uint max_key_part = 0;
+    uint cur_key_infix_len = 0;
+    uint cur_used_key_parts;
+    KEY_PART_INFO *cur_min_max_arg_part = nullptr;
+    // Set to true if the query has equality predicate on the grouping
+    // attributes.
+    bool is_eq_range_pred = false;
+
+    /* Check (B1) - if current index is covering. */
+    if (!table->covering_keys.is_set(cur_index)) {
+      cause = "not_covering";
+      goto next_index;
+    }
+
+    /*
+      If the current storage manager is such that it appends the primary key to
+      each index, then the above condition is insufficient to check if the
+      index is covering. In such cases it may happen that some fields are
+      covered by the PK index, but not by the current index. Since we can't
+      use the concatenation of both indexes for index lookup, such an index
+      does not qualify as covering in our case. If this is the case, below
+      we check that all query fields are indeed covered by 'cur_index'.
+    */
+    if (pk < MAX_KEY && cur_index != pk &&
+        (table->file->ha_table_flags() & HA_PRIMARY_KEY_IN_READ_INDEX)) {
+      /* For each table field */
+      for (uint i = 0; i < table->s->fields; i++) {
+        Field *cur_field = table->field[i];
+        /*
+          If the field is used in the current query ensure that it's
+          part of 'cur_index'
+        */
+        if (bitmap_is_set(table->read_set, cur_field->field_index()) &&
+            !cur_field->is_part_of_actual_key(thd, cur_index, cur_index_info)) {
+          cause = "not_covering";
+          goto next_index;  // Field was not part of key
+        }
+      }
+    }
+    trace_idx.add("covering", true);
+
+    /*
+      Check (GA1) for GROUP BY queries. While at it, check if the query produces
+      only one group.
+    */
+    if (!join->group_list.empty()) {
+      cur_part = cur_index_info->key_part;
+      end_part = cur_part + actual_key_parts(cur_index_info);
+      SEL_ROOT *cur_tree = nullptr;
+      if (tree) cur_tree = get_index_range_tree(cur_index, tree, param);
+      /* Iterate in parallel over the GROUP list and the index parts. */
+      for (tmp_group = join->group_list.order;
+           tmp_group && (cur_part != end_part);
+           tmp_group = tmp_group->next, cur_part++) {
+        /*
+          TODO:
+          tmp_group::item is an array of Item, is it OK to consider only the
+          first Item? If so, then why? What is the array for?
+        */
+        /* Above we already checked that all group items are fields. */
+        assert((*tmp_group->item)->real_item()->type() == Item::FIELD_ITEM);
+        Item_field *group_field = (Item_field *)(*tmp_group->item)->real_item();
+        if (group_field->field->eq(cur_part->field)) {
+          cur_group_prefix_len += cur_part->store_length;
+          ++cur_group_key_parts;
+          max_key_part = cur_part - cur_index_info->key_part + 1;
+          used_key_parts_map.set_bit(max_key_part);
+        } else {
+          cause = "group_attribute_not_prefix_in_index";
+          goto next_index;
+        }
+        // Special case (determine if the query produces only one group):
+        // If all the grouping attributes have an equality predicate or
+        // have NULL range (IS NULL), query produces only one group.
+        // Determining this will help in cost calculation for using this
+        // index.
+        if (cur_tree &&
+            // Check if the range tree is for the key part that is being looked
+            // into.
+            (cur_tree->root->part == cur_part - cur_index_info->key_part) &&
+            // There should not be any disjuntive predicates on the key part.
+            cur_tree->root->first() != nullptr &&
+            cur_tree->root->first()->next == nullptr) {
+          SEL_ARG *range = cur_tree->root->first();
+          const uint is_open_range =
+              (NO_MIN_RANGE | NO_MAX_RANGE | NEAR_MIN | NEAR_MAX | GEOM_FLAG);
+          is_eq_range_pred = !(range->min_flag & is_open_range) &&
+                             !(range->max_flag & is_open_range) &&
+                             ((range->maybe_null() && range->min_value[0] &&
+                               range->max_value[0]) ||
+                              memcmp(range->min_value, range->max_value,
+                                     cur_part->store_length) == 0);
+        } else
+          is_eq_range_pred = false;
+        cur_tree =
+            is_eq_range_pred ? cur_tree->root->first()->next_key_part : nullptr;
+      }
+    }
+
+    /*
+      Check (GA2) if this is a DISTINCT query.
+      If GA2, then Store a new ORDER object in group_fields_array at the
+      position of the key part of item_field->field. Thus we get the ORDER
+      objects for each field ordered as the corresponding key parts.
+      Later group_fields_array of ORDER objects is used to convert the query
+      to a GROUP query.
+    */
+    if ((join->group_list.empty() && join->select_distinct) ||
+        is_agg_distinct) {
+      auto agg_distinct_flds_it = agg_distinct_flds.begin();
+      auto select_items_it = join->fields->begin();
+      while (is_agg_distinct ? (agg_distinct_flds_it != agg_distinct_flds.end())
+                             : (select_items_it != join->fields->end())) {
+        Item *item =
+            (is_agg_distinct ? static_cast<Item *>(*agg_distinct_flds_it++)
+                             : *select_items_it++);
+        if (item->hidden) continue;
+
+        /* (SA5) already checked above. */
+        item_field = (Item_field *)item->real_item();
+        assert(item->real_item()->type() == Item::FIELD_ITEM);
+
+        /* not doing loose index scan for derived tables */
+        if (!item_field->field) {
+          cause = "derived_table";
+          goto next_index;
+        }
+
+        /* Find the order of the key part in the index. */
+        key_part_nr = get_field_keypart(cur_index_info, item_field->field);
+        /*
+          Check if this attribute was already present in the select list.
+          If it was present, then its corresponding key part was alredy used.
+        */
+        if (used_key_parts_map.is_set(key_part_nr)) continue;
+        if (key_part_nr < 1 ||
+            (!is_agg_distinct &&
+             key_part_nr > CountVisibleFields(*join->fields))) {
+          cause = "select_attribute_not_prefix_in_index";
+          goto next_index;
+        }
+        cur_part = cur_index_info->key_part + key_part_nr - 1;
+        cur_group_prefix_len += cur_part->store_length;
+        used_key_parts_map.set_bit(key_part_nr);
+        ++cur_group_key_parts;
+        max_key_part = max(max_key_part, key_part_nr);
+      }
+      /*
+        Check that used key parts forms a prefix of the index.
+        To check this we compare bits in all_parts and cur_parts.
+        all_parts have all bits set from 0 to (max_key_part-1).
+        cur_parts have bits set for only used keyparts.
+      */
+      ulonglong all_parts, cur_parts;
+      all_parts = (1ULL << max_key_part) - 1;
+      cur_parts = used_key_parts_map.to_ulonglong() >> 1;
+      if (all_parts != cur_parts) goto next_index;
+    }
+
+    /* Check (SA2). */
+    if (min_max_arg_item) {
+      key_part_nr = get_field_keypart(cur_index_info, min_max_arg_item->field);
+      if (key_part_nr <= cur_group_key_parts) {
+        cause = "aggregate_column_not_suffix_in_idx";
+        goto next_index;
+      }
+      cur_min_max_arg_part = cur_index_info->key_part + key_part_nr - 1;
+    }
+
+    /* Check (SA6) if clustered key is used. */
+    if (is_agg_distinct && cur_index == table->s->primary_key &&
+        table->file->primary_key_is_clustered()) {
+      cause = "primary_key_is_clustered";
+      goto next_index;
+    }
+
+    /*
+      Check (NGA1, NGA2) and extract a sequence of constants to be used as part
+      of all search keys.
+    */
+
+    /*
+      If there is MIN/MAX, each keypart between the last group part and the
+      MIN/MAX part must participate in equalities with constants, and all
+      keyparts after the MIN/MAX part must not be referenced in the query.
+
+      If there is no MIN/MAX, the keyparts after the last group part can be
+      referenced only in equalities with constants, and the referenced keyparts
+      must form a sequence without any gaps that starts immediately after the
+      last group keypart.
+    */
+    last_part = cur_index_info->key_part + actual_key_parts(cur_index_info);
+    first_non_group_part =
+        (cur_group_key_parts < actual_key_parts(cur_index_info))
+            ? cur_index_info->key_part + cur_group_key_parts
+            : nullptr;
+    first_non_infix_part = cur_min_max_arg_part
+                               ? (cur_min_max_arg_part < last_part)
+                                     ? cur_min_max_arg_part
+                                     : nullptr
+                               : nullptr;
+    if (first_non_group_part &&
+        (!cur_min_max_arg_part ||
+         (cur_min_max_arg_part - first_non_group_part > 0))) {
+      if (tree) {
+        SEL_ROOT *index_range_tree =
+            get_index_range_tree(cur_index, tree, param);
+
+        if (!check_key_infix(index_range_tree, first_non_group_part,
+                             cur_min_max_arg_part, last_part,
+                             &cur_key_infix_len, &first_non_infix_part,
+                             &cur_infix_factor, cur_index_info)) {
+          cause = "non_equality_gap_attribute";
+          goto next_index;
+        }
+      } else if (cur_min_max_arg_part &&
+                 (cur_min_max_arg_part - first_non_group_part > 0)) {
+        /*
+          There is a gap but no range tree, thus no predicates at all for the
+          non-group keyparts.
+        */
+        cause = "no_nongroup_keypart_predicate";
+        goto next_index;
+      } else if (first_non_group_part && join->where_cond) {
+        /*
+          If there is no MIN/MAX function in the query, but some index
+          key part is referenced in the WHERE clause, then this index
+          cannot be used because the WHERE condition over the keypart's
+          field cannot be 'pushed' to the index (because there is no
+          range 'tree'), and the WHERE clause must be evaluated before
+          GROUP BY/DISTINCT.
+        */
+        /*
+          Store the first and last keyparts that need to be analyzed
+          into one array that can be passed as parameter.
+        */
+        KEY_PART_INFO *key_part_range[2];
+        key_part_range[0] = first_non_group_part;
+        key_part_range[1] = last_part;
+
+        /* Check if cur_part is referenced in the WHERE clause. */
+        if (join->where_cond->walk(&Item::find_item_in_field_list_processor,
+                                   enum_walk::SUBQUERY_POSTFIX,
+                                   (uchar *)key_part_range)) {
+          cause = "keypart_reference_from_where_clause";
+          goto next_index;
+        }
+      }
+    }
+
+    /*
+      Test (WA1) partially - that no other keypart after the last infix part is
+      referenced in the query.
+    */
+    if (first_non_infix_part) {
+      cur_part = first_non_infix_part +
+                 (cur_min_max_arg_part && (cur_min_max_arg_part < last_part));
+      for (; cur_part != last_part; cur_part++) {
+        if (bitmap_is_set(table->read_set, cur_part->field->field_index())) {
+          cause = "keypart_after_infix_in_query";
+          goto next_index;
+        }
+      }
+    }
+
+    /**
+      Test Part of WA2:If there are conditions on a column C participating in
+      MIN/MAX, those conditions must be conjunctions to all earlier
+      keyparts. Otherwise, Loose Index Scan cannot be used.
+    */
+    if (tree && min_max_arg_item) {
+      SEL_ROOT *index_range_tree = get_index_range_tree(cur_index, tree, param);
+      SEL_ROOT *cur_range = nullptr;
+      if (get_sel_root_for_keypart(
+              cur_min_max_arg_part - cur_index_info->key_part, index_range_tree,
+              &cur_range) ||
+          (cur_range && cur_range->type != SEL_ROOT::Type::KEY_RANGE)) {
+        cause = "minmax_keypart_in_disjunctive_query";
+        goto next_index;
+      }
+    }
+
+    /* If we got to this point, cur_index_info passes the test. */
+    key_infix_parts = cur_key_infix_len
+                          ? (uint)(first_non_infix_part - first_non_group_part)
+                          : 0;
+    cur_used_key_parts = cur_group_key_parts + key_infix_parts;
+
+    /* Compute the cost of using this index. */
+    if (tree) {
+      /* Find the SEL_ARG sub-tree that corresponds to the chosen index. */
+      cur_index_tree = get_index_range_tree(cur_index, tree, param);
+      /* Check if this range tree can be used for prefix retrieval. */
+      Cost_estimate dummy_cost;
+      uint mrr_flags = HA_MRR_SORTED;
+      uint mrr_bufsize = 0;
+      bool is_ror_scan, is_imerge_scan;
+      cur_quick_prefix_records = check_quick_select(
+          thd, param, cur_param_idx, false /*don't care*/, cur_index_tree, true,
+          order_direction, skip_records_in_range, &mrr_flags, &mrr_bufsize,
+          &dummy_cost, &is_ror_scan, &is_imerge_scan);
+      if (unlikely(cur_index_tree && trace->is_started())) {
+        trace_idx.add("index_dives_for_eq_ranges",
+                      !param->use_index_statistics);
+        Opt_trace_array trace_range(trace, "ranges");
+
+        const KEY_PART_INFO *key_part = cur_index_info->key_part;
+
+        String range_info;
+        range_info.set_charset(system_charset_info);
+        append_range_all_keyparts(&trace_range, nullptr, &range_info,
+                                  cur_index_tree, key_part, false);
+      }
+    }
+    cost_group_min_max(table, cur_index, cur_used_key_parts,
+                       cur_group_key_parts, tree, cur_quick_prefix_records,
+                       have_min, have_max, cur_infix_factor, &cur_read_cost,
+                       &cur_records, is_eq_range_pred);
+    /*
+      If cur_read_cost is lower than best_read_cost use cur_index.
+      Do not compare doubles directly because they may have different
+      representations (64 vs. 80 bits).
+    */
+    trace_idx.add("rows", cur_records).add("cost", cur_read_cost);
+    {
+      Cost_estimate min_diff_cost = cur_read_cost;
+      min_diff_cost.multiply(DBL_EPSILON);
+      if (cur_read_cost < (best_read_cost - min_diff_cost)) {
+        index_info = cur_index_info;
+        index = cur_index;
+        best_read_cost = cur_read_cost;
+        best_records = cur_records;
+        best_index_tree = cur_index_tree;
+        best_quick_prefix_records = cur_quick_prefix_records;
+        best_param_idx = cur_param_idx;
+        group_key_parts = cur_group_key_parts;
+        group_prefix_len = cur_group_prefix_len;
+        key_infix_len = cur_key_infix_len;
+        used_key_parts = cur_used_key_parts;
+        min_max_arg_part = cur_min_max_arg_part;
+      }
+    }
+
+  next_index:
+    if (cause) {
+      trace_idx.add("usable", false).add_alnum("cause", cause);
+      cause = nullptr;
+    }
+  }
+  trace_indexes.end();
+
+  if (!index_info) /* No usable index found. */
+    return nullptr;
+
+  /* Check (SA3) for the where clause. */
+  if (join->where_cond && min_max_arg_item &&
+      !check_group_min_max_predicates(
+          join->where_cond, min_max_arg_item,
+          (index_info->flags & HA_SPATIAL) ? Field::itMBR : Field::itRAW)) {
+    trace_group.add("usable", false)
+        .add_alnum("cause", "unsupported_predicate_on_agg_attribute");
+    return nullptr;
+  }
+
+  /* The query passes all tests, so construct a new TRP object. */
+  read_plan = new (param->return_mem_root) TRP_GROUP_MIN_MAX(
+      have_min, have_max, is_agg_distinct, min_max_arg_part, group_prefix_len,
+      used_key_parts, group_key_parts, index_info, index, key_infix_len, tree,
+      best_index_tree, best_param_idx, best_quick_prefix_records, table, join,
+      param->key[best_param_idx], param->real_keynr[best_param_idx]);
+  if (read_plan) {
+    if (tree && read_plan->quick_prefix_records == 0) return nullptr;
+
+    read_plan->cost_est = best_read_cost;
+    read_plan->records = best_records;
+    if (*cost_est < best_read_cost && is_agg_distinct) {
+      trace_group.add("index_scan", true);
+      read_plan->cost_est.reset();
+      read_plan->use_index_scan();
+    }
+
+    DBUG_PRINT("info",
+               ("Returning group min/max plan: cost: %g, records: %lu",
+                read_plan->cost_est.total_cost(), (ulong)read_plan->records));
+  }
+
+  return read_plan;
+}
+
+/*
+  Check that the MIN/MAX attribute participates only in range predicates
+  with constants.
+
+  SYNOPSIS
+    check_group_min_max_predicates()
+    cond              tree (or subtree) describing all or part of the WHERE
+                      clause being analyzed
+    min_max_arg_item  the field referenced by the MIN/MAX function(s)
+    min_max_arg_part  the keypart of the MIN/MAX argument if any
+
+  DESCRIPTION
+    The function walks recursively over the cond tree representing a WHERE
+    clause, and checks condition (SA3) - if a field is referenced by a MIN/MAX
+    aggregate function, it is referenced only by one of the following
+    predicates: {=, !=, <, <=, >, >=, between, is null, is not null}.
+
+  RETURN
+    true  if cond passes the test
+    false o/w
+*/
+
+static bool check_group_min_max_predicates(Item *cond,
+                                           Item_field *min_max_arg_item,
+                                           Field::imagetype image_type) {
+  DBUG_TRACE;
+  assert(cond && min_max_arg_item);
+
+  cond = cond->real_item();
+  Item::Type cond_type = cond->type();
+  if (cond_type == Item::COND_ITEM) /* 'AND' or 'OR' */
+  {
+    DBUG_PRINT("info", ("Analyzing: %s", ((Item_func *)cond)->func_name()));
+    List_iterator_fast<Item> li(*((Item_cond *)cond)->argument_list());
+    Item *and_or_arg;
+    while ((and_or_arg = li++)) {
+      if (!check_group_min_max_predicates(and_or_arg, min_max_arg_item,
+                                          image_type))
+        return false;
+    }
+    return true;
+  }
+
+  /*
+    TODO:
+    This is a very crude fix to handle sub-selects in the WHERE clause
+    (Item_subselect objects). With the test below we rule out from the
+    optimization all queries with subselects in the WHERE clause. What has to
+    be done, is that here we should analyze whether the subselect references
+    the MIN/MAX argument field, and disallow the optimization only if this is
+    so.
+    Need to handle subselect in min_max_inspect_cond_for_fields() once this
+    is fixed.
+  */
+  if (cond_type == Item::SUBSELECT_ITEM) return false;
+
+  /*
+    Condition of the form 'field' is equivalent to 'field <> 0' and thus
+    satisfies the SA3 condition.
+  */
+  if (cond_type == Item::FIELD_ITEM) {
+    DBUG_PRINT("info", ("Analyzing: %s", cond->full_name()));
+    return true;
+  }
+
+  /*
+    At this point, we have weeded out most conditions other than
+    function items. However, there are cases like the following:
+
+      select 1 in (select max(c) from t1 where max(1) group by a)
+
+    Here the condition "where max(1)" is an Item_sum_max, not an
+    Item_func. In this particular case, the where clause should
+    be equivalent to "where max(1) <> 0". A where clause
+    phrased that way does not satisfy the SA3 condition of
+    get_best_group_min_max(). The "where max(1) = true" clause
+    causes this method to reject the access method
+    (i.e., to return false).
+
+    It's been suggested that it may be possible to use the access method
+    for a sub-family of cases when we're aggregating constants or
+    outer references. For the moment, we bale out and we reject
+    the access method for the query.
+
+    It's hard to prove that there are no other cases where the
+    condition is not an Item_func. So, for the moment, don't apply
+    the optimization if the condition is not a function item.
+  */
+  if (cond_type == Item::SUM_FUNC_ITEM) {
+    return false;
+  }
+
+  /*
+   If this is a debug server, then we want to know about
+   additional oddball cases which might benefit from this
+   optimization.
+  */
+  assert(cond_type == Item::FUNC_ITEM);
+  if (cond_type != Item::FUNC_ITEM) {
+    return false;
+  }
+
+  /* Test if cond references only group-by or non-group fields. */
+  Item_func *pred = (Item_func *)cond;
+  Item *cur_arg;
+  DBUG_PRINT("info", ("Analyzing: %s", pred->func_name()));
+  for (uint arg_idx = 0; arg_idx < pred->argument_count(); arg_idx++) {
+    Item **arguments = pred->arguments();
+    cur_arg = arguments[arg_idx]->real_item();
+    DBUG_PRINT("info", ("cur_arg: %s", cur_arg->full_name()));
+    if (cur_arg->type() == Item::FIELD_ITEM) {
+      if (min_max_arg_item->eq(cur_arg, true)) {
+        /*
+          If pred references the MIN/MAX argument, check whether pred is a range
+          condition that compares the MIN/MAX argument with a constant.
+        */
+        Item_func::Functype pred_type = pred->functype();
+        if (pred_type != Item_func::EQUAL_FUNC &&
+            pred_type != Item_func::LT_FUNC &&
+            pred_type != Item_func::LE_FUNC &&
+            pred_type != Item_func::GT_FUNC &&
+            pred_type != Item_func::GE_FUNC &&
+            pred_type != Item_func::BETWEEN &&
+            pred_type != Item_func::ISNULL_FUNC &&
+            pred_type != Item_func::ISNOTNULL_FUNC &&
+            pred_type != Item_func::EQ_FUNC && pred_type != Item_func::NE_FUNC)
+          return false;
+
+        /* Check that pred compares min_max_arg_item with a constant. */
+        Item *args[3];
+        memset(args, 0, 3 * sizeof(Item *));
+        bool inv;
+        /* Test if this is a comparison of a field and a constant. */
+        if (!is_simple_predicate(pred, args, &inv)) return false;
+
+        /* Check for compatible string comparisons - similar to get_mm_leaf. */
+        if (args[0] && args[1] && !args[2] &&  // this is a binary function
+            min_max_arg_item->result_type() == STRING_RESULT &&
+            /*
+              Don't use an index when comparing strings of different collations.
+            */
+            ((args[1]->result_type() == STRING_RESULT &&
+              image_type == Field::itRAW &&
+              min_max_arg_item->field->charset() !=
+                  pred->compare_collation()) ||
+             /*
+               We can't always use indexes when comparing a string index to a
+               number.
+             */
+             (args[1]->result_type() != STRING_RESULT &&
+              min_max_arg_item->field->cmp_type() != args[1]->result_type())))
+          return false;
+      }
+    } else if (cur_arg->type() == Item::FUNC_ITEM) {
+      if (!check_group_min_max_predicates(cur_arg, min_max_arg_item,
+                                          image_type))
+        return false;
+    } else if (cur_arg->const_item()) {
+      /*
+        For predicates of the form "const OP expr" we also have to check 'expr'
+        to make a decision.
+      */
+      continue;
+    } else
+      return false;
+  }
+
+  return true;
+}
+
+/**
+  Utility function used by min_max_inspect_cond_for_fields() for comparing
+  FILED item with given MIN/MAX item and setting appropriate out paramater.
+
+@param         item_field         Item field for comparison.
+@param         min_max_arg_item   The field referenced by the MIN/MAX
+                                  function(s).
+@param [out]   min_max_arg_present    This out parameter is set to true if
+                                      MIN/MAX argument is present in cond.
+@param [out]   non_min_max_arg_present This out parameter is set to true if
+                                       any field item other than MIN/MAX
+                                       argument is present in cond.
+*/
+static inline void util_min_max_inspect_item(Item *item_field,
+                                             Item_field *min_max_arg_item,
+                                             bool *min_max_arg_present,
+                                             bool *non_min_max_arg_present) {
+  if (item_field->type() == Item::FIELD_ITEM) {
+    if (min_max_arg_item->eq(item_field, true))
+      *min_max_arg_present = true;
+    else
+      *non_min_max_arg_present = true;
+  }
+}
+
+/**
+  This function detects the presents of MIN/MAX field along with at least
+  one non MIN/MAX field participation in the given condition. Subqueries
+  inspection is skipped as of now.
+
+  @param         cond   tree (or subtree) describing all or part of the WHERE
+                        clause being analyzed.
+  @param         min_max_arg_item   The field referenced by the MIN/MAX
+                                    function(s).
+  @param [out]   min_max_arg_present    This out parameter is set to true if
+                                        MIN/MAX argument is present in cond.
+  @param [out]   non_min_max_arg_present This out parameter is set to true if
+                                         any field item other than MIN/MAX
+                                         argument is present in cond.
+
+  @return  TRUE if both MIN/MAX field and non MIN/MAX field is present in cond.
+           FALSE o/w.
+
+  @todo: When the hack present in check_group_min_max_predicate() is removed,
+         subqueries needs to be inspected.
+*/
+
+static bool min_max_inspect_cond_for_fields(Item *cond,
+                                            Item_field *min_max_arg_item,
+                                            bool *min_max_arg_present,
+                                            bool *non_min_max_arg_present) {
+  DBUG_TRACE;
+  assert(cond && min_max_arg_item);
+
+  cond = cond->real_item();
+  Item::Type cond_type = cond->type();
+
+  switch (cond_type) {
+    case Item::COND_ITEM: {
+      DBUG_PRINT("info", ("Analyzing: %s", ((Item_func *)cond)->func_name()));
+      List_iterator_fast<Item> li(*((Item_cond *)cond)->argument_list());
+      Item *and_or_arg;
+      while ((and_or_arg = li++)) {
+        min_max_inspect_cond_for_fields(and_or_arg, min_max_arg_item,
+                                        min_max_arg_present,
+                                        non_min_max_arg_present);
+        if (*min_max_arg_present && *non_min_max_arg_present) return true;
+      }
+
+      return false;
+    }
+    case Item::FUNC_ITEM: {
+      /* Test if cond references both group-by and non-group fields. */
+      Item_func *pred = (Item_func *)cond;
+      Item *cur_arg;
+      DBUG_PRINT("info", ("Analyzing: %s", pred->func_name()));
+      for (uint arg_idx = 0; arg_idx < pred->argument_count(); arg_idx++) {
+        Item **arguments = pred->arguments();
+        cur_arg = arguments[arg_idx]->real_item();
+        DBUG_PRINT("info", ("cur_arg: %s", cur_arg->full_name()));
+
+        if (cur_arg->type() == Item::FUNC_ITEM) {
+          min_max_inspect_cond_for_fields(cur_arg, min_max_arg_item,
+                                          min_max_arg_present,
+                                          non_min_max_arg_present);
+        } else {
+          util_min_max_inspect_item(cur_arg, min_max_arg_item,
+                                    min_max_arg_present,
+                                    non_min_max_arg_present);
+        }
+
+        if (*min_max_arg_present && *non_min_max_arg_present) return true;
+      }
+
+      if (pred->functype() == Item_func::MULT_EQUAL_FUNC) {
+        /*
+          Analyze participating fields in a multiequal condition.
+        */
+        for (Item_field &item_field :
+             down_cast<Item_equal *>(cond)->get_fields()) {
+          util_min_max_inspect_item(&item_field, min_max_arg_item,
+                                    min_max_arg_present,
+                                    non_min_max_arg_present);
+
+          if (*min_max_arg_present && *non_min_max_arg_present) return true;
+        }
+      }
+
+      break;
+    }
+    case Item::FIELD_ITEM: {
+      util_min_max_inspect_item(cond, min_max_arg_item, min_max_arg_present,
+                                non_min_max_arg_present);
+      DBUG_PRINT("info", ("Analyzing: %s", cond->full_name()));
+      return false;
+    }
+    default:
+      break;
+  }
+
+  return false;
+}
+
+/*
+  Check for conjunction of equality predicates on the non-group key parts.
+
+  SYNOPSIS
+    check_key_infix()
+    index_range_tree       [in]  Range tree for the chosen index
+    first_non_group_part   [in]  First index part after group attribute parts
+    min_max_arg_part       [in]  The keypart of the MIN/MAX argument if any
+    last_part              [in]  Last keypart of the index
+    key_infix_len          [out] Lenghth of the infix
+    first_non_infix_part   [out] The first keypart after the infix (if any)
+    infix_factor           [out] The number of combinations of infixes
+                                 that can be possible.
+    index_info             [in]  Pointer to KEY object
+
+  DESCRIPTION
+    Test conditions (NGA1, NGA2) from get_best_group_min_max(). Namely,
+    for each keypart field NGF_i not in GROUP-BY, check that there is at least
+    one equality range predicate for each key part among conds with the form
+    (NGF_i = const_ci) or (const_ci = NGF_i).
+    Thus all the NGF_i attributes must fill the 'gap' between the last group-by
+    attribute and the MIN/MAX attribute in the index (if present). If these
+    conditions hold, update key_infix_len with the total length of the key
+    parts in key_infix. Increase the infix_factor by the number of ranges
+    present on NGF_i.
+
+  RETURN
+    true  if the index passes the test
+    false o/w
+*/
+
+static bool check_key_infix(SEL_ROOT *index_range_tree,
+                            KEY_PART_INFO *first_non_group_part,
+                            KEY_PART_INFO *min_max_arg_part,
+                            KEY_PART_INFO *last_part, uint *key_infix_len,
+                            KEY_PART_INFO **first_non_infix_part,
+                            uint *infix_factor, KEY *index_info) {
+  SEL_ROOT *cur_range;
+  KEY_PART_INFO *cur_part;
+  /* End part for the first loop below. */
+  KEY_PART_INFO *end_part = min_max_arg_part ? min_max_arg_part : last_part;
+
+  *key_infix_len = 0;
+  *infix_factor = 1;
+
+  for (cur_part = first_non_group_part; cur_part != end_part; cur_part++) {
+    cur_range = nullptr;
+    /*
+      get_sel_root_for_keypart gets the range tree for the key part and
+      also checks for a unique conjunction of this tree with all the
+      predicates on the earlier keyparts in the index.
+    */
+    if (get_sel_root_for_keypart(cur_part - index_info->key_part,
+                                 index_range_tree, &cur_range))
+      return false;
+
+    if (!cur_range || cur_range->type != SEL_ROOT::Type::KEY_RANGE) {
+      if (min_max_arg_part)
+        return false; /* The current keypart has no range predicates at all. */
+      else {
+        *first_non_infix_part = cur_part;
+        return true;
+      }
+    }
+
+    /*
+      Check if all ranges are equality or NULL ranges for key the current
+      key part.
+    */
+    SEL_ARG *tmp_range = cur_range->root->first();
+    while (tmp_range) {
+      if ((tmp_range->min_flag & NO_MIN_RANGE) ||
+          (tmp_range->max_flag & NO_MAX_RANGE) ||
+          (tmp_range->min_flag & NEAR_MIN) || (tmp_range->max_flag & NEAR_MAX))
+        return false;
+      if (!((tmp_range->maybe_null() && tmp_range->min_value[0] &&
+             tmp_range->max_value[0]) ||
+            memcmp(tmp_range->min_value, tmp_range->max_value,
+                   cur_part->store_length) == 0))
+        return false;
+      tmp_range = tmp_range->next;
+    }
+    *key_infix_len += cur_part->store_length;
+    *infix_factor *= cur_range->elements;
+  }
+
+  if (!min_max_arg_part && (cur_part == last_part))
+    *first_non_infix_part = last_part;
+
+  return true;
+}
+
+/*
+  Find the key part referenced by a field.
+
+  SYNOPSIS
+    get_field_keypart()
+    index  descriptor of an index
+    field  field that possibly references some key part in index
+
+  NOTES
+    The return value can be used to get a KEY_PART_INFO pointer by
+    part= index->key_part + get_field_keypart(...) - 1;
+
+  RETURN
+    Positive number which is the consecutive number of the key part, or
+    0 if field does not reference any index field.
+*/
+
+static inline uint get_field_keypart(KEY *index, const Field *field) {
+  KEY_PART_INFO *part, *end;
+
+  for (part = index->key_part, end = part + actual_key_parts(index); part < end;
+       part++) {
+    if (field->eq(part->field)) return part - index->key_part + 1;
+  }
+  return 0;
+}
+
+/*
+  Compute the cost of a quick_group_min_max_query_block for a particular index.
+
+  SYNOPSIS
+    cost_group_min_max()
+    table                [in] The table being accessed
+    key                  [in] The index used to access the table
+    used_key_parts       [in] Number of key parts used to access the index
+    group_key_parts      [in] Number of index key parts in the group prefix
+    range_tree           [in] Tree of ranges for all indexes
+    quick_prefix_records [in] Number of records retrieved by the internally
+                              used quick range select if any
+    have_min             [in] True if there is a MIN function
+    have_max             [in] True if there is a MAX function
+    infix_factor         [in] The number of combinations of infix ranges that
+                              can be possible (increases the number of groups).
+    cost_est            [out] The cost to retrieve rows via this quick select
+    records             [out] The number of rows retrieved
+    single_group         [in] True if this query produces only one group because
+                              there are equality predicates on grouping
+                              attributes.
+
+  DESCRIPTION
+    This method computes the access cost of a TRP_GROUP_MIN_MAX instance and
+    the number of rows returned.
+
+  NOTES
+    The cost computation distinguishes several cases:
+    1) No equality predicates over non-group attributes (thus no key_infix).
+       If groups are bigger than blocks on the average, then we assume that it
+       is very unlikely that block ends are aligned with group ends, thus even
+       if we look for both MIN and MAX keys, all pairs of neighbor MIN/MAX
+       keys, except for the first MIN and the last MAX keys, will be in the
+       same block.  If groups are smaller than blocks, then we are going to
+       read all blocks.
+    2) There are equality predicates over non-group attributes.
+       In this case the group prefix is extended by additional constants, and
+       as a result the min/max values are inside sub-groups of the original
+       groups. The number of blocks that will be read depends on whether the
+       ends of these sub-groups will be contained in the same or in different
+       blocks. We compute the probability for the two ends of a subgroup to be
+       in two different blocks as the ratio of:
+       - the number of positions of the left-end of a subgroup inside a group,
+         such that the right end of the subgroup is past the end of the buffer
+         containing the left-end, and
+       - the total number of possible positions for the left-end of the
+         subgroup, which is the number of keys in the containing group.
+       We assume it is very unlikely that two ends of subsequent subgroups are
+       in the same block.
+    3) The are range predicates over the group attributes.
+       Then some groups may be filtered by the range predicates. We use the
+       selectivity of the range predicates to decide how many groups will be
+       filtered.
+
+  TODO
+     - Take into account the optional range predicates over the MIN/MAX
+       argument.
+     - Check if we have a PK index and we use all cols - then each key is a
+       group, and it will be better to use an index scan.
+     - quick_prefix_records used in calculating group prefix selectivity
+       is not the correct estimate always. When group prefix has equality
+       predicates, range optimizer uses infix ranges (if present) to get
+       possible number of rows that would be read from storage engine
+       (quick_prefix_records). But we just need the number of rows that
+       would be read when only group prefix predicates are used.
+       This needs fixing.
+     - When both min and max are present, LIS will make two reads per group
+       instead of one. Similarly when min and max functions are not present,
+       rows retrived are different. Cost model should reflect what happens
+       in QUICK_GROUP_MIN_MAX::get_next()
+
+  RETURN
+    None
+*/
+
+static void cost_group_min_max(TABLE *table, uint key, uint used_key_parts,
+                               uint group_key_parts, SEL_TREE *range_tree,
+                               ha_rows quick_prefix_records, bool have_min,
+                               bool have_max, uint infix_factor,
+                               Cost_estimate *cost_est, ha_rows *records,
+                               bool single_group) {
+  ha_rows table_records;
+  uint num_groups;
+  uint num_blocks;
+  uint keys_per_block;
+  rec_per_key_t keys_per_group;
+  double p_overlap; /* Probability that a sub-group overlaps two blocks. */
+  double quick_prefix_selectivity;
+  double io_blocks;  // Number of blocks to read from table
+  DBUG_TRACE;
+  assert(cost_est->is_zero());
+
+  const KEY *const index_info = &table->key_info[key];
+  table_records = table->file->stats.records;
+  keys_per_block = (table->file->stats.block_size / 2 /
+                        (index_info->key_length + table->file->ref_length) +
+                    1);
+  num_blocks = (uint)(table_records / keys_per_block) + 1;
+
+  /* Compute the number of keys in a group. */
+  if (index_info->has_records_per_key(group_key_parts - 1))
+    // Use index statistics
+    keys_per_group = index_info->records_per_key(group_key_parts - 1);
+  else
+    /* If there is no statistics try to guess */
+    keys_per_group = guess_rec_per_key(table, index_info, group_key_parts);
+
+  if (single_group)
+    // Pre-determined in the calling function that the query will have
+    // only one group.
+    num_groups = 1;
+  else {
+    num_groups = (uint)(table_records / keys_per_group) + 1;
+
+    /* Apply the selectivity of the quick select for group prefixes. */
+    if (range_tree && (quick_prefix_records != HA_POS_ERROR)) {
+      quick_prefix_selectivity =
+          (double)quick_prefix_records / (double)table_records;
+      num_groups = (uint)rint(num_groups * quick_prefix_selectivity);
+      num_groups = std::max(num_groups, 1U);
+    }
+  }
+
+  if (used_key_parts > group_key_parts) {
+    // Average number of keys in sub-groups formed by a key infixes
+    rec_per_key_t keys_in_subgroup;
+    if (index_info->has_records_per_key(used_key_parts - 1))
+      // Use index statistics
+      keys_in_subgroup = index_info->records_per_key(used_key_parts - 1);
+    else {
+      // If no index statistics then we use a guessed records per key value.
+      keys_in_subgroup = guess_rec_per_key(table, index_info, used_key_parts);
+      keys_in_subgroup = std::min(keys_in_subgroup, keys_per_group);
+    }
+
+    /*
+      Compute the probability that two ends of subgroups are inside
+      different blocks. Keys in subgroup need to be increases by the number
+      of infix ranges possible.
+    */
+    keys_in_subgroup = keys_in_subgroup * infix_factor;
+    if (keys_in_subgroup >= keys_per_block) /* If a subgroup is bigger than */
+      p_overlap = 1.0; /* a block, it will overlap at least two blocks. */
+    else {
+      double blocks_per_group = (double)num_blocks / (double)num_groups;
+      p_overlap = (blocks_per_group * (keys_in_subgroup - 1)) / keys_per_group;
+      p_overlap = min(p_overlap, 1.0);
+    }
+    io_blocks = min<double>(num_groups * (1 + p_overlap), num_blocks);
+  } else
+    io_blocks = (keys_per_group > keys_per_block)
+                    ? (have_min && have_max) ? (double)(num_groups + 1)
+                                             : (double)num_groups
+                    : (double)num_blocks;
+
+  /*
+    Estimate IO cost.
+  */
+  const Cost_model_table *const cost_model = table->cost_model();
+  cost_est->add_io(cost_model->page_read_cost_index(key, io_blocks));
+
+  /* Infix factor increases the number of groups (rows) examined. */
+  num_groups *= infix_factor;
+  /*
+    CPU cost must be comparable to that of an index scan as computed
+    in test_quick_select(). When the groups are small,
+    e.g. for a unique index, using index scan will be cheaper since it
+    reads the next record without having to re-position to it on every
+    group. To make the CPU cost reflect this, we estimate the CPU cost
+    as the sum of:
+    1. Cost for evaluating the condition (similarly as for index scan).
+    2. Cost for navigating the index structure (assuming a b-tree).
+       Note: We only add the cost for one comparision per block. For a
+             b-tree the number of comparisons will be larger.
+       TODO: This cost should be provided by the storage engine.
+  */
+  if (keys_per_block <= 1) {
+    // Only one key per block? A *very* high tree.
+    cost_est->add_cpu(std::numeric_limits<double>::max());
+  } else {
+    const double tree_height =
+        table_records == 0
+            ? 1.0
+            : ceil(log(double(table_records)) / log(double(keys_per_block)));
+    const double tree_traversal_cost =
+        cost_model->key_compare_cost(tree_height);
+    const double cpu_cost =
+        num_groups * (tree_traversal_cost + cost_model->row_evaluate_cost(1.0));
+    cost_est->add_cpu(cpu_cost);
+  }
+  *records = num_groups;
+
+  DBUG_PRINT("info", ("table rows: %lu  keys/block: %u  keys/group: %.1f  "
+                      "result rows: %lu  blocks: %u",
+                      (ulong)table_records, keys_per_block, keys_per_group,
+                      (ulong)*records, num_blocks));
+}
+
+static bool add_range(MEM_ROOT *return_mem_root, SEL_ARG *sel_range,
+                      uint key_length, Quick_ranges *range_array) {
+  uint range_flag = sel_range->min_flag | sel_range->max_flag;
+
+  /* Skip (-inf,+inf) ranges, e.g. (x < 5 or x > 4). */
+  if ((range_flag & NO_MIN_RANGE) && (range_flag & NO_MAX_RANGE)) return false;
+
+  if (!(sel_range->min_flag & NO_MIN_RANGE) &&
+      !(sel_range->max_flag & NO_MAX_RANGE)) {
+    if (sel_range->maybe_null() && sel_range->min_value[0] &&
+        sel_range->max_value[0])
+      range_flag |= NULL_RANGE; /* IS NULL condition */
+    /*
+      Do not perform comparison if one of the arguments is NULL.
+    */
+    else if (!sel_range->min_value[0] && !sel_range->max_value[0] &&
+             memcmp(sel_range->min_value, sel_range->max_value, key_length) ==
+                 0)
+      range_flag |= EQ_RANGE; /* equality condition */
+  }
+  QUICK_RANGE *range = new (return_mem_root) QUICK_RANGE(
+      sel_range->min_value, key_length, make_keypart_map(sel_range->part),
+      sel_range->max_value, key_length, make_keypart_map(sel_range->part),
+      range_flag, HA_READ_INVALID);
+  if (!range) return true;
+  if (range_array->push_back(range)) return true;
+  return false;
+}
+
+/*
+  Construct a new quick select object for queries with group by with min/max.
+
+  SYNOPSIS
+    TRP_GROUP_MIN_MAX::make_quick()
+    return_mem_root    Memory pool to use.
+
+  NOTES
+    Make_quick ignores the retrieve_full_rows parameter because
+    QUICK_GROUP_MIN_MAX_SELECT always performs 'index only' scans.
+    The other parameter are ignored as well because all necessary
+    data to create the QUICK object is computed at this TRP creation
+    time.
+
+  RETURN
+    New QUICK_GROUP_MIN_MAX_SELECT object if successfully created,
+    NULL otherwise.
+*/
+
+QUICK_SELECT_I *TRP_GROUP_MIN_MAX::make_quick(bool, MEM_ROOT *return_mem_root) {
+  DBUG_TRACE;
+
+  // Populate key_infix_ranges from index_tree.
+  Quick_ranges_array key_infix_ranges(return_mem_root);
+  uint num_infix_keyparts = used_key_parts - group_key_parts;
+  for (uint i = 0; i < num_infix_keyparts; i++) {
+    key_infix_ranges.push_back(new (return_mem_root)
+                                   Quick_ranges(return_mem_root));
+  }
+  if (key_infix_len > 0) {
+    if (range_tree) {
+      KEY_PART_INFO *infix_keypart = index_info->key_part + group_key_parts;
+
+      // Find the start of key infix ranges in the range tree
+      SEL_ARG *infix_key = index_tree->root;
+      while (infix_key) {
+        if (infix_key->field->eq(infix_keypart->field)) break;
+        infix_key = infix_key->next_key_part->root;
+      }
+
+      // Get ranges on infix keyparts
+      for (uint i = 0; i < num_infix_keyparts; i++) {
+        /*
+          Infix ranges are always contiguous. Get the next set of
+          infix ranges from the first one. infix_key tracks
+          current keypart while cur_range tracks current range
+          within a keypart.
+        */
+        bool is_ascending = infix_key->is_ascending;
+        KEY_PART_INFO *key_infix_part =
+            index_info->key_part + group_key_parts + i;
+        for (SEL_ARG *cur_range = is_ascending ? infix_key->first()
+                                               : infix_key->last();
+             cur_range != nullptr;
+             cur_range = is_ascending ? cur_range->next : cur_range->prev) {
+          assert(cur_range->field->eq(infix_keypart[i].field));
+          if (add_range(return_mem_root, cur_range,
+                        key_infix_part->store_length, key_infix_ranges[i])) {
+            return nullptr;
+          }
+        }
+        // Get the next infix key part.
+        if (infix_key->next_key_part)
+          infix_key = infix_key->next_key_part->root;
+      }
+    }
+  }
+
+  Quick_ranges min_max_ranges(return_mem_root);
+  if (range_tree && min_max_arg_part) {
+    /*
+      Extract the SEL_ARG subtree that contains only ranges for the MIN/MAX
+      attribute, and create an array of QUICK_RANGES to be used by the
+      new quick select.
+    */
+    const SEL_ROOT *min_max_range_root = index_tree;
+    while (min_max_range_root) /* Find the tree for the MIN/MAX key part. */
+    {
+      if (min_max_range_root->root->field->eq(min_max_arg_part->field)) break;
+      min_max_range_root = min_max_range_root->root->next_key_part;
+    }
+    if (min_max_range_root) {
+      /* Create an array of QUICK_RANGEs for the MIN/MAX argument. */
+      for (SEL_ARG *min_max_range = min_max_range_root->root->first();
+           min_max_range; min_max_range = min_max_range->next) {
+        if (add_range(return_mem_root, min_max_range,
+                      min_max_arg_part->store_length, &min_max_ranges)) {
+          return nullptr;
+        }
+      }
+    }
+  }
+
+  /*
+    Determine the total number and length of the keys that will be used for
+    index lookup.
+
+    The total length of the keys used for index lookup depends on whether
+    there are any predicates referencing the min/max argument, and/or if
+    the min/max argument field can be NULL.
+    This function does an optimistic analysis whether the search key might
+    be extended by a constant for the min/max keypart. It is 'optimistic'
+    because during actual execution it may happen that a particular range
+    is skipped, and then a shorter key will be used. However this is data
+    dependent and can't be easily estimated here.
+   */
+  uint real_prefix_len = group_prefix_len + key_infix_len;
+  uint max_used_key_length = real_prefix_len;
+  unsigned real_key_parts = used_key_parts;
+  if (min_max_ranges.size() > 0) {
+    // Check if the right-most range has a lower boundary,
+    // or the left-most range has an upper boundary.
+    if ((have_min && !(min_max_ranges.back()->flag & NO_MIN_RANGE)) ||
+        (have_max && !(min_max_ranges[0]->flag & NO_MAX_RANGE))) {
+      max_used_key_length += min_max_arg_part->store_length;
+      used_key_parts++;
+    }
+  } else if (have_min && min_max_arg_part &&
+             min_max_arg_part->field->is_nullable()) {
+    /*
+      If a MIN argument value is NULL, we can quickly determine
+      that we're in the beginning of the next group, because NULLs
+      are always < any other value. This allows us to quickly
+      determine the end of the current group and jump to the next
+      group (see next_min()) and thus effectively increases the
+      usable key length(see next_min()).
+    */
+    max_used_key_length += min_max_arg_part->store_length;
+    used_key_parts++;
+  }
+
+  QUICK_RANGE_SELECT *quick_prefix_query_block = nullptr;
+  if (range_tree) {
+    assert(quick_prefix_records > 0);
+    if (quick_prefix_records == HA_POS_ERROR)
+      quick_prefix_query_block = nullptr; /* Can't construct a quick select. */
+    else {
+      /* Make a QUICK_RANGE_SELECT to be used for group prefix retrieval. */
+      Quick_ranges ranges(return_mem_root);
+      unsigned used_key_parts;
+      if (get_ranges_from_tree(return_mem_root, table, used_key_part, keyno,
+                               index_tree, group_key_parts, &used_key_parts,
+                               &ranges)) {
+        return nullptr;
+      }
+      // Opens the ranges if there are more conditions in
+      // quick_prefix_query_block than the ones used for jumping through
+      // the prefixes.
+      //
+      // quick_prefix_query_block is made over the conditions on the whole key.
+      // It defines a number of ranges of length x.
+      // However when jumping through the prefixes we use only the the first
+      // few most significant keyparts in the range key. However if there
+      // are more keyparts to follow the ones we are using we must make the
+      // condition on the key inclusive (because x < "ab" means
+      // x[0] < 'a' OR (x[0] == 'a' AND x[1] < 'b').
+      // To achive the above we must turn off the NEAR_MIN/NEAR_MAX
+      uint prefix_max_length = 0;
+      for (const QUICK_RANGE *range : ranges) {
+        prefix_max_length =
+            std::max(prefix_max_length, uint(range->min_length));
+        prefix_max_length =
+            std::max(prefix_max_length, uint(range->max_length));
+      }
+      if (group_prefix_len < prefix_max_length) {
+        for (QUICK_RANGE *range : ranges) {
+          range->flag &= ~(NEAR_MIN | NEAR_MAX);
+        }
+      }
+      quick_prefix_query_block = new (return_mem_root)
+          QUICK_RANGE_SELECT(table, keyno, return_mem_root, HA_MRR_SORTED,
+                             /*mrr_buf_size=*/0, used_key_part,
+                             {&ranges[0], ranges.size()}, used_key_parts);
+
+      if (!quick_prefix_query_block) {
+        return nullptr;
+      }
+    }
+  }
+
+  unique_ptr_destroy_only<QUICK_GROUP_MIN_MAX_SELECT> quick(
+      new (return_mem_root) QUICK_GROUP_MIN_MAX_SELECT(
+          table, join, have_min, have_max, have_agg_distinct, min_max_arg_part,
+          group_prefix_len, group_key_parts, used_key_parts, real_key_parts,
+          max_used_key_length, index_info, index, &cost_est, records,
+          key_infix_len, return_mem_root, is_index_scan,
+          quick_prefix_query_block, std::move(key_infix_ranges),
+          std::move(min_max_ranges)));
+  if (!quick) return nullptr;
+  assert(quick->index == index);
+
+  if (quick->init()) {
+    return nullptr;
+  }
+
+  return quick.release();
+}
diff -Nru mysql-8.0-8.0.26/sql/range_optimizer/group_min_max_plan.h mysql-8.0-8.0.27/sql/range_optimizer/group_min_max_plan.h
--- mysql-8.0-8.0.26/sql/range_optimizer/group_min_max_plan.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/range_optimizer/group_min_max_plan.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,121 @@
+/* Copyright (c) 2000, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef SQL_RANGE_OPTIMIZER_GROUP_MIN_MAX_PLAN_H_
+#define SQL_RANGE_OPTIMIZER_GROUP_MIN_MAX_PLAN_H_
+
+#include <sys/types.h>
+
+#include "my_base.h"
+#include "my_inttypes.h"
+#include "sql/range_optimizer/table_read_plan.h"
+#include "sql/sql_const.h"
+
+class Cost_estimate;
+class KEY;
+class KEY_PART_INFO;
+class Opt_trace_object;
+class RANGE_OPT_PARAM;
+class QUICK_SELECT_I;
+class SEL_ROOT;
+class SEL_TREE;
+struct MEM_ROOT;
+
+/*
+  Plan for a QUICK_GROUP_MIN_MAX_SELECT scan.
+*/
+
+class TRP_GROUP_MIN_MAX : public TABLE_READ_PLAN {
+ private:
+  bool have_min;  ///< true if there is a MIN function
+  bool have_max;  ///< true if there is a MAX function
+  /**
+    true if there is an aggregate distinct function, e.g.
+    "COUNT(DISTINCT x)"
+  */
+  bool have_agg_distinct;
+  /**
+    The key_part of the only field used by all MIN/MAX functions.
+    Note that TRP_GROUP_MIN_MAX is not used if there are MIN/MAX
+    functions on more than one field.
+  */
+  KEY_PART_INFO *min_max_arg_part;
+  uint group_prefix_len;  ///< Length of all key parts in the group prefix
+  uint group_key_parts;   ///< Number of index key parts in the group prefix
+  KEY *index_info;        ///< The index chosen for data access
+  uint key_infix_len;     ///< Longest key for equality predicates
+  SEL_TREE *range_tree;   ///< Represents all range predicates in the query
+  SEL_ROOT *index_tree;   ///< The sub-tree corresponding to index_info
+  uint param_idx;         ///< Index of used key in param->key
+  bool is_index_scan;     ///< Use index_next() instead of random read
+  JOIN *join;
+  KEY_PART *used_key_part;
+  uint keyno;
+
+ public:
+  /** Number of records selected by the ranges in index_tree. */
+  ha_rows quick_prefix_records;
+
+ public:
+  void trace_basic_info(THD *thd, const RANGE_OPT_PARAM *param,
+                        Opt_trace_object *trace_object) const override;
+
+  TRP_GROUP_MIN_MAX(bool have_min_arg, bool have_max_arg,
+                    bool have_agg_distinct_arg,
+                    KEY_PART_INFO *min_max_arg_part_arg,
+                    uint group_prefix_len_arg, uint used_key_parts_arg,
+                    uint group_key_parts_arg, KEY *index_info_arg,
+                    uint index_arg, uint key_infix_len_arg, SEL_TREE *tree_arg,
+                    SEL_ROOT *index_tree_arg, uint param_idx_arg,
+                    ha_rows quick_prefix_records_arg, TABLE *table_arg,
+                    JOIN *join_arg, KEY_PART *used_key_part_arg, uint keyno_arg)
+      : TABLE_READ_PLAN(table_arg, index_arg, used_key_parts_arg,
+                        /*forced_by_hint_arg=*/false),
+        have_min(have_min_arg),
+        have_max(have_max_arg),
+        have_agg_distinct(have_agg_distinct_arg),
+        min_max_arg_part(min_max_arg_part_arg),
+        group_prefix_len(group_prefix_len_arg),
+        group_key_parts(group_key_parts_arg),
+        index_info(index_info_arg),
+        key_infix_len(key_infix_len_arg),
+        range_tree(tree_arg),
+        index_tree(index_tree_arg),
+        param_idx(param_idx_arg),
+        is_index_scan(false),
+        join(join_arg),
+        used_key_part(used_key_part_arg),
+        keyno(keyno_arg),
+        quick_prefix_records(quick_prefix_records_arg) {}
+
+  QUICK_SELECT_I *make_quick(bool retrieve_full_rows,
+                             MEM_ROOT *mem_root) override;
+  void use_index_scan() { is_index_scan = true; }
+};
+
+TRP_GROUP_MIN_MAX *get_best_group_min_max(THD *thd, RANGE_OPT_PARAM *param,
+                                          SEL_TREE *tree,
+                                          enum_order order_direction,
+                                          bool skip_records_in_range,
+                                          const Cost_estimate *cost_est);
+
+#endif  // SQL_RANGE_OPTIMIZER_GROUP_MIN_MAX_PLAN_H_
diff -Nru mysql-8.0-8.0.26/sql/range_optimizer/index_merge.cc mysql-8.0-8.0.27/sql/range_optimizer/index_merge.cc
--- mysql-8.0-8.0.26/sql/range_optimizer/index_merge.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/range_optimizer/index_merge.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,335 @@
+/* Copyright (c) 2000, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include "sql/range_optimizer/index_merge.h"
+
+#include <stdio.h>
+#include <atomic>
+#include <memory>
+
+#include "m_string.h"
+#include "map_helpers.h"
+#include "my_base.h"
+#include "my_dbug.h"
+#include "my_inttypes.h"
+#include "my_sys.h"
+#include "mysql/service_mysql_alloc.h"
+#include "mysqld_error.h"
+#include "sql/handler.h"
+#include "sql/key.h"
+#include "sql/psi_memory_key.h"
+#include "sql/records.h"
+#include "sql/row_iterator.h"
+#include "sql/sql_base.h"
+#include "sql/sql_class.h"
+#include "sql/sql_const.h"
+#include "sql/sql_select.h"
+#include "sql/sql_sort.h"
+#include "sql/system_variables.h"
+#include "sql/table.h"
+#include "sql/thr_malloc.h"
+#include "sql/uniques.h"
+#include "sql_string.h"
+
+struct MY_BITMAP;
+
+QUICK_INDEX_MERGE_SELECT::QUICK_INDEX_MERGE_SELECT(MEM_ROOT *return_mem_root,
+                                                   TABLE *table)
+    : unique(nullptr), pk_quick_select(nullptr), mem_root(return_mem_root) {
+  DBUG_TRACE;
+  index = MAX_KEY;
+  m_table = table;
+}
+
+int QUICK_INDEX_MERGE_SELECT::init() {
+  DBUG_TRACE;
+  return 0;
+}
+
+int QUICK_INDEX_MERGE_SELECT::reset() {
+  DBUG_TRACE;
+  const int retval = read_keys_and_merge();
+  return retval;
+}
+
+bool QUICK_INDEX_MERGE_SELECT::push_quick_back(
+    QUICK_RANGE_SELECT *quick_sel_range) {
+  /*
+    Save quick_select that does scan on clustered primary key as it will be
+    processed separately.
+  */
+  if (m_table->file->primary_key_is_clustered() &&
+      quick_sel_range->index == m_table->s->primary_key)
+    pk_quick_select = quick_sel_range;
+  else
+    return quick_selects.push_back(quick_sel_range);
+  return false;
+}
+
+QUICK_INDEX_MERGE_SELECT::~QUICK_INDEX_MERGE_SELECT() {
+  List_iterator_fast<QUICK_RANGE_SELECT> quick_it(quick_selects);
+  QUICK_RANGE_SELECT *quick;
+  DBUG_TRACE;
+  bool disable_unique_filter = false;
+  destroy(unique);
+  quick_it.rewind();
+  while ((quick = quick_it++)) {
+    // Normally it's disabled by dtor of QUICK_RANGE_SELECT, but it can't be
+    // done without table's handler
+    disable_unique_filter |=
+        (0 != (m_table->key_info[quick->index].flags & HA_MULTI_VALUED_KEY));
+    quick->file = nullptr;
+  }
+  quick_selects.destroy_elements();
+  if (disable_unique_filter)
+    m_table->file->ha_extra(HA_EXTRA_DISABLE_UNIQUE_RECORD_FILTER);
+  destroy(pk_quick_select);
+  /* It's ok to call the next two even if they are already deinitialized */
+  read_record.reset();
+  free_io_cache(m_table);
+}
+
+bool QUICK_INDEX_MERGE_SELECT::is_keys_used(const MY_BITMAP *fields) {
+  QUICK_RANGE_SELECT *quick;
+  List_iterator_fast<QUICK_RANGE_SELECT> it(quick_selects);
+  while ((quick = it++)) {
+    if (is_key_used(m_table, quick->index, fields)) return true;
+  }
+  return false;
+}
+
+/*
+  Perform key scans for all used indexes (except CPK), get rowids and merge
+  them into an ordered non-recurrent sequence of rowids.
+
+  The merge/duplicate removal is performed using Unique class. We put all
+  rowids into Unique, get the sorted sequence and destroy the Unique.
+
+  If table has a clustered primary key that covers all rows (true for bdb
+  and innodb currently) and one of the index_merge scans is a scan on PK,
+  then rows that will be retrieved by PK scan are not put into Unique and
+  primary key scan is not performed here, it is performed later separately.
+
+  RETURN
+    0     OK
+    other error
+*/
+
+int QUICK_INDEX_MERGE_SELECT::read_keys_and_merge() {
+  List_iterator_fast<QUICK_RANGE_SELECT> cur_quick_it(quick_selects);
+  QUICK_RANGE_SELECT *cur_quick;
+  int result;
+  handler *file = m_table->file;
+  DBUG_TRACE;
+
+  /* We're going to just read rowids. */
+  m_table->set_keyread(true);
+  m_table->prepare_for_position();
+
+  cur_quick_it.rewind();
+  cur_quick = cur_quick_it++;
+  assert(cur_quick != nullptr);
+
+  DBUG_EXECUTE_IF("simulate_bug13919180", {
+    my_error(ER_UNKNOWN_ERROR, MYF(0));
+    return 1;
+  });
+  /*
+    We reuse the same instance of handler so we need to call both init and
+    reset here.
+  */
+  if (cur_quick->init() || cur_quick->reset()) return 1;
+
+  size_t sort_buffer_size = current_thd->variables.sortbuff_size;
+#ifndef NDEBUG
+  if (DBUG_EVALUATE_IF("sortbuff_size_256", 1, 0)) sort_buffer_size = 256;
+#endif /* NDEBUG */
+
+  if (unique == nullptr) {
+    DBUG_EXECUTE_IF("index_merge_may_not_create_a_Unique", DBUG_ABORT(););
+    DBUG_EXECUTE_IF("only_one_Unique_may_be_created",
+                    DBUG_SET("+d,index_merge_may_not_create_a_Unique"););
+    unique = new (mem_root) Unique(refpos_order_cmp, (void *)file,
+                                   file->ref_length, sort_buffer_size);
+  } else {
+    unique->reset();
+    m_table->unique_result.sorted_result.reset();
+    assert(!m_table->unique_result.sorted_result_in_fsbuf);
+    m_table->unique_result.sorted_result_in_fsbuf = false;
+
+    if (m_table->unique_result.io_cache) {
+      close_cached_file(m_table->unique_result.io_cache);
+      my_free(m_table->unique_result.io_cache);
+      m_table->unique_result.io_cache = nullptr;
+    }
+  }
+
+  assert(file->ref_length == unique->get_size());
+  assert(sort_buffer_size == unique->get_max_in_memory_size());
+
+  if (!unique) return 1;
+  for (;;) {
+    while ((result = cur_quick->get_next()) == HA_ERR_END_OF_FILE) {
+      cur_quick->range_end();
+      cur_quick = cur_quick_it++;
+      if (!cur_quick) break;
+
+      if (cur_quick->file->inited) cur_quick->file->ha_index_end();
+      if (cur_quick->init() || cur_quick->reset()) return 1;
+    }
+
+    if (result) {
+      if (result != HA_ERR_END_OF_FILE) {
+        cur_quick->range_end();
+        return result;
+      }
+      break;
+    }
+
+    if (current_thd->killed) return 1;
+
+    /* skip row if it will be retrieved by clustered PK scan */
+    if (pk_quick_select && pk_quick_select->row_in_ranges()) continue;
+
+    cur_quick->file->position(cur_quick->record);
+    result = unique->unique_add((char *)cur_quick->file->ref);
+    if (result) return 1;
+  }
+
+  /*
+    Ok all rowids are in the Unique now. The next call will initialize
+    m_table->sort structure so it can be used to iterate through the rowids
+    sequence.
+  */
+  result = unique->get(m_table);
+  doing_pk_scan = false;
+  /* index_merge currently doesn't support "using index" at all */
+  m_table->set_keyread(false);
+  read_record.reset();  // Clear out any previous iterator.
+  read_record = init_table_iterator(current_thd, m_table,
+                                    /*ignore_not_found_rows=*/false,
+                                    /*count_examined_rows=*/false);
+  if (read_record == nullptr) return 1;
+  return result;
+}
+
+/*
+  Get next row for index_merge.
+  NOTES
+    The rows are read from
+      1. rowids stored in Unique.
+      2. QUICK_RANGE_SELECT with clustered primary key (if any).
+    The sets of rows retrieved in 1) and 2) are guaranteed to be disjoint.
+*/
+
+int QUICK_INDEX_MERGE_SELECT::get_next() {
+  int result;
+  DBUG_TRACE;
+
+  if (doing_pk_scan) return pk_quick_select->get_next();
+
+  if ((result = read_record->Read()) == -1) {
+    result = HA_ERR_END_OF_FILE;
+
+    // NOTE: destroying the RowIterator also clears
+    // m_table->unique_result.io_cache if it is initialized, since it
+    // owns the io_cache it is reading from.
+    read_record.reset();
+
+    /* All rows from Unique have been retrieved, do a clustered PK scan */
+    if (pk_quick_select) {
+      doing_pk_scan = true;
+      if ((result = pk_quick_select->init()) ||
+          (result = pk_quick_select->reset()))
+        return result;
+      return pk_quick_select->get_next();
+    }
+  }
+
+  return result;
+}
+
+void QUICK_INDEX_MERGE_SELECT::add_info_string(String *str) {
+  QUICK_RANGE_SELECT *quick;
+  bool first = true;
+  List_iterator_fast<QUICK_RANGE_SELECT> it(quick_selects);
+  str->append(STRING_WITH_LEN("sort_union("));
+  while ((quick = it++)) {
+    if (!first)
+      str->append(',');
+    else
+      first = false;
+    quick->add_info_string(str);
+  }
+  if (pk_quick_select) {
+    str->append(',');
+    pk_quick_select->add_info_string(str);
+  }
+  str->append(')');
+}
+
+void QUICK_INDEX_MERGE_SELECT::add_keys_and_lengths(String *key_names,
+                                                    String *used_lengths) {
+  char buf[64];
+  size_t length;
+  bool first = true;
+  QUICK_RANGE_SELECT *quick;
+
+  List_iterator_fast<QUICK_RANGE_SELECT> it(quick_selects);
+  while ((quick = it++)) {
+    if (first)
+      first = false;
+    else {
+      key_names->append(',');
+      used_lengths->append(',');
+    }
+
+    KEY *key_info = m_table->key_info + quick->index;
+    key_names->append(key_info->name);
+    length = longlong10_to_str(quick->max_used_key_length, buf, 10) - buf;
+    used_lengths->append(buf, length);
+  }
+  if (pk_quick_select) {
+    KEY *key_info = m_table->key_info + pk_quick_select->index;
+    key_names->append(',');
+    key_names->append(key_info->name);
+    length =
+        longlong10_to_str(pk_quick_select->max_used_key_length, buf, 10) - buf;
+    used_lengths->append(',');
+    used_lengths->append(buf, length);
+  }
+}
+
+#ifndef NDEBUG
+void QUICK_INDEX_MERGE_SELECT::dbug_dump(int indent, bool verbose) {
+  List_iterator_fast<QUICK_RANGE_SELECT> it(quick_selects);
+  QUICK_RANGE_SELECT *quick;
+  fprintf(DBUG_FILE, "%*squick index_merge select\n", indent, "");
+  fprintf(DBUG_FILE, "%*smerged scans {\n", indent, "");
+  while ((quick = it++)) quick->dbug_dump(indent + 2, verbose);
+  if (pk_quick_select) {
+    fprintf(DBUG_FILE, "%*sclustered PK quick:\n", indent, "");
+    pk_quick_select->dbug_dump(indent + 2, verbose);
+  }
+  fprintf(DBUG_FILE, "%*s}\n", indent, "");
+}
+#endif
diff -Nru mysql-8.0-8.0.26/sql/range_optimizer/index_merge.h mysql-8.0-8.0.27/sql/range_optimizer/index_merge.h
--- mysql-8.0-8.0.26/sql/range_optimizer/index_merge.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/range_optimizer/index_merge.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,150 @@
+/* Copyright (c) 2000, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef SQL_RANGE_OPTIMIZER_INDEX_MERGE_H_
+#define SQL_RANGE_OPTIMIZER_INDEX_MERGE_H_
+
+#include <assert.h>
+
+#include "my_alloc.h"
+#include "sql/range_optimizer/range_optimizer.h"
+#include "sql/range_optimizer/range_scan.h"
+#include "sql/sql_list.h"
+
+class RowIterator;
+class String;
+class Unique;
+struct MY_BITMAP;
+struct TABLE;
+
+/*
+  QUICK_INDEX_MERGE_SELECT - index_merge access method quick select.
+
+    QUICK_INDEX_MERGE_SELECT uses
+     * QUICK_RANGE_SELECTs to get rows
+     * Unique class to remove duplicate rows
+
+  INDEX MERGE OPTIMIZER
+    Current implementation doesn't detect all cases where index_merge could
+    be used, in particular:
+     * index_merge will never be used if range scan is possible (even if
+       range scan is more expensive)
+
+     * index_merge+'using index' is not supported (this the consequence of
+       the above restriction)
+
+     * If WHERE part contains complex nested AND and OR conditions, some ways
+       to retrieve rows using index_merge will not be considered. The choice
+       of read plan may depend on the order of conjuncts/disjuncts in WHERE
+       part of the query, see comments near imerge_list_or_list and
+       SEL_IMERGE::or_sel_tree_with_checks functions for details.
+
+     * There is no "index_merge_ref" method (but index_merge on non-first
+       table in join is possible with 'range checked for each record').
+
+    See comments around SEL_IMERGE class and test_quick_select for more
+    details.
+
+  ROW RETRIEVAL ALGORITHM
+
+    index_merge uses Unique class for duplicates removal.  index_merge takes
+    advantage of Clustered Primary Key (CPK) if the table has one.
+    The index_merge algorithm consists of two phases:
+
+    Phase 1 (implemented in QUICK_INDEX_MERGE_SELECT::prepare_unique):
+    prepare()
+    {
+      activate 'index only';
+      while(retrieve next row for non-CPK scan)
+      {
+        if (there is a CPK scan and row will be retrieved by it)
+          skip this row;
+        else
+          put its rowid into Unique;
+      }
+      deactivate 'index only';
+    }
+
+    Phase 2 (implemented as sequence of QUICK_INDEX_MERGE_SELECT::get_next
+    calls):
+
+    fetch()
+    {
+      retrieve all rows from row pointers stored in Unique;
+      free Unique;
+      retrieve all rows for CPK scan;
+    }
+*/
+
+class QUICK_INDEX_MERGE_SELECT : public QUICK_SELECT_I {
+  Unique *unique;
+
+ public:
+  QUICK_INDEX_MERGE_SELECT(MEM_ROOT *mem_root, TABLE *table);
+  ~QUICK_INDEX_MERGE_SELECT() override;
+
+  int init() override;
+  void need_sorted_output() override { assert(false); /* Can't do it */ }
+  int reset(void) override;
+  int get_next() override;
+  bool reverse_sorted() const override { return false; }
+  bool reverse_sort_possible() const override { return false; }
+  bool unique_key_range() override { return false; }
+  RangeScanType get_type() const override { return QS_TYPE_INDEX_MERGE; }
+  bool is_loose_index_scan() const override { return false; }
+  bool is_agg_loose_index_scan() const override { return false; }
+  void add_keys_and_lengths(String *key_names, String *used_lengths) override;
+  void add_info_string(String *str) override;
+  bool is_keys_used(const MY_BITMAP *fields) override;
+#ifndef NDEBUG
+  void dbug_dump(int indent, bool verbose) override;
+#endif
+
+  bool push_quick_back(QUICK_RANGE_SELECT *quick_sel_range);
+
+  /* range quick selects this index_merge read consists of */
+  List<QUICK_RANGE_SELECT> quick_selects;
+
+  /* quick select that uses clustered primary key (NULL if none) */
+  QUICK_RANGE_SELECT *pk_quick_select;
+
+  /* true if this select is currently doing a clustered PK scan */
+  bool doing_pk_scan;
+
+  int read_keys_and_merge();
+
+  void get_fields_used(MY_BITMAP *used_fields) override {
+    List_iterator_fast<QUICK_RANGE_SELECT> it(quick_selects);
+    QUICK_RANGE_SELECT *quick;
+    while ((quick = it++)) quick->get_fields_used(used_fields);
+
+    if (pk_quick_select) pk_quick_select->get_fields_used(used_fields);
+  }
+
+  /* used to get rows collected in Unique */
+  unique_ptr_destroy_only<RowIterator> read_record;
+
+ private:
+  MEM_ROOT *mem_root;
+};
+
+#endif  // SQL_RANGE_OPTIMIZER_INDEX_MERGE_H_
diff -Nru mysql-8.0-8.0.26/sql/range_optimizer/index_merge_plan.cc mysql-8.0-8.0.27/sql/range_optimizer/index_merge_plan.cc
--- mysql-8.0-8.0.26/sql/range_optimizer/index_merge_plan.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/range_optimizer/index_merge_plan.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,73 @@
+/* Copyright (c) 2000, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include "sql/range_optimizer/index_merge_plan.h"
+
+#include "sql/handler.h"
+#include "sql/opt_trace.h"
+#include "sql/range_optimizer/index_merge.h"
+#include "sql/range_optimizer/range_opt_param.h"
+#include "sql/range_optimizer/range_scan.h"
+#include "sql/range_optimizer/range_scan_plan.h"
+#include "sql/sql_class.h"
+
+class Opt_trace_context;
+class QUICK_SELECT_I;
+struct MEM_ROOT;
+
+void TRP_INDEX_MERGE::trace_basic_info(THD *thd, const RANGE_OPT_PARAM *param,
+                                       Opt_trace_object *trace_object) const {
+  Opt_trace_context *const trace = &thd->opt_trace;
+  trace_object->add_alnum("type", "index_merge");
+  Opt_trace_array ota(trace, "index_merge_of");
+  for (TRP_RANGE **current = range_scans; current != range_scans_end;
+       current++) {
+    Opt_trace_object trp_info(trace);
+    (*current)->trace_basic_info(thd, param, &trp_info);
+  }
+}
+
+QUICK_SELECT_I *TRP_INDEX_MERGE::make_quick(bool, MEM_ROOT *return_mem_root) {
+  QUICK_INDEX_MERGE_SELECT *quick_imerge;
+  QUICK_RANGE_SELECT *quick;
+  /* index_merge always retrieves full rows, ignore retrieve_full_rows */
+  if (!(quick_imerge = new (return_mem_root)
+            QUICK_INDEX_MERGE_SELECT(return_mem_root, table)))
+    return nullptr;
+  assert(quick_imerge->index == index);
+
+  quick_imerge->records = records;
+  quick_imerge->cost_est = cost_est;
+
+  for (TRP_RANGE **range_scan = range_scans; range_scan != range_scans_end;
+       range_scan++) {
+    if (!(quick = down_cast<QUICK_RANGE_SELECT *>(
+              (*range_scan)->make_quick(false, return_mem_root))) ||
+        quick_imerge->push_quick_back(quick)) {
+      destroy(quick);
+      destroy(quick_imerge);
+      return nullptr;
+    }
+  }
+  quick_imerge->forced_by_hint = forced_by_hint;
+  return quick_imerge;
+}
diff -Nru mysql-8.0-8.0.26/sql/range_optimizer/index_merge_plan.h mysql-8.0-8.0.27/sql/range_optimizer/index_merge_plan.h
--- mysql-8.0-8.0.26/sql/range_optimizer/index_merge_plan.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/range_optimizer/index_merge_plan.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,54 @@
+/* Copyright (c) 2000, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef SQL_RANGE_OPTIMIZER_INDEX_MERGE_PLAN_H_
+#define SQL_RANGE_OPTIMIZER_INDEX_MERGE_PLAN_H_
+
+#include "sql/range_optimizer/table_read_plan.h"
+
+class Opt_trace_object;
+class RANGE_OPT_PARAM;
+class QUICK_SELECT_I;
+class TRP_RANGE;
+struct MEM_ROOT;
+
+/*
+  Plan for QUICK_INDEX_MERGE_SELECT scan.
+  QUICK_ROR_INTERSECT_SELECT always retrieves full rows, so retrieve_full_rows
+  is ignored by make_quick.
+*/
+
+class TRP_INDEX_MERGE : public TABLE_READ_PLAN {
+ public:
+  TRP_INDEX_MERGE(TABLE *table_arg, bool forced_by_hint_arg)
+      : TABLE_READ_PLAN(table_arg, MAX_KEY, /*used_key_parts=*/-1,
+                        forced_by_hint_arg) {}
+  QUICK_SELECT_I *make_quick(bool retrieve_full_rows,
+                             MEM_ROOT *return_mem_root) override;
+  TRP_RANGE **range_scans;     /* array of ptrs to plans of merged scans */
+  TRP_RANGE **range_scans_end; /* end of the array */
+
+  void trace_basic_info(THD *thd, const RANGE_OPT_PARAM *param,
+                        Opt_trace_object *trace_object) const override;
+};
+
+#endif  // SQL_RANGE_OPTIMIZER_INDEX_MERGE_PLAN_H_
diff -Nru mysql-8.0-8.0.26/sql/range_optimizer/internal.h mysql-8.0-8.0.27/sql/range_optimizer/internal.h
--- mysql-8.0-8.0.26/sql/range_optimizer/internal.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/range_optimizer/internal.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,151 @@
+/* Copyright (c) 2000, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef SQL_RANGE_OPTIMIZER_INTERNAL_H_
+#define SQL_RANGE_OPTIMIZER_INTERNAL_H_
+
+#include "sql/range_optimizer/range_optimizer.h"
+
+#include "mysys_err.h"          // EE_CAPACITY_EXCEEDED
+#include "sql/derror.h"         // ER_THD
+#include "sql/error_handler.h"  // Internal_error_handler
+#include "sql/sql_class.h"      // THD
+
+class RANGE_OPT_PARAM;
+struct ROR_SCAN_INFO;
+class SEL_ARG;
+class SEL_IMERGE;
+class SEL_TREE;
+class SEL_ROOT;
+
+[[maybe_unused]] void print_tree(String *out, const char *tree_name,
+                                 SEL_TREE *tree, const RANGE_OPT_PARAM *param,
+                                 const bool print_full);
+
+void append_range(String *out, const KEY_PART_INFO *key_parts,
+                  const uchar *min_key, const uchar *max_key, const uint flag);
+class Opt_trace_array;
+void append_range_all_keyparts(Opt_trace_array *range_trace,
+                               String *range_string, String *range_so_far,
+                               SEL_ROOT *keypart,
+                               const KEY_PART_INFO *key_parts,
+                               const bool print_full);
+
+/**
+  Shared sentinel node for all trees. Initialized by range_optimizer_init(),
+  destroyed by range_optimizer_free();
+  Put it in a namespace, to avoid possible conflicts with the global namespace.
+*/
+namespace opt_range {
+extern SEL_ARG *null_element;
+}
+
+/**
+  Error handling class for range optimizer. We handle only out of memory
+  error here. This is to give a hint to the user to
+  raise range_optimizer_max_mem_size if required.
+  Warning for the memory error is pushed only once. The consequent errors
+  will be ignored.
+*/
+class Range_optimizer_error_handler : public Internal_error_handler {
+ public:
+  Range_optimizer_error_handler()
+      : m_has_errors(false), m_is_mem_error(false) {}
+
+  bool handle_condition(THD *thd, uint sql_errno, const char *,
+                        Sql_condition::enum_severity_level *level,
+                        const char *) override {
+    if (*level == Sql_condition::SL_ERROR) {
+      m_has_errors = true;
+      /* Out of memory error is reported only once. Return as handled */
+      if (m_is_mem_error && sql_errno == EE_CAPACITY_EXCEEDED) return true;
+      if (sql_errno == EE_CAPACITY_EXCEEDED) {
+        m_is_mem_error = true;
+        /* Convert the error into a warning. */
+        *level = Sql_condition::SL_WARNING;
+        push_warning_printf(
+            thd, Sql_condition::SL_WARNING, ER_CAPACITY_EXCEEDED,
+            ER_THD(thd, ER_CAPACITY_EXCEEDED),
+            (ulonglong)thd->variables.range_optimizer_max_mem_size,
+            "range_optimizer_max_mem_size",
+            ER_THD(thd, ER_CAPACITY_EXCEEDED_IN_RANGE_OPTIMIZER));
+        return true;
+      }
+    }
+    return false;
+  }
+
+  bool has_errors() const { return m_has_errors; }
+
+ private:
+  bool m_has_errors;
+  bool m_is_mem_error;
+};
+
+int index_next_different(bool is_index_scan, handler *file,
+                         KEY_PART_INFO *key_part, uchar *record,
+                         const uchar *group_prefix, uint group_prefix_len,
+                         uint group_key_parts);
+
+/*
+  SEL_IMERGE is a list of possible ways to do index merge, i.e. it is
+  a condition in the following form:
+   (t_1||t_2||...||t_N) && (next)
+
+  where all t_i are SEL_TREEs, next is another SEL_IMERGE and no pair
+  (t_i,t_j) contains SEL_ARGS for the same index.
+
+  SEL_TREE contained in SEL_IMERGE always has merges=NULL.
+
+  This class relies on memory manager to do the cleanup.
+*/
+
+class SEL_IMERGE {
+  enum { PREALLOCED_TREES = 10 };
+
+ public:
+  SEL_TREE *trees_prealloced[PREALLOCED_TREES];
+  SEL_TREE **trees;      /* trees used to do index_merge   */
+  SEL_TREE **trees_next; /* last of these trees            */
+  SEL_TREE **trees_end;  /* end of allocated space         */
+
+  SEL_ARG ***best_keys; /* best keys to read in SEL_TREEs */
+
+  SEL_IMERGE()
+      : trees(&trees_prealloced[0]),
+        trees_next(trees),
+        trees_end(trees + PREALLOCED_TREES) {}
+  SEL_IMERGE(SEL_IMERGE *arg, RANGE_OPT_PARAM *param);
+  int or_sel_tree(RANGE_OPT_PARAM *param, SEL_TREE *tree);
+  int or_sel_tree_with_checks(RANGE_OPT_PARAM *param, bool remove_jump_scans,
+                              SEL_TREE *new_tree);
+  int or_sel_imerge_with_checks(RANGE_OPT_PARAM *param, bool remove_jump_scans,
+                                SEL_IMERGE *imerge);
+};
+
+/*
+  Convert double value to #rows. Currently this does floor(), and we
+  might consider using round() instead.
+*/
+#define double2rows(x) ((ha_rows)(x))
+
+#endif  // SQL_RANGE_OPTIMIZER_INTERNAL_H_
diff -Nru mysql-8.0-8.0.26/sql/range_optimizer/partition_pruning.cc mysql-8.0-8.0.27/sql/range_optimizer/partition_pruning.cc
--- mysql-8.0-8.0.26/sql/range_optimizer/partition_pruning.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/range_optimizer/partition_pruning.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,1257 @@
+/* Copyright (c) 2000, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/types.h>
+
+#include "field_types.h"
+#include "my_alloc.h"
+#include "my_base.h"
+#include "my_bitmap.h"
+#include "my_dbug.h"
+#include "my_inttypes.h"
+#include "sql/check_stack.h"
+#include "sql/field.h"
+#include "sql/handler.h"
+#include "sql/item.h"
+#include "sql/mem_root_array.h"
+#include "sql/partition_info.h"
+#include "sql/psi_memory_key.h"
+#include "sql/range_optimizer/internal.h"
+#include "sql/range_optimizer/range_analysis.h"
+#include "sql/range_optimizer/range_optimizer.h"
+#include "sql/range_optimizer/tree.h"
+#include "sql/sql_class.h"
+#include "sql/sql_const.h"
+#include "sql/sql_lex.h"
+#include "sql/sql_list.h"
+#include "sql/sql_partition.h"
+#include "sql/system_variables.h"
+#include "sql/table.h"
+#include "sql/thr_malloc.h"
+
+using opt_range::null_element;
+
+/*
+  PartitionPruningModule
+
+  This part of the code does partition pruning. Partition pruning solves the
+  following problem: given a query over partitioned tables, find partitions
+  that we will not need to access (i.e. partitions that we can assume to be
+  empty) when executing the query.
+  The set of partitions to prune doesn't depend on which query execution
+  plan will be used to execute the query.
+
+  HOW IT WORKS
+
+  Partition pruning module makes use of RangeAnalysisModule. The following
+  examples show how the problem of partition pruning can be reduced to the
+  range analysis problem:
+
+  EXAMPLE 1
+    Consider a query:
+
+      SELECT * FROM t1 WHERE (t1.a < 5 OR t1.a = 10) AND t1.a > 3 AND t1.b='z'
+
+    where table t1 is partitioned using PARTITION BY RANGE(t1.a).  An apparent
+    way to find the used (i.e. not pruned away) partitions is as follows:
+
+    1. analyze the WHERE clause and extract the list of intervals over t1.a
+       for the above query we will get this list: {(3 < t1.a < 5), (t1.a=10)}
+
+    2. for each interval I
+       {
+         find partitions that have non-empty intersection with I;
+         mark them as used;
+       }
+
+  EXAMPLE 2
+    Suppose the table is partitioned by HASH(part_func(t1.a, t1.b)). Then
+    we need to:
+
+    1. Analyze the WHERE clause and get a list of intervals over (t1.a, t1.b).
+       The list of intervals we'll obtain will look like this:
+       ((t1.a, t1.b) = (1,'foo')),
+       ((t1.a, t1.b) = (2,'bar')),
+       ((t1,a, t1.b) > (10,'zz'))
+
+    2. for each interval I
+       {
+         if (the interval has form "(t1.a, t1.b) = (const1, const2)" )
+         {
+           calculate HASH(part_func(t1.a, t1.b));
+           find which partition has records with this hash value and mark
+             it as used;
+         }
+         else
+         {
+           mark all partitions as used;
+           break;
+         }
+       }
+
+   For both examples the step #1 is exactly what RangeAnalysisModule could
+   be used to do, if it was provided with appropriate index description
+   (array of KEY_PART structures).
+   In example #1, we need to provide it with description of index(t1.a),
+   in example #2, we need to provide it with description of index(t1.a, t1.b).
+
+   These index descriptions are further called "partitioning index
+   descriptions". Note that it doesn't matter if such indexes really exist,
+   as range analysis module only uses the description.
+
+   Putting it all together, partitioning module works as follows:
+
+   prune_partitions() {
+     call create_partition_index_description();
+
+     call get_mm_tree(); // invoke the RangeAnalysisModule
+
+     // analyze the obtained interval list and get used partitions
+     call find_used_partitions();
+  }
+
+*/
+
+typedef void (*mark_full_part_func)(partition_info *, uint32);
+
+/*
+  Partition pruning operation context
+*/
+struct PART_PRUNE_PARAM {
+  RANGE_OPT_PARAM range_param; /* Range analyzer parameters */
+
+  /***************************************************************
+   Following fields are filled in based solely on partitioning
+   definition and not modified after that:
+   **************************************************************/
+  partition_info *part_info; /* Copy of table->part_info */
+  /* Function to get partition id from partitioning fields only */
+  get_part_id_func get_top_partition_id_func;
+  /* Function to mark a partition as used (w/all subpartitions if they exist)*/
+  mark_full_part_func mark_full_partition_used;
+
+  /* Partitioning 'index' description, array of key parts */
+  KEY_PART *key;
+
+  /*
+    Number of fields in partitioning 'index' definition created for
+    partitioning (0 if partitioning 'index' doesn't include partitioning
+    fields)
+  */
+  uint part_fields;
+  uint subpart_fields; /* Same as above for subpartitioning */
+
+  /*
+    Number of the last partitioning field keypart in the index, or -1 if
+    partitioning index definition doesn't include partitioning fields.
+  */
+  int last_part_partno;
+  int last_subpart_partno; /* Same as above for supartitioning */
+
+  /*
+    is_part_keypart[i] == test(keypart #i in partitioning index is a member
+                               used in partitioning)
+    Used to maintain current values of cur_part_fields and cur_subpart_fields
+  */
+  bool *is_part_keypart;
+  /* Same as above for subpartitioning */
+  bool *is_subpart_keypart;
+
+  bool ignore_part_fields; /* Ignore rest of partioning fields */
+
+  /***************************************************************
+   Following fields form find_used_partitions() recursion context:
+   **************************************************************/
+  SEL_ARG **arg_stack;     /* "Stack" of SEL_ARGs */
+  SEL_ARG **arg_stack_end; /* Top of the stack    */
+  /* Number of partitioning fields for which we have a SEL_ARG* in arg_stack */
+  uint cur_part_fields;
+  /* Same as cur_part_fields, but for subpartitioning */
+  uint cur_subpart_fields;
+
+  /* Iterator to be used to obtain the "current" set of used partitions */
+  PARTITION_ITERATOR part_iter;
+
+  /* Initialized bitmap of num_subparts size */
+  MY_BITMAP subparts_bitmap;
+
+  /* Used to store 'current key tuples' */
+  uchar min_key[MAX_KEY_LENGTH + MAX_FIELD_WIDTH];
+  uchar max_key[MAX_KEY_LENGTH + MAX_FIELD_WIDTH];
+
+  uchar *cur_min_key;
+  uchar *cur_max_key;
+
+  uint cur_min_flag, cur_max_flag;
+};
+
+static bool create_partition_index_description(PART_PRUNE_PARAM *prune_par);
+static int find_used_partitions(THD *thd, PART_PRUNE_PARAM *ppar,
+                                SEL_ROOT *key_tree);
+static int find_used_partitions(THD *thd, PART_PRUNE_PARAM *ppar,
+                                SEL_ROOT::Type type, SEL_ARG *key_tree);
+static int find_used_partitions_imerge(THD *thd, PART_PRUNE_PARAM *ppar,
+                                       SEL_IMERGE *imerge);
+static int find_used_partitions_imerge_list(THD *thd, PART_PRUNE_PARAM *ppar,
+                                            List<SEL_IMERGE> &merges);
+static void mark_all_partitions_as_used(partition_info *part_info);
+
+#ifndef NDEBUG
+static void print_partitioning_index(KEY_PART *parts, KEY_PART *parts_end);
+static void dbug_print_segment_range(SEL_ARG *arg, KEY_PART *part);
+static void dbug_print_singlepoint_range(SEL_ARG **start, uint num);
+#endif
+
+/**
+  Perform partition pruning for a given table and condition.
+
+  @param      thd            Thread handle
+  @param      table          Table to perform partition pruning for
+  @param      query_block     Query block the table is part of
+  @param      pprune_cond    Condition to use for partition pruning
+
+  @note This function assumes that lock_partitions are setup when it
+  is invoked. The function analyzes the condition, finds partitions that
+  need to be used to retrieve the records that match the condition, and
+  marks them as used by setting appropriate bit in part_info->read_partitions
+  In the worst case all partitions are marked as used. If the table is not
+  yet locked, it will also unset bits in part_info->lock_partitions that is
+  not set in read_partitions.
+
+  This function returns promptly if called for non-partitioned table.
+
+  @return Operation status
+    @retval true  Failure
+    @retval false Success
+*/
+
+bool prune_partitions(THD *thd, TABLE *table, Query_block *query_block,
+                      Item *pprune_cond) {
+  partition_info *part_info = table->part_info;
+  DBUG_TRACE;
+
+  /*
+    If the prepare stage already have completed pruning successfully,
+    it is no use of running prune_partitions() again on the same condition.
+    Since it will not be able to prune anything more than the previous call
+    from the prepare step.
+  */
+  if (part_info && part_info->is_pruning_completed) return false;
+
+  table->all_partitions_pruned_away = false;
+
+  if (!part_info) return false; /* not a partitioned table */
+
+  if (table->s->db_type()->partition_flags() & HA_USE_AUTO_PARTITION &&
+      part_info->is_auto_partitioned)
+    return false; /* Should not prune auto partitioned table */
+
+  if (!pprune_cond) {
+    mark_all_partitions_as_used(part_info);
+    return false;
+  }
+
+  /* No need to continue pruning if there is no more partitions to prune! */
+  if (bitmap_is_clear_all(&part_info->lock_partitions))
+    bitmap_clear_all(&part_info->read_partitions);
+  if (bitmap_is_clear_all(&part_info->read_partitions)) {
+    table->all_partitions_pruned_away = true;
+    return false;
+  }
+
+  PART_PRUNE_PARAM prune_param;
+  MEM_ROOT alloc(key_memory_partitions_prune_exec,
+                 thd->variables.range_alloc_block_size);
+  RANGE_OPT_PARAM *range_par = &prune_param.range_param;
+  my_bitmap_map *old_sets[2];
+
+  prune_param.part_info = part_info;
+  alloc.set_max_capacity(thd->variables.range_optimizer_max_mem_size);
+  alloc.set_error_for_capacity_exceeded(true);
+  thd->push_internal_handler(&range_par->error_handler);
+  range_par->return_mem_root =
+      &alloc;  // We never use the generated TRPs, if any.
+  range_par->temp_mem_root = &alloc;
+
+  if (create_partition_index_description(&prune_param)) {
+    mark_all_partitions_as_used(part_info);
+    thd->pop_internal_handler();
+    return false;
+  }
+
+  dbug_tmp_use_all_columns(table, old_sets, table->read_set, table->write_set);
+  range_par->table = table;
+  range_par->query_block = query_block;
+  /* range_par->cond doesn't need initialization */
+  const table_map prev_tables = INNER_TABLE_BIT;
+  const table_map read_tables = INNER_TABLE_BIT;
+  const table_map current_table = table->pos_in_table_list->map();
+
+  range_par->keys = 1;  // one index
+  range_par->using_real_indexes = false;
+  unsigned real_keynr = 0;
+  range_par->real_keynr = &real_keynr;
+
+  bitmap_clear_all(&part_info->read_partitions);
+
+  prune_param.key = prune_param.range_param.key_parts;
+  SEL_TREE *tree;
+  int res;
+
+  tree = get_mm_tree(thd, range_par, prev_tables, read_tables, current_table,
+                     /*remove_jump_scans=*/false, pprune_cond);
+  if (!tree) goto all_used;
+
+  if (tree->type == SEL_TREE::IMPOSSIBLE) {
+    /* Cannot improve the pruning any further. */
+    part_info->is_pruning_completed = true;
+    goto end;
+  }
+
+  if (tree->type != SEL_TREE::KEY && tree->type != SEL_TREE::KEY_SMALLER)
+    goto all_used;
+
+  if (tree->merges.is_empty()) {
+    /* Range analysis has produced a single list of intervals. */
+    prune_param.arg_stack_end = prune_param.arg_stack;
+    prune_param.cur_part_fields = 0;
+    prune_param.cur_subpart_fields = 0;
+
+    prune_param.cur_min_key = prune_param.min_key;
+    prune_param.cur_max_key = prune_param.max_key;
+    prune_param.cur_min_flag = prune_param.cur_max_flag = 0;
+
+    init_all_partitions_iterator(part_info, &prune_param.part_iter);
+    if (!tree->keys[0] ||
+        (-1 == (res = find_used_partitions(thd, &prune_param, tree->keys[0]))))
+      goto all_used;
+  } else {
+    if (tree->merges.elements == 1) {
+      /*
+        Range analysis has produced a "merge" of several intervals lists, a
+        SEL_TREE that represents an expression in form
+          sel_imerge = (tree1 OR tree2 OR ... OR treeN)
+        that cannot be reduced to one tree. This can only happen when
+        partitioning index has several keyparts and the condition is OR of
+        conditions that refer to different key parts. For example, we'll get
+        here for "partitioning_field=const1 OR subpartitioning_field=const2"
+      */
+      if (-1 == (res = find_used_partitions_imerge(thd, &prune_param,
+                                                   tree->merges.head())))
+        goto all_used;
+    } else {
+      /*
+        Range analysis has produced a list of several imerges, i.e. a
+        structure that represents a condition in form
+        imerge_list= (sel_imerge1 AND sel_imerge2 AND ... AND sel_imergeN)
+        This is produced for complicated WHERE clauses that range analyzer
+        can't really analyze properly.
+      */
+      if (-1 == (res = find_used_partitions_imerge_list(thd, &prune_param,
+                                                        tree->merges)))
+        goto all_used;
+    }
+  }
+
+  /*
+    Decide if the current pruning attempt is the final one.
+
+    During the prepare phase, before locking, subqueries and stored programs
+    are not evaluated. So we need to run prune_partitions() a second time in
+    the optimize phase to prune partitions for reading, when subqueries and
+    stored programs may be evaluated.
+
+    The upcoming pruning attempt will be the final one when:
+    - condition is constant, or
+    - condition may vary for every row (so there is nothing to prune) or
+    - evaluation is in execution phase.
+  */
+  if (pprune_cond->const_item() || !pprune_cond->const_for_execution() ||
+      thd->lex->is_query_tables_locked())
+    part_info->is_pruning_completed = true;
+  goto end;
+
+all_used:
+  mark_all_partitions_as_used(prune_param.part_info);
+end:
+  thd->pop_internal_handler();
+  dbug_tmp_restore_column_maps(table->read_set, table->write_set, old_sets);
+
+  /* If an error occurred we can return failure after freeing the memroot. */
+  if (thd->is_error()) {
+    return true;
+  }
+  /*
+    Must be a subset of the locked partitions.
+    lock_partitions contains the partitions marked by explicit partition
+    selection (... t PARTITION (pX) ...) and we must only use partitions
+    within that set.
+  */
+  bitmap_intersect(&prune_param.part_info->read_partitions,
+                   &prune_param.part_info->lock_partitions);
+  /*
+    If not yet locked, also prune partitions to lock if not UPDATEing
+    partition key fields. This will also prune lock_partitions if we are under
+    LOCK TABLES, so prune away calls to start_stmt().
+    TODO: enhance this prune locking to also allow pruning of
+    'UPDATE t SET part_key = const WHERE cond_is_prunable' so it adds
+    a lock for part_key partition.
+  */
+  if (!thd->lex->is_query_tables_locked() &&
+      !partition_key_modified(table, table->write_set)) {
+    bitmap_copy(&prune_param.part_info->lock_partitions,
+                &prune_param.part_info->read_partitions);
+  }
+  if (bitmap_is_clear_all(&(prune_param.part_info->read_partitions)))
+    table->all_partitions_pruned_away = true;
+  return false;
+}
+
+/*
+  Store field key image to table record
+
+  SYNOPSIS
+    store_key_image_to_rec()
+      field  Field which key image should be stored
+      ptr    Field value in key format
+      len    Length of the value, in bytes
+
+  DESCRIPTION
+    Copy the field value from its key image to the table record. The source
+    is the value in key image format, occupying len bytes in buffer pointed
+    by ptr. The destination is table record, in "field value in table record"
+    format.
+*/
+
+void store_key_image_to_rec(Field *field, uchar *ptr, uint len) {
+  /* Do the same as print_key_value() does */
+  my_bitmap_map *old_map;
+
+  if (field->is_nullable()) {
+    if (*ptr) {
+      field->set_null();
+      return;
+    }
+    field->set_notnull();
+    ptr++;
+  }
+  old_map = dbug_tmp_use_all_columns(field->table, field->table->write_set);
+  field->set_key_image(ptr, len);
+  dbug_tmp_restore_column_map(field->table->write_set, old_map);
+}
+
+/*
+  For SEL_ARG* array, store sel_arg->min values into table record buffer
+
+  SYNOPSIS
+    store_selargs_to_rec()
+      ppar   Partition pruning context
+      start  Array of SEL_ARG* for which the minimum values should be stored
+      num    Number of elements in the array
+
+  DESCRIPTION
+    For each SEL_ARG* interval in the specified array, store the left edge
+    field value (sel_arg->min, key image format) into the table record.
+*/
+
+static void store_selargs_to_rec(PART_PRUNE_PARAM *ppar, SEL_ARG **start,
+                                 int num) {
+  KEY_PART *parts = ppar->range_param.key_parts;
+  for (SEL_ARG **end = start + num; start != end; start++) {
+    SEL_ARG *sel_arg = (*start);
+    store_key_image_to_rec(sel_arg->field, sel_arg->min_value,
+                           parts[sel_arg->part].length);
+  }
+}
+
+/* Mark a partition as used in the case when there are no subpartitions */
+static void mark_full_partition_used_no_parts(partition_info *part_info,
+                                              uint32 part_id) {
+  DBUG_TRACE;
+  DBUG_PRINT("enter", ("Mark partition %u as used", part_id));
+  bitmap_set_bit(&part_info->read_partitions, part_id);
+}
+
+/* Mark a partition as used in the case when there are subpartitions */
+static void mark_full_partition_used_with_parts(partition_info *part_info,
+                                                uint32 part_id) {
+  uint32 start = part_id * part_info->num_subparts;
+  uint32 end = start + part_info->num_subparts;
+  DBUG_TRACE;
+
+  for (; start != end; start++) {
+    DBUG_PRINT("info", ("1:Mark subpartition %u as used", start));
+    bitmap_set_bit(&part_info->read_partitions, start);
+  }
+}
+
+/*
+  Find the set of used partitions for List<SEL_IMERGE>
+  SYNOPSIS
+    find_used_partitions_imerge_list
+      ppar      Partition pruning context.
+      key_tree  Intervals tree to perform pruning for.
+
+  DESCRIPTION
+    List<SEL_IMERGE> represents "imerge1 AND imerge2 AND ...".
+    The set of used partitions is an intersection of used partitions sets
+    for imerge_{i}.
+    We accumulate this intersection in a separate bitmap.
+
+  RETURN
+    See find_used_partitions()
+*/
+
+static int find_used_partitions_imerge_list(THD *thd, PART_PRUNE_PARAM *ppar,
+                                            List<SEL_IMERGE> &merges) {
+  MY_BITMAP all_merges;
+  uint bitmap_bytes;
+  my_bitmap_map *bitmap_buf;
+  uint n_bits = ppar->part_info->read_partitions.n_bits;
+  bitmap_bytes = bitmap_buffer_size(n_bits);
+  if (!(bitmap_buf = (my_bitmap_map *)ppar->range_param.temp_mem_root->Alloc(
+            bitmap_bytes))) {
+    /*
+      Fallback, process just the first SEL_IMERGE. This can leave us with more
+      partitions marked as used then actually needed.
+    */
+    return find_used_partitions_imerge(thd, ppar, merges.head());
+  }
+  bitmap_init(&all_merges, bitmap_buf, n_bits);
+  bitmap_set_prefix(&all_merges, n_bits);
+
+  List_iterator<SEL_IMERGE> it(merges);
+  SEL_IMERGE *imerge;
+  while ((imerge = it++)) {
+    int res = find_used_partitions_imerge(thd, ppar, imerge);
+    if (!res) {
+      /* no used partitions on one ANDed imerge => no used partitions at all */
+      return 0;
+    }
+
+    if (res != -1)
+      bitmap_intersect(&all_merges, &ppar->part_info->read_partitions);
+
+    if (bitmap_is_clear_all(&all_merges)) return 0;
+
+    bitmap_clear_all(&ppar->part_info->read_partitions);
+  }
+  memcpy(ppar->part_info->read_partitions.bitmap, all_merges.bitmap,
+         bitmap_bytes);
+  return 1;
+}
+
+/*
+  Find the set of used partitions for SEL_IMERGE structure
+  SYNOPSIS
+    find_used_partitions_imerge()
+      ppar      Partition pruning context.
+      key_tree  Intervals tree to perform pruning for.
+
+  DESCRIPTION
+    SEL_IMERGE represents "tree1 OR tree2 OR ...". The implementation is
+    trivial - just use mark used partitions for each tree and bail out early
+    if for some tree_{i} all partitions are used.
+
+  RETURN
+    See find_used_partitions().
+*/
+
+static int find_used_partitions_imerge(THD *thd, PART_PRUNE_PARAM *ppar,
+                                       SEL_IMERGE *imerge) {
+  int res = 0;
+  for (SEL_TREE **ptree = imerge->trees; ptree < imerge->trees_next; ptree++) {
+    ppar->arg_stack_end = ppar->arg_stack;
+    ppar->cur_part_fields = 0;
+    ppar->cur_subpart_fields = 0;
+
+    ppar->cur_min_key = ppar->min_key;
+    ppar->cur_max_key = ppar->max_key;
+    ppar->cur_min_flag = ppar->cur_max_flag = 0;
+
+    init_all_partitions_iterator(ppar->part_info, &ppar->part_iter);
+    SEL_ROOT *key_tree = (*ptree)->keys[0];
+    if (!key_tree || (-1 == (res |= find_used_partitions(thd, ppar, key_tree))))
+      return -1;
+  }
+  return res;
+}
+
+/*
+  Collect partitioning ranges for the SEL_ARG tree and mark partitions as used
+
+  SYNOPSIS
+    find_used_partitions()
+      ppar      Partition pruning context.
+      key_tree  SEL_ARG range (sub)tree to perform pruning for
+
+  DESCRIPTION
+    This function
+      * recursively walks the SEL_ARG* tree collecting partitioning "intervals"
+      * finds the partitions one needs to use to get rows in these intervals
+      * marks these partitions as used.
+    The next session desribes the process in greater detail.
+
+  IMPLEMENTATION
+    TYPES OF RESTRICTIONS THAT WE CAN OBTAIN PARTITIONS FOR
+    We can find out which [sub]partitions to use if we obtain restrictions on
+    [sub]partitioning fields in the following form:
+    1.  "partition_field1=const1 AND ... AND partition_fieldN=constN"
+    1.1  Same as (1) but for subpartition fields
+
+    If partitioning supports interval analysis (i.e. partitioning is a
+    function of a single table field, and partition_info::
+    get_part_iter_for_interval != NULL), then we can also use condition in
+    this form:
+    2.  "const1 <=? partition_field <=? const2"
+    2.1  Same as (2) but for subpartition_field
+
+    INFERRING THE RESTRICTIONS FROM SEL_ARG TREE
+
+    The below is an example of what SEL_ARG tree may represent:
+
+    (start)
+     |                           $
+     |   Partitioning keyparts   $  subpartitioning keyparts
+     |                           $
+     |     ...          ...      $
+     |      |            |       $
+     | +---------+  +---------+  $  +-----------+  +-----------+
+     \-| par1=c1 |--| par2=c2 |-----| subpar1=c3|--| subpar2=c5|
+       +---------+  +---------+  $  +-----------+  +-----------+
+            |                    $        |             |
+            |                    $        |        +-----------+
+            |                    $        |        | subpar2=c6|
+            |                    $        |        +-----------+
+            |                    $        |
+            |                    $  +-----------+  +-----------+
+            |                    $  | subpar1=c4|--| subpar2=c8|
+            |                    $  +-----------+  +-----------+
+            |                    $
+            |                    $
+       +---------+               $  +------------+  +------------+
+       | par1=c2 |------------------| subpar1=c10|--| subpar2=c12|
+       +---------+               $  +------------+  +------------+
+            |                    $
+           ...                   $
+
+    The up-down connections are connections via SEL_ARG::left and
+    SEL_ARG::right. A horizontal connection to the right is the
+    SEL_ARG::next_key_part connection.
+
+    find_used_partitions() traverses the entire tree via recursion on
+     * SEL_ARG::next_key_part (from left to right on the picture)
+     * SEL_ARG::left|right (up/down on the pic). Left-right recursion is
+       performed for each depth level.
+
+    Recursion descent on SEL_ARG::next_key_part is used to accumulate (in
+    ppar->arg_stack) constraints on partitioning and subpartitioning fields.
+    For the example in the above picture, one of stack states is:
+      in find_used_partitions(key_tree = "subpar2=c5") (***)
+      in find_used_partitions(key_tree = "subpar1=c3")
+      in find_used_partitions(key_tree = "par2=c2")   (**)
+      in find_used_partitions(key_tree = "par1=c1")
+      in prune_partitions(...)
+    We apply partitioning limits as soon as possible, e.g. when we reach the
+    depth (**), we find which partition(s) correspond to "par1=c1 AND par2=c2",
+    and save them in ppar->part_iter.
+    When we reach the depth (***), we find which subpartition(s) correspond to
+    "subpar1=c3 AND subpar2=c5", and then mark appropriate subpartitions in
+    appropriate subpartitions as used.
+
+    It is possible that constraints on some partitioning fields are missing.
+    For the above example, consider this stack state:
+      in find_used_partitions(key_tree = "subpar2=c12") (***)
+      in find_used_partitions(key_tree = "subpar1=c10")
+      in find_used_partitions(key_tree = "par1=c2")
+      in prune_partitions(...)
+    Here we don't have constraints for all partitioning fields. Since we've
+    never set the ppar->part_iter to contain used set of partitions, we use
+    its default "all partitions" value.  We get  subpartition id for
+    "subpar1=c3 AND subpar2=c5", and mark that subpartition as used in every
+    partition.
+
+    The inverse is also possible: we may get constraints on partitioning
+    fields, but not constraints on subpartitioning fields. In that case,
+    calls to find_used_partitions() with depth below (**) will return -1,
+    and we will mark entire partition as used.
+
+  TODO
+    Replace recursion on SEL_ARG::left and SEL_ARG::right with a loop
+
+  RETURN
+    1   OK, one or more [sub]partitions are marked as used.
+    0   The passed condition doesn't match any partitions
+   -1   Couldn't infer any partition pruning "intervals" from the passed
+        SEL_ARG* tree (which means that all partitions should be marked as
+        used) Marking partitions as used is the responsibility of the caller.
+*/
+
+static int find_used_partitions(THD *thd, PART_PRUNE_PARAM *ppar,
+                                SEL_ROOT::Type key_tree_type,
+                                SEL_ARG *key_tree) {
+  int res, left_res = 0, right_res = 0;
+  int key_tree_part = (int)key_tree->part;
+  bool set_full_part_if_bad_ret = false;
+  bool ignore_part_fields = ppar->ignore_part_fields;
+  bool did_set_ignore_part_fields = false;
+
+  if (check_stack_overrun(thd, 3 * STACK_MIN_SIZE, nullptr)) return -1;
+
+  if (key_tree->left != null_element) {
+    if (-1 == (left_res = find_used_partitions(thd, ppar, key_tree_type,
+                                               key_tree->left)))
+      return -1;
+  }
+
+  /* Push SEL_ARG's to stack to enable looking backwards as well */
+  ppar->cur_part_fields += ppar->is_part_keypart[key_tree_part];
+  ppar->cur_subpart_fields += ppar->is_subpart_keypart[key_tree_part];
+  *(ppar->arg_stack_end++) = key_tree;
+
+  if (ignore_part_fields) {
+    /*
+      We come here when a condition on the first partitioning
+      fields led to evaluating the partitioning condition
+      (due to finding a condition of the type a < const or
+      b > const). Thus we must ignore the rest of the
+      partitioning fields but we still want to analyse the
+      subpartitioning fields.
+    */
+    if (key_tree->next_key_part)
+      res = find_used_partitions(thd, ppar, key_tree->next_key_part);
+    else
+      res = -1;
+    goto pop_and_go_right;
+  }
+
+  /*
+    TODO: It seems that key_tree_type is _always_ KEY_RANGE in practice,
+    so maybe this if is redundant and should be replaced with an assert?
+  */
+  if (key_tree_type == SEL_ROOT::Type::KEY_RANGE) {
+    if (ppar->part_info->get_part_iter_for_interval &&
+        key_tree->part <= ppar->last_part_partno) {
+      /* Collect left and right bound, their lengths and flags */
+      uchar *min_key = ppar->cur_min_key;
+      uchar *max_key = ppar->cur_max_key;
+      uchar *tmp_min_key = min_key;
+      uchar *tmp_max_key = max_key;
+      key_tree->store_min_value(ppar->key[key_tree->part].store_length,
+                                &tmp_min_key, ppar->cur_min_flag);
+      key_tree->store_max_value(ppar->key[key_tree->part].store_length,
+                                &tmp_max_key, ppar->cur_max_flag);
+      uint flag;
+      if (key_tree->next_key_part &&
+          key_tree->next_key_part->root->part == key_tree->part + 1 &&
+          key_tree->next_key_part->root->part <= ppar->last_part_partno &&
+          key_tree->next_key_part->type == SEL_ROOT::Type::KEY_RANGE) {
+        /*
+          There are more key parts for partition pruning to handle
+          This mainly happens when the condition is an equality
+          condition.
+        */
+        if ((tmp_min_key - min_key) == (tmp_max_key - max_key) &&
+            (memcmp(min_key, max_key, (uint)(tmp_max_key - max_key)) == 0) &&
+            !key_tree->min_flag && !key_tree->max_flag) {
+          /* Set 'parameters' */
+          ppar->cur_min_key = tmp_min_key;
+          ppar->cur_max_key = tmp_max_key;
+          uint save_min_flag = ppar->cur_min_flag;
+          uint save_max_flag = ppar->cur_max_flag;
+
+          ppar->cur_min_flag |= key_tree->min_flag;
+          ppar->cur_max_flag |= key_tree->max_flag;
+
+          res = find_used_partitions(thd, ppar, key_tree->next_key_part);
+
+          /* Restore 'parameters' back */
+          ppar->cur_min_key = min_key;
+          ppar->cur_max_key = max_key;
+
+          ppar->cur_min_flag = save_min_flag;
+          ppar->cur_max_flag = save_max_flag;
+          goto pop_and_go_right;
+        }
+        /* We have arrived at the last field in the partition pruning */
+        uint tmp_min_flag = key_tree->min_flag,
+             tmp_max_flag = key_tree->max_flag;
+        if (!tmp_min_flag)
+          key_tree->next_key_part->store_min_key(ppar->key, &tmp_min_key,
+                                                 &tmp_min_flag,
+                                                 ppar->last_part_partno, true);
+        if (!tmp_max_flag)
+          key_tree->next_key_part->store_max_key(ppar->key, &tmp_max_key,
+                                                 &tmp_max_flag,
+                                                 ppar->last_part_partno, false);
+        flag = tmp_min_flag | tmp_max_flag;
+      } else
+        flag = key_tree->min_flag | key_tree->max_flag;
+
+      if (tmp_min_key != ppar->min_key)
+        flag &= ~NO_MIN_RANGE;
+      else
+        flag |= NO_MIN_RANGE;
+      if (tmp_max_key != ppar->max_key)
+        flag &= ~NO_MAX_RANGE;
+      else
+        flag |= NO_MAX_RANGE;
+
+      /*
+        We need to call the interval mapper if we have a condition which
+        makes sense to prune on. In the example of COLUMNS on a and
+        b it makes sense if we have a condition on a, or conditions on
+        both a and b. If we only have conditions on b it might make sense
+        but this is a harder case we will solve later. For the harder case
+        this clause then turns into use of all partitions and thus we
+        simply set res= -1 as if the mapper had returned that.
+        TODO: What to do here is defined in WL#4065.
+      */
+      if (ppar->arg_stack[0]->part == 0) {
+        uint32 i;
+        uint32 store_length_array[MAX_KEY];
+        uint32 num_keys = ppar->part_fields;
+
+        for (i = 0; i < num_keys; i++)
+          store_length_array[i] = ppar->key[i].store_length;
+        res = ppar->part_info->get_part_iter_for_interval(
+            ppar->part_info, false, store_length_array, ppar->min_key,
+            ppar->max_key, tmp_min_key - ppar->min_key,
+            tmp_max_key - ppar->max_key, flag, &ppar->part_iter);
+        if (!res)
+          goto pop_and_go_right; /* res==0 --> no satisfying partitions */
+      } else
+        res = -1;
+
+      if (res == -1) {
+        /* get a full range iterator */
+        init_all_partitions_iterator(ppar->part_info, &ppar->part_iter);
+      }
+      /*
+        Save our intent to mark full partition as used if we will not be able
+        to obtain further limits on subpartitions
+      */
+      if (key_tree_part < ppar->last_part_partno) {
+        /*
+          We need to ignore the rest of the partitioning fields in all
+          evaluations after this
+        */
+        did_set_ignore_part_fields = true;
+        ppar->ignore_part_fields = true;
+      }
+      set_full_part_if_bad_ret = true;
+      goto process_next_key_part;
+    }
+
+    if (key_tree_part == ppar->last_subpart_partno &&
+        (nullptr != ppar->part_info->get_subpart_iter_for_interval)) {
+      PARTITION_ITERATOR subpart_iter;
+      DBUG_EXECUTE("info", dbug_print_segment_range(
+                               key_tree, ppar->range_param.key_parts););
+      res = ppar->part_info->get_subpart_iter_for_interval(
+          ppar->part_info, true, nullptr, /* Currently not used here */
+          key_tree->min_value, key_tree->max_value, 0,
+          0, /* Those are ignored here */
+          key_tree->min_flag | key_tree->max_flag, &subpart_iter);
+      if (res == 0) {
+        /*
+           The only case where we can get "no satisfying subpartitions"
+           returned from the above call is when an error has occurred.
+        */
+        assert(thd->is_error());
+        return 0;
+      }
+
+      if (res == -1) goto pop_and_go_right; /* all subpartitions satisfy */
+
+      uint32 subpart_id;
+      bitmap_clear_all(&ppar->subparts_bitmap);
+      while ((subpart_id = subpart_iter.get_next(&subpart_iter)) !=
+             NOT_A_PARTITION_ID)
+        bitmap_set_bit(&ppar->subparts_bitmap, subpart_id);
+
+      /* Mark each partition as used in each subpartition.  */
+      uint32 part_id;
+      while ((part_id = ppar->part_iter.get_next(&ppar->part_iter)) !=
+             NOT_A_PARTITION_ID) {
+        for (uint i = 0; i < ppar->part_info->num_subparts; i++)
+          if (bitmap_is_set(&ppar->subparts_bitmap, i))
+            bitmap_set_bit(&ppar->part_info->read_partitions,
+                           part_id * ppar->part_info->num_subparts + i);
+      }
+      goto pop_and_go_right;
+    }
+
+    if (key_tree->is_singlepoint()) {
+      if (key_tree_part == ppar->last_part_partno &&
+          ppar->cur_part_fields == ppar->part_fields &&
+          ppar->part_info->get_part_iter_for_interval == nullptr) {
+        /*
+          Ok, we've got "fieldN<=>constN"-type SEL_ARGs for all partitioning
+          fields. Save all constN constants into table record buffer.
+        */
+        store_selargs_to_rec(ppar, ppar->arg_stack, ppar->part_fields);
+        DBUG_EXECUTE("info", dbug_print_singlepoint_range(ppar->arg_stack,
+                                                          ppar->part_fields););
+        uint32 part_id;
+        longlong func_value;
+        /* Find in which partition the {const1, ...,constN} tuple goes */
+        if (ppar->get_top_partition_id_func(ppar->part_info, &part_id,
+                                            &func_value)) {
+          res = 0; /* No satisfying partitions */
+          goto pop_and_go_right;
+        }
+        /* Rembember the limit we got - single partition #part_id */
+        init_single_partition_iterator(part_id, &ppar->part_iter);
+
+        /*
+          If there are no subpartitions/we fail to get any limit for them,
+          then we'll mark full partition as used.
+        */
+        set_full_part_if_bad_ret = true;
+        goto process_next_key_part;
+      }
+
+      if (key_tree_part == ppar->last_subpart_partno &&
+          ppar->cur_subpart_fields == ppar->subpart_fields) {
+        /*
+          Ok, we've got "fieldN<=>constN"-type SEL_ARGs for all subpartitioning
+          fields. Save all constN constants into table record buffer.
+        */
+        store_selargs_to_rec(ppar, ppar->arg_stack_end - ppar->subpart_fields,
+                             ppar->subpart_fields);
+        DBUG_EXECUTE("info", dbug_print_singlepoint_range(
+                                 ppar->arg_stack_end - ppar->subpart_fields,
+                                 ppar->subpart_fields););
+        /* Find the subpartition (it's HASH/KEY so we always have one) */
+        partition_info *part_info = ppar->part_info;
+        uint32 part_id, subpart_id;
+
+        if (part_info->get_subpartition_id(part_info, &subpart_id)) return 0;
+
+        /* Mark this partition as used in each subpartition. */
+        while ((part_id = ppar->part_iter.get_next(&ppar->part_iter)) !=
+               NOT_A_PARTITION_ID) {
+          bitmap_set_bit(&part_info->read_partitions,
+                         part_id * part_info->num_subparts + subpart_id);
+        }
+        res = 1; /* Some partitions were marked as used */
+        goto pop_and_go_right;
+      }
+    } else {
+      /*
+        Can't handle condition on current key part. If we're that deep that
+        we're processing subpartititoning's key parts, this means we'll not be
+        able to infer any suitable condition, so bail out.
+      */
+      if (key_tree_part >= ppar->last_part_partno) {
+        res = -1;
+        goto pop_and_go_right;
+      }
+      /*
+        No meaning in continuing with rest of partitioning key parts.
+        Will try to continue with subpartitioning key parts.
+      */
+      ppar->ignore_part_fields = true;
+      did_set_ignore_part_fields = true;
+      goto process_next_key_part;
+    }
+  }
+
+process_next_key_part:
+  if (key_tree->next_key_part)
+    res = find_used_partitions(thd, ppar, key_tree->next_key_part);
+  else
+    res = -1;
+
+  if (did_set_ignore_part_fields) {
+    /*
+      We have returned from processing all key trees linked to our next
+      key part. We are ready to be moving down (using right pointers) and
+      this tree is a new evaluation requiring its own decision on whether
+      to ignore partitioning fields.
+    */
+    ppar->ignore_part_fields = false;
+  }
+  if (set_full_part_if_bad_ret) {
+    if (res == -1) {
+      /* Got "full range" for subpartitioning fields */
+      uint32 part_id;
+      bool found = false;
+      while ((part_id = ppar->part_iter.get_next(&ppar->part_iter)) !=
+             NOT_A_PARTITION_ID) {
+        ppar->mark_full_partition_used(ppar->part_info, part_id);
+        found = true;
+      }
+      res = found;
+    }
+    /*
+      Restore the "used partitions iterator" to the default setting that
+      specifies iteration over all partitions.
+    */
+    init_all_partitions_iterator(ppar->part_info, &ppar->part_iter);
+  }
+
+pop_and_go_right:
+  /* Pop this key part info off the "stack" */
+  ppar->arg_stack_end--;
+  ppar->cur_part_fields -= ppar->is_part_keypart[key_tree_part];
+  ppar->cur_subpart_fields -= ppar->is_subpart_keypart[key_tree_part];
+
+  if (res == -1) return -1;
+  if (key_tree->right != null_element) {
+    if (-1 == (right_res = find_used_partitions(thd, ppar, key_tree_type,
+                                                key_tree->right)))
+      return -1;
+  }
+  return (left_res || right_res || res);
+}
+
+static int find_used_partitions(THD *thd, PART_PRUNE_PARAM *ppar,
+                                SEL_ROOT *key_tree) {
+  return find_used_partitions(thd, ppar, key_tree->type, key_tree->root);
+}
+
+static void mark_all_partitions_as_used(partition_info *part_info) {
+  bitmap_copy(&(part_info->read_partitions), &(part_info->lock_partitions));
+}
+
+/*
+  Check if field types allow to construct partitioning index description
+
+  SYNOPSIS
+    fields_ok_for_partition_index()
+      pfield  NULL-terminated array of pointers to fields.
+
+  DESCRIPTION
+    For an array of fields, check if we can use all of the fields to create
+    partitioning index description.
+
+    We can't process GEOMETRY fields - for these fields singlepoint intervals
+    cant be generated, and non-singlepoint are "special" kinds of intervals
+    to which our processing logic can't be applied.
+
+    It is not known if we could process ENUM fields, so they are disabled to be
+    on the safe side.
+
+  RETURN
+    true   Yes, fields can be used in partitioning index
+    false  Otherwise
+*/
+
+static bool fields_ok_for_partition_index(Field **pfield) {
+  if (!pfield) return false;
+  for (; (*pfield); pfield++) {
+    enum_field_types ftype = (*pfield)->real_type();
+    if (ftype == MYSQL_TYPE_ENUM || ftype == MYSQL_TYPE_GEOMETRY) return false;
+  }
+  return true;
+}
+
+/*
+  Create partition index description and fill related info in the context
+  struct
+
+  SYNOPSIS
+    create_partition_index_description()
+      prune_par  INOUT Partition pruning context
+
+  DESCRIPTION
+    Create partition index description. Partition index description is:
+
+      part_index(used_fields_list(part_expr), used_fields_list(subpart_expr))
+
+    If partitioning/sub-partitioning uses BLOB or Geometry fields, then
+    corresponding fields_list(...) is not included into index description
+    and we don't perform partition pruning for partitions/subpartitions.
+
+  RETURN
+    true   Out of memory or can't do partition pruning at all
+    false  OK
+*/
+
+static bool create_partition_index_description(PART_PRUNE_PARAM *ppar) {
+  RANGE_OPT_PARAM *range_par = &(ppar->range_param);
+  partition_info *part_info = ppar->part_info;
+  uint used_part_fields, used_subpart_fields;
+
+  used_part_fields = fields_ok_for_partition_index(part_info->part_field_array)
+                         ? part_info->num_part_fields
+                         : 0;
+  used_subpart_fields =
+      fields_ok_for_partition_index(part_info->subpart_field_array)
+          ? part_info->num_subpart_fields
+          : 0;
+
+  uint total_parts = used_part_fields + used_subpart_fields;
+
+  ppar->ignore_part_fields = false;
+  ppar->part_fields = used_part_fields;
+  ppar->last_part_partno = (int)used_part_fields - 1;
+
+  ppar->subpart_fields = used_subpart_fields;
+  ppar->last_subpart_partno =
+      used_subpart_fields ? (int)(used_part_fields + used_subpart_fields - 1)
+                          : -1;
+
+  if (part_info->is_sub_partitioned()) {
+    ppar->mark_full_partition_used = mark_full_partition_used_with_parts;
+    ppar->get_top_partition_id_func = part_info->get_part_partition_id;
+  } else {
+    ppar->mark_full_partition_used = mark_full_partition_used_no_parts;
+    ppar->get_top_partition_id_func = part_info->get_partition_id;
+  }
+
+  KEY_PART *key_part;
+  MEM_ROOT *alloc = range_par->temp_mem_root;
+  if (!total_parts ||
+      !(key_part = (KEY_PART *)alloc->Alloc(sizeof(KEY_PART) * total_parts)) ||
+      !(ppar->arg_stack =
+            (SEL_ARG **)alloc->Alloc(sizeof(SEL_ARG *) * total_parts)) ||
+      !(ppar->is_part_keypart =
+            (bool *)alloc->Alloc(sizeof(bool) * total_parts)) ||
+      !(ppar->is_subpart_keypart =
+            (bool *)alloc->Alloc(sizeof(bool) * total_parts)))
+    return true;
+
+  if (ppar->subpart_fields) {
+    my_bitmap_map *buf;
+    uint32 bufsize = bitmap_buffer_size(ppar->part_info->num_subparts);
+    if (!(buf = (my_bitmap_map *)alloc->Alloc(bufsize))) return true;
+    bitmap_init(&ppar->subparts_bitmap, buf, ppar->part_info->num_subparts);
+  }
+  range_par->key_parts = key_part;
+  Field **field = (ppar->part_fields) ? part_info->part_field_array
+                                      : part_info->subpart_field_array;
+  bool in_subpart_fields = false;
+  for (uint part = 0; part < total_parts; part++, key_part++) {
+    key_part->key = 0;
+    key_part->part = part;
+    key_part->length = (uint16)(*field)->key_length();
+    key_part->store_length = (uint16)get_partition_field_store_length(*field);
+
+    DBUG_PRINT("info", ("part %u length %u store_length %u", part,
+                        key_part->length, key_part->store_length));
+
+    key_part->field = (*field);
+    key_part->image_type = Field::itRAW;
+    /*
+      We set keypart flag to 0 here as the only HA_PART_KEY_SEG is checked
+      in the RangeAnalysisModule.
+    */
+    key_part->flag = 0;
+    /* We don't set key_parts->null_bit as it will not be used */
+
+    ppar->is_part_keypart[part] = !in_subpart_fields;
+    ppar->is_subpart_keypart[part] = in_subpart_fields;
+
+    /*
+      Check if this was last field in this array, in this case we
+      switch to subpartitioning fields. (This will only happens if
+      there are subpartitioning fields to cater for).
+    */
+    if (!*(++field)) {
+      field = part_info->subpart_field_array;
+      in_subpart_fields = true;
+    }
+  }
+  range_par->key_parts_end = key_part;
+
+  DBUG_EXECUTE("info", print_partitioning_index(range_par->key_parts,
+                                                range_par->key_parts_end););
+  return false;
+}
+
+#ifndef NDEBUG
+
+static void print_partitioning_index(KEY_PART *parts, KEY_PART *parts_end) {
+  DBUG_TRACE;
+  DBUG_LOCK_FILE;
+  fprintf(DBUG_FILE, "partitioning INDEX(");
+  for (KEY_PART *p = parts; p != parts_end; p++) {
+    fprintf(DBUG_FILE, "%s%s", p == parts ? "" : " ,", p->field->field_name);
+  }
+  fputs(");\n", DBUG_FILE);
+  DBUG_UNLOCK_FILE;
+}
+
+/* Print a "c1 < keypartX < c2" - type interval into debug trace. */
+static void dbug_print_segment_range(SEL_ARG *arg, KEY_PART *part) {
+  DBUG_TRACE;
+  DBUG_LOCK_FILE;
+  if (!(arg->min_flag & NO_MIN_RANGE)) {
+    store_key_image_to_rec(part->field, arg->min_value, part->length);
+    part->field->dbug_print();
+    if (arg->min_flag & NEAR_MIN)
+      fputs(" < ", DBUG_FILE);
+    else
+      fputs(" <= ", DBUG_FILE);
+  }
+
+  fprintf(DBUG_FILE, "%s", part->field->field_name);
+
+  if (!(arg->max_flag & NO_MAX_RANGE)) {
+    if (arg->max_flag & NEAR_MAX)
+      fputs(" < ", DBUG_FILE);
+    else
+      fputs(" <= ", DBUG_FILE);
+    store_key_image_to_rec(part->field, arg->max_value, part->length);
+    part->field->dbug_print();
+  }
+  fputs("\n", DBUG_FILE);
+  DBUG_UNLOCK_FILE;
+}
+
+/*
+  Print a singlepoint multi-keypart range interval to debug trace
+
+  SYNOPSIS
+    dbug_print_singlepoint_range()
+      start  Array of SEL_ARG* ptrs representing conditions on key parts
+      num    Number of elements in the array.
+
+  DESCRIPTION
+    This function prints a "keypartN=constN AND ... AND keypartK=constK"-type
+    interval to debug trace.
+*/
+
+static void dbug_print_singlepoint_range(SEL_ARG **start, uint num) {
+  DBUG_TRACE;
+  DBUG_LOCK_FILE;
+  SEL_ARG **end = start + num;
+
+  for (SEL_ARG **arg = start; arg != end; arg++) {
+    Field *field = (*arg)->field;
+    fprintf(DBUG_FILE, "%s%s=", (arg == start) ? "" : ", ", field->field_name);
+    field->dbug_print();
+  }
+  fputs("\n", DBUG_FILE);
+  DBUG_UNLOCK_FILE;
+}
+#endif
+
+/****************************************************************************
+ * Partition pruning code ends
+ ****************************************************************************/
diff -Nru mysql-8.0-8.0.26/sql/range_optimizer/partition_pruning.h mysql-8.0-8.0.27/sql/range_optimizer/partition_pruning.h
--- mysql-8.0-8.0.26/sql/range_optimizer/partition_pruning.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/range_optimizer/partition_pruning.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,42 @@
+/* Copyright (c) 2000, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef SQL_RANGE_OPTIMIZER_PARTITION_PRUNING_H_
+#define SQL_RANGE_OPTIMIZER_PARTITION_PRUNING_H_
+
+/*
+  PartitionPruningModule
+  A module that accepts a partitioned table, condition, and finds which
+  partitions we will need to use in query execution. Search down for
+  "PartitionPruningModule" for description.
+  The module has single entry point - prune_partitions() function.
+ */
+
+class Item;
+class Query_block;
+class THD;
+struct TABLE;
+
+bool prune_partitions(THD *thd, TABLE *table, Query_block *query_block,
+                      Item *pprune_cond);
+
+#endif  // SQL_RANGE_OPTIMIZER_PARTITION_PRUNING_H_
diff -Nru mysql-8.0-8.0.26/sql/range_optimizer/range_analysis.cc mysql-8.0-8.0.27/sql/range_optimizer/range_analysis.cc
--- mysql-8.0-8.0.26/sql/range_optimizer/range_analysis.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/range_optimizer/range_analysis.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,1719 @@
+/* Copyright (c) 2000, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include <assert.h>
+#include <string.h>
+#include <sys/types.h>
+
+#include "field_types.h"
+#include "m_ctype.h"
+#include "memory_debugging.h"
+#include "mf_wcomp.h"
+#include "my_alloc.h"
+#include "my_base.h"
+#include "my_byteorder.h"
+#include "my_compiler.h"
+#include "my_dbug.h"
+#include "my_inttypes.h"
+#include "my_table_map.h"
+#include "mysql/udf_registration_types.h"
+#include "mysql_com.h"
+#include "mysqld_error.h"
+#include "sql/current_thd.h"
+#include "sql/derror.h"
+#include "sql/field.h"
+#include "sql/handler.h"
+#include "sql/item.h"
+#include "sql/item_cmpfunc.h"
+#include "sql/item_func.h"
+#include "sql/item_json_func.h"
+#include "sql/item_row.h"
+#include "sql/json_dom.h"
+#include "sql/key.h"
+#include "sql/mem_root_array.h"
+#include "sql/opt_trace.h"
+#include "sql/opt_trace_context.h"
+#include "sql/query_options.h"
+#include "sql/range_optimizer/internal.h"
+#include "sql/range_optimizer/range_optimizer.h"
+#include "sql/range_optimizer/tree.h"
+#include "sql/sql_bitmap.h"
+#include "sql/sql_class.h"
+#include "sql/sql_const.h"
+#include "sql/sql_error.h"
+#include "sql/sql_lex.h"
+#include "sql/sql_list.h"
+#include "sql/sql_optimizer.h"
+#include "sql/system_variables.h"
+#include "sql/table.h"
+#include "sql_string.h"
+#include "template_utils.h"
+
+/*
+  A null_sel_tree is used in get_func_mm_tree_from_in_predicate to pass
+  as an argument to tree_or. It is used only to influence the return
+  value from tree_or function.
+*/
+
+static MEM_ROOT null_root;
+static SEL_TREE null_sel_tree(SEL_TREE::IMPOSSIBLE, &null_root, 0);
+
+static uchar is_null_string[2] = {1, 0};
+
+static SEL_TREE *get_mm_parts(THD *thd, RANGE_OPT_PARAM *param,
+                              table_map prev_tables, table_map read_tables,
+                              Item_func *cond_func, Field *field,
+                              Item_func::Functype type, Item *value);
+static SEL_ROOT *get_mm_leaf(THD *thd, RANGE_OPT_PARAM *param, Item *cond_func,
+                             Field *field, KEY_PART *key_part,
+                             Item_func::Functype type, Item *value);
+static SEL_TREE *get_full_func_mm_tree(THD *thd, RANGE_OPT_PARAM *param,
+                                       table_map prev_tables,
+                                       table_map read_tables,
+                                       table_map current_table,
+                                       bool remove_jump_scans, Item *predicand,
+                                       Item_func *op, Item *value, bool inv);
+static SEL_ROOT *sel_add(SEL_ROOT *key1, SEL_ROOT *key2);
+
+/**
+   If EXPLAIN or if the --safe-updates option is enabled, add a warning that
+   the index cannot be used for range access due to either type conversion or
+   different collations on the field used for comparison
+
+   @param thd        Thread handle
+   @param param      RANGE_OPT_PARAM from test_quick_select
+   @param key_num    Key number
+   @param field      Field in the predicate
+ */
+static void warn_index_not_applicable(THD *thd, const RANGE_OPT_PARAM *param,
+                                      const uint key_num, const Field *field) {
+  if (param->using_real_indexes &&
+      (thd->lex->is_explain() ||
+       thd->variables.option_bits & OPTION_SAFE_UPDATES))
+    push_warning_printf(thd, Sql_condition::SL_WARNING,
+                        ER_WARN_INDEX_NOT_APPLICABLE,
+                        ER_THD(thd, ER_WARN_INDEX_NOT_APPLICABLE), "range",
+                        field->table->key_info[param->real_keynr[key_num]].name,
+                        field->field_name);
+}
+
+/*
+  Build a SEL_TREE for <> or NOT BETWEEN predicate
+
+  SYNOPSIS
+    get_ne_mm_tree()
+      param       RANGE_OPT_PARAM from test_quick_select
+      prev_tables See test_quick_select()
+      read_tables See test_quick_select()
+      remove_jump_scans See get_mm_tree()
+      cond_func   item for the predicate
+      field       field in the predicate
+      lt_value    constant that field should be smaller
+      gt_value    constant that field should be greaterr
+
+  RETURN
+    #  Pointer to tree built tree
+    0  on error
+*/
+static SEL_TREE *get_ne_mm_tree(THD *thd, RANGE_OPT_PARAM *param,
+                                table_map prev_tables, table_map read_tables,
+                                bool remove_jump_scans, Item_func *cond_func,
+                                Field *field, Item *lt_value, Item *gt_value) {
+  SEL_TREE *tree = nullptr;
+
+  if (param->has_errors()) return nullptr;
+
+  tree = get_mm_parts(thd, param, prev_tables, read_tables, cond_func, field,
+                      Item_func::LT_FUNC, lt_value);
+  if (tree) {
+    tree = tree_or(param, remove_jump_scans, tree,
+                   get_mm_parts(thd, param, prev_tables, read_tables, cond_func,
+                                field, Item_func::GT_FUNC, gt_value));
+  }
+  return tree;
+}
+
+/**
+  Factory function to build a SEL_TREE from an @<in predicate@>
+
+  @param thd        Thread handle
+  @param param      Information on 'just about everything'.
+  @param prev_tables See test_quick_select()
+  @param read_tables See test_quick_select()
+  @param remove_jump_scans See get_mm_tree()
+  @param predicand  The @<in predicate's@> predicand, i.e. the left-hand
+                    side of the @<in predicate@> expression.
+  @param op         The 'in' operator itself.
+  @param is_negated If true, the operator is NOT IN, otherwise IN.
+*/
+static SEL_TREE *get_func_mm_tree_from_in_predicate(
+    THD *thd, RANGE_OPT_PARAM *param, table_map prev_tables,
+    table_map read_tables, bool remove_jump_scans, Item *predicand,
+    Item_func_in *op, bool is_negated) {
+  if (param->has_errors()) return nullptr;
+
+  // Populate array as we need to examine its values here
+  if (op->array && !op->populated) op->populate_bisection(thd);
+
+  if (is_negated) {
+    // We don't support row constructors (multiple columns on lhs) here.
+    if (predicand->type() != Item::FIELD_ITEM) return nullptr;
+
+    Field *field = down_cast<Item_field *>(predicand)->field;
+
+    if (op->array && !op->array->is_row_result()) {
+      /*
+        We get here for conditions on the form "t.key NOT IN (c1, c2, ...)",
+        where c{i} are constants. Our goal is to produce a SEL_TREE that
+        represents intervals:
+
+        ($MIN<t.key<c1) OR (c1<t.key<c2) OR (c2<t.key<c3) OR ...    (*)
+
+        where $MIN is either "-inf" or NULL.
+
+        The most straightforward way to produce it is to convert NOT
+        IN into "(t.key != c1) AND (t.key != c2) AND ... " and let the
+        range analyzer build a SEL_TREE from that. The problem is that
+        the range analyzer will use O(N^2) memory (which is probably a
+        bug), and people who do use big NOT IN lists (e.g. see
+        BUG#15872, BUG#21282), will run out of memory.
+
+        Another problem with big lists like (*) is that a big list is
+        unlikely to produce a good "range" access, while considering
+        that range access will require expensive CPU calculations (and
+        for MyISAM even index accesses). In short, big NOT IN lists
+        are rarely worth analyzing.
+
+        Considering the above, we'll handle NOT IN as follows:
+
+        - if the number of entries in the NOT IN list is less than
+          NOT_IN_IGNORE_THRESHOLD, construct the SEL_TREE (*)
+          manually.
+
+        - Otherwise, don't produce a SEL_TREE.
+      */
+
+      const uint NOT_IN_IGNORE_THRESHOLD = 1000;
+      // If we have t.key NOT IN (null, null, ...) or the list is too long
+      if (op->array->used_count == 0 ||
+          op->array->used_count > NOT_IN_IGNORE_THRESHOLD)
+        return nullptr;
+
+      /*
+        Create one Item_type constant object. We'll need it as
+        get_mm_parts only accepts constant values wrapped in Item_Type
+        objects.
+        We create the Item on thd->mem_root which points to
+        per-statement mem_root.
+      */
+      Item_basic_constant *value_item = op->array->create_item(thd->mem_root);
+
+      if (!value_item) return nullptr;
+
+      /* Get a SEL_TREE for "(-inf|NULL) < X < c_0" interval.  */
+      uint i = 0;
+      SEL_TREE *tree = nullptr;
+      do {
+        op->array->value_to_item(i, value_item);
+        tree = get_mm_parts(thd, param, prev_tables, read_tables, op, field,
+                            Item_func::LT_FUNC, value_item);
+        if (!tree) break;
+        i++;
+      } while (i < op->array->used_count && tree->type == SEL_TREE::IMPOSSIBLE);
+
+      if (!tree || tree->type == SEL_TREE::IMPOSSIBLE)
+        /* We get here in cases like "t.unsigned NOT IN (-1,-2,-3) */
+        return nullptr;
+      SEL_TREE *tree2 = nullptr;
+      Item_basic_constant *previous_range_value =
+          op->array->create_item(thd->mem_root);
+      for (; i < op->array->used_count; i++) {
+        // Check if the value stored in the field for the previous range
+        // is greater, lesser or equal to the actual value specified in the
+        // query. Used further down to set the flags for the current range
+        // correctly (as the max value for the previous range will become
+        // the min value for the current range).
+        op->array->value_to_item(i - 1, previous_range_value);
+        int cmp_value =
+            stored_field_cmp_to_item(thd, field, previous_range_value);
+        if (op->array->compare_elems(i, i - 1)) {
+          /* Get a SEL_TREE for "-inf < X < c_i" interval */
+          op->array->value_to_item(i, value_item);
+          tree2 = get_mm_parts(thd, param, prev_tables, read_tables, op, field,
+                               Item_func::LT_FUNC, value_item);
+          if (!tree2) {
+            tree = nullptr;
+            break;
+          }
+
+          /* Change all intervals to be "c_{i-1} < X < c_i" */
+          for (uint idx = 0; idx < param->keys; idx++) {
+            SEL_ARG *last_val;
+            if (tree->keys[idx] && tree2->keys[idx] &&
+                ((last_val = tree->keys[idx]->root->last()))) {
+              SEL_ARG *new_interval = tree2->keys[idx]->root;
+              new_interval->min_value = last_val->max_value;
+              // We set the max value of the previous range as the beginning
+              // for this range interval. However we need values higher than
+              // this value:
+              // For ex: If the range is "not in (1,2)" we first construct
+              // X < 1 before this loop and add 1 < X < 2 in this loop and
+              // follow it up with 2 < X below.
+              // While fetching values for the second interval, we set
+              // "NEAR_MIN" flag so that we fetch values higher than "1".
+              // However, when the values specified are not compatible
+              // with the field that is being compared to, they are rounded
+              // off.
+              // For the example above, if the range given was "not in (0.9,
+              // 1.9)", range optimizer rounds of the values to (1,2). In such
+              // a case, setting the flag to "NEAR_MIN" is not right. Because
+              // we need values higher than "0.9" not "1". We check this
+              // before we set the flag below.
+              if (cmp_value <= 0)
+                new_interval->min_flag = NEAR_MIN;
+              else
+                new_interval->min_flag = 0;
+
+              /*
+                If the interval is over a partial keypart, the
+                interval must be "c_{i-1} <= X < c_i" instead of
+                "c_{i-1} < X < c_i". Reason:
+
+                Consider a table with a column "my_col VARCHAR(3)",
+                and an index with definition
+                "INDEX my_idx my_col(1)". If the table contains rows
+                with my_col values "f" and "foo", the index will not
+                distinguish the two rows.
+
+                Note that tree_or() below will effectively merge
+                this range with the range created for c_{i-1} and
+                we'll eventually end up with only one range:
+                "NULL < X".
+
+                Partitioning indexes are never partial.
+              */
+              if (param->using_real_indexes) {
+                const KEY key = param->table->key_info[param->real_keynr[idx]];
+                const KEY_PART_INFO *kpi = key.key_part + new_interval->part;
+
+                if (kpi->key_part_flag & HA_PART_KEY_SEG)
+                  new_interval->min_flag = 0;
+              }
+            }
+          }
+          /*
+            The following doesn't try to allocate memory so no need to
+            check for NULL.
+          */
+          tree = tree_or(param, remove_jump_scans, tree, tree2);
+        }
+      }
+
+      if (tree && tree->type != SEL_TREE::IMPOSSIBLE) {
+        /*
+          Get the SEL_TREE for the last "c_last < X < +inf" interval
+          (value_item cotains c_last already)
+        */
+        tree2 = get_mm_parts(thd, param, prev_tables, read_tables, op, field,
+                             Item_func::GT_FUNC, value_item);
+        tree = tree_or(param, remove_jump_scans, tree, tree2);
+      }
+      return tree;
+    } else {
+      SEL_TREE *tree = get_ne_mm_tree(thd, param, prev_tables, read_tables,
+                                      remove_jump_scans, op, field,
+                                      op->arguments()[1], op->arguments()[1]);
+      if (tree) {
+        Item **arg, **end;
+        for (arg = op->arguments() + 2, end = arg + op->argument_count() - 2;
+             arg < end; arg++) {
+          tree = tree_and(
+              param, tree,
+              get_ne_mm_tree(thd, param, prev_tables, read_tables,
+                             remove_jump_scans, op, field, *arg, *arg));
+        }
+      }
+      return tree;
+    }
+    return nullptr;
+  }
+
+  // The expression is IN, not negated.
+  if (predicand->type() == Item::FIELD_ITEM) {
+    // The expression is (<column>) IN (...)
+    Field *field = down_cast<Item_field *>(predicand)->field;
+    SEL_TREE *tree =
+        get_mm_parts(thd, param, prev_tables, read_tables, op, field,
+                     Item_func::EQ_FUNC, op->arguments()[1]);
+    if (tree) {
+      Item **arg, **end;
+      for (arg = op->arguments() + 2, end = arg + op->argument_count() - 2;
+           arg < end; arg++) {
+        tree = tree_or(param, remove_jump_scans, tree,
+                       get_mm_parts(thd, param, prev_tables, read_tables, op,
+                                    field, Item_func::EQ_FUNC, *arg));
+      }
+    }
+    return tree;
+  }
+  if (predicand->type() == Item::ROW_ITEM) {
+    /*
+      The expression is (<column>,...) IN (...)
+
+      We iterate over the rows on the rhs of the in predicate,
+      building an OR tree of ANDs, a.k.a. a DNF expression out of this. E.g:
+
+      (col1, col2) IN ((const1, const2), (const3, const4))
+      becomes
+      (col1 = const1 AND col2 = const2) OR (col1 = const3 AND col2 = const4)
+    */
+    SEL_TREE *or_tree = &null_sel_tree;
+    Item_row *row_predicand = down_cast<Item_row *>(predicand);
+
+    // Iterate over the rows on the rhs of the in predicate, building an OR.
+    for (uint i = 1; i < op->argument_count(); ++i) {
+      /*
+        We only support row value expressions. Some optimizations rewrite
+        the Item tree, and we don't handle that.
+      */
+      Item *in_list_item = op->arguments()[i];
+      if (in_list_item->type() != Item::ROW_ITEM) return nullptr;
+      Item_row *row = static_cast<Item_row *>(in_list_item);
+
+      // Iterate over the columns, building an AND tree.
+      SEL_TREE *and_tree = nullptr;
+      for (uint j = 0; j < row_predicand->cols(); ++j) {
+        Item *item = row_predicand->element_index(j);
+
+        // We only support columns in the row on the lhs of the in predicate.
+        if (item->type() != Item::FIELD_ITEM) return nullptr;
+        Field *field = static_cast<Item_field *>(item)->field;
+
+        Item *value = row->element_index(j);
+
+        SEL_TREE *and_expr = get_mm_parts(thd, param, prev_tables, read_tables,
+                                          op, field, Item_func::EQ_FUNC, value);
+
+        and_tree = tree_and(param, and_tree, and_expr);
+        /*
+          Short-circuit evaluation: If and_expr is NULL then no key part in
+          this disjunct can be used as a search key. Or in other words the
+          condition is always true. Hence the whole disjunction is always true.
+        */
+        if (and_tree == nullptr) return nullptr;
+      }
+      or_tree = tree_or(param, remove_jump_scans, and_tree, or_tree);
+    }
+    return or_tree;
+  }
+  return nullptr;
+}
+
+/**
+  Factory function to build a SEL_TREE from a JSON_OVERLAPS or JSON_CONTAINS
+  functions
+
+  \verbatim
+    This function builds SEL_TREE out of JSON_OEVRLAPS() of form:
+      JSON_OVERLAPS(typed_array_field, "[<val>,...,<val>]")
+      JSON_OVERLAPS("[<val>,...,<val>]", typed_array_field)
+      JSON_CONTAINS(typed_array_field, "[<val>,...,<val>]")
+    where
+      typed_array_field is a field which has multi-valued index defined on it
+      <val>             each value in the array is coercible to the array's
+                        type
+    These conditions are pre-checked in substitute_gc().
+  \endverbatim
+  @param thd        Thread handle
+  @param param      Information on 'just about everything'.
+  @param prev_tables See test_quick_select()
+  @param read_tables See test_quick_select()
+  @param remove_jump_scans See get_mm_tree()
+  @param predicand  the typed array JSON_CONTAIN's argument
+  @param op         The 'JSON_OVERLAPS' operator itself.
+
+  @returns
+    non-NULL constructed SEL_TREE
+    NULL     in case of any error
+*/
+
+static SEL_TREE *get_func_mm_tree_from_json_overlaps_contains(
+    THD *thd, RANGE_OPT_PARAM *param, table_map prev_tables,
+    table_map read_tables, bool remove_jump_scans, Item *predicand,
+    Item_func *op) {
+  if (param->has_errors()) return nullptr;
+
+  // The expression is JSON_OVERLAPS(<array_field>,<JSON array/scalar>), or
+  // The expression is JSON_OVERLAPS(<JSON array/scalar>, <array_field>), or
+  // The expression is JSON_CONTAINS(<array_field>, <JSON array/scalar>)
+  if (predicand->type() == Item::FIELD_ITEM && predicand->returns_array()) {
+    Json_wrapper wr, elt;
+    String str;
+    uint values;
+    if (op->functype() == Item_func::JSON_OVERLAPS) {
+      // If the predicand is the 1st arg, then the values arg is 2nd.
+      values = (predicand == op->arguments()[0]) ? 1 : 0;
+    } else {
+      assert(op->functype() == Item_func::JSON_CONTAINS);
+      values = 1;
+    }
+    if (get_json_wrapper(op->arguments(), values, &str, op->func_name(), &wr))
+      return nullptr; /* purecov: inspected */
+
+    // Should be pre-checked already
+    assert(!(op->arguments()[values])->null_value &&
+           wr.type() != enum_json_type::J_OBJECT &&
+           wr.type() != enum_json_type::J_ERROR);
+    if (wr.length() == 0) return nullptr;
+
+    Field_typed_array *field = down_cast<Field_typed_array *>(
+        down_cast<Item_field *>(predicand)->field);
+    if (wr.type() == enum_json_type::J_ARRAY)
+      wr.remove_duplicates(
+          field->type() == MYSQL_TYPE_VARCHAR ? field->charset() : nullptr);
+    size_t i = 0;
+    const size_t len = (wr.type() == enum_json_type::J_ARRAY) ? wr.length() : 1;
+    // Skip leading JSON null values as they can't be indexed and thus doesn't
+    // exist in index.
+    while (i < len && wr[i].type() == enum_json_type::J_NULL) ++i;
+    // No non-null values were found.
+    if (i == len) return nullptr;
+
+    // Fake const table for get_mm_parts, as we're using constants from JSON
+    // array
+    const bool save_const = field->table->const_table;
+    field->table->const_table = true;
+
+    field->set_notnull();
+
+    // Get the SEL_ARG tree for the first non-null element..
+    elt = wr[i++];
+    field->coerce_json_value(&elt, true, nullptr);
+    SEL_TREE *tree =
+        get_mm_parts(thd, param, prev_tables, read_tables, op, field,
+                     Item_func::EQ_FUNC, down_cast<Item_field *>(predicand));
+    // .. and OR with others
+    if (tree) {
+      for (; i < len; i++) {
+        elt = wr[i];
+        field->coerce_json_value(&elt, true, nullptr);
+        tree = tree_or(param, remove_jump_scans, tree,
+                       get_mm_parts(thd, param, prev_tables, read_tables, op,
+                                    field, Item_func::EQ_FUNC,
+                                    down_cast<Item_field *>(predicand)));
+        if (!tree)  // OOM
+          break;
+      }
+    }
+    field->table->const_table = save_const;
+    return tree;
+  }
+  return nullptr;
+}
+
+/**
+  Build a SEL_TREE for a simple predicate.
+
+  @param param     RANGE_OPT_PARAM from test_quick_select
+  @param remove_jump_scans See get_mm_tree()
+  @param predicand field in the predicate
+  @param cond_func item for the predicate
+  @param value     constant in the predicate
+  @param inv       true <> NOT cond_func is considered
+                  (makes sense only when cond_func is BETWEEN or IN)
+
+  @return Pointer to the built tree.
+
+  @todo Remove the appaling hack that 'value' can be a 1 cast to an Item*.
+*/
+
+static SEL_TREE *get_func_mm_tree(THD *thd, RANGE_OPT_PARAM *param,
+                                  table_map prev_tables, table_map read_tables,
+                                  bool remove_jump_scans, Item *predicand,
+                                  Item_func *cond_func, Item *value, bool inv) {
+  SEL_TREE *tree = nullptr;
+  DBUG_TRACE;
+
+  if (param->has_errors()) return nullptr;
+
+  switch (cond_func->functype()) {
+    case Item_func::XOR_FUNC:
+      return nullptr;  // Always true (don't use range access on XOR).
+      break;           // See WL#5800
+
+    case Item_func::NE_FUNC:
+      if (predicand->type() == Item::FIELD_ITEM) {
+        Field *field = down_cast<Item_field *>(predicand)->field;
+        tree =
+            get_ne_mm_tree(thd, param, prev_tables, read_tables,
+                           remove_jump_scans, cond_func, field, value, value);
+      }
+      break;
+
+    case Item_func::BETWEEN:
+      if (predicand->type() == Item::FIELD_ITEM) {
+        Field *field = down_cast<Item_field *>(predicand)->field;
+
+        if (!value) {
+          if (inv) {
+            tree = get_ne_mm_tree(thd, param, prev_tables, read_tables,
+                                  remove_jump_scans, cond_func, field,
+                                  cond_func->arguments()[1],
+                                  cond_func->arguments()[2]);
+          } else {
+            tree = get_mm_parts(thd, param, prev_tables, read_tables, cond_func,
+                                field, Item_func::GE_FUNC,
+                                cond_func->arguments()[1]);
+            if (tree) {
+              tree = tree_and(param, tree,
+                              get_mm_parts(thd, param, prev_tables, read_tables,
+                                           cond_func, field, Item_func::LE_FUNC,
+                                           cond_func->arguments()[2]));
+            }
+          }
+        } else
+          tree = get_mm_parts(
+              thd, param, prev_tables, read_tables, cond_func, field,
+              (inv ? (value == reinterpret_cast<Item *>(1) ? Item_func::GT_FUNC
+                                                           : Item_func::LT_FUNC)
+                   : (value == reinterpret_cast<Item *>(1)
+                          ? Item_func::LE_FUNC
+                          : Item_func::GE_FUNC)),
+              cond_func->arguments()[0]);
+      }
+      break;
+    case Item_func::IN_FUNC: {
+      Item_func_in *in_pred = down_cast<Item_func_in *>(cond_func);
+      tree = get_func_mm_tree_from_in_predicate(thd, param, prev_tables,
+                                                read_tables, remove_jump_scans,
+                                                predicand, in_pred, inv);
+    } break;
+    case Item_func::JSON_CONTAINS:
+    case Item_func::JSON_OVERLAPS: {
+      tree = get_func_mm_tree_from_json_overlaps_contains(
+          thd, param, prev_tables, read_tables, remove_jump_scans, predicand,
+          cond_func);
+    } break;
+
+    case Item_func::MEMBER_OF_FUNC:
+      if (predicand->type() == Item::FIELD_ITEM && predicand->returns_array()) {
+        Field_typed_array *field = down_cast<Field_typed_array *>(
+            down_cast<Item_field *>(predicand)->field);
+        Item *arg = cond_func->arguments()[0];
+
+        Json_wrapper wr;
+        if (arg->val_json(&wr)) {
+          break;
+        }
+
+        assert(!arg->null_value && wr.type() != enum_json_type::J_ERROR);
+
+        if (wr.type() == enum_json_type::J_NULL) {
+          break;
+        }
+
+        // Fake const table for get_mm_parts(), as we are using constants from
+        // JSON array
+
+        const bool save_const = field->table->const_table;
+        field->table->const_table = true;
+        field->set_notnull();
+        field->coerce_json_value(&wr, true, nullptr);
+
+        tree = get_mm_parts(thd, param, prev_tables, read_tables, cond_func,
+                            field, Item_func::EQ_FUNC, predicand);
+
+        field->table->const_table = save_const;
+      }
+      break;
+
+    default:
+      if (predicand->type() == Item::FIELD_ITEM) {
+        Field *field = down_cast<Item_field *>(predicand)->field;
+
+        /*
+           Here the function for the following predicates are processed:
+           <, <=, =, >=, >, LIKE, IS NULL, IS NOT NULL and GIS functions.
+           If the predicate is of the form (value op field) it is handled
+           as the equivalent predicate (field rev_op value), e.g.
+           2 <= a is handled as a >= 2.
+        */
+        Item_func::Functype func_type =
+            (value != cond_func->arguments()[0])
+                ? cond_func->functype()
+                : ((Item_bool_func2 *)cond_func)->rev_functype();
+        tree = get_mm_parts(thd, param, prev_tables, read_tables, cond_func,
+                            field, func_type, value);
+      }
+  }
+
+  return tree;
+}
+
+/*
+  Build conjunction of all SEL_TREEs for a simple predicate applying equalities
+
+  SYNOPSIS
+    get_full_func_mm_tree()
+      param       RANGE_OPT_PARAM from test_quick_select
+     prev_tables  See test_quick_select()
+     read_tables  See test_quick_select()
+      remove_jump_scans See get_mm_tree()
+      predicand   column or row constructor in the predicate's left-hand side.
+      op          Item for the predicate operator
+      value       constant in the predicate (or a field already read from
+                  a table in the case of dynamic range access)
+                  For BETWEEN it contains the number of the field argument.
+      inv         If true, the predicate is negated, e.g. NOT IN.
+                  (makes sense only when cond_func is BETWEEN or IN)
+
+  DESCRIPTION
+    For a simple SARGable predicate of the form (f op c), where f is a field and
+    c is a constant, the function builds a conjunction of all SEL_TREES that can
+    be obtained by the substitution of f for all different fields equal to f.
+
+  NOTES
+    If the WHERE condition contains a predicate (fi op c),
+    then not only SELL_TREE for this predicate is built, but
+    the trees for the results of substitution of fi for
+    each fj belonging to the same multiple equality as fi
+    are built as well.
+    E.g. for WHERE t1.a=t2.a AND t2.a > 10
+    a SEL_TREE for t2.a > 10 will be built for quick select from t2
+    and
+    a SEL_TREE for t1.a > 10 will be built for quick select from t1.
+
+    A BETWEEN predicate of the form (fi [NOT] BETWEEN c1 AND c2) is treated
+    in a similar way: we build a conjuction of trees for the results
+    of all substitutions of fi for equal fj.
+    Yet a predicate of the form (c BETWEEN f1i AND f2i) is processed
+    differently. It is considered as a conjuction of two SARGable
+    predicates (f1i <= c) and (f2i <=c) and the function get_full_func_mm_tree
+    is called for each of them separately producing trees for
+       AND j (f1j <=c ) and AND j (f2j <= c)
+    After this these two trees are united in one conjunctive tree.
+    It's easy to see that the same tree is obtained for
+       AND j,k (f1j <=c AND f2k<=c)
+    which is equivalent to
+       AND j,k (c BETWEEN f1j AND f2k).
+    The validity of the processing of the predicate (c NOT BETWEEN f1i AND f2i)
+    which equivalent to (f1i > c OR f2i < c) is not so obvious. Here the
+    function get_full_func_mm_tree is called for (f1i > c) and (f2i < c)
+    producing trees for AND j (f1j > c) and AND j (f2j < c). Then this two
+    trees are united in one OR-tree. The expression
+      (AND j (f1j > c) OR AND j (f2j < c)
+    is equivalent to the expression
+      AND j,k (f1j > c OR f2k < c)
+    which is just a translation of
+      AND j,k (c NOT BETWEEN f1j AND f2k)
+
+    In the cases when one of the items f1, f2 is a constant c1 we do not create
+    a tree for it at all. It works for BETWEEN predicates but does not
+    work for NOT BETWEEN predicates as we have to evaluate the expression
+    with it. If it is true then the other tree can be completely ignored.
+    We do not do it now and no trees are built in these cases for
+    NOT BETWEEN predicates.
+
+    As to IN predicates only ones of the form (f IN (c1,...,cn)),
+    where f1 is a field and c1,...,cn are constant, are considered as
+    SARGable. We never try to narrow the index scan using predicates of
+    the form (c IN (c1,...,f,...,cn)).
+
+  RETURN
+    Pointer to the tree representing the built conjunction of SEL_TREEs
+*/
+
+static SEL_TREE *get_full_func_mm_tree(THD *thd, RANGE_OPT_PARAM *param,
+                                       table_map prev_tables,
+                                       table_map read_tables,
+                                       table_map current_table,
+                                       bool remove_jump_scans, Item *predicand,
+                                       Item_func *op, Item *value, bool inv) {
+  SEL_TREE *tree = nullptr;
+  SEL_TREE *ftree = nullptr;
+  const table_map param_comp = ~(prev_tables | read_tables | current_table);
+  DBUG_TRACE;
+
+  if (param->has_errors()) return nullptr;
+
+  /*
+    Here we compute a set of tables that we consider as constants
+    suppliers during execution of the SEL_TREE that we produce below.
+  */
+  table_map ref_tables = 0;
+  for (uint i = 0; i < op->arg_count; i++) {
+    Item *arg = op->arguments()[i]->real_item();
+    if (arg != predicand) ref_tables |= arg->used_tables();
+  }
+  if (predicand->type() == Item::FIELD_ITEM) {
+    Item_field *item_field = static_cast<Item_field *>(predicand);
+    Field *field = item_field->field;
+
+    if (!((ref_tables | item_field->table_ref->map()) & param_comp))
+      ftree = get_func_mm_tree(thd, param, prev_tables, read_tables,
+                               remove_jump_scans, predicand, op, value, inv);
+    Item_equal *item_equal = item_field->item_equal;
+    if (item_equal != nullptr) {
+      for (Item_field &item : item_equal->get_fields()) {
+        Field *f = item.field;
+        if (!field->eq(f) &&
+            !((ref_tables | item.table_ref->map()) & param_comp)) {
+          tree = get_func_mm_tree(thd, param, prev_tables, read_tables,
+                                  remove_jump_scans, &item, op, value, inv);
+          ftree = !ftree ? tree : tree_and(param, ftree, tree);
+        }
+      }
+    }
+  } else if (predicand->type() == Item::ROW_ITEM) {
+    ftree = get_func_mm_tree(thd, param, prev_tables, read_tables,
+                             remove_jump_scans, predicand, op, value, inv);
+    return ftree;
+  }
+  return ftree;
+}
+
+/**
+  The Range Analysis Module, which finds range access alternatives
+  applicable to single or multi-index (UNION) access. The function
+  does not calculate or care about the cost of the different
+  alternatives.
+
+  get_mm_tree() employs a relaxed boolean algebra where the solution
+  may be bigger than what the rules of boolean algebra accept. In
+  other words, get_mm_tree() may return range access plans that will
+  read more rows than the input conditions dictate. In it's simplest
+  form, consider a condition on two fields indexed by two different
+  indexes:
+
+     "WHERE fld1 > 'x' AND fld2 > 'y'"
+
+  In this case, there are two single-index range access alternatives.
+  No matter which access path is chosen, rows that are not in the
+  result set may be read.
+
+  In the case above, get_mm_tree() will create range access
+  alternatives for both indexes, so boolean algebra is still correct.
+  In other cases, however, the conditions are too complex to be used
+  without relaxing the rules. This typically happens when ORing a
+  conjunction to a multi-index disjunctions (@see e.g.
+  imerge_list_or_tree()). When this happens, the range optimizer may
+  choose to ignore conjunctions (any condition connected with AND). The
+  effect of this is that the result includes a "bigger" solution than
+  necessary. This is OK since all conditions will be used as filters
+  after row retrieval.
+
+  @see SEL_TREE::keys and SEL_TREE::merges for details of how single
+  and multi-index range access alternatives are stored.j
+
+  remove_jump_scans: Aggressively remove "scans" that do not have
+  conditions on first keyparts. Such scans are usable when doing partition
+  pruning but not regular range optimization.
+*/
+SEL_TREE *get_mm_tree(THD *thd, RANGE_OPT_PARAM *param, table_map prev_tables,
+                      table_map read_tables, table_map current_table,
+                      bool remove_jump_scans, Item *cond) {
+  SEL_TREE *tree = nullptr;
+  SEL_TREE *ftree = nullptr;
+  bool inv = false;
+  Item *value = nullptr;
+  DBUG_TRACE;
+
+  if (param->has_errors()) return nullptr;
+
+  if (cond->type() == Item::COND_ITEM) {
+    List_iterator<Item> li(*((Item_cond *)cond)->argument_list());
+
+    if (((Item_cond *)cond)->functype() == Item_func::COND_AND_FUNC) {
+      tree = nullptr;
+      Item *item;
+      while ((item = li++)) {
+        SEL_TREE *new_tree =
+            get_mm_tree(thd, param, prev_tables, read_tables, current_table,
+                        remove_jump_scans, item);
+        if (param->has_errors()) return nullptr;
+        tree = tree_and(param, tree, new_tree);
+        dbug_print_tree("after_and", tree, param);
+        if (tree && tree->type == SEL_TREE::IMPOSSIBLE) break;
+      }
+    } else {  // Item OR
+      tree = get_mm_tree(thd, param, prev_tables, read_tables, current_table,
+                         remove_jump_scans, li++);
+      if (param->has_errors()) return nullptr;
+      if (tree) {
+        Item *item;
+        while ((item = li++)) {
+          SEL_TREE *new_tree =
+              get_mm_tree(thd, param, prev_tables, read_tables, current_table,
+                          remove_jump_scans, item);
+          if (new_tree == nullptr || param->has_errors()) return nullptr;
+          tree = tree_or(param, remove_jump_scans, tree, new_tree);
+          dbug_print_tree("after_or", tree, param);
+          if (tree == nullptr || tree->type == SEL_TREE::ALWAYS) break;
+        }
+      }
+    }
+    dbug_print_tree("tree_returned", tree, param);
+    return tree;
+  }
+  if (cond->const_item() && !cond->is_expensive()) {
+    const SEL_TREE::Type type =
+        cond->val_int() ? SEL_TREE::ALWAYS : SEL_TREE::IMPOSSIBLE;
+    tree = new (param->temp_mem_root)
+        SEL_TREE(type, param->temp_mem_root, param->keys);
+
+    if (param->has_errors()) return nullptr;
+    dbug_print_tree("tree_returned", tree, param);
+    return tree;
+  }
+
+  table_map ref_tables = 0;
+  table_map param_comp = ~(prev_tables | read_tables | current_table);
+  if (cond->type() != Item::FUNC_ITEM) {  // Should be a field
+    ref_tables = cond->used_tables();
+    if ((ref_tables & current_table) ||
+        (ref_tables & ~(prev_tables | read_tables)))
+      return nullptr;
+    return new (param->temp_mem_root)
+        SEL_TREE(SEL_TREE::MAYBE, param->temp_mem_root, param->keys);
+  }
+
+  Item_func *cond_func = (Item_func *)cond;
+  if (cond_func->functype() == Item_func::BETWEEN ||
+      cond_func->functype() == Item_func::IN_FUNC)
+    inv = ((Item_func_opt_neg *)cond_func)->negated;
+  else {
+    Item_func::optimize_type opt_type = cond_func->select_optimize(thd);
+    if (opt_type == Item_func::OPTIMIZE_NONE) return nullptr;
+  }
+
+  /*
+    Notice that all fields that are outer references are const during
+    the execution and should not be considered for range analysis like
+    fields coming from the local query block are.
+  */
+  switch (cond_func->functype()) {
+    case Item_func::BETWEEN: {
+      Item *const arg_left = cond_func->arguments()[0];
+
+      if (!arg_left->is_outer_reference() &&
+          arg_left->real_item()->type() == Item::FIELD_ITEM) {
+        Item_field *field_item = down_cast<Item_field *>(arg_left->real_item());
+        ftree = get_full_func_mm_tree(thd, param, prev_tables, read_tables,
+                                      current_table, remove_jump_scans,
+                                      field_item, cond_func, nullptr, inv);
+      }
+
+      /*
+        Concerning the code below see the NOTES section in
+        the comments for the function get_full_func_mm_tree()
+      */
+      for (uint i = 1; i < cond_func->arg_count; i++) {
+        Item *const arg = cond_func->arguments()[i];
+
+        if (!arg->is_outer_reference() &&
+            arg->real_item()->type() == Item::FIELD_ITEM) {
+          Item_field *field_item = down_cast<Item_field *>(arg->real_item());
+          SEL_TREE *tmp = get_full_func_mm_tree(
+              thd, param, prev_tables, read_tables, current_table,
+              remove_jump_scans, field_item, cond_func,
+              reinterpret_cast<Item *>(i), inv);
+          if (inv) {
+            tree = !tree ? tmp : tree_or(param, remove_jump_scans, tree, tmp);
+            if (tree == nullptr) break;
+          } else
+            tree = tree_and(param, tree, tmp);
+        } else if (inv) {
+          tree = nullptr;
+          break;
+        }
+      }
+
+      ftree = tree_and(param, ftree, tree);
+      break;
+    }  // end case Item_func::BETWEEN
+
+    case Item_func::JSON_CONTAINS:
+    case Item_func::JSON_OVERLAPS:
+    case Item_func::MEMBER_OF_FUNC:
+    case Item_func::IN_FUNC: {
+      Item *predicand = cond_func->key_item();
+      if (!predicand) return nullptr;
+      predicand = predicand->real_item();
+      if (predicand->type() != Item::FIELD_ITEM &&
+          predicand->type() != Item::ROW_ITEM)
+        return nullptr;
+      ftree = get_full_func_mm_tree(thd, param, prev_tables, read_tables,
+                                    current_table, remove_jump_scans, predicand,
+                                    cond_func, nullptr, inv);
+      break;
+    }  // end case Item_func::IN_FUNC
+
+    case Item_func::MULT_EQUAL_FUNC: {
+      Item_equal *item_equal = (Item_equal *)cond;
+      if (!(value = item_equal->get_const())) return nullptr;
+      ref_tables = value->used_tables();
+      for (Item_field &field_item : item_equal->get_fields()) {
+        Field *field = field_item.field;
+        if (!((ref_tables | field_item.table_ref->map()) & param_comp)) {
+          tree = get_mm_parts(thd, param, prev_tables, read_tables, item_equal,
+                              field, Item_func::EQ_FUNC, value);
+          ftree = !ftree ? tree : tree_and(param, ftree, tree);
+        }
+      }
+
+      dbug_print_tree("tree_returned", ftree, param);
+      return ftree;
+    }  // end case Item_func::MULT_EQUAL_FUNC
+
+    default: {
+      Item *const arg_left = cond_func->arguments()[0];
+
+      assert(!ftree);
+      if (!arg_left->is_outer_reference() &&
+          arg_left->real_item()->type() == Item::FIELD_ITEM) {
+        Item_field *field_item = down_cast<Item_field *>(arg_left->real_item());
+        value = cond_func->arg_count > 1 ? cond_func->arguments()[1] : nullptr;
+        ftree = get_full_func_mm_tree(thd, param, prev_tables, read_tables,
+                                      current_table, remove_jump_scans,
+                                      field_item, cond_func, value, inv);
+      }
+      /*
+        Even if get_full_func_mm_tree() was executed above and did not
+        return a range predicate it may still be possible to create one
+        by reversing the order of the operands. Note that this only
+        applies to predicates where both operands are fields. Example: A
+        query of the form
+
+           WHERE t1.a OP t2.b
+
+        In this case, arguments()[0] == t1.a and arguments()[1] == t2.b.
+        When creating range predicates for t2, get_full_func_mm_tree()
+        above will return NULL because 'field' belongs to t1 and only
+        predicates that applies to t2 are of interest. In this case a
+        call to get_full_func_mm_tree() with reversed operands (see
+        below) may succeed.
+      */
+      Item *arg_right;
+      if (!ftree && cond_func->have_rev_func() &&
+          (arg_right = cond_func->arguments()[1]) &&
+          !arg_right->is_outer_reference() &&
+          arg_right->real_item()->type() == Item::FIELD_ITEM) {
+        Item_field *field_item =
+            down_cast<Item_field *>(arg_right->real_item());
+        value = arg_left;
+        ftree = get_full_func_mm_tree(thd, param, prev_tables, read_tables,
+                                      current_table, remove_jump_scans,
+                                      field_item, cond_func, value, inv);
+      }
+    }  // end case default
+  }    // end switch
+
+  dbug_print_tree("tree_returned", ftree, param);
+  return ftree;
+}
+
+/**
+  Test whether a comparison operator is a spatial comparison
+  operator, i.e. Item_func::SP_*.
+
+  Used to check if range access using operator 'op_type' is applicable
+  for a non-spatial index.
+
+  @param   op_type  The comparison operator.
+  @return  true if 'op_type' is a spatial comparison operator, false otherwise.
+
+*/
+static bool is_spatial_operator(Item_func::Functype op_type) {
+  switch (op_type) {
+    case Item_func::SP_EQUALS_FUNC:
+    case Item_func::SP_DISJOINT_FUNC:
+    case Item_func::SP_INTERSECTS_FUNC:
+    case Item_func::SP_TOUCHES_FUNC:
+    case Item_func::SP_CROSSES_FUNC:
+    case Item_func::SP_WITHIN_FUNC:
+    case Item_func::SP_CONTAINS_FUNC:
+    case Item_func::SP_COVEREDBY_FUNC:
+    case Item_func::SP_COVERS_FUNC:
+    case Item_func::SP_OVERLAPS_FUNC:
+    case Item_func::SP_STARTPOINT:
+    case Item_func::SP_ENDPOINT:
+    case Item_func::SP_EXTERIORRING:
+    case Item_func::SP_POINTN:
+    case Item_func::SP_GEOMETRYN:
+    case Item_func::SP_INTERIORRINGN:
+      return true;
+    default:
+      return false;
+  }
+}
+
+static SEL_TREE *get_mm_parts(THD *thd, RANGE_OPT_PARAM *param,
+                              table_map prev_tables, table_map read_tables,
+                              Item_func *cond_func, Field *field,
+                              Item_func::Functype type, Item *value) {
+  DBUG_TRACE;
+
+  if (param->has_errors()) return nullptr;
+
+  if (field->table != param->table) return nullptr;
+
+  KEY_PART *key_part = param->key_parts;
+  KEY_PART *end = param->key_parts_end;
+  SEL_TREE *tree = nullptr;
+  if (value && value->used_tables() & ~(prev_tables | read_tables))
+    return nullptr;
+  for (; key_part != end; key_part++) {
+    if (field->eq(key_part->field)) {
+      /*
+        Cannot do range access for spatial operators when a
+        non-spatial index is used.
+      */
+      if (key_part->image_type != Field::itMBR &&
+          is_spatial_operator(cond_func->functype()))
+        continue;
+
+      SEL_ROOT *sel_root = nullptr;
+      if (!tree && !(tree = new (param->temp_mem_root)
+                         SEL_TREE(param->temp_mem_root, param->keys)))
+        return nullptr;  // OOM
+      if (!value || !(value->used_tables() & ~read_tables)) {
+        sel_root = get_mm_leaf(thd, param, cond_func, key_part->field, key_part,
+                               type, value);
+        if (!sel_root) continue;
+        if (sel_root->type == SEL_ROOT::Type::IMPOSSIBLE) {
+          tree->type = SEL_TREE::IMPOSSIBLE;
+          return tree;
+        }
+      } else {
+        /*
+          The index may not be used by dynamic range access unless
+          'field' and 'value' are comparable.
+        */
+        if (!comparable_in_index(cond_func, key_part->field,
+                                 key_part->image_type, type, value)) {
+          warn_index_not_applicable(thd, param, key_part->key, field);
+          return nullptr;
+        }
+
+        if (!(sel_root = new (param->temp_mem_root)
+                  SEL_ROOT(param->temp_mem_root, SEL_ROOT::Type::MAYBE_KEY)))
+          return nullptr;  // OOM
+      }
+      sel_root->root->part = (uchar)key_part->part;
+      tree->set_key(key_part->key,
+                    sel_add(tree->release_key(key_part->key), sel_root));
+      tree->keys_map.set_bit(key_part->key);
+    }
+  }
+
+  if (tree && tree->merges.is_empty() && tree->keys_map.is_clear_all())
+    tree = nullptr;
+  return tree;
+}
+
+/**
+  Saves 'value' in 'field' and handles potential type conversion
+  problems.
+
+  @param [out] tree                 The SEL_ROOT leaf under construction. If
+                                    an always false predicate is found it is
+                                    modified to point to a SEL_ROOT with
+                                    type == SEL_ROOT::Type::IMPOSSIBLE.
+  @param value                      The Item that contains a value that shall
+                                    be stored in 'field'.
+  @param comp_op                    Comparison operator: >, >=, <=> etc.
+  @param field                      The field that 'value' is stored into.
+  @param [out] impossible_cond_cause Set to a descriptive string if an
+                                    impossible condition is found.
+  @param memroot                    Memroot for creation of new SEL_ARG.
+  @param query_block                 Query block the field is part of
+
+  @retval false  if saving went fine and it makes sense to continue
+                 optimizing for this predicate.
+  @retval true   if always true/false predicate was found, in which
+                 case 'tree' has been modified to reflect this: NULL
+                 pointer if always true, SEL_ARG with type IMPOSSIBLE
+                 if always false.
+*/
+static bool save_value_and_handle_conversion(SEL_ROOT **tree, Item *value,
+                                             const Item_func::Functype comp_op,
+                                             Field *field,
+                                             const char **impossible_cond_cause,
+                                             MEM_ROOT *memroot,
+                                             Query_block *query_block) {
+  // A SEL_ARG should not have been created for this predicate yet.
+  assert(*tree == nullptr);
+
+  THD *const thd = current_thd;
+
+  if (!(value->const_item() || thd->lex->is_query_tables_locked())) {
+    /*
+      We cannot evaluate the value yet (i.e. required tables are not yet
+      locked.)
+      This is the case of prune_partitions() called during
+      Query_block::prepare().
+    */
+    return true;
+  }
+
+  /*
+    Don't evaluate subqueries during optimization if they are disabled. This
+    function can be called during execution when doing dynamic range access, and
+    we only want to disable subquery evaluation during optimization, so check if
+    we're in the optimization phase by calling Query_expression::is_optimized().
+  */
+  if (!query_block->master_query_expression()->is_optimized() &&
+      !evaluate_during_optimization(value, query_block))
+    return true;
+
+  // For comparison purposes allow invalid dates like 2000-01-32
+  const sql_mode_t orig_sql_mode = thd->variables.sql_mode;
+  thd->variables.sql_mode |= MODE_INVALID_DATES;
+
+  /*
+    We want to change "field > value" to "field OP V"
+    where:
+    * V is what is in "field" after we stored "value" in it via
+    save_in_field_no_warning() (such store operation may have done
+    rounding...)
+    * OP is > or >=, depending on what's correct.
+    For example, if c is an INT column,
+    "c > 2.9" is changed to "c OP 3"
+    where OP is ">=" (">" would not be correct, as 3 > 2.9, a comparison
+    done with stored_field_cmp_to_item()). And
+    "c > 3.1" is changed to "c OP 3" where OP is ">" (3 < 3.1...).
+  */
+
+  // Note that value may be a stored function call, executed here.
+  const type_conversion_status err =
+      value->save_in_field_no_warnings(field, true);
+  thd->variables.sql_mode = orig_sql_mode;
+
+  switch (err) {
+    case TYPE_OK:
+    case TYPE_NOTE_TRUNCATED:
+    case TYPE_WARN_TRUNCATED:
+      return false;
+    case TYPE_WARN_INVALID_STRING:
+      /*
+        An invalid string does not produce any rows when used with
+        equality operator.
+      */
+      if (comp_op == Item_func::EQUAL_FUNC || comp_op == Item_func::EQ_FUNC) {
+        *impossible_cond_cause = "invalid_characters_in_string";
+        goto impossible_cond;
+      }
+      /*
+        For other operations on invalid strings, we assume that the range
+        predicate is always true and let evaluate_join_record() decide
+        the outcome.
+      */
+      return true;
+    case TYPE_ERR_BAD_VALUE:
+      /*
+        In the case of incompatible values, MySQL's SQL dialect has some
+        strange interpretations. For example,
+
+            "int_col > 'foo'" is interpreted as "int_col > 0"
+
+        instead of always false. Because of this, we assume that the
+        range predicate is always true instead of always false and let
+        evaluate_join_record() decide the outcome.
+      */
+      return true;
+    case TYPE_ERR_NULL_CONSTRAINT_VIOLATION:
+      // Checking NULL value on a field that cannot contain NULL.
+      *impossible_cond_cause = "null_field_in_non_null_column";
+      goto impossible_cond;
+    case TYPE_WARN_OUT_OF_RANGE:
+      /*
+        value to store was either higher than field::max_value or lower
+        than field::min_value. The field's max/min value has been stored
+        instead.
+      */
+      if (comp_op == Item_func::EQUAL_FUNC || comp_op == Item_func::EQ_FUNC) {
+        /*
+          Independent of data type, "out_of_range_value =/<=> field" is
+          always false.
+        */
+        *impossible_cond_cause = "value_out_of_range";
+        goto impossible_cond;
+      }
+
+      // If the field is numeric, we can interpret the out of range value.
+      if ((field->type() != FIELD_TYPE_BIT) &&
+          (field->result_type() == REAL_RESULT ||
+           field->result_type() == INT_RESULT ||
+           field->result_type() == DECIMAL_RESULT)) {
+        /*
+          value to store was higher than field::max_value if
+             a) field has a value greater than 0, or
+             b) if field is unsigned and has a negative value (which, when
+                cast to unsigned, means some value higher than LLONG_MAX).
+        */
+        if ((field->val_int() > 0) ||                        // a)
+            (field->is_unsigned() && field->val_int() < 0))  // b)
+        {
+          if (comp_op == Item_func::LT_FUNC || comp_op == Item_func::LE_FUNC) {
+            /*
+              '<' or '<=' compared to a value higher than the field
+              can store is always true.
+            */
+            return true;
+          }
+          if (comp_op == Item_func::GT_FUNC || comp_op == Item_func::GE_FUNC) {
+            /*
+              '>' or '>=' compared to a value higher than the field can
+              store is always false.
+            */
+            *impossible_cond_cause = "value_out_of_range";
+            goto impossible_cond;
+          }
+        } else  // value is lower than field::min_value
+        {
+          if (comp_op == Item_func::GT_FUNC || comp_op == Item_func::GE_FUNC) {
+            /*
+              '>' or '>=' compared to a value lower than the field
+              can store is always true.
+            */
+            return true;
+          }
+          if (comp_op == Item_func::LT_FUNC || comp_op == Item_func::LE_FUNC) {
+            /*
+              '<' or '=' compared to a value lower than the field can
+              store is always false.
+            */
+            *impossible_cond_cause = "value_out_of_range";
+            goto impossible_cond;
+          }
+        }
+      }
+      /*
+        Value is out of range on a datatype where it can't be decided if
+        it was underflow or overflow. It is therefore not possible to
+        determine whether or not the condition is impossible or always
+        true and we have to assume always true.
+      */
+      return true;
+    case TYPE_NOTE_TIME_TRUNCATED:
+      if (field->type() == FIELD_TYPE_DATE &&
+          (comp_op == Item_func::GT_FUNC || comp_op == Item_func::GE_FUNC ||
+           comp_op == Item_func::LT_FUNC || comp_op == Item_func::LE_FUNC)) {
+        /*
+          We were saving DATETIME into a DATE column, the conversion went ok
+          but a non-zero time part was cut off.
+
+          In MySQL's SQL dialect, DATE and DATETIME are compared as datetime
+          values. Index over a DATE column uses DATE comparison. Changing
+          from one comparison to the other is possible:
+
+          datetime(date_col)< '2007-12-10 12:34:55' -> date_col<='2007-12-10'
+          datetime(date_col)<='2007-12-10 12:34:55' -> date_col<='2007-12-10'
+
+          datetime(date_col)> '2007-12-10 12:34:55' -> date_col>='2007-12-10'
+          datetime(date_col)>='2007-12-10 12:34:55' -> date_col>='2007-12-10'
+
+          but we'll need to convert '>' to '>=' and '<' to '<='. This will
+          be done together with other types at the end of get_mm_leaf()
+          (grep for stored_field_cmp_to_item)
+        */
+        return false;
+      }
+      if (comp_op == Item_func::EQ_FUNC || comp_op == Item_func::EQUAL_FUNC) {
+        // Equality comparison is always false when time info has been
+        // truncated.
+        goto impossible_cond;
+      }
+      return true;
+    case TYPE_ERR_OOM:
+      return true;
+      /*
+        No default here to avoid adding new conversion status codes that are
+        unhandled in this function.
+      */
+  }
+
+  assert(false);  // Should never get here.
+
+impossible_cond:
+  *tree = new (memroot) SEL_ROOT(memroot, SEL_ROOT::Type::IMPOSSIBLE);
+  return true;
+}
+
+static SEL_ROOT *get_mm_leaf(THD *thd, RANGE_OPT_PARAM *param, Item *cond_func,
+                             Field *field, KEY_PART *key_part,
+                             Item_func::Functype type, Item *value) {
+  const size_t null_bytes = field->is_nullable() ? 1 : 0;
+  bool optimize_range;
+  SEL_ROOT *tree = nullptr;
+  MEM_ROOT *const alloc = param->temp_mem_root;
+  uchar *str;
+  const char *impossible_cond_cause = nullptr;
+  DBUG_TRACE;
+
+  if (param->has_errors()) goto end;
+
+  if (!value)  // IS NULL or IS NOT NULL
+  {
+    if (field->table->pos_in_table_list->outer_join)
+      /*
+        Range scan cannot be used to scan the inner table of an outer
+        join if the predicate is IS NULL.
+      */
+      goto end;
+    if (!field->is_nullable())  // NOT NULL column
+    {
+      if (type == Item_func::ISNULL_FUNC)
+        tree = new (alloc) SEL_ROOT(alloc, SEL_ROOT::Type::IMPOSSIBLE);
+      goto end;
+    }
+    uchar *null_string =
+        static_cast<uchar *>(alloc->Alloc(key_part->store_length + 1));
+    if (!null_string) goto end;  // out of memory
+
+    TRASH(null_string, key_part->store_length + 1);
+    memcpy(null_string, is_null_string, sizeof(is_null_string));
+
+    SEL_ARG *root;
+    if (!(root = new (alloc) SEL_ARG(field, null_string, null_string,
+                                     !(key_part->flag & HA_REVERSE_SORT))))
+      goto end;                                          // out of memory
+    if (!(tree = new (alloc) SEL_ROOT(root))) goto end;  // out of memory
+    if (type == Item_func::ISNOTNULL_FUNC) {
+      root->min_flag = NEAR_MIN; /* IS NOT NULL ->  X > NULL */
+      root->max_flag = NO_MAX_RANGE;
+    }
+    goto end;
+  }
+
+  /*
+    The range access method cannot be used unless 'field' and 'value'
+    are comparable in the index. Examples of non-comparable
+    field/values: different collation, DATETIME vs TIME etc.
+  */
+  if (!comparable_in_index(cond_func, field, key_part->image_type, type,
+                           value)) {
+    warn_index_not_applicable(thd, param, key_part->key, field);
+    goto end;
+  }
+
+  if (key_part->image_type == Field::itMBR) {
+    // @todo: use is_spatial_operator() instead?
+    switch (type) {
+      case Item_func::SP_EQUALS_FUNC:
+      case Item_func::SP_DISJOINT_FUNC:
+      case Item_func::SP_INTERSECTS_FUNC:
+      case Item_func::SP_TOUCHES_FUNC:
+      case Item_func::SP_CROSSES_FUNC:
+      case Item_func::SP_WITHIN_FUNC:
+      case Item_func::SP_CONTAINS_FUNC:
+      case Item_func::SP_OVERLAPS_FUNC:
+        break;
+      default:
+        /*
+          We cannot involve spatial indexes for queries that
+          don't use MBREQUALS(), MBRDISJOINT(), etc. functions.
+        */
+        goto end;
+    }
+  }
+
+  if (param->using_real_indexes)
+    optimize_range =
+        field->optimize_range(param->real_keynr[key_part->key], key_part->part);
+  else
+    optimize_range = true;
+
+  if (type == Item_func::LIKE_FUNC) {
+    bool like_error;
+    char buff1[MAX_FIELD_WIDTH];
+    uchar *min_str, *max_str;
+    String tmp(buff1, sizeof(buff1), value->collation.collation), *res;
+    size_t length, offset, min_length, max_length;
+    size_t field_length = field->pack_length() + null_bytes;
+
+    if (!optimize_range) goto end;
+    if (!(res = value->val_str(&tmp))) {
+      tree = new (alloc) SEL_ROOT(alloc, SEL_ROOT::Type::IMPOSSIBLE);
+      goto end;
+    }
+
+    /*
+      TODO:
+      Check if this was a function. This should have be optimized away
+      in the sql_select.cc
+    */
+    if (res != &tmp) {
+      tmp.copy(*res);  // Get own copy
+      res = &tmp;
+    }
+    if (field->cmp_type() != STRING_RESULT)
+      goto end;  // Can only optimize strings
+
+    offset = null_bytes;
+    length = key_part->store_length;
+
+    if (length != key_part->length + null_bytes) {
+      /* key packed with length prefix */
+      offset += HA_KEY_BLOB_LENGTH;
+      field_length = length - HA_KEY_BLOB_LENGTH;
+    } else {
+      if (unlikely(length < field_length)) {
+        /*
+          This can only happen in a table created with UNIREG where one key
+          overlaps many fields
+        */
+        length = field_length;
+      } else
+        field_length = length;
+    }
+    length += offset;
+    if (!(min_str = (uchar *)alloc->Alloc(length * 2))) goto end;
+
+    max_str = min_str + length;
+    if (field->is_nullable()) max_str[0] = min_str[0] = 0;
+
+    Item_func_like *like_func = down_cast<Item_func_like *>(cond_func);
+
+    // We can only optimize with LIKE if the escape string is known.
+    if (!like_func->escape_is_evaluated()) goto end;
+
+    field_length -= null_bytes;
+    like_error = my_like_range(
+        field->charset(), res->ptr(), res->length(), like_func->escape(),
+        wild_one, wild_many, field_length, (char *)min_str + offset,
+        (char *)max_str + offset, &min_length, &max_length);
+    if (like_error)  // Can't optimize with LIKE
+      goto end;
+
+    if (offset != null_bytes)  // BLOB or VARCHAR
+    {
+      int2store(min_str + null_bytes, static_cast<uint16>(min_length));
+      int2store(max_str + null_bytes, static_cast<uint16>(max_length));
+    }
+    SEL_ARG *root = new (alloc)
+        SEL_ARG(field, min_str, max_str, !(key_part->flag & HA_REVERSE_SORT));
+    if (!root || !(tree = new (alloc) SEL_ROOT(root)))
+      goto end;  // out of memory
+    goto end;
+  }
+
+  if (!optimize_range && type != Item_func::EQ_FUNC &&
+      type != Item_func::EQUAL_FUNC)
+    goto end;  // Can't optimize this
+
+  /*
+    Geometry operations may mix geometry types, e.g., we may be
+    checking ST_Contains(<polygon field>, <point>). In such cases,
+    field->geom_type will be a different type than the value we're
+    trying to store in it, and the conversion will fail. Therefore,
+    set the most general geometry type while saving, and revert to the
+    original geometry type afterwards.
+  */
+  {
+    const Field::geometry_type save_geom_type =
+        (field->type() == MYSQL_TYPE_GEOMETRY) ? field->get_geometry_type()
+                                               : Field::GEOM_GEOMETRY;
+    if (field->type() == MYSQL_TYPE_GEOMETRY) {
+      down_cast<Field_geom *>(field)->geom_type = Field::GEOM_GEOMETRY;
+    }
+
+    bool always_true_or_false = save_value_and_handle_conversion(
+        &tree, value, type, field, &impossible_cond_cause, alloc,
+        param->query_block);
+
+    if (field->type() == MYSQL_TYPE_GEOMETRY &&
+        save_geom_type != Field::GEOM_GEOMETRY) {
+      down_cast<Field_geom *>(field)->geom_type = save_geom_type;
+    }
+
+    if (always_true_or_false) goto end;
+  }
+
+  /*
+    Any sargable predicate except "<=>" involving NULL as a constant is always
+    false
+  */
+  if (type != Item_func::EQUAL_FUNC && field->is_real_null()) {
+    impossible_cond_cause = "comparison_with_null_always_false";
+    tree = new (alloc) SEL_ROOT(alloc, SEL_ROOT::Type::IMPOSSIBLE);
+    goto end;
+  }
+
+  str = (uchar *)alloc->Alloc(key_part->store_length + 1);
+  if (!str) goto end;
+  if (field->is_nullable())
+    *str = (uchar)field->is_real_null();  // Set to 1 if null
+  field->get_key_image(str + null_bytes, key_part->length,
+                       key_part->image_type);
+  SEL_ARG *root;
+  root =
+      new (alloc) SEL_ARG(field, str, str, !(key_part->flag & HA_REVERSE_SORT));
+  if (!root || !(tree = new (alloc) SEL_ROOT(root))) goto end;  // out of memory
+  /*
+    Check if we are comparing an UNSIGNED integer with a negative constant.
+    In this case we know that:
+    (a) (unsigned_int [< | <=] negative_constant) == false
+    (b) (unsigned_int [> | >=] negative_constant) == true
+    In case (a) the condition is false for all values, and in case (b) it
+    is true for all values, so we can avoid unnecessary retrieval and condition
+    testing, and we also get correct comparison of unsinged integers with
+    negative integers (which otherwise fails because at query execution time
+    negative integers are cast to unsigned if compared with unsigned).
+  */
+  if (field->result_type() == INT_RESULT &&
+      value->result_type() == INT_RESULT &&
+      ((field->type() == FIELD_TYPE_BIT || field->is_unsigned()) &&
+       !(value)->unsigned_flag)) {
+    longlong item_val = value->val_int();
+    if (item_val < 0) {
+      if (type == Item_func::LT_FUNC || type == Item_func::LE_FUNC) {
+        impossible_cond_cause = "unsigned_int_cannot_be_negative";
+        tree->type = SEL_ROOT::Type::IMPOSSIBLE;
+        goto end;
+      }
+      if (type == Item_func::GT_FUNC || type == Item_func::GE_FUNC) {
+        tree = nullptr;
+        goto end;
+      }
+    }
+  }
+
+  switch (type) {
+    case Item_func::LT_FUNC:
+    case Item_func::LE_FUNC:
+      /* Don't use open ranges for partial key_segments */
+      if (!(key_part->flag & HA_PART_KEY_SEG)) {
+        /*
+          Set NEAR_MAX to read values lesser than the stored value.
+        */
+        const int cmp_value = stored_field_cmp_to_item(thd, field, value);
+        if ((type == Item_func::LT_FUNC && cmp_value >= 0) ||
+            (type == Item_func::LE_FUNC && cmp_value > 0))
+          tree->root->max_flag = NEAR_MAX;
+      }
+      if (!field->is_nullable())
+        tree->root->min_flag = NO_MIN_RANGE; /* From start */
+      else {                                 // > NULL
+        if (!(tree->root->min_value = static_cast<uchar *>(
+                  alloc->Alloc(key_part->store_length + 1))))
+          goto end;
+        TRASH(tree->root->min_value, key_part->store_length + 1);
+        memcpy(tree->root->min_value, is_null_string, sizeof(is_null_string));
+        tree->root->min_flag = NEAR_MIN;
+      }
+      break;
+    case Item_func::GT_FUNC:
+    case Item_func::GE_FUNC:
+      /* Don't use open ranges for partial key_segments */
+      if (!(key_part->flag & HA_PART_KEY_SEG)) {
+        /*
+          Set NEAR_MIN to read values greater than the stored value.
+        */
+        const int cmp_value = stored_field_cmp_to_item(thd, field, value);
+        if ((type == Item_func::GT_FUNC && cmp_value <= 0) ||
+            (type == Item_func::GE_FUNC && cmp_value < 0))
+          tree->root->min_flag = NEAR_MIN;
+      }
+      tree->root->max_flag = NO_MAX_RANGE;
+      break;
+    case Item_func::SP_EQUALS_FUNC:
+      tree->root->set_gis_index_read_function(HA_READ_MBR_EQUAL);
+      break;
+    case Item_func::SP_DISJOINT_FUNC:
+      tree->root->set_gis_index_read_function(HA_READ_MBR_DISJOINT);
+      break;
+    case Item_func::SP_INTERSECTS_FUNC:
+      tree->root->set_gis_index_read_function(HA_READ_MBR_INTERSECT);
+      break;
+    case Item_func::SP_TOUCHES_FUNC:
+      tree->root->set_gis_index_read_function(HA_READ_MBR_INTERSECT);
+      break;
+
+    case Item_func::SP_CROSSES_FUNC:
+      tree->root->set_gis_index_read_function(HA_READ_MBR_INTERSECT);
+      break;
+    case Item_func::SP_WITHIN_FUNC:
+      /*
+        Adjust the rkey_func_flag as it's assumed and observed that both
+        MyISAM and Innodb implement this function in reverse order.
+      */
+      tree->root->set_gis_index_read_function(HA_READ_MBR_CONTAIN);
+      break;
+
+    case Item_func::SP_CONTAINS_FUNC:
+      /*
+        Adjust the rkey_func_flag as it's assumed and observed that both
+        MyISAM and Innodb implement this function in reverse order.
+      */
+      tree->root->set_gis_index_read_function(HA_READ_MBR_WITHIN);
+      break;
+    case Item_func::SP_OVERLAPS_FUNC:
+      tree->root->set_gis_index_read_function(HA_READ_MBR_INTERSECT);
+      break;
+
+    default:
+      break;
+  }
+
+end:
+  if (impossible_cond_cause != nullptr) {
+    Opt_trace_object wrapper(&thd->opt_trace);
+    Opt_trace_object(&thd->opt_trace, "impossible_condition",
+                     Opt_trace_context::RANGE_OPTIMIZER)
+        .add_alnum("cause", impossible_cond_cause);
+  }
+  return tree;
+}
+
+/**
+  Add a new key test to a key when scanning through all keys
+  This will never be called for same key parts.
+
+  @param key1 Old root of key
+  @param key2 Element to insert (must be a single element)
+  @return New root of key
+*/
+static SEL_ROOT *sel_add(SEL_ROOT *key1, SEL_ROOT *key2) {
+  if (!key1) return key2;
+  if (!key2) return key1;
+
+  // key2 is assumed to be a single element.
+  assert(!key2->root->next_key_part);
+
+  if (key2->root->part < key1->root->part) {
+    // key2 fits in the start of the list.
+    key2->root->set_next_key_part(key1);
+    return key2;
+  }
+
+  // Find out where in the chain in key1 to put key2.
+  SEL_ARG *node = key1->root;
+  while (node->next_key_part &&
+         node->next_key_part->root->part > key2->root->part)
+    node = node->next_key_part->root;
+
+  key2->root->set_next_key_part(node->release_next_key_part());
+  node->set_next_key_part(key2);
+
+  return key1;
+}
diff -Nru mysql-8.0-8.0.26/sql/range_optimizer/range_analysis.h mysql-8.0-8.0.27/sql/range_optimizer/range_analysis.h
--- mysql-8.0-8.0.26/sql/range_optimizer/range_analysis.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/range_optimizer/range_analysis.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,53 @@
+/* Copyright (c) 2000, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef SQL_RANGE_OPTIMIZER_RANGE_ANALYSIS_H_
+#define SQL_RANGE_OPTIMIZER_RANGE_ANALYSIS_H_
+
+#include "my_table_map.h"
+
+class SEL_TREE;
+class RANGE_OPT_PARAM;
+class Item;
+class THD;
+
+/*
+  RangeAnalysisModule
+    A module that accepts a condition, index (or partitioning) description,
+    and builds lists of intervals (in index/partitioning space), such that
+    all possible records that match the condition are contained within the
+    intervals.
+    The entry point for the range analysis module is get_mm_tree()
+    (mm=min_max) function.
+
+    The lists are returned in form of complicated structure of interlinked
+    SEL_TREE/SEL_IMERGE/SEL_ROOT/SEL_ARG objects.
+    See quick_range_seq_next, find_used_partitions for examples of how to walk
+    this structure.
+    All direct "users" of this module are located within this file, too.
+
+ */
+SEL_TREE *get_mm_tree(THD *thd, RANGE_OPT_PARAM *param, table_map prev_tables,
+                      table_map read_tables, table_map current_table,
+                      bool remove_jump_scans, Item *cond);
+
+#endif  // SQL_RANGE_OPTIMIZER_RANGE_ANALYSIS_H_
diff -Nru mysql-8.0-8.0.26/sql/range_optimizer/range_optimizer.cc mysql-8.0-8.0.27/sql/range_optimizer/range_optimizer.cc
--- mysql-8.0-8.0.26/sql/range_optimizer/range_optimizer.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/range_optimizer/range_optimizer.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,1790 @@
+/* Copyright (c) 2000, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+/*
+  TODO:
+  Fix that MAYBE_KEY are stored in the tree so that we can detect use
+  of full hash keys for queries like:
+
+  select s.id, kws.keyword_id from sites as s,kws where s.id=kws.site_id and
+  kws.keyword_id in (204,205);
+
+*/
+
+/*
+  This file contains:
+
+  Range/index_merge/groupby-minmax optimizer module
+    A module that accepts a table, condition, and returns
+     - a QUICK_*_SELECT object that can be used to retrieve rows that match
+       the specified condition, or a "no records will match the condition"
+       statement.
+
+    The module entry point is
+      test_quick_select()
+
+
+  KeyTupleFormat
+  ~~~~~~~~~~~~~~
+  The code in this file (and elsewhere) makes operations on key value tuples.
+  Those tuples are stored in the following format:
+
+  The tuple is a sequence of key part values. The length of key part value
+  depends only on its type (and not depends on the what value is stored)
+
+    KeyTuple: keypart1-data, keypart2-data, ...
+
+  The value of each keypart is stored in the following format:
+
+    keypart_data: [isnull_byte] keypart-value-bytes
+
+  If a keypart may have a NULL value (key_part->field->is_nullable() can
+  be used to check this), then the first byte is a NULL indicator with the
+  following valid values:
+    1  - keypart has NULL value.
+    0  - keypart has non-NULL value.
+
+  <questionable-statement> If isnull_byte==1 (NULL value), then the following
+  keypart->length bytes must be 0.
+  </questionable-statement>
+
+  keypart-value-bytes holds the value. Its format depends on the field type.
+  The length of keypart-value-bytes may or may not depend on the value being
+  stored. The default is that length is static and equal to
+  KEY_PART_INFO::length.
+
+  Key parts with (key_part_flag & HA_BLOB_PART) have length depending of the
+  value:
+
+     keypart-value-bytes: value_length value_bytes
+
+  The value_length part itself occupies HA_KEY_BLOB_LENGTH=2 bytes.
+
+  See key_copy() and key_restore() for code to move data between index tuple
+  and table record
+
+  CAUTION: the above description is only sergefp's understanding of the
+           subject and may omit some details.
+*/
+
+#include "sql/range_optimizer/range_optimizer.h"
+
+#include <float.h>
+#include <stdio.h>
+#include <string.h>
+#include <algorithm>
+#include <queue>
+#include <set>
+
+#include "field_types.h"  // enum_field_types
+#include "m_ctype.h"
+#include "m_string.h"
+#include "my_alloc.h"
+#include "my_bitmap.h"
+#include "my_compiler.h"
+#include "my_dbug.h"
+#include "my_sqlcommand.h"
+#include "mysql/udf_registration_types.h"
+#include "mysql_com.h"
+#include "scope_guard.h"
+#include "sql/check_stack.h"
+#include "sql/current_thd.h"
+#include "sql/field_common_properties.h"
+#include "sql/item.h"
+#include "sql/item_func.h"
+#include "sql/key.h"  // is_key_used
+#include "sql/mem_root_array.h"
+#include "sql/mysqld.h"
+#include "sql/opt_costmodel.h"
+#include "sql/opt_hints.h"  // hint_key_state
+#include "sql/opt_trace.h"  // Opt_trace_array
+#include "sql/opt_trace_context.h"
+#include "sql/psi_memory_key.h"
+#include "sql/range_optimizer/group_min_max_plan.h"
+#include "sql/range_optimizer/index_merge_plan.h"
+#include "sql/range_optimizer/internal.h"
+#include "sql/range_optimizer/range_analysis.h"
+#include "sql/range_optimizer/range_opt_param.h"
+#include "sql/range_optimizer/range_scan_plan.h"
+#include "sql/range_optimizer/rowid_ordered_retrieval_plan.h"
+#include "sql/range_optimizer/skip_scan_plan.h"
+#include "sql/range_optimizer/table_read_plan.h"
+#include "sql/range_optimizer/tree.h"
+#include "sql/sql_class.h"  // THD
+#include "sql/sql_lex.h"
+#include "sql/sql_list.h"
+#include "sql/sql_optimizer.h"  // JOIN
+#include "sql/sql_select.h"
+#include "sql/system_variables.h"
+#include "sql/table.h"
+#include "sql/thr_malloc.h"
+#include "sql/uniques.h"  // Unique
+
+using std::min;
+
+[[maybe_unused]] static uchar is_null_string[2] = {1, 0};
+
+static TABLE_READ_PLAN *get_best_disjunct_quick(
+    THD *thd, RANGE_OPT_PARAM *param, TABLE *table,
+    bool index_merge_union_allowed, bool index_merge_sort_union_allowed,
+    bool index_merge_intersect_allowed, enum_order interesting_order,
+    bool skip_records_in_range, const MY_BITMAP *needed_fields,
+    SEL_IMERGE *imerge, Unique::Imerge_cost_buf_type *imerge_cost_buff,
+    const Cost_estimate *cost_est, Key_map *needed_reg);
+#ifndef NDEBUG
+static void print_quick(QUICK_SELECT_I *quick, const Key_map *needed_reg);
+#endif
+
+namespace opt_range {
+SEL_ARG *null_element = nullptr;
+}
+using namespace opt_range;
+
+void range_optimizer_init() {
+  null_element = new SEL_ARG;
+  null_element->color =
+      SEL_ARG::BLACK;  // Don't trip up the test in test_rb_tree.
+}
+
+void range_optimizer_free() { delete null_element; }
+
+/*
+  Add SEL_TREE to this index_merge without any checks,
+
+  NOTES
+    This function implements the following:
+      (x_1||...||x_N) || t = (x_1||...||x_N||t), where x_i, t are SEL_TREEs
+
+  RETURN
+     0 - OK
+    -1 - Out of memory.
+*/
+
+int SEL_IMERGE::or_sel_tree(RANGE_OPT_PARAM *param, SEL_TREE *tree) {
+  if (trees_next == trees_end) {
+    const int realloc_ratio = 2; /* Double size for next round */
+    uint old_elements = static_cast<uint>(trees_end - trees);
+    uint new_elements = old_elements * realloc_ratio;
+    SEL_TREE **new_trees =
+        param->temp_mem_root->ArrayAlloc<SEL_TREE *>(new_elements);
+    if (new_trees == nullptr) {
+      return -1;
+    }
+    memcpy(new_trees, trees, old_elements * sizeof(*trees));
+    trees = new_trees;
+    trees_next = trees + old_elements;
+    trees_end = trees + old_elements * realloc_ratio;
+  }
+  *(trees_next++) = tree;
+  return 0;
+}
+
+/*
+  Perform OR operation on this SEL_IMERGE and supplied SEL_TREE new_tree,
+  combining new_tree with one of the trees in this SEL_IMERGE if they both
+  have SEL_ARGs for the same key.
+
+  SYNOPSIS
+    or_sel_tree_with_checks()
+      param    RANGE_OPT_PARAM from test_quick_select
+      remove_jump_scans See get_mm_tree()
+      new_tree SEL_TREE with type KEY or KEY_SMALLER.
+
+  NOTES
+    This does the following:
+    (t_1||...||t_k)||new_tree =
+     either
+       = (t_1||...||t_k||new_tree)
+     or
+       = (t_1||....||(t_j|| new_tree)||...||t_k),
+
+     where t_i, y are SEL_TREEs.
+    new_tree is combined with the first t_j it has a SEL_ARG on common
+    key with. As a consequence of this, choice of keys to do index_merge
+    read may depend on the order of conditions in WHERE part of the query.
+
+  RETURN
+    0  OK
+    1  One of the trees was combined with new_tree to SEL_TREE::ALWAYS,
+       and (*this) should be discarded.
+   -1  An error occurred.
+*/
+
+int SEL_IMERGE::or_sel_tree_with_checks(RANGE_OPT_PARAM *param,
+                                        bool remove_jump_scans,
+                                        SEL_TREE *new_tree) {
+  DBUG_TRACE;
+  for (SEL_TREE **tree = trees; tree != trees_next; tree++) {
+    if (sel_trees_can_be_ored(*tree, new_tree, param)) {
+      *tree = tree_or(param, remove_jump_scans, *tree, new_tree);
+      if (!*tree) return 1;
+      if (((*tree)->type == SEL_TREE::MAYBE) ||
+          ((*tree)->type == SEL_TREE::ALWAYS))
+        return 1;
+      /* SEL_TREE::IMPOSSIBLE is impossible here */
+      return 0;
+    }
+  }
+
+  /* New tree cannot be combined with any of existing trees. */
+  const int ret = or_sel_tree(param, new_tree);
+  return ret;
+}
+
+/*
+  Perform OR operation on this index_merge and supplied index_merge list.
+
+  RETURN
+    0 - OK
+    1 - One of conditions in result is always true and this SEL_IMERGE
+        should be discarded.
+   -1 - An error occurred
+*/
+
+int SEL_IMERGE::or_sel_imerge_with_checks(RANGE_OPT_PARAM *param,
+                                          bool remove_jump_scans,
+                                          SEL_IMERGE *imerge) {
+  for (SEL_TREE **tree = imerge->trees; tree != imerge->trees_next; tree++) {
+    if (or_sel_tree_with_checks(param, remove_jump_scans, *tree)) return 1;
+  }
+  return 0;
+}
+
+SEL_IMERGE::SEL_IMERGE(SEL_IMERGE *arg, RANGE_OPT_PARAM *param) {
+  uint elements = static_cast<uint>(arg->trees_end - arg->trees);
+  if (elements > PREALLOCED_TREES) {
+    if (!(trees = param->temp_mem_root->ArrayAlloc<SEL_TREE *>(elements)))
+      goto mem_err;
+  } else
+    trees = &trees_prealloced[0];
+
+  trees_next = trees;
+  trees_end = trees + elements;
+
+  for (SEL_TREE **tree = trees, **arg_tree = arg->trees; tree < trees_end;
+       tree++, arg_tree++) {
+    if (!(*tree = new (param->temp_mem_root) SEL_TREE(*arg_tree, param)) ||
+        param->has_errors())
+      goto mem_err;
+  }
+
+  return;
+
+mem_err:
+  trees = &trees_prealloced[0];
+  trees_next = trees;
+  trees_end = trees;
+}
+
+QUICK_SELECT_I::QUICK_SELECT_I()
+    : max_used_key_length(0), used_key_parts(0), forced_by_hint(false) {}
+
+void QUICK_SELECT_I::trace_quick_description(Opt_trace_context *trace) {
+  Opt_trace_object range_trace(trace, "range_details");
+
+  String range_info;
+  range_info.set_charset(system_charset_info);
+  add_info_string(&range_info);
+  range_trace.add_utf8("used_index", range_info.ptr(), range_info.length());
+}
+
+QUICK_RANGE::QUICK_RANGE()
+    : min_key(nullptr),
+      max_key(nullptr),
+      min_length(0),
+      max_length(0),
+      flag(NO_MIN_RANGE | NO_MAX_RANGE),
+      rkey_func_flag(HA_READ_INVALID),
+      min_keypart_map(0),
+      max_keypart_map(0) {}
+
+QUICK_RANGE::QUICK_RANGE(const uchar *min_key_arg, uint min_length_arg,
+                         key_part_map min_keypart_map_arg,
+                         const uchar *max_key_arg, uint max_length_arg,
+                         key_part_map max_keypart_map_arg, uint flag_arg,
+                         enum ha_rkey_function rkey_func_flag_arg)
+    : min_key(nullptr),
+      max_key(nullptr),
+      min_length((uint16)min_length_arg),
+      max_length((uint16)max_length_arg),
+      flag((uint16)flag_arg),
+      rkey_func_flag(rkey_func_flag_arg),
+      min_keypart_map(min_keypart_map_arg),
+      max_keypart_map(max_keypart_map_arg) {
+  min_key = static_cast<uchar *>(sql_memdup(min_key_arg, min_length_arg + 1));
+  max_key = static_cast<uchar *>(sql_memdup(max_key_arg, max_length_arg + 1));
+  // If we get is_null_string as argument, the memdup is undefined behavior.
+  assert(min_key_arg != is_null_string);
+  assert(max_key_arg != is_null_string);
+}
+
+/*
+  Fill needed_fields with bitmap of fields used in the query.
+  SYNOPSIS
+    fill_used_fields_bitmap()
+      param Parameter from test_quick_select function.
+
+  NOTES
+    Clustered PK members are not put into the bitmap as they are implicitly
+    present in all keys (and it is impossible to avoid reading them).
+  RETURN
+    0  Ok
+    1  Out of memory.
+*/
+
+static int fill_used_fields_bitmap(RANGE_OPT_PARAM *param,
+                                   MY_BITMAP *needed_fields) {
+  TABLE *table = param->table;
+  my_bitmap_map *tmp;
+  uint pk;
+  if (!(tmp = (my_bitmap_map *)param->return_mem_root->Alloc(
+            table->s->column_bitmap_size)) ||
+      bitmap_init(needed_fields, tmp, table->s->fields))
+    return 1;
+
+  bitmap_copy(needed_fields, table->read_set);
+  bitmap_union(needed_fields, table->write_set);
+
+  pk = param->table->s->primary_key;
+  if (pk != MAX_KEY && param->table->file->primary_key_is_clustered()) {
+    /* The table uses clustered PK and it is not internally generated */
+    KEY_PART_INFO *key_part = param->table->key_info[pk].key_part;
+    KEY_PART_INFO *key_part_end =
+        key_part + param->table->key_info[pk].user_defined_key_parts;
+    for (; key_part != key_part_end; ++key_part)
+      bitmap_clear_bit(needed_fields, key_part->fieldnr - 1);
+  }
+  return 0;
+}
+
+/*
+  Test if a key can be used in different ranges, and create the QUICK
+  access method (range, index merge etc) that is estimated to be
+  cheapest unless table/index scan is even cheaper (exception: @see
+  parameter force_quick_range).
+
+  SYNOPSIS
+    test_quick_select()
+      thd               Current thread
+      return_mem_root   MEM_ROOT to allocate TRPs, QUICK_SELECT_Is and
+                        dependent information on (ie., permanent artifacts
+                        that must live on after the range optimizer
+                        has finished executing).
+      temp_mem_root     MEM_ROOT to use for temporary data. Should usually
+                        be empty on entry, as we we will set memory limits
+                        on it. The primary reason why it's declared in the
+                        caller is that DynamicRangeIterator can clear it
+                        and reuse its memory between calls.
+      keys_to_use       Keys to use for range retrieval
+      prev_tables       Tables assumed to be already read when the scan is
+                        performed (but not read at the moment of this call),
+                        including const tables. Otherwise 0.
+      read_tables       If invoked during execution: tables already read
+                        for this join (so values can be assumed to be present).
+                        Otherwise 0.
+      limit             Query limit
+      force_quick_range Prefer to use range (instead of full table scan) even
+                        if it is more expensive.
+      interesting_order The sort order the range access method must be able
+                        to provide. Three-value logic: asc/desc/don't care
+      table             The table to optimize over.
+      skip_records_in_range
+                        Same as QEP_TAB::m_skip_records_in_range.
+      cond              The condition to optimize for, if any.
+      needed_reg        this info is used in make_join_query_block() even if
+                          there is no quick.
+      quick [out]       Calculated QUICK, or nullptr.
+      ignore_table_scan Disregard table scan while looking for range.
+      query_block       The block the given table is part of.
+
+  NOTES
+    Updates the following:
+      needed_reg - Bits for keys with may be used if all prev regs are read
+
+    In the table struct the following information is updated:
+      quick_keys           - Which keys can be used
+      quick_rows           - How many rows the key matches
+      quick_condition_rows - E(# rows that will satisfy the table condition)
+
+  IMPLEMENTATION
+    quick_condition_rows value is obtained as follows:
+
+      It is a minimum of E(#output rows) for all considered table access
+      methods (range and index_merge accesses over various indexes).
+
+    The obtained value is not a true E(#rows that satisfy table condition)
+    but rather a pessimistic estimate. To obtain a true E(#...) one would
+    need to combine estimates of various access methods, taking into account
+    correlations between sets of rows they will return.
+
+    For example, if values of tbl.key1 and tbl.key2 are independent (a right
+    assumption if we have no information about their correlation) then the
+    correct estimate will be:
+
+      E(#rows("tbl.key1 < c1 AND tbl.key2 < c2")) =
+      = E(#rows(tbl.key1 < c1)) / total_rows(tbl) * E(#rows(tbl.key2 < c2)
+
+    which is smaller than
+
+       MIN(E(#rows(tbl.key1 < c1), E(#rows(tbl.key2 < c2)))
+
+    which is currently produced.
+
+  TODO
+   * Change the value returned in quick_condition_rows from a pessimistic
+     estimate to true E(#rows that satisfy table condition).
+     (we can re-use some of E(#rows) calcuation code from
+  index_merge/intersection for this)
+
+   * Check if this function really needs to modify keys_to_use, and change the
+     code to pass it by reference if it doesn't.
+
+   * In addition to force_quick_range other means can be (an usually are) used
+     to make this function prefer range over full table scan. Figure out if
+     force_quick_range is really needed.
+
+  RETURN
+   -1 if impossible select (i.e. certainly no rows will be selected)
+    0 if can't use quick_select
+    1 if found usable ranges and quick select has been successfully created.
+
+  @note After this call, caller may decide to really use the returned QUICK,
+  by calling QEP_TAB::set_quick() and updating tab->type() if appropriate.
+
+*/
+int test_quick_select(THD *thd, MEM_ROOT *return_mem_root,
+                      MEM_ROOT *temp_mem_root, Key_map keys_to_use,
+                      table_map prev_tables, table_map read_tables,
+                      ha_rows limit, bool force_quick_range,
+                      const enum_order interesting_order, TABLE *table,
+                      bool skip_records_in_range, Item *cond,
+                      Key_map *needed_reg, QUICK_SELECT_I **quick,
+                      bool ignore_table_scan, Query_block *query_block) {
+  DBUG_TRACE;
+
+  *quick = nullptr;
+  needed_reg->clear_all();
+
+  if (keys_to_use.is_clear_all()) return 0;
+
+  DBUG_PRINT("enter", ("keys_to_use: %lu  prev_tables: %lu  ",
+                       (ulong)keys_to_use.to_ulonglong(), (ulong)prev_tables));
+
+  bool force_skip_scan = false;
+  const Cost_model_server *const cost_model = thd->cost_model();
+  ha_rows records = table->file->stats.records;
+  if (!records) records++; /* purecov: inspected */
+  double scan_time =
+      cost_model->row_evaluate_cost(static_cast<double>(records)) + 1;
+  Cost_estimate cost_est = table->file->table_scan_cost();
+  cost_est.add_io(1.1);
+  cost_est.add_cpu(scan_time);
+  if (ignore_table_scan) {
+    scan_time = DBL_MAX;
+    cost_est.set_max_cost();
+  }
+  if (limit < records) {
+    cost_est.reset();
+    // Force to use index
+    cost_est.add_io(
+        table->cost_model()->page_read_cost(static_cast<double>(records)) + 1);
+    cost_est.add_cpu(scan_time);
+  } else if (cost_est.total_cost() <= 2.0 && !force_quick_range)
+    return 0; /* No need for quick select */
+
+  Opt_trace_context *const trace = &thd->opt_trace;
+  Opt_trace_object trace_range(trace, "range_analysis");
+  Opt_trace_object(trace, "table_scan")
+      .add("rows", table->file->stats.records)
+      .add("cost", cost_est);
+
+  keys_to_use.intersect(table->keys_in_use_for_query);
+  if (!keys_to_use.is_clear_all()) {
+    SEL_TREE *tree = nullptr;
+    KEY_PART *key_parts;
+    KEY *key_info;
+    RANGE_OPT_PARAM param;
+
+    /*
+      Use the 3 multiplier as range optimizer allocates big RANGE_OPT_PARAM
+      structure and may evaluate a subquery expression
+      TODO During the optimization phase we should evaluate only inexpensive
+           single-lookup subqueries.
+    */
+    uchar buff[STACK_BUFF_ALLOC];
+    if (check_stack_overrun(thd, 3 * STACK_MIN_SIZE + sizeof(RANGE_OPT_PARAM),
+                            buff))
+      return 0;  // Fatal error flag is set
+
+    /* set up parameter that is passed to all functions */
+    param.table = table;
+    param.query_block = query_block;
+    param.keys = 0;
+    param.return_mem_root = return_mem_root;
+    param.temp_mem_root = temp_mem_root;
+    param.using_real_indexes = true;
+    param.use_index_statistics = false;
+    /*
+      Set index_merge_allowed from OPTIMIZER_SWITCH_INDEX_MERGE.
+      Notice also that OPTIMIZER_SWITCH_INDEX_MERGE disables all
+      index merge sub strategies.
+    */
+    bool index_merge_allowed =
+        thd->optimizer_switch_flag(OPTIMIZER_SWITCH_INDEX_MERGE);
+    bool index_merge_union_allowed =
+        index_merge_allowed &&
+        thd->optimizer_switch_flag(OPTIMIZER_SWITCH_INDEX_MERGE_UNION);
+    bool index_merge_sort_union_allowed =
+        index_merge_allowed &&
+        thd->optimizer_switch_flag(OPTIMIZER_SWITCH_INDEX_MERGE_SORT_UNION);
+    bool index_merge_intersect_allowed =
+        index_merge_allowed &&
+        thd->optimizer_switch_flag(OPTIMIZER_SWITCH_INDEX_MERGE_INTERSECT);
+
+    temp_mem_root->set_max_capacity(
+        thd->variables.range_optimizer_max_mem_size);
+    temp_mem_root->set_error_for_capacity_exceeded(true);
+    thd->push_internal_handler(&param.error_handler);
+    auto cleanup = create_scope_guard([thd] { thd->pop_internal_handler(); });
+
+    // These are being stored in TRPs, so they need to be on return_mem_root.
+    param.real_keynr = return_mem_root->ArrayAlloc<uint>(table->s->keys);
+    param.key = return_mem_root->ArrayAlloc<KEY_PART *>(table->s->keys);
+    param.key_parts =
+        return_mem_root->ArrayAlloc<KEY_PART>(table->s->key_parts);
+    if (param.real_keynr == nullptr || param.key == nullptr ||
+        param.key_parts == nullptr) {
+      return 0;  // Can't use range
+    }
+    key_parts = param.key_parts;
+
+    {
+      Opt_trace_array trace_idx(trace, "potential_range_indexes",
+                                Opt_trace_context::RANGE_OPTIMIZER);
+      /*
+        Make an array with description of all key parts of all table keys.
+        This is used in get_mm_parts function.
+      */
+      key_info = table->key_info;
+      for (uint idx = 0; idx < table->s->keys; idx++, key_info++) {
+        Opt_trace_object trace_idx_details(trace);
+        trace_idx_details.add_utf8("index", key_info->name);
+        KEY_PART_INFO *key_part_info;
+
+        if (!keys_to_use.is_set(idx)) {
+          trace_idx_details.add("usable", false)
+              .add_alnum("cause", "not_applicable");
+          continue;
+        }
+
+        if (hint_key_state(thd, table->pos_in_table_list, idx,
+                           NO_RANGE_HINT_ENUM, 0)) {
+          trace_idx_details.add("usable", false)
+              .add_alnum("cause", "no_range_optimization hint");
+          continue;
+        }
+
+        if (key_info->flags & HA_FULLTEXT) {
+          trace_idx_details.add("usable", false).add_alnum("cause", "fulltext");
+          continue;  // ToDo: ft-keys in non-ft ranges, if possible   SerG
+        }
+
+        trace_idx_details.add("usable", true);
+
+        param.key[param.keys] = key_parts;
+        key_part_info = key_info->key_part;
+        Opt_trace_array trace_keypart(trace, "key_parts");
+        for (uint part = 0; part < actual_key_parts(key_info);
+             part++, key_parts++, key_part_info++) {
+          key_parts->key = param.keys;
+          key_parts->part = part;
+          key_parts->length = key_part_info->length;
+          key_parts->store_length = key_part_info->store_length;
+          key_parts->field = key_part_info->field;
+          key_parts->null_bit = key_part_info->null_bit;
+          key_parts->image_type = (part < key_info->user_defined_key_parts &&
+                                   key_info->flags & HA_SPATIAL)
+                                      ? Field::itMBR
+                                      : Field::itRAW;
+          /* Only HA_PART_KEY_SEG is used */
+          key_parts->flag = key_part_info->key_part_flag;
+          trace_keypart.add_utf8(
+              get_field_name_or_expression(thd, key_part_info->field));
+        }
+        param.real_keynr[param.keys++] = idx;
+      }
+    }
+    param.key_parts_end = key_parts;
+
+    /* Calculate cost of full index read for the shortest covering index */
+    if (!table->covering_keys.is_clear_all()) {
+      int key_for_use = find_shortest_key(table, &table->covering_keys);
+      // find_shortest_key() should return a valid key:
+      assert(key_for_use != MAX_KEY);
+
+      Cost_estimate key_read_time = param.table->file->index_scan_cost(
+          key_for_use, 1, static_cast<double>(records));
+      key_read_time.add_cpu(
+          cost_model->row_evaluate_cost(static_cast<double>(records)));
+
+      bool chosen = false;
+      if (key_read_time < cost_est) {
+        cost_est = key_read_time;
+        chosen = true;
+      }
+
+      Opt_trace_object trace_cov(trace, "best_covering_index_scan",
+                                 Opt_trace_context::RANGE_OPTIMIZER);
+      trace_cov.add_utf8("index", table->key_info[key_for_use].name)
+          .add("cost", key_read_time)
+          .add("chosen", chosen);
+      if (!chosen) trace_cov.add_alnum("cause", "cost");
+    }
+
+    TABLE_READ_PLAN *best_trp = nullptr;
+    TRP_GROUP_MIN_MAX *group_trp;
+    TRP_SKIP_SCAN *skip_scan_trp;
+    Cost_estimate best_cost = cost_est;
+
+    if (cond) {
+      {
+        Opt_trace_array trace_setup_cond(trace, "setup_range_conditions");
+        tree = get_mm_tree(thd, &param, prev_tables | INNER_TABLE_BIT,
+                           read_tables | INNER_TABLE_BIT,
+                           table->pos_in_table_list->map(),
+                           /*remove_jump_scans=*/true, cond);
+      }
+      if (tree) {
+        if (tree->type == SEL_TREE::IMPOSSIBLE) {
+          trace_range.add("impossible_range", true);
+          cost_est.reset();
+          cost_est.add_io(static_cast<double>(HA_POS_ERROR));
+          return -1;
+        }
+        /*
+          If the tree can't be used for range scans, proceed anyway, as we
+          can construct a group-min-max quick select
+        */
+        if (tree->type != SEL_TREE::KEY &&
+            tree->type != SEL_TREE::KEY_SMALLER) {
+          trace_range.add("range_scan_possible", false);
+          if (tree->type == SEL_TREE::ALWAYS)
+            trace_range.add_alnum("cause", "condition_always_true");
+
+          tree = nullptr;
+        }
+      }
+    }
+
+    /*
+      Try to construct a QUICK_GROUP_MIN_MAX_SELECT.
+      Notice that it can be constructed no matter if there is a range tree.
+    */
+    group_trp = get_best_group_min_max(thd, &param, tree, interesting_order,
+                                       skip_records_in_range, &best_cost);
+    if (group_trp) {
+      DBUG_EXECUTE_IF("force_lis_for_group_by", group_trp->cost_est.reset(););
+      param.table->quick_condition_rows =
+          min(group_trp->records, table->file->stats.records);
+      Opt_trace_object grp_summary(trace, "best_group_range_summary",
+                                   Opt_trace_context::RANGE_OPTIMIZER);
+      if (unlikely(trace->is_started()))
+        group_trp->trace_basic_info(thd, &param, &grp_summary);
+      if (group_trp->cost_est < best_cost) {
+        grp_summary.add("chosen", true);
+        best_trp = group_trp;
+        best_cost = best_trp->cost_est;
+      } else
+        grp_summary.add("chosen", false).add_alnum("cause", "cost");
+    }
+
+    force_skip_scan = hint_table_state(thd, param.table->pos_in_table_list,
+                                       SKIP_SCAN_HINT_ENUM, 0);
+
+    if (thd->optimizer_switch_flag(OPTIMIZER_SKIP_SCAN) || force_skip_scan) {
+      skip_scan_trp =
+          get_best_skip_scan(thd, &param, tree, interesting_order,
+                             skip_records_in_range, force_skip_scan);
+      if (skip_scan_trp) {
+        param.table->quick_condition_rows =
+            min(skip_scan_trp->records, table->file->stats.records);
+        Opt_trace_object summary(trace, "best_skip_scan_summary",
+                                 Opt_trace_context::RANGE_OPTIMIZER);
+        if (unlikely(trace->is_started()))
+          skip_scan_trp->trace_basic_info(thd, &param, &summary);
+
+        if (skip_scan_trp->cost_est < best_cost || force_skip_scan) {
+          summary.add("chosen", true);
+          best_trp = skip_scan_trp;
+          best_cost = best_trp->cost_est;
+        } else
+          summary.add("chosen", false).add_alnum("cause", "cost");
+      }
+    }
+
+    if (tree && (!best_trp || !best_trp->forced_by_hint)) {
+      /*
+        It is possible to use a range-based quick select (but it might be
+        slower than 'all' table scan).
+      */
+      dbug_print_tree("final_tree", tree, &param);
+
+      MY_BITMAP needed_fields;
+      if (fill_used_fields_bitmap(&param, &needed_fields)) {
+        return 0;
+      }
+
+      {
+        /*
+          Calculate cost of single index range scan and possible
+          intersections of these
+        */
+        Opt_trace_object trace_range_alt(trace, "analyzing_range_alternatives",
+                                         Opt_trace_context::RANGE_OPTIMIZER);
+        TRP_RANGE *range_trp = get_key_scans_params(
+            thd, &param, tree, false, true, interesting_order,
+            skip_records_in_range, &best_cost, needed_reg);
+
+        /* Get best 'range' plan and prepare data for making other plans */
+        if (range_trp) {
+          best_trp = range_trp;
+          best_cost = best_trp->cost_est;
+        }
+
+        /*
+          Simultaneous key scans and row deletes on several handler
+          objects are not allowed so don't use ROR-intersection for
+          table deletes. Also, ROR-intersection cannot return rows in
+          descending order
+        */
+        if ((thd->lex->sql_command != SQLCOM_DELETE) &&
+            (index_merge_allowed ||
+             hint_table_state(thd, param.table->pos_in_table_list,
+                              INDEX_MERGE_HINT_ENUM, 0)) &&
+            interesting_order != ORDER_DESC) {
+          /*
+            Get best non-covering ROR-intersection plan and prepare data for
+            building covering ROR-intersection.
+          */
+          TRP_ROR_INTERSECT *rori_trp = get_best_ror_intersect(
+              thd, &param, table, index_merge_intersect_allowed,
+              interesting_order, tree, &needed_fields, &best_cost, true);
+          if (rori_trp) {
+            best_trp = rori_trp;
+            best_cost = best_trp->cost_est;
+          }
+        }
+      }
+
+      // Here we calculate cost of union index merge
+      if (!tree->merges.is_empty()) {
+        // Cannot return rows in descending order.
+        if ((index_merge_allowed ||
+             hint_table_state(thd, param.table->pos_in_table_list,
+                              INDEX_MERGE_HINT_ENUM, 0)) &&
+            interesting_order != ORDER_DESC &&
+            param.table->file->stats.records) {
+          /* Try creating index_merge/ROR-union scan. */
+          SEL_IMERGE *imerge;
+          TABLE_READ_PLAN *best_conj_trp = nullptr, *new_conj_trp = nullptr;
+          List_iterator_fast<SEL_IMERGE> it(tree->merges);
+          Opt_trace_array trace_idx_merge(trace, "analyzing_index_merge_union",
+                                          Opt_trace_context::RANGE_OPTIMIZER);
+
+          // Buffer for index_merge cost estimates.
+          Unique::Imerge_cost_buf_type imerge_cost_buff;
+          while ((imerge = it++)) {
+            new_conj_trp = get_best_disjunct_quick(
+                thd, &param, table, index_merge_union_allowed,
+                index_merge_sort_union_allowed, index_merge_intersect_allowed,
+                interesting_order, skip_records_in_range, &needed_fields,
+                imerge, &imerge_cost_buff, &best_cost, needed_reg);
+            if (new_conj_trp)
+              param.table->quick_condition_rows =
+                  min(param.table->quick_condition_rows, new_conj_trp->records);
+            if (!best_conj_trp ||
+                (new_conj_trp &&
+                 new_conj_trp->cost_est < best_conj_trp->cost_est)) {
+              best_conj_trp = new_conj_trp;
+            }
+          }
+          if (best_conj_trp) best_trp = best_conj_trp;
+        }
+      }
+    }
+
+    /*
+      If we got a read plan, create a quick select from it.
+
+      Only create a quick select if the storage engine supports using indexes
+      for access.
+    */
+    if (best_trp && (table->file->ha_table_flags() & HA_NO_INDEX_ACCESS) == 0) {
+      QUICK_SELECT_I *qck;
+      records = best_trp->records;
+      if (!(qck = best_trp->make_quick(true, return_mem_root)) || qck->init()) {
+        return 0;
+      }
+      *quick = qck;
+    }
+
+    if (unlikely(*quick && trace->is_started() && best_trp)) {
+      // best_trp cannot be NULL if quick is set, done to keep fortify happy
+      Opt_trace_object trace_range_summary(trace,
+                                           "chosen_range_access_summary");
+      {
+        Opt_trace_object trace_range_plan(trace, "range_access_plan");
+        best_trp->trace_basic_info(thd, &param, &trace_range_plan);
+      }
+      trace_range_summary.add("rows_for_plan", (*quick)->records)
+          .add("cost_for_plan", (*quick)->cost_est)
+          .add("chosen", true);
+    }
+
+    DBUG_EXECUTE("info", print_quick(*quick, needed_reg););
+  }
+
+  if (records == 0) {
+    return -1;
+  } else {
+    return *quick != nullptr;
+  }
+}
+
+/*
+  Get best plan for a SEL_IMERGE disjunctive expression.
+  SYNOPSIS
+    get_best_disjunct_quick()
+      param             Parameter from check_quick_select function
+      index_merge_union_allowed
+      index_merge_sort_union_allowed
+      index_merge_intersect_allowed
+      interesting_order The sort order the range access method must be able
+                        to provide. Three-value logic: asc/desc/don't care
+      skip_records_in_range  Same value as JOIN_TAB::skip_records_in_range().
+      needed_fields     Bitmap of fields used in the query
+      imerge            Expression to use
+      imerge_cost_buff  Buffer for index_merge cost estimates
+      cost_est          Don't create scans with cost > cost_est
+      needed_reg [out]  Bits for keys with may be used if all prev regs are read
+
+  NOTES
+    index_merge cost is calculated as follows:
+    index_merge_cost =
+      cost(index_reads) +         (see #1)
+      cost(rowid_to_row_scan) +   (see #2)
+      cost(unique_use)            (see #3)
+
+    1. cost(index_reads) =SUM_i(cost(index_read_i))
+       For non-CPK scans,
+         cost(index_read_i) = {cost of ordinary 'index only' scan}
+       For CPK scan,
+         cost(index_read_i) = {cost of non-'index only' scan}
+
+    2. cost(rowid_to_row_scan)
+      If table PK is clustered then
+        cost(rowid_to_row_scan) =
+          {cost of ordinary clustered PK scan with n_ranges=n_rows}
+
+      Otherwise, we use the following model to calculate costs:
+      We need to retrieve n_rows rows from file that occupies n_blocks blocks.
+      We assume that offsets of rows we need are independent variates with
+      uniform distribution in [0..max_file_offset] range.
+
+      We'll denote block as "busy" if it contains row(s) we need to retrieve
+      and "empty" if doesn't contain rows we need.
+
+      Probability that a block is empty is (1 - 1/n_blocks)^n_rows (this
+      applies to any block in file). Let x_i be a variate taking value 1 if
+      block #i is empty and 0 otherwise.
+
+      Then E(x_i) = (1 - 1/n_blocks)^n_rows;
+
+      E(n_empty_blocks) = E(sum(x_i)) = sum(E(x_i)) =
+        = n_blocks * ((1 - 1/n_blocks)^n_rows) =
+       ~= n_blocks * exp(-n_rows/n_blocks).
+
+      E(n_busy_blocks) = n_blocks*(1 - (1 - 1/n_blocks)^n_rows) =
+       ~= n_blocks * (1 - exp(-n_rows/n_blocks)).
+
+      Average size of "hole" between neighbor non-empty blocks is
+           E(hole_size) = n_blocks/E(n_busy_blocks).
+
+      The total cost of reading all needed blocks in one "sweep" is:
+
+        E(n_busy_blocks) * disk_seek_cost(n_blocks/E(n_busy_blocks))
+
+      This cost estimate is calculated in get_sweep_read_cost().
+
+    3. Cost of Unique use is calculated in Unique::get_use_cost function.
+
+  ROR-union cost is calculated in the same way index_merge, but instead of
+  Unique a priority queue is used.
+
+  RETURN
+    Created read plan
+    NULL - Out of memory or no read scan could be built.
+*/
+
+static TABLE_READ_PLAN *get_best_disjunct_quick(
+    THD *thd, RANGE_OPT_PARAM *param, TABLE *table,
+    bool index_merge_union_allowed, bool index_merge_sort_union_allowed,
+    bool index_merge_intersect_allowed, enum_order interesting_order,
+    bool skip_records_in_range, const MY_BITMAP *needed_fields,
+    SEL_IMERGE *imerge, Unique::Imerge_cost_buf_type *imerge_cost_buff,
+    const Cost_estimate *cost_est, Key_map *needed_reg) {
+  TRP_INDEX_MERGE *imerge_trp = nullptr;
+  uint n_child_scans = imerge->trees_next - imerge->trees;
+  TRP_RANGE **cpk_scan = nullptr;
+  bool imerge_too_expensive = false;
+  Cost_estimate imerge_cost;
+  ha_rows cpk_scan_records = 0;
+  ha_rows non_cpk_scan_records = 0;
+  bool pk_is_clustered = table->file->primary_key_is_clustered();
+  bool all_scans_ror_able = true;
+  bool all_scans_rors = true;
+  size_t unique_calc_buff_size;
+  TABLE_READ_PLAN **roru_read_plans;
+  TABLE_READ_PLAN **cur_roru_plan;
+  ha_rows roru_total_records;
+  double roru_intersect_part = 1.0;
+  const Cost_model_table *const cost_model = table->cost_model();
+  Cost_estimate read_cost = *cost_est;
+
+  DBUG_TRACE;
+  DBUG_PRINT("info", ("Full table scan cost: %g", cost_est->total_cost()));
+
+  assert(table->file->stats.records);
+
+  const bool force_index_merge =
+      hint_table_state(thd, table->pos_in_table_list, INDEX_MERGE_HINT_ENUM, 0);
+
+  Opt_trace_context *const trace = &thd->opt_trace;
+  Opt_trace_object trace_best_disjunct(trace);
+  TRP_RANGE **range_scans =
+      param->return_mem_root->ArrayAlloc<TRP_RANGE *>(n_child_scans);
+  if (range_scans == nullptr) {
+    return nullptr;
+  }
+  // Note: to_merge.end() is called to close this object after this for-loop.
+  Opt_trace_array to_merge(trace, "indexes_to_merge");
+  /*
+    Collect best 'range' scan for each of disjuncts, and, while doing so,
+    analyze possibility of ROR scans. Also calculate some values needed by
+    other parts of the code.
+  */
+  {
+    TRP_RANGE **cur_child;
+    SEL_TREE **ptree;
+    for (ptree = imerge->trees, cur_child = range_scans;
+         ptree != imerge->trees_next; ptree++, cur_child++) {
+      DBUG_EXECUTE("info", print_sel_tree(param, *ptree, &(*ptree)->keys_map,
+                                          "tree in SEL_IMERGE"););
+      Opt_trace_object trace_idx(trace);
+      if (!(*cur_child = get_key_scans_params(
+                thd, param, *ptree, true, false, interesting_order,
+                skip_records_in_range, &read_cost, needed_reg))) {
+        /*
+          One of index scans in this index_merge is more expensive than entire
+          table read for another available option. The entire index_merge (and
+          any possible ROR-union) will be more expensive then, too. We continue
+          here only to update SQL_SELECT members.
+        */
+        imerge_too_expensive = true;
+      }
+
+      if (imerge_too_expensive) {
+        trace_idx.add("chosen", false).add_alnum("cause", "cost");
+        continue;
+      }
+
+      if (!((*cur_child)->can_be_used_for_imerge())) {
+        trace_idx.add("chosen", false)
+            .add_alnum("cause", "index has DESC key part");
+        continue;
+      }
+
+      const uint keynr_in_table = param->real_keynr[(*cur_child)->key_idx];
+      imerge_cost += (*cur_child)->cost_est;
+      all_scans_ror_able &= ((*ptree)->n_ror_scans > 0);
+      all_scans_rors &= (*cur_child)->can_be_used_for_ror();
+      if (pk_is_clustered && keynr_in_table == table->s->primary_key) {
+        cpk_scan = cur_child;
+        cpk_scan_records = (*cur_child)->records;
+      } else
+        non_cpk_scan_records += (*cur_child)->records;
+
+      trace_idx.add_utf8("index_to_merge", table->key_info[keynr_in_table].name)
+          .add("cumulated_cost", imerge_cost);
+    }
+  }
+
+  // Note: to_merge trace object is closed here
+  to_merge.end();
+
+  trace_best_disjunct.add("cost_of_reading_ranges", imerge_cost);
+  if (imerge_too_expensive || (((imerge_cost > read_cost) ||
+                                ((non_cpk_scan_records + cpk_scan_records >=
+                                  table->file->stats.records) &&
+                                 !read_cost.is_max_cost())) &&
+                               !force_index_merge)) {
+    /*
+      Bail out if it is obvious that both index_merge and ROR-union will be
+      more expensive
+    */
+    DBUG_PRINT("info", ("Sum of index_merge scans is more expensive than "
+                        "full table scan, bailing out"));
+    trace_best_disjunct.add("chosen", false).add_alnum("cause", "cost");
+    return nullptr;
+  }
+
+  /*
+    If all scans happen to be ROR, proceed to generate a ROR-union plan (it's
+    guaranteed to be cheaper than non-ROR union), unless ROR-unions are
+    disabled in @@optimizer_switch
+  */
+  if (all_scans_rors && (index_merge_union_allowed || force_index_merge)) {
+    roru_read_plans = (TABLE_READ_PLAN **)range_scans;
+    trace_best_disjunct.add("use_roworder_union", true)
+        .add_alnum("cause", "always_cheaper_than_not_roworder_retrieval");
+    goto skip_to_ror_scan;
+  }
+
+  if (cpk_scan) {
+    /*
+      Add one rowid/key comparison for each row retrieved on non-CPK
+      scan. (it is done in QUICK_RANGE_SELECT::row_in_ranges)
+    */
+    const double rid_comp_cost =
+        cost_model->key_compare_cost(static_cast<double>(non_cpk_scan_records));
+    imerge_cost.add_cpu(rid_comp_cost);
+    trace_best_disjunct.add("cost_of_mapping_rowid_in_non_clustered_pk_scan",
+                            rid_comp_cost);
+  }
+
+  /* Calculate cost(rowid_to_row_scan) */
+  {
+    Cost_estimate sweep_cost;
+    JOIN *join = param->query_block->join;
+    const bool is_interrupted = join && join->tables != 1;
+    get_sweep_read_cost(table, non_cpk_scan_records, is_interrupted,
+                        &sweep_cost);
+    imerge_cost += sweep_cost;
+    trace_best_disjunct.add("cost_sort_rowid_and_read_disk", sweep_cost);
+  }
+  DBUG_PRINT("info", ("index_merge cost with rowid-to-row scan: %g",
+                      imerge_cost.total_cost()));
+  if ((imerge_cost > read_cost || !index_merge_sort_union_allowed) &&
+      !force_index_merge) {
+    trace_best_disjunct.add("use_roworder_index_merge", true)
+        .add_alnum("cause", "cost");
+    goto build_ror_index_merge;
+  }
+
+  /* Add Unique operations cost */
+  unique_calc_buff_size = Unique::get_cost_calc_buff_size(
+      (ulong)non_cpk_scan_records, table->file->ref_length,
+      thd->variables.sortbuff_size);
+  if (imerge_cost_buff->size() < unique_calc_buff_size) {
+    *imerge_cost_buff = Unique::Imerge_cost_buf_type::Alloc(
+        param->temp_mem_root, unique_calc_buff_size);
+    if (imerge_cost_buff->array() == nullptr) return nullptr;
+  }
+
+  {
+    const double dup_removal_cost = Unique::get_use_cost(
+        *imerge_cost_buff, (uint)non_cpk_scan_records, table->file->ref_length,
+        thd->variables.sortbuff_size, cost_model);
+
+    trace_best_disjunct.add("cost_duplicate_removal", dup_removal_cost);
+    imerge_cost.add_cpu(dup_removal_cost);
+
+    trace_best_disjunct.add("total_cost", imerge_cost);
+    DBUG_PRINT("info", ("index_merge total cost: %g (wanted: less then %g)",
+                        imerge_cost.total_cost(), read_cost.total_cost()));
+  }
+  if (imerge_cost < read_cost || force_index_merge) {
+    if ((imerge_trp = new (param->return_mem_root)
+             TRP_INDEX_MERGE(table, force_index_merge))) {
+      imerge_trp->cost_est = imerge_cost;
+      imerge_trp->records = non_cpk_scan_records + cpk_scan_records;
+      imerge_trp->records =
+          min(imerge_trp->records, table->file->stats.records);
+      imerge_trp->range_scans = range_scans;
+      imerge_trp->range_scans_end = range_scans + n_child_scans;
+      read_cost = imerge_cost;
+    }
+  }
+
+build_ror_index_merge:
+  if (!all_scans_ror_able || thd->lex->sql_command == SQLCOM_DELETE ||
+      (!index_merge_union_allowed && !force_index_merge))
+    return imerge_trp;
+
+  /* Ok, it is possible to build a ROR-union, try it. */
+  if (!(roru_read_plans = param->return_mem_root->ArrayAlloc<TABLE_READ_PLAN *>(
+            n_child_scans)))
+    return imerge_trp;
+skip_to_ror_scan:
+  Cost_estimate roru_index_cost;
+  roru_total_records = 0;
+  cur_roru_plan = roru_read_plans;
+
+  /*
+    Note: trace_analyze_ror.end() is called to close this object after
+    this for-loop.
+  */
+  Opt_trace_array trace_analyze_ror(trace, "analyzing_roworder_scans");
+  /* Find 'best' ROR scan for each of trees in disjunction */
+  {
+    TRP_RANGE **cur_child;
+    SEL_TREE **ptree;
+    for (ptree = imerge->trees, cur_child = range_scans;
+         ptree != imerge->trees_next; ptree++, cur_child++, cur_roru_plan++) {
+      Opt_trace_object trp_info(trace);
+      if (unlikely(trace->is_started()))
+        (*cur_child)->trace_basic_info(thd, param, &trp_info);
+
+      /*
+        Assume the best ROR scan is the one that has cheapest
+        full-row-retrieval scan cost.
+        Also accumulate index_only scan costs as we'll need them to
+        calculate overall index_intersection cost.
+      */
+      Cost_estimate scan_cost;
+      if ((*cur_child)->can_be_used_for_ror()) {
+        /* Ok, we have index_only cost, now get full rows scan cost */
+        scan_cost =
+            table->file->read_cost(param->real_keynr[(*cur_child)->key_idx], 1,
+                                   static_cast<double>((*cur_child)->records));
+        scan_cost.add_cpu(
+            cost_model->row_evaluate_cost(rows2double((*cur_child)->records)));
+      } else
+        scan_cost = read_cost;
+
+      TRP_RANGE *prev_plan = *cur_child;
+      if (!(*cur_roru_plan = get_best_ror_intersect(
+                thd, param, table, index_merge_intersect_allowed,
+                interesting_order, *ptree, needed_fields, &scan_cost, false))) {
+        if (prev_plan->can_be_used_for_ror())
+          *cur_roru_plan = prev_plan;
+        else
+          return imerge_trp;
+        roru_index_cost += (*cur_roru_plan)->cost_est;
+      } else {
+        roru_index_cost += down_cast<TRP_ROR_INTERSECT *>(*cur_roru_plan)
+                               ->get_index_scan_cost();
+      }
+      roru_total_records += (*cur_roru_plan)->records;
+      roru_intersect_part *=
+          (*cur_roru_plan)->records / table->file->stats.records;
+    }
+  }
+  // Note: trace_analyze_ror trace object is closed here
+  trace_analyze_ror.end();
+
+  /*
+    rows to retrieve=
+      SUM(rows_in_scan_i) - table_rows * PROD(rows_in_scan_i / table_rows).
+    This is valid because index_merge construction guarantees that conditions
+    in disjunction do not share key parts.
+  */
+  roru_total_records -=
+      (ha_rows)(roru_intersect_part * table->file->stats.records);
+  /* ok, got a ROR read plan for each of the disjuncts
+    Calculate cost:
+    cost(index_union_scan(scan_1, ... scan_n)) =
+      SUM_i(cost_of_index_only_scan(scan_i)) +
+      queue_use_cost(rowid_len, n) +
+      cost_of_row_retrieval
+    See get_merge_buffers_cost function for queue_use_cost formula derivation.
+  */
+  Cost_estimate roru_total_cost;
+  {
+    JOIN *join = param->query_block->join;
+    const bool is_interrupted = join && join->tables != 1;
+    get_sweep_read_cost(table, roru_total_records, is_interrupted,
+                        &roru_total_cost);
+    roru_total_cost += roru_index_cost;
+    roru_total_cost.add_cpu(cost_model->key_compare_cost(
+        rows2double(roru_total_records) * std::log2(n_child_scans)));
+  }
+
+  trace_best_disjunct.add("index_roworder_union_cost", roru_total_cost)
+      .add("members", n_child_scans);
+  TRP_ROR_UNION *roru;
+  if (roru_total_cost < read_cost || force_index_merge) {
+    if ((roru = new (param->return_mem_root)
+             TRP_ROR_UNION(table, force_index_merge))) {
+      trace_best_disjunct.add("chosen", true);
+      roru->first_ror = roru_read_plans;
+      roru->last_ror = roru_read_plans + n_child_scans;
+      roru->cost_est = roru_total_cost;
+      roru->records = roru_total_records;
+      return roru;
+    }
+  }
+  trace_best_disjunct.add("chosen", false);
+
+  return imerge_trp;
+}
+
+bool comparable_in_index(Item *cond_func, const Field *field,
+                         const Field::imagetype itype,
+                         Item_func::Functype comp_type, const Item *value) {
+  /*
+    Usually an index cannot be used if the column collation differs
+    from the operation collation. However, a case insensitive index
+    may be used for some binary searches:
+
+       WHERE latin1_swedish_ci_column = 'a' COLLATE lati1_bin;
+       WHERE latin1_swedish_ci_colimn = BINARY 'a '
+  */
+  if ((field->result_type() == STRING_RESULT &&
+       field->match_collation_to_optimize_range() &&
+       value->result_type() == STRING_RESULT && itype == Field::itRAW &&
+       field->charset() != cond_func->compare_collation() &&
+       !((comp_type == Item_func::EQUAL_FUNC ||
+          comp_type == Item_func::EQ_FUNC) &&
+         cond_func->compare_collation()->state & MY_CS_BINSORT)))
+    return false;
+
+  /*
+    Temporal values: Cannot use range access if:
+       'indexed_varchar_column = temporal_value'
+    because there are many ways to represent the same date as a
+    string. A few examples: "01-01-2001", "1-1-2001", "2001-01-01",
+    "2001#01#01". The same problem applies to time. Thus, we cannot
+    create a useful range predicate for temporal values into VARCHAR
+    column indexes.
+  */
+  if (field->result_type() == STRING_RESULT &&
+      !is_temporal_type(field->type()) && value->is_temporal())
+    return false;
+
+  /*
+    Temporal values: Cannot use range access if IndexedTimeComparedToDate:
+       'indexed_time = temporal_value_with_date_part'
+    because:
+      - without index, a TIME column with value '48:00:00' is
+        equal to a DATETIME column with value
+        'CURDATE() + 2 days'
+      - with range access into the TIME column, CURDATE() + 2
+        days becomes "00:00:00" (Field_timef::store_internal()
+        simply extracts the time part from the datetime) which
+        is a lookup key which does not match "48:00:00". On the other
+        hand, we can do ref access for IndexedDatetimeComparedToTime
+        because Field_temporal_with_date::store_time() will convert
+        48:00:00 to CURDATE() + 2 days which is the correct lookup
+        key.
+  */
+  if (field_time_cmp_date(field, value)) return false;
+
+  /*
+    We can't always use indexes when comparing a string index to a
+    number. cmp_type() is checked to allow comparison of dates and
+    numbers.
+  */
+  if (field->result_type() == STRING_RESULT &&
+      value->result_type() != STRING_RESULT &&
+      field->cmp_type() != value->result_type())
+    return false;
+
+  /*
+    We can't use indexes when comparing to a JSON value. For example,
+    the string '{}' should compare equal to the JSON string "{}". If
+    we use a string index to compare the two strings, we will be
+    comparing '{}' and '"{}"', which don't compare equal.
+    The only exception is Item_json, which is a basic const item and is
+    used to contain value coerced to index's type.
+  */
+  if (value->result_type() == STRING_RESULT &&
+      value->data_type() == MYSQL_TYPE_JSON && !value->basic_const_item())
+    return false;
+
+  return true;
+}
+
+#ifndef NDEBUG
+
+/**
+  Debugging function to print out a SEL_ROOT and everything it points to,
+  recursively. Used only when tracking bugs in the range optimizer
+  (for printf debugging); will not normally have any calls to it.
+ */
+[[maybe_unused]] static void debug_print_tree(SEL_ROOT *origin);
+
+static void debug_print_tree(SEL_ROOT *origin) {
+  if (!origin) return;
+
+  std::set<SEL_ROOT *> seen;
+  std::queue<SEL_ROOT *> to_print;
+
+  to_print.push(origin);
+  while (!to_print.empty()) {
+    SEL_ROOT *key = to_print.front();
+    to_print.pop();
+    if (seen.count(key)) continue;
+
+    printf("Printing %p:\n", key);
+    for (SEL_ARG *arg = key->root->first(); arg; arg = arg->next) {
+      printf("  %p (next_key_part=%p)  ", arg, arg->next_key_part);
+      if (arg->next_key_part) to_print.push(arg->next_key_part);
+
+      String tmp;
+      tmp.length(0);
+      KEY_PART_INFO fake_key_part;
+      fake_key_part.field = arg->field;
+      fake_key_part.length = 0;
+      append_range(&tmp, &fake_key_part, arg->min_value, arg->max_value,
+                   arg->min_flag | arg->max_flag);
+      printf("%s\n", tmp.ptr());
+    }
+    printf("\n");
+  }
+}
+
+#endif  // !defined(NDEBUG)
+
+bool QUICK_SELECT_I::is_keys_used(const MY_BITMAP *fields) {
+  return is_key_used(m_table, index, fields);
+}
+
+/**
+  Find the next different key value by skiping all the rows with the same key
+  value.
+
+  Implements a specialized loose index access method for queries
+  containing aggregate functions with distinct of the form:
+    SELECT [SUM|COUNT|AVG](DISTINCT a,...) FROM t
+  This method comes to replace the index scan + Unique class
+  (distinct selection) for loose index scan that visits all the rows of a
+  covering index instead of jumping in the begining of each group.
+  TODO: Placeholder function. To be replaced by a handler API call
+
+  @param is_index_scan     hint to use index scan instead of random index read
+                           to find the next different value.
+  @param file              table handler
+  @param key_part          group key to compare
+  @param record            row data
+  @param group_prefix      current key prefix data
+  @param group_prefix_len  length of the current key prefix data
+  @param group_key_parts   number of the current key prefix columns
+  @return status
+    @retval  0  success
+    @retval !0  failure
+*/
+
+int index_next_different(bool is_index_scan, handler *file,
+                         KEY_PART_INFO *key_part, uchar *record,
+                         const uchar *group_prefix, uint group_prefix_len,
+                         uint group_key_parts) {
+  if (is_index_scan) {
+    int result = 0;
+
+    while (!key_cmp(key_part, group_prefix, group_prefix_len)) {
+      result = file->ha_index_next(record);
+      if (result) return (result);
+    }
+    return result;
+  } else
+    return file->ha_index_read_map(record, group_prefix,
+                                   make_prev_keypart_map(group_key_parts),
+                                   HA_READ_AFTER_KEY);
+}
+
+/**
+  Print a key to a string
+
+  @param[out] out          String the key is appended to
+  @param[in]  key_part     Index components description
+  @param[in]  key          Key tuple
+*/
+static void print_key_value(String *out, const KEY_PART_INFO *key_part,
+                            const uchar *key) {
+  Field *field = key_part->field;
+
+  if (field->is_flag_set(BLOB_FLAG)) {
+    // Byte 0 of a nullable key is the null-byte. If set, key is NULL.
+    if (field->is_nullable() && *key)
+      out->append(STRING_WITH_LEN("NULL"));
+    else
+      (field->type() == MYSQL_TYPE_GEOMETRY)
+          ? out->append(STRING_WITH_LEN("unprintable_geometry_value"))
+          : out->append(STRING_WITH_LEN("unprintable_blob_value"));
+    return;
+  }
+
+  uint store_length = key_part->store_length;
+
+  if (field->is_nullable()) {
+    /*
+      Byte 0 of key is the null-byte. If set, key is NULL.
+      Otherwise, print the key value starting immediately after the
+      null-byte
+    */
+    if (*key) {
+      out->append(STRING_WITH_LEN("NULL"));
+      return;
+    }
+    key++;  // Skip null byte
+    store_length--;
+  }
+
+  /*
+    Binary data cannot be converted to UTF8 which is what the
+    optimizer trace expects. If the column is binary, the hex
+    representation is printed to the trace instead.
+  */
+  if (field->is_flag_set(BINARY_FLAG)) {
+    out->append("0x");
+    for (uint i = 0; i < store_length; i++) {
+      out->append(_dig_vec_lower[*(key + i) >> 4]);
+      out->append(_dig_vec_lower[*(key + i) & 0x0F]);
+    }
+    return;
+  }
+
+  char buff[128];
+  String tmp(buff, sizeof(buff), system_charset_info);
+  tmp.length(0);
+
+  TABLE *table = field->table;
+  my_bitmap_map *old_sets[2];
+
+  dbug_tmp_use_all_columns(table, old_sets, table->read_set, table->write_set);
+
+  field->set_key_image(key, key_part->length);
+  if (field->type() == MYSQL_TYPE_BIT)
+    (void)field->val_int_as_str(&tmp, true);  // may change tmp's charset
+  else
+    field->val_str(&tmp);  // may change tmp's charset
+  out->append(tmp.ptr(), tmp.length(), tmp.charset());
+
+  dbug_tmp_restore_column_maps(table->read_set, table->write_set, old_sets);
+}
+
+/**
+  Append range info for a key part to a string
+
+  @param[in,out] out          String the range info is appended to
+  @param[in]     key_part     Indexed column used in a range select
+  @param[in]     min_key      Key tuple describing lower bound of range
+  @param[in]     max_key      Key tuple describing upper bound of range
+  @param[in]     flag         Key range flags defining what min_key
+                              and max_key represent @see my_base.h
+*/
+void append_range(String *out, const KEY_PART_INFO *key_part,
+                  const uchar *min_key, const uchar *max_key, const uint flag) {
+  if (out->length() > 0) out->append(STRING_WITH_LEN(" AND "));
+
+  if (flag & GEOM_FLAG) {
+    /*
+      The flags of GEOM ranges do not work the same way as for other
+      range types, so printing "col < some_geom" doesn't make sense.
+      Just print the column name, not operator.
+    */
+    out->append(key_part->field->field_name);
+    out->append(STRING_WITH_LEN(" "));
+    print_key_value(out, key_part, min_key);
+    return;
+  }
+
+  if (!(flag & NO_MIN_RANGE)) {
+    print_key_value(out, key_part, min_key);
+    if (flag & NEAR_MIN)
+      out->append(STRING_WITH_LEN(" < "));
+    else
+      out->append(STRING_WITH_LEN(" <= "));
+  }
+
+  out->append(get_field_name_or_expression(current_thd, key_part->field));
+
+  if (!(flag & NO_MAX_RANGE)) {
+    if (flag & NEAR_MAX)
+      out->append(STRING_WITH_LEN(" < "));
+    else
+      out->append(STRING_WITH_LEN(" <= "));
+    print_key_value(out, key_part, max_key);
+  }
+}
+
+/**
+  Traverse an R-B tree of range conditions and append all ranges for
+  this keypart and consecutive keyparts to range_trace (if non-NULL)
+  or to range_string (if range_trace is NULL). See description of R-B
+  trees/SEL_ARG for details on how ranges are linked.
+
+  @param[in,out] range_trace   Optimizer trace array ranges are appended to
+  @param[in,out] range_string  The string where range predicates are
+                               appended when the last keypart has
+                               been reached.
+  @param         range_so_far  String containing ranges for keyparts prior
+                               to this keypart.
+  @param         keypart       The R-B tree containing intervals for this
+  keypart.
+  @param         key_parts     Index components description, used when adding
+                               information to the optimizer trace
+  @param         print_full    Whether or not ranges on unusable keyparts
+                               should be printed. Useful for debugging.
+
+  @note This function mimics the behavior of sel_arg_range_seq_next()
+*/
+void append_range_all_keyparts(Opt_trace_array *range_trace,
+                               String *range_string, String *range_so_far,
+                               SEL_ROOT *keypart,
+                               const KEY_PART_INFO *key_parts,
+                               const bool print_full) {
+  assert(keypart);
+  const SEL_ARG *const keypart_root = keypart->root;
+  assert(keypart_root && keypart_root != null_element);
+
+  const bool append_to_trace = (range_trace != nullptr);
+
+  // Either add info to range_string or to range_trace
+  assert(append_to_trace ? !range_string : (range_string != nullptr));
+
+  // Navigate to first interval in red-black tree
+  const KEY_PART_INFO *cur_key_part = key_parts + keypart_root->part;
+  const SEL_ARG *keypart_range = keypart_root->first();
+
+  const size_t save_range_so_far_length = range_so_far->length();
+
+  while (keypart_range) {
+    /*
+      Skip the rest of condition printing to avoid OOM if appending to
+      range_string and the string becomes too long. Printing very long
+      range conditions normally doesn't make sense either.
+    */
+    if (!append_to_trace && range_string->length() > 500) {
+      range_string->append(STRING_WITH_LEN("..."));
+      break;
+    }
+
+    // Append the current range predicate to the range String
+    switch (keypart->type) {
+      case SEL_ROOT::Type::KEY_RANGE:
+        append_range(range_so_far, cur_key_part, keypart_range->min_value,
+                     keypart_range->max_value,
+                     keypart_range->min_flag | keypart_range->max_flag);
+        break;
+      case SEL_ROOT::Type::MAYBE_KEY:
+        range_so_far->append("MAYBE_KEY");
+        break;
+      case SEL_ROOT::Type::IMPOSSIBLE:
+        range_so_far->append("IMPOSSIBLE");
+        break;
+      default:
+        assert(false);
+        break;
+    }
+
+    /*
+      Print range predicates for consecutive keyparts if
+      1) There are predicates for later keyparts, and
+      2) We explicitly requested to print even the ranges that will
+         not be usable by range access, or
+      3) There are no "holes" in the used keyparts (keypartX can only
+         be used if there is a range predicate on keypartX-1), and
+      4) The current range is an equality range
+    */
+    if (keypart_range->next_key_part &&  // 1
+        (print_full ||                   // 2
+         (keypart_range->next_key_part->root->part ==
+              keypart_range->part + 1 &&      // 3
+          keypart_range->is_singlepoint())))  // 4
+    {
+      append_range_all_keyparts(range_trace, range_string, range_so_far,
+                                keypart_range->next_key_part, key_parts,
+                                print_full);
+    } else {
+      /*
+        This is the last keypart with a usable range predicate. Print
+        full range info to the optimizer trace or to the string
+      */
+      if (append_to_trace)
+        range_trace->add_utf8(range_so_far->ptr(), range_so_far->length());
+      else {
+        if (range_string->length() == 0)
+          range_string->append(STRING_WITH_LEN("("));
+        else
+          range_string->append(STRING_WITH_LEN(" OR ("));
+
+        range_string->append(range_so_far->ptr(), range_so_far->length());
+        range_string->append(STRING_WITH_LEN(")"));
+      }
+    }
+    keypart_range = keypart_range->next;
+    /*
+      Now moving to next range for this keypart, so "reset"
+      range_so_far to include only range description of earlier
+      keyparts
+    */
+    range_so_far->length(save_range_so_far_length);
+  }
+}
+
+void print_tree(String *out, const char *tree_name, SEL_TREE *tree,
+                const RANGE_OPT_PARAM *param, const bool print_full) {
+  if (!param->using_real_indexes) {
+    if (out) {
+      out->append(tree_name);
+      out->append(" uses a partitioned index and cannot be printed");
+    } else
+      DBUG_PRINT("info", ("sel_tree: "
+                          "%s uses a partitioned index and cannot be printed",
+                          tree_name));
+    return;
+  }
+
+  if (!tree) {
+    if (out) {
+      out->append(tree_name);
+      out->append(" is NULL");
+    } else
+      DBUG_PRINT("info", ("sel_tree: %s is NULL", tree_name));
+    return;
+  }
+
+  if (tree->type == SEL_TREE::IMPOSSIBLE) {
+    if (out) {
+      out->append(tree_name);
+      out->append(" is IMPOSSIBLE");
+    } else
+      DBUG_PRINT("info", ("sel_tree: %s is IMPOSSIBLE", tree_name));
+    return;
+  }
+
+  if (tree->type == SEL_TREE::ALWAYS) {
+    if (out) {
+      out->append(tree_name);
+      out->append(" is ALWAYS");
+    } else
+      DBUG_PRINT("info", ("sel_tree: %s is ALWAYS", tree_name));
+    return;
+  }
+
+  if (tree->type == SEL_TREE::MAYBE) {
+    if (out) {
+      out->append(tree_name);
+      out->append(" is MAYBE");
+    } else
+      DBUG_PRINT("info", ("sel_tree: %s is MAYBE", tree_name));
+    return;
+  }
+
+  if (!tree->merges.is_empty()) {
+    if (out) {
+      out->append(tree_name);
+      out->append(" contains the following merges");
+    } else
+      DBUG_PRINT("info", ("sel_tree: "
+                          "%s contains the following merges",
+                          tree_name));
+
+    List_iterator<SEL_IMERGE> it(tree->merges);
+    int i = 1;
+    for (SEL_IMERGE *el = it++; el; el = it++, i++) {
+      if (out) {
+        out->append("\n--- alternative ");
+        char istr[22];
+        out->append(llstr(i, istr));
+        out->append(" ---\n");
+      } else
+        DBUG_PRINT("info", ("sel_tree: --- alternative %d ---", i));
+      for (SEL_TREE **current = el->trees; current != el->trees_next; current++)
+        print_tree(out, "  merge_tree", *current, param, print_full);
+    }
+  }
+
+  for (uint i = 0; i < param->keys; i++) {
+    if (tree->keys[i] == NULL) continue;
+
+    uint real_key_nr = param->real_keynr[i];
+
+    const KEY &cur_key = param->table->key_info[real_key_nr];
+    const KEY_PART_INFO *key_part = cur_key.key_part;
+
+    /*
+      String holding the final range description from
+      append_range_all_keyparts()
+    */
+    char buff1[512];
+    buff1[0] = '\0';
+    String range_result(buff1, sizeof(buff1), system_charset_info);
+    range_result.length(0);
+
+    /*
+      Range description up to a certain keypart - used internally in
+      append_range_all_keyparts()
+    */
+    char buff2[128];
+    String range_so_far(buff2, sizeof(buff2), system_charset_info);
+    range_so_far.length(0);
+
+    append_range_all_keyparts(nullptr, &range_result, &range_so_far,
+                              tree->keys[i], key_part, print_full);
+
+    if (out) {
+      char istr[22];
+
+      out->append(tree_name);
+      out->append(" keys[");
+      out->append(llstr(i, istr));
+      out->append("]: ");
+      out->append(range_result.ptr());
+      out->append("\n");
+    } else
+      DBUG_PRINT("info", ("sel_tree: %p, type=%d, %s->keys[%u(%u)]: %s",
+                          tree->keys[i], static_cast<int>(tree->keys[i]->type),
+                          tree_name, i, real_key_nr, range_result.ptr()));
+  }
+}
+
+/*****************************************************************************
+** Print a quick range for debugging
+** TODO:
+** This should be changed to use a String to store each row instead
+** of locking the DEBUG stream !
+*****************************************************************************/
+
+#ifndef NDEBUG
+
+static void print_quick(QUICK_SELECT_I *quick, const Key_map *needed_reg) {
+  char buf[MAX_KEY / 8 + 1];
+  TABLE *table;
+  my_bitmap_map *old_sets[2];
+  DBUG_TRACE;
+  if (!quick) return;
+  DBUG_LOCK_FILE;
+
+  table = quick->m_table;
+  dbug_tmp_use_all_columns(table, old_sets, table->read_set, table->write_set);
+  quick->dbug_dump(0, true);
+  dbug_tmp_restore_column_maps(table->read_set, table->write_set, old_sets);
+
+  fprintf(DBUG_FILE, "other_keys: 0x%s:\n", needed_reg->print(buf));
+
+  DBUG_UNLOCK_FILE;
+}
+
+#endif /* !NDEBUG */
diff -Nru mysql-8.0-8.0.26/sql/range_optimizer/range_optimizer.h mysql-8.0-8.0.27/sql/range_optimizer/range_optimizer.h
--- mysql-8.0-8.0.26/sql/range_optimizer/range_optimizer.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/range_optimizer/range_optimizer.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,448 @@
+/* Copyright (c) 2000, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+/* classes to use when handling where clause */
+
+#ifndef SQL_RANGE_OPTIMIZER_RANGE_OPTIMIZER_H_
+#define SQL_RANGE_OPTIMIZER_RANGE_OPTIMIZER_H_
+
+#include <assert.h>
+#include <sys/types.h>
+#include <algorithm>
+
+#include "my_base.h"
+#include "my_inttypes.h"
+#include "my_table_map.h"
+#include "prealloced_array.h"  // Prealloced_array
+#include "sql/field.h"         // Field
+#include "sql/handler.h"
+#include "sql/item_func.h"
+#include "sql/key_spec.h"
+#include "sql/malloc_allocator.h"  // IWYU pragma: keep
+#include "sql/sql_bitmap.h"
+#include "sql/sql_const.h"
+#include "sql_string.h"
+
+class Item;
+class Opt_trace_context;
+class Query_block;
+class THD;
+struct MY_BITMAP;
+struct TABLE;
+
+struct KEY_PART {
+  uint16 key, part;
+  /* See KEY_PART_INFO for meaning of the next two: */
+  uint16 store_length, length;
+  uint8 null_bit;
+  /*
+    Keypart flags (0 when this structure is used by partition pruning code
+    for fake partitioning index description)
+  */
+  uint16 flag;
+  Field *field;
+  Field::imagetype image_type;
+};
+
+class QUICK_RANGE {
+ public:
+  uchar *min_key, *max_key;
+  uint16 min_length, max_length;
+
+  /// Stores bitwise-or'ed bits defined in enum key_range_flags.
+  uint16 flag;
+
+  /**
+    Stores one of the HA_READ_MBR_XXX items in enum ha_rkey_function, only
+    effective when flag has a GEOM_FLAG bit.
+  */
+  enum ha_rkey_function rkey_func_flag;
+  key_part_map min_keypart_map,  // bitmap of used keyparts in min_key
+      max_keypart_map;           // bitmap of used keyparts in max_key
+
+  QUICK_RANGE(); /* Full range */
+  QUICK_RANGE(const uchar *min_key_arg, uint min_length_arg,
+              key_part_map min_keypart_map_arg, const uchar *max_key_arg,
+              uint max_length_arg, key_part_map max_keypart_map_arg,
+              uint flag_arg, enum ha_rkey_function rkey_func);
+
+  /**
+     Initalizes a key_range object for communication with storage engine.
+
+     This function facilitates communication with the Storage Engine API by
+     translating the minimum endpoint of the interval represented by this
+     QUICK_RANGE into an index range endpoint specifier for the engine.
+
+     @param kr Pointer to an uninitialized key_range C struct.
+
+     @param prefix_length The length of the search key prefix to be used for
+     lookup.
+
+     @param keypart_map A set (bitmap) of keyparts to be used.
+  */
+  void make_min_endpoint(key_range *kr, uint prefix_length,
+                         key_part_map keypart_map) {
+    make_min_endpoint(kr);
+    kr->length = std::min(kr->length, prefix_length);
+    kr->keypart_map &= keypart_map;
+  }
+
+  /**
+     Initalizes a key_range object for communication with storage engine.
+
+     This function facilitates communication with the Storage Engine API by
+     translating the minimum endpoint of the interval represented by this
+     QUICK_RANGE into an index range endpoint specifier for the engine.
+
+     @param kr Pointer to an uninitialized key_range C struct.
+  */
+  void make_min_endpoint(key_range *kr) {
+    kr->key = (const uchar *)min_key;
+    kr->length = min_length;
+    kr->keypart_map = min_keypart_map;
+    kr->flag = ((flag & NEAR_MIN) ? HA_READ_AFTER_KEY
+                                  : (flag & EQ_RANGE) ? HA_READ_KEY_EXACT
+                                                      : HA_READ_KEY_OR_NEXT);
+  }
+
+  /**
+     Initalizes a key_range object for communication with storage engine.
+
+     This function facilitates communication with the Storage Engine API by
+     translating the maximum endpoint of the interval represented by this
+     QUICK_RANGE into an index range endpoint specifier for the engine.
+
+     @param kr Pointer to an uninitialized key_range C struct.
+
+     @param prefix_length The length of the search key prefix to be used for
+     lookup.
+
+     @param keypart_map A set (bitmap) of keyparts to be used.
+  */
+  void make_max_endpoint(key_range *kr, uint prefix_length,
+                         key_part_map keypart_map) {
+    make_max_endpoint(kr);
+    kr->length = std::min(kr->length, prefix_length);
+    kr->keypart_map &= keypart_map;
+  }
+
+  /**
+     Initalizes a key_range object for communication with storage engine.
+
+     This function facilitates communication with the Storage Engine API by
+     translating the maximum endpoint of the interval represented by this
+     QUICK_RANGE into an index range endpoint specifier for the engine.
+
+     @param kr Pointer to an uninitialized key_range C struct.
+  */
+  void make_max_endpoint(key_range *kr) {
+    kr->key = (const uchar *)max_key;
+    kr->length = max_length;
+    kr->keypart_map = max_keypart_map;
+    /*
+      We use READ_AFTER_KEY here because if we are reading on a key
+      prefix we want to find all keys with this prefix
+    */
+    kr->flag = (flag & NEAR_MAX ? HA_READ_BEFORE_KEY : HA_READ_AFTER_KEY);
+  }
+};
+
+enum RangeScanType {
+  QS_TYPE_RANGE,
+  QS_TYPE_RANGE_DESC,
+  QS_TYPE_INDEX_MERGE,
+  QS_TYPE_ROR_INTERSECT,
+  QS_TYPE_ROR_UNION,
+  QS_TYPE_GROUP_MIN_MAX,
+  QS_TYPE_SKIP_SCAN
+};
+
+/*
+  Quick select interface.
+  This class is a parent for all QUICK_*_SELECT classes.
+
+  The usage scenario is as follows:
+  1. Create quick select
+    quick = new (mem_root) QUICK_XXX_SELECT(...);
+
+  2. Perform lightweight initialization. This can be done in 2 ways:
+  2.a: Regular initialization
+    if (quick->init())
+    {
+      //the only valid action after failed init() call is destroy
+      destroy(quick);
+    }
+  2.b: Special initialization for quick selects merged by QUICK_ROR_*_SELECT
+    if (quick->init_ror_merged_scan())
+      destroy(quick);
+
+  3. Perform zero, one, or more scans.
+    while (...)
+    {
+      // initialize quick select for scan. This may allocate
+      // buffers and/or prefetch rows.
+      if (quick->reset())
+      {
+        //the only valid action after failed reset() call is destroy
+        destroy(quick);
+        //abort query
+      }
+
+      // perform the scan
+      do
+      {
+        res= quick->get_next();
+      } while (res && ...)
+    }
+
+  4. Destroy the select:
+    destroy(quick);
+*/
+
+class QUICK_SELECT_I {
+ public:
+  ha_rows records;         /* estimate of # of records to be retrieved */
+  Cost_estimate cost_est;  ///> cost to perform this retrieval
+  TABLE *m_table;
+  /*
+    Index this quick select uses, or MAX_KEY for quick selects
+    that use several indexes
+  */
+  uint index;
+
+  /*
+    Total length of first used_key_parts parts of the key.
+    Applicable if index!= MAX_KEY.
+  */
+  uint max_used_key_length;
+
+  /*
+    Max. number of (first) key parts this quick select uses for retrieval.
+    eg. for "(key1p1=c1 AND key1p2=c2) OR key1p1=c2" used_key_parts == 2.
+    Applicable if index!= MAX_KEY.
+
+    For QUICK_GROUP_MIN_MAX_SELECT it includes MIN/MAX argument keyparts.
+  */
+  uint used_key_parts;
+  /**
+    true if creation of the object is forced by the hint.
+    The flag is used to skip ref evaluation in find_best_ref() function.
+    It also enables using of QUICK_SELECT object in
+    Optimize_table_order::best_access_path() regardless of the evaluation cost.
+  */
+  bool forced_by_hint;
+
+  QUICK_SELECT_I();
+  QUICK_SELECT_I(const QUICK_SELECT_I &) = default;
+  virtual ~QUICK_SELECT_I() = default;
+
+  /*
+    Do post-constructor initialization.
+    SYNOPSIS
+      init()
+
+    init() performs initializations that should have been in constructor if
+    it was possible to return errors from constructors. The join optimizer may
+    create and then destroy quick selects without retrieving any rows so init()
+    must not contain any IO or CPU intensive code.
+
+    If init() call fails the only valid action is to destroy this quick select,
+    reset() and get_next() must not be called.
+
+    RETURN
+      0      OK
+      other  Error code
+  */
+  virtual int init() = 0;
+
+  /*
+    Initialize quick select for row retrieval.
+    SYNOPSIS
+      reset()
+
+    reset() should be called when it is certain that row retrieval will be
+    necessary. This call may do heavyweight initialization like buffering first
+    N records etc. If reset() call fails get_next() must not be called.
+    Note that reset() may be called several times if
+     * the quick select is executed in a subselect
+     * a JOIN buffer is used
+
+    RETURN
+      0      OK
+      other  Error code
+  */
+  virtual int reset(void) = 0;
+
+  virtual int get_next() = 0; /* get next record to retrieve */
+
+  /* Range end should be called when we have looped over the whole index */
+  virtual void range_end() {}
+
+  /**
+    Whether the range access method returns records in reverse order.
+  */
+  virtual bool reverse_sorted() const = 0;
+  /**
+    Whether the range access method is capable of returning records
+    in reverse order.
+  */
+  virtual bool reverse_sort_possible() const = 0;
+  virtual bool unique_key_range() { return false; }
+
+  /*
+    Request that this quick select produces sorted output.
+    Not all quick selects can provide sorted output, the caller is responsible
+    for calling this function only for those quick selects that can.
+    The implementation is also allowed to provide sorted output even if it
+    was not requested if benificial, or required by implementation
+    internals.
+  */
+  virtual void need_sorted_output() = 0;
+
+  /* Get type of this quick select */
+  virtual RangeScanType get_type() const = 0;
+  virtual bool is_loose_index_scan() const = 0;
+  virtual bool is_agg_loose_index_scan() const = 0;
+
+  /*
+    Initialize this quick select as a merged scan inside a ROR-union or a ROR-
+    intersection scan. The caller must not additionally call init() if this
+    function is called.
+    SYNOPSIS
+      init_ror_merged_scan()
+        reuse_handler  If true, the quick select may use table->handler,
+                       otherwise it must create and use a separate handler
+                       object.
+    RETURN
+      0     Ok
+      other Error
+  */
+  virtual int init_ror_merged_scan(bool reuse_handler [[maybe_unused]]) {
+    assert(0);
+    return 1;
+  }
+
+  /*
+    Save ROWID of last retrieved row in file->ref. This used in ROR-merging.
+  */
+  virtual void save_last_pos() {}
+
+  /*
+    Append comma-separated list of keys this quick select uses to key_names;
+    append comma-separated list of corresponding used lengths to used_lengths.
+    This is used by select_describe.
+  */
+  virtual void add_keys_and_lengths(String *key_names,
+                                    String *used_lengths) = 0;
+
+  /*
+    Append text representation of quick select structure (what and how is
+    merged) to str. The result is added to "Extra" field in EXPLAIN output.
+    This function is implemented only by quick selects that merge other quick
+    selects output and/or can produce output suitable for merging.
+  */
+  virtual void add_info_string(String *str [[maybe_unused]]) {}
+  /*
+    Return 1 if any index used by this quick select
+    uses field which is marked in passed bitmap.
+  */
+  virtual bool is_keys_used(const MY_BITMAP *fields);
+
+  /*
+    rowid of last row retrieved by this quick select. This is used only when
+    doing ROR-index_merge selects
+  */
+  uchar *last_rowid;
+
+  /*
+    Table record buffer used by this quick select.
+  */
+  uchar *record;
+#ifndef NDEBUG
+  /*
+    Print quick select information to DBUG_FILE. Caller is responsible
+    for locking DBUG_FILE before this call and unlocking it afterwards.
+  */
+  virtual void dbug_dump(int indent, bool verbose) = 0;
+#endif
+
+  /*
+    Returns a QUICK_SELECT with reverse order of to the index.
+  */
+  virtual QUICK_SELECT_I *make_reverse(uint used_key_parts_arg
+                                       [[maybe_unused]]) {
+    return nullptr;
+  }
+  virtual void set_handler(handler *file_arg [[maybe_unused]]) {}
+
+  /**
+    Get the fields used by the range access method.
+
+    @param[out] used_fields Bitmap of fields that this range access
+                            method uses.
+  */
+  virtual void get_fields_used(MY_BITMAP *used_fields) = 0;
+  void trace_quick_description(Opt_trace_context *trace);
+};
+
+using Quick_ranges = Mem_root_array<QUICK_RANGE *>;
+using Quick_ranges_array = Mem_root_array<Quick_ranges *>;
+
+int test_quick_select(THD *thd, MEM_ROOT *return_mem_root,
+                      MEM_ROOT *temp_mem_root, Key_map keys_to_use,
+                      table_map prev_tables, table_map read_tables,
+                      ha_rows limit, bool force_quick_range,
+                      const enum_order interesting_order, TABLE *table,
+                      bool skip_records_in_range, Item *cond,
+                      Key_map *needed_reg, QUICK_SELECT_I **quick,
+                      bool ignore_table_scan, Query_block *query_block);
+
+void store_key_image_to_rec(Field *field, uchar *ptr, uint len);
+
+extern String null_string;
+
+/// Global initialization of the null_element. Call on server start.
+void range_optimizer_init();
+
+/// Global destruction of the null_element. Call on server stop.
+void range_optimizer_free();
+
+/**
+  Test if 'value' is comparable to 'field' when setting up range
+  access for predicate "field OP value". 'field' is a field in the
+  table being optimized for while 'value' is whatever 'field' is
+  compared to.
+
+  @param cond_func   the predicate item that compares 'field' with 'value'
+  @param field       field in the predicate
+  @param itype       itMBR if indexed field is spatial, itRAW otherwise
+  @param comp_type   comparator for the predicate
+  @param value       whatever 'field' is compared to
+
+  @return true if 'field' and 'value' are comparable, false otherwise
+*/
+
+bool comparable_in_index(Item *cond_func, const Field *field,
+                         const Field::imagetype itype,
+                         Item_func::Functype comp_type, const Item *value);
+
+#endif  // SQL_RANGE_OPTIMIZER_RANGE_OPTIMIZER_H_
diff -Nru mysql-8.0-8.0.26/sql/range_optimizer/range_opt_param.h mysql-8.0-8.0.27/sql/range_optimizer/range_opt_param.h
--- mysql-8.0-8.0.26/sql/range_optimizer/range_opt_param.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/range_optimizer/range_opt_param.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,85 @@
+/* Copyright (c) 2000, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef SQL_RANGE_OPTIMIZER_RANGE_OPT_PARAM_H_
+#define SQL_RANGE_OPTIMIZER_RANGE_OPT_PARAM_H_
+
+#include "sql/range_optimizer/internal.h"
+
+class RANGE_OPT_PARAM {
+ public:
+  TABLE *table;             /* Table being analyzed */
+  Query_block *query_block; /* Query block the table is part of */
+
+  /* Array of parts of all keys for which range analysis is performed */
+  KEY_PART *key_parts;
+  KEY_PART *key_parts_end;
+  // Memory used for allocating TRPs (TABLE_READ_PLAN objects) and similar
+  // objects that are required for a later call to make_quick(), as well as
+  // QUICK_SELECT_I objects and allocations they need to do themselves.
+  // Typically points to thd->mem_root, but DynamicRangeIterator uses its
+  // own MEM_ROOT here, as it needs to delete all the old data and allocate
+  // new objects. Note that not all data allocated here will indeed be used;
+  // e.g., we may allocate five TRPs here but only choose to use one of them.
+  MEM_ROOT *return_mem_root;
+  // Memory that will be freed when range analysis completes.
+  // In particular, this contains the tree built up to analyze
+  // the input expressions (SEL_TREE), but not the actual scan ranges
+  // decided on and given to the TRPs (Quick_range).
+  MEM_ROOT *temp_mem_root;
+  /*
+    Number of indexes used in range analysis (In SEL_TREE::keys only first
+    #keys elements are not empty)
+  */
+  uint keys;
+
+  /*
+    If true, the index descriptions describe real indexes (and it is ok to
+    call field->optimize_range(real_keynr[...], ...).
+    Otherwise index description describes fake indexes, like a partitioning
+    expression.
+  */
+  bool using_real_indexes;
+
+  /*
+    used_key_no -> table_key_no translation table. Only makes sense if
+    using_real_indexes==true
+  */
+  uint *real_keynr = nullptr;
+
+  /**
+    Whether index statistics or index dives should be used when
+    estimating the number of rows in an equality range. If true, index
+    statistics is used for these indexes.
+  */
+  bool use_index_statistics;
+
+  /// Error handler for this param.
+
+  Range_optimizer_error_handler error_handler;
+
+  bool has_errors() const { return (error_handler.has_errors()); }
+
+  KEY_PART **key = nullptr; /* First key parts of keys used in the query */
+};
+
+#endif  // SQL_RANGE_OPTIMIZER_RANGE_OPT_PARAM_H_
diff -Nru mysql-8.0-8.0.26/sql/range_optimizer/range_scan.cc mysql-8.0-8.0.27/sql/range_optimizer/range_scan.cc
--- mysql-8.0-8.0.26/sql/range_optimizer/range_scan.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/range_optimizer/range_scan.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,578 @@
+/* Copyright (c) 2000, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include "sql/range_optimizer/range_scan.h"
+
+#include <assert.h>
+#include <fcntl.h>
+#include <stdio.h>
+
+#include "field_types.h"
+#include "m_ctype.h"
+#include "m_string.h"
+#include "my_alloc.h"
+#include "my_base.h"
+#include "my_dbug.h"
+#include "my_sys.h"
+#include "mysql/components/services/bits/psi_bits.h"
+#include "mysql/service_mysql_alloc.h"
+#include "sql/current_thd.h"
+#include "sql/key.h"
+#include "sql/psi_memory_key.h"
+#include "sql/range_optimizer/range_scan_desc.h"
+#include "sql/sql_bitmap.h"
+#include "sql/sql_class.h"
+#include "sql/sql_const.h"
+#include "sql/sql_select.h"
+#include "sql/system_variables.h"
+#include "sql/table.h"
+#include "sql/thr_malloc.h"
+#include "sql_string.h"
+#include "template_utils.h"
+
+QUICK_RANGE_SELECT::QUICK_RANGE_SELECT(
+    TABLE *table, uint key_nr, MEM_ROOT *return_mem_root, uint mrr_flags,
+    uint mrr_buf_size, const KEY_PART *key,
+    Bounds_checked_array<QUICK_RANGE *> ranges_arg, uint used_key_parts_arg)
+    : ranges(ranges_arg),
+      free_file(false),
+      cur_range(nullptr),
+      last_range(nullptr),
+      mrr_flags(mrr_flags),
+      mrr_buf_size(mrr_buf_size),
+      mrr_buf_desc(nullptr),
+      key_parts(key),
+      dont_free(false),
+      mem_root(return_mem_root) {
+  DBUG_TRACE;
+
+  used_key_parts = used_key_parts_arg;
+  in_ror_merged_scan = false;
+  index = key_nr;
+  m_table = table;
+  key_part_info = m_table->key_info[index].key_part;
+
+  file = m_table->file;
+  record = m_table->record[0];
+
+  for (const QUICK_RANGE *range : ranges) {
+    max_used_key_length =
+        std::max(max_used_key_length, uint(range->min_length));
+    max_used_key_length =
+        std::max(max_used_key_length, uint(range->max_length));
+  }
+}
+
+void QUICK_RANGE_SELECT::need_sorted_output() { mrr_flags |= HA_MRR_SORTED; }
+
+int QUICK_RANGE_SELECT::init() {
+  DBUG_TRACE;
+
+  if (column_bitmap.bitmap == nullptr) {
+    /* Allocate a bitmap for used columns */
+    my_bitmap_map *bitmap =
+        (my_bitmap_map *)mem_root->Alloc(m_table->s->column_bitmap_size);
+    if (bitmap == nullptr) {
+      column_bitmap.bitmap = nullptr;
+      return true;
+    } else {
+      bitmap_init(&column_bitmap, bitmap, m_table->s->fields);
+    }
+  }
+
+  if (file->inited) file->ha_index_or_rnd_end();
+  return false;
+}
+
+void QUICK_RANGE_SELECT::range_end() {
+  if (file->inited) file->ha_index_or_rnd_end();
+}
+
+QUICK_RANGE_SELECT::~QUICK_RANGE_SELECT() {
+  DBUG_TRACE;
+  if (m_table->key_info[index].flags & HA_MULTI_VALUED_KEY && file)
+    file->ha_extra(HA_EXTRA_DISABLE_UNIQUE_RECORD_FILTER);
+
+  if (!dont_free) {
+    /* file is NULL for CPK scan on covering ROR-intersection */
+    if (file) {
+      range_end();
+      if (free_file) {
+        DBUG_PRINT("info",
+                   ("Freeing separate handler %p (free: %d)", file, free_file));
+        file->ha_external_lock(current_thd, F_UNLCK);
+        file->ha_close();
+        destroy(file);
+      }
+    }
+  }
+  my_free(mrr_buf_desc);
+}
+
+#ifndef NDEBUG
+static void print_multiple_key_values(const KEY_PART *key_part,
+                                      const uchar *key, uint used_length) {
+  char buff[1024];
+  const uchar *key_end = key + used_length;
+  String tmp(buff, sizeof(buff), &my_charset_bin);
+  uint store_length;
+  TABLE *table = key_part->field->table;
+  my_bitmap_map *old_sets[2];
+
+  dbug_tmp_use_all_columns(table, old_sets, table->read_set, table->write_set);
+
+  for (; key < key_end; key += store_length, key_part++) {
+    Field *field = key_part->field;
+    if (field->is_array())
+      field = (down_cast<Field_typed_array *>(field))->get_conv_field();
+    store_length = key_part->store_length;
+
+    if (field->is_nullable()) {
+      if (*key) {
+        if (fwrite("NULL", sizeof(char), 4, DBUG_FILE) != 4) {
+          goto restore_col_map;
+        }
+        continue;
+      }
+      key++;  // Skip null byte
+      store_length--;
+    }
+    field->set_key_image(key, key_part->length);
+    if (field->type() == MYSQL_TYPE_BIT)
+      (void)field->val_int_as_str(&tmp, true);
+    else
+      field->val_str(&tmp);
+    if (fwrite(tmp.ptr(), sizeof(char), tmp.length(), DBUG_FILE) !=
+        tmp.length()) {
+      goto restore_col_map;
+    }
+    if (key + store_length < key_end) fputc('/', DBUG_FILE);
+  }
+restore_col_map:
+  dbug_tmp_restore_column_maps(table->read_set, table->write_set, old_sets);
+}
+
+void QUICK_RANGE_SELECT::dbug_dump(int indent, bool verbose) {
+  /* purecov: begin inspected */
+  fprintf(DBUG_FILE, "%*squick range select, key %s, length: %d\n", indent, "",
+          m_table->key_info[index].name, max_used_key_length);
+
+  if (verbose) {
+    for (size_t ix = 0; ix < ranges.size(); ++ix) {
+      fprintf(DBUG_FILE, "%*s", indent + 2, "");
+      QUICK_RANGE *range = ranges[ix];
+      if (!(range->flag & NO_MIN_RANGE)) {
+        print_multiple_key_values(key_parts, range->min_key, range->min_length);
+        if (range->flag & NEAR_MIN)
+          fputs(" < ", DBUG_FILE);
+        else
+          fputs(" <= ", DBUG_FILE);
+      }
+      fputs("X", DBUG_FILE);
+
+      if (!(range->flag & NO_MAX_RANGE)) {
+        if (range->flag & NEAR_MAX)
+          fputs(" < ", DBUG_FILE);
+        else
+          fputs(" <= ", DBUG_FILE);
+        print_multiple_key_values(key_parts, range->max_key, range->max_length);
+      }
+      fputs("\n", DBUG_FILE);
+    }
+  }
+  /* purecov: end */
+}
+#endif
+
+/*
+  Return 1 if there is only one range and this uses the whole unique key
+*/
+
+bool QUICK_RANGE_SELECT::unique_key_range() {
+  if (ranges.size() == 1) {
+    QUICK_RANGE *tmp = ranges[0];
+    if ((tmp->flag & (EQ_RANGE | NULL_RANGE)) == EQ_RANGE) {
+      KEY *key = m_table->key_info + index;
+      return (key->flags & HA_NOSAME) && key->key_length == tmp->min_length;
+    }
+  }
+  return false;
+}
+
+/*
+  Range sequence interface implementation for array<QUICK_RANGE>: initialize
+
+  SYNOPSIS
+    quick_range_seq_init()
+      init_param  Caller-opaque paramenter: QUICK_RANGE_SELECT* pointer
+
+  RETURN
+    Opaque value to be passed to quick_range_seq_next
+*/
+
+range_seq_t quick_range_seq_init(void *init_param, uint, uint) {
+  QUICK_RANGE_SELECT *quick = static_cast<QUICK_RANGE_SELECT *>(init_param);
+  QUICK_RANGE **first = quick->ranges.begin();
+  QUICK_RANGE **last = quick->ranges.end();
+  quick->qr_traversal_ctx.first = first;
+  quick->qr_traversal_ctx.cur = first;
+  quick->qr_traversal_ctx.last = last;
+  return &quick->qr_traversal_ctx;
+}
+
+/*
+  Range sequence interface implementation for array<QUICK_RANGE>: get next
+
+  SYNOPSIS
+    quick_range_seq_next()
+      rseq        Value returned from quick_range_seq_init
+      range  OUT  Store information about the range here
+
+  @note This function return next range, and 'next' means next range in the
+  array of ranges relatively to the current one when the first keypart has
+  ASC sort order, or previous range - when key part has DESC sort order.
+  This is needed to preserve correct order of records in case of multiple
+  ranges over DESC keypart.
+
+  RETURN
+    0  Ok
+    1  No more ranges in the sequence
+*/
+
+uint quick_range_seq_next(range_seq_t rseq, KEY_MULTI_RANGE *range) {
+  QUICK_RANGE_SEQ_CTX *ctx = (QUICK_RANGE_SEQ_CTX *)rseq;
+
+  if (ctx->cur == ctx->last) return 1; /* no more ranges */
+
+  QUICK_RANGE *cur = *(ctx->cur);
+  key_range *start_key = &range->start_key;
+  key_range *end_key = &range->end_key;
+
+  start_key->key = cur->min_key;
+  start_key->length = cur->min_length;
+  start_key->keypart_map = cur->min_keypart_map;
+  start_key->flag =
+      ((cur->flag & NEAR_MIN)
+           ? HA_READ_AFTER_KEY
+           : (cur->flag & EQ_RANGE) ? HA_READ_KEY_EXACT : HA_READ_KEY_OR_NEXT);
+  end_key->key = cur->max_key;
+  end_key->length = cur->max_length;
+  end_key->keypart_map = cur->max_keypart_map;
+  /*
+    We use HA_READ_AFTER_KEY here because if we are reading on a key
+    prefix. We want to find all keys with this prefix.
+  */
+  end_key->flag =
+      (cur->flag & NEAR_MAX ? HA_READ_BEFORE_KEY : HA_READ_AFTER_KEY);
+  range->range_flag = cur->flag;
+  ctx->cur++;
+  assert(ctx->cur <= ctx->last);
+  return 0;
+}
+
+int QUICK_RANGE_SELECT::reset() {
+  uint buf_size;
+  uchar *mrange_buff = nullptr;
+  int error;
+  HANDLER_BUFFER empty_buf;
+  DBUG_TRACE;
+  last_range = nullptr;
+  cur_range = ranges.begin();
+
+  /* set keyread to true if index is covering */
+  if (!m_table->no_keyread && m_table->covering_keys.is_set(index))
+    m_table->set_keyread(true);
+  else
+    m_table->set_keyread(false);
+  if (!file->inited) {
+    /*
+      read_set is set to the correct value for ror_merge_scan here as a
+      subquery execution during optimization might result in innodb not
+      initializing the read set in index_read() leading to wrong
+      results while merging.
+    */
+    MY_BITMAP *const save_read_set = m_table->read_set;
+    MY_BITMAP *const save_write_set = m_table->write_set;
+    const bool sorted = (mrr_flags & HA_MRR_SORTED);
+    DBUG_EXECUTE_IF("bug14365043_2", DBUG_SET("+d,ha_index_init_fail"););
+
+    /* Pass index specifc read set for ror_merged_scan */
+    if (in_ror_merged_scan) {
+      /*
+        We don't need to signal the bitmap change as the bitmap is always the
+        same for this m_table->file
+      */
+      m_table->column_bitmaps_set_no_signal(&column_bitmap, &column_bitmap);
+    }
+    if ((error = file->ha_index_init(index, sorted))) {
+      file->print_error(error, MYF(0));
+      return error;
+    }
+    if (in_ror_merged_scan) {
+      /* Restore bitmaps set on entry */
+      m_table->column_bitmaps_set_no_signal(save_read_set, save_write_set);
+    }
+  }
+  // Enable & reset unique record filter for multi-valued index
+  if (m_table->key_info[index].flags & HA_MULTI_VALUED_KEY) {
+    file->ha_extra(HA_EXTRA_ENABLE_UNIQUE_RECORD_FILTER);
+    // Add PK's fields to read_set as unique filter uses rowid to skip dups
+    if (m_table->s->primary_key != MAX_KEY)
+      m_table->mark_columns_used_by_index_no_reset(m_table->s->primary_key,
+                                                   m_table->read_set);
+  }
+
+  /* Allocate buffer if we need one but haven't allocated it yet */
+  if (mrr_buf_size && !mrr_buf_desc) {
+    buf_size = mrr_buf_size;
+    while (buf_size &&
+           !my_multi_malloc(key_memory_QUICK_RANGE_SELECT_mrr_buf_desc,
+                            MYF(MY_WME), &mrr_buf_desc, sizeof(*mrr_buf_desc),
+                            &mrange_buff, buf_size, NullS)) {
+      /* Try to shrink the buffers until both are 0. */
+      buf_size /= 2;
+    }
+    if (!mrr_buf_desc) return HA_ERR_OUT_OF_MEM;
+
+    /* Initialize the handler buffer. */
+    mrr_buf_desc->buffer = mrange_buff;
+    mrr_buf_desc->buffer_end = mrange_buff + buf_size;
+    mrr_buf_desc->end_of_used_area = mrange_buff;
+  }
+
+  if (!mrr_buf_desc)
+    empty_buf.buffer = empty_buf.buffer_end = empty_buf.end_of_used_area =
+        nullptr;
+
+  RANGE_SEQ_IF seq_funcs = {quick_range_seq_init, quick_range_seq_next,
+                            nullptr};
+  error =
+      file->multi_range_read_init(&seq_funcs, this, ranges.size(), mrr_flags,
+                                  mrr_buf_desc ? mrr_buf_desc : &empty_buf);
+  return error;
+}
+
+/*
+  Get next possible record using quick-struct.
+
+  SYNOPSIS
+    QUICK_RANGE_SELECT::get_next()
+
+  NOTES
+    Record is read into table->record[0]
+
+  RETURN
+    0			Found row
+    HA_ERR_END_OF_FILE	No (more) rows in range
+    #			Error code
+*/
+
+int QUICK_RANGE_SELECT::get_next() {
+  char *dummy;
+  MY_BITMAP *const save_read_set = m_table->read_set;
+  MY_BITMAP *const save_write_set = m_table->write_set;
+  DBUG_TRACE;
+
+  if (in_ror_merged_scan) {
+    /*
+      We don't need to signal the bitmap change as the bitmap is always the
+      same for this m_table->file
+    */
+    m_table->column_bitmaps_set_no_signal(&column_bitmap, &column_bitmap);
+  }
+
+  int result = file->ha_multi_range_read_next(&dummy);
+
+  if (in_ror_merged_scan) {
+    /* Restore bitmaps set on entry */
+    m_table->column_bitmaps_set_no_signal(save_read_set, save_write_set);
+  }
+  return result;
+}
+
+/*
+  Get the next record with a different prefix.
+
+  @param prefix_length   length of cur_prefix
+  @param group_key_parts The number of key parts in the group prefix
+  @param cur_prefix      prefix of a key to be searched for
+
+  Each subsequent call to the method retrieves the first record that has a
+  prefix with length prefix_length and which is different from cur_prefix,
+  such that the record with the new prefix is within the ranges described by
+  this->ranges. The record found is stored into the buffer pointed by
+  this->record. The method is useful for GROUP-BY queries with range
+  conditions to discover the prefix of the next group that satisfies the range
+  conditions.
+
+  @todo
+
+    This method is a modified copy of QUICK_RANGE_SELECT::get_next(), so both
+    methods should be unified into a more general one to reduce code
+    duplication.
+
+  @retval 0                  on success
+  @retval HA_ERR_END_OF_FILE if returned all keys
+  @retval other              if some error occurred
+*/
+
+int QUICK_RANGE_SELECT::get_next_prefix(uint prefix_length,
+                                        uint group_key_parts,
+                                        uchar *cur_prefix) {
+  DBUG_TRACE;
+  const key_part_map keypart_map = make_prev_keypart_map(group_key_parts);
+
+  for (;;) {
+    int result;
+    if (last_range) {
+      /* Read the next record in the same range with prefix after cur_prefix. */
+      assert(cur_prefix != nullptr);
+      result = file->ha_index_read_map(record, cur_prefix, keypart_map,
+                                       HA_READ_AFTER_KEY);
+      if (result || last_range->max_keypart_map == 0) return result;
+
+      key_range previous_endpoint;
+      last_range->make_max_endpoint(&previous_endpoint, prefix_length,
+                                    keypart_map);
+      if (file->compare_key(&previous_endpoint) <= 0) return 0;
+    }
+
+    const size_t count = ranges.size() - (cur_range - ranges.begin());
+    if (count == 0) {
+      /* Ranges have already been used up before. None is left for read. */
+      last_range = nullptr;
+      return HA_ERR_END_OF_FILE;
+    }
+    last_range = *(cur_range++);
+
+    key_range start_key, end_key;
+    last_range->make_min_endpoint(&start_key, prefix_length, keypart_map);
+    last_range->make_max_endpoint(&end_key, prefix_length, keypart_map);
+
+    const bool sorted = (mrr_flags & HA_MRR_SORTED);
+    result = file->ha_read_range_first(
+        last_range->min_keypart_map ? &start_key : nullptr,
+        last_range->max_keypart_map ? &end_key : nullptr,
+        last_range->flag & EQ_RANGE, sorted);
+    if ((last_range->flag & (UNIQUE_RANGE | EQ_RANGE)) ==
+        (UNIQUE_RANGE | EQ_RANGE))
+      last_range = nullptr;  // Stop searching
+
+    if (result != HA_ERR_END_OF_FILE) return result;
+    last_range = nullptr;  // No matching rows; go to next range
+  }
+}
+
+/*
+  Check if current row will be retrieved by this QUICK_RANGE_SELECT
+
+  NOTES
+    It is assumed that currently a scan is being done on another index
+    which reads all necessary parts of the index that is scanned by this
+    quick select.
+    The implementation does a binary search on sorted array of disjoint
+    ranges, without taking size of range into account.
+
+    This function is used to filter out clustered PK scan rows in
+    index_merge quick select.
+
+  RETURN
+    true  if current row will be retrieved by this quick select
+    false if not
+*/
+
+bool QUICK_RANGE_SELECT::row_in_ranges() {
+  if (ranges.empty()) return false;
+
+  QUICK_RANGE *res;
+  size_t min = 0;
+  size_t max = ranges.size() - 1;
+  size_t mid = (max + min) / 2;
+
+  while (min != max) {
+    if (cmp_next(ranges[mid])) {
+      /* current row value > mid->max */
+      min = mid + 1;
+    } else
+      max = mid;
+    mid = (min + max) / 2;
+  }
+  res = ranges[mid];
+  return (!cmp_next(res) && !cmp_prev(res));
+}
+
+/**
+  Create a compatible quick select with the result ordered in an opposite way
+
+  @param used_key_parts_arg  Number of used key parts
+
+  @retval NULL in case of errors (OOM etc)
+  @retval pointer to a newly created QUICK_SELECT_DESC if success
+*/
+
+QUICK_SELECT_I *QUICK_RANGE_SELECT::make_reverse(uint used_key_parts_arg) {
+  return new (mem_root) QUICK_SELECT_DESC(std::move(*this), used_key_parts_arg);
+}
+
+/*
+  Compare if found key is over max-value
+  Returns 0 if key <= range->max_key
+  TODO: Figure out why can't this function be as simple as cmp_prev().
+  At least it could use key_cmp() from key.cc, it's almost identical.
+*/
+
+int QUICK_RANGE_SELECT::cmp_next(QUICK_RANGE *range_arg) {
+  int cmp;
+  if (range_arg->flag & NO_MAX_RANGE) return 0; /* key can't be to large */
+
+  cmp = key_cmp(key_part_info, range_arg->max_key, range_arg->max_length);
+  if (cmp < 0 || (cmp == 0 && !(range_arg->flag & NEAR_MAX))) return 0;
+  return 1;  // outside of range
+}
+
+/*
+  Returns 0 if found key is inside range (found key >= range->min_key).
+*/
+
+int QUICK_RANGE_SELECT::cmp_prev(QUICK_RANGE *range_arg) {
+  int cmp;
+  if (range_arg->flag & NO_MIN_RANGE) return 0; /* key can't be to small */
+
+  cmp = key_cmp(key_part_info, range_arg->min_key, range_arg->min_length);
+  if (cmp > 0 || (cmp == 0 && !(range_arg->flag & NEAR_MIN))) return 0;
+  return 1;  // outside of range
+}
+
+void QUICK_RANGE_SELECT::add_info_string(String *str) {
+  KEY *key_info = m_table->key_info + index;
+  str->append(key_info->name);
+}
+
+void QUICK_RANGE_SELECT::add_keys_and_lengths(String *key_names,
+                                              String *used_lengths) {
+  char buf[64];
+  size_t length;
+  KEY *key_info = m_table->key_info + index;
+  key_names->append(key_info->name);
+  length = longlong10_to_str(max_used_key_length, buf, 10) - buf;
+  used_lengths->append(buf, length);
+}
diff -Nru mysql-8.0-8.0.26/sql/range_optimizer/range_scan_desc.cc mysql-8.0-8.0.27/sql/range_optimizer/range_scan_desc.cc
--- mysql-8.0-8.0.26/sql/range_optimizer/range_scan_desc.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/range_optimizer/range_scan_desc.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,199 @@
+/* Copyright (c) 2000, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include "sql/range_optimizer/range_scan_desc.h"
+
+#include <assert.h>
+
+#include "my_base.h"
+#include "my_dbug.h"
+#include "sql/handler.h"
+#include "sql/key.h"
+#include "sql/table.h"
+
+/*
+  This is a hack: we inherit from QUICK_RANGE_SELECT so that we can use the
+  get_next() interface, but we have to hold a pointer to the original
+  QUICK_RANGE_SELECT because its data are used all over the place. What
+  should be done is to factor out the data that is needed into a base
+  class (QUICK_SELECT), and then have two subclasses (_ASC and _DESC)
+  which handle the ranges and implement the get_next() function.  But
+  for now, this seems to work right at least.
+*/
+
+QUICK_SELECT_DESC::QUICK_SELECT_DESC(QUICK_RANGE_SELECT &&q,
+                                     uint used_key_parts_arg)
+    : QUICK_RANGE_SELECT(std::move(q)),
+      rev_it(rev_ranges),
+      m_used_key_parts(used_key_parts_arg) {
+  QUICK_RANGE *r;
+  /*
+    Use default MRR implementation for reverse scans. No table engine
+    currently can do an MRR scan with output in reverse index order.
+  */
+  mrr_buf_desc = nullptr;
+  mrr_flags |= HA_MRR_USE_DEFAULT_IMPL;
+  mrr_flags |= HA_MRR_SORTED;  // 'sorted' as internals use index_last/_prev
+  mrr_buf_size = 0;
+
+  Quick_ranges::const_iterator pr = ranges.begin();
+  Quick_ranges::const_iterator end_range = ranges.end();
+  for (; pr != end_range; pr++) {
+    rev_ranges.push_front(*pr);
+  }
+
+  /* Remove EQ_RANGE flag for keys that are not using the full key */
+  for (r = rev_it++; r; r = rev_it++) {
+    if ((r->flag & EQ_RANGE) &&
+        m_table->key_info[index].key_length != r->max_length)
+      r->flag &= ~EQ_RANGE;
+  }
+  rev_it.rewind();
+  q.dont_free = true;  // Don't free shared mem
+}
+
+int QUICK_SELECT_DESC::get_next() {
+  DBUG_TRACE;
+
+  /* The max key is handled as follows:
+   *   - if there is NO_MAX_RANGE, start at the end and move backwards
+   *   - if it is an EQ_RANGE (which means that max key covers the entire
+   *     key) and the query does not use any hidden key fields that are
+   *     not considered when the range optimzier sets EQ_RANGE (e.g. the
+   *     primary key added by InnoDB), then go directly to the key and
+   *     read through it (sorting backwards is same as sorting forwards).
+   *   - if it is NEAR_MAX, go to the key or next, step back once, and
+   *     move backwards
+   *   - otherwise (not NEAR_MAX == include the key), go after the key,
+   *     step back once, and move backwards
+   */
+
+  for (;;) {
+    int result;
+    if (last_range) {  // Already read through key
+      result =
+          ((last_range->flag & EQ_RANGE &&
+            m_used_key_parts <= m_table->key_info[index].user_defined_key_parts)
+               ? file->ha_index_next_same(record, last_range->min_key,
+                                          last_range->min_length)
+               : file->ha_index_prev(record));
+      if (!result) {
+        if (cmp_prev(*rev_it.ref()) == 0) return 0;
+      } else if (result != HA_ERR_END_OF_FILE)
+        return result;
+    }
+
+    if (!(last_range = rev_it++)) return HA_ERR_END_OF_FILE;  // All ranges used
+
+    // Case where we can avoid descending scan, see comment above
+    const bool eqrange_all_keyparts =
+        (last_range->flag & EQ_RANGE) &&
+        (m_used_key_parts <= m_table->key_info[index].user_defined_key_parts);
+
+    /*
+      If we have pushed an index condition (ICP) and this quick select
+      will use ha_index_prev() to read data, we need to let the
+      handler know where to end the scan in order to avoid that the
+      ICP implemention continues to read past the range boundary.
+    */
+    if (file->pushed_idx_cond) {
+      if (!eqrange_all_keyparts) {
+        key_range min_range;
+        last_range->make_min_endpoint(&min_range);
+        if (min_range.length > 0)
+          file->set_end_range(&min_range, handler::RANGE_SCAN_DESC);
+        else
+          file->set_end_range(nullptr, handler::RANGE_SCAN_DESC);
+      } else {
+        /*
+          Will use ha_index_next_same() for reading records. In case we have
+          set the end range for an earlier range, this need to be cleared.
+        */
+        file->set_end_range(nullptr, handler::RANGE_SCAN_ASC);
+      }
+    }
+
+    if (last_range->flag & NO_MAX_RANGE)  // Read last record
+    {
+      int local_error;
+      if ((local_error = file->ha_index_last(record))) {
+        /*
+          HA_ERR_END_OF_FILE is returned both when the table is empty and when
+          there are no qualifying records in the range (when using ICP).
+          Interpret this return value as "no qualifying rows in the range" to
+          avoid loss of records. If the error code truly meant "empty table"
+          the next iteration of the loop will exit.
+        */
+        if (local_error != HA_ERR_END_OF_FILE) return local_error;
+        last_range = nullptr;  // Go to next range
+        continue;
+      }
+
+      if (cmp_prev(last_range) == 0) return 0;
+      last_range = nullptr;  // No match; go to next range
+      continue;
+    }
+
+    if (eqrange_all_keyparts)
+
+    {
+      result = file->ha_index_read_map(record, last_range->max_key,
+                                       last_range->max_keypart_map,
+                                       HA_READ_KEY_EXACT);
+    } else {
+      assert(last_range->flag & NEAR_MAX ||
+             (last_range->flag & EQ_RANGE &&
+              m_used_key_parts >
+                  m_table->key_info[index].user_defined_key_parts) ||
+             range_reads_after_key(last_range));
+      result = file->ha_index_read_map(
+          record, last_range->max_key, last_range->max_keypart_map,
+          ((last_range->flag & NEAR_MAX) ? HA_READ_BEFORE_KEY
+                                         : HA_READ_PREFIX_LAST_OR_PREV));
+    }
+    if (result) {
+      if (result != HA_ERR_KEY_NOT_FOUND && result != HA_ERR_END_OF_FILE)
+        return result;
+      last_range = nullptr;  // Not found, to next range
+      continue;
+    }
+    if (cmp_prev(last_range) == 0) {
+      if ((last_range->flag & (UNIQUE_RANGE | EQ_RANGE)) ==
+          (UNIQUE_RANGE | EQ_RANGE))
+        last_range = nullptr;  // Stop searching
+      return 0;                // Found key is in range
+    }
+    last_range = nullptr;  // To next range
+  }
+}
+/*
+  true if this range will require using HA_READ_AFTER_KEY
+  See comment in get_next() about this
+*/
+
+bool QUICK_SELECT_DESC::range_reads_after_key(QUICK_RANGE *range_arg) {
+  return ((range_arg->flag & (NO_MAX_RANGE | NEAR_MAX)) ||
+          !(range_arg->flag & EQ_RANGE) ||
+          m_table->key_info[index].key_length != range_arg->max_length)
+             ? true
+             : false;
+}
diff -Nru mysql-8.0-8.0.26/sql/range_optimizer/range_scan_desc.h mysql-8.0-8.0.27/sql/range_optimizer/range_scan_desc.h
--- mysql-8.0-8.0.26/sql/range_optimizer/range_scan_desc.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/range_optimizer/range_scan_desc.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,56 @@
+/* Copyright (c) 2000, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef SQL_RANGE_OPTIMIZER_RANGE_SCAN_DESC_H_
+#define SQL_RANGE_OPTIMIZER_RANGE_SCAN_DESC_H_
+
+#include <sys/types.h>
+
+#include "sql/range_optimizer/range_optimizer.h"
+#include "sql/range_optimizer/range_scan.h"
+#include "sql/sql_list.h"
+
+class QUICK_SELECT_DESC : public QUICK_RANGE_SELECT {
+ public:
+  QUICK_SELECT_DESC(QUICK_RANGE_SELECT &&q, uint used_key_parts);
+  int get_next() override;
+  bool reverse_sorted() const override { return true; }
+  bool reverse_sort_possible() const override { return true; }
+  RangeScanType get_type() const override { return QS_TYPE_RANGE_DESC; }
+  bool is_loose_index_scan() const override { return false; }
+  bool is_agg_loose_index_scan() const override { return false; }
+  QUICK_SELECT_I *make_reverse(uint) override {
+    return this;  // is already reverse sorted
+  }
+
+ private:
+  bool range_reads_after_key(QUICK_RANGE *range);
+  int reset(void) override {
+    rev_it.rewind();
+    return QUICK_RANGE_SELECT::reset();
+  }
+  List<QUICK_RANGE> rev_ranges;
+  List_iterator<QUICK_RANGE> rev_it;
+  uint m_used_key_parts;
+};
+
+#endif  // SQL_RANGE_OPTIMIZER_RANGE_SCAN_DESC_H_
diff -Nru mysql-8.0-8.0.26/sql/range_optimizer/range_scan.h mysql-8.0-8.0.27/sql/range_optimizer/range_scan.h
--- mysql-8.0-8.0.26/sql/range_optimizer/range_scan.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/range_optimizer/range_scan.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,146 @@
+/* Copyright (c) 2000, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef SQL_RANGE_OPTIMIZER_RANGE_SCAN_H_
+#define SQL_RANGE_OPTIMIZER_RANGE_SCAN_H_
+
+#include <sys/types.h>
+#include <memory>
+
+#include "my_bitmap.h"
+#include "my_inttypes.h"
+#include "sql/field.h"
+#include "sql/handler.h"
+#include "sql/range_optimizer/range_optimizer.h"
+
+class KEY_PART_INFO;
+class RANGE_OPT_PARAM;
+class SEL_ARG;
+class SEL_ROOT;
+class String;
+class THD;
+struct KEY_MULTI_RANGE;
+struct MEM_ROOT;
+struct TABLE;
+
+/*
+  MRR range sequence, array<QUICK_RANGE> implementation: sequence traversal
+  context.
+*/
+struct QUICK_RANGE_SEQ_CTX {
+  Quick_ranges::const_iterator first;
+  Quick_ranges::const_iterator cur;
+  Quick_ranges::const_iterator last;
+};
+
+/*
+  Quick select that does a range scan on a single key. The records are
+  returned in key order if ::need_sorted_output() has been called.
+*/
+class QUICK_RANGE_SELECT : public QUICK_SELECT_I {
+ protected:
+  handler *file;
+  /* Members to deal with case when this quick select is a ROR-merged scan */
+  bool in_ror_merged_scan;
+
+  // TODO: pre-allocate space to avoid malloc/free for small number of columns.
+  MY_BITMAP column_bitmap;
+
+  friend class TRP_ROR_INTERSECT;
+  friend uint quick_range_seq_next(range_seq_t rseq, KEY_MULTI_RANGE *range);
+  friend range_seq_t quick_range_seq_init(void *init_param, uint n_ranges,
+                                          uint flags);
+  friend class QUICK_SELECT_DESC;
+  friend class QUICK_INDEX_MERGE_SELECT;
+  friend class QUICK_ROR_INTERSECT_SELECT;
+  friend class QUICK_GROUP_MIN_MAX_SELECT;
+
+  Bounds_checked_array<QUICK_RANGE *> ranges; /* ordered array of range ptrs */
+  bool free_file; /* TRUE <=> this->file is "owned" by this quick select */
+
+  /* Range pointers to be used when not using MRR interface */
+  QUICK_RANGE **cur_range; /* current element in ranges  */
+  QUICK_RANGE *last_range;
+
+  /* Members needed to use the MRR interface */
+  QUICK_RANGE_SEQ_CTX qr_traversal_ctx;
+
+  uint mrr_flags;    /* Flags to be used with MRR interface */
+  uint mrr_buf_size; /* copy from thd->variables.read_rnd_buff_size */
+  HANDLER_BUFFER *mrr_buf_desc; /* the handler buffer */
+
+  /* Info about index we're scanning */
+  const KEY_PART *key_parts;
+  KEY_PART_INFO *key_part_info;
+
+  bool dont_free; /* Used by QUICK_SELECT_DESC */
+
+ private:
+  MEM_ROOT *mem_root;
+
+  int cmp_next(QUICK_RANGE *range);
+  int cmp_prev(QUICK_RANGE *range);
+  bool row_in_ranges();
+
+ public:
+  QUICK_RANGE_SELECT(TABLE *table, uint index_arg, MEM_ROOT *return_mem_root,
+                     uint mrr_flags, uint mrr_buf_size, const KEY_PART *key,
+                     Bounds_checked_array<QUICK_RANGE *> ranges,
+                     uint used_key_parts_arg);
+  ~QUICK_RANGE_SELECT() override;
+
+  QUICK_RANGE_SELECT(const QUICK_RANGE_SELECT &) = delete;
+
+  /* Default move ctor used by QUICK_SELECT_DESC */
+  QUICK_RANGE_SELECT(QUICK_RANGE_SELECT &&) = default;
+
+  void need_sorted_output() override;
+  int init() override;
+  int reset(void) override;
+  int get_next() override;
+  void range_end() override;
+  int get_next_prefix(uint prefix_length, uint group_key_parts,
+                      uchar *cur_prefix);
+  bool reverse_sorted() const override { return false; }
+  bool reverse_sort_possible() const override { return true; }
+  bool unique_key_range() override;
+  int init_ror_merged_scan(bool reuse_handler) override;
+  void save_last_pos() override { file->position(record); }
+  RangeScanType get_type() const override { return QS_TYPE_RANGE; }
+  bool is_loose_index_scan() const override { return false; }
+  bool is_agg_loose_index_scan() const override { return false; }
+  void add_keys_and_lengths(String *key_names, String *used_lengths) override;
+  void add_info_string(String *str) override;
+#ifndef NDEBUG
+  void dbug_dump(int indent, bool verbose) override;
+#endif
+  QUICK_SELECT_I *make_reverse(uint used_key_parts_arg) override;
+  void set_handler(handler *file_arg) override { file = file_arg; }
+
+  void get_fields_used(MY_BITMAP *used_fields) override {
+    for (uint i = 0; i < used_key_parts; i++)
+      bitmap_set_bit(used_fields, key_parts[i].field->field_index());
+  }
+  uint get_mrr_flags() const { return mrr_flags; }
+};
+
+#endif  // SQL_RANGE_OPTIMIZER_RANGE_SCAN_H_
diff -Nru mysql-8.0-8.0.26/sql/range_optimizer/range_scan_plan.cc mysql-8.0-8.0.27/sql/range_optimizer/range_scan_plan.cc
--- mysql-8.0-8.0.26/sql/range_optimizer/range_scan_plan.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/range_optimizer/range_scan_plan.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,1259 @@
+/* Copyright (c) 2000, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include "sql/range_optimizer/range_scan_plan.h"
+
+#include <assert.h>
+#include <string.h>
+#include <algorithm>
+#include <memory>
+
+#include "m_ctype.h"
+#include "my_alloc.h"
+#include "my_base.h"
+#include "my_inttypes.h"
+#include "my_sys.h"
+#include "sql/key.h"
+#include "sql/mem_root_array.h"
+#include "sql/opt_hints.h"
+#include "sql/opt_trace.h"
+#include "sql/opt_trace_context.h"
+#include "sql/range_optimizer/geometry.h"
+#include "sql/range_optimizer/internal.h"
+#include "sql/range_optimizer/range_opt_param.h"
+#include "sql/range_optimizer/range_optimizer.h"
+#include "sql/range_optimizer/range_scan.h"
+#include "sql/range_optimizer/tree.h"
+#include "sql/sql_bitmap.h"
+#include "sql/sql_class.h"
+#include "sql/sql_lex.h"
+#include "sql/sql_select.h"
+#include "sql/table.h"
+#include "sql/thr_malloc.h"
+#include "sql_string.h"
+
+using opt_range::null_element;
+using std::max;
+using std::min;
+
+static bool is_key_scan_ror(RANGE_OPT_PARAM *param, uint keynr, uint nparts);
+static bool eq_ranges_exceeds_limit(const SEL_ROOT *keypart, uint *count,
+                                    uint limit);
+static bool get_quick_keys(MEM_ROOT *return_mem_root, const KEY *table_key,
+                           KEY_PART *key, SEL_ARG *key_tree,
+                           uchar *const base_min_key, uchar *min_key,
+                           uint min_key_flag, uchar *const base_max_key,
+                           uchar *max_key, uint max_key_flag, uint *desc_flag,
+                           uint num_key_parts, uint *used_key_parts,
+                           Quick_ranges *ranges);
+
+/* MRR range sequence, SEL_ARG* implementation: stack entry */
+struct RANGE_SEQ_ENTRY {
+  /*
+    Pointers in min and max keys. They point to right-after-end of key
+    images. The 0-th entry has these pointing to key tuple start.
+  */
+  uchar *min_key, *max_key;
+
+  /*
+    Flags, for {keypart0, keypart1, ... this_keypart} subtuple.
+    min_key_flag may have NULL_RANGE set.
+  */
+  uint min_key_flag, max_key_flag;
+  enum ha_rkey_function rkey_func_flag;
+  /* Number of key parts */
+  uint min_key_parts, max_key_parts;
+  /**
+    Pointer into the R-B tree for this keypart. It points to the
+    currently active range for the keypart, so calling next on it will
+    get to the next range. sel_arg_range_seq_next() uses this to avoid
+    reparsing the R-B range trees each time a new range is fetched.
+  */
+  SEL_ARG *key_tree;
+};
+
+/*
+  MRR range sequence, SEL_ARG* implementation: SEL_ARG graph traversal context
+*/
+class Sel_arg_range_sequence {
+ private:
+  /**
+    Stack of ranges for the curr_kp first keyparts. Used by
+    sel_arg_range_seq_next() so that if the next range is equal to the
+    previous one for the first x keyparts, stack[x-1] can be
+    accumulated with the new range in keyparts > x to quickly form
+    the next range to return.
+
+    Notation used below: "x:y" means a range where
+    "column_in_keypart_0=x" and "column_in_keypart_1=y". For
+    simplicity, only equality (no BETWEEN, < etc) is considered in the
+    example but the same principle applies to other range predicate
+    operators too.
+
+    Consider a query with these range predicates:
+      (kp0=1 and kp1=2 and kp2=3) or
+      (kp0=1 and kp1=2 and kp2=4) or
+      (kp0=1 and kp1=3 and kp2=5) or
+      (kp0=1 and kp1=3 and kp2=6)
+
+    1) sel_arg_range_seq_next() is called the first time
+       - traverse the R-B tree (see SEL_ARG) to find the first range
+       - returns range "1:2:3"
+       - values in stack after this: stack[1, 1:2, 1:2:3]
+    2) sel_arg_range_seq_next() is called second time
+       - keypart 2 has another range, so the next range in
+         keypart 2 is appended to stack[1] and saved
+         in stack[2]
+       - returns range "1:2:4"
+       - values in stack after this: stack[1, 1:2, 1:2:4]
+    3) sel_arg_range_seq_next() is called the third time
+       - no more ranges in keypart 2, but keypart 1 has
+         another range, so the next range in keypart 1 is
+         appended to stack[0] and saved in stack[1]. The first
+         range in keypart 2 is then appended to stack[1] and
+         saved in stack[2]
+       - returns range "1:3:5"
+       - values in stack after this: stack[1, 1:3, 1:3:5]
+    4) sel_arg_range_seq_next() is called the fourth time
+       - keypart 2 has another range, see 2)
+       - returns range "1:3:6"
+       - values in stack after this: stack[1, 1:3, 1:3:6]
+  */
+  RANGE_SEQ_ENTRY stack[MAX_REF_PARTS];
+  /*
+    Index of last used element in the above array. A value of -1 means
+    that the stack is empty.
+  */
+  int curr_kp;
+
+ public:
+  uint keyno;      /* index of used tree in SEL_TREE structure */
+  uint real_keyno; /* Number of the index in tables */
+
+  RANGE_OPT_PARAM *const param;
+  bool *is_ror_scan;
+  uchar *min_key, *max_key;
+  const bool skip_records_in_range;
+  SEL_ARG *start; /* Root node of the traversed SEL_ARG* graph */
+
+  /* Number of ranges in the last checked tree->key */
+  uint range_count = 0;
+  uint max_key_part;
+
+  Sel_arg_range_sequence(RANGE_OPT_PARAM *param_arg, bool *is_ror_scan_arg,
+                         uchar *min_key_arg, uchar *max_key_arg,
+                         bool skip_records_in_range_arg)
+      : param(param_arg),
+        is_ror_scan(is_ror_scan_arg),
+        min_key(min_key_arg),
+        max_key(max_key_arg),
+        skip_records_in_range(skip_records_in_range_arg) {
+    reset();
+  }
+
+  void reset() {
+    stack[0].key_tree = nullptr;
+    stack[0].min_key = min_key;
+    stack[0].min_key_flag = 0;
+    stack[0].min_key_parts = 0;
+    stack[0].rkey_func_flag = HA_READ_INVALID;
+
+    stack[0].max_key = max_key;
+    stack[0].max_key_flag = 0;
+    stack[0].max_key_parts = 0;
+    curr_kp = -1;
+  }
+
+  bool stack_empty() const { return (curr_kp == -1); }
+
+  void stack_push_range(SEL_ARG *key_tree);
+
+  void stack_pop_range() {
+    assert(!stack_empty());
+    if (curr_kp == 0)
+      reset();
+    else
+      curr_kp--;
+  }
+
+  int stack_size() const { return curr_kp + 1; }
+
+  RANGE_SEQ_ENTRY *stack_top() {
+    return stack_empty() ? nullptr : &stack[curr_kp];
+  }
+};
+
+/*
+  Range sequence interface, SEL_ARG* implementation: Initialize the traversal
+
+  SYNOPSIS
+    init()
+      init_params  SEL_ARG tree traversal context
+
+  RETURN
+    Value of init_param
+*/
+
+static range_seq_t sel_arg_range_seq_init(void *init_param, uint, uint) {
+  Sel_arg_range_sequence *seq =
+      static_cast<Sel_arg_range_sequence *>(init_param);
+  seq->reset();
+  return init_param;
+}
+
+void Sel_arg_range_sequence::stack_push_range(SEL_ARG *key_tree) {
+  assert((uint)curr_kp + 1 < MAX_REF_PARTS);
+
+  RANGE_SEQ_ENTRY *push_position = &stack[curr_kp + 1];
+  RANGE_SEQ_ENTRY *last_added_kp = stack_top();
+  if (stack_empty()) {
+    /*
+       If we get here this is either
+         a) the first time a range sequence is constructed for this
+            range access method (in which case stack[0] has not been
+            modified since the constructor was called), or
+         b) there are multiple ranges for the first keypart in the
+            condition (and we have called stack_pop_range() to empty
+            the stack).
+       In both cases, reset() has been called and all fields in
+       push_position have been reset. All we need to do is to copy the
+       min/max key flags from the predicate we're about to add to
+       stack[0].
+    */
+    push_position->min_key_flag = key_tree->get_min_flag();
+    push_position->max_key_flag = key_tree->get_max_flag();
+    push_position->rkey_func_flag = key_tree->rkey_func_flag;
+  } else {
+    push_position->min_key = last_added_kp->min_key;
+    push_position->max_key = last_added_kp->max_key;
+    push_position->min_key_parts = last_added_kp->min_key_parts;
+    push_position->max_key_parts = last_added_kp->max_key_parts;
+    push_position->min_key_flag =
+        last_added_kp->min_key_flag | key_tree->get_min_flag();
+    push_position->max_key_flag =
+        last_added_kp->max_key_flag | key_tree->get_max_flag();
+    push_position->rkey_func_flag = key_tree->rkey_func_flag;
+  }
+
+  push_position->key_tree = key_tree;
+  /* psergey-merge-done:
+  key_tree->store(arg->param->key[arg->keyno][key_tree->part].store_length,
+                  &cur->min_key, prev->min_key_flag,
+                  &cur->max_key, prev->max_key_flag);
+  */
+  key_tree->store_min_max_values(
+      param->key[keyno][key_tree->part].store_length, &push_position->min_key,
+      (last_added_kp ? last_added_kp->min_key_flag : 0),
+      &push_position->max_key,
+      (last_added_kp ? last_added_kp->max_key_flag : 0),
+      (int *)&push_position->min_key_parts,
+      (int *)&push_position->max_key_parts);
+  if (key_tree->is_null_interval()) push_position->min_key_flag |= NULL_RANGE;
+  curr_kp++;
+}
+
+/*
+  Range sequence interface, SEL_ARG* implementation: get the next interval
+  in the R-B tree
+
+  SYNOPSIS
+    sel_arg_range_seq_next()
+      rseq        Value returned from sel_arg_range_seq_init
+      range  OUT  Store information about the range here
+
+  DESCRIPTION
+    This is "get_next" function for Range sequence interface implementation
+    for SEL_ARG* tree.
+
+  IMPLEMENTATION
+    The traversal also updates those param members:
+      - range_count
+      - max_key_part
+    as well as:
+      - is_ror_scan
+
+  RETURN
+    0  Ok
+    1  No more ranges in the sequence
+
+  NOTE: append_range_all_keyparts(), which is used to e.g. print
+  ranges to Optimizer Trace in a human readable format, mimics the
+  behavior of this function.
+*/
+
+// psergey-merge-todo: support check_quick_keys:max_keypart
+static uint sel_arg_range_seq_next(range_seq_t rseq, KEY_MULTI_RANGE *range) {
+  SEL_ARG *key_tree;
+  Sel_arg_range_sequence *seq = static_cast<Sel_arg_range_sequence *>(rseq);
+
+  if (seq->stack_empty()) {
+    /*
+      This is the first time sel_arg_range_seq_next is called.
+      seq->start points to the root of the R-B tree for the first
+      keypart
+    */
+    key_tree = seq->start;
+
+    /*
+      Move to the first range for the first keypart. Save this range
+      in seq->stack[0] and carry on to ranges in the next keypart if
+      any
+    */
+    key_tree = key_tree->first();
+    seq->stack_push_range(key_tree);
+  } else {
+    /*
+      This is not the first time sel_arg_range_seq_next is called, so
+      seq->stack is populated with the range the last call to this
+      function found. seq->stack[current_keypart].key_tree points to a
+      leaf in the R-B tree of the last keypart that was part of the
+      former range. This is the starting point for finding the next
+      range. @see Sel_arg_range_sequence::stack
+    */
+    // See if there are more ranges in this or any of the previous keyparts
+    while (true) {
+      key_tree = seq->stack_top()->key_tree;
+      seq->stack_pop_range();
+      if (key_tree->next) {
+        /* This keypart has more ranges */
+        assert(key_tree->next != null_element);
+        key_tree = key_tree->next;
+
+        /*
+          save the next range for this keypart and carry on to ranges in
+          the next keypart if any
+        */
+        seq->stack_push_range(key_tree);
+        *seq->is_ror_scan = false;
+        break;
+      }
+
+      if (seq->stack_empty()) {
+        // There are no more ranges for the first keypart: we're done
+        return 1;
+      }
+      /*
+         There are no more ranges for the current keypart. Step back
+         to the previous keypart and see if there are more ranges
+         there.
+      */
+    }
+  }
+
+  assert(!seq->stack_empty());
+
+  /*
+    Add range info for the next keypart if
+      1) there is a range predicate for a later keypart
+      2) the range predicate is for the next keypart in the index: a
+         range predicate on keypartX+1 can only be used if there is a
+         range predicate on keypartX.
+      3) the range predicate on the next keypart is usable
+  */
+  while (key_tree->next_key_part &&                                    // 1)
+         key_tree->next_key_part->root != null_element &&              // 1)
+         key_tree->next_key_part->root->part == key_tree->part + 1 &&  // 2)
+         key_tree->next_key_part->type == SEL_ROOT::Type::KEY_RANGE)   // 3)
+  {
+    {
+      DBUG_PRINT("info", ("while(): key_tree->part %d", key_tree->part));
+      RANGE_SEQ_ENTRY *cur = seq->stack_top();
+      const size_t min_key_total_length = cur->min_key - seq->min_key;
+      const size_t max_key_total_length = cur->max_key - seq->max_key;
+
+      /*
+        Check if more ranges can be added. This is the case if all
+        predicates for keyparts handled so far are equality
+        predicates. If either of the following apply, there are
+        non-equality predicates in stack[]:
+
+        1) min_key_total_length != max_key_total_length (because
+           equality ranges are stored as "min_key = max_key = <value>")
+        2) memcmp(<min_key_values>,<max_key_values>) != 0 (same argument as 1)
+        3) A min or max flag has been set: Because flags denote ranges
+           ('<', '<=' etc), any value but 0 indicates a non-equality
+           predicate.
+      */
+
+      uchar *min_key_start;
+      uchar *max_key_start;
+      size_t cur_key_length;
+
+      if (seq->stack_size() == 1) {
+        min_key_start = seq->min_key;
+        max_key_start = seq->max_key;
+        cur_key_length = min_key_total_length;
+      } else {
+        const RANGE_SEQ_ENTRY prev = cur[-1];
+        min_key_start = prev.min_key;
+        max_key_start = prev.max_key;
+        cur_key_length = cur->min_key - prev.min_key;
+      }
+
+      if ((min_key_total_length != max_key_total_length) ||          // 1)
+          (memcmp(min_key_start, max_key_start, cur_key_length)) ||  // 2)
+          (key_tree->min_flag || key_tree->max_flag))                // 3)
+      {
+        DBUG_PRINT("info", ("while(): inside if()"));
+        /*
+          The range predicate up to and including the one in key_tree
+          is usable by range access but does not allow subranges made
+          up from predicates in later keyparts. This may e.g. be
+          because the predicate operator is "<". Since there are range
+          predicates on more keyparts, we use those to more closely
+          specify the start and stop locations for the range. Example:
+
+                "SELECT * FROM t1 WHERE a >= 2 AND b >= 3":
+
+                t1 content:
+                -----------
+                1 1
+                2 1     <- 1)
+                2 2
+                2 3     <- 2)
+                2 4
+                3 1
+                3 2
+                3 3
+
+          The predicate cannot be translated into something like
+             "(a=2 and b>=3) or (a=3 and b>=3) or ..."
+          I.e., it cannot be divided into subranges, but by storing
+          min/max key below we can at least start the scan from 2)
+          instead of 1)
+
+        */
+        *seq->is_ror_scan = false;
+        key_tree->store_next_min_max_keys(
+            seq->param->key[seq->keyno], &cur->min_key, &cur->min_key_flag,
+            &cur->max_key, &cur->max_key_flag, (int *)&cur->min_key_parts,
+            (int *)&cur->max_key_parts);
+        break;
+      }
+    }
+
+    /*
+      There are usable range predicates for the next keypart and the
+      range predicate for the current keypart allows us to make use of
+      them. Move to the first range predicate for the next keypart.
+      Push this range predicate to seq->stack and move on to the next
+      keypart (if any). @see Sel_arg_range_sequence::stack
+    */
+    key_tree = key_tree->next_key_part->root->first();
+    seq->stack_push_range(key_tree);
+  }
+
+  assert(!seq->stack_empty() && (seq->stack_top() != nullptr));
+
+  // We now have a full range predicate in seq->stack_top()
+  RANGE_SEQ_ENTRY *cur = seq->stack_top();
+  RANGE_OPT_PARAM *param = seq->param;
+  size_t min_key_length = cur->min_key - seq->min_key;
+
+  if (cur->min_key_flag & GEOM_FLAG) {
+    range->range_flag = cur->min_key_flag;
+
+    /* Here minimum contains also function code bits, and maximum is +inf */
+    range->start_key.key = seq->min_key;
+    range->start_key.length = min_key_length;
+    range->start_key.keypart_map = make_prev_keypart_map(cur->min_key_parts);
+    range->start_key.flag = cur->rkey_func_flag;
+    /*
+      Spatial operators are only allowed on spatial indexes, and no
+      spatial index can at the moment return rows in ROWID order
+    */
+    assert(!*seq->is_ror_scan);
+  } else {
+    const KEY *cur_key_info = &param->table->key_info[seq->real_keyno];
+    range->range_flag = cur->min_key_flag | cur->max_key_flag;
+
+    range->start_key.key = seq->min_key;
+    range->start_key.length = cur->min_key - seq->min_key;
+    range->start_key.keypart_map = make_prev_keypart_map(cur->min_key_parts);
+    range->start_key.flag =
+        (cur->min_key_flag & NEAR_MIN ? HA_READ_AFTER_KEY : HA_READ_KEY_EXACT);
+
+    range->end_key.key = seq->max_key;
+    range->end_key.length = cur->max_key - seq->max_key;
+    range->end_key.keypart_map = make_prev_keypart_map(cur->max_key_parts);
+    range->end_key.flag =
+        (cur->max_key_flag & NEAR_MAX ? HA_READ_BEFORE_KEY : HA_READ_AFTER_KEY);
+    /*
+      This is an equality range (keypart_0=X and ... and keypart_n=Z) if
+        1) There are no flags indicating open range (e.g.,
+           "keypart_x > y") or GIS.
+        2) The lower bound and the upper bound of the range has the
+           same value (min_key == max_key).
+    */
+    const uint is_open_range =
+        (NO_MIN_RANGE | NO_MAX_RANGE | NEAR_MIN | NEAR_MAX | GEOM_FLAG);
+    const bool is_eq_range_pred =
+        !(cur->min_key_flag & is_open_range) &&              // 1)
+        !(cur->max_key_flag & is_open_range) &&              // 1)
+        range->start_key.length == range->end_key.length &&  // 2)
+        !memcmp(seq->min_key, seq->max_key, range->start_key.length);
+
+    if (is_eq_range_pred) {
+      range->range_flag = EQ_RANGE;
+      /*
+        Use statistics instead of index dives for estimates of rows in
+        this range if the user requested it
+      */
+      if (param->use_index_statistics)
+        range->range_flag |= SKIP_RECORDS_IN_RANGE;
+
+      /*
+        An equality range is a unique range (0 or 1 rows in the range)
+        if the index is unique (1) and all keyparts are used (2).
+        Note that keys which are extended with PK parts have no
+        HA_NOSAME flag. So we can use user_defined_key_parts.
+      */
+      if (cur_key_info->flags & HA_NOSAME &&  // 1)
+          (uint)key_tree->part + 1 ==
+              cur_key_info->user_defined_key_parts)  // 2)
+        range->range_flag |= UNIQUE_RANGE | (cur->min_key_flag & NULL_RANGE);
+    }
+
+    if (*seq->is_ror_scan) {
+      const uint key_part_number = key_tree->part + 1;
+      /*
+        If we get here, the condition on the key was converted to form
+        "(keyXpart1 = c1) AND ... AND (keyXpart{key_tree->part - 1} = cN) AND
+          somecond(keyXpart{key_tree->part})"
+        Check if
+          somecond is "keyXpart{key_tree->part} = const" and
+          uncovered "tail" of KeyX parts is either empty or is identical to
+          first members of clustered primary key.
+
+        If last key part is PK part added to the key as an extension
+        and is_key_scan_ror() result is true then it's possible to
+        use ROR scan.
+      */
+      if ((!is_eq_range_pred &&
+           key_part_number <= cur_key_info->user_defined_key_parts) ||
+          !is_key_scan_ror(param, seq->real_keyno, key_part_number))
+        *seq->is_ror_scan = false;
+    }
+  }
+
+  seq->range_count++;
+  seq->max_key_part = max<uint>(seq->max_key_part, key_tree->part);
+
+  if (seq->skip_records_in_range) range->range_flag |= SKIP_RECORDS_IN_RANGE;
+
+  return 0;
+}
+
+ha_rows check_quick_select(THD *thd, RANGE_OPT_PARAM *param, uint idx,
+                           bool index_only, SEL_ROOT *tree,
+                           bool update_tbl_stats, enum_order order_direction,
+                           bool skip_records_in_range, uint *mrr_flags,
+                           uint *bufsize, Cost_estimate *cost,
+                           bool *is_ror_scan, bool *is_imerge_scan) {
+  uchar min_key[MAX_KEY_LENGTH + MAX_FIELD_WIDTH];
+  uchar max_key[MAX_KEY_LENGTH + MAX_FIELD_WIDTH];
+
+  Sel_arg_range_sequence seq(param, is_ror_scan, min_key, max_key,
+                             skip_records_in_range);
+  RANGE_SEQ_IF seq_if = {sel_arg_range_seq_init, sel_arg_range_seq_next,
+                         nullptr};
+  handler *file = param->table->file;
+  ha_rows rows;
+  uint keynr = param->real_keynr[idx];
+  DBUG_TRACE;
+
+  /* Handle cases when we don't have a valid non-empty list of range */
+  if (!tree) return HA_POS_ERROR;
+  if (tree->type == SEL_ROOT::Type::IMPOSSIBLE) return 0L;
+  if (tree->type != SEL_ROOT::Type::KEY_RANGE || tree->root->part != 0)
+    return HA_POS_ERROR;  // Don't use tree
+
+  seq.keyno = idx;
+  seq.real_keyno = keynr;
+  seq.start = tree->root;
+  seq.range_count = 0;
+  seq.max_key_part = 0;
+
+  /*
+    If there are more equality ranges than specified by the
+    eq_range_index_dive_limit variable we switches from using index
+    dives to use statistics.
+  */
+  uint range_count = 0;
+  param->use_index_statistics = eq_ranges_exceeds_limit(
+      tree, &range_count, thd->variables.eq_range_index_dive_limit);
+  *is_imerge_scan = true;
+  *is_ror_scan = !(file->index_flags(keynr, 0, true) & HA_KEY_SCAN_NOT_ROR);
+
+  *mrr_flags = (order_direction == ORDER_DESC) ? HA_MRR_USE_DEFAULT_IMPL : 0;
+  *mrr_flags |= HA_MRR_NO_ASSOCIATION;
+  /*
+    Pass HA_MRR_SORTED to see if MRR implementation can handle sorting.
+  */
+  if (order_direction != ORDER_NOT_RELEVANT) *mrr_flags |= HA_MRR_SORTED;
+
+  bool pk_is_clustered = file->primary_key_is_clustered();
+  if (index_only &&
+      (file->index_flags(keynr, seq.max_key_part, true) & HA_KEYREAD_ONLY) &&
+      !(pk_is_clustered && keynr == param->table->s->primary_key))
+    *mrr_flags |= HA_MRR_INDEX_ONLY;
+
+  if (current_thd->lex->sql_command != SQLCOM_SELECT)
+    *mrr_flags |= HA_MRR_SORTED;  // Assumed to give faster ins/upd/del
+
+  *bufsize = thd->variables.read_rnd_buff_size;
+  // Sets is_ror_scan to false for some queries, e.g. multi-ranges
+  rows = file->multi_range_read_info_const(keynr, &seq_if, (void *)&seq, 0,
+                                           bufsize, mrr_flags, cost);
+  if (rows != HA_POS_ERROR) {
+    param->table->quick_rows[keynr] = rows;
+    if (update_tbl_stats) {
+      param->table->quick_keys.set_bit(keynr);
+      param->table->quick_key_parts[keynr] = seq.max_key_part + 1;
+      param->table->quick_n_ranges[keynr] = seq.range_count;
+      param->table->quick_condition_rows =
+          min(param->table->quick_condition_rows, rows);
+    }
+    param->table->possible_quick_keys.set_bit(keynr);
+  }
+  /*
+    Check whether ROR scan could be used. It cannot be used if
+    1. Index algo is not HA_KEY_ALG_BTREE or HA_KEY_ALG_SE_SPECIFIC
+       (this mostly covers engines like Archive/Federated.)
+       TODO: Don't have this logic here, make table engines return
+       appropriate flags instead.
+    2. Any of the keyparts in the index chosen is descending. Desc
+       indexes do not work well for ROR scans, except for clustered PK.
+    3. SE states the index can't be used for ROR. We need 2nd check
+       here to avoid enabling it for a non-ROR PK.
+    4. Index contains virtual columns. QUICK_ROR_INTERSECT_SELECT
+       and QUICK_ROR_UNION_SELECT do read_set manipulations in reset(),
+       which breaks virtual generated column's computation logic, which
+       is used when reading index values. So, disable index merge
+       intersection/union for any index on such column.
+       @todo lift this implementation restriction
+  */
+  // Get the index key algorithm
+  enum ha_key_alg key_alg = param->table->key_info[seq.real_keyno].algorithm;
+
+  // Check if index has desc keypart
+  KEY_PART_INFO *key_part = param->table->key_info[keynr].key_part;
+  KEY_PART_INFO *key_part_end =
+      key_part + param->table->key_info[keynr].user_defined_key_parts;
+  for (; key_part != key_part_end; ++key_part) {
+    if (key_part->key_part_flag & HA_REVERSE_SORT) {
+      // ROR will be enabled again for clustered PK, see 'else if' below.
+      *is_ror_scan = false;  // 2
+      *is_imerge_scan = false;
+      break;
+    }
+  }
+  if (((key_alg != HA_KEY_ALG_BTREE) &&
+       (key_alg != HA_KEY_ALG_SE_SPECIFIC)) ||                      // 1
+      (file->index_flags(keynr, 0, true) & HA_KEY_SCAN_NOT_ROR) ||  // 3
+      param->table->index_contains_some_virtual_gcol(keynr))        // 4
+  {
+    *is_ror_scan = false;
+  } else if (param->table->s->primary_key == keynr && pk_is_clustered) {
+    /*
+      Clustered PK scan is always a ROR scan (TODO: same as above).
+      This can enable ROR back if it was disabled by multi_range_read_info_const
+      call.
+    */
+    *is_ror_scan = true;
+  }
+
+  DBUG_PRINT("exit", ("Records: %lu", (ulong)rows));
+  return rows;
+}
+
+/*
+  Check if key scan on given index with equality conditions on first n key
+  parts is a ROR scan.
+
+  SYNOPSIS
+    is_key_scan_ror()
+      param  Parameter from test_quick_select
+      keynr  Number of key in the table. The key must not be a clustered
+             primary key.
+      nparts Number of first key parts for which equality conditions
+             are present.
+
+  NOTES
+    ROR (Rowid Ordered Retrieval) key scan is a key scan that produces
+    ordered sequence of rowids (ha_xxx::cmp_ref is the comparison function)
+
+    This function is needed to handle a practically-important special case:
+    an index scan is a ROR scan if it is done using a condition in form
+
+        "key1_1=c_1 AND ... AND key1_n=c_n"
+
+    where the index is defined on (key1_1, ..., key1_N [,a_1, ..., a_n])
+
+    and the table has a clustered Primary Key defined as
+
+      PRIMARY KEY(a_1, ..., a_n, b1, ..., b_k)
+
+    i.e. the first key parts of it are identical to uncovered parts ot the
+    key being scanned. This function assumes that the index flags do not
+    include HA_KEY_SCAN_NOT_ROR flag (that is checked elsewhere).
+
+    Check (1) is made in quick_range_seq_next()
+
+  RETURN
+    true   The scan is ROR-scan
+    false  Otherwise
+*/
+
+static bool is_key_scan_ror(RANGE_OPT_PARAM *param, uint keynr, uint nparts) {
+  KEY *table_key = param->table->key_info + keynr;
+
+  /*
+    Range predicates on hidden key parts do not change the fact
+    that a scan is rowid ordered, so we only care about user
+    defined keyparts
+  */
+  const uint user_defined_nparts =
+      std::min<uint>(nparts, table_key->user_defined_key_parts);
+
+  KEY_PART_INFO *key_part = table_key->key_part + user_defined_nparts;
+  KEY_PART_INFO *key_part_end =
+      (table_key->key_part + table_key->user_defined_key_parts);
+  uint pk_number;
+
+  for (KEY_PART_INFO *kp = table_key->key_part; kp < key_part; kp++) {
+    uint16 fieldnr = param->table->key_info[keynr]
+                         .key_part[kp - table_key->key_part]
+                         .fieldnr -
+                     1;
+    if (param->table->field[fieldnr]->key_length() != kp->length) return false;
+  }
+
+  if (key_part == key_part_end) return true;
+
+  key_part = table_key->key_part + user_defined_nparts;
+  pk_number = param->table->s->primary_key;
+  if (!param->table->file->primary_key_is_clustered() || pk_number == MAX_KEY)
+    return false;
+
+  KEY_PART_INFO *pk_part = param->table->key_info[pk_number].key_part;
+  KEY_PART_INFO *pk_part_end =
+      pk_part + param->table->key_info[pk_number].user_defined_key_parts;
+  for (; (key_part != key_part_end) && (pk_part != pk_part_end);
+       ++key_part, ++pk_part) {
+    if ((key_part->field != pk_part->field) ||
+        (key_part->length != pk_part->length))
+      return false;
+  }
+  return (key_part == key_part_end);
+}
+
+bool get_ranges_from_tree(MEM_ROOT *return_mem_root, TABLE *table,
+                          KEY_PART *key, uint keyno, SEL_ROOT *key_tree,
+                          uint num_key_parts, unsigned *used_key_parts,
+                          Quick_ranges *ranges) {
+  *used_key_parts = 0;
+  if (key_tree->type != SEL_ROOT::Type::KEY_RANGE) {
+    return false;
+  }
+  uchar min_key[MAX_KEY_LENGTH + MAX_FIELD_WIDTH];
+  uchar max_key[MAX_KEY_LENGTH + MAX_FIELD_WIDTH];
+  return get_quick_keys(return_mem_root, &table->key_info[keyno], key,
+                        key_tree->root, min_key, min_key, 0, max_key, max_key,
+                        0, nullptr, num_key_parts, used_key_parts, ranges);
+}
+/*
+  Create a QUICK_RANGE_SELECT from given key and SEL_ARG tree for that key.
+
+  SYNOPSIS
+    get_quick_select()
+      reurn_mem_root MEM_ROOT to allocate the object and associated data on.
+      table          Table to scan.
+      key
+      keyno          Index of used key in table.
+      key_tree       SEL_ARG tree for the used key
+      mrr_flags      MRR parameter for quick select
+      mrr_buf_size   MRR parameter for quick select
+      num_key_parts  Number of key parts used for creating QUICK_RANGE_SELECT.
+                     Note: QUICK_GROUP_MIN_MAX creates ranges only for key parts
+                     on grouped columns. Rest of the scans create ranges using
+                     all usable keyparts. Hence the default is MAX_REF_PARTS.
+
+  NOTES
+    The caller must call QUICK_SELECT::init for returned quick select.
+
+  RETURN
+    NULL on error
+    otherwise created quick select
+*/
+
+QUICK_RANGE_SELECT *get_quick_select(MEM_ROOT *return_mem_root, TABLE *table,
+                                     KEY_PART *key, uint keyno,
+                                     SEL_ROOT *key_tree, uint mrr_flags,
+                                     uint mrr_buf_size, uint num_key_parts) {
+  DBUG_TRACE;
+
+  assert(key_tree->type == SEL_ROOT::Type::KEY_RANGE ||
+         key_tree->type == SEL_ROOT::Type::IMPOSSIBLE);
+
+  Quick_ranges ranges(return_mem_root);
+  unsigned used_key_parts;
+  if (get_ranges_from_tree(return_mem_root, table, key, keyno, key_tree,
+                           num_key_parts, &used_key_parts, &ranges)) {
+    return nullptr;
+  }
+
+  if (table->key_info[keyno].flags & HA_SPATIAL) {
+    return new (return_mem_root) QUICK_RANGE_SELECT_GEOM(
+        table, keyno, return_mem_root, mrr_flags, mrr_buf_size, key,
+        {&ranges[0], ranges.size()}, used_key_parts);
+  } else {
+    return new (return_mem_root) QUICK_RANGE_SELECT(
+        table, keyno, return_mem_root, mrr_flags, mrr_buf_size, key,
+        {&ranges[0], ranges.size()}, used_key_parts);
+  }
+}
+
+void TRP_RANGE::trace_basic_info(THD *thd, const RANGE_OPT_PARAM *param,
+                                 Opt_trace_object *trace_object) const {
+  assert(param->using_real_indexes);
+  const uint keynr_in_table = param->real_keynr[key_idx];
+
+  const KEY &cur_key = param->table->key_info[keynr_in_table];
+  const KEY_PART_INFO *key_part = cur_key.key_part;
+
+  trace_object->add_alnum("type", "range_scan")
+      .add_utf8("index", cur_key.name)
+      .add("rows", records);
+
+  Opt_trace_array trace_range(&thd->opt_trace, "ranges");
+
+  // TRP_RANGE should not be created if there are no range intervals
+  assert(key);
+
+  String range_info;
+  range_info.set_charset(system_charset_info);
+  append_range_all_keyparts(&trace_range, nullptr, &range_info, key, key_part,
+                            false);
+}
+
+TRP_RANGE *get_key_scans_params(THD *thd, RANGE_OPT_PARAM *param,
+                                SEL_TREE *tree, bool index_read_must_be_used,
+                                bool update_tbl_stats,
+                                enum_order order_direction,
+                                bool skip_records_in_range,
+                                const Cost_estimate *cost_est,
+                                Key_map *needed_reg) {
+  uint idx, best_idx = 0;
+  SEL_ROOT *key, *key_to_read = nullptr;
+  ha_rows best_records = 0; /* protected by key_to_read */
+  uint best_mrr_flags = 0, best_buf_size = 0;
+  TRP_RANGE *read_plan = nullptr;
+  Cost_estimate read_cost = *cost_est;
+  DBUG_TRACE;
+  Opt_trace_context *const trace = &thd->opt_trace;
+  /*
+    Note that there may be trees that have type SEL_TREE::KEY but contain no
+    key reads at all, e.g. tree for expression "key1 is not null" where key1
+    is defined as "not null".
+  */
+  DBUG_EXECUTE("info",
+               print_sel_tree(param, tree, &tree->keys_map, "tree scans"););
+  Opt_trace_array ota(trace, "range_scan_alternatives");
+
+  tree->ror_scans_map.clear_all();
+  tree->n_ror_scans = 0;
+  bool is_best_idx_imerge_scan = true;
+  bool use_cheapest_index_merge = false;
+  bool force_index_merge =
+      idx_merge_hint_state(thd, param->table, &use_cheapest_index_merge);
+
+  for (idx = 0; idx < param->keys; idx++) {
+    key = tree->keys[idx];
+    if (key) {
+      ha_rows found_records;
+      Cost_estimate cost;
+      uint mrr_flags = 0, buf_size = 0;
+      uint keynr = param->real_keynr[idx];
+      if (key->type == SEL_ROOT::Type::MAYBE_KEY || key->root->maybe_flag)
+        needed_reg->set_bit(keynr);
+
+      bool read_index_only =
+          index_read_must_be_used
+              ? true
+              : (bool)param->table->covering_keys.is_set(keynr);
+
+      Opt_trace_object trace_idx(trace);
+      trace_idx.add_utf8("index", param->table->key_info[keynr].name);
+      bool is_ror_scan, is_imerge_scan;
+      found_records = check_quick_select(
+          thd, param, idx, read_index_only, key, update_tbl_stats,
+          order_direction, skip_records_in_range, &mrr_flags, &buf_size, &cost,
+          &is_ror_scan, &is_imerge_scan);
+
+      if (!compound_hint_key_enabled(param->table, keynr,
+                                     INDEX_MERGE_HINT_ENUM)) {
+        trace_idx.add("chosen", false).add_alnum("cause", "index_merge_hint");
+        continue;
+      }
+
+      // check_quick_select() says don't use range if it returns HA_POS_ERROR
+      if (found_records != HA_POS_ERROR && thd->opt_trace.is_started()) {
+        Opt_trace_array trace_range(&thd->opt_trace, "ranges");
+
+        const KEY &cur_key = param->table->key_info[keynr];
+        const KEY_PART_INFO *key_part = cur_key.key_part;
+
+        String range_info;
+        range_info.set_charset(system_charset_info);
+        append_range_all_keyparts(&trace_range, nullptr, &range_info, key,
+                                  key_part, false);
+        trace_range.end();  // NOTE: ends the tracing scope
+
+        /// No cost calculation when index dive is skipped.
+        if (skip_records_in_range)
+          trace_idx.add_alnum("index_dives_for_range_access",
+                              "skipped_due_to_force_index");
+        else
+          trace_idx.add("index_dives_for_eq_ranges",
+                        !param->use_index_statistics);
+
+        trace_idx.add("rowid_ordered", is_ror_scan)
+            .add("using_mrr", !(mrr_flags & HA_MRR_USE_DEFAULT_IMPL))
+            .add("index_only", read_index_only)
+            .add("in_memory", cur_key.in_memory_estimate());
+
+        if (skip_records_in_range) {
+          trace_idx.add_alnum("rows", "not applicable")
+              .add_alnum("cost", "not applicable");
+        } else {
+          trace_idx.add("rows", found_records).add("cost", cost);
+        }
+      }
+
+      if ((found_records != HA_POS_ERROR) && is_ror_scan) {
+        tree->n_ror_scans++;
+        tree->ror_scans_map.set_bit(idx);
+      }
+
+      if (found_records != HA_POS_ERROR &&
+          (read_cost > cost ||
+           /*
+             Ignore cost check if INDEX_MERGE hint is used with
+             explicitly specified indexes or if INDEX_MERGE hint
+             is used without any specified indexes and no best
+             index is chosen yet.
+           */
+           (force_index_merge &&
+            (!use_cheapest_index_merge || !key_to_read)))) {
+        trace_idx.add("chosen", true);
+        read_cost = cost;
+        best_records = found_records;
+        key_to_read = key;
+        best_idx = idx;
+        best_mrr_flags = mrr_flags;
+        best_buf_size = buf_size;
+        is_best_idx_imerge_scan = is_imerge_scan;
+      } else {
+        trace_idx.add("chosen", false);
+        if (found_records == HA_POS_ERROR)
+          if (key->type == SEL_ROOT::Type::MAYBE_KEY)
+            trace_idx.add_alnum("cause", "depends_on_unread_values");
+          else
+            trace_idx.add_alnum("cause", "no_valid_range_for_this_index");
+        else
+          trace_idx.add_alnum("cause", "cost");
+      }
+    }
+  }
+
+  DBUG_EXECUTE("info",
+               print_sel_tree(param, tree, &tree->ror_scans_map, "ROR scans"););
+
+  if (key_to_read) {
+    Quick_ranges ranges(param->return_mem_root);
+    unsigned used_key_parts;
+    if (get_ranges_from_tree(param->return_mem_root, param->table,
+                             param->key[best_idx], param->real_keynr[best_idx],
+                             key_to_read, MAX_REF_PARTS, &used_key_parts,
+                             &ranges)) {
+      return nullptr;
+    }
+
+    const bool is_ror = tree->ror_scans_map.is_set(best_idx);
+    if ((read_plan = new (param->return_mem_root) TRP_RANGE(
+             key_to_read, best_idx, best_mrr_flags, best_buf_size, param->table,
+             param->key[best_idx], param->real_keynr[best_idx], is_ror,
+             is_best_idx_imerge_scan,
+             Bounds_checked_array<QUICK_RANGE *>{&ranges[0], ranges.size()},
+             used_key_parts))) {
+      read_plan->records = best_records;
+      read_plan->cost_est = read_cost;
+      DBUG_PRINT("info",
+                 ("Returning range plan for key %s, cost %g, records %lu",
+                  param->table->key_info[param->real_keynr[best_idx]].name,
+                  read_plan->cost_est.total_cost(), (ulong)read_plan->records));
+    }
+  } else
+    DBUG_PRINT("info", ("No 'range' table read plan found"));
+
+  return read_plan;
+}
+
+/*
+  Return true if any part of the key is NULL
+
+  SYNOPSIS
+    null_part_in_key()
+      key_part  Array of key parts (index description)
+      key       Key values tuple
+      length    Length of key values tuple in bytes.
+
+  RETURN
+    true   The tuple has at least one "keypartX is NULL"
+    false  Otherwise
+*/
+
+static bool null_part_in_key(KEY_PART *key_part, const uchar *key,
+                             uint length) {
+  for (const uchar *end = key + length; key < end;
+       key += key_part++->store_length) {
+    if (key_part->null_bit && *key) return true;
+  }
+  return false;
+}
+
+/**
+  Generate key values for range select from given sel_arg tree
+
+  SYNOPSIS
+    get_quick_keys()
+
+  @param return_mem_root MEM_ROOT to use for allocating the data
+  @param key            Generate key values for this key
+  @param key_tree       SEL_ARG tree
+  @param base_min_key   Start of min key buffer
+  @param min_key        Current append place in min key buffer
+  @param min_key_flag   Min key's flags
+  @param base_max_key   Start of max key buffer
+  @param max_key        Current append place in max key buffer
+  @param max_key_flag   Max key's flags
+  @param desc_flag      Desc flag of the first keypart
+  @param num_key_parts  Number of key parts that should be used for
+                        creating ranges (see get_quick_select() for details)
+  @param ranges         The ranges to scan
+
+  @note Fix this to get all possible sub_ranges
+
+  @returns
+    true    OOM
+    false   Ok
+*/
+
+static bool get_quick_keys(MEM_ROOT *return_mem_root, const KEY *table_key,
+                           KEY_PART *key, SEL_ARG *key_tree,
+                           uchar *const base_min_key, uchar *min_key,
+                           uint min_key_flag, uchar *const base_max_key,
+                           uchar *max_key, uint max_key_flag, uint *desc_flag,
+                           uint num_key_parts, uint *used_key_parts,
+                           Quick_ranges *ranges) {
+  QUICK_RANGE *range;
+  uint flag = 0;
+  int min_part = key_tree->part - 1,  // # of keypart values in min_key buffer
+      max_part = key_tree->part - 1;  // # of keypart values in max_key buffer
+
+  const bool asc = key_tree->is_ascending;
+  SEL_ARG *cur_key_tree = asc ? key_tree->left : key_tree->right;
+  if (cur_key_tree != null_element)
+    if (get_quick_keys(return_mem_root, table_key, key, cur_key_tree,
+                       base_min_key, min_key, min_key_flag, base_max_key,
+                       max_key, max_key_flag, desc_flag, num_key_parts,
+                       used_key_parts, ranges))
+      return true;
+  uchar *tmp_min_key = min_key, *tmp_max_key = max_key;
+  key_tree->store_min_max_values(key[key_tree->part].store_length, &tmp_min_key,
+                                 min_key_flag, &tmp_max_key, max_key_flag,
+                                 &min_part, &max_part);
+  if (!asc) flag |= DESC_FLAG;
+
+  // Stop processing key values if this is the last key part that needs to be
+  // looked into. See get_quick_select() for details.
+  if ((num_key_parts > 1) && key_tree->next_key_part &&
+      key_tree->next_key_part->type == SEL_ROOT::Type::KEY_RANGE &&
+      key_tree->next_key_part->root->part ==
+          key_tree->part + 1) {  // const key as prefix
+    if ((tmp_min_key - min_key) == (tmp_max_key - max_key) &&
+        memcmp(min_key, max_key, (uint)(tmp_max_key - max_key)) == 0 &&
+        key_tree->min_flag == 0 && key_tree->max_flag == 0) {
+      if (get_quick_keys(return_mem_root, table_key, key,
+                         key_tree->next_key_part->root, base_min_key,
+                         tmp_min_key, min_key_flag | key_tree->get_min_flag(),
+                         base_max_key, tmp_max_key,
+                         max_key_flag | key_tree->get_max_flag(),
+                         (desc_flag ? desc_flag : &flag), num_key_parts - 1,
+                         used_key_parts, ranges))
+        return true;
+      goto end;  // Ugly, but efficient
+    }
+    {
+      uint tmp_min_flag = key_tree->get_min_flag();
+      uint tmp_max_flag = key_tree->get_max_flag();
+      key_tree->store_next_min_max_keys(key, &tmp_min_key, &tmp_min_flag,
+                                        &tmp_max_key, &tmp_max_flag, &min_part,
+                                        &max_part);
+      flag |= tmp_min_flag | tmp_max_flag;
+    }
+  } else {
+    if (asc)
+      flag = (key_tree->min_flag & GEOM_FLAG)
+                 ? key_tree->min_flag
+                 : key_tree->min_flag | key_tree->max_flag;
+    else {
+      // Invert flags for DESC keypart
+      flag |= invert_min_flag(key_tree->min_flag) |
+              invert_max_flag(key_tree->max_flag);
+    }
+  }
+
+  /*
+    Ensure that some part of min_key and max_key are used.  If not,
+    regard this as no lower/upper range
+  */
+  if ((flag & GEOM_FLAG) == 0) {
+    if (tmp_min_key != base_min_key)
+      flag &= ~NO_MIN_RANGE;
+    else
+      flag |= NO_MIN_RANGE;
+    if (tmp_max_key != base_max_key)
+      flag &= ~NO_MAX_RANGE;
+    else
+      flag |= NO_MAX_RANGE;
+  }
+  if ((flag & ~DESC_FLAG) == 0) {
+    uint length = (uint)(tmp_min_key - base_min_key);
+    if (length == (uint)(tmp_max_key - base_max_key) &&
+        !memcmp(base_min_key, base_max_key, length)) {
+      flag |= EQ_RANGE;
+      /*
+        Note that keys which are extended with PK parts have no
+        HA_NOSAME flag. So we can use user_defined_key_parts.
+      */
+      if ((table_key->flags & HA_NOSAME) &&
+          key_tree->part == table_key->user_defined_key_parts - 1) {
+        if ((table_key->flags & HA_NULL_PART_KEY) &&
+            null_part_in_key(key, base_min_key,
+                             (uint)(tmp_min_key - base_min_key)))
+          flag |= NULL_RANGE;
+        else
+          flag |= UNIQUE_RANGE;
+      }
+    }
+  }
+  /*
+    Set DESC flag. We need this flag set according to the first keypart.
+    Depending on it, key values will be scanned either forward or backward,
+    preserving the order or records in the index along multiple ranges.
+  */
+  if (desc_flag) flag = (flag & ~DESC_FLAG) | *desc_flag;
+
+  /* Get range for retrieving rows in QUICK_SELECT::get_next */
+  if (!(range = new (return_mem_root)
+            QUICK_RANGE(base_min_key, (uint)(tmp_min_key - base_min_key),
+                        min_part >= 0 ? make_keypart_map(min_part) : 0,
+                        base_max_key, (uint)(tmp_max_key - base_max_key),
+                        max_part >= 0 ? make_keypart_map(max_part) : 0, flag,
+                        key_tree->rkey_func_flag)))
+    return true;  // out of memory
+
+  *used_key_parts = std::max(*used_key_parts, uint(key_tree->part + 1));
+  if (ranges->push_back(range)) return true;
+
+end:
+  cur_key_tree = asc ? key_tree->right : key_tree->left;
+  if (cur_key_tree != null_element)
+    return get_quick_keys(return_mem_root, table_key, key, cur_key_tree,
+                          base_min_key, min_key, min_key_flag, base_max_key,
+                          max_key, max_key_flag, desc_flag, num_key_parts,
+                          used_key_parts, ranges);
+  return false;
+}
+
+/**
+  Traverse the R-B range tree for this and later keyparts to see if
+  there are at least as many equality ranges as defined by the limit.
+
+  @param keypart        The R-B tree of ranges for a given keypart.
+  @param [in,out] count The number of equality ranges found so far
+  @param limit          The number of ranges
+
+  @retval true if limit > 0 and 'limit' or more equality ranges have been
+          found in the range R-B trees
+  @retval false otherwise
+
+*/
+
+static bool eq_ranges_exceeds_limit(const SEL_ROOT *keypart, uint *count,
+                                    uint limit) {
+  // "Statistics instead of index dives" feature is turned off
+  if (limit == 0) return false;
+
+  /*
+    Optimization: if there is at least one equality range, index
+    statistics will be used when limit is 1. It's safe to return true
+    even without checking that there is an equality range because if
+    there are none, index statistics will not be used anyway.
+  */
+  if (limit == 1) return true;
+
+  for (SEL_ARG *keypart_range = keypart->root->first(); keypart_range;
+       keypart_range = keypart_range->next) {
+    /*
+      This is an equality range predicate and should be counted if:
+      1) the range for this keypart does not have a min/max flag
+         (which indicates <, <= etc), and
+      2) the lower and upper range boundaries have the same value
+         (it's not a "x BETWEEN a AND b")
+
+      Note, however, that if this is an "x IS NULL" condition we don't
+      count it because the number of NULL-values is likely to be off
+      the index statistics we plan to use.
+    */
+    if (!keypart_range->min_flag && !keypart_range->max_flag &&  // 1)
+        !keypart_range->cmp_max_to_min(keypart_range) &&         // 2)
+        !keypart_range->is_null_interval())                      // "x IS NULL"
+    {
+      /*
+         Count predicates in the next keypart, but only if that keypart
+         is the next in the index.
+      */
+      if (keypart_range->next_key_part &&
+          keypart_range->next_key_part->root->part == keypart_range->part + 1)
+        eq_ranges_exceeds_limit(keypart_range->next_key_part, count, limit);
+      else
+        // We've found a path of equlity predicates down to a keypart leaf
+        (*count)++;
+
+      if (*count >= limit) return true;
+    }
+  }
+  return false;
+}
diff -Nru mysql-8.0-8.0.26/sql/range_optimizer/range_scan_plan.h mysql-8.0-8.0.27/sql/range_optimizer/range_scan_plan.h
--- mysql-8.0-8.0.26/sql/range_optimizer/range_scan_plan.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/range_optimizer/range_scan_plan.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,220 @@
+/* Copyright (c) 2000, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef SQL_RANGE_OPTIMIZER_RANGE_SCAN_PLAN_H_
+#define SQL_RANGE_OPTIMIZER_RANGE_SCAN_PLAN_H_
+
+#include <sys/types.h>
+
+#include "my_dbug.h"
+#include "sql/handler.h"
+#include "sql/range_optimizer/geometry.h"
+#include "sql/range_optimizer/range_opt_param.h"
+#include "sql/range_optimizer/range_scan.h"
+#include "sql/range_optimizer/table_read_plan.h"
+#include "sql/sql_const.h"
+
+class Opt_trace_object;
+class RANGE_OPT_PARAM;
+class QUICK_SELECT_I;
+class SEL_ROOT;
+class SEL_TREE;
+struct MEM_ROOT;
+
+bool get_ranges_from_tree(MEM_ROOT *return_mem_root, TABLE *table,
+                          KEY_PART *key, uint keyno, SEL_ROOT *key_tree,
+                          uint num_key_parts, unsigned *used_key_parts,
+                          Quick_ranges *ranges);
+
+QUICK_RANGE_SELECT *get_quick_select(MEM_ROOT *return_mem_root, TABLE *table,
+                                     KEY_PART *key, uint keyno,
+                                     SEL_ROOT *key_tree, uint mrr_flags,
+                                     uint mrr_buf_size,
+                                     uint num_key_parts = MAX_REF_PARTS);
+
+/*
+  Plan for a QUICK_RANGE_SELECT scan.
+  TRP_RANGE::make_quick ignores retrieve_full_rows parameter because
+  QUICK_RANGE_SELECT doesn't distinguish between 'index only' scans and full
+  record retrieval scans.
+*/
+
+class TRP_RANGE : public TABLE_READ_PLAN {
+ public:
+  uint key_idx; /* key number in RANGE_OPT_PARAM::key and
+                   RANGE_OPT_PARAM::real_keynr */
+
+  // NOTE: Both used_key_part_arg and ranges must be allocated on the
+  // return_mem_root, as they need to outlive the range optimizer.
+  TRP_RANGE(SEL_ROOT *key_arg, uint idx_arg, uint mrr_flags_arg,
+            uint mrr_buf_size_arg, TABLE *table_arg,
+            KEY_PART *used_key_part_arg, uint keyno_arg, bool is_ror_arg,
+            bool is_imerge_arg, Bounds_checked_array<QUICK_RANGE *> ranges_arg,
+            uint used_key_parts_arg)
+      : TABLE_READ_PLAN(table_arg, keyno_arg, used_key_parts_arg,
+                        /*forced_by_hint_arg=*/false),
+        key_idx(idx_arg),
+        key(key_arg),
+        mrr_flags(mrr_flags_arg),
+        mrr_buf_size(mrr_buf_size_arg),
+        used_key_part(used_key_part_arg),
+        is_ror(is_ror_arg),
+        is_imerge(is_imerge_arg),
+        ranges(ranges_arg) {}
+
+  QUICK_SELECT_I *make_quick(bool, MEM_ROOT *return_mem_root) override {
+    DBUG_TRACE;
+
+    QUICK_RANGE_SELECT *quick;
+    if (table->key_info[index].flags & HA_SPATIAL) {
+      quick = new (return_mem_root) QUICK_RANGE_SELECT_GEOM(
+          table, index, return_mem_root, mrr_flags, mrr_buf_size, used_key_part,
+          ranges, used_key_parts);
+    } else {
+      quick = new (return_mem_root) QUICK_RANGE_SELECT(
+          table, index, return_mem_root, mrr_flags, mrr_buf_size, used_key_part,
+          ranges, used_key_parts);
+    }
+
+    if (quick != nullptr) {
+      quick->records = records;
+      quick->cost_est = cost_est;
+      assert(quick->index == index);
+    }
+    return quick;
+  }
+
+  void trace_basic_info(THD *thd, const RANGE_OPT_PARAM *param,
+                        Opt_trace_object *trace_object) const override;
+
+  bool can_be_used_for_ror() const { return is_ror; }
+  bool can_be_used_for_imerge() const { return is_imerge; }
+
+ private:
+  /**
+    Root of red-black tree for intervals over key fields to be used in
+    "range" method retrieval. See SEL_ARG graph description.
+
+    Used only for tracing.
+   */
+  SEL_ROOT *key;
+  uint mrr_flags;
+  uint mrr_buf_size;
+
+  // The key part(s) we are scanning on. Note that this may be an array.
+  KEY_PART *used_key_part;
+
+  /*
+    If true, the scan returns rows in rowid order.
+   */
+  const bool is_ror;
+
+  /*
+    If true, this plan can be used for index merge scan.
+   */
+  const bool is_imerge;
+
+  // The actual ranges we are scanning over (originally derived from “key�).
+  Bounds_checked_array<QUICK_RANGE *> ranges;
+};
+
+/*
+  Get best "range" table read plan for given SEL_TREE, also update some info
+
+  SYNOPSIS
+    get_key_scans_params()
+      param                    Parameters from test_quick_select
+      tree                     Make range select for this SEL_TREE
+      index_read_must_be_used  true <=> assume 'index only' option will be set
+                               (except for clustered PK indexes)
+      update_tbl_stats         true <=> update table->quick_* with information
+                               about range scans we've evaluated.
+      interesting_order        The sort order the range access method must be
+                               able to provide. Three-value logic:
+                               asc/desc/don't care
+      skip_records_in_range    Same value as JOIN_TAB::skip_records_in_range().
+      cost_est                 Maximum cost. i.e. don't create read plans with
+                               cost > cost_est.
+      needed_reg               ptr to needed_reg argument
+                               of test_quick_select().
+
+  DESCRIPTION
+    Find the best "range" table read plan for given SEL_TREE.
+    The side effects are
+     - tree->ror_scans is updated to indicate which scans are ROR scans.
+     - if update_tbl_stats=true then table->quick_* is updated with info
+       about every possible range scan.
+
+  RETURN
+    Best range read plan
+    NULL if no plan found or error occurred
+*/
+
+TRP_RANGE *get_key_scans_params(THD *thd, RANGE_OPT_PARAM *param,
+                                SEL_TREE *tree, bool index_read_must_be_used,
+                                bool update_tbl_stats,
+                                enum_order interesting_order,
+                                bool skip_records_in_range,
+                                const Cost_estimate *cost_est,
+                                Key_map *needed_reg);
+
+/*
+  Calculate estimate of number records that will be retrieved by a range
+  scan on given index using given SEL_ARG intervals tree.
+
+  SYNOPSIS
+    check_quick_select()
+      param             Parameter from test_quick_select
+      idx               Number of index to use in RANGE_OPT_PARAM::key
+                        SEL_TREE::key
+      index_only        true  - assume only index tuples will be accessed
+                        false - assume full table rows will be read
+      tree              Transformed selection condition, tree->key[idx] holds
+                        the intervals for the given index.
+      update_tbl_stats  true <=> update table->quick_* with information
+                        about range scan we've evaluated.
+      order_direction   The sort order the range access method must be able
+                        to provide. Three-value logic: asc/desc/don't care
+      skip_records_in_range Same value as JOIN_TAB::skip_records_in_range().
+      mrr_flags   INOUT MRR access flags
+      cost        OUT   Scan cost
+      is_ror_scan OUT   Set to reflect if the key scan is a ROR
+                        (see is_key_scan_ror function for more info)
+      is_imerge_scan OUT  Set to reflect if the key scan can be used for
+                        index-merge-scan
+
+  NOTES
+    param->table->quick_*, param->range_count (and maybe others) are
+    updated with data of given key scan, see quick_range_seq_next for details.
+
+  RETURN
+    Estimate # of records to be retrieved.
+    HA_POS_ERROR if estimate calculation failed due to table handler problems.
+*/
+ha_rows check_quick_select(THD *thd, RANGE_OPT_PARAM *param, uint idx,
+                           bool index_only, SEL_ROOT *tree,
+                           bool update_tbl_stats, enum_order order_direction,
+                           bool skip_records_in_range, uint *mrr_flags,
+                           uint *bufsize, Cost_estimate *cost,
+                           bool *is_ror_scan, bool *is_imerge_scan);
+
+#endif  // SQL_RANGE_OPTIMIZER_RANGE_SCAN_PLAN_H_
diff -Nru mysql-8.0-8.0.26/sql/range_optimizer/rowid_ordered_retrieval.cc mysql-8.0-8.0.27/sql/range_optimizer/rowid_ordered_retrieval.cc
--- mysql-8.0-8.0.26/sql/range_optimizer/rowid_ordered_retrieval.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/range_optimizer/rowid_ordered_retrieval.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,664 @@
+/* Copyright (c) 2000, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include "sql/range_optimizer/rowid_ordered_retrieval.h"
+
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+#include <new>
+
+#include "lex_string.h"
+#include "m_string.h"
+#include "my_base.h"
+#include "my_bitmap.h"
+#include "my_dbug.h"
+#include "my_sys.h"
+#include "mysql/components/services/bits/psi_bits.h"
+#include "mysqld_error.h"
+#include "sql/current_thd.h"
+#include "sql/key.h"
+#include "sql/psi_memory_key.h"
+#include "sql/sql_class.h"
+#include "sql/sql_const.h"
+#include "sql/system_variables.h"
+#include "sql/thr_malloc.h"
+#include "sql_string.h"
+
+QUICK_ROR_INTERSECT_SELECT::QUICK_ROR_INTERSECT_SELECT(
+    TABLE *table, bool retrieve_full_rows, MEM_ROOT *return_mem_root)
+    : mem_root(return_mem_root),
+      cpk_quick(nullptr),
+      need_to_fetch_row(retrieve_full_rows),
+      scans_inited(false) {
+  index = MAX_KEY;
+  m_table = table;
+  record = m_table->record[0];
+  last_rowid = (uchar *)mem_root->Alloc(m_table->file->ref_length);
+}
+
+/*
+  Do post-constructor initialization.
+  SYNOPSIS
+    QUICK_ROR_INTERSECT_SELECT::init()
+
+  RETURN
+    0      OK
+    other  Error code
+*/
+
+int QUICK_ROR_INTERSECT_SELECT::init() {
+  DBUG_TRACE;
+  /* Check if last_rowid was successfully allocated in ctor */
+  return !last_rowid;
+}
+
+/*
+  Initialize this quick select to be a ROR-merged scan.
+
+  SYNOPSIS
+    QUICK_RANGE_SELECT::init_ror_merged_scan()
+      reuse_handler If true, use m_table->file, otherwise create a separate
+                    handler object
+
+  NOTES
+    This function creates and prepares for subsequent use a separate handler
+    object if it can't reuse m_table->file. The reason for this is that during
+    ROR-merge several key scans are performed simultaneously, and a single
+    handler is only capable of preserving context of a single key scan.
+
+    In ROR-merge the quick select doing merge does full records retrieval,
+    merged quick selects read only keys.
+
+  RETURN
+    0  ROR child scan initialized, ok to use.
+    1  error
+*/
+
+int QUICK_RANGE_SELECT::init_ror_merged_scan(bool reuse_handler) {
+  handler *save_file = file, *org_file;
+  MY_BITMAP *const save_read_set = m_table->read_set;
+  MY_BITMAP *const save_write_set = m_table->write_set;
+  DBUG_TRACE;
+
+  THD *thd = current_thd;
+
+  in_ror_merged_scan = true;
+  mrr_flags |= HA_MRR_SORTED;
+  if (reuse_handler) {
+    DBUG_PRINT("info", ("Reusing handler %p", file));
+    if (init() || reset()) {
+      return 1;
+    }
+    m_table->column_bitmaps_set(&column_bitmap, &column_bitmap);
+    file->ha_extra(HA_EXTRA_SECONDARY_SORT_ROWID);
+    goto end;
+  }
+
+  /* Create a separate handler object for this quick select */
+  if (free_file) {
+    /* already have own 'handler' object. */
+    return 0;
+  }
+
+  if (!(file =
+            m_table->file->clone(m_table->s->normalized_path.str, mem_root))) {
+    /*
+      Manually set the error flag. Note: there seems to be quite a few
+      places where a failure could cause the server to "hang" the client by
+      sending no response to a query. ATM those are not real errors because
+      the storage engine calls in question happen to never fail with the
+      existing storage engines.
+    */
+    my_error(ER_OUT_OF_RESOURCES, MYF(0)); /* purecov: inspected */
+    /* Caller will free the memory */
+    goto failure; /* purecov: inspected */
+  }
+
+  m_table->column_bitmaps_set(&column_bitmap, &column_bitmap);
+
+  if (file->ha_external_lock(thd, m_table->file->get_lock_type())) goto failure;
+
+  if (init() || reset()) {
+    file->ha_external_lock(thd, F_UNLCK);
+    file->ha_close();
+    goto failure;
+  }
+  free_file = true;
+  last_rowid = file->ref;
+  file->ha_extra(HA_EXTRA_SECONDARY_SORT_ROWID);
+
+end:
+  /*
+    We are only going to read key fields and call position() on 'file'
+    The following sets m_table->tmp_set to only use this key and then updates
+    m_table->read_set and m_table->write_set to use this bitmap.
+    The now bitmap is stored in 'column_bitmap' which is used in ::get_next()
+  */
+  org_file = m_table->file;
+  m_table->file = file;
+  /* We don't have to set 'm_table->keyread' here as the 'file' is unique */
+  if (!m_table->no_keyread) m_table->mark_columns_used_by_index(index);
+  m_table->prepare_for_position();
+  m_table->file = org_file;
+  bitmap_copy(&column_bitmap, m_table->read_set);
+
+  /*
+    We have prepared a column_bitmap which get_next() will use. To do this we
+    used TABLE::read_set/write_set as playground; restore them to their
+    original value to not pollute other scans.
+  */
+  m_table->column_bitmaps_set(save_read_set, save_write_set);
+  bitmap_clear_all(&m_table->tmp_set);
+
+  return 0;
+
+failure:
+  m_table->column_bitmaps_set(save_read_set, save_write_set);
+  destroy(file);
+  file = save_file;
+  return 1;
+}
+
+/*
+  Initialize this quick select to be a part of a ROR-merged scan.
+  SYNOPSIS
+    QUICK_ROR_INTERSECT_SELECT::init_ror_merged_scan()
+      reuse_handler If true, use m_table->file, otherwise create separate
+                    handler object.
+  RETURN
+    0     OK
+    other error code
+*/
+int QUICK_ROR_INTERSECT_SELECT::init_ror_merged_scan(bool reuse_handler) {
+  List_iterator_fast<QUICK_RANGE_SELECT> quick_it(quick_selects);
+  QUICK_RANGE_SELECT *quick;
+  DBUG_TRACE;
+
+  /* Initialize all merged "children" quick selects */
+  assert(!need_to_fetch_row || reuse_handler);
+  if (!need_to_fetch_row && reuse_handler) {
+    quick = quick_it++;
+    /*
+      There is no use of this->file. Use it for the first of merged range
+      selects.
+    */
+    int error = quick->init_ror_merged_scan(true);
+    if (error) return error;
+    quick->file->ha_extra(HA_EXTRA_KEYREAD_PRESERVE_FIELDS);
+  }
+  while ((quick = quick_it++)) {
+#ifndef NDEBUG
+    const MY_BITMAP *const save_read_set = quick->m_table->read_set;
+    const MY_BITMAP *const save_write_set = quick->m_table->write_set;
+#endif
+    int error;
+    if ((error = quick->init_ror_merged_scan(false))) return error;
+    quick->file->ha_extra(HA_EXTRA_KEYREAD_PRESERVE_FIELDS);
+    // Sets are shared by all members of "quick_selects" so must not change
+    assert(quick->m_table->read_set == save_read_set);
+    assert(quick->m_table->write_set == save_write_set);
+    /* All merged scans share the same record buffer in intersection. */
+    quick->record = m_table->record[0];
+  }
+
+  /* Prepare for ha_rnd_pos calls if needed. */
+  int error;
+  if (need_to_fetch_row && (error = m_table->file->ha_rnd_init(false))) {
+    DBUG_PRINT("error", ("ROR index_merge rnd_init call failed"));
+    return error;
+  }
+  return 0;
+}
+
+/*
+  Initialize quick select for row retrieval.
+  SYNOPSIS
+    reset()
+  RETURN
+    0      OK
+    other  Error code
+*/
+
+int QUICK_ROR_INTERSECT_SELECT::reset() {
+  DBUG_TRACE;
+  if (!scans_inited && init_ror_merged_scan(true)) return 1;
+  scans_inited = true;
+  List_iterator_fast<QUICK_RANGE_SELECT> it(quick_selects);
+  QUICK_RANGE_SELECT *quick;
+  while ((quick = it++)) quick->reset();
+  return 0;
+}
+
+/*
+  Add a merged quick select to this ROR-intersection quick select.
+
+  SYNOPSIS
+    QUICK_ROR_INTERSECT_SELECT::push_quick_back()
+      quick Quick select to be added. The quick select must return
+            rows in rowid order.
+  NOTES
+    This call can only be made before init() is called.
+
+  RETURN
+    false OK
+    true  Out of memory.
+*/
+
+bool QUICK_ROR_INTERSECT_SELECT::push_quick_back(QUICK_RANGE_SELECT *quick) {
+  return quick_selects.push_back(quick);
+}
+
+QUICK_ROR_INTERSECT_SELECT::~QUICK_ROR_INTERSECT_SELECT() {
+  DBUG_TRACE;
+  quick_selects.destroy_elements();
+  destroy(cpk_quick);
+  if (need_to_fetch_row && m_table->file->inited) m_table->file->ha_rnd_end();
+}
+
+QUICK_ROR_UNION_SELECT::QUICK_ROR_UNION_SELECT(MEM_ROOT *return_mem_root,
+                                               TABLE *table)
+    : queue(Quick_ror_union_less(this),
+            Malloc_allocator<PSI_memory_key>(PSI_INSTRUMENT_ME)),
+      mem_root(return_mem_root),
+      scans_inited(false) {
+  index = MAX_KEY;
+  m_table = table;
+  rowid_length = table->file->ref_length;
+  record = m_table->record[0];
+}
+
+/*
+  Do post-constructor initialization.
+  SYNOPSIS
+    QUICK_ROR_UNION_SELECT::init()
+
+  RETURN
+    0      OK
+    other  Error code
+*/
+
+int QUICK_ROR_UNION_SELECT::init() {
+  DBUG_TRACE;
+  if (queue.reserve(quick_selects.elements)) {
+    return 1;
+  }
+
+  if (!(cur_rowid = (uchar *)mem_root->Alloc(2 * m_table->file->ref_length)))
+    return 1;
+  prev_rowid = cur_rowid + m_table->file->ref_length;
+  return 0;
+}
+
+/*
+  Initialize quick select for row retrieval.
+  SYNOPSIS
+    reset()
+
+  RETURN
+    0      OK
+    other  Error code
+*/
+
+int QUICK_ROR_UNION_SELECT::reset() {
+  QUICK_SELECT_I *quick;
+  int error;
+  DBUG_TRACE;
+  have_prev_rowid = false;
+  if (!scans_inited) {
+    List_iterator_fast<QUICK_SELECT_I> it(quick_selects);
+    while ((quick = it++)) {
+      error = quick->init_ror_merged_scan(false);
+      if (error) return 1;
+    }
+    scans_inited = true;
+  }
+  queue.clear();
+  /*
+    Initialize scans for merged quick selects and put all merged quick
+    selects into the queue.
+  */
+  List_iterator_fast<QUICK_SELECT_I> it(quick_selects);
+  while ((quick = it++)) {
+    if ((error = quick->reset())) return error;
+    if ((error = quick->get_next())) {
+      if (error == HA_ERR_END_OF_FILE) continue;
+      return error;
+    }
+    quick->save_last_pos();
+    queue.push(quick);
+  }
+
+  /* Prepare for ha_rnd_pos calls. */
+  if (m_table->file->inited && (error = m_table->file->ha_rnd_end())) {
+    DBUG_PRINT("error", ("ROR index_merge rnd_end call failed"));
+    return error;
+  }
+  if ((error = m_table->file->ha_rnd_init(false))) {
+    DBUG_PRINT("error", ("ROR index_merge rnd_init call failed"));
+    return error;
+  }
+
+  return 0;
+}
+
+bool QUICK_ROR_UNION_SELECT::push_quick_back(QUICK_SELECT_I *quick_sel_range) {
+  return quick_selects.push_back(quick_sel_range);
+}
+
+QUICK_ROR_UNION_SELECT::~QUICK_ROR_UNION_SELECT() {
+  DBUG_TRACE;
+  quick_selects.destroy_elements();
+  if (m_table->file->inited) m_table->file->ha_rnd_end();
+}
+
+bool QUICK_ROR_INTERSECT_SELECT::is_keys_used(const MY_BITMAP *fields) {
+  QUICK_RANGE_SELECT *quick;
+  List_iterator_fast<QUICK_RANGE_SELECT> it(quick_selects);
+  while ((quick = it++)) {
+    if (is_key_used(m_table, quick->index, fields)) return true;
+  }
+  return false;
+}
+
+bool QUICK_ROR_UNION_SELECT::is_keys_used(const MY_BITMAP *fields) {
+  QUICK_SELECT_I *quick;
+  List_iterator_fast<QUICK_SELECT_I> it(quick_selects);
+  while ((quick = it++)) {
+    if (quick->is_keys_used(fields)) return true;
+  }
+  return false;
+}
+
+/*
+  Retrieve next record.
+  SYNOPSIS
+     QUICK_ROR_INTERSECT_SELECT::get_next()
+
+  NOTES
+    Invariant on enter/exit: all intersected selects have retrieved all index
+    records with rowid <= some_rowid_val and no intersected select has
+    retrieved any index records with rowid > some_rowid_val.
+    We start fresh and loop until we have retrieved the same rowid in each of
+    the key scans or we got an error.
+
+    If a Clustered PK scan is present, it is used only to check if row
+    satisfies its condition (and never used for row retrieval).
+
+    Locking: to ensure that exclusive locks are only set on records that
+    are included in the final result we must release the lock
+    on all rows we read but do not include in the final result. This
+    must be done on each index that reads the record and the lock
+    must be released using the same handler (the same quick object) as
+    used when reading the record.
+
+  RETURN
+   0     - Ok
+   other - Error code if any error occurred.
+*/
+
+int QUICK_ROR_INTERSECT_SELECT::get_next() {
+  List_iterator_fast<QUICK_RANGE_SELECT> quick_it(quick_selects);
+  QUICK_RANGE_SELECT *quick;
+
+  /* quick that reads the given rowid first. This is needed in order
+  to be able to unlock the row using the same handler object that locked
+  it */
+  QUICK_RANGE_SELECT *quick_with_last_rowid;
+
+  int error, cmp;
+  uint last_rowid_count = 0;
+  DBUG_TRACE;
+
+  do {
+    /* Get a rowid for first quick and save it as a 'candidate' */
+    quick = quick_it++;
+    error = quick->get_next();
+    if (cpk_quick) {
+      while (!error && !cpk_quick->row_in_ranges()) {
+        quick->file->unlock_row(); /* row not in range; unlock */
+        error = quick->get_next();
+      }
+    }
+    if (error) return error;
+
+    quick->file->position(quick->record);
+    memcpy(last_rowid, quick->file->ref, m_table->file->ref_length);
+    last_rowid_count = 1;
+    quick_with_last_rowid = quick;
+
+    while (last_rowid_count < quick_selects.elements) {
+      if (!(quick = quick_it++)) {
+        quick_it.rewind();
+        quick = quick_it++;
+      }
+
+      do {
+        DBUG_EXECUTE_IF("innodb_quick_report_deadlock",
+                        DBUG_SET("+d,innodb_report_deadlock"););
+        if ((error = quick->get_next())) {
+          /* On certain errors like deadlock, trx might be rolled back.*/
+          if (!current_thd->transaction_rollback_request)
+            quick_with_last_rowid->file->unlock_row();
+          return error;
+        }
+        quick->file->position(quick->record);
+        cmp = m_table->file->cmp_ref(quick->file->ref, last_rowid);
+        if (cmp < 0) {
+          /* This row is being skipped.  Release lock on it. */
+          quick->file->unlock_row();
+        }
+      } while (cmp < 0);
+
+      /* Ok, current select 'caught up' and returned ref >= cur_ref */
+      if (cmp > 0) {
+        /* Found a row with ref > cur_ref. Make it a new 'candidate' */
+        if (cpk_quick) {
+          while (!cpk_quick->row_in_ranges()) {
+            quick->file->unlock_row(); /* row not in range; unlock */
+            if ((error = quick->get_next())) {
+              /* On certain errors like deadlock, trx might be rolled back.*/
+              if (!current_thd->transaction_rollback_request)
+                quick_with_last_rowid->file->unlock_row();
+              return error;
+            }
+          }
+          quick->file->position(quick->record);
+        }
+        memcpy(last_rowid, quick->file->ref, m_table->file->ref_length);
+        quick_with_last_rowid->file->unlock_row();
+        last_rowid_count = 1;
+        quick_with_last_rowid = quick;
+      } else {
+        /* current 'candidate' row confirmed by this select */
+        last_rowid_count++;
+      }
+    }
+
+    /* We get here if we got the same row ref in all scans. */
+    if (need_to_fetch_row)
+      error = m_table->file->ha_rnd_pos(m_table->record[0], last_rowid);
+  } while (error == HA_ERR_RECORD_DELETED);
+  return error;
+}
+
+/*
+  Retrieve next record.
+  SYNOPSIS
+    QUICK_ROR_UNION_SELECT::get_next()
+
+  NOTES
+    Enter/exit invariant:
+    For each quick select in the queue a {key,rowid} tuple has been
+    retrieved but the corresponding row hasn't been passed to output.
+
+  RETURN
+   0     - Ok
+   other - Error code if any error occurred.
+*/
+
+int QUICK_ROR_UNION_SELECT::get_next() {
+  int error, dup_row;
+  QUICK_SELECT_I *quick;
+  uchar *tmp;
+  DBUG_TRACE;
+
+  do {
+    do {
+      if (queue.empty()) return HA_ERR_END_OF_FILE;
+      /* Ok, we have a queue with >= 1 scans */
+
+      quick = queue.top();
+      memcpy(cur_rowid, quick->last_rowid, rowid_length);
+
+      /* put into queue rowid from the same stream as top element */
+      if ((error = quick->get_next())) {
+        if (error != HA_ERR_END_OF_FILE) return error;
+        queue.pop();
+      } else {
+        quick->save_last_pos();
+        queue.update_top();
+      }
+
+      if (!have_prev_rowid) {
+        /* No rows have been returned yet */
+        dup_row = false;
+        have_prev_rowid = true;
+      } else
+        dup_row = !m_table->file->cmp_ref(cur_rowid, prev_rowid);
+    } while (dup_row);
+
+    tmp = cur_rowid;
+    cur_rowid = prev_rowid;
+    prev_rowid = tmp;
+
+    error = m_table->file->ha_rnd_pos(quick->record, prev_rowid);
+  } while (error == HA_ERR_RECORD_DELETED);
+  return error;
+}
+
+void QUICK_ROR_INTERSECT_SELECT::add_info_string(String *str) {
+  bool first = true;
+  QUICK_RANGE_SELECT *quick;
+  List_iterator_fast<QUICK_RANGE_SELECT> it(quick_selects);
+  str->append(STRING_WITH_LEN("intersect("));
+  while ((quick = it++)) {
+    KEY *key_info = m_table->key_info + quick->index;
+    if (!first)
+      str->append(',');
+    else
+      first = false;
+    str->append(key_info->name);
+  }
+  if (cpk_quick) {
+    KEY *key_info = m_table->key_info + cpk_quick->index;
+    str->append(',');
+    str->append(key_info->name);
+  }
+  str->append(')');
+}
+
+void QUICK_ROR_UNION_SELECT::add_info_string(String *str) {
+  bool first = true;
+  QUICK_SELECT_I *quick;
+  List_iterator_fast<QUICK_SELECT_I> it(quick_selects);
+  str->append(STRING_WITH_LEN("union("));
+  while ((quick = it++)) {
+    if (!first)
+      str->append(',');
+    else
+      first = false;
+    quick->add_info_string(str);
+  }
+  str->append(')');
+}
+
+void QUICK_ROR_INTERSECT_SELECT::add_keys_and_lengths(String *key_names,
+                                                      String *used_lengths) {
+  char buf[64];
+  size_t length;
+  bool first = true;
+  QUICK_RANGE_SELECT *quick;
+  List_iterator_fast<QUICK_RANGE_SELECT> it(quick_selects);
+  while ((quick = it++)) {
+    KEY *key_info = m_table->key_info + quick->index;
+    if (first)
+      first = false;
+    else {
+      key_names->append(',');
+      used_lengths->append(',');
+    }
+    key_names->append(key_info->name);
+    length = longlong10_to_str(quick->max_used_key_length, buf, 10) - buf;
+    used_lengths->append(buf, length);
+  }
+
+  if (cpk_quick) {
+    KEY *key_info = m_table->key_info + cpk_quick->index;
+    key_names->append(',');
+    key_names->append(key_info->name);
+    length = longlong10_to_str(cpk_quick->max_used_key_length, buf, 10) - buf;
+    used_lengths->append(',');
+    used_lengths->append(buf, length);
+  }
+}
+
+void QUICK_ROR_UNION_SELECT::add_keys_and_lengths(String *key_names,
+                                                  String *used_lengths) {
+  bool first = true;
+  QUICK_SELECT_I *quick;
+  List_iterator_fast<QUICK_SELECT_I> it(quick_selects);
+  while ((quick = it++)) {
+    if (first)
+      first = false;
+    else {
+      used_lengths->append(',');
+      key_names->append(',');
+    }
+    quick->add_keys_and_lengths(key_names, used_lengths);
+  }
+}
+
+#ifndef NDEBUG
+void QUICK_ROR_INTERSECT_SELECT::dbug_dump(int indent, bool verbose) {
+  List_iterator_fast<QUICK_RANGE_SELECT> it(quick_selects);
+  QUICK_RANGE_SELECT *quick;
+  fprintf(DBUG_FILE, "%*squick ROR-intersect select, %scovering\n", indent, "",
+          need_to_fetch_row ? "" : "non-");
+  fprintf(DBUG_FILE, "%*smerged scans {\n", indent, "");
+  while ((quick = it++)) quick->dbug_dump(indent + 2, verbose);
+  if (cpk_quick) {
+    fprintf(DBUG_FILE, "%*sclustered PK quick:\n", indent, "");
+    cpk_quick->dbug_dump(indent + 2, verbose);
+  }
+  fprintf(DBUG_FILE, "%*s}\n", indent, "");
+}
+
+void QUICK_ROR_UNION_SELECT::dbug_dump(int indent, bool verbose) {
+  List_iterator_fast<QUICK_SELECT_I> it(quick_selects);
+  QUICK_SELECT_I *quick;
+  fprintf(DBUG_FILE, "%*squick ROR-union select\n", indent, "");
+  fprintf(DBUG_FILE, "%*smerged scans {\n", indent, "");
+  while ((quick = it++)) quick->dbug_dump(indent + 2, verbose);
+  fprintf(DBUG_FILE, "%*s}\n", indent, "");
+}
+#endif
diff -Nru mysql-8.0-8.0.26/sql/range_optimizer/rowid_ordered_retrieval.h mysql-8.0-8.0.27/sql/range_optimizer/rowid_ordered_retrieval.h
--- mysql-8.0-8.0.26/sql/range_optimizer/rowid_ordered_retrieval.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/range_optimizer/rowid_ordered_retrieval.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,184 @@
+/* Copyright (c) 2000, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef SQL_RANGE_OPTIMIZER_ROWID_ORDERED_RETRIEVAL_H_
+#define SQL_RANGE_OPTIMIZER_ROWID_ORDERED_RETRIEVAL_H_
+
+#include <assert.h>
+#include <sys/types.h>
+#include <vector>
+
+#include "my_alloc.h"
+#include "my_inttypes.h"
+#include "priority_queue.h"
+#include "sql/handler.h"
+#include "sql/malloc_allocator.h"
+#include "sql/range_optimizer/range_optimizer.h"
+#include "sql/range_optimizer/range_scan.h"
+#include "sql/sql_list.h"
+#include "sql/table.h"
+
+class String;
+class THD;
+struct MY_BITMAP;
+
+/*
+  Rowid-Ordered Retrieval (ROR) index intersection quick select.
+  This quick select produces intersection of row sequences returned
+  by several QUICK_RANGE_SELECTs it "merges".
+
+  All merged QUICK_RANGE_SELECTs must return rowids in rowid order.
+  QUICK_ROR_INTERSECT_SELECT will return rows in rowid order, too.
+
+  All merged quick selects retrieve {rowid, covered_fields} tuples (not full
+  table records).
+  QUICK_ROR_INTERSECT_SELECT retrieves full records if it is not being used
+  by QUICK_ROR_INTERSECT_SELECT and all merged quick selects together don't
+  cover needed all fields.
+
+  If one of the merged quick selects is a Clustered PK range scan, it is
+  used only to filter rowid sequence produced by other merged quick selects.
+*/
+
+class QUICK_ROR_INTERSECT_SELECT : public QUICK_SELECT_I {
+ public:
+  QUICK_ROR_INTERSECT_SELECT(TABLE *table, bool retrieve_full_rows,
+                             MEM_ROOT *return_mem_root);
+  ~QUICK_ROR_INTERSECT_SELECT() override;
+
+  int init() override;
+  void need_sorted_output() override { assert(false); /* Can't do it */ }
+  int reset(void) override;
+  int get_next() override;
+  bool reverse_sorted() const override { return false; }
+  bool reverse_sort_possible() const override { return false; }
+  bool unique_key_range() override { return false; }
+  RangeScanType get_type() const override { return QS_TYPE_ROR_INTERSECT; }
+  bool is_loose_index_scan() const override { return false; }
+  bool is_agg_loose_index_scan() const override { return false; }
+  void add_keys_and_lengths(String *key_names, String *used_lengths) override;
+  void add_info_string(String *str) override;
+  bool is_keys_used(const MY_BITMAP *fields) override;
+#ifndef NDEBUG
+  void dbug_dump(int indent, bool verbose) override;
+#endif
+  int init_ror_merged_scan(bool reuse_handler) override;
+  bool push_quick_back(QUICK_RANGE_SELECT *quick_sel_range);
+
+  /*
+    Range quick selects this intersection consists of, not including
+    cpk_quick.
+  */
+  List<QUICK_RANGE_SELECT> quick_selects;
+
+  void get_fields_used(MY_BITMAP *used_fields) override {
+    List_iterator_fast<QUICK_RANGE_SELECT> it(quick_selects);
+    QUICK_RANGE_SELECT *quick;
+    while ((quick = it++)) quick->get_fields_used(used_fields);
+  }
+
+  MEM_ROOT *mem_root; /* Memory pool for this and merged quick selects data. */
+  /*
+    Merged quick select that uses Clustered PK, if there is one. This quick
+    select is not used for row retrieval, it is used for row retrieval.
+  */
+  QUICK_RANGE_SELECT *cpk_quick;
+
+  bool need_to_fetch_row; /* if true, do retrieve full table records. */
+  /* in top-level quick select, true if merged scans where initialized */
+  bool scans_inited;
+};
+
+/*
+  Comparison function to be used QUICK_ROR_UNION_SELECT::queue priority
+  queue.
+*/
+struct Quick_ror_union_less {
+  explicit Quick_ror_union_less(const QUICK_SELECT_I *me) : m_me(me) {}
+  bool operator()(QUICK_SELECT_I *a, QUICK_SELECT_I *b) {
+    return m_me->m_table->file->cmp_ref(a->last_rowid, b->last_rowid) > 0;
+  }
+  const QUICK_SELECT_I *m_me;
+};
+
+/*
+  Rowid-Ordered Retrieval index union select.
+  This quick select produces union of row sequences returned by several
+  quick select it "merges".
+
+  All merged quick selects must return rowids in rowid order.
+  QUICK_ROR_UNION_SELECT will return rows in rowid order, too.
+
+  All merged quick selects are set not to retrieve full table records.
+  ROR-union quick select always retrieves full records.
+
+*/
+
+class QUICK_ROR_UNION_SELECT : public QUICK_SELECT_I {
+ public:
+  QUICK_ROR_UNION_SELECT(MEM_ROOT *return_mem_root, TABLE *table);
+  ~QUICK_ROR_UNION_SELECT() override;
+
+  int init() override;
+  void need_sorted_output() override { assert(false); /* Can't do it */ }
+  int reset(void) override;
+  int get_next() override;
+  bool reverse_sorted() const override { return false; }
+  bool reverse_sort_possible() const override { return false; }
+  bool unique_key_range() override { return false; }
+  RangeScanType get_type() const override { return QS_TYPE_ROR_UNION; }
+  bool is_loose_index_scan() const override { return false; }
+  bool is_agg_loose_index_scan() const override { return false; }
+  void add_keys_and_lengths(String *key_names, String *used_lengths) override;
+  void add_info_string(String *str) override;
+  bool is_keys_used(const MY_BITMAP *fields) override;
+#ifndef NDEBUG
+  void dbug_dump(int indent, bool verbose) override;
+#endif
+
+  bool push_quick_back(QUICK_SELECT_I *quick_sel_range);
+
+  List<QUICK_SELECT_I> quick_selects; /* Merged quick selects */
+
+  void get_fields_used(MY_BITMAP *used_fields) override {
+    List_iterator_fast<QUICK_SELECT_I> it(quick_selects);
+    QUICK_SELECT_I *quick;
+    while ((quick = it++)) quick->get_fields_used(used_fields);
+  }
+
+  Priority_queue<
+      QUICK_SELECT_I *,
+      std::vector<QUICK_SELECT_I *, Malloc_allocator<QUICK_SELECT_I *>>,
+      Quick_ror_union_less>
+      queue; /* Priority queue for merge operation */
+
+  MEM_ROOT *mem_root; /* Memory pool for this and merged quick selects data. */
+  uchar *cur_rowid;   /* buffer used in get_next() */
+  uchar *prev_rowid;  /* rowid of last row returned by get_next() */
+  bool have_prev_rowid; /* true if prev_rowid has valid data */
+  uint rowid_length;    /* table rowid length */
+
+ private:
+  bool scans_inited;
+};
+
+#endif  // SQL_RANGE_OPTIMIZER_ROWID_ORDERED_RETRIEVAL_H_
diff -Nru mysql-8.0-8.0.26/sql/range_optimizer/rowid_ordered_retrieval_plan.cc mysql-8.0-8.0.27/sql/range_optimizer/rowid_ordered_retrieval_plan.cc
--- mysql-8.0-8.0.26/sql/range_optimizer/rowid_ordered_retrieval_plan.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/range_optimizer/rowid_ordered_retrieval_plan.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,1068 @@
+/* Copyright (c) 2000, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include "sql/range_optimizer/rowid_ordered_retrieval_plan.h"
+
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+#include <algorithm>
+#include <utility>
+
+#include "m_ctype.h"
+#include "m_string.h"
+#include "my_alloc.h"
+#include "my_dbug.h"
+#include "my_inttypes.h"
+#include "sql/key.h"
+#include "sql/key_spec.h"
+#include "sql/mem_root_array.h"
+#include "sql/opt_costmodel.h"
+#include "sql/opt_hints.h"
+#include "sql/opt_trace.h"
+#include "sql/range_optimizer/internal.h"
+#include "sql/range_optimizer/range_opt_param.h"
+#include "sql/range_optimizer/range_scan.h"
+#include "sql/range_optimizer/range_scan_plan.h"
+#include "sql/range_optimizer/rowid_ordered_retrieval.h"
+#include "sql/range_optimizer/tree.h"
+#include "sql/sql_bitmap.h"
+#include "sql/sql_class.h"
+#include "sql/sql_const.h"
+#include "sql/sql_lex.h"
+#include "sql/sql_optimizer.h"
+#include "sql/table.h"
+#include "sql_string.h"
+
+class Opt_trace_context;
+class QUICK_SELECT_I;
+
+using std::min;
+
+#ifndef NDEBUG
+static void print_ror_scans_arr(TABLE *table, const char *msg,
+                                ROR_SCAN_INFO **start, ROR_SCAN_INFO **end) {
+  DBUG_TRACE;
+
+  char buff[1024];
+  String tmp(buff, sizeof(buff), &my_charset_bin);
+  tmp.length(0);
+  for (; start != end; start++) {
+    if (tmp.length()) tmp.append(',');
+    tmp.append(table->key_info[(*start)->keynr].name);
+  }
+  if (!tmp.length()) tmp.append(STRING_WITH_LEN("(empty)"));
+  DBUG_PRINT("info", ("ROR key scans (%s): %s", msg, tmp.ptr()));
+  fprintf(DBUG_FILE, "ROR key scans (%s): %s", msg, tmp.ptr());
+}
+#endif
+
+void TRP_ROR_INTERSECT::trace_basic_info(THD *thd, const RANGE_OPT_PARAM *,
+                                         Opt_trace_object *trace_object) const {
+  trace_object->add_alnum("type", "index_roworder_intersect")
+      .add("rows", records)
+      .add("cost", cost_est)
+      .add("covering", is_covering)
+      .add("clustered_pk_scan", cpk_scan != nullptr);
+
+  Opt_trace_context *const trace = &thd->opt_trace;
+  Opt_trace_array ota(trace, "intersect_of");
+  for (ROR_SCAN_INFO *cur_scan : intersect_scans) {
+    const KEY &cur_key = table->key_info[cur_scan->keynr];
+    const KEY_PART_INFO *key_part = cur_key.key_part;
+
+    Opt_trace_object trace_isect_idx(trace);
+    trace_isect_idx.add_alnum("type", "range_scan")
+        .add_utf8("index", cur_key.name)
+        .add("rows", cur_scan->records);
+
+    Opt_trace_array trace_range(trace, "ranges");
+    for (const SEL_ARG *current = cur_scan->sel_root->root->first(); current;
+         current = current->next) {
+      String range_info;
+      range_info.set_charset(system_charset_info);
+      for (const SEL_ARG *part = current; part;
+           part = part->next_key_part ? part->next_key_part->root : nullptr) {
+        const KEY_PART_INFO *cur_key_part = key_part + part->part;
+        append_range(&range_info, cur_key_part, part->min_value,
+                     part->max_value, part->min_flag | part->max_flag);
+      }
+      trace_range.add_utf8(range_info.ptr(), range_info.length());
+    }
+  }
+}
+
+void TRP_ROR_UNION::trace_basic_info(THD *thd, const RANGE_OPT_PARAM *param,
+                                     Opt_trace_object *trace_object) const {
+  Opt_trace_context *const trace = &thd->opt_trace;
+  trace_object->add_alnum("type", "index_roworder_union");
+  Opt_trace_array ota(trace, "union_of");
+  for (TABLE_READ_PLAN **current = first_ror; current != last_ror; current++) {
+    Opt_trace_object trp_info(trace);
+    (*current)->trace_basic_info(thd, param, &trp_info);
+  }
+}
+
+// A replacement for get_quick_select() for when you already have
+// the ranges available, instead of a SEL_TREE that you need to extract
+// ranges from. Does not support reverse range scans.
+static QUICK_RANGE_SELECT *get_quick_select_local(
+    MEM_ROOT *return_mem_root, TABLE *table, KEY_PART *key, uint keyno,
+    uint mrr_flags, uint mrr_buf_size, uint used_key_parts,
+    Bounds_checked_array<QUICK_RANGE *> ranges) {
+  DBUG_TRACE;
+
+  if (table->key_info[keyno].flags & HA_SPATIAL) {
+    return new (return_mem_root)
+        QUICK_RANGE_SELECT_GEOM(table, keyno, return_mem_root, mrr_flags,
+                                mrr_buf_size, key, ranges, used_key_parts);
+  } else {
+    QUICK_RANGE_SELECT *quick = new (return_mem_root)
+        QUICK_RANGE_SELECT(table, keyno, return_mem_root, mrr_flags,
+                           mrr_buf_size, key, ranges, used_key_parts);
+    return quick;
+  }
+}
+
+QUICK_SELECT_I *TRP_ROR_INTERSECT::make_quick(bool retrieve_full_rows,
+                                              MEM_ROOT *return_mem_root) {
+  QUICK_RANGE_SELECT *quick;
+  DBUG_TRACE;
+
+  QUICK_ROR_INTERSECT_SELECT *quick_intrsect = new (return_mem_root)
+      QUICK_ROR_INTERSECT_SELECT(table,
+                                 (retrieve_full_rows ? (!is_covering) : false),
+                                 return_mem_root);
+  if (quick_intrsect) {
+    assert(quick_intrsect->index == index);
+    DBUG_EXECUTE("info",
+                 print_ror_scans_arr(
+                     table, "creating ROR-intersect", &intersect_scans[0],
+                     &intersect_scans[0] + intersect_scans.size()););
+    for (ROR_SCAN_INFO *current : intersect_scans) {
+      uint idx = current->idx;
+      if (!(quick = get_quick_select_local(
+                return_mem_root, table, key[idx], real_keynr[idx],
+                HA_MRR_SORTED, 0, current->used_key_parts, current->ranges)) ||
+          quick_intrsect->push_quick_back(quick)) {
+        destroy(quick_intrsect);
+        return nullptr;
+      }
+    }
+    if (cpk_scan) {
+      uint idx = cpk_scan->idx;
+      if (!(quick = get_quick_select_local(return_mem_root, table, key[idx],
+                                           real_keynr[idx], HA_MRR_SORTED, 0,
+                                           cpk_scan->used_key_parts,
+                                           cpk_scan->ranges))) {
+        destroy(quick_intrsect);
+        return nullptr;
+      }
+      quick->file = nullptr;
+      quick_intrsect->cpk_quick = quick;
+    }
+    quick_intrsect->records = records;
+    quick_intrsect->cost_est = cost_est;
+  }
+  quick_intrsect->forced_by_hint = forced_by_hint;
+  return quick_intrsect;
+}
+
+QUICK_SELECT_I *TRP_ROR_UNION::make_quick(bool, MEM_ROOT *return_mem_root) {
+  QUICK_ROR_UNION_SELECT *quick_roru;
+  TABLE_READ_PLAN **scan;
+  QUICK_SELECT_I *quick;
+  DBUG_TRACE;
+  /*
+    It is impossible to construct a ROR-union that will not retrieve full
+    rows, ignore retrieve_full_rows parameter.
+  */
+  if ((quick_roru = new (return_mem_root)
+           QUICK_ROR_UNION_SELECT(return_mem_root, table))) {
+    assert(quick_roru->index == index);
+    for (scan = first_ror; scan != last_ror; scan++) {
+      if (!(quick = (*scan)->make_quick(false, return_mem_root)) ||
+          quick_roru->push_quick_back(quick))
+        return nullptr;
+    }
+    quick_roru->records = records;
+    quick_roru->cost_est = cost_est;
+  }
+  quick_roru->forced_by_hint = forced_by_hint;
+  return quick_roru;
+}
+
+/*
+  Create ROR_SCAN_INFO* structure with a single ROR scan on index idx using
+  sel_arg set of intervals.
+
+  SYNOPSIS
+    make_ror_scan()
+      param    Parameter from test_quick_select function
+      idx      Index of key in param->keys
+      sel_root Set of intervals for a given key
+      needed_fields  Bitmask of fields needed by the query
+
+  RETURN
+    NULL - out of memory
+    ROR scan structure containing a scan for {idx, sel_arg}
+*/
+
+static ROR_SCAN_INFO *make_ror_scan(const RANGE_OPT_PARAM *param, int idx,
+                                    SEL_ROOT *sel_root,
+                                    const MY_BITMAP *needed_fields) {
+  ROR_SCAN_INFO *ror_scan;
+  my_bitmap_map *bitmap_buf1;
+  my_bitmap_map *bitmap_buf2;
+  uint keynr;
+  DBUG_TRACE;
+
+  if (!(ror_scan = new (param->return_mem_root) ROR_SCAN_INFO)) return nullptr;
+
+  ror_scan->idx = idx;
+  ror_scan->keynr = keynr = param->real_keynr[idx];
+  ror_scan->sel_root = sel_root;
+  ror_scan->records = param->table->quick_rows[keynr];
+
+  if (!(bitmap_buf1 = (my_bitmap_map *)param->return_mem_root->Alloc(
+            param->table->s->column_bitmap_size)))
+    return nullptr;
+  if (!(bitmap_buf2 = (my_bitmap_map *)param->return_mem_root->Alloc(
+            param->table->s->column_bitmap_size)))
+    return nullptr;
+
+  if (bitmap_init(&ror_scan->covered_fields, bitmap_buf1,
+                  param->table->s->fields))
+    return nullptr;
+  if (bitmap_init(&ror_scan->covered_fields_remaining, bitmap_buf2,
+                  param->table->s->fields))
+    return nullptr;
+
+  bitmap_clear_all(&ror_scan->covered_fields);
+
+  KEY_PART_INFO *key_part = param->table->key_info[keynr].key_part;
+  KEY_PART_INFO *key_part_end =
+      key_part + param->table->key_info[keynr].user_defined_key_parts;
+  for (; key_part != key_part_end; ++key_part) {
+    if (bitmap_is_set(needed_fields, key_part->fieldnr - 1))
+      bitmap_set_bit(&ror_scan->covered_fields, key_part->fieldnr - 1);
+  }
+  bitmap_copy(&ror_scan->covered_fields_remaining, &ror_scan->covered_fields);
+
+  double rows = rows2double(param->table->quick_rows[ror_scan->keynr]);
+  ror_scan->index_read_cost =
+      param->table->file->index_scan_cost(ror_scan->keynr, 1, rows);
+
+  Quick_ranges ranges(param->return_mem_root);
+  if (get_ranges_from_tree(param->return_mem_root, param->table,
+                           param->key[idx], param->real_keynr[idx], sel_root,
+                           MAX_REF_PARTS, &ror_scan->used_key_parts, &ranges)) {
+    return nullptr;
+  }
+  ror_scan->ranges = {&ranges[0], ranges.size()};
+
+  return ror_scan;
+}
+
+/**
+  Compare two ROR_SCAN_INFO* by
+    1. Number of fields in this index that are not already covered
+       by other indexes earlier in the intersect ordering: descending
+    2. E(Number of records): ascending
+
+  @param scan1   first ror scan to compare
+  @param scan2   second ror scan to compare
+
+  @return true if scan1 > scan2, false otherwise
+*/
+static bool is_better_intersect_match(const ROR_SCAN_INFO *scan1,
+                                      const ROR_SCAN_INFO *scan2) {
+  if (scan1 == scan2) return false;
+
+  if (scan1->num_covered_fields_remaining > scan2->num_covered_fields_remaining)
+    return false;
+
+  if (scan1->num_covered_fields_remaining < scan2->num_covered_fields_remaining)
+    return true;
+
+  return (scan1->records > scan2->records);
+}
+
+/**
+  Sort indexes in an order that is likely to be a good index merge
+  intersection order. After running this function, [start, ..., end-1]
+  is ordered according to this strategy:
+
+    1) Minimize the number of indexes that must be used in the
+       intersection. I.e., the index covering most fields not already
+       covered by other indexes earlier in the sort order is picked first.
+    2) When multiple indexes cover equally many uncovered fields, the
+       index with lowest E(Number of rows) is chosen.
+
+  Note that all permutations of index ordering are not tested, so this
+  function may not find the optimal order.
+
+  @param[in,out] start     Pointer to the start of indexes that may
+                           be used in index merge intersection
+  @param         end       Pointer past the last index that may be used.
+  @param         param     Parameter from test_quick_select function.
+  @param         needed_fields  Bitmask of fields needed by the query.
+*/
+static void find_intersect_order(ROR_SCAN_INFO **start, ROR_SCAN_INFO **end,
+                                 const RANGE_OPT_PARAM *param,
+                                 const MY_BITMAP *needed_fields) {
+  // nothing to sort if there are only zero or one ROR scans
+  if ((start == end) || (start + 1 == end)) return;
+
+  /*
+    Bitmap of fields we would like the ROR scans to cover. Will be
+    modified by the loop below so that when we're looking for a ROR
+    scan in position 'x' in the ordering, all fields covered by ROR
+    scans 0,...,x-1 have been removed.
+  */
+  MY_BITMAP fields_to_cover;
+  my_bitmap_map *map;
+  if (!(map = (my_bitmap_map *)param->temp_mem_root->Alloc(
+            param->table->s->column_bitmap_size)))
+    return;
+  bitmap_init(&fields_to_cover, map, needed_fields->n_bits);
+  bitmap_copy(&fields_to_cover, needed_fields);
+
+  // Sort ROR scans in [start,...,end-1]
+  for (ROR_SCAN_INFO **place = start; place < (end - 1); place++) {
+    /* Placeholder for the best ROR scan found for position 'place' so far */
+    ROR_SCAN_INFO **best = place;
+    ROR_SCAN_INFO **current = place + 1;
+
+    {
+      /*
+        Calculate how many fields in 'fields_to_cover' not already
+        covered by [start,...,place-1] the 'best' index covers. The
+        result is used in is_better_intersect_match() and is valid
+        when finding the best ROR scan for position 'place' only.
+      */
+      bitmap_intersect(&(*best)->covered_fields_remaining, &fields_to_cover);
+      (*best)->num_covered_fields_remaining =
+          bitmap_bits_set(&(*best)->covered_fields_remaining);
+    }
+    for (; current < end; current++) {
+      {
+        /*
+          Calculate how many fields in 'fields_to_cover' not already
+          covered by [start,...,place-1] the 'current' index covers.
+          The result is used in is_better_intersect_match() and is
+          valid when finding the best ROR scan for position 'place' only.
+        */
+        bitmap_intersect(&(*current)->covered_fields_remaining,
+                         &fields_to_cover);
+        (*current)->num_covered_fields_remaining =
+            bitmap_bits_set(&(*current)->covered_fields_remaining);
+
+        /*
+          No need to compare with 'best' if 'current' does not
+          contribute with uncovered fields.
+        */
+        if ((*current)->num_covered_fields_remaining == 0) continue;
+      }
+
+      if (is_better_intersect_match(*best, *current)) best = current;
+    }
+
+    /*
+      'best' is now the ROR scan that will be sorted in position
+      'place'. When searching for the best ROR scans later in the sort
+      sequence we do not need coverage of the fields covered by 'best'
+    */
+    bitmap_subtract(&fields_to_cover, &(*best)->covered_fields);
+    if (best != place) std::swap(*best, *place);
+
+    if (bitmap_is_clear_all(&fields_to_cover))
+      return;  // No more fields to cover
+  }
+}
+
+/* Auxiliary structure for incremental ROR-intersection creation */
+typedef struct {
+  const RANGE_OPT_PARAM *param;
+  MY_BITMAP covered_fields; /* union of fields covered by all scans */
+  /*
+    Fraction of table records that satisfies conditions of all scans.
+    This is the number of full records that will be retrieved if a
+    non-index_only index intersection will be employed.
+  */
+  double out_rows;
+  /* true if covered_fields is a superset of needed_fields */
+  bool is_covering;
+
+  ha_rows index_records;         /* sum(#records to look in indexes) */
+  Cost_estimate index_scan_cost; /* SUM(cost of 'index-only' scans) */
+  Cost_estimate total_cost;
+} ROR_INTERSECT_INFO;
+
+/*
+  Allocate a ROR_INTERSECT_INFO and initialize it to contain zero scans.
+
+  SYNOPSIS
+    ror_intersect_init()
+      param         Parameter from test_quick_select
+
+  RETURN
+    allocated structure
+    NULL on error
+*/
+
+static ROR_INTERSECT_INFO *ror_intersect_init(const RANGE_OPT_PARAM *param) {
+  ROR_INTERSECT_INFO *info;
+  my_bitmap_map *buf;
+  if (!(info = new (param->return_mem_root) ROR_INTERSECT_INFO)) return nullptr;
+  info->param = param;
+  if (!(buf = (my_bitmap_map *)param->temp_mem_root->Alloc(
+            param->table->s->column_bitmap_size)))
+    return nullptr;
+  if (bitmap_init(&info->covered_fields, buf, param->table->s->fields))
+    return nullptr;
+  info->is_covering = false;
+  info->index_scan_cost.reset();
+  info->total_cost.reset();
+  info->index_records = 0;
+  info->out_rows = (double)param->table->file->stats.records;
+  bitmap_clear_all(&info->covered_fields);
+  return info;
+}
+
+static void ror_intersect_cpy(ROR_INTERSECT_INFO *dst,
+                              const ROR_INTERSECT_INFO *src) {
+  dst->param = src->param;
+  memcpy(dst->covered_fields.bitmap, src->covered_fields.bitmap,
+         no_bytes_in_map(&src->covered_fields));
+  dst->out_rows = src->out_rows;
+  dst->is_covering = src->is_covering;
+  dst->index_records = src->index_records;
+  dst->index_scan_cost = src->index_scan_cost;
+  dst->total_cost = src->total_cost;
+}
+
+/*
+  Get selectivity of adding a ROR scan to the ROR-intersection.
+
+  SYNOPSIS
+    ror_scan_selectivity()
+      info  ROR-interection, an intersection of ROR index scans
+      scan  ROR scan that may or may not improve the selectivity
+            of 'info'
+
+  NOTES
+    Suppose we have conditions on several keys
+    cond=k_11=c_11 AND k_12=c_12 AND ...  // key_parts of first key in 'info'
+         k_21=c_21 AND k_22=c_22 AND ...  // key_parts of second key in 'info'
+          ...
+         k_n1=c_n1 AND k_n3=c_n3 AND ...  (1) //key_parts of 'scan'
+
+    where k_ij may be the same as any k_pq (i.e. keys may have common parts).
+
+    Note that for ROR retrieval, only equality conditions are usable so there
+    are no open ranges (e.g., k_ij > c_ij) in 'scan' or 'info'.
+    FIXME: This isn't true in practice; e.g. i_main.costmodel_planchange ends
+    up calling this function with an inequality condition, and thus the
+  estimation is probably wrong (since the code assumes only one element in the
+  tree).
+
+    A full row is retrieved if entire condition holds.
+
+    The recursive procedure for finding P(cond) is as follows:
+
+    First step:
+    Pick 1st part of 1st key and break conjunction (1) into two parts:
+      cond= (k_11=c_11 AND R)
+
+    Here R may still contain condition(s) equivalent to k_11=c_11.
+    Nevertheless, the following holds:
+
+      P(k_11=c_11 AND R) = P(k_11=c_11) * P(R | k_11=c_11).
+
+    Mark k_11 as fixed field (and satisfied condition) F, save P(F),
+    save R to be cond and proceed to recursion step.
+
+    Recursion step:
+    We have a set of fixed fields/satisfied conditions) F, probability P(F),
+    and remaining conjunction R
+    Pick next key part on current key and its condition "k_ij=c_ij".
+    We will add "k_ij=c_ij" into F and update P(F).
+    Lets denote k_ij as t,  R = t AND R1, where R1 may still contain t. Then
+
+     P((t AND R1)|F) = P(t|F) * P(R1|t|F) = P(t|F) * P(R1|(t AND F)) (2)
+
+    (where '|' mean conditional probability, not "or")
+
+    Consider the first multiplier in (2). One of the following holds:
+    a) F contains condition on field used in t (i.e. t AND F = F).
+      Then P(t|F) = 1
+
+    b) F doesn't contain condition on field used in t. Then F and t are
+     considered independent.
+
+     P(t|F) = P(t|(fields_before_t_in_key AND other_fields)) =
+          = P(t|fields_before_t_in_key).
+
+     P(t|fields_before_t_in_key) = #records(fields_before_t_in_key) /
+                                   #records(fields_before_t_in_key, t)
+
+    The second multiplier is calculated by applying this step recursively.
+
+  IMPLEMENTATION
+    This function calculates the result of application of the "recursion step"
+    described above for all fixed key members of a single key, accumulating set
+    of covered fields, selectivity, etc.
+
+    The calculation is conducted as follows:
+    Lets denote #records(keypart1, ... keypartK) as n_k. We need to calculate
+
+     n_{k1}      n_{k2}
+    --------- * ---------  * .... (3)
+     n_{k1-1}    n_{k2-1}
+
+    where k1,k2,... are key parts which fields were not yet marked as fixed
+    ( this is result of application of option b) of the recursion step for
+      parts of a single key).
+    Since it is reasonable to expect that most of the fields are not marked
+    as fixed, we calculate (3) as
+
+                                  n_{i1}      n_{i2}
+    (3) = n_{max_key_part}  / (   --------- * ---------  * ....  )
+                                  n_{i1-1}    n_{i2-1}
+
+    where i1,i2, .. are key parts that were already marked as fixed.
+
+    In order to minimize number of expensive records_in_range calls we
+    group and reduce adjacent fractions. Note that on the optimizer's
+    request, index statistics may be used instead of records_in_range
+    @see RANGE_OPT_PARAM::use_index_statistics.
+
+  RETURN
+    Selectivity of given ROR scan, a number between 0 and 1. 1 means that
+    adding 'scan' to the intersection does not improve the selectivity.
+*/
+
+static double ror_scan_selectivity(const ROR_INTERSECT_INFO *info,
+                                   const ROR_SCAN_INFO *scan) {
+  double selectivity_mult = 1.0;
+  const TABLE *const table = info->param->table;
+  const KEY_PART_INFO *const key_part = table->key_info[scan->keynr].key_part;
+  /**
+    key values tuple, used to store both min_range.key and
+    max_range.key. This function is only called for equality ranges;
+    open ranges (e.g. "min_value < X < max_value") cannot be used for
+    rowid ordered retrieval, so in this function we know that
+    min_range.key == max_range.key
+  */
+  uchar key_val[MAX_KEY_LENGTH + MAX_FIELD_WIDTH];
+  uchar *key_ptr = key_val;
+  SEL_ARG *tuple_arg = nullptr;
+  key_part_map keypart_map = 0;
+  bool cur_covered;
+  bool prev_covered =
+      bitmap_is_set(&info->covered_fields, key_part->fieldnr - 1);
+  key_range min_range;
+  key_range max_range;
+  min_range.key = key_val;
+  min_range.flag = HA_READ_KEY_EXACT;
+  max_range.key = key_val;
+  max_range.flag = HA_READ_AFTER_KEY;
+  ha_rows prev_records = table->file->stats.records;
+  DBUG_TRACE;
+
+  for (SEL_ROOT *sel_root = scan->sel_root; sel_root;
+       sel_root = sel_root->root->next_key_part) {
+    DBUG_PRINT("info", ("sel_root step"));
+    cur_covered = bitmap_is_set(&info->covered_fields,
+                                key_part[sel_root->root->part].fieldnr - 1);
+    if (cur_covered != prev_covered) {
+      /* create (part1val, ..., part{n-1}val) tuple. */
+      bool is_null_range = false;
+      ha_rows records;
+      if (!tuple_arg) {
+        tuple_arg = scan->sel_root->root;
+        /* Here we use the length of the first key part */
+        tuple_arg->store_min_value(key_part[0].store_length, &key_ptr, 0);
+        is_null_range |= tuple_arg->is_null_interval();
+        keypart_map = 1;
+      }
+      while (tuple_arg->next_key_part != sel_root) {
+        tuple_arg = tuple_arg->next_key_part->root;
+        tuple_arg->store_min_value(key_part[tuple_arg->part].store_length,
+                                   &key_ptr, 0);
+        is_null_range |= tuple_arg->is_null_interval();
+        keypart_map = (keypart_map << 1) | 1;
+      }
+      min_range.length = max_range.length = (size_t)(key_ptr - key_val);
+      min_range.keypart_map = max_range.keypart_map = keypart_map;
+
+      /*
+        Get the number of rows in this range. This is done by calling
+        records_in_range() unless all these are true:
+          1) The user has requested that index statistics should be used
+             for equality ranges to avoid the incurred overhead of
+             index dives in records_in_range()
+          2) The range is not on the form "x IS NULL". The reason is
+             that the number of rows with this value are likely to be
+             very different than the values in the index statistics
+          3) Index statistics is available.
+        @see key_val
+      */
+      if (!info->param->use_index_statistics ||  // (1)
+          is_null_range ||                       // (2)
+          !table->key_info[scan->keynr].has_records_per_key(
+              tuple_arg->part))  // (3)
+      {
+        DBUG_EXECUTE_IF("crash_records_in_range", DBUG_SUICIDE(););
+        assert(min_range.length > 0);
+        records =
+            table->file->records_in_range(scan->keynr, &min_range, &max_range);
+      } else {
+        // Use index statistics
+        records = static_cast<ha_rows>(
+            table->key_info[scan->keynr].records_per_key(tuple_arg->part));
+      }
+
+      if (cur_covered) {
+        /* uncovered -> covered */
+        double tmp = rows2double(records) / rows2double(prev_records);
+        DBUG_PRINT("info", ("Selectivity multiplier: %g", tmp));
+        selectivity_mult *= tmp;
+        prev_records = HA_POS_ERROR;
+      } else {
+        /* covered -> uncovered */
+        prev_records = records;
+      }
+    }
+    prev_covered = cur_covered;
+  }
+  if (!prev_covered) {
+    double tmp =
+        rows2double(table->quick_rows[scan->keynr]) / rows2double(prev_records);
+    DBUG_PRINT("info", ("Selectivity multiplier: %g", tmp));
+    selectivity_mult *= tmp;
+  }
+  // Todo: This assert fires in PB sysqa RQG tests.
+  // assert(selectivity_mult <= 1.0);
+  DBUG_PRINT("info", ("Returning multiplier: %g", selectivity_mult));
+  return selectivity_mult;
+}
+
+/*
+  Check if adding a ROR scan to a ROR-intersection reduces its cost of
+  ROR-intersection and if yes, update parameters of ROR-intersection,
+  including its cost.
+
+  SYNOPSIS
+    ror_intersect_add()
+      info         ROR-intersection structure to add the scan to.
+      needed_fields  Bitmask of fields needed by the query.
+      ror_scan     ROR scan info to add.
+      is_cpk_scan  If true, add the scan as CPK scan (this can be inferred
+                   from other parameters and is passed separately only to
+                   avoid duplicating the inference code)
+      trace_costs  Optimizer trace object cost details are added to
+      ignore_cost  Ignore cost check due to use of INDEX_MERGE hint
+
+  NOTES
+    Adding a ROR scan to ROR-intersect "makes sense" iff the cost of ROR-
+    intersection decreases. The cost of ROR-intersection is calculated as
+    follows:
+
+    cost= SUM_i(key_scan_cost_i) + cost_of_full_rows_retrieval
+
+    When we add a scan the first increases and the second decreases.
+
+    cost_of_full_rows_retrieval=
+      (union of indexes used covers all needed fields) ?
+        cost_of_sweep_read(E(rows_to_retrieve), rows_in_table) :
+        0
+
+    E(rows_to_retrieve) = #rows_in_table * ror_scan_selectivity(null, scan1) *
+                           ror_scan_selectivity({scan1}, scan2) * ... *
+                           ror_scan_selectivity({scan1,...}, scanN).
+  RETURN
+    true   ROR scan added to ROR-intersection, cost updated.
+    false  It doesn't make sense to add this ROR scan to this ROR-intersection.
+*/
+
+static bool ror_intersect_add(ROR_INTERSECT_INFO *info,
+                              const MY_BITMAP *needed_fields,
+                              ROR_SCAN_INFO *ror_scan, bool is_cpk_scan,
+                              Opt_trace_object *trace_costs, bool ignore_cost) {
+  double selectivity_mult = 1.0;
+
+  DBUG_TRACE;
+  DBUG_PRINT("info", ("Current out_rows= %g", info->out_rows));
+  DBUG_PRINT("info", ("Adding scan on %s",
+                      info->param->table->key_info[ror_scan->keynr].name));
+  DBUG_PRINT("info", ("is_cpk_scan: %d", is_cpk_scan));
+
+  selectivity_mult = ror_scan_selectivity(info, ror_scan);
+  if (selectivity_mult == 1.0 && !ignore_cost) {
+    /* Don't add this scan if it doesn't improve selectivity. */
+    DBUG_PRINT("info", ("The scan doesn't improve selectivity."));
+    return false;
+  }
+
+  info->out_rows *= selectivity_mult;
+
+  if (is_cpk_scan) {
+    /*
+      CPK scan is used to filter out rows. We apply filtering for each
+      record of every scan. For each record we assume that one key
+      compare is done:
+    */
+    const Cost_model_table *const cost_model = info->param->table->cost_model();
+    const double idx_cost =
+        cost_model->key_compare_cost(rows2double(info->index_records));
+    info->index_scan_cost.add_cpu(idx_cost);
+    trace_costs->add("index_scan_cost", idx_cost);
+  } else {
+    info->index_records += info->param->table->quick_rows[ror_scan->keynr];
+    info->index_scan_cost += ror_scan->index_read_cost;
+    trace_costs->add("index_scan_cost", ror_scan->index_read_cost);
+    bitmap_union(&info->covered_fields, &ror_scan->covered_fields);
+    if (!info->is_covering &&
+        bitmap_is_subset(needed_fields, &info->covered_fields)) {
+      DBUG_PRINT("info", ("ROR-intersect is covering now"));
+      info->is_covering = true;
+    }
+  }
+
+  info->total_cost = info->index_scan_cost;
+  trace_costs->add("cumulated_index_scan_cost", info->index_scan_cost);
+
+  if (!info->is_covering) {
+    Cost_estimate sweep_cost;
+    JOIN *join = info->param->query_block->join;
+    const bool is_interrupted = join && join->tables != 1;
+
+    get_sweep_read_cost(info->param->table, double2rows(info->out_rows),
+                        is_interrupted, &sweep_cost);
+    info->total_cost += sweep_cost;
+    trace_costs->add("disk_sweep_cost", sweep_cost);
+  } else
+    trace_costs->add("disk_sweep_cost", 0);
+
+  DBUG_PRINT("info", ("New out_rows: %g", info->out_rows));
+  DBUG_PRINT("info", ("New cost: %g, %scovering", info->total_cost.total_cost(),
+                      info->is_covering ? "" : "non-"));
+  return true;
+}
+
+/*
+  Get best ROR-intersection plan using non-covering ROR-intersection search
+  algorithm. The returned plan may be covering.
+
+  SYNOPSIS
+    get_best_ror_intersect()
+      param            Parameter from test_quick_select function.
+      order_direction  The sort order the range access method must be able
+                       to provide. Three-value logic: asc/desc/don't care
+      tree             Transformed restriction condition to be used to look
+                       for ROR scans.
+      cost_est         Do not return read plans with cost > cost_est.
+      are_all_covering [out] set to true if union of all scans covers all
+                       fields needed by the query (and it is possible to build
+                       a covering ROR-intersection)
+      force_index_merge_result true if the function must return cheapest
+                               intersection object when INDEX_MERGE hint is
+                               used without specified indexes, false otherwise.
+
+  NOTES
+    get_key_scans_params must be called before this function can be called.
+
+    When this function is called by ROR-union construction algorithm it
+    assumes it is building an uncovered ROR-intersection (and thus # of full
+    records to be retrieved is wrong here). This is a hack.
+
+  IMPLEMENTATION
+    The approximate best non-covering plan search algorithm is as follows:
+
+    find_min_ror_intersection_scan()
+    {
+      R= select all ROR scans;
+      order R by (E(#records_matched) * key_record_length).
+
+      S= first(R); -- set of scans that will be used for ROR-intersection
+      R= R-first(S);
+      min_cost= cost(S);
+      min_scan= make_scan(S);
+      while (R is not empty)
+      {
+        firstR= R - first(R);
+        if (!selectivity(S + firstR < selectivity(S)))
+          continue;
+
+        S= S + first(R);
+        if (cost(S) < min_cost)
+        {
+          min_cost= cost(S);
+          min_scan= make_scan(S);
+        }
+      }
+      return min_scan;
+    }
+
+    See ror_intersect_add function for ROR intersection costs.
+
+    Special handling for Clustered PK scans
+    Clustered PK contains all table fields, so using it as a regular scan in
+    index intersection doesn't make sense: a range scan on CPK will be less
+    expensive in this case.
+    Clustered PK scan has special handling in ROR-intersection: it is not used
+    to retrieve rows, instead its condition is used to filter row references
+    we get from scans on other keys.
+
+  RETURN
+    ROR-intersection table read plan
+    NULL if out of memory or no suitable plan found.
+*/
+
+TRP_ROR_INTERSECT *get_best_ror_intersect(
+    THD *thd, const RANGE_OPT_PARAM *param, TABLE *table,
+    bool index_merge_intersect_allowed, enum_order order_direction,
+    SEL_TREE *tree, const MY_BITMAP *needed_fields,
+    const Cost_estimate *cost_est, bool force_index_merge_result) {
+  uint idx;
+  Cost_estimate min_cost;
+  Opt_trace_context *const trace = &thd->opt_trace;
+  DBUG_TRACE;
+
+  bool use_cheapest_index_merge = false;
+  bool force_index_merge =
+      idx_merge_hint_state(thd, table, &use_cheapest_index_merge);
+
+  Opt_trace_object trace_ror(trace, "analyzing_roworder_intersect");
+
+  min_cost.set_max_cost();
+
+  if (tree->n_ror_scans < 2 ||
+      ((!table->file->stats.records || !index_merge_intersect_allowed) &&
+       !force_index_merge)) {
+    trace_ror.add("usable", false);
+    if (tree->n_ror_scans < 2)
+      trace_ror.add_alnum("cause", "too_few_roworder_scans");
+    else
+      trace_ror.add("need_tracing", true);
+    return nullptr;
+  }
+
+  if (order_direction == ORDER_DESC) return nullptr;
+
+  /*
+    Step1: Collect ROR-able SEL_ARGs and create ROR_SCAN_INFO for each of
+    them. Also find and save clustered PK scan if there is one.
+  */
+  ROR_SCAN_INFO **cur_ror_scan;
+  ROR_SCAN_INFO *cpk_scan = nullptr;
+  uint cpk_no;
+  bool cpk_scan_used = false;
+
+  if (!(tree->ror_scans =
+            param->temp_mem_root->ArrayAlloc<ROR_SCAN_INFO *>(param->keys)))
+    return nullptr;
+  cpk_no = ((table->file->primary_key_is_clustered()) ? table->s->primary_key
+                                                      : MAX_KEY);
+
+  for (idx = 0, cur_ror_scan = tree->ror_scans; idx < param->keys; idx++) {
+    ROR_SCAN_INFO *scan;
+    if (!tree->ror_scans_map.is_set(idx)) continue;
+    if (!(scan = make_ror_scan(param, idx, tree->keys[idx], needed_fields)))
+      return nullptr;
+    if (param->real_keynr[idx] == cpk_no) {
+      cpk_scan = scan;
+      tree->n_ror_scans--;
+    } else
+      *(cur_ror_scan++) = scan;
+  }
+
+  tree->ror_scans_end = cur_ror_scan;
+  DBUG_EXECUTE("info", print_ror_scans_arr(table, "original", tree->ror_scans,
+                                           tree->ror_scans_end););
+  /*
+    Ok, [ror_scans, ror_scans_end) is array of ptrs to initialized
+    ROR_SCAN_INFO's.
+    Step 2: Get best ROR-intersection using an approximate algorithm.
+  */
+  find_intersect_order(tree->ror_scans, tree->ror_scans_end, param,
+                       needed_fields);
+
+  DBUG_EXECUTE("info", print_ror_scans_arr(table, "ordered", tree->ror_scans,
+                                           tree->ror_scans_end););
+
+  ROR_SCAN_INFO **intersect_scans; /* ROR scans used in index intersection */
+  ROR_SCAN_INFO **intersect_scans_end;
+  if (!(intersect_scans = param->return_mem_root->ArrayAlloc<ROR_SCAN_INFO *>(
+            tree->n_ror_scans)))
+    return nullptr;
+  intersect_scans_end = intersect_scans;
+
+  /* Create and incrementally update ROR intersection. */
+  ROR_INTERSECT_INFO *intersect, *intersect_best = nullptr;
+  if (!(intersect = ror_intersect_init(param)) ||
+      !(intersect_best = ror_intersect_init(param)))
+    return nullptr;
+
+  /* [intersect_scans,intersect_scans_best) will hold the best intersection */
+  ROR_SCAN_INFO **intersect_scans_best;
+  cur_ror_scan = tree->ror_scans;
+  intersect_scans_best = intersect_scans;
+  /*
+    Note: trace_isect_idx.end() is called to close this object after
+    this while-loop.
+  */
+  Opt_trace_array trace_isect_idx(trace, "intersecting_indexes");
+  while (cur_ror_scan != tree->ror_scans_end && !intersect->is_covering) {
+    Opt_trace_object trace_idx(trace);
+    trace_idx.add_utf8("index", table->key_info[(*cur_ror_scan)->keynr].name);
+
+    if (!compound_hint_key_enabled(table, (*cur_ror_scan)->keynr,
+                                   INDEX_MERGE_HINT_ENUM)) {
+      trace_idx.add("usable", false).add_alnum("cause", "index_merge_hint");
+      cur_ror_scan++;
+      continue;
+    }
+
+    /* S= S + first(R);  R= R - first(R); */
+    if (!ror_intersect_add(intersect, needed_fields, *cur_ror_scan, false,
+                           &trace_idx,
+                           force_index_merge && !use_cheapest_index_merge)) {
+      trace_idx.add("cumulated_total_cost", intersect->total_cost)
+          .add("usable", false)
+          .add_alnum("cause", "does_not_reduce_cost_of_intersect");
+      cur_ror_scan++;
+      continue;
+    }
+
+    trace_idx.add("cumulated_total_cost", intersect->total_cost)
+        .add("usable", true)
+        .add("matching_rows_now", intersect->out_rows)
+        .add("isect_covering_with_this_index", intersect->is_covering);
+
+    *(intersect_scans_end++) = *(cur_ror_scan++);
+
+    if (intersect->total_cost < min_cost ||
+        (force_index_merge &&
+         /*
+           If INDEX_MERGE hint is used without only specified index,
+           index merge is forced and the cheapest combination of indexes
+           will be chosen. Since ranges are sorted by index scan cost,
+           index merge is forced for first two ranges and next ranges are
+           added only if they reduce total cost and there is no clustered
+           primary key scan or intersection is covering. If there is
+           a range by clustered primary key and intersection is not covering,
+           combination of first index and primary key is considered as
+           a cheapest intersection.
+         */
+         ((intersect_scans_best - intersect_scans < 2 &&
+           force_index_merge_result && (!cpk_scan || intersect->is_covering)) ||
+          !use_cheapest_index_merge))) {
+      /* Local minimum found, save it */
+      ror_intersect_cpy(intersect_best, intersect);
+      intersect_scans_best = intersect_scans_end;
+      min_cost = intersect->total_cost;
+      trace_idx.add("chosen", true);
+    } else {
+      trace_idx.add("chosen", false).add_alnum("cause", "does_not_reduce_cost");
+    }
+  }
+  // Note: trace_isect_idx trace object is closed here
+  trace_isect_idx.end();
+
+  if (intersect_scans_best == intersect_scans) {
+    trace_ror.add("chosen", false)
+        .add_alnum("cause", "does_not_increase_selectivity");
+    DBUG_PRINT("info", ("None of scans increase selectivity"));
+    return nullptr;
+  }
+
+  DBUG_EXECUTE("info",
+               print_ror_scans_arr(table, "best ROR-intersection",
+                                   intersect_scans, intersect_scans_best););
+
+  uint best_num = intersect_scans_best - intersect_scans;
+  ror_intersect_cpy(intersect, intersect_best);
+
+  /*
+    Ok, found the best ROR-intersection of non-CPK key scans.
+    Check if we should add a CPK scan. If the obtained ROR-intersection is
+    covering, it doesn't make sense to add CPK scan.
+  */
+  {  // Scope for trace object
+    Opt_trace_object trace_cpk(trace, "clustered_pk");
+    if (cpk_scan && !intersect->is_covering &&
+        compound_hint_key_enabled(table, cpk_no, INDEX_MERGE_HINT_ENUM)) {
+      if (ror_intersect_add(intersect, needed_fields, cpk_scan, true,
+                            &trace_cpk, true) &&
+          ((intersect->total_cost < min_cost) ||
+           (force_index_merge &&
+            (!use_cheapest_index_merge ||
+             (best_num == 1 && force_index_merge_result))))) {
+        trace_cpk.add("clustered_pk_scan_added_to_intersect", true)
+            .add("cumulated_cost", intersect->total_cost);
+        cpk_scan_used = true;
+        intersect_best = intersect;  // just set pointer here
+      } else
+        trace_cpk.add("clustered_pk_added_to_intersect", false)
+            .add_alnum("cause", "cost");
+    } else {
+      trace_cpk.add("clustered_pk_added_to_intersect", false)
+          .add_alnum("cause", cpk_scan ? "roworder_is_covering"
+                                       : "no_clustered_pk_index");
+    }
+  }
+  /* Ok, return ROR-intersect plan if we have found one */
+  TRP_ROR_INTERSECT *trp = nullptr;
+  if ((min_cost < *cost_est || force_index_merge) &&
+      (cpk_scan_used || best_num > 1)) {
+    if (!(trp = new (param->return_mem_root) TRP_ROR_INTERSECT(
+              table, force_index_merge, param->key, param->real_keynr,
+              {intersect_scans, best_num}, intersect_best->index_scan_cost,
+              intersect_best->is_covering,
+              cpk_scan_used ? cpk_scan : nullptr))) {
+      return trp;
+    }
+    trp->cost_est = intersect_best->total_cost;
+    /* Prevent divisons by zero */
+    ha_rows best_rows = double2rows(intersect_best->out_rows);
+    if (!best_rows) best_rows = 1;
+    table->quick_condition_rows = min(table->quick_condition_rows, best_rows);
+    trp->records = best_rows;
+
+    trace_ror.add("rows", trp->records)
+        .add("cost", trp->cost_est)
+        .add("covering", intersect_best->is_covering)
+        .add("chosen", true);
+
+    DBUG_PRINT("info", ("Returning non-covering ROR-intersect plan:"
+                        "cost %g, records %lu",
+                        trp->cost_est.total_cost(), (ulong)trp->records));
+  } else {
+    trace_ror.add("chosen", false)
+        .add_alnum("cause", (*cost_est > min_cost) ? "too_few_indexes_to_merge"
+                                                   : "cost");
+  }
+  return trp;
+}
diff -Nru mysql-8.0-8.0.26/sql/range_optimizer/rowid_ordered_retrieval_plan.h mysql-8.0-8.0.27/sql/range_optimizer/rowid_ordered_retrieval_plan.h
--- mysql-8.0-8.0.26/sql/range_optimizer/rowid_ordered_retrieval_plan.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/range_optimizer/rowid_ordered_retrieval_plan.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,140 @@
+/* Copyright (c) 2000, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef SQL_RANGE_OPTIMIZER_ROWID_ORDERED_RETRIEVAL_PLAN_H_
+#define SQL_RANGE_OPTIMIZER_ROWID_ORDERED_RETRIEVAL_PLAN_H_
+
+#include <sys/types.h>
+
+#include "my_base.h"
+#include "my_bitmap.h"
+#include "sql/handler.h"
+#include "sql/range_optimizer/table_read_plan.h"
+
+class Opt_trace_object;
+class RANGE_OPT_PARAM;
+class QUICK_SELECT_I;
+class SEL_ROOT;
+class SEL_TREE;
+struct MEM_ROOT;
+
+struct ROR_SCAN_INFO {
+  uint idx;         ///< # of used key in param->keys
+  uint keynr;       ///< # of used key in table
+  ha_rows records;  ///< estimate of # records this scan will return
+
+  /** Set of intervals over key fields that will be used for row retrieval. */
+  SEL_ROOT *sel_root;
+
+  /** Fields used in the query and covered by this ROR scan. */
+  MY_BITMAP covered_fields;
+  /**
+    Fields used in the query that are a) covered by this ROR scan and
+    b) not already covered by ROR scans ordered earlier in the merge
+    sequence.
+  */
+  MY_BITMAP covered_fields_remaining;
+  /** Number of fields in covered_fields_remaining (caching of
+   * bitmap_bits_set()) */
+  uint num_covered_fields_remaining;
+
+  /**
+    Cost of reading all index records with values in sel_arg intervals set
+    (assuming there is no need to access full table records)
+  */
+  Cost_estimate index_read_cost;
+
+  /**
+    The ranges to scan for this index. Must be allocated on the return_mem_root.
+   */
+  Bounds_checked_array<QUICK_RANGE *> ranges;
+  uint used_key_parts;
+};
+
+/* Plan for QUICK_ROR_INTERSECT_SELECT scan. */
+
+class TRP_ROR_INTERSECT : public TABLE_READ_PLAN {
+ public:
+  // intersect_scans (both the pointers and the structs themselves)
+  // must be allocated on return_mem_root, as it will be used
+  // by make_quick(), which can be called after the range optimizer
+  // has returned.
+  TRP_ROR_INTERSECT(TABLE *table_arg, bool forced_by_hint_arg,
+                    KEY_PART *const *key_arg, const uint *real_keynr_arg,
+                    Bounds_checked_array<ROR_SCAN_INFO *> intersect_scans_arg,
+                    Cost_estimate index_scan_cost_arg, bool is_covering_arg,
+                    ROR_SCAN_INFO *cpk_scan_arg)
+      : TABLE_READ_PLAN(table_arg, MAX_KEY, /*used_key_parts=*/-1,
+                        forced_by_hint_arg),
+        intersect_scans(intersect_scans_arg),
+        cpk_scan(cpk_scan_arg),
+        is_covering(is_covering_arg),
+        index_scan_cost(index_scan_cost_arg),
+        key(key_arg),
+        real_keynr(real_keynr_arg) {}
+
+  QUICK_SELECT_I *make_quick(bool retrieve_full_rows,
+                             MEM_ROOT *return_mem_root) override;
+
+  Cost_estimate get_index_scan_cost() const { return index_scan_cost; }
+
+ private:
+  /* ROR range scans used in this intersection */
+  Bounds_checked_array<ROR_SCAN_INFO *> intersect_scans;
+  ROR_SCAN_INFO *cpk_scan; /* Clustered PK scan, if there is one */
+  const bool is_covering;  /* true if no row retrieval phase is necessary */
+  const Cost_estimate index_scan_cost; /* SUM(cost(index_scan)) */
+
+  void trace_basic_info(THD *thd, const RANGE_OPT_PARAM *param,
+                        Opt_trace_object *trace_object) const override;
+
+  KEY_PART *const *key;
+  const uint *real_keynr;
+};
+
+/*
+  Plan for QUICK_ROR_UNION_SELECT scan.
+  QUICK_ROR_UNION_SELECT always retrieves full rows, so retrieve_full_rows
+  is ignored by make_quick.
+*/
+
+class TRP_ROR_UNION : public TABLE_READ_PLAN {
+ public:
+  TRP_ROR_UNION(TABLE *table_arg, bool forced_by_hint_arg)
+      : TABLE_READ_PLAN(table_arg, MAX_KEY, /*used_key_parts=*/-1,
+                        forced_by_hint_arg) {}
+  QUICK_SELECT_I *make_quick(bool retrieve_full_rows,
+                             MEM_ROOT *return_mem_root) override;
+  TABLE_READ_PLAN **first_ror; /* array of ptrs to plans for merged scans */
+  TABLE_READ_PLAN **last_ror;  /* end of the above array */
+
+  void trace_basic_info(THD *thd, const RANGE_OPT_PARAM *param,
+                        Opt_trace_object *trace_object) const override;
+};
+
+TRP_ROR_INTERSECT *get_best_ror_intersect(
+    THD *thd, const RANGE_OPT_PARAM *param, TABLE *table,
+    bool index_merge_intersect_allowed, enum_order order_direction,
+    SEL_TREE *tree, const MY_BITMAP *needed_fields,
+    const Cost_estimate *cost_est, bool force_index_merge_result);
+
+#endif  // SQL_RANGE_OPTIMIZER_ROWID_ORDERED_RETRIEVAL_PLAN_H_
diff -Nru mysql-8.0-8.0.26/sql/range_optimizer/skip_scan.cc mysql-8.0-8.0.27/sql/range_optimizer/skip_scan.cc
--- mysql-8.0-8.0.26/sql/range_optimizer/skip_scan.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/range_optimizer/skip_scan.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,538 @@
+/* Copyright (c) 2000, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include "sql/range_optimizer/skip_scan.h"
+
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "m_ctype.h"
+#include "m_string.h"
+#include "my_dbug.h"
+#include "my_sys.h"
+#include "mysql/service_mysql_alloc.h"
+#include "sql/handler.h"
+#include "sql/psi_memory_key.h"
+#include "sql/range_optimizer/internal.h"
+#include "sql/range_optimizer/tree.h"
+#include "sql/sql_class.h"
+#include "sql/sql_optimizer.h"
+#include "sql/system_variables.h"
+#include "sql/table.h"
+#include "sql/thr_malloc.h"
+#include "sql_string.h"
+
+void QUICK_SKIP_SCAN_SELECT::add_info_string(String *str) {
+  str->append(STRING_WITH_LEN("index_for_skip_scan("));
+  str->append(index_info->name);
+  str->append(')');
+}
+
+/**
+  Construct new quick select for queries that can do skip scans.
+  See get_best_skip_scan() description for more details.
+
+  SYNOPSIS
+    QUICK_SKIP_SCAN_SELECT::QUICK_SKIP_SCAN_SELECT()
+    table              The table being accessed
+    index_info         The index chosen for data access
+    use_index          The id of index_info
+    range_part         The keypart belonging to the range condition C
+    index_range_tree   The complete range key
+    eq_prefix_len      Length of the equality prefix key
+    eq_prefix_parts    Number of keyparts in the equality prefix
+    used_key_parts_arg Total number of keyparts A_1,...,C
+    read_cost_arg      Cost of this access method
+    read_records       Number of records returned
+    return_mem_root    Memory pool for this class
+
+  RETURN
+    None
+*/
+
+QUICK_SKIP_SCAN_SELECT::QUICK_SKIP_SCAN_SELECT(
+    TABLE *table, KEY *index_info, uint use_index, KEY_PART_INFO *range_part,
+    SEL_ROOT *index_range_tree, uint eq_prefix_len, uint eq_prefix_parts,
+    uint used_key_parts_arg, const Cost_estimate *read_cost_arg,
+    ha_rows read_records, MEM_ROOT *return_mem_root,
+    bool has_aggregate_function, uchar *min_range_key_arg,
+    uchar *max_range_key_arg, uchar *min_search_key_arg,
+    uchar *max_search_key_arg, uint range_cond_flag_arg, uint range_key_len_arg)
+    : index_info(index_info),
+      index_range_tree(index_range_tree),
+      eq_prefix_len(eq_prefix_len),
+      eq_prefix_key_parts(eq_prefix_parts),
+      distinct_prefix(nullptr),
+      range_key_part(range_part),
+      mem_root(return_mem_root),
+      range_key_len(range_key_len_arg),
+      seen_first_key(false),
+      min_range_key(min_range_key_arg),
+      max_range_key(max_range_key_arg),
+      min_search_key(min_search_key_arg),
+      max_search_key(max_search_key_arg),
+      range_cond_flag(range_cond_flag_arg),
+      has_aggregate_function(has_aggregate_function) {
+  m_table = table;
+  index = use_index;
+  record = m_table->record[0];
+  cost_est = *read_cost_arg;
+  records = read_records;
+
+  used_key_parts = used_key_parts_arg;
+  max_used_key_length = 0;
+  distinct_prefix_len = 0;
+  KEY_PART_INFO *p = index_info->key_part;
+
+  my_bitmap_map *bitmap;
+  if (!(bitmap = (my_bitmap_map *)return_mem_root->Alloc(
+            m_table->s->column_bitmap_size))) {
+    column_bitmap.bitmap = nullptr;
+  } else
+    bitmap_init(&column_bitmap, bitmap, m_table->s->fields);
+  bitmap_copy(&column_bitmap, m_table->read_set);
+
+  for (uint i = 0; i < used_key_parts; i++, p++) {
+    max_used_key_length += p->store_length;
+    /*
+      The last key part contains the subrange scan that we want to execute
+      for every distinct prefix. There is only ever one keypart, so just
+      exclude the last key from the distinct prefix.
+    */
+    if (i + 1 < used_key_parts) {
+      distinct_prefix_len += p->store_length;
+      bitmap_set_bit(&column_bitmap, p->field->field_index());
+    }
+  }
+  distinct_prefix_key_parts = used_key_parts - 1;
+}
+
+/**
+  Do post-constructor initialization.
+
+  SYNOPSIS
+    QUICK_SKIP_SCAN_SELECT::init()
+
+  DESCRIPTION
+    The method performs initialization that cannot be done in the constructor
+    such as memory allocations that may fail. It allocates memory for the
+    equality prefix and distinct prefix buffers. It also extracts all equality
+    prefixes from index_range_tree, as well as allocates memory to store them.
+
+  RETURN
+    0      OK
+    other  Error code
+*/
+
+int QUICK_SKIP_SCAN_SELECT::init() {
+  if (distinct_prefix) return 0;
+
+  assert(distinct_prefix_key_parts > 0 && distinct_prefix_len > 0);
+  if (!(distinct_prefix = (uchar *)mem_root->Alloc(distinct_prefix_len)))
+    return 1;
+
+  if (eq_prefix_len > 0) {
+    eq_prefix = (uchar *)mem_root->Alloc(eq_prefix_len);
+    if (!eq_prefix) return 1;
+  } else {
+    eq_prefix = nullptr;
+  }
+
+  if (eq_prefix_key_parts > 0) {
+    eq_prefixes = mem_root->ArrayAlloc<EQPrefix>(eq_prefix_key_parts);
+    if (eq_prefixes == nullptr) {
+      return 1;
+    }
+
+    const SEL_ARG *cur_range = index_range_tree->root->first();
+    const SEL_ARG *first_range = nullptr;
+    const SEL_ROOT *cur_root = index_range_tree;
+    for (uint i = 0; i < eq_prefix_key_parts;
+         i++, cur_range = cur_range->next_key_part->root) {
+      eq_prefixes[i].cur_eq_prefix = 0;
+      unsigned num_elements = cur_root->elements;
+      cur_root = cur_range->next_key_part;
+      assert(num_elements > 0);
+      eq_prefixes[i].eq_key_prefixes =
+          Bounds_checked_array<uchar *>::Alloc(mem_root, num_elements);
+
+      uint j = 0;
+      first_range = cur_range->first();
+      for (cur_range = first_range; cur_range;
+           j++, cur_range = cur_range->next) {
+        KEY_PART_INFO *keypart = index_info->key_part + i;
+        size_t field_length = keypart->store_length;
+        //  Store ranges in the reverse order if key part is descending.
+        uint pos = cur_range->is_ascending ? j : num_elements - j - 1;
+
+        if (!(eq_prefixes[i].eq_key_prefixes[pos] =
+                  mem_root->ArrayAlloc<uchar>(field_length)))
+          return 1;
+
+        if (cur_range->maybe_null() && cur_range->min_value[0] &&
+            cur_range->max_value[0]) {
+          assert(field_length > 0);
+          eq_prefixes[i].eq_key_prefixes[pos][0] = 0x1;
+        } else {
+          assert(memcmp(cur_range->min_value, cur_range->max_value,
+                        field_length) == 0);
+          memcpy(eq_prefixes[i].eq_key_prefixes[pos], cur_range->min_value,
+                 field_length);
+        }
+      }
+      cur_range = first_range;
+      assert(j == num_elements);
+    }
+  }
+
+  return 0;
+}
+
+QUICK_SKIP_SCAN_SELECT::~QUICK_SKIP_SCAN_SELECT() {
+  DBUG_TRACE;
+  if (m_table->file->inited) m_table->file->ha_index_or_rnd_end();
+}
+
+/**
+  Initialize a quick skip scan index select for key retrieval.
+
+  SYNOPSIS
+    QUICK_SKIP_SCAN_SELECT::reset()
+
+  DESCRIPTION
+    Initialize the index chosen for access and initialize what the first
+    equality key prefix should be.
+
+  RETURN
+    0      OK
+    other  Error code
+*/
+
+int QUICK_SKIP_SCAN_SELECT::reset(void) {
+  DBUG_TRACE;
+
+  int result;
+  seen_first_key = false;
+  m_table->set_keyread(true);  // This access path demands index-only reads.
+  MY_BITMAP *const save_read_set = m_table->read_set;
+
+  m_table->column_bitmaps_set_no_signal(&column_bitmap, m_table->write_set);
+  if ((result = m_table->file->ha_index_init(index, true))) {
+    m_table->file->print_error(result, MYF(0));
+    return result;
+  }
+
+  // Set the first equality prefix.
+  size_t offset = 0;
+  for (uint i = 0; i < eq_prefix_key_parts; i++) {
+    const uchar *key = eq_prefixes[i].eq_key_prefixes[0];
+    eq_prefixes[i].cur_eq_prefix = 0;
+    uint part_length = (index_info->key_part + i)->store_length;
+    memcpy(eq_prefix + offset, key, part_length);
+    offset += part_length;
+    assert(offset <= eq_prefix_len);
+  }
+
+  m_table->column_bitmaps_set_no_signal(save_read_set, m_table->write_set);
+  return 0;
+}
+
+/**
+  Increments cur_prefix and sets what the next equality prefix should be.
+
+  SYNOPSIS
+    QUICK_SKIP_SCAN_SELECT::next_eq_prefix()
+
+  DESCRIPTION
+    Increments cur_prefix and sets what the next equality prefix should be.
+    This is done in index order, so the increment happens on the last keypart.
+    The key is written to eq_prefix.
+
+  RETURN
+    true   OK
+    false  No more equality key prefixes.
+*/
+
+bool QUICK_SKIP_SCAN_SELECT::next_eq_prefix() {
+  DBUG_TRACE;
+  /*
+    Counts at which position we're at in eq_prefix from the back of the
+    string.
+  */
+  size_t reverse_offset = 0;
+
+  // Increment the cur_prefix count.
+  for (uint i = 0; i < eq_prefix_key_parts; i++) {
+    uint part = eq_prefix_key_parts - i - 1;
+    EQPrefix &eqp = eq_prefixes[part];
+    assert(eqp.cur_eq_prefix < eqp.eq_key_prefixes.size());
+    uint part_length = (index_info->key_part + part)->store_length;
+    reverse_offset += part_length;
+
+    ++eqp.cur_eq_prefix;
+    const uchar *key =
+        eqp.eq_key_prefixes[eqp.cur_eq_prefix % eqp.eq_key_prefixes.size()];
+    memcpy(eq_prefix + eq_prefix_len - reverse_offset, key, part_length);
+    if (eqp.cur_eq_prefix == eqp.eq_key_prefixes.size()) {
+      eqp.cur_eq_prefix = 0;
+      if (part == 0) {
+        // This is the last key part.
+        return false;
+      }
+    } else {
+      break;
+    }
+  }
+
+  return true;
+}
+
+/**
+  Get the next row for skip scan.
+
+  SYNOPSIS
+    QUICK_SKIP_SCAN_SELECT::get_next()
+
+  DESCRIPTION
+    Find the next record in the skip scan. The scan is broken into groups
+    based on distinct A_1,...,B_m. The strategy is to have an outer loop
+    going through all possible A_1,...,A_k. This work is done in
+    next_eq_prefix().
+
+    For each equality prefix that we get from "next_eq_prefix() we loop through
+    all distinct B_1,...,B_m within that prefix. And for each of those groups
+    we do a subrange scan on keypart C.
+
+    The high level algorithm is like so:
+    for (eq_prefix in eq_prefixes)       // (A_1,....A_k)
+      for (distinct_prefix in eq_prefix) // A_1-B_1,...,A_k-B_m
+        do subrange scan within distinct prefix
+          using range_cond               // A_1-B_1-C,...A_k-B_m-C
+
+    But since this is a iterator interface, state needs to be kept between
+    calls. State is stored in eq_prefix, cur_eq_prefix and distinct_prefix.
+
+  NOTES
+    We can be more memory efficient by combining some of these fields. For
+    example, eq_prefix will always be a prefix of distinct_prefix, and
+    distinct_prefix will always be a prefix of min_search_key/max_search_key.
+
+  RETURN
+    0                  on success
+    HA_ERR_END_OF_FILE if returned all keys
+    other              if some error occurred
+*/
+
+int QUICK_SKIP_SCAN_SELECT::get_next() {
+  DBUG_TRACE;
+  int result = HA_ERR_END_OF_FILE;
+  int past_eq_prefix = 0;
+  bool is_prefix_valid = seen_first_key;
+
+  assert(distinct_prefix_len + range_key_len == max_used_key_length);
+
+  MY_BITMAP *const save_read_set = m_table->read_set;
+  m_table->column_bitmaps_set_no_signal(&column_bitmap, m_table->write_set);
+  do {
+    if (!is_prefix_valid) {
+      if (!seen_first_key) {
+        if (eq_prefix_key_parts == 0) {
+          result = m_table->file->ha_index_first(record);
+        } else {
+          result = m_table->file->ha_index_read_map(
+              record, eq_prefix, make_prev_keypart_map(eq_prefix_key_parts),
+              HA_READ_KEY_OR_NEXT);
+        }
+        seen_first_key = true;
+      } else {
+        result = index_next_different(false /* is_index_scan */, m_table->file,
+                                      index_info->key_part, record,
+                                      distinct_prefix, distinct_prefix_len,
+                                      distinct_prefix_key_parts);
+      }
+
+      if (result) goto exit;
+
+      // Save the prefix of this group for subsequent calls.
+      key_copy(distinct_prefix, record, index_info, distinct_prefix_len);
+
+      if (eq_prefix) {
+        past_eq_prefix =
+            key_cmp(index_info->key_part, eq_prefix, eq_prefix_len);
+        assert(past_eq_prefix >= 0);
+
+        // We are past the equality prefix, so get the next prefix.
+        if (past_eq_prefix > 0) {
+          bool has_next = next_eq_prefix();
+          if (has_next) {
+            /*
+              Reset seen_first_key so that we can determine the next distinct
+              prefix.
+            */
+            seen_first_key = false;
+            result = HA_ERR_END_OF_FILE;
+            continue;
+          }
+          result = HA_ERR_END_OF_FILE;
+          goto exit;
+        }
+      }
+
+      // We should not be doing a skip scan if there is no range predicate.
+      assert(!(range_cond_flag & NO_MIN_RANGE) ||
+             !(range_cond_flag & NO_MAX_RANGE));
+
+      if (!(range_cond_flag & NO_MIN_RANGE)) {
+        // If there is a minimum key, append to the distinct prefix.
+        memcpy(min_search_key, distinct_prefix, distinct_prefix_len);
+        memcpy(min_search_key + distinct_prefix_len, min_range_key,
+               range_key_len);
+        start_key.key = min_search_key;
+        start_key.length = max_used_key_length;
+        start_key.keypart_map = make_prev_keypart_map(used_key_parts);
+        start_key.flag = (range_cond_flag & (EQ_RANGE | NULL_RANGE))
+                             ? HA_READ_KEY_EXACT
+                             : (range_cond_flag & NEAR_MIN)
+                                   ? HA_READ_AFTER_KEY
+                                   : HA_READ_KEY_OR_NEXT;
+      } else {
+        // If there is no minimum key, just use the distinct prefix.
+        start_key.key = distinct_prefix;
+        start_key.length = distinct_prefix_len;
+        start_key.keypart_map = make_prev_keypart_map(used_key_parts - 1);
+        start_key.flag = HA_READ_KEY_OR_NEXT;
+      }
+
+      /*
+        It is not obvious what the semantics of HA_READ_BEFORE_KEY,
+        HA_READ_KEY_EXACT and HA_READ_AFTER_KEY are for end_key.
+
+        See handler::set_end_range for details on what they do.
+      */
+      if (!(range_cond_flag & NO_MAX_RANGE)) {
+        // If there is a maximum key, append to the distinct prefix.
+        memcpy(max_search_key, distinct_prefix, distinct_prefix_len);
+        memcpy(max_search_key + distinct_prefix_len, max_range_key,
+               range_key_len);
+        end_key.key = max_search_key;
+        end_key.length = max_used_key_length;
+        end_key.keypart_map = make_prev_keypart_map(used_key_parts);
+        //  See comment in quick_range_seq_next for why these flags are set.
+        end_key.flag = (range_cond_flag & NEAR_MAX) ? HA_READ_BEFORE_KEY
+                                                    : HA_READ_AFTER_KEY;
+      } else {
+        // If there is no maximum key, just use the distinct prefix.
+        end_key.key = distinct_prefix;
+        end_key.length = distinct_prefix_len;
+        end_key.keypart_map = make_prev_keypart_map(used_key_parts - 1);
+        end_key.flag = HA_READ_AFTER_KEY;
+      }
+      is_prefix_valid = true;
+
+      result = m_table->file->ha_read_range_first(
+          &start_key, &end_key, range_cond_flag & EQ_RANGE, true /* sorted */);
+      if (result) {
+        if (result == HA_ERR_END_OF_FILE) {
+          is_prefix_valid = false;
+          continue;
+        }
+        goto exit;
+      }
+    } else {
+      result = m_table->file->ha_read_range_next();
+      if (result) {
+        if (result == HA_ERR_END_OF_FILE) {
+          is_prefix_valid = false;
+          continue;
+        }
+        goto exit;
+      }
+    }
+  } while ((result == HA_ERR_KEY_NOT_FOUND || result == HA_ERR_END_OF_FILE));
+
+exit:
+  m_table->column_bitmaps_set_no_signal(save_read_set, m_table->write_set);
+
+  if (result == HA_ERR_KEY_NOT_FOUND) result = HA_ERR_END_OF_FILE;
+
+  return result;
+}
+
+/**
+  Append comma-separated list of keys this quick select uses to key_names;
+  append comma-separated list of corresponding used lengths to used_lengths.
+
+  SYNOPSIS
+    QUICK_SKIP_SCAN_SELECT::add_keys_and_lengths()
+    key_names    [out] Names of used indexes
+    used_lengths [out] Corresponding lengths of the index names
+
+  DESCRIPTION
+    This method is used by select_describe to extract the names of the
+    indexes used by a quick select.
+
+*/
+
+void QUICK_SKIP_SCAN_SELECT::add_keys_and_lengths(String *key_names,
+                                                  String *used_lengths) {
+  char buf[64];
+  uint length;
+  key_names->append(index_info->name);
+  length = longlong10_to_str(max_used_key_length, buf, 10) - buf;
+  used_lengths->append(buf, length);
+}
+
+#ifndef NDEBUG
+void QUICK_SKIP_SCAN_SELECT::dbug_dump(int indent, bool verbose) {
+  fprintf(DBUG_FILE,
+          "%*squick_skip_scan_query_block: index %s (%d), length: %d\n", indent,
+          "", index_info->name, index, max_used_key_length);
+  if (eq_prefix_len > 0) {
+    fprintf(DBUG_FILE, "%*susing eq_prefix with length %d:\n", indent, "",
+            eq_prefix_len);
+  }
+
+  if (verbose) {
+    char buff1[512];
+    buff1[0] = '\0';
+    String range_result(buff1, sizeof(buff1), system_charset_info);
+
+    if (index_range_tree && eq_prefix_key_parts > 0) {
+      range_result.length(0);
+      char buff2[128];
+      String range_so_far(buff2, sizeof(buff2), system_charset_info);
+      range_so_far.length(0);
+      append_range_all_keyparts(nullptr, &range_result, &range_so_far,
+                                index_range_tree, index_info->key_part, false);
+      fprintf(DBUG_FILE, "Prefix ranges: %s\n", range_result.c_ptr());
+    }
+
+    {
+      range_result.length(0);
+      append_range(&range_result, range_key_part, min_range_key, max_range_key,
+                   range_cond_flag);
+      fprintf(DBUG_FILE, "Range: %s\n", range_result.c_ptr());
+    }
+  }
+}
+#endif
diff -Nru mysql-8.0-8.0.26/sql/range_optimizer/skip_scan.h mysql-8.0-8.0.27/sql/range_optimizer/skip_scan.h
--- mysql-8.0-8.0.26/sql/range_optimizer/skip_scan.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/range_optimizer/skip_scan.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,163 @@
+/* Copyright (c) 2000, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef SQL_RANGE_OPTIMIZER_SKIP_SCAN_H_
+#define SQL_RANGE_OPTIMIZER_SKIP_SCAN_H_
+
+#include <sys/types.h>
+
+#include "my_alloc.h"
+#include "my_base.h"
+#include "my_bitmap.h"
+#include "my_inttypes.h"
+#include "sql/field.h"  // Field
+#include "sql/key.h"
+#include "sql/malloc_allocator.h"  // IWYU pragma: keep
+#include "sql/range_optimizer/range_optimizer.h"
+
+class Cost_estimate;
+class JOIN;
+class SEL_ARG;
+class SEL_ROOT;
+class String;
+struct TABLE;
+
+/*
+  Index scan for range queries that can use skip scans.
+
+  This class provides a specialized index access method for the queries
+  of the forms:
+
+       SELECT A_1,...,A_k, B_1,...,B_m, C
+         FROM T
+        WHERE
+         EQ(A_1,...,A_k)
+         AND RNG(C);
+
+  where all selected fields are parts of the same index.
+  The class of queries that can be processed by this quick select is fully
+  specified in the description of get_best_skip_scan() in opt_range.cc.
+
+  Since one of the requirements is that all select fields are part of the same
+  index, this class produces only index keys, and not complete records.
+*/
+
+class QUICK_SKIP_SCAN_SELECT : public QUICK_SELECT_I {
+ private:
+  KEY *index_info;            /* Index for skip scan */
+  SEL_ROOT *index_range_tree; /* Range tree for skip scan */
+  MY_BITMAP column_bitmap;    /* Map of key parts to be read */
+
+  /*
+    This is an array of array of equality constants with length
+    eq_prefix_key_parts.
+
+    For example, an equality predicate like "a IN (1, 2) AND b IN (2, 3, 4)",
+    eq_prefixes will contain:
+
+    [
+      { eq_key_prefixes = array[1, 2], cur_eq_prefix = ... },
+      { eq_key_prefixes = array[2, 3, 4], cur_eq_prefix = ... }
+    ]
+   */
+  struct EQPrefix {
+    Bounds_checked_array<uchar *> eq_key_prefixes;
+
+    /*
+       During skip scan, we will have to iterate through all possible
+       equality prefixes. This is the product of all the elements in
+       eq_prefix_elements. In the above example, there are 2 x 3 = 6 possible
+       equality prefixes.
+
+       To track which prefix we are on, we use cur_eq_prefix. For example,
+       if both EQPrefixes have the value 1 here, it indicates that the current
+       equality prefix is (2, 3).
+     */
+    uint cur_eq_prefix;
+  };
+  EQPrefix *eq_prefixes;
+  const uint eq_prefix_len; /* Total length of the equality prefix. */
+  uint eq_prefix_key_parts; /* A number of keyparts in skip scan prefix */
+  uchar *eq_prefix;         /* Storage for current equality prefix. */
+
+  uchar *distinct_prefix; /* Storage for prefix A_1, ... B_m. */
+  uint distinct_prefix_len;
+  uint distinct_prefix_key_parts;
+
+  KEY_PART_INFO *range_key_part; /* The keypart of range condition 'C'. */
+  MEM_ROOT *mem_root;
+  const uint range_key_len;
+  /*
+    Denotes whether the first key for the current equality prefix was
+    retrieved.
+  */
+  bool seen_first_key;
+
+  /* Storage for full lookup key for use with handler::read_range_first/next */
+  uchar *const min_range_key;
+  uchar *const max_range_key;
+  uchar *const min_search_key;
+  uchar *const max_search_key;
+  const uint range_cond_flag;
+
+  key_range start_key;
+  key_range end_key;
+
+  bool has_aggregate_function;
+
+  bool next_eq_prefix();
+
+ public:
+  QUICK_SKIP_SCAN_SELECT(TABLE *table, KEY *index_info, uint index,
+                         KEY_PART_INFO *range_part, SEL_ROOT *index_range_tree,
+                         uint eq_prefix_len, uint eq_prefix_parts,
+                         uint used_key_parts,
+                         const Cost_estimate *read_cost_arg, ha_rows records,
+                         MEM_ROOT *temp_mem_root, bool has_aggregate_function,
+                         uchar *min_range_key, uchar *max_range_key,
+                         uchar *min_search_key, uchar *max_search_key,
+                         uint range_cond_flag, uint range_key_len);
+  ~QUICK_SKIP_SCAN_SELECT() override;
+  int init() override;
+  void need_sorted_output() override {}
+  int reset() override;
+  int get_next() override;
+  bool reverse_sorted() const override { return false; }
+  bool reverse_sort_possible() const override { return false; }
+  bool unique_key_range() override { return false; }
+  RangeScanType get_type() const override { return QS_TYPE_SKIP_SCAN; }
+  bool is_loose_index_scan() const override { return true; }
+  bool is_agg_loose_index_scan() const override {
+    return has_aggregate_function;
+  }
+  void add_keys_and_lengths(String *key_names, String *used_lengths) override;
+#ifndef NDEBUG
+  void dbug_dump(int indent, bool verbose) override;
+#endif
+  void get_fields_used(MY_BITMAP *used_fields) override {
+    for (uint i = 0; i < used_key_parts; i++)
+      bitmap_set_bit(used_fields, index_info->key_part[i].field->field_index());
+  }
+  void add_info_string(String *str) override;
+};
+
+#endif  // SQL_RANGE_OPTIMIZER_SKIP_SCAN_H_
diff -Nru mysql-8.0-8.0.26/sql/range_optimizer/skip_scan_plan.cc mysql-8.0-8.0.27/sql/range_optimizer/skip_scan_plan.cc
--- mysql-8.0-8.0.26/sql/range_optimizer/skip_scan_plan.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/range_optimizer/skip_scan_plan.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,625 @@
+/* Copyright (c) 2000, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include "sql/range_optimizer/skip_scan_plan.h"
+
+#include <assert.h>
+#include <float.h>
+#include <math.h>
+#include <string.h>
+#include <algorithm>
+
+#include "m_ctype.h"
+#include "my_bitmap.h"
+#include "my_dbug.h"
+#include "my_inttypes.h"
+#include "my_table_map.h"
+#include "sql/current_thd.h"
+#include "sql/field.h"
+#include "sql/handler.h"
+#include "sql/item.h"
+#include "sql/item_sum.h"
+#include "sql/key.h"
+#include "sql/key_spec.h"
+#include "sql/opt_costmodel.h"
+#include "sql/opt_hints.h"
+#include "sql/opt_statistics.h"
+#include "sql/opt_trace.h"
+#include "sql/opt_trace_context.h"
+#include "sql/range_optimizer/internal.h"
+#include "sql/range_optimizer/range_opt_param.h"
+#include "sql/range_optimizer/range_scan_plan.h"
+#include "sql/range_optimizer/skip_scan.h"
+#include "sql/range_optimizer/tree.h"
+#include "sql/sql_bitmap.h"
+#include "sql/sql_class.h"
+#include "sql/sql_const.h"
+#include "sql/sql_lex.h"
+#include "sql/sql_optimizer.h"
+#include "sql/sql_select.h"
+#include "sql/table.h"
+#include "sql_string.h"
+
+class QUICK_SELECT_I;
+struct MEM_ROOT;
+
+using std::max;
+using std::min;
+
+void TRP_SKIP_SCAN::trace_basic_info(THD *thd, const RANGE_OPT_PARAM *,
+                                     Opt_trace_object *trace_object) const {
+  trace_object->add_alnum("type", "skip_scan")
+      .add_utf8("index", index_info->name);
+
+  const KEY_PART_INFO *key_part = index_info->key_part;
+  Opt_trace_context *const trace = &thd->opt_trace;
+  {
+    Opt_trace_array trace_keyparts(trace, "key_parts_used_for_access");
+    for (uint partno = 0; partno < used_key_parts; partno++) {
+      const KEY_PART_INFO *cur_key_part = key_part + partno;
+      trace_keyparts.add_utf8(cur_key_part->field->field_name);
+    }
+  }
+
+  if (index_range_tree && eq_prefix_parts > 0) {
+    Opt_trace_array trace_range(trace, "prefix ranges");
+    String range_info;
+    range_info.set_charset(system_charset_info);
+    append_range_all_keyparts(&trace_range, nullptr, &range_info,
+                              index_range_tree, key_part, false);
+  }
+
+  Opt_trace_array trace_range(trace, "range");
+  {
+    String range_info;
+    range_info.set_charset(system_charset_info);
+    const KEY_PART_INFO *cur_key_part =
+        key_part + range_part_tracing_only->part;
+    append_range(
+        &range_info, cur_key_part, range_part_tracing_only->min_value,
+        range_part_tracing_only->max_value,
+        range_part_tracing_only->min_flag | range_part_tracing_only->max_flag);
+    trace_range.add_utf8(range_info.ptr(), range_info.length());
+  }
+}
+
+/**
+  Construct a new quick select object for queries doing skip scans.
+
+  SYNOPSIS
+    TRP_SKIP_SCAN::make_quick()
+    retrieve_full_rows ignored
+    return_mem_root    Memory pool to use
+
+  NOTES
+    Make_quick ignores the retrieve_full_rows parameter because
+    QUICK_SKIP_SCAN_SELECT always performs index only scans.
+
+  RETURN
+    New QUICK_SKIP_SCAN_SELECT object if successfully created,
+    NULL otherwise.
+*/
+
+QUICK_SELECT_I *TRP_SKIP_SCAN::make_quick(bool, MEM_ROOT *return_mem_root) {
+  DBUG_TRACE;
+
+  QUICK_SKIP_SCAN_SELECT *quick = new (return_mem_root) QUICK_SKIP_SCAN_SELECT(
+      table, index_info, index, range_key_part, index_range_tree, eq_prefix_len,
+      eq_prefix_parts, used_key_parts, &cost_est, records, return_mem_root,
+      has_aggregate_function, min_range_key, max_range_key, min_search_key,
+      max_search_key, range_cond_flag, range_key_len);
+
+  if (!quick) return nullptr;
+
+  assert(quick->index == index);
+
+  if (quick->init()) {
+    destroy(quick);
+    return nullptr;
+  }
+
+  quick->forced_by_hint = forced_by_hint;
+  return quick;
+}
+
+static void cost_skip_scan(TABLE *table, uint key, uint distinct_key_parts,
+                           ha_rows quick_prefix_records,
+                           Cost_estimate *cost_est, ha_rows *records,
+                           Item *where_cond, Opt_trace_object *trace_idx);
+
+/**
+  Test if skip scan is applicable and if so, construct a new TRP object.
+
+  DESCRIPTION
+    Test whether a query can be computed via a QUICK_SKIP_SCAN_SELECT.
+    The overall query form should look like this:
+
+       SELECT A_1,...,A_k, B_1,...,B_m, C
+         FROM T
+        WHERE
+         EQ(A_1,...,A_k)
+         AND RNG(C);
+
+    Queries computable via a QUICK_SKIP_SCAN_SELECT must satisfy the
+    following conditions:
+
+    A) Table T has at least one compound index I of the form:
+       I = <A_1,...,A_k, B_1,..., B_m, C ,[D_1,...,D_n]>
+       Keyparts A and D may be empty, but B and C must be non-empty.
+    B) Only one table referenced.
+    C) Cannot have group by/select distinct
+    D) Query must reference fields in the index only.
+    E) The predicates on A_1...A_k must be equality predicates and they need
+       to be constants. This includes the 'IN' operator.
+    F) The query must be a conjunctive query.
+       In other words, it is a AND of ORs:
+       (COND1(kp1) OR COND2(kp1)) AND (COND1(kp2) OR ...) AND ...
+       See get_sel_arg_for_keypart for details.
+    G) There must be a range condition on C.
+    H) Conditions on D columns are allowed. Conditions on D must be in
+       conjunction with range condition on C.
+
+  NOTES
+    If the current query satisfies the conditions above, and if
+    (mem_root! = NULL), then the function constructs and returns a new TRP
+    object, that is later used to construct a new QUICK_SKIP_SCAN_SELECT.
+
+  @param  param     Parameter from test_quick_select
+  @param  tree      Range tree generated by get_mm_tree
+  @param  order_direction The sort order the range access method must be able
+                    to provide. Three-value logic: asc/desc/don't care
+  @param  skip_records_in_range Same value as JOIN_TAB::skip_records_in_range()
+  @param  force_skip_scan  TRUE if skip scan is forced by optimizer hint
+
+  @retval NULL, if skip index scan not applicable,
+          otherwise skip index scan table read plan.
+*/
+
+TRP_SKIP_SCAN *get_best_skip_scan(THD *thd, RANGE_OPT_PARAM *param,
+                                  SEL_TREE *tree, enum_order order_direction,
+                                  bool skip_records_in_range,
+                                  bool force_skip_scan) {
+  JOIN *join = param->query_block->join;
+  TABLE *table = param->table;
+  const char *cause = nullptr;
+  Opt_trace_context *const trace = &thd->opt_trace;
+  Cost_estimate best_read_cost;
+  ha_rows best_records = 0;
+  bool has_aggregate_function = false;
+  DBUG_TRACE;
+  best_read_cost.set_max_cost();
+  Opt_trace_object trace_group(trace, "skip_scan_range",
+                               Opt_trace_context::RANGE_OPTIMIZER);
+
+  if (!join)
+    cause = "no_join";
+  else if (join->primary_tables != 1) /* Query must reference one table. */
+    cause = "not_single_table";
+  else if (table->s->keys == 0) /* There are no indexes to use. */
+    cause = "no_index";
+  else if (order_direction == ORDER_DESC)
+    cause = "cannot_do_reverse_ordering";
+  else if (!join->group_list.empty())
+    cause = "has_group_by";
+  else if (!tree)
+    cause = "disjuntive_predicate_present";
+  else if (join->select_distinct)
+    cause = "has_select_distinct";
+
+  if (cause != nullptr) {
+    trace_group.add("chosen", false).add_alnum("cause", cause);
+    return nullptr;
+  }
+
+  KEY *index_info = nullptr; /* The index chosen for data access. */
+  uint index = 0;
+  KEY_PART_INFO *range_key_part = nullptr;
+  SEL_ROOT *index_range_tree = nullptr;
+  SEL_ARG *cur_range = nullptr;
+  SEL_ARG *range_sel_arg = nullptr;
+  uint field_length;
+  uint eq_prefix_len = 0;
+  uint eq_prefix_parts = 0;
+  uint used_key_parts = 0;
+  Cost_estimate min_diff_cost;
+  Opt_trace_array trace_indices(trace, "potential_skip_scan_indexes");
+
+  if (join->sum_funcs[0]) {
+    Item_sum *min_max_item;
+    Item_sum **func_ptr = join->sum_funcs;
+    while ((min_max_item = *(func_ptr++))) {
+      /*
+        TODO: Investigate if this condition could be relaxed in
+        some cases.
+      */
+      if (min_max_item->sum_func() == Item_sum::COUNT_DISTINCT_FUNC ||
+          min_max_item->sum_func() == Item_sum::SUM_DISTINCT_FUNC ||
+          min_max_item->sum_func() == Item_sum::AVG_DISTINCT_FUNC) {
+        trace_group.add("chosen", false)
+            .add_alnum("cause", "has_aggregate_distinct");
+        return nullptr;
+      }
+    }
+    has_aggregate_function = true;
+  }
+
+  for (uint cur_param_idx = 0; cur_param_idx < param->keys; ++cur_param_idx) {
+    const uint cur_index = param->real_keynr[cur_param_idx];
+    KEY *const cur_index_info = &table->key_info[cur_index];
+
+    Opt_trace_object trace_idx(trace);
+    trace_idx.add_utf8("index", cur_index_info->name);
+    KEY_PART_INFO *cur_part;
+    KEY_PART_INFO *end_part;
+    Cost_estimate cur_read_cost;
+    ha_rows cur_records;
+    SEL_ARG *cur_range_sel_arg = nullptr;
+    SEL_ROOT *cur_index_range_tree = nullptr;
+    uint cur_eq_prefix_len = 0;
+    uint cur_eq_prefix_parts = 0;
+    KEY_PART_INFO *cur_range_key_part = nullptr;
+    enum {
+      EQUALITY_KEYPART = 0,
+      SKIPPED_KEYPART = 1,
+      RANGE_KEYPART = 2,
+      TRAILING_KEYPART = 3
+    };
+    uint keypart_stage = EQUALITY_KEYPART;
+    uint cur_used_key_parts = 0;
+    uint part = 0;
+    ha_rows quick_prefix_records;
+
+    if (!compound_hint_key_enabled(param->table, cur_index,
+                                   SKIP_SCAN_HINT_ENUM)) {
+      cause = "skip_scan_hint";
+      goto next_index;
+    }
+
+    cur_part = cur_index_info->key_part;
+    end_part = cur_part + actual_key_parts(cur_index_info);
+
+    if (!table->covering_keys.is_set(cur_index)) {
+      cause = "query_references_nonkey_column";
+      goto next_index;
+    }
+
+    /* Extract equality constants that form the prefix. */
+    cur_index_range_tree = get_index_range_tree(cur_index, tree, param);
+    if (cur_index_range_tree == nullptr) {
+      cause = "disjuntive_predicate_present";
+      goto next_index;
+    }
+    for (cur_part = cur_index_info->key_part; cur_part != end_part;
+         cur_part++, part++) {
+      SEL_ROOT *cur_range_root = nullptr;
+      if (get_sel_root_for_keypart(cur_part - cur_index_info->key_part,
+                                   cur_index_range_tree, &cur_range_root)) {
+        cause = "keypart_in_disjunctive_query";
+        goto next_index;
+      }
+
+      if (cur_range_root && cur_range_root->type != SEL_ROOT::Type::KEY_RANGE) {
+        cause = "not_a_key_range";
+        goto next_index;
+      }
+      // There is no range predicate on current key part.
+      if (cur_range_root == nullptr) {
+        if (keypart_stage == EQUALITY_KEYPART ||
+            keypart_stage == RANGE_KEYPART) {
+          keypart_stage++;
+        }
+        continue;
+      }
+
+      cur_range = cur_range_root->root;
+      // There exists a range predicate on the current key part.
+      if (keypart_stage == EQUALITY_KEYPART) {
+        field_length = cur_part->store_length;
+        for (cur_range = cur_range->first(); cur_range;
+             cur_range = cur_range->next) {
+          // NEAR_MIN/NEAR_MAX means a strict inequality.
+          if ((cur_range->min_flag & NO_MIN_RANGE) ||
+              (cur_range->max_flag & NO_MAX_RANGE) ||
+              (cur_range->min_flag & NEAR_MIN) ||
+              (cur_range->max_flag & NEAR_MAX)) {
+            cause = "prefix_not_const_equality";
+            goto next_index;
+          }
+
+          if (!(cur_range->maybe_null() && cur_range->min_value[0] &&
+                cur_range->max_value[0]) &&  // IS NOT NULL
+              memcmp(cur_range->min_value, cur_range->max_value,
+                     field_length) != 0)  // not equality
+          {
+            cause = "prefix_not_const_equality";
+            goto next_index;
+          }
+        }
+        cur_eq_prefix_len += field_length;
+        cur_eq_prefix_parts++;
+      } else if (keypart_stage == SKIPPED_KEYPART) {
+        if (cur_range_root->elements > 1) {
+          cause = "range_predicate_too_complex";
+          goto next_index;
+        }
+        cur_range_key_part = cur_part;
+        cur_range_sel_arg = cur_range;
+        cur_used_key_parts = part + 1;
+        keypart_stage++;
+      }
+    }
+
+    if (keypart_stage < RANGE_KEYPART) {
+      cause = "no_range_predicate";
+      goto next_index;
+    }
+
+    assert(cur_used_key_parts >= 2);
+    table->possible_quick_keys.set_bit(cur_index);
+
+    assert(cur_index_range_tree);
+    {
+      Cost_estimate dummy_cost;
+      uint mrr_flags = HA_MRR_SORTED;
+      uint mrr_bufsize = 0;
+      /*
+        Calculate number of records returned by prefix equality ranges.
+      */
+      bool is_ror_scan, is_imerge_scan;
+      quick_prefix_records = check_quick_select(
+          thd, param, cur_param_idx, true, cur_index_range_tree, false,
+          order_direction, skip_records_in_range, &mrr_flags, &mrr_bufsize,
+          &dummy_cost, &is_ror_scan, &is_imerge_scan);
+    }
+    cost_skip_scan(table, cur_index, cur_used_key_parts - 1,
+                   quick_prefix_records, &cur_read_cost, &cur_records,
+                   join->where_cond, &trace_idx);
+
+    trace_idx.add("rows", cur_records).add("cost", cur_read_cost);
+
+    min_diff_cost = cur_read_cost;
+    min_diff_cost.multiply(DBL_EPSILON);
+    if (cur_read_cost < (best_read_cost - min_diff_cost)) {
+      index_info = cur_index_info;
+      index = cur_index;
+      best_read_cost = cur_read_cost;
+      best_records = cur_records;
+
+      eq_prefix_len = cur_eq_prefix_len;
+      eq_prefix_parts = cur_eq_prefix_parts;
+      index_range_tree = cur_index_range_tree;
+
+      range_sel_arg = cur_range_sel_arg;
+      range_key_part = cur_range_key_part;
+      used_key_parts = cur_used_key_parts;
+    }
+  next_index:
+    if (cause) {
+      trace_idx.add("usable", false).add_alnum("cause", cause);
+      cause = nullptr;
+    }
+  }
+  trace_indices.end();
+
+  if (!index_info) /* No usable index found. */
+    return nullptr;
+
+  // Setup fields that hold the range condition on key part C.
+  //
+  // This is only the suffix of the whole key, that we use
+  // to append to the prefix to get the full key later on.
+  uint range_cond_flag = 0;
+  if (!(range_sel_arg->min_flag & NO_MIN_RANGE) &&
+      !(range_sel_arg->max_flag & NO_MAX_RANGE)) {
+    // IS NULL condition
+    if (range_sel_arg->maybe_null() && range_sel_arg->min_value[0] &&
+        range_sel_arg->max_value[0])
+      range_cond_flag |= NULL_RANGE;
+    // equality condition
+    else if (memcmp(range_sel_arg->min_value, range_sel_arg->max_value,
+                    range_key_part->store_length) == 0)
+      range_cond_flag |= EQ_RANGE;
+  }
+
+  uchar *min_value, *max_value;
+  if (range_sel_arg->is_ascending) {
+    range_cond_flag |= range_sel_arg->min_flag | range_sel_arg->max_flag;
+    min_value = range_sel_arg->min_value;
+    max_value = range_sel_arg->max_value;
+  } else {
+    range_cond_flag |= invert_min_flag(range_sel_arg->min_flag) |
+                       invert_max_flag(range_sel_arg->max_flag);
+    min_value = range_sel_arg->max_value;
+    max_value = range_sel_arg->min_value;
+  }
+
+  unsigned range_key_len = range_key_part->store_length;
+
+  // Allocate storage for min/max key if they exist.
+  unsigned max_used_key_length = 0;
+  for (uint i = 0; i < used_key_parts; ++i) {
+    max_used_key_length += index_info->key_part[i].store_length;
+  }
+
+  MEM_ROOT *const mem_root = param->return_mem_root;
+  uchar *min_range_key = nullptr;
+  uchar *min_search_key = nullptr;
+  if (!(range_cond_flag & NO_MIN_RANGE)) {
+    if (!(min_range_key = mem_root->ArrayAlloc<uchar>(range_key_len)))
+      return nullptr;
+    if (!(min_search_key = mem_root->ArrayAlloc<uchar>(max_used_key_length)))
+      return nullptr;
+
+    memcpy(min_range_key, min_value, range_key_len);
+  }
+  uchar *max_range_key = nullptr;
+  uchar *max_search_key = nullptr;
+  if (!(range_cond_flag & NO_MAX_RANGE)) {
+    if (!(max_range_key = mem_root->ArrayAlloc<uchar>(range_key_len)))
+      return nullptr;
+    if (!(max_search_key = mem_root->ArrayAlloc<uchar>(max_used_key_length)))
+      return nullptr;
+
+    memcpy(max_range_key, max_value, range_key_len);
+  }
+
+  /* The query passes all tests, so construct a new TRP object. */
+  TRP_SKIP_SCAN *read_plan = new (param->return_mem_root) TRP_SKIP_SCAN(
+      table, index_info, index, index_range_tree, eq_prefix_len,
+      eq_prefix_parts, range_key_part, used_key_parts, force_skip_scan,
+      best_records, has_aggregate_function, min_range_key, max_range_key,
+      min_search_key, max_search_key, range_cond_flag,
+      /*range_part_tracing_only=*/range_sel_arg->first(), range_key_len);
+  if (read_plan) {
+    read_plan->cost_est = best_read_cost;
+    read_plan->records = best_records;
+    DBUG_PRINT("info",
+               ("Returning skip scan: cost: %g, records: %lu",
+                read_plan->cost_est.total_cost(), (ulong)read_plan->records));
+  }
+  return read_plan;
+}
+
+/**
+  Compute the cost of a QUICK_SKIP_SCAN_SELECT for a particular index.
+
+  SYNOPSIS
+    cost_skip_scan()
+    table                [in] The table being accessed
+    key                  [in] The index used to access the table
+    distinct_key_parts   [in] Number of key_parts used to get distinct prefix
+    quick_prefix_records [in] Number of records processed by prefix ranges
+    cost_est             [out] The cost to retrieve rows via this quick select
+    records              [out] The number of rows retrieved
+    where_cond           [in] WHERE condition
+    trace_idx            [in] optimizer_trace object
+
+  DESCRIPTION
+    This method computes the access cost of a TRP_SKIP_SCAN instance and
+    the number of rows returned.
+
+  NOTES
+
+    To estimate the size of the groups to read, index statistics
+    from rec_per_key is used. Each equality range decreases
+    number of the groups to read. The total number of processed
+    records from all the groups will be quick_prefix_records if
+    there are equality ranges else it will be the entire table.
+    Number of distinct group is calculated by dividing the
+    number of processed record by the number keys in a group.
+
+    Number of processed records is calculated using following formula:
+
+    records = number_of_distinct_groups * records_per_group * filtering_effect
+
+    where filtering_effect is filtering effect of the range condition.
+
+  RETURN
+    None
+*/
+
+void cost_skip_scan(TABLE *table, uint key, uint distinct_key_parts,
+                    ha_rows quick_prefix_records, Cost_estimate *cost_est,
+                    ha_rows *records, Item *where_cond,
+                    Opt_trace_object *trace_idx) {
+  ha_rows table_records, skip_scan_records;
+  uint num_groups;
+  rec_per_key_t keys_per_group;
+  const KEY *const index_info = &table->key_info[key];
+  DBUG_TRACE;
+
+  table_records = table->file->stats.records;
+  if (quick_prefix_records == HA_POS_ERROR)
+    skip_scan_records = table_records;
+  else
+    skip_scan_records = quick_prefix_records;
+
+  /* Compute the number of keys in a group. */
+  if (index_info->has_records_per_key(distinct_key_parts - 1)) {
+    // Use index statistics
+    keys_per_group = index_info->records_per_key(distinct_key_parts - 1);
+    assert(keys_per_group >= 0);
+  } else
+    /* If there is no statistics try to guess */
+    keys_per_group = guess_rec_per_key(table, index_info, distinct_key_parts);
+
+  num_groups = (uint)(skip_scan_records / keys_per_group) + 1;
+  num_groups = std::max(num_groups, 1U);
+
+  /* Calculate filtering effect for the range condition */
+  {
+    rec_per_key_t keys_per_range;
+    table_map used_tables = 0;
+    char buf[MAX_FIELDS / 8];
+    my_bitmap_map *bitbuf =
+        static_cast<my_bitmap_map *>(static_cast<void *>(&buf));
+    MY_BITMAP ignored_fields;
+    bitmap_init(&ignored_fields, bitbuf, table->s->fields);
+    bitmap_set_all(&ignored_fields);
+    bitmap_clear_bit(
+        &ignored_fields,
+        index_info->key_part[distinct_key_parts].field->field_index());
+
+    /* Compute the number of records per group for the range. */
+    if (index_info->has_records_per_key(distinct_key_parts))
+      keys_per_range = index_info->records_per_key(distinct_key_parts);
+    else
+      keys_per_range =
+          guess_rec_per_key(table, index_info, distinct_key_parts + 1);
+    /*
+      Calculation of the filtering effect is based on
+      Item_field::get_cond_filter_default_probability() where
+      max distinct values is used as an argument. So number of
+      keys in distinct group is divided by keys_per_range.
+    */
+    double max_distinct_values = max(
+        1.0, static_cast<double>(uint(keys_per_group) / uint(keys_per_range)));
+    float filtering_effect = where_cond->get_filtering_effect(
+        current_thd, table->pos_in_table_list->map(), used_tables,
+        &ignored_fields, max_distinct_values);
+    *records = max(ha_rows(1), ha_rows(skip_scan_records * filtering_effect));
+  }
+
+  /* Estimate IO cost. */
+  const Cost_model_table *const cost_model = table->cost_model();
+  Cost_estimate cost_skip_scan =
+      table->file->index_scan_cost(key, num_groups, *records);
+
+  /* CPU cost*/
+  const double tree_height =
+      table_records == 0 ? 1.0 : ceil(log2(double(table_records)));
+  const double tree_traversal_cost = cost_model->key_compare_cost(tree_height);
+  /* Number of re-positions happens twice per group. */
+  trace_idx->add("tree_travel_cost", tree_traversal_cost)
+      .add("num_groups", num_groups);
+  const double cpu_cost =
+      tree_traversal_cost * num_groups * 2 +
+      cost_model->row_evaluate_cost(static_cast<double>(*records)) +
+      cost_model->key_compare_cost(static_cast<double>(*records));
+  cost_skip_scan.add_cpu(cpu_cost);
+
+  *cost_est = cost_skip_scan;
+
+  DBUG_PRINT("info",
+             ("table rows: %lu keys/group: %u result rows: %lu",
+              (ulong)table_records, (uint)keys_per_group, (ulong)*records));
+}
diff -Nru mysql-8.0-8.0.26/sql/range_optimizer/skip_scan_plan.h mysql-8.0-8.0.27/sql/range_optimizer/skip_scan_plan.h
--- mysql-8.0-8.0.26/sql/range_optimizer/skip_scan_plan.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/range_optimizer/skip_scan_plan.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,111 @@
+/* Copyright (c) 2000, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef SQL_RANGE_OPTIMIZER_SKIP_SCAN_PLAN_H_
+#define SQL_RANGE_OPTIMIZER_SKIP_SCAN_PLAN_H_
+
+#include <sys/types.h>
+
+#include "my_base.h"
+#include "sql/range_optimizer/table_read_plan.h"
+
+class KEY;
+class KEY_PART_INFO;
+class Opt_trace_object;
+class RANGE_OPT_PARAM;
+class QUICK_SELECT_I;
+class SEL_ARG;
+class SEL_ROOT;
+class SEL_TREE;
+struct MEM_ROOT;
+
+/*
+  Plan for a QUICK_SKIP_SCAN_SELECT scan.
+*/
+
+class TRP_SKIP_SCAN : public TABLE_READ_PLAN {
+ private:
+  KEY *index_info;                ///< The index chosen for data access
+  uint eq_prefix_len;             ///< Length of the equality prefix
+  uint eq_prefix_parts;           ///< Number of parts in the equality prefix
+  KEY_PART_INFO *range_key_part;  ///< The key part corresponding to the range
+                                  ///< condition
+  uchar *const min_range_key;
+  uchar *const max_range_key;
+  uchar *const min_search_key;
+  uchar *const max_search_key;
+  const uint range_cond_flag;
+  const uint range_key_len;
+
+  // The sub-tree corresponding to the range condition
+  // (on key part C - for more details see description of get_best_skip_scan()).
+  //
+  // Does not necessarily live as long as the TRP, so used for tracing only.
+  const SEL_ARG *range_part_tracing_only;
+
+  SEL_ROOT *index_range_tree;   ///< The sub-tree corresponding to index_info
+  bool has_aggregate_function;  ///< TRUE if there are aggregate functions.
+
+ public:
+  void trace_basic_info(THD *thd, const RANGE_OPT_PARAM *param,
+                        Opt_trace_object *trace_object) const override;
+
+  TRP_SKIP_SCAN(TABLE *table_arg, KEY *index_info, uint index_arg,
+                SEL_ROOT *index_range_tree, uint eq_prefix_len,
+                uint eq_prefix_parts, KEY_PART_INFO *range_key_part,
+                uint used_key_parts_arg, bool forced_by_hint_arg,
+                ha_rows read_records, bool has_aggregate_function,
+                uchar *min_range_key_arg, uchar *max_range_key_arg,
+                uchar *min_search_key_arg, uchar *max_search_key_arg,
+                uint range_cond_flag_arg,
+                const SEL_ARG *range_part_tracing_only_arg,
+                uint range_key_len_arg)
+      : TABLE_READ_PLAN(table_arg, index_arg, used_key_parts_arg,
+                        forced_by_hint_arg),
+        index_info(index_info),
+        eq_prefix_len(eq_prefix_len),
+        eq_prefix_parts(eq_prefix_parts),
+        range_key_part(range_key_part),
+        min_range_key(min_range_key_arg),
+        max_range_key(max_range_key_arg),
+        min_search_key(min_search_key_arg),
+        max_search_key(max_search_key_arg),
+        range_cond_flag(range_cond_flag_arg),
+        range_key_len(range_key_len_arg),
+        range_part_tracing_only(range_part_tracing_only_arg),
+        index_range_tree(index_range_tree),
+        has_aggregate_function(has_aggregate_function) {
+    records = read_records;
+  }
+
+  ~TRP_SKIP_SCAN() override = default;
+
+  QUICK_SELECT_I *make_quick(bool retrieve_full_rows,
+                             MEM_ROOT *return_mem_root) override;
+};
+
+TRP_SKIP_SCAN *get_best_skip_scan(THD *thd, RANGE_OPT_PARAM *param,
+                                  SEL_TREE *tree, enum_order order_direction,
+                                  bool skip_records_in_range,
+                                  bool force_skip_scan);
+
+#endif  // SQL_RANGE_OPTIMIZER_SKIP_SCAN_PLAN_H_
diff -Nru mysql-8.0-8.0.26/sql/range_optimizer/table_read_plan.h mysql-8.0-8.0.27/sql/range_optimizer/table_read_plan.h
--- mysql-8.0-8.0.26/sql/range_optimizer/table_read_plan.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/range_optimizer/table_read_plan.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,102 @@
+/* Copyright (c) 2000, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef SQL_RANGE_OPTIMIZER_TABLE_READ_PLAN_H_
+#define SQL_RANGE_OPTIMIZER_TABLE_READ_PLAN_H_
+
+#include "sql/range_optimizer/range_optimizer.h"
+
+class Opt_trace_object;
+class RANGE_OPT_PARAM;
+class SEL_ROOT;
+
+/*
+  Table rows retrieval plan. Range optimizer creates QUICK_SELECT_I-derived
+  objects from table read plans.
+*/
+class TABLE_READ_PLAN {
+ public:
+  /*
+    Plan read cost, with or without cost of full row retrieval, depending
+    on plan creation parameters.
+  */
+  Cost_estimate cost_est;
+  ha_rows records; /* estimate of #rows to be examined */
+
+  // The table scanned.
+  TABLE *const table;
+
+  /*
+    Index this quick select uses, or MAX_KEY for quick selects
+    that use several indexes
+   */
+  const uint index;
+
+  /*
+    Max. number of (first) key parts this quick select uses for retrieval.
+    eg. for "(key1p1=c1 AND key1p2=c2) OR key1p1=c2" used_key_parts == 2.
+    Applicable if index!= MAX_KEY.
+
+    For QUICK_GROUP_MIN_MAX_SELECT it includes MIN/MAX argument keyparts.
+   */
+  uint used_key_parts;
+
+  const bool forced_by_hint;
+
+  /*
+    Create quick select for this plan.
+    SYNOPSIS
+     make_quick()
+       retrieve_full_rows  If true, created quick select will do full record
+                           retrieval.
+       return_mem_root     Memory pool to use.
+
+    NOTES
+      retrieve_full_rows is ignored by some implementations.
+
+    RETURN
+      created quick select
+      NULL on any error.
+  */
+  virtual QUICK_SELECT_I *make_quick(bool retrieve_full_rows,
+                                     MEM_ROOT *return_mem_root) = 0;
+
+  TABLE_READ_PLAN(TABLE *table_arg, int index_arg, uint used_key_parts_arg,
+                  bool forced_by_hint_arg)
+      : table(table_arg),
+        index(index_arg),
+        used_key_parts(used_key_parts_arg),
+        forced_by_hint(forced_by_hint_arg) {}
+  virtual ~TABLE_READ_PLAN() = default;
+
+  /**
+     Add basic info for this TABLE_READ_PLAN to the optimizer trace.
+
+     @param thd          Thread handle
+     @param param        Parameters for range analysis of this table
+     @param trace_object The optimizer trace object the info is appended to
+  */
+  virtual void trace_basic_info(THD *thd, const RANGE_OPT_PARAM *param,
+                                Opt_trace_object *trace_object) const = 0;
+};
+
+#endif  // SQL_RANGE_OPTIMIZER_TABLE_READ_PLAN_H_
diff -Nru mysql-8.0-8.0.26/sql/range_optimizer/tree.cc mysql-8.0-8.0.27/sql/range_optimizer/tree.cc
--- mysql-8.0-8.0.26/sql/range_optimizer/tree.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/range_optimizer/tree.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,2170 @@
+/* Copyright (c) 2000, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include "sql/range_optimizer/tree.h"
+
+#include <algorithm>
+#include <set>
+#include <utility>
+
+#include "m_ctype.h"
+#include "m_string.h"
+#include "memory_debugging.h"
+#include "my_dbug.h"
+#include "my_loglevel.h"
+#include "my_sqlcommand.h"
+#include "mysql/components/services/log_builtins.h"
+#include "mysqld_error.h"
+#include "sql/current_thd.h"
+#include "sql/handler.h"
+#include "sql/key.h"
+#include "sql/key_spec.h"
+#include "sql/range_optimizer/internal.h"
+#include "sql/range_optimizer/range_opt_param.h"
+#include "sql/range_optimizer/range_optimizer.h"
+#include "sql/sql_class.h"
+#include "sql/sql_lex.h"
+#include "sql/system_variables.h"
+#include "sql/table.h"
+#include "sql_string.h"
+
+using std::max;
+using std::min;
+
+// Note: tree1 and tree2 are not usable by themselves after tree_and() or
+// tree_or().
+SEL_TREE *tree_and(RANGE_OPT_PARAM *param, SEL_TREE *tree1, SEL_TREE *tree2);
+SEL_TREE *tree_or(RANGE_OPT_PARAM *param, bool remove_jump_scans,
+                  SEL_TREE *tree1, SEL_TREE *tree2);
+SEL_ROOT *key_or(RANGE_OPT_PARAM *param, SEL_ROOT *key1, SEL_ROOT *key2);
+SEL_ROOT *key_and(RANGE_OPT_PARAM *param, SEL_ROOT *key1, SEL_ROOT *key2);
+
+SEL_ARG *rb_delete_fixup(SEL_ARG *root, SEL_ARG *key, SEL_ARG *par);
+#ifndef NDEBUG
+int test_rb_tree(SEL_ARG *element, SEL_ARG *parent);
+#endif
+
+static bool eq_tree(const SEL_ROOT *a, const SEL_ROOT *b);
+static bool eq_tree(const SEL_ARG *a, const SEL_ARG *b);
+static bool get_range(SEL_ARG **e1, SEL_ARG **e2, const SEL_ROOT *root1);
+
+using opt_range::null_element;
+
+/*
+  Returns a number of keypart values appended to the key buffer
+  for min key and max key. This function is used by both Range
+  Analysis and Partition pruning. For partition pruning we have
+  to ensure that we don't store also subpartition fields. Thus
+  we have to stop at the last partition part and not step into
+  the subpartition fields. For Range Analysis we set last_part
+  to MAX_KEY which we should never reach.
+
+  Note: Caller of this function should take care of sending the
+  correct flags and correct key to be stored into.  In case of
+  ascending indexes, store_min_key() gets called to store the
+  min_value to range start_key. In case of descending indexes, it's
+  called for storing min_value to range end_key.
+*/
+
+int SEL_ROOT::store_min_key(KEY_PART *key, uchar **range_key,
+                            uint *range_key_flag, uint last_part,
+                            bool start_key) {
+  SEL_ARG *key_tree = root->first();
+  uint res = key_tree->store_min_value(key[key_tree->part].store_length,
+                                       range_key, *range_key_flag);
+  // We've stored min_value, so append min_flag
+  *range_key_flag |= key_tree->min_flag;
+  if (key_tree->next_key_part &&
+      key_tree->next_key_part->type == SEL_ROOT::Type::KEY_RANGE &&
+      key_tree->part != last_part &&
+      key_tree->next_key_part->root->part == key_tree->part + 1 &&
+      !(*range_key_flag & (NO_MIN_RANGE | NEAR_MIN))) {
+    const bool asc = key_tree->next_key_part->root->is_ascending;
+    if ((start_key && asc) || (!start_key && !asc))
+      res += key_tree->next_key_part->store_min_key(
+          key, range_key, range_key_flag, last_part, start_key);
+    else {
+      uint tmp_flag = invert_min_flag(*range_key_flag);
+      res += key_tree->next_key_part->store_max_key(key, range_key, &tmp_flag,
+                                                    last_part, start_key);
+      *range_key_flag = invert_max_flag(tmp_flag);
+    }
+  }
+  return res;
+}
+
+/*
+  Returns the number of keypart values appended to the key buffer.
+
+  Note: Caller of this function should take care of sending the
+  correct flags and correct key to be stored into.  In case of
+  ascending indexes, store_max_key() gets called while storing the
+  max_value into range end_key. In case of descending indexes,
+  its max_value to range start_key.
+*/
+
+int SEL_ROOT::store_max_key(KEY_PART *key, uchar **range_key,
+                            uint *range_key_flag, uint last_part,
+                            bool start_key) {
+  SEL_ARG *key_tree = root->last();
+  uint res = key_tree->store_max_value(key[key_tree->part].store_length,
+                                       range_key, *range_key_flag);
+  // We've stored max value, so return max_flag
+  (*range_key_flag) |= key_tree->max_flag;
+  if (key_tree->next_key_part &&
+      key_tree->next_key_part->type == SEL_ROOT::Type::KEY_RANGE &&
+      key_tree->part != last_part &&
+      key_tree->next_key_part->root->part == key_tree->part + 1 &&
+      !(*range_key_flag & (NO_MAX_RANGE | NEAR_MAX))) {
+    const bool asc = key_tree->next_key_part->root->is_ascending;
+    if ((!start_key && asc) || (start_key && !asc))
+      res += key_tree->next_key_part->store_max_key(
+          key, range_key, range_key_flag, last_part, start_key);
+    else {
+      uint tmp_flag = invert_max_flag(*range_key_flag);
+      res += key_tree->next_key_part->store_min_key(key, range_key, &tmp_flag,
+                                                    last_part, start_key);
+      *range_key_flag = invert_min_flag(tmp_flag);
+    }
+  }
+  return res;
+}
+
+void SEL_ROOT::free_tree() {
+  if (use_count == 0) {
+    for (SEL_ARG *pos = root->first(); pos; pos = pos->next) {
+      SEL_ROOT *root = pos->release_next_key_part();
+      if (root) root->free_tree();
+    }
+  }
+}
+
+/**
+  Helper function to compare two SEL_ROOTs.
+*/
+static bool all_same(const SEL_ROOT *sa1, const SEL_ROOT *sa2) {
+  if (sa1 == nullptr && sa2 == nullptr) return true;
+  if ((sa1 != nullptr && sa2 == nullptr) || (sa1 == nullptr && sa2 != nullptr))
+    return false;
+  if (sa1->type == SEL_ROOT::Type::KEY_RANGE &&
+      sa2->type == SEL_ROOT::Type::KEY_RANGE) {
+    const SEL_ARG *sa1_arg = sa1->root->first();
+    const SEL_ARG *sa2_arg = sa2->root->first();
+    for (; sa1_arg && sa2_arg && sa1_arg->is_same(sa2_arg);
+         sa1_arg = sa1_arg->next, sa2_arg = sa2_arg->next)
+      ;
+    if (sa1_arg || sa2_arg) return false;
+    return true;
+  } else
+    return sa1->type == sa2->type;
+}
+
+SEL_TREE::SEL_TREE(SEL_TREE *arg, RANGE_OPT_PARAM *param)
+    : keys(param->temp_mem_root, param->keys), n_ror_scans(0) {
+  keys_map = arg->keys_map;
+  type = arg->type;
+  for (uint idx = 0; idx < param->keys; idx++) {
+    if (arg->keys[idx]) {
+      set_key(idx, arg->keys[idx]->clone_tree(param));
+      if (!keys[idx]) break;
+    } else
+      set_key(idx, nullptr);
+  }
+
+  List_iterator<SEL_IMERGE> it(arg->merges);
+  for (SEL_IMERGE *el = it++; el; el = it++) {
+    SEL_IMERGE *merge = new (param->temp_mem_root) SEL_IMERGE(el, param);
+    if (!merge || merge->trees == merge->trees_next || param->has_errors()) {
+      merges.clear();
+      return;
+    }
+    merges.push_back(merge);
+  }
+
+  /*
+    SEL_TREEs are only created by get_mm_tree() (and functions called
+    by get_mm_tree()). Index intersection is checked after
+    get_mm_tree() has constructed all ranges. In other words, there
+    should not be any ROR scans to copy when this ctor is called.
+  */
+  assert(n_ror_scans == 0);
+}
+
+/*
+  Perform AND operation on two index_merge lists and store result in *im1.
+*/
+
+inline void imerge_list_and_list(List<SEL_IMERGE> *im1, List<SEL_IMERGE> *im2) {
+  im1->concat(im2);
+}
+
+/*
+  Perform OR operation on 2 index_merge lists, storing result in first list.
+
+  NOTES
+    The following conversion is implemented:
+     (a_1 &&...&& a_N)||(b_1 &&...&& b_K) = AND_i,j(a_i || b_j) =>
+      => (a_1||b_1).
+
+    i.e. all conjuncts except the first one are currently dropped.
+    This is done to avoid producing N*K ways to do index_merge.
+
+    If (a_1||b_1) produce a condition that is always true, NULL is returned
+    and index_merge is discarded (while it is actually possible to try
+    harder).
+
+    As a consequence of this, choice of keys to do index_merge read may depend
+    on the order of conditions in WHERE part of the query.
+
+  RETURN
+    0     OK, result is stored in *im1
+    other Error, both passed lists are unusable
+*/
+
+static int imerge_list_or_list(RANGE_OPT_PARAM *param, bool remove_jump_scans,
+                               List<SEL_IMERGE> *im1, List<SEL_IMERGE> *im2) {
+  SEL_IMERGE *imerge = im1->head();
+  im1->clear();
+  im1->push_back(imerge);
+
+  return imerge->or_sel_imerge_with_checks(param, remove_jump_scans,
+                                           im2->head());
+}
+
+/*
+  Perform OR operation on index_merge list and key tree.
+
+  RETURN
+    false     OK, result is stored in *im1.
+    true      Error
+*/
+
+static bool imerge_list_or_tree(RANGE_OPT_PARAM *param, bool remove_jump_scans,
+                                List<SEL_IMERGE> *im1, SEL_TREE *tree) {
+  DBUG_TRACE;
+  SEL_IMERGE *imerge;
+  List_iterator<SEL_IMERGE> it(*im1);
+
+  uint remaining_trees = im1->elements;
+  while ((imerge = it++)) {
+    SEL_TREE *or_tree;
+    /*
+      Need to make a copy of 'tree' for all but the last OR operation
+      because or_sel_tree_with_checks() may change it.
+    */
+    if (--remaining_trees == 0)
+      or_tree = tree;
+    else {
+      or_tree = new (param->temp_mem_root) SEL_TREE(tree, param);
+      if (!or_tree || param->has_errors()) return true;
+      if (or_tree->keys_map.is_clear_all() && or_tree->merges.is_empty())
+        return false;
+    }
+
+    int result_or =
+        imerge->or_sel_tree_with_checks(param, remove_jump_scans, or_tree);
+    if (result_or == 1)
+      it.remove();
+    else if (result_or == -1)
+      return true;
+  }
+  assert(remaining_trees == 0);
+  return im1->is_empty();
+}
+
+SEL_ARG::SEL_ARG(SEL_ARG &arg)
+    : min_flag(arg.min_flag),
+      max_flag(arg.max_flag),
+      maybe_flag(arg.maybe_flag),
+      part(arg.part),
+      rkey_func_flag(arg.rkey_func_flag),
+      field(arg.field),
+      min_value(arg.min_value),
+      max_value(arg.max_value),
+      left(null_element),
+      right(null_element),
+      next(nullptr),
+      prev(nullptr),
+      next_key_part(arg.next_key_part),
+      is_ascending(arg.is_ascending) {
+  if (next_key_part) ++next_key_part->use_count;
+}
+
+SEL_ARG::SEL_ARG(Field *f, const uchar *min_value_arg,
+                 const uchar *max_value_arg, bool asc)
+    : part(0),
+      rkey_func_flag(HA_READ_INVALID),
+      field(f),
+      min_value(const_cast<uchar *>(min_value_arg)),
+      max_value(const_cast<uchar *>(max_value_arg)),
+      left(null_element),
+      right(null_element),
+      next(nullptr),
+      prev(nullptr),
+      parent(nullptr),
+      color(BLACK),
+      is_ascending(asc) {}
+
+SEL_ARG::SEL_ARG(Field *field_, uint8 part_, uchar *min_value_,
+                 uchar *max_value_, uint8 min_flag_, uint8 max_flag_,
+                 bool maybe_flag_, bool asc)
+    : min_flag(min_flag_),
+      max_flag(max_flag_),
+      maybe_flag(maybe_flag_),
+      part(part_),
+      rkey_func_flag(HA_READ_INVALID),
+      field(field_),
+      min_value(min_value_),
+      max_value(max_value_),
+      left(null_element),
+      right(null_element),
+      next(nullptr),
+      prev(nullptr),
+      parent(nullptr),
+      color(BLACK),
+      is_ascending(asc) {}
+
+SEL_ARG *SEL_ARG::clone(RANGE_OPT_PARAM *param, SEL_ARG *new_parent,
+                        SEL_ARG **next_arg) {
+  SEL_ARG *tmp;
+
+  if (param->has_errors()) return nullptr;
+
+  if (!(tmp = new (param->temp_mem_root)
+            SEL_ARG(field, part, min_value, max_value, min_flag, max_flag,
+                    maybe_flag, is_ascending)))
+    return nullptr;  // OOM
+  tmp->parent = new_parent;
+  tmp->set_next_key_part(next_key_part);
+  if (left == null_element || left == nullptr) {
+    tmp->left = left;
+  } else {
+    if (!(tmp->left = left->clone(param, tmp, next_arg)))
+      return nullptr;  // OOM
+  }
+
+  tmp->prev = *next_arg;  // Link into next/prev chain
+  (*next_arg)->next = tmp;
+  (*next_arg) = tmp;
+
+  if (right == null_element || right == nullptr) {
+    tmp->right = right;
+  } else {
+    if (!(tmp->right = right->clone(param, tmp, next_arg)))
+      return nullptr;  // OOM
+  }
+  tmp->color = color;
+  return tmp;
+}
+
+/**
+  This gives the first SEL_ARG in the interval list, and the minimal element
+  in the red-black tree
+
+  @return
+  SEL_ARG   first SEL_ARG in the interval list
+*/
+SEL_ARG *SEL_ARG::first() {
+  SEL_ARG *next_arg = this;
+  if (!next_arg->left) return nullptr;  // MAYBE_KEY
+  while (next_arg->left != null_element) next_arg = next_arg->left;
+  return next_arg;
+}
+
+const SEL_ARG *SEL_ARG::first() const {
+  return const_cast<SEL_ARG *>(this)->first();
+}
+
+SEL_ARG *SEL_ARG::last() {
+  SEL_ARG *next_arg = this;
+  if (!next_arg->right) return nullptr;  // MAYBE_KEY
+  while (next_arg->right != null_element) next_arg = next_arg->right;
+  return next_arg;
+}
+
+/*
+  Check if a compare is ok, when one takes ranges in account
+  Returns -2 or 2 if the ranges where 'joined' like  < 2 and >= 2
+*/
+
+int sel_cmp(Field *field, uchar *a, uchar *b, uint8 a_flag, uint8 b_flag) {
+  int cmp;
+  /* First check if there was a compare to a min or max element */
+  if (a_flag & (NO_MIN_RANGE | NO_MAX_RANGE)) {
+    if ((a_flag & (NO_MIN_RANGE | NO_MAX_RANGE)) ==
+        (b_flag & (NO_MIN_RANGE | NO_MAX_RANGE)))
+      return 0;
+    return (a_flag & NO_MIN_RANGE) ? -1 : 1;
+  }
+  if (b_flag & (NO_MIN_RANGE | NO_MAX_RANGE))
+    return (b_flag & NO_MIN_RANGE) ? 1 : -1;
+
+  if (field->is_nullable())  // If null is part of key
+  {
+    if (*a != *b) {
+      return *a ? -1 : 1;
+    }
+    if (*a) goto end;  // NULL where equal
+    a++;
+    b++;  // Skip NULL marker
+  }
+  cmp = field->key_cmp(a, b);
+  if (cmp) return cmp < 0 ? -1 : 1;  // The values differed
+
+  // Check if the compared equal arguments was defined with open/closed range
+end:
+  if (a_flag & (NEAR_MIN | NEAR_MAX)) {
+    if ((a_flag & (NEAR_MIN | NEAR_MAX)) == (b_flag & (NEAR_MIN | NEAR_MAX)))
+      return 0;
+    if (!(b_flag & (NEAR_MIN | NEAR_MAX))) return (a_flag & NEAR_MIN) ? 2 : -2;
+    return (a_flag & NEAR_MIN) ? 1 : -1;
+  }
+  if (b_flag & (NEAR_MIN | NEAR_MAX)) return (b_flag & NEAR_MIN) ? -2 : 2;
+  return 0;  // The elements where equal
+}
+
+namespace {
+
+size_t count_elements(const SEL_ARG *arg) {
+  size_t elements = 1;
+  assert(arg->left);
+  assert(arg->right);
+  if (arg->left && arg->left != null_element)
+    elements += count_elements(arg->left);
+  if (arg->right && arg->right != null_element)
+    elements += count_elements(arg->right);
+  return elements;
+}
+
+}  // Namespace
+
+SEL_ROOT::SEL_ROOT(SEL_ARG *root_arg)
+    : type(Type::KEY_RANGE),
+      root(root_arg),
+      elements(count_elements(root_arg)) {}
+
+SEL_ROOT::SEL_ROOT(MEM_ROOT *mem_root, Type type_arg)
+    : type(type_arg), root(new (mem_root) SEL_ARG()), elements(1) {
+  assert(type_arg == Type::MAYBE_KEY || type_arg == Type::IMPOSSIBLE);
+  root->make_root();
+  if (type_arg == Type::MAYBE_KEY) {
+    // See todo for left/right pointers
+    root->left = root->right = nullptr;
+  }
+}
+
+SEL_ROOT *SEL_ROOT::clone_tree(RANGE_OPT_PARAM *param) const {
+  /*
+    Only SEL_ROOTs of type KEY_RANGE has any elements that need to be cloned.
+    For other types, just create a new SEL_ROOT object.
+  */
+  if (type != Type::KEY_RANGE)
+    return new (param->temp_mem_root) SEL_ROOT(param->temp_mem_root, type);
+
+  SEL_ARG tmp_link, *next_arg, *new_root;
+  SEL_ROOT *new_tree;
+  next_arg = &tmp_link;
+
+  // Clone the underlying SEL_ARG tree, starting from the root node.
+  if (!(new_root = root->clone(param, (SEL_ARG *)nullptr, &next_arg)) ||
+      (param && param->has_errors()))
+    return nullptr;
+
+  // Make the SEL_ROOT itself.
+  if (!(new_tree = new (param->temp_mem_root) SEL_ROOT(new_root)))
+    return nullptr;
+  new_tree->elements = elements;
+  next_arg->next = nullptr;       // Fix last link
+  tmp_link.next->prev = nullptr;  // Fix first link
+  new_tree->use_count = 0;
+  return new_tree;
+}
+
+SEL_TREE *tree_and(RANGE_OPT_PARAM *param, SEL_TREE *tree1, SEL_TREE *tree2) {
+  DBUG_TRACE;
+
+  if (param->has_errors()) return nullptr;
+
+  if (!tree1) return tree2;
+  if (!tree2) return tree1;
+  if (tree1->type == SEL_TREE::IMPOSSIBLE || tree2->type == SEL_TREE::ALWAYS)
+    return tree1;
+  if (tree2->type == SEL_TREE::IMPOSSIBLE || tree1->type == SEL_TREE::ALWAYS)
+    return tree2;
+  if (tree1->type == SEL_TREE::MAYBE) {
+    if (tree2->type == SEL_TREE::KEY) tree2->type = SEL_TREE::KEY_SMALLER;
+    return tree2;
+  }
+  if (tree2->type == SEL_TREE::MAYBE) {
+    tree1->type = SEL_TREE::KEY_SMALLER;
+    return tree1;
+  }
+
+  dbug_print_tree("tree1", tree1, param);
+  dbug_print_tree("tree2", tree2, param);
+
+  Key_map result_keys;
+
+  /* Join the trees key per key */
+  for (uint idx = 0; idx < param->keys; idx++) {
+    SEL_ROOT *key1 = tree1->release_key(idx);
+    SEL_ROOT *key2 = tree2->release_key(idx);
+
+    if (key1 || key2) {
+      SEL_ROOT *new_key = key_and(param, key1, key2);
+      tree1->set_key(idx, new_key);
+      if (new_key) {
+        if (new_key->type == SEL_ROOT::Type::IMPOSSIBLE) {
+          tree1->type = SEL_TREE::IMPOSSIBLE;
+          return tree1;
+        }
+        result_keys.set_bit(idx);
+#ifndef NDEBUG
+        /*
+          Do not test use_count if there is a large range tree created.
+          It takes too much time to traverse the tree.
+        */
+        if (param->temp_mem_root->allocated_size() < 2097152)
+          new_key->test_use_count(new_key);
+#endif
+      }
+    }
+  }
+  tree1->keys_map = result_keys;
+
+  /* ok, both trees are index_merge trees */
+  imerge_list_and_list(&tree1->merges, &tree2->merges);
+  return tree1;
+}
+
+/*
+  Check if two SEL_TREES can be combined into one (i.e. a single key range
+  read can be constructed for "cond_of_tree1 OR cond_of_tree2" ) without
+  using index_merge.
+*/
+
+bool sel_trees_can_be_ored(SEL_TREE *tree1, SEL_TREE *tree2,
+                           RANGE_OPT_PARAM *param) {
+  Key_map common_keys = tree1->keys_map;
+  DBUG_TRACE;
+  common_keys.intersect(tree2->keys_map);
+
+  dbug_print_tree("tree1", tree1, param);
+  dbug_print_tree("tree2", tree2, param);
+
+  if (common_keys.is_clear_all()) return false;
+
+  /* trees have a common key, check if they refer to same key part */
+  for (uint key_no = 0; key_no < param->keys; key_no++) {
+    if (common_keys.is_set(key_no)) {
+      const SEL_ROOT *key1 = tree1->keys[key_no];
+      const SEL_ROOT *key2 = tree2->keys[key_no];
+      /* GIS_OPTIMIZER_FIXME: temp solution. key1 could be all nulls */
+      if (key1 && key2 && key1->root->part == key2->root->part) return true;
+    }
+  }
+  return false;
+}
+
+/*
+  Remove the trees that are not suitable for record retrieval.
+  SYNOPSIS
+    param  Range analysis parameter
+    tree   Tree to be processed, tree->type is KEY or KEY_SMALLER
+
+  DESCRIPTION
+    This function walks through tree->keys[] and removes the SEL_ARG* trees
+    that are not "maybe" trees (*) and cannot be used to construct quick range
+    selects.
+    (*) - have type MAYBE or MAYBE_KEY. Perhaps we should remove trees of
+          these types here as well.
+
+    A SEL_ARG* tree cannot be used to construct quick select if it has
+    tree->part != 0. (e.g. it could represent "keypart2 < const").
+
+    WHY THIS FUNCTION IS NEEDED
+
+    Normally we allow construction of SEL_TREE objects that have SEL_ARG
+    trees that do not allow quick range select construction. For example for
+    " keypart1=1 AND keypart2=2 " the execution will proceed as follows:
+    tree1= SEL_TREE { SEL_ARG{keypart1=1} }
+    tree2= SEL_TREE { SEL_ARG{keypart2=2} } -- can't make quick range select
+                                               from this
+    call tree_and(tree1, tree2) -- this joins SEL_ARGs into a usable SEL_ARG
+                                   tree.
+
+    There is an exception though: when we construct index_merge SEL_TREE,
+    any SEL_ARG* tree that cannot be used to construct quick range select can
+    be removed, because current range analysis code doesn't provide any way
+    that tree could be later combined with another tree.
+    Consider an example: we should not construct
+    st1 = SEL_TREE {
+      merges = SEL_IMERGE {
+                            SEL_TREE(t.key1part1 = 1),
+                            SEL_TREE(t.key2part2 = 2)   -- (*)
+                          }
+                   };
+    because
+     - (*) cannot be used to construct quick range select,
+     - There is no execution path that would cause (*) to be converted to
+       a tree that could be used.
+
+    The latter is easy to verify: first, notice that the only way to convert
+    (*) into a usable tree is to call tree_and(something, (*)).
+
+    Second look at what tree_and/tree_or function would do when passed a
+    SEL_TREE that has the structure like st1 tree has, and conlcude that
+    tree_and(something, (*)) will not be called.
+
+  RETURN
+    0  Ok, some suitable trees left
+    1  No tree->keys[] left.
+*/
+
+static bool remove_nonrange_trees(RANGE_OPT_PARAM *param, SEL_TREE *tree) {
+  bool res = false;
+  for (uint i = 0; i < param->keys; i++) {
+    if (tree->keys[i]) {
+      if (tree->keys[i]->root->part) {
+        tree->keys[i] = NULL;
+        tree->keys_map.clear_bit(i);
+      } else
+        res = true;
+    }
+  }
+  return !res;
+}
+
+SEL_TREE *tree_or(RANGE_OPT_PARAM *param, bool remove_jump_scans,
+                  SEL_TREE *tree1, SEL_TREE *tree2) {
+  DBUG_TRACE;
+
+  if (param->has_errors()) return nullptr;
+
+  if (!tree1 || !tree2) return nullptr;
+  if (tree1->type == SEL_TREE::IMPOSSIBLE || tree2->type == SEL_TREE::ALWAYS)
+    return tree2;
+  if (tree2->type == SEL_TREE::IMPOSSIBLE || tree1->type == SEL_TREE::ALWAYS)
+    return tree1;
+  if (tree1->type == SEL_TREE::MAYBE) return tree1;  // Can't use this
+  if (tree2->type == SEL_TREE::MAYBE) return tree2;
+
+  /*
+    It is possible that a tree contains both
+    a) simple range predicates (in tree->keys[]) and
+    b) index merge range predicates (in tree->merges)
+
+    If a tree has both, they represent equally *valid* range
+    predicate alternatives; both will return all relevant rows from
+    the table but one may return more unnecessary rows than the
+    other (additional rows will be filtered later). However, doing
+    an OR operation on trees with both types of predicates is too
+    complex at the time. We therefore remove the index merge
+    predicates (if we have both types) before OR'ing the trees.
+
+    TODO: enable tree_or() for trees with both simple and index
+    merge range predicates.
+  */
+  if (!tree1->merges.is_empty()) {
+    for (uint i = 0; i < param->keys; i++)
+      if (tree1->keys[i] != NULL &&
+          tree1->keys[i]->type == SEL_ROOT::Type::KEY_RANGE) {
+        tree1->merges.clear();
+        break;
+      }
+  }
+  if (!tree2->merges.is_empty()) {
+    for (uint i = 0; i < param->keys; i++)
+      if (tree2->keys[i] != NULL &&
+          tree2->keys[i]->type == SEL_ROOT::Type::KEY_RANGE) {
+        tree2->merges.clear();
+        break;
+      }
+  }
+
+  SEL_TREE *result = nullptr;
+  Key_map result_keys;
+  if (sel_trees_can_be_ored(tree1, tree2, param)) {
+    /* Join the trees key per key */
+    for (uint idx = 0; idx < param->keys; idx++) {
+      SEL_ROOT *key1 = tree1->release_key(idx);
+      SEL_ROOT *key2 = tree2->release_key(idx);
+      SEL_ROOT *new_key = key_or(param, key1, key2);
+      tree1->set_key(idx, new_key);
+      if (new_key) {
+        result = tree1;  // Added to tree1
+        result_keys.set_bit(idx);
+#ifndef NDEBUG
+        /*
+          Do not test use count if there is a large range tree created.
+          It takes too much time to traverse the tree.
+        */
+        if (param->temp_mem_root->allocated_size() < 2097152)
+          new_key->test_use_count(new_key);
+#endif
+      }
+    }
+    if (result) result->keys_map = result_keys;
+  } else {
+    /* ok, two trees have KEY type but cannot be used without index merge */
+    if (tree1->merges.is_empty() && tree2->merges.is_empty()) {
+      if (remove_jump_scans) {
+        bool no_trees = remove_nonrange_trees(param, tree1);
+        no_trees = no_trees || remove_nonrange_trees(param, tree2);
+        if (no_trees)
+          return new (param->temp_mem_root)
+              SEL_TREE(SEL_TREE::ALWAYS, param->temp_mem_root, param->keys);
+      }
+      SEL_IMERGE *merge;
+      /* both trees are "range" trees, produce new index merge structure */
+      if (!(result = new (param->temp_mem_root)
+                SEL_TREE(param->temp_mem_root, param->keys)) ||
+          !(merge = new (param->temp_mem_root) SEL_IMERGE()) ||
+          (result->merges.push_back(merge)) ||
+          (merge->or_sel_tree(param, tree1)) ||
+          (merge->or_sel_tree(param, tree2)))
+        result = nullptr;
+      else
+        result->type = tree1->type;
+    } else if (!tree1->merges.is_empty() && !tree2->merges.is_empty()) {
+      if (imerge_list_or_list(param, remove_jump_scans, &tree1->merges,
+                              &tree2->merges))
+        result = new (param->temp_mem_root)
+            SEL_TREE(SEL_TREE::ALWAYS, param->temp_mem_root, param->keys);
+      else
+        result = tree1;
+    } else {
+      /* one tree is index merge tree and another is range tree */
+      if (tree1->merges.is_empty()) std::swap(tree1, tree2);
+
+      if (remove_jump_scans && remove_nonrange_trees(param, tree2))
+        return new (param->temp_mem_root)
+            SEL_TREE(SEL_TREE::ALWAYS, param->temp_mem_root, param->keys);
+      /* add tree2 to tree1->merges, checking if it collapses to ALWAYS */
+      if (imerge_list_or_tree(param, remove_jump_scans, &tree1->merges, tree2))
+        result = new (param->temp_mem_root)
+            SEL_TREE(SEL_TREE::ALWAYS, param->temp_mem_root, param->keys);
+      else
+        result = tree1;
+    }
+  }
+  return result;
+}
+
+/**
+  And key trees where key1->part < key2->part
+
+  key2 will be connected to every key in key1, and thus
+  have its use_count incremented many times. The returned node
+  will not have its use_count increased; you are supposed to do
+  that yourself when you connect it to a root.
+
+  @param param Range analysis context (needed to track if we have allocated
+               too many SEL_ARGs)
+  @param key1 Root of first tree to AND together
+  @param key2 Root of second tree to AND together
+  @return Root of (key1 AND key2)
+*/
+
+static SEL_ROOT *and_all_keys(RANGE_OPT_PARAM *param, SEL_ROOT *key1,
+                              SEL_ROOT *key2) {
+  SEL_ARG *next;
+
+  // We will be modifying key1, so clone it if we need to.
+  if (key1->use_count > 0) {
+    if (!(key1 = key1->clone_tree(param))) return nullptr;  // OOM
+  }
+
+  /*
+    We will be using key2 several times, so temporarily increase
+    its use_count artificially to keep key_and() below from modifying
+    it in-place.
+
+    Note that this makes test_use_count() fail since our use_count is
+    now higher than the actual number of references, but that is only ever
+    called from tree_and() and tree_or(), not from anything below this,
+    and we undo it below.
+  */
+  ++key2->use_count;
+
+  if (key1->type == SEL_ROOT::Type::MAYBE_KEY) {
+    // See todo for left/right pointers
+    assert(!key1->root->left);
+    assert(!key1->root->right);
+    key1->root->next = key1->root->prev = nullptr;
+  }
+  for (next = key1->root->first(); next; next = next->next) {
+    if (next->next_key_part) {
+      /*
+        The more complicated case; there's already another AND clause,
+        so we cannot connect key2 to key1 directly, but need to recurse.
+      */
+      SEL_ROOT *tmp = key_and(param, next->release_next_key_part(), key2);
+      next->set_next_key_part(tmp);
+      if (tmp && tmp->type == SEL_ROOT::Type::IMPOSSIBLE) {
+        key1->tree_delete(next);
+      }
+    } else {
+      // The trivial case.
+      next->set_next_key_part(key2);
+    }
+  }
+
+  // Undo the temporary use_count modification above.
+  --key2->use_count;
+
+  return key1;
+}
+
+/*
+  Produce a SEL_ARG graph that represents "key1 AND key2"
+
+  SYNOPSIS
+    key_and()
+      param   Range analysis context (needed to track if we have allocated
+              too many SEL_ARGs)
+      key1    First argument, root of its RB-tree
+      key2    Second argument, root of its RB-tree
+
+  key_and() does not modify key1 nor key2 if they are in use by other roots
+  (although typical use is that key1 has been disconnected from its root
+  and thus can be modified in-place). Thus, it does not change their use_count
+  in the typical case.
+
+  The returned node will not have its use_count increased; you are supposed
+  to do that yourself when you connect it to a root.
+
+  RETURN
+    RB-tree root of the resulting SEL_ARG graph.
+    NULL if the result of AND operation is an empty interval {0}.
+*/
+
+SEL_ROOT *key_and(RANGE_OPT_PARAM *param, SEL_ROOT *key1, SEL_ROOT *key2) {
+  if (param->has_errors()) return nullptr;
+
+  if (key1 == nullptr || key1->is_always()) {
+    if (key1) key1->free_tree();
+    return key2;
+  }
+  if (key2 == nullptr || key2->is_always()) {
+    if (key2) key2->free_tree();
+    return key1;
+  }
+
+  if (key1->root->part != key2->root->part) {
+    if (key1->root->part > key2->root->part) {
+      std::swap(key1, key2);
+    }
+    assert(key1->root->part < key2->root->part);
+    return and_all_keys(param, key1, key2);
+  }
+
+  if ((!key2->simple_key() && key1->simple_key() &&
+       key2->type != SEL_ROOT::Type::MAYBE_KEY) ||
+      key1->type == SEL_ROOT::Type::MAYBE_KEY) {  // Put simple key in key2
+    std::swap(key1, key2);
+  }
+
+  /* If one of the key is MAYBE_KEY then the found region may be smaller */
+  if (key2->type == SEL_ROOT::Type::MAYBE_KEY) {
+    if (key1->use_count > 0) {
+      // We are going to modify key1, so we need to clone it.
+      if (!(key1 = key1->clone_tree(param))) return nullptr;  // OOM
+    }
+    if (key1->type == SEL_ROOT::Type::MAYBE_KEY) {  // Both are maybe key
+      SEL_ROOT *new_part = key_and(param, key1->root->release_next_key_part(),
+                                   key2->root->next_key_part);
+      key1->root->set_next_key_part(new_part);
+      return key1;
+    } else {
+      key1->root->maybe_smaller();
+      if (key2->root->next_key_part) {
+        return and_all_keys(param, key1, key2);
+      } else {
+        /*
+          key2 is MAYBE_KEY and nothing more; simply discard it,
+          since we've now moved that information into key1's maybe_flag.
+        */
+        key2->free_tree();
+        return key1;
+      }
+    }
+    // Unreachable.
+    assert(false);
+    return nullptr;
+  }
+
+  if ((key1->root->min_flag | key2->root->min_flag) & GEOM_FLAG) {
+    /*
+      Cannot optimize geometry ranges. The next best thing is to keep
+      one of them.
+    */
+    key2->free_tree();
+    return key1;
+  }
+
+  // Two non-overlapped key ranges for multi-valued index do not mean
+  // an always false condition.
+  // For example, "1 member of(f) AND 2 member of(f)" for f=[1, 2].
+  if (key1->root->field->is_array() || key2->root->field->is_array()) {
+    return and_all_keys(param, key1, key2);
+  }
+
+  SEL_ARG *e1 = key1->root->first(), *e2 = key2->root->first();
+  SEL_ROOT *new_tree = nullptr;
+
+  while (e1 && e2) {
+    int cmp = e1->cmp_min_to_min(e2);
+    if (cmp < 0) {
+      if (get_range(&e1, &e2, key1)) continue;
+    } else if (get_range(&e2, &e1, key2))
+      continue;
+    /*
+      NOTE: We don't destroy e1->next_key_part nor e2->next_key_part
+      (if used at all, the return value here goes into a brand new element;
+      it does not overwrite either of them), so we keep their use_counts
+      intact here.
+    */
+    SEL_ROOT *next = key_and(param, e1->next_key_part, e2->next_key_part);
+    if (next && next->type == SEL_ROOT::Type::IMPOSSIBLE)
+      next->free_tree();
+    else {
+      SEL_ARG *new_arg = e1->clone_and(e2, param->temp_mem_root);
+      if (!new_arg) return nullptr;  // End of memory
+      new_arg->set_next_key_part(next);
+      if (!new_tree) {
+        new_tree = new (param->temp_mem_root) SEL_ROOT(new_arg);
+      } else
+        new_tree->insert(new_arg);
+    }
+    if (e1->cmp_max_to_max(e2) < 0)
+      e1 = e1->next;  // e1 can't overlap next e2
+    else
+      e2 = e2->next;
+  }
+  key1->free_tree();
+  key2->free_tree();
+  if (!new_tree)
+    // Impossible range
+    return new (param->temp_mem_root)
+        SEL_ROOT(param->temp_mem_root, SEL_ROOT::Type::IMPOSSIBLE);
+  return new_tree;
+}
+
+static bool get_range(SEL_ARG **e1, SEL_ARG **e2, const SEL_ROOT *root1) {
+  (*e1) = root1->find_range(*e2);  // first e1->min < e2->min
+  if ((*e1)->cmp_max_to_min(*e2) < 0) {
+    if (!((*e1) = (*e1)->next)) return true;
+    if ((*e1)->cmp_min_to_max(*e2) > 0) {
+      (*e2) = (*e2)->next;
+      return true;
+    }
+  }
+  return false;
+}
+
+/**
+   Combine two range expression under a common OR. On a logical level, the
+   transformation is key_or( expr1, expr2 ) => expr1 OR expr2.
+
+   Both expressions are assumed to be in the SEL_ARG format. In a logic sense,
+   the format is reminiscent of DNF, since an expression such as the following
+
+   ( 1 < kp1 < 10 AND p1 ) OR ( 10 <= kp2 < 20 AND p2 )
+
+   where there is a key consisting of keyparts ( kp1, kp2, ..., kpn ) and p1
+   and p2 are valid SEL_ARG expressions over keyparts kp2 ... kpn, is a valid
+   SEL_ARG condition. The disjuncts appear ordered by the minimum endpoint of
+   the first range and ranges must not overlap. It follows that they are also
+   ordered by maximum endpoints. Thus
+
+   ( 1 < kp1 <= 2 AND ( kp2 = 2 OR kp2 = 3 ) ) OR kp1 = 3
+
+   Is a a valid SER_ARG expression for a key of at least 2 keyparts.
+
+   For simplicity, we will assume that expr2 is a single range predicate,
+   i.e. on the form ( a < x < b AND ... ). It is easy to generalize to a
+   disjunction of several predicates by subsequently call key_or for each
+   disjunct.
+
+   The algorithm iterates over each disjunct of expr1, and for each disjunct
+   where the first keypart's range overlaps with the first keypart's range in
+   expr2:
+
+   If the predicates are equal for the rest of the keyparts, or if there are
+   no more, the range in expr2 has its endpoints copied in, and the SEL_ARG
+   node in expr2 is deallocated. If more ranges became connected in expr1, the
+   surplus is also dealocated. If they differ, two ranges are created.
+
+   - The range leading up to the overlap. Empty if endpoints are equal.
+
+   - The overlapping sub-range. May be the entire range if they are equal.
+
+   Finally, there may be one more range if expr2's first keypart's range has a
+   greater maximum endpoint than the last range in expr1.
+
+   For the overlapping sub-range, we recursively call key_or. Thus in order to
+   compute key_or of
+
+     (1) ( 1 < kp1 < 10 AND 1 < kp2 < 10 )
+
+     (2) ( 2 < kp1 < 20 AND 4 < kp2 < 20 )
+
+   We create the ranges 1 < kp <= 2, 2 < kp1 < 10, 10 <= kp1 < 20. For the
+   first one, we simply hook on the condition for the second keypart from (1)
+   : 1 < kp2 < 10. For the second range 2 < kp1 < 10, key_or( 1 < kp2 < 10, 4
+   < kp2 < 20 ) is called, yielding 1 < kp2 < 20. For the last range, we reuse
+   the range 4 < kp2 < 20 from (2) for the second keypart. The result is thus
+
+   ( 1  <  kp1 <= 2 AND 1 < kp2 < 10 ) OR
+   ( 2  <  kp1 < 10 AND 1 < kp2 < 20 ) OR
+   ( 10 <= kp1 < 20 AND 4 < kp2 < 20 )
+
+   key_or() does not modify key1 nor key2 if they are in use by other roots
+   (although typical use is that key1 has been disconnected from its root
+   and thus can be modified in-place). Thus, it does not change their
+   use_count.
+
+   The returned node will not have its use_count increased; you are supposed
+   to do that yourself when you connect it to a root.
+
+   @param param    RANGE_OPT_PARAM from test_quick_select
+   @param key1     Root of RB-tree of SEL_ARGs to be ORed with key2
+   @param key2     Root of RB-tree of SEL_ARGs to be ORed with key1
+*/
+SEL_ROOT *key_or(RANGE_OPT_PARAM *param, SEL_ROOT *key1, SEL_ROOT *key2) {
+  if (param->has_errors()) return nullptr;
+
+  if (key1 == nullptr || key1->is_always()) {
+    if (key2) key2->free_tree();
+    return key1;
+  }
+  if (key2 == nullptr || key2->is_always())
+    // Case is symmetric to the one above, just flip parameters.
+    return key_or(param, key2, key1);
+
+  if (key1->root->part != key2->root->part ||
+      (key1->root->min_flag | key2->root->min_flag) & GEOM_FLAG) {
+    key1->free_tree();
+    key2->free_tree();
+    return nullptr;  // Can't optimize this
+  }
+
+  // If one of the key is MAYBE_KEY then the found region may be bigger
+  if (key1->type == SEL_ROOT::Type::MAYBE_KEY) {
+    key2->free_tree();
+    return key1;
+  }
+  if (key2->type == SEL_ROOT::Type::MAYBE_KEY) {
+    key1->free_tree();
+    return key2;
+  }
+
+  // (cond) OR (IMPOSSIBLE) <=> (cond).
+  if (key1->type == SEL_ROOT::Type::IMPOSSIBLE) {
+    key1->free_tree();
+    return key2;
+  }
+  if (key2->type == SEL_ROOT::Type::IMPOSSIBLE) {
+    key2->free_tree();
+    return key1;
+  }
+
+  /*
+    We need to modify one of key1 or key2 (whichever we choose, we will
+    call it key1 afterwards). If either is used only by us (use_count == 0),
+    we can use that directly. If not, we need to clone one of them; we pick
+    the one with the fewest elements since that is the cheapest.
+  */
+  if (key1->use_count > 0) {
+    if (key2->use_count == 0 || key1->elements > key2->elements) {
+      std::swap(key1, key2);
+    }
+    if (key1->use_count > 0 && (key1 = key1->clone_tree(param)) == nullptr)
+      return nullptr;  // OOM
+  }
+  assert(key1->use_count == 0);
+
+  /*
+    Add tree at key2 to tree at key1. If key2 is used by nobody else,
+    we can cannibalize its nodes and add them directly into key1.
+    If not, we'll need to make copies of them.
+  */
+  const bool key2_shared = (key2->use_count != 0);
+  key1->root->maybe_flag |= key2->root->maybe_flag;
+
+  /*
+    Notation for illustrations used in the rest of this function:
+
+      Range: [--------]
+             ^        ^
+             start    stop
+
+      Two overlapping ranges:
+        [-----]               [----]            [--]
+            [---]     or    [---]       or   [-------]
+
+      Ambiguity: ***
+        The range starts or stops somewhere in the "***" range.
+        Example: a starts before b and may end before/the same place/after b
+        a: [----***]
+        b:   [---]
+
+      Adjacent ranges:
+        Ranges that meet but do not overlap. Example: a = "x < 3", b = "x >= 3"
+        a: ----]
+        b:      [----
+  */
+
+  SEL_ARG *cur_key2 = key2->root->first();
+  while (cur_key2) {
+    /*
+      key1 consists of one or more ranges. cur_key1 is the
+      range currently being handled.
+
+      initialize cur_key1 to the latest range in key1 that starts the
+      same place or before the range in cur_key2 starts
+
+      cur_key2:            [------]
+      key1:      [---] [-----] [----]
+                       ^
+                       cur_key1
+    */
+    SEL_ARG *cur_key1 = key1->find_range(cur_key2);
+
+    /*
+      Used to describe how two key values are positioned compared to
+      each other. Consider key_value_a.<cmp_func>(key_value_b):
+
+        -2: key_value_a is smaller than key_value_b, and they are adjacent
+        -1: key_value_a is smaller than key_value_b (not adjacent)
+         0: the key values are equal
+         1: key_value_a is bigger than key_value_b (not adjacent)
+         2: key_value_a is bigger than key_value_b, and they are adjacent
+
+      Example: "cmp= cur_key1->cmp_max_to_min(cur_key2)"
+
+      cur_key2:          [--------           (10 <= x ...  )
+      cur_key1:    -----]                    (  ... x <  10) => cmp==-2
+      cur_key1:    ----]                     (  ... x <   9) => cmp==-1
+      cur_key1:    ------]                   (  ... x <= 10) => cmp== 0
+      cur_key1:    --------]                 (  ... x <= 12) => cmp== 1
+      (cmp == 2 does not make sense for cmp_max_to_min())
+    */
+    int cmp = 0;
+
+    if (!cur_key1) {
+      /*
+        The range in cur_key2 starts before the first range in key1. Use
+        the first range in key1 as cur_key1.
+
+        cur_key2: [--------]
+        key1:            [****--] [----]   [-------]
+                         ^
+                         cur_key1
+      */
+      cur_key1 = key1->root->first();
+      cmp = -1;
+    } else if ((cmp = cur_key1->cmp_max_to_min(cur_key2)) < 0) {
+      /*
+        This is the case:
+        cur_key2:           [-------]
+        cur_key1:   [----**]
+      */
+      SEL_ARG *next_key1 = cur_key1->next;
+      if (cmp == -2 &&
+          eq_tree(cur_key1->next_key_part, cur_key2->next_key_part)) {
+        /*
+          Adjacent (cmp==-2) and equal next_key_parts => ranges can be merged
+
+          This is the case:
+          cur_key2:           [-------]
+          cur_key1:     [----]
+
+          Result:
+          cur_key2:     [-------------]     => inserted into key1 below
+          cur_key1:                         => deleted
+        */
+        SEL_ARG *next_key2 = cur_key2->next;
+        if (key2_shared) {
+          if (!(cur_key2 = new (param->temp_mem_root) SEL_ARG(*cur_key2)))
+            return nullptr;            // out of memory
+          cur_key2->next = next_key2;  // New copy of cur_key2
+        }
+
+        if (cur_key2->copy_min(cur_key1)) {
+          // cur_key2 is full range: [-inf <= cur_key2 <= +inf]
+          key1->free_tree();
+          key2->free_tree();
+          if (key1->root->maybe_flag)
+            return new (param->temp_mem_root)
+                SEL_ROOT(param->temp_mem_root, SEL_ROOT::Type::MAYBE_KEY);
+          return nullptr;
+        }
+
+        key1->tree_delete(cur_key1);
+        if (key1->type == SEL_ROOT::Type::IMPOSSIBLE) {
+          /*
+            cur_key1 was the last range in key1; move the cur_key2
+            range that was merged above to key1
+          */
+          key1->insert(cur_key2);
+          cur_key2 = next_key2;
+          break;
+        }
+      }
+      // Move to next range in key1. Now cur_key1.min > cur_key2.min
+      if (!(cur_key1 = next_key1))
+        break;  // No more ranges in key1. Copy rest of key2
+    }
+
+    if (cmp < 0) {
+      /*
+        This is the case:
+        cur_key2:   [--***]
+        cur_key1:       [----]
+      */
+      int cur_key1_cmp;
+      if ((cur_key1_cmp = cur_key1->cmp_min_to_max(cur_key2)) > 0) {
+        /*
+          This is the case:
+          cur_key2:  [------**]
+          cur_key1:            [----]
+        */
+        if (cur_key1_cmp == 2 &&
+            eq_tree(cur_key1->next_key_part, cur_key2->next_key_part)) {
+          /*
+            Adjacent ranges with equal next_key_part. Merge like this:
+
+            This is the case:
+            cur_key2:    [------]
+            cur_key1:            [-----]
+
+            Result:
+            cur_key2:    [------]
+            cur_key1:    [-------------]
+
+            Then move on to next key2 range.
+          */
+          cur_key1->copy_min_to_min(cur_key2);
+          key1->root->merge_flags(cur_key2);  // should be cur_key1->merge...()
+                                              // ?
+          if (cur_key1->min_flag & NO_MIN_RANGE &&
+              cur_key1->max_flag & NO_MAX_RANGE) {
+            key1->free_tree();
+            key2->free_tree();
+            if (key1->root->maybe_flag)
+              return new (param->temp_mem_root)
+                  SEL_ROOT(param->temp_mem_root, SEL_ROOT::Type::MAYBE_KEY);
+            return nullptr;
+          }
+          cur_key2->release_next_key_part();  // Free not used tree
+          cur_key2 = cur_key2->next;
+          continue;
+        } else {
+          /*
+            cur_key2 not adjacent to cur_key1 or has different next_key_part.
+            Insert into key1 and move to next range in key2
+
+            This is the case:
+            cur_key2:   [------**]
+            cur_key1:             [----]
+
+            Result:
+            key1:       [------**][----]
+                        ^         ^
+                        insert    cur_key1
+          */
+          SEL_ARG *next_key2 = cur_key2->next;
+          if (key2_shared) {
+            SEL_ARG *cpy = new (param->temp_mem_root)
+                SEL_ARG(*cur_key2);    // Must make copy
+            if (!cpy) return nullptr;  // OOM
+            key1->insert(cpy);
+          } else
+            key1->insert(cur_key2);
+          cur_key2 = next_key2;
+          continue;
+        }
+      }
+    }
+
+    /*
+      The ranges in cur_key1 and cur_key2 are overlapping:
+
+      cur_key2:       [----------]
+      cur_key1:    [*****-----*****]
+
+      Corollary: cur_key1.min <= cur_key2.max
+    */
+    if (eq_tree(cur_key1->next_key_part, cur_key2->next_key_part)) {
+      // Merge overlapping ranges with equal next_key_part
+      if (cur_key1->is_same(cur_key2)) {
+        /*
+          cur_key1 covers exactly the same range as cur_key2
+          Use the relevant range in key1.
+        */
+        cur_key1->merge_flags(cur_key2);    // Copy maybe flags
+        cur_key2->release_next_key_part();  // Free not used tree
+        // Move to the next range in cur_key2
+        cur_key2 = cur_key2->next;
+        continue;
+      } else {
+        SEL_ARG *last = cur_key1;
+        SEL_ARG *first = cur_key1;
+
+        /*
+          Find the last range in key1 that overlaps cur_key2 and
+          where all ranges first...last have the same next_key_part as
+          cur_key2.
+
+          cur_key2:  [****----------------------*******]
+          key1:         [--]  [----] [---]  [-----] [xxxx]
+                        ^                   ^       ^
+                        first               last    different next_key_part
+
+          Since cur_key2 covers them, the ranges between first and last
+          are merged into one range by deleting first...last-1 from
+          the key1 tree. In the figure, this applies to first and the
+          two consecutive ranges. The range of last is then extended:
+            * last.min: Set to min(cur_key2.min, first.min)
+            * last.max: If there is a last->next that overlaps cur_key2
+                        (i.e., last->next has a different next_key_part):
+                                        Set adjacent to last->next.min
+                        Otherwise:      Set to max(cur_key2.max, last.max)
+
+          Result:
+          cur_key2:  [****----------------------*******]
+                        [--]  [----] [---]                 => deleted from key1
+          key1:      [**------------------------***][xxxx]
+                     ^                              ^
+                     cur_key1=last                  different next_key_part
+        */
+        while (last->next && last->next->cmp_min_to_max(cur_key2) <= 0 &&
+               eq_tree(last->next->next_key_part, cur_key2->next_key_part)) {
+          /*
+            last->next is covered by cur_key2 and has same next_key_part.
+            last can be deleted
+          */
+          SEL_ARG *save = last;
+          last = last->next;
+          key1->tree_delete(save);
+        }
+        // Redirect cur_key1 to last which will cover the entire range
+        cur_key1 = last;
+
+        /*
+          Extend last to cover the entire range of
+          [min(first.min_value,cur_key2.min_value)...last.max_value].
+          If this forms a full range (the range covers all possible
+          values) we return no SEL_ARG RB-tree.
+        */
+        bool full_range = last->copy_min(first);
+        if (!full_range) full_range = last->copy_min(cur_key2);
+
+        if (!full_range) {
+          if (last->next && cur_key2->cmp_max_to_min(last->next) >= 0) {
+            /*
+              This is the case:
+              cur_key2:   [-------------]
+              key1:     [***------]  [xxxx]
+                        ^            ^
+                        last         different next_key_part
+
+              Extend range of last up to last->next:
+              cur_key2:   [-------------]
+              key1:     [***--------][xxxx]
+            */
+            last->copy_min_to_max(last->next);
+          } else
+            /*
+              This is the case:
+              cur_key2:   [--------*****]
+              key1:     [***---------]    [xxxx]
+                        ^                 ^
+                        last              different next_key_part
+
+              Extend range of last up to max(last.max, cur_key2.max):
+              cur_key2:   [--------*****]
+              key1:     [***----------**] [xxxx]
+            */
+            full_range = last->copy_max(cur_key2);
+        }
+        if (full_range) {  // Full range
+          key1->free_tree();
+          cur_key2->release_next_key_part();
+          if (key1->root->maybe_flag)
+            return new (param->temp_mem_root)
+                SEL_ROOT(param->temp_mem_root, SEL_ROOT::Type::MAYBE_KEY);
+          return nullptr;
+        }
+      }
+    }
+
+    if (cmp >= 0 && cur_key1->cmp_min_to_min(cur_key2) < 0) {
+      /*
+        This is the case ("cmp>=0" means that cur_key1.max >= cur_key2.min):
+        cur_key2:                [-------]
+        cur_key1:         [----------*******]
+      */
+
+      if (!cur_key1->next_key_part) {
+        /*
+          cur_key1->next_key_part is empty: cut the range that
+          is covered by cur_key1 from cur_key2.
+          Reason: (cur_key2->next_key_part OR
+          cur_key1->next_key_part) will be empty and therefore
+          equal to cur_key1->next_key_part. Thus, this part of
+          the cur_key2 range is completely covered by cur_key1.
+        */
+        if (cur_key1->cmp_max_to_max(cur_key2) >= 0) {
+          /*
+            cur_key1 covers the entire range in cur_key2.
+            cur_key2:            [-------]
+            cur_key1:     [-----------------]
+
+            Move on to next range in key2
+          */
+          cur_key2 = cur_key2->next;
+          continue;
+        } else {
+          /*
+            This is the case:
+            cur_key2:            [-------]
+            cur_key1:     [---------]
+
+            Result:
+            cur_key2:                [---]
+            cur_key1:     [---------]
+          */
+          cur_key2->copy_max_to_min(cur_key1);
+          // FIXME: what if key2_shared?
+          continue;
+        }
+      }
+
+      /*
+        The ranges are overlapping but have not been merged because
+        next_key_part of cur_key1 and cur_key2 differ.
+        cur_key2:               [----]
+        cur_key1:     [------------*****]
+
+        Split cur_key1 in two where cur_key2 starts:
+        cur_key2:               [----]
+        key1:         [--------][--*****]
+                      ^         ^
+                      insert    cur_key1
+      */
+      SEL_ARG *new_arg = cur_key1->clone_first(cur_key2, param->temp_mem_root);
+      if (!new_arg) return nullptr;  // OOM
+      new_arg->set_next_key_part(cur_key1->next_key_part);
+      cur_key1->copy_min_to_min(cur_key2);
+      key1->insert(new_arg);
+    }  // cur_key1.min >= cur_key2.min due to this if()
+
+    /*
+      Now cur_key2.min <= cur_key1.min <= cur_key2.max:
+      cur_key2:    [---------]
+      cur_key1:    [****---*****]
+    */
+
+    /*
+      Get a copy we can modify. Note that this will keep an extra reference
+      to its next_key_part (if any), but the destructor will clean that up
+      when we exit from the function. key2_cpy is ephemeral and will not be
+      inserted in any tree, although copies of it might be.
+    */
+    SEL_ARG key2_cpy(*cur_key2);
+
+    for (;;) {
+      if (cur_key1->cmp_min_to_min(&key2_cpy) > 0) {
+        /*
+          This is the case:
+          key2_cpy:    [------------]
+          key1:                 [-*****]
+                                ^
+                                cur_key1
+
+          Result:
+          key2_cpy:             [---]
+          key1:        [-------][-*****]
+                       ^        ^
+                       insert   cur_key1
+        */
+        SEL_ARG *new_arg = key2_cpy.clone_first(cur_key1, param->temp_mem_root);
+        if (!new_arg) return nullptr;  // OOM
+        new_arg->set_next_key_part(key2_cpy.next_key_part);
+        key1->insert(new_arg);
+        key2_cpy.copy_min_to_min(cur_key1);
+      }
+      // Now key2_cpy.min == cur_key1.min
+
+      if ((cmp = cur_key1->cmp_max_to_max(&key2_cpy)) <= 0) {
+        /*
+          cur_key1.max <= key2_cpy.max:
+          key2_cpy:       a)  [-------]    or b)     [----]
+          cur_key1:           [----]                 [----]
+
+          Steps:
+
+           1) Update next_key_part of cur_key1: OR it with
+              key2_cpy->next_key_part.
+           2) If case a: Insert range [cur_key1.max, key2_cpy.max]
+              into key1 using next_key_part of key2_cpy
+
+           Result:
+           key1:          a)  [----][-]    or b)     [----]
+        */
+        cur_key1->maybe_flag |= key2_cpy.maybe_flag;
+        cur_key1->set_next_key_part(key_or(
+            param, cur_key1->release_next_key_part(), key2_cpy.next_key_part));
+
+        if (!cmp) break;  // case b: done with this key2 range
+
+        // Make key2_cpy the range [cur_key1.max, key2_cpy.max]
+        key2_cpy.copy_max_to_min(cur_key1);
+        if (!(cur_key1 = cur_key1->next)) {
+          /*
+            No more ranges in key1. Insert key2_cpy and go to "end"
+            label to insert remaining ranges in key2 if any.
+          */
+          SEL_ARG *new_key1_range =
+              new (param->temp_mem_root) SEL_ARG(key2_cpy);
+          if (!new_key1_range) return nullptr;  // OOM
+          key1->insert(new_key1_range);
+          cur_key2 = cur_key2->next;
+          goto end;
+        }
+        if (cur_key1->cmp_min_to_max(&key2_cpy) > 0) {
+          /*
+            The next range in key1 does not overlap with key2_cpy.
+            Insert this range into key1 and move on to the next range
+            in key2.
+          */
+          SEL_ARG *new_key1_range =
+              new (param->temp_mem_root) SEL_ARG(key2_cpy);
+          if (!new_key1_range) return nullptr;  // OOM
+          key1->insert(new_key1_range);
+          break;
+        }
+        /*
+          key2_cpy overlaps with the next range in key1 and the case
+          is now "cur_key2.min <= cur_key1.min <= cur_key2.max". Go back
+          to for(;;) to handle this situation.
+        */
+        continue;
+      } else {
+        /*
+          This is the case:
+          key2_cpy:        [-------]
+          cur_key1:        [------------]
+
+          Result:
+          key1:            [-------][---]
+                           ^        ^
+                           new_arg  cur_key1
+          Steps:
+
+           0) If cur_key1->next_key_part is empty: do nothing.
+              Reason: (key2_cpy->next_key_part OR
+              cur_key1->next_key_part) will be empty and
+              therefore equal to cur_key1->next_key_part. Thus,
+              the range in key2_cpy is completely covered by
+              cur_key1
+           1) Make new_arg with range [cur_key1.min, key2_cpy.max].
+              new_arg->next_key_part is OR between next_key_part of
+              cur_key1 and key2_cpy
+           2) Make cur_key1 the range [key2_cpy.max, cur_key1.max]
+           3) Insert new_arg into key1
+        */
+        if (!cur_key1->next_key_part)  // Step 0
+        {
+          key2_cpy.release_next_key_part();  // Free not used tree
+          break;
+        }
+        SEL_ARG *new_arg =
+            cur_key1->clone_last(&key2_cpy, param->temp_mem_root);
+        if (!new_arg) return nullptr;  // OOM
+        cur_key1->copy_max_to_min(&key2_cpy);
+
+        new_arg->set_next_key_part(
+            key_or(param, cur_key1->next_key_part, key2_cpy.next_key_part));
+        key1->insert(new_arg);
+        break;
+      }
+    }
+    // Move on to next range in key2
+    cur_key2 = cur_key2->next;
+  }
+
+end:
+  /*
+    Add key2 ranges that are non-overlapping with and higher than the
+    highest range in key1.
+  */
+  while (cur_key2) {
+    SEL_ARG *next = cur_key2->next;
+    if (key2_shared) {
+      SEL_ARG *key2_cpy =
+          new (param->temp_mem_root) SEL_ARG(*cur_key2);  // Must make copy
+      if (!key2_cpy) return nullptr;
+      key1->insert(key2_cpy);
+    } else
+      key1->insert(cur_key2);
+    cur_key2 = next;
+  }
+
+  /*
+    TODO: We should call key2->free_tree() here, since this might be the
+    last reference to the tree (if !key2_shared). However, the tree might
+    be in an invalid state since we may have inserted nodes into key1 without
+    taking them out of key2, so we need to clean that up first. As a temporary
+    measure, we TRASH() it to expose any bugs where people hold on to it
+    where we thought they wouldn't.
+  */
+#ifndef NDEBUG
+  if (!key2_shared) TRASH(key2, sizeof(*key2));
+#endif
+  return key1;
+}
+
+/**
+  Compare if two trees are equal, recursively (not necessarily the same
+  elements, but in terms of structure and values in each leaf).
+
+  NOTE: The demand for the same structure means that some trees that are
+  equivalent could be deemed inequal by this function, depending on insertion
+  order.
+
+  @param a First tree to compare.
+  @param b Second tree to compare.
+
+  @return true iff they are equivalent.
+*/
+static bool eq_tree(const SEL_ROOT *a, const SEL_ROOT *b) {
+  if (a == b) return true;
+  if (!a || !b) return false;
+  if (a->type == SEL_ROOT::Type::KEY_RANGE &&
+      b->type == SEL_ROOT::Type::KEY_RANGE)
+    return eq_tree(a->root, b->root);
+  else
+    return a->type == b->type;
+}
+
+static bool eq_tree(const SEL_ARG *a, const SEL_ARG *b) {
+  if (a == b) return true;
+  if (!a || !b || !a->is_same(b)) return false;
+  if (a->left != null_element && b->left != null_element) {
+    if (!eq_tree(a->left, b->left)) return false;
+  } else if (a->left != null_element || b->left != null_element)
+    return false;
+  if (a->right != null_element && b->right != null_element) {
+    if (!eq_tree(a->right, b->right)) return false;
+  } else if (a->right != null_element || b->right != null_element)
+    return false;
+  if (a->next_key_part != b->next_key_part) {  // Sub range
+    if (!a->next_key_part != !b->next_key_part ||
+        !eq_tree(a->next_key_part, b->next_key_part))
+      return false;
+  }
+  return true;
+}
+
+void SEL_ROOT::insert(SEL_ARG *key) {
+  SEL_ARG *element, **par = nullptr, *last_element = nullptr;
+
+  if (type == Type::IMPOSSIBLE) {
+    /*
+      Used to be impossible, but now gets a new range; remove the dummy node
+      that exists in that kind of tree, and set this one as the root
+      (and sole element) instead.
+    */
+    root->release_next_key_part();
+    uint8 maybe_flag = root->maybe_flag;
+    root = key;
+    root->maybe_flag = maybe_flag;
+    root->make_root();
+    type = Type::KEY_RANGE;
+    return;
+  }
+
+  assert(type == Type::KEY_RANGE);
+  assert(root->parent == nullptr);
+  assert(root != null_element);
+  for (element = root; element != null_element;) {
+    last_element = element;
+    if (key->cmp_min_to_min(element) > 0) {
+      par = &element->right;
+      element = element->right;
+    } else {
+      par = &element->left;
+      element = element->left;
+    }
+  }
+  *par = key;
+  key->parent = last_element;
+  /* Link in list */
+  if (par == &last_element->left) {
+    key->next = last_element;
+    if ((key->prev = last_element->prev)) key->prev->next = key;
+    last_element->prev = key;
+  } else {
+    if ((key->next = last_element->next)) key->next->prev = key;
+    key->prev = last_element;
+    last_element->next = key;
+  }
+  key->left = key->right = null_element;
+  uint8 maybe_flag = root->maybe_flag;
+  root = root->rb_insert(key);  // rebalance tree
+  root->maybe_flag = maybe_flag;
+  ++elements;
+}
+
+SEL_ARG *SEL_ROOT::find_range(const SEL_ARG *key) const {
+  SEL_ARG *element = root, *found = nullptr;
+
+  for (;;) {
+    if (element == null_element) return found;
+    int cmp = element->cmp_min_to_min(key);
+    if (cmp == 0) return element;
+    if (cmp < 0) {
+      found = element;
+      element = element->right;
+    } else
+      element = element->left;
+  }
+}
+
+/*
+  Remove a element from the tree
+
+  SYNOPSIS
+    tree_delete()
+    key		Key that is to be deleted from tree (this)
+
+  NOTE
+    This also frees all sub trees that is used by the element
+
+*/
+
+void SEL_ROOT::tree_delete(SEL_ARG *key) {
+  enum SEL_ARG::leaf_color remove_color;
+  SEL_ARG *nod, **par, *fix_par;
+  DBUG_TRACE;
+
+  assert(this->type == Type::KEY_RANGE);
+  assert(this->root->parent == nullptr);
+
+  /*
+    If deleting the last element, we are now of type IMPOSSIBLE.
+    Keep the element around so that we have somewhere to store
+    next_key_part etc. if needed in the future.
+  */
+  if (elements == 1) {
+    assert(key == root);
+    type = Type::IMPOSSIBLE;
+    key->release_next_key_part();
+    return;
+  }
+
+  /* Unlink from list */
+  if (key->prev) key->prev->next = key->next;
+  if (key->next) key->next->prev = key->prev;
+  if (key->next_key_part) --key->next_key_part->use_count;
+  if (!key->parent)
+    par = &root;
+  else
+    par = key->parent_ptr();
+
+  if (key->left == null_element) {
+    *par = nod = key->right;
+    fix_par = key->parent;
+    if (nod != null_element) nod->parent = fix_par;
+    remove_color = key->color;
+  } else if (key->right == null_element) {
+    *par = nod = key->left;
+    nod->parent = fix_par = key->parent;
+    remove_color = key->color;
+  } else {
+    SEL_ARG *tmp = key->next;               // next bigger key (exist!)
+    nod = *tmp->parent_ptr() = tmp->right;  // unlink tmp from tree
+    fix_par = tmp->parent;
+    if (nod != null_element) nod->parent = fix_par;
+    remove_color = tmp->color;
+
+    tmp->parent = key->parent;  // Move node in place of key
+    (tmp->left = key->left)->parent = tmp;
+    if ((tmp->right = key->right) != null_element) tmp->right->parent = tmp;
+    tmp->color = key->color;
+    *par = tmp;
+    if (fix_par == key)  // key->right == key->next
+      fix_par = tmp;     // new parent of nod
+  }
+
+  --elements;
+  if (root == null_element) return;  // Maybe root later
+  if (remove_color == SEL_ARG::BLACK) {
+    uint8 maybe_flag = root->maybe_flag;
+    root = rb_delete_fixup(root, nod, fix_par);
+    root->maybe_flag = maybe_flag;
+  }
+#ifndef NDEBUG
+  test_rb_tree(root, root->parent);
+#endif
+}
+
+/* Functions to fix up the tree after insert and delete */
+
+static void left_rotate(SEL_ARG **root, SEL_ARG *leaf) {
+  SEL_ARG *y = leaf->right;
+  leaf->right = y->left;
+  if (y->left != null_element) y->left->parent = leaf;
+  if (!(y->parent = leaf->parent))
+    *root = y;
+  else
+    *leaf->parent_ptr() = y;
+  y->left = leaf;
+  leaf->parent = y;
+}
+
+static void right_rotate(SEL_ARG **root, SEL_ARG *leaf) {
+  SEL_ARG *y = leaf->left;
+  leaf->left = y->right;
+  if (y->right != null_element) y->right->parent = leaf;
+  if (!(y->parent = leaf->parent))
+    *root = y;
+  else
+    *leaf->parent_ptr() = y;
+  y->right = leaf;
+  leaf->parent = y;
+}
+
+SEL_ARG *SEL_ARG::rb_insert(SEL_ARG *leaf) {
+  SEL_ARG *y, *par, *par2, *root;
+  root = this;
+  assert(!root->parent);
+  assert(root->color == BLACK);
+
+  leaf->color = RED;
+  while (leaf != root && (par = leaf->parent)->color ==
+                             RED) {  // This can't be root or 1 level under
+    assert(leaf->parent->parent);
+    if (par == (par2 = leaf->parent->parent)->left) {
+      y = par2->right;
+      if (y->color == RED) {
+        par->color = BLACK;
+        y->color = BLACK;
+        leaf = par2;
+        leaf->color = RED; /* And the loop continues */
+      } else {
+        if (leaf == par->right) {
+          left_rotate(&root, leaf->parent);
+          par = leaf; /* leaf is now parent to old leaf */
+        }
+        par->color = BLACK;
+        par2->color = RED;
+        right_rotate(&root, par2);
+        break;
+      }
+    } else {
+      y = par2->left;
+      if (y->color == RED) {
+        par->color = BLACK;
+        y->color = BLACK;
+        leaf = par2;
+        leaf->color = RED; /* And the loop continues */
+      } else {
+        if (leaf == par->left) {
+          right_rotate(&root, par);
+          par = leaf;
+        }
+        par->color = BLACK;
+        par2->color = RED;
+        left_rotate(&root, par2);
+        break;
+      }
+    }
+  }
+  root->color = BLACK;
+#ifndef NDEBUG
+  test_rb_tree(root, root->parent);
+#endif
+  return root;
+}
+
+SEL_ARG *rb_delete_fixup(SEL_ARG *root, SEL_ARG *key, SEL_ARG *par) {
+  SEL_ARG *x, *w;
+  root->parent = nullptr;
+
+  x = key;
+  while (x != root && x->color == SEL_ARG::BLACK) {
+    if (x == par->left) {
+      w = par->right;
+      if (w->color == SEL_ARG::RED) {
+        w->color = SEL_ARG::BLACK;
+        par->color = SEL_ARG::RED;
+        left_rotate(&root, par);
+        w = par->right;
+      }
+      if (w->left->color == SEL_ARG::BLACK &&
+          w->right->color == SEL_ARG::BLACK) {
+        w->color = SEL_ARG::RED;
+        x = par;
+      } else {
+        if (w->right->color == SEL_ARG::BLACK) {
+          w->left->color = SEL_ARG::BLACK;
+          w->color = SEL_ARG::RED;
+          right_rotate(&root, w);
+          w = par->right;
+        }
+        w->color = par->color;
+        par->color = SEL_ARG::BLACK;
+        w->right->color = SEL_ARG::BLACK;
+        left_rotate(&root, par);
+        x = root;
+        break;
+      }
+    } else {
+      w = par->left;
+      if (w->color == SEL_ARG::RED) {
+        w->color = SEL_ARG::BLACK;
+        par->color = SEL_ARG::RED;
+        right_rotate(&root, par);
+        w = par->left;
+      }
+      if (w->right->color == SEL_ARG::BLACK &&
+          w->left->color == SEL_ARG::BLACK) {
+        w->color = SEL_ARG::RED;
+        x = par;
+      } else {
+        if (w->left->color == SEL_ARG::BLACK) {
+          w->right->color = SEL_ARG::BLACK;
+          w->color = SEL_ARG::RED;
+          left_rotate(&root, w);
+          w = par->left;
+        }
+        w->color = par->color;
+        par->color = SEL_ARG::BLACK;
+        w->left->color = SEL_ARG::BLACK;
+        right_rotate(&root, par);
+        x = root;
+        break;
+      }
+    }
+    par = x->parent;
+  }
+  x->color = SEL_ARG::BLACK;
+  return root;
+}
+
+#ifndef NDEBUG
+/* Test that the properties for a red-black tree hold */
+
+int test_rb_tree(SEL_ARG *element, SEL_ARG *parent) {
+  int count_l, count_r;
+
+  if (element == null_element) return 0;  // Found end of tree
+  if (element->parent != parent) {
+    LogErr(ERROR_LEVEL, ER_TREE_CORRUPT_PARENT_SHOULD_POINT_AT_PARENT);
+    return -1;
+  }
+  if (!parent && element->color != SEL_ARG::BLACK) {
+    LogErr(ERROR_LEVEL, ER_TREE_CORRUPT_ROOT_SHOULD_BE_BLACK);
+    return -1;
+  }
+  if (element->color == SEL_ARG::RED &&
+      (element->left->color == SEL_ARG::RED ||
+       element->right->color == SEL_ARG::RED)) {
+    LogErr(ERROR_LEVEL, ER_TREE_CORRUPT_2_CONSECUTIVE_REDS);
+    return -1;
+  }
+  if (element->left == element->right &&
+      element->left != null_element) {  // Dummy test
+    LogErr(ERROR_LEVEL, ER_TREE_CORRUPT_RIGHT_IS_LEFT);
+    return -1;
+  }
+  count_l = test_rb_tree(element->left, element);
+  count_r = test_rb_tree(element->right, element);
+  if (count_l >= 0 && count_r >= 0) {
+    if (count_l == count_r) return count_l + (element->color == SEL_ARG::BLACK);
+    LogErr(ERROR_LEVEL, ER_TREE_CORRUPT_INCORRECT_BLACK_COUNT, count_l,
+           count_r);
+  }
+  return -1;  // Error, no more warnings
+}
+#endif
+
+/**
+  Count how many times SEL_ARG graph "root" refers to its part "key" via
+  transitive closure.
+
+  @param root  An RB-Root node in a SEL_ARG graph.
+  @param key   Another RB-Root node in that SEL_ARG graph.
+  @param seen  Which SEL_ARGs we have already seen in this traversal.
+               Used for deduplication, so that we only count each
+               SEL_ARG once.
+
+  The passed "root" node may refer to "key" node via root->next_key_part,
+  root->next->n
+
+  This function counts how many times the node "key" is referred (via
+  SEL_ARG::next_key_part) by
+  - intervals of RB-tree pointed by "root",
+  - intervals of RB-trees that are pointed by SEL_ARG::next_key_part from
+  intervals of RB-tree pointed by "root",
+  - and so on.
+
+  Here is an example (horizontal links represent next_key_part pointers,
+  vertical links - next/prev prev pointers):
+
+         +----+               $
+         |root|-----------------+
+         +----+               $ |
+           |                  $ |
+           |                  $ |
+         +----+       +---+   $ |     +---+    Here the return value
+         |    |- ... -|   |---$-+--+->|key|    will be 4.
+         +----+       +---+   $ |  |  +---+
+           |                  $ |  |
+          ...                 $ |  |
+           |                  $ |  |
+         +----+   +---+       $ |  |
+         |    |---|   |---------+  |
+         +----+   +---+       $    |
+           |        |         $    |
+          ...     +---+       $    |
+                  |   |------------+
+                  +---+       $
+  @return
+  Number of links to "key" from nodes reachable from "root".
+*/
+
+static ulong count_key_part_usage(const SEL_ROOT *root, const SEL_ROOT *key,
+                                  std::set<const SEL_ROOT *> *seen) {
+  // Don't count paths from a given key twice.
+  if (seen->count(root)) return 0;
+  seen->insert(root);
+  ulong count = 0;
+  for (SEL_ARG *node = root->root->first(); node; node = node->next) {
+    if (node->next_key_part) {
+      if (node->next_key_part == key) count++;
+      if (node->next_key_part->root->part < key->root->part)
+        count += count_key_part_usage(node->next_key_part, key, seen);
+    }
+  }
+  return count;
+}
+
+bool SEL_ROOT::test_use_count(const SEL_ROOT *origin) const {
+  uint e_count = 0;
+  if (this == origin && use_count != 1) {
+    LogErr(INFORMATION_LEVEL, ER_WRONG_COUNT_FOR_ORIGIN, use_count, this);
+    assert(false);
+    return true;
+  }
+  if (type != SEL_ROOT::Type::KEY_RANGE) return false;
+  for (SEL_ARG *pos = root->first(); pos; pos = pos->next) {
+    e_count++;
+    if (pos->next_key_part) {
+      std::set<const SEL_ROOT *> seen;
+      ulong count = count_key_part_usage(origin, pos->next_key_part, &seen);
+      /*
+        This cannot be a strict equality test, since there might be
+        connections from the keys[] array that we don't see.
+      */
+      if (count > pos->next_key_part->use_count) {
+        LogErr(INFORMATION_LEVEL, ER_WRONG_COUNT_FOR_KEY, pos->next_key_part,
+               pos->next_key_part->use_count, count);
+        assert(false);
+        return true;
+      }
+      pos->next_key_part->test_use_count(origin);
+    }
+  }
+  if (e_count != elements) {
+    LogErr(WARNING_LEVEL, ER_WRONG_COUNT_OF_ELEMENTS, e_count, elements, this);
+    assert(false);
+    return true;
+  }
+  return false;
+}
+
+bool get_sel_root_for_keypart(uint key_part_num, SEL_ROOT *keypart_tree,
+                              SEL_ROOT **cur_range) {
+  if (keypart_tree == nullptr) return false;
+  if (keypart_tree->type != SEL_ROOT::Type::KEY_RANGE) {
+    /*
+      A range predicate not usable by Loose Index Scan is found.
+      Predicates for keypart 'keypart_tree->root->part' and later keyparts
+      cannot be used.
+    */
+    *cur_range = keypart_tree;
+    return false;
+  }
+  if (keypart_tree->root->part == key_part_num) {
+    *cur_range = keypart_tree;
+    return false;
+  }
+
+  SEL_ROOT *tree_first_range = nullptr;
+  SEL_ARG *first_kp = keypart_tree->root->first();
+
+  for (SEL_ARG *cur_kp = first_kp; cur_kp; cur_kp = cur_kp->next) {
+    SEL_ROOT *curr_tree = nullptr;
+    if (cur_kp->next_key_part) {
+      if (get_sel_root_for_keypart(key_part_num, cur_kp->next_key_part,
+                                   &curr_tree))
+        return true;
+    }
+    /**
+      Check if the SEL_ARG tree for 'field' is identical for all ranges in
+      'keypart_tree'.
+    */
+    if (cur_kp == first_kp)
+      tree_first_range = curr_tree;
+    else if (!all_same(tree_first_range, curr_tree))
+      return true;
+  }
+  *cur_range = tree_first_range;
+  return false;
+}
+
+#ifndef NDEBUG
+void print_sel_tree(RANGE_OPT_PARAM *param, SEL_TREE *tree, Key_map *tree_map,
+                    const char *msg) {
+  char buff[1024];
+  DBUG_TRACE;
+
+  String tmp(buff, sizeof(buff), &my_charset_bin);
+  tmp.length(0);
+  for (uint idx = 0; idx < param->keys; idx++) {
+    if (tree_map->is_set(idx)) {
+      uint keynr = param->real_keynr[idx];
+      if (tmp.length()) tmp.append(',');
+      tmp.append(param->table->key_info[keynr].name);
+    }
+  }
+  if (!tmp.length()) tmp.append(STRING_WITH_LEN("(empty)"));
+
+  DBUG_PRINT("info", ("SEL_TREE: %p (%s)  scans: %s", tree, msg, tmp.ptr()));
+}
+#endif
diff -Nru mysql-8.0-8.0.26/sql/range_optimizer/tree.h mysql-8.0-8.0.27/sql/range_optimizer/tree.h
--- mysql-8.0-8.0.26/sql/range_optimizer/tree.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/range_optimizer/tree.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,1073 @@
+/* Copyright (c) 2000, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef SQL_RANGE_OPTIMIZER_TREE_H_
+#define SQL_RANGE_OPTIMIZER_TREE_H_
+
+#include <assert.h>
+#include <string.h>
+#include <sys/types.h>
+
+#include "my_alloc.h"
+#include "my_base.h"
+#include "my_inttypes.h"
+#include "sql/field.h"
+#include "sql/mem_root_array.h"
+#include "sql/range_optimizer/internal.h"
+#include "sql/range_optimizer/range_opt_param.h"
+#include "sql/sql_bitmap.h"
+#include "sql/sql_const.h"
+#include "sql/sql_list.h"
+
+class Cost_estimate;
+class SEL_ARG;
+class SEL_ROOT;
+class SEL_TREE;
+struct KEY_PART;
+struct ROR_SCAN_INFO;
+
+// Note: tree1 and tree2 are not usable by themselves after tree_and() or
+// tree_or().
+SEL_TREE *tree_and(RANGE_OPT_PARAM *param, SEL_TREE *tree1, SEL_TREE *tree2);
+SEL_TREE *tree_or(RANGE_OPT_PARAM *param, bool remove_jump_scans,
+                  SEL_TREE *tree1, SEL_TREE *tree2);
+SEL_ROOT *key_or(RANGE_OPT_PARAM *param, SEL_ROOT *key1, SEL_ROOT *key2);
+SEL_ROOT *key_and(RANGE_OPT_PARAM *param, SEL_ROOT *key1, SEL_ROOT *key2);
+
+bool sel_trees_can_be_ored(SEL_TREE *tree1, SEL_TREE *tree2,
+                           RANGE_OPT_PARAM *param);
+
+/**
+  A graph of (possible multiple) key ranges, represented as a red-black
+  binary tree. There are three types (see the Type enum); if KEY_RANGE,
+  we have zero or more SEL_ARGs, described in the documentation on SEL_ARG.
+
+  As a special case, a nullptr SEL_ROOT means a range that is always true.
+  This is true both for keys[] and next_key_part.
+*/
+class SEL_ROOT {
+ public:
+  /**
+    Used to indicate if the range predicate for an index is always
+    true/false, depends on values from other tables or can be
+    evaluated as is.
+  */
+  enum class Type {
+    /** The range predicate for this index is always false. */
+    IMPOSSIBLE,
+    /**
+      There is a range predicate that refers to another table. The
+      range access method cannot be used on this index unless that
+      other table is earlier in the join sequence. The bit
+      representing the index is set in JOIN_TAB::needed_reg to
+      notify the join optimizer that there is a table dependency.
+      After deciding on join order, the optimizer may chose to rerun
+      the range optimizer for tables with such dependencies.
+    */
+    MAYBE_KEY,
+    /**
+      There is a range condition that can be used on this index. The
+      range conditions for this index in stored in the SEL_ARG tree.
+    */
+    KEY_RANGE
+  } type;
+
+  /**
+    Constructs a tree of type KEY_RANGE, using the given root.
+    (The root is allowed to have children.)
+  */
+  SEL_ROOT(SEL_ARG *root);
+
+  /**
+    Used to construct MAYBE_KEY and IMPOSSIBLE SEL_ARGs.
+  */
+  SEL_ROOT(MEM_ROOT *memroot, Type type_arg);
+
+  /**
+    Note that almost all SEL_ROOTs are created on the MEM_ROOT,
+    so this destructor will only rarely be called.
+  */
+  ~SEL_ROOT() { assert(use_count == 0); }
+
+  /**
+    Returns true iff we have a single node that has no max nor min.
+    Note that by convention, a nullptr SEL_ROOT means the same.
+  */
+  bool is_always() const;
+
+  /**
+    Returns a number of keypart values appended to the key buffer
+    for min key and max key. This function is used by both Range
+    Analysis and Partition pruning. For partition pruning we have
+    to ensure that we don't store also subpartition fields. Thus
+    we have to stop at the last partition part and not step into
+    the subpartition fields. For Range Analysis we set last_part
+    to MAX_KEY which we should never reach.
+  */
+  int store_min_key(KEY_PART *key, uchar **range_key, uint *range_key_flag,
+                    uint last_part, bool start_key);
+
+  /* returns a number of keypart values appended to the key buffer */
+  int store_max_key(KEY_PART *key, uchar **range_key, uint *range_key_flag,
+                    uint last_part, bool start_key);
+
+  /**
+    Signal to the tree that the caller will shortly be dropping it
+    on the floor; if others are still using it, this is a no-op,
+    but if the caller was the last one, it is now an orphan, and
+    references from it should not count.
+  */
+  void free_tree();
+
+  /**
+    Insert the given node into the tree, and update the root.
+
+    @param key The node to insert.
+  */
+  void insert(SEL_ARG *key);
+
+  /**
+    Delete the given node from the tree, and update the root.
+
+    @param key The node to delete. Must exist in the tree.
+  */
+  void tree_delete(SEL_ARG *key);
+
+  /**
+    Find best key with min <= given key.
+    Because of the call context, this should never return nullptr to get_range.
+
+    @param key The key to search for.
+  */
+  SEL_ARG *find_range(const SEL_ARG *key) const;
+
+  /**
+    Create a new tree that's a duplicate of this one.
+
+    @param param The parameters for the new tree. Used to find out which
+      MEM_ROOT to allocate the new nodes on.
+
+    @return The new tree, or nullptr in case of out of memory.
+  */
+  SEL_ROOT *clone_tree(RANGE_OPT_PARAM *param) const;
+
+  /**
+    Check if SEL_ROOT::use_count value is correct. See the definition
+    of use_count for what is "correct".
+
+    @param root The origin tree of the SEL_ARG graph (an RB-tree that
+      has the least value of root->sel_root->root->part in the
+      entire graph, and thus is the "origin" of the graph)
+
+    @return true iff an incorrect SEL_ARG::use_count is found.
+  */
+  bool test_use_count(const SEL_ROOT *root) const;
+
+  /** Returns true iff this is a single-element, single-field predicate. */
+  inline bool simple_key() const;
+
+  /**
+    The root node of the tree. Note that this may change as the result
+    of rotations during insertions or deletions, so pointers should be
+    to the SEL_ROOT, not individual SEL_ARG nodes.
+
+    This element can never be nullptr, but can be null_element
+    if type == KEY_RANGE and the tree is empty (which then means the same as
+    type == IMPOSSIBLE).
+
+    If type == IMPOSSIBLE or type == MAYBE_KEY, there's a single root
+    element which only serves to hold next_key_part (we don't really care
+    about root->part in this case); the actual min/max values etc.
+    do not matter and should not be accessed.
+  */
+  SEL_ARG *root;
+
+  /**
+    Number of references to this SEL_ARG tree. References may be from
+    SEL_ARG::next_key_part of SEL_ARGs from earlier keyparts or
+    SEL_TREE::keys[i].
+
+    The SEL_ARG trees are re-used in a lazy-copy manner based on this
+    reference counting.
+  */
+  ulong use_count{0};
+
+  /**
+    Number of nodes in the RB-tree, not including sentinels.
+  */
+  uint16 elements{0};
+};
+
+int sel_cmp(Field *f, uchar *a, uchar *b, uint8 a_flag, uint8 b_flag);
+
+/**
+  A helper function to invert min flags to max flags for DESC key parts.
+  It changes NEAR_MIN, NO_MIN_RANGE to NEAR_MAX, NO_MAX_RANGE appropriately
+*/
+
+inline uint invert_min_flag(uint min_flag) {
+  uint max_flag_out = min_flag & ~(NEAR_MIN | NO_MIN_RANGE);
+  if (min_flag & NEAR_MIN) max_flag_out |= NEAR_MAX;
+  if (min_flag & NO_MIN_RANGE) max_flag_out |= NO_MAX_RANGE;
+  return max_flag_out;
+}
+
+/**
+  A helper function to invert max flags to min flags for DESC key parts.
+  It changes NEAR_MAX, NO_MAX_RANGE to NEAR_MIN, NO_MIN_RANGE appropriately
+*/
+
+inline uint invert_max_flag(uint max_flag) {
+  uint min_flag_out = max_flag & ~(NEAR_MAX | NO_MAX_RANGE);
+  if (max_flag & NEAR_MAX) min_flag_out |= NEAR_MIN;
+  if (max_flag & NO_MAX_RANGE) min_flag_out |= NO_MIN_RANGE;
+  return min_flag_out;
+}
+
+/*
+  A construction block of the SEL_ARG-graph.
+
+  One SEL_ARG object represents an "elementary interval" in form
+
+      min_value <=?  table.keypartX  <=? max_value
+
+  The interval is a non-empty interval of any kind: with[out] minimum/maximum
+  bound, [half]open/closed, single-point interval, etc.
+
+  1. SEL_ARG GRAPH STRUCTURE
+
+  SEL_ARG objects are linked together in a graph, represented by the SEL_ROOT.
+  The meaning of the graph is better demonstrated by an example:
+
+     tree->keys[i]
+      |
+      |             $              $
+      |    part=1   $     part=2   $    part=3
+      |             $              $
+      |  +-------+  $   +-------+  $   +--------+
+      |  | kp1<1 |--$-->| kp2=5 |--$-->| kp3=10 |
+      |  +-------+  $   +-------+  $   +--------+
+      |      |      $              $       |
+      |      |      $              $   +--------+
+      |      |      $              $   | kp3=12 |
+      |      |      $              $   +--------+
+      |  +-------+  $              $
+      \->| kp1=2 |--$--------------$-+
+         +-------+  $              $ |   +--------+
+             |      $              $  ==>| kp3=11 |
+         +-------+  $              $ |   +--------+
+         | kp1=3 |--$--------------$-+       |
+         +-------+  $              $     +--------+
+             |      $              $     | kp3=14 |
+            ...     $              $     +--------+
+
+  The entire graph is partitioned into "interval lists".
+
+  An interval list is a sequence of ordered disjoint intervals over
+  the same key part. SEL_ARG are linked via "next" and "prev" pointers
+  with NULL as sentinel.
+
+    In the example pic, there are 4 interval lists:
+    "kp<1 OR kp1=2 OR kp1=3", "kp2=5", "kp3=10 OR kp3=12", "kp3=11 OR kp3=13".
+    The vertical lines represent SEL_ARG::next/prev pointers.
+
+  Additionally, all intervals in the list form a red-black (RB) tree,
+  linked via left/right/parent pointers with null_element as sentinel. The
+  red-black tree root SEL_ARG object will be further called "root of the
+  interval list".
+
+  A red-black tree with 7 SEL_ARGs will look similar to what is shown
+  below. Left/right/parent pointers are shown while next pointers go from a
+  node with number X to the node with number X+1 (and prev in the
+  opposite direction):
+
+                         Root
+                        +---+
+                        | 4 |
+                        +---+
+                   left/     \ right
+                    __/       \__
+                   /             \
+              +---+               +---+
+              | 2 |               | 6 |
+              +---+               +---+
+        left /     \ right  left /     \ right
+            |       |           |       |
+        +---+       +---+   +---+       +---+
+        | 1 |       | 3 |   | 5 |       | 7 |
+        +---+       +---+   +---+       +---+
+
+  In this tree,
+    * node1->prev == node7->next == NULL
+    * node1->left == node1->right ==
+      node3->left == ... node7->right == null_element
+
+  In an interval list, each member X may have SEL_ARG::next_key_part pointer
+  pointing to the root of another interval list Y. The pointed interval list
+  must cover a key part with greater number (i.e. Y->part > X->part).
+
+    In the example pic, the next_key_part pointers are represented by
+    horisontal lines.
+
+  2. SEL_ARG GRAPH SEMANTICS
+
+  It represents a condition in a special form (we don't have a name for it ATM)
+  The SEL_ARG::next/prev is "OR", and next_key_part is "AND".
+
+  For example, the picture represents the condition in form:
+   (kp1 < 1 AND kp2=5 AND (kp3=10 OR kp3=12)) OR
+   (kp1=2 AND (kp3=11 OR kp3=14)) OR
+   (kp1=3 AND (kp3=11 OR kp3=14))
+
+  In red-black tree form:
+
+                     +-------+                 +--------+
+                     | kp1=2 |.................| kp3=14 |
+                     +-------+                 +--------+
+                      /     \                     /
+             +---------+    +-------+     +--------+
+             | kp1 < 1 |    | kp1=3 |     | kp3=11 |
+             +---------+    +-------+     +--------+
+                 .               .
+            ......               .......
+            .                          .
+        +-------+                  +--------+
+        | kp2=5 |                  | kp3=14 |
+        +-------+                  +--------+
+            .                        /
+            .                   +--------+
+       (root of R-B tree        | kp3=11 |
+        for "kp3={10|12}")      +--------+
+
+
+  Where / and \ denote left and right pointers and ... denotes
+  next_key_part pointers to the root of the R-B tree of intervals for
+  consecutive key parts.
+
+  3. SEL_ARG GRAPH USE
+
+  Use get_mm_tree() to construct SEL_ARG graph from WHERE condition.
+  Then walk the SEL_ARG graph and get a list of dijsoint ordered key
+  intervals (i.e. intervals in form
+
+   (constA1, .., const1_K) < (keypart1,.., keypartK) < (constB1, .., constB_K)
+
+  Those intervals can be used to access the index. The uses are in:
+   - check_quick_select() - Walk the SEL_ARG graph and find an estimate of
+                            how many table records are contained within all
+                            intervals.
+   - get_quick_select()   - Walk the SEL_ARG, materialize the key intervals,
+                            and create QUICK_RANGE_SELECT object that will
+                            read records within these intervals.
+
+  4. SPACE COMPLEXITY NOTES
+
+    SEL_ARG graph is a representation of an ordered disjoint sequence of
+    intervals over the ordered set of index tuple values.
+
+    For multi-part keys, one can construct a WHERE expression such that its
+    list of intervals will be of combinatorial size. Here is an example:
+
+      (keypart1 IN (1,2, ..., n1)) AND
+      (keypart2 IN (1,2, ..., n2)) AND
+      (keypart3 IN (1,2, ..., n3))
+
+    For this WHERE clause the list of intervals will have n1*n2*n3 intervals
+    of form
+
+      (keypart1, keypart2, keypart3) = (k1, k2, k3), where 1 <= k{i} <= n{i}
+
+    SEL_ARG graph structure aims to reduce the amount of required space by
+    "sharing" the elementary intervals when possible (the pic at the
+    beginning of this comment has examples of such sharing). The sharing may
+    prevent combinatorial blowup:
+
+      There are WHERE clauses that have combinatorial-size interval lists but
+      will be represented by a compact SEL_ARG graph.
+      Example:
+        (keypartN IN (1,2, ..., n1)) AND
+        ...
+        (keypart2 IN (1,2, ..., n2)) AND
+        (keypart1 IN (1,2, ..., n3))
+
+    but not in all cases:
+
+    - There are WHERE clauses that do have a compact SEL_ARG-graph
+      representation but get_mm_tree() and its callees will construct a
+      graph of combinatorial size.
+      Example:
+        (keypart1 IN (1,2, ..., n1)) AND
+        (keypart2 IN (1,2, ..., n2)) AND
+        ...
+        (keypartN IN (1,2, ..., n3))
+
+    - There are WHERE clauses for which the minimal possible SEL_ARG graph
+      representation will have combinatorial size.
+      Example:
+        By induction: Let's take any interval on some keypart in the middle:
+
+           kp15=c0
+
+        Then let's AND it with this interval 'structure' from preceding and
+        following keyparts:
+
+          (kp14=c1 AND kp16=c3) OR keypart14=c2) (*)
+
+        We will obtain this SEL_ARG graph:
+
+             kp14     $      kp15      $      kp16
+                      $                $
+         +---------+  $   +---------+  $   +---------+
+         | kp14=c1 |--$-->| kp15=c0 |--$-->| kp16=c3 |
+         +---------+  $   +---------+  $   +---------+
+              |       $                $
+         +---------+  $   +---------+  $
+         | kp14=c2 |--$-->| kp15=c0 |  $
+         +---------+  $   +---------+  $
+                      $                $
+
+       Note that we had to duplicate "kp15=c0" and there was no way to avoid
+       that.
+       The induction step: AND the obtained expression with another "wrapping"
+       expression like (*).
+       When the process ends because of the limit on max. number of keyparts
+       we'll have:
+
+         WHERE clause length  is O(3*#max_keyparts)
+         SEL_ARG graph size   is O(2^(#max_keyparts/2))
+
+       (it is also possible to construct a case where instead of 2 in 2^n we
+        have a bigger constant, e.g. 4, and get a graph with 4^(31/2)= 2^31
+        nodes)
+
+    We avoid consuming too much memory by setting a limit on the number of
+    SEL_ARG object we can construct during one range analysis invocation.
+*/
+
+class SEL_ARG {
+ public:
+  uint8 min_flag{0}, max_flag{0};
+
+  /**
+    maybe_flag signals that this range is AND-ed with some unknown range
+    (a MAYBE_KEY node). This means that the range could be smaller than
+    what it would otherwise denote; e.g., a range such as
+
+      (0 < x < 3) AND x=( SELECT ... )
+
+    could in reality be e.g. (1 < x < 2), depending on what the subselect
+    returns (and we don't know that when planning), but it could never be
+    bigger.
+
+    FIXME: It's unclear if this is really kept separately per SEL_ARG or is
+    meaningful only at the root node, and thus should be moved to the
+    SEL_ROOT. Most code seems to assume the latter, but a few select places,
+    non-root nodes appear to be modified.
+  */
+  bool maybe_flag{false};
+
+  /*
+    Which key part. TODO: This is the same for all values in a SEL_ROOT,
+    so we should move it there.
+  */
+  uint8 part{0};
+
+  bool maybe_null() const { return field->is_nullable(); }
+
+  /**
+    The rtree index interval to scan, undefined unless
+    SEL_ARG::min_flag == GEOM_FLAG.
+  */
+  enum ha_rkey_function rkey_func_flag;
+
+  /*
+    TODO: This is the same for all values in a SEL_ROOT, so we should
+    move it there; however, be careful about cmp_* functions.
+    Note that this should never be nullptr except in the special case
+    where we have a dummy SEL_ARG to hold next_key_part only
+    (see SEL_ROOT::root for more information).
+  */
+  Field *field{nullptr};
+  uchar *min_value, *max_value;  // Pointer to range
+
+  /*
+    eq_tree(), first(), last() etc require that left == right == NULL
+    if the type is MAYBE_KEY. Todo: fix this so SEL_ARGs without R-B
+    children are handled consistently. See related WL#5894.
+  */
+  SEL_ARG *left, *right;    /* R-B tree children */
+  SEL_ARG *next, *prev;     /* Links for bi-directional interval list */
+  SEL_ARG *parent{nullptr}; /* R-B tree parent (nullptr for root) */
+  /*
+    R-B tree of intervals covering keyparts consecutive to this
+    SEL_ARG. See documentation of SEL_ARG GRAPH semantics for details.
+  */
+  SEL_ROOT *next_key_part{nullptr};
+
+  /**
+    Convenience function for removing the next_key_part. The typical
+    use for this function is to disconnect the next_key_part from the
+    root, send it to key_and() or key_or(), and then connect the
+    result of that function back to the SEL_ARG using set_next_key_part().
+
+    @return The previous value of next_key_part.
+  */
+  SEL_ROOT *release_next_key_part() {
+    SEL_ROOT *ret = next_key_part;
+    if (next_key_part) {
+      assert(next_key_part->use_count > 0);
+      --next_key_part->use_count;
+    }
+    next_key_part = nullptr;
+    return ret;
+  }
+
+  /**
+    Convenience function for changing next_key_part, including
+    updating the use_count. The argument is allowed to be nullptr.
+
+    @param next_key_part_arg New value for next_key_part.
+  */
+  void set_next_key_part(SEL_ROOT *next_key_part_arg) {
+    release_next_key_part();
+    next_key_part = next_key_part_arg;
+    if (next_key_part) ++next_key_part->use_count;
+  }
+
+  enum leaf_color { BLACK, RED } color;
+
+  bool is_ascending;  ///< true - ASC order, false - DESC
+
+  SEL_ARG() = default;
+  SEL_ARG(SEL_ARG &);
+  SEL_ARG(Field *, const uchar *, const uchar *, bool asc);
+  SEL_ARG(Field *field, uint8 part, uchar *min_value, uchar *max_value,
+          uint8 min_flag, uint8 max_flag, bool maybe_flag, bool asc);
+  /**
+    Note that almost all SEL_ARGs are created on the MEM_ROOT,
+    so this destructor will only rarely be called.
+  */
+  ~SEL_ARG() { release_next_key_part(); }
+
+  /**
+    returns true if a range predicate is equal. Use all_same()
+    to check for equality of all the predicates on this keypart.
+  */
+  inline bool is_same(const SEL_ARG *arg) const {
+    if (part != arg->part) return false;
+    return cmp_min_to_min(arg) == 0 && cmp_max_to_max(arg) == 0;
+  }
+
+  inline void merge_flags(SEL_ARG *arg) { maybe_flag |= arg->maybe_flag; }
+  inline void maybe_smaller() { maybe_flag = true; }
+  /* Return true iff it's a single-point null interval */
+  inline bool is_null_interval() { return maybe_null() && max_value[0] == 1; }
+  inline int cmp_min_to_min(const SEL_ARG *arg) const {
+    return sel_cmp(field, min_value, arg->min_value, min_flag, arg->min_flag);
+  }
+  inline int cmp_min_to_max(const SEL_ARG *arg) const {
+    return sel_cmp(field, min_value, arg->max_value, min_flag, arg->max_flag);
+  }
+  inline int cmp_max_to_max(const SEL_ARG *arg) const {
+    return sel_cmp(field, max_value, arg->max_value, max_flag, arg->max_flag);
+  }
+  inline int cmp_max_to_min(const SEL_ARG *arg) const {
+    return sel_cmp(field, max_value, arg->min_value, max_flag, arg->min_flag);
+  }
+  SEL_ARG *clone_and(SEL_ARG *arg,
+                     MEM_ROOT *mem_root) {  // Get intersection of ranges.
+    uchar *new_min, *new_max;
+    uint8 flag_min, flag_max;
+    if (cmp_min_to_min(arg) >= 0) {
+      new_min = min_value;
+      flag_min = min_flag;
+    } else {
+      new_min = arg->min_value;
+      flag_min = arg->min_flag; /* purecov: deadcode */
+    }
+    if (cmp_max_to_max(arg) <= 0) {
+      new_max = max_value;
+      flag_max = max_flag;
+    } else {
+      new_max = arg->max_value;
+      flag_max = arg->max_flag;
+    }
+    return new (mem_root)
+        SEL_ARG(field, part, new_min, new_max, flag_min, flag_max,
+                maybe_flag && arg->maybe_flag, is_ascending);
+  }
+  SEL_ARG *clone_first(SEL_ARG *arg,
+                       MEM_ROOT *mem_root) {  // arg->min <= X < arg->min
+    return new (mem_root)
+        SEL_ARG(field, part, min_value, arg->min_value, min_flag,
+                arg->min_flag & NEAR_MIN ? 0 : NEAR_MAX,
+                maybe_flag || arg->maybe_flag, is_ascending);
+  }
+  SEL_ARG *clone_last(SEL_ARG *arg,
+                      MEM_ROOT *mem_root) {  // arg->min <= X <= key_max
+    return new (mem_root)
+        SEL_ARG(field, part, min_value, arg->max_value, min_flag, arg->max_flag,
+                maybe_flag || arg->maybe_flag, is_ascending);
+  }
+  SEL_ARG *clone(RANGE_OPT_PARAM *param, SEL_ARG *new_parent, SEL_ARG **next);
+
+  bool copy_min(SEL_ARG *arg) {  // max(this->min, arg->min) <= x <= this->max
+    if (cmp_min_to_min(arg) > 0) {
+      min_value = arg->min_value;
+      min_flag = arg->min_flag;
+      if ((max_flag & NO_MAX_RANGE) && (min_flag & NO_MIN_RANGE))
+        return true;  // Full range
+    }
+    maybe_flag |= arg->maybe_flag;
+    return false;
+  }
+  bool copy_max(SEL_ARG *arg) {  // this->min <= x <= min(this->max, arg->max)
+    if (cmp_max_to_max(arg) <= 0) {
+      max_value = arg->max_value;
+      max_flag = arg->max_flag;
+      if ((max_flag & NO_MAX_RANGE) && (min_flag & NO_MIN_RANGE))
+        return true;  // Full range
+    }
+    maybe_flag |= arg->maybe_flag;
+    return false;
+  }
+
+  void copy_min_to_min(SEL_ARG *arg) {
+    min_value = arg->min_value;
+    min_flag = arg->min_flag;
+  }
+  void copy_min_to_max(SEL_ARG *arg) {
+    max_value = arg->min_value;
+    max_flag = arg->min_flag & NEAR_MIN ? 0 : NEAR_MAX;
+  }
+  void copy_max_to_min(SEL_ARG *arg) {
+    min_value = arg->max_value;
+    min_flag = arg->max_flag & NEAR_MAX ? 0 : NEAR_MIN;
+  }
+
+  /**
+    Set spatial index range scan parameters. This object will be used to do
+    spatial index range scan after this call.
+
+    @param rkey_func The scan function to perform. It must be one of the
+                     spatial index specific scan functions.
+  */
+  void set_gis_index_read_function(const enum ha_rkey_function rkey_func) {
+    assert(rkey_func >= HA_READ_MBR_CONTAIN && rkey_func <= HA_READ_MBR_EQUAL);
+    min_flag = GEOM_FLAG;
+    rkey_func_flag = rkey_func;
+    max_flag = NO_MAX_RANGE;
+  }
+
+  /* returns a number of keypart values (0 or 1) appended to the key buffer */
+  int store_min_value(uint length, uchar **min_key, uint min_key_flag) {
+    /* "(kp1 > c1) AND (kp2 OP c2) AND ..." -> (kp1 > c1) */
+    if ((min_flag & GEOM_FLAG) ||
+        (!(min_flag & NO_MIN_RANGE) &&
+         !(min_key_flag & (NO_MIN_RANGE | NEAR_MIN)))) {
+      if (maybe_null() && *min_value) {
+        **min_key = 1;
+        memset(*min_key + 1, 0, length - 1);
+      } else
+        memcpy(*min_key, min_value, length);
+      (*min_key) += length;
+      return 1;
+    }
+    return 0;
+  }
+  /* returns a number of keypart values (0 or 1) appended to the key buffer */
+  int store_max_value(uint length, uchar **max_key, uint max_key_flag) {
+    if (!(max_flag & NO_MAX_RANGE) &&
+        !(max_key_flag & (NO_MAX_RANGE | NEAR_MAX))) {
+      if (maybe_null() && *max_value) {
+        **max_key = 1;
+        memset(*max_key + 1, 0, length - 1);
+      } else
+        memcpy(*max_key, max_value, length);
+      (*max_key) += length;
+      return 1;
+    }
+    return 0;
+  }
+
+  /*
+    Returns a number of keypart values appended to the key buffer
+    for min key and max key. This function is used by both Range
+    Analysis and Partition pruning. For partition pruning we have
+    to ensure that we don't store also subpartition fields. Thus
+    we have to stop at the last partition part and not step into
+    the subpartition fields. For Range Analysis we set last_part
+    to MAX_KEY which we should never reach.
+
+    Note: Caller of this function should take care of sending the
+    correct flags and correct key to be stored into.  In case of
+    ascending indexes, store_min_key() gets called to store the
+    min_value to range start_key. In case of descending indexes, it's
+    called for storing min_value to range end_key.
+  */
+  /**
+    Helper function for storing min/max values of SEL_ARG taking into account
+    key part's order.
+  */
+  void store_min_max_values(uint length, uchar **min_key, uint min_flag,
+                            uchar **max_key, uint max_flag, int *min_part,
+                            int *max_part) {
+    if (is_ascending) {
+      *min_part += store_min_value(length, min_key, min_flag);
+      *max_part += store_max_value(length, max_key, max_flag);
+    } else {
+      *max_part += store_min_value(length, max_key, min_flag);
+      *min_part += store_max_value(length, min_key, max_flag);
+    }
+  }
+
+  /**
+    Helper function for storing min/max keys of next SEL_ARG taking into
+    account key part's order.
+
+    @note On checking min/max flags: Flags are used to track whether there's
+    a partial key in the key buffer. So for ASC key parts the flag
+    corresponding to the key being added to should be checked, not
+    corresponding to the value being added. I.e min_flag for min_key.
+    For DESC key parts it's opposite - max_flag for min_key. It's flag
+    of prev key part that should be checked.
+
+  */
+  void store_next_min_max_keys(KEY_PART *key, uchar **cur_min_key,
+                               uint *cur_min_flag, uchar **cur_max_key,
+                               uint *cur_max_flag, int *min_part,
+                               int *max_part) {
+    assert(next_key_part);
+    const bool asc = next_key_part->root->is_ascending;
+    if (!get_min_flag()) {
+      if (asc)
+        *min_part += next_key_part->store_min_key(key, cur_min_key,
+                                                  cur_min_flag, MAX_KEY, true);
+      else {
+        uint tmp_flag = invert_min_flag(*cur_min_flag);
+        *min_part += next_key_part->store_max_key(key, cur_min_key, &tmp_flag,
+                                                  MAX_KEY, true);
+        *cur_min_flag = invert_max_flag(tmp_flag);
+      }
+    }
+    if (!get_max_flag()) {
+      if (asc)
+        *max_part += next_key_part->store_max_key(key, cur_max_key,
+                                                  cur_max_flag, MAX_KEY, false);
+      else {
+        uint tmp_flag = invert_max_flag(*cur_max_flag);
+        *max_part += next_key_part->store_min_key(key, cur_max_key, &tmp_flag,
+                                                  MAX_KEY, false);
+        *cur_max_flag = invert_min_flag(tmp_flag);
+      }
+    }
+  }
+
+  SEL_ARG *rb_insert(SEL_ARG *leaf);
+  friend SEL_ARG *rb_delete_fixup(SEL_ARG *root, SEL_ARG *key, SEL_ARG *par);
+#ifndef NDEBUG
+  friend int test_rb_tree(SEL_ARG *element, SEL_ARG *parent);
+#endif
+  SEL_ARG *first();
+  const SEL_ARG *first() const;
+  SEL_ARG *last();
+  void make_root() {
+    left = right = opt_range::null_element;
+    color = BLACK;
+    parent = next = prev = nullptr;
+  }
+
+  inline SEL_ARG **parent_ptr() {
+    return parent->left == this ? &parent->left : &parent->right;
+  }
+
+  /*
+    Check if this SEL_ARG object represents a single-point interval
+
+    SYNOPSIS
+      is_singlepoint()
+
+    DESCRIPTION
+      Check if this SEL_ARG object (not tree) represents a single-point
+      interval, i.e. if it represents a "keypart = const" or
+      "keypart IS NULL".
+
+    RETURN
+      true   This SEL_ARG object represents a singlepoint interval
+      false  Otherwise
+  */
+
+  bool is_singlepoint() const {
+    /*
+      Check for NEAR_MIN ("strictly less") and NO_MIN_RANGE (-inf < field)
+      flags, and the same for right edge.
+    */
+    if (min_flag || max_flag) return false;
+    uchar *min_val = min_value;
+    uchar *max_val = max_value;
+
+    if (maybe_null()) {
+      /* First byte is a NULL value indicator */
+      if (*min_val != *max_val) return false;
+
+      if (*min_val) return true; /* This "x IS NULL" */
+      min_val++;
+      max_val++;
+    }
+    return !field->key_cmp(min_val, max_val);
+  }
+  /**
+    Return correct min_flag.
+
+    For DESC key parts max flag should be used as min flag, but in order to
+    be checked correctly, max flag should be flipped as code doesn't expect
+    e.g NEAR_MAX in min flag.
+  */
+  uint get_min_flag() {
+    return (is_ascending ? min_flag : invert_max_flag(max_flag));
+  }
+  /**
+    Return correct max_flag.
+
+    For DESC key parts min flag should be used as max flag, but in order to
+    be checked correctly, min flag should be flipped as code doesn't expect
+    e.g NEAR_MIN in max flag.
+  */
+  uint get_max_flag() {
+    return (is_ascending ? max_flag : invert_min_flag(min_flag));
+  }
+};
+
+inline bool SEL_ROOT::is_always() const {
+  return type == Type::KEY_RANGE && elements == 1 && !root->maybe_flag &&
+         (root->min_flag & NO_MIN_RANGE) && (root->max_flag & NO_MAX_RANGE);
+}
+
+inline bool SEL_ROOT::simple_key() const {
+  return elements == 1 && !root->next_key_part;
+}
+
+class SEL_TREE {
+ public:
+  /**
+    Starting an effort to document this field:
+
+    IMPOSSIBLE: if keys[i]->type == SEL_ROOT::Type::IMPOSSIBLE for some i,
+      then type == SEL_TREE::IMPOSSIBLE. Rationale: if the predicate for
+      one of the indexes is always false, then the full predicate is also
+      always false.
+
+    ALWAYS: if either (keys[i]->is_always()) or (keys[i] == NULL) for all i,
+      then type == SEL_TREE::ALWAYS. Rationale: the range access method
+      will not be able to filter out any rows when there are no range
+      predicates that can be used to filter on any index.
+
+    KEY: There are range predicates that can be used on at least one
+      index.
+
+    KEY_SMALLER: There are range predicates that can be used on at
+      least one index. In addition, there are predicates that cannot
+      be directly utilized by range access on key parts in the same
+      index. These unused predicates makes it probable that the row
+      estimate for range access on this index is too pessimistic.
+  */
+  enum Type { IMPOSSIBLE, ALWAYS, MAYBE, KEY, KEY_SMALLER } type;
+
+  SEL_TREE(enum Type type_arg, MEM_ROOT *root, size_t num_keys)
+      : type(type_arg), keys(root, num_keys), n_ror_scans(0) {}
+  SEL_TREE(MEM_ROOT *root, size_t num_keys)
+      : type(KEY), keys(root, num_keys), n_ror_scans(0) {}
+  /**
+    Constructor that performs deep-copy of the SEL_ARG trees in
+    'keys[]' and the index merge alternatives in 'merges'.
+
+    @param arg     The SEL_TREE to copy
+    @param param   Parameters for range analysis
+  */
+  SEL_TREE(SEL_TREE *arg, RANGE_OPT_PARAM *param);
+  /*
+    Possible ways to read rows using a single index because the
+    conditions of the query consists of single-index conjunctions:
+
+       (ranges_for_idx_1) AND (ranges_for_idx_2) AND ...
+
+    The SEL_ARG graph for each non-NULL element in keys[] may consist
+    of many single-index ranges (disjunctions), so ranges_for_idx_1
+    may e.g. be:
+
+       "idx_field1 = 1 OR (idx_field1 > 5 AND idx_field2 = 10)"
+
+    assuming that index1 is a composite index covering
+    (idx_field1,...,idx_field2,..)
+
+    Index merge intersection intersects ranges on SEL_ARGs from two or
+    more indexes.
+
+    Note: there may exist SEL_TREE objects with sel_tree->type=KEY and
+    keys[i]=0 for all i. (SergeyP: it is not clear whether there is any
+    merit in range analyzer functions (e.g. get_mm_parts) returning a
+    pointer to such SEL_TREE instead of NULL)
+
+    Note: If you want to set an element in keys[], use set_key()
+    or release_key() to make sure the SEL_ARG's use_count is correctly
+    updated.
+  */
+  Mem_root_array<SEL_ROOT *> keys;
+  Key_map keys_map; /* bitmask of non-NULL elements in keys */
+
+  /*
+    Possible ways to read rows using Index merge (sort) union.
+
+    Each element in 'merges' consists of multi-index disjunctions,
+    which means that Index merge (sort) union must be applied to read
+    rows. The nodes in the 'merges' list forms a conjunction of such
+    multi-index disjunctions.
+
+    The list is non-empty only if type==KEY.
+  */
+  List<SEL_IMERGE> merges;
+
+  /* The members below are filled/used only after get_mm_tree is done */
+  Key_map ror_scans_map; /* bitmask of ROR scan-able elements in keys */
+  uint n_ror_scans;      /* number of set bits in ror_scans_map */
+
+  ROR_SCAN_INFO **ror_scans;     /* list of ROR key scans */
+  ROR_SCAN_INFO **ror_scans_end; /* last ROR scan */
+  /* Note that #records for each key scan is stored in table->quick_rows */
+
+  /**
+    Convenience function for removing an element in keys[]. The typical
+    use for this function is to disconnect the next_key_part from the
+    root, send it to key_and() or key_or(), and then connect the
+    result of that function back to the SEL_ROOT using set_key().
+
+    @param index Which index slot to release.
+    @return The value in the slot (before removal).
+  */
+  SEL_ROOT *release_key(int index) {
+    SEL_ROOT *ret = keys[index];
+    if (keys[index]) {
+      assert(keys[index]->use_count > 0);
+      --keys[index]->use_count;
+    }
+    keys[index] = nullptr;
+    return ret;
+  }
+
+  /**
+    Convenience function for changing an element in keys[], including
+    updating the use_count.
+
+    @param index Which index slot to change.
+    @param key The new contents of the index slot. Is allowed to be nullptr.
+  */
+  void set_key(int index, SEL_ROOT *key) {
+    release_key(index);
+    keys[index] = key;
+    if (key) ++key->use_count;
+  }
+};
+
+#ifndef NDEBUG
+void print_sel_tree(RANGE_OPT_PARAM *param, SEL_TREE *tree, Key_map *tree_map,
+                    const char *msg);
+#endif
+
+/*
+  Get the SEL_ARG tree 'tree' for the keypart covering 'field', if
+  any. 'tree' must be a unique conjunction to ALL predicates in earlier
+  keyparts of 'keypart_tree'.
+
+  E.g., if 'keypart_tree' is for a composite index (kp1,kp2) and kp2
+  covers 'field', all these conditions satisfies the requirement:
+
+   1. "(kp1=2 OR kp1=3) AND kp2=10"    => returns "kp2=10"
+   2. "(kp1=2 AND kp2=10) OR (kp1=3 AND kp2=10)"  => returns "kp2=10"
+   3. "(kp1=2 AND (kp2=10 OR kp2=11)) OR (kp1=3 AND (kp2=10 OR kp2=11))"
+                                       => returns "kp2=10  OR kp2=11"
+
+   whereas these do not
+   1. "(kp1=2 AND kp2=10) OR kp1=3"
+   2. "(kp1=2 AND kp2=10) OR (kp1=3 AND kp2=11)"
+   3. "(kp1=2 AND kp2=10) OR (kp1=3 AND (kp2=10 OR kp2=11))"
+
+   This function effectively tests requirement WA2.
+
+  @param[in]   key_part_num   Key part number we want the SEL_ARG tree for
+  @param[in]   keypart_tree   The SEL_ARG* tree for the index
+  @param[out]  cur_range      The SEL_ARG tree, if any, for the keypart
+
+  @retval true   'keypart_tree' contained a predicate for key part that
+                  is not conjunction to all predicates on earlier keyparts
+  @retval false  otherwise
+*/
+bool get_sel_root_for_keypart(uint key_part_num, SEL_ROOT *keypart_tree,
+                              SEL_ROOT **cur_range);
+
+/*
+  Find the SEL_ROOT tree that corresponds to the chosen index.
+
+  SYNOPSIS
+    get_index_range_tree()
+    index     [in]  The ID of the index being looked for
+    range_tree[in]  Tree of ranges being searched
+    param     [in]  RANGE_OPT_PARAM from test_quick_select
+
+  DESCRIPTION
+
+    A SEL_TREE contains range trees for all usable indexes. This procedure
+    finds the SEL_ROOT tree for 'index'. The members of a SEL_TREE are
+    ordered in the same way as the members of RANGE_OPT_PARAM::key, thus we
+    first find the corresponding index in the array RANGE_OPT_PARAM::key.
+    This index is returned through the variable param_idx, to be used later
+    as argument of check_quick_select().
+
+  RETURN
+    Pointer to the SEL_ROOT tree that corresponds to index.
+*/
+
+inline SEL_ROOT *get_index_range_tree(uint index, SEL_TREE *range_tree,
+                                      RANGE_OPT_PARAM *param) {
+  uint idx = 0; /* Index nr in param->key_parts */
+  while (idx < param->keys) {
+    if (index == param->real_keynr[idx]) break;
+    idx++;
+  }
+  return (range_tree->keys[idx]);
+}
+
+/**
+  Print the ranges in a SEL_TREE to debug log.
+
+  @param tree_name   Descriptive name of the tree
+  @param tree        The SEL_TREE that will be printed to debug log
+  @param param       RANGE_OPT_PARAM from test_quick_select
+*/
+inline void dbug_print_tree([[maybe_unused]] const char *tree_name,
+                            [[maybe_unused]] SEL_TREE *tree,
+                            [[maybe_unused]] const RANGE_OPT_PARAM *param) {
+#ifndef NDEBUG
+  if (_db_enabled_()) print_tree(nullptr, tree_name, tree, param, true);
+#endif
+}
+
+#endif  // SQL_RANGE_OPTIMIZER_TREE_H_
diff -Nru mysql-8.0-8.0.26/sql/records.cc mysql-8.0-8.0.27/sql/records.cc
--- mysql-8.0-8.0.26/sql/records.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/records.cc	2021-09-28 11:46:34.000000000 +0000
@@ -42,10 +42,11 @@
 #include "sql/handler.h"
 #include "sql/item.h"
 #include "sql/join_optimizer/access_path.h"
+#include "sql/join_optimizer/bit_utils.h"
 #include "sql/key.h"
 #include "sql/opt_explain.h"
-#include "sql/opt_range.h"  // QUICK_SELECT_I
-#include "sql/sql_class.h"  // THD
+#include "sql/range_optimizer/range_optimizer.h"  // QUICK_SELECT_I
+#include "sql/sql_class.h"                        // THD
 #include "sql/sql_const.h"
 #include "sql/sql_executor.h"
 #include "sql/sql_optimizer.h"
@@ -143,47 +144,39 @@
   said iterator afterwards.
 
   @param thd      Thread handle
-  @param table    Table the data [originally] comes from; if nullptr,
-    `table` is inferred from `qep_tab`; if non-nullptr, `qep_tab` must
-   have the same table.
-  @param qep_tab  QEP_TAB for 'table', if there is one; we may use
-    qep_tab->quick() as data source
+  @param table    Table the data [originally] comes from
+  @param quick    QUICK_SELECT_I to scan the table with, or nullptr
+  @param table_ref
+                  Position for the table, must be non-nullptr for
+                  WITH RECURSIVE
+  @param position Place to get cost information from, or nullptr
   @param count_examined_rows
     See AccessPath::count_examined_rows.
  */
-AccessPath *create_table_access_path(THD *thd, TABLE *table, QEP_TAB *qep_tab,
+AccessPath *create_table_access_path(THD *thd, TABLE *table,
+                                     QUICK_SELECT_I *quick,
+                                     TABLE_LIST *table_ref, POSITION *position,
                                      bool count_examined_rows) {
-  // If only 'table' is given, assume no quick, no condition.
-  if (table != nullptr && qep_tab != nullptr) {
-    assert(table == qep_tab->table());
-  } else if (table == nullptr) {
-    table = qep_tab->table();
-  }
-
   AccessPath *path;
-  if (qep_tab != nullptr && qep_tab->quick() != nullptr) {
-    path = NewIndexRangeScanAccessPath(thd, table, qep_tab->quick(),
-                                       count_examined_rows);
-  } else if (qep_tab != nullptr && qep_tab->table_ref != nullptr &&
-             qep_tab->table_ref->is_recursive_reference()) {
+  if (quick != nullptr) {
+    path = NewIndexRangeScanAccessPath(thd, table, quick, count_examined_rows);
+  } else if (table_ref != nullptr && table_ref->is_recursive_reference()) {
     path = NewFollowTailAccessPath(thd, table, count_examined_rows);
   } else {
     path = NewTableScanAccessPath(thd, table, count_examined_rows);
   }
-  if (qep_tab != nullptr && qep_tab->position() != nullptr) {
-    SetCostOnTableAccessPath(*thd->cost_model(), qep_tab->position(),
+  if (position != nullptr) {
+    SetCostOnTableAccessPath(*thd->cost_model(), position,
                              /*is_after_filter=*/false, path);
   }
   return path;
 }
 
 unique_ptr_destroy_only<RowIterator> init_table_iterator(
-    THD *thd, TABLE *table, QEP_TAB *qep_tab, bool ignore_not_found_rows,
-    bool count_examined_rows) {
+    THD *thd, TABLE *table, QUICK_SELECT_I *quick, TABLE_LIST *table_ref,
+    POSITION *position, bool ignore_not_found_rows, bool count_examined_rows) {
   unique_ptr_destroy_only<RowIterator> iterator;
 
-  assert(!(table && qep_tab));
-  if (!table) table = qep_tab->table();
   empty_record(table);
 
   if (table->unique_result.io_cache &&
@@ -207,10 +200,10 @@
         ignore_not_found_rows, /*has_null_flags=*/false,
         /*examined_rows=*/nullptr);
   } else {
-    AccessPath *path =
-        create_table_access_path(thd, table, qep_tab, count_examined_rows);
+    AccessPath *path = create_table_access_path(thd, table, quick, table_ref,
+                                                position, count_examined_rows);
     iterator = CreateIteratorFromAccessPath(thd, path,
-                                            qep_tab ? qep_tab->join() : nullptr,
+                                            /*join=*/nullptr,
                                             /*eligible_for_batch_mode=*/false);
   }
   if (iterator->Init()) {
@@ -269,6 +262,54 @@
       m_expected_rows(expected_rows),
       m_examined_rows(examined_rows) {}
 
+/// Is this range scan a Rowid-Ordered Retrieval (ROR) index merge?
+static bool is_ror(const QUICK_SELECT_I *quick) {
+  switch (quick->get_type()) {
+    case QS_TYPE_ROR_INTERSECT:
+    case QS_TYPE_ROR_UNION:
+      return true;
+    default:
+      return false;
+  }
+}
+
+/// Does this TABLE have a primary key with a BLOB component?
+static bool has_blob_primary_key(const TABLE *table) {
+  if (table->s->is_missing_primary_key()) {
+    return false;
+  }
+
+  const KEY &key = table->key_info[table->s->primary_key];
+  return std::any_of(key.key_part, key.key_part + key.user_defined_key_parts,
+                     [](const KEY_PART_INFO &key_part) {
+                       return Overlaps(key_part.key_part_flag, HA_BLOB_PART);
+                     });
+}
+
+/// Should a record buffer be requested for this range scan?
+static bool should_request_record_buffer(const QUICK_SELECT_I *quick) {
+  // We don't try to set up record buffers for loose index scans, because they
+  // usually cannot read expected_rows_to_fetch rows in one go anyway.
+  if (quick->is_loose_index_scan()) {
+    return false;
+  }
+
+  // Rowid-ordered retrievals may add the primary key to the read_set at a later
+  // stage. If the primary key contains a BLOB component, a record buffer cannot
+  // be used, since BLOBs require storage space outside of the record. So don't
+  // request a buffer in this case, even though the current read_set gives the
+  // impression that using a record buffer would be fine.
+  if (is_ror(quick) &&
+      Overlaps(quick->m_table->file->ha_table_flags(),
+               HA_PRIMARY_KEY_REQUIRED_FOR_POSITION) &&
+      has_blob_primary_key(quick->m_table)) {
+    return false;
+  }
+
+  // Otherwise, request a row buffer.
+  return true;
+}
+
 bool IndexRangeScanIterator::Init() {
   empty_record(table());
 
@@ -285,10 +326,8 @@
     return true;
   }
 
-  // NOTE: We don't try to set up record buffers for loose index scans,
-  // because they usually cannot read expected_rows_to_fetch rows in one go
-  // anyway.
-  if (first_init && table()->file->inited && !m_quick->is_loose_index_scan()) {
+  if (first_init && table()->file->inited &&
+      should_request_record_buffer(m_quick)) {
     if (set_record_buffer(table(), m_expected_rows)) {
       return true; /* purecov: inspected */
     }
diff -Nru mysql-8.0-8.0.26/sql/records.h mysql-8.0-8.0.27/sql/records.h
--- mysql-8.0-8.0.26/sql/records.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/records.h	2021-09-28 11:46:34.000000000 +0000
@@ -38,8 +38,11 @@
 class THD;
 struct AccessPath;
 struct TABLE;
+struct POSITION;
 
-AccessPath *create_table_access_path(THD *thd, TABLE *table, QEP_TAB *qep_tab,
+AccessPath *create_table_access_path(THD *thd, TABLE *table,
+                                     QUICK_SELECT_I *quick,
+                                     TABLE_LIST *table_ref, POSITION *position,
                                      bool count_examined_rows);
 
 /**
@@ -49,7 +52,19 @@
   Returns nullptr on failure.
  */
 unique_ptr_destroy_only<RowIterator> init_table_iterator(
-    THD *thd, TABLE *table, QEP_TAB *qep_tab, bool ignore_not_found_rows,
-    bool count_examined_rows);
+    THD *thd, TABLE *table, QUICK_SELECT_I *quick, TABLE_LIST *table_ref,
+    POSITION *position, bool ignore_not_found_rows, bool count_examined_rows);
+
+/**
+  A short form for when there's no range scan, recursive CTEs or cost
+  information; just a unique_result or a simple table scan. Normally, you should
+  prefer just instantiating an iterator yourself -- this is for legacy use only.
+ */
+inline unique_ptr_destroy_only<RowIterator> init_table_iterator(
+    THD *thd, TABLE *table, bool ignore_not_found_rows,
+    bool count_examined_rows) {
+  return init_table_iterator(thd, table, nullptr, nullptr, nullptr,
+                             ignore_not_found_rows, count_examined_rows);
+}
 
 #endif /* SQL_RECORDS_H */
diff -Nru mysql-8.0-8.0.26/sql/ref_row_iterators.h mysql-8.0-8.0.27/sql/ref_row_iterators.h
--- mysql-8.0-8.0.26/sql/ref_row_iterators.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/ref_row_iterators.h	2021-09-28 11:46:34.000000000 +0000
@@ -150,7 +150,7 @@
   // "examined_rows", if not nullptr, is incremented for each successful Read().
   FullTextSearchIterator(THD *thd, TABLE *table, TABLE_REF *ref,
                          Item_func_match *ft_func, bool use_order,
-                         ha_rows *examined_rows);
+                         bool use_limit, ha_rows *examined_rows);
   ~FullTextSearchIterator() override;
 
   bool Init() override;
@@ -160,6 +160,7 @@
   TABLE_REF *const m_ref;
   Item_func_match *const m_ft_func;
   const bool m_use_order;
+  const bool m_use_limit;
   ha_rows *const m_examined_rows;
 };
 
@@ -181,6 +182,7 @@
   // "examined_rows", if not nullptr, is incremented for each successful Read().
   DynamicRangeIterator(THD *thd, TABLE *table, QEP_TAB *qep_tab,
                        ha_rows *examined_rows);
+  ~DynamicRangeIterator() override;
 
   bool Init() override;
   int Read() override;
@@ -188,6 +190,10 @@
  private:
   QEP_TAB *m_qep_tab;
 
+  // All quicks are allocated on this MEM_ROOT, which is cleared out
+  // between every invocation of the range optimizer.
+  MEM_ROOT m_mem_root;
+
   unique_ptr_destroy_only<RowIterator> m_iterator;
 
   /**
diff -Nru mysql-8.0-8.0.26/sql/regexp/regexp_facade.cc mysql-8.0-8.0.27/sql/regexp/regexp_facade.cc
--- mysql-8.0-8.0.26/sql/regexp/regexp_facade.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/regexp/regexp_facade.cc	2021-09-28 11:46:34.000000000 +0000
@@ -22,10 +22,12 @@
 
 #include "sql/regexp/regexp_facade.h"
 
+#include <optional>
 #include <string>
 #include <tuple>
 
 #include "my_pointer_arithmetic.h"
+#include "sql/item_func.h"
 #include "sql/mysqld.h"  // make_unique_destroy_only
 #include "sql/regexp/regexp_engine.h"
 #include "sql_string.h"
@@ -97,7 +99,11 @@
     size_t converted_size = my_convert(to, to_size, regexp_lib_charset, start,
                                        length, source_charset, &errors);
 
-    if (errors > 0) return true;
+    if (errors > 0) {
+      report_conversion_error(regexp_lib_charset, start, length,
+                              source_charset);
+      return true;
+    }
     assert(converted_size % sizeof(UChar) == 0);
     out->resize(converted_size / sizeof(UChar));
     return false;
@@ -160,11 +166,11 @@
   return cset->numchars(regexp_lib_charset, start, end);
 }
 
-Mysql::Nullable<bool> Regexp_facade::Matches(Item *subject_expr, int start,
-                                             int occurrence) {
+std::optional<bool> Regexp_facade::Matches(Item *subject_expr, int start,
+                                           int occurrence) {
   DBUG_TRACE;
 
-  if (Reset(subject_expr, start)) return Mysql::Nullable<bool>();
+  if (Reset(subject_expr, start)) return std::optional<bool>();
 
   /*
     As far as ICU is concerned, we always start on position 0, since we
@@ -173,10 +179,10 @@
   return m_engine->Matches(0, occurrence);
 }
 
-Mysql::Nullable<int> Regexp_facade::Find(Item *subject_expr, int start,
-                                         int occurrence, bool after_match) {
-  Nullable<bool> match_found = Matches(subject_expr, start, occurrence);
-  if (!match_found.has_value()) return Mysql::Nullable<int>();
+std::optional<int> Regexp_facade::Find(Item *subject_expr, int start,
+                                       int occurrence, bool after_match) {
+  std::optional<bool> match_found = Matches(subject_expr, start, occurrence);
+  if (!match_found.has_value()) return std::optional<int>();
   if (!match_found.value()) return 0;
   int native_start =
       after_match ? m_engine->EndOfMatch() : m_engine->StartOfMatch();
diff -Nru mysql-8.0-8.0.26/sql/regexp/regexp_facade.h mysql-8.0-8.0.27/sql/regexp/regexp_facade.h
--- mysql-8.0-8.0.26/sql/regexp/regexp_facade.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/regexp/regexp_facade.h	2021-09-28 11:46:34.000000000 +0000
@@ -31,9 +31,9 @@
 
 #include <stdint.h>
 
+#include <optional>
 #include <string>
 
-#include "nullable.h"
 #include "sql/item.h"
 #include "sql/regexp/regexp_engine.h"
 #include "sql_string.h"
@@ -93,7 +93,7 @@
     doesn't have to make a special case for when the regular expression is
     NULL. Instead, the case is handled here in the facade.
   */
-  Mysql::Nullable<bool> Matches(Item *subject_expr, int start, int occurrence);
+  std::optional<bool> Matches(Item *subject_expr, int start, int occurrence);
 
   /**
     Searches the subject for a match of the compiled regular expression and
@@ -107,8 +107,8 @@
 
     @return The first character of the match, or a null value if not found.
   */
-  Mysql::Nullable<int> Find(Item *subject_expr, int start, int occurrence,
-                            bool after_match);
+  std::optional<int> Find(Item *subject_expr, int start, int occurrence,
+                          bool after_match);
 
   /**
     @param subject_expr The string to search.
diff -Nru mysql-8.0-8.0.26/sql/replication.h mysql-8.0-8.0.27/sql/replication.h
--- mysql-8.0-8.0.26/sql/replication.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/replication.h	2021-09-28 11:46:34.000000000 +0000
@@ -594,6 +594,8 @@
   my_off_t master_log_pos;
 
   MYSQL *mysql; /* the connection to master */
+
+  bool source_connection_auto_failover;
 } Binlog_relay_IO_param;
 
 /**
diff -Nru mysql-8.0-8.0.26/sql/resourcegroups/resource_group_sql_cmd.cc mysql-8.0-8.0.27/sql/resourcegroups/resource_group_sql_cmd.cc
--- mysql-8.0-8.0.26/sql/resourcegroups/resource_group_sql_cmd.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/resourcegroups/resource_group_sql_cmd.cc	2021-09-28 11:46:34.000000000 +0000
@@ -159,13 +159,10 @@
                                       pfs_thread_id);
       if (!pfs_thread_attr.m_system_thread) {
         Find_thd_with_id find_thd_with_id(pfs_thread_attr.m_processlist_id);
-        THD *thd =
+        THD_ptr thd_ptr =
             Global_THD_manager::get_instance()->find_thd(&find_thd_with_id);
-        if (thd != nullptr) {
-          thd->resource_group_ctx()->m_cur_resource_group = nullptr;
-          mysql_mutex_assert_owner(&thd->LOCK_thd_data);
-          mysql_mutex_unlock(&thd->LOCK_thd_data);
-        }
+        if (thd_ptr)
+          thd_ptr->resource_group_ctx()->m_cur_resource_group = nullptr;
       }
     }
   }
@@ -585,12 +582,10 @@
   // Set resource group context for non-system threads.
   if (!pfs_thread_attr.m_system_thread) {
     Find_thd_with_id find_thd_with_id(pfs_thread_attr.m_processlist_id);
-    THD *cur_thd =
+    THD_ptr cur_thd_ptr =
         Global_THD_manager::get_instance()->find_thd(&find_thd_with_id);
-    if (cur_thd != nullptr) {
-      cur_thd->resource_group_ctx()->m_cur_resource_group = resource_group;
-      mysql_mutex_unlock(&cur_thd->LOCK_thd_data);
-    }
+    if (cur_thd_ptr)
+      cur_thd_ptr->resource_group_ctx()->m_cur_resource_group = resource_group;
   }
 
   if (prev_cur_res_grp != nullptr)
diff -Nru mysql-8.0-8.0.26/sql/rpl_applier_reader.cc mysql-8.0-8.0.27/sql/rpl_applier_reader.cc
--- mysql-8.0-8.0.26/sql/rpl_applier_reader.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_applier_reader.cc	2021-09-28 11:46:34.000000000 +0000
@@ -415,7 +415,7 @@
   if (is_instance_locked == Is_instance_backup_locked_result::LOCKED)
     return false;
 
-  if (m_rli->flush_info(true)) {
+  if (m_rli->flush_info(Relay_log_info::RLI_FLUSH_IGNORE_SYNC_OPT)) {
     m_errmsg = "Error purging processed logs";
     return true;
   }
diff -Nru mysql-8.0-8.0.26/sql/rpl_async_conn_failover_add_managed_udf.cc mysql-8.0-8.0.27/sql/rpl_async_conn_failover_add_managed_udf.cc
--- mysql-8.0-8.0.26/sql/rpl_async_conn_failover_add_managed_udf.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_async_conn_failover_add_managed_udf.cc	2021-09-28 11:46:34.000000000 +0000
@@ -28,11 +28,9 @@
 #include "sql/derror.h" /* ER_THD */
 #include "sql/rpl_async_conn_failover_add_managed_udf.h"
 #include "sql/rpl_async_conn_failover_table_operations.h"
+#include "sql/rpl_group_replication.h"
 #include "sql/rpl_io_monitor.h"
 
-const std::string Rpl_async_conn_failover_add_managed::m_udf_name =
-    "asynchronous_connection_failover_add_managed";
-
 bool Rpl_async_conn_failover_add_managed::init() {
   DBUG_TRACE;
 
@@ -84,7 +82,7 @@
 
   if (err_val) {
     *error = 1;
-    my_error(ER_UDF_ERROR, MYF(0), m_udf_name.c_str(), err_msg.c_str());
+    my_error(ER_UDF_ERROR, MYF(0), m_udf_name, err_msg.c_str());
   } else {
     err_msg.assign(
         "The UDF asynchronous_connection_failover_add_managed() "
@@ -202,6 +200,13 @@
     return true;
   }
 
+  if (is_group_replication_member_secondary()) {
+    my_stpcpy(message,
+              "Can't execute the given operation on a Group Replication "
+              "secondary member.");
+    return true;
+  }
+
   if (Udf_charset_service::set_return_value_charset(init_id) ||
       Udf_charset_service::set_args_charset(args)) {
     return true;
diff -Nru mysql-8.0-8.0.26/sql/rpl_async_conn_failover_add_managed_udf.h mysql-8.0-8.0.27/sql/rpl_async_conn_failover_add_managed_udf.h
--- mysql-8.0-8.0.26/sql/rpl_async_conn_failover_add_managed_udf.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_async_conn_failover_add_managed_udf.h	2021-09-28 11:46:34.000000000 +0000
@@ -29,7 +29,8 @@
 class Rpl_async_conn_failover_add_managed : public Udf_service_impl {
  private:
   Udf_charset_service m_charset_service;
-  static const std::string m_udf_name;
+  static constexpr const char *m_udf_name =
+      "asynchronous_connection_failover_add_managed";
   bool m_initialized{false};
 
  public:
diff -Nru mysql-8.0-8.0.26/sql/rpl_async_conn_failover_add_source_udf.cc mysql-8.0-8.0.27/sql/rpl_async_conn_failover_add_source_udf.cc
--- mysql-8.0-8.0.26/sql/rpl_async_conn_failover_add_source_udf.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_async_conn_failover_add_source_udf.cc	2021-09-28 11:46:34.000000000 +0000
@@ -28,13 +28,11 @@
 #include "sql/derror.h" /* ER_THD */
 #include "sql/rpl_async_conn_failover_add_source_udf.h"
 #include "sql/rpl_async_conn_failover_table_operations.h"
+#include "sql/rpl_group_replication.h"
 #include "sql/rpl_io_monitor.h"
 
 const int DEFAULT_WEIGHT_VAL = 50;
 
-const std::string Rpl_async_conn_failover_add_source::m_udf_name =
-    "asynchronous_connection_failover_add_source";
-
 bool Rpl_async_conn_failover_add_source::init() {
   DBUG_TRACE;
 
@@ -79,11 +77,11 @@
 
   /* add row */
   std::tie(err_val, err_msg) =
-      sql_operations.add_source(channel, host, port, "", weight);
+      sql_operations.add_source(channel, host, port, "", weight, "");
 
   if (err_val) {
     *error = 1;
-    my_error(ER_UDF_ERROR, MYF(0), m_udf_name.c_str(), err_msg.c_str());
+    my_error(ER_UDF_ERROR, MYF(0), m_udf_name, err_msg.c_str());
   } else {
     err_msg.assign(
         "The UDF asynchronous_connection_failover_add_source() "
@@ -173,6 +171,13 @@
     return true;
   }
 
+  if (is_group_replication_member_secondary()) {
+    my_stpcpy(message,
+              "Can't execute the given operation on a Group Replication "
+              "secondary member.");
+    return true;
+  }
+
   if (Udf_charset_service::set_return_value_charset(init_id) ||
       Udf_charset_service::set_args_charset(args)) {
     return true;
diff -Nru mysql-8.0-8.0.26/sql/rpl_async_conn_failover_add_source_udf.h mysql-8.0-8.0.27/sql/rpl_async_conn_failover_add_source_udf.h
--- mysql-8.0-8.0.26/sql/rpl_async_conn_failover_add_source_udf.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_async_conn_failover_add_source_udf.h	2021-09-28 11:46:34.000000000 +0000
@@ -29,7 +29,8 @@
 class Rpl_async_conn_failover_add_source : public Udf_service_impl {
  private:
   Udf_charset_service m_charset_service;
-  static const std::string m_udf_name;
+  static constexpr const char *m_udf_name =
+      "asynchronous_connection_failover_add_source";
   bool m_initialized{false};
 
  public:
diff -Nru mysql-8.0-8.0.26/sql/rpl_async_conn_failover.cc mysql-8.0-8.0.27/sql/rpl_async_conn_failover.cc
--- mysql-8.0-8.0.26/sql/rpl_async_conn_failover.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_async_conn_failover.cc	2021-09-28 11:46:34.000000000 +0000
@@ -22,6 +22,7 @@
 
 #include "mysql/components/services/log_builtins.h"
 
+#include "sql/changestreams/apply/replication_thread_status.h"
 #include "sql/current_thd.h"
 #include "sql/debug_sync.h"  // DEBUG_SYNC
 #include "sql/rpl_async_conn_failover.h"
diff -Nru mysql-8.0-8.0.26/sql/rpl_async_conn_failover_configuration_propagation.cc mysql-8.0-8.0.27/sql/rpl_async_conn_failover_configuration_propagation.cc
--- mysql-8.0-8.0.26/sql/rpl_async_conn_failover_configuration_propagation.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_async_conn_failover_configuration_propagation.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,1027 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include "sql/rpl_async_conn_failover_configuration_propagation.h"
+#include <mutex_lock.h>
+#include <my_dbug.h>
+#include <mysql/components/my_service.h>
+#include <mysql/components/services/group_replication_message_service.h>
+#include <mysql/components/services/group_replication_status_service.h>
+#include "mysql/components/services/log_builtins.h"
+#include "sql/json_dom.h"
+#include "sql/log.h"
+#include "sql/mysqld.h"  // srv_registry
+#include "sql/rpl_async_conn_failover_table_operations.h"
+#include "sql/rpl_channel_service_interface.h"
+#include "sql/rpl_group_replication.h"
+#include "sql/rpl_msr.h"
+
+/*
+  receive function
+*/
+DEFINE_BOOL_METHOD(receive_acf_configuration,
+                   (const char *tag, const unsigned char *data,
+                    size_t data_length)) {
+  return rpl_acf_configuration_handler->receive(tag, data, data_length);
+}
+
+BEGIN_SERVICE_IMPLEMENTATION(group_replication,
+                             group_replication_message_service_recv)
+receive_acf_configuration, END_SERVICE_IMPLEMENTATION();
+
+/*
+  Must match the keys on Rpl_acf_status_configuration::enum_key
+*/
+const std::vector<std::string> Rpl_acf_status_configuration::m_key_names{
+    "SOURCE_CONNECTION_AUTO_FAILOVER"};
+
+Rpl_acf_status_configuration::Rpl_acf_status_configuration() {
+  mysql_mutex_init(0, &m_lock, MY_MUTEX_INIT_FAST);
+}
+
+Rpl_acf_status_configuration::~Rpl_acf_status_configuration() {
+  mysql_mutex_destroy(&m_lock);
+}
+
+std::string Rpl_acf_status_configuration::get_key_name(
+    Rpl_acf_status_configuration::enum_key key) {
+  assert(key < m_key_names.size());
+  return m_key_names[key];
+}
+
+bool Rpl_acf_status_configuration::reset() {
+  DBUG_TRACE;
+  /*
+    On operations that touch both channels info objects and this
+    object, the lock order must be:
+      1) channel_map.wrlock()
+      2) Rpl_acf_status_configuration::m_lock
+    thence the caller must acquire channel_map.wrlock() before calling
+    this method.
+  */
+  channel_map.assert_some_wrlock();
+  MUTEX_LOCK(guard, &m_lock);
+
+  m_version = 0;
+  m_status.clear();
+
+  return unset_source_connection_auto_failover_on_all_channels();
+}
+
+void Rpl_acf_status_configuration::reload() {
+  DBUG_TRACE;
+  /*
+    On operations that touch both channels info objects and this
+    object, the lock order must be:
+      1) channel_map.rdlock()
+      2) Rpl_acf_status_configuration::m_lock
+    thence the caller must acquire channel_map.rdlock() before calling
+    this method.
+  */
+  channel_map.assert_some_lock();
+  MUTEX_LOCK(guard, &m_lock);
+
+  m_version = 0;
+  m_status.clear();
+
+  for (mi_map::iterator it = channel_map.begin(); it != channel_map.end();
+       it++) {
+    Master_info *mi = it->second;
+    if (Master_info::is_configured(mi) &&
+        mi->is_source_connection_auto_failover()) {
+      m_version = 1;
+
+      std::pair<std::string, std::string> key_pair = std::make_pair(
+          mi->get_channel(), get_key_name(SOURCE_CONNECTION_AUTO_FAILOVER));
+      m_status.insert(std::make_pair(key_pair, 1));
+    }
+  }
+}
+
+void Rpl_acf_status_configuration::delete_channel_status(
+    const std::string &channel, Rpl_acf_status_configuration::enum_key key) {
+  DBUG_TRACE;
+  MUTEX_LOCK(guard, &m_lock);
+
+  std::string key_name = get_key_name(key);
+  std::pair<std::string, std::string> key_pair =
+      std::make_pair(channel, key_name);
+
+  auto it = m_status.find(key_pair);
+  if (it != m_status.end()) {
+    m_status.erase(it);
+    m_version++;
+  }
+}
+
+void Rpl_acf_status_configuration::set_value_and_increment_version(
+    const std::string &channel, Rpl_acf_status_configuration::enum_key key,
+    int value,
+    protobuf_replication_asynchronous_connection_failover::VariableStatusList
+        &configuration) {
+  DBUG_TRACE;
+  MUTEX_LOCK(guard, &m_lock);
+
+  m_version++;
+
+  std::string key_name = get_key_name(key);
+  std::pair<std::string, std::string> key_pair =
+      std::make_pair(channel, key_name);
+  m_status[key_pair] = value;
+
+  // Add full content to output configuration.
+  configuration.set_origin(server_uuid);
+  configuration.set_version(m_version);
+
+  for (auto it = m_status.begin(); it != m_status.end(); ++it) {
+    protobuf_replication_asynchronous_connection_failover::VariableStatus
+        *status = configuration.add_status();
+    status->set_channel(it->first.first);
+    status->set_key(it->first.second);
+    status->set_status(it->second);
+  }
+}
+
+bool Rpl_acf_status_configuration::set(
+    const protobuf_replication_asynchronous_connection_failover::
+        VariableStatusList &configuration) {
+  DBUG_TRACE;
+  /*
+    On operations that touch both channels info objects and this
+    object, the lock order must be:
+      1) channel_map.wrlock()
+      2) Rpl_acf_status_configuration::m_lock
+    thence the caller must acquire channel_map.wrlock() before calling
+    this method.
+  */
+  channel_map.assert_some_wrlock();
+  MUTEX_LOCK(guard, &m_lock);
+
+  if (configuration.version() > m_version) {
+    if (unset_source_connection_auto_failover_on_all_channels()) {
+      return true;
+    }
+
+    m_version = configuration.version();
+    m_status.clear();
+
+    for (const protobuf_replication_asynchronous_connection_failover::
+             VariableStatus &status : configuration.status()) {
+      std::pair<std::string, std::string> key_pair =
+          std::make_pair(status.channel(), status.key());
+      m_status.insert(std::make_pair(key_pair, status.status()));
+
+      // Update `SOURCE_CONNECTION_AUTO_FAILOVER` on channel configuration.
+      if (!get_key_name(
+               Rpl_acf_status_configuration::SOURCE_CONNECTION_AUTO_FAILOVER)
+               .compare(status.key())) {
+        bool error = channel_change_source_connection_auto_failover(
+            status.channel().c_str(), status.status());
+        if (error) {
+          return true;
+        }
+      }
+    }
+  }
+
+  return false;
+}
+
+bool Rpl_acf_status_configuration::set(
+    const protobuf_replication_asynchronous_connection_failover::
+        SourceAndManagedAndStatusList &configuration) {
+  DBUG_TRACE;
+  /*
+    On operations that touch both channels info objects and this
+    object, the lock order must be:
+      1) channel_map.wrlock()
+      2) Rpl_acf_status_configuration::m_lock
+    thence the caller must acquire channel_map.wrlock() before calling
+    this method.
+  */
+  channel_map.assert_some_wrlock();
+  MUTEX_LOCK(guard, &m_lock);
+
+  if (unset_source_connection_auto_failover_on_all_channels()) {
+    return true;
+  }
+
+  m_version = configuration.status_version();
+  m_status.clear();
+
+  for (const protobuf_replication_asynchronous_connection_failover::
+           VariableStatus &status : configuration.status()) {
+    std::pair<std::string, std::string> key_pair =
+        std::make_pair(status.channel(), status.key());
+    m_status.insert(std::make_pair(key_pair, status.status()));
+
+    // Update `SOURCE_CONNECTION_AUTO_FAILOVER` on channel configuration.
+    if (!get_key_name(
+             Rpl_acf_status_configuration::SOURCE_CONNECTION_AUTO_FAILOVER)
+             .compare(status.key())) {
+      bool error = channel_change_source_connection_auto_failover(
+          status.channel().c_str(), status.status());
+      if (error) {
+        return true;
+      }
+    }
+  }
+
+  return false;
+}
+
+void Rpl_acf_status_configuration::get(
+    protobuf_replication_asynchronous_connection_failover::
+        SourceAndManagedAndStatusList &configuration) {
+  DBUG_TRACE;
+  MUTEX_LOCK(guard, &m_lock);
+
+  configuration.set_status_version(m_version);
+  configuration.clear_status();
+
+  for (std::map<std::pair<std::string, std::string>, int>::iterator it =
+           m_status.begin();
+       it != m_status.end(); ++it) {
+    protobuf_replication_asynchronous_connection_failover::VariableStatus
+        *status = configuration.add_status();
+    status->set_channel(it->first.first);
+    status->set_key(it->first.second);
+    status->set_status(it->second);
+  }
+}
+
+Rpl_acf_configuration_handler::Rpl_acf_configuration_handler() {}
+
+Rpl_acf_configuration_handler::~Rpl_acf_configuration_handler() { deinit(); }
+
+bool Rpl_acf_configuration_handler::init() {
+  DBUG_TRACE;
+
+  my_service<SERVICE_TYPE(registry_registration)> registrator(
+      "registry_registration", srv_registry);
+  using group_replication_message_service_recv_t =
+      SERVICE_TYPE_NO_CONST(group_replication_message_service_recv);
+  bool result = registrator->register_service(
+      "group_replication_message_service_recv.replication_asynchronous_"
+      "connection_failover_configuration",
+      reinterpret_cast<my_h_service>(
+          const_cast<group_replication_message_service_recv_t *>(
+              &SERVICE_IMPLEMENTATION(
+                  group_replication, group_replication_message_service_recv))));
+
+  if (result) {
+    LogErr(ERROR_LEVEL, ER_GRP_RPL_FAILOVER_REGISTER_MESSAGE_LISTENER_SERVICE);
+  }
+
+  return result;
+}
+
+bool Rpl_acf_configuration_handler::deinit() {
+  DBUG_TRACE;
+
+  my_service<SERVICE_TYPE(registry_registration)> registrator(
+      "registry_registration", srv_registry);
+  return registrator->unregister(
+      "group_replication_message_service_recv.replication_asynchronous_"
+      "connection_failover_configuration");
+}
+
+bool Rpl_acf_configuration_handler::receive(const char *tag,
+                                            const unsigned char *data,
+                                            size_t data_length) {
+  DBUG_TRACE;
+
+  if (!m_message_tag[0].compare(tag)) {
+    return receive_failover(data, data_length);
+  } else if (!m_message_tag[1].compare(tag)) {
+    return receive_managed(data, data_length);
+  } else if (!m_message_tag[2].compare(tag)) {
+    return receive_channel_status(data, data_length);
+  } else if (!m_message_tag[3].compare(tag)) {
+    return receive_failover_and_managed_and_status(data, data_length);
+  }
+
+  return false;
+}
+
+bool Rpl_acf_configuration_handler::receive_failover(const unsigned char *data,
+                                                     size_t data_length) {
+  DBUG_TRACE;
+  bool err_val{false};
+  std::string err_msg{};
+
+  protobuf_replication_asynchronous_connection_failover::SourceList
+      configuration;
+  if (!configuration.ParseFromArray(data, data_length)) {
+    return true;
+  }
+
+  if (configuration.origin().compare(server_uuid)) {
+    /* Received replication_asynchronous_connection_failover table data */
+    Rpl_sys_table_access table_op(m_db, m_table_failover,
+                                  m_table_failover_num_field);
+    if (table_op.open(TL_WRITE)) {
+      table_op.set_error();
+      return true;
+    }
+
+    /* Ignore update if stored version is greater than received version */
+    if (table_op.get_version() > configuration.version()) return false;
+
+    /* Update received version. */
+    if (table_op.update_version(configuration.version())) return true;
+
+    google::protobuf::RepeatedPtrField<
+        protobuf_replication_asynchronous_connection_failover::Source> *fld =
+        configuration.mutable_source();
+    google::protobuf::internal::RepeatedPtrIterator<
+        protobuf_replication_asynchronous_connection_failover::Source>
+        it = fld->begin();
+
+    /*
+      Delete all rows from table than add received rows.
+      The table will become empty if no rows are received.
+    */
+    if (table_op.delete_all_rows()) {
+      return true;
+    }
+
+    /* Add received rows to table. */
+    for (; it != fld->end(); ++it) {
+      std::tie(err_val, err_msg) =
+          Rpl_async_conn_failover_table_operations::add_source_skip_send(
+              it->channel(), it->host(), it->port(), it->network_namespace(),
+              it->weight(), it->managed_name(), table_op);
+      if (err_val) {
+        return true;
+      }
+    }
+
+    if (table_op.close(false)) {
+      return true;
+    }
+  }
+
+  return err_val;
+}
+
+bool Rpl_acf_configuration_handler::receive_managed(const unsigned char *data,
+                                                    size_t data_length) {
+  DBUG_TRACE;
+  bool err_val{false};
+  std::string err_msg{};
+
+  protobuf_replication_asynchronous_connection_failover::ManagedList
+      configuration;
+  if (!configuration.ParseFromArray(data, data_length)) {
+    return true;
+  }
+
+  if (configuration.origin().compare(server_uuid)) {
+    /*
+      Received replication_asynchronous_connection_failover_managed table
+      data.
+    */
+    Rpl_sys_table_access table_op(m_db, m_table_managed,
+                                  m_table_managed_num_field);
+    if (table_op.open(TL_WRITE)) {
+      table_op.set_error();
+      return true;
+    }
+
+    /* Ignore update if stored version is greater than received version. */
+    if (table_op.get_version() > configuration.version()) return false;
+
+    /* Update received version. */
+    if (table_op.update_version(configuration.version())) return true;
+
+    google::protobuf::RepeatedPtrField<
+        protobuf_replication_asynchronous_connection_failover::Managed> *fld =
+        configuration.mutable_managed();
+    google::protobuf::internal::RepeatedPtrIterator<
+        protobuf_replication_asynchronous_connection_failover::Managed>
+        it = fld->begin();
+
+    /*
+      Delete all rows from table than add received rows.
+      The table will become empty if no rows are received.
+    */
+    if (table_op.delete_all_rows()) {
+      return true;
+    }
+
+    /* Add received rows to table. */
+    for (; it != fld->end(); ++it) {
+      json_binary::Value json_val = json_binary::parse_binary(
+          it->configuration().c_str(), it->configuration().length());
+      if (json_val.type() == json_binary::Value::ERROR) {
+        return true;
+      }
+
+      Json_wrapper wrapper(json_val);
+      std::tie(err_val, err_msg) =
+          Rpl_async_conn_failover_table_operations::add_managed_skip_send(
+              it->channel(), it->managed_type(), it->managed_name(), wrapper,
+              table_op);
+      if (err_val) {
+        return true;
+      }
+    }
+
+    if (table_op.close(false)) {
+      return true;
+    }
+  }
+
+  return err_val;
+}
+
+bool Rpl_acf_configuration_handler::receive_channel_status(
+    const unsigned char *data, size_t data_length) {
+  DBUG_TRACE;
+
+  /* Received replica status data. */
+  protobuf_replication_asynchronous_connection_failover::VariableStatusList
+      configuration;
+  if (!configuration.ParseFromArray(data, data_length)) {
+    return true;
+  }
+
+  if (configuration.origin().compare(server_uuid)) {
+    channel_map.wrlock();
+    bool set_status_error = m_rpl_failover_channels_status.set(configuration);
+    channel_map.unlock();
+    if (set_status_error) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+bool Rpl_acf_configuration_handler::send_failover(const char *data,
+                                                  size_t data_length) {
+  DBUG_TRACE;
+  return send(m_message_tag[0].c_str(), data, data_length);
+}
+
+bool Rpl_acf_configuration_handler::send_managed(const char *data,
+                                                 size_t data_length) {
+  DBUG_TRACE;
+  return send(m_message_tag[1].c_str(), data, data_length);
+}
+
+bool Rpl_acf_configuration_handler::send_channel_status(const char *data,
+                                                        size_t data_length) {
+  DBUG_TRACE;
+  return send(m_message_tag[2].c_str(), data, data_length);
+}
+
+bool Rpl_acf_configuration_handler::send(const char *tag, const char *data,
+                                         size_t data_length) {
+  DBUG_TRACE;
+  bool error = false;
+
+  if (tag == nullptr) return true;
+
+  my_h_service gr_status_service_handler = nullptr;
+  SERVICE_TYPE(group_replication_status_service_v1) *gr_status_service =
+      nullptr;
+  my_h_service gr_send_service_handler = nullptr;
+  SERVICE_TYPE(group_replication_message_service_send) *gr_send_service =
+      nullptr;
+
+  srv_registry->acquire("group_replication_status_service_v1",
+                        &gr_status_service_handler);
+  if (nullptr == gr_status_service_handler) {
+    // GR plugin is not loaded.
+    goto end;
+  }
+
+  srv_registry->acquire("group_replication_message_service_send",
+                        &gr_send_service_handler);
+  if (nullptr == gr_send_service_handler) {
+    // GR plugin is not loaded.
+    goto end;
+  }
+
+  gr_status_service =
+      reinterpret_cast<SERVICE_TYPE(group_replication_status_service_v1) *>(
+          gr_status_service_handler);
+  if (!gr_status_service
+           ->is_group_in_single_primary_mode_and_im_the_primary()) {
+    goto end;
+  }
+
+  gr_send_service =
+      reinterpret_cast<SERVICE_TYPE(group_replication_message_service_send) *>(
+          gr_send_service_handler);
+  error = gr_send_service->send(tag, pointer_cast<const unsigned char *>(data),
+                                data_length);
+
+end:
+  srv_registry->release(gr_send_service_handler);
+  srv_registry->release(gr_status_service_handler);
+
+  return error;
+}
+
+bool Rpl_acf_configuration_handler::send_channel_status_and_version_data(
+    const std::string &channel, Rpl_acf_status_configuration::enum_key key,
+    int status) {
+  DBUG_TRACE;
+
+  if (channel_map.is_group_replication_channel_name(channel.c_str())) {
+    return false;
+  }
+
+  if (is_group_replication_member_secondary()) {
+    return false;
+  }
+
+  protobuf_replication_asynchronous_connection_failover::VariableStatusList
+      configuration;
+  m_rpl_failover_channels_status.set_value_and_increment_version(
+      channel, key, status, configuration);
+
+  std::string serialized_configuration{};
+  if (!configuration.SerializeToString(&serialized_configuration)) {
+    return true;
+  }
+
+  if (rpl_acf_configuration_handler->send_channel_status(
+          serialized_configuration.c_str(),
+          serialized_configuration.length())) {
+    return true;
+  }
+
+  return false;
+}
+
+void Rpl_acf_configuration_handler::delete_channel_status(
+    const std::string &channel, Rpl_acf_status_configuration::enum_key key) {
+  DBUG_TRACE;
+  m_rpl_failover_channels_status.delete_channel_status(channel, key);
+}
+
+bool Rpl_acf_configuration_handler::send_managed_data(
+    Rpl_sys_table_access &table_op) {
+  std::vector<RPL_FAILOVER_MANAGED_JSON_TUPLE> managed_list;
+  protobuf_replication_asynchronous_connection_failover::ManagedList
+      configuration;
+  std::string serialized_configuration{};
+
+  if (Rpl_async_conn_failover_table_operations::
+          read_managed_random_rows_internal(table_op, managed_list)) {
+    return true;
+  }
+
+  for (auto managed_detail : managed_list) {
+    auto managed = configuration.add_managed();
+    managed->set_channel(std::get<0>(managed_detail));
+    managed->set_managed_name(std::get<1>(managed_detail));
+    managed->set_managed_type(std::get<2>(managed_detail));
+
+    // Convert Json_wrapper to binary format
+    String buffer;
+    if (std::get<3>(managed_detail).to_binary(current_thd, &buffer)) {
+      return true;
+    }
+
+    std::string str = std::string(buffer.ptr(), buffer.length());
+    managed->set_configuration(str);
+  }
+
+  configuration.set_origin(server_uuid);
+  configuration.set_version(table_op.get_version());
+
+  if (!configuration.SerializeToString(&serialized_configuration)) {
+    return true;
+  }
+
+  if (table_op.close(false)) {
+    return true;
+  }
+
+  if (rpl_acf_configuration_handler->send_managed(
+          serialized_configuration.c_str(),
+          serialized_configuration.length())) {
+    return true;
+  }
+
+  return false;
+}
+
+bool Rpl_acf_configuration_handler::send_failover_data(
+    Rpl_sys_table_access &table_op) {
+  bool error{false};
+  RPL_FAILOVER_SOURCE_LIST source_list;
+  protobuf_replication_asynchronous_connection_failover::SourceList
+      configuration;
+  std::string serialized_configuration{};
+
+  std::tie(error, source_list) =
+      Rpl_async_conn_failover_table_operations::read_source_all_rows_internal(
+          table_op);
+  if (error) return error;
+
+  for (auto source_detail : source_list) {
+    auto source = configuration.add_source();
+    source->set_channel(std::get<0>(source_detail));
+    source->set_host(std::get<1>(source_detail));
+    source->set_port(std::get<2>(source_detail));
+    source->set_network_namespace(std::get<3>(source_detail));
+    source->set_weight(std::get<4>(source_detail));
+    source->set_managed_name(std::get<5>(source_detail));
+  }
+
+  configuration.set_origin(server_uuid);
+  configuration.set_version(table_op.get_version());
+
+  if (!configuration.SerializeToString(&serialized_configuration)) {
+    return true;
+  }
+
+  if (table_op.close(false)) {
+    return true;
+  }
+
+  if (rpl_acf_configuration_handler->send_failover(
+          serialized_configuration.c_str(),
+          serialized_configuration.length())) {
+    return true;
+  }
+
+  return false;
+}
+
+bool Rpl_acf_configuration_handler::send_table_data(
+    Rpl_sys_table_access &table_op) {
+  if (!table_op.get_table_name().compare(m_table_failover)) {
+    return rpl_acf_configuration_handler->send_failover_data(table_op);
+  } else if (!table_op.get_table_name().compare(m_table_managed)) {
+    return rpl_acf_configuration_handler->send_managed_data(table_op);
+  }
+
+  return true;
+}
+
+void Rpl_acf_configuration_handler::reload_failover_channels_status() {
+  DBUG_TRACE;
+  m_rpl_failover_channels_status.reload();
+}
+
+bool Rpl_acf_configuration_handler::get_configuration(
+    std::string &serialized_configuration) {
+  DBUG_TRACE;
+  bool error = false;
+
+  protobuf_replication_asynchronous_connection_failover::
+      SourceAndManagedAndStatusList configuration;
+  configuration.set_origin(server_uuid);
+
+  /* failover sources table */
+  RPL_FAILOVER_SOURCE_LIST source_list;
+  Rpl_sys_table_access table_sources(m_db, m_table_failover,
+                                     m_table_failover_num_field);
+  if (table_sources.open(TL_READ)) {
+    return true;
+  }
+  std::tie(error, source_list) =
+      Rpl_async_conn_failover_table_operations::read_source_all_rows_internal(
+          table_sources);
+  if (error) {
+    return error;
+  }
+
+  configuration.set_source_version(table_sources.get_version());
+  for (RPL_FAILOVER_SOURCE_TUPLE source_tuple : source_list) {
+    protobuf_replication_asynchronous_connection_failover::Source *source =
+        configuration.add_source();
+    source->set_channel(std::get<0>(source_tuple));
+    source->set_host(std::get<1>(source_tuple));
+    source->set_port(std::get<2>(source_tuple));
+    source->set_network_namespace(std::get<3>(source_tuple));
+    source->set_weight(std::get<4>(source_tuple));
+    source->set_managed_name(std::get<5>(source_tuple));
+  }
+
+  if (table_sources.close(error)) {
+    return true;
+  }
+
+  /* failover managed table */
+  std::vector<RPL_FAILOVER_MANAGED_JSON_TUPLE> managed_list;
+  Rpl_sys_table_access table_managed(m_db, m_table_managed,
+                                     m_table_managed_num_field);
+  if (table_managed.open(TL_READ)) {
+    return true;
+  }
+  error = Rpl_async_conn_failover_table_operations::
+      read_managed_random_rows_internal(table_managed, managed_list);
+  if (error) {
+    return error;
+  }
+
+  configuration.set_managed_version(table_managed.get_version());
+  for (RPL_FAILOVER_MANAGED_JSON_TUPLE managed_tuple : managed_list) {
+    protobuf_replication_asynchronous_connection_failover::Managed *managed =
+        configuration.add_managed();
+    managed->set_channel(std::get<0>(managed_tuple));
+    managed->set_managed_name(std::get<1>(managed_tuple));
+    managed->set_managed_type(std::get<2>(managed_tuple));
+
+    // Convert Json_wrapper to binary format
+    String buffer;
+    if (std::get<3>(managed_tuple).to_binary(current_thd, &buffer)) {
+      return true;
+    }
+
+    std::string str = std::string(buffer.ptr(), buffer.length());
+    managed->set_configuration(str);
+  }
+
+  if (table_managed.close(error)) {
+    return true;
+  }
+
+  /* status */
+  m_rpl_failover_channels_status.get(configuration);
+
+  if (!configuration.SerializeToString(&serialized_configuration)) {
+    return true;
+  }
+
+  return error;
+}
+
+bool Rpl_acf_configuration_handler::set_configuration(
+    const std::vector<std::string>
+        &exchanged_replication_failover_channels_serialized_configuration) {
+  DBUG_TRACE;
+
+  if (exchanged_replication_failover_channels_serialized_configuration.size() <
+      1) {
+    /*
+      This member joined a group on which all members do not support
+      WL#14020, as such this member needs to reset its replication
+      failover channels configuration to the default one.
+    */
+    LogErr(WARNING_LEVEL, ER_GRP_RPL_FAILOVER_CONF_DEFAULT_CONFIGURATION);
+    Rpl_async_conn_failover_table_operations sql_operations(TL_WRITE);
+    if (sql_operations.reset()) {
+      LogErr(ERROR_LEVEL,
+             ER_GRP_RPL_FAILOVER_CONF_UNABLE_TO_SET_DEFAULT_CONFIGURATION);
+      return true;
+    }
+
+    if (m_rpl_failover_channels_status.reset()) {
+      LogErr(ERROR_LEVEL,
+             ER_GRP_RPL_FAILOVER_CONF_UNABLE_TO_SET_DEFAULT_CONFIGURATION);
+      return true;
+    }
+
+    return false;
+  }
+
+  /*
+    Since we receive the replication failover channels configuration from
+    all non-joining members, and its changes may be being propagated
+    concurrently with membership changes, we need to choose the configuration
+    with higher version.
+  */
+  protobuf_replication_asynchronous_connection_failover::
+      SourceAndManagedAndStatusList configuration_sources_with_higher_version;
+  configuration_sources_with_higher_version.set_source_version(0);
+
+  protobuf_replication_asynchronous_connection_failover::
+      SourceAndManagedAndStatusList configuration_managed_with_higher_version;
+  configuration_managed_with_higher_version.set_managed_version(0);
+
+  protobuf_replication_asynchronous_connection_failover::
+      SourceAndManagedAndStatusList configuration_status_with_higher_version;
+  configuration_status_with_higher_version.set_status_version(0);
+
+  for (std::string replication_failover_channels_serialized_configuration :
+       exchanged_replication_failover_channels_serialized_configuration) {
+    protobuf_replication_asynchronous_connection_failover::
+        SourceAndManagedAndStatusList configuration;
+
+    if (!configuration.ParseFromString(
+            replication_failover_channels_serialized_configuration)) {
+      LogErr(ERROR_LEVEL, ER_GRP_RPL_FAILOVER_CONF_PARSE_ON_MEMBER_JOIN);
+      continue;
+    }
+
+    if (configuration.source_version() >
+        configuration_sources_with_higher_version.source_version()) {
+      configuration_sources_with_higher_version.CopyFrom(configuration);
+    }
+
+    if (configuration.managed_version() >
+        configuration_managed_with_higher_version.managed_version()) {
+      configuration_managed_with_higher_version.CopyFrom(configuration);
+    }
+
+    if (configuration.status_version() >
+        configuration_status_with_higher_version.status_version()) {
+      configuration_status_with_higher_version.CopyFrom(configuration);
+    }
+  }
+
+  /* failover sources table */
+  if (set_failover_sources_internal(
+          configuration_sources_with_higher_version)) {
+    return true;
+  }
+
+  /* failover managed table */
+  if (set_failover_managed_internal(
+          configuration_managed_with_higher_version)) {
+    return true;
+  }
+
+  /* status */
+  if (m_rpl_failover_channels_status.set(
+          configuration_status_with_higher_version)) {
+    return true;
+  }
+
+  return false;
+}
+
+bool Rpl_acf_configuration_handler::
+    force_my_replication_failover_channels_configuration_on_all_members() {
+  DBUG_TRACE;
+
+  std::string serialized_configuration;
+  bool error = get_configuration(serialized_configuration);
+  if (error) {
+    return true;
+  }
+
+  return send(m_message_tag[3].c_str(), serialized_configuration.c_str(),
+              serialized_configuration.length());
+}
+
+bool Rpl_acf_configuration_handler::receive_failover_and_managed_and_status(
+    const unsigned char *data, size_t data_length) {
+  DBUG_TRACE;
+
+  protobuf_replication_asynchronous_connection_failover::
+      SourceAndManagedAndStatusList configuration;
+  if (!configuration.ParseFromArray(data, data_length)) {
+    return true;
+  }
+
+  if (configuration.origin().compare(server_uuid)) {
+    /* failover sources table */
+    if (set_failover_sources_internal(configuration)) {
+      return true;
+    }
+
+    /* failover managed table */
+    if (set_failover_managed_internal(configuration)) {
+      return true;
+    }
+
+    /* status */
+    channel_map.wrlock();
+    bool set_status_error = m_rpl_failover_channels_status.set(configuration);
+    channel_map.unlock();
+    if (set_status_error) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+bool Rpl_acf_configuration_handler::set_failover_sources_internal(
+    const protobuf_replication_asynchronous_connection_failover::
+        SourceAndManagedAndStatusList &configuration) {
+  DBUG_TRACE;
+
+  /* failover sources table */
+  Rpl_sys_table_access table_sources(m_db, m_table_failover,
+                                     m_table_failover_num_field);
+  if (table_sources.open(TL_WRITE)) {
+    return true;
+  }
+
+  /*
+    Older MySQL versions may have configuration without version,
+    which means its value will be 0, though we only store version
+    greater than 1 on the versions table.
+  */
+  if (configuration.source_version() > 0) {
+    if (table_sources.update_version(configuration.source_version())) {
+      return true;
+    }
+  } else {
+    if (table_sources.delete_version()) {
+      return true;
+    }
+  }
+
+  if (table_sources.delete_all_rows()) {
+    return true;
+  }
+
+  for (const protobuf_replication_asynchronous_connection_failover::Source
+           &source : configuration.source()) {
+    bool err_val{false};
+    std::string err_msg{};
+    std::tie(err_val, err_msg) =
+        Rpl_async_conn_failover_table_operations::add_source_skip_send(
+            source.channel(), source.host(), source.port(),
+            source.network_namespace(), source.weight(), source.managed_name(),
+            table_sources);
+    if (err_val) {
+      return true;
+    }
+  }
+
+  if (table_sources.close(false, true)) {
+    return true;
+  }
+
+  return false;
+}
+
+bool Rpl_acf_configuration_handler::set_failover_managed_internal(
+    const protobuf_replication_asynchronous_connection_failover::
+        SourceAndManagedAndStatusList &configuration) {
+  DBUG_TRACE;
+
+  Rpl_sys_table_access table_managed(m_db, m_table_managed,
+                                     m_table_managed_num_field);
+  if (table_managed.open(TL_WRITE)) {
+    return true;
+  }
+
+  /*
+    Older MySQL versions may have configuration without version,
+    which means its value will be 0, though we only store version
+    greater than 1 on the versions table.
+  */
+  if (configuration.managed_version() > 0) {
+    if (table_managed.update_version(configuration.managed_version())) {
+      return true;
+    }
+  } else {
+    if (table_managed.delete_version()) {
+      return true;
+    }
+  }
+
+  if (table_managed.delete_all_rows()) {
+    return true;
+  }
+
+  for (const protobuf_replication_asynchronous_connection_failover::Managed
+           &managed : configuration.managed()) {
+    bool err_val{false};
+    std::string err_msg{};
+
+    json_binary::Value json_val = json_binary::parse_binary(
+        managed.configuration().c_str(), managed.configuration().length());
+    if (json_val.type() == json_binary::Value::ERROR) {
+      return true;
+    }
+
+    Json_wrapper wrapper(json_val);
+    std::tie(err_val, err_msg) =
+        Rpl_async_conn_failover_table_operations::add_managed_skip_send(
+            managed.channel(), managed.managed_type(), managed.managed_name(),
+            wrapper, table_managed);
+    if (err_val) {
+      return true;
+    }
+  }
+
+  if (table_managed.close(false, true)) {
+    return true;
+  }
+
+  return false;
+}
diff -Nru mysql-8.0-8.0.26/sql/rpl_async_conn_failover_configuration_propagation.h mysql-8.0-8.0.27/sql/rpl_async_conn_failover_configuration_propagation.h
--- mysql-8.0-8.0.26/sql/rpl_async_conn_failover_configuration_propagation.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_async_conn_failover_configuration_propagation.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,471 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef RPL_ASYNC_CONN_FAILOVER_CONFIGURATION_PROPAGATION_INCLUDED
+#define RPL_ASYNC_CONN_FAILOVER_CONFIGURATION_PROPAGATION_INCLUDED
+
+#include <map>
+#include <string>
+#include <vector>
+#include "sql/protobuf/generated/protobuf_lite/replication_asynchronous_connection_failover.pb.h"
+#include "sql/rpl_sys_table_access.h"
+
+/**
+  Memory storage of the replication failover channel status
+  configuration propagated to Group Replication members.
+*/
+class Rpl_acf_status_configuration {
+ public:
+  Rpl_acf_status_configuration();
+
+  virtual ~Rpl_acf_status_configuration();
+
+  /**
+    Status keys propagated with the group.
+  */
+  enum enum_key { SOURCE_CONNECTION_AUTO_FAILOVER = 0 };
+
+  /**
+    Clears the status configuration.
+
+    @return function return value which determines:
+            false  Successful
+            true   Error
+  */
+  bool reset();
+
+  /**
+    Reloads the status configuration from runtime information.
+  */
+  void reload();
+
+  /**
+    Delete the status configuration value.
+
+    @param[in] channel  the channel name.
+    @param[in] key      the variable whose status to set and increment
+                        version.
+  */
+  void delete_channel_status(const std::string &channel,
+                             Rpl_acf_status_configuration::enum_key key);
+
+  /**
+    Sets the status configuration value and increment version value.
+
+    @param[in] channel  the channel name.
+    @param[in] key      the variable whose status to set and increment
+                        version.
+    @param[in] value    the variable status value to set.
+    @param[in] configuration  the configuration in protobuf
+  */
+  void set_value_and_increment_version(
+      const std::string &channel, Rpl_acf_status_configuration::enum_key key,
+      int value,
+      protobuf_replication_asynchronous_connection_failover::VariableStatusList
+          &configuration);
+
+  /**
+    Sets the status configuration with the one received from the
+    group.
+
+    @param[in] configuration  the configuration in protobuf
+
+    @return function return value which determines:
+            false  Successful
+            true   Error
+  */
+  bool set(const protobuf_replication_asynchronous_connection_failover::
+               VariableStatusList &configuration);
+
+  /**
+    Sets the status configuration with the one received from the
+    group.
+
+    @param[in] configuration  the configuration in protobuf
+
+    @return function return value which determines:
+            false  Successful
+            true   Error
+  */
+  bool set(const protobuf_replication_asynchronous_connection_failover::
+               SourceAndManagedAndStatusList &configuration);
+
+  /**
+    Gets the status configuration to send to the group.
+
+    @param[out] configuration  the configuration in protobuf
+  */
+  void get(protobuf_replication_asynchronous_connection_failover::
+               SourceAndManagedAndStatusList &configuration);
+
+ private:
+  mysql_mutex_t m_lock;
+
+  ulonglong m_version{0};
+
+  /*
+    Stores replication failover channel status propagated to Group
+    Replication members.
+    map(<channel,key>, value)
+  */
+  std::map<std::pair<std::string, std::string>, int> m_status;
+
+  static const std::vector<std::string> m_key_names;
+
+  static std::string get_key_name(Rpl_acf_status_configuration::enum_key key);
+};
+
+/*
+  Class provides functions to send and receive
+  replication_asynchronous_connection_failover and
+  replication_asynchronous_connection_failover_managed table data, and
+  SOURCE_CONNECTION_AUTO_FAILOVER value of CHANGE REPLICATION SOURCE command.
+*/
+class Rpl_acf_configuration_handler {
+ public:
+  /**
+    Construction.
+  */
+  Rpl_acf_configuration_handler();
+
+  /**
+    Destruction.
+  */
+  virtual ~Rpl_acf_configuration_handler();
+
+  /**
+    Initialize and configure group_replication_message_service_recv service
+    so member can receive and process data from group members.
+
+    @return function return value which determines if was:
+            false  Successful
+            true   Error
+  */
+  bool init();
+
+  /**
+    Receive data sent by group replication group member.
+
+    @param[in] tag    identifier which determine type of data received.
+    @param[in] data   data received.
+    @param[in] data_length   size of data received.
+
+    @return function return value which determines if read was:
+            false  Successful
+            true   Error
+  */
+  bool receive(const char *tag, const unsigned char *data, size_t data_length);
+
+  /**
+    Send variable status to its group replication group members.
+
+    @param[in] channel  the channel name.
+    @param[in] key  the variable whose status to be send.
+    @param[in] status  the variable status to be send.
+
+    @return function return value which determines:
+            false  Successful
+            true   Error
+  */
+  bool send_channel_status_and_version_data(
+      const std::string &channel, Rpl_acf_status_configuration::enum_key key,
+      int status);
+
+  /**
+    Delete channel status.
+
+    @param[in] channel  the channel name.
+    @param[in] key  the variable whose status to be send.
+  */
+  void delete_channel_status(const std::string &channel,
+                             Rpl_acf_status_configuration::enum_key key);
+
+  /**
+    Get stored data in
+    mysql.replication_asynchronous_connection_failover or
+    mysql.replication_asynchronous_connection_failover_managed table and send
+    to its group replication group members.
+
+    @param[in]  table_op  Rpl_sys_table_access class object.
+
+    @return function return value which determines:
+            false  Successful
+            true   Error
+  */
+  bool send_table_data(Rpl_sys_table_access &table_op);
+
+  /**
+    Get stored data in
+    mysql.replication_asynchronous_connection_failover table and send
+    to its group replication group members.
+
+    @param[in]  table_op  Rpl_sys_table_access class object.
+
+    @return function return value which determines:
+            false  Successful
+            true   Error
+  */
+  bool send_failover_data(Rpl_sys_table_access &table_op);
+
+  /**
+    Reload the failover channel status from runtime information.
+  */
+  void reload_failover_channels_status();
+
+  /**
+    Get data stored in
+    mysql.replication_asynchronous_connection_failover or
+    mysql.replication_asynchronous_connection_failover_managed table
+    in protobuf serialized string format.
+
+    @param[out]  serialized_configuration  save in protobuf serialized string
+                                           format.
+
+    @return function return value which determines:
+            false  Successful
+            true   Error
+  */
+  bool get_configuration(std::string &serialized_configuration);
+
+  /**
+    Save data in
+    mysql.replication_asynchronous_connection_failover or
+    mysql.replication_asynchronous_connection_failover_managed table.
+
+    @param[in] exchanged_replication_failover_channels_serialized_configuration
+                 save data from serialized string format.
+
+    @return function return value which determines:
+            false  Successful
+            true   Error
+  */
+  bool set_configuration(
+      const std::vector<std::string>
+          &exchanged_replication_failover_channels_serialized_configuration);
+
+  /**
+    Collect and broadcast the replication failover channels configuration
+    in a serialized
+    protobuf_replication_asynchronous_connection_failover::SourceAndManagedAndStatusList
+    message, that will override the configuration on all group members.
+
+    @return the operation status
+      @retval false  OK
+      @retval true   Error
+   */
+  bool force_my_replication_failover_channels_configuration_on_all_members();
+
+ private:
+  /* The list of tag identfiers which type of data sent. */
+  const std::vector<std::string> m_message_tag{
+      "mysql_replication_asynchronous_connection_failover",
+      "mysql_replication_asynchronous_connection_managed",
+      "mysql_replication_asynchronous_connection_variable_status",
+      "mysql_replication_asynchronous_connection_failover_and_managed_and_"
+      "status"};
+
+  /*
+    The database replication_asynchronous_connection_failover and
+    replication_asynchronous_connection_failover_managed table belongs to.
+  */
+  const std::string m_db{"mysql"};
+
+  /* replication_asynchronous_connection_failover table name */
+  const std::string m_table_failover{
+      "replication_asynchronous_connection_failover"};
+
+  /* number of fields in replication_asynchronous_connection_failover table */
+  const uint m_table_failover_num_field{6};
+
+  /* replication_asynchronous_connection_failover_managed table name */
+  const std::string m_table_managed{
+      "replication_asynchronous_connection_failover_managed"};
+  /*
+    number of fields in replication_asynchronous_connection_failover_managed
+    table
+  */
+  const uint m_table_managed_num_field{4};
+
+  /*
+    Stores replication failover channel status propagated to Group
+    Replication members.
+  */
+  Rpl_acf_status_configuration m_rpl_failover_channels_status;
+
+  /**
+    Unregister group_replication_message_service_recv service.
+
+    @return function return value which determines if was:
+            false  Successful
+            true   Error
+  */
+  bool deinit();
+
+  /**
+    Receive mysql.replication_asynchronous_connection_failover table data sent
+    by group replication group member.
+
+    @param[in] data   data received.
+    @param[in] data_length   size of data received.
+
+    @return function return value which determines if read was:
+            false  Successful
+            true   Error
+  */
+  bool receive_failover(const unsigned char *data, size_t data_length);
+
+  /**
+    Receive mysql.replication_asynchronous_connection_failover_managed table
+    data sent by group replication group member.
+
+    @param[in] data   data received.
+    @param[in] data_length   size of data received.
+
+    @return function return value which determines if read was:
+            false  Successful
+            true   Error
+  */
+  bool receive_managed(const unsigned char *data, size_t data_length);
+
+  /**
+    Receive SOURCE_CONNECTION_AUTO_FAILOVER value of CHANGE REPLICATION SOURCE
+    command data sent by group replication group member.
+
+    @param[in] data   data received.
+    @param[in] data_length   size of data received.
+
+    @return function return value which determines if read was:
+            false  Successful
+            true   Error
+  */
+  bool receive_channel_status(const unsigned char *data, size_t data_length);
+
+  /**
+    Receive mysql.replication_asynchronous_connection_failover and
+    mysql.replication_asynchronous_connection_failover_managed table
+    data sent by group replication group member.
+
+    @param[in] data   data received.
+    @param[in] data_length   size of data received.
+
+    @return function return value which determines if read was:
+            false  Successful
+            true   Error
+  */
+  bool receive_failover_and_managed_and_status(const unsigned char *data,
+                                               size_t data_length);
+
+  /**
+    Send data to all group replication group members.
+
+    @param[in] tag    identifier which determine type of data.
+    @param[in] data   data to be send
+    @param[in] data_length   size of data to be send.
+
+    @return function return value which determines if read was:
+            false  Successful
+            true   Error
+  */
+  bool send(const char *tag, const char *data, size_t data_length);
+
+  /**
+    Send mysql.replication_asynchronous_connection_failover table data
+    to group replication group members.
+
+    @param[in] data   data to be send
+    @param[in] data_length   size of data to be send.
+
+    @return function return value which determines if read was:
+            false  Successful
+            true   Error
+  */
+  bool send_failover(const char *data, size_t data_length);
+
+  /**
+    Send mysql.replication_asynchronous_connection_failover_managed table data
+    to group replication group members.
+
+    @param[in] data   data to be send
+    @param[in] data_length   size of data to be send.
+
+    @return function return value which determines if read was:
+            false  Successful
+            true   Error
+  */
+  bool send_managed(const char *data, size_t data_length);
+
+  /**
+    Get stored data in
+    mysql.replication_asynchronous_connection_failover_managed table and send
+    to its group replication group members.
+
+    @param[in]  table_op  Rpl_sys_table_access class object.
+
+    @return function return value which determines:
+            false  Successful
+            true   Error
+  */
+  bool send_managed_data(Rpl_sys_table_access &table_op);
+
+  /**
+    Send SOURCE_CONNECTION_AUTO_FAILOVER value of CHANGE REPLICATION SOURCE
+    command data to group replication group members.
+
+    @param[in] data   data to be send
+    @param[in] data_length   size of data to be send.
+
+    @return function return value which determines if read was:
+            false  Successful
+            true   Error
+  */
+  bool send_channel_status(const char *data, size_t data_length);
+
+  /**
+    Save data in
+    mysql.replication_asynchronous_connection_failover table.
+
+    @param[in] configuration  the configuration in protobuf
+
+    @return function return value which determines:
+            false  Successful
+            true   Error
+  */
+  bool set_failover_sources_internal(
+      const protobuf_replication_asynchronous_connection_failover::
+          SourceAndManagedAndStatusList &configuration);
+
+  /**
+    Save data in
+    mysql.replication_asynchronous_connection_failover_managed table.
+
+    @param[in] configuration  the configuration in protobuf
+
+    @return function return value which determines:
+            false  Successful
+            true   Error
+  */
+  bool set_failover_managed_internal(
+      const protobuf_replication_asynchronous_connection_failover::
+          SourceAndManagedAndStatusList &configuration);
+};
+
+#endif /* RPL_ASYNC_CONN_FAILOVER_CONFIGURATION_PROPAGATION_INCLUDED */
diff -Nru mysql-8.0-8.0.26/sql/rpl_async_conn_failover_delete_managed_udf.cc mysql-8.0-8.0.27/sql/rpl_async_conn_failover_delete_managed_udf.cc
--- mysql-8.0-8.0.26/sql/rpl_async_conn_failover_delete_managed_udf.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_async_conn_failover_delete_managed_udf.cc	2021-09-28 11:46:34.000000000 +0000
@@ -27,11 +27,9 @@
 #include "sql/auth/auth_acls.h"
 #include "sql/rpl_async_conn_failover_delete_managed_udf.h"
 #include "sql/rpl_async_conn_failover_table_operations.h"
+#include "sql/rpl_group_replication.h"
 #include "sql/rpl_io_monitor.h"
 
-const std::string Rpl_async_conn_failover_delete_managed::m_udf_name =
-    "asynchronous_connection_failover_delete_managed";
-
 bool Rpl_async_conn_failover_delete_managed::init() {
   DBUG_TRACE;
 
@@ -70,7 +68,7 @@
 
   if (err_val) {
     *error = 1;
-    my_error(ER_UDF_ERROR, MYF(0), m_udf_name.c_str(), err_msg.c_str());
+    my_error(ER_UDF_ERROR, MYF(0), m_udf_name, err_msg.c_str());
   } else {
     err_msg.assign(
         "The UDF asynchronous_connection_failover_delete_managed() "
@@ -139,6 +137,13 @@
     return true;
   }
 
+  if (is_group_replication_member_secondary()) {
+    my_stpcpy(message,
+              "Can't execute the given operation on a Group Replication "
+              "secondary member.");
+    return true;
+  }
+
   if (Udf_charset_service::set_return_value_charset(init_id) ||
       Udf_charset_service::set_args_charset(args))
     return true;
diff -Nru mysql-8.0-8.0.26/sql/rpl_async_conn_failover_delete_managed_udf.h mysql-8.0-8.0.27/sql/rpl_async_conn_failover_delete_managed_udf.h
--- mysql-8.0-8.0.26/sql/rpl_async_conn_failover_delete_managed_udf.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_async_conn_failover_delete_managed_udf.h	2021-09-28 11:46:34.000000000 +0000
@@ -29,7 +29,8 @@
 class Rpl_async_conn_failover_delete_managed : public Udf_service_impl {
  private:
   Udf_charset_service m_charset_service;
-  static const std::string m_udf_name;
+  static constexpr const char *m_udf_name =
+      "asynchronous_connection_failover_delete_managed";
   bool m_initialized{false};
 
  public:
diff -Nru mysql-8.0-8.0.26/sql/rpl_async_conn_failover_delete_source_udf.cc mysql-8.0-8.0.27/sql/rpl_async_conn_failover_delete_source_udf.cc
--- mysql-8.0-8.0.26/sql/rpl_async_conn_failover_delete_source_udf.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_async_conn_failover_delete_source_udf.cc	2021-09-28 11:46:34.000000000 +0000
@@ -28,11 +28,9 @@
 #include "sql/derror.h" /* ER_THD */
 #include "sql/rpl_async_conn_failover_delete_source_udf.h"
 #include "sql/rpl_async_conn_failover_table_operations.h"
+#include "sql/rpl_group_replication.h"
 #include "sql/rpl_io_monitor.h"
 
-const std::string Rpl_async_conn_failover_delete_source::m_udf_name =
-    "asynchronous_connection_failover_delete_source";
-
 bool Rpl_async_conn_failover_delete_source::init() {
   DBUG_TRACE;
 
@@ -74,7 +72,7 @@
 
   if (err_val) {
     *error = 1;
-    my_error(ER_UDF_ERROR, MYF(0), m_udf_name.c_str(), err_msg.c_str());
+    my_error(ER_UDF_ERROR, MYF(0), m_udf_name, err_msg.c_str());
   } else {
     err_msg.assign(
         "The UDF asynchronous_connection_failover_delete_source() "
@@ -155,6 +153,13 @@
     return true;
   }
 
+  if (is_group_replication_member_secondary()) {
+    my_stpcpy(message,
+              "Can't execute the given operation on a Group Replication "
+              "secondary member.");
+    return true;
+  }
+
   if (Udf_charset_service::set_return_value_charset(init_id) ||
       Udf_charset_service::set_args_charset(args))
     return true;
diff -Nru mysql-8.0-8.0.26/sql/rpl_async_conn_failover_delete_source_udf.h mysql-8.0-8.0.27/sql/rpl_async_conn_failover_delete_source_udf.h
--- mysql-8.0-8.0.26/sql/rpl_async_conn_failover_delete_source_udf.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_async_conn_failover_delete_source_udf.h	2021-09-28 11:46:34.000000000 +0000
@@ -29,7 +29,8 @@
 class Rpl_async_conn_failover_delete_source : public Udf_service_impl {
  private:
   Udf_charset_service m_charset_service;
-  static const std::string m_udf_name;
+  static constexpr const char *m_udf_name =
+      "asynchronous_connection_failover_delete_source";
   bool m_initialized{false};
 
  public:
diff -Nru mysql-8.0-8.0.26/sql/rpl_async_conn_failover_reset_udf.cc mysql-8.0-8.0.27/sql/rpl_async_conn_failover_reset_udf.cc
--- mysql-8.0-8.0.26/sql/rpl_async_conn_failover_reset_udf.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_async_conn_failover_reset_udf.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,144 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include "include/m_string.h"
+#include "include/my_dbug.h"
+#include "sql/sql_class.h"
+
+#include "sql/auth/auth_acls.h"
+#include "sql/derror.h" /* ER_THD */
+#include "sql/rpl_async_conn_failover_reset_udf.h"
+#include "sql/rpl_async_conn_failover_table_operations.h"
+#include "sql/rpl_channel_service_interface.h"
+#include "sql/rpl_group_replication.h"
+
+bool Rpl_async_conn_failover_reset::init() {
+  DBUG_TRACE;
+
+  Udf_data udf(m_udf_name, STRING_RESULT, Rpl_async_conn_failover_reset::reset,
+               Rpl_async_conn_failover_reset::reset_init,
+               Rpl_async_conn_failover_reset::reset_deinit);
+
+  m_initialized = !register_udf(udf);
+  return !m_initialized;
+}
+
+bool Rpl_async_conn_failover_reset::deinit() {
+  DBUG_TRACE;
+  if (m_initialized) {
+    return unregister_udf(m_udf_name);
+  }
+  return false;
+}
+
+char *Rpl_async_conn_failover_reset::reset(UDF_INIT *, UDF_ARGS *, char *result,
+                                           unsigned long *length,
+                                           unsigned char *is_null,
+                                           unsigned char *error) {
+  DBUG_TRACE;
+  *is_null = 0;  // result is not null
+  *error = 0;
+
+  std::string err_msg{};  // error message returned during delete row operation
+
+  Rpl_async_conn_failover_table_operations sql_operations(TL_WRITE);
+  if (sql_operations.reset()) {
+    err_msg.assign(
+        "The UDF asynchronous_connection_failover_reset() "
+        "was unable to reset the configuration.");
+    *error = 1;
+    my_error(ER_UDF_ERROR, MYF(0), m_udf_name, err_msg.c_str());
+  } else {
+    err_msg.assign(
+        "The UDF asynchronous_connection_failover_reset() "
+        "executed successfully.");
+  }
+
+  my_stpcpy(result, err_msg.c_str());
+  *length = err_msg.length();
+  return result;
+}
+
+bool Rpl_async_conn_failover_reset::reset_init(UDF_INIT *init_id,
+                                               UDF_ARGS *args, char *message) {
+  DBUG_TRACE;
+
+  if (args->arg_count > 0) {
+    my_stpcpy(message, "Wrong arguments: The function takes no arguments.");
+    return true;
+  }
+
+  THD *thd{current_thd};
+  if (thd == nullptr) {
+    my_stpcpy(message,
+              "Error checking the user privileges. Check the log for "
+              "more details or restart the server.");
+    return true;
+  }
+
+  Security_context *sctx = thd->security_context();
+  if (!sctx->check_access(SUPER_ACL) &&
+      !sctx->has_global_grant(STRING_WITH_LEN("REPLICATION_SLAVE_ADMIN"))
+           .first) {
+    my_stpcpy(message,
+              "Access denied; you need (at least one of) the SUPER or "
+              "REPLICATION_SLAVE_ADMIN privilege for this operation");
+    my_error(ER_SPECIFIC_ACCESS_DENIED_ERROR, MYF(0),
+             "SUPER or REPLICATION_SLAVE_ADMIN");
+    return true;
+  }
+
+  if (thd && thd->locked_tables_mode) {
+    my_stpcpy(message,
+              "Can't execute the given operation because you have"
+              " active locked tables.");
+    return true;
+  }
+
+  if (Udf_charset_service::set_return_value_charset(init_id) ||
+      Udf_charset_service::set_args_charset(args))
+    return true;
+
+  if (is_group_replication_running()) {
+    my_stpcpy(message,
+              "Can't execute the given operation while Group Replication is "
+              "running.");
+    return true;
+  }
+
+  if (is_any_slave_channel_running_with_failover_enabled(
+          CHANNEL_RECEIVER_THREAD | CHANNEL_APPLIER_THREAD)) {
+    my_stpcpy(message,
+              "Can't execute the given operation while Replication channels "
+              "configured with SOURCE_CONNECTION_AUTO_FAILOVER "
+              "are running.");
+    return true;
+  }
+
+  init_id->maybe_null = false;
+  return false;
+}
+
+void Rpl_async_conn_failover_reset::reset_deinit(UDF_INIT *) {
+  DBUG_TRACE;
+  return;
+}
diff -Nru mysql-8.0-8.0.26/sql/rpl_async_conn_failover_reset_udf.h mysql-8.0-8.0.27/sql/rpl_async_conn_failover_reset_udf.h
--- mysql-8.0-8.0.26/sql/rpl_async_conn_failover_reset_udf.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_async_conn_failover_reset_udf.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,94 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef RPL_ASYNC_CONN_FAILOVER_RESET_UDF_H
+#define RPL_ASYNC_CONN_FAILOVER_RESET_UDF_H
+
+#include "sql/udf_service_impl.h"
+#include "sql/udf_service_util.h"
+
+class Rpl_async_conn_failover_reset : public Udf_service_impl {
+ private:
+  Udf_charset_service m_charset_service;
+  static constexpr const char *m_udf_name =
+      "asynchronous_connection_failover_reset";
+  bool m_initialized{false};
+
+ public:
+  Rpl_async_conn_failover_reset() = default;
+  ~Rpl_async_conn_failover_reset() override = default;
+
+  /**
+    Initialize variables, acquires the mysql_service_mysql_udf_metadata from the
+    registry service and register the Asynchronous Connection Failover's reset
+    UDFs. If there is an error registering any UDF, all installed UDFs are
+    unregistered.
+
+    @retval true if there was an error
+    @retval false if all UDFs were registered
+   */
+  bool init() override;
+
+  /**
+    Release the udf_metadata service.
+
+    @retval false  Success
+    @retval true   Failure. service could not be released
+  */
+  bool deinit();
+
+  /**
+    Resets asynchronous connection failover configuration.
+
+    @param[in] init_id     UDF_INIT structure
+    @param[in] args       UDF_ARGS structure containing argument details
+    @param[out] result    error message
+    @param[out] length    error message length
+    @param[out] is_null   if result is null
+    @param[in,out] error  error code
+
+    @return error message
+  */
+  static char *reset(UDF_INIT *init_id, UDF_ARGS *args, char *result,
+                     unsigned long *length, unsigned char *is_null,
+                     unsigned char *error);
+
+  /**
+    Initialize and verifies UDF's arguments. Also sets argument and result
+    charset.
+
+    @param[in] init_id     UDF_INIT structure
+    @param[in] args       UDF_ARGS structure containing argument details
+    @param[out] message   error message
+
+    @return True if error, false otherwise.
+  */
+  static bool reset_init(UDF_INIT *init_id, UDF_ARGS *args, char *message);
+
+  /**
+    Deinitialize variables initalized during init function.
+
+    @param[in] init_id     UDF_INIT structure
+  */
+  static void reset_deinit(UDF_INIT *init_id);
+};
+#endif /* RPL_ASYNC_CONN_FAILOVER_RESET_UDF_H */
diff -Nru mysql-8.0-8.0.26/sql/rpl_async_conn_failover_table_operations.cc mysql-8.0-8.0.27/sql/rpl_async_conn_failover_table_operations.cc
--- mysql-8.0-8.0.26/sql/rpl_async_conn_failover_table_operations.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_async_conn_failover_table_operations.cc	2021-09-28 11:46:34.000000000 +0000
@@ -25,12 +25,22 @@
 #include "sql/current_thd.h"
 #include "sql/handler.h"
 #include "sql/json_dom.h"
+#include "sql/mysqld.h"
+#include "sql/protobuf/generated/protobuf_lite/replication_asynchronous_connection_failover.pb.h"
+#include "sql/rpl_async_conn_failover_configuration_propagation.h"
 #include "sql/rpl_async_conn_failover_table_operations.h"
 #include "sql/rpl_sys_key_access.h"
 #include "sql/rpl_sys_table_access.h"
 #include "sql/sql_base.h"  // MYSQL_OPEN_IGNORE_GLOBAL_READ_LOCK
 #include "sql/udf_service_util.h"
 
+const MYSQL_LEX_CSTRING
+    Rpl_async_conn_failover_table_operations::Primary_weight_key = {
+        STRING_WITH_LEN("Primary_weight")};
+const MYSQL_LEX_CSTRING
+    Rpl_async_conn_failover_table_operations::Secondary_weight_key = {
+        STRING_WITH_LEN("Secondary_weight")};
+
 /*
  Only used on this file.
 */
@@ -50,23 +60,45 @@
 std::tuple<bool, std::string>
 Rpl_async_conn_failover_table_operations::add_source(
     const std::string &channel, const std::string &host, uint port,
-    const std::string &network_namespace, uint weight) {
+    const std::string &network_namespace, uint weight,
+    const std::string &managed_name) {
   DBUG_TRACE;
   assert(network_namespace.empty());
 
   std::vector<uint> field_index{0, 1, 2, 3, 4, 5};
   std::vector<std::string> field_name{
       "channel", "host", "port", "network_namespace", "weight", "managed_name"};
-  RPL_FAILOVER_SOURCE_TUPLE field_value{channel,           host,   port,
-                                        network_namespace, weight, ""};
+  RPL_FAILOVER_SOURCE_TUPLE field_value{
+      channel, host, port, network_namespace, weight, managed_name};
+  std::string serialized_configuration;
 
-  return execute_handler_func<RPL_FAILOVER_SOURCE_TUPLE>(
+  return execute_handler_func_send<RPL_FAILOVER_SOURCE_TUPLE>(
       m_db, m_table_failover, m_table_failover_num_field, m_lock_type,
       field_index, field_name, field_value,
       Rpl_sys_table_access::handler_write_row_func, 0, HA_WHOLE_KEY);
 }
 
 std::tuple<bool, std::string>
+Rpl_async_conn_failover_table_operations::add_source_skip_send(
+    const std::string &channel, const std::string &host, uint port,
+    const std::string &network_namespace, uint weight,
+    const std::string &managed_name, Rpl_sys_table_access &table_op) {
+  DBUG_TRACE;
+  assert(network_namespace.empty());
+
+  std::vector<uint> field_index{0, 1, 2, 3, 4, 5};
+  std::vector<std::string> field_name{
+      "channel", "host", "port", "network_namespace", "weight", "managed_name"};
+  RPL_FAILOVER_SOURCE_TUPLE field_value{
+      channel, host, port, network_namespace, weight, managed_name};
+  std::string serialized_configuration;
+
+  return execute_handler_func_skip_send<RPL_FAILOVER_SOURCE_TUPLE>(
+      field_index, field_name, field_value,
+      Rpl_sys_table_access::handler_write_row_func, 0, HA_WHOLE_KEY, table_op);
+}
+
+std::tuple<bool, std::string>
 Rpl_async_conn_failover_table_operations::add_managed(
     const std::string &channel, const std::string &host, uint port,
     const std::string &network_namespace, const std::string &managed_type,
@@ -98,12 +130,14 @@
                                               "managed_type", "configuration"};
   RPL_FAILOVER_MANAGED_JSON_TUPLE managed_field_value{channel, managed_name,
                                                       managed_type, wrapper};
+  std::tuple<bool, std::string> ret_val{};
+  std::string serialized_configuration;
+
+  ret_val = execute_handler_func_send<RPL_FAILOVER_MANAGED_JSON_TUPLE>(
+      m_db, m_table_managed, m_table_managed_num_field, m_lock_type,
+      managed_field_index, managed_field_name, managed_field_value,
+      Rpl_sys_table_access::handler_write_row_func, 0, HA_WHOLE_KEY);
 
-  std::tuple<bool, std::string> ret_val =
-      execute_handler_func<RPL_FAILOVER_MANAGED_JSON_TUPLE>(
-          m_db, m_table_managed, m_table_managed_num_field, m_lock_type,
-          managed_field_index, managed_field_name, managed_field_value,
-          Rpl_sys_table_access::handler_write_row_func, 0, HA_WHOLE_KEY);
   if (std::get<0>(ret_val)) {
     return ret_val;
   }
@@ -118,7 +152,7 @@
   RPL_FAILOVER_SOURCE_TUPLE field_value{
       channel, host, port, network_namespace, secondary_weight, managed_name};
 
-  ret_val = execute_handler_func<RPL_FAILOVER_SOURCE_TUPLE>(
+  ret_val = execute_handler_func_send<RPL_FAILOVER_SOURCE_TUPLE>(
       m_db, m_table_failover, m_table_failover_num_field, m_lock_type,
       field_index, field_name, field_value,
       Rpl_sys_table_access::handler_write_row_func, 0, HA_WHOLE_KEY);
@@ -131,6 +165,33 @@
 }
 
 std::tuple<bool, std::string>
+Rpl_async_conn_failover_table_operations::add_managed_skip_send(
+    const std::string &channel, const std::string &managed_type,
+    const std::string &managed_name, const Json_wrapper &wrapper,
+    Rpl_sys_table_access &table_op) {
+  DBUG_TRACE;
+
+  // add managed
+  std::vector<uint> managed_field_index{0, 1, 2, 3};
+  std::vector<std::string> managed_field_name{"channel", "managed_name",
+                                              "managed_type", "configuration"};
+  RPL_FAILOVER_MANAGED_JSON_TUPLE managed_field_value{channel, managed_name,
+                                                      managed_type, wrapper};
+  std::tuple<bool, std::string> ret_val{};
+  std::string serialized_configuration;
+
+  ret_val = execute_handler_func_skip_send<RPL_FAILOVER_MANAGED_JSON_TUPLE>(
+      managed_field_index, managed_field_name, managed_field_value,
+      Rpl_sys_table_access::handler_write_row_func, 0, HA_WHOLE_KEY, table_op);
+
+  if (std::get<0>(ret_val)) {
+    return ret_val;
+  }
+
+  return ret_val;
+}
+
+std::tuple<bool, std::string>
 Rpl_async_conn_failover_table_operations::delete_source(
     const std::string &channel, const std::string &host, uint port,
     const std::string &network_namespace) {
@@ -143,7 +204,7 @@
   RPL_FAILOVER_SOURCE_DEL_TUPLE field_value{channel, host, port,
                                             network_namespace, ""};
 
-  return execute_handler_func<RPL_FAILOVER_SOURCE_DEL_TUPLE>(
+  return execute_handler_func_send<RPL_FAILOVER_SOURCE_DEL_TUPLE>(
       m_db, m_table_failover, m_table_failover_num_field, m_lock_type,
       field_index, field_name, field_value,
       Rpl_sys_table_access::handler_delete_row_func, 0, HA_WHOLE_KEY);
@@ -160,7 +221,7 @@
   RPL_FAILOVER_MANAGED_DEL_TUPLE field_value{channel, managed_name};
 
   std::tuple<bool, std::string> ret_val =
-      execute_handler_func<RPL_FAILOVER_MANAGED_DEL_TUPLE>(
+      execute_handler_func_send<RPL_FAILOVER_MANAGED_DEL_TUPLE>(
           m_db, m_table_managed, m_table_managed_num_field, m_lock_type,
           managed_field_index, field_name, field_value,
           Rpl_sys_table_access::handler_delete_row_func, 0, HA_WHOLE_KEY);
@@ -173,7 +234,7 @@
 
   // delete source
   std::vector<uint> field_index{0, 5};
-  ret_val = execute_handler_func<RPL_FAILOVER_MANAGED_DEL_TUPLE>(
+  ret_val = execute_handler_func_send<RPL_FAILOVER_MANAGED_DEL_TUPLE>(
       m_db, m_table_failover, m_table_failover_num_field, m_lock_type,
       field_index, field_name, field_value,
       Rpl_sys_table_access::handler_delete_row_func, 1, (1L << 0) | (1L << 1));
@@ -181,6 +242,34 @@
   return ret_val;
 }
 
+bool Rpl_async_conn_failover_table_operations::reset() {
+  DBUG_TRACE;
+  bool error = false;
+
+  Rpl_sys_table_access table_op_managed(m_db, m_table_managed,
+                                        m_table_managed_num_field);
+  Rpl_sys_table_access table_op_failover(m_db, m_table_failover,
+                                         m_table_failover_num_field);
+
+  if (table_op_managed.open(m_lock_type)) {
+    return true;
+  }
+  error |= table_op_managed.delete_all_rows();
+  error |= table_op_managed.delete_version();
+  error |= table_op_managed.close(error);
+
+  if (!error) {
+    if (table_op_failover.open(m_lock_type)) {
+      return true;
+    }
+    error |= table_op_failover.delete_all_rows();
+    error |= table_op_failover.delete_version();
+    error |= table_op_failover.close(error);
+  }
+
+  return error;
+}
+
 bool Rpl_async_conn_failover_table_operations::read_managed_rows_for_channel(
     std::string channel_name, std::vector<RPL_FAILOVER_MANAGED_TUPLE> &rows) {
   DBUG_TRACE;
@@ -225,7 +314,7 @@
     } while (!key_access.next());
   }
 
-  return (key_access.deinit() || table_op.close(true));
+  return (key_access.deinit() || table_op.close(false));
 }
 
 std::tuple<bool, std::vector<RPL_FAILOVER_SOURCE_TUPLE>>
@@ -257,7 +346,7 @@
     } while (!key_access.next());
   }
 
-  auto error = key_access.deinit() || table_op.close(true);
+  auto error = key_access.deinit() || table_op.close(false);
   return std::make_tuple(error, source_list);
 }
 
@@ -297,22 +386,17 @@
     } while (!key_access.next());
   }
 
-  auto error = key_access.deinit() || table_op.close(true);
+  auto error = key_access.deinit() || table_op.close(false);
   return std::make_tuple(error, source_list);
 }
 
 std::tuple<bool, std::vector<RPL_FAILOVER_SOURCE_TUPLE>>
-Rpl_async_conn_failover_table_operations::read_source_all_rows() {
+Rpl_async_conn_failover_table_operations::read_source_all_rows_internal(
+    Rpl_sys_table_access &table_op) {
   DBUG_TRACE;
   std::vector<RPL_FAILOVER_SOURCE_TUPLE> source_list{};
-
-  Rpl_sys_table_access table_op(m_db, m_table_failover,
-                                m_table_failover_num_field);
-  if (table_op.open(m_lock_type)) {
-    return std::make_tuple(true, source_list);
-  }
-
   TABLE *table = table_op.get_table();
+
   Rpl_sys_key_access key_access;
   if (!key_access.init(table, Rpl_sys_key_access::enum_key_type::INDEX_NEXT)) {
     do {
@@ -323,7 +407,24 @@
     } while (!key_access.next());
   }
 
-  auto error = key_access.deinit() || table_op.close(true);
+  bool error = key_access.deinit();
+  return std::make_tuple(error, source_list);
+}
+
+std::tuple<bool, std::vector<RPL_FAILOVER_SOURCE_TUPLE>>
+Rpl_async_conn_failover_table_operations::read_source_all_rows() {
+  bool error = false;
+  std::vector<RPL_FAILOVER_SOURCE_TUPLE> source_list{};
+
+  Rpl_sys_table_access table_op(m_db, m_table_failover,
+                                m_table_failover_num_field);
+  if (table_op.open(m_lock_type)) {
+    return std::make_tuple(true, source_list);
+  }
+
+  std::tie(error, source_list) = read_source_all_rows_internal(table_op);
+
+  error |= table_op.close(error);
   return std::make_tuple(error, source_list);
 }
 
@@ -349,20 +450,15 @@
     } while (!key_access.next());
   }
 
-  auto error = key_access.deinit() || table_op.close(true);
+  auto error = key_access.deinit() || table_op.close(false);
   return std::make_tuple(error, source_list);
 }
 
-bool Rpl_async_conn_failover_table_operations::read_managed_random_rows(
-    std::vector<RPL_FAILOVER_MANAGED_TUPLE> &rows) {
+bool Rpl_async_conn_failover_table_operations::
+    read_managed_random_rows_internal(
+        Rpl_sys_table_access &table_op,
+        std::vector<RPL_FAILOVER_MANAGED_TUPLE> &rows) {
   DBUG_TRACE;
-
-  Rpl_sys_table_access table_op(m_db, m_table_managed,
-                                m_table_managed_num_field);
-  if (table_op.open(m_lock_type)) {
-    return true;
-  }
-
   TABLE *table = table_op.get_table();
 
   Rpl_sys_key_access key_access;
@@ -392,59 +488,46 @@
     } while (!key_access.next());
   }
 
-  return (key_access.deinit() || table_op.close(true));
+  bool error = key_access.deinit();
+  return error;
 }
 
-std::tuple<bool, RPL_FAILOVER_SOURCE_TUPLE>
-Rpl_async_conn_failover_table_operations::read_source_random_rows_pos(
-    std::string pos) {
+bool Rpl_async_conn_failover_table_operations::
+    read_managed_random_rows_internal(
+        Rpl_sys_table_access &table_op,
+        std::vector<RPL_FAILOVER_MANAGED_JSON_TUPLE> &rows) {
   DBUG_TRACE;
-  RPL_FAILOVER_SOURCE_TUPLE source_detail{};
-
-  Rpl_sys_table_access table_op(m_db, m_table_failover,
-                                m_table_failover_num_field);
-  if (table_op.open(m_lock_type)) {
-    return std::make_tuple(true, source_detail);
-  }
-
   TABLE *table = table_op.get_table();
-  Rpl_sys_key_access key_access;
 
-  if (!key_access.init(table, pos)) {
-    if (!key_access.next()) {
-      /* get source connection detail */
-      get_data<RPL_FAILOVER_SOURCE_TUPLE>(table_op, source_detail);
-    }
+  Rpl_sys_key_access key_access;
+  if (!key_access.init(table, Rpl_sys_key_access::enum_key_type::RND_NEXT)) {
+    do {
+      /* get source detail */
+      RPL_FAILOVER_MANAGED_JSON_TUPLE source_tuple{};
+      get_data<RPL_FAILOVER_MANAGED_JSON_TUPLE>(table_op, source_tuple);
+      rows.push_back(source_tuple);
+    } while (!key_access.next());
   }
 
-  auto error = key_access.deinit() || table_op.close(true);
-  return std::make_tuple(error, source_detail);
+  bool error = key_access.deinit();
+  return error;
 }
 
-std::tuple<bool, RPL_FAILOVER_MANAGED_JSON_TUPLE>
-Rpl_async_conn_failover_table_operations::read_managed_random_rows_pos(
-    std::string pos) {
+bool Rpl_async_conn_failover_table_operations::read_managed_random_rows(
+    std::vector<RPL_FAILOVER_MANAGED_TUPLE> &rows) {
   DBUG_TRACE;
-  RPL_FAILOVER_MANAGED_JSON_TUPLE source_detail{};
+  bool error = false;
 
   Rpl_sys_table_access table_op(m_db, m_table_managed,
                                 m_table_managed_num_field);
   if (table_op.open(m_lock_type)) {
-    return std::make_tuple(true, source_detail);
+    return true;
   }
 
-  TABLE *table = table_op.get_table();
-  Rpl_sys_key_access key_access;
-
-  if (!key_access.init(table, pos)) {
-    if (!key_access.next()) {
-      /* get source connection detail */
-      get_data<RPL_FAILOVER_MANAGED_JSON_TUPLE>(table_op, source_detail);
-    }
-  }
+  error = read_managed_random_rows_internal(table_op, rows);
 
-  auto error = key_access.deinit() || table_op.close(true);
-  return std::make_tuple(error, source_detail);
+  error |= table_op.close(error);
+  return error;
 }
 
 template <class TUP>
@@ -460,24 +543,19 @@
 
 template <class T>
 std::tuple<bool, std::string>
-Rpl_async_conn_failover_table_operations::execute_handler_func(
-    const std::string &db_name, const std::string &table_name, uint num_field,
-    enum thr_lock_type lock_type, const std::vector<uint> &field_index,
+Rpl_async_conn_failover_table_operations::execute_handler_func_skip_send(
+    const std::vector<uint> &field_index,
     const std::vector<std::string> &field_name, const T &field_value,
     std::function<void(Rpl_sys_table_access &, bool &, std::string &, uint &,
                        key_part_map &)>
         func,
-    uint table_index, key_part_map keypart_map) {
+    uint table_index, key_part_map keypart_map,
+    Rpl_sys_table_access &table_op) {
   std::ostringstream str_stream;
   bool err_val{false};
   std::string err_msg{};
+  std::string serialized_configuration;
 
-  Rpl_sys_table_access table_op(db_name, table_name, num_field);
-  if (table_op.open(lock_type)) {
-    table_op.set_error();
-    str_stream << "Error opening " << db_name << "." << table_name << " table.";
-    return std::make_tuple(true, str_stream.str());
-  }
   TABLE *table = table_op.get_table();
 
   Rpl_sys_table_access::for_each_in_tuple(
@@ -500,10 +578,49 @@
     return std::make_tuple(err_val, err_msg);
   }
 
-  if (table_op.close(err_val)) {
-    str_stream << "Error closing " << db_name << "." << table_name << " table.";
+  return std::make_tuple(err_val, err_msg);
+}
+
+template <class T>
+std::tuple<bool, std::string>
+Rpl_async_conn_failover_table_operations::execute_handler_func_send(
+    const std::string &db_name, const std::string &table_name, uint num_field,
+    enum thr_lock_type lock_type, const std::vector<uint> &field_index,
+    const std::vector<std::string> &field_name, const T &field_value,
+    std::function<void(Rpl_sys_table_access &, bool &, std::string &, uint &,
+                       key_part_map &)>
+        func,
+    uint table_index, key_part_map keypart_map) {
+  std::ostringstream str_stream;
+  bool err_val{false};
+  std::string err_msg{};
+  std::string serialized_configuration;
+
+  Rpl_sys_table_access table_op(db_name, table_name, num_field);
+  if (table_op.open(lock_type)) {
+    table_op.set_error();
+    str_stream << "Error opening " << db_name << "." << table_name << " table.";
     return std::make_tuple(true, str_stream.str());
   }
 
+  std::tie(err_val, err_msg) = execute_handler_func_skip_send<T>(
+      field_index, field_name, field_value, func, table_index, keypart_map,
+      table_op);
+
+  if (!err_val) {
+    if (table_op.increment_version()) {
+      str_stream << "Error incrementing member action configuration version"
+                 << " for " << table_op.get_db_name() << "."
+                 << table_op.get_table_name() << " table.";
+      return std::make_tuple(true, str_stream.str());
+    }
+
+    if (rpl_acf_configuration_handler->send_table_data(table_op)) {
+      str_stream << "Error sending " << db_name << "." << table_name
+                 << " table data to group replication members.";
+      return std::make_tuple(true, str_stream.str());
+    }
+  }
+
   return std::make_tuple(err_val, err_msg);
 }
diff -Nru mysql-8.0-8.0.26/sql/rpl_async_conn_failover_table_operations.h mysql-8.0-8.0.27/sql/rpl_async_conn_failover_table_operations.h
--- mysql-8.0-8.0.26/sql/rpl_async_conn_failover_table_operations.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_async_conn_failover_table_operations.h	2021-09-28 11:46:34.000000000 +0000
@@ -26,11 +26,16 @@
 #include <functional>
 #include <tuple>
 #include "sql/field.h"
+#include "sql/table.h"
 #include "sql/udf_service_util.h"
 
 class Rpl_sys_table_access;
 class Json_wrapper;
 
+namespace protobuf_replication_asynchronous_connection_failover {
+class SourceAndManagedList;
+}
+
 /* <channel, host, port, network_namespace, weight, managed_name> */
 using RPL_FAILOVER_SOURCE_TUPLE =
     std::tuple<std::string, std::string, uint, std::string, uint, std::string>;
@@ -66,13 +71,16 @@
 
   /**
     Insert row for a unmanaged sender on
-    replication_asynchronous_connection_failover table.
+    replication_asynchronous_connection_failover table, and
+    send stored table data to its group replication group members.
 
     @param[in] channel            channel
     @param[in] host               sender host
     @param[in] port               sender port
     @param[in] network_namespace  sender network_namespace
     @param[in] weight             sender weight
+    @param[in] managed_name       The name of the group which this server
+                                  belongs to.
 
     @returns std::tuple<bool, std::string> where each element has
              following meaning:
@@ -86,18 +94,48 @@
   std::tuple<bool, std::string> add_source(const std::string &channel,
                                            const std::string &host, uint port,
                                            const std::string &network_namespace,
-                                           uint weight);
+                                           uint weight,
+                                           const std::string &managed_name);
+
+  /**
+    Insert row for a unmanaged sender on
+    replication_asynchronous_connection_failover table.
+
+    @param[in] channel            channel
+    @param[in] host               sender host
+    @param[in] port               sender port
+    @param[in] network_namespace  sender network_namespace
+    @param[in] weight             sender weight
+    @param[in] managed_name       The name of the group which this server
+                                  belongs to.
+    @param[in] table_op           Rpl_sys_table_access class object.
+
+    @returns std::tuple<bool, std::string> where each element has
+             following meaning:
+
+              first element of tuple is function return value and determines:
+                false  Successful
+                true   Error
+
+              second element of tuple is error message.
+  */
+  static std::tuple<bool, std::string> add_source_skip_send(
+      const std::string &channel, const std::string &host, uint port,
+      const std::string &network_namespace, uint weight,
+      const std::string &managed_name, Rpl_sys_table_access &table_op);
 
   /**
     Insert row on replication_asynchronous_connection_failover_managed
-    and replication_asynchronous_connection_failover tables.
+    and replication_asynchronous_connection_failover tables, and
+    send stored table data to its group replication group members.
 
     @param[in] channel            channel
     @param[in] host               sender host
     @param[in] port               sender port
     @param[in] network_namespace  sender network_namespace
-    @param[in] managed_type       managed type
-    @param[in] managed_name       managed name
+    @param[in] managed_type       Determines the manged group type.
+    @param[in] managed_name       The name of the group which this server
+                                  belongs to
     @param[in] primary_weight     weight assigned to the primary
     @param[in] secondary_weight   weight assigned to the secondary
 
@@ -117,6 +155,32 @@
       uint secondary_weight);
 
   /**
+    Insert row on replication_asynchronous_connection_failover_managed
+    table.
+
+    @param[in] channel            channel
+    @param[in] managed_type       Determines the manged group type.
+    @param[in] managed_name       The name of the group which this server
+                                  belongs to.
+    @param[in] wrapper            contains weight assigned to the primary
+                                  and secondary member in Json format.
+    @param[in] table_op           Rpl_sys_table_access class object.
+
+    @returns std::tuple<bool, std::string> where each element has
+             following meaning:
+
+              first element of tuple is function return value and determines:
+                false  Successful
+                true   Error
+
+              second element of tuple is error message.
+  */
+  static std::tuple<bool, std::string> add_managed_skip_send(
+      const std::string &channel, const std::string &managed_type,
+      const std::string &managed_name, const Json_wrapper &wrapper,
+      Rpl_sys_table_access &table_op);
+
+  /**
     Delete row for a unmanaged sender on
     replication_asynchronous_connection_failover table.
 
@@ -143,7 +207,8 @@
     and all its sources on replication_asynchronous_connection_failover table.
 
     @param[in] channel           The asynchronous replication channel name
-    @param[in] managed_name      The Managed name
+    @param[in] managed_name      The name of the group which this server
+                                 belongs to.
 
     @returns std::tuple<bool, std::string> where each element has
              following meaning:
@@ -158,6 +223,17 @@
                                                const std::string &managed_name);
 
   /**
+    Delete all rows on replication_asynchronous_connection_failover_managed
+    and replication_asynchronous_connection_failover tables, and delete
+    its respective rows on replication_group_configuration_version table.
+
+    @return operation status:
+            false  Successful
+            true   Error
+  */
+  bool reset();
+
+  /**
     Read all sources for a channel.
     It uses index scan (ha_index_read_idx_map) to fetch rows for the channel
     name.
@@ -183,7 +259,8 @@
     name and manged name.
 
     @param[in]  channel_name      The channel name
-    @param[in]  managed_name      The Managed name
+    @param[in]  managed_name      The name of the group which this server
+                                  belongs to.
 
     @returns std::tuple<bool, List_of_Tuple> where each element has
              following meaning:
@@ -220,6 +297,25 @@
     Read all sources.
     It uses index scan (ha_index_first) to fetch all the rows.
 
+    @param[in] table_op           Rpl_sys_table_access class object.
+
+    @returns std::tuple<bool, List_of_Tuple> where each element has
+             following meaning:
+
+             first element of tuple is function return value and determines:
+               false  Successful
+               true   Error
+
+             second element of the tuple is list of return details based on
+             open table and template provided.
+  */
+  static std::tuple<bool, std::vector<RPL_FAILOVER_SOURCE_TUPLE>>
+  read_source_all_rows_internal(Rpl_sys_table_access &table_op);
+
+  /**
+    Read all sources.
+    It uses index scan (ha_index_first) to fetch all the rows.
+
     @returns std::tuple<bool, List_of_Tuple> where each element has
              following meaning:
 
@@ -252,9 +348,10 @@
   /**
     Read rows and fields from
     replication_asynchronous_connection_failover_managed table and returns its
-    details in provided RPL_FAILOVER_MANAGED_TUPLE tuple. It uses random scan
-    (ha_rnd_next) to fetch all the rows.
+    details in provided RPL_FAILOVER_MANAGED_JSON_TUPLE tuple. It uses random
+    scan     (ha_rnd_next) to fetch all the rows.
 
+    @param[in] table_op           Rpl_sys_table_access class object.
     @param[out] rows   return rows read from
                        replication_asynchronous_connection_failover_managed
 
@@ -262,41 +359,42 @@
             false  Successful
             true   Error
   */
-  bool read_managed_random_rows(std::vector<RPL_FAILOVER_MANAGED_TUPLE> &rows);
+  static bool read_managed_random_rows_internal(
+      Rpl_sys_table_access &table_op,
+      std::vector<RPL_FAILOVER_MANAGED_JSON_TUPLE> &rows);
 
   /**
-    Get the row at the position from the sources table using random scan
-    (ha_rnd_pos) to fetch the row.
-
-    @returns std::tuple<bool, Tuple> where each element has
-             following meaning:
+    Read rows and fields from
+    replication_asynchronous_connection_failover_managed table and returns its
+    details in provided RPL_FAILOVER_MANAGED_TUPLE tuple. It uses random
+    scan     (ha_rnd_next) to fetch all the rows.
 
-             first element of tuple is function return value and determines:
-               false  Successful
-               true   Error
+    @param[in] table_op           Rpl_sys_table_access class object.
+    @param[out] rows   return rows read from
+                       replication_asynchronous_connection_failover_managed
 
-             second element of the tuple is list of return details based on
-             open table and template provided.
+    @return function return value which determines if read was:
+            false  Successful
+            true   Error
   */
-  std::tuple<bool, RPL_FAILOVER_SOURCE_TUPLE> read_source_random_rows_pos(
-      std::string pos);
+  static bool read_managed_random_rows_internal(
+      Rpl_sys_table_access &table_op,
+      std::vector<RPL_FAILOVER_MANAGED_TUPLE> &rows);
 
   /**
-    Get the row at the position from the managed table using random scan
-    (ha_rnd_pos) to fetch the row.
-
-    @returns std::tuple<bool, Tuple> where each element has
-             following meaning:
+    Read rows and fields from
+    replication_asynchronous_connection_failover_managed table and returns its
+    details in provided RPL_FAILOVER_MANAGED_TUPLE tuple. It uses random scan
+    (ha_rnd_next) to fetch all the rows.
 
-             first element of tuple is function return value and determines:
-               false  Successful
-               true   Error
+    @param[out] rows   return rows read from
+                       replication_asynchronous_connection_failover_managed
 
-             second element of the tuple is list of return details based on
-             open table and template provided.
+    @return function return value which determines if read was:
+            false  Successful
+            true   Error
   */
-  std::tuple<bool, RPL_FAILOVER_MANAGED_JSON_TUPLE>
-  read_managed_random_rows_pos(std::string pos);
+  bool read_managed_random_rows(std::vector<RPL_FAILOVER_MANAGED_TUPLE> &rows);
 
   /**
     Get stored data in table.
@@ -307,6 +405,12 @@
   template <class TUP>
   static void get_data(Rpl_sys_table_access &table_op, TUP &rows);
 
+  /* Configuration column primary key name */
+  static const MYSQL_LEX_CSTRING Primary_weight_key;
+
+  /* Configuration column secondary key name */
+  static const MYSQL_LEX_CSTRING Secondary_weight_key;
+
  private:
   enum thr_lock_type m_lock_type;   // table lock type
   const std::string m_db{"mysql"};  // the database table belongs to
@@ -319,16 +423,43 @@
       "replication_asynchronous_connection_failover_managed"};
   const uint m_table_managed_num_field{4};
 
-  /* Configuration column primary key name */
-  const MYSQL_LEX_CSTRING Primary_weight_key = {
-      STRING_WITH_LEN("Primary_weight")};
+  /**
+    A wrapper template function to save/delete data to given table.
 
-  /* Configuration column secondary key name */
-  const MYSQL_LEX_CSTRING Secondary_weight_key = {
-      STRING_WITH_LEN("Secondary_weight")};
+    @param[in] field_index The list of field's position to be written or match
+                           while querying for delete operations.
+    @param[in] field_name  The list of field names of the table.
+    @param[in] field_value The field values to be written or match while
+                           querying for delete operations.
+    @param[in] func        The handler class function to write/delete data.
+    @param[in] table_index The table index/key position (by default i.e. on
+                           position 0, if primary key present is used).
+    @param[in] keypart_map Which part of key to use.
+    @param[in] table_op    Rpl_sys_table_access class object.
+
+    @returns std::tuple<bool, std::string> where each element has
+             following meaning:
+
+              first element of tuple is function return value and determines:
+                false  Successful
+                true   Error
+
+              second element of tuple is error message.
+  */
+  template <class T>
+  static std::tuple<bool, std::string> execute_handler_func_skip_send(
+      const std::vector<uint> &field_index,
+      const std::vector<std::string> &field_name, const T &field_value,
+      std::function<void(Rpl_sys_table_access &, bool &, std::string &, uint &,
+                         key_part_map &)>
+          func,
+      uint table_index, key_part_map keypart_map,
+      Rpl_sys_table_access &table_op);
 
   /**
-    A wrapper template function to save/delete data to given table.
+    A wrapper template function to save/delete data to given table,
+    and send stored table data to its group replication group members.
+
 
     @param[in] db_name  The database whose table will be used to
                          write/delete data.
@@ -356,7 +487,7 @@
               second element of tuple is error message.
   */
   template <class T>
-  static std::tuple<bool, std::string> execute_handler_func(
+  static std::tuple<bool, std::string> execute_handler_func_send(
       const std::string &db_name, const std::string &table_name, uint num_field,
       enum thr_lock_type lock_type, const std::vector<uint> &field_index,
       const std::vector<std::string> &field_name, const T &field_value,
diff -Nru mysql-8.0-8.0.26/sql/rpl_binlog_sender.cc mysql-8.0-8.0.27/sql/rpl_binlog_sender.cc
--- mysql-8.0-8.0.26/sql/rpl_binlog_sender.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_binlog_sender.cc	2021-09-28 11:46:34.000000000 +0000
@@ -223,7 +223,7 @@
                                          event_offset);
   }
 
-  void deallocate(unsigned char *ptr MY_ATTRIBUTE((unused))) {}
+  void deallocate(unsigned char *ptr [[maybe_unused]]) {}
 
  private:
   Binlog_sender *m_sender = nullptr;
@@ -833,7 +833,7 @@
 int Binlog_sender::check_start_file() {
   char index_entry_name[FN_REFLEN];
   char *name_ptr = nullptr;
-  const char *errmsg;
+  std::string errmsg;
 
   if (m_start_file[0] != '\0') {
     mysql_bin_log.make_log_name(index_entry_name, m_start_file);
@@ -871,9 +871,8 @@
     if (!m_exclude_gtid->is_subset_for_sid(&gtid_executed_and_owned,
                                            gtid_state->get_server_sidno(),
                                            subset_sidno)) {
-      errmsg = ER_THD(m_thd, ER_SLAVE_HAS_MORE_GTIDS_THAN_MASTER);
       global_sid_lock->unlock();
-      set_fatal_error(errmsg);
+      set_fatal_error(ER_THD(m_thd, ER_SLAVE_HAS_MORE_GTIDS_THAN_MASTER));
       return 1;
     }
     /*
@@ -903,16 +902,16 @@
       is thrown from there.
     */
     if (!gtid_state->get_lost_gtids()->is_subset(m_exclude_gtid)) {
-      mysql_bin_log.report_missing_purged_gtids(m_exclude_gtid, &errmsg);
+      mysql_bin_log.report_missing_purged_gtids(m_exclude_gtid, errmsg);
       global_sid_lock->unlock();
-      set_fatal_error(errmsg);
+      set_fatal_error(errmsg.c_str());
       return 1;
     }
     global_sid_lock->unlock();
     Gtid first_gtid = {0, 0};
     if (mysql_bin_log.find_first_log_not_in_gtid_set(
-            index_entry_name, m_exclude_gtid, &first_gtid, &errmsg)) {
-      set_fatal_error(errmsg);
+            index_entry_name, m_exclude_gtid, &first_gtid, errmsg)) {
+      set_fatal_error(errmsg.c_str());
       return 1;
     }
     name_ptr = index_entry_name;
diff -Nru mysql-8.0-8.0.26/sql/rpl_channel_service_interface.cc mysql-8.0-8.0.27/sql/rpl_channel_service_interface.cc
--- mysql-8.0-8.0.26/sql/rpl_channel_service_interface.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_channel_service_interface.cc	2021-09-28 11:46:34.000000000 +0000
@@ -47,6 +47,7 @@
 #include "mysqld_error.h"
 #include "sql/auth/sql_security_ctx.h"
 #include "sql/binlog.h"
+#include "sql/changestreams/apply/replication_thread_status.h"
 #include "sql/current_thd.h"
 #include "sql/log.h"
 #include "sql/log_event.h"
@@ -54,6 +55,7 @@
 #include "sql/mysqld_thd_manager.h"  // Global_THD_manager
 #include "sql/protocol_classic.h"
 #include "sql/raii/sentry.h"
+#include "sql/rpl_async_conn_failover_configuration_propagation.h"
 #include "sql/rpl_channel_credentials.h"
 #include "sql/rpl_gtid.h"
 #include "sql/rpl_info_factory.h"
@@ -413,7 +415,9 @@
 }
 
 int channel_start(const char *channel, Channel_connection_info *connection_info,
-                  int threads_to_start, int wait_for_connection) {
+                  int threads_to_start, int wait_for_connection,
+                  bool use_server_mta_configuration,
+                  bool channel_map_already_locked) {
   DBUG_TRACE;
   int error = 0;
   int thread_mask = 0;
@@ -430,7 +434,11 @@
   mysql_mutex_unlock(&LOCK_sql_replica_skip_counter);
   if (error) return error;
 
-  channel_map.wrlock();
+  if (channel_map_already_locked) {
+    channel_map.assert_some_wrlock();
+  } else {
+    channel_map.wrlock();
+  }
 
   Master_info *mi = channel_map.get_mi(channel);
 
@@ -492,7 +500,8 @@
     thd = create_surrogate_thread();
   }
 
-  error = start_slave(thd, &lex_connection, &lex_mi, thread_mask, mi, false);
+  error = start_slave(thd, &lex_connection, &lex_mi, thread_mask, mi,
+                      use_server_mta_configuration);
 
   if (wait_for_connection && (thread_mask & SLAVE_IO) && !error) {
     mysql_mutex_lock(&mi->run_lock);
@@ -516,7 +525,9 @@
   }
 
 err:
-  channel_map.unlock();
+  if (!channel_map_already_locked) {
+    channel_map.unlock();
+  }
 
   if (thd_created) {
     delete_surrogate_thread(thd);
@@ -1005,16 +1016,16 @@
   int result = -1;
 
   Find_thd_with_id find_thd_with_id(thread_id);
-  THD *thd = Global_THD_manager::get_instance()->find_thd(&find_thd_with_id);
-  if (thd) {
-    if (thd->get_current_stage_key() ==
+  THD_ptr thd_ptr =
+      Global_THD_manager::get_instance()->find_thd(&find_thd_with_id);
+  if (thd_ptr) {
+    if (thd_ptr->get_current_stage_key() ==
         (worker ? stage_replica_waiting_event_from_coordinator
                 : stage_replica_has_read_all_relay_log)
             .m_key)
       result = 1;
     else
       result = 0;
-    mysql_mutex_unlock(&thd->LOCK_thd_data);
   }
 
   return result;
@@ -1098,6 +1109,27 @@
   return 0;
 }
 
+int channel_get_network_namespace(const char *channel, std::string &net_ns) {
+  DBUG_TRACE;
+
+  channel_map.rdlock();
+  Master_info *mi = channel_map.get_mi(channel);
+
+  if (mi == nullptr) {
+    channel_map.unlock();
+    return RPL_CHANNEL_SERVICE_CHANNEL_DOES_NOT_EXISTS_ERROR;
+  }
+
+  mi->inc_reference();
+  channel_map.unlock();
+
+  net_ns.assign(mi->network_namespace_str());
+
+  mi->dec_reference();
+
+  return 0;
+}
+
 bool channel_is_stopping(const char *channel,
                          enum_channel_thread_types thd_type) {
   bool is_stopping = false;
@@ -1202,6 +1234,47 @@
   return false;
 }
 
+bool is_any_slave_channel_running_with_failover_enabled(int thread_mask) {
+  DBUG_TRACE;
+  Master_info *mi = nullptr;
+  bool is_running;
+
+  channel_map.rdlock();
+
+  for (mi_map::iterator it = channel_map.begin(); it != channel_map.end();
+       it++) {
+    mi = it->second;
+
+    if (mi && Master_info::is_configured(mi) &&
+        mi->is_source_connection_auto_failover()) {
+      if ((thread_mask & SLAVE_IO) != 0) {
+        mysql_mutex_lock(&mi->run_lock);
+        is_running = mi->slave_running;
+        mysql_mutex_unlock(&mi->run_lock);
+        if (is_running) {
+          channel_map.unlock();
+          return true;
+        }
+      }
+
+      if ((thread_mask & SLAVE_SQL) != 0) {
+        mysql_mutex_lock(&mi->rli->run_lock);
+        is_running = mi->rli->slave_running;
+        mysql_mutex_unlock(&mi->rli->run_lock);
+        if (is_running) {
+          channel_map.unlock();
+          return true;
+        }
+      }
+    }
+  }
+
+  assert(!Source_IO_monitor::get_instance()->is_monitoring_process_running());
+
+  channel_map.unlock();
+  return false;
+}
+
 enum_slave_channel_status
 has_any_slave_channel_open_temp_table_or_is_its_applier_running() {
   DBUG_TRACE;
@@ -1258,3 +1331,113 @@
   return Rpl_channel_credentials::get_instance().delete_credentials(
       channel_name);
 }
+
+bool start_failover_channels() {
+  DBUG_TRACE;
+  bool error = false;
+  channel_map.wrlock();
+
+  for (mi_map::iterator it = channel_map.begin();
+       !error && it != channel_map.end(); it++) {
+    Master_info *mi = it->second;
+    if (Master_info::is_configured(mi) &&
+        mi->is_source_connection_auto_failover()) {
+      Channel_connection_info info;
+      initialize_channel_connection_info(&info);
+
+      int thread_mask = 0;
+      thread_mask |= CHANNEL_APPLIER_THREAD;
+      thread_mask |= CHANNEL_RECEIVER_THREAD;
+
+      DBUG_EXECUTE_IF("force_error_on_start_failover_channels", {
+        channel_map.unlock();
+        return 1;
+      });
+      error = channel_start(mi->get_channel(), &info, thread_mask, false,
+                            true /* use_server_mta_configuration*/,
+                            true /* channel_map_already_locked */);
+    }
+  }
+
+  channel_map.unlock();
+  return error;
+}
+
+bool channel_change_source_connection_auto_failover(const char *channel,
+                                                    bool status) {
+  bool error = false;
+  channel_map.assert_some_wrlock();
+
+  Master_info *mi = channel_map.get_mi(channel);
+  if (!Master_info::is_configured(mi)) {
+    LogErr(ERROR_LEVEL, ER_GRP_RPL_FAILOVER_CONF_CHANNEL_DOES_NOT_EXIST,
+           channel);
+    return true;
+  }
+
+  mi->channel_wrlock();
+  lock_slave_threads(mi);
+
+  if (status && !mi->is_source_connection_auto_failover()) {
+    mi->set_source_connection_auto_failover();
+    error |= flush_master_info(mi, true, true, false);
+  }
+
+  if (!status && mi->is_source_connection_auto_failover()) {
+    mi->unset_source_connection_auto_failover();
+    error |= flush_master_info(mi, true, true, false);
+  }
+
+  unlock_slave_threads(mi);
+  mi->channel_unlock();
+
+  return error;
+}
+
+bool unset_source_connection_auto_failover_on_all_channels() {
+  channel_map.assert_some_wrlock();
+  bool error = false;
+
+  for (mi_map::iterator it = channel_map.begin();
+       !error && it != channel_map.end(); it++) {
+    Master_info *mi = it->second;
+    if (Master_info::is_configured(mi) &&
+        mi->is_source_connection_auto_failover()) {
+      error |= channel_change_source_connection_auto_failover(mi->get_channel(),
+                                                              false);
+    }
+  }
+
+  return error;
+}
+
+void reload_failover_channels_status() {
+  DBUG_TRACE;
+  channel_map.rdlock();
+  rpl_acf_configuration_handler->reload_failover_channels_status();
+  channel_map.unlock();
+}
+
+bool get_replication_failover_channels_configuration(
+    std::string &serialized_configuration) {
+  DBUG_TRACE;
+  return rpl_acf_configuration_handler->get_configuration(
+      serialized_configuration);
+}
+
+bool set_replication_failover_channels_configuration(
+    const std::vector<std::string>
+        &exchanged_replication_failover_channels_serialized_configuration) {
+  DBUG_TRACE;
+  channel_map.wrlock();
+  bool error = rpl_acf_configuration_handler->set_configuration(
+      exchanged_replication_failover_channels_serialized_configuration);
+  channel_map.unlock();
+  return error;
+}
+
+bool force_my_replication_failover_channels_configuration_on_all_members() {
+  DBUG_TRACE;
+  return rpl_acf_configuration_handler
+      ->force_my_replication_failover_channels_configuration_on_all_members();
+}
diff -Nru mysql-8.0-8.0.26/sql/rpl_channel_service_interface.h mysql-8.0-8.0.27/sql/rpl_channel_service_interface.h
--- mysql-8.0-8.0.26/sql/rpl_channel_service_interface.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_channel_service_interface.h	2021-09-28 11:46:34.000000000 +0000
@@ -24,6 +24,7 @@
 #define RPL_SERVICE_INTERFACE_INCLUDE
 
 #include <string>
+#include <vector>
 
 // Channel errors
 
@@ -174,13 +175,23 @@
   @param threads_to_start     The types of threads to be started
   @param wait_for_connection  If when starting the receiver, the method should
                               wait for the connection to succeed
+  @param use_server_mta_configuration
+                              If true, the channel uses the server parallel
+                              applier configuration when starting the applier
+                              thread, instead of the configuration given on
+                              `channel_create()`
+  @param channel_map_already_locked
+                              If set to true, will not acquire a write
+                              lock of channel_map
 
   @return the operation status
     @retval 0      OK
     @retval !=0    Error
  */
 int channel_start(const char *channel, Channel_connection_info *connection_info,
-                  int threads_to_start, int wait_for_connection);
+                  int threads_to_start, int wait_for_connection,
+                  bool use_server_mta_configuration = false,
+                  bool channel_map_already_locked = false);
 
 /**
   Stops the channel threads according to the given options.
@@ -428,6 +439,17 @@
 bool is_any_slave_channel_running(int thread_mask);
 
 /**
+  Checks if any slave threads of any channel configured with
+  SOURCE_CONNECTION_AUTO_FAILOVER is running.
+
+  @param[in]        thread_mask       type of slave thread- IO/SQL or any
+
+  @retval          true               at least one channel threads are running.
+  @retval          false              none of the the channels are running.
+*/
+bool is_any_slave_channel_running_with_failover_enabled(int thread_mask);
+
+/**
   Checks if any running channel uses the same UUID for
   assign_gtids_to_anonymous_transactions as the group_name
 
@@ -454,6 +476,18 @@
                             std::string &password);
 
 /**
+  Method to get the network namespace configured for a channel
+
+  @param[in]  channel  The channel name
+  @param[out] net_ns   The network namespace to extract
+
+  @return the operation status
+    @retval false   OK
+    @retval true    Error, channel not found
+*/
+int channel_get_network_namespace(const char *channel, std::string &net_ns);
+
+/**
   Return type for function
   has_any_slave_channel_open_temp_table_or_is_its_applier_running()
 */
@@ -492,4 +526,90 @@
 
  */
 int channel_delete_credentials(const char *channel_name);
+
+/**
+  Start channels which have SOURCE_CONNECTION_AUTO_FAILOVER=1.
+
+  @return the operation status
+    @retval false  OK
+    @retval true   Error
+ */
+bool start_failover_channels();
+
+/**
+  Set SOURCE_CONNECTION_AUTO_FAILOVER on the given channel
+  to the given status value.
+
+  @param[in]  channel       The channel name
+  @param[in]  status        true,  enables  SOURCE_CONNECTION_AUTO_FAILOVER
+                            false, disables SOURCE_CONNECTION_AUTO_FAILOVER
+
+  @return the operation status
+    @retval false  OK
+    @retval true   Error
+ */
+bool channel_change_source_connection_auto_failover(const char *channel,
+                                                    bool status);
+
+/**
+  Unset SOURCE_CONNECTION_AUTO_FAILOVER=0 on all channels.
+
+  @return the operation status
+    @retval false  OK
+    @retval true   Error
+ */
+bool unset_source_connection_auto_failover_on_all_channels();
+
+/**
+  Reload the status values on `Rpl_acf_status_configuration`
+  singleton.
+ */
+void reload_failover_channels_status();
+
+/**
+  Get replication failover channels configuration in
+  a serialized
+  protobuf_replication_asynchronous_connection_failover::SourceAndManagedAndStatusList
+  message.
+
+  @param[out] serialized_configuration  the serialized configuration
+
+  @return the operation status
+    @retval false  OK
+    @retval true   Error
+ */
+bool get_replication_failover_channels_configuration(
+    std::string &serialized_configuration);
+
+/**
+  Set replication failover channels configuration that was
+  received from the group.
+  Each member of the group will send its own configuration
+  in a serialized
+  protobuf_replication_asynchronous_connection_failover::SourceAndManagedAndStatusList
+  message.
+
+  @param[in]  exchanged_replication_failover_channels_serialized_configuration
+              vector with the serialized configuration from each member
+
+  @return the operation status
+    @retval false  OK
+    @retval true   Error
+ */
+bool set_replication_failover_channels_configuration(
+    const std::vector<std::string>
+        &exchanged_replication_failover_channels_serialized_configuration);
+
+/**
+  Collect and broadcast the replication failover channels configuration
+  in a serialized
+  protobuf_replication_asynchronous_connection_failover::SourceAndManagedAndStatusList
+  message, that will override the configuration on all group members.
+
+  @return the operation status
+    @retval false  OK
+    @retval true   Error
+ */
+bool force_my_replication_failover_channels_configuration_on_all_members();
+
 #endif  // RPL_SERVICE_INTERFACE_INCLUDE
diff -Nru mysql-8.0-8.0.26/sql/rpl_context.cc mysql-8.0-8.0.27/sql/rpl_context.cc
--- mysql-8.0-8.0.26/sql/rpl_context.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_context.cc	2021-09-28 11:46:34.000000000 +0000
@@ -174,7 +174,7 @@
 
 void Session_consistency_gtids_ctx::unregister_ctx_change_listener(
     Session_consistency_gtids_ctx::Ctx_change_listener *listener
-        MY_ATTRIBUTE((unused))) {
+    [[maybe_unused]]) {
   assert(m_listener == listener || m_listener == nullptr);
 
   if (m_gtid_set) delete m_gtid_set;
diff -Nru mysql-8.0-8.0.26/sql/rpl_debug_points.h mysql-8.0-8.0.27/sql/rpl_debug_points.h
--- mysql-8.0-8.0.26/sql/rpl_debug_points.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_debug_points.h	2021-09-28 11:46:34.000000000 +0000
@@ -116,6 +116,9 @@
 
   /** handle_slave_io */
   DBUG_RPL_S_RETRY_COUNT_EXCEED,
+
+  /** Pause on a replica thread stop after aweking the THD */
+  DBUG_RPL_R_WAIT_AFTER_AWAKE_ON_THREAD_STOP
 };
 
 /**
@@ -269,6 +272,11 @@
           "continue_retry_count_exceed");
       break;
     }
+    /* terminate_slave_thread */
+    case DBUG_RPL_R_WAIT_AFTER_AWAKE_ON_THREAD_STOP: {
+      debug_point_string.assign("now signal signal.stop_point_after_awake");
+      break;
+    }
   }
 
   assert(!debug_point_string.empty());
diff -Nru mysql-8.0-8.0.26/sql/rpl_filter.cc mysql-8.0-8.0.27/sql/rpl_filter.cc
--- mysql-8.0-8.0.26/sql/rpl_filter.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_filter.cc	2021-09-28 11:46:34.000000000 +0000
@@ -45,6 +45,7 @@
 #include "mysqld_error.h"
 #include "sql/auth/auth_acls.h"
 #include "sql/auth/sql_security_ctx.h"
+#include "sql/changestreams/apply/replication_thread_status.h"
 #include "sql/current_thd.h"
 #include "sql/item.h"    // Item
 #include "sql/mysqld.h"  // table_alias_charset
diff -Nru mysql-8.0-8.0.26/sql/rpl_group_replication.cc mysql-8.0-8.0.27/sql/rpl_group_replication.cc
--- mysql-8.0-8.0.26/sql/rpl_group_replication.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_group_replication.cc	2021-09-28 11:46:34.000000000 +0000
@@ -26,7 +26,9 @@
 #include <sys/types.h>
 #include <atomic>
 
+#include <mysql/components/my_service.h>
 #include <mysql/components/services/component_sys_var_service.h>
+#include <mysql/components/services/group_replication_status_service.h>
 #include "m_string.h"
 #include "my_dbug.h"
 #include "my_inttypes.h"
@@ -627,3 +629,25 @@
   delete[] var_value;
   return error;
 }
+
+bool is_group_replication_member_secondary() {
+  bool is_a_secondary = false;
+
+  my_h_service gr_status_service_handler = nullptr;
+  SERVICE_TYPE(group_replication_status_service_v1) *gr_status_service =
+      nullptr;
+  srv_registry->acquire("group_replication_status_service_v1",
+                        &gr_status_service_handler);
+  if (nullptr != gr_status_service_handler) {
+    gr_status_service =
+        reinterpret_cast<SERVICE_TYPE(group_replication_status_service_v1) *>(
+            gr_status_service_handler);
+    if (gr_status_service
+            ->is_group_in_single_primary_mode_and_im_a_secondary()) {
+      is_a_secondary = true;
+    }
+  }
+
+  srv_registry->release(gr_status_service_handler);
+  return is_a_secondary;
+}
diff -Nru mysql-8.0-8.0.26/sql/rpl_group_replication.h mysql-8.0-8.0.27/sql/rpl_group_replication.h
--- mysql-8.0-8.0.26/sql/rpl_group_replication.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_group_replication.h	2021-09-28 11:46:34.000000000 +0000
@@ -23,7 +23,9 @@
 #ifndef RPL_GROUP_REPLICATION_INCLUDED
 #define RPL_GROUP_REPLICATION_INCLUDED
 
+#include <violite.h>
 #include <string>
+
 class THD;
 class View_change_log_event;
 struct GROUP_REPLICATION_CONNECTION_STATUS_CALLBACKS;
@@ -73,4 +75,19 @@
 */
 bool get_group_replication_view_change_uuid(std::string &uuid);
 
+/**
+  Checks if this member is part of a group in single-primary mode and if
+  this member is a secondary.
+
+  @return status
+    @retval true  this member is part of a group in single-primary mode
+                  and is a secondary
+    @retval false otherwise
+*/
+bool is_group_replication_member_secondary();
+
+// Callback definition for socket donation
+typedef void (*gr_incoming_connection_cb)(THD *thd, int fd, SSL *ssl_ctx);
+void set_gr_incoming_connection(gr_incoming_connection_cb x);
+
 #endif /* RPL_GROUP_REPLICATION_INCLUDED */
diff -Nru mysql-8.0-8.0.26/sql/rpl_gtid_execution.cc mysql-8.0-8.0.27/sql/rpl_gtid_execution.cc
--- mysql-8.0-8.0.26/sql/rpl_gtid_execution.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_gtid_execution.cc	2021-09-28 11:46:34.000000000 +0000
@@ -302,16 +302,7 @@
 }
 #endif
 
-/**
-  Check if current transaction should be skipped, that is, if GTID_NEXT
-  was already logged.
-
-  @param  thd    The calling thread.
-
-  @retval true   Transaction was already logged.
-  @retval false  Transaction must be executed.
-*/
-static inline bool is_already_logged_transaction(const THD *thd) {
+bool is_already_logged_transaction(const THD *thd) {
   DBUG_TRACE;
 
   const Gtid_specification *gtid_next = &thd->variables.gtid_next;
@@ -345,7 +336,7 @@
 
   @param  thd     The calling thread.
 */
-static inline void skip_statement(const THD *thd MY_ATTRIBUTE((unused))) {
+static inline void skip_statement(const THD *thd [[maybe_unused]]) {
   DBUG_TRACE;
 
   DBUG_PRINT("info", ("skipping statement '%s'. "
@@ -536,7 +527,7 @@
           skip_statement(thd);
           return GTID_STATEMENT_SKIP;
         }
-        /*FALLTHROUGH*/
+        [[fallthrough]];
       case ANONYMOUS_GTID:
         return GTID_STATEMENT_EXECUTE;
       case INVALID_GTID:
@@ -580,7 +571,7 @@
   return false;
 }
 
-void gtid_set_performance_schema_values(const THD *thd MY_ATTRIBUTE((unused))) {
+void gtid_set_performance_schema_values(const THD *thd [[maybe_unused]]) {
   DBUG_TRACE;
 #ifdef HAVE_PSI_TRANSACTION_INTERFACE
   if (thd->m_transaction_psi != nullptr) {
diff -Nru mysql-8.0-8.0.26/sql/rpl_gtid.h mysql-8.0-8.0.27/sql/rpl_gtid.h
--- mysql-8.0-8.0.26/sql/rpl_gtid.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_gtid.h	2021-09-28 11:46:34.000000000 +0000
@@ -308,7 +308,7 @@
   /// Initialize this Checkable_rwlock.
   Checkable_rwlock(
 #if defined(HAVE_PSI_INTERFACE)
-      PSI_rwlock_key psi_key MY_ATTRIBUTE((unused)) = 0
+      PSI_rwlock_key psi_key [[maybe_unused]] = 0
 #endif
   ) {
 #ifndef NDEBUG
@@ -358,7 +358,7 @@
       Create a guard, assuming the caller already holds a lock on it.
     */
     Guard(Checkable_rwlock &lock, enum_lock_type lock_type,
-          std::adopt_lock_t t MY_ATTRIBUTE((unused)))
+          std::adopt_lock_t t [[maybe_unused]])
         : m_lock(lock), m_lock_type(lock_type) {
       DBUG_TRACE;
       switch (lock_type) {
@@ -920,7 +920,7 @@
     Assert that this thread owns the n'th mutex.
     This is a no-op if NDEBUG is on.
   */
-  inline void assert_owner(int n MY_ATTRIBUTE((unused))) const {
+  inline void assert_owner(int n [[maybe_unused]]) const {
 #ifndef NDEBUG
     mysql_mutex_assert_owner(&get_mutex_cond(n)->mutex);
 #endif
@@ -929,7 +929,7 @@
     Assert that this thread does not own the n'th mutex.
     This is a no-op if NDEBUG is on.
   */
-  inline void assert_not_owner(int n MY_ATTRIBUTE((unused))) const {
+  inline void assert_not_owner(int n [[maybe_unused]]) const {
 #ifndef NDEBUG
     mysql_mutex_assert_not_owner(&get_mutex_cond(n)->mutex);
 #endif
@@ -1127,9 +1127,9 @@
   }
 #endif
   /// Print this Gtid to the trace file if debug is enabled; no-op otherwise.
-  void dbug_print(const Sid_map *sid_map MY_ATTRIBUTE((unused)),
-                  const char *text MY_ATTRIBUTE((unused)) = "",
-                  bool need_lock MY_ATTRIBUTE((unused)) = false) const {
+  void dbug_print(const Sid_map *sid_map [[maybe_unused]],
+                  const char *text [[maybe_unused]] = "",
+                  bool need_lock [[maybe_unused]] = false) const {
 #ifndef NDEBUG
     char buf[MAX_TEXT_LENGTH + 1];
     to_string(sid_map, buf, need_lock);
@@ -1829,10 +1829,10 @@
     Print this Gtid_set to the trace file if debug is enabled; no-op
     otherwise.
   */
-  void dbug_print(const char *text MY_ATTRIBUTE((unused)) = "",
-                  bool need_lock MY_ATTRIBUTE((unused)) = false,
-                  const Gtid_set::String_format *sf MY_ATTRIBUTE((unused)) =
-                      nullptr) const {
+  void dbug_print(const char *text [[maybe_unused]] = "",
+                  bool need_lock [[maybe_unused]] = false,
+                  const Gtid_set::String_format *sf
+                  [[maybe_unused]] = nullptr) const {
 #ifndef NDEBUG
     char *str;
     to_string(&str, need_lock, sf);
@@ -2539,7 +2539,7 @@
     Print this Owned_gtids to the trace file if debug is enabled; no-op
     otherwise.
   */
-  void dbug_print(const char *text MY_ATTRIBUTE((unused)) = "") const {
+  void dbug_print(const char *text [[maybe_unused]] = "") const {
 #ifndef NDEBUG
     char *str = to_string();
     DBUG_PRINT("info", ("%s%s%s", text, *text ? ": " : "", str));
@@ -3232,7 +3232,7 @@
     Print this Gtid_state to the trace file if debug is enabled; no-op
     otherwise.
   */
-  void dbug_print(const char *text MY_ATTRIBUTE((unused)) = "") const {
+  void dbug_print(const char *text [[maybe_unused]] = "") const {
 #ifndef NDEBUG
     sid_lock->assert_some_wrlock();
     char *str = to_string();
@@ -3849,8 +3849,8 @@
     Print this Gtid_specification to the trace file if debug is
     enabled; no-op otherwise.
   */
-  void dbug_print(const char *text MY_ATTRIBUTE((unused)) = "",
-                  bool need_lock MY_ATTRIBUTE((unused)) = false) const {
+  void dbug_print(const char *text [[maybe_unused]] = "",
+                  bool need_lock [[maybe_unused]] = false) const {
 #ifndef NDEBUG
     char buf[MAX_TEXT_LENGTH + 1];
     to_string(global_sid_map, buf, need_lock);
@@ -3876,6 +3876,18 @@
 };
 
 #ifdef MYSQL_SERVER
+
+/**
+  Check if current transaction should be skipped, that is, if GTID_NEXT
+  was already logged.
+
+  @param  thd    The calling thread.
+
+  @retval true   Transaction was already logged.
+  @retval false  Transaction must be executed.
+*/
+bool is_already_logged_transaction(const THD *thd);
+
 /**
   Perform GTID-related checks before executing a statement:
 
diff -Nru mysql-8.0-8.0.26/sql/rpl_gtid_state.cc mysql-8.0-8.0.27/sql/rpl_gtid_state.cc
--- mysql-8.0-8.0.26/sql/rpl_gtid_state.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_gtid_state.cc	2021-09-28 11:46:34.000000000 +0000
@@ -788,8 +788,9 @@
   return thd->is_commit_in_middle_of_statement;
 }
 
-void Gtid_state ::update_gtids_impl_own_gtid_set(
-    THD *thd MY_ATTRIBUTE((unused)), bool is_commit MY_ATTRIBUTE((unused))) {
+void Gtid_state ::update_gtids_impl_own_gtid_set(THD *thd [[maybe_unused]],
+                                                 bool is_commit
+                                                 [[maybe_unused]]) {
 #ifdef HAVE_GTID_NEXT_LIST
   rpl_sidno prev_sidno = 0;
   Gtid_set::Gtid_iterator git(&thd->owned_gtid_set);
@@ -933,8 +934,7 @@
   }
 }
 
-void Gtid_state::update_gtids_impl_own_nothing(
-    THD *thd MY_ATTRIBUTE((unused))) {
+void Gtid_state::update_gtids_impl_own_nothing(THD *thd [[maybe_unused]]) {
   assert(thd->commit_error != THD::CE_COMMIT_ERROR ||
          thd->has_gtid_consistency_violation);
   assert(thd->variables.gtid_next.type == AUTOMATIC_GTID);
diff -Nru mysql-8.0-8.0.26/sql/rpl_handler.cc mysql-8.0-8.0.27/sql/rpl_handler.cc
--- mysql-8.0-8.0.26/sql/rpl_handler.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_handler.cc	2021-09-28 11:46:34.000000000 +0000
@@ -104,7 +104,7 @@
 Delegate::~Delegate() {
   inited = false;
   mysql_rwlock_destroy(&lock);
-  free_root(&memroot, MYF(0));
+  memroot.Clear();
 }
 
 int Delegate::add_observer(void *observer, st_plugin_int *plugin) {
@@ -1100,6 +1100,8 @@
   param->port = mi->port;
   param->master_log_name = const_cast<char *>(mi->get_master_log_name());
   param->master_log_pos = mi->get_master_log_pos();
+  param->source_connection_auto_failover =
+      mi->is_source_connection_auto_failover();
 }
 
 int Binlog_relay_IO_delegate::thread_start(THD *thd, Master_info *mi) {
@@ -1279,6 +1281,39 @@
   return binlog_relay_io_delegate->remove_observer(observer);
 }
 
+static bool is_show_status(enum_sql_command sql_command) {
+  switch (sql_command) {
+    case SQLCOM_SHOW_VARIABLES:
+    case SQLCOM_SHOW_STATUS:
+    case SQLCOM_SHOW_ENGINE_LOGS:
+    case SQLCOM_SHOW_ENGINE_STATUS:
+    case SQLCOM_SHOW_ENGINE_MUTEX:
+    case SQLCOM_SHOW_PROCESSLIST:
+    case SQLCOM_SHOW_MASTER_STAT:
+    case SQLCOM_SHOW_SLAVE_STAT:
+    case SQLCOM_SHOW_CHARSETS:
+    case SQLCOM_SHOW_COLLATIONS:
+    case SQLCOM_SHOW_BINLOGS:
+    case SQLCOM_SHOW_OPEN_TABLES:
+    case SQLCOM_SHOW_SLAVE_HOSTS:
+    case SQLCOM_SHOW_BINLOG_EVENTS:
+    case SQLCOM_SHOW_WARNS:
+    case SQLCOM_SHOW_ERRORS:
+    case SQLCOM_SHOW_STORAGE_ENGINES:
+    case SQLCOM_SHOW_PRIVILEGES:
+    case SQLCOM_SHOW_STATUS_PROC:
+    case SQLCOM_SHOW_STATUS_FUNC:
+    case SQLCOM_SHOW_PLUGINS:
+    case SQLCOM_SHOW_EVENTS:
+    case SQLCOM_SHOW_PROFILE:
+    case SQLCOM_SHOW_PROFILES:
+    case SQLCOM_SHOW_RELAYLOG_EVENTS:
+      return true;
+    default:
+      return false;
+  }
+}
+
 int launch_hook_trans_begin(THD *thd, TABLE_LIST *all_tables) {
   DBUG_TRACE;
   LEX *lex = thd->lex;
@@ -1293,12 +1328,10 @@
     return 0;
   }
 
-  bool is_show = ((sql_command_flags[sql_command] & CF_STATUS_COMMAND) &&
-                  (sql_command != SQLCOM_BINLOG_BASE64_EVENT)) ||
-                 (sql_command == SQLCOM_SHOW_RELAYLOG_EVENTS);
+  bool is_show = is_show_status(sql_command);
   bool is_set = (sql_command == SQLCOM_SET_OPTION);
-  bool is_query_block = (sql_command == SQLCOM_SELECT);
-  bool is_do = (sql_command == SQLCOM_DO);
+  bool is_query_block =
+      (sql_command == SQLCOM_SELECT || sql_command == SQLCOM_DO);
   bool is_empty = (sql_command == SQLCOM_EMPTY_QUERY);
   bool is_use = (sql_command == SQLCOM_CHANGE_DB);
   bool is_stop_gr = (sql_command == SQLCOM_STOP_GROUP_REPLICATION);
@@ -1306,8 +1339,8 @@
   bool is_reset_persist =
       (sql_command == SQLCOM_RESET && lex->option_type == OPT_PERSIST);
 
-  if ((is_set || is_do || is_show || is_empty || is_use || is_stop_gr ||
-       is_shutdown || is_reset_persist) &&
+  if ((is_set || is_show || is_empty || is_use || is_stop_gr || is_shutdown ||
+       is_reset_persist) &&
       !lex->uses_stored_routines()) {
     return 0;
   }
@@ -1315,7 +1348,7 @@
   if (is_query_block) {
     bool is_udf = false;
 
-    // if select is an udf function
+    // If SELECT or DO is a UDF
     Query_block *query_block_elem = lex->unit->first_query_block();
     while (query_block_elem != nullptr) {
       for (Item *item : query_block_elem->visible_fields()) {
@@ -1330,7 +1363,7 @@
     }
 
     if (!is_udf && all_tables == nullptr) {
-      // SELECT that don't use tables and isn't a UDF
+      // SELECT or DO that don't use tables and isn't a UDF
       hold_command = false;
     }
 
diff -Nru mysql-8.0-8.0.26/sql/rpl_info_dummy.cc mysql-8.0-8.0.27/sql/rpl_info_dummy.cc
--- mysql-8.0-8.0.26/sql/rpl_info_dummy.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_info_dummy.cc	2021-09-28 11:46:34.000000000 +0000
@@ -32,9 +32,7 @@
 Rpl_info_dummy::Rpl_info_dummy(const int nparam)
     : Rpl_info_handler(nparam, nullptr) {}
 
-int Rpl_info_dummy::do_init_info(uint instance MY_ATTRIBUTE((unused))) {
-  return 0;
-}
+int Rpl_info_dummy::do_init_info(uint instance [[maybe_unused]]) { return 0; }
 
 int Rpl_info_dummy::do_init_info() { return 0; }
 
@@ -55,13 +53,13 @@
   return REPOSITORY_DOES_NOT_EXIST;
 }
 
-enum_return_check Rpl_info_dummy::do_check_info(
-    uint instance MY_ATTRIBUTE((unused))) {
+enum_return_check Rpl_info_dummy::do_check_info(uint instance
+                                                [[maybe_unused]]) {
   assert(!abort);
   return REPOSITORY_DOES_NOT_EXIST;
 }
 
-int Rpl_info_dummy::do_flush_info(const bool force MY_ATTRIBUTE((unused))) {
+int Rpl_info_dummy::do_flush_info(const bool force [[maybe_unused]]) {
   assert(!abort);
   return 0;
 }
@@ -80,45 +78,44 @@
 
 uint Rpl_info_dummy::do_get_rpl_info_type() { return INFO_REPOSITORY_DUMMY; }
 
-bool Rpl_info_dummy::do_set_info(const int pos MY_ATTRIBUTE((unused)),
-                                 const char *value MY_ATTRIBUTE((unused))) {
+bool Rpl_info_dummy::do_set_info(const int pos [[maybe_unused]],
+                                 const char *value [[maybe_unused]]) {
   assert(!abort);
 
   return false;
 }
 
-bool Rpl_info_dummy::do_set_info(const int pos MY_ATTRIBUTE((unused)),
-                                 const uchar *value MY_ATTRIBUTE((unused)),
-                                 const size_t size MY_ATTRIBUTE((unused))) {
+bool Rpl_info_dummy::do_set_info(const int pos [[maybe_unused]],
+                                 const uchar *value [[maybe_unused]],
+                                 const size_t size [[maybe_unused]]) {
   assert(!abort);
 
   return false;
 }
 
-bool Rpl_info_dummy::do_set_info(const int pos MY_ATTRIBUTE((unused)),
-                                 const ulong value MY_ATTRIBUTE((unused))) {
+bool Rpl_info_dummy::do_set_info(const int pos [[maybe_unused]],
+                                 const ulong value [[maybe_unused]]) {
   assert(!abort);
 
   return false;
 }
 
-bool Rpl_info_dummy::do_set_info(const int pos MY_ATTRIBUTE((unused)),
-                                 const int value MY_ATTRIBUTE((unused))) {
+bool Rpl_info_dummy::do_set_info(const int pos [[maybe_unused]],
+                                 const int value [[maybe_unused]]) {
   assert(!abort);
 
   return false;
 }
 
-bool Rpl_info_dummy::do_set_info(const int pos MY_ATTRIBUTE((unused)),
-                                 const float value MY_ATTRIBUTE((unused))) {
+bool Rpl_info_dummy::do_set_info(const int pos [[maybe_unused]],
+                                 const float value [[maybe_unused]]) {
   assert(!abort);
 
   return false;
 }
 
-bool Rpl_info_dummy::do_set_info(const int pos MY_ATTRIBUTE((unused)),
-                                 const Server_ids *value
-                                     MY_ATTRIBUTE((unused))) {
+bool Rpl_info_dummy::do_set_info(const int pos [[maybe_unused]],
+                                 const Server_ids *value [[maybe_unused]]) {
   assert(!abort);
 
   return false;
@@ -138,51 +135,50 @@
 }
 
 Rpl_info_handler::enum_field_get_status Rpl_info_dummy::do_get_info(
-    const int pos MY_ATTRIBUTE((unused)), char *value MY_ATTRIBUTE((unused)),
-    const size_t size MY_ATTRIBUTE((unused)),
-    const char *default_value MY_ATTRIBUTE((unused))) {
+    const int pos [[maybe_unused]], char *value [[maybe_unused]],
+    const size_t size [[maybe_unused]],
+    const char *default_value [[maybe_unused]]) {
   assert(!abort);
 
   return Rpl_info_handler::enum_field_get_status::FIELD_VALUE_NOT_NULL;
 }
 
 Rpl_info_handler::enum_field_get_status Rpl_info_dummy::do_get_info(
-    const int pos MY_ATTRIBUTE((unused)), uchar *value MY_ATTRIBUTE((unused)),
-    const size_t size MY_ATTRIBUTE((unused)),
-    const uchar *default_value MY_ATTRIBUTE((unused))) {
+    const int pos [[maybe_unused]], uchar *value [[maybe_unused]],
+    const size_t size [[maybe_unused]],
+    const uchar *default_value [[maybe_unused]]) {
   assert(!abort);
 
   return Rpl_info_handler::enum_field_get_status::FIELD_VALUE_NOT_NULL;
 }
 
 Rpl_info_handler::enum_field_get_status Rpl_info_dummy::do_get_info(
-    const int pos MY_ATTRIBUTE((unused)), ulong *value MY_ATTRIBUTE((unused)),
-    const ulong default_value MY_ATTRIBUTE((unused))) {
+    const int pos [[maybe_unused]], ulong *value [[maybe_unused]],
+    const ulong default_value [[maybe_unused]]) {
   assert(!abort);
 
   return Rpl_info_handler::enum_field_get_status::FIELD_VALUE_NOT_NULL;
 }
 
 Rpl_info_handler::enum_field_get_status Rpl_info_dummy::do_get_info(
-    const int pos MY_ATTRIBUTE((unused)), int *value MY_ATTRIBUTE((unused)),
-    const int default_value MY_ATTRIBUTE((unused))) {
+    const int pos [[maybe_unused]], int *value [[maybe_unused]],
+    const int default_value [[maybe_unused]]) {
   assert(!abort);
 
   return Rpl_info_handler::enum_field_get_status::FIELD_VALUE_NOT_NULL;
 }
 
 Rpl_info_handler::enum_field_get_status Rpl_info_dummy::do_get_info(
-    const int pos MY_ATTRIBUTE((unused)), float *value MY_ATTRIBUTE((unused)),
-    const float default_value MY_ATTRIBUTE((unused))) {
+    const int pos [[maybe_unused]], float *value [[maybe_unused]],
+    const float default_value [[maybe_unused]]) {
   assert(!abort);
 
   return Rpl_info_handler::enum_field_get_status::FIELD_VALUE_NOT_NULL;
 }
 
 Rpl_info_handler::enum_field_get_status Rpl_info_dummy::do_get_info(
-    const int pos MY_ATTRIBUTE((unused)),
-    Server_ids *value MY_ATTRIBUTE((unused)),
-    const Server_ids *default_value MY_ATTRIBUTE((unused))) {
+    const int pos [[maybe_unused]], Server_ids *value [[maybe_unused]],
+    const Server_ids *default_value [[maybe_unused]]) {
   assert(!abort);
 
   return Rpl_info_handler::enum_field_get_status::FIELD_VALUE_NOT_NULL;
diff -Nru mysql-8.0-8.0.26/sql/rpl_info_factory.cc mysql-8.0-8.0.27/sql/rpl_info_factory.cc
--- mysql-8.0-8.0.26/sql/rpl_info_factory.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_info_factory.cc	2021-09-28 11:46:34.000000000 +0000
@@ -210,7 +210,7 @@
   Rpl_info_handler *handler_dest = nullptr;
   uint instances = 1;
   uint worker_repository = INVALID_INFO_REPOSITORY;
-  uint worker_instances = 1;
+  std::string scan_msg;
   const char *msg = nullptr;
   const char *msg_alloc =
       "Failed to allocate memory for the relay log info "
@@ -226,10 +226,11 @@
     found.
   */
   if (rli_option != INFO_REPOSITORY_DUMMY &&
-      scan_repositories(&worker_instances, &worker_repository,
-                        worker_table_data, worker_file_data, &msg))
+      scan_and_check_repositories(worker_repository, worker_table_data,
+                                  worker_file_data, scan_msg)) {
+    msg = scan_msg.c_str();
     goto err;
-
+  }
   if (!(rli = new Relay_log_info(
             is_slave_recovery,
 #ifdef HAVE_PSI_INTERFACE
@@ -358,7 +359,12 @@
 
   DBUG_TRACE;
 
-  if (rli->recovery_parallel_workers == 0) return false;
+  /*
+    Skip the optimization check if the last value of the number of workers
+    might not have been persisted
+  */
+  if (rli->recovery_parallel_workers == 0 && !rli->mi->is_gtid_only_mode())
+    return false;
 
   if (Rpl_info_file::do_reset_info(
           Slave_worker::get_number_worker_fields(), worker_file_data.pattern,
@@ -381,7 +387,7 @@
            ER_RPL_FAILED_TO_DELETE_FROM_SLAVE_WORKERS_INFO_REPOSITORY);
   rli->recovery_parallel_workers = 0;
   rli->clear_mts_recovery_groups();
-  if (rli->flush_info(true)) {
+  if (rli->flush_info(Relay_log_info::RLI_FLUSH_IGNORE_SYNC_OPT)) {
     error = true;
     LogErr(ERROR_LEVEL, ER_RPL_FAILED_TO_RESET_STATE_IN_SLAVE_INFO_REPOSITORY);
   }
@@ -884,54 +890,85 @@
   return error;
 }
 
-bool Rpl_info_factory::scan_repositories(uint *found_instances,
-                                         uint *found_rep_option,
-                                         const struct_table_data &table_data,
-                                         const struct_file_data &file_data,
-                                         const char **msg) {
-  bool error = false;
+bool Rpl_info_factory::scan_and_count_repositories(
+    ulonglong &found_instances, uint &found_rep_option,
+    const struct_table_data &table_data, const struct_file_data &file_data,
+    std::string &msg) {
   uint file_instances = 0;
-  uint table_instances = 0;
-  assert(found_rep_option != nullptr);
+  ulonglong table_instances = 0;
 
   DBUG_TRACE;
 
   if (Rpl_info_table::do_count_info(
           table_data.n_fields, table_data.schema, table_data.name,
           &table_data.nullable_fields, &table_instances)) {
-    error = true;
-    goto err;
+    return true;
   }
 
   if (Rpl_info_file::do_count_info(
           file_data.n_fields, file_data.pattern, file_data.name_indexed,
           &file_data.nullable_fields, &file_instances)) {
-    error = true;
-    goto err;
+    return true;
   }
 
   if (file_instances != 0 && table_instances != 0) {
-    error = true;
-    *msg =
+    msg.assign(
         "Multiple repository instances found with data in "
         "them. Unable to decide which is the correct one to "
-        "choose";
-    goto err;
+        "choose");
+    return true;
   }
 
   if (table_instances != 0) {
-    *found_instances = table_instances;
-    *found_rep_option = INFO_REPOSITORY_TABLE;
+    found_instances = table_instances;
+    found_rep_option = INFO_REPOSITORY_TABLE;
   } else if (file_instances != 0) {
-    *found_instances = file_instances;
-    *found_rep_option = INFO_REPOSITORY_FILE;
+    found_instances = file_instances;
+    found_rep_option = INFO_REPOSITORY_FILE;
   } else {
-    *found_instances = 0;
-    *found_rep_option = INVALID_INFO_REPOSITORY;
+    found_instances = 0;
+    found_rep_option = INVALID_INFO_REPOSITORY;
   }
 
-err:
-  return error;
+  return false;
+}
+
+bool Rpl_info_factory::scan_and_check_repositories(
+    uint &found_rep_option, const struct_table_data &table_data,
+    const struct_file_data &file_data, std::string &msg) {
+  uint file_instances = 0;
+
+  DBUG_TRACE;
+
+  auto [error, table_in_use] = Rpl_info_table::table_in_use(
+      table_data.n_fields, table_data.schema, table_data.name,
+      &table_data.nullable_fields);
+
+  if (error) return true;
+
+  if (Rpl_info_file::do_count_info(
+          file_data.n_fields, file_data.pattern, file_data.name_indexed,
+          &file_data.nullable_fields, &file_instances)) {
+    return true;
+  }
+
+  if (file_instances != 0 && table_in_use) {
+    msg.assign(
+        "Multiple repository instances found with data in "
+        "them. Unable to decide which is the correct one to "
+        "choose");
+    return true;
+  }
+
+  if (table_in_use) {
+    found_rep_option = INFO_REPOSITORY_TABLE;
+  } else if (file_instances != 0) {
+    found_rep_option = INFO_REPOSITORY_FILE;
+  } else {
+    found_rep_option = INVALID_INFO_REPOSITORY;
+  }
+
+  return false;
 }
 
 bool Rpl_info_factory::configure_channel_replication_filters(
@@ -1071,14 +1108,14 @@
   DBUG_TRACE;
 
   Master_info *mi = nullptr;
-  const char *msg = nullptr;
+  std::string msg;
   bool error = false, channel_error;
   bool default_channel_existed_previously = false;
 
   std::vector<std::string> channel_list;
 
   /* Number of instances of Master_info repository */
-  uint mi_instances = 0;
+  ulonglong mi_instances = 0;
 
   /* At this point, the repository in invalid or unknown */
   uint mi_repository = INVALID_INFO_REPOSITORY;
@@ -1088,7 +1125,7 @@
     (Number of Slave worker objects that will be created by the Coordinator
     (when replica_parallel_workers>0) at a later stage and not here).
   */
-  uint rli_instances = 0;
+  ulonglong rli_instances = 0;
 
   /* At this point, the repository is invalid or unknown */
   uint rli_repository = INVALID_INFO_REPOSITORY;
@@ -1101,12 +1138,12 @@
   Rpl_info_factory::init_repository_metadata();
 
   /* Count the number of Master_info and Relay_log_info repositories */
-  if (scan_repositories(&mi_instances, &mi_repository, mi_table_data,
-                        mi_file_data, &msg) ||
-      scan_repositories(&rli_instances, &rli_repository, rli_table_data,
-                        rli_file_data, &msg)) {
+  if (scan_and_count_repositories(mi_instances, mi_repository, mi_table_data,
+                                  mi_file_data, msg) ||
+      scan_and_count_repositories(rli_instances, rli_repository, rli_table_data,
+                                  rli_file_data, msg)) {
     /* msg will contain the reason of failure */
-    LogErr(ERROR_LEVEL, ER_RPL_SLAVE_GENERIC_MESSAGE, msg);
+    LogErr(ERROR_LEVEL, ER_RPL_SLAVE_GENERIC_MESSAGE, msg.c_str());
     error = true;
     goto end;
   }
@@ -1161,12 +1198,15 @@
     if (!channel_error &&
         (!is_default_channel || default_channel_existed_previously)) {
       bool ignore_if_no_info = (channel_list.size() == 1) ? true : false;
-      channel_error =
-          load_mi_and_rli_from_repositories(mi, ignore_if_no_info, thread_mask);
+      channel_error = load_mi_and_rli_from_repositories(
+          mi, ignore_if_no_info, thread_mask, false, true);
     }
 
     if (!channel_error) {
       error = configure_channel_replication_filters(mi->rli, cname);
+      invalidate_repository_position(mi);
+      // With GTID ONLY the worker info is not needed
+      if (mi->is_gtid_only_mode()) Rpl_info_factory::reset_workers(mi->rli);
     } else {
       LogErr(ERROR_LEVEL, ER_RPL_SLAVE_FAILED_TO_INIT_A_MASTER_INFO_STRUCTURE,
              cname);
@@ -1254,9 +1294,9 @@
 */
 
 bool Rpl_info_factory::load_channel_names_from_repository(
-    std::vector<std::string> &channel_list,
-    uint mi_instances MY_ATTRIBUTE((unused)), uint mi_repository,
-    const char *default_channel, bool *default_channel_existed_previously) {
+    std::vector<std::string> &channel_list, uint mi_instances [[maybe_unused]],
+    uint mi_repository, const char *default_channel,
+    bool *default_channel_existed_previously) {
   DBUG_TRACE;
 
   *default_channel_existed_previously = false;
@@ -1395,3 +1435,10 @@
   delete info;
   return error != HA_ERR_END_OF_FILE && error != 0;
 }
+
+void Rpl_info_factory::invalidate_repository_position(Master_info *mi) {
+  if (mi->is_gtid_only_mode()) {
+    mi->set_receiver_position_info_invalid(true);
+    mi->rli->set_applier_source_position_info_invalid(true);
+  }
+}
diff -Nru mysql-8.0-8.0.26/sql/rpl_info_factory.h mysql-8.0-8.0.27/sql/rpl_info_factory.h
--- mysql-8.0-8.0.26/sql/rpl_info_factory.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_info_factory.h	2021-09-28 11:46:34.000000000 +0000
@@ -77,6 +77,13 @@
                                      Relay_log_info *rli,
                                      bool is_gaps_collecting_phase);
   static bool reset_workers(Relay_log_info *rli);
+  /**
+    If GTID_ONLY is set for this channel, receiver and applier positions
+    will be marked as invalid.
+
+    @param mi the repository info object whose positions will be invalidated
+  */
+  static void invalidate_repository_position(Master_info *mi);
 
  private:
   typedef struct file_data {
@@ -126,10 +133,42 @@
   static bool init_repositories(Rpl_info *info, Rpl_info_handler **handler_src,
                                 Rpl_info_handler **handler_dst,
                                 const char **msg);
-  static bool scan_repositories(uint *found_instances, uint *found_rep_option,
-                                const struct_table_data &table_data,
-                                const struct_file_data &file_data,
-                                const char **msg);
+  /**
+    Scan table and files for repositories.
+    If both file and table repositories are found an error is returned.
+    This method returns the number of repository instances found which
+    might imply a table scan.
+
+    @param[out] found_instances  the number of repo instances found
+    @param[out] found_rep_option what is the type of repo found (FILE or TABLE)
+    @param[in]  table_data       the data on the tables to scan
+    @param[in]  file_data        the data on the files to scan
+    @param[out] msg              the error message returned
+
+    @return true if an error occurs, false otherwise
+  */
+  static bool scan_and_count_repositories(ulonglong &found_instances,
+                                          uint &found_rep_option,
+                                          const struct_table_data &table_data,
+                                          const struct_file_data &file_data,
+                                          std::string &msg);
+  /**
+    Scan table and files for repositories.
+    If both file and table repositories are found an error is returned.
+    This method does not try to count the number of repositories, only
+    checks if they are present
+
+    @param[out] found_rep_option what is the type of repo found (FILE or TABLE)
+    @param[in]  table_data       the data on the tables to scan
+    @param[in]  file_data        the data on the files to scan
+    @param[out] msg              the error message returned
+
+    @return true if an error occurs, false otherwise
+  */
+  static bool scan_and_check_repositories(uint &found_rep_option,
+                                          const struct_table_data &table_data,
+                                          const struct_file_data &file_data,
+                                          std::string &msg);
   static bool load_channel_names_from_repository(
       std::vector<std::string> &channel_list, uint mi_instances,
       uint mi_repository, const char *default_channel,
diff -Nru mysql-8.0-8.0.26/sql/rpl_info_file.cc mysql-8.0-8.0.27/sql/rpl_info_file.cc
--- mysql-8.0-8.0.26/sql/rpl_info_file.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_info_file.cc	2021-09-28 11:46:34.000000000 +0000
@@ -462,10 +462,7 @@
 
 bool Rpl_info_file::do_is_transactional() { return false; }
 
-bool Rpl_info_file::do_update_is_transactional() {
-  DBUG_EXECUTE_IF("simulate_update_is_transactional_error", { return true; });
-  return false;
-}
+bool Rpl_info_file::do_update_is_transactional() { return false; }
 
 uint Rpl_info_file::do_get_rpl_info_type() { return INFO_REPOSITORY_FILE; }
 
diff -Nru mysql-8.0-8.0.26/sql/rpl_info_table_access.cc mysql-8.0-8.0.27/sql/rpl_info_table_access.cc
--- mysql-8.0-8.0.26/sql/rpl_info_table_access.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_info_table_access.cc	2021-09-28 11:46:34.000000000 +0000
@@ -232,10 +232,9 @@
   Returns the number of entries in table.
 
   The code built on top of this function needs to ensure there is
-  no concurrent threads trying to update the table. So if an error
-  different from HA_ERR_END_OF_FILE is returned, we abort with an
-  error because this implies that someone has manualy and
-  concurrently changed something.
+  no concurrent threads trying to access the table. So if an error
+  different from HA_ERR_END_OF_FILE is returned, an error is returned
+  meaning the count failed cause a deadlock or other issue was found
 
   @param[in]  table   Table
   @param[out] counter Registers the number of entries.
@@ -243,36 +242,38 @@
   @retval false No error
   @retval true  Failure
 */
-bool Rpl_info_table_access::count_info(TABLE *table, uint *counter) {
-  bool end = false;
-  int error = 0;
+bool Rpl_info_table_access::count_info(TABLE *table, ulonglong *counter) {
+  DBUG_TRACE;
+  int error = table->file->ha_records(counter);
+  return error != 0;
+}
+
+/**
+  Returns if the table is being used, meaning it contains at least a
+  line or some concurrency related error was returned when looking at
+  the table.
 
+  @param[in]  table   Table
+
+  @retval a pair of booleans
+          First element is true if an error occurred, false otherwise.
+          Second element is true if the table is not empty or an access error
+          occurred meaning someone else is accessing it. False if the table
+          is empty.
+*/
+std::pair<bool, bool> Rpl_info_table_access::is_table_in_use(TABLE *table) {
   DBUG_TRACE;
 
-  if ((error = table->file->ha_rnd_init(true))) return true;
+  if ((table->file->ha_rnd_init(true))) return std::make_pair(true, false);
 
-  do {
-    error = table->file->ha_rnd_next(table->record[0]);
-    switch (error) {
-      case 0:
-        (*counter)++;
-        break;
-
-      case HA_ERR_END_OF_FILE:
-        end = true;
-        break;
-
-      default:
-        DBUG_PRINT("info", ("Failed to get next record"
-                            " (ha_rnd_next returns %d)",
-                            error));
-        break;
-    }
-  } while (!error);
+  bool is_in_use = true;
+  if (table->file->ha_rnd_next(table->record[0]) == HA_ERR_END_OF_FILE) {
+    is_in_use = false;
+  }
 
   table->file->ha_rnd_end();
 
-  return end ? false : true;
+  return std::make_pair(false, is_in_use);
 }
 
 /**
diff -Nru mysql-8.0-8.0.26/sql/rpl_info_table_access.h mysql-8.0-8.0.27/sql/rpl_info_table_access.h
--- mysql-8.0-8.0.26/sql/rpl_info_table_access.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_info_table_access.h	2021-09-28 11:46:34.000000000 +0000
@@ -52,7 +52,8 @@
                    bool error);
   enum enum_return_id find_info(Rpl_info_values *field_values, TABLE *table);
   enum enum_return_id scan_info(TABLE *table, uint instance);
-  bool count_info(TABLE *table, uint *counter);
+  std::pair<bool, bool> is_table_in_use(TABLE *table);
+  bool count_info(TABLE *table, ulonglong *counter);
   bool load_info_values(uint max_num_field, Field **fields,
                         Rpl_info_values *field_values);
   bool store_info_values(uint max_num_field, Field **fields,
diff -Nru mysql-8.0-8.0.26/sql/rpl_info_table.cc mysql-8.0-8.0.27/sql/rpl_info_table.cc
--- mysql-8.0-8.0.26/sql/rpl_info_table.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_info_table.cc	2021-09-28 11:46:34.000000000 +0000
@@ -527,7 +527,7 @@
 bool Rpl_info_table::do_count_info(uint nparam, const char *param_schema,
                                    const char *param_table,
                                    MY_BITMAP const *nullable_bitmap,
-                                   uint *counter) {
+                                   ulonglong *counter) {
   int error = 1;
   TABLE *table = nullptr;
   sql_mode_t saved_mode;
@@ -580,6 +580,54 @@
   return error;
 }
 
+std::pair<bool, bool> Rpl_info_table::table_in_use(
+    uint nparam, const char *param_schema, const char *param_table,
+    MY_BITMAP const *nullable_bitmap) {
+  bool error{false};
+  bool empty{false};
+
+  TABLE *table = nullptr;
+  Open_tables_backup backup;
+  Rpl_info_table *info = nullptr;
+
+  DBUG_TRACE;
+
+  if (!(info = new Rpl_info_table(nparam, param_schema, param_table, 0, nullptr,
+                                  nullable_bitmap)))
+    return std::make_pair(true, false);
+
+  THD *thd = info->access->create_thd();
+  sql_mode_t saved_mode = thd->variables.sql_mode;
+
+  /*
+    Opens and locks the rpl_info table before accessing it.
+  */
+  if (!info->access->open_table(thd, to_lex_cstring(info->str_schema),
+                                to_lex_cstring(info->str_table),
+                                info->get_number_info(), TL_READ, &table,
+                                &backup)) {
+    /*
+      Check if table is in use
+    */
+    std::tie(error, empty) = info->access->is_table_in_use(table);
+    if (error) {
+      LogErr(WARNING_LEVEL, ER_RPL_CANT_SCAN_INFO_TABLE, info->str_schema.str,
+             info->str_table.str);
+    }
+  }
+  /* else:
+    We cannot simply print out a warning message at this
+    point because this may represent a bootstrap.
+  */
+
+  // Unlocks and closes the rpl_info table.
+  error = info->access->close_table(thd, table, &backup, error) || error;
+  thd->variables.sql_mode = saved_mode;
+  info->access->drop_thd(thd);
+  delete info;
+  return std::make_pair(error != 0, empty);
+}
+
 void Rpl_info_table::do_end_info() {}
 
 int Rpl_info_table::do_prepare_info_for_read() {
@@ -675,7 +723,7 @@
 
 Rpl_info_handler::enum_field_get_status Rpl_info_table::do_get_info(
     const int pos, uchar *value, const size_t size,
-    const uchar *default_value MY_ATTRIBUTE((unused))) {
+    const uchar *default_value [[maybe_unused]]) {
   if (bitmap_is_set(&field_values->is_null, pos)) {
     return Rpl_info_handler::enum_field_get_status::FIELD_VALUE_IS_NULL;
   } else {
@@ -740,7 +788,7 @@
 
 Rpl_info_handler::enum_field_get_status Rpl_info_table::do_get_info(
     const int pos, Server_ids *value,
-    const Server_ids *default_value MY_ATTRIBUTE((unused))) {
+    const Server_ids *default_value [[maybe_unused]]) {
   if (value->unpack_dynamic_ids(field_values->value[pos].c_ptr_safe()))
     return Rpl_info_handler::enum_field_get_status::FAILURE;
 
@@ -758,7 +806,6 @@
   Open_tables_backup backup;
 
   DBUG_TRACE;
-  DBUG_EXECUTE_IF("simulate_update_is_transactional_error", { return true; });
 
   THD *thd = access->create_thd();
   saved_mode = thd->variables.sql_mode;
diff -Nru mysql-8.0-8.0.26/sql/rpl_info_table.h mysql-8.0-8.0.27/sql/rpl_info_table.h
--- mysql-8.0-8.0.26/sql/rpl_info_table.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_info_table.h	2021-09-28 11:46:34.000000000 +0000
@@ -131,7 +131,31 @@
   */
   static bool do_count_info(uint nparam, const char *param_schema,
                             const char *param_table,
-                            MY_BITMAP const *nullable_bitmap, uint *counter);
+                            MY_BITMAP const *nullable_bitmap,
+                            ulonglong *counter);
+  /**
+    Returns if the table is being used, meaning it contains at least a
+    line or some concurrency related error was returned when looking at
+    the table identified by: param_schema.param_table
+
+    @param[in]  nparam           Number of fields in the table.
+    @param[in]  param_schema     Table's schema.
+    @param[in]  param_table      Table's name.
+    @param[in]  nullable_bitmap  bitmap that holds the fields that are
+                                 allowed to be `NULL`-
+    @param[out] counter          Number of entries found.
+
+    @retval a pair of booleans
+            First element is true if an error occurred, false otherwise.
+            Second element is true if the table is not empty or an access error
+            occurred meaning someone else is accessing it. False if the table
+            is empty.
+  */
+  static std::pair<bool, bool> table_in_use(uint nparam,
+                                            const char *param_schema,
+                                            const char *param_table,
+                                            MY_BITMAP const *nullable_bitmap);
+
   static int do_reset_info(uint nparam, const char *param_schema,
                            const char *param_table, const char *channel_name,
                            MY_BITMAP const *nullable_bitmap);
diff -Nru mysql-8.0-8.0.26/sql/rpl_io_monitor.cc mysql-8.0-8.0.27/sql/rpl_io_monitor.cc
--- mysql-8.0-8.0.26/sql/rpl_io_monitor.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_io_monitor.cc	2021-09-28 11:46:34.000000000 +0000
@@ -21,14 +21,19 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
 #include "sql/rpl_io_monitor.h"
+#include <mysql/components/my_service.h>
+#include <mysql/components/services/group_replication_status_service.h>
 #include "mysql/components/services/log_builtins.h"
 
+#include "sql/changestreams/apply/replication_thread_status.h"
 #include "sql/json_dom.h"
 #include "sql/mysqld.h"
 #include "sql/mysqld_thd_manager.h"  // Global_THD_manager
 #include "sql/protocol_classic.h"
 #include "sql/rpl_async_conn_failover.h"  // reset_pos
-#include "sql/rpl_msr.h"                  /* Multisource replication */
+#include "sql/rpl_async_conn_failover_configuration_propagation.h"
+#include "sql/rpl_group_replication.h"
+#include "sql/rpl_msr.h" /* Multisource replication */
 #include "sql/rpl_replica.h"
 #include "sql/rpl_sys_key_access.h"
 #include "sql/rpl_sys_table_access.h"
@@ -249,7 +254,8 @@
   mysql_cond_broadcast(&m_run_cond);
   mysql_mutex_unlock(&m_run_lock);
 
-  while (!is_monitor_killed(thd, nullptr)) {
+  while (!is_monitor_killed(thd, nullptr) &&
+         !is_group_replication_member_secondary()) {
     sync_senders_details(thd);
 
     THD_STAGE_INFO(thd, stage_rpl_failover_wait_before_next_fetch);
@@ -293,6 +299,7 @@
     std::tuple<std::string, std::string, uint> conn_detail) {
   bool err_val{false};
   std::string err_msg{};
+
   Rpl_sys_table_access::for_each_in_tuple(
       conn_detail, [&](const auto &n, const auto &x) {
         if (table_op.store_field(table->field[n], x)) {
@@ -312,6 +319,7 @@
     RPL_FAILOVER_SOURCE_TUPLE conn_detail) {
   bool err_val{false};
   std::string err_msg{};
+
   Rpl_sys_table_access::for_each_in_tuple(
       conn_detail, [&](const auto &n, const auto &x) {
         if (table_op.store_field(table->field[n], x)) {
@@ -738,13 +746,47 @@
     }
   }
 
-  if (table_op.close(err_val)) {
+  /* Increment member action configuration version. */
+  if (table_op.increment_version()) {
+    LogErr(ERROR_LEVEL, ER_RPL_INCREMENTING_MEMBER_ACTION_VERSION, db.c_str(),
+           table_name.c_str());
+    return 1;
+  }
+
+  /*
+    Send replication_asynchronous_connection_failover data to group replication
+    group members.
+  */
+  if (rpl_acf_configuration_handler->send_failover_data(table_op)) {
     return 1;
   }
 
   return 0;
 }
 
+bool Source_IO_monitor::has_primary_lost_contact_with_majority() {
+  bool primary_lost_contact_with_majority = false;
+  my_h_service gr_status_service_handler = nullptr;
+
+  srv_registry->acquire("group_replication_status_service_v1",
+                        &gr_status_service_handler);
+  if (nullptr != gr_status_service_handler) {
+    SERVICE_TYPE(group_replication_status_service_v1) *gr_status_service =
+        reinterpret_cast<SERVICE_TYPE(group_replication_status_service_v1) *>(
+            gr_status_service_handler);
+
+    if (gr_status_service
+            ->is_group_in_single_primary_mode_and_im_the_primary() &&
+        !gr_status_service->is_member_online_with_group_majority()) {
+      primary_lost_contact_with_majority = true;
+    }
+
+    srv_registry->release(gr_status_service_handler);
+  }
+
+  return primary_lost_contact_with_majority;
+}
+
 std::tuple<int, bool, bool, std::tuple<std::string, std::string, uint>>
 Source_IO_monitor::get_online_members(
     THD *thd, Master_info *mi, const Mysql_connection *conn,
@@ -888,8 +930,24 @@
 }
 
 int Source_IO_monitor::sync_senders_details(THD *thd) {
-  std::vector<std::string> channels;
+  bool primary_lost_contact_with_majority =
+      has_primary_lost_contact_with_majority();
 
+  if (primary_lost_contact_with_majority) {
+    /* Log the warning only once per majority loss. */
+    if (!m_primary_lost_contact_with_majority_warning_logged) {
+      m_primary_lost_contact_with_majority_warning_logged = true;
+      LogErr(WARNING_LEVEL, ER_GRP_RPL_FAILOVER_PRIMARY_WITHOUT_MAJORITY);
+    }
+    return 0;
+  } else {
+    if (m_primary_lost_contact_with_majority_warning_logged) {
+      m_primary_lost_contact_with_majority_warning_logged = false;
+      LogErr(WARNING_LEVEL, ER_GRP_RPL_FAILOVER_PRIMARY_BACK_TO_MAJORITY);
+    }
+  }
+
+  std::vector<std::string> channels;
   channel_map.rdlock();
   for (mi_map::iterator it = channel_map.begin(); it != channel_map.end();
        it++) {
diff -Nru mysql-8.0-8.0.26/sql/rpl_io_monitor.h mysql-8.0-8.0.27/sql/rpl_io_monitor.h
--- mysql-8.0-8.0.26/sql/rpl_io_monitor.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_io_monitor.h	2021-09-28 11:46:34.000000000 +0000
@@ -248,6 +248,8 @@
   /* Monitor IO thread state */
   thread_state m_monitor_thd_state;
 
+  bool m_primary_lost_contact_with_majority_warning_logged{false};
+
   /* Sql queries result column number */
   enum enum_res_col {
     COL_GROUP_NAME = 0,
@@ -404,6 +406,15 @@
       RPL_FAILOVER_SOURCE_TUPLE conn_detail);
 
   /**
+    Checks if primary member has lost contact with majority
+
+    @return status
+      @retval true  primary member has lost contact with majority
+      @retval false otherwise
+  */
+  bool has_primary_lost_contact_with_majority();
+
+  /**
     Gets the Json key for primary weight for the Configuration column of
     replication_asynchronous_connection_failover_managed table.
 
diff -Nru mysql-8.0-8.0.26/sql/rpl_log_encryption.cc mysql-8.0-8.0.27/sql/rpl_log_encryption.cc
--- mysql-8.0-8.0.26/sql/rpl_log_encryption.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_log_encryption.cc	2021-09-28 11:46:34.000000000 +0000
@@ -583,7 +583,7 @@
       }
       DBUG_EXECUTE_IF("crash_after_set_old_master_key_seqno_on_keyring",
                       DBUG_SUICIDE(););
-      /* FALLTHROUGH */
+      [[fallthrough]];
     case Key_rotation_step::DETERMINE_NEXT_SEQNO: {
       assert(new_master_key_seqno == 0);
       Keyring_status candidate_key_fetch_status;
@@ -609,7 +609,7 @@
       DBUG_EXECUTE_IF("crash_after_set_new_master_key_seqno_on_keyring",
                       DBUG_SUICIDE(););
     }
-      /* FALLTHROUGH */
+      [[fallthrough]];
     case Key_rotation_step::GENERATE_NEW_MASTER_KEY:
       /*
         Request the keyring to generate a new master key by key id
@@ -619,7 +619,7 @@
       if (generate_master_key_on_keyring(new_master_key_seqno)) goto err1;
       DBUG_EXECUTE_IF("crash_after_generate_new_master_key_on_keyring",
                       DBUG_SUICIDE(););
-      /* FALLTHROUGH */
+      [[fallthrough]];
     case Key_rotation_step::REMOVE_MASTER_KEY_INDEX:
       /*
         We did not store a master key seqno into keyring if
@@ -630,14 +630,14 @@
         DBUG_EXECUTE_IF("crash_after_remove_master_key_seqno_from_keyring",
                         DBUG_SUICIDE(););
       }
-      /* FALLTHROUGH */
+      [[fallthrough]];
     case Key_rotation_step::STORE_MASTER_KEY_INDEX:
       if (set_master_key_seqno_on_keyring(new_master_key_seqno)) goto err1;
       DBUG_EXECUTE_IF("crash_after_set_master_key_seqno_on_keyring",
                       DBUG_SUICIDE(););
       /* The master key is now usable */
       m_master_key_seqno = new_master_key_seqno;
-      /* FALLTHROUGH */
+      [[fallthrough]];
     case Key_rotation_step::ROTATE_LOGS: {
       /* We do not rotate and re-encrypt logs during recovery. */
       if (m_master_key_recovered && current_thd) {
@@ -657,7 +657,7 @@
         if (reencrypt_relay_logs()) return true;
       }
     }
-      /* FALLTHROUGH */
+      [[fallthrough]];
     case Key_rotation_step::PURGE_UNUSED_ENCRYPTION_KEYS: {
       if (m_master_key_recovered && current_thd) {
         /* We do not purge unused encryption keys during recovery. */
@@ -670,7 +670,7 @@
       DBUG_EXECUTE_IF("crash_after_remove_old_master_key_seqno_from_keyring",
                       DBUG_SUICIDE(););
     }
-      /* FALLTHROUGH */
+      [[fallthrough]];
     case Key_rotation_step::REMOVE_KEY_ROTATION_TAG:
       if (remove_new_master_key_seqno_from_keyring()) goto warn2;
       DBUG_EXECUTE_IF("crash_after_remove_new_master_key_seqno_from_keyring",
@@ -1256,8 +1256,8 @@
   return ostr.str();
 }
 
-std::string Rpl_encryption_header_v1::seqno_to_key_id(
-    uint32_t seqno MY_ATTRIBUTE((unused))) {
+std::string Rpl_encryption_header_v1::seqno_to_key_id(uint32_t seqno
+                                                      [[maybe_unused]]) {
   std::ostringstream ostr;
 #ifdef MYSQL_SERVER
   ostr << key_id_prefix() << "_" << seqno;
@@ -1265,8 +1265,8 @@
   return ostr.str();
 }
 
-std::string Rpl_encryption_header_v1::key_id_with_suffix(
-    const char *suffix MY_ATTRIBUTE((unused))) {
+std::string Rpl_encryption_header_v1::key_id_with_suffix(const char *suffix
+                                                         [[maybe_unused]]) {
   std::ostringstream ostr;
 #ifdef MYSQL_SERVER
   ostr << key_id_prefix() << "_" << suffix;
diff -Nru mysql-8.0-8.0.26/sql/rpl_mi.cc mysql-8.0-8.0.27/sql/rpl_mi.cc
--- mysql-8.0-8.0.26/sql/rpl_mi.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_mi.cc	2021-09-28 11:46:34.000000000 +0000
@@ -103,8 +103,11 @@
   /* line for source_connection_auto_failover */
   LINE_FOR_SOURCE_CONNECTION_AUTO_FAILOVER = 32,
 
+  /* line for gtid_only */
+  LINE_FOR_GTID_ONLY = 33,
+
   /* Number of lines currently used when saving master info file */
-  LINES_IN_MASTER_INFO = LINE_FOR_SOURCE_CONNECTION_AUTO_FAILOVER
+  LINES_IN_MASTER_INFO = LINE_FOR_GTID_ONLY
 
 };
 
@@ -144,7 +147,8 @@
                                 "master_compression_algorithm",
                                 "master_zstd_compression_level",
                                 "tls_ciphersuites",
-                                "source_connection_auto_failover"};
+                                "source_connection_auto_failover",
+                                "gtid_only"};
 
 const uint info_mi_table_pk_field_indexes[] = {
     LINE_FOR_CHANNEL - 1,
@@ -193,7 +197,9 @@
       auto_position(false),
       transaction_parser(
           Transaction_boundary_parser::TRX_BOUNDARY_PARSER_RECEIVER),
-      reset(false) {
+      reset(false),
+      m_gtid_only_mode(false),
+      m_is_receiver_position_info_invalid(false) {
   host[0] = 0;
   user[0] = 0;
   bind_addr[0] = 0;
@@ -658,6 +664,14 @@
     m_source_connection_auto_failover = temp_source_connection_auto_failover;
   }
 
+  auto temp_gtid_only{0};
+  if (lines >= LINE_FOR_GTID_ONLY) {
+    if (!!from->get_info(&temp_gtid_only, 0)) return true;
+  } else {
+    if (channel_map.is_group_replication_channel_name(channel))
+      temp_gtid_only = 1;
+  }
+  m_gtid_only_mode = temp_gtid_only;
   return false;
 }
 
@@ -697,7 +711,8 @@
       to->set_info((int)zstd_compression_level) ||
       to->set_info(tls_ciphersuites.first ? nullptr
                                           : tls_ciphersuites.second.c_str()) ||
-      to->set_info((int)m_source_connection_auto_failover))
+      to->set_info((int)m_source_connection_auto_failover) ||
+      to->set_info((int)m_gtid_only_mode))
     return true;
 
   return false;
@@ -785,3 +800,17 @@
           sizeof(linfo->log_file_name) - 1);
   linfo->pos = flushed_relay_log_info.pos;
 }
+
+void Master_info::set_receiver_position_info_invalid(bool invalid) {
+  m_is_receiver_position_info_invalid = invalid;
+}
+
+bool Master_info::is_receiver_position_info_invalid() const {
+  return m_is_receiver_position_info_invalid;
+}
+
+void Master_info::set_gtid_only_mode(bool gtid_only_mode) {
+  m_gtid_only_mode = gtid_only_mode;
+}
+
+bool Master_info::is_gtid_only_mode() const { return m_gtid_only_mode; }
diff -Nru mysql-8.0-8.0.26/sql/rpl_mi.h mysql-8.0-8.0.27/sql/rpl_mi.h
--- mysql-8.0-8.0.26/sql/rpl_mi.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_mi.h	2021-09-28 11:46:34.000000000 +0000
@@ -448,12 +448,21 @@
   my_off_t master_log_pos;
 
  public:
-  inline const char *get_master_log_name() { return master_log_name; }
-  inline ulonglong get_master_log_pos() { return master_log_pos; }
+  inline const char *get_master_log_name() const { return master_log_name; }
+  inline const char *get_master_log_name_info() const {
+    if (m_is_receiver_position_info_invalid) return "INVALID";
+    return get_master_log_name();
+  }
+  inline ulonglong get_master_log_pos() const { return master_log_pos; }
+  inline ulonglong get_master_log_pos_info() const {
+    if (m_is_receiver_position_info_invalid) return 0;
+    return get_master_log_pos();
+  }
   inline void set_master_log_name(const char *log_file_name) {
     strmake(master_log_name, log_file_name, sizeof(master_log_name) - 1);
   }
   inline void set_master_log_pos(ulonglong log_pos) {
+    m_is_receiver_position_info_invalid = false;
     master_log_pos = log_pos;
   }
   inline const char *get_io_rpl_log_name() {
@@ -750,12 +759,55 @@
 
   void get_flushed_relay_log_info(LOG_INFO *linfo);
 
+  /**
+    Marks the receiver position information (master_log_name, master_log_pos)
+    as being invalid or not.
+
+    @param invalid The value to set the status to invalid or valid
+  */
+  void set_receiver_position_info_invalid(bool invalid);
+
+  /**
+    Returns if receiver position information is valid or invalid
+
+    @return true if receiver position information is not reliable,
+            false otherwise.
+  */
+  bool is_receiver_position_info_invalid() const;
+
+  /**
+    Enable or disable the gtid_only mode
+
+    @param gtid_only_mode value to set gtid_only (enable/disable it)
+  */
+  void set_gtid_only_mode(bool gtid_only_mode);
+
+  /**
+    Returns if gtid_only is enabled or not
+
+    @return true if gtid_only mode is active for a channel,
+            false otherwise.
+  */
+  bool is_gtid_only_mode() const;
+
  private:
   /*
     Holds the relay log coordinates (file name and position) of the last master
     coordinates flushed into Master_info repository.
   */
   LOG_INFO flushed_relay_log_info;
+
+  /**
+    Is the replica working in GTID only mode, meaning it does not
+    persist position related information when executing or queing transactions.
+  */
+  bool m_gtid_only_mode;
+
+  /**
+    Are positions invalid. When true this means the values for
+    receiver position related information might be outdated.
+  */
+  bool m_is_receiver_position_info_invalid;
 };
 
 #endif /* RPL_MI_H */
diff -Nru mysql-8.0-8.0.26/sql/rpl_mta_submode.cc mysql-8.0-8.0.27/sql/rpl_mta_submode.cc
--- mysql-8.0-8.0.26/sql/rpl_mta_submode.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_mta_submode.cc	2021-09-28 11:46:34.000000000 +0000
@@ -894,7 +894,7 @@
  */
 
 Slave_worker *Mts_submode_logical_clock::get_least_occupied_worker(
-    Relay_log_info *rli, Slave_worker_array *ws MY_ATTRIBUTE((unused)),
+    Relay_log_info *rli, Slave_worker_array *ws [[maybe_unused]],
     Log_event *ev) {
   Slave_worker *worker = nullptr;
   PSI_stage_info *old_stage = nullptr;
@@ -1016,7 +1016,7 @@
            0 no error.
  */
 int Mts_submode_logical_clock::wait_for_workers_to_finish(
-    Relay_log_info *rli, MY_ATTRIBUTE((unused)) Slave_worker *ignore) {
+    Relay_log_info *rli, [[maybe_unused]] Slave_worker *ignore) {
   PSI_stage_info *old_stage = nullptr;
   THD *thd = rli->info_thd;
   DBUG_TRACE;
diff -Nru mysql-8.0-8.0.26/sql/rpl_record.cc mysql-8.0-8.0.27/sql/rpl_record.cc
--- mysql-8.0-8.0.26/sql/rpl_record.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_record.cc	2021-09-28 11:46:34.000000000 +0000
@@ -54,18 +54,20 @@
 using std::max;
 using std::min;
 
-template <typename T, typename UT>
-void Bit_stream_base<T, UT>::dbug_print(
-    const char *str MY_ATTRIBUTE((unused))) const {
 #ifndef NDEBUG
+template <typename T, typename UT>
+void Bit_stream_base<T, UT>::dbug_print(const char *str) const {
   StringBuffer<STRING_BUFFER_USUAL_SIZE> s;
   s.reserve(static_cast<size_t>(m_current_bit + 1));
   for (uint i = 0; i < m_current_bit; i++)
     s.append((m_ptr[i / 8] & (1 << (i % 8))) != 0 ? '1' : '0');
   s.append("\0", 1);
   DBUG_PRINT("info", ("%s: %u bits: %s", str, m_current_bit, s.ptr()));
-#endif
 }
+#else
+template <typename T, typename UT>
+void Bit_stream_base<T, UT>::dbug_print(const char *) const {}
+#endif
 
 /**
   Write a single field (column) of a row in a binary log row event to the
diff -Nru mysql-8.0-8.0.26/sql/rpl_record.h mysql-8.0-8.0.27/sql/rpl_record.h
--- mysql-8.0-8.0.26/sql/rpl_record.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_record.h	2021-09-28 11:46:34.000000000 +0000
@@ -88,7 +88,7 @@
     Print all the bits before the current position to the debug trace.
     @param str Descriptive text that will be prefixed before the bit string.
   */
-  void dbug_print(const char *str) const;
+  void dbug_print(const char *str [[maybe_unused]]) const;
 };
 
 /**
diff -Nru mysql-8.0-8.0.26/sql/rpl_replica.cc mysql-8.0-8.0.27/sql/rpl_replica.cc
--- mysql-8.0-8.0.26/sql/rpl_replica.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_replica.cc	2021-09-28 11:46:34.000000000 +0000
@@ -52,6 +52,7 @@
 #include "mysql/psi/mysql_cond.h"
 #include "mysql/psi/mysql_mutex.h"
 #include "mysql/status_var.h"
+#include "sql/changestreams/apply/replication_thread_status.h"
 #include "sql/rpl_channel_service_interface.h"
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
@@ -123,6 +124,7 @@
 #include "sql/query_options.h"
 #include "sql/rpl_applier_reader.h"
 #include "sql/rpl_async_conn_failover.h"
+#include "sql/rpl_async_conn_failover_configuration_propagation.h"
 #include "sql/rpl_filter.h"
 #include "sql/rpl_group_replication.h"
 #include "sql/rpl_gtid.h"
@@ -318,6 +320,9 @@
 static int check_slave_sql_config_conflict(const Relay_log_info *rli);
 static void group_replication_cleanup_after_clone();
 
+static void check_replica_configuration_restrictions();
+static bool check_replica_configuration_errors(Master_info *mi,
+                                               int thread_mask);
 /*
   Applier thread InnoDB priority.
   When two transactions conflict inside InnoDB, the one with
@@ -386,77 +391,6 @@
       replica_max_allowed_packet + MAX_LOG_EVENT_HEADER;
 }
 
-/*
-  Find out which replications threads are running
-
-  SYNOPSIS
-    init_thread_mask()
-    mask                Return value here
-    mi                  master_info for slave
-    inverse             If set, returns which threads are not running
-    ignore_monitor_thread    If set, ignores monitor io thread
-
-  IMPLEMENTATION
-    Get a bit mask for which threads are running so that we can later restart
-    these threads.
-
-  RETURN
-    mask        If inverse == 0, running threads
-                If inverse == 1, stopped threads
-*/
-
-void init_thread_mask(int *mask, Master_info *mi, bool inverse,
-                      bool ignore_monitor_thread) {
-  bool set_io = mi->slave_running, set_sql = mi->rli->slave_running;
-  bool set_monitor{
-      Source_IO_monitor::get_instance()->is_monitoring_process_running()};
-  int tmp_mask{0};
-  DBUG_TRACE;
-
-  if (set_io) tmp_mask |= SLAVE_IO;
-  if (set_sql) tmp_mask |= SLAVE_SQL;
-  if (!ignore_monitor_thread && set_monitor &&
-      mi->is_source_connection_auto_failover()) {
-    tmp_mask |= SLAVE_MONITOR;
-  }
-
-  if (inverse) {
-    tmp_mask ^= (SLAVE_IO | SLAVE_SQL);
-    if (!ignore_monitor_thread && mi->is_source_connection_auto_failover()) {
-      tmp_mask ^= SLAVE_MONITOR;
-    }
-  }
-
-  *mask = tmp_mask;
-}
-
-/*
-  lock_slave_threads()
-*/
-
-void lock_slave_threads(Master_info *mi) {
-  DBUG_TRACE;
-
-  // protection against mixed locking order (see header)
-  mi->channel_assert_some_wrlock();
-
-  // TODO: see if we can do this without dual mutex
-  mysql_mutex_lock(&mi->run_lock);
-  mysql_mutex_lock(&mi->rli->run_lock);
-}
-
-/*
-  unlock_slave_threads()
-*/
-
-void unlock_slave_threads(Master_info *mi) {
-  DBUG_TRACE;
-
-  // TODO: see if we can do this without dual mutex
-  mysql_mutex_unlock(&mi->rli->run_lock);
-  mysql_mutex_unlock(&mi->run_lock);
-}
-
 #ifdef HAVE_PSI_INTERFACE
 
 static PSI_memory_key key_memory_rli_mta_coor;
@@ -465,13 +399,13 @@
     key_thread_replica_worker, key_thread_replica_monitor_io;
 
 static PSI_thread_info all_slave_threads[] = {
-    {&key_thread_replica_io, "replica_io",
-     PSI_FLAG_SINGLETON | PSI_FLAG_THREAD_SYSTEM, 0, PSI_DOCUMENT_ME},
-    {&key_thread_replica_sql, "replica_sql",
-     PSI_FLAG_SINGLETON | PSI_FLAG_THREAD_SYSTEM, 0, PSI_DOCUMENT_ME},
-    {&key_thread_replica_worker, "replica_worker",
-     PSI_FLAG_SINGLETON | PSI_FLAG_THREAD_SYSTEM, 0, PSI_DOCUMENT_ME},
-    {&key_thread_replica_monitor_io, "replica_monitor",
+    {&key_thread_replica_io, "replica_io", "rpl_rca_io", PSI_FLAG_THREAD_SYSTEM,
+     0, PSI_DOCUMENT_ME},
+    {&key_thread_replica_sql, "replica_sql", "rpl_rca_sql",
+     PSI_FLAG_THREAD_SYSTEM, 0, PSI_DOCUMENT_ME},
+    {&key_thread_replica_worker, "replica_worker", "rpl_rca_wkr",
+     PSI_FLAG_THREAD_SYSTEM, 0, PSI_DOCUMENT_ME},
+    {&key_thread_replica_monitor_io, "replica_monitor", "rpl_rca_mon",
      PSI_FLAG_SINGLETON | PSI_FLAG_THREAD_SYSTEM, 0, PSI_DOCUMENT_ME}};
 
 static PSI_memory_info all_slave_memory[] = {{&key_memory_rli_mta_coor,
@@ -540,82 +474,8 @@
   }
 #endif
 
-  if (global_gtid_mode.get() == Gtid_mode::OFF) {
-    for (auto it : channel_map) {
-      Master_info *mi = it.second;
-      if (mi != nullptr && mi->is_auto_position()) {
-        LogErr(WARNING_LEVEL,
-               ER_RPL_SLAVE_AUTO_POSITION_IS_1_AND_GTID_MODE_IS_OFF,
-               mi->get_channel(), mi->get_channel());
-      }
-    }
-  }
-
-  if (global_gtid_mode.get() != Gtid_mode::ON) {
-    for (auto it : channel_map) {
-      Master_info *mi = it.second;
-      if (mi != nullptr && mi->is_source_connection_auto_failover()) {
-        LogErr(ERROR_LEVEL, ER_RPL_ASYNC_RECONNECT_GTID_MODE_OFF_CHANNEL,
-               mi->get_channel(), mi->get_channel());
-      }
-    }
-  }
-
-  std::string group_name = get_group_replication_group_name();
-  if ((global_gtid_mode.get() != Gtid_mode::ON) || group_name.length() > 0) {
-    for (auto it : channel_map) {
-      Master_info *mi = it.second;
-      if (mi != nullptr &&
-          mi->rli->m_assign_gtids_to_anonymous_transactions_info.get_type() >
-              Assign_gtids_to_anonymous_transactions_info::enum_type::
-                  AGAT_OFF) {
-        if (global_gtid_mode.get() != Gtid_mode::ON) {
-          std::string assign_gtid_type;
-          if (mi->rli->m_assign_gtids_to_anonymous_transactions_info
-                  .get_type() == Assign_gtids_to_anonymous_transactions_info::
-                                     enum_type::AGAT_LOCAL)
-            assign_gtid_type.assign("LOCAL");
-          else
-            assign_gtid_type.assign("a UUID");
-          LogErr(
-              WARNING_LEVEL,
-              ER_SLAVE_ANONYMOUS_TO_GTID_IS_LOCAL_OR_UUID_AND_GTID_MODE_NOT_ON,
-              mi->get_channel(), assign_gtid_type.data(),
-              Gtid_mode::to_string(global_gtid_mode.get()));
-        } else {
-          if (!(group_name.compare(
-                  mi->rli->m_assign_gtids_to_anonymous_transactions_info
-                      .get_value())))
-            LogErr(WARNING_LEVEL,
-                   ER_REPLICA_ANONYMOUS_TO_GTID_UUID_SAME_AS_GROUP_NAME,
-                   mi->get_channel(),
-                   mi->rli->m_assign_gtids_to_anonymous_transactions_info
-                       .get_value()
-                       .c_str());
-
-          std::string view_change_uuid;
-          if (get_group_replication_view_change_uuid(view_change_uuid)) {
-            /* purecov: begin inspected */
-            LogErr(WARNING_LEVEL,
-                   ER_WARN_GRP_RPL_VIEW_CHANGE_UUID_FAIL_GET_VARIABLE);
-            /* purecov: end */
-          }
+  check_replica_configuration_restrictions();
 
-          if (!(view_change_uuid.compare(
-                  mi->rli->m_assign_gtids_to_anonymous_transactions_info
-                      .get_value()))) {
-            LogErr(
-                WARNING_LEVEL,
-                ER_WARN_REPLICA_ANONYMOUS_TO_GTID_UUID_SAME_AS_VIEW_CHANGE_UUID,
-                mi->get_channel(),
-                mi->rli->m_assign_gtids_to_anonymous_transactions_info
-                    .get_value()
-                    .c_str());
-          }
-        }
-      }
-    }
-  }
   if (check_slave_sql_config_conflict(nullptr)) {
     error = 1;
     goto err;
@@ -1129,11 +989,16 @@
 */
 static void recover_relay_log(Master_info *mi) {
   Relay_log_info *rli = mi->rli;
-  // Set Receiver Thread's positions as per the recovered Applier Thread.
-  mi->set_master_log_pos(
-      max<ulonglong>(BIN_LOG_HEADER_SIZE, rli->get_group_master_log_pos()));
-  mi->set_master_log_name(rli->get_group_master_log_name());
 
+  // If GTID ONLY is enable the receiver doesn't care about these positions
+  if (!mi->is_gtid_only_mode()) {
+    // Set Receiver Thread's positions as per the recovered Applier Thread.
+    mi->set_master_log_pos(std::max<ulonglong>(
+        BIN_LOG_HEADER_SIZE, rli->get_group_master_log_pos()));
+    mi->set_master_log_name(rli->get_group_master_log_name());
+  }
+
+  // TODO make this conditional message also
   LogErr(WARNING_LEVEL, ER_RPL_RECOVERY_FILE_MASTER_POS_INFO,
          (ulong)mi->get_master_log_pos(), mi->get_master_log_name(),
          mi->get_for_channel_str(), rli->get_group_relay_log_pos(),
@@ -1213,7 +1078,7 @@
   group_master_log_name = const_cast<char *>(rli->get_group_master_log_name());
   if (!error) {
     bool run_relay_log_recovery = true;
-    if (!group_master_log_name[0]) {
+    if (!group_master_log_name[0] && !rli->mi->is_gtid_only_mode()) {
       if (rli->replicate_same_server_id) {
         error = 1;
         LogErr(ERROR_LEVEL,
@@ -1283,7 +1148,8 @@
   mysql_mutex_lock(&rli->data_lock);
   recover_relay_log(mi);
 
-  if (mi->flush_info(true) || rli->flush_info(true)) {
+  if (mi->flush_info(true) ||
+      rli->flush_info(Relay_log_info::RLI_FLUSH_IGNORE_SYNC_OPT)) {
     recovery_error = 1;
     mysql_mutex_unlock(&mi->data_lock);
     mysql_mutex_unlock(&rli->data_lock);
@@ -1310,7 +1176,8 @@
 
 int load_mi_and_rli_from_repositories(Master_info *mi, bool ignore_if_no_info,
                                       int thread_mask,
-                                      bool skip_received_gtid_set_recovery) {
+                                      bool skip_received_gtid_set_recovery,
+                                      bool force_load) {
   DBUG_TRACE;
   assert(mi != nullptr && mi->rli != nullptr);
   int init_error = 0;
@@ -1349,8 +1216,14 @@
     goto end;
   }
 
-  if (!(ignore_if_no_info && check_return == REPOSITORY_DOES_NOT_EXIST)) {
-    if ((thread_mask & SLAVE_IO) != 0 && mi->mi_init_info()) init_error = 1;
+  if (!ignore_if_no_info || check_return != REPOSITORY_DOES_NOT_EXIST) {
+    if ((thread_mask & SLAVE_IO) != 0) {
+      if (!mi->inited || force_load) {
+        if (mi->mi_init_info()) {
+          init_error = 1;
+        }
+      }
+    }
   }
 
   check_return = mi->rli->check_info();
@@ -1358,18 +1231,27 @@
     init_error = 1;
     goto end;
   }
-  if (!(ignore_if_no_info && check_return == REPOSITORY_DOES_NOT_EXIST)) {
-    if (((thread_mask & SLAVE_SQL) != 0 || !(mi->rli->inited)) &&
-        mi->rli->rli_init_info(skip_received_gtid_set_recovery))
-      init_error = 1;
-    else {
-      /*
-        During rli_init_info() above, the relay log is opened (if rli was not
-        initialized yet). The function below expects the relay log to be opened
-        to get its coordinates and store as the last flushed relay log
-        coordinates from I/O thread point of view.
-      */
-      mi->update_flushed_relay_log_info();
+  if (!ignore_if_no_info || check_return != REPOSITORY_DOES_NOT_EXIST) {
+    if ((thread_mask & SLAVE_SQL) != 0 || !(mi->rli->inited)) {
+      if (!mi->rli->inited || force_load) {
+        if (mi->rli->rli_init_info(skip_received_gtid_set_recovery)) {
+          init_error = 1;
+        } else {
+          /*
+            During rli_init_info() above, the relay log is opened (if rli was
+            not initialized yet). The function below expects the relay log to be
+            opened to get its coordinates and store as the last flushed relay
+            log coordinates from I/O thread point of view.
+          */
+          mi->update_flushed_relay_log_info();
+        }
+      } else {
+        // Even if we skip rli_init_info we must check if gaps exists to mantain
+        // the server behavior in commands like CHANGE REPLICATION SOURCE
+        if (mi->rli->recovery_parallel_workers ? mts_recovery_groups(mi->rli)
+                                               : 0)
+          init_error = 1;
+      }
     }
   }
 
@@ -1494,10 +1376,15 @@
 }
 
 int flush_master_info(Master_info *mi, bool force, bool need_lock,
-                      bool do_flush_relay_log) {
+                      bool do_flush_relay_log, bool skip_repo_persistence) {
   DBUG_TRACE;
   assert(mi != nullptr && mi->rli != nullptr);
   DBUG_EXECUTE_IF("fail_to_flush_source_info", { return 1; });
+
+  if (skip_repo_persistence && !do_flush_relay_log) {
+    return 0;
+  }
+
   /*
     With the appropriate recovery process, we will not need to flush
     the content of the current log.
@@ -1532,7 +1419,7 @@
   */
   if (do_flush_relay_log) err |= mi->rli->flush_current_log();
 
-  err |= mi->flush_info(force);
+  if (!skip_repo_persistence) err |= mi->flush_info(force);
 
   if (need_lock) {
     mysql_mutex_unlock(data_lock);
@@ -1757,7 +1644,7 @@
     /*
       Flushes the relay log info regardles of the sync_relay_log_info option.
     */
-    if (mi->rli->flush_info(true)) {
+    if (mi->rli->flush_info(Relay_log_info::RLI_FLUSH_IGNORE_SYNC_OPT)) {
       return ER_ERROR_DURING_FLUSH_LOGS;
     }
   }
@@ -1836,16 +1723,18 @@
                      stage_flushing_relay_log_and_source_info_repository);
 
     /*
-      Flushes the master info regardles of the sync_source_info option.
+      Flushes the master info regardles of the sync_source_info option and
+      GTID_ONLY = 0 for this channel
     */
-    mysql_mutex_lock(&mi->data_lock);
-    if (mi->flush_info(true)) {
+    if (!mi->is_gtid_only_mode()) {
+      mysql_mutex_lock(&mi->data_lock);
+      if (mi->flush_info(true)) {
+        mysql_mutex_unlock(&mi->data_lock);
+        mysql_mutex_unlock(log_lock);
+        return ER_ERROR_DURING_FLUSH_LOGS;
+      }
       mysql_mutex_unlock(&mi->data_lock);
-      mysql_mutex_unlock(log_lock);
-      return ER_ERROR_DURING_FLUSH_LOGS;
     }
-    mysql_mutex_unlock(&mi->data_lock);
-
     /*
       Flushes the relay log regardles of the sync_relay_log option.
     */
@@ -1949,7 +1838,7 @@
       ESRCH: thread already killed (can happen, should be ignored)
     */
 #ifndef _WIN32
-    int err MY_ATTRIBUTE((unused)) = pthread_kill(thd->real_id, SIGALRM);
+    int err [[maybe_unused]] = pthread_kill(thd->real_id, SIGALRM);
     assert(err != EINVAL);
 #endif
     if (force)
@@ -1958,6 +1847,10 @@
       thd->awake(THD::NOT_KILLED);
     mysql_mutex_unlock(&thd->LOCK_thd_data);
 
+    DBUG_EXECUTE_IF("block_on_thread_stop_after_awake", {
+      rpl_replica_debug_point(DBUG_RPL_R_WAIT_AFTER_AWAKE_ON_THREAD_STOP);
+    });
+
     /*
       There is a small chance that slave thread might miss the first
       alarm. To protect againts it, resend the signal until it reacts
@@ -2082,66 +1975,7 @@
     return true;
   }
 
-  if (mi->is_auto_position() && (thread_mask & SLAVE_IO) &&
-      global_gtid_mode.get() == Gtid_mode::OFF) {
-    my_error(ER_CANT_USE_AUTO_POSITION_WITH_GTID_MODE_OFF, MYF(0),
-             mi->get_for_channel_str());
-    return true;
-  }
-
-  if (global_gtid_mode.get() != Gtid_mode::ON &&
-      mi->is_source_connection_auto_failover()) {
-    my_error(ER_RPL_ASYNC_RECONNECT_GTID_MODE_OFF, MYF(0));
-    return true;
-  }
-
-  if ((mi->rli->m_assign_gtids_to_anonymous_transactions_info.get_type() >
-       Assign_gtids_to_anonymous_transactions_info::enum_type::AGAT_OFF) &&
-      global_gtid_mode.get() != Gtid_mode::ON) {
-    /*
-      This function may be called either during server start (when
-      --skip-start-replica is not used) or during START SLAVE. The error should
-      only be generated during START SLAVE. During server start, an error has
-      already been written to the log for this case (in init_replica).
-    */
-    if (current_thd)
-      my_error(ER_CANT_USE_ANONYMOUS_TO_GTID_WITH_GTID_MODE_NOT_ON, MYF(0),
-               mi->get_for_channel_str());
-    return true;
-  }
-  if (mi->rli->m_assign_gtids_to_anonymous_transactions_info.get_type() >
-      Assign_gtids_to_anonymous_transactions_info::enum_type::AGAT_OFF) {
-    std::string group_name = get_group_replication_group_name();
-    if ((group_name.length() > 0) &&
-        !(group_name.compare(
-            mi->rli->m_assign_gtids_to_anonymous_transactions_info
-                .get_value()))) {
-      my_error(ER_ANONYMOUS_TO_GTID_UUID_SAME_AS_GROUP_NAME, MYF(0),
-               mi->get_channel());
-      return true;
-    }
-    std::string view_change_uuid;
-    if (get_group_replication_view_change_uuid(view_change_uuid)) {
-      /* purecov: begin inspected */
-      my_error(ER_GRP_RPL_VIEW_CHANGE_UUID_FAIL_GET_VARIABLE, MYF(0));
-      return true;
-      /* purecov: end */
-    } else {
-      if (!(view_change_uuid.compare(
-              mi->rli->m_assign_gtids_to_anonymous_transactions_info
-                  .get_value()))) {
-        my_error(ER_ANONYMOUS_TO_GTID_UUID_SAME_AS_VIEW_CHANGE_UUID, MYF(0),
-                 mi->get_channel());
-        return true;
-      }
-    }
-    if (mi->rli->until_condition == Relay_log_info::UNTIL_SQL_BEFORE_GTIDS ||
-        mi->rli->until_condition == Relay_log_info::UNTIL_SQL_AFTER_GTIDS) {
-      my_error(ER_CANT_SET_SQL_AFTER_OR_BEFORE_GTIDS_WITH_ANONYMOUS_TO_GTID,
-               MYF(0));
-      return true;
-    }
-  }
+  if (check_replica_configuration_errors(mi, thread_mask)) return true;
 
   /**
     SQL AFTER MTS GAPS has no effect when GTID_MODE=ON and SOURCE_AUTO_POS=1
@@ -3218,7 +3052,8 @@
                  " to the relay log, SHOW SLAVE STATUS may be"
                  " inaccurate");
     mysql_mutex_lock(&mi->data_lock);
-    if (flush_master_info(mi, force_flush_mi_info, false, false)) {
+    if (flush_master_info(mi, force_flush_mi_info, false, false,
+                          mi->is_gtid_only_mode())) {
       error = 1;
       LogErr(ERROR_LEVEL, ER_RPL_SLAVE_CANT_FLUSH_MASTER_INFO_FILE);
     }
@@ -3511,13 +3346,13 @@
   protocol->store(mi->get_user(), &my_charset_bin);
   protocol->store((uint32)mi->port);
   protocol->store((uint32)mi->connect_retry);
-  protocol->store(mi->get_master_log_name(), &my_charset_bin);
-  protocol->store((ulonglong)mi->get_master_log_pos());
+  protocol->store(mi->get_master_log_name_info(), &my_charset_bin);
+  protocol->store((ulonglong)mi->get_master_log_pos_info());
   protocol->store(mi->rli->get_group_relay_log_name() +
                       dirname_length(mi->rli->get_group_relay_log_name()),
                   &my_charset_bin);
   protocol->store((ulonglong)mi->rli->get_group_relay_log_pos());
-  protocol->store(mi->rli->get_group_master_log_name(), &my_charset_bin);
+  protocol->store(mi->rli->get_group_master_log_name_info(), &my_charset_bin);
   protocol->store(
       mi->slave_running == MYSQL_SLAVE_RUN_CONNECT
           ? "Yes"
@@ -3548,7 +3383,7 @@
   protocol->store(mi->rli->last_error().number);
   protocol->store(mi->rli->last_error().message, &my_charset_bin);
   protocol->store((uint32)mi->rli->slave_skip_counter);
-  protocol->store((ulonglong)mi->rli->get_group_master_log_pos());
+  protocol->store((ulonglong)mi->rli->get_group_master_log_pos_info());
   protocol->store((ulonglong)mi->rli->log_space_total);
 
   const char *until_type = "";
@@ -4708,7 +4543,7 @@
         or Rows_log_event::do_apply_event when they find the end of
         the group event).
       */
-      if (skip_event) free_root(thd->mem_root, MYF(MY_KEEP_PREALLOC));
+      if (skip_event) thd->mem_root->ClearForReuse();
 
 #ifndef NDEBUG
       DBUG_PRINT("info", ("update_pos error = %d", error));
@@ -4771,7 +4606,8 @@
           }
         }
         rli->mts_recovery_group_seen_begin = false;
-        if (!error) error = rli->flush_info(true);
+        if (!error)
+          error = rli->flush_info(Relay_log_info::RLI_FLUSH_IGNORE_SYNC_OPT);
       }
     }
 
@@ -5036,8 +4872,6 @@
           if ((ev->get_type_code() == binary_log::XID_EVENT) ||
               ((ev->get_type_code() == binary_log::QUERY_EVENT) &&
                strcmp("COMMIT", ((Query_log_event *)ev)->query) == 0)) {
-            assert(thd->get_transaction()->cannot_safely_rollback(
-                Transaction_ctx::SESSION));
             rli->abort_slave = 1;
             mysql_mutex_unlock(&rli->data_lock);
             delete ev;
@@ -5168,7 +5002,8 @@
              We need to figure out if there is a test case that covers
              this part. \Alfranio.
           */
-          if (load_mi_and_rli_from_repositories(rli->mi, false, SLAVE_SQL))
+          if (load_mi_and_rli_from_repositories(rli->mi, false, SLAVE_SQL,
+                                                false, true))
             LogErr(ERROR_LEVEL,
                    ER_RPL_SLAVE_FAILED_TO_INIT_MASTER_INFO_STRUCTURE,
                    rli->get_for_channel_str());
@@ -5416,6 +5251,7 @@
     mysql_mutex_unlock(&mi->run_lock);
     mysql_cond_broadcast(&mi->start_cond);
 
+  connect_init:
     DBUG_PRINT("master_info",
                ("log_file_name: '%s'  position: %s", mi->get_master_log_name(),
                 llstr(mi->get_master_log_pos(), llbuff)));
@@ -5430,14 +5266,12 @@
       goto err;
     }
 
-  connect_init:
     retry_count = 0;
     if (!(mi->mysql = mysql = mysql_init(nullptr))) {
       mi->report(ERROR_LEVEL, ER_SLAVE_FATAL_ERROR,
                  ER_THD(thd, ER_SLAVE_FATAL_ERROR), "error in mysql_init()");
       goto err;
     }
-    mysql_extension_set_server_extn(mysql, &mi->server_extn);
 
     THD_STAGE_INFO(thd, stage_connecting_to_source);
 
@@ -5737,22 +5571,24 @@
         /*
           After event is flushed to relay log file, memory used
           by thread's mem_root is not required any more.
-          Hence adding free_root(thd->mem_root,...) to do the
+          Hence adding ClearorReuse() to do the
           cleanup, otherwise a long running IO thread can
           cause OOM error.
         */
-        free_root(thd->mem_root, MYF(MY_KEEP_PREALLOC));
+        thd->mem_root->ClearForReuse();
       }
     }
 
     // error = 0;
   err:
     /*
-      If source_connection_auto_failover (async connection failover) is enabled
-      and Replica IO thread is not killed but failed due to network error, a
+      If source_connection_auto_failover (async connection failover) is
+      enabled, this server is not a Group Replication SECONDARY and
+      Replica IO thread is not killed but failed due to network error, a
       connection to another source is attempted.
     */
     if (mi->is_source_connection_auto_failover() &&
+        !is_group_replication_member_secondary() &&
         (!io_slave_killed(thd, mi) ||
          (!io_slave_killed(thd, mi) && mi->is_network_error()))) {
       DBUG_EXECUTE_IF("async_conn_failover_crash", DBUG_SUICIDE(););
@@ -6346,7 +6182,8 @@
           recovery_group_cnt++;
 
           LogErr(INFORMATION_LEVEL, ER_RPL_MTS_GROUP_RECOVERY_RELAY_LOG_INFO,
-                 rli->get_group_master_log_name(), ev->common_header->log_pos);
+                 rli->get_group_master_log_name_info(),
+                 ev->common_header->log_pos);
           if ((ret = mts_event_coord_cmp(&ev_coord, &w_last)) == 0) {
 #ifndef NDEBUG
             for (uint i = 0; i <= w->worker_checkpoint_seqno; i++) {
@@ -6497,7 +6334,7 @@
          waiter: set wait_flag; waits....; drops wait_flag;
   */
 
-  error = rli->flush_info(true);
+  error = rli->flush_info(Relay_log_info::RLI_FLUSH_IGNORE_SYNC_OPT);
 
   mysql_cond_broadcast(&rli->data_cond);
   mysql_mutex_unlock(&rli->data_lock);
@@ -6695,7 +6532,8 @@
   if (!error && rli->mts_recovery_group_cnt == 0) {
     if ((error = rli->mts_finalize_recovery()))
       (void)Rpl_info_factory::reset_workers(rli);
-    if (!error) error = rli->flush_info(true);
+    if (!error)
+      error = rli->flush_info(Relay_log_info::RLI_FLUSH_IGNORE_SYNC_OPT);
   }
 
 err:
@@ -6970,7 +6808,9 @@
     else
       rli->current_mts_submode = new Mts_submode_database();
 
-    if (opt_replica_preserve_commit_order && !rli->is_parallel_exec())
+    // Only use replica preserve commit order if more than 1 worker exists
+    if (opt_replica_preserve_commit_order && !rli->is_parallel_exec() &&
+        rli->opt_replica_parallel_workers > 1)
       commit_order_mngr =
           new Commit_order_manager(rli->opt_replica_parallel_workers);
 
@@ -7088,7 +6928,9 @@
       }
     }
 
-    if (rli->update_is_transactional()) {
+    if (rli->update_is_transactional() ||
+        DBUG_EVALUATE_IF("simulate_update_is_transactional_error", true,
+                         false)) {
       mysql_cond_broadcast(&rli->start_cond);
       mysql_mutex_unlock(&rli->run_lock);
       rli->report(
@@ -7156,14 +6998,14 @@
     if (rli->is_privilege_checks_user_null())
       LogErr(INFORMATION_LEVEL, ER_RPL_SLAVE_SQL_THREAD_STARTING,
              rli->get_for_channel_str(), rli->get_rpl_log_name(),
-             llstr(rli->get_group_master_log_pos(), llbuff),
+             llstr(rli->get_group_master_log_pos_info(), llbuff),
              rli->get_group_relay_log_name(),
              llstr(rli->get_group_relay_log_pos(), llbuff1));
     else
       LogErr(INFORMATION_LEVEL,
              ER_RPL_SLAVE_SQL_THREAD_STARTING_WITH_PRIVILEGE_CHECKS,
              rli->get_for_channel_str(), rli->get_rpl_log_name(),
-             llstr(rli->get_group_master_log_pos(), llbuff),
+             llstr(rli->get_group_master_log_pos_info(), llbuff),
              rli->get_group_relay_log_name(),
              llstr(rli->get_group_relay_log_pos(), llbuff1),
              rli->get_privilege_checks_username().c_str(),
@@ -7214,8 +7056,8 @@
                saved_master_log_name, (ulong)saved_master_log_pos,
                rli->get_group_relay_log_name(),
                (ulong)rli->get_group_relay_log_pos(),
-               rli->get_group_master_log_name(),
-               (ulong)rli->get_group_master_log_pos());
+               rli->get_group_master_log_name_info(),
+               (ulong)rli->get_group_master_log_pos_info());
         saved_skip = 0;
       }
 
@@ -7273,11 +7115,11 @@
     /* Thread stopped. Print the current replication position to the log */
     if (slave_errno)
       LogErr(ERROR_LEVEL, slave_errno, rli->get_rpl_log_name(),
-             llstr(rli->get_group_master_log_pos(), llbuff));
+             llstr(rli->get_group_master_log_pos_info(), llbuff));
     else
       LogErr(INFORMATION_LEVEL, ER_RPL_SLAVE_SQL_THREAD_EXITING,
              rli->get_for_channel_str(), rli->get_rpl_log_name(),
-             llstr(rli->get_group_master_log_pos(), llbuff));
+             llstr(rli->get_group_master_log_pos_info(), llbuff));
 
     delete rli->current_mts_submode;
     rli->current_mts_submode = nullptr;
@@ -7987,7 +7829,7 @@
       compressed_transaction_bytes = uncompressed_transaction_bytes =
           anon_gtid_ev.transaction_length - anon_gtid_ev.get_event_length();
     }
-    /* fall through */
+      [[fallthrough]];
     default:
       inc_pos = event_len;
       break;
@@ -8169,8 +8011,11 @@
     }
 
     if (flush_master_info(mi, false /*force*/, lock_count == 0 /*need_lock*/,
-                          false /*flush_relay_log*/))
+                          false /*flush_relay_log*/, mi->is_gtid_only_mode()))
       res = QUEUE_EVENT_ERROR_FLUSHING_INFO;
+    if (mi->is_gtid_only_mode()) {
+      mi->update_flushed_relay_log_info();
+    }
   }
   if (lock_count >= 2) mysql_mutex_unlock(&mi->data_lock);
   if (lock_count >= 1) mysql_mutex_unlock(log_lock);
@@ -8265,7 +8110,6 @@
 int connect_to_master(THD *thd, MYSQL *mysql, Master_info *mi, bool reconnect,
                       bool suppress_warnings, const std::string &host,
                       const uint port, bool is_io_thread) {
-  int slave_was_killed = 0;
   int last_errno = -2;  // impossible error
   ulong err_count = 0;
   char llbuff[22];
@@ -8392,13 +8236,25 @@
   const char *tmp_host = host.empty() ? mi->host : host.c_str();
   uint tmp_port = (port == 0) ? mi->port : port;
 
-  while (
-      !(slave_was_killed = is_io_thread ? io_slave_killed(thd, mi)
-                                        : monitor_io_replica_killed(thd, mi)) &&
-      (reconnect
-           ? mysql_reconnect(mysql) != 0
-           : mysql_real_connect(mysql, tmp_host, user, password, nullptr,
-                                tmp_port, nullptr, client_flag) == nullptr)) {
+  bool replica_was_killed{false};
+  bool connected{false};
+
+  while (!connected) {
+    replica_was_killed = is_io_thread ? io_slave_killed(thd, mi)
+                                      : monitor_io_replica_killed(thd, mi);
+    if (replica_was_killed) break;
+
+    if (reconnect) {
+      connected = !mysql_reconnect(mysql);
+    } else {
+      // Set this each time mysql_real_connect() is called to make a connection
+      mysql_extension_set_server_extn(mysql, &mi->server_extn);
+
+      connected = mysql_real_connect(mysql, tmp_host, user, password, nullptr,
+                                     tmp_port, nullptr, client_flag);
+    }
+    if (connected) break;
+
     /*
        SHOW REPLICA STATUS will display the number of retries which
        would be real retry counts instead of mi->retry_count for
@@ -8423,14 +8279,14 @@
     */
     if (++err_count == mi->retry_count) {
       if (is_network_error(last_errno) && is_io_thread) mi->set_network_error();
-      slave_was_killed = 1;
+      replica_was_killed = true;
       break;
     }
     slave_sleep(thd, mi->connect_retry,
                 is_io_thread ? io_slave_killed : monitor_io_replica_killed, mi);
   }
 
-  if (!slave_was_killed) {
+  if (!replica_was_killed) {
     if (is_io_thread) {
       mi->clear_error();  // clear possible left over reconnect error
       mi->reset_network_error();
@@ -8450,8 +8306,8 @@
     thd->set_active_vio(mysql->net.vio);
   }
   mysql->reconnect = true;
-  DBUG_PRINT("exit", ("slave_was_killed: %d", slave_was_killed));
-  return slave_was_killed;
+  DBUG_PRINT("exit", ("replica_was_killed: %d", replica_was_killed));
+  return replica_was_killed;
 }
 
 /*
@@ -8911,6 +8767,10 @@
         if (set_mts_settings) {
           mi->rli->opt_replica_parallel_workers =
               opt_mts_replica_parallel_workers;
+          if (mi->is_gtid_only_mode() &&
+              opt_mts_replica_parallel_workers == 0) {
+            mi->rli->opt_replica_parallel_workers = 1;
+          }
           if (mts_parallel_option == MTS_PARALLEL_TYPE_DB_NAME)
             mi->rli->channel_mts_submode = MTS_PARALLEL_TYPE_DB_NAME;
           else
@@ -9259,6 +9119,10 @@
     bool is_default =
         !strcmp(mi->get_channel(), channel_map.get_default_channel());
 
+    rpl_acf_configuration_handler->delete_channel_status(
+        mi->get_channel(),
+        Rpl_acf_status_configuration::SOURCE_CONNECTION_AUTO_FAILOVER);
+
     channel_map.delete_mi(mi->get_channel());
 
     if (is_default) {
@@ -9334,24 +9198,24 @@
 }
 
 /**
-   This function checks if the given CHANGE MASTER command has any receive
-   option being set or changed.
+  This function checks if the given CHANGE MASTER/REPLICATION SOURCE command
+  has any receive option being set or changed.
 
-   - used in change_master().
+  - used in change_master().
 
-  @param  lex_mi structure that holds all change master options given on the
-          change master command.
+  @param  lex_mi structure that holds all options given on the
+          change replication source command.
 
-  @retval false No change master receive option.
-  @retval true  At least one receive option was there.
+  @retval false No change replication source receive options were found.
+  @retval true  At least one receive option was found.
 */
-
-static bool have_change_master_receive_option(const LEX_MASTER_INFO *lex_mi) {
+static bool have_change_replication_source_receive_option(
+    const LEX_MASTER_INFO *lex_mi) {
   bool have_receive_option = false;
 
   DBUG_TRACE;
 
-  /* Check if *at least one* receive option is given on change master command*/
+  /* Check if *at least one* receive option is given the command*/
   if (lex_mi->host || lex_mi->user || lex_mi->password ||
       lex_mi->log_file_name || lex_mi->pos || lex_mi->bind_addr ||
       lex_mi->network_namespace || lex_mi->port || lex_mi->connect_retry ||
@@ -9367,15 +9231,83 @@
       lex_mi->public_key_path ||
       lex_mi->get_public_key != LEX_MASTER_INFO::LEX_MI_UNCHANGED ||
       lex_mi->zstd_compression_level || lex_mi->compression_algorithm ||
-      lex_mi->require_row_format != -1 ||
-      lex_mi->assign_gtids_to_anonymous_transactions_type !=
-          LEX_MASTER_INFO::LEX_MI_ANONYMOUS_TO_GTID_UNCHANGED)
+      lex_mi->require_row_format != LEX_MASTER_INFO::LEX_MI_UNCHANGED)
     have_receive_option = true;
 
   return have_receive_option;
 }
 
 /**
+  This function checks if the given CHANGE MASTER/REPLICATION SOURCE command
+  has any execute option being set or changed.
+
+  - used in change_master().
+
+  @param  lex_mi structure that holds all options given on the
+          change replication source command.
+
+  @param[out] need_relay_log_purge
+              - If relay_log_file/relay_log_pos options are used,
+                we wont delete relaylogs. We set this boolean flag to false.
+              - If relay_log_file/relay_log_pos options are NOT used,
+                we return the boolean flag UNCHANGED.
+              - Used in change_receive_options() and change_master().
+
+  @retval false No change replication source execute option.
+  @retval true  At least one execute option was there.
+*/
+static bool have_change_replication_source_execute_option(
+    const LEX_MASTER_INFO *lex_mi, bool *need_relay_log_purge) {
+  bool have_execute_option = false;
+
+  DBUG_TRACE;
+
+  /* Check if *at least one* execute option is given on change master command*/
+  if (lex_mi->relay_log_name || lex_mi->relay_log_pos ||
+      lex_mi->sql_delay != -1 || lex_mi->privilege_checks_username != nullptr ||
+      lex_mi->privilege_checks_none ||
+      lex_mi->require_row_format != LEX_MASTER_INFO::LEX_MI_UNCHANGED ||
+      lex_mi->require_table_primary_key_check !=
+          LEX_MASTER_INFO::LEX_MI_PK_CHECK_UNCHANGED)
+    have_execute_option = true;
+
+  if (lex_mi->relay_log_name || lex_mi->relay_log_pos)
+    *need_relay_log_purge = false;
+
+  return have_execute_option;
+}
+
+/**
+   This function checks if the given CHANGE REPLICATION SOURCE command has
+   any option that affect both the receiver and the applier.
+
+   - used in change_master().
+
+  @param  lex_mi structure that holds all options given on the
+          change replication source command.
+
+  @retval false no option that affects both applier and receiver was found
+  @retval true  At least one option affects both the applier and receiver.
+*/
+static bool have_change_replication_source_applier_and_receive_option(
+    const LEX_MASTER_INFO *lex_mi) {
+  bool have_applier_receive_option = false;
+
+  DBUG_TRACE;
+
+  /* Check if *at least one* receive option is given to change rep source*/
+  if (lex_mi->assign_gtids_to_anonymous_transactions_type !=
+          LEX_MASTER_INFO::LEX_MI_ANONYMOUS_TO_GTID_UNCHANGED ||
+      lex_mi->auto_position != LEX_MASTER_INFO::LEX_MI_UNCHANGED ||
+      lex_mi->m_source_connection_auto_failover !=
+          LEX_MASTER_INFO::LEX_MI_UNCHANGED ||
+      lex_mi->m_gtid_only != LEX_MASTER_INFO::LEX_MI_UNCHANGED)
+    have_applier_receive_option = true;
+
+  return have_applier_receive_option;
+}
+
+/**
    This function checks all possible cases in which compression algorithm,
    compression level can be configured for a channel.
 
@@ -9416,48 +9348,6 @@
 }
 
 /**
-   This function checks if the given CHANGE MASTER command has any execute
-   option being set or changed.
-
-   - used in change_master().
-
-  @param  lex_mi structure that holds all change master options given on the
-          change master command.
-
-  @param[out] need_relay_log_purge
-              - If relay_log_file/relay_log_pos options are used,
-                we wont delete relaylogs. We set this boolean flag to false.
-              - If relay_log_file/relay_log_pos options are NOT used,
-                we return the boolean flag UNCHANGED.
-              - Used in change_receive_options() and change_master().
-
-  @retval false No change master execute option.
-  @retval true  At least one execute option was there.
-*/
-
-static bool have_change_master_execute_option(const LEX_MASTER_INFO *lex_mi,
-                                              bool *need_relay_log_purge) {
-  bool have_execute_option = false;
-
-  DBUG_TRACE;
-
-  /* Check if *at least one* execute option is given on change master command*/
-  if (lex_mi->relay_log_name || lex_mi->relay_log_pos ||
-      lex_mi->sql_delay != -1 || lex_mi->privilege_checks_username != nullptr ||
-      lex_mi->privilege_checks_none || lex_mi->require_row_format != -1 ||
-      lex_mi->require_table_primary_key_check !=
-          LEX_MASTER_INFO::LEX_MI_PK_CHECK_UNCHANGED ||
-      lex_mi->assign_gtids_to_anonymous_transactions_type !=
-          LEX_MASTER_INFO::LEX_MI_ANONYMOUS_TO_GTID_UNCHANGED)
-    have_execute_option = true;
-
-  if (lex_mi->relay_log_name || lex_mi->relay_log_pos)
-    *need_relay_log_purge = false;
-
-  return have_execute_option;
-}
-
-/**
    This function is called if the change master command had at least one
    receive option. This function then sets or alters the receive option(s)
    given in the command. The execute options are handled in the function
@@ -9475,13 +9365,12 @@
                 shall contain connection settings like hostname, user, password
                 and other settings like the number of connection retries.
 
-  @param mi     Pointer to Master_info object belonging to the slave's IO
-                thread.
+  @param mi     Pointer to Master_info object belonging to the replica channel
+                to be configured
 
   @retval 0    no error i.e., success.
   @retval !=0  error.
 */
-
 static int change_receive_options(THD *thd, LEX_MASTER_INFO *lex_mi,
                                   Master_info *mi) {
   int ret = 0; /* return value. Set if there is an error. */
@@ -9574,8 +9463,8 @@
       Here is the default value for heartbeat period if CHANGE MASTER did not
       specify it.  (no data loss in conversion as hb period has a max)
     */
-    mi->heartbeat_period =
-        min<float>(SLAVE_MAX_HEARTBEAT_PERIOD, (replica_net_timeout / 2.0f));
+    mi->heartbeat_period = std::min<float>(SLAVE_MAX_HEARTBEAT_PERIOD,
+                                           (replica_net_timeout / 2.0f));
     assert(mi->heartbeat_period > (float)0.001 || mi->heartbeat_period == 0);
 
     // counter is cleared if master is CHANGED.
@@ -9662,13 +9551,12 @@
   @param lex_mi structure that holds all change master options given on the
                 change master command.
 
-  @param mi     Pointer to Master_info object belonging to the slave's IO
-                thread.
+  @param mi     Pointer to Master_info object belonging to the replica channel
+                that will be configured
 
   @return       false if the execute options were successfully set and true,
                 otherwise.
 */
-
 static bool change_execute_options(LEX_MASTER_INFO *lex_mi, Master_info *mi) {
   DBUG_TRACE;
 
@@ -9687,8 +9575,9 @@
     }
   }
 
-  if (lex_mi->require_row_format != -1) {  // Is included in CHM statement
-    mi->rli->set_require_row_format(lex_mi->require_row_format);
+  if (lex_mi->require_row_format != LEX_MASTER_INFO::LEX_MI_UNCHANGED) {
+    mi->rli->set_require_row_format(lex_mi->require_row_format ==
+                                    LEX_MASTER_INFO::LEX_MI_ENABLE);
   }
 
   if (lex_mi->require_table_primary_key_check !=
@@ -9713,8 +9602,121 @@
     }
   }
 
+  if (lex_mi->relay_log_name) {
+    char relay_log_name[FN_REFLEN];
+    mi->rli->relay_log.make_log_name(relay_log_name, lex_mi->relay_log_name);
+    mi->rli->set_group_relay_log_name(relay_log_name);
+    mi->rli->is_group_master_log_pos_invalid = true;
+  }
+
+  if (lex_mi->relay_log_pos) {
+    mi->rli->set_group_relay_log_pos(lex_mi->relay_log_pos);
+    mi->rli->is_group_master_log_pos_invalid = true;
+  }
+
+  if (lex_mi->sql_delay != -1) mi->rli->set_sql_delay(lex_mi->sql_delay);
+
+  return false;
+}
+
+/**
+   This function is called if the change replication source command had at
+   least one option that affects both the receiver and applier parts.
+   Pure execute option(s) are handled in change_execute_options()
+   The receive options are handled in the function change_receive_options()
+
+   - used in change_master().
+   - Both receiver and applier threads should be stopped on invocation
+
+  @param lex_mi structure that holds all change replication source options
+
+  @param mi     Pointer to Master_info object belonging to the replica channel
+                to be configured
+
+  @return       false if successfully set, true otherwise.
+*/
+static bool change_applier_receiver_options(THD *thd, LEX_MASTER_INFO *lex_mi,
+                                            Master_info *mi) {
+  if (lex_mi->m_source_connection_auto_failover !=
+      LEX_MASTER_INFO::LEX_MI_UNCHANGED) {
+    if (lex_mi->m_source_connection_auto_failover ==
+        LEX_MASTER_INFO::LEX_MI_ENABLE) {
+      mi->set_source_connection_auto_failover();
+      /*
+        Send replication channel SOURCE_CONNECTION_AUTO_FAILOVER attribute of
+        CHANGE REPLICATION SOURCE command status to group replication group
+        members.
+      */
+      if (rpl_acf_configuration_handler->send_channel_status_and_version_data(
+              mi->get_channel(),
+              Rpl_acf_status_configuration::SOURCE_CONNECTION_AUTO_FAILOVER,
+              1)) {
+        my_error(ER_GRP_RPL_FAILOVER_CHANNEL_STATUS_PROPAGATION, MYF(0),
+                 mi->get_channel());
+        mi->unset_source_connection_auto_failover();
+        return true;
+      }
+
+      /*
+        If IO thread is running and the monitoring thread is not, start
+        the monitoring thread.
+      */
+      if (mi->slave_running &&
+          !Source_IO_monitor::get_instance()->is_monitoring_process_running()) {
+        if (Source_IO_monitor::get_instance()->launch_monitoring_process(
+                key_thread_replica_monitor_io)) {
+          my_error(ER_STARTING_REPLICA_MONITOR_IO_THREAD, MYF(0));
+          return true;
+        }
+      }
+    } else {
+      /*
+        If this is the only channel with source_connection_auto_failover,
+        then stop the monitoring thread.
+      */
+      if (mi->is_source_connection_auto_failover() && mi->slave_running &&
+          channel_map
+                  .get_number_of_connection_auto_failover_channels_running() ==
+              1) {
+        if (Source_IO_monitor::get_instance()->terminate_monitoring_process()) {
+          my_error(ER_STOP_REPLICA_MONITOR_IO_THREAD_TIMEOUT, MYF(0));
+          return true;
+        }
+      }
+      mi->unset_source_connection_auto_failover();
+      /*
+        Send replication channel SOURCE_CONNECTION_AUTO_FAILOVER attribute of
+        CHANGE REPLICATION SOURCE command status to group replication group
+        members.
+      */
+      if (rpl_acf_configuration_handler->send_channel_status_and_version_data(
+              mi->get_channel(),
+              Rpl_acf_status_configuration::SOURCE_CONNECTION_AUTO_FAILOVER,
+              0)) {
+        my_error(ER_GRP_RPL_FAILOVER_CHANNEL_STATUS_PROPAGATION, MYF(0),
+                 mi->get_channel());
+        return true;
+      }
+    }
+  }
+
+  if (lex_mi->auto_position != LEX_MASTER_INFO::LEX_MI_UNCHANGED) {
+    mi->set_auto_position(
+        (lex_mi->auto_position == LEX_MASTER_INFO::LEX_MI_ENABLE));
+  }
+
   if (lex_mi->assign_gtids_to_anonymous_transactions_type !=
       LEX_MASTER_INFO::LEX_MI_ANONYMOUS_TO_GTID_UNCHANGED) {
+    if (lex_mi->assign_gtids_to_anonymous_transactions_type >
+        LEX_MASTER_INFO::LEX_MI_ANONYMOUS_TO_GTID_OFF) {
+      push_warning(
+          thd, Sql_condition::SL_NOTE,
+          ER_USING_ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS_AS_LOCAL_OR_UUID,
+          ER_THD(
+              thd,
+              ER_USING_ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS_AS_LOCAL_OR_UUID));
+    }
+
     switch (lex_mi->assign_gtids_to_anonymous_transactions_type) {
       case (LEX_MASTER_INFO::LEX_MI_ANONYMOUS_TO_GTID_LOCAL):
         mi->rli->m_assign_gtids_to_anonymous_transactions_info.set_info(
@@ -9739,20 +9741,11 @@
     }
   }
 
-  if (lex_mi->relay_log_name) {
-    char relay_log_name[FN_REFLEN];
-    mi->rli->relay_log.make_log_name(relay_log_name, lex_mi->relay_log_name);
-    mi->rli->set_group_relay_log_name(relay_log_name);
-    mi->rli->is_group_master_log_pos_invalid = true;
-  }
-
-  if (lex_mi->relay_log_pos) {
-    mi->rli->set_group_relay_log_pos(lex_mi->relay_log_pos);
-    mi->rli->is_group_master_log_pos_invalid = true;
+  if (lex_mi->m_gtid_only != LEX_MASTER_INFO::LEX_MI_UNCHANGED) {
+    mi->set_gtid_only_mode(
+        (lex_mi->m_gtid_only == LEX_MASTER_INFO::LEX_MI_ENABLE));
   }
 
-  if (lex_mi->sql_delay != -1) mi->rli->set_sql_delay(lex_mi->sql_delay);
-
   return false;
 }
 
@@ -9781,6 +9774,517 @@
 }
 
 /**
+  This function validates that change replication source options are
+  valid according to the current GTID_MODE.
+  This method assumes it will only be called when GTID_MODE != ON
+
+  @param lex_mi structure that holds all change replication source options
+
+  @param mi     Pointer to Master_info object belonging to the replica channel
+                to be configured
+
+  @return       false if the configuration is valid
+                true  some configuration option is invalid with GTID_MODE
+*/
+static int validate_gtid_option_restrictions(const LEX_MASTER_INFO *lex_mi,
+                                             Master_info *mi) {
+  int error = 0;
+
+  /*
+    CHANGE REPLICATION SOURCE TO SOURCE_AUTO_POSITION = 1 requires
+      GTID_MODE != OFF
+  */
+  if (global_gtid_mode.get() == Gtid_mode::OFF) {
+    if (lex_mi->auto_position == LEX_MASTER_INFO::LEX_MI_ENABLE) {
+      error = ER_AUTO_POSITION_REQUIRES_GTID_MODE_NOT_OFF;
+      my_error(ER_AUTO_POSITION_REQUIRES_GTID_MODE_NOT_OFF, MYF(0));
+      return error;
+    }
+  }
+
+  /*
+    CHANGE REPLICATION SOURCE TO ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS != OFF
+      requires GTID_MODE = ON
+  */
+  if (lex_mi->assign_gtids_to_anonymous_transactions_type >
+      LEX_MASTER_INFO::LEX_MI_ANONYMOUS_TO_GTID_OFF) {
+    error = ER_ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS_REQUIRES_GTID_MODE_ON;
+    my_error(ER_ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS_REQUIRES_GTID_MODE_ON,
+             MYF(0));
+    return error;
+  }
+
+  /*
+    CHANGE REPLICATION SOURCE TO GTID_ONLY= 1 requires
+      GTID_MODE = ON
+  */
+  if (lex_mi->m_gtid_only == LEX_MASTER_INFO::LEX_MI_ENABLE) {
+    error = ER_CHANGE_REPLICATION_SOURCE_NO_OPTIONS_FOR_GTID_ONLY;
+    my_error(ER_CHANGE_REPLICATION_SOURCE_NO_OPTIONS_FOR_GTID_ONLY, MYF(0),
+             mi->get_channel());
+    return error;
+  }
+
+  /*
+    CHANGE REPLICATION SOURCE TO SOURCE_CONNECTION_AUTO_FAILOVER = 1 requires
+      GTID_MODE = ON
+  */
+  if (lex_mi->m_source_connection_auto_failover ==
+      LEX_MASTER_INFO::LEX_MI_ENABLE) {
+    error = ER_RPL_ASYNC_RECONNECT_GTID_MODE_OFF;
+    my_error(ER_RPL_ASYNC_RECONNECT_GTID_MODE_OFF, MYF(0));
+    return error;
+  }
+
+  if (channel_map.is_group_replication_channel_name(lex_mi->channel)) {
+    error = ER_CHANGE_REP_SOURCE_GR_CHANNEL_WITH_GTID_MODE_NOT_ON;
+    my_error(error, MYF(0));
+    return error;
+  }
+
+  return error;
+}
+
+/**
+  This is an helper method for boolean vars like
+    SOURCE_AUTO_POSITION
+    REQUIRE_ROW_FORMAT
+    SOURCE_CONNECTION_AUTO_FAILOVER
+  It tells if the variable is already enabled or will be by the command
+
+  @param base_value the current variable value
+  @param option_value the configuration input value (UNCHANGED,ENABLED,DISABLE)
+
+  @return true if the option was already enable or will be. false otherwise
+*/
+bool is_option_enabled_or_will_be(bool base_value, int option_value) {
+  bool var_enabled = base_value;
+  switch (option_value) {
+    case LEX_MASTER_INFO::LEX_MI_ENABLE:
+      var_enabled = true;
+      break;
+    case LEX_MASTER_INFO::LEX_MI_DISABLE:
+      var_enabled = false;
+      break;
+    case LEX_MASTER_INFO::LEX_MI_UNCHANGED:
+      break;
+    default:
+      assert(0);
+      break;
+  }
+  return var_enabled;
+}
+
+/**
+  This method evaluates if the different options given to
+    CHANGE REPLICATION SOURCE TO
+  are compatible with the current configuration and with one another.
+
+  Example: SOURCE_CONNECTION_AUTO_FAILOVER = 1 requires
+  SOURCE_AUTO_POSITION to be already enabled or to be enabled on this command.
+
+  @param lex_mi structure that holds all change replication source options given
+                on the command
+
+  @param mi     Pointer to Master_info object for the channel that holds the
+                the configuration
+
+  @return 0     if no issues are found
+          != 0  the error number associated to the issue, if one is found
+*/
+int evaluate_inter_option_dependencies(const LEX_MASTER_INFO *lex_mi,
+                                       Master_info *mi) {
+  int error = 0;
+
+  /**
+    We first define the variables used and then we group the checks for
+    readability
+  */
+  bool is_or_will_auto_position_be_enabled = is_option_enabled_or_will_be(
+      mi->is_auto_position(), lex_mi->auto_position);
+  bool will_auto_position_be_disable =
+      mi->is_auto_position() &&
+      lex_mi->auto_position == LEX_MASTER_INFO::LEX_MI_DISABLE;
+
+  bool is_or_will_require_row_format_be_enabled = is_option_enabled_or_will_be(
+      mi->rli->is_row_format_required(), lex_mi->require_row_format);
+  bool will_require_row_format_be_disable =
+      mi->rli->is_row_format_required() &&
+      lex_mi->require_row_format == LEX_MASTER_INFO::LEX_MI_DISABLE;
+
+  bool is_or_will_source_connection_auto_failover_be_enabled =
+      is_option_enabled_or_will_be(mi->is_source_connection_auto_failover(),
+                                   lex_mi->m_source_connection_auto_failover);
+
+  bool is_or_will_gtid_only_be_enabled = is_option_enabled_or_will_be(
+      mi->is_gtid_only_mode(), lex_mi->m_gtid_only);
+  bool will_gtid_only_mode_be_disable =
+      mi->is_gtid_only_mode() &&
+      lex_mi->m_gtid_only == LEX_MASTER_INFO::LEX_MI_DISABLE;
+
+  auto assign_gtids_to_anonymous_transactions_type =
+      mi->rli->m_assign_gtids_to_anonymous_transactions_info.get_type();
+  switch (lex_mi->assign_gtids_to_anonymous_transactions_type) {
+    case LEX_MASTER_INFO::LEX_MI_ANONYMOUS_TO_GTID_OFF:
+      assign_gtids_to_anonymous_transactions_type =
+          Assign_gtids_to_anonymous_transactions_info::enum_type::AGAT_OFF;
+      break;
+    case LEX_MASTER_INFO::LEX_MI_ANONYMOUS_TO_GTID_LOCAL:
+      assign_gtids_to_anonymous_transactions_type =
+          Assign_gtids_to_anonymous_transactions_info::enum_type::AGAT_LOCAL;
+      break;
+    case LEX_MASTER_INFO::LEX_MI_ANONYMOUS_TO_GTID_UUID:
+      assign_gtids_to_anonymous_transactions_type =
+          Assign_gtids_to_anonymous_transactions_info::enum_type::AGAT_UUID;
+      break;
+    case LEX_MASTER_INFO::LEX_MI_ANONYMOUS_TO_GTID_UNCHANGED:
+      break;
+    default:
+      assert(0);
+      break;
+  }
+
+  /* Check phase - enabling options */
+
+  /*
+    We cannot specify auto position and set either the coordinates
+    on source or replica. If we try to do so, an error message is
+    printed out.
+  */
+  if (lex_mi->log_file_name != nullptr || lex_mi->pos != 0 ||
+      lex_mi->relay_log_name != nullptr || lex_mi->relay_log_pos != 0) {
+    if (lex_mi->auto_position == LEX_MASTER_INFO::LEX_MI_ENABLE ||
+        (lex_mi->auto_position != LEX_MASTER_INFO::LEX_MI_DISABLE &&
+         mi->is_auto_position())) {
+      error = ER_BAD_SLAVE_AUTO_POSITION;
+      my_error(error, MYF(0));
+      return error;
+    }
+  }
+
+  /*
+   CHANGE REPLICATION SOURCE TO ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS != OFF
+   requires
+      SOURCE_AUTO_POSITION = 0
+  */
+  if (assign_gtids_to_anonymous_transactions_type !=
+          Assign_gtids_to_anonymous_transactions_info::enum_type::AGAT_OFF &&
+      is_or_will_auto_position_be_enabled) {
+    error = ER_CANT_COMBINE_ANONYMOUS_TO_GTID_AND_AUTOPOSITION;
+    my_error(error, MYF(0));
+    return error;
+  }
+
+  /*
+    CHANGE REPLICATION SOURCE TO GTID_ONLY = 1 requires
+      SOURCE_AUTO_POSITION = 1
+      REQUIRE_ROW_FORMAT = 1
+   */
+  if (lex_mi->m_gtid_only == LEX_MASTER_INFO::LEX_MI_ENABLE &&
+      (!is_or_will_auto_position_be_enabled ||
+       !is_or_will_require_row_format_be_enabled)) {
+    error = ER_CHANGE_REPLICATION_SOURCE_NO_OPTIONS_FOR_GTID_ONLY;
+    my_error(error, MYF(0), mi->get_channel());
+    return error;
+  }
+
+  /*
+    CHANGE REPLICATION SOURCE TO SOURCE_CONNECTION_AUTO_FAILOVER = 1 requires
+      SOURCE_AUTO_POSITION = 1
+  */
+  if (lex_mi->m_source_connection_auto_failover ==
+          LEX_MASTER_INFO::LEX_MI_ENABLE &&
+      !is_or_will_auto_position_be_enabled) {
+    error = ER_RPL_ASYNC_RECONNECT_AUTO_POSITION_OFF;
+    my_error(error, MYF(0));
+    return error;
+  }
+
+  /*
+    We need to check if there is an empty master_host. Otherwise
+    change master succeeds, a master.info file is created containing
+    empty master_host string and when issuing: start replica; an error
+    is thrown stating that the server is not configured as replica.
+    (See BUG#28796).
+  */
+  if (lex_mi->host && !*lex_mi->host) {
+    error = ER_WRONG_ARGUMENTS;
+    my_error(error, MYF(0), "MASTER_HOST");
+    return error;
+  }
+
+  /*
+    Changing source_connection_auto_failover option is not allowed on group
+    secondary member.
+  */
+  if (lex_mi->m_source_connection_auto_failover !=
+          LEX_MASTER_INFO::LEX_MI_UNCHANGED &&
+      is_group_replication_member_secondary()) {
+    error = ER_OPERATION_NOT_ALLOWED_ON_GR_SECONDARY;
+    my_error(error, MYF(0));
+    return error;
+  }
+
+  /*
+    CHANGE REPLICATION SOURCE TO ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS != OFF
+    can't use the same value as the group replication name or view change uuid
+  */
+  if (lex_mi->assign_gtids_to_anonymous_transactions_type >
+      LEX_MASTER_INFO::LEX_MI_ANONYMOUS_TO_GTID_OFF) {
+    std::string group_name = get_group_replication_group_name();
+    if (group_name.length() > 0) {
+      bool is_same = false;
+      auto type = lex_mi->assign_gtids_to_anonymous_transactions_type;
+      if (type == LEX_MASTER_INFO::LEX_MI_ANONYMOUS_TO_GTID_LOCAL)
+        if (!(group_name.compare(::server_uuid))) is_same = true;
+      if (type == LEX_MASTER_INFO::LEX_MI_ANONYMOUS_TO_GTID_UUID)
+        if (!(group_name.compare(
+                lex_mi->assign_gtids_to_anonymous_transactions_manual_uuid)))
+          is_same = true;
+      if (is_same) {
+        error = ER_CANT_USE_SAME_UUID_AS_GROUP_NAME;
+        my_error(error, MYF(0));
+        return error;
+      }
+
+      std::string view_change_uuid;
+      if (get_group_replication_view_change_uuid(view_change_uuid)) {
+        /* purecov: begin inspected */
+        error = ER_GRP_RPL_VIEW_CHANGE_UUID_FAIL_GET_VARIABLE;
+        my_error(error, MYF(0));
+        return error;
+        /* purecov: end */
+      } else {
+        if (type == LEX_MASTER_INFO::LEX_MI_ANONYMOUS_TO_GTID_LOCAL)
+          if (!(view_change_uuid.compare(::server_uuid))) is_same = true;
+        if (type == LEX_MASTER_INFO::LEX_MI_ANONYMOUS_TO_GTID_UUID)
+          if (!(view_change_uuid.compare(
+                  lex_mi->assign_gtids_to_anonymous_transactions_manual_uuid)))
+            is_same = true;
+        if (is_same) {
+          error = ER_CANT_USE_SAME_UUID_AS_VIEW_CHANGE_UUID;
+          my_error(error, MYF(0));
+          return error;
+        }
+      }
+    }
+  }
+
+  /* Check phase - disabling options */
+
+  /*
+    CHANGE REPLICATION SOURCE TO ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS
+      auto_position cannot be disable if either source_connection_auto_failover
+      option is enabled or getting enabled in current CHANGE MASTER statement.
+  */
+  if (will_auto_position_be_disable &&
+      is_or_will_source_connection_auto_failover_be_enabled) {
+    error = ER_DISABLE_AUTO_POSITION_REQUIRES_ASYNC_RECONNECT_OFF;
+    my_error(error, MYF(0));
+    return error;
+  }
+
+  /*
+    CHANGE REPLICATION SOURCE TO SOURCE_AUTO_POSITION = 0 cannot be done when
+      GTID_ONLY = 1
+  */
+  if (will_auto_position_be_disable && is_or_will_gtid_only_be_enabled) {
+    error = ER_CHANGE_REP_SOURCE_CANT_DISABLE_AUTO_POSITION_WITH_GTID_ONLY;
+    my_error(error, MYF(0), mi->get_channel());
+    return error;
+  }
+  /*
+    CHANGE REPLICATION SOURCE TO REQUIRE_ROW_FORMAT = 0 cannot be done when
+      GTID_ONLY = 1
+  */
+  if (will_require_row_format_be_disable && is_or_will_gtid_only_be_enabled) {
+    error = ER_CHANGE_REP_SOURCE_CANT_DISABLE_REQ_ROW_FORMAT_WITH_GTID_ONLY;
+    my_error(error, MYF(0), mi->get_channel());
+    return error;
+  }
+
+  /*
+    CHANGE REPLICATION SOURCE TO SOURCE_AUTO_POSITION = 0 when
+    source positions in relation to the source are invalid.
+    This requires `SOURCE_LOG_FILE` and `SOURCE_LOG_POS`
+    The message varies if you are also disabling `GTID_ONLY`
+  */
+  if (will_auto_position_be_disable) {
+    if (mi->is_receiver_position_info_invalid()) {
+      if (lex_mi->log_file_name == nullptr || lex_mi->pos == 0) {
+        if (will_gtid_only_mode_be_disable) {
+          error = ER_CHANGE_REP_SOURCE_CANT_DISABLE_GTID_ONLY_WITHOUT_POSITIONS;
+          my_error(error, MYF(0), mi->get_channel());
+        } else {
+          error = ER_CHANGE_REP_SOURCE_CANT_DISABLE_AUTO_POS_WITHOUT_POSITIONS;
+          my_error(error, MYF(0), mi->get_channel());
+        }
+        return error;
+      }
+    }
+  }
+  return error;
+}
+
+/**
+  Log a warning in case GTID_ONLY or SOURCE AUTO POSITION are disabled
+  and the server contains invalid positions.
+
+  @param thd the associated thread object
+
+  @param lex_mi structure that holds all change replication source options given
+                on the command
+
+  @param mi     Pointer to Master_info object
+*/
+static void log_invalid_position_warning(THD *thd,
+                                         const LEX_MASTER_INFO *lex_mi,
+                                         Master_info *mi) {
+  if (lex_mi->m_gtid_only == LEX_MASTER_INFO::LEX_MI_DISABLE ||
+      lex_mi->auto_position == LEX_MASTER_INFO::LEX_MI_DISABLE) {
+    if (mi->is_receiver_position_info_invalid() ||
+        mi->rli->is_applier_source_position_info_invalid()) {
+      push_warning_printf(
+          thd, Sql_condition::SL_WARNING,
+          ER_WARN_C_DISABLE_GTID_ONLY_WITH_SOURCE_AUTO_POS_INVALID_POS,
+          ER_THD(thd,
+                 ER_WARN_C_DISABLE_GTID_ONLY_WITH_SOURCE_AUTO_POS_INVALID_POS),
+          mi->get_channel());
+      LogErr(WARNING_LEVEL,
+             ER_WARN_L_DISABLE_GTID_ONLY_WITH_SOURCE_AUTO_POS_INVALID_POS,
+             mi->get_channel());
+    }
+  }
+}
+
+/**
+  This method aggregates the validation checks made for the command
+    CHANGE REPLICATION SOURCE
+
+  @param thd    Pointer to THD object for the client thread executing the
+                statement.
+
+  @param lex_mi structure that holds all change replication source options given
+                on the command
+
+  @param mi     Pointer to Master_info object for the channel that holds the
+                the configuration
+
+  @param thread_mask  The thread mask identifying which threads are running
+
+  @return A pair of booleans <return_value, remove_mta_info>
+          return_value: true if an error occurred, false otherwise
+          remove_mta_info: if true remove MTA worker info
+*/
+static std::pair<bool, bool> validate_change_replication_source_options(
+    THD *thd, const LEX_MASTER_INFO *lex_mi, Master_info *mi, int thread_mask) {
+  bool mta_remove_worker_info = false;
+  if ((thread_mask & SLAVE_SQL) == 0)  // If execute threads are stopped
+  {
+    if (mi->rli->mts_recovery_group_cnt) {
+      /*
+        Change-Master can't be done if there is a mts group gap.
+        That requires mts-recovery which START SLAVE provides.
+      */
+      assert(mi->rli->recovery_parallel_workers);
+      my_error(ER_MTS_CHANGE_MASTER_CANT_RUN_WITH_GAPS, MYF(0));
+      return std::make_pair(true, mta_remove_worker_info);
+    } else {
+      /*
+        Lack of mts group gaps makes Workers info stale regardless of
+        need_relay_log_purge computation. We set the mta_remove_worker_info
+        flag here and call reset_workers() later to delete the worker info
+        in mysql.slave_worker_info table.
+      */
+      if (mi->rli->recovery_parallel_workers) mta_remove_worker_info = true;
+    }
+  }
+
+  /*
+    When give a warning?
+    CHANGE MASTER command is used in three ways:
+    a) To change a connection configuration but remain connected to
+       the same master.
+    b) To change positions in binary or relay log(eg: master_log_pos).
+    c) To change the master you are replicating from.
+    We give a warning in cases b and c.
+  */
+  if ((lex_mi->host || lex_mi->port || lex_mi->log_file_name || lex_mi->pos ||
+       lex_mi->relay_log_name || lex_mi->relay_log_pos) &&
+      (mi->rli->atomic_channel_open_temp_tables > 0))
+    push_warning(thd, Sql_condition::SL_WARNING,
+                 ER_WARN_OPEN_TEMP_TABLES_MUST_BE_ZERO,
+                 ER_THD(thd, ER_WARN_OPEN_TEMP_TABLES_MUST_BE_ZERO));
+
+  /**
+    Altough this check is redone when the user is set, we do an early
+    check here to avoid failures in the middle of configuration
+  */
+  Relay_log_info::enum_priv_checks_status priv_check_error;
+  priv_check_error = mi->rli->check_privilege_checks_user(
+      lex_mi->privilege_checks_username,
+      lex_mi->privilege_checks_none ? nullptr
+                                    : lex_mi->privilege_checks_hostname);
+  if (!!priv_check_error) {
+    mi->rli->report_privilege_check_error(
+        ERROR_LEVEL, priv_check_error, true /* to client*/,
+        mi->rli->get_channel(), lex_mi->privilege_checks_username,
+        lex_mi->privilege_checks_hostname);
+    return std::make_pair(true, mta_remove_worker_info);
+  }
+  return std::make_pair(false, mta_remove_worker_info);
+}
+
+/**
+  This method aggregates the the instantiation of options for the command
+  CHANGE REPLICATION SOURCE
+
+  @param thd    Pointer to THD object for the client thread executing the
+                statement.
+
+  @param lex_mi structure that holds all change replication source options given
+                on the command
+
+  @param mi     Pointer to Master_info object belonging to the replica channel
+                to be configured
+
+  @param have_both_receive_execute_option the command will change options that
+                                          affect both the applier and receiver
+
+  @param have_execute_option the command will change applier related options
+
+  @param have_receive_option the command will change receiver related options
+
+  @return returns true if an error occurred, false otherwise
+*/
+static bool update_change_replication_source_options(
+    THD *thd, LEX_MASTER_INFO *lex_mi, Master_info *mi,
+    bool have_both_receive_execute_option, bool have_execute_option,
+    bool have_receive_option) {
+  if (have_both_receive_execute_option) {
+    if (change_applier_receiver_options(thd, lex_mi, mi)) {
+      return true;
+    }
+  }
+
+  if (channel_map.is_group_replication_channel_name(lex_mi->channel)) {
+    mi->set_auto_position(true);
+    mi->rli->set_require_row_format(true);
+    mi->set_gtid_only_mode(true);
+  }
+
+  if (have_execute_option && change_execute_options(lex_mi, mi)) return true;
+
+  if (have_receive_option) {
+    if (change_receive_options(thd, lex_mi, mi)) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+/**
   Execute a CHANGE MASTER statement.
 
   Apart from changing the receive/execute configurations/positions,
@@ -9818,8 +10322,12 @@
   bool have_receive_option = false;
   /* Do we have at least one execute related (SQL/coord/worker) option? */
   bool have_execute_option = false;
+  /* Do we have at least one option that relates to receival and execution? */
+  bool have_both_receive_execute_option = false;
+  /** Is there a an error during validation */
+  bool validation_error = false;
   /* If there are no mts gaps, we delete the rows in this table. */
-  bool mts_remove_worker_info = false;
+  bool mta_remove_worker_info = false;
   /* used as a bit mask to indicate running slave threads. */
   int thread_mask;
   /*
@@ -9866,201 +10374,46 @@
   */
   init_thread_mask(&thread_mask, mi, false);
 
-  /*
-    change master with master_auto_position=1 requires stopping both
-    receiver and applier threads. If any slave thread is running,
-    we report an error.
-  */
   if (thread_mask) /* If any thread is running */
   {
-    if (lex_mi->auto_position != LEX_MASTER_INFO::LEX_MI_UNCHANGED) {
-      error = ER_SLAVE_CHANNEL_MUST_STOP;
-      my_error(ER_SLAVE_CHANNEL_MUST_STOP, MYF(0), mi->get_channel());
-      goto err;
-    }
-    if (lex_mi->assign_gtids_to_anonymous_transactions_type !=
-        LEX_MASTER_INFO::LEX_MI_ANONYMOUS_TO_GTID_UNCHANGED) {
-      error = ER_SLAVE_CHANNEL_MUST_STOP;
-      my_error(ER_SLAVE_CHANNEL_MUST_STOP, MYF(0), mi->get_channel());
-      goto err;
-    }
-    /*
-      Prior to WL#6120, we imposed the condition that STOP SLAVE is required
-      before CHANGE MASTER. Since the slave threads die on STOP SLAVE, it was
-      fine if we purged relay logs.
-
-      Now that we do allow CHANGE MASTER with a running receiver/applier thread,
-      we need to make sure that the relay logs are purged only if both
-      receiver and applier threads are stopped otherwise we could lose events.
-
-      The idea behind purging relay logs if both the threads are stopped is to
-      keep consistency with the old behavior. If the user/application is doing
-      a CHANGE MASTER without stopping any one thread, the relay log purge
-      should be controlled via the 'relay_log_purge' option.
-    */
-    need_relay_log_purge = false;
-  }
-
-  /*
-    We cannot specify auto position and set either the coordinates
-    on master or slave. If we try to do so, an error message is
-    printed out.
-  */
-  if (lex_mi->log_file_name != nullptr || lex_mi->pos != 0 ||
-      lex_mi->relay_log_name != nullptr || lex_mi->relay_log_pos != 0) {
-    if (lex_mi->auto_position == LEX_MASTER_INFO::LEX_MI_ENABLE ||
-        (lex_mi->auto_position != LEX_MASTER_INFO::LEX_MI_DISABLE &&
-         mi->is_auto_position())) {
-      error = ER_BAD_SLAVE_AUTO_POSITION;
-      my_error(ER_BAD_SLAVE_AUTO_POSITION, MYF(0));
-      goto err;
-    }
-  }
-
-  /* CHANGE MASTER TO MASTER_AUTO_POSITION = 1 requires GTID_MODE != OFF */
-  if (lex_mi->auto_position == LEX_MASTER_INFO::LEX_MI_ENABLE &&
-      /*
-        We hold channel_map lock for the duration of the CHANGE MASTER.
-        This is important since it prevents that a concurrent
-        connection changes to GTID_MODE=OFF between this check and the
-        point where AUTO_POSITION is stored in the table and in mi.
-      */
-      global_gtid_mode.get() == Gtid_mode::OFF) {
-    error = ER_AUTO_POSITION_REQUIRES_GTID_MODE_NOT_OFF;
-    my_error(ER_AUTO_POSITION_REQUIRES_GTID_MODE_NOT_OFF, MYF(0));
-    goto err;
-  }
-
-  if (lex_mi->assign_gtids_to_anonymous_transactions_type >
-      LEX_MASTER_INFO::LEX_MI_ANONYMOUS_TO_GTID_OFF) {
-    push_warning(
-        thd, Sql_condition::SL_NOTE,
-        ER_USING_ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS_AS_LOCAL_OR_UUID,
-        ER_THD(
-            thd,
-            ER_USING_ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS_AS_LOCAL_OR_UUID));
-    std::string group_name = get_group_replication_group_name();
-    if (group_name.length() > 0) {
-      bool is_same = false;
-      auto type = lex_mi->assign_gtids_to_anonymous_transactions_type;
-      if (type == LEX_MASTER_INFO::LEX_MI_ANONYMOUS_TO_GTID_LOCAL)
-        if (!(group_name.compare(::server_uuid))) is_same = true;
-      if (type == LEX_MASTER_INFO::LEX_MI_ANONYMOUS_TO_GTID_UUID)
-        if (!(group_name.compare(
-                lex_mi->assign_gtids_to_anonymous_transactions_manual_uuid)))
-          is_same = true;
-      if (is_same) {
-        error = ER_CANT_USE_SAME_UUID_AS_GROUP_NAME;
-        my_error(ER_CANT_USE_SAME_UUID_AS_GROUP_NAME, MYF(0));
-        goto err;
-      }
-
-      std::string view_change_uuid;
-      if (get_group_replication_view_change_uuid(view_change_uuid)) {
-        /* purecov: begin inspected */
-        my_error(ER_GRP_RPL_VIEW_CHANGE_UUID_FAIL_GET_VARIABLE, MYF(0));
-        error = ER_GRP_RPL_VIEW_CHANGE_UUID_FAIL_GET_VARIABLE;
-        goto err;
-        /* purecov: end */
-      } else {
-        if (type == LEX_MASTER_INFO::LEX_MI_ANONYMOUS_TO_GTID_LOCAL)
-          if (!(view_change_uuid.compare(::server_uuid))) is_same = true;
-        if (type == LEX_MASTER_INFO::LEX_MI_ANONYMOUS_TO_GTID_UUID)
-          if (!(view_change_uuid.compare(
-                  lex_mi->assign_gtids_to_anonymous_transactions_manual_uuid)))
-            is_same = true;
-        if (is_same) {
-          error = ER_CANT_USE_SAME_UUID_AS_VIEW_CHANGE_UUID;
-          my_error(ER_CANT_USE_SAME_UUID_AS_VIEW_CHANGE_UUID, MYF(0));
-          goto err;
-        }
-      }
-    }
-  }
-
-  /*
-    CHANGE MASTER TO ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS != OFF requires
-    AUTO_POSITION = 0
-   */
-  if (lex_mi->assign_gtids_to_anonymous_transactions_type !=
-          LEX_MASTER_INFO::LEX_MI_ANONYMOUS_TO_GTID_UNCHANGED ||
-      lex_mi->auto_position != LEX_MASTER_INFO::LEX_MI_UNCHANGED) {
-    auto assign_gtids_to_anonymous_transactions_type =
-        mi->rli->m_assign_gtids_to_anonymous_transactions_info.get_type();
-    switch (lex_mi->assign_gtids_to_anonymous_transactions_type) {
-      case LEX_MASTER_INFO::LEX_MI_ANONYMOUS_TO_GTID_OFF:
-        assign_gtids_to_anonymous_transactions_type =
-            Assign_gtids_to_anonymous_transactions_info::enum_type::AGAT_OFF;
-        break;
-      case LEX_MASTER_INFO::LEX_MI_ANONYMOUS_TO_GTID_LOCAL:
-        assign_gtids_to_anonymous_transactions_type =
-            Assign_gtids_to_anonymous_transactions_info::enum_type::AGAT_LOCAL;
-        break;
-      case LEX_MASTER_INFO::LEX_MI_ANONYMOUS_TO_GTID_UUID:
-        assign_gtids_to_anonymous_transactions_type =
-            Assign_gtids_to_anonymous_transactions_info::enum_type::AGAT_UUID;
-        break;
-      case LEX_MASTER_INFO::LEX_MI_ANONYMOUS_TO_GTID_UNCHANGED:
-        break;
-      default:
-        assert(0);
-        break;
-    }
-    auto auto_position = mi->is_auto_position();
-    switch (lex_mi->auto_position) {
-      case LEX_MASTER_INFO::LEX_MI_ENABLE:
-        auto_position = true;
-        break;
-      case LEX_MASTER_INFO::LEX_MI_DISABLE:
-        auto_position = false;
-        break;
-      case LEX_MASTER_INFO::LEX_MI_UNCHANGED:
-        break;
-      default:
-        assert(0);
-        break;
-    }
-    if (assign_gtids_to_anonymous_transactions_type !=
-            Assign_gtids_to_anonymous_transactions_info::enum_type::AGAT_OFF &&
-        auto_position) {
-      error = ER_CANT_COMBINE_ANONYMOUS_TO_GTID_AND_AUTOPOSITION;
-      my_error(ER_CANT_COMBINE_ANONYMOUS_TO_GTID_AND_AUTOPOSITION, MYF(0));
-      goto err;
-    }
-  }
+    /*
+      Prior to WL#6120, we imposed the condition that STOP SLAVE is required
+      before CHANGE MASTER. Since the slave threads die on STOP SLAVE, it was
+      fine if we purged relay logs.
 
-  /* CHANGE MASTER TO ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS != OFF requires
-   * GTID_MODE = ON
-   * */
-  if (lex_mi->assign_gtids_to_anonymous_transactions_type >
-          LEX_MASTER_INFO::LEX_MI_ANONYMOUS_TO_GTID_OFF &&
-      global_gtid_mode.get() != Gtid_mode::ON) {
-    error = ER_ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS_REQUIRES_GTID_MODE_ON;
-    my_error(ER_ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS_REQUIRES_GTID_MODE_ON,
-             MYF(0));
-    goto err;
+      Now that we do allow CHANGE MASTER with a running receiver/applier thread,
+      we need to make sure that the relay logs are purged only if both
+      receiver and applier threads are stopped otherwise we could lose events.
+
+      The idea behind purging relay logs if both the threads are stopped is to
+      keep consistency with the old behavior. If the user/application is doing
+      a CHANGE MASTER without stopping any one thread, the relay log purge
+      should be controlled via the 'relay_log_purge' option.
+    */
+    need_relay_log_purge = false;
   }
 
   /* Check if at least one receive option is given on change master */
-  have_receive_option = have_change_master_receive_option(lex_mi);
+  have_receive_option = have_change_replication_source_receive_option(lex_mi);
 
   /* Check if at least one execute option is given on change master */
-  have_execute_option =
-      have_change_master_execute_option(lex_mi, &need_relay_log_purge);
-
-  if (need_relay_log_purge && /* If we should purge the logs for this channel */
-      preserve_logs &&        /* And we were asked to keep them */
-      mi->rli->inited)        /* And the channel was initialized properly */
-  {
-    need_relay_log_purge = false;
-  }
+  have_execute_option = have_change_replication_source_execute_option(
+      lex_mi, &need_relay_log_purge);
+  /* Check if at least one execute option affects bothe the applier and receiver
+   */
+  have_both_receive_execute_option =
+      have_change_replication_source_applier_and_receive_option(lex_mi);
 
-  /*
-    With both threads running, we dont allow changing either receive or execute
-    options.
+  /* If either:
+      + An option affects both the applier and receiver and one of the threads
+       is running
+      + There are receiver and applier options and both threads are running
+     Then tell the user the replica must stop
    */
-  if (have_receive_option && have_execute_option && (thread_mask & SLAVE_IO) &&
-      (thread_mask & SLAVE_SQL)) {
+  if ((have_both_receive_execute_option &&
+       ((thread_mask & SLAVE_IO) || (thread_mask & SLAVE_SQL))) ||
+      (have_receive_option && have_execute_option && (thread_mask & SLAVE_IO) &&
+       (thread_mask & SLAVE_SQL))) {
     error = ER_SLAVE_CHANNEL_MUST_STOP;
     my_error(ER_SLAVE_CHANNEL_MUST_STOP, MYF(0), mi->get_channel());
     goto err;
@@ -10080,19 +10433,29 @@
     goto err;
   }
 
-  /*
-    We need to check if there is an empty master_host. Otherwise
-    change master succeeds, a master.info file is created containing
-    empty master_host string and when issuing: start slave; an error
-    is thrown stating that the server is not configured as slave.
-    (See BUG#28796).
+  /* If GTID_MODE is different from ON check if some options are invalid
+     We hold channel_map lock for the duration of the CHANGE MASTER.
+     This is important since it prevents that a concurrent
+     connection changes to GTID_MODE=OFF between this check and the
+     point where AUTO_POSITION is stored in the table and in mi.
   */
-  if (lex_mi->host && !*lex_mi->host) {
-    error = ER_WRONG_ARGUMENTS;
-    my_error(ER_WRONG_ARGUMENTS, MYF(0), "MASTER_HOST");
+  if (global_gtid_mode.get() != Gtid_mode::ON) {
+    if ((error = validate_gtid_option_restrictions(lex_mi, mi))) {
+      goto err;
+    }
+  }
+
+  if ((error = evaluate_inter_option_dependencies(lex_mi, mi))) {
     goto err;
   }
 
+  if (need_relay_log_purge && /* If we should purge the logs for this channel */
+      preserve_logs &&        /* And we were asked to keep them */
+      mi->rli->inited)        /* And the channel was initialized properly */
+  {
+    need_relay_log_purge = false;
+  }
+
   THD_STAGE_INFO(thd, stage_changing_source);
 
   int thread_mask_stopped_threads;
@@ -10112,135 +10475,21 @@
     goto err;
   }
 
-  if (channel_map.is_group_replication_channel_name(lex_mi->channel)) {
-    mi->rli->set_require_row_format(true);
-  }
+  std::tie(validation_error, mta_remove_worker_info) =
+      validate_change_replication_source_options(thd, lex_mi, mi, thread_mask);
 
-  if (have_execute_option && (error = change_execute_options(lex_mi, mi)))
+  if (validation_error) {
+    error = 1;
     goto err;
-
-  if ((thread_mask & SLAVE_SQL) == 0)  // If execute threads are stopped
-  {
-    if (mi->rli->mts_recovery_group_cnt) {
-      /*
-        Change-Master can't be done if there is a mts group gap.
-        That requires mts-recovery which START SLAVE provides.
-      */
-      assert(mi->rli->recovery_parallel_workers);
-
-      error = ER_MTS_CHANGE_MASTER_CANT_RUN_WITH_GAPS;
-      my_error(ER_MTS_CHANGE_MASTER_CANT_RUN_WITH_GAPS, MYF(0));
-      goto err;
-    } else {
-      /*
-        Lack of mts group gaps makes Workers info stale regardless of
-        need_relay_log_purge computation. We set the mts_remove_worker_info
-        flag here and call reset_workers() later to delete the worker info
-        in mysql.slave_worker_info table.
-      */
-      if (mi->rli->recovery_parallel_workers) mts_remove_worker_info = true;
-    }
   }
 
   /*
-    When give a warning?
-    CHANGE MASTER command is used in three ways:
-    a) To change a connection configuration but remain connected to
-       the same master.
-    b) To change positions in binary or relay log(eg: master_log_pos).
-    c) To change the master you are replicating from.
-    We give a warning in cases b and c.
-  */
-  if ((lex_mi->host || lex_mi->port || lex_mi->log_file_name || lex_mi->pos ||
-       lex_mi->relay_log_name || lex_mi->relay_log_pos) &&
-      (mi->rli->atomic_channel_open_temp_tables > 0))
-    push_warning(thd, Sql_condition::SL_WARNING,
-                 ER_WARN_OPEN_TEMP_TABLES_MUST_BE_ZERO,
-                 ER_THD(thd, ER_WARN_OPEN_TEMP_TABLES_MUST_BE_ZERO));
-
-  /*
-    auto_position is the only option that affects both receive
-    and execute sections of replication. So, this code is kept
-    outside both if (have_receive_option) and if (have_execute_option)
-
-    Here, we check if the auto_position option was used and set the flag
-    if the slave should connect to the master and look for GTIDs.
-  */
-  if (lex_mi->auto_position != LEX_MASTER_INFO::LEX_MI_UNCHANGED) {
-    /*
-      auto_position cannot be disable if either source_connection_auto_failover
-      option is enabled or getting enabled in current CHANGE MASTER statement.
-    */
-    if (lex_mi->auto_position == LEX_MASTER_INFO::LEX_MI_DISABLE &&
-        ((mi->is_source_connection_auto_failover() &&
-          (lex_mi->m_source_connection_auto_failover ==
-           LEX_MASTER_INFO::LEX_MI_UNCHANGED)) ||
-         (lex_mi->m_source_connection_auto_failover ==
-          LEX_MASTER_INFO::LEX_MI_ENABLE))) {
-      error = ER_DISABLE_AUTO_POSITION_REQUIRES_ASYNC_RECONNECT_OFF;
-      my_error(ER_DISABLE_AUTO_POSITION_REQUIRES_ASYNC_RECONNECT_OFF, MYF(0));
-      goto err;
-    } else {
-      mi->set_auto_position(
-          (lex_mi->auto_position == LEX_MASTER_INFO::LEX_MI_ENABLE));
-    }
-  }
+    Validation operations should be above this comment
+    Try to use the validate_change_replication_source_options method
 
-  /*
-    source_connection_auto_failover option doesn't affect any of receive and
-    execute sections of replication. It is only useful after IO thread fails so
-    its code is kept outside both if (have_receive_option) and if
-    (have_execute_option).
-  */
-  if (lex_mi->m_source_connection_auto_failover !=
-      LEX_MASTER_INFO::LEX_MI_UNCHANGED) {
-    if (lex_mi->m_source_connection_auto_failover ==
-        LEX_MASTER_INFO::LEX_MI_ENABLE) {
-      /*
-        Enable the source_connection_auto_failover option only if gtid_mode=ON
-        and AUTO_POSITION is enabled.
-      */
-      auto gtid_mode = global_gtid_mode.get();
-      if (gtid_mode == Gtid_mode::ON && mi->is_auto_position()) {
-        mi->set_source_connection_auto_failover();
-        /*
-          If IO thread is running and the monitoring thread is not, start
-          the monitoring thread.
-        */
-        if (mi->slave_running && !Source_IO_monitor::get_instance()
-                                      ->is_monitoring_process_running()) {
-          if (Source_IO_monitor::get_instance()->launch_monitoring_process(
-                  key_thread_replica_monitor_io)) {
-            error = ER_STARTING_REPLICA_MONITOR_IO_THREAD;
-            my_error(error, MYF(0));
-            goto err;
-          }
-        }
-      } else {
-        error = (gtid_mode == Gtid_mode::ON)
-                    ? ER_RPL_ASYNC_RECONNECT_AUTO_POSITION_OFF
-                    : ER_RPL_ASYNC_RECONNECT_GTID_MODE_OFF;
-        my_error(error, MYF(0));
-        goto err;
-      }
-    } else {
-      /*
-        If this is the only channel with source_connection_auto_failover,
-        then stop the monitoring thread.
-      */
-      if (mi->is_source_connection_auto_failover() && mi->slave_running &&
-          channel_map
-                  .get_number_of_connection_auto_failover_channels_running() ==
-              1) {
-        if (Source_IO_monitor::get_instance()->terminate_monitoring_process()) {
-          error = ER_STOP_REPLICA_MONITOR_IO_THREAD_TIMEOUT;
-          my_error(error, MYF(0));
-          goto err;
-        }
-      }
-      mi->unset_source_connection_auto_failover();
-    }
-  }
+    Changes to variables should be below this comment
+    Try to use the update_change_replication_source_options method
+   */
 
   if (have_receive_option) {
     strmake(saved_host, mi->host, HOSTNAME_LENGTH);
@@ -10248,10 +10497,13 @@
     saved_port = mi->port;
     strmake(saved_log_name, mi->get_master_log_name(), FN_REFLEN - 1);
     saved_log_pos = mi->get_master_log_pos();
+  }
 
-    if ((error = change_receive_options(thd, lex_mi, mi))) {
-      goto err;
-    }
+  if (update_change_replication_source_options(
+          thd, lex_mi, mi, have_both_receive_execute_option,
+          have_execute_option, have_receive_option)) {
+    error = 1;
+    goto err;
   }
 
   /*
@@ -10271,7 +10523,7 @@
       much more unlikely situation than the one we are fixing here).
     */
     if (!lex_mi->host && !lex_mi->port && !lex_mi->log_file_name &&
-        !lex_mi->pos) {
+        !lex_mi->pos && !mi->rli->is_applier_source_position_info_invalid()) {
       /*
         Sometimes mi->rli->master_log_pos == 0 (it happens when the SQL thread
         is not initialized), so we use a max(). What happens to
@@ -10330,9 +10582,11 @@
         of rli, i.e. to ''/0: we have lost all copies of the original good
         coordinates. That's why we always save good coords in rli.
 */
-      mi->rli->set_group_master_log_pos(mi->get_master_log_pos());
-      mi->rli->set_group_master_log_name(mi->get_master_log_name());
-      DBUG_PRINT("info", ("master_log_pos: %llu", mi->get_master_log_pos()));
+      if (!mi->is_receiver_position_info_invalid()) {
+        mi->rli->set_group_master_log_pos(mi->get_master_log_pos());
+        mi->rli->set_group_master_log_name(mi->get_master_log_name());
+        DBUG_PRINT("info", ("master_log_pos: %llu", mi->get_master_log_pos()));
+      }
     } else {
       const char *errmsg = nullptr;
       if (mi->rli->is_group_relay_log_name_invalid(&errmsg)) {
@@ -10345,7 +10599,8 @@
     char *var_group_master_log_name =
         const_cast<char *>(mi->rli->get_group_master_log_name());
 
-    if (!var_group_master_log_name[0])  // uninitialized case
+    if (!var_group_master_log_name[0] &&  // uninitialized case
+        !mi->rli->is_applier_source_position_info_invalid())
       mi->rli->set_group_master_log_pos(0);
 
     mi->rli->abort_pos_wait++; /* for SOURCE_POS_WAIT() to abort */
@@ -10368,7 +10623,8 @@
       Notice that the rli table is available exclusively as slave is not
       running.
     */
-    if (mi->rli->flush_info(true)) {
+    if (mi->rli->flush_info(Relay_log_info::RLI_FLUSH_IGNORE_SYNC_OPT |
+                            Relay_log_info::RLI_FLUSH_IGNORE_GTID_ONLY)) {
       error = ER_RELAY_LOG_INIT;
       my_error(ER_RELAY_LOG_INIT, MYF(0), "Failed to flush relay info file.");
       goto err;
@@ -10376,7 +10632,9 @@
 
   } /* end 'if (thread_mask & SLAVE_SQL == 0)' */
 
-  if (mts_remove_worker_info)
+  log_invalid_position_warning(thd, lex_mi, mi);
+
+  if (mta_remove_worker_info)
     if (Rpl_info_factory::reset_workers(mi->rli)) {
       error = ER_MTS_RESET_WORKERS;
       my_error(ER_MTS_RESET_WORKERS, MYF(0));
@@ -10499,11 +10757,12 @@
       lex_mi->sql_delay != -1 || lex_mi->public_key_path ||
       lex_mi->get_public_key != LEX_MASTER_INFO::LEX_MI_UNCHANGED ||
       lex_mi->zstd_compression_level || lex_mi->compression_algorithm ||
-      lex_mi->require_row_format != -1 ||
+      lex_mi->require_row_format != LEX_MASTER_INFO::LEX_MI_UNCHANGED ||
       lex_mi->m_source_connection_auto_failover !=
           LEX_MASTER_INFO::LEX_MI_UNCHANGED ||
       lex_mi->assign_gtids_to_anonymous_transactions_type !=
-          LEX_MASTER_INFO::LEX_MI_ANONYMOUS_TO_GTID_UNCHANGED)
+          LEX_MASTER_INFO::LEX_MI_ANONYMOUS_TO_GTID_UNCHANGED ||
+      lex_mi->m_gtid_only != LEX_MASTER_INFO::LEX_MI_UNCHANGED)
     have_extra_option_received = true;
 
   return have_extra_option_received;
@@ -10547,11 +10806,12 @@
       lex_mi->sql_delay != -1 || lex_mi->public_key_path ||
       lex_mi->get_public_key != LEX_MASTER_INFO::LEX_MI_UNCHANGED ||
       lex_mi->zstd_compression_level || lex_mi->compression_algorithm ||
-      lex_mi->require_row_format != -1 ||
+      lex_mi->require_row_format != LEX_MASTER_INFO::LEX_MI_UNCHANGED ||
       lex_mi->m_source_connection_auto_failover !=
           LEX_MASTER_INFO::LEX_MI_UNCHANGED ||
       lex_mi->assign_gtids_to_anonymous_transactions_type !=
-          LEX_MASTER_INFO::LEX_MI_ANONYMOUS_TO_GTID_UNCHANGED)
+          LEX_MASTER_INFO::LEX_MI_ANONYMOUS_TO_GTID_UNCHANGED ||
+      lex_mi->m_gtid_only != LEX_MASTER_INFO::LEX_MI_UNCHANGED)
     have_extra_option_received = true;
 
   return have_extra_option_received;
@@ -10747,3 +11007,183 @@
 /**
   @} (end of group Replication)
 */
+
+/**
+  Checks the current replica configuration against the server GTID mode
+  If some incompatibility is found a warning is logged.
+*/
+static void check_replica_configuration_restrictions() {
+  std::string group_name = get_group_replication_group_name();
+  if (global_gtid_mode.get() != Gtid_mode::ON || group_name.length() > 0) {
+    for (auto it : channel_map) {
+      Master_info *mi = it.second;
+      if (mi != nullptr) {
+        if (global_gtid_mode.get() != Gtid_mode::ON) {
+          // Check if a channel has SOURCE_AUTO POSITION
+          if (global_gtid_mode.get() == Gtid_mode::OFF &&
+              mi->is_auto_position()) {
+            LogErr(WARNING_LEVEL,
+                   ER_RPL_SLAVE_AUTO_POSITION_IS_1_AND_GTID_MODE_IS_OFF,
+                   mi->get_channel(), mi->get_channel());
+          }
+          // Check if a channel has SOURCE_CONNECTION_AUTO_FAILOVER
+          if (mi->is_source_connection_auto_failover()) {
+            LogErr(WARNING_LEVEL, ER_RPL_ASYNC_RECONNECT_GTID_MODE_OFF_CHANNEL,
+                   mi->get_channel(), mi->get_channel());
+          }
+          // Check if a channel has GTID_ONLY
+          if (mi->is_gtid_only_mode()) {
+            LogErr(WARNING_LEVEL,
+                   ER_WARN_REPLICA_GTID_ONLY_AND_GTID_MODE_NOT_ON,
+                   mi->get_channel());
+          }
+          // Check if a channel has ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS
+          if (mi->rli->m_assign_gtids_to_anonymous_transactions_info
+                  .get_type() > Assign_gtids_to_anonymous_transactions_info::
+                                    enum_type::AGAT_OFF) {
+            std::string assign_gtid_type;
+            if (mi->rli->m_assign_gtids_to_anonymous_transactions_info
+                    .get_type() == Assign_gtids_to_anonymous_transactions_info::
+                                       enum_type::AGAT_LOCAL)
+              assign_gtid_type.assign("LOCAL");
+            else
+              assign_gtid_type.assign("a UUID");
+            LogErr(
+                WARNING_LEVEL,
+                ER_SLAVE_ANONYMOUS_TO_GTID_IS_LOCAL_OR_UUID_AND_GTID_MODE_NOT_ON,
+                mi->get_channel(), assign_gtid_type.data(),
+                Gtid_mode::to_string(global_gtid_mode.get()));
+          }
+        } else {
+          // No checks needed if mode is OFF
+          if (mi->rli->m_assign_gtids_to_anonymous_transactions_info
+                  .get_type() ==
+              Assign_gtids_to_anonymous_transactions_info::enum_type::AGAT_OFF)
+            continue;
+
+          /*
+            Check if one of the channels with
+              ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS
+            does not have the same UUID as Group Replication
+          */
+          if (!(group_name.compare(
+                  mi->rli->m_assign_gtids_to_anonymous_transactions_info
+                      .get_value()))) {
+            LogErr(WARNING_LEVEL,
+                   ER_REPLICA_ANONYMOUS_TO_GTID_UUID_SAME_AS_GROUP_NAME,
+                   mi->get_channel(),
+                   mi->rli->m_assign_gtids_to_anonymous_transactions_info
+                       .get_value()
+                       .c_str());
+          }
+          /*
+            Check if one of the channels with
+              ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS
+            does not have the same UUID as group_replication_view_change_uuid
+          */
+          std::string view_change_uuid;
+          if (get_group_replication_view_change_uuid(view_change_uuid)) {
+            /* purecov: begin inspected */
+            LogErr(WARNING_LEVEL,
+                   ER_WARN_GRP_RPL_VIEW_CHANGE_UUID_FAIL_GET_VARIABLE);
+            /* purecov: end */
+          }
+
+          if (!(view_change_uuid.compare(
+                  mi->rli->m_assign_gtids_to_anonymous_transactions_info
+                      .get_value()))) {
+            LogErr(
+                WARNING_LEVEL,
+                ER_WARN_REPLICA_ANONYMOUS_TO_GTID_UUID_SAME_AS_VIEW_CHANGE_UUID,
+                mi->get_channel(),
+                mi->rli->m_assign_gtids_to_anonymous_transactions_info
+                    .get_value()
+                    .c_str());
+          }
+        }
+      }
+    }
+  }
+}
+
+/**
+  Checks the current replica configuration when starting a replication thread
+  If some incompatibility is found an error is thrown.
+
+  @param mi  pointer to the source info repository object
+  @param thread_mask what replication threads are running
+
+  @return true if an error occurs, false otherwise
+*/
+static bool check_replica_configuration_errors(Master_info *mi,
+                                               int thread_mask) {
+  if (global_gtid_mode.get() != Gtid_mode::ON) {
+    if (mi->is_auto_position() && (thread_mask & SLAVE_IO) &&
+        global_gtid_mode.get() == Gtid_mode::OFF) {
+      my_error(ER_CANT_USE_AUTO_POSITION_WITH_GTID_MODE_OFF, MYF(0),
+               mi->get_for_channel_str());
+      return true;
+    }
+
+    if (mi->is_source_connection_auto_failover()) {
+      my_error(ER_RPL_ASYNC_RECONNECT_GTID_MODE_OFF, MYF(0));
+      return true;
+    }
+
+    if (mi->is_gtid_only_mode()) {
+      my_error(ER_CANT_USE_GTID_ONLY_WITH_GTID_MODE_NOT_ON, MYF(0),
+               mi->get_for_channel_str());
+      return true;
+    }
+
+    if ((mi->rli->m_assign_gtids_to_anonymous_transactions_info.get_type() >
+         Assign_gtids_to_anonymous_transactions_info::enum_type::AGAT_OFF)) {
+      /*
+        This function may be called either during server start (when
+        --skip-start-replica is not used) or during START SLAVE. The error
+        should only be generated during START SLAVE. During server start, an
+        error has already been written to the log for this case (in
+        init_replica).
+      */
+      if (current_thd)
+        my_error(ER_CANT_USE_ANONYMOUS_TO_GTID_WITH_GTID_MODE_NOT_ON, MYF(0),
+                 mi->get_for_channel_str());
+      return true;
+    }
+  }
+
+  if (mi->rli->m_assign_gtids_to_anonymous_transactions_info.get_type() >
+      Assign_gtids_to_anonymous_transactions_info::enum_type::AGAT_OFF) {
+    std::string group_name = get_group_replication_group_name();
+    if ((group_name.length() > 0) &&
+        !(group_name.compare(
+            mi->rli->m_assign_gtids_to_anonymous_transactions_info
+                .get_value()))) {
+      my_error(ER_ANONYMOUS_TO_GTID_UUID_SAME_AS_GROUP_NAME, MYF(0),
+               mi->get_channel());
+      return true;
+    }
+    std::string view_change_uuid;
+    if (get_group_replication_view_change_uuid(view_change_uuid)) {
+      /* purecov: begin inspected */
+      my_error(ER_GRP_RPL_VIEW_CHANGE_UUID_FAIL_GET_VARIABLE, MYF(0));
+      return true;
+      /* purecov: end */
+    } else {
+      if (!(view_change_uuid.compare(
+              mi->rli->m_assign_gtids_to_anonymous_transactions_info
+                  .get_value()))) {
+        my_error(ER_ANONYMOUS_TO_GTID_UUID_SAME_AS_VIEW_CHANGE_UUID, MYF(0),
+                 mi->get_channel());
+        return true;
+      }
+    }
+    if (mi->rli->until_condition == Relay_log_info::UNTIL_SQL_BEFORE_GTIDS ||
+        mi->rli->until_condition == Relay_log_info::UNTIL_SQL_AFTER_GTIDS) {
+      my_error(ER_CANT_SET_SQL_AFTER_OR_BEFORE_GTIDS_WITH_ANONYMOUS_TO_GTID,
+               MYF(0));
+      return true;
+    }
+  }
+  return false;
+}
diff -Nru mysql-8.0-8.0.26/sql/rpl_replica.h mysql-8.0-8.0.27/sql/rpl_replica.h
--- mysql-8.0-8.0.26/sql/rpl_replica.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_replica.h	2021-09-28 11:46:34.000000000 +0000
@@ -36,6 +36,7 @@
 #include "mysql.h"      // MYSQL
 #include "mysql/components/services/psi_thread_bits.h"
 #include "mysql_com.h"
+#include "sql/changestreams/apply/constants.h"
 #include "sql/current_thd.h"
 #include "sql/debug_sync.h"
 
@@ -419,6 +420,10 @@
   if (thread_mask&SLAVE_IO)!=0, then mi->init_info is called; if
   (thread_mask&SLAVE_SQL)!=0, then mi->rli->init_info is called.
 
+  @param force_load repositories will only read information if they
+  are not yet intialized. When true this flag forces the repositories
+  to load information from table or file.
+
   @param skip_received_gtid_set_recovery When true, skips the received GTID
                                          set recovery.
 
@@ -427,7 +432,7 @@
 */
 int load_mi_and_rli_from_repositories(
     Master_info *mi, bool ignore_if_no_info, int thread_mask,
-    bool skip_received_gtid_set_recovery = false);
+    bool skip_received_gtid_set_recovery = false, bool force_load = false);
 void end_info(Master_info *mi);
 /**
   Clear the information regarding the `Master_info` and `Relay_log_info` objects
@@ -451,8 +456,32 @@
   @returns true if an error occurred and false otherwiser.
  */
 bool reset_info(Master_info *mi);
+
+/**
+  This method flushes the current configuration for the channel into the
+  connection metadata repository. It will also flush the current contents
+  of the relay log file if instructed to.
+
+  @param mi the `Master_info` reference that holds both `Master_info` and
+            `Relay_log_info` data.
+
+  @param force shall the method ignore the server settings that limit flushes
+               to this repository
+
+  @param need_lock shall the method take the associated data lock and log lock
+                   if false ownership is asserted
+
+  @param flush_relay_log should the method also flush the relay log file
+
+  @param skip_repo_persistence if this method shall skip the repository flush
+                               This wont skip the relay log flush if
+                               flush_relay_log = true
+
+  @returns 0 if no error ocurred, !=0 if an error ocurred
+*/
 int flush_master_info(Master_info *mi, bool force, bool need_lock = true,
-                      bool flush_relay_log = true);
+                      bool flush_relay_log = true,
+                      bool skip_repo_persistence = false);
 void add_replica_skip_errors(const char *arg);
 void set_replica_skip_errors(char **replica_skip_errors_ptr);
 int add_new_channel(Master_info **mi, const char *channel);
@@ -512,21 +541,6 @@
 
 void end_slave();                 /* release slave threads */
 void delete_slave_info_objects(); /* clean up slave threads data */
-/**
-  This method locks both (in this order)
-    mi->run_lock
-    rli->run_lock
-
-  @param mi The associated master info object
-
-  @note this method shall be invoked while locking mi->m_channel_lock
-  for writes. This is due to the mixed order in which these locks are released
-  and acquired in such method as the slave threads start and stop methods.
-*/
-void lock_slave_threads(Master_info *mi);
-void unlock_slave_threads(Master_info *mi);
-void init_thread_mask(int *mask, Master_info *mi, bool inverse,
-                      bool ignore_monitor_thread = false);
 void set_slave_thread_options(THD *thd);
 void set_slave_thread_default_charset(THD *thd, Relay_log_info const *rli);
 int rotate_relay_log(Master_info *mi, bool log_master_fd = true,
@@ -604,12 +618,6 @@
 */
 bool is_network_error(uint errorno);
 
-/* masks for start/stop operations on io and sql slave threads */
-#define SLAVE_IO 1
-#define SLAVE_SQL 2
-// We also have SLAVE_FORCE_ALL 4
-#define SLAVE_MONITOR 8
-
 int init_replica_thread(THD *thd, SLAVE_THD_TYPE thd_type);
 
 /**
diff -Nru mysql-8.0-8.0.26/sql/rpl_rli.cc mysql-8.0-8.0.27/sql/rpl_rli.cc
--- mysql-8.0-8.0.26/sql/rpl_rli.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_rli.cc	2021-09-28 11:46:34.000000000 +0000
@@ -146,6 +146,7 @@
       m_privilege_checks_user_corrupted{false},
       m_require_row_format(false),
       m_require_table_primary_key_check(PK_CHECK_STREAM),
+      m_is_applier_source_position_info_invalid(false),
       is_group_master_log_pos_invalid(false),
       log_space_total(0),
       ignore_log_space_limit(false),
@@ -444,8 +445,8 @@
   DBUG_EXECUTE_IF("enable_mta_wokrer_failure_in_recovery_finalize",
                   { DBUG_SET("+d,mta_worker_thread_init_fails"); });
   for (i = recovery_parallel_workers; i > workers.size() && !ret; i--) {
-    Slave_worker *w =
-        Rpl_info_factory::create_worker(repo_type, i - 1, this, true);
+    Slave_worker *w = Rpl_info_factory::create_worker(repo_type, i - 1, this,
+                                                      !mi->is_gtid_only_mode());
     /*
       If an error occurs during the above create_worker call, the newly created
       worker object gets deleted within the above function call itself and only
@@ -679,7 +680,8 @@
       CHANGE MASTER TO RELAY_LOG_POS ), we will wait till the first event
       is read and the log position is valid again.
     */
-    if (*group_master_log_name && !is_group_master_log_pos_invalid) {
+    if (*group_master_log_name && !is_group_master_log_pos_invalid &&
+        !is_applier_source_position_info_invalid()) {
       char *basename =
           (group_master_log_name + dirname_length(group_master_log_name));
       /*
@@ -988,7 +990,7 @@
 
     See sql/rpl_rli.h for further information on this behavior.
   */
-  error = flush_info(force);
+  error = flush_info(force ? RLI_FLUSH_IGNORE_SYNC_OPT : RLI_FLUSH_NO_OPTION);
 
   mysql_cond_broadcast(&data_cond);
   if (need_data_lock) mysql_mutex_unlock(&data_lock);
@@ -1775,12 +1777,26 @@
     group_master_log_name[0] = 0;
     group_master_log_pos = 0;
   } else {
-    if (is_relay_log_recovery && init_recovery(mi)) {
-      error = 1;
-      goto err;
+    if (is_relay_log_recovery) {
+      if (init_recovery(mi)) {
+        error = 1;
+        goto err;
+      }
+    } else if (mi->is_gtid_only_mode()) {
+      std::string index_entry_name;
+      std::string errmsg;
+      if (relay_log.find_first_log(index_entry_name, errmsg)) {
+        /* purecov: begin tested */
+        LogErr(ERROR_LEVEL, ER_RPL_CANNOT_OPEN_RELAY_LOG, errmsg.c_str());
+        error = 1;
+        goto err;
+        /* purecov: end */
+      }
+      set_group_relay_log_name(index_entry_name.c_str());
+      set_group_relay_log_pos(BIN_LOG_HEADER_SIZE);
     }
 
-    if (is_group_relay_log_name_invalid(&msg)) {
+    if (!mi->is_gtid_only_mode() && is_group_relay_log_name_invalid(&msg)) {
       LogErr(ERROR_LEVEL, ER_RPL_MTS_RECOVERY_CANT_OPEN_RELAY_LOG,
              group_relay_log_name, std::to_string(group_relay_log_pos).c_str());
       error = 1;
@@ -1790,7 +1806,7 @@
 
   inited = true;
   error_on_rli_init_info = false;
-  if (flush_info(true)) {
+  if (flush_info(RLI_FLUSH_IGNORE_SYNC_OPT | RLI_FLUSH_IGNORE_GTID_ONLY)) {
     msg = "Error reading relay log configuration";
     error = 1;
     goto err;
@@ -1896,16 +1912,23 @@
   - Error can happen if writing to file fails or if flushing the file
     fails.
 
-  @todo Change the log file information to a binary format to avoid
-  calling longlong2str.
+  @param flush_flags a bit mask to force flushing in some scenarios
+                     If RLI_FLUSH_IGNORE_SYNC_OPT is given then the method
+                     will ignore the server sync options
+                     If RLI_FLUSH_IGNORE_GTID_ONLY is given then the method
+                     will ignore the channel GTID_ONLY option
 
   @return 0 on success, 1 on error.
 */
-int Relay_log_info::flush_info(const bool force) {
+int Relay_log_info::flush_info(const int flush_flags) {
   DBUG_TRACE;
 
   if (!inited) return 0;
 
+  if (!(flush_flags & RLI_FLUSH_IGNORE_GTID_ONLY) && mi->is_gtid_only_mode()) {
+    return 0;
+  }
+
   /*
     We update the sync_period at this point because only here we
     now that we are handling a relay log info. This needs to be
@@ -1917,7 +1940,8 @@
 
   if (write_info(handler)) goto err;
 
-  if (handler->flush_info(force || force_flush_postponed_due_to_split_trans))
+  if (handler->flush_info((flush_flags & RLI_FLUSH_IGNORE_SYNC_OPT) ||
+                          force_flush_postponed_due_to_split_trans))
     goto err;
 
   force_flush_postponed_due_to_split_trans = false;
@@ -2804,7 +2828,7 @@
   strmake(new_group_relay_log_name, get_group_relay_log_name(), FN_REFLEN - 1);
   new_group_relay_log_pos = get_group_relay_log_pos();
 
-  error = flush_info(true);
+  error = flush_info(RLI_FLUSH_IGNORE_SYNC_OPT);
 
   /*
     Restore the saved ones so they remain actual until the replicated
@@ -3243,6 +3267,14 @@
   this->m_require_table_primary_key_check = require_pk;
 }
 
+void Relay_log_info::set_applier_source_position_info_invalid(bool invalid) {
+  m_is_applier_source_position_info_invalid = invalid;
+}
+
+bool Relay_log_info::is_applier_source_position_info_invalid() const {
+  return m_is_applier_source_position_info_invalid;
+}
+
 std::string Assign_gtids_to_anonymous_transactions_info::get_value() const {
   return m_value;
 }
diff -Nru mysql-8.0-8.0.26/sql/rpl_rli.h mysql-8.0-8.0.27/sql/rpl_rli.h
--- mysql-8.0-8.0.26/sql/rpl_rli.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_rli.h	2021-09-28 11:46:34.000000000 +0000
@@ -23,15 +23,6 @@
 #ifndef RPL_RLI_H
 #define RPL_RLI_H
 
-#if defined(__SUNPRO_CC)
-/*
-  Solaris Studio 12.5 has a bug where, if you use dynamic_cast
-  and then later #include this file (which Boost does), you will
-  get a compile error. Work around it by just including it right now.
-*/
-#include <cxxabi.h>
-#endif
-
 #include <sys/types.h>
 #include <time.h>
 #include <atomic>
@@ -652,6 +643,21 @@
   */
   Replication_transaction_boundary_parser transaction_parser;
 
+  /**
+    Marks the applier position information as being invalid or not.
+
+    @param invalid value to set the position/file info as invalid or not
+  */
+  void set_applier_source_position_info_invalid(bool invalid);
+
+  /**
+    Returns if the applier positions are marked as being invalid or not.
+
+    @return true if applier position information is not reliable,
+            false otherwise.
+  */
+  bool is_applier_source_position_info_invalid() const;
+
   /*
     Let's call a group (of events) :
       - a transaction
@@ -780,6 +786,15 @@
   */
   enum_require_table_primary_key m_require_table_primary_key_check;
 
+  /**
+    Are positions invalid. If true it means the applier related position
+    information (group_master_log_name and group_master_log_pos) might
+    be outdated.
+
+    Check also is_group_master_log_pos_invalid
+  */
+  bool m_is_applier_source_position_info_invalid;
+
  public:
   bool is_relay_log_truncated() { return m_relay_log_truncated; }
 
@@ -835,12 +850,14 @@
   void fill_coord_err_buf(loglevel level, int err_code,
                           const char *buff_coord) const;
 
-  /*
+  /**
     Flag that the group_master_log_pos is invalid. This may occur
     (for example) after CHANGE MASTER TO RELAY_LOG_POS.  This will
     be unset after the first event has been executed and the
     group_master_log_pos is valid again.
-   */
+
+    Check also m_is_applier_position_info_invalid
+  */
   bool is_group_master_log_pos_invalid;
 
   /*
@@ -1503,7 +1520,15 @@
   */
   int rli_init_info(bool skip_received_gtid_set_recovery = false);
   void end_info();
-  int flush_info(bool force = false);
+
+  /** No flush options given to relay log flush */
+  static constexpr int RLI_FLUSH_NO_OPTION{0};
+  /** Ignore server sync options and flush */
+  static constexpr int RLI_FLUSH_IGNORE_SYNC_OPT{1 << 0};
+  /** Flush disresgarding the value of GTID_ONLY */
+  static constexpr int RLI_FLUSH_IGNORE_GTID_ONLY{1 << 1};
+
+  int flush_info(const int flush_flags);
   /**
    Clears from `this` Relay_log_info object all attribute values that are
    not to be kept.
@@ -1534,16 +1559,28 @@
     future_event_relay_log_pos = log_pos;
   }
 
-  inline const char *get_group_master_log_name() {
+  inline const char *get_group_master_log_name() const {
     return group_master_log_name;
   }
-  inline ulonglong get_group_master_log_pos() { return group_master_log_pos; }
+  inline const char *get_group_master_log_name_info() const {
+    if (m_is_applier_source_position_info_invalid) return "INVALID";
+    return get_group_master_log_name();
+  }
+  inline ulonglong get_group_master_log_pos() const {
+    return group_master_log_pos;
+  }
+  inline ulonglong get_group_master_log_pos_info() const {
+    if (m_is_applier_source_position_info_invalid) return 0;
+    return get_group_master_log_pos();
+  }
   inline void set_group_master_log_name(const char *log_file_name) {
     strmake(group_master_log_name, log_file_name,
             sizeof(group_master_log_name) - 1);
   }
   inline void set_group_master_log_pos(ulonglong log_pos) {
     group_master_log_pos = log_pos;
+    // Whenever the position is set, it means it is no longer invalid
+    m_is_applier_source_position_info_invalid = false;
   }
 
   inline const char *get_group_relay_log_name() { return group_relay_log_name; }
@@ -1590,8 +1627,10 @@
   inline void set_event_relay_log_pos(ulonglong log_pos) {
     event_relay_log_pos = log_pos;
   }
-  inline const char *get_rpl_log_name() {
-    return (group_master_log_name[0] ? group_master_log_name : "FIRST");
+  inline const char *get_rpl_log_name() const {
+    return m_is_applier_source_position_info_invalid
+               ? "INVALID"
+               : (group_master_log_name[0] ? group_master_log_name : "FIRST");
   }
 
   static size_t get_number_info_rli_fields();
diff -Nru mysql-8.0-8.0.26/sql/rpl_rli_pdb.cc mysql-8.0-8.0.27/sql/rpl_rli_pdb.cc
--- mysql-8.0-8.0.26/sql/rpl_rli_pdb.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_rli_pdb.cc	2021-09-28 11:46:34.000000000 +0000
@@ -466,6 +466,8 @@
 
   if (!inited) return 0;
 
+  if (c_rli->mi->is_gtid_only_mode()) return 0;
+
   /*
     We update the sync_period at this point because only here we
     now that we are handling a Slave_worker. This needs to be
diff -Nru mysql-8.0-8.0.26/sql/rpl_source.cc mysql-8.0-8.0.27/sql/rpl_source.cc
--- mysql-8.0-8.0.26/sql/rpl_source.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_source.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1052,10 +1052,7 @@
         is_zombie_thread =
             ((thd->server_id == cur_thd->server_id) && !tmp_uuid.length());
       }
-      if (is_zombie_thread) {
-        mysql_mutex_lock(&thd->LOCK_thd_data);
-        return true;
-      }
+      if (is_zombie_thread) return true;
     }
     return false;
   }
@@ -1090,9 +1087,9 @@
   if (replica_uuid.length() == 0 && thd->server_id == 0) return;
 
   Find_zombie_dump_thread find_zombie_dump_thread(replica_uuid);
-  THD *tmp =
+  THD_ptr tmp_ptr =
       Global_THD_manager::get_instance()->find_thd(&find_zombie_dump_thread);
-  if (tmp) {
+  if (tmp_ptr) {
     /*
       Here we do not call kill_one_thread() as
       it will be slow because it will iterate through the list
@@ -1101,17 +1098,16 @@
     if (log_error_verbosity > 2) {
       if (replica_uuid.length()) {
         LogErr(INFORMATION_LEVEL, ER_RPL_ZOMBIE_ENCOUNTERED, "UUID",
-               replica_uuid.c_ptr(), "UUID", tmp->thread_id());
+               replica_uuid.c_ptr(), "UUID", tmp_ptr->thread_id());
       } else {
         char numbuf[32];
         snprintf(numbuf, sizeof(numbuf), "%u", thd->server_id);
         LogErr(INFORMATION_LEVEL, ER_RPL_ZOMBIE_ENCOUNTERED, "server_id",
-               numbuf, "server_id", tmp->thread_id());
+               numbuf, "server_id", tmp_ptr->thread_id());
       }
     }
-    tmp->duplicate_slave_id = true;
-    tmp->awake(THD::KILL_QUERY);
-    mysql_mutex_unlock(&tmp->LOCK_thd_data);
+    tmp_ptr->duplicate_slave_id = true;
+    tmp_ptr->awake(THD::KILL_QUERY);
   }
 }
 
diff -Nru mysql-8.0-8.0.26/sql/rpl_sys_table_access.cc mysql-8.0-8.0.27/sql/rpl_sys_table_access.cc
--- mysql-8.0-8.0.26/sql/rpl_sys_table_access.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_sys_table_access.cc	2021-09-28 11:46:34.000000000 +0000
@@ -28,6 +28,7 @@
 #include "my_dbug.h"
 #include "sql/current_thd.h"
 #include "sql/json_dom.h"  // Json_wrapper
+#include "sql/log.h"
 #include "sql/rpl_sys_key_access.h"
 #include "sql/sql_base.h"
 #include "sql/sql_class.h"
@@ -102,6 +103,7 @@
   assert(nullptr == m_thd);
   m_lock_type = lock_type;
   m_current_thd = current_thd;
+  m_error = false;
 
   THD *thd = nullptr;
   thd = new THD;
@@ -175,6 +177,7 @@
   if (error || m_error) {
     trans_rollback_stmt(m_thd);
     trans_rollback(m_thd);
+    m_error = true;
   } else {
     m_error = trans_commit_stmt(m_thd, ignore_global_read_lock) ||
               trans_commit(m_thd, ignore_global_read_lock);
@@ -257,6 +260,29 @@
   return str_stream.str();
 }
 
+bool Rpl_sys_table_access::delete_all_rows() {
+  bool error = false;
+
+  TABLE *table = get_table();
+  Rpl_sys_key_access key_access;
+  int key_error =
+      key_access.init(table, Rpl_sys_key_access::enum_key_type::INDEX_NEXT);
+  if (!key_error) {
+    do {
+      error |= table->file->ha_delete_row(table->record[0]);
+      if (error) {
+        return true;
+      }
+    } while (!error && !key_access.next());
+  } else if (HA_ERR_END_OF_FILE == key_error) {
+    /* Table is already empty, nothing to delete. */
+  } else {
+    return true;
+  }
+
+  return key_access.deinit();
+}
+
 bool Rpl_sys_table_access::increment_version() {
   DBUG_TRACE;
   assert(m_lock_type >= TL_WRITE_ALLOW_WRITE);
@@ -294,9 +320,10 @@
   return error;
 }
 
-bool Rpl_sys_table_access::update_version(longlong version) {
+bool Rpl_sys_table_access::update_version(ulonglong version) {
   DBUG_TRACE;
   assert(m_lock_type >= TL_WRITE_ALLOW_WRITE);
+  assert(version > 0);
 
   TABLE *table_version = m_table_list[m_table_version_index].table;
   Field **fields = table_version->field;
@@ -326,7 +353,7 @@
   return error;
 }
 
-longlong Rpl_sys_table_access::get_version() {
+ulonglong Rpl_sys_table_access::get_version() {
   DBUG_TRACE;
   longlong version = 0;
 
@@ -347,3 +374,29 @@
 
   return version;
 }
+
+bool Rpl_sys_table_access::delete_version() {
+  DBUG_TRACE;
+  assert(m_lock_type >= TL_WRITE_ALLOW_WRITE);
+
+  TABLE *table_version = m_table_list[m_table_version_index].table;
+  Field **fields = table_version->field;
+  fields[0]->set_notnull();
+  fields[0]->store(m_table_name.c_str(), m_table_name.length(),
+                   &my_charset_bin);
+
+  Rpl_sys_key_access key_access;
+  int error = key_access.init(table_version);
+
+  if (HA_ERR_KEY_NOT_FOUND == error) {
+    error = 0; /* purecov: inspected */
+  } else if (error) {
+    return true; /* purecov: inspected */
+  } else {
+    error |= table_version->file->ha_delete_row(table_version->record[0]);
+  }
+
+  error |= key_access.deinit();
+
+  return error;
+}
diff -Nru mysql-8.0-8.0.26/sql/rpl_sys_table_access.h mysql-8.0-8.0.27/sql/rpl_sys_table_access.h
--- mysql-8.0-8.0.26/sql/rpl_sys_table_access.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_sys_table_access.h	2021-09-28 11:46:34.000000000 +0000
@@ -211,13 +211,21 @@
   }
 
   /**
+    Delete all rows on `m_schema_name.m_table_name`.
+
+    @retval true  if there is error
+    @retval false if there is no error
+  */
+  bool delete_all_rows();
+
+  /**
     Return the version stored on `m_schema_version_name.m_table_version_name`
     for the `m_schema_name.m_table_name` table.
 
     @retval 0  if there is error
     @retval >0 if there is no error
   */
-  longlong get_version();
+  ulonglong get_version();
 
   /**
     Increment the version stored on `m_schema_version_name.m_table_version_name`
@@ -237,7 +245,30 @@
     @retval true  if there is error
     @retval false if there is no error
   */
-  bool update_version(longlong version);
+  bool update_version(ulonglong version);
+
+  /**
+    Delete the version stored on `m_schema_version_name.m_table_version_name`
+    for the `m_schema_name.m_table_name` table.
+
+    @retval true  if there is error
+    @retval false if there is no error
+  */
+  bool delete_version();
+
+  /**
+    Get database name of table accessed.
+
+    @return database name.
+  */
+  std::string get_db_name() { return m_schema_name; }
+
+  /**
+    Get table name of table accessed.
+
+    @return table name.
+  */
+  std::string get_table_name() { return m_table_name; }
 
  private:
   /* THD created for TableAccess object purpose. */
diff -Nru mysql-8.0-8.0.26/sql/rpl_tblmap.cc mysql-8.0-8.0.27/sql/rpl_tblmap.cc
--- mysql-8.0-8.0.26/sql/rpl_tblmap.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_tblmap.cc	2021-09-28 11:46:34.000000000 +0000
@@ -53,11 +53,10 @@
 static const PSI_memory_key table_psi_key = key_memory_table_mapping_root;
 #endif
 
-table_mapping::table_mapping() : m_free(nullptr), m_table_ids(table_psi_key) {
-  /* We don't preallocate any block, this is consistent with m_free=0 above */
-  init_alloc_root(table_psi_key, &m_mem_root,
-                  TABLE_ID_HASH_SIZE * sizeof(entry), 0);
-}
+table_mapping::table_mapping()
+    : m_mem_root(table_psi_key, TABLE_ID_HASH_SIZE * sizeof(entry)),
+      m_free(nullptr),
+      m_table_ids(table_psi_key) {}
 
 table_mapping::~table_mapping() {
 #ifndef MYSQL_SERVER
diff -Nru mysql-8.0-8.0.26/sql/rpl_transaction_ctx.cc mysql-8.0-8.0.27/sql/rpl_transaction_ctx.cc
--- mysql-8.0-8.0.26/sql/rpl_transaction_ctx.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_transaction_ctx.cc	2021-09-28 11:46:34.000000000 +0000
@@ -98,16 +98,15 @@
                        transaction_termination_ctx.m_sidno,
                        transaction_termination_ctx.m_gno));
 
-  THD *thd = nullptr;
   uint error = ER_NO_SUCH_THREAD;
   Find_thd_with_id find_thd_with_id(transaction_termination_ctx.m_thread_id);
 
-  thd = Global_THD_manager::get_instance()->find_thd(&find_thd_with_id);
-  if (thd) {
-    error = thd->get_transaction()
+  THD_ptr thd_ptr =
+      Global_THD_manager::get_instance()->find_thd(&find_thd_with_id);
+  if (thd_ptr) {
+    error = thd_ptr->get_transaction()
                 ->get_rpl_transaction_ctx()
                 ->set_rpl_transaction_ctx(transaction_termination_ctx);
-    mysql_mutex_unlock(&thd->LOCK_thd_data);
   }
   return error;
 }
diff -Nru mysql-8.0-8.0.26/sql/rpl_transaction_write_set_ctx.cc mysql-8.0-8.0.27/sql/rpl_transaction_write_set_ctx.cc
--- mysql-8.0-8.0.26/sql/rpl_transaction_write_set_ctx.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rpl_transaction_write_set_ctx.cc	2021-09-28 11:46:34.000000000 +0000
@@ -191,19 +191,16 @@
 
 Transaction_write_set *get_transaction_write_set(unsigned long m_thread_id) {
   DBUG_TRACE;
-  THD *thd = nullptr;
   Transaction_write_set *result_set = nullptr;
   Find_thd_with_id find_thd_with_id(m_thread_id);
 
-  thd = Global_THD_manager::get_instance()->find_thd(&find_thd_with_id);
-  if (thd) {
+  THD_ptr thd_ptr =
+      Global_THD_manager::get_instance()->find_thd(&find_thd_with_id);
+  if (thd_ptr) {
     Rpl_transaction_write_set_ctx *transaction_write_set_ctx =
-        thd->get_transaction()->get_transaction_write_set_ctx();
+        thd_ptr->get_transaction()->get_transaction_write_set_ctx();
     int write_set_size = transaction_write_set_ctx->get_write_set()->size();
-    if (write_set_size == 0) {
-      mysql_mutex_unlock(&thd->LOCK_thd_data);
-      return nullptr;
-    }
+    if (write_set_size == 0) return nullptr;
 
     result_set = (Transaction_write_set *)my_malloc(
         key_memory_write_set_extraction, sizeof(Transaction_write_set), MYF(0));
@@ -218,7 +215,6 @@
       uint64 temp = *it;
       result_set->write_set[result_set_index++] = temp;
     }
-    mysql_mutex_unlock(&thd->LOCK_thd_data);
   }
   return result_set;
 }
diff -Nru mysql-8.0-8.0.26/sql/rules_table_service.cc mysql-8.0-8.0.27/sql/rules_table_service.cc
--- mysql-8.0-8.0.26/sql/rules_table_service.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rules_table_service.cc	2021-09-28 11:46:34.000000000 +0000
@@ -56,7 +56,10 @@
 
 int Cursor::read() {
   TABLE *table = m_table_list->table;
-  m_last_read_status = table->file->ha_rnd_next(table->record[0]);
+  // Read the next non-deleted record.
+  do {
+    m_last_read_status = table->file->ha_rnd_next(table->record[0]);
+  } while (m_last_read_status == HA_ERR_RECORD_DELETED);
   if (m_last_read_status != 0) m_is_finished = true;
   return m_last_read_status;
 }
diff -Nru mysql-8.0-8.0.26/sql/rwlock_scoped_lock.cc mysql-8.0-8.0.27/sql/rwlock_scoped_lock.cc
--- mysql-8.0-8.0.26/sql/rwlock_scoped_lock.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/rwlock_scoped_lock.cc	2021-09-28 11:46:34.000000000 +0000
@@ -40,8 +40,8 @@
 */
 rwlock_scoped_lock::rwlock_scoped_lock(mysql_rwlock_t *lock,
                                        bool lock_for_write,
-                                       const char *file MY_ATTRIBUTE((unused)),
-                                       int line MY_ATTRIBUTE((unused))) {
+                                       const char *file [[maybe_unused]],
+                                       int line [[maybe_unused]]) {
   if (lock_for_write) {
     if (!mysql_rwlock_wrlock_with_src(lock, file, line)) {
       m_lock = lock;
diff -Nru mysql-8.0-8.0.26/sql/sdi_utils.cc mysql-8.0-8.0.27/sql/sdi_utils.cc
--- mysql-8.0-8.0.26/sql/sdi_utils.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sdi_utils.cc	2021-09-28 11:46:34.000000000 +0000
@@ -29,11 +29,10 @@
 #include "mysqld_error.h"
 
 /* purecov: begin deadcode */
-bool create_serialized_meta_data(const char *schema_name MY_ATTRIBUTE((unused)),
-                                 const char *table_name MY_ATTRIBUTE((unused)),
-                                 uchar **meta_data MY_ATTRIBUTE((unused)),
-                                 size_t *meta_data_length
-                                     MY_ATTRIBUTE((unused))) {
+bool create_serialized_meta_data(const char *schema_name [[maybe_unused]],
+                                 const char *table_name [[maybe_unused]],
+                                 uchar **meta_data [[maybe_unused]],
+                                 size_t *meta_data_length [[maybe_unused]]) {
   /*
     TODO: This function is currently not implemented. The procedure here
     will be along the following lines:
@@ -60,9 +59,9 @@
   return false;
 }
 
-bool import_serialized_meta_data(const uchar *meta_data MY_ATTRIBUTE((unused)),
-                                 size_t meta_data_length MY_ATTRIBUTE((unused)),
-                                 bool readonly MY_ATTRIBUTE((unused))) {
+bool import_serialized_meta_data(const uchar *meta_data [[maybe_unused]],
+                                 size_t meta_data_length [[maybe_unused]],
+                                 bool readonly [[maybe_unused]]) {
   // TODO: This function is currently not implemented. Return error so
   // that client code will not attempt to open a non-existent table
   my_error(ER_FEATURE_DISABLED, MYF(0), "Serialized metadata import",
diff -Nru mysql-8.0-8.0.26/sql/sd_notify.cc mysql-8.0-8.0.27/sql/sd_notify.cc
--- mysql-8.0-8.0.26/sql/sd_notify.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sd_notify.cc	2021-09-28 11:46:34.000000000 +0000
@@ -149,7 +149,7 @@
   }
   if (status == -1) {
     char errbuf[512];
-    LogErr(WARNING_LEVEL, ER_SYSTEMD_NOTIFY_WRITE_FAILED,
+    LogErr(WARNING_LEVEL, ER_SYSTEMD_NOTIFY_WRITE_FAILED, note.c_str(),
            my_strerror(errbuf, sizeof(errbuf) - 1, errno));
   }
 }
diff -Nru mysql-8.0-8.0.26/sql/server_component/backup_lock_service.cc mysql-8.0-8.0.27/sql/server_component/backup_lock_service.cc
--- mysql-8.0-8.0.26/sql/server_component/backup_lock_service.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/server_component/backup_lock_service.cc	2021-09-28 11:46:34.000000000 +0000
@@ -56,7 +56,12 @@
   else
     thd = current_thd;
 
-  release_backup_lock(thd);
+  // When called from the main thread as part of shutdown, current_thd will be
+  // nullptr. And the MDL system will already have been deinit'ed, so there is
+  // nothing to do.
+  if (thd != nullptr) {
+    release_backup_lock(thd);
+  }
 
   return false;
 }
diff -Nru mysql-8.0-8.0.26/sql/server_component/clone_protocol_service.cc mysql-8.0-8.0.27/sql/server_component/clone_protocol_service.cc
--- mysql-8.0-8.0.26/sql/server_component/clone_protocol_service.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/server_component/clone_protocol_service.cc	2021-09-28 11:46:34.000000000 +0000
@@ -95,7 +95,7 @@
     my_thread_init();
 
     /* Create thread with input key for PFS */
-    thd = create_thd(true, true, true, thread_key);
+    thd = create_thd(true, true, true, thread_key, 0);
 #ifdef HAVE_PSI_THREAD_INTERFACE
     thd_created = true;
 #endif
@@ -213,11 +213,11 @@
   auto value = get_one_variable(thd, &show, OPT_GLOBAL, SHOW_SYS, nullptr,
                                 &fromcs, val_buf, &val_length);
 
-  mysql_mutex_unlock(&LOCK_global_system_variables);
-
   uint dummy_err;
   const CHARSET_INFO *tocs = &my_charset_utf8mb4_bin;
   utf8_val.copy(value, val_length, fromcs, tocs, &dummy_err);
+
+  mysql_mutex_unlock(&LOCK_global_system_variables);
   return (0);
 }
 
@@ -560,6 +560,19 @@
     err = ER_QUERY_INTERRUPTED;
   }
 
+  /* This error is not relevant for client but is raised by network
+  net_read_raw_loop() as the code is compiled in server MYSQL_SERVER.
+  For clone client we need to set valid client network error. */
+  if (err == ER_CLIENT_INTERACTION_TIMEOUT) {
+    /* purecov: begin inspected */
+    thd->clear_error();
+    thd->get_stmt_da()->reset_condition_info(thd);
+    net->last_errno = ER_NET_READ_ERROR;
+    err = ER_NET_READ_ERROR;
+    my_error(ER_NET_READ_ERROR, MYF(0));
+    /* purecov: end */
+  }
+
   if (err == 0) {
     net->last_errno = ER_NET_PACKETS_OUT_OF_ORDER;
     err = ER_NET_PACKETS_OUT_OF_ORDER;
@@ -708,6 +721,32 @@
               (THD * thd, uchar err_cmd, bool is_fatal)) {
   DBUG_TRACE;
 
+  NET *net = thd->get_protocol_classic()->get_net();
+  auto da = thd->get_stmt_da();
+
+  /* Consider any previous network error as fatal. */
+  if (!is_fatal && net->last_errno != 0) {
+    is_fatal = true;
+  }
+
+  if (is_fatal) {
+    int err = 0;
+
+    /* Handle the case if network layer hasn't set the error in THD. */
+    if (da->is_error()) {
+      err = da->mysql_errno();
+    } else {
+      err = ER_NET_ERROR_ON_WRITE;
+      my_error(err, MYF(0));
+    }
+
+    mysql_mutex_lock(&thd->LOCK_thd_data);
+    thd->shutdown_active_vio();
+    mysql_mutex_unlock(&thd->LOCK_thd_data);
+
+    return err;
+  }
+
   uchar err_packet[1 + 4 + MYSQL_ERRMSG_SIZE + 1];
   uchar *buf_ptr = &err_packet[0];
   size_t packet_length = 0;
@@ -716,8 +755,6 @@
   ++buf_ptr;
   ++packet_length;
 
-  auto da = thd->get_stmt_da();
-
   char *bufp;
 
   if (da->is_error()) {
@@ -728,13 +765,6 @@
     bufp = reinterpret_cast<char *>(buf_ptr);
     packet_length +=
         snprintf(bufp, MYSQL_ERRMSG_SIZE, "%s", da->message_text());
-    if (is_fatal) {
-      mysql_mutex_lock(&thd->LOCK_thd_data);
-      thd->shutdown_active_vio();
-      mysql_mutex_unlock(&thd->LOCK_thd_data);
-
-      return da->mysql_errno();
-    }
   } else {
     int4store(buf_ptr, ER_INTERNAL_ERROR);
     buf_ptr += 4;
@@ -744,14 +774,6 @@
     packet_length += snprintf(bufp, MYSQL_ERRMSG_SIZE, "%s", "Unknown Error");
   }
 
-  NET *net = thd->get_protocol_classic()->get_net();
-
-  if (net->last_errno != 0) {
-    return static_cast<int>(net->last_errno);
-  }
-
-  assert(!is_fatal);
-
   /* Clean error in THD */
   thd->clear_error();
   thd->get_stmt_da()->reset_condition_info(thd);
@@ -759,12 +781,18 @@
 
   if (my_net_write(net, &err_packet[0], packet_length) || net_flush(net)) {
     int err = static_cast<int>(net->last_errno);
+    da = thd->get_stmt_da();
 
-    if (err == 0) {
+    if (err == 0 || !da->is_error()) {
       net->last_errno = ER_NET_PACKETS_OUT_OF_ORDER;
       err = ER_NET_PACKETS_OUT_OF_ORDER;
       my_error(err, MYF(0));
     }
+
+    mysql_mutex_lock(&thd->LOCK_thd_data);
+    thd->shutdown_active_vio();
+    mysql_mutex_unlock(&thd->LOCK_thd_data);
+
     return err;
   }
   return 0;
diff -Nru mysql-8.0-8.0.26/sql/server_component/component_sys_var_service.cc mysql-8.0-8.0.27/sql/server_component/component_sys_var_service.cc
--- mysql-8.0-8.0.26/sql/server_component/component_sys_var_service.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/server_component/component_sys_var_service.cc	2021-09-28 11:46:34.000000000 +0000
@@ -117,7 +117,7 @@
                     void *variable_value)) {
   try {
     struct sys_var_chain chain = {nullptr, nullptr};
-    sys_var *sysvar MY_ATTRIBUTE((unused));
+    sys_var *sysvar [[maybe_unused]];
     char *com_sys_var_name, *optname;
     int com_sys_var_len;
     SYS_VAR *opt = nullptr;
@@ -356,7 +356,7 @@
     */
     if (mysqld_server_started) {
       Persisted_variables_cache *pv = Persisted_variables_cache::get_instance();
-      if (pv && pv->set_persist_options(true)) {
+      if (pv && pv->set_persist_options(true, true)) {
         LogErr(ERROR_LEVEL,
                ER_SYS_VAR_COMPONENT_FAILED_TO_MAKE_VARIABLE_PERSISTENT,
                com_sys_var_name);
@@ -409,7 +409,6 @@
   const char *variable_value = get_one_variable(
       current_thd, show, OPT_GLOBAL, show->type, nullptr, &fromcs,
       variable_data_buffer, &out_variable_data_length);
-  mysql_mutex_unlock(&LOCK_global_system_variables);
 
   /*
      Allocate a buffer that can hold "worst" case byte-length of the value
@@ -422,6 +421,7 @@
   const size_t result_length =
       copy_and_convert(result.get(), new_len, tocs, variable_value,
                        out_variable_data_length, fromcs, &dummy_err);
+  mysql_mutex_unlock(&LOCK_global_system_variables);
 
   /*
      The length of the user supplied buffer is intentionally checked
diff -Nru mysql-8.0-8.0.26/sql/server_component/log_builtins.cc mysql-8.0-8.0.27/sql/server_component/log_builtins.cc
--- mysql-8.0-8.0.26/sql/server_component/log_builtins.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/server_component/log_builtins.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1271,8 +1271,8 @@
   Make and return an ISO 8601 / RFC 3339 compliant timestamp.
   Accepts the log_timestamps global variable in its third parameter.
 
-  @param buf       A buffer of at least 26 bytes to store the timestamp in
-                   (19 + tzinfo tail + \0)
+  @param buf       A buffer of at least iso8601_size bytes to store
+                   the timestamp in. The timestamp will be \0 terminated.
   @param utime     Microseconds since the epoch
   @param mode      if 0, use UTC; if 1, use local time
 
@@ -1328,6 +1328,7 @@
     assert(false);
   }
 
+  // length depends on whether timezone is "Z" or "+12:34" style
   len = snprintf(buf, iso8601_size, "%04d-%02d-%02dT%02d:%02d:%02d.%06lu%s",
                  my_tm.tm_year + 1900, my_tm.tm_mon + 1, my_tm.tm_mday,
                  my_tm.tm_hour, my_tm.tm_min, my_tm.tm_sec,
diff -Nru mysql-8.0-8.0.26/sql/server_component/log_sink_buffer.cc mysql-8.0-8.0.27/sql/server_component/log_sink_buffer.cc
--- mysql-8.0-8.0.26/sql/server_component/log_sink_buffer.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/server_component/log_sink_buffer.cc	2021-09-28 11:46:34.000000000 +0000
@@ -115,7 +115,15 @@
   during buffered mode (while starting up). New items must
   receive a LOG_ITEM_LOG_BUFFERED timestamp greater than this.
 */
-static ulonglong log_sink_buffer_last = 0;
+static ulonglong log_sink_buffer_latest_buffered = 0;
+
+/**
+  Timestamp of most recent event we flushed to the built-in sink
+  (which happens when start-up takes very long and we're asked to
+  report status even though external log-components have not been
+  loaded yet).
+*/
+static log_line_buffer *log_sink_buffer_latest_event_shown = nullptr;
 
 /**
   Duplicate a log-event. This is a deep copy where the items (key/value pairs)
@@ -206,7 +214,7 @@
   @retval          -1                   can not add event to buffer (OOM?)
   @retval          >0                   number of added fields
 */
-int log_sink_buffer(void *instance MY_ATTRIBUTE((unused)), log_line *ll) {
+int log_sink_buffer(void *instance [[maybe_unused]], log_line *ll) {
   log_line_buffer *llb = nullptr;  ///< log-line buffer
   ulonglong now = 0;
   int count = 0;
@@ -258,10 +266,10 @@
       Prevent two events from receiving the exact same timestamp on
       systems with low resolution clocks.
     */
-    if (now > log_sink_buffer_last)
-      log_sink_buffer_last = now;
+    if (now > log_sink_buffer_latest_buffered)
+      log_sink_buffer_latest_buffered = now;
     else
-      log_sink_buffer_last++;
+      log_sink_buffer_latest_buffered++;
 
     /*
       Save the current time so we can regenerate the textual timestamp
@@ -270,7 +278,7 @@
     */
     if (!log_line_full(&llb->ll)) {
       log_line_item_set(&llb->ll, LOG_ITEM_LOG_BUFFERED)->data_integer =
-          log_sink_buffer_last;
+          log_sink_buffer_latest_buffered;
     }
 
     *log_line_buffer_tail = llb;
@@ -361,6 +369,16 @@
 */
 void log_sink_buffer_check_timeout(void) { log_sink_buffer(nullptr, nullptr); }
 
+/**
+  Test whether we are still in buffered mode,
+  which is implied by the chain of log-components being empty
+  (before the logger is set up), or by the first (and only)
+  configured component being the buffer sink.
+*/
+static bool log_sink_buffer_is_buffered_mode(log_service_instance *lsi) {
+  return ((lsi == nullptr) || (lsi->sce->chistics & LOG_SERVICE_BUFFER));
+}
+
 void log_sink_buffer_flush(enum log_sink_buffer_flush_mode mode) {
   log_line_buffer *llp, *local_head, *local_tail = nullptr;
 
@@ -404,6 +422,29 @@
   // get head element from list of buffered log events
   llp = local_head;
 
+  /*
+    If we're in "intermediate update" mode, we continue
+    after the last event we printed, rather that starting
+    from the head of the list.
+  */
+  if (mode == LOG_BUFFER_REPORT_AND_KEEP) {
+    // If we have a continue address, use it.
+    if (log_sink_buffer_latest_event_shown != nullptr) {
+      /*
+        The continue- address is the last event we previously logged
+        to log_sink_trad(). If there are no new events after that,
+        we never enter the loop below, so we make sure to set up
+        local_tail here so it will have the correct value after the
+        loop, whether the loop was entered or not.
+      */
+      local_tail = log_sink_buffer_latest_event_shown;
+      llp = local_tail->next;
+    }
+  } else {
+    // Any mode that may free list-elements invalidates the continue pointer.
+    log_sink_buffer_latest_event_shown = nullptr;
+  }
+
   while (llp != nullptr) {
     /*
       Forward the buffered lines to log-writers
@@ -412,27 +453,28 @@
       we'll just throw the information away.
     */
     if (mode != LOG_BUFFER_DISCARD_ONLY) {
-      log_service_instance *lsi = log_service_instances;
-
-      // regenerate timestamp with the correct options
-      char local_time_buff[iso8601_size];
+      // Fetch integer timestamp of when we buffered the event.
+      ulonglong now = 0;
       int index_buff = log_line_index_by_type(&llp->ll, LOG_ITEM_LOG_BUFFERED);
-      int index_time = log_line_index_by_type(&llp->ll, LOG_ITEM_LOG_TIMESTAMP);
-      ulonglong now;
 
-      if (index_buff >= 0)
-        now = llp->ll.item[index_buff].data.data_integer;
-      else  // we failed to set a timestamp earlier (OOM?), use current time!
-        now = my_micro_time(); /* purecov: inspected */
+      if (index_buff >= 0) now = llp->ll.item[index_buff].data.data_integer;
+
+      // We failed to set a timestamp earlier (OOM?). Use current time!
+      if (now == 0) now = my_micro_time(); /* purecov: inspected */
 
       DBUG_EXECUTE_IF("log_error_normalize", { now = 0; });
 
+      // Regenerate timestamp with the correct options.
+      char local_time_buff[iso8601_size];
       make_iso8601_timestamp(local_time_buff, now,
                              iso8601_sysvar_logtimestamps);
       char *date = my_strndup(key_memory_log_error_stack, local_time_buff,
                               strlen(local_time_buff) + 1, MYF(0));
 
       if (date != nullptr) {
+        int index_time =
+            log_line_index_by_type(&llp->ll, LOG_ITEM_LOG_TIMESTAMP);
+
         if (index_time >= 0) {
           // release old timestamp value
           if (llp->ll.item[index_time].alloc & LOG_ITEM_FREE_VALUE) {
@@ -471,7 +513,7 @@
         goes wrong, information with undesired formatting is still
         better than not knowing about the issue at all.
       */
-      if ((lsi == nullptr) || (lsi->sce->chistics & LOG_SERVICE_BUFFER)) {
+      if (log_sink_buffer_is_buffered_mode(log_service_instances)) {
         /*
           This is a fallback used when start-up takes very long.
 
@@ -503,11 +545,21 @@
 
           log_line_item_free_all(&temp_line);  // release our temporary copy
 
+          /*
+            Optimization: When giving intermediate updates during long
+            start-ups, we'll remember the first event we haven't yet
+            printed, so we can continue from that element later. This
+            way we won't have to traverse the head of the list to skip
+            the events we've already shown.
+          */
+          log_sink_buffer_latest_event_shown = llp;
+
           local_tail = llp;
           llp = llp->next;  // go to next element, keep head pointer the same
-          continue;         // skip the free()-ing
 
-        } else {  // LOG_BUFFER_PROCESS_AND_DISCARD
+          continue;  // skip the free()-ing
+
+        } else {  // mode == LOG_BUFFER_PROCESS_AND_DISCARD
           /*
             This is a fallback used primarily when start-up is aborted.
 
@@ -531,24 +583,24 @@
             log_builtins_filter_run(log_filter_builtin_rules, &llp->ll);
 
           log_sink_trad(nullptr, &llp->ll);
-        }
-      } else {  // !LOG_SERVICE_BUFFER
+        }  // LOG_BUFFER_REPORT_AND_KEEP? or LOG_BUFFER_PROCESS_AND_DISCARD?
+      } else {  // !log_sink_buffer_is_buffered_mode()
         /*
           If we get here, logging has left the buffered phase, and
           we can write out the log-events using the configuration
           requested by the user, as it should be!
         */
         log_line_submit(&llp->ll);  // frees keys + values (but not llp itself)
-        goto kv_freed;
+        goto kv_freed;              // skip freeing of keys + values
       }
-    }
+    }  // !LOG_BUFFER_DISCARD_ONLY
 
     log_line_item_free_all(&local_head->ll);  // free key/value pairs
   kv_freed:
     local_head = local_head->next;  // delist event
     my_free(llp);                   // free buffered event
     llp = local_head;
-  }
+  }  // while (any_more_buffered_events_to_process)
 
   if (log_builtins_inited && (mode != LOG_BUFFER_REPORT_AND_KEEP))
     mysql_mutex_lock(&THR_LOCK_log_buffered);
@@ -566,6 +618,12 @@
   */
 
   if (local_head != nullptr) {
+    /*
+      Since local_head was non-NULL, we started with a non-empty
+      (local) list. Therefore, local_tail should point at the last
+      element in that list (as it is only allowed to be NULL if
+      the list is empty).
+    */
     assert(local_tail != nullptr);
 
     /*
diff -Nru mysql-8.0-8.0.26/sql/server_component/log_sink_buffer.h mysql-8.0-8.0.27/sql/server_component/log_sink_buffer.h
--- mysql-8.0-8.0.26/sql/server_component/log_sink_buffer.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/server_component/log_sink_buffer.h	2021-09-28 11:46:34.000000000 +0000
@@ -66,7 +66,7 @@
 enum log_error_stage log_error_stage_get(void);
 
 /// Write a log-event to the buffer sink.
-int log_sink_buffer(void *instance MY_ATTRIBUTE((unused)), log_line *ll);
+int log_sink_buffer(void *instance [[maybe_unused]], log_line *ll);
 
 /**
   Release all buffered log-events (discard_error_log_messages()),
diff -Nru mysql-8.0-8.0.26/sql/server_component/log_sink_perfschema.cc mysql-8.0-8.0.27/sql/server_component/log_sink_perfschema.cc
--- mysql-8.0-8.0.26/sql/server_component/log_sink_perfschema.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/server_component/log_sink_perfschema.cc	2021-09-28 11:46:34.000000000 +0000
@@ -809,7 +809,7 @@
 
   @retval          int                  number of added fields, if any
 */
-int log_sink_perfschema(void *instance MY_ATTRIBUTE((unused)), log_line *ll) {
+int log_sink_perfschema(void *instance [[maybe_unused]], log_line *ll) {
   log_sink_pfs_event e;
   memset(&e, 0, sizeof(log_sink_pfs_event));
 
diff -Nru mysql-8.0-8.0.26/sql/server_component/log_sink_perfschema.h mysql-8.0-8.0.27/sql/server_component/log_sink_perfschema.h
--- mysql-8.0-8.0.26/sql/server_component/log_sink_perfschema.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/server_component/log_sink_perfschema.h	2021-09-28 11:46:34.000000000 +0000
@@ -169,6 +169,6 @@
 log_service_error log_sink_pfs_event_add(log_sink_pfs_event *e,
                                          const char *blob_src);
 
-int log_sink_perfschema(void *instance MY_ATTRIBUTE((unused)), log_line *ll);
+int log_sink_perfschema(void *instance [[maybe_unused]], log_line *ll);
 
 #endif /* LOG_SINK_PERFSCHEMA_H */
diff -Nru mysql-8.0-8.0.26/sql/server_component/log_sink_trad.cc mysql-8.0-8.0.27/sql/server_component/log_sink_trad.cc
--- mysql-8.0-8.0.26/sql/server_component/log_sink_trad.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/server_component/log_sink_trad.cc	2021-09-28 11:46:34.000000000 +0000
@@ -81,7 +81,7 @@
 */
 log_service_error log_sink_trad_parse_log_line(const char *line_start,
                                                size_t line_length) {
-  char timestamp[iso8601_size];
+  char timestamp[iso8601_size];  // space for timestamp + '\0'
   char label[16];
   char msg[LOG_BUFF_MAX];
   ssize_t len;
@@ -97,9 +97,10 @@
   // parse timestamp
   if ((len = parse_trad_field(start, &end, line_end)) <= 0)
     return LOG_SERVICE_PARSE_ERROR;
-  if (len > iso8601_size) return LOG_SERVICE_ARGUMENT_TOO_LONG;
+  if (len >= iso8601_size) return LOG_SERVICE_ARGUMENT_TOO_LONG;
+
   memcpy(timestamp, start, len);
-  timestamp[len] = '\0';
+  timestamp[len] = '\0';  // terminate target buffer
   start = end + 1;
   e.m_timestamp = iso8601_timestamp_to_microseconds(timestamp, len);
 
@@ -201,7 +202,7 @@
 
   @retval          int                  number of added fields, if any
 */
-int log_sink_trad(void *instance MY_ATTRIBUTE((unused)), log_line *ll) {
+int log_sink_trad(void *instance [[maybe_unused]], log_line *ll) {
   const char *label = "", *msg = "";
   int c, out_fields = 0;
   size_t msg_len = 0, iso_len = 0, label_len = 0, subsys_len = 0;
diff -Nru mysql-8.0-8.0.26/sql/server_component/log_sink_trad.h mysql-8.0-8.0.27/sql/server_component/log_sink_trad.h
--- mysql-8.0-8.0.26/sql/server_component/log_sink_trad.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/server_component/log_sink_trad.h	2021-09-28 11:46:34.000000000 +0000
@@ -39,6 +39,6 @@
 log_service_error log_sink_trad_parse_log_line(const char *line_start,
                                                size_t line_length);
 
-int log_sink_trad(void *instance MY_ATTRIBUTE((unused)), log_line *ll);
+int log_sink_trad(void *instance [[maybe_unused]], log_line *ll);
 
 #endif /* LOG_SINK_BUFFER_H */
diff -Nru mysql-8.0-8.0.26/sql/server_component/mysql_system_variable_update_imp.cc mysql-8.0-8.0.27/sql/server_component/mysql_system_variable_update_imp.cc
--- mysql-8.0-8.0.26/sql/server_component/mysql_system_variable_update_imp.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/server_component/mysql_system_variable_update_imp.cc	2021-09-28 11:46:34.000000000 +0000
@@ -55,7 +55,7 @@
     if (!m_previous_thd) {
       my_thread_init();
     }
-    thd = create_thd(false, true, false, 0);
+    thd = create_internal_thd();
   }
 
   ~Storing_auto_THD() {
@@ -70,7 +70,7 @@
 
       prev_da->copy_sql_conditions_from_da(m_previous_thd, curr_da);
     }
-    destroy_thd(thd);
+    destroy_internal_thd(thd);
     if (!m_previous_thd) {
       my_thread_end();
     }
diff -Nru mysql-8.0-8.0.26/sql/server_component/mysql_thd_attributes_imp.cc mysql-8.0-8.0.27/sql/server_component/mysql_thd_attributes_imp.cc
--- mysql-8.0-8.0.26/sql/server_component/mysql_thd_attributes_imp.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/server_component/mysql_thd_attributes_imp.cc	2021-09-28 11:46:34.000000000 +0000
@@ -56,8 +56,8 @@
 }
 
 DEFINE_BOOL_METHOD(mysql_thd_attributes_imp::set,
-                   (MYSQL_THD thd MY_ATTRIBUTE((unused)),
-                    const char *name MY_ATTRIBUTE((unused)),
-                    void *inout_pvalue MY_ATTRIBUTE((unused)))) {
+                   (MYSQL_THD thd [[maybe_unused]],
+                    const char *name [[maybe_unused]],
+                    void *inout_pvalue [[maybe_unused]])) {
   return true;
 }
diff -Nru mysql-8.0-8.0.26/sql/server_component/ongoing_transaction_query_service.cc mysql-8.0-8.0.27/sql/server_component/ongoing_transaction_query_service.cc
--- mysql-8.0-8.0.26/sql/server_component/ongoing_transaction_query_service.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/server_component/ongoing_transaction_query_service.cc	2021-09-28 11:46:34.000000000 +0000
@@ -23,6 +23,7 @@
 #include <sql/current_thd.h>
 #include <sql/mysqld_thd_manager.h>
 #include <sql/sql_lex.h>
+#include "mutex_lock.h"  // MUTEX_LOCK
 #include "mysql_ongoing_transaction_query_imp.h"
 #include "sql/sql_class.h"  // THD
 
@@ -38,6 +39,9 @@
   void operator()(THD *thd) override {
     if (thd->is_killed() || thd->is_error()) return;
 
+    MUTEX_LOCK(lock_thd_data, &thd->LOCK_thd_data);
+    if (thd->is_being_disposed()) return;
+
     TX_TRACKER_GET(tst);
 
     /*
diff -Nru mysql-8.0-8.0.26/sql/server_component/persistent_dynamic_loader.cc mysql-8.0-8.0.27/sql/server_component/persistent_dynamic_loader.cc
--- mysql-8.0-8.0.26/sql/server_component/persistent_dynamic_loader.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/server_component/persistent_dynamic_loader.cc	2021-09-28 11:46:34.000000000 +0000
@@ -242,8 +242,8 @@
         create_scope_guard([&thd]() { commit_and_close_mysql_tables(thd); });
 
     unique_ptr_destroy_only<RowIterator> iterator = init_table_iterator(
-        thd, component_table, nullptr,
-        /*ignore_not_found_rows=*/false, /*count_examined_rows=*/false);
+        thd, component_table, /*ignore_not_found_rows=*/false,
+        /*count_examined_rows=*/false);
     if (iterator == nullptr) {
       push_warning(thd, Sql_condition::SL_WARNING, ER_COMPONENT_TABLE_INCORRECT,
                    ER_THD(thd, ER_COMPONENT_TABLE_INCORRECT));
diff -Nru mysql-8.0-8.0.26/sql/server_component/security_context_imp.cc mysql-8.0-8.0.27/sql/server_component/security_context_imp.cc
--- mysql-8.0-8.0.26/sql/server_component/security_context_imp.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/server_component/security_context_imp.cc	2021-09-28 11:46:34.000000000 +0000
@@ -26,7 +26,7 @@
 #include "sql/auth/auth_acls.h"
 #include "sql/current_thd.h"
 #include "sql/sql_class.h"
-#include "sql/sql_thd_internal_api.h"  // create_thd
+#include "sql/sql_thd_internal_api.h"  // create_internal_thd
 
 /**
   Gets the security context for the thread.
@@ -171,7 +171,7 @@
     THD *tmp_thd = nullptr;
     bool retval;
     if (current_thd == nullptr) {
-      tmp_thd = create_thd(false, true, false, PSI_NOT_INSTRUMENTED);
+      tmp_thd = create_internal_thd();
       if (!tmp_thd) return true;
     }
 
@@ -190,7 +190,7 @@
     if (sctx_thd) set_system_user_flag(sctx_thd);
 
     if (tmp_thd) {
-      destroy_thd(tmp_thd);
+      destroy_internal_thd(tmp_thd);
       tmp_thd = nullptr;
     }
     return retval;
diff -Nru mysql-8.0-8.0.26/sql/server_component/server_component.cc mysql-8.0-8.0.27/sql/server_component/server_component.cc
--- mysql-8.0-8.0.26/sql/server_component/server_component.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/server_component/server_component.cc	2021-09-28 11:46:34.000000000 +0000
@@ -488,7 +488,9 @@
     PROVIDES_SERVICE(performance_schema, psi_table_v1),
     /* Obsolete: PROVIDES_SERVICE(performance_schema, psi_thread_v1), */
     /* Obsolete: PROVIDES_SERVICE(performance_schema, psi_thread_v2), */
+    /* Obsolete: PROVIDES_SERVICE(performance_schema, psi_thread_v3), */
     PROVIDES_SERVICE(performance_schema, psi_thread_v4),
+    PROVIDES_SERVICE(performance_schema, psi_thread_v5),
     PROVIDES_SERVICE(performance_schema, psi_transaction_v1),
     /* Deprecated, use pfs_plugin_table_v1. */
     PROVIDES_SERVICE(performance_schema, pfs_plugin_table),
@@ -595,8 +597,8 @@
   return false;
 }
 
-bool deinitialize_minimal_chassis(SERVICE_TYPE_NO_CONST(registry) *
-                                  registry MY_ATTRIBUTE((unused))) {
+bool deinitialize_minimal_chassis(SERVICE_TYPE_NO_CONST(registry) * registry
+                                  [[maybe_unused]]) {
 #ifdef WITH_MYSQL_COMPONENTS_TEST_DRIVER
   /* Normal server code path. Hence we need to deinitialize minimal chassis */
   if (minimal_chassis_deinit(registry, &COMPONENT_REF(mysql_server))) {
diff -Nru mysql-8.0-8.0.26/sql/server_component/table_access_service.cc mysql-8.0-8.0.27/sql/server_component/table_access_service.cc
--- mysql-8.0-8.0.26/sql/server_component/table_access_service.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/server_component/table_access_service.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1269,7 +1269,7 @@
   assert(value != nullptr);
 
   assert(!f->is_null());
-  String *s_ptr MY_ATTRIBUTE((unused));
+  String *s_ptr [[maybe_unused]];
   s_ptr = f->val_str(value, value);
   assert(s_ptr == value);
 
@@ -1301,7 +1301,7 @@
   assert(value != nullptr);
 
   assert(!f->is_null());
-  String *s_ptr MY_ATTRIBUTE((unused));
+  String *s_ptr [[maybe_unused]];
   s_ptr = f->val_str(value, value);
   assert(s_ptr == value);
 
diff -Nru mysql-8.0-8.0.26/sql/session_tracker.cc mysql-8.0-8.0.27/sql/session_tracker.cc
--- mysql-8.0-8.0.26/sql/session_tracker.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/session_tracker.cc	2021-09-28 11:46:34.000000000 +0000
@@ -44,6 +44,7 @@
 #include "mysql_com.h"
 #include "mysqld_error.h"
 #include "sql/current_thd.h"
+#include "sql/protocol.h"
 #include "sql/psi_memory_key.h"
 #include "sql/query_options.h"
 #include "sql/rpl_context.h"
@@ -666,7 +667,7 @@
       length = net_length_size(node->m_sysvar_name.length) +
                node->m_sysvar_name.length + net_length_size(val_length) +
                val_length;
-
+      /* allocate 1 bytes more for session state type. */
       to = (uchar *)buf.prep_append(net_length_size(length) + 1, EXTRA_ALLOC);
 
       /* Session state type (SESSION_TRACK_SYSTEM_VARIABLES) */
@@ -804,7 +805,6 @@
 
   /* Session state type (SESSION_TRACK_SCHEMA) */
   to = net_store_length(to, (ulonglong)SESSION_TRACK_SCHEMA);
-
   /* Length of the overall entity. */
   to = net_store_length(to, length);
 
@@ -826,8 +826,9 @@
   @param tracked_item_name Always null (unused).
 */
 
-void Current_schema_tracker::mark_as_changed(
-    THD *thd, LEX_CSTRING *tracked_item_name MY_ATTRIBUTE((unused))) {
+void Current_schema_tracker::mark_as_changed(THD *thd,
+                                             LEX_CSTRING *tracked_item_name
+                                             [[maybe_unused]]) {
   m_changed = true;
   thd->lex->safe_to_cache_query = false;
 }
@@ -1136,13 +1137,13 @@
       */
       length += net_length_size(length);  // ... plus that of its length
 
+      /* allocate extra 1 bytes for session state type. */
       uchar *to =
           (uchar *)buf.prep_append(net_length_size(length) + 1, EXTRA_ALLOC);
 
       /* Session state type (SESSION_TRACK_TRANSACTION_CHARACTERISTICS) */
       to = net_store_length(
           (uchar *)to, (ulonglong)SESSION_TRACK_TRANSACTION_CHARACTERISTICS);
-
       /* Length of the overall entity. */
       to = net_store_length((uchar *)to, length);
 
@@ -1361,15 +1362,14 @@
 bool Session_state_change_tracker::store(THD *, String &buf) {
   /* since its a boolean tracker length is always 1 */
   const ulonglong length = 1;
-
+  /*
+    format of the payload is as follows:
+    [ tracker type][length] [1 byte flag]
+  */
   uchar *to = (uchar *)buf.prep_append(3, EXTRA_ALLOC);
 
-  /* format of the payload is as follows:
-     [ tracker type] [length] [1 byte flag] */
-
   /* Session state type (SESSION_TRACK_STATE_CHANGE) */
   to = net_store_length(to, (ulonglong)SESSION_TRACK_STATE_CHANGE);
-
   /* Length of the overall entity it is always 1 byte */
   to = net_store_length(to, length);
 
@@ -1417,6 +1417,20 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
+class Session_transaction_state : public State_tracker {
+ public:
+  /** Constructor */
+  Session_transaction_state() {}
+
+  bool enable(THD *) override { return false; }
+  bool check(THD *, set_var *) override { return false; }
+  bool update(THD *) override { return false; }
+  bool store(THD *, String &) override { return false; }
+  void mark_as_changed(THD *, LEX_CSTRING *) override {}
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
 /**
   @brief Initialize session tracker objects.
 
@@ -1433,6 +1447,8 @@
   m_trackers[SESSION_GTIDS_TRACKER] = new (std::nothrow) Session_gtids_tracker;
   m_trackers[TRANSACTION_INFO_TRACKER] =
       new (std::nothrow) Transaction_state_tracker;
+  m_trackers[TRACK_TRANSACTION_STATE] =
+      new (std::nothrow) Session_transaction_state;
 }
 
 void Session_tracker::claim_memory_ownership(bool claim) {
@@ -1613,7 +1629,7 @@
          state-change (see reset()).
 
 
-  @param thd           The thd handle.
+  @param thd                The thd handle.
   @param [in,out] buf       Buffer to store the information to.
 
   @return
@@ -1634,9 +1650,9 @@
   @param tracked_item_name          Always null.
 */
 
-void Session_gtids_tracker::mark_as_changed(THD *thd MY_ATTRIBUTE((unused)),
+void Session_gtids_tracker::mark_as_changed(THD *thd [[maybe_unused]],
                                             LEX_CSTRING *tracked_item_name
-                                                MY_ATTRIBUTE((unused))) {
+                                            [[maybe_unused]]) {
   m_changed = true;
 }
 
@@ -1660,3 +1676,5 @@
   }
   m_changed = false;
 }
+
+///////////////////////////////////////////////////////////////////////////////
diff -Nru mysql-8.0-8.0.26/sql/session_tracker.h mysql-8.0-8.0.27/sql/session_tracker.h
--- mysql-8.0-8.0.26/sql/session_tracker.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/session_tracker.h	2021-09-28 11:46:34.000000000 +0000
@@ -39,11 +39,20 @@
   SESSION_SYSVARS_TRACKER, /* Session system variables */
   CURRENT_SCHEMA_TRACKER,  /* Current schema */
   SESSION_STATE_CHANGE_TRACKER,
-  SESSION_GTIDS_TRACKER,   /* Tracks GTIDs */
-  TRANSACTION_INFO_TRACKER /* Transaction state */
+  SESSION_GTIDS_TRACKER,    /* Tracks GTIDs */
+  TRANSACTION_INFO_TRACKER, /* Transaction state */
+  /*
+    There should be a one-to-one mapping between this enum members and the
+    members from enum enum_session_state_type defined in mysql_com.h.
+    TRANSACTION_INFO_TRACKER maps to 2 types of tracker which are:
+    SESSION_TRACK_TRANSACTION_CHARACTERISTICS, SESSION_TRACK_TRANSACTION_STATE.
+    Thus introduced a dummy tracker type on server side to keep trackers in sync
+    between client and server.
+  */
+  TRACK_TRANSACTION_STATE,
 };
 
-#define SESSION_TRACKER_END TRANSACTION_INFO_TRACKER
+#define SESSION_TRACKER_END TRACK_TRANSACTION_STATE
 
 #define TX_TRACKER_GET(a)                                            \
   Transaction_state_tracker *a =                                     \
@@ -105,7 +114,7 @@
   /** Mark the entity as changed. */
   virtual void mark_as_changed(THD *thd, LEX_CSTRING *name) = 0;
 
-  virtual void claim_memory_ownership(bool claim MY_ATTRIBUTE((unused))) {}
+  virtual void claim_memory_ownership(bool claim [[maybe_unused]]) {}
 };
 
 /**
diff -Nru mysql-8.0-8.0.26/sql/set_var.cc mysql-8.0-8.0.27/sql/set_var.cc
--- mysql-8.0-8.0.26/sql/set_var.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/set_var.cc	2021-09-28 11:46:34.000000000 +0000
@@ -799,6 +799,11 @@
   */
   var = find_or_nullptr(*system_variable_hash,
                         string(str, length ? length : strlen(str)));
+  DBUG_EXECUTE_IF(
+      "check_intern_find_sys_var_lock", if (current_thd) {
+        int err = mysql_rwlock_trywrlock(&LOCK_system_variables_hash);
+        assert(err == EBUSY || err == EDEADLK);
+      });
 
   /* Don't show non-visible variables. */
   if (var && var->not_visible()) return nullptr;
diff -Nru mysql-8.0-8.0.26/sql/sort_param.h mysql-8.0-8.0.27/sql/sort_param.h
--- mysql-8.0-8.0.26/sql/sort_param.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sort_param.h	2021-09-28 11:46:34.000000000 +0000
@@ -141,6 +141,10 @@
 
   /// SortFileIterator needs an extra buffer when unpacking.
   uchar *allocate_addon_buf(uint sz) {
+    if (using_packed_addons()) {
+      assert(sz + Addon_fields::size_of_length_field > sz);
+      sz += Addon_fields::size_of_length_field;
+    }
     if (m_addon_buf != nullptr) {
       assert(m_addon_buf_length == sz);
       return m_addon_buf;
@@ -298,7 +302,6 @@
   uint max_rows_per_buffer{0};  // Max (unpacked) rows / buffer.
   ha_rows max_rows{0};          // Select limit, or HA_POS_ERROR if unlimited.
   bool use_hash{false};         // Whether to use hash to distinguish cut JSON
-  bool m_force_stable_sort{false};  // Keep relative order of equal elements
   bool m_remove_duplicates{
       false};  ///< Whether we want to remove duplicate rows
 
@@ -442,6 +445,8 @@
    */
   void get_rec_and_res_len(uchar *record_start, uint *recl, uint *resl);
 
+  // NOTE: Even with FILESORT_ALG_STD_STABLE, we do not necessarily have a
+  // stable sort if spilling to disk; this is purely a performance option.
   enum enum_sort_algorithm {
     FILESORT_ALG_NONE,
     FILESORT_ALG_STD_SORT,
diff -Nru mysql-8.0-8.0.26/sql/spatial.h mysql-8.0-8.0.27/sql/spatial.h
--- mysql-8.0-8.0.26/sql/spatial.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/spatial.h	2021-09-28 11:46:34.000000000 +0000
@@ -471,27 +471,27 @@
   virtual uint32 get_data_size() const { return -1; }
 
   /* read from trs the wkt string and write into wkb as wkb encoded data. */
-  virtual bool init_from_wkt(Gis_read_stream *trs MY_ATTRIBUTE((unused)),
-                             String *wkb MY_ATTRIBUTE((unused))) {
+  virtual bool init_from_wkt(Gis_read_stream *trs [[maybe_unused]],
+                             String *wkb [[maybe_unused]]) {
     return true;
   }
 
   /* read from wkb the wkb data and write into res as wkb encoded data. */
   /* returns the length of the wkb that was read */
-  virtual uint init_from_wkb(THD *thd MY_ATTRIBUTE((unused)),
-                             const char *wkb MY_ATTRIBUTE((unused)),
-                             uint len MY_ATTRIBUTE((unused)),
-                             wkbByteOrder bo MY_ATTRIBUTE((unused)),
-                             String *res MY_ATTRIBUTE((unused))) {
+  virtual uint init_from_wkb(THD *thd [[maybe_unused]],
+                             const char *wkb [[maybe_unused]],
+                             uint len [[maybe_unused]],
+                             wkbByteOrder bo [[maybe_unused]],
+                             String *res [[maybe_unused]]) {
     return 0;
   }
 
-  virtual bool get_data_as_wkt(String *txt MY_ATTRIBUTE((unused)),
-                               wkb_parser *wkb MY_ATTRIBUTE((unused))) const {
+  virtual bool get_data_as_wkt(String *txt [[maybe_unused]],
+                               wkb_parser *wkb [[maybe_unused]]) const {
     return true;
   }
-  virtual bool get_mbr(MBR *mbr MY_ATTRIBUTE((unused)),
-                       wkb_parser *wkb MY_ATTRIBUTE((unused))) const {
+  virtual bool get_mbr(MBR *mbr [[maybe_unused]],
+                       wkb_parser *wkb [[maybe_unused]]) const {
     return true;
   }
   bool get_mbr(MBR *mbr) {
@@ -518,45 +518,30 @@
     return 0;
   }
 
-  virtual int get_x(double *x MY_ATTRIBUTE((unused))) const { return -1; }
-  virtual int get_y(double *y MY_ATTRIBUTE((unused))) const { return -1; }
-  virtual int geom_length(double *len MY_ATTRIBUTE((unused))) const {
-    return -1;
-  }
-  virtual int is_closed(int *closed MY_ATTRIBUTE((unused))) const { return -1; }
-  virtual int num_interior_ring(
-      uint32 *n_int_rings MY_ATTRIBUTE((unused))) const {
-    return -1;
-  }
-  virtual int num_points(uint32 *n_points MY_ATTRIBUTE((unused))) const {
-    return -1;
-  }
-  virtual int num_geometries(uint32 *num MY_ATTRIBUTE((unused))) const {
-    return -1;
-  }
-  virtual int copy_points(String *result MY_ATTRIBUTE((unused))) const {
+  virtual int get_x(double *x [[maybe_unused]]) const { return -1; }
+  virtual int get_y(double *y [[maybe_unused]]) const { return -1; }
+  virtual int geom_length(double *len [[maybe_unused]]) const { return -1; }
+  virtual int is_closed(int *closed [[maybe_unused]]) const { return -1; }
+  virtual int num_interior_ring(uint32 *n_int_rings [[maybe_unused]]) const {
     return -1;
   }
+  virtual int num_points(uint32 *n_points [[maybe_unused]]) const { return -1; }
+  virtual int num_geometries(uint32 *num [[maybe_unused]]) const { return -1; }
+  virtual int copy_points(String *result [[maybe_unused]]) const { return -1; }
   /* The following 7 functions return geometries in wkb format. */
-  virtual int start_point(String *point MY_ATTRIBUTE((unused))) const {
-    return -1;
-  }
-  virtual int end_point(String *point MY_ATTRIBUTE((unused))) const {
-    return -1;
-  }
-  virtual int exterior_ring(String *ring MY_ATTRIBUTE((unused))) const {
-    return -1;
-  }
-  virtual int point_n(uint32 num MY_ATTRIBUTE((unused)),
-                      String *result MY_ATTRIBUTE((unused))) const {
+  virtual int start_point(String *point [[maybe_unused]]) const { return -1; }
+  virtual int end_point(String *point [[maybe_unused]]) const { return -1; }
+  virtual int exterior_ring(String *ring [[maybe_unused]]) const { return -1; }
+  virtual int point_n(uint32 num [[maybe_unused]],
+                      String *result [[maybe_unused]]) const {
     return -1;
   }
-  virtual int interior_ring_n(uint32 num MY_ATTRIBUTE((unused)),
-                              String *result MY_ATTRIBUTE((unused))) const {
+  virtual int interior_ring_n(uint32 num [[maybe_unused]],
+                              String *result [[maybe_unused]]) const {
     return -1;
   }
-  virtual int geometry_n(uint32 num MY_ATTRIBUTE((unused)),
-                         String *result MY_ATTRIBUTE((unused))) const {
+  virtual int geometry_n(uint32 num [[maybe_unused]],
+                         String *result [[maybe_unused]]) const {
     return -1;
   }
 
diff -Nru mysql-8.0-8.0.26/sql/sp.cc mysql-8.0-8.0.27/sql/sp.cc
--- mysql-8.0-8.0.26/sql/sp.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sp.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1199,7 +1199,7 @@
         if (mark_referencing_views_invalid(thd, &fn_name, &foreach_fn_root))
           return true;
 
-        free_root(&foreach_fn_root, MYF(MY_MARK_BLOCKS_FREE));
+        foreach_fn_root.ClearForReuse();
       }
 
       is_routine_dropped = true;
@@ -2248,7 +2248,7 @@
         flags = 0; /* This is a SELECT with INTO clause */
         break;
       }
-      /* fallthrough */
+      [[fallthrough]];
     case SQLCOM_ANALYZE:
     case SQLCOM_OPTIMIZE:
     case SQLCOM_PRELOAD_KEYS:
@@ -2538,7 +2538,7 @@
         return item->val_str(str);
       else { /* Bit type is handled as binary string */
       }
-      // Fall through
+      [[fallthrough]];
     case STRING_RESULT: {
       String *result = item->val_str(str);
 
diff -Nru mysql-8.0-8.0.26/sql/sp_head.cc mysql-8.0-8.0.27/sql/sp_head.cc
--- mysql-8.0-8.0.26/sql/sp_head.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sp_head.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1692,7 +1692,7 @@
 
   sp->~sp_head();
 
-  free_root(&own_root, MYF(0));
+  own_root.Clear();
 }
 
 sp_head::sp_head(MEM_ROOT &&mem_root, enum_sp_type type)
@@ -2021,12 +2021,12 @@
     Stack size depends on the platform:
       - for most platforms (8 * STACK_MIN_SIZE) is enough;
       - for Solaris SPARC 64 (10 * STACK_MIN_SIZE) is required.
-      - for clang and UBSAN we need even more stack space.
+      - for clang and ASAN/UBSAN we need even more stack space.
   */
 
   {
-#if defined(__sparc) && defined(__SUNPRO_CC)
-    const int sp_stack_size = 10 * STACK_MIN_SIZE;
+#if defined(__clang__) && defined(HAVE_ASAN)
+    const int sp_stack_size = 12 * STACK_MIN_SIZE;
 #elif defined(__clang__) && defined(HAVE_UBSAN)
     const int sp_stack_size = 16 * STACK_MIN_SIZE;
 #else
@@ -2243,7 +2243,7 @@
     thd->cleanup_after_query();
 
     // Release memory allocated during execution of the instruction
-    free_root(&execute_mem_root, MYF(0));
+    execute_mem_root.Clear();
 
     /*
       Find and process SQL handlers unless it is a fatal error (fatal
@@ -2500,7 +2500,7 @@
 
   ::destroy(trigger_runtime_ctx);
   call_arena.free_items();
-  free_root(&call_mem_root, MYF(0));
+  call_mem_root.Clear();
   thd->sp_runtime_ctx = parent_sp_runtime_ctx;
 
   if (thd->killed) thd->send_kill_message();
@@ -2709,7 +2709,7 @@
 err_with_cleanup:
   ::destroy(func_runtime_ctx);
   call_arena.free_items();
-  free_root(&call_mem_root, MYF(0));
+  call_mem_root.Clear();
   thd->sp_runtime_ctx = parent_sp_runtime_ctx;
 
   /*
diff -Nru mysql-8.0-8.0.26/sql/sp_instr.cc mysql-8.0-8.0.27/sql/sp_instr.cc
--- mysql-8.0-8.0.26/sql/sp_instr.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sp_instr.cc	2021-09-28 11:46:34.000000000 +0000
@@ -565,7 +565,7 @@
   cleanup_before_parsing(thd);
 
   // Cleanup and re-init the lex mem_root for re-parse.
-  free_root(&m_lex_mem_root, MYF(0));
+  m_lex_mem_root.Clear();
   init_sql_alloc(PSI_NOT_INSTRUMENTED, &m_lex_mem_root, MEM_ROOT_BLOCK_SIZE,
                  MEM_ROOT_PREALLOC);
 
@@ -1707,16 +1707,16 @@
 
   sp_rcontext *rctx = thd->sp_runtime_ctx;
 
-  if (rctx->set_case_expr(thd, m_case_expr_id, &m_expr_item) &&
-      !rctx->get_case_expr(m_case_expr_id)) {
-    // Failed to evaluate the value, the case expression is still not
-    // initialized. Set to NULL so we can continue.
-
-    Item *null_item = new Item_null();
-
-    if (!null_item || rctx->set_case_expr(thd, m_case_expr_id, &null_item)) {
-      // If this also failed, we have to abort.
-      my_error(ER_OUT_OF_RESOURCES, MYF(ME_FATALERROR));
+  if (rctx->set_case_expr(thd, m_case_expr_id, &m_expr_item)) {
+    if (!rctx->get_case_expr(m_case_expr_id)) {
+      // Failed to evaluate the value, the case expression is still not
+      // initialized. Set to NULL so we can continue.
+      Item *null_item = new Item_null();
+
+      if (!null_item || rctx->set_case_expr(thd, m_case_expr_id, &null_item)) {
+        // If this also failed, we have to abort.
+        my_error(ER_OUT_OF_RESOURCES, MYF(ME_FATALERROR));
+      }
     }
 
     return true;
diff -Nru mysql-8.0-8.0.26/sql/sp_instr.h mysql-8.0-8.0.27/sql/sp_instr.h
--- mysql-8.0-8.0.26/sql/sp_instr.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sp_instr.h	2021-09-28 11:46:34.000000000 +0000
@@ -158,8 +158,7 @@
     index to the next instruction. Jump instruction will add their
     destination to the leads list.
   */
-  virtual uint opt_mark(sp_head *,
-                        List<sp_instr> *leads MY_ATTRIBUTE((unused))) {
+  virtual uint opt_mark(sp_head *, List<sp_instr> *leads [[maybe_unused]]) {
     m_marked = true;
     return get_ip() + 1;
   }
@@ -170,8 +169,7 @@
     used to prevent the mark sweep from looping for ever. Return the
     end destination.
   */
-  virtual uint opt_shortcut_jump(sp_head *,
-                                 sp_instr *start MY_ATTRIBUTE((unused))) {
+  virtual uint opt_shortcut_jump(sp_head *, sp_instr *start [[maybe_unused]]) {
     return get_ip();
   }
 
@@ -181,8 +179,7 @@
     must also take care of their destination pointers. Forward jumps get
     pushed to the backpatch list 'ibp'.
   */
-  virtual void opt_move(uint dst,
-                        List<sp_branch_instr> *ibp MY_ATTRIBUTE((unused))) {
+  virtual void opt_move(uint dst, List<sp_branch_instr> *ibp [[maybe_unused]]) {
     m_ip = dst;
   }
 
@@ -372,6 +369,10 @@
   */
   virtual void get_query(String *sql_query) const;
 
+  /**
+    Some expressions may be re-parsed as SELECT statements, but need to be
+    adjusted to another SQL command. This function facilitates that change.
+  */
   virtual void adjust_sql_command(LEX *) {}
 
   /**
@@ -396,7 +397,7 @@
 
     @return Error flag.
   */
-  virtual bool on_after_expr_parsing(THD *thd MY_ATTRIBUTE((unused))) {
+  virtual bool on_after_expr_parsing(THD *thd [[maybe_unused]]) {
     return false;
   }
 
@@ -558,6 +559,7 @@
   LEX_CSTRING get_expr_query() const override { return m_value_query; }
 
   void adjust_sql_command(LEX *lex) override {
+    assert(lex->sql_command == SQLCOM_SELECT);
     lex->sql_command = SQLCOM_SET_OPTION;
   }
 
@@ -845,6 +847,11 @@
     m_dest = dest;
   }
 
+  void adjust_sql_command(LEX *lex) override {
+    assert(lex->sql_command == SQLCOM_SELECT);
+    lex->sql_command = SQLCOM_END;
+  }
+
  protected:
   /// Where we will go.
   uint m_dest;
diff -Nru mysql-8.0-8.0.26/sql/sql_admin.cc mysql-8.0-8.0.27/sql/sql_admin.cc
--- mysql-8.0-8.0.26/sql/sql_admin.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_admin.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1531,7 +1531,7 @@
   }
 
   thd->clear_error();
-  send_histogram_results(thd, results, table);
+  res = send_histogram_results(thd, results, table);
   thd->get_stmt_da()->reset_condition_info(thd);
   my_eof(thd);
   return res;
@@ -1691,7 +1691,7 @@
                                      &server_admin_callback, &error, force_);
         break;
       case Ssl_acceptor_context_type::context_last:
-        // Fall through
+        [[fallthrough]];
       default:
         assert(false);
         return false;
@@ -1793,7 +1793,7 @@
     : m_port(port), m_data_dir(data_dir), m_clone(), m_is_local(false) {
   m_host = user_info->host;
   m_user = user_info->user;
-  m_passwd = user_info->auth;
+  m_passwd = user_info->first_factor_auth_info.auth;
 }
 
 bool Sql_cmd_clone::execute(THD *thd) {
@@ -2047,18 +2047,17 @@
   List_iterator<LEX_USER> it(*const_cast<List<LEX_USER> *>(roles));
   LEX_USER *role;
   while ((role = it++)) {
-    role->uses_identified_by_clause = false;
-    role->uses_identified_with_clause = false;
-    role->uses_authentication_string_clause = false;
+    role->first_factor_auth_info.uses_identified_by_clause = false;
+    role->first_factor_auth_info.uses_identified_with_clause = false;
+    role->first_factor_auth_info.uses_authentication_string_clause = false;
     role->alter_status.expire_after_days = 0;
     role->alter_status.account_locked = true;
     role->alter_status.update_account_locked_column = true;
     role->alter_status.update_password_expired_fields = true;
     role->alter_status.use_default_password_lifetime = true;
     role->alter_status.update_password_expired_column = true;
-    role->auth.str = nullptr;
-    role->auth.length = 0;
-    role->has_password_generator = false;
+    role->first_factor_auth_info.auth = {};
+    role->first_factor_auth_info.has_password_generator = false;
   }
   if (!(mysql_create_user(thd, *const_cast<List<LEX_USER> *>(roles),
                           if_not_exists, true))) {
diff -Nru mysql-8.0-8.0.26/sql/sql_alter.h mysql-8.0-8.0.27/sql/sql_alter.h
--- mysql-8.0-8.0.26/sql/sql_alter.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_alter.h	2021-09-28 11:46:34.000000000 +0000
@@ -27,13 +27,13 @@
 #include <stddef.h>
 #include <sys/types.h>
 #include <functional>  // std::function
+#include <optional>
 
 #include "lex_string.h"
 
 #include "my_io.h"
 #include "my_sqlcommand.h"
 #include "mysql/components/services/bits/psi_bits.h"
-#include "nullable.h"
 #include "sql/dd/types/column.h"
 #include "sql/gis/srid.h"
 #include "sql/mdl.h"                   // MDL_request
@@ -56,8 +56,6 @@
 
 enum enum_field_types : int;
 
-using Mysql::Nullable;
-
 /**
   Class representing DROP COLUMN, DROP KEY, DROP FOREIGN KEY, DROP CHECK
   CONSTRAINT and DROP CONSTRAINT clauses in ALTER TABLE statement.
@@ -497,7 +495,7 @@
                  const CHARSET_INFO *cs, bool has_explicit_collation,
                  uint uint_geom_type, Value_generator *gcol_info,
                  Value_generator *default_val_expr, const char *opt_after,
-                 Nullable<gis::srid_t> srid,
+                 std::optional<gis::srid_t> srid,
                  Sql_check_constraint_spec_list *check_cons_list,
                  dd::Column::enum_hidden_type hidden, bool is_array = false);
 
diff -Nru mysql-8.0-8.0.26/sql/sql_array.h mysql-8.0-8.0.27/sql/sql_array.h
--- mysql-8.0-8.0.26/sql/sql_array.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_array.h	2021-09-28 11:46:34.000000000 +0000
@@ -95,6 +95,10 @@
     return Bounds_checked_array(m_array, new_size);
   }
 
+  Element_type *data() { return m_array; }
+
+  const Element_type *data() const { return m_array; }
+
   Element_type &operator[](size_t n) {
     assert(n < m_size);
     return m_array[n];
diff -Nru mysql-8.0-8.0.26/sql/sql_audit.cc mysql-8.0-8.0.27/sql/sql_audit.cc
--- mysql-8.0-8.0.26/sql/sql_audit.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_audit.cc	2021-09-28 11:46:34.000000000 +0000
@@ -69,7 +69,7 @@
   /**
     @brief Blocked copy constructor (private).
   */
-  Audit_error_handler(const Audit_error_handler &obj MY_ATTRIBUTE((unused)))
+  Audit_error_handler(const Audit_error_handler &obj [[maybe_unused]])
       : m_thd(nullptr),
         m_warning_message(nullptr),
         m_error_reported(false),
@@ -346,9 +346,8 @@
     @param sqlstate  The SQL state of the underlying error. NULL if none
     @param msg       The text of the underlying error. NULL if none
   */
-  void print_warning(const char *warn_msg MY_ATTRIBUTE((unused)),
-                     uint sql_errno, const char *sqlstate,
-                     const char *msg) override {
+  void print_warning(const char *warn_msg [[maybe_unused]], uint sql_errno,
+                     const char *sqlstate, const char *msg) override {
     LogErr(WARNING_LEVEL, ER_AUDIT_CANT_ABORT_EVENT, m_event_name, sql_errno,
            sqlstate ? sqlstate : "<NO_STATE>", msg ? msg : "<NO_MESSAGE>");
   }
@@ -812,9 +811,8 @@
     @param sqlstate  The SQL state of the underlying error. NULL if none
     @param msg       The text of the underlying error. NULL if none
   */
-  void print_warning(const char *warn_msg MY_ATTRIBUTE((unused)),
-                     uint sql_errno, const char *sqlstate,
-                     const char *msg) override {
+  void print_warning(const char *warn_msg [[maybe_unused]], uint sql_errno,
+                     const char *sqlstate, const char *msg) override {
     LogErr(WARNING_LEVEL, ER_AUDIT_CANT_ABORT_COMMAND, m_command_text,
            sql_errno, sqlstate ? sqlstate : "<NO_STATE>",
            msg ? msg : "<NO_MESSAGE>");
@@ -1420,7 +1418,7 @@
 }
 
 /**  There's at least one active audit plugin tracking a specified class */
-bool is_audit_plugin_class_active(THD *thd MY_ATTRIBUTE((unused)),
+bool is_audit_plugin_class_active(THD *thd [[maybe_unused]],
                                   unsigned long event_class) {
   return mysql_global_audit_mask[event_class] != 0;
 }
diff -Nru mysql-8.0-8.0.26/sql/sql_base.cc mysql-8.0-8.0.27/sql/sql_base.cc
--- mysql-8.0-8.0.26/sql/sql_base.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_base.cc	2021-09-28 11:46:34.000000000 +0000
@@ -35,6 +35,7 @@
 #include <unordered_map>
 #include <utility>
 
+#include "ft_global.h"
 #include "libbinlogevents/include/table_id.h"
 #include "m_ctype.h"
 #include "m_string.h"
@@ -103,8 +104,9 @@
 #include "sql/item_subselect.h"
 #include "sql/lock.h"  // mysql_lock_remove
 #include "sql/log.h"
-#include "sql/log_event.h"  // Query_log_event
-#include "sql/mysqld.h"     // replica_open_temp_tables
+#include "sql/log_event.h"           // Query_log_event
+#include "sql/mysqld.h"              // replica_open_temp_tables
+#include "sql/mysqld_thd_manager.h"  // Global_THD_manage
 #include "sql/nested_join.h"
 #include "sql/partition_info.h"  // partition_info
 #include "sql/psi_memory_key.h"  // key_memory_TABLE
@@ -143,6 +145,7 @@
 #include "sql/thd_raii.h"
 #include "sql/transaction.h"  // trans_rollback_stmt
 #include "sql/transaction_info.h"
+#include "sql/trigger_chain.h"  // Trigger_chain
 #include "sql/xa.h"
 #include "sql_string.h"
 #include "template_utils.h"
@@ -499,7 +502,7 @@
 
 uint cached_table_definitions(void) { return table_def_cache->size(); }
 
-static TABLE_SHARE *process_found_table_share(THD *thd MY_ATTRIBUTE((unused)),
+static TABLE_SHARE *process_found_table_share(THD *thd [[maybe_unused]],
                                               TABLE_SHARE *share,
                                               bool open_view) {
   DBUG_TRACE;
@@ -3792,7 +3795,7 @@
     if (mysql_bin_log.is_open()) {
       bool result = false;
       String temp_buf;
-      result = temp_buf.append("DELETE FROM ");
+      result = temp_buf.append("TRUNCATE TABLE ");
       append_identifier(thd, &temp_buf, share->db.str, strlen(share->db.str));
       result = temp_buf.append(".");
       append_identifier(thd, &temp_buf, share->table_name.str,
@@ -3821,10 +3824,14 @@
       new_thd.store_globals();
       new_thd.set_db(thd->db());
       new_thd.variables.gtid_next.set_automatic();
-      result = mysql_bin_log.write_dml_directly(
-          &new_thd, temp_buf.c_ptr_safe(), temp_buf.length(), SQLCOM_DELETE);
+      Global_THD_manager *thd_manager = Global_THD_manager::get_instance();
+      thd_manager->add_thd(&new_thd);
+      result = mysql_bin_log.write_stmt_directly(
+          &new_thd, temp_buf.c_ptr_safe(), temp_buf.length(), SQLCOM_TRUNCATE);
       new_thd.restore_globals();
       thd->store_globals();
+      new_thd.release_resources();
+      thd_manager->remove_thd(&new_thd);
       return result;
     }
   }
@@ -5308,8 +5315,24 @@
     After we have identified the tablespace names, we iterate
     over the names and acquire IX locks on each of them.
   */
-  if (lock_tablespace_names(thd, &tablespace_set, lock_wait_timeout))
-    return true;
+
+  if (thd->lex->sql_command == SQLCOM_DROP_DB) {
+    /*
+      In case of DROP DATABASE we might have to lock many thousands of
+      tablespaces in extreme cases. Ensure that we don't hold memory used
+      by corresponding MDL_requests after locks have been acquired to
+      reduce memory usage by DROP DATABASE in such cases.
+    */
+    MEM_ROOT mdl_reqs_root(key_memory_rm_db_mdl_reqs_root, MEM_ROOT_BLOCK_SIZE);
+
+    if (lock_tablespace_names(thd, &tablespace_set, lock_wait_timeout,
+                              &mdl_reqs_root))
+      return true;
+  } else {
+    if (lock_tablespace_names(thd, &tablespace_set, lock_wait_timeout,
+                              thd->mem_root))
+      return true;
+  }
 
   return false;
 }
@@ -7587,7 +7610,6 @@
 
   @param table           table where to search for the field
   @param name            name of field
-  @param length          length of name
   @param allow_rowid     do allow finding of "_rowid" field?
   @param[out] field_index_ptr position in field list (used to speedup
                               lookup for fields in prepared tables)
@@ -7596,27 +7618,22 @@
   @retval != NULL        pointer to field
 */
 
-Field *find_field_in_table(TABLE *table, const char *name, size_t length,
-                           bool allow_rowid, uint *field_index_ptr) {
+Field *find_field_in_table(TABLE *table, const char *name, bool allow_rowid,
+                           uint *field_index_ptr) {
   DBUG_TRACE;
   DBUG_PRINT("enter", ("table: '%s', field name: '%s'", table->alias, name));
 
   Field **field_ptr = nullptr, *field;
 
-  if (table->s->name_hash != nullptr) {
-    const auto it = table->s->name_hash->find(std::string(name, length));
-    if (it != table->s->name_hash->end()) {
-      /*
-        field_ptr points to field in TABLE_SHARE. Convert it to the matching
-        field in table
-      */
-      field_ptr = (table->field + (it->second - table->s->field));
-    }
-  } else {
-    if (!(field_ptr = table->field)) return (Field *)nullptr;
-    for (; *field_ptr; ++field_ptr)
-      if (!my_strcasecmp(system_charset_info, (*field_ptr)->field_name, name))
-        break;
+  if (!(field_ptr = table->field)) return nullptr;
+  for (; *field_ptr; ++field_ptr) {
+    // NOTE: This should probably be strncollsp() instead of my_strcasecmp();
+    // in particular, Ñ != N for my_strcasecmp(), which is not according to the
+    // usual ai_ci rules. However, changing it would risk breaking existing
+    // table definitions (which don't distinguish between N and Ñ), so we can
+    // only do this when actually changing the system collation.
+    if (!my_strcasecmp(system_charset_info, (*field_ptr)->field_name, name))
+      break;
   }
 
   if (field_ptr && *field_ptr) {
@@ -7735,7 +7752,7 @@
   } else if (!table_list->nested_join) {
     /* 'table_list' is a stored table. */
     assert(table_list->table);
-    if ((fld = find_field_in_table(table_list->table, name, length, allow_rowid,
+    if ((fld = find_field_in_table(table_list->table, name, allow_rowid,
                                    field_index_ptr)))
       *actual_table = table_list;
   } else {
@@ -7815,20 +7832,11 @@
 
 Field *find_field_in_table_sef(TABLE *table, const char *name) {
   Field **field_ptr = nullptr;
-  if (table->s->name_hash != nullptr) {
-    const auto it = table->s->name_hash->find(name);
-    if (it != table->s->name_hash->end()) {
-      /*
-        field_ptr points to field in TABLE_SHARE. Convert it to the matching
-        field in table
-      */
-      field_ptr = (table->field + (it->second - table->s->field));
-    }
-  } else {
-    if (!(field_ptr = table->field)) return (Field *)nullptr;
-    for (; *field_ptr; ++field_ptr)
-      if (!my_strcasecmp(system_charset_info, (*field_ptr)->field_name, name))
-        break;
+  if (!(field_ptr = table->field)) return nullptr;
+  for (; *field_ptr; ++field_ptr) {
+    // NOTE: See comment on the same call in find_field_in_table().
+    if (!my_strcasecmp(system_charset_info, (*field_ptr)->field_name, name))
+      break;
   }
   if (field_ptr)
     return *field_ptr;
@@ -7920,8 +7928,7 @@
     */
 
     if (table_ref->table && !table_ref->is_view()) {
-      found = find_field_in_table(table_ref->table, name, length, true,
-                                  &field_index);
+      found = find_field_in_table(table_ref->table, name, true, &field_index);
       // Check if there are sufficient privileges to the found field.
       if (found && want_privilege &&
           check_column_grant_in_table_ref(thd, table_ref, name, length,
@@ -9784,11 +9791,14 @@
         if any other column of the row is updated.
       */
       if (*is_row_changed &&
-          (optype_info->function_defaults_apply_on_columns(table->write_set)))
-        optype_info->set_function_defaults(table);
+          (optype_info->function_defaults_apply_on_columns(table->write_set))) {
+        if (optype_info->set_function_defaults(table)) return true;
+      }
     } else if (optype_info->function_defaults_apply_on_columns(
-                   table->write_set))
-      optype_info->set_function_defaults(table);
+                   table->write_set)) {
+      if (optype_info->set_function_defaults(table)) return true;
+    }
+    return false;
   };
 
   /*
@@ -9796,23 +9806,27 @@
     the event is TRG_EVENT_UPDATE and the SQL-command is SQLCOM_INSERT.
   */
 
-  if (table->triggers) {
+  Trigger_chain *tc =
+      table->triggers != nullptr
+          ? table->triggers->get_triggers(event, TRG_ACTION_BEFORE)
+          : nullptr;
+
+  if (tc != nullptr) {
     bool rc;
 
     table->triggers->enable_fields_temporary_nullability(thd);
-
-    if (table->triggers->has_triggers(event, TRG_ACTION_BEFORE) &&
-        command_can_invoke_insert_triggers(event, thd->lex->sql_command)) {
+    if (command_can_invoke_insert_triggers(event, thd->lex->sql_command)) {
       assert(num_fields);
 
       MY_BITMAP insert_into_fields_bitmap;
       bitmap_init(&insert_into_fields_bitmap, nullptr, num_fields);
 
-      fill_function_defaults();
+      rc = fill_function_defaults();
 
-      rc = fill_record(thd, table, fields, values, nullptr,
-                       &insert_into_fields_bitmap,
-                       raise_autoinc_has_expl_non_null_val);
+      if (!rc)
+        rc = fill_record(thd, table, fields, values, nullptr,
+                         &insert_into_fields_bitmap,
+                         raise_autoinc_has_expl_non_null_val);
 
       if (!rc)
         rc = call_before_insert_triggers(thd, table, event,
@@ -9824,9 +9838,10 @@
                        raise_autoinc_has_expl_non_null_val);
 
       if (!rc) {
-        fill_function_defaults();
-        rc = table->triggers->process_triggers(thd, event, TRG_ACTION_BEFORE,
-                                               true);
+        rc = fill_function_defaults();
+        if (!rc)
+          rc = table->triggers->process_triggers(thd, event, TRG_ACTION_BEFORE,
+                                                 true);
         // For UPDATE operation, check if row is updated by the triggers.
         if (!rc &&
             optype_info->get_operation_type() == COPY_INFO::UPDATE_OPERATION &&
@@ -9840,8 +9855,13 @@
       updated by the triggers.
     */
     assert(table->pos_in_table_list && !table->pos_in_table_list->is_view());
-    if (!rc && table->has_gcol())
+    if (!rc && table->has_gcol() &&
+        tc->has_updated_trigger_fields(table->write_set)) {
+      // Dont save old value while re-calculating generated fields.
+      // Before image will already be saved in the first calculation.
+      table->blobs_need_not_keep_old_value();
       rc = update_generated_write_fields(table->write_set, table);
+    }
 
     table->triggers->disable_fields_temporary_nullability();
 
@@ -9850,7 +9870,7 @@
     if (fill_record(thd, table, fields, values, nullptr, nullptr,
                     raise_autoinc_has_expl_non_null_val))
       return true;
-    fill_function_defaults();
+    if (fill_function_defaults()) return true;
     return check_record(thd, fields);
   }
 }
@@ -9999,8 +10019,12 @@
                                           enum enum_trigger_event_type event,
                                           int num_fields) {
   bool rc;
+  Trigger_chain *tc =
+      table->triggers != nullptr
+          ? table->triggers->get_triggers(event, TRG_ACTION_BEFORE)
+          : nullptr;
 
-  if (table->triggers) {
+  if (tc != nullptr) {
     assert(command_can_invoke_insert_triggers(event, thd->lex->sql_command));
     assert(num_fields);
 
@@ -10021,8 +10045,13 @@
     */
     if (!rc && *ptr) {
       TABLE *table_p = (*ptr)->table;
-      if (table_p->has_gcol())
+      if (table_p->has_gcol() &&
+          tc->has_updated_trigger_fields(table_p->write_set)) {
+        // Dont save old value while re-calculating generated fields.
+        // Before image will already be saved in the first calculation.
+        table_p->blobs_need_not_keep_old_value();
         rc = update_generated_write_fields(table_p->write_set, table_p);
+      }
     }
     bitmap_free(&insert_into_fields_bitmap);
     table->triggers->disable_fields_temporary_nullability();
@@ -10049,7 +10078,6 @@
   THD *thd;
   List<LEX_STRING> files;
   List_iterator<LEX_STRING> files_it;
-  MEM_ROOT files_root;
   LEX_STRING *file_str;
   bool result = true;
   DBUG_TRACE;
@@ -10058,7 +10086,7 @@
   thd->thread_stack = (char *)&thd;
   thd->store_globals();
 
-  init_alloc_root(PSI_NOT_INSTRUMENTED, &files_root, 32768, 0);
+  MEM_ROOT files_root(PSI_NOT_INSTRUMENTED, 32768);
 
   for (i = 0; i <= mysql_tmpdir_list.max; i++) {
     tmpdir = mysql_tmpdir_list.list[i];
@@ -10104,7 +10132,7 @@
     (void)mysql_file_delete(key_file_misc, file_str->str, MYF(0));
 
 err:
-  free_root(&files_root, MYF(0));
+  files_root.Clear();
   delete thd;
   return result;
 }
@@ -10271,14 +10299,27 @@
 bool init_ftfuncs(THD *thd, Query_block *query_block) {
   assert(query_block->has_ft_funcs());
 
-  List_iterator<Item_func_match> li(*(query_block->ftfunc_list));
   DBUG_PRINT("info", ("Performing FULLTEXT search"));
   THD_STAGE_INFO(thd, stage_fulltext_initialization);
 
-  Item_func_match *ifm;
-  while ((ifm = li++)) {
-    if (ifm->init_search(thd)) return true;
+  if (thd->lex->using_hypergraph_optimizer) {
+    // Set the no_ranking hint if ranking of the results is not required. The
+    // old optimizer does this when it determines which scan to use. The
+    // hypergraph optimizer doesn't know until the full plan is built, so do it
+    // here, just before the full-text search is performed.
+    for (Item_func_match &ifm : *query_block->ftfunc_list) {
+      if (ifm.master == nullptr && ifm.can_skip_ranking()) {
+        ifm.get_hints()->set_hint_flag(FT_NO_RANKING);
+      }
+    }
   }
+
+  for (Item_func_match &ifm : *query_block->ftfunc_list) {
+    if (ifm.init_search(thd)) {
+      return true;
+    }
+  }
+
   return false;
 }
 
diff -Nru mysql-8.0-8.0.26/sql/sql_base.h mysql-8.0-8.0.27/sql/sql_base.h
--- mysql-8.0-8.0.26/sql/sql_base.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_base.h	2021-09-28 11:46:34.000000000 +0000
@@ -254,8 +254,8 @@
                                uint *cached_field_index_ptr,
                                bool register_tree_change,
                                TABLE_LIST **actual_table);
-Field *find_field_in_table(TABLE *table, const char *name, size_t length,
-                           bool allow_rowid, uint *cached_field_index_ptr);
+Field *find_field_in_table(TABLE *table, const char *name, bool allow_rowid,
+                           uint *cached_field_index_ptr);
 Field *find_field_in_table_sef(TABLE *table, const char *name);
 Item **find_item_in_list(THD *thd, Item *item, mem_root_deque<Item *> *items,
                          uint *counter,
diff -Nru mysql-8.0-8.0.26/sql/sql_call.h mysql-8.0-8.0.27/sql/sql_call.h
--- mysql-8.0-8.0.26/sql/sql_call.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_call.h	2021-09-28 11:46:34.000000000 +0000
@@ -32,7 +32,7 @@
 template <class T>
 class mem_root_deque;
 
-class Sql_cmd_call : public Sql_cmd_dml {
+class Sql_cmd_call final : public Sql_cmd_dml {
  public:
   explicit Sql_cmd_call(sp_name *proc_name_arg,
                         mem_root_deque<Item *> *prog_args_arg)
diff -Nru mysql-8.0-8.0.26/sql/sql_class.cc mysql-8.0-8.0.27/sql/sql_class.cc
--- mysql-8.0-8.0.26/sql/sql_class.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_class.cc	2021-09-28 11:46:34.000000000 +0000
@@ -308,7 +308,7 @@
 
 void THD::enter_stage(const PSI_stage_info *new_stage,
                       PSI_stage_info *old_stage,
-                      const char *calling_func MY_ATTRIBUTE((unused)),
+                      const char *calling_func [[maybe_unused]],
                       const char *calling_file,
                       const unsigned int calling_line) {
   DBUG_PRINT("THD::enter_stage",
@@ -531,8 +531,6 @@
   mysql_audit_init_thd(this);
   net.vio = nullptr;
   system_thread = NON_SYSTEM_THREAD;
-  cleanup_done = false;
-  m_release_resources_done = false;
   peer_port = 0;  // For SHOW PROCESSLIST
   get_transaction()->m_flags.enabled = true;
   m_resource_group_ctx.m_cur_resource_group = nullptr;
@@ -550,6 +548,13 @@
                    MY_MUTEX_INIT_FAST);
   mysql_cond_init(key_COND_thr_lock, &COND_thr_lock);
 
+  /*Initialize connection delegation mutex and cond*/
+  mysql_mutex_init(key_LOCK_group_replication_connection_mutex,
+                   &LOCK_group_replication_connection_mutex,
+                   MY_MUTEX_INIT_FAST);
+  mysql_cond_init(key_COND_group_replication_connection_cond_var,
+                  &COND_group_replication_connection_cond_var);
+
   /* Variables with default values */
   set_proc_info("login");
   where = THD::DEFAULT_WHERE;
@@ -919,7 +924,7 @@
 #endif /* defined(ENABLED_DEBUG_SYNC) */
   killed = NOT_KILLED;
   running_explain_analyze = false;
-  cleanup_done = false;
+  m_thd_life_cycle_stage = enum_thd_life_cycle_stages::ACTIVE;
   init();
   stmt_map.reset();
   user_vars.clear();
@@ -956,6 +961,12 @@
 #endif
 }
 
+bool THD::is_cleanup_done() {
+  return (m_thd_life_cycle_stage ==
+              enum_thd_life_cycle_stages::ACTIVE_AND_CLEAN ||
+          m_thd_life_cycle_stage >= enum_thd_life_cycle_stages::CLEANED_UP);
+}
+
 /*
   Do what's needed when one invokes change user.
   Also used during THD::release_resources, i.e. prior to THD destruction.
@@ -965,7 +976,7 @@
   XID_STATE *xs = trn_ctx->xid_state();
 
   DBUG_TRACE;
-  assert(cleanup_done == 0);
+  assert(!is_cleanup_done());
   DEBUG_SYNC(this, "thd_cleanup_start");
 
   killed = KILL_CONNECTION;
@@ -1050,20 +1061,47 @@
     If we have a Security_context, make sure it is "logged out"
   */
 
-  cleanup_done = true;
+  if (m_thd_life_cycle_stage == enum_thd_life_cycle_stages::ACTIVE)
+    m_thd_life_cycle_stage = enum_thd_life_cycle_stages::ACTIVE_AND_CLEAN;
+  else
+    m_thd_life_cycle_stage = enum_thd_life_cycle_stages::CLEANED_UP;
+}
+
+bool THD::release_resources_done() const {
+  return m_thd_life_cycle_stage ==
+         enum_thd_life_cycle_stages::RESOURCES_RELEASED;
+}
+
+bool THD::is_being_disposed() const {
+#ifndef NDEBUG
+  if (current_thd != this) mysql_mutex_assert_owner(&LOCK_thd_data);
+#endif
+  return (m_thd_life_cycle_stage >=
+          enum_thd_life_cycle_stages::SCHEDULED_FOR_DISPOSAL);
+}
+
+void THD::start_disposal() {
+  mysql_mutex_assert_owner(&LOCK_thd_data);
+  assert(!is_being_disposed());
+
+  if (m_thd_life_cycle_stage == enum_thd_life_cycle_stages::ACTIVE_AND_CLEAN)
+    m_thd_life_cycle_stage = enum_thd_life_cycle_stages::CLEANED_UP;
+  else
+    m_thd_life_cycle_stage = enum_thd_life_cycle_stages::SCHEDULED_FOR_DISPOSAL;
 }
 
 /**
   Release most resources, prior to THD destruction.
  */
 void THD::release_resources() {
-  assert(m_release_resources_done == false);
-
   Global_THD_manager::get_instance()->release_thread_id(m_thread_id);
 
   /* Ensure that no one is using THD */
-  mysql_mutex_lock(&LOCK_thd_data);
   mysql_mutex_lock(&LOCK_query_plan);
+  mysql_mutex_lock(&LOCK_thd_data);
+
+  // Mark THD life cycle state as "SCHEDULED_FOR_DISPOSAL".
+  start_disposal();
 
   /* Close connection */
   if (is_classic_protocol() && get_protocol_classic()->get_vio()) {
@@ -1073,13 +1111,13 @@
 
   /* modification plan for UPDATE/DELETE should be freed. */
   assert(query_plan.get_modification_plan() == nullptr);
-  mysql_mutex_unlock(&LOCK_query_plan);
   mysql_mutex_unlock(&LOCK_thd_data);
+  mysql_mutex_unlock(&LOCK_query_plan);
   mysql_mutex_lock(&LOCK_thd_query);
   mysql_mutex_unlock(&LOCK_thd_query);
 
   stmt_map.reset(); /* close all prepared statements */
-  if (!cleanup_done) cleanup();
+  if (!is_cleanup_done()) cleanup();
 
   mdl_context.destroy();
   ha_close_connection(this);
@@ -1122,7 +1160,7 @@
 
   mysql_mutex_unlock(&LOCK_status);
 
-  m_release_resources_done = true;
+  m_thd_life_cycle_stage = enum_thd_life_cycle_stages::RESOURCES_RELEASED;
 }
 
 THD::~THD() {
@@ -1130,7 +1168,7 @@
   DBUG_TRACE;
   DBUG_PRINT("info", ("THD dtor, this %p", this));
 
-  if (!m_release_resources_done) release_resources();
+  if (!release_resources_done()) release_resources();
 
   clear_next_event_pos();
 
@@ -1144,14 +1182,17 @@
 
   my_free(const_cast<char *>(m_db.str));
   m_db = NULL_CSTR;
-  get_transaction()->free_memory(MYF(0));
+  get_transaction()->free_memory();
   mysql_mutex_destroy(&LOCK_query_plan);
   mysql_mutex_destroy(&LOCK_thd_data);
   mysql_mutex_destroy(&LOCK_thd_query);
   mysql_mutex_destroy(&LOCK_thd_sysvar);
   mysql_mutex_destroy(&LOCK_thd_protocol);
   mysql_mutex_destroy(&LOCK_current_cond);
+  mysql_mutex_destroy(&LOCK_group_replication_connection_mutex);
+
   mysql_cond_destroy(&COND_thr_lock);
+  mysql_cond_destroy(&COND_group_replication_connection_cond_var);
 #ifndef NDEBUG
   dbug_sentry = THD_SENTRY_GONE;
 #endif
@@ -1174,11 +1215,13 @@
   */
   unregister_slave(this, true, true);
 
-  free_root(&main_mem_root, MYF(0));
+  main_mem_root.Clear();
 
   if (m_token_array != nullptr) {
     my_free(m_token_array);
   }
+
+  m_thd_life_cycle_stage = enum_thd_life_cycle_stages::DISPOSED;
 }
 
 /**
@@ -1254,7 +1297,6 @@
         We also know that we will check thd->killed before we go for
         reading the next statement.
       */
-
       shutdown_active_vio();
     }
 
@@ -1561,13 +1603,15 @@
                          from_length, from_cs, 6);
     if (report_error) {
       my_error(ER_CANNOT_CONVERT_STRING, MYF(0), printable_buff,
-               from_cs->csname, to_cs->csname);
+               replace_utf8_utf8mb3(from_cs->csname),
+               replace_utf8_utf8mb3(to_cs->csname));
       return true;
     } else {
       push_warning_printf(this, Sql_condition::SL_WARNING,
                           ER_INVALID_CHARACTER_STRING,
                           ER_THD(this, ER_CANNOT_CONVERT_STRING),
-                          printable_buff, from_cs->csname, to_cs->csname);
+                          printable_buff, replace_utf8_utf8mb3(from_cs->csname),
+                          replace_utf8_utf8mb3(to_cs->csname));
     }
   }
 
@@ -2230,10 +2274,8 @@
   if (slave_thread && has_invoker()) {
     definer->user = m_invoker_user;
     definer->host = m_invoker_host;
-    definer->plugin.str = "";
-    definer->plugin.length = 0;
-    definer->auth.str = nullptr;
-    definer->auth.length = 0;
+    definer->first_factor_auth_info.plugin = EMPTY_CSTR;
+    definer->first_factor_auth_info.auth = {};
   } else
     get_default_definer(this, definer);
 }
@@ -2614,7 +2656,7 @@
   if (!error) da->set_is_sent(true);
 }
 
-void THD::claim_memory_ownership(bool claim MY_ATTRIBUTE((unused))) {
+void THD::claim_memory_ownership(bool claim [[maybe_unused]]) {
 #ifdef HAVE_PSI_MEMORY_INTERFACE
   /*
     Ownership of the THD object is transfered to this thread.
diff -Nru mysql-8.0-8.0.26/sql/sql_class.h mysql-8.0-8.0.27/sql/sql_class.h
--- mysql-8.0-8.0.26/sql/sql_class.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_class.h	2021-09-28 11:46:34.000000000 +0000
@@ -2622,11 +2622,56 @@
   ~THD() override;
 
   void release_resources();
-  bool release_resources_done() const { return m_release_resources_done; }
+  /**
+    @returns true if THD resources are released.
+  */
+  bool release_resources_done() const;
+  /**
+    Check if THD is being disposed (i.e. m_thd_life_cycle_stage >=
+    SCHEDULED_FOR_DISPOSAL)
+
+    Non-owner thread should acquire LOCK_thd_data to check THD state without
+    getting into races.
+
+    @returns true of THD is being disposed.
+  */
+  bool is_being_disposed() const;
 
  private:
-  bool m_release_resources_done;
-  bool cleanup_done;
+  /**
+    Represents life cycle stages of THD instance.
+    Stage transition in THD clean up:
+     1. ACTIVE -> ACTIVE_AND_CLEAN
+
+    Stage transition in THD disposal:
+     1. ACTIVE -> SCHEDULED_FOR_DISPOSAL -> CLEANED_UP -> RESOURCES_RELEASED
+                                                             -> DISPOSED.
+     2. ACTIVE_AND_CLEAN -> CLEANED_UP -> RESOURCES_RELEASED -> DISPOSED.
+  */
+  enum enum_thd_life_cycle_stages {
+    ACTIVE = 0,
+    ACTIVE_AND_CLEAN,
+    SCHEDULED_FOR_DISPOSAL,
+    CLEANED_UP,
+    RESOURCES_RELEASED,
+    DISPOSED
+  };
+  enum_thd_life_cycle_stages m_thd_life_cycle_stage{
+      enum_thd_life_cycle_stages::ACTIVE};
+
+  /**
+    Set THD in ACTIVE life stage to disposal stage.
+
+    To avoid race conditions with non-owner thread checking THD disposal state,
+    LOCK_thd_data should be acquired before changing THD stage to disposal
+    stage.
+  */
+  void start_disposal();
+
+  /**
+    @returns true if THD is cleaned up.
+  */
+  bool is_cleanup_done();
   void cleanup(void);
 
   void init(void);
@@ -3859,8 +3904,8 @@
     Set query to be displayed in performance schema (threads table etc.). Also
     mark the query safe to display for information_schema.process_list.
   */
-  void set_query_for_display(const char *query_arg MY_ATTRIBUTE((unused)),
-                             size_t query_length_arg MY_ATTRIBUTE((unused))) {
+  void set_query_for_display(const char *query_arg [[maybe_unused]],
+                             size_t query_length_arg [[maybe_unused]]) {
     // Set in pfs events statements table
     MYSQL_SET_STATEMENT_TEXT(m_statement_psi, query_arg,
                              static_cast<uint>(query_length_arg));
@@ -4417,6 +4462,8 @@
     @param thd parent session
   */
   void copy_table_access_properties(THD *thd);
+  mysql_mutex_t LOCK_group_replication_connection_mutex;
+  mysql_cond_t COND_group_replication_connection_cond_var;
 };
 
 /**
diff -Nru mysql-8.0-8.0.26/sql/sql_cmd_ddl_table.cc mysql-8.0-8.0.27/sql/sql_cmd_ddl_table.cc
--- mysql-8.0-8.0.26/sql/sql_cmd_ddl_table.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_cmd_ddl_table.cc	2021-09-28 11:46:34.000000000 +0000
@@ -111,7 +111,8 @@
 
   if (lock_tables(thd, lex->query_tables, lex->table_count, 0)) return true;
 
-  if (unit->optimize(thd, nullptr, true)) return true;
+  if (unit->optimize(thd, nullptr, true, /*finalize_access_paths=*/true))
+    return true;
 
   // Calculate the current statement cost.
   accumulate_statement_cost(lex);
diff -Nru mysql-8.0-8.0.26/sql/sql_const_folding.cc mysql-8.0-8.0.27/sql/sql_const_folding.cc
--- mysql-8.0-8.0.26/sql/sql_const_folding.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_const_folding.cc	2021-09-28 11:46:34.000000000 +0000
@@ -244,7 +244,7 @@
         break;
       }
     }
-      // fall-through
+      [[fallthrough]];
     case REAL_RESULT: {
       /*
         Try to convert to decimal. If that fails, we know the constant is out of
@@ -289,7 +289,7 @@
       }
       d = &dec;
     }
-      // fall-through
+      [[fallthrough]];
     case DECIMAL_RESULT: {
       /*
         If out of bounds of longlong, return RP_OUTSIDE_LOW or RP_OUTSIDE_HIGH
@@ -481,6 +481,8 @@
     case INT_RESULT: {
       my_decimal tmp;
       const auto *const d = (*const_val)->val_decimal(&tmp);
+      if (thd->is_error()) return true;
+      assert(d != nullptr);
       assert(decimal_actual_fraction(d) == 0);
       const int actual_intg = decimal_intg(d);
 
@@ -532,7 +534,7 @@
       }
       was_string_or_real = true;
     }
-      // fall-thru
+      [[fallthrough]];
     case DECIMAL_RESULT: {
       /*
         Decimal constant can have different range and precision
diff -Nru mysql-8.0-8.0.26/sql/sql_const.h mysql-8.0-8.0.27/sql/sql_const.h
--- mysql-8.0-8.0.26/sql/sql_const.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_const.h	2021-09-28 11:46:34.000000000 +0000
@@ -197,11 +197,7 @@
 
 #define STACK_MIN_SIZE_FOR_OPEN 1024 * 80
 
-#if defined(__SUNPRO_CC)
-#define STACK_BUFF_ALLOC 352 * 2  ///< For stack overrun checks
-#else
-#define STACK_BUFF_ALLOC 352  ///< For stack overrun checks
-#endif
+constexpr const int STACK_BUFF_ALLOC{352};  ///< For stack overrun checks
 
 #ifndef MYSQLD_NET_RETRY_COUNT
 #define MYSQLD_NET_RETRY_COUNT 10  ///< Abort read after this many int.
diff -Nru mysql-8.0-8.0.26/sql/sql_cursor.h mysql-8.0-8.0.27/sql/sql_cursor.h
--- mysql-8.0-8.0.26/sql/sql_cursor.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_cursor.h	2021-09-28 11:46:34.000000000 +0000
@@ -72,7 +72,7 @@
   virtual bool open(THD *thd) = 0;
   virtual bool fetch(ulong num_rows) = 0;
   virtual void close() = 0;
-  virtual ~Server_side_cursor() { free_root(&mem_root, MYF(0)); }
+  virtual ~Server_side_cursor() { mem_root.Clear(); }
   static void *operator new(size_t size, MEM_ROOT *mem_root,
                             const std::nothrow_t & = std::nothrow) noexcept {
     return mem_root->Alloc(size);
diff -Nru mysql-8.0-8.0.26/sql/sql_data_change.h mysql-8.0-8.0.27/sql/sql_data_change.h
--- mysql-8.0-8.0.26/sql/sql_data_change.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_data_change.h	2021-09-28 11:46:34.000000000 +0000
@@ -277,7 +277,7 @@
                   my_error has already been called so the calling function
                   only needs to bail out.
   */
-  bool set_function_defaults(TABLE *table);
+  [[nodiscard]] bool set_function_defaults(TABLE *table);
 
   /**
      Adds the columns that are bound to receive default values from a function
diff -Nru mysql-8.0-8.0.26/sql/sql_delete.cc mysql-8.0-8.0.27/sql/sql_delete.cc
--- mysql-8.0-8.0.26/sql/sql_delete.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_delete.cc	2021-09-28 11:46:34.000000000 +0000
@@ -37,6 +37,7 @@
 #include "my_sys.h"
 #include "mysql_com.h"
 #include "mysqld_error.h"
+#include "scope_guard.h"
 #include "sql/auth/auth_acls.h"
 #include "sql/auth/auth_common.h"  // check_table_access
 #include "sql/binlog.h"            // mysql_bin_log
@@ -51,9 +52,10 @@
 #include "sql/mysqld.h"       // stage_...
 #include "sql/opt_explain.h"  // Modification_plan
 #include "sql/opt_explain_format.h"
-#include "sql/opt_range.h"  // prune_partitions
 #include "sql/opt_trace.h"  // Opt_trace_object
 #include "sql/query_options.h"
+#include "sql/range_optimizer/partition_pruning.h"
+#include "sql/range_optimizer/range_optimizer.h"  // prune_partitions
 #include "sql/records.h"  // unique_ptr_destroy_only<RowIterator>
 #include "sql/row_iterator.h"
 #include "sql/sorting_iterator.h"
@@ -181,8 +183,16 @@
       table->triggers->has_triggers(TRG_EVENT_DELETE, TRG_ACTION_AFTER);
   unit->set_limit(thd, query_block);
 
-  QEP_TAB_standalone qep_tab_st;
-  QEP_TAB &qep_tab = qep_tab_st.as_QEP_TAB();
+  QUICK_SELECT_I *quick = nullptr;
+  join_type type = JT_UNKNOWN;
+
+  auto cleanup = create_scope_guard([&quick, table] {
+    destroy(quick);
+    table->set_keyread(false);
+    table->file->ha_index_or_rnd_end();
+    free_io_cache(table);
+    filesort_free_buffers(table, true);
+  });
 
   ha_rows limit = unit->select_limit_cnt;
   const bool using_limit = limit != HA_POS_ERROR;
@@ -340,12 +350,9 @@
 
   table->covering_keys.clear_all();
 
-  qep_tab.set_table(table);
-  qep_tab.set_condition(conds);
-
   if (conds &&
       thd->optimizer_switch_flag(OPTIMIZER_SWITCH_ENGINE_CONDITION_PUSHDOWN)) {
-    table->file->cond_push(conds, false);
+    table->file->cond_push(conds);
   }
 
   {  // Enter scope for optimizer trace wrapper
@@ -354,12 +361,13 @@
 
     if (!no_rows && conds != nullptr) {
       Key_map keys_to_use(Key_map::ALL_BITS), needed_reg_dummy;
-      QUICK_SELECT_I *qck;
+      MEM_ROOT temp_mem_root(key_memory_test_quick_select_exec,
+                             thd->variables.range_alloc_block_size);
       no_rows = test_quick_select(
-                    thd, keys_to_use, 0, limit, safe_update, ORDER_NOT_RELEVANT,
-                    &qep_tab, conds, &needed_reg_dummy, &qck,
-                    qep_tab.table()->force_index, query_block) < 0;
-      qep_tab.set_quick(qck);
+                    thd, thd->mem_root, &temp_mem_root, keys_to_use, 0, 0,
+                    limit, safe_update, ORDER_NOT_RELEVANT, table,
+                    /*skip_records_in_range=*/false, conds, &needed_reg_dummy,
+                    &quick, table->force_index, query_block) < 0;
     }
     if (thd->is_error())  // test_quick_select() has improper error propagation
       return true;
@@ -401,8 +409,12 @@
     if (conds != nullptr) table->update_const_key_parts(conds);
     order = simple_remove_const(order, conds);
     ORDER_with_src order_src(order, ESC_ORDER_BY);
-    usable_index =
-        get_index_for_order(&order_src, &qep_tab, limit, &need_sort, &reverse);
+    usable_index = get_index_for_order(&order_src, table, limit, &quick,
+                                       &need_sort, &reverse);
+    if (quick != nullptr) {
+      // May have been changed by get_index_for_order().
+      type = calc_join_type(quick->get_type());
+    }
   }
 
   // Reaching here only when table must be accessed
@@ -410,18 +422,16 @@
 
   {
     ha_rows rows;
-    if (qep_tab.quick())
-      rows = qep_tab.quick()->records;
+    if (quick)
+      rows = quick->records;
     else if (!conds && !need_sort && limit != HA_POS_ERROR)
       rows = limit;
     else {
       delete_table_ref->fetch_number_of_rows();
       rows = table->file->stats.records;
     }
-    qep_tab.set_quick_optim();
-    qep_tab.set_condition_optim();
-    Modification_plan plan(thd, MT_DELETE, &qep_tab, usable_index, limit, false,
-                           need_sort, false, rows);
+    Modification_plan plan(thd, MT_DELETE, table, type, quick, conds,
+                           usable_index, limit, false, need_sort, false, rows);
     DEBUG_SYNC(thd, "planned_single_delete");
 
     if (lex->is_explain()) {
@@ -436,9 +446,11 @@
     unique_ptr_destroy_only<Filesort> fsort;
     JOIN join(thd, query_block);  // Only for holding examined_rows.
     AccessPath *path;
-    if (usable_index == MAX_KEY || qep_tab.quick()) {
-      path = create_table_access_path(thd, nullptr, &qep_tab,
-                                      /*count_examined_rows=*/true);
+    if (usable_index == MAX_KEY || quick) {
+      path =
+          create_table_access_path(thd, table, quick,
+                                   /*table_ref=*/nullptr, /*position=*/nullptr,
+                                   /*count_examined_rows=*/true);
     } else {
       empty_record(table);
       path = NewIndexScanAccessPath(thd, table, usable_index,
@@ -450,20 +462,19 @@
     if (need_sort) {
       assert(usable_index == MAX_KEY);
 
-      if (qep_tab.condition() != nullptr) {
-        path = NewFilterAccessPath(thd, path, qep_tab.condition());
+      if (conds != nullptr) {
+        path = NewFilterAccessPath(thd, path, conds);
       }
 
       fsort.reset(new (thd->mem_root) Filesort(
           thd, {table}, /*keep_buffers=*/false, order, HA_POS_ERROR,
-          /*force_stable_sort=*/false,
           /*remove_duplicates=*/false,
           /*force_sort_positions=*/true, /*unwrap_rollup=*/false));
       path = NewSortAccessPath(thd, path, fsort.get(),
                                /*count_examined_rows=*/false);
       iterator = CreateIteratorFromAccessPath(thd, path, &join,
                                               /*eligible_for_batch_mode=*/true);
-      // Prevent cleanup in JOIN::destroy() and QEP_shared_owner::qs_cleanup(),
+      // Prevent cleanup in JOIN::destroy() and in the cleanup condition guard,
       // to avoid double-destroy of the SortingIterator.
       table->sorting_iterator = nullptr;
       if (iterator == nullptr || iterator->Init()) return true;
@@ -473,11 +484,11 @@
         Filesort has already found and selected the rows we want to delete,
         so we don't need the where clause
       */
-      qep_tab.set_condition(nullptr);
+      conds = nullptr;
     } else {
       iterator = CreateIteratorFromAccessPath(thd, path, &join,
                                               /*eligible_for_batch_mode=*/true);
-      // Prevent cleanup in JOIN::destroy() and QEP_shared_owner::qs_cleanup(),
+      // Prevent cleanup in JOIN::destroy() and in the cleanup condition guard,
       // to avoid double-destroy of the SortingIterator.
       table->sorting_iterator = nullptr;
       if (iterator->Init()) return true;
@@ -504,9 +515,9 @@
     if (thd->is_error()) return true;
 
     if ((table->file->ha_table_flags() & HA_READ_BEFORE_WRITE_REMOVAL) &&
-        !using_limit && !has_delete_triggers && qep_tab.quick() &&
-        qep_tab.quick()->index != MAX_KEY)
-      read_removal = table->check_read_removal(qep_tab.quick()->index);
+        !using_limit && !has_delete_triggers && quick &&
+        quick->index != MAX_KEY)
+      read_removal = table->check_read_removal(quick->index);
 
     assert(limit > 0);
 
@@ -516,8 +527,8 @@
       assert(!thd->is_error());
       thd->inc_examined_row_count(1);
 
-      if (qep_tab.condition() != nullptr) {
-        const bool skip_record = qep_tab.condition()->val_int() == 0;
+      if (conds != nullptr) {
+        const bool skip_record = conds->val_int() == 0;
         if (thd->is_error()) {
           error = 1;
           break;
@@ -978,8 +989,6 @@
     *(table_ptr++) = table;
   }
 
-  if (select->has_ft_funcs() && init_ftfuncs(thd, select)) return true;
-
   assert(!thd->is_error());
 
   return false;
@@ -1184,7 +1193,7 @@
     been deleted by foreign key handling
   */
   unique_ptr_destroy_only<RowIterator> iterator =
-      init_table_iterator(thd, table, nullptr, /*ignore_not_found_rows=*/true,
+      init_table_iterator(thd, table, /*ignore_not_found_rows=*/true,
                           /*count_examined_rows=*/false);
   if (iterator == nullptr) return 1;
   bool will_batch = !table->file->start_bulk_delete();
diff -Nru mysql-8.0-8.0.26/sql/sql_derived.cc mysql-8.0-8.0.27/sql/sql_derived.cc
--- mysql-8.0-8.0.26/sql/sql_derived.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_derived.cc	2021-09-28 11:46:34.000000000 +0000
@@ -240,6 +240,10 @@
   return false;
 }
 
+void Common_table_expr::remove_table(TABLE_LIST *tr) {
+  (void)tmp_tables.erase_value(tr);
+}
+
 /**
   Resolve a derived table or view reference, including recursively resolving
   contained subqueries.
@@ -1006,6 +1010,14 @@
       return nullptr;
   }
 
+  // Pushing in2exists conditions down into other query blocks
+  // could cause them to get lost, as Item_subselect would not know
+  // where to remove them from. They're a very rare case to have pushable,
+  // so simply refuse pushing them.
+  if (cond->created_by_in2exists()) {
+    return nullptr;
+  }
+
   // Mark the condition as it passed the checks
   cond->marker = Item::MARKER_COND_DERIVED_TABLE;
   return cond;
@@ -1154,7 +1166,7 @@
   if (view_ref) {
     (*cond) = (*cond)->transform(&Item::replace_view_refs_with_clone,
                                  pointer_cast<uchar *>(m_derived_table));
-    if (cond == nullptr) return true;
+    if (*cond == nullptr) return true;
   }
   Item *new_cond =
       is_having ? (*cond)->transform(&Item::replace_with_derived_expr_ref,
@@ -1301,6 +1313,14 @@
   having ? derived_query_block->set_having_cond(derived_cond)
          : derived_query_block->set_where_cond(derived_cond);
   thd->lex->set_current_query_block(saved_query_block);
+  // Need to call setup_ftfuncs() if we have pushed down a condition having
+  // full text function.
+  if (derived_query_block->has_ft_funcs() &&
+      HasFullTextFunction(cond_to_attach)) {
+    if (setup_ftfuncs(thd, derived_query_block)) {
+      return true;
+    }
+  }
   return false;
 }
 
@@ -1335,7 +1355,9 @@
     }
   }
 
-  if (unit->optimize(thd, table, /*create_iterators=*/false) || thd->is_error())
+  if (unit->optimize(thd, table, /*create_iterators=*/false,
+                     /*finalize_access_paths=*/true) ||
+      thd->is_error())
     return true;
 
   // If the table is const, materialize it now. The hypergraph optimizer
diff -Nru mysql-8.0-8.0.26/sql/sql_digest.cc mysql-8.0-8.0.27/sql/sql_digest.cc
--- mysql-8.0-8.0.26/sql/sql_digest.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_digest.cc	2021-09-28 11:46:34.000000000 +0000
@@ -453,7 +453,8 @@
         }
       } while (found_unary);
     }
-    /* fall through, for case NULL_SYM below */
+      /* fall through, for case NULL_SYM below */
+      [[fallthrough]];
     case LEX_HOSTNAME:
     case TEXT_STRING:
     case NCHAR_STRING:
diff -Nru mysql-8.0-8.0.26/sql/sql_error.cc mysql-8.0-8.0.27/sql/sql_error.cc
--- mysql-8.0-8.0.26/sql/sql_error.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_error.cc	2021-09-28 11:46:34.000000000 +0000
@@ -351,7 +351,7 @@
   m_message_text[0] = '\0';
 }
 
-Diagnostics_area::~Diagnostics_area() { free_root(&m_condition_root, MYF(0)); }
+Diagnostics_area::~Diagnostics_area() { m_condition_root.Clear(); }
 
 void Diagnostics_area::reset_diagnostics_area() {
   DBUG_TRACE;
@@ -498,7 +498,7 @@
 
   m_conditions_list.clear();
   m_preexisting_sql_conditions.clear();
-  free_root(&m_condition_root, MYF(0));
+  m_condition_root.Clear();
   memset(m_current_statement_cond_count_by_qb, 0,
          sizeof(m_current_statement_cond_count_by_qb));
   m_current_statement_cond_count = 0;
diff -Nru mysql-8.0-8.0.26/sql/sql_executor.cc mysql-8.0-8.0.27/sql/sql_executor.cc
--- mysql-8.0-8.0.26/sql/sql_executor.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_executor.cc	2021-09-28 11:46:34.000000000 +0000
@@ -74,7 +74,7 @@
 #include "sql/item_sum.h"  // Item_sum
 #include "sql/join_optimizer/access_path.h"
 #include "sql/join_optimizer/bit_utils.h"
-#include "sql/join_optimizer/estimate_filter_cost.h"
+#include "sql/join_optimizer/cost_model.h"
 #include "sql/join_optimizer/join_optimizer.h"
 #include "sql/join_optimizer/materialize_path_parameters.h"
 #include "sql/join_optimizer/relational_expression.h"
@@ -88,11 +88,11 @@
 #include "sql/nested_join.h"
 #include "sql/opt_costmodel.h"
 #include "sql/opt_explain_format.h"
-#include "sql/opt_range.h"  // QUICK_SELECT_I
 #include "sql/opt_trace.h"  // Opt_trace_object
 #include "sql/opt_trace_context.h"
 #include "sql/query_options.h"
-#include "sql/record_buffer.h"  // Record_buffer
+#include "sql/range_optimizer/range_optimizer.h"  // QUICK_SELECT_I
+#include "sql/record_buffer.h"                    // Record_buffer
 #include "sql/records.h"
 #include "sql/ref_row_iterators.h"
 #include "sql/row_iterator.h"
@@ -252,7 +252,6 @@
 
     if (m_ordered_index_usage != ORDERED_INDEX_GROUP_BY &&
         add_sorting_to_table(const_tables, &group_list,
-                             /*force_stable_sort=*/false,
                              /*sort_before_group=*/true))
       goto err;
 
@@ -282,7 +281,6 @@
 
       if (m_ordered_index_usage != ORDERED_INDEX_ORDER_BY &&
           add_sorting_to_table(const_tables, &order,
-                               /*force_stable_sort=*/false,
                                /*sort_before_group=*/false))
         goto err;
       order.clean();
@@ -417,7 +415,7 @@
 /** Update record 0 in tmp_table from record 1. */
 
 void update_tmptable_sum_func(Item_sum **func_ptr,
-                              TABLE *tmp_table MY_ATTRIBUTE((unused))) {
+                              TABLE *tmp_table [[maybe_unused]]) {
   DBUG_TRACE;
   Item_sum *func;
   while ((func = *(func_ptr++))) func->update_field();
@@ -491,10 +489,8 @@
     if (item_equal->update_const(thd)) return true;
     if (!contained_const && item_equal->get_const()) {
       /* Update keys for range analysis */
-      Item_equal_iterator it(*item_equal);
-      Item_field *item_field;
-      while ((item_field = it++)) {
-        const Field *field = item_field->field;
+      for (Item_field &item_field : item_equal->get_fields()) {
+        const Field *field = item_field.field;
         JOIN_TAB *stat = field->table->reginfo.join_tab;
         Key_map possible_keys = field->key_start;
         possible_keys.intersect(field->table->keys_in_use_for_query);
@@ -509,7 +505,7 @@
         if (!possible_keys.is_clear_all()) {
           TABLE *const table = field->table;
           for (Key_use *use = stat->keyuse();
-               use && use->table_ref == item_field->table_ref; use++) {
+               use && use->table_ref == item_field.table_ref; use++) {
             if (possible_keys.is_set(use->key) &&
                 table->key_info[use->key].key_part[use->keypart].field == field)
               table->const_key_parts[use->key] |= use->keypart_map;
@@ -759,6 +755,20 @@
   return any_mrr_paths;
 }
 
+Item *CreateConjunction(List<Item> *items) {
+  if (items->size() == 0) {
+    return nullptr;
+  } else if (items->size() == 1) {
+    return items->head();
+  } else {
+    Item *condition = new Item_cond_and(*items);
+    condition->quick_fix_field();
+    condition->update_used_tables();
+    condition->apply_is_true();
+    return condition;
+  }
+}
+
 /**
   Return a new iterator that wraps "iterator" and that tests all of the given
   conditions (if any), ANDed together. If there are no conditions, just return
@@ -791,16 +801,9 @@
     }
   }
 
-  Item *condition = nullptr;
-  if (items.size() == 0) {
+  Item *condition = CreateConjunction(&items);
+  if (condition == nullptr) {
     return path;
-  } else if (items.size() == 1) {
-    condition = items.head();
-  } else {
-    condition = new Item_cond_and(items);
-    condition->quick_fix_field();
-    condition->update_used_tables();
-    condition->apply_is_true();
   }
   *conditions_depend_on_outer_tables |= condition->used_tables();
 
@@ -839,7 +842,7 @@
   invalidator->num_output_rows = path->num_output_rows;
   invalidator->cost = path->cost;
 
-  QEP_TAB *tab2 = qep_tab->join()->map2qep_tab[table_index_to_invalidate];
+  QEP_TAB *tab2 = &qep_tab->join()->qep_tab[table_index_to_invalidate];
   if (tab2->invalidators == nullptr) {
     tab2->invalidators =
         new (thd->mem_root) Mem_root_array<const AccessPath *>(thd->mem_root);
@@ -879,12 +882,6 @@
                                                          right_table_map);
       }
     } else if (item->type() == Item::FIELD_ITEM) {
-      if (ref->key_copy[part_no] == nullptr ||
-          ref->key_copy[part_no]->name() == STORE_KEY_CONST_NAME) {
-        // A constant, so no need to propagate.
-        continue;
-      }
-
       bool dummy;
       Item_equal *item_eq = find_item_equal(
           table_list->cond_equal, down_cast<Item_field *>(item), &dummy);
@@ -895,8 +892,6 @@
 
       item->walk(&Item::ensure_multi_equality_fields_are_available_walker,
                  enum_walk::POSTFIX, pointer_cast<uchar *>(&left_table_map));
-      down_cast<store_key_field *>(ref->key_copy[part_no])
-          ->replace_from_field(down_cast<Item_field *>(item)->field);
     }
   }
 
@@ -1421,6 +1416,69 @@
       qep_tab->invalidators, /*need_rowid=*/false, table_path);
 }
 
+AccessPath *MoveCompositeIteratorsFromTablePath(AccessPath *path) {
+  AccessPath *table_path = path->materialize().table_path;
+  AccessPath *bottom_of_table_path = nullptr;
+  const auto scan_functor = [&bottom_of_table_path, path](AccessPath *sub_path,
+                                                          const JOIN *) {
+    switch (sub_path->type) {
+      case AccessPath::TABLE_SCAN:
+      case AccessPath::REF:
+      case AccessPath::REF_OR_NULL:
+      case AccessPath::EQ_REF:
+      case AccessPath::ALTERNATIVE:
+      case AccessPath::CONST_TABLE:
+        // We found our real bottom.
+        path->materialize().table_path = sub_path;
+        return true;
+      default:
+        // New possible bottom, so keep going.
+        bottom_of_table_path = sub_path;
+        return false;
+    }
+  };
+  WalkAccessPaths(table_path, /*join=*/nullptr,
+                  WalkAccessPathPolicy::ENTIRE_TREE, scan_functor);
+  if (bottom_of_table_path != nullptr) {
+    switch (bottom_of_table_path->type) {
+      case AccessPath::FILTER:
+        bottom_of_table_path->filter().child = path;
+        break;
+      case AccessPath::SORT:
+        bottom_of_table_path->sort().child = path;
+        break;
+      case AccessPath::LIMIT_OFFSET:
+        bottom_of_table_path->limit_offset().child = path;
+        break;
+
+      // It's a bit odd to have STREAM and MATERIALIZE nodes
+      // inside table_path, but it happens when we have UNION with
+      // with ORDER BY on nondeterminisic predicates, or INSERT
+      // which requires buffering. It should be safe move it
+      // out of table_path nevertheless.
+      case AccessPath::STREAM:
+        bottom_of_table_path->stream().child = path;
+        break;
+      case AccessPath::MATERIALIZE:
+        assert(bottom_of_table_path->materialize().param->query_blocks.size() ==
+               1);
+        bottom_of_table_path->materialize()
+            .param->query_blocks[0]
+            .subquery_path = path;
+        break;
+      default:
+        assert(false);
+    }
+
+    // This isn't strictly accurate, but helps propagate information
+    // better throughout the tree nevertheless.
+    CopyBasicProperties(*path, table_path);
+
+    path = table_path;
+  }
+  return path;
+}
+
 AccessPath *GetAccessPathForDerivedTable(
     THD *thd, TABLE_LIST *table_ref, TABLE *table, bool rematerialize,
     Mem_root_array<const AccessPath *> *invalidators, bool need_rowid,
@@ -1473,7 +1531,8 @@
         query_expression->offset_limit_cnt == 0
             ? query_expression->m_reject_multiple_rows
             : false);
-    EstimateMaterializeCost(path);
+    EstimateMaterializeCost(thd, path);
+    path = MoveCompositeIteratorsFromTablePath(path);
     if (query_expression->offset_limit_cnt != 0) {
       // LIMIT is handled inside MaterializeIterator, but OFFSET is not.
       // SQL_CALC_FOUND_ROWS cannot occur in a derived table's definition.
@@ -1514,7 +1573,8 @@
         query_expression,
         /*ref_slice=*/-1, rematerialize, tmp_table_param->end_write_records,
         query_expression->m_reject_multiple_rows);
-    EstimateMaterializeCost(path);
+    EstimateMaterializeCost(thd, path);
+    path = MoveCompositeIteratorsFromTablePath(path);
   }
 
   path->cost_before_filter = path->cost;
@@ -1609,7 +1669,7 @@
         /*ref_slice=*/-1, qep_tab->rematerialize,
         sjm->table_param.end_write_records,
         /*reject_multiple_rows=*/false);
-    EstimateMaterializeCost(table_path);
+    EstimateMaterializeCost(thd, table_path);
 
 #ifndef NDEBUG
     // Make sure we clear this table out when the join is reset,
@@ -1941,8 +2001,10 @@
   // We also remove the join conditions, to avoid using time on extracting their
   // hash values. (Also, Item_func_eq::append_join_key_for_hash_join has an
   // assert that this case should never happen, so it would trigger.)
-  const table_map probe_used_tables = GetUsedTableMap(probe_path);
-  const table_map build_used_tables = GetUsedTableMap(build_path);
+  const table_map probe_used_tables =
+      GetUsedTableMap(probe_path, /*include_pruned_tables=*/false);
+  const table_map build_used_tables =
+      GetUsedTableMap(build_path, /*include_pruned_tables=*/false);
   for (const HashJoinCondition &condition : hash_join_conditions) {
     if ((!condition.left_uses_any_table(probe_used_tables) &&
          !condition.right_uses_any_table(probe_used_tables)) ||
@@ -2268,8 +2330,8 @@
     // into one invalidator.
     for (auto it = pending_invalidators->begin();
          it != pending_invalidators->end();) {
-      assert(path != nullptr);
       if (it->table_index_to_invalidate < last_idx) {
+        assert(path != nullptr);
         path = NewInvalidatorAccessPathForTable(thd, path, it->qep_tab,
                                                 it->table_index_to_invalidate);
         it = pending_invalidators->erase(it);
@@ -2817,7 +2879,8 @@
       if (qep_tab->op_type == QEP_TAB::OT_MATERIALIZE) {
         qep_tab->table()->alias = "<temporary>";
         AccessPath *table_path =
-            create_table_access_path(thd, nullptr, qep_tab,
+            create_table_access_path(thd, qep_tab->table(), qep_tab->quick(),
+                                     qep_tab->table_ref, qep_tab->position(),
                                      /*count_examined_rows=*/false);
         path = NewMaterializeAccessPath(
             thd,
@@ -2828,7 +2891,7 @@
             /*cte=*/nullptr, query_expression(), qep_tab->ref_item_slice,
             /*rematerialize=*/true, qep_tab->tmp_table_param->end_write_records,
             /*reject_multiple_rows=*/false);
-        EstimateMaterializeCost(path);
+        EstimateMaterializeCost(thd, path);
       }
     }
   } else {
@@ -2968,27 +3031,26 @@
         // Switch to the right slice if applicable, so that we fetch out the
         // correct items from order_arg.
         Switch_ref_item_slice slice_switch(this, qep_tab->ref_item_slice);
-        dup_filesort = new (thd->mem_root)
-            Filesort(thd, {qep_tab->table()}, /*keep_buffers=*/false, order,
-                     HA_POS_ERROR, /*force_stable_sort=*/false,
-                     /*remove_duplicates=*/true, force_sort_positions,
-                     /*unwrap_rollup=*/false);
+        dup_filesort = new (thd->mem_root) Filesort(
+            thd, {qep_tab->table()}, /*keep_buffers=*/false, order,
+            HA_POS_ERROR, /*remove_duplicates=*/true, force_sort_positions,
+            /*unwrap_rollup=*/false);
 
         if (desired_order != nullptr && filesort == nullptr) {
           // We picked up the desired order from the first table, but we cannot
           // reuse its Filesort object, as it would get the wrong slice and
           // potentially addon fields. Create a new one.
-          filesort = new (thd->mem_root)
-              Filesort(thd, {qep_tab->table()}, /*keep_buffers=*/false,
-                       desired_order, HA_POS_ERROR, /*force_stable_sort=*/false,
-                       /*remove_duplicates=*/false, force_sort_positions,
-                       /*unwrap_rollup=*/false);
+          filesort = new (thd->mem_root) Filesort(
+              thd, {qep_tab->table()}, /*keep_buffers=*/false, desired_order,
+              HA_POS_ERROR, /*remove_duplicates=*/false, force_sort_positions,
+              /*unwrap_rollup=*/false);
         }
       }
     }
 
     AccessPath *table_path =
-        create_table_access_path(thd, nullptr, qep_tab,
+        create_table_access_path(thd, qep_tab->table(), qep_tab->quick(),
+                                 qep_tab->table_ref, qep_tab->position(),
                                  /*count_examined_rows=*/false);
     qep_tab->table()->alias = "<temporary>";
 
@@ -3007,7 +3069,7 @@
             /*ref_slice=*/-1,
             /*rematerialize=*/true, tmp_table_param.end_write_records,
             /*reject_multiple_rows=*/false);
-        EstimateMaterializeCost(path);
+        EstimateMaterializeCost(thd, path);
       }
     } else if (qep_tab->op_type == QEP_TAB::OT_AGGREGATE_INTO_TMP_TABLE) {
       path = NewTemptableAggregateAccessPath(
@@ -3053,7 +3115,7 @@
             /*cte=*/nullptr, query_expression(), qep_tab->ref_item_slice,
             /*rematerialize=*/true, qep_tab->tmp_table_param->end_write_records,
             /*reject_multiple_rows=*/false);
-        EstimateMaterializeCost(path);
+        EstimateMaterializeCost(thd, path);
       }
     }
 
@@ -3246,8 +3308,9 @@
       Other error than duplicate error: Attempt to create a temporary table.
     */
     bool is_duplicate;
-    if (create_ondisk_from_heap(thd, sjtbl->tmp_table, error, true,
-                                &is_duplicate))
+    if (create_ondisk_from_heap(thd, sjtbl->tmp_table, error,
+                                /*insert_last_record=*/true,
+                                /*ignore_last_dup=*/true, &is_duplicate))
       return -1;
     return is_duplicate ? 1 : 0;
   }
@@ -3299,16 +3362,6 @@
   return false;
 }
 
-int safe_index_read(QEP_TAB *tab) {
-  int error;
-  TABLE *table = tab->table();
-  if ((error = table->file->ha_index_read_map(
-           table->record[0], tab->ref().key_buff,
-           make_prev_keypart_map(tab->ref().key_parts), HA_READ_KEY_EXACT)))
-    return report_handler_error(table, error);
-  return 0;
-}
-
 /**
    Reads content of constant table
    @param tab  table
@@ -3872,12 +3925,20 @@
                                            ha_rows *examined_rows)
     : TableRowIterator(thd, table),
       m_qep_tab(qep_tab),
+      m_mem_root(key_memory_test_quick_select_exec,
+                 thd->variables.range_alloc_block_size),
       m_examined_rows(examined_rows),
       m_read_set_without_base_columns(table->read_set) {
   add_virtual_gcol_base_cols(table, thd->mem_root,
                              &m_read_set_with_base_columns);
 }
 
+DynamicRangeIterator::~DynamicRangeIterator() {
+  // This is owned by our MEM_ROOT.
+  destroy(m_qep_tab->quick());
+  m_qep_tab->set_quick(nullptr);
+}
+
 bool DynamicRangeIterator::Init() {
   Opt_trace_context *const trace = &thd()->opt_trace;
   const bool disable_trace =
@@ -3892,21 +3953,13 @@
   trace_table.add_utf8_table(m_qep_tab->table_ref);
 
   Key_map needed_reg_dummy;
-  QUICK_SELECT_I *old_qck = m_qep_tab->quick();
   QUICK_SELECT_I *qck;
+  // In execution, range estimation is done for each row,
+  // so we can access previous tables.
+  table_map const_tables = m_qep_tab->join()->found_const_table_map;
+  table_map read_tables =
+      m_qep_tab->prefix_tables() & ~m_qep_tab->added_tables();
   DEBUG_SYNC(thd(), "quick_not_created");
-  const int rc = test_quick_select(
-      thd(), m_qep_tab->keys(),
-      0,  // empty table map
-      HA_POS_ERROR,
-      false,  // don't force quick range
-      ORDER_NOT_RELEVANT, m_qep_tab, m_qep_tab->condition(), &needed_reg_dummy,
-      &qck, m_qep_tab->table()->force_index, m_qep_tab->join()->query_block);
-  if (thd()->is_error())  // @todo consolidate error reporting of
-                          // test_quick_select
-    return true;
-  assert(old_qck == nullptr || old_qck != qck);
-  m_qep_tab->set_quick(qck);
 
   /*
     EXPLAIN CONNECTION is used to understand why a query is currently taking
@@ -3918,12 +3971,40 @@
 
   DEBUG_SYNC(thd(), "quick_created_before_mutex");
 
+  // We're about to destroy the MEM_ROOT containing the old quick, below.
+  // But we cannot run test_quick_select() under the plan lock, since it might
+  // want to evaluate a subquery that in itself has a DynamicRangeIterator(),
+  // and the plan lock is not recursive. So we set a different plan temporarily
+  // while we are calculating the new one, so that EXPLAIN FOR CONNECTION
+  // does not read bad data.
   thd()->lock_query_plan();
+  m_qep_tab->set_type(JT_UNKNOWN);
+  thd()->unlock_query_plan();
+
+  QUICK_SELECT_I *old_qck = m_qep_tab->quick();
+  destroy(old_qck);
+  m_qep_tab->set_quick(nullptr);
+  m_mem_root.ClearForReuse();
+
+  const int rc = test_quick_select(
+      thd(), &m_mem_root, &m_mem_root, m_qep_tab->keys(), const_tables,
+      read_tables, HA_POS_ERROR,
+      false,  // don't force quick range
+      ORDER_NOT_RELEVANT, m_qep_tab->table(),
+      m_qep_tab->skip_records_in_range(), m_qep_tab->condition(),
+      &needed_reg_dummy, &qck, m_qep_tab->table()->force_index,
+      m_qep_tab->join()->query_block);
+  if (thd()->is_error())  // @todo consolidate error reporting of
+                          // test_quick_select
+  {
+    return true;
+  }
+
+  thd()->lock_query_plan();
+  m_qep_tab->set_quick(qck);
   m_qep_tab->set_type(qck ? calc_join_type(qck->get_type()) : JT_ALL);
-  m_qep_tab->set_quick_optim();
   thd()->unlock_query_plan();
 
-  delete old_qck;
   DEBUG_SYNC(thd(), "quick_droped_after_mutex");
 
   // Clear out and destroy any old iterators before we start constructing
@@ -4003,16 +4084,56 @@
 FullTextSearchIterator::FullTextSearchIterator(THD *thd, TABLE *table,
                                                TABLE_REF *ref,
                                                Item_func_match *ft_func,
-                                               bool use_order,
+                                               bool use_order, bool use_limit,
                                                ha_rows *examined_rows)
     : TableRowIterator(thd, table),
       m_ref(ref),
       m_ft_func(ft_func),
       m_use_order(use_order),
-      m_examined_rows(examined_rows) {}
+      m_use_limit(use_limit),
+      m_examined_rows(examined_rows) {
+  // Mark the full-text search function as used for index scan, if using the
+  // hypergraph optimizer. The old optimizer uses heuristics to determine if a
+  // full-text index scan should be used, and can set this flag the moment it
+  // decides it should use an index scan. The hypergraph optimizer, on the other
+  // hand, maintains alternative plans with and without index scans throughout
+  // the planning, and doesn't determine whether it should use the indexed or
+  // non-indexed plan until the full query plan has been constructed.
+  if (thd->lex->using_hypergraph_optimizer) {
+    // Should not already be enabled.
+    assert(!ft_func->score_from_index_scan);
+    // Should operate on the main object.
+    assert(ft_func->get_master() == ft_func);
+
+    // Mark the MATCH function as a source for a full-text index scan.
+    ft_func->score_from_index_scan = true;
+
+    if (table->covering_keys.is_set(ft_func->key) && !table->no_keyread) {
+      // The index is covering. Tell the storage engine that it can do an
+      // index-only scan.
+      table->set_keyread(true);
+    }
+
+    // Enable ordering of the results on relevance, if requested.
+    if (use_order) {
+      ft_func->get_hints()->set_hint_flag(FT_SORTED);
+    }
+
+    // Propagate the limit to the storage engine, if requested.
+    if (use_limit) {
+      ft_func->get_hints()->set_hint_limit(
+          ft_func->table_ref->query_block->join->m_select_limit);
+    }
+  }
+
+  assert(ft_func->score_from_index_scan);
+}
 
 FullTextSearchIterator::~FullTextSearchIterator() {
   table()->file->ha_index_or_rnd_end();
+  if (table()->key_read) {
+    table()->set_keyread(false);
+  }
 }
 
 bool FullTextSearchIterator::Init() {
@@ -4203,9 +4324,10 @@
       break;
 
     case JT_FT:
-      path = NewFullTextSearchAccessPath(join()->thd, table(), &ref(),
-                                         ft_func(), use_order(),
-                                         /*count_examined_rows=*/true);
+      path = NewFullTextSearchAccessPath(
+          join()->thd, table(), &ref(), ft_func(), use_order(),
+          ft_func()->get_hints()->get_limit() != HA_POS_ERROR,
+          /*count_examined_rows=*/true);
       used_ref = &ref();
       break;
 
@@ -4221,7 +4343,8 @@
         path = NewDynamicIndexRangeScanAccessPath(join()->thd, table(), this,
                                                   /*count_examined_rows=*/true);
       } else {
-        path = create_table_access_path(join()->thd, nullptr, this,
+        path = create_table_access_path(join()->thd, table(), quick(),
+                                        table_ref, position(),
                                         /*count_examined_rows=*/true);
       }
       break;
@@ -4680,7 +4803,7 @@
   @param param     Represents the current temporary file being produced
   @param thd       The current thread
   @param reverse_copy   If true, copies fields *back* from the frame buffer
-                        tmp table to the input table's buffer,
+                        tmp table to the output table's buffer,
                         cf. #bring_back_frame_row.
 
   @returns false if OK, true on error.
@@ -4803,22 +4926,13 @@
         Item_field *ifield = down_cast<Item_field *>(new_item);
         Item_ref *iref = down_cast<Item_ref *>(item);
         ifield->table_name = iref->table_name;
-        ifield->set_orig_db_name(iref->orig_db_name());
+        ifield->set_orignal_db_name(iref->original_db_name());
         ifield->db_name = iref->db_name;
       }
       if (orig_field != nullptr && item != new_item) {
-        down_cast<Item_field *>(new_item)->set_orig_table_name(
-            orig_field->orig_table_name());
-      }
-#ifndef NDEBUG
-      if (!new_item->item_name.is_set()) {
-        char buff[256];
-        String str(buff, sizeof(buff), &my_charset_bin);
-        str.length(0);
-        item->print(thd, &str, QT_ORDINARY);
-        new_item->item_name.copy(str.ptr(), str.length());
+        down_cast<Item_field *>(new_item)->set_original_table_name(
+            orig_field->original_table_name());
       }
-#endif
     } else {
       new_item = item;
       replace_embedded_rollup_references_with_tmp_fields(thd, item, fields);
diff -Nru mysql-8.0-8.0.26/sql/sql_executor.h mysql-8.0-8.0.27/sql/sql_executor.h
--- mysql-8.0-8.0.26/sql/sql_executor.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_executor.h	2021-09-28 11:46:34.000000000 +0000
@@ -36,7 +36,6 @@
 #include <vector>
 
 #include "my_alloc.h"
-#include "my_compiler.h"
 #include "my_inttypes.h"
 #include "my_table_map.h"
 #include "sql/row_iterator.h"
@@ -162,9 +161,8 @@
 
 void setup_tmptable_write_func(QEP_TAB *tab, Opt_trace_object *trace);
 
-MY_ATTRIBUTE((warn_unused_result))
-bool copy_fields(Temp_table_param *param, const THD *thd,
-                 bool reverse_copy = false);
+[[nodiscard]] bool copy_fields(Temp_table_param *param, const THD *thd,
+                               bool reverse_copy = false);
 
 enum Copy_func_type : int {
   /**
@@ -233,8 +231,6 @@
 /** Help function when we get some an error from the table handler. */
 int report_handler_error(TABLE *table, int error);
 
-int safe_index_read(QEP_TAB *tab);
-
 int join_read_const_table(JOIN_TAB *tab, POSITION *pos);
 
 int do_sj_dups_weedout(THD *thd, SJ_TMP_TABLE *sjtbl);
@@ -273,8 +269,6 @@
         tmp_table_param(nullptr),
         filesort(nullptr),
         ref_item_slice(REF_SLICE_SAVED_BASE),
-        m_condition_optim(nullptr),
-        m_quick_optim(nullptr),
         m_keyread_optim(false),
         m_reversed_access(false),
         lateral_derived_tables_depend_on_me(0) {}
@@ -287,8 +281,6 @@
   // Getters and setters
 
   Item *condition_optim() const { return m_condition_optim; }
-  QUICK_SELECT_I *quick_optim() const { return m_quick_optim; }
-  void set_quick_optim() { m_quick_optim = quick(); }
   void set_condition_optim() { m_condition_optim = condition(); }
   bool keyread_optim() const { return m_keyread_optim; }
   void set_keyread_optim() {
@@ -340,15 +332,6 @@
   bool use_order() const;  ///< Use ordering provided by chosen index?
 
   /**
-     Used to begin a new execution of a subquery. Necessary if this subquery
-     has done a filesort which which has cleared condition/quick.
-  */
-  void restore_quick_optim_and_condition() {
-    if (m_condition_optim) set_condition(m_condition_optim);
-    if (m_quick_optim) set_quick(m_quick_optim);
-  }
-
-  /**
     Construct an access path for reading from this table in the query,
     using the access method that has been determined previously
     (e.g., table scan, ref access, optional sort afterwards, etc.).
@@ -455,26 +438,9 @@
   */
   uint ref_item_slice;
 
-  /// @see m_quick_optim
-  Item *m_condition_optim;
-
-  /**
-     m_quick is the quick "to be used at this stage of execution".
-     It can happen that filesort uses the quick (produced by the optimizer) to
-     produce a sorted result, then the read of this result has to be done
-     without "quick", so we must reset m_quick to NULL, but we want to delay
-     freeing of m_quick or it would close the filesort's result and the table
-     prematurely.
-     In that case, we move m_quick to m_quick_optim (=> delay deletion), reset
-     m_quick to NULL (read of filesort's result will be without quick); if
-     this is a subquery which is later executed a second time,
-     QEP_TAB::reset() will restore the quick from m_quick_optim into m_quick.
-     quick_optim stands for "the quick decided by the optimizer".
-     EXPLAIN reads this member and m_condition_optim; so if you change them
-     after exposing the plan (setting plan_state), do it with the
-     LOCK_query_plan mutex.
-  */
-  QUICK_SELECT_I *m_quick_optim;
+  /// Condition as it was set by the optimizer, used for EXPLAIN.
+  /// m_condition may be overwritten at a later stage.
+  Item *m_condition_optim = nullptr;
 
   /**
      True if only index is going to be read for this table. This is the
@@ -495,7 +461,7 @@
      LDT, for efficiency (less useless calls to QEP_TAB::refresh_lateral())
      and clarity in EXPLAIN.
   */
-  table_map lateral_derived_tables_depend_on_me;
+  qep_tab_map lateral_derived_tables_depend_on_me;
 
   Mem_root_array<const AccessPath *> *invalidators = nullptr;
 
@@ -503,27 +469,6 @@
   QEP_TAB &operator=(const QEP_TAB &);  // not defined
 };
 
-/**
-   @returns a pointer to the QEP_TAB whose index is qtab->member. For
-   example, QEP_AT(x,first_inner) is the first_inner table of x.
-*/
-#define QEP_AT(qtab, member) (qtab->join()->qep_tab[qtab->member])
-
-/**
-   Use this class when you need a QEP_TAB not connected to any JOIN_TAB.
-*/
-class QEP_TAB_standalone {
- public:
-  QEP_TAB_standalone() { m_qt.set_qs(&m_qs); }
-  ~QEP_TAB_standalone() { m_qt.cleanup(); }
-  /// @returns access to the QEP_TAB
-  QEP_TAB &as_QEP_TAB() { return m_qt; }
-
- private:
-  QEP_shared m_qs;
-  QEP_TAB m_qt;
-};
-
 bool set_record_buffer(TABLE *table, double expected_rows_to_fetch);
 void init_tmptable_sum_functions(Item_sum **func_ptr);
 void update_tmptable_sum_func(Item_sum **func_ptr, TABLE *tmp_table);
@@ -543,6 +488,12 @@
   int table_index_to_attach_to;  // -1 means “on the last possible outer join�.
 };
 
+/**
+  Create an AND conjuction of all given items. If there are no items, returns
+  nullptr. If there's only one item, returns that item.
+ */
+Item *CreateConjunction(List<Item> *items);
+
 unique_ptr_destroy_only<RowIterator> PossiblyAttachFilterIterator(
     unique_ptr_destroy_only<RowIterator> iterator,
     const std::vector<Item *> &conditions, THD *thd);
@@ -552,6 +503,18 @@
                      std::vector<PendingCondition> *predicates_above_join,
                      std::vector<PendingCondition> *join_conditions);
 
+/**
+  For a MATERIALIZE access path, move any non-basic iterators (e.g. sorts and
+  filters) from table_path to above the path, for easier EXPLAIN and generally
+  simpler structure. Note the assert in CreateIteratorFromAccessPath() that we
+  succeeded. (ALTERNATIVE counts as a basic iterator in this regard.)
+
+  We do this by finding the second-bottommost access path, and inserting our
+  materialize node as it child. The bottommost one becomes the actual table
+  access path.
+ */
+AccessPath *MoveCompositeIteratorsFromTablePath(AccessPath *path);
+
 AccessPath *GetAccessPathForDerivedTable(THD *thd, QEP_TAB *qep_tab,
                                          AccessPath *table_path);
 AccessPath *GetAccessPathForDerivedTable(
diff -Nru mysql-8.0-8.0.26/sql/sql_handler.cc mysql-8.0-8.0.27/sql/sql_handler.cc
--- mysql-8.0-8.0.26/sql/sql_handler.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_handler.cc	2021-09-28 11:46:34.000000000 +0000
@@ -636,6 +636,7 @@
           natural order, or, vice versa, trying to read next row in natural
           order after reading previous rows in index order.
         */
+        [[fallthrough]];
       case enum_ha_read_modes::RFIRST:
         if (m_key_name) {
           if (!(error = table->file->ha_index_or_rnd_end()) &&
@@ -658,6 +659,7 @@
         }
         /* else fall through, for more info, see comment before 'case RFIRST'.
          */
+        [[fallthrough]];
       case enum_ha_read_modes::RLAST:
         assert(m_key_name != nullptr);
         if (!(error = table->file->ha_index_or_rnd_end()) &&
diff -Nru mysql-8.0-8.0.26/sql/sql_help.cc mysql-8.0-8.0.27/sql/sql_help.cc
--- mysql-8.0-8.0.26/sql/sql_help.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_help.cc	2021-09-28 11:46:34.000000000 +0000
@@ -27,37 +27,35 @@
 #include <algorithm>
 #include <atomic>
 #include <memory>
+#include <string>
+#include <utility>
 
 #include "m_ctype.h"
-#include "m_string.h"
+#include "mem_root_deque.h"
 #include "my_alloc.h"
 #include "my_base.h"
 #include "my_bitmap.h"
 #include "my_dbug.h"
 #include "my_inttypes.h"
-#include "my_macros.h"
 #include "my_sys.h"
 #include "mysqld_error.h"
+#include "sql/basic_row_iterators.h"
+#include "sql/composite_iterators.h"
 #include "sql/debug_sync.h"
 #include "sql/field.h"
 #include "sql/handler.h"
 #include "sql/item.h"
 #include "sql/item_cmpfunc.h"  // Item_func_like
-#include "sql/key_spec.h"
-#include "sql/opt_range.h"  // SQL_SELECT
-#include "sql/opt_trace.h"  // Opt_trace_object
 #include "sql/protocol.h"
-#include "sql/records.h"  // init_table_iterator
 #include "sql/row_iterator.h"
 #include "sql/sql_base.h"  // REPORT_ALL_ERRORS
 #include "sql/sql_bitmap.h"
 #include "sql/sql_class.h"
-#include "sql/sql_executor.h"  // QEP_TAB
 #include "sql/sql_lex.h"
 #include "sql/sql_list.h"
-#include "sql/sql_optimizer.h"
 #include "sql/sql_table.h"  // primary_key_name
 #include "sql/table.h"
+#include "sql/timing_iterator.h"
 #include "sql_string.h"
 #include "template_utils.h"
 #include "thr_lock.h"
@@ -193,7 +191,7 @@
   SYNOPSIS
     search_topics()
     thd 	 Thread handler
-    topics	 Table of topics
+    iterator     Iterator giving topics
     find_fields  Filled array of info for fields
     select	 Function to test for matching help topic.
                  Normally 'help_topic.name like 'bit%'
@@ -213,20 +211,13 @@
 
 */
 
-static int search_topics(THD *thd, QEP_TAB *topics,
+static int search_topics(THD *thd, RowIterator *iterator,
                          struct st_find_field *find_fields, List<String> *names,
                          String *name, String *description, String *example) {
   int count = 0;
   DBUG_TRACE;
 
-  unique_ptr_destroy_only<RowIterator> iterator = init_table_iterator(
-      thd, nullptr, topics,
-      /*ignore_not_found_rows=*/false, /*count_examined_rows=*/false);
-  if (iterator == nullptr) return 0;
-
   while (!iterator->Read()) {
-    if (!topics->condition()->val_int())  // Doesn't match like
-      continue;
     memorize_variant_topic(thd, count, find_fields, names, name, description,
                            example);
     count++;
@@ -239,8 +230,7 @@
 
   SYNOPSIS
     search_keyword()
-    thd          Thread handler
-    keywords     Table of keywords
+    iterator     Iterator giving keywords
     find_fields  Filled array of info for fields
     select       Function to test for matching keyword.
                  Normally 'help_keyword.name like 'bit%'
@@ -253,20 +243,12 @@
     2   found more then one topic matching the mask
 */
 
-static int search_keyword(THD *thd, QEP_TAB *keywords,
+static int search_keyword(RowIterator *iterator,
                           struct st_find_field *find_fields, int *key_id) {
   int count = 0;
   DBUG_TRACE;
 
-  unique_ptr_destroy_only<RowIterator> iterator = init_table_iterator(
-      thd, nullptr, keywords,
-      /*ignore_not_found_rows=*/false, /*count_examined_rows=*/false);
-  if (iterator == nullptr) return 0;
-
   while (!iterator->Read() && count < 2) {
-    if (!keywords->condition()->val_int())  // Dosn't match like
-      continue;
-
     *key_id = (int)find_fields[help_keyword_help_keyword_id].field->val_int();
 
     count++;
@@ -359,7 +341,7 @@
   Look for categories by mask.
 
   @param thd          THD for init_table_iterator
-  @param categories   Table of categories
+  @param iterator     Iterator giving categories.
   @param find_fields  Filled array of info for fields
   @param names        List of found categories names (out)
   @param res_id	      Primary index of found category
@@ -367,7 +349,7 @@
 
   @return             Number of categories found
  */
-static int search_categories(THD *thd, QEP_TAB *categories,
+static int search_categories(THD *thd, RowIterator *iterator,
                              struct st_find_field *find_fields,
                              List<String> *names, int16 *res_id) {
   Field *pfname = find_fields[help_category_name].field;
@@ -376,14 +358,7 @@
 
   DBUG_TRACE;
 
-  unique_ptr_destroy_only<RowIterator> iterator = init_table_iterator(
-      thd, nullptr, categories,
-      /*ignore_not_found_rows=*/false, /*count_examined_rows=*/false);
-  if (iterator == nullptr) return 0;
-
   while (!iterator->Read()) {
-    if (categories->condition() && !categories->condition()->val_int())
-      continue;
     String *lname = new (thd->mem_root) String;
     get_field(thd->mem_root, pfname, lname);
     if (++count == 1 && res_id) *res_id = (int16)pcat_id->val_int();
@@ -398,22 +373,17 @@
   SYNOPSIS
     get_all_items_for_category()
     thd	    Thread handler
-    items   Table of items
+    iterator  Iterator giving items
     pfname  Field "name" in items
     select  "where" part of query..
     res     list of finded names
 */
 
-static void get_all_items_for_category(THD *thd, QEP_TAB *items, Field *pfname,
-                                       List<String> *res) {
+static void get_all_items_for_category(THD *thd, RowIterator *iterator,
+                                       Field *pfname, List<String> *res) {
   DBUG_TRACE;
 
-  unique_ptr_destroy_only<RowIterator> iterator = init_table_iterator(
-      thd, nullptr, items,
-      /*ignore_not_found_rows=*/false, /*count_examined_rows=*/false);
-  if (iterator == nullptr) return;
   while (!iterator->Read()) {
-    if (!items->condition()->val_int()) continue;
     String *name = new (thd->mem_root) String();
     get_field(thd->mem_root, pfname, name);
     res->push_back(name);
@@ -560,38 +530,26 @@
   @param thd      Thread handler
   @param cond     WHERE part of select
   @param table    goal table
-  @param tab      QEP_TAB
-
-  @returns true if error
 
-  @note Side-effects: 'table', 'cond' and possibly a 'quick' are assigned to
-  'tab'
+  @returns an iterator, or nullptr if error
 */
 
-static bool prepare_simple_query_block(THD *thd, Item *cond, TABLE *table,
-                                       QEP_TAB *tab) {
+static unique_ptr_destroy_only<RowIterator> prepare_simple_query_block(
+    THD *thd, Item *cond, TABLE *table) {
   if (!cond->fixed) cond->fix_fields(thd, &cond);  // can never fail
 
-  // Initialize the cost model that will be used for this table
-  table->init_cost_model(thd->cost_model());
-
-  /* Assume that no indexes cover all required fields */
-  table->covering_keys.clear_all();
-
-  tab->set_table(table);
-  tab->set_condition(cond);
-
-  // Wrapper for correct JSON in optimizer trace
-  Opt_trace_object wrapper(&thd->opt_trace);
-  Key_map keys_to_use(Key_map::ALL_BITS), needed_reg_dummy;
-  QUICK_SELECT_I *qck;
-  const bool impossible =
-      test_quick_select(thd, keys_to_use, 0, HA_POS_ERROR, false,
-                        ORDER_NOT_RELEVANT, tab, cond, &needed_reg_dummy, &qck,
-                        tab->table()->force_index, thd->lex->query_block) < 0;
-  tab->set_quick(qck);
-
-  return impossible || (tab->quick() && tab->quick()->reset());
+  unique_ptr_destroy_only<RowIterator> table_scan_iterator =
+      NewIterator<TableScanIterator>(thd, table, /*expected_rows=*/100.0,
+                                     /*examined_rows=*/nullptr);
+  if (table_scan_iterator == nullptr) {
+    return nullptr;
+  }
+  unique_ptr_destroy_only<RowIterator> filter_iterator =
+      NewIterator<FilterIterator>(thd, std::move(table_scan_iterator), cond);
+  if (filter_iterator == nullptr || filter_iterator->Init()) {
+    return nullptr;
+  }
+  return filter_iterator;
 }
 
 /**
@@ -602,19 +560,18 @@
   @param  mlen     length of mask
   @param  table    goal table
   @param  pfname   field "name" in table
-  @param  tab      QEP_TAB
 
-  @returns true if error
+  @returns an iterator, or nullptr if error
   @see prepare_simple_query_block()
 */
 
-static bool prepare_select_for_name(THD *thd, const char *mask, size_t mlen,
-                                    TABLE *table, Field *pfname, QEP_TAB *tab) {
+static unique_ptr_destroy_only<RowIterator> prepare_select_for_name(
+    THD *thd, const char *mask, size_t mlen, TABLE *table, Field *pfname) {
   Item *cond = new Item_func_like(
       new Item_field(pfname), new Item_string(mask, mlen, pfname->charset()),
       new Item_string("\\", 1, &my_charset_latin1));
-  if (thd->is_fatal_error()) return true; /* purecov: inspected */
-  return prepare_simple_query_block(thd, cond, table, tab);
+  if (thd->is_fatal_error()) return nullptr; /* purecov: inspected */
+  return prepare_simple_query_block(thd, cond, table);
 }
 
 /*
@@ -677,26 +634,23 @@
     tables[i]->table->file->init_table_handle_for_HANDLER();
 
   {
-    QEP_TAB_standalone qep_tab_st;
-    QEP_TAB &tab = qep_tab_st.as_QEP_TAB();
-    if (prepare_select_for_name(thd, mask, mlen, tables[0]->table,
-                                used_fields[help_topic_name].field, &tab))
-      goto error;
+    unique_ptr_destroy_only<RowIterator> iterator = prepare_select_for_name(
+        thd, mask, mlen, tables[0]->table, used_fields[help_topic_name].field);
+    if (iterator == nullptr) goto error;
 
-    count_topics = search_topics(thd, &tab, used_fields, &topics_list, &name,
-                                 &description, &example);
+    count_topics = search_topics(thd, iterator.get(), used_fields, &topics_list,
+                                 &name, &description, &example);
   }
 
   if (count_topics == 0) {
     int key_id = 0;
-    QEP_TAB_standalone qep_tab_st;
-    QEP_TAB &tab = qep_tab_st.as_QEP_TAB();
 
-    if (prepare_select_for_name(thd, mask, mlen, tables[3]->table,
-                                used_fields[help_keyword_name].field, &tab))
-      goto error;
+    unique_ptr_destroy_only<RowIterator> iterator =
+        prepare_select_for_name(thd, mask, mlen, tables[3]->table,
+                                used_fields[help_keyword_name].field);
+    if (iterator == nullptr) goto error;
 
-    count_topics = search_keyword(thd, &tab, used_fields, &key_id);
+    count_topics = search_keyword(iterator.get(), used_fields, &key_id);
     count_topics =
         (count_topics != 1)
             ? 0
@@ -709,16 +663,14 @@
     int16 category_id;
     Field *cat_cat_id = used_fields[help_category_parent_category_id].field;
     {
-      QEP_TAB_standalone qep_tab_st;
-      QEP_TAB &tab = qep_tab_st.as_QEP_TAB();
-
-      if (prepare_select_for_name(thd, mask, mlen, tables[1]->table,
-                                  used_fields[help_category_name].field, &tab))
-        goto error;
+      unique_ptr_destroy_only<RowIterator> iterator =
+          prepare_select_for_name(thd, mask, mlen, tables[1]->table,
+                                  used_fields[help_category_name].field);
+      if (iterator == nullptr) goto error;
 
       DEBUG_SYNC(thd, "before_help_record_read");
 
-      count_categories = search_categories(thd, &tab, used_fields,
+      count_categories = search_categories(thd, iterator.get(), used_fields,
                                            &categories_list, &category_id);
     }
     if (!count_categories) {
@@ -736,23 +688,19 @@
           new Item_field(cat_cat_id), new Item_int((int32)category_id));
 
       {
-        QEP_TAB_standalone qep_tab_st;
-        QEP_TAB &tab = qep_tab_st.as_QEP_TAB();
-
-        if (prepare_simple_query_block(thd, cond_topic_by_cat, tables[0]->table,
-                                       &tab))
-          goto error;
-        get_all_items_for_category(
-            thd, &tab, used_fields[help_topic_name].field, &topics_list);
+        unique_ptr_destroy_only<RowIterator> iterator =
+            prepare_simple_query_block(thd, cond_topic_by_cat,
+                                       tables[0]->table);
+        if (iterator == nullptr) goto error;
+        get_all_items_for_category(thd, iterator.get(),
+                                   used_fields[help_topic_name].field,
+                                   &topics_list);
       }
       {
-        QEP_TAB_standalone qep_tab_st;
-        QEP_TAB &tab = qep_tab_st.as_QEP_TAB();
-
-        if (prepare_simple_query_block(thd, cond_cat_by_cat, tables[1]->table,
-                                       &tab))
-          goto error;
-        get_all_items_for_category(thd, &tab,
+        unique_ptr_destroy_only<RowIterator> iterator =
+            prepare_simple_query_block(thd, cond_cat_by_cat, tables[1]->table);
+        if (iterator == nullptr) goto error;
+        get_all_items_for_category(thd, iterator.get(),
                                    used_fields[help_category_name].field,
                                    &subcategories_list);
       }
@@ -771,13 +719,12 @@
         send_variant_2_list(mem_root, protocol, &topics_list, "N", nullptr))
       goto error;
 
-    QEP_TAB_standalone qep_tab_st;
-    QEP_TAB &tab = qep_tab_st.as_QEP_TAB();
-
-    if (prepare_select_for_name(thd, mask, mlen, tables[1]->table,
-                                used_fields[help_category_name].field, &tab))
-      goto error;
-    search_categories(thd, &tab, used_fields, &categories_list, nullptr);
+    unique_ptr_destroy_only<RowIterator> iterator =
+        prepare_select_for_name(thd, mask, mlen, tables[1]->table,
+                                used_fields[help_category_name].field);
+    if (iterator == nullptr) goto error;
+    search_categories(thd, iterator.get(), used_fields, &categories_list,
+                      nullptr);
     /* Then send categories */
     if (send_variant_2_list(mem_root, protocol, &categories_list, "Y", nullptr))
       goto error;
diff -Nru mysql-8.0-8.0.26/sql/sql_hints.yy.cc mysql-8.0-8.0.27/sql/sql_hints.yy.cc
--- mysql-8.0-8.0.26/sql/sql_hints.yy.cc	2021-07-01 08:15:14.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_hints.yy.cc	2021-09-28 13:21:02.000000000 +0000
@@ -104,7 +104,7 @@
 }
 
 
-#line 108 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:339  */
+#line 108 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:339  */
 
 # ifndef YY_NULLPTR
 #  if defined __cplusplus && 201103L <= __cplusplus
@@ -124,8 +124,8 @@
 
 /* In a future release of Bison, this section will be replaced
    by #include "sql_hints.yy.h".  */
-#ifndef YY_HINT_PARSER_VAR_LIB_PB2_SB_1_3692345_1625126119_25_DIST_GPL_SQL_SQL_HINTS_YY_H_INCLUDED
-# define YY_HINT_PARSER_VAR_LIB_PB2_SB_1_3692345_1625126119_25_DIST_GPL_SQL_SQL_HINTS_YY_H_INCLUDED
+#ifndef YY_HINT_PARSER_VAR_LIB_PB2_SB_1_4617039_1632834178_1_DIST_GPL_SQL_SQL_HINTS_YY_H_INCLUDED
+# define YY_HINT_PARSER_VAR_LIB_PB2_SB_1_4617039_1632834178_1_DIST_GPL_SQL_SQL_HINTS_YY_H_INCLUDED
 /* Debug traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
@@ -251,11 +251,11 @@
 
 int HINT_PARSER_parse (class THD *thd, class Hint_scanner *scanner, class PT_hint_list **ret);
 
-#endif /* !YY_HINT_PARSER_VAR_LIB_PB2_SB_1_3692345_1625126119_25_DIST_GPL_SQL_SQL_HINTS_YY_H_INCLUDED  */
+#endif /* !YY_HINT_PARSER_VAR_LIB_PB2_SB_1_4617039_1632834178_1_DIST_GPL_SQL_SQL_HINTS_YY_H_INCLUDED  */
 
 /* Copy the second part of user declarations.  */
 
-#line 259 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:358  */
+#line 259 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -1573,19 +1573,19 @@
         case 2:
 #line 206 "sql_hints.yy" /* yacc.c:1646  */
     { *ret= (yyvsp[-1].hint_list); }
-#line 1577 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1577 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 3:
 #line 208 "sql_hints.yy" /* yacc.c:1646  */
     { *ret= (yyvsp[-2].hint_list); }
-#line 1583 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1583 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 4:
 #line 210 "sql_hints.yy" /* yacc.c:1646  */
     { *ret= NULL; }
-#line 1589 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1589 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 5:
@@ -1595,7 +1595,7 @@
             if ((yyval.hint_list) == NULL || (yyval.hint_list)->push_back((yyvsp[0].hint)))
               YYABORT; // OOM
           }
-#line 1599 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1599 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 6:
@@ -1604,7 +1604,7 @@
             (yyvsp[-1].hint_list)->push_back((yyvsp[0].hint));
             (yyval.hint_list)= (yyvsp[-1].hint_list);
           }
-#line 1608 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1608 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 14:
@@ -1624,13 +1624,13 @@
                 YYABORT; // OOM
             }
           }
-#line 1628 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1628 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 15:
 #line 259 "sql_hints.yy" /* yacc.c:1646  */
     { (yyval.hint_param_table_list).init(thd->mem_root); }
-#line 1634 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1634 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 17:
@@ -1640,7 +1640,7 @@
             if ((yyval.hint_param_table_list).push_back((yyvsp[0].hint_param_table)))
               YYABORT; // OOM
           }
-#line 1644 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1644 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 18:
@@ -1650,13 +1650,13 @@
               YYABORT; // OOM
             (yyval.hint_param_table_list)= (yyvsp[-2].hint_param_table_list);
           }
-#line 1654 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1654 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 19:
 #line 279 "sql_hints.yy" /* yacc.c:1646  */
     { (yyval.hint_param_table_list).init(thd->mem_root); }
-#line 1660 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1660 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 21:
@@ -1666,7 +1666,7 @@
             if ((yyval.hint_param_table_list).push_back((yyvsp[0].hint_param_table)))
               YYABORT; // OOM
           }
-#line 1670 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1670 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 22:
@@ -1676,13 +1676,13 @@
               YYABORT; // OOM
             (yyval.hint_param_table_list)= (yyvsp[-2].hint_param_table_list);
           }
-#line 1680 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1680 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 23:
 #line 299 "sql_hints.yy" /* yacc.c:1646  */
     { (yyval.hint_param_index_list).init(thd->mem_root); }
-#line 1686 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1686 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 25:
@@ -1692,7 +1692,7 @@
             if ((yyval.hint_param_index_list).push_back((yyvsp[0].lexer.hint_string)))
               YYABORT; // OOM
           }
-#line 1696 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1696 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 26:
@@ -1702,7 +1702,7 @@
               YYABORT; // OOM
             (yyval.hint_param_index_list)= (yyvsp[-2].hint_param_index_list);
           }
-#line 1706 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1706 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 28:
@@ -1711,7 +1711,7 @@
             (yyval.hint_param_table).table= (yyvsp[0].lexer.hint_string);
             (yyval.hint_param_table).opt_query_block= NULL_CSTR;
           }
-#line 1715 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1715 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 29:
@@ -1720,7 +1720,7 @@
             (yyval.hint_param_table).table= (yyvsp[-1].lexer.hint_string);
             (yyval.hint_param_table).opt_query_block= (yyvsp[0].lexer.hint_string);
           }
-#line 1724 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1724 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 31:
@@ -1729,13 +1729,13 @@
             (yyval.hint_param_table).table= (yyvsp[0].lexer.hint_string);
             (yyval.hint_param_table).opt_query_block= (yyvsp[-1].lexer.hint_string);
           }
-#line 1733 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1733 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 32:
 #line 348 "sql_hints.yy" /* yacc.c:1646  */
     { (yyval.lexer.hint_string)= NULL_CSTR; }
-#line 1739 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1739 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 34:
@@ -1745,7 +1745,7 @@
             if ((yyval.hint) == NULL)
               YYABORT; // OOM
           }
-#line 1749 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1749 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 35:
@@ -1755,7 +1755,7 @@
             if ((yyval.hint) == NULL)
               YYABORT; // OOM
           }
-#line 1759 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1759 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 36:
@@ -1765,7 +1765,7 @@
             if ((yyval.hint) == NULL)
               YYABORT; // OOM
           }
-#line 1769 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1769 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 37:
@@ -1775,7 +1775,7 @@
             if ((yyval.hint) == NULL)
               YYABORT; // OOM
           }
-#line 1779 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1779 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 38:
@@ -1785,7 +1785,7 @@
             if ((yyval.hint) == NULL)
               YYABORT; // OOM
           }
-#line 1789 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1789 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 39:
@@ -1795,7 +1795,7 @@
             if ((yyval.hint) == NULL)
               YYABORT; // OOM
           }
-#line 1799 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1799 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 40:
@@ -1805,7 +1805,7 @@
             if ((yyval.hint) == NULL)
               YYABORT; // OOM
           }
-#line 1809 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1809 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 41:
@@ -1815,7 +1815,7 @@
             if ((yyval.hint) == NULL)
               YYABORT; // OOM
           }
-#line 1819 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1819 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 42:
@@ -1825,7 +1825,7 @@
             if ((yyval.hint) == NULL)
               YYABORT; // OOM
           }
-#line 1829 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1829 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 43:
@@ -1835,13 +1835,13 @@
             if ((yyval.hint) == NULL)
               YYABORT; // OOM
           }
-#line 1839 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1839 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 44:
 #line 425 "sql_hints.yy" /* yacc.c:1646  */
     { (yyval.ulong_num)= 0; }
-#line 1845 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1845 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 45:
@@ -1849,7 +1849,7 @@
     {
             (yyval.ulong_num)= (yyvsp[0].ulong_num);
           }
-#line 1853 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1853 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 46:
@@ -1857,44 +1857,44 @@
     {
             (yyval.ulong_num)= (yyvsp[-2].ulong_num) | (yyvsp[0].ulong_num);
           }
-#line 1861 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1861 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 47:
 #line 437 "sql_hints.yy" /* yacc.c:1646  */
     { (yyval.ulong_num)= OPTIMIZER_SWITCH_FIRSTMATCH; }
-#line 1867 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1867 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 48:
 #line 438 "sql_hints.yy" /* yacc.c:1646  */
     { (yyval.ulong_num)= OPTIMIZER_SWITCH_LOOSE_SCAN; }
-#line 1873 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1873 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 49:
 #line 439 "sql_hints.yy" /* yacc.c:1646  */
     { (yyval.ulong_num)= OPTIMIZER_SWITCH_MATERIALIZATION; }
-#line 1879 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1879 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 50:
 #line 440 "sql_hints.yy" /* yacc.c:1646  */
     { (yyval.ulong_num)= OPTIMIZER_SWITCH_DUPSWEEDOUT; }
-#line 1885 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1885 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 51:
 #line 444 "sql_hints.yy" /* yacc.c:1646  */
     { (yyval.ulong_num)=
                                    static_cast<long>(Subquery_strategy::SUBQ_MATERIALIZATION); }
-#line 1892 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1892 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 52:
 #line 446 "sql_hints.yy" /* yacc.c:1646  */
     { (yyval.ulong_num)= static_cast<long>(Subquery_strategy::SUBQ_EXISTS); }
-#line 1898 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1898 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 53:
@@ -1904,7 +1904,7 @@
             if ((yyval.hint) == NULL)
               YYABORT; // OOM
           }
-#line 1908 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1908 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 54:
@@ -1914,7 +1914,7 @@
             if ((yyval.hint) == NULL)
               YYABORT; // OOM
           }
-#line 1918 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1918 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 55:
@@ -1924,7 +1924,7 @@
             if ((yyval.hint) == NULL)
               YYABORT; // OOM
           }
-#line 1928 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1928 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 56:
@@ -1934,7 +1934,7 @@
             if ((yyval.hint) == NULL)
               YYABORT; // OOM
           }
-#line 1938 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1938 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 57:
@@ -1944,7 +1944,7 @@
             if ((yyval.hint) == NULL)
               YYABORT; // OOM
           }
-#line 1948 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1948 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 58:
@@ -1954,7 +1954,7 @@
             if ((yyval.hint) == NULL)
               YYABORT; // OOM
           }
-#line 1958 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1958 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 59:
@@ -1962,7 +1962,7 @@
     {
             (yyval.hint_type)= BKA_HINT_ENUM;
           }
-#line 1966 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1966 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 60:
@@ -1970,7 +1970,7 @@
     {
             (yyval.hint_type)= BNL_HINT_ENUM;
           }
-#line 1974 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1974 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 61:
@@ -1978,7 +1978,7 @@
     {
             (yyval.hint_type)= HASH_JOIN_HINT_ENUM;
           }
-#line 1982 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1982 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 62:
@@ -1986,7 +1986,7 @@
     {
             (yyval.hint_type)= DERIVED_MERGE_HINT_ENUM;
           }
-#line 1990 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1990 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 63:
@@ -1994,7 +1994,7 @@
     {
             (yyval.hint_type)= DERIVED_CONDITION_PUSHDOWN_HINT_ENUM;
           }
-#line 1998 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 1998 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 64:
@@ -2002,7 +2002,7 @@
     {
             (yyval.hint_type)= BKA_HINT_ENUM;
           }
-#line 2006 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 2006 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 65:
@@ -2010,7 +2010,7 @@
     {
             (yyval.hint_type)= BNL_HINT_ENUM;
           }
-#line 2014 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 2014 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 66:
@@ -2018,7 +2018,7 @@
     {
             (yyval.hint_type)= HASH_JOIN_HINT_ENUM;
           }
-#line 2022 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 2022 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 67:
@@ -2026,7 +2026,7 @@
     {
             (yyval.hint_type)= DERIVED_MERGE_HINT_ENUM;
           }
-#line 2030 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 2030 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 68:
@@ -2034,7 +2034,7 @@
     {
             (yyval.hint_type)= DERIVED_CONDITION_PUSHDOWN_HINT_ENUM;
           }
-#line 2038 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 2038 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 69:
@@ -2042,7 +2042,7 @@
     {
             (yyval.hint_type)= MRR_HINT_ENUM;
           }
-#line 2046 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 2046 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 70:
@@ -2050,7 +2050,7 @@
     {
             (yyval.hint_type)= NO_RANGE_HINT_ENUM;
           }
-#line 2054 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 2054 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 71:
@@ -2058,7 +2058,7 @@
     {
             (yyval.hint_type)= INDEX_MERGE_HINT_ENUM;
           }
-#line 2062 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 2062 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 72:
@@ -2066,7 +2066,7 @@
     {
             (yyval.hint_type)= SKIP_SCAN_HINT_ENUM;
           }
-#line 2070 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 2070 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 73:
@@ -2074,7 +2074,7 @@
     {
             (yyval.hint_type)= INDEX_HINT_ENUM;
           }
-#line 2078 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 2078 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 74:
@@ -2082,7 +2082,7 @@
     {
             (yyval.hint_type)= JOIN_INDEX_HINT_ENUM;
           }
-#line 2086 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 2086 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 75:
@@ -2090,7 +2090,7 @@
     {
             (yyval.hint_type)= GROUP_INDEX_HINT_ENUM;
           }
-#line 2094 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 2094 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 76:
@@ -2098,7 +2098,7 @@
     {
             (yyval.hint_type)= ORDER_INDEX_HINT_ENUM;
           }
-#line 2102 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 2102 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 77:
@@ -2106,7 +2106,7 @@
     {
             (yyval.hint_type)= ICP_HINT_ENUM;
           }
-#line 2110 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 2110 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 78:
@@ -2114,7 +2114,7 @@
     {
             (yyval.hint_type)= MRR_HINT_ENUM;
           }
-#line 2118 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 2118 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 79:
@@ -2122,7 +2122,7 @@
     {
             (yyval.hint_type)= INDEX_MERGE_HINT_ENUM;
           }
-#line 2126 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 2126 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 80:
@@ -2130,7 +2130,7 @@
     {
             (yyval.hint_type)= SKIP_SCAN_HINT_ENUM;
           }
-#line 2134 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 2134 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 81:
@@ -2138,7 +2138,7 @@
     {
             (yyval.hint_type)= INDEX_HINT_ENUM;
           }
-#line 2142 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 2142 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 82:
@@ -2146,7 +2146,7 @@
     {
             (yyval.hint_type)= JOIN_INDEX_HINT_ENUM;
           }
-#line 2150 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 2150 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 83:
@@ -2154,7 +2154,7 @@
     {
             (yyval.hint_type)= GROUP_INDEX_HINT_ENUM;
           }
-#line 2158 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 2158 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 84:
@@ -2162,7 +2162,7 @@
     {
             (yyval.hint_type)= ORDER_INDEX_HINT_ENUM;
           }
-#line 2166 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 2166 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 85:
@@ -2172,7 +2172,7 @@
             if ((yyval.hint) == NULL)
               YYABORT; // OOM
           }
-#line 2176 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 2176 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 86:
@@ -2182,7 +2182,7 @@
             if ((yyval.hint) == NULL)
               YYABORT; // OOM
           }
-#line 2186 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 2186 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 87:
@@ -2195,7 +2195,7 @@
            if ((yyval.hint) == nullptr)
               YYABORT; // OOM
          }
-#line 2199 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 2199 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 90:
@@ -2214,7 +2214,7 @@
                 YYABORT; // OOM
             }
           }
-#line 2218 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 2218 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 91:
@@ -2222,7 +2222,7 @@
     {
             (yyval.item)= NEW_PTN Item_float((yyvsp[0].lexer.hint_string).str, (yyvsp[0].lexer.hint_string).length);
           }
-#line 2226 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 2226 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 92:
@@ -2258,7 +2258,7 @@
               }
             }
           }
-#line 2262 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 2262 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
   case 95:
@@ -2268,11 +2268,11 @@
           if ((yyval.item) == NULL)
             YYABORT; // OOM
         }
-#line 2272 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 2272 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
     break;
 
 
-#line 2276 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
+#line 2276 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_hints.yy.cc" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
diff -Nru mysql-8.0-8.0.26/sql/sql_hints.yy.h mysql-8.0-8.0.27/sql/sql_hints.yy.h
--- mysql-8.0-8.0.26/sql/sql_hints.yy.h	2021-07-01 08:15:14.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_hints.yy.h	2021-09-28 13:21:02.000000000 +0000
@@ -30,8 +30,8 @@
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
-#ifndef YY_HINT_PARSER_VAR_LIB_PB2_SB_1_3692345_1625126119_25_DIST_GPL_SQL_SQL_HINTS_YY_H_INCLUDED
-# define YY_HINT_PARSER_VAR_LIB_PB2_SB_1_3692345_1625126119_25_DIST_GPL_SQL_SQL_HINTS_YY_H_INCLUDED
+#ifndef YY_HINT_PARSER_VAR_LIB_PB2_SB_1_4617039_1632834178_1_DIST_GPL_SQL_SQL_HINTS_YY_H_INCLUDED
+# define YY_HINT_PARSER_VAR_LIB_PB2_SB_1_4617039_1632834178_1_DIST_GPL_SQL_SQL_HINTS_YY_H_INCLUDED
 /* Debug traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
@@ -157,4 +157,4 @@
 
 int HINT_PARSER_parse (class THD *thd, class Hint_scanner *scanner, class PT_hint_list **ret);
 
-#endif /* !YY_HINT_PARSER_VAR_LIB_PB2_SB_1_3692345_1625126119_25_DIST_GPL_SQL_SQL_HINTS_YY_H_INCLUDED  */
+#endif /* !YY_HINT_PARSER_VAR_LIB_PB2_SB_1_4617039_1632834178_1_DIST_GPL_SQL_SQL_HINTS_YY_H_INCLUDED  */
diff -Nru mysql-8.0-8.0.26/sql/sql_insert.cc mysql-8.0-8.0.27/sql/sql_insert.cc
--- mysql-8.0-8.0.26/sql/sql_insert.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_insert.cc	2021-09-28 11:46:34.000000000 +0000
@@ -235,12 +235,12 @@
           const Item *item2 = *j;
           if (item1->eq(item2, true)) {
             my_error(ER_FIELD_SPECIFIED_TWICE, MYF(0), item1->item_name.ptr());
-            break;
+            return true;
           }
         }
       }
-      assert(thd->is_error());
-      return true;
+      // A duplicate column name should have been found by now.
+      assert(false);
     }
   }
   /* Mark all generated columns for write*/
@@ -671,7 +671,7 @@
 
     const bool transactional_table = insert_table->file->has_transactions();
 
-    const bool changed MY_ATTRIBUTE((unused)) =
+    const bool changed [[maybe_unused]] =
         info.stats.copied || info.stats.deleted || info.stats.updated;
 
     if (!has_error ||
@@ -1897,6 +1897,9 @@
           So here we recalculate data for generated columns.
         */
         if (table->vfield) {
+          // Dont save old value while re-calculating generated fields.
+          // Before image will already be saved in the first calculation.
+          table->blobs_need_not_keep_old_value();
           update_generated_write_fields(table->write_set, table);
         }
 
@@ -2187,7 +2190,7 @@
   if (!table->file->has_transactions())
     thd->get_transaction()->mark_modified_non_trans_table(
         Transaction_ctx::STMT);
-  free_root(&mem_root, MYF(0));
+  mem_root.Clear();
   return trg_error;
 
 err : {
@@ -2202,7 +2205,7 @@
   table->file->restore_auto_increment(prev_insert_id);
   if (key) my_safe_afree(key, table->s->max_unique_length, MAX_KEY_LENGTH);
   table->column_bitmaps_set(save_read_set, save_write_set);
-  free_root(&mem_root, MYF(0));
+  mem_root.Clear();
   return true;
 }
 
@@ -2453,7 +2456,7 @@
 
 bool Query_result_insert::send_eof(THD *thd) {
   ulonglong id, row_count;
-  bool changed MY_ATTRIBUTE((unused));
+  bool changed [[maybe_unused]];
   THD::killed_state killed_status = thd->killed;
   DBUG_TRACE;
   DBUG_PRINT("enter",
@@ -2566,7 +2569,7 @@
     and the end of the function.
    */
   if (table != nullptr) {
-    bool changed MY_ATTRIBUTE((unused));
+    bool changed [[maybe_unused]];
     bool transactional_table;
     /*
       Try to end the bulk insert which might have been started before.
@@ -3061,8 +3064,9 @@
     columns defined in CREATE TABLE SELECT. Hence calling set_function_defaults
     explicitly.
   */
-  if (info.function_defaults_apply_on_columns(table->write_set))
-    info.set_function_defaults(table);
+  if (info.function_defaults_apply_on_columns(table->write_set)) {
+    if (info.set_function_defaults(table)) return;
+  }
 
   fill_record_n_invoke_before_triggers(thd, table_fields, values, table,
                                        TRG_EVENT_INSERT, table->s->fields);
@@ -3185,8 +3189,6 @@
   if (error)
     abort_result_set(thd);
   else {
-    bool commit_error = false;
-
     DBUG_EXECUTE_IF("crash_after_create_select_insert", DBUG_SUICIDE(););
     /*
       Do an implicit commit at end of statement for non-temporary tables.
@@ -3199,30 +3201,20 @@
     */
     if (!table->s->tmp_table) {
       thd->get_stmt_da()->set_overwrite_status(true);
-      commit_error = trans_commit_stmt(thd) || trans_commit_implicit(thd);
+      error = trans_commit_stmt(thd) || trans_commit_implicit(thd);
       thd->get_stmt_da()->set_overwrite_status(false);
     }
 
-    if (m_plock) {
+    if (!error && m_plock) {
       mysql_unlock_tables(thd, *m_plock);
       *m_plock = nullptr;
       m_plock = nullptr;
     }
 
-    if (commit_error) {
-      assert(!table->s->tmp_table);
-      assert(table == thd->open_tables);
-      close_thread_table(thd, &thd->open_tables);
-      /*
-        Remove TABLE and TABLE_SHARE objects for the table which creation
-        might have been rolled back from the caches.
-      */
-      tdc_remove_table(thd, TDC_RT_REMOVE_ALL, create_table->db,
-                       create_table->table_name, false);
+    if (!error && m_post_ddl_ht) {
+      m_post_ddl_ht->post_ddl(thd);
     }
 
-    if (m_post_ddl_ht) m_post_ddl_ht->post_ddl(thd);
-
     fk_invalidator.invalidate(thd);
   }
   return error;
diff -Nru mysql-8.0-8.0.26/sql/sql_lex.cc mysql-8.0-8.0.27/sql/sql_lex.cc
--- mysql-8.0-8.0.26/sql/sql_lex.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_lex.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1095,7 +1095,7 @@
               case '_':
               case '%':
                 *to++ = '\\';  // remember prefix for wildcard
-                               /* Fall through */
+                [[fallthrough]];
               default:
                 *to++ = *str;
                 break;
@@ -1438,13 +1438,13 @@
           state = MY_LEX_HEX_NUMBER;
           break;
         }
-        // Fall through.
+        [[fallthrough]];
       case MY_LEX_IDENT_OR_BIN:
         if (lip->yyPeek() == '\'') {  // Found b'bin-number'
           state = MY_LEX_BIN_NUMBER;
           break;
         }
-        // Fall through.
+        [[fallthrough]];
       case MY_LEX_IDENT:
         const char *start;
         if (use_mb(cs)) {
@@ -1454,7 +1454,7 @@
               break;
             case 0:
               if (my_mbmaxlenlen(cs) < 2) break;
-              /* else fall through */
+              [[fallthrough]];
             default:
               int l =
                   my_ismbchar(cs, lip->get_ptr() - 1, lip->get_end_of_query());
@@ -1470,7 +1470,7 @@
                 break;
               case 0:
                 if (my_mbmaxlenlen(cs) < 2) break;
-                /* else fall through */
+                [[fallthrough]];
               default:
                 int l;
                 if ((l = my_ismbchar(cs, lip->get_ptr() - 1,
@@ -1607,7 +1607,7 @@
           }
           lip->yyUnget();
         }
-        // fall through
+        [[fallthrough]];
       case MY_LEX_IDENT_START:  // We come here after '.'
         result_state = IDENT;
         if (use_mb(cs)) {
@@ -1618,7 +1618,7 @@
                 break;
               case 0:
                 if (my_mbmaxlenlen(cs) < 2) break;
-                /* else fall through */
+                [[fallthrough]];
               default:
                 int l;
                 if ((l = my_ismbchar(cs, lip->get_ptr() - 1,
@@ -1690,7 +1690,7 @@
           yylval->lex_str = get_token(lip, 0, lip->yyLength());
           return int_token(yylval->lex_str.str, (uint)yylval->lex_str.length);
         }
-        // fall through
+        [[fallthrough]];
       case MY_LEX_REAL:  // Incomplete real number
         while (my_isdigit(cs, c = lip->yyGet()))
           ;
@@ -1775,7 +1775,7 @@
           break;
         }
         /* " used for strings */
-        // Fall through.
+        [[fallthrough]];
       case MY_LEX_STRING:  // Incomplete text string
         if (!(yylval->lex_str.str = get_text(lip, 1, 1))) {
           state = MY_LEX_CHAR;  // Read char by char
@@ -2893,21 +2893,25 @@
     if (print_error(thd, str)) return;
 
     switch (parent_lex->sql_command) {
-      case SQLCOM_UPDATE:  // Fall through
+      case SQLCOM_UPDATE:
+        [[fallthrough]];
       case SQLCOM_UPDATE_MULTI:
         print_update(thd, str, query_type);
         return;
-      case SQLCOM_DELETE:  // Fall through
+      case SQLCOM_DELETE:
+        [[fallthrough]];
       case SQLCOM_DELETE_MULTI:
         print_delete(thd, str, query_type);
         return;
-      case SQLCOM_INSERT:  // Fall through
+      case SQLCOM_INSERT:
+        [[fallthrough]];
       case SQLCOM_INSERT_SELECT:
       case SQLCOM_REPLACE:
       case SQLCOM_REPLACE_SELECT:
         print_insert(thd, str, query_type);
         return;
-      case SQLCOM_SELECT:  // Fall through
+      case SQLCOM_SELECT:
+        [[fallthrough]];
       default:
         break;
     }
@@ -3611,10 +3615,10 @@
       allowed to be mergeable, which makes the INFORMATION_SCHEMA
       query execution faster.
 
-      According to optimizer team (Roy), making this decision based on
-      the command type here is a hack. This should probably change when
-      we introduce Sql_cmd_show class, which should treat the following
-      SHOW commands same as SQLCOM_SELECT.
+      According to optimizer team (Roy), making this decision based
+      on the command type here is a hack. This should probably change when we
+      introduce Sql_cmd_show class, which should treat the following SHOW
+      commands same as SQLCOM_SELECT.
      */
     case SQLCOM_SHOW_CHARSETS:
     case SQLCOM_SHOW_COLLATIONS:
@@ -3916,46 +3920,45 @@
           static_cast<uint8>(1 << static_cast<int>(TRG_EVENT_UPDATE)) |
           static_cast<uint8>(1 << static_cast<int>(TRG_EVENT_DELETE));
       break;
-    /*
-            Basic INSERT. If there is an additional ON DUPLIATE KEY UPDATE
-            clause, it will be handled later in this method.
-    */
-    case SQLCOM_INSERT: /* fall through */
+    case SQLCOM_INSERT:
     case SQLCOM_INSERT_SELECT:
-    /*
-            LOAD DATA ... INFILE is expected to fire BEFORE/AFTER INSERT
-            triggers.
-            If the statement also has REPLACE clause, it will be
-            handled later in this method.
-    */
-    case SQLCOM_LOAD: /* fall through */
-    /*
-            REPLACE is semantically equivalent to INSERT. In case
-            of a primary or unique key conflict, it deletes the old
-            record and inserts a new one. So we also may need to
-            fire ON DELETE triggers. This functionality is handled
-            later in this method.
-    */
-    case SQLCOM_REPLACE: /* fall through */
+      /*
+        Basic INSERT. If there is an additional ON DUPLIATE KEY
+        UPDATE clause, it will be handled later in this method.
+       */
+    case SQLCOM_LOAD:
+      /*
+        LOAD DATA ... INFILE is expected to fire BEFORE/AFTER
+        INSERT triggers. If the statement also has REPLACE clause, it will be
+        handled later in this method.
+       */
+    case SQLCOM_REPLACE:
     case SQLCOM_REPLACE_SELECT:
-    /*
-            CREATE TABLE ... SELECT defaults to INSERT if the table or
-            view already exists. REPLACE option of CREATE TABLE ...
-            REPLACE SELECT is handled later in this method.
-    */
+      /*
+        REPLACE is semantically equivalent to INSERT. In case
+        of a primary or unique key conflict, it deletes the old
+        record and inserts a new one. So we also may need to
+        fire ON DELETE triggers. This functionality is handled
+        later in this method.
+      */
     case SQLCOM_CREATE_TABLE:
+      /*
+        CREATE TABLE ... SELECT defaults to INSERT if the table
+        or view already exists. REPLACE option of CREATE TABLE ... REPLACE
+        SELECT is handled later in this method.
+       */
       new_trg_event_map |=
           static_cast<uint8>(1 << static_cast<int>(TRG_EVENT_INSERT));
       break;
-    /* Basic update and multi-update */
-    case SQLCOM_UPDATE: /* fall through */
+    case SQLCOM_UPDATE:
     case SQLCOM_UPDATE_MULTI:
+      /* Basic update and multi-update */
       new_trg_event_map |=
           static_cast<uint8>(1 << static_cast<int>(TRG_EVENT_UPDATE));
       break;
-    /* Basic delete and multi-delete */
-    case SQLCOM_DELETE: /* fall through */
+    case SQLCOM_DELETE:
     case SQLCOM_DELETE_MULTI:
+      /* Basic delete and multi-delete */
       new_trg_event_map |=
           static_cast<uint8>(1 << static_cast<int>(TRG_EVENT_DELETE));
       break;
@@ -4816,7 +4819,7 @@
   until_after_gaps = false;
   ssl = ssl_verify_server_cert = heartbeat_opt = repl_ignore_server_ids_opt =
       retry_count_opt = auto_position = port_opt = get_public_key =
-          m_source_connection_auto_failover = LEX_MI_UNCHANGED;
+          m_source_connection_auto_failover = m_gtid_only = LEX_MI_UNCHANGED;
   ssl_key = ssl_cert = ssl_ca = ssl_capath = ssl_cipher = nullptr;
   ssl_crl = ssl_crlpath = nullptr;
   public_key_path = nullptr;
@@ -4832,7 +4835,7 @@
   zstd_compression_level = 0;
   privilege_checks_none = false;
   privilege_checks_username = privilege_checks_hostname = nullptr;
-  require_row_format = -1;
+  require_row_format = LEX_MI_UNCHANGED;
   require_table_primary_key_check = LEX_MI_PK_CHECK_UNCHANGED;
   assign_gtids_to_anonymous_transactions_type =
       LEX_MI_ANONYMOUS_TO_GTID_UNCHANGED;
diff -Nru mysql-8.0-8.0.26/sql/sql_lex.h mysql-8.0-8.0.27/sql/sql_lex.h
--- mysql-8.0-8.0.26/sql/sql_lex.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_lex.h	2021-09-28 11:46:34.000000000 +0000
@@ -381,7 +381,7 @@
   } ssl,
       ssl_verify_server_cert, heartbeat_opt, repl_ignore_server_ids_opt,
       retry_count_opt, auto_position, port_opt, get_public_key,
-      m_source_connection_auto_failover;
+      m_source_connection_auto_failover, m_gtid_only;
   char *ssl_key, *ssl_cert, *ssl_ca, *ssl_capath, *ssl_cipher;
   char *ssl_crl, *ssl_crlpath, *tls_version;
   /*
@@ -926,9 +926,25 @@
     @param create_iterators If false, only access paths are created,
       not iterators. Only top level query blocks (these that we are to call
       exec() on) should have iterators. See also force_create_iterators().
+
+    @param finalize_access_paths Relevant for the hypergraph optimizer only.
+      If false, the given access paths will _not_ be finalized, so you cannot
+      create iterators from it before finalize() is called (see
+      FinalizePlanForQueryBlock()), and create_iterators must also be false.
+      This is relevant only if you are potentially optimizing multiple times
+      (see change_to_access_path_without_in2exists()), since you are only
+      allowed to finalize a query block once. The fake_query_block, if any,
+      is always finalized.
+   */
+  bool optimize(THD *thd, TABLE *materialize_destination, bool create_iterators,
+                bool finalize_access_paths);
+
+  /**
+    For any non-finalized query block, finalize it so that we are allowed to
+    create iterators. Must be called after the final access path is chosen
+    (ie., after any calls to change_to_access_path_without_in2exists()).
    */
-  bool optimize(THD *thd, TABLE *materialize_destination,
-                bool create_iterators);
+  bool finalize(THD *thd);
 
   /**
     Do everything that would be needed before running Init() on the root
@@ -1796,7 +1812,7 @@
 
   bool setup_conds(THD *thd);
   bool prepare(THD *thd, mem_root_deque<Item *> *insert_field_list);
-  bool optimize(THD *thd);
+  bool optimize(THD *thd, bool finalize_access_paths);
   void reset_nj_counters(mem_root_deque<TABLE_LIST *> *join_list = nullptr);
 
   bool change_group_ref_for_func(THD *thd, Item *func, bool *changed);
@@ -4416,9 +4432,24 @@
   Input parameters to the parser.
 */
 struct Parser_input {
+  /**
+    True if the text parsed corresponds to an actual query,
+    and not another text artifact.
+    This flag is used to disable digest parsing of nested:
+    - view definitions
+    - table trigger definitions
+    - table partition definitions
+    - event scheduler event definitions
+  */
+  bool m_has_digest;
+  /**
+    True if the caller needs to compute a digest.
+    This flag is used to request explicitly a digest computation,
+    independently of the performance schema configuration.
+  */
   bool m_compute_digest;
 
-  Parser_input() : m_compute_digest(false) {}
+  Parser_input() : m_has_digest(false), m_compute_digest(false) {}
 };
 
 /**
@@ -4529,12 +4560,12 @@
     return (*THR_MALLOC)->Alloc(size);
   }
   static void *operator new(size_t size, MEM_ROOT *mem_root,
-                            const std::nothrow_t &arg MY_ATTRIBUTE((unused)) =
-                                std::nothrow) noexcept {
+                            const std::nothrow_t &arg
+                            [[maybe_unused]] = std::nothrow) noexcept {
     return mem_root->Alloc(size);
   }
-  static void operator delete(void *ptr MY_ATTRIBUTE((unused)),
-                              size_t size MY_ATTRIBUTE((unused))) {
+  static void operator delete(void *ptr [[maybe_unused]],
+                              size_t size [[maybe_unused]]) {
     TRASH(ptr, size);
   }
   static void operator delete(
@@ -4596,9 +4627,10 @@
   with inconsistent hidden flags. Must be called before adding the item to
   fields.
  */
-inline void assert_consistent_hidden_flags(
-    const mem_root_deque<Item *> &fields MY_ATTRIBUTE((unused)),
-    Item *item MY_ATTRIBUTE((unused)), bool hidden MY_ATTRIBUTE((unused))) {
+inline void assert_consistent_hidden_flags(const mem_root_deque<Item *> &fields
+                                           [[maybe_unused]],
+                                           Item *item [[maybe_unused]],
+                                           bool hidden [[maybe_unused]]) {
 #ifndef NDEBUG
   if (std::find(fields.begin(), fields.end(), item) != fields.end()) {
     // The item is already in the list, so we can't add it
diff -Nru mysql-8.0-8.0.26/sql/sql_lex_hints.cc mysql-8.0-8.0.27/sql/sql_lex_hints.cc
--- mysql-8.0-8.0.26/sql/sql_lex_hints.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_lex_hints.cc	2021-09-28 11:46:34.000000000 +0000
@@ -114,7 +114,7 @@
   }
 }
 
-void HINT_PARSER_error(THD *thd MY_ATTRIBUTE((unused)), Hint_scanner *scanner,
+void HINT_PARSER_error(THD *thd [[maybe_unused]], Hint_scanner *scanner,
                        PT_hint_list **, const char *msg) {
   if (strcmp(msg, "syntax error") == 0)
     msg = ER_THD(thd, ER_WARN_OPTIMIZER_HINT_SYNTAX_ERROR);
diff -Nru mysql-8.0-8.0.26/sql/sql_lex_hints.h mysql-8.0-8.0.27/sql/sql_lex_hints.h
--- mysql-8.0-8.0.26/sql/sql_lex_hints.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_lex_hints.h	2021-09-28 11:46:34.000000000 +0000
@@ -363,7 +363,7 @@
     @param byte         A byte to compare with the byte we skip.
                         Unused in non-debug builds.
   */
-  void skip_byte(char byte MY_ATTRIBUTE((unused))) {
+  void skip_byte(char byte [[maybe_unused]]) {
     assert(peek_byte() == byte);
     skip_byte();
   }
@@ -374,7 +374,7 @@
     @param str          A string of characters to compare with the next byte.
                         Unused in non-debug builds.
   */
-  void skip_byte(const char *str MY_ATTRIBUTE((unused))) {
+  void skip_byte(const char *str [[maybe_unused]]) {
     assert(strchr(str, peek_byte()));
     skip_byte();
   }
diff -Nru mysql-8.0-8.0.26/sql/sql_load.cc mysql-8.0-8.0.27/sql/sql_load.cc
--- mysql-8.0-8.0.26/sql/sql_load.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_load.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1317,7 +1317,7 @@
     case 'N':
       found_null = true;
 
-      /* fall through */
+      [[fallthrough]];
     default:
       return chr;
   }
diff -Nru mysql-8.0-8.0.26/sql/sql_manager.cc mysql-8.0-8.0.27/sql/sql_manager.cc
--- mysql-8.0-8.0.26/sql/sql_manager.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_manager.cc	2021-09-28 11:46:34.000000000 +0000
@@ -59,7 +59,7 @@
 mysql_cond_t COND_manager;
 
 extern "C" {
-static void *handle_manager(void *arg MY_ATTRIBUTE((unused))) {
+static void *handle_manager(void *arg [[maybe_unused]]) {
   int error = 0;
   struct timespec abstime;
   bool reset_flush_time = true;
diff -Nru mysql-8.0-8.0.26/sql/sql_optimizer.cc mysql-8.0-8.0.27/sql/sql_optimizer.cc
--- mysql-8.0-8.0.26/sql/sql_optimizer.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_optimizer.cc	2021-09-28 11:46:34.000000000 +0000
@@ -83,14 +83,15 @@
 #include "sql/opt_costmodel.h"
 #include "sql/opt_explain.h"  // join_type_str
 #include "sql/opt_hints.h"    // hint_table_state
-#include "sql/opt_range.h"    // QUICK_SELECT_I
 #include "sql/opt_trace.h"    // Opt_trace_object
 #include "sql/opt_trace_context.h"
 #include "sql/parse_tree_node_base.h"
 #include "sql/parser_yystype.h"
 #include "sql/query_options.h"
 #include "sql/query_result.h"
-#include "sql/sql_base.h"  // init_ftfuncs
+#include "sql/range_optimizer/partition_pruning.h"
+#include "sql/range_optimizer/range_optimizer.h"  // QUICK_SELECT_I
+#include "sql/sql_base.h"                         // init_ftfuncs
 #include "sql/sql_bitmap.h"
 #include "sql/sql_class.h"
 #include "sql/sql_const.h"
@@ -218,7 +219,7 @@
   return false;
 }
 
-static bool HasFullTextFunction(Item *item) {
+bool HasFullTextFunction(Item *item) {
   return WalkItem(item, enum_walk::PREFIX, [](Item *inner_item) {
     return inner_item->type() == Item::FUNC_ITEM &&
            down_cast<Item_func *>(inner_item)->functype() == Item_func::FT_FUNC;
@@ -226,6 +227,31 @@
 }
 
 /**
+  The List<Item_equal> in COND_EQUAL partially overlaps with the argument list
+  in various Item_cond via C-style casts. However, the hypergraph optimizer can
+  modify the lists in Item_cond (by calling compile()), causing an Item_equal to
+  be replaced with Item_func_eq, and this can cause a List<Item_equal> not to
+  contain Item_equal pointers anymore. This is is obviously bad if anybody wants
+  to actually look into these lists after optimization (in particular, NDB
+  wants this).
+
+  Since untangling this spaghetti seems very hard, we solve it by brute force:
+  Make a copy of all the COND_EQUAL lists, so that they no longer reach into the
+  Item_cond. This allows us to modify the Item_cond at will.
+ */
+static void SaveCondEqualLists(COND_EQUAL *cond_equal) {
+  if (cond_equal == nullptr) {
+    return;
+  }
+  List<Item_equal> copy;
+  for (Item_equal &item : cond_equal->current_level) {
+    copy.push_back(&item);
+  }
+  cond_equal->current_level = std::move(copy);
+  SaveCondEqualLists(cond_equal->upper_levels);
+}
+
+/**
   Optimizes one query block into a query execution plan (QEP.)
 
   This is the entry point to the query optimization phase. This phase
@@ -259,7 +285,7 @@
   @retval false Success.
   @retval true Error, error code saved in member JOIN::error.
 */
-bool JOIN::optimize() {
+bool JOIN::optimize(bool finalize_access_paths) {
   DBUG_TRACE;
 
   uint no_jbuf_after = UINT_MAX;
@@ -289,7 +315,7 @@
 
   const bool has_windows = m_windows.elements != 0;
 
-  if (has_windows && Window::setup_windows2(thd, m_windows))
+  if (has_windows && Window::setup_windows2(thd, &m_windows))
     return true; /* purecov: inspected */
 
   if (query_block->olap == ROLLUP_TYPE && optimize_rollup())
@@ -349,7 +375,8 @@
       // Derived tables and const subqueries are already optimized
       if (!unit->is_optimized() &&
           unit->optimize(thd, /*materialize_destination=*/nullptr,
-                         /*create_iterators=*/false))
+                         /*create_iterators=*/false,
+                         /*finalize_access_paths=*/false))
         return true;
     }
   }
@@ -529,7 +556,14 @@
     std::string trace_str;
     std::string *trace_ptr = thd->opt_trace.is_started() ? &trace_str : nullptr;
 
+    SaveCondEqualLists(cond_equal);
+
     m_root_access_path = FindBestQueryPlan(thd, query_block, trace_ptr);
+    if (finalize_access_paths && m_root_access_path != nullptr) {
+      if (FinalizePlanForQueryBlock(thd, query_block, m_root_access_path)) {
+        return true;
+      }
+    }
 
     // If this query block was modified by IN-to-EXISTS conversion,
     // the outer query block may want to undo that conversion and materialize
@@ -557,6 +591,7 @@
       }
       where_cond = where_cond_no_in2exists;
       having_cond = having_cond_no_in2exists;
+      assert(!finalize_access_paths);
       m_root_access_path_no_in2exists =
           FindBestQueryPlan(thd, query_block, trace_ptr);
     } else {
@@ -745,6 +780,13 @@
     item->walk(&Item::cast_incompatible_args, enum_walk::POSTFIX, nullptr);
   }
 
+  // Also GROUP BY expressions, so that find_in_group_list() doesn't
+  // inadvertently fail because the SELECT list has casts that GROUP BY doesn't.
+  for (ORDER *ord = group_list.order; ord != nullptr; ord = ord->next) {
+    (*ord->item)
+        ->walk(&Item::cast_incompatible_args, enum_walk::POSTFIX, nullptr);
+  }
+
   if (rollup_state != RollupState::NONE) {
     /*
       Fields may have been replaced by Item_rollup_group_item, so
@@ -1176,22 +1218,20 @@
    Sets the plan's state of the JOIN. This is always the final step of
    optimization; starting from this call, we expose the plan to other
    connections (via EXPLAIN CONNECTION) so the plan has to be final.
-   QEP_TAB's quick_optim, condition_optim and keyread_optim are set here.
-*/
+   keyread_optim is set here.
+ */
 void JOIN::set_plan_state(enum_plan_state plan_state_arg) {
   // A plan should not change to another plan:
   assert(plan_state_arg == NO_PLAN || plan_state == NO_PLAN);
   if (plan_state == NO_PLAN && plan_state_arg != NO_PLAN) {
     if (qep_tab != nullptr) {
       /*
-        We want to cover primary tables, tmp tables (they may have a sort, so
-        their "quick" and "condition" may change when execution runs the
-        sort), and sj-mat inner tables. Note that make_tmp_tables_info() may
-        have added a sort to the first non-const primary table, so it's
-        important to do those assignments after make_tmp_tables_info().
+        We want to cover primary tables, tmp tables. Note that
+        make_tmp_tables_info() may have added a sort to the first non-const
+        primary table, so it's important to do this assignment after
+        make_tmp_tables_info().
       */
       for (uint i = const_tables; i < tables; ++i) {
-        qep_tab[i].set_quick_optim();
         qep_tab[i].set_condition_optim();
         qep_tab[i].set_keyread_optim();
       }
@@ -1347,7 +1387,8 @@
 
   subselect_indexsubquery_engine *engine =
       new (thd->mem_root) subselect_indexsubquery_engine(
-          first_qep_tab,
+          first_qep_tab->table(), first_qep_tab->table_ref,
+          first_qep_tab->ref(), first_qep_tab->type(),
           down_cast<Item_in_subselect *>(query_expression()->item),
           first_qep_tab->condition(), having_cond);
   query_expression()->item->set_indexsubquery_engine(engine);
@@ -1405,8 +1446,7 @@
 
   if (plan_is_single_table() && (!group_list.empty() || select_distinct) &&
       !tmp_table_param.sum_func_count &&
-      (!tab->quick() ||
-       tab->quick()->get_type() != QUICK_SELECT_I::QS_TYPE_GROUP_MIN_MAX)) {
+      (!tab->quick() || tab->quick()->get_type() != QS_TYPE_GROUP_MIN_MAX)) {
     if (!group_list.empty() && rollup_state == RollupState::NONE &&
         list_contains_unique_index(tab, find_field_in_order_list,
                                    (void *)group_list.order)) {
@@ -1558,8 +1598,7 @@
       now only for one table queries with covering indexes.
     */
     if (!(query_block->active_options() & SELECT_BIG_RESULT || with_json_agg) ||
-        (tab->quick() &&
-         tab->quick()->get_type() == QUICK_SELECT_I::QS_TYPE_GROUP_MIN_MAX)) {
+        (tab->quick() && tab->quick()->get_type() == QS_TYPE_GROUP_MIN_MAX)) {
       if (simple_group &&    // GROUP BY is possibly skippable
           !select_distinct)  // .. if not preceded by a DISTINCT
       {
@@ -2185,9 +2224,8 @@
       by clustered PK values.
     */
 
-    if (quick_type == QUICK_SELECT_I::QS_TYPE_INDEX_MERGE ||
-        quick_type == QUICK_SELECT_I::QS_TYPE_ROR_UNION ||
-        quick_type == QUICK_SELECT_I::QS_TYPE_ROR_INTERSECT)
+    if (quick_type == QS_TYPE_INDEX_MERGE || quick_type == QS_TYPE_ROR_UNION ||
+        quick_type == QS_TYPE_ROR_INTERSECT)
       return false;
     ref_key = tab->quick()->index;
     ref_key_parts = tab->quick()->used_key_parts;
@@ -2262,15 +2300,18 @@
           trace_recest.add_utf8_table(tab->table_ref)
               .add_utf8("index", table->key_info[new_ref_key].name);
           QUICK_SELECT_I *qck;
+          MEM_ROOT temp_mem_root(key_memory_test_quick_select_exec,
+                                 thd->variables.range_alloc_block_size);
           const bool no_quick =
               test_quick_select(
-                  thd, new_ref_key_map,
+                  thd, thd->mem_root, &temp_mem_root, new_ref_key_map, 0,
                   0,  // empty table_map
                   join->calc_found_rows
                       ? HA_POS_ERROR
                       : join->query_expression()->select_limit_cnt,
                   false,  // don't force quick range
-                  order.order->direction, tab,
+                  order.order->direction, tab->table(),
+                  tab->skip_records_in_range(),
                   // we are after make_join_query_block():
                   tab->condition(), &tab->needed_reg, &qck,
                   tab->table()->force_index, join->query_block) <= 0;
@@ -2374,15 +2415,18 @@
 
       Key_map keys_to_use;            // Force the creation of quick select
       keys_to_use.set_bit(best_key);  // only best_key.
+      MEM_ROOT temp_mem_root(key_memory_test_quick_select_exec,
+                             thd->variables.range_alloc_block_size);
       QUICK_SELECT_I *qck;
       test_quick_select(
-          thd, keys_to_use,
+          thd, thd->mem_root, &temp_mem_root, keys_to_use, 0,
           0,  // empty table_map
           join->calc_found_rows ? HA_POS_ERROR
                                 : join->query_expression()->select_limit_cnt,
           true,  // force quick range
-          order.order->direction, tab, tab->condition(), &tab->needed_reg, &qck,
-          tab->table()->force_index, join->query_block);
+          order.order->direction, tab->table(), tab->skip_records_in_range(),
+          tab->condition(), &tab->needed_reg, &qck, tab->table()->force_index,
+          join->query_block);
       if (order_direction < 0 && tab->quick() != nullptr &&
           tab->quick() != save_quick) {
         /*
@@ -2395,7 +2439,7 @@
             3 - constructed right above
           In this case we drop quick #2 as #3 is expected to be better.
         */
-        delete tab->quick();
+        destroy(tab->quick());
         tab->set_quick(nullptr);
       }
       /*
@@ -2555,7 +2599,7 @@
           /* purecov: end */
         }
         if (tab->quick() != tmp && tab->quick() != save_quick)
-          delete tab->quick();
+          destroy(tab->quick());
         tab->set_quick(tmp);
         tab->set_type(calc_join_type(tmp->get_type()));
         tab->position()->filter_effect = COND_FILTER_STALE;
@@ -2599,11 +2643,11 @@
     }
 
     // Keep current (ordered) tab->quick()
-    if (save_quick != tab->quick()) delete save_quick;
+    if (save_quick != tab->quick()) destroy(save_quick);
   } else {
     // Restore original save_quick
     if (tab->quick() != save_quick) {
-      delete tab->quick();
+      destroy(tab->quick());
       tab->set_quick(save_quick);
     }
   }
@@ -2747,21 +2791,25 @@
             trace, "rerunning_range_optimizer_for_single_index");
 
         QUICK_SELECT_I *qck;
+        MEM_ROOT temp_mem_root(key_memory_test_quick_select_exec,
+                               thd->variables.range_alloc_block_size);
         if (test_quick_select(
-                thd, new_ref_key_map, 0,  // empty table_map
-                tab->join()->row_limit, false, ordering, tab,
+                thd, thd->mem_root, &temp_mem_root, new_ref_key_map, 0,
+                0,  // empty table_map
+                tab->join()->row_limit, false, ordering, tab->table(),
+                tab->skip_records_in_range(),
                 tab->join_cond() ? tab->join_cond() : tab->join()->where_cond,
                 &tab->needed_reg, &qck, recheck_range,
                 tab->join()->query_block) > 0) {
           if (length < qck->max_used_key_length) {
-            delete tab->quick();
+            destroy(tab->quick());
             tab->set_quick(qck);
             return true;
           } else {
             Opt_trace_object(trace, "access_type_unchanged")
                 .add("ref_key_length", length)
                 .add("range_key_length", qck->max_used_key_length);
-            delete qck;
+            destroy(qck);
           }
         }
       } else
@@ -2835,7 +2883,7 @@
         tab->position()->filter_effect = COND_FILTER_STALE;
       } else {
         // Cleanup quick, REF/REF_OR_NULL/EQ_REF, will be clarified later
-        delete tab->quick();
+        ::destroy(tab->quick());
         tab->set_quick(nullptr);
       }
     }
@@ -3041,7 +3089,7 @@
           We must use the duplicate-eliminating index, so this QUICK is not
           an option.
         */
-        delete tab->quick();
+        ::destroy(tab->quick());
         tab->set_quick(nullptr);
       }
       if (!pos->key) {
@@ -3491,8 +3539,8 @@
 class COND_CMP : public ilink<COND_CMP> {
  public:
   static void *operator new(size_t size) { return (*THR_MALLOC)->Alloc(size); }
-  static void operator delete(void *ptr MY_ATTRIBUTE((unused)),
-                              size_t size MY_ATTRIBUTE((unused))) {
+  static void operator delete(void *ptr [[maybe_unused]],
+                              size_t size [[maybe_unused]]) {
     TRASH(ptr, size);
   }
 
@@ -3627,12 +3675,6 @@
 static bool check_simple_equality(THD *thd, Item *left_item, Item *right_item,
                                   Item *item, COND_EQUAL *cond_equal,
                                   bool *simple_equality) {
-  if (thd->lex->using_hypergraph_optimizer) {
-    // We cannot handle loops in the query graph yet.
-    *simple_equality = false;
-    return false;
-  }
-
   *simple_equality = false;
 
   if (left_item->type() == Item::REF_ITEM &&
@@ -4376,7 +4418,7 @@
   if (((Item *)item_equal)->const_item() && !item_equal->val_int())
     return new Item_func_false();
   Item *const item_const = item_equal->get_const();
-  Item_equal_iterator it(*item_equal);
+  auto it = item_equal->get_fields().begin();
   if (!item_const) {
     /*
       If there is a const item, match all field items with the const item,
@@ -4384,14 +4426,14 @@
     */
     it++;
   }
-  Item_field *item_field;  // Field to generate equality for.
-  while ((item_field = it++)) {
+  while (it != item_equal->get_fields().end()) {
     /*
       Generate an equality of the form:
       item_field = some previous field in item_equal's list.
 
       First see if we really need to generate it:
     */
+    Item_field *item_field = &*it++;  // Field to generate equality for.
     Item_equal *const upper = item_field->find_item_equal(upper_levels);
     if (upper)  // item_field is in this upper equality
     {
@@ -4409,8 +4451,8 @@
 
       if (!(tab && sj_is_materialize_strategy(tab->get_sj_strategy()))) {
         Item_field *item_match;
-        Item_equal_iterator li(*item_equal);
-        while ((item_match = li++) != item_field) {
+        auto li = item_equal->get_fields().begin();
+        while ((item_match = &*li++) != item_field) {
           if (item_match->find_item_equal(upper_levels) == upper)
             break;  // (item_match, item_field) is also in upper level equality
         }
@@ -5964,12 +6006,14 @@
     QUICK_SELECT_I *qck;
     Key_map keys_to_use = tab->const_keys;
     keys_to_use.merge(tab->skip_scan_keys);
+    MEM_ROOT temp_mem_root(key_memory_test_quick_select_exec,
+                           thd->variables.range_alloc_block_size);
     int error = test_quick_select(
-        thd, keys_to_use,
+        thd, thd->mem_root, &temp_mem_root, keys_to_use, 0,
         0,  // empty table_map
         limit,
         false,  // don't force quick range
-        ORDER_NOT_RELEVANT, tab,
+        ORDER_NOT_RELEVANT, tab->table(), tab->skip_records_in_range(),
         tab->join_cond() ? tab->join_cond() : tab->join()->where_cond,
         &tab->needed_reg, &qck, tab->table()->force_index,
         tab->join()->query_block);
@@ -7044,11 +7088,9 @@
     Add to the set of possible key values every substitution of
     the field for an equal field included into item_equal
   */
-  Item_equal_iterator it(*item_equal);
-  Item_field *item;
-  while ((item = it++)) {
-    if (!field_item->field->eq(item->field)) {
-      if (add_key_field(thd, key_fields, and_level, cond, item, eq_func, val,
+  for (Item_field &item : item_equal->get_fields()) {
+    if (!field_item->field->eq(item.field)) {
+      if (add_key_field(thd, key_fields, and_level, cond, &item, eq_func, val,
                         num_values, usable_tables, sargables))
         return true;
     }
@@ -7455,10 +7497,8 @@
           field1=const_item as a condition allowing an index access of the table
           with field1 by the keys value of field1.
         */
-        Item_equal_iterator it(*item_equal);
-        Item_field *item;
-        while ((item = it++)) {
-          if (add_key_field(thd, key_fields, *and_level, cond_func, item, true,
+        for (Item_field &item : item_equal->get_fields()) {
+          if (add_key_field(thd, key_fields, *and_level, cond_func, &item, true,
                             &const_item, 1, usable_tables, sargables))
             return true;
         }
@@ -7469,20 +7509,15 @@
           field1=field2 as a condition allowing an index access of the table
           with field1 by the keys value of field2.
         */
-        Item_equal_iterator outer_it(*item_equal);
-        Item_equal_iterator inner_it(*item_equal);
-        Item_field *outer;
-        while ((outer = outer_it++)) {
-          Item_field *inner;
-          while ((inner = inner_it++)) {
-            if (!outer->field->eq(inner->field)) {
-              if (add_key_field(thd, key_fields, *and_level, cond_func, outer,
-                                true, (Item **)&inner, 1, usable_tables,
-                                sargables))
+        for (Item_field &outer : item_equal->get_fields()) {
+          for (Item_field &inner : item_equal->get_fields()) {
+            if (!outer.field->eq(inner.field)) {
+              Item *inner_ptr = &inner;
+              if (add_key_field(thd, key_fields, *and_level, cond_func, &outer,
+                                true, &inner_ptr, 1, usable_tables, sargables))
                 return true;
             }
           }
-          inner_it.rewind();
         }
       }
       break;
@@ -7803,7 +7838,7 @@
       case Item_sum::AVG_DISTINCT_FUNC:
       case Item_sum::SUM_DISTINCT_FUNC:
         if (sum_item->argument_count() == 1) break;
-      /* fall through */
+        [[fallthrough]];
       default:
         return false;
     }
@@ -9374,9 +9409,8 @@
               We keep (for now) the QUICK AM calculated in
               get_quick_record_count().
             */
-            assert(tab->quick()->is_valid());
           } else {
-            delete tab->quick();
+            destroy(tab->quick());
             tab->set_quick(nullptr);
           }
         }
@@ -9534,18 +9568,22 @@
             bool search_if_impossible = recheck_reason != DONT_RECHECK;
             if (search_if_impossible) {
               if (tab->quick()) {
-                delete tab->quick();
+                destroy(tab->quick());
                 tab->set_type(JT_ALL);
               }
               QUICK_SELECT_I *qck;
+              MEM_ROOT temp_mem_root(key_memory_test_quick_select_exec,
+                                     thd->variables.range_alloc_block_size);
               search_if_impossible =
                   test_quick_select(
-                      thd, usable_keys, used_tables & ~tab->table_ref->map(),
+                      thd, thd->mem_root, &temp_mem_root, usable_keys,
+                      used_tables & ~tab->table_ref->map(), 0,
                       join->calc_found_rows
                           ? HA_POS_ERROR
                           : join->query_expression()->select_limit_cnt,
                       false,  // don't force quick range
-                      interesting_order, tab, tab->condition(),
+                      interesting_order, tab->table(),
+                      tab->skip_records_in_range(), tab->condition(),
                       &tab->needed_reg, &qck, tab->table()->force_index,
                       join->query_block) < 0;
               tab->set_quick(qck);
@@ -9560,18 +9598,22 @@
                 return true;  // No ON, so it's really "impossible WHERE"
               Opt_trace_object trace_without_on(trace, "without_ON_clause");
               if (tab->quick()) {
-                delete tab->quick();
+                destroy(tab->quick());
                 tab->set_type(JT_ALL);
               }
               QUICK_SELECT_I *qck;
+              MEM_ROOT temp_mem_root(key_memory_test_quick_select_exec,
+                                     thd->variables.range_alloc_block_size);
               const bool impossible_where =
                   test_quick_select(
-                      thd, tab->keys(), used_tables & ~tab->table_ref->map(),
+                      thd, thd->mem_root, &temp_mem_root, tab->keys(),
+                      used_tables & ~tab->table_ref->map(), 0,
                       join->calc_found_rows
                           ? HA_POS_ERROR
                           : join->query_expression()->select_limit_cnt,
                       false,  // don't force quick range
-                      ORDER_NOT_RELEVANT, tab, tab->condition(),
+                      ORDER_NOT_RELEVANT, tab->table(),
+                      tab->skip_records_in_range(), tab->condition(),
                       &tab->needed_reg, &qck, tab->table()->force_index,
                       join->query_block) < 0;
               tab->set_quick(qck);
@@ -10487,6 +10529,9 @@
 
   assert(query_block->has_ft_funcs());
 
+  // Only used by the old optimizer.
+  assert(!thd->lex->using_hypergraph_optimizer);
+
   for (uint i = const_tables; i < tables; i++) {
     JOIN_TAB *tab = best_ref[i];
     if (tab->type() != JT_FT) continue;
diff -Nru mysql-8.0-8.0.26/sql/sql_optimizer.h mysql-8.0-8.0.27/sql/sql_optimizer.h
--- mysql-8.0-8.0.26/sql/sql_optimizer.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_optimizer.h	2021-09-28 11:46:34.000000000 +0000
@@ -156,8 +156,6 @@
   JOIN_TAB **best_ref{nullptr};
   /// mapping between table indexes and JOIN_TABs
   JOIN_TAB **map2table{nullptr};
-  ///< mapping between table indexes and QEB_TABs
-  QEP_TAB **map2qep_tab{nullptr};
   /*
     The table which has an index that allows to produce the requried ordering.
     A special value of 0x1 means that the ordering will be produced by
@@ -611,7 +609,7 @@
   */
   bool plan_is_single_table() { return primary_tables - const_tables == 1; }
 
-  bool optimize();
+  bool optimize(bool finalize_access_paths);
   void reset();
   bool prepare_result();
   void destroy();
@@ -714,7 +712,7 @@
  public:
   bool update_equalities_for_sjm();
   bool add_sorting_to_table(uint idx, ORDER_with_src *order,
-                            bool force_stable_sort, bool sort_before_group);
+                            bool sort_before_group);
   bool decide_subquery_strategy();
   void refine_best_rowcount();
   table_map calculate_deps_of_remaining_lateral_derived_tables(
@@ -788,6 +786,13 @@
    */
   void refresh_base_slice();
 
+  /**
+    Whether this query block needs finalization (see
+    FinalizePlanForQueryBlock()) before it can be actually used.
+    This only happens when using the hypergraph join optimizer.
+   */
+  bool needs_finalize{false};
+
  private:
   bool optimized{false};  ///< flag to avoid double optimization in EXPLAIN
 
@@ -1194,4 +1199,6 @@
  */
 bool ref_lookup_subsumes_comparison(Field *field, Item *right_item);
 
+bool HasFullTextFunction(Item *item);
+
 #endif /* SQL_OPTIMIZER_INCLUDED */
diff -Nru mysql-8.0-8.0.26/sql/sql_parse.cc mysql-8.0-8.0.27/sql/sql_parse.cc
--- mysql-8.0-8.0.26/sql/sql_parse.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_parse.cc	2021-09-28 11:46:34.000000000 +0000
@@ -32,6 +32,7 @@
 #include <functional>
 #include <iterator>
 #include <memory>
+#include <optional>
 #include <string>
 #include <utility>
 #include <vector>
@@ -72,9 +73,9 @@
 #include "mysql_version.h"
 #include "mysqld_error.h"
 #include "mysys_err.h"  // EE_CAPACITY_EXCEEDED
-#include "nullable.h"
 #include "pfs_thread_provider.h"
 #include "prealloced_array.h"
+#include "scope_guard.h"
 #include "sql/auth/auth_acls.h"
 #include "sql/auth/auth_common.h"  // acl_authenticate
 #include "sql/auth/sql_security_ctx.h"
@@ -195,7 +196,6 @@
 class Abstract_table;
 }  // namespace dd
 
-using Mysql::Nullable;
 using std::max;
 
 /**
@@ -248,6 +248,7 @@
     "Binlog Dump GTID",
     "Reset Connection",
     "clone",
+    "Group Replication Data Stream subscription",
     "Error"  // Last command number
 };
 
@@ -1488,6 +1489,43 @@
                                    query_length);
 }
 
+/*Reference to the GR callback that receives incoming connections*/
+static std::atomic<gr_incoming_connection_cb> com_incoming_gr_stream_cb;
+
+void set_gr_incoming_connection(gr_incoming_connection_cb x) {
+  com_incoming_gr_stream_cb.store(x);
+}
+
+gr_incoming_connection_cb get_gr_incoming_connection() {
+  gr_incoming_connection_cb retval = nullptr;
+  retval = com_incoming_gr_stream_cb.load();
+  return retval;
+}
+
+void call_gr_incoming_connection_cb(THD *thd, int fd, SSL *ssl_ctx) {
+  gr_incoming_connection_cb gr_connection_callback =
+      get_gr_incoming_connection();
+
+  if (gr_connection_callback) {
+    gr_connection_callback(thd, fd, ssl_ctx);
+
+    PSI_stage_info saved_stage;
+    mysql_mutex_lock(&thd->LOCK_group_replication_connection_mutex);
+    thd->ENTER_COND(&thd->COND_group_replication_connection_cond_var,
+                    &thd->LOCK_group_replication_connection_mutex,
+                    &stage_communication_delegation, &saved_stage);
+    while (thd->is_killed() == THD::NOT_KILLED) {
+      struct timespec abstime;
+      set_timespec(&abstime, 1);
+      mysql_cond_timedwait(&thd->COND_group_replication_connection_cond_var,
+                           &thd->LOCK_group_replication_connection_mutex,
+                           &abstime);
+    }
+    mysql_mutex_unlock(&thd->LOCK_group_replication_connection_mutex);
+    thd->EXIT_COND(&saved_stage);
+  }
+}
+
 /**
   Deep copy the name and value of named parameters into the THD memory.
 
@@ -1709,6 +1747,25 @@
 
       break;
     }
+    case COM_SUBSCRIBE_GROUP_REPLICATION_STREAM: {
+      Security_context *sctx = thd->security_context();
+      if (!sctx->has_global_grant(STRING_WITH_LEN("GROUP_REPLICATION_STREAM"))
+               .first) {
+        my_error(ER_SPECIFIC_ACCESS_DENIED_ERROR, MYF(0), "");
+        error = true;
+        break;
+      }
+
+      if (!error && get_gr_incoming_connection() == nullptr) {
+        my_error(ER_UNKNOWN_COM_ERROR, MYF(0));
+        error = true;
+        break;
+      }
+
+      my_ok(thd);
+
+      break;
+    }
     case COM_CHANGE_USER: {
       int auth_rc;
       thd->status_var.com_other++;
@@ -1844,6 +1901,8 @@
       Parser_state parser_state;
       if (parser_state.init(thd, thd->query().str, thd->query().length)) break;
 
+      parser_state.m_input.m_has_digest = true;
+
       // we produce digest if it's not explicitly turned off
       // by setting maximum digest length to zero
       if (get_max_digest_length() != 0)
@@ -2057,6 +2116,7 @@
       }
 
       thd->cleanup_after_query();
+      thd->lex->destroy();
       break;
     }
     case COM_QUIT:
@@ -2124,13 +2184,14 @@
       if (trans_commit_implicit(thd)) break;
       close_thread_tables(thd);
       thd->mdl_context.release_transactional_locks();
+      thd->lex->destroy();
       my_ok(thd);
       break;
     }
     case COM_STATISTICS: {
       System_status_var current_global_status_var;
       ulong uptime;
-      size_t length MY_ATTRIBUTE((unused));
+      size_t length [[maybe_unused]];
       ulonglong queries_per_second1000;
       char buff[250];
       size_t buff_len = sizeof(buff);
@@ -2254,6 +2315,13 @@
     error = clone_cmd->execute_server(thd);
   }
 
+  if (command == COM_SUBSCRIBE_GROUP_REPLICATION_STREAM && !error) {
+    call_gr_incoming_connection_cb(
+        thd, thd->active_vio->mysql_socket.fd,
+        thd->active_vio->ssl_arg ? static_cast<SSL *>(thd->active_vio->ssl_arg)
+                                 : nullptr);
+  }
+
   thd->rpl_thd_ctx.session_gtids_ctx().notify_after_response_packet(thd);
 
   if (!thd->is_error() && !thd->killed)
@@ -3530,10 +3598,11 @@
           set_var_password *setpasswd = static_cast<set_var_password *>(var);
           if (setpasswd->has_generated_password()) {
             const LEX_USER *user = setpasswd->get_user();
-            generated_passwords.push_back(
-                {std::string(user->user.str, user->user.length),
-                 std::string(user->host.str, user->host.length),
-                 setpasswd->get_generated_password()});
+            random_password_info p{
+                std::string(user->user.str, user->user.length),
+                std::string(user->host.str, user->host.length),
+                setpasswd->get_generated_password(), 1};
+            generated_passwords.push_back(p);
           }
         }
         if (generated_passwords.size() > 0) {
@@ -3910,7 +3979,7 @@
         my_ok(thd);
         break;
       }
-      // Fall through.
+      [[fallthrough]];
     case SQLCOM_FLUSH: {
       int write_to_binlog;
       if (is_reload_request_denied(thd, lex->type)) goto error;
@@ -4100,7 +4169,7 @@
       thd->binlog_invoker();
 
       if (!(res = sp_create_routine(thd, lex->sphead, thd->lex->definer))) {
-        /* only add privileges if really neccessary */
+        /* only add privileges if really necessary */
 
         Security_context security_context;
         bool restore_backup_context = false;
@@ -4349,7 +4418,7 @@
     case SQLCOM_HA_READ:
     case SQLCOM_HA_CLOSE:
       assert(first_table == all_tables && first_table != nullptr);
-      /* fall through */
+      [[fallthrough]];
     case SQLCOM_CREATE_SERVER:
     case SQLCOM_CREATE_RESOURCE_GROUP:
     case SQLCOM_ALTER_SERVER:
@@ -4443,11 +4512,22 @@
       Security_context *sctx = thd->security_context();
       bool own_password_expired = sctx->password_expired();
       bool check_permission = true;
+      /* track if it is ALTER USER registration step */
+      bool finish_reg = false;
+      bool init_reg = false;
+      bool unregister = false;
+      bool is_self = false;
 
       List_iterator<LEX_USER> user_list(lex->users_list);
       while ((tmp_user = user_list++)) {
+        LEX_MFA *tmp_lex_mfa;
+        List_iterator<LEX_MFA> mfa_list_it(tmp_user->mfa_list);
+        while ((tmp_lex_mfa = mfa_list_it++)) {
+          finish_reg |= tmp_lex_mfa->finish_registration;
+          init_reg |= tmp_lex_mfa->init_registration;
+          unregister |= tmp_lex_mfa->unregister;
+        }
         bool update_password_only = false;
-        bool is_self = false;
         bool second_password = false;
 
         /* If it is an empty lex_user update it with current user */
@@ -4464,15 +4544,14 @@
 
         /* copy password expire attributes to individual lex user */
         user->alter_status = thd->lex->alter_password;
-
         /*
           Only self password change is non-privileged operation. To detect the
           same, we find :
           (1) If it is only password change operation
           (2) If this operation is on self
         */
-        if (user->uses_identified_by_clause &&
-            !user->uses_identified_with_clause &&
+        if (user->first_factor_auth_info.uses_identified_by_clause &&
+            !user->first_factor_auth_info.uses_identified_with_clause &&
             !thd->lex->mqh.specified_limits &&
             !user->alter_status.update_account_locked_column &&
             !user->alter_status.update_password_expired_column &&
@@ -4491,6 +4570,14 @@
                           user->user.str) &&
                   !my_strcasecmp(&my_charset_latin1, user->host.str,
                                  sctx->priv_host().str);
+        if (finish_reg || init_reg) {
+          /* Registration step is allowed only for connecting users */
+          if (!is_self) {
+            my_error(ER_INVALID_USER_FOR_REGISTRATION, MYF(0), sctx->user().str,
+                     sctx->priv_host().str);
+            goto error;
+          }
+        }
         /*
           if user executes ALTER statement to change password only
           for himself then skip access check - Provided preference to
@@ -4500,7 +4587,9 @@
         if (user->discard_old_password || user->retain_current_password) {
           second_password = true;
         }
-        if ((update_password_only || user->discard_old_password) && is_self) {
+        if ((update_password_only || user->discard_old_password || init_reg ||
+             finish_reg || unregister) &&
+            is_self) {
           changing_own_password = update_password_only;
           if (second_password) {
             if (check_access(thd, UPDATE_ACL, consts::mysql.c_str(), nullptr,
@@ -4524,9 +4613,10 @@
           check_permission = false;
         }
 
-        if (is_self && (user->uses_identified_by_clause ||
-                        user->uses_identified_with_clause ||
-                        user->uses_authentication_string_clause)) {
+        if (is_self &&
+            (user->first_factor_auth_info.uses_identified_by_clause ||
+             user->first_factor_auth_info.uses_identified_with_clause ||
+             user->first_factor_auth_info.uses_authentication_string_clause)) {
           changing_own_password = true;
           break;
         }
@@ -4543,9 +4633,17 @@
         my_error(ER_MUST_CHANGE_PASSWORD, MYF(0));
         goto error;
       }
-
       /* Conditionally writes to binlog */
       res = mysql_alter_user(thd, lex->users_list, lex->drop_if_exists);
+      /*
+        Iterate over list of MFA methods, check if all auth plugin methods
+        which need registration steps have completed, then turn OFF server
+        sandbox mode
+      */
+      tmp_user = lex->users_list[0];
+      if (!res && is_self && finish_reg) {
+        if (turn_off_sandbox_mode(thd, tmp_user)) return true;
+      }
       break;
     }
     default:
@@ -4700,9 +4798,9 @@
   if (test_flags & TEST_DO_QUICK_LEAK_CHECK) {
     static unsigned long total_leaked_bytes = 0;
     unsigned long leaked = 0;
-    unsigned long dubious MY_ATTRIBUTE((unused));
-    unsigned long reachable MY_ATTRIBUTE((unused));
-    unsigned long suppressed MY_ATTRIBUTE((unused));
+    unsigned long dubious [[maybe_unused]];
+    unsigned long reachable [[maybe_unused]];
+    unsigned long suppressed [[maybe_unused]];
     /*
       We could possibly use VALGRIND_DO_CHANGED_LEAK_CHECK here,
       but that is a fairly new addition to the Valgrind api.
@@ -4746,7 +4844,7 @@
   @returns false if check is successful, true if error
 */
 
-bool show_precheck(THD *thd, LEX *lex, bool lock MY_ATTRIBUTE((unused))) {
+bool show_precheck(THD *thd, LEX *lex, bool lock [[maybe_unused]]) {
   assert(lex->sql_command == SQLCOM_SHOW_CREATE_USER);
   TABLE_LIST *const tables = lex->query_tables;
   if (tables != nullptr) {
@@ -5014,12 +5112,16 @@
         }
         lex->set_trg_event_type_for_tables();
 
-        int error MY_ATTRIBUTE((unused));
-        if (unlikely(thd->security_context()->password_expired() &&
-                     lex->sql_command != SQLCOM_SET_PASSWORD &&
-                     lex->sql_command != SQLCOM_SET_OPTION &&
-                     lex->sql_command != SQLCOM_ALTER_USER)) {
-          my_error(ER_MUST_CHANGE_PASSWORD, MYF(0));
+        int error [[maybe_unused]];
+        if (unlikely(
+                (thd->security_context()->password_expired() ||
+                 thd->security_context()->is_in_registration_sandbox_mode()) &&
+                lex->sql_command != SQLCOM_SET_PASSWORD &&
+                lex->sql_command != SQLCOM_ALTER_USER)) {
+          if (thd->security_context()->is_in_registration_sandbox_mode())
+            my_error(ER_PLUGIN_REQUIRES_REGISTRATION, MYF(0));
+          else
+            my_error(ER_MUST_CHANGE_PASSWORD, MYF(0));
           error = 1;
         } else {
           resourcegroups::Resource_group *src_res_grp = nullptr;
@@ -5045,8 +5147,8 @@
     }
   } else {
     /*
-      Log the failed raw query in the Performance Schema. This statement did not
-      parse, so there is no way to tell if it may contain a password of not.
+      Log the failed raw query in the Performance Schema. This statement did
+      not parse, so there is no way to tell if it may contain a password of not.
 
       The tradeoff is:
         a) If we do log the query, a user typing by accident a broken query
@@ -5163,7 +5265,7 @@
     const char *change, List<String> *interval_list, const CHARSET_INFO *cs,
     bool has_explicit_collation, uint uint_geom_type,
     Value_generator *gcol_info, Value_generator *default_val_expr,
-    const char *opt_after, Nullable<gis::srid_t> srid,
+    const char *opt_after, std::optional<gis::srid_t> srid,
     Sql_check_constraint_spec_list *col_check_const_spec_list,
     dd::Column::enum_hidden_type hidden, bool is_array) {
   uint8 datetime_precision = decimals ? atoi(decimals) : 0;
@@ -6151,13 +6253,12 @@
 */
 
 static uint kill_one_thread(THD *thd, my_thread_id id, bool only_kill_query) {
-  THD *tmp = nullptr;
   uint error = ER_NO_SUCH_THREAD;
   Find_thd_with_id find_thd_with_id(id);
 
   DBUG_TRACE;
   DBUG_PRINT("enter", ("id=%u only_kill=%d", id, only_kill_query));
-  tmp = Global_THD_manager::get_instance()->find_thd(&find_thd_with_id);
+  THD_ptr tmp = Global_THD_manager::get_instance()->find_thd(&find_thd_with_id);
   Security_context *sctx = thd->security_context();
   if (tmp) {
     /*
@@ -6184,6 +6285,7 @@
         Process the kill:
         if thread is not already undergoing any kill connection.
         Killer must have SYSTEM_USER privilege iff killee has the same privilege
+        privilege
       */
       if (tmp->killed != THD::KILL_CONNECTION) {
         if (tmp->is_system_user() && !thd->is_system_user()) {
@@ -6196,7 +6298,6 @@
         error = 0;
     } else
       error = ER_KILL_DENIED_ERROR;
-    mysql_mutex_unlock(&tmp->LOCK_thd_data);
   }
   DEBUG_SYNC(thd, "kill_thd_end");
   DBUG_PRINT("exit", ("%d", error));
@@ -6363,7 +6464,7 @@
   return invert ? (Comp_creator *)&ne_creator : (Comp_creator *)&eq_creator;
 }
 
-Comp_creator *comp_equal_creator(bool invert MY_ATTRIBUTE((unused))) {
+Comp_creator *comp_equal_creator(bool invert [[maybe_unused]]) {
   assert(!invert);  // Function never called with true.
   return &equal_creator;
 }
@@ -6461,12 +6562,12 @@
   definer->host.str = sctx->priv_host().str;
   definer->host.length = strlen(definer->host.str);
 
-  definer->plugin = EMPTY_CSTR;
-  definer->auth = NULL_CSTR;
+  definer->first_factor_auth_info.plugin = EMPTY_CSTR;
+  definer->first_factor_auth_info.auth = NULL_CSTR;
   definer->current_auth = NULL_CSTR;
-  definer->uses_identified_with_clause = false;
-  definer->uses_identified_by_clause = false;
-  definer->uses_authentication_string_clause = false;
+  definer->first_factor_auth_info.uses_identified_with_clause = false;
+  definer->first_factor_auth_info.uses_identified_by_clause = false;
+  definer->first_factor_auth_info.uses_authentication_string_clause = false;
   definer->uses_replace_clause = false;
   definer->retain_current_password = false;
   definer->discard_old_password = false;
@@ -6477,7 +6578,7 @@
   definer->alter_status.account_locked = false;
   definer->alter_status.update_password_require_current =
       Lex_acl_attrib_udyn::DEFAULT;
-  definer->has_password_generator = false;
+  definer->first_factor_auth_info.has_password_generator = false;
   definer->alter_status.failed_login_attempts = 0;
   definer->alter_status.password_lock_time = 0;
   definer->alter_status.update_failed_login_attempts = false;
@@ -6498,7 +6599,7 @@
 LEX_USER *create_default_definer(THD *thd) {
   LEX_USER *definer;
 
-  if (!(definer = (LEX_USER *)thd->alloc(sizeof(LEX_USER)))) return nullptr;
+  if (!(definer = (LEX_USER *)LEX_USER::alloc(thd))) return nullptr;
 
   thd->get_definer(definer);
 
@@ -6528,23 +6629,25 @@
         This is needed because a LEX_USER is both used as a component in an
         AST and as a specifier for a particular user in the ACL subsystem.
       */
-      default_definer->uses_authentication_string_clause =
-          user->uses_authentication_string_clause;
-      default_definer->uses_identified_by_clause =
-          user->uses_identified_by_clause;
-      default_definer->uses_identified_with_clause =
-          user->uses_identified_with_clause;
+      default_definer->first_factor_auth_info
+          .uses_authentication_string_clause =
+          user->first_factor_auth_info.uses_authentication_string_clause;
+      default_definer->first_factor_auth_info.uses_identified_by_clause =
+          user->first_factor_auth_info.uses_identified_by_clause;
+      default_definer->first_factor_auth_info.uses_identified_with_clause =
+          user->first_factor_auth_info.uses_identified_with_clause;
       default_definer->uses_replace_clause = user->uses_replace_clause;
       default_definer->current_auth.str = user->current_auth.str;
       default_definer->current_auth.length = user->current_auth.length;
       default_definer->retain_current_password = user->retain_current_password;
       default_definer->discard_old_password = user->discard_old_password;
-      default_definer->plugin.str = user->plugin.str;
-      default_definer->plugin.length = user->plugin.length;
-      default_definer->auth.str = user->auth.str;
-      default_definer->auth.length = user->auth.length;
+      default_definer->first_factor_auth_info.plugin =
+          user->first_factor_auth_info.plugin;
+      default_definer->first_factor_auth_info.auth =
+          user->first_factor_auth_info.auth;
       default_definer->alter_status = user->alter_status;
-      default_definer->has_password_generator = user->has_password_generator;
+      default_definer->first_factor_auth_info.has_password_generator =
+          user->first_factor_auth_info.has_password_generator;
       return default_definer;
     }
   }
@@ -6736,6 +6839,7 @@
       ... handle error
     }
 
+    parser_state.m_input.m_has_digest= true;
     parser_state.m_input.m_compute_digest= true;
 
     rc= parse_sql(the, &parser_state, ctx);
@@ -6782,21 +6886,37 @@
   parser_state->m_digest_psi = nullptr;
   parser_state->m_lip.m_digest = nullptr;
 
-  if (thd->m_digest != nullptr) {
-    /* Start Digest */
-    parser_state->m_digest_psi = MYSQL_DIGEST_START(thd->m_statement_psi);
+  /*
+    Partial parsers (GRAMMAR_SELECTOR_*) are not supposed to compute digests.
+  */
+  assert(!parser_state->m_lip.is_partial_parser() ||
+         !parser_state->m_input.m_has_digest);
+
+  /*
+    Only consider statements that are supposed to have a digest,
+    like top level queries.
+  */
+  if (parser_state->m_input.m_has_digest) {
+    /*
+      For these statements,
+      see if the digest computation is required.
+    */
+    if (thd->m_digest != nullptr) {
+      /* Start Digest */
+      parser_state->m_digest_psi = MYSQL_DIGEST_START(thd->m_statement_psi);
 
-    if (parser_state->m_input.m_compute_digest ||
-        (parser_state->m_digest_psi != nullptr)) {
-      /*
-        If either:
-        - the caller wants to compute a digest
-        - the performance schema wants to compute a digest
-        set the digest listener in the lexer.
-      */
-      parser_state->m_lip.m_digest = thd->m_digest;
-      parser_state->m_lip.m_digest->m_digest_storage.m_charset_number =
-          thd->charset()->number;
+      if (parser_state->m_input.m_compute_digest ||
+          (parser_state->m_digest_psi != nullptr)) {
+        /*
+          If either:
+          - the caller wants to compute a digest
+          - the performance schema wants to compute a digest
+          set the digest listener in the lexer.
+        */
+        parser_state->m_lip.m_digest = thd->m_digest;
+        parser_state->m_lip.m_digest->m_digest_storage.m_charset_number =
+            thd->charset()->number;
+      }
     }
   }
 
diff -Nru mysql-8.0-8.0.26/sql/sql_partition.cc mysql-8.0-8.0.27/sql/sql_partition.cc
--- mysql-8.0-8.0.26/sql/sql_partition.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_partition.cc	2021-09-28 11:46:34.000000000 +0000
@@ -80,13 +80,13 @@
 #include "sql/item_func.h"  // Item_func
 #include "sql/key.h"
 #include "sql/mdl.h"
-#include "sql/mysqld.h"     // mysql_tmpdir
-#include "sql/opt_range.h"  // store_key_image_to_rec
+#include "sql/mysqld.h"  // mysql_tmpdir
 #include "sql/parse_tree_node_base.h"
 #include "sql/partition_info.h"                  // partition_info
 #include "sql/partitioning/partition_handler.h"  // Partition_handler
 #include "sql/psi_memory_key.h"
 #include "sql/query_options.h"
+#include "sql/range_optimizer/range_optimizer.h"  // store_key_image_to_rec
 #include "sql/sql_alter.h"
 #include "sql/sql_base.h"   // wait_while_table_is_used
 #include "sql/sql_class.h"  // THD
@@ -312,7 +312,7 @@
 */
 
 int get_parts_for_update(const uchar *old_data,
-                         const uchar *new_data MY_ATTRIBUTE((unused)),
+                         const uchar *new_data [[maybe_unused]],
                          const uchar *rec0, partition_info *part_info,
                          uint32 *old_part_id, uint32 *new_part_id,
                          longlong *new_func_value) {
@@ -4265,7 +4265,7 @@
 
 uint prep_alter_part_table(THD *thd, TABLE *table, Alter_info *alter_info,
                            HA_CREATE_INFO *create_info,
-                           Alter_table_ctx *alter_ctx MY_ATTRIBUTE((unused)),
+                           Alter_table_ctx *alter_ctx [[maybe_unused]],
                            bool *partition_changed,
                            partition_info **new_part_info) {
   DBUG_TRACE;
@@ -5702,7 +5702,7 @@
 */
 
 static int get_part_iter_for_interval_via_mapping(
-    partition_info *part_info, bool is_subpart MY_ATTRIBUTE((unused)),
+    partition_info *part_info, bool is_subpart [[maybe_unused]],
     uint32 *store_length_array, /* ignored */
     uchar *min_value, uchar *max_value, uint min_len,
     uint max_len, /* ignored */
diff -Nru mysql-8.0-8.0.26/sql/sql_planner.cc mysql-8.0-8.0.27/sql/sql_planner.cc
--- mysql-8.0-8.0.26/sql/sql_planner.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_planner.cc	2021-09-28 11:46:34.000000000 +0000
@@ -58,11 +58,11 @@
 #include "sql/nested_join.h"
 #include "sql/opt_costmodel.h"
 #include "sql/opt_hints.h"  // hint_table_state
-#include "sql/opt_range.h"  // QUICK_SELECT_I
 #include "sql/opt_trace.h"  // Opt_trace_object
 #include "sql/opt_trace_context.h"
 #include "sql/query_options.h"
 #include "sql/query_result.h"
+#include "sql/range_optimizer/range_optimizer.h"  // QUICK_SELECT_I
 #include "sql/sql_bitmap.h"
 #include "sql/sql_class.h"  // THD
 #include "sql/sql_const.h"
@@ -1076,10 +1076,8 @@
              tab->quick()->index == best_ref->key &&  // (2)
              (used_key_parts >=
               table->quick_key_parts[best_ref->key]) &&  // (2)
-             (tab->quick()->get_type() !=
-              QUICK_SELECT_I::QS_TYPE_GROUP_MIN_MAX) &&
-             (tab->quick()->get_type() !=
-              QUICK_SELECT_I::QS_TYPE_SKIP_SCAN))  // (2)
+             (tab->quick()->get_type() != QS_TYPE_GROUP_MIN_MAX) &&
+             (tab->quick()->get_type() != QS_TYPE_SKIP_SCAN))  // (2)
   {
     trace_access_scan.add_alnum("access_type", "range");
     tab->quick()->trace_quick_description(trace);
@@ -1088,8 +1086,7 @@
   } else if ((table->file->ha_table_flags() & HA_TABLE_SCAN_ON_INDEX) &&  //(3)
              !table->covering_keys.is_clear_all() && best_ref &&          //(3)
              (!tab->quick() ||                                            //(3)
-              (tab->quick()->get_type() ==
-                   QUICK_SELECT_I::QS_TYPE_ROR_INTERSECT &&  //(3)
+              (tab->quick()->get_type() == QS_TYPE_ROR_INTERSECT &&       //(3)
                best_ref->read_cost <
                    tab->quick()->cost_est.total_cost())))  //(3)
   {
@@ -1730,7 +1727,7 @@
     // Ok, can use the strategy
 
     if (tab->quick() && tab->quick()->index == key &&
-        tab->quick()->get_type() == QUICK_SELECT_I::QS_TYPE_RANGE) {
+        tab->quick()->get_type() == QS_TYPE_RANGE) {
       quick_uses_applicable_index = true;
       quick_max_keypart = max_keypart;
     }
@@ -2365,7 +2362,7 @@
       join state will not be reverted back to its initial state because we
       don't "pop" tables already present in the partial plan.
     */
-    bool is_interleave_error MY_ATTRIBUTE((unused)) =
+    bool is_interleave_error [[maybe_unused]] =
         check_interleaving_with_nj(best_table);
     /* This has been already checked by best_extension_by_limited_search */
     assert(!is_interleave_error);
@@ -4620,7 +4617,7 @@
 */
 
 void Optimize_table_order::backout_nj_state(const table_map remaining_tables
-                                                MY_ATTRIBUTE((unused)),
+                                            [[maybe_unused]],
                                             const JOIN_TAB *tab) {
   assert(remaining_tables & tab->table_ref->map());
 
diff -Nru mysql-8.0-8.0.26/sql/sql_plugin.cc mysql-8.0-8.0.27/sql/sql_plugin.cc
--- mysql-8.0-8.0.26/sql/sql_plugin.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_plugin.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1079,8 +1079,8 @@
         if (plugin_hash[plugin->type]
                 ->emplace(to_string(tmp_plugin_ptr->name), tmp_plugin_ptr)
                 .second) {
-          init_alloc_root(key_memory_plugin_int_mem_root,
-                          &tmp_plugin_ptr->mem_root, 4096, 4096);
+          ::new ((void *)&tmp_plugin_ptr->mem_root)
+              MEM_ROOT(key_memory_plugin_int_mem_root, 4096);
           return false;
         }
         tmp_plugin_ptr->state = PLUGIN_IS_FREED;
@@ -1157,7 +1157,7 @@
   if (plugin->plugin_dl) plugin_dl_del(&plugin->plugin_dl->dl);
   plugin->state = PLUGIN_IS_FREED;
   plugin_array_version++;
-  free_root(&plugin->mem_root, MYF(0));
+  plugin->mem_root.Clear();
 }
 
 static void reap_plugins(void) {
@@ -1224,7 +1224,7 @@
       could be unlocked faster - optimizing for LIFO semantics.
     */
     plugin_ref *iter = lex->plugins.end() - 1;
-    bool found_it MY_ATTRIBUTE((unused)) = false;
+    bool found_it [[maybe_unused]] = false;
     for (; iter >= lex->plugins.begin() - 1; --iter) {
       if (plugin == *iter) {
         lex->plugins.erase(iter);
@@ -1391,7 +1391,7 @@
   init_plugin_psi_keys();
 #endif
 
-  init_alloc_root(key_memory_plugin_mem_root, &plugin_mem_root, 4096, 4096);
+  ::new ((void *)&plugin_mem_root) MEM_ROOT(key_memory_plugin_mem_root, 4096);
 
   bookmark_hash = new malloc_unordered_map<std::string, st_bookmark *>(
       key_memory_plugin_bookmark);
@@ -1489,8 +1489,7 @@
   if ((retval = plugin_init_internals())) return retval;
 
   /* Allocate the temporary mem root, will be freed before returning */
-  MEM_ROOT tmp_root;
-  init_alloc_root(key_memory_plugin_init_tmp, &tmp_root, 4096, 4096);
+  MEM_ROOT tmp_root(key_memory_plugin_init_tmp, 4096);
 
   I_List_iterator<i_string> iter(opt_early_plugin_load_list);
   i_string *item;
@@ -1498,7 +1497,7 @@
     plugin_load_list(&tmp_root, argc, argv, item->ptr, true);
 
   /* Temporary mem root not needed anymore, can free it here */
-  free_root(&tmp_root, MYF(0));
+  tmp_root.Clear();
 
   if (!(flags & PLUGIN_INIT_SKIP_INITIALIZATION))
     retval = plugin_init_initialize_and_reap();
@@ -1522,8 +1521,7 @@
   assert(!initialized);
 
   /* Allocate the temporary mem root, will be freed before returning */
-  MEM_ROOT tmp_root;
-  init_alloc_root(key_memory_plugin_init_tmp, &tmp_root, 4096, 4096);
+  MEM_ROOT tmp_root(key_memory_plugin_init_tmp, 4096);
 
   mysql_mutex_lock(&LOCK_plugin);
   initialized = true;
@@ -1566,7 +1564,7 @@
         tmp.load_option = PLUGIN_FORCE;
       }
 
-      free_root(&tmp_root, MYF(MY_MARK_BLOCKS_FREE));
+      tmp_root.ClearForReuse();
       if (test_plugin_options(&tmp_root, &tmp, argc, argv))
         tmp.state = PLUGIN_IS_DISABLED;
       else
@@ -1619,12 +1617,12 @@
 
   mysql_mutex_unlock(&LOCK_plugin);
 
-  free_root(&tmp_root, MYF(0));
+  tmp_root.Clear();
   return false;
 
 err_unlock:
   mysql_mutex_unlock(&LOCK_plugin);
-  free_root(&tmp_root, MYF(0));
+  tmp_root.Clear();
   return true;
 }
 
@@ -1727,8 +1725,7 @@
   /* Register all dynamic plugins */
   if (!(flags & PLUGIN_INIT_SKIP_DYNAMIC_LOADING)) {
     /* Allocate the temporary mem root, will be freed before returning */
-    MEM_ROOT tmp_root;
-    init_alloc_root(key_memory_plugin_init_tmp, &tmp_root, 4096, 4096);
+    MEM_ROOT tmp_root(key_memory_plugin_init_tmp, 4096);
 
     I_List_iterator<i_string> iter(opt_plugin_load_list);
     i_string *item;
@@ -1739,7 +1736,6 @@
       plugin_load(&tmp_root, argc, argv);
 
     /* Temporary mem root not needed anymore, can free it here */
-    free_root(&tmp_root, MYF(0));
   } else if (!opt_plugin_load_list.is_empty()) {
     /* Table is always empty at initialize */
     assert(opt_initialize);
@@ -1821,7 +1817,7 @@
   }
   table = tables.table;
   unique_ptr_destroy_only<RowIterator> iterator = init_table_iterator(
-      new_thd, table, nullptr,
+      new_thd, table,
       /*ignore_not_found_rows=*/false, /*count_examined_rows=*/false);
   if (iterator == nullptr) {
     close_trans_system_tables(new_thd);
@@ -1861,7 +1857,7 @@
       mysql_rwlock_unlock(&LOCK_system_variables_hash);
       mysql_mutex_unlock(&LOCK_plugin);
     }
-    free_root(tmp_root, MYF(MY_MARK_BLOCKS_FREE));
+    tmp_root->ClearForReuse();
   }
   if (error > 0) {
     char errbuf[MYSQL_ERRMSG_SIZE];
@@ -1905,7 +1901,7 @@
     switch ((*(p++) = *(list++))) {
       case '\0':
         list = nullptr; /* terminate the loop */
-                        /* fall through */
+        [[fallthrough]];
       case ';':
 #ifndef _WIN32
       case ':': /* can't use this as delimiter as it may be drive letter */
@@ -1931,7 +1927,7 @@
               name.str = const_cast<char *>(plugin->name);
               name.length = strlen(name.str);
 
-              free_root(tmp_root, MYF(MY_MARK_BLOCKS_FREE));
+              tmp_root->ClearForReuse();
               if (plugin_add(tmp_root, to_lex_cstring(name), &dl, argc, argv,
                              REPORT_TO_LOG, load_early))
                 goto error;
@@ -1940,7 +1936,7 @@
           } else
             goto error;
         } else {
-          free_root(tmp_root, MYF(MY_MARK_BLOCKS_FREE));
+          tmp_root->ClearForReuse();
           /*
             The whole locking sequence is not strictly speaking needed since
             this is a function that's executed only during server bootstrap, but
@@ -1967,7 +1963,7 @@
           str->str = p;
           continue;
         }
-        // Fall through.
+        [[fallthrough]];
       default:
         str->length++;
         continue;
@@ -2136,7 +2132,7 @@
   bookmark_hash = nullptr;
   delete malloced_string_type_sysvars_bookmark_hash;
   malloced_string_type_sysvars_bookmark_hash = nullptr;
-  free_root(&plugin_mem_root, MYF(0));
+  plugin_mem_root.Clear();
 
   global_variables_dynamic_size = 0;
 }
@@ -2181,13 +2177,12 @@
       initialized = true;
   }
   /* Allocate the temporary mem root, will be freed before returning */
-  MEM_ROOT tmp_root;
-  init_alloc_root(PSI_NOT_INSTRUMENTED, &tmp_root, 4096, 4096);
+  MEM_ROOT tmp_root(PSI_NOT_INSTRUMENTED, 4096);
 
   plugin_load_list(&tmp_root, argc, argv, plugin, true);
 
   /* Temporary mem root not needed anymore, can free it here */
-  free_root(&tmp_root, MYF(0));
+  tmp_root.Clear();
 
   retval = plugin_init_initialize_and_reap();
 
@@ -3505,9 +3500,9 @@
   @retval 0 Success
 */
 
-static bool check_if_option_is_deprecated(
-    int optid, const struct my_option *opt,
-    char *argument MY_ATTRIBUTE((unused))) {
+static bool check_if_option_is_deprecated(int optid,
+                                          const struct my_option *opt,
+                                          char *argument [[maybe_unused]]) {
   if (optid == -1) {
     push_deprecated_warn(nullptr, opt->name, (opt->name + strlen("plugin-")));
   }
@@ -3551,7 +3546,7 @@
   LEX_CSTRING plugin_name;
   char *varname;
   int error;
-  sys_var *v MY_ATTRIBUTE((unused));
+  sys_var *v [[maybe_unused]];
   st_bookmark *var;
   size_t len;
   uint count = EXTRA_OPTIONS;
@@ -3659,7 +3654,7 @@
   */
   if (mysqld_server_started) {
     Persisted_variables_cache *pv = Persisted_variables_cache::get_instance();
-    if (pv && pv->set_persist_options(true)) {
+    if (pv && pv->set_persist_options(true, false)) {
       LogErr(ERROR_LEVEL, ER_PLUGIN_CANT_SET_PERSISTENT_OPTIONS, tmp->name.str);
       goto err;
     }
diff -Nru mysql-8.0-8.0.26/sql/sql_plugin_var.cc mysql-8.0-8.0.27/sql/sql_plugin_var.cc
--- mysql-8.0-8.0.26/sql/sql_plugin_var.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_plugin_var.cc	2021-09-28 11:46:34.000000000 +0000
@@ -497,7 +497,7 @@
   @retval true not valid
   @retval false valid
 */
-bool sys_var_pluginvar::on_check_pluginvar(sys_var *self MY_ATTRIBUTE((unused)),
+bool sys_var_pluginvar::on_check_pluginvar(sys_var *self [[maybe_unused]],
                                            THD *, set_var *var) {
   /* This handler is installed only if NO_DEFAULT is specified */
   assert(((sys_var_pluginvar *)self)->plugin_var->flags & PLUGIN_VAR_NODEFAULT);
diff -Nru mysql-8.0-8.0.26/sql/sql_plugin_var.h mysql-8.0-8.0.27/sql/sql_plugin_var.h
--- mysql-8.0-8.0.26/sql/sql_plugin_var.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_plugin_var.h	2021-09-28 11:46:34.000000000 +0000
@@ -209,8 +209,8 @@
   const char *orig_pluginvar_name;
 
   static void *operator new(size_t size, MEM_ROOT *mem_root,
-                            const std::nothrow_t &arg MY_ATTRIBUTE((unused)) =
-                                std::nothrow) noexcept {
+                            const std::nothrow_t &arg
+                            [[maybe_unused]] = std::nothrow) noexcept {
     return mem_root->Alloc(size);
   }
 
@@ -218,8 +218,8 @@
     return my_malloc(PSI_NOT_INSTRUMENTED, size, MYF(0));
   }
 
-  static void operator delete(void *ptr_arg MY_ATTRIBUTE((unused)),
-                              size_t size MY_ATTRIBUTE((unused))) {
+  static void operator delete(void *ptr_arg [[maybe_unused]],
+                              size_t size [[maybe_unused]]) {
     TRASH(ptr_arg, size);
   }
 
diff -Nru mysql-8.0-8.0.26/sql/sql_prepare.cc mysql-8.0-8.0.27/sql/sql_prepare.cc
--- mysql-8.0-8.0.26/sql/sql_prepare.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_prepare.cc	2021-09-28 11:46:34.000000000 +0000
@@ -245,7 +245,7 @@
 class Protocol_local final : public Protocol {
  public:
   Protocol_local(THD *thd, Ed_connection *ed_connection);
-  ~Protocol_local() override { free_root(&m_rset_root, MYF(0)); }
+  ~Protocol_local() override { m_rset_root.Clear(); }
 
   int read_packet() override;
 
@@ -2391,7 +2391,7 @@
     lex->destroy();
     delete (st_lex_local *)lex;  // TRASH memory
   }
-  free_root(&main_mem_root, MYF(0));
+  main_mem_root.Clear();
 }
 
 void Prepared_statement::cleanup_stmt() {
@@ -2528,6 +2528,8 @@
   digest.reset(token_array, max_digest_length);
   thd->m_digest = &digest;
 
+  parser_state.m_input.m_has_digest = true;
+
   // we produce digest if it's not explicitly turned off
   // by setting maximum digest length to zero
   if (get_max_digest_length() != 0)
@@ -2954,7 +2956,7 @@
                                       bool open_cursor) {
   Reprepare_observer reprepare_observer;
   bool error;
-  bool reprepared_for_types MY_ATTRIBUTE((unused)) = false;
+  bool reprepared_for_types [[maybe_unused]] = false;
 
   /* Check if we got an error when sending long data */
   if (m_arena.get_state() == Query_arena::STMT_ERROR) {
diff -Nru mysql-8.0-8.0.26/sql/sql_profile.cc mysql-8.0-8.0.27/sql/sql_profile.cc
--- mysql-8.0-8.0.26/sql/sql_profile.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_profile.cc	2021-09-28 11:46:34.000000000 +0000
@@ -78,9 +78,9 @@
 /**
   Connects Information_Schema and Profiling.
 */
-int fill_query_profile_statistics_info(
-    THD *thd MY_ATTRIBUTE((unused)), TABLE_LIST *tables MY_ATTRIBUTE((unused)),
-    Item *) {
+int fill_query_profile_statistics_info(THD *thd [[maybe_unused]],
+                                       TABLE_LIST *tables [[maybe_unused]],
+                                       Item *) {
 #if defined(ENABLED_PROFILING)
   const char *old = thd->lex->sql_command == SQLCOM_SHOW_PROFILE
                         ? "SHOW PROFILE"
diff -Nru mysql-8.0-8.0.26/sql/sql_rename.cc mysql-8.0-8.0.27/sql/sql_rename.cc
--- mysql-8.0-8.0.26/sql/sql_rename.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_rename.cc	2021-09-28 11:46:34.000000000 +0000
@@ -820,7 +820,8 @@
 
       break;
     }
-    case dd::enum_table_type::SYSTEM_VIEW:  // Fall through
+    case dd::enum_table_type::SYSTEM_VIEW:
+      [[fallthrough]];
     case dd::enum_table_type::USER_VIEW: {
       // Changing the schema of a view is not allowed.
       if (strcmp(ren_table->db, new_db)) {
diff -Nru mysql-8.0-8.0.26/sql/sql_resolver.cc mysql-8.0-8.0.27/sql/sql_resolver.cc
--- mysql-8.0-8.0.26/sql/sql_resolver.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_resolver.cc	2021-09-28 11:46:34.000000000 +0000
@@ -82,13 +82,14 @@
 #include "sql/mem_root_array.h"
 #include "sql/nested_join.h"
 #include "sql/opt_hints.h"
-#include "sql/opt_range.h"  // prune_partitions
 #include "sql/opt_trace.h"  // Opt_trace_object
 #include "sql/opt_trace_context.h"
 #include "sql/parse_tree_nodes.h"  // PT_order_expr
 #include "sql/query_options.h"
 #include "sql/query_result.h"  // Query_result
-#include "sql/sql_base.h"      // setup_fields
+#include "sql/range_optimizer/partition_pruning.h"
+#include "sql/range_optimizer/range_optimizer.h"  // prune_partitions
+#include "sql/sql_base.h"                         // setup_fields
 #include "sql/sql_class.h"
 #include "sql/sql_cmd.h"  // Sql_cmd
 #include "sql/sql_const.h"
@@ -389,7 +390,7 @@
   */
   if (m_windows.elements != 0 &&
       Window::setup_windows1(thd, this, base_ref_items, get_table_list(),
-                             &fields, m_windows))
+                             &fields, &m_windows))
     return true;
 
   bool added_new_sum_funcs = false;
@@ -559,7 +560,7 @@
   }
 
   // Eliminate unused window definitions, redundant sorts etc.
-  if (m_windows.elements != 0) Window::eliminate_unused_objects(m_windows);
+  if (!m_windows.is_empty()) Window::eliminate_unused_objects(&m_windows);
 
   // Replace group by field references inside window functions with references
   // in the presence of ROLLUP.
@@ -664,6 +665,16 @@
     resolve_place = RESOLVE_NONE;
   }
 
+  /*
+    A table value constructor may have a defined ordering, thus calling
+    setup_order() is needed, however calling setup_order_final() is
+    not necessary since this construct cannot be aggregated.
+  */
+  if (is_ordered() && setup_order(thd, base_ref_items, get_table_list(),
+                                  &fields, order_list.first)) {
+    return true;
+  }
+
   // Again, duplicating checks that are also done in Query_block::prepare for
   // resolving subqueries. This should, like the resolving of m_having_clause
   // above, be refactored such that there is less duplication of code from
@@ -676,16 +687,6 @@
     if (resolve_subquery(thd)) return true;
   }
 
-  /*
-    A table value constructor may have a defined ordering, thus calling
-    setup_order() is needed, however calling setup_order_final() is
-    not necessary since this construct cannot be aggregated.
-  */
-  if (is_ordered() && setup_order(thd, base_ref_items, get_table_list(),
-                                  &fields, order_list.first)) {
-    return true;
-  }
-
   if (query_result() && query_result()->prepare(thd, fields, unit))
     return true; /* purecov: inspected */
 
@@ -3198,10 +3199,28 @@
     // Expressions from the SELECT list will not be used; unlike in the case of
     // IN, they are not part of sj_inner_exprs.
     // @todo in WL#6570, move this to resolve_subquery().
-    Item::Cleanup_after_removal_context ctx(this);
+    bool view_ref_with_subquery = false;
+    // Do not remove an item of type Item_view_ref. Refer to
+    // the comments in Item_cond::fix_fields on the removal of
+    // Item_view_ref type.
     for (Item *item : subq_query_block->visible_fields()) {
-      item->walk(&Item::clean_up_after_removal, enum_walk::SUBQUERY_POSTFIX,
-                 pointer_cast<uchar *>(&ctx));
+      if (item->has_subquery()) {
+        WalkItem(item, enum_walk::PREFIX,
+                 [&view_ref_with_subquery](Item *inner_item) {
+                   if (inner_item->type() == Item::REF_ITEM &&
+                       down_cast<Item_ref *>(inner_item)->ref_type() ==
+                           Item_ref::VIEW_REF) {
+                     view_ref_with_subquery = true;
+                     return true;
+                   }
+                   return false;
+                 });
+      }
+      if (!view_ref_with_subquery) {
+        Item::Cleanup_after_removal_context ctx(this);
+        item->walk(&Item::clean_up_after_removal, enum_walk::SUBQUERY_POSTFIX,
+                   pointer_cast<uchar *>(&ctx));
+      }
     }
   }
 
@@ -4511,8 +4530,8 @@
       Group_check gc(this, &root);
       rc = gc.check_query(thd);
       gc.to_opt_trace(thd);
-    }  // scope, to let any destructor run before free_root().
-    free_root(&root, MYF(0));
+    }  // scope, to let any destructor run before root.Clear().
+    root.Clear();
   }
 
   if (!rc && is_distinct()) {
@@ -4695,11 +4714,8 @@
     THD *thd, Item *item,
     const function<ReplaceResult(Item *item, Item *parent,
                                  unsigned argument_idx)> &get_new_item) {
-  if (item->type() == Item::FUNC_ITEM) {
+  if (item->type() == Item::FUNC_ITEM || item->type() == Item::SUM_FUNC_ITEM) {
     Item_func *func_item = down_cast<Item_func *>(item);
-    if (func_item->m_is_window_function) {
-      return false;
-    }
     for (unsigned argument_idx = 0; argument_idx < func_item->arg_count;
          argument_idx++) {
       Item *arg = func_item->arguments()[argument_idx];
@@ -4725,11 +4741,36 @@
       case Item_func::EQ_FUNC:
       case Item_func::NE_FUNC:
       case Item_func::EQUAL_FUNC:
-        down_cast<Item_bool_func2 *>(item)->set_cmp_func();
+        if (down_cast<Item_bool_func2 *>(item)->set_cmp_func()) {
+          return true;
+        }
         break;
       default:
         break;
     }
+    if (item->m_is_window_function) {
+      down_cast<Item_sum *>(item)->update_after_wf_arguments_changed(thd);
+    }
+  } else if (item->type() == Item::ROW_ITEM) {
+    // Pretty much exactly the same logic as functions above.
+    Item_row *row_item = down_cast<Item_row *>(item);
+    for (unsigned argument_idx = 0; argument_idx < row_item->cols();
+         argument_idx++) {
+      Item *arg = row_item->element_index(argument_idx);
+      ReplaceResult result = get_new_item(arg, item, argument_idx);
+      if (result.action == ReplaceResult::ERROR) {
+        return true;
+      } else if (result.action == ReplaceResult::REPLACE) {
+        if (thd->lex->is_exec_started()) {
+          thd->change_item_tree(row_item->addr(argument_idx),
+                                result.replacement);
+        } else {
+          *row_item->addr(argument_idx) = result.replacement;
+        }
+      } else if (WalkAndReplace(thd, arg, get_new_item)) {
+        return true;
+      }
+    }
   } else if (item->type() == Item::COND_ITEM) {
     Item_cond *cond_item = down_cast<Item_cond *>(item);
     List_iterator<Item> li(*cond_item->argument_list());
@@ -4837,8 +4878,34 @@
       });
   if (error) return nullptr;
   if (changed) {
-    item->set_nullable(true);
     item->update_used_tables();
+    // Since item is now nullable, mark every expression (except rollup sum
+    // functions) depending on it as also potentially nullable. (This is a
+    // conservative choice; in some cases, expressions can be proven
+    // non-nullable even for NULL arguments.)
+    class Update_nullability_for_rollup_items : public Item_tree_walker {
+     public:
+      using Item_tree_walker::is_stopped;
+      using Item_tree_walker::stop_at;
+    };
+    Update_nullability_for_rollup_items info;
+    if (WalkItem(
+            item, enum_walk::PREFIX | enum_walk::POSTFIX,
+            [&info](Item *inner_item) {
+              if (info.is_stopped(inner_item)) {
+                return false;
+              } else if (inner_item->type() == Item::SUM_FUNC_ITEM &&
+                         down_cast<Item_sum *>(inner_item)->real_sum_func() ==
+                             Item_sum::ROLLUP_SUM_SWITCHER_FUNC) {
+                info.stop_at(inner_item);
+                return false;
+              } else {
+                inner_item->set_nullable(true);
+                return false;
+              }
+            })) {
+      return nullptr;
+    }
   }
   return item;
 }
@@ -5733,8 +5800,7 @@
   @returns true on error, else false
 */
 bool Query_block::remove_aggregates(THD *thd,
-                                    Query_block MY_ATTRIBUTE((unused)) *
-                                        select) {
+                                    [[maybe_unused]] Query_block *select) {
   for (auto it = fields.begin(); it != fields.end(); ++it) {
     Item *select_expr = *it;
     if (!select_expr->m_is_window_function &&
@@ -5946,7 +6012,7 @@
     resolve_placeholder_tables below, we can go back and modify the references
     at this level.
   */
-  std::vector<Item **> contrib_exprs;
+  std::unordered_map<Item **, bool> contrib_exprs;
 
   // We want permanent changes
   {
@@ -6106,18 +6172,21 @@
 
     // We will find all fields mentioned above by checking fields, which
     // has any hidden fields induced by ORDER BY or window specifications, in
-    // addition to fields from the select expressions.
+    // addition to fields from the select expressions. We also make a note
+    // of the expression's hidden status to mark the expression as hidden
+    // when it is replaced with derived table expression later.
     for (Item *&item : fields) {
-      contrib_exprs.push_back(&item);
+      contrib_exprs.emplace(std::pair<Item **, bool>(&item, item->hidden));
     }
 
     // Collect fields in expr, but not from inside grouped aggregates.
     Item::Collect_item_fields_or_view_refs info{&item_fields_or_view_refs,
                                                 this};
     for (auto expr : contrib_exprs) {
-      if ((*expr)->walk(&Item::collect_item_field_or_view_ref_processor,
-                        enum_walk::SUBQUERY_PREFIX | enum_walk::POSTFIX,
-                        pointer_cast<uchar *>(&info)))
+      if ((*expr.first)
+              ->walk(&Item::collect_item_field_or_view_ref_processor,
+                     enum_walk::SUBQUERY_PREFIX | enum_walk::POSTFIX,
+                     pointer_cast<uchar *>(&info)))
         return true; /* purecov: inspected */
     }
 
@@ -6133,7 +6202,7 @@
           lfi.remove();
       }
     }
-    // We now have all fields and view refefences; now find only unique ones.
+    // We now have all fields and view references; now find only unique ones.
     lfi.init(item_fields_or_view_refs);
     while ((lf = lfi++)) {
       if (lf->type() == Item::FIELD_ITEM) {
@@ -6198,7 +6267,7 @@
 
       for (Item_sum *agg : having_aggs.list) {
         Item::Aggregate_ref_update info(agg, new_derived);
-        bool MY_ATTRIBUTE((unused)) error = new_derived->m_having_cond->walk(
+        [[maybe_unused]] bool error = new_derived->m_having_cond->walk(
             &Item::update_aggr_refs, enum_walk::PREFIX,
             pointer_cast<uchar *>(&info));
         assert(!error);
@@ -6281,14 +6350,27 @@
     for (auto vr : unique_view_refs) {
       for (auto expr : contrib_exprs) {
         Item::Item_view_ref_replacement info(vr->real_item(), *field_ptr, this);
-        Item *new_item = (*expr)->transform(&Item::replace_item_view_ref,
-                                            pointer_cast<uchar *>(&info));
+        Item *new_item = (*expr.first)
+                             ->transform(&Item::replace_item_view_ref,
+                                         pointer_cast<uchar *>(&info));
         if (new_item == nullptr) return true;
-        if (new_item != *expr) *expr = new_item;
+        if (new_item != *expr.first) {
+          // Replace in base_ref_items
+          for (size_t i = 0; i < fields.size(); i++) {
+            if (base_ref_items[i] == *expr.first) {
+              base_ref_items[i] = new_item;
+              break;
+            }
+          }
+          // Replace in fields
+          *expr.first = new_item;
+          // Mark this expression as hidden if it was hidden in this query
+          // block.
+          (*expr.first)->hidden = expr.second;
+        }
       }
       ++field_ptr;
     }
-
     // field_ptr now points to the first of the fields added to the select list
     // of the derived table's query block. We now create new fields for this
     // block which will point to the corresponding fields moved to the derived
@@ -6306,13 +6388,37 @@
       pair.second->context = &new_derived->context;
 
       for (auto expr : contrib_exprs) {
-        Item::Item_field_replacement info(pair.first, replaces_field, this);
-        Item *new_item = (*expr)->transform(&Item::replace_item_field,
-                                            pointer_cast<uchar *>(&info));
+        Item_field *replacement = replaces_field;
+        // If this expression was hidden, we need to make a copy of the derived
+        // table field. The same derived table field cannot be marked both
+        // hidden and visible if the field replaces two different expressions
+        // in the transforming query block.
+        if (expr.second == true) {
+          auto hidden_field = new (thd->mem_root) Item_field(*field_ptr);
+          if (hidden_field == nullptr) return true;
+          hidden_field->item_name.set(pair.second->orig_name.ptr());
+          pair.second->orig_name.set(nullptr, 0);
+          pair.second->context = &new_derived->context;
+          replacement = hidden_field;
+        }
+        Item::Item_field_replacement info(pair.first, replacement, this);
+        Item *new_item = (*expr.first)
+                             ->transform(&Item::replace_item_field,
+                                         pointer_cast<uchar *>(&info));
         if (new_item == nullptr) return true;
-        if (new_item != *expr) *expr = new_item;
+        if (new_item != *expr.first) {
+          // Replace in base_ref_items
+          for (size_t i = 0; i < fields.size(); i++) {
+            if (base_ref_items[i] == *expr.first) {
+              base_ref_items[i] = new_item;
+              break;
+            }
+          }
+          // Replace in fields
+          (*expr.first) = new_item;
+          (*expr.first)->hidden = expr.second;
+        }
       }
-
       ++field_ptr;
     }
 
@@ -6346,16 +6452,25 @@
   Item_singlerow_subselect::Scalar_subquery_replacement info(
       subquery->item, *tr->table->field, this, subquery->m_add_coalesce);
 
+  // ROLLUP wrappers might have been added to the expression at this point. Take
+  // care to transform the inner item and keep the rollup wrappers as is.
+  bool with_rollup_wrapper = is_rollup_group_wrapper(*expr);
+  Item *orig_unwrapped_item = unwrap_rollup_group(*expr);
   Item *new_item = (*expr)->transform(&Item::replace_scalar_subquery,
                                       pointer_cast<uchar *>(&info));
   if (new_item == nullptr) return true;
 
-  // If we replaced an item contained in the transformed query block, save it
-  // for rollback and retain its name so the metadata column name remains
-  // correct.
+  // If we replaced an item contained in the transformed query block,
+  // retain its name so the metadata column name remains correct.
   if (*expr != new_item) {
     new_item->item_name.set((*expr)->item_name.ptr());
     *expr = new_item;
+  } else if (with_rollup_wrapper) {
+    // If the original expression was a rollup group item, the inner item of the
+    // expression might have changed.
+    Item *new_unwrapped_item = unwrap_rollup_group(new_item);
+    if (new_unwrapped_item != orig_unwrapped_item)
+      new_unwrapped_item->item_name.set((*expr)->item_name.ptr());
   }
 
   new_item->update_used_tables();
@@ -6478,7 +6593,7 @@
                                mem_root_deque<TABLE_LIST *> *nested_join_list,
                                TABLE_LIST *derived_table) {
   // Locate join nest in which the joinee with the condition sits
-  const bool found MY_ATTRIBUTE((unused)) = walk_join_list(
+  const bool found [[maybe_unused]] = walk_join_list(
       *nested_join_list,
       [join_cond, &nested_join_list](TABLE_LIST *tr) mutable -> bool {
         if (tr->join_cond() == join_cond) {
@@ -6920,26 +7035,30 @@
 }
 
 /**
-  Called (before transforming a correlated subquery to derived table)
-  to check if the predicate that is being looked into is an equality and
-  that its non-correlated operand is a simple column reference.
-  (Else we need to group on expressions in the derived table -
-  not supported currently).
+  Called to check if the provided correlated predicate is eligible for
+  transformation. To be eligible, it must have one non-correlated operand
+  and one correlated operand, and the non-correlated operand must be a
+  simple column reference (Else we need to group on expressions in the
+  derived table - not supported currently).
   @param  cor_pred correlated predicate that needs to be examined
-  @return true if the check fails, false otherwise.
+  @return true if predicate is eligible for transformation.
 */
-bool check_predicate_and_args(Item *cor_pred) {
+bool is_correlated_predicate_eligible(Item *cor_pred) {
+  assert(cor_pred->is_outer_reference());
   if (cor_pred->type() == Item::FUNC_ITEM &&
       down_cast<Item_func *>(cor_pred)->functype() != Item_func::EQ_FUNC)
-    return true;
+    return false;
   Item_func *eq_func = down_cast<Item_func *>(cor_pred);
+  bool non_correlated_operand = false;
   for (uint i = 0; i < eq_func->argument_count(); i++) {
     Item *item = eq_func->arguments()[i];
-    if (!item->is_outer_reference() &&
-        item->real_item()->type() != Item::FIELD_ITEM)
-      return true;
+    if (!item->is_outer_reference()) {
+      if (item->real_item()->type() != Item::FIELD_ITEM) return false;
+      non_correlated_operand = true;
+    }
   }
-  return false;
+  // We need to find one non-correlated operand in the correlated predicate
+  return non_correlated_operand;
 }
 
 /**
@@ -6990,7 +7109,7 @@
         else if (!cor_pred->eq(pred, false))
           continue;
         found = true;
-        if (check_predicate_and_args(cor_pred)) return true;
+        if (!is_correlated_predicate_eligible(cor_pred)) return true;
         break;
       }
     }
@@ -7215,7 +7334,7 @@
         cor_pred = cond_part;
         cond_part = nullptr;
       }
-      if (check_predicate_and_args(cor_pred)) return false;
+      if (!is_correlated_predicate_eligible(cor_pred)) return false;
       going.push_back(cor_pred);
     }
     if (cond_part) staying.push_back(cond_part);
@@ -7226,7 +7345,7 @@
   // expression containing this outer reference is not marked as such due to
   // some optimizations. Reject such queries for transformation (Since we
   // anyways reject queries with non-correlated operands having expressions in
-  // check_predicate_and_args())
+  // is_correlated_predicate_eligible())
   if (going.elements == 0) return false;
 
   // Construct a new, reduced, WHERE clause sans the lifted predicates, which
@@ -7496,13 +7615,20 @@
     do {
       old_size = fields.size();
       for (Item *&select_expr : fields) {
-        Item *prev_value = select_expr;
+        // At this time, expression could be wrapped in a rollup group
+        // wrapper. It is the inner item of the rollup group item that
+        // gets replaced. We take care to retain the rollup wrappers.
+        Item *prev_value = unwrap_rollup_group(select_expr);
         if (replace_subquery_in_expr(thd, &subquery, tl, &select_expr))
           return true;
-        if (select_expr != prev_value) {
+        Item *unwrapped_select_expr = unwrap_rollup_group(select_expr);
+        if (unwrapped_select_expr != prev_value) {
+          // If we replace a subquery in the select field list, possibly
+          // hidden inside a rollup wrapper, replace corresponding item
+          // in base_ref_items
           for (size_t i = 0; i < fields.size(); i++) {
             if (base_ref_items[i] == prev_value)
-              base_ref_items[i] = select_expr;
+              base_ref_items[i] = unwrapped_select_expr;
           }
         }
         if (fields.size() != old_size) {
diff -Nru mysql-8.0-8.0.26/sql/sql_rewrite.cc mysql-8.0-8.0.27/sql/sql_rewrite.cc
--- mysql-8.0-8.0.26/sql/sql_rewrite.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_rewrite.cc	2021-09-28 11:46:34.000000000 +0000
@@ -190,6 +190,24 @@
   str->append(STRING_WITH_LEN("@"));
   append_query_string(thd, system_charset_info, &from_host, str);
 }
+
+/**
+  Append the authorization id for the user. This quotes auth_id with ` or "
+  based on the sql_mode set.
+
+  @param [in]       thd     The THD to find the SQL mode
+  @param [in]       user    LEX User to retrieve the plugin string
+  @param [in]       comma   Separator to be prefixed before adding user info
+  @param [in, out]  str     The string in which authID is suffixed
+*/
+void append_auth_id_identifier(const THD *thd, const LEX_USER *user, bool comma,
+                               String *str) {
+  assert(thd);
+  if (comma) str->append(',');
+  append_auth_id_string(thd, user->user.str, user->user.length, user->host.str,
+                        user->host.length, str);
+}
+
 /**
   Used with List<>::sort for alphabetic sorting of LEX_USER records
   using user,host as keys.
@@ -228,7 +246,7 @@
   @retval        true    If the Query is re-written.
   @retval        false   Otherwise
 */
-bool rewrite_query(THD *thd, Consumer_type type, Rewrite_params *params,
+bool rewrite_query(THD *thd, Consumer_type type, const Rewrite_params *params,
                    String &rlb) {
   DBUG_TRACE;
   std::unique_ptr<I_rewriter> rw = nullptr;
@@ -331,7 +349,7 @@
                       rewriter.
 */
 void mysql_rewrite_query(THD *thd, Consumer_type type /*= Consumer_type::LOG */,
-                         Rewrite_params *params /*= nullptr*/) {
+                         const Rewrite_params *params /*= nullptr*/) {
   String rlb;
 
   DBUG_TRACE;
@@ -367,7 +385,7 @@
                           If instrumented, the previous
 */
 void mysql_rewrite_acl_query(THD *thd, String &rlb, Consumer_type type,
-                             Rewrite_params *params /* = nullptr */,
+                             const Rewrite_params *params /* = nullptr */,
                              bool do_ps_instrument /* = true */) {
   if (rewrite_query(thd, type, params, rlb) && (rlb.length() > 0) &&
       do_ps_instrument) {
@@ -489,7 +507,9 @@
 */
 
 void Rewriter_user::append_auth_str(LEX_USER *user, String *str) const {
-  String from_auth(user->auth.str, user->auth.length, system_charset_info);
+  String from_auth(user->first_factor_auth_info.auth.str,
+                   user->first_factor_auth_info.auth.length,
+                   system_charset_info);
   append_query_string(m_thd, system_charset_info, &from_auth, str);
 }
 /**
@@ -655,8 +675,9 @@
 void Rewriter_user::append_plugin_name(const LEX_USER *user,
                                        String *str) const {
   str->append(STRING_WITH_LEN(" WITH "));
-  if (user->plugin.length > 0) {
-    String from_plugin(user->plugin.str, user->plugin.length,
+  if (user->first_factor_auth_info.plugin.length > 0) {
+    String from_plugin(user->first_factor_auth_info.plugin.str,
+                       user->first_factor_auth_info.plugin.length,
                        system_charset_info);
     append_query_string(m_thd, system_charset_info, &from_plugin, str);
   } else {
@@ -666,6 +687,41 @@
     append_query_string(m_thd, system_charset_info, &default_plugin, str);
   }
 }
+
+/**
+  Append the authentication plugin name from LEX_MFA for the user
+
+  @param [in]       user    User to retrieve the plugin string
+  @param [in, out]  str     The string in which plugin info is suffixed
+*/
+void Rewriter_user::append_mfa_plugin_name(const LEX_MFA *user,
+                                           String *str) const {
+  if (user->plugin.length > 0) {
+    str->append(STRING_WITH_LEN(" WITH "));
+    String from_plugin(user->plugin.str, user->plugin.length,
+                       system_charset_info);
+    append_query_string(m_thd, system_charset_info, &from_plugin, str);
+  }
+}
+
+/**
+  Append the authentication string from LEX_MFA for the user
+
+  @param [in]       user    User to retrieve the plugin string
+  @param [in, out]  str     The string in which plugin info is suffixed
+*/
+void Rewriter_user::append_mfa_auth_str(const LEX_MFA *user,
+                                        String *str) const {
+  if (user->uses_identified_by_clause &&
+      m_consumer_type == Consumer_type::TEXTLOG) {
+    str->append(STRING_WITH_LEN(" BY "));
+    append_literal_secret(str);
+  } else if (user->auth.length > 0) {
+    str->append(STRING_WITH_LEN(" AS "));
+    String auth_str(user->auth.str, user->auth.length, system_charset_info);
+    append_query_string(m_thd, system_charset_info, &auth_str, str);
+  }
+}
 /**
    The default implementation is to append the PASSWORD HISTORY clause iff it
    is specified. Though concrete classes may add their own implementation.
@@ -772,23 +828,55 @@
 void Rewriter_create_user::append_user_auth_info(LEX_USER *user, bool comma,
                                                  String *str) const {
   append_auth_id(m_thd, user, comma, str);
-  if (user->uses_identified_by_clause || user->uses_identified_with_clause ||
-      user->uses_authentication_string_clause ||
+  List_iterator<LEX_MFA> mfa_list(user->mfa_list);
+  LEX_MFA *tmp_mfa;
+  if (user->with_initial_auth) {
+    /*
+      In case of passwordless user, server fiddles with user specified syntax,
+      thus we are expected to write the original syntax.
+      ex:
+      CREATE USER foo IDENTIFIED WITH authentication_fido INITIAL AUTHENTICATION
+         IDENTIFIED BY 'abc';
+      above sql is converted by server as:
+      CREATE USER foo IDENTIFIED BY 'abc' AND IDENTIFIED WITH
+      authentication_fido;
+
+      This block ensures that query is rewritten in logs as:
+      CREATE USER foo IDENTIFIED WITH authentication_fido INITIAL AUTHENTICATION
+         IDENTIFIED WITH <default auth plugin> AS <auth_hash_string>;
+    */
+    assert(user->mfa_list.size());
+    /* point to 2nd factor which is authentication_fido */
+    tmp_mfa = mfa_list++;
+    str->append(STRING_WITH_LEN(" IDENTIFIED"));
+    append_mfa_plugin_name(tmp_mfa, str);
+    str->append(STRING_WITH_LEN(" INITIAL AUTHENTICATION"));
+  }
+  if (user->first_factor_auth_info.uses_identified_by_clause ||
+      user->first_factor_auth_info.uses_identified_with_clause ||
+      user->first_factor_auth_info.uses_authentication_string_clause ||
       m_consumer_type == Consumer_type::BINLOG) {
     str->append(STRING_WITH_LEN(" IDENTIFIED"));
-    if (user->uses_identified_with_clause ||
+    if (user->first_factor_auth_info.uses_identified_with_clause ||
         m_consumer_type == Consumer_type::BINLOG)
       append_plugin_name(user, str);
 
-    if (user->uses_identified_by_clause &&
+    if (user->first_factor_auth_info.uses_identified_by_clause &&
         m_consumer_type == Consumer_type::TEXTLOG) {
       str->append(STRING_WITH_LEN(" BY "));
       append_literal_secret(str);
-    } else if (user->auth.length > 0) {
+    } else if (user->first_factor_auth_info.auth.length > 0) {
       str->append(STRING_WITH_LEN(" AS "));
       append_auth_str(user, str);
     }
   }
+  if (user->mfa_list.size() && !user->with_initial_auth) {
+    while ((tmp_mfa = mfa_list++)) {
+      str->append(STRING_WITH_LEN(" AND IDENTIFIED"));
+      append_mfa_plugin_name(tmp_mfa, str);
+      append_mfa_auth_str(tmp_mfa, str);
+    }
+  }
 }
 /**
   Append the PASSWORD HISTORY clause for users iff it is specified
@@ -847,14 +935,15 @@
 void Rewriter_alter_user::append_user_auth_info(LEX_USER *user, bool comma,
                                                 String *str) const {
   append_auth_id(m_thd, user, comma, str);
-  if (user->uses_identified_by_clause || user->uses_identified_with_clause ||
-      user->uses_authentication_string_clause) {
+  if (user->first_factor_auth_info.uses_identified_by_clause ||
+      user->first_factor_auth_info.uses_identified_with_clause ||
+      user->first_factor_auth_info.uses_authentication_string_clause) {
     str->append(STRING_WITH_LEN(" IDENTIFIED"));
-    if (user->uses_identified_with_clause ||
+    if (user->first_factor_auth_info.uses_identified_with_clause ||
         m_consumer_type == Consumer_type::BINLOG)
       append_plugin_name(user, str);
 
-    if (user->uses_identified_by_clause &&
+    if (user->first_factor_auth_info.uses_identified_by_clause &&
         m_consumer_type == Consumer_type::TEXTLOG) {
       str->append(STRING_WITH_LEN(" BY "));
       append_literal_secret(str);
@@ -862,7 +951,7 @@
       if (user->uses_replace_clause) {
         str->append(STRING_WITH_LEN(" REPLACE <secret>"));
       }
-    } else if (user->auth.length > 0) {
+    } else if (user->first_factor_auth_info.auth.length > 0) {
       str->append(STRING_WITH_LEN(" AS "));
       append_auth_str(user, str);
     }
@@ -871,6 +960,44 @@
       str->append(STRING_WITH_LEN(" RETAIN CURRENT PASSWORD"));
     }
   }
+  List_iterator<LEX_MFA> mfa_list(user->mfa_list);
+  if (user->mfa_list.size()) {
+    LEX_MFA *tmp_mfa;
+    while ((tmp_mfa = mfa_list++)) {
+      if (tmp_mfa->unregister) {
+        str->append(" ");
+        str->append(std::to_string(tmp_mfa->nth_factor).c_str());
+        str->append(STRING_WITH_LEN(" FACTOR UNREGISTER"));
+      } else if (tmp_mfa->finish_registration || tmp_mfa->modify_factor) {
+        /*
+          ALTER USER foo Nth FACTOR FINISH REGISTRATION;
+          is binlogged as
+          ALTER USER foo MODIFY Nth FACTOR IDENTIFIED WITH <plugin>
+             AS <auth-str>;
+        */
+        str->append(STRING_WITH_LEN(" MODIFY "));
+        str->append(std::to_string(tmp_mfa->nth_factor).c_str());
+        str->append(STRING_WITH_LEN(" FACTOR"));
+        str->append(STRING_WITH_LEN(" IDENTIFIED"));
+        append_mfa_plugin_name(tmp_mfa, str);
+        append_mfa_auth_str(tmp_mfa, str);
+      } else if (tmp_mfa->drop_factor) {
+        str->append(STRING_WITH_LEN(" DROP "));
+        str->append(std::to_string(tmp_mfa->nth_factor).c_str());
+        str->append(STRING_WITH_LEN(" FACTOR"));
+      } else if (tmp_mfa->add_factor) {
+        str->append(STRING_WITH_LEN(" ADD "));
+        str->append(std::to_string(tmp_mfa->nth_factor).c_str());
+        str->append(STRING_WITH_LEN(" FACTOR"));
+        if (tmp_mfa->uses_identified_by_clause ||
+            tmp_mfa->uses_identified_with_clause) {
+          str->append(STRING_WITH_LEN(" IDENTIFIED"));
+          append_mfa_plugin_name(tmp_mfa, str);
+          append_mfa_auth_str(tmp_mfa, str);
+        }
+      }
+    }
+  }
 
   if (user->discard_old_password) {
     str->append(STRING_WITH_LEN(" DISCARD OLD PASSWORD"));
@@ -900,11 +1027,10 @@
     parent::rewrite_password_reuse(lex, str);
   }
 }
-Rewriter_show_create_user::Rewriter_show_create_user(THD *thd,
-                                                     Consumer_type type,
-                                                     Rewrite_params *params)
+Rewriter_show_create_user::Rewriter_show_create_user(
+    THD *thd, Consumer_type type, const Rewrite_params *params)
     : Rewriter_user(thd, type),
-      show_params_(dynamic_cast<Show_user_params *>(params)) {}
+      show_params_(dynamic_cast<const Show_user_params *>(params)) {}
 
 /**
   Rewrite the query for the SHOW CREATE USER statement.
@@ -933,7 +1059,7 @@
   @param [in, out]  str    The string in which the clause is suffixed
 */
 void Rewriter_show_create_user::rewrite_user_application_user_metadata(
-    const LEX *lex MY_ATTRIBUTE((unused)), String *str) const {
+    const LEX *lex [[maybe_unused]], String *str) const {
   /* Only show the ATTRIBUTE operator if there's any attribute to show. */
   if (show_params_->metadata_str->length() > 0) {
     str->append(" ATTRIBUTE '");
@@ -953,16 +1079,22 @@
 */
 void Rewriter_show_create_user::append_auth_str(LEX_USER *user,
                                                 String *str) const {
-  String from_auth(user->auth.str, user->auth.length, system_charset_info);
+  String from_auth(user->first_factor_auth_info.auth.str,
+                   user->first_factor_auth_info.auth.length,
+                   system_charset_info);
 
   if (show_params_ && show_params_->print_identified_with_as_hex_ &&
-      user->auth.length) {
-    for (const char *c = user->auth.str;
-         static_cast<size_t>(c - user->auth.str) < user->auth.length; c++) {
+      user->first_factor_auth_info.auth.length) {
+    for (const char *c = user->first_factor_auth_info.auth.str;
+         static_cast<size_t>(c - user->first_factor_auth_info.auth.str) <
+         user->first_factor_auth_info.auth.length;
+         c++) {
       if (!my_isgraph(system_charset_info, *c)) {
-        from_auth.alloc(user->auth.length * 2 + 3);
-        str_to_hex(from_auth.c_ptr_quick(), user->auth.str, user->auth.length);
-        from_auth.length(user->auth.length * 2 + 2);
+        from_auth.alloc(user->first_factor_auth_info.auth.length * 2 + 3);
+        str_to_hex(from_auth.c_ptr_quick(),
+                   user->first_factor_auth_info.auth.str,
+                   user->first_factor_auth_info.auth.length);
+        from_auth.length(user->first_factor_auth_info.auth.length * 2 + 2);
         str->append(from_auth);
 
         return;
@@ -1001,11 +1133,23 @@
 void Rewriter_show_create_user::append_user_auth_info(LEX_USER *user,
                                                       bool comma,
                                                       String *str) const {
-  append_auth_id(m_thd, user, comma, str);
+  append_auth_id_identifier(m_thd, user, comma, str);
+  List_iterator<LEX_MFA> mfa_list(user->mfa_list);
+  LEX_MFA *tmp_mfa;
+  bool is_passwordless = false;
+  if (user->mfa_list.size()) {
+    tmp_mfa = mfa_list++;
+    is_passwordless = tmp_mfa->passwordless;
+    if (is_passwordless) {
+      str->append(STRING_WITH_LEN(" IDENTIFIED"));
+      append_mfa_plugin_name(tmp_mfa, str);
+      str->append(STRING_WITH_LEN(" INITIAL AUTHENTICATION"));
+    }
+  }
   assert(m_thd->lex->contains_plaintext_password == false);
   str->append(STRING_WITH_LEN(" IDENTIFIED"));
   append_plugin_name(user, str);
-  if (user->auth.length > 0) {
+  if (user->first_factor_auth_info.auth.length > 0) {
     str->append(STRING_WITH_LEN(" AS "));
     if (show_params_ && show_params_->hide_password_hash) {
       append_literal_secret(str);
@@ -1013,6 +1157,21 @@
       append_auth_str(user, str);
     }
   }
+  mfa_list = user->mfa_list;
+  if (user->mfa_list.size() && !is_passwordless) {
+    while ((tmp_mfa = mfa_list++)) {
+      str->append(STRING_WITH_LEN(" AND IDENTIFIED WITH "));
+      String plugin_str(tmp_mfa->plugin.str, tmp_mfa->plugin.length,
+                        system_charset_info);
+      append_query_string(m_thd, system_charset_info, &plugin_str, str);
+      if (tmp_mfa->auth.length > 0) {
+        str->append(STRING_WITH_LEN(" AS "));
+        String auth_str(tmp_mfa->auth.str, tmp_mfa->auth.length,
+                        system_charset_info);
+        append_query_string(m_thd, system_charset_info, &auth_str, str);
+      }
+    }
+  }
 }
 
 Rewriter_set::Rewriter_set(THD *thd, Consumer_type type)
@@ -1042,9 +1201,9 @@
 }
 
 Rewriter_set_password::Rewriter_set_password(THD *thd, Consumer_type type,
-                                             Rewrite_params *params)
+                                             const Rewrite_params *params)
     : Rewriter_set(thd, type) {
-  User_params *param = dynamic_cast<User_params *>(params);
+  const User_params *param = dynamic_cast<const User_params *>(params);
   if (param) m_users = param->users;
 }
 
@@ -1079,7 +1238,9 @@
                         system_charset_info);
 #endif
     } else {
-      auth_str = String(user->auth.str, user->auth.length, system_charset_info);
+      auth_str =
+          String(user->first_factor_auth_info.auth.str,
+                 user->first_factor_auth_info.auth.length, system_charset_info);
     }
     /*
       Construct :
@@ -1090,7 +1251,7 @@
     rlb.append(STRING_WITH_LEN("@"));
     append_query_string(m_thd, system_charset_info, &current_host, &rlb);
     rlb.append(STRING_WITH_LEN(" IDENTIFIED WITH '"));
-    rlb.append(user->plugin.str);
+    rlb.append(user->first_factor_auth_info.plugin.str);
     rlb.append(STRING_WITH_LEN("' AS "));
     append_query_string(m_thd, system_charset_info, &auth_str, &rlb);
     if (user->retain_current_password)
@@ -1104,9 +1265,9 @@
 }
 
 Rewriter_grant::Rewriter_grant(THD *thd, Consumer_type type,
-                               Rewrite_params *params)
+                               const Rewrite_params *params)
     : I_rewriter(thd, type) {
-  grant_params = dynamic_cast<Grant_params *>(params);
+  grant_params = dynamic_cast<const Grant_params *>(params);
 }
 
 /**
diff -Nru mysql-8.0-8.0.26/sql/sql_rewrite.h mysql-8.0-8.0.27/sql/sql_rewrite.h
--- mysql-8.0-8.0.26/sql/sql_rewrite.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_rewrite.h	2021-09-28 11:46:34.000000000 +0000
@@ -45,6 +45,8 @@
   Parameters required by specific Rewriter must be added in the concrete
   implementation.
   Clients need to wrap the parameters in specific concrete object.
+  The Rewrite_params objects is not expected to change and passed around as
+  const objects.
 */
 class Rewrite_params {
  protected:
@@ -98,14 +100,14 @@
   or clears it if no rewriting took place.
 */
 void mysql_rewrite_query(THD *thd, Consumer_type type = Consumer_type::TEXTLOG,
-                         Rewrite_params *params = nullptr);
+                         const Rewrite_params *params = nullptr);
 /**
   Provides the default interface to rewrite the ACL query.
   If do_ps_instrument, it sets the thd->rewritten_query with
   a rewritten query.
 */
 void mysql_rewrite_acl_query(THD *thd, String &rlb, Consumer_type type,
-                             Rewrite_params *params = nullptr,
+                             const Rewrite_params *params = nullptr,
                              bool do_ps_instrument = true);
 
 /**
@@ -157,6 +159,10 @@
   virtual void append_auth_str(LEX_USER *lex, String *str) const;
   /* Append the authentication plugin name for the user */
   void append_plugin_name(const LEX_USER *user, String *str) const;
+  /* Append authentication plugin name from LEX_MFA for the user */
+  void append_mfa_plugin_name(const LEX_MFA *user, String *str) const;
+  /* Append the authentication string from LEX_MFA for the user */
+  void append_mfa_auth_str(const LEX_MFA *user, String *str) const;
 
   /*
     Rewrites some of the user specific properties which are common to
@@ -235,7 +241,7 @@
 
  public:
   Rewriter_show_create_user(THD *thd, Consumer_type type,
-                            Rewrite_params *params);
+                            const Rewrite_params *params);
   bool rewrite(String &rlb) const override;
   void rewrite_user_application_user_metadata(const LEX *lex,
                                               String *str) const override;
@@ -249,7 +255,7 @@
                              String *str) const override;
   void rewrite_password_history(const LEX *lex, String *str) const override;
   void rewrite_password_reuse(const LEX *lex, String *str) const override;
-  Show_user_params *show_params_;
+  const Show_user_params *show_params_;
 };
 
 /** Rewrites the SET statement. */
@@ -265,7 +271,8 @@
   using parent = Rewriter_set;
 
  public:
-  Rewriter_set_password(THD *thd, Consumer_type type, Rewrite_params *params);
+  Rewriter_set_password(THD *thd, Consumer_type type,
+                        const Rewrite_params *params);
   bool rewrite(String &rlb) const override;
 
  private:
@@ -276,12 +283,12 @@
 /** Rewrites the GRANT statement. */
 class Rewriter_grant final : public I_rewriter {
  public:
-  Rewriter_grant(THD *thd, Consumer_type type, Rewrite_params *params);
+  Rewriter_grant(THD *thd, Consumer_type type, const Rewrite_params *params);
   bool rewrite(String &rlb) const override;
 
  private:
   /* GRANT AS information */
-  Grant_params *grant_params = nullptr;
+  const Grant_params *grant_params = nullptr;
 };
 
 /** Rewrites the CHANGE REPLICATION SOURCE statement. */
diff -Nru mysql-8.0-8.0.26/sql/sql_select.cc mysql-8.0-8.0.27/sql/sql_select.cc
--- mysql-8.0-8.0.26/sql/sql_select.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_select.cc	2021-09-28 11:46:34.000000000 +0000
@@ -58,6 +58,7 @@
 #include "mysql/udf_registration_types.h"
 #include "mysql_com.h"
 #include "mysqld_error.h"
+#include "scope_guard.h"
 #include "sql/auth/auth_acls.h"
 #include "sql/auth/auth_common.h"  // *_ACL
 #include "sql/auth/sql_security_ctx.h"
@@ -75,7 +76,9 @@
 #include "sql/item_subselect.h"
 #include "sql/item_sum.h"  // Item_sum
 #include "sql/join_optimizer/access_path.h"
+#include "sql/join_optimizer/bit_utils.h"
 #include "sql/join_optimizer/join_optimizer.h"
+#include "sql/join_optimizer/replace_item.h"
 #include "sql/json_dom.h"
 #include "sql/key.h"  // key_copy, key_cmp, key_cmp_if_same
 #include "sql/key_spec.h"
@@ -86,12 +89,12 @@
 #include "sql/opt_explain.h"
 #include "sql/opt_explain_format.h"
 #include "sql/opt_hints.h"  // hint_key_state()
-#include "sql/opt_range.h"  // QUICK_SELECT_I
 #include "sql/opt_trace.h"
 #include "sql/opt_trace_context.h"
 #include "sql/parse_tree_node_base.h"
 #include "sql/query_options.h"
 #include "sql/query_result.h"
+#include "sql/range_optimizer/range_optimizer.h"  // QUICK_SELECT_I
 #include "sql/row_iterator.h"
 #include "sql/set_var.h"
 #include "sql/sorting_iterator.h"
@@ -108,6 +111,7 @@
 #include "sql/sql_optimizer.h"  // JOIN
 #include "sql/sql_parse.h"      // bind_fields
 #include "sql/sql_planner.h"    // calculate_condition_filter
+#include "sql/sql_resolver.h"
 #include "sql/sql_test.h"       // misc. debug printing utilities
 #include "sql/sql_timer.h"      // thd_timer_set
 #include "sql/sql_tmp_table.h"  // tmp tables
@@ -327,7 +331,8 @@
 
   lex->using_hypergraph_optimizer =
       thd->optimizer_switch_flag(OPTIMIZER_SWITCH_HYPERGRAPH_OPTIMIZER) &&
-      (lex->sql_command == SQLCOM_SELECT ||
+      (lex->sql_command == SQLCOM_SELECT || lex->sql_command == SQLCOM_DO ||
+       lex->sql_command == SQLCOM_CALL ||
        lex->sql_command == SQLCOM_INSERT_SELECT ||
        lex->sql_command == SQLCOM_REPLACE_SELECT);
 
@@ -757,7 +762,7 @@
   Query_expression *unit = lex->unit;
 
   if (unit->optimize(thd, /*materialize_destination=*/nullptr,
-                     /*create_iterators=*/true))
+                     /*create_iterators=*/true, /*finalize_access_paths=*/true))
     return true;
 
   // Calculate the current statement cost.
@@ -1631,12 +1636,6 @@
         subquery, so resetting key_err is not needed.
       */
       tab->ref().key_err = true;
-      /*
-        If the finished execution used "filesort", it may have reset "quick"
-        or "condition" when it didn't need them anymore. Restore them for the
-        new execution (the new filesort will need them when it starts).
-      */
-      tab->restore_quick_optim_and_condition();
     }
   }
 
@@ -1787,7 +1786,7 @@
   @returns false if success, true if error
 */
 
-bool Query_block::optimize(THD *thd) {
+bool Query_block::optimize(THD *thd, bool finalize_access_paths) {
   DBUG_TRACE;
 
   assert(join == nullptr);
@@ -1802,7 +1801,7 @@
   join = join_local;
   thd->unlock_query_plan();
 
-  if (join->optimize()) return true;
+  if (join->optimize(finalize_access_paths)) return true;
 
   if (join->zero_result_cause && !is_implicitly_grouped()) return false;
 
@@ -1812,7 +1811,8 @@
     // Derived tables and const subqueries are already optimized
     if (!query_expression->is_optimized() &&
         query_expression->optimize(thd, /*materialize_destination=*/nullptr,
-                                   /*create_iterators=*/false))
+                                   /*create_iterators=*/false,
+                                   /*finalize_access_paths=*/true))
       return true;
   }
 
@@ -2314,49 +2314,21 @@
   return thd->is_error();
 }
 
-store_key_field::store_key_field(THD *thd, Field *to_field_arg, uchar *ptr,
-                                 uchar *null_ptr_arg, uint length,
-                                 Field *from_field, const char *name_arg)
-    : store_key(thd, to_field_arg, ptr, null_ptr_arg, length),
-      m_field_name(name_arg) {
-  // If from_field is nullable but we cannot store null, make
-  // to_field temporary nullable so we can check in copy_inner()
-  // if we end up with an illegal null value.
-  if (!to_field->is_nullable() &&
-      (from_field->is_nullable() || from_field->table->is_nullable()))
-    to_field->set_tmp_nullable();
-  m_copy_field.set(to_field, from_field);
-}
-
-enum store_key::store_key_result store_key_field::copy_inner() {
-  TABLE *table = to_field->table;
-  my_bitmap_map *old_map = dbug_tmp_use_all_columns(table, table->write_set);
-  m_copy_field.invoke_do_copy();
-  dbug_tmp_restore_column_map(table->write_set, old_map);
-  null_key = to_field->is_null();
-  return to_field->is_tmp_null() ? STORE_KEY_FATAL : STORE_KEY_OK;
-}
-
-void store_key_field::replace_from_field(Field *from_field) {
-  m_copy_field.set(to_field, from_field);
-}
-
 namespace {
 
-class store_key_const_item final : public store_key_item {
+class store_key_const_item final : public store_key {
   int cached_result = -1;
 
  public:
   store_key_const_item(THD *thd, Field *to_field_arg, uchar *ptr,
                        uchar *null_ptr_arg, uint length, Item *item_arg)
-      : store_key_item(thd, to_field_arg, ptr, null_ptr_arg, length, item_arg) {
-  }
+      : store_key(thd, to_field_arg, ptr, null_ptr_arg, length, item_arg) {}
   const char *name() const override { return STORE_KEY_CONST_NAME; }
 
  protected:
   enum store_key_result copy_inner() override {
     if (cached_result == -1) {
-      cached_result = store_key_item::copy_inner();
+      cached_result = store_key::copy_inner();
     }
     return static_cast<store_key_result>(cached_result);
   }
@@ -2367,7 +2339,7 @@
   obtained from val_json() method and then converted according to field's
   result type and saved. This allows proper handling of temporal values.
 */
-class store_key_json_item final : public store_key_item {
+class store_key_json_item final : public store_key {
   /// Whether the key is constant.
   const bool m_const_key{false};
   /// Whether the key was already copied.
@@ -2377,7 +2349,7 @@
   store_key_json_item(THD *thd, Field *to_field_arg, uchar *ptr,
                       uchar *null_ptr_arg, uint length, Item *item_arg,
                       bool const_key_arg)
-      : store_key_item(thd, to_field_arg, ptr, null_ptr_arg, length, item_arg),
+      : store_key(thd, to_field_arg, ptr, null_ptr_arg, length, item_arg),
         m_const_key(const_key_arg) {}
 
   const char *name() const override {
@@ -2406,30 +2378,14 @@
         thd, key_part->field, key_buff + maybe_null,
         maybe_null ? key_buff : nullptr, key_part->length, val);
   }
-
-  Item_field *field_item = nullptr;
-  if (val->type() == Item::FIELD_ITEM)
-    field_item = down_cast<Item_field *>(val->real_item());
-  else if (val->type() == Item::REF_ITEM) {
-    Item_ref *item_ref = down_cast<Item_ref *>(val);
-    if (item_ref->ref_type() == Item_ref::OUTER_REF) {
-      if ((*item_ref->ref)->type() == Item::FIELD_ITEM)
-        field_item = down_cast<Item_field *>(item_ref->real_item());
-    }
-  }
-  if (field_item)
-    return new (thd->mem_root)
-        store_key_field(thd, key_part->field, key_buff + maybe_null,
-                        maybe_null ? key_buff : nullptr, key_part->length,
-                        field_item->field, val->full_name());
-
   return new (thd->mem_root)
-      store_key_item(thd, key_part->field, key_buff + maybe_null,
-                     maybe_null ? key_buff : nullptr, key_part->length, val);
+      store_key(thd, key_part->field, key_buff + maybe_null,
+                maybe_null ? key_buff : nullptr, key_part->length, val);
 }
 
 store_key::store_key(THD *thd, Field *field_arg, uchar *ptr, uchar *null,
-                     uint length) {
+                     uint length, Item *item_arg)
+    : item(item_arg) {
   if (field_arg->type() == MYSQL_TYPE_BLOB ||
       field_arg->type() == MYSQL_TYPE_GEOMETRY) {
     /*
@@ -2443,6 +2399,12 @@
   } else
     to_field =
         field_arg->new_key_field(thd->mem_root, field_arg->table, ptr, null, 1);
+
+  // If the item is nullable, but we cannot store null, make
+  // to_field temporary nullable so that we can check in copy_inner()
+  // if we end up with an illegal null value.
+  if (!to_field->is_nullable() && item->is_nullable())
+    to_field->set_tmp_nullable();
 }
 
 store_key::store_key_result store_key::copy() {
@@ -2464,7 +2426,7 @@
 }
 
 enum store_key::store_key_result store_key_hash_item::copy_inner() {
-  enum store_key_result res = store_key_item::copy_inner();
+  enum store_key_result res = store_key::copy_inner();
   if (res != STORE_KEY_FATAL) {
     // Convert to and from little endian, since that is what gets
     // stored in the hash field we are lookup up against.
@@ -2530,17 +2492,7 @@
   return store_key::STORE_KEY_FATAL;
 }
 
-store_key_item::store_key_item(THD *thd, Field *to_field_arg, uchar *ptr,
-                               uchar *null_ptr_arg, uint length, Item *item_arg)
-    : store_key(thd, to_field_arg, ptr, null_ptr_arg, length), item(item_arg) {
-  // If the item is nullable, but we cannot store null, make
-  // to_field temporary nullable so that we can check in copy_inner()
-  // if we end up with an illegal null value.
-  if (!to_field->is_nullable() && item->is_nullable())
-    to_field->set_tmp_nullable();
-}
-
-enum store_key::store_key_result store_key_item::copy_inner() {
+enum store_key::store_key_result store_key::copy_inner() {
   THD *thd = current_thd;
   TABLE *table = to_field->table;
   my_bitmap_map *old_map = dbug_tmp_use_all_columns(table, table->write_set);
@@ -3156,7 +3108,7 @@
       case JT_ALL:
         join->thd->set_status_no_index_used();
         qep_tab->using_dynamic_range = (tab->use_quick == QS_DYNAMIC_RANGE);
-      /* Fall through */
+        [[fallthrough]];
       case JT_INDEX_SCAN:
         if (tab->position()->filter_effect != COND_FILTER_STALE_NO_CONST &&
             !tab->sj_mat_exec()) {
@@ -3293,7 +3245,7 @@
       */
       if (last != NO_PLAN_IDX) {
         QEP_TAB &t = join->qep_tab[last];
-        t.lateral_derived_tables_depend_on_me |= table_ref->map();
+        t.lateral_derived_tables_depend_on_me |= TableBitmap(i);
         trace_refine_table.add_utf8("rematerialized_for_each_row_of",
                                     t.table()->alias);
       }
@@ -3371,7 +3323,6 @@
   // Delete parts specific of QEP_TAB:
   destroy(filesort);
   filesort = nullptr;
-  if (quick_optim() != quick()) delete quick_optim();
 
   TABLE *const t = table();
 
@@ -3421,7 +3372,7 @@
       table_ref->derived_key_list.clear();
     }
   }
-  delete quick();
+  destroy(quick());
 }
 
 uint QEP_TAB::sjm_query_block_id() const {
@@ -4120,6 +4071,65 @@
   return false;
 }
 
+bool CreateFramebufferTable(
+    THD *thd, const Temp_table_param &tmp_table_param,
+    const Query_block &query_block, const mem_root_deque<Item *> &source_fields,
+    const mem_root_deque<Item *> &window_output_fields,
+    Func_ptr_array *mapping_from_source_to_window_output, Window *window) {
+  /*
+    Create the window frame buffer tmp table.  We create a
+    temporary table with same contents as the output tmp table
+    in the windowing pipeline (columns defined by
+    curr_all_fields), but used for intermediate storage, saving
+    the window's frame buffer now that we know the window needs
+    buffering.
+  */
+  Temp_table_param *par = new (thd->mem_root) Temp_table_param(tmp_table_param);
+  par->m_window_frame_buffer = true;
+
+  // Don't include temporary fields that originally came from
+  // a window function (or an expression containing a window function).
+  // Window functions are not relevant to store in the framebuffer,
+  // and in fact, trying to restore them would often overwrite
+  // good data we shouldn't.
+  //
+  // Not that the regular filtering in create_tmp_table() cannot do this
+  // for us, as it only sees the Item_field, not where it came from.
+  mem_root_deque<Item *> fb_fields(window_output_fields);
+  for (size_t i = 0; i < fb_fields.size(); ++i) {
+    Item *orig_item = source_fields[i];
+    if (orig_item->has_wf()) {
+      fb_fields[i] = nullptr;
+    }
+  }
+  fb_fields.erase(std::remove(fb_fields.begin(), fb_fields.end(), nullptr),
+                  fb_fields.end());
+  count_field_types(&query_block, par, fb_fields, false, false);
+
+  TABLE *table =
+      create_tmp_table(thd, par, fb_fields, nullptr, false, false,
+                       query_block.active_options(), HA_POS_ERROR, "");
+  if (table == nullptr) return true;
+
+  window->set_frame_buffer_param(par);
+  window->set_frame_buffer(table);
+
+  // For window function expressions we are to evaluate after
+  // framebuffering, we need to replace their arguments to point to the
+  // output table instead of the input table (we could probably also have
+  // used the framebuffer if we wanted). E.g., if our input is t1 and our
+  // output is <temporary>, we need to rewrite 1 + SUM(t1.x) OVER w into
+  // 1 + SUM(<temporary>.x) OVER w.
+  for (Func_ptr &ptr : *mapping_from_source_to_window_output) {
+    if (ptr.func()->has_wf()) {
+      ReplaceMaterializedItems(thd, ptr.func(),
+                               *mapping_from_source_to_window_output,
+                               /*need_exact_match=*/false);
+    }
+  }
+  return false;
+}
+
 /**
   Init tmp tables usage info.
 
@@ -4161,9 +4171,25 @@
   uint curr_tmp_table = const_tables;
   TABLE *exec_tmp_table = nullptr;
 
+  auto cleanup_tmp_tables_on_error =
+      create_scope_guard([this, &curr_tmp_table] {
+        if (qep_tab == nullptr) {
+          return;
+        }
+        for (unsigned table_idx = primary_tables; table_idx <= curr_tmp_table;
+             ++table_idx) {
+          TABLE *table = qep_tab[table_idx].table();
+          if (table != nullptr) {
+            close_tmp_table(table);
+            free_tmp_table(table);
+            qep_tab[table_idx].set_table(nullptr);
+          }
+        }
+      });
+
   /*
     If the plan is constant, we will not do window tmp table processing
-    cf. special code path in do_query_block.
+    cf. special code path for handling const plans.
   */
   m_windowing_steps = m_windows.elements > 0 && !plan_is_const() &&
                       !implicit_grouping && !group_optimized_away;
@@ -4387,7 +4413,6 @@
         if (!plan_is_const())  // No need to sort a single row
         {
           if (add_sorting_to_table(curr_tmp_table - 1, &group_list,
-                                   /*force_stable_sort=*/false,
                                    /*sort_before_group=*/true))
             return true;
         }
@@ -4554,7 +4579,6 @@
         explain_flags.set(order_arg.src, ESP_USING_TMPTABLE);
 
       if (add_sorting_to_table(curr_tmp_table, &order_arg,
-                               /*force_stable_sort=*/false,
                                /*sort_before_group=*/false))
         return true;
       /*
@@ -4610,52 +4634,42 @@
         from the next temporary table.
       */
       const uint widx = REF_SLICE_WIN_1 + wno;
-      m_windows[wno]->set_needs_restore_input_row(
-          wno == 0 && qep_tab[primary_tables - 1].type() == JT_EQ_REF);
 
-      if (m_windows[wno]->needs_buffering()) {
-        /*
-          Create the window frame buffer tmp table.  We create a
-          temporary table with same contents as the output tmp table
-          in the windowing pipeline (columns defined by
-          curr_all_fields), but used for intermediate storage, saving
-          the window's frame buffer now that we know the window needs
-          buffering.
-        */
-        Temp_table_param *par =
-            new (thd->mem_root) Temp_table_param(tmp_table_param);
-        par->m_window_frame_buffer = true;
-        TABLE *table =
-            create_tmp_table(thd, par, *curr_fields, nullptr, false, false,
-                             query_block->active_options(), HA_POS_ERROR, "");
-        if (table == nullptr) return true;
+      QEP_TAB *tab = &qep_tab[curr_tmp_table];
+      mem_root_deque<Item *> *orig_fields = curr_fields;
+      {
+        Opt_trace_object trace_this_tbl(trace);
+        trace_this_tbl
+            .add("adding_tmp_table_in_plan_at_position", curr_tmp_table)
+            .add_alnum("cause", "output_for_window_functions")
+            .add("with_buffer", m_windows[wno]->needs_buffering());
 
-        m_windows[wno]->set_frame_buffer_param(par);
-        m_windows[wno]->set_frame_buffer(table);
-      }
+        if (create_intermediate_table(tab, *curr_fields, dummy, false))
+          return true;
 
-      Opt_trace_object trace_this_tbl(trace);
-      trace_this_tbl.add("adding_tmp_table_in_plan_at_position", curr_tmp_table)
-          .add_alnum("cause", "output_for_window_functions")
-          .add("with_buffer", m_windows[wno]->needs_buffering());
-      QEP_TAB *tab = &qep_tab[curr_tmp_table];
-      if (create_intermediate_table(tab, *curr_fields, dummy, false))
-        return true;
+        if (alloc_ref_item_slice(thd, widx)) return true;
 
-      if (m_windows[wno]->make_special_rows_cache(thd, tab->table()))
-        return true;
+        if (change_to_use_tmp_fields(curr_fields, thd, ref_items[widx],
+                                     &tmp_fields[widx],
+                                     query_block->m_added_non_hidden_fields))
+          return true;
 
-      if (alloc_ref_item_slice(thd, widx)) return true;
+        curr_fields = &tmp_fields[widx];
+        set_ref_item_slice(widx);
+        tab->ref_item_slice = widx;
+        setup_tmptable_write_func(tab, &trace_this_tbl);
+      }
 
-      if (change_to_use_tmp_fields(curr_fields, thd, ref_items[widx],
-                                   &tmp_fields[widx],
-                                   query_block->m_added_non_hidden_fields))
-        return true;
+      if (m_windows[wno]->needs_buffering()) {
+        if (CreateFramebufferTable(
+                thd, tmp_table_param, *query_block, *orig_fields, *curr_fields,
+                tab->tmp_table_param->items_to_copy, m_windows[wno])) {
+          return true;
+        }
+      }
 
-      curr_fields = &tmp_fields[widx];
-      set_ref_item_slice(widx);
-      tab->ref_item_slice = widx;
-      setup_tmptable_write_func(tab, &trace_this_tbl);
+      if (m_windows[wno]->make_special_rows_cache(thd, tab->table()))
+        return true;
 
       ORDER_with_src w_partition(m_windows[wno]->sorting_order(),
                                  ESC_WINDOWING);
@@ -4663,7 +4677,6 @@
       if (w_partition.order != nullptr) {
         Opt_trace_object trace_pre_sort(trace, "adding_sort_to_previous_table");
         if (add_sorting_to_table(curr_tmp_table - 1, &w_partition,
-                                 /*force_stable_sort=*/true,
                                  /*sort_before_group=*/false))
           return true;
       }
@@ -4671,7 +4684,6 @@
       if (m_windows[wno]->is_last()) {
         if (!order.empty() && m_ordered_index_usage != ORDERED_INDEX_ORDER_BY) {
           if (add_sorting_to_table(curr_tmp_table, &order,
-                                   /*force_stable_sort=*/false,
                                    /*sort_before_group=*/false))
             return true;
         }
@@ -4723,6 +4735,7 @@
     etc).
   */
   assert(!query_block->is_recursive() || !tmp_tables);
+  cleanup_tmp_tables_on_error.commit();
   return false;
 }
 
@@ -4754,19 +4767,6 @@
 void JOIN::unplug_join_tabs() {
   ASSERT_BEST_REF_IN_JOIN_ORDER(this);
 
-  /*
-    During execution we will need to access QEP_TABs by map.
-    map2table points to JOIN_TABs which are to be trashed a few lines down; so
-    we won't use map2table, but build a similar map2qep_tab; no need to
-    allocate new space for this array, we can reuse that of map2table.
-  */
-  static_assert(sizeof(QEP_TAB *) == sizeof(JOIN_TAB *), "");
-  void *storage = reinterpret_cast<void *>(map2table);
-  map2qep_tab = reinterpret_cast<QEP_TAB **>(storage);
-  for (uint i = 0; i < tables; ++i)
-    if (best_ref[i]->table_ref)
-      map2qep_tab[best_ref[i]->table_ref->tableno()] = &qep_tab[i];
-
   map2table = nullptr;
 
   for (uint i = 0; i < tables; ++i) best_ref[i]->cleanup();
@@ -4781,10 +4781,6 @@
                     created Filesort object gets attached to this.
 
   @param sort_order List of expressions to sort the table by
-  @param force_stable_sort
-                    If true, use stable sort, that is the sort will
-                    keep the reative order of equivalent elements.
-                    Needed for windowing semantics.
   @param sort_before_group
                     If true, this sort happens before grouping is done
                     (potentially as a step of grouping itself),
@@ -4797,7 +4793,6 @@
 */
 
 bool JOIN::add_sorting_to_table(uint idx, ORDER_with_src *sort_order,
-                                bool force_stable_sort,
                                 bool sort_before_group) {
   DBUG_TRACE;
   ASSERT_BEST_REF_IN_JOIN_ORDER(this);
@@ -4846,8 +4841,7 @@
     Switch_ref_item_slice slice_switch(this, tab->ref_item_slice);
     tab->filesort = new (thd->mem_root)
         Filesort(thd, {tab->table()}, keep_buffers, sort_order->order,
-                 HA_POS_ERROR, force_stable_sort,
-                 /*remove_duplicates=*/false, force_sort_position,
+                 HA_POS_ERROR, /*remove_duplicates=*/false, force_sort_position,
                  /*unwrap_rollup=*/sort_before_group);
     tab->filesort_pushed_order = sort_order->order;
   }
@@ -5109,8 +5103,9 @@
   Find a key to apply single table UPDATE/DELETE by a given ORDER
 
   @param       order           Linked list of ORDER BY arguments
-  @param       tab             Table to find a key
+  @param       table           Table to find a key
   @param       limit           LIMIT clause parameter
+  @param [in,out] quick        QUICK_SELECT_I used for this table, if any
   @param [out] need_sort       true if filesort needed
   @param [out] reverse
     true if the key is reversed again given ORDER (undefined if key == MAX_KEY)
@@ -5127,12 +5122,12 @@
       to table->file->stats.records.
 */
 
-uint get_index_for_order(ORDER_with_src *order, QEP_TAB *tab, ha_rows limit,
-                         bool *need_sort, bool *reverse) {
-  if (tab->quick() &&
-      tab->quick()->unique_key_range()) {  // Single row select (always
-                                           // "ordered"): Ok to use with key
-                                           // field UPDATE
+uint get_index_for_order(ORDER_with_src *order, TABLE *table, ha_rows limit,
+                         QUICK_SELECT_I **quick, bool *need_sort,
+                         bool *reverse) {
+  if ((*quick) && (*quick)->unique_key_range()) {  // Single row select (always
+                                                   // "ordered"): Ok to use with
+                                                   // key field UPDATE
     *need_sort = false;
     /*
       Returning of MAX_KEY here prevents updating of used_key_is_modified
@@ -5141,12 +5136,10 @@
     return MAX_KEY;
   }
 
-  TABLE *const table = tab->table();
-
   if (order->empty()) {
     *need_sort = false;
-    if (tab->quick())
-      return tab->quick()->index;  // index or MAX_KEY, use quick select as is
+    if ((*quick))
+      return (*quick)->index;  // index or MAX_KEY, use quick select as is
     else
       return table->file
           ->key_used_on_scan;  // MAX_KEY or index for some engines
@@ -5158,19 +5151,19 @@
     return MAX_KEY;
   }
 
-  if (tab->quick()) {
-    if (tab->quick()->index == MAX_KEY) {
+  if ((*quick)) {
+    if ((*quick)->index == MAX_KEY) {
       *need_sort = true;
       return MAX_KEY;
     }
 
     uint used_key_parts;
     bool skip_quick;
-    switch (test_if_order_by_key(order, table, tab->quick()->index,
-                                 &used_key_parts, &skip_quick)) {
+    switch (test_if_order_by_key(order, table, (*quick)->index, &used_key_parts,
+                                 &skip_quick)) {
       case 1:  // desired order
         *need_sort = false;
-        return tab->quick()->index;
+        return (*quick)->index;
       case 0:  // unacceptable order
         *need_sort = true;
         return MAX_KEY;
@@ -5178,10 +5171,9 @@
       {
         QUICK_SELECT_I *reverse_quick;
         if (!skip_quick &&
-            (reverse_quick = tab->quick()->make_reverse(used_key_parts))) {
-          delete tab->quick();
-          tab->set_quick(reverse_quick);
-          tab->set_type(calc_join_type(reverse_quick->get_type()));
+            (reverse_quick = (*quick)->make_reverse(used_key_parts))) {
+          destroy(*quick);
+          *quick = reverse_quick;
           *need_sort = false;
           return reverse_quick->index;
         } else {
@@ -5237,16 +5229,14 @@
 }
 
 join_type calc_join_type(int quick_type) {
-  if ((quick_type == QUICK_SELECT_I::QS_TYPE_INDEX_MERGE) ||
-      (quick_type == QUICK_SELECT_I::QS_TYPE_ROR_INTERSECT) ||
-      (quick_type == QUICK_SELECT_I::QS_TYPE_ROR_UNION))
+  if ((quick_type == QS_TYPE_INDEX_MERGE) ||
+      (quick_type == QS_TYPE_ROR_INTERSECT) ||
+      (quick_type == QS_TYPE_ROR_UNION))
     return JT_INDEX_MERGE;
   else
     return JT_RANGE;
 }
 
-const char *STORE_KEY_CONST_NAME = "const";
-
 /**
   @} (end of group Query_Optimizer)
 */
diff -Nru mysql-8.0-8.0.26/sql/sql_select.h mysql-8.0-8.0.27/sql/sql_select.h
--- mysql-8.0-8.0.26/sql/sql_select.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_select.h	2021-09-28 11:46:34.000000000 +0000
@@ -45,6 +45,7 @@
 #include "sql/sql_const.h"
 #include "sql/sql_opt_exec_shared.h"  // join_type
 
+class Func_ptr;
 class Item;
 class Item_func;
 class JOIN_TAB;
@@ -64,8 +65,10 @@
 struct SJ_TMP_TABLE_TAB;
 struct TABLE;
 struct TABLE_LIST;
+class Window;
 
 typedef ulonglong nested_join_map;
+typedef Mem_root_array<Func_ptr> Func_ptr_array;
 
 class Sql_cmd_select : public Sql_cmd_dml {
  public:
@@ -791,7 +794,7 @@
 extern "C" int refpos_order_cmp(const void *arg, const void *a, const void *b);
 
 /// The name of store_key instances that represent constant items.
-extern const char *STORE_KEY_CONST_NAME;
+constexpr const char *STORE_KEY_CONST_NAME = "const";
 
 /// Check privileges for all columns referenced from join expression
 bool check_privileges_for_join(THD *thd, mem_root_deque<TABLE_LIST *> *tables);
@@ -806,9 +809,17 @@
  public:
   bool null_key{false}; /* true <=> the value of the key has a null part */
   enum store_key_result { STORE_KEY_OK, STORE_KEY_FATAL, STORE_KEY_CONV };
-  store_key(THD *thd, Field *field_arg, uchar *ptr, uchar *null, uint length);
+  store_key(THD *thd, Field *to_field_arg, uchar *ptr, uchar *null_ptr_arg,
+            uint length, Item *item_arg);
   virtual ~store_key() = default;
-  virtual const char *name() const = 0;
+  virtual const char *name() const {
+    // Compatible with legacy behavior.
+    if (item->type() == Item::FIELD_ITEM) {
+      return item->full_name();
+    } else {
+      return "func";
+    }
+  }
 
   /**
     @brief sets ignore truncation warnings mode and calls the real copy method
@@ -820,55 +831,25 @@
 
  protected:
   Field *to_field;  // Store data here
-
-  virtual enum store_key_result copy_inner() = 0;
-};
-
-class store_key_field final : public store_key {
-  Copy_field m_copy_field;
-  const char *m_field_name;
-
- public:
-  store_key_field(THD *thd, Field *to_field_arg, uchar *ptr,
-                  uchar *null_ptr_arg, uint length, Field *from_field,
-                  const char *name_arg);
-
-  const char *name() const override { return m_field_name; }
-
-  // Change the source field to be another field. Used only by
-  // CreateBKAIterator, when rewriting multi-equalities used in ref access.
-  void replace_from_field(Field *from_field);
-
- protected:
-  enum store_key_result copy_inner() override;
-};
-class store_key_item : public store_key {
- protected:
   Item *item;
 
- public:
-  store_key_item(THD *thd, Field *to_field_arg, uchar *ptr, uchar *null_ptr_arg,
-                 uint length, Item *item_arg);
-  const char *name() const override { return "func"; }
-
- protected:
-  enum store_key_result copy_inner() override;
+  virtual enum store_key_result copy_inner();
 };
 
 /*
   Class used for unique constraint implementation by subselect_hash_sj_engine.
-  It uses store_key_item implementation to do actual copying, but after
+  It uses store_key implementation to do actual copying, but after
   that, copy_inner calculates hash of each key part for unique constraint.
 */
 
-class store_key_hash_item final : public store_key_item {
+class store_key_hash_item final : public store_key {
   ulonglong *hash;
 
  public:
   store_key_hash_item(THD *thd, Field *to_field_arg, uchar *ptr,
                       uchar *null_ptr_arg, uint length, Item *item_arg,
                       ulonglong *hash_arg)
-      : store_key_item(thd, to_field_arg, ptr, null_ptr_arg, length, item_arg),
+      : store_key(thd, to_field_arg, ptr, null_ptr_arg, length, item_arg),
         hash(hash_arg) {}
   const char *name() const override { return "func"; }
 
@@ -929,8 +910,9 @@
 
 class ORDER_with_src;
 
-uint get_index_for_order(ORDER_with_src *order, QEP_TAB *tab, ha_rows limit,
-                         bool *need_sort, bool *reverse);
+uint get_index_for_order(ORDER_with_src *order, TABLE *table, ha_rows limit,
+                         QUICK_SELECT_I **quick, bool *need_sort,
+                         bool *reverse);
 int test_if_order_by_key(ORDER_with_src *order, TABLE *table, uint idx,
                          uint *used_key_parts, bool *skip_quick);
 bool test_if_cheaper_ordering(const JOIN_TAB *tab, ORDER_with_src *order,
@@ -1032,6 +1014,12 @@
 bool equality_has_no_implicit_casts(const Item_func_comparison *func,
                                     const Item *item1, const Item *item2);
 
+bool CreateFramebufferTable(
+    THD *thd, const Temp_table_param &tmp_table_param,
+    const Query_block &query_block, const mem_root_deque<Item *> &source_fields,
+    const mem_root_deque<Item *> &window_output_fields,
+    Func_ptr_array *mapping_from_source_to_window_output, Window *window);
+
 /**
   Validates a query that uses the secondary engine
 
diff -Nru mysql-8.0-8.0.26/sql/sql_servers.cc mysql-8.0-8.0.27/sql/sql_servers.cc
--- mysql-8.0-8.0.26/sql/sql_servers.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_servers.cc	2021-09-28 11:46:34.000000000 +0000
@@ -246,12 +246,12 @@
   if (servers_cache != nullptr) {
     servers_cache->clear();
   }
-  free_root(&mem, MYF(0));
+  mem.Clear();
   init_sql_alloc(key_memory_servers, &mem, ACL_ALLOC_BLOCK_SIZE, 0);
 
-  unique_ptr_destroy_only<RowIterator> iterator = init_table_iterator(
-      thd, table, nullptr,
-      /*ignore_not_found_rows=*/false, /*count_examined_rows=*/false);
+  unique_ptr_destroy_only<RowIterator> iterator =
+      init_table_iterator(thd, table, /*ignore_not_found_rows=*/false,
+                          /*count_examined_rows=*/false);
   if (iterator == nullptr) return true;
 
   while (!(iterator->Read())) {
@@ -881,12 +881,12 @@
   DBUG_TRACE;
   if (servers_cache == nullptr) return;
   if (!end) {
-    free_root(&mem, MYF(MY_MARK_BLOCKS_FREE));
+    mem.ClearForReuse();
     servers_cache->clear();
     return;
   }
   mysql_rwlock_destroy(&THR_LOCK_servers);
-  free_root(&mem, MYF(0));
+  mem.Clear();
   delete servers_cache;
   servers_cache = nullptr;
 }
diff -Nru mysql-8.0-8.0.26/sql/sql_show.cc mysql-8.0-8.0.27/sql/sql_show.cc
--- mysql-8.0-8.0.26/sql/sql_show.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_show.cc	2021-09-28 11:46:34.000000000 +0000
@@ -33,6 +33,7 @@
 #include <functional>
 #include <memory>
 #include <new>
+#include <optional>
 #include <string>
 #include <vector>
 
@@ -66,7 +67,6 @@
 #include "mysql_com.h"
 #include "mysql_time.h"
 #include "mysqld_error.h"
-#include "nullable.h"
 #include "scope_guard.h"         // Scope_guard
 #include "sql/auth/auth_acls.h"  // DB_ACLS
 #include "sql/auth/auth_common.h"
@@ -1027,8 +1027,8 @@
      failed is not available at this point. The only way for us to check is by
      reconstructing the actual error message and see if it's the same.
   */
-  // MY_ATTRIBUTE((unused)) This applies to CHECK_ERRMSG_FORMAT = ON
-  const char *get_view_access_denied_message(THD *thd MY_ATTRIBUTE((unused))) {
+  // [[maybe_unused]] This applies to CHECK_ERRMSG_FORMAT = ON
+  const char *get_view_access_denied_message(THD *thd [[maybe_unused]]) {
     if (!m_view_access_denied_message_ptr) {
       m_view_access_denied_message_ptr = m_view_access_denied_message;
       snprintf(m_view_access_denied_message, MYSQL_ERRMSG_SIZE,
@@ -1060,7 +1060,7 @@
           is_handled = false;
           break;
         }
-        // Fall through
+        [[fallthrough]];
       case ER_COLUMNACCESS_DENIED_ERROR:
       // ER_VIEW_NO_EXPLAIN cannot happen here.
       case ER_PROCACCESS_DENIED_ERROR:
@@ -2193,19 +2193,20 @@
   }
 
   packet->append(STRING_WITH_LEN("\n)"));
+
+  /**
+    Append START TRANSACTION for CREATE SELECT on SE supporting atomic DDL.
+    This is done only while binlogging CREATE TABLE AS SELECT.
+  */
+  if (!thd->lex->query_block->field_list_is_empty() &&
+      (create_info_arg->db_type->flags & HTON_SUPPORTS_ATOMIC_DDL)) {
+    packet->append(STRING_WITH_LEN(" START TRANSACTION"));
+  }
+
   bool show_tablespace = false;
   if (!foreign_db_mode) {
     show_table_options = true;
 
-    /**
-      Append START TRANSACTION for CREATE SELECT on SE supporting atomic DDL.
-      This is done only while binlogging CREATE TABLE AS SELECT.
-    */
-    if (!thd->lex->query_block->field_list_is_empty() &&
-        (create_info_arg->db_type->flags & HTON_SUPPORTS_ATOMIC_DDL)) {
-      packet->append(STRING_WITH_LEN(" START TRANSACTION"));
-    }
-
     // Show tablespace name only if it is explicitly provided by user.
     if (share->tmp_table) {
       // Innodb allows temporary tables in be in system temporary tablespace.
@@ -2697,16 +2698,16 @@
     LEX_CSTRING inspect_sctx_host = inspect_sctx->host();
     LEX_CSTRING inspect_sctx_host_or_ip = inspect_sctx->host_or_ip();
 
-    mysql_mutex_lock(&inspect_thd->LOCK_thd_protocol);
-    if ((!(inspect_thd->get_protocol() &&
-           inspect_thd->get_protocol()->connection_alive()) &&
-         !inspect_thd->system_thread) ||
-        (m_user && (inspect_thd->system_thread || !inspect_sctx_user.str ||
-                    strcmp(inspect_sctx_user.str, m_user)))) {
-      mysql_mutex_unlock(&inspect_thd->LOCK_thd_protocol);
-      return;
+    {
+      MUTEX_LOCK(grd, &inspect_thd->LOCK_thd_protocol);
+      if ((!(inspect_thd->get_protocol() &&
+             inspect_thd->get_protocol()->connection_alive()) &&
+           !inspect_thd->system_thread) ||
+          (m_user && (inspect_thd->system_thread || !inspect_sctx_user.str ||
+                      strcmp(inspect_sctx_user.str, m_user)))) {
+        return;
+      }
     }
-    mysql_mutex_unlock(&inspect_thd->LOCK_thd_protocol);
 
     thread_info *thd_info = new (m_client_thd->mem_root) thread_info;
 
@@ -2907,12 +2908,14 @@
             ? NullS
             : client_priv_user;
 
-    if ((!inspect_thd->get_protocol()->connection_alive() &&
-         !inspect_thd->system_thread) ||
-        (user && (inspect_thd->system_thread || !inspect_sctx_user.str ||
-                  strcmp(inspect_sctx_user.str, user))))
-      return;
-
+    {
+      MUTEX_LOCK(grd, &inspect_thd->LOCK_thd_protocol);
+      if ((!inspect_thd->get_protocol()->connection_alive() &&
+           !inspect_thd->system_thread) ||
+          (user && (inspect_thd->system_thread || !inspect_sctx_user.str ||
+                    strcmp(inspect_sctx_user.str, user))))
+        return;
+    }
     DBUG_EXECUTE_IF(
         "test_fill_proc_with_x_root",
         if (0 == strcmp(inspect_sctx_user.str, "x_root")) {
@@ -3510,7 +3513,10 @@
 bool schema_table_store_record(THD *thd, TABLE *table) {
   int error;
   if ((error = table->file->ha_write_row(table->record[0]))) {
-    if (create_ondisk_from_heap(thd, table, error, false, nullptr)) return true;
+    if (create_ondisk_from_heap(thd, table, error, /*insert_last_record=*/true,
+                                /*ignore_last_dup=*/false,
+                                /*is_duplicate=*/nullptr))
+      return true;
   }
   return false;
 }
@@ -3544,7 +3550,9 @@
   @return false on success, true on error.
 */
 bool convert_heap_table_to_ondisk(THD *thd, TABLE *table, int error) {
-  return (create_ondisk_from_heap(thd, table, error, false, nullptr));
+  return (create_ondisk_from_heap(
+      thd, table, error, /*insert_last_record=*/true,
+      /*ignore_last_dup=*/false, /*is_duplicate=*/nullptr));
 }
 
 /**
diff -Nru mysql-8.0-8.0.26/sql/sql_signal.cc mysql-8.0-8.0.27/sql/sql_signal.cc
--- mysql-8.0-8.0.26/sql/sql_signal.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_signal.cc	2021-09-28 11:46:34.000000000 +0000
@@ -95,7 +95,7 @@
 }
 
 void Sql_cmd_common_signal::assign_defaults(
-    THD *thd MY_ATTRIBUTE((unused)), Sql_condition *cond, bool set_level_code,
+    THD *thd [[maybe_unused]], Sql_condition *cond, bool set_level_code,
     Sql_condition::enum_severity_level level, int sqlcode) {
   if (set_level_code) {
     cond->m_severity_level = level;
diff -Nru mysql-8.0-8.0.26/sql/sql_table.cc mysql-8.0-8.0.27/sql/sql_table.cc
--- mysql-8.0-8.0.26/sql/sql_table.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_table.cc	2021-09-28 11:46:34.000000000 +0000
@@ -26,36 +26,51 @@
 
 #include "sql/sql_table.h"
 
+#include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 #include <algorithm>
 #include <atomic>
-#include <cstring>
 #include <functional>
 #include <memory>
-#include <new>
+#include <optional>
 #include <string>
+#include <string_view>
 #include <type_traits>
 
+/* HAVE_PSI_*_INTERFACE */
+#include "my_psi_config.h"  // IWYU pragma: keep
+
+/* drop_table_share with WITH_LOCK_ORDER */
+#include "mysql/psi/psi_table.h"  // IWYU pragma: keep
+
+/* PSI_TABLE_CALL() with WITH_LOCK_ORDER */
+#include "mysql/psi/mysql_table.h"  // IWYU pragma: keep
+
+#include "decimal.h"
 #include "field_types.h"  // enum_field_types
 #include "lex_string.h"
 #include "libbinlogevents/include/binlog_event.h"
 #include "m_ctype.h"
 #include "m_string.h"  // my_stpncpy
+#include "map_helpers.h"
+#include "mem_root_deque.h"
 #include "my_alloc.h"
 #include "my_base.h"
-#include "my_bit.h"
+#include "my_bitmap.h"
 #include "my_check_opt.h"  // T_EXTEND
+#include "my_checksum.h"
 #include "my_compiler.h"
 #include "my_dbug.h"
 #include "my_io.h"
 #include "my_loglevel.h"
-#include "my_md5.h"
-#include "my_md5_size.h"
 #include "my_psi_config.h"
+#include "my_sqlcommand.h"
 #include "my_sys.h"
+#include "my_systime.h"
 #include "my_thread_local.h"
 #include "my_time.h"
 #include "mysql/components/services/bits/psi_bits.h"
@@ -65,18 +80,17 @@
 #include "mysql/plugin.h"
 #include "mysql/psi/mysql_mutex.h"
 #include "mysql/psi/mysql_stage.h"
-#include "mysql/psi/mysql_table.h"
-#include "mysql/psi/psi_table.h"
 #include "mysql_com.h"
 #include "mysql_time.h"
 #include "mysqld_error.h"  // ER_*
-#include "nullable.h"
+#include "pfs_table_provider.h"
 #include "prealloced_array.h"
 #include "scope_guard.h"
 #include "sql/auth/auth_acls.h"
 #include "sql/auth/auth_common.h"  // check_fk_parent_table_access
 #include "sql/binlog.h"            // mysql_bin_log
 #include "sql/create_field.h"
+#include "sql/current_thd.h"
 #include "sql/dd/cache/dictionary_client.h"  // dd::cache::Dictionary_client
 #include "sql/dd/collection.h"
 #include "sql/dd/dd.h"          // dd::get_dictionary
@@ -101,8 +115,10 @@
 #include "sql/dd_table_share.h"  // open_table_def
 #include "sql/debug_sync.h"      // DEBUG_SYNC
 #include "sql/derror.h"          // ER_THD
-#include "sql/error_handler.h"   // Drop_table_error_handler
+#include "sql/enum_query_type.h"
+#include "sql/error_handler.h"  // Drop_table_error_handler
 #include "sql/field.h"
+#include "sql/field_common_properties.h"
 #include "sql/filesort.h"  // Filesort
 #include "sql/gis/srid.h"
 #include "sql/handler.h"
@@ -119,19 +135,19 @@
 #include "sql/log_event.h"  // Query_log_event
 #include "sql/mdl.h"
 #include "sql/mem_root_array.h"
+#include "sql/my_decimal.h"
 #include "sql/mysqld.h"  // lower_case_table_names
 #include "sql/partition_element.h"
 #include "sql/partition_info.h"                  // partition_info
 #include "sql/partitioning/partition_handler.h"  // Partition_handler
 #include "sql/protocol.h"
+#include "sql/psi_memory_key.h"
 #include "sql/query_options.h"
 #include "sql/records.h"  // unique_ptr_destroy_only<RowIterator>
 #include "sql/row_iterator.h"
 #include "sql/rpl_gtid.h"
-#include "sql/rpl_replica_commit_order_manager.h"  // Commit_order_manager
-#include "sql/rpl_rli.h"                           // rli_slave etc
+#include "sql/rpl_rli.h"  // rli_slave etc
 #include "sql/session_tracker.h"
-#include "sql/sorting_iterator.h"
 #include "sql/sql_alter.h"
 #include "sql/sql_backup_lock.h"  // acquire_shared_backup_lock
 #include "sql/sql_base.h"         // lock_table_names
@@ -142,26 +158,26 @@
 #include "sql/sql_constraint.h"  // Constraint_type_resolver
 #include "sql/sql_db.h"          // get_default_db_collation
 #include "sql/sql_error.h"
-#include "sql/sql_executor.h"  // QEP_TAB_standalone
 #include "sql/sql_handler.h"
 #include "sql/sql_lex.h"
 #include "sql/sql_list.h"
 #include "sql/sql_parse.h"  // test_if_data_home_dir
 #include "sql/sql_partition.h"
 #include "sql/sql_plist.h"
+#include "sql/sql_plugin.h"
 #include "sql/sql_plugin_ref.h"
 #include "sql/sql_resolver.h"  // setup_order
 #include "sql/sql_show.h"
 #include "sql/sql_tablespace.h"  // validate_tablespace_name
 #include "sql/sql_time.h"        // make_truncated_value_warning
-#include "sql/sql_tmp_table.h"   // create_tmp_field
 #include "sql/sql_trigger.h"     // change_trigger_table_name
 #include "sql/srs_fetcher.h"
+#include "sql/stateless_allocator.h"
 #include "sql/strfunc.h"  // find_type2
 #include "sql/system_variables.h"
 #include "sql/table.h"
 #include "sql/thd_raii.h"
-#include "sql/timing_iterator.h"
+#include "sql/thr_malloc.h"
 #include "sql/transaction.h"  // trans_commit_stmt
 #include "sql/transaction_info.h"
 #include "sql/trigger.h"
@@ -178,6 +194,8 @@
 using binary_log::checksum_crc32;
 using std::max;
 using std::min;
+using std::string;
+using std::to_string;
 
 #define ER_THD_OR_DEFAULT(thd, X) \
   ((thd) ? ER_THD_NONCONST(thd, X) : ER_DEFAULT_NONCONST(X))
@@ -1470,7 +1488,7 @@
     */
     Dummy_error_handler error_handler;
     thd->push_internal_handler(&error_handler);
-    bool ignored MY_ATTRIBUTE((unused));
+    bool ignored [[maybe_unused]];
     ignored = thd->dd_client()->invalidate(parent_it.first.first.c_str(),
                                            parent_it.first.second.c_str());
     DBUG_EXECUTE_IF("fail_while_invalidating_fk_parents",
@@ -2486,8 +2504,7 @@
 */
 static bool adjust_fk_children_for_parent_drop(
     THD *thd, const char *parent_table_db, const char *parent_table_name,
-    const dd::Table *parent_table_def,
-    handlerton *hton MY_ATTRIBUTE((unused))) {
+    const dd::Table *parent_table_def, handlerton *hton [[maybe_unused]]) {
   for (const dd::Foreign_key_parent *parent_fk :
        parent_table_def->foreign_key_parents()) {
     if (my_strcasecmp(table_alias_charset,
@@ -2598,9 +2615,9 @@
 /**
  * Loads a table from its primary engine into its secondary engine.
  *
- * @note An MDL_EXCLUSIVE lock on the table must have been acquired prior to
- * calling this function to ensure that all currently running DML statements
- * commit before load begins.
+ * This call assumes that MDL_SHARED_NO_WRITE/SECLOAD_SCAN_START_MDL lock
+ * on the table have been acquired by caller. During its execution it may
+ * downgrade this lock to MDL_SHARED_UPGRADEABLE/SECLOAD_PAR_SCAN_MDL.
  *
  * @param thd              Thread handler.
  * @param table            Table in primary storage engine.
@@ -2609,7 +2626,8 @@
  */
 static bool secondary_engine_load_table(THD *thd, const TABLE &table) {
   assert(thd->mdl_context.owns_equal_or_stronger_lock(
-      MDL_key::TABLE, table.s->db.str, table.s->table_name.str, MDL_EXCLUSIVE));
+      MDL_key::TABLE, table.s->db.str, table.s->table_name.str,
+      SECLOAD_SCAN_START_MDL));
   assert(table.s->has_secondary_engine());
 
   // At least one column must be loaded into the secondary engine.
@@ -3256,7 +3274,7 @@
           committed earlier.
         */
       }
-      free_root(&foreach_table_root, MYF(MY_MARK_BLOCKS_FREE));
+      foreach_table_root.ClearForReuse();
     }
   }
 
@@ -3284,7 +3302,7 @@
                           &safe_to_release_mdl_atomic, &foreach_table_root)) {
         goto err_with_rollback;
       }
-      free_root(&foreach_table_root, MYF(MY_MARK_BLOCKS_FREE));
+      foreach_table_root.ClearForReuse();
     }
 
     DBUG_EXECUTE_IF("rm_table_no_locks_abort_after_atomic_tables", {
@@ -3317,7 +3335,7 @@
                                          &foreach_table_root))
         goto err_with_rollback;
 
-      free_root(&foreach_table_root, MYF(MY_MARK_BLOCKS_FREE));
+      foreach_table_root.ClearForReuse();
     }
 
 #ifndef NDEBUG
@@ -3953,7 +3971,7 @@
         my_error(ER_CHECK_NOT_IMPLEMENTED, MYF(0), "GEOMETRY");
         return true;
       }
-      /* fall-through */
+      [[fallthrough]];
     case MYSQL_TYPE_BLOB:
     case MYSQL_TYPE_MEDIUM_BLOB:
     case MYSQL_TYPE_TINY_BLOB:
@@ -4905,7 +4923,7 @@
           return true;
         }
         key_info->algorithm = HA_KEY_ALG_RTREE;
-        /* fall through */
+        [[fallthrough]];
       case MYSQL_TYPE_TINY_BLOB:
       case MYSQL_TYPE_MEDIUM_BLOB:
       case MYSQL_TYPE_LONG_BLOB:
@@ -7481,7 +7499,7 @@
 
 /**
   Check if the given key name exists in the array of keys. The lookup is
-  case sensitive.
+  case insensitive.
 
   @param keys the array to check for the key name in
   @param key_name the key name to look for.
@@ -7509,34 +7527,69 @@
   return false;
 }
 
+/// Checks if a column with the given name exists in a list of fields.
+static bool column_name_exists(const List<Create_field> &fields,
+                               const string &column_name) {
+  for (const Create_field &field : fields) {
+    if (my_strcasecmp(system_charset_info, column_name.c_str(),
+                      field.field_name) == 0) {
+      return true;
+    }
+  }
+  return false;
+}
+
 /**
   Create a name for the hidden generated column that represents the functional
-  key part. The name is a hash of the index name and the key part number.
+  key part.
+
+  The name is a string on the form `!hidden!index_name!key_part!counter`. The
+  counter is usually 0, but is incremented until a unique name is found, in the
+  unlikely event that there is another column with the same name. The index_name
+  part may be truncated to make sure the column name does not exceed the maximum
+  column name length (NAME_CHAR_LEN).
 
   @param key_name the name of the index.
   @param key_part_number the key part number, starting from zero.
+  @param fields the other columns in the table
   @param mem_root the MEM_ROOT where the column name should be allocated.
 
   @returns the name for the hidden generated column, allocated on the supplied
            MEM_ROOT
 */
 static const char *make_functional_index_column_name(
-    const std::string &key_name, int key_part_number, MEM_ROOT *mem_root) {
-  std::string combined_name;
-  combined_name.append(key_name);
-  combined_name.append(std::to_string(key_part_number));
-
-  uchar digest[MD5_HASH_SIZE];
-  compute_md5_hash(pointer_cast<char *>(digest), combined_name.c_str(),
-                   combined_name.size());
-
-  // + 1 for the null terminator
-  char *output = new (mem_root) char[(MD5_HASH_SIZE * 2) + 1];
-  array_to_hex(output, digest, MD5_HASH_SIZE);
-
-  // Ensure that the null terminator is present
-  output[(MD5_HASH_SIZE * 2)] = '\0';
-  return output;
+    std::string_view key_name, unsigned key_part_number,
+    const List<Create_field> &fields, MEM_ROOT *mem_root) {
+  // Loop until we have found a unique name. We'll usually find one in the first
+  // iteration, but if there are user-defined columns using the same naming
+  // scheme, we might need to increment the counter to avoid collisions. We're
+  // guaranteed to find a unique name in at most fields.size() + 1 iterations.
+  for (unsigned count = 0;; ++count) {
+    assert(count <= fields.size());
+
+    string name("!hidden!");
+    name += key_name;
+
+    string suffix("!");
+    suffix += to_string(key_part_number);
+    suffix += '!';
+    suffix += to_string(count);
+
+    // If the name is so long that we hit the NAME_CHAR_LEN limit, truncate the
+    // index name part, so that there is enough room to add the suffix with the
+    // key part number and the counter. (If we had truncated the counter, we
+    // could loop forever because the generated name is the same in each
+    // iteration.)
+    name.resize(min(name.size(), NAME_CHAR_LEN - suffix.size()));
+    name.append(suffix);
+    assert(name.size() <= NAME_CHAR_LEN);
+
+    if (column_name_exists(fields, name)) {
+      continue;
+    }
+
+    return strmake_root(mem_root, name.data(), name.size());
+  }
 }
 
 /**
@@ -7602,22 +7655,6 @@
     key_spec->name.length = key_name.size();
     key_spec->name.str = strmake_root(thd->stmt_arena->mem_root,
                                       key_name.c_str(), key_name.size());
-  } else {
-    // Check that the key name isn't already in use. Normally we check for
-    // duplicate key names in prepare_key(), but for functional indexes we have
-    // to do it a bit earlier. The reason is that the name of the hidden
-    // generated column is a hash of the key name and the key part number. If we
-    // have the same index name twice, we will end up with two hidden columns
-    // with the same name. And, since prepare_create_field() is called before
-    // prepare_key(), we will get a "duplicate field name" error instead of the
-    // expected "duplicate key name" error. Thus, we do a pre-check for
-    // duplicate functional index names here.
-    if (key_name_exists(alter_info->key_list,
-                        {key_spec->name.str, key_spec->name.length},
-                        key_spec)) {
-      my_error(ER_DUP_KEYNAME, MYF(0), key_spec->name.str);
-      return nullptr;
-    }
   }
 
   // First we need to resolve the expression in the functional index so that we
@@ -7657,7 +7694,7 @@
 
   const char *field_name = make_functional_index_column_name(
       {key_spec->name.str, key_spec->name.length}, key_part_number,
-      thd->stmt_arena->mem_root);
+      alter_info->create_list, thd->stmt_arena->mem_root);
 
   Item *item = kp->get_expression();
 
@@ -7814,8 +7851,23 @@
   */
 
   /* Fix this when we have new .frm files;  Current limit is 4G rows (QQ) */
-  if (create_info->max_rows > UINT_MAX32) create_info->max_rows = UINT_MAX32;
-  if (create_info->min_rows > UINT_MAX32) create_info->min_rows = UINT_MAX32;
+  constexpr ulonglong u32max = UINT_MAX32;
+  if (create_info->max_rows > UINT_MAX32) {
+    // Values larger than uint32_max are capped to uint32_max.
+    // Emit a warning about this.
+    push_warning_printf(thd, Sql_condition::SL_WARNING, ER_VALUE_OUT_OF_RANGE,
+                        ER_THD(thd, ER_VALUE_OUT_OF_RANGE), "max_rows",
+                        create_info->max_rows, 0ULL, u32max, u32max);
+    create_info->max_rows = UINT_MAX32;
+  }
+  if (create_info->min_rows > UINT_MAX32) {
+    // Values larger than uint32_max are capped to uint32_max.
+    // Emit a warning about this.
+    push_warning_printf(thd, Sql_condition::SL_WARNING, ER_VALUE_OUT_OF_RANGE,
+                        ER_THD(thd, ER_VALUE_OUT_OF_RANGE), "min_rows",
+                        create_info->min_rows, 0ULL, u32max, u32max);
+    create_info->min_rows = UINT_MAX32;
+  }
 
   if (create_info->row_type == ROW_TYPE_DYNAMIC)
     create_info->table_options |= HA_OPTION_PACK_RECORD;
@@ -10559,7 +10611,7 @@
     over the names and acquire MDL lock for each of them.
   */
   if (lock_tablespace_names(thd, &tablespace_set,
-                            thd->variables.lock_wait_timeout)) {
+                            thd->variables.lock_wait_timeout, thd->mem_root)) {
     return true;
   }
 
@@ -10746,7 +10798,7 @@
           */
           create_info->used_fields |= HA_CREATE_USED_ENGINE;
 
-          bool result MY_ATTRIBUTE((unused)) = store_create_info(
+          bool result [[maybe_unused]] = store_create_info(
               thd, table, &query, create_info, true /* show_database */);
 
           assert(result == 0);  // store_create_info() always return 0
@@ -11088,7 +11140,16 @@
   assert(m_alter_info->requested_algorithm ==
          Alter_info::ALTER_TABLE_ALGORITHM_DEFAULT);
 
-  table_list->mdl_request.set_type(MDL_EXCLUSIVE);
+  // Load if SECONDARY_LOAD, unload if SECONDARY_UNLOAD
+  const bool is_load = m_alter_info->flags & Alter_info::ALTER_SECONDARY_LOAD;
+
+  // SECONDARY_LOAD operation requires SNW MDL for its initial phase, which is
+  // downgraded to SU lock (by RAPID SE) and eventually upgraded to X lock (by
+  // SQL-layer) before updating Table Definition Cache.
+  const enum_mdl_type mdl_type =
+      is_load ? SECLOAD_SCAN_START_MDL : MDL_EXCLUSIVE;
+
+  table_list->mdl_request.set_type(mdl_type);
 
   // Always use isolation level READ_COMMITTED to ensure consistent view of
   // table data during entire load operation. Higher isolation levels provide no
@@ -11104,6 +11165,30 @@
   if (open_and_lock_tables(thd, table_list, 0, &alter_prelocking_strategy))
     return true;
 
+  // SECONDARY_LOAD/SECONDARY_UNLOAD requires a secondary engine.
+  if (!table_list->table->s->has_secondary_engine()) {
+    my_error(ER_SECONDARY_ENGINE, MYF(0), "No secondary engine defined");
+    return true;
+  }
+
+  if (!is_load && secondary_engine_lock_tables_mode(*thd)) {
+    if (thd->mdl_context.upgrade_shared_lock(table_list->table->mdl_ticket,
+                                             mdl_type,
+                                             thd->variables.lock_wait_timeout))
+      return true;
+  }
+  assert(thd->mdl_context.owns_equal_or_stronger_lock(
+      MDL_key::TABLE, table_list->db, table_list->table_name, mdl_type));
+
+  MDL_ticket *mdl_ticket = table_list->table->mdl_ticket;
+  auto downgrade_guard = create_scope_guard([mdl_ticket, thd] {
+    // Under LOCK TABLES, downgrade to MDL_SHARED_NO_READ_WRITE after all
+    // operations have completed.
+    if (secondary_engine_lock_tables_mode(*thd)) {
+      mdl_ticket->downgrade_lock(MDL_SHARED_NO_READ_WRITE);
+    }
+  });
+
   // Omit hidden generated columns and columns marked as NOT SECONDARY from
   // read_set. It is the responsibility of the secondary engine handler to load
   // only the columns included in the read_set.
@@ -11121,12 +11206,6 @@
     table_list->table->mark_column_used(*field, MARK_COLUMNS_READ);
   }
 
-  // SECONDARY_LOAD/SECONDARY_UNLOAD requires a secondary engine.
-  if (!table_list->table->s->has_secondary_engine()) {
-    my_error(ER_SECONDARY_ENGINE, MYF(0), "No secondary engine defined");
-    return true;
-  }
-
   // It should not have been possible to define a temporary table with a
   // secondary engine.
   assert(table_list->table->s->tmp_table == NO_TMP_TABLE);
@@ -11142,22 +11221,13 @@
                                 &table_def))
     return true;
 
-  MDL_ticket *mdl_ticket = table_list->table->mdl_ticket;
-
-  auto downgrade_guard = create_scope_guard([mdl_ticket, thd] {
-    // Under LOCK TABLES, downgrade to MDL_SHARED_NO_READ_WRITE after all
-    // operations have completed.
-    if (secondary_engine_lock_tables_mode(*thd)) {
-      mdl_ticket->downgrade_lock(MDL_SHARED_NO_READ_WRITE);
-    }
-  });
-  if (thd->mdl_context.upgrade_shared_lock(mdl_ticket, MDL_EXCLUSIVE,
-                                           thd->variables.lock_wait_timeout))
-    return true;
-
   // Cleanup that must be done regardless of commit or rollback.
   auto cleanup = [thd, hton]() {
     hton->post_ddl(thd);
+
+    // reopen_tables() will only affect tables which have been closed by
+    // close_all_tables_for_name(), which means it will do reopen only while we
+    // hold X lock on table.
     return thd->locked_tables_mode &&
            thd->locked_tables_list.reopen_tables(thd);
   };
@@ -11170,16 +11240,31 @@
     cleanup();
   });
 
-  // Load if SECONDARY_LOAD, unload if SECONDARY_UNLOAD
-  const bool is_load = m_alter_info->flags & Alter_info::ALTER_SECONDARY_LOAD;
+  if (is_load) {
+    if (DBUG_EVALUATE_IF("sim_secload_fail",
+                         (my_error(ER_SECONDARY_ENGINE, MYF(0),
+                                   "Simulated failure of secondary_load()"),
+                          true),
+                         false) ||
+        secondary_engine_load_table(thd, *table_list->table))
+      return true;
+  } else {
+    if (DBUG_EVALUATE_IF("sim_secunload_fail",
+                         (my_error(ER_SECONDARY_ENGINE, MYF(0),
+                                   "Simulated failure of secondary_unload()"),
+                          true),
+                         false) ||
+        secondary_engine_unload_table(thd, table_list->db,
+                                      table_list->table_name, *table_def, true))
+      return true;
+  }
 
-  // Initiate loading into or unloading from secondary engine.
-  const bool error =
-      is_load
-          ? secondary_engine_load_table(thd, *table_list->table)
-          : secondary_engine_unload_table(
-                thd, table_list->db, table_list->table_name, *table_def, true);
-  if (error) return true;
+  // Need to upgrade to allow old table definition to be purged from TDC
+  // (this is no-op in case of SECONDARY_UNLOAD).
+  DEBUG_SYNC(thd, "secload_upgrade_mdl_x");
+  if (thd->mdl_context.upgrade_shared_lock(mdl_ticket, SECLOAD_TDC_EVICT_MDL,
+                                           thd->variables.lock_wait_timeout))
+    return true;
 
   // Close primary table.
   close_all_tables_for_name(thd, table_list->table->s, false, nullptr);
@@ -12261,6 +12346,7 @@
     case Alter_info::LEAVE_AS_IS:
       if (!indexes_were_disabled) break;
       /* fall-through: disabled indexes */
+      [[fallthrough]];
     case Alter_info::DISABLE:
       error = table->file->ha_disable_indexes(HA_KEY_SWITCH_NONUNIQ_SAVE);
   }
@@ -13009,7 +13095,7 @@
     case HA_ALTER_ERROR:
     case HA_ALTER_INPLACE_NOT_SUPPORTED:
       assert(0);
-      // fall through
+      [[fallthrough]];
     case HA_ALTER_INPLACE_NO_LOCK:
     case HA_ALTER_INPLACE_NO_LOCK_AFTER_PREPARE:
       switch (alter_info->requested_lock) {
@@ -13768,7 +13854,8 @@
         Create_field *find;
         while ((find = find_it++)) {
           if (my_strcasecmp(system_charset_info, sql_fk->key_part[j].str,
-                            find->field_name) == 0) {
+                            find->field_name) == 0 &&
+              find->field != nullptr) {
             break;
           }
         }
@@ -13785,9 +13872,11 @@
         assert(!find->is_virtual_gcol());
         if (is_self_referencing) {
           find_it.rewind();
+
           while ((find = find_it++)) {
             if (my_strcasecmp(system_charset_info, sql_fk->fk_key_part[j].str,
-                              find->field_name) == 0) {
+                              find->field_name) == 0 &&
+                find->field != nullptr) {
               break;
             }
           }
@@ -14672,7 +14761,7 @@
             */
             break;
           }
-          // Fall-through.
+          [[fallthrough]];
         case Alter_drop::KEY:
         case Alter_drop::COLUMN:
           my_error(ER_CANT_DROP_FIELD_OR_KEY, MYF(0), drop->name);
@@ -15677,7 +15766,7 @@
                 new_create_field->after = nullptr;
                 new_create_field->field_name =
                     make_functional_index_column_name(
-                        alter_rename_key->new_name, static_cast<int>(k),
+                        alter_rename_key->new_name, k, alter_info->create_list,
                         thd->mem_root);
 
                 alter_info->create_list.push_back(new_create_field);
@@ -17871,8 +17960,8 @@
 }
 
 static int copy_data_between_tables(
-    THD *thd, PSI_stage_progress *psi MY_ATTRIBUTE((unused)), TABLE *from,
-    TABLE *to, List<Create_field> &create, ha_rows *copied, ha_rows *deleted,
+    THD *thd, PSI_stage_progress *psi [[maybe_unused]], TABLE *from, TABLE *to,
+    List<Create_field> &create, ha_rows *copied, ha_rows *deleted,
     Alter_info::enum_enable_or_disable keys_onoff, Alter_table_ctx *alter_ctx) {
   DBUG_TRACE;
 
@@ -17889,9 +17978,6 @@
   Query_expression *const unit = thd->lex->unit;
   Query_block *const select = unit->first_query_block();
 
-  QEP_TAB_standalone qep_tab_st;
-  QEP_TAB &qep_tab = qep_tab_st.as_QEP_TAB();
-
   /*
     If target storage engine supports atomic DDL we should not commit
     and disable transaction to let SE do proper cleanup on error/crash.
@@ -17994,8 +18080,9 @@
 
   unique_ptr_destroy_only<Filesort> fsort;
   unique_ptr_destroy_only<RowIterator> iterator;
-  AccessPath *path = create_table_access_path(thd, from, nullptr,
-                                              /*count_examined_rows=*/false);
+  AccessPath *path =
+      create_table_access_path(thd, from, nullptr, nullptr, nullptr,
+                               /*count_examined_rows=*/false);
 
   if (order != nullptr && to->s->primary_key != MAX_KEY &&
       to->file->primary_key_is_clustered()) {
@@ -18007,7 +18094,6 @@
     push_warning(thd, Sql_condition::SL_WARNING, ER_UNKNOWN_ERROR, warn_buff);
     order = nullptr;
   }
-  qep_tab.set_table(from);
   /* Tell handler that we have values for all columns in the to table */
   to->use_all_columns();
   if (order != nullptr) {
@@ -18028,8 +18114,8 @@
     }
     fsort.reset(new (thd->mem_root) Filesort(
         thd, {from}, /*keep_buffers=*/false, order, HA_POS_ERROR,
-        /*force_stable_sort=*/false, /*remove_duplicates=*/false,
-        /*force_sort_positions=*/true, /*unwrap_rollup=*/false));
+        /*remove_duplicates=*/false, /*force_sort_positions=*/true,
+        /*unwrap_rollup=*/false));
     path = NewSortAccessPath(thd, path, fsort.get(),
                              /*count_examined_rows=*/false);
   }
diff -Nru mysql-8.0-8.0.26/sql/sql_table.h mysql-8.0-8.0.27/sql/sql_table.h
--- mysql-8.0-8.0.26/sql/sql_table.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_table.h	2021-09-28 11:46:34.000000000 +0000
@@ -27,10 +27,10 @@
 #include <sys/types.h>
 #include <map>
 #include <set>
+#include <string>
 #include <utility>
 #include <vector>
 
-#include "my_compiler.h"
 #include "my_inttypes.h"
 #include "my_sharedlib.h"
 #include "mysql/components/services/mysql_mutex_bits.h"
@@ -45,6 +45,7 @@
 class THD;
 class handler;
 struct CHARSET_INFO;
+struct MEM_ROOT;
 struct TABLE;
 struct TABLE_LIST;
 struct handlerton;
@@ -84,6 +85,23 @@
 /** Don't change generated check constraint names while renaming table. */
 static const uint NO_CC_RENAME = 1 << 5;
 
+// MDL lock types used for ALTER TABLE SECONDARY_LOAD.
+
+/** The MDL type used when initially opening a table for SECONDARY_LOAD */
+constexpr enum_mdl_type SECLOAD_SCAN_START_MDL = MDL_SHARED_NO_WRITE;
+
+/**
+  The weaker MDL which the secondary engine plugin may downgrade to after
+  a parallel scan has been started
+*/
+constexpr enum_mdl_type SECLOAD_PAR_SCAN_MDL = MDL_SHARED_UPGRADABLE;
+
+/**
+  The MDL which must be acquired before the old table definition
+  can be evicted from the table definition cache.
+*/
+constexpr enum_mdl_type SECLOAD_TDC_EVICT_MDL = MDL_EXCLUSIVE;
+
 handlerton *get_viable_handlerton_for_create(THD *thd, const char *table_name,
                                              const HA_CREATE_INFO &ci);
 
@@ -171,11 +189,11 @@
 
   @retval operation outcome, false if no error.
 */
-bool adjust_fk_children_after_parent_def_change(
+[[nodiscard]] bool adjust_fk_children_after_parent_def_change(
     THD *thd, bool check_charsets, const char *parent_table_db,
     const char *parent_table_name, handlerton *hton,
     const dd::Table *parent_table_def, Alter_info *parent_alter_info,
-    bool invalidate_tdc) MY_ATTRIBUTE((warn_unused_result));
+    bool invalidate_tdc);
 
 /**
   Check if new definition of parent table is compatible with foreign keys
@@ -205,10 +223,10 @@
 
   @retval operation outcome, false if no error.
 */
-bool collect_fk_children(THD *thd, const char *schema, const char *table_name,
-                         handlerton *hton, enum_mdl_type lock_type,
-                         MDL_request_list *mdl_requests)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool collect_fk_children(THD *thd, const char *schema,
+                                       const char *table_name, handlerton *hton,
+                                       enum_mdl_type lock_type,
+                                       MDL_request_list *mdl_requests);
 
 /**
   Add MDL requests for lock of specified type on tables referenced by the
@@ -229,12 +247,11 @@
 
   @retval operation outcome, false if no error.
 */
-bool collect_fk_parents_for_new_fks(
+[[nodiscard]] bool collect_fk_parents_for_new_fks(
     THD *thd, const char *db_name, const char *table_name,
     const Alter_info *alter_info, enum_mdl_type lock_type, handlerton *hton,
     MDL_request_list *mdl_requests,
-    Foreign_key_parents_invalidator *fk_invalidator)
-    MY_ATTRIBUTE((warn_unused_result));
+    Foreign_key_parents_invalidator *fk_invalidator);
 
 /**
   Add MDL requests for exclusive metadata locks on names of foreign keys
@@ -281,11 +298,10 @@
 
   @retval operation outcome, false if no error.
 */
-bool collect_and_lock_fk_tables_for_rename_table(
+[[nodiscard]] bool collect_and_lock_fk_tables_for_rename_table(
     THD *thd, const char *db, const char *table_name,
     const dd::Table *table_def, const char *new_db, const char *new_table_name,
-    handlerton *hton, Foreign_key_parents_invalidator *fk_invalidator)
-    MY_ATTRIBUTE((warn_unused_result));
+    handlerton *hton, Foreign_key_parents_invalidator *fk_invalidator);
 
 /**
   Update referenced table names and the unique constraint name for FKs
@@ -300,10 +316,11 @@
 
   @retval operation outcome, false if no error.
 */
-bool adjust_fks_for_rename_table(THD *thd, const char *db,
-                                 const char *table_name, const char *new_db,
-                                 const char *new_table_name, handlerton *hton)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool adjust_fks_for_rename_table(THD *thd, const char *db,
+                                               const char *table_name,
+                                               const char *new_db,
+                                               const char *new_table_name,
+                                               handlerton *hton);
 
 /*
   Check if parent key for the foreign key exists, set foreign key's unique
@@ -332,11 +349,12 @@
 
   @retval Operation result. False if success.
 */
-bool prepare_fk_parent_key(handlerton *hton, const dd::Table *parent_table_def,
-                           const dd::Table *old_parent_table_def,
-                           const dd::Table *old_child_table_def,
-                           bool is_self_referencing_fk, dd::Foreign_key *fk)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool prepare_fk_parent_key(handlerton *hton,
+                                         const dd::Table *parent_table_def,
+                                         const dd::Table *old_parent_table_def,
+                                         const dd::Table *old_child_table_def,
+                                         bool is_self_referencing_fk,
+                                         dd::Foreign_key *fk);
 
 /**
   Prepare Create_field and Key_spec objects for ALTER and upgrade.
@@ -410,8 +428,8 @@
   @retval False - Success.
   @retval True  - Failure.
 */
-bool rm_table_do_discovery_and_lock_fk_tables(THD *thd, TABLE_LIST *tables)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool rm_table_do_discovery_and_lock_fk_tables(THD *thd,
+                                                            TABLE_LIST *tables);
 
 bool quick_rm_table(THD *thd, handlerton *base, const char *db,
                     const char *table_name, uint flags);
diff -Nru mysql-8.0-8.0.26/sql/sql_tablespace.h mysql-8.0-8.0.27/sql/sql_tablespace.h
--- mysql-8.0-8.0.26/sql/sql_tablespace.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_tablespace.h	2021-09-28 11:46:34.000000000 +0000
@@ -25,10 +25,11 @@
 
 #include <sys/types.h>
 
+#include <optional>
+
 #include "lex_string.h"
 #include "my_inttypes.h"
 #include "my_sqlcommand.h"
-#include "nullable.h"     // Nullable
 #include "sql/handler.h"  // ts_command_type
 #include "sql/sql_cmd.h"  // Sql_cmd
 
@@ -43,7 +44,7 @@
   ulonglong undo_buffer_size = 8 * 1024 * 1024;  // Default 8 MByte
   ulonglong redo_buffer_size = 8 * 1024 * 1024;  // Default 8 MByte
   ulonglong initial_size = 128 * 1024 * 1024;    // Default 128 MByte
-  Mysql::Nullable<ulonglong> autoextend_size;    // No autoextension as default
+  std::optional<ulonglong> autoextend_size;      // No autoextension as default
   ulonglong max_size = 0;         // Max size == initial size => no extension
   ulonglong file_block_size = 0;  // 0=default or must be a valid Page Size
   uint nodegroup_id = UNDEF_NODEGROUP;
diff -Nru mysql-8.0-8.0.26/sql/sql_test.cc mysql-8.0-8.0.27/sql/sql_test.cc
--- mysql-8.0-8.0.26/sql/sql_test.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_test.cc	2021-09-28 11:46:34.000000000 +0000
@@ -52,10 +52,10 @@
 #include "sql/mysqld.h"              // LOCK_status
 #include "sql/mysqld_thd_manager.h"  // Global_THD_manager
 #include "sql/opt_explain.h"         // join_type_str
-#include "sql/opt_range.h"           // QUICK_SELECT_I
 #include "sql/opt_trace.h"
 #include "sql/opt_trace_context.h"
 #include "sql/psi_memory_key.h"
+#include "sql/range_optimizer/range_optimizer.h"  // QUICK_SELECT_I
 #include "sql/sql_bitmap.h"
 #include "sql/sql_class.h"
 #include "sql/sql_const.h"
diff -Nru mysql-8.0-8.0.26/sql/sql_thd_api.cc mysql-8.0-8.0.27/sql/sql_thd_api.cc
--- mysql-8.0-8.0.26/sql/sql_thd_api.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_thd_api.cc	2021-09-28 11:46:34.000000000 +0000
@@ -153,7 +153,7 @@
   @param thd              THD object
 */
 
-void thd_clear_errors(THD *thd MY_ATTRIBUTE((unused))) { set_my_errno(0); }
+void thd_clear_errors(THD *thd [[maybe_unused]]) { set_my_errno(0); }
 
 /**
   Close the socket used by this connection
diff -Nru mysql-8.0-8.0.26/sql/sql_thd_internal_api.cc mysql-8.0-8.0.27/sql/sql_thd_internal_api.cc
--- mysql-8.0-8.0.26/sql/sql_thd_internal_api.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_thd_internal_api.cc	2021-09-28 11:46:34.000000000 +0000
@@ -64,8 +64,54 @@
 struct mysql_cond_t;
 struct mysql_mutex_t;
 
-void thd_init(THD *thd, char *stack_start, bool bound MY_ATTRIBUTE((unused)),
-              PSI_thread_key psi_key MY_ATTRIBUTE((unused))) {
+THD *create_internal_thd() {
+  /* For internal threads, use enabled_plugins = false. */
+  THD *thd = new THD(false);
+  thd->system_thread = SYSTEM_THREAD_BACKGROUND;
+  // Skip grants and set the system_user flag in THD.
+  thd->security_context()->skip_grants();
+  thd->thread_stack = reinterpret_cast<char *>(&thd);
+  thd->store_globals();
+
+#ifdef HAVE_PSI_THREAD_INTERFACE
+  PSI_thread *psi;
+  psi = PSI_THREAD_CALL(get_thread)();
+  if (psi != nullptr) {
+    /*
+      Associate this THD to the background thread instrumentation,
+      so that system variables and status variables
+      are visible for the background thread.
+    */
+    PSI_THREAD_CALL(set_thread_THD)(psi, thd);
+    thd->set_psi(psi);
+  }
+#endif /* HAVE_PSI_THREAD_INTERFACE */
+
+  return thd;
+}
+
+void destroy_internal_thd(THD *thd) {
+  assert(thd->system_thread == SYSTEM_THREAD_BACKGROUND);
+
+#ifdef HAVE_PSI_THREAD_INTERFACE
+  PSI_thread *psi;
+  psi = PSI_THREAD_CALL(get_thread)();
+  if (psi != nullptr) {
+    /*
+      Dissociate this THD from the background thread instrumentation.
+    */
+    PSI_THREAD_CALL(set_thread_THD)(psi, nullptr);
+    thd->set_psi(nullptr);
+  }
+#endif /* HAVE_PSI_THREAD_INTERFACE */
+
+  thd->release_resources();
+  delete thd;
+}
+
+void thd_init(THD *thd, char *stack_start, bool bound [[maybe_unused]],
+              PSI_thread_key psi_key [[maybe_unused]],
+              unsigned int psi_seqnum [[maybe_unused]]) {
   DBUG_TRACE;
   // TODO: Purge threads currently terminate too late for them to be added.
   // Note that P_S interprets all threads with thread_id != 0 as
@@ -78,7 +124,7 @@
   }
 #ifdef HAVE_PSI_THREAD_INTERFACE
   PSI_thread *psi;
-  psi = PSI_THREAD_CALL(new_thread)(psi_key, thd, thd->thread_id());
+  psi = PSI_THREAD_CALL(new_thread)(psi_key, psi_seqnum, thd, thd->thread_id());
   if (bound) {
     PSI_THREAD_CALL(set_thread_os_id)(psi);
   }
@@ -98,14 +144,15 @@
 }
 
 THD *create_thd(bool enable_plugins, bool background_thread, bool bound,
-                PSI_thread_key psi_key) {
+                PSI_thread_key psi_key, unsigned int psi_seqnum) {
   THD *thd = new THD(enable_plugins);
   if (background_thread) {
     thd->system_thread = SYSTEM_THREAD_BACKGROUND;
     // Skip grants and set the system_user flag in THD.
     thd->security_context()->skip_grants();
   }
-  (void)thd_init(thd, reinterpret_cast<char *>(&thd), bound, psi_key);
+  (void)thd_init(thd, reinterpret_cast<char *>(&thd), bound, psi_key,
+                 psi_seqnum);
   return thd;
 }
 
diff -Nru mysql-8.0-8.0.26/sql/sql_thd_internal_api.h mysql-8.0-8.0.27/sql/sql_thd_internal_api.h
--- mysql-8.0-8.0.26/sql/sql_thd_internal_api.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_thd_internal_api.h	2021-09-28 11:46:34.000000000 +0000
@@ -41,15 +41,20 @@
 class THD;
 class partition_info;
 
+THD *create_internal_thd();
+void destroy_internal_thd(THD *thd);
+
 /**
   Set up various THD data for a new connection
 
-  @param              thd            THD object
-  @param              stack_start    Start of stack for connection
-  @param              bound          True if bound to a physical thread.
-  @param              psi_key        Instrumentation key for the thread.
+  @param thd            THD object
+  @param stack_start    Start of stack for connection
+  @param bound          True if bound to a physical thread.
+  @param psi_key        Instrumentation key for the thread.
+  @param psi_seqnum     Instrumentation sequence number for the thread.
 */
-void thd_init(THD *thd, char *stack_start, bool bound, PSI_thread_key psi_key);
+void thd_init(THD *thd, char *stack_start, bool bound, PSI_thread_key psi_key,
+              unsigned int psi_seqnum);
 
 /**
   Create a THD and do proper initialization of it.
@@ -58,6 +63,7 @@
   @param background_thread  Is this a background thread?
   @param bound              True if bound to a physical thread.
   @param psi_key            Instrumentation key for the thread.
+  @param psi_seqnum         Instrumentation sequence number for the thread.
 
   @note Dynamic plugin support is only possible for THDs that
         are created after the server has initialized properly.
@@ -67,7 +73,7 @@
         terminate during shutdown.
 */
 THD *create_thd(bool enable_plugins, bool background_thread, bool bound,
-                PSI_thread_key psi_key);
+                PSI_thread_key psi_key, unsigned int psi_seqnum);
 
 /**
   Cleanup the THD object, remove it from the global list of THDs
diff -Nru mysql-8.0-8.0.26/sql/sql_time.cc mysql-8.0-8.0.27/sql/sql_time.cc
--- mysql-8.0-8.0.26/sql/sql_time.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_time.cc	2021-09-28 11:46:34.000000000 +0000
@@ -599,7 +599,7 @@
   @param[out] str      String to convert to
   @param      dec      Number of fractional digits.
 */
-void make_time(const Date_time_format *format MY_ATTRIBUTE((unused)),
+void make_time(const Date_time_format *format [[maybe_unused]],
                const MYSQL_TIME *l_time, String *str, uint dec) {
   uint length = static_cast<uint>(my_time_to_str(*l_time, str->ptr(), dec));
   str->length(length);
@@ -612,7 +612,7 @@
   @param      l_time   DATE value
   @param[out] str      String to convert to
 */
-void make_date(const Date_time_format *format MY_ATTRIBUTE((unused)),
+void make_date(const Date_time_format *format [[maybe_unused]],
                const MYSQL_TIME *l_time, String *str) {
   uint length = static_cast<uint>(my_date_to_str(*l_time, str->ptr()));
   str->length(length);
@@ -626,7 +626,7 @@
   @param[out] str      String to convert to
   @param      dec      Number of fractional digits.
 */
-void make_datetime(const Date_time_format *format MY_ATTRIBUTE((unused)),
+void make_datetime(const Date_time_format *format [[maybe_unused]],
                    const MYSQL_TIME *l_time, String *str, uint dec) {
   uint length = static_cast<uint>(my_datetime_to_str(*l_time, str->ptr(), dec));
   str->length(length);
diff -Nru mysql-8.0-8.0.26/sql/sql_timer.cc mysql-8.0-8.0.27/sql/sql_timer.cc
--- mysql-8.0-8.0.26/sql/sql_timer.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_timer.cc	2021-09-28 11:46:34.000000000 +0000
@@ -99,7 +99,8 @@
 
 static bool timer_notify(THD_timer_info *thd_timer) {
   Find_thd_with_id find_thd_with_id(thd_timer->thread_id);
-  THD *thd = Global_THD_manager::get_instance()->find_thd(&find_thd_with_id);
+  THD_ptr thd_ptr =
+      Global_THD_manager::get_instance()->find_thd(&find_thd_with_id);
 
   assert(!thd_timer->destroy || !thd_timer->thread_id);
   /*
@@ -107,12 +108,11 @@
     was being delivered. If this is the case, the timer object
     was detached (orphaned) and has no associated session (thd).
   */
-  if (thd) {
+  if (thd_ptr) {
     /* process only if thread is not already undergoing any kill connection. */
-    if (thd->killed != THD::KILL_CONNECTION) {
-      thd->awake(THD::KILL_TIMEOUT);
+    if (thd_ptr->killed != THD::KILL_CONNECTION) {
+      thd_ptr->awake(THD::KILL_TIMEOUT);
     }
-    mysql_mutex_unlock(&thd->LOCK_thd_data);
   }
 
   /* Mark the object as unreachable. */
diff -Nru mysql-8.0-8.0.26/sql/sql_tmp_table.cc mysql-8.0-8.0.27/sql/sql_tmp_table.cc
--- mysql-8.0-8.0.26/sql/sql_tmp_table.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_tmp_table.cc	2021-09-28 11:46:34.000000000 +0000
@@ -64,13 +64,13 @@
 #include "sql/mem_root_allocator.h"
 #include "sql/mem_root_array.h"     // Mem_root_array
 #include "sql/mysqld.h"             // heap_hton
-#include "sql/opt_range.h"          // QUICK_SELECT_I
 #include "sql/opt_trace.h"          // Opt_trace_object
 #include "sql/opt_trace_context.h"  // Opt_trace_context
 #include "sql/psi_memory_key.h"
 #include "sql/query_options.h"
-#include "sql/sql_base.h"   // free_io_cache
-#include "sql/sql_class.h"  // THD
+#include "sql/range_optimizer/range_optimizer.h"  // QUICK_SELECT_I
+#include "sql/sql_base.h"                         // free_io_cache
+#include "sql/sql_class.h"                        // THD
 #include "sql/sql_const.h"
 #include "sql/sql_executor.h"  // SJ_TMP_TABLE
 #include "sql/sql_lex.h"
@@ -343,13 +343,6 @@
   @param make_copy_field if true, a pointer of the result field should be stored
   in from_field,  otherwise the item should be wrapped in Func_ptr and stored in
   copy_func
-  @param copy_result_field true <=> save item's result_field in the from_field
-                       arg, before changing it. This is used for a window's
-                       OUT table when window uses frame buffer to copy a
-                       function's result field from OUT table to frame buffer
-                       (and back). @note that the goals of 'from_field' when
-                       this argument is true and when it is false, are
-                       different.
 
   @retval NULL On error.
 
@@ -359,8 +352,8 @@
 Field *create_tmp_field(THD *thd, TABLE *table, Item *item, Item::Type type,
                         Func_ptr_array *copy_func, Field **from_field,
                         Field **default_field, bool group, bool modify_item,
-                        bool table_cant_handle_bit_fields, bool make_copy_field,
-                        bool copy_result_field) {
+                        bool table_cant_handle_bit_fields,
+                        bool make_copy_field) {
   DBUG_TRACE;
   Field *result = nullptr;
   Item::Type orig_type = type;
@@ -435,7 +428,7 @@
       *from_field = item_field->field;
       break;
     }
-    /* Fall through */
+      [[fallthrough]];
     case Item::FUNC_ITEM:
       if (down_cast<Item_func *>(item)->functype() == Item_func::FUNC_SP) {
         Item_func_sp *item_func_sp = down_cast<Item_func_sp *>(item);
@@ -457,7 +450,7 @@
         break;
       }
 
-      /* Fall through */
+      [[fallthrough]];
     case Item::COND_ITEM:
     case Item::FIELD_AVG_ITEM:
     case Item::FIELD_BIT_ITEM:
@@ -480,24 +473,7 @@
         result = item_sum->create_tmp_field(group, table);
         if (!result) my_error(ER_OUT_OF_RESOURCES, MYF(ME_FATALERROR));
       } else {
-        /*
-          (2) we're windowing. The Item doesn't contain any not-yet-calculated
-          window function (per logic in our caller create_tmp_table()). So it
-          is an ordinary function or can be considered as such. We're creating
-          the OUT table using IN table as source, and we have previously
-          created a frame buffer (FB) using IN table as source. That previous
-          creation has set IN's item's result_field to be the FB field. Here
-          we save that FB field in from_field. Right after that,
-          create_tmp_field_from_item() sets IN's item's result_field to the
-          OUT field (which OUT field is the 'result' variable). Later, we create
-          a Copy_field to from_field (FB) from the marked field (OUT). The end
-          situation is: IN's item's result_field is in OUT, enabling the
-          initial function evaluation and saving of its result in OUT; the
-          Copy_field from OUT to FB and back will allow buffering/restoration
-          of that result.
-        */
-        if (make_copy_field || (copy_result_field && !is_wf))  // (2)
-        {
+        if (make_copy_field) {
           *from_field = item->get_tmp_table_field();
           assert(*from_field);
         }
@@ -999,6 +975,15 @@
   long hidden_field_count = param->hidden_field_count;
   const bool not_all_columns = !(select_options & TMP_TABLE_ALL_COLUMNS);
 
+  // Don't call set_result_field() on each item if:
+  //  - we materialize all columns, with no filtering of aggregate functions
+  //    or the likes (TODO: needs documentation with rationale, but probably
+  //    indicates that we are doing derived table materialization, which doesn't
+  //    use result fields), or
+  //  - We are creating a window function's framebuffer table, where the result
+  //    field is already set to the output field and must not be overwritten.
+  const bool modify_items = not_all_columns && !param->m_window_frame_buffer;
+
   /*
     total_uneven_bit_length is uneven bit length for visible fields
     hidden_uneven_bit_length is uneven bit length for hidden fields
@@ -1011,6 +996,11 @@
     const bool is_sum_func =
         type == Item::SUM_FUNC_ITEM && !item->m_is_window_function;
 
+    if (param->m_window_frame_buffer) {
+      // These should have been filtered out in the caller.
+      assert(!item->m_is_window_function);
+    }
+
     bool store_column = true;
     if (not_all_columns) {
       if (item->has_aggregation() && type != Item::SUM_FUNC_ITEM) {
@@ -1026,15 +1016,8 @@
           store_column = false;
         }
       } else if (item->m_is_window_function) {
-        if (!param->m_window || param->m_window_frame_buffer) {
-          /*
-            A pre-windowing table; no point in storing WF.
-            Or a window's frame buffer:
-            - the window's WFs cannot be calculated yet
-            - same for later windows' WFs
-            - previous windows' WFs are already replaced with Item_field (so
-            don't come here).
-          */
+        if (!param->m_window) {
+          // A pre-windowing table; no point in storing WF.
           store_column = false;
         } else if (param->m_window != down_cast<Item_sum *>(item)->window()) {
           // A later window's WF: no point in storing it in this table.
@@ -1063,7 +1046,7 @@
           Field *new_field = create_tmp_field(
               thd, table, arg, arg->type(), param->items_to_copy,
               &from_field[fieldnr], &default_field[fieldnr], /*group=*/false,
-              not_all_columns, false, false, false);
+              modify_items, false, false);
           from_item[fieldnr] = arg;
           if (new_field == nullptr) return nullptr;  // Should be OOM
           new_field->set_field_index(fieldnr);
@@ -1117,20 +1100,15 @@
           tables can't index BIT fields directly. We do the same
           for distinct, as we want the distinct index to be
           usable in this case too.
-          (3) This is the OUT table of windowing, there is a frame buffer, and
-          the item is an expression which can store its value in a result_field
-          (e.g. it is Item_func). In that case we pass copy_result_field=true.
         */
         new_field = create_tmp_field(
             thd, table, item, type, param->items_to_copy, &from_field[fieldnr],
             &default_field[fieldnr],
             group != nullptr,  // (1)
-            !param->force_copy_fields && (not_all_columns || group != nullptr),
+            !param->force_copy_fields && (modify_items || group != nullptr),
             item->marker == Item::MARKER_BIT ||
                 param->bit_fields_as_long,  //(2)
-            param->force_copy_fields,
-            (param->m_window &&  // (3)
-             param->m_window->frame_buffer_param() && item->is_result_field()));
+            param->force_copy_fields);
         from_item[fieldnr] = item;
       }
 
@@ -1144,7 +1122,7 @@
         But only for the group-by table. So do not set result_field if this is
         a tmp table for UNION or derived table materialization.
       */
-      if (not_all_columns && type == Item::SUM_FUNC_ITEM)
+      if (modify_items && type == Item::SUM_FUNC_ITEM)
         down_cast<Item_sum *>(item)->set_result_field(new_field);
       share->reclength += new_field->pack_length();
       if (!new_field->is_flag_set(NOT_NULL_FLAG)) null_count++;
@@ -1243,8 +1221,15 @@
       assert(field->table == table);
       cur_group->field_in_tmp_table = field;
 
-      if ((*cur_group->item)->max_char_length() > CONVERT_IF_BIGGER_TO_BLOB)
+      /*
+        Use hash key as the unique constraint if the group-by key is
+        big or if it is non-deterministic. Group-by items get evaluated
+        twice and a non-deterministic function would cause a discrepancy.
+      */
+      if ((*cur_group->item)->max_char_length() > CONVERT_IF_BIGGER_TO_BLOB ||
+          (*cur_group->item)->is_non_deterministic()) {
         unique_constraint_via_hash_field = true;
+      }
     }
     if (param->group_parts > max_key_parts ||
         param->group_length > max_key_length ||
@@ -1485,20 +1470,13 @@
     }
 
     if (from_field[i]) {
-      Item *item = from_item[i];
       /* This column is directly mapped to a column in the GROUP BY clause. */
-      if (param->m_window && param->m_window->frame_buffer_param() &&
-          item->is_result_field() &&
-          (item->type() != Item::SUM_FUNC_ITEM ||
-           !item->real_item()->m_is_window_function)) {
-        // A non-window-function. Grep for (2) in this file.
-        Temp_table_param *window_fb = param->m_window->frame_buffer_param();
-        window_fb->copy_fields.emplace_back(from_field[i], field);
+      if (param->m_window_frame_buffer) {
+        // Framebuffer copying uses copy_fields instead of items_to_copy,
+        // as it can copy fields in reverse (ie., back again from the
+        // framebuffer) when needed.
+        param->copy_fields.emplace_back(field, from_field[i]);
       } else {
-        if (param->m_window) {
-          param->copy_fields.emplace_back(field, from_field[i]);
-        }
-
         param->items_to_copy->push_back(Func_ptr{from_item[i], field});
       }
     }
@@ -2447,6 +2425,11 @@
          share->ref_count() > 0 && share->tmp_open_count == 0 &&
          share->tmp_handler_count < share->ref_count());
 
+  if (table->pos_in_table_list != nullptr &&
+      table->pos_in_table_list->common_table_expr() != nullptr) {
+    table->pos_in_table_list->common_table_expr()->remove_table(
+        table->pos_in_table_list);
+  }
   /*
     In create_tmp_table(), the share's memroot is allocated inside own_root
     and is then made a copy of own_root, so it is inside its memory blocks,
@@ -2457,7 +2440,7 @@
   {
     MEM_ROOT own_root = std::move(share->mem_root);
     destroy(table);
-    free_root(&own_root, MYF(0));
+    own_root.Clear();
   }
 }
 
@@ -2465,14 +2448,20 @@
   If a MEMORY table gets full, create a disk-based table and copy all rows
   to this.
 
-  @param thd             THD reference
-  @param wtable          Table reference being written to
-  @param error           Reason why inserting into MEMORY table failed.
-  @param ignore_last_dup If true, ignore duplicate key error for last
-                         inserted key (see detailed description below).
-  @param [out] is_duplicate if non-NULL and ignore_last_dup is true,
-                         return true if last key was a duplicate,
-                         and false otherwise.
+  @param[in] thd                THD reference
+  @param[in] wtable             Table reference being written to
+  @param[in] error              Reason why inserting into MEMORY table failed.
+  @param[in] insert_last_record If true, the last record(table->record[0])
+                                is inserted into the newly created table after
+                                copying all the records from the temp table.
+                                If false, the last record is not inserted
+                                and the paramters ignore_last_dup, is_duplicate
+                                are ignored.
+  @param[in] ignore_last_dup    If true, ignore duplicate key error for last
+                                inserted key (see detailed description below).
+  @param [out] is_duplicate     If non-NULL and ignore_last_dup is true,
+                                return true if last key was a duplicate,
+                                and false otherwise.
 
   @details
     Function can be called with any error code, but only HA_ERR_RECORD_FILE_FULL
@@ -2482,13 +2471,18 @@
     switches to use the new table within the table handle.
     The function uses table->record[1] as a temporary buffer while copying.
 
-    The function assumes that table->record[0] contains the row that caused
-    the error when inserting into the MEMORY table (the "last row").
-    After all existing rows have been copied to the new table, the last row
-    is attempted to be inserted as well. If ignore_last_dup is true,
-    this row can be a duplicate of an existing row without throwing an error.
-    If is_duplicate is non-NULL, an indication of whether the last row was
-    a duplicate is returned.
+    If the parameter insert_last_record is true, this function assumes that
+    table->record[0] contains the row that caused the error when inserting
+    into the MEMORY table (the "last row"). After all existing rows have been
+    copied to the new table,the last row is attempted to be inserted as well.
+    If ignore_last_dup is true, this row can be a duplicate of an existing row
+    without throwing an error. If is_duplicate is non-NULL, an indication of
+    whether the last row was a duplicate is returned.
+
+    If the parameter insert_last_record is false, this function makes no
+    assumptions on the operation and will not try an insert of the last
+    record(table->record[0]). The caller is expected to handle the operation
+    after moving to disk.
 
   @note that any index/scan access initialized on the MEMORY 'wtable' is not
   replicated to the on-disk table - it's the caller's responsibility.
@@ -2519,7 +2513,8 @@
 */
 
 bool create_ondisk_from_heap(THD *thd, TABLE *wtable, int error,
-                             bool ignore_last_dup, bool *is_duplicate) {
+                             bool insert_last_record, bool ignore_last_dup,
+                             bool *is_duplicate) {
   int write_err = 0;
   bool table_on_disk = false;
   DBUG_TRACE;
@@ -2688,16 +2683,17 @@
           DBUG_EXECUTE_IF("raise_error", write_err = HA_ERR_FOUND_DUPP_KEY;);
           if (write_err) goto err_after_open;
         }
-        /* copy row that filled HEAP table */
-        if ((write_err = new_table.file->ha_write_row(table->record[0]))) {
-          if (!new_table.file->is_ignorable_error(write_err) ||
-              !ignore_last_dup)
-            goto err_after_open;
-          if (is_duplicate) *is_duplicate = true;
-        } else {
-          if (is_duplicate) *is_duplicate = false;
+        if (insert_last_record) {
+          /* copy row that filled in-memory table */
+          if ((write_err = new_table.file->ha_write_row(table->record[0]))) {
+            if (!new_table.file->is_ignorable_error(write_err) ||
+                !ignore_last_dup)
+              goto err_after_open;
+            if (is_duplicate) *is_duplicate = true;
+          } else {
+            if (is_duplicate) *is_duplicate = false;
+          }
         }
-
         (void)table->file->ha_rnd_end();
 #ifndef NDEBUG
         rows_on_disk = true;
@@ -2845,8 +2841,7 @@
   @param length       how many available bytes in rowid_bytes
   @param row_num      PK to encode
 */
-void encode_innodb_position(uchar *rowid_bytes,
-                            uint length MY_ATTRIBUTE((unused)),
+void encode_innodb_position(uchar *rowid_bytes, uint length [[maybe_unused]],
                             ha_rows row_num) {
   assert(length == 6);
   for (int i = 0; i < 6; i++)
diff -Nru mysql-8.0-8.0.26/sql/sql_tmp_table.h mysql-8.0-8.0.27/sql/sql_tmp_table.h
--- mysql-8.0-8.0.26/sql/sql_tmp_table.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_tmp_table.h	2021-09-28 11:46:34.000000000 +0000
@@ -62,7 +62,8 @@
                                     ulonglong select_options = 0,
                                     const char *alias = nullptr);
 bool create_ondisk_from_heap(THD *thd, TABLE *table, int error,
-                             bool ignore_last_dup, bool *is_duplicate);
+                             bool insert_last_record, bool ignore_last_dup,
+                             bool *is_duplicate);
 void close_tmp_table(TABLE *table);
 void free_tmp_table(TABLE *table);
 TABLE *create_duplicate_weedout_tmp_table(THD *thd, uint uniq_tuple_length_arg,
@@ -74,8 +75,8 @@
 Field *create_tmp_field(THD *thd, TABLE *table, Item *item, Item::Type type,
                         Func_ptr_array *copy_func, Field **from_field,
                         Field **default_field, bool group, bool modify_item,
-                        bool table_cant_handle_bit_fields, bool make_copy_field,
-                        bool copy_result_field = false);
+                        bool table_cant_handle_bit_fields,
+                        bool make_copy_field);
 Field *create_tmp_field_from_field(THD *thd, const Field *org_field,
                                    const char *name, TABLE *table,
                                    Item_field *item);
diff -Nru mysql-8.0-8.0.26/sql/sql_truncate.cc mysql-8.0-8.0.27/sql/sql_truncate.cc
--- mysql-8.0-8.0.26/sql/sql_truncate.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_truncate.cc	2021-09-28 11:46:34.000000000 +0000
@@ -580,11 +580,11 @@
       */
     case Truncate_result::OK:
       m_error = false;
-      // fallthrough
+      [[fallthrough]];
     case Truncate_result::FAILED_BUT_BINLOG:
       binlog_stmt = true;
       binlog_is_trans = table_ref->table->file->has_transactions();
-      // fallthrough
+      [[fallthrough]];
     case Truncate_result::FAILED_SKIP_BINLOG:
       /*
         Call to handler_truncate() might have updated table definition
diff -Nru mysql-8.0-8.0.26/sql/sql_udf.cc mysql-8.0-8.0.27/sql/sql_udf.cc
--- mysql-8.0-8.0.26/sql/sql_udf.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_udf.cc	2021-09-28 11:46:34.000000000 +0000
@@ -228,7 +228,7 @@
   THD *new_thd = new (std::nothrow) THD;
   if (new_thd == nullptr) {
     LogErr(ERROR_LEVEL, ER_UDF_CANT_ALLOC_FOR_STRUCTURES);
-    free_root(&mem, MYF(0));
+    mem.Clear();
     delete new_thd;
     return;
   }
@@ -248,9 +248,9 @@
   }
 
   table = tables.table;
-  iterator = init_table_iterator(new_thd, table, nullptr,
-                                 /*ignore_not_found_rows=*/false,
-                                 /*count_examined_rows=*/false);
+  iterator =
+      init_table_iterator(new_thd, table, /*ignore_not_found_rows=*/false,
+                          /*count_examined_rows=*/false);
   if (iterator == nullptr) goto end;
   while (!(error = iterator->Read())) {
     DBUG_PRINT("info", ("init udf record"));
@@ -375,7 +375,7 @@
     delete udf_hash;
     udf_hash = nullptr;
   }
-  free_root(&mem, MYF(0));
+  mem.Clear();
   initialized = false;
 
   mysql_rwlock_destroy(&THR_LOCK_udf);
diff -Nru mysql-8.0-8.0.26/sql/sql_udf.h mysql-8.0-8.0.27/sql/sql_udf.h
--- mysql-8.0-8.0.26/sql/sql_udf.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_udf.h	2021-09-28 11:46:34.000000000 +0000
@@ -90,6 +90,8 @@
   uchar is_null{0};
   /// True when handler has been initialized and use count incremented
   bool m_initialized{false};
+  /// True when init function has been called
+  bool m_init_func_called{false};
   Item **args;
   Udf_args_extension m_args_extension; /**< A struct that holds the extension
                                           arguments for each UDF argument */
diff -Nru mysql-8.0-8.0.26/sql/sql_union.cc mysql-8.0-8.0.27/sql/sql_union.cc
--- mysql-8.0-8.0.26/sql/sql_union.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_union.cc	2021-09-28 11:46:34.000000000 +0000
@@ -124,7 +124,8 @@
   // create_ondisk_from_heap will generate error if needed
   if (!table->file->is_ignorable_error(error)) {
     bool is_duplicate;
-    if (create_ondisk_from_heap(thd, table, error, true, &is_duplicate))
+    if (create_ondisk_from_heap(thd, table, error, /*insert_last_record=*/true,
+                                /*ignore_last_dup=*/true, &is_duplicate))
       return true; /* purecov: inspected */
     // Table's engine changed, index is not initialized anymore
     if (table->hash_field) table->file->ha_index_init(0, false);
@@ -656,10 +657,43 @@
   return false;
 }
 
+/// Finalizes the initialization of all the full-text functions used in the
+/// given query expression, and recursively in every query expression inner to
+/// the given one. We do this fairly late, since we need to know whether or not
+/// the full-text function is to be used for a full-text index scan, and whether
+/// or not that scan is sorted. When the iterators have been created, we know
+/// that the final decision has been made, so we do it right after the iterators
+/// have been created.
+static bool finalize_full_text_functions(THD *thd,
+                                         Query_expression *query_expression) {
+  assert(thd->lex->using_hypergraph_optimizer);
+  for (Query_expression *qe = query_expression; qe != nullptr;
+       qe = qe->next_query_expression()) {
+    for (Query_block *qb = qe->first_query_block(); qb != nullptr;
+         qb = qb->next_query_block()) {
+      if (qb->has_ft_funcs()) {
+        if (init_ftfuncs(thd, qb)) {
+          return true;
+        }
+      }
+      if (finalize_full_text_functions(thd,
+                                       qb->first_inner_query_expression())) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
 bool Query_expression::optimize(THD *thd, TABLE *materialize_destination,
-                                bool create_iterators) {
+                                bool create_iterators,
+                                bool finalize_access_paths) {
   DBUG_TRACE;
 
+  if (!finalize_access_paths) {
+    assert(!create_iterators);
+  }
+
   assert(is_prepared() && !is_optimized());
 
   Change_current_query_block save_query_block(thd);
@@ -669,13 +703,14 @@
 
   if (query_result() != nullptr) query_result()->estimated_rowcount = 0;
 
-  for (Query_block *sl = first_query_block(); sl; sl = sl->next_query_block()) {
-    thd->lex->set_current_query_block(sl);
+  for (Query_block *query_block = first_query_block(); query_block != nullptr;
+       query_block = query_block->next_query_block()) {
+    thd->lex->set_current_query_block(query_block);
 
     // LIMIT is required for optimization
-    if (set_limit(thd, sl)) return true; /* purecov: inspected */
+    if (set_limit(thd, query_block)) return true; /* purecov: inspected */
 
-    if (sl->optimize(thd)) return true;
+    if (query_block->optimize(thd, finalize_access_paths)) return true;
 
     /*
       Accumulate estimated number of rows.
@@ -684,11 +719,11 @@
       2. If GROUP BY clause is optimized away because it was a constant then
          query produces at most one row.
      */
-    estimated_rowcount +=
-        sl->is_implicitly_grouped() || sl->join->group_optimized_away
-            ? 1
-            : sl->join->best_rowcount;
-    estimated_cost += sl->join->best_read;
+    estimated_rowcount += query_block->is_implicitly_grouped() ||
+                                  query_block->join->group_optimized_away
+                              ? 1
+                              : query_block->join->best_rowcount;
+    estimated_cost += query_block->join->best_read;
 
     // TABLE_LIST::fetch_number_of_rows() expects to get the number of rows
     // from all earlier query blocks from the query result, so we need to update
@@ -741,7 +776,8 @@
            fake_query_block->where_cond() == nullptr &&
            fake_query_block->having_cond() == nullptr);
 
-    if (fake_query_block->optimize(thd)) return true;
+    if (fake_query_block->optimize(thd, /*finalize_access_paths=*/true))
+      return true;
   } else if (saved_fake_query_block != nullptr) {
     // When GetTableIterator() sets up direct materialization, it looks for
     // the value of global_parameters()'s LIMIT in unit->select_limit_cnt;
@@ -808,6 +844,16 @@
     }
     m_root_iterator = CreateIteratorFromAccessPath(
         thd, m_root_access_path, join, /*eligible_for_batch_mode=*/true);
+    if (m_root_iterator == nullptr) {
+      return true;
+    }
+
+    if (thd->lex->using_hypergraph_optimizer) {
+      if (finalize_full_text_functions(thd, this)) {
+        return true;
+      }
+    }
+
     if (false) {
       // This can be useful during debugging.
       bool is_root_of_join = (join != nullptr);
@@ -820,13 +866,35 @@
   return false;
 }
 
+bool Query_expression::finalize(THD *thd) {
+  for (Query_block *query_block = first_query_block(); query_block != nullptr;
+       query_block = query_block->next_query_block()) {
+    if (query_block->join != nullptr && query_block->join->needs_finalize) {
+      if (FinalizePlanForQueryBlock(thd, query_block,
+                                    query_block->join->root_access_path())) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
 bool Query_expression::force_create_iterators(THD *thd) {
   if (m_root_iterator == nullptr) {
     JOIN *join = is_union() ? nullptr : first_query_block()->join;
     m_root_iterator = CreateIteratorFromAccessPath(
         thd, m_root_access_path, join, /*eligible_for_batch_mode=*/true);
   }
-  return m_root_iterator == nullptr;
+
+  if (m_root_iterator == nullptr) return true;
+
+  if (thd->lex->using_hypergraph_optimizer) {
+    if (finalize_full_text_functions(thd, this)) {
+      return true;
+    }
+  }
+
+  return false;
 }
 
 Mem_root_array<MaterializePathParameters::QueryBlock>
@@ -948,7 +1016,8 @@
         /*ref_slice=*/-1,
         /*rematerialize=*/true, push_limit_down ? limit : HA_POS_ERROR,
         /*reject_multiple_rows=*/false);
-    EstimateMaterializeCost(param.path);
+    EstimateMaterializeCost(thd, param.path);
+    param.path = MoveCompositeIteratorsFromTablePath(param.path);
     param.join = nullptr;
     union_all_sub_paths->push_back(param);
   }
diff -Nru mysql-8.0-8.0.26/sql/sql_union.h mysql-8.0-8.0.27/sql/sql_union.h
--- mysql-8.0-8.0.26/sql/sql_union.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_union.h	2021-09-28 11:46:34.000000000 +0000
@@ -58,9 +58,9 @@
 
     @return false on success, true on failure
   */
-  virtual bool postponed_prepare(THD *thd MY_ATTRIBUTE((unused)),
+  virtual bool postponed_prepare(THD *thd [[maybe_unused]],
                                  const mem_root_deque<Item *> &types
-                                     MY_ATTRIBUTE((unused))) {
+                                 [[maybe_unused]]) {
     return false;
   }
   bool send_data(THD *thd, const mem_root_deque<Item *> &items) override;
diff -Nru mysql-8.0-8.0.26/sql/sql_update.cc mysql-8.0-8.0.27/sql/sql_update.cc
--- mysql-8.0-8.0.26/sql/sql_update.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_update.cc	2021-09-28 11:46:34.000000000 +0000
@@ -72,7 +72,6 @@
 #include "sql/mysqld.h"       // stage_... mysql_tmpdir
 #include "sql/opt_explain.h"  // Modification_plan
 #include "sql/opt_explain_format.h"
-#include "sql/opt_range.h"  // QUICK_SELECT_I
 #include "sql/opt_trace.h"  // Opt_trace_object
 #include "sql/opt_trace_context.h"
 #include "sql/parse_tree_node_base.h"
@@ -80,6 +79,8 @@
 #include "sql/protocol.h"
 #include "sql/psi_memory_key.h"
 #include "sql/query_options.h"
+#include "sql/range_optimizer/partition_pruning.h"
+#include "sql/range_optimizer/range_optimizer.h"  // QUICK_SELECT_I
 #include "sql/records.h"  // unique_ptr_destroy_only<RowIterator>
 #include "sql/row_iterator.h"
 #include "sql/select_lex_visitor.h"
@@ -107,6 +108,7 @@
 #include "sql/thd_raii.h"
 #include "sql/timing_iterator.h"
 #include "sql/transaction_info.h"
+#include "sql/trigger_chain.h"
 #include "sql/trigger_def.h"
 #include "template_utils.h"
 #include "thr_lock.h"
@@ -454,15 +456,20 @@
   table->mark_columns_needed_for_update(thd,
                                         false /*mark_binlog_columns=false*/);
 
-  QEP_TAB_standalone qep_tab_st;
-  QEP_TAB &qep_tab = qep_tab_st.as_QEP_TAB();
+  QUICK_SELECT_I *quick = nullptr;
+  join_type type = JT_UNKNOWN;
 
-  qep_tab.set_table(table);
-  qep_tab.set_condition(conds);
+  auto cleanup = create_scope_guard([&quick, table] {
+    destroy(quick);
+    table->set_keyread(false);
+    table->file->ha_index_or_rnd_end();
+    free_io_cache(table);
+    filesort_free_buffers(table, true);
+  });
 
   if (conds &&
       thd->optimizer_switch_flag(OPTIMIZER_SWITCH_ENGINE_CONDITION_PUSHDOWN)) {
-    table->file->cond_push(conds, false);
+    table->file->cond_push(conds);
   }
 
   {  // Enter scope for optimizer trace wrapper
@@ -471,12 +478,13 @@
 
     if (!no_rows && conds != nullptr) {
       Key_map keys_to_use(Key_map::ALL_BITS), needed_reg_dummy;
-      QUICK_SELECT_I *qck;
+      MEM_ROOT temp_mem_root(key_memory_test_quick_select_exec,
+                             thd->variables.range_alloc_block_size);
       no_rows = test_quick_select(
-                    thd, keys_to_use, 0, limit, safe_update, ORDER_NOT_RELEVANT,
-                    &qep_tab, conds, &needed_reg_dummy, &qck,
-                    qep_tab.table()->force_index, query_block) < 0;
-      qep_tab.set_quick(qck);
+                    thd, thd->mem_root, &temp_mem_root, keys_to_use, 0, 0,
+                    limit, safe_update, ORDER_NOT_RELEVANT, table,
+                    /*skip_records_in_range=*/false, conds, &needed_reg_dummy,
+                    &quick, table->force_index, query_block) < 0;
       if (thd->is_error()) return true;
     }
     if (no_rows) {
@@ -528,8 +536,12 @@
   uint used_index;
   {
     ORDER_with_src order_src(order, ESC_ORDER_BY);
-    used_index =
-        get_index_for_order(&order_src, &qep_tab, limit, &need_sort, &reverse);
+    used_index = get_index_for_order(&order_src, table, limit, &quick,
+                                     &need_sort, &reverse);
+    if (quick != nullptr) {
+      // May have been changed by get_index_for_order().
+      type = calc_join_type(quick->get_type());
+    }
   }
   if (need_sort) {  // Assign table scan index to check below for modified key
                     // fields:
@@ -538,13 +550,13 @@
   if (used_index != MAX_KEY) {  // Check if we are modifying a key that we are
                                 // used to search with:
     used_key_is_modified = is_key_used(table, used_index, table->write_set);
-  } else if (qep_tab.quick()) {
+  } else if (quick) {
     /*
       select->quick != NULL and used_index == MAX_KEY happens for index
       merge and should be handled in a different way.
     */
-    used_key_is_modified = (!qep_tab.quick()->unique_key_range() &&
-                            qep_tab.quick()->is_keys_used(table->write_set));
+    used_key_is_modified =
+        (!quick->unique_key_range() && quick->is_keys_used(table->write_set));
   }
 
   if (table->part_info)
@@ -568,18 +580,17 @@
 
   {  // Start of scope for Modification_plan
     ha_rows rows;
-    if (qep_tab.quick())
-      rows = qep_tab.quick()->records;
+    if (quick)
+      rows = quick->records;
     else if (!conds && !need_sort && limit != HA_POS_ERROR)
       rows = limit;
     else {
       update_table_ref->fetch_number_of_rows();
       rows = table->file->stats.records;
     }
-    qep_tab.set_quick_optim();
-    qep_tab.set_condition_optim();
     DEBUG_SYNC(thd, "before_single_update");
-    Modification_plan plan(thd, MT_UPDATE, &qep_tab, used_index, limit,
+    Modification_plan plan(thd, MT_UPDATE, table, type, quick, conds,
+                           used_index, limit,
                            (!using_filesort && (used_key_is_modified || order)),
                            using_filesort, used_key_is_modified, rows);
     DEBUG_SYNC(thd, "planned_single_update");
@@ -606,25 +617,24 @@
         */
         JOIN join(thd, query_block);  // Only for holding examined_rows.
         AccessPath *path = create_table_access_path(
-            thd, nullptr, &qep_tab, /*count_examined_rows=*/true);
+            thd, table, quick, /*table_ref=*/nullptr,
+            /*position=*/nullptr, /*count_examined_rows=*/true);
 
-        if (qep_tab.condition() != nullptr) {
-          path = NewFilterAccessPath(thd, path, qep_tab.condition());
+        if (conds != nullptr) {
+          path = NewFilterAccessPath(thd, path, conds);
         }
 
         // Force filesort to sort by position.
         fsort.reset(new (thd->mem_root) Filesort(
-            thd, {qep_tab.table()}, /*keep_buffers=*/false, order, limit,
-            /*force_stable_sort=*/false,
+            thd, {table}, /*keep_buffers=*/false, order, limit,
             /*remove_duplicates=*/false,
             /*force_sort_positions=*/true, /*unwrap_rollup=*/false));
         path = NewSortAccessPath(thd, path, fsort.get(),
                                  /*count_examined_rows=*/false);
         iterator = CreateIteratorFromAccessPath(
             thd, path, &join, /*eligible_for_batch_mode=*/true);
-        // Prevent cleanup in JOIN::destroy() and
-        // QEP_shared_owner::qs_cleanup(), to avoid double-destroy of the
-        // SortingIterator.
+        // Prevent cleanup in JOIN::destroy() and in the cleanup condition
+        // guard, to avoid double-destroy of the SortingIterator.
         table->sorting_iterator = nullptr;
 
         if (iterator == nullptr || iterator->Init()) return true;
@@ -634,8 +644,9 @@
           Filesort has already found and selected the rows we want to update,
           so we don't need the where clause
         */
-        qep_tab.set_quick(nullptr);
-        qep_tab.set_condition(nullptr);
+        destroy(quick);
+        quick = nullptr;
+        conds = nullptr;
       } else {
         /*
           We are doing a search on a key that is updated. In this case
@@ -652,14 +663,6 @@
           table->set_keyread(true);
 
         table->prepare_for_position();
-
-        /* If quick select is used, initialize it before retrieving rows. */
-        if (qep_tab.quick() && (error = qep_tab.quick()->reset())) {
-          if (table->file->is_fatal_error(error)) error_flags |= ME_FATALERROR;
-
-          table->file->print_error(error, error_flags);
-          return true;
-        }
         table->file->try_semi_consistent_read(true);
         auto end_semi_consistent_read = create_scope_guard(
             [table] { table->file->try_semi_consistent_read(false); });
@@ -676,8 +679,10 @@
         */
 
         AccessPath *path;
-        if (used_index == MAX_KEY || qep_tab.quick()) {
-          path = create_table_access_path(thd, nullptr, &qep_tab,
+        if (used_index == MAX_KEY || quick) {
+          path = create_table_access_path(thd, table, quick,
+                                          /*table_ref=*/nullptr,
+                                          /*position=*/nullptr,
                                           /*count_examined_rows=*/false);
         } else {
           empty_record(table);
@@ -688,9 +693,8 @@
 
         iterator = CreateIteratorFromAccessPath(
             thd, path, /*join=*/nullptr, /*eligible_for_batch_mode=*/true);
-        // Prevent cleanup in JOIN::destroy() and
-        // QEP_shared_owner::qs_cleanup(), to avoid double-destroy of the
-        // SortingIterator.
+        // Prevent cleanup in JOIN::destroy() and in the cleanup condition
+        // guard, to avoid double-destroy of the SortingIterator.
         table->sorting_iterator = nullptr;
 
         if (iterator == nullptr || iterator->Init()) {
@@ -714,8 +718,8 @@
           assert(!thd->is_error());
           thd->inc_examined_row_count(1);
 
-          if (qep_tab.condition() != nullptr) {
-            const bool skip_record = qep_tab.condition()->val_int() == 0;
+          if (conds != nullptr) {
+            const bool skip_record = conds->val_int() == 0;
             if (thd->is_error()) {
               error = 1;
               /*
@@ -769,14 +773,17 @@
             /*examined_rows=*/nullptr);
         if (iterator->Init()) return true;
 
-        qep_tab.set_quick(nullptr);
-        qep_tab.set_condition(nullptr);
+        destroy(quick);
+        quick = nullptr;
+        conds = nullptr;
       }
     } else {
       // No ORDER BY or updated key underway, so we can use a regular read.
-      iterator = init_table_iterator(thd, nullptr, &qep_tab,
-                                     /*ignore_not_found_rows=*/false,
-                                     /*count_examined_rows=*/false);
+      iterator =
+          init_table_iterator(thd, table, quick,
+                              /*table_ref=*/nullptr, /*position=*/nullptr,
+                              /*ignore_not_found_rows=*/false,
+                              /*count_examined_rows=*/false);
       if (iterator == nullptr) return true; /* purecov: inspected */
     }
 
@@ -810,9 +817,9 @@
     }
     if ((table->file->ha_table_flags() & HA_READ_BEFORE_WRITE_REMOVAL) &&
         !thd->lex->is_ignore() && !using_limit && !has_update_triggers &&
-        qep_tab.quick() && qep_tab.quick()->index != MAX_KEY &&
+        quick && quick->index != MAX_KEY &&
         check_constant_expressions(*update_value_list))
-      read_removal = table->check_read_removal(qep_tab.quick()->index);
+      read_removal = table->check_read_removal(quick->index);
 
     // If the update is batched, we cannot do partial update, so turn it off.
     if (will_batch) table->cleanup_partial_update(); /* purecov: inspected */
@@ -823,8 +830,8 @@
       error = iterator->Read();
       if (error || thd->killed) break;
       thd->inc_examined_row_count(1);
-      if (qep_tab.condition() != nullptr) {
-        const bool skip_record = qep_tab.condition()->val_int() == 0;
+      if (conds != nullptr) {
+        const bool skip_record = conds->val_int() == 0;
         if (thd->is_error()) {
           error = 1;
           break;
@@ -978,27 +985,34 @@
             ((error = table->file->exec_bulk_update(&dup_key_found)) ||
              dup_key_found)) {
           if (error) {
-            /* purecov: begin inspected */
-            assert(false);
             /*
-              The handler should not report error of duplicate keys if they
-              are ignored. This is a requirement on batching handlers.
+              ndbcluster is the only handler that returns an error at this
+              juncture
             */
+            assert(table->file->ht->db_type == DB_TYPE_NDBCLUSTER);
             if (table->file->is_fatal_error(error))
               error_flags |= ME_FATALERROR;
 
             table->file->print_error(error, error_flags);
             error = 1;
             break;
-            /* purecov: end */
           }
+          /* purecov: begin inspected */
           /*
-            Either an error was found and we are ignoring errors or there
-            were duplicate keys found. In both cases we need to correct
-            the counters and continue the loop.
+            Either an error was found and we are ignoring errors or there were
+            duplicate keys found with HA_IGNORE_DUP_KEY enabled. In both cases
+            we need to correct the counters and continue the loop.
           */
+
+          /*
+            Note that NDB disables batching when duplicate keys are to be
+            ignored. Any duplicate key found will result in an error returned
+            above.
+          */
+          assert(false);
           limit = dup_key_found;  // limit is 0 when we get here so need to +
           updated_rows -= dup_key_found;
+          /* purecov: end */
         } else {
           error = -1;  // Simulate end of file
           break;
@@ -1925,6 +1939,7 @@
       // If the index access is using some secondary key(s), and if the table
       // has a clustered primary key, modifying that key might affect the
       // functioning of the the secondary key(s), so fall through to check that.
+      [[fallthrough]];
     case JT_ALL:
       assert(join_tab->type() != JT_ALL || join_tab->quick() == nullptr);
       // If using the clustered key under the cover:
@@ -2417,9 +2432,10 @@
       /* Write row, ignoring duplicated updates to a row */
       error = tmp_table->file->ha_write_row(tmp_table->record[0]);
       if (error != HA_ERR_FOUND_DUPP_KEY && error != HA_ERR_FOUND_DUPP_UNIQUE) {
-        if (error &&
-            (create_ondisk_from_heap(thd, tmp_table, error, true, nullptr) ||
-             tmp_table->file->ha_index_init(0, false /*sorted*/))) {
+        if (error && (create_ondisk_from_heap(
+                          thd, tmp_table, error, /*insert_last_record=*/true,
+                          /*ignore_last_dup=*/true, /*is_duplicate=*/nullptr) ||
+                      tmp_table->file->ha_index_init(0, false /*sorted*/))) {
           update_completed = true;
           return true;  // Not a table_is_full error
         }
@@ -2636,9 +2652,16 @@
                                                     TRG_ACTION_BEFORE, true);
 
         // Trigger might have changed dependencies of generated columns
-        if (!rc && table->vfield &&
-            update_generated_write_fields(table->write_set, table))
-          goto err;
+        Trigger_chain *tc =
+            table->triggers->get_triggers(TRG_EVENT_UPDATE, TRG_ACTION_BEFORE);
+        bool has_trigger_updated_fields =
+            (tc && tc->has_updated_trigger_fields(table->write_set));
+        if (!rc && table->vfield && has_trigger_updated_fields) {
+          // Dont save old value while re-calculating generated fields.
+          // Before image will already be saved in the first calculation.
+          table->blobs_need_not_keep_old_value();
+          if (update_generated_write_fields(table->write_set, table)) goto err;
+        }
 
         table->triggers->disable_fields_temporary_nullability();
 
@@ -2654,8 +2677,9 @@
           are set before before-triggers are called; here, it's the opposite
           order.
         */
-        update_operations[offset]->set_function_defaults(table);
-
+        if (update_operations[offset]->set_function_defaults(table)) {
+          goto err;
+        }
         /*
           It is safe to not invoke CHECK OPTION for VIEW if records are same.
           In this case the row is coming from the view and thus should satisfy
diff -Nru mysql-8.0-8.0.26/sql/sql_view.cc mysql-8.0-8.0.27/sql/sql_view.cc
--- mysql-8.0-8.0.26/sql/sql_view.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_view.cc	2021-09-28 11:46:34.000000000 +0000
@@ -72,7 +72,6 @@
 #include "sql/sql_base.h"   // get_table_def_key
 #include "sql/sql_class.h"  // THD
 #include "sql/sql_const.h"
-#include "sql/sql_digest_stream.h"
 #include "sql/sql_error.h"
 #include "sql/sql_lex.h"
 #include "sql/sql_list.h"
@@ -597,6 +596,7 @@
   /* prepare select to resolve all fields */
   lex->context_analysis_only |= CONTEXT_ANALYSIS_ONLY_VIEW;
   if (!unit->is_prepared()) {
+    Prepared_stmt_arena_holder ps_arena_holder(thd);
     /*
       @todo - the following code is duplicated in mysql_test_create_view.
               ensure that we have a single preparation function for create view.
@@ -1279,9 +1279,6 @@
   // Needed for correct units markup for EXPLAIN
   view_lex->explain_format = old_lex->explain_format;
 
-  if (thd->m_digest != nullptr)
-    thd->m_digest->reset(thd->m_token_array, max_digest_length);
-
   /*
     Push error handler allowing DD table access. Creating views referring
     to DD tables is rejected except for the I_S views. Thus, when parsing
@@ -1308,6 +1305,10 @@
     // Switch off modes which can prevent normal parsing of VIEW
     Sql_mode_parse_guard parse_guard(thd);
 
+    // Do not pollute the current statement
+    // with a digest of the view definition
+    assert(!parser_state.m_input.m_has_digest);
+
     // Parse the query text of the view
     result = parse_sql(thd, &parser_state, view_ref->view_creation_ctx);
   }
diff -Nru mysql-8.0-8.0.26/sql/sql_yacc.cc mysql-8.0-8.0.27/sql/sql_yacc.cc
--- mysql-8.0-8.0.26/sql/sql_yacc.cc	2021-07-01 08:15:39.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_yacc.cc	2021-09-28 13:21:33.000000000 +0000
@@ -527,7 +527,7 @@
 }
 
 
-#line 531 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:339  */
+#line 531 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:339  */
 
 # ifndef YY_NULLPTR
 #  if defined __cplusplus && 201103L <= __cplusplus
@@ -547,8 +547,8 @@
 
 /* In a future release of Bison, this section will be replaced
    by #include "sql_yacc.h".  */
-#ifndef YY_MYSQL_VAR_LIB_PB2_SB_1_3692345_1625126119_25_DIST_GPL_SQL_SQL_YACC_H_INCLUDED
-# define YY_MYSQL_VAR_LIB_PB2_SB_1_3692345_1625126119_25_DIST_GPL_SQL_SQL_YACC_H_INCLUDED
+#ifndef YY_MYSQL_VAR_LIB_PB2_SB_1_4617039_1632834178_1_DIST_GPL_SQL_SQL_YACC_H_INCLUDED
+# define YY_MYSQL_VAR_LIB_PB2_SB_1_4617039_1632834178_1_DIST_GPL_SQL_SQL_YACC_H_INCLUDED
 /* Debug traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
@@ -1344,11 +1344,20 @@
     SOURCE_ZSTD_COMPRESSION_LEVEL_SYM = 1188,
     ST_COLLECT_SYM = 1189,
     KEYRING_SYM = 1190,
-    KEYWORD_USED_AS_IDENT = 1192,
-    KEYWORD_USED_AS_KEYWORD = 1193,
-    CONDITIONLESS_JOIN = 1194,
-    SUBQUERY_AS_EXPR = 1195,
-    EMPTY_FROM_CLAUSE = 1196
+    AUTHENTICATION_SYM = 1191,
+    FACTOR_SYM = 1192,
+    FINISH_SYM = 1193,
+    INITIATE_SYM = 1194,
+    REGISTRATION_SYM = 1195,
+    UNREGISTER_SYM = 1196,
+    INITIAL_SYM = 1197,
+    CHALLENGE_RESPONSE_SYM = 1198,
+    GTID_ONLY_SYM = 1199,
+    KEYWORD_USED_AS_IDENT = 1201,
+    KEYWORD_USED_AS_KEYWORD = 1202,
+    CONDITIONLESS_JOIN = 1203,
+    SUBQUERY_AS_EXPR = 1204,
+    EMPTY_FROM_CLAUSE = 1205
   };
 #endif
 /* Tokens.  */
@@ -2134,11 +2143,20 @@
 #define SOURCE_ZSTD_COMPRESSION_LEVEL_SYM 1188
 #define ST_COLLECT_SYM 1189
 #define KEYRING_SYM 1190
-#define KEYWORD_USED_AS_IDENT 1192
-#define KEYWORD_USED_AS_KEYWORD 1193
-#define CONDITIONLESS_JOIN 1194
-#define SUBQUERY_AS_EXPR 1195
-#define EMPTY_FROM_CLAUSE 1196
+#define AUTHENTICATION_SYM 1191
+#define FACTOR_SYM 1192
+#define FINISH_SYM 1193
+#define INITIATE_SYM 1194
+#define REGISTRATION_SYM 1195
+#define UNREGISTER_SYM 1196
+#define INITIAL_SYM 1197
+#define CHALLENGE_RESPONSE_SYM 1198
+#define GTID_ONLY_SYM 1199
+#define KEYWORD_USED_AS_IDENT 1201
+#define KEYWORD_USED_AS_KEYWORD 1202
+#define CONDITIONLESS_JOIN 1203
+#define SUBQUERY_AS_EXPR 1204
+#define EMPTY_FROM_CLAUSE 1205
 
 /* Value type.  */
 
@@ -2160,11 +2178,11 @@
 
 int MYSQLparse (class THD *YYTHD, class Parse_tree_root **parse_tree);
 
-#endif /* !YY_MYSQL_VAR_LIB_PB2_SB_1_3692345_1625126119_25_DIST_GPL_SQL_SQL_YACC_H_INCLUDED  */
+#endif /* !YY_MYSQL_VAR_LIB_PB2_SB_1_4617039_1632834178_1_DIST_GPL_SQL_SQL_YACC_H_INCLUDED  */
 
 /* Copy the second part of user declarations.  */
 
-#line 2168 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:358  */
+#line 2186 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -2406,23 +2424,23 @@
 #endif /* !YYCOPY_NEEDED */
 
 /* YYFINAL -- State number of the termination state.  */
-#define YYFINAL  1128
+#define YYFINAL  1137
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   89241
+#define YYLAST   89576
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  809
+#define YYNTOKENS  818
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  1007
+#define YYNNTS  1018
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  3185
+#define YYNRULES  3221
 /* YYNSTATES -- Number of states.  */
-#define YYNSTATES  5501
+#define YYNSTATES  5556
 
 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
    by yylex, with out-of-bounds checking.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   1196
+#define YYMAXUTOK   1205
 
 #define YYTRANSLATE(YYX)                                                \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -2434,16 +2452,16 @@
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,   806,     2,     2,     2,   794,   789,     2,
-     798,   799,   792,   791,   803,   790,   804,   793,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,   805,   801,
-       2,     2,     2,     2,   802,     2,     2,     2,     2,     2,
+       2,     2,     2,   815,     2,     2,     2,   803,   798,     2,
+     807,   808,   801,   800,   812,   799,   813,   802,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,   814,   810,
+       2,     2,     2,     2,   811,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,   795,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,   804,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,   807,   788,   808,   796,     2,     2,     2,
+       2,     2,     2,   816,   797,   817,   805,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -2550,332 +2568,337 @@
      754,   755,   756,   757,   758,   759,   760,   761,   762,   763,
      764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
      774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
-     784,     2,   785,   786,   787,   797,   800
+     784,   785,   786,   787,   788,   789,   790,   791,   792,   793,
+       2,   794,   795,   796,   806,   809
 };
 
 #if YYDEBUG
   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,  2153,  2153,  2154,  2159,  2169,  2187,  2191,  2199,  2212,
-    2211,  2236,  2243,  2245,  2249,  2250,  2255,  2256,  2257,  2258,
-    2259,  2260,  2261,  2262,  2263,  2264,  2265,  2266,  2267,  2268,
-    2269,  2270,  2271,  2272,  2273,  2274,  2275,  2276,  2277,  2278,
-    2279,  2280,  2281,  2282,  2283,  2284,  2285,  2286,  2287,  2288,
-    2289,  2290,  2291,  2292,  2293,  2294,  2295,  2296,  2297,  2298,
-    2299,  2300,  2301,  2302,  2303,  2304,  2305,  2306,  2307,  2308,
-    2309,  2310,  2311,  2312,  2313,  2314,  2315,  2316,  2317,  2318,
-    2319,  2320,  2321,  2322,  2323,  2324,  2325,  2326,  2327,  2328,
-    2329,  2330,  2331,  2332,  2333,  2334,  2335,  2336,  2337,  2338,
-    2339,  2340,  2341,  2342,  2343,  2344,  2345,  2346,  2347,  2348,
-    2349,  2350,  2351,  2352,  2353,  2354,  2355,  2356,  2357,  2358,
-    2359,  2360,  2361,  2362,  2363,  2364,  2365,  2366,  2367,  2368,
-    2369,  2370,  2371,  2372,  2373,  2374,  2375,  2376,  2377,  2378,
-    2379,  2380,  2381,  2382,  2383,  2384,  2385,  2386,  2387,  2388,
-    2389,  2393,  2403,  2404,  2408,  2428,  2435,  2446,  2445,  2456,
-    2458,  2462,  2463,  2467,  2480,  2479,  2498,  2503,  2508,  2507,
-    2524,  2523,  2541,  2542,  2545,  2552,  2559,  2566,  2573,  2580,
-    2588,  2597,  2603,  2610,  2617,  2625,  2634,  2640,  2646,  2654,
-    2662,  2668,  2675,  2682,  2690,  2702,  2708,  2715,  2722,  2730,
-    2740,  2741,  2745,  2751,  2755,  2760,  2764,  2770,  2774,  2779,
-    2783,  2788,  2792,  2797,  2801,  2806,  2810,  2815,  2819,  2824,
-    2828,  2833,  2837,  2842,  2846,  2851,  2855,  2860,  2864,  2869,
-    2873,  2878,  2882,  2887,  2891,  2896,  2900,  2905,  2909,  2914,
-    2918,  2923,  2927,  2932,  2936,  2941,  2945,  2950,  2954,  2959,
-    2963,  2968,  2972,  2976,  2980,  2984,  2988,  2998,  3002,  3006,
-    3011,  3022,  3027,  3031,  3035,  3039,  3040,  3044,  3048,  3052,
-    3057,  3061,  3065,  3069,  3075,  3109,  3113,  3117,  3121,  3127,
-    3128,  3138,  3139,  3155,  3156,  3159,  3161,  3162,  3166,  3172,
-    3178,  3187,  3191,  3195,  3202,  3206,  3210,  3224,  3229,  3237,
-    3242,  3246,  3251,  3255,  3259,  3275,  3279,  3290,  3291,  3296,
-    3306,  3316,  3321,  3329,  3336,  3349,  3348,  3363,  3365,  3378,
-    3398,  3417,  3437,  3454,  3459,  3468,  3473,  3485,  3497,  3511,
-    3527,  3531,  3538,  3547,  3555,  3566,  3567,  3571,  3575,  3579,
-    3583,  3587,  3592,  3596,  3604,  3603,  3635,  3634,  3643,  3652,
-    3653,  3659,  3665,  3675,  3681,  3689,  3691,  3700,  3701,  3705,
-    3711,  3720,  3721,  3729,  3729,  3787,  3788,  3789,  3790,  3791,
-    3792,  3793,  3794,  3795,  3796,  3797,  3798,  3799,  3803,  3817,
-    3836,  3837,  3841,  3842,  3847,  3849,  3851,  3853,  3855,  3857,
-    3859,  3865,  3866,  3867,  3871,  3875,  3882,  3889,  3890,  3897,
-    3899,  3903,  3904,  3908,  3959,  3961,  3965,  3966,  3970,  4020,
-    4021,  4022,  4023,  4027,  4028,  4032,  4033,  4038,  4041,  4065,
-    4164,  4182,  4181,  4260,  4256,  4333,  4334,  4339,  4341,  4346,
-    4369,  4380,  4384,  4406,  4407,  4411,  4415,  4428,  4434,  4440,
-    4449,  4462,  4488,  4494,  4495,  4501,  4502,  4507,  4513,  4526,
-    4528,  4548,  4554,  4556,  4558,  4560,  4562,  4564,  4566,  4568,
-    4570,  4572,  4574,  4576,  4581,  4595,  4612,  4613,  4615,  4620,
-    4626,  4635,  4641,  4650,  4658,  4686,  4694,  4696,  4705,  4710,
-    4716,  4725,  4733,  4735,  4737,  4739,  4741,  4743,  4745,  4747,
-    4749,  4751,  4753,  4755,  4757,  4762,  4782,  4806,  4810,  4818,
-    4819,  4820,  4821,  4822,  4823,  4824,  4825,  4826,  4827,  4828,
-    4829,  4830,  4835,  4834,  4845,  4845,  4910,  4909,  4966,  4966,
-    4988,  5045,  5092,  5116,  5115,  5140,  5162,  5164,  5165,  5169,
-    5187,  5208,  5216,  5254,  5208,  5282,  5284,  5285,  5289,  5290,
-    5295,  5305,  5294,  5357,  5356,  5370,  5371,  5375,  5376,  5381,
-    5389,  5380,  5439,  5447,  5438,  5493,  5506,  5511,  5510,  5548,
-    5549,  5554,  5553,  5587,  5587,  5606,  5605,  5653,  5668,  5676,
-    5667,  5734,  5742,  5731,  5784,  5786,  5791,  5793,  5795,  5810,
-    5811,  5818,  5819,  5826,  5827,  5831,  5837,  5846,  5847,  5848,
-    5849,  5850,  5851,  5852,  5853,  5854,  5855,  5856,  5860,  5861,
-    5865,  5871,  5880,  5881,  5882,  5883,  5884,  5885,  5886,  5890,
-    5891,  5895,  5901,  5910,  5914,  5915,  5919,  5925,  5934,  5935,
-    5936,  5937,  5938,  5939,  5940,  5944,  5945,  5949,  5955,  5964,
-    5965,  5966,  5970,  5974,  5975,  5979,  5983,  5990,  5997,  6001,
-    6008,  6015,  6022,  6029,  6036,  6043,  6050,  6057,  6061,  6068,
-    6075,  6082,  6083,  6158,  6164,  6168,  6173,  6178,  6184,  6192,
-    6202,  6203,  6217,  6225,  6229,  6233,  6237,  6241,  6245,  6252,
-    6253,  6258,  6259,  6277,  6278,  6290,  6291,  6296,  6305,  6306,
-    6311,  6317,  6327,  6328,  6340,  6341,  6345,  6351,  6360,  6369,
-    6372,  6377,  6385,  6386,  6390,  6394,  6401,  6408,  6418,  6417,
-    6435,  6441,  6450,  6451,  6456,  6457,  6461,  6467,  6476,  6483,
-    6484,  6488,  6494,  6503,  6505,  6507,  6509,  6511,  6513,  6515,
-    6517,  6526,  6527,  6531,  6532,  6553,  6554,  6558,  6559,  6563,
-    6568,  6573,  6588,  6589,  6593,  6599,  6608,  6614,  6622,  6624,
-    6628,  6632,  6636,  6640,  6644,  6648,  6652,  6656,  6660,  6664,
-    6668,  6672,  6676,  6680,  6684,  6701,  6705,  6709,  6713,  6717,
-    6721,  6725,  6729,  6733,  6737,  6741,  6745,  6749,  6753,  6757,
-    6761,  6766,  6770,  6774,  6778,  6785,  6799,  6803,  6807,  6811,
-    6815,  6816,  6817,  6818,  6819,  6820,  6824,  6825,  6826,  6830,
-    6831,  6832,  6833,  6837,  6843,  6852,  6853,  6857,  6864,  6865,
-    6873,  6879,  6885,  6890,  6900,  6908,  6916,  6920,  6921,  6925,
-    6926,  6930,  6931,  6935,  6939,  6943,  6964,  6966,  6970,  6971,
-    6972,  6976,  6980,  6984,  6988,  6992,  6996,  7000,  7004,  7009,
-    7014,  7023,  7032,  7036,  7040,  7045,  7054,  7058,  7081,  7085,
-    7089,  7093,  7097,  7101,  7105,  7106,  7110,  7114,  7118,  7123,
-    7128,  7133,  7138,  7143,  7147,  7151,  7156,  7160,  7167,  7169,
-    7171,  7173,  7175,  7177,  7179,  7181,  7186,  7187,  7191,  7192,
-    7196,  7197,  7198,  7199,  7200,  7204,  7205,  7206,  7207,  7208,
-    7212,  7217,  7221,  7223,  7227,  7228,  7229,  7230,  7235,  7239,
-    7248,  7252,  7257,  7261,  7270,  7271,  7275,  7276,  7277,  7285,
-    7286,  7290,  7294,  7298,  7299,  7300,  7309,  7310,  7311,  7312,
-    7315,  7316,  7321,  7325,  7329,  7330,  7334,  7353,  7372,  7376,
-    7380,  7384,  7388,  7392,  7396,  7400,  7404,  7408,  7412,  7416,
-    7420,  7424,  7428,  7432,  7441,  7446,  7459,  7463,  7467,  7474,
-    7475,  7476,  7480,  7481,  7482,  7486,  7492,  7496,  7500,  7501,
-    7505,  7514,  7518,  7519,  7523,  7532,  7536,  7537,  7541,  7547,
-    7551,  7552,  7556,  7557,  7562,  7563,  7567,  7574,  7582,  7588,
-    7598,  7602,  7607,  7612,  7617,  7624,  7630,  7641,  7642,  7650,
-    7649,  7661,  7663,  7667,  7682,  7683,  7687,  7694,  7704,  7705,
-    7706,  7707,  7712,  7716,  7721,  7726,  7732,  7741,  7742,  7743,
-    7744,  7745,  7749,  7750,  7754,  7755,  7759,  7760,  7764,  7765,
-    7766,  7770,  7771,  7775,  7776,  7780,  7786,  7795,  7796,  7810,
-    7811,  7815,  7821,  7830,  7834,  7835,  7839,  7845,  7854,  7855,
-    7860,  7861,  7865,  7869,  7873,  7897,  7898,  7899,  7903,  7904,
-    7908,  7909,  7913,  7914,  7918,  7919,  7920,  7924,  7930,  7940,
-    7946,  7961,  7967,  7977,  7978,  7987,  7988,  7992,  7993,  7997,
-    8003,  8015,  8025,  8039,  8038,  8059,  8058,  8080,  8079,  8101,
-    8100,  8119,  8113,  8136,  8135,  8171,  8193,  8212,  8232,  8240,
-    8262,  8286,  8297,  8299,  8314,  8328,  8334,  8346,  8358,  8372,
-    8373,  8377,  8387,  8397,  8402,  8409,  8418,  8419,  8423,  8424,
-    8428,  8434,  8440,  8448,  8463,  8471,  8479,  8486,  8493,  8500,
-    8507,  8513,  8519,  8525,  8537,  8549,  8558,  8559,  8563,  8564,
-    8568,  8574,  8580,  8586,  8595,  8609,  8610,  8611,  8612,  8616,
-    8617,  8629,  8630,  8634,  8635,  8639,  8640,  8655,  8660,  8668,
-    8672,  8680,  8684,  8689,  8690,  8699,  8703,  8714,  8718,  8722,
-    8726,  8730,  8735,  8740,  8745,  8750,  8757,  8761,  8765,  8769,
-    8774,  8779,  8784,  8789,  8793,  8800,  8801,  8805,  8809,  8816,
-    8817,  8825,  8832,  8837,  8841,  8846,  8857,  8858,  8866,  8870,
-    8874,  8878,  8882,  8886,  8891,  8895,  8899,  8903,  8907,  8911,
-    8915,  8919,  8923,  8927,  8932,  8936,  8940,  8944,  8948,  8952,
-    8956,  8960,  8964,  8970,  8974,  8981,  8986,  8991,  8999,  9000,
-    9005,  9010,  9016,  9025,  9029,  9033,  9050,  9054,  9058,  9074,
-    9076,  9080,  9081,  9085,  9086,  9087,  9091,  9092,  9093,  9097,
-    9098,  9099,  9100,  9104,  9105,  9113,  9121,  9123,  9127,  9128,
-    9132,  9133,  9134,  9138,  9150,  9163,  9170,  9171,  9175,  9190,
-    9205,  9189,  9229,  9246,  9249,  9256,  9260,  9267,  9271,  9275,
-    9282,  9285,  9292,  9295,  9302,  9305,  9312,  9315,  9323,  9326,
-    9333,  9337,  9344,  9348,  9356,  9360,  9385,  9386,  9387,  9392,
-    9397,  9404,  9418,  9419,  9420,  9424,  9433,  9434,  9438,  9439,
-    9447,  9448,  9449,  9453,  9463,  9464,  9483,  9488,  9495,  9505,
-    9513,  9521,  9522,  9526,  9527,  9535,  9537,  9539,  9541,  9543,
-    9545,  9550,  9557,  9558,  9559,  9564,  9563,  9569,  9576,  9581,
-    9589,  9590,  9594,  9607,  9611,  9620,  9626,  9635,  9642,  9643,
-    9647,  9652,  9659,  9665,  9674,  9681,  9688,  9689,  9699,  9700,
-    9704,  9708,  9713,  9717,  9753,  9757,  9761,  9765,  9769,  9808,
-    9814,  9821,  9827,  9834,  9839,  9845,  9853,  9857,  9861,  9865,
-    9869,  9877,  9878,  9879,  9886,  9891,  9895,  9907,  9929,  9953,
-    9954,  9958,  9962,  9963,  9967,  9973,  9982,  9989, 10001, 10004,
-   10008, 10013, 10017, 10021, 10030, 10036, 10045, 10049, 10053, 10060,
-   10061, 10065, 10069, 10070, 10074, 10075, 10079, 10085, 10091, 10101,
-   10102, 10110, 10111, 10112, 10113, 10114, 10118, 10119, 10124, 10130,
-   10135, 10141, 10145, 10149, 10153, 10157, 10161, 10165, 10169, 10173,
-   10177, 10181, 10185, 10198, 10202, 10206, 10211, 10215, 10222, 10226,
-   10235, 10239, 10243, 10247, 10255, 10259, 10263, 10268, 10273, 10281,
-   10289, 10293, 10294, 10298, 10302, 10306, 10310, 10314, 10318, 10322,
-   10326, 10330, 10334, 10338, 10342, 10346, 10350, 10354, 10358, 10359,
-   10363, 10364, 10371, 10372, 10376, 10377, 10381, 10382, 10383, 10384,
-   10385, 10386, 10387, 10391, 10392, 10396, 10397, 10398, 10399, 10400,
-   10401, 10405, 10406, 10407, 10408, 10409, 10410, 10414, 10418, 10422,
-   10426, 10430, 10434, 10435, 10439, 10443, 10447, 10451, 10455, 10459,
-   10463, 10467, 10475, 10479, 10483, 10487, 10491, 10495, 10500, 10507,
-   10518, 10519, 10529, 10533, 10537, 10541, 10545, 10549, 10553, 10557,
-   10561, 10565, 10572, 10576, 10580, 10584, 10588, 10592, 10596, 10600,
-   10604, 10609, 10614, 10619, 10623, 10627, 10631, 10635, 10640, 10644,
-   10663, 10667, 10671, 10675, 10679, 10684, 10689, 10693, 10697, 10702,
-   10706, 10710, 10714, 10718, 10722, 10726, 10730, 10735, 10739, 10743,
-   10747, 10751, 10762, 10765, 10776, 10780, 10784, 10788, 10792, 10796,
-   10800, 10804, 10808, 10812, 10816, 10820, 10824, 10828, 10832, 10836,
-   10840, 10844, 10848, 10852, 10856, 10860, 10864, 10868, 10874, 10880,
-   10886, 10892, 10898, 10902, 10920, 10924, 10931, 10933, 10946, 10947,
-   10951, 10952, 10956, 10957, 10961, 10967, 10976, 10983, 10984, 10988,
-   10992, 10996, 11000, 11004, 11014, 11024, 11028, 11032, 11036, 11040,
-   11044, 11048, 11057, 11061, 11065, 11069, 11073, 11077, 11081, 11085,
-   11089, 11093, 11103, 11107, 11111, 11115, 11119, 11123, 11127, 11138,
-   11149, 11153, 11157, 11170, 11174, 11186, 11187, 11191, 11192, 11193,
-   11198, 11201, 11209, 11212, 11216, 11225, 11228, 11232, 11240, 11243,
-   11250, 11257, 11261, 11268, 11275, 11282, 11303, 11306, 11314, 11317,
-   11325, 11328, 11336, 11339, 11348, 11353, 11360, 11364, 11368, 11372,
-   11376, 11383, 11390, 11394, 11398, 11402, 11406, 11414, 11417, 11421,
-   11425, 11429, 11435, 11436, 11437, 11441, 11448, 11452, 11459, 11463,
-   11470, 11471, 11476, 11481, 11485, 11486, 11490, 11495, 11505, 11512,
-   11519, 11538, 11546, 11553, 11560, 11567, 11574, 11581, 11588, 11595,
-   11602, 11609, 11616, 11624, 11631, 11638, 11645, 11652, 11659, 11666,
-   11673, 11683, 11684, 11688, 11694, 11703, 11704, 11708, 11714, 11723,
-   11724, 11728, 11729, 11733, 11741, 11750, 11751, 11752, 11765, 11766,
-   11847, 11851, 11856, 11860, 11864, 11874, 11881, 11882, 11883, 11887,
-   11888, 11889, 11890, 11893, 11894, 11897, 11899, 11902, 11904, 11912,
-   11913, 11917, 11946, 11947, 11948, 11949, 11951, 11953, 11957, 11958,
-   11967, 11968, 11972, 11979, 11980, 11984, 11997, 12008, 12024, 12031,
-   12037, 12046, 12050, 12060, 12067, 12070, 12081, 12085, 12090, 12095,
-   12104, 12105, 12116, 12119, 12122, 12126, 12130, 12138, 12141, 12142,
-   12143, 12147, 12148, 12152, 12158, 12167, 12168, 12176, 12177, 12181,
-   12186, 12192, 12196, 12202, 12211, 12217, 12225, 12229, 12238, 12250,
-   12251, 12252, 12253, 12254, 12255, 12256, 12257, 12258, 12259, 12260,
-   12261, 12265, 12266, 12267, 12268, 12269, 12270, 12271, 12272, 12273,
-   12277, 12278, 12279, 12280, 12283, 12285, 12289, 12290, 12293, 12295,
-   12299, 12300, 12304, 12308, 12309, 12316, 12320, 12327, 12332, 12341,
-   12358, 12366, 12373, 12379, 12389, 12392, 12399, 12405, 12414, 12428,
-   12429, 12436, 12441, 12452, 12453, 12468, 12473, 12483, 12490, 12491,
-   12495, 12502, 12507, 12517, 12518, 12522, 12523, 12527, 12528, 12532,
-   12539, 12545, 12551, 12560, 12564, 12568, 12572, 12576, 12583, 12584,
-   12588, 12589, 12590, 12591, 12592, 12593, 12597, 12598, 12599, 12600,
-   12601, 12605, 12606, 12607, 12608, 12609, 12613, 12614, 12615, 12616,
-   12617, 12621, 12626, 12627, 12631, 12637, 12646, 12650, 12657, 12664,
-   12670, 12674, 12682, 12695, 12711, 12720, 12730, 12753, 12788, 12795,
-   12810, 12820, 12835, 12844, 12855, 12875, 12897, 12920, 12928, 12935,
-   12942, 12948, 12957, 12963, 12972, 12973, 12977, 12978, 12982, 12983,
-   12987, 12993, 13002, 13003, 13010, 13030, 13050, 13068, 13081, 13098,
-   13114, 13115, 13116, 13125, 13129, 13130, 13141, 13143, 13147, 13152,
-   13157, 13165, 13170, 13175, 13183, 13189, 13198, 13205, 13206, 13210,
-   13214, 13215, 13219, 13224, 13234, 13239, 13248, 13249, 13252, 13254,
-   13258, 13262, 13267, 13272, 13276, 13282, 13291, 13292, 13300, 13304,
-   13318, 13322, 13331, 13348, 13349, 13353, 13360, 13372, 13380, 13381,
-   13387, 13400, 13410, 13423, 13425, 13429, 13430, 13434, 13435, 13436,
-   13440, 13446, 13448, 13452, 13453, 13457, 13458, 13462, 13463, 13464,
-   13465, 13466, 13467, 13468, 13469, 13470, 13474, 13475, 13487, 13493,
-   13500, 13507, 13514, 13521, 13528, 13535, 13542, 13549, 13556, 13573,
-   13580, 13587, 13594, 13601, 13609, 13626, 13633, 13640, 13647, 13654,
-   13661, 13672, 13679, 13686, 13693, 13700, 13707, 13714, 13721, 13725,
-   13729, 13736, 13743, 13750, 13757, 13764, 13773, 13780, 13787, 13794,
-   13801, 13808, 13815, 13822, 13829, 13836, 13837, 13841, 13842, 13845,
-   13847, 13851, 13852, 13856, 13857, 13861, 13862, 13866, 13867, 13868,
-   13869, 13873, 13874, 13878, 13879, 13883, 13884, 13888, 13889, 13890,
-   13895, 13902, 13909, 13910, 13911, 13912, 13913, 13914, 13921, 13922,
-   13927, 13930, 13946, 13964, 13974, 13975, 13980, 13988, 13987, 14000,
-   13999, 14013, 14017, 14018, 14031, 14030, 14053, 14054, 14059, 14061,
-   14063, 14065, 14067, 14069, 14075, 14077, 14079, 14081, 14083, 14085,
-   14090, 14091, 14096, 14095, 14102, 14112, 14113, 14118, 14123, 14133,
-   14132, 14144, 14143, 14151, 14150, 14170, 14171, 14175, 14176, 14191,
-   14190, 14201, 14205, 14209, 14223, 14235, 14236, 14237, 14243, 14254,
-   14293, 14294, 14298, 14299, 14303, 14304, 14305, 14309, 14310, 14314,
-   14315, 14319, 14320, 14324, 14329, 14333, 14338, 14344, 14349, 14357,
-   14358, 14362, 14367, 14371, 14376, 14384, 14385, 14389, 14390, 14394,
-   14395, 14399, 14400, 14401, 14405, 14411, 14420, 14421, 14428, 14429,
-   14433, 14441, 14461, 14482, 14487, 14493, 14498, 14506, 14513, 14520,
-   14530, 14549, 14550, 14551, 14561, 14562, 14566, 14581, 14582, 14583,
-   14584, 14588, 14592, 14596, 14600, 14604, 14611, 14612, 14616, 14617,
-   14621, 14632, 14633, 14634, 14639, 14643, 14647, 14654, 14655, 14664,
-   14665, 14669, 14673, 14683, 14690, 14697, 14701, 14705, 14709, 14713,
-   14717, 14726, 14732, 14743, 14749, 14760, 14761, 14791, 14804, 14817,
-   14833, 14849, 14866, 14870, 14871, 14878, 14894, 14895, 14906, 14907,
-   14917, 14918, 14929, 14930, 14940, 14941, 14942, 14946, 14947, 14948,
-   14952, 14957, 14965, 14969, 14983, 14988, 14996, 15020, 15021, 15022,
-   15023, 15024, 15031, 15032, 15033, 15040, 15041, 15042, 15043, 15044,
-   15045, 15046, 15047, 15048, 15049, 15050, 15051, 15052, 15053, 15054,
-   15055, 15056, 15057, 15058, 15059, 15060, 15061, 15062, 15063, 15064,
-   15065, 15066, 15067, 15068, 15069, 15070, 15071, 15072, 15073, 15074,
-   15089, 15090, 15091, 15098, 15099, 15100, 15101, 15102, 15103, 15104,
-   15105, 15106, 15114, 15115, 15116, 15117, 15118, 15119, 15120, 15121,
-   15122, 15123, 15124, 15125, 15126, 15127, 15128, 15129, 15130, 15131,
-   15132, 15133, 15134, 15135, 15136, 15137, 15138, 15139, 15140, 15141,
-   15142, 15143, 15144, 15145, 15146, 15147, 15148, 15149, 15150, 15151,
-   15152, 15153, 15154, 15155, 15156, 15157, 15158, 15159, 15160, 15161,
-   15162, 15163, 15164, 15165, 15166, 15167, 15168, 15169, 15170, 15171,
-   15172, 15173, 15174, 15175, 15176, 15177, 15178, 15179, 15180, 15181,
-   15182, 15183, 15184, 15185, 15186, 15187, 15188, 15189, 15190, 15191,
-   15192, 15193, 15194, 15195, 15196, 15197, 15198, 15199, 15200, 15201,
-   15202, 15203, 15204, 15205, 15206, 15207, 15208, 15209, 15210, 15211,
-   15212, 15213, 15214, 15215, 15216, 15217, 15218, 15219, 15220, 15221,
-   15222, 15223, 15224, 15225, 15226, 15227, 15228, 15229, 15230, 15231,
-   15232, 15233, 15234, 15235, 15236, 15237, 15238, 15239, 15240, 15241,
-   15242, 15243, 15244, 15245, 15246, 15247, 15248, 15249, 15250, 15251,
-   15252, 15253, 15254, 15255, 15256, 15257, 15258, 15259, 15260, 15261,
-   15262, 15263, 15264, 15265, 15266, 15267, 15268, 15269, 15270, 15271,
-   15272, 15273, 15274, 15275, 15276, 15277, 15278, 15279, 15280, 15281,
-   15282, 15283, 15284, 15285, 15286, 15287, 15288, 15289, 15290, 15291,
-   15292, 15293, 15294, 15295, 15296, 15297, 15298, 15299, 15300, 15301,
-   15302, 15303, 15304, 15305, 15306, 15307, 15308, 15309, 15310, 15311,
-   15312, 15313, 15314, 15315, 15316, 15317, 15318, 15319, 15320, 15321,
-   15322, 15323, 15324, 15325, 15326, 15327, 15328, 15329, 15330, 15331,
-   15332, 15333, 15334, 15335, 15336, 15337, 15338, 15339, 15340, 15341,
-   15342, 15343, 15344, 15345, 15346, 15347, 15348, 15349, 15350, 15351,
-   15352, 15353, 15354, 15355, 15356, 15357, 15358, 15359, 15360, 15361,
-   15362, 15363, 15364, 15365, 15366, 15367, 15368, 15369, 15370, 15371,
-   15372, 15373, 15374, 15375, 15376, 15377, 15378, 15379, 15380, 15381,
-   15382, 15383, 15384, 15385, 15386, 15387, 15388, 15389, 15390, 15391,
-   15392, 15393, 15394, 15395, 15396, 15397, 15398, 15399, 15400, 15401,
-   15402, 15403, 15404, 15405, 15406, 15407, 15408, 15409, 15410, 15411,
-   15412, 15413, 15414, 15415, 15416, 15417, 15418, 15419, 15420, 15421,
-   15422, 15423, 15424, 15425, 15426, 15427, 15428, 15429, 15430, 15431,
-   15432, 15433, 15434, 15435, 15436, 15437, 15438, 15439, 15440, 15441,
-   15442, 15443, 15444, 15445, 15446, 15447, 15448, 15449, 15450, 15451,
-   15452, 15453, 15454, 15455, 15456, 15457, 15458, 15459, 15460, 15461,
-   15462, 15463, 15464, 15465, 15466, 15467, 15468, 15469, 15470, 15471,
-   15472, 15473, 15474, 15475, 15476, 15477, 15478, 15479, 15480, 15481,
-   15482, 15483, 15484, 15485, 15486, 15487, 15488, 15489, 15490, 15491,
-   15492, 15493, 15494, 15495, 15496, 15497, 15498, 15499, 15500, 15501,
-   15502, 15503, 15504, 15505, 15506, 15507, 15508, 15509, 15510, 15511,
-   15512, 15513, 15514, 15515, 15516, 15517, 15518, 15519, 15520, 15521,
-   15522, 15523, 15524, 15525, 15526, 15527, 15528, 15540, 15541, 15542,
-   15554, 15555, 15556, 15557, 15566, 15567, 15568, 15569, 15570, 15581,
-   15590, 15594, 15598, 15602, 15609, 15617, 15625, 15637, 15641, 15646,
-   15651, 15656, 15661, 15666, 15674, 15675, 15679, 15683, 15690, 15696,
-   15705, 15710, 15717, 15727, 15728, 15733, 15737, 15745, 15749, 15753,
-   15754, 15755, 15756, 15757, 15761, 15762, 15763, 15764, 15768, 15769,
-   15770, 15771, 15775, 15776, 15777, 15778, 15779, 15780, 15785, 15793,
-   15799, 15803, 15808, 15812, 15819, 15823, 15830, 15834, 15838, 15845,
-   15849, 15856, 15863, 15864, 15868, 15875, 15876, 15880, 15881, 15885,
-   15886, 15887, 15888, 15892, 15893, 15894, 15898, 15902, 15906, 15910,
-   15920, 15919, 15932, 15942, 15943, 15947, 15948, 15952, 15980, 15981,
-   15982, 15987, 15992, 15991, 16004, 16015, 16023, 16030, 16037, 16053,
-   16057, 16061, 16064, 16067, 16082, 16097, 16107, 16111, 16115, 16124,
-   16135, 16151, 16152, 16156, 16157, 16158, 16159, 16163, 16164, 16165,
-   16166, 16167, 16173, 16178, 16194, 16193, 16212, 16217, 16228, 16233,
-   16250, 16249, 16266, 16279, 16280, 16281, 16282, 16285, 16287, 16291,
-   16297, 16306, 16313, 16315, 16317, 16319, 16321, 16323, 16325, 16327,
-   16329, 16331, 16333, 16335, 16337, 16339, 16341, 16343, 16345, 16350,
-   16352, 16366, 16368, 16370, 16372, 16374, 16376, 16378, 16380, 16382,
-   16384, 16386, 16388, 16390, 16392, 16397, 16398, 16401, 16403, 16407,
-   16408, 16412, 16422, 16432, 16445, 16459, 16471, 16483, 16495, 16512,
-   16518, 16527, 16533, 16542, 16543, 16547, 16548, 16551, 16562, 16573,
-   16584, 16597, 16611, 16623, 16634, 16648, 16666, 16677, 16688, 16702,
-   16713, 16727, 16742, 16755, 16766, 16771, 16779, 16784, 16792, 16793,
-   16797, 16803, 16811, 16813, 16817, 16821, 16825, 16832, 16833, 16838,
-   16839, 16843, 16844, 16848, 16853, 16855, 16860, 16861, 16869, 16868,
-   16878, 16879, 16884, 16885, 16886, 16891, 16892, 16893, 16897, 16898,
-   16902, 16914, 16923, 16933, 16942, 16956, 16957, 16958, 16962, 16966,
-   16970, 16977, 16978, 16979, 16980, 16981, 16982, 16983, 16989, 17000,
-   17009, 17011, 17013, 17018, 17019, 17020, 17021, 17022, 17026, 17027,
-   17028, 17029, 17030, 17031, 17041, 17042, 17047, 17060, 17073, 17075,
-   17077, 17082, 17087, 17089, 17091, 17097, 17098, 17100, 17106, 17105,
-   17145, 17196, 17197, 17198, 17199, 17209, 17211, 17217, 17222, 17240,
-   17230, 17307, 17325, 17349, 17373, 17379, 17420, 17346, 17487, 17507,
-   17512, 17520, 17485, 17541, 17546, 17551, 17556, 17561, 17566, 17574,
-   17575, 17578, 17587, 17597, 17615, 17616, 17620, 17621, 17622, 17626,
-   17627, 17632, 17633, 17635, 17640, 17646, 17655, 17661, 17670, 17676,
-   17685, 17702, 17711, 17734, 17738, 17746, 17749, 17753, 17760, 17761,
-   17766, 17772, 17776, 17783, 17793, 17800, 17813, 17814, 17818, 17819,
-   17827, 17828, 17833, 17841, 17842, 17847
+       0,  2177,  2177,  2178,  2183,  2193,  2211,  2215,  2223,  2236,
+    2235,  2260,  2267,  2269,  2273,  2274,  2279,  2280,  2281,  2282,
+    2283,  2284,  2285,  2286,  2287,  2288,  2289,  2290,  2291,  2292,
+    2293,  2294,  2295,  2296,  2297,  2298,  2299,  2300,  2301,  2302,
+    2303,  2304,  2305,  2306,  2307,  2308,  2309,  2310,  2311,  2312,
+    2313,  2314,  2315,  2316,  2317,  2318,  2319,  2320,  2321,  2322,
+    2323,  2324,  2325,  2326,  2327,  2328,  2329,  2330,  2331,  2332,
+    2333,  2334,  2335,  2336,  2337,  2338,  2339,  2340,  2341,  2342,
+    2343,  2344,  2345,  2346,  2347,  2348,  2349,  2350,  2351,  2352,
+    2353,  2354,  2355,  2356,  2357,  2358,  2359,  2360,  2361,  2362,
+    2363,  2364,  2365,  2366,  2367,  2368,  2369,  2370,  2371,  2372,
+    2373,  2374,  2375,  2376,  2377,  2378,  2379,  2380,  2381,  2382,
+    2383,  2384,  2385,  2386,  2387,  2388,  2389,  2390,  2391,  2392,
+    2393,  2394,  2395,  2396,  2397,  2398,  2399,  2400,  2401,  2402,
+    2403,  2404,  2405,  2406,  2407,  2408,  2409,  2410,  2411,  2412,
+    2413,  2417,  2427,  2428,  2432,  2452,  2459,  2470,  2469,  2480,
+    2482,  2486,  2487,  2491,  2504,  2503,  2522,  2527,  2532,  2531,
+    2548,  2547,  2565,  2566,  2569,  2576,  2583,  2590,  2597,  2604,
+    2612,  2621,  2627,  2634,  2641,  2649,  2658,  2664,  2670,  2678,
+    2686,  2692,  2699,  2706,  2714,  2726,  2732,  2739,  2746,  2754,
+    2764,  2765,  2769,  2775,  2779,  2784,  2788,  2794,  2798,  2803,
+    2807,  2812,  2816,  2821,  2825,  2830,  2834,  2839,  2843,  2848,
+    2852,  2857,  2861,  2866,  2870,  2875,  2879,  2884,  2888,  2893,
+    2897,  2902,  2906,  2911,  2915,  2920,  2924,  2929,  2933,  2938,
+    2942,  2947,  2951,  2956,  2960,  2965,  2969,  2974,  2978,  2983,
+    2987,  2992,  2996,  3000,  3004,  3008,  3012,  3022,  3026,  3030,
+    3035,  3046,  3051,  3055,  3059,  3063,  3064,  3068,  3072,  3076,
+    3081,  3085,  3089,  3093,  3099,  3133,  3137,  3141,  3145,  3151,
+    3152,  3168,  3169,  3185,  3186,  3203,  3206,  3208,  3209,  3213,
+    3219,  3225,  3234,  3238,  3242,  3249,  3253,  3257,  3271,  3276,
+    3284,  3289,  3293,  3298,  3302,  3306,  3322,  3326,  3337,  3338,
+    3343,  3353,  3363,  3368,  3376,  3383,  3396,  3395,  3410,  3412,
+    3425,  3445,  3464,  3484,  3501,  3506,  3515,  3520,  3532,  3544,
+    3558,  3574,  3578,  3585,  3594,  3602,  3613,  3614,  3618,  3622,
+    3626,  3630,  3634,  3639,  3643,  3651,  3650,  3682,  3681,  3690,
+    3699,  3700,  3706,  3712,  3722,  3728,  3736,  3738,  3747,  3748,
+    3752,  3758,  3767,  3768,  3776,  3776,  3834,  3835,  3836,  3837,
+    3838,  3839,  3840,  3841,  3842,  3843,  3844,  3845,  3846,  3850,
+    3864,  3883,  3884,  3888,  3889,  3894,  3896,  3898,  3900,  3902,
+    3904,  3906,  3912,  3913,  3914,  3918,  3922,  3929,  3936,  3937,
+    3944,  3946,  3950,  3951,  3955,  4006,  4008,  4012,  4013,  4017,
+    4067,  4068,  4069,  4070,  4074,  4075,  4079,  4080,  4085,  4088,
+    4112,  4211,  4229,  4228,  4307,  4303,  4380,  4381,  4386,  4388,
+    4393,  4416,  4427,  4431,  4453,  4454,  4458,  4462,  4475,  4481,
+    4487,  4496,  4509,  4535,  4541,  4542,  4548,  4549,  4554,  4560,
+    4573,  4575,  4595,  4601,  4603,  4605,  4607,  4609,  4611,  4613,
+    4615,  4617,  4619,  4621,  4623,  4628,  4642,  4659,  4660,  4662,
+    4667,  4673,  4682,  4688,  4697,  4705,  4733,  4741,  4743,  4752,
+    4757,  4763,  4772,  4780,  4782,  4784,  4786,  4788,  4790,  4792,
+    4794,  4796,  4798,  4800,  4802,  4804,  4809,  4829,  4853,  4857,
+    4865,  4866,  4867,  4868,  4869,  4870,  4871,  4872,  4873,  4874,
+    4875,  4876,  4877,  4882,  4881,  4892,  4892,  4957,  4956,  5013,
+    5013,  5035,  5092,  5139,  5163,  5162,  5187,  5209,  5211,  5212,
+    5216,  5234,  5255,  5263,  5301,  5255,  5329,  5331,  5332,  5336,
+    5337,  5342,  5352,  5341,  5404,  5403,  5417,  5418,  5422,  5423,
+    5428,  5436,  5427,  5486,  5494,  5485,  5540,  5553,  5558,  5557,
+    5595,  5596,  5601,  5600,  5634,  5634,  5653,  5652,  5700,  5715,
+    5723,  5714,  5781,  5789,  5778,  5831,  5833,  5838,  5840,  5842,
+    5857,  5858,  5865,  5866,  5873,  5874,  5878,  5884,  5893,  5894,
+    5895,  5896,  5897,  5898,  5899,  5900,  5901,  5902,  5903,  5907,
+    5908,  5912,  5918,  5927,  5928,  5929,  5930,  5931,  5932,  5933,
+    5937,  5938,  5942,  5948,  5957,  5961,  5962,  5966,  5972,  5981,
+    5982,  5983,  5984,  5985,  5986,  5987,  5991,  5992,  5996,  6002,
+    6011,  6012,  6013,  6017,  6021,  6022,  6026,  6030,  6037,  6044,
+    6048,  6055,  6062,  6069,  6076,  6083,  6090,  6097,  6104,  6108,
+    6115,  6122,  6129,  6130,  6205,  6211,  6215,  6220,  6225,  6231,
+    6239,  6249,  6250,  6264,  6272,  6276,  6280,  6284,  6288,  6292,
+    6299,  6300,  6305,  6306,  6324,  6325,  6337,  6338,  6343,  6352,
+    6353,  6358,  6364,  6374,  6375,  6387,  6388,  6392,  6398,  6407,
+    6416,  6419,  6424,  6432,  6433,  6437,  6441,  6448,  6455,  6465,
+    6464,  6482,  6488,  6497,  6498,  6503,  6504,  6508,  6514,  6523,
+    6530,  6531,  6535,  6541,  6550,  6552,  6554,  6556,  6558,  6560,
+    6562,  6564,  6573,  6574,  6578,  6579,  6600,  6601,  6605,  6606,
+    6610,  6615,  6620,  6635,  6636,  6640,  6646,  6655,  6661,  6669,
+    6671,  6675,  6679,  6683,  6687,  6691,  6695,  6708,  6712,  6716,
+    6720,  6724,  6728,  6732,  6736,  6740,  6758,  6762,  6766,  6770,
+    6774,  6778,  6782,  6786,  6790,  6794,  6798,  6802,  6806,  6810,
+    6814,  6818,  6832,  6836,  6840,  6844,  6851,  6865,  6869,  6873,
+    6877,  6881,  6882,  6883,  6884,  6885,  6886,  6890,  6891,  6892,
+    6896,  6897,  6898,  6899,  6903,  6909,  6918,  6919,  6923,  6930,
+    6931,  6939,  6945,  6951,  6956,  6966,  6974,  6982,  6986,  6987,
+    6991,  6992,  6996,  6997,  7001,  7005,  7009,  7030,  7032,  7036,
+    7037,  7038,  7042,  7046,  7050,  7054,  7058,  7062,  7066,  7070,
+    7075,  7080,  7089,  7098,  7102,  7106,  7111,  7120,  7124,  7147,
+    7151,  7155,  7159,  7163,  7167,  7171,  7172,  7176,  7180,  7184,
+    7189,  7194,  7199,  7204,  7209,  7213,  7217,  7222,  7226,  7233,
+    7235,  7237,  7239,  7241,  7243,  7245,  7247,  7252,  7253,  7257,
+    7258,  7262,  7263,  7264,  7265,  7266,  7270,  7271,  7272,  7273,
+    7274,  7278,  7283,  7287,  7289,  7293,  7294,  7295,  7296,  7301,
+    7305,  7314,  7318,  7323,  7327,  7336,  7337,  7341,  7342,  7343,
+    7351,  7352,  7356,  7360,  7364,  7365,  7366,  7375,  7376,  7377,
+    7378,  7381,  7382,  7387,  7391,  7395,  7396,  7400,  7419,  7438,
+    7442,  7446,  7450,  7454,  7458,  7462,  7466,  7470,  7474,  7478,
+    7482,  7486,  7490,  7494,  7498,  7507,  7512,  7525,  7529,  7533,
+    7540,  7541,  7542,  7546,  7547,  7548,  7552,  7558,  7562,  7566,
+    7567,  7571,  7580,  7584,  7585,  7589,  7598,  7602,  7603,  7607,
+    7613,  7617,  7618,  7622,  7623,  7628,  7629,  7633,  7640,  7648,
+    7654,  7664,  7668,  7673,  7678,  7683,  7690,  7696,  7707,  7708,
+    7716,  7715,  7727,  7729,  7733,  7748,  7749,  7753,  7760,  7770,
+    7771,  7772,  7773,  7778,  7782,  7787,  7792,  7798,  7807,  7808,
+    7809,  7810,  7811,  7815,  7816,  7820,  7821,  7825,  7826,  7830,
+    7831,  7832,  7836,  7837,  7841,  7842,  7846,  7852,  7861,  7862,
+    7876,  7877,  7881,  7887,  7896,  7900,  7901,  7905,  7911,  7920,
+    7921,  7926,  7927,  7931,  7935,  7939,  7963,  7964,  7965,  7969,
+    7970,  7974,  7975,  7979,  7980,  7984,  7985,  7986,  7990,  7996,
+    8006,  8012,  8027,  8033,  8043,  8044,  8053,  8054,  8058,  8059,
+    8063,  8069,  8081,  8091,  8105,  8104,  8125,  8124,  8146,  8145,
+    8167,  8166,  8185,  8179,  8202,  8201,  8237,  8259,  8278,  8298,
+    8306,  8328,  8352,  8363,  8366,  8378,  8390,  8395,  8407,  8419,
+    8430,  8437,  8445,  8446,  8450,  8460,  8470,  8475,  8482,  8491,
+    8492,  8496,  8497,  8501,  8507,  8513,  8521,  8536,  8544,  8552,
+    8559,  8566,  8573,  8580,  8586,  8592,  8598,  8610,  8622,  8631,
+    8632,  8636,  8637,  8641,  8647,  8653,  8659,  8668,  8681,  8682,
+    8683,  8684,  8688,  8689,  8701,  8702,  8706,  8707,  8711,  8712,
+    8727,  8732,  8740,  8744,  8752,  8756,  8761,  8762,  8771,  8775,
+    8786,  8790,  8794,  8798,  8802,  8807,  8812,  8817,  8822,  8829,
+    8833,  8837,  8841,  8846,  8851,  8856,  8861,  8865,  8872,  8873,
+    8877,  8881,  8888,  8889,  8897,  8904,  8909,  8913,  8918,  8929,
+    8930,  8938,  8942,  8946,  8950,  8954,  8958,  8963,  8967,  8971,
+    8975,  8979,  8983,  8987,  8991,  8995,  8999,  9004,  9008,  9012,
+    9016,  9020,  9024,  9028,  9032,  9036,  9042,  9046,  9053,  9058,
+    9063,  9071,  9072,  9077,  9082,  9088,  9097,  9101,  9105,  9122,
+    9126,  9130,  9146,  9148,  9152,  9153,  9157,  9158,  9159,  9163,
+    9164,  9165,  9169,  9170,  9171,  9172,  9176,  9177,  9185,  9193,
+    9195,  9199,  9200,  9204,  9205,  9206,  9210,  9222,  9235,  9242,
+    9243,  9247,  9262,  9277,  9261,  9301,  9318,  9321,  9328,  9332,
+    9339,  9343,  9347,  9354,  9357,  9364,  9367,  9374,  9377,  9384,
+    9387,  9395,  9398,  9405,  9409,  9416,  9420,  9428,  9432,  9457,
+    9458,  9459,  9464,  9469,  9476,  9490,  9491,  9492,  9496,  9505,
+    9506,  9510,  9511,  9519,  9520,  9521,  9525,  9535,  9536,  9555,
+    9560,  9567,  9577,  9585,  9593,  9594,  9598,  9599,  9607,  9609,
+    9611,  9613,  9615,  9617,  9622,  9629,  9630,  9631,  9636,  9635,
+    9641,  9648,  9653,  9661,  9662,  9666,  9679,  9683,  9692,  9698,
+    9707,  9714,  9715,  9719,  9724,  9731,  9737,  9746,  9753,  9760,
+    9761,  9771,  9772,  9776,  9780,  9785,  9789,  9825,  9829,  9833,
+    9837,  9841,  9880,  9886,  9893,  9899,  9906,  9911,  9917,  9925,
+    9929,  9933,  9937,  9941,  9949,  9950,  9951,  9958,  9963,  9967,
+    9979, 10001, 10025, 10026, 10030, 10034, 10035, 10039, 10045, 10054,
+   10061, 10073, 10076, 10080, 10085, 10089, 10093, 10102, 10108, 10117,
+   10121, 10125, 10132, 10133, 10137, 10141, 10142, 10146, 10147, 10151,
+   10157, 10163, 10173, 10174, 10182, 10183, 10184, 10185, 10186, 10190,
+   10191, 10196, 10202, 10207, 10213, 10217, 10221, 10225, 10229, 10233,
+   10237, 10241, 10245, 10249, 10253, 10257, 10270, 10274, 10278, 10283,
+   10287, 10294, 10298, 10307, 10311, 10315, 10319, 10327, 10331, 10335,
+   10340, 10345, 10353, 10361, 10365, 10366, 10370, 10374, 10378, 10382,
+   10386, 10390, 10394, 10398, 10402, 10406, 10410, 10414, 10418, 10422,
+   10426, 10430, 10431, 10435, 10436, 10443, 10444, 10448, 10449, 10453,
+   10454, 10455, 10456, 10457, 10458, 10459, 10463, 10464, 10468, 10469,
+   10470, 10471, 10472, 10473, 10477, 10478, 10479, 10480, 10481, 10482,
+   10486, 10490, 10494, 10498, 10502, 10506, 10507, 10511, 10515, 10519,
+   10523, 10527, 10532, 10536, 10540, 10548, 10552, 10556, 10560, 10564,
+   10568, 10573, 10580, 10591, 10592, 10602, 10606, 10610, 10614, 10618,
+   10622, 10626, 10630, 10634, 10638, 10645, 10649, 10653, 10657, 10661,
+   10665, 10669, 10673, 10677, 10682, 10687, 10692, 10696, 10700, 10704,
+   10708, 10713, 10717, 10736, 10740, 10744, 10748, 10752, 10757, 10762,
+   10766, 10770, 10775, 10779, 10783, 10787, 10791, 10795, 10799, 10803,
+   10808, 10812, 10816, 10820, 10824, 10835, 10838, 10849, 10853, 10857,
+   10861, 10865, 10869, 10873, 10877, 10881, 10885, 10889, 10893, 10897,
+   10901, 10905, 10909, 10913, 10917, 10921, 10925, 10929, 10933, 10937,
+   10941, 10947, 10953, 10959, 10965, 10971, 10975, 10993, 10997, 11004,
+   11006, 11019, 11020, 11024, 11025, 11029, 11030, 11034, 11040, 11049,
+   11056, 11057, 11061, 11065, 11069, 11073, 11077, 11087, 11097, 11101,
+   11105, 11109, 11113, 11117, 11121, 11130, 11134, 11138, 11142, 11146,
+   11150, 11154, 11158, 11162, 11166, 11176, 11180, 11184, 11188, 11192,
+   11196, 11200, 11211, 11222, 11226, 11230, 11243, 11247, 11259, 11260,
+   11264, 11265, 11266, 11271, 11274, 11282, 11285, 11289, 11298, 11301,
+   11305, 11313, 11316, 11323, 11330, 11334, 11341, 11348, 11355, 11376,
+   11379, 11387, 11390, 11398, 11401, 11409, 11412, 11421, 11426, 11433,
+   11437, 11441, 11445, 11449, 11456, 11463, 11467, 11471, 11475, 11479,
+   11487, 11490, 11494, 11498, 11502, 11508, 11509, 11510, 11514, 11521,
+   11525, 11532, 11536, 11543, 11544, 11549, 11554, 11558, 11559, 11563,
+   11568, 11578, 11585, 11592, 11611, 11619, 11626, 11633, 11640, 11647,
+   11654, 11661, 11668, 11675, 11682, 11689, 11697, 11704, 11711, 11718,
+   11725, 11732, 11739, 11746, 11756, 11757, 11761, 11767, 11776, 11777,
+   11781, 11787, 11796, 11797, 11801, 11802, 11806, 11814, 11823, 11824,
+   11825, 11838, 11839, 11920, 11924, 11929, 11933, 11937, 11947, 11954,
+   11955, 11956, 11960, 11961, 11962, 11963, 11966, 11967, 11970, 11972,
+   11975, 11977, 11985, 11986, 11990, 12019, 12020, 12021, 12022, 12024,
+   12026, 12030, 12031, 12040, 12041, 12045, 12052, 12053, 12057, 12070,
+   12081, 12097, 12104, 12110, 12119, 12123, 12133, 12140, 12143, 12154,
+   12158, 12163, 12168, 12177, 12178, 12189, 12192, 12195, 12199, 12203,
+   12211, 12214, 12215, 12216, 12220, 12221, 12225, 12231, 12240, 12241,
+   12249, 12250, 12254, 12259, 12265, 12269, 12275, 12284, 12290, 12298,
+   12302, 12311, 12323, 12324, 12325, 12326, 12327, 12328, 12329, 12330,
+   12331, 12332, 12333, 12334, 12338, 12339, 12340, 12341, 12342, 12343,
+   12344, 12345, 12346, 12350, 12351, 12352, 12353, 12356, 12358, 12362,
+   12363, 12366, 12368, 12372, 12373, 12377, 12381, 12382, 12389, 12393,
+   12400, 12405, 12414, 12431, 12439, 12446, 12452, 12462, 12465, 12472,
+   12478, 12487, 12501, 12502, 12509, 12514, 12525, 12526, 12541, 12546,
+   12556, 12563, 12564, 12568, 12575, 12580, 12590, 12591, 12595, 12596,
+   12600, 12601, 12605, 12612, 12618, 12624, 12633, 12637, 12641, 12645,
+   12649, 12656, 12657, 12661, 12662, 12663, 12664, 12665, 12666, 12670,
+   12671, 12672, 12673, 12674, 12678, 12679, 12680, 12681, 12682, 12686,
+   12687, 12688, 12689, 12690, 12694, 12699, 12700, 12704, 12710, 12719,
+   12723, 12730, 12737, 12743, 12747, 12755, 12768, 12784, 12793, 12803,
+   12826, 12861, 12868, 12883, 12893, 12908, 12917, 12928, 12948, 12970,
+   12993, 13001, 13008, 13015, 13021, 13030, 13036, 13045, 13046, 13050,
+   13051, 13055, 13056, 13060, 13066, 13075, 13076, 13083, 13103, 13123,
+   13141, 13154, 13171, 13187, 13188, 13189, 13198, 13202, 13203, 13214,
+   13216, 13220, 13225, 13230, 13238, 13243, 13248, 13256, 13262, 13271,
+   13278, 13279, 13283, 13287, 13288, 13292, 13297, 13307, 13312, 13321,
+   13322, 13325, 13327, 13331, 13335, 13340, 13345, 13349, 13355, 13364,
+   13365, 13373, 13377, 13391, 13395, 13404, 13421, 13422, 13426, 13433,
+   13445, 13453, 13454, 13460, 13473, 13483, 13496, 13498, 13502, 13503,
+   13507, 13508, 13509, 13513, 13519, 13521, 13525, 13526, 13530, 13531,
+   13535, 13536, 13537, 13538, 13539, 13540, 13541, 13542, 13543, 13547,
+   13548, 13560, 13566, 13573, 13580, 13587, 13594, 13601, 13608, 13615,
+   13622, 13629, 13646, 13653, 13660, 13667, 13674, 13682, 13699, 13706,
+   13713, 13720, 13727, 13734, 13745, 13752, 13759, 13766, 13773, 13780,
+   13787, 13794, 13798, 13802, 13809, 13816, 13823, 13830, 13837, 13846,
+   13853, 13860, 13867, 13874, 13881, 13888, 13895, 13902, 13909, 13910,
+   13914, 13915, 13918, 13920, 13924, 13925, 13929, 13930, 13934, 13935,
+   13939, 13940, 13941, 13942, 13946, 13947, 13951, 13952, 13956, 13957,
+   13961, 13962, 13963, 13968, 13975, 13982, 13983, 13984, 13985, 13986,
+   13987, 13994, 13995, 14000, 14003, 14019, 14037, 14047, 14048, 14053,
+   14061, 14060, 14073, 14072, 14086, 14090, 14091, 14104, 14103, 14126,
+   14127, 14132, 14134, 14136, 14138, 14140, 14142, 14148, 14150, 14152,
+   14154, 14156, 14158, 14163, 14164, 14169, 14168, 14175, 14185, 14186,
+   14191, 14196, 14206, 14205, 14217, 14216, 14224, 14223, 14243, 14244,
+   14248, 14249, 14264, 14263, 14274, 14278, 14282, 14296, 14308, 14309,
+   14310, 14316, 14327, 14366, 14367, 14371, 14372, 14376, 14377, 14378,
+   14382, 14383, 14387, 14388, 14392, 14393, 14397, 14402, 14406, 14411,
+   14417, 14422, 14430, 14431, 14435, 14440, 14444, 14449, 14457, 14458,
+   14462, 14463, 14467, 14468, 14472, 14473, 14474, 14478, 14484, 14493,
+   14494, 14501, 14502, 14506, 14514, 14534, 14555, 14560, 14566, 14571,
+   14579, 14586, 14593, 14603, 14622, 14623, 14624, 14634, 14635, 14639,
+   14654, 14655, 14656, 14657, 14661, 14665, 14669, 14673, 14677, 14684,
+   14685, 14689, 14690, 14694, 14705, 14706, 14707, 14712, 14716, 14720,
+   14727, 14728, 14737, 14738, 14742, 14746, 14756, 14763, 14770, 14774,
+   14778, 14782, 14786, 14790, 14799, 14805, 14816, 14822, 14833, 14834,
+   14864, 14877, 14890, 14906, 14922, 14939, 14943, 14944, 14951, 14967,
+   14968, 14979, 14980, 14990, 14991, 15002, 15003, 15013, 15014, 15015,
+   15019, 15020, 15021, 15025, 15030, 15038, 15042, 15055, 15060, 15068,
+   15092, 15093, 15094, 15095, 15096, 15103, 15104, 15105, 15112, 15113,
+   15114, 15115, 15116, 15117, 15118, 15119, 15120, 15121, 15122, 15123,
+   15124, 15125, 15126, 15127, 15128, 15129, 15130, 15131, 15132, 15133,
+   15134, 15135, 15136, 15137, 15138, 15139, 15140, 15141, 15142, 15143,
+   15144, 15145, 15146, 15161, 15162, 15163, 15170, 15171, 15172, 15173,
+   15174, 15175, 15176, 15177, 15178, 15186, 15187, 15188, 15189, 15190,
+   15191, 15192, 15193, 15194, 15195, 15196, 15197, 15198, 15199, 15200,
+   15201, 15202, 15203, 15204, 15205, 15206, 15207, 15208, 15209, 15210,
+   15211, 15212, 15213, 15214, 15215, 15216, 15217, 15218, 15219, 15220,
+   15221, 15222, 15223, 15224, 15225, 15226, 15227, 15228, 15229, 15230,
+   15231, 15232, 15233, 15234, 15235, 15236, 15237, 15238, 15239, 15240,
+   15241, 15242, 15243, 15244, 15245, 15246, 15247, 15248, 15249, 15250,
+   15251, 15252, 15253, 15254, 15255, 15256, 15257, 15258, 15259, 15260,
+   15261, 15262, 15263, 15264, 15265, 15266, 15267, 15268, 15269, 15270,
+   15271, 15272, 15273, 15274, 15275, 15276, 15277, 15278, 15279, 15280,
+   15281, 15282, 15283, 15284, 15285, 15286, 15287, 15288, 15289, 15290,
+   15291, 15292, 15293, 15294, 15295, 15296, 15297, 15298, 15299, 15300,
+   15301, 15302, 15303, 15304, 15305, 15306, 15307, 15308, 15309, 15310,
+   15311, 15312, 15313, 15314, 15315, 15316, 15317, 15318, 15319, 15320,
+   15321, 15322, 15323, 15324, 15325, 15326, 15327, 15328, 15329, 15330,
+   15331, 15332, 15333, 15334, 15335, 15336, 15337, 15338, 15339, 15340,
+   15341, 15342, 15343, 15344, 15345, 15346, 15347, 15348, 15349, 15350,
+   15351, 15352, 15353, 15354, 15355, 15356, 15357, 15358, 15359, 15360,
+   15361, 15362, 15363, 15364, 15365, 15366, 15367, 15368, 15369, 15370,
+   15371, 15372, 15373, 15374, 15375, 15376, 15377, 15378, 15379, 15380,
+   15381, 15382, 15383, 15384, 15385, 15386, 15387, 15388, 15389, 15390,
+   15391, 15392, 15393, 15394, 15395, 15396, 15397, 15398, 15399, 15400,
+   15401, 15402, 15403, 15404, 15405, 15406, 15407, 15408, 15409, 15410,
+   15411, 15412, 15413, 15414, 15415, 15416, 15417, 15418, 15419, 15420,
+   15421, 15422, 15423, 15424, 15425, 15426, 15427, 15428, 15429, 15430,
+   15431, 15432, 15433, 15434, 15435, 15436, 15437, 15438, 15439, 15440,
+   15441, 15442, 15443, 15444, 15445, 15446, 15447, 15448, 15449, 15450,
+   15451, 15452, 15453, 15454, 15455, 15456, 15457, 15458, 15459, 15460,
+   15461, 15462, 15463, 15464, 15465, 15466, 15467, 15468, 15469, 15470,
+   15471, 15472, 15473, 15474, 15475, 15476, 15477, 15478, 15479, 15480,
+   15481, 15482, 15483, 15484, 15485, 15486, 15487, 15488, 15489, 15490,
+   15491, 15492, 15493, 15494, 15495, 15496, 15497, 15498, 15499, 15500,
+   15501, 15502, 15503, 15504, 15505, 15506, 15507, 15508, 15509, 15510,
+   15511, 15512, 15513, 15514, 15515, 15516, 15517, 15518, 15519, 15520,
+   15521, 15522, 15523, 15524, 15525, 15526, 15527, 15528, 15529, 15530,
+   15531, 15532, 15533, 15534, 15535, 15536, 15537, 15538, 15539, 15540,
+   15541, 15542, 15543, 15544, 15545, 15546, 15547, 15548, 15549, 15550,
+   15551, 15552, 15553, 15554, 15555, 15556, 15557, 15558, 15559, 15560,
+   15561, 15562, 15563, 15564, 15565, 15566, 15567, 15568, 15569, 15570,
+   15571, 15572, 15573, 15574, 15575, 15576, 15577, 15578, 15579, 15580,
+   15581, 15582, 15583, 15584, 15585, 15586, 15587, 15588, 15589, 15590,
+   15591, 15592, 15593, 15594, 15595, 15596, 15597, 15598, 15599, 15600,
+   15601, 15602, 15603, 15604, 15605, 15606, 15607, 15608, 15609, 15621,
+   15622, 15623, 15635, 15636, 15637, 15638, 15647, 15648, 15649, 15650,
+   15651, 15662, 15671, 15675, 15679, 15683, 15690, 15698, 15706, 15718,
+   15722, 15727, 15732, 15737, 15742, 15747, 15755, 15756, 15760, 15764,
+   15771, 15777, 15786, 15791, 15798, 15808, 15809, 15814, 15818, 15826,
+   15830, 15834, 15835, 15836, 15837, 15838, 15842, 15843, 15844, 15845,
+   15849, 15850, 15851, 15852, 15856, 15857, 15858, 15859, 15860, 15861,
+   15866, 15874, 15880, 15884, 15889, 15893, 15900, 15904, 15911, 15915,
+   15919, 15926, 15930, 15937, 15944, 15945, 15949, 15956, 15957, 15961,
+   15962, 15966, 15967, 15968, 15969, 15973, 15974, 15975, 15979, 15983,
+   15987, 15991, 16001, 16000, 16013, 16023, 16024, 16028, 16029, 16033,
+   16061, 16062, 16063, 16068, 16073, 16072, 16085, 16096, 16104, 16111,
+   16118, 16134, 16138, 16142, 16145, 16148, 16163, 16178, 16188, 16192,
+   16196, 16205, 16216, 16232, 16233, 16237, 16238, 16239, 16240, 16244,
+   16245, 16246, 16247, 16248, 16254, 16259, 16275, 16274, 16293, 16298,
+   16309, 16314, 16331, 16330, 16347, 16360, 16361, 16362, 16363, 16366,
+   16368, 16372, 16378, 16387, 16394, 16396, 16398, 16400, 16402, 16404,
+   16406, 16408, 16410, 16412, 16414, 16416, 16418, 16420, 16422, 16424,
+   16426, 16431, 16433, 16447, 16449, 16451, 16453, 16455, 16457, 16459,
+   16461, 16463, 16465, 16467, 16469, 16471, 16473, 16478, 16479, 16482,
+   16484, 16488, 16489, 16493, 16503, 16513, 16526, 16540, 16552, 16564,
+   16576, 16593, 16599, 16608, 16614, 16623, 16624, 16628, 16629, 16633,
+   16643, 16652, 16666, 16673, 16687, 16696, 16697, 16702, 16711, 16712,
+   16713, 16714, 16715, 16716, 16720, 16733, 16747, 16761, 16775, 16790,
+   16805, 16811, 16817, 16826, 16837, 16848, 16855, 16862, 16873, 16880,
+   16887, 16894, 16902, 16908, 16916, 16933, 16941, 16955, 16966, 16989,
+   17003, 17008, 17016, 17021, 17029, 17030, 17034, 17040, 17048, 17050,
+   17054, 17058, 17062, 17069, 17070, 17075, 17076, 17080, 17081, 17085,
+   17090, 17092, 17097, 17098, 17106, 17105, 17115, 17116, 17121, 17122,
+   17123, 17128, 17129, 17130, 17134, 17135, 17139, 17151, 17160, 17170,
+   17179, 17193, 17194, 17195, 17199, 17203, 17207, 17214, 17215, 17216,
+   17217, 17218, 17219, 17220, 17226, 17237, 17246, 17248, 17250, 17255,
+   17256, 17257, 17258, 17259, 17263, 17264, 17265, 17266, 17267, 17268,
+   17278, 17279, 17284, 17297, 17310, 17312, 17314, 17319, 17324, 17326,
+   17328, 17334, 17335, 17337, 17343, 17342, 17382, 17433, 17434, 17435,
+   17436, 17446, 17448, 17454, 17459, 17477, 17467, 17544, 17562, 17586,
+   17610, 17616, 17657, 17583, 17724, 17744, 17749, 17757, 17722, 17778,
+   17783, 17788, 17793, 17798, 17803, 17811, 17812, 17815, 17824, 17834,
+   17852, 17853, 17857, 17858, 17859, 17863, 17864, 17869, 17870, 17872,
+   17877, 17883, 17892, 17898, 17907, 17913, 17922, 17939, 17948, 17970,
+   17974, 17982, 17985, 17989, 17996, 17997, 18002, 18008, 18012, 18019,
+   18029, 18036, 18049, 18050, 18054, 18055, 18063, 18064, 18069, 18077,
+   18078, 18083
 };
 #endif
 
@@ -3070,17 +3093,19 @@
   "SOURCE_SSL_KEY_SYM", "SOURCE_SSL_VERIFY_SERVER_CERT_SYM",
   "SOURCE_TLS_CIPHERSUITES_SYM", "SOURCE_TLS_VERSION_SYM",
   "SOURCE_USER_SYM", "SOURCE_ZSTD_COMPRESSION_LEVEL_SYM", "ST_COLLECT_SYM",
-  "KEYRING_SYM", "KEYWORD_USED_AS_IDENT", "KEYWORD_USED_AS_KEYWORD",
-  "CONDITIONLESS_JOIN", "'|'", "'&'", "'-'", "'+'", "'*'", "'/'", "'%'",
-  "'^'", "'~'", "SUBQUERY_AS_EXPR", "'('", "')'", "EMPTY_FROM_CLAUSE",
-  "';'", "'@'", "','", "'.'", "':'", "'!'", "'{'", "'}'", "$accept",
-  "start_entry", "sql_statement", "$@1", "opt_end_of_input",
-  "simple_statement_or_begin", "simple_statement", "deallocate",
-  "deallocate_or_drop", "prepare", "prepare_src", "execute", "$@2",
-  "execute_using", "execute_var_list", "execute_var_ident", "help", "$@3",
-  "change_replication_source", "change", "$@4", "$@5", "filter_defs",
-  "filter_def", "opt_filter_db_list", "filter_db_list", "filter_db_ident",
-  "opt_filter_db_pair_list", "filter_db_pair_list",
+  "KEYRING_SYM", "AUTHENTICATION_SYM", "FACTOR_SYM", "FINISH_SYM",
+  "INITIATE_SYM", "REGISTRATION_SYM", "UNREGISTER_SYM", "INITIAL_SYM",
+  "CHALLENGE_RESPONSE_SYM", "GTID_ONLY_SYM", "KEYWORD_USED_AS_IDENT",
+  "KEYWORD_USED_AS_KEYWORD", "CONDITIONLESS_JOIN", "'|'", "'&'", "'-'",
+  "'+'", "'*'", "'/'", "'%'", "'^'", "'~'", "SUBQUERY_AS_EXPR", "'('",
+  "')'", "EMPTY_FROM_CLAUSE", "';'", "'@'", "','", "'.'", "':'", "'!'",
+  "'{'", "'}'", "$accept", "start_entry", "sql_statement", "$@1",
+  "opt_end_of_input", "simple_statement_or_begin", "simple_statement",
+  "deallocate", "deallocate_or_drop", "prepare", "prepare_src", "execute",
+  "$@2", "execute_using", "execute_var_list", "execute_var_ident", "help",
+  "$@3", "change_replication_source", "change", "$@4", "$@5",
+  "filter_defs", "filter_def", "opt_filter_db_list", "filter_db_list",
+  "filter_db_ident", "opt_filter_db_pair_list", "filter_db_pair_list",
   "opt_filter_table_list", "filter_table_list", "filter_table_ident",
   "opt_filter_string_list", "filter_string_list", "filter_string",
   "source_defs", "change_replication_source_auto_position",
@@ -3376,17 +3401,23 @@
   "$@57", "opt_acl_type", "opt_privileges", "role_or_privilege_list",
   "role_or_privilege", "opt_with_admin_option", "opt_and", "require_list",
   "require_list_element", "grant_ident", "user_list", "role_list",
-  "opt_retain_current_password", "opt_discard_old_password", "create_user",
-  "alter_user", "create_user_list", "alter_user_list", "opt_column_list",
-  "column_list", "require_clause", "grant_options", "opt_grant_option",
-  "opt_with_roles", "opt_grant_as", "begin_stmt", "$@58", "opt_work",
-  "opt_chain", "opt_release", "opt_savepoint", "commit", "rollback",
-  "savepoint", "release", "union_option", "row_subquery", "table_subquery",
-  "subquery", "query_spec_option", "init_lex_create_info",
-  "view_or_trigger_or_sp_or_event", "definer_tail", "no_definer_tail",
-  "definer_opt", "no_definer", "definer", "view_replace_or_algorithm",
-  "view_replace", "view_algorithm", "view_suid", "view_tail", "$@59",
-  "view_query_block", "view_check_option", "trigger_action_order",
+  "opt_retain_current_password", "opt_discard_old_password",
+  "opt_user_registration", "create_user", "opt_create_user_with_mfa",
+  "identification", "identified_by_password",
+  "identified_by_random_password", "identified_with_plugin",
+  "identified_with_plugin_as_auth", "identified_with_plugin_by_password",
+  "identified_with_plugin_by_random_password", "opt_initial_auth",
+  "alter_user", "factor", "create_user_list", "alter_user_list",
+  "opt_column_list", "column_list", "require_clause", "grant_options",
+  "opt_grant_option", "opt_with_roles", "opt_grant_as", "begin_stmt",
+  "$@58", "opt_work", "opt_chain", "opt_release", "opt_savepoint",
+  "commit", "rollback", "savepoint", "release", "union_option",
+  "row_subquery", "table_subquery", "subquery", "query_spec_option",
+  "init_lex_create_info", "view_or_trigger_or_sp_or_event", "definer_tail",
+  "no_definer_tail", "definer_opt", "no_definer", "definer",
+  "view_replace_or_algorithm", "view_replace", "view_algorithm",
+  "view_suid", "view_tail", "$@59", "view_query_block",
+  "view_check_option", "trigger_action_order",
   "trigger_follows_precedes_clause", "trigger_tail", "$@60", "udf_tail",
   "sf_tail", "$@61", "$@62", "$@63", "$@64", "sp_tail", "$@65", "$@66",
   "$@67", "$@68", "xa", "opt_convert_xid", "xid", "begin_or_start",
@@ -3404,7 +3435,7 @@
    (internal) symbol number NUM (which must be that of a token).  */
 static const yytype_uint16 yytoknum[] =
 {
-       0,   256,  1191,   258,   259,   260,   261,   262,   263,   264,
+       0,   256,  1200,   258,   259,   260,   261,   262,   263,   264,
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
      275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
      285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
@@ -3482,18 +3513,19 @@
     1156,  1157,  1158,  1159,  1160,  1161,  1162,  1163,  1164,  1165,
     1166,  1167,  1168,  1169,  1170,  1171,  1172,  1173,  1174,  1175,
     1176,  1177,  1178,  1179,  1180,  1181,  1182,  1183,  1184,  1185,
-    1186,  1187,  1188,  1189,  1190,  1192,  1193,  1194,   124,    38,
-      45,    43,    42,    47,    37,    94,   126,  1195,    40,    41,
-    1196,    59,    64,    44,    46,    58,    33,   123,   125
+    1186,  1187,  1188,  1189,  1190,  1191,  1192,  1193,  1194,  1195,
+    1196,  1197,  1198,  1199,  1201,  1202,  1203,   124,    38,    45,
+      43,    42,    47,    37,    94,   126,  1204,    40,    41,  1205,
+      59,    64,    44,    46,    58,    33,   123,   125
 };
 # endif
 
-#define YYPACT_NINF -4292
+#define YYPACT_NINF -4344
 
 #define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-4292)))
+  (!!((Yystate) == (-4344)))
 
-#define YYTABLE_NINF -2988
+#define YYTABLE_NINF -3000
 
 #define yytable_value_is_error(Yytable_value) \
   0
@@ -3502,557 +3534,562 @@
      STATE-NUM.  */
 static const int yypact[] =
 {
-    6780,  3405,   291, -4292,     4,   356, 72241,  1447,  1692,  1692,
-     -14,  4124, -4292, -4292, -4292, 13356,  4190, -4292, 72241,   291,
-     264, 48841, 72241, -4292,   663,   384,    53,  1163,   240,  1345,
-     291, 72241, -4292,   800,    24,   291,   362,   696, 64441, 49621,
-     -14, 72241,  2918, 30876,  7305, -4292, 64441,   523,   287, 72241,
-     807,    87,  1153, 72241,  1037, 65221,  1653, 22992,  2576,  1243,
-     969,   327, -4292, 17371,  1865,  1731, -4292,  1983, -4292, -4292,
-    1439, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, 56641, -4292,   178,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292,  2331,  1289,  1505, -4292, -4292, -4292,
-   -4292,  1119, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292,   457, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, 66001, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,  1849,
-   72241,  2005, 72241,  1613,  1997, 72241, 62881, 72241, 72241,  1346,
-    2087,  2168,  2175, -4292, -4292,  2350, -4292, -4292,  1692,   -14,
-   -4292, -4292, 72241, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292,  1684, -4292,  1683, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292,   943,  1930, -4292, -4292, 72241, 72241, -4292,  2551,
-    2346,  2348,  2389,  2136, 62881,   191, 72241, -4292,  2057, -4292,
-    2346,  2346,  2420,  2448,  2126, -4292, -4292, -4292,  2350,  2697,
-   -4292,  1949,  1962,  2006, 22992, -4292,  2012,  2017,  2064, 17371,
-    2071,  2080,  2094,  2102,  2122,  2125,  2138,  2151,  2151,  2167,
-    2171,  2173,  2178,  -124,  2207, -4292,  2213,   969,  2222, -4292,
-   -4292,  2234,  2237,  2242,  2246, -4292,  2264,  2269,  2271, 18174,
-    2285,  2299, -4292, 41796,  2306,  2309,  2323,  2328,  2330,  2338,
-    2344,  2349,  2357, -4292, -4292, 17371,  2167, -4292, -4292, -4292,
-    2359,  2365,  2392,  2407,  2418,  2430,  2442,  2444,  2446,  2459,
-    2461,  2479,  2488,  2504,  2510,  2513,  2167, -4292,  -106,  2524,
-    2527,   635,  2534, -4292,  2535, -4292,   260,  2540,  2151,  2167,
-    2167,  2567,  2571,  2574,  2575,  2581,  2584,  2590,  2591,  2595,
-    2598,  2602,  2603,  2612,  2613,  2618,  2620,  2624,  2625,  2631,
-    2645,  2652,  2655, 22992, 22992, -4292, 22992, 10947, 31656, -4292,
-   72241, -4292, -4292,  1938, -4292, 51961,  4599, -4292,  2883, 22992,
-    1103, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292,  2278, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-     107, -4292,  2656,  2079, -4292, -4292,  2087,  2087,  2087, 72241,
-    2701,  2087,  2087,  2169, 72241,  2087,  2423,  2087,  2087,  2087,
-    2740,  1692, -4292, -4292, -4292, -4292,  2823,  2596,  2664,  2753,
-   -4292,  2422, -4292, -4292, -4292,  2803, -4292,  2657, -4292,  2648,
-   -4292,  2797,  2657, -4292,   296,  2657,   223, -4292, -4292, -4292,
-    2657, -4292, -4292, -4292, -4292,  -243, -4292, -4292, -4292, -4292,
-     836, -4292,  2813,   164, 62881,  3020, -4292, -4292, -4292,  3118,
-   72241,     4, -4292, -4292, 17371, -4292,  2950, -4292,  1211,  3057,
-   -4292,  1692,  3166,   390, 72241, 57421, -4292,  1692, -4292, -4292,
-    3128, -4292,   108,    47,  2794, -4292, -4292,  2958, -4292,  2596,
-    3084,   197,   265, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, 13356,  2918, -4292, -4292,    71,  2963,  1258,
-   -4292, -4292, 52741,  1364, -4292,   912, -4292, 76141, -4292,  3252,
-   32436, 54301, -4292,  2663, -4292, -4292, -4292, -4292, -4292, -4292,
-   74581,  2665,   285, -4292,  3304, -4292,   133,  2679,  2565,   133,
-   58201,  3195,  1062,   266,   448,   571, -4292,  3285, -4292,  2939,
-    2921, -4292, -4292,   572,  2965, -4292,  3318, -4292,  3264, -4292,
-    2945,  3195, -4292, -4292,   133,  2946,  3202,  3336,  1339,  2375,
-     464,  1517,  2958, -4292, -4292,  1237,  1923, -4292,  1923, -4292,
-    2694, -4292, 72241, 72241,     4, -4292,  1692, -4292,  2699,  2703,
-   -4292, 72241,  2704, -4292,  2711, -4292,   263,   263,   263,  3419,
-     263, -4292,   263,  3663,  2712,  2719,  3474,  3367,  2859,  3369,
-   -4292,  3330,  3422,  1851,  2735,   228,  1238,  1119, -4292, -4292,
-    2736, 72241,  2151, -4292,  2741,  1197, -4292, -4292,  2738, -4292,
-    2186, -4292,    58,  3381,  3383,  3386, -4292,  2744, -4292, -4292,
-   -4292, -4292,    30, 30096,  3310,  2331, -4292,   364,  3518,  2037,
-    3195, -4292, 55081,  2037,  3195, -4292, -4292,  1289,  1354,  1644,
-    3275,  3374,  3410, -4292,  2483, 58981,  1203, -4292, -4292, 57421,
-   -4292, 72241, 72241,  1492, 62881, -4292, 72241, -4292,  3193,  2954,
-    9413, 72241,  3407, -4292, 72241, 72241,  3049, -4292, 72241, -4292,
-      70, -4292,  1882, 17371, -4292, 72241, -4292, -4292, -4292,   103,
-   -4292,   208,   379,  1753,   937, 72241, 72241, 72241,  3064,  3394,
-   72241,  2888,  3590, 72241, 57421, 79261, 72241, 72241,  2346,  1281,
-    1681, -4292, -4292, 17371, 17371,  2086,  3527,  3593,  3593,  3593,
-    1939,  2974, 17371, 17371, 17371, 17371, 17371, 17371,  2089,  2810,
-   -4292, -4292,    -3, -4292,  2817, 17371, 17371, -4292, 17371, 17371,
-   72241, -4292,  4583, 17371, 17371,   584,  3472, 17371, 17371, 17371,
-   10947,  4678, 17371, 17371, 72241,  3608,  2816, -4292,  2818,  2154,
-   17371, 17371,  2236, 17371, 17371, 17371, 17371, 17371, -4292, -4292,
-   17371, 17371, 22992, 17371, 17371, 17371, 17371, 17371, 17371,  2825,
-   17371,  3593,  3593, 17371, 17371,  2272, -4292, -4292, 17371,  2746,
-    2746, -4292, 17371, 11750, 17371, -4292, -4292, -4292,  2826, -4292,
-   -4292, -4292, 72241,  3593,  3593, 17371, 17371, 17371,  3593,  3593,
-   17371,  2829,  2831, 17371, 17371, 17371, 17371, 17371, 29316,  2832,
-    2836,  2837, 22992,  2294,  3527,  3527,  3527,   -50,   195,    44,
-     193,  1615, -4292,  3126, 17371, 17371, -4292, -4292, 66781, -4292,
-   -4292, -4292, 17371, -4292, 17371, 17371, -4292, -4292, -4292, -4292,
-   -4292, -4292,  2033, -4292, -4292, -4292, 18977, 22992, 22992,  2839,
-   22992, 22992, -4292, -4292, 22992, 22992, 22992,  3364,  2979, 22992,
-   22992, 23795, 24598, 22992, 22992, 22992, 22992,  1405,  3527, 62881,
-   22992, -4292, -4292,  2278,  2278, 17371, 44916, 72241, 72241, 72241,
-    3273, 72241, 72241, 62881,  2933,  1312, 72241, 72241, 57421, 72241,
-   79261, 72241,  2087,  3035,  4532, 34776, -4292, -4292, -4292, -4292,
-   -4292,  3089, -4292, -4292, -4292, -4292, -4292, 72241, -4292, -4292,
-   57421, -4292, -4292, -4292, -4292, -4292, -4292, -4292, 62881, -4292,
-    1001, 57421, 50401,   194, -4292, 73021, 72241, -4292,     4, -4292,
-    3128,  3138, -4292,  2852,  1939,  3611, -4292, -4292,  3380,  3634,
-   72241, 72241,   -69, -4292,  3378, -4292, -4292,  2865,  3087, 72241,
-   72241, -4292, 72241, 72241, -4292, -4292, -4292, -4292,  2867, -4292,
-   -4292,  2278,  4096, -4292,  2877, 57421, 57421,  1001,  3199,  1753,
-      57, -4292, -4292, 77701, 72241, -4292, -4292, -4292, -4292,  3610,
-   17371, -4292, 57421,  2960,  3123,  3424,   915, -4292,  2895,  2896,
-   -4292,  3043, -4292, -4292,  2899, -4292,  2900, 72241,  1065,   285,
-   -4292, -4292, -4292, -4292, -4292, 72241,  2903,   912, -4292,  2665,
-     285, 33216, -4292, 12553,  3455,  2278, 17371, -4292, -4292,  2913,
-    2346, 72241, 72241, 72241, 72241, 72241, 57421, 72241, -4292, -4292,
-     156, -4292, -4292, -4292, -4292, -4292,   133, 72241, -4292, 72241,
-     133, 57421, -4292,  1062, 72241,   133, -4292,  3456,  3151, -4292,
-   -4292, -4292,  3531, -4292, -4292,  3519,  2911, -4292,  3455, -4292,
-    1062, -4292, -4292,  3521, -4292, -4292, -4292,  1062, -4292, -4292,
-   -4292,  1062,  1062,  1062,   133,   133, -4292,  1029,  3630, -4292,
-    2919, -4292, -4292, -4292, -4292,  2922, -4292,  3521, -4292, -4292,
-    2852, -4292, 19780,  1037,  2704, 72241, 72241,  3708, -4292, -4292,
-    2927, -4292,  3354,  3177, -4292,  3095, -4292, -4292,  1358, -4292,
-   72241, 17371,  1538, -4292,    44, -4292, 57421,  3605, -4292, -4292,
-   -4292,   250, -4292,  3591, -4292, -4292,  2944,  3023,  3700, 62881,
-    3101,  3027,   215, -4292,  1561, 57421,  3120,     4,     4,     4,
-     178, -4292, -4292,  2616,  3186,  3186, 62881,  2964, -4292, -4292,
-   -4292,  3268, -4292, -4292,   364, 17371, -4292, -4292,  1119, -4292,
-   -4292, -4292, -4292, -4292,   256, -4292, -4292,  1119, -4292,  3195,
-    3195, -4292, -4292, -4292, -4292, 67561,  1644,  3118,  3410, -4292,
-   62881,  3684, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292,  1019, -4292, -4292, 72241, 72241,   350,
-   -4292,  3461,  3770, -4292,  2980,  3669,   285,   285,  3669,   285,
-     285, -4292,  3198, -4292,   285,   205, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292,  3627,  2853,   285,  2128,  3395,
-     285,   285,  3712,   285,  3400,  3401,   285,   285,   285,   285,
-    3220,  3671, -4292,   285,  3544,   930,  3266,  3547,   285,  3409,
-   -4292,  1693,  3675,   285,   285,   285,   285,   285,  3712,  3412,
-    3766,   285,   285,  3416,   520,  3418,  3425,   285,  3242,   285,
-     285,   285,   378,   285,   285,  3430,   285,  3209,  3213,   285,
-   -4292, -4292,   285,   285, -4292,  4203, -4292, -4292, -4292,  2691,
-   -4292, -4292,  1656, -4292, -4292,  3029,  3030, -4292, -4292, -4292,
-   -4292,  3334, -4292,  3130, -4292,  3344,  3210, -4292,  3049,   146,
-   68341, 72241, -4292, -4292,  3044,  3045,  2223, -4292,  1939,  3046,
-    3047, -4292,  2975,  5510, -4292, -4292, 72241, -4292, -4292, -4292,
-   -4292,  3251, -4292, -4292, -4292, -4292,  2901, -4292,  3794,  3411,
-   -4292, -4292,  3692, -4292,  3489,  3868,  3160,  3769,  3504,  2346,
-    3669,  3269,  3889,  3657, -4292,    92,  2900,  3307,  1768, 72241,
-    3699,  2346, 72241, 72241, 72241, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, 72241, -4292, -4292, -4292, -4292, -4292, -4292,  3049,
-     324,   254, -4292,  3593,  3103, 17371,  3113,  3114,  3115, 17371,
-     179,   416,   459,  1480,  1814,   530,   180, 17371,  3117, 14159,
-   -4292,  3119, -4292, -4292,   421,   431,   600,   852,  3129, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,  3725,
-   -4292,   452,  3131, -4292, -4292, -4292, -4292,  3122, -4292, 17371,
-    1369,   479,   490,   206,  3142,   501,  1890,  1895,  3136, 72241,
-   72241,  3593,  3139,  1619,  1626,  3593,  3144,   507,  1639,  1922,
-    1955,  1968,   511,  1980,  3839,  1715,   524,   535,  1730,   588,
-     665, -4292,  1764,  3148,  3152,   675,   231,  3593,  3157,   268,
-    3154,  3155,  1785, 14962, 15765, 16568,   176,   684, -4292,  3161,
-   -4292,  2818,  3163,  3164,   273,   219,  1790,  3168,  3170,  1986,
-    3278,  3278,  1807,  1207,  1812,  1207,  1214, 62881,  3175, -4292,
-   -4292, -4292, -4292,  3278,  3278,  3278,   158,  3593,  3176,   267,
-   -4292, 17371,  3173,  3174,  3178, 62881, 17371,   174, -4292, -4292,
-   -4292,  2709,   270, -4292, -4292, -4292, -4292, -4292,  1084, -4292,
-    3181, -4292,   969,  2376,  3189, 10947, -4292,  1682,  3189,  3878,
-    1774,  1774, 22992, -4292,  3187,  3098,  1187, 18174,  1342, 18174,
-    1342,  3189,  3189,  3189, -4292, 22992,  3190, 22992, 22992, -4292,
-    3527, -4292, -4292, 51961,  3191,  3192, -4292, -4292,  1277, -4292,
-   -4292,  3188, 72241,  1312, -4292, -4292,  2087, -4292, -4292, -4292,
-     274, -4292, -4292,   576, -4292,  3196,   154,  2900,  3801, 72241,
-    3200, -4292,  3716,  3721,  3724,  3726, -4292, -4292, -4292, -4292,
-    3727, -4292,  3734, -4292, -4292,  3219, -4292, 72241, 28536, 62881,
-   -4292,  3222, -4292,  3834, -4292,  3635, -4292, -4292,  1987,  3446,
-   -4292, -4292, -4292, -4292, 45701,  1123, -4292, -4292, 72241, -4292,
-     190,   218,  4054,  3397, -4292,  2852, 72241,     4,     4, 72241,
-   -4292,  3796, -4292,   328,  3227, -4292,  3233, 62881, -4292, -4292,
-     349, 57421, 57421,  3235, -4292,  3457,    79,  3640, -4292,  3459,
-    4031,  4031,    47, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292,  3244,  3885,  3838,  3672,
-    3853,  3196, 45701, -4292, 72241, -4292, 26186,  3397, -4292,  3854,
-    3470,  3471,   -99, -4292, 59761, -4292,  1939,  1097,  3599, -4292,
-    3599,  2166, -4292, -4292,  3800, -4292,  3624, -4292, 79261, -4292,
-   62881, 79261,  3863,  3254,  3256,  3257,  3259,  3260, 75361, 17371,
-   -4292, -4292, -4292, 12553,  3262, -4292, 75361, -4292, -4292, 22992,
-    2213, -4292,  2446, -4292,  1939, -4292,     4,  3869, -4292,  1939,
-    3271, 72241, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292,  3453,   133, -4292, -4292,
-   -4292, -4292, -4292,  3641,  3195,  2965,  3869,   133,  4011, -4292,
-     133, 72241, 72241,   133, -4292, -4292, -4292, -4292,  3560,  1237,
-    3469,  1923, -4292,  2213,  1939,  3282,  3274, -4292, -4292, -4292,
-    2014, -4292,   969,   263,  3678, -4292,  3891, -4292, -4292, -4292,
-   -4292, -4292,  1751,  1825, -4292,   128,   136,  3686,   368,  3286,
-     285, -4292, -4292, -4292, -4292,  3687,   -47, -4292, 78481,  3691,
-    1463, 62881,  3524,  3528, -4292, -4292,  3530, -4292, -4292,   528,
-    1636, -4292,  2476,   242, -4292, -4292, -4292, -4292, -4292, 72241,
-    3436, -4292,  2277, -4292, -4292, -4292, -4292,  2673, -4292, 33996,
-    3764,  2700,  3303, -4292, -4292, -4292, 55081, 55081, -4292, -4292,
-   -4292, -4292, 72241,    86, -4292,  3306, -4292, 26971, -4292,  3564,
-    3728,   151, -4292, -4292, -4292, -4292, -4292,  2617,  3249, -4292,
-   -4292,  4048,  3639,  3857,  3525,  3249,  2522,     4,  1679, -4292,
-    2828,     4,  1679,  2828,  2828, 72241,     4, -4292,   392,   285,
-   -4292, 72241,  2223,   291,  2223, -4292,  1010, 72241, 42576, 69121,
-   72241, 72241, 72241, 72241,   291,  1648,  3565, 72241,  3565, 69901,
-     291,     4,     4,     4,     4,  2673,   285,  3565, -4292, 69901,
-   -4292, 72241, 72241,  3861, 72241,  3862, 72241, 72241, -4292, 62881,
-   72241, 69901, -4292,   285,  1837,    -2, 70681,  1648,  1648, 72241,
-     291, 72241,  2288,     4,   291, -4292, 72241, -4292, -4292, 72241,
-   72241,   291,   291,  2634, -4292,  2288,  2288,  3179, -4292, -4292,
-   72241,  3565, 69901,  3325, -4292, -4292, 60541,     4,     4, -4292,
-     285,   285,  3744, -4292, -4292,  9997,  9607,  2051,   285,  3420,
-    3750,  1089, 72241, -4292,  3458,  3475, -4292, -4292, -4292, -4292,
-   -4292,  2223, 69901, 71461,  3879, -4292, 17371,  3969,  3990,  3991,
-    3993,  3995,  3996,  3999,    74, -4292,  4008, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,  4009,
-    4017, -4292, -4292,  4018, -4292, -4292,  4019, -4292,  4021,  4025,
-    4029,  4030, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,    99,
-    4032,  4040,  4043,  4049,  4050,  4052,  4053,  4056,  4058,  4063,
-    4065,  4066,  4067,  4073,  4074,  4075,  4076,  4078,  4079,  4081,
-    4082,  4083,  4084,  4085,  4086, -4292,  4089,  4090, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292,   227, 72241,  3525,  3463,  3567,
-   72241,  3587, -4292,  3967,  2812,  3669,   262,  3601, 57421,  3788,
-     285,  1419,  1419,  3881, -4292,  5767, 72241, 72241,  3462,   -55,
-   -4292,  2026, -4292, 20583, -4292,  3468,  3278,  1939,  3278,  3278,
-    3278,   747, 17371, 17371,  4102,  4729,   147, -4292, 61321, -4292,
-   -4292, -4292, 61321,  4729,  2047,  3278,  3473, -4292,  4016,  4024,
-   -4292, -4292, -4292, 17371, 17371, -4292, 17371,   -12, -4292, 17371,
-   17371, 17371, 17371, 17371, -4292, -4292, 22992, -4292,  3466,  3477,
-    3278, -4292, -4292,  3478,  3278, 17371, -4292, -4292, -4292, -4292,
-   17371, -4292, 17371, -4292, 17371, 17371, -4292, 17371, 17371, -4292,
-    3278,  3278, 21386, 17371, 17371,  3480,  3278, -4292, 17371, 17371,
-   17371, -4292, 17371,  2066, 17371,  2484, 17371,  2621, 17371, -4292,
-   17371, -4292,  3278,  3278, -4292, 17371,  2287, -4292,  3565, -4292,
-    3593,  3278, -4292, 43356, -4292, -4292,    77, 29316,  3482,    77,
-    3484, 22992, -4292,  3278, -4292, -4292, -4292,  1456,  3485,  3278,
-    2069, -4292, -4292, -4292,  3487,  1939, -4292, -4292, -4292, -4292,
-   -4292, -4292, 22992,   293, 22992,  3878, 22992,  4678,  4678,  2431,
-   10947, -4292,  1831,  3878, -4292, -4292, 17371, 17371, 46486, 72241,
-     446, -4292,  3587,    88, -4292,   232, -4292, -4292, 57421, -4292,
-   -4292, -4292, -4292, -4292,   154, 62881,  3486, -4292, -4292, -4292,
-   -4292, -4292,  3521, -4292,  3441,  3233, -4292,  3702,  3717,  3722,
-   -4292, 36336, -4292, -4292, -4292, -4292, 36336,  1685,  1001, -4292,
-   72241, 57421,  3488,  3490,  3492,  3680,  3643, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,  3397,  3501,
-    3195, -4292,  3640, -4292, -4292,  3498, -4292,  1882,  3186,   853,
-   72241, -4292, 17371,     4, -4292,  3720, -4292, 72241, 72241, -4292,
-   -4292, -4292, -4292,   160, -4292,  3506,  2541, -4292,  3587, -4292,
-   -4292,  3521,  3521, -4292,  4096, 28536,  3921,  1001, 57421,  4110,
-   -4292, -4292,  3510,   969, 25401,  3581, -4292,  3509,  3352, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292,  3640,  3362,  4098,
-    3397, 79261, 79261, 79261, -4292, -4292, -4292,  3586,  3123,  3123,
-    3592,  3592,   235,  3890, -4292, -4292, -4292, -4292,  2900, -4292,
-   -4292,  3564, -4292, -4292, -4292, -4292, -4292,   285,  1939, -4292,
-   33216, -4292, -4292,  1648,  3195,   184, -4292, 57421, -4292,  3952,
-   -4292, -4292,  3195, -4292,     4, -4292,  1062,  1062, -4292, -4292,
-   -4292,  3573,  3714, -4292, -4292, 19780, -4292, 72241, -4292,  3532,
-   -4292,  3992, 72241,  4174,  3533, 22992,  3535, 22992,  3564,  3785,
-    3543,  4332,  3565,  3186, -4292,  3599,  3942, -4292, -4292,  2900,
-   -4292,  3892,  3943,  3592,  2419, -4292, -4292, -4292, -4292,   451,
-    3565,  3565,  3565,  3565,  2476, -4292,   138,   814,  1325,  3564,
-     181,   242, -4292,  3549, -4292, -4292, 61321,  4277, -4292, -4292,
-   -4292, -4292, -4292, -4292, 17371, -4292, -4292,  -130,   212,  1262,
-   26971, 72241, 47271, -4292,   -81, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292,   285, -4292,   285,     4,  3821,  3822,
-    3823,  3826,  3833,  3871, -4292, -4292, 72241,  3989, -4292,     4,
-    1675,     4,     4,     4,     4,  3565,     4,     4,  2085, -4292,
-   -4292, -4292,   282, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, 62881,
-   -4292, -4292, -4292, 72241,   252, 72241,  3569,  4114,  4115,  2223,
-      96, 72241,  3582,  3771,  3797, 53521, 88592, -4292, -4292, -4292,
-    4026,  4026,  2172,  1146, 69901, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, 72241, -4292,
-   -4292,  2901,  3588, -4292,  3564, -4292, -4292, -4292, -4292, 55861,
-       4, -4292,  3831, -4292, -4292, 72241,  3588, -4292, -4292,   329,
-   -4292,  3757,  3832,     4, -4292, -4292, -4292, -4292, -4292,  4027,
-   -4292, -4292, -4292, -4292, -4292, -4292, 88592, 69901,  3597, -4292,
-    1749, -4292, -4292, -4292, -4292, 69901,  3819,  3829, -4292, 72241,
-   69901, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, 72241, -4292, -4292, -4292, -4292,
-   59761, 61321, -4292,  3351,  3503,  4203, -4292, -4292, -4292,  3029,
-   -4292, -4292, -4292,   576,  4036,   285,  2241,   276, -4292,  3953,
-   -4292, -4292,  2711,  4037,  4042,  3614, -4292,  3618, -4292,  3615,
-   -4292, 68341,  1939,  3606,  3606,  3623,  3623,  3626,  3626,  3628,
-    2975, -4292,  3629,     4,  3565,     4, 62101,  3565,   932,  3564,
-    1148,  5510, -4292,  3565,     4,     4,     4,     4,  3565,  3565,
-    3565,  3565,  3565,     4,     4,     4,     4,     4,     4,  3565,
-       4,   130,     4,     4,  3565,  1757,     4,  3565,     4,  1648,
-   -4292,   229, -4292,  3632,  2439,  3587, 62881,  3633, -4292,  4210,
-     285,   285,   285,   285, -4292,   290, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,   576,  1694,
-   62881, 79261, -4292,  3120,  1400, -4292, -4292, -4292, -4292, -4292,
-   72241,  2859, -4292, 72241, -4292, 40236, -4292, -4292, -4292, -4292,
-    1368,  1591, -4292,   364,  1354, -4292,   547,  3956, -4292, -4292,
-     281,  3636, -4292, -4292,   211, 18174,  1853,  3278, -4292, -4292,
-   -4292, -4292, -4292, 17371,  1939,  2321, -4292,  3638,  3638,  3642,
-   -4292,  3644,  4028,  3638, -4292, -4292, -4292, -4292, -4292, -4292,
-    4370, -4292, -4292, -4292, -4292,  4192,  3642,  4197, -4292,  3638,
-   -4292,  3729,  4416,  3696,  3649,  3651,  3660,  3278, -4292,  3278,
-   17371, 17371,  1866,   346,  1875,  4412,  3970,  1221,  1242,   391,
-   -4292,  1901,  3860,  3278, -4292,  3278, -4292,  1903,  1909,  1924,
-    1932,  1261,  1941,  2100, -4292, -4292, 18174,  1945,   238,   450,
-    3278, -4292,  1947,  1306,  1321,  1952, 17371,  1957, 17371,  1965,
-   17371,  1967,  1981, -4292, -4292,  1995,  3665,  3665,  3658,  3670,
-   -4292, 72241, -4292, -4292, -4292, -4292,  3781,  3790,  3278,  3676,
-      77,  3278,    77,   168, -4292,  3901,   -48,  3278, -4292, -4292,
-   72241, -4292, -4292, -4292, 17371,  1103,   173, -4292, -4292, 22992,
-     468, 22992, -4292,  3679, -4292, -4292, -4292, -4292,  4196,  4463,
-   -4292, -4292,  3937, -4292, -4292, -4292,  3200, -4292, -4292,   137,
-    4324,  3688, -4292, -4292, -4292, -4292, -4292, 45701, -4292,  1144,
-    3695, 48056, 57421,  4105,  3195, 19780, -4292,  2892, 72241,  2223,
-    4259,   269,  3850,  4218, -4292, -4292, -4292,  1939, -4292, 57421,
-   -4292, -4292, -4292, 72241, 72241,  1037, -4292, 37896, -4292, -4292,
-   -4292, -4292,  3703, -4292, -4292, -4292,  4342, -4292,  4307, 45701,
-    3196, 57421, 17371,  3362,  3704,  3709,  3710,  3711,  3713,  3718,
-   26971, 26971,  4253,  4257, -4292,  4129,   247,  4129, -4292, 41016,
-   26971, 26971,  3234,  2711,  4472,  4304,  4098,  2900,  2900,  2900,
-    3599,  3599, -4292,  4419, -4292, -4292, -4292, -4292, -4292, -4292,
-     297, -4292, 12553, -4292, -4292, -4292, -4292, -4292,  3196, -4292,
-    3521, -4292,  3397,   133,  4366, -4292,  4368, -4292,  3730,  4371,
-    4127, -4292, -4292,  3565, -4292, -4292, 72241,  2970, 72241,  2999,
-   -4292,  4484,  3736, 22992,  4376,  3740,  4311, -4292,  3592,  3599,
-    3123,   782, -4292,   188,  1732, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292,  1629,  4438,  3272,  4298, -4292, -4292, -4292,
-    2278,  2278, -4292, -4292, -4292,  1131,  4266, -4292, 26971,  3640,
-   47271,   -95, -4292, -4292,  3742, 72241,  2288,     4, -4292, -4292,
-   -4292,  4437, -4292,  4439,  1687,  4181,  4389, -4292, -4292,   300,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292,  2522, -4292,  3754,  3564,  4153,  3756, 17371, 72241,
-   -4292, -4292, -4292,  3828, -4292, -4292,  3758, 44136,  1419,  1419,
-    2107, -4292, -4292, -4292, 88592, -4292,  3638,  3638,  3638, -4292,
-   -4292,   337,  3642, -4292, -4292,  3760, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292,   602,  2791, -4292, -4292,   602, -4292,
-   -4292, -4292,   237,  2268, -4292, -4292, -4292, -4292, -4292,  3762,
-   -4292,  3638,  3642,  3642, -4292, -4292,   602,  3638, -4292,  3638,
-    4125,  3840, -4292,   175,  3638,  3638,  3638,  3768,  3644, -4292,
-   -4292, -4292, -4292, -4292,  4430,   465, -4292, 88592, -4292, 72241,
-   -4292,  3610,  3610, -4292, -4292, -4292, -4292,  4003, -4292, -4292,
-   -4292,  1235, -4292, 72241, -4292, -4292, 72241, 72241,    52,   160,
-    3765, -4292, -4292, -4292,  3780,   -32, -4292,    -2, -4292, -4292,
-    3801,  1809,  1130,  3994,  2372, -4292, 72241, 72241, -4292, -4292,
-   71461, -4292, 38676, -4292, -4292, 39456, -4292, -4292,   -61, -4292,
-   -4292,  2038, -4292, -4292,  3565, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, 44136,   285,   285, -4292,   307, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292,  4188, 44136,  1185, 72241,
-       4,  2828,  2828,  3564,  2790, -4292,  4169, -4292,  2441,  2900,
-     242, -4292, -4292,  3130,  3776, -4292, -4292, 72241,  2108, -4292,
-   -4292,  6549,   364, -4292,   281,  4198, 72241, -4292, -4292, -4292,
-   -4292,  4068, -4292, -4292, -4292, -4292,  4205,  4678, -4292, -4292,
-    1939, 17371,   933, -4292, -4292,   602,  4208, -4292,  1204, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292,  3787,  4729,  4346, -4292, -4292, -4292, -4292, -4292,
-    4678,  4678, -4292, -4292, 17371, -4292, 17371,   263,  3799, 17371,
-   17371, -4292, 17371, -4292,  1198,  3802,  3959, -4292, -4292, -4292,
-   -4292, -4292, -4292, 17371, -4292, -4292,  4678, -4292, 17371, -4292,
-   -4292, 17371, -4292, -4292, 17371, 17371, -4292,  2035, -4292,  2092,
-   -4292,  2141, -4292, -4292, -4292,  3564,  3803,  3804,  3565,  3278,
-   -4292,  3806,  4199, -4292, -4292, -4292, 17371, -4292,  3278, -4292,
-    3278,  4399,  4729,  1470, -4292, -4292,  2109, -4292, -4292, -4292,
-   17371,  1103, -4292, -4292, -4292, -4292, -4292, -4292,  4168, -4292,
-    4471, 36336,  4033,  4397, -4292, -4292, -4292, -4292,  1159, -4292,
-   -4292,  2115, 72241,  4587,  4233, -4292,  2223,  4259,  4343, -4292,
-    4365, -4292, -4292, -4292, -4292,  3814,  3588,  3811, -4292,   285,
-    2434,  2130, -4292, -4292, -4292,  3812, 19780,  3816, -4292, 28536,
-   57421,  4424,  3196,  1583,  2711, 26971, -4292, -4292, -4292, -4292,
-   -4292,  3352,  3815,  3818,  3835,  3352, -4292, -4292, -4292,  4377,
-   -4292,  4129,  4129,  4378,  4379, -4292,  2395,  3396,   466, -4292,
-   17371, 17371,  3927,  4304,  3592,  3592,  4235,  3564, -4292, -4292,
-   -4292, -4292,     4,     4,  1361,     4,  4479,  4515, -4292,  2142,
-   -4292, -4292,  2160, -4292,  4367,  4153, -4292,  3349,  3564, 72241,
-    4597, -4292,  3592,  3592,  3123, -4292, -4292, -4292,  3592,  4244,
-     801, -4292,  3564, -4292,   134, -4292, -4292,  3507, -4292, -4292,
-    4608,  4609,  4506,  4612,  1131, -4292,    80, -4292,   -95,  3397,
-    1287, -4292,  3870, -4292,  1248, -4292, -4292, -4292, -4292, -4292,
-   -4292,  4184, -4292,  1493, -4292, 44136, -4292, 72241,  2180, -4292,
-   44136,  2165,  3866, -4292, 44136, 17371, -4292,  2188, -4292,   186,
-   -4292, -4292, -4292, 53521,  4125, -4292, -4292, -4292,  4630,   354,
-   -4292,  4639, -4292,   602, 61321, -4292, -4292, -4292, -4292,   263,
-   -4292,  1532, -4292,   602, -4292, -4292,  4051, -4292, -4292, -4292,
-     263,   602, -4292, -4292, -4292, -4292,  1769, 72241,  1235, -4292,
-   -4292, 59761,  2497,     4,  3707,  3950, -4292,  4072, -4292,  4556,
-    1738,  4420,  3587,   285,   285,  4620, -4292, -4292,  3830, -4292,
-    4483,  4428, -4292,   746, -4292,  4658, -4292,   602,  4658,  1769,
-    4323, -4292,  1769,  1769, -4292,  3827, -4292,  1235, -4292, -4292,
-   -4292, 72241, 72241, -4292, -4292, -4292, -4292, -4292,  3900, -4292,
-   -4292,  4334,  4036, -4292, -4292,  4289, -4292, 17371, 17371,  4333,
-   72241,  4335, -4292,  4634,  4692,  3588,  1270, -4292, -4292,  2194,
-   -4292, -4292, -4292,  2199, -4292, -4292,  3910, -4292,  2201, -4292,
-   -4292, -4292, 72241, -4292,  2218,  2220, -4292, -4292,  2226,  2828,
-    2828,  2649,  1185,  3917,  2227,     4,     4,     4,     4, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292,   188,  1776,   181,  3420,
-   44136,  3918,  6737, -4292,  4204,  4231,  3922,  3919, -4292, 88592,
-       4,   361, 72241,  1640,  1939,  3925,  3929,  3930,  3931, -4292,
-    3932,  2257, -4292,  3729, -4292,  2278,  3939,  3940,  2204,  3923,
-   -4292, -4292,  3278,  2214,  1604,  2273,  4395,  4475, -4292,  4318,
-   -4292,  2216,  1658,  2229,  2240,  2262,  2283, -4292, -4292, -4292,
-   -4292, -4292, -4292,  3944, -4292, -4292,  4698,  4361,  1939, -4292,
-   -4292,   347,    77, -4292,  3149, -4292, -4292,  3951,  1470, -4292,
-    4374, -4292,  2275,  4577,  4477, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   57421,  4372,  4547,  4744,  3397,   162, 72241,  4233,  4621, -4292,
-   -4292, -4292,  4202, -4292, 72241, 19780, -4292, -4292,  2434, 72241,
-   44916,  3973,  3703, -4292,  3196, 57421,  1456, -4292,  1485, -4292,
-   -4292,  4516,  4517, -4292, -4292, 17371,  3980, 17371,  3984, -4292,
-   -4292,  2223,  2223, -4292,   466, -4292, -4292,  1939,   553, -4292,
-    1939, 72241, -4292,  3927, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292,     4,  4623,  4381, -4292, 72241, -4292,   381,  2300,
-   -4292, -4292,  4000,  3985,     4, -4292, -4292,  3592, -4292,  3592,
-    3123, -4292,  4672, -4292, -4292, -4292,  4673,   263,   263,  4754,
-     263, -4292,  4755,  4762,    80, -4292, -4292,  4425,  4425,  4434,
-   -4292,  2342,  4195, -4292,  4153,  2353, -4292, 72241,  2379,  2301,
-    2050, 44136,  4443, -4292, -4292, -4292, -4292, -4292, -4292, 61321,
-   -4292, -4292,  4658,  2381, -4292, -4292, -4292,  2386, -4292, -4292,
-   -4292, -4292, -4292,  1769, -4292,  4020, -4292,   478, -4292, -4292,
-   -4292, -4292, -4292,  3702,  3717,  3722,  1757,  1757, 17371, -4292,
-   -4292, -4292, -4292, -4292, -4292,  4449,  4200, -4292, -4292, -4292,
-   -4292, -4292, -4292,     4,     4, -4292, 59761, -4292,  4807,  4802,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292,  4022, -4292, -4292,
-   17371, -4292, -4292,  2019, -4292,  4153, -4292, -4292, -4292,  1939,
-    4678,  4743, -4292, -4292,  4316,     4,  4684,  2859,  4456, -4292,
-   -4292, 72241, -4292, 72241, 72241, -4292,     4,  4039, -4292,  4057,
-   -4292,  3565,  1053, -4292, -4292, -4292,  2522,   249, -4292, -4292,
-   -4292,  4606, -4292,  4432, -4292, -4292,  2241,  2399, -4292, -4292,
-       4,  1130, -4292, 72241,  3610, -4292, -4292, -4292, -4292,  4047,
-    4044, -4292, 72241,  4646, -4292, -4292, -4292, -4292, -4292, -4292,
-    4476,  4055,  4828, -4292, -4292, -4292, 17371, -4292, -4292, 17371,
-   -4292, -4292,  4510,  4683, -4292, -4292, -4292, -4292, -4292, -4292,
-    4059,  3565, 17371,  4809,  1168, -4292, -4292,  3278, -4292, -4292,
-   -4292,  4482,   225, -4292, -4292, -4292,  1159, -4292,  4478, 57421,
-   -4292,  3195,  4233,  2711, -4292,  4598, 72241, -4292, -4292, -4292,
-   -4292, -4292,  4060, -4292, -4292,  3196,   245, -4292, -4292, -4292,
-    1939, 72241,  1939, 72241,  4666,  4666, -4292, -4292, 17371, -4292,
-    4842,  4062, -4292, -4292, -4292,     4,  4707, -4292, -4292,  4071,
-    4332, -4292, -4292,   286, -4292, -4292,  3592, -4292, -4292, -4292,
-   -4292,   263, -4292,   263,   263, -4292,  4594,  4594,  4710,  1053,
-    2270,  3250, -4292,   249,  2404, -4292,  2050,  1749,     4,   285,
-     285,   285, -4292,  2050, -4292, -4292, -4292, -4292, -4292,  4077,
-   -4292, -4292,   602,   263,   602, -4292, 72241,  4555, -4292, -4292,
-    2326, -4292, -4292, -4292, -4292, -4292, -4292,  4087,  2347, -4292,
-   -4292,  2409, -4292, -4292, -4292, -4292, -4292,  4238, -4292,  4207,
-   -4292, -4292, -4292, -4292, 72241, 72241, -4292,  4480,   446,  1053,
-   -4292, -4292,  2412,   446,   249, -4292, -4292,  4827, -4292, -4292,
-    2050, -4292,  4333,  4409, -4292, -4292, -4292,  1899, 88592,  4733,
-    4088, -4292,  4771, -4292,  2384, -4292, -4292, -4292,  4091,  4092,
-   17371, -4292, -4292, -4292, -4292,  2458, -4292,  4722, -4292, -4292,
-    4744, -4292,  4250, -4292, -4292, -4292,  4280,  3640,  4093,  4095,
-    4097,  4099,  1828,  4094,  4101, -4292,  4107, 72241, -4292,     4,
-    3521, 22992,  4108,  4753,   839, -4292, -4292, -4292, -4292, -4292,
-   -4292, 55081, -4292, -4292, -4292, -4292,  4109,  4327,   285,  4772,
-    4773,   285,   285,   285,   285,  4112,  3250, -4292,  4757, -4292,
-    4125, 72241, -4292, -4292, -4292,  3565,     4,     4, -4292,  1749,
-   -4292, -4292, -4292,  2438, -4292,   253,  4534, -4292, 17371, -4292,
-   -4292,  4375, -4292, 86281,  1099, -4292, -4292,  4117,  4119,  2576,
-   -4292, -4292, -4292, -4292, -4292,  3587,   446,  2372, -4292, 88592,
-   -4292, -4292,  3610,  4440, -4292,  3642, -4292, -4292,  3303,  2834,
-    4442, 17371,  4222,  4248, -4292, -4292,  4239,  4240, -4292,  4276,
-   -4292, 72241,  2673, 73801,  3715, -4292, -4292,  4885, -4292,  4888,
-   71461, 71461, -4292, -4292, -4292, -4292,  3580, 72241,   285,  4403,
-   -4292, -4292,  4140, -4292, -4292,   341,     4,   285,   285,  3587,
-    3587,  3564, 72241,  4385, -4292, -4292,   285, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, 72241, -4292, -4292, -4292,   503, -4292,
-    2398, 17371,  4788,  4312, 72241,  1801, -4292, 87841, 87841, 72241,
-   -4292, -4292, -4292, -4292,  7903, -4292, -4292,  1194, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,  4912,
-   -4292,  4141, -4292, -4292, -4292, -4292,  4884,  4565,  4889, -4292,
-   72241, -4292, -4292, -4292,  4634,  3610,  4041, -4292,  1433,  4155,
-   17371,  1894, -4292,  4937,  1943,  1958, -4292,  4678, -4292,   292,
-   -4292, -4292, -4292, 76921,  3811,  4481,  4256,  2453, -4292, 10069,
-   -4292, -4292, -4292,  4164,  2455,  4411,  2514,  3186, -4292, -4292,
-    2532, -4292, 22189, -4292, -4292, -4292, -4292,     4,     4, -4292,
-   -4292, -4292, -4292, 62881,  2542, -4292, 62881, -4292,  1352,  1352,
-    1617,  1939, 17371, -4292, 17371,  4336, -4292, -4292,  4768, 72241,
-   -4292, -4292, -4292, -4292, 17371, -4292, 86281, 86281, -4292, -4292,
-   -4292, -4292,  4934,  4584, -4292,  4586,  4172,  4824, -4292, -4292,
-   -4292, -4292,  4838, 86281, -4292, -4292, 62881, -4292, -4292,  4678,
-   -4292,  2834, -4292, -4292,  4282,  4493, -4292,  4290, -4292,  3043,
-   -4292, -4292,  2900,  4749,  4277,  1456, -4292, 73801,  4279,  3610,
-   -4292, -4292,  3564, -4292,  4411,  4518, -4292,  4140, -4292,  2547,
-   -4292,  3878, -4292, -4292,  3250, -4292,  4385, -4292, -4292,  4975,
-   -4292,  1632,  4607,  4610, -4292, -4292,  3830,  1939,  1939, -4292,
-     261, -4292, -4292,  4737,  4831, 17371,  1939, 82381,  4185, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, 87061, 17371, -4292,  1194,  4912, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, 86281,  1977, -4292, -4292, -4292,
-   -4292, -4292,  4940,  4266,   245, -4292, -4292,  4819, -4292, -4292,
-   -4292, -4292, -4292, 22189, -4292, -4292, -4292, -4292, -4292,  4383,
-    4862, -4292,  4362, 17371, 86281, -4292,  4840, -4292,  4766,  1939,
-    4705,  4201, -4292,  4193,  1939,  4876, 87841, 87841, -4292,  4041,
-   -4292, -4292,   263,  4770, -4292, -4292,  4301, -4292,  1352,  1352,
-   -4292,   461, -4292,  1939, 83161,  4950, 72241, -4292,  4431, -4292,
-   -4292, 17371,  4864, 63661, 83941,  4209, -4292, -4292, -4292, 86281,
-   -4292,  4645,  4213,  1456, -4292, -4292, 17371, -4292,  4866,  4444,
-   -4292,  4219, -4292, 86281,  1939, 86281, -4292, -4292,  4810,  8612,
-    2243, -4292,  4223, -4292, -4292,  1448, 35556,  4526,  1156,  1939,
-    4973, 86281, 72241, 80041,  4874, 84721,  4836, 72241,  3610,  4837,
-    4839, -4292, -4292, -4292, -4292, -4292, 62881,  2553, -4292, -4292,
-   72241, -4292, -4292, -4292,  1470,  4458, -4292, 80821, -4292,  2693,
-    4582,  4404, -4292, -4292,  4915,  3427, -4292, -4292, -4292, 37116,
-    4243, -4292,   285, -4292,  4664, 86281, 86281, -4292, -4292, -4292,
-   -4292, 51181, 17371, -4292, -4292, -4292, -4292,  1865, -4292, 72241,
-   19780,  4344, 81601, 85501, -4292, -4292, -4292, 27755, -4292, -4292,
-   -4292,  4851, -4292,  1939, -4292, -4292, -4292, 51181, -4292, -4292,
-   -4292
+    6081,  2502,   254, -4344,   -52,   352, 71855,   186,  1360,  1360,
+    -103,  3167, -4344, -4344, -4344, 12295,  3432, -4344, 71855,   254,
+     483, 48185, 71855, -4344,    32,  2406,    42,  1275,   534,   938,
+     254, 71855, -4344,    87,  1891,   254,  1608,   610, 63965, 48974,
+    -103, 71855,  3635, 30013,  8863, -4344, 63965,  1363,   267, 71855,
+     766,    51,  1389, 71855,   880, 64754,  2156, 22039,  2546,  1527,
+    1040,   310, -4344, 16355,  2105,  1969, -4344,  1837, -4344, -4344,
+    1734, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, 56075, -4344,  1120,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344,  2386,    92,  1491, -4344, -4344, -4344,
+   -4344,  1380, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344,   429, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, 65543, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,  2096,
+   71855,  2121, 71855,  1973,  2084, 71855, 62387, 71855, 71855,  1799,
+    2189,  2233,  2308, -4344, -4344,  2355, -4344, -4344,  1360,  -103,
+   -4344, -4344, 71855, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344,  1751, -4344,  1687, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344,  1161,  2005, -4344, -4344, 71855, 71855, -4344,  2594,  2397,
+    2402,  2452,  2219, 62387,   107, 71855, -4344,  2199, -4344,  2397,
+    2397,  2478,  2504,  2249, -4344, -4344, -4344,  2355,  2769, -4344,
+    2048,  2071,  2079, 22039, -4344,  2081,  2086,  2101, 16355,  2110,
+    2115,  2125,  2133,  2150,  2153,  2158,  2164,  2164,  2167,  2169,
+    2178,  2186,   776,  2196, -4344,  2201,  1040,  2203, -4344, -4344,
+    2215,  2217,  2221,  2229, -4344,  2240,  2247,  2255, 17167,  2257,
+    2269, -4344, 41059,  2307,  2336,  2342,  2353,  2371,  2373,  2378,
+    2403,  2405, -4344, -4344, 16355,  2167, -4344, -4344, -4344,  2410,
+    2416,  2417,  2419,  2428,  2430,  2433,  2438,  2445,  2448,  2451,
+    2453,  2462,  2467,  2475,  2484,  2167, -4344,  1079,  2489,  2490,
+    1176,  2492, -4344,  2498, -4344,   584,  2503,  2164,  2167,  2167,
+    2515,  2517,  2534,  2540,  2542,  2543,  2552,  2555,  2557,  2563,
+    2584,  2600,  2622,  2623,  2625,  2631,  2634,  2636,  2641,  2658,
+    2662,  2663, 22039, 22039, -4344, 22039,  9859, 30802, -4344, 71855,
+   -4344, -4344,  1988, -4344, 51341,  3821, -4344,  2786, 22039,  1072,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+    2332, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,   131,
+   -4344,  2669,  2246, -4344, -4344,  2189,  2189,  2189, 71855,  2921,
+    2189,  2189,  2425, 71855,  2189,  2595,  2189,  2189,  2189,  3022,
+    1360, -4344, -4344, -4344, -4344,  3012,  2865,  2845,  2603, -4344,
+    2681, -4344, -4344, -4344,  3014, -4344,  2670, -4344,  2923, -4344,
+    3107,  2670, -4344,   317,  2670,   226, -4344, -4344, -4344,  2670,
+   -4344, -4344, -4344, -4344,  1525, -4344, -4344, -4344, -4344,  1147,
+   -4344,  3112,   158, 62387,  3298, -4344, -4344, -4344,  3275, 71855,
+     -52, -4344, -4344, 16355, -4344,  3262, -4344,   391,  3315, -4344,
+    1360,  3314,   390, 71855, 56864, -4344,  1360, -4344, -4344,  3273,
+   -4344,   126,   106,  2911, -4344, -4344,  3051, -4344,  2865,  3181,
+      96,   281, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, 12295,  3635, -4344, -4344,   162,  3060,   960, -4344,
+   -4344, 52130,  1451, -4344,   237, -4344, 75800, -4344,  3358, 31591,
+   53708, -4344,  2759, -4344, -4344, -4344, -4344, -4344, -4344, 74222,
+    2763,  1146, -4344,  3414, -4344,   878,  2791,  1648,   878, 57653,
+    3317,   371,   577,   325,   296, -4344,  3406, -4344,  3066,  3040,
+   -4344, -4344,   608,  2826, -4344,  3445, -4344,  3395, -4344,  3078,
+    3317, -4344, -4344,   878,  3079,  3336,  3467,  1827,  2454,   340,
+     -34,  3051, -4344, -4344,  1256,    58, -4344,    58, -4344,  2813,
+   -4344, 71855, 71855,   -52, -4344,  1360, -4344,  2821,  2823, -4344,
+   71855,  2828, -4344,  2842, -4344,   645,   645,   645,  3556,   645,
+   -4344,   645,  2922,  2840,  2855,  3616,  3510,  2204,  3512, -4344,
+    3473,  3560,  1286,  2866,   256,   589,  1380, -4344, -4344,  2862,
+   71855,  2164, -4344,  2869,  1616, -4344, -4344,  2873, -4344,  3554,
+   -4344,   812,  3517,  3526,  3529, -4344,  2878, -4344, -4344, -4344,
+   -4344,  1753, 29224,  3446,  2386, -4344,  1705,  3652,  1219,  3317,
+   -4344, 54497,  1219,  3317, -4344, -4344,    92,  1604,  2076,  3403,
+    3507,  3548, -4344,  2194, 58442,   124, -4344, -4344, 56864, -4344,
+   71855, 71855,  1397, 62387, -4344, 71855, -4344,  3326,  2815,  9069,
+   71855,  3539, -4344, 71855, 71855,  3184, -4344, 71855, -4344,    57,
+   -4344,  2351, 16355, -4344, 71855, -4344, -4344, -4344,   154, -4344,
+    1829,   395,   194,  2210, 71855, 71855, 71855,  3211,  3540, 71855,
+    3028,  3733, 71855, 56864, 78956, 71855, 71855,  2397,  1094,  1908,
+   -4344, -4344, 16355, 16355,  1781,  3672,  3735,  3735,  3735,  2020,
+    3118, 16355, 16355, 16355, 16355, 16355, 16355,  1833,  2945, -4344,
+   -4344,    35, -4344,  2947, 16355, 16355, -4344, 16355, 16355, 71855,
+   -4344,  4749, 16355, 16355,   722,  3618, 16355, 16355, 16355,  9859,
+    5268, 16355, 16355, 71855,  3746,  2950, -4344,  2951,  1991, 16355,
+   16355,  2216, 16355, 16355, 16355, 16355, 16355, -4344, -4344, 16355,
+   16355, 22039, 16355, 16355, 16355, 16355, 16355, 16355,  2965, 16355,
+    3735,  3735, 16355, 16355,  2254, -4344, -4344, 16355,  2654,  2654,
+   -4344, 16355, 10671, 16355, -4344, -4344, -4344,  2969, -4344, -4344,
+   -4344, 71855,  3735,  3735, 16355, 16355, 16355,  3735,  3735, 16355,
+    2972,  2976, 16355, 16355, 16355, 16355, 16355, 28435,  2981,  2982,
+    2985, 22039,  2287,  3672,  3672,  3672,   -53,   132,   111,   228,
+    1587, -4344,  3294, 16355, 16355, -4344, -4344, 66332, -4344, -4344,
+   -4344, 16355, -4344, 16355, 16355, -4344, -4344, -4344, -4344, -4344,
+   -4344,  3003, -4344, -4344, -4344, 17979, 22039, 22039,  2995, 22039,
+   22039, -4344, -4344, 22039, 22039, 22039,  3533,  3138, 22039, 22039,
+   22851, 23663, 22039, 22039, 22039, 22039,  1771,  3672, 62387, 22039,
+   -4344, -4344,  2332,  2332, 16355, 44215, 71855, 71855, 71855,  3434,
+   71855, 71855, 62387,  3101,  1495, 71855, 71855, 56864, 71855, 78956,
+   71855,  2189,  3201,  4150, 33958, -4344, -4344, -4344, -4344, -4344,
+    3254, -4344, -4344, -4344, -4344, -4344, 71855, -4344, -4344, 56864,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, 62387, -4344,  1295,
+   56864, 49763,   239, -4344, 72644, 71855, -4344,   -52, -4344,  3273,
+    3302, -4344,  3009,  2020,  3768, -4344, -4344,  3541,  3794, 71855,
+   71855,  -144, -4344,  3542, -4344, -4344,  3027,  3258, 71855, 71855,
+   -4344, 71855, 71855, -4344, -4344, -4344, -4344,  3029, -4344, -4344,
+    2332,  4004, -4344,  3032, 56864, 56864,  1295,  3362,   194,   122,
+   -4344, -4344, 77378, 71855, -4344, -4344, -4344, -4344,  3778, 16355,
+   -4344, 56864,  3122,  3285,  3585,    64, -4344,  3047,  3049, -4344,
+    3210, -4344, -4344,  3061, -4344,  3059, 71855,  2659,  1146, -4344,
+   -4344, -4344, -4344, -4344, 71855,  3065,   237, -4344,  2763,  1146,
+   32380, -4344, 11483,  3624,  2332, 16355, -4344, -4344,  3083,  2397,
+   71855, 71855, 71855, 71855, 71855, 56864, 71855, -4344, -4344,  1595,
+   -4344, -4344, -4344, -4344, -4344,   878, 71855, -4344, 71855,   878,
+   56864, -4344,   371, 71855,   878, -4344,  3636,  3330, -4344, -4344,
+   -4344,  3712, -4344, -4344,  3700,  3086, -4344,  3624, -4344,   371,
+   -4344, -4344,  3705, -4344, -4344, -4344,   371, -4344, -4344, -4344,
+     371,   371,   371,   878,   878, -4344,   101,  3813, -4344,  3092,
+   -4344, -4344, -4344, -4344,  3095, -4344,  3705, -4344, -4344,  3009,
+   -4344, 18791,   880,  2828, 71855, 71855,  3888, -4344, -4344,  3098,
+   -4344,  3535,  3356, -4344,  3270, -4344, -4344,   205, -4344, 71855,
+   16355,  2113, -4344,   111, -4344, 56864,  3782, -4344, -4344, -4344,
+     280, -4344,  3764, -4344, -4344,  3113,  3199,  3876,  3150, -4344,
+    3484,  3484,  1921, 62387,  3577,  3307,  3233,  3577,   307,  3577,
+   -4344, -4344,    -2,   809, -4344,  3237,   974,  3237,  2114, 56864,
+    3329,   -52,   -52,   -52,  1120, -4344, -4344,  2501,  3397,  3397,
+   62387,  3160, -4344, -4344, -4344,  3474, -4344, -4344,  1705, 16355,
+   -4344, -4344,  1380, -4344, -4344, -4344, -4344, -4344,   309, -4344,
+   -4344,  1380, -4344,  3317,  3317, -4344, -4344, -4344, -4344, 67121,
+    2076,  3275,  3548, -4344, 62387,  3890, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,   329, -4344,
+   -4344, 71855, 71855,  1649, -4344,  3663,  3973, -4344,  3176,  3875,
+    1146,  1146,  3875,  1146,  1146, -4344,  3407, -4344,  1146,   123,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,  3830,
+    3724,  1146,  2495,  3590,  1146,  1146,  3918,  1146,  3596,  3597,
+    1146,  1146,  1146,  1146,  3416,  3865, -4344,  1146,  3745,  1669,
+    4093,  3747,  1146,  3607, -4344,  1728,  3873,  1146,  1146,  1146,
+    1146,  1146,  3918,  3613,  3966,  1146,  1146,  3615,  1898,  3617,
+    3619,  1146,  3440,  1146,  1146,  1146,  2003,  1146,  1146,  3628,
+    1146,  3408,  3415,  1146, -4344, -4344,  1146,  1146, -4344,  5588,
+   -4344, -4344, -4344,  2876, -4344, -4344,  1532, -4344, -4344,  3220,
+    3227, -4344, -4344, -4344, -4344,  3549, -4344,  3333, -4344,  3565,
+    3431, -4344,  3184,   152, 67910, 71855, -4344, -4344,  3267,  3269,
+    1024, -4344,  2020,  3253,  3266, -4344,  3659, 88783, -4344, -4344,
+   71855, -4344, -4344, -4344, -4344,  3472, -4344, -4344, -4344, -4344,
+    1638, -4344,  4025,  3637, -4344, -4344,  3912, -4344,  3710,  4082,
+    3375,  3981,  3720,  2397,  3875,  3485,  4098,   453, -4344,   112,
+    3059,  3521,  1760, 71855,  3906,  2397, 71855, 71855, 71855, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, 71855, -4344, -4344, -4344,
+   -4344, -4344, -4344,  3184,   346,   334, -4344,  3735,  3305, 16355,
+    3306,  3318,  3319, 16355,   430,   415,   397,  1280,  1955,   459,
+     262, 16355,  3320, 13107, -4344,  3324, -4344, -4344,   392,   405,
+     512,   556,  3332, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344,  3926, -4344,   413,  3334, -4344, -4344, -4344,
+   -4344,  3313, -4344, 16355,   600,   423,   466,   273,  3335,   481,
+    2008,  2013,  3331, 71855, 71855,  3735,  3337,   609,   618,  3735,
+    3341,   505,   703,  2089,  2138,  2143,   521,  2146,  3547,  1318,
+     536,   560,  1338,   611,   613, -4344,  1377,  3342,  3343,   886,
+     313,  3735,  3344,   321,  3346,  3347,  1438, 13919, 14731, 15543,
+     249,  1005, -4344,  3345, -4344,  2951,  3348,  3355,   359,   291,
+    1567,  3357,  3360,  2174,  3454,  3454,  1622,  1101,  1643,  1101,
+    1232, 62387,  3364, -4344, -4344, -4344, -4344,  3454,  3454,  3454,
+     219,  3735,  3365,   275, -4344, 16355,  3361,  3367,  3374, 62387,
+   16355,   210, -4344, -4344, -4344,  2767,   315, -4344, -4344, -4344,
+   -4344, -4344,  1234, -4344,  3363, -4344,  1040,  1993,  3340,  9859,
+   -4344,  1473,  3340,  3501,  1662,  1662, 22039, -4344,  3371,  3034,
+    3437, 17167,   314, 17167,   314,  3340,  3340,  3340, -4344, 22039,
+    3382, 22039, 22039, -4344,  3672, -4344, -4344, 51341,  3383,  3384,
+   -4344, -4344,  -174, -4344, -4344,  3386, 71855,  1495, -4344, -4344,
+    2189, -4344, -4344, -4344,   145, -4344, -4344,   247, -4344,  3385,
+     178,  3059,  3962, 71855,  3390, -4344,  3915,  3919,  3920,  3921,
+   -4344, -4344, -4344, -4344,  3922, -4344,  3924, -4344, -4344,  3400,
+   -4344, 71855, 27646, 62387, -4344,  3401, -4344,  4054, -4344,  3839,
+   -4344, -4344,  2183,  3639, -4344, -4344, -4344, -4344, 45009,  1064,
+   -4344, -4344, 71855, -4344,    82,   240,  3586,  3584, -4344,  3009,
+   71855,   -52,   -52, 71855, -4344,  3986, -4344,   251,  3412, -4344,
+    3413, 62387, -4344, -4344,   286, 56864, 56864,  3417, -4344,  3644,
+     129,  3827, -4344,  3646,  4217,  4217,   106, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+    3420,  4073,  4033,  3858,  4047,  3385, 45009, -4344, 71855, -4344,
+   25269,  3584, -4344,  4049,  3665,  3666,  -116, -4344, 59231, -4344,
+    2020,  1267,  3484, -4344,  3484,   113, -4344, -4344,  3994, -4344,
+    3818, -4344, 78956, -4344, 62387, 78956,  4057,  3441,  3442,  3444,
+    3455,  3456, 75011, 16355, -4344, -4344, -4344, 11483,  3458, -4344,
+   75011, -4344, -4344, 22039,  2201, -4344,  2445, -4344,  2020, -4344,
+     -52,  4056, -4344,  2020,  3464, 71855, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+    3662,   878, -4344, -4344, -4344, -4344, -4344,  3850,  3317,  2826,
+    4056,   878,  4219, -4344,   878, 71855, 71855,   878, -4344, -4344,
+   -4344, -4344,  3769,  1256,  3674,    58, -4344,  2201,  2020,  3476,
+    3477, -4344, -4344, -4344,  2225, -4344,  1040,   645,  3881, -4344,
+    4094, -4344, -4344, -4344, -4344, -4344,  1933,  1668, -4344,   222,
+     238,  3891,   306,  3479,  1146, -4344, -4344, -4344, -4344,  3892,
+    1264, -4344,  3285,  3237,  3237,  3502,  3505, -4344, -4344,  4069,
+   78167,  3907,  4165, 62387,  4069,  3285,  4208, -4344,  3285, -4344,
+   -4344,  3285, -4344, -4344,  3742,  3748, -4344, -4344,  3749, -4344,
+   -4344,  1250,  2463, -4344,  2458,   283, -4344, -4344, -4344, -4344,
+   -4344, 71855,  3656, -4344,  2195, -4344, -4344, -4344, -4344,  2747,
+   -4344, 33169,  3975,  2544,  3514, -4344, -4344, -4344, 54497, 54497,
+   -4344, -4344, -4344, -4344, 71855,   102, -4344,  3518, -4344, 26063,
+   -4344,  1546,  3953,   263, -4344, -4344, -4344, -4344, -4344,  2671,
+    2978, -4344, -4344,  4273,  3859,  4072,  3741,  2978,  2252,   -52,
+    1793, -4344,  2841,   -52,  1793,  2841,  2841, 71855,   -52, -4344,
+    2181,  1146, -4344, 71855,  1024,   254,  1024, -4344,  1062, 71855,
+   41848, 68699, 71855, 71855, 71855, 71855,   254,  1778,  1778, 71855,
+    2335, 69488,   254,   -52,   -52,   -52,   -52,  2747,  1146,  2335,
+   -4344, 69488, -4344, 71855, 71855,  4076, 71855,  4079, 71855, 71855,
+   -4344, 62387, 71855, 69488, -4344,  1146,  1680,  1778, 70277,  1778,
+    1778, 71855,   254, 71855,  2677,   -52,   254, -4344, 71855, -4344,
+   -4344, 71855, 71855,   254,   254,  2161, -4344,  2677,  2677,  2896,
+   -4344, -4344, 71855,  2335, 69488,  3536, -4344, -4344, 60020,   -52,
+     -52, -4344,  1146,  1146,  3951, -4344, -4344, 88500, 88422,  2119,
+    1146,  3651,  3982,  2093, 71855, -4344,  3686,  3688, -4344, -4344,
+   -4344, -4344, -4344,  1024, 69488, 71066,  4112, -4344, 16355,  4202,
+    4203,  4204,  4206,  4207,  4210,  4211,   142, -4344,  4213, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344,  4220,  4221, -4344, -4344,  4222, -4344, -4344,  4223, -4344,
+    4224,  4226,  4227,  4228, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344,  4229,   182,  4230,  4233,  4234,  4237,  4238,  4239,  4240,
+    4241,  4244,  4245,  4246,  4247,  4248,  4250,  4252,  4253,  4254,
+    4255,  4258,  4259,  4260,  4262,  4271,  4274,  4275, -4344,  4276,
+    4281, -4344, -4344, -4344, -4344, -4344, -4344, -4344,   248, 71855,
+    3741,  3660,  3736, 71855,  3681, -4344,  4147,  2935,  3875,  4069,
+   -4344,  4360, -4344, -4344,  3653, -4344, -4344, -4344,  3789, 56864,
+    3987,  1146,  1326,  1326,  4068, -4344,  3654, 71855, 71855,  3645,
+     846, -4344,  2427, -4344, 19603, -4344,  3647,  3454,  2020,  3454,
+    3454,  3454,  1752, 16355, 16355,  4300,  5830,   153, -4344, 60809,
+   -4344, -4344, -4344, 60809,  5830,  2265,  3454,  3649, -4344,  4218,
+    4225, -4344, -4344, -4344, 16355, 16355, -4344, 16355,   351, -4344,
+   16355, 16355, 16355, 16355, 16355, -4344, -4344, 22039, -4344,  3643,
+    3650,  3454, -4344, -4344,  3657,  3454, 16355, -4344, -4344, -4344,
+   -4344, 16355, -4344, 16355, -4344, 16355, 16355, -4344, 16355, 16355,
+   -4344,  3454,  3454, 20415, 16355, 16355,  3658,  3454, -4344, 16355,
+   16355, 16355, -4344, 16355,  1636, 16355,  1720, 16355,  1995, 16355,
+   -4344, 16355, -4344,  3454,  3454, -4344, 16355,   526, -4344,  2335,
+   -4344,  3735,  3454, -4344, 42637, -4344, -4344,   149, 28435,  3661,
+     149,  3664, 22039, -4344,  3454, -4344, -4344, -4344,  1676,  3667,
+    3454,  2274, -4344, -4344, -4344,  3655,  2020, -4344, -4344, -4344,
+   -4344, -4344, -4344, 22039,   364, 22039,  3501, 22039,  5268,  5268,
+    2554,  9859, -4344,  1477,  3501, -4344, -4344, 16355, 16355, 45803,
+   71855,   426, -4344,  3681,  1321, -4344,   146, -4344, -4344, 56864,
+   -4344, -4344, -4344, -4344, -4344,   178, 62387,  3669, -4344, -4344,
+   -4344, -4344, -4344,  3705, -4344,  4163,  3413, -4344,  3896,  3900,
+    3903, -4344, 35536, -4344, -4344, -4344, -4344, 35536,  2055,  1295,
+   -4344, 71855, 56864,  3670,  3671,  3673,  3905,  3824, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,  3584,
+    3675,  3317, -4344,  3827, -4344, -4344,  3677, -4344,  2351,  3397,
+    1195, 71855, -4344, 16355,   -52, -4344,  3908, -4344, 71855, 71855,
+   -4344, -4344, -4344, -4344,  1077, -4344,  3678,  2696, -4344,  3681,
+   -4344, -4344,  3705,  3705, -4344,  4004, 27646,  4107,  1295, 56864,
+    4297, -4344, -4344,  3690,  1040, 24475,  3765, -4344,  3687,  3006,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,  3827,  3125,
+    4290,  3584, 78956, 78956, 78956, -4344, -4344, -4344,  3771,  3285,
+    3237,  3237,   289,  4074, -4344, -4344, -4344, -4344,  3059, -4344,
+   -4344,  1546, -4344, -4344, -4344, -4344, -4344,  1146,  2020, -4344,
+   32380, -4344, -4344,  1778,  3317,   471, -4344, 56864, -4344,  4132,
+   -4344, -4344,  3317, -4344,   -52, -4344,   371,   371, -4344, -4344,
+   -4344,  3576,  3894, -4344, -4344, 18791, -4344, 71855, -4344,  3696,
+   -4344,  4174, 71855,  4355,  3706, 22039,  3707, 22039,  1546,  3958,
+    3708,  4504,  2335,  3397, -4344,  4114, -4344, -4344, -4344, -4344,
+    4018, -4344,  4512, -4344, -4344, -4344,  3059, -4344,  3577,  2524,
+    4179,  3237,  4124,  3237,  3237, -4344, -4344, -4344, -4344,   338,
+    2335,  2335,  2335,  2335,  2458, -4344,   160,  1125,  2338,  1546,
+     212,   283, -4344,  3716, -4344, -4344, 60809,  4457, -4344, -4344,
+   -4344, -4344, -4344, -4344, 16355, -4344, -4344,  1116,   497,  1344,
+   26063, 71855, 46597, -4344,   728, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344,  1146, -4344,  1146,   -52,  3999,  4001,
+    4002,  4003,  4006,  4048, -4344, -4344, 71855,  4167, -4344,   -52,
+    2380,   -52,   -52,   -52,   -52,  2335,   -52,   -52,  2279, -4344,
+   -4344, -4344,   207, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, 62387,
+   -4344, -4344, -4344, 71855,    11, 71855,  3739,  4277,  4279,  1024,
+      63, 71855,  3743,  3934,  3961, 52919, 88866, -4344, -4344, -4344,
+    4183,  4183,  2383,   305, 69488, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, 71855, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344,  1638,  3751, -4344,  1546, -4344, -4344, -4344, -4344, 55286,
+     -52, -4344,  3995, -4344, -4344, 71855,  3751, -4344, -4344,   745,
+   -4344,  3923,  3998,   -52, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, 88866, 69488,  3752, -4344,   467, -4344,
+   -4344, -4344, -4344, 69488,  3983,  3985, -4344, 71855, 69488, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, 71855, -4344, -4344, -4344, -4344, 59231, 60809,
+   -4344,  3189,  3212,  5588, -4344, -4344, -4344,  3220, -4344, -4344,
+   -4344,   247,  4197,  1146,  1131,   545, -4344,  4122, -4344, -4344,
+    2842,  4196,  4199,  3770, -4344,  3772, -4344,  3767, -4344, 67910,
+    2020,  3775,  3775,  3776,  3776,  3777,  3777,  3779,  3659, -4344,
+    3780,   -52,  2335,   -52, 61598,  2335,    29,  1546,   961,  1546,
+   88783, -4344,  2335,   -52,   -52,   -52,   -52,  2335,  2335,  2335,
+    2335,  2335,   -52,   -52,   -52,   -52,   -52,   -52,  2335,   -52,
+    1226,   -52,   -52,  2335,  2528,   -52,  2335,   -52,  1778, -4344,
+     272, -4344,  3783,  2937,  3681, 62387,  3784, -4344,  4365,  1146,
+    1146,  1146,  1146, -4344,   288, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344,   247,  4566, -4344,
+    3804, -4344, 78956, -4344,  3329,  -123, -4344, -4344, -4344, -4344,
+   -4344, 71855,  2204, -4344, 71855, -4344, 39481, -4344, -4344, -4344,
+   -4344,  2000,  1699, -4344,  1705,  1604, -4344,   491,  4121, -4344,
+   -4344,   218,  3787, -4344, -4344,  1149, 17167,  1673,  3454, -4344,
+   -4344, -4344, -4344, -4344, 16355,  2020,  2449, -4344,  3790,  3790,
+    3791, -4344,  3793,  4188,  3790, -4344, -4344, -4344, -4344, -4344,
+   -4344,  4534, -4344, -4344, -4344, -4344,  4356,  3791,  4357, -4344,
+    3790, -4344,  3886,  4589,  3861,  3805,  3806,  3807,  3454, -4344,
+    3454, 16355, 16355,  1693,   532,  1725,  4570,  4125,  1262,  1277,
+     591, -4344,  1763,  3626,  3454, -4344,  3454, -4344,  1782,  1794,
+    1807,  1812,  1284,  1822,  2280, -4344, -4344, 17167,  1832,   268,
+     593,  3454, -4344,  1844,  1293,  1320,  1872, 16355,  1877, 16355,
+    1884, 16355,  1896,  1917, -4344, -4344,  1930,  3814,  3814,  3808,
+    3815, -4344, 71855, -4344, -4344, -4344, -4344,  3935,  3937,  3454,
+    3816,   149,  3454,   149,   184, -4344,  4055,  1447,  3454, -4344,
+   -4344, 71855, -4344, -4344, -4344, 16355,  1072,   227, -4344, -4344,
+   22039,   788, 22039, -4344,  3817, -4344, -4344, -4344, -4344,  4342,
+    4617, -4344, -4344,  4086, -4344, -4344, -4344,  3390, -4344, -4344,
+     192,  4475,  3825, -4344, -4344, -4344, -4344, -4344, 45009, -4344,
+    1143,  3835, 47391, 56864,  4261,  3317, 18791, -4344,  3327, 71855,
+    1024,  4407,   259,  3997,  4364, -4344, -4344, -4344,  2020, -4344,
+   56864, -4344, -4344, -4344, 71855, 71855,   880, -4344, 37114, -4344,
+   -4344, -4344, -4344,  3840, -4344, -4344, -4344,  4482, -4344,  4451,
+   45009,  3385, 56864, 16355,  3125,  3837,  3842,  3843,  3845,  3846,
+    3847, 26063, 26063,  4398,  4400, -4344,  4269,   968,  4269, -4344,
+   40270, 26063, 26063,  2731,  2842,  4612,  4445,  4290,  3059,  3059,
+    3059,  3484,  3484, -4344, -4344, -4344, -4344, -4344, -4344,   302,
+   -4344, 11483, -4344, -4344, -4344, -4344, -4344,  3385, -4344,  3705,
+   -4344,  3584,   878,  4503, -4344,  4505, -4344,  3852,  4506,  4268,
+   -4344, -4344,  2335, -4344, -4344, 71855,  2725, 71855,  3154, -4344,
+    4624,  3868, 22039,  4516,  3870,  4450, -4344, -4344,  3887,  3577,
+   -4344,   195,  1618,  3577, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344,  1696,  4577,  3204,  4437,
+   -4344, -4344, -4344,  2332,  2332, -4344, -4344, -4344,  1531,  4405,
+   -4344, 26063,  3827, 46597,  -151, -4344, -4344,  3872, 71855,  2677,
+     -52, -4344, -4344, -4344,  4575, -4344,  4576,  2152,  4320,  4527,
+   -4344, -4344,   312, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344,  2252, -4344,  3883,  1546,  4291,
+    3889, 16355, 71855, -4344, -4344, -4344,  3964, -4344, -4344,  3895,
+   43426,  1326,  1326,  2286, -4344, -4344, -4344, 88866, -4344,  3790,
+    3790,  3790, -4344, -4344,  1074,  3791, -4344, -4344,  3897, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344,   749,  2227, -4344,
+   -4344,   749, -4344, -4344, -4344,   258,  2176, -4344, -4344, -4344,
+   -4344, -4344,  3899, -4344,  3790,  3791,  3791, -4344, -4344,   749,
+    3790, -4344,  3790,  4263,  3952, -4344,   206,  3790,  3790,  3790,
+    3901,  3793, -4344, -4344, -4344, -4344, -4344,  4569,   654, -4344,
+   88866, -4344, 71855, -4344,  3778,  3778, -4344, -4344, -4344, -4344,
+    4130, -4344, -4344,  1934, -4344, 71855, -4344, -4344, 71855, 71855,
+     -12,  1077,  3902, -4344, -4344, -4344,  3910,    21, -4344,   361,
+   -4344, -4344,  3962,  2242,   478,  4116,  1556, -4344, 71855, 71855,
+   -4344, -4344, 71066, -4344, 37903, -4344, -4344, 38692, -4344, -4344,
+    -107, -4344, -4344,  2127, -4344, -4344,  2335, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, 43426,  1146,  1146, -4344,   400,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,  4324,
+   43426,  1191, 71855,   -52,  2841,  2841,  1546,  3196, -4344,  4069,
+    4483,  3059,   283, -4344, -4344,  3333,  3909, -4344, -4344, 71855,
+    2297, -4344, -4344,  6513,  1705, -4344,   218,  4336, 71855, -4344,
+   -4344, -4344, -4344,  4205, -4344, -4344, -4344, -4344,  4337,  5268,
+   -4344, -4344,  2020, 16355,  1386, -4344, -4344,   749,  4345, -4344,
+    1470, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344,  3911,  5830,  4473, -4344, -4344, -4344,
+   -4344, -4344,  5268,  5268, -4344, -4344, 16355, -4344, 16355,   645,
+    3913, 16355, 16355, -4344, 16355, -4344,   403,  3914,  4088, -4344,
+   -4344, -4344, -4344, -4344, -4344, 16355, -4344, -4344,  5268, -4344,
+   16355, -4344, -4344, 16355, -4344, -4344, 16355, 16355, -4344,  1942,
+   -4344,  1956, -4344,  1997, -4344, -4344, -4344,  1546,  3925,  3928,
+    2335,  3454, -4344,  3931,  4327, -4344, -4344, -4344, 16355, -4344,
+    3454, -4344,  3454,  4531,  5830,  2002, -4344, -4344,  2299, -4344,
+   -4344, -4344, 16355,  1072, -4344, -4344, -4344, -4344, -4344, -4344,
+    4299, -4344,  3424, 35536,  4152,  4519, -4344, -4344, -4344, -4344,
+    1390, -4344, -4344,  2326, 71855,  4711,  4363, -4344,  1024,  4407,
+    4472, -4344,  4498, -4344, -4344, -4344, -4344,  3940,  3751,  3933,
+   -4344,  1146,  1746,  2347, -4344, -4344, -4344,  3938, 18791,  3945,
+   -4344, 27646, 56864,  4553,  3385,  1324,  2842, 26063, -4344, -4344,
+   -4344, -4344, -4344,  3006,  3941,  3943,  3944,  3006, -4344, -4344,
+   -4344,  4508, -4344,  4269,  4269,  4509,  4510, -4344,  2518,  2864,
+    1285, -4344, 16355, 16355,  4065,  4445,  3237,  3237,  1546, -4344,
+   -4344, -4344, -4344,   -52,   -52,  2803,   -52,  4603,  4649, -4344,
+    2361, -4344, -4344,  2369, -4344,  4499,  4291, -4344,  3265,  1546,
+   71855,  4731,  4759,  4069, -4344, -4344, -4344,  4378, -4344,  4069,
+   -4344,  1546, -4344,   177, -4344, -4344,  3638, -4344, -4344,  4734,
+    4743,  4640,  4746,  1531, -4344,  2015, -4344,  -151,  3584,  1564,
+   -4344,  3996, -4344,  1189, -4344, -4344, -4344, -4344, -4344, -4344,
+    4319, -4344,  1808, -4344, 43426, -4344, 71855,  2382, -4344, 43426,
+    2009,  3993, -4344, 43426, 16355, -4344,  2390, -4344,   196, -4344,
+   -4344, -4344, 52919,  4263, -4344, -4344, -4344,  4766,   502, -4344,
+    4767, -4344,   749, 60809, -4344, -4344, -4344, -4344,   645, -4344,
+      15, -4344,   749, -4344, -4344,  4178, -4344, -4344, -4344,   645,
+     749, -4344, -4344, -4344, -4344,  2010, 71855,  1934, -4344, -4344,
+   59231,  2456,   -52,  3272,  4075, -4344,  4198, -4344,  4680,  1750,
+    4544,  3681,  1146,  1146,  4744, -4344, -4344,  4761, -4344,  4606,
+    4547, -4344,   798, -4344,  4776, -4344,   749,  4776,  2010,  4440,
+   -4344,  2010,  2010, -4344,  3515, -4344,  1934, -4344, -4344, -4344,
+   71855, 71855, -4344, -4344, -4344, -4344, -4344,  4007, -4344, -4344,
+    4441,  4197, -4344,  4443, -4344, -4344,  4401, -4344, 16355, 16355,
+    4442, 71855,  4446, -4344,  4740,  4797,  3751,  1424, -4344, -4344,
+    2392, -4344, -4344, -4344,  2407, -4344, -4344,  4009, -4344,  2424,
+   -4344, -4344, -4344, 71855, -4344,  2442,  2476, -4344, -4344,  2500,
+    2841,  2841,  1524,  1191,  4013,  2506,   -52,   -52,   -52,   -52,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344,   333, -4344, -4344,
+   -4344,   212,  3651, 43426,  4016,  7768, -4344,  4311,  4340,  4021,
+    4019, -4344, 88866,   -52,   278, 71855,  1729,  2020,  4022,  4027,
+    4029,  4031, -4344,  4032,  2509, -4344,  3886, -4344,  2332,  4034,
+    4036,  2016,  4035, -4344, -4344,  3454,  2018,  1333,  2519,  4492,
+    4581, -4344,  4414, -4344,  2034,  1853,  2053,  2205,  2207,  2209,
+   -4344, -4344, -4344, -4344, -4344, -4344,  4037, -4344, -4344,  4800,
+    4465,  2020, -4344, -4344,   357,   149, -4344,  3459, -4344, -4344,
+    4045,  2002, -4344,  4477, -4344,  2527,  4681,  4572, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, 56864,  4471,  4648,  4838,  3584,   202, 71855,
+    4363,  4714, -4344, -4344, -4344,  4298, -4344, 71855, 18791, -4344,
+   -4344,  1746, 71855, 44215,  4062,  3840, -4344,  3385, 56864,  1676,
+   -4344,   271, -4344, -4344,  4604,  4613, -4344, -4344, 16355,  4066,
+   16355,  4067, -4344, -4344,  1024,  1024, -4344,  1285, -4344, -4344,
+    2020,  -156, -4344,  2020, 71855, -4344,  4065, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344,   -52,  4704,  4467, -4344, 71855, -4344,
+     330,  2564, -4344, -4344,  4071,  4063,   -52,   195, -4344, -4344,
+   -4344,  4756, -4344, -4344, -4344,  4757,   645,   645,  4832,   645,
+   -4344,  4833,  4835,  2015, -4344, -4344,  4497,  4497,  4511, -4344,
+    2569,  4266, -4344,  4291,  2578, -4344, 71855,  2585,  2235,  2063,
+   43426,  4515, -4344, -4344, -4344, -4344, -4344, -4344, 60809, -4344,
+   -4344,  4776,  2591, -4344, -4344, -4344,  2592, -4344, -4344, -4344,
+   -4344, -4344,  2010, -4344,  4085, -4344,   473, -4344, -4344, -4344,
+   -4344, -4344,  3896,  3900,  3903,  2528,  2528, 16355, -4344, -4344,
+   -4344, -4344, -4344, -4344,  4522,  4278, -4344, -4344, -4344, -4344,
+   -4344, -4344,   -52,   -52, -4344, 59231, -4344,  4878,  4873, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344,  4083, -4344, -4344, 16355,
+   -4344, -4344,  2211, -4344,  4291, -4344, -4344, -4344, -4344,  2020,
+    5268,  4815, -4344, -4344,  4387,   -52,  4762,  2204,  4535, -4344,
+   -4344, 71855, -4344, 71855, 71855, -4344,   -52,  4096, -4344,  4102,
+   -4344,  2335,  1060, -4344, -4344, -4344,  2252,   493, -4344, -4344,
+   -4344,  4682, 62387, -4344,  1131,  2638, -4344, -4344,   -52,   478,
+   -4344, 71855,  3778, -4344, -4344, -4344, -4344,  4103,  4105, -4344,
+   71855,  4720, -4344, -4344, -4344, -4344, -4344, -4344,  4546,  4115,
+    4898, -4344, -4344, -4344, 16355, -4344, -4344, 16355, -4344, -4344,
+    4587,  4758, -4344, -4344, -4344, -4344, -4344, -4344,  4128,  2335,
+   16355,  4874,    10, -4344, -4344,  3454, -4344, -4344, -4344,  4555,
+     156, -4344, -4344, -4344,  1390, -4344,  4549, 56864, -4344,  3317,
+    4363,  2842, -4344,  4676, 71855, -4344, -4344, -4344, -4344, -4344,
+    4133, -4344, -4344,  3385,   476, -4344, -4344, -4344,  2020, 71855,
+    2020, 71855,  4751,  4751, -4344, -4344, 16355, -4344,  4935,  4146,
+   -4344, -4344, -4344,   -52,  4799, -4344, -4344,  4155,  4504, -4344,
+   -4344,   356, -4344, -4344, -4344, -4344, -4344,   645, -4344,   645,
+     645, -4344,  4688,  4688,  4804,  1060,  2434,  2657, -4344,   493,
+    2646, -4344,  2063,   467,   -52,  1146,  1146,  1146, -4344,  2063,
+   -4344, -4344, -4344, -4344, -4344,  4159, -4344, -4344,   749,   645,
+     749, -4344, 71855,  4650, -4344, -4344,  2328, -4344, -4344, -4344,
+   -4344, -4344, -4344,  4169,  2334, -4344, -4344,  2647, -4344, -4344,
+   -4344, -4344, -4344,  4341, -4344,  4305, -4344, -4344, -4344, -4344,
+   71855, 71855, -4344,  4582,   426,  1060, -4344, -4344,  2655,   426,
+     493, -4344, -4344,  4932,  4960, -4344,  2063, -4344,  4442,  4513,
+   -4344, -4344, -4344,  2175, 88866,  4837,  4181, -4344,  4884, -4344,
+    2340, -4344, -4344, -4344,  4190,  4189, 16355, -4344, -4344, -4344,
+   -4344,  3017, -4344,  4840, -4344, -4344,  4838, -4344,  4367, -4344,
+   -4344, -4344,  4392,  3827,  4200,  4201,  4209,  4212,  2085,  4216,
+    4232, -4344,  4249, 71855, -4344,   -52,  3705, 22039,  4251,  4868,
+    1787, -4344, -4344, -4344, -4344, -4344, 54497, -4344, -4344, -4344,
+   -4344,  4256,  4432,  1146,  4870,  4872,  1146,  1146,  1146,  1146,
+    4264,  2657, -4344,  4855, -4344,  4263, 71855, -4344, -4344, -4344,
+    2335,   -52,   -52, -4344,   467, -4344, -4344, -4344,  2660, -4344,
+    1736,  4637, -4344, 16355, -4344, -4344,  4478, -4344, 86057,  1688,
+   -4344, -4344,  4236,  4214,  2546, -4344, -4344, -4344, -4344, -4344,
+    3681,   426,  1556, -4344, 88866, -4344, -4344,  3778,  4533, -4344,
+    3791, -4344, -4344,  3514,  3509,  4542, 16355,  4349,  4350, -4344,
+   -4344,  4354,  4368, -4344,  4374, -4344, 71855,  2747, 73433,  3228,
+   -4344, -4344,  4970, -4344,  4983, 71066, 71066, -4344, -4344, -4344,
+   -4344,  3463, 71855,  1146,  4502, -4344, -4344,  4267, -4344, -4344,
+      53,   -52,  1146,  1146,  3681,  3681,  1546, 71855,  4500, -4344,
+   -4344,  1146, -4344, -4344, -4344, -4344, -4344, -4344, -4344, 71855,
+   -4344, -4344, -4344,   447, -4344,  2398, 16355,  4900,  4428, 71855,
+    1745, -4344, 87635, 87635, 71855, -4344, -4344, -4344, -4344,  6781,
+   -4344, -4344,  1528, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344,  5033, -4344,  4265, -4344, -4344, -4344,
+   -4344,  5002,  4683,  5004, -4344, 71855, -4344, -4344, -4344,  4740,
+    3778,  4111, -4344,  1020,  4270, 16355,  1653, -4344,  5050,  1677,
+    2074, -4344,  5268, -4344,   383, -4344, -4344, -4344, 76589,  3933,
+    4592,  4373,  2685, -4344, 88426, -4344, -4344, -4344,  4272,  2693,
+    4517,  2709,  3397, -4344, -4344,  2734, -4344, 21227, -4344, -4344,
+   -4344, -4344,   -52,   -52, -4344, -4344, -4344, -4344, 62387,  2737,
+   -4344, 62387, -4344,  1249,  1249,   707,  2020, 16355, -4344, 16355,
+    4448, -4344, -4344,  4879, 71855, -4344, -4344, -4344, -4344, 16355,
+   -4344, 86057, 86057, -4344, -4344, -4344, -4344,  5052,  4698, -4344,
+    4705,  4280,  4948, -4344, -4344, -4344, -4344,  4959, 86057, -4344,
+   -4344, 62387, -4344, -4344,  5268, -4344,  3509, -4344, -4344,  4404,
+    4614, -4344,  4408, -4344,  3210, -4344, -4344,  3059,  4875,  4457,
+    1676, -4344, 73433,  4397,  3778, -4344, -4344,  1546, -4344,  4517,
+    4638, -4344,  4267, -4344,  2745, -4344,  3501, -4344, -4344,  2657,
+   -4344,  4500, -4344, -4344,  5095, -4344,  1428,  4727,  4728, -4344,
+   -4344,  4761,  2020,  2020, -4344,   454, -4344, -4344,  4861,  4954,
+   16355,  2020, 82112,  4301, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, 86846, 16355, -4344,
+    1528,  5033, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   86057,  2080, -4344, -4344, -4344, -4344, -4344,  5062,  4405,   476,
+   -4344, -4344,  4941, -4344, -4344, -4344, -4344, -4344, 21227, -4344,
+   -4344, -4344, -4344, -4344,  4507,  4984, -4344,  4480, 16355, 86057,
+   -4344,  4962, -4344,  4887,  2020,  4826,  4309, -4344,  4306,  2020,
+    4998, 87635, 87635, -4344,  4111, -4344, -4344,   645,  4892, -4344,
+   -4344,  4422, -4344,  1249,  1249, -4344,   514, -4344,  2020, 82901,
+    5071, 71855, -4344,  4554, -4344, -4344, 16355,  4986, 63176, 83690,
+    4321, -4344, -4344, -4344, 86057, -4344,  4763,  4323,  1676, -4344,
+   -4344, 16355, -4344,  4980,  4562, -4344,  4325, -4344, 86057,  2020,
+   86057, -4344, -4344,  4924,  7991,  2573, -4344,  4330, -4344, -4344,
+     888, 34747,  4641,  1709,  2020,  5088, 86057, 71855, 79745,  4990,
+   84479,  4951, 71855,  3778,  4952,  4953, -4344, -4344, -4344, -4344,
+   -4344, 62387,  2761, -4344, -4344, 71855, -4344, -4344, -4344,  2002,
+    4578, -4344, 80534, -4344,  2924,  4695,  4518, -4344, -4344,  5025,
+    3023, -4344, -4344, -4344, 36325,  4339, -4344,  1146, -4344,  4779,
+   86057, 86057, -4344, -4344, -4344, -4344, 50552, 16355, -4344, -4344,
+   -4344, -4344,  2105, -4344, 71855, 18791,  4459, 81323, 85268, -4344,
+   -4344, -4344, 26856, -4344, -4344, -4344,  4963, -4344,  2020, -4344,
+   -4344, -4344, 50552, -4344, -4344, -4344
 };
 
   /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -4060,769 +4097,776 @@
      means the default is an error.  */
 static const yytype_uint16 yydefact[] =
 {
-    2023,  3096,  1312,  3048,     0,     0,     0,     0,     0,     0,
-    3050,  3096,   152,  2138,  2139,     0,  1966,     8,     0,  1312,
-     466,     0,     0,   164,     0,  1980,     0,  2195,     0,     0,
-    1312,     0,  2189,     0,     0,  1312,  2028,  2172,   443,     0,
-    3050,     0,  1378,     0,  2115,  2905,     0,     0,     0,     0,
-    2041,     0,  2902,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  2906,     0,     0,     0,     2,     9,    14,    43,
+    2026,  3132,  1315,  3084,     0,     0,     0,     0,     0,     0,
+    3086,  3132,   152,  2141,  2142,     0,  1969,     8,     0,  1315,
+     467,     0,     0,   164,     0,  1983,     0,  2198,     0,     0,
+    1315,     0,  2192,     0,     0,  1315,  2031,  2175,   444,     0,
+    3086,     0,  1381,     0,  2118,  2917,     0,     0,     0,     0,
+    2044,     0,  2914,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  2918,     0,     0,     0,     2,     9,    14,    43,
        0,    80,    63,    70,    32,    42,    40,    39,    37,    41,
       38,    31,   141,    87,    66,    26,    16,    21,    18,    28,
-      17,    20,    24,    25,    23,    27,    22,     0,    67,  1236,
+      17,    20,    24,    25,    23,    27,    22,     0,    67,  1239,
      144,   143,   142,    34,    84,    29,    30,    33,    77,    83,
-      78,    79,    92,  1343,  1340,  1888,  1342,  1356,  1364,  1365,
-    1366,  2024,    46,    59,    50,    47,    49,    53,    52,    61,
+      78,    79,    92,  1346,  1343,  1891,  1345,  1359,  1367,  1368,
+    1369,  2027,    46,    59,    50,    47,    49,    53,    52,    61,
       62,    48,    60,    57,    58,    51,    55,    56,    54,    72,
       85,   148,     0,    44,   145,   111,   136,   137,   117,   135,
      123,   124,   112,   113,   114,   100,    96,   133,    97,   131,
      121,   115,   102,   101,   139,   116,   130,   129,   134,   128,
      138,    98,    99,   125,   120,   103,   107,   110,   122,   132,
      106,   105,   108,   127,   119,   126,   118,   104,   109,    45,
-      64,  2140,    65,    86,    81,    74,   149,    75,    93,    95,
+      64,  2143,    65,    86,    81,    74,   149,    75,    93,    95,
       94,    76,   147,   140,    88,    19,    69,    89,    68,    15,
       36,    90,    91,    82,   150,    73,   146,    71,    35,     0,
-    1133,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1964,     0,  1071,  3094,  3095,  3096,  1314,  1313,     0,  3050,
-    2299,  1299,     0,  2383,  2382,  2385,  2387,  2388,  2389,  2390,
-    2391,  2392,  2335,  2394,  2396,  2397,  2398,  2399,  2400,  2336,
-    2401,  2402,  2403,  2404,  2405,  2406,  2337,  2338,  2408,  2409,
-    2410,  2411,  2412,  2339,  2340,  2413,  2414,  2415,  2416,  2417,
-    2418,  2419,  2420,  2421,  2422,  2342,  2423,  2343,  2424,  2425,
-    2427,  2428,  2458,  2429,  2430,  2431,  2432,  2433,  2434,  2344,
-    2435,  2436,  2437,  2438,  2439,  2440,  2441,  2442,  2443,  2345,
-    2444,  2445,  2447,  2449,  2450,  2451,  2452,  2453,  2346,  2454,
-    2455,  2456,  2457,  2347,  2459,  2461,  2462,  2464,  2466,  2465,
-    2467,  2468,  2373,  2469,  2470,  2332,  2472,  2473,  2474,  2475,
-    2476,  2478,  2479,  2374,  2480,  2481,  2482,  2483,  2348,  2349,
-    2485,  2486,  2487,  2488,  2495,  2489,  2490,  2491,  2804,  2494,
-    2350,  2496,  2351,  2500,  2499,  2501,  2295,  2502,  2296,  2503,
-    2352,  2505,  2506,  2507,  2508,  2353,  2510,  2511,  2512,  2513,
-    2514,  2515,  2517,  2354,  2519,  2520,  2521,  2522,  2523,  2524,
-    2805,  2526,  2527,  2528,  2529,  2531,  2532,  2534,  2536,  2537,
-    2538,  2539,  2541,  2542,  2552,  2543,  2544,  2545,  2547,  2546,
-    2548,  2549,  2550,  2553,  2533,  2555,  2556,  2557,  2558,  2559,
-    2560,  2561,  2563,  2564,  2565,  2566,  2567,  2568,  2569,  2570,
-    2571,  2572,  2573,  2574,  2575,  2576,  2577,  2578,  2579,  2580,
-    2581,  2582,  2584,  2585,  2586,  2587,  2375,  2355,  2589,  2591,
-    2592,  2594,  2597,  2598,  2599,  2601,  2605,  2606,  2607,  2608,
-    2609,  2611,  2610,  2612,  2615,  2617,  2618,  2616,  2619,  2620,
-    2621,  2356,  2357,  2623,  2624,  2625,  2376,  2627,  2629,  2628,
-    2377,  2630,  2631,  2632,  2634,  2635,  2636,  2637,  2638,  2640,
-    2641,  2642,  2643,  2644,  2378,  2645,  2647,  2358,  2648,  2379,
-    2650,  2652,  2651,  2653,  2655,  2656,  2654,  2359,  2660,  2662,
-    2663,  2665,  2667,  2669,  2360,  2671,  2672,  2673,  2675,  2674,
-    2676,  2361,  2677,  2678,  2684,  2685,  2686,  2687,  2808,  2688,
-    2689,  2334,  2362,  2690,  2363,  2692,  2693,  2694,  2695,  2696,
-    2720,  2725,  2726,  2727,  2728,  2729,  2730,  2732,  2733,  2364,
-    2734,  2735,  2736,  2737,  2365,  2738,  2740,  2742,  2743,  2744,
-    2745,  2746,  2381,  2747,  2748,  2749,  2750,  2751,  2752,  2753,
-    2754,  2755,  2756,  2757,  2762,  2760,  2761,  2763,  2765,  2766,
-    2366,  2767,  2768,  2770,  2771,  2772,  2773,  2367,  2368,  2774,
-    2775,  2776,  2777,  2778,  2779,  2780,  2781,  2783,  2785,  2786,
-    2787,  2788,  2789,  2790,  2791,  2792,  2369,  2793,  2794,  2795,
-    2806,  2670,  2386,  2509,  2784,  2426,  2691,  2525,  2588,  2807,
-    2497,  2407,  2341,  2471,  2484,  2590,  2604,  2622,  2661,  2759,
-    2769,  2583,  2602,  2614,  2498,  2668,  2731,  2758,  2380,  2782,
-    2540,  2492,  2333,  2446,  2448,  2603,  2639,  2384,  2504,  2393,
-    2562,  2600,  2682,  2679,  2681,  2683,  2664,  2596,  2460,  2595,
-    2535,  2633,  2530,  2554,  2626,  2551,  2658,  2613,  2477,  2659,
-    2739,  2593,  2666,  2516,  2764,  2395,  2463,  2680,  2700,  2796,
-    2657,  2649,  2646,  2493,  2697,  2698,  2699,  2701,  2702,  2703,
-    2704,  2705,  2706,  2707,  2708,  2709,  2710,  2718,  2712,  2711,
-    2713,  2714,  2716,  2715,  2717,  2719,  2721,  2722,  2723,  2724,
-    2741,  2518,   397,  2306,   379,  2307,  2328,  2329,  2330,  2327,
-    2331,   166,     0,     0,  2894,  2893,     0,     0,  3051,  3052,
-     732,     0,     0,     0,     0,     0,     0,  1967,     0,  1012,
-     732,   732,     0,     0,     0,   317,  3079,  3079,  3096,  3098,
-    3100,  2385,  2335,  2399,     0,  2263,     0,     0,     0,  1739,
-       0,  2339,     0,  2417,  2419,     0,     0,  1406,  1406,   896,
-       0,     0,     0,  2442,  2443,  2269,     0,     0,     0,  2260,
-    2270,  2485,  2489,  2491,     0,  2262,  2501,     0,     0,     0,
-       0,  2523,  2272,     0,     0,  2566,  2568,     0,     0,  2572,
-    2573,  2574,  2575,  2244,  1465,     0,   896,  2256,  2271,  2250,
-    2619,  2620,     0,  2630,     0,     0,  2669,     0,     0,  2674,
-    2684,     0,     0,  2743,     0,     0,   896,  2243,  2762,  2760,
-    2761,  2763,     0,  2261,  2366,  2273,     0,  2777,  1406,   896,
-     896,     0,     0,     0,  2787,  2788,  2795,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  2516,  2741,     0,     0,  1398,     0,     0,     0,  1464,
-       0,  1548,  3070,  1942,  1397,  1401,  1418,  1423,  1440,     0,
-    1457,  1476,  1477,  1479,  1586,  1478,  1484,  1607,  1485,  1608,
-    1483,  2257,  1482,  2267,  2266,  1481,  2258,  2268,  2259,  1399,
-    1475,  2286,  2306,  2285,  1491,  3068,  1964,  1964,  1964,     0,
-       0,  1964,  1964,     0,     0,  1964,     0,  1964,  1964,  1964,
-       0,     0,   157,  2147,   467,   468,     0,  2947,  2960,  2961,
-    2957,  2962,  2980,  2963,  2967,     0,  2959,  3028,  2319,     0,
-    2966,     0,  3028,  2964,     0,  3028,     0,  2965,  2970,  2981,
-    3028,  2958,  2308,  2318,  2317,  3028,  2798,  2797,  2309,  2799,
-       0,  2949,     0,  2291,     0,     0,  1982,  1983,  1981,  1221,
-       0,     0,  2196,  2197,     0,  2200,     0,  2201,  2204,     0,
-    2890,     0,     0,     0,     0,     0,  1315,     0,  1985,  2029,
-    1986,  1984,  1964,     0,   433,   442,   444,   445,   441,  2947,
-       0,     0,  3052,  3063,  3078,  3073,  3072,  3075,  3076,  3077,
-    1383,  3074,  3071,     0,  1379,  1381,  1382,   949,     0,     0,
-    2839,  2842,  2578,  2612,  2843,  2765,  2840,  2670,  2841,  2380,
-       0,     0,  2312,  2866,  2801,  2802,  2803,  2800,  2313,  2809,
-       0,  2833,     0,  2108,     0,   949,  2127,     0,     0,  2127,
-       0,  1897,  2111,  2116,  2114,     0,  2845,  2088,  2846,  2107,
-       0,  2064,  2087,     0,  2043,  2080,     0,  2847,  1246,  2110,
-       0,  1897,  1247,  2071,  2127,     0,     0,     0,     0,     0,
-       0,     0,   445,  1235,  1246,  1253,  1268,  1234,  1268,  1377,
-    2291,  2042,     0,     0,     0,  2904,     0,  2198,     0,  1376,
-    2005,     0,  1865,  1868,  1870,  3144,     0,     0,     0,  3139,
-       0,  3145,     0,     0,  2285,     0,     0,     0,     0,     0,
-    3069,     0,     0,     0,     0,     0,     0,     0,     1,    11,
-       0,     0,  1406,  2316,  2777,     0,  2315,  2314,  2320,  2322,
-    3005,  3026,  3032,     0,     0,     0,  1233,  1237,  1238,  1240,
-    1241,  1242,     0,     0,     0,  1341,  1385,  1345,     0,  3065,
-    1897,  1889,     0,  3065,  1897,  1353,  1348,  1888,  1355,  2035,
-    2028,  2140,  2485,  2143,  2023,  2144,     0,  1063,  1134,     0,
-    1067,     0,     0,     0,     0,  2907,     0,  1065,     0,  2109,
-    1141,     0,     0,  1092,     0,     0,  3105,  1069,     0,  3049,
-       0,  1325,  1336,  1731,   396,     0,   170,   167,   168,  1282,
-    1960,  1301,     0,  3055,     0,     0,     0,     0,  3101,     0,
-       0,     0,   579,     0,     0,     0,     0,     0,   732,  3105,
-    3105,  3079,  3099,     0,     0,  1858,  1498,  1858,  1858,  1858,
-    1740,     0,     0,     0,     0,     0,     0,     0,  1858,     0,
-    1542,  1514,     0,  1543,     0,     0,     0,  2274,     0,     0,
-       0,  1495,     0,     0,  1731,     0,  1700,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1735,  1737,  2285,  1858,
-       0,     0,  1858,     0,     0,     0,     0,     0,  1411,   945,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1858,  1858,     0,     0,  1858,  1556,  2276,     0,     0,
-       0,  2275,     0,     0,     0,  2265,  2264,  2245,     0,  1559,
-    1561,  1560,     0,  1858,  1858,     0,     0,     0,  1858,  1858,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1858,  1488,  1487,  1489,     0,     0,  3070,
-       0,  2848,  1696,  1698,     0,     0,  1461,  1460,     0,  1459,
-    1458,  2305,     0,  1400,     0,     0,  1405,  1404,  1466,  1467,
-    1468,  1469,     0,  1470,  1471,  1472,     0,     0,     0,     0,
-       0,     0,  1463,  1462,     0,     0,     0,     0,  1442,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1490,     0,
-       0,  2300,  2246,     0,     0,  1602,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1968,     0,     0,     0,     0,
-       0,     0,  1964,   159,     0,     0,  2948,  2940,  2978,  2977,
-    2982,     0,  2979,  2975,  2983,  2984,  2968,     0,  2954,  2972,
-       0,  2956,  2974,  2973,  2953,  2969,  2976,  2955,     0,  2951,
-    2943,     0,     0,  1854,  2917,     0,     0,   165,     0,  1222,
-    1986,     0,  3158,  3155,  2194,     0,  2205,  2206,  2202,     0,
-       0,     0,     0,  2107,     0,  2190,  3064,  1317,     0,     0,
-       0,  1987,     0,     0,  2174,  2183,  2179,  2181,  2173,  2176,
-     434,     0,     0,   464,  2934,     0,     0,  2943,  3058,  3055,
-    1369,  1380,   948,     0,     0,   951,  2865,  2006,  2007,   960,
-       0,   950,     0,     0,     0,     0,     0,  2811,  2875,  2872,
-    2871,  2824,  2819,  2818,  2324,  3001,  2817,     0,  2852,     0,
-     955,   957,   956,  2862,   954,     0,     0,  2765,  2812,  2833,
-       0,     0,  2810,     0,  2123,     0,     0,  2129,  2086,     0,
-     732,     0,     0,     0,     0,     0,     0,     0,  2058,  2106,
-       0,  2105,  2079,  1898,  2121,  2122,  2127,     0,  2120,     0,
-    2127,     0,  2094,  2111,     0,  2127,  2055,     0,     0,  2047,
-    2052,  2048,     0,  2054,  2053,  2056,  2044,  2045,  2123,  2070,
-    2111,  2078,  2085,   307,  2069,  2075,  2083,  2111,  1010,  1009,
-    1008,     0,     0,  2111,  2127,  2127,   440,     0,     0,  1252,
-    1254,  1255,  1273,  1272,  1249,  1269,  1270,   307,  2040,  3156,
-    3157,  2903,  2012,     0,  1866,     0,     0,     0,  2249,  2248,
-    3141,  2247,  3149,  3151,  3135,     0,  3138,  3137,  3146,     3,
-       0,     0,   669,     4,     0,     6,     0,     0,     7,  1344,
-    1362,     0,  1361,    12,   151,  2323,     0,     0,     0,     0,
-       0,     0,     0,  3023,     0,     0,  1116,     0,     0,     0,
-       0,  1390,  1389,  1392,  2454,     0,     0,  1941,  1935,  1938,
-    1937,     0,  1384,  1347,  1346,     0,  3067,  3066,     0,  1349,
-    1906,  1907,  1905,  1899,  1900,  1904,  1903,     0,  1351,  1897,
-    1897,  1354,  2039,  2038,  2037,     0,  2035,  1221,     0,  2142,
-       0,     0,  2132,  2133,  2134,  2135,  2136,  2131,  2130,  2145,
-    2146,  3103,  3104,  3102,   962,  3097,   380,     0,     0,  2909,
-    2915,     0,     0,   380,     0,     0,  2008,  2008,     0,  2008,
-    2008,   648,     0,   647,  2008,   738,   600,   602,   603,   637,
-     604,   605,   606,   607,   608,     0,  1219,  2008,  1219,     0,
-    2008,  2008,  1219,  2008,     0,     0,  2008,  2008,  2008,  2008,
-       0,     0,   963,  2008,     0,     0,  1219,     0,  2008,     0,
-    1203,     0,     0,  2008,  2008,  2008,  2008,  2008,  1219,     0,
-       0,  2008,  2008,     0,  1229,     0,     0,  2008,     0,  2008,
-    2008,  2008,     0,  2008,  2008,     0,  2008,     0,     0,  2008,
-    1163,  1164,  2008,  2008,   774,  1174,   734,   761,   762,     0,
-    1061,  1062,  1135,  1137,  1207,  1143,  1142,  1171,  1176,  1205,
-    1206,     0,  1965,  3170,  1073,     0,     0,  1072,  3105,  1296,
-       0,     0,  1005,  1004,     0,     0,  1336,  1327,  1733,     0,
-    1732,   378,     0,     0,  1284,  1283,     0,  1281,  1309,  1308,
-    1306,     0,  1307,  1305,  1300,  1302,  1303,  3054,     0,     0,
-    3056,  3060,     0,   315,     0,     0,     0,     0,     0,   732,
-       0,   581,     0,  3013,  3024,   330,   313,     0,  1038,     0,
-       0,   732,     0,     0,     0,  3093,  3081,  3088,  3089,  3092,
-    3091,  3090,     0,  3087,  3080,  3083,  3084,  3086,  3085,  3105,
-       0,     0,  1859,  1858,     0,     0,     0,     0,     0,     0,
-    1741,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1407,     0,   897,  1568,     0,     0,     0,     0,     0,  1830,
-    1831,  1832,  1833,  1841,  1834,  1835,  1836,  1843,  1848,  1837,
-    1838,  1844,  1845,  1846,  1839,  1847,  1842,  1840,  1849,     0,
-    1829,     0,     0,  1853,  1850,  1852,  1851,     0,  1701,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1858,     0,     0,     0,  1858,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1578,     0,     0,     0,     0,     0,  1858,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1538,     0,
-    2288,  2287,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1643,     0,  1643,     0,     0,     0,  1646,
-    1647,  1645,  1648,     0,     0,     0,     0,  1858,     0,     0,
-    1492,     0,     0,     0,     0,     0,     0,     0,  1396,  1403,
-    1402,  1409,  1408,  1410,  1414,  1419,  1412,  1416,     0,  1473,
-    2392,  1421,     0,     0,  1454,     0,  1424,  1434,  1455,  1438,
-    1445,  1446,     0,  1441,     0,  1443,  1444,     0,  1448,     0,
-    1447,  1451,  1452,  1453,  1456,     0,     0,     0,     0,  1480,
-    1486,  1508,  1509,  1401,     0,  1603,  1604,  2281,  2289,  1945,
-    1952,  1947,     0,  1968,  1949,  1957,  1964,  1972,  1973,  1954,
-     738,  1970,  1953,   609,  2999,  1950,  1223,  1959,  3183,     0,
-       0,   158,     0,     0,     0,     0,  2164,  2166,  2169,  2165,
-       0,  2168,     0,  2167,  2148,  2151,  2157,  2170,     0,     0,
-     465,   469,   471,     0,   474,     0,  2971,  3030,     0,     0,
-    2952,  2945,  2946,  2944,     0,  2985,  2950,  1855,     0,  2916,
-    2482,  2586,     0,  1860,  2292,  3160,     0,     0,     0,     0,
-    2203,     0,  2892,  1854,  2891,  2895,  1311,     0,   154,   155,
-       0,     0,     0,  1316,  1320,     0,  1286,  1769,  2178,  2187,
-    2185,  2185,     0,   432,   457,   452,   460,   454,   456,   455,
-     461,   462,   463,   458,   453,   459,   446,     0,     0,     0,
-       0,  2932,     0,  3059,     0,  3061,     0,  1860,  1370,  1369,
-       0,     0,     0,  2868,     0,  2864,  2863,     0,  1089,  2302,
-    1089,     0,  2877,  2878,     0,  2869,     0,  2870,     0,  2823,
-       0,     0,  2826,     0,     0,     0,     0,     0,     0,     0,
-    2867,  2832,  2831,     0,  2834,  2835,     0,  2838,  2886,  2887,
-    2884,  2885,  2888,  2889,  2883,  2859,     0,  2125,  2128,  1862,
-       0,     0,  2103,  2097,  2096,  2092,  2098,  2104,  2093,  2065,
-    2066,  2067,  2061,  2112,  2102,  2100,  2089,  2127,  2101,  2099,
-    2049,  2050,  2051,     0,  1897,     0,  2125,  2127,     0,  2095,
-    2127,     0,     0,  2127,  2082,  2084,  1258,  1259,     0,     0,
-    1274,     0,  1248,  2017,  2016,     0,  2013,  2015,  2004,  1867,
-       0,  1872,     0,     0,     0,  3136,  3152,  3134,  3140,  3147,
-    3148,  3133,  2289,     0,   670,     0,     0,   673,     0,     0,
-    2008,  1363,    13,    10,  1124,     0,     0,  2321,     0,     0,
-       0,     0,     0,     0,  3036,  3034,     0,  3035,  3033,  2990,
-    3005,  3027,     0,  1096,  1245,  2297,  1244,  1243,  1239,     0,
-       0,  1395,  1392,  1386,  1393,  2301,  1940,   952,  1936,     0,
-       0,  1893,  1890,  1892,  1359,  1357,     0,     0,  1360,  1358,
-    1350,  1352,     0,     0,  1962,  2033,  2036,     0,  2141,     0,
-       0,   962,   721,   723,   730,   729,   731,     0,  1068,  2914,
-    2913,     0,     0,     0,     0,  1066,     0,     0,   598,  2009,
-       0,     0,   598,     0,     0,     0,     0,   739,  2109,  2008,
-    1220,  1055,  1006,  1312,  1006,  1180,     0,  1055,     0,     0,
-       0,     0,     0,     0,  1312,     0,     0,     0,     0,     0,
-    1312,     0,     0,     0,     0,     0,  2008,     0,  1189,     0,
-    1145,     0,     0,     0,     0,     0,     0,     0,  1190,     0,
-       0,     0,  1146,  2008,     0,     0,     0,     0,     0,     0,
-    1312,     0,     0,     0,  1312,  1232,     0,  1231,  1230,     0,
-       0,  1312,  1312,     0,   771,     0,     0,     0,   767,   768,
-       0,     0,     0,     0,  1167,  1168,     0,     0,     0,   735,
-    2008,  2008,     0,  1139,  1136,   962,   962,     0,  2008,  3178,
-    1125,     0,     0,  1070,     0,     0,  1293,  1329,  1323,  1328,
-    1326,  1336,     0,  1820,     0,   398,     0,     0,     0,     0,
-       0,     0,     0,     0,   307,   172,     0,   202,   206,   214,
-     218,   204,   299,   301,   210,   212,   216,   224,   236,   222,
-     240,   226,   228,   230,   232,   220,   234,   208,   246,     0,
-       0,   242,   244,     0,   248,   250,     0,   238,     0,     0,
-       0,     0,   245,   203,   207,   249,   215,   219,   247,   205,
-     300,   302,   211,   213,   243,   217,   221,   223,   225,   241,
-     227,   229,   231,   233,   235,   239,   237,   209,   251,   307,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   200,     0,     0,   284,  1961,
-    1310,  1304,  3053,  3057,   733,   962,     0,     0,     0,     0,
-       0,     0,   580,     0,   583,     0,     0,     0,     0,  3032,
-    2008,     0,     0,     0,  1039,   962,     0,     0,     0,   379,
-    3128,     0,  3082,     0,  1564,     0,  1658,  1708,  1658,  1658,
-    1658,     0,     0,     0,     0,     0,     0,  1565,     0,  1512,
-    1566,  1567,     0,     0,     0,  1658,     0,   898,     0,     0,
-    1515,  1516,  1505,     0,     0,  1587,     0,  1704,  1517,     0,
-       0,     0,     0,     0,  1588,  1736,     0,  1738,  2289,     0,
-    1658,  1572,  1523,     0,  1658,     0,  1524,  1589,  1590,  1591,
-       0,  1593,     0,  1574,     0,     0,  1577,     0,     0,  1526,
-    1658,  1658,     0,     0,     0,     0,  1658,  1528,     0,     0,
-       0,  1527,     0,     0,     0,     0,     0,     0,     0,  1530,
-       0,  1506,  1658,  1658,  1580,     0,     0,  1582,     0,  1539,
-    1858,  1658,  1695,     0,  1635,  1634,  1652,     0,     0,  1652,
-       0,     0,  1649,     0,  1636,  1633,  1632,     0,     0,  1658,
-       0,  2849,  2850,  2851,  1057,  1697,  1496,  1415,  1420,  1413,
-    1417,  1422,     0,     0,     0,  1433,     0,     0,     0,     0,
-       0,  1425,  1436,  1439,  1606,  1594,     0,  1731,     0,     0,
-    1208,  1956,     0,  2109,  1955,   610,   611,   613,     0,  1225,
-    1224,  1951,  3184,  1948,  1223,     0,   160,   162,  2162,  2159,
-    2158,  2160,   307,  2161,     0,  2171,  2149,  2442,  2762,  2763,
-     478,     0,   450,   449,   451,   475,     0,     0,  2943,  3029,
-       0,     0,  2994,  2997,     0,     0,     0,  2938,  1857,  2927,
-    2923,  2928,  2930,  2926,  2929,  2931,  2924,  2925,  1860,     0,
-    1897,  1861,  1769,  3154,  3159,  1331,  1332,  1336,     0,     0,
-       0,   156,     0,     0,  2191,     0,  1318,     0,     0,  1291,
-    1290,  1292,  1285,  1287,  1288,     0,     0,  1770,     0,  2184,
-    2186,   307,   307,  2175,     0,     0,     0,  2943,     0,     0,
-    3062,  1372,     0,     0,     0,     0,  1371,  1373,  1374,  1746,
-    1745,  1776,  1773,  1772,  1775,  1774,  1777,  1769,  1854,  1879,
-    1860,     0,     0,     0,   959,   961,   958,     0,     0,     0,
-    3003,  3003,     0,     0,  2882,  2874,  2876,  2873,  2825,  2325,
-    3002,     0,  2855,  2856,  2857,  2853,  2854,     0,  2860,  2858,
-       0,  2837,  2124,     0,  1897,     0,  2091,     0,  2063,     0,
-    2081,  2046,  1897,  2062,     0,  2060,  2111,  2111,  2059,  1257,
-    1256,     0,  1260,  1271,  2011,     0,  1871,     0,  1869,  3142,
-    3150,     0,     0,     0,     0,     0,     0,     0,     0,   675,
-       0,   671,     0,     0,  1085,  1089,     0,  1086,  1087,  1088,
-    3006,  2302,     0,  3003,  3019,  2993,  2992,  2991,  2988,     0,
-       0,     0,     0,     0,  1117,  1119,     0,     0,     0,     0,
-    1093,  1097,  1098,  1391,  1394,  1387,     0,  2211,  1934,  1388,
-    1895,  1896,  2283,  1894,     0,  1902,  1901,     0,  1854,  2291,
-       0,     0,     0,  2293,     0,  1932,  1933,  1917,  1918,  1916,
-    1919,  2137,  1920,  1931,  2008,   722,  2008,     0,     0,     0,
-       0,     0,     0,     0,   381,   390,     0,     0,  2908,     0,
-     625,     0,     0,     0,     0,     0,     0,     0,     0,   335,
-     632,  1076,   738,  1927,  1929,  1926,  1928,   638,   651,  1930,
-     652,   649,  1077,   636,   639,  1078,  3185,   650,   601,     0,
-     808,  1056,  1007,  1055,  1147,  1055,     0,     0,     0,  1006,
-     811,  1055,     0,  1035,  1056,   807,     0,  1214,  1213,  1215,
-     809,   809,     0,     0,     0,  1924,  1925,  1923,  1921,  1922,
-     750,  1914,  1915,  1911,  1912,  1910,  1913,   745,     0,   756,
-    1169,  1301,  1170,  1827,     0,   747,   748,   749,   769,     0,
-       0,   758,     0,  1187,  1188,     0,  1150,  1185,  1186,  1223,
-     740,     0,     0,     0,   787,   788,   786,   763,  3176,     0,
-     770,  1217,  1216,  1218,   743,   744,     0,     0,  1204,  1886,
-    1893,   776,   751,   775,   746,     0,     0,     0,  1198,  1158,
-       0,   785,   783,   780,   782,   781,   784,   759,   752,   753,
-     755,   754,   766,   757,  1157,  2170,   741,   742,   772,   773,
-       0,     0,  1140,  1219,  1219,  1175,  1172,  1173,  1138,  1144,
-    1177,   633,   634,   609,     0,  2008,  3180,     0,  1127,  1129,
-    3106,  3107,  1870,     0,     0,     0,  1823,     0,  1824,  1821,
-    1822,     0,  1734,     0,     0,     0,     0,     0,     0,     0,
-       0,   171,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   169,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     316,   962,   727,     0,   614,     0,     0,     0,   325,     0,
-    2008,  2008,  2008,  2008,   320,   738,   585,   587,   588,   589,
-     590,   591,   594,   592,   595,   593,   596,   597,   609,     0,
-       0,     0,  3025,  1116,     0,  1044,  1046,  1045,  1041,  1040,
-       0,     0,  2210,     0,  2209,   807,   310,   654,   656,   659,
-     657,   738,   736,  1997,  1999,   661,     0,     0,   344,  3123,
-       0,     0,   575,   574,     0,     0,     0,  1658,  1609,  1659,
-    1611,  1612,  1617,     0,  1742,     0,  1502,   910,   910,   894,
-    1716,   890,   882,   888,  1730,  1721,  1725,  1728,  1727,  1729,
-       0,   866,  1724,  1726,   880,  1712,   894,  1714,  1717,   910,
-    1722,  1510,     0,     0,     0,     0,     0,  1658,  1619,  1658,
-       0,     0,     0,     0,     0,     0,  1702,     0,     0,     0,
-    1507,     0,  1598,  1658,  1623,  1658,  1621,     0,     0,     0,
-       0,     0,     0,     0,  1627,  1625,     0,     0,     0,     0,
-    1658,  1629,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1626,  1628,     0,     0,     0,     0,     0,
-    1613,  1666,  1660,  1661,  1662,  1663,     0,     0,     0,  1650,
-    1652,     0,  1652,     0,  1637,     0,  1562,  1658,  1615,  1493,
-       0,  1699,  1431,  1426,     0,  1435,     0,  1450,  1449,     0,
-       0,     0,  1605,     0,  2282,  2290,  1946,  1944,  1210,  1209,
-    1958,  1971,  2109,  3000,  1943,   163,     0,  2163,  2156,  2152,
-       0,   470,   479,   472,   476,   477,   473,     0,  3031,  3039,
-       0,     0,     0,     0,  1897,     0,  2918,     0,     0,  1336,
-    1338,  2207,     0,  2898,  2899,  2897,  2896,  2193,  2192,     0,
-    1321,  1322,  1289,     0,     0,  2001,  2000,     0,  1977,  1979,
-    1988,  1991,     0,  2188,  2180,  2182,     0,   447,     0,     0,
-    2937,     0,     0,  1854,     0,  1746,  1776,  1773,  1772,  1775,
-       0,     0,     0,     0,  1759,  1767,  1765,  1767,  1762,     0,
-       0,     0,  1854,  1870,     0,  1863,  1879,  2822,  2821,  2820,
-    1089,  1089,  1090,     0,  2814,  2813,  2880,  2879,  2881,  2828,
-     738,  2827,     0,  2836,  2126,  2072,  2077,  2076,  2090,  2057,
-     307,   308,  1860,  2127,     0,  1280,     0,  1276,  1275,     0,
-    1262,  2014,  1873,     0,  3153,     5,     0,     0,     0,     0,
-     674,     0,   684,     0,     0,     0,     0,  3161,  3003,  1089,
-       0,  3003,  3016,     0,     0,  2989,  1122,  1120,  1121,  1123,
-    1118,  1101,  1100,  1102,     0,     0,     0,  1115,  1114,  1113,
-       0,     0,  1082,  1099,   953,     0,  2219,  1891,     0,  1769,
-       0,  1860,  1963,  2034,  2033,     0,     0,     0,   384,   387,
-     385,     0,   386,     0,     0,  2911,     0,   635,  1075,   738,
-     627,   629,   630,   631,   339,   338,   340,   341,   343,   342,
-     337,  1081,     0,   645,     0,     0,     0,     0,     0,  1055,
-    1002,  1003,   810,     0,   805,   812,     0,     0,     0,     0,
-       0,   793,   795,   796,     0,   879,   833,   824,   910,   827,
-     826,   970,   894,   838,   885,     0,   887,   884,   859,   858,
-     875,   857,   862,   846,   970,   970,   845,   878,   970,   863,
-     861,   865,     0,   866,   886,   871,   860,   864,   856,     0,
-     877,   910,   894,   894,   842,   876,   970,     0,   869,   910,
-     798,   914,   844,   977,     0,     0,   910,   912,   890,  1196,
-    1197,  1043,  1042,  1195,     0,     0,  1153,     0,  1154,     0,
-    1156,   960,   960,   764,  1161,  1184,  1183,     0,  1162,   765,
-    3177,  1226,  1152,     0,  1887,  1151,     0,     0,     0,  1286,
-       0,   778,   777,  1080,  3174,  3171,  3172,     0,  3182,  3181,
-    3183,     0,     0,     0,   349,  3108,     0,     0,  1335,  1337,
-       0,  1324,     0,   174,   175,     0,   176,   177,     0,   178,
-     179,     0,   180,   173,   285,   305,   306,   253,   290,   279,
-     289,   280,   292,   291,   293,   281,   282,   295,   296,   294,
-     283,   201,   278,   252,   254,   255,   256,   257,   258,   259,
-     260,   261,   262,   263,   267,   270,   271,   268,   269,   264,
-     298,   265,   297,   266,   272,   273,   274,   276,   277,   303,
-     304,   728,     0,  2008,  2008,   319,   738,   616,   618,   619,
-     620,   621,   624,   622,   623,   325,     0,     0,   324,     0,
-       0,     0,     0,     0,  2109,   321,     0,  3007,  3009,   331,
-    1096,  3168,  3169,  3170,     0,   660,   311,     0,     0,   655,
-     653,   962,  1998,   658,     0,     0,   399,   791,   792,   790,
-     789,     0,  3129,   578,   576,   577,     0,     0,  1540,  1610,
-    1743,     0,     0,   911,  1709,   970,     0,  1719,     0,  1720,
-     892,   891,   883,   881,  1723,   889,   867,  1713,  1718,  1715,
-    1711,  1511,     0,     0,  2277,  1513,  1504,  1503,  1620,  1618,
-       0,     0,  1546,  1570,     0,  1547,     0,     0,     0,     0,
-       0,  1519,     0,  1522,     0,     0,  1600,  1624,  1622,  1573,
-    1592,  1549,  1575,     0,  1525,  1494,     0,  1550,     0,  1555,
-    1553,     0,  1630,  1529,     0,     0,  1536,     0,  1534,     0,
-    1535,     0,  1537,  1579,  1581,     0,     0,     0,     0,  1658,
-    1667,     0,  1668,  1654,  1653,  1640,     0,  1644,     0,  1641,
-       0,  1655,     0,  1796,  1616,  1058,     0,  1430,  1432,  1428,
-       0,  1437,  1595,  1212,  1211,   612,   161,  2154,     0,  2150,
-       0,     0,     0,     0,  2942,  2996,  2995,  2998,  3037,  2986,
-    2919,     0,     0,  2018,  2020,  1333,  1336,  1338,     0,  1334,
-       0,  2208,  2900,  2901,  1319,     0,  1826,  1978,  2026,     0,
-       0,     0,  1995,  2280,  2279,  2287,  2012,  1996,  2003,     0,
-       0,     0,  2933,     0,  1870,     0,  1784,  1778,  1780,  1781,
-    1783,     0,     0,  1746,  1745,  1375,  1761,  1760,  1768,     0,
-    1766,  1767,  1767,     0,     0,  1755,  1754,     0,  1817,  1785,
-       0,     0,  1874,  1863,  3003,  3003,     0,     0,  2861,  2073,
-    2074,  2068,     0,     0,     0,     0,     0,  1264,  3143,     0,
-     680,   667,     0,   665,   669,     0,   662,     0,     0,   678,
-       0,  1084,  3003,  3003,     0,  3017,  2304,  2303,  3003,     0,
-    3003,  1105,     0,  1104,  1110,  1107,  1106,     0,  1095,  1094,
-       0,     0,     0,     0,  2212,  2214,     0,  1939,  1860,  1860,
-    2292,  2031,     0,  2294,  1860,   724,   779,   389,   388,   394,
-     395,     0,  2910,  2109,   336,     0,  1149,     0,     0,   686,
-       0,     0,     0,   813,     0,     0,  1053,     0,  1052,  1893,
-    1036,  1037,  1179,   807,   798,   832,   825,   843,   964,   975,
-     973,   967,   868,   970,     0,   971,   972,   829,   841,     0,
-     852,     0,   847,   970,   855,   851,   867,   870,   872,   874,
-       0,   970,   840,   839,   849,   836,   899,     0,  1226,   799,
-     924,     0,     0,     0,     0,  1462,   918,     0,   982,     0,
-       0,   927,     0,  2008,  2008,     0,   935,   814,   915,   917,
-     816,     0,   938,     0,   978,   977,   831,   970,   977,   899,
-       0,   913,   899,   899,  1193,     0,  1194,  1226,  1828,  1202,
-    1201,     0,     0,  1228,  1182,  1885,  1200,  1199,     0,  1155,
-     760,     0,     0,  3179,  1091,     0,   359,     0,     0,  1126,
-       0,   352,   350,   361,     0,  1298,  1294,  1825,   181,     0,
-     183,   185,   190,     0,   192,  2326,     0,   195,     0,   197,
-    2298,   199,     0,   186,     0,     0,   286,   288,     0,     0,
-       0,  2109,   323,     0,     0,     0,     0,     0,     0,   582,
-     644,   640,   646,   643,   586,  3008,     0,     0,  1093,  3178,
-       0,     0,   962,   737,     0,     0,     0,   400,   402,     0,
-       0,   409,     0,     0,  1744,     0,     0,     0,     0,  1710,
-       0,     0,  1499,  1510,  2278,     0,     0,     0,     0,  1705,
-    1707,  1703,  1658,     0,     0,     0,     0,     0,  1497,     0,
-    1596,     0,     0,     0,     0,     0,     0,  1533,  1531,  1532,
-     979,  1584,  1583,     0,  1614,  1664,     0,  1670,  1651,  1639,
-    1638,     0,  1652,  1563,     0,  1804,  1805,     0,  1797,  1798,
-       0,  1427,     0,     0,     0,   487,   482,   490,   484,   486,
-     485,   491,   492,   493,   494,   488,   483,   489,   481,   480,
-       0,     0,     0,  3046,  1860,  2018,     0,  2020,     0,  1976,
-    1330,  1339,     0,  1771,     0,     0,  1989,  1992,     0,     0,
-       0,     0,     0,   448,  2936,     0,     0,  1786,  1375,  1747,
-    1763,     0,     0,  1756,  1764,     0,     0,     0,     0,  1811,
-    1812,     0,     0,  1815,  1818,  1819,  1782,  2284,  1883,  1882,
-    1864,     0,  1368,  1874,  2816,  2815,  3004,  2829,  1279,  1278,
-    1277,  1261,     0,     0,  1266,   668,     0,   666,     0,     0,
-     664,   672,     0,   679,     0,  1083,  3014,  3003,  3020,  3003,
-       0,  3021,     0,  1111,  1112,  1109,     0,     0,     0,     0,
-       0,  2213,     0,     0,  2220,  2222,  2032,  1888,  1888,     0,
-     628,     0,   689,  1148,     0,     0,   806,     0,     0,     0,
-    1024,     0,     0,  1049,   794,   797,   966,   965,   969,     0,
-     968,   828,   977,     0,  1059,   848,   873,     0,   850,   903,
-     904,   905,   837,   900,   902,   984,  1178,   930,   939,   941,
-     940,   931,   929,     0,     0,     0,     0,     0,     0,   946,
-     921,  2254,   947,  2255,  2251,     0,     0,   942,   943,   944,
-     932,   928,   933,     0,     0,   934,     0,   916,     0,     0,
-     926,   919,   920,   830,   834,   835,   821,     0,   822,   823,
-       0,  1191,  1181,  1165,  1227,     0,  3175,  3173,   360,   348,
-       0,     0,  1128,  1130,     0,     0,  1131,     0,     0,  1297,
+    1136,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1967,     0,  1072,  3130,  3131,  3132,  1317,  1316,     0,  3086,
+    2302,  1302,     0,  2386,  2385,  2388,  2390,  2391,  2392,  2393,
+    2394,  2395,  2338,  2397,  2400,  2401,  2402,  2403,  2404,  2339,
+    2405,  2406,  2407,  2408,  2409,  2410,  2340,  2341,  2412,  2413,
+    2414,  2416,  2417,  2342,  2343,  2418,  2419,  2420,  2421,  2422,
+    2423,  2424,  2425,  2426,  2427,  2345,  2428,  2346,  2429,  2430,
+    2432,  2433,  2463,  2434,  2435,  2436,  2437,  2438,  2439,  2347,
+    2440,  2441,  2442,  2443,  2444,  2445,  2446,  2447,  2448,  2348,
+    2449,  2450,  2452,  2454,  2455,  2456,  2457,  2458,  2349,  2459,
+    2460,  2461,  2462,  2350,  2464,  2466,  2467,  2469,  2471,  2470,
+    2472,  2473,  2376,  2474,  2475,  2335,  2477,  2478,  2479,  2480,
+    2481,  2484,  2485,  2377,  2486,  2487,  2489,  2490,  2351,  2352,
+    2492,  2493,  2494,  2495,  2502,  2496,  2497,  2498,  2816,  2501,
+    2353,  2504,  2354,  2508,  2507,  2509,  2298,  2510,  2299,  2511,
+    2355,  2513,  2514,  2517,  2518,  2356,  2520,  2521,  2522,  2523,
+    2524,  2525,  2527,  2357,  2529,  2530,  2531,  2532,  2533,  2534,
+    2817,  2536,  2537,  2538,  2539,  2541,  2542,  2544,  2546,  2547,
+    2548,  2549,  2551,  2552,  2562,  2553,  2554,  2555,  2557,  2556,
+    2558,  2559,  2560,  2563,  2543,  2565,  2566,  2567,  2568,  2569,
+    2570,  2571,  2573,  2574,  2575,  2576,  2577,  2578,  2579,  2580,
+    2581,  2582,  2583,  2584,  2585,  2586,  2587,  2588,  2589,  2590,
+    2591,  2592,  2594,  2595,  2596,  2597,  2378,  2358,  2599,  2601,
+    2602,  2604,  2607,  2608,  2609,  2611,  2615,  2616,  2617,  2618,
+    2619,  2621,  2620,  2622,  2625,  2627,  2628,  2626,  2629,  2630,
+    2631,  2359,  2360,  2633,  2634,  2635,  2379,  2637,  2639,  2638,
+    2380,  2640,  2641,  2642,  2644,  2645,  2646,  2647,  2648,  2651,
+    2652,  2653,  2654,  2655,  2381,  2656,  2658,  2361,  2659,  2382,
+    2661,  2663,  2662,  2664,  2666,  2667,  2665,  2362,  2671,  2673,
+    2674,  2676,  2678,  2680,  2363,  2682,  2683,  2684,  2686,  2685,
+    2687,  2364,  2688,  2689,  2695,  2696,  2697,  2698,  2820,  2699,
+    2700,  2337,  2365,  2701,  2366,  2703,  2704,  2705,  2706,  2707,
+    2731,  2736,  2737,  2738,  2739,  2740,  2741,  2743,  2744,  2367,
+    2745,  2746,  2747,  2748,  2368,  2749,  2751,  2753,  2754,  2755,
+    2756,  2757,  2384,  2758,  2759,  2760,  2761,  2762,  2763,  2764,
+    2765,  2766,  2767,  2768,  2773,  2771,  2772,  2774,  2776,  2777,
+    2369,  2778,  2779,  2781,  2782,  2783,  2784,  2370,  2371,  2785,
+    2787,  2788,  2789,  2790,  2791,  2792,  2793,  2795,  2797,  2798,
+    2799,  2800,  2801,  2802,  2803,  2804,  2372,  2805,  2806,  2807,
+    2818,  2681,  2389,  2519,  2796,  2431,  2702,  2535,  2598,  2819,
+    2505,  2411,  2344,  2476,  2491,  2600,  2614,  2632,  2672,  2770,
+    2780,  2593,  2612,  2624,  2506,  2679,  2742,  2769,  2383,  2794,
+    2550,  2499,  2336,  2451,  2453,  2613,  2649,  2387,  2512,  2396,
+    2572,  2610,  2693,  2690,  2692,  2694,  2675,  2606,  2465,  2605,
+    2545,  2643,  2540,  2564,  2636,  2561,  2669,  2623,  2483,  2670,
+    2750,  2603,  2677,  2526,  2775,  2398,  2468,  2691,  2711,  2808,
+    2668,  2660,  2657,  2500,  2708,  2709,  2710,  2712,  2713,  2714,
+    2715,  2716,  2717,  2718,  2719,  2720,  2721,  2729,  2723,  2722,
+    2724,  2725,  2727,  2726,  2728,  2730,  2732,  2733,  2734,  2735,
+    2752,  2528,  2399,  2482,  2488,  2516,  2650,  2786,  2515,  2415,
+    2503,   398,  2309,   380,  2310,  2331,  2332,  2333,  2330,  2334,
+     166,     0,     0,  2906,  2905,     0,     0,  3087,  3088,   733,
+       0,     0,     0,     0,     0,     0,  1970,     0,  1013,   733,
+     733,     0,     0,     0,   318,  3115,  3115,  3132,  3134,  3136,
+    2388,  2338,  2403,     0,  2266,     0,     0,     0,  1742,     0,
+    2342,     0,  2422,  2424,     0,     0,  1409,  1409,   897,     0,
+       0,     0,  2447,  2448,  2272,     0,     0,     0,  2263,  2273,
+    2492,  2496,  2498,     0,  2265,  2509,     0,     0,     0,     0,
+    2533,  2275,     0,     0,  2576,  2578,     0,     0,  2582,  2583,
+    2584,  2585,  2247,  1468,     0,   897,  2259,  2274,  2253,  2629,
+    2630,     0,  2640,     0,     0,  2680,     0,     0,  2685,  2695,
+       0,     0,  2754,     0,     0,   897,  2246,  2773,  2771,  2772,
+    2774,     0,  2264,  2369,  2276,     0,  2789,  1409,   897,   897,
+       0,     0,     0,  2799,  2800,  2807,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    2526,  2752,     0,     0,  1401,     0,     0,     0,  1467,     0,
+    1551,  3106,  1945,  1400,  1404,  1421,  1426,  1443,     0,  1460,
+    1479,  1480,  1482,  1589,  1481,  1487,  1610,  1488,  1611,  1486,
+    2260,  1485,  2270,  2269,  1484,  2261,  2271,  2262,  1402,  1478,
+    2289,  2309,  2288,  1494,  3104,  1967,  1967,  1967,     0,     0,
+    1967,  1967,     0,     0,  1967,     0,  1967,  1967,  1967,     0,
+       0,   157,  2150,   468,   469,     0,  2959,  2972,  2973,  2969,
+    2974,  2992,  2975,  2979,     0,  2971,  3064,  2322,     0,  2978,
+       0,  3064,  2976,     0,  3064,     0,  2977,  2982,  2993,  3064,
+    2970,  2311,  2321,  2320,  3064,  2810,  2809,  2312,  2811,     0,
+    2961,     0,  2294,     0,     0,  1985,  1986,  1984,  1224,     0,
+       0,  2199,  2200,     0,  2203,     0,  2204,  2207,     0,  2902,
+       0,     0,     0,     0,     0,  1318,     0,  1988,  2032,  1989,
+    1987,  1967,     0,   434,   443,   445,   446,   442,  2959,     0,
+       0,  3088,  3099,  3114,  3109,  3108,  3111,  3112,  3113,  1386,
+    3110,  3107,     0,  1382,  1384,  1385,   950,     0,     0,  2851,
+    2854,  2588,  2622,  2855,  2776,  2852,  2681,  2853,  2383,     0,
+       0,  2315,  2878,  2813,  2814,  2815,  2812,  2316,  2821,     0,
+    2845,     0,  2111,     0,   950,  2130,     0,     0,  2130,     0,
+    1900,  2114,  2119,  2117,     0,  2857,  2091,  2858,  2110,     0,
+    2067,  2090,     0,  2046,  2083,     0,  2859,  1249,  2113,     0,
+    1900,  1250,  2074,  2130,     0,     0,     0,     0,     0,     0,
+       0,   446,  1238,  1249,  1256,  1271,  1237,  1271,  1380,  2294,
+    2045,     0,     0,     0,  2916,     0,  2201,     0,  1379,  2008,
+       0,  1868,  1871,  1873,  3180,     0,     0,     0,  3175,     0,
+    3181,     0,     0,  2288,     0,     0,     0,     0,     0,  3105,
+       0,     0,     0,     0,     0,     0,     0,     1,    11,     0,
+       0,  1409,  2319,  2789,     0,  2318,  2317,  2323,  2325,  3017,
+    3062,  3068,     0,     0,     0,  1236,  1240,  1241,  1243,  1244,
+    1245,     0,     0,     0,  1344,  1388,  1348,     0,  3101,  1900,
+    1892,     0,  3101,  1900,  1356,  1351,  1891,  1358,  2038,  2031,
+    2143,  2492,  2146,  2026,  2147,     0,  1064,  1137,     0,  1068,
+       0,     0,     0,     0,  2919,     0,  1066,     0,  2112,  1144,
+       0,     0,  1095,     0,     0,  3141,  1070,     0,  3085,     0,
+    1328,  1339,  1734,   397,     0,   170,   167,   168,  1285,  1963,
+    1304,     0,  3091,     0,     0,     0,     0,  3137,     0,     0,
+       0,   580,     0,     0,     0,     0,     0,   733,  3141,  3141,
+    3115,  3135,     0,     0,  1861,  1501,  1861,  1861,  1861,  1743,
+       0,     0,     0,     0,     0,     0,     0,  1861,     0,  1545,
+    1517,     0,  1546,     0,     0,     0,  2277,     0,     0,     0,
+    1498,     0,     0,  1734,     0,  1703,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1738,  1740,  2288,  1861,     0,
+       0,  1861,     0,     0,     0,     0,     0,  1414,   946,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1861,  1861,     0,     0,  1861,  1559,  2279,     0,     0,     0,
+    2278,     0,     0,     0,  2268,  2267,  2248,     0,  1562,  1564,
+    1563,     0,  1861,  1861,     0,     0,     0,  1861,  1861,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1861,  1491,  1490,  1492,     0,     0,  3106,     0,
+    2860,  1699,  1701,     0,     0,  1464,  1463,     0,  1462,  1461,
+    2308,     0,  1403,     0,     0,  1408,  1407,  1469,  1470,  1471,
+    1472,     0,  1473,  1474,  1475,     0,     0,     0,     0,     0,
+       0,  1466,  1465,     0,     0,     0,     0,  1445,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1493,     0,     0,
+    2303,  2249,     0,     0,  1605,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1971,     0,     0,     0,     0,     0,
+       0,  1967,   159,     0,     0,  2960,  2952,  2990,  2989,  2994,
+       0,  2991,  2987,  2995,  2996,  2980,     0,  2966,  2984,     0,
+    2968,  2986,  2985,  2965,  2981,  2988,  2967,     0,  2963,  2955,
+       0,     0,  1857,  2929,     0,     0,   165,     0,  1225,  1989,
+       0,  3194,  3191,  2197,     0,  2208,  2209,  2205,     0,     0,
+       0,     0,  2110,     0,  2193,  3100,  1320,     0,     0,     0,
+    1990,     0,     0,  2177,  2186,  2182,  2184,  2176,  2179,   435,
+       0,     0,   465,  2946,     0,     0,  2955,  3094,  3091,  1372,
+    1383,   949,     0,     0,   952,  2877,  2009,  2010,   961,     0,
+     951,     0,     0,     0,     0,     0,  2823,  2887,  2884,  2883,
+    2836,  2831,  2830,  2327,  3013,  2829,     0,  2864,     0,   956,
+     958,   957,  2874,   955,     0,     0,  2776,  2824,  2845,     0,
+       0,  2822,     0,  2126,     0,     0,  2132,  2089,     0,   733,
+       0,     0,     0,     0,     0,     0,     0,  2061,  2109,     0,
+    2108,  2082,  1901,  2124,  2125,  2130,     0,  2123,     0,  2130,
+       0,  2097,  2114,     0,  2130,  2058,     0,     0,  2050,  2055,
+    2051,     0,  2057,  2056,  2059,  2047,  2048,  2126,  2073,  2114,
+    2081,  2088,   308,  2072,  2078,  2086,  2114,  1011,  1010,  1009,
+       0,     0,  2114,  2130,  2130,   441,     0,     0,  1255,  1257,
+    1258,  1276,  1275,  1252,  1272,  1273,   308,  2043,  3192,  3193,
+    2915,  2015,     0,  1869,     0,     0,     0,  2252,  2251,  3177,
+    2250,  3185,  3187,  3171,     0,  3174,  3173,  3182,     3,     0,
+       0,   670,     4,     0,     6,     0,     0,     7,  1347,  1365,
+       0,  1364,    12,   151,  2326,     0,     0,     0,     0,  1091,
+    1092,  1092,     0,     0,     0,     0,     0,     0,     0,     0,
+    3052,  1090,  3015,  3015,  3048,  3015,  3015,  3015,     0,     0,
+    1119,     0,     0,     0,     0,  1393,  1392,  1395,  2459,     0,
+       0,  1944,  1938,  1941,  1940,     0,  1387,  1350,  1349,     0,
+    3103,  3102,     0,  1352,  1909,  1910,  1908,  1902,  1903,  1907,
+    1906,     0,  1354,  1900,  1900,  1357,  2042,  2041,  2040,     0,
+    2038,  1224,     0,  2145,     0,     0,  2135,  2136,  2137,  2138,
+    2139,  2134,  2133,  2148,  2149,  3139,  3140,  3138,   963,  3133,
+     381,     0,     0,  2921,  2927,     0,     0,   381,     0,     0,
+    2011,  2011,     0,  2011,  2011,   649,     0,   648,  2011,   739,
+     601,   603,   604,   638,   605,   606,   607,   608,   609,     0,
+    1222,  2011,  1222,     0,  2011,  2011,  1222,  2011,     0,     0,
+    2011,  2011,  2011,  2011,     0,     0,   964,  2011,     0,     0,
+    1222,     0,  2011,     0,  1206,     0,     0,  2011,  2011,  2011,
+    2011,  2011,  1222,     0,     0,  2011,  2011,     0,  1232,     0,
+       0,  2011,     0,  2011,  2011,  2011,     0,  2011,  2011,     0,
+    2011,     0,     0,  2011,  1166,  1167,  2011,  2011,   775,  1177,
+     735,   762,   763,     0,  1062,  1063,  1138,  1140,  1210,  1146,
+    1145,  1174,  1179,  1208,  1209,     0,  1968,  3206,  1074,     0,
+       0,  1073,  3141,  1299,     0,     0,  1006,  1005,     0,     0,
+    1339,  1330,  1736,     0,  1735,   379,     0,     0,  1287,  1286,
+       0,  1284,  1312,  1311,  1309,     0,  1310,  1308,  1303,  1305,
+    1306,  3090,     0,     0,  3092,  3096,     0,   316,     0,     0,
+       0,     0,     0,   733,     0,   582,     0,  3025,  3060,   331,
+     314,     0,  1039,     0,     0,   733,     0,     0,     0,  3129,
+    3117,  3124,  3125,  3128,  3127,  3126,     0,  3123,  3116,  3119,
+    3120,  3122,  3121,  3141,     0,     0,  1862,  1861,     0,     0,
+       0,     0,     0,     0,  1744,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1410,     0,   898,  1571,     0,     0,
+       0,     0,     0,  1833,  1834,  1835,  1836,  1844,  1837,  1838,
+    1839,  1846,  1851,  1840,  1841,  1847,  1848,  1849,  1842,  1850,
+    1845,  1843,  1852,     0,  1832,     0,     0,  1856,  1853,  1855,
+    1854,     0,  1704,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1861,     0,     0,     0,  1861,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1581,     0,     0,     0,     0,
+       0,  1861,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1541,     0,  2291,  2290,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1646,     0,  1646,
+       0,     0,     0,  1649,  1650,  1648,  1651,     0,     0,     0,
+       0,  1861,     0,     0,  1495,     0,     0,     0,     0,     0,
+       0,     0,  1399,  1406,  1405,  1412,  1411,  1413,  1417,  1422,
+    1415,  1419,     0,  1476,  2395,  1424,     0,     0,  1457,     0,
+    1427,  1437,  1458,  1441,  1448,  1449,     0,  1444,     0,  1446,
+    1447,     0,  1451,     0,  1450,  1454,  1455,  1456,  1459,     0,
+       0,     0,     0,  1483,  1489,  1511,  1512,  1404,     0,  1606,
+    1607,  2284,  2292,  1948,  1955,  1950,     0,  1971,  1952,  1960,
+    1967,  1975,  1976,  1957,   739,  1973,  1956,   610,  3011,  1953,
+    1226,  1962,  3219,     0,     0,   158,     0,     0,     0,     0,
+    2167,  2169,  2172,  2168,     0,  2171,     0,  2170,  2151,  2154,
+    2160,  2173,     0,     0,   466,   470,   472,     0,   475,     0,
+    2983,  3066,     0,     0,  2964,  2957,  2958,  2956,     0,  2997,
+    2962,  1858,     0,  2928,  2489,  2596,     0,  1863,  2295,  3196,
+       0,     0,     0,     0,  2206,     0,  2904,  1857,  2903,  2907,
+    1314,     0,   154,   155,     0,     0,     0,  1319,  1323,     0,
+    1289,  1772,  2181,  2190,  2188,  2188,     0,   433,   458,   453,
+     461,   455,   457,   456,   462,   463,   464,   459,   454,   460,
+     447,     0,     0,     0,     0,  2944,     0,  3095,     0,  3097,
+       0,  1863,  1373,  1372,     0,     0,     0,  2880,     0,  2876,
+    2875,     0,  1092,  2305,  1092,     0,  2889,  2890,     0,  2881,
+       0,  2882,     0,  2835,     0,     0,  2838,     0,     0,     0,
+       0,     0,     0,     0,  2879,  2844,  2843,     0,  2846,  2847,
+       0,  2850,  2898,  2899,  2896,  2897,  2900,  2901,  2895,  2871,
+       0,  2128,  2131,  1865,     0,     0,  2106,  2100,  2099,  2095,
+    2101,  2107,  2096,  2068,  2069,  2070,  2064,  2115,  2105,  2103,
+    2092,  2130,  2104,  2102,  2052,  2053,  2054,     0,  1900,     0,
+    2128,  2130,     0,  2098,  2130,     0,     0,  2130,  2085,  2087,
+    1261,  1262,     0,     0,  1277,     0,  1251,  2020,  2019,     0,
+    2016,  2018,  2007,  1870,     0,  1875,     0,     0,     0,  3172,
+    3188,  3170,  3176,  3183,  3184,  3169,  2292,     0,   671,     0,
+       0,   674,     0,     0,  2011,  1366,    13,    10,  1127,     0,
+       0,  3059,     0,  3015,  3015,     0,     0,  3020,  2324,     0,
+       0,     0,  3057,     0,     0,     0,     0,  3045,     0,  3046,
+    3049,     0,  3050,  3051,     0,     0,  3072,  3070,     0,  3071,
+    3069,  3002,  3017,  3063,     0,  1099,  1248,  2300,  1247,  1246,
+    1242,     0,     0,  1398,  1395,  1389,  1396,  2304,  1943,   953,
+    1939,     0,     0,  1896,  1893,  1895,  1362,  1360,     0,     0,
+    1363,  1361,  1353,  1355,     0,     0,  1965,  2036,  2039,     0,
+    2144,     0,     0,   963,   722,   724,   731,   730,   732,     0,
+    1069,  2926,  2925,     0,     0,     0,     0,  1067,     0,     0,
+     599,  2012,     0,     0,   599,     0,     0,     0,     0,   740,
+    2112,  2011,  1223,  1056,  1007,  1315,  1007,  1183,     0,  1056,
+       0,     0,     0,     0,     0,     0,  1315,     0,     0,     0,
+       0,     0,  1315,     0,     0,     0,     0,     0,  2011,     0,
+    1192,     0,  1148,     0,     0,     0,     0,     0,     0,     0,
+    1193,     0,     0,     0,  1149,  2011,     0,     0,     0,     0,
+       0,     0,  1315,     0,     0,     0,  1315,  1235,     0,  1234,
+    1233,     0,     0,  1315,  1315,     0,   772,     0,     0,     0,
+     768,   769,     0,     0,     0,     0,  1170,  1171,     0,     0,
+       0,   736,  2011,  2011,     0,  1142,  1139,   963,   963,     0,
+    2011,  3214,  1128,     0,     0,  1071,     0,     0,  1296,  1332,
+    1326,  1331,  1329,  1339,     0,  1823,     0,   399,     0,     0,
+       0,     0,     0,     0,     0,     0,   308,   172,     0,   202,
+     206,   214,   218,   204,   300,   302,   210,   212,   216,   224,
+     236,   222,   240,   226,   228,   230,   232,   220,   234,   208,
+     246,     0,     0,   242,   244,     0,   248,   250,     0,   238,
+       0,     0,     0,     0,   245,   203,   207,   249,   215,   219,
+     247,   205,   301,   303,   211,   213,   243,   217,   221,   223,
+     225,   241,   227,   229,   231,   233,   235,   239,   237,   209,
+     251,     0,   308,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   200,     0,
+       0,   285,  1964,  1313,  1307,  3089,  3093,   734,   963,     0,
+       0,     0,     0,     0,     0,   581,     0,   584,     0,     0,
+    3024,  3025,  3028,  3029,  3030,  3031,  3032,  3033,     0,     0,
+    3068,  2011,     0,     0,     0,  1040,   963,     0,     0,     0,
+     380,  3164,     0,  3118,     0,  1567,     0,  1661,  1711,  1661,
+    1661,  1661,     0,     0,     0,     0,     0,     0,  1568,     0,
+    1515,  1569,  1570,     0,     0,     0,  1661,     0,   899,     0,
+       0,  1518,  1519,  1508,     0,     0,  1590,     0,  1707,  1520,
+       0,     0,     0,     0,     0,  1591,  1739,     0,  1741,  2292,
+       0,  1661,  1575,  1526,     0,  1661,     0,  1527,  1592,  1593,
+    1594,     0,  1596,     0,  1577,     0,     0,  1580,     0,     0,
+    1529,  1661,  1661,     0,     0,     0,     0,  1661,  1531,     0,
+       0,     0,  1530,     0,     0,     0,     0,     0,     0,     0,
+    1533,     0,  1509,  1661,  1661,  1583,     0,     0,  1585,     0,
+    1542,  1861,  1661,  1698,     0,  1638,  1637,  1655,     0,     0,
+    1655,     0,     0,  1652,     0,  1639,  1636,  1635,     0,     0,
+    1661,     0,  2861,  2862,  2863,  1058,  1700,  1499,  1418,  1423,
+    1416,  1420,  1425,     0,     0,     0,  1436,     0,     0,     0,
+       0,     0,  1428,  1439,  1442,  1609,  1597,     0,  1734,     0,
+       0,  1211,  1959,     0,  2112,  1958,   611,   612,   614,     0,
+    1228,  1227,  1954,  3220,  1951,  1226,     0,   160,   162,  2165,
+    2162,  2161,  2163,   308,  2164,     0,  2174,  2152,  2447,  2773,
+    2774,   479,     0,   451,   450,   452,   476,     0,     0,  2955,
+    3065,     0,     0,  3006,  3009,     0,     0,     0,  2950,  1860,
+    2939,  2935,  2940,  2942,  2938,  2941,  2943,  2936,  2937,  1863,
+       0,  1900,  1864,  1772,  3190,  3195,  1334,  1335,  1339,     0,
+       0,     0,   156,     0,     0,  2194,     0,  1321,     0,     0,
+    1294,  1293,  1295,  1288,  1290,  1291,     0,     0,  1773,     0,
+    2187,  2189,   308,   308,  2178,     0,     0,     0,  2955,     0,
+       0,  3098,  1375,     0,     0,     0,     0,  1374,  1376,  1377,
+    1749,  1748,  1779,  1776,  1775,  1778,  1777,  1780,  1772,  1857,
+    1882,  1863,     0,     0,     0,   960,   962,   959,     0,     0,
+    3015,  3015,     0,     0,  2894,  2886,  2888,  2885,  2837,  2328,
+    3014,     0,  2867,  2868,  2869,  2865,  2866,     0,  2872,  2870,
+       0,  2849,  2127,     0,  1900,     0,  2094,     0,  2066,     0,
+    2084,  2049,  1900,  2065,     0,  2063,  2114,  2114,  2062,  1260,
+    1259,     0,  1263,  1274,  2014,     0,  1874,     0,  1872,  3178,
+    3186,     0,     0,     0,     0,     0,     0,     0,     0,   676,
+       0,   672,     0,     0,  1086,     0,  3034,  1093,  1085,  1084,
+       0,  3019,  3053,  3030,  1087,  1088,  1089,  3018,     0,  3036,
+    3055,  3015,     0,  3015,  3015,  3005,  3004,  3003,  3000,     0,
+       0,     0,     0,     0,  1120,  1122,     0,     0,     0,     0,
+    1096,  1100,  1101,  1394,  1397,  1390,     0,  2214,  1937,  1391,
+    1898,  1899,  2286,  1897,     0,  1905,  1904,     0,  1857,  2294,
+       0,     0,     0,  2296,     0,  1935,  1936,  1920,  1921,  1919,
+    1922,  2140,  1923,  1934,  2011,   723,  2011,     0,     0,     0,
+       0,     0,     0,     0,   382,   391,     0,     0,  2920,     0,
+     626,     0,     0,     0,     0,     0,     0,     0,     0,   336,
+     633,  1077,   739,  1930,  1932,  1929,  1931,   639,   652,  1933,
+     653,   650,  1078,   637,   640,  1079,  3221,   651,   602,     0,
+     809,  1057,  1008,  1056,  1150,  1056,     0,     0,     0,  1007,
+     812,  1056,     0,  1036,  1057,   808,     0,  1217,  1216,  1218,
+     810,   810,     0,     0,     0,  1927,  1928,  1926,  1924,  1925,
+     751,   746,     0,  1917,  1918,  1914,  1915,  1913,  1916,   757,
+    1172,  1304,  1173,  1830,     0,   748,   749,   750,   770,     0,
+       0,   759,     0,  1190,  1191,     0,  1153,  1188,  1189,  1226,
+     741,     0,     0,     0,   788,   789,   787,   764,   771,  1220,
+    1219,  1221,   744,   745,     0,     0,  1207,  1889,  1896,   777,
+     752,   776,   747,     0,     0,     0,  1201,  1161,     0,   786,
+     784,   781,   783,   782,   785,   760,   753,   754,   756,   755,
+     767,   758,  1160,  2173,   742,   743,   773,   774,     0,     0,
+    1143,  1222,  1222,  1178,  1175,  1176,  1141,  1147,  1180,   634,
+     635,   610,     0,  2011,  3216,     0,  1130,  1132,  3142,  3143,
+    1873,     0,     0,     0,  1826,     0,  1827,  1824,  1825,     0,
+    1737,     0,     0,     0,     0,     0,     0,     0,     0,   171,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   169,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   317,
+     963,   728,     0,   615,     0,     0,     0,   326,     0,  2011,
+    2011,  2011,  2011,   321,   739,   586,   588,   589,   590,   591,
+     592,   595,   593,   596,   594,   597,   598,   610,  3026,  3022,
+       0,  3023,     0,  3061,  1119,     0,  1045,  1047,  1046,  1042,
+    1041,     0,     0,  2213,     0,  2212,   808,   311,   655,   657,
+     660,   658,   739,   737,  2000,  2002,   662,     0,     0,   345,
+    3159,     0,     0,   576,   575,     0,     0,     0,  1661,  1612,
+    1662,  1614,  1615,  1620,     0,  1745,     0,  1505,   911,   911,
+     895,  1719,   891,   883,   889,  1733,  1724,  1728,  1731,  1730,
+    1732,     0,   867,  1727,  1729,   881,  1715,   895,  1717,  1720,
+     911,  1725,  1513,     0,     0,     0,     0,     0,  1661,  1622,
+    1661,     0,     0,     0,     0,     0,     0,  1705,     0,     0,
+       0,  1510,     0,  1601,  1661,  1626,  1661,  1624,     0,     0,
+       0,     0,     0,     0,     0,  1630,  1628,     0,     0,     0,
+       0,  1661,  1632,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1629,  1631,     0,     0,     0,     0,
+       0,  1616,  1669,  1663,  1664,  1665,  1666,     0,     0,     0,
+    1653,  1655,     0,  1655,     0,  1640,     0,  1565,  1661,  1618,
+    1496,     0,  1702,  1434,  1429,     0,  1438,     0,  1453,  1452,
+       0,     0,     0,  1608,     0,  2285,  2293,  1949,  1947,  1213,
+    1212,  1961,  1974,  2112,  3012,  1946,   163,     0,  2166,  2159,
+    2155,     0,   471,   480,   473,   477,   478,   474,     0,  3067,
+    3075,     0,     0,     0,     0,  1900,     0,  2930,     0,     0,
+    1339,  1341,  2210,     0,  2910,  2911,  2909,  2908,  2196,  2195,
+       0,  1324,  1325,  1292,     0,     0,  2004,  2003,     0,  1980,
+    1982,  1991,  1994,     0,  2191,  2183,  2185,     0,   448,     0,
+       0,  2949,     0,     0,  1857,     0,  1749,  1779,  1776,  1775,
+    1778,     0,     0,     0,     0,  1762,  1770,  1768,  1770,  1765,
+       0,     0,     0,  1857,  1873,     0,  1866,  1882,  2834,  2833,
+    2832,  1092,  1092,  2826,  2825,  2892,  2891,  2893,  2840,   739,
+    2839,     0,  2848,  2129,  2075,  2080,  2079,  2093,  2060,   308,
+     309,  1863,  2130,     0,  1283,     0,  1279,  1278,     0,  1265,
+    2017,  1876,     0,  3189,     5,     0,     0,     0,     0,   675,
+       0,   685,     0,     0,     0,     0,  3197,  3035,     0,     0,
+    3058,     0,     0,     0,  3043,  3016,  3047,  3044,  3001,  1125,
+    1123,  1124,  1126,  1121,  1104,  1103,  1105,     0,     0,     0,
+    1118,  1117,  1116,     0,     0,  1083,  1102,   954,     0,  2222,
+    1894,     0,  1772,     0,  1863,  1966,  2037,  2036,     0,     0,
+       0,   385,   388,   386,     0,   387,     0,     0,  2923,     0,
+     636,  1076,   739,   628,   630,   631,   632,   340,   339,   341,
+     342,   344,   343,   338,  1082,     0,   646,     0,     0,     0,
+       0,     0,  1056,  1003,  1004,   811,     0,   806,   813,     0,
+       0,     0,     0,     0,   794,   796,   797,     0,   880,   834,
+     825,   911,   828,   827,   971,   895,   839,   886,     0,   888,
+     885,   860,   859,   876,   858,   863,   847,   971,   971,   846,
+     879,   971,   864,   862,   866,     0,   867,   887,   872,   861,
+     865,   857,     0,   878,   911,   895,   895,   843,   877,   971,
+       0,   870,   911,   799,   915,   845,   978,     0,     0,   911,
+     913,   891,  1199,  1200,  1044,  1043,  1198,     0,     0,  1156,
+       0,  1157,     0,  1159,   961,   961,   765,  1164,  1187,  1186,
+       0,  1165,   766,  1229,  1155,     0,  1890,  1154,     0,     0,
+       0,  1289,     0,   779,   778,  1081,  3210,  3207,  3208,     0,
+    3218,  3217,  3219,     0,     0,     0,   350,  3144,     0,     0,
+    1338,  1340,     0,  1327,     0,   174,   175,     0,   176,   177,
+       0,   178,   179,     0,   180,   173,   286,   306,   307,   253,
+     291,   279,   290,   280,   293,   292,   294,   281,   282,   296,
+     297,   295,   283,   284,   201,   278,   252,   254,   255,   256,
+     257,   258,   259,   260,   261,   262,   263,   267,   270,   271,
+     268,   269,   264,   299,   265,   298,   266,   272,   273,   274,
+     276,   277,   304,   305,   729,     0,  2011,  2011,   320,   739,
+     617,   619,   620,   621,   622,   625,   623,   624,   326,     0,
+       0,   325,     0,     0,     0,     0,     0,  2112,   322,     0,
+       0,   332,  1099,  3204,  3205,  3206,     0,   661,   312,     0,
+       0,   656,   654,   963,  2001,   659,     0,     0,   400,   792,
+     793,   791,   790,     0,  3165,   579,   577,   578,     0,     0,
+    1543,  1613,  1746,     0,     0,   912,  1712,   971,     0,  1722,
+       0,  1723,   893,   892,   884,   882,  1726,   890,   868,  1716,
+    1721,  1718,  1714,  1514,     0,     0,  2280,  1516,  1507,  1506,
+    1623,  1621,     0,     0,  1549,  1573,     0,  1550,     0,     0,
+       0,     0,     0,  1522,     0,  1525,     0,     0,  1603,  1627,
+    1625,  1576,  1595,  1552,  1578,     0,  1528,  1497,     0,  1553,
+       0,  1558,  1556,     0,  1633,  1532,     0,     0,  1539,     0,
+    1537,     0,  1538,     0,  1540,  1582,  1584,     0,     0,     0,
+       0,  1661,  1670,     0,  1671,  1657,  1656,  1643,     0,  1647,
+       0,  1644,     0,  1658,     0,  1799,  1619,  1059,     0,  1433,
+    1435,  1431,     0,  1440,  1598,  1215,  1214,   613,   161,  2157,
+       0,  2153,     0,     0,     0,     0,  2954,  3008,  3007,  3010,
+    3073,  2998,  2931,     0,     0,  2021,  2023,  1336,  1339,  1341,
+       0,  1337,     0,  2211,  2912,  2913,  1322,     0,  1829,  1981,
+    2029,     0,     0,     0,  1998,  2283,  2282,  2290,  2015,  1999,
+    2006,     0,     0,     0,  2945,     0,  1873,     0,  1787,  1781,
+    1783,  1784,  1786,     0,     0,  1749,  1748,  1378,  1764,  1763,
+    1771,     0,  1769,  1770,  1770,     0,     0,  1758,  1757,     0,
+    1820,  1788,     0,     0,  1877,  1866,  3015,  3015,     0,  2873,
+    2076,  2077,  2071,     0,     0,     0,     0,     0,  1267,  3179,
+       0,   681,   668,     0,   666,   670,     0,   663,     0,     0,
+     679,     0,     0,     0,  2307,  2306,  3037,     0,  3038,     0,
+    1108,     0,  1107,  1113,  1110,  1109,     0,  1098,  1097,     0,
+       0,     0,     0,  2215,  2217,     0,  1942,  1863,  1863,  2295,
+    2034,     0,  2297,  1863,   725,   780,   390,   389,   395,   396,
+       0,  2922,  2112,   337,     0,  1152,     0,     0,   687,     0,
+       0,     0,   814,     0,     0,  1054,     0,  1053,  1896,  1037,
+    1038,  1182,   808,   799,   833,   826,   844,   965,   976,   974,
+     968,   869,   971,     0,   972,   973,   830,   842,     0,   853,
+       0,   848,   971,   856,   852,   868,   871,   873,   875,     0,
+     971,   841,   840,   850,   837,   900,     0,  1229,   800,   925,
+       0,     0,     0,     0,  1465,   919,     0,   983,     0,     0,
+     928,     0,  2011,  2011,     0,   936,   815,   916,   918,   817,
+       0,   939,     0,   979,   978,   832,   971,   978,   900,     0,
+     914,   900,   900,  1196,     0,  1197,  1229,  1831,  1205,  1204,
+       0,     0,  1231,  1185,  1888,  1203,  1202,     0,  1158,   761,
+       0,     0,  3212,     0,  3215,  1094,     0,   360,     0,     0,
+    1129,     0,   353,   351,   362,     0,  1301,  1297,  1828,   181,
+       0,   183,   185,   190,     0,   192,  2329,     0,   195,     0,
+     197,  2301,   199,     0,   186,     0,     0,   287,   289,     0,
+       0,     0,  2112,   324,     0,     0,     0,     0,     0,     0,
+     583,   645,   641,   647,   644,   587,  3027,     0,  3042,  3040,
+    3041,  1096,  3214,     0,     0,   963,   738,     0,     0,     0,
+     401,   403,     0,     0,   410,     0,     0,  1747,     0,     0,
+       0,     0,  1713,     0,     0,  1502,  1513,  2281,     0,     0,
+       0,     0,  1708,  1710,  1706,  1661,     0,     0,     0,     0,
+       0,  1500,     0,  1599,     0,     0,     0,     0,     0,     0,
+    1536,  1534,  1535,   980,  1587,  1586,     0,  1617,  1667,     0,
+    1673,  1654,  1642,  1641,     0,  1655,  1566,     0,  1807,  1808,
+       0,  1800,  1801,     0,  1430,     0,     0,     0,   488,   483,
+     491,   485,   487,   486,   492,   493,   494,   495,   489,   484,
+     490,   482,   481,     0,     0,     0,  3082,  1863,  2021,     0,
+    2023,     0,  1979,  1333,  1342,     0,  1774,     0,     0,  1992,
+    1995,     0,     0,     0,     0,     0,   449,  2948,     0,     0,
+    1789,  1378,  1750,  1766,     0,     0,  1759,  1767,     0,     0,
+       0,     0,  1814,  1815,     0,     0,  1818,  1821,  1822,  1785,
+    2287,  1886,  1885,  1867,     0,  1371,  1877,  2828,  2827,  2841,
+    1282,  1281,  1280,  1264,     0,     0,  1269,   669,     0,   667,
+       0,     0,   665,   673,     0,   680,     0,     0,  3054,  3039,
+    3056,     0,  1114,  1115,  1112,     0,     0,     0,     0,     0,
+    2216,     0,     0,  2223,  2225,  2035,  1891,  1891,     0,   629,
+       0,   690,  1151,     0,     0,   807,     0,     0,     0,  1025,
+       0,     0,  1050,   795,   798,   967,   966,   970,     0,   969,
+     829,   978,     0,  1060,   849,   874,     0,   851,   904,   905,
+     906,   838,   901,   903,   985,  1181,   931,   940,   942,   941,
+     932,   930,     0,     0,     0,     0,     0,     0,   947,   922,
+    2257,   948,  2258,  2254,     0,     0,   943,   944,   945,   933,
+     929,   934,     0,     0,   935,     0,   917,     0,     0,   927,
+     920,   921,   831,   835,   836,   822,     0,   823,   824,     0,
+    1194,  1184,  1168,  1230,     0,  3211,  3209,  3213,   361,   349,
+       0,     0,  1131,  1133,     0,     0,  1134,     0,     0,  1300,
      182,     0,   191,     0,     0,   196,     0,     0,   187,     0,
-     275,     0,  1013,   642,   641,   617,     0,  1019,   326,   327,
-     329,     0,  3010,     0,  3011,   318,  3180,     0,   312,   309,
-       0,     0,  3124,     0,   960,  3122,   412,   410,   411,     0,
-     405,   407,     0,     0,  1541,   908,   906,   909,   907,   895,
-       0,     0,     0,  1544,  1545,  1571,     0,  1631,  1569,     0,
-    1520,  1597,     0,     0,  1576,  1551,  1554,  1552,  1557,  1558,
-       0,     0,     0,     0,  1672,  1656,  1657,     0,  1806,  1521,
-    1799,     0,     0,  1429,  2155,  2153,  3037,  3040,     0,     0,
-    2939,  1897,  2020,  1870,  1974,     0,     0,  2025,  2027,  1990,
-    1993,  1994,  2289,  2010,  2002,  2935,     0,  1779,  1758,  1757,
-    1750,     0,  1752,     0,  1807,  1807,  1816,  1884,     0,  1880,
-       0,  1875,  1876,  1367,  1263,     0,     0,  1250,   681,     0,
-     671,   685,   663,  3165,  3018,  3022,  3003,  1103,  1108,  2217,
-    2218,     0,  2215,     0,     0,  2221,  1908,  1908,     0,  1013,
-       0,   709,   687,  1019,     0,  1048,  1024,  1893,     0,  2008,
-    2008,  2008,   800,  1025,  1026,  1028,  1029,  1032,  1051,     0,
-     976,   974,   970,     0,   970,   901,     0,   988,  2253,  2252,
-       0,   923,   925,   936,   937,   930,   817,     0,     0,  1160,
-    1166,     0,   346,   351,   362,   363,  1074,  3111,  3109,     0,
-     184,   193,   194,   198,     0,     0,   287,     0,  1208,  1014,
-    1015,  1017,     0,  1208,  1020,  1021,  1023,     0,  3012,   314,
-    1024,  3121,   357,     0,   401,   403,  3130,   409,     0,     0,
-       0,  1500,     0,  1706,     0,  1599,  1601,   980,     0,  1669,
-       0,  1693,  1692,  1694,  1665,     0,  1642,     0,  1803,  1802,
-    3046,  3038,  3041,  2920,  1975,  2019,     0,  1769,     0,     0,
-       0,     0,     0,     0,     0,  1881,     0,     0,  1265,     0,
-     307,     0,     0,     0,     0,  3162,  3163,  3015,  2216,  2224,
-    2223,     0,  2030,  2022,  2912,   801,     0,     0,  2008,     0,
-       0,  2008,  2008,  2008,  2008,   704,   710,   712,     0,   802,
-       0,     0,   803,  1054,  1031,     0,     0,     0,  1027,  1893,
-     853,  1060,   854,     0,   987,     0,   992,   922,     0,  1192,
-    1159,   353,  1132,   514,     0,  3110,  1295,     0,     0,     0,
-     333,  1016,   322,   334,  1022,     0,  1208,   349,   358,     0,
-     382,   406,   960,     0,   893,   894,  1518,  1585,  1671,     0,
-       0,     0,     0,  1687,  1674,  1675,     0,     0,  2941,     0,
-    3047,     0,   952,     0,  1854,  1751,  1753,     0,  1808,     0,
-    1820,     0,  1878,  1877,  1267,  1251,     0,     0,  2008,     0,
-    3166,  1909,   698,   691,   694,     0,     0,  2008,  2008,     0,
-       0,     0,     0,     0,   688,   711,  2008,   804,  1047,  1030,
-    1033,  1034,  1050,   985,     0,   989,   990,   991,     0,   983,
-       0,     0,   355,   540,  2416,   526,   512,     0,     0,  2599,
-     516,   364,   367,   365,  2023,   366,   372,     0,   373,   374,
-     375,   376,   377,   368,   538,   539,   371,   369,   370,     0,
-    2310,     0,  2311,  2371,  2370,  2372,     0,     0,     0,   188,
-       0,  1018,   328,   332,   361,   960,  3131,   408,  3117,     0,
-       0,     0,  1682,     0,     0,     0,  1680,     0,  1676,     0,
-    1673,  1678,  1677,     0,  2021,  2225,  2583,     0,  1789,     0,
-    1787,  1810,  1809,     0,     0,   682,     0,     0,  3167,   698,
-       0,   696,     0,   692,   690,   693,   720,     0,     0,   716,
-     717,   715,   713,     0,     0,   706,     0,   986,     0,     0,
-     818,   354,     0,   347,     0,     0,   525,   528,     0,     0,
-     531,   521,   520,   522,     0,   515,   514,   514,   568,   519,
-     565,   564,   557,     0,  3112,     0,     0,     0,  3125,   392,
-     391,   383,     0,   514,  3115,  3116,     0,  3119,  1501,     0,
-    1683,     0,  1685,  1684,     0,     0,  1689,     0,  1690,  2824,
-    3045,  3044,  3042,     0,  2211,     0,  1788,     0,     0,   960,
-    1814,  1813,     0,   676,   682,  3165,   695,     0,   702,     0,
-     700,   703,   718,   719,   709,   705,     0,   714,   998,     0,
-     997,     0,   994,   993,   820,   819,   914,   356,   541,   552,
-     555,   547,   527,     0,     0,     0,   517,   514,     0,   501,
-     499,   500,   506,   507,   508,   509,   510,   511,   502,   505,
-     503,   504,   514,     0,   417,     0,     0,  3113,  3114,   189,
-     363,   382,   393,  3132,  3118,   514,     0,  1681,  1679,  1688,
-    1691,  3043,     0,  2219,     0,  1790,  1791,  1794,   683,   677,
-    3164,   697,   699,     0,   708,   707,  1000,  1001,   999,     0,
-       0,   815,     0,     0,   514,   548,     0,   523,     0,   532,
-       0,     0,   415,   571,   569,   413,   559,   559,   345,  3126,
-    3120,  1686,     0,  2227,  1793,  1795,     0,   701,     0,     0,
-     549,   555,   545,   553,   514,     0,     0,   513,     0,   567,
-     416,     0,     0,     0,   514,     0,   558,   560,   562,   514,
-    2226,     0,  2231,     0,   996,   995,     0,   546,     0,     0,
-     544,   524,   529,   514,   572,   514,   426,   425,     0,     0,
-     495,   566,     0,   418,  3127,     0,     0,  2238,  1796,   550,
-       0,   514,     0,   514,     0,   514,     0,     0,   960,     0,
-       0,   414,  2229,  2230,  2228,  2233,     0,     0,  2235,  2236,
-       0,  2199,  1800,  1792,  1798,     0,   542,   514,   530,   535,
-       0,     0,   421,   496,   497,     0,   423,  2237,  2232,     0,
-    2239,  2241,     0,  1801,     0,   514,   514,   531,   534,   573,
-     570,     0,     0,   419,   420,   431,   430,     0,  2234,     0,
-       0,     0,   514,   514,   536,   439,   437,   514,   427,   435,
-     429,     0,   436,   498,   424,  2240,  2242,     0,   422,   438,
-     428
+     275,     0,  1014,   643,   642,   618,     0,  1020,   327,   328,
+     330,     0,     0,   319,  3216,     0,   313,   310,     0,     0,
+    3160,     0,   961,  3158,   413,   411,   412,     0,   406,   408,
+       0,     0,  1544,   909,   907,   910,   908,   896,     0,     0,
+       0,  1547,  1548,  1574,     0,  1634,  1572,     0,  1523,  1600,
+       0,     0,  1579,  1554,  1557,  1555,  1560,  1561,     0,     0,
+       0,     0,  1675,  1659,  1660,     0,  1809,  1524,  1802,     0,
+       0,  1432,  2158,  2156,  3073,  3076,     0,     0,  2951,  1900,
+    2023,  1873,  1977,     0,     0,  2028,  2030,  1993,  1996,  1997,
+    2292,  2013,  2005,  2947,     0,  1782,  1761,  1760,  1753,     0,
+    1755,     0,  1810,  1810,  1819,  1887,     0,  1883,     0,  1878,
+    1879,  1370,  1266,     0,     0,  1253,   682,     0,   672,   686,
+     664,  3201,  3021,  1106,  1111,  2220,  2221,     0,  2218,     0,
+       0,  2224,  1911,  1911,     0,  1014,     0,   710,   688,  1020,
+       0,  1049,  1025,  1896,     0,  2011,  2011,  2011,   801,  1026,
+    1027,  1029,  1030,  1033,  1052,     0,   977,   975,   971,     0,
+     971,   902,     0,   989,  2256,  2255,     0,   924,   926,   937,
+     938,   931,   818,     0,     0,  1163,  1169,     0,   347,   352,
+     363,   364,  1075,  3147,  3145,     0,   184,   193,   194,   198,
+       0,     0,   288,     0,  1211,  1015,  1016,  1018,     0,  1211,
+    1021,  1022,  1024,     0,     0,   315,  1025,  3157,   358,     0,
+     402,   404,  3166,   410,     0,     0,     0,  1503,     0,  1709,
+       0,  1602,  1604,   981,     0,  1672,     0,  1696,  1695,  1697,
+    1668,     0,  1645,     0,  1806,  1805,  3082,  3074,  3077,  2932,
+    1978,  2022,     0,  1772,     0,     0,     0,     0,     0,     0,
+       0,  1884,     0,     0,  1268,     0,   308,     0,     0,     0,
+       0,  3198,  3199,  2219,  2227,  2226,     0,  2033,  2025,  2924,
+     802,     0,     0,  2011,     0,     0,  2011,  2011,  2011,  2011,
+     705,   711,   713,     0,   803,     0,     0,   804,  1055,  1032,
+       0,     0,     0,  1028,  1896,   854,  1061,   855,     0,   988,
+       0,   993,   923,     0,  1195,  1162,   354,  1135,   515,     0,
+    3146,  1298,     0,     0,     0,   334,  1017,   323,   335,  1023,
+       0,  1211,   350,   359,     0,   383,   407,   961,     0,   894,
+     895,  1521,  1588,  1674,     0,     0,     0,     0,  1690,  1677,
+    1678,     0,     0,  2953,     0,  3083,     0,   953,     0,  1857,
+    1754,  1756,     0,  1811,     0,  1823,     0,  1881,  1880,  1270,
+    1254,     0,     0,  2011,     0,  3202,  1912,   699,   692,   695,
+       0,     0,  2011,  2011,     0,     0,     0,     0,     0,   689,
+     712,  2011,   805,  1048,  1031,  1034,  1035,  1051,   986,     0,
+     990,   991,   992,     0,   984,     0,     0,   356,   541,  2421,
+     527,   513,     0,     0,  2609,   517,   365,   368,   366,  2026,
+     367,   373,     0,   374,   375,   376,   377,   378,   369,   539,
+     540,   372,   370,   371,     0,  2313,     0,  2314,  2374,  2373,
+    2375,     0,     0,     0,   188,     0,  1019,   329,   333,   362,
+     961,  3167,   409,  3153,     0,     0,     0,  1685,     0,     0,
+       0,  1683,     0,  1679,     0,  1676,  1681,  1680,     0,  2024,
+    2228,  2593,     0,  1792,     0,  1790,  1813,  1812,     0,     0,
+     683,     0,     0,  3203,   699,     0,   697,     0,   693,   691,
+     694,   721,     0,     0,   717,   718,   716,   714,     0,     0,
+     707,     0,   987,     0,     0,   819,   355,     0,   348,     0,
+       0,   526,   529,     0,     0,   532,   522,   521,   523,     0,
+     516,   515,   515,   569,   520,   566,   565,   558,     0,  3148,
+       0,     0,     0,  3161,   393,   392,   384,     0,   515,  3151,
+    3152,     0,  3155,  1504,     0,  1686,     0,  1688,  1687,     0,
+       0,  1692,     0,  1693,  2836,  3081,  3080,  3078,     0,  2214,
+       0,  1791,     0,     0,   961,  1817,  1816,     0,   677,   683,
+    3201,   696,     0,   703,     0,   701,   704,   719,   720,   710,
+     706,     0,   715,   999,     0,   998,     0,   995,   994,   821,
+     820,   915,   357,   542,   553,   556,   548,   528,     0,     0,
+       0,   518,   515,     0,   502,   500,   501,   507,   508,   509,
+     510,   511,   512,   503,   506,   504,   505,   515,     0,   418,
+       0,     0,  3149,  3150,   189,   364,   383,   394,  3168,  3154,
+     515,     0,  1684,  1682,  1691,  1694,  3079,     0,  2222,     0,
+    1793,  1794,  1797,   684,   678,  3200,   698,   700,     0,   709,
+     708,  1001,  1002,  1000,     0,     0,   816,     0,     0,   515,
+     549,     0,   524,     0,   533,     0,     0,   416,   572,   570,
+     414,   560,   560,   346,  3162,  3156,  1689,     0,  2230,  1796,
+    1798,     0,   702,     0,     0,   550,   556,   546,   554,   515,
+       0,     0,   514,     0,   568,   417,     0,     0,     0,   515,
+       0,   559,   561,   563,   515,  2229,     0,  2234,     0,   997,
+     996,     0,   547,     0,     0,   545,   525,   530,   515,   573,
+     515,   427,   426,     0,     0,   496,   567,     0,   419,  3163,
+       0,     0,  2241,  1799,   551,     0,   515,     0,   515,     0,
+     515,     0,     0,   961,     0,     0,   415,  2232,  2233,  2231,
+    2236,     0,     0,  2238,  2239,     0,  2202,  1803,  1795,  1801,
+       0,   543,   515,   531,   536,     0,     0,   422,   497,   498,
+       0,   424,  2240,  2235,     0,  2242,  2244,     0,  1804,     0,
+     515,   515,   532,   535,   574,   571,     0,     0,   420,   421,
+     432,   431,     0,  2237,     0,     0,     0,   515,   515,   537,
+     440,   438,   515,   428,   436,   430,     0,   437,   499,   425,
+    2243,  2245,     0,   423,   439,   429
 };
 
   /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-   -4292, -4292, -4292, -4292, -4292, -4292,   -56, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292,  1523, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292,  1770,  1778, -4292, -4110, -4292, -4292,  1777,
-   -4292,   371,  1779, -4292,   369, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292,  1765, -4292,   367, -4292, -4292, -4292, -4292, -4292, -4292,
-   -2845, -1588, -4292, -4292, -4292, -4292, -4292, -4292,  1134, -4292,
-   -4292,   365,  1338,  3841, -4292,   351, -4292,    46, -4292, -4292,
-   -4292, -4044,   -65,  -245, -4292, -4292,    20,  3346,  -231, -3454,
-   -4292, -4292, -4292, -4292, -4292, -4292,   370, -4292, -4292,   177,
-   -4292, -4292, -1272, -4292, -4292, -4292, -4292, -4292, -4292,  -416,
-    -369,  2507, -4292, -4292, -4292,  5041, -4292,  4007, -4292, -2773,
-    2174, -4292, -4292, -4292, -4292, -4292,  2224, -2721, -4292, -4292,
-   -4292,  1014, -4292, -4292, -4292,  -355,    93, -4292,    97, -4292,
-      98, -4292,   100, -4292,   102,   104,   105,   109, -4292,   110,
-   -4292, -4292,  -376, -4292, -4292, -4292, -4292,   111, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292,  -272, -4292, -4292,  -178, -4292,
-   -4292,  -265,   112, -4292,  -247,   113, -4292,   115, -4292,  -187,
-   -4292,  -185, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292,  1188,  2689,  3934,  2687, -2726, -4292,  1607, -4292,
-   -4292,   755, -4292, -4292,   907, -1547, -4292,  2474, -2555, -2510,
-   -1141, -2488, -4292, -4292, -4292, -3149, -3142, -1394, -4292, -1376,
-   -2478, -2467, -2351,   741,  1763,  1771,  1759,    29, -4292,   965,
-     330, -4292, -4292, -4292, -3501,  -112, -4292, -3870,   559, -4292,
-   -4292, -4292, -4292, -3070, -4292, -4292,  -189, -4292, -4292,  -120,
-    -117, -4292,   172, -4292,  2739, -4292, -4292, -2407,  -538,  2626,
-   -4292, -1993, -1757, -2335, -1610, -1608, -4292, -4292, -4292,  1195,
-    1787,   910, -4292,   913, -1637,   859, -3668, -4292, -4292,  -617,
-   -2803, -4292, -4292, -4237, -4292, -2540,  1391, -4292, -4292, -2522,
-   -4292, -4292, -4292,  1360,  1362, -3310,  1756, -2106, -4292,   548,
-     986, -1237, -4292,  -114, -4292,   866, -4292, -4292, -3803, -4292,
-     -29, -2602,   123, -4292, -4292, -3116, -3632, -1607, -4292, -4292,
-   -3372, -2580,  1689, -4292, -4292,   192, -4292, -4292, -4292, -4292,
-   -3069, -4292, -1702, -2203, -4292, -4292,   342, -4292,   284,   343,
-   -4292,   280, -4272, -4292,   332, -2461,  2029, -4292,  3290, -3079,
-   -2508, -4292, -4166, -1268,   590, -2300, -4292,   909, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -2072, -4292, -4292,   794,  1245,
-   -4292,  2132,  1833, -4292,  2143, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292,  2662, -4292,   526, -1276,  2666, -4292,
-    2669,   517, -3061, -1140, -4292, -1109, -4292, -1630,  3483, -2432,
-   -1943, -4292, -4292, -4292, -4292, -4292,  3526, -4292, -4292, -4292,
-    3066, -4292, -4292, -4292, -4292, -4292, -4292, -4292,  2876, -4292,
-   -4292, -4292, -4292,  4113, -4292,  2881, -4292, -4292, -4292, -4292,
-   -4292,  1374, -4292,  2284, -4292, -4292, -4292, -4292, -4292,  2027,
-    3338, -4292, -4292,    45, -4292, -4292, -4292, -4292,  2298, -4292,
-   -4292,  3365,  1936, -4292, -4292,  1667,  2319, -1781,  1120, -1168,
-    5154,    13,    68,     5,   959, -4292,  2990, -4292, -4292, -2262,
-   -4292, -4292, -4292, -4292,  4212, -1047, -1117, -4292, -4292,  2845,
-   -4292,  4215,  3888,  3137,   874,  5121, -4292, -1310, -4292,   -27,
-   -4292, -4292,  -877, -4292, -4292, -4292,  -636,   831, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,  2445,
-   -4292, -4292, -4292,  3230,  2480, -4292, -4292, -2700, -4292, -2428,
-   -1909, -4292, -2530,   302, -4292, -4292, -4292, -4292, -4292, -4292,
-     348, -4292,    37, -4292, -4292, -4292, -2081, -4292, -4292, -4292,
-   -4292, -4292,  -923, -2570, -1149, -1188, -4292,  3998, -4292, -4292,
-   -4292, -2925, -4292, -2640, -4292, -4292, -4292, -4292, -2999, -2822,
-   -4292,  -904,  2341,  2343,  2352,  2354, -4292, -4292,   -43, -4292,
-      35, -4292,  -142, -4292,  -161, -4289, -4291,   489, -4292,   763,
-   -4292, -4292, -4292,   239,  1440,   243, -2017, -2406, -1263,  1840,
-   -4292, -4292, -2139,  4069, -2132, -2062,  1142,     7,  4214,  3673,
-   -3155, -4292,   764, -4292,   357,  1705,   561, -4292, -4292,  1482,
-   -1147,  -111,   394, -3134, -4292, -1052,   -80, -4292, -2336,   492,
-   -2354, -2783, -2283, -2609, -2340, -4292, -4292,  2934,    15, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292,  -597,   141,  -637,
-    5300,  3211, -4292,  2489,  4158,  4159, -4292, -4292,  3874,  1782,
-    1789, -4292, -3364, -2811, -4292, -4292, -4292,  -989,  1506,   835,
-    3731,  1222,  1794, -2959,   855, -4020,  4167, -4292, -3556,   851,
-    4178,  4175, -3234,  3647, -4292, -4292, -4292, -4292, -4292,  3060,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -4292,  4384,   -41, -1413, -4292,
-   -4292, -4292,  1686,  3784,  3062,  -990, -4292, -4292, -4292, -4292,
-    4211, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-    2515,  2139, -4292, -4292, -4292, -4292,  3171, -4292, -4292, -4292,
-    3180, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292,  1824,   132, -4292,  1175,    60, -4292,
-     810, -4292, -4292, -4292, -4292, -4292,   -74, -4292, -4292,   -92,
-   -2766, -1165, -1151,   934,  1074, -2041, -2505, -2076, -3229, -1218,
-   -4292, -4292,   891, -3395, -2963,   593,  -771, -1305, -1295,   185,
-    2322,  3966, -1519, -4292,  5903,  -889, -1647, -2289,  1006,  4038,
-      -6, -4292, -3278, -4292,    59,   122,  2111,   -60,  3143, -3681,
-   -4292,    12,     2, -4292,   315,   157, -4292, -4292,   309, -4292,
-   -4292, -4292,   159, -4292, -4292, -4292, -4292,  3856, -4292,  2421,
-    5356, -4292, -4292, -4292,  3134,  5359,  -874,  3867,  3159, -4292,
-    3165, -4292, -4292, -4292, -2125, -4292, -4292,   217, -4292,  2503,
-   -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292, -4292,
-   -4292, -4292, -4292, -4292, -4292, -1360,  4415,  5369,  3963, -4292,
-   -4292,  2378, -4292, -2078, -1409, -1207, -2882, -4292,  2743,  3759,
-   -4292, -4292,  1800, -4292,  2754,   656, -4292, -4292,   495, -4292,
-   -4292,  1697,  4426,  3928, -4292, -4292, -4292, -4292, -4292,  4263,
-   -4292,    -9,   -36, -4292,  -420, -4292, -4292, -4292,    89,  5418,
-    5420, -4292, -4292,   207, -4292,  -895, -4292, -4292, -4292, -4292,
-   -4292,  4206, -4292, -4292,  4216, -4292, -4292, -4292, -4292,  4217,
-   -4292, -4292, -4292, -4292, -4292, -4292,  1699, -4292, -4292, -4292,
-   -4292, -4292, -4292,    67, -4292, -4292, -4292,   182, -4292,  1489,
-   -4292,  1101,  1598,  1049,   733,  1600, -2455
+   -4344, -4344, -4344, -4344, -4344, -4344,     4, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344,  1571, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344,  1823,  1834, -4344, -4213, -4344, -4344,  1831,
+   -4344,   425,  1835, -4344,   424, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344,  1819, -4344,   422, -4344, -4344, -4344, -4344, -4344, -4344,
+   -2880, -1595, -4344, -4344, -4344, -4344, -4344, -4344,  1186, -4344,
+   -4344,   420,  1392,  3942, -4344,   411, -4344,   110, -4344, -4344,
+   -4344, -4063,    -5,  -182, -4344, -4344,    20,  3428,  -180, -3836,
+   -4344, -4344, -4344, -4344, -4344, -4344,   416, -4344, -4344,   225,
+   -4344, -4344, -1926, -4344, -4344, -4344, -4344, -4344, -4344,  -363,
+    -320,  2715, -4344, -4344, -4344,  5145, -4344,  4101, -4344, -2793,
+    2218, -4344, -4344, -4344, -4344, -4344,  2277, -2736, -4344, -4344,
+   -4344,  1052, -4344, -4344, -4344,  -869,   138, -4344,   139, -4344,
+     141, -4344,   143, -4344,   144,   147,   148,   151, -4344,   155,
+   -4344, -4344,  -318, -4344, -4344, -4344, -4344,   157, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344,  -219, -4344, -4344,  -124, -4344,
+   -4344,  -214,   163, -4344,  -198,   164, -4344,   165, -4344,  -145,
+   -4344,  -142, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344,  1222,  2746,  4026,  2748, -2804, -4344,  1642, -4344,
+   -4344,   794, -4344, -4344,   945, -1547, -4344,  2529, -2547, -2544,
+   -1146, -2542, -4344, -4344, -4344, -3195, -3180, -1388, -4344, -1391,
+   -2528, -2516, -2380,   775,  1801,  1803,  1800,     8, -4344,  1001,
+     372, -4344, -4344, -4344, -3543,   -68, -4344, -3877,   599, -4344,
+   -4344, -4344, -4344, -3034, -4344, -4344,  -143, -4344, -4344,   -78,
+     -75, -4344,   215, -4344,  2794, -4344, -4344, -2454,  -550,  2682,
+   -4344, -2040, -1776, -2355, -1629, -1627, -4344, -4344, -4344,  1235,
+    1824,   950, -4344,   951, -1657,   899, -3708, -4344, -4344,  -588,
+   -3012, -4344, -4344, -4249, -4344, -2545,  1427, -4344, -4344, -2529,
+   -4344, -4344, -4344,  1395,  1398, -3340,  2070, -1501, -4344,   587,
+     582, -1551, -4344,   -71, -4344,   904, -4344, -4344, -3873, -4344,
+     -33, -2655,   168, -4344, -4344, -3140, -3688, -1621, -4344, -4344,
+   -3578, -2410,  1724, -4344, -4344,   231, -4344, -4344, -4344, -4344,
+   -3347, -4344, -1671, -2243, -4344, -4344,   382, -4344,   323,   380,
+   -4344,   320, -4334, -4344,   373,  -951,  2072, -4344,  3359, -3112,
+   -2512, -4344, -4228, -3581,   624, -2316, -4344,   947, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -1574, -4344, -4344,   826,  1276,
+   -4344,  2170,  1870, -4344,  2184, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344,  2717, -4344,   567, -2103,  2722, -4344,
+    2724,   549, -2541, -1134, -4344, -1129, -4344, -1638,  3561, -2473,
+   -3010, -4344, -4344, -4344, -4344, -4344,  3599, -4344, -4344, -4344,
+    3052, -4344, -4344, -4344, -4344, -4344, -4344, -4344,  2952, -4344,
+   -4344, -4344, -4344,  4231, -4344,  2949, -4344, -4344, -4344, -4344,
+   -4344,  1406, -4344,  2337, -4344, -4344, -4344, -4344, -4344,  2068,
+    3418, -4344, -4344,   103, -4344, -4344, -4344, -4344,  2344, -4344,
+   -4344,  3438,  1975, -4344, -4344,  1697,  2357, -1794,  1150, -1177,
+    5246,    13,    85,     5,   991, -4344,  3062, -4344, -4344, -2281,
+   -4344, -4344, -4344, -4344,  4293, -1049, -1125, -4344, -4344,  2889,
+   -4344,  4292,  3954,  3190,   698,  4532, -4344, -1299, -4344,   -19,
+   -4344, -4344,  -885, -4344, -4344, -4344,  -691,   843, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,  2443,
+   -4344, -4344, -4344,  3263,  2483, -4344, -4344, -2737, -4344, -2478,
+   -1962, -4344, -2537,   322, -4344, -4344, -4344, -4344, -4344, -4344,
+     342, -4344,    39, -4344, -4344, -4344, -2091, -4344, -4344, -4344,
+   -4344, -4344,  -963, -2593, -1157, -1164, -4344,  4043, -4344, -4344,
+   -4344, -3260, -4344, -2745, -4344, -4344, -4344, -4344, -3110, -2864,
+   -4344,  -916,  2346,  2348,  2349,  2350, -4344, -4344,   -50, -4344,
+      25, -4344,  -136, -4344,  -161, -4343, -4297,   486, -4344,   753,
+   -4344, -4344, -4344,   236,  1430,   241, -1974, -2460, -1259,  1809,
+   -4344, -4344, -2143,  4091, -2150, -2098,  1128,     3,  4235,  3715,
+   -3171, -4344,   754, -4344,   348,  1685,   543, -4344, -4344,  1469,
+   -1149,  -111,   379, -3160, -4344, -1058,   -87, -4344, -2378,   475,
+   -2429, -2747, -2271, -2626, -2388, -4344, -4344,  2925,     9, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344,  -528,   284,  -651,
+    5344,  3224, -4344,  2479,  4182,  4185, -4344, -4344,  3893,  1758,
+    1762, -4344, -3787, -2884, -4344, -4344, -4344, -1017,  2962,   806,
+    3744,  1196,  1767, -3007,   827, -4113,  4194, -4344, -3602,   821,
+    4215,  4243, -3408,  3676, -4344, -4344, -4344, -4344, -4344,  3050,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -4344,  4389,   -36, -1410, -4344,
+   -4344, -4344,  1582,  3785,  3053, -1008, -4344, -4344, -4344, -4344,
+    4242, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+    2485,  2098, -4344, -4344, -4344, -4344,  3163, -4344, -4344, -4344,
+    3168, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344,  1780,    97, -4344,  1132,    22, -4344,
+     769, -4344, -4344, -4344, -4344, -4344,  -115, -4344, -4344,  -131,
+   -2780, -1165, -1153,   887,  1031, -1853, -2230, -2090, -3239, -1219,
+   -4344, -4344,   845, -3416, -3014,   553,  -772, -1324, -1311,   498,
+    2281,  3648, -1579, -4344,  4595,  -899, -1675, -2147,   793,  4044,
+      -6, -4344, -2829, -4344,  -209,   130,  2075,   -43,  3140, -3713,
+   -4344,    12,    23, -4344,   490,     2, -4344, -4344,   159, -4344,
+   -4344, -4344,   133, -4344, -4344, -4344, -4344,  3880, -4344,  2388,
+    5380, -4344, -4344, -4344,  3134,  5386,  -810,  3884,  3164, -4344,
+    3165, -4344, -4344, -4344, -2135, -4344, -4344,   161, -4344,  2487,
+   -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344, -4344,
+   -4344, -4344, -4344, -4344, -4344, -1356,  4427,  5397,  3978, -4344,
+   -4344,  2341, -4344, -2069, -1403, -1197, -1544, -4344,  4295,  2723,
+    2736, -2249, -1098, -1091,  -944, -1121,  -994,  -976, -4344,  3756,
+   -1520, -4344, -4344,  1985, -4344,  2728,   625, -4344, -4344,   464,
+   -4344, -4344,  1617,  4444,  3946, -4344, -4344, -4344, -4344, -4344,
+    4284, -4344,   -18,    -1, -4344,  -396, -4344, -4344, -4344,   109,
+    5440,  5441, -4344, -4344,   220, -4344,  -925, -4344, -4344, -4344,
+   -4344, -4344,  4257, -4344, -4344,  4282, -4344, -4344, -4344, -4344,
+    4287, -4344, -4344, -4344, -4344, -4344, -4344,  2300, -4344, -4344,
+   -4344, -4344, -4344, -4344,  -677, -4344, -4344, -4344,   167, -4344,
+    1448, -4344,  1066, -4344,  1006,   695,  1559, -2486
 };
 
   /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,    65,    66,  1130,  2353,    67,    68,    69,    70,    71,
-    2188,    72,  1423,  2131,  2846,  2847,    73,   964,   723,    74,
-    1853,  1852,  2554,  2555,  3853,  4349,  4350,  3862,  4364,  3856,
-    4353,  4354,  3859,  4358,  4359,  2619,  2620,  2621,  2622,  2623,
-    2624,  2625,  2626,  2627,  2628,  2629,  2630,  2631,  2632,  2633,
-    2634,  2635,  2636,  2637,  2638,  2639,  2640,  2641,  2642,  2643,
-    2644,  2645,  4365,  4366,  3869,  3875,  3880,  3901,  2646,  2647,
-    2648,  2309,    75,    76,    77,    78,  2655,    79,  3928,  2669,
-      80,  3108,  3109,  1895,  3955,  4339,  5001,  4343,  5092,  5193,
-    5017,  3258,  4676,  5002,  5003,  5101,  2678,  2418,  5136,  3094,
-    5221,  3095,    81,  1204,  4396,  4397,  4398,  4719,  4720,  4721,
-    4722,  5384,  5287,  5355,  5385,  5471,  5477,  5408,  5487,  5488,
-    5489,  5475,  1491,  5490,    82,   996,   997,  1493,  2216,  2860,
-    2217,    83,    84,   926,  2150,  2151,  2152,  2153,  3536,  2861,
-    3531,  3532,  4478,  5409,  5473,  5288,  5289,  5200,  5290,  5104,
-    5291,  5204,  5292,  5107,  5293,  5294,  5295,  5296,  5376,  5297,
-    5199,  5401,  5284,  5285,  5378,  5449,  5468,  5298,  5114,  5194,
-    5342,  5115,  5195,  5371,  5280,  5372,  5396,  5445,  5281,  5343,
-    5399,  5346,  5299,  5305,  5386,  5300,  5306,  5301,  5119,  5211,
-    5304,  5209,  5303,  5382,  5381,  5424,  3384,  3966,  1881,  2664,
-    3334,  3335,  3336,  3111,  3112,  1746,  2834,  2835,  2836,  3915,
-    3916,  3917,  3708,  3709,  3710,  2428,  3253,  3100,  1747,  1748,
-    1814,  1750,  3340,  3919,  3920,  3341,  3342,  1751,  3344,  1752,
-    1753,  1754,  3117,  3366,  3367,  3368,  3369,  3370,  2347,  2348,
-    3655,  3019,  3652,  4552,  4169,  5253,  4176,  4228,  4229,  4831,
-    5174,  5063,  5170,  5064,  5172,  5259,  5260,  5074,  5184,  5185,
-    4975,  4976,  4977,  2411,  2412,  3320,  3321,  2413,  1215,  1815,
-    3371,  2438,  1816,  3212,  1817,  1818,  2416,  3227,  3197,  3961,
-    3740,  3741,  3742,  4278,  3743,  3140,  2446,  3733,  3734,  4296,
-    3790,  4649,  5276,  3791,  3792,  3793,  3794,  3795,  3796,  3797,
-    3983,  3798,  3984,  3979,  3980,  3977,  1253,  4612,  4613,  4614,
-    3973,  3974,  4312,  4297,  4298,  4299,  4621,  4640,   871,  4630,
-    4254,  1509,  3057,  1532,  1533,  2955,  2235,  1819,  4255,  4256,
-    4257,  4306,  4046,  4750,  4301,  4279,  4857,  4993,  4996,  5089,
-    5272,  3141,  1845,  3133,  1601,   743,  4888,  4889,  4890,  4893,
-    4894,  4895,  4842,  4843,  4844,  4845,  3142,  2673,  4846,  4847,
-    3358,  4834,  4236,  4237,  4238,  3143,  3501,  4603,    85,    86,
-    1724,    87,  1733,    88,  1726,    89,  1838,  1196,    90,  2530,
-      91,    92,    93,    94,    95,  2960,    96,    97,  3682,  3050,
-    3051,  3052,  2373,  3044,  3045,  1135,  3259,  3844,  4876,  1177,
-    1820,  1821,  2524,  1822,  1823,  4869,  1824,  3171,  1825,  1826,
-    1827,  1828,  3517,  3518,  3148,  3519,  3202,  2448,  1460,  2841,
-    4324,  2500,    98,    99,  1146,  1147,  1148,  1149,  1150,  1151,
-    1075,   100,   101,  2320,  4950,   102,  1609,  1610,  1611,  3640,
-    4167,  4544,  4807,  1614,  1615,  1616,  3002,  3638,   103,  1857,
-     104,  2912,  2913,  2914,   105,  4679,  2536,   106,   107,  1864,
-    1865,  1866,   108,   238,   109,  1479,  1477,  2193,  2194,   110,
-    1200,  1201,  2538,   111,  2895,  2896,  1846,  1847,  4099,   112,
-     113,  3373,   115,   872,   117,   118,  2227,  2228,  2936,  2937,
-     119,   120,  1013,  1014,  1015,  1155,  1156,  1673,  2382,  2383,
-    2384,   873,   874,  1363,  1250,  1848,   876,   877,  2084,   878,
-    1364,  1365,  4303,   879,  1376,  2072,   880,  3992,   881,   882,
-    4063,   883,   884,   885,  4015,  4016,  4430,  2104,  2105,  2106,
-     886,   887,   888,  2788,  2038,  2039,  4057,  3488,  4452,  3388,
-    3389,  3482,  4800,  3484,  4051,  4052,  4447,  4754,  4924,  5033,
-    5142,  5035,  5143,  5150,  4925,   889,   890,  1352,  1969,  4008,
-    3436,  4419,  1914,  3421,  1849,  1850,  1275,  1276,  1241,  2694,
-    1920,  2938,  4132,  2939,  3599,  3600,  3601,  4143,  4139,  2916,
-    2917,  2940,  2941,  2942,  2943,  2944,  2945,  2946,  4939,  5157,
-    5158,  5366,  4457,  5443,  4458,  4459,  4460,  4943,  4522,  4523,
-    4524,  4525,  4526,  3267,  3268,  3269,  4105,  3172,  1959,  1960,
-    1967,  2168,  2169,  1915,  2890,  1547,  4152,  1127,  1102,  1103,
-    1627,  2330,  4532,  4801,  4802,  3605,  4528,  4799,  3208,  3209,
-    1160,  1164,  2392,  3062,  3063,  1562,  1563,  1693,  1694,  4962,
-    3213,  3081,  3160,  3118,  3082,  3083,  1677,  1678,  1157,  1679,
+      -1,    65,    66,  1139,  2377,    67,    68,    69,    70,    71,
+    2212,    72,  1432,  2155,  2897,  2898,    73,   973,   732,    74,
+    1877,  1876,  2596,  2597,  3915,  4410,  4411,  3924,  4425,  3918,
+    4414,  4415,  3921,  4419,  4420,  2662,  2663,  2664,  2665,  2666,
+    2667,  2668,  2669,  2670,  2671,  2672,  2673,  2674,  2675,  2676,
+    2677,  2678,  2679,  2680,  2681,  2682,  2683,  2684,  2685,  2686,
+    2687,  2688,  4426,  4427,  3931,  3937,  3942,  3964,  2689,  2690,
+    2691,  2333,    75,    76,    77,    78,  2698,    79,  3991,  2720,
+      80,  3168,  3169,  1919,  4017,  4400,  5056,  4404,  5147,  5248,
+    5072,  3316,  4736,  5057,  5058,  5156,  2729,  2460,  5191,  3154,
+    5276,  3155,    81,  1213,  4459,  4460,  4461,  4777,  4778,  4779,
+    4780,  5439,  5342,  5410,  5440,  5526,  5532,  5463,  5542,  5543,
+    5544,  5530,  1500,  5545,    82,  1005,  1006,  1502,  2240,  2911,
+    2241,    83,    84,   935,  2174,  2175,  2176,  2177,  3597,  2912,
+    3592,  3593,  4541,  5464,  5528,  5343,  5344,  5255,  5345,  5159,
+    5346,  5259,  5347,  5162,  5348,  5349,  5350,  5351,  5431,  5352,
+    5254,  5456,  5339,  5340,  5433,  5504,  5523,  5353,  5169,  5249,
+    5397,  5170,  5250,  5426,  5335,  5427,  5451,  5500,  5336,  5398,
+    5454,  5401,  5354,  5360,  5441,  5355,  5361,  5356,  5174,  5266,
+    5359,  5264,  5358,  5437,  5436,  5479,  3445,  4028,  1905,  2707,
+    3393,  3394,  3395,  3171,  3172,  1770,  2885,  2886,  2887,  3978,
+    3979,  3980,  3771,  3772,  3773,  2470,  3311,  3160,  1771,  1772,
+    1838,  1774,  3399,  3982,  3983,  3400,  3401,  1775,  3403,  1776,
+    1777,  1778,  3177,  3427,  3428,  3429,  3430,  3431,  2371,  2372,
+    3714,  3069,  3711,  4614,  4230,  5308,  4237,  4287,  4288,  4887,
+    5229,  5118,  5225,  5119,  5227,  5314,  5315,  5129,  5239,  5240,
+    5030,  5031,  5032,  2453,  2454,  3379,  3380,  2455,  1224,  1839,
+    3432,  2480,  1840,  3270,  1841,  1842,  2458,  3285,  3257,  4023,
+    3803,  3804,  3805,  4337,  3806,  3200,  2488,  3796,  3797,  4355,
+    3853,  4708,  5331,  3854,  3855,  3856,  3857,  3858,  3859,  3860,
+    4045,  3861,  4046,  4041,  4042,  4039,  1262,  4671,  4672,  4673,
+    4035,  4036,  4371,  4356,  4357,  4358,  4680,  4699,   880,  4689,
+    4313,  1518,  3117,  1541,  1542,  3006,  2259,  1843,  4314,  4315,
+    4316,  4365,  4108,  4808,  4360,  4338,  4913,  5048,  5051,  5144,
+    5327,  3201,  1869,  3193,  1610,   752,  4944,  4945,  4946,  4949,
+    4950,  4951,  4898,  4899,  4900,  4901,  3202,  2724,  4902,  4903,
+    3419,  4890,  4295,  4296,  4297,  3203,  3562,  4662,    85,    86,
+    1748,    87,  1757,    88,  1750,    89,  1862,  1205,    90,  2572,
+      91,    92,    93,    94,    95,  2383,    96,    97,  3745,  3110,
+    3111,  3112,  2415,  3104,  3105,  1144,  3317,  3906,  4932,  1186,
+    1844,  1845,  2566,  1846,  1847,  4925,  1848,  3231,  1849,  1850,
+    1851,  1852,  3578,  3579,  3208,  3580,  3260,  2490,  1469,  2892,
+    4383,  2542,    98,    99,  1155,  1156,  1157,  1158,  1159,  1160,
+    1084,   100,   101,  2344,  5006,   102,  1618,  1619,  1620,  3699,
+    4228,  4606,  4865,  1623,  1624,  1625,  3052,  3697,   103,  1881,
+     104,  2963,  2964,  2965,   105,  4739,  2578,   106,   107,  1888,
+    1889,  1890,   108,   238,   109,  1488,  1486,  2217,  2218,   110,
+    1209,  1210,  2580,   111,  2946,  2947,  1870,  1871,  4161,   112,
+     113,  3434,   115,   881,   117,   118,  2251,  2252,  2987,  2988,
+     119,   120,  1022,  1023,  1024,  1164,  1165,  1697,  2424,  2425,
+    2426,   882,   883,  1372,  1259,  1872,   885,   886,  2108,   887,
+    1373,  1374,  4362,   888,  1385,  2096,   889,  4054,   890,   891,
+    4125,   892,   893,   894,  4077,  4078,  4493,  2128,  2129,  2130,
+     895,   896,   897,  2839,  2062,  2063,  4119,  3549,  4515,  3449,
+    3450,  3543,  4858,  3545,  4113,  4114,  4510,  4812,  4980,  5088,
+    5197,  5090,  5198,  5205,  4981,   898,   899,  1361,  1993,  4070,
+    3497,  4482,  1938,  3482,  1873,  1874,  1284,  1285,  1250,  2745,
+    1944,  2989,  4194,  2990,  3660,  3661,  3662,  4205,  4201,  2967,
+    2968,  2991,  2992,  2993,  2994,  2995,  2996,  2997,  4995,  5212,
+    5213,  5421,  4520,  5498,  4521,  4522,  4523,  4999,  4585,  4586,
+    4587,  4588,  4589,  3325,  3326,  3327,  4167,  3232,  1983,  1984,
+    1991,  2192,  2193,  1939,  2941,  1556,  4214,  1136,  1111,  1112,
+    1636,  2354,  4595,  4859,  4860,  3666,  4591,  4857,  3266,  3267,
+    1169,  1173,  2434,  3122,  3123,  1571,  1572,  1717,  1718,  5017,
+    3271,  3141,  3220,  3178,  3142,  3143,  1701,  1702,  1166,  1703,
      122,   123,   124,   125,   126,   127,   128,   129,   130,   131,
-     132,   133,   134,   135,   136,   137,   138,  2855,  2403,  1193,
-     744,  2119,  2120,  2121,   139,   140,   969,   990,  1482,  3568,
-    3569,  4111,  3570,  3375,  3572,  4117,  1099,  2429,  2430,  4118,
-    1100,  2325,  2326,  2327,  4487,  4489,   141,   142,  4107,  4108,
-     991,   143,  3073,  1705,  1706,   144,  1092,  1585,  1586,  1587,
-    2304,   145,   146,   147,   148,   149,   150,   151,   152,   153,
+     132,   133,   134,   135,   136,   137,   138,  2906,  2445,  1202,
+     753,  2143,  2144,  2145,   139,   140,   978,   999,  1491,  3629,
+    3630,  4173,  3631,  3436,  3633,  4179,  1108,  2471,  2472,  4180,
+    1109,  2349,  2350,  2351,  4550,  4552,   141,   142,  4169,  4170,
+    1000,   143,  3133,  1729,  1730,   144,  1101,  1594,  1595,  1596,
+    2328,   145,   146,   147,   148,   149,   150,   151,   152,   153,
      154,   155,   156,   157,   158,   159,   160,   161,   162,   163,
      164,   165,   166,   167,   168,   169,   170,   171,   172,   173,
      174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
-     184,   185,   186,   187,   188,  1560,  1076,  1755,  1566,  1078,
-    1079,  1080,  1567,  2277,  2984,  1548,   189,   190,  1717,   191,
-    1173,  1174,  1718,   192,  1424,  2144,  3529,  4079,  4463,  2145,
-    2146,  2856,   193,   993,  1488,  1484,  1489,  2200,  2201,  2199,
-    2921,  2919,   194,   983,  1475,  2904,   195,   974,   196,   197,
-     978,  2181,  1468,  4100,  3376,  3686,  4204,  4205,  4207,  4574,
-    4575,  5244,  5392,  5434,  5417,  5437,  5438,  5441,  5460,  5461,
-     891,  1630,   892,  4631,  4632,   893,   894,   895,   896,   897,
-     898,  4415,  4112,   899,  2393,  4529,   900,  4109,   901,  2947,
-    2404,   713,  4360,  4361,  1136,  1631,  2386,  2240,  4188,  1366,
-    1114,   954,  5121,  1033,  1138,  1524,  1139,  2124,  1525,  2874,
-     715,   716,   717,  5122,   718,   719,   958,  1038,   720,   198,
-    1039,   199,  2249,   200,  3620,  3621,  1538,  1542,  2264,  2265,
-    2266,  1081,  2055,  2258,  1539,  2267,  1042,  1517,  1518,  2247,
-    1519,  2245,  1520,  2965,  2275,   201,  1470,   726,  2184,  2185,
-    3555,   202,  1096,   203,   204,   205,  1185,   206,  2173,  2888,
-    2889,   207,  2219,   208,  2155,  2164,  1427,   960,   961,  2877,
-    3039,  2368,  2369,  2875,  2125,  1526,  3614,  1663,  1884,  1141,
-    1885,  1142,  1438,  2158,  1666,  4483,  4084,  5040,  4770,   209,
-     239,   729,  1213,  1871,  2224,   210,   211,   212,   213,  1688,
-     904,  2948,   905,  1016,  1229,   745,  1904,  1896,   232,   233,
-     234,   748,   749,   235,  1836,  1837,  4344,  4878,  5005,  5226,
-    5227,  1898,  5315,  1899,  1900,  3956,  4903,  5311,  5389,  1901,
-    3381,  4401,  5020,  5223,   214,  1636,  1632,  1112,  2341,  2335,
-    2337,   215,   216,  1463,   217,   218,  4955,  4956,  3943,  2529,
-    3835,  3836,  3200,  3256,  3840,  2843,  3127
+     184,   185,   186,   187,   188,  1569,  1085,  1779,  1575,  1087,
+    1088,  1089,  1576,  2301,  3034,  1557,   189,   190,  1741,   191,
+    1182,  1183,  1742,   192,  1433,  2168,  3590,  4141,  4526,  2169,
+    2170,  2907,   193,  1002,  1497,  1493,  1498,  2224,  2225,  2223,
+    2972,  2970,   194,   992,  1484,  2955,   195,   983,   196,   197,
+     987,  2205,  1477,  4162,  3437,  3749,  4263,  4264,  4266,  4633,
+    4634,  5299,  5447,  5489,  5472,  5492,  5493,  5496,  5515,  5516,
+     900,  1639,   901,  4690,  4691,   902,   903,   904,   905,   906,
+     907,  4478,  4174,   908,  2435,  4592,   909,  4171,   910,  2998,
+    2446,   722,  4421,  4422,  1145,  1640,  2428,  2264,  4246,  1375,
+    1123,   963,  5176,  1042,  1147,  1533,  1148,  2148,  1534,  2925,
+     724,   725,   726,  5177,   727,   728,   967,  1047,   729,   198,
+    1048,   199,  2273,   200,  3679,  3680,  1547,  1551,  2288,  2289,
+    2290,  1090,  2079,  2282,  1548,  2291,  1051,  1526,  1527,  2271,
+    1528,  2269,  1529,  3015,  2299,   201,  1479,   735,  2208,  2209,
+    3616,   202,  1105,   203,   204,   205,  1194,   206,  2197,  2939,
+    2940,   207,  2243,   208,  2179,  2188,  1436,   969,   970,  2928,
+    3099,  2410,  2411,  2926,  2149,  1535,  2397,  1680,  1669,  1908,
+    2710,  2711,  2712,  2713,  3083,  2715,  2716,  2717,  3411,  1150,
+    1672,  1909,  1151,  1447,  2182,  1690,  4546,  4146,  5095,  4828,
+     209,   239,   738,  1222,  1895,  2248,   210,   211,   212,   213,
+    1712,   913,  2999,   914,  1025,  1238,   754,  1928,  1920,   232,
+     233,   234,   757,   758,   235,  1860,  1861,  4405,  4934,  5060,
+    5281,  5282,  1922,  5370,  1923,  1924,  4018,  4959,  5366,  5444,
+    1925,  3442,  4464,  5075,  5278,   214,  1645,  1641,  1121,  2365,
+    2359,  2361,   215,   216,  1472,   217,   218,  5011,  5012,  4005,
+    2571,  3897,  3898,  4394,  3314,  3902,  2894,  3187
 };
 
   /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
@@ -4830,2662 +4874,2808 @@
      number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int16 yytable[] =
 {
-     714,  1397,  1402,  1077,  1161,   116,  1712,   121,  1974,   903,
-    1719,  1695,   922,   114,  1031,  1074,   963,  2019,  1886,  1591,
-    1699,  2117,  1277,   956,  1120,   982,   712,  2020,  2387,  2322,
-    1113,  3496,   998,  1510,  1514,  1003,  1165,  1140,  1682,  2118,
-     998,   956,  2165,  1090,  2899,  1035,  3641,  1097,  1749,  1104,
-    1829,  1119,  3328,  1543,  2447,  1034,  1923,  1924,  2519,  1558,
-    3065,  3066,  3238,  3239,   923,  2544,  2071,  2862,  3186,  1126,
-    3547,  3033,  2863,  3803,  2476,   981,  3824,  1125,  1651,  3615,
-     987,  1830,  3123,  3124,  1592,  1976,  3906,  2221,  1117,  3491,
-    3119,  1137,  2499,  3119,  3119,  2949,  3424,  1989,  1990,  1991,
-    3425,  3687,  3167,  1993,  3169,  3571,  3988,  3845,  1689,  3337,
-    1684,  2891,  1698,  3181,  2414,  1962,  2415,  2417,  1236,  2445,
-    2041,  2784,  2785,  4295,  3831,  3602,  1168,  2833,  2453,  1209,
-    1211,  1166,  2457,  3426,  2794,  2795,  2796,  2222,  2979,  4214,
-    3530,  3130,  2029,   955,  2929,  3074,  2477,  4172,  2374,  2376,
-    2377,  3662,  3577,  3231,  3338,  3419,  3637,  3233,  2489,  4300,
-    2297,   955,  4714,  3419,  3359,  2891,  1540,  4761,  2961,  4760,
-    3228,  3229,  4113,  3420,  4356,  3921,  3339,  2307,   957,  4319,
-    4320,  3420,  3922,  4486,  2310,  1090,  3346,  2040,  3619,  1167,
-    2313,  2432,  1356,  1357,  1356,  1357,   957,  3347,  1356,  1357,
-    1037,  3014,  1224,  1225,  3204,  3205,  2839,   962,  3060,  3016,
-    4304,  1356,  1357,  2127,  1178,  2167,   714,  2667,   750,   714,
-    1137,  1189,  1090,  3520,  1356,  1357,   727,  1344,  1345,  1399,
-    1346, -2339,  1454,  2167,  1089,  3650,  1090,  1356,  1357,  1399,
-    2776,  3135,  1180,  1398,  1399,  1187,   980,  3046,  3322,  1356,
-    1357,   986,  4687,  3483,  2226,  2909,  1356,  1357,  3680,  4563,
-    3390,  3391,  3392,  2360, -2177,  3678,  3679,  1858,  2308,  1407,
-    1408,  1409,  1356,  1357,  1412,  1413,  1772,  3428,  1416,  1854,
-    1418,  1419,  1420,  3070,  1212,  1188,  1356,  1357,  1356,  1357,
-    2534,  1356,  1357,  2308,  3585,  4672,  2232,  1315,  4328,  4266,
-    1628,  2049,  3444,  1153,  1143,  4549,  3446, -1064,  3486,  3573,
-    3349,  1356,  1357,  3616,  1916,  1917,  1918,  3061,  4938,  1840,
-    1162,  3119,  3454,  3455,  1197,  1928,  4838,  1230,  3461,  2692,
-     959,  4077,  1445,  2662,  1897,  1905,  2909,  1872,  1192, -2119,
-    -738,  3963,  1356,  1357,  3473,  3474, -2921,  3626,   959,  2167,
-   -1856,   975,  1772,  3480,  1772,  1483,  1982,  3841,  1036,  1986,
-    4248, -1079,  1485,  1442,  1356,  1357,  1403,   924, -1856,  1931,
-    3198,  3498,  4249,  2768, -2922,  3435,  1175,  4597,  2003,  2004,
-    2902,  2839,  2008,  -725,  1859,  -726,  4250,  4928,  1860,  1152,
-    -738,  3810,  4260,  4264,  1496,  5235,  4265,  4953,  1045,  1018,
-    2022,  2023,  1861,  3821,  3957,  2027,  2028,  4186,  1545,  1356,
-    1357,  5344,  3524,  1190,  4274,  1045,  1018,  3380,  1736,  3695,
-    2048,  4835,  1152,  3671,  3478,  1043,  1220,  1202,  2753,  3422,
-   -1969,  1158,  4028,  1098,  1356,  1357,  1867,  2695,  -599,  1356,
-    1357,  2696,  4258,  2289,  1152,  1507,  -584,  1257,  4149,  1356,
-    1357,  5085,  3964, -2830,  3684,  1198,  -626,  1741,  1757,   970,
-    4213,  1152,  3732,  -615,  1568,  1307, -2921,  4774,  1356,  1357,
-    1356,  1357,  4272,  4273,  1153,   976,  1737,  1356,  1357,  1316,
-    1154,  4629,  1629,  2953,  3688,  4140,  1356,  1357, -1856,  1938,
-     988,  1087,  3119,  1093, -2922,  2068,  1153,  1356,  1357,  -961,
-    3362,  3900,   240,  1277,  5236,  2290,  3876,  2910,  1356,  1357,
-     240,  4839,   966,  1154,  2101,  2102,  2362,  2508,  4141,  1356,
-    1357, -2118,  1664,  1401,  3025,  1356,  1357,  3833,  3958,  1356,
-    1357,  1855,  1671,  4755,  1682,  1154,  4485,  1602,  1862,  1546,
-    2259,  2495,  1356,  1357,  2421,  3711,  1400,  3038,  1356,  1357,
-    3945,  2263,  1154,  1356,  1357,  1437,  1400,  1486,  1152,  1448,
-    1359,  1400,  1359,  1360,  4982,  1360,  1359,  1682,  3361,  1360,
-    1121,  4880, -2339,   236,  1497,   240,  2292,  3812,  3119,  1359,
-    2295,  1144,  1360,  2410,  3020,  2299,   724,  1169,  2910,   725,
-    4315,   242,  1359, -2987,  2496,  1360,  1455,  4809,  4144, -1856,
-    4716,  1839,  2203,  4409,   967,  1359,  1356,  1357,  1360,  1122,
-    4717,  5344, -1856,  4756,  2314,  2315,  4572,  1359,  1356,  1357,
-    1360, -1856,  3935,  2840,  1359,  4248,   728,  1360,  5016,  1739,
-    4295,  3021,  2396,  5188,  1069,   985,  1863,  4249,  1672,  3832,
-    1359,  1569,  1574,  1360,  4810,  3047,  1163,  2400,  2401,  1154,
-    4573,  4250,  5086,  3725,  1359,   989,  2278,  1360,  4519,  1359,
-    5237,   237,  1360,  1045,  1018,  4131,  4135,  5173,  3656,  3611,
-    3612,  5022,  3584,  3071,  1258,  4146,  4147,   968,  4553,  1359,
-    2497,  -961,  1360,  1356,  1357,  3026,  3666,  3667,  3668,  3669,
-    1889,  2911,  1308,  1356,  1357,  4062,  1963,  4520,  2291,  1964,
-    3624,   240,  1356,  1357,  2251,  1473,  2046,  2363,  3591,  2509,
-    1359,   971,  4302,  1360,  1740,  3959,  3925,  1743,  2422,  2117,
-    1090,  1090,  3591,  4142,  3364,  3423,  4316,  1083,  1137,  2837,
-    1222,  1785,  1359,  2187, -2109,  1360,  3571,  2118,  4357,  2704,
-    3132,  1120,  3132,  3672,  2077,  1094,  4496,  1868,  1322,  1205,
-    4954,  3718,  4934,  4718,  2535,  1842,  3544,  3816,  1404,   240,
-   -1856,  1741,  5087,  3842,  2100,  1356,  1357,  1546,  1261,  3918,
-    3487,  2437,  2911,  4078,  5007,  5008,  4181,  1359,  -738,  4185,
-    1360,  2717,  5135,  1843, -2987,  2129,  1508,  1278,  3199,  1145,
-    4058,  2546,  4060,  1219,  2702,  4871,  1932,  1084,  2840,   925,
-    1487,  2414,  1359,  2415,  2417,  1360,  1443,  1359,  3691,  3603,
-    1360,  1909,  2693,  3828,  3627,  5078,  1401,  1359,  3606,  3965,
-    1360,  1362,  2126,  1362, -2921,  -809,  2891,  1362, -2119,  3617,
-    3960,  1317,  4861,  3724,  1401,  3727,  1359,  1231,  1359,  1360,
-    1362,  1360,  3522,  1652,  2862,  1359, -1856,  1498,  1360,  2863,
-    1446,  2361, -2922,  1362,  1359,  3809,  4564,  1360,  5018,  4267,
-    1355,  1665,  1137,  2800,  1354,  1359,  1362,  4209,  1360,  1367,
-    1356,  1357,  1349,  1841,  2186, -2339,  1359,  3280,  1362,  1360,
-    1348,  4601,  1856,  2196,  3494,  1362,   977,  1359,  2891,  3071,
-    1360,  4605,  4196,  1359,  5279,  2668,  1360,  1359,  3350,  4608,
-    1360,  1362,  3291,  1410,  3801,  3802,  1856,  1221,  1415, -2177,
-    1359,  1210,  1210,  1360,  3911,  1362,  1359,  1362,  3372,  1360,
-    1362,  1359,  5249,  4929,  1360,  1478,  3015,  1353,  3681,  3689,
-    3866,  2903,  1682,  3871,  3017,  4654,  3731,  4251,  1069,  3882,
-    1362,  4244,  4226,  2533,  3887,  3888,  3889,  3890,  3891,  1856,
-    4133,  4050, -1064,  3658,  4598,  3898,  1232,  1856,  1137,  3969,
-    3905,  2797,  4252,  3908,  1461,  4494,  3281,  4061,  1456,  4507,
-   -1856,  1362,  4067,  3972,  1359,  2769,  4213,  1360,  1476,  1137,
-    3048,  3049,  2806,  2703,  4592,  3119,  1359,  5238,  3673,  1360,
-    2685, -2921,  2050,  1362,  1650, -1856,  2051,  4840,  4841,  3998,
-    1452,  3999,  4356,  2366,  4317,  2050, -1079,   903,  2437,  2721,
-   -2118,  1856,  2281, -1856,  2682,  4017,  1137,  4018,  2777, -2922,
-    5216,  1743,  2778,  1457,  1137,  1137,  1603,  1650,  -725,   956,
-    -726,  3292,  4032,  1084,  2754,  2437,  3910,  4029,  1362,    42,
-    1072,  2968,  1035,  4420,  1137,  2414,  1165,  2415,  2417,  2351,
-    3726,  1359,  1034,  2684,  1360,  4405,  1161,  1700,  2729,  2397,
-    3937,  1359,  2733,  1362,  1360,  1170,  2351,  2757,  1362,  4064,
-    1359,  2758,  2774,  1360,  3136, -1969,  2775,  2437,  1362,  4521,
-   -2987,  1511,  4905,  -599,  2755,  2437,  1090,  1619,  1701,  1529,
-    1534,  -584,  3503,  2437,  5370,  1104,  3504,  1362, -2830,  1362,
-    2437,  -626,  2498,  2437,  4113,  4593,  1362,  1085,  -615,  1561,
-    2437,  5189,    49,  1570,  1575,  1362,  3550,  4651,  3348,  1725,
-    3801,  3802,  1069,  1644,  2798,  1654,  1362,  2683,  1206,  5444,
-    4838,  1348,  1168,  1359,  4779,  3972,  1360,  1362,  1422,  5169,
-    1744,  1166,  4511,  4512,  1772,  4003,  3552,  1137,  1362,  4004,
-    4383,  3029,  5126,  5464,  1362,  4337,  1696,  4106,  1362,  1965,
-    -404,  1620,  1966,  5127,  1883,  4617,    54,  1515,  3009,  1720,
-    1683,  1362,  5428,  1137,  1399,  1727,  1728,  1362,  1137,   116,
-    1732,   121,  1362,    55,   957,  1831,  3210,   114,  1833,   714,
-    4011,  4797,  1090,  3182,  4012,  1167,  2020,  1037,  1471,  1851,
-    4508,  2161,  4251,  3137,  1480,  3192,  1311,  5059,  2727,  1873,
-    1874,  1875,  1680,  1450,  1878,  1834,  3260,  1882,  1137,  4302,
-    1887,  1888,  3921,  4406,  2708,  1356,  1357,   956,   965,  3922,
-    4240,  4241,  1356,  1357,  2709,  1362,  3234,  4184,  1359,  1356,
-    1357,  1360,  4426,  1731,  4322,  1695,  1695,  1362,  2958,  4030,
-     972,  3551,  2990,  4031,  1278,  2714,  4560,  1507,  2697,  1564,
-    1356,  1357,  4440,  2807,  3527,  1994,  3265,  4069,  1278,  1165,
-    3343,  4070,  4534,  4535,  2253,  1349,  1072,  1618,  3674,  1356,
-    1357,  4454,  2719,  1348,  4200,  3553,   984,  1749,  3345,  4168,
-    3804,  1749,  1890,  2720,  2242,  4201,  1466,  1749,  4338,  4497,
-    4555,  4556,  1382,  1383,  2723,  4407,  4558,  2988,  4561,  3872,
-    2735,  1565,  1362,  1621,  2740,  4839,  2021,  2993,  4455,  4540,
-    2995,  3393,  1362,  2998,  1356,  1357,  4405,  2744,  1378,  2701,
-    2469,  1362,  2042,  3574,  3575,  1657,   959,  3261,  2745,  1356,
-    1357,  2661,  3934,  1120,  1516,  1118,  4503,  2254,   992,   903,
-    2073,  2074,  2060,  2677,  2078,  1036,  4798,  2079,  2080,  2081,
-    3530,  4215,  2085,  2086,  2088,  2090,  2091,  2092,  2093,  2094,
-    2076,  4183,  1091,  5060,  4537,  4190,  3657,  2864,  3951,  3337,
-    2159,  5128,   957,  1210,  2977,  1829,  1829,  1356,  1357,  3361,
-    5137,  2747,  1540,  1137,  1362,  4551,  1095,  4858,  4859,  2710,
-    2108,  2109,   714,  2111,  5268,  2113,   714,  1137,  2316,  4562,
-     714,  2123,  1137,  1090,  4566,  2128,  1830,  1830,  1451,  2154,
-    2162,  4323,   956,  4413,  3338,  1658,  4208,  3138,  2110,  4232,
-    3877,  2157,  2114,  1312,  1137,  2220,  2122,  3132,  2095,  2117,
-    4345,  4346,  1137,  2447,  4124,  1137,  3339,  3075,  1891,  2172,
-    2174,  2410,  2237,  3419,   956,  2808,  3346,  2118,  2099,  4082,
-    1207,  2822,  3539,  4148,  1090,  1090,  3355,  3347,  2748,  4652,
-   -2109,  3420,  2115,  1090,  1090,  3631,  1090,  2198,  2752,  2832,
-    4990,  1892,  4992,  1378,  1153,  5154,  5206,  2770,  2519,  1137,
-    1137,  1400,  4453,  2470,  4406,  3554,  2287,  4158,  2233,  1362,
-    4160,  4121,  3502,  5218,  1467,   956,  1137,  2160,  3537,  3613,
-    4367,  2296,  1031,  3076,  1162,  2229,  4202,  3675,  3676,  3580,
-    1098,  2252,  3419,  1749,  1507,  2175,  4408,  4456,  3613,  2260,
-    4865,  1381,  2844,  2800,   959,  1721,  4778,  4375,  4154,  4155,
-    3420,  2447,  2476,  1035,  3077,   714,   714,   714,  1090,   714,
-    1137,  1090,  4427,  1034,  3507,  3508,  5166,  2243,  1512,  4211,
-    3453,  2293,  2255,   714,  1165,  1137,  2163,  3579,   714,  2041,
-    2891,  2282,  2283,  2284,   955,  2286,  4411,   957,  3628,  4055,
-    4381,  4382,  4059,  3632,  3633,  3592,  2349,  4182,   979,  2294,
-     973,  3119,  3119,  1359,  2298,  4454,  1360,  4921,  1508,  3362,
-    1359,  1356,  1357,  1360,  1210,  2370,  2445,  1359,  4295,   957,
-    1360,    42,  3361,  3139,  2477,  3078,  2339,  5327,  4935,  1104,
-    2331,  4444,  1356,  1357,  5224,  1158,  2362,  4157,  1359,  2891,
-    1162,  1360,  4455,  1236,  2342,  3356,  2040,  1356,  1357,  1452,
-    1137,  2147,  1251,  1116,  1356,  1357,  3805,  1359,  5207,  4922,
-    1360,  2711,  4602,  1137,  2096,  2183,  1210,  1356,  1357,  1137,
-     957,  2562,  2563,  2447,  2195,  1210,  1683,  2197,  3711,  1607,
-    1137,  2317,  2809,  3873,  3874,  4814,  1158,  4815,  3513,  2957,
-    2097,  1741,  5220,  4642,    49,  1105,  1381,  4780,  2810,  4887,
-    1385,  1386,  1359,  2394,  4443,  1360,  5037,  3079,  1037,  2405,
-    1893,  4203,  2398,  4983,  1137,  1736,  3712,  1359,  3801,  3802,
-    1360,  2414,  1319,  2415,  2417,  5139,  4223,  2256,  2357,  3878,
-    5269,  2419,  2420,  3593,  3713,  4653,  5432,  1401,  4655,   959,
-    1739,  1128,  1106,  1356,  1357,  2388,  2257,  1002,    54,  2285,
-    4786,  1158,  2288,  3594,  3607,  3608,  3609,  -657,  1356,  1357,
-    1181,  1153,  4757,  1399,  4191,  1359,  3595,  5337,  1360,  2876,
-    1596,   959,   721,  1737,  3865,  1182,  3867,  1118,  4097,  2408,
-    3155,  3060,  1722,  4913,  1661,  3883,  3884,  3885,  3886,  4634,
-    4083,  1162,  1356,  1357,  3892,  3893,  3894,  3895,  3896,  3897,
-    2521,  3899,  3902,  3903,  3904,  4482,  5454,  4408,  1723,  3909,
-    5145,  4840,  4841,  1356,  1357,  2579,  2580,  1107,  1356,  1357,
-    4634,   803,   959,  1835,  4219,  2344,  3918,  2363,  2345,  5201,
-    5202,  5270,  3362,  3364,  2052,  1356,  1357,  5010,  2340,  5208,
-    1356,  1357,  5013, -2109,  2539,  1090,  3156, -2109,  3546,  3596,
-    1163,  4456,  4332,  1356,  1357,  5225,  2098,  2814,  1891,  4923,
-    1090,  2523,  5271,  1131,  1362,  5082,  1036,  3479,  1069,  2837,
-      42,  1362,  1741,  4637,  1662,  1508,  4877,  1894,  1362,  1356,
-    1357,  1356,  1357,  1608,  4192,  1702, -2033,  4638,  3806,   775,
-    3061,  1902,  1546,  1090,  1356,  1357,  2679,   714,   714,  1362,
-    3879,  1159,  1158,  1356,  1357,  4557,   714,  2053,  4376,  4377,
-    4378, -2033,  1399,   722,  3357,  5220,  4678,   724,  1362,  1191,
-     725,  1503,  1739,  2680,  2681,  1378,  1739,  1118,  3080,  1356,
-    1357,  1356,  1357,  4371,  1597,  2364,  2838,  1356,  1357,  5433,
-    3923,  3822,  3625,    49,  4957,  4220,  1199,  1703,  3157,  3825,
-    3630,  1743,  1356,  1357,  3829,   780,  1513,  2838,  3924,  4634,
-    1356,  1357,  3119,  1362,  2837,  5133,  1163,  1356,  1357,  1356,
-    1357,  3597,  2838,  1356,  1357,  1356,  1357,  2346,  1362,  1359,
-    1356,  1357,  1360,  1278,  2728,  1356,  1357,  1391,  1392,  1393,
-    1394,  1395,  1396,  1356,  1357,  1356,  1357,    54,  3622,  4193,
-    1359,  1116,  5171,  1360,  4737,  5175,  3511,  4850,  5197,  1356,
-    1357,  1740,  5145,  5338,    55,  1359,  1655,  1648,  1360,  1176,
-    2787,  3941,  1359,  1356,  1357,  1360,  1362,  2791,  4693,  4694,
-    3158,  3677,  4851,  3194,  4009,  1359,  2541,   827,  1360,  3119,
-    3119,  1137,  1502,  3598,  3031,  3382,  1120,  1652,  2862,  1069,
-    5047,  2649,  4159,  2863,  1741,  4010,  3364,   792,  1741,  1137,
-    1686,  4494,  3495,  1356,  1357,  2815,  1116,  3383,  3534,  1604,
-    1120,  1183,  1504,  2811,  4023, -2033,  3690,  1108,  2819,  4639,
-    1400,  2823,  1704,  3809,  2675,  2827,  4576,  4577,  5387,  5387,
-    1349,  2828,  4578,    42,  1356,  1357,  5048,  2821,  1348,  1109,
-   -2033,  4212,  1184,  2481,  2698,  2365,  2792,  1367,  4704,  1912,
-    1893,  1359,  1912,  3195,  1360,  2522,  1090,  1163,  3942,  4034,
-    1356,  1357,  2054,  2366,  2804,  5042,  1359,  1842,  1381,  1360,
-    5273,  1869,  1743,  1090,  4035,  2600,  2601,  4838,  2837,   808,
-    1110,  2905,  2906,  4088,  1393,  1394,  1395,  1396,  4716,  1129,
-    1605,  1090,  1278,  1137,  3939,  1843,  2891,  2891,  4717,  4449,
-    1359,  4450,  2891,  1360,  2864,  3493,    49,  4252,  2873,  1356,
-    1357,  3975,  2878,  5198,  5274,  1179,  1118,  1912,  2718,  3535,
-    1090,  1359,  4122,  1090,  1360,  4335,  1359,  1687,  3505,  1360,
-    3506,  1137,  3990,  1356,  1357,  1137,  1137,  5331,  4863,  4864,
-    1120,  1111,  2450,  1359,  4393,  3032,  1360,  4302,  1359,  4068,
-    1870,  1360,  2440,  4656,  2367,  3196,  4658,  4659,  2865,  1186,
-      54,  1359,  2064,  1835,  1360,  5049,  2873,  2451,  2930,  1400,
-    1090,  1069,  1356,  1357,  4336,  1069,  1913,    55,  1137,  1927,
-    1362,  4891,  1356,  1357,  1356,  1357,  4896,  1359,  1729,  1359,
-    1360,  3159,  1360,  4633,  1137,  5275,  2901,  1356,  1357,  1912,
-     956,  1362,  1359,   956,   724,  1360,  2482,   725,  1356,  1357,
-    1035,  1359,  4114,  3466,  1360,  2239,  1362,  1894,  1035,  2020,
-    1034,  4816,  2020,  1362,  4633,  2986,  1730,  4609,  1034,  2699,
-    1356,  1357,  1844,  2546,  4787,  1912,  1362,  1359,  5181,  1359,
-    1360,  4718,  1360,  2956,  1981,  1359,  1120,  2830,  1360,  5394,
-    5395,  1356,  1357,  2239,  1743,  1090,  1090,  1912,  1743,  2969,
-    1359,  1660,  4839,  1360,  1210,  3550,  4066,  1192,  1359,  1356,
-    1357,  1360,  3476,  3008,  1661,  1359,  3952,  1359,  1360,  5429,
-    1360,  1359,  1210,  1359,  1360,  4616,  1360,  4367,  1359,  1356,
-    1357,  1360,  1195,  1359,  1356,  1357,  1360,  2239,  5430,  3477,
-     835,  1359,  4771,  1359,  1360,  1137,  1360,    42,  3056,  2671,
-     956,  2892,  1362,  2452,  2897,  1356,  1357,  1359,  4891,  1612,
-    1360,  1120,  4896,  2405,  4662,  4610,  1985,  1362,  3838,  4074,
-    1194,  1359,  2672,  1137,  1360,  4106,  4506,  4106,  2521,  1118,
-    1696,  1696,  -657,  3839,  2437,  2812,  3069,  4918,  1382,  1383,
-    2020,  1090,  1356,  1357,  2065,   957,  5132,  4739,   957,  4073,
-    3161,  1362,  2007,  3211,  1662,  1037,  1356,  1357,  2731,  4611,
-    3034,  1359,  2891,  1037,  1360,  2732,  3936,  1744,  4891,  3125,
-      49,  2722,  1362,  4896,  2047,  3131,  3179,  1362,  2736,  4724,
-    3663,  3144,  3146,  3149,  3150,  3151,  3152,  3153,  1680,  2722,
-    3509,  3168,  1359,  3173,  1362,  1360,  1613,  4745,  1842,  1362,
-    5179,  5180,  4386,  3173,  4189,  3183,  3184,  3664,  3173,  5328,
-    3188,  3189,  1362,  1137,  3191,  3173,  3162,   221,  1359,  5324,
-    3203,  1360,  1203,  3206,    54,  2021,  1843,  1205,  3134,  4387,
-    3216,  5029,  4090,  3217,  1090,  3592,  2996,  2997,  1362,  3154,
-    1362,    55,  1356,  1357,  3232,  3174,  3173,  3163,  4703,  4341,
-    1137,  4247,  1208,  1362,  2743,   957,  3330,  1378,  3210,  4966,
-    3053,  5496,  1362,  3735,  4342,  1152,  1090,  1359,  2020,  2746,
-    1360,  5080,  5081,  3799,  3800,  3207,  3173,  3270,  3190,  3215,
-    3343,  2447,  4967,  3067,  4271,   995,  3219,  3220,  1362,  2827,
-    1362,  1359,  4276,   995,  1360,  3012,  1362,   959,  3345,  4309,
-     959,  5030,  1289,  2749,  1391,  1392,  1393,  1394,  1395,  1396,
-    1212,  1362,  1378,  1036,  5230,  3237,  1214,  1153,  3164,  1362,
-     775,  1036,  1306,  1216,  2761,  5148,  1362,  3068,  1362,  2779,
-    1359,  1218,  1362,  1360,  1362,  1320,  1321, -2109,  2962,  1362,
-    1359,  1217,  1359,  1360,  1362,  1360,  2786,  1402,  1883,  1598,
-    1599,  2789,  1362,  2700,  1362,  1359,  1154,  2546,  1360,  2963,
-    1223,  2066,  4618,  5232,  3013,  5061,  1359,  5418,  1362,  1360,
-    3101,  5079,  1226,  3593,  5151,  3372,  1600,  2067,  5233,  1356,
-    1357,  2671,  1362,  4161,  4368,  4619,   780,  2395,  1359,  5152,
-    1090,  1360,  3968,  3594,  1090,  1807,  2399,  5361,  1808,  4374,
-    3165,  2964,  1137,    64,  2672,  4002,  3595,   959,  5318,  1359,
-    3377,   714,  1360,  1550,  4005,  3119,  1739,  1711,  1045,  1018,
-    3374,  3468,  1362,  1227,  4620,  3218,  4134,  1359,  2520,  2724,
-    1360,  1228,  1137,  2546,  2725,  4145,  1137,  3378,  1979,  3442,
-    4013,  3086,  4019,  5031,  4403,  3801,  3802,  1359,  4020,   219,
-    1360,  4504,  1359,  1362,  3221,  1360,  3222,  3262,  1356,  1357,
-    1381,  2737,  3060,  4021,    25,  2546,  3330,  1356,  1357,  3119,
-    3119,  4022,  1551,  1359,  1045,  1018,  1360,  4416,  4417,  1362,
-    4024,  1355,  1441,  3102,  4027,  1444,  4033,  1233,   792,  3596,
-    1447,  4036,  1045,  1018,  2738,  1449,  4038,  1511,  2546,  3223,
-    1234,  1511,  2520,  4432,  4040,  1552,  4042,  2739,  3251,  3252,
-    1359,  2546,  4515,  1360,  4940,  1381,  4941,  3485,  3523,  2741,
-    4043,  2042,  3224,  2546,  1359,  2782,  2869,  1360,  1362,  2546,
-    2870,  4198,  4199,  1749,  4044,  3040,  3041,  2020,  4840,  4841,
-    3042,  3043,  3333,   366,  1235,   368,  1633,  1634,  1741,  1637,
-    1237,  1638,  1362,  3006,  4248,  1238,  1736,  3007,  3470,  4794,
-    4795,  3225,  3515,  3516,  4425,  1349,  4249,  3801,  3802,  3712,
-     808,  3061,  1137,  1348,  4437,  1682,  4362,  4363,  1736,  1137,
-    4250,  3323,  4421,  5466,  5467,  3327,  3427,  3713,  4926,  1401,
-    2546,  1362,  1045,  4261,   809,  2154,  4698,  4699,  4700,  4701,
-    2154,  1362,  1239,  1362,  3538,  1137,  1943,  3330,  3499,  1242,
-    1359,  3597,  2546,  1360,  1737,  4071,  1362,  3913,  1243,  1385,
-    1386,  3166,  4462,  1406,  3721,  1414,  1739,  1362,  3722,  3330,
-    4268,  4438,  1244,  4269,  1090,  3971,  1737,  1120,  1120,  4025,
-    1245,  1090,  1090,  2546,  3525,  5160,  4242,  4392,  4461,  1362,
-    4243,  4243,  2546,  1411,  4484,  3103,  1377,  -807,  3005,  1278,
-    1246,  3374,  1137,  1247,  3583,  3104,    42,  2440,  1090,  4498,
-    1362,  1004,  3105,  4499,  1385,  1386,  1248,  5030,    36,  1349,
-    4439,  4545,  2441,  3598,  2380,  4546,  2381,  1348,  1362,  1249,
-    3075,  1031,  1421,   956,   956,   956,   775,  4581,  1425,  4547,
-    1858,  1735,  4585,  4546,  4586,  1252,  4588,  3331,  1362,  1254,
-   -2109,  1255,  1947,  1362,  3332,    42,  1256,  3923,  1576,  4583,
-    1736,  1137,  1035,  4584,  1553,  1069,  1417,  4590,  3647,  3331,
-    3649,  4591,  1034,  4680,  1362,  3924,  3332,  4681,  4682,    49,
-    4685,  3642,  4683,  4735,  4686,  1259,  3515,  1359,  1577,  4516,
-    1360,  1260,  3333,  4738,  1426,  4744,  3076,  4688,  1741,  4690,
-    1262,  4689,   780,  4691,  1378,  4692,  4697,  1739,  4746,  4591,
-    4591,  1362,  1263,    42,  1120,  1264,  3106,  3914,  1737,  4747,
-    1265,  3564,  3247,  3250,  1266,  1362,  -807,  3113,    49,  1739,
-    1137,   835,  2442,  3565,  3566,   366,  4727,   368,  1005,  1578,
-    4730,  4748,  1267,  1579,  1090,  2405,  3694,  1268,  1743,  1269,
-      55,  4766,  4740,  3226,  4763,  1435,  2546,  1859,  2546,  5140,
-    1948,  1860,  4749,  1272,  1951,  2183,  1359,  3913,  1842,  1360,
-    3705,  1952,  2195,  3561,  4604,  1861,  4785,  1273,  1738,  4811,
-    4837,  5476,    54,  4584,  1279,  4604,    49,  1280,   957,   957,
-     957,  1378,  1740,  1086,  1088,  1511,  1843,  5476,  3114,    55,
-    4495,  1281,  4707,  1137,   792,  4997,  1282,  3131,  1283,  3131,
-    1554,  1362,  1379,  3107,  1740,  3144,  1284,  1037,  1006,  3744,
-    1378,  4829,  1285,  5476,  1428,  4591,  4999,  1286,  3173,  2010,
-    2011,  1555,  4833,  3333,  5032,  1287,  4591,  1290,  1380,  1741,
-    3565,  3566,  3807,  1291,  1389,  1390,  1391,  1392,  1393,  1394,
-    1395,  1396,  1953,  1137,  1440,  3333,  1556,    55,  4836,  3815,
-    4852,  1741,  4591,  5026,  4853,  4854,   755,  1436,  3723,  4853,
-    1292,  1739,  1557,  1453,  4114,  1069,  1465,  5190,  4900,  2020,
-    3115,  3173,  4591,  4980,  2020,  1293,   808,  4981,  5000,  3173,
-    1439,  5012,  4584,  3173,  3173,  3722,  1294,  1458,  1580,  1389,
-    1390,  1391,  1392,  1393,  1394,  1395,  1396,  1381,  1295,  1090,
-     809,  1862,  1118,  1429,  1137,  1137,  1955,  5083,  1511,  1378,
-    1296,  5084,  1297,  2431,  1298,  2433,  2434,  3914,  1382,  1383,
-    2436,  1469,  5246,  2443,  5251,  2167,  5247,  1299,  3850,  1300,
-     959,   959,   959,  2449,  4623,  2539,  2455,  2456,  1362,  2458,
-    -807,   775,  2461,  2462,  2463,  2464,  1740,  1301,  1743,  2467,
-    1137,    64,  2379,  2380,  2479,  2381,  1302,  2311,  2312,  2484,
-    2485,  2486,  2487,  2488,  1165,  1036,  1581,  2492,  2493,  2956,
-    1511,  3161,  1303,  2503,  3230,  2505,  2506,  2507,  1304,  2510,
-    2511,  1305,  2513,  5254,  1381,  2516,  1430,  4546,  2517,  2518,
-    1137,  1431,  1309,  1741,  1384,  1310,  3087,  4968,   779,  1863,
-    2471,  5256,  1313,  1314, -1856,  5257,  1069,   780,  1318,  3567,
-    2440,  5265,  3088,  1381,  1137,  5266,  5332,  1362,  2864,  1459,
-    5333,    42,  5458,   956,  1090,  2472,  5459,  1090,  1069,  3744,
-    1582,  4969,  5055,  1472,  1432,  1322,  3374,  3162,   785,  1323,
-    1644,  2444,  1324,  1325,  1481,  3374,  3374,  1956,  1348,  1326,
-    1433,  3374,  1327,  2167,    42,  3926,  1385,  1386,  1328,  1329,
-   -1856,  4251,  4092,  1330,  3075,  1958,  1331,  4195,  3163,  1387,
-    1332,  1333,  4819,  4820,  1742,  4822,  1434,  4872, -2109,  3938,
-    1334,  1335,  4262,  3788,  1490,  -807,  1336,   219,  1337,  1743,
-    1210,  3116,  1338,  1339,    49,  2440, -1856,   835, -1856,  1340,
-    4826,  4827,  2547,  2548,  2549,  2550,  2551,  2552,  2553,   792,
-    2441,  1743,  1381,  1341,  1007,  1008, -1856,  1009,  1010,  1011,
-    1342, -1856,  3592,  1343,  1405,  1437,  -807,    49,  1492,  2473,
-    3076,  1495, -1856,  1502,  1527, -1856,  1012,  1535,  1541,  3164,
-    1544,  1162, -1856,  1385,  1386,  3485,  2132,  1549,    54,  1571,
-   -1856,  1572,  1583,  1573,  1588,  4970,  1589,  1590,  1593,  1594,
-    1378,  3077, -1856,  1595,  4065,    55,  3592,  1622,  1456,  4104,
-    1069,  1842,  1385,  1386,   803, -1856,  1623,  1625,   957,  1626,
-   -1856,  3565,  3566,   220,  3089,  1635,  1640,  1641, -1856, -1856,
-    5255,   808,  1642,  1643,  1584,  1645,  4732,  1646,    55,  1843,
-    5141,  2873,   221,  1647,  1649,  4087,  1137,  1653,  1744,  1656,
-    1659,  1667,  1090,  1668,  -807,  3944,  1669,  1670,  3946,  3161,
-    2442,  3165,  3374,  1137,  1120,  1120, -1856,  3173,  2021,  1681,
-    1744,  4115,  3078,  1120,  1120,  1120,  1685,  2471,   989,  1708,
-    1710,  4971,  1644,  2873, -1856,  1137,  1734,  2440,  1832, -1856,
-    1348,  1835,  1876,  1743,  1090,  1090,  1842,  1877, -1856,  4972,
-    3593,  3090,  2472,  1090,  1090,  1090,  1879,  1880,  1399,  2133,
-   -1856,  1385,  1386,  2134,  1388,   222,  1912,  1919, -1856,  1930,
-    3594, -1856,  1968,  4973,  1843,  3162,  1933,  3091,  1978,  1979,
-   -1856, -1856,  1980,  3595,  2001,  2018,  4177,  2056,  2030,  3075,
-    2031,  2043,  4565, -1856,  3593,  2044,  2045,  2075, -1856,  2082,
-    4170,  2116,  4170,  2135,  3079,  2083,  3163, -1856,   223,  2130,
-    2112,  2156,  1120,  2177,  3594,  2178,  4958,  1118,  4959,  4960,
-     959,  2179,  2180,  2136,  2182,  2190,  2474,  3595,  2191,  2192,
-    2202,  1389,  1390,  1391,  1392,  1393,  1394,  1395,  1396,  3092,
-    2218,  2234,  1090,  2475,  4210,  2223,  3075,  3161,  4991,  2021,
-    3567,   224,  2238,  1381,  2239,  3076,  2473,  2241,  2244,  2246,
-    2248,  2250,  1744,  2251,  2276,  2280,  3596,  1504,  2300,  3075,
-   -1856,  2301,  2302,  2303,  2305,  2308, -1856,  3164,  2318,  4933,
-     827,  1378,  2319,  3131,  4624,  2321,  3077,  4625,  2137,  2332,
-    2333,  4239,  2334,  4096, -1856,  2336,  2167,   833,  1842, -1856,
-    2338,  2350,   835,  2354,   755,   836,  2020,  2352,  2356, -1856,
-    3596,  2355,  3076,  3162,  2358,  2359,  2372,  2385,  1389,  1390,
-    1391,  1392,  1393,  1394,  1395,  1396,  1843,  2389,  -807,  4171,
-    2390,  2409,  3166,  4517,  5036,  3076,  2423,  2424,  2426,  2427,
-    2435,  3093, -1856,  3077,  3163,  2439,  2440,  1389,  1390,  1391,
-    1392,  1393,  1394,  1395,  1396,  2454,  1069,  3078,  4173,  3165,
-    2459,  2460,  2465,  4318,  1378,  2468,  3113,  2466,  2478,  2480,
-    1695,  2483,  2490,  4974,  2491, -1856,  2494,  2021,  2501,  1639,
-    4326,  4327,  4623,  2138,   225,  2502,  2504,  2514,  3597,   775,
-    2512,  2515,  2525,  2526,  2527,  2531, -1856,  2532, -1856,  2528,
-    3173,  3173,  2542,  2543,  3270,  2545,  4351, -1856, -1856,  4355,
-    2546,  2652,  1385,  1386,  3078,  3164,  3023,  4280,  2653,  2139,
-    2650,  -960, -1856,  2654,   755,  3080,  2656,  4280, -1856,  2444,
-   -1856, -1856,  3597,  2562,  2563,  2657,  2658,  3114,  5144,  3079,
-    2659,  2660,  2663,  2140,  5234,  2666,   779,  1390,  1391,  1392,
-    1393,  1394,  1395,  1396,  -807,   780,  2665,  1402,  2670,  2676,
-    3598,  4646,  2686,   226,  -807,  4282,  4239,  4283,  2141, -1856,
-   -1856,  4281,  2688,  2689,  2690,  4282,  2705,  4283,  2707,  2441,
-    2475,  4239,  2713,  4379,  1381,  2716,   785, -1856,  2712,  2441,
-    2715, -1856, -1856,  2722,  2726,  5302,  3079,  3165,  2730,  4626,
-    4627,  1090,  4623,  2734,  3598,  3129,  5242,  2750,   994,   775,
-    4399,  2751,  2142, -1856,  -807,  4284,  2756,  2759,  2760,  3115,
-    2771, -1856,  2772,  2773, -1856,  4284,  5316,  2783,   227,  2781,
-     228,  2780,  3180, -1856,  2793,  2799, -1856,  2801,  2802, -1474,
-    1378,   902,  2803,  2143,  1396,  2816, -1856,   952,  2820,  3193,
-    2825, -1856,  2829,  2842,  2867,  2826, -1856,   792, -1856,  2838,
-   -1856,  1378,  2845,  2848,   229,   952,   779,  1381,  2849,  1032,
-    4518,  2850,  2868,  2851,  2852,   780,   230,  2579,  2580,  1378,
-    3166,  2853,  2854,   902,  1115,  2866,  3240,  3241,  2871,   902,
-    2900,  1546,  2898, -1856,  3254, -1856,  1856, -1856,  2907,  2908,
-    2915,  2918, -1856,  -960,  2920,  2925,   785,  2924,  2926,  2927,
-    2928,  2226,  2951,  2952,  2959,  1515,  1516,  2971,  2972, -1856,
-    2973,  2974,   803,  2975,  2976,  2980,  2983,  2987,  2989, -1856,
-    2985,  2994,  5374,  2999,   806,  2154,  3001,  3005,   807,   808,
-    5144,  3004,  3010,  1385,  1386,  3011,  2021,  3018,  2742,  1120,
-    3024,  3022, -1856,  -981,  3030,  3035,  3634,  3635,  3636,  3036,
-    3080,  3037, -1856,  -981,  3054,  3059,  3064,  3084,  3096,  4014,
-    3072,  5439,   231,  1278,  1137,  3374,  3097,   792,  3087,  1090,
-    3098,  2020,  3099,  3235,  3185,  3187,  3255,  3257,  3271,  3273,
-    3263,  5423,  4391,  5425,  3088,  5462,   219,  1389,  1390,  1391,
-    1392,  1393,  1394,  1395,  1396,  2020,  3242,  3264,  4550,  5447,
-    3274,  3275,  2204,  3276,  5439,  3277,  3278,  3080,  3166,  3279,
-   -1856, -1856,  2205, -1856,  2020, -1856,  1385,  1386,  3282,  3283,
-   -1856,  3325,  2206,  4170,  5462,  5219,  3354,  3284,  3285,  3286,
-    3116,  3287,   803,  1381,  2020,  3288,  2207,  2208,  2209,  3289,
-    3290, -1856,  3293,  5482,  5483,  1382,  4285,  5390,   807,   808,
-    3294,  4286,  2210,  3295,  1381,  1382,  4285,  4287,  3326,  3296,
-    3297,  4286,  3298,  3299,  2879, -1856,  3300,  4287,  3301,  4239,
-    4599,  4582,  1381,  3302,  4239,  3303,  3304,  3305,  4239,  1736,
-    1760,  1761,   730,  3306,  3307,  3308,  3309,  3744,  3310,  3311,
-    2880,  3312,  3313,  3314,  3315,  3316,  3317,  4288,  1137,  3318,
-    3319,   221,  1664,  3329,  3351,  2881,  3396,  4288,  3360,  5222,
-    3379,  3430,  3542, -1856,  -962,  -962,  1763,  3387,  2882,  3431,
-    3012,  1090,  3429,  1257,  -962,  1137,  3443,  3445,   827,  3460,
-    1766,  3490,  4624,  3492,  3497,  4625,  1767,  1768,  1307,  3526,
-    1769,  3500,  3540,  1311, -2326,   833,  3541,  3543,   906,  3545,
-     835,  3548,  3559,   836,  3563,  3578,  3089,  3581,  3582,  5494,
-    3604,  3590,  3591,  1511,  1771,  1090,  4664, -1856,  3610,  3613,
-    2883,  2884,  3618,   731,  3629,  3639,  4289,  3644,  1772, -1856,
-    3645,  3646,  1773,  3648,   714,  3643,  4289,  2600,  2601,  3651,
-    2956,  3653,  1385,  1386,  3654,  3659,  3661,  3660,  2885, -1856,
-    3685, -1856,  3071,  3699,  3700,  3701,  4351,   907,  3702, -1011,
-    4673,  1778,  3704,  1385,  1386,  3703,  3706,  3728,  1389,  1390,
-    1391,  1392,  1393,  1394,  1395,  1396,  4290,  3729,  3730,  5165,
-    3737,  1385,  1386,  3090,  4239,  3738,  4290,  3981,  3739,  3985,
-     908,  3809,  3732,  3817,  3814,  3818,  1090,  3374,   827,  3820,
-    3823,  3826,  4624,  3843,  3852,  4625,  1382,  1383,  3834,  3091,
-     732,  3827, -1856,  3848,  3846,   833,  2886,  3849,  3850,  3847,
-     835,  3855,  3929,   836,  3858,   909,  3861,  3864,  3954,  2211,
-    3912,  3927,  3986,  4291,  3962,  1402,  3972,  3993,  1782,  3987,
-    3976,  3982,  3978,  4291,  3989,  1783,  2212,  3994,  3995,  3991,
-    3996,  1389,  1390,  1391,  1392,  1393,  1394,  1395,  1396,  3997,
-    4006,  4048,  4615,  4045,  4007,  1784,  1161,  1161,  4053,  4049,
-    2887,  3092,  1317,  5480,  1137,  1757,   910,  4054,  4072,  4056,
-    4773,  1785,  5222,  1069,  4080,  3801,  3802,  4085,  2021,  4089,
-    4098,  4081,  4102,  4115,  4782,  3801,  3802,  4626,  4627,  1137,
-    4103,  4116,  4119,  3374,  4120,  4628,  4663,  4125,  4126,  4127,
-    4128,  4136,  4129,   733, -1856,  4137, -1856,  4130, -1856,  4138,
-    4150,  4151,  4156, -1856,  1786,  3485,  4162,  4465,  4163,  1402,
-    4166,  4165,  4174,  4164,  4175,  4292,  4178,  4466,  4179,  4180,
-    4808,  4194,  1787,  4197,  4206,  4292,  4212,  4467,  4217,  4221,
-    4218,  4222,  4225,  4227,  4230,  4314,  4234,  4233,  4259,  -809,
-    4270,  4468,  4469,  4470,  4330,  4277,  4310,  2132,  4321,  -809,
-    4331,  4373,  4385,  3093,  4390,  4395,  4340,  4471,  4293,  4294,
-    4410,  4239,  4402,  4400,  2213,  4239,  4412,  4723,  4293,  4294,
-    3696,  4414,  3697,  1137,  5491,  4429,  4451,  1791,  4422,  4446,
-    4464,  4428,  4441,  4442,  -153,  4445,  1792,  4481,  4486,   911,
-    4488,  4492,  4491,  4493,  4494,  4480,  4500,  4626,  4627,  4502,
-    5491,  4505,   734,  4509,  4531,  4660, -1749,  1389,  1390,  1391,
-    1392,  1393,  1394,  1395,  1396,  4510,  4513,  4514,  4536,  4542,
-    1137,  4543,   735, -1748,  2344,  4554,  2214,  4559,  1389,  1390,
-    1391,  1392,  1393,  1394,  1395,  1396,  4567,  4568,  1511,  4569,
-    4570,  4579,  3693,  2215,  4587,  4596,  1389,  1390,  1391,  1392,
-    1393,  1394,  1395,  1396,  4600,  4351,  4606,  4355,  4882,  -810,
-    4635,  4636,  3374,  4641,  3136,  1797,  4648,   736,   912, -1966,
-    2133,  4650,   737,  4304,  2134,  4657,  1356,  1357,  4665,  1939,
-    1940,  1941,  1942,  1943,  4668,  2956,  4666,  4399,   913,  4932,
-    4671,  4675,  4674,  4677,  4684,  4696,  4908,  4708,  4711,  4710,
-     902,  4712,  4713,   738,  4725,   902,  4736,   739,  4726,  4727,
-    4728,  4729,  4245,  4246,  2135,   740,  4741,  4253,  4733,  4734,
-    4742,  1798,  1799,  1800,  1801,  4743,  4752,  4751,  4753,  1802,
-    4759,  4762,  4764,   914,  2136,   902,  4767,  4768,   737,  1368,
-    1369,  3837,  4765,  1137,  3397,  4769,  1803,  4776,  4775,  1804,
-    1090,   902,  4783,  4275,  4788,  4789,   915,   741,  4791,  4305,
-    4307,  4308,  4793,  4805,  3981,  3173,  4806,  3173,  4546,   916,
-    4978,  3398,  4817,  4818,  1939,  1940,  1941,  1942,  1943,  4812,
-    1370,   917,  4821,  4823,  4472,  1806,  1944,  1945,  1946,  1947,
-    4824,  4828,  1158,  1371,  4830,  4849,   806,   918,  4856,  2137,
-    4862,  4473,  4866,  4867,  3841,  4730,  4873,  4875,  4879,   902,
-     902,   742,   902,   902,  4897,  4898,  3930,  3931,  3932,  3933,
-    4909,  3399,  4884,   919,  3400,   902,  4906,  4907,  4910,  4912,
-    4994,  4915,  3401,  1372,  4911,  4885,  4916,  4920,  4917,  4927,
-    4942,  4936,  4931,  4946,  2828,  4947,  1373,  4949,  5313,  4951,
-    4961,  3402,  4964,  4995,  5004,  5015,  4989,  5009,  4351,  4351,
-    5006,  5019,  5023,  5025,  4928,  4998,  5039,  5024,  5041,  5058,
-    5027,  5043,  5050,  1374,  5044,  4798,  5045,   920,  5046,  5051,
-    5065,  1944,  1945,  1946,  1947,  3481,  5057,  5062,  5067,  5068,
-    5073,  5088,  5091,  5148,  2138,  5076,  5129,  1948,  3403,  1949,
-    1950,  1951,  5130,  5138,  5056,  5146,  5149,  1809,  1952,  5153,
-    5151,  5152,  5351,  5161,  3404,  4978,  5162,  5168,  5169,  5183,
-     902,  3485,  4474,  5192,  5210,  -543,  5212,  5351,  5213,  5214,
-    2139,  1812,  1813,  5215,  5228,  1696,  5231,  1375,  5245,  4475,
-    5360,  4937,  5243,  5250,  5252,  5282,  -561,  5310,  5307,  5279,
-    5308,  5309,  5312,  5318,  2140,  4239,  5319,  5322,  5320,   902,
-    5326,  5336,  4954,  5347,  5339,  5348,  5352,  5340,  5362,  3405,
-    5365,  5368,  5369,   952,  5375,  5370,  5377,  5379, -2775,  2141,
-    5383,  5391,  5380,  5393,  5400,  5403,  1032,  5405,  3406,  1953,
-    5413,  5416,  1948,  3056,  1949,  1950,  1951,  5415,  5421,  5351,
-    5420,  4476,  5422,  1952,  5431,  5426,  5440,  5446,  5450,  5412,
-    5452,  5455,  5465,  5456,  5414,  2021,  5469,  5159,  4477,  5470,
-    5472,  5481,  4929,  2142,  3270,  3270,  5479,  5499,  5205,  4076,
-    3863,  4170,  3854,  3857,  4881,  4883,  3881,  3860,  4886,  4372,
-    4224,  4892,  4902,  5134,  1359,  5358,  5182,  1360,  5351,  5217,
-    5351,  1903,  1954,  1955,  2143,  3407,  3408,  3409,  5187,  2425,
-    5359,  5500,  3410,  4904,  5021,  3411,  5474,  1082,  5196,  1606,
-    3533,  5484,  5351,  5203,   724,  4479,  5102,   725,  3576,  5397,
-    5103,  5105,  5345,  5106,  1953,  5108,  5398,  5109,  5110,   116,
-    5388,   121,  5111,  5112,  5113,  5116,  5117,   114,  5118,  5357,
-    5356,  3122,  4384,  1745,  4351,  3128,  4695,  5351,  5351,  4075,
-    4580,  3324,  5498,  4709,  3950,  3953,   875,  3412,  3413,  4548,
-    4952,  3949,  5329,  4832,  5367,  5261,  5335,  5334,  5075,  4394,
-    3085,  3245,  3948,  4594,  4645,   956,  4263,  4595,  4313,  4311,
-    5124,  4855,  5341,  3414,  4647,  5155,  4047,  1954,  1955,   902,
-    3736,  4965,  5077,  5011,  5014,  4988,  4979,  1137,  2674,  4607,
-    1137,  4848,  4705,  3683,  1123,  4388,  3940,  3670,  3248,  4870,
-    2407,   952,  3249,  5283,  3246,  3000,  2378,  3562,  3808,   902,
-     902,  1617,  3003,  4329,  2651,  3560,  2540,  3851,   902,   902,
-     902,   902,   902,   902,  1956,  4095,  3549,  4490,  1124,  2950,
-    1137,   902,   902,  4978,   902,   902,  1501,  3055,  1500,   902,
-     902,  1957,  1958,   902,   902,   902,   902,  3415,   902,   902,
-    2824,  5159,  5264,  2058,  4731,  5267,   902,   902,  5052,   902,
-     902,   902,   902,   902,  5124,  5124,   902,   902,   902,   902,
-     902,   902,   902,   902,   902,  2790,   902,  3489,  5317,   902,
-     902,  3512,  1977,  5034,   902,  3586,  5442,  3587,   902,   902,
-     902,  5364,  5325,  5463,  4944,  5314,  3588,  4796,  3589,  5163,
-    4347,   902,   902,   902,  5164,  4533,   902,  4803,  2329,   902,
-     902,   902,   902,   902,  5053,  4325,  5261,  3416,   902,  1956,
-     957,  4153,  5125,  4919,  5028,  1624,   921,  1929,  5123,  4963,
-     902,   902,  3521,  3058,  2831,  1362,  1957,  1958,   902,  4093,
-     902,   902,  1713,  1714,  2176,  3417,  4094,  4784,  4501,  4091,
-    4772,  1715,   902,   902,   902,  4777,   902,   902,  1707,  1716,
-     902,   902,   902,  2406,  2328,   902,   902,   902,   902,   902,
-     902,   902,   902,  5124,  5124,  2991,   902,  1474,  2992,  3528,
-    5402,   902,  2306,  2923,  3830,  4101,  5323,  5410,  3418,  4571,
-    5124,  2922,  1709,  5363,  4825,  5478,   952,  5495,  4758,  4661,
-    4781,  4945,  4702,  3692,  2970,  2262,  2059,  3870,  5321,  1040,
-    2981,  3623,  1041,  3556,  2261,  2967,  5125,  5125,  1001,  2966,
-    2021,  3352,  5123,  5123,  1494,  2166,  5448,  3665,   952,  4369,
-    4370,  5453,  4930,  3353,  2371,  5038,  1697,  2225,  1499,   746,
-    1137,   747,  4389,  4667,  2021,  4333,  1906,  5330,  4706,  4899,
-    4334,     0,     0,     0,  5124,     0,  1907,  1908,     0,     0,
-       0,     0,     0,  2021,     0,     0,     0,     0,     0,  5124,
-       0,     0,   959,     0,     0,  5492,     0,     0,     0,   952,
-       0,     0,  5124,  2021,     0,     0,   902,     0,     0,     0,
-       0,     0,   116,     0,     0,     0,     0,     0,     0,     0,
-     114,  5492,     0,     0,     0,  5457,     0,     0,     0,     0,
-       0,  5124,     0,     0,     0,     0,     0,  1032,     0,   902,
-       0,     0,   902,  5124,  5124,  5125,  5125,     0,     0,     0,
-       0,  5123,  5123,     0,     0,     0,     0,     0,     0,     0,
-       0,  5124,  5125,     0,     0,     0,     0,     0,  5123,     0,
-       0,  5124,     0,     0,     0,     0,  5124,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    5124,     0,  5124,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  5124,     0,
-    5124,     0,  5124,     0,     0,     0,     0,     0,   902,     0,
-       0,     0,     0,     0,     0,     0,  5125,     0,     0,     0,
-       0,     0,  5123,     0,  5124,     0,     0,   902,     0,     0,
-       0,  5125,     0,     0,     0,     0,     0,  5123,     0,     0,
-       0,     0,  5124,  5124,  5125,     0,     0,     0,     0,     0,
-    5123,     0,     0,     0,     0,     0,     0,     0,     0,  5124,
-    5124,     0,     0,     0,  5124,     0,     0,     0,     0,     0,
-       0,   902,     0,  5125,     0,     0,     0,     0,     0,  5123,
-       0,     0,     0,     0,     0,  5125,  5125,     0,     0,     0,
-       0,  5123,  5123,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  5125,     0,     0,     0,     0,     0,  5123,
-       0,     0,     0,  5125,     0,     0,     0,     0,  5125,  5123,
-       0,     0,     0,     0,  5123,     0,     0,     0,     0,     0,
-       0,     0,  5125,     0,  5125,     0,     0,     0,  5123,     0,
-    5123,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    5125,     0,  5125,     0,  5125,     0,  5123,     0,  5123,     0,
-    5123,     0,  2556,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  5125,     0,     0,     0,
-       0,     0,  5123,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  5125,  5125,     0,     0,     0,     0,
-    5123,  5123,     0,     0,     0,     0,     0,     0,  3361,     0,
-       0,  5125,  5125,  1736,  1760,  1761,  5125,  5123,  5123,  4643,
-    4644,     0,  5123,     0,     0,  2557,  2558,  2559,  2560,  2561,
-    2562,  2563,  2564,  2565,  2566,  2567,  2568,  2569,  2570,  2571,
-    2572,  2573,  2574,  2575,  2576,     0,  2577,  2578,     0,     0,
-    1763,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1766,     0,     0,     0,     0,     0,
-    1767,  1768,     0,     0,  1769,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1771,     0,
-    1240,   902,     0,     0,     0,   902,     0,     0,     0,     0,
-       0,     0,  1772,   902,     0,   902,  1773,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   241,     0,     0,
-    1271,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  -657,   953,  1778,  1288,     0,     0,     0,
-       0,     0,     0,     0,     0,   902,     0,     0,     0,     0,
-       0,     0,   953,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  2579,  2580,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   902,
-     902,   902,     0,     0,     0,     0,     0,     0,  1350,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  3362,     0,
-       0,     0,  1782,     0,     0,     0,     0,     0,     0,  1783,
-       0,     0,     0,     0,     0,     0,     0,   902,     0,     0,
-       0,     0,   902,     0,     0,     0,     0,     0,     0,  1784,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   902,  3363,     0,     0,     0,     0,     0,   902,     0,
-       0,     0,     0,   902,     0,   902,     0,     0,     0,     0,
-       0,   902,     0,   902,   902,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1786,     0,
-       0,     0,     0,     0,     0,  1464,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1787,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   875,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1791,     0,     0,     0,     0,     0,  1116,     0,     0,
-    1792,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   952,     0,     0,   952,     0,     0,
-    2581,  2582,  3364,     0,  1032,   902,     0,     0,     0,   902,
-       0,     0,  1032,     0,     0,   902,     0,     0,     0,     0,
-       0,  2583,     0,  2584,  2585,  2586,  2587,  2588,     0,  1797,
-    2589,     0,     0,     0,     0,     0,     0,     0,     0,    42,
-    2590,     0,     0,     0,     0,  2591,  2592,  2593,  2594,  2595,
-    2596,  2597,  2598,  2599,  2600,  2601,  2602,  2603,  2604,  2605,
-    2606,  2607,  2608,  2609,  2610,  2611,  2612,  2613,  2614,  2615,
-    2616,  2617,  2618,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1798,  1799,  1800,  1801,     0,
-       0,     0,     0,  1802,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   952,     0,     0,     0,     0,     0,
-    1803,     0,    49,  1804,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  4985,  4986,  4987,     0,     0,
-       0,     0,     0,     0,  1910,  1911,     0,     0,     0,     0,
-       0,     0,     0,  1921,  1922,     0,     0,  1925,  1926,  1806,
-       0,     0,     0,     0,     0,     0,  1934,  1935,     0,  1936,
-    1937,     0,     0,     0,  1961,     0,    54,     0,  1970,  1971,
-    1972,  1973,     0,  1975,     0,     0,  3120,     0,     0,  3120,
-    3120,  1983,  1984,    55,  1987,  1988,     0,     0,     0,     0,
-       0,  1992,     0,     0,  1995,  1996,  1997,  1998,  1999,  2000,
-       0,  2002,     0,     0,  2005,  2006,     0,     0,     0,  2009,
-       0,     0,     0,  2012,  2016,  2017,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  2024,  2025,  2026,     0,
-       0,     0,     0,     0,  2032,  2033,  2034,  2035,  2036,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  5066,  2057,   875,  5069,  5070,  5071,
-    5072,     0,     0,  2061,     0,  2062,  2063,     0,     0,     0,
-       0,  1809,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   902,     0,     0,  1812,  1813,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  2103,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  5167,  3365,     0,     0,  -657,     0,
-       0,     0,     0,  5177,  5178,  1736,  1760,  1761,     0,     0,
-       0,     0,  5186,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1763,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1766,     0,     0,     0,
-       0,  2236,  1767,  1768,     0,     0,  1769,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   902,
-       0,     0,     0,     0,     0,     0,     0,     0,   902,   902,
-    1771,     0,     0,     0,  2274,     0,     0,  2279,     0,     0,
-       0,     0,     0,     0,  1772,     0,     0,     0,  1773,   902,
-     902,     0,   902,     0,     0,   902,   902,   902,   902,   902,
-       0,     0,   902,     0,     0,     0,     0,     0,     0,     0,
-       0,   902,     0,     0,     0,     0,   902,  1778,   902,     0,
-     902,   902,     0,   902,   902,     0,     0,     0,   902,   902,
-     902,     0,     0,     0,   902,   902,   902,     0,   902,     0,
-     902,     0,   902,     0,   902,     0,   902,     0,     0,     0,
-       0,   902,     0,  2324,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   902,  3361,     0,
-       0,     0,  2343,  1736,  1760,  1761,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   902,     0,
-     902,     0,   902,     0,  1782,     0,   902,     0,     0,     0,
-       0,  1783,   902,   902,     1,     0,     0,     2,     0,     0,
-    1763,     0,     0,     0,     0,     0,  2391,     0,     0,     0,
-       0,  1784,     3,     0,  1766,     0,     4,     0,     0,     0,
-    1767,  1768,     0,     0,  1769,     0,     0,     0,     0,     0,
-       5,     6,     0,     0,     0,     0,     0,     0,     7,     0,
-       0,     0,     0,     8,     9,     0,     0,     0,  1771,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    10,
-       0,     0,  1772,     0,     0,     0,  1773,     0,   902,     0,
-    1786,     0,     0,     0,  1462,     0,     0,     0,     0,    11,
-       0,     0,     0,     0,     0,     0,     0,     0,  1787,     0,
-       0,     0,     0,  -657,     0,  1778,     0,     0,     0,     0,
-       0,    12,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    13,    14,     0,     0,     0,     0,   952,   952,   952,
-       0,     0,     0,    15,    16,     0,     0,     0,     0,     0,
-     953,     0,     0,     0,     0,     0,    17,     0,     0,     0,
-       0,     0,     0,  1791,     0,     0,  1032,     0,     0,     0,
-      18,     0,  1792,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  3362,     0,
-      19,   902,  1782,     0,     0,     0,     0,     0,     0,  1783,
-       0,   902,     0,   902,     0,     0,     0,     0,    20,     0,
-      21,     0,     0,     0,     0,    22,     0,  1462,    23,  1784,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    24,     0,     0,     0,     0,     0,     0,
-       0,    25,     0,     0,    26,     0,     0,     0,     0,     0,
-     902,  1797,     0,     0,     0,     0,  2687,     0,     0,     0,
-    2691,     0,     0,     0,    27,     0,     0,     0,     0,     0,
-    2687,     0,     0,     0,     0,     0,     0,     0,  1786,     0,
-       0,    28,     0,     0,     0,    29,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1787,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1798,  1799,  1800,
-    1801,     0,     0,     0,     0,  1802,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1803,     0,     0,  1804,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   953,     0,
-       0,  1791,     0,     0,  2763,  2765,  2767,  1116,     0,     0,
-    1792,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1806,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    30,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  2805,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  3364,     0,    31,     0,  2813,     0,     0,     0,
-       0,     0,     0,     0,     0,    32,     0,     0,  2817,     0,
-    2818,     0,     0,     0,     0,     0,     0,     0,     0,  1797,
-       0,     0,     0,     0,     0,     0,     0,    33,     0,    42,
-      34,     0,    35,     0,     0,    36,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    37,    38,     0,     0,     0,
-       0,     0,     0,     0,     0,    39,     0,    40,     0,     0,
-       0,     0,     0,     0,     0,     0,    41,     0,     0,     0,
-       0,     0,    42,  1809,     0,  1798,  1799,  1800,  1801,     0,
-      43,     0,     0,  1802,     0,    44,    45,    46,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  1812,  1813,     0,
-    1803,     0,    49,  1804,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   952,    47,     0,
-       0,     0,     0,   953,     0,    48,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1806,
-    1043,  1044,     0,     0,     0,    49,     0,     0,     0,     0,
-       0,   902,     0,     0,     0,   953,    54,     0,     0,   902,
-       0,  1462,     0,     0,     0,     0,  1045,  1018,     0,    50,
-       0,     0,     0,    55,     0,  2189,     0,  1046, -2117,     0,
-    2978,    51,     0,     0,  2274,    52,     0,     0,     0,     0,
-       0,     0,     0,    53,     0,     0,   902,   902,     0,    54,
-       0,     0,  1047,     0,  1048,     0,   953,     0,     0,     0,
-       0,     0,     0,     0,  1049,     0,    55,     0,     0,     0,
-       0,     0,   902,     0,    56,     0,     0,     0,     0,     0,
-       0,     0,   902,     0,   902,     0,   902,     0,     0,     0,
-      57,    58,    59,    60,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    61,     0,     0,     0,     0,
-       0,  1809, -2109,  1050,     0,     0,     0,     0,  1051,     0,
-     902,  1052,     0,     0,     0,   902,     0,   902,     0,     0,
-       0,  1053,     0,     0,     0,  1812,  1813,     0,     0,     0,
-       0,     0,    62,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1054,     0,  1055,     0,     0,     0,     0,
-       0,   902,     0,     0,  1056,     0,  1057,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    63,     0,     0,  1118,     0,     0,  -657,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   902,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    2375,  2375,  2375,     0,     0,     0,     0,     0,    64,     0,
-       0,     0,     0,     0,     0,     0,     0,  1058,   902,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   902,
-    1059,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  3272,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1060,     0,     0,     0,     0,
-       0,     0,     0,     0,   902,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1061,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1062,  1063,     0, -2113,  1064,  1065,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1066,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1067,     0,  3386,     0,     0,     0,     0,     0,
-       0,     0,     0,  3394,  3395,  1068,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  3432,  3433,     0,  3434,     0,     0,
-    3437,  3438,  3439,  3440,  3441,     0,     0, -2844,     0,     0,
-       0,  1069,     0,     0,     0,     0,  3447,     0,     0,     0,
-       0,  3448,     0,  3449,     0,  3450,  3451, -2117,  3452,     0,
-    1070,     0,     0,  3457,  3458,  3459,     0,     0,     0,  3462,
-    3463,  3464,     0,  3465,     0,  3467,     0,  3469,     0,  3471,
-   -2113,  3472,     0,     0,     0,     0,  3475,  3120,  3120,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     1,     0,     0,
-       2,     0,     0,     0,     0,     0,     0,     0, -2844,     0,
-       0,     0,     0,     0,     0,  1071,     0,   902,     0,     4,
-       0,  3510,     0,     0,     0,     0,     0,  2103,     0,     0,
-       0,     0,     0,     5,     6,     0,     0,     0,     0,     0,
-       0,     7,     0,     0,     0,     0,     8,     9,     0,     0,
-     902,     0,   902,     0,     0,   902,   902,     0,   902,     0,
-       0,     0,    10,     0,     0,     0,     0,     0,     0,   902,
-       0,     0,     0,     0,   902,     0,     0,   902,     0,     0,
-     902,   902,    11,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   902,  3557,    12,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    13,    14,   902,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    15,    16,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1072,  1073,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    18,     0,     0,     0,     0,     0,     0,
-    2893,  2894,   902,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    19,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    20,     0,    21,     0,     0,   902,   902,    22,     0,
-       0,    23,     0,     0,     0,     0,  2324,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    24,     0,     0,     0,
-       0,     0,     0,     0,    25,     0,     0,    26,     0,     0,
-       0,   953,     0,     0,   953,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    27,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  2982,
-       0,     0,     0,     0,    28,  2391,     0,     0,    29,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   902,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   953,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    30,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   902,   902,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    31,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    32,     0,
-    3110,     0,     0,     0,  3121,  3120,  3120,     0,     0,  3126,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      33,     0,     0,    34,     0,    35,     0,     0,    36,     0,
-       0,     0,     0,     0,  3175,  3176,  3177,  3178,    37,    38,
-       0,     0,     0,     0,     0,     0,     0,     0,    39,     0,
-      40,     0,     0,     0,     0,     0,     0,     0,     0,    41,
-       0,     0,     0,     0,     0,    42,  3214,     0,     0,     0,
-       0,     0,     0,    43,     0,     0,     0,     0,    44,    45,
-      46,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    3126,  3126,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    47,     0,     0,     0,     0,     0,     0,    48,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   902,     0,     0,     0,     0,     0,     0,    49,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   902,     0,   902,     0,     0,     0,     0,     0,     0,
-       0,     0,    50,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    51,     0,  3967,     0,    52,     0,
-       0,     0,     0,     0,  3970,     0,    53,     0,     0,     0,
-       0,     0,    54,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    55,
-       0,     0,     0,     0,     0,     0,     0,    56,     0,     0,
-       0,  4000,  4001,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  4026,    61,     0,
-       0,     0,     0,     0,     0,     0,     0,  4037,     0,  4039,
-       0,  4041,     0,     0,   902,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    62,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   902,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  3745,  3746,     0,     0,
-       0,     0,  3747,     0,  3748,     0,  3749,  3750,     0,     0,
-       0,     0,     0,     0,     0,     0,  2324,     0,     0,     0,
-       0,     0,     0,     0,  3751,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    64,   902,  4123,     0,   902,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   902,     0,
-       0,     0,     0,     0,  3752,     0,     0,  3753,     0,     0,
-       0,     0,     0,     0,     0,  3754,     0,     0,     0,     0,
-       0,     0,     0,  2274,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  3402,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   902,     0,     0,     0,     0,     0,
-       0,  3755,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  3756,
-       0,  3757,     0,     0,     0,     0,  3558,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  3758,  3759,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  4231,
-       0,     0,     0,     0,   953,   953,   953,     0,     0,  3760,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  3761,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   902,     0,     0,     0,
-       0,  3762,     0,     0,     0,     0,     0,  2375,     0,     0,
-    3763,  3764,     0,  3765,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   902,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  3766,
-    3767,  3768,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  3769,  3770,
-    3771,     0,     0,     0,   902,  3772,     0,     0,  3773,  5120,
-       0,     0,     0,     0,     0,  5131,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  3774,  3775,     0,     0,
-    3698,     0,     0,     0,     0,     0,     0,   902,     0,     0,
-       0,     0,  3707,     0,  3714,  3715,  3716,  3717,     0,  3719,
-    3720,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    3776,  3777,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  3414,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   902,     0,     0,
-       0,     0,     0,  5120,  5120,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  3813,     0,     0,     0,     0,     0,     0,
-       0,     0,  4404,     0,     0,     0,  3819,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   902,     0,  3778,     0,
-       0,     0,  3779,     0,     0,     0,     0,     0,     0,   952,
-       0,     0,     0,     0,  3780,  4418,     0,  2391,     0,     0,
-    4423,  4424,     0,     0,     0,     0,     0,     0,   902,     0,
-       0,     0,     0,     0,  4431,     0,     0,     0,     0,  4433,
-       0,     0,  4434,     0,     0,  4435,  4436,     0,   902,     0,
-     902,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     902,     0,  5120,  5120,     0,     0,     0,  4448,     0,     0,
-       0,     0,     0,     0,  3781,     0,  2375,  3782,  2375,  5120,
-    3783,  3784,  3785,  3786,     0,     0,     0,  2375,  2375,  2375,
-    2375,     0,     0,     0,     0,     0,  2375,  2375,  2375,  2375,
-    2375,  2375,     0,  2375,  2375,  2375,  2375,     0,     0,  3907,
-       0,  2375,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  3787,  3788,     0,     0,  2324,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   902,     0,  5120,   953,     0,     0,     0,     0,     0,
-       0,  3789,     0,     0,     0,     0,     0,     0,  5120,   902,
-       0,  4527,  4530,     0,     0,     0,     0,     0,     0,     0,
-       0,  5120,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   902,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   902,
-    5120,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  5120,  5120,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    5120,     0,     0,     0,     0,     0,     0,   902,     0,     0,
-    5120,     0,     0,     0,     0,  5120,  4589,     0,     0,     0,
-       0,     0,   902,     0,     0,     0,     0,     0,     0,  5120,
-       0,  5120,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  5120,     0,  5120,
-       0,  5120,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  5120,     0,  5427,     0,     0,     0,     0,
-    1756,     0,     0,     0,     0,  1757,     0,  1758,     0,     0,
-    1759,  5120,  5120,     0,     0,     0,     0,     0,   902,  1736,
-    1760,  1761,     0,     0,     0,     0,   902,     0,  5120,  5120,
-       0,     0,     0,  5120,     0,     0,     0,     0,  4669,  4670,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1762,     0,     0,  -962,  -962,  1763,  1764,     0,     0,
-       0,     0,  1765,     0,  -962,     0,     0,     0,     0,     0,
-    1766,     0,     0,     0,     0,     0,  1767,  1768,     0,     0,
-    1769,     0,     0,     0,     0,     0,     0,     0,     0,  1770,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1771,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1772,     0,
-       0,     0,  1773,     0,     0,     0,     0,     0,     0,     0,
-    1774,  1775,     0,     0,     0,     0,     0,  1776,     0,     0,
-       0,     0,     0,     0,     0,  1777,  4187,     0,     0,     0,
-       0,  1778,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1779,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    4216,     0,     0,     0,     0,  1780,     0,     0,     0,     0,
-       0,     0,     0,     0,  1756,     0,  2324,     0,     0,  1757,
-       0,  1758,     0,     0,  1759,     0,     0,     0,     0,     0,
-       0,     0,     0,  1736,  1760,  1761,  4790,     0,  4792,     0,
-       0,     0,     0,     0,     0,     0,  1781,     0,  1782,     0,
-       0,     0,     0,     0,     0,  1783,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1762,     0,     0,     0,     0,
-    1763,  1764,     0,     0,     0,  1784,  1765,     0,     0,     0,
-       0,     0,     0,     0,  1766,     0,     0,     0,     0,     0,
-    1767,  1768,     0,     0,  1769,     0,     0,     0,  1785,     0,
-       0,     0,     0,  1770,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  1771,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1772,     0,  1786,     0,  1773,     0,     0,     0,
-       0,     0,     0,     0,  1774,  1775,     0,     0,     0,  4860,
-       0,  1776,  1787,     0,     0,     0,  1788,     0,     0,  1777,
-       0,  2375,     0,     0,     0,  1778,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1779,     0,     0,     0,
-       0,  4868,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1789,     0,     0,     0,     0,  1780,
-    1790,     0,     0,     0,     0,     0,     0,  1791,     0,     0,
-       0,     0,     0,     0,     0,     0,  1792,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  4380,     0,     0,     0,     0,     0,     0,
-    1781,     0,  1782,     0,     0,     0,     0,     0,  1793,  1783,
-       0,     0,     0,     0,     0,     0,     0,  2391,     0,     0,
-    4914,     0,     0,  1794,  1795,  1796,     0,     0,     0,  1784,
-       0,     0,     0,  4527,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1785,     0,     0,  1797,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  4527,
-       0,     0,     0,     0,     0,     0,     0,     0,  1786,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1787,     0,     0,     0,
-    1788,  1798,  1799,  1800,  1801,     0,     0,     0,     0,  1802,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1803,     0,     0,  1804,
-       0,     0,     0,     0,     0,     0,     0,     0,  1789,     0,
-       0,     0,     0,     0,  1790,     0,     0,     0,     0,     0,
-       0,  1791,  1805,     0,  3243,     0,     0,     0,     0,  1757,
-    1792,  1758,     0,     0,     0,  1806,     0,     0,     0,     0,
-       0,     0,     0,  1736,  1760,  1761,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  2391,  1793,     0,     0,     0,     0,     0,     0,  1807,
-       0,     0,  1808,     0,     0,  1762,     0,  1794,  1795,  1796,
-    1763,     0,     0,     0,     0,  4538,  4539,     0,  4541,     0,
-       0,     0,     0,     0,  1766,     0,     0,     0,     0,     0,
-    1767,  1768,     0,     0,  1769,     0,     0,     0,     0,  1797,
-       0,     0,     0,  1770,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  3745,  3746,     0,     0,     0,  1771,  3747,
-       0,  3748,     0,  3749,  3750,     0,     0,     0,     0,  5090,
-       0,     0,  1772,     0,     0,     0,  1773,     0,     0,     0,
-       0,  3751,     0,     0,  1774,     0,     0,  1809,  1810,  1811,
-       0,  3244,     0,     0,     0,  1798,  1799,  1800,  1801,  1777,
-       0,     0,  5147,  1802,     0,  1778,     0,     0,     0,     0,
-       0,  1812,  1813,     0,     0,     0,     0,     0,     0,     0,
-    1803,     0,     0,  1804,     0,     0,     0,     0,     0,     0,
-       0,  3752,     0,     0,  3753,     0,  4622,     0,     0,  1780,
-       0,     0,  3754,     0,     0,     0,  1805,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1806,
-       0,  3402,  5191,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  3755,     0,
-       0,     0,  1782,     0,     0,     0,     0,     0,     0,  1783,
-       0,     0,     0,  1807,     0,     0,  1808,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  3756,     0,  3757,  1784,
-       0,  5229,     0,  5248,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  3758,  3759,     0,     0,  2375,  2375,
-    2375,  2375,  1785,     0,     0,     0,     0,     0,     0,  4187,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  4715,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  5277,     0,  5278,  3760,     0,  1786,     0,
-       0,     0,     0,     0,     0,  5286,     0,     0,     0,  3761,
-       0,  1809,  1810,  1811,     0,     0,  1787,     0,     0,     0,
-    1788,     0,     0,     0,     0,     0,     0,     0,  3762,     0,
-       0,     0,     0,     0,     0,  1812,  1813,  3763,  3764,     0,
-    3765,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1790,     0,     0,     0,     0,     0,
-       0,  1791,     0,     0,     0,     0,  3766,  3767,  3768,     0,
-    1792,     0,     0,     0,     0,     0,  5349,     0,     0,     0,
-       0,     0,     0,     0,     0,  3769,  3770,  3771,     0,     0,
-       0,     0,  3772,     0,  5354,  3773,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  3774,  3775,  4804,     0,  1794,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  4813,     0,     0,
-       0,     0,     0,     0,  5373,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  3776,  3777,  1797,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  5404,  3414,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  5419,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1798,  1799,  1800,  1801,     0,
-       0,     0,     0,  1802,     0,     0,  3126,  3126,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    1803,     0,     0,  1804,     0,  3778,     0,     0,     0,  3779,
-       0,     0,     0,     0,     0,     0,     0,     0,  4874,     0,
-       0,  3780,     0,     0,     0,     0,     0,     0,     0,  2375,
-       0,     0,     0,  5493,     0,     0,     0,     0,     0,  1806,
-       0,  2324,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  4901,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  1807,     0,     0,  1808,     0,     0,     0,
-       0,  3781,     0,     0,  3782,     0,     0,  3783,  3784,  3785,
-    3786,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    3787,  3788,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  4948,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  3789,     0,
-       0,  1809,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  4984,     0,     0,     0,  1812,  1813,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  5054,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  3126,
-    3126,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   243,   244,     0,   751,   246,   247,   248,   249,
-       0,     0,   250,     0,     0,     0,     0,   251,     0,  5176,
-     752,     0,   253,   254,   255,   256,   753,   258,     0,   259,
-       0,     0,   754,   260,   755,   756,   757,   261,   758,     0,
+     723,  1411,  1406,   121,  1170,   116,  1736,  2043,  1086,   912,
+    1040,  1083,   931,   114,  1519,  1523,   972,  1197,  1719,  1743,
+    2044,  1998,  1600,   966,  2429,   991,   721,  1723,  1685,  1174,
+    1286,  2346,  1007,  2142,  1552,  1012,  2141,  1910,  1122,  1706,
+    1007,   966,  1128,  1099,   965,  1046,  1670,  1106,  3700,  1113,
+    1567,  1682,  1773,  1671,  1149,  1043,  3246,  2189,  1683,  1129,
+    3125,  3126,   965,  2561,  2950,  1853,  1044,  1126,  3557,  1135,
+    1854,  3229,  1245,  3296,  3297,  1601,  2586,  1134,  3387,  3608,
+    3241,  2913,  2914,  3632,  3179,  1660,  2095,  3179,  3179,  1947,
+    1948,  1146,  2835,  2836,  3485,  3183,  3184,  2384,  3486,  2942,
+    3866,  3000,  2245,  3552,  2884,  2845,  2846,  2847,  3886,  2489,
+    3750,  1713,  2416,  2418,  2419,  1722,  1986,  1708,  2000,  2456,
+    3289,  2457,   932,  2487,  3291,  1175,  1177,  2459,  2065,  2518,
+    2013,  2014,  2015,   990,  3663,  3969,  2017,  4050,   996,  2399,
+    3082,  2400,  2402,  2403,  2495,  3090,  4354,  2541,  2499,  3907,
+    2246,   964,  3029,  2942,  2389,  1686,  4273,  2392,  3893,  2394,
+    3396,  3487,  2519,  3397,  4233,  3398,  4359,  3190,  3134,   964,
+     736,  3696,  2321,  1687,  2531,  2053,  3591,  2980,  4818,  3405,
+     968,  1353,  1354,  3638,  1355,  1099,  4378,  4379,  3984,  2331,
+     989,  3406,  3286,  3287,  2064,   995,  2334,  1407,   968,  1233,
+    1234,  3480,  2337,  3985,  4417,  1684,  1176,  1218,  1220,  3480,
+    4747,  3420,  4175,  4772,  1187,  2474,   723,  3481,  3120,   723,
+    1146,  1198,  1099,  4549,  4819,  3481,  1463,  3221,  1365,  1366,
+    2890,   759,  2151,  3076,  4387,  3077,  1099,  2718, -2933,  1549,
+    3646,  4363,  1189,  3195,  3381,  1196,  1365,  1366,  3091,  4319,
+    4323,  3093,  3883,  4324,  3094,  1408,  3258,  3581,  3262,  3263,
+    2191,  3451,  3452,  3453,  1416,  1417,  1418,  1365,  1366,  1421,
+    1422,  4333,  2191,  1425,  3678,  1427,  1428,  1429,  3489, -1080,
+    1365,  1366, -2180,  1940,  1941,  1942,  1365,  1366,  3106,  3743,
+    1408,  1365,  1366,  1505,  1952,  3064,  2576,  3544,  1408,  3130,
+    1221, -1972,  4622,  3505,  -739,  2960,  1864,  3507,  2073,  1365,
+    1366,  3066,  2827,  1921,  1929,  2256,  3179,  2953,  4984,  2250,
+    4325,  3709, -2342,  3515,  3516,  2006,  1161,  3121,  2010,  3522,
+    1878,  1365,  1366,  1365,  1366,  1454,  2332,  4732,  1896,  1365,
+    1366,  4019,  1229,  3634,  1206,  3534,  3535,  2027,  2028,  4272,
+    1492,  2032,  1365,  1366,  3541,  2380,  1201,  2705, -2933,  4611,
+    1239,  3741,  3742,  -600,  1365,  1366,  1578,  3675,  1162,  2046,
+    2047,  3653,  3559,  1796,  2051,  2052,  2332,  1365,  1366,  5228,
+    3547,  2380,  1365,  1366,  1451,  4559,  4139,  1171,  1796,  2072,
+    1412,  4193,  4197,  -739,  4429, -1859, -2934,  1796, -2121,  1207,
+    3539,  4208,  4209,  2404,  -726, -2112,  3934,  1955,  3242,  4435,
+    1365,  1366,  3788,  1611,  4244,  1365,  1366,  1163,  4891, -1065,
+    3252,  1494,  3585,  1365,  1366,  1052,  1629,   240,  -727,  3795,
+    1107,  1365,  1366,  1365,  1366,  3483,  2746,  4832,  1781,  4977,
+    2747,  1365,  1366,  2266,  -585,  3734,  2819,  4489,   979,  3867,
+    1161,  3292,  1891,  2395,  1796,  1387,  1745,  1102, -2842,  4472,
+    3408,  3747,  4090,  2363,   240,  4020,  3004,  5009,  -627,  1161,
+    4688,  1096,  2709,  1506,  1161,  4317,  1475,  1365,  1366,  1167,
+    2340,  3323,  4855,  1555,  1365,  1366,  5290,  3873,  4003,  3120,
+    3423,  4978,  1524,  4211,  -962,  3179,  2092,  1962,  1167,  1365,
+    1366,   730,  1162,  4398,  1621,  4331,  4332,  3895,  1613,  3654,
+    2804,  1286,  3422,  2125,  2126,  1511, -2934,  4774,  2191,   240,
+     971,  2283,  3070,  1365,  1366,  4656,  1162,  4775,  4936,  3655,
+    1365,  1366,  2287,  1045,  1228,  1706,   236,   737,  4007,  1365,
+    1366,  1163,  3656,  4813, -1859,  3012,  4867,  1098,  4206,  4994,
+    1365,  1366,  4548,  1130,  1365,  1366,  -616,  2961,  5037,  1178,
+    1163,  3537,  1893,  1054,  1027,  1163,  3013,  2316,  1573,  3071,
+    4894,  2319,  1409,   993,  1365,  1366,  2323,  5243,  1365,  1366,
+    2743,  3179,  1879,  1706,  3875,  4004,   933,   242,  3538,  1614,
+    1464,  1622,  1131,  4868,  2405,  5291,  1368,   974,  3121,  1369,
+    3938,  2227,  3943,  3998,  5399,  2338,  2339,  1409,  3014,  1365,
+    1366,  1365,  1366,  3774,  1368,  1409,  1495,  1369,  1365,  1366,
+    1574,  1324,  5071,  4814,   237,  3657,  3903,  1365,  1366,  1365,
+    1366,  1365,  1366,  2878,  3685,  1368,  1365,  1366,  1369,  2879,
+    4311,  1894,   731,  3715,  3894,   984,  4399,  2891,  1368,  4354,
+   -2122,  1369,  4021, -1859,  1368,  2302,  4856,  1369,  1390,  1368,
+    2070,  3652,  1369, -2342,  5399,  2442,  2443,  2211,  1362,  1525,
+    4776,  3729,  3730,  3731,  3732,  2364,  -962,  1368,  1583,  1863,
+    1369,  1678,  1637, -1859,  1476,  2438,  3107,  1913,  3010,  1184,
+    3011,  4979,  -739,  1746,  1168,  2452,  2275,  4615,  2101,  1368,
+     980,  4418,  1369,  4640,  3645,  1482,  2267,  1368,  4644,  1103,
+    1369,  1809,  4647,  1172,  3425,  5077, -2933,  4990,  2124,  1747,
+    1368,  1365,  1366,  1369,  3632,  2396,  1199,  5062,  5063,  1099,
+    1099,  3484,  1368,  4392,  4660,  1369,  3781,  1146,  3496,  1231,
+    1211,  2962,  4361,  2341,  4664,  1368,  2142,  3658,  1369,  2141,
+    1368,  5292,  4667,  1369,  1331,  4895,  4375,  4490,  3988,  2888,
+    2577,  2452,  3683,  1892,  1466,  3735,   240,  4022,  1270,   985,
+    3935,  3936,  4307, -1859,  4837,  1577,  3879,  1093,  1368,  4374,
+    2153,  1369,  1413,  1368,  4308,  1129,  1369,  2755,  4713,  3605,
+    2199,  1368,  -810,  1078,  1369,  4303,  1287,  2890,  4309,  1368,
+    3872,  1368,  1369,  1325,  1369,  3868,  1365,  1366,  5133,  1368,
+    1054,  1027,  1369,  3192,  4120,  3192,  4122,  3890,  3789,  3659,
+    5010,  4917,  1520,  1230,  2456,  5190,  2457,  1452,  4140,  2768,
+    1538,  1543,  2459,  2479,  1987,  1162,  3981,  1988,  1579,  3078,
+    3079,  2942,  3548,  1956,  1933,  1368,  3583,  4927,  1369,  3754,
+    1570,  3667,  1368,  1455,  4985,  1369,  3664,  1371,  4376,  1496,
+    5224,  4272,  3672,  1507,  1638,  1171,  1240,  1368,  2954,  1865,
+    1369,  1146,  4765,  1363, -2934,  1371,  2753,  3787,  1376,  3790,
+    4326,  1358,  3555,  3676, -1859,  2913,  2914, -2121,  4268,  1357,
+    2408,  1368, -2933, -1859,  1369,  5073,  1371, -1859,  1368,  4623,
+    2150,  1369,  1612,  2942,  1365,  1366,  4195,  1368,  1461,  1371,
+    1369,  2851,  1419,  3928,  3131,  1371,  3933,  1424,  1368,  1661,
+    1371,  1369,  1368,  3945,  2719,  1369,  3974,  4571,  3950,  3951,
+    3952,  3953,  3954, -1080,  1364,  2479, -2180,  2575,  1371,  3961,
+    1659,  1880,  1368,  2393,  3968,  1369,  1368,  3971,  1706,  1369,
+    3433,  1487,  2210,  1704,  3338, -1972,  3794,  2479,  2479,  3744,
+    1371,  2220,  1371,  2714,  1880,  5304,  1880,  1146,  1371,  4762,
+    4031,  1465,  5271,  1470,  2736, -2342,  1167,  1368,  1241,  1368,
+    1369,  1371,  1369,    42,  1755,  3752,  1368,  1485,  1146,  1369,
+    1880,  4255,  4123,  1371,  3350,  1368,  3179,  1368,  1369,  1368,
+    1369,  3339,  1369,  4651,  1368,  4112,  1371,  1369,  2733,  2305,
+    4060,  1371,  4061,  4034,  4557,  4570,   912,  -600,   934,  2479,
+    1081,  3108,  3109,  1365,  1366,  1146,  4079,  2857,  4080,  3065,
+    4417,  2848,  3904,  1146,  1146,  4129,  2074,  1179,   966,  1371,
+    2075,  4285,  2780,  4094,  1371,  3067,  2784,  1410,  1174, -1859,
+   -2934,  1046,  1371,  1146,  4483,  5244,    49,  2820,  -726,   965,
+    1371,  1043,  1371,  2744,  1659,  1170,  1724,  3351,  2806,  2456,
+    1371,  2457,  1044, -1065,  2754,  3018,  4091,  2459,  5293,  4845,
+    4126,  2074,  -727,  2375,  4961,  2772,  -405,  5334,  2375,  1368,
+    1725,  1431,  1369,  4574,  4575,  1099,  1628,  4307,  -585,  2828,
+    2479,  3686,  4657,  2829,  1113,  1914,  1371,  3973,  2849,  4308,
+      54,  3869, -2842,  1371,  2479,  1402,  1403,  1404,  1405,  1365,
+    1366,  2439,  -627,  4309,  2479,  2805,  3196,    55,  1371,  2808,
+    5499, -1859,  1653,  2809,  1663,  1054,  1027,  4894,  4652, -2122,
+    1357,  1177,  2735,  1408,  1175,  1749,  4175,  5425,  3864,  3865,
+    1584,  1480,  1371,  1554,  3611,  1326,  1146,  1489,  2734,  1371,
+    4393,  3407,  3884,  2588,  4168,  1720,  5487,  2825,  1371,  4710,
+    3887,  2826,  3564,  1707,  1368,  3891,  3565,  1369,  1744,  1371,
+     986,   988,  1146,  1371,  1751,  1752,   121,  1146,   116,  1756,
+    1907,  1172,  3059,  3086,  1855,   968,   114,  1857,   723,  2123,
+    4676,  1099,  5519,  1371,  2759,  2748,  4202,  1371,  1875,  3268,
+    -616,  5279,  2479,  2139,  2891,  5483,  1410,  2760,  1897,  1898,
+    1899,  1176,  2044,  1902,  1858,  2765,  1906,  1146,  3758,  1911,
+    1912,  2778,  1710,  1219,  1219,  2770,   966,  3984,  1371,  4203,
+    1371,  4896,  4897,  3939,  3009,  4361,  1152,  1371,  2184,  4444,
+    1365,  1366,  3985,  2960,  5329,  3197,  1371,   965,  1371,  1866,
+    1371,  1915,  1001,  1287,  2398,  1371,  1630,  2752,  3900,  3098,
+    3040,  1174,  1368,  4229,  3612,  1369,  1688,  1287,  2771,  4025,
+    1365,  1366,  2018,  3901,  1358,  1719,  1719,  1867,  4560,  4299,
+    4300,  1685,  1357,  2774,  1916,  1365,  1366,  1989,  1127,  3736,
+    1990,  5323,  1365,  1366,  1365,  1366,  1516, -1859,  3588,  3864,
+    3865,  1365,  1366,  3038,  1682, -2999,  3404,  2786,  3441,  3402,
+    2761,  1683,  4895,  3043,  1773,  2045,  3045,  4675,  1773,  3048,
+    5045,  1100,  5047,  2791,  1773,  5330,  1365,  1366,  1365,  1366,
+    4065,  2066,  1365,  1366,  4066,  4602,  1215,  1266,  2795,  4310,
+    1371,  1365,  1366,  2704,  3997,  5275,  1365,  1366,   912,  1711,
+    4503,  2084,   981,  1107,  2762,  2728,  4721,  2097,  2098,  5488,
+    2100,  2102,  2796,  3416,  2103,  2104,  2105,  3635,  3636,  2109,
+    2110,  2112,  2114,  2115,  2116,  2117,  2118,  1129,  4566,  5192,
+    4026,  1368,  4013,   968,  1369,  1365,  1366,  1661,  3716,  4073,
+    2915,  4092,  1146,  4074,  4274,  4093,  2183,  3591,  2769,  2132,
+    2133,   723,  2135,  2858,  2137,   723,  1146,  2782,  1686,   723,
+    2147,  1146,  1099,  2798,  2152,  2799,  2783,  1516,  2178,  2401,
+    2873,   966,  5280,  1853,  1853,  1371,  1687,  2134,  1854,  1854,
+    2181,  2138,  1657,  1146,  4204,  2146,  4914,  4915,  4406,  4407,
+    3396,  1146,   965,  3397,  1146,  3398,  1365,  1366,  2196,  2198,
+    1409,  2244,  4476,   966,  2388,  3690,  3673,  3674,  1684,  3405,
+    4267,  4599,  3027,  1099,  1099,  1260,  4291,  4582,  2261,  3198,
+    1549,  3406,  1099,  1099,   965,  1099,  2222,  1368,  3613,  2883,
+    1369,  2430,  4613,  2142,  5209,  2185,  2141,  4428,  1146,  1146,
+     733,  4186,  5273,   734,  4621,  2961, -2999,  2257,  4468,  4625,
+    3480,  2787,  1555,  1917,   966,  1146,  4583,  1040,  2253,  3600,
+    4210,  4711,  2311,  1153,  1459,  2450,  3481,  2561,  3192,  4144,
+    2276,  4516,  3940,  1371,  2489,   965,  2396,  2320,  2284,  1045,
+    3652,  4221,  3417,  4436,  1408,  1328,  4219,  3724,  1408,  3726,
+    3727,  4836,  1046,  5392,   723,   723,   723,  1099,   723,  1146,
+    1099,  1773,  1043,  3598,  3563,  4921,  1174,  1092,  3720,  5221,
+    2317,  4183,   723,  1044,  1146,  4248,  3641,   723,  5275,  3480,
+    2306,  2307,  2308,  1267,  2310,  1365,  1366,  4117,   968,  3737,
+    4121,   964,  4468,  2942,  2171,  3481,  4131,  3963,  2318,  1627,
+    4132,  3389,  1245,  2322,  4270,  2859,  3179,  3179,  2851,  3568,
+    3569,  1516,  2373,  1512,  4442,  4443,  5382,  5324,  1368,  2065,
+     968,  1369,  3640,  4354,  1689,  2895,  1859,  3614,  1113,  2355,
+    2489,  2518,  1104,  4507,  3687,  3514,  3691,  3692,  2865,  4218,
+    1365,  1366,  3572,  2366,  2487,  1521,  2412,  1517,  1368,  1146,
+    1316,  1369,  1371, -2112,  1365,  1366,  2942,  1011,  4661,  1214,
+    4991,  1365,  1366,  1368,  2519,  3199,  1369,  1146,  3135,  1707,
+    1368,   968,  1368,  1369,  4310,  1369,  4469,  4838,  1216,  1368,
+    1918,  4506,  1369,  1146,  4259,  2064,  1365,  1366,  1616,  2962,
+    1765,  1365,  1366,  4402,  1146,  4260,  4943,  1882,  2803,  4311,
+    2927,  2396,   982,  3941,  1368,  1219,  1368,  1369,  4403,  1369,
+    1368,  1365,  1366,  1369,  2186,  3864,  3865,  2436,  5325,  1368,
+    3422,  3574,  1369,  2447,  1368,  4701,  2440,  1369,  1146,  1460,
+    3751,  1154,  4282,  5038,  3136,  3774,   997,  1162,  1365,  1366,
+    5194,  5181,  5092,  1365,  1366,  2461,  2462,  1320,  1371,  5326,
+    4446,  2456,  5182,  2457,  1666,  2489,  1559,  4027,  4470,  2459,
+    4469,  1763,  3927,  1368,  3929,  3137,  1369,  1171,  1517,  3776,
+    1365,  1366,  3775,  1513,  3946,  3947,  3948,  3949,  4815,  4145,
+    4969,  1365,  1366,  3955,  3956,  3957,  3958,  3959,  3960,  4844,
+    3962,  3965,  3966,  3967,  1936,  5509,  2076,   240,  3972,  5393,
+    1365,  1366, -2999,  1387,  2119,  3668,  3669,  3670,  4896,  4897,
+    2563,  3418,  1365,  1366,  1883,  1560,  4159,  2821,  1884,  1760,
+    5261,  4250,  2860,  1555,  1368,  1365,  1366,  1369,  3738,  3739,
+    1365,  1366,  1885,  3527,  4517,  2263,  3138,  3615,  2861,  1664,
+    1365,  1366,  4474,  2463,  1667,  5200,  1936,  1127,  1561,  3008,
+    1365,  1366,  2843,  4933,  2565,  -658,  1208,  4391,  2581,  1099,
+    2187,  1409,  1365,  1366,  1765,  1409,  3254,  1078,  3540,  2077,
+    2855,  4518,    42,  1093,  1099,  4696,  2889,  1761,  1167,  1371,
+    1171,  4034,  2313,  3607,  5137,  3981,  1317,  3392,  1882,  4697,
+    1365,  1366,  1617,  1765,  2749,  1365,  1366,  5328,  4584,  1161,
+    3215,   998,  1365,  1366,  4437,  4438,  4439,  1099,  4037,  1371,
+    2730,   723,   723,  2838,  1365,  1366,  4261,  3529,  3139,  2537,
+     723,  1937,   733,  2888,  1371,   734,  1219,  1125,  3131,  4052,
+    3423,  1371,  1125,  1371,  5140,  1365,  1366,  2731,  2732,  4432,
+    1371,  4251,  5252,  4381,  2314,    49,  3255,  1094,  1365,  1366,
+    1767, -2112,  1517,  1368,  4712,  2889,  1369,  4714, -2036,  1461,
+    1365,  1366,  3976,  3179,  2916,  1371,  3216,  1371,  1886,  1137,
+    5183,  1371,  2538,  1951,  1365,  1366,  3684,  2207,  1219,  4471,
+    1371,  2564,  5262,  1321,  3689,  1371,  2219,  1219,  1668,  2221,
+    1163,  1167,  3987,  1138,  4618,  3986,  3075,  1287,  2779,    54,
+    4620,  4557,  2952,  4906,  1936,  1883,  1390,  4795,  1368,  1884,
+    3681,  1369,  2863,  1365,  1366,  1365,  1366,  2464,  1410,  2888,
+    2120,  3422,  1368,  1885,  1371,  1369,  4545,  1365,  1366,  1368,
+    1763,   812,  1369,  1522,  1365,  1366,  1365,  1366,  1365,  1366,
+    1045,  1078,  3179,  3179,  2842,  1763,  2121,  5200,  3256,  3007,
+    4753,  4754,  1365,  1366,  1368,  1146,  4252,  1369,  2539,  1368,
+    4738,  2309,  1369,  4471,  2312,  3019,  1887,  1562,  3217,  2511,
+    1078,  1365,  1366,  1146,  4071,  1915,  5449,  5450,  2862,  1368,
+    4519,  4698,  1369,  5226,  2078,  1371,  5230,  2866,  2750,  4072,
+    2913,  2914,  2588,  1172,  4220,  1129,  4085,  4216,  4217,  1125,
+    2870,  4262,  2872,  2874,  1358,  4096,  1368,  5253,  1926,  1369,
+    1190,  1368,  1357,  4693,  1369,  1764,  1081,  4635,  4636,  1129,
+    4382,  1376,  3977,  4637,  1767,  1191,  2794,  4517,  2523,  5097,
+    1099,  2005,  4097,  1866,  1387,  5141,  4569,  2315,  1368,  3140,
+    4894,  1369,  2550,  1753,  4693,  4797,  2797,  1099,  1140,  1368,
+    3218,  3554,  1369,  1767,  3425,  5114, -2036,  3753,  4512,  1886,
+    4513,  1867,  1765,  5263,  4518,  1099,  1287,  1146,  1368,  2942,
+    2942,  1369,  2956,  2957,  3566,  2942,  3567,  1765, -2036,  2404,
+    1368,  1754,  2924,  1369,  3089,  2800,  2929,  1127,  1114,  2263,
+    4124,    42,  3531,  1368,  1099,  2888,  1369,  1099,  1368,  4243,
+    4150,  1369,  2889,  4249,  2915,  1146,  1172,  1760,  1368,  1146,
+    1146,  1369,  2122,  1563,  1371,  4001,  4919,  4920,  1368,  4361,
+    3318,  1369,  1704,  1365,  1366,  1365,  1366,  1365,  1366,  1936,
+    1368,  3423,  2512,  1369,  1564,  1115,  3872,  4456,    42,  4184,
+    2924,  3279,  2981,  3280,  1099,  5142,  2812,   836,  1605,  1129,
+    4307,  4907,  1146,  1365,  1366,  1695,  1185,  1887,  1368,  1565,
+    4306,  1369,  4308,  1368,    49,  1761,  1369,  1936,  1146,  1371,
+    1368,  4130,  3556,  1369,   966,  1566,  4309,   966,  5386,  4278,
+    1410,  1188,  1368,  1371,  1046,  1369,  3281,  4693,  1054,  4320,
+    1371,  2524,  1046,  4330,  1043,   965,  1195,  5102,   965,  3036,
+    1936,  4335,  1043,  1368,  4176,  1044,  1369,  1726,  4368,  3282,
+    1116,    49,  3250,  1044,  2044,  1371,  1368,  2044,    54,  1369,
+    1371,  5115,  4428,  5256,  5257,  4895,  3454,  1917,  1368,  1099,
+    1099,  1369,  1446,  5285,  2551,    55,  1457,  1390,  3058,  1078,
+    1371,  3319,  1368,  5103,  5203,  1369,  1365,  1366,  3283,  3295,
+    4247,  2722,  1365,  1366,  1078,  1129,  2009,  5287,  1365,  1366,
+    3161,  1696,  1200,  2583,  3611,  3626,  3627,  1371,  5206,  1727,
+    2405,  3219,  1371,  4519,  2723,  2830, -2036,  4271,  2692,  5236,
+    4974,  1368,    55,  1368,  1369,  4014,  1369,  1146,  1735,  4168,
+    2368,  4168,   966,  2369,  2031,  1368,  3116,  4829,  1369,  1371,
+    4279,  4128,  1368,  5065,  1368,  1369,  1368,  1369,  5068,  1369,
+    1371,  2726,  1606,   965,  4774,  2447,  1365,  1366,  1763,  1201,
+    1368,  1192,  1767,  1369,  4775,  1146,  2563,  2071,  3595,  1371,
+    2837,   968,  1720,  1720,   968,    25,  3443,  1767,  3129,  1368,
+    1859,  1371,  1369,  1099,  5187,  1203,  4136,  2044,  1129,  2942,
+    4135,  2840,  1193,   733,  1371,  3425,   734,  3223,  3444,  1371,
+    3135,  1400,  1401,  1402,  1403,  1404,  1405,  1365,  1366,  1371,
+    1674,  3185,  5104,  3162,  3239,  1204,  3063,  3191,  2406,  1371,
+    2540,  4030,   221,  3204,  3206,  3209,  3210,  3211,  3212,  3213,
+    4692,  1371,    42,  3222,  1918,  3233,  1394,  1395,  5234,  5235,
+    1214,  4064,   994,  1764,  1728,  3233,  1127,  3243,  3244,  -658,
+    3233,  2479,  3248,  3249,   219,  1146,  3251,  3233,  4668,  1371,
+    5379,  4692,  3261,  3224,  1371,  3264,  3136,  2045,  5551,  2773,
+    5188,  1371,  3274,  4067,   975,  3275,  1099,  4782, -2112,  3596,
+    1520,  1768,  2370,  1371,  1520,  3721,  3290,  4152,  3233,   968,
+    1765,  4631,  1146,  1127,  3225,  5135,  5136,  3137,  1212,  2492,
+    5383,  3268,  1365,  1366,  1371,    49,  3120,  4776,  1099,  2482,
+    1117,  4075,  3722,  3570,  2044,  1391,  1392,  1371,  3233,  3328,
+    1161,  4677,  5442,  5442,  2493,  4632,  1866,  1217,  3194,  1371,
+    4081,  1368,  1118,  1368,  1369,  1368,  1369,    42,  1369,  3214,
+    3284,  1676,  4082,  1371,  4678,  3234,  3404,  1677,  4396,  3402,
+     220,  5134,  3798,  1221,  1867,  4083,  4669,  1763,  3653,    54,
+    4084,  1368,  3862,  3863,  1369,  3226,   976,  1223,  3138,   221,
+    4086,  2489,  1162,  1119,  2881,  3265,    55,  1225,  5116,  3273,
+    4089,  1880,  1371,  4679,  1371,  3163,  3277,  3278,  2407,    36,
+     784,  1219,  4095,  2773,  2722,  3164,  1371,  4397,  1411,  5484,
+    4670,  4803,  3165,  1371,  1226,  1371,  2408,  1371,  5473,  1219,
+      49,  1163,  4597,  4598,  1227,  3121,  1907,  2723,  5485,  3433,
+    4098,  1371,  3179,  5021,  4222,  4100,    42,  3586,  1607,  1608,
+    1235,  1678,  4102,  1099,  1120,  1387,    42,  1099,  2943,   977,
+    1371,  2948,   222,  2437,  4104,  3113,  5022,  3227,  2385,  2386,
+    3139,  2387,  2441,  1146,  1368,  1609,   789,  1369,  3864,  3865,
+    1368,  3438,   723,  1369,    54,  4105,  1368,  1078,  3127,  1369,
+    2494,  3435,  1054,  1027,  5023,  4196,  3179,  3179,  4106,  1236,
+    2878,    55,  2562,  1146,  4207,   223,  3062,  1146,  3439,  1765,
+    4500,  1868,  2191,  1004,  5288,  3146,  3654,  2409,  3503,    49,
+    5416,  1004,  1232,  2751,  4501,  5207,  3166,  2588,  5024,    49,
+    4466,  5373,  1045,   366,  1967,   368,  3655,  3100,  3101,  4567,
+    1045,   219,  3102,  3103,  1368,  1365,  1366,  1369,   224,  3656,
+    1398,  1399,  1400,  1401,  1402,  1403,  1404,  1405,  4327,  3223,
+    1364,  4328,  3269,  4479,  4480,  4502,  1679,  1127,  1054,  1027,
+    1767,  4896,  4897,    54,  1237, -2112,  2775,  4645,   801,  1386,
+    2588,  2776,  1759,    54,  4793,  2003,  4796,  4310,  3546,  4495,
+      55, -1859,  2066,  3046,  3047,  1368,  3309,  3310,  1369,  1585,
+      55,  1760,  4802,  2044,  4257,  4258,  3584,  1831,  4321,  3851,
+    1832,  1773,  1371,  4982,  1371,  1242,  1371,  4758,  4759,  4760,
+    4761,  4804,  2422,  3167,  2423,  3224,  1387,  4715,  2277,  1586,
+    4717,  4718,  3657,  3576,  3577,  4996,  1358,  4997,  1243,  4450,
+    1971,  4133,  1371,  1146,  1357,  1298,  1244, -1859,  1246,  1706,
+    1146,  3776,  5025,  1247,  3775,  4578,  3225,  2788,  1390,  1761,
+     817,  2588,  4448,  1410,  4484,  1315,  2178,  1520,  1248,  4449,
+    4488,  2178,    64,  4852,  4853,  3599,  1146,  1251,  1329,  1330,
+    1587,   225,  1252, -1859,  1588, -1859,  1078,  1387,  3228,  1768,
+    1368,  3140,  1253,  1369,  4423,  4424,  1450,  1054,  1027,  1453,
+    1254,  2278,  3128, -1859,  1456,  1099,  2789,  2562, -1859,  1458,
+    2588,  2790,  1099,  1099,  2792,  2588,  5215,  1255,  2588,  1762,
+    1256,  1760, -1859,  3135,  3653,  1257,  3644,  3226,  4525, -1859,
+    1287,  1258,  3435,  1146,  1261,  1371,  1263, -1859,  5026,  1099,
+    3786,  1371,  2833,  1129,  1129,  1264,  2588,  1371,  1972, -1859,
+    1358,  2920,  1975,  1265,  3658,  2921,  5027,  1040,  1357,  1976,
+     226,    64, -1859,  1268,   966,   966,   966, -1859,  1269,  1767,
+    1271,  1127,  3389,  4805,  3389,  4806, -1859,  4807,  3223,  1761,
+    5028,  3288,  1272,  4033,  1273,   965,   965,   965,  1274,  3136,
+    1520,  1146,  1046,  3056,  3740,  1388,  1275,  3057,  3864,  3865,
+    3276,  3987,  1043,  4893,  3986,  1371,  3706,  1276,  3708,  3227,
+    5084,  3701,  1763,  1044,  1277,  3147,  3576,  1394,  1395,  1415,
+    3173,  1389,  1278,  1387,  1281,   227,  3659,   228,   366,  1390,
+     368,  3148,  3320,  3488,  5521,  5522,  1282,  2588,  1648,  1589,
+    1977,  5531,  3560,  1438,  3224, -1859,  2588,  3784,  4087,  3007,
+    1520,  3785,  2588, -2112,  4301, -2112,  1371,  5531,  4302,  1095,
+    1097,   229,  3654,  2604,  2605,  4455,  3653,  4524, -1859,  4302,
+    1146,  2588,  3390,   230,  1288,  3225,  3305,  3308, -1859,  3391,
+    5085,   844,  3655,  5531,  1099,  2447,  3757,  2034,  2035,  1129,
+    1390,  3174,  4579,  1420,  4547,  3656,  5052,  1764,  3055,   784,
+    4824,  1423,  5054,  1289,  1979,  3223,  2191,  1434,  5081,  1290,
+    3768,  1391,  1392,  4663,  4558,  4561,  2279,  1590,  1426,  4562,
+    1291,   968,   968,   968,  4663,  4843,  1439,  2421,  2422,  4607,
+    2423,  1440,  1763,  4608,  1763,  1387,  3989,  4609,  1292,   219,
+    1293,  4608,  2088,  1146,  1765,  1294,  3226,  3191,    42,  3191,
+    4642,  1371,  2335,  2336,  4643,  3204,  3625,  3382,  4649,  3807,
+    4740,  3386,  4650,  1078,  4741,   789,  5245, -1859,  3233,   231,
+    1295,  3224,  1296,  3175,  1441,  4742,  3870,  1299,  3657,  4743,
+    5029,  1591,  1760,  1300,  1301, -1859,  1302,  1393,  1394,  1395,
+    1442, -1859,  4745,  1146,  1430,  1303,  4746,  1304,  4176,  3878,
+    1305,  4580,  3225,  3149,  3654,  1306,  2044,  2621,  2622,  2191,
+    4748,  2044,  1307,  -808,  4749,  1308,  1443,  1764,  1309,  3233,
+    1310,    49,  5086,  2482,  3655,  1766,  1390,  3233,  3227,  1311,
+    3228,  3233,  3233,  3389,  1312,   739,  2513,  3656,  2483, -1859,
+    1761, -1859,  1313,  1435,  4750,  1980,  2482,  1099,  4751,  1394,
+    1395,  1314,  1146,  1146,   221,  1387,  1318,  1319,  3392,  1322,
+    3392,  2514,  1396,  1982,  1765,  1323,  1765,   801,  4752,   764,
+    1327,  2280,  4650,  3226,  4757,  3626,  3627,  4785,  4650, -1859,
+    3150,  4788,  1331,  2581,  1332,  1437,  3135,  4798, -1859,  4254,
+    2281,  2588,    55, -1859,  1444,  4821,  5357, -1859,  1146,  2588,
+    3658,  1333, -1859,  1592, -1859, -1859,  3151,  1334,  1174,  1335,
+    1336,  1398,  1399,  1400,  1401,  1402,  1403,  1404,  1405,  1337,
+    3657,  1078,  1338, -1859,  1339, -1859,   740, -1859,  1391,  1392,
+    1340, -1859,  4869,  3390,  2089,  3976,  4643,  4885,  1390,  1146,
+    3391,  4650,  -808, -1859, -1859,  1593,  4889,  4682,  2484,   817,
+    4650,  1341,  3136,  4892,   784,  3227, -1859,  4650,  1445,  4908,
+    4910, -1859, -1012,  4909,  4909,  2515,  1387,  1342,  3152,  2915,
+   -1859,  5110,  3659,   818,   966,  1099,  1642,  1643,  1099,  1646,
+    3807,  1647, -1859,  3137,  1866,  1394,  1395,  3435, -1859,  1343,
+    1344,  1653,  1345,  1763,  3176,   965,  3435,  3435,  1346,  1357,
+   -1859,  1347,  3435,  1348,  1767, -1859,  4956,  1866,  1349,  2207,
+    4650,   788,  1867,   741,  5035,  5055,  2219,  3622,  5036,  4643,
+     789,  4875,  4876,  5067,  4878,  1350, -1859,  3785,  5138,  1351,
+    1352,  4928,  5139,  5429, -1859,  1867,  1414,  1446,  4581, -1859,
+    4528,  1078,  3658,  1078,  1449,  1448, -1859,  4882,  4883,  3228,
+    4529,   794,  1462,  5301,  3138,  1467,   764,  5302,  1390, -1859,
+    4530,  5306, -1859,  3628, -1859,  3912,  1468,  1397,  1474,  1478,
+    3153,  1481, -1859, -1859,  4531,  4532,  4533,  5309,  1764,  1490,
+    1045,  4608,  1398,  1399,  1400,  1401,  1402,  1403,  1404,  1405,
+    4534,  1499,  5478,  4232,  5480,  3977,  3546,  1394,  1395, -1859,
+     915, -1859,  5311, -1859,  1003,  5320,  5312,  5310, -1859,  5321,
+    5502,  1501,   764,  5387,  3659,  4127,   742,  5388,  1504,  3392,
+    1511,  1674,   801,  1768,  1767,  1765,  1767,  2642,  2643,  5513,
+    1536,   968,  1544,  5514,  4682,  1550,  3139,  4166,  1387,  4790,
+    1553,   784, -1859,  1398,  1399,  1400,  1401,  1402,  1403,  1404,
+    1405,  2090,  2924,  1171,  5537,  5538,  4149,  1146,  1558,   916,
+    1580, -1859,  1582,  1099,  1387, -1859,  -808,  2091,  1581,  1390,
+     844,  1597,  5085,  3435,  1146, -1859,  3228,  1598,  3233,  2045,
+    1599,  1602,  4177,  1603,  1604, -1859,  1465,   812,  1631,  2517,
+    4682,   784,   917,  1653,  2924,  1632,  1146,   784,   788,   815,
+    1634,  1357,  1387,   816,   817,  1099,  1099,   789,  1013,  1635,
+    1129,  1129,  1644,  1649,  1099,  1099,  1099,  1394,  1395,  1129,
+    1129,  1129,  1650,   911,  1651,   743,  1652,   918,  1654,   961,
+    1655,  1656,  1662, -1859,  1658,  3422,  1665,  1691,   794,  1675,
+    1760,  1784,  1785,  1768,  1673,   744,  1692,   961,  1387,  1693,
+    1694,  1041,  1676,  4238,   788,  1705,   998,   789,  1677,  4231,
+    1709,  4231,  1732,   789, -1859,   911,  1124,  2486,  1734,  1758,
+    1856,   911,  5013,  5087,  5014,  5015,  1859,  1787,   919,  1398,
+    1399,  1400,  1401,  1402,  1403,  1404,  1405, -1859, -1859,  1900,
+     745,  1790, -1969,  1901,   794,   746,  1903,  1791,  1792, -1859,
+    1904,  1793,  1078,  1408,  5046,  1099,  2930,  4269,  1936,   801,
+    1129,  1943,  2045,  1954,  5195,  1957,  2002,  4535,  1992, -1859,
+    3135, -1859,  2003,  4624,  2004,  1795,   747,  1387,  1394,  1395,
+     748,  4989,  2931,  2025,  4536,  1014, -1859,  2042,   749,  1796,
+    2054,  1390,  1678,  1797,  2055,  2044,  3191,  2932,  -808,  2067,
+    2068,  1219,  -808,  2069,  4298,  2080,  2793,  3140,  2482,   801,
+    2933,  4947,  2099,  3135,  2107,   801,  4952,  1390,  2106,  2140,
+    -658,  2136,  1802,  2483,   812,  2154,  2180,  2201,  2203,    42,
+     750,  2202, -1859,  2204,  2206,  1767,  3136,  4154,  5091,  2214,
+   -1859,   817,  1399,  1400,  1401,  1402,  1403,  1404,  1405,  2215,
+    2216,  2226, -1859,   836,  2242,  1390,  -153,  4683,  2247,  2258,
+    4684,   920,  2934,  2935,  2262,  1015,  2263,  3137,  2265,  2268,
+     842,  2270, -1859,  1719, -1859,   844,  4377,  2272,   845,  3136,
+     812,  2275,  2274,  2300,   751,  4076,  2604,  2605,  1513,  2045,
+    2936,   817,  4385,  4386,  2304,  3423,   816,   817,  2324,  1806,
+    2325,  1390,    49,  2326,  2327,  4537,  1807,  1679,  2329,  2332,
+    3173,  2342,  3233,  3233,  2343,   818,  3328,  2345,  4412,  2356,
+    2357,  4416,  4538,  2358,  2360,  2362,  1808,  -808,  2374,  4006,
+    2376,  2378,  4008,  2484,  2380, -1859,  1668,  2379,  3138,  3424,
+     921,  5199, -1859, -1859,  4947, -1859,  2381, -1859,  4952,  2382,
+    1394,  1395, -1859,  5289,  1768,  1411,  3626,  3627,  2937,  1668,
+     922,  1398,  1399,  1400,  1401,  1402,  1403,  1404,  1405,  1866,
+    2390,  2391,  4234,    55,  2396,  2414,  1394,  1395,  2427,  4298,
+    1390,  3174,  2431,  -961,  4539,  1810,  2432,  2451,  2465,  4339,
+    2466,  1377,  1378,  2468,  4298,  2469,  4440,  1867,  2481,  2477,
+    2496,  4540,  2482,  1811,  4947,   923,  2501,  2502,  2507,  4952,
+     746,  2508,  2938,  1099,  1394,  1395,  2510,  2522,  2520,  2525,
+    3139,  5297,  4462,  2532,  2533,  2536,  -808,  2543,   924,  2544,
+    2621,  2622,  1379,  4340,  2546,  5371,  2556,  4341,  2554,  4342,
+     836,   925,  2567,  2557,  4683,  1380, -1859,  4684, -1859,  2568,
+   -1859,  2483,  2570,   926,  4043, -1859,  4047,   842,  1815,  2569,
+    1394,  1395,   844,  3175,  1125,   845,  2573,  1816,  2574,   927,
+    2228,  2587,  1398,  1399,  1400,  1401,  1402,  1403,  1404,  1405,
+    2229,  4685,  4686,  4612,  2584,  1381,  2585,  4343,  2588,  4687,
+    2230,  2693,  2695,  2697,  2696,   928,   836,  2699,  1382,  2700,
+    4683,  2701,  2702,  4684,  2231,  2232,  2233,  2703,  2706,  3693,
+    3694,  3695,   844,   842,  1520,  2708,  2727,  4158,   844,  3425,
+    2234,   845,  2721,  2737,  2739,  1383,  2589,  2590,  2591,  2592,
+    2593,  2594,  2595,  2764,  2485,  2767,  2740,  2741,  2756,  1394,
+    1395,  3007,  2758,  5199,  3628,  2773,  1821,  2178,  2777,   929,
+    2763,  -808,  2766,  2834,  1405,  2781,    42,  5494,  2045,  2785,
+    2801,  2802,  2807,  2822,  2893,  -961,  2823,  2513,  2810,  2811,
+    2044,  1016,  1017,  2824,  1018,  1019,  1020,  2482,  2832,  2831,
+   -1477,  5517,  2844,  2850,  2852,  1287,  1146,  3435,  2867,  1384,
+    2853,  1099,  2514,  1021,  2044,  2156,  1129,  2854,  3147,  2871,
+    5494,  2876,  1822,  1823,  1824,  1825,  2877,  2889,  2156,  2880,
+    1826,  2896,  2899,  2044,  3148,  5196,  2900,  2901,  2902,  2903,
+    5517,  2904,  2905,  2917,  2918,  -982,  2919,  1827,  1555,    49,
+    1828,  2922,  2949,  2044,  2951,  1880,  2959,  2966,  2969,  2958,
+    2971,  3140,  2975,  2976,  4231,  2978,  1400,  1401,  1402,  1403,
+    1404,  1405,  2486,  2977,  2979,  5274,  2250,  3002,  3003,  1524,
+    1525,  3021,  5445,  3033,  3022,  3023,  1830,  3024,  4685,  4686,
+    1398,  1399,  1400,  1401,  1402,  1403,  1404,  1405,  3025,  3026,
+    3030,  5220,  3035,    54,  3176,  4658,  3037,  3039,  4298,  3044,
+    4641,  3051,  3049,  4298,  3054,  3060,  2515,  4298,  3061,  3055,
+      55,  3080,  3068,  3072,  3081,  3074,  3807,  1678,  1398,  1399,
+    1400,  1401,  1402,  1403,  1404,  1405,  5277,  1146,  2157,  3088,
+    3087,  3092,  2158,  3095,  4685,  4686,  3119,  1391,  4344,  3096,
+    3097,  2157,  4719,  4345,  3114,  2158,  3124,  -808,  1866,  4346,
+    1099,  3132,  3144,  3156,  1146,  3158,  3157,  2235,  3159,  3245,
+    2642,  2643,  3247,  3293,  1398,  1399,  1400,  1401,  1402,  1403,
+    1404,  1405,  2159,  3300,  2236,  5549,  1867,  3313,  3321,  3315,
+    3322,  3329,  3331,  3332,  3333,  2159,  3334,  3335,  3384,  4347,
+    3336,  3337,  2160,  3340,  1099,  4723,  3149,  3385,  1833,  2709,
+    3341,  3342,  3343,  3344,  3345,  2160,  3346,  3347,  3348,  3349,
+    3352,  4304,  4305,  3353,  3354,   723,  4312,  3355,  3356,  3357,
+    3358,  3359,  1836,  1837,  3360,  3361,  3362,  3363,  3364,  5368,
+    3365,   911,  3366,  3367,  3368,  3369,   911,  4412,  3370,  3371,
+    3372,  4733,  3373,  1398,  1399,  1400,  1401,  1402,  1403,  1404,
+    1405,  3374,  4334,  3388,  3375,  3376,  3377,  2161,  4364,  4366,
+    4367,  3378,  3412,  4043,  3410,  3421,   911,  4298,  4348,  1520,
+    2161,  1688,  3440,  3150,  3457,  3448,  3062,  3490,  3504,  1099,
+    3435,  3426,   911,  3491,  -658,  3506,  3521,  1266,  3561,  3551,
+    3492,  1316,  3553,  5406,  1320,  3558,  1391,  1392,  3604,  3151,
+    1411,  3587,  3606,  3601, -2329,  3624,  3602,  3603,  5406,  3609,
+    3620,  3639,  2237,  2516,  3642,  3651,  3007,  3643,  4349,  3652,
+    5535,  5415,  3665,  3671,  3688,  3698,  3677,  4454,  3702,  3703,
+    2517,  3704,  3710,  3705,  3707,  3712,  3713,  3717,  3718,  3719,
+     911,   911,  3723,   911,   911,  1170,  1170,  3725,  3131,  5277,
+    3748,  3762,  2162,  3763,  3764,  3765,   911,  1146,  3766,  3767,
+    3792,  3152,  3793,  4831,  3769,  2162,  3791,   884,  3801,  3795,
+    3800,  2045,  3802,  4954,  2238,  4350,  4177,  4840,  3877,  3880,
+    5406,  3881,  1146,  3872,  3885,  3888,  3435,  3889,  2163,  3896,
+    5467,  2239,  3905,  3908,  1411,  5469,  3909,  3992,  3910,  3912,
+    3911,  2163,  3914,  3917,  3920,  3999,  3923,  3926,  3546,  4000,
+    3975,  3990,  2164,  4016,  4024,  1132,  4048,  4034,  4038,   241,
+    4040,  4044,  4866,  4049,  4051,  2164,  4053,  3864,  3865,  5406,
+    4055,  5406,  4056,  4057,  4058,  4059,   962,  2165,  4068,  4069,
+    4110,  4107,  4115,  4111,  4116,  4134,  1326,  1809,  4118,  1781,
+    2165,   911,  1078,  5406,   962,  4142,  4147,  4143,  4160,  4164,
+    4298,  5546,  4181,  3153,  4298,  4151,  4165,  4178,  4182,  4187,
+    4188,  4189,  1146,  4190,  4191,  4192,  4198,  4351,  4199,  4200,
+    4212,  2166,  4213,  4223,  4225,  4224,  4226,  5546,  5406,  5406,
+     911,  4227,  4235,  5553,  2166,  4236,  4239,  4240,  4241,  4242,
+    4253,  -810,  4256,  4265,   961,  4271,  4276,  4277,  4280,  4281,
+    4284,  4286,  2167,  4292,  4373,  4380,  4289,  1041,  4401,  1146,
+    4352,  4353,  4293,  4336,  4318,  2167,  4329,  4434,  4369,  4390,
+    4389,  4447,   733,  4458,  4465,   734,  4453,  4473,  4477,  4475,
+    4463,  4485,  4491,  2473,  4492,  2475,  2476,  4509,  4514,  4544,
+    2478,  4527,  4549,  4504,  4543,  4412,  4505,  4416,  4938,  4508,
+    4551,  4554,  3435,  2491,  4555,  4557,  2497,  2498,  4556,  2500,
+    4568,  4563,  2503,  2504,  2505,  2506,  1146,  4565,  4572,  2509,
+   -1752, -1751,  4594,  4604,  2521,  4462,  4573,  4576,  4577,  2526,
+    2527,  2528,  2529,  2530,  4964,  4605,  2368,  2534,  2535,  4616,
+    4617,  4619,  4626,  2545,  4988,  2547,  2548,  2549,  4339,  2552,
+    2553,  4627,  2555,  4628,  4629,  2558,  4638,  3756,  2559,  2560,
+    4646,  4655,  4659,  4665,  -811,  4695,  4694,  4700,  3196,  4707,
+    4709,  4363,  4716,  4725,  4724,  4727,  4728,  4735,  4737,  4731,
+    4756,  1146,  4744,  4734,  4766,  -808,  4768,  4769,  1099,  4770,
+    4783,  4771,  4705,  4799,  4674,  4784,  4341,  4785,  4342,  4786,
+    4787,  4801,  4791,  3233,  4792,  3233,  4800,  4794,  4810,  4809,
+    2483,  5033,  4811,  4817,  4820,  4825,  4822,  4823,  4826,  4827,
+     911,  4833,  4846,  4834,  4863,  1963,  1964,  1965,  1966,  1967,
+    4841,  4847,  4864,  4849,  4851,  4608,  4873,  4874,  4722,  4870,
+    4877,  4879,   961,  4880,  1167,  4886,  4343,  4905,  4884,   815,
+     911,   911,  4912,  4922,  4923,  4788,  3903,  4929,  4918,   911,
+     911,   911,   911,   911,   911,  4931,  5049,  4935,  4940,  4941,
+    4953,  4962,   911,   911,  4965,   911,   911,  4963,  4966,  4968,
+     911,   911,  4976,  4967,   911,   911,   911,   911,  4971,   911,
+     911,  4972,  4983,  4987,  4412,  4412,  4973,   911,   911,  4992,
+     911,   911,   911,   911,   911,  4998,  2879,   911,   911,   911,
+     911,   911,   911,   911,   911,   911,  5002,   911,  5003,  5005,
+     911,   911,  5007,  4781,  5016,   911,  5019,  5044,  5050,   911,
+     911,   911,  1968,  1969,  1970,  1971,  5053,  5059,  5061,  5064,
+    5070,  3721,   911,   911,   911,  5074,  5078,   911,  5111,  5079,
+     911,   911,   911,   911,   911,  5033,  5080,  3546,  5082,   911,
+    5096,  4856,  4984,  5094,  5113,  5120,  5122,  5098,  5123,  5099,
+    1720,   911,   911,  5131,  5143,  5146,  5193,  5100,  5216,   911,
+    5101,   911,   911,  5105,  -982,  5201,  5185,  5208,  5204,  5319,
+    4298,  5217,  5322,   911,   911,   911,  5223,   911,   911,  5106,
+    5203,   911,   911,   911,  5184,  5206,   911,   911,   911,   911,
+     911,   911,   911,   911,  5238,  5247,  3542,   911,  5112,  5207,
+    5179,  -544,   911,  5117,  3116,  5265,  5268,  5269,  5270,  5286,
+    5307,  5128,  5369,  5298,  5224,  5300,  5337,   961,  5283,  5267,
+    5305,  5334,  5362,  1972,  -562,  1973,  1974,  1975,  5364,  5363,
+    2045,  5365,  5214,  5367,  1976,  5373,  5375,  5374,  5381,  3328,
+    3328,  5391,  5010,  5377,  5394,  5395,  4231,  5402,  5403,   961,
+    5417,  5407,  5420,  5425,  5424,  5423,  5430,  5432,  5434,  5435,
+   -2787,  5237,  5438,  5446,  5448,  5455,  1391,  4344,  5458,  5460,
+    5471,  5468,  4345,  5242,  5475,  5470,  5476,  5477,  4346,  5481,
+    5486,  5495,  5501,  5251,  5505,  5507,  5510,  5511,  5258,  5524,
+    5527,  5534,  5520,  5525,  5179,  5179,  5536,  4985,  4138,  5554,
+     961,  3925,   121,  5260,   116,  3919,  3916,   911,  4937,  3944,
+    4939,  3922,   114,  4942,  4433,  1977,  4948,  4283,  4347,  4412,
+    4958,  1927,  5189,  5413,  5272,  2467,  5414,  4960,  5076,  5555,
+    5529,  1091,  1615,  3637,  3594,  4542,  5157,  5158,  1041,  5160,
+     911,  5161,  5163,   911,  5539,  5164,  5165,  5452,  5316,  5166,
+     966,  5400,  5453,  5167,  5443,  5168,  5412,  5180,  5411,  4445,
+    3182,  5171,  5172,  5173,  1769,  4137,  4755,  4639,  3188,  3383,
+    4767,   965,  1146,  4012,  4011,  1146,  4610,  4015,  1978,  1979,
+    5008,  5384,  4888,  5390,  5389,  5422,  5130,  3145,  5338,  3303,
+    4010,  4457,  4653,  4704,  4654,  4322,  4372,  4348,  4370,  4911,
+    5396,  4706,  4109,  5179,  5179,  5210,  5132,  5020,  5066,  5034,
+    5069,  2725,  5043,  3799,  4904,  1146,  4666,  4763,  4451,   911,
+    5179,  3746,  5512,  5033,  4002,  3306,  1365,  1366,  3733,  4926,
+    3307,  3304,  2449,  2420,  3053,  3050,  5214,  4388,   911,  3871,
+    1249,  3623,  3621,  2582,  3913,  3610,  4157,  4349,  2694,  4553,
+    1133,  5180,  5180,  3115,  1509,  3001,  1510,  2875,  2082,  4789,
+    3573,  3550,  2841,  5089,  5107,  5372,  2001,  5380,  1626,  5419,
+    1280,  3647,  4993,  3648,  3649,  3650,  3073,  5497,  5518,  5000,
+    4854,  5218,  4408,  4596,  5179,  1633,  1297,  5219,  1953,  2353,
+    4861,  5108,  4215,  4975,  4384,  5083,  3118,   911,  5018,  5179,
+     930,  2882,  2200,  3582,  4350,  1737,  4155,   968,  1738,  5316,
+    4156,  4842,  5179,  4153,  4564,  4830,  2352,  1739,  4835,  3041,
+    1980,  1483,  2330,  3042,  1963,  1964,  1965,  1966,  1967,  2974,
+    3589,  3892,  4163,  2973,  1731,  4630,  5378,  1981,  1982,  5533,
+    5418,  5179,  4881,  5550,  4816,  4720,  2448,  4839,  1359,  5001,
+    4872,  2083,  3755,  5179,  5179,  3020,  3864,  3865,  3682,  3932,
+    5180,  5180,  1733,  1049,  3031,  5457,  1740,  5376,  2286,  1050,
+    2285,  5179,  5465,  3016,  3017,  1503,  1010,  5180,  3617,  2190,
+    3728,  5179,  3413,  3189,  1681,  2413,  5179,  3409,  3414,  4986,
+    5093,   755,   756,  4452,  2249,  1508,  1721,  4726,  4764,  4955,
+    5179,  4395,  5179,     0,     0,  2045,  4351,     0,     0,     0,
+    3240,  5503,     0,     0,     0,     0,  5508,  5385,  5179,     0,
+    5179,     0,  5179,     0,     0,  1146,     0,  3253,     0,  2045,
+    -810,  1968,  1969,  1970,  1971,     0,  1930,     0,     0,     0,
+       0,  5180,     0,     0,  5179,     0,     0,     0,  2045,  4352,
+    4353,     0,     0,     0,     0,  1473,  5180,     0,     0,     0,
+    5547,  1931,  5179,  5179,  3298,  3299,  1932,     0,  2045,  5180,
+       0,     0,  3312,     0,     0,     0,     0,   116,     0,  5179,
+    5179,     0,     0,     0,  5179,   114,  5547,     0,  5178,     0,
+       0,     0,     0,     0,   884,     0,     0,     0,  5180,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    5180,  5180,     0,     0,     0,  1471,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   911,  5180,     0,
+       0,   911,     0,     0,     0,     0,     0,     0,  5180,   911,
+       0,   911,  1972,  5180,  1973,  1974,  1975,     0,     0,     0,
+       0,     0,     0,  1976,  1760,  1784,  1785,  5180,     0,  5180,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   962,     0,     0,     0,  5180,     0,  5180,     0,  5180,
+       0,   911,  5178,  5178,     0,     0,     0,     0,     0,  -963,
+    -963,  1787,     0,     0,  1368,     0,     0,  1369,     0,  -963,
+       0,  5180,     0,     0,     0,  1790,     0,     0,     0,     0,
+       0,  1791,  1792,     0,     0,  1793,     0,     0,     0,  5180,
+    5180,     0,     0,  3415,     0,   911,   911,   911,     0,     0,
+       0,     0,     0,     0,  1977,     0,  5180,  5180,  1471,  1795,
+       0,  5180,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1796,     0,     0,     0,  1797,     0,     0,
+       0,     0,     0,   911,     0,     0,     0,     0,   911,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1802,   911,     0,     0,
+       0,  5178,  5178,     0,   911,     0,     0,  1978,  1979,   911,
+       0,   911,     0,     0,     0,     0,     0,   911,  5178,   911,
+     911,     0,     0,     0,  1934,  1935,     0,     0,     0,     0,
+       0,     0,     0,  1945,  1946,     0,     0,  1949,  1950,     0,
+       0,     0,     0,     0,     0,     0,  1958,  1959,     0,  1960,
+    1961,     0,     0,     0,  1985,     0,     0,     0,  1994,  1995,
+    1996,  1997,     0,  1999,     0,     0,     0,     0,     0,     0,
+       0,  2007,  2008,  1806,  2011,  2012,     0,     0,     0,   962,
+    1807,  2016,  5178,     0,  2019,  2020,  2021,  2022,  2023,  2024,
+       0,  2026,     0,     0,  2029,  2030,     0,  5178,     0,  2033,
+    1808,     0,     0,  2036,  2040,  2041,     0,     0,     0,     0,
+    5178,     0,     0,     0,     0,  3458,  2048,  2049,  2050,     0,
+       0,     0,     0,     0,  2056,  2057,  2058,  2059,  2060,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  5178,
+       0,     0,  3459,     0,     0,  2081,   884,     0,     0,  1980,
+       0,  5178,  5178,  2085,     0,  2086,  2087,     0,     0,  1810,
+       0,     0,     0,     0,     0,  1371,  1981,  1982,     0,  5178,
+     961,     0,     0,   961,     0,     0,     0,  1811,     0,  5178,
+    1041,   911,     0,     0,  5178,   911,     0,     0,  1041,     0,
+       0,   911,  3460,     0,     0,  3461,  2127,     0,  5178,     0,
+    5178,     0,     0,  3462,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  5178,     0,  5178,     0,
+    5178,     0,  3463,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1815,     0,     0,     0,     0,     0,     0,     0,
+       0,  1816,  5178,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    5178,  5178,     0,     0,     0,     0,     0,     0,     0,  3464,
+       0,     0,     0,     0,   962,     0,     0,  5178,  5178,     0,
+       0,     0,  5178,     0,     0,  3465,     0,     0,   961,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  2260,     0,     0,     0,     0,   962,     0,     0,     0,
+       0,     0,  1471,     0,     0,     0,     0,     0,     0,     0,
+    1821,     0,     0,     0,     0,     0,  2213,     0,     0,     0,
+       0,     0,     0,     0,  2298,     0,     0,  2303,     0,     0,
+    3466,     0,     0,     0,     0,     1,     0,     0,     2,     0,
+       0,     0,     0,     0,     0,     0,  3759,   962,  3760,  3467,
+       0,     0,     0,     3,     0,     0,     0,     4,     0,     0,
+    3180,     0,     0,  3180,  3180,     0,  1822,  1823,  1824,  1825,
+       0,     5,     6,     0,  1826,     0,     0,     0,     0,     7,
+       0,     0,     0,     0,     8,     9,     0,     0,     0,     0,
+       0,  1827,     0,     0,  1828,     0,     0,     0,     0,     0,
+      10,     0,     0,  2348,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  3468,  3469,  3470,     0,
+      11,     0,  2367,  3471,     0,     0,  3472,     0,     0,     0,
+    1830,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    12,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    13,    14,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    15,    16,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   911,    17,  3473,  3474,
+       0,  2433,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    18,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  3475,     0,     0,     0,     0,     0,
+       0,    19,     0,     0,     0,  3899,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  2417,  2417,  2417,    20,
+       0,    21,     0,     0,     0,     0,    22,     0,     0,    23,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1833,     0,    24,     0,     0,     0,     0,     0,
+       0,     0,    25,     0,     0,    26,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1836,  1837,  3476,     0,
+       0,     0,     0,     0,     0,    27,     0,     0,     0,     0,
+       0,  3993,  3994,  3995,  3996,     0,     0,     0,     0,     0,
+       0,     0,    28,     0,     0,     0,    29,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   911,     0,     0,     0,     0,     0,     0,     0,
+       0,   911,   911,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  3477,     0,
+       0,     0,   911,   911,     0,   911,     0,     0,   911,   911,
+     911,   911,   911,     0,     0,   911,     0,     0,     0,     0,
+       0,     0,     0,     0,   911,     0,  3478,     0,     0,   911,
+       0,   911,     0,   911,   911,     0,   911,   911,     0,     0,
+       0,   911,   911,   911,     0,     0,     0,   911,   911,   911,
+       0,   911,    30,   911,     0,   911,     0,   911,     0,   911,
+       0,  2738,     0,     0,   911,  2742,     0,     0,     0,  3479,
+       0,     0,     0,     0,     0,  2738,     0,     0,     0,     0,
+     911,     0,     0,     0,     0,    31,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    32,     0,     0,     0,
+       0,   911,     0,   911,     0,   911,     0,     0,     0,   911,
+       0,     0,     0,     0,     0,   911,   911,     0,    33,     0,
+       0,    34,     0,    35,     0,     0,    36,     0,     0,  1760,
+    1784,  1785,     0,     0,     0,     0,    37,    38,     0,     0,
+       0,     0,     0,     0,     0,     0,    39,     0,    40,     0,
+       0,     0,     0,     0,     0,     0,     0,    41,     0,  2814,
+    2816,  2818,     0,    42,     0,     0,  1787,     0,     0,     0,
+       0,    43,     0,     0,     0,     0,    44,    45,    46,     0,
+    1790,     0,     0,     0,     0,     0,  1791,  1792,     0,     0,
+    1793,   911,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  2856,     0,     0,     0,     0,     0,     0,    47,
+       0,     0,     0,     0,  1795,     0,    48,     0,     0,     0,
+       0,  2864,     0,     0,     0,     0,     0,     0,  1796,     0,
+       0,     0,  1797,  2868,     0,  2869,    49,     0,     0,     0,
+     961,   961,   961,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      50,  1802,     0,     0,     0,     0,     0,     0,  1041,     0,
+       0,     0,    51,     0,     0,     0,    52,     0,     0,     0,
+       0,     0,     0,     0,    53,     0,     0,     0,     0,     0,
+      54,     0,     0,   911,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   911,     0,   911,     0,    55,     0,     0,
+       0,     0,     0,     0,     0,    56,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    57,    58,    59,    60,     0,     0,     0,  1806,     0,
+       0,     0,     0,     0,     0,  1807,    61,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   911,     0,     0,  1808,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    62,     0,     1,  2944,  2945,     2,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  3028,     0,     4,     0,  2298,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     5,     6,    63,  1810,     0,     0,     0,     0,     7,
+       0,     0,     0,     0,     8,     9,     0,     0,     0,     0,
+       0,     0,  1811,     0,     0,     0,     0,     0,     0,     0,
+      10,     0,     0,     0,     0,     0,     0,   962,     0,     0,
+     962,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      11,     0,     0,     0,     0,     0,     0,     0,    64,     0,
+       0,     0,     0,     0,     0,  3032,     0,     0,     0,     0,
+       0,     0,    12,     0,     0,     0,     0,  1815,     0,     0,
+       0,     0,    13,    14,     0,     0,  1816,     0,     0,     0,
+       0,     0,     0,     0,    15,    16,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  4430,  4431,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    18,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    19,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   962,     0,     0,     0,    20,
+       0,    21,     0,     0,     0,  1821,    22,     0,     0,    23,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    24,     0,     0,     0,     0,     0,
+       0,     0,    25,     0,     0,    26,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    27,     0,     0,     0,     0,
+       0,  1822,  1823,  1824,  1825,     0,     0,     0,     0,  1826,
+     961,     0,    28,     0,  3170,     0,    29,     0,  3181,     0,
+       0,     0,     0,  3186,     0,     0,  1827,     0,     0,  1828,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   911,     0,     0,     0,  3235,  3236,
+    3237,  3238,   911,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1830,     0,     0,     0,     0,
+    3330,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    3272,     0,     0,     0,     0,     0,     0,     0,     0,   911,
+     911,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  3186,  3186,     0,     0,     0,     0,
+       0,     0,    30,     0,     0,   911,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   911,     0,   911,     0,   911,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    31,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    32,     0,     0,     0,
+       0,     0,     0,   911,     0,     0,     0,     0,   911,     0,
+     911,     0,     0,     0,     0,     0,     0,     0,    33,     0,
+       0,    34,     0,    35,     0,     0,    36,  1833,     0,     0,
+       0,     0,     0,     0,     0,     0,    37,    38,     0,     0,
+       0,     0,     0,     0,   911,     0,    39,     0,    40,     0,
+       0,  1836,  1837,     0,     0,     0,  3447,    41,     0,     0,
+       0,     0,     0,    42,     0,  3455,  3456,     0,     0,     0,
+       0,    43,     0,     0,     0,     0,    44,    45,    46,     0,
+       0,   911,     0,     0,     0,     0,  3493,  3494,     0,  3495,
+       0,     0,  3498,  3499,  3500,  3501,  3502,     0,     0,     0,
+       0,     0,     0,     0,  4702,  4703,     0,     0,  3508,    47,
+       0,     0,     0,  3509,     0,  3510,    48,  3511,  3512,   911,
+    3513,     0,     0,     0,     0,  3518,  3519,  3520,     0,     0,
+       0,  3523,  3524,  3525,     0,  3526,    49,  3528,     0,  3530,
+       0,  3532,     0,  3533,     0,     0,     0,     0,  3536,     0,
+     911,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      50,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    51,     0,     0,     0,    52,     0,     0,     0,
+       0,     0,     0,     0,    53,     0,     0,     0,     0,     0,
+      54,     0,     0,  3571,     0,     0,     0,     0,     0,  2127,
+       0,     0,     0,     0,     0,     0,     0,    55,     0,     0,
+       0,     0,     0,     0,     0,    56,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   911,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    61,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  3618,     0,     0,     0,     0,
+       0,     0,     0,    62,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  3619,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  2348,    64,     0,
+       0,     0,     0,     0,     0,     0,     0,   962,   962,   962,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  2417,
+       0,     0,  3180,  3180,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  2433,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   911,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   911,     0,   911,     0,     0,   911,
+     911,     0,   911,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   911,     0,     0,     0,     0,   911,     0,
+       0,   911,  3761,     0,   911,   911,     0,     0,     0,     0,
+       0,     0,     0,     0,  3770,     0,  3777,  3778,  3779,  3780,
+       0,  3782,  3783,     0,     0,     0,   911,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     911,     0,     0,     0,     0,     0,     0,     0,     0,  3422,
+       0,     0,     0,     0,  1760,  1784,  1785,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   911,     0,     0,     0,
+       0,  1787,     0,     0,     0,  3876,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1790,     0,     0,  3882,     0,
+       0,  1791,  1792,     0,     0,  1793,     0,  5040,  5041,  5042,
+     911,   911,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1795,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1796,     0,     0,     0,  1797,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  -658,     0,  1802,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  2417,     0,  2417,     0,
+       0,     0,   911,     0,     0,     0,     0,     0,  2417,  2417,
+    2417,  2417,     0,     0,     0,     0,     0,  2417,  2417,  2417,
+    2417,  2417,  2417,     0,  2417,  2417,  2417,  2417,     0,     0,
+    3970,     0,  2417,     0,     0,     0,     0,     0,  4029,     0,
+       0,     0,     0,     0,     0,  5121,  4032,     0,  5124,  5125,
+    5126,  5127,     0,     0,     0,     0,     0,     0,     0,  3423,
+       0,     0,     0,  1806,     0,     0,     0,   962,     0,     0,
+    1807,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  4062,  4063,  3808,  3809,     0,     0,     0,
+    1808,  3810,     0,  3811,     0,  3812,  3813,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   911,   911,     0,  4088,
+       0,     0,     0,  3814,     0,     0,     0,     0,     0,  4099,
+       0,  4101,     0,  4103,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  5222,     0,     0,  3180,  3180,
+       0,     0,     0,     0,  5232,  5233,     0,     0,     0,  1810,
+       0,     0,     0,  5241,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  3815,     0,     0,  3816,  1811,     0,     0,
+       0,     0,     0,     0,  3817,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  3463,     0,     0,     0,     0,  2348,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    3818,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1815,     0,     0,     0,     0,     0,  1125,     0,
+       0,  1816,     0,     0,     0,  4185,     0,     0,  3819,     0,
+    3820,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  3821,  3822,     0,     0,
+       0,     0,     0,     0,     0,     0,   911,     0,     0,     0,
+       0,     0,     0,  2298,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  3425,     0,     0,   911,     0,   911,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  3823,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1821,  3824,     0,     0,     0,     0,     0,     0,     0,     0,
+      42,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    3825,     0,     0,     0,     0,     0,     0,     0,     0,  3826,
+    3827,     0,  3828,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1822,  1823,  1824,  1825,
+       0,     0,     0,     0,  1826,     0,  4245,     0,  3829,  3830,
+    3831,     0,     0,  4290,     0,     0,     0,     0,     0,     0,
+       0,  1827,     0,    49,  1828,   911,     0,  3832,  3833,  3834,
+       0,     0,     0,     0,  3835,     0,     0,  3836,     0,     0,
+       0,     0,     0,     0,     0,  4275,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  3837,  3838,   911,     0,     0,
+    1830,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    54,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  3839,
+    3840,     0,     0,     0,    55,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  3475,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   911,     0,     0,   911,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   911,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  3841,     0,     0,
+       0,  3842,  1833,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  3843,   911,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  2417,  1836,  1837,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  3844,     0,  4467,  3845,     0,     0,  3846,
+    3847,  3848,  3849,     0,     0,  1127,     0,     0,  -658,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  4441,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  4481,     0,
+    2433,     0,     0,  4486,  4487,     0,     0,     0,     0,     0,
+       0,     0,  3850,  3851,     0,     0,     0,  4494,     0,     0,
+       0,     0,  4496,     0,   911,  4497,     0,     0,  4498,  4499,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    3852,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    4511,     0,     0,     0,     0,   911,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   911,     0,     0,     0,     0,  5175,     0,     0,     0,
+    2348,     0,  5186,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   911,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  4590,  4593,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   911,     0,     0,     0,     0,     0,
+    5175,  5175,     0,  5482,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  4600,  4601,
+       0,  4603,     0,     0,     0,     0,  4648,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   911,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   961,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   911,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   911,     0,   911,  1052,  1053,
+       0,     0,     0,     0,     0,     0,     0,   911,     0,  5175,
+    5175,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1054,  1027,  5175,     0,     0,     0,
+    4729,  4730,     0,     0,     0,  1055, -2120,  4681,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1056,     0,  1057,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1058,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   911,     0,
+    5175,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  5175,   911,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  5175,     0,
+   -2112,  1059,     0,     0,     0,     0,  1060,     0,     0,  1061,
+       0,  2417,  2417,  2417,  2417,     0,   911,     0,     0,  1062,
+       0,     0,     0,     0,     0,     0,   911,  5175,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  4773,  5175,
+    5175,  1063,     0,  1064,     0,     0,     0,     0,     0,     0,
+       0,     0,  1065,     0,  1066,     0,  1780,  5175,     0,     0,
+       0,  1781,     0,  1782,   911,     0,  1783,  5175,     0,     0,
+    2348,     0,  5175,     0,     0,  1760,  1784,  1785,     0,   911,
+       0,     0,     0,     0,     0,     0,  5175,     0,  5175,     0,
+    4848,     0,  4850,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  5175,     0,  5175,  1786,  5175,     0,
+    -963,  -963,  1787,  1788,     0,     0,     0,     0,  1789,     0,
+    -963,     0,     0,     0,     0,  1067,  1790,     0,     0,     0,
+    5175,     0,  1791,  1792,     0,     0,  1793,     0,     0,     0,
+       0,     0,     0,     0,     0,  1794,     0,     0,  5175,  5175,
+       0,     0,     0,     0,     0,   911,     0,     0,  1068,     0,
+    1795,     0,     0,   911,     0,  5175,  5175,     0,     0,     0,
+    5175,     0,     0,     0,  1796,     0,     0,     0,  1797,  4862,
+       0,     0,     0,     0,     0,     0,  1798,  1799,     0,     0,
+       0,  4871,  4245,  1800,     0,     0,     0,     0,     0,  4916,
+       0,  1801,     0,     0,     0,     0,     0,  1802,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1803,     0,
+       0,     0,     0,  1069,     0,     0,     0,     0,     0,     0,
+       0,  4924,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1804,     0,     0,     0,     0,     0,     0,     0,     0,
+    1070,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1071,  1072,     0, -2116,  1073,  1074,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  3186,  3186,     0,
+       0,     0,  1805,     0,  1806,     0,  1075,     0,     0,     0,
+       0,  1807,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  2433,     0,     0,  4970,
+    4930,  1808,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  2417,  4590,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1809,     0,     0,     0,     0,     0,
+    1076,     0,     0,  4957,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1077,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  4590,     0,
+    1810,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0, -2856,     0,     0,  1811,  1078,
+       0,     0,  1812,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0, -2120,     0,     0,  1079,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0, -2116,     0,
+    1813,     0,     0,     0,     0,     0,  1814,     0,  5004,     0,
+       0,     0,     0,  1815,     0,     0,     0,     0,     0,     0,
+       0,     0,  1816,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0, -2856,     0,     0,  5039,
+       0,     0,     0,  1080,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1817,     0,     0,     0,  2433,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1818,
+    1819,  1820,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1821,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  5145,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    5109,     0,     0,     0,     0,     0,     0,  1822,  1823,  1824,
+    1825,     0,     0,     0,     0,  1826,  1081,  1082,  5202,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1827,     0,     0,  1828,  3186,  3186,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1829,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1830,     0,     0,     0,     0,     0,     0,  5246,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1831,     0,     0,  1832,     0,
+       0,     0,     0,     0,     0,     0,  5231,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  5284,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  5332,
+       0,  5333,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  5341,     0,  1833,  1834,  1835,     0,     0,     0,     0,
+       0,     0,     0,   962,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1836,  1837,     0,
+       0,     0,     0,     0,     0,     0,     0,  5317,  5318,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   243,   244,     0,   760,   246,   247,
+     248,   249,  5404,     0,   250,     0,     0,     0,     0,   251,
+       0,     0,   761,     0,   253,   254,   255,   256,   762,   258,
+    5409,   259,     0,     0,   763,   260,   764,   765,   766,   261,
+     767,     0,   262,   263,   264,     0,   265,     0,   266,   267,
+       0,     0,   268,   768,   769,   269,   270,     0,   271,   272,
+     770,   771,   274,     0,   275,   276,   277,   278,   772,   280,
+    5428,   773,   282,     0,   283,   284,   285,   286,   287,   288,
+     289,   290,   291,   292,   293,     0,   294,   295,     0,   296,
+     297,   298,   299,   300,     0,   774,   775,   301,     0,     0,
+       0,   776,   302,   777,     0,   303,   778,   779,  5459,   304,
+     305,   306,   780,   781,   782,     0,     0,     0,     0,   783,
+     309,   784,     0,  5474,   785,   310,   311,     0,   312,     0,
+       0,     0,     0,     0,   313,   314,   315,   316,   317,     0,
+       0,     0,   318,     0,     0,   319,   320,   321,     0,     0,
+       0,   322,     0,   323,   324,     0,   325,   326,   327,     0,
+       0,   328,   329,     0,   330,   331,   332,   333,   334,   335,
+     786,     0,   336,   337,   338,   339,   340,   787,   788,   341,
+     342,     0,   343,   344,   345,   346,   347,   789,     0,   348,
+     349,     0,     0,     0,   790,   351,     0,   352,     0,  5548,
+       0,   353,     0,   354,   791,   356,   792,  2348,   358,     0,
+     359,     0,   793,     0,   360,   361,     0,   362,   794,     0,
+     363,   364,     0,     0,     0,   795,   366,   367,   368,   796,
+       0,   369,   370,   371,     0,     0,   372,     0,     0,     0,
+     797,   373,   374,   375,   798,     0,     0,   376,     0,     0,
+       0,   377,   378,     0,   379,   380,     0,     0,     0,   381,
+       0,   382,     0,     0,   383,   384,     0,     0,   385,     0,
+     799,   386,   387,     0,     0,     0,     0,     0,   800,   389,
+       0,   390,     0,   391,     0,   392,   393,     0,     0,   801,
+       0,     0,     0,     0,   394,     0,   395,   396,   397,   398,
+     399,   400,   401,   402,   403,   404,   405,   406,   407,   408,
+     409,   410,   411,     0,   412,   413,   414,   802,   415,   416,
+     417,   418,   803,   419,   420,     0,     0,     0,     0,   421,
+     422,   423,   424,   804,   426,     0,     0,   805,   428,   806,
+     429,     0,   430,   807,   808,   809,   810,   811,   435,   436,
+     437,   438,   439,     0,   812,   440,   441,     0,     0,   442,
+     443,   444,   445,   446,   813,   814,   815,   447,   448,     0,
+     816,   817,   449,     0,   450,   451,     0,   452,   453,   454,
+       0,     0,   455,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   456,   457,   458,   818,   459,     0,   460,     0,
+     461,   462,   463,   464,   465,   466,   467,   819,   820,   470,
+     821,   471,     0,   472,   473,   474,     0,   475,     0,   476,
+     477,   478,   479,   480,     0,   822,   482,   483,     0,     0,
+     484,     0,     0,     0,   485,   486,     0,   487,   488,     0,
+       0,   489,   490,   491,   492,   493,     0,   494,   495,     0,
+     496,   497,   498,   823,   824,   499,   500,   501,   502,   503,
+     504,   505,   506,     0,   507,     0,   508,   509,     0,   510,
+     511,   512,     0,   825,     0,   826,   514,   515,   516,   517,
+       0,   518,   827,   828,   520,   521,   522,   523,     0,   829,
+     525,    42,     0,     0,   526,   527,   528,   529,     0,     0,
+       0,   530,     0,     0,     0,   531,     0,   532,   533,   534,
+     535,     0,   536,   537,   538,   539,   540,     0,     0,     0,
+       0,     0,   541,   542,   543,     0,   544,     0,     0,   545,
+       0,     0,   546,     0,   547,     0,   548,   549,   550,   551,
+     552,   553,   830,   831,   554,   555,     0,     0,   556,   557,
+     832,   559,   560,   561,   833,   834,   562,   563,   564,   565,
+     835,   566,   567,     0,    49,   568,   569,   570,   571,     0,
+     836,   572,   573,     0,   837,   838,   839,   840,     0,     0,
+       0,     0,     0,   578,   579,     0,   841,   842,   843,   581,
+     582,     0,   844,   583,   584,   845,   585,   586,     0,   587,
+     588,     0,     0,   589,     0,     0,   590,     0,   591,     0,
+     846,   593,     0,     0,   847,   848,   849,   594,  1356,   595,
+       0,     0,   596,   851,     0,   852,   597,     0,   598,   599,
+     853,   854,     0,     0,     0,    55,     0,     0,   602,   603,
+     604,     0,   605,   606,   607,   608,     0,     0,   855,     0,
+       0,   610,   611,   612,   613,   614,     0,   615,     0,     0,
+       0,     0,     0,   856,   857,     0,   616,   617,   618,   858,
+     619,   620,   621,     0,   622,   859,   860,   623,   861,   624,
+       0,   862,   863,   864,   865,   866,   625,   626,     0,   867,
+     627,   868,   628,   869,   629,   630,     0,     0,     0,   631,
+     632,   633,   634,   635,   636,   637,   638,     0,   639,   640,
+     641,   642,   643,   644,   645,   646,   647,   648,     0,   649,
+     650,   651,   652,   653,   654,   655,   656,   657,   658,   659,
+     660,   661,   662,   663,   664,   665,   666,   667,   668,   669,
+     670,   671,   672,     0,   870,   674,   675,   676,   677,   678,
+     679,     0,   680,   681,   682,   683,   684,   685,   686,   687,
+     688,   689,   690,   691,   692,   693,   694,   695,   696,   697,
+     698,   699,   700,   701,   702,   703,   704,   705,   706,   707,
+     708,   709,   871,   711,   712,   713,   714,   715,   716,   717,
+     718,   719,   720,     0,     0,     0,     0,     0,   872,   873,
+       0,     0,     0,     0,   875,     0,   876,     0,     0,     0,
+     877,     0,     0,     0,   878,   879,   243,   244,     0,   760,
+     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
+       0,   251,     0,     0,   761,     0,   253,   254,   255,   256,
+     762,   258,     0,   259,     0,     0,   763,   260,   764,   765,
+     766,   261,   767,     0,   262,   263,   264,  2037,   265,     0,
+     266,   267,     0,     0,   268,   768,   769,   269,   270,     0,
+     271,   272,   770,   771,   274,     0,   275,   276,   277,   278,
+     772,   280,     0,   773,   282,     0,   283,   284,   285,   286,
+     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
+       0,   296,   297,   298,   299,   300,     0,   774,   775,   301,
+       0,     0,     0,   776,   302,   777,     0,   303,   778,   779,
+       0,   304,   305,   306,   780,   781,   782,     0,     0,     0,
+       0,   783,   309,   784,     0,     0,   785,   310,   311,     0,
+     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
+     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
+       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
+     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
+     334,   335,   786,     0,   336,   337,   338,   339,   340,   787,
+     788,   341,   342,     0,   343,   344,   345,   346,   347,   789,
+       0,   348,   349,     0,     0,     0,   790,   351,     0,   352,
+       0,     0,     0,   353,     0,   354,   791,   356,   792,     0,
+     358,     0,   359,     0,   793,     0,   360,   361,     0,   362,
+     794,     0,   363,   364,     0,     0,     0,   795,   366,   367,
+     368,   796,     0,   369,   370,   371,     0,     0,   372,     0,
+       0,     0,   797,   373,   374,   375,   798,     0,     0,   376,
+       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
+       0,   381,     0,   382,     0,     0,   383,   384,     0,  2038,
+     385,     0,   799,   386,   387,     0,     0,     0,     0,     0,
+     800,   389,     0,   390,     0,   391,     0,   392,   393,     0,
+       0,   801,     0,     0,     0,     0,   394,     0,   395,   396,
+     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
+     407,   408,   409,   410,   411,     0,   412,   413,   414,   802,
+     415,   416,   417,   418,   803,   419,   420,     0,     0,     0,
+       0,   421,   422,   423,   424,   804,   426,     0,     0,   805,
+     428,   806,   429,     0,   430,   807,   808,   809,   810,   811,
+     435,   436,   437,   438,   439,     0,   812,   440,   441,     0,
+       0,   442,   443,   444,   445,   446,   813,   814,   815,   447,
+     448,     0,   816,   817,   449,     0,   450,   451,     0,   452,
+     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   456,   457,   458,   818,   459,     0,
+     460,     0,   461,   462,   463,   464,   465,   466,   467,   819,
+     820,   470,   821,   471,     0,   472,   473,   474,     0,   475,
+       0,   476,   477,   478,   479,   480,     0,   822,   482,   483,
+       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
+     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
+     495,     0,   496,   497,   498,   823,   824,   499,   500,   501,
+     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
+       0,   510,   511,   512,     0,   825,     0,   826,   514,   515,
+     516,   517,     0,   518,   827,   828,   520,   521,   522,   523,
+       0,   829,   525,     0,     0,     0,   526,   527,   528,   529,
+       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
+     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
+       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
+       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
+     550,   551,   552,   553,   830,   831,   554,   555,     0,     0,
+     556,   557,   832,   559,   560,   561,   833,   834,   562,   563,
+     564,   565,   835,   566,   567,     0,     0,   568,   569,   570,
+     571,     0,   836,   572,   573,     0,   837,   838,   839,   840,
+       0,     0,     0,     0,  2039,   578,   579,     0,   841,   842,
+     843,   581,   582,     0,   844,   583,   584,   845,   585,   586,
+       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
+     591,     0,   846,   593,     0,     0,   847,   848,   849,   594,
+     850,   595,     0,     0,   596,   851,     0,   852,   597,     0,
+     598,   599,   853,   854,     0,     0,     0,     0,     0,     0,
+     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
+     855,     0,     0,   610,   611,   612,   613,   614,     0,   615,
+       0,     0,     0,     0,     0,   856,   857,     0,   616,   617,
+     618,   858,   619,   620,   621,     0,   622,   859,   860,   623,
+     861,   624,     0,   862,   863,   864,   865,   866,   625,   626,
+       0,   867,   627,   868,   628,   869,   629,   630,     0,     0,
+       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
+     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
+       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
+     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
+     668,   669,   670,   671,   672,     0,   870,   674,   675,   676,
+     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
+     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
+     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
+     706,   707,   708,   709,   871,   711,   712,   713,   714,   715,
+     716,   717,   718,   719,   720,     0,     0,     0,     0,     0,
+     872,   873,     0,     0,     0,     0,   875,     0,   876,     0,
+       0,     0,   877,     0,     0,     0,   878,   879,   243,   244,
+       0,   760,   246,   247,   248,   249,  2292,     0,   250,     0,
+       0,     0,     0,   251,     0,     0,   761,     0,   253,   254,
+     255,   256,   762,   258,     0,   259,     0,     0,  2293,   260,
+     764,   765,   766,   261,   767,     0,   262,   263,   264,     0,
+     265,     0,   266,   267,     0,     0,   268,   768,   769,   269,
+     270,     0,   271,   272,   770,   771,   274,     0,   275,   276,
+     277,   278,   772,   280,     0,   773,   282,     0,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,     0,
+     294,   295,     0,   296,   297,   298,   299,   300,     0,   774,
+     775,   301,     0,     0,     0,   776,   302,   777,     0,   303,
+     778,   779,     0,   304,   305,   306,   780,   781,   782,     0,
+       0,     0,     0,   783,   309,   784,     0,     0,  2294,   310,
+     311,     0,   312,     0,     0,     0,     0,     0,   313,   314,
+     315,   316,   317,     0,     0,     0,   318,     0,     0,   319,
+     320,   321,     0,     0,     0,   322,     0,   323,   324,     0,
+     325,   326,   327,     0,     0,   328,   329,     0,   330,   331,
+     332,   333,   334,   335,   786,     0,   336,   337,   338,   339,
+     340,   787,   788,   341,   342,     0,   343,   344,   345,   346,
+     347,   789,     0,   348,   349,     0,     0,     0,   790,   351,
+       0,   352,     0,     0,     0,   353,     0,   354,   791,   356,
+     792,     0,   358,     0,   359,     0,   793,     0,   360,   361,
+       0,   362,   794,     0,   363,   364,     0,     0,     0,   795,
+     366,   367,   368,   796,     0,   369,   370,   371,     0,     0,
+     372,     0,     0,     0,   797,   373,   374,   375,   798,     0,
+       0,   376,     0,     0,     0,   377,   378,     0,   379,   380,
+       0,     0,     0,   381,     0,   382,     0,     0,   383,   384,
+       0,     0,   385,     0,   799,   386,   387,     0,     0,     0,
+       0,     0,   800,   389,     0,   390,     0,   391,     0,   392,
+     393,     0,     0,   801,     0,     0,     0,     0,   394,     0,
+     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
+     405,   406,   407,   408,   409,   410,   411,     0,   412,   413,
+     414,   802,   415,   416,   417,   418,   803,   419,   420,     0,
+       0,     0,     0,   421,   422,   423,   424,   804,   426,     0,
+       0,   805,   428,   806,   429,     0,   430,   807,   808,   809,
+     810,   811,   435,   436,   437,   438,   439,     0,   812,   440,
+     441,     0,     0,   442,   443,   444,   445,   446,   813,   814,
+     815,   447,   448,     0,   816,   817,   449,     0,   450,   451,
+    2295,   452,   453,   454,     0,     0,   455,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   456,   457,   458,   818,
+     459,     0,   460,     0,   461,   462,   463,   464,   465,   466,
+     467,   819,   820,   470,   821,   471,     0,   472,   473,   474,
+       0,   475,     0,   476,   477,   478,   479,   480,     0,   822,
+     482,   483,     0,     0,   484,     0,     0,     0,   485,   486,
+       0,   487,   488,     0,     0,   489,   490,   491,   492,   493,
+       0,   494,   495,     0,   496,   497,   498,   823,   824,   499,
+     500,   501,   502,   503,   504,   505,   506,     0,   507,     0,
+     508,   509,     0,   510,   511,   512,     0,   825,     0,   826,
+     514,   515,   516,   517,     0,   518,  2296,   828,   520,   521,
+     522,   523,     0,   829,   525,     0,     0,     0,   526,   527,
+     528,   529,     0,     0,     0,   530,     0,     0,     0,   531,
+       0,   532,   533,   534,   535,     0,   536,   537,   538,   539,
+     540,     0,     0,     0,     0,     0,   541,   542,   543,     0,
+     544,     0,     0,   545,     0,     0,   546,     0,   547,     0,
+     548,   549,   550,   551,   552,   553,   830,   831,   554,   555,
+       0,     0,   556,   557,   832,   559,   560,   561,   833,   834,
+     562,   563,   564,   565,   835,   566,   567,     0,     0,   568,
+     569,   570,   571,     0,   836,   572,   573,     0,   837,   838,
+     839,   840,     0,     0,     0,     0,     0,   578,   579,     0,
+     841,   842,   843,   581,   582,     0,   844,   583,   584,   845,
+     585,   586,     0,   587,   588,     0,     0,   589,     0,     0,
+     590,     0,   591,     0,   846,   593,     0,     0,   847,   848,
+     849,   594,   850,   595,     0,     0,   596,   851,     0,   852,
+     597,     0,   598,   599,   853,   854,     0,     0,     0,     0,
+       0,     0,   602,   603,   604,     0,   605,   606,   607,   608,
+       0,     0,   855,     0,     0,   610,   611,   612,   613,   614,
+       0,   615,     0,     0,     0,     0,     0,   856,   857,     0,
+     616,   617,   618,   858,   619,   620,   621,     0,   622,   859,
+     860,   623,   861,   624,     0,   862,   863,   864,   865,   866,
+     625,   626,     0,   867,   627,   868,   628,   869,   629,   630,
+       0,     0,     0,   631,   632,   633,   634,   635,   636,   637,
+     638,  2297,   639,   640,   641,   642,   643,   644,   645,   646,
+     647,   648,     0,   649,   650,   651,   652,   653,   654,   655,
+     656,   657,   658,   659,   660,   661,   662,   663,   664,   665,
+     666,   667,   668,   669,   670,   671,   672,     0,   870,   674,
+     675,   676,   677,   678,   679,     0,   680,   681,   682,   683,
+     684,   685,   686,   687,   688,   689,   690,   691,   692,   693,
+     694,   695,   696,   697,   698,   699,   700,   701,   702,   703,
+     704,   705,   706,   707,   708,   709,   871,   711,   712,   713,
+     714,   715,   716,   717,   718,   719,   720,     0,     0,     0,
+       0,     0,   872,   873,     0,     0,     0,     0,   875,     0,
+     876,     0,     0,     0,   877,     0,     0,     0,   878,   879,
+     243,   244,     0,   760,   246,   247,   248,   249,     0,     0,
+     250,     0,     0,     0,     0,   251,     0,     0,   761,     0,
+     253,   254,   255,   256,   762,   258,     0,   259,     0,     0,
+     763,   260,   764,   765,   766,   261,   767,     0,   262,   263,
+     264,     0,   265,     0,   266,   267,     0,     0,   268,   768,
+     769,   269,   270,     0,   271,   272,   770,   771,   274,     0,
+     275,   276,   277,   278,   772,   280,     0,   773,   282,     0,
+     283,   284,   285,   286,   287,   288,   289,   290,   291,   292,
+     293,     0,   294,   295,     0,   296,   297,   298,   299,   300,
+       0,   774,   775,   301,     0,     0,     0,   776,   302,   777,
+       0,   303,   778,   779,     0,   304,   305,   306,   780,   781,
+     782,     0,     0,     0,     0,   783,   309,   784,     0,     0,
+     785,   310,   311,     0,   312,     0,     0,     0,     0,     0,
+     313,   314,   315,   316,   317,     0,     0,     0,   318,     0,
+       0,   319,   320,   321,     0,     0,     0,   322,     0,   323,
+     324,     0,   325,   326,   327,     0,     0,   328,   329,     0,
+     330,   331,   332,   333,   334,   335,   786,     0,   336,   337,
+     338,   339,   340,   787,   788,   341,   342,     0,   343,   344,
+     345,   346,   347,   789,     0,   348,   349,     0,     0,     0,
+     790,   351,     0,   352,     0,     0,     0,   353,     0,   354,
+     791,   356,   792,     0,   358,     0,   359,     0,   793,     0,
+     360,   361,     0,   362,   794,     0,   363,   364,     0,     0,
+       0,   795,   366,   367,   368,   796,     0,   369,   370,   371,
+       0,     0,   372,     0,     0,     0,   797,   373,   374,   375,
+     798,     0,     0,   376,     0,     0,     0,   377,   378,     0,
+     379,   380,     0,     0,     0,   381,     0,   382,     0,     0,
+     383,   384,     0,     0,   385,     0,   799,   386,   387,     0,
+       0,     0,     0,     0,   800,   389,     0,   390,     0,   391,
+       0,   392,   393,     0,     0,   801,     0,     0,     0,     0,
+     394,     0,   395,   396,   397,   398,   399,   400,   401,   402,
+     403,   404,   405,   406,   407,   408,   409,   410,   411,     0,
+     412,   413,   414,   802,   415,   416,   417,   418,   803,   419,
+     420,     0,     0,     0,     0,   421,   422,   423,   424,   804,
+     426,     0,     0,   805,   428,   806,   429,     0,   430,   807,
+     808,   809,   810,   811,   435,   436,   437,   438,   439,     0,
+     812,   440,   441,     0,     0,   442,   443,   444,   445,   446,
+     813,   814,   815,   447,   448,     0,   816,   817,   449,     0,
+     450,   451,     0,   452,   453,   454,     0,     0,   455,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   456,   457,
+     458,   818,   459,     0,   460,     0,   461,   462,   463,   464,
+     465,   466,   467,   819,   820,   470,   821,   471,     0,   472,
+     473,   474,     0,   475,     0,   476,   477,   478,   479,   480,
+       0,   822,   482,   483,     0,     0,   484,     0,     0,     0,
+     485,   486,     0,   487,   488,     0,     0,   489,   490,   491,
+     492,   493,     0,   494,   495,     0,   496,   497,   498,   823,
+     824,   499,   500,   501,   502,   503,   504,   505,   506,     0,
+     507,     0,   508,   509,     0,   510,   511,   512,     0,   825,
+       0,   826,   514,   515,   516,   517,     0,   518,   827,   828,
+     520,   521,   522,   523,     0,   829,   525,     0,     0,     0,
+     526,   527,   528,   529,     0,     0,     0,   530,     0,     0,
+       0,   531,     0,   532,   533,   534,   535,     0,   536,   537,
+     538,   539,   540,     0,     0,     0,     0,     0,   541,   542,
+     543,     0,   544,     0,     0,   545,     0,     0,   546,     0,
+     547,     0,   548,   549,   550,   551,   552,   553,   830,   831,
+     554,   555,     0,     0,   556,   557,   832,   559,   560,   561,
+     833,   834,   562,   563,   564,   565,   835,   566,   567,     0,
+       0,   568,   569,   570,   571,     0,   836,   572,   573,     0,
+     837,   838,   839,   840,     0,     0,     0,     0,     0,   578,
+     579,     0,   841,   842,   843,   581,   582,     0,   844,   583,
+     584,   845,   585,   586,     0,   587,   588,     0,     0,   589,
+       0,     0,   590,     0,   591,     0,   846,   593,     0,     0,
+     847,   848,   849,   594,   850,   595,     0,     0,   596,   851,
+       0,   852,   597,     0,   598,   599,   853,   854,     0,     0,
+       0,     0,     0,     0,   602,   603,   604,     0,   605,   606,
+     607,   608,     0,     0,   855,     0,     0,   610,   611,   612,
+     613,   614,     0,   615,     0,     0,     0,     0,     0,   856,
+     857,     0,   616,   617,   618,   858,   619,   620,   621,     0,
+     622,   859,   860,   623,   861,   624,     0,   862,   863,   864,
+     865,   866,   625,   626,     0,   867,   627,   868,   628,   869,
+     629,   630,     0,     0,     0,   631,   632,   633,   634,   635,
+     636,   637,   638,     0,   639,   640,   641,   642,   643,   644,
+     645,   646,   647,   648,     0,   649,   650,   651,   652,   653,
+     654,   655,   656,   657,   658,   659,   660,   661,   662,   663,
+     664,   665,   666,   667,   668,   669,   670,   671,   672,     0,
+     870,   674,   675,   676,   677,   678,   679,     0,   680,   681,
+     682,   683,   684,   685,   686,   687,   688,   689,   690,   691,
+     692,   693,   694,   695,   696,   697,   698,   699,   700,   701,
+     702,   703,   704,   705,   706,   707,   708,   709,   871,   711,
+     712,   713,   714,   715,   716,   717,   718,   719,   720,     0,
+       0,     0,     0,     0,   872,   873,   874,     0,     0,     0,
+     875,     0,   876,     0,     0,     0,   877,     0,     0,     0,
+     878,   879,   243,   244,     0,   760,   246,   247,   248,   249,
+       0,     0,   250,     0,     0,     0,     0,   251,     0,     0,
+     761,     0,   253,   254,   255,   256,   762,   258,     0,   259,
+       0,     0,   763,   260,   764,   765,   766,   261,   767,     0,
      262,   263,   264,     0,   265,     0,   266,   267,     0,     0,
-     268,   759,   760,   269,   270,     0,   271,   272,   761,   762,
-     274,     0,   275,   276,   277,   278,   763,   280,     0,   764,
+     268,   768,   769,   269,   270,     0,   271,   272,   770,   771,
+     274,     0,   275,   276,   277,   278,   772,   280,     0,   773,
      282,     0,   283,   284,   285,   286,   287,   288,   289,   290,
      291,   292,   293,     0,   294,   295,     0,   296,   297,   298,
-     299,   300,     0,   765,   766,   301,     0,     0,     0,   767,
-     302,   768,     0,   303,   769,   770,   953,   304,   305,   306,
-     771,   772,   773,     0,     0,     0,     0,   774,   309,   775,
-       0,     0,   776,   310,   311,     0,   312,     0,     0,     0,
-    5262,  5263,   313,   314,   315,   316,   317,     0,     0,     0,
+     299,   300,     0,   774,   775,   301,     0,     0,     0,   776,
+     302,   777,     0,   303,   778,   779,     0,   304,   305,   306,
+     780,   781,   782,     0,     0,     0,     0,   783,   309,   784,
+       0,     0,   785,   310,   311,     0,   312,     0,     0,     0,
+       0,     0,   313,   314,   315,   316,   317,     0,     0,     0,
      318,     0,     0,   319,   320,   321,     0,     0,     0,   322,
        0,   323,   324,     0,   325,   326,   327,     0,     0,   328,
-     329,     0,   330,   331,   332,   333,   334,   335,   777,     0,
-     336,   337,   338,   339,   340,   778,   779,   341,   342,     0,
-     343,   344,   345,   346,   347,   780,     0,   348,   349,     0,
-       0,     0,   781,   351,     0,   352,     0,     0,     0,   353,
-       0,   354,   782,   356,   783,     0,   358,     0,   359,     0,
-     784,     0,   360,   361,     0,   362,   785,     0,   363,   364,
-       0,     0,     0,   786,   366,   367,   368,   787,     0,   369,
-     370,   371,     0,     0,   372,     0,     0,     0,   788,   373,
-     374,   375,   789,     0,     0,   376,     0,     0,     0,   377,
+     329,     0,   330,   331,   332,   333,   334,   335,   786,     0,
+     336,   337,   338,   339,   340,   787,   788,   341,   342,     0,
+     343,   344,   345,   346,   347,   789,     0,   348,   349,     0,
+       0,     0,   790,   351,     0,   352,     0,     0,     0,   353,
+       0,   354,   791,   356,   792,     0,   358,     0,   359,     0,
+     793,     0,   360,   361,     0,   362,   794,     0,   363,   364,
+       0,     0,     0,   795,   366,   367,   368,   796,     0,   369,
+     370,   371,     0,     0,   372,     0,     0,     0,   797,   373,
+     374,   375,   798,     0,     0,   376,     0,     0,     0,   377,
      378,     0,   379,   380,     0,     0,     0,   381,     0,   382,
-       0,     0,   383,   384,     0,     0,   385,     0,   790,   386,
-     387,     0,     0,     0,     0,     0,   791,   389,     0,   390,
-       0,   391,     0,   392,   393,     0,     0,   792,     0,     0,
+       0,     0,   383,   384,     0,     0,   385,     0,   799,   386,
+     387,     0,     0,     0,     0,     0,   800,   389,     0,   390,
+       0,   391,     0,   392,   393,     0,     0,   801,     0,     0,
        0,     0,   394,     0,   395,   396,   397,   398,   399,   400,
      401,   402,   403,   404,   405,   406,   407,   408,   409,   410,
-     411,     0,   412,   413,   414,   793,   415,   416,   417,   418,
-     794,   419,   420,     0,     0,     0,     0,   421,   422,   423,
-     424,   795,   426,     0,     0,   796,   428,   797,   429,     0,
-     430,   798,   799,   800,   801,   802,   435,   436,   437,   438,
-     439,     0,   803,   440,   441,     0,     0,   442,   443,   444,
-     445,   446,   804,   805,   806,   447,   448,     0,   807,   808,
+     411,     0,   412,   413,   414,   802,   415,   416,   417,   418,
+     803,   419,   420,     0,     0,     0,     0,   421,   422,   423,
+     424,   804,   426,     0,     0,   805,   428,   806,   429,     0,
+     430,   807,   808,   809,   810,   811,   435,   436,   437,   438,
+     439,     0,   812,   440,   441,     0,     0,   442,   443,   444,
+     445,   446,   813,   814,   815,   447,   448,     0,   816,   817,
      449,     0,   450,   451,     0,   452,   453,   454,     0,     0,
      455,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     456,   457,   458,   809,   459,     0,   460,     0,   461,   462,
-     463,   464,   465,   466,   467,   810,   811,   470,   812,   471,
+     456,   457,   458,   818,   459,     0,   460,     0,   461,   462,
+     463,   464,   465,   466,   467,   819,   820,   470,   821,   471,
        0,   472,   473,   474,     0,   475,     0,   476,   477,   478,
-     479,   480,     0,   813,   482,   483,     0,     0,   484,     0,
+     479,   480,     0,   822,   482,   483,     0,     0,   484,     0,
        0,     0,   485,   486,     0,   487,   488,     0,     0,   489,
      490,   491,   492,   493,     0,   494,   495,     0,   496,   497,
-     498,   814,   815,   499,   500,   501,   502,   503,   504,   505,
+     498,   823,   824,   499,   500,   501,   502,   503,   504,   505,
      506,     0,   507,     0,   508,   509,     0,   510,   511,   512,
-       0,   816,     0,   817,   514,   515,   516,   517,     0,   518,
-     818,   819,   520,   521,   522,   523,     0,   820,   525,    42,
+       0,   825,     0,   826,   514,   515,   516,   517,     0,   518,
+     827,   828,   520,   521,   522,   523,     0,   829,   525,     0,
        0,     0,   526,   527,   528,   529,     0,     0,     0,   530,
        0,     0,     0,   531,     0,   532,   533,   534,   535,     0,
      536,   537,   538,   539,   540,     0,     0,     0,     0,     0,
      541,   542,   543,     0,   544,     0,     0,   545,     0,     0,
      546,     0,   547,     0,   548,   549,   550,   551,   552,   553,
-     821,   822,   554,   555,     0,     0,   556,   557,   823,   559,
-     560,   561,   824,   825,   562,   563,   564,   565,   826,   566,
-     567,     0,    49,   568,   569,   570,   571,     0,   827,   572,
-     573,     0,   828,   829,   830,   831,     0,     0,     0,     0,
-       0,   578,   579,     0,   832,   833,   834,   581,   582,     0,
-     835,   583,   584,   836,   585,   586,     0,   587,   588,     0,
-       0,   589,     0,     0,   590,     0,   591,     0,   837,   593,
-       0,     0,   838,   839,   840,   594,  1347,   595,     0,     0,
-     596,   842,     0,   843,   597,     0,   598,   599,   844,   845,
-       0,     0,     0,    55,     0,     0,   602,   603,   604,     0,
-     605,   606,   607,   608,     0,     0,   846,     0,     0,   610,
+     830,   831,   554,   555,     0,     0,   556,   557,   832,   559,
+     560,   561,   833,   834,   562,   563,   564,   565,   835,   566,
+     567,     0,     0,   568,   569,   570,   571,     0,   836,   572,
+     573,     0,   837,   838,   839,   840,     0,     0,     0,     0,
+       0,   578,   579,     0,   841,   842,   843,   581,   582,     0,
+     844,   583,   584,   845,   585,   586,     0,   587,   588,     0,
+       0,   589,     0,     0,   590,     0,   591,     0,   846,   593,
+       0,     0,   847,   848,   849,   594,   850,   595,     0,     0,
+     596,   851,     0,   852,   597,     0,   598,   599,   853,   854,
+       0,     0,     0,     0,     0,     0,   602,   603,   604,     0,
+     605,   606,   607,   608,     0,     0,   855,     0,     0,   610,
      611,   612,   613,   614,     0,   615,     0,     0,     0,     0,
-       0,   847,   848,     0,   616,   617,   618,   849,   619,   620,
-     621,     0,   622,   850,   851,   623,   852,   624,     0,   853,
-     854,   855,   856,   857,   625,   626,     0,   858,   627,   859,
-     628,   860,   629,   630,     0,     0,     0,   631,   632,   633,
+       0,   856,   857,     0,   616,   617,   618,   858,   619,   620,
+     621,     0,   622,   859,   860,   623,   861,   624,     0,   862,
+     863,   864,   865,   866,   625,   626,     0,   867,   627,   868,
+     628,   869,   629,   630,     0,     0,     0,   631,   632,   633,
      634,   635,   636,   637,   638,     0,   639,   640,   641,   642,
      643,   644,   645,   646,   647,   648,     0,   649,   650,   651,
      652,   653,   654,   655,   656,   657,   658,   659,   660,   661,
      662,   663,   664,   665,   666,   667,   668,   669,   670,   671,
-     672,     0,   861,   674,   675,   676,   677,   678,   679,     0,
+     672,     0,   870,   674,   675,   676,   677,   678,   679,     0,
      680,   681,   682,   683,   684,   685,   686,   687,   688,   689,
      690,   691,   692,   693,   694,   695,   696,   697,   698,   699,
      700,   701,   702,   703,   704,   705,   706,   707,   708,   709,
-     862,   711,     0,     0,     0,     0,     0,   863,   864,     0,
-       0,     0,     0,   866,     0,   867,     0,     0,     0,   868,
-       0,     0,     0,   869,   870,   243,   244,     0,   751,   246,
-     247,   248,   249,     0,     0,   250,     0,     0,     0,     0,
-     251,     0,     0,   752,     0,   253,   254,   255,   256,   753,
-     258,     0,   259,     0,     0,   754,   260,   755,   756,   757,
-     261,   758,     0,   262,   263,   264,  2013,   265,     0,   266,
-     267,     0,     0,   268,   759,   760,   269,   270,     0,   271,
-     272,   761,   762,   274,     0,   275,   276,   277,   278,   763,
-     280,     0,   764,   282,     0,   283,   284,   285,   286,   287,
-     288,   289,   290,   291,   292,   293,     0,   294,   295,     0,
-     296,   297,   298,   299,   300,     0,   765,   766,   301,     0,
-       0,     0,   767,   302,   768,     0,   303,   769,   770,     0,
-     304,   305,   306,   771,   772,   773,     0,     0,     0,     0,
-     774,   309,   775,     0,     0,   776,   310,   311,     0,   312,
-       0,     0,     0,     0,     0,   313,   314,   315,   316,   317,
-       0,     0,     0,   318,     0,     0,   319,   320,   321,     0,
-       0,     0,   322,     0,   323,   324,     0,   325,   326,   327,
-       0,     0,   328,   329,     0,   330,   331,   332,   333,   334,
-     335,   777,     0,   336,   337,   338,   339,   340,   778,   779,
-     341,   342,     0,   343,   344,   345,   346,   347,   780,     0,
-     348,   349,     0,     0,     0,   781,   351,     0,   352,     0,
-       0,     0,   353,     0,   354,   782,   356,   783,     0,   358,
-       0,   359,     0,   784,     0,   360,   361,     0,   362,   785,
-       0,   363,   364,     0,     0,     0,   786,   366,   367,   368,
-     787,     0,   369,   370,   371,     0,     0,   372,     0,     0,
-       0,   788,   373,   374,   375,   789,     0,     0,   376,     0,
-       0,     0,   377,   378,     0,   379,   380,     0,     0,     0,
-     381,     0,   382,     0,     0,   383,   384,     0,  2014,   385,
-       0,   790,   386,   387,     0,     0,     0,     0,     0,   791,
-     389,     0,   390,     0,   391,     0,   392,   393,     0,     0,
-     792,     0,     0,     0,     0,   394,     0,   395,   396,   397,
-     398,   399,   400,   401,   402,   403,   404,   405,   406,   407,
-     408,   409,   410,   411,     0,   412,   413,   414,   793,   415,
-     416,   417,   418,   794,   419,   420,     0,     0,     0,     0,
-     421,   422,   423,   424,   795,   426,     0,     0,   796,   428,
-     797,   429,     0,   430,   798,   799,   800,   801,   802,   435,
-     436,   437,   438,   439,     0,   803,   440,   441,     0,     0,
-     442,   443,   444,   445,   446,   804,   805,   806,   447,   448,
-       0,   807,   808,   449,     0,   450,   451,     0,   452,   453,
-     454,     0,     0,   455,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   456,   457,   458,   809,   459,     0,   460,
-       0,   461,   462,   463,   464,   465,   466,   467,   810,   811,
-     470,   812,   471,     0,   472,   473,   474,     0,   475,     0,
-     476,   477,   478,   479,   480,     0,   813,   482,   483,     0,
-       0,   484,     0,     0,     0,   485,   486,     0,   487,   488,
-       0,     0,   489,   490,   491,   492,   493,     0,   494,   495,
-       0,   496,   497,   498,   814,   815,   499,   500,   501,   502,
-     503,   504,   505,   506,     0,   507,     0,   508,   509,     0,
-     510,   511,   512,     0,   816,     0,   817,   514,   515,   516,
-     517,     0,   518,   818,   819,   520,   521,   522,   523,     0,
-     820,   525,     0,     0,     0,   526,   527,   528,   529,     0,
-       0,     0,   530,     0,     0,     0,   531,     0,   532,   533,
-     534,   535,     0,   536,   537,   538,   539,   540,     0,     0,
-       0,     0,     0,   541,   542,   543,     0,   544,     0,     0,
-     545,     0,     0,   546,     0,   547,     0,   548,   549,   550,
-     551,   552,   553,   821,   822,   554,   555,     0,     0,   556,
-     557,   823,   559,   560,   561,   824,   825,   562,   563,   564,
-     565,   826,   566,   567,     0,     0,   568,   569,   570,   571,
-       0,   827,   572,   573,     0,   828,   829,   830,   831,     0,
-       0,     0,     0,  2015,   578,   579,     0,   832,   833,   834,
-     581,   582,     0,   835,   583,   584,   836,   585,   586,     0,
-     587,   588,     0,     0,   589,     0,     0,   590,     0,   591,
-       0,   837,   593,     0,     0,   838,   839,   840,   594,   841,
-     595,     0,     0,   596,   842,     0,   843,   597,     0,   598,
-     599,   844,   845,     0,     0,     0,     0,     0,     0,   602,
-     603,   604,     0,   605,   606,   607,   608,     0,     0,   846,
-       0,     0,   610,   611,   612,   613,   614,     0,   615,     0,
-       0,     0,     0,     0,   847,   848,     0,   616,   617,   618,
-     849,   619,   620,   621,     0,   622,   850,   851,   623,   852,
-     624,     0,   853,   854,   855,   856,   857,   625,   626,     0,
-     858,   627,   859,   628,   860,   629,   630,     0,     0,     0,
-     631,   632,   633,   634,   635,   636,   637,   638,     0,   639,
-     640,   641,   642,   643,   644,   645,   646,   647,   648,     0,
-     649,   650,   651,   652,   653,   654,   655,   656,   657,   658,
-     659,   660,   661,   662,   663,   664,   665,   666,   667,   668,
-     669,   670,   671,   672,     0,   861,   674,   675,   676,   677,
-     678,   679,     0,   680,   681,   682,   683,   684,   685,   686,
-     687,   688,   689,   690,   691,   692,   693,   694,   695,   696,
-     697,   698,   699,   700,   701,   702,   703,   704,   705,   706,
-     707,   708,   709,   862,   711,     0,     0,     0,     0,     0,
-     863,   864,     0,     0,     0,     0,   866,     0,   867,     0,
-       0,     0,   868,     0,     0,     0,   869,   870,   243,   244,
-       0,   751,   246,   247,   248,   249,  2268,     0,   250,     0,
-       0,     0,     0,   251,     0,     0,   752,     0,   253,   254,
-     255,   256,   753,   258,     0,   259,     0,     0,  2269,   260,
-     755,   756,   757,   261,   758,     0,   262,   263,   264,     0,
-     265,     0,   266,   267,     0,     0,   268,   759,   760,   269,
-     270,     0,   271,   272,   761,   762,   274,     0,   275,   276,
-     277,   278,   763,   280,     0,   764,   282,     0,   283,   284,
-     285,   286,   287,   288,   289,   290,   291,   292,   293,     0,
-     294,   295,     0,   296,   297,   298,   299,   300,     0,   765,
-     766,   301,     0,     0,     0,   767,   302,   768,     0,   303,
-     769,   770,     0,   304,   305,   306,   771,   772,   773,     0,
-       0,     0,     0,   774,   309,   775,     0,     0,  2270,   310,
-     311,     0,   312,     0,     0,     0,     0,     0,   313,   314,
-     315,   316,   317,     0,     0,     0,   318,     0,     0,   319,
-     320,   321,     0,     0,     0,   322,     0,   323,   324,     0,
-     325,   326,   327,     0,     0,   328,   329,     0,   330,   331,
-     332,   333,   334,   335,   777,     0,   336,   337,   338,   339,
-     340,   778,   779,   341,   342,     0,   343,   344,   345,   346,
-     347,   780,     0,   348,   349,     0,     0,     0,   781,   351,
-       0,   352,     0,     0,     0,   353,     0,   354,   782,   356,
-     783,     0,   358,     0,   359,     0,   784,     0,   360,   361,
-       0,   362,   785,     0,   363,   364,     0,     0,     0,   786,
-     366,   367,   368,   787,     0,   369,   370,   371,     0,     0,
-     372,     0,     0,     0,   788,   373,   374,   375,   789,     0,
-       0,   376,     0,     0,     0,   377,   378,     0,   379,   380,
-       0,     0,     0,   381,     0,   382,     0,     0,   383,   384,
-       0,     0,   385,     0,   790,   386,   387,     0,     0,     0,
-       0,     0,   791,   389,     0,   390,     0,   391,     0,   392,
-     393,     0,     0,   792,     0,     0,     0,     0,   394,     0,
-     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
-     405,   406,   407,   408,   409,   410,   411,     0,   412,   413,
-     414,   793,   415,   416,   417,   418,   794,   419,   420,     0,
-       0,     0,     0,   421,   422,   423,   424,   795,   426,     0,
-       0,   796,   428,   797,   429,     0,   430,   798,   799,   800,
-     801,   802,   435,   436,   437,   438,   439,     0,   803,   440,
-     441,     0,     0,   442,   443,   444,   445,   446,   804,   805,
-     806,   447,   448,     0,   807,   808,   449,     0,   450,   451,
-    2271,   452,   453,   454,     0,     0,   455,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   456,   457,   458,   809,
-     459,     0,   460,     0,   461,   462,   463,   464,   465,   466,
-     467,   810,   811,   470,   812,   471,     0,   472,   473,   474,
-       0,   475,     0,   476,   477,   478,   479,   480,     0,   813,
-     482,   483,     0,     0,   484,     0,     0,     0,   485,   486,
-       0,   487,   488,     0,     0,   489,   490,   491,   492,   493,
-       0,   494,   495,     0,   496,   497,   498,   814,   815,   499,
-     500,   501,   502,   503,   504,   505,   506,     0,   507,     0,
-     508,   509,     0,   510,   511,   512,     0,   816,     0,   817,
-     514,   515,   516,   517,     0,   518,  2272,   819,   520,   521,
-     522,   523,     0,   820,   525,     0,     0,     0,   526,   527,
-     528,   529,     0,     0,     0,   530,     0,     0,     0,   531,
-       0,   532,   533,   534,   535,     0,   536,   537,   538,   539,
-     540,     0,     0,     0,     0,     0,   541,   542,   543,     0,
-     544,     0,     0,   545,     0,     0,   546,     0,   547,     0,
-     548,   549,   550,   551,   552,   553,   821,   822,   554,   555,
-       0,     0,   556,   557,   823,   559,   560,   561,   824,   825,
-     562,   563,   564,   565,   826,   566,   567,     0,     0,   568,
-     569,   570,   571,     0,   827,   572,   573,     0,   828,   829,
-     830,   831,     0,     0,     0,     0,     0,   578,   579,     0,
-     832,   833,   834,   581,   582,     0,   835,   583,   584,   836,
-     585,   586,     0,   587,   588,     0,     0,   589,     0,     0,
-     590,     0,   591,     0,   837,   593,     0,     0,   838,   839,
-     840,   594,   841,   595,     0,     0,   596,   842,     0,   843,
-     597,     0,   598,   599,   844,   845,     0,     0,     0,     0,
-       0,     0,   602,   603,   604,     0,   605,   606,   607,   608,
-       0,     0,   846,     0,     0,   610,   611,   612,   613,   614,
-       0,   615,     0,     0,     0,     0,     0,   847,   848,     0,
-     616,   617,   618,   849,   619,   620,   621,     0,   622,   850,
-     851,   623,   852,   624,     0,   853,   854,   855,   856,   857,
-     625,   626,     0,   858,   627,   859,   628,   860,   629,   630,
-       0,     0,     0,   631,   632,   633,   634,   635,   636,   637,
-     638,  2273,   639,   640,   641,   642,   643,   644,   645,   646,
-     647,   648,     0,   649,   650,   651,   652,   653,   654,   655,
-     656,   657,   658,   659,   660,   661,   662,   663,   664,   665,
-     666,   667,   668,   669,   670,   671,   672,     0,   861,   674,
-     675,   676,   677,   678,   679,     0,   680,   681,   682,   683,
-     684,   685,   686,   687,   688,   689,   690,   691,   692,   693,
-     694,   695,   696,   697,   698,   699,   700,   701,   702,   703,
-     704,   705,   706,   707,   708,   709,   862,   711,     0,     0,
-       0,     0,     0,   863,   864,     0,     0,     0,     0,   866,
-       0,   867,     0,     0,     0,   868,     0,     0,     0,   869,
-     870,   243,   244,     0,   751,   246,   247,   248,   249,     0,
-       0,   250,     0,     0,     0,     0,   251,     0,     0,   752,
-       0,   253,   254,   255,   256,   753,   258,     0,   259,     0,
-       0,   754,   260,   755,   756,   757,   261,   758,     0,   262,
-     263,   264,     0,   265,     0,   266,   267,     0,     0,   268,
-     759,   760,   269,   270,     0,   271,   272,   761,   762,   274,
-       0,   275,   276,   277,   278,   763,   280,     0,   764,   282,
-       0,   283,   284,   285,   286,   287,   288,   289,   290,   291,
-     292,   293,     0,   294,   295,     0,   296,   297,   298,   299,
-     300,     0,   765,   766,   301,     0,     0,     0,   767,   302,
-     768,     0,   303,   769,   770,     0,   304,   305,   306,   771,
-     772,   773,     0,     0,     0,     0,   774,   309,   775,     0,
-       0,   776,   310,   311,     0,   312,     0,     0,     0,     0,
-       0,   313,   314,   315,   316,   317,     0,     0,     0,   318,
-       0,     0,   319,   320,   321,     0,     0,     0,   322,     0,
-     323,   324,     0,   325,   326,   327,     0,     0,   328,   329,
-       0,   330,   331,   332,   333,   334,   335,   777,     0,   336,
-     337,   338,   339,   340,   778,   779,   341,   342,     0,   343,
-     344,   345,   346,   347,   780,     0,   348,   349,     0,     0,
-       0,   781,   351,     0,   352,     0,     0,     0,   353,     0,
-     354,   782,   356,   783,     0,   358,     0,   359,     0,   784,
-       0,   360,   361,     0,   362,   785,     0,   363,   364,     0,
-       0,     0,   786,   366,   367,   368,   787,     0,   369,   370,
-     371,     0,     0,   372,     0,     0,     0,   788,   373,   374,
-     375,   789,     0,     0,   376,     0,     0,     0,   377,   378,
-       0,   379,   380,     0,     0,     0,   381,     0,   382,     0,
-       0,   383,   384,     0,     0,   385,     0,   790,   386,   387,
-       0,     0,     0,     0,     0,   791,   389,     0,   390,     0,
-     391,     0,   392,   393,     0,     0,   792,     0,     0,     0,
-       0,   394,     0,   395,   396,   397,   398,   399,   400,   401,
-     402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
-       0,   412,   413,   414,   793,   415,   416,   417,   418,   794,
-     419,   420,     0,     0,     0,     0,   421,   422,   423,   424,
-     795,   426,     0,     0,   796,   428,   797,   429,     0,   430,
-     798,   799,   800,   801,   802,   435,   436,   437,   438,   439,
-       0,   803,   440,   441,     0,     0,   442,   443,   444,   445,
-     446,   804,   805,   806,   447,   448,     0,   807,   808,   449,
-       0,   450,   451,     0,   452,   453,   454,     0,     0,   455,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   456,
-     457,   458,   809,   459,     0,   460,     0,   461,   462,   463,
-     464,   465,   466,   467,   810,   811,   470,   812,   471,     0,
-     472,   473,   474,     0,   475,     0,   476,   477,   478,   479,
-     480,     0,   813,   482,   483,     0,     0,   484,     0,     0,
-       0,   485,   486,     0,   487,   488,     0,     0,   489,   490,
-     491,   492,   493,     0,   494,   495,     0,   496,   497,   498,
-     814,   815,   499,   500,   501,   502,   503,   504,   505,   506,
-       0,   507,     0,   508,   509,     0,   510,   511,   512,     0,
-     816,     0,   817,   514,   515,   516,   517,     0,   518,   818,
-     819,   520,   521,   522,   523,     0,   820,   525,     0,     0,
-       0,   526,   527,   528,   529,     0,     0,     0,   530,     0,
-       0,     0,   531,     0,   532,   533,   534,   535,     0,   536,
-     537,   538,   539,   540,     0,     0,     0,     0,     0,   541,
-     542,   543,     0,   544,     0,     0,   545,     0,     0,   546,
-       0,   547,     0,   548,   549,   550,   551,   552,   553,   821,
-     822,   554,   555,     0,     0,   556,   557,   823,   559,   560,
-     561,   824,   825,   562,   563,   564,   565,   826,   566,   567,
-       0,     0,   568,   569,   570,   571,     0,   827,   572,   573,
-       0,   828,   829,   830,   831,     0,     0,     0,     0,     0,
-     578,   579,     0,   832,   833,   834,   581,   582,     0,   835,
-     583,   584,   836,   585,   586,     0,   587,   588,     0,     0,
-     589,     0,     0,   590,     0,   591,     0,   837,   593,     0,
-       0,   838,   839,   840,   594,   841,   595,     0,     0,   596,
-     842,     0,   843,   597,     0,   598,   599,   844,   845,     0,
-       0,     0,     0,     0,     0,   602,   603,   604,     0,   605,
-     606,   607,   608,     0,     0,   846,     0,     0,   610,   611,
-     612,   613,   614,     0,   615,     0,     0,     0,     0,     0,
-     847,   848,     0,   616,   617,   618,   849,   619,   620,   621,
-       0,   622,   850,   851,   623,   852,   624,     0,   853,   854,
-     855,   856,   857,   625,   626,     0,   858,   627,   859,   628,
-     860,   629,   630,     0,     0,     0,   631,   632,   633,   634,
-     635,   636,   637,   638,     0,   639,   640,   641,   642,   643,
-     644,   645,   646,   647,   648,     0,   649,   650,   651,   652,
-     653,   654,   655,   656,   657,   658,   659,   660,   661,   662,
-     663,   664,   665,   666,   667,   668,   669,   670,   671,   672,
-       0,   861,   674,   675,   676,   677,   678,   679,     0,   680,
-     681,   682,   683,   684,   685,   686,   687,   688,   689,   690,
-     691,   692,   693,   694,   695,   696,   697,   698,   699,   700,
-     701,   702,   703,   704,   705,   706,   707,   708,   709,   862,
-     711,     0,     0,     0,     0,     0,   863,   864,   865,     0,
-       0,     0,   866,     0,   867,     0,     0,     0,   868,     0,
-       0,     0,   869,   870,   243,   244,     0,   751,   246,   247,
+     871,   711,   712,   713,   714,   715,   716,   717,   718,   719,
+     720,     0,     0,     0,     0,     0,   872,   873,  2757,     0,
+       0,     0,   875,     0,   876,     0,     0,     0,   877,     0,
+       0,     0,   878,   879,   243,   244,     0,   760,   246,   247,
      248,   249,     0,     0,   250,     0,     0,     0,     0,   251,
-       0,     0,   752,     0,   253,   254,   255,   256,   753,   258,
-       0,   259,     0,     0,   754,   260,   755,   756,   757,   261,
-     758,     0,   262,   263,   264,     0,   265,     0,   266,   267,
-       0,     0,   268,   759,   760,   269,   270,     0,   271,   272,
-     761,   762,   274,     0,   275,   276,   277,   278,   763,   280,
-       0,   764,   282,     0,   283,   284,   285,   286,   287,   288,
+       0,     0,   761,     0,   253,   254,   255,   256,   762,   258,
+       0,   259,     0,     0,   763,   260,   764,   765,   766,   261,
+     767,     0,   262,   263,   264,     0,   265,     0,   266,   267,
+       0,     0,   268,   768,   769,   269,   270,     0,   271,   272,
+     770,   771,   274,     0,   275,   276,   277,   278,   772,   280,
+       0,   773,   282,     0,   283,   284,   285,   286,   287,   288,
      289,   290,   291,   292,   293,     0,   294,   295,     0,   296,
-     297,   298,   299,   300,     0,   765,   766,   301,     0,     0,
-       0,   767,   302,   768,     0,   303,   769,   770,     0,   304,
-     305,   306,   771,   772,   773,     0,     0,     0,     0,   774,
-     309,   775,     0,     0,   776,   310,   311,     0,   312,     0,
+     297,   298,   299,   300,     0,   774,   775,   301,     0,     0,
+       0,   776,   302,   777,     0,   303,   778,   779,     0,   304,
+     305,   306,   780,   781,   782,     0,     0,     0,     0,   783,
+     309,   784,     0,     0,   785,   310,   311,     0,   312,     0,
        0,     0,     0,     0,   313,   314,   315,   316,   317,     0,
        0,     0,   318,     0,     0,   319,   320,   321,     0,     0,
        0,   322,     0,   323,   324,     0,   325,   326,   327,     0,
        0,   328,   329,     0,   330,   331,   332,   333,   334,   335,
-     777,     0,   336,   337,   338,   339,   340,   778,   779,   341,
-     342,     0,   343,   344,   345,   346,   347,   780,     0,   348,
-     349,     0,     0,     0,   781,   351,     0,   352,     0,     0,
-       0,   353,     0,   354,   782,   356,   783,     0,   358,     0,
-     359,     0,   784,     0,   360,   361,     0,   362,   785,     0,
-     363,   364,     0,     0,     0,   786,   366,   367,   368,   787,
+     786,     0,   336,   337,   338,   339,   340,   787,   788,   341,
+     342,     0,   343,   344,   345,   346,   347,   789,     0,   348,
+     349,     0,     0,     0,   790,   351,  2813,   352,     0,     0,
+       0,   353,     0,   354,   791,   356,   792,     0,   358,     0,
+     359,     0,   793,     0,   360,   361,     0,   362,   794,     0,
+     363,   364,     0,     0,     0,   795,   366,   367,   368,   796,
        0,   369,   370,   371,     0,     0,   372,     0,     0,     0,
-     788,   373,   374,   375,   789,     0,     0,   376,     0,     0,
+     797,   373,   374,   375,   798,     0,     0,   376,     0,     0,
        0,   377,   378,     0,   379,   380,     0,     0,     0,   381,
        0,   382,     0,     0,   383,   384,     0,     0,   385,     0,
-     790,   386,   387,     0,     0,     0,     0,     0,   791,   389,
-       0,   390,     0,   391,     0,   392,   393,     0,     0,   792,
+     799,   386,   387,     0,     0,     0,     0,     0,   800,   389,
+       0,   390,     0,   391,     0,   392,   393,     0,     0,   801,
        0,     0,     0,     0,   394,     0,   395,   396,   397,   398,
      399,   400,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,   411,     0,   412,   413,   414,   793,   415,   416,
-     417,   418,   794,   419,   420,     0,     0,     0,     0,   421,
-     422,   423,   424,   795,   426,     0,     0,   796,   428,   797,
-     429,     0,   430,   798,   799,   800,   801,   802,   435,   436,
-     437,   438,   439,     0,   803,   440,   441,     0,     0,   442,
-     443,   444,   445,   446,   804,   805,   806,   447,   448,     0,
-     807,   808,   449,     0,   450,   451,     0,   452,   453,   454,
+     409,   410,   411,     0,   412,   413,   414,   802,   415,   416,
+     417,   418,   803,   419,   420,     0,     0,     0,     0,   421,
+     422,   423,   424,   804,   426,     0,     0,   805,   428,   806,
+     429,     0,   430,   807,   808,   809,   810,   811,   435,   436,
+     437,   438,   439,     0,   812,   440,   441,     0,     0,   442,
+     443,   444,   445,   446,   813,   814,   815,   447,   448,     0,
+     816,   817,   449,     0,   450,   451,     0,   452,   453,   454,
        0,     0,   455,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   456,   457,   458,   809,   459,     0,   460,     0,
-     461,   462,   463,   464,   465,   466,   467,   810,   811,   470,
-     812,   471,     0,   472,   473,   474,     0,   475,     0,   476,
-     477,   478,   479,   480,     0,   813,   482,   483,     0,     0,
+       0,     0,   456,   457,   458,   818,   459,     0,   460,     0,
+     461,   462,   463,   464,   465,   466,   467,   819,   820,   470,
+     821,   471,     0,   472,   473,   474,     0,   475,     0,   476,
+     477,   478,   479,   480,     0,   822,   482,   483,     0,     0,
      484,     0,     0,     0,   485,   486,     0,   487,   488,     0,
        0,   489,   490,   491,   492,   493,     0,   494,   495,     0,
-     496,   497,   498,   814,   815,   499,   500,   501,   502,   503,
+     496,   497,   498,   823,   824,   499,   500,   501,   502,   503,
      504,   505,   506,     0,   507,     0,   508,   509,     0,   510,
-     511,   512,     0,   816,     0,   817,   514,   515,   516,   517,
-       0,   518,   818,   819,   520,   521,   522,   523,     0,   820,
+     511,   512,     0,   825,     0,   826,   514,   515,   516,   517,
+       0,   518,   827,   828,   520,   521,   522,   523,     0,   829,
      525,     0,     0,     0,   526,   527,   528,   529,     0,     0,
        0,   530,     0,     0,     0,   531,     0,   532,   533,   534,
      535,     0,   536,   537,   538,   539,   540,     0,     0,     0,
        0,     0,   541,   542,   543,     0,   544,     0,     0,   545,
        0,     0,   546,     0,   547,     0,   548,   549,   550,   551,
-     552,   553,   821,   822,   554,   555,     0,     0,   556,   557,
-     823,   559,   560,   561,   824,   825,   562,   563,   564,   565,
-     826,   566,   567,     0,     0,   568,   569,   570,   571,     0,
-     827,   572,   573,     0,   828,   829,   830,   831,     0,     0,
-       0,     0,     0,   578,   579,     0,   832,   833,   834,   581,
-     582,     0,   835,   583,   584,   836,   585,   586,     0,   587,
+     552,   553,   830,   831,   554,   555,     0,     0,   556,   557,
+     832,   559,   560,   561,   833,   834,   562,   563,   564,   565,
+     835,   566,   567,     0,     0,   568,   569,   570,   571,     0,
+     836,   572,   573,     0,   837,   838,   839,   840,     0,     0,
+       0,     0,     0,   578,   579,     0,   841,   842,   843,   581,
+     582,     0,   844,   583,   584,   845,   585,   586,     0,   587,
      588,     0,     0,   589,     0,     0,   590,     0,   591,     0,
-     837,   593,     0,     0,   838,   839,   840,   594,   841,   595,
-       0,     0,   596,   842,     0,   843,   597,     0,   598,   599,
-     844,   845,     0,     0,     0,     0,     0,     0,   602,   603,
-     604,     0,   605,   606,   607,   608,     0,     0,   846,     0,
+     846,   593,     0,     0,   847,   848,   849,   594,   850,   595,
+       0,     0,   596,   851,     0,   852,   597,     0,   598,   599,
+     853,   854,     0,     0,     0,     0,     0,     0,   602,   603,
+     604,     0,   605,   606,   607,   608,     0,     0,   855,     0,
        0,   610,   611,   612,   613,   614,     0,   615,     0,     0,
-       0,     0,     0,   847,   848,     0,   616,   617,   618,   849,
-     619,   620,   621,     0,   622,   850,   851,   623,   852,   624,
-       0,   853,   854,   855,   856,   857,   625,   626,     0,   858,
-     627,   859,   628,   860,   629,   630,     0,     0,     0,   631,
+       0,     0,     0,   856,   857,     0,   616,   617,   618,   858,
+     619,   620,   621,     0,   622,   859,   860,   623,   861,   624,
+       0,   862,   863,   864,   865,   866,   625,   626,     0,   867,
+     627,   868,   628,   869,   629,   630,     0,     0,     0,   631,
      632,   633,   634,   635,   636,   637,   638,     0,   639,   640,
      641,   642,   643,   644,   645,   646,   647,   648,     0,   649,
      650,   651,   652,   653,   654,   655,   656,   657,   658,   659,
      660,   661,   662,   663,   664,   665,   666,   667,   668,   669,
-     670,   671,   672,     0,   861,   674,   675,   676,   677,   678,
+     670,   671,   672,     0,   870,   674,   675,   676,   677,   678,
      679,     0,   680,   681,   682,   683,   684,   685,   686,   687,
      688,   689,   690,   691,   692,   693,   694,   695,   696,   697,
      698,   699,   700,   701,   702,   703,   704,   705,   706,   707,
-     708,   709,   862,   711,     0,     0,     0,     0,     0,   863,
-     864,  2706,     0,     0,     0,   866,     0,   867,     0,     0,
-       0,   868,     0,     0,     0,   869,   870,   243,   244,     0,
-     751,   246,   247,   248,   249,     0,     0,   250,     0,     0,
-       0,     0,   251,     0,     0,   752,     0,   253,   254,   255,
-     256,   753,   258,     0,   259,     0,     0,   754,   260,   755,
-     756,   757,   261,   758,     0,   262,   263,   264,     0,   265,
-       0,   266,   267,     0,     0,   268,   759,   760,   269,   270,
-       0,   271,   272,   761,   762,   274,     0,   275,   276,   277,
-     278,   763,   280,     0,   764,   282,     0,   283,   284,   285,
-     286,   287,   288,   289,   290,   291,   292,   293,     0,   294,
-     295,     0,   296,   297,   298,   299,   300,     0,   765,   766,
-     301,     0,     0,     0,   767,   302,   768,     0,   303,   769,
-     770,     0,   304,   305,   306,   771,   772,   773,     0,     0,
-       0,     0,   774,   309,   775,     0,     0,   776,   310,   311,
-       0,   312,     0,     0,     0,     0,     0,   313,   314,   315,
-     316,   317,     0,     0,     0,   318,     0,     0,   319,   320,
-     321,     0,     0,     0,   322,     0,   323,   324,     0,   325,
-     326,   327,     0,     0,   328,   329,     0,   330,   331,   332,
-     333,   334,   335,   777,     0,   336,   337,   338,   339,   340,
-     778,   779,   341,   342,     0,   343,   344,   345,   346,   347,
-     780,     0,   348,   349,     0,     0,     0,   781,   351,  2762,
-     352,     0,     0,     0,   353,     0,   354,   782,   356,   783,
-       0,   358,     0,   359,     0,   784,     0,   360,   361,     0,
-     362,   785,     0,   363,   364,     0,     0,     0,   786,   366,
-     367,   368,   787,     0,   369,   370,   371,     0,     0,   372,
-       0,     0,     0,   788,   373,   374,   375,   789,     0,     0,
-     376,     0,     0,     0,   377,   378,     0,   379,   380,     0,
-       0,     0,   381,     0,   382,     0,     0,   383,   384,     0,
-       0,   385,     0,   790,   386,   387,     0,     0,     0,     0,
-       0,   791,   389,     0,   390,     0,   391,     0,   392,   393,
-       0,     0,   792,     0,     0,     0,     0,   394,     0,   395,
-     396,   397,   398,   399,   400,   401,   402,   403,   404,   405,
-     406,   407,   408,   409,   410,   411,     0,   412,   413,   414,
-     793,   415,   416,   417,   418,   794,   419,   420,     0,     0,
-       0,     0,   421,   422,   423,   424,   795,   426,     0,     0,
-     796,   428,   797,   429,     0,   430,   798,   799,   800,   801,
-     802,   435,   436,   437,   438,   439,     0,   803,   440,   441,
-       0,     0,   442,   443,   444,   445,   446,   804,   805,   806,
-     447,   448,     0,   807,   808,   449,     0,   450,   451,     0,
-     452,   453,   454,     0,     0,   455,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   456,   457,   458,   809,   459,
-       0,   460,     0,   461,   462,   463,   464,   465,   466,   467,
-     810,   811,   470,   812,   471,     0,   472,   473,   474,     0,
-     475,     0,   476,   477,   478,   479,   480,     0,   813,   482,
-     483,     0,     0,   484,     0,     0,     0,   485,   486,     0,
-     487,   488,     0,     0,   489,   490,   491,   492,   493,     0,
-     494,   495,     0,   496,   497,   498,   814,   815,   499,   500,
-     501,   502,   503,   504,   505,   506,     0,   507,     0,   508,
-     509,     0,   510,   511,   512,     0,   816,     0,   817,   514,
-     515,   516,   517,     0,   518,   818,   819,   520,   521,   522,
-     523,     0,   820,   525,     0,     0,     0,   526,   527,   528,
-     529,     0,     0,     0,   530,     0,     0,     0,   531,     0,
-     532,   533,   534,   535,     0,   536,   537,   538,   539,   540,
-       0,     0,     0,     0,     0,   541,   542,   543,     0,   544,
-       0,     0,   545,     0,     0,   546,     0,   547,     0,   548,
-     549,   550,   551,   552,   553,   821,   822,   554,   555,     0,
-       0,   556,   557,   823,   559,   560,   561,   824,   825,   562,
-     563,   564,   565,   826,   566,   567,     0,     0,   568,   569,
-     570,   571,     0,   827,   572,   573,     0,   828,   829,   830,
-     831,     0,     0,     0,     0,     0,   578,   579,     0,   832,
-     833,   834,   581,   582,     0,   835,   583,   584,   836,   585,
-     586,     0,   587,   588,     0,     0,   589,     0,     0,   590,
-       0,   591,     0,   837,   593,     0,     0,   838,   839,   840,
-     594,   841,   595,     0,     0,   596,   842,     0,   843,   597,
-       0,   598,   599,   844,   845,     0,     0,     0,     0,     0,
-       0,   602,   603,   604,     0,   605,   606,   607,   608,     0,
-       0,   846,     0,     0,   610,   611,   612,   613,   614,     0,
-     615,     0,     0,     0,     0,     0,   847,   848,     0,   616,
-     617,   618,   849,   619,   620,   621,     0,   622,   850,   851,
-     623,   852,   624,     0,   853,   854,   855,   856,   857,   625,
-     626,     0,   858,   627,   859,   628,   860,   629,   630,     0,
-       0,     0,   631,   632,   633,   634,   635,   636,   637,   638,
-       0,   639,   640,   641,   642,   643,   644,   645,   646,   647,
-     648,     0,   649,   650,   651,   652,   653,   654,   655,   656,
-     657,   658,   659,   660,   661,   662,   663,   664,   665,   666,
-     667,   668,   669,   670,   671,   672,     0,   861,   674,   675,
-     676,   677,   678,   679,     0,   680,   681,   682,   683,   684,
-     685,   686,   687,   688,   689,   690,   691,   692,   693,   694,
-     695,   696,   697,   698,   699,   700,   701,   702,   703,   704,
-     705,   706,   707,   708,   709,   862,   711,     0,     0,     0,
-       0,     0,   863,   864,     0,     0,     0,     0,   866,     0,
-     867,     0,     0,     0,   868,     0,     0,     0,   869,   870,
-     243,   244,     0,   751,   246,   247,   248,   249,     0,     0,
-     250,     0,     0,     0,     0,   251,     0,     0,   752,     0,
-     253,   254,   255,   256,   753,   258,     0,   259,     0,     0,
-     754,   260,   755,   756,   757,   261,   758,     0,   262,   263,
-     264,     0,   265,     0,   266,   267,     0,     0,   268,   759,
-     760,   269,   270,     0,   271,   272,   761,   762,   274,     0,
-     275,   276,   277,   278,   763,   280,     0,   764,   282,     0,
-     283,   284,   285,   286,   287,   288,   289,   290,   291,   292,
-     293,     0,   294,   295,     0,   296,   297,   298,   299,   300,
-       0,   765,   766,   301,     0,     0,     0,   767,   302,   768,
-       0,   303,   769,   770,     0,   304,   305,   306,   771,   772,
-     773,     0,     0,     0,     0,   774,   309,   775,     0,     0,
-     776,   310,   311,     0,   312,     0,     0,     0,     0,     0,
-     313,   314,   315,   316,   317,     0,     0,     0,   318,     0,
-       0,   319,   320,   321,     0,     0,     0,   322,     0,   323,
-     324,     0,   325,   326,   327,     0,     0,   328,   329,     0,
-     330,   331,   332,   333,   334,   335,   777,     0,   336,   337,
-     338,   339,   340,   778,   779,   341,   342,     0,   343,   344,
-     345,   346,   347,   780,     0,   348,   349,     0,     0,     0,
-     781,   351,  2764,   352,     0,     0,     0,   353,     0,   354,
-     782,   356,   783,     0,   358,     0,   359,     0,   784,     0,
-     360,   361,     0,   362,   785,     0,   363,   364,     0,     0,
-       0,   786,   366,   367,   368,   787,     0,   369,   370,   371,
-       0,     0,   372,     0,     0,     0,   788,   373,   374,   375,
-     789,     0,     0,   376,     0,     0,     0,   377,   378,     0,
-     379,   380,     0,     0,     0,   381,     0,   382,     0,     0,
-     383,   384,     0,     0,   385,     0,   790,   386,   387,     0,
-       0,     0,     0,     0,   791,   389,     0,   390,     0,   391,
-       0,   392,   393,     0,     0,   792,     0,     0,     0,     0,
-     394,     0,   395,   396,   397,   398,   399,   400,   401,   402,
-     403,   404,   405,   406,   407,   408,   409,   410,   411,     0,
-     412,   413,   414,   793,   415,   416,   417,   418,   794,   419,
-     420,     0,     0,     0,     0,   421,   422,   423,   424,   795,
-     426,     0,     0,   796,   428,   797,   429,     0,   430,   798,
-     799,   800,   801,   802,   435,   436,   437,   438,   439,     0,
-     803,   440,   441,     0,     0,   442,   443,   444,   445,   446,
-     804,   805,   806,   447,   448,     0,   807,   808,   449,     0,
-     450,   451,     0,   452,   453,   454,     0,     0,   455,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   456,   457,
-     458,   809,   459,     0,   460,     0,   461,   462,   463,   464,
-     465,   466,   467,   810,   811,   470,   812,   471,     0,   472,
-     473,   474,     0,   475,     0,   476,   477,   478,   479,   480,
-       0,   813,   482,   483,     0,     0,   484,     0,     0,     0,
-     485,   486,     0,   487,   488,     0,     0,   489,   490,   491,
-     492,   493,     0,   494,   495,     0,   496,   497,   498,   814,
-     815,   499,   500,   501,   502,   503,   504,   505,   506,     0,
-     507,     0,   508,   509,     0,   510,   511,   512,     0,   816,
-       0,   817,   514,   515,   516,   517,     0,   518,   818,   819,
-     520,   521,   522,   523,     0,   820,   525,     0,     0,     0,
-     526,   527,   528,   529,     0,     0,     0,   530,     0,     0,
-       0,   531,     0,   532,   533,   534,   535,     0,   536,   537,
-     538,   539,   540,     0,     0,     0,     0,     0,   541,   542,
-     543,     0,   544,     0,     0,   545,     0,     0,   546,     0,
-     547,     0,   548,   549,   550,   551,   552,   553,   821,   822,
-     554,   555,     0,     0,   556,   557,   823,   559,   560,   561,
-     824,   825,   562,   563,   564,   565,   826,   566,   567,     0,
-       0,   568,   569,   570,   571,     0,   827,   572,   573,     0,
-     828,   829,   830,   831,     0,     0,     0,     0,     0,   578,
-     579,     0,   832,   833,   834,   581,   582,     0,   835,   583,
-     584,   836,   585,   586,     0,   587,   588,     0,     0,   589,
-       0,     0,   590,     0,   591,     0,   837,   593,     0,     0,
-     838,   839,   840,   594,   841,   595,     0,     0,   596,   842,
-       0,   843,   597,     0,   598,   599,   844,   845,     0,     0,
-       0,     0,     0,     0,   602,   603,   604,     0,   605,   606,
-     607,   608,     0,     0,   846,     0,     0,   610,   611,   612,
-     613,   614,     0,   615,     0,     0,     0,     0,     0,   847,
-     848,     0,   616,   617,   618,   849,   619,   620,   621,     0,
-     622,   850,   851,   623,   852,   624,     0,   853,   854,   855,
-     856,   857,   625,   626,     0,   858,   627,   859,   628,   860,
-     629,   630,     0,     0,     0,   631,   632,   633,   634,   635,
-     636,   637,   638,     0,   639,   640,   641,   642,   643,   644,
-     645,   646,   647,   648,     0,   649,   650,   651,   652,   653,
-     654,   655,   656,   657,   658,   659,   660,   661,   662,   663,
-     664,   665,   666,   667,   668,   669,   670,   671,   672,     0,
-     861,   674,   675,   676,   677,   678,   679,     0,   680,   681,
-     682,   683,   684,   685,   686,   687,   688,   689,   690,   691,
-     692,   693,   694,   695,   696,   697,   698,   699,   700,   701,
-     702,   703,   704,   705,   706,   707,   708,   709,   862,   711,
-       0,     0,     0,     0,     0,   863,   864,     0,     0,     0,
-       0,   866,     0,   867,     0,     0,     0,   868,     0,     0,
-       0,   869,   870,   243,   244,     0,   751,   246,   247,   248,
-     249,     0,     0,   250,     0,     0,     0,     0,   251,     0,
-       0,   752,     0,   253,   254,   255,   256,   753,   258,     0,
-     259,     0,     0,   754,   260,   755,   756,   757,   261,   758,
-       0,   262,   263,   264,     0,   265,     0,   266,   267,     0,
-       0,   268,   759,   760,   269,   270,     0,   271,   272,   761,
-     762,   274,     0,   275,   276,   277,   278,   763,   280,     0,
-     764,   282,     0,   283,   284,   285,   286,   287,   288,   289,
-     290,   291,   292,   293,     0,   294,   295,     0,   296,   297,
-     298,   299,   300,     0,   765,   766,   301,     0,     0,     0,
-     767,   302,   768,     0,   303,   769,   770,     0,   304,   305,
-     306,   771,   772,   773,     0,     0,     0,     0,   774,   309,
-     775,     0,     0,   776,   310,   311,     0,   312,     0,     0,
-       0,     0,     0,   313,   314,   315,   316,   317,     0,     0,
-       0,   318,     0,     0,   319,   320,   321,     0,     0,     0,
-     322,     0,   323,   324,     0,   325,   326,   327,     0,     0,
-     328,   329,     0,   330,   331,   332,   333,   334,   335,   777,
-       0,   336,   337,   338,   339,   340,   778,   779,   341,   342,
-       0,   343,   344,   345,   346,   347,   780,     0,   348,   349,
-       0,     0,     0,   781,   351,  2766,   352,     0,     0,     0,
-     353,     0,   354,   782,   356,   783,     0,   358,     0,   359,
-       0,   784,     0,   360,   361,     0,   362,   785,     0,   363,
-     364,     0,     0,     0,   786,   366,   367,   368,   787,     0,
-     369,   370,   371,     0,     0,   372,     0,     0,     0,   788,
-     373,   374,   375,   789,     0,     0,   376,     0,     0,     0,
-     377,   378,     0,   379,   380,     0,     0,     0,   381,     0,
-     382,     0,     0,   383,   384,     0,     0,   385,     0,   790,
-     386,   387,     0,     0,     0,     0,     0,   791,   389,     0,
-     390,     0,   391,     0,   392,   393,     0,     0,   792,     0,
-       0,     0,     0,   394,     0,   395,   396,   397,   398,   399,
-     400,   401,   402,   403,   404,   405,   406,   407,   408,   409,
-     410,   411,     0,   412,   413,   414,   793,   415,   416,   417,
-     418,   794,   419,   420,     0,     0,     0,     0,   421,   422,
-     423,   424,   795,   426,     0,     0,   796,   428,   797,   429,
-       0,   430,   798,   799,   800,   801,   802,   435,   436,   437,
-     438,   439,     0,   803,   440,   441,     0,     0,   442,   443,
-     444,   445,   446,   804,   805,   806,   447,   448,     0,   807,
-     808,   449,     0,   450,   451,     0,   452,   453,   454,     0,
-       0,   455,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   456,   457,   458,   809,   459,     0,   460,     0,   461,
-     462,   463,   464,   465,   466,   467,   810,   811,   470,   812,
-     471,     0,   472,   473,   474,     0,   475,     0,   476,   477,
-     478,   479,   480,     0,   813,   482,   483,     0,     0,   484,
-       0,     0,     0,   485,   486,     0,   487,   488,     0,     0,
-     489,   490,   491,   492,   493,     0,   494,   495,     0,   496,
-     497,   498,   814,   815,   499,   500,   501,   502,   503,   504,
-     505,   506,     0,   507,     0,   508,   509,     0,   510,   511,
-     512,     0,   816,     0,   817,   514,   515,   516,   517,     0,
-     518,   818,   819,   520,   521,   522,   523,     0,   820,   525,
-       0,     0,     0,   526,   527,   528,   529,     0,     0,     0,
-     530,     0,     0,     0,   531,     0,   532,   533,   534,   535,
-       0,   536,   537,   538,   539,   540,     0,     0,     0,     0,
-       0,   541,   542,   543,     0,   544,     0,     0,   545,     0,
-       0,   546,     0,   547,     0,   548,   549,   550,   551,   552,
-     553,   821,   822,   554,   555,     0,     0,   556,   557,   823,
-     559,   560,   561,   824,   825,   562,   563,   564,   565,   826,
-     566,   567,     0,     0,   568,   569,   570,   571,     0,   827,
-     572,   573,     0,   828,   829,   830,   831,     0,     0,     0,
-       0,     0,   578,   579,     0,   832,   833,   834,   581,   582,
-       0,   835,   583,   584,   836,   585,   586,     0,   587,   588,
-       0,     0,   589,     0,     0,   590,     0,   591,     0,   837,
-     593,     0,     0,   838,   839,   840,   594,   841,   595,     0,
-       0,   596,   842,     0,   843,   597,     0,   598,   599,   844,
-     845,     0,     0,     0,     0,     0,     0,   602,   603,   604,
-       0,   605,   606,   607,   608,     0,     0,   846,     0,     0,
-     610,   611,   612,   613,   614,     0,   615,     0,     0,     0,
-       0,     0,   847,   848,     0,   616,   617,   618,   849,   619,
-     620,   621,     0,   622,   850,   851,   623,   852,   624,     0,
-     853,   854,   855,   856,   857,   625,   626,     0,   858,   627,
-     859,   628,   860,   629,   630,     0,     0,     0,   631,   632,
-     633,   634,   635,   636,   637,   638,     0,   639,   640,   641,
-     642,   643,   644,   645,   646,   647,   648,     0,   649,   650,
-     651,   652,   653,   654,   655,   656,   657,   658,   659,   660,
-     661,   662,   663,   664,   665,   666,   667,   668,   669,   670,
-     671,   672,     0,   861,   674,   675,   676,   677,   678,   679,
-       0,   680,   681,   682,   683,   684,   685,   686,   687,   688,
-     689,   690,   691,   692,   693,   694,   695,   696,   697,   698,
-     699,   700,   701,   702,   703,   704,   705,   706,   707,   708,
-     709,   862,   711,     0,     0,     0,     0,     0,   863,   864,
-       0,     0,     0,     0,   866,     0,   867,     0,     0,     0,
-     868,     0,     0,     0,   869,   870,   243,   244,     0,   751,
+     708,   709,   871,   711,   712,   713,   714,   715,   716,   717,
+     718,   719,   720,     0,     0,     0,     0,     0,   872,   873,
+       0,     0,     0,     0,   875,     0,   876,     0,     0,     0,
+     877,     0,     0,     0,   878,   879,   243,   244,     0,   760,
      246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   752,     0,   253,   254,   255,   256,
-     753,   258,     0,   259,     0,     0,   754,   260,   755,   756,
-     757,   261,   758,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,   759,   760,   269,   270,     0,
-     271,   272,   761,   762,   274,     0,   275,   276,   277,   278,
-     763,   280,     0,   764,   282,     0,   283,   284,   285,   286,
+       0,   251,     0,     0,   761,     0,   253,   254,   255,   256,
+     762,   258,     0,   259,     0,     0,   763,   260,   764,   765,
+     766,   261,   767,     0,   262,   263,   264,     0,   265,     0,
+     266,   267,     0,     0,   268,   768,   769,   269,   270,     0,
+     271,   272,   770,   771,   274,     0,   275,   276,   277,   278,
+     772,   280,     0,   773,   282,     0,   283,   284,   285,   286,
      287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,   765,   766,   301,
-       0,     0,     0,   767,   302,   768,     0,   303,   769,   770,
-       0,   304,   305,   306,   771,   772,   773,     0,     0,     0,
-       0,   774,   309,   775,     0,     0,   776,   310,   311,     0,
+       0,   296,   297,   298,   299,   300,     0,   774,   775,   301,
+       0,     0,     0,   776,   302,   777,     0,   303,   778,   779,
+       0,   304,   305,   306,   780,   781,   782,     0,     0,     0,
+       0,   783,   309,   784,     0,     0,   785,   310,   311,     0,
      312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
      317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
        0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
      327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,   335,   777,     0,   336,   337,   338,   339,   340,   778,
-     779,   341,   342,     0,   343,   344,   345,   346,   347,   780,
-       0,   348,   349,     0,     0,     0,   781,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   782,   356,   783,     0,
-     358,     0,   359,     0,   784,     0,   360,   361,     0,   362,
-     785,     0,   363,   364,     0,     0,     0,   786,   366,   367,
-     368,   787,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,   788,   373,   374,   375,   789,     0,     0,   376,
+     334,   335,   786,     0,   336,   337,   338,   339,   340,   787,
+     788,   341,   342,     0,   343,   344,   345,   346,   347,   789,
+       0,   348,   349,     0,     0,     0,   790,   351,  2815,   352,
+       0,     0,     0,   353,     0,   354,   791,   356,   792,     0,
+     358,     0,   359,     0,   793,     0,   360,   361,     0,   362,
+     794,     0,   363,   364,     0,     0,     0,   795,   366,   367,
+     368,   796,     0,   369,   370,   371,     0,     0,   372,     0,
+       0,     0,   797,   373,   374,   375,   798,     0,     0,   376,
        0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
        0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,   790,   386,   387,     0,     0,     0,     0,     0,
-     791,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,   792,     0,     0,     0,     0,   394,     0,   395,   396,
+     385,     0,   799,   386,   387,     0,     0,     0,     0,     0,
+     800,   389,     0,   390,     0,   391,     0,   392,   393,     0,
+       0,   801,     0,     0,     0,     0,   394,     0,   395,   396,
      397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,   793,
-     415,   416,   417,   418,   794,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   795,   426,     0,     0,   796,
-     428,   797,   429,     0,   430,   798,   799,   800,   801,   802,
-     435,   436,   437,   438,   439,     0,   803,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,   804,   805,   806,   447,
-     448,     0,   807,   808,   449,     0,   450,   451,     0,   452,
+     407,   408,   409,   410,   411,     0,   412,   413,   414,   802,
+     415,   416,   417,   418,   803,   419,   420,     0,     0,     0,
+       0,   421,   422,   423,   424,   804,   426,     0,     0,   805,
+     428,   806,   429,     0,   430,   807,   808,   809,   810,   811,
+     435,   436,   437,   438,   439,     0,   812,   440,   441,     0,
+       0,   442,   443,   444,   445,   446,   813,   814,   815,   447,
+     448,     0,   816,   817,   449,     0,   450,   451,     0,   452,
      453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,   809,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   810,
-     811,   470,   812,   471,     0,   472,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   813,   482,   483,
+       0,     0,     0,     0,   456,   457,   458,   818,   459,     0,
+     460,     0,   461,   462,   463,   464,   465,   466,   467,   819,
+     820,   470,   821,   471,     0,   472,   473,   474,     0,   475,
+       0,   476,   477,   478,   479,   480,     0,   822,   482,   483,
        0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
      488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,   497,   498,   814,   815,   499,   500,   501,
+     495,     0,   496,   497,   498,   823,   824,   499,   500,   501,
      502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   816,     0,   817,   514,   515,
-     516,   517,     0,   518,   818,   819,   520,   521,   522,   523,
-       0,   820,   525,     0,     0,     0,   526,   527,   528,   529,
+       0,   510,   511,   512,     0,   825,     0,   826,   514,   515,
+     516,   517,     0,   518,   827,   828,   520,   521,   522,   523,
+       0,   829,   525,     0,     0,     0,   526,   527,   528,   529,
        0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
      533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
        0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
        0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,   821,   822,   554,   555,     0,     0,
-     556,   557,   823,   559,   560,   561,   824,   825,   562,   563,
-     564,   565,   826,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,   827,   572,   573,     0,   828,   829,   830,   831,
-       0,     0,     0,     0,     0,   578,   579,     0,   832,   833,
-     834,   581,   582,     0,   835,   583,   584,   836,   585,   586,
+     550,   551,   552,   553,   830,   831,   554,   555,     0,     0,
+     556,   557,   832,   559,   560,   561,   833,   834,   562,   563,
+     564,   565,   835,   566,   567,     0,     0,   568,   569,   570,
+     571,     0,   836,   572,   573,     0,   837,   838,   839,   840,
+       0,     0,     0,     0,     0,   578,   579,     0,   841,   842,
+     843,   581,   582,     0,   844,   583,   584,   845,   585,   586,
        0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   837,   593,     0,     0,   838,   839,   840,   594,
-     841,   595,     0,     0,   596,   842,     0,   843,   597,     0,
-     598,   599,   844,   845,     0,     0,     0,     0,     0,     0,
+     591,     0,   846,   593,     0,     0,   847,   848,   849,   594,
+     850,   595,     0,     0,   596,   851,     0,   852,   597,     0,
+     598,   599,   853,   854,     0,     0,     0,     0,     0,     0,
      602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     846,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,   847,   848,     0,   616,   617,
-     618,   849,   619,   620,   621,     0,   622,   850,   851,   623,
-     852,   624,     0,   853,   854,   855,   856,   857,   625,   626,
-       0,   858,   627,   859,   628,   860,   629,   630,     0,     0,
+     855,     0,     0,   610,   611,   612,   613,   614,     0,   615,
+       0,     0,     0,     0,     0,   856,   857,     0,   616,   617,
+     618,   858,   619,   620,   621,     0,   622,   859,   860,   623,
+     861,   624,     0,   862,   863,   864,   865,   866,   625,   626,
+       0,   867,   627,   868,   628,   869,   629,   630,     0,     0,
        0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
      639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
        0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
      658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   861,   674,   675,   676,
+     668,   669,   670,   671,   672,     0,   870,   674,   675,   676,
      677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
      686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
      696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   862,   711,     0,     0,     0,     0,
-       0,   863,   864,     0,     0,     0,     0,   866,     0,   867,
-       0,     0,     0,   868,     0,     0,     0,   869,   870,   243,
-     244,     0,   751,   246,   247,   248,   249,     0,     0,   250,
-       0,     0,     0,     0,   251,     0,     0,   752,     0,   253,
-     254,   255,   256,   753,   258,     0,   259,     0,     0,   754,
-     260,   755,   756,   757,   261,   758,     0,   262,   263,   264,
-       0,   265,     0,   266,   267,     0,     0,   268,   759,   760,
-     269,   270,     0,   271,   272,   761,   762,   274,     0,   275,
-     276,   277,   278,   763,   280,     0,   764,   282,     0,   283,
-     284,   285,   286,   287,   288,   289,   290,   291,   292,   293,
-       0,   294,   295,     0,   296,   297,   298,   299,   300,     0,
-     765,   766,   301,     0,     0,     0,   767,   302,   768,     0,
-     303,   769,   770,     0,   304,   305,   306,   771,   772,   773,
-       0,     0,     0,     0,   774,   309,   775,     0,     0,   776,
-     310,   311,     0,   312,     0,     0,     0,     0,     0,   313,
-     314,   315,   316,   317,     0,     0,     0,   318,     0,     0,
-     319,   320,   321,     0,     0,     0,   322,     0,   323,   324,
-       0,   325,   326,   327,     0,     0,   328,   329,     0,   330,
-     331,   332,   333,   334,   335,   777,     0,   336,   337,   338,
-     339,   340,   778,   779,   341,   342,     0,   343,   344,   345,
-     346,   347,   780,     0,   348,   349,     0,     0,     0,   781,
-     351,     0,   352,     0,     0,     0,   353,     0,   354,   782,
-     356,   783,     0,   358,     0,   359,     0,   784,     0,   360,
-     361,     0,   362,   785,     0,   363,   364,     0,     0,     0,
-     786,   366,   367,   368,   787,     0,   369,   370,   371,     0,
-       0,   372,     0,     0,     0,   788,   373,   374,   375,   789,
-       0,     0,   376,     0,     0,     0,   377,   378,     0,   379,
-     380,     0,     0,     0,   381,     0,   382,     0,     0,   383,
-     384,     0,     0,   385,     0,   790,   386,   387,     0,     0,
-       0,     0,     0,   791,   389,     0,   390,     0,   391,     0,
-     392,   393,     0,     0,   792,     0,     0,     0,     0,   394,
-       0,   395,   396,   397,   398,   399,   400,   401,   402,   403,
-     404,   405,   406,   407,   408,   409,   410,   411,     0,   412,
-     413,   414,   793,   415,   416,   417,   418,   794,   419,   420,
-       0,     0,     0,     0,   421,   422,   423,   424,   795,   426,
-       0,     0,   796,   428,   797,   429,     0,   430,   798,   799,
-     800,   801,   802,   435,   436,   437,   438,   439,     0,   803,
-     440,   441,     0,     0,   442,   443,   444,   445,   446,   804,
-     805,   806,   447,   448,     0,   807,   808,   449,     0,   450,
-     451,     0,   452,   453,   454,     0,     0,   455,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   456,   457,   458,
-     809,   459,     0,   460,     0,   461,   462,   463,   464,   465,
-     466,   467,   810,   811,   470,   812,   471,     0,   472,   473,
-     474,     0,   475,     0,   476,   477,   478,   479,   480,     0,
-     813,   482,   483,     0,     0,   484,     0,     0,     0,   485,
-     486,     0,   487,   488,     0,     0,   489,   490,   491,   492,
-     493,     0,   494,   495,     0,   496,   497,   498,   814,   815,
-     499,   500,   501,   502,   503,   504,   505,   506,     0,   507,
-       0,   508,   509,     0,   510,   511,   512,     0,   816,     0,
-     817,   514,   515,   516,   517,     0,   518,   818,   819,   520,
-     521,   522,   523,     0,   820,   525,     0,     0,     0,   526,
-     527,   528,   529,     0,     0,     0,   530,     0,     0,     0,
-     531,     0,   532,   533,   534,   535,     0,   536,   537,   538,
-     539,   540,     0,     0,     0,     0,     0,   541,   542,   543,
-       0,   544,     0,     0,   545,     0,     0,   546,     0,   547,
-       0,   548,   549,   550,   551,   552,   553,   821,   822,   554,
-     555,     0,     0,   556,   557,   823,   559,   560,   561,   824,
-     825,   562,   563,   564,   565,   826,   566,   567,     0,     0,
-     568,   569,   570,   571,     0,   827,   572,   573,     0,   828,
-     829,   830,   831,     0,     0,     0,     0,     0,   578,   579,
-       0,   832,   833,   834,   581,   582,     0,   835,   583,   584,
-     836,   585,   586,     0,   587,   588,     0,     0,   589,     0,
-       0,   590,     0,   591,     0,   837,   593,     0,     0,   838,
-     839,   840,   594,   841,   595,     0,     0,   596,   842,     0,
-     843,   597,     0,   598,   599,   844,   845,     0,     0,     0,
-       0,     0,     0,   602,   603,   604,     0,   605,   606,   607,
-     608,     0,     0,   846,     0,     0,   610,   611,   612,   613,
-     614,     0,   615,     0,     0,     0,     0,     0,   847,   848,
-       0,   616,   617,   618,   849,   619,   620,   621,     0,   622,
-     850,   851,   623,   852,   624,     0,   853,   854,   855,   856,
-     857,   625,   626,     0,   858,   627,   859,   628,   860,   629,
-     630,     0,     0,     0,   631,   632,   633,   634,   635,   636,
-     637,   638,     0,   639,   640,   641,   642,   643,   644,   645,
-     646,   647,   648,     0,   649,   650,   651,   652,   653,   654,
-     655,   656,   657,   658,   659,   660,   661,   662,   663,   664,
-     665,   666,   667,   668,   669,   670,   671,   672,     0,   861,
-     674,   675,   676,   677,   678,   679,     0,   680,   681,   682,
-     683,   684,   685,   686,   687,   688,   689,   690,   691,   692,
-     693,   694,   695,   696,   697,   698,   699,   700,   701,   702,
-     703,   704,   705,   706,   707,   708,   709,   862,   711,     0,
-       0,     0,     0,     0,   863,   864,     0,     0,     0,     0,
-     866,     0,  1270,     0,     0,     0,   868,     0,     0,     0,
-     869,   870,   243,   244,     0,   751,   246,   247,   248,   249,
-    2069,     0,   250,     0,     0,     0,     0,  2070,     0,     0,
-     752,     0,   253,   254,   255,   256,   753,   258,     0,   259,
-       0,     0,   754,   260,   755,   756,   757,   261,   758,     0,
+     706,   707,   708,   709,   871,   711,   712,   713,   714,   715,
+     716,   717,   718,   719,   720,     0,     0,     0,     0,     0,
+     872,   873,     0,     0,     0,     0,   875,     0,   876,     0,
+       0,     0,   877,     0,     0,     0,   878,   879,   243,   244,
+       0,   760,   246,   247,   248,   249,     0,     0,   250,     0,
+       0,     0,     0,   251,     0,     0,   761,     0,   253,   254,
+     255,   256,   762,   258,     0,   259,     0,     0,   763,   260,
+     764,   765,   766,   261,   767,     0,   262,   263,   264,     0,
+     265,     0,   266,   267,     0,     0,   268,   768,   769,   269,
+     270,     0,   271,   272,   770,   771,   274,     0,   275,   276,
+     277,   278,   772,   280,     0,   773,   282,     0,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,     0,
+     294,   295,     0,   296,   297,   298,   299,   300,     0,   774,
+     775,   301,     0,     0,     0,   776,   302,   777,     0,   303,
+     778,   779,     0,   304,   305,   306,   780,   781,   782,     0,
+       0,     0,     0,   783,   309,   784,     0,     0,   785,   310,
+     311,     0,   312,     0,     0,     0,     0,     0,   313,   314,
+     315,   316,   317,     0,     0,     0,   318,     0,     0,   319,
+     320,   321,     0,     0,     0,   322,     0,   323,   324,     0,
+     325,   326,   327,     0,     0,   328,   329,     0,   330,   331,
+     332,   333,   334,   335,   786,     0,   336,   337,   338,   339,
+     340,   787,   788,   341,   342,     0,   343,   344,   345,   346,
+     347,   789,     0,   348,   349,     0,     0,     0,   790,   351,
+    2817,   352,     0,     0,     0,   353,     0,   354,   791,   356,
+     792,     0,   358,     0,   359,     0,   793,     0,   360,   361,
+       0,   362,   794,     0,   363,   364,     0,     0,     0,   795,
+     366,   367,   368,   796,     0,   369,   370,   371,     0,     0,
+     372,     0,     0,     0,   797,   373,   374,   375,   798,     0,
+       0,   376,     0,     0,     0,   377,   378,     0,   379,   380,
+       0,     0,     0,   381,     0,   382,     0,     0,   383,   384,
+       0,     0,   385,     0,   799,   386,   387,     0,     0,     0,
+       0,     0,   800,   389,     0,   390,     0,   391,     0,   392,
+     393,     0,     0,   801,     0,     0,     0,     0,   394,     0,
+     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
+     405,   406,   407,   408,   409,   410,   411,     0,   412,   413,
+     414,   802,   415,   416,   417,   418,   803,   419,   420,     0,
+       0,     0,     0,   421,   422,   423,   424,   804,   426,     0,
+       0,   805,   428,   806,   429,     0,   430,   807,   808,   809,
+     810,   811,   435,   436,   437,   438,   439,     0,   812,   440,
+     441,     0,     0,   442,   443,   444,   445,   446,   813,   814,
+     815,   447,   448,     0,   816,   817,   449,     0,   450,   451,
+       0,   452,   453,   454,     0,     0,   455,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   456,   457,   458,   818,
+     459,     0,   460,     0,   461,   462,   463,   464,   465,   466,
+     467,   819,   820,   470,   821,   471,     0,   472,   473,   474,
+       0,   475,     0,   476,   477,   478,   479,   480,     0,   822,
+     482,   483,     0,     0,   484,     0,     0,     0,   485,   486,
+       0,   487,   488,     0,     0,   489,   490,   491,   492,   493,
+       0,   494,   495,     0,   496,   497,   498,   823,   824,   499,
+     500,   501,   502,   503,   504,   505,   506,     0,   507,     0,
+     508,   509,     0,   510,   511,   512,     0,   825,     0,   826,
+     514,   515,   516,   517,     0,   518,   827,   828,   520,   521,
+     522,   523,     0,   829,   525,     0,     0,     0,   526,   527,
+     528,   529,     0,     0,     0,   530,     0,     0,     0,   531,
+       0,   532,   533,   534,   535,     0,   536,   537,   538,   539,
+     540,     0,     0,     0,     0,     0,   541,   542,   543,     0,
+     544,     0,     0,   545,     0,     0,   546,     0,   547,     0,
+     548,   549,   550,   551,   552,   553,   830,   831,   554,   555,
+       0,     0,   556,   557,   832,   559,   560,   561,   833,   834,
+     562,   563,   564,   565,   835,   566,   567,     0,     0,   568,
+     569,   570,   571,     0,   836,   572,   573,     0,   837,   838,
+     839,   840,     0,     0,     0,     0,     0,   578,   579,     0,
+     841,   842,   843,   581,   582,     0,   844,   583,   584,   845,
+     585,   586,     0,   587,   588,     0,     0,   589,     0,     0,
+     590,     0,   591,     0,   846,   593,     0,     0,   847,   848,
+     849,   594,   850,   595,     0,     0,   596,   851,     0,   852,
+     597,     0,   598,   599,   853,   854,     0,     0,     0,     0,
+       0,     0,   602,   603,   604,     0,   605,   606,   607,   608,
+       0,     0,   855,     0,     0,   610,   611,   612,   613,   614,
+       0,   615,     0,     0,     0,     0,     0,   856,   857,     0,
+     616,   617,   618,   858,   619,   620,   621,     0,   622,   859,
+     860,   623,   861,   624,     0,   862,   863,   864,   865,   866,
+     625,   626,     0,   867,   627,   868,   628,   869,   629,   630,
+       0,     0,     0,   631,   632,   633,   634,   635,   636,   637,
+     638,     0,   639,   640,   641,   642,   643,   644,   645,   646,
+     647,   648,     0,   649,   650,   651,   652,   653,   654,   655,
+     656,   657,   658,   659,   660,   661,   662,   663,   664,   665,
+     666,   667,   668,   669,   670,   671,   672,     0,   870,   674,
+     675,   676,   677,   678,   679,     0,   680,   681,   682,   683,
+     684,   685,   686,   687,   688,   689,   690,   691,   692,   693,
+     694,   695,   696,   697,   698,   699,   700,   701,   702,   703,
+     704,   705,   706,   707,   708,   709,   871,   711,   712,   713,
+     714,   715,   716,   717,   718,   719,   720,     0,     0,     0,
+       0,     0,   872,   873,     0,     0,     0,     0,   875,     0,
+     876,     0,     0,     0,   877,     0,     0,     0,   878,   879,
+     243,   244,     0,   760,   246,   247,   248,   249,     0,     0,
+     250,     0,     0,     0,     0,   251,     0,     0,   761,     0,
+     253,   254,   255,   256,   762,   258,     0,   259,     0,     0,
+     763,   260,   764,   765,   766,   261,   767,     0,   262,   263,
+     264,     0,   265,     0,   266,   267,     0,     0,   268,   768,
+     769,   269,   270,     0,   271,   272,   770,   771,   274,     0,
+     275,   276,   277,   278,   772,   280,     0,   773,   282,     0,
+     283,   284,   285,   286,   287,   288,   289,   290,   291,   292,
+     293,     0,   294,   295,     0,   296,   297,   298,   299,   300,
+       0,   774,   775,   301,     0,     0,     0,   776,   302,   777,
+       0,   303,   778,   779,     0,   304,   305,   306,   780,   781,
+     782,     0,     0,     0,     0,   783,   309,   784,     0,     0,
+     785,   310,   311,     0,   312,     0,     0,     0,     0,     0,
+     313,   314,   315,   316,   317,     0,     0,     0,   318,     0,
+       0,   319,   320,   321,     0,     0,     0,   322,     0,   323,
+     324,     0,   325,   326,   327,     0,     0,   328,   329,     0,
+     330,   331,   332,   333,   334,   335,   786,     0,   336,   337,
+     338,   339,   340,   787,   788,   341,   342,     0,   343,   344,
+     345,   346,   347,   789,     0,   348,   349,     0,     0,     0,
+     790,   351,     0,   352,     0,     0,     0,   353,     0,   354,
+     791,   356,   792,     0,   358,     0,   359,     0,   793,     0,
+     360,   361,     0,   362,   794,     0,   363,   364,     0,     0,
+       0,   795,   366,   367,   368,   796,     0,   369,   370,   371,
+       0,     0,   372,     0,     0,     0,   797,   373,   374,   375,
+     798,     0,     0,   376,     0,     0,     0,   377,   378,     0,
+     379,   380,     0,     0,     0,   381,     0,   382,     0,     0,
+     383,   384,     0,     0,   385,     0,   799,   386,   387,     0,
+       0,     0,     0,     0,   800,   389,     0,   390,     0,   391,
+       0,   392,   393,     0,     0,   801,     0,     0,     0,     0,
+     394,     0,   395,   396,   397,   398,   399,   400,   401,   402,
+     403,   404,   405,   406,   407,   408,   409,   410,   411,     0,
+     412,   413,   414,   802,   415,   416,   417,   418,   803,   419,
+     420,     0,     0,     0,     0,   421,   422,   423,   424,   804,
+     426,     0,     0,   805,   428,   806,   429,     0,   430,   807,
+     808,   809,   810,   811,   435,   436,   437,   438,   439,     0,
+     812,   440,   441,     0,     0,   442,   443,   444,   445,   446,
+     813,   814,   815,   447,   448,     0,   816,   817,   449,     0,
+     450,   451,     0,   452,   453,   454,     0,     0,   455,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   456,   457,
+     458,   818,   459,     0,   460,     0,   461,   462,   463,   464,
+     465,   466,   467,   819,   820,   470,   821,   471,     0,   472,
+     473,   474,     0,   475,     0,   476,   477,   478,   479,   480,
+       0,   822,   482,   483,     0,     0,   484,     0,     0,     0,
+     485,   486,     0,   487,   488,     0,     0,   489,   490,   491,
+     492,   493,     0,   494,   495,     0,   496,   497,   498,   823,
+     824,   499,   500,   501,   502,   503,   504,   505,   506,     0,
+     507,     0,   508,   509,     0,   510,   511,   512,     0,   825,
+       0,   826,   514,   515,   516,   517,     0,   518,   827,   828,
+     520,   521,   522,   523,     0,   829,   525,     0,     0,     0,
+     526,   527,   528,   529,     0,     0,     0,   530,     0,     0,
+       0,   531,     0,   532,   533,   534,   535,     0,   536,   537,
+     538,   539,   540,     0,     0,     0,     0,     0,   541,   542,
+     543,     0,   544,     0,     0,   545,     0,     0,   546,     0,
+     547,     0,   548,   549,   550,   551,   552,   553,   830,   831,
+     554,   555,     0,     0,   556,   557,   832,   559,   560,   561,
+     833,   834,   562,   563,   564,   565,   835,   566,   567,     0,
+       0,   568,   569,   570,   571,     0,   836,   572,   573,     0,
+     837,   838,   839,   840,     0,     0,     0,     0,     0,   578,
+     579,     0,   841,   842,   843,   581,   582,     0,   844,   583,
+     584,   845,   585,   586,     0,   587,   588,     0,     0,   589,
+       0,     0,   590,     0,   591,     0,   846,   593,     0,     0,
+     847,   848,   849,   594,   850,   595,     0,     0,   596,   851,
+       0,   852,   597,     0,   598,   599,   853,   854,     0,     0,
+       0,     0,     0,     0,   602,   603,   604,     0,   605,   606,
+     607,   608,     0,     0,   855,     0,     0,   610,   611,   612,
+     613,   614,     0,   615,     0,     0,     0,     0,     0,   856,
+     857,     0,   616,   617,   618,   858,   619,   620,   621,     0,
+     622,   859,   860,   623,   861,   624,     0,   862,   863,   864,
+     865,   866,   625,   626,     0,   867,   627,   868,   628,   869,
+     629,   630,     0,     0,     0,   631,   632,   633,   634,   635,
+     636,   637,   638,     0,   639,   640,   641,   642,   643,   644,
+     645,   646,   647,   648,     0,   649,   650,   651,   652,   653,
+     654,   655,   656,   657,   658,   659,   660,   661,   662,   663,
+     664,   665,   666,   667,   668,   669,   670,   671,   672,     0,
+     870,   674,   675,   676,   677,   678,   679,     0,   680,   681,
+     682,   683,   684,   685,   686,   687,   688,   689,   690,   691,
+     692,   693,   694,   695,   696,   697,   698,   699,   700,   701,
+     702,   703,   704,   705,   706,   707,   708,   709,   871,   711,
+     712,   713,   714,   715,   716,   717,   718,   719,   720,     0,
+       0,     0,     0,     0,   872,   873,     0,     0,     0,     0,
+     875,     0,   876,     0,     0,     0,   877,     0,     0,     0,
+     878,   879,   243,   244,     0,   760,   246,   247,   248,   249,
+       0,     0,   250,     0,     0,     0,     0,   251,     0,     0,
+     761,     0,   253,   254,   255,   256,   762,   258,     0,   259,
+       0,     0,   763,   260,   764,   765,   766,   261,   767,     0,
      262,   263,   264,     0,   265,     0,   266,   267,     0,     0,
-     268,   759,   760,   269,   270,     0,   271,   272,   761,   762,
-     274,     0,   275,   276,   277,   278,   763,   280,     0,   764,
+     268,   768,   769,   269,   270,     0,   271,   272,   770,   771,
+     274,     0,   275,   276,   277,   278,   772,   280,     0,   773,
      282,     0,   283,   284,   285,   286,   287,   288,   289,   290,
      291,   292,   293,     0,   294,   295,     0,   296,   297,   298,
-     299,   300,     0,   765,   766,   301,     0,     0,     0,   767,
-     302,   768,     0,   303,   769,   770,     0,   304,   305,   306,
-     771,   772,   773,     0,     0,     0,     0,   774,   309,   775,
-       0,     0,   776,   310,   311,     0,   312,     0,     0,     0,
+     299,   300,     0,   774,   775,   301,     0,     0,     0,   776,
+     302,   777,     0,   303,   778,   779,     0,   304,   305,   306,
+     780,   781,   782,     0,     0,     0,     0,   783,   309,   784,
+       0,     0,   785,   310,   311,     0,   312,     0,     0,     0,
        0,     0,   313,   314,   315,   316,   317,     0,     0,     0,
      318,     0,     0,   319,   320,   321,     0,     0,     0,   322,
        0,   323,   324,     0,   325,   326,   327,     0,     0,   328,
-     329,     0,   330,   331,   332,   333,   334,   335,   777,     0,
-     336,   337,   338,   339,   340,   778,   779,   341,   342,     0,
-     343,   344,   345,   346,   347,   780,     0,   348,   349,     0,
-       0,     0,   781,   351,     0,   352,     0,     0,     0,   353,
-       0,   354,   782,   356,   783,     0,   358,     0,   359,     0,
-     784,     0,   360,   361,     0,   362,   785,     0,   363,   364,
-       0,     0,     0,   786,   366,   367,   368,   787,     0,   369,
-     370,   371,     0,     0,   372,     0,     0,     0,   788,   373,
-     374,   375,   789,     0,     0,   376,     0,     0,     0,   377,
+     329,     0,   330,   331,   332,   333,   334,   335,   786,     0,
+     336,   337,   338,   339,   340,   787,   788,   341,   342,     0,
+     343,   344,   345,   346,   347,   789,     0,   348,   349,     0,
+       0,     0,   790,   351,     0,   352,     0,     0,     0,   353,
+       0,   354,   791,   356,   792,     0,   358,     0,   359,     0,
+     793,     0,   360,   361,     0,   362,   794,     0,   363,   364,
+       0,     0,     0,   795,   366,   367,   368,   796,     0,   369,
+     370,   371,     0,     0,   372,     0,     0,     0,   797,   373,
+     374,   375,   798,     0,     0,   376,     0,     0,     0,   377,
      378,     0,   379,   380,     0,     0,     0,   381,     0,   382,
-       0,     0,   383,   384,     0,     0,   385,     0,   790,   386,
-     387,     0,     0,     0,     0,     0,   791,   389,     0,   390,
-       0,   391,     0,   392,   393,     0,     0,   792,     0,     0,
+       0,     0,   383,   384,     0,     0,   385,     0,   799,   386,
+     387,     0,     0,     0,     0,     0,   800,   389,     0,   390,
+       0,   391,     0,   392,   393,     0,     0,   801,     0,     0,
        0,     0,   394,     0,   395,   396,   397,   398,   399,   400,
      401,   402,   403,   404,   405,   406,   407,   408,   409,   410,
-     411,     0,   412,   413,   414,   793,   415,   416,   417,   418,
-     794,   419,   420,     0,     0,     0,     0,   421,   422,   423,
-     424,   795,   426,     0,     0,   796,   428,   797,   429,     0,
-     430,   798,   799,   800,   801,   802,   435,   436,   437,   438,
-     439,     0,   803,   440,   441,     0,     0,   442,   443,   444,
-     445,   446,   804,     0,   806,   447,   448,     0,   807,   808,
+     411,     0,   412,   413,   414,   802,   415,   416,   417,   418,
+     803,   419,   420,     0,     0,     0,     0,   421,   422,   423,
+     424,   804,   426,     0,     0,   805,   428,   806,   429,     0,
+     430,   807,   808,   809,   810,   811,   435,   436,   437,   438,
+     439,     0,   812,   440,   441,     0,     0,   442,   443,   444,
+     445,   446,   813,   814,   815,   447,   448,     0,   816,   817,
      449,     0,   450,   451,     0,   452,   453,   454,     0,     0,
      455,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     456,   457,   458,   809,   459,     0,   460,     0,   461,   462,
-     463,   464,   465,   466,   467,   810,   811,   470,   812,   471,
+     456,   457,   458,   818,   459,     0,   460,     0,   461,   462,
+     463,   464,   465,   466,   467,   819,   820,   470,   821,   471,
        0,   472,   473,   474,     0,   475,     0,   476,   477,   478,
-     479,   480,     0,   813,   482,   483,     0,     0,   484,     0,
+     479,   480,     0,   822,   482,   483,     0,     0,   484,     0,
        0,     0,   485,   486,     0,   487,   488,     0,     0,   489,
      490,   491,   492,   493,     0,   494,   495,     0,   496,   497,
-     498,   814,   815,   499,   500,   501,   502,   503,   504,   505,
+     498,   823,   824,   499,   500,   501,   502,   503,   504,   505,
      506,     0,   507,     0,   508,   509,     0,   510,   511,   512,
-       0,   816,     0,   817,   514,   515,   516,   517,     0,   518,
-     818,   819,   520,   521,   522,   523,     0,   820,   525,     0,
+       0,   825,     0,   826,   514,   515,   516,   517,     0,   518,
+     827,   828,   520,   521,   522,   523,     0,   829,   525,     0,
        0,     0,   526,   527,   528,   529,     0,     0,     0,   530,
        0,     0,     0,   531,     0,   532,   533,   534,   535,     0,
      536,   537,   538,   539,   540,     0,     0,     0,     0,     0,
      541,   542,   543,     0,   544,     0,     0,   545,     0,     0,
      546,     0,   547,     0,   548,   549,   550,   551,   552,   553,
-     821,   822,   554,   555,     0,     0,   556,   557,   823,   559,
-     560,   561,   824,   825,   562,   563,   564,   565,   826,   566,
-     567,     0,     0,   568,   569,   570,   571,     0,   827,   572,
-     573,     0,   828,   829,   830,   831,     0,     0,     0,     0,
-       0,   578,   579,     0,   832,   833,   834,   581,   582,     0,
-     835,   583,   584,   836,   585,   586,     0,   587,   588,     0,
-       0,   589,     0,     0,   590,     0,   591,     0,   837,   593,
-       0,     0,   838,   839,   840,   594,   841,   595,     0,     0,
-     596,   842,     0,   843,   597,     0,   598,   599,   844,   845,
+     830,   831,   554,   555,     0,     0,   556,   557,   832,   559,
+     560,   561,   833,   834,   562,   563,   564,   565,   835,   566,
+     567,     0,     0,   568,   569,   570,   571,     0,   836,   572,
+     573,     0,   837,   838,   839,   840,     0,     0,     0,     0,
+       0,   578,   579,     0,   841,   842,   843,   581,   582,     0,
+     844,   583,   584,   845,   585,   586,     0,   587,   588,     0,
+       0,   589,     0,     0,   590,     0,   591,     0,   846,   593,
+       0,     0,   847,   848,   849,   594,   850,   595,     0,     0,
+     596,   851,     0,   852,   597,     0,   598,   599,   853,   854,
        0,     0,     0,     0,     0,     0,   602,   603,   604,     0,
-     605,   606,   607,   608,     0,     0,   846,     0,     0,   610,
+     605,   606,   607,   608,     0,     0,   855,     0,     0,   610,
      611,   612,   613,   614,     0,   615,     0,     0,     0,     0,
-       0,   847,   848,     0,   616,   617,   618,   849,   619,   620,
-     621,     0,   622,   850,   851,   623,   852,   624,     0,   853,
-     854,   855,   856,   857,   625,   626,     0,   858,   627,   859,
-     628,   860,   629,   630,     0,     0,     0,   631,   632,   633,
+       0,   856,   857,     0,   616,   617,   618,   858,   619,   620,
+     621,     0,   622,   859,   860,   623,   861,   624,     0,   862,
+     863,   864,   865,   866,   625,   626,     0,   867,   627,   868,
+     628,   869,   629,   630,     0,     0,     0,   631,   632,   633,
      634,   635,   636,   637,   638,     0,   639,   640,   641,   642,
      643,   644,   645,   646,   647,   648,     0,   649,   650,   651,
      652,   653,   654,   655,   656,   657,   658,   659,   660,   661,
      662,   663,   664,   665,   666,   667,   668,   669,   670,   671,
-     672,     0,   861,   674,   675,   676,   677,   678,   679,     0,
+     672,     0,   870,   674,   675,   676,   677,   678,   679,     0,
      680,   681,   682,   683,   684,   685,   686,   687,   688,   689,
      690,   691,   692,   693,   694,   695,   696,   697,   698,   699,
      700,   701,   702,   703,   704,   705,   706,   707,   708,   709,
-     862,   711,     0,     0,     0,     0,     0,   863,   864,     0,
-       0,     0,     0,   866,     0,   867,     0,     0,     0,   868,
-       0,     0,     0,   869,   870,   243,   244,     0,   751,   246,
-     247,   248,   249,     0,     0,   250,     0,     0,     0,     0,
-     251,     0,     0,   752,     0,   253,   254,   255,   256,   753,
-     258,     0,   259,     0,     0,   754,   260,   755,   756,   757,
-     261,   758,     0,   262,   263,   264,     0,   265,     0,   266,
-     267,     0,     0,   268,   759,   760,   269,   270,     0,   271,
-     272,   761,   762,   274,     0,   275,   276,   277,   278,   763,
-     280,     0,   764,   282,     0,   283,   284,   285,   286,   287,
-     288,   289,   290,   291,   292,   293,     0,   294,   295,     0,
-     296,   297,   298,   299,   300,     0,   765,   766,   301,     0,
-       0,     0,   767,   302,   768,     0,   303,   769,   770,     0,
-     304,   305,   306,   771,   772,   773,     0,     0,     0,     0,
-     774,   309,   775,     0,     0,  2323,   310,   311,     0,   312,
-       0,     0,     0,     0,     0,   313,   314,   315,   316,   317,
-       0,     0,     0,   318,     0,     0,   319,   320,   321,     0,
-       0,     0,   322,     0,   323,   324,     0,   325,   326,   327,
-       0,     0,   328,   329,     0,   330,   331,   332,   333,   334,
-     335,   777,     0,   336,   337,   338,   339,   340,   778,   779,
-     341,   342,     0,   343,   344,   345,   346,   347,   780,     0,
-     348,   349,     0,     0,     0,   781,   351,     0,   352,     0,
-       0,     0,   353,     0,   354,   782,   356,   783,     0,   358,
-       0,   359,     0,   784,     0,   360,   361,     0,   362,   785,
-       0,   363,   364,     0,     0,     0,   786,   366,   367,   368,
-     787,     0,   369,   370,   371,     0,     0,   372,     0,     0,
-       0,   788,   373,   374,   375,   789,     0,     0,   376,     0,
-       0,     0,   377,   378,     0,   379,   380,     0,     0,     0,
-     381,     0,   382,     0,     0,   383,   384,     0,     0,   385,
-       0,   790,   386,   387,     0,     0,     0,     0,     0,   791,
-     389,     0,   390,     0,   391,     0,   392,   393,     0,     0,
-     792,     0,     0,     0,     0,   394,     0,   395,   396,   397,
-     398,   399,   400,   401,   402,   403,   404,   405,   406,   407,
-     408,   409,   410,   411,     0,   412,   413,   414,   793,   415,
-     416,   417,   418,   794,   419,   420,     0,     0,     0,     0,
-     421,   422,   423,   424,   795,   426,     0,     0,   796,   428,
-     797,   429,     0,   430,   798,   799,   800,   801,   802,   435,
-     436,   437,   438,   439,     0,   803,   440,   441,     0,     0,
-     442,   443,   444,   445,   446,   804,   805,   806,   447,   448,
-       0,   807,   808,   449,     0,   450,   451,     0,   452,   453,
-     454,     0,     0,   455,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   456,   457,   458,   809,   459,     0,   460,
-       0,   461,   462,   463,   464,   465,   466,   467,   810,   811,
-     470,   812,   471,     0,   472,   473,   474,     0,   475,     0,
-     476,   477,   478,   479,   480,     0,   813,   482,   483,     0,
-       0,   484,     0,     0,     0,   485,   486,     0,   487,   488,
-       0,     0,   489,   490,   491,   492,   493,     0,   494,   495,
-       0,   496,   497,   498,   814,   815,   499,   500,   501,   502,
-     503,   504,   505,   506,     0,   507,     0,   508,   509,     0,
-     510,   511,   512,     0,   816,     0,   817,   514,   515,   516,
-     517,     0,   518,   818,   819,   520,   521,   522,   523,     0,
-     820,   525,     0,     0,     0,   526,   527,   528,   529,     0,
-       0,     0,   530,     0,     0,     0,   531,     0,   532,   533,
-     534,   535,     0,   536,   537,   538,   539,   540,     0,     0,
-       0,     0,     0,   541,   542,   543,     0,   544,     0,     0,
-     545,     0,     0,   546,     0,   547,     0,   548,   549,   550,
-     551,   552,   553,   821,   822,   554,   555,     0,     0,   556,
-     557,   823,   559,   560,   561,   824,   825,   562,   563,   564,
-     565,   826,   566,   567,     0,     0,   568,   569,   570,   571,
-       0,   827,   572,   573,     0,   828,   829,   830,   831,     0,
-       0,     0,     0,     0,   578,   579,     0,   832,   833,   834,
-     581,   582,     0,   835,   583,   584,   836,   585,   586,     0,
-     587,   588,     0,     0,   589,     0,     0,   590,     0,   591,
-       0,   837,   593,     0,     0,   838,   839,   840,   594,   841,
-     595,     0,     0,   596,   842,     0,   843,   597,     0,   598,
-     599,   844,   845,     0,     0,     0,     0,     0,     0,   602,
-     603,   604,     0,   605,   606,   607,   608,     0,     0,   846,
-       0,     0,   610,   611,   612,   613,   614,     0,   615,     0,
-       0,     0,     0,     0,   847,   848,     0,   616,   617,   618,
-     849,   619,   620,   621,     0,   622,   850,   851,   623,   852,
-     624,     0,   853,   854,   855,   856,   857,   625,   626,     0,
-     858,   627,   859,   628,   860,   629,   630,     0,     0,     0,
-     631,   632,   633,   634,   635,   636,   637,   638,     0,   639,
-     640,   641,   642,   643,   644,   645,   646,   647,   648,     0,
-     649,   650,   651,   652,   653,   654,   655,   656,   657,   658,
-     659,   660,   661,   662,   663,   664,   665,   666,   667,   668,
-     669,   670,   671,   672,     0,   861,   674,   675,   676,   677,
-     678,   679,     0,   680,   681,   682,   683,   684,   685,   686,
-     687,   688,   689,   690,   691,   692,   693,   694,   695,   696,
-     697,   698,   699,   700,   701,   702,   703,   704,   705,   706,
-     707,   708,   709,   862,   711,     0,     0,     0,     0,     0,
-     863,   864,     0,     0,     0,     0,   866,     0,   867,     0,
-       0,     0,   868,     0,     0,     0,   869,   870,   243,   244,
-       0,   751,   246,   247,   248,   249,     0,     0,   250,     0,
-       0,     0,     0,   251,     0,     0,   752,     0,   253,   254,
-     255,   256,   753,   258,     0,   259,     0,     0,   754,   260,
-     755,   756,   757,   261,   758,     0,   262,   263,   264,     0,
-     265,     0,   266,   267,     0,     0,   268,   759,   760,   269,
-     270,     0,   271,   272,   761,   762,   274,     0,   275,   276,
-     277,   278,   763,   280,     0,   764,   282,     0,   283,   284,
+     871,   711,   712,   713,   714,   715,   716,   717,   718,   719,
+     720,     0,     0,     0,     0,     0,   872,   873,     0,     0,
+       0,     0,   875,     0,  1279,     0,     0,     0,   877,     0,
+       0,     0,   878,   879,   243,   244,     0,   760,   246,   247,
+     248,   249,  2093,     0,   250,     0,     0,     0,     0,  2094,
+       0,     0,   761,     0,   253,   254,   255,   256,   762,   258,
+       0,   259,     0,     0,   763,   260,   764,   765,   766,   261,
+     767,     0,   262,   263,   264,     0,   265,     0,   266,   267,
+       0,     0,   268,   768,   769,   269,   270,     0,   271,   272,
+     770,   771,   274,     0,   275,   276,   277,   278,   772,   280,
+       0,   773,   282,     0,   283,   284,   285,   286,   287,   288,
+     289,   290,   291,   292,   293,     0,   294,   295,     0,   296,
+     297,   298,   299,   300,     0,   774,   775,   301,     0,     0,
+       0,   776,   302,   777,     0,   303,   778,   779,     0,   304,
+     305,   306,   780,   781,   782,     0,     0,     0,     0,   783,
+     309,   784,     0,     0,   785,   310,   311,     0,   312,     0,
+       0,     0,     0,     0,   313,   314,   315,   316,   317,     0,
+       0,     0,   318,     0,     0,   319,   320,   321,     0,     0,
+       0,   322,     0,   323,   324,     0,   325,   326,   327,     0,
+       0,   328,   329,     0,   330,   331,   332,   333,   334,   335,
+     786,     0,   336,   337,   338,   339,   340,   787,   788,   341,
+     342,     0,   343,   344,   345,   346,   347,   789,     0,   348,
+     349,     0,     0,     0,   790,   351,     0,   352,     0,     0,
+       0,   353,     0,   354,   791,   356,   792,     0,   358,     0,
+     359,     0,   793,     0,   360,   361,     0,   362,   794,     0,
+     363,   364,     0,     0,     0,   795,   366,   367,   368,   796,
+       0,   369,   370,   371,     0,     0,   372,     0,     0,     0,
+     797,   373,   374,   375,   798,     0,     0,   376,     0,     0,
+       0,   377,   378,     0,   379,   380,     0,     0,     0,   381,
+       0,   382,     0,     0,   383,   384,     0,     0,   385,     0,
+     799,   386,   387,     0,     0,     0,     0,     0,   800,   389,
+       0,   390,     0,   391,     0,   392,   393,     0,     0,   801,
+       0,     0,     0,     0,   394,     0,   395,   396,   397,   398,
+     399,   400,   401,   402,   403,   404,   405,   406,   407,   408,
+     409,   410,   411,     0,   412,   413,   414,   802,   415,   416,
+     417,   418,   803,   419,   420,     0,     0,     0,     0,   421,
+     422,   423,   424,   804,   426,     0,     0,   805,   428,   806,
+     429,     0,   430,   807,   808,   809,   810,   811,   435,   436,
+     437,   438,   439,     0,   812,   440,   441,     0,     0,   442,
+     443,   444,   445,   446,   813,     0,   815,   447,   448,     0,
+     816,   817,   449,     0,   450,   451,     0,   452,   453,   454,
+       0,     0,   455,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   456,   457,   458,   818,   459,     0,   460,     0,
+     461,   462,   463,   464,   465,   466,   467,   819,   820,   470,
+     821,   471,     0,   472,   473,   474,     0,   475,     0,   476,
+     477,   478,   479,   480,     0,   822,   482,   483,     0,     0,
+     484,     0,     0,     0,   485,   486,     0,   487,   488,     0,
+       0,   489,   490,   491,   492,   493,     0,   494,   495,     0,
+     496,   497,   498,   823,   824,   499,   500,   501,   502,   503,
+     504,   505,   506,     0,   507,     0,   508,   509,     0,   510,
+     511,   512,     0,   825,     0,   826,   514,   515,   516,   517,
+       0,   518,   827,   828,   520,   521,   522,   523,     0,   829,
+     525,     0,     0,     0,   526,   527,   528,   529,     0,     0,
+       0,   530,     0,     0,     0,   531,     0,   532,   533,   534,
+     535,     0,   536,   537,   538,   539,   540,     0,     0,     0,
+       0,     0,   541,   542,   543,     0,   544,     0,     0,   545,
+       0,     0,   546,     0,   547,     0,   548,   549,   550,   551,
+     552,   553,   830,   831,   554,   555,     0,     0,   556,   557,
+     832,   559,   560,   561,   833,   834,   562,   563,   564,   565,
+     835,   566,   567,     0,     0,   568,   569,   570,   571,     0,
+     836,   572,   573,     0,   837,   838,   839,   840,     0,     0,
+       0,     0,     0,   578,   579,     0,   841,   842,   843,   581,
+     582,     0,   844,   583,   584,   845,   585,   586,     0,   587,
+     588,     0,     0,   589,     0,     0,   590,     0,   591,     0,
+     846,   593,     0,     0,   847,   848,   849,   594,   850,   595,
+       0,     0,   596,   851,     0,   852,   597,     0,   598,   599,
+     853,   854,     0,     0,     0,     0,     0,     0,   602,   603,
+     604,     0,   605,   606,   607,   608,     0,     0,   855,     0,
+       0,   610,   611,   612,   613,   614,     0,   615,     0,     0,
+       0,     0,     0,   856,   857,     0,   616,   617,   618,   858,
+     619,   620,   621,     0,   622,   859,   860,   623,   861,   624,
+       0,   862,   863,   864,   865,   866,   625,   626,     0,   867,
+     627,   868,   628,   869,   629,   630,     0,     0,     0,   631,
+     632,   633,   634,   635,   636,   637,   638,     0,   639,   640,
+     641,   642,   643,   644,   645,   646,   647,   648,     0,   649,
+     650,   651,   652,   653,   654,   655,   656,   657,   658,   659,
+     660,   661,   662,   663,   664,   665,   666,   667,   668,   669,
+     670,   671,   672,     0,   870,   674,   675,   676,   677,   678,
+     679,     0,   680,   681,   682,   683,   684,   685,   686,   687,
+     688,   689,   690,   691,   692,   693,   694,   695,   696,   697,
+     698,   699,   700,   701,   702,   703,   704,   705,   706,   707,
+     708,   709,   871,   711,   712,   713,   714,   715,   716,   717,
+     718,   719,   720,     0,     0,     0,     0,     0,   872,   873,
+       0,     0,     0,     0,   875,     0,   876,     0,     0,     0,
+     877,     0,     0,     0,   878,   879,   243,   244,     0,   760,
+     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
+       0,   251,     0,     0,   761,     0,   253,   254,   255,   256,
+     762,   258,     0,   259,     0,     0,   763,   260,   764,   765,
+     766,   261,   767,     0,   262,   263,   264,     0,   265,     0,
+     266,   267,     0,     0,   268,   768,   769,   269,   270,     0,
+     271,   272,   770,   771,   274,     0,   275,   276,   277,   278,
+     772,   280,     0,   773,   282,     0,   283,   284,   285,   286,
+     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
+       0,   296,   297,   298,   299,   300,     0,   774,   775,   301,
+       0,     0,     0,   776,   302,   777,     0,   303,   778,   779,
+       0,   304,   305,   306,   780,   781,   782,     0,     0,     0,
+       0,   783,   309,   784,     0,     0,  2347,   310,   311,     0,
+     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
+     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
+       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
+     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
+     334,   335,   786,     0,   336,   337,   338,   339,   340,   787,
+     788,   341,   342,     0,   343,   344,   345,   346,   347,   789,
+       0,   348,   349,     0,     0,     0,   790,   351,     0,   352,
+       0,     0,     0,   353,     0,   354,   791,   356,   792,     0,
+     358,     0,   359,     0,   793,     0,   360,   361,     0,   362,
+     794,     0,   363,   364,     0,     0,     0,   795,   366,   367,
+     368,   796,     0,   369,   370,   371,     0,     0,   372,     0,
+       0,     0,   797,   373,   374,   375,   798,     0,     0,   376,
+       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
+       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
+     385,     0,   799,   386,   387,     0,     0,     0,     0,     0,
+     800,   389,     0,   390,     0,   391,     0,   392,   393,     0,
+       0,   801,     0,     0,     0,     0,   394,     0,   395,   396,
+     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
+     407,   408,   409,   410,   411,     0,   412,   413,   414,   802,
+     415,   416,   417,   418,   803,   419,   420,     0,     0,     0,
+       0,   421,   422,   423,   424,   804,   426,     0,     0,   805,
+     428,   806,   429,     0,   430,   807,   808,   809,   810,   811,
+     435,   436,   437,   438,   439,     0,   812,   440,   441,     0,
+       0,   442,   443,   444,   445,   446,   813,   814,   815,   447,
+     448,     0,   816,   817,   449,     0,   450,   451,     0,   452,
+     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   456,   457,   458,   818,   459,     0,
+     460,     0,   461,   462,   463,   464,   465,   466,   467,   819,
+     820,   470,   821,   471,     0,   472,   473,   474,     0,   475,
+       0,   476,   477,   478,   479,   480,     0,   822,   482,   483,
+       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
+     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
+     495,     0,   496,   497,   498,   823,   824,   499,   500,   501,
+     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
+       0,   510,   511,   512,     0,   825,     0,   826,   514,   515,
+     516,   517,     0,   518,   827,   828,   520,   521,   522,   523,
+       0,   829,   525,     0,     0,     0,   526,   527,   528,   529,
+       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
+     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
+       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
+       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
+     550,   551,   552,   553,   830,   831,   554,   555,     0,     0,
+     556,   557,   832,   559,   560,   561,   833,   834,   562,   563,
+     564,   565,   835,   566,   567,     0,     0,   568,   569,   570,
+     571,     0,   836,   572,   573,     0,   837,   838,   839,   840,
+       0,     0,     0,     0,     0,   578,   579,     0,   841,   842,
+     843,   581,   582,     0,   844,   583,   584,   845,   585,   586,
+       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
+     591,     0,   846,   593,     0,     0,   847,   848,   849,   594,
+     850,   595,     0,     0,   596,   851,     0,   852,   597,     0,
+     598,   599,   853,   854,     0,     0,     0,     0,     0,     0,
+     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
+     855,     0,     0,   610,   611,   612,   613,   614,     0,   615,
+       0,     0,     0,     0,     0,   856,   857,     0,   616,   617,
+     618,   858,   619,   620,   621,     0,   622,   859,   860,   623,
+     861,   624,     0,   862,   863,   864,   865,   866,   625,   626,
+       0,   867,   627,   868,   628,   869,   629,   630,     0,     0,
+       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
+     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
+       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
+     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
+     668,   669,   670,   671,   672,     0,   870,   674,   675,   676,
+     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
+     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
+     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
+     706,   707,   708,   709,   871,   711,   712,   713,   714,   715,
+     716,   717,   718,   719,   720,     0,     0,     0,     0,     0,
+     872,   873,     0,     0,     0,     0,   875,     0,   876,     0,
+       0,     0,   877,     0,     0,     0,   878,   879,   243,   244,
+       0,   760,   246,   247,   248,   249,     0,     0,   250,     0,
+       0,     0,     0,   251,     0,     0,   761,     0,   253,   254,
+     255,   256,   762,   258,     0,   259,     0,     0,   763,   260,
+     764,   765,   766,   261,   767,     0,   262,   263,   264,     0,
+     265,     0,   266,   267,     0,     0,   268,   768,   769,   269,
+     270,     0,   271,   272,   770,   771,   274,     0,   275,   276,
+     277,   278,   772,   280,     0,   773,   282,     0,   283,   284,
      285,   286,   287,   288,   289,   290,   291,   292,   293,     0,
-     294,   295,     0,   296,   297,   298,   299,   300,     0,   765,
-     766,   301,     0,     0,     0,   767,   302,   768,     0,   303,
-     769,   770,     0,   304,   305,   306,   771,   772,   773,     0,
-       0,     0,     0,   774,   309,   775,     0,     0,   776,   310,
+     294,   295,     0,   296,   297,   298,   299,   300,     0,   774,
+     775,   301,     0,     0,     0,   776,   302,   777,     0,   303,
+     778,   779,     0,   304,   305,   306,   780,   781,   782,     0,
+       0,     0,     0,   783,   309,   784,     0,     0,   785,   310,
      311,     0,   312,     0,     0,     0,     0,     0,   313,   314,
      315,   316,   317,     0,     0,     0,   318,     0,     0,   319,
      320,   321,     0,     0,     0,   322,     0,   323,   324,     0,
      325,   326,   327,     0,     0,   328,   329,     0,   330,   331,
-     332,   333,   334,   335,   777,     0,   336,   337,   338,   339,
-     340,   778,   779,   341,   342,     0,   343,   344,   345,   346,
-     347,   780,     0,   348,   349,     0,     0,     0,   781,   351,
-       0,   352,     0,     0,     0,   353,     0,   354,   782,   356,
-     783,     0,   358,     0,   359,     0,   784,     0,   360,   361,
-       0,   362,   785,     0,   363,   364,     0,     0,     0,   786,
-     366,   367,   368,   787,     0,   369,   370,   371,     0,     0,
-     372,     0,     0,     0,   788,   373,   374,   375,  3385,     0,
+     332,   333,   334,   335,   786,     0,   336,   337,   338,   339,
+     340,   787,   788,   341,   342,     0,   343,   344,   345,   346,
+     347,   789,     0,   348,   349,     0,     0,     0,   790,   351,
+       0,   352,     0,     0,     0,   353,     0,   354,   791,   356,
+     792,     0,   358,     0,   359,     0,   793,     0,   360,   361,
+       0,   362,   794,     0,   363,   364,     0,     0,     0,   795,
+     366,   367,   368,   796,     0,   369,   370,   371,     0,     0,
+     372,     0,     0,     0,   797,   373,   374,   375,  3446,     0,
        0,   376,     0,     0,     0,   377,   378,     0,   379,   380,
        0,     0,     0,   381,     0,   382,     0,     0,   383,   384,
-       0,     0,   385,     0,   790,   386,   387,     0,     0,     0,
-       0,     0,   791,   389,     0,   390,     0,   391,     0,   392,
-     393,     0,     0,   792,     0,     0,     0,     0,   394,     0,
+       0,     0,   385,     0,   799,   386,   387,     0,     0,     0,
+       0,     0,   800,   389,     0,   390,     0,   391,     0,   392,
+     393,     0,     0,   801,     0,     0,     0,     0,   394,     0,
      395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
      405,   406,   407,   408,   409,   410,   411,     0,   412,   413,
-     414,   793,   415,   416,   417,   418,   794,   419,   420,     0,
-       0,     0,     0,   421,   422,   423,   424,   795,   426,     0,
-       0,   796,   428,   797,   429,     0,   430,   798,   799,   800,
-     801,   802,   435,   436,   437,   438,   439,     0,   803,   440,
-     441,     0,     0,   442,   443,   444,   445,   446,   804,   805,
-     806,   447,   448,     0,   807,   808,   449,     0,   450,   451,
+     414,   802,   415,   416,   417,   418,   803,   419,   420,     0,
+       0,     0,     0,   421,   422,   423,   424,   804,   426,     0,
+       0,   805,   428,   806,   429,     0,   430,   807,   808,   809,
+     810,   811,   435,   436,   437,   438,   439,     0,   812,   440,
+     441,     0,     0,   442,   443,   444,   445,   446,   813,   814,
+     815,   447,   448,     0,   816,   817,   449,     0,   450,   451,
        0,   452,   453,   454,     0,     0,   455,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   456,   457,   458,   809,
+       0,     0,     0,     0,     0,     0,   456,   457,   458,   818,
      459,     0,   460,     0,   461,   462,   463,   464,   465,   466,
-     467,   810,   811,   470,   812,   471,     0,   472,   473,   474,
-       0,   475,     0,   476,   477,   478,   479,   480,     0,   813,
+     467,   819,   820,   470,   821,   471,     0,   472,   473,   474,
+       0,   475,     0,   476,   477,   478,   479,   480,     0,   822,
      482,   483,     0,     0,   484,     0,     0,     0,   485,   486,
        0,   487,   488,     0,     0,   489,   490,   491,   492,   493,
-       0,   494,   495,     0,   496,   497,   498,   814,   815,   499,
+       0,   494,   495,     0,   496,   497,   498,   823,   824,   499,
      500,   501,   502,   503,   504,   505,   506,     0,   507,     0,
-     508,   509,     0,   510,   511,   512,     0,   816,     0,   817,
-     514,   515,   516,   517,     0,   518,   818,   819,   520,   521,
-     522,   523,     0,   820,   525,     0,     0,     0,   526,   527,
+     508,   509,     0,   510,   511,   512,     0,   825,     0,   826,
+     514,   515,   516,   517,     0,   518,   827,   828,   520,   521,
+     522,   523,     0,   829,   525,     0,     0,     0,   526,   527,
      528,   529,     0,     0,     0,   530,     0,     0,     0,   531,
        0,   532,   533,   534,   535,     0,   536,   537,   538,   539,
      540,     0,     0,     0,     0,     0,   541,   542,   543,     0,
      544,     0,     0,   545,     0,     0,   546,     0,   547,     0,
-     548,   549,   550,   551,   552,   553,   821,   822,   554,   555,
-       0,     0,   556,   557,   823,   559,   560,   561,   824,   825,
-     562,   563,   564,   565,   826,   566,   567,     0,     0,   568,
-     569,   570,   571,     0,   827,   572,   573,     0,   828,   829,
-     830,   831,     0,     0,     0,     0,     0,   578,   579,     0,
-     832,   833,   834,   581,   582,     0,   835,   583,   584,   836,
+     548,   549,   550,   551,   552,   553,   830,   831,   554,   555,
+       0,     0,   556,   557,   832,   559,   560,   561,   833,   834,
+     562,   563,   564,   565,   835,   566,   567,     0,     0,   568,
+     569,   570,   571,     0,   836,   572,   573,     0,   837,   838,
+     839,   840,     0,     0,     0,     0,     0,   578,   579,     0,
+     841,   842,   843,   581,   582,     0,   844,   583,   584,   845,
      585,   586,     0,   587,   588,     0,     0,   589,     0,     0,
-     590,     0,   591,     0,   837,   593,     0,     0,   838,   839,
-     840,   594,   841,   595,     0,     0,   596,   842,     0,   843,
-     597,     0,   598,   599,   844,   845,     0,     0,     0,     0,
+     590,     0,   591,     0,   846,   593,     0,     0,   847,   848,
+     849,   594,   850,   595,     0,     0,   596,   851,     0,   852,
+     597,     0,   598,   599,   853,   854,     0,     0,     0,     0,
        0,     0,   602,   603,   604,     0,   605,   606,   607,   608,
-       0,     0,   846,     0,     0,   610,   611,   612,   613,   614,
-       0,   615,     0,     0,     0,     0,     0,   847,   848,     0,
-     616,   617,   618,   849,   619,   620,   621,     0,   622,   850,
-     851,   623,   852,   624,     0,   853,   854,   855,   856,   857,
-     625,   626,     0,   858,   627,   859,   628,   860,   629,   630,
+       0,     0,   855,     0,     0,   610,   611,   612,   613,   614,
+       0,   615,     0,     0,     0,     0,     0,   856,   857,     0,
+     616,   617,   618,   858,   619,   620,   621,     0,   622,   859,
+     860,   623,   861,   624,     0,   862,   863,   864,   865,   866,
+     625,   626,     0,   867,   627,   868,   628,   869,   629,   630,
        0,     0,     0,   631,   632,   633,   634,   635,   636,   637,
      638,     0,   639,   640,   641,   642,   643,   644,   645,   646,
      647,   648,     0,   649,   650,   651,   652,   653,   654,   655,
      656,   657,   658,   659,   660,   661,   662,   663,   664,   665,
-     666,   667,   668,   669,   670,   671,   672,     0,   861,   674,
+     666,   667,   668,   669,   670,   671,   672,     0,   870,   674,
      675,   676,   677,   678,   679,     0,   680,   681,   682,   683,
      684,   685,   686,   687,   688,   689,   690,   691,   692,   693,
      694,   695,   696,   697,   698,   699,   700,   701,   702,   703,
-     704,   705,   706,   707,   708,   709,   862,   711,     0,     0,
-       0,     0,     0,   863,   864,     0,     0,     0,     0,   866,
-       0,   867,     0,     0,     0,   868,     0,     0,     0,   869,
-     870,   243,   244,     0,   751,   246,   247,   248,   249,     0,
-       0,   250,     0,     0,     0,     0,   251,     0,     0,   752,
-       0,   253,   254,   255,   256,   753,   258,     0,   259,     0,
-       0,   754,   260,   755,   756,   757,   261,   758,     0,   262,
-     263,   264,     0,   265,     0,   266,   267,     0,     0,   268,
-     759,   760,   269,   270,     0,   271,   272,   761,   762,   274,
-       0,   275,   276,   277,   278,   763,   280,     0,   764,   282,
-       0,   283,   284,   285,   286,   287,   288,   289,   290,   291,
-     292,   293,     0,   294,   295,     0,   296,   297,   298,   299,
-     300,     0,   765,   766,   301,     0,     0,     0,   767,   302,
-     768,     0,   303,   769,   770,     0,   304,   305,   306,   771,
-     772,   773,     0,     0,     0,     0,   774,   309,   775,     0,
-       0,   776,   310,   311,     0,   312,     0,     0,     0,     0,
-       0,   313,   314,   315,   316,   317,     0,     0,     0,   318,
-       0,     0,   319,   320,   321,     0,     0,     0,   322,     0,
-     323,   324,     0,   325,   326,   327,     0,     0,   328,   329,
-       0,   330,   331,   332,   333,   334,   335,   777,     0,   336,
-     337,   338,   339,   340,   778,   779,   341,   342,     0,   343,
-     344,   345,   346,   347,   780,     0,   348,   349,     0,     0,
-       0,   781,   351,     0,   352,     0,     0,     0,   353,     0,
-     354,   782,   356,   783,     0,   358,     0,   359,     0,   784,
-       0,   360,   361,     0,   362,   785,     0,   363,   364,     0,
-       0,     0,   786,   366,   367,   368,   787,     0,   369,   370,
-     371,     0,     0,   372,     0,     0,     0,   788,   373,   374,
-     375,  3456,     0,     0,   376,     0,     0,     0,   377,   378,
-       0,   379,   380,     0,     0,     0,   381,     0,   382,     0,
-       0,   383,   384,     0,     0,   385,     0,   790,   386,   387,
-       0,     0,     0,     0,     0,   791,   389,     0,   390,     0,
-     391,     0,   392,   393,     0,     0,   792,     0,     0,     0,
-       0,   394,     0,   395,   396,   397,   398,   399,   400,   401,
-     402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
-       0,   412,   413,   414,   793,   415,   416,   417,   418,   794,
-     419,   420,     0,     0,     0,     0,   421,   422,   423,   424,
-     795,   426,     0,     0,   796,   428,   797,   429,     0,   430,
-     798,   799,   800,   801,   802,   435,   436,   437,   438,   439,
-       0,   803,   440,   441,     0,     0,   442,   443,   444,   445,
-     446,   804,   805,   806,   447,   448,     0,   807,   808,   449,
-       0,   450,   451,     0,   452,   453,   454,     0,     0,   455,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   456,
-     457,   458,   809,   459,     0,   460,     0,   461,   462,   463,
-     464,   465,   466,   467,   810,   811,   470,   812,   471,     0,
-     472,   473,   474,     0,   475,     0,   476,   477,   478,   479,
-     480,     0,   813,   482,   483,     0,     0,   484,     0,     0,
-       0,   485,   486,     0,   487,   488,     0,     0,   489,   490,
-     491,   492,   493,     0,   494,   495,     0,   496,   497,   498,
-     814,   815,   499,   500,   501,   502,   503,   504,   505,   506,
-       0,   507,     0,   508,   509,     0,   510,   511,   512,     0,
-     816,     0,   817,   514,   515,   516,   517,     0,   518,   818,
-     819,   520,   521,   522,   523,     0,   820,   525,     0,     0,
-       0,   526,   527,   528,   529,     0,     0,     0,   530,     0,
-       0,     0,   531,     0,   532,   533,   534,   535,     0,   536,
-     537,   538,   539,   540,     0,     0,     0,     0,     0,   541,
-     542,   543,     0,   544,     0,     0,   545,     0,     0,   546,
-       0,   547,     0,   548,   549,   550,   551,   552,   553,   821,
-     822,   554,   555,     0,     0,   556,   557,   823,   559,   560,
-     561,   824,   825,   562,   563,   564,   565,   826,   566,   567,
-       0,     0,   568,   569,   570,   571,     0,   827,   572,   573,
-       0,   828,   829,   830,   831,     0,     0,     0,     0,     0,
-     578,   579,     0,   832,   833,   834,   581,   582,     0,   835,
-     583,   584,   836,   585,   586,     0,   587,   588,     0,     0,
-     589,     0,     0,   590,     0,   591,     0,   837,   593,     0,
-       0,   838,   839,   840,   594,   841,   595,     0,     0,   596,
-     842,     0,   843,   597,     0,   598,   599,   844,   845,     0,
-       0,     0,     0,     0,     0,   602,   603,   604,     0,   605,
-     606,   607,   608,     0,     0,   846,     0,     0,   610,   611,
-     612,   613,   614,     0,   615,     0,     0,     0,     0,     0,
-     847,   848,     0,   616,   617,   618,   849,   619,   620,   621,
-       0,   622,   850,   851,   623,   852,   624,     0,   853,   854,
-     855,   856,   857,   625,   626,     0,   858,   627,   859,   628,
-     860,   629,   630,     0,     0,     0,   631,   632,   633,   634,
-     635,   636,   637,   638,     0,   639,   640,   641,   642,   643,
-     644,   645,   646,   647,   648,     0,   649,   650,   651,   652,
-     653,   654,   655,   656,   657,   658,   659,   660,   661,   662,
-     663,   664,   665,   666,   667,   668,   669,   670,   671,   672,
-       0,   861,   674,   675,   676,   677,   678,   679,     0,   680,
-     681,   682,   683,   684,   685,   686,   687,   688,   689,   690,
-     691,   692,   693,   694,   695,   696,   697,   698,   699,   700,
-     701,   702,   703,   704,   705,   706,   707,   708,   709,   862,
-     711,     0,     0,     0,     0,     0,   863,   864,     0,     0,
-       0,     0,   866,     0,   867,     0,     0,     0,   868,     0,
-       0,     0,   869,   870,   243,   244,     0,   751,   246,   247,
+     704,   705,   706,   707,   708,   709,   871,   711,   712,   713,
+     714,   715,   716,   717,   718,   719,   720,     0,     0,     0,
+       0,     0,   872,   873,     0,     0,     0,     0,   875,     0,
+     876,     0,     0,     0,   877,     0,     0,     0,   878,   879,
+     243,   244,     0,   760,   246,   247,   248,   249,     0,     0,
+     250,     0,     0,     0,     0,   251,     0,     0,   761,     0,
+     253,   254,   255,   256,   762,   258,     0,   259,     0,     0,
+     763,   260,   764,   765,   766,   261,   767,     0,   262,   263,
+     264,     0,   265,     0,   266,   267,     0,     0,   268,   768,
+     769,   269,   270,     0,   271,   272,   770,   771,   274,     0,
+     275,   276,   277,   278,   772,   280,     0,   773,   282,     0,
+     283,   284,   285,   286,   287,   288,   289,   290,   291,   292,
+     293,     0,   294,   295,     0,   296,   297,   298,   299,   300,
+       0,   774,   775,   301,     0,     0,     0,   776,   302,   777,
+       0,   303,   778,   779,     0,   304,   305,   306,   780,   781,
+     782,     0,     0,     0,     0,   783,   309,   784,     0,     0,
+     785,   310,   311,     0,   312,     0,     0,     0,     0,     0,
+     313,   314,   315,   316,   317,     0,     0,     0,   318,     0,
+       0,   319,   320,   321,     0,     0,     0,   322,     0,   323,
+     324,     0,   325,   326,   327,     0,     0,   328,   329,     0,
+     330,   331,   332,   333,   334,   335,   786,     0,   336,   337,
+     338,   339,   340,   787,   788,   341,   342,     0,   343,   344,
+     345,   346,   347,   789,     0,   348,   349,     0,     0,     0,
+     790,   351,     0,   352,     0,     0,     0,   353,     0,   354,
+     791,   356,   792,     0,   358,     0,   359,     0,   793,     0,
+     360,   361,     0,   362,   794,     0,   363,   364,     0,     0,
+       0,   795,   366,   367,   368,   796,     0,   369,   370,   371,
+       0,     0,   372,     0,     0,     0,   797,   373,   374,   375,
+    3517,     0,     0,   376,     0,     0,     0,   377,   378,     0,
+     379,   380,     0,     0,     0,   381,     0,   382,     0,     0,
+     383,   384,     0,     0,   385,     0,   799,   386,   387,     0,
+       0,     0,     0,     0,   800,   389,     0,   390,     0,   391,
+       0,   392,   393,     0,     0,   801,     0,     0,     0,     0,
+     394,     0,   395,   396,   397,   398,   399,   400,   401,   402,
+     403,   404,   405,   406,   407,   408,   409,   410,   411,     0,
+     412,   413,   414,   802,   415,   416,   417,   418,   803,   419,
+     420,     0,     0,     0,     0,   421,   422,   423,   424,   804,
+     426,     0,     0,   805,   428,   806,   429,     0,   430,   807,
+     808,   809,   810,   811,   435,   436,   437,   438,   439,     0,
+     812,   440,   441,     0,     0,   442,   443,   444,   445,   446,
+     813,   814,   815,   447,   448,     0,   816,   817,   449,     0,
+     450,   451,     0,   452,   453,   454,     0,     0,   455,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   456,   457,
+     458,   818,   459,     0,   460,     0,   461,   462,   463,   464,
+     465,   466,   467,   819,   820,   470,   821,   471,     0,   472,
+     473,   474,     0,   475,     0,   476,   477,   478,   479,   480,
+       0,   822,   482,   483,     0,     0,   484,     0,     0,     0,
+     485,   486,     0,   487,   488,     0,     0,   489,   490,   491,
+     492,   493,     0,   494,   495,     0,   496,   497,   498,   823,
+     824,   499,   500,   501,   502,   503,   504,   505,   506,     0,
+     507,     0,   508,   509,     0,   510,   511,   512,     0,   825,
+       0,   826,   514,   515,   516,   517,     0,   518,   827,   828,
+     520,   521,   522,   523,     0,   829,   525,     0,     0,     0,
+     526,   527,   528,   529,     0,     0,     0,   530,     0,     0,
+       0,   531,     0,   532,   533,   534,   535,     0,   536,   537,
+     538,   539,   540,     0,     0,     0,     0,     0,   541,   542,
+     543,     0,   544,     0,     0,   545,     0,     0,   546,     0,
+     547,     0,   548,   549,   550,   551,   552,   553,   830,   831,
+     554,   555,     0,     0,   556,   557,   832,   559,   560,   561,
+     833,   834,   562,   563,   564,   565,   835,   566,   567,     0,
+       0,   568,   569,   570,   571,     0,   836,   572,   573,     0,
+     837,   838,   839,   840,     0,     0,     0,     0,     0,   578,
+     579,     0,   841,   842,   843,   581,   582,     0,   844,   583,
+     584,   845,   585,   586,     0,   587,   588,     0,     0,   589,
+       0,     0,   590,     0,   591,     0,   846,   593,     0,     0,
+     847,   848,   849,   594,   850,   595,     0,     0,   596,   851,
+       0,   852,   597,     0,   598,   599,   853,   854,     0,     0,
+       0,     0,     0,     0,   602,   603,   604,     0,   605,   606,
+     607,   608,     0,     0,   855,     0,     0,   610,   611,   612,
+     613,   614,     0,   615,     0,     0,     0,     0,     0,   856,
+     857,     0,   616,   617,   618,   858,   619,   620,   621,     0,
+     622,   859,   860,   623,   861,   624,     0,   862,   863,   864,
+     865,   866,   625,   626,     0,   867,   627,   868,   628,   869,
+     629,   630,     0,     0,     0,   631,   632,   633,   634,   635,
+     636,   637,   638,     0,   639,   640,   641,   642,   643,   644,
+     645,   646,   647,   648,     0,   649,   650,   651,   652,   653,
+     654,   655,   656,   657,   658,   659,   660,   661,   662,   663,
+     664,   665,   666,   667,   668,   669,   670,   671,   672,     0,
+     870,   674,   675,   676,   677,   678,   679,     0,   680,   681,
+     682,   683,   684,   685,   686,   687,   688,   689,   690,   691,
+     692,   693,   694,   695,   696,   697,   698,   699,   700,   701,
+     702,   703,   704,   705,   706,   707,   708,   709,   871,   711,
+     712,   713,   714,   715,   716,   717,   718,   719,   720,     0,
+       0,     0,     0,     0,   872,   873,     0,     0,     0,     0,
+     875,     0,   876,     0,     0,     0,   877,     0,     0,     0,
+     878,   879,   243,   244,     0,   760,   246,   247,   248,   249,
+       0,     0,   250,     0,     0,     0,     0,   251,     0,     0,
+     761,     0,   253,   254,   255,   256,   762,   258,     0,   259,
+       0,     0,   763,   260,   764,   765,   766,   261,   767,     0,
+     262,   263,   264,     0,   265,     0,   266,   267,     0,     0,
+     268,   768,   769,   269,   270,     0,   271,   272,   770,   771,
+     274,     0,   275,   276,   277,   278,   772,   280,     0,   773,
+     282,     0,   283,   284,   285,   286,   287,   288,   289,   290,
+     291,   292,   293,     0,   294,   295,     0,   296,   297,   298,
+     299,   300,     0,   774,   775,   301,     0,     0,     0,   776,
+     302,   777,     0,   303,   778,   779,     0,   304,   305,   306,
+     780,   781,   782,     0,     0,     0,     0,   783,   309,   784,
+       0,     0,   785,   310,   311,     0,   312,     0,     0,     0,
+       0,     0,   313,   314,   315,   316,   317,     0,     0,     0,
+     318,     0,     0,   319,   320,   321,     0,     0,     0,   322,
+       0,   323,   324,     0,   325,   326,   327,     0,     0,   328,
+     329,     0,   330,   331,   332,   333,   334,   335,   786,     0,
+     336,   337,   338,   339,   340,   787,   788,   341,   342,     0,
+     343,   344,   345,   346,   347,   789,     0,   348,   349,     0,
+       0,     0,   790,   351,     0,   352,     0,     0,     0,   353,
+       0,   354,   791,   356,   792,     0,   358,     0,   359,     0,
+     793,     0,   360,   361,     0,   362,   794,     0,   363,   364,
+       0,     0,     0,   795,   366,   367,   368,   796,     0,   369,
+     370,   371,     0,     0,   372,     0,     0,     0,   797,   373,
+     374,   375,   798,     0,     0,   376,     0,     0,     0,   377,
+     378,     0,   379,   380,     0,     0,     0,   381,     0,   382,
+       0,     0,   383,   384,     0,     0,   385,     0,   799,   386,
+     387,     0,     0,     0,     0,     0,   800,   389,     0,   390,
+       0,   391,     0,   392,   393,     0,     0,   801,     0,     0,
+       0,     0,   394,     0,   395,   396,   397,   398,   399,   400,
+     401,   402,   403,   404,   405,   406,   407,   408,   409,   410,
+     411,     0,   412,   413,   414,   802,   415,   416,   417,   418,
+     803,   419,   420,  5313,     0,     0,     0,   421,   422,   423,
+     424,   804,   426,     0,     0,   805,   428,   806,   429,     0,
+     430,   807,   808,   809,   810,   811,   435,   436,   437,   438,
+     439,     0,   812,   440,   441,     0,     0,   442,   443,   444,
+     445,   446,   813,     0,   815,   447,   448,     0,   816,   817,
+     449,     0,   450,   451,     0,   452,   453,   454,     0,     0,
+     455,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     456,   457,   458,   818,   459,     0,   460,     0,   461,   462,
+     463,   464,   465,   466,   467,   819,   820,   470,   821,   471,
+       0,   472,   473,   474,     0,   475,     0,   476,   477,   478,
+     479,   480,     0,   822,   482,   483,     0,     0,   484,     0,
+       0,     0,   485,   486,     0,   487,   488,     0,     0,   489,
+     490,   491,   492,   493,     0,   494,   495,     0,   496,   497,
+     498,   823,   824,   499,   500,   501,   502,   503,   504,   505,
+     506,     0,   507,     0,   508,   509,     0,   510,   511,   512,
+       0,   825,     0,   826,   514,   515,   516,   517,     0,   518,
+     827,   828,   520,   521,   522,   523,     0,   829,   525,     0,
+       0,     0,   526,   527,   528,   529,     0,     0,     0,   530,
+       0,     0,     0,   531,     0,   532,   533,   534,   535,     0,
+     536,   537,   538,   539,   540,     0,     0,     0,     0,     0,
+     541,   542,   543,     0,   544,     0,     0,   545,     0,     0,
+     546,     0,   547,     0,   548,   549,   550,   551,   552,   553,
+     830,   831,   554,   555,     0,     0,   556,   557,   832,   559,
+     560,   561,   833,   834,   562,   563,   564,   565,   835,   566,
+     567,     0,     0,   568,   569,   570,   571,     0,   836,   572,
+     573,     0,   837,   838,   839,   840,     0,     0,     0,     0,
+       0,   578,   579,     0,   841,   842,   843,   581,   582,     0,
+     844,   583,   584,   845,   585,   586,     0,   587,   588,     0,
+       0,   589,     0,     0,   590,     0,   591,     0,   846,   593,
+       0,     0,   847,   848,   849,   594,   850,   595,     0,     0,
+     596,   851,     0,   852,   597,     0,   598,   599,   853,   854,
+       0,     0,     0,     0,     0,     0,   602,   603,   604,     0,
+     605,   606,   607,   608,     0,     0,   855,     0,     0,   610,
+     611,   612,   613,   614,     0,   615,     0,     0,     0,     0,
+       0,   856,   857,     0,   616,   617,   618,   858,   619,   620,
+     621,     0,   622,   859,   860,   623,   861,   624,     0,   862,
+     863,   864,   865,   866,   625,   626,     0,   867,   627,   868,
+     628,   869,   629,   630,     0,     0,     0,   631,   632,   633,
+     634,   635,   636,   637,   638,     0,   639,   640,   641,   642,
+     643,   644,   645,   646,   647,   648,     0,   649,   650,   651,
+     652,   653,   654,   655,   656,   657,   658,   659,   660,   661,
+     662,   663,   664,   665,   666,   667,   668,   669,   670,   671,
+     672,     0,   870,   674,   675,   676,   677,   678,   679,     0,
+     680,   681,   682,   683,   684,   685,   686,   687,   688,   689,
+     690,   691,   692,   693,   694,   695,   696,   697,   698,   699,
+     700,   701,   702,   703,   704,   705,   706,   707,   708,   709,
+     871,   711,   712,   713,   714,   715,   716,   717,   718,   719,
+     720,     0,     0,     0,     0,     0,   872,   873,     0,     0,
+       0,     0,   875,     0,   876,     0,     0,     0,   877,     0,
+       0,     0,   878,   879,   243,   244,     0,   760,   246,   247,
      248,   249,     0,     0,   250,     0,     0,     0,     0,   251,
-       0,     0,   752,     0,   253,   254,   255,   256,   753,   258,
-       0,   259,     0,     0,   754,   260,   755,   756,   757,   261,
-     758,     0,   262,   263,   264,     0,   265,     0,   266,   267,
-       0,     0,   268,   759,   760,   269,   270,     0,   271,   272,
-     761,   762,   274,     0,   275,   276,   277,   278,   763,   280,
-       0,   764,   282,     0,   283,   284,   285,   286,   287,   288,
+       0,     0,   761,     0,   253,   254,   255,   256,   762,   258,
+       0,   259,     0,     0,   763,   260,   764,   765,   766,   261,
+     767,     0,   262,   263,   264,     0,   265,     0,   266,   267,
+       0,     0,   268,   768,   769,   269,   270,     0,   271,   272,
+     770,   771,   274,     0,   275,   276,   277,   278,   772,   280,
+       0,   773,   282,     0,   283,   284,   285,   286,   287,   288,
      289,   290,   291,   292,   293,     0,   294,   295,     0,   296,
-     297,   298,   299,   300,     0,   765,   766,   301,     0,     0,
-       0,   767,   302,   768,     0,   303,   769,   770,     0,   304,
-     305,   306,   771,   772,   773,     0,     0,     0,     0,   774,
-     309,   775,     0,     0,   776,   310,   311,     0,   312,     0,
+     297,   298,   299,   300,     0,   774,   775,   301,     0,     0,
+       0,   776,   302,   777,     0,   303,   778,   779,     0,   304,
+     305,   306,   780,   781,   782,     0,     0,     0,     0,   783,
+     309,   784,     0,     0,   785,   310,   311,     0,   312,     0,
        0,     0,     0,     0,   313,   314,   315,   316,   317,     0,
        0,     0,   318,     0,     0,   319,   320,   321,     0,     0,
        0,   322,     0,   323,   324,     0,   325,   326,   327,     0,
        0,   328,   329,     0,   330,   331,   332,   333,   334,   335,
-     777,     0,   336,   337,   338,   339,   340,   778,   779,   341,
-     342,     0,   343,   344,   345,   346,   347,   780,     0,   348,
-     349,     0,     0,     0,   781,   351,     0,   352,     0,     0,
-       0,   353,     0,   354,   782,   356,   783,     0,   358,     0,
-     359,     0,   784,     0,   360,   361,     0,   362,   785,     0,
-     363,   364,     0,     0,     0,   786,   366,   367,   368,   787,
+     786,     0,   336,   337,   338,   339,   340,   787,   788,   341,
+     342,     0,   343,   344,   345,   346,   347,   789,     0,   348,
+     349,     0,     0,     0,   790,   351,     0,   352,     0,     0,
+       0,   353,     0,   354,   791,   356,   792,     0,   358,     0,
+     359,     0,   793,     0,   360,   361,     0,   362,   794,     0,
+     363,   364,     0,     0,     0,   795,   366,   367,   368,   796,
        0,   369,   370,   371,     0,     0,   372,     0,     0,     0,
-     788,   373,   374,   375,   789,     0,     0,   376,     0,     0,
+     797,   373,   374,   375,   798,     0,     0,   376,     0,     0,
        0,   377,   378,     0,   379,   380,     0,     0,     0,   381,
        0,   382,     0,     0,   383,   384,     0,     0,   385,     0,
-     790,   386,   387,     0,     0,     0,     0,     0,   791,   389,
-       0,   390,     0,   391,     0,   392,   393,     0,     0,   792,
+     799,   386,   387,     0,     0,     0,     0,     0,   800,   389,
+       0,   390,     0,   391,     0,   392,   393,     0,     0,   801,
        0,     0,     0,     0,   394,     0,   395,   396,   397,   398,
      399,   400,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,   411,     0,   412,   413,   414,   793,   415,   416,
-     417,   418,   794,   419,   420,  5258,     0,     0,     0,   421,
-     422,   423,   424,   795,   426,     0,     0,   796,   428,   797,
-     429,     0,   430,   798,   799,   800,   801,   802,   435,   436,
-     437,   438,   439,     0,   803,   440,   441,     0,     0,   442,
-     443,   444,   445,   446,   804,     0,   806,   447,   448,     0,
-     807,   808,   449,     0,   450,   451,     0,   452,   453,   454,
+     409,   410,   411,     0,   412,   413,   414,   802,   415,   416,
+     417,   418,   803,   419,   420,     0,     0,     0,     0,   421,
+     422,   423,   424,   804,   426,     0,     0,   805,   428,   806,
+     429,     0,   430,   807,   808,   809,   810,   811,   435,   436,
+     437,   438,   439,     0,   812,   440,   441,     0,     0,   442,
+     443,   444,   445,   446,   813,     0,   815,   447,   448,     0,
+     816,   817,   449,     0,   450,   451,     0,   452,   453,   454,
        0,     0,   455,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   456,   457,   458,   809,   459,     0,   460,     0,
-     461,   462,   463,   464,   465,   466,   467,   810,   811,   470,
-     812,   471,     0,   472,   473,   474,     0,   475,     0,   476,
-     477,   478,   479,   480,     0,   813,   482,   483,     0,     0,
+       0,     0,   456,   457,   458,   818,   459,     0,   460,     0,
+     461,   462,   463,   464,   465,   466,   467,   819,   820,   470,
+     821,   471,     0,   472,   473,   474,     0,   475,     0,   476,
+     477,   478,   479,   480,     0,   822,   482,   483,     0,     0,
      484,     0,     0,     0,   485,   486,     0,   487,   488,     0,
        0,   489,   490,   491,   492,   493,     0,   494,   495,     0,
-     496,   497,   498,   814,   815,   499,   500,   501,   502,   503,
+     496,   497,   498,   823,   824,   499,   500,   501,   502,   503,
      504,   505,   506,     0,   507,     0,   508,   509,     0,   510,
-     511,   512,     0,   816,     0,   817,   514,   515,   516,   517,
-       0,   518,   818,   819,   520,   521,   522,   523,     0,   820,
+     511,   512,     0,   825,     0,   826,   514,   515,   516,   517,
+       0,   518,   827,   828,   520,   521,   522,   523,     0,   829,
      525,     0,     0,     0,   526,   527,   528,   529,     0,     0,
        0,   530,     0,     0,     0,   531,     0,   532,   533,   534,
      535,     0,   536,   537,   538,   539,   540,     0,     0,     0,
        0,     0,   541,   542,   543,     0,   544,     0,     0,   545,
        0,     0,   546,     0,   547,     0,   548,   549,   550,   551,
-     552,   553,   821,   822,   554,   555,     0,     0,   556,   557,
-     823,   559,   560,   561,   824,   825,   562,   563,   564,   565,
-     826,   566,   567,     0,     0,   568,   569,   570,   571,     0,
-     827,   572,   573,     0,   828,   829,   830,   831,     0,     0,
-       0,     0,     0,   578,   579,     0,   832,   833,   834,   581,
-     582,     0,   835,   583,   584,   836,   585,   586,     0,   587,
+     552,   553,   830,   831,   554,   555,     0,     0,   556,   557,
+     832,   559,   560,   561,   833,   834,   562,   563,   564,   565,
+     835,   566,   567,     0,     0,   568,   569,   570,   571,     0,
+     836,   572,   573,     0,   837,   838,   839,   840,     0,     0,
+       0,     0,     0,   578,   579,     0,   841,   842,   843,   581,
+     582,     0,   844,   583,   584,   845,   585,   586,     0,   587,
      588,     0,     0,   589,     0,     0,   590,     0,   591,     0,
-     837,   593,     0,     0,   838,   839,   840,   594,   841,   595,
-       0,     0,   596,   842,     0,   843,   597,     0,   598,   599,
-     844,   845,     0,     0,     0,     0,     0,     0,   602,   603,
-     604,     0,   605,   606,   607,   608,     0,     0,   846,     0,
+     846,   593,     0,     0,   847,   848,   849,   594,   850,   595,
+       0,     0,   596,   851,     0,   852,   597,     0,   598,   599,
+     853,   854,     0,     0,     0,     0,     0,     0,   602,   603,
+     604,     0,   605,   606,   607,   608,     0,     0,   855,     0,
        0,   610,   611,   612,   613,   614,     0,   615,     0,     0,
-       0,     0,     0,   847,   848,     0,   616,   617,   618,   849,
-     619,   620,   621,     0,   622,   850,   851,   623,   852,   624,
-       0,   853,   854,   855,   856,   857,   625,   626,     0,   858,
-     627,   859,   628,   860,   629,   630,     0,     0,     0,   631,
+       0,     0,     0,   856,   857,     0,   616,   617,   618,   858,
+     619,   620,   621,     0,   622,   859,   860,   623,   861,   624,
+       0,   862,   863,   864,   865,   866,   625,   626,     0,   867,
+     627,   868,   628,   869,   629,   630,     0,     0,     0,   631,
      632,   633,   634,   635,   636,   637,   638,     0,   639,   640,
      641,   642,   643,   644,   645,   646,   647,   648,     0,   649,
      650,   651,   652,   653,   654,   655,   656,   657,   658,   659,
      660,   661,   662,   663,   664,   665,   666,   667,   668,   669,
-     670,   671,   672,     0,   861,   674,   675,   676,   677,   678,
+     670,   671,   672,     0,   870,   674,   675,   676,   677,   678,
      679,     0,   680,   681,   682,   683,   684,   685,   686,   687,
      688,   689,   690,   691,   692,   693,   694,   695,   696,   697,
      698,   699,   700,   701,   702,   703,   704,   705,   706,   707,
-     708,   709,   862,   711,     0,     0,     0,     0,     0,   863,
-     864,     0,     0,     0,     0,   866,     0,   867,     0,     0,
-       0,   868,     0,     0,     0,   869,   870,   243,   244,     0,
-     751,   246,   247,   248,   249,     0,     0,   250,     0,     0,
-       0,     0,   251,     0,     0,   752,     0,   253,   254,   255,
-     256,   753,   258,     0,   259,     0,     0,   754,   260,   755,
-     756,   757,   261,   758,     0,   262,   263,   264,     0,   265,
-       0,   266,   267,     0,     0,   268,   759,   760,   269,   270,
-       0,   271,   272,   761,   762,   274,     0,   275,   276,   277,
-     278,   763,   280,     0,   764,   282,     0,   283,   284,   285,
-     286,   287,   288,   289,   290,   291,   292,   293,     0,   294,
-     295,     0,   296,   297,   298,   299,   300,     0,   765,   766,
-     301,     0,     0,     0,   767,   302,   768,     0,   303,   769,
-     770,     0,   304,   305,   306,   771,   772,   773,     0,     0,
-       0,     0,   774,   309,   775,     0,     0,   776,   310,   311,
-       0,   312,     0,     0,     0,     0,     0,   313,   314,   315,
-     316,   317,     0,     0,     0,   318,     0,     0,   319,   320,
-     321,     0,     0,     0,   322,     0,   323,   324,     0,   325,
-     326,   327,     0,     0,   328,   329,     0,   330,   331,   332,
-     333,   334,   335,   777,     0,   336,   337,   338,   339,   340,
-     778,   779,   341,   342,     0,   343,   344,   345,   346,   347,
-     780,     0,   348,   349,     0,     0,     0,   781,   351,     0,
-     352,     0,     0,     0,   353,     0,   354,   782,   356,   783,
-       0,   358,     0,   359,     0,   784,     0,   360,   361,     0,
-     362,   785,     0,   363,   364,     0,     0,     0,   786,   366,
-     367,   368,   787,     0,   369,   370,   371,     0,     0,   372,
-       0,     0,     0,   788,   373,   374,   375,   789,     0,     0,
-     376,     0,     0,     0,   377,   378,     0,   379,   380,     0,
-       0,     0,   381,     0,   382,     0,     0,   383,   384,     0,
-       0,   385,     0,   790,   386,   387,     0,     0,     0,     0,
-       0,   791,   389,     0,   390,     0,   391,     0,   392,   393,
-       0,     0,   792,     0,     0,     0,     0,   394,     0,   395,
-     396,   397,   398,   399,   400,   401,   402,   403,   404,   405,
-     406,   407,   408,   409,   410,   411,     0,   412,   413,   414,
-     793,   415,   416,   417,   418,   794,   419,   420,     0,     0,
-       0,     0,   421,   422,   423,   424,   795,   426,     0,     0,
-     796,   428,   797,   429,     0,   430,   798,   799,   800,   801,
-     802,   435,   436,   437,   438,   439,     0,   803,   440,   441,
-       0,     0,   442,   443,   444,   445,   446,   804,     0,   806,
-     447,   448,     0,   807,   808,   449,     0,   450,   451,     0,
-     452,   453,   454,     0,     0,   455,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   456,   457,   458,   809,   459,
-       0,   460,     0,   461,   462,   463,   464,   465,   466,   467,
-     810,   811,   470,   812,   471,     0,   472,   473,   474,     0,
-     475,     0,   476,   477,   478,   479,   480,     0,   813,   482,
-     483,     0,     0,   484,     0,     0,     0,   485,   486,     0,
-     487,   488,     0,     0,   489,   490,   491,   492,   493,     0,
-     494,   495,     0,   496,   497,   498,   814,   815,   499,   500,
-     501,   502,   503,   504,   505,   506,     0,   507,     0,   508,
-     509,     0,   510,   511,   512,     0,   816,     0,   817,   514,
-     515,   516,   517,     0,   518,   818,   819,   520,   521,   522,
-     523,     0,   820,   525,     0,     0,     0,   526,   527,   528,
-     529,     0,     0,     0,   530,     0,     0,     0,   531,     0,
-     532,   533,   534,   535,     0,   536,   537,   538,   539,   540,
-       0,     0,     0,     0,     0,   541,   542,   543,     0,   544,
-       0,     0,   545,     0,     0,   546,     0,   547,     0,   548,
-     549,   550,   551,   552,   553,   821,   822,   554,   555,     0,
-       0,   556,   557,   823,   559,   560,   561,   824,   825,   562,
-     563,   564,   565,   826,   566,   567,     0,     0,   568,   569,
-     570,   571,     0,   827,   572,   573,     0,   828,   829,   830,
-     831,     0,     0,     0,     0,     0,   578,   579,     0,   832,
-     833,   834,   581,   582,     0,   835,   583,   584,   836,   585,
-     586,     0,   587,   588,     0,     0,   589,     0,     0,   590,
-       0,   591,     0,   837,   593,     0,     0,   838,   839,   840,
-     594,   841,   595,     0,     0,   596,   842,     0,   843,   597,
-       0,   598,   599,   844,   845,     0,     0,     0,     0,     0,
-       0,   602,   603,   604,     0,   605,   606,   607,   608,     0,
-       0,   846,     0,     0,   610,   611,   612,   613,   614,     0,
-     615,     0,     0,     0,     0,     0,   847,   848,     0,   616,
-     617,   618,   849,   619,   620,   621,     0,   622,   850,   851,
-     623,   852,   624,     0,   853,   854,   855,   856,   857,   625,
-     626,     0,   858,   627,   859,   628,   860,   629,   630,     0,
-       0,     0,   631,   632,   633,   634,   635,   636,   637,   638,
-       0,   639,   640,   641,   642,   643,   644,   645,   646,   647,
-     648,     0,   649,   650,   651,   652,   653,   654,   655,   656,
-     657,   658,   659,   660,   661,   662,   663,   664,   665,   666,
-     667,   668,   669,   670,   671,   672,     0,   861,   674,   675,
-     676,   677,   678,   679,     0,   680,   681,   682,   683,   684,
-     685,   686,   687,   688,   689,   690,   691,   692,   693,   694,
-     695,   696,   697,   698,   699,   700,   701,   702,   703,   704,
-     705,   706,   707,   708,   709,   862,   711,     0,     0,     0,
-       0,     0,   863,   864,     0,     0,     0,     0,   866,     0,
-     867,     0,     0,     0,   868,     0,     0,     0,   869,   870,
-     243,   244,     0,   751,   246,   247,   248,   249,     0,     0,
-     250,     0,     0,     0,     0,   251,     0,     0,   752,     0,
-     253,   254,   255,   256,   753,   258,     0,   259,     0,     0,
-     754,   260,   755,   756,   757,   261,   758,     0,   262,   263,
-     264,     0,   265,     0,   266,   267,     0,     0,   268,   759,
-     760,   269,   270,     0,   271,   272,   761,   762,   274,     0,
-     275,   276,   277,   278,   763,   280,     0,   764,   282,     0,
-     283,   284,   285,   286,   287,   288,   289,   290,   291,   292,
-     293,     0,   294,   295,     0,   296,   297,   298,   299,   300,
-       0,   765,   766,   301,     0,     0,     0,   767,   302,   768,
-       0,   303,   769,   770,     0,   304,   305,   306,   771,   772,
-     773,     0,     0,     0,     0,   774,   309,   775,     0,     0,
-     776,   310,   311,     0,   312,     0,     0,     0,     0,     0,
-     313,   314,   315,   316,   317,     0,     0,     0,   318,     0,
-       0,   319,   320,   321,     0,     0,     0,   322,     0,   323,
-     324,     0,   325,   326,   327,     0,     0,   328,   329,     0,
-     330,   331,   332,   333,   334,   335,   777,     0,   336,   337,
-     338,   339,   340,   778,   779,   341,   342,     0,   343,   344,
-     345,   346,   347,   780,     0,   348,   349,     0,     0,     0,
-     781,   351,     0,   352,     0,     0,     0,   353,     0,   354,
-     782,   356,   783,     0,   358,     0,   359,     0,   784,     0,
-     360,   361,     0,   362,   785,     0,   363,   364,     0,     0,
-       0,   786,   366,   367,   368,   787,     0,   369,   370,   371,
-       0,     0,   372,     0,     0,     0,   788,   373,   374,   375,
-    2087,     0,     0,   376,     0,     0,     0,   377,   378,     0,
-     379,   380,     0,     0,     0,   381,     0,   382,     0,     0,
-     383,   384,     0,     0,   385,     0,   790,   386,   387,     0,
-       0,     0,     0,     0,   791,   389,     0,   390,     0,   391,
-       0,   392,   393,     0,     0,   792,     0,     0,     0,     0,
-     394,     0,   395,   396,   397,   398,   399,   400,   401,   402,
-     403,   404,   405,   406,   407,   408,   409,   410,   411,     0,
-     412,   413,   414,   793,   415,   416,   417,   418,   794,   419,
-     420,     0,     0,     0,     0,   421,   422,   423,   424,   795,
-     426,     0,     0,   796,   428,   797,   429,     0,   430,   798,
-     799,   800,   801,   802,   435,   436,   437,   438,   439,     0,
-     803,   440,   441,     0,     0,   442,   443,   444,   445,   446,
-     804,     0,   806,   447,   448,     0,   807,   808,   449,     0,
-     450,   451,     0,   452,   453,   454,     0,     0,   455,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   456,   457,
-     458,   809,   459,     0,   460,     0,   461,   462,   463,   464,
-     465,   466,   467,   810,   811,   470,   812,   471,     0,   472,
-     473,   474,     0,   475,     0,   476,   477,   478,   479,   480,
-       0,   813,   482,   483,     0,     0,   484,     0,     0,     0,
-     485,   486,     0,   487,   488,     0,     0,   489,   490,   491,
-     492,   493,     0,   494,   495,     0,   496,   497,   498,   814,
-     815,   499,   500,   501,   502,   503,   504,   505,   506,     0,
-     507,     0,   508,   509,     0,   510,   511,   512,     0,   816,
-       0,   817,   514,   515,   516,   517,     0,   518,   818,   819,
-     520,   521,   522,   523,     0,   820,   525,     0,     0,     0,
-     526,   527,   528,   529,     0,     0,     0,   530,     0,     0,
-       0,   531,     0,   532,   533,   534,   535,     0,   536,   537,
-     538,   539,   540,     0,     0,     0,     0,     0,   541,   542,
-     543,     0,   544,     0,     0,   545,     0,     0,   546,     0,
-     547,     0,   548,   549,   550,   551,   552,   553,   821,   822,
-     554,   555,     0,     0,   556,   557,   823,   559,   560,   561,
-     824,   825,   562,   563,   564,   565,   826,   566,   567,     0,
-       0,   568,   569,   570,   571,     0,   827,   572,   573,     0,
-     828,   829,   830,   831,     0,     0,     0,     0,     0,   578,
-     579,     0,   832,   833,   834,   581,   582,     0,   835,   583,
-     584,   836,   585,   586,     0,   587,   588,     0,     0,   589,
-       0,     0,   590,     0,   591,     0,   837,   593,     0,     0,
-     838,   839,   840,   594,   841,   595,     0,     0,   596,   842,
-       0,   843,   597,     0,   598,   599,   844,   845,     0,     0,
-       0,     0,     0,     0,   602,   603,   604,     0,   605,   606,
-     607,   608,     0,     0,   846,     0,     0,   610,   611,   612,
-     613,   614,     0,   615,     0,     0,     0,     0,     0,   847,
-     848,     0,   616,   617,   618,   849,   619,   620,   621,     0,
-     622,   850,   851,   623,   852,   624,     0,   853,   854,   855,
-     856,   857,   625,   626,     0,   858,   627,   859,   628,   860,
-     629,   630,     0,     0,     0,   631,   632,   633,   634,   635,
-     636,   637,   638,     0,   639,   640,   641,   642,   643,   644,
-     645,   646,   647,   648,     0,   649,   650,   651,   652,   653,
-     654,   655,   656,   657,   658,   659,   660,   661,   662,   663,
-     664,   665,   666,   667,   668,   669,   670,   671,   672,     0,
-     861,   674,   675,   676,   677,   678,   679,     0,   680,   681,
-     682,   683,   684,   685,   686,   687,   688,   689,   690,   691,
-     692,   693,   694,   695,   696,   697,   698,   699,   700,   701,
-     702,   703,   704,   705,   706,   707,   708,   709,   862,   711,
-       0,     0,     0,     0,     0,   863,   864,     0,     0,     0,
-       0,   866,     0,   867,     0,     0,     0,   868,     0,     0,
-       0,   869,   870,   243,   244,     0,   751,   246,   247,   248,
-     249,     0,     0,   250,     0,     0,     0,     0,   251,     0,
-       0,   752,     0,   253,   254,   255,   256,   753,   258,     0,
-     259,     0,     0,   754,   260,   755,   756,   757,   261,   758,
-       0,   262,   263,   264,     0,   265,     0,   266,   267,     0,
-       0,   268,   759,   760,   269,   270,     0,   271,   272,   761,
-     762,   274,     0,   275,   276,   277,   278,   763,   280,     0,
-     764,   282,     0,   283,   284,   285,   286,   287,   288,   289,
-     290,   291,   292,   293,     0,   294,   295,     0,   296,   297,
-     298,   299,   300,     0,   765,   766,   301,     0,     0,     0,
-     767,   302,   768,     0,   303,   769,   770,     0,   304,   305,
-     306,   771,   772,   773,     0,     0,     0,     0,   774,   309,
-     775,     0,     0,   776,   310,   311,     0,   312,     0,     0,
-       0,     0,     0,   313,   314,   315,   316,   317,     0,     0,
-       0,   318,     0,     0,   319,   320,   321,     0,     0,     0,
-     322,     0,   323,   324,     0,   325,   326,   327,     0,     0,
-     328,   329,     0,   330,   331,   332,   333,   334,   335,   777,
-       0,   336,   337,   338,   339,   340,   778,   779,   341,   342,
-       0,   343,   344,   345,   346,   347,   780,     0,   348,   349,
-       0,     0,     0,   781,   351,     0,   352,     0,     0,     0,
-     353,     0,   354,   782,   356,   783,     0,   358,     0,   359,
-       0,   784,     0,   360,   361,     0,   362,   785,     0,   363,
-     364,     0,     0,     0,   786,   366,   367,   368,   787,     0,
-     369,   370,   371,     0,     0,   372,     0,     0,     0,   788,
-     373,   374,   375,  2089,     0,     0,   376,     0,     0,     0,
-     377,   378,     0,   379,   380,     0,     0,     0,   381,     0,
-     382,     0,     0,   383,   384,     0,     0,   385,     0,   790,
-     386,   387,     0,     0,     0,     0,     0,   791,   389,     0,
-     390,     0,   391,     0,   392,   393,     0,     0,   792,     0,
-       0,     0,     0,   394,     0,   395,   396,   397,   398,   399,
-     400,   401,   402,   403,   404,   405,   406,   407,   408,   409,
-     410,   411,     0,   412,   413,   414,   793,   415,   416,   417,
-     418,   794,   419,   420,     0,     0,     0,     0,   421,   422,
-     423,   424,   795,   426,     0,     0,   796,   428,   797,   429,
-       0,   430,   798,   799,   800,   801,   802,   435,   436,   437,
-     438,   439,     0,   803,   440,   441,     0,     0,   442,   443,
-     444,   445,   446,   804,     0,   806,   447,   448,     0,   807,
-     808,   449,     0,   450,   451,     0,   452,   453,   454,     0,
-       0,   455,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   456,   457,   458,   809,   459,     0,   460,     0,   461,
-     462,   463,   464,   465,   466,   467,   810,   811,   470,   812,
-     471,     0,   472,   473,   474,     0,   475,     0,   476,   477,
-     478,   479,   480,     0,   813,   482,   483,     0,     0,   484,
-       0,     0,     0,   485,   486,     0,   487,   488,     0,     0,
-     489,   490,   491,   492,   493,     0,   494,   495,     0,   496,
-     497,   498,   814,   815,   499,   500,   501,   502,   503,   504,
-     505,   506,     0,   507,     0,   508,   509,     0,   510,   511,
-     512,     0,   816,     0,   817,   514,   515,   516,   517,     0,
-     518,   818,   819,   520,   521,   522,   523,     0,   820,   525,
-       0,     0,     0,   526,   527,   528,   529,     0,     0,     0,
-     530,     0,     0,     0,   531,     0,   532,   533,   534,   535,
-       0,   536,   537,   538,   539,   540,     0,     0,     0,     0,
-       0,   541,   542,   543,     0,   544,     0,     0,   545,     0,
-       0,   546,     0,   547,     0,   548,   549,   550,   551,   552,
-     553,   821,   822,   554,   555,     0,     0,   556,   557,   823,
-     559,   560,   561,   824,   825,   562,   563,   564,   565,   826,
-     566,   567,     0,     0,   568,   569,   570,   571,     0,   827,
-     572,   573,     0,   828,   829,   830,   831,     0,     0,     0,
-       0,     0,   578,   579,     0,   832,   833,   834,   581,   582,
-       0,   835,   583,   584,   836,   585,   586,     0,   587,   588,
-       0,     0,   589,     0,     0,   590,     0,   591,     0,   837,
-     593,     0,     0,   838,   839,   840,   594,   841,   595,     0,
-       0,   596,   842,     0,   843,   597,     0,   598,   599,   844,
-     845,     0,     0,     0,     0,     0,     0,   602,   603,   604,
-       0,   605,   606,   607,   608,     0,     0,   846,     0,     0,
-     610,   611,   612,   613,   614,     0,   615,     0,     0,     0,
-       0,     0,   847,   848,     0,   616,   617,   618,   849,   619,
-     620,   621,     0,   622,   850,   851,   623,   852,   624,     0,
-     853,   854,   855,   856,   857,   625,   626,     0,   858,   627,
-     859,   628,   860,   629,   630,     0,     0,     0,   631,   632,
-     633,   634,   635,   636,   637,   638,     0,   639,   640,   641,
-     642,   643,   644,   645,   646,   647,   648,     0,   649,   650,
-     651,   652,   653,   654,   655,   656,   657,   658,   659,   660,
-     661,   662,   663,   664,   665,   666,   667,   668,   669,   670,
-     671,   672,     0,   861,   674,   675,   676,   677,   678,   679,
-       0,   680,   681,   682,   683,   684,   685,   686,   687,   688,
-     689,   690,   691,   692,   693,   694,   695,   696,   697,   698,
-     699,   700,   701,   702,   703,   704,   705,   706,   707,   708,
-     709,   862,   711,     0,     0,     0,     0,     0,   863,   864,
-       0,     0,     0,     0,   866,     0,   867,     0,     0,     0,
-     868,     0,     0,     0,   869,   870,   243,   244,     0,   245,
+     708,   709,   871,   711,   712,   713,   714,   715,   716,   717,
+     718,   719,   720,     0,     0,     0,     0,     0,   872,   873,
+       0,     0,     0,     0,   875,     0,   876,     0,     0,     0,
+     877,     0,     0,     0,   878,   879,   243,   244,     0,   760,
      246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
+       0,   251,     0,     0,   761,     0,   253,   254,   255,   256,
+     762,   258,     0,   259,     0,     0,   763,   260,   764,   765,
+     766,   261,   767,     0,   262,   263,   264,     0,   265,     0,
+     266,   267,     0,     0,   268,   768,   769,   269,   270,     0,
+     271,   272,   770,   771,   274,     0,   275,   276,   277,   278,
+     772,   280,     0,   773,   282,     0,   283,   284,   285,   286,
      287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,     0,   310,   311,     0,
+       0,   296,   297,   298,   299,   300,     0,   774,   775,   301,
+       0,     0,     0,   776,   302,   777,     0,   303,   778,   779,
+       0,   304,   305,   306,   780,   781,   782,     0,     0,     0,
+       0,   783,   309,   784,     0,     0,   785,   310,   311,     0,
      312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
      317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
        0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
      327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
+     334,   335,   786,     0,   336,   337,   338,   339,   340,   787,
+     788,   341,   342,     0,   343,   344,   345,   346,   347,   789,
+       0,   348,   349,     0,     0,     0,   790,   351,     0,   352,
+       0,     0,     0,   353,     0,   354,   791,   356,   792,     0,
+     358,     0,   359,     0,   793,     0,   360,   361,     0,   362,
+     794,     0,   363,   364,     0,     0,     0,   795,   366,   367,
+     368,   796,     0,   369,   370,   371,     0,     0,   372,     0,
+       0,     0,   797,   373,   374,   375,  2111,     0,     0,   376,
        0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
        0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,     0,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
+     385,     0,   799,   386,   387,     0,     0,     0,     0,     0,
+     800,   389,     0,   390,     0,   391,     0,   392,   393,     0,
+       0,   801,     0,     0,     0,     0,   394,     0,   395,   396,
      397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
+     407,   408,   409,   410,   411,     0,   412,   413,   414,   802,
+     415,   416,   417,   418,   803,   419,   420,     0,     0,     0,
+       0,   421,   422,   423,   424,   804,   426,     0,     0,   805,
+     428,   806,   429,     0,   430,   807,   808,   809,   810,   811,
+     435,   436,   437,   438,   439,     0,   812,   440,   441,     0,
+       0,   442,   443,   444,   445,   446,   813,     0,   815,   447,
+     448,     0,   816,   817,   449,     0,   450,   451,     0,   452,
      453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
+       0,     0,     0,     0,   456,   457,   458,   818,   459,     0,
+     460,     0,   461,   462,   463,   464,   465,   466,   467,   819,
+     820,   470,   821,   471,     0,   472,   473,   474,     0,   475,
+       0,   476,   477,   478,   479,   480,     0,   822,   482,   483,
        0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
      488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
+     495,     0,   496,   497,   498,   823,   824,   499,   500,   501,
      502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,    42,     0,     0,   526,   527,   528,   529,
+       0,   510,   511,   512,     0,   825,     0,   826,   514,   515,
+     516,   517,     0,   518,   827,   828,   520,   521,   522,   523,
+       0,   829,   525,     0,     0,     0,   526,   527,   528,   529,
        0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
      533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
        0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
        0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,    49,   568,   569,   570,
-     571,     0,     0,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
+     550,   551,   552,   553,   830,   831,   554,   555,     0,     0,
+     556,   557,   832,   559,   560,   561,   833,   834,   562,   563,
+     564,   565,   835,   566,   567,     0,     0,   568,   569,   570,
+     571,     0,   836,   572,   573,     0,   837,   838,   839,   840,
+       0,     0,     0,     0,     0,   578,   579,     0,   841,   842,
+     843,   581,   582,     0,   844,   583,   584,   845,   585,   586,
        0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-      54,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,    55,     0,     0,
+     591,     0,   846,   593,     0,     0,   847,   848,   849,   594,
+     850,   595,     0,     0,   596,   851,     0,   852,   597,     0,
+     598,   599,   853,   854,     0,     0,     0,     0,     0,     0,
      602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-    2932,   631,   632,   633,   634,   635,   636,   637,   638,     0,
+     855,     0,     0,   610,   611,   612,   613,   614,     0,   615,
+       0,     0,     0,     0,     0,   856,   857,     0,   616,   617,
+     618,   858,   619,   620,   621,     0,   622,   859,   860,   623,
+     861,   624,     0,   862,   863,   864,   865,   866,   625,   626,
+       0,   867,   627,   868,   628,   869,   629,   630,     0,     0,
+       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
      639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
-    2933,   649,   650,   651,   652,   653,   654,   655,   656,   657,
+       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
      658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
+     668,   669,   670,   671,   672,     0,   870,   674,   675,   676,
      677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
      686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
      696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,     0,     0,     0,     0,
-       0,   243,   244,     0,   245,   246,   247,   248,   249,  2934,
-       0,   250,     0,     0,     0,     0,   251,     0,  2935,   252,
-       0,   253,   254,   255,   256,   257,   258,     0,   259,     0,
+     706,   707,   708,   709,   871,   711,   712,   713,   714,   715,
+     716,   717,   718,   719,   720,     0,     0,     0,     0,     0,
+     872,   873,     0,     0,     0,     0,   875,     0,   876,     0,
+       0,     0,   877,     0,     0,     0,   878,   879,   243,   244,
+       0,   760,   246,   247,   248,   249,     0,     0,   250,     0,
+       0,     0,     0,   251,     0,     0,   761,     0,   253,   254,
+     255,   256,   762,   258,     0,   259,     0,     0,   763,   260,
+     764,   765,   766,   261,   767,     0,   262,   263,   264,     0,
+     265,     0,   266,   267,     0,     0,   268,   768,   769,   269,
+     270,     0,   271,   272,   770,   771,   274,     0,   275,   276,
+     277,   278,   772,   280,     0,   773,   282,     0,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,     0,
+     294,   295,     0,   296,   297,   298,   299,   300,     0,   774,
+     775,   301,     0,     0,     0,   776,   302,   777,     0,   303,
+     778,   779,     0,   304,   305,   306,   780,   781,   782,     0,
+       0,     0,     0,   783,   309,   784,     0,     0,   785,   310,
+     311,     0,   312,     0,     0,     0,     0,     0,   313,   314,
+     315,   316,   317,     0,     0,     0,   318,     0,     0,   319,
+     320,   321,     0,     0,     0,   322,     0,   323,   324,     0,
+     325,   326,   327,     0,     0,   328,   329,     0,   330,   331,
+     332,   333,   334,   335,   786,     0,   336,   337,   338,   339,
+     340,   787,   788,   341,   342,     0,   343,   344,   345,   346,
+     347,   789,     0,   348,   349,     0,     0,     0,   790,   351,
+       0,   352,     0,     0,     0,   353,     0,   354,   791,   356,
+     792,     0,   358,     0,   359,     0,   793,     0,   360,   361,
+       0,   362,   794,     0,   363,   364,     0,     0,     0,   795,
+     366,   367,   368,   796,     0,   369,   370,   371,     0,     0,
+     372,     0,     0,     0,   797,   373,   374,   375,  2113,     0,
+       0,   376,     0,     0,     0,   377,   378,     0,   379,   380,
+       0,     0,     0,   381,     0,   382,     0,     0,   383,   384,
+       0,     0,   385,     0,   799,   386,   387,     0,     0,     0,
+       0,     0,   800,   389,     0,   390,     0,   391,     0,   392,
+     393,     0,     0,   801,     0,     0,     0,     0,   394,     0,
+     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
+     405,   406,   407,   408,   409,   410,   411,     0,   412,   413,
+     414,   802,   415,   416,   417,   418,   803,   419,   420,     0,
+       0,     0,     0,   421,   422,   423,   424,   804,   426,     0,
+       0,   805,   428,   806,   429,     0,   430,   807,   808,   809,
+     810,   811,   435,   436,   437,   438,   439,     0,   812,   440,
+     441,     0,     0,   442,   443,   444,   445,   446,   813,     0,
+     815,   447,   448,     0,   816,   817,   449,     0,   450,   451,
+       0,   452,   453,   454,     0,     0,   455,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   456,   457,   458,   818,
+     459,     0,   460,     0,   461,   462,   463,   464,   465,   466,
+     467,   819,   820,   470,   821,   471,     0,   472,   473,   474,
+       0,   475,     0,   476,   477,   478,   479,   480,     0,   822,
+     482,   483,     0,     0,   484,     0,     0,     0,   485,   486,
+       0,   487,   488,     0,     0,   489,   490,   491,   492,   493,
+       0,   494,   495,     0,   496,   497,   498,   823,   824,   499,
+     500,   501,   502,   503,   504,   505,   506,     0,   507,     0,
+     508,   509,     0,   510,   511,   512,     0,   825,     0,   826,
+     514,   515,   516,   517,     0,   518,   827,   828,   520,   521,
+     522,   523,     0,   829,   525,     0,     0,     0,   526,   527,
+     528,   529,     0,     0,     0,   530,     0,     0,     0,   531,
+       0,   532,   533,   534,   535,     0,   536,   537,   538,   539,
+     540,     0,     0,     0,     0,     0,   541,   542,   543,     0,
+     544,     0,     0,   545,     0,     0,   546,     0,   547,     0,
+     548,   549,   550,   551,   552,   553,   830,   831,   554,   555,
+       0,     0,   556,   557,   832,   559,   560,   561,   833,   834,
+     562,   563,   564,   565,   835,   566,   567,     0,     0,   568,
+     569,   570,   571,     0,   836,   572,   573,     0,   837,   838,
+     839,   840,     0,     0,     0,     0,     0,   578,   579,     0,
+     841,   842,   843,   581,   582,     0,   844,   583,   584,   845,
+     585,   586,     0,   587,   588,     0,     0,   589,     0,     0,
+     590,     0,   591,     0,   846,   593,     0,     0,   847,   848,
+     849,   594,   850,   595,     0,     0,   596,   851,     0,   852,
+     597,     0,   598,   599,   853,   854,     0,     0,     0,     0,
+       0,     0,   602,   603,   604,     0,   605,   606,   607,   608,
+       0,     0,   855,     0,     0,   610,   611,   612,   613,   614,
+       0,   615,     0,     0,     0,     0,     0,   856,   857,     0,
+     616,   617,   618,   858,   619,   620,   621,     0,   622,   859,
+     860,   623,   861,   624,     0,   862,   863,   864,   865,   866,
+     625,   626,     0,   867,   627,   868,   628,   869,   629,   630,
+       0,     0,     0,   631,   632,   633,   634,   635,   636,   637,
+     638,     0,   639,   640,   641,   642,   643,   644,   645,   646,
+     647,   648,     0,   649,   650,   651,   652,   653,   654,   655,
+     656,   657,   658,   659,   660,   661,   662,   663,   664,   665,
+     666,   667,   668,   669,   670,   671,   672,     0,   870,   674,
+     675,   676,   677,   678,   679,     0,   680,   681,   682,   683,
+     684,   685,   686,   687,   688,   689,   690,   691,   692,   693,
+     694,   695,   696,   697,   698,   699,   700,   701,   702,   703,
+     704,   705,   706,   707,   708,   709,   871,   711,   712,   713,
+     714,   715,   716,   717,   718,   719,   720,     0,     0,     0,
+       0,     0,   872,   873,     0,     0,     0,     0,   875,     0,
+     876,     0,     0,     0,   877,     0,     0,     0,   878,   879,
+     243,   244,     0,   245,   246,   247,   248,   249,     0,     0,
+     250,     0,     0,     0,     0,   251,     0,     0,   252,     0,
+     253,   254,   255,   256,   257,   258,     0,   259,     0,     0,
+       0,   260,     0,     0,     0,   261,     0,     0,   262,   263,
+     264,     0,   265,     0,   266,   267,     0,     0,   268,     0,
+       0,   269,   270,     0,   271,   272,   273,     0,   274,     0,
+     275,   276,   277,   278,   279,   280,     0,   281,   282,     0,
+     283,   284,   285,   286,   287,   288,   289,   290,   291,   292,
+     293,     0,   294,   295,     0,   296,   297,   298,   299,   300,
+       0,     0,     0,   301,     0,     0,     0,     0,   302,     0,
+       0,   303,     0,     0,     0,   304,   305,   306,     0,     0,
+     307,     0,     0,     0,     0,   308,   309,     0,     0,     0,
+       0,   310,   311,     0,   312,     0,     0,     0,     0,     0,
+     313,   314,   315,   316,   317,     0,     0,     0,   318,     0,
+       0,   319,   320,   321,     0,     0,     0,   322,     0,   323,
+     324,     0,   325,   326,   327,     0,     0,   328,   329,     0,
+     330,   331,   332,   333,   334,   335,     0,     0,   336,   337,
+     338,   339,   340,     0,     0,   341,   342,     0,   343,   344,
+     345,   346,   347,     0,     0,   348,   349,     0,     0,     0,
+     350,   351,     0,   352,     0,     0,     0,   353,     0,   354,
+     355,   356,   357,     0,   358,     0,   359,     0,     0,     0,
+     360,   361,     0,   362,     0,     0,   363,   364,     0,     0,
+       0,   365,   366,   367,   368,     0,     0,   369,   370,   371,
+       0,     0,   372,     0,     0,     0,     0,   373,   374,   375,
+       0,     0,     0,   376,     0,     0,     0,   377,   378,     0,
+     379,   380,     0,     0,     0,   381,     0,   382,     0,     0,
+     383,   384,     0,     0,   385,     0,     0,   386,   387,     0,
+       0,     0,     0,     0,   388,   389,     0,   390,     0,   391,
+       0,   392,   393,     0,     0,     0,     0,     0,     0,     0,
+     394,     0,   395,   396,   397,   398,   399,   400,   401,   402,
+     403,   404,   405,   406,   407,   408,   409,   410,   411,     0,
+     412,   413,   414,     0,   415,   416,   417,   418,     0,   419,
+     420,     0,     0,     0,     0,   421,   422,   423,   424,   425,
+     426,     0,     0,   427,   428,     0,   429,     0,   430,     0,
+     431,   432,   433,   434,   435,   436,   437,   438,   439,     0,
+       0,   440,   441,     0,     0,   442,   443,   444,   445,   446,
+       0,     0,     0,   447,   448,     0,     0,     0,   449,     0,
+     450,   451,     0,   452,   453,   454,     0,     0,   455,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   456,   457,
+     458,     0,   459,     0,   460,     0,   461,   462,   463,   464,
+     465,   466,   467,   468,   469,   470,     0,   471,     0,   472,
+     473,   474,     0,   475,     0,   476,   477,   478,   479,   480,
+       0,   481,   482,   483,     0,     0,   484,     0,     0,     0,
+     485,   486,     0,   487,   488,     0,     0,   489,   490,   491,
+     492,   493,     0,   494,   495,     0,   496,   497,   498,     0,
+       0,   499,   500,   501,   502,   503,   504,   505,   506,     0,
+     507,     0,   508,   509,     0,   510,   511,   512,     0,   513,
+       0,     0,   514,   515,   516,   517,     0,   518,     0,   519,
+     520,   521,   522,   523,     0,   524,   525,    42,     0,     0,
+     526,   527,   528,   529,     0,     0,     0,   530,     0,     0,
+       0,   531,     0,   532,   533,   534,   535,     0,   536,   537,
+     538,   539,   540,     0,     0,     0,     0,     0,   541,   542,
+     543,     0,   544,     0,     0,   545,     0,     0,   546,     0,
+     547,     0,   548,   549,   550,   551,   552,   553,     0,     0,
+     554,   555,     0,     0,   556,   557,   558,   559,   560,   561,
+       0,     0,   562,   563,   564,   565,     0,   566,   567,     0,
+      49,   568,   569,   570,   571,     0,     0,   572,   573,     0,
+     574,   575,   576,   577,     0,     0,     0,     0,     0,   578,
+     579,     0,     0,     0,   580,   581,   582,     0,     0,   583,
+     584,     0,   585,   586,     0,   587,   588,     0,     0,   589,
+       0,     0,   590,     0,   591,     0,   592,   593,     0,     0,
+       0,     0,     0,   594,    54,   595,     0,     0,   596,     0,
+       0,     0,   597,     0,   598,   599,   600,   601,     0,     0,
+       0,    55,     0,     0,   602,   603,   604,     0,   605,   606,
+     607,   608,     0,     0,   609,     0,     0,   610,   611,   612,
+     613,   614,     0,   615,     0,     0,     0,     0,     0,     0,
+       0,     0,   616,   617,   618,     0,   619,   620,   621,     0,
+     622,     0,     0,   623,     0,   624,     0,     0,     0,     0,
+       0,     0,   625,   626,     0,     0,   627,     0,   628,     0,
+     629,   630,     0,     0,  2983,   631,   632,   633,   634,   635,
+     636,   637,   638,     0,   639,   640,   641,   642,   643,   644,
+     645,   646,   647,   648,  2984,   649,   650,   651,   652,   653,
+     654,   655,   656,   657,   658,   659,   660,   661,   662,   663,
+     664,   665,   666,   667,   668,   669,   670,   671,   672,     0,
+     673,   674,   675,   676,   677,   678,   679,     0,   680,   681,
+     682,   683,   684,   685,   686,   687,   688,   689,   690,   691,
+     692,   693,   694,   695,   696,   697,   698,   699,   700,   701,
+     702,   703,   704,   705,   706,   707,   708,   709,   710,   711,
+     712,   713,   714,   715,   716,   717,   718,   719,   720,     0,
+       0,     0,     0,     0,   243,   244,     0,   245,   246,   247,
+     248,   249,  2985,     0,   250,     0,     0,     0,     0,   251,
+       0,  2986,   252,     0,   253,   254,   255,   256,   257,   258,
+       0,   259,     0,     0,     0,   260,     0,     0,     0,   261,
+       0,     0,   262,   263,   264,     0,   265,     0,   266,   267,
+       0,     0,   268,     0,     0,   269,   270,     0,   271,   272,
+     273,     0,   274,     0,   275,   276,   277,   278,   279,   280,
+       0,   281,   282,     0,   283,   284,   285,   286,   287,   288,
+     289,   290,   291,   292,   293,     0,   294,   295,     0,   296,
+     297,   298,   299,   300,     0,     0,     0,   301,     0,     0,
+       0,     0,   302,     0,     0,   303,     0,     0,     0,   304,
+     305,   306,     0,     0,   307,     0,     0,     0,     0,   308,
+     309,     0,     0,     0,     0,   310,   311,     0,   312,     0,
+       0,     0,     0,     0,   313,   314,   315,   316,   317,     0,
+       0,     0,   318,     0,  2982,   319,   320,   321,     0,     0,
+       0,   322,     0,   323,   324,     0,   325,   326,   327,     0,
+       0,   328,   329,     0,   330,   331,   332,   333,   334,   335,
+       0,     0,   336,   337,   338,   339,   340,     0,     0,   341,
+     342,     0,   343,   344,   345,   346,   347,     0,     0,   348,
+     349,     0,     0,     0,   350,   351,     0,   352,     0,     0,
+       0,   353,     0,   354,   355,   356,   357,     0,   358,     0,
+     359,     0,     0,     0,   360,   361,     0,   362,     0,     0,
+     363,   364,     0,     0,     0,   365,   366,   367,   368,     0,
+       0,   369,   370,   371,     0,     0,   372,     0,     0,     0,
+       0,   373,   374,   375,     0,     0,     0,   376,     0,     0,
+       0,   377,   378,     0,   379,   380,     0,     0,     0,   381,
+       0,   382,     0,     0,   383,   384,     0,     0,   385,     0,
+       0,   386,   387,     0,     0,     0,     0,     0,   388,   389,
+       0,   390,     0,   391,     0,   392,   393,     0,     0,     0,
+       0,     0,     0,     0,   394,     0,   395,   396,   397,   398,
+     399,   400,   401,   402,   403,   404,   405,   406,   407,   408,
+     409,   410,   411,     0,   412,   413,   414,     0,   415,   416,
+     417,   418,     0,   419,   420,     0,     0,     0,     0,   421,
+     422,   423,   424,   425,   426,     0,     0,   427,   428,     0,
+     429,     0,   430,     0,   431,   432,   433,   434,   435,   436,
+     437,   438,   439,     0,     0,   440,   441,     0,     0,   442,
+     443,   444,   445,   446,     0,     0,     0,   447,   448,     0,
+       0,     0,   449,     0,   450,   451,     0,   452,   453,   454,
+       0,     0,   455,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   456,   457,   458,     0,   459,     0,   460,     0,
+     461,   462,   463,   464,   465,   466,   467,   468,   469,   470,
+       0,   471,     0,   472,   473,   474,     0,   475,     0,   476,
+     477,   478,   479,   480,     0,   481,   482,   483,     0,     0,
+     484,     0,     0,     0,   485,   486,     0,   487,   488,     0,
+       0,   489,   490,   491,   492,   493,     0,   494,   495,     0,
+     496,   497,   498,     0,     0,   499,   500,   501,   502,   503,
+     504,   505,   506,     0,   507,     0,   508,   509,     0,   510,
+     511,   512,     0,   513,     0,     0,   514,   515,   516,   517,
+       0,   518,     0,   519,   520,   521,   522,   523,     0,   524,
+     525,     0,     0,     0,   526,   527,   528,   529,     0,     0,
+       0,   530,     0,     0,     0,   531,     0,   532,   533,   534,
+     535,     0,   536,   537,   538,   539,   540,     0,     0,     0,
+       0,     0,   541,   542,   543,     0,   544,     0,     0,   545,
+       0,     0,   546,     0,   547,     0,   548,   549,   550,   551,
+     552,   553,     0,     0,   554,   555,     0,     0,   556,   557,
+     558,   559,   560,   561,     0,     0,   562,   563,   564,   565,
+       0,   566,   567,     0,     0,   568,   569,   570,   571,     0,
+       0,   572,   573,     0,   574,   575,   576,   577,     0,     0,
+       0,     0,     0,   578,   579,     0,     0,     0,   580,   581,
+     582,     0,     0,   583,   584,     0,   585,   586,     0,   587,
+     588,     0,     0,   589,     0,     0,   590,     0,   591,     0,
+     592,   593,     0,     0,     0,     0,     0,   594,     0,   595,
+       0,     0,   596,     0,     0,     0,   597,     0,   598,   599,
+     600,   601,     0,     0,     0,     0,     0,     0,   602,   603,
+     604,     0,   605,   606,   607,   608,     0,     0,   609,     0,
+       0,   610,   611,   612,   613,   614,     0,   615,     0,     0,
+       0,     0,     0,     0,     0,     0,   616,   617,   618,     0,
+     619,   620,   621,     0,   622,     0,     0,   623,     0,   624,
+       0,     0,     0,     0,     0,     0,   625,   626,     0,     0,
+     627,     0,   628,     0,   629,   630,     0,     0,  2983,   631,
+     632,   633,   634,   635,   636,   637,   638,     0,   639,   640,
+     641,   642,   643,   644,   645,   646,   647,   648,  2984,   649,
+     650,   651,   652,   653,   654,   655,   656,   657,   658,   659,
+     660,   661,   662,   663,   664,   665,   666,   667,   668,   669,
+     670,   671,   672,     0,   673,   674,   675,   676,   677,   678,
+     679,     0,   680,   681,   682,   683,   684,   685,   686,   687,
+     688,   689,   690,   691,   692,   693,   694,   695,   696,   697,
+     698,   699,   700,   701,   702,   703,   704,   705,   706,   707,
+     708,   709,   710,   711,   712,   713,   714,   715,   716,   717,
+     718,   719,   720,     0,     0,     0,     0,     0,   243,   244,
+       0,   245,   246,   247,   248,   249,  2985,     0,   250,     0,
+       0,     0,     0,   251,     0,  2986,   252,     0,   253,   254,
+     255,   256,   257,   258,     0,   259,     0,     0,     0,   260,
+       0,     0,     0,   261,     0,     0,   262,   263,   264,     0,
+     265,     0,   266,   267,     0,     0,   268,     0,     0,   269,
+     270,     0,   271,   272,   273,     0,   274,     0,   275,   276,
+     277,   278,   279,   280,     0,   281,   282,     0,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,     0,
+     294,   295,     0,   296,   297,   298,   299,   300,     0,     0,
+       0,   301,     0,     0,     0,     0,   302,     0,     0,   303,
+       0,     0,     0,   304,   305,   306,     0,     0,   307,     0,
+       0,     0,     0,   308,   309,     0,     0,     0,     0,   310,
+     311,     0,   312,     0,     0,     0,     0,     0,   313,   314,
+     315,   316,   317,     0,     0,     0,   318,     0,     0,   319,
+     320,   321,     0,     0,     0,   322,     0,   323,   324,     0,
+     325,   326,   327,     0,     0,   328,   329,     0,   330,   331,
+     332,   333,   334,   335,     0,     0,   336,   337,   338,   339,
+     340,     0,     0,   341,   342,     0,   343,   344,   345,   346,
+     347,     0,     0,   348,   349,     0,     0,     0,   350,   351,
+       0,   352,     0,     0,     0,   353,     0,   354,   355,   356,
+     357,     0,   358,     0,   359,     0,     0,     0,   360,   361,
+       0,   362,     0,     0,   363,   364,     0,     0,     0,   365,
+     366,   367,   368,     0,     0,   369,   370,   371,     0,     0,
+     372,     0,     0,     0,     0,   373,   374,   375,     0,     0,
+       0,   376,     0,     0,     0,   377,   378,     0,   379,   380,
+       0,     0,     0,   381,     0,   382,     0,     0,   383,   384,
+       0,     0,   385,     0,     0,   386,   387,     0,     0,     0,
+       0,     0,   388,   389,     0,   390,     0,   391,     0,   392,
+     393,     0,     0,     0,     0,     0,     0,     0,   394,     0,
+     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
+     405,   406,   407,   408,   409,   410,   411,     0,   412,   413,
+     414,     0,   415,   416,   417,   418,     0,   419,   420,     0,
+       0,     0,     0,   421,   422,   423,   424,   425,   426,     0,
+       0,   427,   428,     0,   429,     0,   430,     0,   431,   432,
+     433,   434,   435,   436,   437,   438,   439,     0,     0,   440,
+     441,     0,     0,   442,   443,   444,   445,   446,     0,     0,
+       0,   447,   448,     0,     0,     0,   449,     0,   450,   451,
+       0,   452,   453,   454,     0,     0,   455,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   456,   457,   458,     0,
+     459,     0,   460,     0,   461,   462,   463,   464,   465,   466,
+     467,   468,   469,   470,     0,   471,     0,   472,   473,   474,
+       0,   475,     0,   476,   477,   478,   479,   480,     0,   481,
+     482,   483,     0,     0,   484,     0,     0,     0,   485,   486,
+       0,   487,   488,     0,     0,   489,   490,   491,   492,   493,
+       0,   494,   495,     0,   496,   497,   498,     0,     0,   499,
+     500,   501,   502,   503,   504,   505,   506,     0,   507,     0,
+     508,   509,     0,   510,   511,   512,     0,   513,     0,     0,
+     514,   515,   516,   517,     0,   518,     0,   519,   520,   521,
+     522,   523,     0,   524,   525,     0,     0,     0,   526,   527,
+     528,   529,     0,     0,     0,   530,     0,     0,     0,   531,
+       0,   532,   533,   534,   535,     0,   536,   537,   538,   539,
+     540,     0,     0,     0,     0,     0,   541,   542,   543,     0,
+     544,     0,     0,   545,     0,     0,   546,     0,   547,     0,
+     548,   549,   550,   551,   552,   553,     0,     0,   554,   555,
+       0,     0,   556,   557,   558,   559,   560,   561,     0,     0,
+     562,   563,   564,   565,     0,   566,   567,     0,     0,   568,
+     569,   570,   571,     0,     0,   572,   573,     0,   574,   575,
+     576,   577,     0,     0,     0,     0,     0,   578,   579,     0,
+       0,     0,   580,   581,   582,     0,     0,   583,   584,     0,
+     585,   586,     0,   587,   588,     0,     0,   589,     0,     0,
+     590,     0,   591,     0,   592,   593,     0,     0,     0,     0,
+       0,   594,     0,   595,     0,     0,   596,     0,     0,     0,
+     597,     0,   598,   599,   600,   601,     0,     0,     0,     0,
+       0,     0,   602,   603,   604,     0,   605,   606,   607,   608,
+       0,     0,   609,     0,     0,   610,   611,   612,   613,   614,
+       0,   615,     0,     0,     0,     0,     0,     0,     0,     0,
+     616,   617,   618,     0,   619,   620,   621,     0,   622,     0,
+       0,   623,     0,   624,     0,     0,     0,     0,     0,     0,
+     625,   626,     0,     0,   627,     0,   628,     0,   629,   630,
+       0,     0,  2983,   631,   632,   633,   634,   635,   636,   637,
+     638,     0,   639,   640,   641,   642,   643,   644,   645,   646,
+     647,   648,  2984,   649,   650,   651,   652,   653,   654,   655,
+     656,   657,   658,   659,   660,   661,   662,   663,   664,   665,
+     666,   667,   668,   669,   670,   671,   672,     0,   673,   674,
+     675,   676,   677,   678,   679,     0,   680,   681,   682,   683,
+     684,   685,   686,   687,   688,   689,   690,   691,   692,   693,
+     694,   695,   696,   697,   698,   699,   700,   701,   702,   703,
+     704,   705,   706,   707,   708,   709,   710,   711,   712,   713,
+     714,   715,   716,   717,   718,   719,   720,     0,     0,     0,
+       0,   243,   244,     0,   245,   246,   247,   248,   249,     0,
+    2985,   250,     0,     0,     0,     0,   251,     0,     0,  2986,
+       0,   253,   254,   255,   256,   257,   258,     0,  -564,     0,
        0,     0,   260,     0,     0,     0,   261,     0,     0,   262,
-     263,   264,     0,   265,     0,   266,   267,     0,     0,   268,
-       0,     0,   269,   270,     0,   271,   272,   273,     0,   274,
-       0,   275,   276,   277,   278,   279,   280,     0,   281,   282,
-       0,   283,   284,   285,   286,   287,   288,   289,   290,   291,
-     292,   293,     0,   294,   295,     0,   296,   297,   298,   299,
+     263,   264,     0,   265,     0,     0,     0,     0,     0,   268,
+    5148,     0,   269,   270,     0,   271,   272,     0,     0,     0,
+       0,   275,   276,   277,  5149,   279,   280,     0,   281,   282,
+       0,   283,   284,     0,   286,     0,   288,   289,   290,   291,
+     292,   293,     0,   294,   295,     0,   296,   297,   298,     0,
      300,     0,     0,     0,   301,     0,     0,     0,     0,   302,
        0,     0,   303,     0,     0,     0,   304,   305,   306,     0,
-       0,   307,     0,     0,     0,     0,   308,   309,     0,     0,
+       0,   307,     0,     0,     0,     0,   308,     0,     0,     0,
        0,     0,   310,   311,     0,   312,     0,     0,     0,     0,
-       0,   313,   314,   315,   316,   317,     0,     0,     0,   318,
-       0,  2931,   319,   320,   321,     0,     0,     0,   322,     0,
-     323,   324,     0,   325,   326,   327,     0,     0,   328,   329,
-       0,   330,   331,   332,   333,   334,   335,     0,     0,   336,
-     337,   338,   339,   340,     0,     0,   341,   342,     0,   343,
-     344,   345,   346,   347,     0,     0,   348,   349,     0,     0,
+       0,   313,   314,   315,   316,   317,     0,     0,     0,     0,
+       0,     0,   319,   320,   321,     0,     0,     0,   322,     0,
+       0,   324,     0,   325,   326,   327,     0,     0,   328,   329,
+       0,   330,   331,   332,   333,   334,     0,     0,     0,   336,
+     337,   338,   339,   340,     0,     0,   341,   342,  5150,   343,
+     344,   345,   346,   347,     0,     0,     0,     0,     0,     0,
        0,   350,   351,     0,   352,     0,     0,     0,   353,     0,
      354,   355,   356,   357,     0,   358,     0,   359,     0,     0,
-       0,   360,   361,     0,   362,     0,     0,   363,   364,     0,
+       0,     0,   361,     0,     0,     0,     0,   363,   364,     0,
+       0,     0,   365,   366,   367,   368,  5151,     0,   369,     0,
+     371,     0,     0,   372,     0,     0,     0,     0,   373,   374,
+       0,     0,     0,     0,   376,     0,     0,     0,   377,   378,
+       0,   379,   380,  5152,     0,     0,   381,     0,   382,     0,
+       0,     0,   384,     0,     0,   385,  5153,     0,   386,   387,
+       0,     0,     0,     0,     0,   388,   389,     0,   390,     0,
+     391,     0,   392,   393,     0,     0,     0,     0,  -519,     0,
+       0,   394,     0,   395,   396,   397,   398,   399,   400,   401,
+     402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
+       0,   412,   413,   414,     0,   415,   416,   417,   418,     0,
+     419,   420,     0,     0,     0,     0,   421,   422,   423,   424,
+     425,   426,     0,     0,   427,   428,     0,   429,     0,   430,
+       0,   431,   432,   433,   434,   435,   436,   437,   438,   439,
+       0,     0,   440,   441,     0,     0,   442,   443,   444,   445,
+     446,     0,     0,     0,     0,   448,     0,     0,     0,   449,
+       0,   450,   451,     0,   452,   453,  5154,     0,     0,   455,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   456,
+     457,   458,     0,   459,     0,   460,     0,   461,   462,   463,
+     464,   465,   466,   467,   468,   469,   470,     0,     0,     0,
+       0,   473,   474,     0,   475,     0,   476,   477,   478,   479,
+     480,     0,   481,   482,   483,     0,     0,   484,     0,     0,
+       0,   485,   486,     0,   487,   488,     0,     0,   489,   490,
+     491,   492,   493,     0,   494,   495,     0,   496,     0,   498,
+    -519,     0,   499,   500,   501,   502,   503,   504,   505,   506,
+       0,     0,     0,   508,   509,     0,   510,   511,   512,  5155,
+     513,     0,     0,     0,   515,   516,   517,     0,   518,     0,
+     519,   520,     0,   522,   523,     0,   524,   525,     0,     0,
+       0,   526,   527,   528,   529,     0,     0,     0,   530,     0,
+       0,     0,     0,     0,     0,   533,     0,   535,     0,   536,
+     537,   538,   539,   540,     0,     0,     0,     0,     0,   541,
+     542,   543,     0,   544,     0,     0,   545,     0,     0,   546,
+       0,   547,     0,   548,     0,   550,   551,   552,   553,     0,
+       0,     0,   555,     0,     0,   556,   557,   558,   559,   560,
+     561,     0,     0,   562,   563,   564,   565,     0,   566,   567,
+       0,     0,   568,   569,   570,   571,     0,     0,   572,   573,
+       0,   574,   575,   576,   577,     0,     0,     0,     0,     0,
+     578,   579,     0,     0,     0,     0,   581,   582,     0,     0,
+     583,   584,     0,   585,   586,     0,     0,     0,     0,     0,
+     589,     0,     0,   590,     0,   591,     0,   592,   593,     0,
+       0,     0,     0,     0,   594,     0,   595,     0,     0,   596,
+       0,     0,     0,   597,     0,   598,   599,   600,   601,     0,
+       0,  -519,     0,     0,     0,   602,   603,   604,     0,   605,
+       0,   607,   608,     0,     0,   609,     0,     0,   610,   611,
+     612,   613,   614,     0,   615,     0,     0,     0,     0,     0,
+       0,     0,     0,   616,   617,   618,     0,   619,   620,   621,
+       0,     0,     0,     0,   623,     0,   624,     0,     0,     0,
+       0,     0,     0,   625,   626,     0,     0,   627,     0,   628,
+       0,   629,   630,     0,     0,     0,   631,   632,   633,   634,
+     635,   636,   637,   638,     0,   639,   640,   641,     0,   643,
+     644,   645,   646,   647,   648,     0,   649,   650,   651,   652,
+     653,   654,   655,   656,   657,   658,   659,   660,   661,   662,
+     663,   664,   665,   666,   667,   668,   669,   670,   671,   672,
+       0,   673,   674,   675,   676,   677,   678,   679,     0,   680,
+     681,   682,   683,   684,   685,   686,   687,   688,   689,   690,
+     691,   692,   693,   694,   695,   696,   697,   698,   699,   700,
+     701,   702,   703,   704,   705,   706,   707,   708,   709,   710,
+     711,   712,   713,   714,   715,   716,   717,   718,   719,   720,
+       0,   243,   244,     0,   245,   246,   247,   248,   249,     0,
+       0,   250,     0,     0,     0,     0,   251,     0,  5552,   252,
+       0,   253,   254,   255,   256,   257,   258,     0,   259,     0,
+       0,     0,   260,   764,     0,     0,   261,     0,     0,   262,
+     263,   264,     0,   265,     0,   266,   267,     0,     0,   268,
+       0,     0,   269,   270,     0,   271,   272,   273,     0,   274,
+       0,   275,   276,   277,   278,   279,   280,     0,   281,   282,
+       0,   283,   284,   285,   286,   287,   288,   289,   290,   291,
+     292,   293,     0,   294,   295,     0,   296,   297,   298,   299,
+     300,     0,     0,     0,   301,     0,     0,     0,     0,   302,
+       0,     0,   303,     0,     0,     0,   304,   305,   306,     0,
+       0,  2908,     0,     0,     0,     0,   308,   309,   784,     0,
+       0,     0,   310,   311,     0,   312,     0,     0,     0,     0,
+       0,   313,   314,   315,   316,   317,     0,     0,     0,   318,
+       0,     0,   319,   320,   321,     0,     0,     0,   322,     0,
+     323,   324,     0,   325,   326,   327,     0,     0,   328,   329,
+       0,   330,   331,   332,   333,   334,   335,     0,     0,   336,
+     337,   338,   339,   340,     0,   788,   341,   342,     0,   343,
+     344,   345,   346,   347,   789,     0,   348,   349,     0,     0,
+       0,   350,   351,     0,   352,     0,     0,     0,   353,     0,
+     354,   355,   356,   357,     0,   358,     0,   359,     0,     0,
+       0,   360,   361,     0,   362,   794,     0,   363,   364,     0,
        0,     0,   365,   366,   367,   368,     0,     0,   369,   370,
      371,     0,     0,   372,     0,     0,     0,     0,   373,   374,
      375,     0,     0,     0,   376,     0,     0,     0,   377,   378,
        0,   379,   380,     0,     0,     0,   381,     0,   382,     0,
        0,   383,   384,     0,     0,   385,     0,     0,   386,   387,
        0,     0,     0,     0,     0,   388,   389,     0,   390,     0,
-     391,     0,   392,   393,     0,     0,     0,     0,     0,     0,
+     391,     0,   392,   393,     0,     0,   801,     0,     0,     0,
        0,   394,     0,   395,   396,   397,   398,   399,   400,   401,
      402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
        0,   412,   413,   414,     0,   415,   416,   417,   418,     0,
      419,   420,     0,     0,     0,     0,   421,   422,   423,   424,
      425,   426,     0,     0,   427,   428,     0,   429,     0,   430,
        0,   431,   432,   433,   434,   435,   436,   437,   438,   439,
-       0,     0,   440,   441,     0,     0,   442,   443,   444,   445,
-     446,     0,     0,     0,   447,   448,     0,     0,     0,   449,
+       0,   812,   440,   441,     0,     0,   442,   443,   444,   445,
+     446,     0,     0,     0,   447,   448,     0,   816,   817,   449,
        0,   450,   451,     0,   452,   453,   454,     0,     0,   455,
        0,     0,     0,     0,     0,     0,     0,     0,     0,   456,
      457,   458,     0,   459,     0,   460,     0,   461,   462,   463,
@@ -7505,10 +7695,10 @@
        0,   547,     0,   548,   549,   550,   551,   552,   553,     0,
        0,   554,   555,     0,     0,   556,   557,   558,   559,   560,
      561,     0,     0,   562,   563,   564,   565,     0,   566,   567,
-       0,     0,   568,   569,   570,   571,     0,     0,   572,   573,
-       0,   574,   575,   576,   577,     0,     0,     0,     0,     0,
-     578,   579,     0,     0,     0,   580,   581,   582,     0,     0,
-     583,   584,     0,   585,   586,     0,   587,   588,     0,     0,
+       0,     0,   568,   569,   570,   571,     0,   836,   572,   573,
+       0,  2909,   575,   576,  2910,     0,     0,     0,     0,     0,
+     578,   579,     0,     0,   842,   580,   581,   582,     0,   844,
+     583,   584,   845,   585,   586,     0,   587,   588,     0,     0,
      589,     0,     0,   590,     0,   591,     0,   592,   593,     0,
        0,     0,     0,     0,   594,     0,   595,     0,     0,   596,
        0,     0,     0,   597,     0,   598,   599,   600,   601,     0,
@@ -7518,18 +7708,334 @@
        0,     0,     0,   616,   617,   618,     0,   619,   620,   621,
        0,   622,     0,     0,   623,     0,   624,     0,     0,     0,
        0,     0,     0,   625,   626,     0,     0,   627,     0,   628,
-       0,   629,   630,     0,     0,  2932,   631,   632,   633,   634,
+       0,   629,   630,     0,     0,     0,   631,   632,   633,   634,
      635,   636,   637,   638,     0,   639,   640,   641,   642,   643,
-     644,   645,   646,   647,   648,  2933,   649,   650,   651,   652,
+     644,   645,   646,   647,   648,     0,   649,   650,   651,   652,
      653,   654,   655,   656,   657,   658,   659,   660,   661,   662,
      663,   664,   665,   666,   667,   668,   669,   670,   671,   672,
        0,   673,   674,   675,   676,   677,   678,   679,     0,   680,
      681,   682,   683,   684,   685,   686,   687,   688,   689,   690,
      691,   692,   693,   694,   695,   696,   697,   698,   699,   700,
      701,   702,   703,   704,   705,   706,   707,   708,   709,   710,
-     711,     0,     0,     0,     0,     0,   243,   244,     0,   245,
-     246,   247,   248,   249,  2934,     0,   250,     0,     0,     0,
-       0,   251,     0,  2935,   252,     0,   253,   254,   255,   256,
+     711,   712,   713,   714,   715,   716,   717,   718,   719,   720,
+     243,   244,     0,   245,   246,   247,   248,   249,     0,     0,
+     250,     0,     0,     0,     0,   251,     0,   877,   252,     0,
+     253,   254,   255,   256,   257,   258,     0,   259,     0,     0,
+       0,   260,     0,     0,     0,   261,     0,     0,   262,   263,
+     264,     0,   265,     0,   266,   267,     0,     0,   268,     0,
+       0,   269,   270,     0,   271,   272,   273,     0,   274,     0,
+     275,   276,   277,   278,   279,   280,     0,   281,   282,     0,
+     283,   284,   285,   286,   287,   288,   289,   290,   291,   292,
+     293,     0,   294,   295,     0,   296,   297,   298,   299,   300,
+       0,     0,     0,   301,     0,     0,     0,     0,   302,     0,
+       0,   303,     0,     0,     0,   304,   305,   306,     0,     0,
+     307,     0,     0,     0,     0,   308,   309,     0,     0,     0,
+       0,   310,   311,     0,   312,     0,     0,     0,     0,     0,
+     313,   314,   315,   316,   317,     0,     0,     0,   318,     0,
+       0,   319,   320,   321,     0,     0,     0,   322,     0,   323,
+     324,     0,   325,   326,   327,     0,     0,   328,   329,     0,
+     330,   331,   332,   333,   334,   335,     0,     0,   336,   337,
+     338,   339,   340,     0,     0,   341,   342,     0,   343,   344,
+     345,   346,   347,     0,     0,   348,   349,     0,     0,     0,
+     350,   351,     0,   352,     0,     0,     0,   353,     0,   354,
+     355,   356,   357,     0,   358,     0,   359,     0,     0,     0,
+     360,   361,     0,   362,     0,     0,   363,   364,     0,     0,
+       0,   365,   366,   367,   368,     0,     0,   369,   370,   371,
+       0,     0,   372,     0,     0,     0,     0,   373,   374,   375,
+       0,     0,     0,   376,     0,     0,     0,   377,   378,     0,
+     379,   380,     0,     0,     0,   381,     0,   382,     0,     0,
+     383,   384,     0,     0,   385,     0,     0,   386,   387,     0,
+       0,     0,     0,     0,   388,   389,     0,   390,     0,   391,
+       0,   392,   393,     0,     0,   801,     0,     0,     0,     0,
+     394,     0,   395,   396,   397,   398,   399,   400,   401,   402,
+     403,   404,   405,   406,   407,   408,   409,   410,   411,     0,
+     412,   413,   414,     0,   415,   416,   417,   418,     0,   419,
+     420,     0,     0,     0,     0,   421,   422,   423,   424,   425,
+     426,     0,     0,   427,   428,     0,   429,     0,   430,     0,
+     431,   432,   433,   434,   435,   436,   437,   438,   439,     0,
+       0,   440,   441,     0,     0,   442,   443,   444,   445,   446,
+       0,     0,     0,   447,   448,     0,     0,   817,   449,     0,
+     450,   451,     0,   452,   453,   454,     0,     0,   455,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   456,   457,
+     458,   818,   459,     0,   460,     0,   461,   462,   463,   464,
+     465,   466,   467,   468,   469,   470,     0,   471,     0,   472,
+     473,   474,     0,   475,     0,   476,   477,   478,   479,   480,
+       0,   481,   482,   483,     0,     0,   484,     0,     0,     0,
+     485,   486,     0,   487,   488,     0,     0,   489,   490,   491,
+     492,   493,     0,   494,   495,     0,   496,   497,   498,     0,
+       0,   499,   500,   501,   502,   503,   504,   505,   506,     0,
+     507,     0,   508,   509,     0,   510,   511,   512,     0,   513,
+       0,     0,   514,   515,   516,   517,     0,   518,     0,   519,
+     520,   521,   522,   523,     0,   524,   525,     0,     0,     0,
+     526,   527,   528,   529,     0,     0,     0,   530,     0,     0,
+       0,   531,     0,   532,   533,   534,   535,     0,   536,   537,
+     538,   539,   540,     0,     0,     0,     0,     0,   541,   542,
+     543,     0,   544,     0,     0,   545,     0,     0,   546,     0,
+     547,     0,   548,   549,   550,   551,   552,   553,     0,     0,
+     554,   555,     0,     0,   556,   557,   558,   559,   560,   561,
+       0,     0,   562,   563,   564,   565,     0,   566,   567,     0,
+       0,   568,   569,   570,   571,     0,     0,   572,   573,     0,
+     574,   575,   576,   577,     0,     0,     0,     0,     0,   578,
+     579,     0,     0,     0,   580,   581,   582,     0,   844,   583,
+     584,     0,   585,   586,     0,   587,   588,     0,     0,   589,
+       0,     0,   590,     0,   591,     0,   592,   593,     0,     0,
+       0,     0,     0,   594,     0,   595,     0,     0,   596,     0,
+       0,     0,   597,     0,   598,   599,   600,   601,     0,     0,
+       0,     0,     0,     0,   602,   603,   604,     0,   605,   606,
+     607,   608,     0,     0,   609,     0,     0,   610,   611,   612,
+     613,   614,     0,   615,     0,     0,     0,     0,     0,     0,
+       0,     0,   616,   617,   618,     0,   619,   620,   621,     0,
+     622,     0,     0,   623,     0,   624,     0,     0,     0,     0,
+       0,     0,   625,   626,     0,     0,   627,     0,   628,     0,
+     629,   630,     0,     0,     0,   631,   632,   633,   634,   635,
+     636,   637,   638,     0,   639,   640,   641,   642,   643,   644,
+     645,   646,   647,   648,     0,   649,   650,   651,   652,   653,
+     654,   655,   656,   657,   658,   659,   660,   661,   662,   663,
+     664,   665,   666,   667,   668,   669,   670,   671,   672,     0,
+     673,   674,   675,   676,   677,   678,   679,     0,   680,   681,
+     682,   683,   684,   685,   686,   687,   688,   689,   690,   691,
+     692,   693,   694,   695,   696,   697,   698,   699,   700,   701,
+     702,   703,   704,   705,   706,   707,   708,   709,   710,   711,
+     712,   713,   714,   715,   716,   717,   718,   719,   720,   243,
+     244,     0,   245,   246,   247,   248,   249,     0,     0,   250,
+       0,     0,     0,     0,   251,     0,  2061,   252,     0,   253,
+     254,   255,   256,   257,   258,     0,   259,     0,     0,     0,
+     260,     0,     0,     0,   261,     0,     0,   262,   263,   264,
+       0,   265,     0,   266,   267,     0,     0,   268,     0,     0,
+     269,   270,     0,   271,   272,   273,     0,   274,     0,   275,
+     276,   277,   278,   279,   280,     0,   281,   282,     0,   283,
+     284,   285,   286,   287,   288,   289,   290,   291,   292,   293,
+       0,   294,   295,     0,   296,   297,   298,   299,   300,     0,
+       0,     0,   301,     0,     0,     0,     0,   302,     0,     0,
+     303,     0,     0,     0,   304,   305,   306,     0,     0,   307,
+       0,     0,     0,     0,   308,   309,     0,     0,     0,     0,
+     310,   311,     0,   312,     0,     0,     0,     0,     0,   313,
+     314,   315,   316,   317,     0,     0,     0,   318,     0,     0,
+    1698,   320,   321,     0,     0,     0,   322,     0,   323,   324,
+       0,   325,   326,   327,     0,     0,   328,   329,     0,   330,
+     331,   332,   333,   334,   335,     0,     0,   336,   337,   338,
+     339,   340,     0,     0,   341,   342,     0,   343,   344,   345,
+     346,   347,     0,     0,   348,   349,     0,     0,     0,   350,
+     351,     0,   352,     0,     0,     0,   353,     0,   354,   355,
+     356,   357,     0,   358,     0,   359,     0,     0,     0,   360,
+     361,     0,   362,     0,     0,   363,   364,     0,     0,     0,
+     365,   366,   367,   368,     0,     0,   369,   370,   371,     0,
+       0,   372,     0,     0,     0,     0,   373,   374,   375,     0,
+       0,     0,   376,     0,     0,     0,   377,   378,     0,   379,
+     380,     0,     0,     0,   381,     0,   382,     0,     0,   383,
+     384,     0,     0,   385,     0,     0,   386,   387,  1142,     0,
+       0,     0,     0,   388,   389,     0,   390,     0,   391,     0,
+     392,   393,     0,     0,     0,     0,     0,     0,     0,   394,
+       0,   395,   396,   397,   398,   399,   400,   401,   402,   403,
+     404,   405,   406,   407,   408,   409,   410,   411,     0,   412,
+     413,   414,     0,   415,   416,   417,   418,     0,   419,   420,
+       0,     0,     0,     0,   421,   422,   423,   424,   425,   426,
+       0,     0,   427,   428,     0,   429,     0,   430,     0,   431,
+     432,   433,   434,   435,   436,   437,   438,   439,     0,     0,
+     440,   441,     0,     0,   442,   443,   444,   445,   446,     0,
+       0,     0,   447,   448,     0,     0,     0,   449,     0,   450,
+     451,     0,   452,   453,   454,     0,     0,   455,     0,     0,
+       0,     0,     0,     0,     0,  1699,     0,   456,   457,   458,
+       0,   459,     0,   460,     0,   461,   462,   463,   464,   465,
+     466,   467,   468,   469,   470,     0,   471,     0,   472,   473,
+     474,     0,   475,     0,   476,   477,   478,   479,   480,     0,
+     481,   482,   483,     0,     0,   484,     0,     0,     0,   485,
+     486,     0,   487,   488,     0,     0,   489,   490,   491,   492,
+     493,     0,   494,   495,     0,   496,   497,   498,     0,     0,
+     499,   500,   501,   502,   503,   504,   505,   506,     0,   507,
+       0,   508,   509,     0,   510,   511,   512,     0,   513,     0,
+       0,   514,   515,   516,   517,     0,   518,     0,   519,   520,
+     521,   522,   523,     0,   524,   525,     0,     0,     0,   526,
+     527,   528,   529,     0,     0,     0,   530,     0,     0,     0,
+     531,     0,   532,   533,   534,   535,     0,   536,   537,   538,
+     539,   540,     0,     0,     0,     0,     0,   541,   542,   543,
+       0,   544,     0,     0,   545,     0,     0,   546,     0,   547,
+       0,   548,   549,   550,   551,   552,   553,     0,     0,   554,
+     555,     0,     0,   556,   557,   558,   559,   560,   561,     0,
+       0,   562,   563,   564,   565,     0,   566,   567,     0,     0,
+     568,   569,   570,   571,     0,   240,   572,   573,     0,   574,
+     575,   576,   577,     0,     0,     0,     0,     0,   578,   579,
+       0,     0,     0,   580,   581,   582,     0,     0,   583,   584,
+       0,   585,   586,     0,   587,   588,     0,     0,   589,     0,
+       0,   590,     0,   591,     0,   592,   593,     0,     0,     0,
+       0,     0,   594,     0,   595,     0,     0,   596,     0,     0,
+       0,   597,     0,   598,   599,   600,   601,     0,     0,     0,
+       0,     0,     0,   602,   603,   604,     0,   605,   606,   607,
+     608,     0,     0,   609,     0,     0,   610,   611,   612,   613,
+     614,     0,   615,     0,     0,     0,     0,     0,     0,     0,
+       0,   616,   617,   618,     0,   619,   620,   621,     0,   622,
+       0,     0,   623,     0,   624,     0,     0,     0,     0,     0,
+       0,   625,   626,     0,     0,   627,     0,   628,     0,   629,
+     630,     0,     0,     0,   631,   632,   633,   634,   635,   636,
+     637,   638,     0,   639,   640,   641,   642,   643,   644,   645,
+     646,   647,   648,     0,   649,   650,   651,   652,   653,   654,
+     655,   656,   657,   658,   659,   660,   661,   662,   663,   664,
+     665,   666,   667,   668,   669,   670,   671,   672,     0,   673,
+     674,   675,   676,   677,   678,   679,     0,   680,   681,   682,
+     683,   684,   685,   686,   687,   688,   689,   690,   691,   692,
+     693,   694,   695,   696,   697,   698,   699,   700,   701,   702,
+     703,   704,   705,   706,   707,   708,   709,   710,   711,   712,
+     713,   714,   715,   716,   717,   718,   719,   720,   243,   244,
+       0,   245,   246,   247,   248,   249,     0,     0,   250,     0,
+       0,     0,     0,   251,     0,  1700,   252,     0,   253,   254,
+     255,   256,   257,   258,     0,   259,     0,     0,     0,   260,
+       0,     0,     0,   261,     0,     0,   262,   263,   264,     0,
+     265,     0,   266,   267,     0,     0,   268,     0,     0,   269,
+     270,     0,   271,   272,  1026,  1027,   274,     0,   275,   276,
+     277,   278,   279,   280,     0,   281,   282,     0,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,     0,
+     294,   295,     0,   296,   297,   298,   299,   300,     0,     0,
+       0,   301,     0,     0,     0,     0,   302,     0,     0,   303,
+       0,     0,     0,   304,   305,   306,     0,     0,   307,     0,
+       0,     0,     0,   308,   309,     0,     0,     0,  1028,   310,
+     311,     0,   312,     0,     0,     0,     0,     0,   313,   314,
+     315,   316,   317,     0,     0,     0,   318,     0,     0,   319,
+     320,   321,     0,     0,     0,   322,     0,   323,   324,     0,
+     325,   326,   327,     0,     0,   328,   329,     0,   330,   331,
+     332,   333,   334,   335,     0,     0,   336,   337,   338,   339,
+     340,     0,     0,   341,   342,     0,   343,   344,   345,   346,
+     347,     0,     0,   348,   349,     0,     0,     0,   350,   351,
+       0,   352,     0,     0,     0,   353,     0,   354,   355,   356,
+     357,     0,  1029,     0,   359,     0,     0,     0,   360,   361,
+       0,   362,     0,     0,   363,   364,     0,     0,     0,   365,
+     366,   367,   368,     0,     0,   369,   370,   371,     0,     0,
+     372,     0,     0,     0,     0,   373,   374,   375,     0,     0,
+       0,   376,     0,     0,     0,   377,   378,     0,   379,   380,
+       0,     0,     0,   381,     0,   382,     0,     0,   383,   384,
+       0,     0,   385,     0,     0,   386,   387,     0,     0,     0,
+       0,     0,   388,   389,     0,  1030,     0,   391,     0,   392,
+     393,     0,     0,     0,     0,     0,     0,     0,   394,     0,
+     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
+     405,   406,   407,   408,   409,   410,   411,     0,   412,   413,
+     414,     0,   415,   416,   417,   418,     0,   419,   420,     0,
+       0,     0,     0,   421,   422,   423,   424,   425,   426,     0,
+       0,   427,   428,     0,   429,     0,   430,     0,   431,   432,
+     433,   434,   435,   436,  1031,   438,   439,     0,     0,   440,
+     441,     0,     0,   442,   443,   444,   445,   446,     0,     0,
+       0,   447,   448,     0,     0,     0,   449,     0,   450,   451,
+       0,   452,   453,   454,     0,     0,   455,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   456,   457,   458,     0,
+     459,     0,   460,     0,   461,   462,  1032,   464,   465,   466,
+     467,   468,   469,   470,     0,   471,     0,   472,   473,   474,
+       0,   475,     0,   476,   477,   478,   479,   480,     0,   481,
+     482,   483,     0,     0,   484,     0,     0,     0,   485,   486,
+       0,   487,   488,     0,     0,   489,   490,   491,   492,   493,
+       0,   494,   495,     0,   496,   497,   498,     0,     0,   499,
+     500,   501,   502,   503,   504,   505,   506,     0,   507,     0,
+     508,   509,     0,   510,   511,   512,     0,   513,     0,     0,
+     514,   515,   516,   517,     0,   518,     0,   519,   520,   521,
+     522,   523,     0,   524,   525,     0,     0,     0,   526,   527,
+    1033,   529,     0,     0,     0,   530,     0,     0,     0,   531,
+       0,   532,   533,   534,   535,     0,   536,   537,   538,   539,
+     540,     0,     0,     0,     0,     0,   541,   542,   543,     0,
+     544,     0,     0,   545,     0,     0,   546,     0,   547,     0,
+     548,   549,   550,   551,   552,   553,     0,     0,   554,   555,
+       0,     0,   556,   557,   558,   559,   560,   561,     0,     0,
+     562,   563,   564,   565,     0,   566,   567,     0,     0,   568,
+     569,   570,   571,     0,     0,   572,   573,     0,   574,   575,
+     576,   577,     0,     0,     0,     0,     0,  1034,   579,     0,
+       0,     0,   580,   581,   582,     0,     0,   583,   584,     0,
+     585,   586,     0,   587,   588,     0,     0,   589,     0,     0,
+     590,     0,   591,     0,   592,   593,     0,     0,     0,     0,
+       0,   594,     0,   595,     0,     0,   596,     0,     0,     0,
+     597,     0,   598,   599,   600,   601,     0,     0,     0,     0,
+       0,     0,   602,   603,   604,     0,   605,   606,   607,   608,
+       0,     0,   609,     0,     0,  1035,  1036,   612,   613,   614,
+       0,   615,     0,     0,     0,     0,     0,     0,     0,     0,
+     616,   617,   618,     0,  1037,   620,   621,     0,   622,     0,
+       0,   623,     0,   624,     0,     0,     0,     0,     0,     0,
+     625,   626,     0,     0,   627,     0,   628,     0,   629,   630,
+       0,     0,     0,   631,   632,   633,   634,   635,   636,   637,
+    1038,     0,   639,   640,   641,   642,   643,   644,   645,   646,
+     647,   648,     0,   649,   650,   651,   652,   653,   654,   655,
+     656,   657,   658,   659,   660,   661,   662,   663,   664,   665,
+     666,   667,   668,   669,   670,   671,   672,     0,   673,   674,
+     675,   676,   677,   678,   679,     0,   680,   681,   682,   683,
+     684,   685,   686,   687,   688,   689,   690,   691,   692,   693,
+     694,   695,   696,   697,   698,   699,   700,   701,   702,   703,
+     704,   705,   706,   707,   708,   709,   710,   711,   712,   713,
+     714,   715,   716,   717,   718,   719,   720,   243,   244,     0,
+     245,   246,   247,   248,   249,     0,     0,   250,     0,     0,
+       0,     0,   251,     0,  1039,   252,     0,   253,   254,   255,
+     256,   257,   258,     0,   259,     0,     0,     0,   260,     0,
+       0,     0,   261,     0,     0,   262,   263,   264,     0,   265,
+       0,   266,   267,     0,     0,   268,     0,     0,   269,   270,
+       0,   271,   272,   273,     0,   274,     0,   275,   276,   277,
+     278,   279,   280,     0,   281,   282,     0,   283,   284,   285,
+     286,   287,   288,   289,   290,   291,   292,   293,     0,   294,
+     295,     0,   296,   297,   298,   299,   300,     0,     0,     0,
+     301,     0,     0,     0,     0,   302,     0,     0,   303,     0,
+       0,     0,   304,   305,   306,     0,     0,   307,     0,     0,
+       0,     0,   308,   309,     0,     0,     0,     0,   310,   311,
+       0,   312,     0,     0,     0,     0,     0,   313,   314,   315,
+     316,   317,     0,     0,     0,   318,     0,     0,   319,   320,
+     321,     0,     0,     0,   322,     0,   323,   324,     0,   325,
+     326,   327,     0,     0,   328,   329,     0,   330,   331,   332,
+     333,   334,   335,     0,     0,   336,   337,   338,   339,   340,
+       0,     0,   341,   342,     0,   343,   344,   345,   346,   347,
+       0,     0,   348,   349,     0,     0,     0,   350,   351,     0,
+     352,     0,     0,     0,   353,     0,   354,   355,   356,   357,
+       0,   358,     0,   359,     0,     0,     0,   360,   361,     0,
+     362,     0,     0,   363,   364,     0,     0,     0,   365,   366,
+     367,   368,     0,     0,   369,   370,   371,     0,     0,   372,
+       0,     0,     0,     0,   373,   374,   375,     0,     0,     0,
+     376,     0,     0,     0,   377,   378,     0,   379,   380,     0,
+       0,     0,   381,     0,   382,     0,     0,   383,   384,     0,
+       0,   385,     0,     0,   386,   387,  1142,     0,     0,     0,
+       0,   388,   389,     0,   390,     0,   391,     0,   392,   393,
+       0,     0,     0,     0,     0,     0,     0,   394,     0,   395,
+     396,   397,   398,   399,   400,   401,   402,   403,   404,   405,
+     406,   407,   408,   409,   410,   411,     0,   412,   413,   414,
+       0,   415,   416,   417,   418,     0,   419,   420,     0,     0,
+       0,     0,   421,   422,   423,   424,   425,   426,     0,     0,
+     427,   428,     0,   429,     0,   430,     0,   431,   432,   433,
+     434,   435,   436,   437,   438,   439,     0,     0,   440,   441,
+       0,     0,   442,   443,   444,   445,   446,     0,     0,     0,
+     447,   448,     0,     0,     0,   449,     0,   450,   451,     0,
+     452,   453,   454,     0,     0,   455,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   456,   457,   458,     0,   459,
+       0,   460,     0,   461,   462,   463,   464,   465,   466,   467,
+     468,   469,   470,     0,   471,     0,   472,   473,   474,     0,
+     475,     0,   476,   477,   478,   479,   480,     0,   481,   482,
+     483,     0,     0,   484,     0,     0,     0,   485,   486,     0,
+     487,   488,     0,     0,   489,   490,   491,   492,   493,     0,
+     494,   495,     0,   496,   497,   498,     0,     0,   499,   500,
+     501,   502,   503,   504,   505,   506,     0,   507,     0,   508,
+     509,     0,   510,   511,   512,     0,   513,     0,     0,   514,
+     515,   516,   517,     0,   518,     0,   519,   520,   521,   522,
+     523,     0,   524,   525,     0,     0,     0,   526,   527,   528,
+     529,     0,     0,     0,   530,     0,     0,     0,   531,     0,
+     532,   533,   534,   535,     0,   536,   537,   538,   539,   540,
+       0,     0,     0,     0,     0,   541,   542,   543,     0,   544,
+       0,     0,   545,     0,     0,   546,     0,   547,     0,   548,
+     549,   550,   551,   552,   553,     0,     0,   554,   555,     0,
+       0,   556,   557,   558,   559,   560,   561,     0,     0,   562,
+     563,   564,   565,     0,   566,   567,     0,     0,   568,   569,
+     570,   571,     0,   240,   572,   573,     0,   574,   575,   576,
+     577,     0,     0,     0,     0,     0,   578,   579,     0,     0,
+       0,   580,   581,   582,     0,     0,   583,   584,     0,   585,
+     586,     0,   587,   588,     0,     0,   589,     0,     0,   590,
+       0,   591,     0,   592,   593,     0,     0,     0,     0,     0,
+     594,     0,   595,     0,     0,   596,     0,     0,     0,   597,
+       0,   598,   599,   600,   601,     0,     0,     0,     0,     0,
+       0,   602,   603,   604,     0,   605,   606,   607,   608,     0,
+       0,   609,     0,     0,   610,   611,   612,   613,   614,     0,
+     615,     0,     0,     0,     0,     0,     0,     0,     0,   616,
+     617,   618,     0,   619,   620,   621,     0,   622,     0,     0,
+     623,     0,   624,     0,     0,     0,     0,     0,     0,   625,
+     626,     0,     0,   627,     0,   628,     0,   629,   630,     0,
+       0,     0,   631,   632,   633,   634,   635,   636,   637,   638,
+       0,   639,   640,   641,   642,   643,   644,   645,   646,   647,
+     648,     0,   649,   650,   651,   652,   653,   654,   655,   656,
+     657,   658,   659,   660,   661,   662,   663,   664,   665,   666,
+     667,   668,   669,   670,   671,   672,     0,   673,   674,   675,
+     676,   677,   678,   679,     0,   680,   681,   682,   683,   684,
+     685,   686,   687,   688,   689,   690,   691,   692,   693,   694,
+     695,   696,   697,   698,   699,   700,   701,   702,   703,   704,
+     705,   706,   707,   708,   709,   710,   711,   712,   713,   714,
+     715,   716,   717,   718,   719,   720,   243,   244,     0,   245,
+     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
+       0,   251,     0,  1360,   252,     0,   253,   254,   255,   256,
      257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
        0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
      266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
@@ -7554,7 +8060,7 @@
        0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
        0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
        0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,     0,     0,     0,     0,     0,
+     385,     0,     0,   386,   387,  1142,     0,     0,     0,     0,
      388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
        0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
      397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
@@ -7584,7 +8090,7 @@
      550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
      556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
      564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,     0,   572,   573,     0,   574,   575,   576,   577,
+     571,     0,   240,   572,   573,     0,   574,   575,   576,   577,
        0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
      580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
        0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
@@ -7597,173 +8103,333 @@
      618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
        0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
        0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-    2932,   631,   632,   633,   634,   635,   636,   637,   638,     0,
+       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
      639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
-    2933,   649,   650,   651,   652,   653,   654,   655,   656,   657,
+       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
      658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
      668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
      677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
      686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
      696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,     0,     0,     0,     0,
-     243,   244,     0,   245,   246,   247,   248,   249,     0,  2934,
-     250,     0,     0,     0,     0,   251,     0,     0,  2935,     0,
-     253,   254,   255,   256,   257,   258,     0,  -563,     0,     0,
-       0,   260,     0,     0,     0,   261,     0,     0,   262,   263,
-     264,     0,   265,     0,     0,     0,     0,     0,   268,  5093,
-       0,   269,   270,     0,   271,   272,     0,     0,     0,     0,
-     275,   276,   277,  5094,   279,   280,     0,   281,   282,     0,
-     283,   284,     0,   286,     0,   288,   289,   290,   291,   292,
-     293,     0,   294,   295,     0,   296,   297,   298,     0,   300,
-       0,     0,     0,   301,     0,     0,     0,     0,   302,     0,
-       0,   303,     0,     0,     0,   304,   305,   306,     0,     0,
-     307,     0,     0,     0,     0,   308,     0,     0,     0,     0,
-       0,   310,   311,     0,   312,     0,     0,     0,     0,     0,
-     313,   314,   315,   316,   317,     0,     0,     0,     0,     0,
-       0,   319,   320,   321,     0,     0,     0,   322,     0,     0,
-     324,     0,   325,   326,   327,     0,     0,   328,   329,     0,
-     330,   331,   332,   333,   334,     0,     0,     0,   336,   337,
-     338,   339,   340,     0,     0,   341,   342,  5095,   343,   344,
-     345,   346,   347,     0,     0,     0,     0,     0,     0,     0,
-     350,   351,     0,   352,     0,     0,     0,   353,     0,   354,
-     355,   356,   357,     0,   358,     0,   359,     0,     0,     0,
-       0,   361,     0,     0,     0,     0,   363,   364,     0,     0,
-       0,   365,   366,   367,   368,  5096,     0,   369,     0,   371,
-       0,     0,   372,     0,     0,     0,     0,   373,   374,     0,
-       0,     0,     0,   376,     0,     0,     0,   377,   378,     0,
-     379,   380,  5097,     0,     0,   381,     0,   382,     0,     0,
-       0,   384,     0,     0,   385,  5098,     0,   386,   387,     0,
-       0,     0,     0,     0,   388,   389,     0,   390,     0,   391,
-       0,   392,   393,     0,     0,     0,     0,  -518,     0,     0,
-     394,     0,   395,   396,   397,   398,   399,   400,   401,   402,
-     403,   404,   405,   406,   407,   408,   409,   410,   411,     0,
-     412,   413,   414,     0,   415,   416,   417,   418,     0,   419,
-     420,     0,     0,     0,     0,   421,   422,   423,   424,   425,
-     426,     0,     0,   427,   428,     0,   429,     0,   430,     0,
-     431,   432,   433,   434,   435,   436,   437,   438,   439,     0,
-       0,   440,   441,     0,     0,   442,   443,   444,   445,   446,
-       0,     0,     0,     0,   448,     0,     0,     0,   449,     0,
-     450,   451,     0,   452,   453,  5099,     0,     0,   455,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   456,   457,
-     458,     0,   459,     0,   460,     0,   461,   462,   463,   464,
-     465,   466,   467,   468,   469,   470,     0,     0,     0,     0,
-     473,   474,     0,   475,     0,   476,   477,   478,   479,   480,
-       0,   481,   482,   483,     0,     0,   484,     0,     0,     0,
-     485,   486,     0,   487,   488,     0,     0,   489,   490,   491,
-     492,   493,     0,   494,   495,     0,   496,     0,   498,  -518,
-       0,   499,   500,   501,   502,   503,   504,   505,   506,     0,
-       0,     0,   508,   509,     0,   510,   511,   512,  5100,   513,
-       0,     0,     0,   515,   516,   517,     0,   518,     0,   519,
-     520,     0,   522,   523,     0,   524,   525,     0,     0,     0,
-     526,   527,   528,   529,     0,     0,     0,   530,     0,     0,
-       0,     0,     0,     0,   533,     0,   535,     0,   536,   537,
-     538,   539,   540,     0,     0,     0,     0,     0,   541,   542,
-     543,     0,   544,     0,     0,   545,     0,     0,   546,     0,
-     547,     0,   548,     0,   550,   551,   552,   553,     0,     0,
-       0,   555,     0,     0,   556,   557,   558,   559,   560,   561,
-       0,     0,   562,   563,   564,   565,     0,   566,   567,     0,
-       0,   568,   569,   570,   571,     0,     0,   572,   573,     0,
-     574,   575,   576,   577,     0,     0,     0,     0,     0,   578,
-     579,     0,     0,     0,     0,   581,   582,     0,     0,   583,
-     584,     0,   585,   586,     0,     0,     0,     0,     0,   589,
-       0,     0,   590,     0,   591,     0,   592,   593,     0,     0,
-       0,     0,     0,   594,     0,   595,     0,     0,   596,     0,
-       0,     0,   597,     0,   598,   599,   600,   601,     0,     0,
-    -518,     0,     0,     0,   602,   603,   604,     0,   605,     0,
-     607,   608,     0,     0,   609,     0,     0,   610,   611,   612,
-     613,   614,     0,   615,     0,     0,     0,     0,     0,     0,
-       0,     0,   616,   617,   618,     0,   619,   620,   621,     0,
-       0,     0,     0,   623,     0,   624,     0,     0,     0,     0,
-       0,     0,   625,   626,     0,     0,   627,     0,   628,     0,
-     629,   630,     0,     0,     0,   631,   632,   633,   634,   635,
-     636,   637,   638,     0,   639,   640,   641,     0,   643,   644,
-     645,   646,   647,   648,     0,   649,   650,   651,   652,   653,
-     654,   655,   656,   657,   658,   659,   660,   661,   662,   663,
-     664,   665,   666,   667,   668,   669,   670,   671,   672,     0,
-     673,   674,   675,   676,   677,   678,   679,     0,   680,   681,
-     682,   683,   684,   685,   686,   687,   688,   689,   690,   691,
-     692,   693,   694,   695,   696,   697,   698,   699,   700,   701,
-     702,   703,   704,   705,   706,   707,   708,   709,   710,   711,
-       0,   243,   244,     0,   245,   246,   247,   248,   249,     0,
-       0,   250,     0,     0,     0,     0,   251,     0,  5497,   252,
-       0,   253,   254,   255,   256,   257,   258,     0,   259,     0,
-       0,     0,   260,   755,     0,     0,   261,     0,     0,   262,
-     263,   264,     0,   265,     0,   266,   267,     0,     0,   268,
-       0,     0,   269,   270,     0,   271,   272,   273,     0,   274,
-       0,   275,   276,   277,   278,   279,   280,     0,   281,   282,
-       0,   283,   284,   285,   286,   287,   288,   289,   290,   291,
-     292,   293,     0,   294,   295,     0,   296,   297,   298,   299,
-     300,     0,     0,     0,   301,     0,     0,     0,     0,   302,
-       0,     0,   303,     0,     0,     0,   304,   305,   306,     0,
-       0,  2857,     0,     0,     0,     0,   308,   309,   775,     0,
-       0,     0,   310,   311,     0,   312,     0,     0,     0,     0,
-       0,   313,   314,   315,   316,   317,     0,     0,     0,   318,
-       0,     0,   319,   320,   321,     0,     0,     0,   322,     0,
-     323,   324,     0,   325,   326,   327,     0,     0,   328,   329,
-       0,   330,   331,   332,   333,   334,   335,     0,     0,   336,
-     337,   338,   339,   340,     0,   779,   341,   342,     0,   343,
-     344,   345,   346,   347,   780,     0,   348,   349,     0,     0,
-       0,   350,   351,     0,   352,     0,     0,     0,   353,     0,
-     354,   355,   356,   357,     0,   358,     0,   359,     0,     0,
-       0,   360,   361,     0,   362,   785,     0,   363,   364,     0,
-       0,     0,   365,   366,   367,   368,     0,     0,   369,   370,
-     371,     0,     0,   372,     0,     0,     0,     0,   373,   374,
-     375,     0,     0,     0,   376,     0,     0,     0,   377,   378,
-       0,   379,   380,     0,     0,     0,   381,     0,   382,     0,
-       0,   383,   384,     0,     0,   385,     0,     0,   386,   387,
-       0,     0,     0,     0,     0,   388,   389,     0,   390,     0,
-     391,     0,   392,   393,     0,     0,   792,     0,     0,     0,
-       0,   394,     0,   395,   396,   397,   398,   399,   400,   401,
-     402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
-       0,   412,   413,   414,     0,   415,   416,   417,   418,     0,
-     419,   420,     0,     0,     0,     0,   421,   422,   423,   424,
-     425,   426,     0,     0,   427,   428,     0,   429,     0,   430,
-       0,   431,   432,   433,   434,   435,   436,   437,   438,   439,
-       0,   803,   440,   441,     0,     0,   442,   443,   444,   445,
-     446,     0,     0,     0,   447,   448,     0,   807,   808,   449,
-       0,   450,   451,     0,   452,   453,   454,     0,     0,   455,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   456,
-     457,   458,     0,   459,     0,   460,     0,   461,   462,   463,
-     464,   465,   466,   467,   468,   469,   470,     0,   471,     0,
-     472,   473,   474,     0,   475,     0,   476,   477,   478,   479,
-     480,     0,   481,   482,   483,     0,     0,   484,     0,     0,
-       0,   485,   486,     0,   487,   488,     0,     0,   489,   490,
-     491,   492,   493,     0,   494,   495,     0,   496,   497,   498,
-       0,     0,   499,   500,   501,   502,   503,   504,   505,   506,
-       0,   507,     0,   508,   509,     0,   510,   511,   512,     0,
-     513,     0,     0,   514,   515,   516,   517,     0,   518,     0,
-     519,   520,   521,   522,   523,     0,   524,   525,     0,     0,
-       0,   526,   527,   528,   529,     0,     0,     0,   530,     0,
-       0,     0,   531,     0,   532,   533,   534,   535,     0,   536,
-     537,   538,   539,   540,     0,     0,     0,     0,     0,   541,
-     542,   543,     0,   544,     0,     0,   545,     0,     0,   546,
-       0,   547,     0,   548,   549,   550,   551,   552,   553,     0,
-       0,   554,   555,     0,     0,   556,   557,   558,   559,   560,
-     561,     0,     0,   562,   563,   564,   565,     0,   566,   567,
-       0,     0,   568,   569,   570,   571,     0,   827,   572,   573,
-       0,  2858,   575,   576,  2859,     0,     0,     0,     0,     0,
-     578,   579,     0,     0,   833,   580,   581,   582,     0,   835,
-     583,   584,   836,   585,   586,     0,   587,   588,     0,     0,
-     589,     0,     0,   590,     0,   591,     0,   592,   593,     0,
-       0,     0,     0,     0,   594,     0,   595,     0,     0,   596,
-       0,     0,     0,   597,     0,   598,   599,   600,   601,     0,
-       0,     0,     0,     0,     0,   602,   603,   604,     0,   605,
-     606,   607,   608,     0,     0,   609,     0,     0,   610,   611,
-     612,   613,   614,     0,   615,     0,     0,     0,     0,     0,
-       0,     0,     0,   616,   617,   618,     0,   619,   620,   621,
-       0,   622,     0,     0,   623,     0,   624,     0,     0,     0,
-       0,     0,     0,   625,   626,     0,     0,   627,     0,   628,
-       0,   629,   630,     0,     0,     0,   631,   632,   633,   634,
-     635,   636,   637,   638,     0,   639,   640,   641,   642,   643,
-     644,   645,   646,   647,   648,     0,   649,   650,   651,   652,
-     653,   654,   655,   656,   657,   658,   659,   660,   661,   662,
-     663,   664,   665,   666,   667,   668,   669,   670,   671,   672,
-       0,   673,   674,   675,   676,   677,   678,   679,     0,   680,
-     681,   682,   683,   684,   685,   686,   687,   688,   689,   690,
-     691,   692,   693,   694,   695,   696,   697,   698,   699,   700,
-     701,   702,   703,   704,   705,   706,   707,   708,   709,   710,
-     711,   243,   244,     0,   245,   246,   247,   248,   249,     0,
-       0,   250,     0,     0,     0,     0,   251,     0,   868,   252,
+     706,   707,   708,   709,   710,   711,   712,   713,   714,   715,
+     716,   717,   718,   719,   720,   243,   244,     0,   245,   246,
+     247,   248,   249,     0,     0,   250,     0,     0,     0,     0,
+     251,     0,  1537,   252,     0,   253,   254,   255,   256,   257,
+     258,     0,   259,     0,     0,     0,   260,     0,     0,     0,
+     261,     0,     0,   262,   263,   264,     0,   265,     0,   266,
+     267,     0,     0,   268,     0,     0,   269,   270,     0,   271,
+     272,  1026,  1027,   274,     0,   275,   276,   277,   278,   279,
+     280,     0,   281,   282,     0,   283,   284,   285,   286,   287,
+     288,   289,   290,   291,   292,   293,     0,   294,   295,     0,
+     296,   297,   298,   299,   300,     0,     0,     0,   301,     0,
+       0,     0,     0,   302,     0,     0,   303,     0,     0,     0,
+     304,   305,   306,     0,     0,   307,     0,     0,     0,     0,
+     308,   309,     0,     0,     0,  1545,   310,   311,     0,   312,
+       0,     0,     0,     0,     0,   313,   314,   315,   316,   317,
+       0,     0,     0,   318,     0,     0,   319,   320,   321,     0,
+       0,     0,   322,     0,   323,   324,     0,   325,   326,   327,
+       0,     0,   328,   329,     0,   330,   331,   332,   333,   334,
+     335,     0,     0,   336,   337,   338,   339,   340,     0,     0,
+     341,   342,     0,   343,   344,   345,   346,   347,     0,     0,
+     348,   349,     0,     0,     0,   350,   351,     0,   352,     0,
+       0,     0,   353,     0,   354,   355,   356,   357,     0,  1029,
+       0,   359,     0,     0,     0,   360,   361,     0,   362,     0,
+       0,   363,   364,     0,     0,     0,   365,   366,   367,   368,
+       0,     0,   369,   370,   371,     0,     0,   372,     0,     0,
+       0,     0,   373,   374,   375,     0,     0,     0,   376,     0,
+       0,     0,   377,   378,     0,   379,   380,     0,     0,     0,
+     381,     0,   382,     0,     0,   383,   384,     0,     0,   385,
+       0,     0,   386,   387,     0,     0,     0,     0,     0,   388,
+     389,     0,  1030,     0,   391,     0,   392,   393,     0,     0,
+       0,     0,     0,     0,     0,   394,     0,   395,   396,   397,
+     398,   399,   400,   401,   402,   403,   404,   405,   406,   407,
+     408,   409,   410,   411,     0,   412,   413,   414,     0,   415,
+     416,   417,   418,     0,   419,   420,     0,     0,     0,     0,
+     421,   422,   423,   424,   425,   426,     0,     0,   427,   428,
+       0,   429,     0,   430,     0,   431,   432,   433,   434,   435,
+     436,  1031,   438,   439,     0,     0,   440,   441,     0,     0,
+     442,   443,   444,   445,   446,     0,     0,     0,   447,   448,
+       0,     0,     0,   449,     0,   450,   451,     0,   452,   453,
+     454,     0,     0,   455,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   456,   457,   458,     0,   459,     0,   460,
+       0,   461,   462,   463,   464,   465,   466,   467,   468,   469,
+     470,     0,   471,     0,   472,   473,   474,     0,   475,     0,
+     476,   477,   478,   479,   480,     0,   481,   482,   483,     0,
+       0,   484,     0,     0,     0,   485,   486,     0,   487,   488,
+       0,     0,   489,   490,   491,   492,   493,     0,   494,   495,
+       0,   496,   497,   498,     0,     0,   499,   500,   501,   502,
+     503,   504,   505,   506,     0,   507,     0,   508,   509,     0,
+     510,   511,   512,     0,   513,     0,     0,   514,   515,   516,
+     517,     0,   518,     0,   519,   520,   521,   522,   523,     0,
+     524,   525,     0,     0,     0,   526,   527,  1033,   529,     0,
+       0,     0,   530,     0,     0,     0,   531,     0,   532,   533,
+     534,   535,     0,   536,   537,   538,   539,   540,     0,     0,
+       0,     0,     0,   541,   542,   543,     0,   544,     0,     0,
+     545,     0,     0,   546,     0,   547,     0,   548,   549,   550,
+     551,   552,   553,     0,     0,   554,   555,     0,     0,   556,
+     557,   558,   559,   560,   561,     0,     0,   562,   563,   564,
+     565,     0,   566,   567,     0,     0,   568,   569,   570,   571,
+       0,     0,   572,   573,     0,   574,   575,   576,   577,     0,
+       0,     0,     0,     0,   578,   579,     0,     0,     0,   580,
+     581,   582,     0,     0,   583,   584,     0,   585,   586,     0,
+     587,   588,     0,     0,   589,     0,     0,   590,     0,   591,
+       0,   592,   593,     0,     0,     0,     0,     0,   594,     0,
+     595,     0,     0,   596,     0,     0,     0,   597,     0,   598,
+     599,   600,   601,     0,     0,     0,     0,     0,     0,   602,
+     603,   604,     0,   605,   606,   607,   608,     0,     0,   609,
+       0,     0,  1035,   611,   612,   613,   614,     0,   615,     0,
+       0,     0,     0,     0,     0,     0,     0,   616,   617,   618,
+       0,  1037,   620,   621,     0,   622,     0,     0,   623,     0,
+     624,     0,     0,     0,     0,     0,     0,   625,   626,     0,
+       0,   627,     0,   628,     0,   629,   630,     0,     0,     0,
+     631,   632,   633,   634,   635,   636,   637,   638,     0,   639,
+     640,   641,   642,   643,   644,   645,   646,   647,   648,     0,
+     649,   650,   651,   652,   653,   654,   655,   656,   657,   658,
+     659,   660,   661,   662,   663,   664,   665,   666,   667,   668,
+     669,   670,   671,   672,     0,   673,   674,   675,   676,   677,
+     678,   679,     0,   680,   681,   682,   683,   684,   685,   686,
+     687,   688,   689,   690,   691,   692,   693,   694,   695,   696,
+     697,   698,   699,   700,   701,   702,   703,   704,   705,   706,
+     707,   708,   709,   710,   711,   712,   713,   714,   715,   716,
+     717,   718,   719,   720,   243,   244,     0,   245,   246,   247,
+     248,   249,     0,     0,   250,     0,     0,     0,     0,   251,
+       0,  1039,   252,     0,   253,   254,   255,   256,   257,   258,
+       0,   259,     0,     0,     0,   260,     0,     0,     0,   261,
+       0,     0,   262,   263,   264,     0,   265,     0,   266,   267,
+       0,     0,   268,     0,     0,   269,   270,     0,   271,   272,
+     273,     0,   274,     0,   275,   276,   277,   278,   279,   280,
+       0,   281,   282,     0,   283,   284,   285,   286,   287,   288,
+     289,   290,   291,   292,   293,     0,   294,   295,     0,   296,
+     297,   298,   299,   300,     0,     0,     0,   301,     0,     0,
+       0,     0,   302,     0,     0,   303,     0,     0,     0,   304,
+     305,   306,     0,     0,   307,     0,     0,     0,     0,   308,
+     309,     0,     0,     0,     0,   310,   311,     0,   312,     0,
+       0,     0,     0,     0,   313,   314,   315,   316,   317,     0,
+       0,     0,   318,     0,     0,   319,   320,   321,     0,     0,
+       0,   322,     0,   323,   324,     0,   325,   326,   327,     0,
+       0,   328,   329,     0,   330,   331,   332,   333,   334,   335,
+       0,     0,   336,   337,   338,   339,   340,     0,     0,   341,
+     342,     0,   343,   344,   345,   346,   347,     0,     0,   348,
+     349,     0,     0,     0,   350,   351,     0,   352,     0,     0,
+       0,   353,     0,   354,   355,   356,   357,     0,   358,     0,
+     359,     0,     0,     0,   360,   361,     0,   362,     0,     0,
+     363,   364,     0,     0,     0,   365,   366,   367,   368,     0,
+       0,   369,   370,   371,     0,     0,   372,     0,     0,     0,
+       0,   373,   374,   375,     0,     0,     0,   376,     0,     0,
+       0,   377,   378,     0,   379,   380,     0,     0,     0,   381,
+       0,   382,     0,     0,   383,   384,     0,     0,   385,     0,
+       0,   386,   387,  1142,     0,     0,     0,     0,   388,   389,
+       0,   390,     0,   391,     0,   392,   393,     0,     0,     0,
+       0,     0,     0,     0,   394,     0,   395,   396,   397,   398,
+     399,   400,   401,   402,   403,   404,   405,   406,   407,   408,
+     409,   410,   411,     0,   412,   413,   414,     0,   415,   416,
+     417,   418,     0,   419,   420,     0,     0,     0,     0,   421,
+     422,   423,   424,   425,   426,     0,     0,   427,   428,     0,
+     429,     0,   430,     0,   431,   432,   433,   434,   435,   436,
+     437,   438,   439,     0,     0,   440,   441,     0,     0,   442,
+     443,   444,   445,   446,     0,     0,     0,   447,   448,     0,
+       0,     0,   449,     0,   450,   451,     0,   452,   453,   454,
+       0,     0,   455,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   456,   457,   458,     0,   459,     0,   460,     0,
+     461,   462,   463,   464,   465,   466,   467,   468,   469,   470,
+       0,   471,     0,   472,   473,   474,     0,   475,     0,   476,
+     477,   478,   479,   480,     0,   481,   482,   483,     0,     0,
+     484,     0,     0,     0,   485,   486,     0,   487,   488,     0,
+       0,   489,   490,   491,   492,   493,     0,   494,   495,     0,
+     496,   497,   498,     0,     0,   499,   500,   501,   502,   503,
+     504,   505,   506,     0,   507,     0,   508,   509,     0,   510,
+     511,   512,     0,   513,     0,     0,   514,   515,   516,   517,
+       0,   518,     0,   519,   520,   521,   522,   523,     0,   524,
+     525,     0,     0,     0,   526,   527,   528,   529,     0,     0,
+       0,   530,     0,     0,     0,   531,     0,   532,   533,   534,
+     535,     0,   536,   537,   538,   539,   540,     0,     0,     0,
+       0,     0,   541,   542,   543,     0,   544,     0,     0,   545,
+       0,     0,   546,     0,   547,     0,   548,   549,   550,   551,
+     552,   553,     0,     0,   554,   555,     0,     0,   556,   557,
+     558,   559,   560,   561,     0,     0,   562,   563,   564,   565,
+       0,   566,   567,     0,     0,   568,   569,   570,   571,     0,
+     240,   572,   573,     0,   574,   575,   576,   577,     0,     0,
+       0,     0,     0,   578,   579,     0,     0,     0,   580,   581,
+     582,     0,     0,   583,   584,     0,   585,   586,     0,   587,
+     588,     0,     0,   589,     0,     0,   590,     0,   591,     0,
+     592,   593,     0,     0,     0,     0,     0,   594,     0,   595,
+       0,     0,   596,     0,     0,     0,   597,     0,   598,   599,
+     600,   601,     0,     0,     0,     0,     0,     0,   602,   603,
+     604,     0,   605,   606,   607,   608,     0,     0,   609,     0,
+       0,   610,   611,   612,   613,   614,     0,   615,     0,     0,
+       0,     0,     0,     0,     0,     0,   616,   617,   618,     0,
+     619,   620,   621,     0,   622,     0,     0,   623,     0,   624,
+       0,     0,     0,     0,     0,     0,   625,   626,     0,     0,
+     627,     0,   628,     0,   629,   630,     0,     0,     0,   631,
+     632,   633,   634,   635,   636,   637,   638,     0,   639,   640,
+     641,   642,   643,   644,   645,   646,   647,   648,     0,   649,
+     650,   651,   652,   653,   654,   655,   656,   657,   658,   659,
+     660,   661,   662,   663,   664,   665,   666,   667,   668,   669,
+     670,   671,   672,     0,   673,   674,   675,   676,   677,   678,
+     679,     0,   680,   681,   682,   683,   684,   685,   686,   687,
+     688,   689,   690,   691,   692,   693,   694,   695,   696,   697,
+     698,   699,   700,   701,   702,   703,   704,   705,   706,   707,
+     708,   709,   710,   711,   712,   713,   714,   715,   716,   717,
+     718,   719,   720,   243,   244,     0,   245,   246,   247,   248,
+     249,     0,     0,   250,     0,     0,     0,     0,   251,     0,
+    1700,   252,     0,   253,   254,   255,   256,   257,   258,     0,
+     259,     0,     0,     0,   260,     0,     0,     0,   261,     0,
+       0,   262,   263,   264,     0,   265,     0,   266,   267,     0,
+       0,   268,     0,     0,   269,   270,     0,   271,   272,   273,
+       0,   274,     0,   275,   276,   277,   278,   279,   280,     0,
+     281,   282,     0,   283,   284,   285,   286,   287,   288,   289,
+     290,   291,   292,   293,  2172,   294,   295,     0,   296,   297,
+     298,   299,   300,     0,     0,     0,   301,     0,     0,     0,
+       0,   302,     0,     0,   303,     0,     0,     0,   304,   305,
+     306,     0,     0,   307,     0,     0,     0,     0,   308,   309,
+       0,     0,     0,     0,   310,   311,     0,   312,     0,     0,
+       0,     0,     0,   313,   314,   315,   316,   317,     0,     0,
+       0,   318,     0,     0,   319,   320,   321,     0,     0,     0,
+     322,     0,   323,   324,     0,   325,   326,   327,     0,     0,
+     328,   329,     0,   330,   331,   332,   333,   334,   335,     0,
+       0,   336,   337,   338,   339,   340,     0,     0,   341,   342,
+       0,   343,   344,   345,   346,   347,     0,     0,   348,   349,
+       0,     0,     0,   350,   351,     0,   352,     0,     0,     0,
+     353,     0,   354,   355,   356,   357,     0,   358,     0,   359,
+       0,     0,     0,   360,   361,     0,   362,     0,     0,   363,
+     364,     0,     0,     0,   365,   366,   367,   368,     0,     0,
+     369,   370,   371,     0,     0,   372,     0,     0,     0,     0,
+     373,   374,   375,     0,     0,     0,   376,     0,     0,     0,
+     377,   378,     0,   379,   380,     0,     0,     0,   381,     0,
+     382,     0,     0,   383,   384,     0,     0,   385,     0,     0,
+     386,   387,     0,     0,     0,     0,     0,   388,   389,     0,
+     390,     0,   391,     0,   392,   393,     0,     0,     0,     0,
+       0,     0,     0,   394,     0,   395,   396,   397,   398,   399,
+     400,   401,   402,   403,   404,   405,   406,   407,   408,   409,
+     410,   411,     0,   412,   413,   414,     0,   415,   416,   417,
+     418,     0,   419,   420,     0,     0,     0,     0,   421,   422,
+     423,   424,   425,   426,     0,     0,   427,   428,     0,   429,
+       0,   430,     0,   431,   432,   433,   434,   435,   436,   437,
+     438,   439,     0,     0,   440,   441,     0,     0,   442,   443,
+     444,   445,   446,     0,     0,     0,   447,   448,     0,     0,
+       0,   449,     0,   450,   451,     0,   452,   453,   454,     0,
+       0,   455,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   456,   457,   458,     0,   459,     0,   460,     0,   461,
+     462,   463,   464,   465,   466,   467,   468,   469,   470,     0,
+     471,     0,   472,   473,   474,     0,   475,     0,   476,   477,
+     478,   479,   480,     0,   481,   482,   483,     0,     0,   484,
+       0,     0,     0,   485,   486,     0,   487,   488,     0,     0,
+     489,   490,   491,   492,   493,     0,   494,   495,     0,   496,
+     497,   498,     0,     0,   499,   500,   501,   502,   503,   504,
+     505,   506,     0,   507,     0,   508,   509,     0,   510,   511,
+     512,     0,   513,     0,     0,   514,   515,   516,   517,     0,
+     518,     0,   519,   520,   521,   522,   523,     0,   524,   525,
+       0,     0,     0,   526,   527,   528,   529,     0,     0,     0,
+     530,     0,     0,     0,   531,     0,   532,   533,   534,   535,
+       0,   536,   537,   538,   539,   540,     0,     0,     0,     0,
+       0,   541,   542,   543,     0,   544,     0,     0,   545,     0,
+       0,   546,     0,   547,     0,   548,   549,   550,   551,   552,
+     553,     0,     0,   554,   555,     0,     0,   556,   557,   558,
+     559,   560,   561,     0,     0,   562,   563,   564,   565,     0,
+     566,   567,     0,     0,   568,   569,   570,   571,     0,     0,
+     572,   573,     0,   574,   575,   576,   577,     0,     0,     0,
+       0,     0,   578,   579,     0,     0,     0,   580,   581,   582,
+       0,     0,   583,   584,     0,   585,   586,     0,   587,   588,
+       0,     0,   589,     0,     0,   590,     0,   591,     0,   592,
+     593,     0,     0,     0,     0,     0,   594,     0,   595,     0,
+       0,   596,     0,     0,     0,   597,     0,   598,   599,   600,
+     601,     0,     0,     0,     0,     0,     0,   602,   603,   604,
+       0,   605,   606,   607,   608,     0,     0,   609,     0,     0,
+     610,   611,   612,   613,   614,     0,   615,     0,     0,     0,
+       0,     0,     0,     0,     0,   616,   617,   618,     0,   619,
+     620,   621,     0,   622,     0,     0,   623,     0,   624,     0,
+       0,     0,     0,     0,     0,   625,   626,     0,     0,   627,
+       0,   628,     0,   629,   630,     0,     0,     0,   631,   632,
+     633,   634,   635,   636,   637,   638,     0,   639,   640,   641,
+     642,   643,   644,   645,   646,   647,   648,     0,   649,   650,
+     651,   652,   653,   654,   655,   656,   657,   658,   659,   660,
+     661,   662,   663,   664,   665,   666,   667,   668,   669,   670,
+     671,   672,     0,   673,   674,   675,   676,   677,   678,   679,
+       0,   680,   681,   682,   683,   684,   685,   686,   687,   688,
+     689,   690,   691,   692,   693,   694,   695,   696,   697,   698,
+     699,   700,   701,   702,   703,   704,   705,   706,   707,   708,
+     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
+     719,   720,   243,   244,     0,   245,   246,   247,   248,   249,
+       0,     0,   250,     0,     0,     0,     0,   251,     0,  2173,
+     252,     0,   253,   254,   255,   256,   257,   258,     0,   259,
+       0,     0,     0,   260,     0,     0,     0,   261,     0,     0,
+     262,   263,   264,     0,   265,     0,   266,   267,     0,     0,
+     268,     0,     0,   269,   270,     0,   271,   272,   273,     0,
+     274,     0,   275,   276,   277,   278,   279,   280,     0,   281,
+     282,     0,   283,   284,   285,   286,   287,   288,   289,   290,
+     291,   292,   293,     0,   294,   295,     0,   296,   297,   298,
+     299,   300,     0,     0,     0,   301,     0,     0,     0,     0,
+     302,     0,     0,   303,     0,     0,     0,   304,   305,   306,
+       0,     0,   307,     0,     0,     0,     0,   308,   309,     0,
+       0,     0,     0,   310,   311,     0,   312,     0,     0,     0,
+       0,     0,   313,   314,   315,   316,   317,     0,     0,     0,
+     318,     0,     0,   319,   320,   321,     0,     0,     0,   322,
+       0,   323,   324,     0,   325,   326,   327,     0,     0,   328,
+     329,     0,   330,   331,   332,   333,   334,   335,     0,     0,
+     336,   337,   338,   339,   340,     0,     0,   341,   342,     0,
+     343,   344,   345,   346,   347,     0,     0,   348,   349,     0,
+       0,     0,   350,   351,     0,   352,     0,     0,     0,   353,
+       0,   354,   355,   356,   357,     0,   358,     0,   359,     0,
+       0,     0,   360,   361,     0,   362,     0,     0,   363,   364,
+       0,     0,     0,   365,   366,   367,   368,     0,     0,   369,
+     370,   371,     0,     0,   372,     0,     0,     0,     0,   373,
+     374,   375,     0,     0,     0,   376,     0,     0,     0,   377,
+     378,     0,   379,   380,     0,     0,     0,   381,     0,   382,
+       0,     0,   383,   384,     0,     0,   385,     0,     0,   386,
+     387,     0,     0,     0,     0,     0,   388,   389,     0,   390,
+       0,   391,     0,   392,   393,     0,     0,     0,     0,     0,
+       0,     0,   394,     0,   395,   396,   397,   398,   399,   400,
+     401,   402,   403,   404,   405,   406,   407,   408,   409,   410,
+     411,     0,   412,   413,   414,     0,   415,   416,   417,   418,
+       0,   419,   420,     0,     0,     0,     0,   421,   422,   423,
+     424,   425,   426,     0,     0,   427,   428,     0,   429,     0,
+     430,     0,   431,   432,   433,   434,   435,   436,   437,   438,
+     439,     0,     0,   440,   441,     0,     0,   442,   443,   444,
+     445,   446,     0,     0,     0,   447,   448,     0,     0,     0,
+     449,     0,   450,   451,     0,   452,   453,   454,     0,     0,
+     455,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     456,   457,   458,     0,   459,     0,   460,     0,   461,   462,
+     463,   464,   465,   466,   467,   468,   469,   470,     0,   471,
+       0,   472,   473,   474,     0,   475,     0,   476,   477,   478,
+     479,   480,     0,   481,   482,   483,     0,     0,   484,     0,
+       0,     0,   485,   486,     0,   487,   488,     0,     0,   489,
+     490,   491,   492,   493,     0,   494,   495,     0,   496,   497,
+     498,     0,     0,   499,   500,   501,   502,   503,   504,   505,
+     506,     0,   507,     0,   508,   509,     0,   510,   511,   512,
+       0,   513,     0,     0,   514,   515,   516,   517,     0,   518,
+       0,   519,   520,   521,   522,   523,     0,   524,   525,     0,
+       0,     0,   526,   527,   528,   529,     0,     0,     0,   530,
+       0,     0,     0,   531,     0,   532,   533,   534,   535,     0,
+     536,   537,   538,   539,   540,     0,     0,     0,     0,     0,
+     541,   542,   543,     0,   544,     0,     0,   545,     0,     0,
+     546,     0,   547,     0,   548,   549,   550,   551,   552,   553,
+       0,     0,   554,   555,     0,     0,   556,   557,   558,   559,
+     560,   561,     0,     0,   562,   563,   564,   565,     0,   566,
+     567,     0,     0,   568,   569,   570,   571,     0,     0,   572,
+     573,     0,   574,   575,   576,   577,     0,     0,     0,     0,
+       0,   578,   579,     0,     0,     0,   580,   581,   582,     0,
+       0,   583,   584,     0,   585,   586,     0,   587,   588,     0,
+       0,   589,     0,     0,   590,     0,   591,     0,   592,   593,
+       0,     0,     0,     0,     0,   594,     0,   595,     0,     0,
+     596,     0,     0,     0,   597,     0,   598,   599,   600,   601,
+       0,     0,     0,     0,     0,     0,   602,   603,   604,     0,
+     605,   606,   607,   608,     0,     0,   609,     0,     0,   610,
+     611,   612,   613,   614,     0,   615,     0,     0,     0,     0,
+       0,     0,     0,     0,   616,   617,   618,     0,   619,   620,
+     621,     0,   622,     0,     0,   623,     0,   624,     0,     0,
+       0,     0,     0,     0,   625,   626,     0,     0,   627,     0,
+     628,     0,   629,   630,     0,     0,     0,   631,   632,   633,
+     634,   635,   636,   637,   638,     0,   639,   640,   641,   642,
+     643,   644,   645,   646,   647,   648,     0,   649,   650,   651,
+     652,   653,   654,   655,   656,   657,   658,   659,   660,   661,
+     662,   663,   664,   665,   666,   667,   668,   669,   670,   671,
+     672,     0,   673,   674,   675,   676,   677,   678,   679,     0,
+     680,   681,   682,   683,   684,   685,   686,   687,   688,   689,
+     690,   691,   692,   693,   694,   695,   696,   697,   698,   699,
+     700,   701,   702,   703,   704,   705,   706,   707,   708,   709,
+     710,   711,   712,   713,   714,   715,   716,   717,   718,   719,
+     720,   243,   244,     0,   245,   246,   247,   248,   249,     0,
+       0,   250,     0,     0,     0,  5490,   251,     0,  5491,   252,
        0,   253,   254,   255,   256,   257,   258,     0,   259,     0,
        0,     0,   260,     0,     0,     0,   261,     0,     0,   262,
      263,   264,     0,   265,     0,   266,   267,     0,     0,   268,
@@ -7790,84 +8456,6 @@
        0,   379,   380,     0,     0,     0,   381,     0,   382,     0,
        0,   383,   384,     0,     0,   385,     0,     0,   386,   387,
        0,     0,     0,     0,     0,   388,   389,     0,   390,     0,
-     391,     0,   392,   393,     0,     0,   792,     0,     0,     0,
-       0,   394,     0,   395,   396,   397,   398,   399,   400,   401,
-     402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
-       0,   412,   413,   414,     0,   415,   416,   417,   418,     0,
-     419,   420,     0,     0,     0,     0,   421,   422,   423,   424,
-     425,   426,     0,     0,   427,   428,     0,   429,     0,   430,
-       0,   431,   432,   433,   434,   435,   436,   437,   438,   439,
-       0,     0,   440,   441,     0,     0,   442,   443,   444,   445,
-     446,     0,     0,     0,   447,   448,     0,     0,   808,   449,
-       0,   450,   451,     0,   452,   453,   454,     0,     0,   455,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   456,
-     457,   458,   809,   459,     0,   460,     0,   461,   462,   463,
-     464,   465,   466,   467,   468,   469,   470,     0,   471,     0,
-     472,   473,   474,     0,   475,     0,   476,   477,   478,   479,
-     480,     0,   481,   482,   483,     0,     0,   484,     0,     0,
-       0,   485,   486,     0,   487,   488,     0,     0,   489,   490,
-     491,   492,   493,     0,   494,   495,     0,   496,   497,   498,
-       0,     0,   499,   500,   501,   502,   503,   504,   505,   506,
-       0,   507,     0,   508,   509,     0,   510,   511,   512,     0,
-     513,     0,     0,   514,   515,   516,   517,     0,   518,     0,
-     519,   520,   521,   522,   523,     0,   524,   525,     0,     0,
-       0,   526,   527,   528,   529,     0,     0,     0,   530,     0,
-       0,     0,   531,     0,   532,   533,   534,   535,     0,   536,
-     537,   538,   539,   540,     0,     0,     0,     0,     0,   541,
-     542,   543,     0,   544,     0,     0,   545,     0,     0,   546,
-       0,   547,     0,   548,   549,   550,   551,   552,   553,     0,
-       0,   554,   555,     0,     0,   556,   557,   558,   559,   560,
-     561,     0,     0,   562,   563,   564,   565,     0,   566,   567,
-       0,     0,   568,   569,   570,   571,     0,     0,   572,   573,
-       0,   574,   575,   576,   577,     0,     0,     0,     0,     0,
-     578,   579,     0,     0,     0,   580,   581,   582,     0,   835,
-     583,   584,     0,   585,   586,     0,   587,   588,     0,     0,
-     589,     0,     0,   590,     0,   591,     0,   592,   593,     0,
-       0,     0,     0,     0,   594,     0,   595,     0,     0,   596,
-       0,     0,     0,   597,     0,   598,   599,   600,   601,     0,
-       0,     0,     0,     0,     0,   602,   603,   604,     0,   605,
-     606,   607,   608,     0,     0,   609,     0,     0,   610,   611,
-     612,   613,   614,     0,   615,     0,     0,     0,     0,     0,
-       0,     0,     0,   616,   617,   618,     0,   619,   620,   621,
-       0,   622,     0,     0,   623,     0,   624,     0,     0,     0,
-       0,     0,     0,   625,   626,     0,     0,   627,     0,   628,
-       0,   629,   630,     0,     0,     0,   631,   632,   633,   634,
-     635,   636,   637,   638,     0,   639,   640,   641,   642,   643,
-     644,   645,   646,   647,   648,     0,   649,   650,   651,   652,
-     653,   654,   655,   656,   657,   658,   659,   660,   661,   662,
-     663,   664,   665,   666,   667,   668,   669,   670,   671,   672,
-       0,   673,   674,   675,   676,   677,   678,   679,     0,   680,
-     681,   682,   683,   684,   685,   686,   687,   688,   689,   690,
-     691,   692,   693,   694,   695,   696,   697,   698,   699,   700,
-     701,   702,   703,   704,   705,   706,   707,   708,   709,   710,
-     711,   243,   244,     0,   245,   246,   247,   248,   249,     0,
-       0,   250,     0,     0,     0,     0,   251,     0,  2037,   252,
-       0,   253,   254,   255,   256,   257,   258,     0,   259,     0,
-       0,     0,   260,     0,     0,     0,   261,     0,     0,   262,
-     263,   264,     0,   265,     0,   266,   267,     0,     0,   268,
-       0,     0,   269,   270,     0,   271,   272,   273,     0,   274,
-       0,   275,   276,   277,   278,   279,   280,     0,   281,   282,
-       0,   283,   284,   285,   286,   287,   288,   289,   290,   291,
-     292,   293,     0,   294,   295,     0,   296,   297,   298,   299,
-     300,     0,     0,     0,   301,     0,     0,     0,     0,   302,
-       0,     0,   303,     0,     0,     0,   304,   305,   306,     0,
-       0,   307,     0,     0,     0,     0,   308,   309,     0,     0,
-       0,     0,   310,   311,     0,   312,     0,     0,     0,     0,
-       0,   313,   314,   315,   316,   317,     0,     0,     0,   318,
-       0,     0,  1674,   320,   321,     0,     0,     0,   322,     0,
-     323,   324,     0,   325,   326,   327,     0,     0,   328,   329,
-       0,   330,   331,   332,   333,   334,   335,     0,     0,   336,
-     337,   338,   339,   340,     0,     0,   341,   342,     0,   343,
-     344,   345,   346,   347,     0,     0,   348,   349,     0,     0,
-       0,   350,   351,     0,   352,     0,     0,     0,   353,     0,
-     354,   355,   356,   357,     0,   358,     0,   359,     0,     0,
-       0,   360,   361,     0,   362,     0,     0,   363,   364,     0,
-       0,     0,   365,   366,   367,   368,     0,     0,   369,   370,
-     371,     0,     0,   372,     0,     0,     0,     0,   373,   374,
-     375,     0,     0,     0,   376,     0,     0,     0,   377,   378,
-       0,   379,   380,     0,     0,     0,   381,     0,   382,     0,
-       0,   383,   384,     0,     0,   385,     0,     0,   386,   387,
-    1133,     0,     0,     0,     0,   388,   389,     0,   390,     0,
      391,     0,   392,   393,     0,     0,     0,     0,     0,     0,
        0,   394,     0,   395,   396,   397,   398,   399,   400,   401,
      402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
@@ -7878,7 +8466,7 @@
        0,     0,   440,   441,     0,     0,   442,   443,   444,   445,
      446,     0,     0,     0,   447,   448,     0,     0,     0,   449,
        0,   450,   451,     0,   452,   453,   454,     0,     0,   455,
-       0,     0,     0,     0,     0,     0,     0,  1675,     0,   456,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   456,
      457,   458,     0,   459,     0,   460,     0,   461,   462,   463,
      464,   465,   466,   467,   468,   469,   470,     0,   471,     0,
      472,   473,   474,     0,   475,     0,   476,   477,   478,   479,
@@ -7896,7 +8484,7 @@
        0,   547,     0,   548,   549,   550,   551,   552,   553,     0,
        0,   554,   555,     0,     0,   556,   557,   558,   559,   560,
      561,     0,     0,   562,   563,   564,   565,     0,   566,   567,
-       0,     0,   568,   569,   570,   571,     0,   240,   572,   573,
+       0,     0,   568,   569,   570,   571,     0,     0,   572,   573,
        0,   574,   575,   576,   577,     0,     0,     0,     0,     0,
      578,   579,     0,     0,     0,   580,   581,   582,     0,     0,
      583,   584,     0,   585,   586,     0,   587,   588,     0,     0,
@@ -7918,13375 +8506,6473 @@
      681,   682,   683,   684,   685,   686,   687,   688,   689,   690,
      691,   692,   693,   694,   695,   696,   697,   698,   699,   700,
      701,   702,   703,   704,   705,   706,   707,   708,   709,   710,
-     711,   243,   244,     0,   245,   246,   247,   248,   249,     0,
-       0,   250,     0,     0,     0,     0,   251,     0,  1676,   252,
-       0,   253,   254,   255,   256,   257,   258,     0,   259,     0,
-       0,     0,   260,     0,     0,     0,   261,     0,     0,   262,
-     263,   264,     0,   265,     0,   266,   267,     0,     0,   268,
-       0,     0,   269,   270,     0,   271,   272,  1017,  1018,   274,
-       0,   275,   276,   277,   278,   279,   280,     0,   281,   282,
-       0,   283,   284,   285,   286,   287,   288,   289,   290,   291,
-     292,   293,     0,   294,   295,     0,   296,   297,   298,   299,
-     300,     0,     0,     0,   301,     0,     0,     0,     0,   302,
-       0,     0,   303,     0,     0,     0,   304,   305,   306,     0,
-       0,   307,     0,     0,     0,     0,   308,   309,     0,     0,
-       0,  1019,   310,   311,     0,   312,     0,     0,     0,     0,
-       0,   313,   314,   315,   316,   317,     0,     0,     0,   318,
-       0,     0,   319,   320,   321,     0,     0,     0,   322,     0,
-     323,   324,     0,   325,   326,   327,     0,     0,   328,   329,
-       0,   330,   331,   332,   333,   334,   335,     0,     0,   336,
-     337,   338,   339,   340,     0,     0,   341,   342,     0,   343,
-     344,   345,   346,   347,     0,     0,   348,   349,     0,     0,
-       0,   350,   351,     0,   352,     0,     0,     0,   353,     0,
-     354,   355,   356,   357,     0,  1020,     0,   359,     0,     0,
-       0,   360,   361,     0,   362,     0,     0,   363,   364,     0,
-       0,     0,   365,   366,   367,   368,     0,     0,   369,   370,
-     371,     0,     0,   372,     0,     0,     0,     0,   373,   374,
-     375,     0,     0,     0,   376,     0,     0,     0,   377,   378,
-       0,   379,   380,     0,     0,     0,   381,     0,   382,     0,
-       0,   383,   384,     0,     0,   385,     0,     0,   386,   387,
-       0,     0,     0,     0,     0,   388,   389,     0,  1021,     0,
-     391,     0,   392,   393,     0,     0,     0,     0,     0,     0,
-       0,   394,     0,   395,   396,   397,   398,   399,   400,   401,
-     402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
-       0,   412,   413,   414,     0,   415,   416,   417,   418,     0,
-     419,   420,     0,     0,     0,     0,   421,   422,   423,   424,
-     425,   426,     0,     0,   427,   428,     0,   429,     0,   430,
-       0,   431,   432,   433,   434,   435,   436,  1022,   438,   439,
-       0,     0,   440,   441,     0,     0,   442,   443,   444,   445,
-     446,     0,     0,     0,   447,   448,     0,     0,     0,   449,
-       0,   450,   451,     0,   452,   453,   454,     0,     0,   455,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   456,
-     457,   458,     0,   459,     0,   460,     0,   461,   462,  1023,
-     464,   465,   466,   467,   468,   469,   470,     0,   471,     0,
-     472,   473,   474,     0,   475,     0,   476,   477,   478,   479,
-     480,     0,   481,   482,   483,     0,     0,   484,     0,     0,
-       0,   485,   486,     0,   487,   488,     0,     0,   489,   490,
-     491,   492,   493,     0,   494,   495,     0,   496,   497,   498,
-       0,     0,   499,   500,   501,   502,   503,   504,   505,   506,
-       0,   507,     0,   508,   509,     0,   510,   511,   512,     0,
-     513,     0,     0,   514,   515,   516,   517,     0,   518,     0,
-     519,   520,   521,   522,   523,     0,   524,   525,     0,     0,
-       0,   526,   527,  1024,   529,     0,     0,     0,   530,     0,
-       0,     0,   531,     0,   532,   533,   534,   535,     0,   536,
-     537,   538,   539,   540,     0,     0,     0,     0,     0,   541,
-     542,   543,     0,   544,     0,     0,   545,     0,     0,   546,
-       0,   547,     0,   548,   549,   550,   551,   552,   553,     0,
-       0,   554,   555,     0,     0,   556,   557,   558,   559,   560,
-     561,     0,     0,   562,   563,   564,   565,     0,   566,   567,
-       0,     0,   568,   569,   570,   571,     0,     0,   572,   573,
-       0,   574,   575,   576,   577,     0,     0,     0,     0,     0,
-    1025,   579,     0,     0,     0,   580,   581,   582,     0,     0,
-     583,   584,     0,   585,   586,     0,   587,   588,     0,     0,
-     589,     0,     0,   590,     0,   591,     0,   592,   593,     0,
-       0,     0,     0,     0,   594,     0,   595,     0,     0,   596,
-       0,     0,     0,   597,     0,   598,   599,   600,   601,     0,
-       0,     0,     0,     0,     0,   602,   603,   604,     0,   605,
-     606,   607,   608,     0,     0,   609,     0,     0,  1026,  1027,
-     612,   613,   614,     0,   615,     0,     0,     0,     0,     0,
-       0,     0,     0,   616,   617,   618,     0,  1028,   620,   621,
-       0,   622,     0,     0,   623,     0,   624,     0,     0,     0,
-       0,     0,     0,   625,   626,     0,     0,   627,     0,   628,
-       0,   629,   630,     0,     0,     0,   631,   632,   633,   634,
-     635,   636,   637,  1029,     0,   639,   640,   641,   642,   643,
-     644,   645,   646,   647,   648,     0,   649,   650,   651,   652,
-     653,   654,   655,   656,   657,   658,   659,   660,   661,   662,
-     663,   664,   665,   666,   667,   668,   669,   670,   671,   672,
-       0,   673,   674,   675,   676,   677,   678,   679,     0,   680,
-     681,   682,   683,   684,   685,   686,   687,   688,   689,   690,
-     691,   692,   693,   694,   695,   696,   697,   698,   699,   700,
-     701,   702,   703,   704,   705,   706,   707,   708,   709,   710,
-     711,   243,   244,     0,   245,   246,   247,   248,   249,     0,
-       0,   250,     0,     0,     0,     0,   251,     0,  1030,   252,
-       0,   253,   254,   255,   256,   257,   258,     0,   259,     0,
-       0,     0,   260,     0,     0,     0,   261,     0,     0,   262,
-     263,   264,     0,   265,     0,   266,   267,     0,     0,   268,
-       0,     0,   269,   270,     0,   271,   272,   273,     0,   274,
-       0,   275,   276,   277,   278,   279,   280,     0,   281,   282,
-       0,   283,   284,   285,   286,   287,   288,   289,   290,   291,
-     292,   293,     0,   294,   295,     0,   296,   297,   298,   299,
-     300,     0,     0,     0,   301,     0,     0,     0,     0,   302,
-       0,     0,   303,     0,     0,     0,   304,   305,   306,     0,
-       0,   307,     0,     0,     0,     0,   308,   309,     0,     0,
-       0,     0,   310,   311,     0,   312,     0,     0,     0,     0,
-       0,   313,   314,   315,   316,   317,     0,     0,     0,   318,
-       0,     0,   319,   320,   321,     0,     0,     0,   322,     0,
-     323,   324,     0,   325,   326,   327,     0,     0,   328,   329,
-       0,   330,   331,   332,   333,   334,   335,     0,     0,   336,
-     337,   338,   339,   340,     0,     0,   341,   342,     0,   343,
-     344,   345,   346,   347,     0,     0,   348,   349,     0,     0,
-       0,   350,   351,     0,   352,     0,     0,     0,   353,     0,
-     354,   355,   356,   357,     0,   358,     0,   359,     0,     0,
-       0,   360,   361,     0,   362,     0,     0,   363,   364,     0,
-       0,     0,   365,   366,   367,   368,     0,     0,   369,   370,
-     371,     0,     0,   372,     0,     0,     0,     0,   373,   374,
-     375,     0,     0,     0,   376,     0,     0,     0,   377,   378,
-       0,   379,   380,     0,     0,     0,   381,     0,   382,     0,
-       0,   383,   384,     0,     0,   385,     0,     0,   386,   387,
-    1133,     0,     0,     0,     0,   388,   389,     0,   390,     0,
-     391,     0,   392,   393,     0,     0,     0,     0,     0,     0,
-       0,   394,     0,   395,   396,   397,   398,   399,   400,   401,
-     402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
-       0,   412,   413,   414,     0,   415,   416,   417,   418,     0,
-     419,   420,     0,     0,     0,     0,   421,   422,   423,   424,
-     425,   426,     0,     0,   427,   428,     0,   429,     0,   430,
-       0,   431,   432,   433,   434,   435,   436,   437,   438,   439,
-       0,     0,   440,   441,     0,     0,   442,   443,   444,   445,
-     446,     0,     0,     0,   447,   448,     0,     0,     0,   449,
-       0,   450,   451,     0,   452,   453,   454,     0,     0,   455,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   456,
-     457,   458,     0,   459,     0,   460,     0,   461,   462,   463,
-     464,   465,   466,   467,   468,   469,   470,     0,   471,     0,
-     472,   473,   474,     0,   475,     0,   476,   477,   478,   479,
-     480,     0,   481,   482,   483,     0,     0,   484,     0,     0,
-       0,   485,   486,     0,   487,   488,     0,     0,   489,   490,
-     491,   492,   493,     0,   494,   495,     0,   496,   497,   498,
-       0,     0,   499,   500,   501,   502,   503,   504,   505,   506,
-       0,   507,     0,   508,   509,     0,   510,   511,   512,     0,
-     513,     0,     0,   514,   515,   516,   517,     0,   518,     0,
-     519,   520,   521,   522,   523,     0,   524,   525,     0,     0,
-       0,   526,   527,   528,   529,     0,     0,     0,   530,     0,
-       0,     0,   531,     0,   532,   533,   534,   535,     0,   536,
-     537,   538,   539,   540,     0,     0,     0,     0,     0,   541,
-     542,   543,     0,   544,     0,     0,   545,     0,     0,   546,
-       0,   547,     0,   548,   549,   550,   551,   552,   553,     0,
-       0,   554,   555,     0,     0,   556,   557,   558,   559,   560,
-     561,     0,     0,   562,   563,   564,   565,     0,   566,   567,
-       0,     0,   568,   569,   570,   571,     0,   240,   572,   573,
-       0,   574,   575,   576,   577,     0,     0,     0,     0,     0,
-     578,   579,     0,     0,     0,   580,   581,   582,     0,     0,
-     583,   584,     0,   585,   586,     0,   587,   588,     0,     0,
-     589,     0,     0,   590,     0,   591,     0,   592,   593,     0,
-       0,     0,     0,     0,   594,     0,   595,     0,     0,   596,
-       0,     0,     0,   597,     0,   598,   599,   600,   601,     0,
-       0,     0,     0,     0,     0,   602,   603,   604,     0,   605,
-     606,   607,   608,     0,     0,   609,     0,     0,   610,   611,
-     612,   613,   614,     0,   615,     0,     0,     0,     0,     0,
-       0,     0,     0,   616,   617,   618,     0,   619,   620,   621,
-       0,   622,     0,     0,   623,     0,   624,     0,     0,     0,
-       0,     0,     0,   625,   626,     0,     0,   627,     0,   628,
-       0,   629,   630,     0,     0,     0,   631,   632,   633,   634,
-     635,   636,   637,   638,     0,   639,   640,   641,   642,   643,
-     644,   645,   646,   647,   648,     0,   649,   650,   651,   652,
-     653,   654,   655,   656,   657,   658,   659,   660,   661,   662,
-     663,   664,   665,   666,   667,   668,   669,   670,   671,   672,
-       0,   673,   674,   675,   676,   677,   678,   679,     0,   680,
-     681,   682,   683,   684,   685,   686,   687,   688,   689,   690,
-     691,   692,   693,   694,   695,   696,   697,   698,   699,   700,
-     701,   702,   703,   704,   705,   706,   707,   708,   709,   710,
-     711,   243,   244,     0,   245,   246,   247,   248,   249,     0,
-       0,   250,     0,     0,     0,     0,   251,     0,  1351,   252,
-       0,   253,   254,   255,   256,   257,   258,     0,   259,     0,
-       0,     0,   260,     0,     0,     0,   261,     0,     0,   262,
-     263,   264,     0,   265,     0,   266,   267,     0,     0,   268,
-       0,     0,   269,   270,     0,   271,   272,   273,     0,   274,
-       0,   275,   276,   277,   278,   279,   280,     0,   281,   282,
-       0,   283,   284,   285,   286,   287,   288,   289,   290,   291,
-     292,   293,     0,   294,   295,     0,   296,   297,   298,   299,
-     300,     0,     0,     0,   301,     0,     0,     0,     0,   302,
-       0,     0,   303,     0,     0,     0,   304,   305,   306,     0,
-       0,   307,     0,     0,     0,     0,   308,   309,     0,     0,
-       0,     0,   310,   311,     0,   312,     0,     0,     0,     0,
-       0,   313,   314,   315,   316,   317,     0,     0,     0,   318,
-       0,     0,   319,   320,   321,     0,     0,     0,   322,     0,
-     323,   324,     0,   325,   326,   327,     0,     0,   328,   329,
-       0,   330,   331,   332,   333,   334,   335,     0,     0,   336,
-     337,   338,   339,   340,     0,     0,   341,   342,     0,   343,
-     344,   345,   346,   347,     0,     0,   348,   349,     0,     0,
-       0,   350,   351,     0,   352,     0,     0,     0,   353,     0,
-     354,   355,   356,   357,     0,   358,     0,   359,     0,     0,
-       0,   360,   361,     0,   362,     0,     0,   363,   364,     0,
-       0,     0,   365,   366,   367,   368,     0,     0,   369,   370,
-     371,     0,     0,   372,     0,     0,     0,     0,   373,   374,
-     375,     0,     0,     0,   376,     0,     0,     0,   377,   378,
-       0,   379,   380,     0,     0,     0,   381,     0,   382,     0,
-       0,   383,   384,     0,     0,   385,     0,     0,   386,   387,
-    1133,     0,     0,     0,     0,   388,   389,     0,   390,     0,
-     391,     0,   392,   393,     0,     0,     0,     0,     0,     0,
-       0,   394,     0,   395,   396,   397,   398,   399,   400,   401,
-     402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
-       0,   412,   413,   414,     0,   415,   416,   417,   418,     0,
-     419,   420,     0,     0,     0,     0,   421,   422,   423,   424,
-     425,   426,     0,     0,   427,   428,     0,   429,     0,   430,
-       0,   431,   432,   433,   434,   435,   436,   437,   438,   439,
-       0,     0,   440,   441,     0,     0,   442,   443,   444,   445,
-     446,     0,     0,     0,   447,   448,     0,     0,     0,   449,
-       0,   450,   451,     0,   452,   453,   454,     0,     0,   455,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   456,
-     457,   458,     0,   459,     0,   460,     0,   461,   462,   463,
-     464,   465,   466,   467,   468,   469,   470,     0,   471,     0,
-     472,   473,   474,     0,   475,     0,   476,   477,   478,   479,
-     480,     0,   481,   482,   483,     0,     0,   484,     0,     0,
-       0,   485,   486,     0,   487,   488,     0,     0,   489,   490,
-     491,   492,   493,     0,   494,   495,     0,   496,   497,   498,
-       0,     0,   499,   500,   501,   502,   503,   504,   505,   506,
-       0,   507,     0,   508,   509,     0,   510,   511,   512,     0,
-     513,     0,     0,   514,   515,   516,   517,     0,   518,     0,
-     519,   520,   521,   522,   523,     0,   524,   525,     0,     0,
-       0,   526,   527,   528,   529,     0,     0,     0,   530,     0,
-       0,     0,   531,     0,   532,   533,   534,   535,     0,   536,
-     537,   538,   539,   540,     0,     0,     0,     0,     0,   541,
-     542,   543,     0,   544,     0,     0,   545,     0,     0,   546,
-       0,   547,     0,   548,   549,   550,   551,   552,   553,     0,
-       0,   554,   555,     0,     0,   556,   557,   558,   559,   560,
-     561,     0,     0,   562,   563,   564,   565,     0,   566,   567,
-       0,     0,   568,   569,   570,   571,     0,   240,   572,   573,
-       0,   574,   575,   576,   577,     0,     0,     0,     0,     0,
-     578,   579,     0,     0,     0,   580,   581,   582,     0,     0,
-     583,   584,     0,   585,   586,     0,   587,   588,     0,     0,
-     589,     0,     0,   590,     0,   591,     0,   592,   593,     0,
-       0,     0,     0,     0,   594,     0,   595,     0,     0,   596,
-       0,     0,     0,   597,     0,   598,   599,   600,   601,     0,
-       0,     0,     0,     0,     0,   602,   603,   604,     0,   605,
-     606,   607,   608,     0,     0,   609,     0,     0,   610,   611,
-     612,   613,   614,     0,   615,     0,     0,     0,     0,     0,
-       0,     0,     0,   616,   617,   618,     0,   619,   620,   621,
-       0,   622,     0,     0,   623,     0,   624,     0,     0,     0,
-       0,     0,     0,   625,   626,     0,     0,   627,     0,   628,
-       0,   629,   630,     0,     0,     0,   631,   632,   633,   634,
-     635,   636,   637,   638,     0,   639,   640,   641,   642,   643,
-     644,   645,   646,   647,   648,     0,   649,   650,   651,   652,
-     653,   654,   655,   656,   657,   658,   659,   660,   661,   662,
-     663,   664,   665,   666,   667,   668,   669,   670,   671,   672,
-       0,   673,   674,   675,   676,   677,   678,   679,     0,   680,
-     681,   682,   683,   684,   685,   686,   687,   688,   689,   690,
-     691,   692,   693,   694,   695,   696,   697,   698,   699,   700,
-     701,   702,   703,   704,   705,   706,   707,   708,   709,   710,
-     711,   243,   244,     0,   245,   246,   247,   248,   249,     0,
-       0,   250,     0,     0,     0,     0,   251,     0,  1528,   252,
-       0,   253,   254,   255,   256,   257,   258,     0,   259,     0,
-       0,     0,   260,     0,     0,     0,   261,     0,     0,   262,
-     263,   264,     0,   265,     0,   266,   267,     0,     0,   268,
-       0,     0,   269,   270,     0,   271,   272,  1017,  1018,   274,
-       0,   275,   276,   277,   278,   279,   280,     0,   281,   282,
-       0,   283,   284,   285,   286,   287,   288,   289,   290,   291,
-     292,   293,     0,   294,   295,     0,   296,   297,   298,   299,
-     300,     0,     0,     0,   301,     0,     0,     0,     0,   302,
-       0,     0,   303,     0,     0,     0,   304,   305,   306,     0,
-       0,   307,     0,     0,     0,     0,   308,   309,     0,     0,
-       0,  1536,   310,   311,     0,   312,     0,     0,     0,     0,
-       0,   313,   314,   315,   316,   317,     0,     0,     0,   318,
-       0,     0,   319,   320,   321,     0,     0,     0,   322,     0,
-     323,   324,     0,   325,   326,   327,     0,     0,   328,   329,
-       0,   330,   331,   332,   333,   334,   335,     0,     0,   336,
-     337,   338,   339,   340,     0,     0,   341,   342,     0,   343,
-     344,   345,   346,   347,     0,     0,   348,   349,     0,     0,
-       0,   350,   351,     0,   352,     0,     0,     0,   353,     0,
-     354,   355,   356,   357,     0,  1020,     0,   359,     0,     0,
-       0,   360,   361,     0,   362,     0,     0,   363,   364,     0,
-       0,     0,   365,   366,   367,   368,     0,     0,   369,   370,
-     371,     0,     0,   372,     0,     0,     0,     0,   373,   374,
-     375,     0,     0,     0,   376,     0,     0,     0,   377,   378,
-       0,   379,   380,     0,     0,     0,   381,     0,   382,     0,
-       0,   383,   384,     0,     0,   385,     0,     0,   386,   387,
-       0,     0,     0,     0,     0,   388,   389,     0,  1021,     0,
-     391,     0,   392,   393,     0,     0,     0,     0,     0,     0,
-       0,   394,     0,   395,   396,   397,   398,   399,   400,   401,
-     402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
-       0,   412,   413,   414,     0,   415,   416,   417,   418,     0,
-     419,   420,     0,     0,     0,     0,   421,   422,   423,   424,
-     425,   426,     0,     0,   427,   428,     0,   429,     0,   430,
-       0,   431,   432,   433,   434,   435,   436,  1022,   438,   439,
-       0,     0,   440,   441,     0,     0,   442,   443,   444,   445,
-     446,     0,     0,     0,   447,   448,     0,     0,     0,   449,
-       0,   450,   451,     0,   452,   453,   454,     0,     0,   455,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   456,
-     457,   458,     0,   459,     0,   460,     0,   461,   462,   463,
-     464,   465,   466,   467,   468,   469,   470,     0,   471,     0,
-     472,   473,   474,     0,   475,     0,   476,   477,   478,   479,
-     480,     0,   481,   482,   483,     0,     0,   484,     0,     0,
-       0,   485,   486,     0,   487,   488,     0,     0,   489,   490,
-     491,   492,   493,     0,   494,   495,     0,   496,   497,   498,
-       0,     0,   499,   500,   501,   502,   503,   504,   505,   506,
-       0,   507,     0,   508,   509,     0,   510,   511,   512,     0,
-     513,     0,     0,   514,   515,   516,   517,     0,   518,     0,
-     519,   520,   521,   522,   523,     0,   524,   525,     0,     0,
-       0,   526,   527,  1024,   529,     0,     0,     0,   530,     0,
-       0,     0,   531,     0,   532,   533,   534,   535,     0,   536,
-     537,   538,   539,   540,     0,     0,     0,     0,     0,   541,
-     542,   543,     0,   544,     0,     0,   545,     0,     0,   546,
-       0,   547,     0,   548,   549,   550,   551,   552,   553,     0,
-       0,   554,   555,     0,     0,   556,   557,   558,   559,   560,
-     561,     0,     0,   562,   563,   564,   565,     0,   566,   567,
-       0,     0,   568,   569,   570,   571,     0,     0,   572,   573,
-       0,   574,   575,   576,   577,     0,     0,     0,     0,     0,
-     578,   579,     0,     0,     0,   580,   581,   582,     0,     0,
-     583,   584,     0,   585,   586,     0,   587,   588,     0,     0,
-     589,     0,     0,   590,     0,   591,     0,   592,   593,     0,
-       0,     0,     0,     0,   594,     0,   595,     0,     0,   596,
-       0,     0,     0,   597,     0,   598,   599,   600,   601,     0,
-       0,     0,     0,     0,     0,   602,   603,   604,     0,   605,
-     606,   607,   608,     0,     0,   609,     0,     0,  1026,   611,
-     612,   613,   614,     0,   615,     0,     0,     0,     0,     0,
-       0,     0,     0,   616,   617,   618,     0,  1028,   620,   621,
-       0,   622,     0,     0,   623,     0,   624,     0,     0,     0,
-       0,     0,     0,   625,   626,     0,     0,   627,     0,   628,
-       0,   629,   630,     0,     0,     0,   631,   632,   633,   634,
-     635,   636,   637,   638,     0,   639,   640,   641,   642,   643,
-     644,   645,   646,   647,   648,     0,   649,   650,   651,   652,
-     653,   654,   655,   656,   657,   658,   659,   660,   661,   662,
-     663,   664,   665,   666,   667,   668,   669,   670,   671,   672,
-       0,   673,   674,   675,   676,   677,   678,   679,     0,   680,
-     681,   682,   683,   684,   685,   686,   687,   688,   689,   690,
-     691,   692,   693,   694,   695,   696,   697,   698,   699,   700,
-     701,   702,   703,   704,   705,   706,   707,   708,   709,   710,
-     711,   243,   244,     0,   245,   246,   247,   248,   249,     0,
-       0,   250,     0,     0,     0,     0,   251,     0,  1030,   252,
-       0,   253,   254,   255,   256,   257,   258,     0,   259,     0,
-       0,     0,   260,     0,     0,     0,   261,     0,     0,   262,
-     263,   264,     0,   265,     0,   266,   267,     0,     0,   268,
-       0,     0,   269,   270,     0,   271,   272,   273,     0,   274,
-       0,   275,   276,   277,   278,   279,   280,     0,   281,   282,
-       0,   283,   284,   285,   286,   287,   288,   289,   290,   291,
-     292,   293,     0,   294,   295,     0,   296,   297,   298,   299,
-     300,     0,     0,     0,   301,     0,     0,     0,     0,   302,
-       0,     0,   303,     0,     0,     0,   304,   305,   306,     0,
-       0,   307,     0,     0,     0,     0,   308,   309,     0,     0,
-       0,     0,   310,   311,     0,   312,     0,     0,     0,     0,
-       0,   313,   314,   315,   316,   317,     0,     0,     0,   318,
-       0,     0,   319,   320,   321,     0,     0,     0,   322,     0,
-     323,   324,     0,   325,   326,   327,     0,     0,   328,   329,
-       0,   330,   331,   332,   333,   334,   335,     0,     0,   336,
-     337,   338,   339,   340,     0,     0,   341,   342,     0,   343,
-     344,   345,   346,   347,     0,     0,   348,   349,     0,     0,
-       0,   350,   351,     0,   352,     0,     0,     0,   353,     0,
-     354,   355,   356,   357,     0,   358,     0,   359,     0,     0,
-       0,   360,   361,     0,   362,     0,     0,   363,   364,     0,
-       0,     0,   365,   366,   367,   368,     0,     0,   369,   370,
-     371,     0,     0,   372,     0,     0,     0,     0,   373,   374,
-     375,     0,     0,     0,   376,     0,     0,     0,   377,   378,
-       0,   379,   380,     0,     0,     0,   381,     0,   382,     0,
-       0,   383,   384,     0,     0,   385,     0,     0,   386,   387,
-    1133,     0,     0,     0,     0,   388,   389,     0,   390,     0,
-     391,     0,   392,   393,     0,     0,     0,     0,     0,     0,
-       0,   394,     0,   395,   396,   397,   398,   399,   400,   401,
-     402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
-       0,   412,   413,   414,     0,   415,   416,   417,   418,     0,
-     419,   420,     0,     0,     0,     0,   421,   422,   423,   424,
-     425,   426,     0,     0,   427,   428,     0,   429,     0,   430,
-       0,   431,   432,   433,   434,   435,   436,   437,   438,   439,
-       0,     0,   440,   441,     0,     0,   442,   443,   444,   445,
-     446,     0,     0,     0,   447,   448,     0,     0,     0,   449,
-       0,   450,   451,     0,   452,   453,   454,     0,     0,   455,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   456,
-     457,   458,     0,   459,     0,   460,     0,   461,   462,   463,
-     464,   465,   466,   467,   468,   469,   470,     0,   471,     0,
-     472,   473,   474,     0,   475,     0,   476,   477,   478,   479,
-     480,     0,   481,   482,   483,     0,     0,   484,     0,     0,
-       0,   485,   486,     0,   487,   488,     0,     0,   489,   490,
-     491,   492,   493,     0,   494,   495,     0,   496,   497,   498,
-       0,     0,   499,   500,   501,   502,   503,   504,   505,   506,
-       0,   507,     0,   508,   509,     0,   510,   511,   512,     0,
-     513,     0,     0,   514,   515,   516,   517,     0,   518,     0,
-     519,   520,   521,   522,   523,     0,   524,   525,     0,     0,
-       0,   526,   527,   528,   529,     0,     0,     0,   530,     0,
-       0,     0,   531,     0,   532,   533,   534,   535,     0,   536,
-     537,   538,   539,   540,     0,     0,     0,     0,     0,   541,
-     542,   543,     0,   544,     0,     0,   545,     0,     0,   546,
-       0,   547,     0,   548,   549,   550,   551,   552,   553,     0,
-       0,   554,   555,     0,     0,   556,   557,   558,   559,   560,
-     561,     0,     0,   562,   563,   564,   565,     0,   566,   567,
-       0,     0,   568,   569,   570,   571,     0,   240,   572,   573,
-       0,   574,   575,   576,   577,     0,     0,     0,     0,     0,
-     578,   579,     0,     0,     0,   580,   581,   582,     0,     0,
-     583,   584,     0,   585,   586,     0,   587,   588,     0,     0,
-     589,     0,     0,   590,     0,   591,     0,   592,   593,     0,
-       0,     0,     0,     0,   594,     0,   595,     0,     0,   596,
-       0,     0,     0,   597,     0,   598,   599,   600,   601,     0,
-       0,     0,     0,     0,     0,   602,   603,   604,     0,   605,
-     606,   607,   608,     0,     0,   609,     0,     0,   610,   611,
-     612,   613,   614,     0,   615,     0,     0,     0,     0,     0,
-       0,     0,     0,   616,   617,   618,     0,   619,   620,   621,
-       0,   622,     0,     0,   623,     0,   624,     0,     0,     0,
-       0,     0,     0,   625,   626,     0,     0,   627,     0,   628,
-       0,   629,   630,     0,     0,     0,   631,   632,   633,   634,
-     635,   636,   637,   638,     0,   639,   640,   641,   642,   643,
-     644,   645,   646,   647,   648,     0,   649,   650,   651,   652,
-     653,   654,   655,   656,   657,   658,   659,   660,   661,   662,
-     663,   664,   665,   666,   667,   668,   669,   670,   671,   672,
-       0,   673,   674,   675,   676,   677,   678,   679,     0,   680,
-     681,   682,   683,   684,   685,   686,   687,   688,   689,   690,
-     691,   692,   693,   694,   695,   696,   697,   698,   699,   700,
-     701,   702,   703,   704,   705,   706,   707,   708,   709,   710,
-     711,   243,   244,     0,   245,   246,   247,   248,   249,     0,
-       0,   250,     0,     0,     0,     0,   251,     0,  1676,   252,
-       0,   253,   254,   255,   256,   257,   258,     0,   259,     0,
-       0,     0,   260,     0,     0,     0,   261,     0,     0,   262,
-     263,   264,     0,   265,     0,   266,   267,     0,     0,   268,
-       0,     0,   269,   270,     0,   271,   272,   273,     0,   274,
-       0,   275,   276,   277,   278,   279,   280,     0,   281,   282,
-       0,   283,   284,   285,   286,   287,   288,   289,   290,   291,
-     292,   293,  2148,   294,   295,     0,   296,   297,   298,   299,
-     300,     0,     0,     0,   301,     0,     0,     0,     0,   302,
-       0,     0,   303,     0,     0,     0,   304,   305,   306,     0,
-       0,   307,     0,     0,     0,     0,   308,   309,     0,     0,
-       0,     0,   310,   311,     0,   312,     0,     0,     0,     0,
-       0,   313,   314,   315,   316,   317,     0,     0,     0,   318,
-       0,     0,   319,   320,   321,     0,     0,     0,   322,     0,
-     323,   324,     0,   325,   326,   327,     0,     0,   328,   329,
-       0,   330,   331,   332,   333,   334,   335,     0,     0,   336,
-     337,   338,   339,   340,     0,     0,   341,   342,     0,   343,
-     344,   345,   346,   347,     0,     0,   348,   349,     0,     0,
-       0,   350,   351,     0,   352,     0,     0,     0,   353,     0,
-     354,   355,   356,   357,     0,   358,     0,   359,     0,     0,
-       0,   360,   361,     0,   362,     0,     0,   363,   364,     0,
-       0,     0,   365,   366,   367,   368,     0,     0,   369,   370,
-     371,     0,     0,   372,     0,     0,     0,     0,   373,   374,
-     375,     0,     0,     0,   376,     0,     0,     0,   377,   378,
-       0,   379,   380,     0,     0,     0,   381,     0,   382,     0,
-       0,   383,   384,     0,     0,   385,     0,     0,   386,   387,
-       0,     0,     0,     0,     0,   388,   389,     0,   390,     0,
-     391,     0,   392,   393,     0,     0,     0,     0,     0,     0,
-       0,   394,     0,   395,   396,   397,   398,   399,   400,   401,
-     402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
-       0,   412,   413,   414,     0,   415,   416,   417,   418,     0,
-     419,   420,     0,     0,     0,     0,   421,   422,   423,   424,
-     425,   426,     0,     0,   427,   428,     0,   429,     0,   430,
-       0,   431,   432,   433,   434,   435,   436,   437,   438,   439,
-       0,     0,   440,   441,     0,     0,   442,   443,   444,   445,
-     446,     0,     0,     0,   447,   448,     0,     0,     0,   449,
-       0,   450,   451,     0,   452,   453,   454,     0,     0,   455,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   456,
-     457,   458,     0,   459,     0,   460,     0,   461,   462,   463,
-     464,   465,   466,   467,   468,   469,   470,     0,   471,     0,
-     472,   473,   474,     0,   475,     0,   476,   477,   478,   479,
-     480,     0,   481,   482,   483,     0,     0,   484,     0,     0,
-       0,   485,   486,     0,   487,   488,     0,     0,   489,   490,
-     491,   492,   493,     0,   494,   495,     0,   496,   497,   498,
-       0,     0,   499,   500,   501,   502,   503,   504,   505,   506,
-       0,   507,     0,   508,   509,     0,   510,   511,   512,     0,
-     513,     0,     0,   514,   515,   516,   517,     0,   518,     0,
-     519,   520,   521,   522,   523,     0,   524,   525,     0,     0,
-       0,   526,   527,   528,   529,     0,     0,     0,   530,     0,
-       0,     0,   531,     0,   532,   533,   534,   535,     0,   536,
-     537,   538,   539,   540,     0,     0,     0,     0,     0,   541,
-     542,   543,     0,   544,     0,     0,   545,     0,     0,   546,
-       0,   547,     0,   548,   549,   550,   551,   552,   553,     0,
-       0,   554,   555,     0,     0,   556,   557,   558,   559,   560,
-     561,     0,     0,   562,   563,   564,   565,     0,   566,   567,
-       0,     0,   568,   569,   570,   571,     0,     0,   572,   573,
-       0,   574,   575,   576,   577,     0,     0,     0,     0,     0,
-     578,   579,     0,     0,     0,   580,   581,   582,     0,     0,
-     583,   584,     0,   585,   586,     0,   587,   588,     0,     0,
-     589,     0,     0,   590,     0,   591,     0,   592,   593,     0,
-       0,     0,     0,     0,   594,     0,   595,     0,     0,   596,
-       0,     0,     0,   597,     0,   598,   599,   600,   601,     0,
-       0,     0,     0,     0,     0,   602,   603,   604,     0,   605,
-     606,   607,   608,     0,     0,   609,     0,     0,   610,   611,
-     612,   613,   614,     0,   615,     0,     0,     0,     0,     0,
-       0,     0,     0,   616,   617,   618,     0,   619,   620,   621,
-       0,   622,     0,     0,   623,     0,   624,     0,     0,     0,
-       0,     0,     0,   625,   626,     0,     0,   627,     0,   628,
-       0,   629,   630,     0,     0,     0,   631,   632,   633,   634,
-     635,   636,   637,   638,     0,   639,   640,   641,   642,   643,
-     644,   645,   646,   647,   648,     0,   649,   650,   651,   652,
-     653,   654,   655,   656,   657,   658,   659,   660,   661,   662,
-     663,   664,   665,   666,   667,   668,   669,   670,   671,   672,
-       0,   673,   674,   675,   676,   677,   678,   679,     0,   680,
-     681,   682,   683,   684,   685,   686,   687,   688,   689,   690,
-     691,   692,   693,   694,   695,   696,   697,   698,   699,   700,
-     701,   702,   703,   704,   705,   706,   707,   708,   709,   710,
-     711,   243,   244,     0,   245,   246,   247,   248,   249,     0,
-       0,   250,     0,     0,     0,     0,   251,     0,  2149,   252,
-       0,   253,   254,   255,   256,   257,   258,     0,   259,     0,
-       0,     0,   260,     0,     0,     0,   261,     0,     0,   262,
-     263,   264,     0,   265,     0,   266,   267,     0,     0,   268,
-       0,     0,   269,   270,     0,   271,   272,   273,     0,   274,
-       0,   275,   276,   277,   278,   279,   280,     0,   281,   282,
-       0,   283,   284,   285,   286,   287,   288,   289,   290,   291,
-     292,   293,     0,   294,   295,     0,   296,   297,   298,   299,
-     300,     0,     0,     0,   301,     0,     0,     0,     0,   302,
-       0,     0,   303,     0,     0,     0,   304,   305,   306,     0,
-       0,   307,     0,     0,     0,     0,   308,   309,     0,     0,
-       0,     0,   310,   311,     0,   312,     0,     0,     0,     0,
-       0,   313,   314,   315,   316,   317,     0,     0,     0,   318,
-       0,     0,   319,   320,   321,     0,     0,     0,   322,     0,
-     323,   324,     0,   325,   326,   327,     0,     0,   328,   329,
-       0,   330,   331,   332,   333,   334,   335,     0,     0,   336,
-     337,   338,   339,   340,     0,     0,   341,   342,     0,   343,
-     344,   345,   346,   347,     0,     0,   348,   349,     0,     0,
-       0,   350,   351,     0,   352,     0,     0,     0,   353,     0,
-     354,   355,   356,   357,     0,   358,     0,   359,     0,     0,
-       0,   360,   361,     0,   362,     0,     0,   363,   364,     0,
-       0,     0,   365,   366,   367,   368,     0,     0,   369,   370,
-     371,     0,     0,   372,     0,     0,     0,     0,   373,   374,
-     375,     0,     0,     0,   376,     0,     0,     0,   377,   378,
-       0,   379,   380,     0,     0,     0,   381,     0,   382,     0,
-       0,   383,   384,     0,     0,   385,     0,     0,   386,   387,
-       0,     0,     0,     0,     0,   388,   389,     0,   390,     0,
-     391,     0,   392,   393,     0,     0,     0,     0,     0,     0,
-       0,   394,     0,   395,   396,   397,   398,   399,   400,   401,
-     402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
-       0,   412,   413,   414,     0,   415,   416,   417,   418,     0,
-     419,   420,     0,     0,     0,     0,   421,   422,   423,   424,
-     425,   426,     0,     0,   427,   428,     0,   429,     0,   430,
-       0,   431,   432,   433,   434,   435,   436,   437,   438,   439,
-       0,     0,   440,   441,     0,     0,   442,   443,   444,   445,
-     446,     0,     0,     0,   447,   448,     0,     0,     0,   449,
-       0,   450,   451,     0,   452,   453,   454,     0,     0,   455,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   456,
-     457,   458,     0,   459,     0,   460,     0,   461,   462,   463,
-     464,   465,   466,   467,   468,   469,   470,     0,   471,     0,
-     472,   473,   474,     0,   475,     0,   476,   477,   478,   479,
-     480,     0,   481,   482,   483,     0,     0,   484,     0,     0,
-       0,   485,   486,     0,   487,   488,     0,     0,   489,   490,
-     491,   492,   493,     0,   494,   495,     0,   496,   497,   498,
-       0,     0,   499,   500,   501,   502,   503,   504,   505,   506,
-       0,   507,     0,   508,   509,     0,   510,   511,   512,     0,
-     513,     0,     0,   514,   515,   516,   517,     0,   518,     0,
-     519,   520,   521,   522,   523,     0,   524,   525,     0,     0,
-       0,   526,   527,   528,   529,     0,     0,     0,   530,     0,
-       0,     0,   531,     0,   532,   533,   534,   535,     0,   536,
-     537,   538,   539,   540,     0,     0,     0,     0,     0,   541,
-     542,   543,     0,   544,     0,     0,   545,     0,     0,   546,
-       0,   547,     0,   548,   549,   550,   551,   552,   553,     0,
-       0,   554,   555,     0,     0,   556,   557,   558,   559,   560,
-     561,     0,     0,   562,   563,   564,   565,     0,   566,   567,
-       0,     0,   568,   569,   570,   571,     0,     0,   572,   573,
-       0,   574,   575,   576,   577,     0,     0,     0,     0,     0,
-     578,   579,     0,     0,     0,   580,   581,   582,     0,     0,
-     583,   584,     0,   585,   586,     0,   587,   588,     0,     0,
-     589,     0,     0,   590,     0,   591,     0,   592,   593,     0,
-       0,     0,     0,     0,   594,     0,   595,     0,     0,   596,
-       0,     0,     0,   597,     0,   598,   599,   600,   601,     0,
-       0,     0,     0,     0,     0,   602,   603,   604,     0,   605,
-     606,   607,   608,     0,     0,   609,     0,     0,   610,   611,
-     612,   613,   614,     0,   615,     0,     0,     0,     0,     0,
-       0,     0,     0,   616,   617,   618,     0,   619,   620,   621,
-       0,   622,     0,     0,   623,     0,   624,     0,     0,     0,
-       0,     0,     0,   625,   626,     0,     0,   627,     0,   628,
-       0,   629,   630,     0,     0,     0,   631,   632,   633,   634,
-     635,   636,   637,   638,     0,   639,   640,   641,   642,   643,
-     644,   645,   646,   647,   648,     0,   649,   650,   651,   652,
-     653,   654,   655,   656,   657,   658,   659,   660,   661,   662,
-     663,   664,   665,   666,   667,   668,   669,   670,   671,   672,
-       0,   673,   674,   675,   676,   677,   678,   679,     0,   680,
-     681,   682,   683,   684,   685,   686,   687,   688,   689,   690,
-     691,   692,   693,   694,   695,   696,   697,   698,   699,   700,
-     701,   702,   703,   704,   705,   706,   707,   708,   709,   710,
-     711,   243,   244,     0,   245,   246,   247,   248,   249,     0,
-       0,   250,     0,     0,     0,  5435,   251,     0,  5436,   252,
-       0,   253,   254,   255,   256,   257,   258,     0,   259,     0,
-       0,     0,   260,     0,     0,     0,   261,     0,     0,   262,
-     263,   264,     0,   265,     0,   266,   267,     0,     0,   268,
-       0,     0,   269,   270,     0,   271,   272,   273,     0,   274,
-       0,   275,   276,   277,   278,   279,   280,     0,   281,   282,
-       0,   283,   284,   285,   286,   287,   288,   289,   290,   291,
-     292,   293,     0,   294,   295,     0,   296,   297,   298,   299,
-     300,     0,     0,     0,   301,     0,     0,     0,     0,   302,
-       0,     0,   303,     0,     0,     0,   304,   305,   306,     0,
-       0,   307,     0,     0,     0,     0,   308,   309,     0,     0,
-       0,     0,   310,   311,     0,   312,     0,     0,     0,     0,
-       0,   313,   314,   315,   316,   317,     0,     0,     0,   318,
-       0,     0,   319,   320,   321,     0,     0,     0,   322,     0,
-     323,   324,     0,   325,   326,   327,     0,     0,   328,   329,
-       0,   330,   331,   332,   333,   334,   335,     0,     0,   336,
-     337,   338,   339,   340,     0,     0,   341,   342,     0,   343,
-     344,   345,   346,   347,     0,     0,   348,   349,     0,     0,
-       0,   350,   351,     0,   352,     0,     0,     0,   353,     0,
-     354,   355,   356,   357,     0,   358,     0,   359,     0,     0,
-       0,   360,   361,     0,   362,     0,     0,   363,   364,     0,
-       0,     0,   365,   366,   367,   368,     0,     0,   369,   370,
-     371,     0,     0,   372,     0,     0,     0,     0,   373,   374,
-     375,     0,     0,     0,   376,     0,     0,     0,   377,   378,
-       0,   379,   380,     0,     0,     0,   381,     0,   382,     0,
-       0,   383,   384,     0,     0,   385,     0,     0,   386,   387,
-       0,     0,     0,     0,     0,   388,   389,     0,   390,     0,
-     391,     0,   392,   393,     0,     0,     0,     0,     0,     0,
-       0,   394,     0,   395,   396,   397,   398,   399,   400,   401,
-     402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
-       0,   412,   413,   414,     0,   415,   416,   417,   418,     0,
-     419,   420,     0,     0,     0,     0,   421,   422,   423,   424,
-     425,   426,     0,     0,   427,   428,     0,   429,     0,   430,
-       0,   431,   432,   433,   434,   435,   436,   437,   438,   439,
-       0,     0,   440,   441,     0,     0,   442,   443,   444,   445,
-     446,     0,     0,     0,   447,   448,     0,     0,     0,   449,
-       0,   450,   451,     0,   452,   453,   454,     0,     0,   455,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   456,
-     457,   458,     0,   459,     0,   460,     0,   461,   462,   463,
-     464,   465,   466,   467,   468,   469,   470,     0,   471,     0,
-     472,   473,   474,     0,   475,     0,   476,   477,   478,   479,
-     480,     0,   481,   482,   483,     0,     0,   484,     0,     0,
-       0,   485,   486,     0,   487,   488,     0,     0,   489,   490,
-     491,   492,   493,     0,   494,   495,     0,   496,   497,   498,
-       0,     0,   499,   500,   501,   502,   503,   504,   505,   506,
-       0,   507,     0,   508,   509,     0,   510,   511,   512,     0,
-     513,     0,     0,   514,   515,   516,   517,     0,   518,     0,
-     519,   520,   521,   522,   523,     0,   524,   525,     0,     0,
-       0,   526,   527,   528,   529,     0,     0,     0,   530,     0,
-       0,     0,   531,     0,   532,   533,   534,   535,     0,   536,
-     537,   538,   539,   540,     0,     0,     0,     0,     0,   541,
-     542,   543,     0,   544,     0,     0,   545,     0,     0,   546,
-       0,   547,     0,   548,   549,   550,   551,   552,   553,     0,
-       0,   554,   555,     0,     0,   556,   557,   558,   559,   560,
-     561,     0,     0,   562,   563,   564,   565,     0,   566,   567,
-       0,     0,   568,   569,   570,   571,     0,     0,   572,   573,
-       0,   574,   575,   576,   577,     0,     0,     0,     0,     0,
-     578,   579,     0,     0,     0,   580,   581,   582,     0,     0,
-     583,   584,     0,   585,   586,     0,   587,   588,     0,     0,
-     589,     0,     0,   590,     0,   591,     0,   592,   593,     0,
-       0,     0,     0,     0,   594,     0,   595,     0,     0,   596,
-       0,     0,     0,   597,     0,   598,   599,   600,   601,     0,
-       0,     0,     0,     0,     0,   602,   603,   604,     0,   605,
-     606,   607,   608,     0,     0,   609,     0,     0,   610,   611,
-     612,   613,   614,     0,   615,     0,     0,     0,     0,     0,
-       0,     0,     0,   616,   617,   618,     0,   619,   620,   621,
-       0,   622,     0,     0,   623,     0,   624,     0,     0,     0,
-       0,     0,     0,   625,   626,     0,     0,   627,     0,   628,
-       0,   629,   630,     0,     0,     0,   631,   632,   633,   634,
-     635,   636,   637,   638,     0,   639,   640,   641,   642,   643,
-     644,   645,   646,   647,   648,     0,   649,   650,   651,   652,
-     653,   654,   655,   656,   657,   658,   659,   660,   661,   662,
-     663,   664,   665,   666,   667,   668,   669,   670,   671,   672,
-       0,   673,   674,   675,   676,   677,   678,   679,     0,   680,
-     681,   682,   683,   684,   685,   686,   687,   688,   689,   690,
-     691,   692,   693,   694,   695,   696,   697,   698,   699,   700,
-     701,   702,   703,   704,   705,   706,   707,   708,   709,   710,
-     711,   243,   244,     0,   245,   246,   247,   248,   249,     0,
-       0,   250,     0,     0,     0,     0,   251,     0,  2149,   252,
-       0,   253,   254,   255,   256,   257,   258,     0,   259,     0,
-       0,     0,   260,     0,     0,     0,   261,     0,     0,   262,
-     263,   264,     0,   265,     0,   266,   267,     0,     0,   268,
-       0,     0,   269,   270,     0,   271,   272,   273,     0,   274,
-       0,   275,   276,   277,   278,   279,   280,     0,   281,   282,
-       0,   283,   284,   285,   286,   287,   288,   289,   290,   291,
-     292,   293,     0,   294,   295,     0,   296,   297,   298,   299,
-     300,     0,     0,     0,   301,     0,     0,     0,     0,   302,
-       0,     0,   303,     0,     0,     0,   304,   305,   306,     0,
-       0,   307,     0,     0,     0,     0,   308,   309,     0,     0,
-       0,     0,   310,   311,     0,   312,     0,     0,     0,     0,
-       0,   313,   314,   315,   316,   317,     0,     0,     0,   318,
-       0,     0,   319,   320,   321,     0,     0,     0,   322,     0,
-     323,   324,     0,   325,   326,   327,     0,     0,   328,   329,
-       0,   330,   331,   332,   333,   334,   335,     0,     0,   336,
-     337,   338,   339,   340,     0,     0,   341,   342,     0,   343,
-     344,   345,   346,   347,     0,     0,   348,   349,     0,     0,
-       0,   350,   351,     0,   352,     0,     0,     0,   353,     0,
-     354,   355,   356,   357,     0,   358,     0,   359,     0,     0,
-       0,   360,   361,     0,   362,     0,     0,   363,   364,     0,
-       0,     0,   365,   366,   367,   368,     0,     0,   369,   370,
-     371,     0,     0,   372,     0,     0,     0,     0,   373,   374,
-     375,     0,     0,     0,   376,     0,     0,     0,   377,   378,
-       0,   379,   380,     0,     0,     0,   381,     0,   382,     0,
-       0,   383,   384,     0,     0,   385,     0,     0,   386,   387,
-       0,     0,     0,     0,     0,   388,   389,     0,   390,     0,
-     391,     0,   392,   393,     0,     0,     0,     0,     0,     0,
-       0,   394,     0,   395,   396,   397,   398,   399,   400,   401,
-     402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
-       0,   412,   413,   414,     0,   415,   416,   417,   418,     0,
-     419,   420,     0,     0,     0,     0,   421,   422,   423,   424,
-     425,   426,     0,     0,   427,   428,     0,   429,     0,   430,
-       0,   431,   432,   433,   434,   435,   436,   437,   438,   439,
-       0,     0,   440,   441,     0,     0,   442,   443,   444,   445,
-     446,     0,     0,     0,   447,   448,     0,     0,     0,   449,
-       0,   450,   451,     0,   452,   453,   454,     0,     0,   455,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   456,
-     457,   458,     0,   459,     0,   460,     0,   461,   462,   463,
-     464,   465,   466,   467,   468,   469,   470,     0,   471,     0,
-     472,   473,   474,     0,   475,     0,   476,   477,   478,   479,
-     480,     0,   481,   482,   483,     0,     0,   484,     0,     0,
-       0,   485,   486,     0,   487,   488,     0,     0,   489,   490,
-     491,   492,   493,     0,   494,   495,     0,   496,   497,   498,
-       0,     0,   499,   500,   501,   502,   503,   504,   505,   506,
-       0,   507,     0,   508,   509,     0,   510,   511,   512,     0,
-     513,     0,     0,   514,   515,   516,   517,     0,   518,     0,
-     519,   520,   521,   522,   523,     0,   524,   525,     0,     0,
-       0,   526,   527,   528,   529,     0,     0,     0,   530,     0,
-       0,     0,   531,     0,   532,   533,   534,   535,     0,   536,
-     537,   538,   539,   540,     0,     0,     0,     0,     0,   541,
-     542,   543,     0,   544,     0,     0,   545,     0,     0,   546,
-       0,   547,     0,   548,   549,   550,   551,   552,   553,     0,
-       0,   554,   555,     0,     0,   556,   557,   558,   559,   560,
-     561,     0,     0,   562,   563,   564,   565,     0,   566,   567,
-       0,     0,   568,   569,   570,   571,     0,     0,   572,   573,
-       0,   574,   575,   576,   577,     0,     0,     0,     0,     0,
-     578,   579,     0,     0,     0,   580,   581,   582,     0,     0,
-     583,   584,     0,   585,   586,     0,   587,   588,     0,     0,
-     589,     0,     0,   590,     0,   591,     0,   592,   593,     0,
-       0,     0,     0,     0,   594,     0,   595,     0,     0,   596,
-       0,     0,     0,   597,     0,   598,   599,   600,   601,     0,
-       0,     0,     0,     0,     0,   602,   603,   604,     0,   605,
-     606,   607,   608,     0,     0,   609,     0,     0,   610,   611,
-     612,   613,   614,     0,   615,     0,     0,     0,     0,     0,
-       0,     0,     0,   616,   617,   618,     0,   619,   620,   621,
-       0,   622,     0,     0,   623,     0,   624,     0,     0,     0,
-       0,     0,     0,   625,   626,     0,     0,   627,     0,   628,
-       0,   629,   630,     0,     0,     0,   631,   632,   633,   634,
-     635,   636,   637,   638,     0,   639,   640,   641,   642,   643,
-     644,   645,   646,   647,   648,     0,   649,   650,   651,   652,
-     653,   654,   655,   656,   657,   658,   659,   660,   661,   662,
-     663,   664,   665,   666,   667,   668,   669,   670,   671,   672,
-       0,   673,   674,   675,   676,   677,   678,   679,     0,   680,
-     681,   682,   683,   684,   685,   686,   687,   688,   689,   690,
-     691,   692,   693,   694,   695,   696,   697,   698,   699,   700,
-     701,   702,   703,   704,   705,   706,   707,   708,   709,   710,
-     711,   243,   244,     0,   245,   246,   247,   248,   249,     0,
-       0,   250,     0,     0,     0,     0,   251,     0,  5436,   252,
-       0,   253,   254,   255,   256,   257,   258,     0,   259,     0,
-       0,     0,   260,     0,     0,     0,   261,     0,     0,   262,
-     263,   264,     0,   265,     0,   266,   267,     0,     0,   268,
-       0,     0,   269,   270,     0,   271,   272,   273,     0,   274,
-       0,   275,   276,   277,   278,   279,   280,     0,   281,   282,
-       0,   283,   284,   285,   286,   287,   288,   289,   290,   291,
-     292,   293,     0,   294,   295,     0,   296,   297,   298,   299,
-     300,     0,     0,     0,   301,     0,     0,     0,     0,   302,
-       0,     0,   303,     0,     0,     0,   304,   305,   306,     0,
-       0,   307,     0,     0,     0,     0,   308,   309,     0,     0,
-       0,     0,   310,   311,     0,   312,     0,     0,     0,     0,
-       0,   313,   314,   315,   316,   317,     0,     0,     0,   318,
-       0,     0,   319,   320,   321,     0,     0,     0,   322,     0,
-     323,   324,     0,   325,   326,   327,     0,     0,   328,   329,
-       0,   330,   331,   332,   333,   334,   335,     0,     0,   336,
-     337,   338,   339,   340,     0,     0,   341,   342,     0,   343,
-     344,   345,   346,   347,     0,     0,   348,   349,     0,     0,
-       0,   350,   351,     0,   352,     0,     0,     0,   353,     0,
-     354,   355,   356,   357,     0,   358,     0,   359,     0,     0,
-       0,   360,   361,     0,   362,     0,     0,   363,   364,     0,
-       0,     0,   365,   366,   367,   368,     0,     0,   369,   370,
-     371,     0,     0,   372,     0,     0,     0,     0,   373,   374,
-     375,     0,     0,     0,   376,     0,     0,     0,   377,   378,
-       0,   379,   380,     0,     0,     0,   381,     0,   382,     0,
-       0,   383,   384,     0,     0,   385,     0,     0,   386,   387,
-       0,     0,     0,     0,     0,   388,   389,     0,   390,     0,
-     391,     0,   392,   393,     0,     0,     0,     0,     0,     0,
-       0,   394,     0,   395,   396,   397,   398,   399,   400,   401,
-     402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
-       0,   412,   413,   414,     0,   415,   416,   417,   418,     0,
-     419,   420,     0,     0,     0,     0,   421,   422,   423,   424,
-     425,   426,     0,     0,   427,   428,     0,   429,     0,   430,
-       0,   431,   432,   433,   434,   435,   436,   437,   438,   439,
-       0,     0,   440,   441,     0,     0,   442,   443,   444,   445,
-     446,     0,     0,     0,   447,   448,     0,     0,     0,   449,
-       0,   450,   451,     0,   452,   453,   454,     0,     0,   455,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   456,
-     457,   458,     0,   459,     0,   460,     0,   461,   462,   463,
-     464,   465,   466,   467,   468,   469,   470,     0,   471,     0,
-     472,   473,   474,     0,   475,     0,   476,   477,   478,   479,
-     480,     0,   481,   482,   483,     0,     0,   484,     0,     0,
-       0,   485,   486,     0,   487,   488,     0,     0,   489,   490,
-     491,   492,   493,     0,   494,   495,     0,   496,   497,   498,
-       0,     0,   499,   500,   501,   502,   503,   504,   505,   506,
-       0,   507,     0,   508,   509,     0,   510,   511,   512,     0,
-     513,     0,     0,   514,   515,   516,   517,     0,   518,     0,
-     519,   520,   521,   522,   523,     0,   524,   525,    42,     0,
-       0,   526,   527,   528,   529,     0,     0,     0,   530,     0,
-       0,     0,   531,     0,   532,   533,   534,   535,     0,   536,
-     537,   538,   539,   540,     0,     0,     0,     0,     0,   541,
-     542,   543,     0,   544,     0,     0,   545,     0,     0,   546,
-       0,   547,     0,   548,   549,   550,   551,   552,   553,     0,
-       0,   554,   555,     0,     0,   556,   557,   558,   559,   560,
-     561,     0,     0,   562,   563,   564,   565,     0,   566,   567,
-       0,    49,   568,   569,   570,   571,     0,     0,   572,   573,
-       0,   574,   575,   576,   577,     0,     0,     0,     0,     0,
-     578,   579,     0,     0,     0,   580,   581,   582,     0,     0,
-     583,   584,     0,   585,   586,     0,   587,   588,     0,     0,
-     589,     0,     0,   590,     0,   591,     0,   592,   593,     0,
-       0,     0,     0,     0,   594,    54,   595,     0,     0,   596,
-       0,     0,     0,   597,     0,   598,   599,   600,   601,     0,
-       0,     0,    55,     0,     0,   602,   603,   604,     0,   605,
-     606,   607,   608,     0,     0,   609,     0,     0,   610,   611,
-     612,   613,   614,     0,   615,     0,     0,     0,     0,     0,
-       0,     0,     0,   616,   617,   618,     0,   619,   620,   621,
-       0,   622,     0,     0,   623,     0,   624,     0,     0,     0,
-       0,     0,     0,   625,   626,     0,     0,   627,     0,   628,
-       0,   629,   630,     0,     0,     0,   631,   632,   633,   634,
-     635,   636,   637,   638,     0,   639,   640,   641,   642,   643,
-     644,   645,   646,   647,   648,     0,   649,   650,   651,   652,
-     653,   654,   655,   656,   657,   658,   659,   660,   661,   662,
-     663,   664,   665,   666,   667,   668,   669,   670,   671,   672,
-       0,   673,   674,   675,   676,   677,   678,   679,     0,   680,
-     681,   682,   683,   684,   685,   686,   687,   688,   689,   690,
-     691,   692,   693,   694,   695,   696,   697,   698,   699,   700,
-     701,   702,   703,   704,   705,   706,   707,   708,   709,   710,
-     711,   243,   244,     0,   245,   246,   247,   248,   249,     0,
-       0,   250,     0,     0,  1118,  4110,   251,     0,     0,   252,
-       0,   253,   254,   255,   256,   257,   258,     0,   259,     0,
-       0,     0,   260,     0,     0,     0,   261,     0,     0,   262,
-     263,   264,     0,   265,     0,   266,   267,     0,     0,   268,
-       0,     0,   269,   270,     0,   271,   272,   273,     0,   274,
-       0,   275,   276,   277,   278,   279,   280,     0,   281,   282,
-       0,   283,   284,   285,   286,   287,   288,   289,   290,   291,
-     292,   293,     0,   294,   295,     0,   296,   297,   298,   299,
-     300,     0,     0,     0,   301,     0,     0,     0,     0,   302,
-       0,     0,   303,     0,     0,     0,   304,   305,   306,     0,
-       0,   307,     0,     0,     0,     0,   308,   309,     0,     0,
-       0,     0,   310,   311,     0,   312,     0,     0,     0,     0,
-       0,   313,   314,   315,   316,   317,     0,     0,     0,   318,
-       0,     0,   319,   320,   321,     0,     0,     0,   322,     0,
-     323,   324,     0,   325,   326,   327,     0,     0,   328,   329,
-       0,   330,   331,   332,   333,   334,   335,     0,     0,   336,
-     337,   338,   339,   340,     0,     0,   341,   342,     0,   343,
-     344,   345,   346,   347,     0,     0,   348,   349,     0,     0,
-       0,   350,   351,     0,   352,     0,     0,     0,   353,     0,
-     354,   355,   356,   357,     0,   358,     0,   359,     0,     0,
-       0,   360,   361,     0,   362,     0,     0,   363,   364,     0,
-       0,     0,   365,   366,   367,   368,     0,     0,   369,   370,
-     371,     0,     0,   372,     0,     0,     0,     0,   373,   374,
-     375,     0,     0,     0,   376,     0,     0,     0,   377,   378,
-       0,   379,   380,     0,     0,     0,   381,     0,   382,     0,
-       0,   383,   384,     0,     0,   385,     0,     0,   386,   387,
-       0,     0,     0,     0,     0,   388,   389,     0,   390,     0,
-     391,     0,   392,   393,     0,     0,     0,     0,     0,     0,
-       0,   394,     0,   395,   396,   397,   398,   399,   400,   401,
-     402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
-       0,   412,   413,   414,     0,   415,   416,   417,   418,     0,
-     419,   420,     0,     0,     0,     0,   421,   422,   423,   424,
-     425,   426,     0,     0,   427,   428,     0,   429,     0,   430,
-       0,   431,   432,   433,   434,   435,   436,   437,   438,   439,
-       0,     0,   440,   441,     0,     0,   442,   443,   444,   445,
-     446,     0,     0,     0,   447,   448,     0,     0,     0,   449,
-       0,   450,   451,     0,   452,   453,   454,     0,     0,   455,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   456,
-     457,   458,     0,   459,     0,   460,     0,   461,   462,   463,
-     464,   465,   466,   467,   468,   469,   470,     0,   471,     0,
-     472,   473,   474,     0,   475,     0,   476,   477,   478,   479,
-     480,     0,   481,   482,   483,     0,     0,   484,     0,     0,
-       0,   485,   486,     0,   487,   488,     0,     0,   489,   490,
-     491,   492,   493,     0,   494,   495,     0,   496,   497,   498,
-       0,     0,   499,   500,   501,   502,   503,   504,   505,   506,
-       0,   507,     0,   508,   509,     0,   510,   511,   512,     0,
-     513,     0,     0,   514,   515,   516,   517,     0,   518,     0,
-     519,   520,   521,   522,   523,     0,   524,   525,     0,     0,
-       0,   526,   527,   528,   529,     0,     0,     0,   530,     0,
-       0,     0,   531,     0,   532,   533,   534,   535,     0,   536,
-     537,   538,   539,   540,     0,     0,     0,     0,     0,   541,
-     542,   543,     0,   544,     0,     0,   545,     0,     0,   546,
-       0,   547,     0,   548,   549,   550,   551,   552,   553,     0,
-       0,   554,   555,     0,     0,   556,   557,   558,   559,   560,
-     561,     0,     0,   562,   563,   564,   565,     0,   566,   567,
-       0,     0,   568,   569,   570,   571,     0,     0,   572,   573,
-       0,   574,   575,   576,   577,     0,     0,     0,     0,     0,
-     578,   579,     0,     0,     0,   580,   581,   582,     0,     0,
-     583,   584,     0,   585,   586,     0,   587,   588,     0,     0,
-     589,     0,     0,   590,     0,   591,     0,   592,   593,     0,
-       0,     0,     0,     0,   594,     0,   595,     0,     0,   596,
-       0,     0,     0,   597,     0,   598,   599,   600,   601,     0,
-       0,     0,     0,     0,     0,   602,   603,   604,     0,   605,
-     606,   607,   608,     0,     0,   609,     0,     0,   610,   611,
-     612,   613,   614,     0,   615,     0,     0,     0,     0,     0,
-       0,     0,     0,   616,   617,   618,     0,   619,   620,   621,
-       0,   622,     0,     0,   623,     0,   624,     0,     0,     0,
-       0,     0,     0,   625,   626,     0,     0,   627,     0,   628,
-       0,   629,   630,     0,     0,     0,   631,   632,   633,   634,
-     635,   636,   637,   638,     0,   639,   640,   641,   642,   643,
-     644,   645,   646,   647,   648,     0,   649,   650,   651,   652,
-     653,   654,   655,   656,   657,   658,   659,   660,   661,   662,
-     663,   664,   665,   666,   667,   668,   669,   670,   671,   672,
-       0,   673,   674,   675,   676,   677,   678,   679,     0,   680,
-     681,   682,   683,   684,   685,   686,   687,   688,   689,   690,
-     691,   692,   693,   694,   695,   696,   697,   698,   699,   700,
-     701,   702,   703,   704,   705,   706,   707,   708,   709,   710,
-     711,   243,   244,     0,   245,   246,   247,   248,   249,     0,
-       0,   250,     0,     0,     0,  4348,   251,     0,     0,   252,
-       0,   253,   254,   255,   256,   257,   258,     0,   259,     0,
-       0,     0,   260,     0,     0,     0,   261,     0,     0,   262,
-     263,   264,     0,   265,     0,   266,   267,     0,     0,   268,
-       0,     0,   269,   270,     0,   271,   272,   273,     0,   274,
-       0,   275,   276,   277,   278,   279,   280,     0,   281,   282,
-       0,   283,   284,   285,   286,   287,   288,   289,   290,   291,
-     292,   293,     0,   294,   295,     0,   296,   297,   298,   299,
-     300,     0,     0,     0,   301,     0,     0,     0,     0,   302,
-       0,     0,   303,     0,     0,     0,   304,   305,   306,     0,
-       0,   307,     0,     0,     0,     0,   308,   309,     0,     0,
-       0,     0,   310,   311,     0,   312,     0,     0,     0,     0,
-       0,   313,   314,   315,   316,   317,     0,     0,     0,   318,
-       0,     0,   319,   320,   321,     0,     0,     0,   322,     0,
-     323,   324,     0,   325,   326,   327,     0,     0,   328,   329,
-       0,   330,   331,   332,   333,   334,   335,     0,     0,   336,
-     337,   338,   339,   340,     0,     0,   341,   342,     0,   343,
-     344,   345,   346,   347,     0,     0,   348,   349,     0,     0,
-       0,   350,   351,     0,   352,     0,     0,     0,   353,     0,
-     354,   355,   356,   357,     0,   358,     0,   359,     0,     0,
-       0,   360,   361,     0,   362,     0,     0,   363,   364,     0,
-       0,     0,   365,   366,   367,   368,     0,     0,   369,   370,
-     371,     0,     0,   372,     0,     0,     0,     0,   373,   374,
-     375,     0,     0,     0,   376,     0,     0,     0,   377,   378,
-       0,   379,   380,     0,     0,     0,   381,     0,   382,     0,
-       0,   383,   384,     0,     0,   385,     0,     0,   386,   387,
-       0,     0,     0,     0,     0,   388,   389,     0,   390,     0,
-     391,     0,   392,   393,     0,     0,     0,     0,     0,     0,
-       0,   394,     0,   395,   396,   397,   398,   399,   400,   401,
-     402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
-       0,   412,   413,   414,     0,   415,   416,   417,   418,     0,
-     419,   420,     0,     0,     0,     0,   421,   422,   423,   424,
-     425,   426,     0,     0,   427,   428,     0,   429,     0,   430,
-       0,   431,   432,   433,   434,   435,   436,   437,   438,   439,
-       0,     0,   440,   441,     0,     0,   442,   443,   444,   445,
-     446,     0,     0,     0,   447,   448,     0,     0,     0,   449,
-       0,   450,   451,     0,   452,   453,   454,     0,     0,   455,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   456,
-     457,   458,     0,   459,     0,   460,     0,   461,   462,   463,
-     464,   465,   466,   467,   468,   469,   470,     0,   471,     0,
-     472,   473,   474,     0,   475,     0,   476,   477,   478,   479,
-     480,     0,   481,   482,   483,     0,     0,   484,     0,     0,
-       0,   485,   486,     0,   487,   488,     0,     0,   489,   490,
-     491,   492,   493,     0,   494,   495,     0,   496,   497,   498,
-       0,     0,   499,   500,   501,   502,   503,   504,   505,   506,
-       0,   507,     0,   508,   509,     0,   510,   511,   512,     0,
-     513,     0,     0,   514,   515,   516,   517,     0,   518,     0,
-     519,   520,   521,   522,   523,     0,   524,   525,     0,     0,
-       0,   526,   527,   528,   529,     0,     0,     0,   530,     0,
-       0,     0,   531,     0,   532,   533,   534,   535,     0,   536,
-     537,   538,   539,   540,     0,     0,     0,     0,     0,   541,
-     542,   543,     0,   544,     0,     0,   545,     0,     0,   546,
-       0,   547,     0,   548,   549,   550,   551,   552,   553,     0,
-       0,   554,   555,     0,     0,   556,   557,   558,   559,   560,
-     561,     0,     0,   562,   563,   564,   565,     0,   566,   567,
-       0,     0,   568,   569,   570,   571,     0,     0,   572,   573,
-       0,   574,   575,   576,   577,     0,     0,     0,     0,     0,
-     578,   579,     0,     0,     0,   580,   581,   582,     0,     0,
-     583,   584,     0,   585,   586,     0,   587,   588,     0,     0,
-     589,     0,     0,   590,     0,   591,     0,   592,   593,     0,
-       0,     0,     0,     0,   594,     0,   595,     0,     0,   596,
-       0,     0,     0,   597,     0,   598,   599,   600,   601,     0,
-       0,     0,     0,     0,     0,   602,   603,   604,     0,   605,
-     606,   607,   608,     0,     0,   609,     0,     0,   610,   611,
-     612,   613,   614,     0,   615,     0,     0,     0,     0,     0,
-       0,     0,     0,   616,   617,   618,     0,   619,   620,   621,
-       0,   622,     0,     0,   623,     0,   624,     0,     0,     0,
-       0,     0,     0,   625,   626,     0,     0,   627,     0,   628,
-       0,   629,   630,     0,     0,     0,   631,   632,   633,   634,
-     635,   636,   637,   638,     0,   639,   640,   641,   642,   643,
-     644,   645,   646,   647,   648,     0,   649,   650,   651,   652,
-     653,   654,   655,   656,   657,   658,   659,   660,   661,   662,
-     663,   664,   665,   666,   667,   668,   669,   670,   671,   672,
-       0,   673,   674,   675,   676,   677,   678,   679,     0,   680,
-     681,   682,   683,   684,   685,   686,   687,   688,   689,   690,
-     691,   692,   693,   694,   695,   696,   697,   698,   699,   700,
-     701,   702,   703,   704,   705,   706,   707,   708,   709,   710,
-     711,   243,   244,     0,   245,   246,   247,   248,   249,     0,
-       0,   250,     0,     0,     0,  4352,   251,     0,     0,   252,
-       0,   253,   254,   255,   256,   257,   258,     0,   259,     0,
-       0,     0,   260,     0,     0,     0,   261,     0,     0,   262,
-     263,   264,     0,   265,     0,   266,   267,     0,     0,   268,
-       0,     0,   269,   270,     0,   271,   272,   273,     0,   274,
-       0,   275,   276,   277,   278,   279,   280,     0,   281,   282,
-       0,   283,   284,   285,   286,   287,   288,   289,   290,   291,
-     292,   293,     0,   294,   295,  2441,   296,   297,   298,   299,
-     300,     0,     0,     0,   301,     0,     0,     0,     0,   302,
-       0,     0,   303,     0,     0,     0,   304,   305,   306,     0,
-       0,   307,     0,     0,     0,     0,   308,   309,     0,     0,
-       0,     0,   310,   311,     0,   312,     0,     0,     0,     0,
-       0,   313,   314,   315,   316,   317,     0,     0,     0,   318,
-       0,     0,   319,   320,   321,     0,     0,     0,   322,     0,
-     323,   324,     0,   325,   326,   327,     0,     0,   328,   329,
-       0,   330,   331,   332,   333,   334,   335,     0,     0,   336,
-     337,   338,   339,   340,     0,     0,   341,   342,     0,   343,
-     344,   345,   346,   347,     0,     0,   348,   349,     0,     0,
-       0,   350,   351,     0,   352,  2442,     0,     0,   353,     0,
-     354,   355,   356,   357,     0,   358,     0,   359,     0,     0,
-       0,   360,   361,     0,   362,     0,     0,   363,   364,     0,
-       0,     0,   365,   366,   367,   368,     0,     0,   369,   370,
-     371,  1842,     0,   372,     0,     0,     0,     0,   373,   374,
-     375,     0,     0,     0,   376,     0,     0,     0,   377,   378,
-       0,   379,   380,     0,     0,     0,   381,     0,   382,  1843,
-       0,   383,   384,     0,     0,   385,     0,     0,   386,   387,
-       0,  3947,     0,     0,     0,   388,   389,     0,   390,     0,
-     391,     0,   392,   393,     0,     0,     0,     0,     0,     0,
-       0,   394,     0,   395,   396,   397,   398,   399,   400,   401,
-     402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
-       0,   412,   413,   414,     0,   415,   416,   417,   418,     0,
-     419,   420,     0,     0,     0,     0,   421,   422,   423,   424,
-     425,   426,     0,     0,   427,   428,     0,   429,     0,   430,
-       0,   431,   432,   433,   434,   435,   436,   437,   438,   439,
-       0,     0,   440,   441,     0,     0,   442,   443,   444,   445,
-     446,     0,     0,     0,   447,   448,     0,     0,     0,   449,
-       0,   450,   451,     0,   452,   453,   454,     0,     0,   455,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   456,
-     457,   458,     0,   459,     0,   460,     0,   461,   462,   463,
-     464,   465,   466,   467,   468,   469,   470,     0,   471,     0,
-     472,   473,   474,     0,   475,     0,   476,   477,   478,   479,
-     480,     0,   481,   482,   483,     0,     0,   484,     0,     0,
-       0,   485,   486,     0,   487,   488,     0,     0,   489,   490,
-     491,   492,   493,     0,   494,   495,     0,   496,   497,   498,
-       0,     0,   499,   500,   501,   502,   503,   504,   505,   506,
-       0,   507,     0,   508,   509,     0,   510,   511,   512,     0,
-     513,     0,     0,   514,   515,   516,   517,     0,   518,     0,
-     519,   520,   521,   522,   523,     0,   524,   525,    42,     0,
-       0,   526,   527,   528,   529,     0,     0,     0,   530,     0,
-       0,     0,   531,     0,   532,   533,   534,   535,     0,   536,
-     537,   538,   539,   540,  2444,     0,     0,     0,     0,   541,
-     542,   543,     0,   544,     0,     0,   545,     0,     0,   546,
-       0,   547,     0,   548,   549,   550,   551,   552,   553,     0,
-       0,   554,   555,     0,     0,   556,   557,   558,   559,   560,
-     561,     0,     0,   562,   563,   564,   565,     0,   566,   567,
-       0,    49,   568,   569,   570,   571,     0,     0,   572,   573,
-       0,   574,   575,   576,   577,     0,     0,     0,     0,     0,
-     578,   579,     0,     0,     0,   580,   581,   582,     0,     0,
-     583,   584,     0,   585,   586,     0,   587,   588,     0,     0,
-     589,     0,     0,   590,     0,   591,     0,   592,   593,     0,
-       0,     0,     0,     0,   594,    54,   595,     0,     0,   596,
-       0,     0,     0,   597,     0,   598,   599,   600,   601,     0,
-       0,     0,    55,     0,     0,   602,   603,   604,     0,   605,
-     606,   607,   608,     0,     0,   609,     0,     0,   610,   611,
-     612,   613,   614,     0,   615,     0,     0,     0,     0,     0,
-       0,     0,     0,   616,   617,   618,     0,   619,   620,   621,
-       0,   622,     0,     0,   623,     0,   624,     0,     0,     0,
-       0,     0,     0,   625,   626,     0,     0,   627,     0,   628,
-       0,   629,   630,     0,     0,     0,   631,   632,   633,   634,
-     635,   636,   637,   638,     0,   639,   640,   641,   642,   643,
-     644,   645,   646,   647,   648,     0,   649,   650,   651,   652,
-     653,   654,   655,   656,   657,   658,   659,   660,   661,   662,
-     663,   664,   665,   666,   667,   668,   669,   670,   671,   672,
-       0,   673,   674,   675,   676,   677,   678,   679,     0,   680,
-     681,   682,   683,   684,   685,   686,   687,   688,   689,   690,
-     691,   692,   693,   694,   695,   696,   697,   698,   699,   700,
-     701,   702,   703,   704,   705,   706,   707,   708,   709,   710,
-     711,   243,   244,     0,   245,   246,   247,   248,   249,     0,
-       0,   250,     0,     0,  1118,     0,   251,     0,     0,   252,
-       0,   253,   254,   255,   256,   257,   258,     0,   259,     0,
-       0,     0,   260,     0,     0,     0,   261,     0,     0,   262,
-     263,   264,     0,   265,     0,   266,   267,     0,     0,   268,
-       0,     0,   269,   270,     0,   271,   272,   273,     0,   274,
-       0,   275,   276,   277,   278,   279,   280,     0,   281,   282,
-       0,   283,   284,   285,   286,   287,   288,   289,   290,   291,
-     292,   293,     0,   294,   295,     0,   296,   297,   298,   299,
-     300,     0,     0,     0,   301,     0,     0,     0,     0,   302,
-       0,     0,   303,     0,     0,     0,   304,   305,   306,     0,
-       0,   307,     0,     0,     0,     0,   308,   309,     0,     0,
-       0,     0,   310,   311,     0,   312,     0,     0,     0,     0,
-       0,   313,   314,   315,   316,   317,     0,     0,     0,   318,
-       0,     0,   319,   320,   321,     0,     0,     0,   322,     0,
-     323,   324,     0,   325,   326,   327,     0,     0,   328,   329,
-       0,   330,   331,   332,   333,   334,   335,     0,     0,   336,
-     337,   338,   339,   340,     0,     0,   341,   342,     0,   343,
-     344,   345,   346,   347,     0,     0,   348,   349,     0,     0,
-       0,   350,   351,     0,   352,     0,     0,     0,   353,     0,
-     354,   355,   356,   357,     0,   358,     0,   359,     0,     0,
-       0,   360,   361,     0,   362,     0,     0,   363,   364,     0,
-       0,     0,   365,   366,   367,   368,     0,     0,   369,   370,
-     371,     0,     0,   372,     0,     0,     0,     0,   373,   374,
-     375,     0,     0,     0,   376,     0,     0,     0,   377,   378,
-       0,   379,   380,     0,     0,     0,   381,     0,   382,     0,
-       0,   383,   384,     0,     0,   385,     0,     0,   386,   387,
-       0,     0,     0,     0,     0,   388,   389,     0,   390,     0,
-     391,     0,   392,   393,     0,     0,     0,     0,     0,     0,
-       0,   394,     0,   395,   396,   397,   398,   399,   400,   401,
-     402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
-       0,   412,   413,   414,     0,   415,   416,   417,   418,     0,
-     419,   420,     0,     0,     0,     0,   421,   422,   423,   424,
-     425,   426,     0,     0,   427,   428,     0,   429,     0,   430,
-       0,   431,   432,   433,   434,   435,   436,   437,   438,   439,
-       0,     0,   440,   441,     0,     0,   442,   443,   444,   445,
-     446,     0,     0,     0,   447,   448,     0,     0,     0,   449,
-       0,   450,   451,     0,   452,   453,   454,     0,     0,   455,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   456,
-     457,   458,     0,   459,     0,   460,     0,   461,   462,   463,
-     464,   465,   466,   467,   468,   469,   470,     0,   471,     0,
-     472,   473,   474,     0,   475,     0,   476,   477,   478,   479,
-     480,     0,   481,   482,   483,     0,     0,   484,     0,     0,
-       0,   485,   486,     0,   487,   488,     0,     0,   489,   490,
-     491,   492,   493,     0,   494,   495,     0,   496,   497,   498,
-       0,     0,   499,   500,   501,   502,   503,   504,   505,   506,
-       0,   507,     0,   508,   509,     0,   510,   511,   512,     0,
-     513,     0,     0,   514,   515,   516,   517,     0,   518,     0,
-     519,   520,   521,   522,   523,     0,   524,   525,     0,     0,
-       0,   526,   527,   528,   529,     0,     0,     0,   530,     0,
-       0,     0,   531,     0,   532,   533,   534,   535,     0,   536,
-     537,   538,   539,   540,     0,     0,     0,     0,     0,   541,
-     542,   543,     0,   544,     0,     0,   545,     0,     0,   546,
-       0,   547,     0,   548,   549,   550,   551,   552,   553,     0,
-       0,   554,   555,     0,     0,   556,   557,   558,   559,   560,
-     561,     0,     0,   562,   563,   564,   565,     0,   566,   567,
-       0,     0,   568,   569,   570,   571,     0,     0,   572,   573,
-       0,   574,   575,   576,   577,     0,     0,     0,     0,     0,
-     578,   579,     0,     0,     0,   580,   581,   582,     0,     0,
-     583,   584,     0,   585,   586,     0,   587,   588,     0,     0,
-     589,     0,     0,   590,     0,   591,     0,   592,   593,     0,
-       0,     0,     0,     0,   594,     0,   595,     0,     0,   596,
-       0,     0,     0,   597,     0,   598,   599,   600,   601,     0,
-       0,     0,     0,     0,     0,   602,   603,   604,     0,   605,
-     606,   607,   608,     0,     0,   609,     0,     0,   610,   611,
-     612,   613,   614,     0,   615,     0,     0,     0,     0,     0,
-       0,     0,     0,   616,   617,   618,     0,   619,   620,   621,
-       0,   622,     0,     0,   623,     0,   624,     0,     0,     0,
-       0,     0,     0,   625,   626,     0,     0,   627,     0,   628,
-       0,   629,   630,     0,     0,  2932,   631,   632,   633,   634,
-     635,   636,   637,   638,     0,   639,   640,   641,   642,   643,
-     644,   645,   646,   647,   648,  2933,   649,   650,   651,   652,
-     653,   654,   655,   656,   657,   658,   659,   660,   661,   662,
-     663,   664,   665,   666,   667,   668,   669,   670,   671,   672,
-       0,   673,   674,   675,   676,   677,   678,   679,     0,   680,
-     681,   682,   683,   684,   685,   686,   687,   688,   689,   690,
-     691,   692,   693,   694,   695,   696,   697,   698,   699,   700,
-     701,   702,   703,   704,   705,   706,   707,   708,   709,   710,
-     711,   243,   244,     0,   245,   246,   247,   248,   249,     0,
-       0,   250,     0,     0,  2934,     0,   251,     0,     0,   252,
-       0,   253,   254,   255,   256,   257,   258,     0,   259,     0,
-       0,     0,   260,     0,     0,     0,   261,     0,     0,   262,
-     263,   264,     0,   265,     0,   266,   267,     0,     0,   268,
-       0,     0,   269,   270,     0,   271,   272,   273,     0,   274,
-       0,   275,   276,   277,   278,   279,   280,     0,   281,   282,
-       0,   283,   284,   285,   286,   287,   288,   289,   290,   291,
-     292,   293,     0,   294,   295,     0,   296,   297,   298,   299,
-     300,     0,     0,     0,   301,     0,     0,     0,     0,   302,
-       0,     0,   303,     0,     0,     0,   304,   305,   306,     0,
-       0,   307,     0,     0,     0,     0,   308,   309,     0,     0,
-       0,     0,   310,   311,     0,   312,     0,     0,     0,     0,
-       0,   313,   314,   315,   316,   317,     0,     0,     0,   318,
-       0,     0,   319,   320,   321,     0,     0,     0,   322,     0,
-     323,   324,     0,   325,   326,   327,     0,     0,   328,   329,
-       0,   330,   331,   332,   333,   334,   335,     0,     0,   336,
-     337,   338,   339,   340,     0,     0,   341,   342,     0,   343,
-     344,   345,   346,   347,     0,     0,   348,   349,     0,     0,
-       0,   350,   351,     0,   352,     0,     0,     0,   353,     0,
-     354,   355,   356,   357,     0,   358,     0,   359,     0,     0,
-       0,   360,   361,     0,   362,     0,     0,   363,   364,     0,
-       0,     0,   365,   366,   367,   368,     0,     0,   369,   370,
-     371,     0,     0,   372,     0,     0,     0,     0,   373,   374,
-     375,     0,     0,     0,   376,     0,     0,     0,   377,   378,
-       0,   379,   380,     0,     0,     0,   381,     0,   382,     0,
-       0,   383,   384,     0,     0,   385,     0,     0,   386,   387,
-       0,     0,     0,     0,     0,   388,   389,     0,   390,     0,
-     391,     0,   392,   393,     0,     0,     0,     0,     0,     0,
-       0,   394,     0,   395,   396,   397,   398,   399,   400,   401,
-     402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
-       0,   412,   413,   414,     0,   415,   416,   417,   418,     0,
-     419,   420,     0,     0,     0,     0,   421,   422,   423,   424,
-     425,   426,     0,     0,   427,   428,     0,   429,     0,   430,
-       0,   431,   432,   433,   434,   435,   436,   437,   438,   439,
-       0,     0,   440,   441,     0,     0,   442,   443,   444,   445,
-     446,     0,     0,     0,   447,   448,     0,     0,     0,   449,
-       0,   450,   451,     0,   452,   453,   454,     0,     0,   455,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   456,
-     457,   458,     0,   459,     0,   460,     0,   461,   462,   463,
-     464,   465,   466,   467,   468,   469,   470,     0,   471,     0,
-     472,   473,   474,     0,   475,     0,   476,   477,   478,   479,
-     480,     0,   481,   482,   483,     0,     0,   484,     0,     0,
-       0,   485,   486,     0,   487,   488,     0,     0,   489,   490,
-     491,   492,   493,     0,   494,   495,     0,   496,   497,   498,
-       0,     0,   499,   500,   501,   502,   503,   504,   505,   506,
-       0,   507,     0,   508,   509,     0,   510,   511,   512,     0,
-     513,     0,     0,   514,   515,   516,   517,     0,   518,     0,
-     519,   520,   521,   522,   523,     0,   524,   525,     0,     0,
-       0,   526,   527,   528,   529,     0,     0,     0,   530,     0,
-       0,     0,   531,     0,   532,   533,   534,   535,     0,   536,
-     537,   538,   539,   540,     0,     0,     0,     0,     0,   541,
-     542,   543,     0,   544,     0,     0,   545,     0,     0,   546,
-       0,   547,     0,   548,   549,   550,   551,   552,   553,     0,
-       0,   554,   555,     0,     0,   556,   557,   558,   559,   560,
-     561,     0,     0,   562,   563,   564,   565,     0,   566,   567,
-       0,     0,   568,   569,   570,   571,     0,     0,   572,   573,
-       0,   574,   575,   576,   577,     0,     0,     0,     0,     0,
-     578,   579,     0,     0,     0,   580,   581,   582,     0,     0,
-     583,   584,     0,   585,   586,     0,   587,   588,     0,     0,
-     589,     0,     0,   590,     0,   591,     0,   592,   593,     0,
-       0,     0,     0,     0,   594,     0,   595,     0,     0,   596,
-       0,     0,     0,   597,     0,   598,   599,   600,   601,     0,
-       0,     0,     0,     0,     0,   602,   603,   604,     0,   605,
-     606,   607,   608,     0,     0,   609,     0,     0,   610,   611,
-     612,   613,   614,     0,   615,     0,     0,     0,     0,     0,
-       0,     0,     0,   616,   617,   618,     0,   619,   620,   621,
-       0,   622,     0,     0,   623,     0,   624,     0,     0,     0,
-       0,     0,     0,   625,   626,     0,     0,   627,     0,   628,
-       0,   629,   630,     0,     0,     0,   631,   632,   633,   634,
-     635,   636,   637,   638,     0,   639,   640,   641,   642,   643,
-     644,   645,   646,   647,   648,     0,   649,   650,   651,   652,
-     653,   654,   655,   656,   657,   658,   659,   660,   661,   662,
-     663,   664,   665,   666,   667,   668,   669,   670,   671,   672,
-       0,   673,   674,   675,   676,   677,   678,   679,     0,   680,
-     681,   682,   683,   684,   685,   686,   687,   688,   689,   690,
-     691,   692,   693,   694,   695,   696,   697,   698,   699,   700,
-     701,   702,   703,   704,   705,   706,   707,   708,   709,   710,
-     711,   243,   244,     0,   245,   246,   247,   248,   249,     0,
-       0,   250,     0,     0,  1274,     0,   251,     0,     0,   252,
-       0,   253,   254,   255,   256,   257,   258,     0,   259,     0,
-       0,     0,   260,     0,     0,     0,   261,     0,     0,   262,
-     263,   264,     0,   265,     0,   266,   267,     0,     0,   268,
-       0,     0,   269,   270,     0,   271,   272,   273,     0,   274,
-       0,   275,   276,   277,   278,   279,   280,     0,   281,   282,
-       0,   283,   284,   285,   286,   287,   288,   289,   290,   291,
-     292,   293,     0,   294,   295,     0,   296,   297,   298,   299,
-     300,     0,     0,     0,   301,     0,     0,     0,     0,   302,
-       0,     0,   303,     0,     0,     0,   304,   305,   306,     0,
-       0,   307,     0,     0,     0,     0,   308,   309,     0,     0,
-       0,     0,   310,   311,     0,   312,     0,     0,     0,     0,
-       0,   313,   314,   315,   316,   317,     0,     0,     0,   318,
-       0,     0,   319,   320,   321,     0,     0,     0,   322,     0,
-     323,   324,     0,   325,   326,   327,     0,     0,   328,   329,
-       0,   330,   331,   332,   333,   334,   335,     0,     0,   336,
-     337,   338,   339,   340,     0,     0,   341,   342,     0,   343,
-     344,   345,   346,   347,     0,     0,   348,   349,     0,     0,
-       0,   350,   351,     0,   352,     0,     0,     0,   353,     0,
-     354,   355,   356,   357,     0,   358,     0,   359,     0,     0,
-       0,   360,   361,     0,   362,     0,     0,   363,   364,     0,
-       0,     0,   365,   366,   367,   368,     0,     0,   369,   370,
-     371,     0,     0,   372,     0,     0,     0,     0,   373,   374,
-     375,     0,     0,     0,   376,     0,     0,     0,   377,   378,
-       0,   379,   380,     0,     0,     0,   381,     0,   382,     0,
-       0,   383,   384,     0,     0,   385,     0,     0,   386,   387,
-       0,     0,     0,     0,     0,   388,   389,     0,   390,     0,
-     391,     0,   392,   393,     0,     0,     0,     0,     0,     0,
-       0,   394,     0,   395,   396,   397,   398,   399,   400,   401,
-     402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
-       0,   412,   413,   414,     0,   415,   416,   417,   418,     0,
-     419,   420,     0,     0,     0,     0,   421,   422,   423,   424,
-     425,   426,     0,     0,   427,   428,     0,   429,     0,   430,
-       0,   431,   432,   433,   434,   435,   436,   437,   438,   439,
-       0,     0,   440,   441,     0,     0,   442,   443,   444,   445,
-     446,     0,     0,     0,   447,   448,     0,     0,     0,   449,
-       0,   450,   451,     0,   452,   453,   454,     0,     0,   455,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   456,
-     457,   458,     0,   459,     0,   460,     0,   461,   462,   463,
-     464,   465,   466,   467,   468,   469,   470,     0,   471,     0,
-     472,   473,   474,     0,   475,     0,   476,   477,   478,   479,
-     480,     0,   481,   482,   483,     0,     0,   484,     0,     0,
-       0,   485,   486,     0,   487,   488,     0,     0,   489,   490,
-     491,   492,   493,     0,   494,   495,     0,   496,   497,   498,
-       0,     0,   499,   500,   501,   502,   503,   504,   505,   506,
-       0,   507,     0,   508,   509,     0,   510,   511,   512,     0,
-     513,     0,     0,   514,   515,   516,   517,     0,   518,     0,
-     519,   520,   521,   522,   523,     0,   524,   525,     0,     0,
-       0,   526,   527,   528,   529,     0,     0,     0,   530,     0,
-       0,     0,   531,     0,   532,   533,   534,   535,     0,   536,
-     537,   538,   539,   540,     0,     0,     0,     0,     0,   541,
-     542,   543,     0,   544,     0,     0,   545,     0,     0,   546,
-       0,   547,     0,   548,   549,   550,   551,   552,   553,     0,
-       0,   554,   555,     0,     0,   556,   557,   558,   559,   560,
-     561,     0,     0,   562,   563,   564,   565,     0,   566,   567,
-       0,     0,   568,   569,   570,   571,     0,     0,   572,   573,
-       0,   574,   575,   576,   577,     0,     0,     0,     0,     0,
-     578,   579,     0,     0,     0,   580,   581,   582,     0,     0,
-     583,   584,     0,   585,   586,     0,   587,   588,     0,     0,
-     589,     0,     0,   590,     0,   591,     0,   592,   593,     0,
-       0,     0,     0,     0,   594,     0,   595,     0,     0,   596,
-       0,     0,     0,   597,     0,   598,   599,   600,   601,     0,
-       0,     0,     0,     0,     0,   602,   603,   604,     0,   605,
-     606,   607,   608,     0,     0,   609,     0,     0,   610,   611,
-     612,   613,   614,     0,   615,     0,     0,     0,     0,     0,
-       0,     0,     0,   616,   617,   618,     0,   619,   620,   621,
-       0,   622,     0,     0,   623,     0,   624,     0,     0,     0,
-       0,     0,     0,   625,   626,     0,     0,   627,     0,   628,
-       0,   629,   630,     0,     0,     0,   631,   632,   633,   634,
-     635,   636,   637,   638,     0,   639,   640,   641,   642,   643,
-     644,   645,   646,   647,   648,     0,   649,   650,   651,   652,
-     653,   654,   655,   656,   657,   658,   659,   660,   661,   662,
-     663,   664,   665,   666,   667,   668,   669,   670,   671,   672,
-       0,   673,   674,   675,   676,   677,   678,   679,     0,   680,
-     681,   682,   683,   684,   685,   686,   687,   688,   689,   690,
-     691,   692,   693,   694,   695,   696,   697,   698,   699,   700,
-     701,   702,   703,   704,   705,   706,   707,   708,   709,   710,
-     711,   243,   244,     0,   245,   246,   247,   248,   249,     0,
-       0,   250,     0,     0,  3145,     0,   251,     0,     0,   252,
-       0,   253,   254,   255,   256,   257,   258,     0,   259,     0,
-       0,     0,   260,     0,     0,     0,   261,     0,     0,   262,
-     263,   264,     0,   265,     0,   266,   267,     0,     0,   268,
-       0,     0,   269,   270,     0,   271,   272,   273,     0,   274,
-       0,   275,   276,   277,   278,   279,   280,     0,   281,   282,
-       0,   283,   284,   285,   286,   287,   288,   289,   290,   291,
-     292,   293,     0,   294,   295,     0,   296,   297,   298,   299,
-     300,     0,     0,     0,   301,     0,     0,     0,     0,   302,
-       0,     0,   303,     0,     0,     0,   304,   305,   306,     0,
-       0,   307,     0,     0,     0,     0,   308,   309,     0,     0,
-       0,     0,   310,   311,     0,   312,     0,     0,     0,     0,
-       0,   313,   314,   315,   316,   317,     0,     0,     0,   318,
-       0,     0,   319,   320,   321,     0,     0,     0,   322,     0,
-     323,   324,     0,   325,   326,   327,     0,     0,   328,   329,
-       0,   330,   331,   332,   333,   334,   335,     0,     0,   336,
-     337,   338,   339,   340,     0,     0,   341,   342,     0,   343,
-     344,   345,   346,   347,     0,     0,   348,   349,     0,     0,
-       0,   350,   351,     0,   352,     0,     0,     0,   353,     0,
-     354,   355,   356,   357,     0,   358,     0,   359,     0,     0,
-       0,   360,   361,     0,   362,     0,     0,   363,   364,     0,
-       0,     0,   365,   366,   367,   368,     0,     0,   369,   370,
-     371,     0,     0,   372,     0,     0,     0,     0,   373,   374,
-     375,     0,     0,     0,   376,     0,     0,     0,   377,   378,
-       0,   379,   380,     0,     0,     0,   381,     0,   382,     0,
-       0,   383,   384,     0,     0,   385,     0,     0,   386,   387,
-       0,     0,     0,     0,     0,   388,   389,     0,   390,     0,
-     391,     0,   392,   393,     0,     0,     0,     0,     0,     0,
-       0,   394,     0,   395,   396,   397,   398,   399,   400,   401,
-     402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
-       0,   412,   413,   414,     0,   415,   416,   417,   418,     0,
-     419,   420,     0,     0,     0,     0,   421,   422,   423,   424,
-     425,   426,     0,     0,   427,   428,     0,   429,     0,   430,
-       0,   431,   432,   433,   434,   435,   436,   437,   438,   439,
-       0,     0,   440,   441,     0,     0,   442,   443,   444,   445,
-     446,     0,     0,     0,   447,   448,     0,     0,     0,   449,
-       0,   450,   451,     0,   452,   453,   454,     0,     0,   455,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   456,
-     457,   458,     0,   459,     0,   460,     0,   461,   462,   463,
-     464,   465,   466,   467,   468,   469,   470,     0,   471,     0,
-     472,   473,   474,     0,   475,     0,   476,   477,   478,   479,
-     480,     0,   481,   482,   483,     0,     0,   484,     0,     0,
-       0,   485,   486,     0,   487,   488,     0,     0,   489,   490,
-     491,   492,   493,     0,   494,   495,     0,   496,   497,   498,
-       0,     0,   499,   500,   501,   502,   503,   504,   505,   506,
-       0,   507,     0,   508,   509,     0,   510,   511,   512,     0,
-     513,     0,     0,   514,   515,   516,   517,     0,   518,     0,
-     519,   520,   521,   522,   523,     0,   524,   525,     0,     0,
-       0,   526,   527,   528,   529,     0,     0,     0,   530,     0,
-       0,     0,   531,     0,   532,   533,   534,   535,     0,   536,
-     537,   538,   539,   540,     0,     0,     0,     0,     0,   541,
-     542,   543,     0,   544,     0,     0,   545,     0,     0,   546,
-       0,   547,     0,   548,   549,   550,   551,   552,   553,     0,
-       0,   554,   555,     0,     0,   556,   557,   558,   559,   560,
-     561,     0,     0,   562,   563,   564,   565,     0,   566,   567,
-       0,     0,   568,   569,   570,   571,     0,     0,   572,   573,
-       0,   574,   575,   576,   577,     0,     0,     0,     0,     0,
-     578,   579,     0,     0,     0,   580,   581,   582,     0,     0,
-     583,   584,     0,   585,   586,     0,   587,   588,     0,     0,
-     589,     0,     0,   590,     0,   591,     0,   592,   593,     0,
-       0,     0,     0,     0,   594,     0,   595,     0,     0,   596,
-       0,     0,     0,   597,     0,   598,   599,   600,   601,     0,
-       0,     0,     0,     0,     0,   602,   603,   604,     0,   605,
-     606,   607,   608,     0,     0,   609,     0,     0,   610,   611,
-     612,   613,   614,     0,   615,     0,     0,     0,     0,     0,
-       0,     0,     0,   616,   617,   618,     0,   619,   620,   621,
-       0,   622,     0,     0,   623,     0,   624,     0,     0,     0,
-       0,     0,     0,   625,   626,     0,     0,   627,     0,   628,
-       0,   629,   630,     0,     0,     0,   631,   632,   633,   634,
-     635,   636,   637,   638,     0,   639,   640,   641,   642,   643,
-     644,   645,   646,   647,   648,     0,   649,   650,   651,   652,
-     653,   654,   655,   656,   657,   658,   659,   660,   661,   662,
-     663,   664,   665,   666,   667,   668,   669,   670,   671,   672,
-       0,   673,   674,   675,   676,   677,   678,   679,     0,   680,
-     681,   682,   683,   684,   685,   686,   687,   688,   689,   690,
-     691,   692,   693,   694,   695,   696,   697,   698,   699,   700,
-     701,   702,   703,   704,   705,   706,   707,   708,   709,   710,
-     711,   243,   244,     0,   245,   246,   247,   248,   249,     0,
-       0,   250,     0,     0,  3481,     0,   251,     0,     0,   252,
-       0,   253,   254,   255,   256,   257,   258,     0,   259,     0,
-       0,     0,   260,     0,     0,     0,   261,     0,     0,   262,
-     263,   264,     0,   265,     0,   266,   267,     0,     0,   268,
-       0,     0,   269,   270,     0,   271,   272,   273,     0,   274,
-       0,   275,   276,   277,   278,   279,   280,     0,   281,   282,
-       0,   283,   284,   285,   286,   287,   288,   289,   290,   291,
-     292,   293,     0,   294,   295,     0,   296,   297,   298,   299,
-     300,     0,     0,     0,   301,     0,     0,     0,     0,   302,
-       0,     0,   303,     0,     0,     0,   304,   305,   306,     0,
-       0,   307,     0,     0,     0,     0,   308,   309,     0,     0,
-       0,     0,   310,   311,     0,   312,     0,     0,     0,     0,
-       0,   313,   314,   315,   316,   317,     0,     0,     0,   318,
-       0,     0,   319,   320,   321,     0,     0,     0,   322,     0,
-     323,   324,     0,   325,   326,   327,     0,     0,   328,   329,
-       0,   330,   331,   332,   333,   334,   335,     0,     0,   336,
-     337,   338,   339,   340,     0,     0,   341,   342,     0,   343,
-     344,   345,   346,   347,     0,     0,   348,   349,     0,     0,
-       0,   350,   351,     0,   352,     0,     0,     0,   353,     0,
-     354,   355,   356,   357,     0,   358,     0,   359,     0,     0,
-       0,   360,   361,     0,   362,     0,     0,   363,   364,     0,
-       0,     0,   365,   366,   367,   368,     0,     0,   369,   370,
-     371,     0,     0,   372,     0,     0,     0,     0,   373,   374,
-     375,     0,     0,     0,   376,     0,     0,     0,   377,   378,
-       0,   379,   380,     0,     0,     0,   381,     0,   382,     0,
-       0,   383,   384,     0,     0,   385,     0,     0,   386,   387,
-       0,     0,     0,     0,     0,   388,   389,     0,   390,     0,
-     391,     0,   392,   393,     0,     0,     0,     0,     0,     0,
-       0,   394,     0,   395,   396,   397,   398,   399,   400,   401,
-     402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
-       0,   412,   413,   414,     0,   415,   416,   417,   418,     0,
-     419,   420,     0,     0,     0,     0,   421,   422,   423,   424,
-     425,   426,     0,     0,   427,   428,     0,   429,     0,   430,
-       0,   431,   432,   433,   434,   435,   436,   437,   438,   439,
-       0,     0,   440,   441,     0,     0,   442,   443,   444,   445,
-     446,     0,     0,     0,   447,   448,     0,     0,     0,   449,
-       0,   450,   451,     0,   452,   453,   454,     0,     0,   455,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   456,
-     457,   458,     0,   459,     0,   460,     0,   461,   462,   463,
-     464,   465,   466,   467,   468,   469,   470,     0,   471,     0,
-     472,   473,   474,     0,   475,     0,   476,   477,   478,   479,
-     480,     0,   481,   482,   483,     0,     0,   484,     0,     0,
-       0,   485,   486,     0,   487,   488,     0,     0,   489,   490,
-     491,   492,   493,     0,   494,   495,     0,   496,   497,   498,
-       0,     0,   499,   500,   501,   502,   503,   504,   505,   506,
-       0,   507,     0,   508,   509,     0,   510,   511,   512,     0,
-     513,     0,     0,   514,   515,   516,   517,     0,   518,     0,
-     519,   520,   521,   522,   523,     0,   524,   525,     0,     0,
-       0,   526,   527,   528,   529,     0,     0,     0,   530,     0,
-       0,     0,   531,     0,   532,   533,   534,   535,     0,   536,
-     537,   538,   539,   540,     0,     0,     0,     0,     0,   541,
-     542,   543,     0,   544,     0,     0,   545,     0,     0,   546,
-       0,   547,     0,   548,   549,   550,   551,   552,   553,     0,
-       0,   554,   555,     0,     0,   556,   557,   558,   559,   560,
-     561,     0,     0,   562,   563,   564,   565,     0,   566,   567,
-       0,     0,   568,   569,   570,   571,     0,     0,   572,   573,
-       0,   574,   575,   576,   577,     0,     0,     0,     0,     0,
-     578,   579,     0,     0,     0,   580,   581,   582,     0,     0,
-     583,   584,     0,   585,   586,     0,   587,   588,     0,     0,
-     589,     0,     0,   590,     0,   591,     0,   592,   593,     0,
-       0,     0,     0,     0,   594,     0,   595,     0,     0,   596,
-       0,     0,     0,   597,     0,   598,   599,   600,   601,     0,
-       0,     0,     0,     0,     0,   602,   603,   604,     0,   605,
-     606,   607,   608,     0,     0,   609,     0,     0,   610,   611,
-     612,   613,   614,     0,   615,     0,     0,     0,     0,     0,
-       0,     0,     0,   616,   617,   618,     0,   619,   620,   621,
-       0,   622,     0,     0,   623,     0,   624,     0,     0,     0,
-       0,     0,     0,   625,   626,     0,     0,   627,     0,   628,
-       0,   629,   630,     0,     0,     0,   631,   632,   633,   634,
-     635,   636,   637,   638,     0,   639,   640,   641,   642,   643,
-     644,   645,   646,   647,   648,     0,   649,   650,   651,   652,
-     653,   654,   655,   656,   657,   658,   659,   660,   661,   662,
-     663,   664,   665,   666,   667,   668,   669,   670,   671,   672,
-       0,   673,   674,   675,   676,   677,   678,   679,     0,   680,
-     681,   682,   683,   684,   685,   686,   687,   688,   689,   690,
-     691,   692,   693,   694,   695,   696,   697,   698,   699,   700,
-     701,   702,   703,   704,   705,   706,   707,   708,   709,   710,
-     711,   243,   244,     0,   245,   246,   247,   248,   249,     0,
-       0,   250,     0,     0,  4235,     0,   251,     0,     0,   252,
-       0,   253,   254,   255,   256,   257,   258,     0,   259,     0,
-       0,     0,   260,     0,     0,     0,   261,     0,     0,   262,
-     263,   264,     0,   265,     0,   266,   267,     0,     0,   268,
-       0,     0,   269,   270,     0,   271,   272,   273,     0,   274,
-       0,   275,   276,   277,   278,   279,   280,     0,   281,   282,
-       0,   283,   284,   285,   286,   287,   288,   289,   290,   291,
-     292,   293,     0,   294,   295,     0,   296,   297,   298,   299,
-     300,     0,     0,     0,   301,     0,     0,     0,     0,   302,
-       0,     0,   303,     0,     0,     0,   304,   305,   306,     0,
-       0,   307,     0,     0,     0,     0,   308,   309,     0,     0,
-       0,     0,   310,   311,     0,   312,     0,     0,     0,     0,
-       0,   313,   314,   315,   316,   317,     0,     0,     0,   318,
-       0,     0,   319,   320,   321,     0,     0,     0,   322,     0,
-     323,   324,     0,   325,   326,   327,     0,     0,   328,   329,
-       0,   330,   331,   332,   333,   334,   335,     0,     0,   336,
-     337,   338,   339,   340,     0,     0,   341,   342,     0,   343,
-     344,   345,   346,   347,     0,     0,   348,   349,     0,     0,
-       0,   350,   351,     0,   352,     0,     0,     0,   353,     0,
-     354,   355,   356,   357,     0,   358,     0,   359,     0,     0,
-       0,   360,   361,     0,   362,     0,     0,   363,   364,     0,
-       0,     0,   365,   366,   367,   368,     0,     0,   369,   370,
-     371,     0,     0,   372,     0,     0,     0,     0,   373,   374,
-     375,     0,     0,     0,   376,     0,     0,     0,   377,   378,
-       0,   379,   380,     0,     0,     0,   381,     0,   382,     0,
-       0,   383,   384,     0,     0,   385,     0,     0,   386,   387,
-       0,     0,     0,     0,     0,   388,   389,     0,   390,     0,
-     391,     0,   392,   393,     0,     0,     0,     0,     0,     0,
-       0,   394,     0,   395,   396,   397,   398,   399,   400,   401,
-     402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
-       0,   412,   413,   414,     0,   415,   416,   417,   418,     0,
-     419,   420,     0,     0,     0,     0,   421,   422,   423,   424,
-     425,   426,     0,     0,   427,   428,     0,   429,     0,   430,
-       0,   431,   432,   433,   434,   435,   436,   437,   438,   439,
-       0,     0,   440,   441,     0,     0,   442,   443,   444,   445,
-     446,     0,     0,     0,   447,   448,     0,     0,     0,   449,
-       0,   450,   451,     0,   452,   453,   454,     0,     0,   455,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   456,
-     457,   458,     0,   459,     0,   460,     0,   461,   462,   463,
-     464,   465,   466,   467,   468,   469,   470,     0,   471,     0,
-     472,   473,   474,     0,   475,     0,   476,   477,   478,   479,
-     480,     0,   481,   482,   483,     0,     0,   484,     0,     0,
-       0,   485,   486,     0,   487,   488,     0,     0,   489,   490,
-     491,   492,   493,     0,   494,   495,     0,   496,   497,   498,
-       0,     0,   499,   500,   501,   502,   503,   504,   505,   506,
-       0,   507,     0,   508,   509,     0,   510,   511,   512,     0,
-     513,     0,     0,   514,   515,   516,   517,     0,   518,     0,
-     519,   520,   521,   522,   523,     0,   524,   525,     0,     0,
-       0,   526,   527,   528,   529,     0,     0,     0,   530,     0,
-       0,     0,   531,     0,   532,   533,   534,   535,     0,   536,
-     537,   538,   539,   540,     0,     0,     0,     0,     0,   541,
-     542,   543,     0,   544,     0,     0,   545,     0,     0,   546,
-       0,   547,     0,   548,   549,   550,   551,   552,   553,     0,
-       0,   554,   555,     0,     0,   556,   557,   558,   559,   560,
-     561,     0,     0,   562,   563,   564,   565,     0,   566,   567,
-       0,     0,   568,   569,   570,   571,     0,     0,   572,   573,
-       0,   574,   575,   576,   577,     0,     0,     0,     0,     0,
-     578,   579,     0,     0,     0,   580,   581,   582,     0,     0,
-     583,   584,     0,   585,   586,     0,   587,   588,     0,     0,
-     589,     0,     0,   590,     0,   591,     0,   592,   593,     0,
-       0,     0,     0,     0,   594,     0,   595,     0,     0,   596,
-       0,     0,     0,   597,     0,   598,   599,   600,   601,     0,
-       0,     0,     0,     0,     0,   602,   603,   604,     0,   605,
-     606,   607,   608,     0,     0,   609,     0,     0,   610,   611,
-     612,   613,   614,     0,   615,     0,     0,     0,     0,     0,
-       0,     0,     0,   616,   617,   618,     0,   619,   620,   621,
-       0,   622,     0,     0,   623,     0,   624,     0,     0,     0,
-       0,     0,     0,   625,   626,     0,     0,   627,     0,   628,
-       0,   629,   630,     0,     0,     0,   631,   632,   633,   634,
-     635,   636,   637,   638,     0,   639,   640,   641,   642,   643,
-     644,   645,   646,   647,   648,     0,   649,   650,   651,   652,
-     653,   654,   655,   656,   657,   658,   659,   660,   661,   662,
-     663,   664,   665,   666,   667,   668,   669,   670,   671,   672,
-       0,   673,   674,   675,   676,   677,   678,   679,     0,   680,
-     681,   682,   683,   684,   685,   686,   687,   688,   689,   690,
-     691,   692,   693,   694,   695,   696,   697,   698,   699,   700,
-     701,   702,   703,   704,   705,   706,   707,   708,   709,   710,
-     711,     0,     0,     0,     0,     0,   243,   244,  2107,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,     0,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,     0,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,     0,     0,     0,     0,
-       0,   243,   244,  2872,   245,   246,   247,   248,   249,     0,
-       0,   250,     0,     0,     0,     0,   251,     0,     0,   252,
-       0,   253,   254,   255,   256,   257,   258,     0,   259,     0,
-       0,     0,   260,     0,     0,     0,   261,     0,     0,   262,
-     263,   264,     0,   265,     0,   266,   267,     0,     0,   268,
-       0,     0,   269,   270,     0,   271,   272,   273,     0,   274,
-       0,   275,   276,   277,   278,   279,   280,     0,   281,   282,
-       0,   283,   284,   285,   286,   287,   288,   289,   290,   291,
-     292,   293,     0,   294,   295,     0,   296,   297,   298,   299,
-     300,     0,     0,     0,   301,     0,     0,     0,     0,   302,
-       0,     0,   303,     0,     0,     0,   304,   305,   306,     0,
-       0,   307,     0,     0,     0,     0,   308,   309,     0,     0,
-       0,     0,   310,   311,     0,   312,     0,     0,     0,     0,
-       0,   313,   314,   315,   316,   317,     0,     0,     0,   318,
-       0,     0,   319,   320,   321,     0,     0,     0,   322,     0,
-     323,   324,     0,   325,   326,   327,     0,     0,   328,   329,
-       0,   330,   331,   332,   333,   334,   335,     0,     0,   336,
-     337,   338,   339,   340,     0,     0,   341,   342,     0,   343,
-     344,   345,   346,   347,     0,     0,   348,   349,     0,     0,
-       0,   350,   351,     0,   352,     0,     0,     0,   353,     0,
-     354,   355,   356,   357,     0,   358,     0,   359,     0,     0,
-       0,   360,   361,     0,   362,     0,     0,   363,   364,     0,
-       0,     0,   365,   366,   367,   368,     0,     0,   369,   370,
-     371,     0,     0,   372,     0,     0,     0,     0,   373,   374,
-     375,     0,     0,     0,   376,     0,     0,     0,   377,   378,
-       0,   379,   380,     0,     0,     0,   381,     0,   382,     0,
-       0,   383,   384,     0,     0,   385,     0,     0,   386,   387,
-       0,     0,     0,     0,     0,   388,   389,     0,   390,     0,
-     391,     0,   392,   393,     0,     0,     0,     0,     0,     0,
-       0,   394,     0,   395,   396,   397,   398,   399,   400,   401,
-     402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
-       0,   412,   413,   414,     0,   415,   416,   417,   418,     0,
-     419,   420,     0,     0,     0,     0,   421,   422,   423,   424,
-     425,   426,     0,     0,   427,   428,     0,   429,     0,   430,
-       0,   431,   432,   433,   434,   435,   436,   437,   438,   439,
-       0,     0,   440,   441,     0,     0,   442,   443,   444,   445,
-     446,     0,     0,     0,   447,   448,     0,     0,     0,   449,
-       0,   450,   451,     0,   452,   453,   454,     0,     0,   455,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   456,
-     457,   458,     0,   459,     0,   460,     0,   461,   462,   463,
-     464,   465,   466,   467,   468,   469,   470,     0,   471,     0,
-     472,   473,   474,     0,   475,     0,   476,   477,   478,   479,
-     480,     0,   481,   482,   483,     0,     0,   484,     0,     0,
-       0,   485,   486,     0,   487,   488,     0,     0,   489,   490,
-     491,   492,   493,     0,   494,   495,     0,   496,   497,   498,
-       0,     0,   499,   500,   501,   502,   503,   504,   505,   506,
-       0,   507,     0,   508,   509,     0,   510,   511,   512,     0,
-     513,     0,     0,   514,   515,   516,   517,     0,   518,     0,
-     519,   520,   521,   522,   523,     0,   524,   525,     0,     0,
-       0,   526,   527,   528,   529,     0,     0,     0,   530,     0,
-       0,     0,   531,     0,   532,   533,   534,   535,     0,   536,
-     537,   538,   539,   540,     0,     0,     0,     0,     0,   541,
-     542,   543,     0,   544,     0,     0,   545,     0,     0,   546,
-       0,   547,     0,   548,   549,   550,   551,   552,   553,     0,
-       0,   554,   555,     0,     0,   556,   557,   558,   559,   560,
-     561,     0,     0,   562,   563,   564,   565,     0,   566,   567,
-       0,     0,   568,   569,   570,   571,     0,     0,   572,   573,
-       0,   574,   575,   576,   577,     0,     0,     0,     0,     0,
-     578,   579,     0,     0,     0,   580,   581,   582,     0,     0,
-     583,   584,     0,   585,   586,     0,   587,   588,     0,     0,
-     589,     0,     0,   590,     0,   591,     0,   592,   593,     0,
-       0,     0,     0,     0,   594,     0,   595,     0,     0,   596,
-       0,     0,     0,   597,     0,   598,   599,   600,   601,     0,
-       0,     0,     0,     0,     0,   602,   603,   604,     0,   605,
-     606,   607,   608,     0,     0,   609,     0,     0,   610,   611,
-     612,   613,   614,     0,   615,     0,     0,     0,     0,     0,
-       0,     0,     0,   616,   617,   618,     0,   619,   620,   621,
-       0,   622,     0,     0,   623,     0,   624,     0,     0,     0,
-       0,     0,     0,   625,   626,     0,     0,   627,     0,   628,
-       0,   629,   630,     0,     0,     0,   631,   632,   633,   634,
-     635,   636,   637,   638,     0,   639,   640,   641,   642,   643,
-     644,   645,   646,   647,   648,     0,   649,   650,   651,   652,
-     653,   654,   655,   656,   657,   658,   659,   660,   661,   662,
-     663,   664,   665,   666,   667,   668,   669,   670,   671,   672,
-       0,   673,   674,   675,   676,   677,   678,   679,     0,   680,
-     681,   682,   683,   684,   685,   686,   687,   688,   689,   690,
-     691,   692,   693,   694,   695,   696,   697,   698,   699,   700,
-     701,   702,   703,   704,   705,   706,   707,   708,   709,   710,
-     711,     0,     0,     0,     0,     0,   243,   244,  3514,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,     0,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,     0,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,     0,     0,     0,     0,
-       0,   243,   244,  3693,   245,   246,   247,   248,   249,     0,
-       0,   250,     0,     0,     0,     0,   251,     0,     0,   252,
-       0,   253,   254,   255,   256,   257,   258,     0,   259,     0,
-       0,     0,   260,     0,     0,     0,   261,     0,     0,   262,
-     263,   264,     0,   265,     0,   266,   267,     0,     0,   268,
-       0,     0,   269,   270,     0,   271,   272,   273,     0,   274,
-       0,   275,   276,   277,   278,   279,   280,     0,   281,   282,
-       0,   283,   284,   285,   286,   287,   288,   289,   290,   291,
-     292,   293,     0,   294,   295,     0,   296,   297,   298,   299,
-     300,     0,     0,     0,   301,     0,     0,     0,     0,   302,
-       0,     0,   303,     0,     0,     0,   304,   305,   306,     0,
-       0,   307,     0,     0,     0,     0,   308,   309,     0,     0,
-       0,     0,   310,   311,     0,   312,     0,     0,     0,     0,
-       0,   313,   314,   315,   316,   317,     0,     0,     0,   318,
-       0,     0,   319,   320,   321,     0,     0,     0,   322,     0,
-     323,   324,     0,   325,   326,   327,     0,     0,   328,   329,
-       0,   330,   331,   332,   333,   334,   335,     0,     0,   336,
-     337,   338,   339,   340,     0,     0,   341,   342,     0,   343,
-     344,   345,   346,   347,     0,     0,   348,   349,     0,     0,
-       0,   350,   351,     0,   352,     0,     0,     0,   353,     0,
-     354,   355,   356,   357,     0,   358,     0,   359,     0,     0,
-       0,   360,   361,     0,   362,     0,     0,   363,   364,     0,
-       0,     0,   365,   366,   367,   368,     0,     0,   369,   370,
-     371,     0,     0,   372,     0,     0,     0,     0,   373,   374,
-     375,     0,     0,     0,   376,     0,     0,     0,   377,   378,
-       0,   379,   380,     0,     0,     0,   381,     0,   382,     0,
-       0,   383,   384,     0,     0,   385,     0,     0,   386,   387,
-       0,     0,     0,     0,     0,   388,   389,     0,   390,     0,
-     391,     0,   392,   393,     0,     0,     0,     0,     0,     0,
-       0,   394,     0,   395,   396,   397,   398,   399,   400,   401,
-     402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
-       0,   412,   413,   414,     0,   415,   416,   417,   418,     0,
-     419,   420,     0,     0,     0,     0,   421,   422,   423,   424,
-     425,   426,     0,     0,   427,   428,     0,   429,     0,   430,
-       0,   431,   432,   433,   434,   435,   436,   437,   438,   439,
-       0,     0,   440,   441,     0,     0,   442,   443,   444,   445,
-     446,     0,     0,     0,   447,   448,     0,     0,     0,   449,
-       0,   450,   451,     0,   452,   453,   454,     0,     0,   455,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   456,
-     457,   458,     0,   459,     0,   460,     0,   461,   462,   463,
-     464,   465,   466,   467,   468,   469,   470,     0,   471,     0,
-     472,   473,   474,     0,   475,     0,   476,   477,   478,   479,
-     480,     0,   481,   482,   483,     0,     0,   484,     0,     0,
-       0,   485,   486,     0,   487,   488,     0,     0,   489,   490,
-     491,   492,   493,     0,   494,   495,     0,   496,   497,   498,
-       0,     0,   499,   500,   501,   502,   503,   504,   505,   506,
-       0,   507,     0,   508,   509,     0,   510,   511,   512,     0,
-     513,     0,     0,   514,   515,   516,   517,     0,   518,     0,
-     519,   520,   521,   522,   523,     0,   524,   525,     0,     0,
-       0,   526,   527,   528,   529,     0,     0,     0,   530,     0,
-       0,     0,   531,     0,   532,   533,   534,   535,     0,   536,
-     537,   538,   539,   540,     0,     0,     0,     0,     0,   541,
-     542,   543,     0,   544,     0,     0,   545,     0,     0,   546,
-       0,   547,     0,   548,   549,   550,   551,   552,   553,     0,
-       0,   554,   555,     0,     0,   556,   557,   558,   559,   560,
-     561,     0,     0,   562,   563,   564,   565,     0,   566,   567,
-       0,     0,   568,   569,   570,   571,     0,     0,   572,   573,
-       0,   574,   575,   576,   577,     0,     0,     0,     0,     0,
-     578,   579,     0,     0,     0,   580,   581,   582,     0,     0,
-     583,   584,     0,   585,   586,     0,   587,   588,     0,     0,
-     589,     0,     0,   590,     0,   591,     0,   592,   593,     0,
-       0,     0,     0,     0,   594,     0,   595,     0,     0,   596,
-       0,     0,     0,   597,     0,   598,   599,   600,   601,     0,
-       0,     0,     0,     0,     0,   602,   603,   604,     0,   605,
-     606,   607,   608,     0,     0,   609,     0,     0,   610,   611,
-     612,   613,   614,     0,   615,     0,     0,     0,     0,     0,
-       0,     0,     0,   616,   617,   618,     0,   619,   620,   621,
-       0,   622,     0,     0,   623,     0,   624,     0,     0,     0,
-       0,     0,     0,   625,   626,     0,     0,   627,     0,   628,
-       0,   629,   630,     0,     0,     0,   631,   632,   633,   634,
-     635,   636,   637,   638,     0,   639,   640,   641,   642,   643,
-     644,   645,   646,   647,   648,     0,   649,   650,   651,   652,
-     653,   654,   655,   656,   657,   658,   659,   660,   661,   662,
-     663,   664,   665,   666,   667,   668,   669,   670,   671,   672,
-       0,   673,   674,   675,   676,   677,   678,   679,     0,   680,
-     681,   682,   683,   684,   685,   686,   687,   688,   689,   690,
-     691,   692,   693,   694,   695,   696,   697,   698,   699,   700,
-     701,   702,   703,   704,   705,   706,   707,   708,   709,   710,
-     711,     0,     0,     0,     0,     0,   243,   244,  4086,   245,
-     246,   247,   248,   249,   927,   928,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-     929,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,     0,   310,   311,     0,
-     312,   930,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,   931,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   932,   333,
-     334,   933,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   934,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,   935,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,   936,     0,   372,     0,
-       0,     0,   937,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,   938,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,   939,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,     0,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,   940,   477,   478,   479,   941,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,   942,     0,   489,   490,   491,   492,   493,     0,   943,
-     495,     0,   496,   497,   498,     0,     0,   944,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,   945,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,   946,   947,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   948,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,   240,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,   949,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,   950,
-     591,   951,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,     0,     0,
-     639,   640,   641,     0,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,   999,   928,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-     929,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,     0,   310,   311,     0,
-     312,   930,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,   931,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   932,   333,
-     334,   933,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   934,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,   935,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,   936,     0,   372,     0,
-       0,     0,   937,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,   938,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,   939,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,     0,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,   940,   477,   478,   479,  1000,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,   942,     0,   489,   490,   491,   492,   493,     0,   943,
-     495,     0,   496,   497,   498,     0,     0,   944,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,   945,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,   946,   947,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   948,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,   240,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,   949,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,   950,
-     591,   951,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,     0,     0,
-     639,   640,   641,     0,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,   928,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-     929,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,     0,   310,   311,     0,
-     312,   930,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,   931,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   932,   333,
-     334,   933,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   934,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,   935,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,   936,     0,   372,     0,
-       0,     0,   937,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,   938,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,   939,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,     0,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,   940,   477,   478,   479,     0,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,   942,     0,   489,   490,   491,   492,   493,     0,   943,
-     495,     0,   496,   497,   498,     0,     0,   944,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,   945,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,   946,   947,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   948,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,   240,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,   949,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,   950,
-     591,   951,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,     0,     0,
-     639,   640,   641,     0,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,  3161,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   343,   344,   345,   346,   347,  3162,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-    3163,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,     0,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,  3164,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,  1382,  1383,     0,   447,
-     448,     0,     0,  3165,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,  5485,   994,  5486,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,     0,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,  3166,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,  1356,
-    1357,   251,  1358,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,     0,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,  1359,     0,     0,
-    1360,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,  1361,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,  1362,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,  1505,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,  1506,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,  1507,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,  1133,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,  1508,   530,     0,     0,     0,   531,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,   240,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-    2441,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-    2442,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,  1842,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,  1843,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,     0,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,  2444,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,     0,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,  1530,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,  1531,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,  1133,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,   240,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,     0,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,  1690,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
-     448,     0,     0,  1691,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,   809,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,     0,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,  1692,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,  1505,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,  3811,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,  1133,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,   240,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,  1132,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,  1133,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,   240,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,  1134,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,  1132,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,  1133,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,   240,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,  1559,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,  1133,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,   240,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,     0,   260,  1628,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-    1629,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,     0,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,  1401,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,  2954,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,  1133,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,   240,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,  1133,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
-     448,     0,  3236,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,   240,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,  1505,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,  1133,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,   240,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,  1133,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
-     448,     0,  3868,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,   240,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,  1133,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,   240,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,  5406,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,   335,     0,  5407,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,     0,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,     0,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,     0,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,   994,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,     0,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,     0,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,     0,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-    1101,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,  1171,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,  1172,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,     0,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,     0,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,     0,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,  1361,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,  2402,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,     0,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,     0,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,  2537,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,     0,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,     0,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,  3147,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,     0,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,     0,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,  3170,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,     0,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,     0,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,  3201,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,     0,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,     0,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,     0,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,  3266,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,     0,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,     0,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,     0,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   343,   344,   345,  2170,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,     0,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,  2171,   445,   446,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,     0,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,     0,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,     0,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,  5156,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,  1536,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-       0,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,     0,     0,     0,     0,     0,
-     388,   389,     0,     0,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,     0,   529,
-       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,     0,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,  1537,   579,     0,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,     0,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,     0,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,  1536,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-       0,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,     0,     0,     0,     0,     0,
-     388,   389,     0,     0,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,     0,   529,
-       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,     0,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,     0,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,     0,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,  1521,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,  1522,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,     0,   333,
-     334,     0,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,     0,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,   938,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,  1523,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,     0,   477,   478,   479,     0,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,     0,
-     495,     0,   496,   497,   498,     0,     0,     0,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,     0,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,     0,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,   240,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,     0,     0,
-     639,   640,   641,     0,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,  5239,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,  5240,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,     0,   333,
-     334,     0,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,     0,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,   938,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,  5241,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,     0,   477,   478,   479,     0,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,     0,
-     495,     0,   496,   497,   498,     0,     0,     0,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,     0,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,     0,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,   240,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,     0,     0,
-     639,   640,   641,     0,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,  2230,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,     0,   333,
-     334,     0,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,     0,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,   938,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,  2231,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,     0,   477,   478,   479,     0,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,     0,
-     495,     0,   496,   497,   498,     0,     0,     0,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,     0,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,     0,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,   240,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,     0,     0,
-     639,   640,   641,     0,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,  3027,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,     0,   333,
-     334,     0,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,     0,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,   938,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,  3028,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,     0,   477,   478,   479,     0,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,     0,
-     495,     0,   496,   497,   498,     0,     0,     0,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,     0,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,     0,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,   240,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,     0,     0,
-     639,   640,   641,     0,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
-     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,   309,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,     0,   333,
-     334,     0,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,     0,   344,   345,   346,   347,     0,
-       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
-     385,     0,     0,   386,   387,   938,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,     0,     0,     0,     0,   447,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
-       0,     0,   477,   478,   479,     0,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,     0,
-     495,     0,   496,   497,   498,     0,     0,     0,   500,   501,
-     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
-     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,     0,     0,   532,
-     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
-     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,     0,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,   240,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,     0,     0,
-     639,   640,   641,     0,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,     0,     0,   253,   254,   255,   256,
-     257,   258,     0,  -563,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-       0,     0,     0,     0,   268,  5093,     0,   269,   270,     0,
-     271,   272,     0,     0,     0,     0,   275,   276,   277,  5094,
-     279,   280,     0,   281,   282,     0,   283,   284,     0,   286,
-       0,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,     0,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,     0,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,     0,     0,     0,   319,   320,   321,
-       0,  -533,  -533,   322,     0,  -533,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,     0,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,  5095,   343,   344,   345,   346,   347,     0,
-       0,     0,     0,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,     0,   361,     0,     0,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,  5096,     0,   369,     0,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,     0,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,  5097,     0,
-       0,   381,     0,   382,     0,     0,     0,   384,     0,     0,
-     385,  5098,     0,   386,   387,     0,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,  -518,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,     0,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,  5099,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,     0,     0,     0,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,     0,   498,  -518,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,     0,     0,   508,   509,
-       0,   510,   511,   512,  5100,   513,     0,     0,     0,   515,
-     516,   517,     0,   518,     0,   519,   520,     0,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,     0,     0,     0,
-     533,     0,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,     0,
-     550,   551,   552,   553,     0,     0,     0,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,     0,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-       0,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,     0,     0,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,  -518,     0,     0,     0,
-     602,   603,   604,     0,   605,     0,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,     0,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,     0,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,     0,     0,   253,   254,   255,   256,
-     257,   258,     0,  -563,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-       0,     0,     0,     0,   268,  5093,     0,   269,   270,     0,
-     271,   272,     0,     0,     0,     0,   275,   276,   277,  5094,
-     279,   280,     0,   281,   282,     0,   283,   284,     0,   286,
-       0,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,     0,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,     0,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,     0,     0,     0,   319,   320,   321,
-       0,  -554,     0,   322,     0,  -554,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,     0,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,  5095,   343,   344,   345,   346,   347,     0,
-       0,     0,     0,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,     0,   361,     0,     0,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,  5096,     0,   369,     0,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,     0,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,  5097,     0,
-       0,   381,     0,   382,     0,     0,     0,   384,     0,     0,
-     385,  5098,     0,   386,   387,     0,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,  -518,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,     0,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,  5099,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,     0,     0,     0,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,     0,   498,  -518,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,     0,     0,   508,   509,
-       0,   510,   511,   512,  5100,   513,     0,     0,     0,   515,
-     516,   517,     0,   518,     0,   519,   520,     0,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,     0,     0,     0,
-     533,     0,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,     0,
-     550,   551,   552,   553,     0,     0,     0,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,     0,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-       0,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,     0,     0,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,  -554,     0,  -518,     0,     0,     0,
-     602,   603,   604,     0,   605,     0,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,     0,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,     0,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,     0,     0,   253,   254,   255,   256,
-     257,   258,     0,  -563,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-       0,     0,     0,     0,   268,  5093,     0,   269,   270,     0,
-     271,   272,     0,     0,     0,     0,   275,   276,   277,  5094,
-     279,   280,     0,   281,   282,     0,   283,   284,     0,   286,
-       0,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,     0,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,     0,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,     0,     0,     0,   319,   320,   321,
-       0,  -551,     0,   322,     0,  -551,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,     0,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,  5095,   343,   344,   345,   346,   347,     0,
-       0,     0,     0,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,     0,   361,     0,     0,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,  5096,     0,   369,     0,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,     0,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,  5097,     0,
-       0,   381,     0,   382,     0,     0,     0,   384,     0,     0,
-     385,  5098,     0,   386,   387,     0,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,  -518,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,     0,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,  5099,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,     0,     0,     0,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,     0,   498,  -518,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,     0,     0,   508,   509,
-       0,   510,   511,   512,  5100,   513,     0,     0,     0,   515,
-     516,   517,     0,   518,     0,   519,   520,     0,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,     0,     0,     0,
-     533,     0,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,     0,
-     550,   551,   552,   553,     0,     0,     0,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,     0,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-       0,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,     0,     0,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,  -551,     0,  -518,     0,     0,     0,
-     602,   603,   604,     0,   605,     0,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,     0,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,     0,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,     0,     0,   253,   254,   255,   256,
-     257,   258,     0,  -563,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-       0,     0,     0,     0,   268,  5093,     0,   269,   270,     0,
-     271,   272,     0,     0,     0,     0,   275,   276,   277,  5094,
-     279,   280,     0,   281,   282,     0,   283,   284,     0,   286,
-       0,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,     0,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,     0,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,     0,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,  5350,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,     0,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,  5095,   343,   344,   345,   346,   347,     0,
-       0,     0,     0,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,     0,   361,     0,     0,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,  5096,     0,   369,     0,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,     0,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,  5097,     0,
-       0,   381,     0,   382,     0,     0,     0,   384,     0,     0,
-     385,  5098,     0,   386,   387,     0,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,  -518,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,     0,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,  5099,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,     0,     0,     0,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,     0,   498,  -518,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,     0,     0,   508,   509,
-       0,   510,   511,   512,  5100,   513,     0,     0,     0,   515,
-     516,   517,     0,   518,     0,   519,   520,     0,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,     0,     0,     0,
-     533,     0,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,     0,
-     550,   551,   552,   553,     0,     0,     0,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,     0,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-       0,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,     0,     0,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,  -518,     0,     0,     0,
-     602,   603,   604,     0,   605,     0,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,     0,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,     0,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,     0,     0,   253,   254,   255,   256,
-     257,   258,     0,  -563,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-       0,     0,     0,     0,   268,  5093,     0,   269,   270,     0,
-     271,   272,     0,     0,     0,     0,   275,   276,   277,  5094,
-     279,   280,     0,   281,   282,     0,   283,   284,     0,   286,
-       0,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,     0,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,     0,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,     0,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,  -556,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,     0,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,  5095,   343,   344,   345,   346,   347,     0,
-       0,     0,     0,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,     0,   361,     0,     0,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,  5096,     0,   369,     0,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,     0,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,  5097,     0,
-       0,   381,     0,   382,     0,     0,     0,   384,     0,     0,
-     385,  5098,     0,   386,   387,     0,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,  -518,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,     0,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,  5099,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,     0,     0,     0,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,     0,   498,  -518,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,     0,     0,   508,   509,
-       0,   510,   511,   512,  5100,   513,     0,     0,     0,   515,
-     516,   517,     0,   518,     0,   519,   520,     0,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,     0,     0,     0,
-     533,     0,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,     0,
-     550,   551,   552,   553,     0,     0,     0,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,     0,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-       0,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,     0,     0,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,  -518,     0,     0,     0,
-     602,   603,   604,     0,   605,     0,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,     0,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,     0,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,     0,     0,   253,   254,   255,   256,
-     257,   258,     0,  -563,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-       0,     0,     0,     0,   268,  5093,     0,   269,   270,     0,
-     271,   272,     0,     0,     0,     0,   275,   276,   277,  5094,
-     279,   280,     0,   281,   282,     0,   283,   284,     0,   286,
-       0,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,     0,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,     0,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,     0,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,  5411,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,     0,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,  5095,   343,   344,   345,   346,   347,     0,
-       0,     0,     0,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,     0,   361,     0,     0,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,  5096,     0,   369,     0,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,     0,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,  5097,     0,
-       0,   381,     0,   382,     0,     0,     0,   384,     0,     0,
-     385,  5098,     0,   386,   387,     0,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,  -518,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,     0,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,  5099,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,     0,     0,     0,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,     0,   498,  -518,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,     0,     0,   508,   509,
-       0,   510,   511,   512,  5100,   513,     0,     0,     0,   515,
-     516,   517,     0,   518,     0,   519,   520,     0,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,     0,     0,     0,
-     533,     0,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,     0,
-     550,   551,   552,   553,     0,     0,     0,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,     0,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-       0,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,     0,     0,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,  -518,     0,     0,     0,
-     602,   603,   604,     0,   605,     0,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,     0,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,     0,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,     0,     0,   253,   254,   255,   256,
-     257,   258,     0,  -563,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-       0,     0,     0,     0,   268,  5093,     0,   269,   270,     0,
-     271,   272,     0,     0,     0,     0,   275,   276,   277,  5094,
-     279,   280,     0,   281,   282,     0,   283,   284,     0,   286,
-       0,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,     0,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,     0,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,     0,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,  5451,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,     0,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,  5095,   343,   344,   345,   346,   347,     0,
-       0,     0,     0,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,     0,   361,     0,     0,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,  5096,     0,   369,     0,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,     0,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,  5097,     0,
-       0,   381,     0,   382,     0,     0,     0,   384,     0,     0,
-     385,  5098,     0,   386,   387,     0,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,  -518,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,     0,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,  5099,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,     0,     0,     0,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,     0,   498,  -518,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,     0,     0,   508,   509,
-       0,   510,   511,   512,  5100,   513,     0,     0,     0,   515,
-     516,   517,     0,   518,     0,   519,   520,     0,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,     0,     0,     0,
-     533,     0,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,     0,
-     550,   551,   552,   553,     0,     0,     0,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,     0,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-       0,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,     0,     0,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,  -518,     0,     0,     0,
-     602,   603,   604,     0,   605,     0,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,     0,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,     0,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,     0,     0,   253,   254,   255,   256,
-     257,   258,     0,  -563,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-       0,     0,     0,     0,   268,  5093,     0,   269,   270,     0,
-     271,   272,     0,     0,     0,     0,   275,   276,   277,  5094,
-     279,   280,     0,   281,   282,     0,   283,   284,     0,   286,
-       0,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,     0,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,     0,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,     0,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,  -537,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,     0,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,  5095,   343,   344,   345,   346,   347,     0,
-       0,     0,     0,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,     0,   361,     0,     0,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,  5096,     0,   369,     0,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,     0,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,  5097,     0,
-       0,   381,     0,   382,     0,     0,     0,   384,     0,     0,
-     385,  5098,     0,   386,   387,     0,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,  -518,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,     0,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,  5099,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,     0,     0,     0,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,     0,   498,  -518,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,     0,     0,   508,   509,
-       0,   510,   511,   512,  5100,   513,     0,     0,     0,   515,
-     516,   517,     0,   518,     0,   519,   520,     0,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,     0,     0,     0,
-     533,     0,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,     0,
-     550,   551,   552,   553,     0,     0,     0,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,     0,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-       0,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,     0,     0,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,  -518,     0,     0,     0,
-     602,   603,   604,     0,   605,     0,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,     0,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,     0,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,     0,     0,   253,   254,   255,   256,
-     257,   258,     0,  -563,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-       0,     0,     0,     0,   268,  5093,     0,   269,   270,     0,
-     271,   272,     0,     0,     0,     0,   275,   276,   277,  5094,
-     279,   280,     0,   281,   282,     0,   283,   284,     0,   286,
-       0,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,     0,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,     0,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,     0,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,     0,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,     0,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,  5095,   343,   344,   345,   346,   347,     0,
-       0,     0,     0,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,     0,   361,     0,     0,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,  5096,     0,   369,     0,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,     0,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,  5097,     0,
-       0,   381,     0,   382,     0,     0,     0,   384,     0,     0,
-     385,  5098,     0,   386,   387,     0,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,  -518,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,     0,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,  5099,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,     0,     0,     0,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,     0,   498,  -518,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,     0,     0,   508,   509,
-       0,   510,   511,   512,  5100,   513,     0,     0,     0,   515,
-     516,   517,     0,   518,     0,   519,   520,     0,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,     0,     0,     0,
-     533,     0,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,     0,
-     550,   551,   552,   553,     0,     0,     0,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,     0,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-       0,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,     0,     0,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,  -518,     0,     0,     0,
-     602,   603,   604,     0,   605,     0,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,     0,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,     0,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,     0,     0,   253,   254,   255,   256,
-     257,   258,     0,  -563,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-       0,     0,     0,     0,   268,  5093,     0,   269,   270,     0,
-     271,   272,     0,     0,     0,     0,   275,   276,   277,  5094,
-     279,   280,     0,   281,   282,     0,   283,   284,     0,   286,
-       0,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,     0,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,     0,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,     0,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,     0,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,     0,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,  5095,   343,   344,   345,   346,   347,     0,
-       0,     0,     0,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,     0,   361,     0,     0,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,  5096,     0,   369,     0,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,     0,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,  5097,     0,
-       0,   381,     0,   382,     0,     0,     0,   384,     0,     0,
-     385,  5098,     0,   386,   387,     0,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,  -518,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,     0,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,  5099,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,     0,     0,     0,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,     0,   498,  -518,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,     0,     0,   508,   509,
-       0,   510,   511,   512,  5100,   513,     0,     0,     0,   515,
-     516,   517,     0,   518,     0,   519,   520,     0,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,     0,     0,     0,
-     533,     0,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,     0,
-     550,   551,   552,   553,     0,     0,     0,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,     0,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-       0,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,     0,     0,     0,     0,   589,     0,     0,  5353,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,  -518,     0,     0,     0,
-     602,   603,   604,     0,   605,     0,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,     0,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,     0,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,   243,   244,     0,   245,
-     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
-       0,   251,     0,     0,     0,     0,   253,   254,   255,   256,
-     257,   258,     0,     0,     0,     0,     0,   260,     0,     0,
-       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
-       0,     0,     0,     0,   268,     0,     0,   269,   270,     0,
-     271,   272,     0,     0,     0,     0,   275,   276,   277,   278,
-     279,   280,     0,   281,   282,     0,   283,   284,     0,   286,
-       0,   288,   289,   290,   291,   292,   293,     0,   294,   295,
-       0,   296,   297,   298,     0,   300,     0,     0,     0,   301,
-       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
-       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
-       0,   308,     0,     0,     0,     0,     0,   310,   311,     0,
-     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
-     317,     0,     0,     0,     0,     0,     0,   319,   320,   321,
-       0,     0,     0,   322,     0,     0,   324,     0,   325,   326,
-     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
-     334,     0,     0,     0,   336,   337,   338,   339,   340,     0,
-       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
-       0,     0,     0,     0,     0,     0,   350,   351,     0,   352,
-       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
-     358,     0,   359,     0,     0,     0,     0,   361,     0,     0,
-       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
-     368,     0,     0,   369,     0,   371,     0,     0,   372,     0,
-       0,     0,     0,   373,   374,     0,     0,     0,     0,   376,
-       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
-       0,   381,     0,   382,     0,     0,     0,   384,     0,     0,
-     385,     0,     0,   386,   387,     0,     0,     0,     0,     0,
-     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
-       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
-     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
-       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
-     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
-       0,   442,   443,   444,   445,   446,     0,     0,     0,     0,
-     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
-     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
-     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
-     469,   470,     0,     0,     0,     0,   473,   474,     0,   475,
-       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
-       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
-     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
-     495,     0,   496,     0,   498,     0,     0,   499,   500,   501,
-     502,   503,   504,   505,   506,     0,     0,     0,   508,   509,
-       0,   510,   511,   512,     0,   513,     0,     0,     0,   515,
-     516,   517,     0,   518,     0,   519,   520,     0,   522,   523,
-       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
-       0,     0,     0,   530,     0,     0,     0,     0,     0,     0,
-     533,     0,   535,     0,   536,   537,   538,   539,   540,     0,
-       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
-       0,   545,     0,     0,   546,     0,   547,     0,   548,     0,
-     550,   551,   552,   553,     0,     0,     0,   555,     0,     0,
-     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
-     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
-     571,     0,     0,   572,   573,     0,   574,   575,   576,   577,
-       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
-       0,   581,   582,     0,     0,   583,   584,     0,   585,   586,
-       0,     0,     0,     0,     0,   589,     0,     0,   590,     0,
-     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
-       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
-     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
-     602,   603,   604,     0,   605,     0,   607,   608,     0,     0,
-     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
-     618,     0,   619,   620,   621,     0,     0,     0,     0,   623,
-       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
-       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
-       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
-     639,   640,   641,     0,   643,   644,   645,   646,   647,   648,
-       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
-     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
-     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
-     706,   707,   708,   709,   710,   711,  3745,  3746,     0,     0,
-       0,     0,  3747,     0,  3748,     0,  3749,  3750,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  3751,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  3752,     0,     0,  3753,     0,     0,
-       0,     0,     0,     0,     0,  3754,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  3402,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  3755,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  3756,
-       0,  3757,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  3758,  3759,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  3760,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  3761,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  3762,     0,     0,     0,     0,     0,     0,     0,     0,
-    3763,  3764,     0,  3765,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  3766,
-    3767,  3768,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  3769,  3770,
-    3771,     0,     0,     0,     0,  3772,     0,     0,  3773,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  3774,  3775,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    3776,  3777,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  3414,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,  3778,     0,
-       0,     0,  3779,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  3780,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  3781,     0,     0,  3782,     0,     0,
-    3783,  3784,  3785,  3786,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  3787,  3788,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  3789
-};
-
-static const yytype_int16 yycheck[] =
-{
-       6,   878,   891,    44,   115,     0,  1174,     0,  1271,    15,
-    1175,  1162,    18,     0,    43,    44,    22,  1322,  1225,  1071,
-    1167,  1415,   793,    21,    60,    31,     6,  1322,  1675,  1617,
-      57,  2797,    38,  1022,  1023,    41,   116,    97,  1155,  1415,
-      46,    39,  1451,    49,  2183,    43,  3005,    53,  1189,    55,
-    1190,    60,  2661,  1042,  1756,    43,  1244,  1245,  1815,  1049,
-    2396,  2397,  2517,  2518,    19,  1846,  1376,  2148,  2474,    64,
-    2892,  2360,  2148,  3152,  1776,    30,  3210,    64,  1125,  2961,
-      35,  1190,  2433,  2434,  1074,  1273,  3315,  1496,    59,  2789,
-    2430,    97,  1794,  2433,  2434,  2227,  2698,  1285,  1286,  1287,
-    2702,  3064,  2456,  1291,  2458,  2916,  3416,  3262,  1160,  2664,
-    1157,  2173,  1164,  2467,  1724,  1264,  1724,  1724,   754,  1756,
-    1338,  2030,  2031,  3791,  3240,  2947,   121,  2120,  1758,   726,
-     727,   116,  1762,  2703,  2043,  2044,  2045,  1497,  2263,  3695,
-    2861,  2441,  1330,    21,  2222,  2407,  1776,  3648,  1667,  1668,
-    1669,  3033,  2925,  2507,  2664,  2695,  3001,  2511,  1788,  3791,
-    1573,    39,  4399,  2703,  2672,  2227,  1040,  4458,  2240,  4458,
-    2505,  2506,  3567,  2695,  3855,  3324,  2664,  1590,    21,  3811,
-    3812,  2703,  3324,    21,  1597,   191,  2664,  1338,  2971,   121,
-    1603,  1738,    18,    19,    18,    19,    39,  2664,    18,    19,
-      43,    73,   740,   741,  2487,  2488,    52,    22,    22,    73,
-      35,    18,    19,  1420,   220,    21,   222,   125,    11,   225,
-     226,   227,   228,  2832,    18,    19,     9,   863,   864,    71,
-     866,   160,    68,    21,    49,  3018,   242,    18,    19,    71,
-      21,  2444,   222,   879,    71,   225,    29,     5,  2655,    18,
-      19,    34,  4362,  2783,   197,   176,    18,    19,    77,   125,
-    2688,  2689,  2690,    48,   156,  3048,  3049,    59,   194,   906,
-     907,   908,    18,    19,   911,   912,   125,  2705,   915,   176,
-     917,   918,   919,   197,    19,   226,    18,    19,    18,    19,
-     144,    18,    19,   194,  2934,  4339,  1503,    37,   246,    62,
-      37,  1348,  2730,   246,   126,  4175,  2734,   156,   231,  2918,
-      48,    18,    19,    78,  1237,  1238,  1239,   131,    73,   249,
-     276,  2661,  2750,  2751,   235,  1248,    77,   747,  2756,   150,
-      21,   194,   109,  1880,  1229,  1230,   176,  1214,   230,    73,
-     372,   130,    18,    19,  2772,  2773,   156,   163,    39,    21,
-     156,   111,   125,  2781,   125,   992,  1279,    81,    43,  1282,
-      23,   156,   315,    67,    18,    19,   259,   103,   156,   372,
-     372,  2799,    35,   197,   156,   387,   191,    23,  1301,  1302,
-      31,    52,  1305,   156,   176,   156,    49,   162,   180,   194,
-     158,  3174,  3764,  3765,   197,   103,  3768,   111,    61,    62,
-    1323,  1324,   194,  3206,   123,  1328,  1329,   219,   275,    18,
-      19,   150,  2844,   228,  3786,    61,    62,   472,    26,   500,
-    1343,  4587,   194,   285,  2778,    35,   235,   242,   197,   282,
-     156,   387,   194,   483,    18,    19,    57,    21,   156,    18,
-      19,    25,  3752,   287,   194,   160,   156,   571,  3603,    18,
-      19,   198,   241,   156,  3056,   238,   156,   369,    12,   406,
-    3694,   194,   366,   156,   198,   571,   276,  4487,    18,    19,
-      18,    19,  3782,  3783,   246,   235,    84,    18,    19,   219,
-     285,  4284,   219,   582,   614,   238,    18,    19,   276,  1260,
-     128,   204,  2832,   406,   276,  1372,   246,    18,    19,    21,
-     231,   371,   571,  1274,   212,   349,  3289,   428,    18,    19,
-     571,   262,   128,   285,  1403,  1404,    65,   139,   271,    18,
-      19,    73,   464,   571,   571,    18,    19,  3253,   247,    18,
-      19,   428,   502,   186,  1651,   285,  4092,    73,   330,   634,
-    1529,    21,    18,    19,   194,  3100,   388,    19,    18,    19,
-    3361,  1540,   285,    18,    19,   798,   388,   510,   194,   802,
-     386,   388,   386,   389,  4836,   389,   386,  1684,    21,   389,
-     243,  4681,   501,   282,   377,   571,  1566,  3179,  2918,   386,
-    1570,   403,   389,   432,   216,  1575,   562,   130,   428,   565,
-     125,   235,   386,    65,    74,   389,   432,   216,  3597,   387,
-     239,  1198,  1491,  3975,   220,   386,    18,    19,   389,   282,
-     249,   150,   400,   266,  1604,  1605,   536,   386,    18,    19,
-     389,   293,  3348,   469,   386,    23,   640,   389,  4900,   237,
-    4298,   263,   376,   130,   546,   611,   428,    35,   608,  3241,
-     386,    70,    70,   389,   263,   403,   602,  1699,  1700,   285,
-     570,    49,   399,   401,   386,   293,  1545,   389,   192,   386,
-     368,   370,   389,    61,    62,  3590,  3591,   326,  3022,  2958,
-    2959,  4908,  2934,   803,   798,  3600,  3601,   293,  4179,   386,
-     160,   203,   389,    18,    19,   732,  3040,  3041,  3042,  3043,
-    1228,   612,   798,    18,    19,   743,   112,   231,   542,   115,
-    2983,   571,    18,    19,   803,   315,  1342,   256,   803,   331,
-     386,   658,  3791,   389,   322,   434,  3325,   629,   368,  2113,
-     726,   727,   803,   476,   455,   578,  3805,   204,   734,  2123,
-     736,   285,   386,   802,   158,   389,  3547,  2113,   799,  1927,
-    2442,   777,  2444,   605,  1380,   658,  4110,   368,   798,   804,
-     464,  3105,  4772,   392,   608,   235,  2888,  3189,   651,   571,
-     432,   369,   509,   487,  1400,    18,    19,   634,   777,  3324,
-     693,   803,   612,   636,  4884,  4885,  3658,   386,   546,  3661,
-     389,  1969,  5019,   263,   256,  1422,   501,   793,   790,   611,
-    3490,   803,  3492,   734,   614,  4665,   799,   510,   469,   535,
-     753,  2411,   386,  2411,  2411,   389,   510,   386,  3070,  2948,
-     389,  1231,   633,  3219,   630,  4981,   571,   386,  2950,   608,
-     389,   647,  1419,   647,   634,   729,  2888,   647,   562,   594,
-     549,   571,  4635,  3133,   571,  3135,   386,   748,   386,   389,
-     647,   389,  2835,   799,  2925,   386,   634,   582,   389,  2925,
-     627,   636,   634,   647,   386,   803,   722,   389,  4902,   622,
-     803,   803,   868,  2051,   870,   386,   647,  3689,   389,   875,
-      18,    19,   867,   803,  1471,   804,   386,   803,   647,   389,
-     867,  4253,   803,  1480,  2793,   647,   646,   386,  2950,   803,
-     389,  4263,  3675,   386,   633,   803,   389,   386,   636,  4271,
-     389,   647,   803,   909,   655,   656,   803,   716,   914,   801,
-     386,   726,   727,   389,  3321,   647,   386,   647,  2675,   389,
-     647,   386,  5159,   698,   389,   985,   798,   868,   747,  3068,
-    3284,   582,  2049,  3287,   798,  4307,  3139,   600,   546,  3293,
-     647,  3744,  3725,  1838,  3298,  3299,  3300,  3301,  3302,   803,
-    3590,  3481,   801,  3025,   600,  3309,   749,   803,   964,  3387,
-    3314,   803,   625,  3317,   970,   803,  2554,   799,   804,  4124,
-     642,   647,   799,   798,   386,   799,  4210,   389,   984,   985,
-     738,   739,   808,   803,   798,  3325,   386,   695,   174,   389,
-    1913,   801,   799,   647,   799,   801,   803,   748,   749,  3427,
-     803,  3429,  4683,   552,  3807,   799,   801,  1013,   803,   803,
-     562,   803,  1550,   801,  1909,  3443,  1022,  3445,   799,   801,
-    5130,   629,   803,   964,  1030,  1031,   562,   799,   801,  1027,
-     801,  2619,  3460,   510,   803,   803,  3319,   799,   647,   492,
-     753,  2248,  1040,  4006,  1050,  2655,  1126,  2655,  2655,   799,
-     798,   386,  1040,   799,   389,   122,  1167,  1168,  1981,   803,
-    3349,   386,  1985,   647,   389,   608,   799,   799,   647,  3497,
-     386,   803,   799,   389,    64,   801,   803,   803,   647,   613,
-     552,  1022,  4714,   801,  2007,   803,  1092,  1093,  1168,  1030,
-    1031,   801,   799,   803,   633,  1101,   803,   647,   801,   647,
-     803,   801,   582,   803,  4499,  4239,   647,   584,   801,  1050,
-     803,   608,   565,   542,   542,   647,  2897,   371,  2665,  1179,
-     655,   656,   546,  1118,  2047,  1131,   647,   803,   185,  5418,
-      77,  1118,  1127,   386,  4498,   798,   389,   647,   921,   798,
-     748,  1126,  4141,  4142,   125,   799,   293,  1153,   647,   803,
-    3933,  2358,    53,  5444,   647,    25,  1162,  3563,   647,   575,
-     799,  1094,   578,    64,  1224,  4281,   619,   255,  2333,  1175,
-    1155,   647,  5409,  1179,    71,  1181,  1182,   647,  1184,  1174,
-    1186,  1174,   647,   636,  1027,  1191,  2491,  1174,  1194,  1195,
-     799,   638,  1198,  2469,   803,  1127,  2491,  1040,   981,  1205,
-    4125,   200,   600,   193,   987,  2481,   571,   368,  1979,  1215,
-    1216,  1217,  1153,   377,  1220,  1195,   127,  1223,  1224,  4298,
-    1226,  1227,  4371,   290,   803,    18,    19,  1225,   565,  4371,
-    3738,  3739,    18,    19,   803,   647,  2512,   455,   386,    18,
-      19,   389,    44,  1184,     9,  2396,  2397,   647,  2237,   799,
-      87,  2898,  2304,   803,  1260,   803,   455,   160,   799,   197,
-      18,    19,  4045,   179,  2852,  1292,  2542,   799,  1274,  1349,
-    2664,   803,  4154,  4155,   209,  1270,   753,  1092,   464,    18,
-      19,   125,   803,  1270,   153,   432,   486,  2428,  2664,  3643,
-     144,  2432,    11,   803,   379,   164,    85,  2438,   168,  4110,
-    4182,  4183,   365,   366,   803,   372,  4188,  2297,  4190,   377,
-     803,   249,   647,  1096,   803,   262,  1322,  2307,   162,  4164,
-    2310,   574,   647,  2313,    18,    19,   122,   803,   141,   799,
-     400,   647,  1338,  2921,  2922,   138,  1027,   248,   803,    18,
-      19,  1879,  3335,  1379,   432,   798,  4119,   282,   652,  1355,
-    1377,  1378,  1358,  1891,  1381,  1040,   803,  1384,  1385,  1386,
-    4081,  3696,  1389,  1390,  1391,  1392,  1393,  1394,  1395,  1396,
-    1379,  3660,   565,   534,  4157,  3664,  3023,  2148,  3371,  3934,
-    1440,   282,  1225,  1198,  2258,  2525,  2526,    18,    19,    21,
-    5022,   803,  2266,  1399,   647,  4178,   243,  4626,  4627,   799,
-    1406,  1407,  1408,  1409,    52,  1411,  1412,  1413,   379,  4192,
-    1416,  1417,  1418,  1419,  4197,  1421,  2525,  2526,   582,  1425,
-     419,   186,  1420,  3993,  3934,   228,  3688,   417,  1408,  3729,
-     282,  1437,  1412,   798,  1440,  1495,  1416,  3139,    33,  2833,
-    3846,  3847,  1448,  3145,  3583,  1451,  3934,   122,   167,  1455,
-    1456,   432,  1512,  3993,  1452,   371,  3934,  2833,  1399,  3537,
-     517,  2097,  2871,  3602,  1470,  1471,    47,  3934,   803,   723,
-     158,  3993,  1413,  1479,  1480,  2994,  1482,  1483,   803,  2116,
-    4852,   200,  4854,   141,   246,  5041,   292,   803,  3245,  1495,
-    1496,   388,  4062,   563,   290,   642,  1556,  3622,  1504,   647,
-    3632,  3579,  2812,  5135,   293,  1503,  1512,  1448,  2868,   727,
-    3864,  1571,  1541,   188,   276,  1500,   385,   703,   704,  2928,
-     483,  1527,  4062,  2664,   160,  1458,   593,   371,   727,  1535,
-    4646,   344,  2129,  2721,  1225,   332,  4495,   352,  3610,  3611,
-    4062,  3243,  3244,  1541,   219,  1551,  1552,  1553,  1554,  1555,
-    1556,  1557,   354,  1541,  2817,  2818,  5057,   642,   194,  3691,
-    2748,  1567,   497,  1569,  1644,  1571,   565,  2927,  1574,  2787,
-    3632,  1551,  1552,  1553,  1452,  1555,   372,  1420,  2987,  3488,
-    3931,  3932,  3491,  2996,  2997,   100,  1646,  3659,   243,  1569,
-     427,  3931,  3932,   386,  1574,   125,   389,   429,   501,   231,
-     386,    18,    19,   389,  1419,  1665,  3243,   386,  5276,  1452,
-     389,   492,    21,   603,  3244,   290,   258,  5249,  4773,  1625,
-    1626,  4049,    18,    19,   191,   387,    65,  3620,   386,  3691,
-     276,   389,   162,  2269,  1640,   216,  2787,    18,    19,   803,
-    1646,  1424,   768,   400,    18,    19,   500,   386,   454,   481,
-     389,   799,  4254,  1659,   249,  1470,  1471,    18,    19,  1665,
-    1503,   300,   301,  3365,  1479,  1480,  1651,  1482,  4223,   432,
-    1676,   642,   588,   741,   742,  4557,   387,  4559,  2827,   582,
-     275,   369,  5136,  4292,   565,    32,   344,  4498,   604,   636,
-     503,   504,   386,  1688,  4048,   389,  4925,   372,  1541,  1705,
-     419,   570,  1697,  4837,  1710,    26,  3100,   386,   655,   656,
-     389,  3321,   838,  3321,  3321,  5025,  3709,   652,  1659,   571,
-     368,  1727,  1728,   238,  3100,  4305,   278,   571,  4308,  1420,
-     237,     0,    79,    18,    19,  1676,   671,    40,   619,  1554,
-    4506,   387,  1557,   258,  2951,  2952,  2953,   156,    18,    19,
-     137,   246,  4452,    71,   125,   386,   271,   125,   389,   636,
-     421,  1452,   315,    84,  3283,   152,  3285,   798,  3549,  1710,
-     122,    22,   569,  4736,   138,  3294,  3295,  3296,  3297,  4284,
-     636,   276,    18,    19,  3303,  3304,  3305,  3306,  3307,  3308,
-    1819,  3310,  3311,  3312,  3313,   636,  5428,   593,   595,  3318,
-    5029,   748,   749,    18,    19,   444,   445,   154,    18,    19,
-    4315,   355,  1503,   532,   127,   277,  4371,   256,   280,  5097,
-    5098,   469,   231,   455,   209,    18,    19,  4888,   470,   635,
-      18,    19,  4893,   158,  1840,  1841,   188,   158,  2890,   354,
-     602,   371,  3835,    18,    19,   412,   441,   165,   167,   681,
-    1856,  1822,   500,   414,   647,  4989,  1541,  2780,   546,  3253,
-     492,   647,   369,   125,   228,   501,  4677,   586,   647,    18,
-      19,    18,    19,   636,   245,   231,   614,   139,  3154,   122,
-     131,   200,   634,  1889,    18,    19,  1892,  1893,  1894,   647,
-     742,   602,   387,    18,    19,  4184,  1902,   282,   713,   714,
-     715,   614,    71,   456,   485,  5359,   636,   562,   647,   563,
-     565,   653,   237,  1893,  1894,   141,   237,   798,   593,    18,
-      19,    18,    19,  3916,   585,   364,   803,    18,    19,   481,
-    3324,  3207,  2984,   565,  4816,   248,   239,   293,   290,  3215,
-    2992,   629,    18,    19,  3220,   188,   582,   803,  3324,  4454,
-      18,    19,  4292,   647,  3348,  5016,   602,    18,    19,    18,
-      19,   476,   803,    18,    19,    18,    19,   429,   647,   386,
-      18,    19,   389,  1979,  1980,    18,    19,   790,   791,   792,
-     793,   794,   795,    18,    19,    18,    19,   619,  2977,   360,
-     386,   400,  5062,   389,  4422,  5065,   165,  4599,   197,    18,
-      19,   322,  5231,   371,   636,   386,  1132,   156,   389,   160,
-     803,   611,   386,    18,    19,   389,   647,   803,  4369,  4370,
-     372,   696,  4602,   186,   803,   386,  1841,   571,   389,  4369,
-    4370,  2037,   500,   548,   571,     9,  2072,   799,  4119,   546,
-     212,  1856,  3630,  4119,   369,   803,   455,   290,   369,  2055,
-      13,   803,   596,    18,    19,  2082,   400,    31,   373,   542,
-    2096,   448,   804,  2072,   803,   803,   804,   414,  2095,   331,
-     388,  2098,   428,   803,  1889,   798,  4208,  4209,  5356,  5357,
-    2075,   804,  4214,   492,    18,    19,   258,  2096,  2075,   436,
-     803,   804,   479,   400,   614,   534,  2037,  2103,  4387,    13,
-     419,   386,    13,   266,   389,   449,  2112,   602,   708,   803,
-      18,    19,   497,   552,  2055,  4937,   386,   235,   344,   389,
-    5189,   368,   629,  2129,   803,   764,   765,    77,  3522,   372,
-     477,  2191,  2192,  3542,   792,   793,   794,   795,   239,   156,
-     623,  2147,  2148,  2149,  3351,   263,  4208,  4209,   249,  4058,
-     386,  4060,  4214,   389,  2925,  2791,   565,   625,  2164,    18,
-      19,  3398,  2168,   362,   547,   160,   798,    13,   799,   484,
-    2176,   386,  3581,  2179,   389,   366,   386,   140,  2814,   389,
-    2816,  2187,  3419,    18,    19,  2191,  2192,  5257,  4643,  4644,
-    2226,   538,    64,   386,  3951,   732,   389,  5276,   386,  3509,
-     447,   389,    74,  4309,   643,   368,  4312,  4313,  2149,   212,
-     619,   386,   179,   532,   389,   387,  2222,    89,  2224,   388,
-    2226,   546,    18,    19,   415,   546,   140,   636,  2234,   140,
-     647,  4692,    18,    19,    18,    19,  4697,   386,   746,   386,
-     389,   593,   389,  4284,  2250,   628,  2187,    18,    19,    13,
-    2248,   647,   386,  2251,   562,   389,   563,   565,    18,    19,
-    2258,   386,  3567,   197,   389,   571,   647,   586,  2266,  3564,
-    2258,  4560,  3567,   647,  4315,  2281,   784,   508,  2266,   799,
-      18,    19,   400,   803,   799,    13,   647,   386,  5071,   386,
-     389,   392,   389,  2234,   140,   386,  2332,  2112,   389,  5368,
-    5369,    18,    19,   571,   629,  2311,  2312,    13,   629,  2250,
-     386,   125,   262,   389,  2129,  4096,  3504,   230,   386,    18,
-      19,   389,    35,  2332,   138,   386,  3373,   386,   389,    86,
-     389,   386,  2147,   386,   389,  4278,   389,  4691,   386,    18,
-      19,   389,   167,   386,    18,    19,   389,   571,   105,    62,
-     593,   386,  4484,   386,   389,  2361,   389,   492,  2387,   591,
-    2358,  2176,   647,   235,  2179,    18,    19,   386,  4829,   446,
-     389,  2407,  4833,  2379,  4317,   606,   140,   647,   137,  3519,
-     212,   386,   614,  2389,   389,  4791,   803,  4793,  2417,   798,
-    2396,  2397,   801,   152,   803,    19,  2402,  4751,   365,   366,
-    3695,  2407,    18,    19,   371,  2248,  5015,   803,  2251,  3518,
-     122,   647,   140,   125,   228,  2258,    18,    19,   799,   650,
-    2361,   386,  4484,  2266,   389,   799,   732,   748,  4889,  2435,
-     565,   791,   647,  4894,   140,  2441,  2465,   647,   799,   799,
-      21,  2447,  2448,  2449,  2450,  2451,  2452,  2453,  2389,   791,
-      19,  2457,   386,  2459,   647,   389,   533,   799,   235,   647,
-    5069,  5070,    21,  2469,   732,  2471,  2472,    48,  2474,  5252,
-    2476,  2477,   647,  2479,  2480,  2481,   188,   127,   386,  5245,
-    2486,   389,   798,  2489,   619,  2491,   263,   804,  2443,    48,
-    2496,    33,  3544,  2499,  2500,   100,  2311,  2312,   647,  2454,
-     647,   636,    18,    19,  2510,  2460,  2512,   219,   732,   137,
-    2516,  3748,   582,   647,   799,  2358,    77,   141,  3823,   249,
-    2379,  5480,   647,  3140,   152,   194,  2532,   386,  3823,   799,
-     389,  4986,  4987,  3150,  3151,  2490,  2542,  2543,  2479,  2494,
-    3934,  4243,   272,  2402,  3781,    38,  2501,  2502,   647,   798,
-     647,   386,  3789,    46,   389,   804,   647,  2248,  3934,  3796,
-    2251,   103,   806,   799,   790,   791,   792,   793,   794,   795,
-      19,   647,   141,  2258,   680,  2516,   230,   246,   290,   647,
-     122,  2266,   826,   235,   799,   691,   647,  2402,   647,   799,
-     386,   455,   647,   389,   647,   839,   840,   158,   432,   647,
-     386,   212,   386,   389,   647,   389,   799,  3496,  2668,   234,
-     235,   799,   647,   799,   647,   386,   285,   803,   389,   453,
-     563,   588,   125,   680,   799,  4961,   386,  5393,   647,   389,
-     108,  4985,   212,   238,   691,  4392,   261,   604,   680,    18,
-      19,   591,   647,  3633,  3912,   148,   188,  1688,   386,   691,
-    2656,   389,   799,   258,  2660,   636,  1697,   680,   639,  3927,
-     372,   495,  2668,   798,   614,   799,   271,  2358,   691,   386,
-    2676,  2677,   389,   108,   799,  5015,   237,   194,    61,    62,
-    2675,   197,   647,   235,   187,  2500,  3590,   386,    71,   799,
-     389,   565,  2698,   803,   799,  3599,  2702,  2677,   803,  2726,
-     799,    84,   799,   245,  3967,   655,   656,   386,   799,    12,
-     389,  4120,   386,   647,    80,   389,    82,  2532,    18,    19,
-     344,   799,    22,   799,   241,   803,    77,    18,    19,  5069,
-    5070,   799,   167,   386,    61,    62,   389,  4000,  4001,   647,
-     799,   803,   942,   221,   799,   945,   799,   798,   290,   354,
-     950,   799,    61,    62,   799,   955,   799,  2698,   803,   125,
-     798,  2702,    71,  4026,   799,   200,   799,   799,   717,   718,
-     386,   803,   377,   389,  4791,   344,  4793,  2783,  2838,   799,
-     799,  2787,   148,   803,   386,   799,   799,   389,   647,   803,
-     803,  3680,  3681,  3934,   799,   319,   320,  4092,   748,   749,
-     324,   325,   363,   227,   798,   229,  1107,  1108,   369,  1110,
-     798,  1112,   647,   799,    23,   798,    26,   803,   197,  4521,
-    4522,   187,  2828,  2829,  4012,  2820,    35,   655,   656,  4223,
-     372,   131,  2838,  2820,   799,  3952,   798,   799,    26,  2845,
-      49,  2656,  4007,   150,   151,  2660,   799,  4223,  4757,   571,
-     803,   647,    61,    62,   396,  2861,  4375,  4376,  4377,  4378,
-    2866,   647,   798,   647,  2870,  2871,   120,    77,   799,   798,
-     386,   476,   803,   389,    84,  3511,   647,   438,   798,   503,
-     504,   593,  4070,   804,   799,   716,   237,   647,   803,    77,
-     622,   799,   798,   625,  2900,   574,    84,  2933,  2934,   799,
-     798,  2907,  2908,   803,  2845,  5044,   799,   799,   799,   647,
-     803,   803,   803,   212,   799,   393,    33,    64,   803,  2925,
-     798,  2916,  2928,   798,  2933,   403,   492,    74,  2934,   799,
-     647,    13,   410,   803,   503,   504,   798,   103,   455,  2934,
-     799,   799,    89,   548,   667,   803,   669,  2934,   647,   798,
-     122,  2980,   212,  2951,  2952,  2953,   122,  4225,   135,   799,
-      59,     7,  4230,   803,   799,   798,  4234,   177,   647,   798,
-     158,   798,   226,   647,   184,   492,   798,  4371,    13,   799,
-      26,  2987,  2980,   803,   419,   546,   563,   799,  3015,   177,
-    3017,   803,  2980,   799,   647,  4371,   184,   803,   799,   565,
-     799,  3007,   803,   799,   803,   798,  3012,   386,    43,   614,
-     389,   798,   363,   799,   418,   799,   188,   799,   369,   799,
-     798,   803,   188,   803,   141,   799,   799,   237,   799,   803,
-     803,   647,   798,   492,  3070,   798,   514,   598,    84,   799,
-     798,   500,  2525,  2526,   798,   647,   193,   219,   565,   237,
-    3056,   593,   199,   619,   620,   227,   799,   229,   140,    94,
-     803,   799,   798,    98,  3070,  3071,  3072,   798,   629,   798,
-     636,  4480,   799,   439,   799,   653,   803,   176,   803,   245,
-     334,   180,   799,   798,   338,  2900,   386,   438,   235,   389,
-    3096,   345,  2907,  2908,  4259,   194,  4505,   798,   144,   799,
-     799,  5455,   619,   803,   798,  4270,   565,   798,  2951,  2952,
-    2953,   141,   322,    47,    48,  3056,   263,  5471,   290,   636,
-    4109,   798,  4390,  3129,   290,   799,   798,  3133,   798,  3135,
-     565,   647,   249,   611,   322,  3141,   798,  2980,   220,  3145,
-     141,   799,   798,  5497,   480,   803,   799,   798,  3154,  1309,
-    1310,   586,   799,   363,   696,   798,   803,   798,   275,   369,
-     619,   620,  3168,   798,   788,   789,   790,   791,   792,   793,
-     794,   795,   426,  3179,   377,   363,   611,   636,   799,  3185,
-     799,   369,   803,   799,   803,   799,    37,   384,  3129,   803,
-     798,   237,   627,   380,  4499,   546,   246,   799,   799,  4494,
-     372,  3207,   803,   799,  4499,   798,   372,   803,   799,  3215,
-     562,   799,   803,  3219,  3220,   803,   798,   197,   253,   788,
-     789,   790,   791,   792,   793,   794,   795,   344,   798,  3235,
-     396,   330,   798,   480,  3240,  3241,   490,   799,  3179,   141,
-     798,   803,   798,  1737,   798,  1739,  1740,   598,   365,   366,
-    1744,   194,   799,   400,   799,    21,   803,   798,   803,   798,
-    2951,  2952,  2953,  1757,   115,  3271,  1760,  1761,   647,  1763,
-     417,   122,  1766,  1767,  1768,  1769,   322,   798,   629,  1773,
-    3286,   798,   666,   667,  1778,   669,   798,  1601,  1602,  1783,
-    1784,  1785,  1786,  1787,  3374,  2980,   331,  1791,  1792,  3240,
-    3241,   122,   798,  1797,   125,  1799,  1800,  1801,   798,  1803,
-    1804,   798,  1806,   799,   344,  1809,   563,   803,  1812,  1813,
-    3326,   568,   798,   369,   441,   798,    77,    77,   179,   428,
-      64,   799,   798,   798,   100,   803,   546,   188,   798,   798,
-      74,   799,    93,   344,  3350,   803,   799,   647,  4119,   231,
-     803,   492,   799,  3351,  3360,    89,   803,  3363,   546,  3365,
-     395,   111,  4950,   197,   611,   798,  3361,   188,   219,   798,
-    3365,   518,   798,   798,   246,  3370,  3371,   631,  3365,   798,
-     627,  3376,   798,    21,   492,  3326,   503,   504,   798,   798,
-     156,   600,   500,   798,   122,   649,   798,   125,   219,   516,
-     798,   798,  4567,  4568,   450,  4570,   653,  4670,   158,  3350,
-     798,   798,   621,   622,   620,    64,   798,    12,   798,   629,
-    3235,   593,   798,   798,   565,    74,   192,   593,   194,   798,
-    4577,  4578,   457,   458,   459,   460,   461,   462,   463,   290,
-      89,   629,   344,   798,   526,   527,   212,   529,   530,   531,
-     798,   217,   100,   798,   798,   798,   603,   565,   500,   193,
-     188,   377,   100,   500,   212,   231,   548,   804,   803,   290,
-     166,   276,   238,   503,   504,  3481,    35,   798,   619,   194,
-     246,   542,   517,   562,   166,   235,   222,   542,   542,   287,
-     141,   219,   258,   157,  3500,   636,   100,   798,   804,  3559,
-     546,   235,   503,   504,   355,   271,   803,   803,  3351,   798,
-     276,   619,   620,   108,   265,    96,   804,   798,   156,   285,
-    5167,   372,    48,   156,   559,   156,  4415,   197,   636,   263,
-     696,  3537,   127,   111,   799,  3541,  3542,   801,   748,   798,
-     802,   160,  3548,   160,   193,  3360,   160,   803,  3363,   122,
-     199,   372,  3547,  3559,  3590,  3591,   194,  3563,  3564,   249,
-     748,  3567,   290,  3599,  3600,  3601,    48,    64,   293,   195,
-     160,   321,  3567,  3579,   212,  3581,   383,    74,   171,   217,
-    3567,   532,   518,   629,  3590,  3591,   235,   193,   354,   339,
-     238,   342,    89,  3599,  3600,  3601,   708,     7,    71,   158,
-     238,   503,   504,   162,   721,   200,    13,   633,   246,   799,
-     258,   377,   140,   363,   263,   188,   799,   368,    10,   803,
-     258,   387,   804,   271,   799,   799,  3653,   501,   799,   122,
-     799,   799,   125,   271,   238,   799,   799,   798,   276,   275,
-    3646,   708,  3648,   202,   372,   666,   219,   285,   243,   614,
-     377,   562,  3688,   515,   258,   803,  4821,   798,  4823,  4824,
-    3351,    50,   282,   222,    30,   287,   400,   271,   803,   582,
-     803,   788,   789,   790,   791,   792,   793,   794,   795,   430,
-     803,    71,  3688,   417,  3690,   486,   122,   122,  4853,  3695,
-     798,   286,   732,   344,   571,   188,   193,   273,   803,   803,
-     657,   802,   748,   803,   249,   792,   354,   804,   252,   122,
-     476,   560,   181,   194,   803,   194,   354,   290,    88,  4771,
-     571,   141,   803,  3729,   575,   803,   219,   578,   287,    21,
-     803,  3737,   378,  3548,   500,   558,    21,   588,   235,   377,
-     645,   136,   593,   799,    37,   596,  5041,   156,    48,   387,
-     354,   728,   188,   188,   653,   728,   636,   571,   788,   789,
-     790,   791,   792,   793,   794,   795,   263,   803,   417,   799,
-     502,    87,   593,   377,  4925,   188,   315,     7,   798,   110,
-     582,   532,   548,   219,   219,   158,    74,   788,   789,   790,
-     791,   792,   793,   794,   795,   400,   546,   290,   799,   372,
-     400,   400,   582,  3809,   141,   261,   219,   136,   261,   400,
-    4961,   136,   400,   563,    48,   100,   400,  3823,   400,   156,
-    3826,  3827,   115,   382,   419,   400,   584,   618,   476,   122,
-     400,   618,   803,   803,   500,   491,   602,   627,   476,   709,
-    3846,  3847,   798,   798,  3850,   799,  3852,   613,   614,  3855,
-     803,    57,   503,   504,   290,   290,  2350,    27,   447,   418,
-     609,    21,   500,   171,    37,   593,   377,    27,   634,   518,
-     636,   156,   476,   300,   301,     7,   716,   290,  5029,   372,
-     111,   377,   613,   442,  5147,   228,   179,   789,   790,   791,
-     792,   793,   794,   795,    64,   188,     7,  4786,   591,   200,
-     548,    71,   799,   498,    64,    75,  3912,    77,   467,   194,
-     548,    71,   799,   799,   799,    75,   799,    77,   799,    89,
-     417,  3927,   197,  3929,   344,   803,   219,   212,   799,    89,
-     799,   697,   217,   791,   798,  5207,   372,   372,   799,   790,
-     791,  3947,   115,   799,   548,  2439,  5153,   799,   521,   122,
-    3956,   799,   511,   238,   603,   125,   799,   803,   803,   372,
-     799,   246,   799,   799,   602,   125,  5229,   689,   563,   799,
-     565,   803,  2466,   258,   799,   799,   614,   804,   804,   798,
-     141,    15,   804,   542,   795,   798,   271,    21,   798,  2483,
-     799,   276,   804,   192,   160,   803,   634,   290,   636,   803,
-     285,   141,   802,   287,   599,    39,   179,   344,   287,    43,
-     614,   287,   377,   287,   287,   188,   611,   444,   445,   141,
-     593,   287,   803,    57,    58,   803,  2520,  2521,   582,    63,
-     803,   634,   236,   799,  2528,   801,   803,   803,   803,   582,
-     400,   582,   808,   203,    13,   160,   219,   803,   210,   377,
-     197,   197,   582,   582,   455,   255,   432,   194,   804,   697,
-     804,   804,   355,   804,   804,   803,   197,   614,   427,   354,
-     799,    60,  5344,   513,   367,  4081,   607,   803,   371,   372,
-    5231,   799,   404,   503,   504,   194,  4092,   401,   249,  4125,
-     403,   805,   377,   263,   403,   571,   523,   524,   525,   571,
-     593,   571,   387,   263,   668,   341,   803,   379,    60,   249,
-     804,  5416,   707,  4119,  4120,  4110,   477,   290,    77,  4125,
-     263,  5416,   597,   798,   263,   263,   706,   377,   249,   160,
-     672,  5403,  3947,  5405,    93,  5440,    12,   788,   789,   790,
-     791,   792,   793,   794,   795,  5440,   402,   672,   799,  5421,
-     160,   160,    56,   160,  5459,   160,   160,   593,   593,   160,
-     798,   799,    66,   801,  5459,   803,   503,   504,   160,   160,
-     808,   708,    76,  4179,  5479,   134,  2670,   160,   160,   160,
-     593,   160,   355,   344,  5479,   160,    90,    91,    92,   160,
-     160,   476,   160,  5465,  5466,   365,   366,  5362,   371,   372,
-     160,   371,   106,   160,   344,   365,   366,   377,   641,   160,
-     160,   371,   160,   160,   160,   500,   160,   377,   160,  4225,
-    4249,  4227,   344,   160,  4230,   160,   160,   160,  4234,    26,
-      27,    28,   108,   160,   160,   160,   160,  4243,   160,   160,
-     186,   160,   160,   160,   160,   160,   160,   417,  4254,   160,
-     160,   127,   464,   286,   653,   201,   154,   417,   377,  5136,
-     798,   245,   582,   548,    61,    62,    63,   799,   214,   245,
-     804,  4277,   799,   571,    71,  4281,   799,   799,   571,   799,
-      77,   799,   575,   799,   799,   578,    83,    84,   571,   803,
-      87,   804,   804,   571,   804,   588,   804,   654,   108,   798,
-     593,   803,   582,   596,   798,   384,   265,   197,   798,  5477,
-     212,   730,   803,  4254,   111,  4321,  4322,   602,   732,   727,
-     266,   267,   432,   199,   372,   611,   496,   335,   125,   614,
-     156,   798,   129,   798,  4340,   803,   496,   764,   765,   554,
-    4281,   798,   503,   504,    12,   403,   403,   455,   294,   634,
-      73,   636,   803,   532,   532,   532,  4362,   167,   532,   235,
-    4340,   158,   491,   503,   504,   532,   377,   798,   788,   789,
-     790,   791,   792,   793,   794,   795,   546,   263,   263,   799,
-     798,   503,   504,   342,  4390,   614,   546,  3401,   591,  3403,
-     200,   803,   366,   636,   563,   563,  4402,  4392,   571,   372,
-     803,   582,   575,   450,   798,   578,   365,   366,   372,   368,
-     286,   582,   697,   799,   377,   588,   362,   799,   803,   377,
-     593,   798,   212,   596,   798,   235,   798,   798,   472,   333,
-     798,   798,    62,   603,   798,  5324,   798,    21,   235,   247,
-     798,   413,   798,   603,   247,   242,   350,   751,   799,   720,
-     799,   788,   789,   790,   791,   792,   793,   794,   795,   799,
-      48,   803,  4277,   798,   494,   262,  4577,  4578,   687,   799,
-     416,   430,   571,  5462,  4480,    12,   286,   687,   799,   803,
-    4486,   285,  5359,   546,   160,   655,   656,   792,  4494,   384,
-     231,   803,   642,  4499,  4500,   655,   656,   790,   791,  4505,
-     282,   798,   160,  4498,   197,   798,  4321,   803,   799,   799,
-     799,   258,   799,   389,   799,   258,   801,   799,   803,   390,
-      48,   217,   103,   808,   321,  4531,   160,    56,   160,  5418,
-     403,   160,    48,   803,   798,   705,   160,    66,   798,   228,
-    4546,   103,   339,   245,   278,   705,   804,    76,   111,   368,
-     111,   162,   798,   400,   798,   125,   798,   729,   798,   729,
-     798,    90,    91,    92,   799,   440,   798,    35,   565,   729,
-     790,   383,   403,   532,   798,   377,   582,   106,   748,   749,
-     372,  4587,   377,   515,   488,  4591,   799,  4402,   748,   749,
-    3084,   245,  3086,  4599,  5471,   636,   197,   394,   799,   400,
-     432,   799,   799,   799,   414,   799,   403,   210,    21,   419,
-     377,   246,   269,   799,   803,   582,   804,   790,   791,   803,
-    5497,   197,   498,   808,   697,   798,   808,   788,   789,   790,
-     791,   792,   793,   794,   795,   258,   258,   258,   403,   160,
-    4646,   126,   518,   808,   277,    48,   550,   403,   788,   789,
-     790,   791,   792,   793,   794,   795,    48,    48,  4599,   153,
-      48,   477,   792,   567,   798,    35,   788,   789,   790,   791,
-     792,   793,   794,   795,    35,  4681,   625,  4683,  4684,   729,
-     608,   125,  4677,   263,    64,   482,   203,   563,   498,   565,
-     158,   263,   568,    35,   162,   372,    18,    19,   798,   116,
-     117,   118,   119,   120,   415,  4646,   372,  4713,   518,  4769,
-     377,    77,   377,    21,   804,   798,  4722,   799,   487,   515,
-     754,   799,   803,   599,   799,   759,   803,   603,   799,   799,
-     799,   799,  3746,  3747,   202,   611,   341,  3751,   799,   799,
-     265,   538,   539,   540,   541,   427,    48,   803,   387,   546,
-     799,   377,   175,   563,   222,   789,   384,   210,   568,   160,
-     161,  3255,   285,  4769,    35,    21,   563,   565,   147,   566,
-    4776,   805,   799,  3787,   258,   258,   586,   653,   798,  3793,
-    3794,  3795,   798,   160,  3798,  4791,   405,  4793,   803,   599,
-    4831,    62,   120,   120,   116,   117,   118,   119,   120,   799,
-     201,   611,    48,    48,   333,   602,   223,   224,   225,   226,
-      48,   377,   387,   214,   619,   372,   367,   627,   798,   287,
-     620,   350,    15,    21,    81,   803,   510,   143,   372,   863,
-     864,   707,   866,   867,   228,   403,  3330,  3331,  3332,  3333,
-     194,   112,   803,   653,   115,   879,   799,   803,   372,    21,
-    4856,   341,   123,   254,   799,   798,   173,    48,   799,   377,
-     194,   263,   384,    21,   804,   803,   267,   160,  5223,   798,
-     276,   142,   162,   318,   636,    48,   799,   397,  4884,  4885,
-     673,   472,   149,   112,   162,   798,   636,   799,   608,   136,
-     799,   798,   798,   294,   799,   803,   799,   707,   799,   798,
-     573,   223,   224,   225,   226,   798,   798,   798,   136,   136,
-     798,   377,   537,   691,   382,   158,   799,   334,   189,   336,
-     337,   338,   803,   483,  4951,   483,   678,   724,   345,   653,
-     691,   691,  5287,    48,   205,  4976,    48,   534,   798,   554,
-     974,  4947,   471,   155,    32,   633,   805,  5302,    64,   384,
-     418,   748,   749,    64,   799,  4961,    19,   358,   702,   488,
-    5315,  4776,   481,   799,   553,   197,    32,   143,   384,   633,
-     384,   799,   134,   691,   442,  4981,   483,   228,   688,  1013,
-     701,     6,   464,   246,   377,   154,   801,   377,    48,   260,
-     171,   608,   130,  1027,   154,   633,   230,   292,   805,   467,
-     124,   231,   801,   702,    54,   574,  1040,   143,   279,   426,
-     801,   798,   334,  5042,   336,   337,   338,   372,   574,  5374,
-     154,   550,   803,   345,   801,   215,   500,    54,   154,  5384,
-     194,   194,   574,   194,  5389,  5041,   454,  5043,   567,   635,
-     125,   377,   698,   511,  5050,  5051,   803,   196,  5104,  3526,
-    3280,  5057,  3274,  3276,  4683,  4686,  3291,  3278,  4691,  3925,
-    3722,  4696,  4711,  5017,   386,  5310,  5072,   389,  5423,  5134,
-    5425,  1230,   489,   490,   542,   346,   347,   348,  5084,  1733,
-    5311,  5497,   353,  4713,  4907,   356,  5455,    46,  5094,  1082,
-    2866,  5467,  5447,  5099,   562,  4081,  5003,   565,  2924,  5371,
-    5003,  5003,  5280,  5003,   426,  5003,  5371,  5003,  5003,  5104,
-    5357,  5104,  5003,  5003,  5003,  5003,  5003,  5104,  5003,  5306,
-    5305,  2432,  3934,  1189,  5130,  2438,  4371,  5482,  5483,  3522,
-    4223,  2657,  5487,  4392,  3371,  3376,    15,   408,   409,  4174,
-    4810,  3370,  5254,  4584,  5333,  5172,  5266,  5264,  4976,  3954,
-    2411,  2525,  3365,  4243,  4295,  5153,  3765,  4244,  3798,  3797,
-    5003,  4613,  5276,   434,  4298,  5042,  3477,   489,   490,  1203,
-    3141,  4829,  4980,  4889,  4894,  4843,  4833,  5183,  1888,  4270,
-    5186,  4591,  4388,  3051,    63,  3940,  3353,  3044,  2526,  4663,
-    1707,  1225,  2526,  5199,  2525,  2319,  1670,  2913,  3171,  1233,
-    1234,  1088,  2321,  3829,  1866,  2907,  1841,  3271,  1242,  1243,
-    1244,  1245,  1246,  1247,   631,  3548,  2897,  4097,    64,  2229,
-    5226,  1255,  1256,  5264,  1258,  1259,  1014,  2382,  1013,  1263,
-    1264,   648,   649,  1267,  1268,  1269,  1270,   508,  1272,  1273,
-    2103,  5247,  5183,  1355,  4413,  5186,  1280,  1281,  4946,  1283,
-    1284,  1285,  1286,  1287,  5097,  5098,  1290,  1291,  1292,  1293,
-    1294,  1295,  1296,  1297,  1298,  2035,  1300,  2787,  5231,  1303,
-    1304,  2826,  1274,  4925,  1308,  2934,  5418,  2934,  1312,  1313,
-    1314,  5324,  5247,  5444,  4795,  5226,  2934,  4524,  2934,  5050,
-    3850,  1325,  1326,  1327,  5051,  4153,  1330,  4533,  1625,  1333,
-    1334,  1335,  1336,  1337,  4947,  3823,  5333,   578,  1342,   631,
-    5153,  3606,  5003,  4752,  4920,  1101,    16,  1248,  5003,  4827,
-    1354,  1355,  2833,  2389,  2113,   647,   648,   649,  1362,  3547,
-    1364,  1365,  1174,  1174,  1460,   606,  3547,  4502,  4116,  3545,
-    4485,  1174,  1376,  1377,  1378,  4494,  1380,  1381,  1170,  1174,
-    1384,  1385,  1386,  1706,  1623,  1389,  1390,  1391,  1392,  1393,
-    1394,  1395,  1396,  5206,  5207,  2305,  1400,   983,  2306,  2854,
-    5376,  1405,  1588,  2202,  3235,  3551,  5244,  5383,   649,  4204,
-    5223,  2201,  1171,  5323,  4574,  5459,  1420,  5479,  4454,  4315,
-    4499,  4798,  4386,  3071,  2251,  1539,  1358,  3286,  5239,    43,
-    2266,  2980,    43,  2900,  1537,  2246,  5097,  5098,    39,  2244,
-    5416,  2668,  5097,  5098,   999,  1452,  5422,  3039,  1452,  3913,
-    3914,  5427,  4766,  2669,  1665,  4930,  1163,  1499,  1002,    11,
-    5436,    11,  3943,  4332,  5440,  3837,  1230,  5255,  4389,  4706,
-    3840,    -1,    -1,    -1,  5287,    -1,  1230,  1230,    -1,    -1,
-      -1,    -1,    -1,  5459,    -1,    -1,    -1,    -1,    -1,  5302,
-      -1,    -1,  5153,    -1,    -1,  5471,    -1,    -1,    -1,  1503,
-      -1,    -1,  5315,  5479,    -1,    -1,  1510,    -1,    -1,    -1,
-      -1,    -1,  5477,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    5477,  5497,    -1,    -1,    -1,  5436,    -1,    -1,    -1,    -1,
-      -1,  5344,    -1,    -1,    -1,    -1,    -1,  1541,    -1,  1543,
-      -1,    -1,  1546,  5356,  5357,  5206,  5207,    -1,    -1,    -1,
-      -1,  5206,  5207,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  5374,  5223,    -1,    -1,    -1,    -1,    -1,  5223,    -1,
-      -1,  5384,    -1,    -1,    -1,    -1,  5389,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    5403,    -1,  5405,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5421,    -1,
-    5423,    -1,  5425,    -1,    -1,    -1,    -1,    -1,  1622,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  5287,    -1,    -1,    -1,
-      -1,    -1,  5287,    -1,  5447,    -1,    -1,  1641,    -1,    -1,
-      -1,  5302,    -1,    -1,    -1,    -1,    -1,  5302,    -1,    -1,
-      -1,    -1,  5465,  5466,  5315,    -1,    -1,    -1,    -1,    -1,
-    5315,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5482,
-    5483,    -1,    -1,    -1,  5487,    -1,    -1,    -1,    -1,    -1,
-      -1,  1685,    -1,  5344,    -1,    -1,    -1,    -1,    -1,  5344,
-      -1,    -1,    -1,    -1,    -1,  5356,  5357,    -1,    -1,    -1,
-      -1,  5356,  5357,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  5374,    -1,    -1,    -1,    -1,    -1,  5374,
-      -1,    -1,    -1,  5384,    -1,    -1,    -1,    -1,  5389,  5384,
-      -1,    -1,    -1,    -1,  5389,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  5403,    -1,  5405,    -1,    -1,    -1,  5403,    -1,
-    5405,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    5421,    -1,  5423,    -1,  5425,    -1,  5421,    -1,  5423,    -1,
-    5425,    -1,   232,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  5447,    -1,    -1,    -1,
-      -1,    -1,  5447,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  5465,  5466,    -1,    -1,    -1,    -1,
-    5465,  5466,    -1,    -1,    -1,    -1,    -1,    -1,    21,    -1,
-      -1,  5482,  5483,    26,    27,    28,  5487,  5482,  5483,  4293,
-    4294,    -1,  5487,    -1,    -1,   295,   296,   297,   298,   299,
-     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
-     310,   311,   312,   313,   314,    -1,   316,   317,    -1,    -1,
-      63,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    77,    -1,    -1,    -1,    -1,    -1,
-      83,    84,    -1,    -1,    87,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   111,    -1,
-     759,  1915,    -1,    -1,    -1,  1919,    -1,    -1,    -1,    -1,
-      -1,    -1,   125,  1927,    -1,  1929,   129,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,     4,    -1,    -1,
-     789,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   156,    21,   158,   805,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  1969,    -1,    -1,    -1,    -1,
-      -1,    -1,    39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   444,   445,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2013,
-    2014,  2015,    -1,    -1,    -1,    -1,    -1,    -1,   867,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   231,    -1,
-      -1,    -1,   235,    -1,    -1,    -1,    -1,    -1,    -1,   242,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2051,    -1,    -1,
-      -1,    -1,  2056,    -1,    -1,    -1,    -1,    -1,    -1,   262,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  2075,   275,    -1,    -1,    -1,    -1,    -1,  2082,    -1,
-      -1,    -1,    -1,  2087,    -1,  2089,    -1,    -1,    -1,    -1,
-      -1,  2095,    -1,  2097,  2098,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   321,    -1,
-      -1,    -1,    -1,    -1,    -1,   974,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   339,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  1013,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   394,    -1,    -1,    -1,    -1,    -1,   400,    -1,    -1,
-     403,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  2248,    -1,    -1,  2251,    -1,    -1,
-     710,   711,   455,    -1,  2258,  2259,    -1,    -1,    -1,  2263,
-      -1,    -1,  2266,    -1,    -1,  2269,    -1,    -1,    -1,    -1,
-      -1,   731,    -1,   733,   734,   735,   736,   737,    -1,   482,
-     740,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   492,
-     750,    -1,    -1,    -1,    -1,   755,   756,   757,   758,   759,
-     760,   761,   762,   763,   764,   765,   766,   767,   768,   769,
-     770,   771,   772,   773,   774,   775,   776,   777,   778,   779,
-     780,   781,   782,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   538,   539,   540,   541,    -1,
-      -1,    -1,    -1,   546,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  2358,    -1,    -1,    -1,    -1,    -1,
-     563,    -1,   565,   566,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  4839,  4840,  4841,    -1,    -1,
-      -1,    -1,    -1,    -1,  1233,  1234,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  1242,  1243,    -1,    -1,  1246,  1247,   602,
-      -1,    -1,    -1,    -1,    -1,    -1,  1255,  1256,    -1,  1258,
-    1259,    -1,    -1,    -1,  1263,    -1,   619,    -1,  1267,  1268,
-    1269,  1270,    -1,  1272,    -1,    -1,  2430,    -1,    -1,  2433,
-    2434,  1280,  1281,   636,  1283,  1284,    -1,    -1,    -1,    -1,
-      -1,  1290,    -1,    -1,  1293,  1294,  1295,  1296,  1297,  1298,
-      -1,  1300,    -1,    -1,  1303,  1304,    -1,    -1,    -1,  1308,
-      -1,    -1,    -1,  1312,  1313,  1314,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  1325,  1326,  1327,    -1,
-      -1,    -1,    -1,    -1,  1333,  1334,  1335,  1336,  1337,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  4968,  1354,  1355,  4971,  4972,  4973,
-    4974,    -1,    -1,  1362,    -1,  1364,  1365,    -1,    -1,    -1,
-      -1,   724,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  2546,    -1,    -1,   748,   749,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  1405,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  5058,   798,    -1,    -1,   801,    -1,
-      -1,    -1,    -1,  5067,  5068,    26,    27,    28,    -1,    -1,
-      -1,    -1,  5076,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    63,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    77,    -1,    -1,    -1,
-      -1,  1510,    83,    84,    -1,    -1,    87,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2683,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2692,  2693,
-     111,    -1,    -1,    -1,  1543,    -1,    -1,  1546,    -1,    -1,
-      -1,    -1,    -1,    -1,   125,    -1,    -1,    -1,   129,  2713,
-    2714,    -1,  2716,    -1,    -1,  2719,  2720,  2721,  2722,  2723,
-      -1,    -1,  2726,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  2735,    -1,    -1,    -1,    -1,  2740,   158,  2742,    -1,
-    2744,  2745,    -1,  2747,  2748,    -1,    -1,    -1,  2752,  2753,
-    2754,    -1,    -1,    -1,  2758,  2759,  2760,    -1,  2762,    -1,
-    2764,    -1,  2766,    -1,  2768,    -1,  2770,    -1,    -1,    -1,
-      -1,  2775,    -1,  1622,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2791,    21,    -1,
-      -1,    -1,  1641,    26,    27,    28,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2812,    -1,
-    2814,    -1,  2816,    -1,   235,    -1,  2820,    -1,    -1,    -1,
-      -1,   242,  2826,  2827,    14,    -1,    -1,    17,    -1,    -1,
-      63,    -1,    -1,    -1,    -1,    -1,  1685,    -1,    -1,    -1,
-      -1,   262,    32,    -1,    77,    -1,    36,    -1,    -1,    -1,
-      83,    84,    -1,    -1,    87,    -1,    -1,    -1,    -1,    -1,
-      50,    51,    -1,    -1,    -1,    -1,    -1,    -1,    58,    -1,
-      -1,    -1,    -1,    63,    64,    -1,    -1,    -1,   111,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    79,
-      -1,    -1,   125,    -1,    -1,    -1,   129,    -1,  2902,    -1,
-     321,    -1,    -1,    -1,   971,    -1,    -1,    -1,    -1,    99,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   339,    -1,
-      -1,    -1,    -1,   156,    -1,   158,    -1,    -1,    -1,    -1,
-      -1,   121,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   131,   132,    -1,    -1,    -1,    -1,  2951,  2952,  2953,
-      -1,    -1,    -1,   143,   144,    -1,    -1,    -1,    -1,    -1,
-    1027,    -1,    -1,    -1,    -1,    -1,   156,    -1,    -1,    -1,
-      -1,    -1,    -1,   394,    -1,    -1,  2980,    -1,    -1,    -1,
-     170,    -1,   403,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   231,    -1,
-     190,  3005,   235,    -1,    -1,    -1,    -1,    -1,    -1,   242,
-      -1,  3015,    -1,  3017,    -1,    -1,    -1,    -1,   208,    -1,
-     210,    -1,    -1,    -1,    -1,   215,    -1,  1094,   218,   262,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   233,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   241,    -1,    -1,   244,    -1,    -1,    -1,    -1,    -1,
-    3064,   482,    -1,    -1,    -1,    -1,  1915,    -1,    -1,    -1,
-    1919,    -1,    -1,    -1,   264,    -1,    -1,    -1,    -1,    -1,
-    1929,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   321,    -1,
-      -1,   281,    -1,    -1,    -1,   285,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   339,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   538,   539,   540,
-     541,    -1,    -1,    -1,    -1,   546,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   563,    -1,    -1,   566,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1225,    -1,
-      -1,   394,    -1,    -1,  2013,  2014,  2015,   400,    -1,    -1,
-     403,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   602,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   381,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2056,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   455,    -1,   414,    -1,  2075,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   425,    -1,    -1,  2087,    -1,
-    2089,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   482,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   447,    -1,   492,
-     450,    -1,   452,    -1,    -1,   455,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   465,   466,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   475,    -1,   477,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   486,    -1,    -1,    -1,
-      -1,    -1,   492,   724,    -1,   538,   539,   540,   541,    -1,
-     500,    -1,    -1,   546,    -1,   505,   506,   507,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   748,   749,    -1,
-     563,    -1,   565,   566,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3351,   538,    -1,
-      -1,    -1,    -1,  1420,    -1,   545,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   602,
-      35,    36,    -1,    -1,    -1,   565,    -1,    -1,    -1,    -1,
-      -1,  3385,    -1,    -1,    -1,  1452,   619,    -1,    -1,  3393,
-      -1,  1458,    -1,    -1,    -1,    -1,    61,    62,    -1,   589,
-      -1,    -1,    -1,   636,    -1,  1472,    -1,    72,    73,    -1,
-    2259,   601,    -1,    -1,  2263,   605,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   613,    -1,    -1,  3430,  3431,    -1,   619,
-      -1,    -1,    97,    -1,    99,    -1,  1503,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   109,    -1,   636,    -1,    -1,    -1,
-      -1,    -1,  3456,    -1,   644,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  3466,    -1,  3468,    -1,  3470,    -1,    -1,    -1,
-     660,   661,   662,   663,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   675,    -1,    -1,    -1,    -1,
-      -1,   724,   157,   158,    -1,    -1,    -1,    -1,   163,    -1,
-    3504,   166,    -1,    -1,    -1,  3509,    -1,  3511,    -1,    -1,
-      -1,   176,    -1,    -1,    -1,   748,   749,    -1,    -1,    -1,
-      -1,    -1,   712,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   198,    -1,   200,    -1,    -1,    -1,    -1,
-      -1,  3545,    -1,    -1,   209,    -1,   211,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   752,    -1,    -1,   798,    -1,    -1,   801,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3582,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    1667,  1668,  1669,    -1,    -1,    -1,    -1,    -1,   798,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   282,  3622,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3653,
-     315,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  2546,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   380,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  3728,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   407,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   418,   419,    -1,   421,   422,   423,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   443,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   497,    -1,  2683,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  2692,  2693,   510,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  2713,  2714,    -1,  2716,    -1,    -1,
-    2719,  2720,  2721,  2722,  2723,    -1,    -1,   542,    -1,    -1,
-      -1,   546,    -1,    -1,    -1,    -1,  2735,    -1,    -1,    -1,
-      -1,  2740,    -1,  2742,    -1,  2744,  2745,   562,  2747,    -1,
-     565,    -1,    -1,  2752,  2753,  2754,    -1,    -1,    -1,  2758,
-    2759,  2760,    -1,  2762,    -1,  2764,    -1,  2766,    -1,  2768,
-     585,  2770,    -1,    -1,    -1,    -1,  2775,  3931,  3932,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    14,    -1,    -1,
-      17,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   623,    -1,
-      -1,    -1,    -1,    -1,    -1,   630,    -1,  3971,    -1,    36,
-      -1,  2820,    -1,    -1,    -1,    -1,    -1,  2826,    -1,    -1,
-      -1,    -1,    -1,    50,    51,    -1,    -1,    -1,    -1,    -1,
-      -1,    58,    -1,    -1,    -1,    -1,    63,    64,    -1,    -1,
-    4004,    -1,  4006,    -1,    -1,  4009,  4010,    -1,  4012,    -1,
-      -1,    -1,    79,    -1,    -1,    -1,    -1,    -1,    -1,  4023,
-      -1,    -1,    -1,    -1,  4028,    -1,    -1,  4031,    -1,    -1,
-    4034,  4035,    99,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  4056,  2902,   121,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   131,   132,  4070,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   143,   144,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   753,   754,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   170,    -1,    -1,    -1,    -1,    -1,    -1,
-    2177,  2178,  4116,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   190,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   208,    -1,   210,    -1,    -1,  4150,  4151,   215,    -1,
-      -1,   218,    -1,    -1,    -1,    -1,  3005,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   233,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   241,    -1,    -1,   244,    -1,    -1,
-      -1,  2248,    -1,    -1,  2251,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   264,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2276,
-      -1,    -1,    -1,    -1,   281,  3064,    -1,    -1,   285,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  4235,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  2358,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   381,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  4337,  4338,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   414,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   425,    -1,
-    2427,    -1,    -1,    -1,  2431,  4369,  4370,    -1,    -1,  2436,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     447,    -1,    -1,   450,    -1,   452,    -1,    -1,   455,    -1,
-      -1,    -1,    -1,    -1,  2461,  2462,  2463,  2464,   465,   466,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   475,    -1,
-     477,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   486,
-      -1,    -1,    -1,    -1,    -1,   492,  2493,    -1,    -1,    -1,
-      -1,    -1,    -1,   500,    -1,    -1,    -1,    -1,   505,   506,
-     507,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    2517,  2518,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   538,    -1,    -1,    -1,    -1,    -1,    -1,   545,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  4495,    -1,    -1,    -1,    -1,    -1,    -1,   565,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  4515,    -1,  4517,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   589,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   601,    -1,  3385,    -1,   605,    -1,
-      -1,    -1,    -1,    -1,  3393,    -1,   613,    -1,    -1,    -1,
-      -1,    -1,   619,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   636,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   644,    -1,    -1,
-      -1,  3430,  3431,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3456,   675,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3466,    -1,  3468,
-      -1,  3470,    -1,    -1,  4628,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   712,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  4660,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    34,    35,    -1,    -1,
-      -1,    -1,    40,    -1,    42,    -1,    44,    45,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  3545,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    62,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   798,  4736,  3582,    -1,  4739,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4752,    -1,
-      -1,    -1,    -1,    -1,   112,    -1,    -1,   115,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   123,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  3622,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   142,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  4798,    -1,    -1,    -1,    -1,    -1,
-      -1,   159,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   187,
-      -1,   189,    -1,    -1,    -1,    -1,  2903,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   205,   206,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3728,
-      -1,    -1,    -1,    -1,  2951,  2952,  2953,    -1,    -1,   247,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   260,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  4920,    -1,    -1,    -1,
-      -1,   279,    -1,    -1,    -1,    -1,    -1,  2994,    -1,    -1,
-     288,   289,    -1,   291,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4951,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   327,
-     328,   329,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   346,   347,
-     348,    -1,    -1,    -1,  4998,   353,    -1,    -1,   356,  5003,
-      -1,    -1,    -1,    -1,    -1,  5009,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   374,   375,    -1,    -1,
-    3087,    -1,    -1,    -1,    -1,    -1,    -1,  5031,    -1,    -1,
-      -1,    -1,  3099,    -1,  3101,  3102,  3103,  3104,    -1,  3106,
-    3107,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     408,   409,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   434,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  5091,    -1,    -1,
-      -1,    -1,    -1,  5097,  5098,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  3180,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  3971,    -1,    -1,    -1,  3193,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  5140,    -1,   496,    -1,
-      -1,    -1,   500,    -1,    -1,    -1,    -1,    -1,    -1,  5153,
-      -1,    -1,    -1,    -1,   512,  4004,    -1,  4006,    -1,    -1,
-    4009,  4010,    -1,    -1,    -1,    -1,    -1,    -1,  5172,    -1,
-      -1,    -1,    -1,    -1,  4023,    -1,    -1,    -1,    -1,  4028,
-      -1,    -1,  4031,    -1,    -1,  4034,  4035,    -1,  5192,    -1,
-    5194,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    5204,    -1,  5206,  5207,    -1,    -1,    -1,  4056,    -1,    -1,
-      -1,    -1,    -1,    -1,   572,    -1,  3283,   575,  3285,  5223,
-     578,   579,   580,   581,    -1,    -1,    -1,  3294,  3295,  3296,
-    3297,    -1,    -1,    -1,    -1,    -1,  3303,  3304,  3305,  3306,
-    3307,  3308,    -1,  3310,  3311,  3312,  3313,    -1,    -1,  3316,
-      -1,  3318,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   621,   622,    -1,    -1,  4116,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  5285,    -1,  5287,  3351,    -1,    -1,    -1,    -1,    -1,
-      -1,   649,    -1,    -1,    -1,    -1,    -1,    -1,  5302,  5303,
-      -1,  4150,  4151,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  5315,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5333,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5343,
-    5344,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  5356,  5357,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    5374,    -1,    -1,    -1,    -1,    -1,    -1,  5381,    -1,    -1,
-    5384,    -1,    -1,    -1,    -1,  5389,  4235,    -1,    -1,    -1,
-      -1,    -1,  5396,    -1,    -1,    -1,    -1,    -1,    -1,  5403,
-      -1,  5405,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  5421,    -1,  5423,
-      -1,  5425,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  5447,    -1,   803,    -1,    -1,    -1,    -1,
-       7,    -1,    -1,    -1,    -1,    12,    -1,    14,    -1,    -1,
-      17,  5465,  5466,    -1,    -1,    -1,    -1,    -1,  5472,    26,
-      27,    28,    -1,    -1,    -1,    -1,  5480,    -1,  5482,  5483,
-      -1,    -1,    -1,  5487,    -1,    -1,    -1,    -1,  4337,  4338,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    58,    -1,    -1,    61,    62,    63,    64,    -1,    -1,
-      -1,    -1,    69,    -1,    71,    -1,    -1,    -1,    -1,    -1,
-      77,    -1,    -1,    -1,    -1,    -1,    83,    84,    -1,    -1,
-      87,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    96,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   111,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   125,    -1,
-      -1,    -1,   129,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     137,   138,    -1,    -1,    -1,    -1,    -1,   144,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   152,  3663,    -1,    -1,    -1,
-      -1,   158,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   169,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    3697,    -1,    -1,    -1,    -1,   192,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,     7,    -1,  4495,    -1,    -1,    12,
-      -1,    14,    -1,    -1,    17,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    26,    27,    28,  4515,    -1,  4517,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   233,    -1,   235,    -1,
-      -1,    -1,    -1,    -1,    -1,   242,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    58,    -1,    -1,    -1,    -1,
-      63,    64,    -1,    -1,    -1,   262,    69,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    77,    -1,    -1,    -1,    -1,    -1,
-      83,    84,    -1,    -1,    87,    -1,    -1,    -1,   285,    -1,
-      -1,    -1,    -1,    96,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   111,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   125,    -1,   321,    -1,   129,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   137,   138,    -1,    -1,    -1,  4628,
-      -1,   144,   339,    -1,    -1,    -1,   343,    -1,    -1,   152,
-      -1,  3858,    -1,    -1,    -1,   158,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   169,    -1,    -1,    -1,
-      -1,  4660,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   381,    -1,    -1,    -1,    -1,   192,
-     387,    -1,    -1,    -1,    -1,    -1,    -1,   394,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   403,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  3930,    -1,    -1,    -1,    -1,    -1,    -1,
-     233,    -1,   235,    -1,    -1,    -1,    -1,    -1,   435,   242,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4736,    -1,    -1,
-    4739,    -1,    -1,   450,   451,   452,    -1,    -1,    -1,   262,
-      -1,    -1,    -1,  4752,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   285,    -1,    -1,   482,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4798,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   321,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   339,    -1,    -1,    -1,
-     343,   538,   539,   540,   541,    -1,    -1,    -1,    -1,   546,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   563,    -1,    -1,   566,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   381,    -1,
-      -1,    -1,    -1,    -1,   387,    -1,    -1,    -1,    -1,    -1,
-      -1,   394,   589,    -1,     7,    -1,    -1,    -1,    -1,    12,
-     403,    14,    -1,    -1,    -1,   602,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    26,    27,    28,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  4920,   435,    -1,    -1,    -1,    -1,    -1,    -1,   636,
-      -1,    -1,   639,    -1,    -1,    58,    -1,   450,   451,   452,
-      63,    -1,    -1,    -1,    -1,  4162,  4163,    -1,  4165,    -1,
-      -1,    -1,    -1,    -1,    77,    -1,    -1,    -1,    -1,    -1,
-      83,    84,    -1,    -1,    87,    -1,    -1,    -1,    -1,   482,
-      -1,    -1,    -1,    96,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    34,    35,    -1,    -1,    -1,   111,    40,
-      -1,    42,    -1,    44,    45,    -1,    -1,    -1,    -1,  4998,
-      -1,    -1,   125,    -1,    -1,    -1,   129,    -1,    -1,    -1,
-      -1,    62,    -1,    -1,   137,    -1,    -1,   724,   725,   726,
-      -1,   144,    -1,    -1,    -1,   538,   539,   540,   541,   152,
-      -1,    -1,  5031,   546,    -1,   158,    -1,    -1,    -1,    -1,
-      -1,   748,   749,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     563,    -1,    -1,   566,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   112,    -1,    -1,   115,    -1,  4283,    -1,    -1,   192,
-      -1,    -1,   123,    -1,    -1,    -1,   589,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   602,
-      -1,   142,  5091,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   159,    -1,
-      -1,    -1,   235,    -1,    -1,    -1,    -1,    -1,    -1,   242,
-      -1,    -1,    -1,   636,    -1,    -1,   639,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   187,    -1,   189,   262,
-      -1,  5140,    -1,   194,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   205,   206,    -1,    -1,  4375,  4376,
-    4377,  4378,   285,    -1,    -1,    -1,    -1,    -1,    -1,  4386,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  4400,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  5192,    -1,  5194,   247,    -1,   321,    -1,
-      -1,    -1,    -1,    -1,    -1,  5204,    -1,    -1,    -1,   260,
-      -1,   724,   725,   726,    -1,    -1,   339,    -1,    -1,    -1,
-     343,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   279,    -1,
-      -1,    -1,    -1,    -1,    -1,   748,   749,   288,   289,    -1,
-     291,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   387,    -1,    -1,    -1,    -1,    -1,
-      -1,   394,    -1,    -1,    -1,    -1,   327,   328,   329,    -1,
-     403,    -1,    -1,    -1,    -1,    -1,  5285,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   346,   347,   348,    -1,    -1,
-      -1,    -1,   353,    -1,  5303,   356,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   374,   375,  4542,    -1,   450,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4554,    -1,    -1,
-      -1,    -1,    -1,    -1,  5343,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   408,   409,   482,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  5381,   434,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  5396,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   538,   539,   540,   541,    -1,
-      -1,    -1,    -1,   546,    -1,    -1,  4643,  4644,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     563,    -1,    -1,   566,    -1,   496,    -1,    -1,    -1,   500,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4675,    -1,
-      -1,   512,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4686,
-      -1,    -1,    -1,  5472,    -1,    -1,    -1,    -1,    -1,   602,
-      -1,  5480,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  4710,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   636,    -1,    -1,   639,    -1,    -1,    -1,
-      -1,   572,    -1,    -1,   575,    -1,    -1,   578,   579,   580,
-     581,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     621,   622,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4805,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   649,    -1,
-      -1,   724,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  4838,    -1,    -1,    -1,   748,   749,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  4949,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4986,
-    4987,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,     5,     6,    -1,     8,     9,    10,    11,    12,
-      -1,    -1,    15,    -1,    -1,    -1,    -1,    20,    -1,  5066,
-      23,    -1,    25,    26,    27,    28,    29,    30,    -1,    32,
-      -1,    -1,    35,    36,    37,    38,    39,    40,    41,    -1,
-      43,    44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,
-      53,    54,    55,    56,    57,    -1,    59,    60,    61,    62,
-      63,    -1,    65,    66,    67,    68,    69,    70,    -1,    72,
-      73,    -1,    75,    76,    77,    78,    79,    80,    81,    82,
-      83,    84,    85,    -1,    87,    88,    -1,    90,    91,    92,
-      93,    94,    -1,    96,    97,    98,    -1,    -1,    -1,   102,
-     103,   104,    -1,   106,   107,   108,  5153,   110,   111,   112,
-     113,   114,   115,    -1,    -1,    -1,    -1,   120,   121,   122,
-      -1,    -1,   125,   126,   127,    -1,   129,    -1,    -1,    -1,
-    5177,  5178,   135,   136,   137,   138,   139,    -1,    -1,    -1,
-     143,    -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,
-      -1,   154,   155,    -1,   157,   158,   159,    -1,    -1,   162,
-     163,    -1,   165,   166,   167,   168,   169,   170,   171,    -1,
-     173,   174,   175,   176,   177,   178,   179,   180,   181,    -1,
-     183,   184,   185,   186,   187,   188,    -1,   190,   191,    -1,
-      -1,    -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,
-      -1,   204,   205,   206,   207,    -1,   209,    -1,   211,    -1,
-     213,    -1,   215,   216,    -1,   218,   219,    -1,   221,   222,
-      -1,    -1,    -1,   226,   227,   228,   229,   230,    -1,   232,
-     233,   234,    -1,    -1,   237,    -1,    -1,    -1,   241,   242,
-     243,   244,   245,    -1,    -1,   248,    -1,    -1,    -1,   252,
-     253,    -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,
-      -1,    -1,   265,   266,    -1,    -1,   269,    -1,   271,   272,
-     273,    -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,
-      -1,   284,    -1,   286,   287,    -1,    -1,   290,    -1,    -1,
-      -1,    -1,   295,    -1,   297,   298,   299,   300,   301,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-     313,    -1,   315,   316,   317,   318,   319,   320,   321,   322,
-     323,   324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,
-     333,   334,   335,    -1,    -1,   338,   339,   340,   341,    -1,
-     343,   344,   345,   346,   347,   348,   349,   350,   351,   352,
-     353,    -1,   355,   356,   357,    -1,    -1,   360,   361,   362,
-     363,   364,   365,   366,   367,   368,   369,    -1,   371,   372,
-     373,    -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,
-     383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     393,   394,   395,   396,   397,    -1,   399,    -1,   401,   402,
-     403,   404,   405,   406,   407,   408,   409,   410,   411,   412,
-      -1,   414,   415,   416,    -1,   418,    -1,   420,   421,   422,
-     423,   424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,
-      -1,    -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,
-     443,   444,   445,   446,    -1,   448,   449,    -1,   451,   452,
-     453,   454,   455,   456,   457,   458,   459,   460,   461,   462,
-     463,    -1,   465,    -1,   467,   468,    -1,   470,   471,   472,
-      -1,   474,    -1,   476,   477,   478,   479,   480,    -1,   482,
-     483,   484,   485,   486,   487,   488,    -1,   490,   491,   492,
-      -1,    -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,
-      -1,    -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,
-     513,   514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,
-     523,   524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,
-     533,    -1,   535,    -1,   537,   538,   539,   540,   541,   542,
-     543,   544,   545,   546,    -1,    -1,   549,   550,   551,   552,
-     553,   554,   555,   556,   557,   558,   559,   560,   561,   562,
-     563,    -1,   565,   566,   567,   568,   569,    -1,   571,   572,
-     573,    -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,
-      -1,   584,   585,    -1,   587,   588,   589,   590,   591,    -1,
-     593,   594,   595,   596,   597,   598,    -1,   600,   601,    -1,
-      -1,   604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,
-      -1,    -1,   615,   616,   617,   618,   619,   620,    -1,    -1,
-     623,   624,    -1,   626,   627,    -1,   629,   630,   631,   632,
-      -1,    -1,    -1,   636,    -1,    -1,   639,   640,   641,    -1,
-     643,   644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,
-     653,   654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,
-      -1,   664,   665,    -1,   667,   668,   669,   670,   671,   672,
-     673,    -1,   675,   676,   677,   678,   679,   680,    -1,   682,
-     683,   684,   685,   686,   687,   688,    -1,   690,   691,   692,
-     693,   694,   695,   696,    -1,    -1,    -1,   700,   701,   702,
-     703,   704,   705,   706,   707,    -1,   709,   710,   711,   712,
-     713,   714,   715,   716,   717,   718,    -1,   720,   721,   722,
-     723,   724,   725,   726,   727,   728,   729,   730,   731,   732,
-     733,   734,   735,   736,   737,   738,   739,   740,   741,   742,
-     743,    -1,   745,   746,   747,   748,   749,   750,   751,    -1,
-     753,   754,   755,   756,   757,   758,   759,   760,   761,   762,
-     763,   764,   765,   766,   767,   768,   769,   770,   771,   772,
-     773,   774,   775,   776,   777,   778,   779,   780,   781,   782,
-     783,   784,    -1,    -1,    -1,    -1,    -1,   790,   791,    -1,
-      -1,    -1,    -1,   796,    -1,   798,    -1,    -1,    -1,   802,
-      -1,    -1,    -1,   806,   807,     5,     6,    -1,     8,     9,
-      10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,    -1,
-      20,    -1,    -1,    23,    -1,    25,    26,    27,    28,    29,
-      30,    -1,    32,    -1,    -1,    35,    36,    37,    38,    39,
-      40,    41,    -1,    43,    44,    45,    46,    47,    -1,    49,
-      50,    -1,    -1,    53,    54,    55,    56,    57,    -1,    59,
-      60,    61,    62,    63,    -1,    65,    66,    67,    68,    69,
-      70,    -1,    72,    73,    -1,    75,    76,    77,    78,    79,
-      80,    81,    82,    83,    84,    85,    -1,    87,    88,    -1,
-      90,    91,    92,    93,    94,    -1,    96,    97,    98,    -1,
-      -1,    -1,   102,   103,   104,    -1,   106,   107,   108,    -1,
-     110,   111,   112,   113,   114,   115,    -1,    -1,    -1,    -1,
-     120,   121,   122,    -1,    -1,   125,   126,   127,    -1,   129,
-      -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,   139,
-      -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,    -1,
-      -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,   159,
-      -1,    -1,   162,   163,    -1,   165,   166,   167,   168,   169,
-     170,   171,    -1,   173,   174,   175,   176,   177,   178,   179,
-     180,   181,    -1,   183,   184,   185,   186,   187,   188,    -1,
-     190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,    -1,
-      -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,   209,
-      -1,   211,    -1,   213,    -1,   215,   216,    -1,   218,   219,
-      -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,   229,
-     230,    -1,   232,   233,   234,    -1,    -1,   237,    -1,    -1,
-      -1,   241,   242,   243,   244,   245,    -1,    -1,   248,    -1,
-      -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,    -1,
-     260,    -1,   262,    -1,    -1,   265,   266,    -1,   268,   269,
-      -1,   271,   272,   273,    -1,    -1,    -1,    -1,    -1,   279,
-     280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,    -1,
-     290,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,   299,
-     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
-     310,   311,   312,   313,    -1,   315,   316,   317,   318,   319,
-     320,   321,   322,   323,   324,   325,    -1,    -1,    -1,    -1,
-     330,   331,   332,   333,   334,   335,    -1,    -1,   338,   339,
-     340,   341,    -1,   343,   344,   345,   346,   347,   348,   349,
-     350,   351,   352,   353,    -1,   355,   356,   357,    -1,    -1,
-     360,   361,   362,   363,   364,   365,   366,   367,   368,   369,
-      -1,   371,   372,   373,    -1,   375,   376,    -1,   378,   379,
-     380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   393,   394,   395,   396,   397,    -1,   399,
-      -1,   401,   402,   403,   404,   405,   406,   407,   408,   409,
-     410,   411,   412,    -1,   414,   415,   416,    -1,   418,    -1,
-     420,   421,   422,   423,   424,    -1,   426,   427,   428,    -1,
-      -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,   439,
-      -1,    -1,   442,   443,   444,   445,   446,    -1,   448,   449,
-      -1,   451,   452,   453,   454,   455,   456,   457,   458,   459,
-     460,   461,   462,   463,    -1,   465,    -1,   467,   468,    -1,
-     470,   471,   472,    -1,   474,    -1,   476,   477,   478,   479,
-     480,    -1,   482,   483,   484,   485,   486,   487,   488,    -1,
-     490,   491,    -1,    -1,    -1,   495,   496,   497,   498,    -1,
-      -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,   509,
-     510,   511,    -1,   513,   514,   515,   516,   517,    -1,    -1,
-      -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,    -1,
-     530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,   539,
-     540,   541,   542,   543,   544,   545,   546,    -1,    -1,   549,
-     550,   551,   552,   553,   554,   555,   556,   557,   558,   559,
-     560,   561,   562,   563,    -1,    -1,   566,   567,   568,   569,
-      -1,   571,   572,   573,    -1,   575,   576,   577,   578,    -1,
-      -1,    -1,    -1,   583,   584,   585,    -1,   587,   588,   589,
-     590,   591,    -1,   593,   594,   595,   596,   597,   598,    -1,
-     600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,   609,
-      -1,   611,   612,    -1,    -1,   615,   616,   617,   618,   619,
-     620,    -1,    -1,   623,   624,    -1,   626,   627,    -1,   629,
-     630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,   639,
-     640,   641,    -1,   643,   644,   645,   646,    -1,    -1,   649,
-      -1,    -1,   652,   653,   654,   655,   656,    -1,   658,    -1,
-      -1,    -1,    -1,    -1,   664,   665,    -1,   667,   668,   669,
-     670,   671,   672,   673,    -1,   675,   676,   677,   678,   679,
-     680,    -1,   682,   683,   684,   685,   686,   687,   688,    -1,
-     690,   691,   692,   693,   694,   695,   696,    -1,    -1,    -1,
-     700,   701,   702,   703,   704,   705,   706,   707,    -1,   709,
-     710,   711,   712,   713,   714,   715,   716,   717,   718,    -1,
-     720,   721,   722,   723,   724,   725,   726,   727,   728,   729,
-     730,   731,   732,   733,   734,   735,   736,   737,   738,   739,
-     740,   741,   742,   743,    -1,   745,   746,   747,   748,   749,
-     750,   751,    -1,   753,   754,   755,   756,   757,   758,   759,
-     760,   761,   762,   763,   764,   765,   766,   767,   768,   769,
-     770,   771,   772,   773,   774,   775,   776,   777,   778,   779,
-     780,   781,   782,   783,   784,    -1,    -1,    -1,    -1,    -1,
-     790,   791,    -1,    -1,    -1,    -1,   796,    -1,   798,    -1,
-      -1,    -1,   802,    -1,    -1,    -1,   806,   807,     5,     6,
-      -1,     8,     9,    10,    11,    12,    13,    -1,    15,    -1,
-      -1,    -1,    -1,    20,    -1,    -1,    23,    -1,    25,    26,
-      27,    28,    29,    30,    -1,    32,    -1,    -1,    35,    36,
-      37,    38,    39,    40,    41,    -1,    43,    44,    45,    -1,
-      47,    -1,    49,    50,    -1,    -1,    53,    54,    55,    56,
-      57,    -1,    59,    60,    61,    62,    63,    -1,    65,    66,
-      67,    68,    69,    70,    -1,    72,    73,    -1,    75,    76,
-      77,    78,    79,    80,    81,    82,    83,    84,    85,    -1,
-      87,    88,    -1,    90,    91,    92,    93,    94,    -1,    96,
-      97,    98,    -1,    -1,    -1,   102,   103,   104,    -1,   106,
-     107,   108,    -1,   110,   111,   112,   113,   114,   115,    -1,
-      -1,    -1,    -1,   120,   121,   122,    -1,    -1,   125,   126,
-     127,    -1,   129,    -1,    -1,    -1,    -1,    -1,   135,   136,
-     137,   138,   139,    -1,    -1,    -1,   143,    -1,    -1,   146,
-     147,   148,    -1,    -1,    -1,   152,    -1,   154,   155,    -1,
-     157,   158,   159,    -1,    -1,   162,   163,    -1,   165,   166,
-     167,   168,   169,   170,   171,    -1,   173,   174,   175,   176,
-     177,   178,   179,   180,   181,    -1,   183,   184,   185,   186,
-     187,   188,    -1,   190,   191,    -1,    -1,    -1,   195,   196,
-      -1,   198,    -1,    -1,    -1,   202,    -1,   204,   205,   206,
-     207,    -1,   209,    -1,   211,    -1,   213,    -1,   215,   216,
-      -1,   218,   219,    -1,   221,   222,    -1,    -1,    -1,   226,
-     227,   228,   229,   230,    -1,   232,   233,   234,    -1,    -1,
-     237,    -1,    -1,    -1,   241,   242,   243,   244,   245,    -1,
-      -1,   248,    -1,    -1,    -1,   252,   253,    -1,   255,   256,
-      -1,    -1,    -1,   260,    -1,   262,    -1,    -1,   265,   266,
-      -1,    -1,   269,    -1,   271,   272,   273,    -1,    -1,    -1,
-      -1,    -1,   279,   280,    -1,   282,    -1,   284,    -1,   286,
-     287,    -1,    -1,   290,    -1,    -1,    -1,    -1,   295,    -1,
-     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,   313,    -1,   315,   316,
-     317,   318,   319,   320,   321,   322,   323,   324,   325,    -1,
-      -1,    -1,    -1,   330,   331,   332,   333,   334,   335,    -1,
-      -1,   338,   339,   340,   341,    -1,   343,   344,   345,   346,
-     347,   348,   349,   350,   351,   352,   353,    -1,   355,   356,
-     357,    -1,    -1,   360,   361,   362,   363,   364,   365,   366,
-     367,   368,   369,    -1,   371,   372,   373,    -1,   375,   376,
-     377,   378,   379,   380,    -1,    -1,   383,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   393,   394,   395,   396,
-     397,    -1,   399,    -1,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,   412,    -1,   414,   415,   416,
-      -1,   418,    -1,   420,   421,   422,   423,   424,    -1,   426,
-     427,   428,    -1,    -1,   431,    -1,    -1,    -1,   435,   436,
-      -1,   438,   439,    -1,    -1,   442,   443,   444,   445,   446,
-      -1,   448,   449,    -1,   451,   452,   453,   454,   455,   456,
-     457,   458,   459,   460,   461,   462,   463,    -1,   465,    -1,
-     467,   468,    -1,   470,   471,   472,    -1,   474,    -1,   476,
-     477,   478,   479,   480,    -1,   482,   483,   484,   485,   486,
-     487,   488,    -1,   490,   491,    -1,    -1,    -1,   495,   496,
-     497,   498,    -1,    -1,    -1,   502,    -1,    -1,    -1,   506,
-      -1,   508,   509,   510,   511,    -1,   513,   514,   515,   516,
-     517,    -1,    -1,    -1,    -1,    -1,   523,   524,   525,    -1,
-     527,    -1,    -1,   530,    -1,    -1,   533,    -1,   535,    -1,
-     537,   538,   539,   540,   541,   542,   543,   544,   545,   546,
-      -1,    -1,   549,   550,   551,   552,   553,   554,   555,   556,
-     557,   558,   559,   560,   561,   562,   563,    -1,    -1,   566,
-     567,   568,   569,    -1,   571,   572,   573,    -1,   575,   576,
-     577,   578,    -1,    -1,    -1,    -1,    -1,   584,   585,    -1,
-     587,   588,   589,   590,   591,    -1,   593,   594,   595,   596,
-     597,   598,    -1,   600,   601,    -1,    -1,   604,    -1,    -1,
-     607,    -1,   609,    -1,   611,   612,    -1,    -1,   615,   616,
-     617,   618,   619,   620,    -1,    -1,   623,   624,    -1,   626,
-     627,    -1,   629,   630,   631,   632,    -1,    -1,    -1,    -1,
-      -1,    -1,   639,   640,   641,    -1,   643,   644,   645,   646,
-      -1,    -1,   649,    -1,    -1,   652,   653,   654,   655,   656,
-      -1,   658,    -1,    -1,    -1,    -1,    -1,   664,   665,    -1,
-     667,   668,   669,   670,   671,   672,   673,    -1,   675,   676,
-     677,   678,   679,   680,    -1,   682,   683,   684,   685,   686,
-     687,   688,    -1,   690,   691,   692,   693,   694,   695,   696,
-      -1,    -1,    -1,   700,   701,   702,   703,   704,   705,   706,
-     707,   708,   709,   710,   711,   712,   713,   714,   715,   716,
-     717,   718,    -1,   720,   721,   722,   723,   724,   725,   726,
-     727,   728,   729,   730,   731,   732,   733,   734,   735,   736,
-     737,   738,   739,   740,   741,   742,   743,    -1,   745,   746,
-     747,   748,   749,   750,   751,    -1,   753,   754,   755,   756,
-     757,   758,   759,   760,   761,   762,   763,   764,   765,   766,
-     767,   768,   769,   770,   771,   772,   773,   774,   775,   776,
-     777,   778,   779,   780,   781,   782,   783,   784,    -1,    -1,
-      -1,    -1,    -1,   790,   791,    -1,    -1,    -1,    -1,   796,
-      -1,   798,    -1,    -1,    -1,   802,    -1,    -1,    -1,   806,
-     807,     5,     6,    -1,     8,     9,    10,    11,    12,    -1,
-      -1,    15,    -1,    -1,    -1,    -1,    20,    -1,    -1,    23,
-      -1,    25,    26,    27,    28,    29,    30,    -1,    32,    -1,
-      -1,    35,    36,    37,    38,    39,    40,    41,    -1,    43,
-      44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,
-      54,    55,    56,    57,    -1,    59,    60,    61,    62,    63,
-      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
-      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    -1,    87,    88,    -1,    90,    91,    92,    93,
-      94,    -1,    96,    97,    98,    -1,    -1,    -1,   102,   103,
-     104,    -1,   106,   107,   108,    -1,   110,   111,   112,   113,
-     114,   115,    -1,    -1,    -1,    -1,   120,   121,   122,    -1,
-      -1,   125,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,
-      -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,   143,
-      -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,
-     154,   155,    -1,   157,   158,   159,    -1,    -1,   162,   163,
-      -1,   165,   166,   167,   168,   169,   170,   171,    -1,   173,
-     174,   175,   176,   177,   178,   179,   180,   181,    -1,   183,
-     184,   185,   186,   187,   188,    -1,   190,   191,    -1,    -1,
-      -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,
-     204,   205,   206,   207,    -1,   209,    -1,   211,    -1,   213,
-      -1,   215,   216,    -1,   218,   219,    -1,   221,   222,    -1,
-      -1,    -1,   226,   227,   228,   229,   230,    -1,   232,   233,
-     234,    -1,    -1,   237,    -1,    -1,    -1,   241,   242,   243,
-     244,   245,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,
-      -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,
-      -1,   265,   266,    -1,    -1,   269,    -1,   271,   272,   273,
-      -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,
-     284,    -1,   286,   287,    -1,    -1,   290,    -1,    -1,    -1,
-      -1,   295,    -1,   297,   298,   299,   300,   301,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
-      -1,   315,   316,   317,   318,   319,   320,   321,   322,   323,
-     324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,
-     334,   335,    -1,    -1,   338,   339,   340,   341,    -1,   343,
-     344,   345,   346,   347,   348,   349,   350,   351,   352,   353,
-      -1,   355,   356,   357,    -1,    -1,   360,   361,   362,   363,
-     364,   365,   366,   367,   368,   369,    -1,   371,   372,   373,
-      -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,   383,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,
-     394,   395,   396,   397,    -1,   399,    -1,   401,   402,   403,
-     404,   405,   406,   407,   408,   409,   410,   411,   412,    -1,
-     414,   415,   416,    -1,   418,    -1,   420,   421,   422,   423,
-     424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,
-      -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,   443,
-     444,   445,   446,    -1,   448,   449,    -1,   451,   452,   453,
-     454,   455,   456,   457,   458,   459,   460,   461,   462,   463,
-      -1,   465,    -1,   467,   468,    -1,   470,   471,   472,    -1,
-     474,    -1,   476,   477,   478,   479,   480,    -1,   482,   483,
-     484,   485,   486,   487,   488,    -1,   490,   491,    -1,    -1,
-      -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,
-      -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,   513,
-     514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,
-     524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,
-      -1,   535,    -1,   537,   538,   539,   540,   541,   542,   543,
-     544,   545,   546,    -1,    -1,   549,   550,   551,   552,   553,
-     554,   555,   556,   557,   558,   559,   560,   561,   562,   563,
-      -1,    -1,   566,   567,   568,   569,    -1,   571,   572,   573,
-      -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,
-     584,   585,    -1,   587,   588,   589,   590,   591,    -1,   593,
-     594,   595,   596,   597,   598,    -1,   600,   601,    -1,    -1,
-     604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,
-      -1,   615,   616,   617,   618,   619,   620,    -1,    -1,   623,
-     624,    -1,   626,   627,    -1,   629,   630,   631,   632,    -1,
-      -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,
-     644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,
-     654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,
-     664,   665,    -1,   667,   668,   669,   670,   671,   672,   673,
-      -1,   675,   676,   677,   678,   679,   680,    -1,   682,   683,
-     684,   685,   686,   687,   688,    -1,   690,   691,   692,   693,
-     694,   695,   696,    -1,    -1,    -1,   700,   701,   702,   703,
-     704,   705,   706,   707,    -1,   709,   710,   711,   712,   713,
-     714,   715,   716,   717,   718,    -1,   720,   721,   722,   723,
-     724,   725,   726,   727,   728,   729,   730,   731,   732,   733,
-     734,   735,   736,   737,   738,   739,   740,   741,   742,   743,
-      -1,   745,   746,   747,   748,   749,   750,   751,    -1,   753,
-     754,   755,   756,   757,   758,   759,   760,   761,   762,   763,
-     764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
-     774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
-     784,    -1,    -1,    -1,    -1,    -1,   790,   791,   792,    -1,
-      -1,    -1,   796,    -1,   798,    -1,    -1,    -1,   802,    -1,
-      -1,    -1,   806,   807,     5,     6,    -1,     8,     9,    10,
-      11,    12,    -1,    -1,    15,    -1,    -1,    -1,    -1,    20,
-      -1,    -1,    23,    -1,    25,    26,    27,    28,    29,    30,
-      -1,    32,    -1,    -1,    35,    36,    37,    38,    39,    40,
-      41,    -1,    43,    44,    45,    -1,    47,    -1,    49,    50,
-      -1,    -1,    53,    54,    55,    56,    57,    -1,    59,    60,
-      61,    62,    63,    -1,    65,    66,    67,    68,    69,    70,
-      -1,    72,    73,    -1,    75,    76,    77,    78,    79,    80,
-      81,    82,    83,    84,    85,    -1,    87,    88,    -1,    90,
-      91,    92,    93,    94,    -1,    96,    97,    98,    -1,    -1,
-      -1,   102,   103,   104,    -1,   106,   107,   108,    -1,   110,
-     111,   112,   113,   114,   115,    -1,    -1,    -1,    -1,   120,
-     121,   122,    -1,    -1,   125,   126,   127,    -1,   129,    -1,
-      -1,    -1,    -1,    -1,   135,   136,   137,   138,   139,    -1,
-      -1,    -1,   143,    -1,    -1,   146,   147,   148,    -1,    -1,
-      -1,   152,    -1,   154,   155,    -1,   157,   158,   159,    -1,
-      -1,   162,   163,    -1,   165,   166,   167,   168,   169,   170,
-     171,    -1,   173,   174,   175,   176,   177,   178,   179,   180,
-     181,    -1,   183,   184,   185,   186,   187,   188,    -1,   190,
-     191,    -1,    -1,    -1,   195,   196,    -1,   198,    -1,    -1,
-      -1,   202,    -1,   204,   205,   206,   207,    -1,   209,    -1,
-     211,    -1,   213,    -1,   215,   216,    -1,   218,   219,    -1,
-     221,   222,    -1,    -1,    -1,   226,   227,   228,   229,   230,
-      -1,   232,   233,   234,    -1,    -1,   237,    -1,    -1,    -1,
-     241,   242,   243,   244,   245,    -1,    -1,   248,    -1,    -1,
-      -1,   252,   253,    -1,   255,   256,    -1,    -1,    -1,   260,
-      -1,   262,    -1,    -1,   265,   266,    -1,    -1,   269,    -1,
-     271,   272,   273,    -1,    -1,    -1,    -1,    -1,   279,   280,
-      -1,   282,    -1,   284,    -1,   286,   287,    -1,    -1,   290,
-      -1,    -1,    -1,    -1,   295,    -1,   297,   298,   299,   300,
-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,    -1,   315,   316,   317,   318,   319,   320,
-     321,   322,   323,   324,   325,    -1,    -1,    -1,    -1,   330,
-     331,   332,   333,   334,   335,    -1,    -1,   338,   339,   340,
-     341,    -1,   343,   344,   345,   346,   347,   348,   349,   350,
-     351,   352,   353,    -1,   355,   356,   357,    -1,    -1,   360,
-     361,   362,   363,   364,   365,   366,   367,   368,   369,    -1,
-     371,   372,   373,    -1,   375,   376,    -1,   378,   379,   380,
-      -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   393,   394,   395,   396,   397,    -1,   399,    -1,
-     401,   402,   403,   404,   405,   406,   407,   408,   409,   410,
-     411,   412,    -1,   414,   415,   416,    -1,   418,    -1,   420,
-     421,   422,   423,   424,    -1,   426,   427,   428,    -1,    -1,
-     431,    -1,    -1,    -1,   435,   436,    -1,   438,   439,    -1,
-      -1,   442,   443,   444,   445,   446,    -1,   448,   449,    -1,
-     451,   452,   453,   454,   455,   456,   457,   458,   459,   460,
-     461,   462,   463,    -1,   465,    -1,   467,   468,    -1,   470,
-     471,   472,    -1,   474,    -1,   476,   477,   478,   479,   480,
-      -1,   482,   483,   484,   485,   486,   487,   488,    -1,   490,
-     491,    -1,    -1,    -1,   495,   496,   497,   498,    -1,    -1,
-      -1,   502,    -1,    -1,    -1,   506,    -1,   508,   509,   510,
-     511,    -1,   513,   514,   515,   516,   517,    -1,    -1,    -1,
-      -1,    -1,   523,   524,   525,    -1,   527,    -1,    -1,   530,
-      -1,    -1,   533,    -1,   535,    -1,   537,   538,   539,   540,
-     541,   542,   543,   544,   545,   546,    -1,    -1,   549,   550,
-     551,   552,   553,   554,   555,   556,   557,   558,   559,   560,
-     561,   562,   563,    -1,    -1,   566,   567,   568,   569,    -1,
-     571,   572,   573,    -1,   575,   576,   577,   578,    -1,    -1,
-      -1,    -1,    -1,   584,   585,    -1,   587,   588,   589,   590,
-     591,    -1,   593,   594,   595,   596,   597,   598,    -1,   600,
-     601,    -1,    -1,   604,    -1,    -1,   607,    -1,   609,    -1,
-     611,   612,    -1,    -1,   615,   616,   617,   618,   619,   620,
-      -1,    -1,   623,   624,    -1,   626,   627,    -1,   629,   630,
-     631,   632,    -1,    -1,    -1,    -1,    -1,    -1,   639,   640,
-     641,    -1,   643,   644,   645,   646,    -1,    -1,   649,    -1,
-      -1,   652,   653,   654,   655,   656,    -1,   658,    -1,    -1,
-      -1,    -1,    -1,   664,   665,    -1,   667,   668,   669,   670,
-     671,   672,   673,    -1,   675,   676,   677,   678,   679,   680,
-      -1,   682,   683,   684,   685,   686,   687,   688,    -1,   690,
-     691,   692,   693,   694,   695,   696,    -1,    -1,    -1,   700,
-     701,   702,   703,   704,   705,   706,   707,    -1,   709,   710,
-     711,   712,   713,   714,   715,   716,   717,   718,    -1,   720,
-     721,   722,   723,   724,   725,   726,   727,   728,   729,   730,
-     731,   732,   733,   734,   735,   736,   737,   738,   739,   740,
-     741,   742,   743,    -1,   745,   746,   747,   748,   749,   750,
-     751,    -1,   753,   754,   755,   756,   757,   758,   759,   760,
-     761,   762,   763,   764,   765,   766,   767,   768,   769,   770,
-     771,   772,   773,   774,   775,   776,   777,   778,   779,   780,
-     781,   782,   783,   784,    -1,    -1,    -1,    -1,    -1,   790,
-     791,   792,    -1,    -1,    -1,   796,    -1,   798,    -1,    -1,
-      -1,   802,    -1,    -1,    -1,   806,   807,     5,     6,    -1,
-       8,     9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,
-      -1,    -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,
-      28,    29,    30,    -1,    32,    -1,    -1,    35,    36,    37,
-      38,    39,    40,    41,    -1,    43,    44,    45,    -1,    47,
-      -1,    49,    50,    -1,    -1,    53,    54,    55,    56,    57,
-      -1,    59,    60,    61,    62,    63,    -1,    65,    66,    67,
-      68,    69,    70,    -1,    72,    73,    -1,    75,    76,    77,
-      78,    79,    80,    81,    82,    83,    84,    85,    -1,    87,
-      88,    -1,    90,    91,    92,    93,    94,    -1,    96,    97,
-      98,    -1,    -1,    -1,   102,   103,   104,    -1,   106,   107,
-     108,    -1,   110,   111,   112,   113,   114,   115,    -1,    -1,
-      -1,    -1,   120,   121,   122,    -1,    -1,   125,   126,   127,
-      -1,   129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,
-     138,   139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,
-     148,    -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,
-     158,   159,    -1,    -1,   162,   163,    -1,   165,   166,   167,
-     168,   169,   170,   171,    -1,   173,   174,   175,   176,   177,
-     178,   179,   180,   181,    -1,   183,   184,   185,   186,   187,
-     188,    -1,   190,   191,    -1,    -1,    -1,   195,   196,   197,
-     198,    -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,
-      -1,   209,    -1,   211,    -1,   213,    -1,   215,   216,    -1,
-     218,   219,    -1,   221,   222,    -1,    -1,    -1,   226,   227,
-     228,   229,   230,    -1,   232,   233,   234,    -1,    -1,   237,
-      -1,    -1,    -1,   241,   242,   243,   244,   245,    -1,    -1,
-     248,    -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,
-      -1,    -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,
-      -1,   269,    -1,   271,   272,   273,    -1,    -1,    -1,    -1,
-      -1,   279,   280,    -1,   282,    -1,   284,    -1,   286,   287,
-      -1,    -1,   290,    -1,    -1,    -1,    -1,   295,    -1,   297,
-     298,   299,   300,   301,   302,   303,   304,   305,   306,   307,
-     308,   309,   310,   311,   312,   313,    -1,   315,   316,   317,
-     318,   319,   320,   321,   322,   323,   324,   325,    -1,    -1,
-      -1,    -1,   330,   331,   332,   333,   334,   335,    -1,    -1,
-     338,   339,   340,   341,    -1,   343,   344,   345,   346,   347,
-     348,   349,   350,   351,   352,   353,    -1,   355,   356,   357,
-      -1,    -1,   360,   361,   362,   363,   364,   365,   366,   367,
-     368,   369,    -1,   371,   372,   373,    -1,   375,   376,    -1,
-     378,   379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   393,   394,   395,   396,   397,
-      -1,   399,    -1,   401,   402,   403,   404,   405,   406,   407,
-     408,   409,   410,   411,   412,    -1,   414,   415,   416,    -1,
-     418,    -1,   420,   421,   422,   423,   424,    -1,   426,   427,
-     428,    -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,
-     438,   439,    -1,    -1,   442,   443,   444,   445,   446,    -1,
-     448,   449,    -1,   451,   452,   453,   454,   455,   456,   457,
-     458,   459,   460,   461,   462,   463,    -1,   465,    -1,   467,
-     468,    -1,   470,   471,   472,    -1,   474,    -1,   476,   477,
-     478,   479,   480,    -1,   482,   483,   484,   485,   486,   487,
-     488,    -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,
-     498,    -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,
-     508,   509,   510,   511,    -1,   513,   514,   515,   516,   517,
-      -1,    -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,
-      -1,    -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,
-     538,   539,   540,   541,   542,   543,   544,   545,   546,    -1,
-      -1,   549,   550,   551,   552,   553,   554,   555,   556,   557,
-     558,   559,   560,   561,   562,   563,    -1,    -1,   566,   567,
-     568,   569,    -1,   571,   572,   573,    -1,   575,   576,   577,
-     578,    -1,    -1,    -1,    -1,    -1,   584,   585,    -1,   587,
-     588,   589,   590,   591,    -1,   593,   594,   595,   596,   597,
-     598,    -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,
-      -1,   609,    -1,   611,   612,    -1,    -1,   615,   616,   617,
-     618,   619,   620,    -1,    -1,   623,   624,    -1,   626,   627,
-      -1,   629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,
-      -1,   639,   640,   641,    -1,   643,   644,   645,   646,    -1,
-      -1,   649,    -1,    -1,   652,   653,   654,   655,   656,    -1,
-     658,    -1,    -1,    -1,    -1,    -1,   664,   665,    -1,   667,
-     668,   669,   670,   671,   672,   673,    -1,   675,   676,   677,
-     678,   679,   680,    -1,   682,   683,   684,   685,   686,   687,
-     688,    -1,   690,   691,   692,   693,   694,   695,   696,    -1,
-      -1,    -1,   700,   701,   702,   703,   704,   705,   706,   707,
-      -1,   709,   710,   711,   712,   713,   714,   715,   716,   717,
-     718,    -1,   720,   721,   722,   723,   724,   725,   726,   727,
-     728,   729,   730,   731,   732,   733,   734,   735,   736,   737,
-     738,   739,   740,   741,   742,   743,    -1,   745,   746,   747,
-     748,   749,   750,   751,    -1,   753,   754,   755,   756,   757,
-     758,   759,   760,   761,   762,   763,   764,   765,   766,   767,
-     768,   769,   770,   771,   772,   773,   774,   775,   776,   777,
-     778,   779,   780,   781,   782,   783,   784,    -1,    -1,    -1,
-      -1,    -1,   790,   791,    -1,    -1,    -1,    -1,   796,    -1,
-     798,    -1,    -1,    -1,   802,    -1,    -1,    -1,   806,   807,
-       5,     6,    -1,     8,     9,    10,    11,    12,    -1,    -1,
-      15,    -1,    -1,    -1,    -1,    20,    -1,    -1,    23,    -1,
-      25,    26,    27,    28,    29,    30,    -1,    32,    -1,    -1,
-      35,    36,    37,    38,    39,    40,    41,    -1,    43,    44,
-      45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,    54,
-      55,    56,    57,    -1,    59,    60,    61,    62,    63,    -1,
-      65,    66,    67,    68,    69,    70,    -1,    72,    73,    -1,
-      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
-      85,    -1,    87,    88,    -1,    90,    91,    92,    93,    94,
-      -1,    96,    97,    98,    -1,    -1,    -1,   102,   103,   104,
-      -1,   106,   107,   108,    -1,   110,   111,   112,   113,   114,
-     115,    -1,    -1,    -1,    -1,   120,   121,   122,    -1,    -1,
-     125,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,    -1,
-     135,   136,   137,   138,   139,    -1,    -1,    -1,   143,    -1,
-      -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,   154,
-     155,    -1,   157,   158,   159,    -1,    -1,   162,   163,    -1,
-     165,   166,   167,   168,   169,   170,   171,    -1,   173,   174,
-     175,   176,   177,   178,   179,   180,   181,    -1,   183,   184,
-     185,   186,   187,   188,    -1,   190,   191,    -1,    -1,    -1,
-     195,   196,   197,   198,    -1,    -1,    -1,   202,    -1,   204,
-     205,   206,   207,    -1,   209,    -1,   211,    -1,   213,    -1,
-     215,   216,    -1,   218,   219,    -1,   221,   222,    -1,    -1,
-      -1,   226,   227,   228,   229,   230,    -1,   232,   233,   234,
-      -1,    -1,   237,    -1,    -1,    -1,   241,   242,   243,   244,
-     245,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,    -1,
-     255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,    -1,
-     265,   266,    -1,    -1,   269,    -1,   271,   272,   273,    -1,
-      -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,   284,
-      -1,   286,   287,    -1,    -1,   290,    -1,    -1,    -1,    -1,
-     295,    -1,   297,   298,   299,   300,   301,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,   313,    -1,
-     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
-     325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,   334,
-     335,    -1,    -1,   338,   339,   340,   341,    -1,   343,   344,
-     345,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
-     355,   356,   357,    -1,    -1,   360,   361,   362,   363,   364,
-     365,   366,   367,   368,   369,    -1,   371,   372,   373,    -1,
-     375,   376,    -1,   378,   379,   380,    -1,    -1,   383,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,   394,
-     395,   396,   397,    -1,   399,    -1,   401,   402,   403,   404,
-     405,   406,   407,   408,   409,   410,   411,   412,    -1,   414,
-     415,   416,    -1,   418,    -1,   420,   421,   422,   423,   424,
-      -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,    -1,
-     435,   436,    -1,   438,   439,    -1,    -1,   442,   443,   444,
-     445,   446,    -1,   448,   449,    -1,   451,   452,   453,   454,
-     455,   456,   457,   458,   459,   460,   461,   462,   463,    -1,
-     465,    -1,   467,   468,    -1,   470,   471,   472,    -1,   474,
-      -1,   476,   477,   478,   479,   480,    -1,   482,   483,   484,
-     485,   486,   487,   488,    -1,   490,   491,    -1,    -1,    -1,
-     495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,    -1,
-      -1,   506,    -1,   508,   509,   510,   511,    -1,   513,   514,
-     515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,   524,
-     525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,    -1,
-     535,    -1,   537,   538,   539,   540,   541,   542,   543,   544,
-     545,   546,    -1,    -1,   549,   550,   551,   552,   553,   554,
-     555,   556,   557,   558,   559,   560,   561,   562,   563,    -1,
-      -1,   566,   567,   568,   569,    -1,   571,   572,   573,    -1,
-     575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,   584,
-     585,    -1,   587,   588,   589,   590,   591,    -1,   593,   594,
-     595,   596,   597,   598,    -1,   600,   601,    -1,    -1,   604,
-      -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,    -1,
-     615,   616,   617,   618,   619,   620,    -1,    -1,   623,   624,
-      -1,   626,   627,    -1,   629,   630,   631,   632,    -1,    -1,
-      -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,   644,
-     645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,   654,
-     655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,   664,
-     665,    -1,   667,   668,   669,   670,   671,   672,   673,    -1,
-     675,   676,   677,   678,   679,   680,    -1,   682,   683,   684,
-     685,   686,   687,   688,    -1,   690,   691,   692,   693,   694,
-     695,   696,    -1,    -1,    -1,   700,   701,   702,   703,   704,
-     705,   706,   707,    -1,   709,   710,   711,   712,   713,   714,
-     715,   716,   717,   718,    -1,   720,   721,   722,   723,   724,
-     725,   726,   727,   728,   729,   730,   731,   732,   733,   734,
-     735,   736,   737,   738,   739,   740,   741,   742,   743,    -1,
-     745,   746,   747,   748,   749,   750,   751,    -1,   753,   754,
-     755,   756,   757,   758,   759,   760,   761,   762,   763,   764,
-     765,   766,   767,   768,   769,   770,   771,   772,   773,   774,
-     775,   776,   777,   778,   779,   780,   781,   782,   783,   784,
-      -1,    -1,    -1,    -1,    -1,   790,   791,    -1,    -1,    -1,
-      -1,   796,    -1,   798,    -1,    -1,    -1,   802,    -1,    -1,
-      -1,   806,   807,     5,     6,    -1,     8,     9,    10,    11,
-      12,    -1,    -1,    15,    -1,    -1,    -1,    -1,    20,    -1,
-      -1,    23,    -1,    25,    26,    27,    28,    29,    30,    -1,
-      32,    -1,    -1,    35,    36,    37,    38,    39,    40,    41,
-      -1,    43,    44,    45,    -1,    47,    -1,    49,    50,    -1,
-      -1,    53,    54,    55,    56,    57,    -1,    59,    60,    61,
-      62,    63,    -1,    65,    66,    67,    68,    69,    70,    -1,
-      72,    73,    -1,    75,    76,    77,    78,    79,    80,    81,
-      82,    83,    84,    85,    -1,    87,    88,    -1,    90,    91,
-      92,    93,    94,    -1,    96,    97,    98,    -1,    -1,    -1,
-     102,   103,   104,    -1,   106,   107,   108,    -1,   110,   111,
-     112,   113,   114,   115,    -1,    -1,    -1,    -1,   120,   121,
-     122,    -1,    -1,   125,   126,   127,    -1,   129,    -1,    -1,
-      -1,    -1,    -1,   135,   136,   137,   138,   139,    -1,    -1,
-      -1,   143,    -1,    -1,   146,   147,   148,    -1,    -1,    -1,
-     152,    -1,   154,   155,    -1,   157,   158,   159,    -1,    -1,
-     162,   163,    -1,   165,   166,   167,   168,   169,   170,   171,
-      -1,   173,   174,   175,   176,   177,   178,   179,   180,   181,
-      -1,   183,   184,   185,   186,   187,   188,    -1,   190,   191,
-      -1,    -1,    -1,   195,   196,   197,   198,    -1,    -1,    -1,
-     202,    -1,   204,   205,   206,   207,    -1,   209,    -1,   211,
-      -1,   213,    -1,   215,   216,    -1,   218,   219,    -1,   221,
-     222,    -1,    -1,    -1,   226,   227,   228,   229,   230,    -1,
-     232,   233,   234,    -1,    -1,   237,    -1,    -1,    -1,   241,
-     242,   243,   244,   245,    -1,    -1,   248,    -1,    -1,    -1,
-     252,   253,    -1,   255,   256,    -1,    -1,    -1,   260,    -1,
-     262,    -1,    -1,   265,   266,    -1,    -1,   269,    -1,   271,
-     272,   273,    -1,    -1,    -1,    -1,    -1,   279,   280,    -1,
-     282,    -1,   284,    -1,   286,   287,    -1,    -1,   290,    -1,
-      -1,    -1,    -1,   295,    -1,   297,   298,   299,   300,   301,
-     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
-     312,   313,    -1,   315,   316,   317,   318,   319,   320,   321,
-     322,   323,   324,   325,    -1,    -1,    -1,    -1,   330,   331,
-     332,   333,   334,   335,    -1,    -1,   338,   339,   340,   341,
-      -1,   343,   344,   345,   346,   347,   348,   349,   350,   351,
-     352,   353,    -1,   355,   356,   357,    -1,    -1,   360,   361,
-     362,   363,   364,   365,   366,   367,   368,   369,    -1,   371,
-     372,   373,    -1,   375,   376,    -1,   378,   379,   380,    -1,
-      -1,   383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   393,   394,   395,   396,   397,    -1,   399,    -1,   401,
-     402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
-     412,    -1,   414,   415,   416,    -1,   418,    -1,   420,   421,
-     422,   423,   424,    -1,   426,   427,   428,    -1,    -1,   431,
-      -1,    -1,    -1,   435,   436,    -1,   438,   439,    -1,    -1,
-     442,   443,   444,   445,   446,    -1,   448,   449,    -1,   451,
-     452,   453,   454,   455,   456,   457,   458,   459,   460,   461,
-     462,   463,    -1,   465,    -1,   467,   468,    -1,   470,   471,
-     472,    -1,   474,    -1,   476,   477,   478,   479,   480,    -1,
-     482,   483,   484,   485,   486,   487,   488,    -1,   490,   491,
-      -1,    -1,    -1,   495,   496,   497,   498,    -1,    -1,    -1,
-     502,    -1,    -1,    -1,   506,    -1,   508,   509,   510,   511,
-      -1,   513,   514,   515,   516,   517,    -1,    -1,    -1,    -1,
-      -1,   523,   524,   525,    -1,   527,    -1,    -1,   530,    -1,
-      -1,   533,    -1,   535,    -1,   537,   538,   539,   540,   541,
-     542,   543,   544,   545,   546,    -1,    -1,   549,   550,   551,
-     552,   553,   554,   555,   556,   557,   558,   559,   560,   561,
-     562,   563,    -1,    -1,   566,   567,   568,   569,    -1,   571,
-     572,   573,    -1,   575,   576,   577,   578,    -1,    -1,    -1,
-      -1,    -1,   584,   585,    -1,   587,   588,   589,   590,   591,
-      -1,   593,   594,   595,   596,   597,   598,    -1,   600,   601,
-      -1,    -1,   604,    -1,    -1,   607,    -1,   609,    -1,   611,
-     612,    -1,    -1,   615,   616,   617,   618,   619,   620,    -1,
-      -1,   623,   624,    -1,   626,   627,    -1,   629,   630,   631,
-     632,    -1,    -1,    -1,    -1,    -1,    -1,   639,   640,   641,
-      -1,   643,   644,   645,   646,    -1,    -1,   649,    -1,    -1,
-     652,   653,   654,   655,   656,    -1,   658,    -1,    -1,    -1,
-      -1,    -1,   664,   665,    -1,   667,   668,   669,   670,   671,
-     672,   673,    -1,   675,   676,   677,   678,   679,   680,    -1,
-     682,   683,   684,   685,   686,   687,   688,    -1,   690,   691,
-     692,   693,   694,   695,   696,    -1,    -1,    -1,   700,   701,
-     702,   703,   704,   705,   706,   707,    -1,   709,   710,   711,
-     712,   713,   714,   715,   716,   717,   718,    -1,   720,   721,
-     722,   723,   724,   725,   726,   727,   728,   729,   730,   731,
-     732,   733,   734,   735,   736,   737,   738,   739,   740,   741,
-     742,   743,    -1,   745,   746,   747,   748,   749,   750,   751,
-      -1,   753,   754,   755,   756,   757,   758,   759,   760,   761,
-     762,   763,   764,   765,   766,   767,   768,   769,   770,   771,
-     772,   773,   774,   775,   776,   777,   778,   779,   780,   781,
-     782,   783,   784,    -1,    -1,    -1,    -1,    -1,   790,   791,
-      -1,    -1,    -1,    -1,   796,    -1,   798,    -1,    -1,    -1,
-     802,    -1,    -1,    -1,   806,   807,     5,     6,    -1,     8,
-       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    35,    36,    37,    38,
-      39,    40,    41,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    54,    55,    56,    57,    -1,
-      59,    60,    61,    62,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    96,    97,    98,
-      -1,    -1,    -1,   102,   103,   104,    -1,   106,   107,   108,
-      -1,   110,   111,   112,   113,   114,   115,    -1,    -1,    -1,
-      -1,   120,   121,   122,    -1,    -1,   125,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,   171,    -1,   173,   174,   175,   176,   177,   178,
-     179,   180,   181,    -1,   183,   184,   185,   186,   187,   188,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,   213,    -1,   215,   216,    -1,   218,
-     219,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,   230,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,   241,   242,   243,   244,   245,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,   271,   272,   273,    -1,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,   290,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,   318,
-     319,   320,   321,   322,   323,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,   340,   341,    -1,   343,   344,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,   355,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,   365,   366,   367,   368,
-     369,    -1,   371,   372,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,   396,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,   411,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,   454,   455,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,   476,   477,   478,
-     479,   480,    -1,   482,   483,   484,   485,   486,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,   543,   544,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,   555,   556,   557,   558,
-     559,   560,   561,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,   571,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,   587,   588,
-     589,   590,   591,    -1,   593,   594,   595,   596,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,   615,   616,   617,   618,
-     619,   620,    -1,    -1,   623,   624,    -1,   626,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,   664,   665,    -1,   667,   668,
-     669,   670,   671,   672,   673,    -1,   675,   676,   677,   678,
-     679,   680,    -1,   682,   683,   684,   685,   686,   687,   688,
-      -1,   690,   691,   692,   693,   694,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,    -1,    -1,    -1,    -1,
-      -1,   790,   791,    -1,    -1,    -1,    -1,   796,    -1,   798,
-      -1,    -1,    -1,   802,    -1,    -1,    -1,   806,   807,     5,
-       6,    -1,     8,     9,    10,    11,    12,    -1,    -1,    15,
-      -1,    -1,    -1,    -1,    20,    -1,    -1,    23,    -1,    25,
-      26,    27,    28,    29,    30,    -1,    32,    -1,    -1,    35,
-      36,    37,    38,    39,    40,    41,    -1,    43,    44,    45,
-      -1,    47,    -1,    49,    50,    -1,    -1,    53,    54,    55,
-      56,    57,    -1,    59,    60,    61,    62,    63,    -1,    65,
-      66,    67,    68,    69,    70,    -1,    72,    73,    -1,    75,
-      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
-      -1,    87,    88,    -1,    90,    91,    92,    93,    94,    -1,
-      96,    97,    98,    -1,    -1,    -1,   102,   103,   104,    -1,
-     106,   107,   108,    -1,   110,   111,   112,   113,   114,   115,
-      -1,    -1,    -1,    -1,   120,   121,   122,    -1,    -1,   125,
-     126,   127,    -1,   129,    -1,    -1,    -1,    -1,    -1,   135,
-     136,   137,   138,   139,    -1,    -1,    -1,   143,    -1,    -1,
-     146,   147,   148,    -1,    -1,    -1,   152,    -1,   154,   155,
-      -1,   157,   158,   159,    -1,    -1,   162,   163,    -1,   165,
-     166,   167,   168,   169,   170,   171,    -1,   173,   174,   175,
-     176,   177,   178,   179,   180,   181,    -1,   183,   184,   185,
-     186,   187,   188,    -1,   190,   191,    -1,    -1,    -1,   195,
-     196,    -1,   198,    -1,    -1,    -1,   202,    -1,   204,   205,
-     206,   207,    -1,   209,    -1,   211,    -1,   213,    -1,   215,
-     216,    -1,   218,   219,    -1,   221,   222,    -1,    -1,    -1,
-     226,   227,   228,   229,   230,    -1,   232,   233,   234,    -1,
-      -1,   237,    -1,    -1,    -1,   241,   242,   243,   244,   245,
-      -1,    -1,   248,    -1,    -1,    -1,   252,   253,    -1,   255,
-     256,    -1,    -1,    -1,   260,    -1,   262,    -1,    -1,   265,
-     266,    -1,    -1,   269,    -1,   271,   272,   273,    -1,    -1,
-      -1,    -1,    -1,   279,   280,    -1,   282,    -1,   284,    -1,
-     286,   287,    -1,    -1,   290,    -1,    -1,    -1,    -1,   295,
-      -1,   297,   298,   299,   300,   301,   302,   303,   304,   305,
-     306,   307,   308,   309,   310,   311,   312,   313,    -1,   315,
-     316,   317,   318,   319,   320,   321,   322,   323,   324,   325,
-      -1,    -1,    -1,    -1,   330,   331,   332,   333,   334,   335,
-      -1,    -1,   338,   339,   340,   341,    -1,   343,   344,   345,
-     346,   347,   348,   349,   350,   351,   352,   353,    -1,   355,
-     356,   357,    -1,    -1,   360,   361,   362,   363,   364,   365,
-     366,   367,   368,   369,    -1,   371,   372,   373,    -1,   375,
-     376,    -1,   378,   379,   380,    -1,    -1,   383,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,   394,   395,
-     396,   397,    -1,   399,    -1,   401,   402,   403,   404,   405,
-     406,   407,   408,   409,   410,   411,   412,    -1,   414,   415,
-     416,    -1,   418,    -1,   420,   421,   422,   423,   424,    -1,
-     426,   427,   428,    -1,    -1,   431,    -1,    -1,    -1,   435,
-     436,    -1,   438,   439,    -1,    -1,   442,   443,   444,   445,
-     446,    -1,   448,   449,    -1,   451,   452,   453,   454,   455,
-     456,   457,   458,   459,   460,   461,   462,   463,    -1,   465,
-      -1,   467,   468,    -1,   470,   471,   472,    -1,   474,    -1,
-     476,   477,   478,   479,   480,    -1,   482,   483,   484,   485,
-     486,   487,   488,    -1,   490,   491,    -1,    -1,    -1,   495,
-     496,   497,   498,    -1,    -1,    -1,   502,    -1,    -1,    -1,
-     506,    -1,   508,   509,   510,   511,    -1,   513,   514,   515,
-     516,   517,    -1,    -1,    -1,    -1,    -1,   523,   524,   525,
-      -1,   527,    -1,    -1,   530,    -1,    -1,   533,    -1,   535,
-      -1,   537,   538,   539,   540,   541,   542,   543,   544,   545,
-     546,    -1,    -1,   549,   550,   551,   552,   553,   554,   555,
-     556,   557,   558,   559,   560,   561,   562,   563,    -1,    -1,
-     566,   567,   568,   569,    -1,   571,   572,   573,    -1,   575,
-     576,   577,   578,    -1,    -1,    -1,    -1,    -1,   584,   585,
-      -1,   587,   588,   589,   590,   591,    -1,   593,   594,   595,
-     596,   597,   598,    -1,   600,   601,    -1,    -1,   604,    -1,
-      -1,   607,    -1,   609,    -1,   611,   612,    -1,    -1,   615,
-     616,   617,   618,   619,   620,    -1,    -1,   623,   624,    -1,
-     626,   627,    -1,   629,   630,   631,   632,    -1,    -1,    -1,
-      -1,    -1,    -1,   639,   640,   641,    -1,   643,   644,   645,
-     646,    -1,    -1,   649,    -1,    -1,   652,   653,   654,   655,
-     656,    -1,   658,    -1,    -1,    -1,    -1,    -1,   664,   665,
-      -1,   667,   668,   669,   670,   671,   672,   673,    -1,   675,
-     676,   677,   678,   679,   680,    -1,   682,   683,   684,   685,
-     686,   687,   688,    -1,   690,   691,   692,   693,   694,   695,
-     696,    -1,    -1,    -1,   700,   701,   702,   703,   704,   705,
-     706,   707,    -1,   709,   710,   711,   712,   713,   714,   715,
-     716,   717,   718,    -1,   720,   721,   722,   723,   724,   725,
-     726,   727,   728,   729,   730,   731,   732,   733,   734,   735,
-     736,   737,   738,   739,   740,   741,   742,   743,    -1,   745,
-     746,   747,   748,   749,   750,   751,    -1,   753,   754,   755,
-     756,   757,   758,   759,   760,   761,   762,   763,   764,   765,
-     766,   767,   768,   769,   770,   771,   772,   773,   774,   775,
-     776,   777,   778,   779,   780,   781,   782,   783,   784,    -1,
-      -1,    -1,    -1,    -1,   790,   791,    -1,    -1,    -1,    -1,
-     796,    -1,   798,    -1,    -1,    -1,   802,    -1,    -1,    -1,
-     806,   807,     5,     6,    -1,     8,     9,    10,    11,    12,
-      13,    -1,    15,    -1,    -1,    -1,    -1,    20,    -1,    -1,
-      23,    -1,    25,    26,    27,    28,    29,    30,    -1,    32,
-      -1,    -1,    35,    36,    37,    38,    39,    40,    41,    -1,
-      43,    44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,
-      53,    54,    55,    56,    57,    -1,    59,    60,    61,    62,
-      63,    -1,    65,    66,    67,    68,    69,    70,    -1,    72,
-      73,    -1,    75,    76,    77,    78,    79,    80,    81,    82,
-      83,    84,    85,    -1,    87,    88,    -1,    90,    91,    92,
-      93,    94,    -1,    96,    97,    98,    -1,    -1,    -1,   102,
-     103,   104,    -1,   106,   107,   108,    -1,   110,   111,   112,
-     113,   114,   115,    -1,    -1,    -1,    -1,   120,   121,   122,
-      -1,    -1,   125,   126,   127,    -1,   129,    -1,    -1,    -1,
-      -1,    -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,
-     143,    -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,
-      -1,   154,   155,    -1,   157,   158,   159,    -1,    -1,   162,
-     163,    -1,   165,   166,   167,   168,   169,   170,   171,    -1,
-     173,   174,   175,   176,   177,   178,   179,   180,   181,    -1,
-     183,   184,   185,   186,   187,   188,    -1,   190,   191,    -1,
-      -1,    -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,
-      -1,   204,   205,   206,   207,    -1,   209,    -1,   211,    -1,
-     213,    -1,   215,   216,    -1,   218,   219,    -1,   221,   222,
-      -1,    -1,    -1,   226,   227,   228,   229,   230,    -1,   232,
-     233,   234,    -1,    -1,   237,    -1,    -1,    -1,   241,   242,
-     243,   244,   245,    -1,    -1,   248,    -1,    -1,    -1,   252,
-     253,    -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,
-      -1,    -1,   265,   266,    -1,    -1,   269,    -1,   271,   272,
-     273,    -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,
-      -1,   284,    -1,   286,   287,    -1,    -1,   290,    -1,    -1,
-      -1,    -1,   295,    -1,   297,   298,   299,   300,   301,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-     313,    -1,   315,   316,   317,   318,   319,   320,   321,   322,
-     323,   324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,
-     333,   334,   335,    -1,    -1,   338,   339,   340,   341,    -1,
-     343,   344,   345,   346,   347,   348,   349,   350,   351,   352,
-     353,    -1,   355,   356,   357,    -1,    -1,   360,   361,   362,
-     363,   364,   365,    -1,   367,   368,   369,    -1,   371,   372,
-     373,    -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,
-     383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     393,   394,   395,   396,   397,    -1,   399,    -1,   401,   402,
-     403,   404,   405,   406,   407,   408,   409,   410,   411,   412,
-      -1,   414,   415,   416,    -1,   418,    -1,   420,   421,   422,
-     423,   424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,
-      -1,    -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,
-     443,   444,   445,   446,    -1,   448,   449,    -1,   451,   452,
-     453,   454,   455,   456,   457,   458,   459,   460,   461,   462,
-     463,    -1,   465,    -1,   467,   468,    -1,   470,   471,   472,
-      -1,   474,    -1,   476,   477,   478,   479,   480,    -1,   482,
-     483,   484,   485,   486,   487,   488,    -1,   490,   491,    -1,
-      -1,    -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,
-      -1,    -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,
-     513,   514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,
-     523,   524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,
-     533,    -1,   535,    -1,   537,   538,   539,   540,   541,   542,
-     543,   544,   545,   546,    -1,    -1,   549,   550,   551,   552,
-     553,   554,   555,   556,   557,   558,   559,   560,   561,   562,
-     563,    -1,    -1,   566,   567,   568,   569,    -1,   571,   572,
-     573,    -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,
-      -1,   584,   585,    -1,   587,   588,   589,   590,   591,    -1,
-     593,   594,   595,   596,   597,   598,    -1,   600,   601,    -1,
-      -1,   604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,
-      -1,    -1,   615,   616,   617,   618,   619,   620,    -1,    -1,
-     623,   624,    -1,   626,   627,    -1,   629,   630,   631,   632,
-      -1,    -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,
-     643,   644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,
-     653,   654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,
-      -1,   664,   665,    -1,   667,   668,   669,   670,   671,   672,
-     673,    -1,   675,   676,   677,   678,   679,   680,    -1,   682,
-     683,   684,   685,   686,   687,   688,    -1,   690,   691,   692,
-     693,   694,   695,   696,    -1,    -1,    -1,   700,   701,   702,
-     703,   704,   705,   706,   707,    -1,   709,   710,   711,   712,
-     713,   714,   715,   716,   717,   718,    -1,   720,   721,   722,
-     723,   724,   725,   726,   727,   728,   729,   730,   731,   732,
-     733,   734,   735,   736,   737,   738,   739,   740,   741,   742,
-     743,    -1,   745,   746,   747,   748,   749,   750,   751,    -1,
-     753,   754,   755,   756,   757,   758,   759,   760,   761,   762,
-     763,   764,   765,   766,   767,   768,   769,   770,   771,   772,
-     773,   774,   775,   776,   777,   778,   779,   780,   781,   782,
-     783,   784,    -1,    -1,    -1,    -1,    -1,   790,   791,    -1,
-      -1,    -1,    -1,   796,    -1,   798,    -1,    -1,    -1,   802,
-      -1,    -1,    -1,   806,   807,     5,     6,    -1,     8,     9,
-      10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,    -1,
-      20,    -1,    -1,    23,    -1,    25,    26,    27,    28,    29,
-      30,    -1,    32,    -1,    -1,    35,    36,    37,    38,    39,
-      40,    41,    -1,    43,    44,    45,    -1,    47,    -1,    49,
-      50,    -1,    -1,    53,    54,    55,    56,    57,    -1,    59,
-      60,    61,    62,    63,    -1,    65,    66,    67,    68,    69,
-      70,    -1,    72,    73,    -1,    75,    76,    77,    78,    79,
-      80,    81,    82,    83,    84,    85,    -1,    87,    88,    -1,
-      90,    91,    92,    93,    94,    -1,    96,    97,    98,    -1,
-      -1,    -1,   102,   103,   104,    -1,   106,   107,   108,    -1,
-     110,   111,   112,   113,   114,   115,    -1,    -1,    -1,    -1,
-     120,   121,   122,    -1,    -1,   125,   126,   127,    -1,   129,
-      -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,   139,
-      -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,    -1,
-      -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,   159,
-      -1,    -1,   162,   163,    -1,   165,   166,   167,   168,   169,
-     170,   171,    -1,   173,   174,   175,   176,   177,   178,   179,
-     180,   181,    -1,   183,   184,   185,   186,   187,   188,    -1,
-     190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,    -1,
-      -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,   209,
-      -1,   211,    -1,   213,    -1,   215,   216,    -1,   218,   219,
-      -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,   229,
-     230,    -1,   232,   233,   234,    -1,    -1,   237,    -1,    -1,
-      -1,   241,   242,   243,   244,   245,    -1,    -1,   248,    -1,
-      -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,    -1,
-     260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,   269,
-      -1,   271,   272,   273,    -1,    -1,    -1,    -1,    -1,   279,
-     280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,    -1,
-     290,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,   299,
-     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
-     310,   311,   312,   313,    -1,   315,   316,   317,   318,   319,
-     320,   321,   322,   323,   324,   325,    -1,    -1,    -1,    -1,
-     330,   331,   332,   333,   334,   335,    -1,    -1,   338,   339,
-     340,   341,    -1,   343,   344,   345,   346,   347,   348,   349,
-     350,   351,   352,   353,    -1,   355,   356,   357,    -1,    -1,
-     360,   361,   362,   363,   364,   365,   366,   367,   368,   369,
-      -1,   371,   372,   373,    -1,   375,   376,    -1,   378,   379,
-     380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   393,   394,   395,   396,   397,    -1,   399,
-      -1,   401,   402,   403,   404,   405,   406,   407,   408,   409,
-     410,   411,   412,    -1,   414,   415,   416,    -1,   418,    -1,
-     420,   421,   422,   423,   424,    -1,   426,   427,   428,    -1,
-      -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,   439,
-      -1,    -1,   442,   443,   444,   445,   446,    -1,   448,   449,
-      -1,   451,   452,   453,   454,   455,   456,   457,   458,   459,
-     460,   461,   462,   463,    -1,   465,    -1,   467,   468,    -1,
-     470,   471,   472,    -1,   474,    -1,   476,   477,   478,   479,
-     480,    -1,   482,   483,   484,   485,   486,   487,   488,    -1,
-     490,   491,    -1,    -1,    -1,   495,   496,   497,   498,    -1,
-      -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,   509,
-     510,   511,    -1,   513,   514,   515,   516,   517,    -1,    -1,
-      -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,    -1,
-     530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,   539,
-     540,   541,   542,   543,   544,   545,   546,    -1,    -1,   549,
-     550,   551,   552,   553,   554,   555,   556,   557,   558,   559,
-     560,   561,   562,   563,    -1,    -1,   566,   567,   568,   569,
-      -1,   571,   572,   573,    -1,   575,   576,   577,   578,    -1,
-      -1,    -1,    -1,    -1,   584,   585,    -1,   587,   588,   589,
-     590,   591,    -1,   593,   594,   595,   596,   597,   598,    -1,
-     600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,   609,
-      -1,   611,   612,    -1,    -1,   615,   616,   617,   618,   619,
-     620,    -1,    -1,   623,   624,    -1,   626,   627,    -1,   629,
-     630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,   639,
-     640,   641,    -1,   643,   644,   645,   646,    -1,    -1,   649,
-      -1,    -1,   652,   653,   654,   655,   656,    -1,   658,    -1,
-      -1,    -1,    -1,    -1,   664,   665,    -1,   667,   668,   669,
-     670,   671,   672,   673,    -1,   675,   676,   677,   678,   679,
-     680,    -1,   682,   683,   684,   685,   686,   687,   688,    -1,
-     690,   691,   692,   693,   694,   695,   696,    -1,    -1,    -1,
-     700,   701,   702,   703,   704,   705,   706,   707,    -1,   709,
-     710,   711,   712,   713,   714,   715,   716,   717,   718,    -1,
-     720,   721,   722,   723,   724,   725,   726,   727,   728,   729,
-     730,   731,   732,   733,   734,   735,   736,   737,   738,   739,
-     740,   741,   742,   743,    -1,   745,   746,   747,   748,   749,
-     750,   751,    -1,   753,   754,   755,   756,   757,   758,   759,
-     760,   761,   762,   763,   764,   765,   766,   767,   768,   769,
-     770,   771,   772,   773,   774,   775,   776,   777,   778,   779,
-     780,   781,   782,   783,   784,    -1,    -1,    -1,    -1,    -1,
-     790,   791,    -1,    -1,    -1,    -1,   796,    -1,   798,    -1,
-      -1,    -1,   802,    -1,    -1,    -1,   806,   807,     5,     6,
-      -1,     8,     9,    10,    11,    12,    -1,    -1,    15,    -1,
-      -1,    -1,    -1,    20,    -1,    -1,    23,    -1,    25,    26,
-      27,    28,    29,    30,    -1,    32,    -1,    -1,    35,    36,
-      37,    38,    39,    40,    41,    -1,    43,    44,    45,    -1,
-      47,    -1,    49,    50,    -1,    -1,    53,    54,    55,    56,
-      57,    -1,    59,    60,    61,    62,    63,    -1,    65,    66,
-      67,    68,    69,    70,    -1,    72,    73,    -1,    75,    76,
-      77,    78,    79,    80,    81,    82,    83,    84,    85,    -1,
-      87,    88,    -1,    90,    91,    92,    93,    94,    -1,    96,
-      97,    98,    -1,    -1,    -1,   102,   103,   104,    -1,   106,
-     107,   108,    -1,   110,   111,   112,   113,   114,   115,    -1,
-      -1,    -1,    -1,   120,   121,   122,    -1,    -1,   125,   126,
-     127,    -1,   129,    -1,    -1,    -1,    -1,    -1,   135,   136,
-     137,   138,   139,    -1,    -1,    -1,   143,    -1,    -1,   146,
-     147,   148,    -1,    -1,    -1,   152,    -1,   154,   155,    -1,
-     157,   158,   159,    -1,    -1,   162,   163,    -1,   165,   166,
-     167,   168,   169,   170,   171,    -1,   173,   174,   175,   176,
-     177,   178,   179,   180,   181,    -1,   183,   184,   185,   186,
-     187,   188,    -1,   190,   191,    -1,    -1,    -1,   195,   196,
-      -1,   198,    -1,    -1,    -1,   202,    -1,   204,   205,   206,
-     207,    -1,   209,    -1,   211,    -1,   213,    -1,   215,   216,
-      -1,   218,   219,    -1,   221,   222,    -1,    -1,    -1,   226,
-     227,   228,   229,   230,    -1,   232,   233,   234,    -1,    -1,
-     237,    -1,    -1,    -1,   241,   242,   243,   244,   245,    -1,
-      -1,   248,    -1,    -1,    -1,   252,   253,    -1,   255,   256,
-      -1,    -1,    -1,   260,    -1,   262,    -1,    -1,   265,   266,
-      -1,    -1,   269,    -1,   271,   272,   273,    -1,    -1,    -1,
-      -1,    -1,   279,   280,    -1,   282,    -1,   284,    -1,   286,
-     287,    -1,    -1,   290,    -1,    -1,    -1,    -1,   295,    -1,
-     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,   313,    -1,   315,   316,
-     317,   318,   319,   320,   321,   322,   323,   324,   325,    -1,
-      -1,    -1,    -1,   330,   331,   332,   333,   334,   335,    -1,
-      -1,   338,   339,   340,   341,    -1,   343,   344,   345,   346,
-     347,   348,   349,   350,   351,   352,   353,    -1,   355,   356,
-     357,    -1,    -1,   360,   361,   362,   363,   364,   365,   366,
-     367,   368,   369,    -1,   371,   372,   373,    -1,   375,   376,
-      -1,   378,   379,   380,    -1,    -1,   383,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   393,   394,   395,   396,
-     397,    -1,   399,    -1,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,   412,    -1,   414,   415,   416,
-      -1,   418,    -1,   420,   421,   422,   423,   424,    -1,   426,
-     427,   428,    -1,    -1,   431,    -1,    -1,    -1,   435,   436,
-      -1,   438,   439,    -1,    -1,   442,   443,   444,   445,   446,
-      -1,   448,   449,    -1,   451,   452,   453,   454,   455,   456,
-     457,   458,   459,   460,   461,   462,   463,    -1,   465,    -1,
-     467,   468,    -1,   470,   471,   472,    -1,   474,    -1,   476,
-     477,   478,   479,   480,    -1,   482,   483,   484,   485,   486,
-     487,   488,    -1,   490,   491,    -1,    -1,    -1,   495,   496,
-     497,   498,    -1,    -1,    -1,   502,    -1,    -1,    -1,   506,
-      -1,   508,   509,   510,   511,    -1,   513,   514,   515,   516,
-     517,    -1,    -1,    -1,    -1,    -1,   523,   524,   525,    -1,
-     527,    -1,    -1,   530,    -1,    -1,   533,    -1,   535,    -1,
-     537,   538,   539,   540,   541,   542,   543,   544,   545,   546,
-      -1,    -1,   549,   550,   551,   552,   553,   554,   555,   556,
-     557,   558,   559,   560,   561,   562,   563,    -1,    -1,   566,
-     567,   568,   569,    -1,   571,   572,   573,    -1,   575,   576,
-     577,   578,    -1,    -1,    -1,    -1,    -1,   584,   585,    -1,
-     587,   588,   589,   590,   591,    -1,   593,   594,   595,   596,
-     597,   598,    -1,   600,   601,    -1,    -1,   604,    -1,    -1,
-     607,    -1,   609,    -1,   611,   612,    -1,    -1,   615,   616,
-     617,   618,   619,   620,    -1,    -1,   623,   624,    -1,   626,
-     627,    -1,   629,   630,   631,   632,    -1,    -1,    -1,    -1,
-      -1,    -1,   639,   640,   641,    -1,   643,   644,   645,   646,
-      -1,    -1,   649,    -1,    -1,   652,   653,   654,   655,   656,
-      -1,   658,    -1,    -1,    -1,    -1,    -1,   664,   665,    -1,
-     667,   668,   669,   670,   671,   672,   673,    -1,   675,   676,
-     677,   678,   679,   680,    -1,   682,   683,   684,   685,   686,
-     687,   688,    -1,   690,   691,   692,   693,   694,   695,   696,
-      -1,    -1,    -1,   700,   701,   702,   703,   704,   705,   706,
-     707,    -1,   709,   710,   711,   712,   713,   714,   715,   716,
-     717,   718,    -1,   720,   721,   722,   723,   724,   725,   726,
-     727,   728,   729,   730,   731,   732,   733,   734,   735,   736,
-     737,   738,   739,   740,   741,   742,   743,    -1,   745,   746,
-     747,   748,   749,   750,   751,    -1,   753,   754,   755,   756,
-     757,   758,   759,   760,   761,   762,   763,   764,   765,   766,
-     767,   768,   769,   770,   771,   772,   773,   774,   775,   776,
-     777,   778,   779,   780,   781,   782,   783,   784,    -1,    -1,
-      -1,    -1,    -1,   790,   791,    -1,    -1,    -1,    -1,   796,
-      -1,   798,    -1,    -1,    -1,   802,    -1,    -1,    -1,   806,
-     807,     5,     6,    -1,     8,     9,    10,    11,    12,    -1,
-      -1,    15,    -1,    -1,    -1,    -1,    20,    -1,    -1,    23,
-      -1,    25,    26,    27,    28,    29,    30,    -1,    32,    -1,
-      -1,    35,    36,    37,    38,    39,    40,    41,    -1,    43,
-      44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,
-      54,    55,    56,    57,    -1,    59,    60,    61,    62,    63,
-      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
-      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    -1,    87,    88,    -1,    90,    91,    92,    93,
-      94,    -1,    96,    97,    98,    -1,    -1,    -1,   102,   103,
-     104,    -1,   106,   107,   108,    -1,   110,   111,   112,   113,
-     114,   115,    -1,    -1,    -1,    -1,   120,   121,   122,    -1,
-      -1,   125,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,
-      -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,   143,
-      -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,
-     154,   155,    -1,   157,   158,   159,    -1,    -1,   162,   163,
-      -1,   165,   166,   167,   168,   169,   170,   171,    -1,   173,
-     174,   175,   176,   177,   178,   179,   180,   181,    -1,   183,
-     184,   185,   186,   187,   188,    -1,   190,   191,    -1,    -1,
-      -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,
-     204,   205,   206,   207,    -1,   209,    -1,   211,    -1,   213,
-      -1,   215,   216,    -1,   218,   219,    -1,   221,   222,    -1,
-      -1,    -1,   226,   227,   228,   229,   230,    -1,   232,   233,
-     234,    -1,    -1,   237,    -1,    -1,    -1,   241,   242,   243,
-     244,   245,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,
-      -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,
-      -1,   265,   266,    -1,    -1,   269,    -1,   271,   272,   273,
-      -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,
-     284,    -1,   286,   287,    -1,    -1,   290,    -1,    -1,    -1,
-      -1,   295,    -1,   297,   298,   299,   300,   301,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
-      -1,   315,   316,   317,   318,   319,   320,   321,   322,   323,
-     324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,
-     334,   335,    -1,    -1,   338,   339,   340,   341,    -1,   343,
-     344,   345,   346,   347,   348,   349,   350,   351,   352,   353,
-      -1,   355,   356,   357,    -1,    -1,   360,   361,   362,   363,
-     364,   365,   366,   367,   368,   369,    -1,   371,   372,   373,
-      -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,   383,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,
-     394,   395,   396,   397,    -1,   399,    -1,   401,   402,   403,
-     404,   405,   406,   407,   408,   409,   410,   411,   412,    -1,
-     414,   415,   416,    -1,   418,    -1,   420,   421,   422,   423,
-     424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,
-      -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,   443,
-     444,   445,   446,    -1,   448,   449,    -1,   451,   452,   453,
-     454,   455,   456,   457,   458,   459,   460,   461,   462,   463,
-      -1,   465,    -1,   467,   468,    -1,   470,   471,   472,    -1,
-     474,    -1,   476,   477,   478,   479,   480,    -1,   482,   483,
-     484,   485,   486,   487,   488,    -1,   490,   491,    -1,    -1,
-      -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,
-      -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,   513,
-     514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,
-     524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,
-      -1,   535,    -1,   537,   538,   539,   540,   541,   542,   543,
-     544,   545,   546,    -1,    -1,   549,   550,   551,   552,   553,
-     554,   555,   556,   557,   558,   559,   560,   561,   562,   563,
-      -1,    -1,   566,   567,   568,   569,    -1,   571,   572,   573,
-      -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,
-     584,   585,    -1,   587,   588,   589,   590,   591,    -1,   593,
-     594,   595,   596,   597,   598,    -1,   600,   601,    -1,    -1,
-     604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,
-      -1,   615,   616,   617,   618,   619,   620,    -1,    -1,   623,
-     624,    -1,   626,   627,    -1,   629,   630,   631,   632,    -1,
-      -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,
-     644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,
-     654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,
-     664,   665,    -1,   667,   668,   669,   670,   671,   672,   673,
-      -1,   675,   676,   677,   678,   679,   680,    -1,   682,   683,
-     684,   685,   686,   687,   688,    -1,   690,   691,   692,   693,
-     694,   695,   696,    -1,    -1,    -1,   700,   701,   702,   703,
-     704,   705,   706,   707,    -1,   709,   710,   711,   712,   713,
-     714,   715,   716,   717,   718,    -1,   720,   721,   722,   723,
-     724,   725,   726,   727,   728,   729,   730,   731,   732,   733,
-     734,   735,   736,   737,   738,   739,   740,   741,   742,   743,
-      -1,   745,   746,   747,   748,   749,   750,   751,    -1,   753,
-     754,   755,   756,   757,   758,   759,   760,   761,   762,   763,
-     764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
-     774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
-     784,    -1,    -1,    -1,    -1,    -1,   790,   791,    -1,    -1,
-      -1,    -1,   796,    -1,   798,    -1,    -1,    -1,   802,    -1,
-      -1,    -1,   806,   807,     5,     6,    -1,     8,     9,    10,
-      11,    12,    -1,    -1,    15,    -1,    -1,    -1,    -1,    20,
-      -1,    -1,    23,    -1,    25,    26,    27,    28,    29,    30,
-      -1,    32,    -1,    -1,    35,    36,    37,    38,    39,    40,
-      41,    -1,    43,    44,    45,    -1,    47,    -1,    49,    50,
-      -1,    -1,    53,    54,    55,    56,    57,    -1,    59,    60,
-      61,    62,    63,    -1,    65,    66,    67,    68,    69,    70,
-      -1,    72,    73,    -1,    75,    76,    77,    78,    79,    80,
-      81,    82,    83,    84,    85,    -1,    87,    88,    -1,    90,
-      91,    92,    93,    94,    -1,    96,    97,    98,    -1,    -1,
-      -1,   102,   103,   104,    -1,   106,   107,   108,    -1,   110,
-     111,   112,   113,   114,   115,    -1,    -1,    -1,    -1,   120,
-     121,   122,    -1,    -1,   125,   126,   127,    -1,   129,    -1,
-      -1,    -1,    -1,    -1,   135,   136,   137,   138,   139,    -1,
-      -1,    -1,   143,    -1,    -1,   146,   147,   148,    -1,    -1,
-      -1,   152,    -1,   154,   155,    -1,   157,   158,   159,    -1,
-      -1,   162,   163,    -1,   165,   166,   167,   168,   169,   170,
-     171,    -1,   173,   174,   175,   176,   177,   178,   179,   180,
-     181,    -1,   183,   184,   185,   186,   187,   188,    -1,   190,
-     191,    -1,    -1,    -1,   195,   196,    -1,   198,    -1,    -1,
-      -1,   202,    -1,   204,   205,   206,   207,    -1,   209,    -1,
-     211,    -1,   213,    -1,   215,   216,    -1,   218,   219,    -1,
-     221,   222,    -1,    -1,    -1,   226,   227,   228,   229,   230,
-      -1,   232,   233,   234,    -1,    -1,   237,    -1,    -1,    -1,
-     241,   242,   243,   244,   245,    -1,    -1,   248,    -1,    -1,
-      -1,   252,   253,    -1,   255,   256,    -1,    -1,    -1,   260,
-      -1,   262,    -1,    -1,   265,   266,    -1,    -1,   269,    -1,
-     271,   272,   273,    -1,    -1,    -1,    -1,    -1,   279,   280,
-      -1,   282,    -1,   284,    -1,   286,   287,    -1,    -1,   290,
-      -1,    -1,    -1,    -1,   295,    -1,   297,   298,   299,   300,
-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,    -1,   315,   316,   317,   318,   319,   320,
-     321,   322,   323,   324,   325,   326,    -1,    -1,    -1,   330,
-     331,   332,   333,   334,   335,    -1,    -1,   338,   339,   340,
-     341,    -1,   343,   344,   345,   346,   347,   348,   349,   350,
-     351,   352,   353,    -1,   355,   356,   357,    -1,    -1,   360,
-     361,   362,   363,   364,   365,    -1,   367,   368,   369,    -1,
-     371,   372,   373,    -1,   375,   376,    -1,   378,   379,   380,
-      -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   393,   394,   395,   396,   397,    -1,   399,    -1,
-     401,   402,   403,   404,   405,   406,   407,   408,   409,   410,
-     411,   412,    -1,   414,   415,   416,    -1,   418,    -1,   420,
-     421,   422,   423,   424,    -1,   426,   427,   428,    -1,    -1,
-     431,    -1,    -1,    -1,   435,   436,    -1,   438,   439,    -1,
-      -1,   442,   443,   444,   445,   446,    -1,   448,   449,    -1,
-     451,   452,   453,   454,   455,   456,   457,   458,   459,   460,
-     461,   462,   463,    -1,   465,    -1,   467,   468,    -1,   470,
-     471,   472,    -1,   474,    -1,   476,   477,   478,   479,   480,
-      -1,   482,   483,   484,   485,   486,   487,   488,    -1,   490,
-     491,    -1,    -1,    -1,   495,   496,   497,   498,    -1,    -1,
-      -1,   502,    -1,    -1,    -1,   506,    -1,   508,   509,   510,
-     511,    -1,   513,   514,   515,   516,   517,    -1,    -1,    -1,
-      -1,    -1,   523,   524,   525,    -1,   527,    -1,    -1,   530,
-      -1,    -1,   533,    -1,   535,    -1,   537,   538,   539,   540,
-     541,   542,   543,   544,   545,   546,    -1,    -1,   549,   550,
-     551,   552,   553,   554,   555,   556,   557,   558,   559,   560,
-     561,   562,   563,    -1,    -1,   566,   567,   568,   569,    -1,
-     571,   572,   573,    -1,   575,   576,   577,   578,    -1,    -1,
-      -1,    -1,    -1,   584,   585,    -1,   587,   588,   589,   590,
-     591,    -1,   593,   594,   595,   596,   597,   598,    -1,   600,
-     601,    -1,    -1,   604,    -1,    -1,   607,    -1,   609,    -1,
-     611,   612,    -1,    -1,   615,   616,   617,   618,   619,   620,
-      -1,    -1,   623,   624,    -1,   626,   627,    -1,   629,   630,
-     631,   632,    -1,    -1,    -1,    -1,    -1,    -1,   639,   640,
-     641,    -1,   643,   644,   645,   646,    -1,    -1,   649,    -1,
-      -1,   652,   653,   654,   655,   656,    -1,   658,    -1,    -1,
-      -1,    -1,    -1,   664,   665,    -1,   667,   668,   669,   670,
-     671,   672,   673,    -1,   675,   676,   677,   678,   679,   680,
-      -1,   682,   683,   684,   685,   686,   687,   688,    -1,   690,
-     691,   692,   693,   694,   695,   696,    -1,    -1,    -1,   700,
-     701,   702,   703,   704,   705,   706,   707,    -1,   709,   710,
-     711,   712,   713,   714,   715,   716,   717,   718,    -1,   720,
-     721,   722,   723,   724,   725,   726,   727,   728,   729,   730,
-     731,   732,   733,   734,   735,   736,   737,   738,   739,   740,
-     741,   742,   743,    -1,   745,   746,   747,   748,   749,   750,
-     751,    -1,   753,   754,   755,   756,   757,   758,   759,   760,
-     761,   762,   763,   764,   765,   766,   767,   768,   769,   770,
-     771,   772,   773,   774,   775,   776,   777,   778,   779,   780,
-     781,   782,   783,   784,    -1,    -1,    -1,    -1,    -1,   790,
-     791,    -1,    -1,    -1,    -1,   796,    -1,   798,    -1,    -1,
-      -1,   802,    -1,    -1,    -1,   806,   807,     5,     6,    -1,
-       8,     9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,
-      -1,    -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,
-      28,    29,    30,    -1,    32,    -1,    -1,    35,    36,    37,
-      38,    39,    40,    41,    -1,    43,    44,    45,    -1,    47,
-      -1,    49,    50,    -1,    -1,    53,    54,    55,    56,    57,
-      -1,    59,    60,    61,    62,    63,    -1,    65,    66,    67,
-      68,    69,    70,    -1,    72,    73,    -1,    75,    76,    77,
-      78,    79,    80,    81,    82,    83,    84,    85,    -1,    87,
-      88,    -1,    90,    91,    92,    93,    94,    -1,    96,    97,
-      98,    -1,    -1,    -1,   102,   103,   104,    -1,   106,   107,
-     108,    -1,   110,   111,   112,   113,   114,   115,    -1,    -1,
-      -1,    -1,   120,   121,   122,    -1,    -1,   125,   126,   127,
-      -1,   129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,
-     138,   139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,
-     148,    -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,
-     158,   159,    -1,    -1,   162,   163,    -1,   165,   166,   167,
-     168,   169,   170,   171,    -1,   173,   174,   175,   176,   177,
-     178,   179,   180,   181,    -1,   183,   184,   185,   186,   187,
-     188,    -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,
-     198,    -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,
-      -1,   209,    -1,   211,    -1,   213,    -1,   215,   216,    -1,
-     218,   219,    -1,   221,   222,    -1,    -1,    -1,   226,   227,
-     228,   229,   230,    -1,   232,   233,   234,    -1,    -1,   237,
-      -1,    -1,    -1,   241,   242,   243,   244,   245,    -1,    -1,
-     248,    -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,
-      -1,    -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,
-      -1,   269,    -1,   271,   272,   273,    -1,    -1,    -1,    -1,
-      -1,   279,   280,    -1,   282,    -1,   284,    -1,   286,   287,
-      -1,    -1,   290,    -1,    -1,    -1,    -1,   295,    -1,   297,
-     298,   299,   300,   301,   302,   303,   304,   305,   306,   307,
-     308,   309,   310,   311,   312,   313,    -1,   315,   316,   317,
-     318,   319,   320,   321,   322,   323,   324,   325,    -1,    -1,
-      -1,    -1,   330,   331,   332,   333,   334,   335,    -1,    -1,
-     338,   339,   340,   341,    -1,   343,   344,   345,   346,   347,
-     348,   349,   350,   351,   352,   353,    -1,   355,   356,   357,
-      -1,    -1,   360,   361,   362,   363,   364,   365,    -1,   367,
-     368,   369,    -1,   371,   372,   373,    -1,   375,   376,    -1,
-     378,   379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   393,   394,   395,   396,   397,
-      -1,   399,    -1,   401,   402,   403,   404,   405,   406,   407,
-     408,   409,   410,   411,   412,    -1,   414,   415,   416,    -1,
-     418,    -1,   420,   421,   422,   423,   424,    -1,   426,   427,
-     428,    -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,
-     438,   439,    -1,    -1,   442,   443,   444,   445,   446,    -1,
-     448,   449,    -1,   451,   452,   453,   454,   455,   456,   457,
-     458,   459,   460,   461,   462,   463,    -1,   465,    -1,   467,
-     468,    -1,   470,   471,   472,    -1,   474,    -1,   476,   477,
-     478,   479,   480,    -1,   482,   483,   484,   485,   486,   487,
-     488,    -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,
-     498,    -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,
-     508,   509,   510,   511,    -1,   513,   514,   515,   516,   517,
-      -1,    -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,
-      -1,    -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,
-     538,   539,   540,   541,   542,   543,   544,   545,   546,    -1,
-      -1,   549,   550,   551,   552,   553,   554,   555,   556,   557,
-     558,   559,   560,   561,   562,   563,    -1,    -1,   566,   567,
-     568,   569,    -1,   571,   572,   573,    -1,   575,   576,   577,
-     578,    -1,    -1,    -1,    -1,    -1,   584,   585,    -1,   587,
-     588,   589,   590,   591,    -1,   593,   594,   595,   596,   597,
-     598,    -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,
-      -1,   609,    -1,   611,   612,    -1,    -1,   615,   616,   617,
-     618,   619,   620,    -1,    -1,   623,   624,    -1,   626,   627,
-      -1,   629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,
-      -1,   639,   640,   641,    -1,   643,   644,   645,   646,    -1,
-      -1,   649,    -1,    -1,   652,   653,   654,   655,   656,    -1,
-     658,    -1,    -1,    -1,    -1,    -1,   664,   665,    -1,   667,
-     668,   669,   670,   671,   672,   673,    -1,   675,   676,   677,
-     678,   679,   680,    -1,   682,   683,   684,   685,   686,   687,
-     688,    -1,   690,   691,   692,   693,   694,   695,   696,    -1,
-      -1,    -1,   700,   701,   702,   703,   704,   705,   706,   707,
-      -1,   709,   710,   711,   712,   713,   714,   715,   716,   717,
-     718,    -1,   720,   721,   722,   723,   724,   725,   726,   727,
-     728,   729,   730,   731,   732,   733,   734,   735,   736,   737,
-     738,   739,   740,   741,   742,   743,    -1,   745,   746,   747,
-     748,   749,   750,   751,    -1,   753,   754,   755,   756,   757,
-     758,   759,   760,   761,   762,   763,   764,   765,   766,   767,
-     768,   769,   770,   771,   772,   773,   774,   775,   776,   777,
-     778,   779,   780,   781,   782,   783,   784,    -1,    -1,    -1,
-      -1,    -1,   790,   791,    -1,    -1,    -1,    -1,   796,    -1,
-     798,    -1,    -1,    -1,   802,    -1,    -1,    -1,   806,   807,
-       5,     6,    -1,     8,     9,    10,    11,    12,    -1,    -1,
-      15,    -1,    -1,    -1,    -1,    20,    -1,    -1,    23,    -1,
-      25,    26,    27,    28,    29,    30,    -1,    32,    -1,    -1,
-      35,    36,    37,    38,    39,    40,    41,    -1,    43,    44,
-      45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,    54,
-      55,    56,    57,    -1,    59,    60,    61,    62,    63,    -1,
-      65,    66,    67,    68,    69,    70,    -1,    72,    73,    -1,
-      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
-      85,    -1,    87,    88,    -1,    90,    91,    92,    93,    94,
-      -1,    96,    97,    98,    -1,    -1,    -1,   102,   103,   104,
-      -1,   106,   107,   108,    -1,   110,   111,   112,   113,   114,
-     115,    -1,    -1,    -1,    -1,   120,   121,   122,    -1,    -1,
-     125,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,    -1,
-     135,   136,   137,   138,   139,    -1,    -1,    -1,   143,    -1,
-      -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,   154,
-     155,    -1,   157,   158,   159,    -1,    -1,   162,   163,    -1,
-     165,   166,   167,   168,   169,   170,   171,    -1,   173,   174,
-     175,   176,   177,   178,   179,   180,   181,    -1,   183,   184,
-     185,   186,   187,   188,    -1,   190,   191,    -1,    -1,    -1,
-     195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,   204,
-     205,   206,   207,    -1,   209,    -1,   211,    -1,   213,    -1,
-     215,   216,    -1,   218,   219,    -1,   221,   222,    -1,    -1,
-      -1,   226,   227,   228,   229,   230,    -1,   232,   233,   234,
-      -1,    -1,   237,    -1,    -1,    -1,   241,   242,   243,   244,
-     245,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,    -1,
-     255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,    -1,
-     265,   266,    -1,    -1,   269,    -1,   271,   272,   273,    -1,
-      -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,   284,
-      -1,   286,   287,    -1,    -1,   290,    -1,    -1,    -1,    -1,
-     295,    -1,   297,   298,   299,   300,   301,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,   313,    -1,
-     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
-     325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,   334,
-     335,    -1,    -1,   338,   339,   340,   341,    -1,   343,   344,
-     345,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
-     355,   356,   357,    -1,    -1,   360,   361,   362,   363,   364,
-     365,    -1,   367,   368,   369,    -1,   371,   372,   373,    -1,
-     375,   376,    -1,   378,   379,   380,    -1,    -1,   383,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,   394,
-     395,   396,   397,    -1,   399,    -1,   401,   402,   403,   404,
-     405,   406,   407,   408,   409,   410,   411,   412,    -1,   414,
-     415,   416,    -1,   418,    -1,   420,   421,   422,   423,   424,
-      -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,    -1,
-     435,   436,    -1,   438,   439,    -1,    -1,   442,   443,   444,
-     445,   446,    -1,   448,   449,    -1,   451,   452,   453,   454,
-     455,   456,   457,   458,   459,   460,   461,   462,   463,    -1,
-     465,    -1,   467,   468,    -1,   470,   471,   472,    -1,   474,
-      -1,   476,   477,   478,   479,   480,    -1,   482,   483,   484,
-     485,   486,   487,   488,    -1,   490,   491,    -1,    -1,    -1,
-     495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,    -1,
-      -1,   506,    -1,   508,   509,   510,   511,    -1,   513,   514,
-     515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,   524,
-     525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,    -1,
-     535,    -1,   537,   538,   539,   540,   541,   542,   543,   544,
-     545,   546,    -1,    -1,   549,   550,   551,   552,   553,   554,
-     555,   556,   557,   558,   559,   560,   561,   562,   563,    -1,
-      -1,   566,   567,   568,   569,    -1,   571,   572,   573,    -1,
-     575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,   584,
-     585,    -1,   587,   588,   589,   590,   591,    -1,   593,   594,
-     595,   596,   597,   598,    -1,   600,   601,    -1,    -1,   604,
-      -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,    -1,
-     615,   616,   617,   618,   619,   620,    -1,    -1,   623,   624,
-      -1,   626,   627,    -1,   629,   630,   631,   632,    -1,    -1,
-      -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,   644,
-     645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,   654,
-     655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,   664,
-     665,    -1,   667,   668,   669,   670,   671,   672,   673,    -1,
-     675,   676,   677,   678,   679,   680,    -1,   682,   683,   684,
-     685,   686,   687,   688,    -1,   690,   691,   692,   693,   694,
-     695,   696,    -1,    -1,    -1,   700,   701,   702,   703,   704,
-     705,   706,   707,    -1,   709,   710,   711,   712,   713,   714,
-     715,   716,   717,   718,    -1,   720,   721,   722,   723,   724,
-     725,   726,   727,   728,   729,   730,   731,   732,   733,   734,
-     735,   736,   737,   738,   739,   740,   741,   742,   743,    -1,
-     745,   746,   747,   748,   749,   750,   751,    -1,   753,   754,
-     755,   756,   757,   758,   759,   760,   761,   762,   763,   764,
-     765,   766,   767,   768,   769,   770,   771,   772,   773,   774,
-     775,   776,   777,   778,   779,   780,   781,   782,   783,   784,
-      -1,    -1,    -1,    -1,    -1,   790,   791,    -1,    -1,    -1,
-      -1,   796,    -1,   798,    -1,    -1,    -1,   802,    -1,    -1,
-      -1,   806,   807,     5,     6,    -1,     8,     9,    10,    11,
-      12,    -1,    -1,    15,    -1,    -1,    -1,    -1,    20,    -1,
-      -1,    23,    -1,    25,    26,    27,    28,    29,    30,    -1,
-      32,    -1,    -1,    35,    36,    37,    38,    39,    40,    41,
-      -1,    43,    44,    45,    -1,    47,    -1,    49,    50,    -1,
-      -1,    53,    54,    55,    56,    57,    -1,    59,    60,    61,
-      62,    63,    -1,    65,    66,    67,    68,    69,    70,    -1,
-      72,    73,    -1,    75,    76,    77,    78,    79,    80,    81,
-      82,    83,    84,    85,    -1,    87,    88,    -1,    90,    91,
-      92,    93,    94,    -1,    96,    97,    98,    -1,    -1,    -1,
-     102,   103,   104,    -1,   106,   107,   108,    -1,   110,   111,
-     112,   113,   114,   115,    -1,    -1,    -1,    -1,   120,   121,
-     122,    -1,    -1,   125,   126,   127,    -1,   129,    -1,    -1,
-      -1,    -1,    -1,   135,   136,   137,   138,   139,    -1,    -1,
-      -1,   143,    -1,    -1,   146,   147,   148,    -1,    -1,    -1,
-     152,    -1,   154,   155,    -1,   157,   158,   159,    -1,    -1,
-     162,   163,    -1,   165,   166,   167,   168,   169,   170,   171,
-      -1,   173,   174,   175,   176,   177,   178,   179,   180,   181,
-      -1,   183,   184,   185,   186,   187,   188,    -1,   190,   191,
-      -1,    -1,    -1,   195,   196,    -1,   198,    -1,    -1,    -1,
-     202,    -1,   204,   205,   206,   207,    -1,   209,    -1,   211,
-      -1,   213,    -1,   215,   216,    -1,   218,   219,    -1,   221,
-     222,    -1,    -1,    -1,   226,   227,   228,   229,   230,    -1,
-     232,   233,   234,    -1,    -1,   237,    -1,    -1,    -1,   241,
-     242,   243,   244,   245,    -1,    -1,   248,    -1,    -1,    -1,
-     252,   253,    -1,   255,   256,    -1,    -1,    -1,   260,    -1,
-     262,    -1,    -1,   265,   266,    -1,    -1,   269,    -1,   271,
-     272,   273,    -1,    -1,    -1,    -1,    -1,   279,   280,    -1,
-     282,    -1,   284,    -1,   286,   287,    -1,    -1,   290,    -1,
-      -1,    -1,    -1,   295,    -1,   297,   298,   299,   300,   301,
-     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
-     312,   313,    -1,   315,   316,   317,   318,   319,   320,   321,
-     322,   323,   324,   325,    -1,    -1,    -1,    -1,   330,   331,
-     332,   333,   334,   335,    -1,    -1,   338,   339,   340,   341,
-      -1,   343,   344,   345,   346,   347,   348,   349,   350,   351,
-     352,   353,    -1,   355,   356,   357,    -1,    -1,   360,   361,
-     362,   363,   364,   365,    -1,   367,   368,   369,    -1,   371,
-     372,   373,    -1,   375,   376,    -1,   378,   379,   380,    -1,
-      -1,   383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   393,   394,   395,   396,   397,    -1,   399,    -1,   401,
-     402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
-     412,    -1,   414,   415,   416,    -1,   418,    -1,   420,   421,
-     422,   423,   424,    -1,   426,   427,   428,    -1,    -1,   431,
-      -1,    -1,    -1,   435,   436,    -1,   438,   439,    -1,    -1,
-     442,   443,   444,   445,   446,    -1,   448,   449,    -1,   451,
-     452,   453,   454,   455,   456,   457,   458,   459,   460,   461,
-     462,   463,    -1,   465,    -1,   467,   468,    -1,   470,   471,
-     472,    -1,   474,    -1,   476,   477,   478,   479,   480,    -1,
-     482,   483,   484,   485,   486,   487,   488,    -1,   490,   491,
-      -1,    -1,    -1,   495,   496,   497,   498,    -1,    -1,    -1,
-     502,    -1,    -1,    -1,   506,    -1,   508,   509,   510,   511,
-      -1,   513,   514,   515,   516,   517,    -1,    -1,    -1,    -1,
-      -1,   523,   524,   525,    -1,   527,    -1,    -1,   530,    -1,
-      -1,   533,    -1,   535,    -1,   537,   538,   539,   540,   541,
-     542,   543,   544,   545,   546,    -1,    -1,   549,   550,   551,
-     552,   553,   554,   555,   556,   557,   558,   559,   560,   561,
-     562,   563,    -1,    -1,   566,   567,   568,   569,    -1,   571,
-     572,   573,    -1,   575,   576,   577,   578,    -1,    -1,    -1,
-      -1,    -1,   584,   585,    -1,   587,   588,   589,   590,   591,
-      -1,   593,   594,   595,   596,   597,   598,    -1,   600,   601,
-      -1,    -1,   604,    -1,    -1,   607,    -1,   609,    -1,   611,
-     612,    -1,    -1,   615,   616,   617,   618,   619,   620,    -1,
-      -1,   623,   624,    -1,   626,   627,    -1,   629,   630,   631,
-     632,    -1,    -1,    -1,    -1,    -1,    -1,   639,   640,   641,
-      -1,   643,   644,   645,   646,    -1,    -1,   649,    -1,    -1,
-     652,   653,   654,   655,   656,    -1,   658,    -1,    -1,    -1,
-      -1,    -1,   664,   665,    -1,   667,   668,   669,   670,   671,
-     672,   673,    -1,   675,   676,   677,   678,   679,   680,    -1,
-     682,   683,   684,   685,   686,   687,   688,    -1,   690,   691,
-     692,   693,   694,   695,   696,    -1,    -1,    -1,   700,   701,
-     702,   703,   704,   705,   706,   707,    -1,   709,   710,   711,
-     712,   713,   714,   715,   716,   717,   718,    -1,   720,   721,
-     722,   723,   724,   725,   726,   727,   728,   729,   730,   731,
-     732,   733,   734,   735,   736,   737,   738,   739,   740,   741,
-     742,   743,    -1,   745,   746,   747,   748,   749,   750,   751,
-      -1,   753,   754,   755,   756,   757,   758,   759,   760,   761,
-     762,   763,   764,   765,   766,   767,   768,   769,   770,   771,
-     772,   773,   774,   775,   776,   777,   778,   779,   780,   781,
-     782,   783,   784,    -1,    -1,    -1,    -1,    -1,   790,   791,
-      -1,    -1,    -1,    -1,   796,    -1,   798,    -1,    -1,    -1,
-     802,    -1,    -1,    -1,   806,   807,     5,     6,    -1,     8,
-       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,   492,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,   565,   566,   567,   568,
-     569,    -1,    -1,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-     619,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,   636,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-     699,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
-     719,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,    -1,    -1,    -1,    -1,
-      -1,     5,     6,    -1,     8,     9,    10,    11,    12,   798,
-      -1,    15,    -1,    -1,    -1,    -1,    20,    -1,   807,    23,
-      -1,    25,    26,    27,    28,    29,    30,    -1,    32,    -1,
-      -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,
-      44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,
-      -1,    -1,    56,    57,    -1,    59,    60,    61,    -1,    63,
-      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
-      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    -1,    87,    88,    -1,    90,    91,    92,    93,
-      94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,
-      -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,
-      -1,   115,    -1,    -1,    -1,    -1,   120,   121,    -1,    -1,
-      -1,    -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,
-      -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,   143,
-      -1,   145,   146,   147,   148,    -1,    -1,    -1,   152,    -1,
-     154,   155,    -1,   157,   158,   159,    -1,    -1,   162,   163,
-      -1,   165,   166,   167,   168,   169,   170,    -1,    -1,   173,
-     174,   175,   176,   177,    -1,    -1,   180,   181,    -1,   183,
-     184,   185,   186,   187,    -1,    -1,   190,   191,    -1,    -1,
-      -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,
-     204,   205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,
-      -1,   215,   216,    -1,   218,    -1,    -1,   221,   222,    -1,
-      -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,   233,
-     234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,
-     244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,
-      -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,
-      -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,
-      -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,
-     284,    -1,   286,   287,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   295,    -1,   297,   298,   299,   300,   301,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
-      -1,   315,   316,   317,    -1,   319,   320,   321,   322,    -1,
-     324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,
-     334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,
-      -1,   345,   346,   347,   348,   349,   350,   351,   352,   353,
-      -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,   363,
-     364,    -1,    -1,    -1,   368,   369,    -1,    -1,    -1,   373,
-      -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,   383,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,
-     394,   395,    -1,   397,    -1,   399,    -1,   401,   402,   403,
-     404,   405,   406,   407,   408,   409,   410,    -1,   412,    -1,
-     414,   415,   416,    -1,   418,    -1,   420,   421,   422,   423,
-     424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,
-      -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,   443,
-     444,   445,   446,    -1,   448,   449,    -1,   451,   452,   453,
-      -1,    -1,   456,   457,   458,   459,   460,   461,   462,   463,
-      -1,   465,    -1,   467,   468,    -1,   470,   471,   472,    -1,
-     474,    -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,
-     484,   485,   486,   487,   488,    -1,   490,   491,    -1,    -1,
-      -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,
-      -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,   513,
-     514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,
-     524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,
-      -1,   535,    -1,   537,   538,   539,   540,   541,   542,    -1,
-      -1,   545,   546,    -1,    -1,   549,   550,   551,   552,   553,
-     554,    -1,    -1,   557,   558,   559,   560,    -1,   562,   563,
-      -1,    -1,   566,   567,   568,   569,    -1,    -1,   572,   573,
-      -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,
-     584,   585,    -1,    -1,    -1,   589,   590,   591,    -1,    -1,
-     594,   595,    -1,   597,   598,    -1,   600,   601,    -1,    -1,
-     604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,
-      -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,
-      -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,
-      -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,
-     644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,
-     654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,   673,
-      -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,
-      -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,
-      -1,   695,   696,    -1,    -1,   699,   700,   701,   702,   703,
-     704,   705,   706,   707,    -1,   709,   710,   711,   712,   713,
-     714,   715,   716,   717,   718,   719,   720,   721,   722,   723,
-     724,   725,   726,   727,   728,   729,   730,   731,   732,   733,
-     734,   735,   736,   737,   738,   739,   740,   741,   742,   743,
-      -1,   745,   746,   747,   748,   749,   750,   751,    -1,   753,
-     754,   755,   756,   757,   758,   759,   760,   761,   762,   763,
-     764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
-     774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
-     784,    -1,    -1,    -1,    -1,    -1,     5,     6,    -1,     8,
-       9,    10,    11,    12,   798,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,   807,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,    -1,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-     699,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
-     719,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,    -1,    -1,    -1,    -1,
-       5,     6,    -1,     8,     9,    10,    11,    12,    -1,   798,
-      15,    -1,    -1,    -1,    -1,    20,    -1,    -1,   807,    -1,
-      25,    26,    27,    28,    29,    30,    -1,    32,    -1,    -1,
-      -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,    44,
-      45,    -1,    47,    -1,    -1,    -1,    -1,    -1,    53,    54,
-      -1,    56,    57,    -1,    59,    60,    -1,    -1,    -1,    -1,
-      65,    66,    67,    68,    69,    70,    -1,    72,    73,    -1,
-      75,    76,    -1,    78,    -1,    80,    81,    82,    83,    84,
-      85,    -1,    87,    88,    -1,    90,    91,    92,    -1,    94,
-      -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,    -1,
-      -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,    -1,
-     115,    -1,    -1,    -1,    -1,   120,    -1,    -1,    -1,    -1,
-      -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,    -1,
-     135,   136,   137,   138,   139,    -1,    -1,    -1,    -1,    -1,
-      -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,    -1,
-     155,    -1,   157,   158,   159,    -1,    -1,   162,   163,    -1,
-     165,   166,   167,   168,   169,    -1,    -1,    -1,   173,   174,
-     175,   176,   177,    -1,    -1,   180,   181,   182,   183,   184,
-     185,   186,   187,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,   204,
-     205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,    -1,
-      -1,   216,    -1,    -1,    -1,    -1,   221,   222,    -1,    -1,
-      -1,   226,   227,   228,   229,   230,    -1,   232,    -1,   234,
-      -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,    -1,
-      -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,    -1,
-     255,   256,   257,    -1,    -1,   260,    -1,   262,    -1,    -1,
-      -1,   266,    -1,    -1,   269,   270,    -1,   272,   273,    -1,
-      -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,   284,
-      -1,   286,   287,    -1,    -1,    -1,    -1,   292,    -1,    -1,
-     295,    -1,   297,   298,   299,   300,   301,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,   313,    -1,
-     315,   316,   317,    -1,   319,   320,   321,   322,    -1,   324,
-     325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,   334,
-     335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,    -1,
-     345,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
-      -1,   356,   357,    -1,    -1,   360,   361,   362,   363,   364,
-      -1,    -1,    -1,    -1,   369,    -1,    -1,    -1,   373,    -1,
-     375,   376,    -1,   378,   379,   380,    -1,    -1,   383,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,   394,
-     395,    -1,   397,    -1,   399,    -1,   401,   402,   403,   404,
-     405,   406,   407,   408,   409,   410,    -1,    -1,    -1,    -1,
-     415,   416,    -1,   418,    -1,   420,   421,   422,   423,   424,
-      -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,    -1,
-     435,   436,    -1,   438,   439,    -1,    -1,   442,   443,   444,
-     445,   446,    -1,   448,   449,    -1,   451,    -1,   453,   454,
-      -1,   456,   457,   458,   459,   460,   461,   462,   463,    -1,
-      -1,    -1,   467,   468,    -1,   470,   471,   472,   473,   474,
-      -1,    -1,    -1,   478,   479,   480,    -1,   482,    -1,   484,
-     485,    -1,   487,   488,    -1,   490,   491,    -1,    -1,    -1,
-     495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,    -1,
-      -1,    -1,    -1,    -1,   509,    -1,   511,    -1,   513,   514,
-     515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,   524,
-     525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,    -1,
-     535,    -1,   537,    -1,   539,   540,   541,   542,    -1,    -1,
-      -1,   546,    -1,    -1,   549,   550,   551,   552,   553,   554,
-      -1,    -1,   557,   558,   559,   560,    -1,   562,   563,    -1,
-      -1,   566,   567,   568,   569,    -1,    -1,   572,   573,    -1,
-     575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,   584,
-     585,    -1,    -1,    -1,    -1,   590,   591,    -1,    -1,   594,
-     595,    -1,   597,   598,    -1,    -1,    -1,    -1,    -1,   604,
-      -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,    -1,
-      -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,    -1,
-      -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,    -1,
-     635,    -1,    -1,    -1,   639,   640,   641,    -1,   643,    -1,
-     645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,   654,
-     655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   667,   668,   669,    -1,   671,   672,   673,    -1,
-      -1,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,    -1,
-      -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,    -1,
-     695,   696,    -1,    -1,    -1,   700,   701,   702,   703,   704,
-     705,   706,   707,    -1,   709,   710,   711,    -1,   713,   714,
-     715,   716,   717,   718,    -1,   720,   721,   722,   723,   724,
-     725,   726,   727,   728,   729,   730,   731,   732,   733,   734,
-     735,   736,   737,   738,   739,   740,   741,   742,   743,    -1,
-     745,   746,   747,   748,   749,   750,   751,    -1,   753,   754,
-     755,   756,   757,   758,   759,   760,   761,   762,   763,   764,
-     765,   766,   767,   768,   769,   770,   771,   772,   773,   774,
-     775,   776,   777,   778,   779,   780,   781,   782,   783,   784,
-      -1,     5,     6,    -1,     8,     9,    10,    11,    12,    -1,
-      -1,    15,    -1,    -1,    -1,    -1,    20,    -1,   803,    23,
-      -1,    25,    26,    27,    28,    29,    30,    -1,    32,    -1,
-      -1,    -1,    36,    37,    -1,    -1,    40,    -1,    -1,    43,
-      44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,
-      -1,    -1,    56,    57,    -1,    59,    60,    61,    -1,    63,
-      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
-      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    -1,    87,    88,    -1,    90,    91,    92,    93,
-      94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,
-      -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,
-      -1,   115,    -1,    -1,    -1,    -1,   120,   121,   122,    -1,
-      -1,    -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,
-      -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,   143,
-      -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,
-     154,   155,    -1,   157,   158,   159,    -1,    -1,   162,   163,
-      -1,   165,   166,   167,   168,   169,   170,    -1,    -1,   173,
-     174,   175,   176,   177,    -1,   179,   180,   181,    -1,   183,
-     184,   185,   186,   187,   188,    -1,   190,   191,    -1,    -1,
-      -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,
-     204,   205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,
-      -1,   215,   216,    -1,   218,   219,    -1,   221,   222,    -1,
-      -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,   233,
-     234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,
-     244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,
-      -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,
-      -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,
-      -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,
-     284,    -1,   286,   287,    -1,    -1,   290,    -1,    -1,    -1,
-      -1,   295,    -1,   297,   298,   299,   300,   301,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
-      -1,   315,   316,   317,    -1,   319,   320,   321,   322,    -1,
-     324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,
-     334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,
-      -1,   345,   346,   347,   348,   349,   350,   351,   352,   353,
-      -1,   355,   356,   357,    -1,    -1,   360,   361,   362,   363,
-     364,    -1,    -1,    -1,   368,   369,    -1,   371,   372,   373,
-      -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,   383,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,
-     394,   395,    -1,   397,    -1,   399,    -1,   401,   402,   403,
-     404,   405,   406,   407,   408,   409,   410,    -1,   412,    -1,
-     414,   415,   416,    -1,   418,    -1,   420,   421,   422,   423,
-     424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,
-      -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,   443,
-     444,   445,   446,    -1,   448,   449,    -1,   451,   452,   453,
-      -1,    -1,   456,   457,   458,   459,   460,   461,   462,   463,
-      -1,   465,    -1,   467,   468,    -1,   470,   471,   472,    -1,
-     474,    -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,
-     484,   485,   486,   487,   488,    -1,   490,   491,    -1,    -1,
-      -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,
-      -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,   513,
-     514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,
-     524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,
-      -1,   535,    -1,   537,   538,   539,   540,   541,   542,    -1,
-      -1,   545,   546,    -1,    -1,   549,   550,   551,   552,   553,
-     554,    -1,    -1,   557,   558,   559,   560,    -1,   562,   563,
-      -1,    -1,   566,   567,   568,   569,    -1,   571,   572,   573,
-      -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,
-     584,   585,    -1,    -1,   588,   589,   590,   591,    -1,   593,
-     594,   595,   596,   597,   598,    -1,   600,   601,    -1,    -1,
-     604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,
-      -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,
-      -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,
-      -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,
-     644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,
-     654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,   673,
-      -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,
-      -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,
-      -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,   703,
-     704,   705,   706,   707,    -1,   709,   710,   711,   712,   713,
-     714,   715,   716,   717,   718,    -1,   720,   721,   722,   723,
-     724,   725,   726,   727,   728,   729,   730,   731,   732,   733,
-     734,   735,   736,   737,   738,   739,   740,   741,   742,   743,
-      -1,   745,   746,   747,   748,   749,   750,   751,    -1,   753,
-     754,   755,   756,   757,   758,   759,   760,   761,   762,   763,
-     764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
-     774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
-     784,     5,     6,    -1,     8,     9,    10,    11,    12,    -1,
-      -1,    15,    -1,    -1,    -1,    -1,    20,    -1,   802,    23,
-      -1,    25,    26,    27,    28,    29,    30,    -1,    32,    -1,
-      -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,
-      44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,
-      -1,    -1,    56,    57,    -1,    59,    60,    61,    -1,    63,
-      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
-      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    -1,    87,    88,    -1,    90,    91,    92,    93,
-      94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,
-      -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,
-      -1,   115,    -1,    -1,    -1,    -1,   120,   121,    -1,    -1,
-      -1,    -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,
-      -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,   143,
-      -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,
-     154,   155,    -1,   157,   158,   159,    -1,    -1,   162,   163,
-      -1,   165,   166,   167,   168,   169,   170,    -1,    -1,   173,
-     174,   175,   176,   177,    -1,    -1,   180,   181,    -1,   183,
-     184,   185,   186,   187,    -1,    -1,   190,   191,    -1,    -1,
-      -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,
-     204,   205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,
-      -1,   215,   216,    -1,   218,    -1,    -1,   221,   222,    -1,
-      -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,   233,
-     234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,
-     244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,
-      -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,
-      -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,
-      -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,
-     284,    -1,   286,   287,    -1,    -1,   290,    -1,    -1,    -1,
-      -1,   295,    -1,   297,   298,   299,   300,   301,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
-      -1,   315,   316,   317,    -1,   319,   320,   321,   322,    -1,
-     324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,
-     334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,
-      -1,   345,   346,   347,   348,   349,   350,   351,   352,   353,
-      -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,   363,
-     364,    -1,    -1,    -1,   368,   369,    -1,    -1,   372,   373,
-      -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,   383,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,
-     394,   395,   396,   397,    -1,   399,    -1,   401,   402,   403,
-     404,   405,   406,   407,   408,   409,   410,    -1,   412,    -1,
-     414,   415,   416,    -1,   418,    -1,   420,   421,   422,   423,
-     424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,
-      -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,   443,
-     444,   445,   446,    -1,   448,   449,    -1,   451,   452,   453,
-      -1,    -1,   456,   457,   458,   459,   460,   461,   462,   463,
-      -1,   465,    -1,   467,   468,    -1,   470,   471,   472,    -1,
-     474,    -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,
-     484,   485,   486,   487,   488,    -1,   490,   491,    -1,    -1,
-      -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,
-      -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,   513,
-     514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,
-     524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,
-      -1,   535,    -1,   537,   538,   539,   540,   541,   542,    -1,
-      -1,   545,   546,    -1,    -1,   549,   550,   551,   552,   553,
-     554,    -1,    -1,   557,   558,   559,   560,    -1,   562,   563,
-      -1,    -1,   566,   567,   568,   569,    -1,    -1,   572,   573,
-      -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,
-     584,   585,    -1,    -1,    -1,   589,   590,   591,    -1,   593,
-     594,   595,    -1,   597,   598,    -1,   600,   601,    -1,    -1,
-     604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,
-      -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,
-      -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,
-      -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,
-     644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,
-     654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,   673,
-      -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,
-      -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,
-      -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,   703,
-     704,   705,   706,   707,    -1,   709,   710,   711,   712,   713,
-     714,   715,   716,   717,   718,    -1,   720,   721,   722,   723,
-     724,   725,   726,   727,   728,   729,   730,   731,   732,   733,
-     734,   735,   736,   737,   738,   739,   740,   741,   742,   743,
-      -1,   745,   746,   747,   748,   749,   750,   751,    -1,   753,
-     754,   755,   756,   757,   758,   759,   760,   761,   762,   763,
-     764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
-     774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
-     784,     5,     6,    -1,     8,     9,    10,    11,    12,    -1,
-      -1,    15,    -1,    -1,    -1,    -1,    20,    -1,   802,    23,
-      -1,    25,    26,    27,    28,    29,    30,    -1,    32,    -1,
-      -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,
-      44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,
-      -1,    -1,    56,    57,    -1,    59,    60,    61,    -1,    63,
-      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
-      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    -1,    87,    88,    -1,    90,    91,    92,    93,
-      94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,
-      -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,
-      -1,   115,    -1,    -1,    -1,    -1,   120,   121,    -1,    -1,
-      -1,    -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,
-      -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,   143,
-      -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,
-     154,   155,    -1,   157,   158,   159,    -1,    -1,   162,   163,
-      -1,   165,   166,   167,   168,   169,   170,    -1,    -1,   173,
-     174,   175,   176,   177,    -1,    -1,   180,   181,    -1,   183,
-     184,   185,   186,   187,    -1,    -1,   190,   191,    -1,    -1,
-      -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,
-     204,   205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,
-      -1,   215,   216,    -1,   218,    -1,    -1,   221,   222,    -1,
-      -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,   233,
-     234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,
-     244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,
-      -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,
-      -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,
-     274,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,
-     284,    -1,   286,   287,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   295,    -1,   297,   298,   299,   300,   301,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
-      -1,   315,   316,   317,    -1,   319,   320,   321,   322,    -1,
-     324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,
-     334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,
-      -1,   345,   346,   347,   348,   349,   350,   351,   352,   353,
-      -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,   363,
-     364,    -1,    -1,    -1,   368,   369,    -1,    -1,    -1,   373,
-      -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,   383,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   391,    -1,   393,
-     394,   395,    -1,   397,    -1,   399,    -1,   401,   402,   403,
-     404,   405,   406,   407,   408,   409,   410,    -1,   412,    -1,
-     414,   415,   416,    -1,   418,    -1,   420,   421,   422,   423,
-     424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,
-      -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,   443,
-     444,   445,   446,    -1,   448,   449,    -1,   451,   452,   453,
-      -1,    -1,   456,   457,   458,   459,   460,   461,   462,   463,
-      -1,   465,    -1,   467,   468,    -1,   470,   471,   472,    -1,
-     474,    -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,
-     484,   485,   486,   487,   488,    -1,   490,   491,    -1,    -1,
-      -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,
-      -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,   513,
-     514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,
-     524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,
-      -1,   535,    -1,   537,   538,   539,   540,   541,   542,    -1,
-      -1,   545,   546,    -1,    -1,   549,   550,   551,   552,   553,
-     554,    -1,    -1,   557,   558,   559,   560,    -1,   562,   563,
-      -1,    -1,   566,   567,   568,   569,    -1,   571,   572,   573,
-      -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,
-     584,   585,    -1,    -1,    -1,   589,   590,   591,    -1,    -1,
-     594,   595,    -1,   597,   598,    -1,   600,   601,    -1,    -1,
-     604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,
-      -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,
-      -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,
-      -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,
-     644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,
-     654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,   673,
-      -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,
-      -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,
-      -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,   703,
-     704,   705,   706,   707,    -1,   709,   710,   711,   712,   713,
-     714,   715,   716,   717,   718,    -1,   720,   721,   722,   723,
-     724,   725,   726,   727,   728,   729,   730,   731,   732,   733,
-     734,   735,   736,   737,   738,   739,   740,   741,   742,   743,
-      -1,   745,   746,   747,   748,   749,   750,   751,    -1,   753,
-     754,   755,   756,   757,   758,   759,   760,   761,   762,   763,
-     764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
-     774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
-     784,     5,     6,    -1,     8,     9,    10,    11,    12,    -1,
-      -1,    15,    -1,    -1,    -1,    -1,    20,    -1,   802,    23,
-      -1,    25,    26,    27,    28,    29,    30,    -1,    32,    -1,
-      -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,
-      44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,
-      -1,    -1,    56,    57,    -1,    59,    60,    61,    62,    63,
-      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
-      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    -1,    87,    88,    -1,    90,    91,    92,    93,
-      94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,
-      -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,
-      -1,   115,    -1,    -1,    -1,    -1,   120,   121,    -1,    -1,
-      -1,   125,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,
-      -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,   143,
-      -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,
-     154,   155,    -1,   157,   158,   159,    -1,    -1,   162,   163,
-      -1,   165,   166,   167,   168,   169,   170,    -1,    -1,   173,
-     174,   175,   176,   177,    -1,    -1,   180,   181,    -1,   183,
-     184,   185,   186,   187,    -1,    -1,   190,   191,    -1,    -1,
-      -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,
-     204,   205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,
-      -1,   215,   216,    -1,   218,    -1,    -1,   221,   222,    -1,
-      -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,   233,
-     234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,
-     244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,
-      -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,
-      -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,
-      -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,
-     284,    -1,   286,   287,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   295,    -1,   297,   298,   299,   300,   301,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
-      -1,   315,   316,   317,    -1,   319,   320,   321,   322,    -1,
-     324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,
-     334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,
-      -1,   345,   346,   347,   348,   349,   350,   351,   352,   353,
-      -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,   363,
-     364,    -1,    -1,    -1,   368,   369,    -1,    -1,    -1,   373,
-      -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,   383,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,
-     394,   395,    -1,   397,    -1,   399,    -1,   401,   402,   403,
-     404,   405,   406,   407,   408,   409,   410,    -1,   412,    -1,
-     414,   415,   416,    -1,   418,    -1,   420,   421,   422,   423,
-     424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,
-      -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,   443,
-     444,   445,   446,    -1,   448,   449,    -1,   451,   452,   453,
-      -1,    -1,   456,   457,   458,   459,   460,   461,   462,   463,
-      -1,   465,    -1,   467,   468,    -1,   470,   471,   472,    -1,
-     474,    -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,
-     484,   485,   486,   487,   488,    -1,   490,   491,    -1,    -1,
-      -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,
-      -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,   513,
-     514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,
-     524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,
-      -1,   535,    -1,   537,   538,   539,   540,   541,   542,    -1,
-      -1,   545,   546,    -1,    -1,   549,   550,   551,   552,   553,
-     554,    -1,    -1,   557,   558,   559,   560,    -1,   562,   563,
-      -1,    -1,   566,   567,   568,   569,    -1,    -1,   572,   573,
-      -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,
-     584,   585,    -1,    -1,    -1,   589,   590,   591,    -1,    -1,
-     594,   595,    -1,   597,   598,    -1,   600,   601,    -1,    -1,
-     604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,
-      -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,
-      -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,
-      -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,
-     644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,
-     654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,   673,
-      -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,
-      -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,
-      -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,   703,
-     704,   705,   706,   707,    -1,   709,   710,   711,   712,   713,
-     714,   715,   716,   717,   718,    -1,   720,   721,   722,   723,
-     724,   725,   726,   727,   728,   729,   730,   731,   732,   733,
-     734,   735,   736,   737,   738,   739,   740,   741,   742,   743,
-      -1,   745,   746,   747,   748,   749,   750,   751,    -1,   753,
-     754,   755,   756,   757,   758,   759,   760,   761,   762,   763,
-     764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
-     774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
-     784,     5,     6,    -1,     8,     9,    10,    11,    12,    -1,
-      -1,    15,    -1,    -1,    -1,    -1,    20,    -1,   802,    23,
-      -1,    25,    26,    27,    28,    29,    30,    -1,    32,    -1,
-      -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,
-      44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,
-      -1,    -1,    56,    57,    -1,    59,    60,    61,    -1,    63,
-      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
-      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    -1,    87,    88,    -1,    90,    91,    92,    93,
-      94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,
-      -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,
-      -1,   115,    -1,    -1,    -1,    -1,   120,   121,    -1,    -1,
-      -1,    -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,
-      -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,   143,
-      -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,
-     154,   155,    -1,   157,   158,   159,    -1,    -1,   162,   163,
-      -1,   165,   166,   167,   168,   169,   170,    -1,    -1,   173,
-     174,   175,   176,   177,    -1,    -1,   180,   181,    -1,   183,
-     184,   185,   186,   187,    -1,    -1,   190,   191,    -1,    -1,
-      -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,
-     204,   205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,
-      -1,   215,   216,    -1,   218,    -1,    -1,   221,   222,    -1,
-      -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,   233,
-     234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,
-     244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,
-      -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,
-      -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,
-     274,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,
-     284,    -1,   286,   287,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   295,    -1,   297,   298,   299,   300,   301,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
-      -1,   315,   316,   317,    -1,   319,   320,   321,   322,    -1,
-     324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,
-     334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,
-      -1,   345,   346,   347,   348,   349,   350,   351,   352,   353,
-      -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,   363,
-     364,    -1,    -1,    -1,   368,   369,    -1,    -1,    -1,   373,
-      -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,   383,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,
-     394,   395,    -1,   397,    -1,   399,    -1,   401,   402,   403,
-     404,   405,   406,   407,   408,   409,   410,    -1,   412,    -1,
-     414,   415,   416,    -1,   418,    -1,   420,   421,   422,   423,
-     424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,
-      -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,   443,
-     444,   445,   446,    -1,   448,   449,    -1,   451,   452,   453,
-      -1,    -1,   456,   457,   458,   459,   460,   461,   462,   463,
-      -1,   465,    -1,   467,   468,    -1,   470,   471,   472,    -1,
-     474,    -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,
-     484,   485,   486,   487,   488,    -1,   490,   491,    -1,    -1,
-      -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,
-      -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,   513,
-     514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,
-     524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,
-      -1,   535,    -1,   537,   538,   539,   540,   541,   542,    -1,
-      -1,   545,   546,    -1,    -1,   549,   550,   551,   552,   553,
-     554,    -1,    -1,   557,   558,   559,   560,    -1,   562,   563,
-      -1,    -1,   566,   567,   568,   569,    -1,   571,   572,   573,
-      -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,
-     584,   585,    -1,    -1,    -1,   589,   590,   591,    -1,    -1,
-     594,   595,    -1,   597,   598,    -1,   600,   601,    -1,    -1,
-     604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,
-      -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,
-      -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,
-      -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,
-     644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,
-     654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,   673,
-      -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,
-      -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,
-      -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,   703,
-     704,   705,   706,   707,    -1,   709,   710,   711,   712,   713,
-     714,   715,   716,   717,   718,    -1,   720,   721,   722,   723,
-     724,   725,   726,   727,   728,   729,   730,   731,   732,   733,
-     734,   735,   736,   737,   738,   739,   740,   741,   742,   743,
-      -1,   745,   746,   747,   748,   749,   750,   751,    -1,   753,
-     754,   755,   756,   757,   758,   759,   760,   761,   762,   763,
-     764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
-     774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
-     784,     5,     6,    -1,     8,     9,    10,    11,    12,    -1,
-      -1,    15,    -1,    -1,    -1,    -1,    20,    -1,   802,    23,
-      -1,    25,    26,    27,    28,    29,    30,    -1,    32,    -1,
-      -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,
-      44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,
-      -1,    -1,    56,    57,    -1,    59,    60,    61,    -1,    63,
-      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
-      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    -1,    87,    88,    -1,    90,    91,    92,    93,
-      94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,
-      -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,
-      -1,   115,    -1,    -1,    -1,    -1,   120,   121,    -1,    -1,
-      -1,    -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,
-      -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,   143,
-      -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,
-     154,   155,    -1,   157,   158,   159,    -1,    -1,   162,   163,
-      -1,   165,   166,   167,   168,   169,   170,    -1,    -1,   173,
-     174,   175,   176,   177,    -1,    -1,   180,   181,    -1,   183,
-     184,   185,   186,   187,    -1,    -1,   190,   191,    -1,    -1,
-      -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,
-     204,   205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,
-      -1,   215,   216,    -1,   218,    -1,    -1,   221,   222,    -1,
-      -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,   233,
-     234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,
-     244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,
-      -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,
-      -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,
-     274,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,
-     284,    -1,   286,   287,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   295,    -1,   297,   298,   299,   300,   301,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
-      -1,   315,   316,   317,    -1,   319,   320,   321,   322,    -1,
-     324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,
-     334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,
-      -1,   345,   346,   347,   348,   349,   350,   351,   352,   353,
-      -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,   363,
-     364,    -1,    -1,    -1,   368,   369,    -1,    -1,    -1,   373,
-      -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,   383,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,
-     394,   395,    -1,   397,    -1,   399,    -1,   401,   402,   403,
-     404,   405,   406,   407,   408,   409,   410,    -1,   412,    -1,
-     414,   415,   416,    -1,   418,    -1,   420,   421,   422,   423,
-     424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,
-      -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,   443,
-     444,   445,   446,    -1,   448,   449,    -1,   451,   452,   453,
-      -1,    -1,   456,   457,   458,   459,   460,   461,   462,   463,
-      -1,   465,    -1,   467,   468,    -1,   470,   471,   472,    -1,
-     474,    -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,
-     484,   485,   486,   487,   488,    -1,   490,   491,    -1,    -1,
-      -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,
-      -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,   513,
-     514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,
-     524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,
-      -1,   535,    -1,   537,   538,   539,   540,   541,   542,    -1,
-      -1,   545,   546,    -1,    -1,   549,   550,   551,   552,   553,
-     554,    -1,    -1,   557,   558,   559,   560,    -1,   562,   563,
-      -1,    -1,   566,   567,   568,   569,    -1,   571,   572,   573,
-      -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,
-     584,   585,    -1,    -1,    -1,   589,   590,   591,    -1,    -1,
-     594,   595,    -1,   597,   598,    -1,   600,   601,    -1,    -1,
-     604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,
-      -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,
-      -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,
-      -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,
-     644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,
-     654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,   673,
-      -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,
-      -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,
-      -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,   703,
-     704,   705,   706,   707,    -1,   709,   710,   711,   712,   713,
-     714,   715,   716,   717,   718,    -1,   720,   721,   722,   723,
-     724,   725,   726,   727,   728,   729,   730,   731,   732,   733,
-     734,   735,   736,   737,   738,   739,   740,   741,   742,   743,
-      -1,   745,   746,   747,   748,   749,   750,   751,    -1,   753,
-     754,   755,   756,   757,   758,   759,   760,   761,   762,   763,
-     764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
-     774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
-     784,     5,     6,    -1,     8,     9,    10,    11,    12,    -1,
-      -1,    15,    -1,    -1,    -1,    -1,    20,    -1,   802,    23,
-      -1,    25,    26,    27,    28,    29,    30,    -1,    32,    -1,
-      -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,
-      44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,
-      -1,    -1,    56,    57,    -1,    59,    60,    61,    62,    63,
-      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
-      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    -1,    87,    88,    -1,    90,    91,    92,    93,
-      94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,
-      -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,
-      -1,   115,    -1,    -1,    -1,    -1,   120,   121,    -1,    -1,
-      -1,   125,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,
-      -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,   143,
-      -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,
-     154,   155,    -1,   157,   158,   159,    -1,    -1,   162,   163,
-      -1,   165,   166,   167,   168,   169,   170,    -1,    -1,   173,
-     174,   175,   176,   177,    -1,    -1,   180,   181,    -1,   183,
-     184,   185,   186,   187,    -1,    -1,   190,   191,    -1,    -1,
-      -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,
-     204,   205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,
-      -1,   215,   216,    -1,   218,    -1,    -1,   221,   222,    -1,
-      -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,   233,
-     234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,
-     244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,
-      -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,
-      -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,
-      -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,
-     284,    -1,   286,   287,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   295,    -1,   297,   298,   299,   300,   301,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
-      -1,   315,   316,   317,    -1,   319,   320,   321,   322,    -1,
-     324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,
-     334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,
-      -1,   345,   346,   347,   348,   349,   350,   351,   352,   353,
-      -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,   363,
-     364,    -1,    -1,    -1,   368,   369,    -1,    -1,    -1,   373,
-      -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,   383,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,
-     394,   395,    -1,   397,    -1,   399,    -1,   401,   402,   403,
-     404,   405,   406,   407,   408,   409,   410,    -1,   412,    -1,
-     414,   415,   416,    -1,   418,    -1,   420,   421,   422,   423,
-     424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,
-      -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,   443,
-     444,   445,   446,    -1,   448,   449,    -1,   451,   452,   453,
-      -1,    -1,   456,   457,   458,   459,   460,   461,   462,   463,
-      -1,   465,    -1,   467,   468,    -1,   470,   471,   472,    -1,
-     474,    -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,
-     484,   485,   486,   487,   488,    -1,   490,   491,    -1,    -1,
-      -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,
-      -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,   513,
-     514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,
-     524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,
-      -1,   535,    -1,   537,   538,   539,   540,   541,   542,    -1,
-      -1,   545,   546,    -1,    -1,   549,   550,   551,   552,   553,
-     554,    -1,    -1,   557,   558,   559,   560,    -1,   562,   563,
-      -1,    -1,   566,   567,   568,   569,    -1,    -1,   572,   573,
-      -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,
-     584,   585,    -1,    -1,    -1,   589,   590,   591,    -1,    -1,
-     594,   595,    -1,   597,   598,    -1,   600,   601,    -1,    -1,
-     604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,
-      -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,
-      -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,
-      -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,
-     644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,
-     654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,   673,
-      -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,
-      -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,
-      -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,   703,
-     704,   705,   706,   707,    -1,   709,   710,   711,   712,   713,
-     714,   715,   716,   717,   718,    -1,   720,   721,   722,   723,
-     724,   725,   726,   727,   728,   729,   730,   731,   732,   733,
-     734,   735,   736,   737,   738,   739,   740,   741,   742,   743,
-      -1,   745,   746,   747,   748,   749,   750,   751,    -1,   753,
-     754,   755,   756,   757,   758,   759,   760,   761,   762,   763,
-     764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
-     774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
-     784,     5,     6,    -1,     8,     9,    10,    11,    12,    -1,
-      -1,    15,    -1,    -1,    -1,    -1,    20,    -1,   802,    23,
-      -1,    25,    26,    27,    28,    29,    30,    -1,    32,    -1,
-      -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,
-      44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,
-      -1,    -1,    56,    57,    -1,    59,    60,    61,    -1,    63,
-      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
-      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    -1,    87,    88,    -1,    90,    91,    92,    93,
-      94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,
-      -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,
-      -1,   115,    -1,    -1,    -1,    -1,   120,   121,    -1,    -1,
-      -1,    -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,
-      -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,   143,
-      -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,
-     154,   155,    -1,   157,   158,   159,    -1,    -1,   162,   163,
-      -1,   165,   166,   167,   168,   169,   170,    -1,    -1,   173,
-     174,   175,   176,   177,    -1,    -1,   180,   181,    -1,   183,
-     184,   185,   186,   187,    -1,    -1,   190,   191,    -1,    -1,
-      -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,
-     204,   205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,
-      -1,   215,   216,    -1,   218,    -1,    -1,   221,   222,    -1,
-      -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,   233,
-     234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,
-     244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,
-      -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,
-      -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,
-     274,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,
-     284,    -1,   286,   287,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   295,    -1,   297,   298,   299,   300,   301,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
-      -1,   315,   316,   317,    -1,   319,   320,   321,   322,    -1,
-     324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,
-     334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,
-      -1,   345,   346,   347,   348,   349,   350,   351,   352,   353,
-      -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,   363,
-     364,    -1,    -1,    -1,   368,   369,    -1,    -1,    -1,   373,
-      -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,   383,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,
-     394,   395,    -1,   397,    -1,   399,    -1,   401,   402,   403,
-     404,   405,   406,   407,   408,   409,   410,    -1,   412,    -1,
-     414,   415,   416,    -1,   418,    -1,   420,   421,   422,   423,
-     424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,
-      -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,   443,
-     444,   445,   446,    -1,   448,   449,    -1,   451,   452,   453,
-      -1,    -1,   456,   457,   458,   459,   460,   461,   462,   463,
-      -1,   465,    -1,   467,   468,    -1,   470,   471,   472,    -1,
-     474,    -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,
-     484,   485,   486,   487,   488,    -1,   490,   491,    -1,    -1,
-      -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,
-      -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,   513,
-     514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,
-     524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,
-      -1,   535,    -1,   537,   538,   539,   540,   541,   542,    -1,
-      -1,   545,   546,    -1,    -1,   549,   550,   551,   552,   553,
-     554,    -1,    -1,   557,   558,   559,   560,    -1,   562,   563,
-      -1,    -1,   566,   567,   568,   569,    -1,   571,   572,   573,
-      -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,
-     584,   585,    -1,    -1,    -1,   589,   590,   591,    -1,    -1,
-     594,   595,    -1,   597,   598,    -1,   600,   601,    -1,    -1,
-     604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,
-      -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,
-      -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,
-      -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,
-     644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,
-     654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,   673,
-      -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,
-      -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,
-      -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,   703,
-     704,   705,   706,   707,    -1,   709,   710,   711,   712,   713,
-     714,   715,   716,   717,   718,    -1,   720,   721,   722,   723,
-     724,   725,   726,   727,   728,   729,   730,   731,   732,   733,
-     734,   735,   736,   737,   738,   739,   740,   741,   742,   743,
-      -1,   745,   746,   747,   748,   749,   750,   751,    -1,   753,
-     754,   755,   756,   757,   758,   759,   760,   761,   762,   763,
-     764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
-     774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
-     784,     5,     6,    -1,     8,     9,    10,    11,    12,    -1,
-      -1,    15,    -1,    -1,    -1,    -1,    20,    -1,   802,    23,
-      -1,    25,    26,    27,    28,    29,    30,    -1,    32,    -1,
-      -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,
-      44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,
-      -1,    -1,    56,    57,    -1,    59,    60,    61,    -1,    63,
-      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
-      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    86,    87,    88,    -1,    90,    91,    92,    93,
-      94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,
-      -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,
-      -1,   115,    -1,    -1,    -1,    -1,   120,   121,    -1,    -1,
-      -1,    -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,
-      -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,   143,
-      -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,
-     154,   155,    -1,   157,   158,   159,    -1,    -1,   162,   163,
-      -1,   165,   166,   167,   168,   169,   170,    -1,    -1,   173,
-     174,   175,   176,   177,    -1,    -1,   180,   181,    -1,   183,
-     184,   185,   186,   187,    -1,    -1,   190,   191,    -1,    -1,
-      -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,
-     204,   205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,
-      -1,   215,   216,    -1,   218,    -1,    -1,   221,   222,    -1,
-      -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,   233,
-     234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,
-     244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,
-      -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,
-      -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,
-      -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,
-     284,    -1,   286,   287,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   295,    -1,   297,   298,   299,   300,   301,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
-      -1,   315,   316,   317,    -1,   319,   320,   321,   322,    -1,
-     324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,
-     334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,
-      -1,   345,   346,   347,   348,   349,   350,   351,   352,   353,
-      -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,   363,
-     364,    -1,    -1,    -1,   368,   369,    -1,    -1,    -1,   373,
-      -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,   383,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,
-     394,   395,    -1,   397,    -1,   399,    -1,   401,   402,   403,
-     404,   405,   406,   407,   408,   409,   410,    -1,   412,    -1,
-     414,   415,   416,    -1,   418,    -1,   420,   421,   422,   423,
-     424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,
-      -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,   443,
-     444,   445,   446,    -1,   448,   449,    -1,   451,   452,   453,
-      -1,    -1,   456,   457,   458,   459,   460,   461,   462,   463,
-      -1,   465,    -1,   467,   468,    -1,   470,   471,   472,    -1,
-     474,    -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,
-     484,   485,   486,   487,   488,    -1,   490,   491,    -1,    -1,
-      -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,
-      -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,   513,
-     514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,
-     524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,
-      -1,   535,    -1,   537,   538,   539,   540,   541,   542,    -1,
-      -1,   545,   546,    -1,    -1,   549,   550,   551,   552,   553,
-     554,    -1,    -1,   557,   558,   559,   560,    -1,   562,   563,
-      -1,    -1,   566,   567,   568,   569,    -1,    -1,   572,   573,
-      -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,
-     584,   585,    -1,    -1,    -1,   589,   590,   591,    -1,    -1,
-     594,   595,    -1,   597,   598,    -1,   600,   601,    -1,    -1,
-     604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,
-      -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,
-      -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,
-      -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,
-     644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,
-     654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,   673,
-      -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,
-      -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,
-      -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,   703,
-     704,   705,   706,   707,    -1,   709,   710,   711,   712,   713,
-     714,   715,   716,   717,   718,    -1,   720,   721,   722,   723,
-     724,   725,   726,   727,   728,   729,   730,   731,   732,   733,
-     734,   735,   736,   737,   738,   739,   740,   741,   742,   743,
-      -1,   745,   746,   747,   748,   749,   750,   751,    -1,   753,
-     754,   755,   756,   757,   758,   759,   760,   761,   762,   763,
-     764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
-     774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
-     784,     5,     6,    -1,     8,     9,    10,    11,    12,    -1,
-      -1,    15,    -1,    -1,    -1,    -1,    20,    -1,   802,    23,
-      -1,    25,    26,    27,    28,    29,    30,    -1,    32,    -1,
-      -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,
-      44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,
-      -1,    -1,    56,    57,    -1,    59,    60,    61,    -1,    63,
-      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
-      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    -1,    87,    88,    -1,    90,    91,    92,    93,
-      94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,
-      -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,
-      -1,   115,    -1,    -1,    -1,    -1,   120,   121,    -1,    -1,
-      -1,    -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,
-      -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,   143,
-      -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,
-     154,   155,    -1,   157,   158,   159,    -1,    -1,   162,   163,
-      -1,   165,   166,   167,   168,   169,   170,    -1,    -1,   173,
-     174,   175,   176,   177,    -1,    -1,   180,   181,    -1,   183,
-     184,   185,   186,   187,    -1,    -1,   190,   191,    -1,    -1,
-      -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,
-     204,   205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,
-      -1,   215,   216,    -1,   218,    -1,    -1,   221,   222,    -1,
-      -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,   233,
-     234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,
-     244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,
-      -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,
-      -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,
-      -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,
-     284,    -1,   286,   287,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   295,    -1,   297,   298,   299,   300,   301,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
-      -1,   315,   316,   317,    -1,   319,   320,   321,   322,    -1,
-     324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,
-     334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,
-      -1,   345,   346,   347,   348,   349,   350,   351,   352,   353,
-      -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,   363,
-     364,    -1,    -1,    -1,   368,   369,    -1,    -1,    -1,   373,
-      -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,   383,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,
-     394,   395,    -1,   397,    -1,   399,    -1,   401,   402,   403,
-     404,   405,   406,   407,   408,   409,   410,    -1,   412,    -1,
-     414,   415,   416,    -1,   418,    -1,   420,   421,   422,   423,
-     424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,
-      -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,   443,
-     444,   445,   446,    -1,   448,   449,    -1,   451,   452,   453,
-      -1,    -1,   456,   457,   458,   459,   460,   461,   462,   463,
-      -1,   465,    -1,   467,   468,    -1,   470,   471,   472,    -1,
-     474,    -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,
-     484,   485,   486,   487,   488,    -1,   490,   491,    -1,    -1,
-      -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,
-      -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,   513,
-     514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,
-     524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,
-      -1,   535,    -1,   537,   538,   539,   540,   541,   542,    -1,
-      -1,   545,   546,    -1,    -1,   549,   550,   551,   552,   553,
-     554,    -1,    -1,   557,   558,   559,   560,    -1,   562,   563,
-      -1,    -1,   566,   567,   568,   569,    -1,    -1,   572,   573,
-      -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,
-     584,   585,    -1,    -1,    -1,   589,   590,   591,    -1,    -1,
-     594,   595,    -1,   597,   598,    -1,   600,   601,    -1,    -1,
-     604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,
-      -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,
-      -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,
-      -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,
-     644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,
-     654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,   673,
-      -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,
-      -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,
-      -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,   703,
-     704,   705,   706,   707,    -1,   709,   710,   711,   712,   713,
-     714,   715,   716,   717,   718,    -1,   720,   721,   722,   723,
-     724,   725,   726,   727,   728,   729,   730,   731,   732,   733,
-     734,   735,   736,   737,   738,   739,   740,   741,   742,   743,
-      -1,   745,   746,   747,   748,   749,   750,   751,    -1,   753,
-     754,   755,   756,   757,   758,   759,   760,   761,   762,   763,
-     764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
-     774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
-     784,     5,     6,    -1,     8,     9,    10,    11,    12,    -1,
-      -1,    15,    -1,    -1,    -1,   799,    20,    -1,   802,    23,
-      -1,    25,    26,    27,    28,    29,    30,    -1,    32,    -1,
-      -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,
-      44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,
-      -1,    -1,    56,    57,    -1,    59,    60,    61,    -1,    63,
-      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
-      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    -1,    87,    88,    -1,    90,    91,    92,    93,
-      94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,
-      -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,
-      -1,   115,    -1,    -1,    -1,    -1,   120,   121,    -1,    -1,
-      -1,    -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,
-      -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,   143,
-      -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,
-     154,   155,    -1,   157,   158,   159,    -1,    -1,   162,   163,
-      -1,   165,   166,   167,   168,   169,   170,    -1,    -1,   173,
-     174,   175,   176,   177,    -1,    -1,   180,   181,    -1,   183,
-     184,   185,   186,   187,    -1,    -1,   190,   191,    -1,    -1,
-      -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,
-     204,   205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,
-      -1,   215,   216,    -1,   218,    -1,    -1,   221,   222,    -1,
-      -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,   233,
-     234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,
-     244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,
-      -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,
-      -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,
-      -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,
-     284,    -1,   286,   287,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   295,    -1,   297,   298,   299,   300,   301,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
-      -1,   315,   316,   317,    -1,   319,   320,   321,   322,    -1,
-     324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,
-     334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,
-      -1,   345,   346,   347,   348,   349,   350,   351,   352,   353,
-      -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,   363,
-     364,    -1,    -1,    -1,   368,   369,    -1,    -1,    -1,   373,
-      -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,   383,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,
-     394,   395,    -1,   397,    -1,   399,    -1,   401,   402,   403,
-     404,   405,   406,   407,   408,   409,   410,    -1,   412,    -1,
-     414,   415,   416,    -1,   418,    -1,   420,   421,   422,   423,
-     424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,
-      -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,   443,
-     444,   445,   446,    -1,   448,   449,    -1,   451,   452,   453,
-      -1,    -1,   456,   457,   458,   459,   460,   461,   462,   463,
-      -1,   465,    -1,   467,   468,    -1,   470,   471,   472,    -1,
-     474,    -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,
-     484,   485,   486,   487,   488,    -1,   490,   491,    -1,    -1,
-      -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,
-      -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,   513,
-     514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,
-     524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,
-      -1,   535,    -1,   537,   538,   539,   540,   541,   542,    -1,
-      -1,   545,   546,    -1,    -1,   549,   550,   551,   552,   553,
-     554,    -1,    -1,   557,   558,   559,   560,    -1,   562,   563,
-      -1,    -1,   566,   567,   568,   569,    -1,    -1,   572,   573,
-      -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,
-     584,   585,    -1,    -1,    -1,   589,   590,   591,    -1,    -1,
-     594,   595,    -1,   597,   598,    -1,   600,   601,    -1,    -1,
-     604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,
-      -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,
-      -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,
-      -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,
-     644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,
-     654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,   673,
-      -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,
-      -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,
-      -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,   703,
-     704,   705,   706,   707,    -1,   709,   710,   711,   712,   713,
-     714,   715,   716,   717,   718,    -1,   720,   721,   722,   723,
-     724,   725,   726,   727,   728,   729,   730,   731,   732,   733,
-     734,   735,   736,   737,   738,   739,   740,   741,   742,   743,
-      -1,   745,   746,   747,   748,   749,   750,   751,    -1,   753,
-     754,   755,   756,   757,   758,   759,   760,   761,   762,   763,
-     764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
-     774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
-     784,     5,     6,    -1,     8,     9,    10,    11,    12,    -1,
-      -1,    15,    -1,    -1,    -1,    -1,    20,    -1,   802,    23,
-      -1,    25,    26,    27,    28,    29,    30,    -1,    32,    -1,
-      -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,
-      44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,
-      -1,    -1,    56,    57,    -1,    59,    60,    61,    -1,    63,
-      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
-      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    -1,    87,    88,    -1,    90,    91,    92,    93,
-      94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,
-      -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,
-      -1,   115,    -1,    -1,    -1,    -1,   120,   121,    -1,    -1,
-      -1,    -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,
-      -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,   143,
-      -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,
-     154,   155,    -1,   157,   158,   159,    -1,    -1,   162,   163,
-      -1,   165,   166,   167,   168,   169,   170,    -1,    -1,   173,
-     174,   175,   176,   177,    -1,    -1,   180,   181,    -1,   183,
-     184,   185,   186,   187,    -1,    -1,   190,   191,    -1,    -1,
-      -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,
-     204,   205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,
-      -1,   215,   216,    -1,   218,    -1,    -1,   221,   222,    -1,
-      -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,   233,
-     234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,
-     244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,
-      -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,
-      -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,
-      -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,
-     284,    -1,   286,   287,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   295,    -1,   297,   298,   299,   300,   301,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
-      -1,   315,   316,   317,    -1,   319,   320,   321,   322,    -1,
-     324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,
-     334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,
-      -1,   345,   346,   347,   348,   349,   350,   351,   352,   353,
-      -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,   363,
-     364,    -1,    -1,    -1,   368,   369,    -1,    -1,    -1,   373,
-      -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,   383,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,
-     394,   395,    -1,   397,    -1,   399,    -1,   401,   402,   403,
-     404,   405,   406,   407,   408,   409,   410,    -1,   412,    -1,
-     414,   415,   416,    -1,   418,    -1,   420,   421,   422,   423,
-     424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,
-      -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,   443,
-     444,   445,   446,    -1,   448,   449,    -1,   451,   452,   453,
-      -1,    -1,   456,   457,   458,   459,   460,   461,   462,   463,
-      -1,   465,    -1,   467,   468,    -1,   470,   471,   472,    -1,
-     474,    -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,
-     484,   485,   486,   487,   488,    -1,   490,   491,    -1,    -1,
-      -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,
-      -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,   513,
-     514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,
-     524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,
-      -1,   535,    -1,   537,   538,   539,   540,   541,   542,    -1,
-      -1,   545,   546,    -1,    -1,   549,   550,   551,   552,   553,
-     554,    -1,    -1,   557,   558,   559,   560,    -1,   562,   563,
-      -1,    -1,   566,   567,   568,   569,    -1,    -1,   572,   573,
-      -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,
-     584,   585,    -1,    -1,    -1,   589,   590,   591,    -1,    -1,
-     594,   595,    -1,   597,   598,    -1,   600,   601,    -1,    -1,
-     604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,
-      -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,
-      -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,
-      -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,
-     644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,
-     654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,   673,
-      -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,
-      -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,
-      -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,   703,
-     704,   705,   706,   707,    -1,   709,   710,   711,   712,   713,
-     714,   715,   716,   717,   718,    -1,   720,   721,   722,   723,
-     724,   725,   726,   727,   728,   729,   730,   731,   732,   733,
-     734,   735,   736,   737,   738,   739,   740,   741,   742,   743,
-      -1,   745,   746,   747,   748,   749,   750,   751,    -1,   753,
-     754,   755,   756,   757,   758,   759,   760,   761,   762,   763,
-     764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
-     774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
-     784,     5,     6,    -1,     8,     9,    10,    11,    12,    -1,
-      -1,    15,    -1,    -1,    -1,    -1,    20,    -1,   802,    23,
-      -1,    25,    26,    27,    28,    29,    30,    -1,    32,    -1,
-      -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,
-      44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,
-      -1,    -1,    56,    57,    -1,    59,    60,    61,    -1,    63,
-      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
-      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    -1,    87,    88,    -1,    90,    91,    92,    93,
-      94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,
-      -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,
-      -1,   115,    -1,    -1,    -1,    -1,   120,   121,    -1,    -1,
-      -1,    -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,
-      -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,   143,
-      -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,
-     154,   155,    -1,   157,   158,   159,    -1,    -1,   162,   163,
-      -1,   165,   166,   167,   168,   169,   170,    -1,    -1,   173,
-     174,   175,   176,   177,    -1,    -1,   180,   181,    -1,   183,
-     184,   185,   186,   187,    -1,    -1,   190,   191,    -1,    -1,
-      -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,
-     204,   205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,
-      -1,   215,   216,    -1,   218,    -1,    -1,   221,   222,    -1,
-      -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,   233,
-     234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,
-     244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,
-      -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,
-      -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,
-      -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,
-     284,    -1,   286,   287,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   295,    -1,   297,   298,   299,   300,   301,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
-      -1,   315,   316,   317,    -1,   319,   320,   321,   322,    -1,
-     324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,
-     334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,
-      -1,   345,   346,   347,   348,   349,   350,   351,   352,   353,
-      -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,   363,
-     364,    -1,    -1,    -1,   368,   369,    -1,    -1,    -1,   373,
-      -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,   383,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,
-     394,   395,    -1,   397,    -1,   399,    -1,   401,   402,   403,
-     404,   405,   406,   407,   408,   409,   410,    -1,   412,    -1,
-     414,   415,   416,    -1,   418,    -1,   420,   421,   422,   423,
-     424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,
-      -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,   443,
-     444,   445,   446,    -1,   448,   449,    -1,   451,   452,   453,
-      -1,    -1,   456,   457,   458,   459,   460,   461,   462,   463,
-      -1,   465,    -1,   467,   468,    -1,   470,   471,   472,    -1,
-     474,    -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,
-     484,   485,   486,   487,   488,    -1,   490,   491,   492,    -1,
-      -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,
-      -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,   513,
-     514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,
-     524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,
-      -1,   535,    -1,   537,   538,   539,   540,   541,   542,    -1,
-      -1,   545,   546,    -1,    -1,   549,   550,   551,   552,   553,
-     554,    -1,    -1,   557,   558,   559,   560,    -1,   562,   563,
-      -1,   565,   566,   567,   568,   569,    -1,    -1,   572,   573,
-      -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,
-     584,   585,    -1,    -1,    -1,   589,   590,   591,    -1,    -1,
-     594,   595,    -1,   597,   598,    -1,   600,   601,    -1,    -1,
-     604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,
-      -1,    -1,    -1,    -1,   618,   619,   620,    -1,    -1,   623,
-      -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,
-      -1,    -1,   636,    -1,    -1,   639,   640,   641,    -1,   643,
-     644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,
-     654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,   673,
-      -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,
-      -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,
-      -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,   703,
-     704,   705,   706,   707,    -1,   709,   710,   711,   712,   713,
-     714,   715,   716,   717,   718,    -1,   720,   721,   722,   723,
-     724,   725,   726,   727,   728,   729,   730,   731,   732,   733,
-     734,   735,   736,   737,   738,   739,   740,   741,   742,   743,
-      -1,   745,   746,   747,   748,   749,   750,   751,    -1,   753,
-     754,   755,   756,   757,   758,   759,   760,   761,   762,   763,
-     764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
-     774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
-     784,     5,     6,    -1,     8,     9,    10,    11,    12,    -1,
-      -1,    15,    -1,    -1,   798,   799,    20,    -1,    -1,    23,
-      -1,    25,    26,    27,    28,    29,    30,    -1,    32,    -1,
-      -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,
-      44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,
-      -1,    -1,    56,    57,    -1,    59,    60,    61,    -1,    63,
-      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
-      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    -1,    87,    88,    -1,    90,    91,    92,    93,
-      94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,
-      -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,
-      -1,   115,    -1,    -1,    -1,    -1,   120,   121,    -1,    -1,
-      -1,    -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,
-      -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,   143,
-      -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,
-     154,   155,    -1,   157,   158,   159,    -1,    -1,   162,   163,
-      -1,   165,   166,   167,   168,   169,   170,    -1,    -1,   173,
-     174,   175,   176,   177,    -1,    -1,   180,   181,    -1,   183,
-     184,   185,   186,   187,    -1,    -1,   190,   191,    -1,    -1,
-      -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,
-     204,   205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,
-      -1,   215,   216,    -1,   218,    -1,    -1,   221,   222,    -1,
-      -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,   233,
-     234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,
-     244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,
-      -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,
-      -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,
-      -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,
-     284,    -1,   286,   287,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   295,    -1,   297,   298,   299,   300,   301,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
-      -1,   315,   316,   317,    -1,   319,   320,   321,   322,    -1,
-     324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,
-     334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,
-      -1,   345,   346,   347,   348,   349,   350,   351,   352,   353,
-      -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,   363,
-     364,    -1,    -1,    -1,   368,   369,    -1,    -1,    -1,   373,
-      -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,   383,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,
-     394,   395,    -1,   397,    -1,   399,    -1,   401,   402,   403,
-     404,   405,   406,   407,   408,   409,   410,    -1,   412,    -1,
-     414,   415,   416,    -1,   418,    -1,   420,   421,   422,   423,
-     424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,
-      -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,   443,
-     444,   445,   446,    -1,   448,   449,    -1,   451,   452,   453,
-      -1,    -1,   456,   457,   458,   459,   460,   461,   462,   463,
-      -1,   465,    -1,   467,   468,    -1,   470,   471,   472,    -1,
-     474,    -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,
-     484,   485,   486,   487,   488,    -1,   490,   491,    -1,    -1,
-      -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,
-      -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,   513,
-     514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,
-     524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,
-      -1,   535,    -1,   537,   538,   539,   540,   541,   542,    -1,
-      -1,   545,   546,    -1,    -1,   549,   550,   551,   552,   553,
-     554,    -1,    -1,   557,   558,   559,   560,    -1,   562,   563,
-      -1,    -1,   566,   567,   568,   569,    -1,    -1,   572,   573,
-      -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,
-     584,   585,    -1,    -1,    -1,   589,   590,   591,    -1,    -1,
-     594,   595,    -1,   597,   598,    -1,   600,   601,    -1,    -1,
-     604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,
-      -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,
-      -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,
-      -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,
-     644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,
-     654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,   673,
-      -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,
-      -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,
-      -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,   703,
-     704,   705,   706,   707,    -1,   709,   710,   711,   712,   713,
-     714,   715,   716,   717,   718,    -1,   720,   721,   722,   723,
-     724,   725,   726,   727,   728,   729,   730,   731,   732,   733,
-     734,   735,   736,   737,   738,   739,   740,   741,   742,   743,
-      -1,   745,   746,   747,   748,   749,   750,   751,    -1,   753,
-     754,   755,   756,   757,   758,   759,   760,   761,   762,   763,
-     764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
-     774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
-     784,     5,     6,    -1,     8,     9,    10,    11,    12,    -1,
-      -1,    15,    -1,    -1,    -1,   799,    20,    -1,    -1,    23,
-      -1,    25,    26,    27,    28,    29,    30,    -1,    32,    -1,
-      -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,
-      44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,
-      -1,    -1,    56,    57,    -1,    59,    60,    61,    -1,    63,
-      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
-      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    -1,    87,    88,    -1,    90,    91,    92,    93,
-      94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,
-      -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,
-      -1,   115,    -1,    -1,    -1,    -1,   120,   121,    -1,    -1,
-      -1,    -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,
-      -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,   143,
-      -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,
-     154,   155,    -1,   157,   158,   159,    -1,    -1,   162,   163,
-      -1,   165,   166,   167,   168,   169,   170,    -1,    -1,   173,
-     174,   175,   176,   177,    -1,    -1,   180,   181,    -1,   183,
-     184,   185,   186,   187,    -1,    -1,   190,   191,    -1,    -1,
-      -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,
-     204,   205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,
-      -1,   215,   216,    -1,   218,    -1,    -1,   221,   222,    -1,
-      -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,   233,
-     234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,
-     244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,
-      -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,
-      -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,
-      -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,
-     284,    -1,   286,   287,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   295,    -1,   297,   298,   299,   300,   301,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
-      -1,   315,   316,   317,    -1,   319,   320,   321,   322,    -1,
-     324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,
-     334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,
-      -1,   345,   346,   347,   348,   349,   350,   351,   352,   353,
-      -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,   363,
-     364,    -1,    -1,    -1,   368,   369,    -1,    -1,    -1,   373,
-      -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,   383,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,
-     394,   395,    -1,   397,    -1,   399,    -1,   401,   402,   403,
-     404,   405,   406,   407,   408,   409,   410,    -1,   412,    -1,
-     414,   415,   416,    -1,   418,    -1,   420,   421,   422,   423,
-     424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,
-      -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,   443,
-     444,   445,   446,    -1,   448,   449,    -1,   451,   452,   453,
-      -1,    -1,   456,   457,   458,   459,   460,   461,   462,   463,
-      -1,   465,    -1,   467,   468,    -1,   470,   471,   472,    -1,
-     474,    -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,
-     484,   485,   486,   487,   488,    -1,   490,   491,    -1,    -1,
-      -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,
-      -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,   513,
-     514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,
-     524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,
-      -1,   535,    -1,   537,   538,   539,   540,   541,   542,    -1,
-      -1,   545,   546,    -1,    -1,   549,   550,   551,   552,   553,
-     554,    -1,    -1,   557,   558,   559,   560,    -1,   562,   563,
-      -1,    -1,   566,   567,   568,   569,    -1,    -1,   572,   573,
-      -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,
-     584,   585,    -1,    -1,    -1,   589,   590,   591,    -1,    -1,
-     594,   595,    -1,   597,   598,    -1,   600,   601,    -1,    -1,
-     604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,
-      -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,
-      -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,
-      -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,
-     644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,
-     654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,   673,
-      -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,
-      -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,
-      -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,   703,
-     704,   705,   706,   707,    -1,   709,   710,   711,   712,   713,
-     714,   715,   716,   717,   718,    -1,   720,   721,   722,   723,
-     724,   725,   726,   727,   728,   729,   730,   731,   732,   733,
-     734,   735,   736,   737,   738,   739,   740,   741,   742,   743,
-      -1,   745,   746,   747,   748,   749,   750,   751,    -1,   753,
-     754,   755,   756,   757,   758,   759,   760,   761,   762,   763,
-     764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
-     774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
-     784,     5,     6,    -1,     8,     9,    10,    11,    12,    -1,
-      -1,    15,    -1,    -1,    -1,   799,    20,    -1,    -1,    23,
-      -1,    25,    26,    27,    28,    29,    30,    -1,    32,    -1,
-      -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,
-      44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,
-      -1,    -1,    56,    57,    -1,    59,    60,    61,    -1,    63,
-      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
-      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    -1,    87,    88,    89,    90,    91,    92,    93,
-      94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,
-      -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,
-      -1,   115,    -1,    -1,    -1,    -1,   120,   121,    -1,    -1,
-      -1,    -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,
-      -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,   143,
-      -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,
-     154,   155,    -1,   157,   158,   159,    -1,    -1,   162,   163,
-      -1,   165,   166,   167,   168,   169,   170,    -1,    -1,   173,
-     174,   175,   176,   177,    -1,    -1,   180,   181,    -1,   183,
-     184,   185,   186,   187,    -1,    -1,   190,   191,    -1,    -1,
-      -1,   195,   196,    -1,   198,   199,    -1,    -1,   202,    -1,
-     204,   205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,
-      -1,   215,   216,    -1,   218,    -1,    -1,   221,   222,    -1,
-      -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,   233,
-     234,   235,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,
-     244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,
-      -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,   263,
-      -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,
-      -1,   275,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,
-     284,    -1,   286,   287,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   295,    -1,   297,   298,   299,   300,   301,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
-      -1,   315,   316,   317,    -1,   319,   320,   321,   322,    -1,
-     324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,
-     334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,
-      -1,   345,   346,   347,   348,   349,   350,   351,   352,   353,
-      -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,   363,
-     364,    -1,    -1,    -1,   368,   369,    -1,    -1,    -1,   373,
-      -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,   383,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,
-     394,   395,    -1,   397,    -1,   399,    -1,   401,   402,   403,
-     404,   405,   406,   407,   408,   409,   410,    -1,   412,    -1,
-     414,   415,   416,    -1,   418,    -1,   420,   421,   422,   423,
-     424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,
-      -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,   443,
-     444,   445,   446,    -1,   448,   449,    -1,   451,   452,   453,
-      -1,    -1,   456,   457,   458,   459,   460,   461,   462,   463,
-      -1,   465,    -1,   467,   468,    -1,   470,   471,   472,    -1,
-     474,    -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,
-     484,   485,   486,   487,   488,    -1,   490,   491,   492,    -1,
-      -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,
-      -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,   513,
-     514,   515,   516,   517,   518,    -1,    -1,    -1,    -1,   523,
-     524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,
-      -1,   535,    -1,   537,   538,   539,   540,   541,   542,    -1,
-      -1,   545,   546,    -1,    -1,   549,   550,   551,   552,   553,
-     554,    -1,    -1,   557,   558,   559,   560,    -1,   562,   563,
-      -1,   565,   566,   567,   568,   569,    -1,    -1,   572,   573,
-      -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,
-     584,   585,    -1,    -1,    -1,   589,   590,   591,    -1,    -1,
-     594,   595,    -1,   597,   598,    -1,   600,   601,    -1,    -1,
-     604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,
-      -1,    -1,    -1,    -1,   618,   619,   620,    -1,    -1,   623,
-      -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,
-      -1,    -1,   636,    -1,    -1,   639,   640,   641,    -1,   643,
-     644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,
-     654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,   673,
-      -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,
-      -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,
-      -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,   703,
-     704,   705,   706,   707,    -1,   709,   710,   711,   712,   713,
-     714,   715,   716,   717,   718,    -1,   720,   721,   722,   723,
-     724,   725,   726,   727,   728,   729,   730,   731,   732,   733,
-     734,   735,   736,   737,   738,   739,   740,   741,   742,   743,
-      -1,   745,   746,   747,   748,   749,   750,   751,    -1,   753,
-     754,   755,   756,   757,   758,   759,   760,   761,   762,   763,
-     764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
-     774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
-     784,     5,     6,    -1,     8,     9,    10,    11,    12,    -1,
-      -1,    15,    -1,    -1,   798,    -1,    20,    -1,    -1,    23,
-      -1,    25,    26,    27,    28,    29,    30,    -1,    32,    -1,
-      -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,
-      44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,
-      -1,    -1,    56,    57,    -1,    59,    60,    61,    -1,    63,
-      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
-      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    -1,    87,    88,    -1,    90,    91,    92,    93,
-      94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,
-      -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,
-      -1,   115,    -1,    -1,    -1,    -1,   120,   121,    -1,    -1,
-      -1,    -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,
-      -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,   143,
-      -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,
-     154,   155,    -1,   157,   158,   159,    -1,    -1,   162,   163,
-      -1,   165,   166,   167,   168,   169,   170,    -1,    -1,   173,
-     174,   175,   176,   177,    -1,    -1,   180,   181,    -1,   183,
-     184,   185,   186,   187,    -1,    -1,   190,   191,    -1,    -1,
-      -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,
-     204,   205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,
-      -1,   215,   216,    -1,   218,    -1,    -1,   221,   222,    -1,
-      -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,   233,
-     234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,
-     244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,
-      -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,
-      -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,
-      -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,
-     284,    -1,   286,   287,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   295,    -1,   297,   298,   299,   300,   301,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
-      -1,   315,   316,   317,    -1,   319,   320,   321,   322,    -1,
-     324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,
-     334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,
-      -1,   345,   346,   347,   348,   349,   350,   351,   352,   353,
-      -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,   363,
-     364,    -1,    -1,    -1,   368,   369,    -1,    -1,    -1,   373,
-      -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,   383,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,
-     394,   395,    -1,   397,    -1,   399,    -1,   401,   402,   403,
-     404,   405,   406,   407,   408,   409,   410,    -1,   412,    -1,
-     414,   415,   416,    -1,   418,    -1,   420,   421,   422,   423,
-     424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,
-      -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,   443,
-     444,   445,   446,    -1,   448,   449,    -1,   451,   452,   453,
-      -1,    -1,   456,   457,   458,   459,   460,   461,   462,   463,
-      -1,   465,    -1,   467,   468,    -1,   470,   471,   472,    -1,
-     474,    -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,
-     484,   485,   486,   487,   488,    -1,   490,   491,    -1,    -1,
-      -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,
-      -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,   513,
-     514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,
-     524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,
-      -1,   535,    -1,   537,   538,   539,   540,   541,   542,    -1,
-      -1,   545,   546,    -1,    -1,   549,   550,   551,   552,   553,
-     554,    -1,    -1,   557,   558,   559,   560,    -1,   562,   563,
-      -1,    -1,   566,   567,   568,   569,    -1,    -1,   572,   573,
-      -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,
-     584,   585,    -1,    -1,    -1,   589,   590,   591,    -1,    -1,
-     594,   595,    -1,   597,   598,    -1,   600,   601,    -1,    -1,
-     604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,
-      -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,
-      -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,
-      -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,
-     644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,
-     654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,   673,
-      -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,
-      -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,
-      -1,   695,   696,    -1,    -1,   699,   700,   701,   702,   703,
-     704,   705,   706,   707,    -1,   709,   710,   711,   712,   713,
-     714,   715,   716,   717,   718,   719,   720,   721,   722,   723,
-     724,   725,   726,   727,   728,   729,   730,   731,   732,   733,
-     734,   735,   736,   737,   738,   739,   740,   741,   742,   743,
-      -1,   745,   746,   747,   748,   749,   750,   751,    -1,   753,
-     754,   755,   756,   757,   758,   759,   760,   761,   762,   763,
-     764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
-     774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
-     784,     5,     6,    -1,     8,     9,    10,    11,    12,    -1,
-      -1,    15,    -1,    -1,   798,    -1,    20,    -1,    -1,    23,
-      -1,    25,    26,    27,    28,    29,    30,    -1,    32,    -1,
-      -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,
-      44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,
-      -1,    -1,    56,    57,    -1,    59,    60,    61,    -1,    63,
-      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
-      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    -1,    87,    88,    -1,    90,    91,    92,    93,
-      94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,
-      -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,
-      -1,   115,    -1,    -1,    -1,    -1,   120,   121,    -1,    -1,
-      -1,    -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,
-      -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,   143,
-      -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,
-     154,   155,    -1,   157,   158,   159,    -1,    -1,   162,   163,
-      -1,   165,   166,   167,   168,   169,   170,    -1,    -1,   173,
-     174,   175,   176,   177,    -1,    -1,   180,   181,    -1,   183,
-     184,   185,   186,   187,    -1,    -1,   190,   191,    -1,    -1,
-      -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,
-     204,   205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,
-      -1,   215,   216,    -1,   218,    -1,    -1,   221,   222,    -1,
-      -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,   233,
-     234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,
-     244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,
-      -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,
-      -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,
-      -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,
-     284,    -1,   286,   287,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   295,    -1,   297,   298,   299,   300,   301,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
-      -1,   315,   316,   317,    -1,   319,   320,   321,   322,    -1,
-     324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,
-     334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,
-      -1,   345,   346,   347,   348,   349,   350,   351,   352,   353,
-      -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,   363,
-     364,    -1,    -1,    -1,   368,   369,    -1,    -1,    -1,   373,
-      -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,   383,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,
-     394,   395,    -1,   397,    -1,   399,    -1,   401,   402,   403,
-     404,   405,   406,   407,   408,   409,   410,    -1,   412,    -1,
-     414,   415,   416,    -1,   418,    -1,   420,   421,   422,   423,
-     424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,
-      -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,   443,
-     444,   445,   446,    -1,   448,   449,    -1,   451,   452,   453,
-      -1,    -1,   456,   457,   458,   459,   460,   461,   462,   463,
-      -1,   465,    -1,   467,   468,    -1,   470,   471,   472,    -1,
-     474,    -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,
-     484,   485,   486,   487,   488,    -1,   490,   491,    -1,    -1,
-      -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,
-      -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,   513,
-     514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,
-     524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,
-      -1,   535,    -1,   537,   538,   539,   540,   541,   542,    -1,
-      -1,   545,   546,    -1,    -1,   549,   550,   551,   552,   553,
-     554,    -1,    -1,   557,   558,   559,   560,    -1,   562,   563,
-      -1,    -1,   566,   567,   568,   569,    -1,    -1,   572,   573,
-      -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,
-     584,   585,    -1,    -1,    -1,   589,   590,   591,    -1,    -1,
-     594,   595,    -1,   597,   598,    -1,   600,   601,    -1,    -1,
-     604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,
-      -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,
-      -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,
-      -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,
-     644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,
-     654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,   673,
-      -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,
-      -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,
-      -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,   703,
-     704,   705,   706,   707,    -1,   709,   710,   711,   712,   713,
-     714,   715,   716,   717,   718,    -1,   720,   721,   722,   723,
-     724,   725,   726,   727,   728,   729,   730,   731,   732,   733,
-     734,   735,   736,   737,   738,   739,   740,   741,   742,   743,
-      -1,   745,   746,   747,   748,   749,   750,   751,    -1,   753,
-     754,   755,   756,   757,   758,   759,   760,   761,   762,   763,
-     764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
-     774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
-     784,     5,     6,    -1,     8,     9,    10,    11,    12,    -1,
-      -1,    15,    -1,    -1,   798,    -1,    20,    -1,    -1,    23,
-      -1,    25,    26,    27,    28,    29,    30,    -1,    32,    -1,
-      -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,
-      44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,
-      -1,    -1,    56,    57,    -1,    59,    60,    61,    -1,    63,
-      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
-      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    -1,    87,    88,    -1,    90,    91,    92,    93,
-      94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,
-      -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,
-      -1,   115,    -1,    -1,    -1,    -1,   120,   121,    -1,    -1,
-      -1,    -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,
-      -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,   143,
-      -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,
-     154,   155,    -1,   157,   158,   159,    -1,    -1,   162,   163,
-      -1,   165,   166,   167,   168,   169,   170,    -1,    -1,   173,
-     174,   175,   176,   177,    -1,    -1,   180,   181,    -1,   183,
-     184,   185,   186,   187,    -1,    -1,   190,   191,    -1,    -1,
-      -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,
-     204,   205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,
-      -1,   215,   216,    -1,   218,    -1,    -1,   221,   222,    -1,
-      -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,   233,
-     234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,
-     244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,
-      -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,
-      -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,
-      -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,
-     284,    -1,   286,   287,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   295,    -1,   297,   298,   299,   300,   301,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
-      -1,   315,   316,   317,    -1,   319,   320,   321,   322,    -1,
-     324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,
-     334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,
-      -1,   345,   346,   347,   348,   349,   350,   351,   352,   353,
-      -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,   363,
-     364,    -1,    -1,    -1,   368,   369,    -1,    -1,    -1,   373,
-      -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,   383,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,
-     394,   395,    -1,   397,    -1,   399,    -1,   401,   402,   403,
-     404,   405,   406,   407,   408,   409,   410,    -1,   412,    -1,
-     414,   415,   416,    -1,   418,    -1,   420,   421,   422,   423,
-     424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,
-      -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,   443,
-     444,   445,   446,    -1,   448,   449,    -1,   451,   452,   453,
-      -1,    -1,   456,   457,   458,   459,   460,   461,   462,   463,
-      -1,   465,    -1,   467,   468,    -1,   470,   471,   472,    -1,
-     474,    -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,
-     484,   485,   486,   487,   488,    -1,   490,   491,    -1,    -1,
-      -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,
-      -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,   513,
-     514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,
-     524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,
-      -1,   535,    -1,   537,   538,   539,   540,   541,   542,    -1,
-      -1,   545,   546,    -1,    -1,   549,   550,   551,   552,   553,
-     554,    -1,    -1,   557,   558,   559,   560,    -1,   562,   563,
-      -1,    -1,   566,   567,   568,   569,    -1,    -1,   572,   573,
-      -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,
-     584,   585,    -1,    -1,    -1,   589,   590,   591,    -1,    -1,
-     594,   595,    -1,   597,   598,    -1,   600,   601,    -1,    -1,
-     604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,
-      -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,
-      -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,
-      -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,
-     644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,
-     654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,   673,
-      -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,
-      -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,
-      -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,   703,
-     704,   705,   706,   707,    -1,   709,   710,   711,   712,   713,
-     714,   715,   716,   717,   718,    -1,   720,   721,   722,   723,
-     724,   725,   726,   727,   728,   729,   730,   731,   732,   733,
-     734,   735,   736,   737,   738,   739,   740,   741,   742,   743,
-      -1,   745,   746,   747,   748,   749,   750,   751,    -1,   753,
-     754,   755,   756,   757,   758,   759,   760,   761,   762,   763,
-     764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
-     774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
-     784,     5,     6,    -1,     8,     9,    10,    11,    12,    -1,
-      -1,    15,    -1,    -1,   798,    -1,    20,    -1,    -1,    23,
-      -1,    25,    26,    27,    28,    29,    30,    -1,    32,    -1,
-      -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,
-      44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,
-      -1,    -1,    56,    57,    -1,    59,    60,    61,    -1,    63,
-      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
-      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    -1,    87,    88,    -1,    90,    91,    92,    93,
-      94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,
-      -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,
-      -1,   115,    -1,    -1,    -1,    -1,   120,   121,    -1,    -1,
-      -1,    -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,
-      -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,   143,
-      -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,
-     154,   155,    -1,   157,   158,   159,    -1,    -1,   162,   163,
-      -1,   165,   166,   167,   168,   169,   170,    -1,    -1,   173,
-     174,   175,   176,   177,    -1,    -1,   180,   181,    -1,   183,
-     184,   185,   186,   187,    -1,    -1,   190,   191,    -1,    -1,
-      -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,
-     204,   205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,
-      -1,   215,   216,    -1,   218,    -1,    -1,   221,   222,    -1,
-      -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,   233,
-     234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,
-     244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,
-      -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,
-      -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,
-      -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,
-     284,    -1,   286,   287,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   295,    -1,   297,   298,   299,   300,   301,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
-      -1,   315,   316,   317,    -1,   319,   320,   321,   322,    -1,
-     324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,
-     334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,
-      -1,   345,   346,   347,   348,   349,   350,   351,   352,   353,
-      -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,   363,
-     364,    -1,    -1,    -1,   368,   369,    -1,    -1,    -1,   373,
-      -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,   383,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,
-     394,   395,    -1,   397,    -1,   399,    -1,   401,   402,   403,
-     404,   405,   406,   407,   408,   409,   410,    -1,   412,    -1,
-     414,   415,   416,    -1,   418,    -1,   420,   421,   422,   423,
-     424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,
-      -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,   443,
-     444,   445,   446,    -1,   448,   449,    -1,   451,   452,   453,
-      -1,    -1,   456,   457,   458,   459,   460,   461,   462,   463,
-      -1,   465,    -1,   467,   468,    -1,   470,   471,   472,    -1,
-     474,    -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,
-     484,   485,   486,   487,   488,    -1,   490,   491,    -1,    -1,
-      -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,
-      -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,   513,
-     514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,
-     524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,
-      -1,   535,    -1,   537,   538,   539,   540,   541,   542,    -1,
-      -1,   545,   546,    -1,    -1,   549,   550,   551,   552,   553,
-     554,    -1,    -1,   557,   558,   559,   560,    -1,   562,   563,
-      -1,    -1,   566,   567,   568,   569,    -1,    -1,   572,   573,
-      -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,
-     584,   585,    -1,    -1,    -1,   589,   590,   591,    -1,    -1,
-     594,   595,    -1,   597,   598,    -1,   600,   601,    -1,    -1,
-     604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,
-      -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,
-      -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,
-      -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,
-     644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,
-     654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,   673,
-      -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,
-      -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,
-      -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,   703,
-     704,   705,   706,   707,    -1,   709,   710,   711,   712,   713,
-     714,   715,   716,   717,   718,    -1,   720,   721,   722,   723,
-     724,   725,   726,   727,   728,   729,   730,   731,   732,   733,
-     734,   735,   736,   737,   738,   739,   740,   741,   742,   743,
-      -1,   745,   746,   747,   748,   749,   750,   751,    -1,   753,
-     754,   755,   756,   757,   758,   759,   760,   761,   762,   763,
-     764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
-     774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
-     784,     5,     6,    -1,     8,     9,    10,    11,    12,    -1,
-      -1,    15,    -1,    -1,   798,    -1,    20,    -1,    -1,    23,
-      -1,    25,    26,    27,    28,    29,    30,    -1,    32,    -1,
-      -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,
-      44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,
-      -1,    -1,    56,    57,    -1,    59,    60,    61,    -1,    63,
-      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
-      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    -1,    87,    88,    -1,    90,    91,    92,    93,
-      94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,
-      -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,
-      -1,   115,    -1,    -1,    -1,    -1,   120,   121,    -1,    -1,
-      -1,    -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,
-      -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,   143,
-      -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,
-     154,   155,    -1,   157,   158,   159,    -1,    -1,   162,   163,
-      -1,   165,   166,   167,   168,   169,   170,    -1,    -1,   173,
-     174,   175,   176,   177,    -1,    -1,   180,   181,    -1,   183,
-     184,   185,   186,   187,    -1,    -1,   190,   191,    -1,    -1,
-      -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,
-     204,   205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,
-      -1,   215,   216,    -1,   218,    -1,    -1,   221,   222,    -1,
-      -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,   233,
-     234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,
-     244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,
-      -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,
-      -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,
-      -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,
-     284,    -1,   286,   287,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   295,    -1,   297,   298,   299,   300,   301,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
-      -1,   315,   316,   317,    -1,   319,   320,   321,   322,    -1,
-     324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,
-     334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,
-      -1,   345,   346,   347,   348,   349,   350,   351,   352,   353,
-      -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,   363,
-     364,    -1,    -1,    -1,   368,   369,    -1,    -1,    -1,   373,
-      -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,   383,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,
-     394,   395,    -1,   397,    -1,   399,    -1,   401,   402,   403,
-     404,   405,   406,   407,   408,   409,   410,    -1,   412,    -1,
-     414,   415,   416,    -1,   418,    -1,   420,   421,   422,   423,
-     424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,
-      -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,   443,
-     444,   445,   446,    -1,   448,   449,    -1,   451,   452,   453,
-      -1,    -1,   456,   457,   458,   459,   460,   461,   462,   463,
-      -1,   465,    -1,   467,   468,    -1,   470,   471,   472,    -1,
-     474,    -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,
-     484,   485,   486,   487,   488,    -1,   490,   491,    -1,    -1,
-      -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,
-      -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,   513,
-     514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,
-     524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,
-      -1,   535,    -1,   537,   538,   539,   540,   541,   542,    -1,
-      -1,   545,   546,    -1,    -1,   549,   550,   551,   552,   553,
-     554,    -1,    -1,   557,   558,   559,   560,    -1,   562,   563,
-      -1,    -1,   566,   567,   568,   569,    -1,    -1,   572,   573,
-      -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,
-     584,   585,    -1,    -1,    -1,   589,   590,   591,    -1,    -1,
-     594,   595,    -1,   597,   598,    -1,   600,   601,    -1,    -1,
-     604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,
-      -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,
-      -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,
-      -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,
-     644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,
-     654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,   673,
-      -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,
-      -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,
-      -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,   703,
-     704,   705,   706,   707,    -1,   709,   710,   711,   712,   713,
-     714,   715,   716,   717,   718,    -1,   720,   721,   722,   723,
-     724,   725,   726,   727,   728,   729,   730,   731,   732,   733,
-     734,   735,   736,   737,   738,   739,   740,   741,   742,   743,
-      -1,   745,   746,   747,   748,   749,   750,   751,    -1,   753,
-     754,   755,   756,   757,   758,   759,   760,   761,   762,   763,
-     764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
-     774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
-     784,     5,     6,    -1,     8,     9,    10,    11,    12,    -1,
-      -1,    15,    -1,    -1,   798,    -1,    20,    -1,    -1,    23,
-      -1,    25,    26,    27,    28,    29,    30,    -1,    32,    -1,
-      -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,
-      44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,
-      -1,    -1,    56,    57,    -1,    59,    60,    61,    -1,    63,
-      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
-      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    -1,    87,    88,    -1,    90,    91,    92,    93,
-      94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,
-      -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,
-      -1,   115,    -1,    -1,    -1,    -1,   120,   121,    -1,    -1,
-      -1,    -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,
-      -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,   143,
-      -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,
-     154,   155,    -1,   157,   158,   159,    -1,    -1,   162,   163,
-      -1,   165,   166,   167,   168,   169,   170,    -1,    -1,   173,
-     174,   175,   176,   177,    -1,    -1,   180,   181,    -1,   183,
-     184,   185,   186,   187,    -1,    -1,   190,   191,    -1,    -1,
-      -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,
-     204,   205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,
-      -1,   215,   216,    -1,   218,    -1,    -1,   221,   222,    -1,
-      -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,   233,
-     234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,
-     244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,
-      -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,
-      -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,
-      -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,
-     284,    -1,   286,   287,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   295,    -1,   297,   298,   299,   300,   301,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
-      -1,   315,   316,   317,    -1,   319,   320,   321,   322,    -1,
-     324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,
-     334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,
-      -1,   345,   346,   347,   348,   349,   350,   351,   352,   353,
-      -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,   363,
-     364,    -1,    -1,    -1,   368,   369,    -1,    -1,    -1,   373,
-      -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,   383,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,
-     394,   395,    -1,   397,    -1,   399,    -1,   401,   402,   403,
-     404,   405,   406,   407,   408,   409,   410,    -1,   412,    -1,
-     414,   415,   416,    -1,   418,    -1,   420,   421,   422,   423,
-     424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,
-      -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,   443,
-     444,   445,   446,    -1,   448,   449,    -1,   451,   452,   453,
-      -1,    -1,   456,   457,   458,   459,   460,   461,   462,   463,
-      -1,   465,    -1,   467,   468,    -1,   470,   471,   472,    -1,
-     474,    -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,
-     484,   485,   486,   487,   488,    -1,   490,   491,    -1,    -1,
-      -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,
-      -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,   513,
-     514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,
-     524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,
-      -1,   535,    -1,   537,   538,   539,   540,   541,   542,    -1,
-      -1,   545,   546,    -1,    -1,   549,   550,   551,   552,   553,
-     554,    -1,    -1,   557,   558,   559,   560,    -1,   562,   563,
-      -1,    -1,   566,   567,   568,   569,    -1,    -1,   572,   573,
-      -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,
-     584,   585,    -1,    -1,    -1,   589,   590,   591,    -1,    -1,
-     594,   595,    -1,   597,   598,    -1,   600,   601,    -1,    -1,
-     604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,
-      -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,
-      -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,
-      -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,
-     644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,
-     654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,   673,
-      -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,
-      -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,
-      -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,   703,
-     704,   705,   706,   707,    -1,   709,   710,   711,   712,   713,
-     714,   715,   716,   717,   718,    -1,   720,   721,   722,   723,
-     724,   725,   726,   727,   728,   729,   730,   731,   732,   733,
-     734,   735,   736,   737,   738,   739,   740,   741,   742,   743,
-      -1,   745,   746,   747,   748,   749,   750,   751,    -1,   753,
-     754,   755,   756,   757,   758,   759,   760,   761,   762,   763,
-     764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
-     774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
-     784,    -1,    -1,    -1,    -1,    -1,     5,     6,   792,     8,
-       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,    -1,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,    -1,    -1,    -1,    -1,
-      -1,     5,     6,   792,     8,     9,    10,    11,    12,    -1,
-      -1,    15,    -1,    -1,    -1,    -1,    20,    -1,    -1,    23,
-      -1,    25,    26,    27,    28,    29,    30,    -1,    32,    -1,
-      -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,
-      44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,
-      -1,    -1,    56,    57,    -1,    59,    60,    61,    -1,    63,
-      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
-      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    -1,    87,    88,    -1,    90,    91,    92,    93,
-      94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,
-      -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,
-      -1,   115,    -1,    -1,    -1,    -1,   120,   121,    -1,    -1,
-      -1,    -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,
-      -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,   143,
-      -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,
-     154,   155,    -1,   157,   158,   159,    -1,    -1,   162,   163,
-      -1,   165,   166,   167,   168,   169,   170,    -1,    -1,   173,
-     174,   175,   176,   177,    -1,    -1,   180,   181,    -1,   183,
-     184,   185,   186,   187,    -1,    -1,   190,   191,    -1,    -1,
-      -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,
-     204,   205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,
-      -1,   215,   216,    -1,   218,    -1,    -1,   221,   222,    -1,
-      -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,   233,
-     234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,
-     244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,
-      -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,
-      -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,
-      -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,
-     284,    -1,   286,   287,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   295,    -1,   297,   298,   299,   300,   301,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
-      -1,   315,   316,   317,    -1,   319,   320,   321,   322,    -1,
-     324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,
-     334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,
-      -1,   345,   346,   347,   348,   349,   350,   351,   352,   353,
-      -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,   363,
-     364,    -1,    -1,    -1,   368,   369,    -1,    -1,    -1,   373,
-      -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,   383,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,
-     394,   395,    -1,   397,    -1,   399,    -1,   401,   402,   403,
-     404,   405,   406,   407,   408,   409,   410,    -1,   412,    -1,
-     414,   415,   416,    -1,   418,    -1,   420,   421,   422,   423,
-     424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,
-      -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,   443,
-     444,   445,   446,    -1,   448,   449,    -1,   451,   452,   453,
-      -1,    -1,   456,   457,   458,   459,   460,   461,   462,   463,
-      -1,   465,    -1,   467,   468,    -1,   470,   471,   472,    -1,
-     474,    -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,
-     484,   485,   486,   487,   488,    -1,   490,   491,    -1,    -1,
-      -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,
-      -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,   513,
-     514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,
-     524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,
-      -1,   535,    -1,   537,   538,   539,   540,   541,   542,    -1,
-      -1,   545,   546,    -1,    -1,   549,   550,   551,   552,   553,
-     554,    -1,    -1,   557,   558,   559,   560,    -1,   562,   563,
-      -1,    -1,   566,   567,   568,   569,    -1,    -1,   572,   573,
-      -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,
-     584,   585,    -1,    -1,    -1,   589,   590,   591,    -1,    -1,
-     594,   595,    -1,   597,   598,    -1,   600,   601,    -1,    -1,
-     604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,
-      -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,
-      -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,
-      -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,
-     644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,
-     654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,   673,
-      -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,
-      -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,
-      -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,   703,
-     704,   705,   706,   707,    -1,   709,   710,   711,   712,   713,
-     714,   715,   716,   717,   718,    -1,   720,   721,   722,   723,
-     724,   725,   726,   727,   728,   729,   730,   731,   732,   733,
-     734,   735,   736,   737,   738,   739,   740,   741,   742,   743,
-      -1,   745,   746,   747,   748,   749,   750,   751,    -1,   753,
-     754,   755,   756,   757,   758,   759,   760,   761,   762,   763,
-     764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
-     774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
-     784,    -1,    -1,    -1,    -1,    -1,     5,     6,   792,     8,
-       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,    -1,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,    -1,    -1,    -1,    -1,
-      -1,     5,     6,   792,     8,     9,    10,    11,    12,    -1,
-      -1,    15,    -1,    -1,    -1,    -1,    20,    -1,    -1,    23,
-      -1,    25,    26,    27,    28,    29,    30,    -1,    32,    -1,
-      -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,
-      44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,
-      -1,    -1,    56,    57,    -1,    59,    60,    61,    -1,    63,
-      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
-      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    -1,    87,    88,    -1,    90,    91,    92,    93,
-      94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,
-      -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,
-      -1,   115,    -1,    -1,    -1,    -1,   120,   121,    -1,    -1,
-      -1,    -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,
-      -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,   143,
-      -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,
-     154,   155,    -1,   157,   158,   159,    -1,    -1,   162,   163,
-      -1,   165,   166,   167,   168,   169,   170,    -1,    -1,   173,
-     174,   175,   176,   177,    -1,    -1,   180,   181,    -1,   183,
-     184,   185,   186,   187,    -1,    -1,   190,   191,    -1,    -1,
-      -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,
-     204,   205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,
-      -1,   215,   216,    -1,   218,    -1,    -1,   221,   222,    -1,
-      -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,   233,
-     234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,
-     244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,
-      -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,
-      -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,
-      -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,
-     284,    -1,   286,   287,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   295,    -1,   297,   298,   299,   300,   301,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
-      -1,   315,   316,   317,    -1,   319,   320,   321,   322,    -1,
-     324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,
-     334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,
-      -1,   345,   346,   347,   348,   349,   350,   351,   352,   353,
-      -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,   363,
-     364,    -1,    -1,    -1,   368,   369,    -1,    -1,    -1,   373,
-      -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,   383,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,
-     394,   395,    -1,   397,    -1,   399,    -1,   401,   402,   403,
-     404,   405,   406,   407,   408,   409,   410,    -1,   412,    -1,
-     414,   415,   416,    -1,   418,    -1,   420,   421,   422,   423,
-     424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,
-      -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,   443,
-     444,   445,   446,    -1,   448,   449,    -1,   451,   452,   453,
-      -1,    -1,   456,   457,   458,   459,   460,   461,   462,   463,
-      -1,   465,    -1,   467,   468,    -1,   470,   471,   472,    -1,
-     474,    -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,
-     484,   485,   486,   487,   488,    -1,   490,   491,    -1,    -1,
-      -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,
-      -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,   513,
-     514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,
-     524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,
-      -1,   535,    -1,   537,   538,   539,   540,   541,   542,    -1,
-      -1,   545,   546,    -1,    -1,   549,   550,   551,   552,   553,
-     554,    -1,    -1,   557,   558,   559,   560,    -1,   562,   563,
-      -1,    -1,   566,   567,   568,   569,    -1,    -1,   572,   573,
-      -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,
-     584,   585,    -1,    -1,    -1,   589,   590,   591,    -1,    -1,
-     594,   595,    -1,   597,   598,    -1,   600,   601,    -1,    -1,
-     604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,
-      -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,
-      -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,
-      -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,
-     644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,
-     654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,   673,
-      -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,
-      -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,
-      -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,   703,
-     704,   705,   706,   707,    -1,   709,   710,   711,   712,   713,
-     714,   715,   716,   717,   718,    -1,   720,   721,   722,   723,
-     724,   725,   726,   727,   728,   729,   730,   731,   732,   733,
-     734,   735,   736,   737,   738,   739,   740,   741,   742,   743,
-      -1,   745,   746,   747,   748,   749,   750,   751,    -1,   753,
-     754,   755,   756,   757,   758,   759,   760,   761,   762,   763,
-     764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
-     774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
-     784,    -1,    -1,    -1,    -1,    -1,     5,     6,   792,     8,
-       9,    10,    11,    12,    13,    14,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      99,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,
-     129,   130,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,   144,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,   210,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,   235,    -1,   237,    -1,
-      -1,    -1,   241,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,   274,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,   285,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,    -1,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,   440,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,   492,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,   505,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,   571,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,   586,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,   608,
-     609,   610,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,    -1,    -1,
-     709,   710,   711,    -1,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    13,    14,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      99,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,
-     129,   130,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,   144,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,   210,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,   235,    -1,   237,    -1,
-      -1,    -1,   241,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,   274,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,   285,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,    -1,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,   440,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,   492,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,   505,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,   571,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,   586,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,   608,
-     609,   610,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,    -1,    -1,
-     709,   710,   711,    -1,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    -1,    14,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      99,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,
-     129,   130,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,   144,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,   210,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,   235,    -1,   237,    -1,
-      -1,    -1,   241,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,   274,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,   285,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,    -1,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,    -1,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,   440,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,   492,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,   505,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,   571,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,   586,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,   608,
-     609,   610,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,    -1,    -1,
-     709,   710,   711,    -1,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,   122,    -1,    -1,    -1,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,   188,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-     219,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,   290,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,   365,   366,    -1,   368,
-     369,    -1,    -1,   372,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,   520,   521,   522,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,    -1,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,   593,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    18,
-      19,    20,    21,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,   386,    -1,    -1,
-     389,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,   571,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,   647,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    35,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,   125,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,   160,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,   274,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,   501,   502,    -1,    -1,    -1,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,   571,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      89,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-     199,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,   235,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,   263,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,   518,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,    -1,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    35,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,   125,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,   274,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,   571,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,   290,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,    -1,   372,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,   396,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,    -1,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,   593,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    35,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,   125,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,   274,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,   571,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,   104,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,   274,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,   571,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,   104,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,   274,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,   571,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    13,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,   274,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,   571,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    37,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-     219,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,   571,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    35,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,   274,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,   571,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,   274,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,   371,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,   571,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    35,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,   274,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,   571,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,   274,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,   371,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,   571,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,   274,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,   571,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    95,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,   172,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,    -1,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,   521,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,    -1,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,    -1,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-     659,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    -1,    -1,    15,    -1,    17,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,    -1,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,   571,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,   197,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,    -1,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,   125,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,    -1,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,   125,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,    -1,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
+     711,   712,   713,   714,   715,   716,   717,   718,   719,   720,
+     243,   244,     0,   245,   246,   247,   248,   249,     0,     0,
+     250,     0,     0,     0,     0,   251,     0,  2173,   252,     0,
+     253,   254,   255,   256,   257,   258,     0,   259,     0,     0,
+       0,   260,     0,     0,     0,   261,     0,     0,   262,   263,
+     264,     0,   265,     0,   266,   267,     0,     0,   268,     0,
+       0,   269,   270,     0,   271,   272,   273,     0,   274,     0,
+     275,   276,   277,   278,   279,   280,     0,   281,   282,     0,
+     283,   284,   285,   286,   287,   288,   289,   290,   291,   292,
+     293,     0,   294,   295,     0,   296,   297,   298,   299,   300,
+       0,     0,     0,   301,     0,     0,     0,     0,   302,     0,
+       0,   303,     0,     0,     0,   304,   305,   306,     0,     0,
+     307,     0,     0,     0,     0,   308,   309,     0,     0,     0,
+       0,   310,   311,     0,   312,     0,     0,     0,     0,     0,
+     313,   314,   315,   316,   317,     0,     0,     0,   318,     0,
+       0,   319,   320,   321,     0,     0,     0,   322,     0,   323,
+     324,     0,   325,   326,   327,     0,     0,   328,   329,     0,
+     330,   331,   332,   333,   334,   335,     0,     0,   336,   337,
+     338,   339,   340,     0,     0,   341,   342,     0,   343,   344,
+     345,   346,   347,     0,     0,   348,   349,     0,     0,     0,
+     350,   351,     0,   352,     0,     0,     0,   353,     0,   354,
+     355,   356,   357,     0,   358,     0,   359,     0,     0,     0,
+     360,   361,     0,   362,     0,     0,   363,   364,     0,     0,
+       0,   365,   366,   367,   368,     0,     0,   369,   370,   371,
+       0,     0,   372,     0,     0,     0,     0,   373,   374,   375,
+       0,     0,     0,   376,     0,     0,     0,   377,   378,     0,
+     379,   380,     0,     0,     0,   381,     0,   382,     0,     0,
+     383,   384,     0,     0,   385,     0,     0,   386,   387,     0,
+       0,     0,     0,     0,   388,   389,     0,   390,     0,   391,
+       0,   392,   393,     0,     0,     0,     0,     0,     0,     0,
+     394,     0,   395,   396,   397,   398,   399,   400,   401,   402,
+     403,   404,   405,   406,   407,   408,   409,   410,   411,     0,
+     412,   413,   414,     0,   415,   416,   417,   418,     0,   419,
+     420,     0,     0,     0,     0,   421,   422,   423,   424,   425,
+     426,     0,     0,   427,   428,     0,   429,     0,   430,     0,
+     431,   432,   433,   434,   435,   436,   437,   438,   439,     0,
+       0,   440,   441,     0,     0,   442,   443,   444,   445,   446,
+       0,     0,     0,   447,   448,     0,     0,     0,   449,     0,
+     450,   451,     0,   452,   453,   454,     0,     0,   455,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   456,   457,
+     458,     0,   459,     0,   460,     0,   461,   462,   463,   464,
+     465,   466,   467,   468,   469,   470,     0,   471,     0,   472,
+     473,   474,     0,   475,     0,   476,   477,   478,   479,   480,
+       0,   481,   482,   483,     0,     0,   484,     0,     0,     0,
+     485,   486,     0,   487,   488,     0,     0,   489,   490,   491,
+     492,   493,     0,   494,   495,     0,   496,   497,   498,     0,
+       0,   499,   500,   501,   502,   503,   504,   505,   506,     0,
+     507,     0,   508,   509,     0,   510,   511,   512,     0,   513,
+       0,     0,   514,   515,   516,   517,     0,   518,     0,   519,
+     520,   521,   522,   523,     0,   524,   525,     0,     0,     0,
+     526,   527,   528,   529,     0,     0,     0,   530,     0,     0,
+       0,   531,     0,   532,   533,   534,   535,     0,   536,   537,
+     538,   539,   540,     0,     0,     0,     0,     0,   541,   542,
+     543,     0,   544,     0,     0,   545,     0,     0,   546,     0,
+     547,     0,   548,   549,   550,   551,   552,   553,     0,     0,
+     554,   555,     0,     0,   556,   557,   558,   559,   560,   561,
+       0,     0,   562,   563,   564,   565,     0,   566,   567,     0,
+       0,   568,   569,   570,   571,     0,     0,   572,   573,     0,
+     574,   575,   576,   577,     0,     0,     0,     0,     0,   578,
+     579,     0,     0,     0,   580,   581,   582,     0,     0,   583,
+     584,     0,   585,   586,     0,   587,   588,     0,     0,   589,
+       0,     0,   590,     0,   591,     0,   592,   593,     0,     0,
+       0,     0,     0,   594,     0,   595,     0,     0,   596,     0,
+       0,     0,   597,     0,   598,   599,   600,   601,     0,     0,
+       0,     0,     0,     0,   602,   603,   604,     0,   605,   606,
+     607,   608,     0,     0,   609,     0,     0,   610,   611,   612,
+     613,   614,     0,   615,     0,     0,     0,     0,     0,     0,
+       0,     0,   616,   617,   618,     0,   619,   620,   621,     0,
+     622,     0,     0,   623,     0,   624,     0,     0,     0,     0,
+       0,     0,   625,   626,     0,     0,   627,     0,   628,     0,
+     629,   630,     0,     0,     0,   631,   632,   633,   634,   635,
+     636,   637,   638,     0,   639,   640,   641,   642,   643,   644,
+     645,   646,   647,   648,     0,   649,   650,   651,   652,   653,
+     654,   655,   656,   657,   658,   659,   660,   661,   662,   663,
+     664,   665,   666,   667,   668,   669,   670,   671,   672,     0,
+     673,   674,   675,   676,   677,   678,   679,     0,   680,   681,
+     682,   683,   684,   685,   686,   687,   688,   689,   690,   691,
+     692,   693,   694,   695,   696,   697,   698,   699,   700,   701,
+     702,   703,   704,   705,   706,   707,   708,   709,   710,   711,
+     712,   713,   714,   715,   716,   717,   718,   719,   720,   243,
+     244,     0,   245,   246,   247,   248,   249,     0,     0,   250,
+       0,     0,     0,     0,   251,     0,  5491,   252,     0,   253,
+     254,   255,   256,   257,   258,     0,   259,     0,     0,     0,
+     260,     0,     0,     0,   261,     0,     0,   262,   263,   264,
+       0,   265,     0,   266,   267,     0,     0,   268,     0,     0,
+     269,   270,     0,   271,   272,   273,     0,   274,     0,   275,
+     276,   277,   278,   279,   280,     0,   281,   282,     0,   283,
+     284,   285,   286,   287,   288,   289,   290,   291,   292,   293,
+       0,   294,   295,     0,   296,   297,   298,   299,   300,     0,
+       0,     0,   301,     0,     0,     0,     0,   302,     0,     0,
+     303,     0,     0,     0,   304,   305,   306,     0,     0,   307,
+       0,     0,     0,     0,   308,   309,     0,     0,     0,     0,
+     310,   311,     0,   312,     0,     0,     0,     0,     0,   313,
+     314,   315,   316,   317,     0,     0,     0,   318,     0,     0,
+     319,   320,   321,     0,     0,     0,   322,     0,   323,   324,
+       0,   325,   326,   327,     0,     0,   328,   329,     0,   330,
+     331,   332,   333,   334,   335,     0,     0,   336,   337,   338,
+     339,   340,     0,     0,   341,   342,     0,   343,   344,   345,
+     346,   347,     0,     0,   348,   349,     0,     0,     0,   350,
+     351,     0,   352,     0,     0,     0,   353,     0,   354,   355,
+     356,   357,     0,   358,     0,   359,     0,     0,     0,   360,
+     361,     0,   362,     0,     0,   363,   364,     0,     0,     0,
+     365,   366,   367,   368,     0,     0,   369,   370,   371,     0,
+       0,   372,     0,     0,     0,     0,   373,   374,   375,     0,
+       0,     0,   376,     0,     0,     0,   377,   378,     0,   379,
+     380,     0,     0,     0,   381,     0,   382,     0,     0,   383,
+     384,     0,     0,   385,     0,     0,   386,   387,     0,     0,
+       0,     0,     0,   388,   389,     0,   390,     0,   391,     0,
+     392,   393,     0,     0,     0,     0,     0,     0,     0,   394,
+       0,   395,   396,   397,   398,   399,   400,   401,   402,   403,
+     404,   405,   406,   407,   408,   409,   410,   411,     0,   412,
+     413,   414,     0,   415,   416,   417,   418,     0,   419,   420,
+       0,     0,     0,     0,   421,   422,   423,   424,   425,   426,
+       0,     0,   427,   428,     0,   429,     0,   430,     0,   431,
+     432,   433,   434,   435,   436,   437,   438,   439,     0,     0,
+     440,   441,     0,     0,   442,   443,   444,   445,   446,     0,
+       0,     0,   447,   448,     0,     0,     0,   449,     0,   450,
+     451,     0,   452,   453,   454,     0,     0,   455,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   456,   457,   458,
+       0,   459,     0,   460,     0,   461,   462,   463,   464,   465,
+     466,   467,   468,   469,   470,     0,   471,     0,   472,   473,
+     474,     0,   475,     0,   476,   477,   478,   479,   480,     0,
+     481,   482,   483,     0,     0,   484,     0,     0,     0,   485,
+     486,     0,   487,   488,     0,     0,   489,   490,   491,   492,
+     493,     0,   494,   495,     0,   496,   497,   498,     0,     0,
+     499,   500,   501,   502,   503,   504,   505,   506,     0,   507,
+       0,   508,   509,     0,   510,   511,   512,     0,   513,     0,
+       0,   514,   515,   516,   517,     0,   518,     0,   519,   520,
+     521,   522,   523,     0,   524,   525,    42,     0,     0,   526,
+     527,   528,   529,     0,     0,     0,   530,     0,     0,     0,
+     531,     0,   532,   533,   534,   535,     0,   536,   537,   538,
+     539,   540,     0,     0,     0,     0,     0,   541,   542,   543,
+       0,   544,     0,     0,   545,     0,     0,   546,     0,   547,
+       0,   548,   549,   550,   551,   552,   553,     0,     0,   554,
+     555,     0,     0,   556,   557,   558,   559,   560,   561,     0,
+       0,   562,   563,   564,   565,     0,   566,   567,     0,    49,
+     568,   569,   570,   571,     0,     0,   572,   573,     0,   574,
+     575,   576,   577,     0,     0,     0,     0,     0,   578,   579,
+       0,     0,     0,   580,   581,   582,     0,     0,   583,   584,
+       0,   585,   586,     0,   587,   588,     0,     0,   589,     0,
+       0,   590,     0,   591,     0,   592,   593,     0,     0,     0,
+       0,     0,   594,    54,   595,     0,     0,   596,     0,     0,
+       0,   597,     0,   598,   599,   600,   601,     0,     0,     0,
+      55,     0,     0,   602,   603,   604,     0,   605,   606,   607,
+     608,     0,     0,   609,     0,     0,   610,   611,   612,   613,
+     614,     0,   615,     0,     0,     0,     0,     0,     0,     0,
+       0,   616,   617,   618,     0,   619,   620,   621,     0,   622,
+       0,     0,   623,     0,   624,     0,     0,     0,     0,     0,
+       0,   625,   626,     0,     0,   627,     0,   628,     0,   629,
+     630,     0,     0,     0,   631,   632,   633,   634,   635,   636,
+     637,   638,     0,   639,   640,   641,   642,   643,   644,   645,
+     646,   647,   648,     0,   649,   650,   651,   652,   653,   654,
+     655,   656,   657,   658,   659,   660,   661,   662,   663,   664,
+     665,   666,   667,   668,   669,   670,   671,   672,     0,   673,
+     674,   675,   676,   677,   678,   679,     0,   680,   681,   682,
+     683,   684,   685,   686,   687,   688,   689,   690,   691,   692,
+     693,   694,   695,   696,   697,   698,   699,   700,   701,   702,
+     703,   704,   705,   706,   707,   708,   709,   710,   711,   712,
+     713,   714,   715,   716,   717,   718,   719,   720,   243,   244,
+       0,   245,   246,   247,   248,   249,     0,     0,   250,     0,
+       0,  1127,  4172,   251,     0,     0,   252,     0,   253,   254,
+     255,   256,   257,   258,     0,   259,     0,     0,     0,   260,
+       0,     0,     0,   261,     0,     0,   262,   263,   264,     0,
+     265,     0,   266,   267,     0,     0,   268,     0,     0,   269,
+     270,     0,   271,   272,   273,     0,   274,     0,   275,   276,
+     277,   278,   279,   280,     0,   281,   282,     0,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,     0,
+     294,   295,     0,   296,   297,   298,   299,   300,     0,     0,
+       0,   301,     0,     0,     0,     0,   302,     0,     0,   303,
+       0,     0,     0,   304,   305,   306,     0,     0,   307,     0,
+       0,     0,     0,   308,   309,     0,     0,     0,     0,   310,
+     311,     0,   312,     0,     0,     0,     0,     0,   313,   314,
+     315,   316,   317,     0,     0,     0,   318,     0,     0,   319,
+     320,   321,     0,     0,     0,   322,     0,   323,   324,     0,
+     325,   326,   327,     0,     0,   328,   329,     0,   330,   331,
+     332,   333,   334,   335,     0,     0,   336,   337,   338,   339,
+     340,     0,     0,   341,   342,     0,   343,   344,   345,   346,
+     347,     0,     0,   348,   349,     0,     0,     0,   350,   351,
+       0,   352,     0,     0,     0,   353,     0,   354,   355,   356,
+     357,     0,   358,     0,   359,     0,     0,     0,   360,   361,
+       0,   362,     0,     0,   363,   364,     0,     0,     0,   365,
+     366,   367,   368,     0,     0,   369,   370,   371,     0,     0,
+     372,     0,     0,     0,     0,   373,   374,   375,     0,     0,
+       0,   376,     0,     0,     0,   377,   378,     0,   379,   380,
+       0,     0,     0,   381,     0,   382,     0,     0,   383,   384,
+       0,     0,   385,     0,     0,   386,   387,     0,     0,     0,
+       0,     0,   388,   389,     0,   390,     0,   391,     0,   392,
+     393,     0,     0,     0,     0,     0,     0,     0,   394,     0,
+     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
+     405,   406,   407,   408,   409,   410,   411,     0,   412,   413,
+     414,     0,   415,   416,   417,   418,     0,   419,   420,     0,
+       0,     0,     0,   421,   422,   423,   424,   425,   426,     0,
+       0,   427,   428,     0,   429,     0,   430,     0,   431,   432,
+     433,   434,   435,   436,   437,   438,   439,     0,     0,   440,
+     441,     0,     0,   442,   443,   444,   445,   446,     0,     0,
+       0,   447,   448,     0,     0,     0,   449,     0,   450,   451,
+       0,   452,   453,   454,     0,     0,   455,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   456,   457,   458,     0,
+     459,     0,   460,     0,   461,   462,   463,   464,   465,   466,
+     467,   468,   469,   470,     0,   471,     0,   472,   473,   474,
+       0,   475,     0,   476,   477,   478,   479,   480,     0,   481,
+     482,   483,     0,     0,   484,     0,     0,     0,   485,   486,
+       0,   487,   488,     0,     0,   489,   490,   491,   492,   493,
+       0,   494,   495,     0,   496,   497,   498,     0,     0,   499,
+     500,   501,   502,   503,   504,   505,   506,     0,   507,     0,
+     508,   509,     0,   510,   511,   512,     0,   513,     0,     0,
+     514,   515,   516,   517,     0,   518,     0,   519,   520,   521,
+     522,   523,     0,   524,   525,     0,     0,     0,   526,   527,
+     528,   529,     0,     0,     0,   530,     0,     0,     0,   531,
+       0,   532,   533,   534,   535,     0,   536,   537,   538,   539,
+     540,     0,     0,     0,     0,     0,   541,   542,   543,     0,
+     544,     0,     0,   545,     0,     0,   546,     0,   547,     0,
+     548,   549,   550,   551,   552,   553,     0,     0,   554,   555,
+       0,     0,   556,   557,   558,   559,   560,   561,     0,     0,
+     562,   563,   564,   565,     0,   566,   567,     0,     0,   568,
+     569,   570,   571,     0,     0,   572,   573,     0,   574,   575,
+     576,   577,     0,     0,     0,     0,     0,   578,   579,     0,
+       0,     0,   580,   581,   582,     0,     0,   583,   584,     0,
+     585,   586,     0,   587,   588,     0,     0,   589,     0,     0,
+     590,     0,   591,     0,   592,   593,     0,     0,     0,     0,
+       0,   594,     0,   595,     0,     0,   596,     0,     0,     0,
+     597,     0,   598,   599,   600,   601,     0,     0,     0,     0,
+       0,     0,   602,   603,   604,     0,   605,   606,   607,   608,
+       0,     0,   609,     0,     0,   610,   611,   612,   613,   614,
+       0,   615,     0,     0,     0,     0,     0,     0,     0,     0,
+     616,   617,   618,     0,   619,   620,   621,     0,   622,     0,
+       0,   623,     0,   624,     0,     0,     0,     0,     0,     0,
+     625,   626,     0,     0,   627,     0,   628,     0,   629,   630,
+       0,     0,     0,   631,   632,   633,   634,   635,   636,   637,
+     638,     0,   639,   640,   641,   642,   643,   644,   645,   646,
+     647,   648,     0,   649,   650,   651,   652,   653,   654,   655,
+     656,   657,   658,   659,   660,   661,   662,   663,   664,   665,
+     666,   667,   668,   669,   670,   671,   672,     0,   673,   674,
+     675,   676,   677,   678,   679,     0,   680,   681,   682,   683,
+     684,   685,   686,   687,   688,   689,   690,   691,   692,   693,
+     694,   695,   696,   697,   698,   699,   700,   701,   702,   703,
+     704,   705,   706,   707,   708,   709,   710,   711,   712,   713,
+     714,   715,   716,   717,   718,   719,   720,   243,   244,     0,
+     245,   246,   247,   248,   249,     0,     0,   250,     0,     0,
+       0,  4409,   251,     0,     0,   252,     0,   253,   254,   255,
+     256,   257,   258,     0,   259,     0,     0,     0,   260,     0,
+       0,     0,   261,     0,     0,   262,   263,   264,     0,   265,
+       0,   266,   267,     0,     0,   268,     0,     0,   269,   270,
+       0,   271,   272,   273,     0,   274,     0,   275,   276,   277,
+     278,   279,   280,     0,   281,   282,     0,   283,   284,   285,
+     286,   287,   288,   289,   290,   291,   292,   293,     0,   294,
+     295,     0,   296,   297,   298,   299,   300,     0,     0,     0,
+     301,     0,     0,     0,     0,   302,     0,     0,   303,     0,
+       0,     0,   304,   305,   306,     0,     0,   307,     0,     0,
+       0,     0,   308,   309,     0,     0,     0,     0,   310,   311,
+       0,   312,     0,     0,     0,     0,     0,   313,   314,   315,
+     316,   317,     0,     0,     0,   318,     0,     0,   319,   320,
+     321,     0,     0,     0,   322,     0,   323,   324,     0,   325,
+     326,   327,     0,     0,   328,   329,     0,   330,   331,   332,
+     333,   334,   335,     0,     0,   336,   337,   338,   339,   340,
+       0,     0,   341,   342,     0,   343,   344,   345,   346,   347,
+       0,     0,   348,   349,     0,     0,     0,   350,   351,     0,
+     352,     0,     0,     0,   353,     0,   354,   355,   356,   357,
+       0,   358,     0,   359,     0,     0,     0,   360,   361,     0,
+     362,     0,     0,   363,   364,     0,     0,     0,   365,   366,
+     367,   368,     0,     0,   369,   370,   371,     0,     0,   372,
+       0,     0,     0,     0,   373,   374,   375,     0,     0,     0,
+     376,     0,     0,     0,   377,   378,     0,   379,   380,     0,
+       0,     0,   381,     0,   382,     0,     0,   383,   384,     0,
+       0,   385,     0,     0,   386,   387,     0,     0,     0,     0,
+       0,   388,   389,     0,   390,     0,   391,     0,   392,   393,
+       0,     0,     0,     0,     0,     0,     0,   394,     0,   395,
+     396,   397,   398,   399,   400,   401,   402,   403,   404,   405,
+     406,   407,   408,   409,   410,   411,     0,   412,   413,   414,
+       0,   415,   416,   417,   418,     0,   419,   420,     0,     0,
+       0,     0,   421,   422,   423,   424,   425,   426,     0,     0,
+     427,   428,     0,   429,     0,   430,     0,   431,   432,   433,
+     434,   435,   436,   437,   438,   439,     0,     0,   440,   441,
+       0,     0,   442,   443,   444,   445,   446,     0,     0,     0,
+     447,   448,     0,     0,     0,   449,     0,   450,   451,     0,
+     452,   453,   454,     0,     0,   455,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   456,   457,   458,     0,   459,
+       0,   460,     0,   461,   462,   463,   464,   465,   466,   467,
+     468,   469,   470,     0,   471,     0,   472,   473,   474,     0,
+     475,     0,   476,   477,   478,   479,   480,     0,   481,   482,
+     483,     0,     0,   484,     0,     0,     0,   485,   486,     0,
+     487,   488,     0,     0,   489,   490,   491,   492,   493,     0,
+     494,   495,     0,   496,   497,   498,     0,     0,   499,   500,
+     501,   502,   503,   504,   505,   506,     0,   507,     0,   508,
+     509,     0,   510,   511,   512,     0,   513,     0,     0,   514,
+     515,   516,   517,     0,   518,     0,   519,   520,   521,   522,
+     523,     0,   524,   525,     0,     0,     0,   526,   527,   528,
+     529,     0,     0,     0,   530,     0,     0,     0,   531,     0,
+     532,   533,   534,   535,     0,   536,   537,   538,   539,   540,
+       0,     0,     0,     0,     0,   541,   542,   543,     0,   544,
+       0,     0,   545,     0,     0,   546,     0,   547,     0,   548,
+     549,   550,   551,   552,   553,     0,     0,   554,   555,     0,
+       0,   556,   557,   558,   559,   560,   561,     0,     0,   562,
+     563,   564,   565,     0,   566,   567,     0,     0,   568,   569,
+     570,   571,     0,     0,   572,   573,     0,   574,   575,   576,
+     577,     0,     0,     0,     0,     0,   578,   579,     0,     0,
+       0,   580,   581,   582,     0,     0,   583,   584,     0,   585,
+     586,     0,   587,   588,     0,     0,   589,     0,     0,   590,
+       0,   591,     0,   592,   593,     0,     0,     0,     0,     0,
+     594,     0,   595,     0,     0,   596,     0,     0,     0,   597,
+       0,   598,   599,   600,   601,     0,     0,     0,     0,     0,
+       0,   602,   603,   604,     0,   605,   606,   607,   608,     0,
+       0,   609,     0,     0,   610,   611,   612,   613,   614,     0,
+     615,     0,     0,     0,     0,     0,     0,     0,     0,   616,
+     617,   618,     0,   619,   620,   621,     0,   622,     0,     0,
+     623,     0,   624,     0,     0,     0,     0,     0,     0,   625,
+     626,     0,     0,   627,     0,   628,     0,   629,   630,     0,
+       0,     0,   631,   632,   633,   634,   635,   636,   637,   638,
+       0,   639,   640,   641,   642,   643,   644,   645,   646,   647,
+     648,     0,   649,   650,   651,   652,   653,   654,   655,   656,
+     657,   658,   659,   660,   661,   662,   663,   664,   665,   666,
+     667,   668,   669,   670,   671,   672,     0,   673,   674,   675,
+     676,   677,   678,   679,     0,   680,   681,   682,   683,   684,
+     685,   686,   687,   688,   689,   690,   691,   692,   693,   694,
+     695,   696,   697,   698,   699,   700,   701,   702,   703,   704,
+     705,   706,   707,   708,   709,   710,   711,   712,   713,   714,
+     715,   716,   717,   718,   719,   720,   243,   244,     0,   245,
+     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
+    4413,   251,     0,     0,   252,     0,   253,   254,   255,   256,
+     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
+       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
+     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
+     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
+     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
+     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
+    2483,   296,   297,   298,   299,   300,     0,     0,     0,   301,
+       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
+       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
+       0,   308,   309,     0,     0,     0,     0,   310,   311,     0,
+     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
+     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
+       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
+     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
+     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
+       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
+       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
+    2484,     0,     0,   353,     0,   354,   355,   356,   357,     0,
+     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
+       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
+     368,     0,     0,   369,   370,   371,  1866,     0,   372,     0,
+       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
+       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
+       0,   381,     0,   382,  1867,     0,   383,   384,     0,     0,
+     385,     0,     0,   386,   387,     0,  4009,     0,     0,     0,
+     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
+       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
+     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
+     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
+     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
+       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
+     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
+     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
+       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
+     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
+     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
+     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
+     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
+       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
+       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
+     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
+     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
+     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
+       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
+     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
+       0,   524,   525,    42,     0,     0,   526,   527,   528,   529,
+       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
+     533,   534,   535,     0,   536,   537,   538,   539,   540,  2486,
+       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
+       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
+     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
+     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
+     564,   565,     0,   566,   567,     0,    49,   568,   569,   570,
+     571,     0,     0,   572,   573,     0,   574,   575,   576,   577,
+       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
+     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
+       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
+     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
+      54,   595,     0,     0,   596,     0,     0,     0,   597,     0,
+     598,   599,   600,   601,     0,     0,     0,    55,     0,     0,
+     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
+     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
+       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
+     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
+       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
+       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
+       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
+     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
+       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
+     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
+     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
+     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
+     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
+     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
+     706,   707,   708,   709,   710,   711,   712,   713,   714,   715,
+     716,   717,   718,   719,   720,   243,   244,     0,   245,   246,
+     247,   248,   249,     0,     0,   250,     0,     0,  1127,     0,
+     251,     0,     0,   252,     0,   253,   254,   255,   256,   257,
+     258,     0,   259,     0,     0,     0,   260,     0,     0,     0,
+     261,     0,     0,   262,   263,   264,     0,   265,     0,   266,
+     267,     0,     0,   268,     0,     0,   269,   270,     0,   271,
+     272,   273,     0,   274,     0,   275,   276,   277,   278,   279,
+     280,     0,   281,   282,     0,   283,   284,   285,   286,   287,
+     288,   289,   290,   291,   292,   293,     0,   294,   295,     0,
+     296,   297,   298,   299,   300,     0,     0,     0,   301,     0,
+       0,     0,     0,   302,     0,     0,   303,     0,     0,     0,
+     304,   305,   306,     0,     0,   307,     0,     0,     0,     0,
+     308,   309,     0,     0,     0,     0,   310,   311,     0,   312,
+       0,     0,     0,     0,     0,   313,   314,   315,   316,   317,
+       0,     0,     0,   318,     0,     0,   319,   320,   321,     0,
+       0,     0,   322,     0,   323,   324,     0,   325,   326,   327,
+       0,     0,   328,   329,     0,   330,   331,   332,   333,   334,
+     335,     0,     0,   336,   337,   338,   339,   340,     0,     0,
+     341,   342,     0,   343,   344,   345,   346,   347,     0,     0,
+     348,   349,     0,     0,     0,   350,   351,     0,   352,     0,
+       0,     0,   353,     0,   354,   355,   356,   357,     0,   358,
+       0,   359,     0,     0,     0,   360,   361,     0,   362,     0,
+       0,   363,   364,     0,     0,     0,   365,   366,   367,   368,
+       0,     0,   369,   370,   371,     0,     0,   372,     0,     0,
+       0,     0,   373,   374,   375,     0,     0,     0,   376,     0,
+       0,     0,   377,   378,     0,   379,   380,     0,     0,     0,
+     381,     0,   382,     0,     0,   383,   384,     0,     0,   385,
+       0,     0,   386,   387,     0,     0,     0,     0,     0,   388,
+     389,     0,   390,     0,   391,     0,   392,   393,     0,     0,
+       0,     0,     0,     0,     0,   394,     0,   395,   396,   397,
+     398,   399,   400,   401,   402,   403,   404,   405,   406,   407,
+     408,   409,   410,   411,     0,   412,   413,   414,     0,   415,
+     416,   417,   418,     0,   419,   420,     0,     0,     0,     0,
+     421,   422,   423,   424,   425,   426,     0,     0,   427,   428,
+       0,   429,     0,   430,     0,   431,   432,   433,   434,   435,
+     436,   437,   438,   439,     0,     0,   440,   441,     0,     0,
+     442,   443,   444,   445,   446,     0,     0,     0,   447,   448,
+       0,     0,     0,   449,     0,   450,   451,     0,   452,   453,
+     454,     0,     0,   455,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   456,   457,   458,     0,   459,     0,   460,
+       0,   461,   462,   463,   464,   465,   466,   467,   468,   469,
+     470,     0,   471,     0,   472,   473,   474,     0,   475,     0,
+     476,   477,   478,   479,   480,     0,   481,   482,   483,     0,
+       0,   484,     0,     0,     0,   485,   486,     0,   487,   488,
+       0,     0,   489,   490,   491,   492,   493,     0,   494,   495,
+       0,   496,   497,   498,     0,     0,   499,   500,   501,   502,
+     503,   504,   505,   506,     0,   507,     0,   508,   509,     0,
+     510,   511,   512,     0,   513,     0,     0,   514,   515,   516,
+     517,     0,   518,     0,   519,   520,   521,   522,   523,     0,
+     524,   525,     0,     0,     0,   526,   527,   528,   529,     0,
+       0,     0,   530,     0,     0,     0,   531,     0,   532,   533,
+     534,   535,     0,   536,   537,   538,   539,   540,     0,     0,
+       0,     0,     0,   541,   542,   543,     0,   544,     0,     0,
+     545,     0,     0,   546,     0,   547,     0,   548,   549,   550,
+     551,   552,   553,     0,     0,   554,   555,     0,     0,   556,
+     557,   558,   559,   560,   561,     0,     0,   562,   563,   564,
+     565,     0,   566,   567,     0,     0,   568,   569,   570,   571,
+       0,     0,   572,   573,     0,   574,   575,   576,   577,     0,
+       0,     0,     0,     0,   578,   579,     0,     0,     0,   580,
+     581,   582,     0,     0,   583,   584,     0,   585,   586,     0,
+     587,   588,     0,     0,   589,     0,     0,   590,     0,   591,
+       0,   592,   593,     0,     0,     0,     0,     0,   594,     0,
+     595,     0,     0,   596,     0,     0,     0,   597,     0,   598,
+     599,   600,   601,     0,     0,     0,     0,     0,     0,   602,
+     603,   604,     0,   605,   606,   607,   608,     0,     0,   609,
+       0,     0,   610,   611,   612,   613,   614,     0,   615,     0,
+       0,     0,     0,     0,     0,     0,     0,   616,   617,   618,
+       0,   619,   620,   621,     0,   622,     0,     0,   623,     0,
+     624,     0,     0,     0,     0,     0,     0,   625,   626,     0,
+       0,   627,     0,   628,     0,   629,   630,     0,     0,  2983,
+     631,   632,   633,   634,   635,   636,   637,   638,     0,   639,
+     640,   641,   642,   643,   644,   645,   646,   647,   648,  2984,
+     649,   650,   651,   652,   653,   654,   655,   656,   657,   658,
+     659,   660,   661,   662,   663,   664,   665,   666,   667,   668,
+     669,   670,   671,   672,     0,   673,   674,   675,   676,   677,
+     678,   679,     0,   680,   681,   682,   683,   684,   685,   686,
+     687,   688,   689,   690,   691,   692,   693,   694,   695,   696,
+     697,   698,   699,   700,   701,   702,   703,   704,   705,   706,
+     707,   708,   709,   710,   711,   712,   713,   714,   715,   716,
+     717,   718,   719,   720,   243,   244,     0,   245,   246,   247,
+     248,   249,     0,     0,   250,     0,     0,  2985,     0,   251,
+       0,     0,   252,     0,   253,   254,   255,   256,   257,   258,
+       0,   259,     0,     0,     0,   260,     0,     0,     0,   261,
+       0,     0,   262,   263,   264,     0,   265,     0,   266,   267,
+       0,     0,   268,     0,     0,   269,   270,     0,   271,   272,
+     273,     0,   274,     0,   275,   276,   277,   278,   279,   280,
+       0,   281,   282,     0,   283,   284,   285,   286,   287,   288,
+     289,   290,   291,   292,   293,     0,   294,   295,     0,   296,
+     297,   298,   299,   300,     0,     0,     0,   301,     0,     0,
+       0,     0,   302,     0,     0,   303,     0,     0,     0,   304,
+     305,   306,     0,     0,   307,     0,     0,     0,     0,   308,
+     309,     0,     0,     0,     0,   310,   311,     0,   312,     0,
+       0,     0,     0,     0,   313,   314,   315,   316,   317,     0,
+       0,     0,   318,     0,     0,   319,   320,   321,     0,     0,
+       0,   322,     0,   323,   324,     0,   325,   326,   327,     0,
+       0,   328,   329,     0,   330,   331,   332,   333,   334,   335,
+       0,     0,   336,   337,   338,   339,   340,     0,     0,   341,
+     342,     0,   343,   344,   345,   346,   347,     0,     0,   348,
+     349,     0,     0,     0,   350,   351,     0,   352,     0,     0,
+       0,   353,     0,   354,   355,   356,   357,     0,   358,     0,
+     359,     0,     0,     0,   360,   361,     0,   362,     0,     0,
+     363,   364,     0,     0,     0,   365,   366,   367,   368,     0,
+       0,   369,   370,   371,     0,     0,   372,     0,     0,     0,
+       0,   373,   374,   375,     0,     0,     0,   376,     0,     0,
+       0,   377,   378,     0,   379,   380,     0,     0,     0,   381,
+       0,   382,     0,     0,   383,   384,     0,     0,   385,     0,
+       0,   386,   387,     0,     0,     0,     0,     0,   388,   389,
+       0,   390,     0,   391,     0,   392,   393,     0,     0,     0,
+       0,     0,     0,     0,   394,     0,   395,   396,   397,   398,
+     399,   400,   401,   402,   403,   404,   405,   406,   407,   408,
+     409,   410,   411,     0,   412,   413,   414,     0,   415,   416,
+     417,   418,     0,   419,   420,     0,     0,     0,     0,   421,
+     422,   423,   424,   425,   426,     0,     0,   427,   428,     0,
+     429,     0,   430,     0,   431,   432,   433,   434,   435,   436,
+     437,   438,   439,     0,     0,   440,   441,     0,     0,   442,
+     443,   444,   445,   446,     0,     0,     0,   447,   448,     0,
+       0,     0,   449,     0,   450,   451,     0,   452,   453,   454,
+       0,     0,   455,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   456,   457,   458,     0,   459,     0,   460,     0,
+     461,   462,   463,   464,   465,   466,   467,   468,   469,   470,
+       0,   471,     0,   472,   473,   474,     0,   475,     0,   476,
+     477,   478,   479,   480,     0,   481,   482,   483,     0,     0,
+     484,     0,     0,     0,   485,   486,     0,   487,   488,     0,
+       0,   489,   490,   491,   492,   493,     0,   494,   495,     0,
+     496,   497,   498,     0,     0,   499,   500,   501,   502,   503,
+     504,   505,   506,     0,   507,     0,   508,   509,     0,   510,
+     511,   512,     0,   513,     0,     0,   514,   515,   516,   517,
+       0,   518,     0,   519,   520,   521,   522,   523,     0,   524,
+     525,     0,     0,     0,   526,   527,   528,   529,     0,     0,
+       0,   530,     0,     0,     0,   531,     0,   532,   533,   534,
+     535,     0,   536,   537,   538,   539,   540,     0,     0,     0,
+       0,     0,   541,   542,   543,     0,   544,     0,     0,   545,
+       0,     0,   546,     0,   547,     0,   548,   549,   550,   551,
+     552,   553,     0,     0,   554,   555,     0,     0,   556,   557,
+     558,   559,   560,   561,     0,     0,   562,   563,   564,   565,
+       0,   566,   567,     0,     0,   568,   569,   570,   571,     0,
+       0,   572,   573,     0,   574,   575,   576,   577,     0,     0,
+       0,     0,     0,   578,   579,     0,     0,     0,   580,   581,
+     582,     0,     0,   583,   584,     0,   585,   586,     0,   587,
+     588,     0,     0,   589,     0,     0,   590,     0,   591,     0,
+     592,   593,     0,     0,     0,     0,     0,   594,     0,   595,
+       0,     0,   596,     0,     0,     0,   597,     0,   598,   599,
+     600,   601,     0,     0,     0,     0,     0,     0,   602,   603,
+     604,     0,   605,   606,   607,   608,     0,     0,   609,     0,
+       0,   610,   611,   612,   613,   614,     0,   615,     0,     0,
+       0,     0,     0,     0,     0,     0,   616,   617,   618,     0,
+     619,   620,   621,     0,   622,     0,     0,   623,     0,   624,
+       0,     0,     0,     0,     0,     0,   625,   626,     0,     0,
+     627,     0,   628,     0,   629,   630,     0,     0,     0,   631,
+     632,   633,   634,   635,   636,   637,   638,     0,   639,   640,
+     641,   642,   643,   644,   645,   646,   647,   648,     0,   649,
+     650,   651,   652,   653,   654,   655,   656,   657,   658,   659,
+     660,   661,   662,   663,   664,   665,   666,   667,   668,   669,
+     670,   671,   672,     0,   673,   674,   675,   676,   677,   678,
+     679,     0,   680,   681,   682,   683,   684,   685,   686,   687,
+     688,   689,   690,   691,   692,   693,   694,   695,   696,   697,
+     698,   699,   700,   701,   702,   703,   704,   705,   706,   707,
+     708,   709,   710,   711,   712,   713,   714,   715,   716,   717,
+     718,   719,   720,   243,   244,     0,   245,   246,   247,   248,
+     249,     0,     0,   250,     0,     0,  1283,     0,   251,     0,
+       0,   252,     0,   253,   254,   255,   256,   257,   258,     0,
+     259,     0,     0,     0,   260,     0,     0,     0,   261,     0,
+       0,   262,   263,   264,     0,   265,     0,   266,   267,     0,
+       0,   268,     0,     0,   269,   270,     0,   271,   272,   273,
+       0,   274,     0,   275,   276,   277,   278,   279,   280,     0,
+     281,   282,     0,   283,   284,   285,   286,   287,   288,   289,
+     290,   291,   292,   293,     0,   294,   295,     0,   296,   297,
+     298,   299,   300,     0,     0,     0,   301,     0,     0,     0,
+       0,   302,     0,     0,   303,     0,     0,     0,   304,   305,
+     306,     0,     0,   307,     0,     0,     0,     0,   308,   309,
+       0,     0,     0,     0,   310,   311,     0,   312,     0,     0,
+       0,     0,     0,   313,   314,   315,   316,   317,     0,     0,
+       0,   318,     0,     0,   319,   320,   321,     0,     0,     0,
+     322,     0,   323,   324,     0,   325,   326,   327,     0,     0,
+     328,   329,     0,   330,   331,   332,   333,   334,   335,     0,
+       0,   336,   337,   338,   339,   340,     0,     0,   341,   342,
+       0,   343,   344,   345,   346,   347,     0,     0,   348,   349,
+       0,     0,     0,   350,   351,     0,   352,     0,     0,     0,
+     353,     0,   354,   355,   356,   357,     0,   358,     0,   359,
+       0,     0,     0,   360,   361,     0,   362,     0,     0,   363,
+     364,     0,     0,     0,   365,   366,   367,   368,     0,     0,
+     369,   370,   371,     0,     0,   372,     0,     0,     0,     0,
+     373,   374,   375,     0,     0,     0,   376,     0,     0,     0,
+     377,   378,     0,   379,   380,     0,     0,     0,   381,     0,
+     382,     0,     0,   383,   384,     0,     0,   385,     0,     0,
+     386,   387,     0,     0,     0,     0,     0,   388,   389,     0,
+     390,     0,   391,     0,   392,   393,     0,     0,     0,     0,
+       0,     0,     0,   394,     0,   395,   396,   397,   398,   399,
+     400,   401,   402,   403,   404,   405,   406,   407,   408,   409,
+     410,   411,     0,   412,   413,   414,     0,   415,   416,   417,
+     418,     0,   419,   420,     0,     0,     0,     0,   421,   422,
+     423,   424,   425,   426,     0,     0,   427,   428,     0,   429,
+       0,   430,     0,   431,   432,   433,   434,   435,   436,   437,
+     438,   439,     0,     0,   440,   441,     0,     0,   442,   443,
+     444,   445,   446,     0,     0,     0,   447,   448,     0,     0,
+       0,   449,     0,   450,   451,     0,   452,   453,   454,     0,
+       0,   455,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   456,   457,   458,     0,   459,     0,   460,     0,   461,
+     462,   463,   464,   465,   466,   467,   468,   469,   470,     0,
+     471,     0,   472,   473,   474,     0,   475,     0,   476,   477,
+     478,   479,   480,     0,   481,   482,   483,     0,     0,   484,
+       0,     0,     0,   485,   486,     0,   487,   488,     0,     0,
+     489,   490,   491,   492,   493,     0,   494,   495,     0,   496,
+     497,   498,     0,     0,   499,   500,   501,   502,   503,   504,
+     505,   506,     0,   507,     0,   508,   509,     0,   510,   511,
+     512,     0,   513,     0,     0,   514,   515,   516,   517,     0,
+     518,     0,   519,   520,   521,   522,   523,     0,   524,   525,
+       0,     0,     0,   526,   527,   528,   529,     0,     0,     0,
+     530,     0,     0,     0,   531,     0,   532,   533,   534,   535,
+       0,   536,   537,   538,   539,   540,     0,     0,     0,     0,
+       0,   541,   542,   543,     0,   544,     0,     0,   545,     0,
+       0,   546,     0,   547,     0,   548,   549,   550,   551,   552,
+     553,     0,     0,   554,   555,     0,     0,   556,   557,   558,
+     559,   560,   561,     0,     0,   562,   563,   564,   565,     0,
+     566,   567,     0,     0,   568,   569,   570,   571,     0,     0,
+     572,   573,     0,   574,   575,   576,   577,     0,     0,     0,
+       0,     0,   578,   579,     0,     0,     0,   580,   581,   582,
+       0,     0,   583,   584,     0,   585,   586,     0,   587,   588,
+       0,     0,   589,     0,     0,   590,     0,   591,     0,   592,
+     593,     0,     0,     0,     0,     0,   594,     0,   595,     0,
+       0,   596,     0,     0,     0,   597,     0,   598,   599,   600,
+     601,     0,     0,     0,     0,     0,     0,   602,   603,   604,
+       0,   605,   606,   607,   608,     0,     0,   609,     0,     0,
+     610,   611,   612,   613,   614,     0,   615,     0,     0,     0,
+       0,     0,     0,     0,     0,   616,   617,   618,     0,   619,
+     620,   621,     0,   622,     0,     0,   623,     0,   624,     0,
+       0,     0,     0,     0,     0,   625,   626,     0,     0,   627,
+       0,   628,     0,   629,   630,     0,     0,     0,   631,   632,
+     633,   634,   635,   636,   637,   638,     0,   639,   640,   641,
+     642,   643,   644,   645,   646,   647,   648,     0,   649,   650,
+     651,   652,   653,   654,   655,   656,   657,   658,   659,   660,
+     661,   662,   663,   664,   665,   666,   667,   668,   669,   670,
+     671,   672,     0,   673,   674,   675,   676,   677,   678,   679,
+       0,   680,   681,   682,   683,   684,   685,   686,   687,   688,
+     689,   690,   691,   692,   693,   694,   695,   696,   697,   698,
+     699,   700,   701,   702,   703,   704,   705,   706,   707,   708,
      709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    13,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,    -1,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
+     719,   720,   243,   244,     0,   245,   246,   247,   248,   249,
+       0,     0,   250,     0,     0,  3205,     0,   251,     0,     0,
+     252,     0,   253,   254,   255,   256,   257,   258,     0,   259,
+       0,     0,     0,   260,     0,     0,     0,   261,     0,     0,
+     262,   263,   264,     0,   265,     0,   266,   267,     0,     0,
+     268,     0,     0,   269,   270,     0,   271,   272,   273,     0,
+     274,     0,   275,   276,   277,   278,   279,   280,     0,   281,
+     282,     0,   283,   284,   285,   286,   287,   288,   289,   290,
+     291,   292,   293,     0,   294,   295,     0,   296,   297,   298,
+     299,   300,     0,     0,     0,   301,     0,     0,     0,     0,
+     302,     0,     0,   303,     0,     0,     0,   304,   305,   306,
+       0,     0,   307,     0,     0,     0,     0,   308,   309,     0,
+       0,     0,     0,   310,   311,     0,   312,     0,     0,     0,
+       0,     0,   313,   314,   315,   316,   317,     0,     0,     0,
+     318,     0,     0,   319,   320,   321,     0,     0,     0,   322,
+       0,   323,   324,     0,   325,   326,   327,     0,     0,   328,
+     329,     0,   330,   331,   332,   333,   334,   335,     0,     0,
+     336,   337,   338,   339,   340,     0,     0,   341,   342,     0,
+     343,   344,   345,   346,   347,     0,     0,   348,   349,     0,
+       0,     0,   350,   351,     0,   352,     0,     0,     0,   353,
+       0,   354,   355,   356,   357,     0,   358,     0,   359,     0,
+       0,     0,   360,   361,     0,   362,     0,     0,   363,   364,
+       0,     0,     0,   365,   366,   367,   368,     0,     0,   369,
+     370,   371,     0,     0,   372,     0,     0,     0,     0,   373,
+     374,   375,     0,     0,     0,   376,     0,     0,     0,   377,
+     378,     0,   379,   380,     0,     0,     0,   381,     0,   382,
+       0,     0,   383,   384,     0,     0,   385,     0,     0,   386,
+     387,     0,     0,     0,     0,     0,   388,   389,     0,   390,
+       0,   391,     0,   392,   393,     0,     0,     0,     0,     0,
+       0,     0,   394,     0,   395,   396,   397,   398,   399,   400,
+     401,   402,   403,   404,   405,   406,   407,   408,   409,   410,
+     411,     0,   412,   413,   414,     0,   415,   416,   417,   418,
+       0,   419,   420,     0,     0,     0,     0,   421,   422,   423,
+     424,   425,   426,     0,     0,   427,   428,     0,   429,     0,
+     430,     0,   431,   432,   433,   434,   435,   436,   437,   438,
+     439,     0,     0,   440,   441,     0,     0,   442,   443,   444,
+     445,   446,     0,     0,     0,   447,   448,     0,     0,     0,
+     449,     0,   450,   451,     0,   452,   453,   454,     0,     0,
+     455,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     456,   457,   458,     0,   459,     0,   460,     0,   461,   462,
+     463,   464,   465,   466,   467,   468,   469,   470,     0,   471,
+       0,   472,   473,   474,     0,   475,     0,   476,   477,   478,
+     479,   480,     0,   481,   482,   483,     0,     0,   484,     0,
+       0,     0,   485,   486,     0,   487,   488,     0,     0,   489,
+     490,   491,   492,   493,     0,   494,   495,     0,   496,   497,
+     498,     0,     0,   499,   500,   501,   502,   503,   504,   505,
+     506,     0,   507,     0,   508,   509,     0,   510,   511,   512,
+       0,   513,     0,     0,   514,   515,   516,   517,     0,   518,
+       0,   519,   520,   521,   522,   523,     0,   524,   525,     0,
+       0,     0,   526,   527,   528,   529,     0,     0,     0,   530,
+       0,     0,     0,   531,     0,   532,   533,   534,   535,     0,
+     536,   537,   538,   539,   540,     0,     0,     0,     0,     0,
+     541,   542,   543,     0,   544,     0,     0,   545,     0,     0,
+     546,     0,   547,     0,   548,   549,   550,   551,   552,   553,
+       0,     0,   554,   555,     0,     0,   556,   557,   558,   559,
+     560,   561,     0,     0,   562,   563,   564,   565,     0,   566,
+     567,     0,     0,   568,   569,   570,   571,     0,     0,   572,
+     573,     0,   574,   575,   576,   577,     0,     0,     0,     0,
+       0,   578,   579,     0,     0,     0,   580,   581,   582,     0,
+       0,   583,   584,     0,   585,   586,     0,   587,   588,     0,
+       0,   589,     0,     0,   590,     0,   591,     0,   592,   593,
+       0,     0,     0,     0,     0,   594,     0,   595,     0,     0,
+     596,     0,     0,     0,   597,     0,   598,   599,   600,   601,
+       0,     0,     0,     0,     0,     0,   602,   603,   604,     0,
+     605,   606,   607,   608,     0,     0,   609,     0,     0,   610,
+     611,   612,   613,   614,     0,   615,     0,     0,     0,     0,
+       0,     0,     0,     0,   616,   617,   618,     0,   619,   620,
+     621,     0,   622,     0,     0,   623,     0,   624,     0,     0,
+       0,     0,     0,     0,   625,   626,     0,     0,   627,     0,
+     628,     0,   629,   630,     0,     0,     0,   631,   632,   633,
+     634,   635,   636,   637,   638,     0,   639,   640,   641,   642,
+     643,   644,   645,   646,   647,   648,     0,   649,   650,   651,
+     652,   653,   654,   655,   656,   657,   658,   659,   660,   661,
+     662,   663,   664,   665,   666,   667,   668,   669,   670,   671,
+     672,     0,   673,   674,   675,   676,   677,   678,   679,     0,
+     680,   681,   682,   683,   684,   685,   686,   687,   688,   689,
+     690,   691,   692,   693,   694,   695,   696,   697,   698,   699,
+     700,   701,   702,   703,   704,   705,   706,   707,   708,   709,
+     710,   711,   712,   713,   714,   715,   716,   717,   718,   719,
+     720,   243,   244,     0,   245,   246,   247,   248,   249,     0,
+       0,   250,     0,     0,  3542,     0,   251,     0,     0,   252,
+       0,   253,   254,   255,   256,   257,   258,     0,   259,     0,
+       0,     0,   260,     0,     0,     0,   261,     0,     0,   262,
+     263,   264,     0,   265,     0,   266,   267,     0,     0,   268,
+       0,     0,   269,   270,     0,   271,   272,   273,     0,   274,
+       0,   275,   276,   277,   278,   279,   280,     0,   281,   282,
+       0,   283,   284,   285,   286,   287,   288,   289,   290,   291,
+     292,   293,     0,   294,   295,     0,   296,   297,   298,   299,
+     300,     0,     0,     0,   301,     0,     0,     0,     0,   302,
+       0,     0,   303,     0,     0,     0,   304,   305,   306,     0,
+       0,   307,     0,     0,     0,     0,   308,   309,     0,     0,
+       0,     0,   310,   311,     0,   312,     0,     0,     0,     0,
+       0,   313,   314,   315,   316,   317,     0,     0,     0,   318,
+       0,     0,   319,   320,   321,     0,     0,     0,   322,     0,
+     323,   324,     0,   325,   326,   327,     0,     0,   328,   329,
+       0,   330,   331,   332,   333,   334,   335,     0,     0,   336,
+     337,   338,   339,   340,     0,     0,   341,   342,     0,   343,
+     344,   345,   346,   347,     0,     0,   348,   349,     0,     0,
+       0,   350,   351,     0,   352,     0,     0,     0,   353,     0,
+     354,   355,   356,   357,     0,   358,     0,   359,     0,     0,
+       0,   360,   361,     0,   362,     0,     0,   363,   364,     0,
+       0,     0,   365,   366,   367,   368,     0,     0,   369,   370,
+     371,     0,     0,   372,     0,     0,     0,     0,   373,   374,
+     375,     0,     0,     0,   376,     0,     0,     0,   377,   378,
+       0,   379,   380,     0,     0,     0,   381,     0,   382,     0,
+       0,   383,   384,     0,     0,   385,     0,     0,   386,   387,
+       0,     0,     0,     0,     0,   388,   389,     0,   390,     0,
+     391,     0,   392,   393,     0,     0,     0,     0,     0,     0,
+       0,   394,     0,   395,   396,   397,   398,   399,   400,   401,
+     402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
+       0,   412,   413,   414,     0,   415,   416,   417,   418,     0,
+     419,   420,     0,     0,     0,     0,   421,   422,   423,   424,
+     425,   426,     0,     0,   427,   428,     0,   429,     0,   430,
+       0,   431,   432,   433,   434,   435,   436,   437,   438,   439,
+       0,     0,   440,   441,     0,     0,   442,   443,   444,   445,
+     446,     0,     0,     0,   447,   448,     0,     0,     0,   449,
+       0,   450,   451,     0,   452,   453,   454,     0,     0,   455,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   456,
+     457,   458,     0,   459,     0,   460,     0,   461,   462,   463,
+     464,   465,   466,   467,   468,   469,   470,     0,   471,     0,
+     472,   473,   474,     0,   475,     0,   476,   477,   478,   479,
+     480,     0,   481,   482,   483,     0,     0,   484,     0,     0,
+       0,   485,   486,     0,   487,   488,     0,     0,   489,   490,
+     491,   492,   493,     0,   494,   495,     0,   496,   497,   498,
+       0,     0,   499,   500,   501,   502,   503,   504,   505,   506,
+       0,   507,     0,   508,   509,     0,   510,   511,   512,     0,
+     513,     0,     0,   514,   515,   516,   517,     0,   518,     0,
+     519,   520,   521,   522,   523,     0,   524,   525,     0,     0,
+       0,   526,   527,   528,   529,     0,     0,     0,   530,     0,
+       0,     0,   531,     0,   532,   533,   534,   535,     0,   536,
+     537,   538,   539,   540,     0,     0,     0,     0,     0,   541,
+     542,   543,     0,   544,     0,     0,   545,     0,     0,   546,
+       0,   547,     0,   548,   549,   550,   551,   552,   553,     0,
+       0,   554,   555,     0,     0,   556,   557,   558,   559,   560,
+     561,     0,     0,   562,   563,   564,   565,     0,   566,   567,
+       0,     0,   568,   569,   570,   571,     0,     0,   572,   573,
+       0,   574,   575,   576,   577,     0,     0,     0,     0,     0,
+     578,   579,     0,     0,     0,   580,   581,   582,     0,     0,
+     583,   584,     0,   585,   586,     0,   587,   588,     0,     0,
+     589,     0,     0,   590,     0,   591,     0,   592,   593,     0,
+       0,     0,     0,     0,   594,     0,   595,     0,     0,   596,
+       0,     0,     0,   597,     0,   598,   599,   600,   601,     0,
+       0,     0,     0,     0,     0,   602,   603,   604,     0,   605,
+     606,   607,   608,     0,     0,   609,     0,     0,   610,   611,
+     612,   613,   614,     0,   615,     0,     0,     0,     0,     0,
+       0,     0,     0,   616,   617,   618,     0,   619,   620,   621,
+       0,   622,     0,     0,   623,     0,   624,     0,     0,     0,
+       0,     0,     0,   625,   626,     0,     0,   627,     0,   628,
+       0,   629,   630,     0,     0,     0,   631,   632,   633,   634,
+     635,   636,   637,   638,     0,   639,   640,   641,   642,   643,
+     644,   645,   646,   647,   648,     0,   649,   650,   651,   652,
+     653,   654,   655,   656,   657,   658,   659,   660,   661,   662,
+     663,   664,   665,   666,   667,   668,   669,   670,   671,   672,
+       0,   673,   674,   675,   676,   677,   678,   679,     0,   680,
+     681,   682,   683,   684,   685,   686,   687,   688,   689,   690,
+     691,   692,   693,   694,   695,   696,   697,   698,   699,   700,
+     701,   702,   703,   704,   705,   706,   707,   708,   709,   710,
+     711,   712,   713,   714,   715,   716,   717,   718,   719,   720,
+     243,   244,     0,   245,   246,   247,   248,   249,     0,     0,
+     250,     0,     0,  4294,     0,   251,     0,     0,   252,     0,
+     253,   254,   255,   256,   257,   258,     0,   259,     0,     0,
+       0,   260,     0,     0,     0,   261,     0,     0,   262,   263,
+     264,     0,   265,     0,   266,   267,     0,     0,   268,     0,
+       0,   269,   270,     0,   271,   272,   273,     0,   274,     0,
+     275,   276,   277,   278,   279,   280,     0,   281,   282,     0,
+     283,   284,   285,   286,   287,   288,   289,   290,   291,   292,
+     293,     0,   294,   295,     0,   296,   297,   298,   299,   300,
+       0,     0,     0,   301,     0,     0,     0,     0,   302,     0,
+       0,   303,     0,     0,     0,   304,   305,   306,     0,     0,
+     307,     0,     0,     0,     0,   308,   309,     0,     0,     0,
+       0,   310,   311,     0,   312,     0,     0,     0,     0,     0,
+     313,   314,   315,   316,   317,     0,     0,     0,   318,     0,
+       0,   319,   320,   321,     0,     0,     0,   322,     0,   323,
+     324,     0,   325,   326,   327,     0,     0,   328,   329,     0,
+     330,   331,   332,   333,   334,   335,     0,     0,   336,   337,
+     338,   339,   340,     0,     0,   341,   342,     0,   343,   344,
+     345,   346,   347,     0,     0,   348,   349,     0,     0,     0,
+     350,   351,     0,   352,     0,     0,     0,   353,     0,   354,
+     355,   356,   357,     0,   358,     0,   359,     0,     0,     0,
+     360,   361,     0,   362,     0,     0,   363,   364,     0,     0,
+       0,   365,   366,   367,   368,     0,     0,   369,   370,   371,
+       0,     0,   372,     0,     0,     0,     0,   373,   374,   375,
+       0,     0,     0,   376,     0,     0,     0,   377,   378,     0,
+     379,   380,     0,     0,     0,   381,     0,   382,     0,     0,
+     383,   384,     0,     0,   385,     0,     0,   386,   387,     0,
+       0,     0,     0,     0,   388,   389,     0,   390,     0,   391,
+       0,   392,   393,     0,     0,     0,     0,     0,     0,     0,
+     394,     0,   395,   396,   397,   398,   399,   400,   401,   402,
+     403,   404,   405,   406,   407,   408,   409,   410,   411,     0,
+     412,   413,   414,     0,   415,   416,   417,   418,     0,   419,
+     420,     0,     0,     0,     0,   421,   422,   423,   424,   425,
+     426,     0,     0,   427,   428,     0,   429,     0,   430,     0,
+     431,   432,   433,   434,   435,   436,   437,   438,   439,     0,
+       0,   440,   441,     0,     0,   442,   443,   444,   445,   446,
+       0,     0,     0,   447,   448,     0,     0,     0,   449,     0,
+     450,   451,     0,   452,   453,   454,     0,     0,   455,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   456,   457,
+     458,     0,   459,     0,   460,     0,   461,   462,   463,   464,
+     465,   466,   467,   468,   469,   470,     0,   471,     0,   472,
+     473,   474,     0,   475,     0,   476,   477,   478,   479,   480,
+       0,   481,   482,   483,     0,     0,   484,     0,     0,     0,
+     485,   486,     0,   487,   488,     0,     0,   489,   490,   491,
+     492,   493,     0,   494,   495,     0,   496,   497,   498,     0,
+       0,   499,   500,   501,   502,   503,   504,   505,   506,     0,
+     507,     0,   508,   509,     0,   510,   511,   512,     0,   513,
+       0,     0,   514,   515,   516,   517,     0,   518,     0,   519,
+     520,   521,   522,   523,     0,   524,   525,     0,     0,     0,
+     526,   527,   528,   529,     0,     0,     0,   530,     0,     0,
+       0,   531,     0,   532,   533,   534,   535,     0,   536,   537,
+     538,   539,   540,     0,     0,     0,     0,     0,   541,   542,
+     543,     0,   544,     0,     0,   545,     0,     0,   546,     0,
+     547,     0,   548,   549,   550,   551,   552,   553,     0,     0,
+     554,   555,     0,     0,   556,   557,   558,   559,   560,   561,
+       0,     0,   562,   563,   564,   565,     0,   566,   567,     0,
+       0,   568,   569,   570,   571,     0,     0,   572,   573,     0,
+     574,   575,   576,   577,     0,     0,     0,     0,     0,   578,
+     579,     0,     0,     0,   580,   581,   582,     0,     0,   583,
+     584,     0,   585,   586,     0,   587,   588,     0,     0,   589,
+       0,     0,   590,     0,   591,     0,   592,   593,     0,     0,
+       0,     0,     0,   594,     0,   595,     0,     0,   596,     0,
+       0,     0,   597,     0,   598,   599,   600,   601,     0,     0,
+       0,     0,     0,     0,   602,   603,   604,     0,   605,   606,
+     607,   608,     0,     0,   609,     0,     0,   610,   611,   612,
+     613,   614,     0,   615,     0,     0,     0,     0,     0,     0,
+       0,     0,   616,   617,   618,     0,   619,   620,   621,     0,
+     622,     0,     0,   623,     0,   624,     0,     0,     0,     0,
+       0,     0,   625,   626,     0,     0,   627,     0,   628,     0,
+     629,   630,     0,     0,     0,   631,   632,   633,   634,   635,
+     636,   637,   638,     0,   639,   640,   641,   642,   643,   644,
+     645,   646,   647,   648,     0,   649,   650,   651,   652,   653,
+     654,   655,   656,   657,   658,   659,   660,   661,   662,   663,
+     664,   665,   666,   667,   668,   669,   670,   671,   672,     0,
+     673,   674,   675,   676,   677,   678,   679,     0,   680,   681,
+     682,   683,   684,   685,   686,   687,   688,   689,   690,   691,
+     692,   693,   694,   695,   696,   697,   698,   699,   700,   701,
+     702,   703,   704,   705,   706,   707,   708,   709,   710,   711,
+     712,   713,   714,   715,   716,   717,   718,   719,   720,     0,
+       0,     0,     0,     0,   243,   244,  2131,   245,   246,   247,
+     248,   249,     0,     0,   250,     0,     0,     0,     0,   251,
+       0,     0,   252,     0,   253,   254,   255,   256,   257,   258,
+       0,   259,     0,     0,     0,   260,     0,     0,     0,   261,
+       0,     0,   262,   263,   264,     0,   265,     0,   266,   267,
+       0,     0,   268,     0,     0,   269,   270,     0,   271,   272,
+     273,     0,   274,     0,   275,   276,   277,   278,   279,   280,
+       0,   281,   282,     0,   283,   284,   285,   286,   287,   288,
+     289,   290,   291,   292,   293,     0,   294,   295,     0,   296,
+     297,   298,   299,   300,     0,     0,     0,   301,     0,     0,
+       0,     0,   302,     0,     0,   303,     0,     0,     0,   304,
+     305,   306,     0,     0,   307,     0,     0,     0,     0,   308,
+     309,     0,     0,     0,     0,   310,   311,     0,   312,     0,
+       0,     0,     0,     0,   313,   314,   315,   316,   317,     0,
+       0,     0,   318,     0,     0,   319,   320,   321,     0,     0,
+       0,   322,     0,   323,   324,     0,   325,   326,   327,     0,
+       0,   328,   329,     0,   330,   331,   332,   333,   334,   335,
+       0,     0,   336,   337,   338,   339,   340,     0,     0,   341,
+     342,     0,   343,   344,   345,   346,   347,     0,     0,   348,
+     349,     0,     0,     0,   350,   351,     0,   352,     0,     0,
+       0,   353,     0,   354,   355,   356,   357,     0,   358,     0,
+     359,     0,     0,     0,   360,   361,     0,   362,     0,     0,
+     363,   364,     0,     0,     0,   365,   366,   367,   368,     0,
+       0,   369,   370,   371,     0,     0,   372,     0,     0,     0,
+       0,   373,   374,   375,     0,     0,     0,   376,     0,     0,
+       0,   377,   378,     0,   379,   380,     0,     0,     0,   381,
+       0,   382,     0,     0,   383,   384,     0,     0,   385,     0,
+       0,   386,   387,     0,     0,     0,     0,     0,   388,   389,
+       0,   390,     0,   391,     0,   392,   393,     0,     0,     0,
+       0,     0,     0,     0,   394,     0,   395,   396,   397,   398,
+     399,   400,   401,   402,   403,   404,   405,   406,   407,   408,
+     409,   410,   411,     0,   412,   413,   414,     0,   415,   416,
+     417,   418,     0,   419,   420,     0,     0,     0,     0,   421,
+     422,   423,   424,   425,   426,     0,     0,   427,   428,     0,
+     429,     0,   430,     0,   431,   432,   433,   434,   435,   436,
+     437,   438,   439,     0,     0,   440,   441,     0,     0,   442,
+     443,   444,   445,   446,     0,     0,     0,   447,   448,     0,
+       0,     0,   449,     0,   450,   451,     0,   452,   453,   454,
+       0,     0,   455,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   456,   457,   458,     0,   459,     0,   460,     0,
+     461,   462,   463,   464,   465,   466,   467,   468,   469,   470,
+       0,   471,     0,   472,   473,   474,     0,   475,     0,   476,
+     477,   478,   479,   480,     0,   481,   482,   483,     0,     0,
+     484,     0,     0,     0,   485,   486,     0,   487,   488,     0,
+       0,   489,   490,   491,   492,   493,     0,   494,   495,     0,
+     496,   497,   498,     0,     0,   499,   500,   501,   502,   503,
+     504,   505,   506,     0,   507,     0,   508,   509,     0,   510,
+     511,   512,     0,   513,     0,     0,   514,   515,   516,   517,
+       0,   518,     0,   519,   520,   521,   522,   523,     0,   524,
+     525,     0,     0,     0,   526,   527,   528,   529,     0,     0,
+       0,   530,     0,     0,     0,   531,     0,   532,   533,   534,
+     535,     0,   536,   537,   538,   539,   540,     0,     0,     0,
+       0,     0,   541,   542,   543,     0,   544,     0,     0,   545,
+       0,     0,   546,     0,   547,     0,   548,   549,   550,   551,
+     552,   553,     0,     0,   554,   555,     0,     0,   556,   557,
+     558,   559,   560,   561,     0,     0,   562,   563,   564,   565,
+       0,   566,   567,     0,     0,   568,   569,   570,   571,     0,
+       0,   572,   573,     0,   574,   575,   576,   577,     0,     0,
+       0,     0,     0,   578,   579,     0,     0,     0,   580,   581,
+     582,     0,     0,   583,   584,     0,   585,   586,     0,   587,
+     588,     0,     0,   589,     0,     0,   590,     0,   591,     0,
+     592,   593,     0,     0,     0,     0,     0,   594,     0,   595,
+       0,     0,   596,     0,     0,     0,   597,     0,   598,   599,
+     600,   601,     0,     0,     0,     0,     0,     0,   602,   603,
+     604,     0,   605,   606,   607,   608,     0,     0,   609,     0,
+       0,   610,   611,   612,   613,   614,     0,   615,     0,     0,
+       0,     0,     0,     0,     0,     0,   616,   617,   618,     0,
+     619,   620,   621,     0,   622,     0,     0,   623,     0,   624,
+       0,     0,     0,     0,     0,     0,   625,   626,     0,     0,
+     627,     0,   628,     0,   629,   630,     0,     0,     0,   631,
+     632,   633,   634,   635,   636,   637,   638,     0,   639,   640,
+     641,   642,   643,   644,   645,   646,   647,   648,     0,   649,
+     650,   651,   652,   653,   654,   655,   656,   657,   658,   659,
+     660,   661,   662,   663,   664,   665,   666,   667,   668,   669,
+     670,   671,   672,     0,   673,   674,   675,   676,   677,   678,
+     679,     0,   680,   681,   682,   683,   684,   685,   686,   687,
+     688,   689,   690,   691,   692,   693,   694,   695,   696,   697,
+     698,   699,   700,   701,   702,   703,   704,   705,   706,   707,
+     708,   709,   710,   711,   712,   713,   714,   715,   716,   717,
+     718,   719,   720,     0,     0,     0,     0,     0,   243,   244,
+    2923,   245,   246,   247,   248,   249,     0,     0,   250,     0,
+       0,     0,     0,   251,     0,     0,   252,     0,   253,   254,
+     255,   256,   257,   258,     0,   259,     0,     0,     0,   260,
+       0,     0,     0,   261,     0,     0,   262,   263,   264,     0,
+     265,     0,   266,   267,     0,     0,   268,     0,     0,   269,
+     270,     0,   271,   272,   273,     0,   274,     0,   275,   276,
+     277,   278,   279,   280,     0,   281,   282,     0,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,     0,
+     294,   295,     0,   296,   297,   298,   299,   300,     0,     0,
+       0,   301,     0,     0,     0,     0,   302,     0,     0,   303,
+       0,     0,     0,   304,   305,   306,     0,     0,   307,     0,
+       0,     0,     0,   308,   309,     0,     0,     0,     0,   310,
+     311,     0,   312,     0,     0,     0,     0,     0,   313,   314,
+     315,   316,   317,     0,     0,     0,   318,     0,     0,   319,
+     320,   321,     0,     0,     0,   322,     0,   323,   324,     0,
+     325,   326,   327,     0,     0,   328,   329,     0,   330,   331,
+     332,   333,   334,   335,     0,     0,   336,   337,   338,   339,
+     340,     0,     0,   341,   342,     0,   343,   344,   345,   346,
+     347,     0,     0,   348,   349,     0,     0,     0,   350,   351,
+       0,   352,     0,     0,     0,   353,     0,   354,   355,   356,
+     357,     0,   358,     0,   359,     0,     0,     0,   360,   361,
+       0,   362,     0,     0,   363,   364,     0,     0,     0,   365,
+     366,   367,   368,     0,     0,   369,   370,   371,     0,     0,
+     372,     0,     0,     0,     0,   373,   374,   375,     0,     0,
+       0,   376,     0,     0,     0,   377,   378,     0,   379,   380,
+       0,     0,     0,   381,     0,   382,     0,     0,   383,   384,
+       0,     0,   385,     0,     0,   386,   387,     0,     0,     0,
+       0,     0,   388,   389,     0,   390,     0,   391,     0,   392,
+     393,     0,     0,     0,     0,     0,     0,     0,   394,     0,
+     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
+     405,   406,   407,   408,   409,   410,   411,     0,   412,   413,
+     414,     0,   415,   416,   417,   418,     0,   419,   420,     0,
+       0,     0,     0,   421,   422,   423,   424,   425,   426,     0,
+       0,   427,   428,     0,   429,     0,   430,     0,   431,   432,
+     433,   434,   435,   436,   437,   438,   439,     0,     0,   440,
+     441,     0,     0,   442,   443,   444,   445,   446,     0,     0,
+       0,   447,   448,     0,     0,     0,   449,     0,   450,   451,
+       0,   452,   453,   454,     0,     0,   455,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   456,   457,   458,     0,
+     459,     0,   460,     0,   461,   462,   463,   464,   465,   466,
+     467,   468,   469,   470,     0,   471,     0,   472,   473,   474,
+       0,   475,     0,   476,   477,   478,   479,   480,     0,   481,
+     482,   483,     0,     0,   484,     0,     0,     0,   485,   486,
+       0,   487,   488,     0,     0,   489,   490,   491,   492,   493,
+       0,   494,   495,     0,   496,   497,   498,     0,     0,   499,
+     500,   501,   502,   503,   504,   505,   506,     0,   507,     0,
+     508,   509,     0,   510,   511,   512,     0,   513,     0,     0,
+     514,   515,   516,   517,     0,   518,     0,   519,   520,   521,
+     522,   523,     0,   524,   525,     0,     0,     0,   526,   527,
+     528,   529,     0,     0,     0,   530,     0,     0,     0,   531,
+       0,   532,   533,   534,   535,     0,   536,   537,   538,   539,
+     540,     0,     0,     0,     0,     0,   541,   542,   543,     0,
+     544,     0,     0,   545,     0,     0,   546,     0,   547,     0,
+     548,   549,   550,   551,   552,   553,     0,     0,   554,   555,
+       0,     0,   556,   557,   558,   559,   560,   561,     0,     0,
+     562,   563,   564,   565,     0,   566,   567,     0,     0,   568,
+     569,   570,   571,     0,     0,   572,   573,     0,   574,   575,
+     576,   577,     0,     0,     0,     0,     0,   578,   579,     0,
+       0,     0,   580,   581,   582,     0,     0,   583,   584,     0,
+     585,   586,     0,   587,   588,     0,     0,   589,     0,     0,
+     590,     0,   591,     0,   592,   593,     0,     0,     0,     0,
+       0,   594,     0,   595,     0,     0,   596,     0,     0,     0,
+     597,     0,   598,   599,   600,   601,     0,     0,     0,     0,
+       0,     0,   602,   603,   604,     0,   605,   606,   607,   608,
+       0,     0,   609,     0,     0,   610,   611,   612,   613,   614,
+       0,   615,     0,     0,     0,     0,     0,     0,     0,     0,
+     616,   617,   618,     0,   619,   620,   621,     0,   622,     0,
+       0,   623,     0,   624,     0,     0,     0,     0,     0,     0,
+     625,   626,     0,     0,   627,     0,   628,     0,   629,   630,
+       0,     0,     0,   631,   632,   633,   634,   635,   636,   637,
+     638,     0,   639,   640,   641,   642,   643,   644,   645,   646,
+     647,   648,     0,   649,   650,   651,   652,   653,   654,   655,
+     656,   657,   658,   659,   660,   661,   662,   663,   664,   665,
+     666,   667,   668,   669,   670,   671,   672,     0,   673,   674,
+     675,   676,   677,   678,   679,     0,   680,   681,   682,   683,
+     684,   685,   686,   687,   688,   689,   690,   691,   692,   693,
+     694,   695,   696,   697,   698,   699,   700,   701,   702,   703,
+     704,   705,   706,   707,   708,   709,   710,   711,   712,   713,
+     714,   715,   716,   717,   718,   719,   720,     0,     0,     0,
+       0,     0,   243,   244,  3575,   245,   246,   247,   248,   249,
+       0,     0,   250,     0,     0,     0,     0,   251,     0,     0,
+     252,     0,   253,   254,   255,   256,   257,   258,     0,   259,
+       0,     0,     0,   260,     0,     0,     0,   261,     0,     0,
+     262,   263,   264,     0,   265,     0,   266,   267,     0,     0,
+     268,     0,     0,   269,   270,     0,   271,   272,   273,     0,
+     274,     0,   275,   276,   277,   278,   279,   280,     0,   281,
+     282,     0,   283,   284,   285,   286,   287,   288,   289,   290,
+     291,   292,   293,     0,   294,   295,     0,   296,   297,   298,
+     299,   300,     0,     0,     0,   301,     0,     0,     0,     0,
+     302,     0,     0,   303,     0,     0,     0,   304,   305,   306,
+       0,     0,   307,     0,     0,     0,     0,   308,   309,     0,
+       0,     0,     0,   310,   311,     0,   312,     0,     0,     0,
+       0,     0,   313,   314,   315,   316,   317,     0,     0,     0,
+     318,     0,     0,   319,   320,   321,     0,     0,     0,   322,
+       0,   323,   324,     0,   325,   326,   327,     0,     0,   328,
+     329,     0,   330,   331,   332,   333,   334,   335,     0,     0,
+     336,   337,   338,   339,   340,     0,     0,   341,   342,     0,
+     343,   344,   345,   346,   347,     0,     0,   348,   349,     0,
+       0,     0,   350,   351,     0,   352,     0,     0,     0,   353,
+       0,   354,   355,   356,   357,     0,   358,     0,   359,     0,
+       0,     0,   360,   361,     0,   362,     0,     0,   363,   364,
+       0,     0,     0,   365,   366,   367,   368,     0,     0,   369,
+     370,   371,     0,     0,   372,     0,     0,     0,     0,   373,
+     374,   375,     0,     0,     0,   376,     0,     0,     0,   377,
+     378,     0,   379,   380,     0,     0,     0,   381,     0,   382,
+       0,     0,   383,   384,     0,     0,   385,     0,     0,   386,
+     387,     0,     0,     0,     0,     0,   388,   389,     0,   390,
+       0,   391,     0,   392,   393,     0,     0,     0,     0,     0,
+       0,     0,   394,     0,   395,   396,   397,   398,   399,   400,
+     401,   402,   403,   404,   405,   406,   407,   408,   409,   410,
+     411,     0,   412,   413,   414,     0,   415,   416,   417,   418,
+       0,   419,   420,     0,     0,     0,     0,   421,   422,   423,
+     424,   425,   426,     0,     0,   427,   428,     0,   429,     0,
+     430,     0,   431,   432,   433,   434,   435,   436,   437,   438,
+     439,     0,     0,   440,   441,     0,     0,   442,   443,   444,
+     445,   446,     0,     0,     0,   447,   448,     0,     0,     0,
+     449,     0,   450,   451,     0,   452,   453,   454,     0,     0,
+     455,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     456,   457,   458,     0,   459,     0,   460,     0,   461,   462,
+     463,   464,   465,   466,   467,   468,   469,   470,     0,   471,
+       0,   472,   473,   474,     0,   475,     0,   476,   477,   478,
+     479,   480,     0,   481,   482,   483,     0,     0,   484,     0,
+       0,     0,   485,   486,     0,   487,   488,     0,     0,   489,
+     490,   491,   492,   493,     0,   494,   495,     0,   496,   497,
+     498,     0,     0,   499,   500,   501,   502,   503,   504,   505,
+     506,     0,   507,     0,   508,   509,     0,   510,   511,   512,
+       0,   513,     0,     0,   514,   515,   516,   517,     0,   518,
+       0,   519,   520,   521,   522,   523,     0,   524,   525,     0,
+       0,     0,   526,   527,   528,   529,     0,     0,     0,   530,
+       0,     0,     0,   531,     0,   532,   533,   534,   535,     0,
+     536,   537,   538,   539,   540,     0,     0,     0,     0,     0,
+     541,   542,   543,     0,   544,     0,     0,   545,     0,     0,
+     546,     0,   547,     0,   548,   549,   550,   551,   552,   553,
+       0,     0,   554,   555,     0,     0,   556,   557,   558,   559,
+     560,   561,     0,     0,   562,   563,   564,   565,     0,   566,
+     567,     0,     0,   568,   569,   570,   571,     0,     0,   572,
+     573,     0,   574,   575,   576,   577,     0,     0,     0,     0,
+       0,   578,   579,     0,     0,     0,   580,   581,   582,     0,
+       0,   583,   584,     0,   585,   586,     0,   587,   588,     0,
+       0,   589,     0,     0,   590,     0,   591,     0,   592,   593,
+       0,     0,     0,     0,     0,   594,     0,   595,     0,     0,
+     596,     0,     0,     0,   597,     0,   598,   599,   600,   601,
+       0,     0,     0,     0,     0,     0,   602,   603,   604,     0,
+     605,   606,   607,   608,     0,     0,   609,     0,     0,   610,
+     611,   612,   613,   614,     0,   615,     0,     0,     0,     0,
+       0,     0,     0,     0,   616,   617,   618,     0,   619,   620,
+     621,     0,   622,     0,     0,   623,     0,   624,     0,     0,
+       0,     0,     0,     0,   625,   626,     0,     0,   627,     0,
+     628,     0,   629,   630,     0,     0,     0,   631,   632,   633,
+     634,   635,   636,   637,   638,     0,   639,   640,   641,   642,
+     643,   644,   645,   646,   647,   648,     0,   649,   650,   651,
+     652,   653,   654,   655,   656,   657,   658,   659,   660,   661,
+     662,   663,   664,   665,   666,   667,   668,   669,   670,   671,
+     672,     0,   673,   674,   675,   676,   677,   678,   679,     0,
+     680,   681,   682,   683,   684,   685,   686,   687,   688,   689,
+     690,   691,   692,   693,   694,   695,   696,   697,   698,   699,
+     700,   701,   702,   703,   704,   705,   706,   707,   708,   709,
+     710,   711,   712,   713,   714,   715,   716,   717,   718,   719,
+     720,     0,     0,     0,     0,     0,   243,   244,  3756,   245,
+     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
+       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
+     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
+       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
+     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
+     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
+     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
+     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
+       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
+       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
+       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
+       0,   308,   309,     0,     0,     0,     0,   310,   311,     0,
+     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
+     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
+       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
+     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
+     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
+       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
+       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
+       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
+     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
+       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
+     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
+       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
+       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
+       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
+     385,     0,     0,   386,   387,     0,     0,     0,     0,     0,
+     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
+       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
+     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
+     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
+     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
+       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
+     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
+     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
+       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
+     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
+     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
+     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
+     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
+       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
+       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
+     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
+     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
+     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
+       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
+     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
+       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
+       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
+     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
+       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
+       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
+     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
+     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
+     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
+     571,     0,     0,   572,   573,     0,   574,   575,   576,   577,
+       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
+     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
+       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
+     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
+       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
+     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
+     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
+     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
+       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
+     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
+       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
+       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
+       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
+     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
+       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
+     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
+     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
+     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
+     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
+     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
+     706,   707,   708,   709,   710,   711,   712,   713,   714,   715,
+     716,   717,   718,   719,   720,     0,     0,     0,     0,     0,
+     243,   244,  4148,   245,   246,   247,   248,   249,   936,   937,
+     250,     0,     0,     0,     0,   251,     0,     0,   252,     0,
+     253,   254,   255,   256,   257,   258,     0,   259,     0,     0,
+       0,   260,     0,     0,     0,   261,     0,     0,   262,   263,
+     264,     0,   265,     0,   266,   267,     0,     0,   268,     0,
+       0,   269,   270,     0,   271,   272,   273,     0,   274,     0,
+     275,   276,   277,   278,   279,   280,     0,   281,   282,     0,
+     283,   284,   285,   286,   287,   288,   289,   290,   291,   292,
+     293,     0,   294,   295,     0,   296,   297,   298,   299,   300,
+       0,     0,     0,   301,   938,     0,     0,     0,   302,     0,
+       0,   303,     0,     0,     0,   304,   305,   306,     0,     0,
+     307,     0,     0,     0,     0,   308,   309,     0,     0,     0,
+       0,   310,   311,     0,   312,   939,     0,     0,     0,     0,
+     313,   314,   315,   316,   317,     0,     0,     0,   318,   940,
+       0,   319,   320,   321,     0,     0,     0,   322,     0,   323,
+     324,     0,   325,   326,   327,     0,     0,   328,   329,     0,
+     330,   331,   941,   333,   334,   942,     0,     0,   336,   337,
+     338,   339,   340,     0,     0,   341,   342,     0,   943,   344,
+     345,   346,   347,     0,     0,   348,   349,     0,     0,     0,
+     350,   351,     0,   352,     0,     0,     0,   353,     0,   354,
+     355,   356,   357,     0,   358,   944,   359,     0,     0,     0,
+     360,   361,     0,   362,     0,     0,   363,   364,     0,     0,
+       0,   365,   366,   367,   368,     0,     0,   369,   370,   371,
+     945,     0,   372,     0,     0,     0,   946,   373,   374,   375,
+       0,     0,     0,   376,     0,     0,     0,   377,   378,     0,
+     379,   380,     0,     0,     0,   381,     0,   382,     0,     0,
+     383,   384,     0,     0,   385,     0,     0,   386,   387,   947,
+       0,     0,     0,     0,   388,   389,     0,   390,     0,   391,
+     948,   392,   393,     0,     0,     0,     0,     0,     0,     0,
+     394,     0,   395,   396,   397,   398,   399,   400,   401,   402,
+     403,   404,   405,   406,   407,   408,   409,   410,   411,     0,
+     412,   413,   414,     0,   415,   416,   417,   418,     0,   419,
+     420,     0,     0,     0,     0,   421,   422,   423,   424,   425,
+     426,     0,     0,   427,   428,     0,   429,     0,   430,     0,
+     431,   432,   433,   434,   435,   436,   437,   438,   439,     0,
+       0,   440,   441,     0,     0,   442,   443,   444,   445,     0,
+       0,     0,     0,   447,   448,     0,     0,     0,   449,     0,
+     450,   451,     0,   452,   453,   454,     0,     0,   455,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   456,   457,
+     458,     0,   459,     0,   460,     0,   461,   462,   463,   464,
+     465,   466,   467,   468,   469,   470,     0,   471,     0,   472,
+     473,   474,     0,   475,     0,   949,   477,   478,   479,   950,
+       0,   481,   482,   483,     0,     0,   484,     0,     0,     0,
+     485,   486,     0,   487,   488,   951,     0,   489,   490,   491,
+     492,   493,     0,   952,   495,     0,   496,   497,   498,     0,
+       0,   953,   500,   501,   502,   503,   504,   505,   506,     0,
+     507,     0,   508,   509,     0,   510,   511,   512,     0,   513,
+       0,     0,   514,   515,   516,   517,     0,   518,     0,   519,
+     520,   521,   522,   523,     0,   524,   525,   954,     0,     0,
+     526,   527,   528,   529,     0,     0,     0,   530,     0,     0,
+     955,   956,     0,   532,   533,   534,   535,     0,   536,   537,
+     538,   539,   540,     0,     0,     0,     0,     0,   541,   542,
+     543,     0,   544,     0,     0,   545,     0,     0,   546,     0,
+     547,     0,   548,   549,   550,   551,   552,   553,     0,     0,
+     554,   555,     0,     0,   556,   557,   558,   559,   560,   561,
+       0,     0,   957,   563,   564,   565,     0,   566,   567,     0,
+       0,   568,   569,   570,   571,     0,   240,   572,   573,     0,
+     574,   575,   576,   577,     0,     0,     0,     0,     0,   578,
+     579,   958,     0,     0,   580,   581,   582,     0,     0,   583,
+     584,     0,   585,   586,     0,   587,   588,     0,     0,   589,
+       0,     0,   590,   959,   591,   960,   592,   593,     0,     0,
+       0,     0,     0,   594,     0,   595,     0,     0,   596,     0,
+       0,     0,   597,     0,   598,   599,   600,   601,     0,     0,
+       0,     0,     0,     0,   602,   603,   604,     0,   605,   606,
+     607,   608,     0,     0,   609,     0,     0,   610,   611,   612,
+     613,   614,     0,   615,     0,     0,     0,     0,     0,     0,
+       0,     0,   616,   617,   618,     0,   619,   620,   621,     0,
+     622,     0,     0,   623,     0,   624,     0,     0,     0,     0,
+       0,     0,   625,   626,     0,     0,   627,     0,   628,     0,
+     629,   630,     0,     0,     0,   631,   632,   633,   634,   635,
+     636,   637,     0,     0,   639,   640,   641,     0,   643,   644,
+     645,   646,   647,   648,     0,   649,   650,   651,   652,   653,
+     654,   655,   656,   657,   658,   659,   660,   661,   662,   663,
+     664,   665,   666,   667,   668,   669,   670,   671,   672,     0,
+     673,   674,   675,   676,   677,   678,   679,     0,   680,   681,
+     682,   683,   684,   685,   686,   687,   688,   689,   690,   691,
+     692,   693,   694,   695,   696,   697,   698,   699,   700,   701,
+     702,   703,   704,   705,   706,   707,   708,   709,   710,   711,
+     712,   713,   714,   715,   716,   717,   718,   719,   720,   243,
+     244,     0,   245,   246,   247,   248,   249,  1008,   937,   250,
+       0,     0,     0,     0,   251,     0,     0,   252,     0,   253,
+     254,   255,   256,   257,   258,     0,   259,     0,     0,     0,
+     260,     0,     0,     0,   261,     0,     0,   262,   263,   264,
+       0,   265,     0,   266,   267,     0,     0,   268,     0,     0,
+     269,   270,     0,   271,   272,   273,     0,   274,     0,   275,
+     276,   277,   278,   279,   280,     0,   281,   282,     0,   283,
+     284,   285,   286,   287,   288,   289,   290,   291,   292,   293,
+       0,   294,   295,     0,   296,   297,   298,   299,   300,     0,
+       0,     0,   301,   938,     0,     0,     0,   302,     0,     0,
+     303,     0,     0,     0,   304,   305,   306,     0,     0,   307,
+       0,     0,     0,     0,   308,   309,     0,     0,     0,     0,
+     310,   311,     0,   312,   939,     0,     0,     0,     0,   313,
+     314,   315,   316,   317,     0,     0,     0,   318,   940,     0,
+     319,   320,   321,     0,     0,     0,   322,     0,   323,   324,
+       0,   325,   326,   327,     0,     0,   328,   329,     0,   330,
+     331,   941,   333,   334,   942,     0,     0,   336,   337,   338,
+     339,   340,     0,     0,   341,   342,     0,   943,   344,   345,
+     346,   347,     0,     0,   348,   349,     0,     0,     0,   350,
+     351,     0,   352,     0,     0,     0,   353,     0,   354,   355,
+     356,   357,     0,   358,   944,   359,     0,     0,     0,   360,
+     361,     0,   362,     0,     0,   363,   364,     0,     0,     0,
+     365,   366,   367,   368,     0,     0,   369,   370,   371,   945,
+       0,   372,     0,     0,     0,   946,   373,   374,   375,     0,
+       0,     0,   376,     0,     0,     0,   377,   378,     0,   379,
+     380,     0,     0,     0,   381,     0,   382,     0,     0,   383,
+     384,     0,     0,   385,     0,     0,   386,   387,   947,     0,
+       0,     0,     0,   388,   389,     0,   390,     0,   391,   948,
+     392,   393,     0,     0,     0,     0,     0,     0,     0,   394,
+       0,   395,   396,   397,   398,   399,   400,   401,   402,   403,
+     404,   405,   406,   407,   408,   409,   410,   411,     0,   412,
+     413,   414,     0,   415,   416,   417,   418,     0,   419,   420,
+       0,     0,     0,     0,   421,   422,   423,   424,   425,   426,
+       0,     0,   427,   428,     0,   429,     0,   430,     0,   431,
+     432,   433,   434,   435,   436,   437,   438,   439,     0,     0,
+     440,   441,     0,     0,   442,   443,   444,   445,     0,     0,
+       0,     0,   447,   448,     0,     0,     0,   449,     0,   450,
+     451,     0,   452,   453,   454,     0,     0,   455,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   456,   457,   458,
+       0,   459,     0,   460,     0,   461,   462,   463,   464,   465,
+     466,   467,   468,   469,   470,     0,   471,     0,   472,   473,
+     474,     0,   475,     0,   949,   477,   478,   479,  1009,     0,
+     481,   482,   483,     0,     0,   484,     0,     0,     0,   485,
+     486,     0,   487,   488,   951,     0,   489,   490,   491,   492,
+     493,     0,   952,   495,     0,   496,   497,   498,     0,     0,
+     953,   500,   501,   502,   503,   504,   505,   506,     0,   507,
+       0,   508,   509,     0,   510,   511,   512,     0,   513,     0,
+       0,   514,   515,   516,   517,     0,   518,     0,   519,   520,
+     521,   522,   523,     0,   524,   525,   954,     0,     0,   526,
+     527,   528,   529,     0,     0,     0,   530,     0,     0,   955,
+     956,     0,   532,   533,   534,   535,     0,   536,   537,   538,
+     539,   540,     0,     0,     0,     0,     0,   541,   542,   543,
+       0,   544,     0,     0,   545,     0,     0,   546,     0,   547,
+       0,   548,   549,   550,   551,   552,   553,     0,     0,   554,
+     555,     0,     0,   556,   557,   558,   559,   560,   561,     0,
+       0,   957,   563,   564,   565,     0,   566,   567,     0,     0,
+     568,   569,   570,   571,     0,   240,   572,   573,     0,   574,
+     575,   576,   577,     0,     0,     0,     0,     0,   578,   579,
+     958,     0,     0,   580,   581,   582,     0,     0,   583,   584,
+       0,   585,   586,     0,   587,   588,     0,     0,   589,     0,
+       0,   590,   959,   591,   960,   592,   593,     0,     0,     0,
+       0,     0,   594,     0,   595,     0,     0,   596,     0,     0,
+       0,   597,     0,   598,   599,   600,   601,     0,     0,     0,
+       0,     0,     0,   602,   603,   604,     0,   605,   606,   607,
+     608,     0,     0,   609,     0,     0,   610,   611,   612,   613,
+     614,     0,   615,     0,     0,     0,     0,     0,     0,     0,
+       0,   616,   617,   618,     0,   619,   620,   621,     0,   622,
+       0,     0,   623,     0,   624,     0,     0,     0,     0,     0,
+       0,   625,   626,     0,     0,   627,     0,   628,     0,   629,
+     630,     0,     0,     0,   631,   632,   633,   634,   635,   636,
+     637,     0,     0,   639,   640,   641,     0,   643,   644,   645,
+     646,   647,   648,     0,   649,   650,   651,   652,   653,   654,
+     655,   656,   657,   658,   659,   660,   661,   662,   663,   664,
+     665,   666,   667,   668,   669,   670,   671,   672,     0,   673,
+     674,   675,   676,   677,   678,   679,     0,   680,   681,   682,
+     683,   684,   685,   686,   687,   688,   689,   690,   691,   692,
+     693,   694,   695,   696,   697,   698,   699,   700,   701,   702,
+     703,   704,   705,   706,   707,   708,   709,   710,   711,   712,
+     713,   714,   715,   716,   717,   718,   719,   720,   243,   244,
+       0,   245,   246,   247,   248,   249,     0,   937,   250,     0,
+       0,     0,     0,   251,     0,     0,   252,     0,   253,   254,
+     255,   256,   257,   258,     0,   259,     0,     0,     0,   260,
+       0,     0,     0,   261,     0,     0,   262,   263,   264,     0,
+     265,     0,   266,   267,     0,     0,   268,     0,     0,   269,
+     270,     0,   271,   272,   273,     0,   274,     0,   275,   276,
+     277,   278,   279,   280,     0,   281,   282,     0,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,     0,
+     294,   295,     0,   296,   297,   298,   299,   300,     0,     0,
+       0,   301,   938,     0,     0,     0,   302,     0,     0,   303,
+       0,     0,     0,   304,   305,   306,     0,     0,   307,     0,
+       0,     0,     0,   308,   309,     0,     0,     0,     0,   310,
+     311,     0,   312,   939,     0,     0,     0,     0,   313,   314,
+     315,   316,   317,     0,     0,     0,   318,   940,     0,   319,
+     320,   321,     0,     0,     0,   322,     0,   323,   324,     0,
+     325,   326,   327,     0,     0,   328,   329,     0,   330,   331,
+     941,   333,   334,   942,     0,     0,   336,   337,   338,   339,
+     340,     0,     0,   341,   342,     0,   943,   344,   345,   346,
+     347,     0,     0,   348,   349,     0,     0,     0,   350,   351,
+       0,   352,     0,     0,     0,   353,     0,   354,   355,   356,
+     357,     0,   358,   944,   359,     0,     0,     0,   360,   361,
+       0,   362,     0,     0,   363,   364,     0,     0,     0,   365,
+     366,   367,   368,     0,     0,   369,   370,   371,   945,     0,
+     372,     0,     0,     0,   946,   373,   374,   375,     0,     0,
+       0,   376,     0,     0,     0,   377,   378,     0,   379,   380,
+       0,     0,     0,   381,     0,   382,     0,     0,   383,   384,
+       0,     0,   385,     0,     0,   386,   387,   947,     0,     0,
+       0,     0,   388,   389,     0,   390,     0,   391,   948,   392,
+     393,     0,     0,     0,     0,     0,     0,     0,   394,     0,
+     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
+     405,   406,   407,   408,   409,   410,   411,     0,   412,   413,
+     414,     0,   415,   416,   417,   418,     0,   419,   420,     0,
+       0,     0,     0,   421,   422,   423,   424,   425,   426,     0,
+       0,   427,   428,     0,   429,     0,   430,     0,   431,   432,
+     433,   434,   435,   436,   437,   438,   439,     0,     0,   440,
+     441,     0,     0,   442,   443,   444,   445,     0,     0,     0,
+       0,   447,   448,     0,     0,     0,   449,     0,   450,   451,
+       0,   452,   453,   454,     0,     0,   455,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   456,   457,   458,     0,
+     459,     0,   460,     0,   461,   462,   463,   464,   465,   466,
+     467,   468,   469,   470,     0,   471,     0,   472,   473,   474,
+       0,   475,     0,   949,   477,   478,   479,     0,     0,   481,
+     482,   483,     0,     0,   484,     0,     0,     0,   485,   486,
+       0,   487,   488,   951,     0,   489,   490,   491,   492,   493,
+       0,   952,   495,     0,   496,   497,   498,     0,     0,   953,
+     500,   501,   502,   503,   504,   505,   506,     0,   507,     0,
+     508,   509,     0,   510,   511,   512,     0,   513,     0,     0,
+     514,   515,   516,   517,     0,   518,     0,   519,   520,   521,
+     522,   523,     0,   524,   525,   954,     0,     0,   526,   527,
+     528,   529,     0,     0,     0,   530,     0,     0,   955,   956,
+       0,   532,   533,   534,   535,     0,   536,   537,   538,   539,
+     540,     0,     0,     0,     0,     0,   541,   542,   543,     0,
+     544,     0,     0,   545,     0,     0,   546,     0,   547,     0,
+     548,   549,   550,   551,   552,   553,     0,     0,   554,   555,
+       0,     0,   556,   557,   558,   559,   560,   561,     0,     0,
+     957,   563,   564,   565,     0,   566,   567,     0,     0,   568,
+     569,   570,   571,     0,   240,   572,   573,     0,   574,   575,
+     576,   577,     0,     0,     0,     0,     0,   578,   579,   958,
+       0,     0,   580,   581,   582,     0,     0,   583,   584,     0,
+     585,   586,     0,   587,   588,     0,     0,   589,     0,     0,
+     590,   959,   591,   960,   592,   593,     0,     0,     0,     0,
+       0,   594,     0,   595,     0,     0,   596,     0,     0,     0,
+     597,     0,   598,   599,   600,   601,     0,     0,     0,     0,
+       0,     0,   602,   603,   604,     0,   605,   606,   607,   608,
+       0,     0,   609,     0,     0,   610,   611,   612,   613,   614,
+       0,   615,     0,     0,     0,     0,     0,     0,     0,     0,
+     616,   617,   618,     0,   619,   620,   621,     0,   622,     0,
+       0,   623,     0,   624,     0,     0,     0,     0,     0,     0,
+     625,   626,     0,     0,   627,     0,   628,     0,   629,   630,
+       0,     0,     0,   631,   632,   633,   634,   635,   636,   637,
+       0,     0,   639,   640,   641,     0,   643,   644,   645,   646,
+     647,   648,     0,   649,   650,   651,   652,   653,   654,   655,
+     656,   657,   658,   659,   660,   661,   662,   663,   664,   665,
+     666,   667,   668,   669,   670,   671,   672,     0,   673,   674,
+     675,   676,   677,   678,   679,     0,   680,   681,   682,   683,
+     684,   685,   686,   687,   688,   689,   690,   691,   692,   693,
+     694,   695,   696,   697,   698,   699,   700,   701,   702,   703,
+     704,   705,   706,   707,   708,   709,   710,   711,   712,   713,
+     714,   715,   716,   717,   718,   719,   720,   243,   244,     0,
+     245,   246,   247,   248,   249,     0,     0,   250,     0,     0,
+       0,     0,   251,     0,     0,   252,     0,   253,   254,   255,
+     256,   257,   258,     0,   259,     0,     0,     0,   260,     0,
+       0,     0,   261,     0,     0,   262,   263,   264,     0,   265,
+       0,   266,   267,     0,     0,   268,     0,     0,   269,   270,
+       0,   271,   272,   273,     0,   274,     0,   275,   276,   277,
+     278,   279,   280,     0,   281,   282,     0,   283,   284,   285,
+     286,   287,   288,   289,   290,   291,   292,   293,     0,   294,
+     295,     0,   296,   297,   298,   299,   300,     0,     0,     0,
+     301,     0,     0,     0,     0,   302,     0,     0,   303,     0,
+       0,     0,   304,   305,   306,     0,     0,   307,     0,     0,
+       0,     0,   308,   309,  3223,     0,     0,     0,   310,   311,
+       0,   312,     0,     0,     0,     0,     0,   313,   314,   315,
+     316,   317,     0,     0,     0,   318,     0,     0,   319,   320,
+     321,     0,     0,     0,   322,     0,   323,   324,     0,   325,
+     326,   327,     0,     0,   328,   329,     0,   330,   331,   332,
+     333,   334,   335,     0,     0,   336,   337,   338,   339,   340,
+       0,     0,   341,   342,     0,   343,   344,   345,   346,   347,
+    3224,     0,   348,   349,     0,     0,     0,   350,   351,     0,
+     352,     0,     0,     0,   353,     0,   354,   355,   356,   357,
+       0,   358,     0,   359,     0,     0,     0,   360,   361,     0,
+     362,  3225,     0,   363,   364,     0,     0,     0,   365,   366,
+     367,   368,     0,     0,   369,   370,   371,     0,     0,   372,
+       0,     0,     0,     0,   373,   374,   375,     0,     0,     0,
+     376,     0,     0,     0,   377,   378,     0,   379,   380,     0,
+       0,     0,   381,     0,   382,     0,     0,   383,   384,     0,
+       0,   385,     0,     0,   386,   387,     0,     0,     0,     0,
+       0,   388,   389,     0,   390,     0,   391,     0,   392,   393,
+       0,     0,  3226,     0,     0,     0,     0,   394,     0,   395,
+     396,   397,   398,   399,   400,   401,   402,   403,   404,   405,
+     406,   407,   408,   409,   410,   411,     0,   412,   413,   414,
+       0,   415,   416,   417,   418,     0,   419,   420,     0,     0,
+       0,     0,   421,   422,   423,   424,   425,   426,     0,     0,
+     427,   428,     0,   429,     0,   430,     0,   431,   432,   433,
+     434,   435,   436,   437,   438,   439,     0,     0,   440,   441,
+       0,     0,   442,   443,   444,   445,   446,  1391,  1392,     0,
+     447,   448,     0,     0,  3227,   449,     0,   450,   451,     0,
+     452,   453,   454,     0,     0,   455,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   456,   457,   458,     0,   459,
+       0,   460,     0,   461,   462,   463,   464,   465,   466,   467,
+     468,   469,   470,     0,   471,     0,   472,   473,   474,     0,
+     475,     0,   476,   477,   478,   479,   480,     0,   481,   482,
+     483,     0,     0,   484,     0,     0,     0,   485,   486,     0,
+     487,   488,     0,     0,   489,   490,   491,   492,   493,     0,
+     494,   495,     0,   496,   497,   498,     0,     0,   499,   500,
+     501,   502,   503,   504,   505,   506,     0,   507,     0,   508,
+     509,     0,   510,   511,   512,     0,   513,     0,     0,   514,
+     515,   516,   517,     0,   518,     0,   519,   520,   521,   522,
+     523,     0,   524,   525,     0,     0,     0,   526,   527,   528,
+     529,     0,     0,     0,   530,     0,     0,     0,   531,     0,
+     532,   533,   534,   535,     0,   536,   537,   538,   539,   540,
+       0,     0,  5540,  1003,  5541,   541,   542,   543,     0,   544,
+       0,     0,   545,     0,     0,   546,     0,   547,     0,   548,
+     549,   550,   551,   552,   553,     0,     0,   554,   555,     0,
+       0,   556,   557,   558,   559,   560,   561,     0,     0,   562,
+     563,   564,   565,     0,   566,   567,     0,     0,   568,   569,
+     570,   571,     0,     0,   572,   573,     0,   574,   575,   576,
+     577,     0,     0,     0,     0,     0,   578,   579,     0,     0,
+       0,   580,   581,   582,     0,  3228,   583,   584,     0,   585,
+     586,     0,   587,   588,     0,     0,   589,     0,     0,   590,
+       0,   591,     0,   592,   593,     0,     0,     0,     0,     0,
+     594,     0,   595,     0,     0,   596,     0,     0,     0,   597,
+       0,   598,   599,   600,   601,     0,     0,     0,     0,     0,
+       0,   602,   603,   604,     0,   605,   606,   607,   608,     0,
+       0,   609,     0,     0,   610,   611,   612,   613,   614,     0,
+     615,     0,     0,     0,     0,     0,     0,     0,     0,   616,
+     617,   618,     0,   619,   620,   621,     0,   622,     0,     0,
+     623,     0,   624,     0,     0,     0,     0,     0,     0,   625,
+     626,     0,     0,   627,     0,   628,     0,   629,   630,     0,
+       0,     0,   631,   632,   633,   634,   635,   636,   637,   638,
+       0,   639,   640,   641,   642,   643,   644,   645,   646,   647,
+     648,     0,   649,   650,   651,   652,   653,   654,   655,   656,
+     657,   658,   659,   660,   661,   662,   663,   664,   665,   666,
+     667,   668,   669,   670,   671,   672,     0,   673,   674,   675,
+     676,   677,   678,   679,     0,   680,   681,   682,   683,   684,
+     685,   686,   687,   688,   689,   690,   691,   692,   693,   694,
+     695,   696,   697,   698,   699,   700,   701,   702,   703,   704,
+     705,   706,   707,   708,   709,   710,   711,   712,   713,   714,
+     715,   716,   717,   718,   719,   720,   243,   244,     0,   245,
+     246,   247,   248,   249,     0,     0,   250,     0,     0,  1365,
+    1366,   251,  1367,     0,   252,     0,   253,   254,   255,   256,
+     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
+       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
+     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
+     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
+     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
+     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
+       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
+       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
+       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
+       0,   308,   309,     0,     0,     0,     0,   310,   311,     0,
+     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
+     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
+       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
+     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
+     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
+       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
+       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
+       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
+     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
+       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
+     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
+       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
+       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
+       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
+     385,     0,     0,   386,   387,     0,     0,     0,     0,     0,
+     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
+       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
+     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
+     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
+     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
+       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
+     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
+     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
+       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
+     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
+     453,   454,     0,     0,   455,     0,     0,  1368,     0,     0,
+    1369,     0,     0,     0,   456,   457,   458,     0,   459,     0,
+     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
+     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
+       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
+       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
+     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
+     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
+     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
+       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
+     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
+       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
+       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
+     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
+       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
+       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
+     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
+     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
+     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
+     571,     0,  1370,   572,   573,     0,   574,   575,   576,   577,
+       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
+     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
+       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
+     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
+       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
+     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
+     602,   603,   604,     0,   605,   606,   607,   608,  1371,     0,
+     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
+       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
+     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
+       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
+       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
+       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
+     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
+       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
+     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
+     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
+     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
+     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
+     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
+     706,   707,   708,   709,   710,   711,   712,   713,   714,   715,
+     716,   717,   718,   719,   720,   243,   244,     0,   245,   246,
+     247,   248,   249,     0,     0,   250,     0,     0,     0,     0,
+     251,     0,     0,   252,     0,   253,   254,   255,   256,   257,
+     258,     0,   259,     0,     0,  1514,   260,     0,     0,     0,
+     261,     0,     0,   262,   263,   264,     0,   265,     0,   266,
+     267,     0,     0,   268,     0,     0,   269,   270,     0,   271,
+     272,   273,     0,   274,     0,   275,   276,   277,   278,   279,
+     280,     0,   281,   282,     0,   283,   284,   285,   286,   287,
+     288,   289,   290,   291,   292,   293,     0,   294,   295,     0,
+     296,   297,   298,   299,   300,     0,     0,     0,   301,     0,
+       0,     0,     0,   302,     0,     0,   303,     0,     0,     0,
+     304,   305,   306,     0,     0,   307,     0,     0,     0,     0,
+     308,   309,     0,     0,     0,  1515,   310,   311,     0,   312,
+       0,     0,     0,     0,     0,   313,   314,   315,   316,   317,
+       0,     0,     0,   318,     0,     0,   319,   320,   321,     0,
+       0,     0,   322,     0,   323,   324,     0,   325,   326,   327,
+    1516,     0,   328,   329,     0,   330,   331,   332,   333,   334,
+     335,     0,     0,   336,   337,   338,   339,   340,     0,     0,
+     341,   342,     0,   343,   344,   345,   346,   347,     0,     0,
+     348,   349,     0,     0,     0,   350,   351,     0,   352,     0,
+       0,     0,   353,     0,   354,   355,   356,   357,     0,   358,
+       0,   359,     0,     0,     0,   360,   361,     0,   362,     0,
+       0,   363,   364,     0,     0,     0,   365,   366,   367,   368,
+       0,     0,   369,   370,   371,     0,     0,   372,     0,     0,
+       0,     0,   373,   374,   375,     0,     0,     0,   376,     0,
+       0,     0,   377,   378,     0,   379,   380,     0,     0,     0,
+     381,     0,   382,     0,     0,   383,   384,     0,     0,   385,
+       0,     0,   386,   387,  1142,     0,     0,     0,     0,   388,
+     389,     0,   390,     0,   391,     0,   392,   393,     0,     0,
+       0,     0,     0,     0,     0,   394,     0,   395,   396,   397,
+     398,   399,   400,   401,   402,   403,   404,   405,   406,   407,
+     408,   409,   410,   411,     0,   412,   413,   414,     0,   415,
+     416,   417,   418,     0,   419,   420,     0,     0,     0,     0,
+     421,   422,   423,   424,   425,   426,     0,     0,   427,   428,
+       0,   429,     0,   430,     0,   431,   432,   433,   434,   435,
+     436,   437,   438,   439,     0,     0,   440,   441,     0,     0,
+     442,   443,   444,   445,   446,     0,     0,     0,   447,   448,
+       0,     0,     0,   449,     0,   450,   451,     0,   452,   453,
+     454,     0,     0,   455,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   456,   457,   458,     0,   459,     0,   460,
+       0,   461,   462,   463,   464,   465,   466,   467,   468,   469,
+     470,     0,   471,     0,   472,   473,   474,     0,   475,     0,
+     476,   477,   478,   479,   480,     0,   481,   482,   483,     0,
+       0,   484,     0,     0,     0,   485,   486,     0,   487,   488,
+       0,     0,   489,   490,   491,   492,   493,     0,   494,   495,
+       0,   496,   497,   498,     0,     0,   499,   500,   501,   502,
+     503,   504,   505,   506,     0,   507,     0,   508,   509,     0,
+     510,   511,   512,     0,   513,     0,     0,   514,   515,   516,
+     517,     0,   518,     0,   519,   520,   521,   522,   523,     0,
+     524,   525,     0,     0,     0,   526,   527,   528,   529,     0,
+       0,  1517,   530,     0,     0,     0,   531,     0,   532,   533,
+     534,   535,     0,   536,   537,   538,   539,   540,     0,     0,
+       0,     0,     0,   541,   542,   543,     0,   544,     0,     0,
+     545,     0,     0,   546,     0,   547,     0,   548,   549,   550,
+     551,   552,   553,     0,     0,   554,   555,     0,     0,   556,
+     557,   558,   559,   560,   561,     0,     0,   562,   563,   564,
+     565,     0,   566,   567,     0,     0,   568,   569,   570,   571,
+       0,   240,   572,   573,     0,   574,   575,   576,   577,     0,
+       0,     0,     0,     0,   578,   579,     0,     0,     0,   580,
+     581,   582,     0,     0,   583,   584,     0,   585,   586,     0,
+     587,   588,     0,     0,   589,     0,     0,   590,     0,   591,
+       0,   592,   593,     0,     0,     0,     0,     0,   594,     0,
+     595,     0,     0,   596,     0,     0,     0,   597,     0,   598,
+     599,   600,   601,     0,     0,     0,     0,     0,     0,   602,
+     603,   604,     0,   605,   606,   607,   608,     0,     0,   609,
+       0,     0,   610,   611,   612,   613,   614,     0,   615,     0,
+       0,     0,     0,     0,     0,     0,     0,   616,   617,   618,
+       0,   619,   620,   621,     0,   622,     0,     0,   623,     0,
+     624,     0,     0,     0,     0,     0,     0,   625,   626,     0,
+       0,   627,     0,   628,     0,   629,   630,     0,     0,     0,
+     631,   632,   633,   634,   635,   636,   637,   638,     0,   639,
+     640,   641,   642,   643,   644,   645,   646,   647,   648,     0,
+     649,   650,   651,   652,   653,   654,   655,   656,   657,   658,
+     659,   660,   661,   662,   663,   664,   665,   666,   667,   668,
+     669,   670,   671,   672,     0,   673,   674,   675,   676,   677,
+     678,   679,     0,   680,   681,   682,   683,   684,   685,   686,
+     687,   688,   689,   690,   691,   692,   693,   694,   695,   696,
+     697,   698,   699,   700,   701,   702,   703,   704,   705,   706,
+     707,   708,   709,   710,   711,   712,   713,   714,   715,   716,
+     717,   718,   719,   720,   243,   244,     0,   245,   246,   247,
+     248,   249,     0,     0,   250,     0,     0,     0,     0,   251,
+       0,     0,   252,     0,   253,   254,   255,   256,   257,   258,
+       0,   259,     0,     0,     0,   260,     0,     0,     0,   261,
+       0,     0,   262,   263,   264,     0,   265,     0,   266,   267,
+       0,     0,   268,     0,     0,   269,   270,     0,   271,   272,
+     273,     0,   274,     0,   275,   276,   277,   278,   279,   280,
+       0,   281,   282,     0,   283,   284,   285,   286,   287,   288,
+     289,   290,   291,   292,   293,     0,   294,   295,  2483,   296,
+     297,   298,   299,   300,     0,     0,     0,   301,     0,     0,
+       0,     0,   302,     0,     0,   303,     0,     0,     0,   304,
+     305,   306,     0,     0,   307,     0,     0,     0,     0,   308,
+     309,     0,     0,     0,     0,   310,   311,     0,   312,     0,
+       0,     0,     0,     0,   313,   314,   315,   316,   317,     0,
+       0,     0,   318,     0,     0,   319,   320,   321,     0,     0,
+       0,   322,     0,   323,   324,     0,   325,   326,   327,     0,
+       0,   328,   329,     0,   330,   331,   332,   333,   334,   335,
+       0,     0,   336,   337,   338,   339,   340,     0,     0,   341,
+     342,     0,   343,   344,   345,   346,   347,     0,     0,   348,
+     349,     0,     0,     0,   350,   351,     0,   352,  2484,     0,
+       0,   353,     0,   354,   355,   356,   357,     0,   358,     0,
+     359,     0,     0,     0,   360,   361,     0,   362,     0,     0,
+     363,   364,     0,     0,     0,   365,   366,   367,   368,     0,
+       0,   369,   370,   371,  1866,     0,   372,     0,     0,     0,
+       0,   373,   374,   375,     0,     0,     0,   376,     0,     0,
+       0,   377,   378,     0,   379,   380,     0,     0,     0,   381,
+       0,   382,  1867,     0,   383,   384,     0,     0,   385,     0,
+       0,   386,   387,     0,     0,     0,     0,     0,   388,   389,
+       0,   390,     0,   391,     0,   392,   393,     0,     0,     0,
+       0,     0,     0,     0,   394,     0,   395,   396,   397,   398,
+     399,   400,   401,   402,   403,   404,   405,   406,   407,   408,
+     409,   410,   411,     0,   412,   413,   414,     0,   415,   416,
+     417,   418,     0,   419,   420,     0,     0,     0,     0,   421,
+     422,   423,   424,   425,   426,     0,     0,   427,   428,     0,
+     429,     0,   430,     0,   431,   432,   433,   434,   435,   436,
+     437,   438,   439,     0,     0,   440,   441,     0,     0,   442,
+     443,   444,   445,   446,     0,     0,     0,   447,   448,     0,
+       0,     0,   449,     0,   450,   451,     0,   452,   453,   454,
+       0,     0,   455,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   456,   457,   458,     0,   459,     0,   460,     0,
+     461,   462,   463,   464,   465,   466,   467,   468,   469,   470,
+       0,   471,     0,   472,   473,   474,     0,   475,     0,   476,
+     477,   478,   479,   480,     0,   481,   482,   483,     0,     0,
+     484,     0,     0,     0,   485,   486,     0,   487,   488,     0,
+       0,   489,   490,   491,   492,   493,     0,   494,   495,     0,
+     496,   497,   498,     0,     0,   499,   500,   501,   502,   503,
+     504,   505,   506,     0,   507,     0,   508,   509,     0,   510,
+     511,   512,     0,   513,     0,     0,   514,   515,   516,   517,
+       0,   518,     0,   519,   520,   521,   522,   523,     0,   524,
+     525,     0,     0,     0,   526,   527,   528,   529,     0,     0,
+       0,   530,     0,     0,     0,   531,     0,   532,   533,   534,
+     535,     0,   536,   537,   538,   539,   540,  2486,     0,     0,
+       0,     0,   541,   542,   543,     0,   544,     0,     0,   545,
+       0,     0,   546,     0,   547,     0,   548,   549,   550,   551,
+     552,   553,     0,     0,   554,   555,     0,     0,   556,   557,
+     558,   559,   560,   561,     0,     0,   562,   563,   564,   565,
+       0,   566,   567,     0,     0,   568,   569,   570,   571,     0,
+       0,   572,   573,     0,   574,   575,   576,   577,     0,     0,
+       0,     0,     0,   578,   579,     0,     0,     0,   580,   581,
+     582,     0,     0,   583,   584,     0,   585,   586,     0,   587,
+     588,     0,     0,   589,     0,     0,   590,     0,   591,     0,
+     592,   593,     0,     0,     0,     0,     0,   594,     0,   595,
+       0,     0,   596,     0,     0,     0,   597,     0,   598,   599,
+     600,   601,     0,     0,     0,     0,     0,     0,   602,   603,
+     604,     0,   605,   606,   607,   608,     0,     0,   609,     0,
+       0,   610,   611,   612,   613,   614,     0,   615,     0,     0,
+       0,     0,     0,     0,     0,     0,   616,   617,   618,     0,
+     619,   620,   621,     0,   622,     0,     0,   623,     0,   624,
+       0,     0,     0,     0,     0,     0,   625,   626,     0,     0,
+     627,     0,   628,     0,   629,   630,     0,     0,     0,   631,
+     632,   633,   634,   635,   636,   637,   638,     0,   639,   640,
+     641,   642,   643,   644,   645,   646,   647,   648,     0,   649,
+     650,   651,   652,   653,   654,   655,   656,   657,   658,   659,
+     660,   661,   662,   663,   664,   665,   666,   667,   668,   669,
+     670,   671,   672,     0,   673,   674,   675,   676,   677,   678,
+     679,     0,   680,   681,   682,   683,   684,   685,   686,   687,
+     688,   689,   690,   691,   692,   693,   694,   695,   696,   697,
+     698,   699,   700,   701,   702,   703,   704,   705,   706,   707,
+     708,   709,   710,   711,   712,   713,   714,   715,   716,   717,
+     718,   719,   720,   243,   244,     0,   245,   246,   247,   248,
+     249,     0,     0,   250,     0,     0,     0,     0,   251,     0,
+       0,   252,     0,   253,   254,   255,   256,   257,   258,     0,
+     259,     0,     0,  1539,   260,     0,     0,     0,   261,     0,
+       0,   262,   263,   264,     0,   265,     0,   266,   267,     0,
+       0,   268,     0,     0,   269,   270,     0,   271,   272,   273,
+       0,   274,     0,   275,   276,   277,   278,   279,   280,     0,
+     281,   282,     0,   283,   284,   285,   286,   287,   288,   289,
+     290,   291,   292,   293,     0,   294,   295,     0,   296,   297,
+     298,   299,   300,     0,     0,     0,   301,     0,     0,     0,
+       0,   302,     0,     0,   303,     0,     0,     0,   304,   305,
+     306,     0,     0,   307,     0,     0,     0,     0,   308,   309,
+       0,     0,     0,  1540,   310,   311,     0,   312,     0,     0,
+       0,     0,     0,   313,   314,   315,   316,   317,     0,     0,
+       0,   318,     0,     0,   319,   320,   321,     0,     0,     0,
+     322,     0,   323,   324,     0,   325,   326,   327,     0,     0,
+     328,   329,     0,   330,   331,   332,   333,   334,   335,     0,
+       0,   336,   337,   338,   339,   340,     0,     0,   341,   342,
+       0,   343,   344,   345,   346,   347,     0,     0,   348,   349,
+       0,     0,     0,   350,   351,     0,   352,     0,     0,     0,
+     353,     0,   354,   355,   356,   357,     0,   358,     0,   359,
+       0,     0,     0,   360,   361,     0,   362,     0,     0,   363,
+     364,     0,     0,     0,   365,   366,   367,   368,     0,     0,
+     369,   370,   371,     0,     0,   372,     0,     0,     0,     0,
+     373,   374,   375,     0,     0,     0,   376,     0,     0,     0,
+     377,   378,     0,   379,   380,     0,     0,     0,   381,     0,
+     382,     0,     0,   383,   384,     0,     0,   385,     0,     0,
+     386,   387,  1142,     0,     0,     0,     0,   388,   389,     0,
+     390,     0,   391,     0,   392,   393,     0,     0,     0,     0,
+       0,     0,     0,   394,     0,   395,   396,   397,   398,   399,
+     400,   401,   402,   403,   404,   405,   406,   407,   408,   409,
+     410,   411,     0,   412,   413,   414,     0,   415,   416,   417,
+     418,     0,   419,   420,     0,     0,     0,     0,   421,   422,
+     423,   424,   425,   426,     0,     0,   427,   428,     0,   429,
+       0,   430,     0,   431,   432,   433,   434,   435,   436,   437,
+     438,   439,     0,     0,   440,   441,     0,     0,   442,   443,
+     444,   445,   446,     0,     0,     0,   447,   448,     0,     0,
+       0,   449,     0,   450,   451,     0,   452,   453,   454,     0,
+       0,   455,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   456,   457,   458,     0,   459,     0,   460,     0,   461,
+     462,   463,   464,   465,   466,   467,   468,   469,   470,     0,
+     471,     0,   472,   473,   474,     0,   475,     0,   476,   477,
+     478,   479,   480,     0,   481,   482,   483,     0,     0,   484,
+       0,     0,     0,   485,   486,     0,   487,   488,     0,     0,
+     489,   490,   491,   492,   493,     0,   494,   495,     0,   496,
+     497,   498,     0,     0,   499,   500,   501,   502,   503,   504,
+     505,   506,     0,   507,     0,   508,   509,     0,   510,   511,
+     512,     0,   513,     0,     0,   514,   515,   516,   517,     0,
+     518,     0,   519,   520,   521,   522,   523,     0,   524,   525,
+       0,     0,     0,   526,   527,   528,   529,     0,     0,     0,
+     530,     0,     0,     0,   531,     0,   532,   533,   534,   535,
+       0,   536,   537,   538,   539,   540,     0,     0,     0,     0,
+       0,   541,   542,   543,     0,   544,     0,     0,   545,     0,
+       0,   546,     0,   547,     0,   548,   549,   550,   551,   552,
+     553,     0,     0,   554,   555,     0,     0,   556,   557,   558,
+     559,   560,   561,     0,     0,   562,   563,   564,   565,     0,
+     566,   567,     0,     0,   568,   569,   570,   571,     0,   240,
+     572,   573,     0,   574,   575,   576,   577,     0,     0,     0,
+       0,     0,   578,   579,     0,     0,     0,   580,   581,   582,
+       0,     0,   583,   584,     0,   585,   586,     0,   587,   588,
+       0,     0,   589,     0,     0,   590,     0,   591,     0,   592,
+     593,     0,     0,     0,     0,     0,   594,     0,   595,     0,
+       0,   596,     0,     0,     0,   597,     0,   598,   599,   600,
+     601,     0,     0,     0,     0,     0,     0,   602,   603,   604,
+       0,   605,   606,   607,   608,     0,     0,   609,     0,     0,
+     610,   611,   612,   613,   614,     0,   615,     0,     0,     0,
+       0,     0,     0,     0,     0,   616,   617,   618,     0,   619,
+     620,   621,     0,   622,     0,     0,   623,     0,   624,     0,
+       0,     0,     0,     0,     0,   625,   626,     0,     0,   627,
+       0,   628,     0,   629,   630,     0,     0,     0,   631,   632,
+     633,   634,   635,   636,   637,   638,     0,   639,   640,   641,
+     642,   643,   644,   645,   646,   647,   648,     0,   649,   650,
+     651,   652,   653,   654,   655,   656,   657,   658,   659,   660,
+     661,   662,   663,   664,   665,   666,   667,   668,   669,   670,
+     671,   672,     0,   673,   674,   675,   676,   677,   678,   679,
+       0,   680,   681,   682,   683,   684,   685,   686,   687,   688,
+     689,   690,   691,   692,   693,   694,   695,   696,   697,   698,
+     699,   700,   701,   702,   703,   704,   705,   706,   707,   708,
      709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,   125,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,    -1,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
+     719,   720,   243,   244,     0,   245,   246,   247,   248,   249,
+       0,     0,   250,     0,     0,     0,     0,   251,     0,     0,
+     252,     0,   253,   254,   255,   256,   257,   258,     0,   259,
+       0,     0,     0,   260,     0,     0,     0,   261,     0,     0,
+     262,   263,   264,     0,   265,     0,   266,   267,     0,     0,
+     268,     0,     0,   269,   270,     0,   271,   272,   273,     0,
+     274,     0,   275,   276,   277,   278,   279,   280,     0,   281,
+     282,     0,   283,   284,   285,   286,   287,   288,   289,   290,
+     291,   292,   293,     0,   294,   295,     0,   296,   297,   298,
+     299,   300,     0,     0,     0,   301,     0,     0,     0,     0,
+     302,     0,     0,   303,     0,     0,     0,   304,   305,   306,
+       0,     0,   307,     0,     0,     0,     0,   308,   309,     0,
+       0,     0,     0,   310,   311,     0,   312,     0,     0,     0,
+       0,     0,   313,   314,   315,   316,   317,     0,     0,     0,
+     318,     0,     0,   319,   320,   321,     0,     0,     0,   322,
+       0,   323,   324,     0,   325,   326,   327,     0,     0,   328,
+     329,     0,   330,   331,   332,   333,   334,   335,     0,     0,
+     336,   337,   338,   339,   340,     0,     0,   341,   342,     0,
+     343,   344,   345,   346,   347,     0,     0,   348,   349,     0,
+       0,     0,   350,   351,     0,   352,     0,     0,     0,   353,
+       0,   354,   355,   356,   357,     0,   358,     0,   359,     0,
+       0,     0,   360,   361,     0,   362,     0,     0,   363,   364,
+       0,     0,     0,   365,   366,   367,   368,     0,     0,   369,
+     370,   371,     0,     0,   372,     0,     0,     0,     0,   373,
+     374,   375,     0,     0,     0,   376,     0,     0,     0,   377,
+     378,     0,   379,   380,     0,     0,     0,   381,     0,   382,
+       0,     0,   383,   384,     0,     0,   385,     0,     0,   386,
+     387,     0,     0,     0,     0,     0,   388,   389,     0,   390,
+       0,   391,     0,   392,   393,     0,     0,  1714,     0,     0,
+       0,     0,   394,     0,   395,   396,   397,   398,   399,   400,
+     401,   402,   403,   404,   405,   406,   407,   408,   409,   410,
+     411,     0,   412,   413,   414,     0,   415,   416,   417,   418,
+       0,   419,   420,     0,     0,     0,     0,   421,   422,   423,
+     424,   425,   426,     0,     0,   427,   428,     0,   429,     0,
+     430,     0,   431,   432,   433,   434,   435,   436,   437,   438,
+     439,     0,     0,   440,   441,     0,     0,   442,   443,   444,
+     445,   446,     0,     0,     0,   447,   448,     0,     0,  1715,
+     449,     0,   450,   451,     0,   452,   453,   454,     0,     0,
+     455,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     456,   457,   458,   818,   459,     0,   460,     0,   461,   462,
+     463,   464,   465,   466,   467,   468,   469,   470,     0,   471,
+       0,   472,   473,   474,     0,   475,     0,   476,   477,   478,
+     479,   480,     0,   481,   482,   483,     0,     0,   484,     0,
+       0,     0,   485,   486,     0,   487,   488,     0,     0,   489,
+     490,   491,   492,   493,     0,   494,   495,     0,   496,   497,
+     498,     0,     0,   499,   500,   501,   502,   503,   504,   505,
+     506,     0,   507,     0,   508,   509,     0,   510,   511,   512,
+       0,   513,     0,     0,   514,   515,   516,   517,     0,   518,
+       0,   519,   520,   521,   522,   523,     0,   524,   525,     0,
+       0,     0,   526,   527,   528,   529,     0,     0,     0,   530,
+       0,     0,     0,   531,     0,   532,   533,   534,   535,     0,
+     536,   537,   538,   539,   540,     0,     0,     0,     0,     0,
+     541,   542,   543,     0,   544,     0,     0,   545,     0,     0,
+     546,     0,   547,     0,   548,   549,   550,   551,   552,   553,
+       0,     0,   554,   555,     0,     0,   556,   557,   558,   559,
+     560,   561,     0,     0,   562,   563,   564,   565,     0,   566,
+     567,     0,     0,   568,   569,   570,   571,     0,     0,   572,
+     573,     0,   574,   575,   576,   577,     0,     0,     0,     0,
+       0,   578,   579,     0,     0,     0,   580,   581,   582,     0,
+    1716,   583,   584,     0,   585,   586,     0,   587,   588,     0,
+       0,   589,     0,     0,   590,     0,   591,     0,   592,   593,
+       0,     0,     0,     0,     0,   594,     0,   595,     0,     0,
+     596,     0,     0,     0,   597,     0,   598,   599,   600,   601,
+       0,     0,     0,     0,     0,     0,   602,   603,   604,     0,
+     605,   606,   607,   608,     0,     0,   609,     0,     0,   610,
+     611,   612,   613,   614,     0,   615,     0,     0,     0,     0,
+       0,     0,     0,     0,   616,   617,   618,     0,   619,   620,
+     621,     0,   622,     0,     0,   623,     0,   624,     0,     0,
+       0,     0,     0,     0,   625,   626,     0,     0,   627,     0,
+     628,     0,   629,   630,     0,     0,     0,   631,   632,   633,
+     634,   635,   636,   637,   638,     0,   639,   640,   641,   642,
+     643,   644,   645,   646,   647,   648,     0,   649,   650,   651,
+     652,   653,   654,   655,   656,   657,   658,   659,   660,   661,
+     662,   663,   664,   665,   666,   667,   668,   669,   670,   671,
+     672,     0,   673,   674,   675,   676,   677,   678,   679,     0,
+     680,   681,   682,   683,   684,   685,   686,   687,   688,   689,
+     690,   691,   692,   693,   694,   695,   696,   697,   698,   699,
+     700,   701,   702,   703,   704,   705,   706,   707,   708,   709,
+     710,   711,   712,   713,   714,   715,   716,   717,   718,   719,
+     720,   243,   244,     0,   245,   246,   247,   248,   249,     0,
+       0,   250,     0,     0,     0,     0,   251,     0,     0,   252,
+       0,   253,   254,   255,   256,   257,   258,     0,   259,     0,
+       0,  1514,   260,     0,     0,     0,   261,     0,     0,   262,
+     263,   264,     0,   265,     0,   266,   267,     0,     0,   268,
+       0,     0,   269,   270,     0,   271,   272,   273,     0,   274,
+       0,   275,   276,   277,   278,   279,   280,     0,   281,   282,
+       0,   283,   284,   285,   286,   287,   288,   289,   290,   291,
+     292,   293,     0,   294,   295,     0,   296,   297,   298,   299,
+     300,     0,     0,     0,   301,     0,     0,     0,     0,   302,
+       0,     0,   303,     0,     0,     0,   304,   305,   306,     0,
+       0,   307,     0,     0,     0,     0,   308,   309,     0,     0,
+       0,  3874,   310,   311,     0,   312,     0,     0,     0,     0,
+       0,   313,   314,   315,   316,   317,     0,     0,     0,   318,
+       0,     0,   319,   320,   321,     0,     0,     0,   322,     0,
+     323,   324,     0,   325,   326,   327,     0,     0,   328,   329,
+       0,   330,   331,   332,   333,   334,   335,     0,     0,   336,
+     337,   338,   339,   340,     0,     0,   341,   342,     0,   343,
+     344,   345,   346,   347,     0,     0,   348,   349,     0,     0,
+       0,   350,   351,     0,   352,     0,     0,     0,   353,     0,
+     354,   355,   356,   357,     0,   358,     0,   359,     0,     0,
+       0,   360,   361,     0,   362,     0,     0,   363,   364,     0,
+       0,     0,   365,   366,   367,   368,     0,     0,   369,   370,
+     371,     0,     0,   372,     0,     0,     0,     0,   373,   374,
+     375,     0,     0,     0,   376,     0,     0,     0,   377,   378,
+       0,   379,   380,     0,     0,     0,   381,     0,   382,     0,
+       0,   383,   384,     0,     0,   385,     0,     0,   386,   387,
+    1142,     0,     0,     0,     0,   388,   389,     0,   390,     0,
+     391,     0,   392,   393,     0,     0,     0,     0,     0,     0,
+       0,   394,     0,   395,   396,   397,   398,   399,   400,   401,
+     402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
+       0,   412,   413,   414,     0,   415,   416,   417,   418,     0,
+     419,   420,     0,     0,     0,     0,   421,   422,   423,   424,
+     425,   426,     0,     0,   427,   428,     0,   429,     0,   430,
+       0,   431,   432,   433,   434,   435,   436,   437,   438,   439,
+       0,     0,   440,   441,     0,     0,   442,   443,   444,   445,
+     446,     0,     0,     0,   447,   448,     0,     0,     0,   449,
+       0,   450,   451,     0,   452,   453,   454,     0,     0,   455,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   456,
+     457,   458,     0,   459,     0,   460,     0,   461,   462,   463,
+     464,   465,   466,   467,   468,   469,   470,     0,   471,     0,
+     472,   473,   474,     0,   475,     0,   476,   477,   478,   479,
+     480,     0,   481,   482,   483,     0,     0,   484,     0,     0,
+       0,   485,   486,     0,   487,   488,     0,     0,   489,   490,
+     491,   492,   493,     0,   494,   495,     0,   496,   497,   498,
+       0,     0,   499,   500,   501,   502,   503,   504,   505,   506,
+       0,   507,     0,   508,   509,     0,   510,   511,   512,     0,
+     513,     0,     0,   514,   515,   516,   517,     0,   518,     0,
+     519,   520,   521,   522,   523,     0,   524,   525,     0,     0,
+       0,   526,   527,   528,   529,     0,     0,     0,   530,     0,
+       0,     0,   531,     0,   532,   533,   534,   535,     0,   536,
+     537,   538,   539,   540,     0,     0,     0,     0,     0,   541,
+     542,   543,     0,   544,     0,     0,   545,     0,     0,   546,
+       0,   547,     0,   548,   549,   550,   551,   552,   553,     0,
+       0,   554,   555,     0,     0,   556,   557,   558,   559,   560,
+     561,     0,     0,   562,   563,   564,   565,     0,   566,   567,
+       0,     0,   568,   569,   570,   571,     0,   240,   572,   573,
+       0,   574,   575,   576,   577,     0,     0,     0,     0,     0,
+     578,   579,     0,     0,     0,   580,   581,   582,     0,     0,
+     583,   584,     0,   585,   586,     0,   587,   588,     0,     0,
+     589,     0,     0,   590,     0,   591,     0,   592,   593,     0,
+       0,     0,     0,     0,   594,     0,   595,     0,     0,   596,
+       0,     0,     0,   597,     0,   598,   599,   600,   601,     0,
+       0,     0,     0,     0,     0,   602,   603,   604,     0,   605,
+     606,   607,   608,     0,     0,   609,     0,     0,   610,   611,
+     612,   613,   614,     0,   615,     0,     0,     0,     0,     0,
+       0,     0,     0,   616,   617,   618,     0,   619,   620,   621,
+       0,   622,     0,     0,   623,     0,   624,     0,     0,     0,
+       0,     0,     0,   625,   626,     0,     0,   627,     0,   628,
+       0,   629,   630,     0,     0,     0,   631,   632,   633,   634,
+     635,   636,   637,   638,     0,   639,   640,   641,   642,   643,
+     644,   645,   646,   647,   648,     0,   649,   650,   651,   652,
+     653,   654,   655,   656,   657,   658,   659,   660,   661,   662,
+     663,   664,   665,   666,   667,   668,   669,   670,   671,   672,
+       0,   673,   674,   675,   676,   677,   678,   679,     0,   680,
+     681,   682,   683,   684,   685,   686,   687,   688,   689,   690,
+     691,   692,   693,   694,   695,   696,   697,   698,   699,   700,
+     701,   702,   703,   704,   705,   706,   707,   708,   709,   710,
+     711,   712,   713,   714,   715,   716,   717,   718,   719,   720,
+     243,   244,     0,   245,   246,   247,   248,   249,     0,     0,
+     250,     0,     0,     0,     0,   251,     0,     0,   252,     0,
+     253,   254,   255,   256,   257,   258,     0,   259,     0,     0,
+       0,   260,     0,     0,     0,   261,     0,     0,   262,   263,
+     264,     0,   265,     0,   266,   267,     0,     0,   268,     0,
+       0,   269,   270,     0,   271,   272,   273,     0,   274,     0,
+     275,   276,   277,   278,   279,   280,     0,   281,   282,     0,
+     283,   284,   285,   286,   287,   288,   289,   290,   291,   292,
+     293,     0,   294,   295,     0,   296,   297,   298,   299,   300,
+       0,     0,     0,   301,     0,     0,     0,     0,   302,  1141,
+       0,   303,     0,     0,     0,   304,   305,   306,     0,     0,
+     307,     0,     0,     0,     0,   308,   309,     0,     0,     0,
+       0,   310,   311,     0,   312,     0,     0,     0,     0,     0,
+     313,   314,   315,   316,   317,     0,     0,     0,   318,     0,
+       0,   319,   320,   321,     0,     0,     0,   322,     0,   323,
+     324,     0,   325,   326,   327,     0,     0,   328,   329,     0,
+     330,   331,   332,   333,   334,   335,     0,     0,   336,   337,
+     338,   339,   340,     0,     0,   341,   342,     0,   343,   344,
+     345,   346,   347,     0,     0,   348,   349,     0,     0,     0,
+     350,   351,     0,   352,     0,     0,     0,   353,     0,   354,
+     355,   356,   357,     0,   358,     0,   359,     0,     0,     0,
+     360,   361,     0,   362,     0,     0,   363,   364,     0,     0,
+       0,   365,   366,   367,   368,     0,     0,   369,   370,   371,
+       0,     0,   372,     0,     0,     0,     0,   373,   374,   375,
+       0,     0,     0,   376,     0,     0,     0,   377,   378,     0,
+     379,   380,     0,     0,     0,   381,     0,   382,     0,     0,
+     383,   384,     0,     0,   385,     0,     0,   386,   387,  1142,
+       0,     0,     0,     0,   388,   389,     0,   390,     0,   391,
+       0,   392,   393,     0,     0,     0,     0,     0,     0,     0,
+     394,     0,   395,   396,   397,   398,   399,   400,   401,   402,
+     403,   404,   405,   406,   407,   408,   409,   410,   411,     0,
+     412,   413,   414,     0,   415,   416,   417,   418,     0,   419,
+     420,     0,     0,     0,     0,   421,   422,   423,   424,   425,
+     426,     0,     0,   427,   428,     0,   429,     0,   430,     0,
+     431,   432,   433,   434,   435,   436,   437,   438,   439,     0,
+       0,   440,   441,     0,     0,   442,   443,   444,   445,   446,
+       0,     0,     0,   447,   448,     0,     0,     0,   449,     0,
+     450,   451,     0,   452,   453,   454,     0,     0,   455,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   456,   457,
+     458,     0,   459,     0,   460,     0,   461,   462,   463,   464,
+     465,   466,   467,   468,   469,   470,     0,   471,     0,   472,
+     473,   474,     0,   475,     0,   476,   477,   478,   479,   480,
+       0,   481,   482,   483,     0,     0,   484,     0,     0,     0,
+     485,   486,     0,   487,   488,     0,     0,   489,   490,   491,
+     492,   493,     0,   494,   495,     0,   496,   497,   498,     0,
+       0,   499,   500,   501,   502,   503,   504,   505,   506,     0,
+     507,     0,   508,   509,     0,   510,   511,   512,     0,   513,
+       0,     0,   514,   515,   516,   517,     0,   518,     0,   519,
+     520,   521,   522,   523,     0,   524,   525,     0,     0,     0,
+     526,   527,   528,   529,     0,     0,     0,   530,     0,     0,
+       0,   531,     0,   532,   533,   534,   535,     0,   536,   537,
+     538,   539,   540,     0,     0,     0,     0,     0,   541,   542,
+     543,     0,   544,     0,     0,   545,     0,     0,   546,     0,
+     547,     0,   548,   549,   550,   551,   552,   553,     0,     0,
+     554,   555,     0,     0,   556,   557,   558,   559,   560,   561,
+       0,     0,   562,   563,   564,   565,     0,   566,   567,     0,
+       0,   568,   569,   570,   571,     0,   240,   572,   573,     0,
+     574,   575,   576,   577,     0,     0,     0,     0,     0,   578,
+     579,     0,     0,     0,   580,   581,   582,     0,     0,   583,
+     584,     0,   585,   586,     0,   587,   588,     0,     0,   589,
+       0,     0,   590,     0,   591,     0,  1143,   593,     0,     0,
+       0,     0,     0,   594,     0,   595,     0,     0,   596,     0,
+       0,     0,   597,     0,   598,   599,   600,   601,     0,     0,
+       0,     0,     0,     0,   602,   603,   604,     0,   605,   606,
+     607,   608,     0,     0,   609,     0,     0,   610,   611,   612,
+     613,   614,     0,   615,     0,     0,     0,     0,     0,     0,
+       0,     0,   616,   617,   618,     0,   619,   620,   621,     0,
+     622,     0,     0,   623,     0,   624,     0,     0,     0,     0,
+       0,     0,   625,   626,     0,     0,   627,     0,   628,     0,
+     629,   630,     0,     0,     0,   631,   632,   633,   634,   635,
+     636,   637,   638,     0,   639,   640,   641,   642,   643,   644,
+     645,   646,   647,   648,     0,   649,   650,   651,   652,   653,
+     654,   655,   656,   657,   658,   659,   660,   661,   662,   663,
+     664,   665,   666,   667,   668,   669,   670,   671,   672,     0,
+     673,   674,   675,   676,   677,   678,   679,     0,   680,   681,
+     682,   683,   684,   685,   686,   687,   688,   689,   690,   691,
+     692,   693,   694,   695,   696,   697,   698,   699,   700,   701,
+     702,   703,   704,   705,   706,   707,   708,   709,   710,   711,
+     712,   713,   714,   715,   716,   717,   718,   719,   720,   243,
+     244,     0,   245,   246,   247,   248,   249,     0,     0,   250,
+       0,     0,     0,     0,   251,     0,     0,   252,     0,   253,
+     254,   255,   256,   257,   258,     0,   259,     0,     0,     0,
+     260,     0,     0,     0,   261,     0,     0,   262,   263,   264,
+       0,   265,     0,   266,   267,     0,     0,   268,     0,     0,
+     269,   270,     0,   271,   272,   273,     0,   274,     0,   275,
+     276,   277,   278,   279,   280,     0,   281,   282,     0,   283,
+     284,   285,   286,   287,   288,   289,   290,   291,   292,   293,
+       0,   294,   295,     0,   296,   297,   298,   299,   300,     0,
+       0,     0,   301,     0,     0,     0,     0,   302,  1141,     0,
+     303,     0,     0,     0,   304,   305,   306,     0,     0,   307,
+       0,     0,     0,     0,   308,   309,     0,     0,     0,     0,
+     310,   311,     0,   312,     0,     0,     0,     0,     0,   313,
+     314,   315,   316,   317,     0,     0,     0,   318,     0,     0,
+     319,   320,   321,     0,     0,     0,   322,     0,   323,   324,
+       0,   325,   326,   327,     0,     0,   328,   329,     0,   330,
+     331,   332,   333,   334,   335,     0,     0,   336,   337,   338,
+     339,   340,     0,     0,   341,   342,     0,   343,   344,   345,
+     346,   347,     0,     0,   348,   349,     0,     0,     0,   350,
+     351,     0,   352,     0,     0,     0,   353,     0,   354,   355,
+     356,   357,     0,   358,     0,   359,     0,     0,     0,   360,
+     361,     0,   362,     0,     0,   363,   364,     0,     0,     0,
+     365,   366,   367,   368,     0,     0,   369,   370,   371,     0,
+       0,   372,     0,     0,     0,     0,   373,   374,   375,     0,
+       0,     0,   376,     0,     0,     0,   377,   378,     0,   379,
+     380,     0,     0,     0,   381,     0,   382,     0,     0,   383,
+     384,     0,     0,   385,     0,     0,   386,   387,  1142,     0,
+       0,     0,     0,   388,   389,     0,   390,     0,   391,     0,
+     392,   393,     0,     0,     0,     0,     0,     0,     0,   394,
+       0,   395,   396,   397,   398,   399,   400,   401,   402,   403,
+     404,   405,   406,   407,   408,   409,   410,   411,     0,   412,
+     413,   414,     0,   415,   416,   417,   418,     0,   419,   420,
+       0,     0,     0,     0,   421,   422,   423,   424,   425,   426,
+       0,     0,   427,   428,     0,   429,     0,   430,     0,   431,
+     432,   433,   434,   435,   436,   437,   438,   439,     0,     0,
+     440,   441,     0,     0,   442,   443,   444,   445,   446,     0,
+       0,     0,   447,   448,     0,     0,     0,   449,     0,   450,
+     451,     0,   452,   453,   454,     0,     0,   455,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   456,   457,   458,
+       0,   459,     0,   460,     0,   461,   462,   463,   464,   465,
+     466,   467,   468,   469,   470,     0,   471,     0,   472,   473,
+     474,     0,   475,     0,   476,   477,   478,   479,   480,     0,
+     481,   482,   483,     0,     0,   484,     0,     0,     0,   485,
+     486,     0,   487,   488,     0,     0,   489,   490,   491,   492,
+     493,     0,   494,   495,     0,   496,   497,   498,     0,     0,
+     499,   500,   501,   502,   503,   504,   505,   506,     0,   507,
+       0,   508,   509,     0,   510,   511,   512,     0,   513,     0,
+       0,   514,   515,   516,   517,     0,   518,     0,   519,   520,
+     521,   522,   523,     0,   524,   525,     0,     0,     0,   526,
+     527,   528,   529,     0,     0,     0,   530,     0,     0,     0,
+     531,     0,   532,   533,   534,   535,     0,   536,   537,   538,
+     539,   540,     0,     0,     0,     0,     0,   541,   542,   543,
+       0,   544,     0,     0,   545,     0,     0,   546,     0,   547,
+       0,   548,   549,   550,   551,   552,   553,     0,     0,   554,
+     555,     0,     0,   556,   557,   558,   559,   560,   561,     0,
+       0,   562,   563,   564,   565,     0,   566,   567,     0,     0,
+     568,   569,   570,   571,     0,   240,   572,   573,     0,   574,
+     575,   576,   577,     0,     0,     0,     0,     0,   578,   579,
+       0,     0,     0,   580,   581,   582,     0,     0,   583,   584,
+       0,   585,   586,     0,   587,   588,     0,     0,   589,     0,
+       0,   590,     0,   591,     0,   592,   593,     0,     0,     0,
+       0,     0,   594,     0,   595,     0,     0,   596,     0,     0,
+       0,   597,     0,   598,   599,   600,   601,     0,     0,     0,
+       0,     0,     0,   602,   603,   604,     0,   605,   606,   607,
+     608,     0,     0,   609,     0,     0,   610,   611,   612,   613,
+     614,     0,   615,     0,     0,     0,     0,     0,     0,     0,
+       0,   616,   617,   618,     0,   619,   620,   621,     0,   622,
+       0,     0,   623,     0,   624,     0,     0,     0,     0,     0,
+       0,   625,   626,     0,     0,   627,     0,   628,     0,   629,
+     630,     0,     0,     0,   631,   632,   633,   634,   635,   636,
+     637,   638,     0,   639,   640,   641,   642,   643,   644,   645,
+     646,   647,   648,     0,   649,   650,   651,   652,   653,   654,
+     655,   656,   657,   658,   659,   660,   661,   662,   663,   664,
+     665,   666,   667,   668,   669,   670,   671,   672,     0,   673,
+     674,   675,   676,   677,   678,   679,     0,   680,   681,   682,
+     683,   684,   685,   686,   687,   688,   689,   690,   691,   692,
+     693,   694,   695,   696,   697,   698,   699,   700,   701,   702,
+     703,   704,   705,   706,   707,   708,   709,   710,   711,   712,
+     713,   714,   715,   716,   717,   718,   719,   720,   243,   244,
+       0,   245,   246,   247,   248,   249,  1568,     0,   250,     0,
+       0,     0,     0,   251,     0,     0,   252,     0,   253,   254,
+     255,   256,   257,   258,     0,   259,     0,     0,     0,   260,
+       0,     0,     0,   261,     0,     0,   262,   263,   264,     0,
+     265,     0,   266,   267,     0,     0,   268,     0,     0,   269,
+     270,     0,   271,   272,   273,     0,   274,     0,   275,   276,
+     277,   278,   279,   280,     0,   281,   282,     0,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,     0,
+     294,   295,     0,   296,   297,   298,   299,   300,     0,     0,
+       0,   301,     0,     0,     0,     0,   302,     0,     0,   303,
+       0,     0,     0,   304,   305,   306,     0,     0,   307,     0,
+       0,     0,     0,   308,   309,     0,     0,     0,     0,   310,
+     311,     0,   312,     0,     0,     0,     0,     0,   313,   314,
+     315,   316,   317,     0,     0,     0,   318,     0,     0,   319,
+     320,   321,     0,     0,     0,   322,     0,   323,   324,     0,
+     325,   326,   327,     0,     0,   328,   329,     0,   330,   331,
+     332,   333,   334,   335,     0,     0,   336,   337,   338,   339,
+     340,     0,     0,   341,   342,     0,   343,   344,   345,   346,
+     347,     0,     0,   348,   349,     0,     0,     0,   350,   351,
+       0,   352,     0,     0,     0,   353,     0,   354,   355,   356,
+     357,     0,   358,     0,   359,     0,     0,     0,   360,   361,
+       0,   362,     0,     0,   363,   364,     0,     0,     0,   365,
+     366,   367,   368,     0,     0,   369,   370,   371,     0,     0,
+     372,     0,     0,     0,     0,   373,   374,   375,     0,     0,
+       0,   376,     0,     0,     0,   377,   378,     0,   379,   380,
+       0,     0,     0,   381,     0,   382,     0,     0,   383,   384,
+       0,     0,   385,     0,     0,   386,   387,  1142,     0,     0,
+       0,     0,   388,   389,     0,   390,     0,   391,     0,   392,
+     393,     0,     0,     0,     0,     0,     0,     0,   394,     0,
+     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
+     405,   406,   407,   408,   409,   410,   411,     0,   412,   413,
+     414,     0,   415,   416,   417,   418,     0,   419,   420,     0,
+       0,     0,     0,   421,   422,   423,   424,   425,   426,     0,
+       0,   427,   428,     0,   429,     0,   430,     0,   431,   432,
+     433,   434,   435,   436,   437,   438,   439,     0,     0,   440,
+     441,     0,     0,   442,   443,   444,   445,   446,     0,     0,
+       0,   447,   448,     0,     0,     0,   449,     0,   450,   451,
+       0,   452,   453,   454,     0,     0,   455,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   456,   457,   458,     0,
+     459,     0,   460,     0,   461,   462,   463,   464,   465,   466,
+     467,   468,   469,   470,     0,   471,     0,   472,   473,   474,
+       0,   475,     0,   476,   477,   478,   479,   480,     0,   481,
+     482,   483,     0,     0,   484,     0,     0,     0,   485,   486,
+       0,   487,   488,     0,     0,   489,   490,   491,   492,   493,
+       0,   494,   495,     0,   496,   497,   498,     0,     0,   499,
+     500,   501,   502,   503,   504,   505,   506,     0,   507,     0,
+     508,   509,     0,   510,   511,   512,     0,   513,     0,     0,
+     514,   515,   516,   517,     0,   518,     0,   519,   520,   521,
+     522,   523,     0,   524,   525,     0,     0,     0,   526,   527,
+     528,   529,     0,     0,     0,   530,     0,     0,     0,   531,
+       0,   532,   533,   534,   535,     0,   536,   537,   538,   539,
+     540,     0,     0,     0,     0,     0,   541,   542,   543,     0,
+     544,     0,     0,   545,     0,     0,   546,     0,   547,     0,
+     548,   549,   550,   551,   552,   553,     0,     0,   554,   555,
+       0,     0,   556,   557,   558,   559,   560,   561,     0,     0,
+     562,   563,   564,   565,     0,   566,   567,     0,     0,   568,
+     569,   570,   571,     0,   240,   572,   573,     0,   574,   575,
+     576,   577,     0,     0,     0,     0,     0,   578,   579,     0,
+       0,     0,   580,   581,   582,     0,     0,   583,   584,     0,
+     585,   586,     0,   587,   588,     0,     0,   589,     0,     0,
+     590,     0,   591,     0,   592,   593,     0,     0,     0,     0,
+       0,   594,     0,   595,     0,     0,   596,     0,     0,     0,
+     597,     0,   598,   599,   600,   601,     0,     0,     0,     0,
+       0,     0,   602,   603,   604,     0,   605,   606,   607,   608,
+       0,     0,   609,     0,     0,   610,   611,   612,   613,   614,
+       0,   615,     0,     0,     0,     0,     0,     0,     0,     0,
+     616,   617,   618,     0,   619,   620,   621,     0,   622,     0,
+       0,   623,     0,   624,     0,     0,     0,     0,     0,     0,
+     625,   626,     0,     0,   627,     0,   628,     0,   629,   630,
+       0,     0,     0,   631,   632,   633,   634,   635,   636,   637,
+     638,     0,   639,   640,   641,   642,   643,   644,   645,   646,
+     647,   648,     0,   649,   650,   651,   652,   653,   654,   655,
+     656,   657,   658,   659,   660,   661,   662,   663,   664,   665,
+     666,   667,   668,   669,   670,   671,   672,     0,   673,   674,
+     675,   676,   677,   678,   679,     0,   680,   681,   682,   683,
+     684,   685,   686,   687,   688,   689,   690,   691,   692,   693,
+     694,   695,   696,   697,   698,   699,   700,   701,   702,   703,
+     704,   705,   706,   707,   708,   709,   710,   711,   712,   713,
+     714,   715,   716,   717,   718,   719,   720,   243,   244,     0,
+     245,   246,   247,   248,   249,     0,     0,   250,     0,     0,
+       0,     0,   251,     0,     0,   252,     0,   253,   254,   255,
+     256,   257,   258,     0,   259,     0,     0,     0,   260,  1637,
+       0,     0,   261,     0,     0,   262,   263,   264,     0,   265,
+       0,   266,   267,     0,     0,   268,     0,     0,   269,   270,
+       0,   271,   272,   273,     0,   274,     0,   275,   276,   277,
+     278,   279,   280,     0,   281,   282,     0,   283,   284,   285,
+     286,   287,   288,   289,   290,   291,   292,   293,     0,   294,
+     295,     0,   296,   297,   298,   299,   300,     0,     0,     0,
+     301,     0,     0,     0,     0,   302,     0,     0,   303,     0,
+       0,     0,   304,   305,   306,     0,     0,   307,     0,     0,
+       0,     0,   308,   309,     0,     0,     0,     0,   310,   311,
+       0,   312,     0,     0,     0,     0,     0,   313,   314,   315,
+     316,   317,     0,     0,     0,   318,     0,     0,   319,   320,
+     321,     0,     0,     0,   322,     0,   323,   324,     0,   325,
+     326,   327,     0,     0,   328,   329,     0,   330,   331,   332,
+     333,   334,   335,     0,     0,   336,   337,   338,   339,   340,
+       0,     0,   341,   342,     0,   343,   344,   345,   346,   347,
+       0,     0,   348,   349,     0,     0,     0,   350,   351,     0,
+     352,     0,     0,     0,   353,     0,   354,   355,   356,   357,
+       0,   358,     0,   359,     0,     0,     0,   360,   361,     0,
+     362,  1638,     0,   363,   364,     0,     0,     0,   365,   366,
+     367,   368,     0,     0,   369,   370,   371,     0,     0,   372,
+       0,     0,     0,     0,   373,   374,   375,     0,     0,     0,
+     376,     0,     0,     0,   377,   378,     0,   379,   380,     0,
+       0,     0,   381,     0,   382,     0,     0,   383,   384,     0,
+       0,   385,     0,     0,   386,   387,     0,     0,     0,     0,
+       0,   388,   389,     0,   390,     0,   391,     0,   392,   393,
+       0,     0,     0,     0,     0,     0,     0,   394,     0,   395,
+     396,   397,   398,   399,   400,   401,   402,   403,   404,   405,
+     406,   407,   408,   409,   410,   411,     0,   412,   413,   414,
+       0,   415,   416,   417,   418,     0,   419,   420,     0,     0,
+       0,     0,   421,   422,   423,   424,   425,   426,     0,     0,
+     427,   428,     0,   429,     0,   430,     0,   431,   432,   433,
+     434,   435,   436,   437,   438,   439,     0,     0,   440,   441,
+       0,     0,   442,   443,   444,   445,   446,     0,     0,     0,
+     447,   448,     0,     0,     0,   449,     0,   450,   451,     0,
+     452,   453,   454,     0,     0,   455,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   456,   457,   458,     0,   459,
+       0,   460,     0,   461,   462,   463,   464,   465,   466,   467,
+     468,   469,   470,     0,   471,     0,   472,   473,   474,     0,
+     475,     0,   476,   477,   478,   479,   480,     0,   481,   482,
+     483,     0,     0,   484,     0,     0,     0,   485,   486,     0,
+     487,   488,     0,     0,   489,   490,   491,   492,   493,     0,
+     494,   495,     0,   496,   497,   498,     0,     0,   499,   500,
+     501,   502,   503,   504,   505,   506,     0,   507,     0,   508,
+     509,     0,   510,   511,   512,     0,   513,     0,     0,   514,
+     515,   516,   517,     0,   518,     0,   519,   520,   521,   522,
+     523,     0,   524,   525,     0,     0,     0,   526,   527,   528,
+     529,     0,     0,     0,   530,     0,     0,     0,   531,     0,
+     532,   533,   534,   535,     0,   536,   537,   538,   539,   540,
+       0,     0,     0,     0,     0,   541,   542,   543,     0,   544,
+       0,     0,   545,     0,     0,   546,     0,   547,     0,   548,
+     549,   550,   551,   552,   553,     0,     0,   554,   555,     0,
+       0,   556,   557,   558,   559,   560,   561,     0,     0,   562,
+     563,   564,   565,     0,   566,   567,     0,     0,   568,   569,
+     570,   571,     0,  1410,   572,   573,     0,   574,   575,   576,
+     577,     0,     0,     0,     0,     0,   578,   579,     0,     0,
+       0,   580,   581,   582,     0,     0,   583,   584,     0,   585,
+     586,     0,   587,   588,     0,     0,   589,     0,     0,   590,
+       0,   591,     0,   592,   593,     0,     0,     0,     0,     0,
+     594,     0,   595,     0,     0,   596,     0,     0,     0,   597,
+       0,   598,   599,   600,   601,     0,     0,     0,     0,     0,
+       0,   602,   603,   604,     0,   605,   606,   607,   608,     0,
+       0,   609,     0,     0,   610,   611,   612,   613,   614,     0,
+     615,     0,     0,     0,     0,     0,     0,     0,     0,   616,
+     617,   618,     0,   619,   620,   621,     0,   622,     0,     0,
+     623,     0,   624,     0,     0,     0,     0,     0,     0,   625,
+     626,     0,     0,   627,     0,   628,     0,   629,   630,     0,
+       0,     0,   631,   632,   633,   634,   635,   636,   637,   638,
+       0,   639,   640,   641,   642,   643,   644,   645,   646,   647,
+     648,     0,   649,   650,   651,   652,   653,   654,   655,   656,
+     657,   658,   659,   660,   661,   662,   663,   664,   665,   666,
+     667,   668,   669,   670,   671,   672,     0,   673,   674,   675,
+     676,   677,   678,   679,     0,   680,   681,   682,   683,   684,
+     685,   686,   687,   688,   689,   690,   691,   692,   693,   694,
+     695,   696,   697,   698,   699,   700,   701,   702,   703,   704,
+     705,   706,   707,   708,   709,   710,   711,   712,   713,   714,
+     715,   716,   717,   718,   719,   720,   243,   244,     0,   245,
+     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
+       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
+     257,   258,     0,   259,     0,     0,  3005,   260,     0,     0,
+       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
+     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
+     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
+     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
+     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
+       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
+       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
+       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
+       0,   308,   309,     0,     0,     0,     0,   310,   311,     0,
+     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
+     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
+       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
+     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
+     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
+       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
+       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
+       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
+     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
+       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
+     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
+       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
+       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
+       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
+     385,     0,     0,   386,   387,  1142,     0,     0,     0,     0,
+     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
+       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
+     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
+     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
+     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
+       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
+     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
+     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
+       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
+     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
+     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
+     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
+     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
+       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
+       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
+     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
+     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
+     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
+       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
+     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
+       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
+       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
+     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
+       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
+       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
+     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
+     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
+     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
+     571,     0,   240,   572,   573,     0,   574,   575,   576,   577,
+       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
+     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
+       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
+     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
+       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
+     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
+     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
+     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
+       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
+     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
+       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
+       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
+       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
+     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
+       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
+     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
+     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
+     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
+     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
+     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
+     706,   707,   708,   709,   710,   711,   712,   713,   714,   715,
+     716,   717,   718,   719,   720,   243,   244,     0,   245,   246,
+     247,   248,   249,     0,     0,   250,     0,     0,     0,     0,
+     251,     0,     0,   252,     0,   253,   254,   255,   256,   257,
+     258,     0,   259,     0,     0,     0,   260,     0,     0,     0,
+     261,     0,     0,   262,   263,   264,     0,   265,     0,   266,
+     267,     0,     0,   268,     0,     0,   269,   270,     0,   271,
+     272,   273,     0,   274,     0,   275,   276,   277,   278,   279,
+     280,     0,   281,   282,     0,   283,   284,   285,   286,   287,
+     288,   289,   290,   291,   292,   293,     0,   294,   295,     0,
+     296,   297,   298,   299,   300,     0,     0,     0,   301,     0,
+       0,     0,     0,   302,     0,     0,   303,     0,     0,     0,
+     304,   305,   306,     0,     0,   307,     0,     0,     0,     0,
+     308,   309,     0,     0,     0,     0,   310,   311,     0,   312,
+       0,     0,     0,     0,     0,   313,   314,   315,   316,   317,
+       0,     0,     0,   318,     0,     0,   319,   320,   321,     0,
+       0,     0,   322,     0,   323,   324,     0,   325,   326,   327,
+       0,     0,   328,   329,     0,   330,   331,   332,   333,   334,
+     335,     0,     0,   336,   337,   338,   339,   340,     0,     0,
+     341,   342,     0,   343,   344,   345,   346,   347,     0,     0,
+     348,   349,     0,     0,     0,   350,   351,     0,   352,     0,
+       0,     0,   353,     0,   354,   355,   356,   357,     0,   358,
+       0,   359,     0,     0,     0,   360,   361,     0,   362,     0,
+       0,   363,   364,     0,     0,     0,   365,   366,   367,   368,
+       0,     0,   369,   370,   371,     0,     0,   372,     0,     0,
+       0,     0,   373,   374,   375,     0,     0,     0,   376,     0,
+       0,     0,   377,   378,     0,   379,   380,     0,     0,     0,
+     381,     0,   382,     0,     0,   383,   384,     0,     0,   385,
+       0,     0,   386,   387,  1142,     0,     0,     0,     0,   388,
+     389,     0,   390,     0,   391,     0,   392,   393,     0,     0,
+       0,     0,     0,     0,     0,   394,     0,   395,   396,   397,
+     398,   399,   400,   401,   402,   403,   404,   405,   406,   407,
+     408,   409,   410,   411,     0,   412,   413,   414,     0,   415,
+     416,   417,   418,     0,   419,   420,     0,     0,     0,     0,
+     421,   422,   423,   424,   425,   426,     0,     0,   427,   428,
+       0,   429,     0,   430,     0,   431,   432,   433,   434,   435,
+     436,   437,   438,   439,     0,     0,   440,   441,     0,     0,
+     442,   443,   444,   445,   446,     0,     0,     0,   447,   448,
+       0,  3294,     0,   449,     0,   450,   451,     0,   452,   453,
+     454,     0,     0,   455,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   456,   457,   458,     0,   459,     0,   460,
+       0,   461,   462,   463,   464,   465,   466,   467,   468,   469,
+     470,     0,   471,     0,   472,   473,   474,     0,   475,     0,
+     476,   477,   478,   479,   480,     0,   481,   482,   483,     0,
+       0,   484,     0,     0,     0,   485,   486,     0,   487,   488,
+       0,     0,   489,   490,   491,   492,   493,     0,   494,   495,
+       0,   496,   497,   498,     0,     0,   499,   500,   501,   502,
+     503,   504,   505,   506,     0,   507,     0,   508,   509,     0,
+     510,   511,   512,     0,   513,     0,     0,   514,   515,   516,
+     517,     0,   518,     0,   519,   520,   521,   522,   523,     0,
+     524,   525,     0,     0,     0,   526,   527,   528,   529,     0,
+       0,     0,   530,     0,     0,     0,   531,     0,   532,   533,
+     534,   535,     0,   536,   537,   538,   539,   540,     0,     0,
+       0,     0,     0,   541,   542,   543,     0,   544,     0,     0,
+     545,     0,     0,   546,     0,   547,     0,   548,   549,   550,
+     551,   552,   553,     0,     0,   554,   555,     0,     0,   556,
+     557,   558,   559,   560,   561,     0,     0,   562,   563,   564,
+     565,     0,   566,   567,     0,     0,   568,   569,   570,   571,
+       0,   240,   572,   573,     0,   574,   575,   576,   577,     0,
+       0,     0,     0,     0,   578,   579,     0,     0,     0,   580,
+     581,   582,     0,     0,   583,   584,     0,   585,   586,     0,
+     587,   588,     0,     0,   589,     0,     0,   590,     0,   591,
+       0,   592,   593,     0,     0,     0,     0,     0,   594,     0,
+     595,     0,     0,   596,     0,     0,     0,   597,     0,   598,
+     599,   600,   601,     0,     0,     0,     0,     0,     0,   602,
+     603,   604,     0,   605,   606,   607,   608,     0,     0,   609,
+       0,     0,   610,   611,   612,   613,   614,     0,   615,     0,
+       0,     0,     0,     0,     0,     0,     0,   616,   617,   618,
+       0,   619,   620,   621,     0,   622,     0,     0,   623,     0,
+     624,     0,     0,     0,     0,     0,     0,   625,   626,     0,
+       0,   627,     0,   628,     0,   629,   630,     0,     0,     0,
+     631,   632,   633,   634,   635,   636,   637,   638,     0,   639,
+     640,   641,   642,   643,   644,   645,   646,   647,   648,     0,
+     649,   650,   651,   652,   653,   654,   655,   656,   657,   658,
+     659,   660,   661,   662,   663,   664,   665,   666,   667,   668,
+     669,   670,   671,   672,     0,   673,   674,   675,   676,   677,
+     678,   679,     0,   680,   681,   682,   683,   684,   685,   686,
+     687,   688,   689,   690,   691,   692,   693,   694,   695,   696,
+     697,   698,   699,   700,   701,   702,   703,   704,   705,   706,
+     707,   708,   709,   710,   711,   712,   713,   714,   715,   716,
+     717,   718,   719,   720,   243,   244,     0,   245,   246,   247,
+     248,   249,     0,     0,   250,     0,     0,     0,     0,   251,
+       0,     0,   252,     0,   253,   254,   255,   256,   257,   258,
+       0,   259,     0,     0,  1514,   260,     0,     0,     0,   261,
+       0,     0,   262,   263,   264,     0,   265,     0,   266,   267,
+       0,     0,   268,     0,     0,   269,   270,     0,   271,   272,
+     273,     0,   274,     0,   275,   276,   277,   278,   279,   280,
+       0,   281,   282,     0,   283,   284,   285,   286,   287,   288,
+     289,   290,   291,   292,   293,     0,   294,   295,     0,   296,
+     297,   298,   299,   300,     0,     0,     0,   301,     0,     0,
+       0,     0,   302,     0,     0,   303,     0,     0,     0,   304,
+     305,   306,     0,     0,   307,     0,     0,     0,     0,   308,
+     309,     0,     0,     0,     0,   310,   311,     0,   312,     0,
+       0,     0,     0,     0,   313,   314,   315,   316,   317,     0,
+       0,     0,   318,     0,     0,   319,   320,   321,     0,     0,
+       0,   322,     0,   323,   324,     0,   325,   326,   327,     0,
+       0,   328,   329,     0,   330,   331,   332,   333,   334,   335,
+       0,     0,   336,   337,   338,   339,   340,     0,     0,   341,
+     342,     0,   343,   344,   345,   346,   347,     0,     0,   348,
+     349,     0,     0,     0,   350,   351,     0,   352,     0,     0,
+       0,   353,     0,   354,   355,   356,   357,     0,   358,     0,
+     359,     0,     0,     0,   360,   361,     0,   362,     0,     0,
+     363,   364,     0,     0,     0,   365,   366,   367,   368,     0,
+       0,   369,   370,   371,     0,     0,   372,     0,     0,     0,
+       0,   373,   374,   375,     0,     0,     0,   376,     0,     0,
+       0,   377,   378,     0,   379,   380,     0,     0,     0,   381,
+       0,   382,     0,     0,   383,   384,     0,     0,   385,     0,
+       0,   386,   387,  1142,     0,     0,     0,     0,   388,   389,
+       0,   390,     0,   391,     0,   392,   393,     0,     0,     0,
+       0,     0,     0,     0,   394,     0,   395,   396,   397,   398,
+     399,   400,   401,   402,   403,   404,   405,   406,   407,   408,
+     409,   410,   411,     0,   412,   413,   414,     0,   415,   416,
+     417,   418,     0,   419,   420,     0,     0,     0,     0,   421,
+     422,   423,   424,   425,   426,     0,     0,   427,   428,     0,
+     429,     0,   430,     0,   431,   432,   433,   434,   435,   436,
+     437,   438,   439,     0,     0,   440,   441,     0,     0,   442,
+     443,   444,   445,   446,     0,     0,     0,   447,   448,     0,
+       0,     0,   449,     0,   450,   451,     0,   452,   453,   454,
+       0,     0,   455,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   456,   457,   458,     0,   459,     0,   460,     0,
+     461,   462,   463,   464,   465,   466,   467,   468,   469,   470,
+       0,   471,     0,   472,   473,   474,     0,   475,     0,   476,
+     477,   478,   479,   480,     0,   481,   482,   483,     0,     0,
+     484,     0,     0,     0,   485,   486,     0,   487,   488,     0,
+       0,   489,   490,   491,   492,   493,     0,   494,   495,     0,
+     496,   497,   498,     0,     0,   499,   500,   501,   502,   503,
+     504,   505,   506,     0,   507,     0,   508,   509,     0,   510,
+     511,   512,     0,   513,     0,     0,   514,   515,   516,   517,
+       0,   518,     0,   519,   520,   521,   522,   523,     0,   524,
+     525,     0,     0,     0,   526,   527,   528,   529,     0,     0,
+       0,   530,     0,     0,     0,   531,     0,   532,   533,   534,
+     535,     0,   536,   537,   538,   539,   540,     0,     0,     0,
+       0,     0,   541,   542,   543,     0,   544,     0,     0,   545,
+       0,     0,   546,     0,   547,     0,   548,   549,   550,   551,
+     552,   553,     0,     0,   554,   555,     0,     0,   556,   557,
+     558,   559,   560,   561,     0,     0,   562,   563,   564,   565,
+       0,   566,   567,     0,     0,   568,   569,   570,   571,     0,
+     240,   572,   573,     0,   574,   575,   576,   577,     0,     0,
+       0,     0,     0,   578,   579,     0,     0,     0,   580,   581,
+     582,     0,     0,   583,   584,     0,   585,   586,     0,   587,
+     588,     0,     0,   589,     0,     0,   590,     0,   591,     0,
+     592,   593,     0,     0,     0,     0,     0,   594,     0,   595,
+       0,     0,   596,     0,     0,     0,   597,     0,   598,   599,
+     600,   601,     0,     0,     0,     0,     0,     0,   602,   603,
+     604,     0,   605,   606,   607,   608,     0,     0,   609,     0,
+       0,   610,   611,   612,   613,   614,     0,   615,     0,     0,
+       0,     0,     0,     0,     0,     0,   616,   617,   618,     0,
+     619,   620,   621,     0,   622,     0,     0,   623,     0,   624,
+       0,     0,     0,     0,     0,     0,   625,   626,     0,     0,
+     627,     0,   628,     0,   629,   630,     0,     0,     0,   631,
+     632,   633,   634,   635,   636,   637,   638,     0,   639,   640,
+     641,   642,   643,   644,   645,   646,   647,   648,     0,   649,
+     650,   651,   652,   653,   654,   655,   656,   657,   658,   659,
+     660,   661,   662,   663,   664,   665,   666,   667,   668,   669,
+     670,   671,   672,     0,   673,   674,   675,   676,   677,   678,
+     679,     0,   680,   681,   682,   683,   684,   685,   686,   687,
+     688,   689,   690,   691,   692,   693,   694,   695,   696,   697,
+     698,   699,   700,   701,   702,   703,   704,   705,   706,   707,
+     708,   709,   710,   711,   712,   713,   714,   715,   716,   717,
+     718,   719,   720,   243,   244,     0,   245,   246,   247,   248,
+     249,     0,     0,   250,     0,     0,     0,     0,   251,     0,
+       0,   252,     0,   253,   254,   255,   256,   257,   258,     0,
+     259,     0,     0,     0,   260,     0,     0,     0,   261,     0,
+       0,   262,   263,   264,     0,   265,     0,   266,   267,     0,
+       0,   268,     0,     0,   269,   270,     0,   271,   272,   273,
+       0,   274,     0,   275,   276,   277,   278,   279,   280,     0,
+     281,   282,     0,   283,   284,   285,   286,   287,   288,   289,
+     290,   291,   292,   293,     0,   294,   295,     0,   296,   297,
+     298,   299,   300,     0,     0,     0,   301,     0,     0,     0,
+       0,   302,     0,     0,   303,     0,     0,     0,   304,   305,
+     306,     0,     0,   307,     0,     0,     0,     0,   308,   309,
+       0,     0,     0,     0,   310,   311,     0,   312,     0,     0,
+       0,     0,     0,   313,   314,   315,   316,   317,     0,     0,
+       0,   318,     0,     0,   319,   320,   321,     0,     0,     0,
+     322,     0,   323,   324,     0,   325,   326,   327,     0,     0,
+     328,   329,     0,   330,   331,   332,   333,   334,   335,     0,
+       0,   336,   337,   338,   339,   340,     0,     0,   341,   342,
+       0,   343,   344,   345,   346,   347,     0,     0,   348,   349,
+       0,     0,     0,   350,   351,     0,   352,     0,     0,     0,
+     353,     0,   354,   355,   356,   357,     0,   358,     0,   359,
+       0,     0,     0,   360,   361,     0,   362,     0,     0,   363,
+     364,     0,     0,     0,   365,   366,   367,   368,     0,     0,
+     369,   370,   371,     0,     0,   372,     0,     0,     0,     0,
+     373,   374,   375,     0,     0,     0,   376,     0,     0,     0,
+     377,   378,     0,   379,   380,     0,     0,     0,   381,     0,
+     382,     0,     0,   383,   384,     0,     0,   385,     0,     0,
+     386,   387,  1142,     0,     0,     0,     0,   388,   389,     0,
+     390,     0,   391,     0,   392,   393,     0,     0,     0,     0,
+       0,     0,     0,   394,     0,   395,   396,   397,   398,   399,
+     400,   401,   402,   403,   404,   405,   406,   407,   408,   409,
+     410,   411,     0,   412,   413,   414,     0,   415,   416,   417,
+     418,     0,   419,   420,     0,     0,     0,     0,   421,   422,
+     423,   424,   425,   426,     0,     0,   427,   428,     0,   429,
+       0,   430,     0,   431,   432,   433,   434,   435,   436,   437,
+     438,   439,     0,     0,   440,   441,     0,     0,   442,   443,
+     444,   445,   446,     0,     0,     0,   447,   448,     0,  3930,
+       0,   449,     0,   450,   451,     0,   452,   453,   454,     0,
+       0,   455,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   456,   457,   458,     0,   459,     0,   460,     0,   461,
+     462,   463,   464,   465,   466,   467,   468,   469,   470,     0,
+     471,     0,   472,   473,   474,     0,   475,     0,   476,   477,
+     478,   479,   480,     0,   481,   482,   483,     0,     0,   484,
+       0,     0,     0,   485,   486,     0,   487,   488,     0,     0,
+     489,   490,   491,   492,   493,     0,   494,   495,     0,   496,
+     497,   498,     0,     0,   499,   500,   501,   502,   503,   504,
+     505,   506,     0,   507,     0,   508,   509,     0,   510,   511,
+     512,     0,   513,     0,     0,   514,   515,   516,   517,     0,
+     518,     0,   519,   520,   521,   522,   523,     0,   524,   525,
+       0,     0,     0,   526,   527,   528,   529,     0,     0,     0,
+     530,     0,     0,     0,   531,     0,   532,   533,   534,   535,
+       0,   536,   537,   538,   539,   540,     0,     0,     0,     0,
+       0,   541,   542,   543,     0,   544,     0,     0,   545,     0,
+       0,   546,     0,   547,     0,   548,   549,   550,   551,   552,
+     553,     0,     0,   554,   555,     0,     0,   556,   557,   558,
+     559,   560,   561,     0,     0,   562,   563,   564,   565,     0,
+     566,   567,     0,     0,   568,   569,   570,   571,     0,   240,
+     572,   573,     0,   574,   575,   576,   577,     0,     0,     0,
+       0,     0,   578,   579,     0,     0,     0,   580,   581,   582,
+       0,     0,   583,   584,     0,   585,   586,     0,   587,   588,
+       0,     0,   589,     0,     0,   590,     0,   591,     0,   592,
+     593,     0,     0,     0,     0,     0,   594,     0,   595,     0,
+       0,   596,     0,     0,     0,   597,     0,   598,   599,   600,
+     601,     0,     0,     0,     0,     0,     0,   602,   603,   604,
+       0,   605,   606,   607,   608,     0,     0,   609,     0,     0,
+     610,   611,   612,   613,   614,     0,   615,     0,     0,     0,
+       0,     0,     0,     0,     0,   616,   617,   618,     0,   619,
+     620,   621,     0,   622,     0,     0,   623,     0,   624,     0,
+       0,     0,     0,     0,     0,   625,   626,     0,     0,   627,
+       0,   628,     0,   629,   630,     0,     0,     0,   631,   632,
+     633,   634,   635,   636,   637,   638,     0,   639,   640,   641,
+     642,   643,   644,   645,   646,   647,   648,     0,   649,   650,
+     651,   652,   653,   654,   655,   656,   657,   658,   659,   660,
+     661,   662,   663,   664,   665,   666,   667,   668,   669,   670,
+     671,   672,     0,   673,   674,   675,   676,   677,   678,   679,
+       0,   680,   681,   682,   683,   684,   685,   686,   687,   688,
+     689,   690,   691,   692,   693,   694,   695,   696,   697,   698,
+     699,   700,   701,   702,   703,   704,   705,   706,   707,   708,
      709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,   417,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,    -1,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
+     719,   720,   243,   244,     0,   245,   246,   247,   248,   249,
+       0,     0,   250,     0,     0,     0,     0,   251,     0,     0,
+     252,     0,   253,   254,   255,   256,   257,   258,     0,   259,
+       0,     0,     0,   260,     0,     0,     0,   261,     0,     0,
+     262,   263,   264,     0,   265,     0,   266,   267,     0,     0,
+     268,     0,     0,   269,   270,     0,   271,   272,   273,     0,
+     274,     0,   275,   276,   277,   278,   279,   280,     0,   281,
+     282,     0,   283,   284,   285,   286,   287,   288,   289,   290,
+     291,   292,   293,     0,   294,   295,     0,   296,   297,   298,
+     299,   300,     0,     0,     0,   301,     0,     0,     0,     0,
+     302,     0,     0,   303,     0,     0,     0,   304,   305,   306,
+       0,     0,   307,     0,     0,     0,     0,   308,   309,     0,
+       0,     0,     0,   310,   311,     0,   312,     0,     0,     0,
+       0,     0,   313,   314,   315,   316,   317,     0,     0,     0,
+     318,     0,     0,   319,   320,   321,     0,     0,     0,   322,
+       0,   323,   324,     0,   325,   326,   327,     0,     0,   328,
+     329,     0,   330,   331,   332,   333,   334,   335,     0,     0,
+     336,   337,   338,   339,   340,     0,     0,   341,   342,     0,
+     343,   344,   345,   346,   347,     0,     0,   348,   349,     0,
+       0,     0,   350,   351,     0,   352,     0,     0,     0,   353,
+       0,   354,   355,   356,   357,     0,   358,     0,   359,     0,
+       0,     0,   360,   361,     0,   362,     0,     0,   363,   364,
+       0,     0,     0,   365,   366,   367,   368,     0,     0,   369,
+     370,   371,     0,     0,   372,     0,     0,     0,     0,   373,
+     374,   375,     0,     0,     0,   376,     0,     0,     0,   377,
+     378,     0,   379,   380,     0,     0,     0,   381,     0,   382,
+       0,     0,   383,   384,     0,     0,   385,     0,     0,   386,
+     387,  1142,     0,     0,     0,     0,   388,   389,     0,   390,
+       0,   391,     0,   392,   393,     0,     0,     0,     0,     0,
+       0,     0,   394,     0,   395,   396,   397,   398,   399,   400,
+     401,   402,   403,   404,   405,   406,   407,   408,   409,   410,
+     411,     0,   412,   413,   414,     0,   415,   416,   417,   418,
+       0,   419,   420,     0,     0,     0,     0,   421,   422,   423,
+     424,   425,   426,     0,     0,   427,   428,     0,   429,     0,
+     430,     0,   431,   432,   433,   434,   435,   436,   437,   438,
+     439,     0,     0,   440,   441,     0,     0,   442,   443,   444,
+     445,   446,     0,     0,     0,   447,   448,     0,     0,     0,
+     449,     0,   450,   451,     0,   452,   453,   454,     0,     0,
+     455,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     456,   457,   458,     0,   459,     0,   460,     0,   461,   462,
+     463,   464,   465,   466,   467,   468,   469,   470,     0,   471,
+       0,   472,   473,   474,     0,   475,     0,   476,   477,   478,
+     479,   480,     0,   481,   482,   483,     0,     0,   484,     0,
+       0,     0,   485,   486,     0,   487,   488,     0,     0,   489,
+     490,   491,   492,   493,     0,   494,   495,     0,   496,   497,
+     498,     0,     0,   499,   500,   501,   502,   503,   504,   505,
+     506,     0,   507,     0,   508,   509,     0,   510,   511,   512,
+       0,   513,     0,     0,   514,   515,   516,   517,     0,   518,
+       0,   519,   520,   521,   522,   523,     0,   524,   525,     0,
+       0,     0,   526,   527,   528,   529,     0,     0,     0,   530,
+       0,     0,     0,   531,     0,   532,   533,   534,   535,     0,
+     536,   537,   538,   539,   540,     0,     0,     0,     0,     0,
+     541,   542,   543,     0,   544,     0,     0,   545,     0,     0,
+     546,     0,   547,     0,   548,   549,   550,   551,   552,   553,
+       0,     0,   554,   555,     0,     0,   556,   557,   558,   559,
+     560,   561,     0,     0,   562,   563,   564,   565,     0,   566,
+     567,     0,     0,   568,   569,   570,   571,     0,   240,   572,
+     573,     0,   574,   575,   576,   577,     0,     0,     0,     0,
+       0,   578,   579,     0,     0,     0,   580,   581,   582,     0,
+       0,   583,   584,     0,   585,   586,     0,   587,   588,     0,
+       0,   589,     0,     0,   590,     0,   591,     0,   592,   593,
+       0,     0,     0,     0,     0,   594,     0,   595,     0,     0,
+     596,     0,     0,     0,   597,     0,   598,   599,   600,   601,
+       0,     0,     0,     0,     0,     0,   602,   603,   604,     0,
+     605,   606,   607,   608,     0,     0,   609,     0,     0,   610,
+     611,   612,   613,   614,     0,   615,     0,     0,     0,     0,
+       0,     0,     0,     0,   616,   617,   618,     0,   619,   620,
+     621,     0,   622,     0,     0,   623,     0,   624,     0,     0,
+       0,     0,     0,     0,   625,   626,     0,     0,   627,     0,
+     628,     0,   629,   630,     0,     0,     0,   631,   632,   633,
+     634,   635,   636,   637,   638,     0,   639,   640,   641,   642,
+     643,   644,   645,   646,   647,   648,     0,   649,   650,   651,
+     652,   653,   654,   655,   656,   657,   658,   659,   660,   661,
+     662,   663,   664,   665,   666,   667,   668,   669,   670,   671,
+     672,     0,   673,   674,   675,   676,   677,   678,   679,     0,
+     680,   681,   682,   683,   684,   685,   686,   687,   688,   689,
+     690,   691,   692,   693,   694,   695,   696,   697,   698,   699,
+     700,   701,   702,   703,   704,   705,   706,   707,   708,   709,
+     710,   711,   712,   713,   714,   715,   716,   717,   718,   719,
+     720,   243,   244,     0,   245,   246,   247,   248,   249,     0,
+       0,   250,     0,     0,     0,     0,   251,     0,     0,   252,
+       0,   253,   254,   255,   256,   257,   258,     0,   259,     0,
+       0,     0,   260,     0,     0,     0,   261,     0,     0,   262,
+     263,   264,     0,   265,     0,   266,   267,     0,     0,   268,
+       0,     0,   269,   270,     0,   271,   272,   273,     0,   274,
+       0,   275,   276,   277,   278,   279,   280,     0,   281,   282,
+       0,   283,   284,   285,   286,   287,   288,   289,   290,   291,
+     292,   293,     0,   294,   295,     0,   296,   297,   298,   299,
+     300,  5461,     0,     0,   301,     0,     0,     0,     0,   302,
+       0,     0,   303,     0,     0,     0,   304,   305,   306,     0,
+       0,   307,     0,     0,     0,     0,   308,   309,     0,     0,
+       0,     0,   310,   311,     0,   312,     0,     0,     0,     0,
+       0,   313,   314,   315,   316,   317,     0,     0,     0,   318,
+       0,     0,   319,   320,   321,     0,     0,     0,   322,     0,
+     323,   324,     0,   325,   326,   327,     0,     0,   328,   329,
+       0,   330,   331,   332,   333,   334,   335,     0,  5462,   336,
+     337,   338,   339,   340,     0,     0,   341,   342,     0,   343,
+     344,   345,   346,   347,     0,     0,   348,   349,     0,     0,
+       0,   350,   351,     0,   352,     0,     0,     0,   353,     0,
+     354,   355,   356,   357,     0,   358,     0,   359,     0,     0,
+       0,   360,   361,     0,   362,     0,     0,   363,   364,     0,
+       0,     0,   365,   366,   367,   368,     0,     0,   369,   370,
+     371,     0,     0,   372,     0,     0,     0,     0,   373,   374,
+     375,     0,     0,     0,   376,     0,     0,     0,   377,   378,
+       0,   379,   380,     0,     0,     0,   381,     0,   382,     0,
+       0,   383,   384,     0,     0,   385,     0,     0,   386,   387,
+       0,     0,     0,     0,     0,   388,   389,     0,   390,     0,
+     391,     0,   392,   393,     0,     0,     0,     0,     0,     0,
+       0,   394,     0,   395,   396,   397,   398,   399,   400,   401,
+     402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
+       0,   412,   413,   414,     0,   415,   416,   417,   418,     0,
+     419,   420,     0,     0,     0,     0,   421,   422,   423,   424,
+     425,   426,     0,     0,   427,   428,     0,   429,     0,   430,
+       0,   431,   432,   433,   434,   435,   436,   437,   438,   439,
+       0,     0,   440,   441,     0,     0,   442,   443,   444,   445,
+     446,     0,     0,     0,   447,   448,     0,     0,     0,   449,
+       0,   450,   451,     0,   452,   453,   454,     0,     0,   455,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   456,
+     457,   458,     0,   459,     0,   460,     0,   461,   462,   463,
+     464,   465,   466,   467,   468,   469,   470,     0,   471,     0,
+     472,   473,   474,     0,   475,     0,   476,   477,   478,   479,
+     480,     0,   481,   482,   483,     0,     0,   484,     0,     0,
+       0,   485,   486,     0,   487,   488,     0,     0,   489,   490,
+     491,   492,   493,     0,   494,   495,     0,   496,   497,   498,
+       0,     0,   499,   500,   501,   502,   503,   504,   505,   506,
+       0,   507,     0,   508,   509,     0,   510,   511,   512,     0,
+     513,     0,     0,   514,   515,   516,   517,     0,   518,     0,
+     519,   520,   521,   522,   523,     0,   524,   525,     0,     0,
+       0,   526,   527,   528,   529,     0,     0,     0,   530,     0,
+       0,     0,   531,     0,   532,   533,   534,   535,     0,   536,
+     537,   538,   539,   540,     0,     0,     0,     0,     0,   541,
+     542,   543,     0,   544,     0,     0,   545,     0,     0,   546,
+       0,   547,     0,   548,   549,   550,   551,   552,   553,     0,
+       0,   554,   555,     0,     0,   556,   557,   558,   559,   560,
+     561,     0,     0,   562,   563,   564,   565,     0,   566,   567,
+       0,     0,   568,   569,   570,   571,     0,     0,   572,   573,
+       0,   574,   575,   576,   577,     0,     0,     0,     0,     0,
+     578,   579,     0,     0,     0,   580,   581,   582,     0,     0,
+     583,   584,     0,   585,   586,     0,   587,   588,     0,     0,
+     589,     0,     0,   590,     0,   591,     0,   592,   593,     0,
+       0,     0,     0,     0,   594,     0,   595,     0,     0,   596,
+       0,     0,     0,   597,     0,   598,   599,   600,   601,     0,
+       0,     0,     0,     0,     0,   602,   603,   604,     0,   605,
+     606,   607,   608,     0,     0,   609,     0,     0,   610,   611,
+     612,   613,   614,     0,   615,     0,     0,     0,     0,     0,
+       0,     0,     0,   616,   617,   618,     0,   619,   620,   621,
+       0,   622,     0,     0,   623,     0,   624,     0,     0,     0,
+       0,     0,     0,   625,   626,     0,     0,   627,     0,   628,
+       0,   629,   630,     0,     0,     0,   631,   632,   633,   634,
+     635,   636,   637,   638,     0,   639,   640,   641,   642,   643,
+     644,   645,   646,   647,   648,     0,   649,   650,   651,   652,
+     653,   654,   655,   656,   657,   658,   659,   660,   661,   662,
+     663,   664,   665,   666,   667,   668,   669,   670,   671,   672,
+       0,   673,   674,   675,   676,   677,   678,   679,     0,   680,
+     681,   682,   683,   684,   685,   686,   687,   688,   689,   690,
+     691,   692,   693,   694,   695,   696,   697,   698,   699,   700,
+     701,   702,   703,   704,   705,   706,   707,   708,   709,   710,
+     711,   712,   713,   714,   715,   716,   717,   718,   719,   720,
+     243,   244,     0,   245,   246,   247,   248,   249,     0,     0,
+     250,     0,     0,     0,     0,   251,     0,     0,   252,     0,
+     253,   254,   255,   256,   257,   258,     0,   259,     0,     0,
+       0,   260,     0,     0,     0,   261,     0,     0,   262,   263,
+     264,     0,   265,     0,   266,   267,     0,     0,   268,     0,
+       0,   269,   270,     0,   271,   272,   273,     0,   274,     0,
+     275,   276,   277,   278,   279,   280,     0,   281,   282,     0,
+     283,   284,   285,   286,   287,   288,   289,   290,   291,   292,
+     293,     0,   294,   295,     0,   296,   297,   298,   299,   300,
+       0,     0,     0,   301,     0,     0,     0,     0,   302,     0,
+       0,   303,     0,     0,     0,   304,   305,   306,     0,     0,
+     307,     0,     0,     0,     0,   308,   309,     0,     0,     0,
+       0,   310,   311,     0,   312,     0,     0,     0,     0,     0,
+     313,   314,   315,   316,   317,     0,     0,     0,   318,     0,
+       0,   319,   320,   321,     0,     0,     0,   322,     0,   323,
+     324,     0,   325,   326,   327,     0,     0,   328,   329,     0,
+     330,   331,   332,   333,   334,   335,     0,     0,   336,   337,
+     338,   339,   340,     0,     0,   341,   342,     0,   343,   344,
+     345,   346,   347,     0,     0,   348,   349,     0,     0,     0,
+     350,   351,     0,   352,     0,     0,     0,   353,     0,   354,
+     355,   356,   357,     0,   358,     0,   359,     0,     0,     0,
+     360,   361,     0,   362,     0,     0,   363,   364,     0,     0,
+       0,   365,   366,   367,   368,     0,     0,   369,   370,   371,
+       0,     0,   372,     0,     0,     0,     0,   373,   374,   375,
+       0,     0,     0,   376,     0,     0,     0,   377,   378,     0,
+     379,   380,     0,     0,     0,   381,     0,   382,     0,     0,
+     383,   384,     0,     0,   385,     0,     0,   386,   387,     0,
+       0,     0,     0,     0,   388,   389,     0,   390,     0,   391,
+       0,   392,   393,     0,     0,     0,     0,     0,     0,     0,
+     394,     0,   395,   396,   397,   398,   399,   400,   401,   402,
+     403,   404,   405,   406,   407,   408,   409,   410,   411,     0,
+     412,   413,   414,     0,   415,   416,   417,   418,     0,   419,
+     420,     0,     0,     0,     0,   421,   422,   423,   424,   425,
+     426,     0,     0,   427,   428,     0,   429,     0,   430,     0,
+     431,   432,   433,   434,   435,   436,   437,   438,   439,     0,
+       0,   440,   441,     0,     0,   442,   443,   444,   445,   446,
+       0,     0,     0,   447,   448,     0,     0,     0,   449,     0,
+     450,   451,     0,   452,   453,   454,     0,     0,   455,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   456,   457,
+     458,     0,   459,     0,   460,     0,   461,   462,   463,   464,
+     465,   466,   467,   468,   469,   470,     0,   471,     0,   472,
+     473,   474,     0,   475,     0,   476,   477,   478,   479,   480,
+       0,   481,   482,   483,     0,     0,   484,     0,     0,     0,
+     485,   486,     0,   487,   488,     0,     0,   489,   490,   491,
+     492,   493,     0,   494,   495,     0,   496,   497,   498,     0,
+       0,   499,   500,   501,   502,   503,   504,   505,   506,     0,
+     507,     0,   508,   509,     0,   510,   511,   512,     0,   513,
+       0,     0,   514,   515,   516,   517,     0,   518,     0,   519,
+     520,   521,   522,   523,     0,   524,   525,     0,     0,     0,
+     526,   527,   528,   529,     0,     0,     0,   530,     0,     0,
+       0,   531,     0,   532,   533,   534,   535,     0,   536,   537,
+     538,   539,   540,     0,     0,     0,  1003,     0,   541,   542,
+     543,     0,   544,     0,     0,   545,     0,     0,   546,     0,
+     547,     0,   548,   549,   550,   551,   552,   553,     0,     0,
+     554,   555,     0,     0,   556,   557,   558,   559,   560,   561,
+       0,     0,   562,   563,   564,   565,     0,   566,   567,     0,
+       0,   568,   569,   570,   571,     0,     0,   572,   573,     0,
+     574,   575,   576,   577,     0,     0,     0,     0,     0,   578,
+     579,     0,     0,     0,   580,   581,   582,     0,     0,   583,
+     584,     0,   585,   586,     0,   587,   588,     0,     0,   589,
+       0,     0,   590,     0,   591,     0,   592,   593,     0,     0,
+       0,     0,     0,   594,     0,   595,     0,     0,   596,     0,
+       0,     0,   597,     0,   598,   599,   600,   601,     0,     0,
+       0,     0,     0,     0,   602,   603,   604,     0,   605,   606,
+     607,   608,     0,     0,   609,     0,     0,   610,   611,   612,
+     613,   614,     0,   615,     0,     0,     0,     0,     0,     0,
+       0,     0,   616,   617,   618,     0,   619,   620,   621,     0,
+     622,     0,     0,   623,     0,   624,     0,     0,     0,     0,
+       0,     0,   625,   626,     0,     0,   627,     0,   628,     0,
+     629,   630,     0,     0,     0,   631,   632,   633,   634,   635,
+     636,   637,   638,     0,   639,   640,   641,   642,   643,   644,
+     645,   646,   647,   648,     0,   649,   650,   651,   652,   653,
+     654,   655,   656,   657,   658,   659,   660,   661,   662,   663,
+     664,   665,   666,   667,   668,   669,   670,   671,   672,     0,
+     673,   674,   675,   676,   677,   678,   679,     0,   680,   681,
+     682,   683,   684,   685,   686,   687,   688,   689,   690,   691,
+     692,   693,   694,   695,   696,   697,   698,   699,   700,   701,
+     702,   703,   704,   705,   706,   707,   708,   709,   710,   711,
+     712,   713,   714,   715,   716,   717,   718,   719,   720,   243,
+     244,     0,   245,   246,   247,   248,   249,     0,     0,   250,
+       0,     0,     0,     0,   251,     0,     0,   252,     0,   253,
+     254,   255,   256,   257,   258,     0,   259,     0,     0,     0,
+     260,     0,     0,     0,   261,     0,     0,   262,   263,   264,
+       0,   265,     0,   266,   267,     0,     0,   268,     0,     0,
+     269,   270,     0,   271,   272,   273,     0,   274,     0,   275,
+     276,   277,   278,   279,   280,     0,   281,   282,     0,   283,
+     284,   285,   286,   287,   288,   289,   290,   291,   292,   293,
+       0,   294,   295,     0,   296,   297,   298,   299,   300,     0,
+       0,     0,   301,     0,     0,     0,     0,   302,     0,     0,
+     303,     0,     0,     0,   304,   305,   306,     0,     0,   307,
+       0,     0,     0,     0,   308,   309,     0,     0,     0,     0,
+     310,   311,     0,   312,     0,     0,     0,     0,     0,   313,
+     314,   315,   316,   317,     0,     0,     0,   318,     0,     0,
+     319,   320,   321,     0,     0,     0,   322,     0,   323,   324,
+       0,   325,   326,   327,     0,     0,   328,   329,     0,   330,
+     331,   332,   333,   334,   335,     0,     0,   336,   337,   338,
+     339,   340,     0,     0,   341,   342,     0,   343,   344,   345,
+     346,   347,     0,     0,   348,   349,     0,     0,     0,   350,
+     351,     0,   352,     0,     0,     0,   353,     0,   354,   355,
+     356,   357,     0,   358,     0,   359,     0,     0,     0,   360,
+     361,     0,   362,     0,     0,   363,   364,     0,     0,     0,
+     365,   366,   367,   368,     0,     0,   369,   370,   371,     0,
+       0,   372,     0,     0,     0,     0,   373,   374,   375,     0,
+       0,     0,   376,     0,     0,     0,   377,   378,     0,   379,
+     380,     0,     0,     0,   381,     0,   382,     0,     0,   383,
+     384,     0,     0,   385,     0,     0,   386,   387,     0,     0,
+       0,     0,     0,   388,   389,     0,   390,     0,   391,     0,
+     392,   393,     0,     0,     0,     0,     0,     0,     0,   394,
+       0,   395,   396,   397,   398,   399,   400,   401,   402,   403,
+     404,   405,   406,   407,   408,   409,   410,   411,     0,   412,
+     413,   414,     0,   415,   416,   417,   418,     0,   419,   420,
+       0,     0,     0,     0,   421,   422,   423,   424,   425,   426,
+       0,     0,   427,   428,     0,   429,     0,   430,     0,   431,
+     432,   433,   434,   435,   436,   437,   438,   439,     0,     0,
+     440,   441,     0,     0,   442,   443,   444,   445,   446,     0,
+       0,     0,   447,   448,     0,     0,     0,   449,     0,   450,
+     451,     0,   452,   453,   454,     0,     0,   455,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   456,   457,   458,
+       0,   459,     0,   460,     0,   461,   462,   463,   464,   465,
+     466,   467,   468,   469,   470,     0,   471,     0,   472,   473,
+     474,     0,   475,     0,   476,   477,   478,   479,   480,     0,
+     481,   482,   483,     0,     0,   484,     0,     0,     0,   485,
+     486,     0,   487,   488,     0,     0,   489,   490,   491,   492,
+     493,     0,   494,   495,     0,   496,   497,   498,     0,     0,
+     499,   500,   501,   502,   503,   504,   505,   506,     0,   507,
+       0,   508,   509,     0,   510,   511,   512,     0,   513,     0,
+       0,   514,   515,   516,   517,     0,   518,     0,   519,   520,
+     521,   522,   523,     0,   524,   525,     0,     0,     0,   526,
+     527,   528,   529,     0,     0,     0,   530,     0,     0,     0,
+     531,     0,   532,   533,   534,   535,     0,   536,   537,   538,
+     539,   540,     0,     0,     0,     0,     0,   541,   542,   543,
+       0,   544,     0,     0,   545,     0,     0,   546,     0,   547,
+       0,   548,   549,   550,   551,   552,   553,     0,     0,   554,
+     555,     0,     0,   556,   557,   558,   559,   560,   561,     0,
+       0,   562,   563,   564,   565,     0,   566,   567,     0,     0,
+     568,   569,   570,   571,     0,     0,   572,   573,     0,   574,
+     575,   576,   577,     0,     0,     0,     0,     0,   578,   579,
+       0,     0,     0,   580,   581,   582,     0,     0,   583,   584,
+       0,   585,   586,     0,   587,   588,     0,     0,   589,     0,
+       0,   590,     0,   591,     0,   592,   593,     0,     0,     0,
+       0,     0,   594,     0,   595,     0,     0,   596,     0,     0,
+       0,   597,     0,   598,   599,   600,   601,     0,     0,     0,
+       0,     0,     0,   602,   603,   604,     0,   605,   606,   607,
+     608,     0,     0,   609,     0,     0,   610,   611,   612,   613,
+     614,     0,   615,  1110,     0,     0,     0,     0,     0,     0,
+       0,   616,   617,   618,     0,   619,   620,   621,     0,   622,
+       0,     0,   623,     0,   624,     0,     0,     0,     0,     0,
+       0,   625,   626,     0,     0,   627,     0,   628,     0,   629,
+     630,     0,     0,     0,   631,   632,   633,   634,   635,   636,
+     637,   638,     0,   639,   640,   641,   642,   643,   644,   645,
+     646,   647,   648,     0,   649,   650,   651,   652,   653,   654,
+     655,   656,   657,   658,   659,   660,   661,   662,   663,   664,
+     665,   666,   667,   668,   669,   670,   671,   672,     0,   673,
+     674,   675,   676,   677,   678,   679,     0,   680,   681,   682,
+     683,   684,   685,   686,   687,   688,   689,   690,   691,   692,
+     693,   694,   695,   696,   697,   698,   699,   700,   701,   702,
+     703,   704,   705,   706,   707,   708,   709,   710,   711,   712,
+     713,   714,   715,   716,   717,   718,   719,   720,   243,   244,
+       0,   245,   246,   247,   248,   249,     0,     0,   250,     0,
+    1180,     0,     0,   251,     0,     0,   252,     0,   253,   254,
+     255,   256,   257,   258,     0,   259,     0,     0,     0,   260,
+       0,     0,     0,   261,     0,     0,   262,   263,   264,     0,
+     265,     0,   266,   267,     0,     0,   268,     0,     0,   269,
+     270,     0,   271,   272,   273,     0,   274,     0,   275,   276,
+     277,   278,   279,   280,     0,   281,   282,     0,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,     0,
+     294,   295,     0,   296,   297,   298,   299,   300,     0,     0,
+       0,   301,     0,     0,     0,     0,   302,     0,     0,   303,
+       0,     0,     0,   304,   305,   306,     0,     0,   307,     0,
+       0,     0,     0,   308,   309,     0,     0,     0,     0,   310,
+     311,     0,   312,     0,     0,     0,     0,     0,   313,   314,
+     315,   316,   317,     0,     0,     0,   318,     0,     0,   319,
+     320,   321,     0,     0,     0,   322,     0,   323,   324,     0,
+     325,   326,   327,     0,     0,   328,   329,     0,   330,   331,
+     332,   333,   334,   335,     0,     0,   336,   337,   338,   339,
+     340,     0,     0,   341,   342,     0,   343,   344,   345,   346,
+     347,     0,     0,   348,   349,     0,     0,     0,  1181,   351,
+       0,   352,     0,     0,     0,   353,     0,   354,   355,   356,
+     357,     0,   358,     0,   359,     0,     0,     0,   360,   361,
+       0,   362,     0,     0,   363,   364,     0,     0,     0,   365,
+     366,   367,   368,     0,     0,   369,   370,   371,     0,     0,
+     372,     0,     0,     0,     0,   373,   374,   375,     0,     0,
+       0,   376,     0,     0,     0,   377,   378,     0,   379,   380,
+       0,     0,     0,   381,     0,   382,     0,     0,   383,   384,
+       0,     0,   385,     0,     0,   386,   387,     0,     0,     0,
+       0,     0,   388,   389,     0,   390,     0,   391,     0,   392,
+     393,     0,     0,     0,     0,     0,     0,     0,   394,     0,
+     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
+     405,   406,   407,   408,   409,   410,   411,     0,   412,   413,
+     414,     0,   415,   416,   417,   418,     0,   419,   420,     0,
+       0,     0,     0,   421,   422,   423,   424,   425,   426,     0,
+       0,   427,   428,     0,   429,     0,   430,     0,   431,   432,
+     433,   434,   435,   436,   437,   438,   439,     0,     0,   440,
+     441,     0,     0,   442,   443,   444,   445,   446,     0,     0,
+       0,   447,   448,     0,     0,     0,   449,     0,   450,   451,
+       0,   452,   453,   454,     0,     0,   455,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   456,   457,   458,     0,
+     459,     0,   460,     0,   461,   462,   463,   464,   465,   466,
+     467,   468,   469,   470,     0,   471,     0,   472,   473,   474,
+       0,   475,     0,   476,   477,   478,   479,   480,     0,   481,
+     482,   483,     0,     0,   484,     0,     0,     0,   485,   486,
+       0,   487,   488,     0,     0,   489,   490,   491,   492,   493,
+       0,   494,   495,     0,   496,   497,   498,     0,     0,   499,
+     500,   501,   502,   503,   504,   505,   506,     0,   507,     0,
+     508,   509,     0,   510,   511,   512,     0,   513,     0,     0,
+     514,   515,   516,   517,     0,   518,     0,   519,   520,   521,
+     522,   523,     0,   524,   525,     0,     0,     0,   526,   527,
+     528,   529,     0,     0,     0,   530,     0,     0,     0,   531,
+       0,   532,   533,   534,   535,     0,   536,   537,   538,   539,
+     540,     0,     0,     0,     0,     0,   541,   542,   543,     0,
+     544,     0,     0,   545,     0,     0,   546,     0,   547,     0,
+     548,   549,   550,   551,   552,   553,     0,     0,   554,   555,
+       0,     0,   556,   557,   558,   559,   560,   561,     0,     0,
+     562,   563,   564,   565,     0,   566,   567,     0,     0,   568,
+     569,   570,   571,     0,     0,   572,   573,     0,   574,   575,
+     576,   577,     0,     0,     0,     0,     0,   578,   579,     0,
+       0,     0,   580,   581,   582,     0,     0,   583,   584,     0,
+     585,   586,     0,   587,   588,     0,     0,   589,     0,     0,
+     590,     0,   591,     0,   592,   593,     0,     0,     0,     0,
+       0,   594,     0,   595,     0,     0,   596,     0,     0,     0,
+     597,     0,   598,   599,   600,   601,     0,     0,     0,     0,
+       0,     0,   602,   603,   604,     0,   605,   606,   607,   608,
+       0,     0,   609,     0,     0,   610,   611,   612,   613,   614,
+       0,   615,     0,     0,     0,     0,     0,     0,     0,     0,
+     616,   617,   618,     0,   619,   620,   621,     0,   622,     0,
+       0,   623,     0,   624,     0,     0,     0,     0,     0,     0,
+     625,   626,     0,     0,   627,     0,   628,     0,   629,   630,
+       0,     0,     0,   631,   632,   633,   634,   635,   636,   637,
+     638,     0,   639,   640,   641,   642,   643,   644,   645,   646,
+     647,   648,     0,   649,   650,   651,   652,   653,   654,   655,
+     656,   657,   658,   659,   660,   661,   662,   663,   664,   665,
+     666,   667,   668,   669,   670,   671,   672,     0,   673,   674,
+     675,   676,   677,   678,   679,     0,   680,   681,   682,   683,
+     684,   685,   686,   687,   688,   689,   690,   691,   692,   693,
+     694,   695,   696,   697,   698,   699,   700,   701,   702,   703,
+     704,   705,   706,   707,   708,   709,   710,   711,   712,   713,
+     714,   715,   716,   717,   718,   719,   720,   243,   244,     0,
+     245,   246,   247,   248,   249,     0,     0,   250,     0,     0,
+       0,     0,   251,     0,     0,   252,     0,   253,   254,   255,
+     256,   257,   258,     0,   259,     0,     0,     0,   260,     0,
+       0,     0,   261,     0,     0,   262,   263,   264,     0,   265,
+       0,   266,   267,     0,     0,   268,     0,     0,   269,   270,
+       0,   271,   272,   273,     0,   274,     0,   275,   276,   277,
+     278,   279,   280,     0,   281,   282,     0,   283,   284,   285,
+     286,   287,   288,   289,   290,   291,   292,   293,     0,   294,
+     295,     0,   296,   297,   298,   299,   300,     0,     0,     0,
+     301,     0,     0,     0,     0,   302,     0,     0,   303,     0,
+       0,     0,   304,   305,   306,     0,     0,   307,     0,     0,
+       0,     0,   308,   309,     0,     0,     0,     0,   310,   311,
+       0,   312,     0,     0,     0,     0,     0,   313,   314,   315,
+     316,   317,     0,     0,     0,   318,     0,     0,   319,   320,
+     321,     0,     0,     0,   322,     0,   323,   324,     0,   325,
+     326,   327,     0,     0,   328,   329,     0,   330,   331,   332,
+     333,   334,   335,     0,     0,   336,   337,   338,   339,   340,
+       0,     0,   341,   342,     0,   343,   344,   345,   346,   347,
+       0,     0,   348,   349,     0,     0,     0,   350,   351,     0,
+     352,     0,     0,     0,   353,     0,   354,   355,   356,   357,
+       0,   358,     0,   359,     0,     0,     0,   360,   361,     0,
+     362,     0,     0,   363,   364,     0,     0,     0,   365,   366,
+     367,   368,     0,     0,   369,   370,   371,     0,     0,   372,
+       0,     0,     0,     0,   373,   374,   375,     0,     0,     0,
+     376,     0,     0,     0,   377,   378,     0,   379,   380,     0,
+       0,     0,   381,     0,   382,     0,     0,   383,   384,     0,
+       0,   385,     0,     0,   386,   387,     0,     0,     0,     0,
+       0,   388,   389,     0,   390,     0,   391,     0,   392,   393,
+       0,     0,     0,     0,     0,     0,     0,   394,     0,   395,
+     396,   397,   398,   399,   400,   401,   402,   403,   404,   405,
+     406,   407,   408,   409,   410,   411,     0,   412,   413,   414,
+       0,   415,   416,   417,   418,     0,   419,   420,     0,     0,
+       0,     0,   421,   422,   423,   424,   425,   426,     0,     0,
+     427,   428,     0,   429,     0,   430,     0,   431,   432,   433,
+     434,   435,   436,   437,   438,   439,     0,     0,   440,   441,
+       0,     0,   442,   443,   444,   445,   446,     0,     0,     0,
+     447,   448,     0,     0,     0,   449,     0,   450,   451,     0,
+     452,   453,   454,     0,     0,   455,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   456,   457,   458,     0,   459,
+       0,   460,     0,   461,   462,   463,   464,   465,   466,   467,
+     468,   469,   470,     0,   471,     0,   472,   473,   474,     0,
+     475,     0,   476,   477,   478,   479,   480,     0,   481,   482,
+     483,     0,     0,   484,     0,     0,     0,   485,   486,     0,
+     487,   488,     0,     0,   489,   490,   491,   492,   493,     0,
+     494,   495,     0,   496,   497,   498,     0,     0,   499,   500,
+     501,   502,   503,   504,   505,   506,     0,   507,     0,   508,
+     509,     0,   510,   511,   512,     0,   513,     0,     0,   514,
+     515,   516,   517,     0,   518,     0,   519,   520,   521,   522,
+     523,     0,   524,   525,     0,     0,     0,   526,   527,   528,
+     529,     0,     0,     0,   530,     0,     0,     0,   531,     0,
+     532,   533,   534,   535,     0,   536,   537,   538,   539,   540,
+       0,     0,     0,     0,     0,   541,   542,   543,     0,   544,
+       0,     0,   545,     0,     0,   546,     0,   547,     0,   548,
+     549,   550,   551,   552,   553,     0,     0,   554,   555,     0,
+       0,   556,   557,   558,   559,   560,   561,     0,     0,   562,
+     563,   564,   565,     0,   566,   567,     0,     0,   568,   569,
+     570,   571,     0,  1370,   572,   573,     0,   574,   575,   576,
+     577,     0,     0,     0,     0,     0,   578,   579,     0,     0,
+       0,   580,   581,   582,     0,     0,   583,   584,     0,   585,
+     586,     0,   587,   588,     0,     0,   589,     0,     0,   590,
+       0,   591,     0,   592,   593,     0,     0,     0,     0,     0,
+     594,     0,   595,     0,     0,   596,     0,     0,     0,   597,
+       0,   598,   599,   600,   601,     0,     0,     0,     0,     0,
+       0,   602,   603,   604,     0,   605,   606,   607,   608,     0,
+       0,   609,     0,     0,   610,   611,   612,   613,   614,     0,
+     615,     0,     0,     0,     0,     0,     0,     0,     0,   616,
+     617,   618,     0,   619,   620,   621,     0,   622,     0,     0,
+     623,     0,   624,     0,     0,     0,     0,     0,     0,   625,
+     626,     0,     0,   627,     0,   628,     0,   629,   630,     0,
+       0,     0,   631,   632,   633,   634,   635,   636,   637,   638,
+       0,   639,   640,   641,   642,   643,   644,   645,   646,   647,
+     648,     0,   649,   650,   651,   652,   653,   654,   655,   656,
+     657,   658,   659,   660,   661,   662,   663,   664,   665,   666,
+     667,   668,   669,   670,   671,   672,     0,   673,   674,   675,
+     676,   677,   678,   679,     0,   680,   681,   682,   683,   684,
+     685,   686,   687,   688,   689,   690,   691,   692,   693,   694,
+     695,   696,   697,   698,   699,   700,   701,   702,   703,   704,
+     705,   706,   707,   708,   709,   710,   711,   712,   713,   714,
+     715,   716,   717,   718,   719,   720,   243,   244,     0,   245,
+     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
+       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
+     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
+       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
+     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
+     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
+     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
+     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
+       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
+       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
+       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
+       0,   308,   309,     0,     0,     0,     0,   310,   311,     0,
+     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
+     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
+       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
+     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
+     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
+       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
+       0,   348,   349,     0,     0,     0,   350,   351,  2444,   352,
+       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
+     358,     0,   359,     0,     0,     0,   360,   361,     0,   362,
+       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
+     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
+       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
+       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
+       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
+     385,     0,     0,   386,   387,     0,     0,     0,     0,     0,
+     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
+       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
+     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
+     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
+     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
+       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
+     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
+     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
+       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
+     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
+     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
+     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
+     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
+       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
+       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
+     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
+     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
+     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
+       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
+     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
+       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
+       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
+     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
+       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
+       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
+     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
+     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
+     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
+     571,     0,     0,   572,   573,     0,   574,   575,   576,   577,
+       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
+     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
+       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
+     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
+       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
+     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
+     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
+     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
+       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
+     618,     0,   619,   620,   621,     0,   622,     0,     0,   623,
+       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
+       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
+       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
+     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
+       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
+     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
+     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
+     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
+     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
+     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
+     706,   707,   708,   709,   710,   711,   712,   713,   714,   715,
+     716,   717,   718,   719,   720,   243,   244,     0,   245,   246,
+     247,   248,   249,     0,     0,   250,     0,     0,     0,     0,
+     251,     0,     0,   252,     0,   253,   254,   255,   256,   257,
+     258,     0,   259,     0,     0,     0,   260,     0,     0,     0,
+     261,     0,     0,   262,   263,   264,     0,   265,     0,   266,
+     267,     0,     0,   268,     0,     0,   269,   270,     0,   271,
+     272,   273,     0,   274,     0,   275,   276,   277,   278,   279,
+     280,     0,   281,   282,     0,   283,   284,   285,   286,   287,
+     288,   289,   290,   291,   292,   293,     0,   294,   295,     0,
+     296,   297,   298,   299,   300,     0,     0,     0,   301,     0,
+       0,     0,     0,   302,     0,     0,   303,     0,     0,     0,
+     304,   305,   306,     0,     0,   307,     0,     0,     0,     0,
+     308,   309,     0,     0,     0,  2579,   310,   311,     0,   312,
+       0,     0,     0,     0,     0,   313,   314,   315,   316,   317,
+       0,     0,     0,   318,     0,     0,   319,   320,   321,     0,
+       0,     0,   322,     0,   323,   324,     0,   325,   326,   327,
+       0,     0,   328,   329,     0,   330,   331,   332,   333,   334,
+     335,     0,     0,   336,   337,   338,   339,   340,     0,     0,
+     341,   342,     0,   343,   344,   345,   346,   347,     0,     0,
+     348,   349,     0,     0,     0,   350,   351,     0,   352,     0,
+       0,     0,   353,     0,   354,   355,   356,   357,     0,   358,
+       0,   359,     0,     0,     0,   360,   361,     0,   362,     0,
+       0,   363,   364,     0,     0,     0,   365,   366,   367,   368,
+       0,     0,   369,   370,   371,     0,     0,   372,     0,     0,
+       0,     0,   373,   374,   375,     0,     0,     0,   376,     0,
+       0,     0,   377,   378,     0,   379,   380,     0,     0,     0,
+     381,     0,   382,     0,     0,   383,   384,     0,     0,   385,
+       0,     0,   386,   387,     0,     0,     0,     0,     0,   388,
+     389,     0,   390,     0,   391,     0,   392,   393,     0,     0,
+       0,     0,     0,     0,     0,   394,     0,   395,   396,   397,
+     398,   399,   400,   401,   402,   403,   404,   405,   406,   407,
+     408,   409,   410,   411,     0,   412,   413,   414,     0,   415,
+     416,   417,   418,     0,   419,   420,     0,     0,     0,     0,
+     421,   422,   423,   424,   425,   426,     0,     0,   427,   428,
+       0,   429,     0,   430,     0,   431,   432,   433,   434,   435,
+     436,   437,   438,   439,     0,     0,   440,   441,     0,     0,
+     442,   443,   444,   445,   446,     0,     0,     0,   447,   448,
+       0,     0,     0,   449,     0,   450,   451,     0,   452,   453,
+     454,     0,     0,   455,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   456,   457,   458,     0,   459,     0,   460,
+       0,   461,   462,   463,   464,   465,   466,   467,   468,   469,
+     470,     0,   471,     0,   472,   473,   474,     0,   475,     0,
+     476,   477,   478,   479,   480,     0,   481,   482,   483,     0,
+       0,   484,     0,     0,     0,   485,   486,     0,   487,   488,
+       0,     0,   489,   490,   491,   492,   493,     0,   494,   495,
+       0,   496,   497,   498,     0,     0,   499,   500,   501,   502,
+     503,   504,   505,   506,     0,   507,     0,   508,   509,     0,
+     510,   511,   512,     0,   513,     0,     0,   514,   515,   516,
+     517,     0,   518,     0,   519,   520,   521,   522,   523,     0,
+     524,   525,     0,     0,     0,   526,   527,   528,   529,     0,
+       0,     0,   530,     0,     0,     0,   531,     0,   532,   533,
+     534,   535,     0,   536,   537,   538,   539,   540,     0,     0,
+       0,     0,     0,   541,   542,   543,     0,   544,     0,     0,
+     545,     0,     0,   546,     0,   547,     0,   548,   549,   550,
+     551,   552,   553,     0,     0,   554,   555,     0,     0,   556,
+     557,   558,   559,   560,   561,     0,     0,   562,   563,   564,
+     565,     0,   566,   567,     0,     0,   568,   569,   570,   571,
+       0,     0,   572,   573,     0,   574,   575,   576,   577,     0,
+       0,     0,     0,     0,   578,   579,     0,     0,     0,   580,
+     581,   582,     0,     0,   583,   584,     0,   585,   586,     0,
+     587,   588,     0,     0,   589,     0,     0,   590,     0,   591,
+       0,   592,   593,     0,     0,     0,     0,     0,   594,     0,
+     595,     0,     0,   596,     0,     0,     0,   597,     0,   598,
+     599,   600,   601,     0,     0,     0,     0,     0,     0,   602,
+     603,   604,     0,   605,   606,   607,   608,     0,     0,   609,
+       0,     0,   610,   611,   612,   613,   614,     0,   615,     0,
+       0,     0,     0,     0,     0,     0,     0,   616,   617,   618,
+       0,   619,   620,   621,     0,   622,     0,     0,   623,     0,
+     624,     0,     0,     0,     0,     0,     0,   625,   626,     0,
+       0,   627,     0,   628,     0,   629,   630,     0,     0,     0,
+     631,   632,   633,   634,   635,   636,   637,   638,     0,   639,
+     640,   641,   642,   643,   644,   645,   646,   647,   648,     0,
+     649,   650,   651,   652,   653,   654,   655,   656,   657,   658,
+     659,   660,   661,   662,   663,   664,   665,   666,   667,   668,
+     669,   670,   671,   672,     0,   673,   674,   675,   676,   677,
+     678,   679,     0,   680,   681,   682,   683,   684,   685,   686,
+     687,   688,   689,   690,   691,   692,   693,   694,   695,   696,
+     697,   698,   699,   700,   701,   702,   703,   704,   705,   706,
+     707,   708,   709,   710,   711,   712,   713,   714,   715,   716,
+     717,   718,   719,   720,   243,   244,     0,   245,   246,   247,
+     248,   249,     0,     0,   250,     0,     0,     0,     0,   251,
+       0,     0,   252,     0,   253,   254,   255,   256,   257,   258,
+       0,   259,     0,     0,     0,   260,     0,     0,     0,   261,
+       0,     0,   262,   263,   264,     0,   265,     0,   266,   267,
+       0,     0,   268,     0,     0,   269,   270,     0,   271,   272,
+     273,     0,   274,     0,   275,   276,   277,   278,   279,   280,
+       0,   281,   282,     0,   283,   284,   285,   286,   287,   288,
+     289,   290,   291,   292,   293,     0,   294,   295,     0,   296,
+     297,   298,   299,   300,     0,     0,     0,   301,     0,     0,
+       0,     0,   302,     0,     0,   303,     0,     0,     0,   304,
+     305,   306,     0,     0,   307,     0,     0,     0,     0,   308,
+     309,     0,     0,     0,  3207,   310,   311,     0,   312,     0,
+       0,     0,     0,     0,   313,   314,   315,   316,   317,     0,
+       0,     0,   318,     0,     0,   319,   320,   321,     0,     0,
+       0,   322,     0,   323,   324,     0,   325,   326,   327,     0,
+       0,   328,   329,     0,   330,   331,   332,   333,   334,   335,
+       0,     0,   336,   337,   338,   339,   340,     0,     0,   341,
+     342,     0,   343,   344,   345,   346,   347,     0,     0,   348,
+     349,     0,     0,     0,   350,   351,     0,   352,     0,     0,
+       0,   353,     0,   354,   355,   356,   357,     0,   358,     0,
+     359,     0,     0,     0,   360,   361,     0,   362,     0,     0,
+     363,   364,     0,     0,     0,   365,   366,   367,   368,     0,
+       0,   369,   370,   371,     0,     0,   372,     0,     0,     0,
+       0,   373,   374,   375,     0,     0,     0,   376,     0,     0,
+       0,   377,   378,     0,   379,   380,     0,     0,     0,   381,
+       0,   382,     0,     0,   383,   384,     0,     0,   385,     0,
+       0,   386,   387,     0,     0,     0,     0,     0,   388,   389,
+       0,   390,     0,   391,     0,   392,   393,     0,     0,     0,
+       0,     0,     0,     0,   394,     0,   395,   396,   397,   398,
+     399,   400,   401,   402,   403,   404,   405,   406,   407,   408,
+     409,   410,   411,     0,   412,   413,   414,     0,   415,   416,
+     417,   418,     0,   419,   420,     0,     0,     0,     0,   421,
+     422,   423,   424,   425,   426,     0,     0,   427,   428,     0,
+     429,     0,   430,     0,   431,   432,   433,   434,   435,   436,
+     437,   438,   439,     0,     0,   440,   441,     0,     0,   442,
+     443,   444,   445,   446,     0,     0,     0,   447,   448,     0,
+       0,     0,   449,     0,   450,   451,     0,   452,   453,   454,
+       0,     0,   455,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   456,   457,   458,     0,   459,     0,   460,     0,
+     461,   462,   463,   464,   465,   466,   467,   468,   469,   470,
+       0,   471,     0,   472,   473,   474,     0,   475,     0,   476,
+     477,   478,   479,   480,     0,   481,   482,   483,     0,     0,
+     484,     0,     0,     0,   485,   486,     0,   487,   488,     0,
+       0,   489,   490,   491,   492,   493,     0,   494,   495,     0,
+     496,   497,   498,     0,     0,   499,   500,   501,   502,   503,
+     504,   505,   506,     0,   507,     0,   508,   509,     0,   510,
+     511,   512,     0,   513,     0,     0,   514,   515,   516,   517,
+       0,   518,     0,   519,   520,   521,   522,   523,     0,   524,
+     525,     0,     0,     0,   526,   527,   528,   529,     0,     0,
+       0,   530,     0,     0,     0,   531,     0,   532,   533,   534,
+     535,     0,   536,   537,   538,   539,   540,     0,     0,     0,
+       0,     0,   541,   542,   543,     0,   544,     0,     0,   545,
+       0,     0,   546,     0,   547,     0,   548,   549,   550,   551,
+     552,   553,     0,     0,   554,   555,     0,     0,   556,   557,
+     558,   559,   560,   561,     0,     0,   562,   563,   564,   565,
+       0,   566,   567,     0,     0,   568,   569,   570,   571,     0,
+       0,   572,   573,     0,   574,   575,   576,   577,     0,     0,
+       0,     0,     0,   578,   579,     0,     0,     0,   580,   581,
+     582,     0,     0,   583,   584,     0,   585,   586,     0,   587,
+     588,     0,     0,   589,     0,     0,   590,     0,   591,     0,
+     592,   593,     0,     0,     0,     0,     0,   594,     0,   595,
+       0,     0,   596,     0,     0,     0,   597,     0,   598,   599,
+     600,   601,     0,     0,     0,     0,     0,     0,   602,   603,
+     604,     0,   605,   606,   607,   608,     0,     0,   609,     0,
+       0,   610,   611,   612,   613,   614,     0,   615,     0,     0,
+       0,     0,     0,     0,     0,     0,   616,   617,   618,     0,
+     619,   620,   621,     0,   622,     0,     0,   623,     0,   624,
+       0,     0,     0,     0,     0,     0,   625,   626,     0,     0,
+     627,     0,   628,     0,   629,   630,     0,     0,     0,   631,
+     632,   633,   634,   635,   636,   637,   638,     0,   639,   640,
+     641,   642,   643,   644,   645,   646,   647,   648,     0,   649,
+     650,   651,   652,   653,   654,   655,   656,   657,   658,   659,
+     660,   661,   662,   663,   664,   665,   666,   667,   668,   669,
+     670,   671,   672,     0,   673,   674,   675,   676,   677,   678,
+     679,     0,   680,   681,   682,   683,   684,   685,   686,   687,
+     688,   689,   690,   691,   692,   693,   694,   695,   696,   697,
+     698,   699,   700,   701,   702,   703,   704,   705,   706,   707,
+     708,   709,   710,   711,   712,   713,   714,   715,   716,   717,
+     718,   719,   720,   243,   244,     0,   245,   246,   247,   248,
+     249,  3230,     0,   250,     0,     0,     0,     0,   251,     0,
+       0,   252,     0,   253,   254,   255,   256,   257,   258,     0,
+     259,     0,     0,     0,   260,     0,     0,     0,   261,     0,
+       0,   262,   263,   264,     0,   265,     0,   266,   267,     0,
+       0,   268,     0,     0,   269,   270,     0,   271,   272,   273,
+       0,   274,     0,   275,   276,   277,   278,   279,   280,     0,
+     281,   282,     0,   283,   284,   285,   286,   287,   288,   289,
+     290,   291,   292,   293,     0,   294,   295,     0,   296,   297,
+     298,   299,   300,     0,     0,     0,   301,     0,     0,     0,
+       0,   302,     0,     0,   303,     0,     0,     0,   304,   305,
+     306,     0,     0,   307,     0,     0,     0,     0,   308,   309,
+       0,     0,     0,     0,   310,   311,     0,   312,     0,     0,
+       0,     0,     0,   313,   314,   315,   316,   317,     0,     0,
+       0,   318,     0,     0,   319,   320,   321,     0,     0,     0,
+     322,     0,   323,   324,     0,   325,   326,   327,     0,     0,
+     328,   329,     0,   330,   331,   332,   333,   334,   335,     0,
+       0,   336,   337,   338,   339,   340,     0,     0,   341,   342,
+       0,   343,   344,   345,   346,   347,     0,     0,   348,   349,
+       0,     0,     0,   350,   351,     0,   352,     0,     0,     0,
+     353,     0,   354,   355,   356,   357,     0,   358,     0,   359,
+       0,     0,     0,   360,   361,     0,   362,     0,     0,   363,
+     364,     0,     0,     0,   365,   366,   367,   368,     0,     0,
+     369,   370,   371,     0,     0,   372,     0,     0,     0,     0,
+     373,   374,   375,     0,     0,     0,   376,     0,     0,     0,
+     377,   378,     0,   379,   380,     0,     0,     0,   381,     0,
+     382,     0,     0,   383,   384,     0,     0,   385,     0,     0,
+     386,   387,     0,     0,     0,     0,     0,   388,   389,     0,
+     390,     0,   391,     0,   392,   393,     0,     0,     0,     0,
+       0,     0,     0,   394,     0,   395,   396,   397,   398,   399,
+     400,   401,   402,   403,   404,   405,   406,   407,   408,   409,
+     410,   411,     0,   412,   413,   414,     0,   415,   416,   417,
+     418,     0,   419,   420,     0,     0,     0,     0,   421,   422,
+     423,   424,   425,   426,     0,     0,   427,   428,     0,   429,
+       0,   430,     0,   431,   432,   433,   434,   435,   436,   437,
+     438,   439,     0,     0,   440,   441,     0,     0,   442,   443,
+     444,   445,   446,     0,     0,     0,   447,   448,     0,     0,
+       0,   449,     0,   450,   451,     0,   452,   453,   454,     0,
+       0,   455,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   456,   457,   458,     0,   459,     0,   460,     0,   461,
+     462,   463,   464,   465,   466,   467,   468,   469,   470,     0,
+     471,     0,   472,   473,   474,     0,   475,     0,   476,   477,
+     478,   479,   480,     0,   481,   482,   483,     0,     0,   484,
+       0,     0,     0,   485,   486,     0,   487,   488,     0,     0,
+     489,   490,   491,   492,   493,     0,   494,   495,     0,   496,
+     497,   498,     0,     0,   499,   500,   501,   502,   503,   504,
+     505,   506,     0,   507,     0,   508,   509,     0,   510,   511,
+     512,     0,   513,     0,     0,   514,   515,   516,   517,     0,
+     518,     0,   519,   520,   521,   522,   523,     0,   524,   525,
+       0,     0,     0,   526,   527,   528,   529,     0,     0,     0,
+     530,     0,     0,     0,   531,     0,   532,   533,   534,   535,
+       0,   536,   537,   538,   539,   540,     0,     0,     0,     0,
+       0,   541,   542,   543,     0,   544,     0,     0,   545,     0,
+       0,   546,     0,   547,     0,   548,   549,   550,   551,   552,
+     553,     0,     0,   554,   555,     0,     0,   556,   557,   558,
+     559,   560,   561,     0,     0,   562,   563,   564,   565,     0,
+     566,   567,     0,     0,   568,   569,   570,   571,     0,     0,
+     572,   573,     0,   574,   575,   576,   577,     0,     0,     0,
+       0,     0,   578,   579,     0,     0,     0,   580,   581,   582,
+       0,     0,   583,   584,     0,   585,   586,     0,   587,   588,
+       0,     0,   589,     0,     0,   590,     0,   591,     0,   592,
+     593,     0,     0,     0,     0,     0,   594,     0,   595,     0,
+       0,   596,     0,     0,     0,   597,     0,   598,   599,   600,
+     601,     0,     0,     0,     0,     0,     0,   602,   603,   604,
+       0,   605,   606,   607,   608,     0,     0,   609,     0,     0,
+     610,   611,   612,   613,   614,     0,   615,     0,     0,     0,
+       0,     0,     0,     0,     0,   616,   617,   618,     0,   619,
+     620,   621,     0,   622,     0,     0,   623,     0,   624,     0,
+       0,     0,     0,     0,     0,   625,   626,     0,     0,   627,
+       0,   628,     0,   629,   630,     0,     0,     0,   631,   632,
+     633,   634,   635,   636,   637,   638,     0,   639,   640,   641,
+     642,   643,   644,   645,   646,   647,   648,     0,   649,   650,
+     651,   652,   653,   654,   655,   656,   657,   658,   659,   660,
+     661,   662,   663,   664,   665,   666,   667,   668,   669,   670,
+     671,   672,     0,   673,   674,   675,   676,   677,   678,   679,
+       0,   680,   681,   682,   683,   684,   685,   686,   687,   688,
+     689,   690,   691,   692,   693,   694,   695,   696,   697,   698,
+     699,   700,   701,   702,   703,   704,   705,   706,   707,   708,
      709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,    -1,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
+     719,   720,   243,   244,     0,   245,   246,   247,   248,   249,
+       0,     0,   250,     0,     0,     0,     0,   251,     0,     0,
+     252,     0,   253,   254,   255,   256,   257,   258,     0,   259,
+       0,     0,     0,   260,     0,     0,     0,   261,     0,     0,
+     262,   263,   264,     0,   265,     0,   266,   267,     0,     0,
+     268,     0,     0,   269,   270,     0,   271,   272,   273,     0,
+     274,     0,   275,   276,   277,   278,   279,   280,     0,   281,
+     282,     0,   283,   284,   285,   286,   287,   288,   289,   290,
+     291,   292,   293,     0,   294,   295,     0,   296,   297,   298,
+     299,   300,     0,     0,     0,   301,     0,     0,     0,     0,
+     302,     0,     0,   303,     0,     0,     0,   304,   305,   306,
+       0,     0,   307,     0,     0,     0,     0,   308,   309,     0,
+       0,     0,  3259,   310,   311,     0,   312,     0,     0,     0,
+       0,     0,   313,   314,   315,   316,   317,     0,     0,     0,
+     318,     0,     0,   319,   320,   321,     0,     0,     0,   322,
+       0,   323,   324,     0,   325,   326,   327,     0,     0,   328,
+     329,     0,   330,   331,   332,   333,   334,   335,     0,     0,
+     336,   337,   338,   339,   340,     0,     0,   341,   342,     0,
+     343,   344,   345,   346,   347,     0,     0,   348,   349,     0,
+       0,     0,   350,   351,     0,   352,     0,     0,     0,   353,
+       0,   354,   355,   356,   357,     0,   358,     0,   359,     0,
+       0,     0,   360,   361,     0,   362,     0,     0,   363,   364,
+       0,     0,     0,   365,   366,   367,   368,     0,     0,   369,
+     370,   371,     0,     0,   372,     0,     0,     0,     0,   373,
+     374,   375,     0,     0,     0,   376,     0,     0,     0,   377,
+     378,     0,   379,   380,     0,     0,     0,   381,     0,   382,
+       0,     0,   383,   384,     0,     0,   385,     0,     0,   386,
+     387,     0,     0,     0,     0,     0,   388,   389,     0,   390,
+       0,   391,     0,   392,   393,     0,     0,     0,     0,     0,
+       0,     0,   394,     0,   395,   396,   397,   398,   399,   400,
+     401,   402,   403,   404,   405,   406,   407,   408,   409,   410,
+     411,     0,   412,   413,   414,     0,   415,   416,   417,   418,
+       0,   419,   420,     0,     0,     0,     0,   421,   422,   423,
+     424,   425,   426,     0,     0,   427,   428,     0,   429,     0,
+     430,     0,   431,   432,   433,   434,   435,   436,   437,   438,
+     439,     0,     0,   440,   441,     0,     0,   442,   443,   444,
+     445,   446,     0,     0,     0,   447,   448,     0,     0,     0,
+     449,     0,   450,   451,     0,   452,   453,   454,     0,     0,
+     455,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     456,   457,   458,     0,   459,     0,   460,     0,   461,   462,
+     463,   464,   465,   466,   467,   468,   469,   470,     0,   471,
+       0,   472,   473,   474,     0,   475,     0,   476,   477,   478,
+     479,   480,     0,   481,   482,   483,     0,     0,   484,     0,
+       0,     0,   485,   486,     0,   487,   488,     0,     0,   489,
+     490,   491,   492,   493,     0,   494,   495,     0,   496,   497,
+     498,     0,     0,   499,   500,   501,   502,   503,   504,   505,
+     506,     0,   507,     0,   508,   509,     0,   510,   511,   512,
+       0,   513,     0,     0,   514,   515,   516,   517,     0,   518,
+       0,   519,   520,   521,   522,   523,     0,   524,   525,     0,
+       0,     0,   526,   527,   528,   529,     0,     0,     0,   530,
+       0,     0,     0,   531,     0,   532,   533,   534,   535,     0,
+     536,   537,   538,   539,   540,     0,     0,     0,     0,     0,
+     541,   542,   543,     0,   544,     0,     0,   545,     0,     0,
+     546,     0,   547,     0,   548,   549,   550,   551,   552,   553,
+       0,     0,   554,   555,     0,     0,   556,   557,   558,   559,
+     560,   561,     0,     0,   562,   563,   564,   565,     0,   566,
+     567,     0,     0,   568,   569,   570,   571,     0,     0,   572,
+     573,     0,   574,   575,   576,   577,     0,     0,     0,     0,
+       0,   578,   579,     0,     0,     0,   580,   581,   582,     0,
+       0,   583,   584,     0,   585,   586,     0,   587,   588,     0,
+       0,   589,     0,     0,   590,     0,   591,     0,   592,   593,
+       0,     0,     0,     0,     0,   594,     0,   595,     0,     0,
+     596,     0,     0,     0,   597,     0,   598,   599,   600,   601,
+       0,     0,     0,     0,     0,     0,   602,   603,   604,     0,
+     605,   606,   607,   608,     0,     0,   609,     0,     0,   610,
+     611,   612,   613,   614,     0,   615,     0,     0,     0,     0,
+       0,     0,     0,     0,   616,   617,   618,     0,   619,   620,
+     621,     0,   622,     0,     0,   623,     0,   624,     0,     0,
+       0,     0,     0,     0,   625,   626,     0,     0,   627,     0,
+     628,     0,   629,   630,     0,     0,     0,   631,   632,   633,
+     634,   635,   636,   637,   638,     0,   639,   640,   641,   642,
+     643,   644,   645,   646,   647,   648,     0,   649,   650,   651,
+     652,   653,   654,   655,   656,   657,   658,   659,   660,   661,
+     662,   663,   664,   665,   666,   667,   668,   669,   670,   671,
+     672,     0,   673,   674,   675,   676,   677,   678,   679,     0,
+     680,   681,   682,   683,   684,   685,   686,   687,   688,   689,
+     690,   691,   692,   693,   694,   695,   696,   697,   698,   699,
+     700,   701,   702,   703,   704,   705,   706,   707,   708,   709,
+     710,   711,   712,   713,   714,   715,   716,   717,   718,   719,
+     720,   243,   244,     0,   245,   246,   247,   248,   249,     0,
+       0,   250,     0,     0,     0,     0,   251,     0,     0,   252,
+       0,   253,   254,   255,   256,   257,   258,     0,   259,     0,
+       0,     0,   260,     0,     0,     0,   261,     0,     0,   262,
+     263,   264,     0,   265,     0,   266,   267,     0,     0,   268,
+       0,     0,   269,   270,     0,   271,   272,   273,     0,   274,
+       0,   275,   276,   277,   278,   279,   280,     0,   281,   282,
+       0,   283,   284,   285,   286,   287,   288,   289,   290,   291,
+     292,   293,     0,   294,   295,     0,   296,   297,   298,   299,
+     300,     0,     0,     0,   301,     0,     0,     0,     0,   302,
+       0,     0,   303,     0,     0,     0,   304,   305,   306,     0,
+       0,   307,     0,     0,     0,     0,   308,   309,     0,     0,
+       0,     0,   310,   311,     0,   312,     0,     0,     0,     0,
+       0,   313,   314,   315,   316,   317,     0,     0,     0,   318,
+       0,     0,   319,   320,   321,     0,     0,     0,   322,     0,
+     323,   324,     0,   325,   326,   327,     0,     0,   328,   329,
+       0,   330,   331,   332,   333,   334,   335,     0,     0,   336,
+     337,   338,   339,   340,     0,     0,   341,   342,     0,   343,
+     344,   345,   346,   347,     0,     0,   348,   349,     0,     0,
+       0,   350,   351,     0,   352,     0,     0,     0,   353,     0,
+     354,   355,   356,   357,     0,   358,     0,   359,     0,     0,
+       0,   360,   361,     0,   362,     0,     0,   363,   364,     0,
+       0,     0,   365,   366,   367,   368,     0,     0,   369,   370,
+     371,     0,     0,   372,     0,     0,     0,     0,   373,   374,
+     375,     0,     0,     0,   376,     0,     0,     0,   377,   378,
+       0,   379,   380,     0,     0,     0,   381,     0,   382,     0,
+       0,   383,   384,     0,     0,   385,     0,     0,   386,   387,
+       0,     0,     0,     0,     0,   388,   389,     0,   390,     0,
+     391,     0,   392,   393,     0,     0,     0,     0,     0,     0,
+       0,   394,     0,   395,   396,   397,   398,   399,   400,   401,
+     402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
+       0,   412,   413,   414,     0,   415,   416,   417,   418,     0,
+     419,   420,     0,     0,     0,     0,   421,   422,   423,   424,
+     425,   426,     0,     0,   427,   428,     0,   429,     0,   430,
+       0,   431,   432,   433,   434,   435,   436,   437,   438,   439,
+       0,     0,   440,   441,     0,     0,   442,   443,   444,   445,
+     446,     0,     0,     0,   447,   448,     0,     0,     0,   449,
+       0,   450,   451,     0,   452,   453,   454,     0,     0,   455,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   456,
+     457,   458,     0,   459,     0,   460,     0,   461,   462,   463,
+     464,   465,   466,   467,   468,   469,   470,     0,   471,     0,
+     472,   473,   474,  3324,   475,     0,   476,   477,   478,   479,
+     480,     0,   481,   482,   483,     0,     0,   484,     0,     0,
+       0,   485,   486,     0,   487,   488,     0,     0,   489,   490,
+     491,   492,   493,     0,   494,   495,     0,   496,   497,   498,
+       0,     0,   499,   500,   501,   502,   503,   504,   505,   506,
+       0,   507,     0,   508,   509,     0,   510,   511,   512,     0,
+     513,     0,     0,   514,   515,   516,   517,     0,   518,     0,
+     519,   520,   521,   522,   523,     0,   524,   525,     0,     0,
+       0,   526,   527,   528,   529,     0,     0,     0,   530,     0,
+       0,     0,   531,     0,   532,   533,   534,   535,     0,   536,
+     537,   538,   539,   540,     0,     0,     0,     0,     0,   541,
+     542,   543,     0,   544,     0,     0,   545,     0,     0,   546,
+       0,   547,     0,   548,   549,   550,   551,   552,   553,     0,
+       0,   554,   555,     0,     0,   556,   557,   558,   559,   560,
+     561,     0,     0,   562,   563,   564,   565,     0,   566,   567,
+       0,     0,   568,   569,   570,   571,     0,     0,   572,   573,
+       0,   574,   575,   576,   577,     0,     0,     0,     0,     0,
+     578,   579,     0,     0,     0,   580,   581,   582,     0,     0,
+     583,   584,     0,   585,   586,     0,   587,   588,     0,     0,
+     589,     0,     0,   590,     0,   591,     0,   592,   593,     0,
+       0,     0,     0,     0,   594,     0,   595,     0,     0,   596,
+       0,     0,     0,   597,     0,   598,   599,   600,   601,     0,
+       0,     0,     0,     0,     0,   602,   603,   604,     0,   605,
+     606,   607,   608,     0,     0,   609,     0,     0,   610,   611,
+     612,   613,   614,     0,   615,     0,     0,     0,     0,     0,
+       0,     0,     0,   616,   617,   618,     0,   619,   620,   621,
+       0,   622,     0,     0,   623,     0,   624,     0,     0,     0,
+       0,     0,     0,   625,   626,     0,     0,   627,     0,   628,
+       0,   629,   630,     0,     0,     0,   631,   632,   633,   634,
+     635,   636,   637,   638,     0,   639,   640,   641,   642,   643,
+     644,   645,   646,   647,   648,     0,   649,   650,   651,   652,
+     653,   654,   655,   656,   657,   658,   659,   660,   661,   662,
+     663,   664,   665,   666,   667,   668,   669,   670,   671,   672,
+       0,   673,   674,   675,   676,   677,   678,   679,     0,   680,
+     681,   682,   683,   684,   685,   686,   687,   688,   689,   690,
+     691,   692,   693,   694,   695,   696,   697,   698,   699,   700,
+     701,   702,   703,   704,   705,   706,   707,   708,   709,   710,
+     711,   712,   713,   714,   715,   716,   717,   718,   719,   720,
+     243,   244,     0,   245,   246,   247,   248,   249,     0,     0,
+     250,     0,     0,     0,     0,   251,     0,     0,   252,     0,
+     253,   254,   255,   256,   257,   258,     0,   259,     0,     0,
+       0,   260,     0,     0,     0,   261,     0,     0,   262,   263,
+     264,     0,   265,     0,   266,   267,     0,     0,   268,     0,
+       0,   269,   270,     0,   271,   272,   273,     0,   274,     0,
+     275,   276,   277,   278,   279,   280,     0,   281,   282,     0,
+     283,   284,   285,   286,   287,   288,   289,   290,   291,   292,
+     293,     0,   294,   295,     0,   296,   297,   298,   299,   300,
+       0,     0,     0,   301,     0,     0,     0,     0,   302,     0,
+       0,   303,     0,     0,     0,   304,   305,   306,     0,     0,
+     307,     0,     0,     0,     0,   308,   309,     0,     0,     0,
+       0,   310,   311,     0,   312,     0,     0,     0,     0,     0,
+     313,   314,   315,   316,   317,     0,     0,     0,   318,     0,
+       0,   319,   320,   321,     0,     0,     0,   322,     0,   323,
+     324,     0,   325,   326,   327,     0,     0,   328,   329,     0,
+     330,   331,   332,   333,   334,   335,     0,     0,   336,   337,
+     338,   339,   340,     0,     0,   341,   342,     0,   343,   344,
+     345,   346,   347,     0,     0,   348,   349,     0,     0,     0,
+     350,   351,     0,   352,     0,     0,     0,   353,     0,   354,
+     355,   356,   357,     0,   358,     0,   359,     0,     0,     0,
+     360,   361,     0,   362,     0,     0,   363,   364,     0,     0,
+       0,   365,   366,   367,   368,     0,     0,   369,   370,   371,
+       0,     0,   372,     0,     0,     0,     0,   373,   374,   375,
+       0,     0,     0,   376,     0,     0,     0,   377,   378,     0,
+     379,   380,     0,     0,     0,   381,     0,   382,     0,     0,
+     383,   384,     0,     0,   385,     0,     0,   386,   387,     0,
+       0,     0,     0,     0,   388,   389,     0,   390,     0,   391,
+       0,   392,   393,     0,     0,     0,     0,     0,     0,     0,
+     394,     0,   395,   396,   397,   398,   399,   400,   401,   402,
+     403,   404,   405,   406,   407,   408,   409,   410,   411,     0,
+     412,   413,   414,     0,   415,   416,   417,   418,     0,   419,
+     420,     0,     0,     0,     0,   421,   422,   423,   424,   425,
+     426,     0,     0,   427,   428,     0,   429,     0,   430,     0,
+     431,   432,   433,   434,   435,   436,   437,   438,   439,     0,
+       0,   440,   441,     0,     0,   442,   443,   444,   445,   446,
+       0,     0,     0,   447,   448,     0,     0,     0,   449,     0,
+     450,   451,     0,   452,   453,   454,     0,     0,   455,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   456,   457,
+     458,     0,   459,     0,   460,     0,   461,   462,   463,   464,
+     465,   466,   467,   468,   469,   470,     0,   471,     0,   472,
+     473,   474,     0,   475,     0,   476,   477,   478,   479,   480,
+       0,   481,   482,   483,     0,     0,   484,     0,     0,     0,
+     485,   486,     0,   487,   488,     0,     0,   489,   490,   491,
+     492,   493,     0,   494,   495,     0,   496,   497,   498,     0,
+       0,   499,   500,   501,   502,   503,   504,   505,   506,     0,
+     507,     0,   508,   509,     0,   510,   511,   512,     0,   513,
+       0,     0,   514,   515,   516,   517,     0,   518,     0,   519,
+     520,   521,   522,   523,     0,   524,   525,     0,     0,     0,
+     526,   527,   528,   529,     0,     0,     0,   530,     0,     0,
+       0,   531,     0,   532,   533,   534,   535,     0,   536,   537,
+     538,   539,   540,     0,     0,     0,     0,     0,   541,   542,
+     543,     0,   544,     0,     0,   545,     0,     0,   546,     0,
+     547,     0,   548,   549,   550,   551,   552,   553,     0,     0,
+     554,   555,     0,     0,   556,   557,   558,   559,   560,   561,
+       0,     0,   562,   563,   564,   565,     0,   566,   567,     0,
+       0,   568,   569,   570,   571,     0,     0,   572,   573,     0,
+     574,   575,   576,   577,     0,     0,     0,     0,     0,   578,
+     579,     0,     0,     0,   580,   581,   582,     0,     0,   583,
+     584,     0,   585,   586,     0,   587,   588,     0,     0,   589,
+       0,     0,   590,     0,   591,     0,   592,   593,     0,     0,
+       0,     0,     0,   594,     0,   595,     0,     0,   596,     0,
+       0,     0,   597,     0,   598,   599,   600,   601,     0,     0,
+       0,     0,     0,     0,   602,   603,   604,     0,   605,   606,
+     607,   608,     0,     0,   609,     0,     0,   610,   611,   612,
+     613,   614,     0,   615,     0,     0,     0,     0,     0,     0,
+       0,     0,   616,   617,   618,     0,   619,   620,   621,     0,
+     622,     0,     0,   623,     0,   624,     0,     0,     0,     0,
+       0,     0,   625,   626,     0,     0,   627,     0,   628,     0,
+     629,   630,     0,     0,     0,   631,   632,   633,   634,   635,
+     636,   637,   638,     0,   639,   640,   641,   642,   643,   644,
+     645,   646,   647,   648,     0,   649,   650,   651,   652,   653,
+     654,   655,   656,   657,   658,   659,   660,   661,   662,   663,
+     664,   665,   666,   667,   668,   669,   670,   671,   672,     0,
+     673,   674,   675,   676,   677,   678,   679,     0,   680,   681,
+     682,   683,   684,   685,   686,   687,   688,   689,   690,   691,
+     692,   693,   694,   695,   696,   697,   698,   699,   700,   701,
+     702,   703,   704,   705,   706,   707,   708,   709,   710,   711,
+     712,   713,   714,   715,   716,   717,   718,   719,   720,   243,
+     244,     0,   245,   246,   247,   248,   249,     0,     0,   250,
+       0,     0,     0,     0,   251,     0,     0,   252,     0,   253,
+     254,   255,   256,   257,   258,     0,   259,     0,     0,     0,
+     260,     0,     0,     0,   261,     0,     0,   262,   263,   264,
+       0,   265,     0,   266,   267,     0,     0,   268,     0,     0,
+     269,   270,     0,   271,   272,   273,     0,   274,     0,   275,
+     276,   277,   278,   279,   280,     0,   281,   282,     0,   283,
+     284,   285,   286,   287,   288,   289,   290,   291,   292,   293,
+       0,   294,   295,     0,   296,   297,   298,   299,   300,     0,
+       0,     0,   301,     0,     0,     0,     0,   302,     0,     0,
+     303,     0,     0,     0,   304,   305,   306,     0,     0,   307,
+       0,     0,     0,     0,   308,   309,     0,     0,     0,     0,
+     310,   311,     0,   312,     0,     0,     0,     0,     0,   313,
+     314,   315,   316,   317,     0,     0,     0,   318,     0,     0,
+     319,   320,   321,     0,     0,     0,   322,     0,   323,   324,
+       0,   325,   326,   327,     0,     0,   328,   329,     0,   330,
+     331,   332,   333,   334,   335,     0,     0,   336,   337,   338,
+     339,   340,     0,     0,   341,   342,     0,   343,   344,   345,
+    2194,   347,     0,     0,   348,   349,     0,     0,     0,   350,
+     351,     0,   352,     0,     0,     0,   353,     0,   354,   355,
+     356,   357,     0,   358,     0,   359,     0,     0,     0,   360,
+     361,     0,   362,     0,     0,   363,   364,     0,     0,     0,
+     365,   366,   367,   368,     0,     0,   369,   370,   371,     0,
+       0,   372,     0,     0,     0,     0,   373,   374,   375,     0,
+       0,     0,   376,     0,     0,     0,   377,   378,     0,   379,
+     380,     0,     0,     0,   381,     0,   382,     0,     0,   383,
+     384,     0,     0,   385,     0,     0,   386,   387,     0,     0,
+       0,     0,     0,   388,   389,     0,   390,     0,   391,     0,
+     392,   393,     0,     0,     0,     0,     0,     0,     0,   394,
+       0,   395,   396,   397,   398,   399,   400,   401,   402,   403,
+     404,   405,   406,   407,   408,   409,   410,   411,     0,   412,
+     413,   414,     0,   415,   416,   417,   418,     0,   419,   420,
+       0,     0,     0,     0,   421,   422,   423,   424,   425,   426,
+       0,     0,   427,   428,     0,   429,     0,   430,     0,   431,
+     432,   433,   434,   435,   436,   437,   438,   439,     0,     0,
+     440,   441,     0,     0,   442,   443,  2195,   445,   446,     0,
+       0,     0,   447,   448,     0,     0,     0,   449,     0,   450,
+     451,     0,   452,   453,   454,     0,     0,   455,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   456,   457,   458,
+       0,   459,     0,   460,     0,   461,   462,   463,   464,   465,
+     466,   467,   468,   469,   470,     0,   471,     0,   472,   473,
+     474,     0,   475,     0,   476,   477,   478,   479,   480,     0,
+     481,   482,   483,     0,     0,   484,     0,     0,     0,   485,
+     486,     0,   487,   488,     0,     0,   489,   490,   491,   492,
+     493,     0,   494,   495,     0,   496,   497,   498,     0,     0,
+     499,   500,   501,   502,   503,   504,   505,   506,     0,   507,
+       0,   508,   509,     0,   510,   511,   512,     0,   513,     0,
+       0,   514,   515,   516,   517,     0,   518,     0,   519,   520,
+     521,   522,   523,     0,   524,   525,     0,     0,     0,   526,
+     527,   528,   529,     0,     0,     0,   530,     0,     0,     0,
+     531,     0,   532,   533,   534,   535,     0,   536,   537,   538,
+     539,   540,     0,     0,     0,     0,     0,   541,   542,   543,
+       0,   544,     0,     0,   545,     0,     0,   546,     0,   547,
+       0,   548,   549,   550,   551,   552,   553,     0,     0,   554,
+     555,     0,     0,   556,   557,   558,   559,   560,   561,     0,
+       0,   562,   563,   564,   565,     0,   566,   567,     0,     0,
+     568,   569,   570,   571,     0,     0,   572,   573,     0,   574,
+     575,   576,   577,     0,     0,     0,     0,     0,   578,   579,
+       0,     0,     0,   580,   581,   582,     0,     0,   583,   584,
+       0,   585,   586,     0,   587,   588,     0,     0,   589,     0,
+       0,   590,     0,   591,     0,   592,   593,     0,     0,     0,
+       0,     0,   594,     0,   595,     0,     0,   596,     0,     0,
+       0,   597,     0,   598,   599,   600,   601,     0,     0,     0,
+       0,     0,     0,   602,   603,   604,     0,   605,   606,   607,
+     608,     0,     0,   609,     0,     0,   610,   611,   612,   613,
+     614,     0,   615,     0,     0,     0,     0,     0,     0,     0,
+       0,   616,   617,   618,     0,   619,   620,   621,     0,   622,
+       0,     0,   623,     0,   624,     0,     0,     0,     0,     0,
+       0,   625,   626,     0,     0,   627,     0,   628,     0,   629,
+     630,     0,     0,     0,   631,   632,   633,   634,   635,   636,
+     637,   638,     0,   639,   640,   641,   642,   643,   644,   645,
+     646,   647,   648,     0,   649,   650,   651,   652,   653,   654,
+     655,   656,   657,   658,   659,   660,   661,   662,   663,   664,
+     665,   666,   667,   668,   669,   670,   671,   672,     0,   673,
+     674,   675,   676,   677,   678,   679,     0,   680,   681,   682,
+     683,   684,   685,   686,   687,   688,   689,   690,   691,   692,
+     693,   694,   695,   696,   697,   698,   699,   700,   701,   702,
+     703,   704,   705,   706,   707,   708,   709,   710,   711,   712,
+     713,   714,   715,   716,   717,   718,   719,   720,   243,   244,
+       0,   245,   246,   247,   248,   249,     0,     0,   250,     0,
+       0,     0,     0,   251,     0,     0,   252,     0,   253,   254,
+     255,   256,   257,   258,     0,   259,     0,     0,     0,   260,
+       0,     0,     0,   261,     0,     0,   262,   263,   264,     0,
+     265,     0,   266,   267,     0,     0,   268,     0,     0,   269,
+     270,     0,   271,   272,   273,     0,   274,     0,   275,   276,
+     277,   278,   279,   280,     0,   281,   282,     0,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,     0,
+     294,   295,     0,   296,   297,   298,   299,   300,     0,     0,
+       0,   301,     0,     0,     0,     0,   302,     0,     0,   303,
+       0,     0,     0,   304,   305,   306,     0,     0,   307,     0,
+       0,     0,     0,   308,   309,     0,     0,     0,     0,   310,
+     311,     0,   312,     0,     0,     0,     0,     0,   313,   314,
+     315,   316,   317,     0,     0,     0,   318,     0,     0,   319,
+     320,   321,     0,     0,     0,   322,     0,   323,   324,     0,
+     325,   326,   327,     0,     0,   328,   329,     0,   330,   331,
+     332,   333,   334,   335,     0,     0,   336,   337,   338,   339,
+     340,     0,     0,   341,   342,     0,   343,   344,   345,   346,
+     347,     0,     0,   348,   349,     0,     0,     0,   350,   351,
+       0,   352,     0,     0,     0,   353,     0,   354,   355,   356,
+     357,     0,   358,     0,   359,     0,     0,     0,   360,   361,
+       0,   362,     0,     0,   363,   364,     0,     0,     0,   365,
+     366,   367,   368,     0,     0,   369,   370,   371,     0,     0,
+     372,     0,     0,     0,     0,   373,   374,   375,     0,     0,
+       0,   376,     0,     0,     0,   377,   378,     0,   379,   380,
+       0,     0,     0,   381,     0,   382,     0,     0,   383,   384,
+       0,     0,   385,     0,     0,   386,   387,     0,     0,     0,
+       0,     0,   388,   389,     0,   390,     0,   391,     0,   392,
+     393,     0,     0,     0,     0,     0,     0,     0,   394,     0,
+     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
+     405,   406,   407,   408,   409,   410,   411,     0,   412,   413,
+     414,     0,   415,   416,   417,   418,     0,   419,   420,     0,
+       0,     0,     0,   421,   422,   423,   424,   425,   426,     0,
+       0,   427,   428,     0,   429,     0,   430,     0,   431,   432,
+     433,   434,   435,   436,   437,   438,   439,     0,     0,   440,
+     441,     0,     0,   442,   443,   444,   445,   446,     0,     0,
+       0,   447,   448,     0,     0,     0,   449,     0,   450,   451,
+       0,   452,   453,   454,     0,     0,   455,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   456,   457,   458,     0,
+     459,     0,   460,     0,   461,   462,   463,   464,   465,   466,
+     467,   468,   469,   470,     0,   471,     0,   472,   473,   474,
+       0,   475,     0,   476,   477,   478,   479,   480,     0,   481,
+     482,   483,     0,     0,   484,     0,     0,     0,   485,   486,
+       0,   487,   488,     0,     0,   489,   490,   491,   492,   493,
+       0,   494,   495,     0,   496,   497,   498,     0,     0,   499,
+     500,   501,   502,   503,   504,   505,   506,     0,   507,     0,
+     508,   509,     0,   510,   511,   512,     0,   513,     0,     0,
+     514,   515,   516,   517,     0,   518,     0,   519,   520,   521,
+     522,   523,     0,   524,   525,     0,     0,     0,   526,   527,
+     528,   529,     0,     0,     0,   530,     0,     0,     0,   531,
+       0,   532,   533,   534,   535,     0,   536,   537,   538,   539,
+     540,     0,     0,     0,     0,     0,   541,   542,   543,     0,
+     544,     0,     0,   545,     0,     0,   546,     0,   547,     0,
+     548,   549,   550,   551,   552,   553,     0,     0,   554,   555,
+       0,     0,   556,   557,   558,   559,   560,   561,     0,     0,
+     562,   563,   564,   565,     0,   566,   567,     0,     0,   568,
+     569,   570,   571,     0,     0,   572,   573,     0,   574,   575,
+     576,   577,     0,     0,     0,     0,     0,   578,   579,     0,
+       0,     0,   580,   581,   582,     0,     0,   583,   584,     0,
+     585,   586,     0,   587,   588,     0,     0,   589,     0,     0,
+     590,     0,   591,     0,   592,   593,     0,     0,     0,     0,
+       0,   594,     0,   595,     0,     0,   596,     0,     0,     0,
+     597,     0,   598,   599,   600,   601,     0,     0,     0,     0,
+       0,     0,   602,   603,   604,     0,   605,   606,   607,   608,
+       0,     0,   609,     0,     0,   610,   611,   612,   613,   614,
+       0,   615,     0,     0,     0,     0,     0,     0,     0,     0,
+     616,   617,   618,     0,   619,   620,   621,     0,   622,     0,
+       0,   623,     0,   624,     0,     0,     0,     0,     0,     0,
+     625,   626,     0,     0,   627,     0,   628,     0,   629,   630,
+       0,     0,     0,  5211,   632,   633,   634,   635,   636,   637,
+     638,     0,   639,   640,   641,   642,   643,   644,   645,   646,
+     647,   648,     0,   649,   650,   651,   652,   653,   654,   655,
+     656,   657,   658,   659,   660,   661,   662,   663,   664,   665,
+     666,   667,   668,   669,   670,   671,   672,     0,   673,   674,
+     675,   676,   677,   678,   679,     0,   680,   681,   682,   683,
+     684,   685,   686,   687,   688,   689,   690,   691,   692,   693,
+     694,   695,   696,   697,   698,   699,   700,   701,   702,   703,
+     704,   705,   706,   707,   708,   709,   710,   711,   712,   713,
+     714,   715,   716,   717,   718,   719,   720,   243,   244,     0,
+     245,   246,   247,   248,   249,     0,     0,   250,     0,     0,
+       0,     0,   251,     0,     0,   252,     0,   253,   254,   255,
+     256,   257,   258,     0,   259,     0,     0,     0,   260,     0,
+       0,     0,   261,     0,     0,   262,   263,   264,     0,   265,
+       0,   266,   267,     0,     0,   268,     0,     0,   269,   270,
+       0,   271,   272,   273,     0,   274,     0,   275,   276,   277,
+     278,   279,   280,     0,   281,   282,     0,   283,   284,   285,
+     286,   287,   288,   289,   290,   291,   292,   293,     0,   294,
+     295,     0,   296,   297,   298,   299,   300,     0,     0,     0,
+     301,     0,     0,     0,     0,   302,     0,     0,   303,     0,
+       0,     0,   304,   305,   306,     0,     0,   307,     0,     0,
+       0,     0,   308,   309,     0,     0,     0,  1545,   310,   311,
+       0,   312,     0,     0,     0,     0,     0,   313,   314,   315,
+     316,   317,     0,     0,     0,   318,     0,     0,   319,   320,
+     321,     0,     0,     0,   322,     0,   323,   324,     0,   325,
+     326,   327,     0,     0,   328,   329,     0,   330,   331,   332,
+     333,   334,   335,     0,     0,   336,   337,   338,   339,   340,
+       0,     0,   341,   342,     0,   343,   344,   345,   346,   347,
+       0,     0,   348,   349,     0,     0,     0,   350,   351,     0,
+     352,     0,     0,     0,   353,     0,   354,   355,   356,   357,
+       0,     0,     0,   359,     0,     0,     0,   360,   361,     0,
+     362,     0,     0,   363,   364,     0,     0,     0,   365,   366,
+     367,   368,     0,     0,   369,   370,   371,     0,     0,   372,
+       0,     0,     0,     0,   373,   374,   375,     0,     0,     0,
+     376,     0,     0,     0,   377,   378,     0,   379,   380,     0,
+       0,     0,   381,     0,   382,     0,     0,   383,   384,     0,
+       0,   385,     0,     0,   386,   387,     0,     0,     0,     0,
+       0,   388,   389,     0,     0,     0,   391,     0,   392,   393,
+       0,     0,     0,     0,     0,     0,     0,   394,     0,   395,
+     396,   397,   398,   399,   400,   401,   402,   403,   404,   405,
+     406,   407,   408,   409,   410,   411,     0,   412,   413,   414,
+       0,   415,   416,   417,   418,     0,   419,   420,     0,     0,
+       0,     0,   421,   422,   423,   424,   425,   426,     0,     0,
+     427,   428,     0,   429,     0,   430,     0,   431,   432,   433,
+     434,   435,   436,   437,   438,   439,     0,     0,   440,   441,
+       0,     0,   442,   443,   444,   445,   446,     0,     0,     0,
+     447,   448,     0,     0,     0,   449,     0,   450,   451,     0,
+     452,   453,   454,     0,     0,   455,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   456,   457,   458,     0,   459,
+       0,   460,     0,   461,   462,   463,   464,   465,   466,   467,
+     468,   469,   470,     0,   471,     0,   472,   473,   474,     0,
+     475,     0,   476,   477,   478,   479,   480,     0,   481,   482,
+     483,     0,     0,   484,     0,     0,     0,   485,   486,     0,
+     487,   488,     0,     0,   489,   490,   491,   492,   493,     0,
+     494,   495,     0,   496,   497,   498,     0,     0,   499,   500,
+     501,   502,   503,   504,   505,   506,     0,   507,     0,   508,
+     509,     0,   510,   511,   512,     0,   513,     0,     0,   514,
+     515,   516,   517,     0,   518,     0,   519,   520,   521,   522,
+     523,     0,   524,   525,     0,     0,     0,   526,   527,     0,
+     529,     0,     0,     0,   530,     0,     0,     0,   531,     0,
+     532,   533,   534,   535,     0,   536,   537,   538,   539,   540,
+       0,     0,     0,     0,     0,   541,   542,   543,     0,   544,
+       0,     0,   545,     0,     0,   546,     0,   547,     0,   548,
+     549,   550,   551,   552,   553,     0,     0,   554,   555,     0,
+       0,   556,   557,   558,   559,   560,   561,     0,     0,   562,
+     563,   564,   565,     0,   566,   567,     0,     0,   568,   569,
+     570,   571,     0,     0,   572,   573,     0,   574,   575,   576,
+     577,     0,     0,     0,     0,     0,  1546,   579,     0,     0,
+       0,   580,   581,   582,     0,     0,   583,   584,     0,   585,
+     586,     0,   587,   588,     0,     0,   589,     0,     0,   590,
+       0,   591,     0,   592,   593,     0,     0,     0,     0,     0,
+     594,     0,   595,     0,     0,   596,     0,     0,     0,   597,
+       0,   598,   599,   600,   601,     0,     0,     0,     0,     0,
+       0,   602,   603,   604,     0,   605,   606,   607,   608,     0,
+       0,   609,     0,     0,     0,   611,   612,   613,   614,     0,
+     615,     0,     0,     0,     0,     0,     0,     0,     0,   616,
+     617,   618,     0,     0,   620,   621,     0,   622,     0,     0,
+     623,     0,   624,     0,     0,     0,     0,     0,     0,   625,
+     626,     0,     0,   627,     0,   628,     0,   629,   630,     0,
+       0,     0,   631,   632,   633,   634,   635,   636,   637,   638,
+       0,   639,   640,   641,   642,   643,   644,   645,   646,   647,
+     648,     0,   649,   650,   651,   652,   653,   654,   655,   656,
+     657,   658,   659,   660,   661,   662,   663,   664,   665,   666,
+     667,   668,   669,   670,   671,   672,     0,   673,   674,   675,
+     676,   677,   678,   679,     0,   680,   681,   682,   683,   684,
+     685,   686,   687,   688,   689,   690,   691,   692,   693,   694,
+     695,   696,   697,   698,   699,   700,   701,   702,   703,   704,
+     705,   706,   707,   708,   709,   710,   711,   712,   713,   714,
+     715,   716,   717,   718,   719,   720,   243,   244,     0,   245,
+     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
+       0,   251,     0,     0,   252,     0,   253,   254,   255,   256,
+     257,   258,     0,   259,     0,     0,     0,   260,     0,     0,
+       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
+     266,   267,     0,     0,   268,     0,     0,   269,   270,     0,
+     271,   272,   273,     0,   274,     0,   275,   276,   277,   278,
+     279,   280,     0,   281,   282,     0,   283,   284,   285,   286,
+     287,   288,   289,   290,   291,   292,   293,     0,   294,   295,
+       0,   296,   297,   298,   299,   300,     0,     0,     0,   301,
+       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
+       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
+       0,   308,   309,     0,     0,     0,  1545,   310,   311,     0,
+     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
+     317,     0,     0,     0,   318,     0,     0,   319,   320,   321,
+       0,     0,     0,   322,     0,   323,   324,     0,   325,   326,
+     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
+     334,   335,     0,     0,   336,   337,   338,   339,   340,     0,
+       0,   341,   342,     0,   343,   344,   345,   346,   347,     0,
+       0,   348,   349,     0,     0,     0,   350,   351,     0,   352,
+       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
+       0,     0,   359,     0,     0,     0,   360,   361,     0,   362,
+       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
+     368,     0,     0,   369,   370,   371,     0,     0,   372,     0,
+       0,     0,     0,   373,   374,   375,     0,     0,     0,   376,
+       0,     0,     0,   377,   378,     0,   379,   380,     0,     0,
+       0,   381,     0,   382,     0,     0,   383,   384,     0,     0,
+     385,     0,     0,   386,   387,     0,     0,     0,     0,     0,
+     388,   389,     0,     0,     0,   391,     0,   392,   393,     0,
+       0,     0,     0,     0,     0,     0,   394,     0,   395,   396,
+     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
+     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
+     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
+       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
+     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
+     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
+       0,   442,   443,   444,   445,   446,     0,     0,     0,   447,
+     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
+     453,   454,     0,     0,   455,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
+     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
+     469,   470,     0,   471,     0,   472,   473,   474,     0,   475,
+       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
+       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
+     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
+     495,     0,   496,   497,   498,     0,     0,   499,   500,   501,
+     502,   503,   504,   505,   506,     0,   507,     0,   508,   509,
+       0,   510,   511,   512,     0,   513,     0,     0,   514,   515,
+     516,   517,     0,   518,     0,   519,   520,   521,   522,   523,
+       0,   524,   525,     0,     0,     0,   526,   527,     0,   529,
+       0,     0,     0,   530,     0,     0,     0,   531,     0,   532,
+     533,   534,   535,     0,   536,   537,   538,   539,   540,     0,
+       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
+       0,   545,     0,     0,   546,     0,   547,     0,   548,   549,
+     550,   551,   552,   553,     0,     0,   554,   555,     0,     0,
+     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
+     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
+     571,     0,     0,   572,   573,     0,   574,   575,   576,   577,
+       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
+     580,   581,   582,     0,     0,   583,   584,     0,   585,   586,
+       0,   587,   588,     0,     0,   589,     0,     0,   590,     0,
+     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
+       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
+     598,   599,   600,   601,     0,     0,     0,     0,     0,     0,
+     602,   603,   604,     0,   605,   606,   607,   608,     0,     0,
+     609,     0,     0,     0,   611,   612,   613,   614,     0,   615,
+       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
+     618,     0,     0,   620,   621,     0,   622,     0,     0,   623,
+       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
+       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
+       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
+     639,   640,   641,   642,   643,   644,   645,   646,   647,   648,
+       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
+     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
+     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
+     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
+     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
+     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
+     706,   707,   708,   709,   710,   711,   712,   713,   714,   715,
+     716,   717,   718,   719,   720,   243,   244,     0,   245,   246,
+     247,   248,   249,  1530,     0,   250,     0,     0,     0,     0,
+     251,     0,     0,   252,     0,   253,   254,   255,   256,   257,
+     258,     0,   259,     0,     0,     0,   260,     0,     0,     0,
+     261,     0,     0,   262,   263,   264,     0,   265,     0,   266,
+     267,     0,     0,   268,     0,     0,   269,   270,     0,   271,
+     272,   273,     0,   274,     0,   275,   276,   277,   278,   279,
+     280,     0,   281,   282,     0,   283,   284,   285,   286,   287,
+     288,   289,   290,   291,   292,   293,     0,   294,   295,     0,
+     296,   297,   298,   299,   300,     0,     0,     0,   301,     0,
+       0,     0,     0,   302,     0,     0,   303,     0,     0,     0,
+     304,   305,   306,     0,     0,   307,     0,     0,     0,     0,
+     308,   309,     0,     0,     0,  1531,   310,   311,     0,   312,
+       0,     0,     0,     0,     0,   313,   314,   315,   316,   317,
+       0,     0,     0,   318,     0,     0,   319,   320,   321,     0,
+       0,     0,   322,     0,   323,   324,     0,   325,   326,   327,
+       0,     0,   328,   329,     0,   330,   331,     0,   333,   334,
+       0,     0,     0,   336,   337,   338,   339,   340,     0,     0,
+     341,   342,     0,     0,   344,   345,   346,   347,     0,     0,
+     348,   349,     0,     0,     0,   350,   351,     0,   352,     0,
+       0,     0,   353,     0,   354,   355,   356,   357,     0,   358,
+       0,   359,     0,     0,     0,   360,   361,     0,   362,     0,
+       0,   363,   364,     0,     0,     0,   365,   366,   367,   368,
+       0,     0,   369,   370,   371,     0,     0,   372,     0,     0,
+       0,     0,   373,   374,   375,     0,     0,     0,   376,     0,
+       0,     0,   377,   378,     0,   379,   380,     0,     0,     0,
+     381,     0,   382,     0,     0,   383,   384,     0,     0,   385,
+       0,     0,   386,   387,   947,     0,     0,     0,     0,   388,
+     389,     0,   390,     0,   391,     0,   392,   393,     0,     0,
+       0,     0,     0,     0,     0,   394,     0,   395,   396,   397,
+     398,   399,   400,   401,   402,   403,   404,   405,   406,   407,
+     408,   409,   410,   411,     0,   412,   413,   414,     0,   415,
+     416,   417,   418,     0,   419,   420,     0,     0,     0,     0,
+     421,   422,   423,   424,   425,   426,     0,     0,   427,   428,
+       0,   429,     0,   430,     0,   431,   432,   433,   434,   435,
+     436,   437,   438,   439,     0,     0,   440,   441,     0,     0,
+     442,   443,   444,   445,  1532,     0,     0,     0,   447,   448,
+       0,     0,     0,   449,     0,   450,   451,     0,   452,   453,
+     454,     0,     0,   455,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   456,   457,   458,     0,   459,     0,   460,
+       0,   461,   462,   463,   464,   465,   466,   467,   468,   469,
+     470,     0,   471,     0,   472,   473,   474,     0,   475,     0,
+       0,   477,   478,   479,     0,     0,   481,   482,   483,     0,
+       0,   484,     0,     0,     0,   485,   486,     0,   487,   488,
+       0,     0,   489,   490,   491,   492,   493,     0,     0,   495,
+       0,   496,   497,   498,     0,     0,     0,   500,   501,   502,
+     503,   504,   505,   506,     0,   507,     0,   508,   509,     0,
+     510,   511,   512,     0,   513,     0,     0,   514,   515,   516,
+     517,     0,   518,     0,   519,   520,   521,   522,   523,     0,
+     524,   525,     0,     0,     0,   526,   527,   528,   529,     0,
+       0,     0,   530,     0,     0,     0,     0,     0,   532,   533,
+     534,   535,     0,   536,   537,   538,   539,   540,     0,     0,
+       0,     0,     0,   541,   542,   543,     0,   544,     0,     0,
+     545,     0,     0,   546,     0,   547,     0,   548,   549,   550,
+     551,   552,   553,     0,     0,   554,   555,     0,     0,   556,
+     557,   558,   559,   560,   561,     0,     0,     0,   563,   564,
+     565,     0,   566,   567,     0,     0,   568,   569,   570,   571,
+       0,   240,   572,   573,     0,   574,   575,   576,   577,     0,
+       0,     0,     0,     0,   578,   579,     0,     0,     0,   580,
+     581,   582,     0,     0,   583,   584,     0,   585,   586,     0,
+     587,   588,     0,     0,   589,     0,     0,   590,     0,   591,
+       0,   592,   593,     0,     0,     0,     0,     0,   594,     0,
+     595,     0,     0,   596,     0,     0,     0,   597,     0,   598,
+     599,   600,   601,     0,     0,     0,     0,     0,     0,   602,
+     603,   604,     0,   605,   606,   607,   608,     0,     0,   609,
+       0,     0,   610,   611,   612,   613,   614,     0,   615,     0,
+       0,     0,     0,     0,     0,     0,     0,   616,   617,   618,
+       0,   619,   620,   621,     0,   622,     0,     0,   623,     0,
+     624,     0,     0,     0,     0,     0,     0,   625,   626,     0,
+       0,   627,     0,   628,     0,   629,   630,     0,     0,     0,
+     631,   632,   633,   634,   635,   636,   637,     0,     0,   639,
+     640,   641,     0,   643,   644,   645,   646,   647,   648,     0,
+     649,   650,   651,   652,   653,   654,   655,   656,   657,   658,
+     659,   660,   661,   662,   663,   664,   665,   666,   667,   668,
+     669,   670,   671,   672,     0,   673,   674,   675,   676,   677,
+     678,   679,     0,   680,   681,   682,   683,   684,   685,   686,
+     687,   688,   689,   690,   691,   692,   693,   694,   695,   696,
+     697,   698,   699,   700,   701,   702,   703,   704,   705,   706,
+     707,   708,   709,   710,   711,   712,   713,   714,   715,   716,
+     717,   718,   719,   720,   243,   244,     0,   245,   246,   247,
+     248,   249,  5294,     0,   250,     0,     0,     0,     0,   251,
+       0,     0,   252,     0,   253,   254,   255,   256,   257,   258,
+       0,   259,     0,     0,     0,   260,     0,     0,     0,   261,
+       0,     0,   262,   263,   264,     0,   265,     0,   266,   267,
+       0,     0,   268,     0,     0,   269,   270,     0,   271,   272,
+     273,     0,   274,     0,   275,   276,   277,   278,   279,   280,
+       0,   281,   282,     0,   283,   284,   285,   286,   287,   288,
+     289,   290,   291,   292,   293,     0,   294,   295,     0,   296,
+     297,   298,   299,   300,     0,     0,     0,   301,     0,     0,
+       0,     0,   302,     0,     0,   303,     0,     0,     0,   304,
+     305,   306,     0,     0,   307,     0,     0,     0,     0,   308,
+     309,     0,     0,     0,  5295,   310,   311,     0,   312,     0,
+       0,     0,     0,     0,   313,   314,   315,   316,   317,     0,
+       0,     0,   318,     0,     0,   319,   320,   321,     0,     0,
+       0,   322,     0,   323,   324,     0,   325,   326,   327,     0,
+       0,   328,   329,     0,   330,   331,     0,   333,   334,     0,
+       0,     0,   336,   337,   338,   339,   340,     0,     0,   341,
+     342,     0,     0,   344,   345,   346,   347,     0,     0,   348,
+     349,     0,     0,     0,   350,   351,     0,   352,     0,     0,
+       0,   353,     0,   354,   355,   356,   357,     0,   358,     0,
+     359,     0,     0,     0,   360,   361,     0,   362,     0,     0,
+     363,   364,     0,     0,     0,   365,   366,   367,   368,     0,
+       0,   369,   370,   371,     0,     0,   372,     0,     0,     0,
+       0,   373,   374,   375,     0,     0,     0,   376,     0,     0,
+       0,   377,   378,     0,   379,   380,     0,     0,     0,   381,
+       0,   382,     0,     0,   383,   384,     0,     0,   385,     0,
+       0,   386,   387,   947,     0,     0,     0,     0,   388,   389,
+       0,   390,     0,   391,     0,   392,   393,     0,     0,     0,
+       0,     0,     0,     0,   394,     0,   395,   396,   397,   398,
+     399,   400,   401,   402,   403,   404,   405,   406,   407,   408,
+     409,   410,   411,     0,   412,   413,   414,     0,   415,   416,
+     417,   418,     0,   419,   420,     0,     0,     0,     0,   421,
+     422,   423,   424,   425,   426,     0,     0,   427,   428,     0,
+     429,     0,   430,     0,   431,   432,   433,   434,   435,   436,
+     437,   438,   439,     0,     0,   440,   441,     0,     0,   442,
+     443,   444,   445,  5296,     0,     0,     0,   447,   448,     0,
+       0,     0,   449,     0,   450,   451,     0,   452,   453,   454,
+       0,     0,   455,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   456,   457,   458,     0,   459,     0,   460,     0,
+     461,   462,   463,   464,   465,   466,   467,   468,   469,   470,
+       0,   471,     0,   472,   473,   474,     0,   475,     0,     0,
+     477,   478,   479,     0,     0,   481,   482,   483,     0,     0,
+     484,     0,     0,     0,   485,   486,     0,   487,   488,     0,
+       0,   489,   490,   491,   492,   493,     0,     0,   495,     0,
+     496,   497,   498,     0,     0,     0,   500,   501,   502,   503,
+     504,   505,   506,     0,   507,     0,   508,   509,     0,   510,
+     511,   512,     0,   513,     0,     0,   514,   515,   516,   517,
+       0,   518,     0,   519,   520,   521,   522,   523,     0,   524,
+     525,     0,     0,     0,   526,   527,   528,   529,     0,     0,
+       0,   530,     0,     0,     0,     0,     0,   532,   533,   534,
+     535,     0,   536,   537,   538,   539,   540,     0,     0,     0,
+       0,     0,   541,   542,   543,     0,   544,     0,     0,   545,
+       0,     0,   546,     0,   547,     0,   548,   549,   550,   551,
+     552,   553,     0,     0,   554,   555,     0,     0,   556,   557,
+     558,   559,   560,   561,     0,     0,     0,   563,   564,   565,
+       0,   566,   567,     0,     0,   568,   569,   570,   571,     0,
+     240,   572,   573,     0,   574,   575,   576,   577,     0,     0,
+       0,     0,     0,   578,   579,     0,     0,     0,   580,   581,
+     582,     0,     0,   583,   584,     0,   585,   586,     0,   587,
+     588,     0,     0,   589,     0,     0,   590,     0,   591,     0,
+     592,   593,     0,     0,     0,     0,     0,   594,     0,   595,
+       0,     0,   596,     0,     0,     0,   597,     0,   598,   599,
+     600,   601,     0,     0,     0,     0,     0,     0,   602,   603,
+     604,     0,   605,   606,   607,   608,     0,     0,   609,     0,
+       0,   610,   611,   612,   613,   614,     0,   615,     0,     0,
+       0,     0,     0,     0,     0,     0,   616,   617,   618,     0,
+     619,   620,   621,     0,   622,     0,     0,   623,     0,   624,
+       0,     0,     0,     0,     0,     0,   625,   626,     0,     0,
+     627,     0,   628,     0,   629,   630,     0,     0,     0,   631,
+     632,   633,   634,   635,   636,   637,     0,     0,   639,   640,
+     641,     0,   643,   644,   645,   646,   647,   648,     0,   649,
+     650,   651,   652,   653,   654,   655,   656,   657,   658,   659,
+     660,   661,   662,   663,   664,   665,   666,   667,   668,   669,
+     670,   671,   672,     0,   673,   674,   675,   676,   677,   678,
+     679,     0,   680,   681,   682,   683,   684,   685,   686,   687,
+     688,   689,   690,   691,   692,   693,   694,   695,   696,   697,
+     698,   699,   700,   701,   702,   703,   704,   705,   706,   707,
+     708,   709,   710,   711,   712,   713,   714,   715,   716,   717,
+     718,   719,   720,   243,   244,     0,   245,   246,   247,   248,
+     249,  2254,     0,   250,     0,     0,     0,     0,   251,     0,
+       0,   252,     0,   253,   254,   255,   256,   257,   258,     0,
+     259,     0,     0,     0,   260,     0,     0,     0,   261,     0,
+       0,   262,   263,   264,     0,   265,     0,   266,   267,     0,
+       0,   268,     0,     0,   269,   270,     0,   271,   272,   273,
+       0,   274,     0,   275,   276,   277,   278,   279,   280,     0,
+     281,   282,     0,   283,   284,   285,   286,   287,   288,   289,
+     290,   291,   292,   293,     0,   294,   295,     0,   296,   297,
+     298,   299,   300,     0,     0,     0,   301,     0,     0,     0,
+       0,   302,     0,     0,   303,     0,     0,     0,   304,   305,
+     306,     0,     0,   307,     0,     0,     0,     0,   308,   309,
+       0,     0,     0,     0,   310,   311,     0,   312,     0,     0,
+       0,     0,     0,   313,   314,   315,   316,   317,     0,     0,
+       0,   318,     0,     0,   319,   320,   321,     0,     0,     0,
+     322,     0,   323,   324,     0,   325,   326,   327,     0,     0,
+     328,   329,     0,   330,   331,     0,   333,   334,     0,     0,
+       0,   336,   337,   338,   339,   340,     0,     0,   341,   342,
+       0,     0,   344,   345,   346,   347,     0,     0,   348,   349,
+       0,     0,     0,   350,   351,     0,   352,     0,     0,     0,
+     353,     0,   354,   355,   356,   357,     0,   358,     0,   359,
+       0,     0,     0,   360,   361,     0,   362,     0,     0,   363,
+     364,     0,     0,     0,   365,   366,   367,   368,     0,     0,
+     369,   370,   371,     0,     0,   372,     0,     0,     0,     0,
+     373,   374,   375,     0,     0,     0,   376,     0,     0,     0,
+     377,   378,     0,   379,   380,     0,     0,     0,   381,     0,
+     382,     0,     0,   383,   384,     0,     0,   385,     0,     0,
+     386,   387,   947,     0,     0,     0,     0,   388,   389,     0,
+     390,     0,   391,     0,   392,   393,     0,     0,     0,     0,
+       0,     0,     0,   394,     0,   395,   396,   397,   398,   399,
+     400,   401,   402,   403,   404,   405,   406,   407,   408,   409,
+     410,   411,     0,   412,   413,   414,     0,   415,   416,   417,
+     418,     0,   419,   420,     0,     0,     0,     0,   421,   422,
+     423,   424,   425,   426,     0,     0,   427,   428,     0,   429,
+       0,   430,     0,   431,   432,   433,   434,   435,   436,   437,
+     438,   439,     0,     0,   440,   441,     0,     0,   442,   443,
+     444,   445,  2255,     0,     0,     0,   447,   448,     0,     0,
+       0,   449,     0,   450,   451,     0,   452,   453,   454,     0,
+       0,   455,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   456,   457,   458,     0,   459,     0,   460,     0,   461,
+     462,   463,   464,   465,   466,   467,   468,   469,   470,     0,
+     471,     0,   472,   473,   474,     0,   475,     0,     0,   477,
+     478,   479,     0,     0,   481,   482,   483,     0,     0,   484,
+       0,     0,     0,   485,   486,     0,   487,   488,     0,     0,
+     489,   490,   491,   492,   493,     0,     0,   495,     0,   496,
+     497,   498,     0,     0,     0,   500,   501,   502,   503,   504,
+     505,   506,     0,   507,     0,   508,   509,     0,   510,   511,
+     512,     0,   513,     0,     0,   514,   515,   516,   517,     0,
+     518,     0,   519,   520,   521,   522,   523,     0,   524,   525,
+       0,     0,     0,   526,   527,   528,   529,     0,     0,     0,
+     530,     0,     0,     0,     0,     0,   532,   533,   534,   535,
+       0,   536,   537,   538,   539,   540,     0,     0,     0,     0,
+       0,   541,   542,   543,     0,   544,     0,     0,   545,     0,
+       0,   546,     0,   547,     0,   548,   549,   550,   551,   552,
+     553,     0,     0,   554,   555,     0,     0,   556,   557,   558,
+     559,   560,   561,     0,     0,     0,   563,   564,   565,     0,
+     566,   567,     0,     0,   568,   569,   570,   571,     0,   240,
+     572,   573,     0,   574,   575,   576,   577,     0,     0,     0,
+       0,     0,   578,   579,     0,     0,     0,   580,   581,   582,
+       0,     0,   583,   584,     0,   585,   586,     0,   587,   588,
+       0,     0,   589,     0,     0,   590,     0,   591,     0,   592,
+     593,     0,     0,     0,     0,     0,   594,     0,   595,     0,
+       0,   596,     0,     0,     0,   597,     0,   598,   599,   600,
+     601,     0,     0,     0,     0,     0,     0,   602,   603,   604,
+       0,   605,   606,   607,   608,     0,     0,   609,     0,     0,
+     610,   611,   612,   613,   614,     0,   615,     0,     0,     0,
+       0,     0,     0,     0,     0,   616,   617,   618,     0,   619,
+     620,   621,     0,   622,     0,     0,   623,     0,   624,     0,
+       0,     0,     0,     0,     0,   625,   626,     0,     0,   627,
+       0,   628,     0,   629,   630,     0,     0,     0,   631,   632,
+     633,   634,   635,   636,   637,     0,     0,   639,   640,   641,
+       0,   643,   644,   645,   646,   647,   648,     0,   649,   650,
+     651,   652,   653,   654,   655,   656,   657,   658,   659,   660,
+     661,   662,   663,   664,   665,   666,   667,   668,   669,   670,
+     671,   672,     0,   673,   674,   675,   676,   677,   678,   679,
+       0,   680,   681,   682,   683,   684,   685,   686,   687,   688,
+     689,   690,   691,   692,   693,   694,   695,   696,   697,   698,
+     699,   700,   701,   702,   703,   704,   705,   706,   707,   708,
      709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,    -1,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
+     719,   720,   243,   244,     0,   245,   246,   247,   248,   249,
+    3084,     0,   250,     0,     0,     0,     0,   251,     0,     0,
+     252,     0,   253,   254,   255,   256,   257,   258,     0,   259,
+       0,     0,     0,   260,     0,     0,     0,   261,     0,     0,
+     262,   263,   264,     0,   265,     0,   266,   267,     0,     0,
+     268,     0,     0,   269,   270,     0,   271,   272,   273,     0,
+     274,     0,   275,   276,   277,   278,   279,   280,     0,   281,
+     282,     0,   283,   284,   285,   286,   287,   288,   289,   290,
+     291,   292,   293,     0,   294,   295,     0,   296,   297,   298,
+     299,   300,     0,     0,     0,   301,     0,     0,     0,     0,
+     302,     0,     0,   303,     0,     0,     0,   304,   305,   306,
+       0,     0,   307,     0,     0,     0,     0,   308,   309,     0,
+       0,     0,     0,   310,   311,     0,   312,     0,     0,     0,
+       0,     0,   313,   314,   315,   316,   317,     0,     0,     0,
+     318,     0,     0,   319,   320,   321,     0,     0,     0,   322,
+       0,   323,   324,     0,   325,   326,   327,     0,     0,   328,
+     329,     0,   330,   331,     0,   333,   334,     0,     0,     0,
+     336,   337,   338,   339,   340,     0,     0,   341,   342,     0,
+       0,   344,   345,   346,   347,     0,     0,   348,   349,     0,
+       0,     0,   350,   351,     0,   352,     0,     0,     0,   353,
+       0,   354,   355,   356,   357,     0,   358,     0,   359,     0,
+       0,     0,   360,   361,     0,   362,     0,     0,   363,   364,
+       0,     0,     0,   365,   366,   367,   368,     0,     0,   369,
+     370,   371,     0,     0,   372,     0,     0,     0,     0,   373,
+     374,   375,     0,     0,     0,   376,     0,     0,     0,   377,
+     378,     0,   379,   380,     0,     0,     0,   381,     0,   382,
+       0,     0,   383,   384,     0,     0,   385,     0,     0,   386,
+     387,   947,     0,     0,     0,     0,   388,   389,     0,   390,
+       0,   391,     0,   392,   393,     0,     0,     0,     0,     0,
+       0,     0,   394,     0,   395,   396,   397,   398,   399,   400,
+     401,   402,   403,   404,   405,   406,   407,   408,   409,   410,
+     411,     0,   412,   413,   414,     0,   415,   416,   417,   418,
+       0,   419,   420,     0,     0,     0,     0,   421,   422,   423,
+     424,   425,   426,     0,     0,   427,   428,     0,   429,     0,
+     430,     0,   431,   432,   433,   434,   435,   436,   437,   438,
+     439,     0,     0,   440,   441,     0,     0,   442,   443,   444,
+     445,  3085,     0,     0,     0,   447,   448,     0,     0,     0,
+     449,     0,   450,   451,     0,   452,   453,   454,     0,     0,
+     455,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     456,   457,   458,     0,   459,     0,   460,     0,   461,   462,
+     463,   464,   465,   466,   467,   468,   469,   470,     0,   471,
+       0,   472,   473,   474,     0,   475,     0,     0,   477,   478,
+     479,     0,     0,   481,   482,   483,     0,     0,   484,     0,
+       0,     0,   485,   486,     0,   487,   488,     0,     0,   489,
+     490,   491,   492,   493,     0,     0,   495,     0,   496,   497,
+     498,     0,     0,     0,   500,   501,   502,   503,   504,   505,
+     506,     0,   507,     0,   508,   509,     0,   510,   511,   512,
+       0,   513,     0,     0,   514,   515,   516,   517,     0,   518,
+       0,   519,   520,   521,   522,   523,     0,   524,   525,     0,
+       0,     0,   526,   527,   528,   529,     0,     0,     0,   530,
+       0,     0,     0,     0,     0,   532,   533,   534,   535,     0,
+     536,   537,   538,   539,   540,     0,     0,     0,     0,     0,
+     541,   542,   543,     0,   544,     0,     0,   545,     0,     0,
+     546,     0,   547,     0,   548,   549,   550,   551,   552,   553,
+       0,     0,   554,   555,     0,     0,   556,   557,   558,   559,
+     560,   561,     0,     0,     0,   563,   564,   565,     0,   566,
+     567,     0,     0,   568,   569,   570,   571,     0,   240,   572,
+     573,     0,   574,   575,   576,   577,     0,     0,     0,     0,
+       0,   578,   579,     0,     0,     0,   580,   581,   582,     0,
+       0,   583,   584,     0,   585,   586,     0,   587,   588,     0,
+       0,   589,     0,     0,   590,     0,   591,     0,   592,   593,
+       0,     0,     0,     0,     0,   594,     0,   595,     0,     0,
+     596,     0,     0,     0,   597,     0,   598,   599,   600,   601,
+       0,     0,     0,     0,     0,     0,   602,   603,   604,     0,
+     605,   606,   607,   608,     0,     0,   609,     0,     0,   610,
+     611,   612,   613,   614,     0,   615,     0,     0,     0,     0,
+       0,     0,     0,     0,   616,   617,   618,     0,   619,   620,
+     621,     0,   622,     0,     0,   623,     0,   624,     0,     0,
+       0,     0,     0,     0,   625,   626,     0,     0,   627,     0,
+     628,     0,   629,   630,     0,     0,     0,   631,   632,   633,
+     634,   635,   636,   637,     0,     0,   639,   640,   641,     0,
+     643,   644,   645,   646,   647,   648,     0,   649,   650,   651,
+     652,   653,   654,   655,   656,   657,   658,   659,   660,   661,
+     662,   663,   664,   665,   666,   667,   668,   669,   670,   671,
+     672,     0,   673,   674,   675,   676,   677,   678,   679,     0,
+     680,   681,   682,   683,   684,   685,   686,   687,   688,   689,
+     690,   691,   692,   693,   694,   695,   696,   697,   698,   699,
+     700,   701,   702,   703,   704,   705,   706,   707,   708,   709,
+     710,   711,   712,   713,   714,   715,   716,   717,   718,   719,
+     720,   243,   244,     0,   245,   246,   247,   248,   249,     0,
+       0,   250,     0,     0,     0,     0,   251,     0,     0,   252,
+       0,   253,   254,   255,   256,   257,   258,     0,   259,     0,
+       0,     0,   260,     0,     0,     0,   261,     0,     0,   262,
+     263,   264,     0,   265,     0,   266,   267,     0,     0,   268,
+       0,     0,   269,   270,     0,   271,   272,   273,     0,   274,
+       0,   275,   276,   277,   278,   279,   280,     0,   281,   282,
+       0,   283,   284,   285,   286,   287,   288,   289,   290,   291,
+     292,   293,     0,   294,   295,     0,   296,   297,   298,   299,
+     300,     0,     0,     0,   301,     0,     0,     0,     0,   302,
+       0,     0,   303,     0,     0,     0,   304,   305,   306,     0,
+       0,   307,     0,     0,     0,     0,   308,   309,     0,     0,
+       0,     0,   310,   311,     0,   312,     0,     0,     0,     0,
+       0,   313,   314,   315,   316,   317,     0,     0,     0,   318,
+       0,     0,   319,   320,   321,     0,     0,     0,   322,     0,
+     323,   324,     0,   325,   326,   327,     0,     0,   328,   329,
+       0,   330,   331,     0,   333,   334,     0,     0,     0,   336,
+     337,   338,   339,   340,     0,     0,   341,   342,     0,     0,
+     344,   345,   346,   347,     0,     0,   348,   349,     0,     0,
+       0,   350,   351,     0,   352,     0,     0,     0,   353,     0,
+     354,   355,   356,   357,     0,   358,     0,   359,     0,     0,
+       0,   360,   361,     0,   362,     0,     0,   363,   364,     0,
+       0,     0,   365,   366,   367,   368,     0,     0,   369,   370,
+     371,     0,     0,   372,     0,     0,     0,     0,   373,   374,
+     375,     0,     0,     0,   376,     0,     0,     0,   377,   378,
+       0,   379,   380,     0,     0,     0,   381,     0,   382,     0,
+       0,   383,   384,     0,     0,   385,     0,     0,   386,   387,
+     947,     0,     0,     0,     0,   388,   389,     0,   390,     0,
+     391,     0,   392,   393,     0,     0,     0,     0,     0,     0,
+       0,   394,     0,   395,   396,   397,   398,   399,   400,   401,
+     402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
+       0,   412,   413,   414,     0,   415,   416,   417,   418,     0,
+     419,   420,     0,     0,     0,     0,   421,   422,   423,   424,
+     425,   426,     0,     0,   427,   428,     0,   429,     0,   430,
+       0,   431,   432,   433,   434,   435,   436,   437,   438,   439,
+       0,     0,   440,   441,     0,     0,   442,   443,   444,   445,
+       0,     0,     0,     0,   447,   448,     0,     0,     0,   449,
+       0,   450,   451,     0,   452,   453,   454,     0,     0,   455,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   456,
+     457,   458,     0,   459,     0,   460,     0,   461,   462,   463,
+     464,   465,   466,   467,   468,   469,   470,     0,   471,     0,
+     472,   473,   474,     0,   475,     0,     0,   477,   478,   479,
+       0,     0,   481,   482,   483,     0,     0,   484,     0,     0,
+       0,   485,   486,     0,   487,   488,     0,     0,   489,   490,
+     491,   492,   493,     0,     0,   495,     0,   496,   497,   498,
+       0,     0,     0,   500,   501,   502,   503,   504,   505,   506,
+       0,   507,     0,   508,   509,     0,   510,   511,   512,     0,
+     513,     0,     0,   514,   515,   516,   517,     0,   518,     0,
+     519,   520,   521,   522,   523,     0,   524,   525,     0,     0,
+       0,   526,   527,   528,   529,     0,     0,     0,   530,     0,
+       0,     0,     0,     0,   532,   533,   534,   535,     0,   536,
+     537,   538,   539,   540,     0,     0,     0,     0,     0,   541,
+     542,   543,     0,   544,     0,     0,   545,     0,     0,   546,
+       0,   547,     0,   548,   549,   550,   551,   552,   553,     0,
+       0,   554,   555,     0,     0,   556,   557,   558,   559,   560,
+     561,     0,     0,     0,   563,   564,   565,     0,   566,   567,
+       0,     0,   568,   569,   570,   571,     0,   240,   572,   573,
+       0,   574,   575,   576,   577,     0,     0,     0,     0,     0,
+     578,   579,     0,     0,     0,   580,   581,   582,     0,     0,
+     583,   584,     0,   585,   586,     0,   587,   588,     0,     0,
+     589,     0,     0,   590,     0,   591,     0,   592,   593,     0,
+       0,     0,     0,     0,   594,     0,   595,     0,     0,   596,
+       0,     0,     0,   597,     0,   598,   599,   600,   601,     0,
+       0,     0,     0,     0,     0,   602,   603,   604,     0,   605,
+     606,   607,   608,     0,     0,   609,     0,     0,   610,   611,
+     612,   613,   614,     0,   615,     0,     0,     0,     0,     0,
+       0,     0,     0,   616,   617,   618,     0,   619,   620,   621,
+       0,   622,     0,     0,   623,     0,   624,     0,     0,     0,
+       0,     0,     0,   625,   626,     0,     0,   627,     0,   628,
+       0,   629,   630,     0,     0,     0,   631,   632,   633,   634,
+     635,   636,   637,     0,     0,   639,   640,   641,     0,   643,
+     644,   645,   646,   647,   648,     0,   649,   650,   651,   652,
+     653,   654,   655,   656,   657,   658,   659,   660,   661,   662,
+     663,   664,   665,   666,   667,   668,   669,   670,   671,   672,
+       0,   673,   674,   675,   676,   677,   678,   679,     0,   680,
+     681,   682,   683,   684,   685,   686,   687,   688,   689,   690,
+     691,   692,   693,   694,   695,   696,   697,   698,   699,   700,
+     701,   702,   703,   704,   705,   706,   707,   708,   709,   710,
+     711,   712,   713,   714,   715,   716,   717,   718,   719,   720,
+     243,   244,     0,   245,   246,   247,   248,   249,     0,     0,
+     250,     0,     0,     0,     0,   251,     0,     0,     0,     0,
+     253,   254,   255,   256,   257,   258,     0,  -564,     0,     0,
+       0,   260,     0,     0,     0,   261,     0,     0,   262,   263,
+     264,     0,   265,     0,     0,     0,     0,     0,   268,  5148,
+       0,   269,   270,     0,   271,   272,     0,     0,     0,     0,
+     275,   276,   277,  5149,   279,   280,     0,   281,   282,     0,
+     283,   284,     0,   286,     0,   288,   289,   290,   291,   292,
+     293,     0,   294,   295,     0,   296,   297,   298,     0,   300,
+       0,     0,     0,   301,     0,     0,     0,     0,   302,     0,
+       0,   303,     0,     0,     0,   304,   305,   306,     0,     0,
+     307,     0,     0,     0,     0,   308,     0,     0,     0,     0,
+       0,   310,   311,     0,   312,     0,     0,     0,     0,     0,
+     313,   314,   315,   316,   317,     0,     0,     0,     0,     0,
+       0,   319,   320,   321,     0,  -534,  -534,   322,     0,  -534,
+     324,     0,   325,   326,   327,     0,     0,   328,   329,     0,
+     330,   331,   332,   333,   334,     0,     0,     0,   336,   337,
+     338,   339,   340,     0,     0,   341,   342,  5150,   343,   344,
+     345,   346,   347,     0,     0,     0,     0,     0,     0,     0,
+     350,   351,     0,   352,     0,     0,     0,   353,     0,   354,
+     355,   356,   357,     0,   358,     0,   359,     0,     0,     0,
+       0,   361,     0,     0,     0,     0,   363,   364,     0,     0,
+       0,   365,   366,   367,   368,  5151,     0,   369,     0,   371,
+       0,     0,   372,     0,     0,     0,     0,   373,   374,     0,
+       0,     0,     0,   376,     0,     0,     0,   377,   378,     0,
+     379,   380,  5152,     0,     0,   381,     0,   382,     0,     0,
+       0,   384,     0,     0,   385,  5153,     0,   386,   387,     0,
+       0,     0,     0,     0,   388,   389,     0,   390,     0,   391,
+       0,   392,   393,     0,     0,     0,     0,  -519,     0,     0,
+     394,     0,   395,   396,   397,   398,   399,   400,   401,   402,
+     403,   404,   405,   406,   407,   408,   409,   410,   411,     0,
+     412,   413,   414,     0,   415,   416,   417,   418,     0,   419,
+     420,     0,     0,     0,     0,   421,   422,   423,   424,   425,
+     426,     0,     0,   427,   428,     0,   429,     0,   430,     0,
+     431,   432,   433,   434,   435,   436,   437,   438,   439,     0,
+       0,   440,   441,     0,     0,   442,   443,   444,   445,   446,
+       0,     0,     0,     0,   448,     0,     0,     0,   449,     0,
+     450,   451,     0,   452,   453,  5154,     0,     0,   455,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   456,   457,
+     458,     0,   459,     0,   460,     0,   461,   462,   463,   464,
+     465,   466,   467,   468,   469,   470,     0,     0,     0,     0,
+     473,   474,     0,   475,     0,   476,   477,   478,   479,   480,
+       0,   481,   482,   483,     0,     0,   484,     0,     0,     0,
+     485,   486,     0,   487,   488,     0,     0,   489,   490,   491,
+     492,   493,     0,   494,   495,     0,   496,     0,   498,  -519,
+       0,   499,   500,   501,   502,   503,   504,   505,   506,     0,
+       0,     0,   508,   509,     0,   510,   511,   512,  5155,   513,
+       0,     0,     0,   515,   516,   517,     0,   518,     0,   519,
+     520,     0,   522,   523,     0,   524,   525,     0,     0,     0,
+     526,   527,   528,   529,     0,     0,     0,   530,     0,     0,
+       0,     0,     0,     0,   533,     0,   535,     0,   536,   537,
+     538,   539,   540,     0,     0,     0,     0,     0,   541,   542,
+     543,     0,   544,     0,     0,   545,     0,     0,   546,     0,
+     547,     0,   548,     0,   550,   551,   552,   553,     0,     0,
+       0,   555,     0,     0,   556,   557,   558,   559,   560,   561,
+       0,     0,   562,   563,   564,   565,     0,   566,   567,     0,
+       0,   568,   569,   570,   571,     0,     0,   572,   573,     0,
+     574,   575,   576,   577,     0,     0,     0,     0,     0,   578,
+     579,     0,     0,     0,     0,   581,   582,     0,     0,   583,
+     584,     0,   585,   586,     0,     0,     0,     0,     0,   589,
+       0,     0,   590,     0,   591,     0,   592,   593,     0,     0,
+       0,     0,     0,   594,     0,   595,     0,     0,   596,     0,
+       0,     0,   597,     0,   598,   599,   600,   601,     0,     0,
+    -519,     0,     0,     0,   602,   603,   604,     0,   605,     0,
+     607,   608,     0,     0,   609,     0,     0,   610,   611,   612,
+     613,   614,     0,   615,     0,     0,     0,     0,     0,     0,
+       0,     0,   616,   617,   618,     0,   619,   620,   621,     0,
+       0,     0,     0,   623,     0,   624,     0,     0,     0,     0,
+       0,     0,   625,   626,     0,     0,   627,     0,   628,     0,
+     629,   630,     0,     0,     0,   631,   632,   633,   634,   635,
+     636,   637,   638,     0,   639,   640,   641,     0,   643,   644,
+     645,   646,   647,   648,     0,   649,   650,   651,   652,   653,
+     654,   655,   656,   657,   658,   659,   660,   661,   662,   663,
+     664,   665,   666,   667,   668,   669,   670,   671,   672,     0,
+     673,   674,   675,   676,   677,   678,   679,     0,   680,   681,
+     682,   683,   684,   685,   686,   687,   688,   689,   690,   691,
+     692,   693,   694,   695,   696,   697,   698,   699,   700,   701,
+     702,   703,   704,   705,   706,   707,   708,   709,   710,   711,
+     712,   713,   714,   715,   716,   717,   718,   719,   720,   243,
+     244,     0,   245,   246,   247,   248,   249,     0,     0,   250,
+       0,     0,     0,     0,   251,     0,     0,     0,     0,   253,
+     254,   255,   256,   257,   258,     0,  -564,     0,     0,     0,
+     260,     0,     0,     0,   261,     0,     0,   262,   263,   264,
+       0,   265,     0,     0,     0,     0,     0,   268,  5148,     0,
+     269,   270,     0,   271,   272,     0,     0,     0,     0,   275,
+     276,   277,  5149,   279,   280,     0,   281,   282,     0,   283,
+     284,     0,   286,     0,   288,   289,   290,   291,   292,   293,
+       0,   294,   295,     0,   296,   297,   298,     0,   300,     0,
+       0,     0,   301,     0,     0,     0,     0,   302,     0,     0,
+     303,     0,     0,     0,   304,   305,   306,     0,     0,   307,
+       0,     0,     0,     0,   308,     0,     0,     0,     0,     0,
+     310,   311,     0,   312,     0,     0,     0,     0,     0,   313,
+     314,   315,   316,   317,     0,     0,     0,     0,     0,     0,
+     319,   320,   321,     0,  -555,     0,   322,     0,  -555,   324,
+       0,   325,   326,   327,     0,     0,   328,   329,     0,   330,
+     331,   332,   333,   334,     0,     0,     0,   336,   337,   338,
+     339,   340,     0,     0,   341,   342,  5150,   343,   344,   345,
+     346,   347,     0,     0,     0,     0,     0,     0,     0,   350,
+     351,     0,   352,     0,     0,     0,   353,     0,   354,   355,
+     356,   357,     0,   358,     0,   359,     0,     0,     0,     0,
+     361,     0,     0,     0,     0,   363,   364,     0,     0,     0,
+     365,   366,   367,   368,  5151,     0,   369,     0,   371,     0,
+       0,   372,     0,     0,     0,     0,   373,   374,     0,     0,
+       0,     0,   376,     0,     0,     0,   377,   378,     0,   379,
+     380,  5152,     0,     0,   381,     0,   382,     0,     0,     0,
+     384,     0,     0,   385,  5153,     0,   386,   387,     0,     0,
+       0,     0,     0,   388,   389,     0,   390,     0,   391,     0,
+     392,   393,     0,     0,     0,     0,  -519,     0,     0,   394,
+       0,   395,   396,   397,   398,   399,   400,   401,   402,   403,
+     404,   405,   406,   407,   408,   409,   410,   411,     0,   412,
+     413,   414,     0,   415,   416,   417,   418,     0,   419,   420,
+       0,     0,     0,     0,   421,   422,   423,   424,   425,   426,
+       0,     0,   427,   428,     0,   429,     0,   430,     0,   431,
+     432,   433,   434,   435,   436,   437,   438,   439,     0,     0,
+     440,   441,     0,     0,   442,   443,   444,   445,   446,     0,
+       0,     0,     0,   448,     0,     0,     0,   449,     0,   450,
+     451,     0,   452,   453,  5154,     0,     0,   455,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   456,   457,   458,
+       0,   459,     0,   460,     0,   461,   462,   463,   464,   465,
+     466,   467,   468,   469,   470,     0,     0,     0,     0,   473,
+     474,     0,   475,     0,   476,   477,   478,   479,   480,     0,
+     481,   482,   483,     0,     0,   484,     0,     0,     0,   485,
+     486,     0,   487,   488,     0,     0,   489,   490,   491,   492,
+     493,     0,   494,   495,     0,   496,     0,   498,  -519,     0,
+     499,   500,   501,   502,   503,   504,   505,   506,     0,     0,
+       0,   508,   509,     0,   510,   511,   512,  5155,   513,     0,
+       0,     0,   515,   516,   517,     0,   518,     0,   519,   520,
+       0,   522,   523,     0,   524,   525,     0,     0,     0,   526,
+     527,   528,   529,     0,     0,     0,   530,     0,     0,     0,
+       0,     0,     0,   533,     0,   535,     0,   536,   537,   538,
+     539,   540,     0,     0,     0,     0,     0,   541,   542,   543,
+       0,   544,     0,     0,   545,     0,     0,   546,     0,   547,
+       0,   548,     0,   550,   551,   552,   553,     0,     0,     0,
+     555,     0,     0,   556,   557,   558,   559,   560,   561,     0,
+       0,   562,   563,   564,   565,     0,   566,   567,     0,     0,
+     568,   569,   570,   571,     0,     0,   572,   573,     0,   574,
+     575,   576,   577,     0,     0,     0,     0,     0,   578,   579,
+       0,     0,     0,     0,   581,   582,     0,     0,   583,   584,
+       0,   585,   586,     0,     0,     0,     0,     0,   589,     0,
+       0,   590,     0,   591,     0,   592,   593,     0,     0,     0,
+       0,     0,   594,     0,   595,     0,     0,   596,     0,     0,
+       0,   597,     0,   598,   599,   600,   601,  -555,     0,  -519,
+       0,     0,     0,   602,   603,   604,     0,   605,     0,   607,
+     608,     0,     0,   609,     0,     0,   610,   611,   612,   613,
+     614,     0,   615,     0,     0,     0,     0,     0,     0,     0,
+       0,   616,   617,   618,     0,   619,   620,   621,     0,     0,
+       0,     0,   623,     0,   624,     0,     0,     0,     0,     0,
+       0,   625,   626,     0,     0,   627,     0,   628,     0,   629,
+     630,     0,     0,     0,   631,   632,   633,   634,   635,   636,
+     637,   638,     0,   639,   640,   641,     0,   643,   644,   645,
+     646,   647,   648,     0,   649,   650,   651,   652,   653,   654,
+     655,   656,   657,   658,   659,   660,   661,   662,   663,   664,
+     665,   666,   667,   668,   669,   670,   671,   672,     0,   673,
+     674,   675,   676,   677,   678,   679,     0,   680,   681,   682,
+     683,   684,   685,   686,   687,   688,   689,   690,   691,   692,
+     693,   694,   695,   696,   697,   698,   699,   700,   701,   702,
+     703,   704,   705,   706,   707,   708,   709,   710,   711,   712,
+     713,   714,   715,   716,   717,   718,   719,   720,   243,   244,
+       0,   245,   246,   247,   248,   249,     0,     0,   250,     0,
+       0,     0,     0,   251,     0,     0,     0,     0,   253,   254,
+     255,   256,   257,   258,     0,  -564,     0,     0,     0,   260,
+       0,     0,     0,   261,     0,     0,   262,   263,   264,     0,
+     265,     0,     0,     0,     0,     0,   268,  5148,     0,   269,
+     270,     0,   271,   272,     0,     0,     0,     0,   275,   276,
+     277,  5149,   279,   280,     0,   281,   282,     0,   283,   284,
+       0,   286,     0,   288,   289,   290,   291,   292,   293,     0,
+     294,   295,     0,   296,   297,   298,     0,   300,     0,     0,
+       0,   301,     0,     0,     0,     0,   302,     0,     0,   303,
+       0,     0,     0,   304,   305,   306,     0,     0,   307,     0,
+       0,     0,     0,   308,     0,     0,     0,     0,     0,   310,
+     311,     0,   312,     0,     0,     0,     0,     0,   313,   314,
+     315,   316,   317,     0,     0,     0,     0,     0,     0,   319,
+     320,   321,     0,  -552,     0,   322,     0,  -552,   324,     0,
+     325,   326,   327,     0,     0,   328,   329,     0,   330,   331,
+     332,   333,   334,     0,     0,     0,   336,   337,   338,   339,
+     340,     0,     0,   341,   342,  5150,   343,   344,   345,   346,
+     347,     0,     0,     0,     0,     0,     0,     0,   350,   351,
+       0,   352,     0,     0,     0,   353,     0,   354,   355,   356,
+     357,     0,   358,     0,   359,     0,     0,     0,     0,   361,
+       0,     0,     0,     0,   363,   364,     0,     0,     0,   365,
+     366,   367,   368,  5151,     0,   369,     0,   371,     0,     0,
+     372,     0,     0,     0,     0,   373,   374,     0,     0,     0,
+       0,   376,     0,     0,     0,   377,   378,     0,   379,   380,
+    5152,     0,     0,   381,     0,   382,     0,     0,     0,   384,
+       0,     0,   385,  5153,     0,   386,   387,     0,     0,     0,
+       0,     0,   388,   389,     0,   390,     0,   391,     0,   392,
+     393,     0,     0,     0,     0,  -519,     0,     0,   394,     0,
+     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
+     405,   406,   407,   408,   409,   410,   411,     0,   412,   413,
+     414,     0,   415,   416,   417,   418,     0,   419,   420,     0,
+       0,     0,     0,   421,   422,   423,   424,   425,   426,     0,
+       0,   427,   428,     0,   429,     0,   430,     0,   431,   432,
+     433,   434,   435,   436,   437,   438,   439,     0,     0,   440,
+     441,     0,     0,   442,   443,   444,   445,   446,     0,     0,
+       0,     0,   448,     0,     0,     0,   449,     0,   450,   451,
+       0,   452,   453,  5154,     0,     0,   455,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   456,   457,   458,     0,
+     459,     0,   460,     0,   461,   462,   463,   464,   465,   466,
+     467,   468,   469,   470,     0,     0,     0,     0,   473,   474,
+       0,   475,     0,   476,   477,   478,   479,   480,     0,   481,
+     482,   483,     0,     0,   484,     0,     0,     0,   485,   486,
+       0,   487,   488,     0,     0,   489,   490,   491,   492,   493,
+       0,   494,   495,     0,   496,     0,   498,  -519,     0,   499,
+     500,   501,   502,   503,   504,   505,   506,     0,     0,     0,
+     508,   509,     0,   510,   511,   512,  5155,   513,     0,     0,
+       0,   515,   516,   517,     0,   518,     0,   519,   520,     0,
+     522,   523,     0,   524,   525,     0,     0,     0,   526,   527,
+     528,   529,     0,     0,     0,   530,     0,     0,     0,     0,
+       0,     0,   533,     0,   535,     0,   536,   537,   538,   539,
+     540,     0,     0,     0,     0,     0,   541,   542,   543,     0,
+     544,     0,     0,   545,     0,     0,   546,     0,   547,     0,
+     548,     0,   550,   551,   552,   553,     0,     0,     0,   555,
+       0,     0,   556,   557,   558,   559,   560,   561,     0,     0,
+     562,   563,   564,   565,     0,   566,   567,     0,     0,   568,
+     569,   570,   571,     0,     0,   572,   573,     0,   574,   575,
+     576,   577,     0,     0,     0,     0,     0,   578,   579,     0,
+       0,     0,     0,   581,   582,     0,     0,   583,   584,     0,
+     585,   586,     0,     0,     0,     0,     0,   589,     0,     0,
+     590,     0,   591,     0,   592,   593,     0,     0,     0,     0,
+       0,   594,     0,   595,     0,     0,   596,     0,     0,     0,
+     597,     0,   598,   599,   600,   601,  -552,     0,  -519,     0,
+       0,     0,   602,   603,   604,     0,   605,     0,   607,   608,
+       0,     0,   609,     0,     0,   610,   611,   612,   613,   614,
+       0,   615,     0,     0,     0,     0,     0,     0,     0,     0,
+     616,   617,   618,     0,   619,   620,   621,     0,     0,     0,
+       0,   623,     0,   624,     0,     0,     0,     0,     0,     0,
+     625,   626,     0,     0,   627,     0,   628,     0,   629,   630,
+       0,     0,     0,   631,   632,   633,   634,   635,   636,   637,
+     638,     0,   639,   640,   641,     0,   643,   644,   645,   646,
+     647,   648,     0,   649,   650,   651,   652,   653,   654,   655,
+     656,   657,   658,   659,   660,   661,   662,   663,   664,   665,
+     666,   667,   668,   669,   670,   671,   672,     0,   673,   674,
+     675,   676,   677,   678,   679,     0,   680,   681,   682,   683,
+     684,   685,   686,   687,   688,   689,   690,   691,   692,   693,
+     694,   695,   696,   697,   698,   699,   700,   701,   702,   703,
+     704,   705,   706,   707,   708,   709,   710,   711,   712,   713,
+     714,   715,   716,   717,   718,   719,   720,   243,   244,     0,
+     245,   246,   247,   248,   249,     0,     0,   250,     0,     0,
+       0,     0,   251,     0,     0,     0,     0,   253,   254,   255,
+     256,   257,   258,     0,  -564,     0,     0,     0,   260,     0,
+       0,     0,   261,     0,     0,   262,   263,   264,     0,   265,
+       0,     0,     0,     0,     0,   268,  5148,     0,   269,   270,
+       0,   271,   272,     0,     0,     0,     0,   275,   276,   277,
+    5149,   279,   280,     0,   281,   282,     0,   283,   284,     0,
+     286,     0,   288,   289,   290,   291,   292,   293,     0,   294,
+     295,     0,   296,   297,   298,     0,   300,     0,     0,     0,
+     301,     0,     0,     0,     0,   302,     0,     0,   303,     0,
+       0,     0,   304,   305,   306,     0,     0,   307,     0,     0,
+       0,     0,   308,     0,     0,     0,     0,     0,   310,   311,
+       0,   312,     0,     0,     0,     0,     0,   313,   314,   315,
+     316,   317,     0,     0,     0,     0,     0,     0,   319,   320,
+     321,     0,     0,     0,   322,     0,  5405,   324,     0,   325,
+     326,   327,     0,     0,   328,   329,     0,   330,   331,   332,
+     333,   334,     0,     0,     0,   336,   337,   338,   339,   340,
+       0,     0,   341,   342,  5150,   343,   344,   345,   346,   347,
+       0,     0,     0,     0,     0,     0,     0,   350,   351,     0,
+     352,     0,     0,     0,   353,     0,   354,   355,   356,   357,
+       0,   358,     0,   359,     0,     0,     0,     0,   361,     0,
+       0,     0,     0,   363,   364,     0,     0,     0,   365,   366,
+     367,   368,  5151,     0,   369,     0,   371,     0,     0,   372,
+       0,     0,     0,     0,   373,   374,     0,     0,     0,     0,
+     376,     0,     0,     0,   377,   378,     0,   379,   380,  5152,
+       0,     0,   381,     0,   382,     0,     0,     0,   384,     0,
+       0,   385,  5153,     0,   386,   387,     0,     0,     0,     0,
+       0,   388,   389,     0,   390,     0,   391,     0,   392,   393,
+       0,     0,     0,     0,  -519,     0,     0,   394,     0,   395,
+     396,   397,   398,   399,   400,   401,   402,   403,   404,   405,
+     406,   407,   408,   409,   410,   411,     0,   412,   413,   414,
+       0,   415,   416,   417,   418,     0,   419,   420,     0,     0,
+       0,     0,   421,   422,   423,   424,   425,   426,     0,     0,
+     427,   428,     0,   429,     0,   430,     0,   431,   432,   433,
+     434,   435,   436,   437,   438,   439,     0,     0,   440,   441,
+       0,     0,   442,   443,   444,   445,   446,     0,     0,     0,
+       0,   448,     0,     0,     0,   449,     0,   450,   451,     0,
+     452,   453,  5154,     0,     0,   455,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   456,   457,   458,     0,   459,
+       0,   460,     0,   461,   462,   463,   464,   465,   466,   467,
+     468,   469,   470,     0,     0,     0,     0,   473,   474,     0,
+     475,     0,   476,   477,   478,   479,   480,     0,   481,   482,
+     483,     0,     0,   484,     0,     0,     0,   485,   486,     0,
+     487,   488,     0,     0,   489,   490,   491,   492,   493,     0,
+     494,   495,     0,   496,     0,   498,  -519,     0,   499,   500,
+     501,   502,   503,   504,   505,   506,     0,     0,     0,   508,
+     509,     0,   510,   511,   512,  5155,   513,     0,     0,     0,
+     515,   516,   517,     0,   518,     0,   519,   520,     0,   522,
+     523,     0,   524,   525,     0,     0,     0,   526,   527,   528,
+     529,     0,     0,     0,   530,     0,     0,     0,     0,     0,
+       0,   533,     0,   535,     0,   536,   537,   538,   539,   540,
+       0,     0,     0,     0,     0,   541,   542,   543,     0,   544,
+       0,     0,   545,     0,     0,   546,     0,   547,     0,   548,
+       0,   550,   551,   552,   553,     0,     0,     0,   555,     0,
+       0,   556,   557,   558,   559,   560,   561,     0,     0,   562,
+     563,   564,   565,     0,   566,   567,     0,     0,   568,   569,
+     570,   571,     0,     0,   572,   573,     0,   574,   575,   576,
+     577,     0,     0,     0,     0,     0,   578,   579,     0,     0,
+       0,     0,   581,   582,     0,     0,   583,   584,     0,   585,
+     586,     0,     0,     0,     0,     0,   589,     0,     0,   590,
+       0,   591,     0,   592,   593,     0,     0,     0,     0,     0,
+     594,     0,   595,     0,     0,   596,     0,     0,     0,   597,
+       0,   598,   599,   600,   601,     0,     0,  -519,     0,     0,
+       0,   602,   603,   604,     0,   605,     0,   607,   608,     0,
+       0,   609,     0,     0,   610,   611,   612,   613,   614,     0,
+     615,     0,     0,     0,     0,     0,     0,     0,     0,   616,
+     617,   618,     0,   619,   620,   621,     0,     0,     0,     0,
+     623,     0,   624,     0,     0,     0,     0,     0,     0,   625,
+     626,     0,     0,   627,     0,   628,     0,   629,   630,     0,
+       0,     0,   631,   632,   633,   634,   635,   636,   637,   638,
+       0,   639,   640,   641,     0,   643,   644,   645,   646,   647,
+     648,     0,   649,   650,   651,   652,   653,   654,   655,   656,
+     657,   658,   659,   660,   661,   662,   663,   664,   665,   666,
+     667,   668,   669,   670,   671,   672,     0,   673,   674,   675,
+     676,   677,   678,   679,     0,   680,   681,   682,   683,   684,
+     685,   686,   687,   688,   689,   690,   691,   692,   693,   694,
+     695,   696,   697,   698,   699,   700,   701,   702,   703,   704,
+     705,   706,   707,   708,   709,   710,   711,   712,   713,   714,
+     715,   716,   717,   718,   719,   720,   243,   244,     0,   245,
+     246,   247,   248,   249,     0,     0,   250,     0,     0,     0,
+       0,   251,     0,     0,     0,     0,   253,   254,   255,   256,
+     257,   258,     0,  -564,     0,     0,     0,   260,     0,     0,
+       0,   261,     0,     0,   262,   263,   264,     0,   265,     0,
+       0,     0,     0,     0,   268,  5148,     0,   269,   270,     0,
+     271,   272,     0,     0,     0,     0,   275,   276,   277,  5149,
+     279,   280,     0,   281,   282,     0,   283,   284,     0,   286,
+       0,   288,   289,   290,   291,   292,   293,     0,   294,   295,
+       0,   296,   297,   298,     0,   300,     0,     0,     0,   301,
+       0,     0,     0,     0,   302,     0,     0,   303,     0,     0,
+       0,   304,   305,   306,     0,     0,   307,     0,     0,     0,
+       0,   308,     0,     0,     0,     0,     0,   310,   311,     0,
+     312,     0,     0,     0,     0,     0,   313,   314,   315,   316,
+     317,     0,     0,     0,     0,     0,     0,   319,   320,   321,
+       0,     0,     0,   322,     0,  -557,   324,     0,   325,   326,
+     327,     0,     0,   328,   329,     0,   330,   331,   332,   333,
+     334,     0,     0,     0,   336,   337,   338,   339,   340,     0,
+       0,   341,   342,  5150,   343,   344,   345,   346,   347,     0,
+       0,     0,     0,     0,     0,     0,   350,   351,     0,   352,
+       0,     0,     0,   353,     0,   354,   355,   356,   357,     0,
+     358,     0,   359,     0,     0,     0,     0,   361,     0,     0,
+       0,     0,   363,   364,     0,     0,     0,   365,   366,   367,
+     368,  5151,     0,   369,     0,   371,     0,     0,   372,     0,
+       0,     0,     0,   373,   374,     0,     0,     0,     0,   376,
+       0,     0,     0,   377,   378,     0,   379,   380,  5152,     0,
+       0,   381,     0,   382,     0,     0,     0,   384,     0,     0,
+     385,  5153,     0,   386,   387,     0,     0,     0,     0,     0,
+     388,   389,     0,   390,     0,   391,     0,   392,   393,     0,
+       0,     0,     0,  -519,     0,     0,   394,     0,   395,   396,
+     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
+     407,   408,   409,   410,   411,     0,   412,   413,   414,     0,
+     415,   416,   417,   418,     0,   419,   420,     0,     0,     0,
+       0,   421,   422,   423,   424,   425,   426,     0,     0,   427,
+     428,     0,   429,     0,   430,     0,   431,   432,   433,   434,
+     435,   436,   437,   438,   439,     0,     0,   440,   441,     0,
+       0,   442,   443,   444,   445,   446,     0,     0,     0,     0,
+     448,     0,     0,     0,   449,     0,   450,   451,     0,   452,
+     453,  5154,     0,     0,   455,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   456,   457,   458,     0,   459,     0,
+     460,     0,   461,   462,   463,   464,   465,   466,   467,   468,
+     469,   470,     0,     0,     0,     0,   473,   474,     0,   475,
+       0,   476,   477,   478,   479,   480,     0,   481,   482,   483,
+       0,     0,   484,     0,     0,     0,   485,   486,     0,   487,
+     488,     0,     0,   489,   490,   491,   492,   493,     0,   494,
+     495,     0,   496,     0,   498,  -519,     0,   499,   500,   501,
+     502,   503,   504,   505,   506,     0,     0,     0,   508,   509,
+       0,   510,   511,   512,  5155,   513,     0,     0,     0,   515,
+     516,   517,     0,   518,     0,   519,   520,     0,   522,   523,
+       0,   524,   525,     0,     0,     0,   526,   527,   528,   529,
+       0,     0,     0,   530,     0,     0,     0,     0,     0,     0,
+     533,     0,   535,     0,   536,   537,   538,   539,   540,     0,
+       0,     0,     0,     0,   541,   542,   543,     0,   544,     0,
+       0,   545,     0,     0,   546,     0,   547,     0,   548,     0,
+     550,   551,   552,   553,     0,     0,     0,   555,     0,     0,
+     556,   557,   558,   559,   560,   561,     0,     0,   562,   563,
+     564,   565,     0,   566,   567,     0,     0,   568,   569,   570,
+     571,     0,     0,   572,   573,     0,   574,   575,   576,   577,
+       0,     0,     0,     0,     0,   578,   579,     0,     0,     0,
+       0,   581,   582,     0,     0,   583,   584,     0,   585,   586,
+       0,     0,     0,     0,     0,   589,     0,     0,   590,     0,
+     591,     0,   592,   593,     0,     0,     0,     0,     0,   594,
+       0,   595,     0,     0,   596,     0,     0,     0,   597,     0,
+     598,   599,   600,   601,     0,     0,  -519,     0,     0,     0,
+     602,   603,   604,     0,   605,     0,   607,   608,     0,     0,
+     609,     0,     0,   610,   611,   612,   613,   614,     0,   615,
+       0,     0,     0,     0,     0,     0,     0,     0,   616,   617,
+     618,     0,   619,   620,   621,     0,     0,     0,     0,   623,
+       0,   624,     0,     0,     0,     0,     0,     0,   625,   626,
+       0,     0,   627,     0,   628,     0,   629,   630,     0,     0,
+       0,   631,   632,   633,   634,   635,   636,   637,   638,     0,
+     639,   640,   641,     0,   643,   644,   645,   646,   647,   648,
+       0,   649,   650,   651,   652,   653,   654,   655,   656,   657,
+     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
+     668,   669,   670,   671,   672,     0,   673,   674,   675,   676,
+     677,   678,   679,     0,   680,   681,   682,   683,   684,   685,
+     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
+     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
+     706,   707,   708,   709,   710,   711,   712,   713,   714,   715,
+     716,   717,   718,   719,   720,   243,   244,     0,   245,   246,
+     247,   248,   249,     0,     0,   250,     0,     0,     0,     0,
+     251,     0,     0,     0,     0,   253,   254,   255,   256,   257,
+     258,     0,  -564,     0,     0,     0,   260,     0,     0,     0,
+     261,     0,     0,   262,   263,   264,     0,   265,     0,     0,
+       0,     0,     0,   268,  5148,     0,   269,   270,     0,   271,
+     272,     0,     0,     0,     0,   275,   276,   277,  5149,   279,
+     280,     0,   281,   282,     0,   283,   284,     0,   286,     0,
+     288,   289,   290,   291,   292,   293,     0,   294,   295,     0,
+     296,   297,   298,     0,   300,     0,     0,     0,   301,     0,
+       0,     0,     0,   302,     0,     0,   303,     0,     0,     0,
+     304,   305,   306,     0,     0,   307,     0,     0,     0,     0,
+     308,     0,     0,     0,     0,     0,   310,   311,     0,   312,
+       0,     0,     0,     0,     0,   313,   314,   315,   316,   317,
+       0,     0,     0,     0,     0,     0,   319,   320,   321,     0,
+       0,     0,   322,     0,  5466,   324,     0,   325,   326,   327,
+       0,     0,   328,   329,     0,   330,   331,   332,   333,   334,
+       0,     0,     0,   336,   337,   338,   339,   340,     0,     0,
+     341,   342,  5150,   343,   344,   345,   346,   347,     0,     0,
+       0,     0,     0,     0,     0,   350,   351,     0,   352,     0,
+       0,     0,   353,     0,   354,   355,   356,   357,     0,   358,
+       0,   359,     0,     0,     0,     0,   361,     0,     0,     0,
+       0,   363,   364,     0,     0,     0,   365,   366,   367,   368,
+    5151,     0,   369,     0,   371,     0,     0,   372,     0,     0,
+       0,     0,   373,   374,     0,     0,     0,     0,   376,     0,
+       0,     0,   377,   378,     0,   379,   380,  5152,     0,     0,
+     381,     0,   382,     0,     0,     0,   384,     0,     0,   385,
+    5153,     0,   386,   387,     0,     0,     0,     0,     0,   388,
+     389,     0,   390,     0,   391,     0,   392,   393,     0,     0,
+       0,     0,  -519,     0,     0,   394,     0,   395,   396,   397,
+     398,   399,   400,   401,   402,   403,   404,   405,   406,   407,
+     408,   409,   410,   411,     0,   412,   413,   414,     0,   415,
+     416,   417,   418,     0,   419,   420,     0,     0,     0,     0,
+     421,   422,   423,   424,   425,   426,     0,     0,   427,   428,
+       0,   429,     0,   430,     0,   431,   432,   433,   434,   435,
+     436,   437,   438,   439,     0,     0,   440,   441,     0,     0,
+     442,   443,   444,   445,   446,     0,     0,     0,     0,   448,
+       0,     0,     0,   449,     0,   450,   451,     0,   452,   453,
+    5154,     0,     0,   455,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   456,   457,   458,     0,   459,     0,   460,
+       0,   461,   462,   463,   464,   465,   466,   467,   468,   469,
+     470,     0,     0,     0,     0,   473,   474,     0,   475,     0,
+     476,   477,   478,   479,   480,     0,   481,   482,   483,     0,
+       0,   484,     0,     0,     0,   485,   486,     0,   487,   488,
+       0,     0,   489,   490,   491,   492,   493,     0,   494,   495,
+       0,   496,     0,   498,  -519,     0,   499,   500,   501,   502,
+     503,   504,   505,   506,     0,     0,     0,   508,   509,     0,
+     510,   511,   512,  5155,   513,     0,     0,     0,   515,   516,
+     517,     0,   518,     0,   519,   520,     0,   522,   523,     0,
+     524,   525,     0,     0,     0,   526,   527,   528,   529,     0,
+       0,     0,   530,     0,     0,     0,     0,     0,     0,   533,
+       0,   535,     0,   536,   537,   538,   539,   540,     0,     0,
+       0,     0,     0,   541,   542,   543,     0,   544,     0,     0,
+     545,     0,     0,   546,     0,   547,     0,   548,     0,   550,
+     551,   552,   553,     0,     0,     0,   555,     0,     0,   556,
+     557,   558,   559,   560,   561,     0,     0,   562,   563,   564,
+     565,     0,   566,   567,     0,     0,   568,   569,   570,   571,
+       0,     0,   572,   573,     0,   574,   575,   576,   577,     0,
+       0,     0,     0,     0,   578,   579,     0,     0,     0,     0,
+     581,   582,     0,     0,   583,   584,     0,   585,   586,     0,
+       0,     0,     0,     0,   589,     0,     0,   590,     0,   591,
+       0,   592,   593,     0,     0,     0,     0,     0,   594,     0,
+     595,     0,     0,   596,     0,     0,     0,   597,     0,   598,
+     599,   600,   601,     0,     0,  -519,     0,     0,     0,   602,
+     603,   604,     0,   605,     0,   607,   608,     0,     0,   609,
+       0,     0,   610,   611,   612,   613,   614,     0,   615,     0,
+       0,     0,     0,     0,     0,     0,     0,   616,   617,   618,
+       0,   619,   620,   621,     0,     0,     0,     0,   623,     0,
+     624,     0,     0,     0,     0,     0,     0,   625,   626,     0,
+       0,   627,     0,   628,     0,   629,   630,     0,     0,     0,
+     631,   632,   633,   634,   635,   636,   637,   638,     0,   639,
+     640,   641,     0,   643,   644,   645,   646,   647,   648,     0,
+     649,   650,   651,   652,   653,   654,   655,   656,   657,   658,
+     659,   660,   661,   662,   663,   664,   665,   666,   667,   668,
+     669,   670,   671,   672,     0,   673,   674,   675,   676,   677,
+     678,   679,     0,   680,   681,   682,   683,   684,   685,   686,
+     687,   688,   689,   690,   691,   692,   693,   694,   695,   696,
+     697,   698,   699,   700,   701,   702,   703,   704,   705,   706,
+     707,   708,   709,   710,   711,   712,   713,   714,   715,   716,
+     717,   718,   719,   720,   243,   244,     0,   245,   246,   247,
+     248,   249,     0,     0,   250,     0,     0,     0,     0,   251,
+       0,     0,     0,     0,   253,   254,   255,   256,   257,   258,
+       0,  -564,     0,     0,     0,   260,     0,     0,     0,   261,
+       0,     0,   262,   263,   264,     0,   265,     0,     0,     0,
+       0,     0,   268,  5148,     0,   269,   270,     0,   271,   272,
+       0,     0,     0,     0,   275,   276,   277,  5149,   279,   280,
+       0,   281,   282,     0,   283,   284,     0,   286,     0,   288,
+     289,   290,   291,   292,   293,     0,   294,   295,     0,   296,
+     297,   298,     0,   300,     0,     0,     0,   301,     0,     0,
+       0,     0,   302,     0,     0,   303,     0,     0,     0,   304,
+     305,   306,     0,     0,   307,     0,     0,     0,     0,   308,
+       0,     0,     0,     0,     0,   310,   311,     0,   312,     0,
+       0,     0,     0,     0,   313,   314,   315,   316,   317,     0,
+       0,     0,     0,     0,     0,   319,   320,   321,     0,     0,
+       0,   322,     0,  5506,   324,     0,   325,   326,   327,     0,
+       0,   328,   329,     0,   330,   331,   332,   333,   334,     0,
+       0,     0,   336,   337,   338,   339,   340,     0,     0,   341,
+     342,  5150,   343,   344,   345,   346,   347,     0,     0,     0,
+       0,     0,     0,     0,   350,   351,     0,   352,     0,     0,
+       0,   353,     0,   354,   355,   356,   357,     0,   358,     0,
+     359,     0,     0,     0,     0,   361,     0,     0,     0,     0,
+     363,   364,     0,     0,     0,   365,   366,   367,   368,  5151,
+       0,   369,     0,   371,     0,     0,   372,     0,     0,     0,
+       0,   373,   374,     0,     0,     0,     0,   376,     0,     0,
+       0,   377,   378,     0,   379,   380,  5152,     0,     0,   381,
+       0,   382,     0,     0,     0,   384,     0,     0,   385,  5153,
+       0,   386,   387,     0,     0,     0,     0,     0,   388,   389,
+       0,   390,     0,   391,     0,   392,   393,     0,     0,     0,
+       0,  -519,     0,     0,   394,     0,   395,   396,   397,   398,
+     399,   400,   401,   402,   403,   404,   405,   406,   407,   408,
+     409,   410,   411,     0,   412,   413,   414,     0,   415,   416,
+     417,   418,     0,   419,   420,     0,     0,     0,     0,   421,
+     422,   423,   424,   425,   426,     0,     0,   427,   428,     0,
+     429,     0,   430,     0,   431,   432,   433,   434,   435,   436,
+     437,   438,   439,     0,     0,   440,   441,     0,     0,   442,
+     443,   444,   445,   446,     0,     0,     0,     0,   448,     0,
+       0,     0,   449,     0,   450,   451,     0,   452,   453,  5154,
+       0,     0,   455,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   456,   457,   458,     0,   459,     0,   460,     0,
+     461,   462,   463,   464,   465,   466,   467,   468,   469,   470,
+       0,     0,     0,     0,   473,   474,     0,   475,     0,   476,
+     477,   478,   479,   480,     0,   481,   482,   483,     0,     0,
+     484,     0,     0,     0,   485,   486,     0,   487,   488,     0,
+       0,   489,   490,   491,   492,   493,     0,   494,   495,     0,
+     496,     0,   498,  -519,     0,   499,   500,   501,   502,   503,
+     504,   505,   506,     0,     0,     0,   508,   509,     0,   510,
+     511,   512,  5155,   513,     0,     0,     0,   515,   516,   517,
+       0,   518,     0,   519,   520,     0,   522,   523,     0,   524,
+     525,     0,     0,     0,   526,   527,   528,   529,     0,     0,
+       0,   530,     0,     0,     0,     0,     0,     0,   533,     0,
+     535,     0,   536,   537,   538,   539,   540,     0,     0,     0,
+       0,     0,   541,   542,   543,     0,   544,     0,     0,   545,
+       0,     0,   546,     0,   547,     0,   548,     0,   550,   551,
+     552,   553,     0,     0,     0,   555,     0,     0,   556,   557,
+     558,   559,   560,   561,     0,     0,   562,   563,   564,   565,
+       0,   566,   567,     0,     0,   568,   569,   570,   571,     0,
+       0,   572,   573,     0,   574,   575,   576,   577,     0,     0,
+       0,     0,     0,   578,   579,     0,     0,     0,     0,   581,
+     582,     0,     0,   583,   584,     0,   585,   586,     0,     0,
+       0,     0,     0,   589,     0,     0,   590,     0,   591,     0,
+     592,   593,     0,     0,     0,     0,     0,   594,     0,   595,
+       0,     0,   596,     0,     0,     0,   597,     0,   598,   599,
+     600,   601,     0,     0,  -519,     0,     0,     0,   602,   603,
+     604,     0,   605,     0,   607,   608,     0,     0,   609,     0,
+       0,   610,   611,   612,   613,   614,     0,   615,     0,     0,
+       0,     0,     0,     0,     0,     0,   616,   617,   618,     0,
+     619,   620,   621,     0,     0,     0,     0,   623,     0,   624,
+       0,     0,     0,     0,     0,     0,   625,   626,     0,     0,
+     627,     0,   628,     0,   629,   630,     0,     0,     0,   631,
+     632,   633,   634,   635,   636,   637,   638,     0,   639,   640,
+     641,     0,   643,   644,   645,   646,   647,   648,     0,   649,
+     650,   651,   652,   653,   654,   655,   656,   657,   658,   659,
+     660,   661,   662,   663,   664,   665,   666,   667,   668,   669,
+     670,   671,   672,     0,   673,   674,   675,   676,   677,   678,
+     679,     0,   680,   681,   682,   683,   684,   685,   686,   687,
+     688,   689,   690,   691,   692,   693,   694,   695,   696,   697,
+     698,   699,   700,   701,   702,   703,   704,   705,   706,   707,
+     708,   709,   710,   711,   712,   713,   714,   715,   716,   717,
+     718,   719,   720,   243,   244,     0,   245,   246,   247,   248,
+     249,     0,     0,   250,     0,     0,     0,     0,   251,     0,
+       0,     0,     0,   253,   254,   255,   256,   257,   258,     0,
+    -564,     0,     0,     0,   260,     0,     0,     0,   261,     0,
+       0,   262,   263,   264,     0,   265,     0,     0,     0,     0,
+       0,   268,  5148,     0,   269,   270,     0,   271,   272,     0,
+       0,     0,     0,   275,   276,   277,  5149,   279,   280,     0,
+     281,   282,     0,   283,   284,     0,   286,     0,   288,   289,
+     290,   291,   292,   293,     0,   294,   295,     0,   296,   297,
+     298,     0,   300,     0,     0,     0,   301,     0,     0,     0,
+       0,   302,     0,     0,   303,     0,     0,     0,   304,   305,
+     306,     0,     0,   307,     0,     0,     0,     0,   308,     0,
+       0,     0,     0,     0,   310,   311,     0,   312,     0,     0,
+       0,     0,     0,   313,   314,   315,   316,   317,     0,     0,
+       0,     0,     0,     0,   319,   320,   321,     0,     0,     0,
+     322,     0,  -538,   324,     0,   325,   326,   327,     0,     0,
+     328,   329,     0,   330,   331,   332,   333,   334,     0,     0,
+       0,   336,   337,   338,   339,   340,     0,     0,   341,   342,
+    5150,   343,   344,   345,   346,   347,     0,     0,     0,     0,
+       0,     0,     0,   350,   351,     0,   352,     0,     0,     0,
+     353,     0,   354,   355,   356,   357,     0,   358,     0,   359,
+       0,     0,     0,     0,   361,     0,     0,     0,     0,   363,
+     364,     0,     0,     0,   365,   366,   367,   368,  5151,     0,
+     369,     0,   371,     0,     0,   372,     0,     0,     0,     0,
+     373,   374,     0,     0,     0,     0,   376,     0,     0,     0,
+     377,   378,     0,   379,   380,  5152,     0,     0,   381,     0,
+     382,     0,     0,     0,   384,     0,     0,   385,  5153,     0,
+     386,   387,     0,     0,     0,     0,     0,   388,   389,     0,
+     390,     0,   391,     0,   392,   393,     0,     0,     0,     0,
+    -519,     0,     0,   394,     0,   395,   396,   397,   398,   399,
+     400,   401,   402,   403,   404,   405,   406,   407,   408,   409,
+     410,   411,     0,   412,   413,   414,     0,   415,   416,   417,
+     418,     0,   419,   420,     0,     0,     0,     0,   421,   422,
+     423,   424,   425,   426,     0,     0,   427,   428,     0,   429,
+       0,   430,     0,   431,   432,   433,   434,   435,   436,   437,
+     438,   439,     0,     0,   440,   441,     0,     0,   442,   443,
+     444,   445,   446,     0,     0,     0,     0,   448,     0,     0,
+       0,   449,     0,   450,   451,     0,   452,   453,  5154,     0,
+       0,   455,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   456,   457,   458,     0,   459,     0,   460,     0,   461,
+     462,   463,   464,   465,   466,   467,   468,   469,   470,     0,
+       0,     0,     0,   473,   474,     0,   475,     0,   476,   477,
+     478,   479,   480,     0,   481,   482,   483,     0,     0,   484,
+       0,     0,     0,   485,   486,     0,   487,   488,     0,     0,
+     489,   490,   491,   492,   493,     0,   494,   495,     0,   496,
+       0,   498,  -519,     0,   499,   500,   501,   502,   503,   504,
+     505,   506,     0,     0,     0,   508,   509,     0,   510,   511,
+     512,  5155,   513,     0,     0,     0,   515,   516,   517,     0,
+     518,     0,   519,   520,     0,   522,   523,     0,   524,   525,
+       0,     0,     0,   526,   527,   528,   529,     0,     0,     0,
+     530,     0,     0,     0,     0,     0,     0,   533,     0,   535,
+       0,   536,   537,   538,   539,   540,     0,     0,     0,     0,
+       0,   541,   542,   543,     0,   544,     0,     0,   545,     0,
+       0,   546,     0,   547,     0,   548,     0,   550,   551,   552,
+     553,     0,     0,     0,   555,     0,     0,   556,   557,   558,
+     559,   560,   561,     0,     0,   562,   563,   564,   565,     0,
+     566,   567,     0,     0,   568,   569,   570,   571,     0,     0,
+     572,   573,     0,   574,   575,   576,   577,     0,     0,     0,
+       0,     0,   578,   579,     0,     0,     0,     0,   581,   582,
+       0,     0,   583,   584,     0,   585,   586,     0,     0,     0,
+       0,     0,   589,     0,     0,   590,     0,   591,     0,   592,
+     593,     0,     0,     0,     0,     0,   594,     0,   595,     0,
+       0,   596,     0,     0,     0,   597,     0,   598,   599,   600,
+     601,     0,     0,  -519,     0,     0,     0,   602,   603,   604,
+       0,   605,     0,   607,   608,     0,     0,   609,     0,     0,
+     610,   611,   612,   613,   614,     0,   615,     0,     0,     0,
+       0,     0,     0,     0,     0,   616,   617,   618,     0,   619,
+     620,   621,     0,     0,     0,     0,   623,     0,   624,     0,
+       0,     0,     0,     0,     0,   625,   626,     0,     0,   627,
+       0,   628,     0,   629,   630,     0,     0,     0,   631,   632,
+     633,   634,   635,   636,   637,   638,     0,   639,   640,   641,
+       0,   643,   644,   645,   646,   647,   648,     0,   649,   650,
+     651,   652,   653,   654,   655,   656,   657,   658,   659,   660,
+     661,   662,   663,   664,   665,   666,   667,   668,   669,   670,
+     671,   672,     0,   673,   674,   675,   676,   677,   678,   679,
+       0,   680,   681,   682,   683,   684,   685,   686,   687,   688,
+     689,   690,   691,   692,   693,   694,   695,   696,   697,   698,
+     699,   700,   701,   702,   703,   704,   705,   706,   707,   708,
      709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
+     719,   720,   243,   244,     0,   245,   246,   247,   248,   249,
+       0,     0,   250,     0,     0,     0,     0,   251,     0,     0,
+       0,     0,   253,   254,   255,   256,   257,   258,     0,  -564,
+       0,     0,     0,   260,     0,     0,     0,   261,     0,     0,
+     262,   263,   264,     0,   265,     0,     0,     0,     0,     0,
+     268,  5148,     0,   269,   270,     0,   271,   272,     0,     0,
+       0,     0,   275,   276,   277,  5149,   279,   280,     0,   281,
+     282,     0,   283,   284,     0,   286,     0,   288,   289,   290,
+     291,   292,   293,     0,   294,   295,     0,   296,   297,   298,
+       0,   300,     0,     0,     0,   301,     0,     0,     0,     0,
+     302,     0,     0,   303,     0,     0,     0,   304,   305,   306,
+       0,     0,   307,     0,     0,     0,     0,   308,     0,     0,
+       0,     0,     0,   310,   311,     0,   312,     0,     0,     0,
+       0,     0,   313,   314,   315,   316,   317,     0,     0,     0,
+       0,     0,     0,   319,   320,   321,     0,     0,     0,   322,
+       0,     0,   324,     0,   325,   326,   327,     0,     0,   328,
+     329,     0,   330,   331,   332,   333,   334,     0,     0,     0,
+     336,   337,   338,   339,   340,     0,     0,   341,   342,  5150,
+     343,   344,   345,   346,   347,     0,     0,     0,     0,     0,
+       0,     0,   350,   351,     0,   352,     0,     0,     0,   353,
+       0,   354,   355,   356,   357,     0,   358,     0,   359,     0,
+       0,     0,     0,   361,     0,     0,     0,     0,   363,   364,
+       0,     0,     0,   365,   366,   367,   368,  5151,     0,   369,
+       0,   371,     0,     0,   372,     0,     0,     0,     0,   373,
+     374,     0,     0,     0,     0,   376,     0,     0,     0,   377,
+     378,     0,   379,   380,  5152,     0,     0,   381,     0,   382,
+       0,     0,     0,   384,     0,     0,   385,  5153,     0,   386,
+     387,     0,     0,     0,     0,     0,   388,   389,     0,   390,
+       0,   391,     0,   392,   393,     0,     0,     0,     0,  -519,
+       0,     0,   394,     0,   395,   396,   397,   398,   399,   400,
+     401,   402,   403,   404,   405,   406,   407,   408,   409,   410,
+     411,     0,   412,   413,   414,     0,   415,   416,   417,   418,
+       0,   419,   420,     0,     0,     0,     0,   421,   422,   423,
+     424,   425,   426,     0,     0,   427,   428,     0,   429,     0,
+     430,     0,   431,   432,   433,   434,   435,   436,   437,   438,
+     439,     0,     0,   440,   441,     0,     0,   442,   443,   444,
+     445,   446,     0,     0,     0,     0,   448,     0,     0,     0,
+     449,     0,   450,   451,     0,   452,   453,  5154,     0,     0,
+     455,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     456,   457,   458,     0,   459,     0,   460,     0,   461,   462,
+     463,   464,   465,   466,   467,   468,   469,   470,     0,     0,
+       0,     0,   473,   474,     0,   475,     0,   476,   477,   478,
+     479,   480,     0,   481,   482,   483,     0,     0,   484,     0,
+       0,     0,   485,   486,     0,   487,   488,     0,     0,   489,
+     490,   491,   492,   493,     0,   494,   495,     0,   496,     0,
+     498,  -519,     0,   499,   500,   501,   502,   503,   504,   505,
+     506,     0,     0,     0,   508,   509,     0,   510,   511,   512,
+    5155,   513,     0,     0,     0,   515,   516,   517,     0,   518,
+       0,   519,   520,     0,   522,   523,     0,   524,   525,     0,
+       0,     0,   526,   527,   528,   529,     0,     0,     0,   530,
+       0,     0,     0,     0,     0,     0,   533,     0,   535,     0,
+     536,   537,   538,   539,   540,     0,     0,     0,     0,     0,
+     541,   542,   543,     0,   544,     0,     0,   545,     0,     0,
+     546,     0,   547,     0,   548,     0,   550,   551,   552,   553,
+       0,     0,     0,   555,     0,     0,   556,   557,   558,   559,
+     560,   561,     0,     0,   562,   563,   564,   565,     0,   566,
+     567,     0,     0,   568,   569,   570,   571,     0,     0,   572,
+     573,     0,   574,   575,   576,   577,     0,     0,     0,     0,
+       0,   578,   579,     0,     0,     0,     0,   581,   582,     0,
+       0,   583,   584,     0,   585,   586,     0,     0,     0,     0,
+       0,   589,     0,     0,   590,     0,   591,     0,   592,   593,
+       0,     0,     0,     0,     0,   594,     0,   595,     0,     0,
+     596,     0,     0,     0,   597,     0,   598,   599,   600,   601,
+       0,     0,  -519,     0,     0,     0,   602,   603,   604,     0,
+     605,     0,   607,   608,     0,     0,   609,     0,     0,   610,
+     611,   612,   613,   614,     0,   615,     0,     0,     0,     0,
+       0,     0,     0,     0,   616,   617,   618,     0,   619,   620,
+     621,     0,     0,     0,     0,   623,     0,   624,     0,     0,
+       0,     0,     0,     0,   625,   626,     0,     0,   627,     0,
+     628,     0,   629,   630,     0,     0,     0,   631,   632,   633,
+     634,   635,   636,   637,   638,     0,   639,   640,   641,     0,
+     643,   644,   645,   646,   647,   648,     0,   649,   650,   651,
+     652,   653,   654,   655,   656,   657,   658,   659,   660,   661,
+     662,   663,   664,   665,   666,   667,   668,   669,   670,   671,
+     672,     0,   673,   674,   675,   676,   677,   678,   679,     0,
+     680,   681,   682,   683,   684,   685,   686,   687,   688,   689,
+     690,   691,   692,   693,   694,   695,   696,   697,   698,   699,
+     700,   701,   702,   703,   704,   705,   706,   707,   708,   709,
+     710,   711,   712,   713,   714,   715,   716,   717,   718,   719,
+     720,   243,   244,     0,   245,   246,   247,   248,   249,     0,
+       0,   250,     0,     0,     0,     0,   251,     0,     0,     0,
+       0,   253,   254,   255,   256,   257,   258,     0,  -564,     0,
+       0,     0,   260,     0,     0,     0,   261,     0,     0,   262,
+     263,   264,     0,   265,     0,     0,     0,     0,     0,   268,
+    5148,     0,   269,   270,     0,   271,   272,     0,     0,     0,
+       0,   275,   276,   277,  5149,   279,   280,     0,   281,   282,
+       0,   283,   284,     0,   286,     0,   288,   289,   290,   291,
+     292,   293,     0,   294,   295,     0,   296,   297,   298,     0,
+     300,     0,     0,     0,   301,     0,     0,     0,     0,   302,
+       0,     0,   303,     0,     0,     0,   304,   305,   306,     0,
+       0,   307,     0,     0,     0,     0,   308,     0,     0,     0,
+       0,     0,   310,   311,     0,   312,     0,     0,     0,     0,
+       0,   313,   314,   315,   316,   317,     0,     0,     0,     0,
+       0,     0,   319,   320,   321,     0,     0,     0,   322,     0,
+       0,   324,     0,   325,   326,   327,     0,     0,   328,   329,
+       0,   330,   331,   332,   333,   334,     0,     0,     0,   336,
+     337,   338,   339,   340,     0,     0,   341,   342,  5150,   343,
+     344,   345,   346,   347,     0,     0,     0,     0,     0,     0,
+       0,   350,   351,     0,   352,     0,     0,     0,   353,     0,
+     354,   355,   356,   357,     0,   358,     0,   359,     0,     0,
+       0,     0,   361,     0,     0,     0,     0,   363,   364,     0,
+       0,     0,   365,   366,   367,   368,  5151,     0,   369,     0,
+     371,     0,     0,   372,     0,     0,     0,     0,   373,   374,
+       0,     0,     0,     0,   376,     0,     0,     0,   377,   378,
+       0,   379,   380,  5152,     0,     0,   381,     0,   382,     0,
+       0,     0,   384,     0,     0,   385,  5153,     0,   386,   387,
+       0,     0,     0,     0,     0,   388,   389,     0,   390,     0,
+     391,     0,   392,   393,     0,     0,     0,     0,  -519,     0,
+       0,   394,     0,   395,   396,   397,   398,   399,   400,   401,
+     402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
+       0,   412,   413,   414,     0,   415,   416,   417,   418,     0,
+     419,   420,     0,     0,     0,     0,   421,   422,   423,   424,
+     425,   426,     0,     0,   427,   428,     0,   429,     0,   430,
+       0,   431,   432,   433,   434,   435,   436,   437,   438,   439,
+       0,     0,   440,   441,     0,     0,   442,   443,   444,   445,
+     446,     0,     0,     0,     0,   448,     0,     0,     0,   449,
+       0,   450,   451,     0,   452,   453,  5154,     0,     0,   455,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   456,
+     457,   458,     0,   459,     0,   460,     0,   461,   462,   463,
+     464,   465,   466,   467,   468,   469,   470,     0,     0,     0,
+       0,   473,   474,     0,   475,     0,   476,   477,   478,   479,
+     480,     0,   481,   482,   483,     0,     0,   484,     0,     0,
+       0,   485,   486,     0,   487,   488,     0,     0,   489,   490,
+     491,   492,   493,     0,   494,   495,     0,   496,     0,   498,
+    -519,     0,   499,   500,   501,   502,   503,   504,   505,   506,
+       0,     0,     0,   508,   509,     0,   510,   511,   512,  5155,
+     513,     0,     0,     0,   515,   516,   517,     0,   518,     0,
+     519,   520,     0,   522,   523,     0,   524,   525,     0,     0,
+       0,   526,   527,   528,   529,     0,     0,     0,   530,     0,
+       0,     0,     0,     0,     0,   533,     0,   535,     0,   536,
+     537,   538,   539,   540,     0,     0,     0,     0,     0,   541,
+     542,   543,     0,   544,     0,     0,   545,     0,     0,   546,
+       0,   547,     0,   548,     0,   550,   551,   552,   553,     0,
+       0,     0,   555,     0,     0,   556,   557,   558,   559,   560,
+     561,     0,     0,   562,   563,   564,   565,     0,   566,   567,
+       0,     0,   568,   569,   570,   571,     0,     0,   572,   573,
+       0,   574,   575,   576,   577,     0,     0,     0,     0,     0,
+     578,   579,     0,     0,     0,     0,   581,   582,     0,     0,
+     583,   584,     0,   585,   586,     0,     0,     0,     0,     0,
+     589,     0,     0,  5408,     0,   591,     0,   592,   593,     0,
+       0,     0,     0,     0,   594,     0,   595,     0,     0,   596,
+       0,     0,     0,   597,     0,   598,   599,   600,   601,     0,
+       0,  -519,     0,     0,     0,   602,   603,   604,     0,   605,
+       0,   607,   608,     0,     0,   609,     0,     0,   610,   611,
+     612,   613,   614,     0,   615,     0,     0,     0,     0,     0,
+       0,     0,     0,   616,   617,   618,     0,   619,   620,   621,
+       0,     0,     0,     0,   623,     0,   624,     0,     0,     0,
+       0,     0,     0,   625,   626,     0,     0,   627,     0,   628,
+       0,   629,   630,     0,     0,     0,   631,   632,   633,   634,
+     635,   636,   637,   638,     0,   639,   640,   641,     0,   643,
+     644,   645,   646,   647,   648,     0,   649,   650,   651,   652,
+     653,   654,   655,   656,   657,   658,   659,   660,   661,   662,
+     663,   664,   665,   666,   667,   668,   669,   670,   671,   672,
+       0,   673,   674,   675,   676,   677,   678,   679,     0,   680,
+     681,   682,   683,   684,   685,   686,   687,   688,   689,   690,
+     691,   692,   693,   694,   695,   696,   697,   698,   699,   700,
+     701,   702,   703,   704,   705,   706,   707,   708,   709,   710,
+     711,   712,   713,   714,   715,   716,   717,   718,   719,   720,
+     243,   244,     0,   245,   246,   247,   248,   249,     0,     0,
+     250,     0,     0,     0,     0,   251,     0,     0,     0,     0,
+     253,   254,   255,   256,   257,   258,     0,     0,     0,     0,
+       0,   260,     0,     0,     0,   261,     0,     0,   262,   263,
+     264,     0,   265,     0,     0,     0,     0,     0,   268,     0,
+       0,   269,   270,     0,   271,   272,     0,     0,     0,     0,
+     275,   276,   277,   278,   279,   280,     0,   281,   282,     0,
+     283,   284,     0,   286,     0,   288,   289,   290,   291,   292,
+     293,     0,   294,   295,     0,   296,   297,   298,     0,   300,
+       0,     0,     0,   301,     0,     0,     0,     0,   302,     0,
+       0,   303,     0,     0,     0,   304,   305,   306,     0,     0,
+     307,     0,     0,     0,     0,   308,     0,     0,     0,     0,
+       0,   310,   311,     0,   312,     0,     0,     0,     0,     0,
+     313,   314,   315,   316,   317,     0,     0,     0,     0,     0,
+       0,   319,   320,   321,     0,     0,     0,   322,     0,     0,
+     324,     0,   325,   326,   327,     0,     0,   328,   329,     0,
+     330,   331,   332,   333,   334,     0,     0,     0,   336,   337,
+     338,   339,   340,     0,     0,   341,   342,     0,   343,   344,
+     345,   346,   347,     0,     0,     0,     0,     0,     0,     0,
+     350,   351,     0,   352,     0,     0,     0,   353,     0,   354,
+     355,   356,   357,     0,   358,     0,   359,     0,     0,     0,
+       0,   361,     0,     0,     0,     0,   363,   364,     0,     0,
+       0,   365,   366,   367,   368,     0,     0,   369,     0,   371,
+       0,     0,   372,     0,     0,     0,     0,   373,   374,     0,
+       0,     0,     0,   376,     0,     0,     0,   377,   378,     0,
+     379,   380,     0,     0,     0,   381,     0,   382,     0,     0,
+       0,   384,     0,     0,   385,     0,     0,   386,   387,     0,
+       0,     0,     0,     0,   388,   389,     0,   390,     0,   391,
+       0,   392,   393,     0,     0,     0,     0,     0,     0,     0,
+     394,     0,   395,   396,   397,   398,   399,   400,   401,   402,
+     403,   404,   405,   406,   407,   408,   409,   410,   411,     0,
+     412,   413,   414,     0,   415,   416,   417,   418,     0,   419,
+     420,     0,     0,     0,     0,   421,   422,   423,   424,   425,
+     426,     0,     0,   427,   428,     0,   429,     0,   430,     0,
+     431,   432,   433,   434,   435,   436,   437,   438,   439,     0,
+       0,   440,   441,     0,     0,   442,   443,   444,   445,   446,
+       0,     0,     0,     0,   448,     0,     0,     0,   449,     0,
+     450,   451,     0,   452,   453,   454,     0,     0,   455,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   456,   457,
+     458,     0,   459,     0,   460,     0,   461,   462,   463,   464,
+     465,   466,   467,   468,   469,   470,     0,     0,     0,     0,
+     473,   474,     0,   475,     0,   476,   477,   478,   479,   480,
+       0,   481,   482,   483,     0,     0,   484,     0,     0,     0,
+     485,   486,     0,   487,   488,     0,     0,   489,   490,   491,
+     492,   493,     0,   494,   495,     0,   496,     0,   498,     0,
+       0,   499,   500,   501,   502,   503,   504,   505,   506,     0,
+       0,     0,   508,   509,     0,   510,   511,   512,     0,   513,
+       0,     0,     0,   515,   516,   517,     0,   518,     0,   519,
+     520,     0,   522,   523,     0,   524,   525,     0,     0,     0,
+     526,   527,   528,   529,     0,     0,     0,   530,     0,     0,
+       0,     0,     0,     0,   533,     0,   535,     0,   536,   537,
+     538,   539,   540,     0,     0,     0,     0,     0,   541,   542,
+     543,     0,   544,     0,     0,   545,     0,     0,   546,     0,
+     547,     0,   548,     0,   550,   551,   552,   553,     0,     0,
+       0,   555,     0,     0,   556,   557,   558,   559,   560,   561,
+       0,     0,   562,   563,   564,   565,     0,   566,   567,     0,
+       0,   568,   569,   570,   571,     0,     0,   572,   573,     0,
+     574,   575,   576,   577,     0,     0,     0,     0,     0,   578,
+     579,     0,     0,     0,     0,   581,   582,     0,     0,   583,
+     584,     0,   585,   586,     0,     0,     0,     0,     0,   589,
+       0,     0,   590,     0,   591,     0,   592,   593,     0,     0,
+       0,     0,     0,   594,     0,   595,     0,     0,   596,     0,
+       0,     0,   597,     0,   598,   599,   600,   601,     0,     0,
+       0,     0,     0,     0,   602,   603,   604,     0,   605,     0,
+     607,   608,     0,     0,   609,     0,     0,   610,   611,   612,
+     613,   614,     0,   615,     0,     0,     0,     0,     0,     0,
+       0,     0,   616,   617,   618,     0,   619,   620,   621,     0,
+       0,     0,     0,   623,     0,   624,     0,     0,     0,     0,
+       0,     0,   625,   626,     0,     0,   627,     0,   628,     0,
+     629,   630,     0,     0,     0,   631,   632,   633,   634,   635,
+     636,   637,   638,     0,   639,   640,   641,     0,   643,   644,
+     645,   646,   647,   648,     0,   649,   650,   651,   652,   653,
+     654,   655,   656,   657,   658,   659,   660,   661,   662,   663,
+     664,   665,   666,   667,   668,   669,   670,   671,   672,     0,
+     673,   674,   675,   676,   677,   678,   679,     0,   680,   681,
+     682,   683,   684,   685,   686,   687,   688,   689,   690,   691,
+     692,   693,   694,   695,   696,   697,   698,   699,   700,   701,
+     702,   703,   704,   705,   706,   707,   708,   709,   710,   711,
+     712,   713,   714,   715,   716,   717,   718,   719,   720,  1780,
+       0,     0,     0,     0,  1781,     0,  1782,     0,     0,  1783,
+       0,     0,     0,     0,     0,     0,     0,     0,  1760,  1784,
+    1785,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    3808,  3809,     0,     0,     0,     0,  3810,     0,  3811,     0,
+    3812,  3813,     0,     0,     0,     0,     0,     0,     0,     0,
+    1786,     0,     0,     0,     0,  1787,  1788,     0,  3814,     0,
+       0,  1789,     0,     0,     0,     0,     0,     0,     0,  1790,
+       0,     0,     0,     0,     0,  1791,  1792,  3301,     0,  1793,
+       0,     0,  1781,     0,  1782,     0,     0,     0,  1794,     0,
+       0,     0,     0,     0,     0,     0,  1760,  1784,  1785,     0,
+       0,     0,     0,  1795,     0,     0,     0,     0,  3815,     0,
+       0,  3816,     0,     0,     0,     0,     0,  1796,     0,  3817,
+       0,  1797,     0,     0,     0,     0,     0,     0,  1786,  1798,
+    1799,     0,     0,  1787,     0,     0,  1800,     0,  3463,     0,
+       0,     0,     0,     0,  1801,     0,     0,  1790,     0,     0,
+    1802,     0,     0,  1791,  1792,  3818,     0,  1793,     0,     0,
+       0,  1803,     0,     0,     0,     0,  1794,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1795,     0,  3819,  1804,  3820,     0,     0,     0,     0,
+    5303,     0,     0,     0,     0,  1796,     0,     0,     0,  1797,
+       0,  3821,  3822,     0,     0,     0,     0,  1798,     0,     0,
+       0,     0,     0,     0,  3302,     0,     0,     0,     0,     0,
+       0,     0,  1801,     0,     0,  1805,     0,  1806,  1802,     0,
+       0,     0,     0,     0,  1807,     0,     0,     0,     0,     0,
+       0,     0,     0,  3823,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1808,     0,  3824,     0,     0,     0,
+       0,     0,  1804,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  3825,     0,  1809,     0,     0,
+       0,     0,     0,     0,  3826,  3827,     0,  3828,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1806,     0,     0,     0,     0,
+       0,     0,  1807,  1810,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  3829,  3830,  3831,     0,     0,     0,     0,
+       0,  1811,  1808,     0,     0,  1812,     0,     0,     0,     0,
+       0,     0,  3832,  3833,  3834,     0,     0,     0,     0,  3835,
+       0,     0,  3836,     0,     0,  1809,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    3837,  3838,     0,  1813,     0,     0,     0,     0,     0,  1814,
+       0,     0,     0,     0,     0,     0,  1815,     0,     0,     0,
+       0,  1810,     0,     0,     0,  1816,     0,     0,     0,     0,
+       0,     0,     0,     0,  3839,  3840,     0,     0,     0,  1811,
+       0,     0,     0,  1812,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1817,     0,     0,
+    3475,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1818,  1819,  1820,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  1814,     0,     0,
+       0,     0,     0,     0,  1815,     0,     0,     0,     0,     0,
+    3808,  3809,     0,  1816,  1821,     0,  3810,     0,  3811,     0,
+    3812,  3813,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  3841,     0,     0,     0,  3842,     0,  3814,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  3843,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1818,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1822,  1823,  1824,  1825,     0,     0,     0,     0,  1826,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  3815,     0,
+       0,  3816,  1821,     0,     0,  1827,     0,     0,  1828,  3817,
+       0,     0,     0,     0,     0,     0,     0,     0,  3844,     0,
+       0,  3845,     0,     0,  3846,  3847,  3848,  3849,  3463,     0,
+       0,  1829,     0,     0,     0,  2598,     0,     0,     0,     0,
+       0,     0,     0,     0,  1830,  3818,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  1822,  1823,
+    1824,  1825,     0,     0,     0,     0,  1826,  3850,  3851,     0,
+       0,     0,     0,  3819,     0,  3820,     0,     0,  1831,     0,
+       0,  1832,     0,  1827,     0,     0,  1828,     0,     0,     0,
+       0,  3821,  3822,     0,     0,  3852,     0,     0,  2599,  2600,
+    2601,  2602,  2603,  2604,  2605,  2606,  2607,  2608,  2609,  2610,
+    2611,  2612,  2613,  2614,  2615,  2616,  2617,  2618,     0,  2619,
+    2620,     0,  1830,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  3823,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  3824,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1831,     0,     0,  1832,
+       0,     0,     0,     0,     0,  3825,  1833,  1834,  1835,     0,
+       0,     0,     0,     0,  3826,  3827,     0,  3828,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    1836,  1837,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  3829,  3830,  3831,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  3832,  3833,  3834,     0,     0,     0,     0,  3835,
+       0,     0,  3836,     0,  1833,     0,     0,  2621,  2622,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    3837,  3838,     0,     0,     0,     0,     0,     0,  1836,  1837,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  3839,  3840,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    3475,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  3841,     0,     0,     0,  3842,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  3843,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,  3844,     0,
+       0,  3845,     0,     0,  3846,  3847,  3848,  3849,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  3850,  3851,     0,
+       0,     0,     0,  2623,  2624,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  2625,  3852,  2626,  2627,  2628,  2629,
+    2630,     0,     0,  2631,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  2632,     0,     0,     0,     0,  2633,  2634,
+    2635,  2636,  2637,  2638,  2639,  2640,  2641,  2642,  2643,  2644,
+    2645,  2646,  2647,  2648,  2649,  2650,  2651,  2652,  2653,  2654,
+    2655,  2656,  2657,  2658,  2659,  2660,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  2661
+};
+
+static const yytype_int16 yycheck[] =
+{
+       6,   900,   887,     0,   115,     0,  1183,  1331,    44,    15,
+      43,    44,    18,     0,  1031,  1032,    22,   226,  1171,  1184,
+    1331,  1280,  1080,    21,  1699,    31,     6,  1176,  1149,   116,
+     802,  1626,    38,  1424,  1051,    41,  1424,  1234,    57,  1164,
+      46,    39,    60,    49,    21,    43,  1144,    53,  3055,    55,
+    1058,  1149,  1198,  1144,    97,    43,  2516,  1460,  1149,    60,
+    2438,  2439,    39,  1839,  2207,  1199,    43,    59,  2848,    64,
+    1199,  2500,   763,  2559,  2560,  1083,  1870,    64,  2704,  2943,
+    2509,  2172,  2172,  2967,  2472,  1134,  1385,  2475,  2476,  1253,
+    1254,    97,  2054,  2055,  2749,  2475,  2476,  1671,  2753,  2197,
+    3212,  2251,  1505,  2840,  2144,  2067,  2068,  2069,  3268,  1780,
+    3124,  1169,  1691,  1692,  1693,  1173,  1273,  1166,  1282,  1748,
+    2549,  1748,    19,  1780,  2553,   116,   121,  1748,  1347,  1800,
+    1294,  1295,  1296,    30,  2998,  3374,  1300,  3477,    35,  1683,
+    2389,  1685,  1686,  1687,  1782,  2394,  3854,  1818,  1786,  3320,
+    1506,    21,  2287,  2251,  1674,  1149,  3758,  1677,  3298,  1679,
+    2707,  2754,  1800,  2707,  3707,  2707,  3854,  2483,  2449,    39,
+       9,  3051,  1582,  1149,  1812,  1339,  2912,  2246,  4521,  2707,
+      21,   872,   873,  2976,   875,   191,  3874,  3875,  3383,  1599,
+      29,  2707,  2547,  2548,  1347,    34,  1606,   888,    39,   749,
+     750,  2746,  1612,  3383,  3917,  1149,   121,   735,   736,  2754,
+    4423,  2723,  3628,  4462,   220,  1762,   222,  2746,    22,   225,
+     226,   227,   228,    21,  4521,  2754,    68,  2498,    18,    19,
+      52,    11,  1429,  2380,   246,  2382,   242,   125,   156,  1049,
+    2985,    35,   222,  2486,  2698,   225,    18,    19,  2395,  3827,
+    3828,  2398,  3264,  3831,  2401,    71,  2527,  2883,  2529,  2530,
+      21,  2739,  2740,  2741,   915,   916,   917,    18,    19,   920,
+     921,  3849,    21,   924,  3021,   926,   927,   928,  2756,   156,
+      18,    19,   156,  1246,  1247,  1248,    18,    19,     5,    77,
+      71,    18,    19,   197,  1257,    73,   144,  2834,    71,   197,
+      19,   156,   125,  2781,   158,   176,   249,  2785,  1357,    18,
+      19,    73,    21,  1238,  1239,  1512,  2704,    31,   162,   197,
+      62,  3068,   160,  2801,  2802,  1288,   194,   131,  1291,  2807,
+     176,    18,    19,    18,    19,   109,   194,  4400,  1223,    18,
+      19,   123,   235,  2969,   235,  2823,  2824,  1310,  1311,  3757,
+    1001,  1314,    18,    19,  2832,    48,   230,  1904,   276,  4236,
+     756,  3108,  3109,   156,    18,    19,    70,    78,   246,  1332,
+    1333,   100,  2850,   125,  1337,  1338,   194,    18,    19,   326,
+     231,    48,    18,    19,    67,  4172,   194,   276,   125,  1352,
+     259,  3651,  3652,   372,  3975,   156,   156,   125,    73,   238,
+    2829,  3661,  3662,    65,   156,   158,   377,   372,  2511,  3990,
+      18,    19,   401,    73,   219,    18,    19,   285,  4646,   156,
+    2523,   315,  2895,    18,    19,    35,  1103,   571,   156,   366,
+     483,    18,    19,    18,    19,   282,    21,  4550,    12,   429,
+      25,    18,    19,   379,   156,   285,   197,    44,   406,   144,
+     194,  2554,    57,   455,   125,   141,   332,   406,   156,  4037,
+    2709,  3116,   194,   258,   571,   247,   582,   111,   156,   194,
+    4343,   204,    19,   377,   194,  3815,    85,    18,    19,   387,
+     379,  2584,   638,   634,    18,    19,   103,  3234,   611,    22,
+     231,   481,   255,  3664,    21,  2883,  1381,  1269,   387,    18,
+      19,   315,   246,    25,   446,  3845,  3846,  3311,   542,   238,
+     197,  1283,    21,  1412,  1413,   500,   276,   239,    21,   571,
+      22,  1538,   216,    18,    19,    23,   246,   249,  4741,   258,
+      18,    19,  1549,    43,   743,  1660,   282,   640,  3422,    18,
+      19,   285,   271,   186,   293,   432,   216,    49,  3658,    73,
+      18,    19,  4154,   243,    18,    19,   156,   428,  4892,   130,
+     285,    35,   368,    61,    62,   285,   453,  1575,   197,   263,
+      77,  1579,   388,   486,    18,    19,  1584,   130,    18,    19,
+     150,  2969,   428,  1708,  3239,   708,   103,   235,    62,   623,
+     432,   533,   282,   263,   256,   212,   386,   565,   131,   389,
+    3347,  1500,  3349,  3407,   150,  1613,  1614,   388,   495,    18,
+      19,    18,    19,  3160,   386,   388,   510,   389,    18,    19,
+     249,    37,  4956,   266,   370,   354,    81,    18,    19,    18,
+      19,    18,    19,   807,   163,   386,    18,    19,   389,   813,
+     625,   447,   456,  3072,  3299,   111,   168,   469,   386,  4357,
+      73,   389,   434,   156,   386,  1554,   812,   389,   344,   386,
+    1351,   812,   389,   501,   150,  1723,  1724,   811,   877,   432,
+     392,  3100,  3101,  3102,  3103,   470,   203,   386,    70,  1207,
+     389,   228,    37,   432,   293,   376,   403,  1237,  2262,   191,
+    2264,   681,   546,   569,   602,   432,   812,  4240,  1389,   386,
+     658,   808,   389,  4284,  2985,   315,   642,   386,  4289,   658,
+     389,   285,  4293,   602,   455,  4964,   634,  4830,  1409,   595,
+     386,    18,    19,   389,  3608,   727,   228,  4940,  4941,   735,
+     736,   578,   386,   372,  4312,   389,  3165,   743,   387,   745,
+     242,   612,  3854,   642,  4322,   386,  2137,   476,   389,  2137,
+     386,   368,  4330,   389,   807,   262,  3868,   354,  3384,  2147,
+     608,   432,  3033,   368,   973,   605,   571,   549,   786,   235,
+     741,   742,    23,   276,  4561,   198,  3249,   510,   386,   125,
+    1431,   389,   651,   386,    35,   786,   389,  1951,  4366,  2939,
+    1467,   386,   729,   546,   389,  3807,   802,    52,    49,   386,
+     812,   386,   389,   219,   389,   500,    18,    19,  5036,   386,
+      61,    62,   389,  2484,  3551,  2486,  3553,  3277,   807,   548,
+     464,  4694,  1031,   716,  2453,  5074,  2453,   510,   636,  1993,
+    1039,  1040,  2453,   812,   112,   246,  3383,   115,   542,  2383,
+    2384,  2939,   693,   808,  1240,   386,  2886,  4724,   389,  3130,
+    1059,  3001,   386,   627,   698,   389,  2999,   647,  3870,   753,
+     807,  4269,  3009,   582,   219,   276,   757,   386,   582,   812,
+     389,   877,  4453,   879,   634,   647,   614,  3193,   884,  3195,
+     622,   876,  2844,   594,   387,  2976,  2976,   562,  3752,   876,
+     552,   386,   810,   642,   389,  4958,   647,   400,   386,   722,
+    1428,   389,   562,  3001,    18,    19,  3651,   386,   812,   647,
+     389,  2075,   918,  3342,   812,   647,  3345,   923,   386,   808,
+     647,   389,   386,  3352,   812,   389,  3380,  4187,  3357,  3358,
+    3359,  3360,  3361,   810,   812,   812,   810,  1862,   647,  3368,
+     808,   812,   386,   636,  3373,   389,   386,  3376,  2073,   389,
+    2726,   994,  1480,  1162,   812,   810,  3199,   812,   812,   747,
+     647,  1489,   647,  1907,   812,  5214,   812,   973,   647,   636,
+    3448,   813,  5185,   979,  1937,   813,   387,   386,   758,   386,
+     389,   647,   389,   492,  1193,  3128,   386,   993,   994,   389,
+     812,  3738,   808,   647,   812,   386,  3384,   386,   389,   386,
+     389,  2596,   389,   807,   386,  3542,   647,   389,  1933,  1559,
+    3488,   647,  3490,   807,   812,  4186,  1022,   810,   535,   812,
+     753,   738,   739,    18,    19,  1031,  3504,   817,  3506,   807,
+    4743,   812,   487,  1039,  1040,   808,   808,   608,  1036,   647,
+     812,  3788,  2005,  3521,   647,   807,  2009,   571,  1135,   810,
+     810,  1049,   647,  1059,  4068,   608,   565,   808,   810,  1036,
+     647,  1049,   647,   633,   808,  1176,  1177,  2662,  2031,  2698,
+     647,  2698,  1049,   810,   812,  2272,   808,  2698,   695,   808,
+    3558,   808,   810,   808,  4772,   812,   808,   633,   808,   386,
+    1177,   930,   389,  4203,  4204,  1101,  1102,    23,   810,   808,
+     812,   630,   600,   812,  1110,    11,   647,  3378,  2071,    35,
+     619,  3214,   810,   647,   812,   801,   802,   803,   804,    18,
+      19,   812,   810,    49,   812,   812,    64,   636,   647,   808,
+    5473,   634,  1127,   812,  1140,    61,    62,    77,  4298,   562,
+    1127,  1136,   808,    71,  1135,  1188,  4562,   633,   655,   656,
+     542,   990,   647,   275,  2948,   571,  1162,   996,   812,   647,
+     799,  2708,  3265,   812,  3624,  1171,   278,   808,   647,   371,
+    3273,   812,   808,  1164,   386,  3278,   812,   389,  1184,   647,
+     646,   243,  1188,   647,  1190,  1191,  1183,  1193,  1183,  1195,
+    1233,   602,  2357,  2390,  1200,  1036,  1183,  1203,  1204,  1408,
+    4340,  1207,  5499,   647,   812,   808,   238,   647,  1214,  2533,
+     810,   191,   812,  1422,   469,  5464,   571,   812,  1224,  1225,
+    1226,  1136,  2533,  1229,  1204,   812,  1232,  1233,   500,  1235,
+    1236,  2003,    13,   735,   736,   812,  1234,  4432,   647,   271,
+     647,   748,   749,   282,  2261,  4357,   126,   647,  1457,  3996,
+      18,    19,  4432,   176,   547,   193,   647,  1234,   647,   235,
+     647,   167,   652,  1269,   455,   647,  1105,   808,   137,    19,
+    2328,  1358,   386,  3702,  2949,   389,   464,  1283,   812,   130,
+      18,    19,  1301,   152,  1279,  2438,  2439,   263,  4172,  3801,
+    3802,  2412,  1279,   812,   200,    18,    19,   575,   807,   174,
+     578,    52,    18,    19,    18,    19,   160,   810,  2903,   655,
+     656,    18,    19,  2321,  2412,    65,  2707,   812,   472,  2707,
+     808,  2412,   262,  2331,  2470,  1331,  2334,  4337,  2474,  2337,
+    4908,   565,  4910,   812,  2480,   628,    18,    19,    18,    19,
+     808,  1347,    18,    19,   812,  4225,   185,   571,   812,   600,
+     647,    18,    19,  1903,  3394,  5191,    18,    19,  1364,   140,
+    4107,  1367,    87,   483,   808,  1915,  4376,  1386,  1387,   481,
+    1388,  1390,   812,    47,  1393,  1394,  1395,  2972,  2973,  1398,
+    1399,  1400,  1401,  1402,  1403,  1404,  1405,  1388,  4181,  5077,
+     241,   386,  3432,  1234,   389,    18,    19,   808,  3073,   808,
+    2172,   808,  1408,   812,  3759,   812,  1449,  4143,   808,  1415,
+    1416,  1417,  1418,   179,  1420,  1421,  1422,   808,  2412,  1425,
+    1426,  1427,  1428,   812,  1430,   812,   808,   160,  1434,   455,
+    2121,  1429,   412,  2567,  2568,   647,  2412,  1417,  2567,  2568,
+    1446,  1421,   156,  1449,   476,  1425,  4685,  4686,  3908,  3909,
+    3997,  1457,  1429,  3997,  1460,  3997,    18,    19,  1464,  1465,
+     388,  1504,  4055,  1461,  1673,  3044,  3010,  3011,  2412,  3997,
+    3751,  4218,  2282,  1479,  1480,   777,  3792,   192,  1521,   417,
+    2290,  3997,  1488,  1489,  1461,  1491,  1492,   386,   293,  2140,
+     389,  1700,  4239,  2884,  5096,   200,  2884,  3926,  1504,  1505,
+     562,  3644,  5190,   565,  4251,   428,   256,  1513,   122,  4256,
+    4055,   808,   634,   419,  1512,  1521,   231,  1550,  1509,  2922,
+    3663,   723,  1565,   403,   377,  1734,  4055,  3303,  3199,  3598,
+    1536,  4124,   571,   647,  3205,  1512,   727,  1580,  1544,  1049,
+     812,  3691,   216,   352,    71,   847,  3681,  3091,    71,  3093,
+    3094,  4558,  1550,   125,  1560,  1561,  1562,  1563,  1564,  1565,
+    1566,  2707,  1550,  2919,  2863,  4705,  1653,   204,  3088,  5112,
+    1576,  3640,  1578,  1550,  1580,  3722,  2979,  1583,  5414,  4124,
+    1560,  1561,  1562,   807,  1564,    18,    19,  3549,  1429,   464,
+    3552,  1461,   122,  3691,  1433,  4124,   808,   371,  1578,  1101,
+     812,    77,  2293,  1583,  3754,   371,  3994,  3995,  2772,  2868,
+    2869,   160,  1655,   653,  3994,  3995,  5304,   368,   386,  2838,
+    1461,   389,  2978,  5331,   812,  2153,   532,   432,  1634,  1635,
+    3301,  3302,   243,  4111,  3037,  2799,  3046,  3047,   165,  3679,
+      18,    19,   165,  1649,  3301,   194,  1689,   501,   386,  1655,
+     571,   389,   647,   158,    18,    19,  3754,    40,  4313,   813,
+    4831,    18,    19,   386,  3302,   603,   389,  1673,   122,  1660,
+     386,  1512,   386,   389,   600,   389,   290,  4561,   517,   386,
+     586,  4110,   389,  1689,   153,  2838,    18,    19,   432,   612,
+     369,    18,    19,   137,  1700,   164,   636,    59,   812,   625,
+     636,   727,   427,   742,   386,  1207,   386,   389,   152,   389,
+     386,    18,    19,   389,   419,   655,   656,  1712,   469,   386,
+      21,  2878,   389,  1729,   386,  4351,  1721,   389,  1734,   582,
+     614,   611,  3772,  4893,   188,  4282,   128,   246,    18,    19,
+    5080,    53,  4981,    18,    19,  1751,  1752,   571,   647,   500,
+    3999,  3380,    64,  3380,   138,  3426,   108,   608,   372,  3380,
+     290,   237,  3341,   386,  3343,   219,   389,   276,   501,  3160,
+      18,    19,  3160,   813,  3353,  3354,  3355,  3356,  4515,   636,
+    4794,    18,    19,  3362,  3363,  3364,  3365,  3366,  3367,  4569,
+    3369,  3370,  3371,  3372,    13,  5483,   209,   571,  3377,   371,
+      18,    19,   552,   141,    33,  3002,  3003,  3004,   748,   749,
+    1843,   485,    18,    19,   176,   167,  3610,   812,   180,    26,
+     292,   125,   588,   634,   386,    18,    19,   389,   703,   704,
+      18,    19,   194,   197,   125,   571,   290,   642,   604,  1141,
+      18,    19,   372,   194,   228,  5084,    13,   807,   200,   582,
+      18,    19,  2061,  4737,  1846,   156,   239,  3897,  1864,  1865,
+     565,   388,    18,    19,   369,   388,   186,   546,  2831,   282,
+    2079,   162,   492,   510,  1880,   125,   812,    84,   387,   647,
+     276,   807,   287,  2941,  5044,  4432,   807,   363,    59,   139,
+      18,    19,   636,   369,   614,    18,    19,  5244,   613,   194,
+     122,   293,    18,    19,   713,   714,   715,  1913,  3459,   647,
+    1916,  1917,  1918,   812,    18,    19,   385,   197,   372,    21,
+    1926,   140,   562,  3311,   647,   565,  1428,   400,   812,  3480,
+     231,   647,   400,   647,   198,    18,    19,  1917,  1918,  3979,
+     647,   245,   197,     9,   349,   565,   266,   584,    18,    19,
+     629,   158,   501,   386,  4364,   812,   389,  4367,   614,   812,
+      18,    19,   438,  4351,  2173,   647,   188,   647,   330,     0,
+     282,   647,    74,   140,    18,    19,  3034,  1479,  1480,   593,
+     647,   449,   454,   807,  3042,   647,  1488,  1489,   372,  1491,
+     285,   387,  3383,   156,  4243,  3383,   732,  2003,  2004,   619,
+    4249,   812,  2211,  4658,    13,   176,   344,  4485,   386,   180,
+    3027,   389,    19,    18,    19,    18,    19,   368,   571,  3407,
+     249,    21,   386,   194,   647,   389,   636,    18,    19,   386,
+     237,   355,   389,   582,    18,    19,    18,    19,    18,    19,
+    1550,   546,  4430,  4431,   812,   237,   275,  5286,   368,  2258,
+    4430,  4431,    18,    19,   386,  2061,   360,   389,   160,   386,
+     636,  1563,   389,   593,  1566,  2274,   428,   419,   290,   400,
+     546,    18,    19,  2079,   812,   167,  5423,  5424,  2096,   386,
+     371,   331,   389,  5117,   497,   647,  5120,  2106,   808,   812,
+    4181,  4181,   812,   602,  3689,  2096,   812,  3671,  3672,   400,
+    2119,   570,  2120,  2122,  2099,   812,   386,   362,   200,   389,
+     137,   386,  2099,  4343,   389,   322,   753,  4267,  4268,  2120,
+     186,  2127,   598,  4273,   629,   152,   808,   125,   400,  4993,
+    2136,   140,   812,   235,   141,   399,   812,   542,   386,   593,
+      77,   389,   139,   746,  4374,   812,   808,  2153,   414,   386,
+     372,  2842,   389,   629,   455,   368,   812,   813,  4120,   330,
+    4122,   263,   369,   635,   162,  2171,  2172,  2173,   386,  4267,
+    4268,   389,  2215,  2216,  2865,  4273,  2867,   369,   614,    65,
+     386,   784,  2188,   389,  2393,   808,  2192,   807,    32,   571,
+     743,   492,   197,   386,  2200,  3583,   389,  2203,   386,  3719,
+    3603,   389,   812,  3723,  2976,  2211,   602,    26,   386,  2215,
+    2216,   389,   441,   565,   647,  3412,  4702,  4703,   386,  5331,
+     127,   389,  2431,    18,    19,    18,    19,    18,    19,    13,
+     386,   231,   563,   389,   586,    79,   812,  4013,   492,  3642,
+    2246,    80,  2248,    82,  2250,   509,   808,   571,   421,  2250,
+      23,  4661,  2258,    18,    19,   502,   160,   428,   386,   611,
+    3811,   389,    35,   386,   565,    84,   389,    13,  2274,   647,
+     386,  3570,   596,   389,  2272,   627,    49,  2275,  5312,   127,
+     571,   160,   386,   647,  2282,   389,   125,  4517,    61,    62,
+     647,   563,  2290,  3844,  2282,  2272,   212,   212,  2275,  2305,
+      13,  3852,  2290,   386,  3628,  2282,   389,   231,  3859,   148,
+     154,   565,  2521,  2290,  3625,   647,   386,  3628,   619,   389,
+     647,   534,  4751,  5152,  5153,   262,   574,   419,   386,  2335,
+    2336,   389,   807,   680,   331,   636,   811,   344,  2356,   546,
+     647,   248,   386,   258,   691,   389,    18,    19,   187,  2558,
+     732,   591,    18,    19,   546,  2356,   140,   680,    18,    19,
+     108,   608,   563,  1865,  4158,   619,   620,   647,   691,   293,
+     256,   593,   647,   371,   614,   808,   812,   813,  1880,  5126,
+    4809,   386,   636,   386,   389,  3434,   389,  2393,   194,  4849,
+     277,  4851,  2390,   280,   140,   386,  2429,  4547,   389,   647,
+     248,  3565,   386,  4944,   386,   389,   386,   389,  4949,   389,
+     647,  1913,   585,  2390,   239,  2421,    18,    19,   237,   230,
+     386,   448,   629,   389,   249,  2431,  2459,   140,   373,   647,
+     808,  2272,  2438,  2439,  2275,   241,     9,   629,  2444,   386,
+     532,   647,   389,  2449,  5070,   212,  3580,  3758,  2449,  4547,
+    3579,   808,   479,   562,   647,   455,   565,   122,    31,   647,
+     122,   799,   800,   801,   802,   803,   804,    18,    19,   647,
+       7,  2477,   387,   221,  2507,   167,   808,  2483,   364,   647,
+     582,   808,   127,  2489,  2490,  2491,  2492,  2493,  2494,  2495,
+    4343,   647,   492,  2499,   586,  2501,   503,   504,  5124,  5125,
+     813,   808,   611,   322,   428,  2511,   807,  2513,  2514,   810,
+    2516,   812,  2518,  2519,    12,  2521,  2522,  2523,   508,   647,
+    5300,  4374,  2528,   188,   647,  2531,   188,  2533,  5535,   800,
+    5071,   647,  2538,   808,   128,  2541,  2542,   808,   158,   484,
+    2749,   748,   429,   647,  2753,    21,  2552,  3605,  2554,  2390,
+     369,   536,  2558,   807,   219,  5041,  5042,   219,   807,    64,
+    5307,  3885,    18,    19,   647,   565,    22,   392,  2574,    74,
+     414,   808,    48,    19,  3885,   365,   366,   647,  2584,  2585,
+     194,   125,  5411,  5412,    89,   570,   235,   582,  2485,   647,
+     808,   386,   436,   386,   389,   386,   389,   492,   389,  2496,
+     439,   138,   808,   647,   148,  2502,  3997,   144,   366,  3997,
+     108,  5040,  3200,    19,   263,   808,   606,   237,   100,   619,
+     808,   386,  3210,  3211,   389,   290,   220,   230,   290,   127,
+     808,  4302,   246,   477,  2136,  2532,   636,   235,  5016,  2536,
+     808,   812,   647,   187,   647,   393,  2543,  2544,   534,   455,
+     122,  2153,   808,   800,   591,   403,   647,   415,  3557,    86,
+     650,   808,   410,   647,   212,   647,   552,   647,  5448,  2171,
+     565,   285,  4216,  4217,   455,   131,  2719,   614,   105,  4455,
+     808,   647,  5070,   249,  3692,   808,   492,  2896,   234,   235,
+     212,   228,   808,  2699,   538,   141,   492,  2703,  2200,   293,
+     647,  2203,   200,  1712,   808,  2421,   272,   372,   787,   788,
+     372,   790,  1721,  2719,   386,   261,   188,   389,   655,   656,
+     386,  2727,  2728,   389,   619,   808,   386,   546,  2444,   389,
+     235,  2726,    61,    62,    77,  3651,  5124,  5125,   808,   235,
+     807,   636,    71,  2749,  3660,   243,   813,  2753,  2728,   369,
+     808,   400,    21,    38,   680,    84,   238,   643,  2777,   565,
+     680,    46,   563,   808,   808,   691,   514,   812,   111,   565,
+    4029,   691,  2282,   227,   120,   229,   258,   319,   320,  4182,
+    2290,    12,   324,   325,   386,    18,    19,   389,   286,   271,
+     797,   798,   799,   800,   801,   802,   803,   804,   622,   122,
+     812,   625,   125,  4062,  4063,   808,   343,   807,    61,    62,
+     629,   748,   749,   619,   565,   158,   808,   808,   290,    33,
+     812,   808,     7,   619,   808,   812,   808,   600,  2834,  4088,
+     636,   100,  2838,  2335,  2336,   386,   717,   718,   389,    13,
+     636,    26,   808,  4154,  3743,  3744,  2889,   636,   621,   622,
+     639,  3997,   647,  4815,   647,   807,   647,  4436,  4437,  4438,
+    4439,   808,   667,   611,   669,   188,   141,  4368,   209,    43,
+    4371,  4372,   354,  2879,  2880,  4849,  2871,  4851,   807,  4000,
+     226,  3572,   647,  2889,  2871,   815,   807,   156,   807,  4014,
+    2896,  4282,   235,   807,  4282,   377,   219,   808,   344,    84,
+     372,   812,  4000,   571,  4069,   835,  2912,  3116,   807,  4000,
+    4074,  2917,   807,  4584,  4585,  2921,  2922,   807,   848,   849,
+      94,   419,   807,   192,    98,   194,   546,   141,   593,   748,
+     386,   593,   807,   389,   807,   808,   951,    61,    62,   954,
+     807,   282,  2444,   212,   959,  2951,   808,    71,   217,   964,
+     812,   808,  2958,  2959,   808,   812,  5099,   807,   812,   144,
+     807,    26,   231,   122,   100,   807,  2984,   290,  4132,   238,
+    2976,   807,  2967,  2979,   807,   647,   807,   246,   321,  2985,
+    3189,   647,   808,  2984,  2985,   807,   812,   647,   334,   258,
+    2985,   808,   338,   807,   476,   812,   339,  3030,  2985,   345,
+     498,   807,   271,   807,  3002,  3003,  3004,   276,   807,   629,
+     807,   807,    77,   808,    77,   808,   285,   808,   122,    84,
+     363,   125,   807,   574,   807,  3002,  3003,  3004,   807,   188,
+    3239,  3037,  3030,   808,   696,   249,   807,   812,   655,   656,
+    2542,  4432,  3030,   808,  4432,   647,  3065,   807,  3067,   372,
+      33,  3057,   237,  3030,   807,    77,  3062,   503,   504,   813,
+     219,   275,   807,   141,   807,   563,   548,   565,   227,   344,
+     229,    93,  2574,   808,   150,   151,   807,   812,   156,   253,
+     426,  5510,   808,   480,   188,   354,   812,   808,   808,  3298,
+    3299,   812,   812,   158,   808,   158,   647,  5526,   812,    47,
+      48,   599,   238,   300,   301,   808,   100,   808,   377,   812,
+    3116,   812,   177,   611,   807,   219,  2567,  2568,   387,   184,
+     103,   593,   258,  5552,  3130,  3131,  3132,  1318,  1319,  3130,
+     344,   290,   614,   212,   808,   271,   808,   322,   812,   122,
+    4543,   716,   808,   807,   490,   122,    21,   135,   808,   807,
+    3156,   365,   366,  4318,  4171,   808,   497,   331,   563,   812,
+     807,  3002,  3003,  3004,  4329,  4568,   563,   666,   667,   808,
+     669,   568,   237,   812,   237,   141,  3385,   808,   807,    12,
+     807,   812,   179,  3189,   369,   807,   290,  3193,   492,  3195,
+     808,   647,  1610,  1611,   812,  3201,   500,  2699,   808,  3205,
+     808,  2703,   812,   546,   812,   188,   808,   476,  3214,   707,
+     807,   188,   807,   372,   611,   808,  3222,   807,   354,   812,
+     563,   395,    26,   807,   807,   100,   807,   441,   503,   504,
+     627,   500,   808,  3239,   212,   807,   812,   807,  4562,  3245,
+     807,   377,   219,   265,   238,   807,  4557,   444,   445,    21,
+     808,  4562,   807,    64,   812,   807,   653,   322,   807,  3265,
+     807,   565,   245,    74,   258,   450,   344,  3273,   372,   807,
+     593,  3277,  3278,    77,   807,   108,    64,   271,    89,   548,
+      84,   156,   807,   418,   808,   631,    74,  3293,   812,   503,
+     504,   807,  3298,  3299,   127,   141,   807,   807,   363,   807,
+     363,    89,   516,   649,   369,   807,   369,   290,   808,    37,
+     807,   652,   812,   290,   808,   619,   620,   808,   812,   194,
+     342,   812,   807,  3329,   807,   480,   122,   808,   100,   125,
+     671,   812,   636,   602,   653,   808,  5262,   212,  3344,   812,
+     476,   807,   217,   517,   613,   614,   368,   807,  3435,   807,
+     807,   797,   798,   799,   800,   801,   802,   803,   804,   807,
+     354,   546,   807,   238,   807,   634,   199,   636,   365,   366,
+     807,   246,   808,   177,   371,   438,   812,   808,   344,  3385,
+     184,   812,   193,   258,   156,   559,   808,   115,   199,   372,
+     812,   807,   188,   808,   122,   372,   271,   812,   384,   808,
+     808,   276,   235,   812,   812,   193,   141,   807,   430,  4181,
+     285,  5006,   548,   396,  3412,  3421,  1116,  1117,  3424,  1119,
+    3426,  1121,   194,   219,   235,   503,   504,  3422,   697,   807,
+     807,  3426,   807,   237,   593,  3412,  3431,  3432,   807,  3426,
+     212,   807,  3437,   807,   629,   217,   808,   235,   807,  2951,
+     812,   179,   263,   286,   808,   808,  2958,  2959,   812,   812,
+     188,  4626,  4627,   808,  4629,   807,   238,   812,   808,   807,
+     807,  4730,   812,  5399,   246,   263,   807,   807,   614,   354,
+      56,   546,   476,   546,   377,   562,   258,  4636,  4637,   593,
+      66,   219,   380,   808,   290,   197,    37,   812,   344,   271,
+      76,   808,   377,   807,   276,   812,   231,   721,   246,   194,
+     532,   197,   387,   285,    90,    91,    92,   808,   322,   246,
+    3030,   812,   797,   798,   799,   800,   801,   802,   803,   804,
+     106,   620,  5458,   808,  5460,   598,  3542,   503,   504,   808,
+     108,   810,   808,   812,   521,   808,   812,  5222,   817,   812,
+    5476,   500,    37,   808,   548,  3561,   389,   812,   377,   363,
+     500,     7,   290,   748,   629,   369,   629,   764,   765,   808,
+     212,  3412,   813,   812,   115,   812,   372,  3620,   141,  4478,
+     166,   122,   354,   797,   798,   799,   800,   801,   802,   803,
+     804,   588,  3598,   276,  5520,  5521,  3602,  3603,   807,   167,
+     194,   476,   562,  3609,   141,   377,   417,   604,   542,   344,
+     593,   166,   103,  3608,  3620,   387,   593,   222,  3624,  3625,
+     542,   542,  3628,   287,   157,   500,   813,   355,   807,   417,
+     115,   122,   200,  3628,  3640,   812,  3642,   122,   179,   367,
+     812,  3628,   141,   371,   372,  3651,  3652,   188,    13,   807,
+    3651,  3652,    96,   813,  3660,  3661,  3662,   503,   504,  3660,
+    3661,  3662,   807,    15,    48,   498,   156,   235,   156,    21,
+     197,   111,   810,   548,   808,    21,   807,   160,   219,   125,
+      26,    27,    28,   748,   811,   518,   160,    39,   141,   160,
+     812,    43,   138,  3712,   179,   249,   293,   188,   144,  3705,
+      48,  3707,   195,   188,   476,    57,    58,   518,   160,   383,
+     171,    63,  4877,   696,  4879,  4880,   532,    63,   286,   797,
+     798,   799,   800,   801,   802,   803,   804,   602,   500,   518,
+     563,    77,   565,   193,   219,   568,   708,    83,    84,   614,
+       7,    87,   546,    71,  4909,  3751,   160,  3753,    13,   290,
+    3751,   633,  3758,   808,   245,   808,    10,   333,   140,   634,
+     122,   636,   812,   125,   813,   111,   599,   141,   503,   504,
+     603,  4829,   186,   808,   350,   140,   548,   808,   611,   125,
+     808,   344,   228,   129,   808,  5096,  3792,   201,    64,   808,
+     808,  3293,   603,   808,  3800,   501,   249,   593,    74,   290,
+     214,  4752,   807,   122,   666,   290,  4757,   344,   275,   708,
+     156,   377,   158,    89,   355,   614,   562,   515,    50,   492,
+     653,   812,   697,   282,    30,   629,   188,   500,  4981,   287,
+     602,   372,   798,   799,   800,   801,   802,   803,   804,   812,
+     582,   812,   614,   571,   812,   344,   414,   575,   486,    71,
+     578,   419,   266,   267,   732,   220,   571,   219,   273,   812,
+     588,   812,   634,  5016,   636,   593,  3872,   657,   596,   188,
+     355,   812,   811,   249,   707,   249,   300,   301,   813,  3885,
+     294,   372,  3888,  3889,   801,   231,   371,   372,   252,   235,
+     560,   344,   565,   181,   194,   471,   242,   343,   812,   194,
+     219,    88,  3908,  3909,   812,   396,  3912,   812,  3914,    21,
+     812,  3917,   488,   378,   558,   645,   262,   193,   136,  3421,
+     156,   808,  3424,   199,    48,   697,   372,   728,   290,   275,
+     498,  5084,   807,   808,  4885,   810,   786,   812,  4889,   455,
+     503,   504,   817,  5202,   748,  4844,   619,   620,   362,   372,
+     518,   797,   798,   799,   800,   801,   802,   803,   804,   235,
+     653,   728,   808,   636,   727,   636,   503,   504,   571,  3975,
+     344,   290,   812,    21,   550,   321,   502,    87,   315,    27,
+       7,   160,   161,   807,  3990,   110,  3992,   263,   158,   582,
+     400,   567,    74,   339,  4945,   563,   400,   400,   582,  4950,
+     568,   136,   416,  4009,   503,   504,   261,   400,   261,   136,
+     372,  5208,  4018,   400,    48,   400,    64,   400,   586,   400,
+     444,   445,   201,    71,   584,  5284,   618,    75,   400,    77,
+     571,   599,   812,   618,   575,   214,   808,   578,   810,   812,
+     812,    89,   709,   611,  3462,   817,  3464,   588,   394,   500,
+     503,   504,   593,   372,   400,   596,   491,   403,   627,   627,
+      56,   808,   797,   798,   799,   800,   801,   802,   803,   804,
+      66,   799,   800,   808,   807,   254,   807,   125,   812,   807,
+      76,   609,    57,   171,   447,   653,   571,   377,   267,     7,
+     575,   716,   111,   578,    90,    91,    92,   377,   613,   523,
+     524,   525,   593,   588,  4313,     7,   200,  3609,   593,   455,
+     106,   596,   591,   808,   808,   294,   457,   458,   459,   460,
+     461,   462,   463,   197,   400,   812,   808,   808,   808,   503,
+     504,  4340,   808,  5286,   807,   800,   482,  4143,   807,   707,
+     808,   417,   808,   689,   804,   808,   492,  5471,  4154,   808,
+     808,   808,   808,   808,   192,   203,   808,    64,   812,   812,
+    5471,   526,   527,   808,   529,   530,   531,    74,   808,   812,
+     807,  5495,   808,   808,   813,  4181,  4182,  4172,   807,   358,
+     813,  4187,    89,   548,  5495,    35,  4187,   813,    77,   807,
+    5514,   808,   538,   539,   540,   541,   812,   812,    35,   813,
+     546,   811,   287,  5514,    93,   696,   287,   287,   287,   287,
+    5534,   287,   812,   812,   160,   263,   377,   563,   634,   565,
+     566,   582,   236,  5534,   812,   812,   582,   400,   582,   812,
+      13,   593,   812,   160,  4240,   377,   799,   800,   801,   802,
+     803,   804,   518,   210,   197,   134,   197,   582,   582,   255,
+     432,   194,  5417,   197,   813,   813,   602,   813,   799,   800,
+     797,   798,   799,   800,   801,   802,   803,   804,   813,   813,
+     812,   808,   808,   619,   593,  4308,   614,   427,  4284,    60,
+    4286,   607,   513,  4289,   808,   404,   193,  4293,   194,   812,
+     636,   789,   401,   814,   789,   403,  4302,   228,   797,   798,
+     799,   800,   801,   802,   803,   804,  5191,  4313,   158,   144,
+     403,   103,   162,   571,   799,   800,   341,   365,   366,   571,
+     571,   158,   807,   371,   668,   162,   812,   603,   235,   377,
+    4336,   813,   379,    60,  4340,   263,   477,   333,   597,   263,
+     764,   765,   263,   807,   797,   798,   799,   800,   801,   802,
+     803,   804,   202,   402,   350,  5532,   263,   706,   672,   377,
+     672,   249,   160,   160,   160,   202,   160,   160,   708,   417,
+     160,   160,   222,   160,  4380,  4381,   265,   641,   724,    19,
+     160,   160,   160,   160,   160,   222,   160,   160,   160,   160,
+     160,  3809,  3810,   160,   160,  4401,  3814,   160,   160,   160,
+     160,   160,   748,   749,   160,   160,   160,   160,   160,  5278,
+     160,   763,   160,   160,   160,   160,   768,  4423,   160,   160,
+     160,  4401,   160,   797,   798,   799,   800,   801,   802,   803,
+     804,   160,  3850,   286,   160,   160,   160,   287,  3856,  3857,
+    3858,   160,   653,  3861,   791,   377,   798,  4453,   496,  4658,
+     287,   464,   807,   342,   154,   808,   813,   808,   808,  4465,
+    4455,   807,   814,   245,   810,   808,   808,   571,   813,   808,
+     245,   571,   808,  5342,   571,   808,   365,   366,   654,   368,
+    5379,   812,   807,   813,   813,   807,   813,   582,  5357,   812,
+     582,   384,   488,   400,   197,   730,  4705,   807,   546,   812,
+    5517,  5370,   212,   732,   372,   611,   432,  4009,   812,   335,
+     417,   156,   554,   807,   807,   807,    12,   403,   500,     7,
+     872,   873,   343,   875,   876,  4636,  4637,   403,   812,  5414,
+      73,   532,   382,   532,   532,   532,   888,  4543,   532,   491,
+     263,   430,   263,  4549,   377,   382,   807,    15,   614,   366,
+     807,  4557,   591,  4762,   550,   603,  4562,  4563,   563,   636,
+    5429,   563,  4568,   812,   812,   582,  4561,   582,   418,   372,
+    5439,   567,   450,   377,  5473,  5444,   377,   212,   808,   812,
+     808,   418,   807,   807,   807,    19,   807,   807,  4594,   785,
+     807,   807,   442,   472,   807,    63,    62,   807,   807,     4,
+     807,   413,  4608,   247,   247,   442,   720,   655,   656,  5478,
+      21,  5480,   751,   808,   808,   808,    21,   467,    48,   494,
+     812,   807,   687,   808,   687,   808,   571,   285,   812,    12,
+     467,   983,   546,  5502,    39,   160,   801,   812,   231,   642,
+    4646,  5526,   160,   532,  4650,   384,   282,   807,   197,   812,
+     808,   808,  4658,   808,   808,   808,   258,   705,   258,   390,
+      48,   511,   217,   160,   812,   160,   160,  5552,  5537,  5538,
+    1022,   403,    48,  5542,   511,   807,   160,   807,   228,   792,
+     103,   729,   245,   278,  1036,   813,   111,   111,   368,   162,
+     807,   400,   542,   729,   125,   565,   807,  1049,   582,  4705,
+     748,   749,   807,   440,   807,   542,   807,   383,   807,   799,
+     808,   228,   562,   377,   377,   565,   807,   372,   245,   808,
+     515,   808,   808,  1761,   636,  1763,  1764,   400,   197,   210,
+    1768,   432,    21,   808,   582,  4741,   808,  4743,  4744,   808,
+     377,   269,  4737,  1781,   246,   812,  1784,  1785,   808,  1787,
+     197,   813,  1790,  1791,  1792,  1793,  4762,   812,   817,  1797,
+     817,   817,   697,   160,  1802,  4771,   258,   258,   258,  1807,
+    1808,  1809,  1810,  1811,  4780,   126,   277,  1815,  1816,    48,
+      21,   403,    48,  1821,  4827,  1823,  1824,  1825,    27,  1827,
+    1828,    48,  1830,   153,    48,  1833,   477,   801,  1836,  1837,
+     807,    35,    35,   625,   729,   125,   608,   263,    64,   203,
+     263,    35,   372,   372,   807,   372,   415,    77,    21,   377,
+     807,  4827,   813,   377,   808,    64,   515,   487,  4834,   808,
+     808,   812,    71,   341,  4336,   808,    75,   808,    77,   808,
+     808,   427,   808,  4849,   808,  4851,   265,   812,    48,   812,
+      89,  4887,   387,   808,   377,   384,   175,   285,   210,    21,
+    1212,   147,   258,   565,   160,   116,   117,   118,   119,   120,
+     808,   258,   405,   807,   807,   812,   120,   120,  4380,   808,
+      48,    48,  1234,    48,   387,   619,   125,   372,   377,   367,
+    1242,  1243,   807,    15,    21,   812,    81,   510,   620,  1251,
+    1252,  1253,  1254,  1255,  1256,   143,  4912,   372,   812,   807,
+     228,   808,  1264,  1265,   194,  1267,  1268,   812,   372,    21,
+    1272,  1273,    48,   808,  1276,  1277,  1278,  1279,   341,  1281,
+    1282,   173,   377,   384,  4940,  4941,   808,  1289,  1290,   263,
+    1292,  1293,  1294,  1295,  1296,   194,   813,  1299,  1300,  1301,
+    1302,  1303,  1304,  1305,  1306,  1307,    21,  1309,   812,   160,
+    1312,  1313,   807,  4465,   276,  1317,   162,   808,   318,  1321,
+    1322,  1323,   223,   224,   225,   226,   807,   636,   673,   397,
+      48,    21,  1334,  1335,  1336,   472,   149,  1339,  5007,   808,
+    1342,  1343,  1344,  1345,  1346,  5031,   112,  5003,   808,  1351,
+     608,   812,   162,   636,   136,   573,   136,   807,   136,   808,
+    5016,  1363,  1364,   158,   377,   537,   483,   808,    48,  1371,
+     808,  1373,  1374,   807,   263,   483,   812,   653,   678,  5238,
+    5036,    48,  5241,  1385,  1386,  1387,   534,  1389,  1390,   807,
+     691,  1393,  1394,  1395,   808,   691,  1398,  1399,  1400,  1401,
+    1402,  1403,  1404,  1405,   554,   155,   807,  1409,   807,   691,
+    5058,   633,  1414,   807,  5097,    32,    64,   384,    64,    19,
+     553,   807,  5281,   481,   807,   702,   197,  1429,   808,   814,
+     808,   633,   384,   334,    32,   336,   337,   338,   808,   384,
+    5096,   143,  5098,   134,   345,   691,   688,   483,   701,  5105,
+    5106,     6,   464,   228,   377,   377,  5112,   246,   154,  1461,
+      48,   810,   171,   633,   130,   608,   154,   230,   292,   810,
+     814,  5127,   124,   231,   702,    54,   365,   366,   574,   143,
+     807,   810,   371,  5139,   154,   372,   574,   812,   377,   215,
+     810,   500,    54,  5149,   154,   194,   194,   194,  5154,   454,
+     125,   812,   574,   635,  5152,  5153,   377,   698,  3587,   196,
+    1512,  3338,  5159,  5159,  5159,  3334,  3332,  1519,  4743,  3350,
+    4746,  3336,  5159,  4751,  3988,   426,  4756,  3785,   417,  5185,
+    4769,  1239,  5072,  5365,  5189,  1757,  5366,  4771,  4963,  5552,
+    5510,    46,  1091,  2975,  2917,  4143,  5058,  5058,  1550,  5058,
+    1552,  5058,  5058,  1555,  5522,  5058,  5058,  5426,  5227,  5058,
+    5208,  5335,  5426,  5058,  5412,  5058,  5361,  5058,  5360,  3997,
+    2474,  5058,  5058,  5058,  1198,  3583,  4432,  4282,  2480,  2700,
+    4455,  5208,  5238,  3432,  3431,  5241,  4235,  3437,   489,   490,
+    4868,  5309,  4643,  5321,  5319,  5388,  5031,  2453,  5254,  2567,
+    3426,  4016,  4302,  4354,  4303,  3828,  3861,   496,  3860,  4672,
+    5331,  4357,  3538,  5261,  5262,  5097,  5035,  4885,  4945,  4889,
+    4950,  1912,  4899,  3201,  4650,  5281,  4329,  4451,  4002,  1631,
+    5278,  3111,  5491,  5319,  3414,  2568,    18,    19,  3104,  4722,
+    2568,  2567,  1731,  1694,  2345,  2343,  5302,  3891,  1650,  3231,
+     768,  2964,  2958,  1865,  3329,  2948,  3609,   546,  1890,  4159,
+      64,  5152,  5153,  2424,  1022,  2253,  1023,  2127,  1364,  4476,
+    2877,  2838,  2059,  4981,  5002,  5286,  1283,  5302,  1097,  5379,
+     798,  2985,  4834,  2985,  2985,  2985,  2374,  5473,  5499,  4853,
+    4587,  5105,  3912,  4215,  5342,  1110,   814,  5106,  1257,  1634,
+    4596,  5003,  3667,  4810,  3885,  4976,  2431,  1709,  4883,  5357,
+      16,  2137,  1469,  2884,   603,  1183,  3608,  5208,  1183,  5388,
+    3608,  4565,  5370,  3606,  4178,  4548,  1632,  1183,  4557,  2329,
+     631,   992,  1597,  2330,   116,   117,   118,   119,   120,  2226,
+    2905,  3293,  3612,  2225,  1179,  4263,  5299,   648,   649,  5514,
+    5378,  5399,  4633,  5534,  4517,  4374,  1730,  4562,   876,  4856,
+    4617,  1367,  3131,  5411,  5412,  2275,   655,   656,  3030,  3344,
+    5261,  5262,  1180,    43,  2290,  5431,  1183,  5294,  1548,    43,
+    1546,  5429,  5438,  2268,  2270,  1008,    39,  5278,  2951,  1461,
+    3099,  5439,  2719,  2481,  1149,  1689,  5444,  2711,  2720,  4824,
+    4986,    11,    11,  4005,  1508,  1011,  1172,  4391,  4452,  4764,
+    5458,  3902,  5460,    -1,    -1,  5471,   705,    -1,    -1,    -1,
+    2508,  5477,    -1,    -1,    -1,    -1,  5482,  5310,  5476,    -1,
+    5478,    -1,  5480,    -1,    -1,  5491,    -1,  2525,    -1,  5495,
+     729,   223,   224,   225,   226,    -1,  1239,    -1,    -1,    -1,
+      -1,  5342,    -1,    -1,  5502,    -1,    -1,    -1,  5514,   748,
+     749,    -1,    -1,    -1,    -1,   983,  5357,    -1,    -1,    -1,
+    5526,  1239,  5520,  5521,  2562,  2563,  1239,    -1,  5534,  5370,
+      -1,    -1,  2570,    -1,    -1,    -1,    -1,  5532,    -1,  5537,
+    5538,    -1,    -1,    -1,  5542,  5532,  5552,    -1,  5058,    -1,
+      -1,    -1,    -1,    -1,  1022,    -1,    -1,    -1,  5399,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    5411,  5412,    -1,    -1,    -1,   980,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1939,  5429,    -1,
+      -1,  1943,    -1,    -1,    -1,    -1,    -1,    -1,  5439,  1951,
+      -1,  1953,   334,  5444,   336,   337,   338,    -1,    -1,    -1,
+      -1,    -1,    -1,   345,    26,    27,    28,  5458,    -1,  5460,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  1036,    -1,    -1,    -1,  5476,    -1,  5478,    -1,  5480,
+      -1,  1993,  5152,  5153,    -1,    -1,    -1,    -1,    -1,    61,
+      62,    63,    -1,    -1,   386,    -1,    -1,   389,    -1,    71,
+      -1,  5502,    -1,    -1,    -1,    77,    -1,    -1,    -1,    -1,
+      -1,    83,    84,    -1,    -1,    87,    -1,    -1,    -1,  5520,
+    5521,    -1,    -1,  2721,    -1,  2037,  2038,  2039,    -1,    -1,
+      -1,    -1,    -1,    -1,   426,    -1,  5537,  5538,  1103,   111,
+      -1,  5542,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   125,    -1,    -1,    -1,   129,    -1,    -1,
+      -1,    -1,    -1,  2075,    -1,    -1,    -1,    -1,  2080,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   158,  2099,    -1,    -1,
+      -1,  5261,  5262,    -1,  2106,    -1,    -1,   489,   490,  2111,
+      -1,  2113,    -1,    -1,    -1,    -1,    -1,  2119,  5278,  2121,
+    2122,    -1,    -1,    -1,  1242,  1243,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  1251,  1252,    -1,    -1,  1255,  1256,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  1264,  1265,    -1,  1267,
+    1268,    -1,    -1,    -1,  1272,    -1,    -1,    -1,  1276,  1277,
+    1278,  1279,    -1,  1281,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  1289,  1290,   235,  1292,  1293,    -1,    -1,    -1,  1234,
+     242,  1299,  5342,    -1,  1302,  1303,  1304,  1305,  1306,  1307,
+      -1,  1309,    -1,    -1,  1312,  1313,    -1,  5357,    -1,  1317,
+     262,    -1,    -1,  1321,  1322,  1323,    -1,    -1,    -1,    -1,
+    5370,    -1,    -1,    -1,    -1,    35,  1334,  1335,  1336,    -1,
+      -1,    -1,    -1,    -1,  1342,  1343,  1344,  1345,  1346,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5399,
+      -1,    -1,    62,    -1,    -1,  1363,  1364,    -1,    -1,   631,
+      -1,  5411,  5412,  1371,    -1,  1373,  1374,    -1,    -1,   321,
+      -1,    -1,    -1,    -1,    -1,   647,   648,   649,    -1,  5429,
+    2272,    -1,    -1,  2275,    -1,    -1,    -1,   339,    -1,  5439,
+    2282,  2283,    -1,    -1,  5444,  2287,    -1,    -1,  2290,    -1,
+      -1,  2293,   112,    -1,    -1,   115,  1414,    -1,  5458,    -1,
+    5460,    -1,    -1,   123,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  5476,    -1,  5478,    -1,
+    5480,    -1,   142,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   394,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   403,  5502,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    5520,  5521,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   189,
+      -1,    -1,    -1,    -1,  1429,    -1,    -1,  5537,  5538,    -1,
+      -1,    -1,  5542,    -1,    -1,   205,    -1,    -1,  2390,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  1519,    -1,    -1,    -1,    -1,  1461,    -1,    -1,    -1,
+      -1,    -1,  1467,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     482,    -1,    -1,    -1,    -1,    -1,  1481,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  1552,    -1,    -1,  1555,    -1,    -1,
+     260,    -1,    -1,    -1,    -1,    14,    -1,    -1,    17,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  3144,  1512,  3146,   279,
+      -1,    -1,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
+    2472,    -1,    -1,  2475,  2476,    -1,   538,   539,   540,   541,
+      -1,    50,    51,    -1,   546,    -1,    -1,    -1,    -1,    58,
+      -1,    -1,    -1,    -1,    63,    64,    -1,    -1,    -1,    -1,
+      -1,   563,    -1,    -1,   566,    -1,    -1,    -1,    -1,    -1,
+      79,    -1,    -1,  1631,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   346,   347,   348,    -1,
+      99,    -1,  1650,   353,    -1,    -1,   356,    -1,    -1,    -1,
+     602,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   121,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   131,   132,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   143,   144,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  2588,   156,   408,   409,
+      -1,  1709,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   170,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   434,    -1,    -1,    -1,    -1,    -1,
+      -1,   190,    -1,    -1,    -1,  3313,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  1691,  1692,  1693,   208,
+      -1,   210,    -1,    -1,    -1,    -1,   215,    -1,    -1,   218,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   724,    -1,   233,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   241,    -1,    -1,   244,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   748,   749,   508,    -1,
+      -1,    -1,    -1,    -1,    -1,   264,    -1,    -1,    -1,    -1,
+      -1,  3389,  3390,  3391,  3392,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   281,    -1,    -1,    -1,   285,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  2734,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  2743,  2744,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   578,    -1,
+      -1,    -1,  2764,  2765,    -1,  2767,    -1,    -1,  2770,  2771,
+    2772,  2773,  2774,    -1,    -1,  2777,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  2786,    -1,   606,    -1,    -1,  2791,
+      -1,  2793,    -1,  2795,  2796,    -1,  2798,  2799,    -1,    -1,
+      -1,  2803,  2804,  2805,    -1,    -1,    -1,  2809,  2810,  2811,
+      -1,  2813,   381,  2815,    -1,  2817,    -1,  2819,    -1,  2821,
+      -1,  1939,    -1,    -1,  2826,  1943,    -1,    -1,    -1,   649,
+      -1,    -1,    -1,    -1,    -1,  1953,    -1,    -1,    -1,    -1,
+    2842,    -1,    -1,    -1,    -1,   414,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   425,    -1,    -1,    -1,
+      -1,  2863,    -1,  2865,    -1,  2867,    -1,    -1,    -1,  2871,
+      -1,    -1,    -1,    -1,    -1,  2877,  2878,    -1,   447,    -1,
+      -1,   450,    -1,   452,    -1,    -1,   455,    -1,    -1,    26,
+      27,    28,    -1,    -1,    -1,    -1,   465,   466,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   475,    -1,   477,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   486,    -1,  2037,
+    2038,  2039,    -1,   492,    -1,    -1,    63,    -1,    -1,    -1,
+      -1,   500,    -1,    -1,    -1,    -1,   505,   506,   507,    -1,
+      77,    -1,    -1,    -1,    -1,    -1,    83,    84,    -1,    -1,
+      87,  2953,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  2080,    -1,    -1,    -1,    -1,    -1,    -1,   538,
+      -1,    -1,    -1,    -1,   111,    -1,   545,    -1,    -1,    -1,
+      -1,  2099,    -1,    -1,    -1,    -1,    -1,    -1,   125,    -1,
+      -1,    -1,   129,  2111,    -1,  2113,   565,    -1,    -1,    -1,
+    3002,  3003,  3004,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     589,   158,    -1,    -1,    -1,    -1,    -1,    -1,  3030,    -1,
+      -1,    -1,   601,    -1,    -1,    -1,   605,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   613,    -1,    -1,    -1,    -1,    -1,
+     619,    -1,    -1,  3055,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  3065,    -1,  3067,    -1,   636,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   644,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   660,   661,   662,   663,    -1,    -1,    -1,   235,    -1,
+      -1,    -1,    -1,    -1,    -1,   242,   675,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  3124,    -1,    -1,   262,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   712,    -1,    14,  2201,  2202,    17,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  2283,    -1,    36,    -1,  2287,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    50,    51,   752,   321,    -1,    -1,    -1,    -1,    58,
+      -1,    -1,    -1,    -1,    63,    64,    -1,    -1,    -1,    -1,
+      -1,    -1,   339,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      79,    -1,    -1,    -1,    -1,    -1,    -1,  2272,    -1,    -1,
+    2275,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      99,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   807,    -1,
+      -1,    -1,    -1,    -1,    -1,  2300,    -1,    -1,    -1,    -1,
+      -1,    -1,   121,    -1,    -1,    -1,    -1,   394,    -1,    -1,
+      -1,    -1,   131,   132,    -1,    -1,   403,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   143,   144,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3976,  3977,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   170,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   190,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  2390,    -1,    -1,    -1,   208,
+      -1,   210,    -1,    -1,    -1,   482,   215,    -1,    -1,   218,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   233,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   241,    -1,    -1,   244,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   264,    -1,    -1,    -1,    -1,
+      -1,   538,   539,   540,   541,    -1,    -1,    -1,    -1,   546,
+    3412,    -1,   281,    -1,  2469,    -1,   285,    -1,  2473,    -1,
+      -1,    -1,    -1,  2478,    -1,    -1,   563,    -1,    -1,   566,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  3446,    -1,    -1,    -1,  2503,  2504,
+    2505,  2506,  3454,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   602,    -1,    -1,    -1,    -1,
+    2588,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    2535,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3491,
+    3492,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  2559,  2560,    -1,    -1,    -1,    -1,
+      -1,    -1,   381,    -1,    -1,  3517,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  3527,    -1,  3529,    -1,  3531,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   414,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   425,    -1,    -1,    -1,
+      -1,    -1,    -1,  3565,    -1,    -1,    -1,    -1,  3570,    -1,
+    3572,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   447,    -1,
+      -1,   450,    -1,   452,    -1,    -1,   455,   724,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   465,   466,    -1,    -1,
+      -1,    -1,    -1,    -1,  3606,    -1,   475,    -1,   477,    -1,
+      -1,   748,   749,    -1,    -1,    -1,  2734,   486,    -1,    -1,
+      -1,    -1,    -1,   492,    -1,  2743,  2744,    -1,    -1,    -1,
+      -1,   500,    -1,    -1,    -1,    -1,   505,   506,   507,    -1,
+      -1,  3643,    -1,    -1,    -1,    -1,  2764,  2765,    -1,  2767,
+      -1,    -1,  2770,  2771,  2772,  2773,  2774,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  4352,  4353,    -1,    -1,  2786,   538,
+      -1,    -1,    -1,  2791,    -1,  2793,   545,  2795,  2796,  3681,
+    2798,    -1,    -1,    -1,    -1,  2803,  2804,  2805,    -1,    -1,
+      -1,  2809,  2810,  2811,    -1,  2813,   565,  2815,    -1,  2817,
+      -1,  2819,    -1,  2821,    -1,    -1,    -1,    -1,  2826,    -1,
+    3712,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     589,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   601,    -1,    -1,    -1,   605,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   613,    -1,    -1,    -1,    -1,    -1,
+     619,    -1,    -1,  2871,    -1,    -1,    -1,    -1,    -1,  2877,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   636,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   644,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3791,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   675,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  2953,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   712,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2954,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3055,   807,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  3002,  3003,  3004,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3044,
+      -1,    -1,  3994,  3995,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  3124,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  4033,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  4066,    -1,  4068,    -1,    -1,  4071,
+    4072,    -1,  4074,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  4085,    -1,    -1,    -1,    -1,  4090,    -1,
+      -1,  4093,  3147,    -1,  4096,  4097,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  3159,    -1,  3161,  3162,  3163,  3164,
+      -1,  3166,  3167,    -1,    -1,    -1,  4118,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    4132,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    21,
+      -1,    -1,    -1,    -1,    26,    27,    28,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  4178,    -1,    -1,    -1,
+      -1,    63,    -1,    -1,    -1,  3240,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    77,    -1,    -1,  3253,    -1,
+      -1,    83,    84,    -1,    -1,    87,    -1,  4895,  4896,  4897,
+    4212,  4213,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   111,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   125,    -1,    -1,    -1,   129,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   156,    -1,   158,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  3341,    -1,  3343,    -1,
+      -1,    -1,  4294,    -1,    -1,    -1,    -1,    -1,  3353,  3354,
+    3355,  3356,    -1,    -1,    -1,    -1,    -1,  3362,  3363,  3364,
+    3365,  3366,  3367,    -1,  3369,  3370,  3371,  3372,    -1,    -1,
+    3375,    -1,  3377,    -1,    -1,    -1,    -1,    -1,  3446,    -1,
+      -1,    -1,    -1,    -1,    -1,  5023,  3454,    -1,  5026,  5027,
+    5028,  5029,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   231,
+      -1,    -1,    -1,   235,    -1,    -1,    -1,  3412,    -1,    -1,
+     242,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  3491,  3492,    34,    35,    -1,    -1,    -1,
+     262,    40,    -1,    42,    -1,    44,    45,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  4398,  4399,    -1,  3517,
+      -1,    -1,    -1,    62,    -1,    -1,    -1,    -1,    -1,  3527,
+      -1,  3529,    -1,  3531,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  5113,    -1,    -1,  4430,  4431,
+      -1,    -1,    -1,    -1,  5122,  5123,    -1,    -1,    -1,   321,
+      -1,    -1,    -1,  5131,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   112,    -1,    -1,   115,   339,    -1,    -1,
+      -1,    -1,    -1,    -1,   123,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   142,    -1,    -1,    -1,    -1,  3606,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     159,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   394,    -1,    -1,    -1,    -1,    -1,   400,    -1,
+      -1,   403,    -1,    -1,    -1,  3643,    -1,    -1,   187,    -1,
+     189,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   205,   206,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  4558,    -1,    -1,    -1,
+      -1,    -1,    -1,  3681,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   455,    -1,    -1,  4578,    -1,  4580,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   247,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     482,   260,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     492,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     279,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   288,
+     289,    -1,   291,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   538,   539,   540,   541,
+      -1,    -1,    -1,    -1,   546,    -1,  3721,    -1,   327,   328,
+     329,    -1,    -1,  3791,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   563,    -1,   565,   566,  4687,    -1,   346,   347,   348,
+      -1,    -1,    -1,    -1,   353,    -1,    -1,   356,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  3760,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   374,   375,  4719,    -1,    -1,
+     602,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   619,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   408,
+     409,    -1,    -1,    -1,   636,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   434,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  4794,    -1,    -1,  4797,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4810,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   496,    -1,    -1,
+      -1,   500,   724,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   512,  4856,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  3920,   748,   749,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   572,    -1,  4033,   575,    -1,    -1,   578,
+     579,   580,   581,    -1,    -1,   807,    -1,    -1,   810,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  3993,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4066,    -1,
+    4068,    -1,    -1,  4071,  4072,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   621,   622,    -1,    -1,    -1,  4085,    -1,    -1,
+      -1,    -1,  4090,    -1,  4976,  4093,    -1,    -1,  4096,  4097,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     649,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    4118,    -1,    -1,    -1,    -1,  5007,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  5053,    -1,    -1,    -1,    -1,  5058,    -1,    -1,    -1,
+    4178,    -1,  5064,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  5086,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  4212,  4213,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  5146,    -1,    -1,    -1,    -1,    -1,
+    5152,  5153,    -1,   812,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4223,  4224,
+      -1,  4226,    -1,    -1,    -1,    -1,  4294,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  5195,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  5208,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  5227,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  5247,    -1,  5249,    35,    36,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  5259,    -1,  5261,
+    5262,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    61,    62,  5278,    -1,    -1,    -1,
+    4398,  4399,    -1,    -1,    -1,    72,    73,  4342,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      97,    -1,    99,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   109,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5340,    -1,
+    5342,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  5357,  5358,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5370,    -1,
+     157,   158,    -1,    -1,    -1,    -1,   163,    -1,    -1,   166,
+      -1,  4436,  4437,  4438,  4439,    -1,  5388,    -1,    -1,   176,
+      -1,    -1,    -1,    -1,    -1,    -1,  5398,  5399,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4463,  5411,
+    5412,   198,    -1,   200,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   209,    -1,   211,    -1,     7,  5429,    -1,    -1,
+      -1,    12,    -1,    14,  5436,    -1,    17,  5439,    -1,    -1,
+    4558,    -1,  5444,    -1,    -1,    26,    27,    28,    -1,  5451,
+      -1,    -1,    -1,    -1,    -1,    -1,  5458,    -1,  5460,    -1,
+    4578,    -1,  4580,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  5476,    -1,  5478,    58,  5480,    -1,
+      61,    62,    63,    64,    -1,    -1,    -1,    -1,    69,    -1,
+      71,    -1,    -1,    -1,    -1,   282,    77,    -1,    -1,    -1,
+    5502,    -1,    83,    84,    -1,    -1,    87,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    96,    -1,    -1,  5520,  5521,
+      -1,    -1,    -1,    -1,    -1,  5527,    -1,    -1,   315,    -1,
+     111,    -1,    -1,  5535,    -1,  5537,  5538,    -1,    -1,    -1,
+    5542,    -1,    -1,    -1,   125,    -1,    -1,    -1,   129,  4604,
+      -1,    -1,    -1,    -1,    -1,    -1,   137,   138,    -1,    -1,
+      -1,  4616,  4617,   144,    -1,    -1,    -1,    -1,    -1,  4687,
+      -1,   152,    -1,    -1,    -1,    -1,    -1,   158,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   169,    -1,
+      -1,    -1,    -1,   380,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  4719,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   192,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     407,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   418,   419,    -1,   421,   422,   423,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  4702,  4703,    -1,
+      -1,    -1,   233,    -1,   235,    -1,   443,    -1,    -1,    -1,
+      -1,   242,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  4794,    -1,    -1,  4797,
+    4735,   262,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  4746,  4810,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   285,    -1,    -1,    -1,    -1,    -1,
+     497,    -1,    -1,  4768,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   510,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  4856,    -1,
+     321,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   542,    -1,    -1,   339,   546,
+      -1,    -1,   343,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   562,    -1,    -1,   565,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   585,    -1,
+     381,    -1,    -1,    -1,    -1,    -1,   387,    -1,  4863,    -1,
+      -1,    -1,    -1,   394,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   403,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   623,    -1,    -1,  4894,
+      -1,    -1,    -1,   630,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   435,    -1,    -1,    -1,  4976,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   450,
+     451,   452,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   482,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  5053,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    5005,    -1,    -1,    -1,    -1,    -1,    -1,   538,   539,   540,
+     541,    -1,    -1,    -1,    -1,   546,   753,   754,  5086,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   563,    -1,    -1,   566,  5041,  5042,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   589,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   602,    -1,    -1,    -1,    -1,    -1,    -1,  5146,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   636,    -1,    -1,   639,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  5121,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  5195,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  5247,
+      -1,  5249,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  5259,    -1,   724,   725,   726,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  5208,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   748,   749,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  5232,  5233,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,     5,     6,    -1,     8,     9,    10,
+      11,    12,  5340,    -1,    15,    -1,    -1,    -1,    -1,    20,
+      -1,    -1,    23,    -1,    25,    26,    27,    28,    29,    30,
+    5358,    32,    -1,    -1,    35,    36,    37,    38,    39,    40,
+      41,    -1,    43,    44,    45,    -1,    47,    -1,    49,    50,
+      -1,    -1,    53,    54,    55,    56,    57,    -1,    59,    60,
+      61,    62,    63,    -1,    65,    66,    67,    68,    69,    70,
+    5398,    72,    73,    -1,    75,    76,    77,    78,    79,    80,
+      81,    82,    83,    84,    85,    -1,    87,    88,    -1,    90,
+      91,    92,    93,    94,    -1,    96,    97,    98,    -1,    -1,
+      -1,   102,   103,   104,    -1,   106,   107,   108,  5436,   110,
+     111,   112,   113,   114,   115,    -1,    -1,    -1,    -1,   120,
+     121,   122,    -1,  5451,   125,   126,   127,    -1,   129,    -1,
+      -1,    -1,    -1,    -1,   135,   136,   137,   138,   139,    -1,
+      -1,    -1,   143,    -1,    -1,   146,   147,   148,    -1,    -1,
+      -1,   152,    -1,   154,   155,    -1,   157,   158,   159,    -1,
+      -1,   162,   163,    -1,   165,   166,   167,   168,   169,   170,
+     171,    -1,   173,   174,   175,   176,   177,   178,   179,   180,
+     181,    -1,   183,   184,   185,   186,   187,   188,    -1,   190,
+     191,    -1,    -1,    -1,   195,   196,    -1,   198,    -1,  5527,
+      -1,   202,    -1,   204,   205,   206,   207,  5535,   209,    -1,
+     211,    -1,   213,    -1,   215,   216,    -1,   218,   219,    -1,
+     221,   222,    -1,    -1,    -1,   226,   227,   228,   229,   230,
+      -1,   232,   233,   234,    -1,    -1,   237,    -1,    -1,    -1,
+     241,   242,   243,   244,   245,    -1,    -1,   248,    -1,    -1,
+      -1,   252,   253,    -1,   255,   256,    -1,    -1,    -1,   260,
+      -1,   262,    -1,    -1,   265,   266,    -1,    -1,   269,    -1,
+     271,   272,   273,    -1,    -1,    -1,    -1,    -1,   279,   280,
+      -1,   282,    -1,   284,    -1,   286,   287,    -1,    -1,   290,
+      -1,    -1,    -1,    -1,   295,    -1,   297,   298,   299,   300,
+     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
+     311,   312,   313,    -1,   315,   316,   317,   318,   319,   320,
+     321,   322,   323,   324,   325,    -1,    -1,    -1,    -1,   330,
+     331,   332,   333,   334,   335,    -1,    -1,   338,   339,   340,
+     341,    -1,   343,   344,   345,   346,   347,   348,   349,   350,
+     351,   352,   353,    -1,   355,   356,   357,    -1,    -1,   360,
+     361,   362,   363,   364,   365,   366,   367,   368,   369,    -1,
+     371,   372,   373,    -1,   375,   376,    -1,   378,   379,   380,
+      -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   393,   394,   395,   396,   397,    -1,   399,    -1,
+     401,   402,   403,   404,   405,   406,   407,   408,   409,   410,
+     411,   412,    -1,   414,   415,   416,    -1,   418,    -1,   420,
+     421,   422,   423,   424,    -1,   426,   427,   428,    -1,    -1,
+     431,    -1,    -1,    -1,   435,   436,    -1,   438,   439,    -1,
+      -1,   442,   443,   444,   445,   446,    -1,   448,   449,    -1,
+     451,   452,   453,   454,   455,   456,   457,   458,   459,   460,
+     461,   462,   463,    -1,   465,    -1,   467,   468,    -1,   470,
+     471,   472,    -1,   474,    -1,   476,   477,   478,   479,   480,
+      -1,   482,   483,   484,   485,   486,   487,   488,    -1,   490,
+     491,   492,    -1,    -1,   495,   496,   497,   498,    -1,    -1,
+      -1,   502,    -1,    -1,    -1,   506,    -1,   508,   509,   510,
+     511,    -1,   513,   514,   515,   516,   517,    -1,    -1,    -1,
+      -1,    -1,   523,   524,   525,    -1,   527,    -1,    -1,   530,
+      -1,    -1,   533,    -1,   535,    -1,   537,   538,   539,   540,
+     541,   542,   543,   544,   545,   546,    -1,    -1,   549,   550,
+     551,   552,   553,   554,   555,   556,   557,   558,   559,   560,
+     561,   562,   563,    -1,   565,   566,   567,   568,   569,    -1,
+     571,   572,   573,    -1,   575,   576,   577,   578,    -1,    -1,
+      -1,    -1,    -1,   584,   585,    -1,   587,   588,   589,   590,
+     591,    -1,   593,   594,   595,   596,   597,   598,    -1,   600,
+     601,    -1,    -1,   604,    -1,    -1,   607,    -1,   609,    -1,
+     611,   612,    -1,    -1,   615,   616,   617,   618,   619,   620,
+      -1,    -1,   623,   624,    -1,   626,   627,    -1,   629,   630,
+     631,   632,    -1,    -1,    -1,   636,    -1,    -1,   639,   640,
+     641,    -1,   643,   644,   645,   646,    -1,    -1,   649,    -1,
+      -1,   652,   653,   654,   655,   656,    -1,   658,    -1,    -1,
+      -1,    -1,    -1,   664,   665,    -1,   667,   668,   669,   670,
+     671,   672,   673,    -1,   675,   676,   677,   678,   679,   680,
+      -1,   682,   683,   684,   685,   686,   687,   688,    -1,   690,
+     691,   692,   693,   694,   695,   696,    -1,    -1,    -1,   700,
+     701,   702,   703,   704,   705,   706,   707,    -1,   709,   710,
+     711,   712,   713,   714,   715,   716,   717,   718,    -1,   720,
+     721,   722,   723,   724,   725,   726,   727,   728,   729,   730,
+     731,   732,   733,   734,   735,   736,   737,   738,   739,   740,
+     741,   742,   743,    -1,   745,   746,   747,   748,   749,   750,
+     751,    -1,   753,   754,   755,   756,   757,   758,   759,   760,
+     761,   762,   763,   764,   765,   766,   767,   768,   769,   770,
+     771,   772,   773,   774,   775,   776,   777,   778,   779,   780,
+     781,   782,   783,   784,   785,   786,   787,   788,   789,   790,
+     791,   792,   793,    -1,    -1,    -1,    -1,    -1,   799,   800,
+      -1,    -1,    -1,    -1,   805,    -1,   807,    -1,    -1,    -1,
+     811,    -1,    -1,    -1,   815,   816,     5,     6,    -1,     8,
        9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
       -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
+      29,    30,    -1,    32,    -1,    -1,    35,    36,    37,    38,
+      39,    40,    41,    -1,    43,    44,    45,    46,    47,    -1,
+      49,    50,    -1,    -1,    53,    54,    55,    56,    57,    -1,
+      59,    60,    61,    62,    63,    -1,    65,    66,    67,    68,
       69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
       79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,
+      -1,    90,    91,    92,    93,    94,    -1,    96,    97,    98,
+      -1,    -1,    -1,   102,   103,   104,    -1,   106,   107,   108,
+      -1,   110,   111,   112,   113,   114,   115,    -1,    -1,    -1,
+      -1,   120,   121,   122,    -1,    -1,   125,   126,   127,    -1,
      129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
      139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
       -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
      159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
+     169,   170,   171,    -1,   173,   174,   175,   176,   177,   178,
+     179,   180,   181,    -1,   183,   184,   185,   186,   187,   188,
       -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
       -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
+     209,    -1,   211,    -1,   213,    -1,   215,   216,    -1,   218,
+     219,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
+     229,   230,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
+      -1,    -1,   241,   242,   243,   244,   245,    -1,    -1,   248,
       -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
+      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,   268,
+     269,    -1,   271,   272,   273,    -1,    -1,    -1,    -1,    -1,
      279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
+      -1,   290,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
      299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
+     309,   310,   311,   312,   313,    -1,   315,   316,   317,   318,
+     319,   320,   321,   322,   323,   324,   325,    -1,    -1,    -1,
       -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
+     339,   340,   341,    -1,   343,   344,   345,   346,   347,   348,
+     349,   350,   351,   352,   353,    -1,   355,   356,   357,    -1,
+      -1,   360,   361,   362,   363,   364,   365,   366,   367,   368,
+     369,    -1,   371,   372,   373,    -1,   375,   376,    -1,   378,
      379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
+      -1,    -1,    -1,    -1,   393,   394,   395,   396,   397,    -1,
      399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
+     409,   410,   411,   412,    -1,   414,   415,   416,    -1,   418,
       -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
       -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
      439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
+     449,    -1,   451,   452,   453,   454,   455,   456,   457,   458,
      459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
+      -1,   470,   471,   472,    -1,   474,    -1,   476,   477,   478,
+     479,   480,    -1,   482,   483,   484,   485,   486,   487,   488,
       -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
       -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
      509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
       -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
       -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,    -1,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,   125,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-      -1,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
-     279,   280,    -1,    -1,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,    -1,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,    -1,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
+     539,   540,   541,   542,   543,   544,   545,   546,    -1,    -1,
+     549,   550,   551,   552,   553,   554,   555,   556,   557,   558,
+     559,   560,   561,   562,   563,    -1,    -1,   566,   567,   568,
+     569,    -1,   571,   572,   573,    -1,   575,   576,   577,   578,
+      -1,    -1,    -1,    -1,   583,   584,   585,    -1,   587,   588,
+     589,   590,   591,    -1,   593,   594,   595,   596,   597,   598,
       -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
+     609,    -1,   611,   612,    -1,    -1,   615,   616,   617,   618,
+     619,   620,    -1,    -1,   623,   624,    -1,   626,   627,    -1,
      629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
      639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,    -1,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,    -1,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
+     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
+      -1,    -1,    -1,    -1,    -1,   664,   665,    -1,   667,   668,
+     669,   670,   671,   672,   673,    -1,   675,   676,   677,   678,
+     679,   680,    -1,   682,   683,   684,   685,   686,   687,   688,
+      -1,   690,   691,   692,   693,   694,   695,   696,    -1,    -1,
       -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
      709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
       -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
@@ -21295,399 +14981,2023 @@
      749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
      759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
      769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
+     779,   780,   781,   782,   783,   784,   785,   786,   787,   788,
+     789,   790,   791,   792,   793,    -1,    -1,    -1,    -1,    -1,
+     799,   800,    -1,    -1,    -1,    -1,   805,    -1,   807,    -1,
+      -1,    -1,   811,    -1,    -1,    -1,   815,   816,     5,     6,
+      -1,     8,     9,    10,    11,    12,    13,    -1,    15,    -1,
+      -1,    -1,    -1,    20,    -1,    -1,    23,    -1,    25,    26,
+      27,    28,    29,    30,    -1,    32,    -1,    -1,    35,    36,
+      37,    38,    39,    40,    41,    -1,    43,    44,    45,    -1,
+      47,    -1,    49,    50,    -1,    -1,    53,    54,    55,    56,
+      57,    -1,    59,    60,    61,    62,    63,    -1,    65,    66,
+      67,    68,    69,    70,    -1,    72,    73,    -1,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    -1,
+      87,    88,    -1,    90,    91,    92,    93,    94,    -1,    96,
+      97,    98,    -1,    -1,    -1,   102,   103,   104,    -1,   106,
+     107,   108,    -1,   110,   111,   112,   113,   114,   115,    -1,
+      -1,    -1,    -1,   120,   121,   122,    -1,    -1,   125,   126,
+     127,    -1,   129,    -1,    -1,    -1,    -1,    -1,   135,   136,
+     137,   138,   139,    -1,    -1,    -1,   143,    -1,    -1,   146,
+     147,   148,    -1,    -1,    -1,   152,    -1,   154,   155,    -1,
+     157,   158,   159,    -1,    -1,   162,   163,    -1,   165,   166,
+     167,   168,   169,   170,   171,    -1,   173,   174,   175,   176,
+     177,   178,   179,   180,   181,    -1,   183,   184,   185,   186,
+     187,   188,    -1,   190,   191,    -1,    -1,    -1,   195,   196,
+      -1,   198,    -1,    -1,    -1,   202,    -1,   204,   205,   206,
+     207,    -1,   209,    -1,   211,    -1,   213,    -1,   215,   216,
+      -1,   218,   219,    -1,   221,   222,    -1,    -1,    -1,   226,
+     227,   228,   229,   230,    -1,   232,   233,   234,    -1,    -1,
+     237,    -1,    -1,    -1,   241,   242,   243,   244,   245,    -1,
+      -1,   248,    -1,    -1,    -1,   252,   253,    -1,   255,   256,
+      -1,    -1,    -1,   260,    -1,   262,    -1,    -1,   265,   266,
+      -1,    -1,   269,    -1,   271,   272,   273,    -1,    -1,    -1,
+      -1,    -1,   279,   280,    -1,   282,    -1,   284,    -1,   286,
+     287,    -1,    -1,   290,    -1,    -1,    -1,    -1,   295,    -1,
+     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,   313,    -1,   315,   316,
+     317,   318,   319,   320,   321,   322,   323,   324,   325,    -1,
+      -1,    -1,    -1,   330,   331,   332,   333,   334,   335,    -1,
+      -1,   338,   339,   340,   341,    -1,   343,   344,   345,   346,
+     347,   348,   349,   350,   351,   352,   353,    -1,   355,   356,
+     357,    -1,    -1,   360,   361,   362,   363,   364,   365,   366,
+     367,   368,   369,    -1,   371,   372,   373,    -1,   375,   376,
+     377,   378,   379,   380,    -1,    -1,   383,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   393,   394,   395,   396,
+     397,    -1,   399,    -1,   401,   402,   403,   404,   405,   406,
+     407,   408,   409,   410,   411,   412,    -1,   414,   415,   416,
+      -1,   418,    -1,   420,   421,   422,   423,   424,    -1,   426,
+     427,   428,    -1,    -1,   431,    -1,    -1,    -1,   435,   436,
+      -1,   438,   439,    -1,    -1,   442,   443,   444,   445,   446,
+      -1,   448,   449,    -1,   451,   452,   453,   454,   455,   456,
+     457,   458,   459,   460,   461,   462,   463,    -1,   465,    -1,
+     467,   468,    -1,   470,   471,   472,    -1,   474,    -1,   476,
+     477,   478,   479,   480,    -1,   482,   483,   484,   485,   486,
+     487,   488,    -1,   490,   491,    -1,    -1,    -1,   495,   496,
+     497,   498,    -1,    -1,    -1,   502,    -1,    -1,    -1,   506,
+      -1,   508,   509,   510,   511,    -1,   513,   514,   515,   516,
+     517,    -1,    -1,    -1,    -1,    -1,   523,   524,   525,    -1,
+     527,    -1,    -1,   530,    -1,    -1,   533,    -1,   535,    -1,
+     537,   538,   539,   540,   541,   542,   543,   544,   545,   546,
+      -1,    -1,   549,   550,   551,   552,   553,   554,   555,   556,
+     557,   558,   559,   560,   561,   562,   563,    -1,    -1,   566,
+     567,   568,   569,    -1,   571,   572,   573,    -1,   575,   576,
+     577,   578,    -1,    -1,    -1,    -1,    -1,   584,   585,    -1,
+     587,   588,   589,   590,   591,    -1,   593,   594,   595,   596,
+     597,   598,    -1,   600,   601,    -1,    -1,   604,    -1,    -1,
+     607,    -1,   609,    -1,   611,   612,    -1,    -1,   615,   616,
+     617,   618,   619,   620,    -1,    -1,   623,   624,    -1,   626,
+     627,    -1,   629,   630,   631,   632,    -1,    -1,    -1,    -1,
+      -1,    -1,   639,   640,   641,    -1,   643,   644,   645,   646,
+      -1,    -1,   649,    -1,    -1,   652,   653,   654,   655,   656,
+      -1,   658,    -1,    -1,    -1,    -1,    -1,   664,   665,    -1,
+     667,   668,   669,   670,   671,   672,   673,    -1,   675,   676,
+     677,   678,   679,   680,    -1,   682,   683,   684,   685,   686,
+     687,   688,    -1,   690,   691,   692,   693,   694,   695,   696,
+      -1,    -1,    -1,   700,   701,   702,   703,   704,   705,   706,
+     707,   708,   709,   710,   711,   712,   713,   714,   715,   716,
+     717,   718,    -1,   720,   721,   722,   723,   724,   725,   726,
+     727,   728,   729,   730,   731,   732,   733,   734,   735,   736,
+     737,   738,   739,   740,   741,   742,   743,    -1,   745,   746,
+     747,   748,   749,   750,   751,    -1,   753,   754,   755,   756,
+     757,   758,   759,   760,   761,   762,   763,   764,   765,   766,
+     767,   768,   769,   770,   771,   772,   773,   774,   775,   776,
+     777,   778,   779,   780,   781,   782,   783,   784,   785,   786,
+     787,   788,   789,   790,   791,   792,   793,    -1,    -1,    -1,
+      -1,    -1,   799,   800,    -1,    -1,    -1,    -1,   805,    -1,
+     807,    -1,    -1,    -1,   811,    -1,    -1,    -1,   815,   816,
+       5,     6,    -1,     8,     9,    10,    11,    12,    -1,    -1,
+      15,    -1,    -1,    -1,    -1,    20,    -1,    -1,    23,    -1,
+      25,    26,    27,    28,    29,    30,    -1,    32,    -1,    -1,
+      35,    36,    37,    38,    39,    40,    41,    -1,    43,    44,
+      45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,    54,
+      55,    56,    57,    -1,    59,    60,    61,    62,    63,    -1,
+      65,    66,    67,    68,    69,    70,    -1,    72,    73,    -1,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    -1,    87,    88,    -1,    90,    91,    92,    93,    94,
+      -1,    96,    97,    98,    -1,    -1,    -1,   102,   103,   104,
+      -1,   106,   107,   108,    -1,   110,   111,   112,   113,   114,
+     115,    -1,    -1,    -1,    -1,   120,   121,   122,    -1,    -1,
+     125,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,    -1,
+     135,   136,   137,   138,   139,    -1,    -1,    -1,   143,    -1,
+      -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,   154,
+     155,    -1,   157,   158,   159,    -1,    -1,   162,   163,    -1,
+     165,   166,   167,   168,   169,   170,   171,    -1,   173,   174,
+     175,   176,   177,   178,   179,   180,   181,    -1,   183,   184,
+     185,   186,   187,   188,    -1,   190,   191,    -1,    -1,    -1,
+     195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,   204,
+     205,   206,   207,    -1,   209,    -1,   211,    -1,   213,    -1,
+     215,   216,    -1,   218,   219,    -1,   221,   222,    -1,    -1,
+      -1,   226,   227,   228,   229,   230,    -1,   232,   233,   234,
+      -1,    -1,   237,    -1,    -1,    -1,   241,   242,   243,   244,
+     245,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,    -1,
+     255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,    -1,
+     265,   266,    -1,    -1,   269,    -1,   271,   272,   273,    -1,
+      -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,   284,
+      -1,   286,   287,    -1,    -1,   290,    -1,    -1,    -1,    -1,
+     295,    -1,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,    -1,
+     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
+     325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,   334,
+     335,    -1,    -1,   338,   339,   340,   341,    -1,   343,   344,
+     345,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
+     355,   356,   357,    -1,    -1,   360,   361,   362,   363,   364,
+     365,   366,   367,   368,   369,    -1,   371,   372,   373,    -1,
+     375,   376,    -1,   378,   379,   380,    -1,    -1,   383,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,   394,
+     395,   396,   397,    -1,   399,    -1,   401,   402,   403,   404,
+     405,   406,   407,   408,   409,   410,   411,   412,    -1,   414,
+     415,   416,    -1,   418,    -1,   420,   421,   422,   423,   424,
+      -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,    -1,
+     435,   436,    -1,   438,   439,    -1,    -1,   442,   443,   444,
+     445,   446,    -1,   448,   449,    -1,   451,   452,   453,   454,
+     455,   456,   457,   458,   459,   460,   461,   462,   463,    -1,
+     465,    -1,   467,   468,    -1,   470,   471,   472,    -1,   474,
+      -1,   476,   477,   478,   479,   480,    -1,   482,   483,   484,
+     485,   486,   487,   488,    -1,   490,   491,    -1,    -1,    -1,
+     495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,    -1,
+      -1,   506,    -1,   508,   509,   510,   511,    -1,   513,   514,
+     515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,   524,
+     525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,    -1,
+     535,    -1,   537,   538,   539,   540,   541,   542,   543,   544,
+     545,   546,    -1,    -1,   549,   550,   551,   552,   553,   554,
+     555,   556,   557,   558,   559,   560,   561,   562,   563,    -1,
+      -1,   566,   567,   568,   569,    -1,   571,   572,   573,    -1,
+     575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,   584,
+     585,    -1,   587,   588,   589,   590,   591,    -1,   593,   594,
+     595,   596,   597,   598,    -1,   600,   601,    -1,    -1,   604,
+      -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,    -1,
+     615,   616,   617,   618,   619,   620,    -1,    -1,   623,   624,
+      -1,   626,   627,    -1,   629,   630,   631,   632,    -1,    -1,
+      -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,   644,
+     645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,   654,
+     655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,   664,
+     665,    -1,   667,   668,   669,   670,   671,   672,   673,    -1,
+     675,   676,   677,   678,   679,   680,    -1,   682,   683,   684,
+     685,   686,   687,   688,    -1,   690,   691,   692,   693,   694,
+     695,   696,    -1,    -1,    -1,   700,   701,   702,   703,   704,
+     705,   706,   707,    -1,   709,   710,   711,   712,   713,   714,
+     715,   716,   717,   718,    -1,   720,   721,   722,   723,   724,
+     725,   726,   727,   728,   729,   730,   731,   732,   733,   734,
+     735,   736,   737,   738,   739,   740,   741,   742,   743,    -1,
+     745,   746,   747,   748,   749,   750,   751,    -1,   753,   754,
+     755,   756,   757,   758,   759,   760,   761,   762,   763,   764,
+     765,   766,   767,   768,   769,   770,   771,   772,   773,   774,
+     775,   776,   777,   778,   779,   780,   781,   782,   783,   784,
+     785,   786,   787,   788,   789,   790,   791,   792,   793,    -1,
+      -1,    -1,    -1,    -1,   799,   800,   801,    -1,    -1,    -1,
+     805,    -1,   807,    -1,    -1,    -1,   811,    -1,    -1,    -1,
+     815,   816,     5,     6,    -1,     8,     9,    10,    11,    12,
+      -1,    -1,    15,    -1,    -1,    -1,    -1,    20,    -1,    -1,
+      23,    -1,    25,    26,    27,    28,    29,    30,    -1,    32,
+      -1,    -1,    35,    36,    37,    38,    39,    40,    41,    -1,
+      43,    44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,
+      53,    54,    55,    56,    57,    -1,    59,    60,    61,    62,
+      63,    -1,    65,    66,    67,    68,    69,    70,    -1,    72,
+      73,    -1,    75,    76,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    -1,    87,    88,    -1,    90,    91,    92,
+      93,    94,    -1,    96,    97,    98,    -1,    -1,    -1,   102,
+     103,   104,    -1,   106,   107,   108,    -1,   110,   111,   112,
+     113,   114,   115,    -1,    -1,    -1,    -1,   120,   121,   122,
+      -1,    -1,   125,   126,   127,    -1,   129,    -1,    -1,    -1,
+      -1,    -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,
+     143,    -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,
+      -1,   154,   155,    -1,   157,   158,   159,    -1,    -1,   162,
+     163,    -1,   165,   166,   167,   168,   169,   170,   171,    -1,
+     173,   174,   175,   176,   177,   178,   179,   180,   181,    -1,
+     183,   184,   185,   186,   187,   188,    -1,   190,   191,    -1,
+      -1,    -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,
+      -1,   204,   205,   206,   207,    -1,   209,    -1,   211,    -1,
+     213,    -1,   215,   216,    -1,   218,   219,    -1,   221,   222,
+      -1,    -1,    -1,   226,   227,   228,   229,   230,    -1,   232,
+     233,   234,    -1,    -1,   237,    -1,    -1,    -1,   241,   242,
+     243,   244,   245,    -1,    -1,   248,    -1,    -1,    -1,   252,
+     253,    -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,
+      -1,    -1,   265,   266,    -1,    -1,   269,    -1,   271,   272,
+     273,    -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,
+      -1,   284,    -1,   286,   287,    -1,    -1,   290,    -1,    -1,
+      -1,    -1,   295,    -1,   297,   298,   299,   300,   301,   302,
+     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
+     313,    -1,   315,   316,   317,   318,   319,   320,   321,   322,
+     323,   324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,
+     333,   334,   335,    -1,    -1,   338,   339,   340,   341,    -1,
+     343,   344,   345,   346,   347,   348,   349,   350,   351,   352,
+     353,    -1,   355,   356,   357,    -1,    -1,   360,   361,   362,
+     363,   364,   365,   366,   367,   368,   369,    -1,   371,   372,
+     373,    -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,
+     383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     393,   394,   395,   396,   397,    -1,   399,    -1,   401,   402,
+     403,   404,   405,   406,   407,   408,   409,   410,   411,   412,
+      -1,   414,   415,   416,    -1,   418,    -1,   420,   421,   422,
+     423,   424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,
+      -1,    -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,
+     443,   444,   445,   446,    -1,   448,   449,    -1,   451,   452,
+     453,   454,   455,   456,   457,   458,   459,   460,   461,   462,
+     463,    -1,   465,    -1,   467,   468,    -1,   470,   471,   472,
+      -1,   474,    -1,   476,   477,   478,   479,   480,    -1,   482,
+     483,   484,   485,   486,   487,   488,    -1,   490,   491,    -1,
+      -1,    -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,
+      -1,    -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,
+     513,   514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,
+     523,   524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,
+     533,    -1,   535,    -1,   537,   538,   539,   540,   541,   542,
+     543,   544,   545,   546,    -1,    -1,   549,   550,   551,   552,
+     553,   554,   555,   556,   557,   558,   559,   560,   561,   562,
+     563,    -1,    -1,   566,   567,   568,   569,    -1,   571,   572,
+     573,    -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,
+      -1,   584,   585,    -1,   587,   588,   589,   590,   591,    -1,
+     593,   594,   595,   596,   597,   598,    -1,   600,   601,    -1,
+      -1,   604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,
+      -1,    -1,   615,   616,   617,   618,   619,   620,    -1,    -1,
+     623,   624,    -1,   626,   627,    -1,   629,   630,   631,   632,
+      -1,    -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,
+     643,   644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,
+     653,   654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,
+      -1,   664,   665,    -1,   667,   668,   669,   670,   671,   672,
+     673,    -1,   675,   676,   677,   678,   679,   680,    -1,   682,
+     683,   684,   685,   686,   687,   688,    -1,   690,   691,   692,
+     693,   694,   695,   696,    -1,    -1,    -1,   700,   701,   702,
+     703,   704,   705,   706,   707,    -1,   709,   710,   711,   712,
+     713,   714,   715,   716,   717,   718,    -1,   720,   721,   722,
+     723,   724,   725,   726,   727,   728,   729,   730,   731,   732,
+     733,   734,   735,   736,   737,   738,   739,   740,   741,   742,
+     743,    -1,   745,   746,   747,   748,   749,   750,   751,    -1,
+     753,   754,   755,   756,   757,   758,   759,   760,   761,   762,
+     763,   764,   765,   766,   767,   768,   769,   770,   771,   772,
+     773,   774,   775,   776,   777,   778,   779,   780,   781,   782,
+     783,   784,   785,   786,   787,   788,   789,   790,   791,   792,
+     793,    -1,    -1,    -1,    -1,    -1,   799,   800,   801,    -1,
+      -1,    -1,   805,    -1,   807,    -1,    -1,    -1,   811,    -1,
+      -1,    -1,   815,   816,     5,     6,    -1,     8,     9,    10,
+      11,    12,    -1,    -1,    15,    -1,    -1,    -1,    -1,    20,
+      -1,    -1,    23,    -1,    25,    26,    27,    28,    29,    30,
+      -1,    32,    -1,    -1,    35,    36,    37,    38,    39,    40,
+      41,    -1,    43,    44,    45,    -1,    47,    -1,    49,    50,
+      -1,    -1,    53,    54,    55,    56,    57,    -1,    59,    60,
+      61,    62,    63,    -1,    65,    66,    67,    68,    69,    70,
+      -1,    72,    73,    -1,    75,    76,    77,    78,    79,    80,
+      81,    82,    83,    84,    85,    -1,    87,    88,    -1,    90,
+      91,    92,    93,    94,    -1,    96,    97,    98,    -1,    -1,
+      -1,   102,   103,   104,    -1,   106,   107,   108,    -1,   110,
+     111,   112,   113,   114,   115,    -1,    -1,    -1,    -1,   120,
+     121,   122,    -1,    -1,   125,   126,   127,    -1,   129,    -1,
+      -1,    -1,    -1,    -1,   135,   136,   137,   138,   139,    -1,
+      -1,    -1,   143,    -1,    -1,   146,   147,   148,    -1,    -1,
+      -1,   152,    -1,   154,   155,    -1,   157,   158,   159,    -1,
+      -1,   162,   163,    -1,   165,   166,   167,   168,   169,   170,
+     171,    -1,   173,   174,   175,   176,   177,   178,   179,   180,
+     181,    -1,   183,   184,   185,   186,   187,   188,    -1,   190,
+     191,    -1,    -1,    -1,   195,   196,   197,   198,    -1,    -1,
+      -1,   202,    -1,   204,   205,   206,   207,    -1,   209,    -1,
+     211,    -1,   213,    -1,   215,   216,    -1,   218,   219,    -1,
+     221,   222,    -1,    -1,    -1,   226,   227,   228,   229,   230,
+      -1,   232,   233,   234,    -1,    -1,   237,    -1,    -1,    -1,
+     241,   242,   243,   244,   245,    -1,    -1,   248,    -1,    -1,
+      -1,   252,   253,    -1,   255,   256,    -1,    -1,    -1,   260,
+      -1,   262,    -1,    -1,   265,   266,    -1,    -1,   269,    -1,
+     271,   272,   273,    -1,    -1,    -1,    -1,    -1,   279,   280,
+      -1,   282,    -1,   284,    -1,   286,   287,    -1,    -1,   290,
+      -1,    -1,    -1,    -1,   295,    -1,   297,   298,   299,   300,
+     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
+     311,   312,   313,    -1,   315,   316,   317,   318,   319,   320,
+     321,   322,   323,   324,   325,    -1,    -1,    -1,    -1,   330,
+     331,   332,   333,   334,   335,    -1,    -1,   338,   339,   340,
+     341,    -1,   343,   344,   345,   346,   347,   348,   349,   350,
+     351,   352,   353,    -1,   355,   356,   357,    -1,    -1,   360,
+     361,   362,   363,   364,   365,   366,   367,   368,   369,    -1,
+     371,   372,   373,    -1,   375,   376,    -1,   378,   379,   380,
+      -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   393,   394,   395,   396,   397,    -1,   399,    -1,
+     401,   402,   403,   404,   405,   406,   407,   408,   409,   410,
+     411,   412,    -1,   414,   415,   416,    -1,   418,    -1,   420,
+     421,   422,   423,   424,    -1,   426,   427,   428,    -1,    -1,
+     431,    -1,    -1,    -1,   435,   436,    -1,   438,   439,    -1,
+      -1,   442,   443,   444,   445,   446,    -1,   448,   449,    -1,
+     451,   452,   453,   454,   455,   456,   457,   458,   459,   460,
+     461,   462,   463,    -1,   465,    -1,   467,   468,    -1,   470,
+     471,   472,    -1,   474,    -1,   476,   477,   478,   479,   480,
+      -1,   482,   483,   484,   485,   486,   487,   488,    -1,   490,
+     491,    -1,    -1,    -1,   495,   496,   497,   498,    -1,    -1,
+      -1,   502,    -1,    -1,    -1,   506,    -1,   508,   509,   510,
+     511,    -1,   513,   514,   515,   516,   517,    -1,    -1,    -1,
+      -1,    -1,   523,   524,   525,    -1,   527,    -1,    -1,   530,
+      -1,    -1,   533,    -1,   535,    -1,   537,   538,   539,   540,
+     541,   542,   543,   544,   545,   546,    -1,    -1,   549,   550,
+     551,   552,   553,   554,   555,   556,   557,   558,   559,   560,
+     561,   562,   563,    -1,    -1,   566,   567,   568,   569,    -1,
+     571,   572,   573,    -1,   575,   576,   577,   578,    -1,    -1,
+      -1,    -1,    -1,   584,   585,    -1,   587,   588,   589,   590,
+     591,    -1,   593,   594,   595,   596,   597,   598,    -1,   600,
+     601,    -1,    -1,   604,    -1,    -1,   607,    -1,   609,    -1,
+     611,   612,    -1,    -1,   615,   616,   617,   618,   619,   620,
+      -1,    -1,   623,   624,    -1,   626,   627,    -1,   629,   630,
+     631,   632,    -1,    -1,    -1,    -1,    -1,    -1,   639,   640,
+     641,    -1,   643,   644,   645,   646,    -1,    -1,   649,    -1,
+      -1,   652,   653,   654,   655,   656,    -1,   658,    -1,    -1,
+      -1,    -1,    -1,   664,   665,    -1,   667,   668,   669,   670,
+     671,   672,   673,    -1,   675,   676,   677,   678,   679,   680,
+      -1,   682,   683,   684,   685,   686,   687,   688,    -1,   690,
+     691,   692,   693,   694,   695,   696,    -1,    -1,    -1,   700,
+     701,   702,   703,   704,   705,   706,   707,    -1,   709,   710,
+     711,   712,   713,   714,   715,   716,   717,   718,    -1,   720,
+     721,   722,   723,   724,   725,   726,   727,   728,   729,   730,
+     731,   732,   733,   734,   735,   736,   737,   738,   739,   740,
+     741,   742,   743,    -1,   745,   746,   747,   748,   749,   750,
+     751,    -1,   753,   754,   755,   756,   757,   758,   759,   760,
+     761,   762,   763,   764,   765,   766,   767,   768,   769,   770,
+     771,   772,   773,   774,   775,   776,   777,   778,   779,   780,
+     781,   782,   783,   784,   785,   786,   787,   788,   789,   790,
+     791,   792,   793,    -1,    -1,    -1,    -1,    -1,   799,   800,
+      -1,    -1,    -1,    -1,   805,    -1,   807,    -1,    -1,    -1,
+     811,    -1,    -1,    -1,   815,   816,     5,     6,    -1,     8,
        9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
       -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
+      29,    30,    -1,    32,    -1,    -1,    35,    36,    37,    38,
+      39,    40,    41,    -1,    43,    44,    45,    -1,    47,    -1,
+      49,    50,    -1,    -1,    53,    54,    55,    56,    57,    -1,
+      59,    60,    61,    62,    63,    -1,    65,    66,    67,    68,
       69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
       79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,   125,   126,   127,    -1,
+      -1,    90,    91,    92,    93,    94,    -1,    96,    97,    98,
+      -1,    -1,    -1,   102,   103,   104,    -1,   106,   107,   108,
+      -1,   110,   111,   112,   113,   114,   115,    -1,    -1,    -1,
+      -1,   120,   121,   122,    -1,    -1,   125,   126,   127,    -1,
      129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
      139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
       -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
      159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-      -1,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
-     279,   280,    -1,    -1,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,    -1,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,    -1,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,    -1,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,    -1,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    13,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,   125,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,    -1,   168,
-     169,    -1,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,    -1,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,   274,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,    -1,   421,   422,   423,    -1,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,    -1,
-     449,    -1,   451,   452,   453,    -1,    -1,    -1,   457,   458,
-     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,    -1,    -1,   508,
-     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,    -1,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,   571,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,    -1,    -1,
-     709,   710,   711,    -1,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    13,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,   125,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,    -1,   168,
-     169,    -1,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,    -1,   184,   185,   186,   187,    -1,
-      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
+     169,   170,   171,    -1,   173,   174,   175,   176,   177,   178,
+     179,   180,   181,    -1,   183,   184,   185,   186,   187,   188,
+      -1,   190,   191,    -1,    -1,    -1,   195,   196,   197,   198,
       -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
+     209,    -1,   211,    -1,   213,    -1,   215,   216,    -1,   218,
+     219,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
+     229,   230,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
+      -1,    -1,   241,   242,   243,   244,   245,    -1,    -1,   248,
       -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
       -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,   274,    -1,    -1,    -1,    -1,
+     269,    -1,   271,   272,   273,    -1,    -1,    -1,    -1,    -1,
      279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
+      -1,   290,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
      299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
+     309,   310,   311,   312,   313,    -1,   315,   316,   317,   318,
+     319,   320,   321,   322,   323,   324,   325,    -1,    -1,    -1,
       -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
+     339,   340,   341,    -1,   343,   344,   345,   346,   347,   348,
+     349,   350,   351,   352,   353,    -1,   355,   356,   357,    -1,
+      -1,   360,   361,   362,   363,   364,   365,   366,   367,   368,
+     369,    -1,   371,   372,   373,    -1,   375,   376,    -1,   378,
      379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
+      -1,    -1,    -1,    -1,   393,   394,   395,   396,   397,    -1,
      399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,    -1,   421,   422,   423,    -1,    -1,   426,   427,   428,
+     409,   410,   411,   412,    -1,   414,   415,   416,    -1,   418,
+      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
       -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,    -1,
-     449,    -1,   451,   452,   453,    -1,    -1,    -1,   457,   458,
+     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
+     449,    -1,   451,   452,   453,   454,   455,   456,   457,   458,
      459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
+      -1,   470,   471,   472,    -1,   474,    -1,   476,   477,   478,
+     479,   480,    -1,   482,   483,   484,   485,   486,   487,   488,
       -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,    -1,    -1,   508,
+      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
      509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
       -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
       -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,    -1,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
+     539,   540,   541,   542,   543,   544,   545,   546,    -1,    -1,
+     549,   550,   551,   552,   553,   554,   555,   556,   557,   558,
+     559,   560,   561,   562,   563,    -1,    -1,   566,   567,   568,
      569,    -1,   571,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
+      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,   587,   588,
+     589,   590,   591,    -1,   593,   594,   595,   596,   597,   598,
       -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
+     609,    -1,   611,   612,    -1,    -1,   615,   616,   617,   618,
+     619,   620,    -1,    -1,   623,   624,    -1,   626,   627,    -1,
      629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
      639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
      649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,    -1,    -1,
-     709,   710,   711,    -1,   713,   714,   715,   716,   717,   718,
+      -1,    -1,    -1,    -1,    -1,   664,   665,    -1,   667,   668,
+     669,   670,   671,   672,   673,    -1,   675,   676,   677,   678,
+     679,   680,    -1,   682,   683,   684,   685,   686,   687,   688,
+      -1,   690,   691,   692,   693,   694,   695,   696,    -1,    -1,
+      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
+     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
       -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
      729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
      739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
      749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
      759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
      769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    13,    -1,    15,    -1,    -1,    -1,
+     779,   780,   781,   782,   783,   784,   785,   786,   787,   788,
+     789,   790,   791,   792,   793,    -1,    -1,    -1,    -1,    -1,
+     799,   800,    -1,    -1,    -1,    -1,   805,    -1,   807,    -1,
+      -1,    -1,   811,    -1,    -1,    -1,   815,   816,     5,     6,
+      -1,     8,     9,    10,    11,    12,    -1,    -1,    15,    -1,
+      -1,    -1,    -1,    20,    -1,    -1,    23,    -1,    25,    26,
+      27,    28,    29,    30,    -1,    32,    -1,    -1,    35,    36,
+      37,    38,    39,    40,    41,    -1,    43,    44,    45,    -1,
+      47,    -1,    49,    50,    -1,    -1,    53,    54,    55,    56,
+      57,    -1,    59,    60,    61,    62,    63,    -1,    65,    66,
+      67,    68,    69,    70,    -1,    72,    73,    -1,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    -1,
+      87,    88,    -1,    90,    91,    92,    93,    94,    -1,    96,
+      97,    98,    -1,    -1,    -1,   102,   103,   104,    -1,   106,
+     107,   108,    -1,   110,   111,   112,   113,   114,   115,    -1,
+      -1,    -1,    -1,   120,   121,   122,    -1,    -1,   125,   126,
+     127,    -1,   129,    -1,    -1,    -1,    -1,    -1,   135,   136,
+     137,   138,   139,    -1,    -1,    -1,   143,    -1,    -1,   146,
+     147,   148,    -1,    -1,    -1,   152,    -1,   154,   155,    -1,
+     157,   158,   159,    -1,    -1,   162,   163,    -1,   165,   166,
+     167,   168,   169,   170,   171,    -1,   173,   174,   175,   176,
+     177,   178,   179,   180,   181,    -1,   183,   184,   185,   186,
+     187,   188,    -1,   190,   191,    -1,    -1,    -1,   195,   196,
+     197,   198,    -1,    -1,    -1,   202,    -1,   204,   205,   206,
+     207,    -1,   209,    -1,   211,    -1,   213,    -1,   215,   216,
+      -1,   218,   219,    -1,   221,   222,    -1,    -1,    -1,   226,
+     227,   228,   229,   230,    -1,   232,   233,   234,    -1,    -1,
+     237,    -1,    -1,    -1,   241,   242,   243,   244,   245,    -1,
+      -1,   248,    -1,    -1,    -1,   252,   253,    -1,   255,   256,
+      -1,    -1,    -1,   260,    -1,   262,    -1,    -1,   265,   266,
+      -1,    -1,   269,    -1,   271,   272,   273,    -1,    -1,    -1,
+      -1,    -1,   279,   280,    -1,   282,    -1,   284,    -1,   286,
+     287,    -1,    -1,   290,    -1,    -1,    -1,    -1,   295,    -1,
+     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,   313,    -1,   315,   316,
+     317,   318,   319,   320,   321,   322,   323,   324,   325,    -1,
+      -1,    -1,    -1,   330,   331,   332,   333,   334,   335,    -1,
+      -1,   338,   339,   340,   341,    -1,   343,   344,   345,   346,
+     347,   348,   349,   350,   351,   352,   353,    -1,   355,   356,
+     357,    -1,    -1,   360,   361,   362,   363,   364,   365,   366,
+     367,   368,   369,    -1,   371,   372,   373,    -1,   375,   376,
+      -1,   378,   379,   380,    -1,    -1,   383,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   393,   394,   395,   396,
+     397,    -1,   399,    -1,   401,   402,   403,   404,   405,   406,
+     407,   408,   409,   410,   411,   412,    -1,   414,   415,   416,
+      -1,   418,    -1,   420,   421,   422,   423,   424,    -1,   426,
+     427,   428,    -1,    -1,   431,    -1,    -1,    -1,   435,   436,
+      -1,   438,   439,    -1,    -1,   442,   443,   444,   445,   446,
+      -1,   448,   449,    -1,   451,   452,   453,   454,   455,   456,
+     457,   458,   459,   460,   461,   462,   463,    -1,   465,    -1,
+     467,   468,    -1,   470,   471,   472,    -1,   474,    -1,   476,
+     477,   478,   479,   480,    -1,   482,   483,   484,   485,   486,
+     487,   488,    -1,   490,   491,    -1,    -1,    -1,   495,   496,
+     497,   498,    -1,    -1,    -1,   502,    -1,    -1,    -1,   506,
+      -1,   508,   509,   510,   511,    -1,   513,   514,   515,   516,
+     517,    -1,    -1,    -1,    -1,    -1,   523,   524,   525,    -1,
+     527,    -1,    -1,   530,    -1,    -1,   533,    -1,   535,    -1,
+     537,   538,   539,   540,   541,   542,   543,   544,   545,   546,
+      -1,    -1,   549,   550,   551,   552,   553,   554,   555,   556,
+     557,   558,   559,   560,   561,   562,   563,    -1,    -1,   566,
+     567,   568,   569,    -1,   571,   572,   573,    -1,   575,   576,
+     577,   578,    -1,    -1,    -1,    -1,    -1,   584,   585,    -1,
+     587,   588,   589,   590,   591,    -1,   593,   594,   595,   596,
+     597,   598,    -1,   600,   601,    -1,    -1,   604,    -1,    -1,
+     607,    -1,   609,    -1,   611,   612,    -1,    -1,   615,   616,
+     617,   618,   619,   620,    -1,    -1,   623,   624,    -1,   626,
+     627,    -1,   629,   630,   631,   632,    -1,    -1,    -1,    -1,
+      -1,    -1,   639,   640,   641,    -1,   643,   644,   645,   646,
+      -1,    -1,   649,    -1,    -1,   652,   653,   654,   655,   656,
+      -1,   658,    -1,    -1,    -1,    -1,    -1,   664,   665,    -1,
+     667,   668,   669,   670,   671,   672,   673,    -1,   675,   676,
+     677,   678,   679,   680,    -1,   682,   683,   684,   685,   686,
+     687,   688,    -1,   690,   691,   692,   693,   694,   695,   696,
+      -1,    -1,    -1,   700,   701,   702,   703,   704,   705,   706,
+     707,    -1,   709,   710,   711,   712,   713,   714,   715,   716,
+     717,   718,    -1,   720,   721,   722,   723,   724,   725,   726,
+     727,   728,   729,   730,   731,   732,   733,   734,   735,   736,
+     737,   738,   739,   740,   741,   742,   743,    -1,   745,   746,
+     747,   748,   749,   750,   751,    -1,   753,   754,   755,   756,
+     757,   758,   759,   760,   761,   762,   763,   764,   765,   766,
+     767,   768,   769,   770,   771,   772,   773,   774,   775,   776,
+     777,   778,   779,   780,   781,   782,   783,   784,   785,   786,
+     787,   788,   789,   790,   791,   792,   793,    -1,    -1,    -1,
+      -1,    -1,   799,   800,    -1,    -1,    -1,    -1,   805,    -1,
+     807,    -1,    -1,    -1,   811,    -1,    -1,    -1,   815,   816,
+       5,     6,    -1,     8,     9,    10,    11,    12,    -1,    -1,
+      15,    -1,    -1,    -1,    -1,    20,    -1,    -1,    23,    -1,
+      25,    26,    27,    28,    29,    30,    -1,    32,    -1,    -1,
+      35,    36,    37,    38,    39,    40,    41,    -1,    43,    44,
+      45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,    54,
+      55,    56,    57,    -1,    59,    60,    61,    62,    63,    -1,
+      65,    66,    67,    68,    69,    70,    -1,    72,    73,    -1,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    -1,    87,    88,    -1,    90,    91,    92,    93,    94,
+      -1,    96,    97,    98,    -1,    -1,    -1,   102,   103,   104,
+      -1,   106,   107,   108,    -1,   110,   111,   112,   113,   114,
+     115,    -1,    -1,    -1,    -1,   120,   121,   122,    -1,    -1,
+     125,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,    -1,
+     135,   136,   137,   138,   139,    -1,    -1,    -1,   143,    -1,
+      -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,   154,
+     155,    -1,   157,   158,   159,    -1,    -1,   162,   163,    -1,
+     165,   166,   167,   168,   169,   170,   171,    -1,   173,   174,
+     175,   176,   177,   178,   179,   180,   181,    -1,   183,   184,
+     185,   186,   187,   188,    -1,   190,   191,    -1,    -1,    -1,
+     195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,   204,
+     205,   206,   207,    -1,   209,    -1,   211,    -1,   213,    -1,
+     215,   216,    -1,   218,   219,    -1,   221,   222,    -1,    -1,
+      -1,   226,   227,   228,   229,   230,    -1,   232,   233,   234,
+      -1,    -1,   237,    -1,    -1,    -1,   241,   242,   243,   244,
+     245,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,    -1,
+     255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,    -1,
+     265,   266,    -1,    -1,   269,    -1,   271,   272,   273,    -1,
+      -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,   284,
+      -1,   286,   287,    -1,    -1,   290,    -1,    -1,    -1,    -1,
+     295,    -1,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,    -1,
+     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
+     325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,   334,
+     335,    -1,    -1,   338,   339,   340,   341,    -1,   343,   344,
+     345,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
+     355,   356,   357,    -1,    -1,   360,   361,   362,   363,   364,
+     365,   366,   367,   368,   369,    -1,   371,   372,   373,    -1,
+     375,   376,    -1,   378,   379,   380,    -1,    -1,   383,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,   394,
+     395,   396,   397,    -1,   399,    -1,   401,   402,   403,   404,
+     405,   406,   407,   408,   409,   410,   411,   412,    -1,   414,
+     415,   416,    -1,   418,    -1,   420,   421,   422,   423,   424,
+      -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,    -1,
+     435,   436,    -1,   438,   439,    -1,    -1,   442,   443,   444,
+     445,   446,    -1,   448,   449,    -1,   451,   452,   453,   454,
+     455,   456,   457,   458,   459,   460,   461,   462,   463,    -1,
+     465,    -1,   467,   468,    -1,   470,   471,   472,    -1,   474,
+      -1,   476,   477,   478,   479,   480,    -1,   482,   483,   484,
+     485,   486,   487,   488,    -1,   490,   491,    -1,    -1,    -1,
+     495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,    -1,
+      -1,   506,    -1,   508,   509,   510,   511,    -1,   513,   514,
+     515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,   524,
+     525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,    -1,
+     535,    -1,   537,   538,   539,   540,   541,   542,   543,   544,
+     545,   546,    -1,    -1,   549,   550,   551,   552,   553,   554,
+     555,   556,   557,   558,   559,   560,   561,   562,   563,    -1,
+      -1,   566,   567,   568,   569,    -1,   571,   572,   573,    -1,
+     575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,   584,
+     585,    -1,   587,   588,   589,   590,   591,    -1,   593,   594,
+     595,   596,   597,   598,    -1,   600,   601,    -1,    -1,   604,
+      -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,    -1,
+     615,   616,   617,   618,   619,   620,    -1,    -1,   623,   624,
+      -1,   626,   627,    -1,   629,   630,   631,   632,    -1,    -1,
+      -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,   644,
+     645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,   654,
+     655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,   664,
+     665,    -1,   667,   668,   669,   670,   671,   672,   673,    -1,
+     675,   676,   677,   678,   679,   680,    -1,   682,   683,   684,
+     685,   686,   687,   688,    -1,   690,   691,   692,   693,   694,
+     695,   696,    -1,    -1,    -1,   700,   701,   702,   703,   704,
+     705,   706,   707,    -1,   709,   710,   711,   712,   713,   714,
+     715,   716,   717,   718,    -1,   720,   721,   722,   723,   724,
+     725,   726,   727,   728,   729,   730,   731,   732,   733,   734,
+     735,   736,   737,   738,   739,   740,   741,   742,   743,    -1,
+     745,   746,   747,   748,   749,   750,   751,    -1,   753,   754,
+     755,   756,   757,   758,   759,   760,   761,   762,   763,   764,
+     765,   766,   767,   768,   769,   770,   771,   772,   773,   774,
+     775,   776,   777,   778,   779,   780,   781,   782,   783,   784,
+     785,   786,   787,   788,   789,   790,   791,   792,   793,    -1,
+      -1,    -1,    -1,    -1,   799,   800,    -1,    -1,    -1,    -1,
+     805,    -1,   807,    -1,    -1,    -1,   811,    -1,    -1,    -1,
+     815,   816,     5,     6,    -1,     8,     9,    10,    11,    12,
+      -1,    -1,    15,    -1,    -1,    -1,    -1,    20,    -1,    -1,
+      23,    -1,    25,    26,    27,    28,    29,    30,    -1,    32,
+      -1,    -1,    35,    36,    37,    38,    39,    40,    41,    -1,
+      43,    44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,
+      53,    54,    55,    56,    57,    -1,    59,    60,    61,    62,
+      63,    -1,    65,    66,    67,    68,    69,    70,    -1,    72,
+      73,    -1,    75,    76,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    -1,    87,    88,    -1,    90,    91,    92,
+      93,    94,    -1,    96,    97,    98,    -1,    -1,    -1,   102,
+     103,   104,    -1,   106,   107,   108,    -1,   110,   111,   112,
+     113,   114,   115,    -1,    -1,    -1,    -1,   120,   121,   122,
+      -1,    -1,   125,   126,   127,    -1,   129,    -1,    -1,    -1,
+      -1,    -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,
+     143,    -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,
+      -1,   154,   155,    -1,   157,   158,   159,    -1,    -1,   162,
+     163,    -1,   165,   166,   167,   168,   169,   170,   171,    -1,
+     173,   174,   175,   176,   177,   178,   179,   180,   181,    -1,
+     183,   184,   185,   186,   187,   188,    -1,   190,   191,    -1,
+      -1,    -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,
+      -1,   204,   205,   206,   207,    -1,   209,    -1,   211,    -1,
+     213,    -1,   215,   216,    -1,   218,   219,    -1,   221,   222,
+      -1,    -1,    -1,   226,   227,   228,   229,   230,    -1,   232,
+     233,   234,    -1,    -1,   237,    -1,    -1,    -1,   241,   242,
+     243,   244,   245,    -1,    -1,   248,    -1,    -1,    -1,   252,
+     253,    -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,
+      -1,    -1,   265,   266,    -1,    -1,   269,    -1,   271,   272,
+     273,    -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,
+      -1,   284,    -1,   286,   287,    -1,    -1,   290,    -1,    -1,
+      -1,    -1,   295,    -1,   297,   298,   299,   300,   301,   302,
+     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
+     313,    -1,   315,   316,   317,   318,   319,   320,   321,   322,
+     323,   324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,
+     333,   334,   335,    -1,    -1,   338,   339,   340,   341,    -1,
+     343,   344,   345,   346,   347,   348,   349,   350,   351,   352,
+     353,    -1,   355,   356,   357,    -1,    -1,   360,   361,   362,
+     363,   364,   365,   366,   367,   368,   369,    -1,   371,   372,
+     373,    -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,
+     383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     393,   394,   395,   396,   397,    -1,   399,    -1,   401,   402,
+     403,   404,   405,   406,   407,   408,   409,   410,   411,   412,
+      -1,   414,   415,   416,    -1,   418,    -1,   420,   421,   422,
+     423,   424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,
+      -1,    -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,
+     443,   444,   445,   446,    -1,   448,   449,    -1,   451,   452,
+     453,   454,   455,   456,   457,   458,   459,   460,   461,   462,
+     463,    -1,   465,    -1,   467,   468,    -1,   470,   471,   472,
+      -1,   474,    -1,   476,   477,   478,   479,   480,    -1,   482,
+     483,   484,   485,   486,   487,   488,    -1,   490,   491,    -1,
+      -1,    -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,
+      -1,    -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,
+     513,   514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,
+     523,   524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,
+     533,    -1,   535,    -1,   537,   538,   539,   540,   541,   542,
+     543,   544,   545,   546,    -1,    -1,   549,   550,   551,   552,
+     553,   554,   555,   556,   557,   558,   559,   560,   561,   562,
+     563,    -1,    -1,   566,   567,   568,   569,    -1,   571,   572,
+     573,    -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,
+      -1,   584,   585,    -1,   587,   588,   589,   590,   591,    -1,
+     593,   594,   595,   596,   597,   598,    -1,   600,   601,    -1,
+      -1,   604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,
+      -1,    -1,   615,   616,   617,   618,   619,   620,    -1,    -1,
+     623,   624,    -1,   626,   627,    -1,   629,   630,   631,   632,
+      -1,    -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,
+     643,   644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,
+     653,   654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,
+      -1,   664,   665,    -1,   667,   668,   669,   670,   671,   672,
+     673,    -1,   675,   676,   677,   678,   679,   680,    -1,   682,
+     683,   684,   685,   686,   687,   688,    -1,   690,   691,   692,
+     693,   694,   695,   696,    -1,    -1,    -1,   700,   701,   702,
+     703,   704,   705,   706,   707,    -1,   709,   710,   711,   712,
+     713,   714,   715,   716,   717,   718,    -1,   720,   721,   722,
+     723,   724,   725,   726,   727,   728,   729,   730,   731,   732,
+     733,   734,   735,   736,   737,   738,   739,   740,   741,   742,
+     743,    -1,   745,   746,   747,   748,   749,   750,   751,    -1,
+     753,   754,   755,   756,   757,   758,   759,   760,   761,   762,
+     763,   764,   765,   766,   767,   768,   769,   770,   771,   772,
+     773,   774,   775,   776,   777,   778,   779,   780,   781,   782,
+     783,   784,   785,   786,   787,   788,   789,   790,   791,   792,
+     793,    -1,    -1,    -1,    -1,    -1,   799,   800,    -1,    -1,
+      -1,    -1,   805,    -1,   807,    -1,    -1,    -1,   811,    -1,
+      -1,    -1,   815,   816,     5,     6,    -1,     8,     9,    10,
+      11,    12,    13,    -1,    15,    -1,    -1,    -1,    -1,    20,
+      -1,    -1,    23,    -1,    25,    26,    27,    28,    29,    30,
+      -1,    32,    -1,    -1,    35,    36,    37,    38,    39,    40,
+      41,    -1,    43,    44,    45,    -1,    47,    -1,    49,    50,
+      -1,    -1,    53,    54,    55,    56,    57,    -1,    59,    60,
+      61,    62,    63,    -1,    65,    66,    67,    68,    69,    70,
+      -1,    72,    73,    -1,    75,    76,    77,    78,    79,    80,
+      81,    82,    83,    84,    85,    -1,    87,    88,    -1,    90,
+      91,    92,    93,    94,    -1,    96,    97,    98,    -1,    -1,
+      -1,   102,   103,   104,    -1,   106,   107,   108,    -1,   110,
+     111,   112,   113,   114,   115,    -1,    -1,    -1,    -1,   120,
+     121,   122,    -1,    -1,   125,   126,   127,    -1,   129,    -1,
+      -1,    -1,    -1,    -1,   135,   136,   137,   138,   139,    -1,
+      -1,    -1,   143,    -1,    -1,   146,   147,   148,    -1,    -1,
+      -1,   152,    -1,   154,   155,    -1,   157,   158,   159,    -1,
+      -1,   162,   163,    -1,   165,   166,   167,   168,   169,   170,
+     171,    -1,   173,   174,   175,   176,   177,   178,   179,   180,
+     181,    -1,   183,   184,   185,   186,   187,   188,    -1,   190,
+     191,    -1,    -1,    -1,   195,   196,    -1,   198,    -1,    -1,
+      -1,   202,    -1,   204,   205,   206,   207,    -1,   209,    -1,
+     211,    -1,   213,    -1,   215,   216,    -1,   218,   219,    -1,
+     221,   222,    -1,    -1,    -1,   226,   227,   228,   229,   230,
+      -1,   232,   233,   234,    -1,    -1,   237,    -1,    -1,    -1,
+     241,   242,   243,   244,   245,    -1,    -1,   248,    -1,    -1,
+      -1,   252,   253,    -1,   255,   256,    -1,    -1,    -1,   260,
+      -1,   262,    -1,    -1,   265,   266,    -1,    -1,   269,    -1,
+     271,   272,   273,    -1,    -1,    -1,    -1,    -1,   279,   280,
+      -1,   282,    -1,   284,    -1,   286,   287,    -1,    -1,   290,
+      -1,    -1,    -1,    -1,   295,    -1,   297,   298,   299,   300,
+     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
+     311,   312,   313,    -1,   315,   316,   317,   318,   319,   320,
+     321,   322,   323,   324,   325,    -1,    -1,    -1,    -1,   330,
+     331,   332,   333,   334,   335,    -1,    -1,   338,   339,   340,
+     341,    -1,   343,   344,   345,   346,   347,   348,   349,   350,
+     351,   352,   353,    -1,   355,   356,   357,    -1,    -1,   360,
+     361,   362,   363,   364,   365,    -1,   367,   368,   369,    -1,
+     371,   372,   373,    -1,   375,   376,    -1,   378,   379,   380,
+      -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   393,   394,   395,   396,   397,    -1,   399,    -1,
+     401,   402,   403,   404,   405,   406,   407,   408,   409,   410,
+     411,   412,    -1,   414,   415,   416,    -1,   418,    -1,   420,
+     421,   422,   423,   424,    -1,   426,   427,   428,    -1,    -1,
+     431,    -1,    -1,    -1,   435,   436,    -1,   438,   439,    -1,
+      -1,   442,   443,   444,   445,   446,    -1,   448,   449,    -1,
+     451,   452,   453,   454,   455,   456,   457,   458,   459,   460,
+     461,   462,   463,    -1,   465,    -1,   467,   468,    -1,   470,
+     471,   472,    -1,   474,    -1,   476,   477,   478,   479,   480,
+      -1,   482,   483,   484,   485,   486,   487,   488,    -1,   490,
+     491,    -1,    -1,    -1,   495,   496,   497,   498,    -1,    -1,
+      -1,   502,    -1,    -1,    -1,   506,    -1,   508,   509,   510,
+     511,    -1,   513,   514,   515,   516,   517,    -1,    -1,    -1,
+      -1,    -1,   523,   524,   525,    -1,   527,    -1,    -1,   530,
+      -1,    -1,   533,    -1,   535,    -1,   537,   538,   539,   540,
+     541,   542,   543,   544,   545,   546,    -1,    -1,   549,   550,
+     551,   552,   553,   554,   555,   556,   557,   558,   559,   560,
+     561,   562,   563,    -1,    -1,   566,   567,   568,   569,    -1,
+     571,   572,   573,    -1,   575,   576,   577,   578,    -1,    -1,
+      -1,    -1,    -1,   584,   585,    -1,   587,   588,   589,   590,
+     591,    -1,   593,   594,   595,   596,   597,   598,    -1,   600,
+     601,    -1,    -1,   604,    -1,    -1,   607,    -1,   609,    -1,
+     611,   612,    -1,    -1,   615,   616,   617,   618,   619,   620,
+      -1,    -1,   623,   624,    -1,   626,   627,    -1,   629,   630,
+     631,   632,    -1,    -1,    -1,    -1,    -1,    -1,   639,   640,
+     641,    -1,   643,   644,   645,   646,    -1,    -1,   649,    -1,
+      -1,   652,   653,   654,   655,   656,    -1,   658,    -1,    -1,
+      -1,    -1,    -1,   664,   665,    -1,   667,   668,   669,   670,
+     671,   672,   673,    -1,   675,   676,   677,   678,   679,   680,
+      -1,   682,   683,   684,   685,   686,   687,   688,    -1,   690,
+     691,   692,   693,   694,   695,   696,    -1,    -1,    -1,   700,
+     701,   702,   703,   704,   705,   706,   707,    -1,   709,   710,
+     711,   712,   713,   714,   715,   716,   717,   718,    -1,   720,
+     721,   722,   723,   724,   725,   726,   727,   728,   729,   730,
+     731,   732,   733,   734,   735,   736,   737,   738,   739,   740,
+     741,   742,   743,    -1,   745,   746,   747,   748,   749,   750,
+     751,    -1,   753,   754,   755,   756,   757,   758,   759,   760,
+     761,   762,   763,   764,   765,   766,   767,   768,   769,   770,
+     771,   772,   773,   774,   775,   776,   777,   778,   779,   780,
+     781,   782,   783,   784,   785,   786,   787,   788,   789,   790,
+     791,   792,   793,    -1,    -1,    -1,    -1,    -1,   799,   800,
+      -1,    -1,    -1,    -1,   805,    -1,   807,    -1,    -1,    -1,
+     811,    -1,    -1,    -1,   815,   816,     5,     6,    -1,     8,
+       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
       -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
+      29,    30,    -1,    32,    -1,    -1,    35,    36,    37,    38,
+      39,    40,    41,    -1,    43,    44,    45,    -1,    47,    -1,
+      49,    50,    -1,    -1,    53,    54,    55,    56,    57,    -1,
+      59,    60,    61,    62,    63,    -1,    65,    66,    67,    68,
       69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
       79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,
+      -1,    90,    91,    92,    93,    94,    -1,    96,    97,    98,
+      -1,    -1,    -1,   102,   103,   104,    -1,   106,   107,   108,
+      -1,   110,   111,   112,   113,   114,   115,    -1,    -1,    -1,
+      -1,   120,   121,   122,    -1,    -1,   125,   126,   127,    -1,
      129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
      139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
       -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,    -1,   168,
-     169,    -1,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,    -1,   184,   185,   186,   187,    -1,
+     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
+     169,   170,   171,    -1,   173,   174,   175,   176,   177,   178,
+     179,   180,   181,    -1,   183,   184,   185,   186,   187,   188,
       -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
       -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
+     209,    -1,   211,    -1,   213,    -1,   215,   216,    -1,   218,
+     219,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
+     229,   230,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
+      -1,    -1,   241,   242,   243,   244,   245,    -1,    -1,   248,
       -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
       -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,   274,    -1,    -1,    -1,    -1,
+     269,    -1,   271,   272,   273,    -1,    -1,    -1,    -1,    -1,
      279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
+      -1,   290,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
      299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
+     309,   310,   311,   312,   313,    -1,   315,   316,   317,   318,
+     319,   320,   321,   322,   323,   324,   325,    -1,    -1,    -1,
       -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
+     339,   340,   341,    -1,   343,   344,   345,   346,   347,   348,
+     349,   350,   351,   352,   353,    -1,   355,   356,   357,    -1,
+      -1,   360,   361,   362,   363,   364,   365,   366,   367,   368,
+     369,    -1,   371,   372,   373,    -1,   375,   376,    -1,   378,
      379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
+      -1,    -1,    -1,    -1,   393,   394,   395,   396,   397,    -1,
      399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,    -1,   421,   422,   423,    -1,    -1,   426,   427,   428,
+     409,   410,   411,   412,    -1,   414,   415,   416,    -1,   418,
+      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
       -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,    -1,
-     449,    -1,   451,   452,   453,    -1,    -1,    -1,   457,   458,
+     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
+     449,    -1,   451,   452,   453,   454,   455,   456,   457,   458,
      459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
+      -1,   470,   471,   472,    -1,   474,    -1,   476,   477,   478,
+     479,   480,    -1,   482,   483,   484,   485,   486,   487,   488,
       -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,    -1,    -1,   508,
+      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
      509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
       -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
       -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,    -1,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
+     539,   540,   541,   542,   543,   544,   545,   546,    -1,    -1,
+     549,   550,   551,   552,   553,   554,   555,   556,   557,   558,
+     559,   560,   561,   562,   563,    -1,    -1,   566,   567,   568,
      569,    -1,   571,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
+      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,   587,   588,
+     589,   590,   591,    -1,   593,   594,   595,   596,   597,   598,
       -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
+     609,    -1,   611,   612,    -1,    -1,   615,   616,   617,   618,
+     619,   620,    -1,    -1,   623,   624,    -1,   626,   627,    -1,
      629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
      639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
      649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,    -1,    -1,
-     709,   710,   711,    -1,   713,   714,   715,   716,   717,   718,
+      -1,    -1,    -1,    -1,    -1,   664,   665,    -1,   667,   668,
+     669,   670,   671,   672,   673,    -1,   675,   676,   677,   678,
+     679,   680,    -1,   682,   683,   684,   685,   686,   687,   688,
+      -1,   690,   691,   692,   693,   694,   695,   696,    -1,    -1,
+      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
+     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
       -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
      729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
      739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
      749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
      759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
      769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    13,    -1,    15,    -1,    -1,    -1,
+     779,   780,   781,   782,   783,   784,   785,   786,   787,   788,
+     789,   790,   791,   792,   793,    -1,    -1,    -1,    -1,    -1,
+     799,   800,    -1,    -1,    -1,    -1,   805,    -1,   807,    -1,
+      -1,    -1,   811,    -1,    -1,    -1,   815,   816,     5,     6,
+      -1,     8,     9,    10,    11,    12,    -1,    -1,    15,    -1,
+      -1,    -1,    -1,    20,    -1,    -1,    23,    -1,    25,    26,
+      27,    28,    29,    30,    -1,    32,    -1,    -1,    35,    36,
+      37,    38,    39,    40,    41,    -1,    43,    44,    45,    -1,
+      47,    -1,    49,    50,    -1,    -1,    53,    54,    55,    56,
+      57,    -1,    59,    60,    61,    62,    63,    -1,    65,    66,
+      67,    68,    69,    70,    -1,    72,    73,    -1,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    -1,
+      87,    88,    -1,    90,    91,    92,    93,    94,    -1,    96,
+      97,    98,    -1,    -1,    -1,   102,   103,   104,    -1,   106,
+     107,   108,    -1,   110,   111,   112,   113,   114,   115,    -1,
+      -1,    -1,    -1,   120,   121,   122,    -1,    -1,   125,   126,
+     127,    -1,   129,    -1,    -1,    -1,    -1,    -1,   135,   136,
+     137,   138,   139,    -1,    -1,    -1,   143,    -1,    -1,   146,
+     147,   148,    -1,    -1,    -1,   152,    -1,   154,   155,    -1,
+     157,   158,   159,    -1,    -1,   162,   163,    -1,   165,   166,
+     167,   168,   169,   170,   171,    -1,   173,   174,   175,   176,
+     177,   178,   179,   180,   181,    -1,   183,   184,   185,   186,
+     187,   188,    -1,   190,   191,    -1,    -1,    -1,   195,   196,
+      -1,   198,    -1,    -1,    -1,   202,    -1,   204,   205,   206,
+     207,    -1,   209,    -1,   211,    -1,   213,    -1,   215,   216,
+      -1,   218,   219,    -1,   221,   222,    -1,    -1,    -1,   226,
+     227,   228,   229,   230,    -1,   232,   233,   234,    -1,    -1,
+     237,    -1,    -1,    -1,   241,   242,   243,   244,   245,    -1,
+      -1,   248,    -1,    -1,    -1,   252,   253,    -1,   255,   256,
+      -1,    -1,    -1,   260,    -1,   262,    -1,    -1,   265,   266,
+      -1,    -1,   269,    -1,   271,   272,   273,    -1,    -1,    -1,
+      -1,    -1,   279,   280,    -1,   282,    -1,   284,    -1,   286,
+     287,    -1,    -1,   290,    -1,    -1,    -1,    -1,   295,    -1,
+     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,   313,    -1,   315,   316,
+     317,   318,   319,   320,   321,   322,   323,   324,   325,    -1,
+      -1,    -1,    -1,   330,   331,   332,   333,   334,   335,    -1,
+      -1,   338,   339,   340,   341,    -1,   343,   344,   345,   346,
+     347,   348,   349,   350,   351,   352,   353,    -1,   355,   356,
+     357,    -1,    -1,   360,   361,   362,   363,   364,   365,   366,
+     367,   368,   369,    -1,   371,   372,   373,    -1,   375,   376,
+      -1,   378,   379,   380,    -1,    -1,   383,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   393,   394,   395,   396,
+     397,    -1,   399,    -1,   401,   402,   403,   404,   405,   406,
+     407,   408,   409,   410,   411,   412,    -1,   414,   415,   416,
+      -1,   418,    -1,   420,   421,   422,   423,   424,    -1,   426,
+     427,   428,    -1,    -1,   431,    -1,    -1,    -1,   435,   436,
+      -1,   438,   439,    -1,    -1,   442,   443,   444,   445,   446,
+      -1,   448,   449,    -1,   451,   452,   453,   454,   455,   456,
+     457,   458,   459,   460,   461,   462,   463,    -1,   465,    -1,
+     467,   468,    -1,   470,   471,   472,    -1,   474,    -1,   476,
+     477,   478,   479,   480,    -1,   482,   483,   484,   485,   486,
+     487,   488,    -1,   490,   491,    -1,    -1,    -1,   495,   496,
+     497,   498,    -1,    -1,    -1,   502,    -1,    -1,    -1,   506,
+      -1,   508,   509,   510,   511,    -1,   513,   514,   515,   516,
+     517,    -1,    -1,    -1,    -1,    -1,   523,   524,   525,    -1,
+     527,    -1,    -1,   530,    -1,    -1,   533,    -1,   535,    -1,
+     537,   538,   539,   540,   541,   542,   543,   544,   545,   546,
+      -1,    -1,   549,   550,   551,   552,   553,   554,   555,   556,
+     557,   558,   559,   560,   561,   562,   563,    -1,    -1,   566,
+     567,   568,   569,    -1,   571,   572,   573,    -1,   575,   576,
+     577,   578,    -1,    -1,    -1,    -1,    -1,   584,   585,    -1,
+     587,   588,   589,   590,   591,    -1,   593,   594,   595,   596,
+     597,   598,    -1,   600,   601,    -1,    -1,   604,    -1,    -1,
+     607,    -1,   609,    -1,   611,   612,    -1,    -1,   615,   616,
+     617,   618,   619,   620,    -1,    -1,   623,   624,    -1,   626,
+     627,    -1,   629,   630,   631,   632,    -1,    -1,    -1,    -1,
+      -1,    -1,   639,   640,   641,    -1,   643,   644,   645,   646,
+      -1,    -1,   649,    -1,    -1,   652,   653,   654,   655,   656,
+      -1,   658,    -1,    -1,    -1,    -1,    -1,   664,   665,    -1,
+     667,   668,   669,   670,   671,   672,   673,    -1,   675,   676,
+     677,   678,   679,   680,    -1,   682,   683,   684,   685,   686,
+     687,   688,    -1,   690,   691,   692,   693,   694,   695,   696,
+      -1,    -1,    -1,   700,   701,   702,   703,   704,   705,   706,
+     707,    -1,   709,   710,   711,   712,   713,   714,   715,   716,
+     717,   718,    -1,   720,   721,   722,   723,   724,   725,   726,
+     727,   728,   729,   730,   731,   732,   733,   734,   735,   736,
+     737,   738,   739,   740,   741,   742,   743,    -1,   745,   746,
+     747,   748,   749,   750,   751,    -1,   753,   754,   755,   756,
+     757,   758,   759,   760,   761,   762,   763,   764,   765,   766,
+     767,   768,   769,   770,   771,   772,   773,   774,   775,   776,
+     777,   778,   779,   780,   781,   782,   783,   784,   785,   786,
+     787,   788,   789,   790,   791,   792,   793,    -1,    -1,    -1,
+      -1,    -1,   799,   800,    -1,    -1,    -1,    -1,   805,    -1,
+     807,    -1,    -1,    -1,   811,    -1,    -1,    -1,   815,   816,
+       5,     6,    -1,     8,     9,    10,    11,    12,    -1,    -1,
+      15,    -1,    -1,    -1,    -1,    20,    -1,    -1,    23,    -1,
+      25,    26,    27,    28,    29,    30,    -1,    32,    -1,    -1,
+      35,    36,    37,    38,    39,    40,    41,    -1,    43,    44,
+      45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,    54,
+      55,    56,    57,    -1,    59,    60,    61,    62,    63,    -1,
+      65,    66,    67,    68,    69,    70,    -1,    72,    73,    -1,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    -1,    87,    88,    -1,    90,    91,    92,    93,    94,
+      -1,    96,    97,    98,    -1,    -1,    -1,   102,   103,   104,
+      -1,   106,   107,   108,    -1,   110,   111,   112,   113,   114,
+     115,    -1,    -1,    -1,    -1,   120,   121,   122,    -1,    -1,
+     125,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,    -1,
+     135,   136,   137,   138,   139,    -1,    -1,    -1,   143,    -1,
+      -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,   154,
+     155,    -1,   157,   158,   159,    -1,    -1,   162,   163,    -1,
+     165,   166,   167,   168,   169,   170,   171,    -1,   173,   174,
+     175,   176,   177,   178,   179,   180,   181,    -1,   183,   184,
+     185,   186,   187,   188,    -1,   190,   191,    -1,    -1,    -1,
+     195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,   204,
+     205,   206,   207,    -1,   209,    -1,   211,    -1,   213,    -1,
+     215,   216,    -1,   218,   219,    -1,   221,   222,    -1,    -1,
+      -1,   226,   227,   228,   229,   230,    -1,   232,   233,   234,
+      -1,    -1,   237,    -1,    -1,    -1,   241,   242,   243,   244,
+     245,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,    -1,
+     255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,    -1,
+     265,   266,    -1,    -1,   269,    -1,   271,   272,   273,    -1,
+      -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,   284,
+      -1,   286,   287,    -1,    -1,   290,    -1,    -1,    -1,    -1,
+     295,    -1,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,    -1,
+     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
+     325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,   334,
+     335,    -1,    -1,   338,   339,   340,   341,    -1,   343,   344,
+     345,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
+     355,   356,   357,    -1,    -1,   360,   361,   362,   363,   364,
+     365,   366,   367,   368,   369,    -1,   371,   372,   373,    -1,
+     375,   376,    -1,   378,   379,   380,    -1,    -1,   383,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,   394,
+     395,   396,   397,    -1,   399,    -1,   401,   402,   403,   404,
+     405,   406,   407,   408,   409,   410,   411,   412,    -1,   414,
+     415,   416,    -1,   418,    -1,   420,   421,   422,   423,   424,
+      -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,    -1,
+     435,   436,    -1,   438,   439,    -1,    -1,   442,   443,   444,
+     445,   446,    -1,   448,   449,    -1,   451,   452,   453,   454,
+     455,   456,   457,   458,   459,   460,   461,   462,   463,    -1,
+     465,    -1,   467,   468,    -1,   470,   471,   472,    -1,   474,
+      -1,   476,   477,   478,   479,   480,    -1,   482,   483,   484,
+     485,   486,   487,   488,    -1,   490,   491,    -1,    -1,    -1,
+     495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,    -1,
+      -1,   506,    -1,   508,   509,   510,   511,    -1,   513,   514,
+     515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,   524,
+     525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,    -1,
+     535,    -1,   537,   538,   539,   540,   541,   542,   543,   544,
+     545,   546,    -1,    -1,   549,   550,   551,   552,   553,   554,
+     555,   556,   557,   558,   559,   560,   561,   562,   563,    -1,
+      -1,   566,   567,   568,   569,    -1,   571,   572,   573,    -1,
+     575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,   584,
+     585,    -1,   587,   588,   589,   590,   591,    -1,   593,   594,
+     595,   596,   597,   598,    -1,   600,   601,    -1,    -1,   604,
+      -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,    -1,
+     615,   616,   617,   618,   619,   620,    -1,    -1,   623,   624,
+      -1,   626,   627,    -1,   629,   630,   631,   632,    -1,    -1,
+      -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,   644,
+     645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,   654,
+     655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,   664,
+     665,    -1,   667,   668,   669,   670,   671,   672,   673,    -1,
+     675,   676,   677,   678,   679,   680,    -1,   682,   683,   684,
+     685,   686,   687,   688,    -1,   690,   691,   692,   693,   694,
+     695,   696,    -1,    -1,    -1,   700,   701,   702,   703,   704,
+     705,   706,   707,    -1,   709,   710,   711,   712,   713,   714,
+     715,   716,   717,   718,    -1,   720,   721,   722,   723,   724,
+     725,   726,   727,   728,   729,   730,   731,   732,   733,   734,
+     735,   736,   737,   738,   739,   740,   741,   742,   743,    -1,
+     745,   746,   747,   748,   749,   750,   751,    -1,   753,   754,
+     755,   756,   757,   758,   759,   760,   761,   762,   763,   764,
+     765,   766,   767,   768,   769,   770,   771,   772,   773,   774,
+     775,   776,   777,   778,   779,   780,   781,   782,   783,   784,
+     785,   786,   787,   788,   789,   790,   791,   792,   793,    -1,
+      -1,    -1,    -1,    -1,   799,   800,    -1,    -1,    -1,    -1,
+     805,    -1,   807,    -1,    -1,    -1,   811,    -1,    -1,    -1,
+     815,   816,     5,     6,    -1,     8,     9,    10,    11,    12,
+      -1,    -1,    15,    -1,    -1,    -1,    -1,    20,    -1,    -1,
+      23,    -1,    25,    26,    27,    28,    29,    30,    -1,    32,
+      -1,    -1,    35,    36,    37,    38,    39,    40,    41,    -1,
+      43,    44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,
+      53,    54,    55,    56,    57,    -1,    59,    60,    61,    62,
+      63,    -1,    65,    66,    67,    68,    69,    70,    -1,    72,
+      73,    -1,    75,    76,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    -1,    87,    88,    -1,    90,    91,    92,
+      93,    94,    -1,    96,    97,    98,    -1,    -1,    -1,   102,
+     103,   104,    -1,   106,   107,   108,    -1,   110,   111,   112,
+     113,   114,   115,    -1,    -1,    -1,    -1,   120,   121,   122,
+      -1,    -1,   125,   126,   127,    -1,   129,    -1,    -1,    -1,
+      -1,    -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,
+     143,    -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,
+      -1,   154,   155,    -1,   157,   158,   159,    -1,    -1,   162,
+     163,    -1,   165,   166,   167,   168,   169,   170,   171,    -1,
+     173,   174,   175,   176,   177,   178,   179,   180,   181,    -1,
+     183,   184,   185,   186,   187,   188,    -1,   190,   191,    -1,
+      -1,    -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,
+      -1,   204,   205,   206,   207,    -1,   209,    -1,   211,    -1,
+     213,    -1,   215,   216,    -1,   218,   219,    -1,   221,   222,
+      -1,    -1,    -1,   226,   227,   228,   229,   230,    -1,   232,
+     233,   234,    -1,    -1,   237,    -1,    -1,    -1,   241,   242,
+     243,   244,   245,    -1,    -1,   248,    -1,    -1,    -1,   252,
+     253,    -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,
+      -1,    -1,   265,   266,    -1,    -1,   269,    -1,   271,   272,
+     273,    -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,
+      -1,   284,    -1,   286,   287,    -1,    -1,   290,    -1,    -1,
+      -1,    -1,   295,    -1,   297,   298,   299,   300,   301,   302,
+     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
+     313,    -1,   315,   316,   317,   318,   319,   320,   321,   322,
+     323,   324,   325,   326,    -1,    -1,    -1,   330,   331,   332,
+     333,   334,   335,    -1,    -1,   338,   339,   340,   341,    -1,
+     343,   344,   345,   346,   347,   348,   349,   350,   351,   352,
+     353,    -1,   355,   356,   357,    -1,    -1,   360,   361,   362,
+     363,   364,   365,    -1,   367,   368,   369,    -1,   371,   372,
+     373,    -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,
+     383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     393,   394,   395,   396,   397,    -1,   399,    -1,   401,   402,
+     403,   404,   405,   406,   407,   408,   409,   410,   411,   412,
+      -1,   414,   415,   416,    -1,   418,    -1,   420,   421,   422,
+     423,   424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,
+      -1,    -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,
+     443,   444,   445,   446,    -1,   448,   449,    -1,   451,   452,
+     453,   454,   455,   456,   457,   458,   459,   460,   461,   462,
+     463,    -1,   465,    -1,   467,   468,    -1,   470,   471,   472,
+      -1,   474,    -1,   476,   477,   478,   479,   480,    -1,   482,
+     483,   484,   485,   486,   487,   488,    -1,   490,   491,    -1,
+      -1,    -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,
+      -1,    -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,
+     513,   514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,
+     523,   524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,
+     533,    -1,   535,    -1,   537,   538,   539,   540,   541,   542,
+     543,   544,   545,   546,    -1,    -1,   549,   550,   551,   552,
+     553,   554,   555,   556,   557,   558,   559,   560,   561,   562,
+     563,    -1,    -1,   566,   567,   568,   569,    -1,   571,   572,
+     573,    -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,
+      -1,   584,   585,    -1,   587,   588,   589,   590,   591,    -1,
+     593,   594,   595,   596,   597,   598,    -1,   600,   601,    -1,
+      -1,   604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,
+      -1,    -1,   615,   616,   617,   618,   619,   620,    -1,    -1,
+     623,   624,    -1,   626,   627,    -1,   629,   630,   631,   632,
+      -1,    -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,
+     643,   644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,
+     653,   654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,
+      -1,   664,   665,    -1,   667,   668,   669,   670,   671,   672,
+     673,    -1,   675,   676,   677,   678,   679,   680,    -1,   682,
+     683,   684,   685,   686,   687,   688,    -1,   690,   691,   692,
+     693,   694,   695,   696,    -1,    -1,    -1,   700,   701,   702,
+     703,   704,   705,   706,   707,    -1,   709,   710,   711,   712,
+     713,   714,   715,   716,   717,   718,    -1,   720,   721,   722,
+     723,   724,   725,   726,   727,   728,   729,   730,   731,   732,
+     733,   734,   735,   736,   737,   738,   739,   740,   741,   742,
+     743,    -1,   745,   746,   747,   748,   749,   750,   751,    -1,
+     753,   754,   755,   756,   757,   758,   759,   760,   761,   762,
+     763,   764,   765,   766,   767,   768,   769,   770,   771,   772,
+     773,   774,   775,   776,   777,   778,   779,   780,   781,   782,
+     783,   784,   785,   786,   787,   788,   789,   790,   791,   792,
+     793,    -1,    -1,    -1,    -1,    -1,   799,   800,    -1,    -1,
+      -1,    -1,   805,    -1,   807,    -1,    -1,    -1,   811,    -1,
+      -1,    -1,   815,   816,     5,     6,    -1,     8,     9,    10,
+      11,    12,    -1,    -1,    15,    -1,    -1,    -1,    -1,    20,
+      -1,    -1,    23,    -1,    25,    26,    27,    28,    29,    30,
+      -1,    32,    -1,    -1,    35,    36,    37,    38,    39,    40,
+      41,    -1,    43,    44,    45,    -1,    47,    -1,    49,    50,
+      -1,    -1,    53,    54,    55,    56,    57,    -1,    59,    60,
+      61,    62,    63,    -1,    65,    66,    67,    68,    69,    70,
+      -1,    72,    73,    -1,    75,    76,    77,    78,    79,    80,
+      81,    82,    83,    84,    85,    -1,    87,    88,    -1,    90,
+      91,    92,    93,    94,    -1,    96,    97,    98,    -1,    -1,
+      -1,   102,   103,   104,    -1,   106,   107,   108,    -1,   110,
+     111,   112,   113,   114,   115,    -1,    -1,    -1,    -1,   120,
+     121,   122,    -1,    -1,   125,   126,   127,    -1,   129,    -1,
+      -1,    -1,    -1,    -1,   135,   136,   137,   138,   139,    -1,
+      -1,    -1,   143,    -1,    -1,   146,   147,   148,    -1,    -1,
+      -1,   152,    -1,   154,   155,    -1,   157,   158,   159,    -1,
+      -1,   162,   163,    -1,   165,   166,   167,   168,   169,   170,
+     171,    -1,   173,   174,   175,   176,   177,   178,   179,   180,
+     181,    -1,   183,   184,   185,   186,   187,   188,    -1,   190,
+     191,    -1,    -1,    -1,   195,   196,    -1,   198,    -1,    -1,
+      -1,   202,    -1,   204,   205,   206,   207,    -1,   209,    -1,
+     211,    -1,   213,    -1,   215,   216,    -1,   218,   219,    -1,
+     221,   222,    -1,    -1,    -1,   226,   227,   228,   229,   230,
+      -1,   232,   233,   234,    -1,    -1,   237,    -1,    -1,    -1,
+     241,   242,   243,   244,   245,    -1,    -1,   248,    -1,    -1,
+      -1,   252,   253,    -1,   255,   256,    -1,    -1,    -1,   260,
+      -1,   262,    -1,    -1,   265,   266,    -1,    -1,   269,    -1,
+     271,   272,   273,    -1,    -1,    -1,    -1,    -1,   279,   280,
+      -1,   282,    -1,   284,    -1,   286,   287,    -1,    -1,   290,
+      -1,    -1,    -1,    -1,   295,    -1,   297,   298,   299,   300,
+     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
+     311,   312,   313,    -1,   315,   316,   317,   318,   319,   320,
+     321,   322,   323,   324,   325,    -1,    -1,    -1,    -1,   330,
+     331,   332,   333,   334,   335,    -1,    -1,   338,   339,   340,
+     341,    -1,   343,   344,   345,   346,   347,   348,   349,   350,
+     351,   352,   353,    -1,   355,   356,   357,    -1,    -1,   360,
+     361,   362,   363,   364,   365,    -1,   367,   368,   369,    -1,
+     371,   372,   373,    -1,   375,   376,    -1,   378,   379,   380,
+      -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   393,   394,   395,   396,   397,    -1,   399,    -1,
+     401,   402,   403,   404,   405,   406,   407,   408,   409,   410,
+     411,   412,    -1,   414,   415,   416,    -1,   418,    -1,   420,
+     421,   422,   423,   424,    -1,   426,   427,   428,    -1,    -1,
+     431,    -1,    -1,    -1,   435,   436,    -1,   438,   439,    -1,
+      -1,   442,   443,   444,   445,   446,    -1,   448,   449,    -1,
+     451,   452,   453,   454,   455,   456,   457,   458,   459,   460,
+     461,   462,   463,    -1,   465,    -1,   467,   468,    -1,   470,
+     471,   472,    -1,   474,    -1,   476,   477,   478,   479,   480,
+      -1,   482,   483,   484,   485,   486,   487,   488,    -1,   490,
+     491,    -1,    -1,    -1,   495,   496,   497,   498,    -1,    -1,
+      -1,   502,    -1,    -1,    -1,   506,    -1,   508,   509,   510,
+     511,    -1,   513,   514,   515,   516,   517,    -1,    -1,    -1,
+      -1,    -1,   523,   524,   525,    -1,   527,    -1,    -1,   530,
+      -1,    -1,   533,    -1,   535,    -1,   537,   538,   539,   540,
+     541,   542,   543,   544,   545,   546,    -1,    -1,   549,   550,
+     551,   552,   553,   554,   555,   556,   557,   558,   559,   560,
+     561,   562,   563,    -1,    -1,   566,   567,   568,   569,    -1,
+     571,   572,   573,    -1,   575,   576,   577,   578,    -1,    -1,
+      -1,    -1,    -1,   584,   585,    -1,   587,   588,   589,   590,
+     591,    -1,   593,   594,   595,   596,   597,   598,    -1,   600,
+     601,    -1,    -1,   604,    -1,    -1,   607,    -1,   609,    -1,
+     611,   612,    -1,    -1,   615,   616,   617,   618,   619,   620,
+      -1,    -1,   623,   624,    -1,   626,   627,    -1,   629,   630,
+     631,   632,    -1,    -1,    -1,    -1,    -1,    -1,   639,   640,
+     641,    -1,   643,   644,   645,   646,    -1,    -1,   649,    -1,
+      -1,   652,   653,   654,   655,   656,    -1,   658,    -1,    -1,
+      -1,    -1,    -1,   664,   665,    -1,   667,   668,   669,   670,
+     671,   672,   673,    -1,   675,   676,   677,   678,   679,   680,
+      -1,   682,   683,   684,   685,   686,   687,   688,    -1,   690,
+     691,   692,   693,   694,   695,   696,    -1,    -1,    -1,   700,
+     701,   702,   703,   704,   705,   706,   707,    -1,   709,   710,
+     711,   712,   713,   714,   715,   716,   717,   718,    -1,   720,
+     721,   722,   723,   724,   725,   726,   727,   728,   729,   730,
+     731,   732,   733,   734,   735,   736,   737,   738,   739,   740,
+     741,   742,   743,    -1,   745,   746,   747,   748,   749,   750,
+     751,    -1,   753,   754,   755,   756,   757,   758,   759,   760,
+     761,   762,   763,   764,   765,   766,   767,   768,   769,   770,
+     771,   772,   773,   774,   775,   776,   777,   778,   779,   780,
+     781,   782,   783,   784,   785,   786,   787,   788,   789,   790,
+     791,   792,   793,    -1,    -1,    -1,    -1,    -1,   799,   800,
+      -1,    -1,    -1,    -1,   805,    -1,   807,    -1,    -1,    -1,
+     811,    -1,    -1,    -1,   815,   816,     5,     6,    -1,     8,
+       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
       -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
+      29,    30,    -1,    32,    -1,    -1,    35,    36,    37,    38,
+      39,    40,    41,    -1,    43,    44,    45,    -1,    47,    -1,
+      49,    50,    -1,    -1,    53,    54,    55,    56,    57,    -1,
+      59,    60,    61,    62,    63,    -1,    65,    66,    67,    68,
       69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
       79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,
+      -1,    90,    91,    92,    93,    94,    -1,    96,    97,    98,
+      -1,    -1,    -1,   102,   103,   104,    -1,   106,   107,   108,
+      -1,   110,   111,   112,   113,   114,   115,    -1,    -1,    -1,
+      -1,   120,   121,   122,    -1,    -1,   125,   126,   127,    -1,
      129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
      139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
       -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,    -1,   168,
-     169,    -1,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,    -1,   184,   185,   186,   187,    -1,
+     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
+     169,   170,   171,    -1,   173,   174,   175,   176,   177,   178,
+     179,   180,   181,    -1,   183,   184,   185,   186,   187,   188,
       -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
       -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
+     209,    -1,   211,    -1,   213,    -1,   215,   216,    -1,   218,
+     219,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
+     229,   230,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
+      -1,    -1,   241,   242,   243,   244,   245,    -1,    -1,   248,
       -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
       -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,   274,    -1,    -1,    -1,    -1,
+     269,    -1,   271,   272,   273,    -1,    -1,    -1,    -1,    -1,
      279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
+      -1,   290,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
      299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
+     309,   310,   311,   312,   313,    -1,   315,   316,   317,   318,
+     319,   320,   321,   322,   323,   324,   325,    -1,    -1,    -1,
       -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
+     339,   340,   341,    -1,   343,   344,   345,   346,   347,   348,
+     349,   350,   351,   352,   353,    -1,   355,   356,   357,    -1,
+      -1,   360,   361,   362,   363,   364,   365,    -1,   367,   368,
+     369,    -1,   371,   372,   373,    -1,   375,   376,    -1,   378,
      379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
+      -1,    -1,    -1,    -1,   393,   394,   395,   396,   397,    -1,
      399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,    -1,   421,   422,   423,    -1,    -1,   426,   427,   428,
+     409,   410,   411,   412,    -1,   414,   415,   416,    -1,   418,
+      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
       -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,    -1,
-     449,    -1,   451,   452,   453,    -1,    -1,    -1,   457,   458,
+     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
+     449,    -1,   451,   452,   453,   454,   455,   456,   457,   458,
      459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
-     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
+      -1,   470,   471,   472,    -1,   474,    -1,   476,   477,   478,
+     479,   480,    -1,   482,   483,   484,   485,   486,   487,   488,
       -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,    -1,    -1,   508,
+      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
      509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
       -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
       -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
-     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,    -1,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
+     539,   540,   541,   542,   543,   544,   545,   546,    -1,    -1,
+     549,   550,   551,   552,   553,   554,   555,   556,   557,   558,
+     559,   560,   561,   562,   563,    -1,    -1,   566,   567,   568,
      569,    -1,   571,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
+      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,   587,   588,
+     589,   590,   591,    -1,   593,   594,   595,   596,   597,   598,
       -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
+     609,    -1,   611,   612,    -1,    -1,   615,   616,   617,   618,
+     619,   620,    -1,    -1,   623,   624,    -1,   626,   627,    -1,
      629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
      639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
      649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,    -1,    -1,
-     709,   710,   711,    -1,   713,   714,   715,   716,   717,   718,
+      -1,    -1,    -1,    -1,    -1,   664,   665,    -1,   667,   668,
+     669,   670,   671,   672,   673,    -1,   675,   676,   677,   678,
+     679,   680,    -1,   682,   683,   684,   685,   686,   687,   688,
+      -1,   690,   691,   692,   693,   694,   695,   696,    -1,    -1,
+      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
+     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
       -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
      729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
      739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
      749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
      759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
      769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
+     779,   780,   781,   782,   783,   784,   785,   786,   787,   788,
+     789,   790,   791,   792,   793,    -1,    -1,    -1,    -1,    -1,
+     799,   800,    -1,    -1,    -1,    -1,   805,    -1,   807,    -1,
+      -1,    -1,   811,    -1,    -1,    -1,   815,   816,     5,     6,
+      -1,     8,     9,    10,    11,    12,    -1,    -1,    15,    -1,
+      -1,    -1,    -1,    20,    -1,    -1,    23,    -1,    25,    26,
+      27,    28,    29,    30,    -1,    32,    -1,    -1,    35,    36,
+      37,    38,    39,    40,    41,    -1,    43,    44,    45,    -1,
+      47,    -1,    49,    50,    -1,    -1,    53,    54,    55,    56,
+      57,    -1,    59,    60,    61,    62,    63,    -1,    65,    66,
+      67,    68,    69,    70,    -1,    72,    73,    -1,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    -1,
+      87,    88,    -1,    90,    91,    92,    93,    94,    -1,    96,
+      97,    98,    -1,    -1,    -1,   102,   103,   104,    -1,   106,
+     107,   108,    -1,   110,   111,   112,   113,   114,   115,    -1,
+      -1,    -1,    -1,   120,   121,   122,    -1,    -1,   125,   126,
+     127,    -1,   129,    -1,    -1,    -1,    -1,    -1,   135,   136,
+     137,   138,   139,    -1,    -1,    -1,   143,    -1,    -1,   146,
+     147,   148,    -1,    -1,    -1,   152,    -1,   154,   155,    -1,
+     157,   158,   159,    -1,    -1,   162,   163,    -1,   165,   166,
+     167,   168,   169,   170,   171,    -1,   173,   174,   175,   176,
+     177,   178,   179,   180,   181,    -1,   183,   184,   185,   186,
+     187,   188,    -1,   190,   191,    -1,    -1,    -1,   195,   196,
+      -1,   198,    -1,    -1,    -1,   202,    -1,   204,   205,   206,
+     207,    -1,   209,    -1,   211,    -1,   213,    -1,   215,   216,
+      -1,   218,   219,    -1,   221,   222,    -1,    -1,    -1,   226,
+     227,   228,   229,   230,    -1,   232,   233,   234,    -1,    -1,
+     237,    -1,    -1,    -1,   241,   242,   243,   244,   245,    -1,
+      -1,   248,    -1,    -1,    -1,   252,   253,    -1,   255,   256,
+      -1,    -1,    -1,   260,    -1,   262,    -1,    -1,   265,   266,
+      -1,    -1,   269,    -1,   271,   272,   273,    -1,    -1,    -1,
+      -1,    -1,   279,   280,    -1,   282,    -1,   284,    -1,   286,
+     287,    -1,    -1,   290,    -1,    -1,    -1,    -1,   295,    -1,
+     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,   313,    -1,   315,   316,
+     317,   318,   319,   320,   321,   322,   323,   324,   325,    -1,
+      -1,    -1,    -1,   330,   331,   332,   333,   334,   335,    -1,
+      -1,   338,   339,   340,   341,    -1,   343,   344,   345,   346,
+     347,   348,   349,   350,   351,   352,   353,    -1,   355,   356,
+     357,    -1,    -1,   360,   361,   362,   363,   364,   365,    -1,
+     367,   368,   369,    -1,   371,   372,   373,    -1,   375,   376,
+      -1,   378,   379,   380,    -1,    -1,   383,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   393,   394,   395,   396,
+     397,    -1,   399,    -1,   401,   402,   403,   404,   405,   406,
+     407,   408,   409,   410,   411,   412,    -1,   414,   415,   416,
+      -1,   418,    -1,   420,   421,   422,   423,   424,    -1,   426,
+     427,   428,    -1,    -1,   431,    -1,    -1,    -1,   435,   436,
+      -1,   438,   439,    -1,    -1,   442,   443,   444,   445,   446,
+      -1,   448,   449,    -1,   451,   452,   453,   454,   455,   456,
+     457,   458,   459,   460,   461,   462,   463,    -1,   465,    -1,
+     467,   468,    -1,   470,   471,   472,    -1,   474,    -1,   476,
+     477,   478,   479,   480,    -1,   482,   483,   484,   485,   486,
+     487,   488,    -1,   490,   491,    -1,    -1,    -1,   495,   496,
+     497,   498,    -1,    -1,    -1,   502,    -1,    -1,    -1,   506,
+      -1,   508,   509,   510,   511,    -1,   513,   514,   515,   516,
+     517,    -1,    -1,    -1,    -1,    -1,   523,   524,   525,    -1,
+     527,    -1,    -1,   530,    -1,    -1,   533,    -1,   535,    -1,
+     537,   538,   539,   540,   541,   542,   543,   544,   545,   546,
+      -1,    -1,   549,   550,   551,   552,   553,   554,   555,   556,
+     557,   558,   559,   560,   561,   562,   563,    -1,    -1,   566,
+     567,   568,   569,    -1,   571,   572,   573,    -1,   575,   576,
+     577,   578,    -1,    -1,    -1,    -1,    -1,   584,   585,    -1,
+     587,   588,   589,   590,   591,    -1,   593,   594,   595,   596,
+     597,   598,    -1,   600,   601,    -1,    -1,   604,    -1,    -1,
+     607,    -1,   609,    -1,   611,   612,    -1,    -1,   615,   616,
+     617,   618,   619,   620,    -1,    -1,   623,   624,    -1,   626,
+     627,    -1,   629,   630,   631,   632,    -1,    -1,    -1,    -1,
+      -1,    -1,   639,   640,   641,    -1,   643,   644,   645,   646,
+      -1,    -1,   649,    -1,    -1,   652,   653,   654,   655,   656,
+      -1,   658,    -1,    -1,    -1,    -1,    -1,   664,   665,    -1,
+     667,   668,   669,   670,   671,   672,   673,    -1,   675,   676,
+     677,   678,   679,   680,    -1,   682,   683,   684,   685,   686,
+     687,   688,    -1,   690,   691,   692,   693,   694,   695,   696,
+      -1,    -1,    -1,   700,   701,   702,   703,   704,   705,   706,
+     707,    -1,   709,   710,   711,   712,   713,   714,   715,   716,
+     717,   718,    -1,   720,   721,   722,   723,   724,   725,   726,
+     727,   728,   729,   730,   731,   732,   733,   734,   735,   736,
+     737,   738,   739,   740,   741,   742,   743,    -1,   745,   746,
+     747,   748,   749,   750,   751,    -1,   753,   754,   755,   756,
+     757,   758,   759,   760,   761,   762,   763,   764,   765,   766,
+     767,   768,   769,   770,   771,   772,   773,   774,   775,   776,
+     777,   778,   779,   780,   781,   782,   783,   784,   785,   786,
+     787,   788,   789,   790,   791,   792,   793,    -1,    -1,    -1,
+      -1,    -1,   799,   800,    -1,    -1,    -1,    -1,   805,    -1,
+     807,    -1,    -1,    -1,   811,    -1,    -1,    -1,   815,   816,
+       5,     6,    -1,     8,     9,    10,    11,    12,    -1,    -1,
+      15,    -1,    -1,    -1,    -1,    20,    -1,    -1,    23,    -1,
+      25,    26,    27,    28,    29,    30,    -1,    32,    -1,    -1,
+      -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,    44,
+      45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,    -1,
+      -1,    56,    57,    -1,    59,    60,    61,    -1,    63,    -1,
+      65,    66,    67,    68,    69,    70,    -1,    72,    73,    -1,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    -1,    87,    88,    -1,    90,    91,    92,    93,    94,
+      -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,    -1,
+      -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,    -1,
+     115,    -1,    -1,    -1,    -1,   120,   121,    -1,    -1,    -1,
+      -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,    -1,
+     135,   136,   137,   138,   139,    -1,    -1,    -1,   143,    -1,
+      -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,   154,
+     155,    -1,   157,   158,   159,    -1,    -1,   162,   163,    -1,
+     165,   166,   167,   168,   169,   170,    -1,    -1,   173,   174,
+     175,   176,   177,    -1,    -1,   180,   181,    -1,   183,   184,
+     185,   186,   187,    -1,    -1,   190,   191,    -1,    -1,    -1,
+     195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,   204,
+     205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,    -1,
+     215,   216,    -1,   218,    -1,    -1,   221,   222,    -1,    -1,
+      -1,   226,   227,   228,   229,    -1,    -1,   232,   233,   234,
+      -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,   244,
+      -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,    -1,
+     255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,    -1,
+     265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,    -1,
+      -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,   284,
+      -1,   286,   287,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     295,    -1,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,    -1,
+     315,   316,   317,    -1,   319,   320,   321,   322,    -1,   324,
+     325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,   334,
+     335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,    -1,
+     345,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
+      -1,   356,   357,    -1,    -1,   360,   361,   362,   363,   364,
+      -1,    -1,    -1,   368,   369,    -1,    -1,    -1,   373,    -1,
+     375,   376,    -1,   378,   379,   380,    -1,    -1,   383,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,   394,
+     395,    -1,   397,    -1,   399,    -1,   401,   402,   403,   404,
+     405,   406,   407,   408,   409,   410,    -1,   412,    -1,   414,
+     415,   416,    -1,   418,    -1,   420,   421,   422,   423,   424,
+      -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,    -1,
+     435,   436,    -1,   438,   439,    -1,    -1,   442,   443,   444,
+     445,   446,    -1,   448,   449,    -1,   451,   452,   453,    -1,
+      -1,   456,   457,   458,   459,   460,   461,   462,   463,    -1,
+     465,    -1,   467,   468,    -1,   470,   471,   472,    -1,   474,
+      -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,   484,
+     485,   486,   487,   488,    -1,   490,   491,   492,    -1,    -1,
+     495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,    -1,
+      -1,   506,    -1,   508,   509,   510,   511,    -1,   513,   514,
+     515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,   524,
+     525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,    -1,
+     535,    -1,   537,   538,   539,   540,   541,   542,    -1,    -1,
+     545,   546,    -1,    -1,   549,   550,   551,   552,   553,   554,
+      -1,    -1,   557,   558,   559,   560,    -1,   562,   563,    -1,
+     565,   566,   567,   568,   569,    -1,    -1,   572,   573,    -1,
+     575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,   584,
+     585,    -1,    -1,    -1,   589,   590,   591,    -1,    -1,   594,
+     595,    -1,   597,   598,    -1,   600,   601,    -1,    -1,   604,
+      -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,    -1,
+      -1,    -1,    -1,   618,   619,   620,    -1,    -1,   623,    -1,
+      -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,    -1,
+      -1,   636,    -1,    -1,   639,   640,   641,    -1,   643,   644,
+     645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,   654,
+     655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   667,   668,   669,    -1,   671,   672,   673,    -1,
+     675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,    -1,
+      -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,    -1,
+     695,   696,    -1,    -1,   699,   700,   701,   702,   703,   704,
+     705,   706,   707,    -1,   709,   710,   711,   712,   713,   714,
+     715,   716,   717,   718,   719,   720,   721,   722,   723,   724,
+     725,   726,   727,   728,   729,   730,   731,   732,   733,   734,
+     735,   736,   737,   738,   739,   740,   741,   742,   743,    -1,
+     745,   746,   747,   748,   749,   750,   751,    -1,   753,   754,
+     755,   756,   757,   758,   759,   760,   761,   762,   763,   764,
+     765,   766,   767,   768,   769,   770,   771,   772,   773,   774,
+     775,   776,   777,   778,   779,   780,   781,   782,   783,   784,
+     785,   786,   787,   788,   789,   790,   791,   792,   793,    -1,
+      -1,    -1,    -1,    -1,     5,     6,    -1,     8,     9,    10,
+      11,    12,   807,    -1,    15,    -1,    -1,    -1,    -1,    20,
+      -1,   816,    23,    -1,    25,    26,    27,    28,    29,    30,
+      -1,    32,    -1,    -1,    -1,    36,    -1,    -1,    -1,    40,
+      -1,    -1,    43,    44,    45,    -1,    47,    -1,    49,    50,
+      -1,    -1,    53,    -1,    -1,    56,    57,    -1,    59,    60,
+      61,    -1,    63,    -1,    65,    66,    67,    68,    69,    70,
+      -1,    72,    73,    -1,    75,    76,    77,    78,    79,    80,
+      81,    82,    83,    84,    85,    -1,    87,    88,    -1,    90,
+      91,    92,    93,    94,    -1,    -1,    -1,    98,    -1,    -1,
+      -1,    -1,   103,    -1,    -1,   106,    -1,    -1,    -1,   110,
+     111,   112,    -1,    -1,   115,    -1,    -1,    -1,    -1,   120,
+     121,    -1,    -1,    -1,    -1,   126,   127,    -1,   129,    -1,
+      -1,    -1,    -1,    -1,   135,   136,   137,   138,   139,    -1,
+      -1,    -1,   143,    -1,   145,   146,   147,   148,    -1,    -1,
+      -1,   152,    -1,   154,   155,    -1,   157,   158,   159,    -1,
+      -1,   162,   163,    -1,   165,   166,   167,   168,   169,   170,
+      -1,    -1,   173,   174,   175,   176,   177,    -1,    -1,   180,
+     181,    -1,   183,   184,   185,   186,   187,    -1,    -1,   190,
+     191,    -1,    -1,    -1,   195,   196,    -1,   198,    -1,    -1,
+      -1,   202,    -1,   204,   205,   206,   207,    -1,   209,    -1,
+     211,    -1,    -1,    -1,   215,   216,    -1,   218,    -1,    -1,
+     221,   222,    -1,    -1,    -1,   226,   227,   228,   229,    -1,
+      -1,   232,   233,   234,    -1,    -1,   237,    -1,    -1,    -1,
+      -1,   242,   243,   244,    -1,    -1,    -1,   248,    -1,    -1,
+      -1,   252,   253,    -1,   255,   256,    -1,    -1,    -1,   260,
+      -1,   262,    -1,    -1,   265,   266,    -1,    -1,   269,    -1,
+      -1,   272,   273,    -1,    -1,    -1,    -1,    -1,   279,   280,
+      -1,   282,    -1,   284,    -1,   286,   287,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   295,    -1,   297,   298,   299,   300,
+     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
+     311,   312,   313,    -1,   315,   316,   317,    -1,   319,   320,
+     321,   322,    -1,   324,   325,    -1,    -1,    -1,    -1,   330,
+     331,   332,   333,   334,   335,    -1,    -1,   338,   339,    -1,
+     341,    -1,   343,    -1,   345,   346,   347,   348,   349,   350,
+     351,   352,   353,    -1,    -1,   356,   357,    -1,    -1,   360,
+     361,   362,   363,   364,    -1,    -1,    -1,   368,   369,    -1,
+      -1,    -1,   373,    -1,   375,   376,    -1,   378,   379,   380,
+      -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   393,   394,   395,    -1,   397,    -1,   399,    -1,
+     401,   402,   403,   404,   405,   406,   407,   408,   409,   410,
+      -1,   412,    -1,   414,   415,   416,    -1,   418,    -1,   420,
+     421,   422,   423,   424,    -1,   426,   427,   428,    -1,    -1,
+     431,    -1,    -1,    -1,   435,   436,    -1,   438,   439,    -1,
+      -1,   442,   443,   444,   445,   446,    -1,   448,   449,    -1,
+     451,   452,   453,    -1,    -1,   456,   457,   458,   459,   460,
+     461,   462,   463,    -1,   465,    -1,   467,   468,    -1,   470,
+     471,   472,    -1,   474,    -1,    -1,   477,   478,   479,   480,
+      -1,   482,    -1,   484,   485,   486,   487,   488,    -1,   490,
+     491,    -1,    -1,    -1,   495,   496,   497,   498,    -1,    -1,
+      -1,   502,    -1,    -1,    -1,   506,    -1,   508,   509,   510,
+     511,    -1,   513,   514,   515,   516,   517,    -1,    -1,    -1,
+      -1,    -1,   523,   524,   525,    -1,   527,    -1,    -1,   530,
+      -1,    -1,   533,    -1,   535,    -1,   537,   538,   539,   540,
+     541,   542,    -1,    -1,   545,   546,    -1,    -1,   549,   550,
+     551,   552,   553,   554,    -1,    -1,   557,   558,   559,   560,
+      -1,   562,   563,    -1,    -1,   566,   567,   568,   569,    -1,
+      -1,   572,   573,    -1,   575,   576,   577,   578,    -1,    -1,
+      -1,    -1,    -1,   584,   585,    -1,    -1,    -1,   589,   590,
+     591,    -1,    -1,   594,   595,    -1,   597,   598,    -1,   600,
+     601,    -1,    -1,   604,    -1,    -1,   607,    -1,   609,    -1,
+     611,   612,    -1,    -1,    -1,    -1,    -1,   618,    -1,   620,
+      -1,    -1,   623,    -1,    -1,    -1,   627,    -1,   629,   630,
+     631,   632,    -1,    -1,    -1,    -1,    -1,    -1,   639,   640,
+     641,    -1,   643,   644,   645,   646,    -1,    -1,   649,    -1,
+      -1,   652,   653,   654,   655,   656,    -1,   658,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   667,   668,   669,    -1,
+     671,   672,   673,    -1,   675,    -1,    -1,   678,    -1,   680,
+      -1,    -1,    -1,    -1,    -1,    -1,   687,   688,    -1,    -1,
+     691,    -1,   693,    -1,   695,   696,    -1,    -1,   699,   700,
+     701,   702,   703,   704,   705,   706,   707,    -1,   709,   710,
+     711,   712,   713,   714,   715,   716,   717,   718,   719,   720,
+     721,   722,   723,   724,   725,   726,   727,   728,   729,   730,
+     731,   732,   733,   734,   735,   736,   737,   738,   739,   740,
+     741,   742,   743,    -1,   745,   746,   747,   748,   749,   750,
+     751,    -1,   753,   754,   755,   756,   757,   758,   759,   760,
+     761,   762,   763,   764,   765,   766,   767,   768,   769,   770,
+     771,   772,   773,   774,   775,   776,   777,   778,   779,   780,
+     781,   782,   783,   784,   785,   786,   787,   788,   789,   790,
+     791,   792,   793,    -1,    -1,    -1,    -1,    -1,     5,     6,
+      -1,     8,     9,    10,    11,    12,   807,    -1,    15,    -1,
+      -1,    -1,    -1,    20,    -1,   816,    23,    -1,    25,    26,
+      27,    28,    29,    30,    -1,    32,    -1,    -1,    -1,    36,
+      -1,    -1,    -1,    40,    -1,    -1,    43,    44,    45,    -1,
+      47,    -1,    49,    50,    -1,    -1,    53,    -1,    -1,    56,
+      57,    -1,    59,    60,    61,    -1,    63,    -1,    65,    66,
+      67,    68,    69,    70,    -1,    72,    73,    -1,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    -1,
+      87,    88,    -1,    90,    91,    92,    93,    94,    -1,    -1,
+      -1,    98,    -1,    -1,    -1,    -1,   103,    -1,    -1,   106,
+      -1,    -1,    -1,   110,   111,   112,    -1,    -1,   115,    -1,
+      -1,    -1,    -1,   120,   121,    -1,    -1,    -1,    -1,   126,
+     127,    -1,   129,    -1,    -1,    -1,    -1,    -1,   135,   136,
+     137,   138,   139,    -1,    -1,    -1,   143,    -1,    -1,   146,
+     147,   148,    -1,    -1,    -1,   152,    -1,   154,   155,    -1,
+     157,   158,   159,    -1,    -1,   162,   163,    -1,   165,   166,
+     167,   168,   169,   170,    -1,    -1,   173,   174,   175,   176,
+     177,    -1,    -1,   180,   181,    -1,   183,   184,   185,   186,
+     187,    -1,    -1,   190,   191,    -1,    -1,    -1,   195,   196,
+      -1,   198,    -1,    -1,    -1,   202,    -1,   204,   205,   206,
+     207,    -1,   209,    -1,   211,    -1,    -1,    -1,   215,   216,
+      -1,   218,    -1,    -1,   221,   222,    -1,    -1,    -1,   226,
+     227,   228,   229,    -1,    -1,   232,   233,   234,    -1,    -1,
+     237,    -1,    -1,    -1,    -1,   242,   243,   244,    -1,    -1,
+      -1,   248,    -1,    -1,    -1,   252,   253,    -1,   255,   256,
+      -1,    -1,    -1,   260,    -1,   262,    -1,    -1,   265,   266,
+      -1,    -1,   269,    -1,    -1,   272,   273,    -1,    -1,    -1,
+      -1,    -1,   279,   280,    -1,   282,    -1,   284,    -1,   286,
+     287,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,
+     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,   313,    -1,   315,   316,
+     317,    -1,   319,   320,   321,   322,    -1,   324,   325,    -1,
+      -1,    -1,    -1,   330,   331,   332,   333,   334,   335,    -1,
+      -1,   338,   339,    -1,   341,    -1,   343,    -1,   345,   346,
+     347,   348,   349,   350,   351,   352,   353,    -1,    -1,   356,
+     357,    -1,    -1,   360,   361,   362,   363,   364,    -1,    -1,
+      -1,   368,   369,    -1,    -1,    -1,   373,    -1,   375,   376,
+      -1,   378,   379,   380,    -1,    -1,   383,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   393,   394,   395,    -1,
+     397,    -1,   399,    -1,   401,   402,   403,   404,   405,   406,
+     407,   408,   409,   410,    -1,   412,    -1,   414,   415,   416,
+      -1,   418,    -1,   420,   421,   422,   423,   424,    -1,   426,
+     427,   428,    -1,    -1,   431,    -1,    -1,    -1,   435,   436,
+      -1,   438,   439,    -1,    -1,   442,   443,   444,   445,   446,
+      -1,   448,   449,    -1,   451,   452,   453,    -1,    -1,   456,
+     457,   458,   459,   460,   461,   462,   463,    -1,   465,    -1,
+     467,   468,    -1,   470,   471,   472,    -1,   474,    -1,    -1,
+     477,   478,   479,   480,    -1,   482,    -1,   484,   485,   486,
+     487,   488,    -1,   490,   491,    -1,    -1,    -1,   495,   496,
+     497,   498,    -1,    -1,    -1,   502,    -1,    -1,    -1,   506,
+      -1,   508,   509,   510,   511,    -1,   513,   514,   515,   516,
+     517,    -1,    -1,    -1,    -1,    -1,   523,   524,   525,    -1,
+     527,    -1,    -1,   530,    -1,    -1,   533,    -1,   535,    -1,
+     537,   538,   539,   540,   541,   542,    -1,    -1,   545,   546,
+      -1,    -1,   549,   550,   551,   552,   553,   554,    -1,    -1,
+     557,   558,   559,   560,    -1,   562,   563,    -1,    -1,   566,
+     567,   568,   569,    -1,    -1,   572,   573,    -1,   575,   576,
+     577,   578,    -1,    -1,    -1,    -1,    -1,   584,   585,    -1,
+      -1,    -1,   589,   590,   591,    -1,    -1,   594,   595,    -1,
+     597,   598,    -1,   600,   601,    -1,    -1,   604,    -1,    -1,
+     607,    -1,   609,    -1,   611,   612,    -1,    -1,    -1,    -1,
+      -1,   618,    -1,   620,    -1,    -1,   623,    -1,    -1,    -1,
+     627,    -1,   629,   630,   631,   632,    -1,    -1,    -1,    -1,
+      -1,    -1,   639,   640,   641,    -1,   643,   644,   645,   646,
+      -1,    -1,   649,    -1,    -1,   652,   653,   654,   655,   656,
+      -1,   658,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     667,   668,   669,    -1,   671,   672,   673,    -1,   675,    -1,
+      -1,   678,    -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,
+     687,   688,    -1,    -1,   691,    -1,   693,    -1,   695,   696,
+      -1,    -1,   699,   700,   701,   702,   703,   704,   705,   706,
+     707,    -1,   709,   710,   711,   712,   713,   714,   715,   716,
+     717,   718,   719,   720,   721,   722,   723,   724,   725,   726,
+     727,   728,   729,   730,   731,   732,   733,   734,   735,   736,
+     737,   738,   739,   740,   741,   742,   743,    -1,   745,   746,
+     747,   748,   749,   750,   751,    -1,   753,   754,   755,   756,
+     757,   758,   759,   760,   761,   762,   763,   764,   765,   766,
+     767,   768,   769,   770,   771,   772,   773,   774,   775,   776,
+     777,   778,   779,   780,   781,   782,   783,   784,   785,   786,
+     787,   788,   789,   790,   791,   792,   793,    -1,    -1,    -1,
+      -1,     5,     6,    -1,     8,     9,    10,    11,    12,    -1,
+     807,    15,    -1,    -1,    -1,    -1,    20,    -1,    -1,   816,
+      -1,    25,    26,    27,    28,    29,    30,    -1,    32,    -1,
+      -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,
+      44,    45,    -1,    47,    -1,    -1,    -1,    -1,    -1,    53,
+      54,    -1,    56,    57,    -1,    59,    60,    -1,    -1,    -1,
+      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
+      -1,    75,    76,    -1,    78,    -1,    80,    81,    82,    83,
+      84,    85,    -1,    87,    88,    -1,    90,    91,    92,    -1,
+      94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,
+      -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,
+      -1,   115,    -1,    -1,    -1,    -1,   120,    -1,    -1,    -1,
+      -1,    -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,
+      -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,    -1,
+      -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,
+      -1,   155,    -1,   157,   158,   159,    -1,    -1,   162,   163,
+      -1,   165,   166,   167,   168,   169,    -1,    -1,    -1,   173,
+     174,   175,   176,   177,    -1,    -1,   180,   181,   182,   183,
+     184,   185,   186,   187,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,
+     204,   205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,
+      -1,    -1,   216,    -1,    -1,    -1,    -1,   221,   222,    -1,
+      -1,    -1,   226,   227,   228,   229,   230,    -1,   232,    -1,
+     234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,
+      -1,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,
+      -1,   255,   256,   257,    -1,    -1,   260,    -1,   262,    -1,
+      -1,    -1,   266,    -1,    -1,   269,   270,    -1,   272,   273,
+      -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,
+     284,    -1,   286,   287,    -1,    -1,    -1,    -1,   292,    -1,
+      -1,   295,    -1,   297,   298,   299,   300,   301,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
+      -1,   315,   316,   317,    -1,   319,   320,   321,   322,    -1,
+     324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,
+     334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,
+      -1,   345,   346,   347,   348,   349,   350,   351,   352,   353,
+      -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,   363,
+     364,    -1,    -1,    -1,    -1,   369,    -1,    -1,    -1,   373,
+      -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,   383,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,
+     394,   395,    -1,   397,    -1,   399,    -1,   401,   402,   403,
+     404,   405,   406,   407,   408,   409,   410,    -1,    -1,    -1,
+      -1,   415,   416,    -1,   418,    -1,   420,   421,   422,   423,
+     424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,
+      -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,   443,
+     444,   445,   446,    -1,   448,   449,    -1,   451,    -1,   453,
+     454,    -1,   456,   457,   458,   459,   460,   461,   462,   463,
+      -1,    -1,    -1,   467,   468,    -1,   470,   471,   472,   473,
+     474,    -1,    -1,    -1,   478,   479,   480,    -1,   482,    -1,
+     484,   485,    -1,   487,   488,    -1,   490,   491,    -1,    -1,
+      -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,
+      -1,    -1,    -1,    -1,    -1,   509,    -1,   511,    -1,   513,
+     514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,
+     524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,
+      -1,   535,    -1,   537,    -1,   539,   540,   541,   542,    -1,
+      -1,    -1,   546,    -1,    -1,   549,   550,   551,   552,   553,
+     554,    -1,    -1,   557,   558,   559,   560,    -1,   562,   563,
+      -1,    -1,   566,   567,   568,   569,    -1,    -1,   572,   573,
+      -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,
+     584,   585,    -1,    -1,    -1,    -1,   590,   591,    -1,    -1,
+     594,   595,    -1,   597,   598,    -1,    -1,    -1,    -1,    -1,
+     604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,
+      -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,
+      -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,
+      -1,   635,    -1,    -1,    -1,   639,   640,   641,    -1,   643,
+      -1,   645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,
+     654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,   673,
+      -1,    -1,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,
+      -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,
+      -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,   703,
+     704,   705,   706,   707,    -1,   709,   710,   711,    -1,   713,
+     714,   715,   716,   717,   718,    -1,   720,   721,   722,   723,
+     724,   725,   726,   727,   728,   729,   730,   731,   732,   733,
+     734,   735,   736,   737,   738,   739,   740,   741,   742,   743,
+      -1,   745,   746,   747,   748,   749,   750,   751,    -1,   753,
+     754,   755,   756,   757,   758,   759,   760,   761,   762,   763,
+     764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
+     774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
+     784,   785,   786,   787,   788,   789,   790,   791,   792,   793,
+      -1,     5,     6,    -1,     8,     9,    10,    11,    12,    -1,
+      -1,    15,    -1,    -1,    -1,    -1,    20,    -1,   812,    23,
+      -1,    25,    26,    27,    28,    29,    30,    -1,    32,    -1,
+      -1,    -1,    36,    37,    -1,    -1,    40,    -1,    -1,    43,
+      44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,
+      -1,    -1,    56,    57,    -1,    59,    60,    61,    -1,    63,
+      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
+      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
+      84,    85,    -1,    87,    88,    -1,    90,    91,    92,    93,
+      94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,
+      -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,
+      -1,   115,    -1,    -1,    -1,    -1,   120,   121,   122,    -1,
+      -1,    -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,
+      -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,   143,
+      -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,
+     154,   155,    -1,   157,   158,   159,    -1,    -1,   162,   163,
+      -1,   165,   166,   167,   168,   169,   170,    -1,    -1,   173,
+     174,   175,   176,   177,    -1,   179,   180,   181,    -1,   183,
+     184,   185,   186,   187,   188,    -1,   190,   191,    -1,    -1,
+      -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,
+     204,   205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,
+      -1,   215,   216,    -1,   218,   219,    -1,   221,   222,    -1,
+      -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,   233,
+     234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,
+     244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,
+      -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,
+      -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,
+      -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,
+     284,    -1,   286,   287,    -1,    -1,   290,    -1,    -1,    -1,
+      -1,   295,    -1,   297,   298,   299,   300,   301,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
+      -1,   315,   316,   317,    -1,   319,   320,   321,   322,    -1,
+     324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,
+     334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,
+      -1,   345,   346,   347,   348,   349,   350,   351,   352,   353,
+      -1,   355,   356,   357,    -1,    -1,   360,   361,   362,   363,
+     364,    -1,    -1,    -1,   368,   369,    -1,   371,   372,   373,
+      -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,   383,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,
+     394,   395,    -1,   397,    -1,   399,    -1,   401,   402,   403,
+     404,   405,   406,   407,   408,   409,   410,    -1,   412,    -1,
+     414,   415,   416,    -1,   418,    -1,   420,   421,   422,   423,
+     424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,
+      -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,   443,
+     444,   445,   446,    -1,   448,   449,    -1,   451,   452,   453,
+      -1,    -1,   456,   457,   458,   459,   460,   461,   462,   463,
+      -1,   465,    -1,   467,   468,    -1,   470,   471,   472,    -1,
+     474,    -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,
+     484,   485,   486,   487,   488,    -1,   490,   491,    -1,    -1,
+      -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,
+      -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,   513,
+     514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,
+     524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,
+      -1,   535,    -1,   537,   538,   539,   540,   541,   542,    -1,
+      -1,   545,   546,    -1,    -1,   549,   550,   551,   552,   553,
+     554,    -1,    -1,   557,   558,   559,   560,    -1,   562,   563,
+      -1,    -1,   566,   567,   568,   569,    -1,   571,   572,   573,
+      -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,
+     584,   585,    -1,    -1,   588,   589,   590,   591,    -1,   593,
+     594,   595,   596,   597,   598,    -1,   600,   601,    -1,    -1,
+     604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,
+      -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,
+      -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,
+      -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,
+     644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,
+     654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,   673,
+      -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,
+      -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,
+      -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,   703,
+     704,   705,   706,   707,    -1,   709,   710,   711,   712,   713,
+     714,   715,   716,   717,   718,    -1,   720,   721,   722,   723,
+     724,   725,   726,   727,   728,   729,   730,   731,   732,   733,
+     734,   735,   736,   737,   738,   739,   740,   741,   742,   743,
+      -1,   745,   746,   747,   748,   749,   750,   751,    -1,   753,
+     754,   755,   756,   757,   758,   759,   760,   761,   762,   763,
+     764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
+     774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
+     784,   785,   786,   787,   788,   789,   790,   791,   792,   793,
+       5,     6,    -1,     8,     9,    10,    11,    12,    -1,    -1,
+      15,    -1,    -1,    -1,    -1,    20,    -1,   811,    23,    -1,
+      25,    26,    27,    28,    29,    30,    -1,    32,    -1,    -1,
+      -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,    44,
+      45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,    -1,
+      -1,    56,    57,    -1,    59,    60,    61,    -1,    63,    -1,
+      65,    66,    67,    68,    69,    70,    -1,    72,    73,    -1,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    -1,    87,    88,    -1,    90,    91,    92,    93,    94,
+      -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,    -1,
+      -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,    -1,
+     115,    -1,    -1,    -1,    -1,   120,   121,    -1,    -1,    -1,
+      -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,    -1,
+     135,   136,   137,   138,   139,    -1,    -1,    -1,   143,    -1,
+      -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,   154,
+     155,    -1,   157,   158,   159,    -1,    -1,   162,   163,    -1,
+     165,   166,   167,   168,   169,   170,    -1,    -1,   173,   174,
+     175,   176,   177,    -1,    -1,   180,   181,    -1,   183,   184,
+     185,   186,   187,    -1,    -1,   190,   191,    -1,    -1,    -1,
+     195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,   204,
+     205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,    -1,
+     215,   216,    -1,   218,    -1,    -1,   221,   222,    -1,    -1,
+      -1,   226,   227,   228,   229,    -1,    -1,   232,   233,   234,
+      -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,   244,
+      -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,    -1,
+     255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,    -1,
+     265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,    -1,
+      -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,   284,
+      -1,   286,   287,    -1,    -1,   290,    -1,    -1,    -1,    -1,
+     295,    -1,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,    -1,
+     315,   316,   317,    -1,   319,   320,   321,   322,    -1,   324,
+     325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,   334,
+     335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,    -1,
+     345,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
+      -1,   356,   357,    -1,    -1,   360,   361,   362,   363,   364,
+      -1,    -1,    -1,   368,   369,    -1,    -1,   372,   373,    -1,
+     375,   376,    -1,   378,   379,   380,    -1,    -1,   383,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,   394,
+     395,   396,   397,    -1,   399,    -1,   401,   402,   403,   404,
+     405,   406,   407,   408,   409,   410,    -1,   412,    -1,   414,
+     415,   416,    -1,   418,    -1,   420,   421,   422,   423,   424,
+      -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,    -1,
+     435,   436,    -1,   438,   439,    -1,    -1,   442,   443,   444,
+     445,   446,    -1,   448,   449,    -1,   451,   452,   453,    -1,
+      -1,   456,   457,   458,   459,   460,   461,   462,   463,    -1,
+     465,    -1,   467,   468,    -1,   470,   471,   472,    -1,   474,
+      -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,   484,
+     485,   486,   487,   488,    -1,   490,   491,    -1,    -1,    -1,
+     495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,    -1,
+      -1,   506,    -1,   508,   509,   510,   511,    -1,   513,   514,
+     515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,   524,
+     525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,    -1,
+     535,    -1,   537,   538,   539,   540,   541,   542,    -1,    -1,
+     545,   546,    -1,    -1,   549,   550,   551,   552,   553,   554,
+      -1,    -1,   557,   558,   559,   560,    -1,   562,   563,    -1,
+      -1,   566,   567,   568,   569,    -1,    -1,   572,   573,    -1,
+     575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,   584,
+     585,    -1,    -1,    -1,   589,   590,   591,    -1,   593,   594,
+     595,    -1,   597,   598,    -1,   600,   601,    -1,    -1,   604,
+      -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,    -1,
+      -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,    -1,
+      -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,    -1,
+      -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,   644,
+     645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,   654,
+     655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   667,   668,   669,    -1,   671,   672,   673,    -1,
+     675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,    -1,
+      -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,    -1,
+     695,   696,    -1,    -1,    -1,   700,   701,   702,   703,   704,
+     705,   706,   707,    -1,   709,   710,   711,   712,   713,   714,
+     715,   716,   717,   718,    -1,   720,   721,   722,   723,   724,
+     725,   726,   727,   728,   729,   730,   731,   732,   733,   734,
+     735,   736,   737,   738,   739,   740,   741,   742,   743,    -1,
+     745,   746,   747,   748,   749,   750,   751,    -1,   753,   754,
+     755,   756,   757,   758,   759,   760,   761,   762,   763,   764,
+     765,   766,   767,   768,   769,   770,   771,   772,   773,   774,
+     775,   776,   777,   778,   779,   780,   781,   782,   783,   784,
+     785,   786,   787,   788,   789,   790,   791,   792,   793,     5,
+       6,    -1,     8,     9,    10,    11,    12,    -1,    -1,    15,
+      -1,    -1,    -1,    -1,    20,    -1,   811,    23,    -1,    25,
+      26,    27,    28,    29,    30,    -1,    32,    -1,    -1,    -1,
+      36,    -1,    -1,    -1,    40,    -1,    -1,    43,    44,    45,
+      -1,    47,    -1,    49,    50,    -1,    -1,    53,    -1,    -1,
+      56,    57,    -1,    59,    60,    61,    -1,    63,    -1,    65,
+      66,    67,    68,    69,    70,    -1,    72,    73,    -1,    75,
+      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
+      -1,    87,    88,    -1,    90,    91,    92,    93,    94,    -1,
+      -1,    -1,    98,    -1,    -1,    -1,    -1,   103,    -1,    -1,
+     106,    -1,    -1,    -1,   110,   111,   112,    -1,    -1,   115,
+      -1,    -1,    -1,    -1,   120,   121,    -1,    -1,    -1,    -1,
+     126,   127,    -1,   129,    -1,    -1,    -1,    -1,    -1,   135,
+     136,   137,   138,   139,    -1,    -1,    -1,   143,    -1,    -1,
+     146,   147,   148,    -1,    -1,    -1,   152,    -1,   154,   155,
+      -1,   157,   158,   159,    -1,    -1,   162,   163,    -1,   165,
+     166,   167,   168,   169,   170,    -1,    -1,   173,   174,   175,
+     176,   177,    -1,    -1,   180,   181,    -1,   183,   184,   185,
+     186,   187,    -1,    -1,   190,   191,    -1,    -1,    -1,   195,
+     196,    -1,   198,    -1,    -1,    -1,   202,    -1,   204,   205,
+     206,   207,    -1,   209,    -1,   211,    -1,    -1,    -1,   215,
+     216,    -1,   218,    -1,    -1,   221,   222,    -1,    -1,    -1,
+     226,   227,   228,   229,    -1,    -1,   232,   233,   234,    -1,
+      -1,   237,    -1,    -1,    -1,    -1,   242,   243,   244,    -1,
+      -1,    -1,   248,    -1,    -1,    -1,   252,   253,    -1,   255,
+     256,    -1,    -1,    -1,   260,    -1,   262,    -1,    -1,   265,
+     266,    -1,    -1,   269,    -1,    -1,   272,   273,   274,    -1,
+      -1,    -1,    -1,   279,   280,    -1,   282,    -1,   284,    -1,
+     286,   287,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   295,
+      -1,   297,   298,   299,   300,   301,   302,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,   312,   313,    -1,   315,
+     316,   317,    -1,   319,   320,   321,   322,    -1,   324,   325,
+      -1,    -1,    -1,    -1,   330,   331,   332,   333,   334,   335,
+      -1,    -1,   338,   339,    -1,   341,    -1,   343,    -1,   345,
+     346,   347,   348,   349,   350,   351,   352,   353,    -1,    -1,
+     356,   357,    -1,    -1,   360,   361,   362,   363,   364,    -1,
+      -1,    -1,   368,   369,    -1,    -1,    -1,   373,    -1,   375,
+     376,    -1,   378,   379,   380,    -1,    -1,   383,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   391,    -1,   393,   394,   395,
+      -1,   397,    -1,   399,    -1,   401,   402,   403,   404,   405,
+     406,   407,   408,   409,   410,    -1,   412,    -1,   414,   415,
+     416,    -1,   418,    -1,   420,   421,   422,   423,   424,    -1,
+     426,   427,   428,    -1,    -1,   431,    -1,    -1,    -1,   435,
+     436,    -1,   438,   439,    -1,    -1,   442,   443,   444,   445,
+     446,    -1,   448,   449,    -1,   451,   452,   453,    -1,    -1,
+     456,   457,   458,   459,   460,   461,   462,   463,    -1,   465,
+      -1,   467,   468,    -1,   470,   471,   472,    -1,   474,    -1,
+      -1,   477,   478,   479,   480,    -1,   482,    -1,   484,   485,
+     486,   487,   488,    -1,   490,   491,    -1,    -1,    -1,   495,
+     496,   497,   498,    -1,    -1,    -1,   502,    -1,    -1,    -1,
+     506,    -1,   508,   509,   510,   511,    -1,   513,   514,   515,
+     516,   517,    -1,    -1,    -1,    -1,    -1,   523,   524,   525,
+      -1,   527,    -1,    -1,   530,    -1,    -1,   533,    -1,   535,
+      -1,   537,   538,   539,   540,   541,   542,    -1,    -1,   545,
+     546,    -1,    -1,   549,   550,   551,   552,   553,   554,    -1,
+      -1,   557,   558,   559,   560,    -1,   562,   563,    -1,    -1,
+     566,   567,   568,   569,    -1,   571,   572,   573,    -1,   575,
+     576,   577,   578,    -1,    -1,    -1,    -1,    -1,   584,   585,
+      -1,    -1,    -1,   589,   590,   591,    -1,    -1,   594,   595,
+      -1,   597,   598,    -1,   600,   601,    -1,    -1,   604,    -1,
+      -1,   607,    -1,   609,    -1,   611,   612,    -1,    -1,    -1,
+      -1,    -1,   618,    -1,   620,    -1,    -1,   623,    -1,    -1,
+      -1,   627,    -1,   629,   630,   631,   632,    -1,    -1,    -1,
+      -1,    -1,    -1,   639,   640,   641,    -1,   643,   644,   645,
+     646,    -1,    -1,   649,    -1,    -1,   652,   653,   654,   655,
+     656,    -1,   658,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   667,   668,   669,    -1,   671,   672,   673,    -1,   675,
+      -1,    -1,   678,    -1,   680,    -1,    -1,    -1,    -1,    -1,
+      -1,   687,   688,    -1,    -1,   691,    -1,   693,    -1,   695,
+     696,    -1,    -1,    -1,   700,   701,   702,   703,   704,   705,
+     706,   707,    -1,   709,   710,   711,   712,   713,   714,   715,
+     716,   717,   718,    -1,   720,   721,   722,   723,   724,   725,
+     726,   727,   728,   729,   730,   731,   732,   733,   734,   735,
+     736,   737,   738,   739,   740,   741,   742,   743,    -1,   745,
+     746,   747,   748,   749,   750,   751,    -1,   753,   754,   755,
+     756,   757,   758,   759,   760,   761,   762,   763,   764,   765,
+     766,   767,   768,   769,   770,   771,   772,   773,   774,   775,
+     776,   777,   778,   779,   780,   781,   782,   783,   784,   785,
+     786,   787,   788,   789,   790,   791,   792,   793,     5,     6,
+      -1,     8,     9,    10,    11,    12,    -1,    -1,    15,    -1,
+      -1,    -1,    -1,    20,    -1,   811,    23,    -1,    25,    26,
+      27,    28,    29,    30,    -1,    32,    -1,    -1,    -1,    36,
+      -1,    -1,    -1,    40,    -1,    -1,    43,    44,    45,    -1,
+      47,    -1,    49,    50,    -1,    -1,    53,    -1,    -1,    56,
+      57,    -1,    59,    60,    61,    62,    63,    -1,    65,    66,
+      67,    68,    69,    70,    -1,    72,    73,    -1,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    -1,
+      87,    88,    -1,    90,    91,    92,    93,    94,    -1,    -1,
+      -1,    98,    -1,    -1,    -1,    -1,   103,    -1,    -1,   106,
+      -1,    -1,    -1,   110,   111,   112,    -1,    -1,   115,    -1,
+      -1,    -1,    -1,   120,   121,    -1,    -1,    -1,   125,   126,
+     127,    -1,   129,    -1,    -1,    -1,    -1,    -1,   135,   136,
+     137,   138,   139,    -1,    -1,    -1,   143,    -1,    -1,   146,
+     147,   148,    -1,    -1,    -1,   152,    -1,   154,   155,    -1,
+     157,   158,   159,    -1,    -1,   162,   163,    -1,   165,   166,
+     167,   168,   169,   170,    -1,    -1,   173,   174,   175,   176,
+     177,    -1,    -1,   180,   181,    -1,   183,   184,   185,   186,
+     187,    -1,    -1,   190,   191,    -1,    -1,    -1,   195,   196,
+      -1,   198,    -1,    -1,    -1,   202,    -1,   204,   205,   206,
+     207,    -1,   209,    -1,   211,    -1,    -1,    -1,   215,   216,
+      -1,   218,    -1,    -1,   221,   222,    -1,    -1,    -1,   226,
+     227,   228,   229,    -1,    -1,   232,   233,   234,    -1,    -1,
+     237,    -1,    -1,    -1,    -1,   242,   243,   244,    -1,    -1,
+      -1,   248,    -1,    -1,    -1,   252,   253,    -1,   255,   256,
+      -1,    -1,    -1,   260,    -1,   262,    -1,    -1,   265,   266,
+      -1,    -1,   269,    -1,    -1,   272,   273,    -1,    -1,    -1,
+      -1,    -1,   279,   280,    -1,   282,    -1,   284,    -1,   286,
+     287,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,
+     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,   313,    -1,   315,   316,
+     317,    -1,   319,   320,   321,   322,    -1,   324,   325,    -1,
+      -1,    -1,    -1,   330,   331,   332,   333,   334,   335,    -1,
+      -1,   338,   339,    -1,   341,    -1,   343,    -1,   345,   346,
+     347,   348,   349,   350,   351,   352,   353,    -1,    -1,   356,
+     357,    -1,    -1,   360,   361,   362,   363,   364,    -1,    -1,
+      -1,   368,   369,    -1,    -1,    -1,   373,    -1,   375,   376,
+      -1,   378,   379,   380,    -1,    -1,   383,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   393,   394,   395,    -1,
+     397,    -1,   399,    -1,   401,   402,   403,   404,   405,   406,
+     407,   408,   409,   410,    -1,   412,    -1,   414,   415,   416,
+      -1,   418,    -1,   420,   421,   422,   423,   424,    -1,   426,
+     427,   428,    -1,    -1,   431,    -1,    -1,    -1,   435,   436,
+      -1,   438,   439,    -1,    -1,   442,   443,   444,   445,   446,
+      -1,   448,   449,    -1,   451,   452,   453,    -1,    -1,   456,
+     457,   458,   459,   460,   461,   462,   463,    -1,   465,    -1,
+     467,   468,    -1,   470,   471,   472,    -1,   474,    -1,    -1,
+     477,   478,   479,   480,    -1,   482,    -1,   484,   485,   486,
+     487,   488,    -1,   490,   491,    -1,    -1,    -1,   495,   496,
+     497,   498,    -1,    -1,    -1,   502,    -1,    -1,    -1,   506,
+      -1,   508,   509,   510,   511,    -1,   513,   514,   515,   516,
+     517,    -1,    -1,    -1,    -1,    -1,   523,   524,   525,    -1,
+     527,    -1,    -1,   530,    -1,    -1,   533,    -1,   535,    -1,
+     537,   538,   539,   540,   541,   542,    -1,    -1,   545,   546,
+      -1,    -1,   549,   550,   551,   552,   553,   554,    -1,    -1,
+     557,   558,   559,   560,    -1,   562,   563,    -1,    -1,   566,
+     567,   568,   569,    -1,    -1,   572,   573,    -1,   575,   576,
+     577,   578,    -1,    -1,    -1,    -1,    -1,   584,   585,    -1,
+      -1,    -1,   589,   590,   591,    -1,    -1,   594,   595,    -1,
+     597,   598,    -1,   600,   601,    -1,    -1,   604,    -1,    -1,
+     607,    -1,   609,    -1,   611,   612,    -1,    -1,    -1,    -1,
+      -1,   618,    -1,   620,    -1,    -1,   623,    -1,    -1,    -1,
+     627,    -1,   629,   630,   631,   632,    -1,    -1,    -1,    -1,
+      -1,    -1,   639,   640,   641,    -1,   643,   644,   645,   646,
+      -1,    -1,   649,    -1,    -1,   652,   653,   654,   655,   656,
+      -1,   658,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     667,   668,   669,    -1,   671,   672,   673,    -1,   675,    -1,
+      -1,   678,    -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,
+     687,   688,    -1,    -1,   691,    -1,   693,    -1,   695,   696,
+      -1,    -1,    -1,   700,   701,   702,   703,   704,   705,   706,
+     707,    -1,   709,   710,   711,   712,   713,   714,   715,   716,
+     717,   718,    -1,   720,   721,   722,   723,   724,   725,   726,
+     727,   728,   729,   730,   731,   732,   733,   734,   735,   736,
+     737,   738,   739,   740,   741,   742,   743,    -1,   745,   746,
+     747,   748,   749,   750,   751,    -1,   753,   754,   755,   756,
+     757,   758,   759,   760,   761,   762,   763,   764,   765,   766,
+     767,   768,   769,   770,   771,   772,   773,   774,   775,   776,
+     777,   778,   779,   780,   781,   782,   783,   784,   785,   786,
+     787,   788,   789,   790,   791,   792,   793,     5,     6,    -1,
+       8,     9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,
+      -1,    -1,    20,    -1,   811,    23,    -1,    25,    26,    27,
+      28,    29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,
+      -1,    -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,
+      -1,    49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,
+      -1,    59,    60,    61,    -1,    63,    -1,    65,    66,    67,
+      68,    69,    70,    -1,    72,    73,    -1,    75,    76,    77,
+      78,    79,    80,    81,    82,    83,    84,    85,    -1,    87,
+      88,    -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,
+      98,    -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,
+      -1,    -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,
+      -1,    -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,
+      -1,   129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,
+     138,   139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,
+     148,    -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,
+     158,   159,    -1,    -1,   162,   163,    -1,   165,   166,   167,
+     168,   169,   170,    -1,    -1,   173,   174,   175,   176,   177,
+      -1,    -1,   180,   181,    -1,   183,   184,   185,   186,   187,
+      -1,    -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,
+     198,    -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,
+      -1,   209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,
+     218,    -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,
+     228,   229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,
+      -1,    -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,
+     248,    -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,
+      -1,    -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,
+      -1,   269,    -1,    -1,   272,   273,   274,    -1,    -1,    -1,
+      -1,   279,   280,    -1,   282,    -1,   284,    -1,   286,   287,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,
+     298,   299,   300,   301,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,   313,    -1,   315,   316,   317,
+      -1,   319,   320,   321,   322,    -1,   324,   325,    -1,    -1,
+      -1,    -1,   330,   331,   332,   333,   334,   335,    -1,    -1,
+     338,   339,    -1,   341,    -1,   343,    -1,   345,   346,   347,
+     348,   349,   350,   351,   352,   353,    -1,    -1,   356,   357,
+      -1,    -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,
+     368,   369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,
+     378,   379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,
+      -1,   399,    -1,   401,   402,   403,   404,   405,   406,   407,
+     408,   409,   410,    -1,   412,    -1,   414,   415,   416,    -1,
+     418,    -1,   420,   421,   422,   423,   424,    -1,   426,   427,
+     428,    -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,
+     438,   439,    -1,    -1,   442,   443,   444,   445,   446,    -1,
+     448,   449,    -1,   451,   452,   453,    -1,    -1,   456,   457,
+     458,   459,   460,   461,   462,   463,    -1,   465,    -1,   467,
+     468,    -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,
+     478,   479,   480,    -1,   482,    -1,   484,   485,   486,   487,
+     488,    -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,
+     498,    -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,
+     508,   509,   510,   511,    -1,   513,   514,   515,   516,   517,
+      -1,    -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,
+      -1,    -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,
+     538,   539,   540,   541,   542,    -1,    -1,   545,   546,    -1,
+      -1,   549,   550,   551,   552,   553,   554,    -1,    -1,   557,
+     558,   559,   560,    -1,   562,   563,    -1,    -1,   566,   567,
+     568,   569,    -1,   571,   572,   573,    -1,   575,   576,   577,
+     578,    -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,
+      -1,   589,   590,   591,    -1,    -1,   594,   595,    -1,   597,
+     598,    -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,
+      -1,   609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,
+     618,    -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,
+      -1,   629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,
+      -1,   639,   640,   641,    -1,   643,   644,   645,   646,    -1,
+      -1,   649,    -1,    -1,   652,   653,   654,   655,   656,    -1,
+     658,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,
+     668,   669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,
+     678,    -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,
+     688,    -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,
+      -1,    -1,   700,   701,   702,   703,   704,   705,   706,   707,
+      -1,   709,   710,   711,   712,   713,   714,   715,   716,   717,
+     718,    -1,   720,   721,   722,   723,   724,   725,   726,   727,
+     728,   729,   730,   731,   732,   733,   734,   735,   736,   737,
+     738,   739,   740,   741,   742,   743,    -1,   745,   746,   747,
+     748,   749,   750,   751,    -1,   753,   754,   755,   756,   757,
+     758,   759,   760,   761,   762,   763,   764,   765,   766,   767,
+     768,   769,   770,   771,   772,   773,   774,   775,   776,   777,
+     778,   779,   780,   781,   782,   783,   784,   785,   786,   787,
+     788,   789,   790,   791,   792,   793,     5,     6,    -1,     8,
        9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
+      -1,    20,    -1,   811,    23,    -1,    25,    26,    27,    28,
       29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
       -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
       49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
@@ -21701,9 +17011,9 @@
      129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
      139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
       -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,    -1,   168,
-     169,    -1,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,    -1,   184,   185,   186,   187,    -1,
+     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
+     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
+      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
       -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
       -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
      209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
@@ -21721,26 +17031,26 @@
       -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
      339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
      349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,    -1,    -1,    -1,    -1,   368,
+      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
      369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
      379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
      399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
      409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
-      -1,    -1,   421,   422,   423,    -1,    -1,   426,   427,   428,
+      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
       -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,    -1,
-     449,    -1,   451,   452,   453,    -1,    -1,    -1,   457,   458,
+     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
+     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
      459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
       -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
      479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
       -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,    -1,    -1,   508,
+      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
      509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
       -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
       -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
      539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,    -1,   558,
+     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
      559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
      569,    -1,   571,   572,   573,    -1,   575,   576,   577,   578,
       -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
@@ -21755,717 +17065,5068 @@
      669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
       -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
       -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,    -1,    -1,
-     709,   710,   711,    -1,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    -1,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      -1,    -1,    -1,    -1,    53,    54,    -1,    56,    57,    -1,
-      59,    60,    -1,    -1,    -1,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    -1,    78,
-      -1,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    -1,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,    -1,    -1,    -1,    -1,    -1,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,    -1,    -1,    -1,   146,   147,   148,
-      -1,   150,   151,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,    -1,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,   182,   183,   184,   185,   186,   187,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,    -1,   216,    -1,    -1,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,   230,    -1,   232,    -1,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,    -1,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,   257,    -1,
-      -1,   260,    -1,   262,    -1,    -1,    -1,   266,    -1,    -1,
-     269,   270,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,   292,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,    -1,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,    -1,    -1,    -1,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,    -1,   453,   454,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,    -1,    -1,   467,   468,
-      -1,   470,   471,   472,   473,   474,    -1,    -1,    -1,   478,
-     479,   480,    -1,   482,    -1,   484,   485,    -1,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,    -1,    -1,    -1,
-     509,    -1,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,    -1,
-     539,   540,   541,   542,    -1,    -1,    -1,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,    -1,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-      -1,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,    -1,    -1,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,   635,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,    -1,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,    -1,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,    -1,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    -1,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      -1,    -1,    -1,    -1,    53,    54,    -1,    56,    57,    -1,
-      59,    60,    -1,    -1,    -1,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    -1,    78,
-      -1,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    -1,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,    -1,    -1,    -1,    -1,    -1,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,    -1,    -1,    -1,   146,   147,   148,
-      -1,   150,    -1,   152,    -1,   154,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,    -1,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,   182,   183,   184,   185,   186,   187,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,    -1,   216,    -1,    -1,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,   230,    -1,   232,    -1,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,    -1,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,   257,    -1,
-      -1,   260,    -1,   262,    -1,    -1,    -1,   266,    -1,    -1,
-     269,   270,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,   292,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,    -1,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,    -1,    -1,    -1,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,    -1,   453,   454,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,    -1,    -1,   467,   468,
-      -1,   470,   471,   472,   473,   474,    -1,    -1,    -1,   478,
-     479,   480,    -1,   482,    -1,   484,   485,    -1,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,    -1,    -1,    -1,
-     509,    -1,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,    -1,
-     539,   540,   541,   542,    -1,    -1,    -1,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,    -1,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-      -1,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,    -1,    -1,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,   633,    -1,   635,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,    -1,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,    -1,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
       -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,    -1,   713,   714,   715,   716,   717,   718,
+     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
       -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
      729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
      739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
      749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
      759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
      769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
+     779,   780,   781,   782,   783,   784,   785,   786,   787,   788,
+     789,   790,   791,   792,   793,     5,     6,    -1,     8,     9,
+      10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,    -1,
+      20,    -1,   811,    23,    -1,    25,    26,    27,    28,    29,
+      30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,    -1,
+      40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,    49,
+      50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,    59,
+      60,    61,    62,    63,    -1,    65,    66,    67,    68,    69,
+      70,    -1,    72,    73,    -1,    75,    76,    77,    78,    79,
+      80,    81,    82,    83,    84,    85,    -1,    87,    88,    -1,
+      90,    91,    92,    93,    94,    -1,    -1,    -1,    98,    -1,
+      -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,    -1,
+     110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,    -1,
+     120,   121,    -1,    -1,    -1,   125,   126,   127,    -1,   129,
+      -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,   139,
+      -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,    -1,
+      -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,   159,
+      -1,    -1,   162,   163,    -1,   165,   166,   167,   168,   169,
+     170,    -1,    -1,   173,   174,   175,   176,   177,    -1,    -1,
+     180,   181,    -1,   183,   184,   185,   186,   187,    -1,    -1,
+     190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,    -1,
+      -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,   209,
+      -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,    -1,
+      -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,   229,
+      -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,    -1,
+      -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,    -1,
+      -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,    -1,
+     260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,   269,
+      -1,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,   279,
+     280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,    -1,   315,   316,   317,    -1,   319,
+     320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,    -1,
+     330,   331,   332,   333,   334,   335,    -1,    -1,   338,   339,
+      -1,   341,    -1,   343,    -1,   345,   346,   347,   348,   349,
+     350,   351,   352,   353,    -1,    -1,   356,   357,    -1,    -1,
+     360,   361,   362,   363,   364,    -1,    -1,    -1,   368,   369,
+      -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,   379,
+     380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,   399,
+      -1,   401,   402,   403,   404,   405,   406,   407,   408,   409,
+     410,    -1,   412,    -1,   414,   415,   416,    -1,   418,    -1,
+     420,   421,   422,   423,   424,    -1,   426,   427,   428,    -1,
+      -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,   439,
+      -1,    -1,   442,   443,   444,   445,   446,    -1,   448,   449,
+      -1,   451,   452,   453,    -1,    -1,   456,   457,   458,   459,
+     460,   461,   462,   463,    -1,   465,    -1,   467,   468,    -1,
+     470,   471,   472,    -1,   474,    -1,    -1,   477,   478,   479,
+     480,    -1,   482,    -1,   484,   485,   486,   487,   488,    -1,
+     490,   491,    -1,    -1,    -1,   495,   496,   497,   498,    -1,
+      -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,   509,
+     510,   511,    -1,   513,   514,   515,   516,   517,    -1,    -1,
+      -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,    -1,
+     530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,   539,
+     540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,   549,
+     550,   551,   552,   553,   554,    -1,    -1,   557,   558,   559,
+     560,    -1,   562,   563,    -1,    -1,   566,   567,   568,   569,
+      -1,    -1,   572,   573,    -1,   575,   576,   577,   578,    -1,
+      -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,   589,
+     590,   591,    -1,    -1,   594,   595,    -1,   597,   598,    -1,
+     600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,   609,
+      -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,    -1,
+     620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,   629,
+     630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,   639,
+     640,   641,    -1,   643,   644,   645,   646,    -1,    -1,   649,
+      -1,    -1,   652,   653,   654,   655,   656,    -1,   658,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,   669,
+      -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,    -1,
+     680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,    -1,
+      -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,    -1,
+     700,   701,   702,   703,   704,   705,   706,   707,    -1,   709,
+     710,   711,   712,   713,   714,   715,   716,   717,   718,    -1,
+     720,   721,   722,   723,   724,   725,   726,   727,   728,   729,
+     730,   731,   732,   733,   734,   735,   736,   737,   738,   739,
+     740,   741,   742,   743,    -1,   745,   746,   747,   748,   749,
+     750,   751,    -1,   753,   754,   755,   756,   757,   758,   759,
+     760,   761,   762,   763,   764,   765,   766,   767,   768,   769,
+     770,   771,   772,   773,   774,   775,   776,   777,   778,   779,
+     780,   781,   782,   783,   784,   785,   786,   787,   788,   789,
+     790,   791,   792,   793,     5,     6,    -1,     8,     9,    10,
+      11,    12,    -1,    -1,    15,    -1,    -1,    -1,    -1,    20,
+      -1,   811,    23,    -1,    25,    26,    27,    28,    29,    30,
+      -1,    32,    -1,    -1,    -1,    36,    -1,    -1,    -1,    40,
+      -1,    -1,    43,    44,    45,    -1,    47,    -1,    49,    50,
+      -1,    -1,    53,    -1,    -1,    56,    57,    -1,    59,    60,
+      61,    -1,    63,    -1,    65,    66,    67,    68,    69,    70,
+      -1,    72,    73,    -1,    75,    76,    77,    78,    79,    80,
+      81,    82,    83,    84,    85,    -1,    87,    88,    -1,    90,
+      91,    92,    93,    94,    -1,    -1,    -1,    98,    -1,    -1,
+      -1,    -1,   103,    -1,    -1,   106,    -1,    -1,    -1,   110,
+     111,   112,    -1,    -1,   115,    -1,    -1,    -1,    -1,   120,
+     121,    -1,    -1,    -1,    -1,   126,   127,    -1,   129,    -1,
+      -1,    -1,    -1,    -1,   135,   136,   137,   138,   139,    -1,
+      -1,    -1,   143,    -1,    -1,   146,   147,   148,    -1,    -1,
+      -1,   152,    -1,   154,   155,    -1,   157,   158,   159,    -1,
+      -1,   162,   163,    -1,   165,   166,   167,   168,   169,   170,
+      -1,    -1,   173,   174,   175,   176,   177,    -1,    -1,   180,
+     181,    -1,   183,   184,   185,   186,   187,    -1,    -1,   190,
+     191,    -1,    -1,    -1,   195,   196,    -1,   198,    -1,    -1,
+      -1,   202,    -1,   204,   205,   206,   207,    -1,   209,    -1,
+     211,    -1,    -1,    -1,   215,   216,    -1,   218,    -1,    -1,
+     221,   222,    -1,    -1,    -1,   226,   227,   228,   229,    -1,
+      -1,   232,   233,   234,    -1,    -1,   237,    -1,    -1,    -1,
+      -1,   242,   243,   244,    -1,    -1,    -1,   248,    -1,    -1,
+      -1,   252,   253,    -1,   255,   256,    -1,    -1,    -1,   260,
+      -1,   262,    -1,    -1,   265,   266,    -1,    -1,   269,    -1,
+      -1,   272,   273,   274,    -1,    -1,    -1,    -1,   279,   280,
+      -1,   282,    -1,   284,    -1,   286,   287,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   295,    -1,   297,   298,   299,   300,
+     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
+     311,   312,   313,    -1,   315,   316,   317,    -1,   319,   320,
+     321,   322,    -1,   324,   325,    -1,    -1,    -1,    -1,   330,
+     331,   332,   333,   334,   335,    -1,    -1,   338,   339,    -1,
+     341,    -1,   343,    -1,   345,   346,   347,   348,   349,   350,
+     351,   352,   353,    -1,    -1,   356,   357,    -1,    -1,   360,
+     361,   362,   363,   364,    -1,    -1,    -1,   368,   369,    -1,
+      -1,    -1,   373,    -1,   375,   376,    -1,   378,   379,   380,
+      -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   393,   394,   395,    -1,   397,    -1,   399,    -1,
+     401,   402,   403,   404,   405,   406,   407,   408,   409,   410,
+      -1,   412,    -1,   414,   415,   416,    -1,   418,    -1,   420,
+     421,   422,   423,   424,    -1,   426,   427,   428,    -1,    -1,
+     431,    -1,    -1,    -1,   435,   436,    -1,   438,   439,    -1,
+      -1,   442,   443,   444,   445,   446,    -1,   448,   449,    -1,
+     451,   452,   453,    -1,    -1,   456,   457,   458,   459,   460,
+     461,   462,   463,    -1,   465,    -1,   467,   468,    -1,   470,
+     471,   472,    -1,   474,    -1,    -1,   477,   478,   479,   480,
+      -1,   482,    -1,   484,   485,   486,   487,   488,    -1,   490,
+     491,    -1,    -1,    -1,   495,   496,   497,   498,    -1,    -1,
+      -1,   502,    -1,    -1,    -1,   506,    -1,   508,   509,   510,
+     511,    -1,   513,   514,   515,   516,   517,    -1,    -1,    -1,
+      -1,    -1,   523,   524,   525,    -1,   527,    -1,    -1,   530,
+      -1,    -1,   533,    -1,   535,    -1,   537,   538,   539,   540,
+     541,   542,    -1,    -1,   545,   546,    -1,    -1,   549,   550,
+     551,   552,   553,   554,    -1,    -1,   557,   558,   559,   560,
+      -1,   562,   563,    -1,    -1,   566,   567,   568,   569,    -1,
+     571,   572,   573,    -1,   575,   576,   577,   578,    -1,    -1,
+      -1,    -1,    -1,   584,   585,    -1,    -1,    -1,   589,   590,
+     591,    -1,    -1,   594,   595,    -1,   597,   598,    -1,   600,
+     601,    -1,    -1,   604,    -1,    -1,   607,    -1,   609,    -1,
+     611,   612,    -1,    -1,    -1,    -1,    -1,   618,    -1,   620,
+      -1,    -1,   623,    -1,    -1,    -1,   627,    -1,   629,   630,
+     631,   632,    -1,    -1,    -1,    -1,    -1,    -1,   639,   640,
+     641,    -1,   643,   644,   645,   646,    -1,    -1,   649,    -1,
+      -1,   652,   653,   654,   655,   656,    -1,   658,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   667,   668,   669,    -1,
+     671,   672,   673,    -1,   675,    -1,    -1,   678,    -1,   680,
+      -1,    -1,    -1,    -1,    -1,    -1,   687,   688,    -1,    -1,
+     691,    -1,   693,    -1,   695,   696,    -1,    -1,    -1,   700,
+     701,   702,   703,   704,   705,   706,   707,    -1,   709,   710,
+     711,   712,   713,   714,   715,   716,   717,   718,    -1,   720,
+     721,   722,   723,   724,   725,   726,   727,   728,   729,   730,
+     731,   732,   733,   734,   735,   736,   737,   738,   739,   740,
+     741,   742,   743,    -1,   745,   746,   747,   748,   749,   750,
+     751,    -1,   753,   754,   755,   756,   757,   758,   759,   760,
+     761,   762,   763,   764,   765,   766,   767,   768,   769,   770,
+     771,   772,   773,   774,   775,   776,   777,   778,   779,   780,
+     781,   782,   783,   784,   785,   786,   787,   788,   789,   790,
+     791,   792,   793,     5,     6,    -1,     8,     9,    10,    11,
+      12,    -1,    -1,    15,    -1,    -1,    -1,    -1,    20,    -1,
+     811,    23,    -1,    25,    26,    27,    28,    29,    30,    -1,
+      32,    -1,    -1,    -1,    36,    -1,    -1,    -1,    40,    -1,
+      -1,    43,    44,    45,    -1,    47,    -1,    49,    50,    -1,
+      -1,    53,    -1,    -1,    56,    57,    -1,    59,    60,    61,
+      -1,    63,    -1,    65,    66,    67,    68,    69,    70,    -1,
+      72,    73,    -1,    75,    76,    77,    78,    79,    80,    81,
+      82,    83,    84,    85,    86,    87,    88,    -1,    90,    91,
+      92,    93,    94,    -1,    -1,    -1,    98,    -1,    -1,    -1,
+      -1,   103,    -1,    -1,   106,    -1,    -1,    -1,   110,   111,
+     112,    -1,    -1,   115,    -1,    -1,    -1,    -1,   120,   121,
+      -1,    -1,    -1,    -1,   126,   127,    -1,   129,    -1,    -1,
+      -1,    -1,    -1,   135,   136,   137,   138,   139,    -1,    -1,
+      -1,   143,    -1,    -1,   146,   147,   148,    -1,    -1,    -1,
+     152,    -1,   154,   155,    -1,   157,   158,   159,    -1,    -1,
+     162,   163,    -1,   165,   166,   167,   168,   169,   170,    -1,
+      -1,   173,   174,   175,   176,   177,    -1,    -1,   180,   181,
+      -1,   183,   184,   185,   186,   187,    -1,    -1,   190,   191,
+      -1,    -1,    -1,   195,   196,    -1,   198,    -1,    -1,    -1,
+     202,    -1,   204,   205,   206,   207,    -1,   209,    -1,   211,
+      -1,    -1,    -1,   215,   216,    -1,   218,    -1,    -1,   221,
+     222,    -1,    -1,    -1,   226,   227,   228,   229,    -1,    -1,
+     232,   233,   234,    -1,    -1,   237,    -1,    -1,    -1,    -1,
+     242,   243,   244,    -1,    -1,    -1,   248,    -1,    -1,    -1,
+     252,   253,    -1,   255,   256,    -1,    -1,    -1,   260,    -1,
+     262,    -1,    -1,   265,   266,    -1,    -1,   269,    -1,    -1,
+     272,   273,    -1,    -1,    -1,    -1,    -1,   279,   280,    -1,
+     282,    -1,   284,    -1,   286,   287,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   295,    -1,   297,   298,   299,   300,   301,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,   313,    -1,   315,   316,   317,    -1,   319,   320,   321,
+     322,    -1,   324,   325,    -1,    -1,    -1,    -1,   330,   331,
+     332,   333,   334,   335,    -1,    -1,   338,   339,    -1,   341,
+      -1,   343,    -1,   345,   346,   347,   348,   349,   350,   351,
+     352,   353,    -1,    -1,   356,   357,    -1,    -1,   360,   361,
+     362,   363,   364,    -1,    -1,    -1,   368,   369,    -1,    -1,
+      -1,   373,    -1,   375,   376,    -1,   378,   379,   380,    -1,
+      -1,   383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   393,   394,   395,    -1,   397,    -1,   399,    -1,   401,
+     402,   403,   404,   405,   406,   407,   408,   409,   410,    -1,
+     412,    -1,   414,   415,   416,    -1,   418,    -1,   420,   421,
+     422,   423,   424,    -1,   426,   427,   428,    -1,    -1,   431,
+      -1,    -1,    -1,   435,   436,    -1,   438,   439,    -1,    -1,
+     442,   443,   444,   445,   446,    -1,   448,   449,    -1,   451,
+     452,   453,    -1,    -1,   456,   457,   458,   459,   460,   461,
+     462,   463,    -1,   465,    -1,   467,   468,    -1,   470,   471,
+     472,    -1,   474,    -1,    -1,   477,   478,   479,   480,    -1,
+     482,    -1,   484,   485,   486,   487,   488,    -1,   490,   491,
+      -1,    -1,    -1,   495,   496,   497,   498,    -1,    -1,    -1,
+     502,    -1,    -1,    -1,   506,    -1,   508,   509,   510,   511,
+      -1,   513,   514,   515,   516,   517,    -1,    -1,    -1,    -1,
+      -1,   523,   524,   525,    -1,   527,    -1,    -1,   530,    -1,
+      -1,   533,    -1,   535,    -1,   537,   538,   539,   540,   541,
+     542,    -1,    -1,   545,   546,    -1,    -1,   549,   550,   551,
+     552,   553,   554,    -1,    -1,   557,   558,   559,   560,    -1,
+     562,   563,    -1,    -1,   566,   567,   568,   569,    -1,    -1,
+     572,   573,    -1,   575,   576,   577,   578,    -1,    -1,    -1,
+      -1,    -1,   584,   585,    -1,    -1,    -1,   589,   590,   591,
+      -1,    -1,   594,   595,    -1,   597,   598,    -1,   600,   601,
+      -1,    -1,   604,    -1,    -1,   607,    -1,   609,    -1,   611,
+     612,    -1,    -1,    -1,    -1,    -1,   618,    -1,   620,    -1,
+      -1,   623,    -1,    -1,    -1,   627,    -1,   629,   630,   631,
+     632,    -1,    -1,    -1,    -1,    -1,    -1,   639,   640,   641,
+      -1,   643,   644,   645,   646,    -1,    -1,   649,    -1,    -1,
+     652,   653,   654,   655,   656,    -1,   658,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   667,   668,   669,    -1,   671,
+     672,   673,    -1,   675,    -1,    -1,   678,    -1,   680,    -1,
+      -1,    -1,    -1,    -1,    -1,   687,   688,    -1,    -1,   691,
+      -1,   693,    -1,   695,   696,    -1,    -1,    -1,   700,   701,
+     702,   703,   704,   705,   706,   707,    -1,   709,   710,   711,
+     712,   713,   714,   715,   716,   717,   718,    -1,   720,   721,
+     722,   723,   724,   725,   726,   727,   728,   729,   730,   731,
+     732,   733,   734,   735,   736,   737,   738,   739,   740,   741,
+     742,   743,    -1,   745,   746,   747,   748,   749,   750,   751,
+      -1,   753,   754,   755,   756,   757,   758,   759,   760,   761,
+     762,   763,   764,   765,   766,   767,   768,   769,   770,   771,
+     772,   773,   774,   775,   776,   777,   778,   779,   780,   781,
+     782,   783,   784,   785,   786,   787,   788,   789,   790,   791,
+     792,   793,     5,     6,    -1,     8,     9,    10,    11,    12,
+      -1,    -1,    15,    -1,    -1,    -1,    -1,    20,    -1,   811,
+      23,    -1,    25,    26,    27,    28,    29,    30,    -1,    32,
+      -1,    -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,
+      43,    44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,
+      53,    -1,    -1,    56,    57,    -1,    59,    60,    61,    -1,
+      63,    -1,    65,    66,    67,    68,    69,    70,    -1,    72,
+      73,    -1,    75,    76,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    -1,    87,    88,    -1,    90,    91,    92,
+      93,    94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,
+     103,    -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,
+      -1,    -1,   115,    -1,    -1,    -1,    -1,   120,   121,    -1,
+      -1,    -1,    -1,   126,   127,    -1,   129,    -1,    -1,    -1,
+      -1,    -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,
+     143,    -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,
+      -1,   154,   155,    -1,   157,   158,   159,    -1,    -1,   162,
+     163,    -1,   165,   166,   167,   168,   169,   170,    -1,    -1,
+     173,   174,   175,   176,   177,    -1,    -1,   180,   181,    -1,
+     183,   184,   185,   186,   187,    -1,    -1,   190,   191,    -1,
+      -1,    -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,
+      -1,   204,   205,   206,   207,    -1,   209,    -1,   211,    -1,
+      -1,    -1,   215,   216,    -1,   218,    -1,    -1,   221,   222,
+      -1,    -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,
+     233,   234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,
+     243,   244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,
+     253,    -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,
+      -1,    -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,
+     273,    -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,
+      -1,   284,    -1,   286,   287,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   295,    -1,   297,   298,   299,   300,   301,   302,
+     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
+     313,    -1,   315,   316,   317,    -1,   319,   320,   321,   322,
+      -1,   324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,
+     333,   334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,
+     343,    -1,   345,   346,   347,   348,   349,   350,   351,   352,
+     353,    -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,
+     363,   364,    -1,    -1,    -1,   368,   369,    -1,    -1,    -1,
+     373,    -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,
+     383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     393,   394,   395,    -1,   397,    -1,   399,    -1,   401,   402,
+     403,   404,   405,   406,   407,   408,   409,   410,    -1,   412,
+      -1,   414,   415,   416,    -1,   418,    -1,   420,   421,   422,
+     423,   424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,
+      -1,    -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,
+     443,   444,   445,   446,    -1,   448,   449,    -1,   451,   452,
+     453,    -1,    -1,   456,   457,   458,   459,   460,   461,   462,
+     463,    -1,   465,    -1,   467,   468,    -1,   470,   471,   472,
+      -1,   474,    -1,    -1,   477,   478,   479,   480,    -1,   482,
+      -1,   484,   485,   486,   487,   488,    -1,   490,   491,    -1,
+      -1,    -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,
+      -1,    -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,
+     513,   514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,
+     523,   524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,
+     533,    -1,   535,    -1,   537,   538,   539,   540,   541,   542,
+      -1,    -1,   545,   546,    -1,    -1,   549,   550,   551,   552,
+     553,   554,    -1,    -1,   557,   558,   559,   560,    -1,   562,
+     563,    -1,    -1,   566,   567,   568,   569,    -1,    -1,   572,
+     573,    -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,
+      -1,   584,   585,    -1,    -1,    -1,   589,   590,   591,    -1,
+      -1,   594,   595,    -1,   597,   598,    -1,   600,   601,    -1,
+      -1,   604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,
+      -1,    -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,
+     623,    -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,
+      -1,    -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,
+     643,   644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,
+     653,   654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,
+     673,    -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,
+      -1,    -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,
+     693,    -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,
+     703,   704,   705,   706,   707,    -1,   709,   710,   711,   712,
+     713,   714,   715,   716,   717,   718,    -1,   720,   721,   722,
+     723,   724,   725,   726,   727,   728,   729,   730,   731,   732,
+     733,   734,   735,   736,   737,   738,   739,   740,   741,   742,
+     743,    -1,   745,   746,   747,   748,   749,   750,   751,    -1,
+     753,   754,   755,   756,   757,   758,   759,   760,   761,   762,
+     763,   764,   765,   766,   767,   768,   769,   770,   771,   772,
+     773,   774,   775,   776,   777,   778,   779,   780,   781,   782,
+     783,   784,   785,   786,   787,   788,   789,   790,   791,   792,
+     793,     5,     6,    -1,     8,     9,    10,    11,    12,    -1,
+      -1,    15,    -1,    -1,    -1,   808,    20,    -1,   811,    23,
+      -1,    25,    26,    27,    28,    29,    30,    -1,    32,    -1,
+      -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,
+      44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,
+      -1,    -1,    56,    57,    -1,    59,    60,    61,    -1,    63,
+      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
+      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
+      84,    85,    -1,    87,    88,    -1,    90,    91,    92,    93,
+      94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,
+      -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,
+      -1,   115,    -1,    -1,    -1,    -1,   120,   121,    -1,    -1,
+      -1,    -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,
+      -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,   143,
+      -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,
+     154,   155,    -1,   157,   158,   159,    -1,    -1,   162,   163,
+      -1,   165,   166,   167,   168,   169,   170,    -1,    -1,   173,
+     174,   175,   176,   177,    -1,    -1,   180,   181,    -1,   183,
+     184,   185,   186,   187,    -1,    -1,   190,   191,    -1,    -1,
+      -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,
+     204,   205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,
+      -1,   215,   216,    -1,   218,    -1,    -1,   221,   222,    -1,
+      -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,   233,
+     234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,
+     244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,
+      -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,
+      -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,
+      -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,
+     284,    -1,   286,   287,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   295,    -1,   297,   298,   299,   300,   301,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
+      -1,   315,   316,   317,    -1,   319,   320,   321,   322,    -1,
+     324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,
+     334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,
+      -1,   345,   346,   347,   348,   349,   350,   351,   352,   353,
+      -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,   363,
+     364,    -1,    -1,    -1,   368,   369,    -1,    -1,    -1,   373,
+      -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,   383,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,
+     394,   395,    -1,   397,    -1,   399,    -1,   401,   402,   403,
+     404,   405,   406,   407,   408,   409,   410,    -1,   412,    -1,
+     414,   415,   416,    -1,   418,    -1,   420,   421,   422,   423,
+     424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,
+      -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,   443,
+     444,   445,   446,    -1,   448,   449,    -1,   451,   452,   453,
+      -1,    -1,   456,   457,   458,   459,   460,   461,   462,   463,
+      -1,   465,    -1,   467,   468,    -1,   470,   471,   472,    -1,
+     474,    -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,
+     484,   485,   486,   487,   488,    -1,   490,   491,    -1,    -1,
+      -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,
+      -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,   513,
+     514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,
+     524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,
+      -1,   535,    -1,   537,   538,   539,   540,   541,   542,    -1,
+      -1,   545,   546,    -1,    -1,   549,   550,   551,   552,   553,
+     554,    -1,    -1,   557,   558,   559,   560,    -1,   562,   563,
+      -1,    -1,   566,   567,   568,   569,    -1,    -1,   572,   573,
+      -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,
+     584,   585,    -1,    -1,    -1,   589,   590,   591,    -1,    -1,
+     594,   595,    -1,   597,   598,    -1,   600,   601,    -1,    -1,
+     604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,
+      -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,
+      -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,
+      -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,
+     644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,
+     654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,   673,
+      -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,
+      -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,
+      -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,   703,
+     704,   705,   706,   707,    -1,   709,   710,   711,   712,   713,
+     714,   715,   716,   717,   718,    -1,   720,   721,   722,   723,
+     724,   725,   726,   727,   728,   729,   730,   731,   732,   733,
+     734,   735,   736,   737,   738,   739,   740,   741,   742,   743,
+      -1,   745,   746,   747,   748,   749,   750,   751,    -1,   753,
+     754,   755,   756,   757,   758,   759,   760,   761,   762,   763,
+     764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
+     774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
+     784,   785,   786,   787,   788,   789,   790,   791,   792,   793,
+       5,     6,    -1,     8,     9,    10,    11,    12,    -1,    -1,
+      15,    -1,    -1,    -1,    -1,    20,    -1,   811,    23,    -1,
+      25,    26,    27,    28,    29,    30,    -1,    32,    -1,    -1,
+      -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,    44,
+      45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,    -1,
+      -1,    56,    57,    -1,    59,    60,    61,    -1,    63,    -1,
+      65,    66,    67,    68,    69,    70,    -1,    72,    73,    -1,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    -1,    87,    88,    -1,    90,    91,    92,    93,    94,
+      -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,    -1,
+      -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,    -1,
+     115,    -1,    -1,    -1,    -1,   120,   121,    -1,    -1,    -1,
+      -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,    -1,
+     135,   136,   137,   138,   139,    -1,    -1,    -1,   143,    -1,
+      -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,   154,
+     155,    -1,   157,   158,   159,    -1,    -1,   162,   163,    -1,
+     165,   166,   167,   168,   169,   170,    -1,    -1,   173,   174,
+     175,   176,   177,    -1,    -1,   180,   181,    -1,   183,   184,
+     185,   186,   187,    -1,    -1,   190,   191,    -1,    -1,    -1,
+     195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,   204,
+     205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,    -1,
+     215,   216,    -1,   218,    -1,    -1,   221,   222,    -1,    -1,
+      -1,   226,   227,   228,   229,    -1,    -1,   232,   233,   234,
+      -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,   244,
+      -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,    -1,
+     255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,    -1,
+     265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,    -1,
+      -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,   284,
+      -1,   286,   287,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     295,    -1,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,    -1,
+     315,   316,   317,    -1,   319,   320,   321,   322,    -1,   324,
+     325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,   334,
+     335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,    -1,
+     345,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
+      -1,   356,   357,    -1,    -1,   360,   361,   362,   363,   364,
+      -1,    -1,    -1,   368,   369,    -1,    -1,    -1,   373,    -1,
+     375,   376,    -1,   378,   379,   380,    -1,    -1,   383,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,   394,
+     395,    -1,   397,    -1,   399,    -1,   401,   402,   403,   404,
+     405,   406,   407,   408,   409,   410,    -1,   412,    -1,   414,
+     415,   416,    -1,   418,    -1,   420,   421,   422,   423,   424,
+      -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,    -1,
+     435,   436,    -1,   438,   439,    -1,    -1,   442,   443,   444,
+     445,   446,    -1,   448,   449,    -1,   451,   452,   453,    -1,
+      -1,   456,   457,   458,   459,   460,   461,   462,   463,    -1,
+     465,    -1,   467,   468,    -1,   470,   471,   472,    -1,   474,
+      -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,   484,
+     485,   486,   487,   488,    -1,   490,   491,    -1,    -1,    -1,
+     495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,    -1,
+      -1,   506,    -1,   508,   509,   510,   511,    -1,   513,   514,
+     515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,   524,
+     525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,    -1,
+     535,    -1,   537,   538,   539,   540,   541,   542,    -1,    -1,
+     545,   546,    -1,    -1,   549,   550,   551,   552,   553,   554,
+      -1,    -1,   557,   558,   559,   560,    -1,   562,   563,    -1,
+      -1,   566,   567,   568,   569,    -1,    -1,   572,   573,    -1,
+     575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,   584,
+     585,    -1,    -1,    -1,   589,   590,   591,    -1,    -1,   594,
+     595,    -1,   597,   598,    -1,   600,   601,    -1,    -1,   604,
+      -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,    -1,
+      -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,    -1,
+      -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,    -1,
+      -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,   644,
+     645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,   654,
+     655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   667,   668,   669,    -1,   671,   672,   673,    -1,
+     675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,    -1,
+      -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,    -1,
+     695,   696,    -1,    -1,    -1,   700,   701,   702,   703,   704,
+     705,   706,   707,    -1,   709,   710,   711,   712,   713,   714,
+     715,   716,   717,   718,    -1,   720,   721,   722,   723,   724,
+     725,   726,   727,   728,   729,   730,   731,   732,   733,   734,
+     735,   736,   737,   738,   739,   740,   741,   742,   743,    -1,
+     745,   746,   747,   748,   749,   750,   751,    -1,   753,   754,
+     755,   756,   757,   758,   759,   760,   761,   762,   763,   764,
+     765,   766,   767,   768,   769,   770,   771,   772,   773,   774,
+     775,   776,   777,   778,   779,   780,   781,   782,   783,   784,
+     785,   786,   787,   788,   789,   790,   791,   792,   793,     5,
+       6,    -1,     8,     9,    10,    11,    12,    -1,    -1,    15,
+      -1,    -1,    -1,    -1,    20,    -1,   811,    23,    -1,    25,
+      26,    27,    28,    29,    30,    -1,    32,    -1,    -1,    -1,
+      36,    -1,    -1,    -1,    40,    -1,    -1,    43,    44,    45,
+      -1,    47,    -1,    49,    50,    -1,    -1,    53,    -1,    -1,
+      56,    57,    -1,    59,    60,    61,    -1,    63,    -1,    65,
+      66,    67,    68,    69,    70,    -1,    72,    73,    -1,    75,
+      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
+      -1,    87,    88,    -1,    90,    91,    92,    93,    94,    -1,
+      -1,    -1,    98,    -1,    -1,    -1,    -1,   103,    -1,    -1,
+     106,    -1,    -1,    -1,   110,   111,   112,    -1,    -1,   115,
+      -1,    -1,    -1,    -1,   120,   121,    -1,    -1,    -1,    -1,
+     126,   127,    -1,   129,    -1,    -1,    -1,    -1,    -1,   135,
+     136,   137,   138,   139,    -1,    -1,    -1,   143,    -1,    -1,
+     146,   147,   148,    -1,    -1,    -1,   152,    -1,   154,   155,
+      -1,   157,   158,   159,    -1,    -1,   162,   163,    -1,   165,
+     166,   167,   168,   169,   170,    -1,    -1,   173,   174,   175,
+     176,   177,    -1,    -1,   180,   181,    -1,   183,   184,   185,
+     186,   187,    -1,    -1,   190,   191,    -1,    -1,    -1,   195,
+     196,    -1,   198,    -1,    -1,    -1,   202,    -1,   204,   205,
+     206,   207,    -1,   209,    -1,   211,    -1,    -1,    -1,   215,
+     216,    -1,   218,    -1,    -1,   221,   222,    -1,    -1,    -1,
+     226,   227,   228,   229,    -1,    -1,   232,   233,   234,    -1,
+      -1,   237,    -1,    -1,    -1,    -1,   242,   243,   244,    -1,
+      -1,    -1,   248,    -1,    -1,    -1,   252,   253,    -1,   255,
+     256,    -1,    -1,    -1,   260,    -1,   262,    -1,    -1,   265,
+     266,    -1,    -1,   269,    -1,    -1,   272,   273,    -1,    -1,
+      -1,    -1,    -1,   279,   280,    -1,   282,    -1,   284,    -1,
+     286,   287,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   295,
+      -1,   297,   298,   299,   300,   301,   302,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,   312,   313,    -1,   315,
+     316,   317,    -1,   319,   320,   321,   322,    -1,   324,   325,
+      -1,    -1,    -1,    -1,   330,   331,   332,   333,   334,   335,
+      -1,    -1,   338,   339,    -1,   341,    -1,   343,    -1,   345,
+     346,   347,   348,   349,   350,   351,   352,   353,    -1,    -1,
+     356,   357,    -1,    -1,   360,   361,   362,   363,   364,    -1,
+      -1,    -1,   368,   369,    -1,    -1,    -1,   373,    -1,   375,
+     376,    -1,   378,   379,   380,    -1,    -1,   383,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,   394,   395,
+      -1,   397,    -1,   399,    -1,   401,   402,   403,   404,   405,
+     406,   407,   408,   409,   410,    -1,   412,    -1,   414,   415,
+     416,    -1,   418,    -1,   420,   421,   422,   423,   424,    -1,
+     426,   427,   428,    -1,    -1,   431,    -1,    -1,    -1,   435,
+     436,    -1,   438,   439,    -1,    -1,   442,   443,   444,   445,
+     446,    -1,   448,   449,    -1,   451,   452,   453,    -1,    -1,
+     456,   457,   458,   459,   460,   461,   462,   463,    -1,   465,
+      -1,   467,   468,    -1,   470,   471,   472,    -1,   474,    -1,
+      -1,   477,   478,   479,   480,    -1,   482,    -1,   484,   485,
+     486,   487,   488,    -1,   490,   491,   492,    -1,    -1,   495,
+     496,   497,   498,    -1,    -1,    -1,   502,    -1,    -1,    -1,
+     506,    -1,   508,   509,   510,   511,    -1,   513,   514,   515,
+     516,   517,    -1,    -1,    -1,    -1,    -1,   523,   524,   525,
+      -1,   527,    -1,    -1,   530,    -1,    -1,   533,    -1,   535,
+      -1,   537,   538,   539,   540,   541,   542,    -1,    -1,   545,
+     546,    -1,    -1,   549,   550,   551,   552,   553,   554,    -1,
+      -1,   557,   558,   559,   560,    -1,   562,   563,    -1,   565,
+     566,   567,   568,   569,    -1,    -1,   572,   573,    -1,   575,
+     576,   577,   578,    -1,    -1,    -1,    -1,    -1,   584,   585,
+      -1,    -1,    -1,   589,   590,   591,    -1,    -1,   594,   595,
+      -1,   597,   598,    -1,   600,   601,    -1,    -1,   604,    -1,
+      -1,   607,    -1,   609,    -1,   611,   612,    -1,    -1,    -1,
+      -1,    -1,   618,   619,   620,    -1,    -1,   623,    -1,    -1,
+      -1,   627,    -1,   629,   630,   631,   632,    -1,    -1,    -1,
+     636,    -1,    -1,   639,   640,   641,    -1,   643,   644,   645,
+     646,    -1,    -1,   649,    -1,    -1,   652,   653,   654,   655,
+     656,    -1,   658,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   667,   668,   669,    -1,   671,   672,   673,    -1,   675,
+      -1,    -1,   678,    -1,   680,    -1,    -1,    -1,    -1,    -1,
+      -1,   687,   688,    -1,    -1,   691,    -1,   693,    -1,   695,
+     696,    -1,    -1,    -1,   700,   701,   702,   703,   704,   705,
+     706,   707,    -1,   709,   710,   711,   712,   713,   714,   715,
+     716,   717,   718,    -1,   720,   721,   722,   723,   724,   725,
+     726,   727,   728,   729,   730,   731,   732,   733,   734,   735,
+     736,   737,   738,   739,   740,   741,   742,   743,    -1,   745,
+     746,   747,   748,   749,   750,   751,    -1,   753,   754,   755,
+     756,   757,   758,   759,   760,   761,   762,   763,   764,   765,
+     766,   767,   768,   769,   770,   771,   772,   773,   774,   775,
+     776,   777,   778,   779,   780,   781,   782,   783,   784,   785,
+     786,   787,   788,   789,   790,   791,   792,   793,     5,     6,
+      -1,     8,     9,    10,    11,    12,    -1,    -1,    15,    -1,
+      -1,   807,   808,    20,    -1,    -1,    23,    -1,    25,    26,
+      27,    28,    29,    30,    -1,    32,    -1,    -1,    -1,    36,
+      -1,    -1,    -1,    40,    -1,    -1,    43,    44,    45,    -1,
+      47,    -1,    49,    50,    -1,    -1,    53,    -1,    -1,    56,
+      57,    -1,    59,    60,    61,    -1,    63,    -1,    65,    66,
+      67,    68,    69,    70,    -1,    72,    73,    -1,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    -1,
+      87,    88,    -1,    90,    91,    92,    93,    94,    -1,    -1,
+      -1,    98,    -1,    -1,    -1,    -1,   103,    -1,    -1,   106,
+      -1,    -1,    -1,   110,   111,   112,    -1,    -1,   115,    -1,
+      -1,    -1,    -1,   120,   121,    -1,    -1,    -1,    -1,   126,
+     127,    -1,   129,    -1,    -1,    -1,    -1,    -1,   135,   136,
+     137,   138,   139,    -1,    -1,    -1,   143,    -1,    -1,   146,
+     147,   148,    -1,    -1,    -1,   152,    -1,   154,   155,    -1,
+     157,   158,   159,    -1,    -1,   162,   163,    -1,   165,   166,
+     167,   168,   169,   170,    -1,    -1,   173,   174,   175,   176,
+     177,    -1,    -1,   180,   181,    -1,   183,   184,   185,   186,
+     187,    -1,    -1,   190,   191,    -1,    -1,    -1,   195,   196,
+      -1,   198,    -1,    -1,    -1,   202,    -1,   204,   205,   206,
+     207,    -1,   209,    -1,   211,    -1,    -1,    -1,   215,   216,
+      -1,   218,    -1,    -1,   221,   222,    -1,    -1,    -1,   226,
+     227,   228,   229,    -1,    -1,   232,   233,   234,    -1,    -1,
+     237,    -1,    -1,    -1,    -1,   242,   243,   244,    -1,    -1,
+      -1,   248,    -1,    -1,    -1,   252,   253,    -1,   255,   256,
+      -1,    -1,    -1,   260,    -1,   262,    -1,    -1,   265,   266,
+      -1,    -1,   269,    -1,    -1,   272,   273,    -1,    -1,    -1,
+      -1,    -1,   279,   280,    -1,   282,    -1,   284,    -1,   286,
+     287,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,
+     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,   313,    -1,   315,   316,
+     317,    -1,   319,   320,   321,   322,    -1,   324,   325,    -1,
+      -1,    -1,    -1,   330,   331,   332,   333,   334,   335,    -1,
+      -1,   338,   339,    -1,   341,    -1,   343,    -1,   345,   346,
+     347,   348,   349,   350,   351,   352,   353,    -1,    -1,   356,
+     357,    -1,    -1,   360,   361,   362,   363,   364,    -1,    -1,
+      -1,   368,   369,    -1,    -1,    -1,   373,    -1,   375,   376,
+      -1,   378,   379,   380,    -1,    -1,   383,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   393,   394,   395,    -1,
+     397,    -1,   399,    -1,   401,   402,   403,   404,   405,   406,
+     407,   408,   409,   410,    -1,   412,    -1,   414,   415,   416,
+      -1,   418,    -1,   420,   421,   422,   423,   424,    -1,   426,
+     427,   428,    -1,    -1,   431,    -1,    -1,    -1,   435,   436,
+      -1,   438,   439,    -1,    -1,   442,   443,   444,   445,   446,
+      -1,   448,   449,    -1,   451,   452,   453,    -1,    -1,   456,
+     457,   458,   459,   460,   461,   462,   463,    -1,   465,    -1,
+     467,   468,    -1,   470,   471,   472,    -1,   474,    -1,    -1,
+     477,   478,   479,   480,    -1,   482,    -1,   484,   485,   486,
+     487,   488,    -1,   490,   491,    -1,    -1,    -1,   495,   496,
+     497,   498,    -1,    -1,    -1,   502,    -1,    -1,    -1,   506,
+      -1,   508,   509,   510,   511,    -1,   513,   514,   515,   516,
+     517,    -1,    -1,    -1,    -1,    -1,   523,   524,   525,    -1,
+     527,    -1,    -1,   530,    -1,    -1,   533,    -1,   535,    -1,
+     537,   538,   539,   540,   541,   542,    -1,    -1,   545,   546,
+      -1,    -1,   549,   550,   551,   552,   553,   554,    -1,    -1,
+     557,   558,   559,   560,    -1,   562,   563,    -1,    -1,   566,
+     567,   568,   569,    -1,    -1,   572,   573,    -1,   575,   576,
+     577,   578,    -1,    -1,    -1,    -1,    -1,   584,   585,    -1,
+      -1,    -1,   589,   590,   591,    -1,    -1,   594,   595,    -1,
+     597,   598,    -1,   600,   601,    -1,    -1,   604,    -1,    -1,
+     607,    -1,   609,    -1,   611,   612,    -1,    -1,    -1,    -1,
+      -1,   618,    -1,   620,    -1,    -1,   623,    -1,    -1,    -1,
+     627,    -1,   629,   630,   631,   632,    -1,    -1,    -1,    -1,
+      -1,    -1,   639,   640,   641,    -1,   643,   644,   645,   646,
+      -1,    -1,   649,    -1,    -1,   652,   653,   654,   655,   656,
+      -1,   658,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     667,   668,   669,    -1,   671,   672,   673,    -1,   675,    -1,
+      -1,   678,    -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,
+     687,   688,    -1,    -1,   691,    -1,   693,    -1,   695,   696,
+      -1,    -1,    -1,   700,   701,   702,   703,   704,   705,   706,
+     707,    -1,   709,   710,   711,   712,   713,   714,   715,   716,
+     717,   718,    -1,   720,   721,   722,   723,   724,   725,   726,
+     727,   728,   729,   730,   731,   732,   733,   734,   735,   736,
+     737,   738,   739,   740,   741,   742,   743,    -1,   745,   746,
+     747,   748,   749,   750,   751,    -1,   753,   754,   755,   756,
+     757,   758,   759,   760,   761,   762,   763,   764,   765,   766,
+     767,   768,   769,   770,   771,   772,   773,   774,   775,   776,
+     777,   778,   779,   780,   781,   782,   783,   784,   785,   786,
+     787,   788,   789,   790,   791,   792,   793,     5,     6,    -1,
+       8,     9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,
+      -1,   808,    20,    -1,    -1,    23,    -1,    25,    26,    27,
+      28,    29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,
+      -1,    -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,
+      -1,    49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,
+      -1,    59,    60,    61,    -1,    63,    -1,    65,    66,    67,
+      68,    69,    70,    -1,    72,    73,    -1,    75,    76,    77,
+      78,    79,    80,    81,    82,    83,    84,    85,    -1,    87,
+      88,    -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,
+      98,    -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,
+      -1,    -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,
+      -1,    -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,
+      -1,   129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,
+     138,   139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,
+     148,    -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,
+     158,   159,    -1,    -1,   162,   163,    -1,   165,   166,   167,
+     168,   169,   170,    -1,    -1,   173,   174,   175,   176,   177,
+      -1,    -1,   180,   181,    -1,   183,   184,   185,   186,   187,
+      -1,    -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,
+     198,    -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,
+      -1,   209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,
+     218,    -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,
+     228,   229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,
+      -1,    -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,
+     248,    -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,
+      -1,    -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,
+      -1,   269,    -1,    -1,   272,   273,    -1,    -1,    -1,    -1,
+      -1,   279,   280,    -1,   282,    -1,   284,    -1,   286,   287,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,
+     298,   299,   300,   301,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,   313,    -1,   315,   316,   317,
+      -1,   319,   320,   321,   322,    -1,   324,   325,    -1,    -1,
+      -1,    -1,   330,   331,   332,   333,   334,   335,    -1,    -1,
+     338,   339,    -1,   341,    -1,   343,    -1,   345,   346,   347,
+     348,   349,   350,   351,   352,   353,    -1,    -1,   356,   357,
+      -1,    -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,
+     368,   369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,
+     378,   379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,
+      -1,   399,    -1,   401,   402,   403,   404,   405,   406,   407,
+     408,   409,   410,    -1,   412,    -1,   414,   415,   416,    -1,
+     418,    -1,   420,   421,   422,   423,   424,    -1,   426,   427,
+     428,    -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,
+     438,   439,    -1,    -1,   442,   443,   444,   445,   446,    -1,
+     448,   449,    -1,   451,   452,   453,    -1,    -1,   456,   457,
+     458,   459,   460,   461,   462,   463,    -1,   465,    -1,   467,
+     468,    -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,
+     478,   479,   480,    -1,   482,    -1,   484,   485,   486,   487,
+     488,    -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,
+     498,    -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,
+     508,   509,   510,   511,    -1,   513,   514,   515,   516,   517,
+      -1,    -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,
+      -1,    -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,
+     538,   539,   540,   541,   542,    -1,    -1,   545,   546,    -1,
+      -1,   549,   550,   551,   552,   553,   554,    -1,    -1,   557,
+     558,   559,   560,    -1,   562,   563,    -1,    -1,   566,   567,
+     568,   569,    -1,    -1,   572,   573,    -1,   575,   576,   577,
+     578,    -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,
+      -1,   589,   590,   591,    -1,    -1,   594,   595,    -1,   597,
+     598,    -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,
+      -1,   609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,
+     618,    -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,
+      -1,   629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,
+      -1,   639,   640,   641,    -1,   643,   644,   645,   646,    -1,
+      -1,   649,    -1,    -1,   652,   653,   654,   655,   656,    -1,
+     658,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,
+     668,   669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,
+     678,    -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,
+     688,    -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,
+      -1,    -1,   700,   701,   702,   703,   704,   705,   706,   707,
+      -1,   709,   710,   711,   712,   713,   714,   715,   716,   717,
+     718,    -1,   720,   721,   722,   723,   724,   725,   726,   727,
+     728,   729,   730,   731,   732,   733,   734,   735,   736,   737,
+     738,   739,   740,   741,   742,   743,    -1,   745,   746,   747,
+     748,   749,   750,   751,    -1,   753,   754,   755,   756,   757,
+     758,   759,   760,   761,   762,   763,   764,   765,   766,   767,
+     768,   769,   770,   771,   772,   773,   774,   775,   776,   777,
+     778,   779,   780,   781,   782,   783,   784,   785,   786,   787,
+     788,   789,   790,   791,   792,   793,     5,     6,    -1,     8,
        9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    -1,    -1,    25,    26,    27,    28,
+     808,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
       29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
       -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      -1,    -1,    -1,    -1,    53,    54,    -1,    56,    57,    -1,
-      59,    60,    -1,    -1,    -1,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    -1,    78,
-      -1,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    -1,    94,    -1,    -1,    -1,    98,
+      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
+      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
+      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
+      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
+      89,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
       -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
       -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,    -1,    -1,    -1,    -1,    -1,   126,   127,    -1,
+      -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,
      129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,    -1,    -1,    -1,   146,   147,   148,
-      -1,   150,    -1,   152,    -1,   154,   155,    -1,   157,   158,
+     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
+      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
      159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,    -1,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,   182,   183,   184,   185,   186,   187,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,    -1,   216,    -1,    -1,
+     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
+      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
+      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
+     199,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
+     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
       -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,   230,    -1,   232,    -1,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,    -1,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,   257,    -1,
-      -1,   260,    -1,   262,    -1,    -1,    -1,   266,    -1,    -1,
-     269,   270,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
+     229,    -1,    -1,   232,   233,   234,   235,    -1,   237,    -1,
+      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
+      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
+      -1,   260,    -1,   262,   263,    -1,   265,   266,    -1,    -1,
+     269,    -1,    -1,   272,   273,    -1,   275,    -1,    -1,    -1,
      279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,   292,    -1,    -1,   295,    -1,   297,   298,
+      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
      299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
      309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
      319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
       -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
      339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
      349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,    -1,
+      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
      369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
      379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
      399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,    -1,    -1,    -1,   415,   416,    -1,   418,
+     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
       -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
       -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
      439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,    -1,   453,   454,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,    -1,    -1,   467,   468,
-      -1,   470,   471,   472,   473,   474,    -1,    -1,    -1,   478,
-     479,   480,    -1,   482,    -1,   484,   485,    -1,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,    -1,    -1,    -1,
-     509,    -1,   511,    -1,   513,   514,   515,   516,   517,    -1,
+     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
+     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
+      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
+     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
+      -1,   490,   491,   492,    -1,    -1,   495,   496,   497,   498,
+      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
+     509,   510,   511,    -1,   513,   514,   515,   516,   517,   518,
       -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,    -1,
-     539,   540,   541,   542,    -1,    -1,    -1,   546,    -1,    -1,
+      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
+     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
      549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
+     559,   560,    -1,   562,   563,    -1,   565,   566,   567,   568,
      569,    -1,    -1,   572,   573,    -1,   575,   576,   577,   578,
       -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-      -1,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,    -1,    -1,    -1,    -1,   604,    -1,    -1,   607,    -1,
+     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
+      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
      609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,   633,    -1,   635,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,    -1,   645,   646,    -1,    -1,
+     619,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
+     629,   630,   631,   632,    -1,    -1,    -1,   636,    -1,    -1,
+     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
      649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,    -1,    -1,    -1,   678,
+     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
       -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
       -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
       -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,    -1,   713,   714,   715,   716,   717,   718,
+     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
       -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
      729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
      739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
      749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
      759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
      769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
+     779,   780,   781,   782,   783,   784,   785,   786,   787,   788,
+     789,   790,   791,   792,   793,     5,     6,    -1,     8,     9,
+      10,    11,    12,    -1,    -1,    15,    -1,    -1,   807,    -1,
+      20,    -1,    -1,    23,    -1,    25,    26,    27,    28,    29,
+      30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,    -1,
+      40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,    49,
+      50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,    59,
+      60,    61,    -1,    63,    -1,    65,    66,    67,    68,    69,
+      70,    -1,    72,    73,    -1,    75,    76,    77,    78,    79,
+      80,    81,    82,    83,    84,    85,    -1,    87,    88,    -1,
+      90,    91,    92,    93,    94,    -1,    -1,    -1,    98,    -1,
+      -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,    -1,
+     110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,    -1,
+     120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,   129,
+      -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,   139,
+      -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,    -1,
+      -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,   159,
+      -1,    -1,   162,   163,    -1,   165,   166,   167,   168,   169,
+     170,    -1,    -1,   173,   174,   175,   176,   177,    -1,    -1,
+     180,   181,    -1,   183,   184,   185,   186,   187,    -1,    -1,
+     190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,    -1,
+      -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,   209,
+      -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,    -1,
+      -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,   229,
+      -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,    -1,
+      -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,    -1,
+      -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,    -1,
+     260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,   269,
+      -1,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,   279,
+     280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,    -1,   315,   316,   317,    -1,   319,
+     320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,    -1,
+     330,   331,   332,   333,   334,   335,    -1,    -1,   338,   339,
+      -1,   341,    -1,   343,    -1,   345,   346,   347,   348,   349,
+     350,   351,   352,   353,    -1,    -1,   356,   357,    -1,    -1,
+     360,   361,   362,   363,   364,    -1,    -1,    -1,   368,   369,
+      -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,   379,
+     380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,   399,
+      -1,   401,   402,   403,   404,   405,   406,   407,   408,   409,
+     410,    -1,   412,    -1,   414,   415,   416,    -1,   418,    -1,
+     420,   421,   422,   423,   424,    -1,   426,   427,   428,    -1,
+      -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,   439,
+      -1,    -1,   442,   443,   444,   445,   446,    -1,   448,   449,
+      -1,   451,   452,   453,    -1,    -1,   456,   457,   458,   459,
+     460,   461,   462,   463,    -1,   465,    -1,   467,   468,    -1,
+     470,   471,   472,    -1,   474,    -1,    -1,   477,   478,   479,
+     480,    -1,   482,    -1,   484,   485,   486,   487,   488,    -1,
+     490,   491,    -1,    -1,    -1,   495,   496,   497,   498,    -1,
+      -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,   509,
+     510,   511,    -1,   513,   514,   515,   516,   517,    -1,    -1,
+      -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,    -1,
+     530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,   539,
+     540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,   549,
+     550,   551,   552,   553,   554,    -1,    -1,   557,   558,   559,
+     560,    -1,   562,   563,    -1,    -1,   566,   567,   568,   569,
+      -1,    -1,   572,   573,    -1,   575,   576,   577,   578,    -1,
+      -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,   589,
+     590,   591,    -1,    -1,   594,   595,    -1,   597,   598,    -1,
+     600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,   609,
+      -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,    -1,
+     620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,   629,
+     630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,   639,
+     640,   641,    -1,   643,   644,   645,   646,    -1,    -1,   649,
+      -1,    -1,   652,   653,   654,   655,   656,    -1,   658,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,   669,
+      -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,    -1,
+     680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,    -1,
+      -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,   699,
+     700,   701,   702,   703,   704,   705,   706,   707,    -1,   709,
+     710,   711,   712,   713,   714,   715,   716,   717,   718,   719,
+     720,   721,   722,   723,   724,   725,   726,   727,   728,   729,
+     730,   731,   732,   733,   734,   735,   736,   737,   738,   739,
+     740,   741,   742,   743,    -1,   745,   746,   747,   748,   749,
+     750,   751,    -1,   753,   754,   755,   756,   757,   758,   759,
+     760,   761,   762,   763,   764,   765,   766,   767,   768,   769,
+     770,   771,   772,   773,   774,   775,   776,   777,   778,   779,
+     780,   781,   782,   783,   784,   785,   786,   787,   788,   789,
+     790,   791,   792,   793,     5,     6,    -1,     8,     9,    10,
+      11,    12,    -1,    -1,    15,    -1,    -1,   807,    -1,    20,
+      -1,    -1,    23,    -1,    25,    26,    27,    28,    29,    30,
+      -1,    32,    -1,    -1,    -1,    36,    -1,    -1,    -1,    40,
+      -1,    -1,    43,    44,    45,    -1,    47,    -1,    49,    50,
+      -1,    -1,    53,    -1,    -1,    56,    57,    -1,    59,    60,
+      61,    -1,    63,    -1,    65,    66,    67,    68,    69,    70,
+      -1,    72,    73,    -1,    75,    76,    77,    78,    79,    80,
+      81,    82,    83,    84,    85,    -1,    87,    88,    -1,    90,
+      91,    92,    93,    94,    -1,    -1,    -1,    98,    -1,    -1,
+      -1,    -1,   103,    -1,    -1,   106,    -1,    -1,    -1,   110,
+     111,   112,    -1,    -1,   115,    -1,    -1,    -1,    -1,   120,
+     121,    -1,    -1,    -1,    -1,   126,   127,    -1,   129,    -1,
+      -1,    -1,    -1,    -1,   135,   136,   137,   138,   139,    -1,
+      -1,    -1,   143,    -1,    -1,   146,   147,   148,    -1,    -1,
+      -1,   152,    -1,   154,   155,    -1,   157,   158,   159,    -1,
+      -1,   162,   163,    -1,   165,   166,   167,   168,   169,   170,
+      -1,    -1,   173,   174,   175,   176,   177,    -1,    -1,   180,
+     181,    -1,   183,   184,   185,   186,   187,    -1,    -1,   190,
+     191,    -1,    -1,    -1,   195,   196,    -1,   198,    -1,    -1,
+      -1,   202,    -1,   204,   205,   206,   207,    -1,   209,    -1,
+     211,    -1,    -1,    -1,   215,   216,    -1,   218,    -1,    -1,
+     221,   222,    -1,    -1,    -1,   226,   227,   228,   229,    -1,
+      -1,   232,   233,   234,    -1,    -1,   237,    -1,    -1,    -1,
+      -1,   242,   243,   244,    -1,    -1,    -1,   248,    -1,    -1,
+      -1,   252,   253,    -1,   255,   256,    -1,    -1,    -1,   260,
+      -1,   262,    -1,    -1,   265,   266,    -1,    -1,   269,    -1,
+      -1,   272,   273,    -1,    -1,    -1,    -1,    -1,   279,   280,
+      -1,   282,    -1,   284,    -1,   286,   287,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   295,    -1,   297,   298,   299,   300,
+     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
+     311,   312,   313,    -1,   315,   316,   317,    -1,   319,   320,
+     321,   322,    -1,   324,   325,    -1,    -1,    -1,    -1,   330,
+     331,   332,   333,   334,   335,    -1,    -1,   338,   339,    -1,
+     341,    -1,   343,    -1,   345,   346,   347,   348,   349,   350,
+     351,   352,   353,    -1,    -1,   356,   357,    -1,    -1,   360,
+     361,   362,   363,   364,    -1,    -1,    -1,   368,   369,    -1,
+      -1,    -1,   373,    -1,   375,   376,    -1,   378,   379,   380,
+      -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   393,   394,   395,    -1,   397,    -1,   399,    -1,
+     401,   402,   403,   404,   405,   406,   407,   408,   409,   410,
+      -1,   412,    -1,   414,   415,   416,    -1,   418,    -1,   420,
+     421,   422,   423,   424,    -1,   426,   427,   428,    -1,    -1,
+     431,    -1,    -1,    -1,   435,   436,    -1,   438,   439,    -1,
+      -1,   442,   443,   444,   445,   446,    -1,   448,   449,    -1,
+     451,   452,   453,    -1,    -1,   456,   457,   458,   459,   460,
+     461,   462,   463,    -1,   465,    -1,   467,   468,    -1,   470,
+     471,   472,    -1,   474,    -1,    -1,   477,   478,   479,   480,
+      -1,   482,    -1,   484,   485,   486,   487,   488,    -1,   490,
+     491,    -1,    -1,    -1,   495,   496,   497,   498,    -1,    -1,
+      -1,   502,    -1,    -1,    -1,   506,    -1,   508,   509,   510,
+     511,    -1,   513,   514,   515,   516,   517,    -1,    -1,    -1,
+      -1,    -1,   523,   524,   525,    -1,   527,    -1,    -1,   530,
+      -1,    -1,   533,    -1,   535,    -1,   537,   538,   539,   540,
+     541,   542,    -1,    -1,   545,   546,    -1,    -1,   549,   550,
+     551,   552,   553,   554,    -1,    -1,   557,   558,   559,   560,
+      -1,   562,   563,    -1,    -1,   566,   567,   568,   569,    -1,
+      -1,   572,   573,    -1,   575,   576,   577,   578,    -1,    -1,
+      -1,    -1,    -1,   584,   585,    -1,    -1,    -1,   589,   590,
+     591,    -1,    -1,   594,   595,    -1,   597,   598,    -1,   600,
+     601,    -1,    -1,   604,    -1,    -1,   607,    -1,   609,    -1,
+     611,   612,    -1,    -1,    -1,    -1,    -1,   618,    -1,   620,
+      -1,    -1,   623,    -1,    -1,    -1,   627,    -1,   629,   630,
+     631,   632,    -1,    -1,    -1,    -1,    -1,    -1,   639,   640,
+     641,    -1,   643,   644,   645,   646,    -1,    -1,   649,    -1,
+      -1,   652,   653,   654,   655,   656,    -1,   658,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   667,   668,   669,    -1,
+     671,   672,   673,    -1,   675,    -1,    -1,   678,    -1,   680,
+      -1,    -1,    -1,    -1,    -1,    -1,   687,   688,    -1,    -1,
+     691,    -1,   693,    -1,   695,   696,    -1,    -1,    -1,   700,
+     701,   702,   703,   704,   705,   706,   707,    -1,   709,   710,
+     711,   712,   713,   714,   715,   716,   717,   718,    -1,   720,
+     721,   722,   723,   724,   725,   726,   727,   728,   729,   730,
+     731,   732,   733,   734,   735,   736,   737,   738,   739,   740,
+     741,   742,   743,    -1,   745,   746,   747,   748,   749,   750,
+     751,    -1,   753,   754,   755,   756,   757,   758,   759,   760,
+     761,   762,   763,   764,   765,   766,   767,   768,   769,   770,
+     771,   772,   773,   774,   775,   776,   777,   778,   779,   780,
+     781,   782,   783,   784,   785,   786,   787,   788,   789,   790,
+     791,   792,   793,     5,     6,    -1,     8,     9,    10,    11,
+      12,    -1,    -1,    15,    -1,    -1,   807,    -1,    20,    -1,
+      -1,    23,    -1,    25,    26,    27,    28,    29,    30,    -1,
+      32,    -1,    -1,    -1,    36,    -1,    -1,    -1,    40,    -1,
+      -1,    43,    44,    45,    -1,    47,    -1,    49,    50,    -1,
+      -1,    53,    -1,    -1,    56,    57,    -1,    59,    60,    61,
+      -1,    63,    -1,    65,    66,    67,    68,    69,    70,    -1,
+      72,    73,    -1,    75,    76,    77,    78,    79,    80,    81,
+      82,    83,    84,    85,    -1,    87,    88,    -1,    90,    91,
+      92,    93,    94,    -1,    -1,    -1,    98,    -1,    -1,    -1,
+      -1,   103,    -1,    -1,   106,    -1,    -1,    -1,   110,   111,
+     112,    -1,    -1,   115,    -1,    -1,    -1,    -1,   120,   121,
+      -1,    -1,    -1,    -1,   126,   127,    -1,   129,    -1,    -1,
+      -1,    -1,    -1,   135,   136,   137,   138,   139,    -1,    -1,
+      -1,   143,    -1,    -1,   146,   147,   148,    -1,    -1,    -1,
+     152,    -1,   154,   155,    -1,   157,   158,   159,    -1,    -1,
+     162,   163,    -1,   165,   166,   167,   168,   169,   170,    -1,
+      -1,   173,   174,   175,   176,   177,    -1,    -1,   180,   181,
+      -1,   183,   184,   185,   186,   187,    -1,    -1,   190,   191,
+      -1,    -1,    -1,   195,   196,    -1,   198,    -1,    -1,    -1,
+     202,    -1,   204,   205,   206,   207,    -1,   209,    -1,   211,
+      -1,    -1,    -1,   215,   216,    -1,   218,    -1,    -1,   221,
+     222,    -1,    -1,    -1,   226,   227,   228,   229,    -1,    -1,
+     232,   233,   234,    -1,    -1,   237,    -1,    -1,    -1,    -1,
+     242,   243,   244,    -1,    -1,    -1,   248,    -1,    -1,    -1,
+     252,   253,    -1,   255,   256,    -1,    -1,    -1,   260,    -1,
+     262,    -1,    -1,   265,   266,    -1,    -1,   269,    -1,    -1,
+     272,   273,    -1,    -1,    -1,    -1,    -1,   279,   280,    -1,
+     282,    -1,   284,    -1,   286,   287,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   295,    -1,   297,   298,   299,   300,   301,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,   313,    -1,   315,   316,   317,    -1,   319,   320,   321,
+     322,    -1,   324,   325,    -1,    -1,    -1,    -1,   330,   331,
+     332,   333,   334,   335,    -1,    -1,   338,   339,    -1,   341,
+      -1,   343,    -1,   345,   346,   347,   348,   349,   350,   351,
+     352,   353,    -1,    -1,   356,   357,    -1,    -1,   360,   361,
+     362,   363,   364,    -1,    -1,    -1,   368,   369,    -1,    -1,
+      -1,   373,    -1,   375,   376,    -1,   378,   379,   380,    -1,
+      -1,   383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   393,   394,   395,    -1,   397,    -1,   399,    -1,   401,
+     402,   403,   404,   405,   406,   407,   408,   409,   410,    -1,
+     412,    -1,   414,   415,   416,    -1,   418,    -1,   420,   421,
+     422,   423,   424,    -1,   426,   427,   428,    -1,    -1,   431,
+      -1,    -1,    -1,   435,   436,    -1,   438,   439,    -1,    -1,
+     442,   443,   444,   445,   446,    -1,   448,   449,    -1,   451,
+     452,   453,    -1,    -1,   456,   457,   458,   459,   460,   461,
+     462,   463,    -1,   465,    -1,   467,   468,    -1,   470,   471,
+     472,    -1,   474,    -1,    -1,   477,   478,   479,   480,    -1,
+     482,    -1,   484,   485,   486,   487,   488,    -1,   490,   491,
+      -1,    -1,    -1,   495,   496,   497,   498,    -1,    -1,    -1,
+     502,    -1,    -1,    -1,   506,    -1,   508,   509,   510,   511,
+      -1,   513,   514,   515,   516,   517,    -1,    -1,    -1,    -1,
+      -1,   523,   524,   525,    -1,   527,    -1,    -1,   530,    -1,
+      -1,   533,    -1,   535,    -1,   537,   538,   539,   540,   541,
+     542,    -1,    -1,   545,   546,    -1,    -1,   549,   550,   551,
+     552,   553,   554,    -1,    -1,   557,   558,   559,   560,    -1,
+     562,   563,    -1,    -1,   566,   567,   568,   569,    -1,    -1,
+     572,   573,    -1,   575,   576,   577,   578,    -1,    -1,    -1,
+      -1,    -1,   584,   585,    -1,    -1,    -1,   589,   590,   591,
+      -1,    -1,   594,   595,    -1,   597,   598,    -1,   600,   601,
+      -1,    -1,   604,    -1,    -1,   607,    -1,   609,    -1,   611,
+     612,    -1,    -1,    -1,    -1,    -1,   618,    -1,   620,    -1,
+      -1,   623,    -1,    -1,    -1,   627,    -1,   629,   630,   631,
+     632,    -1,    -1,    -1,    -1,    -1,    -1,   639,   640,   641,
+      -1,   643,   644,   645,   646,    -1,    -1,   649,    -1,    -1,
+     652,   653,   654,   655,   656,    -1,   658,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   667,   668,   669,    -1,   671,
+     672,   673,    -1,   675,    -1,    -1,   678,    -1,   680,    -1,
+      -1,    -1,    -1,    -1,    -1,   687,   688,    -1,    -1,   691,
+      -1,   693,    -1,   695,   696,    -1,    -1,    -1,   700,   701,
+     702,   703,   704,   705,   706,   707,    -1,   709,   710,   711,
+     712,   713,   714,   715,   716,   717,   718,    -1,   720,   721,
+     722,   723,   724,   725,   726,   727,   728,   729,   730,   731,
+     732,   733,   734,   735,   736,   737,   738,   739,   740,   741,
+     742,   743,    -1,   745,   746,   747,   748,   749,   750,   751,
+      -1,   753,   754,   755,   756,   757,   758,   759,   760,   761,
+     762,   763,   764,   765,   766,   767,   768,   769,   770,   771,
+     772,   773,   774,   775,   776,   777,   778,   779,   780,   781,
+     782,   783,   784,   785,   786,   787,   788,   789,   790,   791,
+     792,   793,     5,     6,    -1,     8,     9,    10,    11,    12,
+      -1,    -1,    15,    -1,    -1,   807,    -1,    20,    -1,    -1,
+      23,    -1,    25,    26,    27,    28,    29,    30,    -1,    32,
+      -1,    -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,
+      43,    44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,
+      53,    -1,    -1,    56,    57,    -1,    59,    60,    61,    -1,
+      63,    -1,    65,    66,    67,    68,    69,    70,    -1,    72,
+      73,    -1,    75,    76,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    -1,    87,    88,    -1,    90,    91,    92,
+      93,    94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,
+     103,    -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,
+      -1,    -1,   115,    -1,    -1,    -1,    -1,   120,   121,    -1,
+      -1,    -1,    -1,   126,   127,    -1,   129,    -1,    -1,    -1,
+      -1,    -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,
+     143,    -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,
+      -1,   154,   155,    -1,   157,   158,   159,    -1,    -1,   162,
+     163,    -1,   165,   166,   167,   168,   169,   170,    -1,    -1,
+     173,   174,   175,   176,   177,    -1,    -1,   180,   181,    -1,
+     183,   184,   185,   186,   187,    -1,    -1,   190,   191,    -1,
+      -1,    -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,
+      -1,   204,   205,   206,   207,    -1,   209,    -1,   211,    -1,
+      -1,    -1,   215,   216,    -1,   218,    -1,    -1,   221,   222,
+      -1,    -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,
+     233,   234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,
+     243,   244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,
+     253,    -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,
+      -1,    -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,
+     273,    -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,
+      -1,   284,    -1,   286,   287,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   295,    -1,   297,   298,   299,   300,   301,   302,
+     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
+     313,    -1,   315,   316,   317,    -1,   319,   320,   321,   322,
+      -1,   324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,
+     333,   334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,
+     343,    -1,   345,   346,   347,   348,   349,   350,   351,   352,
+     353,    -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,
+     363,   364,    -1,    -1,    -1,   368,   369,    -1,    -1,    -1,
+     373,    -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,
+     383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     393,   394,   395,    -1,   397,    -1,   399,    -1,   401,   402,
+     403,   404,   405,   406,   407,   408,   409,   410,    -1,   412,
+      -1,   414,   415,   416,    -1,   418,    -1,   420,   421,   422,
+     423,   424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,
+      -1,    -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,
+     443,   444,   445,   446,    -1,   448,   449,    -1,   451,   452,
+     453,    -1,    -1,   456,   457,   458,   459,   460,   461,   462,
+     463,    -1,   465,    -1,   467,   468,    -1,   470,   471,   472,
+      -1,   474,    -1,    -1,   477,   478,   479,   480,    -1,   482,
+      -1,   484,   485,   486,   487,   488,    -1,   490,   491,    -1,
+      -1,    -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,
+      -1,    -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,
+     513,   514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,
+     523,   524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,
+     533,    -1,   535,    -1,   537,   538,   539,   540,   541,   542,
+      -1,    -1,   545,   546,    -1,    -1,   549,   550,   551,   552,
+     553,   554,    -1,    -1,   557,   558,   559,   560,    -1,   562,
+     563,    -1,    -1,   566,   567,   568,   569,    -1,    -1,   572,
+     573,    -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,
+      -1,   584,   585,    -1,    -1,    -1,   589,   590,   591,    -1,
+      -1,   594,   595,    -1,   597,   598,    -1,   600,   601,    -1,
+      -1,   604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,
+      -1,    -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,
+     623,    -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,
+      -1,    -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,
+     643,   644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,
+     653,   654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,
+     673,    -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,
+      -1,    -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,
+     693,    -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,
+     703,   704,   705,   706,   707,    -1,   709,   710,   711,   712,
+     713,   714,   715,   716,   717,   718,    -1,   720,   721,   722,
+     723,   724,   725,   726,   727,   728,   729,   730,   731,   732,
+     733,   734,   735,   736,   737,   738,   739,   740,   741,   742,
+     743,    -1,   745,   746,   747,   748,   749,   750,   751,    -1,
+     753,   754,   755,   756,   757,   758,   759,   760,   761,   762,
+     763,   764,   765,   766,   767,   768,   769,   770,   771,   772,
+     773,   774,   775,   776,   777,   778,   779,   780,   781,   782,
+     783,   784,   785,   786,   787,   788,   789,   790,   791,   792,
+     793,     5,     6,    -1,     8,     9,    10,    11,    12,    -1,
+      -1,    15,    -1,    -1,   807,    -1,    20,    -1,    -1,    23,
+      -1,    25,    26,    27,    28,    29,    30,    -1,    32,    -1,
+      -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,
+      44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,
+      -1,    -1,    56,    57,    -1,    59,    60,    61,    -1,    63,
+      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
+      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
+      84,    85,    -1,    87,    88,    -1,    90,    91,    92,    93,
+      94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,
+      -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,
+      -1,   115,    -1,    -1,    -1,    -1,   120,   121,    -1,    -1,
+      -1,    -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,
+      -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,   143,
+      -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,
+     154,   155,    -1,   157,   158,   159,    -1,    -1,   162,   163,
+      -1,   165,   166,   167,   168,   169,   170,    -1,    -1,   173,
+     174,   175,   176,   177,    -1,    -1,   180,   181,    -1,   183,
+     184,   185,   186,   187,    -1,    -1,   190,   191,    -1,    -1,
+      -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,
+     204,   205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,
+      -1,   215,   216,    -1,   218,    -1,    -1,   221,   222,    -1,
+      -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,   233,
+     234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,
+     244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,
+      -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,
+      -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,
+      -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,
+     284,    -1,   286,   287,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   295,    -1,   297,   298,   299,   300,   301,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
+      -1,   315,   316,   317,    -1,   319,   320,   321,   322,    -1,
+     324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,
+     334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,
+      -1,   345,   346,   347,   348,   349,   350,   351,   352,   353,
+      -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,   363,
+     364,    -1,    -1,    -1,   368,   369,    -1,    -1,    -1,   373,
+      -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,   383,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,
+     394,   395,    -1,   397,    -1,   399,    -1,   401,   402,   403,
+     404,   405,   406,   407,   408,   409,   410,    -1,   412,    -1,
+     414,   415,   416,    -1,   418,    -1,   420,   421,   422,   423,
+     424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,
+      -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,   443,
+     444,   445,   446,    -1,   448,   449,    -1,   451,   452,   453,
+      -1,    -1,   456,   457,   458,   459,   460,   461,   462,   463,
+      -1,   465,    -1,   467,   468,    -1,   470,   471,   472,    -1,
+     474,    -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,
+     484,   485,   486,   487,   488,    -1,   490,   491,    -1,    -1,
+      -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,
+      -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,   513,
+     514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,
+     524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,
+      -1,   535,    -1,   537,   538,   539,   540,   541,   542,    -1,
+      -1,   545,   546,    -1,    -1,   549,   550,   551,   552,   553,
+     554,    -1,    -1,   557,   558,   559,   560,    -1,   562,   563,
+      -1,    -1,   566,   567,   568,   569,    -1,    -1,   572,   573,
+      -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,
+     584,   585,    -1,    -1,    -1,   589,   590,   591,    -1,    -1,
+     594,   595,    -1,   597,   598,    -1,   600,   601,    -1,    -1,
+     604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,
+      -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,
+      -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,
+      -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,
+     644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,
+     654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,   673,
+      -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,
+      -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,
+      -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,   703,
+     704,   705,   706,   707,    -1,   709,   710,   711,   712,   713,
+     714,   715,   716,   717,   718,    -1,   720,   721,   722,   723,
+     724,   725,   726,   727,   728,   729,   730,   731,   732,   733,
+     734,   735,   736,   737,   738,   739,   740,   741,   742,   743,
+      -1,   745,   746,   747,   748,   749,   750,   751,    -1,   753,
+     754,   755,   756,   757,   758,   759,   760,   761,   762,   763,
+     764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
+     774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
+     784,   785,   786,   787,   788,   789,   790,   791,   792,   793,
+       5,     6,    -1,     8,     9,    10,    11,    12,    -1,    -1,
+      15,    -1,    -1,   807,    -1,    20,    -1,    -1,    23,    -1,
+      25,    26,    27,    28,    29,    30,    -1,    32,    -1,    -1,
+      -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,    44,
+      45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,    -1,
+      -1,    56,    57,    -1,    59,    60,    61,    -1,    63,    -1,
+      65,    66,    67,    68,    69,    70,    -1,    72,    73,    -1,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    -1,    87,    88,    -1,    90,    91,    92,    93,    94,
+      -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,    -1,
+      -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,    -1,
+     115,    -1,    -1,    -1,    -1,   120,   121,    -1,    -1,    -1,
+      -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,    -1,
+     135,   136,   137,   138,   139,    -1,    -1,    -1,   143,    -1,
+      -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,   154,
+     155,    -1,   157,   158,   159,    -1,    -1,   162,   163,    -1,
+     165,   166,   167,   168,   169,   170,    -1,    -1,   173,   174,
+     175,   176,   177,    -1,    -1,   180,   181,    -1,   183,   184,
+     185,   186,   187,    -1,    -1,   190,   191,    -1,    -1,    -1,
+     195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,   204,
+     205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,    -1,
+     215,   216,    -1,   218,    -1,    -1,   221,   222,    -1,    -1,
+      -1,   226,   227,   228,   229,    -1,    -1,   232,   233,   234,
+      -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,   244,
+      -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,    -1,
+     255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,    -1,
+     265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,    -1,
+      -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,   284,
+      -1,   286,   287,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     295,    -1,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,    -1,
+     315,   316,   317,    -1,   319,   320,   321,   322,    -1,   324,
+     325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,   334,
+     335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,    -1,
+     345,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
+      -1,   356,   357,    -1,    -1,   360,   361,   362,   363,   364,
+      -1,    -1,    -1,   368,   369,    -1,    -1,    -1,   373,    -1,
+     375,   376,    -1,   378,   379,   380,    -1,    -1,   383,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,   394,
+     395,    -1,   397,    -1,   399,    -1,   401,   402,   403,   404,
+     405,   406,   407,   408,   409,   410,    -1,   412,    -1,   414,
+     415,   416,    -1,   418,    -1,   420,   421,   422,   423,   424,
+      -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,    -1,
+     435,   436,    -1,   438,   439,    -1,    -1,   442,   443,   444,
+     445,   446,    -1,   448,   449,    -1,   451,   452,   453,    -1,
+      -1,   456,   457,   458,   459,   460,   461,   462,   463,    -1,
+     465,    -1,   467,   468,    -1,   470,   471,   472,    -1,   474,
+      -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,   484,
+     485,   486,   487,   488,    -1,   490,   491,    -1,    -1,    -1,
+     495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,    -1,
+      -1,   506,    -1,   508,   509,   510,   511,    -1,   513,   514,
+     515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,   524,
+     525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,    -1,
+     535,    -1,   537,   538,   539,   540,   541,   542,    -1,    -1,
+     545,   546,    -1,    -1,   549,   550,   551,   552,   553,   554,
+      -1,    -1,   557,   558,   559,   560,    -1,   562,   563,    -1,
+      -1,   566,   567,   568,   569,    -1,    -1,   572,   573,    -1,
+     575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,   584,
+     585,    -1,    -1,    -1,   589,   590,   591,    -1,    -1,   594,
+     595,    -1,   597,   598,    -1,   600,   601,    -1,    -1,   604,
+      -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,    -1,
+      -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,    -1,
+      -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,    -1,
+      -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,   644,
+     645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,   654,
+     655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   667,   668,   669,    -1,   671,   672,   673,    -1,
+     675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,    -1,
+      -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,    -1,
+     695,   696,    -1,    -1,    -1,   700,   701,   702,   703,   704,
+     705,   706,   707,    -1,   709,   710,   711,   712,   713,   714,
+     715,   716,   717,   718,    -1,   720,   721,   722,   723,   724,
+     725,   726,   727,   728,   729,   730,   731,   732,   733,   734,
+     735,   736,   737,   738,   739,   740,   741,   742,   743,    -1,
+     745,   746,   747,   748,   749,   750,   751,    -1,   753,   754,
+     755,   756,   757,   758,   759,   760,   761,   762,   763,   764,
+     765,   766,   767,   768,   769,   770,   771,   772,   773,   774,
+     775,   776,   777,   778,   779,   780,   781,   782,   783,   784,
+     785,   786,   787,   788,   789,   790,   791,   792,   793,    -1,
+      -1,    -1,    -1,    -1,     5,     6,   801,     8,     9,    10,
+      11,    12,    -1,    -1,    15,    -1,    -1,    -1,    -1,    20,
+      -1,    -1,    23,    -1,    25,    26,    27,    28,    29,    30,
+      -1,    32,    -1,    -1,    -1,    36,    -1,    -1,    -1,    40,
+      -1,    -1,    43,    44,    45,    -1,    47,    -1,    49,    50,
+      -1,    -1,    53,    -1,    -1,    56,    57,    -1,    59,    60,
+      61,    -1,    63,    -1,    65,    66,    67,    68,    69,    70,
+      -1,    72,    73,    -1,    75,    76,    77,    78,    79,    80,
+      81,    82,    83,    84,    85,    -1,    87,    88,    -1,    90,
+      91,    92,    93,    94,    -1,    -1,    -1,    98,    -1,    -1,
+      -1,    -1,   103,    -1,    -1,   106,    -1,    -1,    -1,   110,
+     111,   112,    -1,    -1,   115,    -1,    -1,    -1,    -1,   120,
+     121,    -1,    -1,    -1,    -1,   126,   127,    -1,   129,    -1,
+      -1,    -1,    -1,    -1,   135,   136,   137,   138,   139,    -1,
+      -1,    -1,   143,    -1,    -1,   146,   147,   148,    -1,    -1,
+      -1,   152,    -1,   154,   155,    -1,   157,   158,   159,    -1,
+      -1,   162,   163,    -1,   165,   166,   167,   168,   169,   170,
+      -1,    -1,   173,   174,   175,   176,   177,    -1,    -1,   180,
+     181,    -1,   183,   184,   185,   186,   187,    -1,    -1,   190,
+     191,    -1,    -1,    -1,   195,   196,    -1,   198,    -1,    -1,
+      -1,   202,    -1,   204,   205,   206,   207,    -1,   209,    -1,
+     211,    -1,    -1,    -1,   215,   216,    -1,   218,    -1,    -1,
+     221,   222,    -1,    -1,    -1,   226,   227,   228,   229,    -1,
+      -1,   232,   233,   234,    -1,    -1,   237,    -1,    -1,    -1,
+      -1,   242,   243,   244,    -1,    -1,    -1,   248,    -1,    -1,
+      -1,   252,   253,    -1,   255,   256,    -1,    -1,    -1,   260,
+      -1,   262,    -1,    -1,   265,   266,    -1,    -1,   269,    -1,
+      -1,   272,   273,    -1,    -1,    -1,    -1,    -1,   279,   280,
+      -1,   282,    -1,   284,    -1,   286,   287,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   295,    -1,   297,   298,   299,   300,
+     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
+     311,   312,   313,    -1,   315,   316,   317,    -1,   319,   320,
+     321,   322,    -1,   324,   325,    -1,    -1,    -1,    -1,   330,
+     331,   332,   333,   334,   335,    -1,    -1,   338,   339,    -1,
+     341,    -1,   343,    -1,   345,   346,   347,   348,   349,   350,
+     351,   352,   353,    -1,    -1,   356,   357,    -1,    -1,   360,
+     361,   362,   363,   364,    -1,    -1,    -1,   368,   369,    -1,
+      -1,    -1,   373,    -1,   375,   376,    -1,   378,   379,   380,
+      -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   393,   394,   395,    -1,   397,    -1,   399,    -1,
+     401,   402,   403,   404,   405,   406,   407,   408,   409,   410,
+      -1,   412,    -1,   414,   415,   416,    -1,   418,    -1,   420,
+     421,   422,   423,   424,    -1,   426,   427,   428,    -1,    -1,
+     431,    -1,    -1,    -1,   435,   436,    -1,   438,   439,    -1,
+      -1,   442,   443,   444,   445,   446,    -1,   448,   449,    -1,
+     451,   452,   453,    -1,    -1,   456,   457,   458,   459,   460,
+     461,   462,   463,    -1,   465,    -1,   467,   468,    -1,   470,
+     471,   472,    -1,   474,    -1,    -1,   477,   478,   479,   480,
+      -1,   482,    -1,   484,   485,   486,   487,   488,    -1,   490,
+     491,    -1,    -1,    -1,   495,   496,   497,   498,    -1,    -1,
+      -1,   502,    -1,    -1,    -1,   506,    -1,   508,   509,   510,
+     511,    -1,   513,   514,   515,   516,   517,    -1,    -1,    -1,
+      -1,    -1,   523,   524,   525,    -1,   527,    -1,    -1,   530,
+      -1,    -1,   533,    -1,   535,    -1,   537,   538,   539,   540,
+     541,   542,    -1,    -1,   545,   546,    -1,    -1,   549,   550,
+     551,   552,   553,   554,    -1,    -1,   557,   558,   559,   560,
+      -1,   562,   563,    -1,    -1,   566,   567,   568,   569,    -1,
+      -1,   572,   573,    -1,   575,   576,   577,   578,    -1,    -1,
+      -1,    -1,    -1,   584,   585,    -1,    -1,    -1,   589,   590,
+     591,    -1,    -1,   594,   595,    -1,   597,   598,    -1,   600,
+     601,    -1,    -1,   604,    -1,    -1,   607,    -1,   609,    -1,
+     611,   612,    -1,    -1,    -1,    -1,    -1,   618,    -1,   620,
+      -1,    -1,   623,    -1,    -1,    -1,   627,    -1,   629,   630,
+     631,   632,    -1,    -1,    -1,    -1,    -1,    -1,   639,   640,
+     641,    -1,   643,   644,   645,   646,    -1,    -1,   649,    -1,
+      -1,   652,   653,   654,   655,   656,    -1,   658,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   667,   668,   669,    -1,
+     671,   672,   673,    -1,   675,    -1,    -1,   678,    -1,   680,
+      -1,    -1,    -1,    -1,    -1,    -1,   687,   688,    -1,    -1,
+     691,    -1,   693,    -1,   695,   696,    -1,    -1,    -1,   700,
+     701,   702,   703,   704,   705,   706,   707,    -1,   709,   710,
+     711,   712,   713,   714,   715,   716,   717,   718,    -1,   720,
+     721,   722,   723,   724,   725,   726,   727,   728,   729,   730,
+     731,   732,   733,   734,   735,   736,   737,   738,   739,   740,
+     741,   742,   743,    -1,   745,   746,   747,   748,   749,   750,
+     751,    -1,   753,   754,   755,   756,   757,   758,   759,   760,
+     761,   762,   763,   764,   765,   766,   767,   768,   769,   770,
+     771,   772,   773,   774,   775,   776,   777,   778,   779,   780,
+     781,   782,   783,   784,   785,   786,   787,   788,   789,   790,
+     791,   792,   793,    -1,    -1,    -1,    -1,    -1,     5,     6,
+     801,     8,     9,    10,    11,    12,    -1,    -1,    15,    -1,
+      -1,    -1,    -1,    20,    -1,    -1,    23,    -1,    25,    26,
+      27,    28,    29,    30,    -1,    32,    -1,    -1,    -1,    36,
+      -1,    -1,    -1,    40,    -1,    -1,    43,    44,    45,    -1,
+      47,    -1,    49,    50,    -1,    -1,    53,    -1,    -1,    56,
+      57,    -1,    59,    60,    61,    -1,    63,    -1,    65,    66,
+      67,    68,    69,    70,    -1,    72,    73,    -1,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    -1,
+      87,    88,    -1,    90,    91,    92,    93,    94,    -1,    -1,
+      -1,    98,    -1,    -1,    -1,    -1,   103,    -1,    -1,   106,
+      -1,    -1,    -1,   110,   111,   112,    -1,    -1,   115,    -1,
+      -1,    -1,    -1,   120,   121,    -1,    -1,    -1,    -1,   126,
+     127,    -1,   129,    -1,    -1,    -1,    -1,    -1,   135,   136,
+     137,   138,   139,    -1,    -1,    -1,   143,    -1,    -1,   146,
+     147,   148,    -1,    -1,    -1,   152,    -1,   154,   155,    -1,
+     157,   158,   159,    -1,    -1,   162,   163,    -1,   165,   166,
+     167,   168,   169,   170,    -1,    -1,   173,   174,   175,   176,
+     177,    -1,    -1,   180,   181,    -1,   183,   184,   185,   186,
+     187,    -1,    -1,   190,   191,    -1,    -1,    -1,   195,   196,
+      -1,   198,    -1,    -1,    -1,   202,    -1,   204,   205,   206,
+     207,    -1,   209,    -1,   211,    -1,    -1,    -1,   215,   216,
+      -1,   218,    -1,    -1,   221,   222,    -1,    -1,    -1,   226,
+     227,   228,   229,    -1,    -1,   232,   233,   234,    -1,    -1,
+     237,    -1,    -1,    -1,    -1,   242,   243,   244,    -1,    -1,
+      -1,   248,    -1,    -1,    -1,   252,   253,    -1,   255,   256,
+      -1,    -1,    -1,   260,    -1,   262,    -1,    -1,   265,   266,
+      -1,    -1,   269,    -1,    -1,   272,   273,    -1,    -1,    -1,
+      -1,    -1,   279,   280,    -1,   282,    -1,   284,    -1,   286,
+     287,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,
+     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,   313,    -1,   315,   316,
+     317,    -1,   319,   320,   321,   322,    -1,   324,   325,    -1,
+      -1,    -1,    -1,   330,   331,   332,   333,   334,   335,    -1,
+      -1,   338,   339,    -1,   341,    -1,   343,    -1,   345,   346,
+     347,   348,   349,   350,   351,   352,   353,    -1,    -1,   356,
+     357,    -1,    -1,   360,   361,   362,   363,   364,    -1,    -1,
+      -1,   368,   369,    -1,    -1,    -1,   373,    -1,   375,   376,
+      -1,   378,   379,   380,    -1,    -1,   383,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   393,   394,   395,    -1,
+     397,    -1,   399,    -1,   401,   402,   403,   404,   405,   406,
+     407,   408,   409,   410,    -1,   412,    -1,   414,   415,   416,
+      -1,   418,    -1,   420,   421,   422,   423,   424,    -1,   426,
+     427,   428,    -1,    -1,   431,    -1,    -1,    -1,   435,   436,
+      -1,   438,   439,    -1,    -1,   442,   443,   444,   445,   446,
+      -1,   448,   449,    -1,   451,   452,   453,    -1,    -1,   456,
+     457,   458,   459,   460,   461,   462,   463,    -1,   465,    -1,
+     467,   468,    -1,   470,   471,   472,    -1,   474,    -1,    -1,
+     477,   478,   479,   480,    -1,   482,    -1,   484,   485,   486,
+     487,   488,    -1,   490,   491,    -1,    -1,    -1,   495,   496,
+     497,   498,    -1,    -1,    -1,   502,    -1,    -1,    -1,   506,
+      -1,   508,   509,   510,   511,    -1,   513,   514,   515,   516,
+     517,    -1,    -1,    -1,    -1,    -1,   523,   524,   525,    -1,
+     527,    -1,    -1,   530,    -1,    -1,   533,    -1,   535,    -1,
+     537,   538,   539,   540,   541,   542,    -1,    -1,   545,   546,
+      -1,    -1,   549,   550,   551,   552,   553,   554,    -1,    -1,
+     557,   558,   559,   560,    -1,   562,   563,    -1,    -1,   566,
+     567,   568,   569,    -1,    -1,   572,   573,    -1,   575,   576,
+     577,   578,    -1,    -1,    -1,    -1,    -1,   584,   585,    -1,
+      -1,    -1,   589,   590,   591,    -1,    -1,   594,   595,    -1,
+     597,   598,    -1,   600,   601,    -1,    -1,   604,    -1,    -1,
+     607,    -1,   609,    -1,   611,   612,    -1,    -1,    -1,    -1,
+      -1,   618,    -1,   620,    -1,    -1,   623,    -1,    -1,    -1,
+     627,    -1,   629,   630,   631,   632,    -1,    -1,    -1,    -1,
+      -1,    -1,   639,   640,   641,    -1,   643,   644,   645,   646,
+      -1,    -1,   649,    -1,    -1,   652,   653,   654,   655,   656,
+      -1,   658,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     667,   668,   669,    -1,   671,   672,   673,    -1,   675,    -1,
+      -1,   678,    -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,
+     687,   688,    -1,    -1,   691,    -1,   693,    -1,   695,   696,
+      -1,    -1,    -1,   700,   701,   702,   703,   704,   705,   706,
+     707,    -1,   709,   710,   711,   712,   713,   714,   715,   716,
+     717,   718,    -1,   720,   721,   722,   723,   724,   725,   726,
+     727,   728,   729,   730,   731,   732,   733,   734,   735,   736,
+     737,   738,   739,   740,   741,   742,   743,    -1,   745,   746,
+     747,   748,   749,   750,   751,    -1,   753,   754,   755,   756,
+     757,   758,   759,   760,   761,   762,   763,   764,   765,   766,
+     767,   768,   769,   770,   771,   772,   773,   774,   775,   776,
+     777,   778,   779,   780,   781,   782,   783,   784,   785,   786,
+     787,   788,   789,   790,   791,   792,   793,    -1,    -1,    -1,
+      -1,    -1,     5,     6,   801,     8,     9,    10,    11,    12,
+      -1,    -1,    15,    -1,    -1,    -1,    -1,    20,    -1,    -1,
+      23,    -1,    25,    26,    27,    28,    29,    30,    -1,    32,
+      -1,    -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,
+      43,    44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,
+      53,    -1,    -1,    56,    57,    -1,    59,    60,    61,    -1,
+      63,    -1,    65,    66,    67,    68,    69,    70,    -1,    72,
+      73,    -1,    75,    76,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    -1,    87,    88,    -1,    90,    91,    92,
+      93,    94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,
+     103,    -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,
+      -1,    -1,   115,    -1,    -1,    -1,    -1,   120,   121,    -1,
+      -1,    -1,    -1,   126,   127,    -1,   129,    -1,    -1,    -1,
+      -1,    -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,
+     143,    -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,
+      -1,   154,   155,    -1,   157,   158,   159,    -1,    -1,   162,
+     163,    -1,   165,   166,   167,   168,   169,   170,    -1,    -1,
+     173,   174,   175,   176,   177,    -1,    -1,   180,   181,    -1,
+     183,   184,   185,   186,   187,    -1,    -1,   190,   191,    -1,
+      -1,    -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,
+      -1,   204,   205,   206,   207,    -1,   209,    -1,   211,    -1,
+      -1,    -1,   215,   216,    -1,   218,    -1,    -1,   221,   222,
+      -1,    -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,
+     233,   234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,
+     243,   244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,
+     253,    -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,
+      -1,    -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,
+     273,    -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,
+      -1,   284,    -1,   286,   287,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   295,    -1,   297,   298,   299,   300,   301,   302,
+     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
+     313,    -1,   315,   316,   317,    -1,   319,   320,   321,   322,
+      -1,   324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,
+     333,   334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,
+     343,    -1,   345,   346,   347,   348,   349,   350,   351,   352,
+     353,    -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,
+     363,   364,    -1,    -1,    -1,   368,   369,    -1,    -1,    -1,
+     373,    -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,
+     383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     393,   394,   395,    -1,   397,    -1,   399,    -1,   401,   402,
+     403,   404,   405,   406,   407,   408,   409,   410,    -1,   412,
+      -1,   414,   415,   416,    -1,   418,    -1,   420,   421,   422,
+     423,   424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,
+      -1,    -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,
+     443,   444,   445,   446,    -1,   448,   449,    -1,   451,   452,
+     453,    -1,    -1,   456,   457,   458,   459,   460,   461,   462,
+     463,    -1,   465,    -1,   467,   468,    -1,   470,   471,   472,
+      -1,   474,    -1,    -1,   477,   478,   479,   480,    -1,   482,
+      -1,   484,   485,   486,   487,   488,    -1,   490,   491,    -1,
+      -1,    -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,
+      -1,    -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,
+     513,   514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,
+     523,   524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,
+     533,    -1,   535,    -1,   537,   538,   539,   540,   541,   542,
+      -1,    -1,   545,   546,    -1,    -1,   549,   550,   551,   552,
+     553,   554,    -1,    -1,   557,   558,   559,   560,    -1,   562,
+     563,    -1,    -1,   566,   567,   568,   569,    -1,    -1,   572,
+     573,    -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,
+      -1,   584,   585,    -1,    -1,    -1,   589,   590,   591,    -1,
+      -1,   594,   595,    -1,   597,   598,    -1,   600,   601,    -1,
+      -1,   604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,
+      -1,    -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,
+     623,    -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,
+      -1,    -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,
+     643,   644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,
+     653,   654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,
+     673,    -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,
+      -1,    -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,
+     693,    -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,
+     703,   704,   705,   706,   707,    -1,   709,   710,   711,   712,
+     713,   714,   715,   716,   717,   718,    -1,   720,   721,   722,
+     723,   724,   725,   726,   727,   728,   729,   730,   731,   732,
+     733,   734,   735,   736,   737,   738,   739,   740,   741,   742,
+     743,    -1,   745,   746,   747,   748,   749,   750,   751,    -1,
+     753,   754,   755,   756,   757,   758,   759,   760,   761,   762,
+     763,   764,   765,   766,   767,   768,   769,   770,   771,   772,
+     773,   774,   775,   776,   777,   778,   779,   780,   781,   782,
+     783,   784,   785,   786,   787,   788,   789,   790,   791,   792,
+     793,    -1,    -1,    -1,    -1,    -1,     5,     6,   801,     8,
        9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    -1,    -1,    25,    26,    27,    28,
+      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
       29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
       -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      -1,    -1,    -1,    -1,    53,    54,    -1,    56,    57,    -1,
-      59,    60,    -1,    -1,    -1,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    -1,    78,
-      -1,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    -1,    94,    -1,    -1,    -1,    98,
+      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
+      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
+      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
+      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
+      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
       -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
       -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,    -1,    -1,    -1,    -1,    -1,   126,   127,    -1,
+      -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,
      129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,    -1,    -1,    -1,   146,   147,   148,
+     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
       -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
      159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,    -1,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,   182,   183,   184,   185,   186,   187,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   195,   196,    -1,   198,
+     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
+      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
+      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
       -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,    -1,   216,    -1,    -1,
+     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
       -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,   230,    -1,   232,    -1,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,    -1,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,   257,    -1,
-      -1,   260,    -1,   262,    -1,    -1,    -1,   266,    -1,    -1,
-     269,   270,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
+     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
+      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
+      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
+      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
+     269,    -1,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
      279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,   292,    -1,    -1,   295,    -1,   297,   298,
+      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
      299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
      309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
      319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
       -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
      339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
      349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,    -1,
+      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
      369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
      379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
      399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,    -1,    -1,    -1,   415,   416,    -1,   418,
+     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
       -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
       -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
      439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,    -1,   453,   454,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,    -1,    -1,   467,   468,
-      -1,   470,   471,   472,   473,   474,    -1,    -1,    -1,   478,
-     479,   480,    -1,   482,    -1,   484,   485,    -1,   487,   488,
+     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
+     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
+      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
+     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
       -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,    -1,    -1,    -1,
-     509,    -1,   511,    -1,   513,   514,   515,   516,   517,    -1,
+      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
+     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
       -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,    -1,
-     539,   540,   541,   542,    -1,    -1,    -1,   546,    -1,    -1,
+      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
+     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
      549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
      559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
      569,    -1,    -1,   572,   573,    -1,   575,   576,   577,   578,
       -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-      -1,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,    -1,    -1,    -1,    -1,   604,    -1,    -1,   607,    -1,
+     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
+      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
      609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
       -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,   635,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,    -1,   645,   646,    -1,    -1,
+     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
+     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
      649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,    -1,    -1,    -1,   678,
+     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
       -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
       -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
       -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,    -1,   713,   714,   715,   716,   717,   718,
+     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
       -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
      729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
      739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
      749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
      759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
      769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    -1,    -1,    25,    26,    27,    28,
+     779,   780,   781,   782,   783,   784,   785,   786,   787,   788,
+     789,   790,   791,   792,   793,    -1,    -1,    -1,    -1,    -1,
+       5,     6,   801,     8,     9,    10,    11,    12,    13,    14,
+      15,    -1,    -1,    -1,    -1,    20,    -1,    -1,    23,    -1,
+      25,    26,    27,    28,    29,    30,    -1,    32,    -1,    -1,
+      -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,    44,
+      45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,    -1,
+      -1,    56,    57,    -1,    59,    60,    61,    -1,    63,    -1,
+      65,    66,    67,    68,    69,    70,    -1,    72,    73,    -1,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    -1,    87,    88,    -1,    90,    91,    92,    93,    94,
+      -1,    -1,    -1,    98,    99,    -1,    -1,    -1,   103,    -1,
+      -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,    -1,
+     115,    -1,    -1,    -1,    -1,   120,   121,    -1,    -1,    -1,
+      -1,   126,   127,    -1,   129,   130,    -1,    -1,    -1,    -1,
+     135,   136,   137,   138,   139,    -1,    -1,    -1,   143,   144,
+      -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,   154,
+     155,    -1,   157,   158,   159,    -1,    -1,   162,   163,    -1,
+     165,   166,   167,   168,   169,   170,    -1,    -1,   173,   174,
+     175,   176,   177,    -1,    -1,   180,   181,    -1,   183,   184,
+     185,   186,   187,    -1,    -1,   190,   191,    -1,    -1,    -1,
+     195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,   204,
+     205,   206,   207,    -1,   209,   210,   211,    -1,    -1,    -1,
+     215,   216,    -1,   218,    -1,    -1,   221,   222,    -1,    -1,
+      -1,   226,   227,   228,   229,    -1,    -1,   232,   233,   234,
+     235,    -1,   237,    -1,    -1,    -1,   241,   242,   243,   244,
+      -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,    -1,
+     255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,    -1,
+     265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,   274,
+      -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,   284,
+     285,   286,   287,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     295,    -1,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,    -1,
+     315,   316,   317,    -1,   319,   320,   321,   322,    -1,   324,
+     325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,   334,
+     335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,    -1,
+     345,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
+      -1,   356,   357,    -1,    -1,   360,   361,   362,   363,    -1,
+      -1,    -1,    -1,   368,   369,    -1,    -1,    -1,   373,    -1,
+     375,   376,    -1,   378,   379,   380,    -1,    -1,   383,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,   394,
+     395,    -1,   397,    -1,   399,    -1,   401,   402,   403,   404,
+     405,   406,   407,   408,   409,   410,    -1,   412,    -1,   414,
+     415,   416,    -1,   418,    -1,   420,   421,   422,   423,   424,
+      -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,    -1,
+     435,   436,    -1,   438,   439,   440,    -1,   442,   443,   444,
+     445,   446,    -1,   448,   449,    -1,   451,   452,   453,    -1,
+      -1,   456,   457,   458,   459,   460,   461,   462,   463,    -1,
+     465,    -1,   467,   468,    -1,   470,   471,   472,    -1,   474,
+      -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,   484,
+     485,   486,   487,   488,    -1,   490,   491,   492,    -1,    -1,
+     495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,    -1,
+     505,   506,    -1,   508,   509,   510,   511,    -1,   513,   514,
+     515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,   524,
+     525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,    -1,
+     535,    -1,   537,   538,   539,   540,   541,   542,    -1,    -1,
+     545,   546,    -1,    -1,   549,   550,   551,   552,   553,   554,
+      -1,    -1,   557,   558,   559,   560,    -1,   562,   563,    -1,
+      -1,   566,   567,   568,   569,    -1,   571,   572,   573,    -1,
+     575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,   584,
+     585,   586,    -1,    -1,   589,   590,   591,    -1,    -1,   594,
+     595,    -1,   597,   598,    -1,   600,   601,    -1,    -1,   604,
+      -1,    -1,   607,   608,   609,   610,   611,   612,    -1,    -1,
+      -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,    -1,
+      -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,    -1,
+      -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,   644,
+     645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,   654,
+     655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   667,   668,   669,    -1,   671,   672,   673,    -1,
+     675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,    -1,
+      -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,    -1,
+     695,   696,    -1,    -1,    -1,   700,   701,   702,   703,   704,
+     705,   706,    -1,    -1,   709,   710,   711,    -1,   713,   714,
+     715,   716,   717,   718,    -1,   720,   721,   722,   723,   724,
+     725,   726,   727,   728,   729,   730,   731,   732,   733,   734,
+     735,   736,   737,   738,   739,   740,   741,   742,   743,    -1,
+     745,   746,   747,   748,   749,   750,   751,    -1,   753,   754,
+     755,   756,   757,   758,   759,   760,   761,   762,   763,   764,
+     765,   766,   767,   768,   769,   770,   771,   772,   773,   774,
+     775,   776,   777,   778,   779,   780,   781,   782,   783,   784,
+     785,   786,   787,   788,   789,   790,   791,   792,   793,     5,
+       6,    -1,     8,     9,    10,    11,    12,    13,    14,    15,
+      -1,    -1,    -1,    -1,    20,    -1,    -1,    23,    -1,    25,
+      26,    27,    28,    29,    30,    -1,    32,    -1,    -1,    -1,
+      36,    -1,    -1,    -1,    40,    -1,    -1,    43,    44,    45,
+      -1,    47,    -1,    49,    50,    -1,    -1,    53,    -1,    -1,
+      56,    57,    -1,    59,    60,    61,    -1,    63,    -1,    65,
+      66,    67,    68,    69,    70,    -1,    72,    73,    -1,    75,
+      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
+      -1,    87,    88,    -1,    90,    91,    92,    93,    94,    -1,
+      -1,    -1,    98,    99,    -1,    -1,    -1,   103,    -1,    -1,
+     106,    -1,    -1,    -1,   110,   111,   112,    -1,    -1,   115,
+      -1,    -1,    -1,    -1,   120,   121,    -1,    -1,    -1,    -1,
+     126,   127,    -1,   129,   130,    -1,    -1,    -1,    -1,   135,
+     136,   137,   138,   139,    -1,    -1,    -1,   143,   144,    -1,
+     146,   147,   148,    -1,    -1,    -1,   152,    -1,   154,   155,
+      -1,   157,   158,   159,    -1,    -1,   162,   163,    -1,   165,
+     166,   167,   168,   169,   170,    -1,    -1,   173,   174,   175,
+     176,   177,    -1,    -1,   180,   181,    -1,   183,   184,   185,
+     186,   187,    -1,    -1,   190,   191,    -1,    -1,    -1,   195,
+     196,    -1,   198,    -1,    -1,    -1,   202,    -1,   204,   205,
+     206,   207,    -1,   209,   210,   211,    -1,    -1,    -1,   215,
+     216,    -1,   218,    -1,    -1,   221,   222,    -1,    -1,    -1,
+     226,   227,   228,   229,    -1,    -1,   232,   233,   234,   235,
+      -1,   237,    -1,    -1,    -1,   241,   242,   243,   244,    -1,
+      -1,    -1,   248,    -1,    -1,    -1,   252,   253,    -1,   255,
+     256,    -1,    -1,    -1,   260,    -1,   262,    -1,    -1,   265,
+     266,    -1,    -1,   269,    -1,    -1,   272,   273,   274,    -1,
+      -1,    -1,    -1,   279,   280,    -1,   282,    -1,   284,   285,
+     286,   287,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   295,
+      -1,   297,   298,   299,   300,   301,   302,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,   312,   313,    -1,   315,
+     316,   317,    -1,   319,   320,   321,   322,    -1,   324,   325,
+      -1,    -1,    -1,    -1,   330,   331,   332,   333,   334,   335,
+      -1,    -1,   338,   339,    -1,   341,    -1,   343,    -1,   345,
+     346,   347,   348,   349,   350,   351,   352,   353,    -1,    -1,
+     356,   357,    -1,    -1,   360,   361,   362,   363,    -1,    -1,
+      -1,    -1,   368,   369,    -1,    -1,    -1,   373,    -1,   375,
+     376,    -1,   378,   379,   380,    -1,    -1,   383,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,   394,   395,
+      -1,   397,    -1,   399,    -1,   401,   402,   403,   404,   405,
+     406,   407,   408,   409,   410,    -1,   412,    -1,   414,   415,
+     416,    -1,   418,    -1,   420,   421,   422,   423,   424,    -1,
+     426,   427,   428,    -1,    -1,   431,    -1,    -1,    -1,   435,
+     436,    -1,   438,   439,   440,    -1,   442,   443,   444,   445,
+     446,    -1,   448,   449,    -1,   451,   452,   453,    -1,    -1,
+     456,   457,   458,   459,   460,   461,   462,   463,    -1,   465,
+      -1,   467,   468,    -1,   470,   471,   472,    -1,   474,    -1,
+      -1,   477,   478,   479,   480,    -1,   482,    -1,   484,   485,
+     486,   487,   488,    -1,   490,   491,   492,    -1,    -1,   495,
+     496,   497,   498,    -1,    -1,    -1,   502,    -1,    -1,   505,
+     506,    -1,   508,   509,   510,   511,    -1,   513,   514,   515,
+     516,   517,    -1,    -1,    -1,    -1,    -1,   523,   524,   525,
+      -1,   527,    -1,    -1,   530,    -1,    -1,   533,    -1,   535,
+      -1,   537,   538,   539,   540,   541,   542,    -1,    -1,   545,
+     546,    -1,    -1,   549,   550,   551,   552,   553,   554,    -1,
+      -1,   557,   558,   559,   560,    -1,   562,   563,    -1,    -1,
+     566,   567,   568,   569,    -1,   571,   572,   573,    -1,   575,
+     576,   577,   578,    -1,    -1,    -1,    -1,    -1,   584,   585,
+     586,    -1,    -1,   589,   590,   591,    -1,    -1,   594,   595,
+      -1,   597,   598,    -1,   600,   601,    -1,    -1,   604,    -1,
+      -1,   607,   608,   609,   610,   611,   612,    -1,    -1,    -1,
+      -1,    -1,   618,    -1,   620,    -1,    -1,   623,    -1,    -1,
+      -1,   627,    -1,   629,   630,   631,   632,    -1,    -1,    -1,
+      -1,    -1,    -1,   639,   640,   641,    -1,   643,   644,   645,
+     646,    -1,    -1,   649,    -1,    -1,   652,   653,   654,   655,
+     656,    -1,   658,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   667,   668,   669,    -1,   671,   672,   673,    -1,   675,
+      -1,    -1,   678,    -1,   680,    -1,    -1,    -1,    -1,    -1,
+      -1,   687,   688,    -1,    -1,   691,    -1,   693,    -1,   695,
+     696,    -1,    -1,    -1,   700,   701,   702,   703,   704,   705,
+     706,    -1,    -1,   709,   710,   711,    -1,   713,   714,   715,
+     716,   717,   718,    -1,   720,   721,   722,   723,   724,   725,
+     726,   727,   728,   729,   730,   731,   732,   733,   734,   735,
+     736,   737,   738,   739,   740,   741,   742,   743,    -1,   745,
+     746,   747,   748,   749,   750,   751,    -1,   753,   754,   755,
+     756,   757,   758,   759,   760,   761,   762,   763,   764,   765,
+     766,   767,   768,   769,   770,   771,   772,   773,   774,   775,
+     776,   777,   778,   779,   780,   781,   782,   783,   784,   785,
+     786,   787,   788,   789,   790,   791,   792,   793,     5,     6,
+      -1,     8,     9,    10,    11,    12,    -1,    14,    15,    -1,
+      -1,    -1,    -1,    20,    -1,    -1,    23,    -1,    25,    26,
+      27,    28,    29,    30,    -1,    32,    -1,    -1,    -1,    36,
+      -1,    -1,    -1,    40,    -1,    -1,    43,    44,    45,    -1,
+      47,    -1,    49,    50,    -1,    -1,    53,    -1,    -1,    56,
+      57,    -1,    59,    60,    61,    -1,    63,    -1,    65,    66,
+      67,    68,    69,    70,    -1,    72,    73,    -1,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    -1,
+      87,    88,    -1,    90,    91,    92,    93,    94,    -1,    -1,
+      -1,    98,    99,    -1,    -1,    -1,   103,    -1,    -1,   106,
+      -1,    -1,    -1,   110,   111,   112,    -1,    -1,   115,    -1,
+      -1,    -1,    -1,   120,   121,    -1,    -1,    -1,    -1,   126,
+     127,    -1,   129,   130,    -1,    -1,    -1,    -1,   135,   136,
+     137,   138,   139,    -1,    -1,    -1,   143,   144,    -1,   146,
+     147,   148,    -1,    -1,    -1,   152,    -1,   154,   155,    -1,
+     157,   158,   159,    -1,    -1,   162,   163,    -1,   165,   166,
+     167,   168,   169,   170,    -1,    -1,   173,   174,   175,   176,
+     177,    -1,    -1,   180,   181,    -1,   183,   184,   185,   186,
+     187,    -1,    -1,   190,   191,    -1,    -1,    -1,   195,   196,
+      -1,   198,    -1,    -1,    -1,   202,    -1,   204,   205,   206,
+     207,    -1,   209,   210,   211,    -1,    -1,    -1,   215,   216,
+      -1,   218,    -1,    -1,   221,   222,    -1,    -1,    -1,   226,
+     227,   228,   229,    -1,    -1,   232,   233,   234,   235,    -1,
+     237,    -1,    -1,    -1,   241,   242,   243,   244,    -1,    -1,
+      -1,   248,    -1,    -1,    -1,   252,   253,    -1,   255,   256,
+      -1,    -1,    -1,   260,    -1,   262,    -1,    -1,   265,   266,
+      -1,    -1,   269,    -1,    -1,   272,   273,   274,    -1,    -1,
+      -1,    -1,   279,   280,    -1,   282,    -1,   284,   285,   286,
+     287,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,
+     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,   313,    -1,   315,   316,
+     317,    -1,   319,   320,   321,   322,    -1,   324,   325,    -1,
+      -1,    -1,    -1,   330,   331,   332,   333,   334,   335,    -1,
+      -1,   338,   339,    -1,   341,    -1,   343,    -1,   345,   346,
+     347,   348,   349,   350,   351,   352,   353,    -1,    -1,   356,
+     357,    -1,    -1,   360,   361,   362,   363,    -1,    -1,    -1,
+      -1,   368,   369,    -1,    -1,    -1,   373,    -1,   375,   376,
+      -1,   378,   379,   380,    -1,    -1,   383,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   393,   394,   395,    -1,
+     397,    -1,   399,    -1,   401,   402,   403,   404,   405,   406,
+     407,   408,   409,   410,    -1,   412,    -1,   414,   415,   416,
+      -1,   418,    -1,   420,   421,   422,   423,    -1,    -1,   426,
+     427,   428,    -1,    -1,   431,    -1,    -1,    -1,   435,   436,
+      -1,   438,   439,   440,    -1,   442,   443,   444,   445,   446,
+      -1,   448,   449,    -1,   451,   452,   453,    -1,    -1,   456,
+     457,   458,   459,   460,   461,   462,   463,    -1,   465,    -1,
+     467,   468,    -1,   470,   471,   472,    -1,   474,    -1,    -1,
+     477,   478,   479,   480,    -1,   482,    -1,   484,   485,   486,
+     487,   488,    -1,   490,   491,   492,    -1,    -1,   495,   496,
+     497,   498,    -1,    -1,    -1,   502,    -1,    -1,   505,   506,
+      -1,   508,   509,   510,   511,    -1,   513,   514,   515,   516,
+     517,    -1,    -1,    -1,    -1,    -1,   523,   524,   525,    -1,
+     527,    -1,    -1,   530,    -1,    -1,   533,    -1,   535,    -1,
+     537,   538,   539,   540,   541,   542,    -1,    -1,   545,   546,
+      -1,    -1,   549,   550,   551,   552,   553,   554,    -1,    -1,
+     557,   558,   559,   560,    -1,   562,   563,    -1,    -1,   566,
+     567,   568,   569,    -1,   571,   572,   573,    -1,   575,   576,
+     577,   578,    -1,    -1,    -1,    -1,    -1,   584,   585,   586,
+      -1,    -1,   589,   590,   591,    -1,    -1,   594,   595,    -1,
+     597,   598,    -1,   600,   601,    -1,    -1,   604,    -1,    -1,
+     607,   608,   609,   610,   611,   612,    -1,    -1,    -1,    -1,
+      -1,   618,    -1,   620,    -1,    -1,   623,    -1,    -1,    -1,
+     627,    -1,   629,   630,   631,   632,    -1,    -1,    -1,    -1,
+      -1,    -1,   639,   640,   641,    -1,   643,   644,   645,   646,
+      -1,    -1,   649,    -1,    -1,   652,   653,   654,   655,   656,
+      -1,   658,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     667,   668,   669,    -1,   671,   672,   673,    -1,   675,    -1,
+      -1,   678,    -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,
+     687,   688,    -1,    -1,   691,    -1,   693,    -1,   695,   696,
+      -1,    -1,    -1,   700,   701,   702,   703,   704,   705,   706,
+      -1,    -1,   709,   710,   711,    -1,   713,   714,   715,   716,
+     717,   718,    -1,   720,   721,   722,   723,   724,   725,   726,
+     727,   728,   729,   730,   731,   732,   733,   734,   735,   736,
+     737,   738,   739,   740,   741,   742,   743,    -1,   745,   746,
+     747,   748,   749,   750,   751,    -1,   753,   754,   755,   756,
+     757,   758,   759,   760,   761,   762,   763,   764,   765,   766,
+     767,   768,   769,   770,   771,   772,   773,   774,   775,   776,
+     777,   778,   779,   780,   781,   782,   783,   784,   785,   786,
+     787,   788,   789,   790,   791,   792,   793,     5,     6,    -1,
+       8,     9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,
+      -1,    -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,
+      28,    29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,
+      -1,    -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,
+      -1,    49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,
+      -1,    59,    60,    61,    -1,    63,    -1,    65,    66,    67,
+      68,    69,    70,    -1,    72,    73,    -1,    75,    76,    77,
+      78,    79,    80,    81,    82,    83,    84,    85,    -1,    87,
+      88,    -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,
+      98,    -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,
+      -1,    -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,
+      -1,    -1,   120,   121,   122,    -1,    -1,    -1,   126,   127,
+      -1,   129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,
+     138,   139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,
+     148,    -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,
+     158,   159,    -1,    -1,   162,   163,    -1,   165,   166,   167,
+     168,   169,   170,    -1,    -1,   173,   174,   175,   176,   177,
+      -1,    -1,   180,   181,    -1,   183,   184,   185,   186,   187,
+     188,    -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,
+     198,    -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,
+      -1,   209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,
+     218,   219,    -1,   221,   222,    -1,    -1,    -1,   226,   227,
+     228,   229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,
+      -1,    -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,
+     248,    -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,
+      -1,    -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,
+      -1,   269,    -1,    -1,   272,   273,    -1,    -1,    -1,    -1,
+      -1,   279,   280,    -1,   282,    -1,   284,    -1,   286,   287,
+      -1,    -1,   290,    -1,    -1,    -1,    -1,   295,    -1,   297,
+     298,   299,   300,   301,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,   313,    -1,   315,   316,   317,
+      -1,   319,   320,   321,   322,    -1,   324,   325,    -1,    -1,
+      -1,    -1,   330,   331,   332,   333,   334,   335,    -1,    -1,
+     338,   339,    -1,   341,    -1,   343,    -1,   345,   346,   347,
+     348,   349,   350,   351,   352,   353,    -1,    -1,   356,   357,
+      -1,    -1,   360,   361,   362,   363,   364,   365,   366,    -1,
+     368,   369,    -1,    -1,   372,   373,    -1,   375,   376,    -1,
+     378,   379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,
+      -1,   399,    -1,   401,   402,   403,   404,   405,   406,   407,
+     408,   409,   410,    -1,   412,    -1,   414,   415,   416,    -1,
+     418,    -1,   420,   421,   422,   423,   424,    -1,   426,   427,
+     428,    -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,
+     438,   439,    -1,    -1,   442,   443,   444,   445,   446,    -1,
+     448,   449,    -1,   451,   452,   453,    -1,    -1,   456,   457,
+     458,   459,   460,   461,   462,   463,    -1,   465,    -1,   467,
+     468,    -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,
+     478,   479,   480,    -1,   482,    -1,   484,   485,   486,   487,
+     488,    -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,
+     498,    -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,
+     508,   509,   510,   511,    -1,   513,   514,   515,   516,   517,
+      -1,    -1,   520,   521,   522,   523,   524,   525,    -1,   527,
+      -1,    -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,
+     538,   539,   540,   541,   542,    -1,    -1,   545,   546,    -1,
+      -1,   549,   550,   551,   552,   553,   554,    -1,    -1,   557,
+     558,   559,   560,    -1,   562,   563,    -1,    -1,   566,   567,
+     568,   569,    -1,    -1,   572,   573,    -1,   575,   576,   577,
+     578,    -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,
+      -1,   589,   590,   591,    -1,   593,   594,   595,    -1,   597,
+     598,    -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,
+      -1,   609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,
+     618,    -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,
+      -1,   629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,
+      -1,   639,   640,   641,    -1,   643,   644,   645,   646,    -1,
+      -1,   649,    -1,    -1,   652,   653,   654,   655,   656,    -1,
+     658,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,
+     668,   669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,
+     678,    -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,
+     688,    -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,
+      -1,    -1,   700,   701,   702,   703,   704,   705,   706,   707,
+      -1,   709,   710,   711,   712,   713,   714,   715,   716,   717,
+     718,    -1,   720,   721,   722,   723,   724,   725,   726,   727,
+     728,   729,   730,   731,   732,   733,   734,   735,   736,   737,
+     738,   739,   740,   741,   742,   743,    -1,   745,   746,   747,
+     748,   749,   750,   751,    -1,   753,   754,   755,   756,   757,
+     758,   759,   760,   761,   762,   763,   764,   765,   766,   767,
+     768,   769,   770,   771,   772,   773,   774,   775,   776,   777,
+     778,   779,   780,   781,   782,   783,   784,   785,   786,   787,
+     788,   789,   790,   791,   792,   793,     5,     6,    -1,     8,
+       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    18,
+      19,    20,    21,    -1,    23,    -1,    25,    26,    27,    28,
       29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
       -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      -1,    -1,    -1,    -1,    53,    54,    -1,    56,    57,    -1,
-      59,    60,    -1,    -1,    -1,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    -1,    78,
-      -1,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    -1,    94,    -1,    -1,    -1,    98,
+      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
+      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
+      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
+      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
+      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
       -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
       -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,    -1,    -1,    -1,    -1,    -1,   126,   127,    -1,
+      -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,
      129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,    -1,    -1,    -1,   146,   147,   148,
+     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
       -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
      159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,    -1,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,   182,   183,   184,   185,   186,   187,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   195,   196,    -1,   198,
+     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
+      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
+      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
       -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,    -1,   216,    -1,    -1,
+     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
       -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,   230,    -1,   232,    -1,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,    -1,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,   257,    -1,
-      -1,   260,    -1,   262,    -1,    -1,    -1,   266,    -1,    -1,
-     269,   270,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
+     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
+      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
+      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
+      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
+     269,    -1,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
      279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,   292,    -1,    -1,   295,    -1,   297,   298,
+      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
      299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
      309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
      319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
       -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
      339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
      349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,    -1,
+      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
      369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
+     379,   380,    -1,    -1,   383,    -1,    -1,   386,    -1,    -1,
+     389,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
      399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,    -1,    -1,    -1,   415,   416,    -1,   418,
+     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
       -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
       -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
      439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,    -1,   453,   454,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,    -1,    -1,   467,   468,
-      -1,   470,   471,   472,   473,   474,    -1,    -1,    -1,   478,
-     479,   480,    -1,   482,    -1,   484,   485,    -1,   487,   488,
+     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
+     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
+      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
+     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
       -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,    -1,    -1,    -1,
-     509,    -1,   511,    -1,   513,   514,   515,   516,   517,    -1,
+      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
+     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
       -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,    -1,
-     539,   540,   541,   542,    -1,    -1,    -1,   546,    -1,    -1,
+      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
+     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
      549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
      559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,    -1,   572,   573,    -1,   575,   576,   577,   578,
+     569,    -1,   571,   572,   573,    -1,   575,   576,   577,   578,
       -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-      -1,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,    -1,    -1,    -1,    -1,   604,    -1,    -1,   607,    -1,
+     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
+      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
      609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
       -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,   635,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,    -1,   645,   646,    -1,    -1,
+     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
+     639,   640,   641,    -1,   643,   644,   645,   646,   647,    -1,
      649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,    -1,    -1,    -1,   678,
+     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
       -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
       -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
       -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,    -1,   713,   714,   715,   716,   717,   718,
+     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
       -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
      729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
      739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
      749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
      759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
      769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
+     779,   780,   781,   782,   783,   784,   785,   786,   787,   788,
+     789,   790,   791,   792,   793,     5,     6,    -1,     8,     9,
+      10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,    -1,
+      20,    -1,    -1,    23,    -1,    25,    26,    27,    28,    29,
+      30,    -1,    32,    -1,    -1,    35,    36,    -1,    -1,    -1,
+      40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,    49,
+      50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,    59,
+      60,    61,    -1,    63,    -1,    65,    66,    67,    68,    69,
+      70,    -1,    72,    73,    -1,    75,    76,    77,    78,    79,
+      80,    81,    82,    83,    84,    85,    -1,    87,    88,    -1,
+      90,    91,    92,    93,    94,    -1,    -1,    -1,    98,    -1,
+      -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,    -1,
+     110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,    -1,
+     120,   121,    -1,    -1,    -1,   125,   126,   127,    -1,   129,
+      -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,   139,
+      -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,    -1,
+      -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,   159,
+     160,    -1,   162,   163,    -1,   165,   166,   167,   168,   169,
+     170,    -1,    -1,   173,   174,   175,   176,   177,    -1,    -1,
+     180,   181,    -1,   183,   184,   185,   186,   187,    -1,    -1,
+     190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,    -1,
+      -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,   209,
+      -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,    -1,
+      -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,   229,
+      -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,    -1,
+      -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,    -1,
+      -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,    -1,
+     260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,   269,
+      -1,    -1,   272,   273,   274,    -1,    -1,    -1,    -1,   279,
+     280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,    -1,   315,   316,   317,    -1,   319,
+     320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,    -1,
+     330,   331,   332,   333,   334,   335,    -1,    -1,   338,   339,
+      -1,   341,    -1,   343,    -1,   345,   346,   347,   348,   349,
+     350,   351,   352,   353,    -1,    -1,   356,   357,    -1,    -1,
+     360,   361,   362,   363,   364,    -1,    -1,    -1,   368,   369,
+      -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,   379,
+     380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,   399,
+      -1,   401,   402,   403,   404,   405,   406,   407,   408,   409,
+     410,    -1,   412,    -1,   414,   415,   416,    -1,   418,    -1,
+     420,   421,   422,   423,   424,    -1,   426,   427,   428,    -1,
+      -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,   439,
+      -1,    -1,   442,   443,   444,   445,   446,    -1,   448,   449,
+      -1,   451,   452,   453,    -1,    -1,   456,   457,   458,   459,
+     460,   461,   462,   463,    -1,   465,    -1,   467,   468,    -1,
+     470,   471,   472,    -1,   474,    -1,    -1,   477,   478,   479,
+     480,    -1,   482,    -1,   484,   485,   486,   487,   488,    -1,
+     490,   491,    -1,    -1,    -1,   495,   496,   497,   498,    -1,
+      -1,   501,   502,    -1,    -1,    -1,   506,    -1,   508,   509,
+     510,   511,    -1,   513,   514,   515,   516,   517,    -1,    -1,
+      -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,    -1,
+     530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,   539,
+     540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,   549,
+     550,   551,   552,   553,   554,    -1,    -1,   557,   558,   559,
+     560,    -1,   562,   563,    -1,    -1,   566,   567,   568,   569,
+      -1,   571,   572,   573,    -1,   575,   576,   577,   578,    -1,
+      -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,   589,
+     590,   591,    -1,    -1,   594,   595,    -1,   597,   598,    -1,
+     600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,   609,
+      -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,    -1,
+     620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,   629,
+     630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,   639,
+     640,   641,    -1,   643,   644,   645,   646,    -1,    -1,   649,
+      -1,    -1,   652,   653,   654,   655,   656,    -1,   658,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,   669,
+      -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,    -1,
+     680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,    -1,
+      -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,    -1,
+     700,   701,   702,   703,   704,   705,   706,   707,    -1,   709,
+     710,   711,   712,   713,   714,   715,   716,   717,   718,    -1,
+     720,   721,   722,   723,   724,   725,   726,   727,   728,   729,
+     730,   731,   732,   733,   734,   735,   736,   737,   738,   739,
+     740,   741,   742,   743,    -1,   745,   746,   747,   748,   749,
+     750,   751,    -1,   753,   754,   755,   756,   757,   758,   759,
+     760,   761,   762,   763,   764,   765,   766,   767,   768,   769,
+     770,   771,   772,   773,   774,   775,   776,   777,   778,   779,
+     780,   781,   782,   783,   784,   785,   786,   787,   788,   789,
+     790,   791,   792,   793,     5,     6,    -1,     8,     9,    10,
+      11,    12,    -1,    -1,    15,    -1,    -1,    -1,    -1,    20,
+      -1,    -1,    23,    -1,    25,    26,    27,    28,    29,    30,
+      -1,    32,    -1,    -1,    -1,    36,    -1,    -1,    -1,    40,
+      -1,    -1,    43,    44,    45,    -1,    47,    -1,    49,    50,
+      -1,    -1,    53,    -1,    -1,    56,    57,    -1,    59,    60,
+      61,    -1,    63,    -1,    65,    66,    67,    68,    69,    70,
+      -1,    72,    73,    -1,    75,    76,    77,    78,    79,    80,
+      81,    82,    83,    84,    85,    -1,    87,    88,    89,    90,
+      91,    92,    93,    94,    -1,    -1,    -1,    98,    -1,    -1,
+      -1,    -1,   103,    -1,    -1,   106,    -1,    -1,    -1,   110,
+     111,   112,    -1,    -1,   115,    -1,    -1,    -1,    -1,   120,
+     121,    -1,    -1,    -1,    -1,   126,   127,    -1,   129,    -1,
+      -1,    -1,    -1,    -1,   135,   136,   137,   138,   139,    -1,
+      -1,    -1,   143,    -1,    -1,   146,   147,   148,    -1,    -1,
+      -1,   152,    -1,   154,   155,    -1,   157,   158,   159,    -1,
+      -1,   162,   163,    -1,   165,   166,   167,   168,   169,   170,
+      -1,    -1,   173,   174,   175,   176,   177,    -1,    -1,   180,
+     181,    -1,   183,   184,   185,   186,   187,    -1,    -1,   190,
+     191,    -1,    -1,    -1,   195,   196,    -1,   198,   199,    -1,
+      -1,   202,    -1,   204,   205,   206,   207,    -1,   209,    -1,
+     211,    -1,    -1,    -1,   215,   216,    -1,   218,    -1,    -1,
+     221,   222,    -1,    -1,    -1,   226,   227,   228,   229,    -1,
+      -1,   232,   233,   234,   235,    -1,   237,    -1,    -1,    -1,
+      -1,   242,   243,   244,    -1,    -1,    -1,   248,    -1,    -1,
+      -1,   252,   253,    -1,   255,   256,    -1,    -1,    -1,   260,
+      -1,   262,   263,    -1,   265,   266,    -1,    -1,   269,    -1,
+      -1,   272,   273,    -1,    -1,    -1,    -1,    -1,   279,   280,
+      -1,   282,    -1,   284,    -1,   286,   287,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   295,    -1,   297,   298,   299,   300,
+     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
+     311,   312,   313,    -1,   315,   316,   317,    -1,   319,   320,
+     321,   322,    -1,   324,   325,    -1,    -1,    -1,    -1,   330,
+     331,   332,   333,   334,   335,    -1,    -1,   338,   339,    -1,
+     341,    -1,   343,    -1,   345,   346,   347,   348,   349,   350,
+     351,   352,   353,    -1,    -1,   356,   357,    -1,    -1,   360,
+     361,   362,   363,   364,    -1,    -1,    -1,   368,   369,    -1,
+      -1,    -1,   373,    -1,   375,   376,    -1,   378,   379,   380,
+      -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   393,   394,   395,    -1,   397,    -1,   399,    -1,
+     401,   402,   403,   404,   405,   406,   407,   408,   409,   410,
+      -1,   412,    -1,   414,   415,   416,    -1,   418,    -1,   420,
+     421,   422,   423,   424,    -1,   426,   427,   428,    -1,    -1,
+     431,    -1,    -1,    -1,   435,   436,    -1,   438,   439,    -1,
+      -1,   442,   443,   444,   445,   446,    -1,   448,   449,    -1,
+     451,   452,   453,    -1,    -1,   456,   457,   458,   459,   460,
+     461,   462,   463,    -1,   465,    -1,   467,   468,    -1,   470,
+     471,   472,    -1,   474,    -1,    -1,   477,   478,   479,   480,
+      -1,   482,    -1,   484,   485,   486,   487,   488,    -1,   490,
+     491,    -1,    -1,    -1,   495,   496,   497,   498,    -1,    -1,
+      -1,   502,    -1,    -1,    -1,   506,    -1,   508,   509,   510,
+     511,    -1,   513,   514,   515,   516,   517,   518,    -1,    -1,
+      -1,    -1,   523,   524,   525,    -1,   527,    -1,    -1,   530,
+      -1,    -1,   533,    -1,   535,    -1,   537,   538,   539,   540,
+     541,   542,    -1,    -1,   545,   546,    -1,    -1,   549,   550,
+     551,   552,   553,   554,    -1,    -1,   557,   558,   559,   560,
+      -1,   562,   563,    -1,    -1,   566,   567,   568,   569,    -1,
+      -1,   572,   573,    -1,   575,   576,   577,   578,    -1,    -1,
+      -1,    -1,    -1,   584,   585,    -1,    -1,    -1,   589,   590,
+     591,    -1,    -1,   594,   595,    -1,   597,   598,    -1,   600,
+     601,    -1,    -1,   604,    -1,    -1,   607,    -1,   609,    -1,
+     611,   612,    -1,    -1,    -1,    -1,    -1,   618,    -1,   620,
+      -1,    -1,   623,    -1,    -1,    -1,   627,    -1,   629,   630,
+     631,   632,    -1,    -1,    -1,    -1,    -1,    -1,   639,   640,
+     641,    -1,   643,   644,   645,   646,    -1,    -1,   649,    -1,
+      -1,   652,   653,   654,   655,   656,    -1,   658,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   667,   668,   669,    -1,
+     671,   672,   673,    -1,   675,    -1,    -1,   678,    -1,   680,
+      -1,    -1,    -1,    -1,    -1,    -1,   687,   688,    -1,    -1,
+     691,    -1,   693,    -1,   695,   696,    -1,    -1,    -1,   700,
+     701,   702,   703,   704,   705,   706,   707,    -1,   709,   710,
+     711,   712,   713,   714,   715,   716,   717,   718,    -1,   720,
+     721,   722,   723,   724,   725,   726,   727,   728,   729,   730,
+     731,   732,   733,   734,   735,   736,   737,   738,   739,   740,
+     741,   742,   743,    -1,   745,   746,   747,   748,   749,   750,
+     751,    -1,   753,   754,   755,   756,   757,   758,   759,   760,
+     761,   762,   763,   764,   765,   766,   767,   768,   769,   770,
+     771,   772,   773,   774,   775,   776,   777,   778,   779,   780,
+     781,   782,   783,   784,   785,   786,   787,   788,   789,   790,
+     791,   792,   793,     5,     6,    -1,     8,     9,    10,    11,
+      12,    -1,    -1,    15,    -1,    -1,    -1,    -1,    20,    -1,
+      -1,    23,    -1,    25,    26,    27,    28,    29,    30,    -1,
+      32,    -1,    -1,    35,    36,    -1,    -1,    -1,    40,    -1,
+      -1,    43,    44,    45,    -1,    47,    -1,    49,    50,    -1,
+      -1,    53,    -1,    -1,    56,    57,    -1,    59,    60,    61,
+      -1,    63,    -1,    65,    66,    67,    68,    69,    70,    -1,
+      72,    73,    -1,    75,    76,    77,    78,    79,    80,    81,
+      82,    83,    84,    85,    -1,    87,    88,    -1,    90,    91,
+      92,    93,    94,    -1,    -1,    -1,    98,    -1,    -1,    -1,
+      -1,   103,    -1,    -1,   106,    -1,    -1,    -1,   110,   111,
+     112,    -1,    -1,   115,    -1,    -1,    -1,    -1,   120,   121,
+      -1,    -1,    -1,   125,   126,   127,    -1,   129,    -1,    -1,
+      -1,    -1,    -1,   135,   136,   137,   138,   139,    -1,    -1,
+      -1,   143,    -1,    -1,   146,   147,   148,    -1,    -1,    -1,
+     152,    -1,   154,   155,    -1,   157,   158,   159,    -1,    -1,
+     162,   163,    -1,   165,   166,   167,   168,   169,   170,    -1,
+      -1,   173,   174,   175,   176,   177,    -1,    -1,   180,   181,
+      -1,   183,   184,   185,   186,   187,    -1,    -1,   190,   191,
+      -1,    -1,    -1,   195,   196,    -1,   198,    -1,    -1,    -1,
+     202,    -1,   204,   205,   206,   207,    -1,   209,    -1,   211,
+      -1,    -1,    -1,   215,   216,    -1,   218,    -1,    -1,   221,
+     222,    -1,    -1,    -1,   226,   227,   228,   229,    -1,    -1,
+     232,   233,   234,    -1,    -1,   237,    -1,    -1,    -1,    -1,
+     242,   243,   244,    -1,    -1,    -1,   248,    -1,    -1,    -1,
+     252,   253,    -1,   255,   256,    -1,    -1,    -1,   260,    -1,
+     262,    -1,    -1,   265,   266,    -1,    -1,   269,    -1,    -1,
+     272,   273,   274,    -1,    -1,    -1,    -1,   279,   280,    -1,
+     282,    -1,   284,    -1,   286,   287,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   295,    -1,   297,   298,   299,   300,   301,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,   313,    -1,   315,   316,   317,    -1,   319,   320,   321,
+     322,    -1,   324,   325,    -1,    -1,    -1,    -1,   330,   331,
+     332,   333,   334,   335,    -1,    -1,   338,   339,    -1,   341,
+      -1,   343,    -1,   345,   346,   347,   348,   349,   350,   351,
+     352,   353,    -1,    -1,   356,   357,    -1,    -1,   360,   361,
+     362,   363,   364,    -1,    -1,    -1,   368,   369,    -1,    -1,
+      -1,   373,    -1,   375,   376,    -1,   378,   379,   380,    -1,
+      -1,   383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   393,   394,   395,    -1,   397,    -1,   399,    -1,   401,
+     402,   403,   404,   405,   406,   407,   408,   409,   410,    -1,
+     412,    -1,   414,   415,   416,    -1,   418,    -1,   420,   421,
+     422,   423,   424,    -1,   426,   427,   428,    -1,    -1,   431,
+      -1,    -1,    -1,   435,   436,    -1,   438,   439,    -1,    -1,
+     442,   443,   444,   445,   446,    -1,   448,   449,    -1,   451,
+     452,   453,    -1,    -1,   456,   457,   458,   459,   460,   461,
+     462,   463,    -1,   465,    -1,   467,   468,    -1,   470,   471,
+     472,    -1,   474,    -1,    -1,   477,   478,   479,   480,    -1,
+     482,    -1,   484,   485,   486,   487,   488,    -1,   490,   491,
+      -1,    -1,    -1,   495,   496,   497,   498,    -1,    -1,    -1,
+     502,    -1,    -1,    -1,   506,    -1,   508,   509,   510,   511,
+      -1,   513,   514,   515,   516,   517,    -1,    -1,    -1,    -1,
+      -1,   523,   524,   525,    -1,   527,    -1,    -1,   530,    -1,
+      -1,   533,    -1,   535,    -1,   537,   538,   539,   540,   541,
+     542,    -1,    -1,   545,   546,    -1,    -1,   549,   550,   551,
+     552,   553,   554,    -1,    -1,   557,   558,   559,   560,    -1,
+     562,   563,    -1,    -1,   566,   567,   568,   569,    -1,   571,
+     572,   573,    -1,   575,   576,   577,   578,    -1,    -1,    -1,
+      -1,    -1,   584,   585,    -1,    -1,    -1,   589,   590,   591,
+      -1,    -1,   594,   595,    -1,   597,   598,    -1,   600,   601,
+      -1,    -1,   604,    -1,    -1,   607,    -1,   609,    -1,   611,
+     612,    -1,    -1,    -1,    -1,    -1,   618,    -1,   620,    -1,
+      -1,   623,    -1,    -1,    -1,   627,    -1,   629,   630,   631,
+     632,    -1,    -1,    -1,    -1,    -1,    -1,   639,   640,   641,
+      -1,   643,   644,   645,   646,    -1,    -1,   649,    -1,    -1,
+     652,   653,   654,   655,   656,    -1,   658,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   667,   668,   669,    -1,   671,
+     672,   673,    -1,   675,    -1,    -1,   678,    -1,   680,    -1,
+      -1,    -1,    -1,    -1,    -1,   687,   688,    -1,    -1,   691,
+      -1,   693,    -1,   695,   696,    -1,    -1,    -1,   700,   701,
+     702,   703,   704,   705,   706,   707,    -1,   709,   710,   711,
+     712,   713,   714,   715,   716,   717,   718,    -1,   720,   721,
+     722,   723,   724,   725,   726,   727,   728,   729,   730,   731,
+     732,   733,   734,   735,   736,   737,   738,   739,   740,   741,
+     742,   743,    -1,   745,   746,   747,   748,   749,   750,   751,
+      -1,   753,   754,   755,   756,   757,   758,   759,   760,   761,
+     762,   763,   764,   765,   766,   767,   768,   769,   770,   771,
+     772,   773,   774,   775,   776,   777,   778,   779,   780,   781,
+     782,   783,   784,   785,   786,   787,   788,   789,   790,   791,
+     792,   793,     5,     6,    -1,     8,     9,    10,    11,    12,
+      -1,    -1,    15,    -1,    -1,    -1,    -1,    20,    -1,    -1,
+      23,    -1,    25,    26,    27,    28,    29,    30,    -1,    32,
+      -1,    -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,
+      43,    44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,
+      53,    -1,    -1,    56,    57,    -1,    59,    60,    61,    -1,
+      63,    -1,    65,    66,    67,    68,    69,    70,    -1,    72,
+      73,    -1,    75,    76,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    -1,    87,    88,    -1,    90,    91,    92,
+      93,    94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,
+     103,    -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,
+      -1,    -1,   115,    -1,    -1,    -1,    -1,   120,   121,    -1,
+      -1,    -1,    -1,   126,   127,    -1,   129,    -1,    -1,    -1,
+      -1,    -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,
+     143,    -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,
+      -1,   154,   155,    -1,   157,   158,   159,    -1,    -1,   162,
+     163,    -1,   165,   166,   167,   168,   169,   170,    -1,    -1,
+     173,   174,   175,   176,   177,    -1,    -1,   180,   181,    -1,
+     183,   184,   185,   186,   187,    -1,    -1,   190,   191,    -1,
+      -1,    -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,
+      -1,   204,   205,   206,   207,    -1,   209,    -1,   211,    -1,
+      -1,    -1,   215,   216,    -1,   218,    -1,    -1,   221,   222,
+      -1,    -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,
+     233,   234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,
+     243,   244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,
+     253,    -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,
+      -1,    -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,
+     273,    -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,
+      -1,   284,    -1,   286,   287,    -1,    -1,   290,    -1,    -1,
+      -1,    -1,   295,    -1,   297,   298,   299,   300,   301,   302,
+     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
+     313,    -1,   315,   316,   317,    -1,   319,   320,   321,   322,
+      -1,   324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,
+     333,   334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,
+     343,    -1,   345,   346,   347,   348,   349,   350,   351,   352,
+     353,    -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,
+     363,   364,    -1,    -1,    -1,   368,   369,    -1,    -1,   372,
+     373,    -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,
+     383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     393,   394,   395,   396,   397,    -1,   399,    -1,   401,   402,
+     403,   404,   405,   406,   407,   408,   409,   410,    -1,   412,
+      -1,   414,   415,   416,    -1,   418,    -1,   420,   421,   422,
+     423,   424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,
+      -1,    -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,
+     443,   444,   445,   446,    -1,   448,   449,    -1,   451,   452,
+     453,    -1,    -1,   456,   457,   458,   459,   460,   461,   462,
+     463,    -1,   465,    -1,   467,   468,    -1,   470,   471,   472,
+      -1,   474,    -1,    -1,   477,   478,   479,   480,    -1,   482,
+      -1,   484,   485,   486,   487,   488,    -1,   490,   491,    -1,
+      -1,    -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,
+      -1,    -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,
+     513,   514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,
+     523,   524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,
+     533,    -1,   535,    -1,   537,   538,   539,   540,   541,   542,
+      -1,    -1,   545,   546,    -1,    -1,   549,   550,   551,   552,
+     553,   554,    -1,    -1,   557,   558,   559,   560,    -1,   562,
+     563,    -1,    -1,   566,   567,   568,   569,    -1,    -1,   572,
+     573,    -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,
+      -1,   584,   585,    -1,    -1,    -1,   589,   590,   591,    -1,
+     593,   594,   595,    -1,   597,   598,    -1,   600,   601,    -1,
+      -1,   604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,
+      -1,    -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,
+     623,    -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,
+      -1,    -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,
+     643,   644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,
+     653,   654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,
+     673,    -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,
+      -1,    -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,
+     693,    -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,
+     703,   704,   705,   706,   707,    -1,   709,   710,   711,   712,
+     713,   714,   715,   716,   717,   718,    -1,   720,   721,   722,
+     723,   724,   725,   726,   727,   728,   729,   730,   731,   732,
+     733,   734,   735,   736,   737,   738,   739,   740,   741,   742,
+     743,    -1,   745,   746,   747,   748,   749,   750,   751,    -1,
+     753,   754,   755,   756,   757,   758,   759,   760,   761,   762,
+     763,   764,   765,   766,   767,   768,   769,   770,   771,   772,
+     773,   774,   775,   776,   777,   778,   779,   780,   781,   782,
+     783,   784,   785,   786,   787,   788,   789,   790,   791,   792,
+     793,     5,     6,    -1,     8,     9,    10,    11,    12,    -1,
+      -1,    15,    -1,    -1,    -1,    -1,    20,    -1,    -1,    23,
+      -1,    25,    26,    27,    28,    29,    30,    -1,    32,    -1,
+      -1,    35,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,
+      44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,
+      -1,    -1,    56,    57,    -1,    59,    60,    61,    -1,    63,
+      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
+      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
+      84,    85,    -1,    87,    88,    -1,    90,    91,    92,    93,
+      94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,
+      -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,
+      -1,   115,    -1,    -1,    -1,    -1,   120,   121,    -1,    -1,
+      -1,   125,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,
+      -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,   143,
+      -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,
+     154,   155,    -1,   157,   158,   159,    -1,    -1,   162,   163,
+      -1,   165,   166,   167,   168,   169,   170,    -1,    -1,   173,
+     174,   175,   176,   177,    -1,    -1,   180,   181,    -1,   183,
+     184,   185,   186,   187,    -1,    -1,   190,   191,    -1,    -1,
+      -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,
+     204,   205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,
+      -1,   215,   216,    -1,   218,    -1,    -1,   221,   222,    -1,
+      -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,   233,
+     234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,
+     244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,
+      -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,
+      -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,
+     274,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,
+     284,    -1,   286,   287,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   295,    -1,   297,   298,   299,   300,   301,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
+      -1,   315,   316,   317,    -1,   319,   320,   321,   322,    -1,
+     324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,
+     334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,
+      -1,   345,   346,   347,   348,   349,   350,   351,   352,   353,
+      -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,   363,
+     364,    -1,    -1,    -1,   368,   369,    -1,    -1,    -1,   373,
+      -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,   383,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,
+     394,   395,    -1,   397,    -1,   399,    -1,   401,   402,   403,
+     404,   405,   406,   407,   408,   409,   410,    -1,   412,    -1,
+     414,   415,   416,    -1,   418,    -1,   420,   421,   422,   423,
+     424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,
+      -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,   443,
+     444,   445,   446,    -1,   448,   449,    -1,   451,   452,   453,
+      -1,    -1,   456,   457,   458,   459,   460,   461,   462,   463,
+      -1,   465,    -1,   467,   468,    -1,   470,   471,   472,    -1,
+     474,    -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,
+     484,   485,   486,   487,   488,    -1,   490,   491,    -1,    -1,
+      -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,
+      -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,   513,
+     514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,
+     524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,
+      -1,   535,    -1,   537,   538,   539,   540,   541,   542,    -1,
+      -1,   545,   546,    -1,    -1,   549,   550,   551,   552,   553,
+     554,    -1,    -1,   557,   558,   559,   560,    -1,   562,   563,
+      -1,    -1,   566,   567,   568,   569,    -1,   571,   572,   573,
+      -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,
+     584,   585,    -1,    -1,    -1,   589,   590,   591,    -1,    -1,
+     594,   595,    -1,   597,   598,    -1,   600,   601,    -1,    -1,
+     604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,
+      -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,
+      -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,
+      -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,
+     644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,
+     654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,   673,
+      -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,
+      -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,
+      -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,   703,
+     704,   705,   706,   707,    -1,   709,   710,   711,   712,   713,
+     714,   715,   716,   717,   718,    -1,   720,   721,   722,   723,
+     724,   725,   726,   727,   728,   729,   730,   731,   732,   733,
+     734,   735,   736,   737,   738,   739,   740,   741,   742,   743,
+      -1,   745,   746,   747,   748,   749,   750,   751,    -1,   753,
+     754,   755,   756,   757,   758,   759,   760,   761,   762,   763,
+     764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
+     774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
+     784,   785,   786,   787,   788,   789,   790,   791,   792,   793,
+       5,     6,    -1,     8,     9,    10,    11,    12,    -1,    -1,
+      15,    -1,    -1,    -1,    -1,    20,    -1,    -1,    23,    -1,
+      25,    26,    27,    28,    29,    30,    -1,    32,    -1,    -1,
+      -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,    44,
+      45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,    -1,
+      -1,    56,    57,    -1,    59,    60,    61,    -1,    63,    -1,
+      65,    66,    67,    68,    69,    70,    -1,    72,    73,    -1,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    -1,    87,    88,    -1,    90,    91,    92,    93,    94,
+      -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,   104,
+      -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,    -1,
+     115,    -1,    -1,    -1,    -1,   120,   121,    -1,    -1,    -1,
+      -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,    -1,
+     135,   136,   137,   138,   139,    -1,    -1,    -1,   143,    -1,
+      -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,   154,
+     155,    -1,   157,   158,   159,    -1,    -1,   162,   163,    -1,
+     165,   166,   167,   168,   169,   170,    -1,    -1,   173,   174,
+     175,   176,   177,    -1,    -1,   180,   181,    -1,   183,   184,
+     185,   186,   187,    -1,    -1,   190,   191,    -1,    -1,    -1,
+     195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,   204,
+     205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,    -1,
+     215,   216,    -1,   218,    -1,    -1,   221,   222,    -1,    -1,
+      -1,   226,   227,   228,   229,    -1,    -1,   232,   233,   234,
+      -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,   244,
+      -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,    -1,
+     255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,    -1,
+     265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,   274,
+      -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,   284,
+      -1,   286,   287,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     295,    -1,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,    -1,
+     315,   316,   317,    -1,   319,   320,   321,   322,    -1,   324,
+     325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,   334,
+     335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,    -1,
+     345,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
+      -1,   356,   357,    -1,    -1,   360,   361,   362,   363,   364,
+      -1,    -1,    -1,   368,   369,    -1,    -1,    -1,   373,    -1,
+     375,   376,    -1,   378,   379,   380,    -1,    -1,   383,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,   394,
+     395,    -1,   397,    -1,   399,    -1,   401,   402,   403,   404,
+     405,   406,   407,   408,   409,   410,    -1,   412,    -1,   414,
+     415,   416,    -1,   418,    -1,   420,   421,   422,   423,   424,
+      -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,    -1,
+     435,   436,    -1,   438,   439,    -1,    -1,   442,   443,   444,
+     445,   446,    -1,   448,   449,    -1,   451,   452,   453,    -1,
+      -1,   456,   457,   458,   459,   460,   461,   462,   463,    -1,
+     465,    -1,   467,   468,    -1,   470,   471,   472,    -1,   474,
+      -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,   484,
+     485,   486,   487,   488,    -1,   490,   491,    -1,    -1,    -1,
+     495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,    -1,
+      -1,   506,    -1,   508,   509,   510,   511,    -1,   513,   514,
+     515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,   524,
+     525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,    -1,
+     535,    -1,   537,   538,   539,   540,   541,   542,    -1,    -1,
+     545,   546,    -1,    -1,   549,   550,   551,   552,   553,   554,
+      -1,    -1,   557,   558,   559,   560,    -1,   562,   563,    -1,
+      -1,   566,   567,   568,   569,    -1,   571,   572,   573,    -1,
+     575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,   584,
+     585,    -1,    -1,    -1,   589,   590,   591,    -1,    -1,   594,
+     595,    -1,   597,   598,    -1,   600,   601,    -1,    -1,   604,
+      -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,    -1,
+      -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,    -1,
+      -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,    -1,
+      -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,   644,
+     645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,   654,
+     655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   667,   668,   669,    -1,   671,   672,   673,    -1,
+     675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,    -1,
+      -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,    -1,
+     695,   696,    -1,    -1,    -1,   700,   701,   702,   703,   704,
+     705,   706,   707,    -1,   709,   710,   711,   712,   713,   714,
+     715,   716,   717,   718,    -1,   720,   721,   722,   723,   724,
+     725,   726,   727,   728,   729,   730,   731,   732,   733,   734,
+     735,   736,   737,   738,   739,   740,   741,   742,   743,    -1,
+     745,   746,   747,   748,   749,   750,   751,    -1,   753,   754,
+     755,   756,   757,   758,   759,   760,   761,   762,   763,   764,
+     765,   766,   767,   768,   769,   770,   771,   772,   773,   774,
+     775,   776,   777,   778,   779,   780,   781,   782,   783,   784,
+     785,   786,   787,   788,   789,   790,   791,   792,   793,     5,
+       6,    -1,     8,     9,    10,    11,    12,    -1,    -1,    15,
+      -1,    -1,    -1,    -1,    20,    -1,    -1,    23,    -1,    25,
+      26,    27,    28,    29,    30,    -1,    32,    -1,    -1,    -1,
+      36,    -1,    -1,    -1,    40,    -1,    -1,    43,    44,    45,
+      -1,    47,    -1,    49,    50,    -1,    -1,    53,    -1,    -1,
+      56,    57,    -1,    59,    60,    61,    -1,    63,    -1,    65,
+      66,    67,    68,    69,    70,    -1,    72,    73,    -1,    75,
+      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
+      -1,    87,    88,    -1,    90,    91,    92,    93,    94,    -1,
+      -1,    -1,    98,    -1,    -1,    -1,    -1,   103,   104,    -1,
+     106,    -1,    -1,    -1,   110,   111,   112,    -1,    -1,   115,
+      -1,    -1,    -1,    -1,   120,   121,    -1,    -1,    -1,    -1,
+     126,   127,    -1,   129,    -1,    -1,    -1,    -1,    -1,   135,
+     136,   137,   138,   139,    -1,    -1,    -1,   143,    -1,    -1,
+     146,   147,   148,    -1,    -1,    -1,   152,    -1,   154,   155,
+      -1,   157,   158,   159,    -1,    -1,   162,   163,    -1,   165,
+     166,   167,   168,   169,   170,    -1,    -1,   173,   174,   175,
+     176,   177,    -1,    -1,   180,   181,    -1,   183,   184,   185,
+     186,   187,    -1,    -1,   190,   191,    -1,    -1,    -1,   195,
+     196,    -1,   198,    -1,    -1,    -1,   202,    -1,   204,   205,
+     206,   207,    -1,   209,    -1,   211,    -1,    -1,    -1,   215,
+     216,    -1,   218,    -1,    -1,   221,   222,    -1,    -1,    -1,
+     226,   227,   228,   229,    -1,    -1,   232,   233,   234,    -1,
+      -1,   237,    -1,    -1,    -1,    -1,   242,   243,   244,    -1,
+      -1,    -1,   248,    -1,    -1,    -1,   252,   253,    -1,   255,
+     256,    -1,    -1,    -1,   260,    -1,   262,    -1,    -1,   265,
+     266,    -1,    -1,   269,    -1,    -1,   272,   273,   274,    -1,
+      -1,    -1,    -1,   279,   280,    -1,   282,    -1,   284,    -1,
+     286,   287,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   295,
+      -1,   297,   298,   299,   300,   301,   302,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,   312,   313,    -1,   315,
+     316,   317,    -1,   319,   320,   321,   322,    -1,   324,   325,
+      -1,    -1,    -1,    -1,   330,   331,   332,   333,   334,   335,
+      -1,    -1,   338,   339,    -1,   341,    -1,   343,    -1,   345,
+     346,   347,   348,   349,   350,   351,   352,   353,    -1,    -1,
+     356,   357,    -1,    -1,   360,   361,   362,   363,   364,    -1,
+      -1,    -1,   368,   369,    -1,    -1,    -1,   373,    -1,   375,
+     376,    -1,   378,   379,   380,    -1,    -1,   383,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,   394,   395,
+      -1,   397,    -1,   399,    -1,   401,   402,   403,   404,   405,
+     406,   407,   408,   409,   410,    -1,   412,    -1,   414,   415,
+     416,    -1,   418,    -1,   420,   421,   422,   423,   424,    -1,
+     426,   427,   428,    -1,    -1,   431,    -1,    -1,    -1,   435,
+     436,    -1,   438,   439,    -1,    -1,   442,   443,   444,   445,
+     446,    -1,   448,   449,    -1,   451,   452,   453,    -1,    -1,
+     456,   457,   458,   459,   460,   461,   462,   463,    -1,   465,
+      -1,   467,   468,    -1,   470,   471,   472,    -1,   474,    -1,
+      -1,   477,   478,   479,   480,    -1,   482,    -1,   484,   485,
+     486,   487,   488,    -1,   490,   491,    -1,    -1,    -1,   495,
+     496,   497,   498,    -1,    -1,    -1,   502,    -1,    -1,    -1,
+     506,    -1,   508,   509,   510,   511,    -1,   513,   514,   515,
+     516,   517,    -1,    -1,    -1,    -1,    -1,   523,   524,   525,
+      -1,   527,    -1,    -1,   530,    -1,    -1,   533,    -1,   535,
+      -1,   537,   538,   539,   540,   541,   542,    -1,    -1,   545,
+     546,    -1,    -1,   549,   550,   551,   552,   553,   554,    -1,
+      -1,   557,   558,   559,   560,    -1,   562,   563,    -1,    -1,
+     566,   567,   568,   569,    -1,   571,   572,   573,    -1,   575,
+     576,   577,   578,    -1,    -1,    -1,    -1,    -1,   584,   585,
+      -1,    -1,    -1,   589,   590,   591,    -1,    -1,   594,   595,
+      -1,   597,   598,    -1,   600,   601,    -1,    -1,   604,    -1,
+      -1,   607,    -1,   609,    -1,   611,   612,    -1,    -1,    -1,
+      -1,    -1,   618,    -1,   620,    -1,    -1,   623,    -1,    -1,
+      -1,   627,    -1,   629,   630,   631,   632,    -1,    -1,    -1,
+      -1,    -1,    -1,   639,   640,   641,    -1,   643,   644,   645,
+     646,    -1,    -1,   649,    -1,    -1,   652,   653,   654,   655,
+     656,    -1,   658,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   667,   668,   669,    -1,   671,   672,   673,    -1,   675,
+      -1,    -1,   678,    -1,   680,    -1,    -1,    -1,    -1,    -1,
+      -1,   687,   688,    -1,    -1,   691,    -1,   693,    -1,   695,
+     696,    -1,    -1,    -1,   700,   701,   702,   703,   704,   705,
+     706,   707,    -1,   709,   710,   711,   712,   713,   714,   715,
+     716,   717,   718,    -1,   720,   721,   722,   723,   724,   725,
+     726,   727,   728,   729,   730,   731,   732,   733,   734,   735,
+     736,   737,   738,   739,   740,   741,   742,   743,    -1,   745,
+     746,   747,   748,   749,   750,   751,    -1,   753,   754,   755,
+     756,   757,   758,   759,   760,   761,   762,   763,   764,   765,
+     766,   767,   768,   769,   770,   771,   772,   773,   774,   775,
+     776,   777,   778,   779,   780,   781,   782,   783,   784,   785,
+     786,   787,   788,   789,   790,   791,   792,   793,     5,     6,
+      -1,     8,     9,    10,    11,    12,    13,    -1,    15,    -1,
+      -1,    -1,    -1,    20,    -1,    -1,    23,    -1,    25,    26,
+      27,    28,    29,    30,    -1,    32,    -1,    -1,    -1,    36,
+      -1,    -1,    -1,    40,    -1,    -1,    43,    44,    45,    -1,
+      47,    -1,    49,    50,    -1,    -1,    53,    -1,    -1,    56,
+      57,    -1,    59,    60,    61,    -1,    63,    -1,    65,    66,
+      67,    68,    69,    70,    -1,    72,    73,    -1,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    -1,
+      87,    88,    -1,    90,    91,    92,    93,    94,    -1,    -1,
+      -1,    98,    -1,    -1,    -1,    -1,   103,    -1,    -1,   106,
+      -1,    -1,    -1,   110,   111,   112,    -1,    -1,   115,    -1,
+      -1,    -1,    -1,   120,   121,    -1,    -1,    -1,    -1,   126,
+     127,    -1,   129,    -1,    -1,    -1,    -1,    -1,   135,   136,
+     137,   138,   139,    -1,    -1,    -1,   143,    -1,    -1,   146,
+     147,   148,    -1,    -1,    -1,   152,    -1,   154,   155,    -1,
+     157,   158,   159,    -1,    -1,   162,   163,    -1,   165,   166,
+     167,   168,   169,   170,    -1,    -1,   173,   174,   175,   176,
+     177,    -1,    -1,   180,   181,    -1,   183,   184,   185,   186,
+     187,    -1,    -1,   190,   191,    -1,    -1,    -1,   195,   196,
+      -1,   198,    -1,    -1,    -1,   202,    -1,   204,   205,   206,
+     207,    -1,   209,    -1,   211,    -1,    -1,    -1,   215,   216,
+      -1,   218,    -1,    -1,   221,   222,    -1,    -1,    -1,   226,
+     227,   228,   229,    -1,    -1,   232,   233,   234,    -1,    -1,
+     237,    -1,    -1,    -1,    -1,   242,   243,   244,    -1,    -1,
+      -1,   248,    -1,    -1,    -1,   252,   253,    -1,   255,   256,
+      -1,    -1,    -1,   260,    -1,   262,    -1,    -1,   265,   266,
+      -1,    -1,   269,    -1,    -1,   272,   273,   274,    -1,    -1,
+      -1,    -1,   279,   280,    -1,   282,    -1,   284,    -1,   286,
+     287,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,
+     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,   313,    -1,   315,   316,
+     317,    -1,   319,   320,   321,   322,    -1,   324,   325,    -1,
+      -1,    -1,    -1,   330,   331,   332,   333,   334,   335,    -1,
+      -1,   338,   339,    -1,   341,    -1,   343,    -1,   345,   346,
+     347,   348,   349,   350,   351,   352,   353,    -1,    -1,   356,
+     357,    -1,    -1,   360,   361,   362,   363,   364,    -1,    -1,
+      -1,   368,   369,    -1,    -1,    -1,   373,    -1,   375,   376,
+      -1,   378,   379,   380,    -1,    -1,   383,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   393,   394,   395,    -1,
+     397,    -1,   399,    -1,   401,   402,   403,   404,   405,   406,
+     407,   408,   409,   410,    -1,   412,    -1,   414,   415,   416,
+      -1,   418,    -1,   420,   421,   422,   423,   424,    -1,   426,
+     427,   428,    -1,    -1,   431,    -1,    -1,    -1,   435,   436,
+      -1,   438,   439,    -1,    -1,   442,   443,   444,   445,   446,
+      -1,   448,   449,    -1,   451,   452,   453,    -1,    -1,   456,
+     457,   458,   459,   460,   461,   462,   463,    -1,   465,    -1,
+     467,   468,    -1,   470,   471,   472,    -1,   474,    -1,    -1,
+     477,   478,   479,   480,    -1,   482,    -1,   484,   485,   486,
+     487,   488,    -1,   490,   491,    -1,    -1,    -1,   495,   496,
+     497,   498,    -1,    -1,    -1,   502,    -1,    -1,    -1,   506,
+      -1,   508,   509,   510,   511,    -1,   513,   514,   515,   516,
+     517,    -1,    -1,    -1,    -1,    -1,   523,   524,   525,    -1,
+     527,    -1,    -1,   530,    -1,    -1,   533,    -1,   535,    -1,
+     537,   538,   539,   540,   541,   542,    -1,    -1,   545,   546,
+      -1,    -1,   549,   550,   551,   552,   553,   554,    -1,    -1,
+     557,   558,   559,   560,    -1,   562,   563,    -1,    -1,   566,
+     567,   568,   569,    -1,   571,   572,   573,    -1,   575,   576,
+     577,   578,    -1,    -1,    -1,    -1,    -1,   584,   585,    -1,
+      -1,    -1,   589,   590,   591,    -1,    -1,   594,   595,    -1,
+     597,   598,    -1,   600,   601,    -1,    -1,   604,    -1,    -1,
+     607,    -1,   609,    -1,   611,   612,    -1,    -1,    -1,    -1,
+      -1,   618,    -1,   620,    -1,    -1,   623,    -1,    -1,    -1,
+     627,    -1,   629,   630,   631,   632,    -1,    -1,    -1,    -1,
+      -1,    -1,   639,   640,   641,    -1,   643,   644,   645,   646,
+      -1,    -1,   649,    -1,    -1,   652,   653,   654,   655,   656,
+      -1,   658,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     667,   668,   669,    -1,   671,   672,   673,    -1,   675,    -1,
+      -1,   678,    -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,
+     687,   688,    -1,    -1,   691,    -1,   693,    -1,   695,   696,
+      -1,    -1,    -1,   700,   701,   702,   703,   704,   705,   706,
+     707,    -1,   709,   710,   711,   712,   713,   714,   715,   716,
+     717,   718,    -1,   720,   721,   722,   723,   724,   725,   726,
+     727,   728,   729,   730,   731,   732,   733,   734,   735,   736,
+     737,   738,   739,   740,   741,   742,   743,    -1,   745,   746,
+     747,   748,   749,   750,   751,    -1,   753,   754,   755,   756,
+     757,   758,   759,   760,   761,   762,   763,   764,   765,   766,
+     767,   768,   769,   770,   771,   772,   773,   774,   775,   776,
+     777,   778,   779,   780,   781,   782,   783,   784,   785,   786,
+     787,   788,   789,   790,   791,   792,   793,     5,     6,    -1,
+       8,     9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,
+      -1,    -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,
+      28,    29,    30,    -1,    32,    -1,    -1,    -1,    36,    37,
+      -1,    -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,
+      -1,    49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,
+      -1,    59,    60,    61,    -1,    63,    -1,    65,    66,    67,
+      68,    69,    70,    -1,    72,    73,    -1,    75,    76,    77,
+      78,    79,    80,    81,    82,    83,    84,    85,    -1,    87,
+      88,    -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,
+      98,    -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,
+      -1,    -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,
+      -1,    -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,
+      -1,   129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,
+     138,   139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,
+     148,    -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,
+     158,   159,    -1,    -1,   162,   163,    -1,   165,   166,   167,
+     168,   169,   170,    -1,    -1,   173,   174,   175,   176,   177,
+      -1,    -1,   180,   181,    -1,   183,   184,   185,   186,   187,
+      -1,    -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,
+     198,    -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,
+      -1,   209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,
+     218,   219,    -1,   221,   222,    -1,    -1,    -1,   226,   227,
+     228,   229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,
+      -1,    -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,
+     248,    -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,
+      -1,    -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,
+      -1,   269,    -1,    -1,   272,   273,    -1,    -1,    -1,    -1,
+      -1,   279,   280,    -1,   282,    -1,   284,    -1,   286,   287,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,
+     298,   299,   300,   301,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,   313,    -1,   315,   316,   317,
+      -1,   319,   320,   321,   322,    -1,   324,   325,    -1,    -1,
+      -1,    -1,   330,   331,   332,   333,   334,   335,    -1,    -1,
+     338,   339,    -1,   341,    -1,   343,    -1,   345,   346,   347,
+     348,   349,   350,   351,   352,   353,    -1,    -1,   356,   357,
+      -1,    -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,
+     368,   369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,
+     378,   379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,
+      -1,   399,    -1,   401,   402,   403,   404,   405,   406,   407,
+     408,   409,   410,    -1,   412,    -1,   414,   415,   416,    -1,
+     418,    -1,   420,   421,   422,   423,   424,    -1,   426,   427,
+     428,    -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,
+     438,   439,    -1,    -1,   442,   443,   444,   445,   446,    -1,
+     448,   449,    -1,   451,   452,   453,    -1,    -1,   456,   457,
+     458,   459,   460,   461,   462,   463,    -1,   465,    -1,   467,
+     468,    -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,
+     478,   479,   480,    -1,   482,    -1,   484,   485,   486,   487,
+     488,    -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,
+     498,    -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,
+     508,   509,   510,   511,    -1,   513,   514,   515,   516,   517,
+      -1,    -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,
+      -1,    -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,
+     538,   539,   540,   541,   542,    -1,    -1,   545,   546,    -1,
+      -1,   549,   550,   551,   552,   553,   554,    -1,    -1,   557,
+     558,   559,   560,    -1,   562,   563,    -1,    -1,   566,   567,
+     568,   569,    -1,   571,   572,   573,    -1,   575,   576,   577,
+     578,    -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,
+      -1,   589,   590,   591,    -1,    -1,   594,   595,    -1,   597,
+     598,    -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,
+      -1,   609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,
+     618,    -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,
+      -1,   629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,
+      -1,   639,   640,   641,    -1,   643,   644,   645,   646,    -1,
+      -1,   649,    -1,    -1,   652,   653,   654,   655,   656,    -1,
+     658,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,
+     668,   669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,
+     678,    -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,
+     688,    -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,
+      -1,    -1,   700,   701,   702,   703,   704,   705,   706,   707,
+      -1,   709,   710,   711,   712,   713,   714,   715,   716,   717,
+     718,    -1,   720,   721,   722,   723,   724,   725,   726,   727,
+     728,   729,   730,   731,   732,   733,   734,   735,   736,   737,
+     738,   739,   740,   741,   742,   743,    -1,   745,   746,   747,
+     748,   749,   750,   751,    -1,   753,   754,   755,   756,   757,
+     758,   759,   760,   761,   762,   763,   764,   765,   766,   767,
+     768,   769,   770,   771,   772,   773,   774,   775,   776,   777,
+     778,   779,   780,   781,   782,   783,   784,   785,   786,   787,
+     788,   789,   790,   791,   792,   793,     5,     6,    -1,     8,
        9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    -1,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
+      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
+      29,    30,    -1,    32,    -1,    -1,    35,    36,    -1,    -1,
       -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      -1,    -1,    -1,    -1,    53,    54,    -1,    56,    57,    -1,
-      59,    60,    -1,    -1,    -1,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    -1,    78,
-      -1,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    -1,    94,    -1,    -1,    -1,    98,
+      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
+      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
+      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
+      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
+      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
       -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
       -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,    -1,    -1,    -1,    -1,    -1,   126,   127,    -1,
+      -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,
      129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,    -1,    -1,    -1,   146,   147,   148,
+     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
       -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
      159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,    -1,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,   182,   183,   184,   185,   186,   187,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   195,   196,    -1,   198,
+     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
+      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
+      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
       -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,    -1,   216,    -1,    -1,
+     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
       -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,   230,    -1,   232,    -1,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,    -1,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,   257,    -1,
-      -1,   260,    -1,   262,    -1,    -1,    -1,   266,    -1,    -1,
-     269,   270,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
+     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
+      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
+      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
+      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
+     269,    -1,    -1,   272,   273,   274,    -1,    -1,    -1,    -1,
      279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,   292,    -1,    -1,   295,    -1,   297,   298,
+      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
      299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
      309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
      319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
       -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
      339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
      349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,    -1,
+      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
      369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
      379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
      399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,    -1,    -1,    -1,   415,   416,    -1,   418,
+     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
       -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
       -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
      439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,    -1,   453,   454,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,    -1,    -1,   467,   468,
-      -1,   470,   471,   472,   473,   474,    -1,    -1,    -1,   478,
-     479,   480,    -1,   482,    -1,   484,   485,    -1,   487,   488,
+     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
+     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
+      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
+     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
       -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,    -1,    -1,    -1,
-     509,    -1,   511,    -1,   513,   514,   515,   516,   517,    -1,
+      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
+     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
       -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,    -1,
-     539,   540,   541,   542,    -1,    -1,    -1,   546,    -1,    -1,
+      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
+     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
      549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
      559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,    -1,   572,   573,    -1,   575,   576,   577,   578,
+     569,    -1,   571,   572,   573,    -1,   575,   576,   577,   578,
       -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-      -1,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,    -1,    -1,    -1,    -1,   604,    -1,    -1,   607,    -1,
+     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
+      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
      609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
       -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,   635,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,    -1,   645,   646,    -1,    -1,
+     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
+     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
      649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,    -1,    -1,    -1,   678,
+     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
       -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
       -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
       -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,    -1,   713,   714,   715,   716,   717,   718,
+     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
       -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
      729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
      739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
      749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
      759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
      769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
+     779,   780,   781,   782,   783,   784,   785,   786,   787,   788,
+     789,   790,   791,   792,   793,     5,     6,    -1,     8,     9,
+      10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,    -1,
+      20,    -1,    -1,    23,    -1,    25,    26,    27,    28,    29,
+      30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,    -1,
+      40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,    49,
+      50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,    59,
+      60,    61,    -1,    63,    -1,    65,    66,    67,    68,    69,
+      70,    -1,    72,    73,    -1,    75,    76,    77,    78,    79,
+      80,    81,    82,    83,    84,    85,    -1,    87,    88,    -1,
+      90,    91,    92,    93,    94,    -1,    -1,    -1,    98,    -1,
+      -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,    -1,
+     110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,    -1,
+     120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,   129,
+      -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,   139,
+      -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,    -1,
+      -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,   159,
+      -1,    -1,   162,   163,    -1,   165,   166,   167,   168,   169,
+     170,    -1,    -1,   173,   174,   175,   176,   177,    -1,    -1,
+     180,   181,    -1,   183,   184,   185,   186,   187,    -1,    -1,
+     190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,    -1,
+      -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,   209,
+      -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,    -1,
+      -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,   229,
+      -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,    -1,
+      -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,    -1,
+      -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,    -1,
+     260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,   269,
+      -1,    -1,   272,   273,   274,    -1,    -1,    -1,    -1,   279,
+     280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,    -1,   315,   316,   317,    -1,   319,
+     320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,    -1,
+     330,   331,   332,   333,   334,   335,    -1,    -1,   338,   339,
+      -1,   341,    -1,   343,    -1,   345,   346,   347,   348,   349,
+     350,   351,   352,   353,    -1,    -1,   356,   357,    -1,    -1,
+     360,   361,   362,   363,   364,    -1,    -1,    -1,   368,   369,
+      -1,   371,    -1,   373,    -1,   375,   376,    -1,   378,   379,
+     380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,   399,
+      -1,   401,   402,   403,   404,   405,   406,   407,   408,   409,
+     410,    -1,   412,    -1,   414,   415,   416,    -1,   418,    -1,
+     420,   421,   422,   423,   424,    -1,   426,   427,   428,    -1,
+      -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,   439,
+      -1,    -1,   442,   443,   444,   445,   446,    -1,   448,   449,
+      -1,   451,   452,   453,    -1,    -1,   456,   457,   458,   459,
+     460,   461,   462,   463,    -1,   465,    -1,   467,   468,    -1,
+     470,   471,   472,    -1,   474,    -1,    -1,   477,   478,   479,
+     480,    -1,   482,    -1,   484,   485,   486,   487,   488,    -1,
+     490,   491,    -1,    -1,    -1,   495,   496,   497,   498,    -1,
+      -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,   509,
+     510,   511,    -1,   513,   514,   515,   516,   517,    -1,    -1,
+      -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,    -1,
+     530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,   539,
+     540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,   549,
+     550,   551,   552,   553,   554,    -1,    -1,   557,   558,   559,
+     560,    -1,   562,   563,    -1,    -1,   566,   567,   568,   569,
+      -1,   571,   572,   573,    -1,   575,   576,   577,   578,    -1,
+      -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,   589,
+     590,   591,    -1,    -1,   594,   595,    -1,   597,   598,    -1,
+     600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,   609,
+      -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,    -1,
+     620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,   629,
+     630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,   639,
+     640,   641,    -1,   643,   644,   645,   646,    -1,    -1,   649,
+      -1,    -1,   652,   653,   654,   655,   656,    -1,   658,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,   669,
+      -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,    -1,
+     680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,    -1,
+      -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,    -1,
+     700,   701,   702,   703,   704,   705,   706,   707,    -1,   709,
+     710,   711,   712,   713,   714,   715,   716,   717,   718,    -1,
+     720,   721,   722,   723,   724,   725,   726,   727,   728,   729,
+     730,   731,   732,   733,   734,   735,   736,   737,   738,   739,
+     740,   741,   742,   743,    -1,   745,   746,   747,   748,   749,
+     750,   751,    -1,   753,   754,   755,   756,   757,   758,   759,
+     760,   761,   762,   763,   764,   765,   766,   767,   768,   769,
+     770,   771,   772,   773,   774,   775,   776,   777,   778,   779,
+     780,   781,   782,   783,   784,   785,   786,   787,   788,   789,
+     790,   791,   792,   793,     5,     6,    -1,     8,     9,    10,
+      11,    12,    -1,    -1,    15,    -1,    -1,    -1,    -1,    20,
+      -1,    -1,    23,    -1,    25,    26,    27,    28,    29,    30,
+      -1,    32,    -1,    -1,    35,    36,    -1,    -1,    -1,    40,
+      -1,    -1,    43,    44,    45,    -1,    47,    -1,    49,    50,
+      -1,    -1,    53,    -1,    -1,    56,    57,    -1,    59,    60,
+      61,    -1,    63,    -1,    65,    66,    67,    68,    69,    70,
+      -1,    72,    73,    -1,    75,    76,    77,    78,    79,    80,
+      81,    82,    83,    84,    85,    -1,    87,    88,    -1,    90,
+      91,    92,    93,    94,    -1,    -1,    -1,    98,    -1,    -1,
+      -1,    -1,   103,    -1,    -1,   106,    -1,    -1,    -1,   110,
+     111,   112,    -1,    -1,   115,    -1,    -1,    -1,    -1,   120,
+     121,    -1,    -1,    -1,    -1,   126,   127,    -1,   129,    -1,
+      -1,    -1,    -1,    -1,   135,   136,   137,   138,   139,    -1,
+      -1,    -1,   143,    -1,    -1,   146,   147,   148,    -1,    -1,
+      -1,   152,    -1,   154,   155,    -1,   157,   158,   159,    -1,
+      -1,   162,   163,    -1,   165,   166,   167,   168,   169,   170,
+      -1,    -1,   173,   174,   175,   176,   177,    -1,    -1,   180,
+     181,    -1,   183,   184,   185,   186,   187,    -1,    -1,   190,
+     191,    -1,    -1,    -1,   195,   196,    -1,   198,    -1,    -1,
+      -1,   202,    -1,   204,   205,   206,   207,    -1,   209,    -1,
+     211,    -1,    -1,    -1,   215,   216,    -1,   218,    -1,    -1,
+     221,   222,    -1,    -1,    -1,   226,   227,   228,   229,    -1,
+      -1,   232,   233,   234,    -1,    -1,   237,    -1,    -1,    -1,
+      -1,   242,   243,   244,    -1,    -1,    -1,   248,    -1,    -1,
+      -1,   252,   253,    -1,   255,   256,    -1,    -1,    -1,   260,
+      -1,   262,    -1,    -1,   265,   266,    -1,    -1,   269,    -1,
+      -1,   272,   273,   274,    -1,    -1,    -1,    -1,   279,   280,
+      -1,   282,    -1,   284,    -1,   286,   287,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   295,    -1,   297,   298,   299,   300,
+     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
+     311,   312,   313,    -1,   315,   316,   317,    -1,   319,   320,
+     321,   322,    -1,   324,   325,    -1,    -1,    -1,    -1,   330,
+     331,   332,   333,   334,   335,    -1,    -1,   338,   339,    -1,
+     341,    -1,   343,    -1,   345,   346,   347,   348,   349,   350,
+     351,   352,   353,    -1,    -1,   356,   357,    -1,    -1,   360,
+     361,   362,   363,   364,    -1,    -1,    -1,   368,   369,    -1,
+      -1,    -1,   373,    -1,   375,   376,    -1,   378,   379,   380,
+      -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   393,   394,   395,    -1,   397,    -1,   399,    -1,
+     401,   402,   403,   404,   405,   406,   407,   408,   409,   410,
+      -1,   412,    -1,   414,   415,   416,    -1,   418,    -1,   420,
+     421,   422,   423,   424,    -1,   426,   427,   428,    -1,    -1,
+     431,    -1,    -1,    -1,   435,   436,    -1,   438,   439,    -1,
+      -1,   442,   443,   444,   445,   446,    -1,   448,   449,    -1,
+     451,   452,   453,    -1,    -1,   456,   457,   458,   459,   460,
+     461,   462,   463,    -1,   465,    -1,   467,   468,    -1,   470,
+     471,   472,    -1,   474,    -1,    -1,   477,   478,   479,   480,
+      -1,   482,    -1,   484,   485,   486,   487,   488,    -1,   490,
+     491,    -1,    -1,    -1,   495,   496,   497,   498,    -1,    -1,
+      -1,   502,    -1,    -1,    -1,   506,    -1,   508,   509,   510,
+     511,    -1,   513,   514,   515,   516,   517,    -1,    -1,    -1,
+      -1,    -1,   523,   524,   525,    -1,   527,    -1,    -1,   530,
+      -1,    -1,   533,    -1,   535,    -1,   537,   538,   539,   540,
+     541,   542,    -1,    -1,   545,   546,    -1,    -1,   549,   550,
+     551,   552,   553,   554,    -1,    -1,   557,   558,   559,   560,
+      -1,   562,   563,    -1,    -1,   566,   567,   568,   569,    -1,
+     571,   572,   573,    -1,   575,   576,   577,   578,    -1,    -1,
+      -1,    -1,    -1,   584,   585,    -1,    -1,    -1,   589,   590,
+     591,    -1,    -1,   594,   595,    -1,   597,   598,    -1,   600,
+     601,    -1,    -1,   604,    -1,    -1,   607,    -1,   609,    -1,
+     611,   612,    -1,    -1,    -1,    -1,    -1,   618,    -1,   620,
+      -1,    -1,   623,    -1,    -1,    -1,   627,    -1,   629,   630,
+     631,   632,    -1,    -1,    -1,    -1,    -1,    -1,   639,   640,
+     641,    -1,   643,   644,   645,   646,    -1,    -1,   649,    -1,
+      -1,   652,   653,   654,   655,   656,    -1,   658,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   667,   668,   669,    -1,
+     671,   672,   673,    -1,   675,    -1,    -1,   678,    -1,   680,
+      -1,    -1,    -1,    -1,    -1,    -1,   687,   688,    -1,    -1,
+     691,    -1,   693,    -1,   695,   696,    -1,    -1,    -1,   700,
+     701,   702,   703,   704,   705,   706,   707,    -1,   709,   710,
+     711,   712,   713,   714,   715,   716,   717,   718,    -1,   720,
+     721,   722,   723,   724,   725,   726,   727,   728,   729,   730,
+     731,   732,   733,   734,   735,   736,   737,   738,   739,   740,
+     741,   742,   743,    -1,   745,   746,   747,   748,   749,   750,
+     751,    -1,   753,   754,   755,   756,   757,   758,   759,   760,
+     761,   762,   763,   764,   765,   766,   767,   768,   769,   770,
+     771,   772,   773,   774,   775,   776,   777,   778,   779,   780,
+     781,   782,   783,   784,   785,   786,   787,   788,   789,   790,
+     791,   792,   793,     5,     6,    -1,     8,     9,    10,    11,
+      12,    -1,    -1,    15,    -1,    -1,    -1,    -1,    20,    -1,
+      -1,    23,    -1,    25,    26,    27,    28,    29,    30,    -1,
+      32,    -1,    -1,    -1,    36,    -1,    -1,    -1,    40,    -1,
+      -1,    43,    44,    45,    -1,    47,    -1,    49,    50,    -1,
+      -1,    53,    -1,    -1,    56,    57,    -1,    59,    60,    61,
+      -1,    63,    -1,    65,    66,    67,    68,    69,    70,    -1,
+      72,    73,    -1,    75,    76,    77,    78,    79,    80,    81,
+      82,    83,    84,    85,    -1,    87,    88,    -1,    90,    91,
+      92,    93,    94,    -1,    -1,    -1,    98,    -1,    -1,    -1,
+      -1,   103,    -1,    -1,   106,    -1,    -1,    -1,   110,   111,
+     112,    -1,    -1,   115,    -1,    -1,    -1,    -1,   120,   121,
+      -1,    -1,    -1,    -1,   126,   127,    -1,   129,    -1,    -1,
+      -1,    -1,    -1,   135,   136,   137,   138,   139,    -1,    -1,
+      -1,   143,    -1,    -1,   146,   147,   148,    -1,    -1,    -1,
+     152,    -1,   154,   155,    -1,   157,   158,   159,    -1,    -1,
+     162,   163,    -1,   165,   166,   167,   168,   169,   170,    -1,
+      -1,   173,   174,   175,   176,   177,    -1,    -1,   180,   181,
+      -1,   183,   184,   185,   186,   187,    -1,    -1,   190,   191,
+      -1,    -1,    -1,   195,   196,    -1,   198,    -1,    -1,    -1,
+     202,    -1,   204,   205,   206,   207,    -1,   209,    -1,   211,
+      -1,    -1,    -1,   215,   216,    -1,   218,    -1,    -1,   221,
+     222,    -1,    -1,    -1,   226,   227,   228,   229,    -1,    -1,
+     232,   233,   234,    -1,    -1,   237,    -1,    -1,    -1,    -1,
+     242,   243,   244,    -1,    -1,    -1,   248,    -1,    -1,    -1,
+     252,   253,    -1,   255,   256,    -1,    -1,    -1,   260,    -1,
+     262,    -1,    -1,   265,   266,    -1,    -1,   269,    -1,    -1,
+     272,   273,   274,    -1,    -1,    -1,    -1,   279,   280,    -1,
+     282,    -1,   284,    -1,   286,   287,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   295,    -1,   297,   298,   299,   300,   301,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,   313,    -1,   315,   316,   317,    -1,   319,   320,   321,
+     322,    -1,   324,   325,    -1,    -1,    -1,    -1,   330,   331,
+     332,   333,   334,   335,    -1,    -1,   338,   339,    -1,   341,
+      -1,   343,    -1,   345,   346,   347,   348,   349,   350,   351,
+     352,   353,    -1,    -1,   356,   357,    -1,    -1,   360,   361,
+     362,   363,   364,    -1,    -1,    -1,   368,   369,    -1,   371,
+      -1,   373,    -1,   375,   376,    -1,   378,   379,   380,    -1,
+      -1,   383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   393,   394,   395,    -1,   397,    -1,   399,    -1,   401,
+     402,   403,   404,   405,   406,   407,   408,   409,   410,    -1,
+     412,    -1,   414,   415,   416,    -1,   418,    -1,   420,   421,
+     422,   423,   424,    -1,   426,   427,   428,    -1,    -1,   431,
+      -1,    -1,    -1,   435,   436,    -1,   438,   439,    -1,    -1,
+     442,   443,   444,   445,   446,    -1,   448,   449,    -1,   451,
+     452,   453,    -1,    -1,   456,   457,   458,   459,   460,   461,
+     462,   463,    -1,   465,    -1,   467,   468,    -1,   470,   471,
+     472,    -1,   474,    -1,    -1,   477,   478,   479,   480,    -1,
+     482,    -1,   484,   485,   486,   487,   488,    -1,   490,   491,
+      -1,    -1,    -1,   495,   496,   497,   498,    -1,    -1,    -1,
+     502,    -1,    -1,    -1,   506,    -1,   508,   509,   510,   511,
+      -1,   513,   514,   515,   516,   517,    -1,    -1,    -1,    -1,
+      -1,   523,   524,   525,    -1,   527,    -1,    -1,   530,    -1,
+      -1,   533,    -1,   535,    -1,   537,   538,   539,   540,   541,
+     542,    -1,    -1,   545,   546,    -1,    -1,   549,   550,   551,
+     552,   553,   554,    -1,    -1,   557,   558,   559,   560,    -1,
+     562,   563,    -1,    -1,   566,   567,   568,   569,    -1,   571,
+     572,   573,    -1,   575,   576,   577,   578,    -1,    -1,    -1,
+      -1,    -1,   584,   585,    -1,    -1,    -1,   589,   590,   591,
+      -1,    -1,   594,   595,    -1,   597,   598,    -1,   600,   601,
+      -1,    -1,   604,    -1,    -1,   607,    -1,   609,    -1,   611,
+     612,    -1,    -1,    -1,    -1,    -1,   618,    -1,   620,    -1,
+      -1,   623,    -1,    -1,    -1,   627,    -1,   629,   630,   631,
+     632,    -1,    -1,    -1,    -1,    -1,    -1,   639,   640,   641,
+      -1,   643,   644,   645,   646,    -1,    -1,   649,    -1,    -1,
+     652,   653,   654,   655,   656,    -1,   658,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   667,   668,   669,    -1,   671,
+     672,   673,    -1,   675,    -1,    -1,   678,    -1,   680,    -1,
+      -1,    -1,    -1,    -1,    -1,   687,   688,    -1,    -1,   691,
+      -1,   693,    -1,   695,   696,    -1,    -1,    -1,   700,   701,
+     702,   703,   704,   705,   706,   707,    -1,   709,   710,   711,
+     712,   713,   714,   715,   716,   717,   718,    -1,   720,   721,
+     722,   723,   724,   725,   726,   727,   728,   729,   730,   731,
+     732,   733,   734,   735,   736,   737,   738,   739,   740,   741,
+     742,   743,    -1,   745,   746,   747,   748,   749,   750,   751,
+      -1,   753,   754,   755,   756,   757,   758,   759,   760,   761,
+     762,   763,   764,   765,   766,   767,   768,   769,   770,   771,
+     772,   773,   774,   775,   776,   777,   778,   779,   780,   781,
+     782,   783,   784,   785,   786,   787,   788,   789,   790,   791,
+     792,   793,     5,     6,    -1,     8,     9,    10,    11,    12,
+      -1,    -1,    15,    -1,    -1,    -1,    -1,    20,    -1,    -1,
+      23,    -1,    25,    26,    27,    28,    29,    30,    -1,    32,
+      -1,    -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,
+      43,    44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,
+      53,    -1,    -1,    56,    57,    -1,    59,    60,    61,    -1,
+      63,    -1,    65,    66,    67,    68,    69,    70,    -1,    72,
+      73,    -1,    75,    76,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    -1,    87,    88,    -1,    90,    91,    92,
+      93,    94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,
+     103,    -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,
+      -1,    -1,   115,    -1,    -1,    -1,    -1,   120,   121,    -1,
+      -1,    -1,    -1,   126,   127,    -1,   129,    -1,    -1,    -1,
+      -1,    -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,
+     143,    -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,
+      -1,   154,   155,    -1,   157,   158,   159,    -1,    -1,   162,
+     163,    -1,   165,   166,   167,   168,   169,   170,    -1,    -1,
+     173,   174,   175,   176,   177,    -1,    -1,   180,   181,    -1,
+     183,   184,   185,   186,   187,    -1,    -1,   190,   191,    -1,
+      -1,    -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,
+      -1,   204,   205,   206,   207,    -1,   209,    -1,   211,    -1,
+      -1,    -1,   215,   216,    -1,   218,    -1,    -1,   221,   222,
+      -1,    -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,
+     233,   234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,
+     243,   244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,
+     253,    -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,
+      -1,    -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,
+     273,   274,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,
+      -1,   284,    -1,   286,   287,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   295,    -1,   297,   298,   299,   300,   301,   302,
+     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
+     313,    -1,   315,   316,   317,    -1,   319,   320,   321,   322,
+      -1,   324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,
+     333,   334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,
+     343,    -1,   345,   346,   347,   348,   349,   350,   351,   352,
+     353,    -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,
+     363,   364,    -1,    -1,    -1,   368,   369,    -1,    -1,    -1,
+     373,    -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,
+     383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     393,   394,   395,    -1,   397,    -1,   399,    -1,   401,   402,
+     403,   404,   405,   406,   407,   408,   409,   410,    -1,   412,
+      -1,   414,   415,   416,    -1,   418,    -1,   420,   421,   422,
+     423,   424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,
+      -1,    -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,
+     443,   444,   445,   446,    -1,   448,   449,    -1,   451,   452,
+     453,    -1,    -1,   456,   457,   458,   459,   460,   461,   462,
+     463,    -1,   465,    -1,   467,   468,    -1,   470,   471,   472,
+      -1,   474,    -1,    -1,   477,   478,   479,   480,    -1,   482,
+      -1,   484,   485,   486,   487,   488,    -1,   490,   491,    -1,
+      -1,    -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,
+      -1,    -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,
+     513,   514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,
+     523,   524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,
+     533,    -1,   535,    -1,   537,   538,   539,   540,   541,   542,
+      -1,    -1,   545,   546,    -1,    -1,   549,   550,   551,   552,
+     553,   554,    -1,    -1,   557,   558,   559,   560,    -1,   562,
+     563,    -1,    -1,   566,   567,   568,   569,    -1,   571,   572,
+     573,    -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,
+      -1,   584,   585,    -1,    -1,    -1,   589,   590,   591,    -1,
+      -1,   594,   595,    -1,   597,   598,    -1,   600,   601,    -1,
+      -1,   604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,
+      -1,    -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,
+     623,    -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,
+      -1,    -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,
+     643,   644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,
+     653,   654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,
+     673,    -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,
+      -1,    -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,
+     693,    -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,
+     703,   704,   705,   706,   707,    -1,   709,   710,   711,   712,
+     713,   714,   715,   716,   717,   718,    -1,   720,   721,   722,
+     723,   724,   725,   726,   727,   728,   729,   730,   731,   732,
+     733,   734,   735,   736,   737,   738,   739,   740,   741,   742,
+     743,    -1,   745,   746,   747,   748,   749,   750,   751,    -1,
+     753,   754,   755,   756,   757,   758,   759,   760,   761,   762,
+     763,   764,   765,   766,   767,   768,   769,   770,   771,   772,
+     773,   774,   775,   776,   777,   778,   779,   780,   781,   782,
+     783,   784,   785,   786,   787,   788,   789,   790,   791,   792,
+     793,     5,     6,    -1,     8,     9,    10,    11,    12,    -1,
+      -1,    15,    -1,    -1,    -1,    -1,    20,    -1,    -1,    23,
+      -1,    25,    26,    27,    28,    29,    30,    -1,    32,    -1,
+      -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,
+      44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,
+      -1,    -1,    56,    57,    -1,    59,    60,    61,    -1,    63,
+      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
+      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
+      84,    85,    -1,    87,    88,    -1,    90,    91,    92,    93,
+      94,    95,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,
+      -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,
+      -1,   115,    -1,    -1,    -1,    -1,   120,   121,    -1,    -1,
+      -1,    -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,
+      -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,   143,
+      -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,
+     154,   155,    -1,   157,   158,   159,    -1,    -1,   162,   163,
+      -1,   165,   166,   167,   168,   169,   170,    -1,   172,   173,
+     174,   175,   176,   177,    -1,    -1,   180,   181,    -1,   183,
+     184,   185,   186,   187,    -1,    -1,   190,   191,    -1,    -1,
+      -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,
+     204,   205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,
+      -1,   215,   216,    -1,   218,    -1,    -1,   221,   222,    -1,
+      -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,   233,
+     234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,
+     244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,
+      -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,
+      -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,
+      -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,
+     284,    -1,   286,   287,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   295,    -1,   297,   298,   299,   300,   301,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
+      -1,   315,   316,   317,    -1,   319,   320,   321,   322,    -1,
+     324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,
+     334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,
+      -1,   345,   346,   347,   348,   349,   350,   351,   352,   353,
+      -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,   363,
+     364,    -1,    -1,    -1,   368,   369,    -1,    -1,    -1,   373,
+      -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,   383,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,
+     394,   395,    -1,   397,    -1,   399,    -1,   401,   402,   403,
+     404,   405,   406,   407,   408,   409,   410,    -1,   412,    -1,
+     414,   415,   416,    -1,   418,    -1,   420,   421,   422,   423,
+     424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,
+      -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,   443,
+     444,   445,   446,    -1,   448,   449,    -1,   451,   452,   453,
+      -1,    -1,   456,   457,   458,   459,   460,   461,   462,   463,
+      -1,   465,    -1,   467,   468,    -1,   470,   471,   472,    -1,
+     474,    -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,
+     484,   485,   486,   487,   488,    -1,   490,   491,    -1,    -1,
+      -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,
+      -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,   513,
+     514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,
+     524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,
+      -1,   535,    -1,   537,   538,   539,   540,   541,   542,    -1,
+      -1,   545,   546,    -1,    -1,   549,   550,   551,   552,   553,
+     554,    -1,    -1,   557,   558,   559,   560,    -1,   562,   563,
+      -1,    -1,   566,   567,   568,   569,    -1,    -1,   572,   573,
+      -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,
+     584,   585,    -1,    -1,    -1,   589,   590,   591,    -1,    -1,
+     594,   595,    -1,   597,   598,    -1,   600,   601,    -1,    -1,
+     604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,
+      -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,
+      -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,
+      -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,
+     644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,
+     654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,   673,
+      -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,
+      -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,
+      -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,   703,
+     704,   705,   706,   707,    -1,   709,   710,   711,   712,   713,
+     714,   715,   716,   717,   718,    -1,   720,   721,   722,   723,
+     724,   725,   726,   727,   728,   729,   730,   731,   732,   733,
+     734,   735,   736,   737,   738,   739,   740,   741,   742,   743,
+      -1,   745,   746,   747,   748,   749,   750,   751,    -1,   753,
+     754,   755,   756,   757,   758,   759,   760,   761,   762,   763,
+     764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
+     774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
+     784,   785,   786,   787,   788,   789,   790,   791,   792,   793,
+       5,     6,    -1,     8,     9,    10,    11,    12,    -1,    -1,
+      15,    -1,    -1,    -1,    -1,    20,    -1,    -1,    23,    -1,
+      25,    26,    27,    28,    29,    30,    -1,    32,    -1,    -1,
+      -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,    44,
+      45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,    -1,
+      -1,    56,    57,    -1,    59,    60,    61,    -1,    63,    -1,
+      65,    66,    67,    68,    69,    70,    -1,    72,    73,    -1,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    -1,    87,    88,    -1,    90,    91,    92,    93,    94,
+      -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,    -1,
+      -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,    -1,
+     115,    -1,    -1,    -1,    -1,   120,   121,    -1,    -1,    -1,
+      -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,    -1,
+     135,   136,   137,   138,   139,    -1,    -1,    -1,   143,    -1,
+      -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,   154,
+     155,    -1,   157,   158,   159,    -1,    -1,   162,   163,    -1,
+     165,   166,   167,   168,   169,   170,    -1,    -1,   173,   174,
+     175,   176,   177,    -1,    -1,   180,   181,    -1,   183,   184,
+     185,   186,   187,    -1,    -1,   190,   191,    -1,    -1,    -1,
+     195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,   204,
+     205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,    -1,
+     215,   216,    -1,   218,    -1,    -1,   221,   222,    -1,    -1,
+      -1,   226,   227,   228,   229,    -1,    -1,   232,   233,   234,
+      -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,   244,
+      -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,    -1,
+     255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,    -1,
+     265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,    -1,
+      -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,   284,
+      -1,   286,   287,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     295,    -1,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,    -1,
+     315,   316,   317,    -1,   319,   320,   321,   322,    -1,   324,
+     325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,   334,
+     335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,    -1,
+     345,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
+      -1,   356,   357,    -1,    -1,   360,   361,   362,   363,   364,
+      -1,    -1,    -1,   368,   369,    -1,    -1,    -1,   373,    -1,
+     375,   376,    -1,   378,   379,   380,    -1,    -1,   383,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,   394,
+     395,    -1,   397,    -1,   399,    -1,   401,   402,   403,   404,
+     405,   406,   407,   408,   409,   410,    -1,   412,    -1,   414,
+     415,   416,    -1,   418,    -1,   420,   421,   422,   423,   424,
+      -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,    -1,
+     435,   436,    -1,   438,   439,    -1,    -1,   442,   443,   444,
+     445,   446,    -1,   448,   449,    -1,   451,   452,   453,    -1,
+      -1,   456,   457,   458,   459,   460,   461,   462,   463,    -1,
+     465,    -1,   467,   468,    -1,   470,   471,   472,    -1,   474,
+      -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,   484,
+     485,   486,   487,   488,    -1,   490,   491,    -1,    -1,    -1,
+     495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,    -1,
+      -1,   506,    -1,   508,   509,   510,   511,    -1,   513,   514,
+     515,   516,   517,    -1,    -1,    -1,   521,    -1,   523,   524,
+     525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,    -1,
+     535,    -1,   537,   538,   539,   540,   541,   542,    -1,    -1,
+     545,   546,    -1,    -1,   549,   550,   551,   552,   553,   554,
+      -1,    -1,   557,   558,   559,   560,    -1,   562,   563,    -1,
+      -1,   566,   567,   568,   569,    -1,    -1,   572,   573,    -1,
+     575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,   584,
+     585,    -1,    -1,    -1,   589,   590,   591,    -1,    -1,   594,
+     595,    -1,   597,   598,    -1,   600,   601,    -1,    -1,   604,
+      -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,    -1,
+      -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,    -1,
+      -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,    -1,
+      -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,   644,
+     645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,   654,
+     655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   667,   668,   669,    -1,   671,   672,   673,    -1,
+     675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,    -1,
+      -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,    -1,
+     695,   696,    -1,    -1,    -1,   700,   701,   702,   703,   704,
+     705,   706,   707,    -1,   709,   710,   711,   712,   713,   714,
+     715,   716,   717,   718,    -1,   720,   721,   722,   723,   724,
+     725,   726,   727,   728,   729,   730,   731,   732,   733,   734,
+     735,   736,   737,   738,   739,   740,   741,   742,   743,    -1,
+     745,   746,   747,   748,   749,   750,   751,    -1,   753,   754,
+     755,   756,   757,   758,   759,   760,   761,   762,   763,   764,
+     765,   766,   767,   768,   769,   770,   771,   772,   773,   774,
+     775,   776,   777,   778,   779,   780,   781,   782,   783,   784,
+     785,   786,   787,   788,   789,   790,   791,   792,   793,     5,
+       6,    -1,     8,     9,    10,    11,    12,    -1,    -1,    15,
+      -1,    -1,    -1,    -1,    20,    -1,    -1,    23,    -1,    25,
+      26,    27,    28,    29,    30,    -1,    32,    -1,    -1,    -1,
+      36,    -1,    -1,    -1,    40,    -1,    -1,    43,    44,    45,
+      -1,    47,    -1,    49,    50,    -1,    -1,    53,    -1,    -1,
+      56,    57,    -1,    59,    60,    61,    -1,    63,    -1,    65,
+      66,    67,    68,    69,    70,    -1,    72,    73,    -1,    75,
+      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
+      -1,    87,    88,    -1,    90,    91,    92,    93,    94,    -1,
+      -1,    -1,    98,    -1,    -1,    -1,    -1,   103,    -1,    -1,
+     106,    -1,    -1,    -1,   110,   111,   112,    -1,    -1,   115,
+      -1,    -1,    -1,    -1,   120,   121,    -1,    -1,    -1,    -1,
+     126,   127,    -1,   129,    -1,    -1,    -1,    -1,    -1,   135,
+     136,   137,   138,   139,    -1,    -1,    -1,   143,    -1,    -1,
+     146,   147,   148,    -1,    -1,    -1,   152,    -1,   154,   155,
+      -1,   157,   158,   159,    -1,    -1,   162,   163,    -1,   165,
+     166,   167,   168,   169,   170,    -1,    -1,   173,   174,   175,
+     176,   177,    -1,    -1,   180,   181,    -1,   183,   184,   185,
+     186,   187,    -1,    -1,   190,   191,    -1,    -1,    -1,   195,
+     196,    -1,   198,    -1,    -1,    -1,   202,    -1,   204,   205,
+     206,   207,    -1,   209,    -1,   211,    -1,    -1,    -1,   215,
+     216,    -1,   218,    -1,    -1,   221,   222,    -1,    -1,    -1,
+     226,   227,   228,   229,    -1,    -1,   232,   233,   234,    -1,
+      -1,   237,    -1,    -1,    -1,    -1,   242,   243,   244,    -1,
+      -1,    -1,   248,    -1,    -1,    -1,   252,   253,    -1,   255,
+     256,    -1,    -1,    -1,   260,    -1,   262,    -1,    -1,   265,
+     266,    -1,    -1,   269,    -1,    -1,   272,   273,    -1,    -1,
+      -1,    -1,    -1,   279,   280,    -1,   282,    -1,   284,    -1,
+     286,   287,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   295,
+      -1,   297,   298,   299,   300,   301,   302,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,   312,   313,    -1,   315,
+     316,   317,    -1,   319,   320,   321,   322,    -1,   324,   325,
+      -1,    -1,    -1,    -1,   330,   331,   332,   333,   334,   335,
+      -1,    -1,   338,   339,    -1,   341,    -1,   343,    -1,   345,
+     346,   347,   348,   349,   350,   351,   352,   353,    -1,    -1,
+     356,   357,    -1,    -1,   360,   361,   362,   363,   364,    -1,
+      -1,    -1,   368,   369,    -1,    -1,    -1,   373,    -1,   375,
+     376,    -1,   378,   379,   380,    -1,    -1,   383,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,   394,   395,
+      -1,   397,    -1,   399,    -1,   401,   402,   403,   404,   405,
+     406,   407,   408,   409,   410,    -1,   412,    -1,   414,   415,
+     416,    -1,   418,    -1,   420,   421,   422,   423,   424,    -1,
+     426,   427,   428,    -1,    -1,   431,    -1,    -1,    -1,   435,
+     436,    -1,   438,   439,    -1,    -1,   442,   443,   444,   445,
+     446,    -1,   448,   449,    -1,   451,   452,   453,    -1,    -1,
+     456,   457,   458,   459,   460,   461,   462,   463,    -1,   465,
+      -1,   467,   468,    -1,   470,   471,   472,    -1,   474,    -1,
+      -1,   477,   478,   479,   480,    -1,   482,    -1,   484,   485,
+     486,   487,   488,    -1,   490,   491,    -1,    -1,    -1,   495,
+     496,   497,   498,    -1,    -1,    -1,   502,    -1,    -1,    -1,
+     506,    -1,   508,   509,   510,   511,    -1,   513,   514,   515,
+     516,   517,    -1,    -1,    -1,    -1,    -1,   523,   524,   525,
+      -1,   527,    -1,    -1,   530,    -1,    -1,   533,    -1,   535,
+      -1,   537,   538,   539,   540,   541,   542,    -1,    -1,   545,
+     546,    -1,    -1,   549,   550,   551,   552,   553,   554,    -1,
+      -1,   557,   558,   559,   560,    -1,   562,   563,    -1,    -1,
+     566,   567,   568,   569,    -1,    -1,   572,   573,    -1,   575,
+     576,   577,   578,    -1,    -1,    -1,    -1,    -1,   584,   585,
+      -1,    -1,    -1,   589,   590,   591,    -1,    -1,   594,   595,
+      -1,   597,   598,    -1,   600,   601,    -1,    -1,   604,    -1,
+      -1,   607,    -1,   609,    -1,   611,   612,    -1,    -1,    -1,
+      -1,    -1,   618,    -1,   620,    -1,    -1,   623,    -1,    -1,
+      -1,   627,    -1,   629,   630,   631,   632,    -1,    -1,    -1,
+      -1,    -1,    -1,   639,   640,   641,    -1,   643,   644,   645,
+     646,    -1,    -1,   649,    -1,    -1,   652,   653,   654,   655,
+     656,    -1,   658,   659,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   667,   668,   669,    -1,   671,   672,   673,    -1,   675,
+      -1,    -1,   678,    -1,   680,    -1,    -1,    -1,    -1,    -1,
+      -1,   687,   688,    -1,    -1,   691,    -1,   693,    -1,   695,
+     696,    -1,    -1,    -1,   700,   701,   702,   703,   704,   705,
+     706,   707,    -1,   709,   710,   711,   712,   713,   714,   715,
+     716,   717,   718,    -1,   720,   721,   722,   723,   724,   725,
+     726,   727,   728,   729,   730,   731,   732,   733,   734,   735,
+     736,   737,   738,   739,   740,   741,   742,   743,    -1,   745,
+     746,   747,   748,   749,   750,   751,    -1,   753,   754,   755,
+     756,   757,   758,   759,   760,   761,   762,   763,   764,   765,
+     766,   767,   768,   769,   770,   771,   772,   773,   774,   775,
+     776,   777,   778,   779,   780,   781,   782,   783,   784,   785,
+     786,   787,   788,   789,   790,   791,   792,   793,     5,     6,
+      -1,     8,     9,    10,    11,    12,    -1,    -1,    15,    -1,
+      17,    -1,    -1,    20,    -1,    -1,    23,    -1,    25,    26,
+      27,    28,    29,    30,    -1,    32,    -1,    -1,    -1,    36,
+      -1,    -1,    -1,    40,    -1,    -1,    43,    44,    45,    -1,
+      47,    -1,    49,    50,    -1,    -1,    53,    -1,    -1,    56,
+      57,    -1,    59,    60,    61,    -1,    63,    -1,    65,    66,
+      67,    68,    69,    70,    -1,    72,    73,    -1,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    -1,
+      87,    88,    -1,    90,    91,    92,    93,    94,    -1,    -1,
+      -1,    98,    -1,    -1,    -1,    -1,   103,    -1,    -1,   106,
+      -1,    -1,    -1,   110,   111,   112,    -1,    -1,   115,    -1,
+      -1,    -1,    -1,   120,   121,    -1,    -1,    -1,    -1,   126,
+     127,    -1,   129,    -1,    -1,    -1,    -1,    -1,   135,   136,
+     137,   138,   139,    -1,    -1,    -1,   143,    -1,    -1,   146,
+     147,   148,    -1,    -1,    -1,   152,    -1,   154,   155,    -1,
+     157,   158,   159,    -1,    -1,   162,   163,    -1,   165,   166,
+     167,   168,   169,   170,    -1,    -1,   173,   174,   175,   176,
+     177,    -1,    -1,   180,   181,    -1,   183,   184,   185,   186,
+     187,    -1,    -1,   190,   191,    -1,    -1,    -1,   195,   196,
+      -1,   198,    -1,    -1,    -1,   202,    -1,   204,   205,   206,
+     207,    -1,   209,    -1,   211,    -1,    -1,    -1,   215,   216,
+      -1,   218,    -1,    -1,   221,   222,    -1,    -1,    -1,   226,
+     227,   228,   229,    -1,    -1,   232,   233,   234,    -1,    -1,
+     237,    -1,    -1,    -1,    -1,   242,   243,   244,    -1,    -1,
+      -1,   248,    -1,    -1,    -1,   252,   253,    -1,   255,   256,
+      -1,    -1,    -1,   260,    -1,   262,    -1,    -1,   265,   266,
+      -1,    -1,   269,    -1,    -1,   272,   273,    -1,    -1,    -1,
+      -1,    -1,   279,   280,    -1,   282,    -1,   284,    -1,   286,
+     287,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,
+     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,   313,    -1,   315,   316,
+     317,    -1,   319,   320,   321,   322,    -1,   324,   325,    -1,
+      -1,    -1,    -1,   330,   331,   332,   333,   334,   335,    -1,
+      -1,   338,   339,    -1,   341,    -1,   343,    -1,   345,   346,
+     347,   348,   349,   350,   351,   352,   353,    -1,    -1,   356,
+     357,    -1,    -1,   360,   361,   362,   363,   364,    -1,    -1,
+      -1,   368,   369,    -1,    -1,    -1,   373,    -1,   375,   376,
+      -1,   378,   379,   380,    -1,    -1,   383,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   393,   394,   395,    -1,
+     397,    -1,   399,    -1,   401,   402,   403,   404,   405,   406,
+     407,   408,   409,   410,    -1,   412,    -1,   414,   415,   416,
+      -1,   418,    -1,   420,   421,   422,   423,   424,    -1,   426,
+     427,   428,    -1,    -1,   431,    -1,    -1,    -1,   435,   436,
+      -1,   438,   439,    -1,    -1,   442,   443,   444,   445,   446,
+      -1,   448,   449,    -1,   451,   452,   453,    -1,    -1,   456,
+     457,   458,   459,   460,   461,   462,   463,    -1,   465,    -1,
+     467,   468,    -1,   470,   471,   472,    -1,   474,    -1,    -1,
+     477,   478,   479,   480,    -1,   482,    -1,   484,   485,   486,
+     487,   488,    -1,   490,   491,    -1,    -1,    -1,   495,   496,
+     497,   498,    -1,    -1,    -1,   502,    -1,    -1,    -1,   506,
+      -1,   508,   509,   510,   511,    -1,   513,   514,   515,   516,
+     517,    -1,    -1,    -1,    -1,    -1,   523,   524,   525,    -1,
+     527,    -1,    -1,   530,    -1,    -1,   533,    -1,   535,    -1,
+     537,   538,   539,   540,   541,   542,    -1,    -1,   545,   546,
+      -1,    -1,   549,   550,   551,   552,   553,   554,    -1,    -1,
+     557,   558,   559,   560,    -1,   562,   563,    -1,    -1,   566,
+     567,   568,   569,    -1,    -1,   572,   573,    -1,   575,   576,
+     577,   578,    -1,    -1,    -1,    -1,    -1,   584,   585,    -1,
+      -1,    -1,   589,   590,   591,    -1,    -1,   594,   595,    -1,
+     597,   598,    -1,   600,   601,    -1,    -1,   604,    -1,    -1,
+     607,    -1,   609,    -1,   611,   612,    -1,    -1,    -1,    -1,
+      -1,   618,    -1,   620,    -1,    -1,   623,    -1,    -1,    -1,
+     627,    -1,   629,   630,   631,   632,    -1,    -1,    -1,    -1,
+      -1,    -1,   639,   640,   641,    -1,   643,   644,   645,   646,
+      -1,    -1,   649,    -1,    -1,   652,   653,   654,   655,   656,
+      -1,   658,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     667,   668,   669,    -1,   671,   672,   673,    -1,   675,    -1,
+      -1,   678,    -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,
+     687,   688,    -1,    -1,   691,    -1,   693,    -1,   695,   696,
+      -1,    -1,    -1,   700,   701,   702,   703,   704,   705,   706,
+     707,    -1,   709,   710,   711,   712,   713,   714,   715,   716,
+     717,   718,    -1,   720,   721,   722,   723,   724,   725,   726,
+     727,   728,   729,   730,   731,   732,   733,   734,   735,   736,
+     737,   738,   739,   740,   741,   742,   743,    -1,   745,   746,
+     747,   748,   749,   750,   751,    -1,   753,   754,   755,   756,
+     757,   758,   759,   760,   761,   762,   763,   764,   765,   766,
+     767,   768,   769,   770,   771,   772,   773,   774,   775,   776,
+     777,   778,   779,   780,   781,   782,   783,   784,   785,   786,
+     787,   788,   789,   790,   791,   792,   793,     5,     6,    -1,
+       8,     9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,
+      -1,    -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,
+      28,    29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,
+      -1,    -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,
+      -1,    49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,
+      -1,    59,    60,    61,    -1,    63,    -1,    65,    66,    67,
+      68,    69,    70,    -1,    72,    73,    -1,    75,    76,    77,
+      78,    79,    80,    81,    82,    83,    84,    85,    -1,    87,
+      88,    -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,
+      98,    -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,
+      -1,    -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,
+      -1,    -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,
+      -1,   129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,
+     138,   139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,
+     148,    -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,
+     158,   159,    -1,    -1,   162,   163,    -1,   165,   166,   167,
+     168,   169,   170,    -1,    -1,   173,   174,   175,   176,   177,
+      -1,    -1,   180,   181,    -1,   183,   184,   185,   186,   187,
+      -1,    -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,
+     198,    -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,
+      -1,   209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,
+     218,    -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,
+     228,   229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,
+      -1,    -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,
+     248,    -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,
+      -1,    -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,
+      -1,   269,    -1,    -1,   272,   273,    -1,    -1,    -1,    -1,
+      -1,   279,   280,    -1,   282,    -1,   284,    -1,   286,   287,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,
+     298,   299,   300,   301,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,   313,    -1,   315,   316,   317,
+      -1,   319,   320,   321,   322,    -1,   324,   325,    -1,    -1,
+      -1,    -1,   330,   331,   332,   333,   334,   335,    -1,    -1,
+     338,   339,    -1,   341,    -1,   343,    -1,   345,   346,   347,
+     348,   349,   350,   351,   352,   353,    -1,    -1,   356,   357,
+      -1,    -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,
+     368,   369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,
+     378,   379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,
+      -1,   399,    -1,   401,   402,   403,   404,   405,   406,   407,
+     408,   409,   410,    -1,   412,    -1,   414,   415,   416,    -1,
+     418,    -1,   420,   421,   422,   423,   424,    -1,   426,   427,
+     428,    -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,
+     438,   439,    -1,    -1,   442,   443,   444,   445,   446,    -1,
+     448,   449,    -1,   451,   452,   453,    -1,    -1,   456,   457,
+     458,   459,   460,   461,   462,   463,    -1,   465,    -1,   467,
+     468,    -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,
+     478,   479,   480,    -1,   482,    -1,   484,   485,   486,   487,
+     488,    -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,
+     498,    -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,
+     508,   509,   510,   511,    -1,   513,   514,   515,   516,   517,
+      -1,    -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,
+      -1,    -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,
+     538,   539,   540,   541,   542,    -1,    -1,   545,   546,    -1,
+      -1,   549,   550,   551,   552,   553,   554,    -1,    -1,   557,
+     558,   559,   560,    -1,   562,   563,    -1,    -1,   566,   567,
+     568,   569,    -1,   571,   572,   573,    -1,   575,   576,   577,
+     578,    -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,
+      -1,   589,   590,   591,    -1,    -1,   594,   595,    -1,   597,
+     598,    -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,
+      -1,   609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,
+     618,    -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,
+      -1,   629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,
+      -1,   639,   640,   641,    -1,   643,   644,   645,   646,    -1,
+      -1,   649,    -1,    -1,   652,   653,   654,   655,   656,    -1,
+     658,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,
+     668,   669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,
+     678,    -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,
+     688,    -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,
+      -1,    -1,   700,   701,   702,   703,   704,   705,   706,   707,
+      -1,   709,   710,   711,   712,   713,   714,   715,   716,   717,
+     718,    -1,   720,   721,   722,   723,   724,   725,   726,   727,
+     728,   729,   730,   731,   732,   733,   734,   735,   736,   737,
+     738,   739,   740,   741,   742,   743,    -1,   745,   746,   747,
+     748,   749,   750,   751,    -1,   753,   754,   755,   756,   757,
+     758,   759,   760,   761,   762,   763,   764,   765,   766,   767,
+     768,   769,   770,   771,   772,   773,   774,   775,   776,   777,
+     778,   779,   780,   781,   782,   783,   784,   785,   786,   787,
+     788,   789,   790,   791,   792,   793,     5,     6,    -1,     8,
        9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    -1,    -1,    25,    26,    27,    28,
+      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
       29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
       -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      -1,    -1,    -1,    -1,    53,    54,    -1,    56,    57,    -1,
-      59,    60,    -1,    -1,    -1,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    -1,    78,
-      -1,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    -1,    94,    -1,    -1,    -1,    98,
+      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
+      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
+      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
+      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
+      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
       -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
       -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,    -1,    -1,    -1,    -1,    -1,   126,   127,    -1,
+      -1,   120,   121,    -1,    -1,    -1,    -1,   126,   127,    -1,
      129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,    -1,    -1,    -1,   146,   147,   148,
+     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
       -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
      159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,    -1,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,   182,   183,   184,   185,   186,   187,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   195,   196,    -1,   198,
+     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
+      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
+      -1,   190,   191,    -1,    -1,    -1,   195,   196,   197,   198,
       -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,    -1,   216,    -1,    -1,
+     209,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
       -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,   230,    -1,   232,    -1,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,    -1,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,   257,    -1,
-      -1,   260,    -1,   262,    -1,    -1,    -1,   266,    -1,    -1,
-     269,   270,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
+     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
+      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
+      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
+      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
+     269,    -1,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
      279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,   292,    -1,    -1,   295,    -1,   297,   298,
+      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
      299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
      309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
      319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
       -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
      339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
      349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,    -1,
+      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
      369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
      379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
      399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,    -1,    -1,    -1,   415,   416,    -1,   418,
+     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
       -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
       -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
      439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,    -1,   453,   454,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,    -1,    -1,   467,   468,
-      -1,   470,   471,   472,   473,   474,    -1,    -1,    -1,   478,
-     479,   480,    -1,   482,    -1,   484,   485,    -1,   487,   488,
+     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
+     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
+      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
+     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
       -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,    -1,    -1,    -1,
-     509,    -1,   511,    -1,   513,   514,   515,   516,   517,    -1,
+      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
+     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
       -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,    -1,
-     539,   540,   541,   542,    -1,    -1,    -1,   546,    -1,    -1,
+      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
+     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
      549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
      559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
      569,    -1,    -1,   572,   573,    -1,   575,   576,   577,   578,
       -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-      -1,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,    -1,    -1,    -1,    -1,   604,    -1,    -1,   607,    -1,
+     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
+      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
      609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
       -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,   635,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,    -1,   645,   646,    -1,    -1,
+     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
+     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
      649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,    -1,    -1,    -1,   678,
+     669,    -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,
       -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
       -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
       -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,    -1,   713,   714,   715,   716,   717,   718,
+     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
       -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
      729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
      739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
      749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
      759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
      769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
+     779,   780,   781,   782,   783,   784,   785,   786,   787,   788,
+     789,   790,   791,   792,   793,     5,     6,    -1,     8,     9,
+      10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,    -1,
+      20,    -1,    -1,    23,    -1,    25,    26,    27,    28,    29,
+      30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,    -1,
+      40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,    49,
+      50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,    59,
+      60,    61,    -1,    63,    -1,    65,    66,    67,    68,    69,
+      70,    -1,    72,    73,    -1,    75,    76,    77,    78,    79,
+      80,    81,    82,    83,    84,    85,    -1,    87,    88,    -1,
+      90,    91,    92,    93,    94,    -1,    -1,    -1,    98,    -1,
+      -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,    -1,
+     110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,    -1,
+     120,   121,    -1,    -1,    -1,   125,   126,   127,    -1,   129,
+      -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,   139,
+      -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,    -1,
+      -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,   159,
+      -1,    -1,   162,   163,    -1,   165,   166,   167,   168,   169,
+     170,    -1,    -1,   173,   174,   175,   176,   177,    -1,    -1,
+     180,   181,    -1,   183,   184,   185,   186,   187,    -1,    -1,
+     190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,    -1,
+      -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,   209,
+      -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,    -1,
+      -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,   229,
+      -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,    -1,
+      -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,    -1,
+      -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,    -1,
+     260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,   269,
+      -1,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,   279,
+     280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,    -1,   315,   316,   317,    -1,   319,
+     320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,    -1,
+     330,   331,   332,   333,   334,   335,    -1,    -1,   338,   339,
+      -1,   341,    -1,   343,    -1,   345,   346,   347,   348,   349,
+     350,   351,   352,   353,    -1,    -1,   356,   357,    -1,    -1,
+     360,   361,   362,   363,   364,    -1,    -1,    -1,   368,   369,
+      -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,   379,
+     380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,   399,
+      -1,   401,   402,   403,   404,   405,   406,   407,   408,   409,
+     410,    -1,   412,    -1,   414,   415,   416,    -1,   418,    -1,
+     420,   421,   422,   423,   424,    -1,   426,   427,   428,    -1,
+      -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,   439,
+      -1,    -1,   442,   443,   444,   445,   446,    -1,   448,   449,
+      -1,   451,   452,   453,    -1,    -1,   456,   457,   458,   459,
+     460,   461,   462,   463,    -1,   465,    -1,   467,   468,    -1,
+     470,   471,   472,    -1,   474,    -1,    -1,   477,   478,   479,
+     480,    -1,   482,    -1,   484,   485,   486,   487,   488,    -1,
+     490,   491,    -1,    -1,    -1,   495,   496,   497,   498,    -1,
+      -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,   509,
+     510,   511,    -1,   513,   514,   515,   516,   517,    -1,    -1,
+      -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,    -1,
+     530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,   539,
+     540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,   549,
+     550,   551,   552,   553,   554,    -1,    -1,   557,   558,   559,
+     560,    -1,   562,   563,    -1,    -1,   566,   567,   568,   569,
+      -1,    -1,   572,   573,    -1,   575,   576,   577,   578,    -1,
+      -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,   589,
+     590,   591,    -1,    -1,   594,   595,    -1,   597,   598,    -1,
+     600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,   609,
+      -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,    -1,
+     620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,   629,
+     630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,   639,
+     640,   641,    -1,   643,   644,   645,   646,    -1,    -1,   649,
+      -1,    -1,   652,   653,   654,   655,   656,    -1,   658,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,   669,
+      -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,    -1,
+     680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,    -1,
+      -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,    -1,
+     700,   701,   702,   703,   704,   705,   706,   707,    -1,   709,
+     710,   711,   712,   713,   714,   715,   716,   717,   718,    -1,
+     720,   721,   722,   723,   724,   725,   726,   727,   728,   729,
+     730,   731,   732,   733,   734,   735,   736,   737,   738,   739,
+     740,   741,   742,   743,    -1,   745,   746,   747,   748,   749,
+     750,   751,    -1,   753,   754,   755,   756,   757,   758,   759,
+     760,   761,   762,   763,   764,   765,   766,   767,   768,   769,
+     770,   771,   772,   773,   774,   775,   776,   777,   778,   779,
+     780,   781,   782,   783,   784,   785,   786,   787,   788,   789,
+     790,   791,   792,   793,     5,     6,    -1,     8,     9,    10,
+      11,    12,    -1,    -1,    15,    -1,    -1,    -1,    -1,    20,
+      -1,    -1,    23,    -1,    25,    26,    27,    28,    29,    30,
+      -1,    32,    -1,    -1,    -1,    36,    -1,    -1,    -1,    40,
+      -1,    -1,    43,    44,    45,    -1,    47,    -1,    49,    50,
+      -1,    -1,    53,    -1,    -1,    56,    57,    -1,    59,    60,
+      61,    -1,    63,    -1,    65,    66,    67,    68,    69,    70,
+      -1,    72,    73,    -1,    75,    76,    77,    78,    79,    80,
+      81,    82,    83,    84,    85,    -1,    87,    88,    -1,    90,
+      91,    92,    93,    94,    -1,    -1,    -1,    98,    -1,    -1,
+      -1,    -1,   103,    -1,    -1,   106,    -1,    -1,    -1,   110,
+     111,   112,    -1,    -1,   115,    -1,    -1,    -1,    -1,   120,
+     121,    -1,    -1,    -1,   125,   126,   127,    -1,   129,    -1,
+      -1,    -1,    -1,    -1,   135,   136,   137,   138,   139,    -1,
+      -1,    -1,   143,    -1,    -1,   146,   147,   148,    -1,    -1,
+      -1,   152,    -1,   154,   155,    -1,   157,   158,   159,    -1,
+      -1,   162,   163,    -1,   165,   166,   167,   168,   169,   170,
+      -1,    -1,   173,   174,   175,   176,   177,    -1,    -1,   180,
+     181,    -1,   183,   184,   185,   186,   187,    -1,    -1,   190,
+     191,    -1,    -1,    -1,   195,   196,    -1,   198,    -1,    -1,
+      -1,   202,    -1,   204,   205,   206,   207,    -1,   209,    -1,
+     211,    -1,    -1,    -1,   215,   216,    -1,   218,    -1,    -1,
+     221,   222,    -1,    -1,    -1,   226,   227,   228,   229,    -1,
+      -1,   232,   233,   234,    -1,    -1,   237,    -1,    -1,    -1,
+      -1,   242,   243,   244,    -1,    -1,    -1,   248,    -1,    -1,
+      -1,   252,   253,    -1,   255,   256,    -1,    -1,    -1,   260,
+      -1,   262,    -1,    -1,   265,   266,    -1,    -1,   269,    -1,
+      -1,   272,   273,    -1,    -1,    -1,    -1,    -1,   279,   280,
+      -1,   282,    -1,   284,    -1,   286,   287,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   295,    -1,   297,   298,   299,   300,
+     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
+     311,   312,   313,    -1,   315,   316,   317,    -1,   319,   320,
+     321,   322,    -1,   324,   325,    -1,    -1,    -1,    -1,   330,
+     331,   332,   333,   334,   335,    -1,    -1,   338,   339,    -1,
+     341,    -1,   343,    -1,   345,   346,   347,   348,   349,   350,
+     351,   352,   353,    -1,    -1,   356,   357,    -1,    -1,   360,
+     361,   362,   363,   364,    -1,    -1,    -1,   368,   369,    -1,
+      -1,    -1,   373,    -1,   375,   376,    -1,   378,   379,   380,
+      -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   393,   394,   395,    -1,   397,    -1,   399,    -1,
+     401,   402,   403,   404,   405,   406,   407,   408,   409,   410,
+      -1,   412,    -1,   414,   415,   416,    -1,   418,    -1,   420,
+     421,   422,   423,   424,    -1,   426,   427,   428,    -1,    -1,
+     431,    -1,    -1,    -1,   435,   436,    -1,   438,   439,    -1,
+      -1,   442,   443,   444,   445,   446,    -1,   448,   449,    -1,
+     451,   452,   453,    -1,    -1,   456,   457,   458,   459,   460,
+     461,   462,   463,    -1,   465,    -1,   467,   468,    -1,   470,
+     471,   472,    -1,   474,    -1,    -1,   477,   478,   479,   480,
+      -1,   482,    -1,   484,   485,   486,   487,   488,    -1,   490,
+     491,    -1,    -1,    -1,   495,   496,   497,   498,    -1,    -1,
+      -1,   502,    -1,    -1,    -1,   506,    -1,   508,   509,   510,
+     511,    -1,   513,   514,   515,   516,   517,    -1,    -1,    -1,
+      -1,    -1,   523,   524,   525,    -1,   527,    -1,    -1,   530,
+      -1,    -1,   533,    -1,   535,    -1,   537,   538,   539,   540,
+     541,   542,    -1,    -1,   545,   546,    -1,    -1,   549,   550,
+     551,   552,   553,   554,    -1,    -1,   557,   558,   559,   560,
+      -1,   562,   563,    -1,    -1,   566,   567,   568,   569,    -1,
+      -1,   572,   573,    -1,   575,   576,   577,   578,    -1,    -1,
+      -1,    -1,    -1,   584,   585,    -1,    -1,    -1,   589,   590,
+     591,    -1,    -1,   594,   595,    -1,   597,   598,    -1,   600,
+     601,    -1,    -1,   604,    -1,    -1,   607,    -1,   609,    -1,
+     611,   612,    -1,    -1,    -1,    -1,    -1,   618,    -1,   620,
+      -1,    -1,   623,    -1,    -1,    -1,   627,    -1,   629,   630,
+     631,   632,    -1,    -1,    -1,    -1,    -1,    -1,   639,   640,
+     641,    -1,   643,   644,   645,   646,    -1,    -1,   649,    -1,
+      -1,   652,   653,   654,   655,   656,    -1,   658,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   667,   668,   669,    -1,
+     671,   672,   673,    -1,   675,    -1,    -1,   678,    -1,   680,
+      -1,    -1,    -1,    -1,    -1,    -1,   687,   688,    -1,    -1,
+     691,    -1,   693,    -1,   695,   696,    -1,    -1,    -1,   700,
+     701,   702,   703,   704,   705,   706,   707,    -1,   709,   710,
+     711,   712,   713,   714,   715,   716,   717,   718,    -1,   720,
+     721,   722,   723,   724,   725,   726,   727,   728,   729,   730,
+     731,   732,   733,   734,   735,   736,   737,   738,   739,   740,
+     741,   742,   743,    -1,   745,   746,   747,   748,   749,   750,
+     751,    -1,   753,   754,   755,   756,   757,   758,   759,   760,
+     761,   762,   763,   764,   765,   766,   767,   768,   769,   770,
+     771,   772,   773,   774,   775,   776,   777,   778,   779,   780,
+     781,   782,   783,   784,   785,   786,   787,   788,   789,   790,
+     791,   792,   793,     5,     6,    -1,     8,     9,    10,    11,
+      12,    13,    -1,    15,    -1,    -1,    -1,    -1,    20,    -1,
+      -1,    23,    -1,    25,    26,    27,    28,    29,    30,    -1,
+      32,    -1,    -1,    -1,    36,    -1,    -1,    -1,    40,    -1,
+      -1,    43,    44,    45,    -1,    47,    -1,    49,    50,    -1,
+      -1,    53,    -1,    -1,    56,    57,    -1,    59,    60,    61,
+      -1,    63,    -1,    65,    66,    67,    68,    69,    70,    -1,
+      72,    73,    -1,    75,    76,    77,    78,    79,    80,    81,
+      82,    83,    84,    85,    -1,    87,    88,    -1,    90,    91,
+      92,    93,    94,    -1,    -1,    -1,    98,    -1,    -1,    -1,
+      -1,   103,    -1,    -1,   106,    -1,    -1,    -1,   110,   111,
+     112,    -1,    -1,   115,    -1,    -1,    -1,    -1,   120,   121,
+      -1,    -1,    -1,    -1,   126,   127,    -1,   129,    -1,    -1,
+      -1,    -1,    -1,   135,   136,   137,   138,   139,    -1,    -1,
+      -1,   143,    -1,    -1,   146,   147,   148,    -1,    -1,    -1,
+     152,    -1,   154,   155,    -1,   157,   158,   159,    -1,    -1,
+     162,   163,    -1,   165,   166,   167,   168,   169,   170,    -1,
+      -1,   173,   174,   175,   176,   177,    -1,    -1,   180,   181,
+      -1,   183,   184,   185,   186,   187,    -1,    -1,   190,   191,
+      -1,    -1,    -1,   195,   196,    -1,   198,    -1,    -1,    -1,
+     202,    -1,   204,   205,   206,   207,    -1,   209,    -1,   211,
+      -1,    -1,    -1,   215,   216,    -1,   218,    -1,    -1,   221,
+     222,    -1,    -1,    -1,   226,   227,   228,   229,    -1,    -1,
+     232,   233,   234,    -1,    -1,   237,    -1,    -1,    -1,    -1,
+     242,   243,   244,    -1,    -1,    -1,   248,    -1,    -1,    -1,
+     252,   253,    -1,   255,   256,    -1,    -1,    -1,   260,    -1,
+     262,    -1,    -1,   265,   266,    -1,    -1,   269,    -1,    -1,
+     272,   273,    -1,    -1,    -1,    -1,    -1,   279,   280,    -1,
+     282,    -1,   284,    -1,   286,   287,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   295,    -1,   297,   298,   299,   300,   301,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,   313,    -1,   315,   316,   317,    -1,   319,   320,   321,
+     322,    -1,   324,   325,    -1,    -1,    -1,    -1,   330,   331,
+     332,   333,   334,   335,    -1,    -1,   338,   339,    -1,   341,
+      -1,   343,    -1,   345,   346,   347,   348,   349,   350,   351,
+     352,   353,    -1,    -1,   356,   357,    -1,    -1,   360,   361,
+     362,   363,   364,    -1,    -1,    -1,   368,   369,    -1,    -1,
+      -1,   373,    -1,   375,   376,    -1,   378,   379,   380,    -1,
+      -1,   383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   393,   394,   395,    -1,   397,    -1,   399,    -1,   401,
+     402,   403,   404,   405,   406,   407,   408,   409,   410,    -1,
+     412,    -1,   414,   415,   416,    -1,   418,    -1,   420,   421,
+     422,   423,   424,    -1,   426,   427,   428,    -1,    -1,   431,
+      -1,    -1,    -1,   435,   436,    -1,   438,   439,    -1,    -1,
+     442,   443,   444,   445,   446,    -1,   448,   449,    -1,   451,
+     452,   453,    -1,    -1,   456,   457,   458,   459,   460,   461,
+     462,   463,    -1,   465,    -1,   467,   468,    -1,   470,   471,
+     472,    -1,   474,    -1,    -1,   477,   478,   479,   480,    -1,
+     482,    -1,   484,   485,   486,   487,   488,    -1,   490,   491,
+      -1,    -1,    -1,   495,   496,   497,   498,    -1,    -1,    -1,
+     502,    -1,    -1,    -1,   506,    -1,   508,   509,   510,   511,
+      -1,   513,   514,   515,   516,   517,    -1,    -1,    -1,    -1,
+      -1,   523,   524,   525,    -1,   527,    -1,    -1,   530,    -1,
+      -1,   533,    -1,   535,    -1,   537,   538,   539,   540,   541,
+     542,    -1,    -1,   545,   546,    -1,    -1,   549,   550,   551,
+     552,   553,   554,    -1,    -1,   557,   558,   559,   560,    -1,
+     562,   563,    -1,    -1,   566,   567,   568,   569,    -1,    -1,
+     572,   573,    -1,   575,   576,   577,   578,    -1,    -1,    -1,
+      -1,    -1,   584,   585,    -1,    -1,    -1,   589,   590,   591,
+      -1,    -1,   594,   595,    -1,   597,   598,    -1,   600,   601,
+      -1,    -1,   604,    -1,    -1,   607,    -1,   609,    -1,   611,
+     612,    -1,    -1,    -1,    -1,    -1,   618,    -1,   620,    -1,
+      -1,   623,    -1,    -1,    -1,   627,    -1,   629,   630,   631,
+     632,    -1,    -1,    -1,    -1,    -1,    -1,   639,   640,   641,
+      -1,   643,   644,   645,   646,    -1,    -1,   649,    -1,    -1,
+     652,   653,   654,   655,   656,    -1,   658,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   667,   668,   669,    -1,   671,
+     672,   673,    -1,   675,    -1,    -1,   678,    -1,   680,    -1,
+      -1,    -1,    -1,    -1,    -1,   687,   688,    -1,    -1,   691,
+      -1,   693,    -1,   695,   696,    -1,    -1,    -1,   700,   701,
+     702,   703,   704,   705,   706,   707,    -1,   709,   710,   711,
+     712,   713,   714,   715,   716,   717,   718,    -1,   720,   721,
+     722,   723,   724,   725,   726,   727,   728,   729,   730,   731,
+     732,   733,   734,   735,   736,   737,   738,   739,   740,   741,
+     742,   743,    -1,   745,   746,   747,   748,   749,   750,   751,
+      -1,   753,   754,   755,   756,   757,   758,   759,   760,   761,
+     762,   763,   764,   765,   766,   767,   768,   769,   770,   771,
+     772,   773,   774,   775,   776,   777,   778,   779,   780,   781,
+     782,   783,   784,   785,   786,   787,   788,   789,   790,   791,
+     792,   793,     5,     6,    -1,     8,     9,    10,    11,    12,
+      -1,    -1,    15,    -1,    -1,    -1,    -1,    20,    -1,    -1,
+      23,    -1,    25,    26,    27,    28,    29,    30,    -1,    32,
+      -1,    -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,
+      43,    44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,
+      53,    -1,    -1,    56,    57,    -1,    59,    60,    61,    -1,
+      63,    -1,    65,    66,    67,    68,    69,    70,    -1,    72,
+      73,    -1,    75,    76,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    -1,    87,    88,    -1,    90,    91,    92,
+      93,    94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,
+     103,    -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,
+      -1,    -1,   115,    -1,    -1,    -1,    -1,   120,   121,    -1,
+      -1,    -1,   125,   126,   127,    -1,   129,    -1,    -1,    -1,
+      -1,    -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,
+     143,    -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,
+      -1,   154,   155,    -1,   157,   158,   159,    -1,    -1,   162,
+     163,    -1,   165,   166,   167,   168,   169,   170,    -1,    -1,
+     173,   174,   175,   176,   177,    -1,    -1,   180,   181,    -1,
+     183,   184,   185,   186,   187,    -1,    -1,   190,   191,    -1,
+      -1,    -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,
+      -1,   204,   205,   206,   207,    -1,   209,    -1,   211,    -1,
+      -1,    -1,   215,   216,    -1,   218,    -1,    -1,   221,   222,
+      -1,    -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,
+     233,   234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,
+     243,   244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,
+     253,    -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,
+      -1,    -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,
+     273,    -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,
+      -1,   284,    -1,   286,   287,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   295,    -1,   297,   298,   299,   300,   301,   302,
+     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
+     313,    -1,   315,   316,   317,    -1,   319,   320,   321,   322,
+      -1,   324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,
+     333,   334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,
+     343,    -1,   345,   346,   347,   348,   349,   350,   351,   352,
+     353,    -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,
+     363,   364,    -1,    -1,    -1,   368,   369,    -1,    -1,    -1,
+     373,    -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,
+     383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     393,   394,   395,    -1,   397,    -1,   399,    -1,   401,   402,
+     403,   404,   405,   406,   407,   408,   409,   410,    -1,   412,
+      -1,   414,   415,   416,    -1,   418,    -1,   420,   421,   422,
+     423,   424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,
+      -1,    -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,
+     443,   444,   445,   446,    -1,   448,   449,    -1,   451,   452,
+     453,    -1,    -1,   456,   457,   458,   459,   460,   461,   462,
+     463,    -1,   465,    -1,   467,   468,    -1,   470,   471,   472,
+      -1,   474,    -1,    -1,   477,   478,   479,   480,    -1,   482,
+      -1,   484,   485,   486,   487,   488,    -1,   490,   491,    -1,
+      -1,    -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,
+      -1,    -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,
+     513,   514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,
+     523,   524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,
+     533,    -1,   535,    -1,   537,   538,   539,   540,   541,   542,
+      -1,    -1,   545,   546,    -1,    -1,   549,   550,   551,   552,
+     553,   554,    -1,    -1,   557,   558,   559,   560,    -1,   562,
+     563,    -1,    -1,   566,   567,   568,   569,    -1,    -1,   572,
+     573,    -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,
+      -1,   584,   585,    -1,    -1,    -1,   589,   590,   591,    -1,
+      -1,   594,   595,    -1,   597,   598,    -1,   600,   601,    -1,
+      -1,   604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,
+      -1,    -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,
+     623,    -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,
+      -1,    -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,
+     643,   644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,
+     653,   654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,
+     673,    -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,
+      -1,    -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,
+     693,    -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,
+     703,   704,   705,   706,   707,    -1,   709,   710,   711,   712,
+     713,   714,   715,   716,   717,   718,    -1,   720,   721,   722,
+     723,   724,   725,   726,   727,   728,   729,   730,   731,   732,
+     733,   734,   735,   736,   737,   738,   739,   740,   741,   742,
+     743,    -1,   745,   746,   747,   748,   749,   750,   751,    -1,
+     753,   754,   755,   756,   757,   758,   759,   760,   761,   762,
+     763,   764,   765,   766,   767,   768,   769,   770,   771,   772,
+     773,   774,   775,   776,   777,   778,   779,   780,   781,   782,
+     783,   784,   785,   786,   787,   788,   789,   790,   791,   792,
+     793,     5,     6,    -1,     8,     9,    10,    11,    12,    -1,
+      -1,    15,    -1,    -1,    -1,    -1,    20,    -1,    -1,    23,
+      -1,    25,    26,    27,    28,    29,    30,    -1,    32,    -1,
+      -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,
+      44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,
+      -1,    -1,    56,    57,    -1,    59,    60,    61,    -1,    63,
+      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
+      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
+      84,    85,    -1,    87,    88,    -1,    90,    91,    92,    93,
+      94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,
+      -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,
+      -1,   115,    -1,    -1,    -1,    -1,   120,   121,    -1,    -1,
+      -1,    -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,
+      -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,   143,
+      -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,
+     154,   155,    -1,   157,   158,   159,    -1,    -1,   162,   163,
+      -1,   165,   166,   167,   168,   169,   170,    -1,    -1,   173,
+     174,   175,   176,   177,    -1,    -1,   180,   181,    -1,   183,
+     184,   185,   186,   187,    -1,    -1,   190,   191,    -1,    -1,
+      -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,
+     204,   205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,
+      -1,   215,   216,    -1,   218,    -1,    -1,   221,   222,    -1,
+      -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,   233,
+     234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,
+     244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,
+      -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,
+      -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,
+      -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,
+     284,    -1,   286,   287,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   295,    -1,   297,   298,   299,   300,   301,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
+      -1,   315,   316,   317,    -1,   319,   320,   321,   322,    -1,
+     324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,
+     334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,
+      -1,   345,   346,   347,   348,   349,   350,   351,   352,   353,
+      -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,   363,
+     364,    -1,    -1,    -1,   368,   369,    -1,    -1,    -1,   373,
+      -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,   383,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,
+     394,   395,    -1,   397,    -1,   399,    -1,   401,   402,   403,
+     404,   405,   406,   407,   408,   409,   410,    -1,   412,    -1,
+     414,   415,   416,   417,   418,    -1,   420,   421,   422,   423,
+     424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,
+      -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,   443,
+     444,   445,   446,    -1,   448,   449,    -1,   451,   452,   453,
+      -1,    -1,   456,   457,   458,   459,   460,   461,   462,   463,
+      -1,   465,    -1,   467,   468,    -1,   470,   471,   472,    -1,
+     474,    -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,
+     484,   485,   486,   487,   488,    -1,   490,   491,    -1,    -1,
+      -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,
+      -1,    -1,   506,    -1,   508,   509,   510,   511,    -1,   513,
+     514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,
+     524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,
+      -1,   535,    -1,   537,   538,   539,   540,   541,   542,    -1,
+      -1,   545,   546,    -1,    -1,   549,   550,   551,   552,   553,
+     554,    -1,    -1,   557,   558,   559,   560,    -1,   562,   563,
+      -1,    -1,   566,   567,   568,   569,    -1,    -1,   572,   573,
+      -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,
+     584,   585,    -1,    -1,    -1,   589,   590,   591,    -1,    -1,
+     594,   595,    -1,   597,   598,    -1,   600,   601,    -1,    -1,
+     604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,
+      -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,
+      -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,
+      -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,
+     644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,
+     654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,   673,
+      -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,
+      -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,
+      -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,   703,
+     704,   705,   706,   707,    -1,   709,   710,   711,   712,   713,
+     714,   715,   716,   717,   718,    -1,   720,   721,   722,   723,
+     724,   725,   726,   727,   728,   729,   730,   731,   732,   733,
+     734,   735,   736,   737,   738,   739,   740,   741,   742,   743,
+      -1,   745,   746,   747,   748,   749,   750,   751,    -1,   753,
+     754,   755,   756,   757,   758,   759,   760,   761,   762,   763,
+     764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
+     774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
+     784,   785,   786,   787,   788,   789,   790,   791,   792,   793,
+       5,     6,    -1,     8,     9,    10,    11,    12,    -1,    -1,
+      15,    -1,    -1,    -1,    -1,    20,    -1,    -1,    23,    -1,
+      25,    26,    27,    28,    29,    30,    -1,    32,    -1,    -1,
+      -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,    44,
+      45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,    -1,
+      -1,    56,    57,    -1,    59,    60,    61,    -1,    63,    -1,
+      65,    66,    67,    68,    69,    70,    -1,    72,    73,    -1,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    -1,    87,    88,    -1,    90,    91,    92,    93,    94,
+      -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,    -1,
+      -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,    -1,
+     115,    -1,    -1,    -1,    -1,   120,   121,    -1,    -1,    -1,
+      -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,    -1,
+     135,   136,   137,   138,   139,    -1,    -1,    -1,   143,    -1,
+      -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,   154,
+     155,    -1,   157,   158,   159,    -1,    -1,   162,   163,    -1,
+     165,   166,   167,   168,   169,   170,    -1,    -1,   173,   174,
+     175,   176,   177,    -1,    -1,   180,   181,    -1,   183,   184,
+     185,   186,   187,    -1,    -1,   190,   191,    -1,    -1,    -1,
+     195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,   204,
+     205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,    -1,
+     215,   216,    -1,   218,    -1,    -1,   221,   222,    -1,    -1,
+      -1,   226,   227,   228,   229,    -1,    -1,   232,   233,   234,
+      -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,   244,
+      -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,    -1,
+     255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,    -1,
+     265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,    -1,
+      -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,   284,
+      -1,   286,   287,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     295,    -1,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,    -1,
+     315,   316,   317,    -1,   319,   320,   321,   322,    -1,   324,
+     325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,   334,
+     335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,    -1,
+     345,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
+      -1,   356,   357,    -1,    -1,   360,   361,   362,   363,   364,
+      -1,    -1,    -1,   368,   369,    -1,    -1,    -1,   373,    -1,
+     375,   376,    -1,   378,   379,   380,    -1,    -1,   383,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,   394,
+     395,    -1,   397,    -1,   399,    -1,   401,   402,   403,   404,
+     405,   406,   407,   408,   409,   410,    -1,   412,    -1,   414,
+     415,   416,    -1,   418,    -1,   420,   421,   422,   423,   424,
+      -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,    -1,
+     435,   436,    -1,   438,   439,    -1,    -1,   442,   443,   444,
+     445,   446,    -1,   448,   449,    -1,   451,   452,   453,    -1,
+      -1,   456,   457,   458,   459,   460,   461,   462,   463,    -1,
+     465,    -1,   467,   468,    -1,   470,   471,   472,    -1,   474,
+      -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,   484,
+     485,   486,   487,   488,    -1,   490,   491,    -1,    -1,    -1,
+     495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,    -1,
+      -1,   506,    -1,   508,   509,   510,   511,    -1,   513,   514,
+     515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,   524,
+     525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,    -1,
+     535,    -1,   537,   538,   539,   540,   541,   542,    -1,    -1,
+     545,   546,    -1,    -1,   549,   550,   551,   552,   553,   554,
+      -1,    -1,   557,   558,   559,   560,    -1,   562,   563,    -1,
+      -1,   566,   567,   568,   569,    -1,    -1,   572,   573,    -1,
+     575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,   584,
+     585,    -1,    -1,    -1,   589,   590,   591,    -1,    -1,   594,
+     595,    -1,   597,   598,    -1,   600,   601,    -1,    -1,   604,
+      -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,    -1,
+      -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,    -1,
+      -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,    -1,
+      -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,   644,
+     645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,   654,
+     655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   667,   668,   669,    -1,   671,   672,   673,    -1,
+     675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,    -1,
+      -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,    -1,
+     695,   696,    -1,    -1,    -1,   700,   701,   702,   703,   704,
+     705,   706,   707,    -1,   709,   710,   711,   712,   713,   714,
+     715,   716,   717,   718,    -1,   720,   721,   722,   723,   724,
+     725,   726,   727,   728,   729,   730,   731,   732,   733,   734,
+     735,   736,   737,   738,   739,   740,   741,   742,   743,    -1,
+     745,   746,   747,   748,   749,   750,   751,    -1,   753,   754,
+     755,   756,   757,   758,   759,   760,   761,   762,   763,   764,
+     765,   766,   767,   768,   769,   770,   771,   772,   773,   774,
+     775,   776,   777,   778,   779,   780,   781,   782,   783,   784,
+     785,   786,   787,   788,   789,   790,   791,   792,   793,     5,
+       6,    -1,     8,     9,    10,    11,    12,    -1,    -1,    15,
+      -1,    -1,    -1,    -1,    20,    -1,    -1,    23,    -1,    25,
+      26,    27,    28,    29,    30,    -1,    32,    -1,    -1,    -1,
+      36,    -1,    -1,    -1,    40,    -1,    -1,    43,    44,    45,
+      -1,    47,    -1,    49,    50,    -1,    -1,    53,    -1,    -1,
+      56,    57,    -1,    59,    60,    61,    -1,    63,    -1,    65,
+      66,    67,    68,    69,    70,    -1,    72,    73,    -1,    75,
+      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
+      -1,    87,    88,    -1,    90,    91,    92,    93,    94,    -1,
+      -1,    -1,    98,    -1,    -1,    -1,    -1,   103,    -1,    -1,
+     106,    -1,    -1,    -1,   110,   111,   112,    -1,    -1,   115,
+      -1,    -1,    -1,    -1,   120,   121,    -1,    -1,    -1,    -1,
+     126,   127,    -1,   129,    -1,    -1,    -1,    -1,    -1,   135,
+     136,   137,   138,   139,    -1,    -1,    -1,   143,    -1,    -1,
+     146,   147,   148,    -1,    -1,    -1,   152,    -1,   154,   155,
+      -1,   157,   158,   159,    -1,    -1,   162,   163,    -1,   165,
+     166,   167,   168,   169,   170,    -1,    -1,   173,   174,   175,
+     176,   177,    -1,    -1,   180,   181,    -1,   183,   184,   185,
+     186,   187,    -1,    -1,   190,   191,    -1,    -1,    -1,   195,
+     196,    -1,   198,    -1,    -1,    -1,   202,    -1,   204,   205,
+     206,   207,    -1,   209,    -1,   211,    -1,    -1,    -1,   215,
+     216,    -1,   218,    -1,    -1,   221,   222,    -1,    -1,    -1,
+     226,   227,   228,   229,    -1,    -1,   232,   233,   234,    -1,
+      -1,   237,    -1,    -1,    -1,    -1,   242,   243,   244,    -1,
+      -1,    -1,   248,    -1,    -1,    -1,   252,   253,    -1,   255,
+     256,    -1,    -1,    -1,   260,    -1,   262,    -1,    -1,   265,
+     266,    -1,    -1,   269,    -1,    -1,   272,   273,    -1,    -1,
+      -1,    -1,    -1,   279,   280,    -1,   282,    -1,   284,    -1,
+     286,   287,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   295,
+      -1,   297,   298,   299,   300,   301,   302,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,   312,   313,    -1,   315,
+     316,   317,    -1,   319,   320,   321,   322,    -1,   324,   325,
+      -1,    -1,    -1,    -1,   330,   331,   332,   333,   334,   335,
+      -1,    -1,   338,   339,    -1,   341,    -1,   343,    -1,   345,
+     346,   347,   348,   349,   350,   351,   352,   353,    -1,    -1,
+     356,   357,    -1,    -1,   360,   361,   362,   363,   364,    -1,
+      -1,    -1,   368,   369,    -1,    -1,    -1,   373,    -1,   375,
+     376,    -1,   378,   379,   380,    -1,    -1,   383,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,   394,   395,
+      -1,   397,    -1,   399,    -1,   401,   402,   403,   404,   405,
+     406,   407,   408,   409,   410,    -1,   412,    -1,   414,   415,
+     416,    -1,   418,    -1,   420,   421,   422,   423,   424,    -1,
+     426,   427,   428,    -1,    -1,   431,    -1,    -1,    -1,   435,
+     436,    -1,   438,   439,    -1,    -1,   442,   443,   444,   445,
+     446,    -1,   448,   449,    -1,   451,   452,   453,    -1,    -1,
+     456,   457,   458,   459,   460,   461,   462,   463,    -1,   465,
+      -1,   467,   468,    -1,   470,   471,   472,    -1,   474,    -1,
+      -1,   477,   478,   479,   480,    -1,   482,    -1,   484,   485,
+     486,   487,   488,    -1,   490,   491,    -1,    -1,    -1,   495,
+     496,   497,   498,    -1,    -1,    -1,   502,    -1,    -1,    -1,
+     506,    -1,   508,   509,   510,   511,    -1,   513,   514,   515,
+     516,   517,    -1,    -1,    -1,    -1,    -1,   523,   524,   525,
+      -1,   527,    -1,    -1,   530,    -1,    -1,   533,    -1,   535,
+      -1,   537,   538,   539,   540,   541,   542,    -1,    -1,   545,
+     546,    -1,    -1,   549,   550,   551,   552,   553,   554,    -1,
+      -1,   557,   558,   559,   560,    -1,   562,   563,    -1,    -1,
+     566,   567,   568,   569,    -1,    -1,   572,   573,    -1,   575,
+     576,   577,   578,    -1,    -1,    -1,    -1,    -1,   584,   585,
+      -1,    -1,    -1,   589,   590,   591,    -1,    -1,   594,   595,
+      -1,   597,   598,    -1,   600,   601,    -1,    -1,   604,    -1,
+      -1,   607,    -1,   609,    -1,   611,   612,    -1,    -1,    -1,
+      -1,    -1,   618,    -1,   620,    -1,    -1,   623,    -1,    -1,
+      -1,   627,    -1,   629,   630,   631,   632,    -1,    -1,    -1,
+      -1,    -1,    -1,   639,   640,   641,    -1,   643,   644,   645,
+     646,    -1,    -1,   649,    -1,    -1,   652,   653,   654,   655,
+     656,    -1,   658,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   667,   668,   669,    -1,   671,   672,   673,    -1,   675,
+      -1,    -1,   678,    -1,   680,    -1,    -1,    -1,    -1,    -1,
+      -1,   687,   688,    -1,    -1,   691,    -1,   693,    -1,   695,
+     696,    -1,    -1,    -1,   700,   701,   702,   703,   704,   705,
+     706,   707,    -1,   709,   710,   711,   712,   713,   714,   715,
+     716,   717,   718,    -1,   720,   721,   722,   723,   724,   725,
+     726,   727,   728,   729,   730,   731,   732,   733,   734,   735,
+     736,   737,   738,   739,   740,   741,   742,   743,    -1,   745,
+     746,   747,   748,   749,   750,   751,    -1,   753,   754,   755,
+     756,   757,   758,   759,   760,   761,   762,   763,   764,   765,
+     766,   767,   768,   769,   770,   771,   772,   773,   774,   775,
+     776,   777,   778,   779,   780,   781,   782,   783,   784,   785,
+     786,   787,   788,   789,   790,   791,   792,   793,     5,     6,
+      -1,     8,     9,    10,    11,    12,    -1,    -1,    15,    -1,
+      -1,    -1,    -1,    20,    -1,    -1,    23,    -1,    25,    26,
+      27,    28,    29,    30,    -1,    32,    -1,    -1,    -1,    36,
+      -1,    -1,    -1,    40,    -1,    -1,    43,    44,    45,    -1,
+      47,    -1,    49,    50,    -1,    -1,    53,    -1,    -1,    56,
+      57,    -1,    59,    60,    61,    -1,    63,    -1,    65,    66,
+      67,    68,    69,    70,    -1,    72,    73,    -1,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    -1,
+      87,    88,    -1,    90,    91,    92,    93,    94,    -1,    -1,
+      -1,    98,    -1,    -1,    -1,    -1,   103,    -1,    -1,   106,
+      -1,    -1,    -1,   110,   111,   112,    -1,    -1,   115,    -1,
+      -1,    -1,    -1,   120,   121,    -1,    -1,    -1,    -1,   126,
+     127,    -1,   129,    -1,    -1,    -1,    -1,    -1,   135,   136,
+     137,   138,   139,    -1,    -1,    -1,   143,    -1,    -1,   146,
+     147,   148,    -1,    -1,    -1,   152,    -1,   154,   155,    -1,
+     157,   158,   159,    -1,    -1,   162,   163,    -1,   165,   166,
+     167,   168,   169,   170,    -1,    -1,   173,   174,   175,   176,
+     177,    -1,    -1,   180,   181,    -1,   183,   184,   185,   186,
+     187,    -1,    -1,   190,   191,    -1,    -1,    -1,   195,   196,
+      -1,   198,    -1,    -1,    -1,   202,    -1,   204,   205,   206,
+     207,    -1,   209,    -1,   211,    -1,    -1,    -1,   215,   216,
+      -1,   218,    -1,    -1,   221,   222,    -1,    -1,    -1,   226,
+     227,   228,   229,    -1,    -1,   232,   233,   234,    -1,    -1,
+     237,    -1,    -1,    -1,    -1,   242,   243,   244,    -1,    -1,
+      -1,   248,    -1,    -1,    -1,   252,   253,    -1,   255,   256,
+      -1,    -1,    -1,   260,    -1,   262,    -1,    -1,   265,   266,
+      -1,    -1,   269,    -1,    -1,   272,   273,    -1,    -1,    -1,
+      -1,    -1,   279,   280,    -1,   282,    -1,   284,    -1,   286,
+     287,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,
+     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,   313,    -1,   315,   316,
+     317,    -1,   319,   320,   321,   322,    -1,   324,   325,    -1,
+      -1,    -1,    -1,   330,   331,   332,   333,   334,   335,    -1,
+      -1,   338,   339,    -1,   341,    -1,   343,    -1,   345,   346,
+     347,   348,   349,   350,   351,   352,   353,    -1,    -1,   356,
+     357,    -1,    -1,   360,   361,   362,   363,   364,    -1,    -1,
+      -1,   368,   369,    -1,    -1,    -1,   373,    -1,   375,   376,
+      -1,   378,   379,   380,    -1,    -1,   383,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   393,   394,   395,    -1,
+     397,    -1,   399,    -1,   401,   402,   403,   404,   405,   406,
+     407,   408,   409,   410,    -1,   412,    -1,   414,   415,   416,
+      -1,   418,    -1,   420,   421,   422,   423,   424,    -1,   426,
+     427,   428,    -1,    -1,   431,    -1,    -1,    -1,   435,   436,
+      -1,   438,   439,    -1,    -1,   442,   443,   444,   445,   446,
+      -1,   448,   449,    -1,   451,   452,   453,    -1,    -1,   456,
+     457,   458,   459,   460,   461,   462,   463,    -1,   465,    -1,
+     467,   468,    -1,   470,   471,   472,    -1,   474,    -1,    -1,
+     477,   478,   479,   480,    -1,   482,    -1,   484,   485,   486,
+     487,   488,    -1,   490,   491,    -1,    -1,    -1,   495,   496,
+     497,   498,    -1,    -1,    -1,   502,    -1,    -1,    -1,   506,
+      -1,   508,   509,   510,   511,    -1,   513,   514,   515,   516,
+     517,    -1,    -1,    -1,    -1,    -1,   523,   524,   525,    -1,
+     527,    -1,    -1,   530,    -1,    -1,   533,    -1,   535,    -1,
+     537,   538,   539,   540,   541,   542,    -1,    -1,   545,   546,
+      -1,    -1,   549,   550,   551,   552,   553,   554,    -1,    -1,
+     557,   558,   559,   560,    -1,   562,   563,    -1,    -1,   566,
+     567,   568,   569,    -1,    -1,   572,   573,    -1,   575,   576,
+     577,   578,    -1,    -1,    -1,    -1,    -1,   584,   585,    -1,
+      -1,    -1,   589,   590,   591,    -1,    -1,   594,   595,    -1,
+     597,   598,    -1,   600,   601,    -1,    -1,   604,    -1,    -1,
+     607,    -1,   609,    -1,   611,   612,    -1,    -1,    -1,    -1,
+      -1,   618,    -1,   620,    -1,    -1,   623,    -1,    -1,    -1,
+     627,    -1,   629,   630,   631,   632,    -1,    -1,    -1,    -1,
+      -1,    -1,   639,   640,   641,    -1,   643,   644,   645,   646,
+      -1,    -1,   649,    -1,    -1,   652,   653,   654,   655,   656,
+      -1,   658,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     667,   668,   669,    -1,   671,   672,   673,    -1,   675,    -1,
+      -1,   678,    -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,
+     687,   688,    -1,    -1,   691,    -1,   693,    -1,   695,   696,
+      -1,    -1,    -1,   700,   701,   702,   703,   704,   705,   706,
+     707,    -1,   709,   710,   711,   712,   713,   714,   715,   716,
+     717,   718,    -1,   720,   721,   722,   723,   724,   725,   726,
+     727,   728,   729,   730,   731,   732,   733,   734,   735,   736,
+     737,   738,   739,   740,   741,   742,   743,    -1,   745,   746,
+     747,   748,   749,   750,   751,    -1,   753,   754,   755,   756,
+     757,   758,   759,   760,   761,   762,   763,   764,   765,   766,
+     767,   768,   769,   770,   771,   772,   773,   774,   775,   776,
+     777,   778,   779,   780,   781,   782,   783,   784,   785,   786,
+     787,   788,   789,   790,   791,   792,   793,     5,     6,    -1,
+       8,     9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,
+      -1,    -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,
+      28,    29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,
+      -1,    -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,
+      -1,    49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,
+      -1,    59,    60,    61,    -1,    63,    -1,    65,    66,    67,
+      68,    69,    70,    -1,    72,    73,    -1,    75,    76,    77,
+      78,    79,    80,    81,    82,    83,    84,    85,    -1,    87,
+      88,    -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,
+      98,    -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,
+      -1,    -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,
+      -1,    -1,   120,   121,    -1,    -1,    -1,   125,   126,   127,
+      -1,   129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,
+     138,   139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,
+     148,    -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,
+     158,   159,    -1,    -1,   162,   163,    -1,   165,   166,   167,
+     168,   169,   170,    -1,    -1,   173,   174,   175,   176,   177,
+      -1,    -1,   180,   181,    -1,   183,   184,   185,   186,   187,
+      -1,    -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,
+     198,    -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,
+      -1,    -1,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,
+     218,    -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,
+     228,   229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,
+      -1,    -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,
+     248,    -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,
+      -1,    -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,
+      -1,   269,    -1,    -1,   272,   273,    -1,    -1,    -1,    -1,
+      -1,   279,   280,    -1,    -1,    -1,   284,    -1,   286,   287,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,
+     298,   299,   300,   301,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,   313,    -1,   315,   316,   317,
+      -1,   319,   320,   321,   322,    -1,   324,   325,    -1,    -1,
+      -1,    -1,   330,   331,   332,   333,   334,   335,    -1,    -1,
+     338,   339,    -1,   341,    -1,   343,    -1,   345,   346,   347,
+     348,   349,   350,   351,   352,   353,    -1,    -1,   356,   357,
+      -1,    -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,
+     368,   369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,
+     378,   379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,
+      -1,   399,    -1,   401,   402,   403,   404,   405,   406,   407,
+     408,   409,   410,    -1,   412,    -1,   414,   415,   416,    -1,
+     418,    -1,   420,   421,   422,   423,   424,    -1,   426,   427,
+     428,    -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,
+     438,   439,    -1,    -1,   442,   443,   444,   445,   446,    -1,
+     448,   449,    -1,   451,   452,   453,    -1,    -1,   456,   457,
+     458,   459,   460,   461,   462,   463,    -1,   465,    -1,   467,
+     468,    -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,
+     478,   479,   480,    -1,   482,    -1,   484,   485,   486,   487,
+     488,    -1,   490,   491,    -1,    -1,    -1,   495,   496,    -1,
+     498,    -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,
+     508,   509,   510,   511,    -1,   513,   514,   515,   516,   517,
+      -1,    -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,
+      -1,    -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,
+     538,   539,   540,   541,   542,    -1,    -1,   545,   546,    -1,
+      -1,   549,   550,   551,   552,   553,   554,    -1,    -1,   557,
+     558,   559,   560,    -1,   562,   563,    -1,    -1,   566,   567,
+     568,   569,    -1,    -1,   572,   573,    -1,   575,   576,   577,
+     578,    -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,
+      -1,   589,   590,   591,    -1,    -1,   594,   595,    -1,   597,
+     598,    -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,
+      -1,   609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,
+     618,    -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,
+      -1,   629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,
+      -1,   639,   640,   641,    -1,   643,   644,   645,   646,    -1,
+      -1,   649,    -1,    -1,    -1,   653,   654,   655,   656,    -1,
+     658,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,
+     668,   669,    -1,    -1,   672,   673,    -1,   675,    -1,    -1,
+     678,    -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,
+     688,    -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,
+      -1,    -1,   700,   701,   702,   703,   704,   705,   706,   707,
+      -1,   709,   710,   711,   712,   713,   714,   715,   716,   717,
+     718,    -1,   720,   721,   722,   723,   724,   725,   726,   727,
+     728,   729,   730,   731,   732,   733,   734,   735,   736,   737,
+     738,   739,   740,   741,   742,   743,    -1,   745,   746,   747,
+     748,   749,   750,   751,    -1,   753,   754,   755,   756,   757,
+     758,   759,   760,   761,   762,   763,   764,   765,   766,   767,
+     768,   769,   770,   771,   772,   773,   774,   775,   776,   777,
+     778,   779,   780,   781,   782,   783,   784,   785,   786,   787,
+     788,   789,   790,   791,   792,   793,     5,     6,    -1,     8,
        9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    -1,    -1,    25,    26,    27,    28,
+      -1,    20,    -1,    -1,    23,    -1,    25,    26,    27,    28,
       29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
       -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      -1,    -1,    -1,    -1,    53,    54,    -1,    56,    57,    -1,
-      59,    60,    -1,    -1,    -1,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    -1,    78,
-      -1,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    -1,    94,    -1,    -1,    -1,    98,
+      49,    50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
+      59,    60,    61,    -1,    63,    -1,    65,    66,    67,    68,
+      69,    70,    -1,    72,    73,    -1,    75,    76,    77,    78,
+      79,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
+      -1,    90,    91,    92,    93,    94,    -1,    -1,    -1,    98,
       -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
       -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,    -1,    -1,    -1,    -1,    -1,   126,   127,    -1,
+      -1,   120,   121,    -1,    -1,    -1,   125,   126,   127,    -1,
      129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,    -1,    -1,    -1,   146,   147,   148,
+     139,    -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,
       -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
      159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,    -1,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,   182,   183,   184,   185,   186,   187,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,    -1,   216,    -1,    -1,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,   230,    -1,   232,    -1,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,    -1,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,   257,    -1,
-      -1,   260,    -1,   262,    -1,    -1,    -1,   266,    -1,    -1,
-     269,   270,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,   292,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,    -1,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,    -1,    -1,    -1,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,    -1,   453,   454,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,    -1,    -1,   467,   468,
-      -1,   470,   471,   472,   473,   474,    -1,    -1,    -1,   478,
-     479,   480,    -1,   482,    -1,   484,   485,    -1,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,    -1,    -1,    -1,
-     509,    -1,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,    -1,
-     539,   540,   541,   542,    -1,    -1,    -1,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,    -1,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-      -1,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,    -1,    -1,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,   635,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,    -1,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,    -1,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,    -1,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    -1,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      -1,    -1,    -1,    -1,    53,    54,    -1,    56,    57,    -1,
-      59,    60,    -1,    -1,    -1,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    -1,    78,
-      -1,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    -1,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,    -1,    -1,    -1,    -1,    -1,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,    -1,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,    -1,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,    -1,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,   182,   183,   184,   185,   186,   187,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   195,   196,    -1,   198,
+     169,   170,    -1,    -1,   173,   174,   175,   176,   177,    -1,
+      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
+      -1,   190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,
       -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,    -1,   216,    -1,    -1,
+      -1,    -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,
       -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,   230,    -1,   232,    -1,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,    -1,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,   257,    -1,
-      -1,   260,    -1,   262,    -1,    -1,    -1,   266,    -1,    -1,
-     269,   270,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,   292,    -1,    -1,   295,    -1,   297,   298,
+     229,    -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,
+      -1,    -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,
+      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
+      -1,   260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,
+     269,    -1,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
+     279,   280,    -1,    -1,    -1,   284,    -1,   286,   287,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
      299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
      309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
      319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
       -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
      339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
      349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,    -1,
+      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,   368,
      369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
      379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
      399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,    -1,    -1,    -1,   415,   416,    -1,   418,
+     409,   410,    -1,   412,    -1,   414,   415,   416,    -1,   418,
       -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
       -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
      439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,    -1,   453,   454,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,    -1,    -1,   467,   468,
-      -1,   470,   471,   472,   473,   474,    -1,    -1,    -1,   478,
-     479,   480,    -1,   482,    -1,   484,   485,    -1,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,    -1,    -1,    -1,
-     509,    -1,   511,    -1,   513,   514,   515,   516,   517,    -1,
+     449,    -1,   451,   452,   453,    -1,    -1,   456,   457,   458,
+     459,   460,   461,   462,   463,    -1,   465,    -1,   467,   468,
+      -1,   470,   471,   472,    -1,   474,    -1,    -1,   477,   478,
+     479,   480,    -1,   482,    -1,   484,   485,   486,   487,   488,
+      -1,   490,   491,    -1,    -1,    -1,   495,   496,    -1,   498,
+      -1,    -1,    -1,   502,    -1,    -1,    -1,   506,    -1,   508,
+     509,   510,   511,    -1,   513,   514,   515,   516,   517,    -1,
       -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,    -1,
-     539,   540,   541,   542,    -1,    -1,    -1,   546,    -1,    -1,
+      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,
+     539,   540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,
      549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
      559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
      569,    -1,    -1,   572,   573,    -1,   575,   576,   577,   578,
       -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-      -1,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,    -1,    -1,    -1,    -1,   604,    -1,    -1,   607,    -1,
+     589,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
+      -1,   600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,
      609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
       -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,   635,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,    -1,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
+     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
+     639,   640,   641,    -1,   643,   644,   645,   646,    -1,    -1,
+     649,    -1,    -1,    -1,   653,   654,   655,   656,    -1,   658,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,    -1,    -1,    -1,   678,
+     669,    -1,    -1,   672,   673,    -1,   675,    -1,    -1,   678,
       -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
       -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
       -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,    -1,   713,   714,   715,   716,   717,   718,
+     709,   710,   711,   712,   713,   714,   715,   716,   717,   718,
       -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
      729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
      739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
      749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
      759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
      769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
+     779,   780,   781,   782,   783,   784,   785,   786,   787,   788,
+     789,   790,   791,   792,   793,     5,     6,    -1,     8,     9,
+      10,    11,    12,    13,    -1,    15,    -1,    -1,    -1,    -1,
+      20,    -1,    -1,    23,    -1,    25,    26,    27,    28,    29,
+      30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,    -1,
+      40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,    49,
+      50,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,    59,
+      60,    61,    -1,    63,    -1,    65,    66,    67,    68,    69,
+      70,    -1,    72,    73,    -1,    75,    76,    77,    78,    79,
+      80,    81,    82,    83,    84,    85,    -1,    87,    88,    -1,
+      90,    91,    92,    93,    94,    -1,    -1,    -1,    98,    -1,
+      -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,    -1,
+     110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,    -1,
+     120,   121,    -1,    -1,    -1,   125,   126,   127,    -1,   129,
+      -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,   139,
+      -1,    -1,    -1,   143,    -1,    -1,   146,   147,   148,    -1,
+      -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,   159,
+      -1,    -1,   162,   163,    -1,   165,   166,    -1,   168,   169,
+      -1,    -1,    -1,   173,   174,   175,   176,   177,    -1,    -1,
+     180,   181,    -1,    -1,   184,   185,   186,   187,    -1,    -1,
+     190,   191,    -1,    -1,    -1,   195,   196,    -1,   198,    -1,
+      -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,   209,
+      -1,   211,    -1,    -1,    -1,   215,   216,    -1,   218,    -1,
+      -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,   229,
+      -1,    -1,   232,   233,   234,    -1,    -1,   237,    -1,    -1,
+      -1,    -1,   242,   243,   244,    -1,    -1,    -1,   248,    -1,
+      -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,    -1,
+     260,    -1,   262,    -1,    -1,   265,   266,    -1,    -1,   269,
+      -1,    -1,   272,   273,   274,    -1,    -1,    -1,    -1,   279,
+     280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,    -1,   315,   316,   317,    -1,   319,
+     320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,    -1,
+     330,   331,   332,   333,   334,   335,    -1,    -1,   338,   339,
+      -1,   341,    -1,   343,    -1,   345,   346,   347,   348,   349,
+     350,   351,   352,   353,    -1,    -1,   356,   357,    -1,    -1,
+     360,   361,   362,   363,   364,    -1,    -1,    -1,   368,   369,
+      -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,   379,
+     380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,   399,
+      -1,   401,   402,   403,   404,   405,   406,   407,   408,   409,
+     410,    -1,   412,    -1,   414,   415,   416,    -1,   418,    -1,
+      -1,   421,   422,   423,    -1,    -1,   426,   427,   428,    -1,
+      -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,   439,
+      -1,    -1,   442,   443,   444,   445,   446,    -1,    -1,   449,
+      -1,   451,   452,   453,    -1,    -1,    -1,   457,   458,   459,
+     460,   461,   462,   463,    -1,   465,    -1,   467,   468,    -1,
+     470,   471,   472,    -1,   474,    -1,    -1,   477,   478,   479,
+     480,    -1,   482,    -1,   484,   485,   486,   487,   488,    -1,
+     490,   491,    -1,    -1,    -1,   495,   496,   497,   498,    -1,
+      -1,    -1,   502,    -1,    -1,    -1,    -1,    -1,   508,   509,
+     510,   511,    -1,   513,   514,   515,   516,   517,    -1,    -1,
+      -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,    -1,
+     530,    -1,    -1,   533,    -1,   535,    -1,   537,   538,   539,
+     540,   541,   542,    -1,    -1,   545,   546,    -1,    -1,   549,
+     550,   551,   552,   553,   554,    -1,    -1,    -1,   558,   559,
+     560,    -1,   562,   563,    -1,    -1,   566,   567,   568,   569,
+      -1,   571,   572,   573,    -1,   575,   576,   577,   578,    -1,
+      -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,   589,
+     590,   591,    -1,    -1,   594,   595,    -1,   597,   598,    -1,
+     600,   601,    -1,    -1,   604,    -1,    -1,   607,    -1,   609,
+      -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,    -1,
+     620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,   629,
+     630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,   639,
+     640,   641,    -1,   643,   644,   645,   646,    -1,    -1,   649,
+      -1,    -1,   652,   653,   654,   655,   656,    -1,   658,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,   669,
+      -1,   671,   672,   673,    -1,   675,    -1,    -1,   678,    -1,
+     680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,    -1,
+      -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,    -1,
+     700,   701,   702,   703,   704,   705,   706,    -1,    -1,   709,
+     710,   711,    -1,   713,   714,   715,   716,   717,   718,    -1,
+     720,   721,   722,   723,   724,   725,   726,   727,   728,   729,
+     730,   731,   732,   733,   734,   735,   736,   737,   738,   739,
+     740,   741,   742,   743,    -1,   745,   746,   747,   748,   749,
+     750,   751,    -1,   753,   754,   755,   756,   757,   758,   759,
+     760,   761,   762,   763,   764,   765,   766,   767,   768,   769,
+     770,   771,   772,   773,   774,   775,   776,   777,   778,   779,
+     780,   781,   782,   783,   784,   785,   786,   787,   788,   789,
+     790,   791,   792,   793,     5,     6,    -1,     8,     9,    10,
+      11,    12,    13,    -1,    15,    -1,    -1,    -1,    -1,    20,
+      -1,    -1,    23,    -1,    25,    26,    27,    28,    29,    30,
+      -1,    32,    -1,    -1,    -1,    36,    -1,    -1,    -1,    40,
+      -1,    -1,    43,    44,    45,    -1,    47,    -1,    49,    50,
+      -1,    -1,    53,    -1,    -1,    56,    57,    -1,    59,    60,
+      61,    -1,    63,    -1,    65,    66,    67,    68,    69,    70,
+      -1,    72,    73,    -1,    75,    76,    77,    78,    79,    80,
+      81,    82,    83,    84,    85,    -1,    87,    88,    -1,    90,
+      91,    92,    93,    94,    -1,    -1,    -1,    98,    -1,    -1,
+      -1,    -1,   103,    -1,    -1,   106,    -1,    -1,    -1,   110,
+     111,   112,    -1,    -1,   115,    -1,    -1,    -1,    -1,   120,
+     121,    -1,    -1,    -1,   125,   126,   127,    -1,   129,    -1,
+      -1,    -1,    -1,    -1,   135,   136,   137,   138,   139,    -1,
+      -1,    -1,   143,    -1,    -1,   146,   147,   148,    -1,    -1,
+      -1,   152,    -1,   154,   155,    -1,   157,   158,   159,    -1,
+      -1,   162,   163,    -1,   165,   166,    -1,   168,   169,    -1,
+      -1,    -1,   173,   174,   175,   176,   177,    -1,    -1,   180,
+     181,    -1,    -1,   184,   185,   186,   187,    -1,    -1,   190,
+     191,    -1,    -1,    -1,   195,   196,    -1,   198,    -1,    -1,
+      -1,   202,    -1,   204,   205,   206,   207,    -1,   209,    -1,
+     211,    -1,    -1,    -1,   215,   216,    -1,   218,    -1,    -1,
+     221,   222,    -1,    -1,    -1,   226,   227,   228,   229,    -1,
+      -1,   232,   233,   234,    -1,    -1,   237,    -1,    -1,    -1,
+      -1,   242,   243,   244,    -1,    -1,    -1,   248,    -1,    -1,
+      -1,   252,   253,    -1,   255,   256,    -1,    -1,    -1,   260,
+      -1,   262,    -1,    -1,   265,   266,    -1,    -1,   269,    -1,
+      -1,   272,   273,   274,    -1,    -1,    -1,    -1,   279,   280,
+      -1,   282,    -1,   284,    -1,   286,   287,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   295,    -1,   297,   298,   299,   300,
+     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
+     311,   312,   313,    -1,   315,   316,   317,    -1,   319,   320,
+     321,   322,    -1,   324,   325,    -1,    -1,    -1,    -1,   330,
+     331,   332,   333,   334,   335,    -1,    -1,   338,   339,    -1,
+     341,    -1,   343,    -1,   345,   346,   347,   348,   349,   350,
+     351,   352,   353,    -1,    -1,   356,   357,    -1,    -1,   360,
+     361,   362,   363,   364,    -1,    -1,    -1,   368,   369,    -1,
+      -1,    -1,   373,    -1,   375,   376,    -1,   378,   379,   380,
+      -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   393,   394,   395,    -1,   397,    -1,   399,    -1,
+     401,   402,   403,   404,   405,   406,   407,   408,   409,   410,
+      -1,   412,    -1,   414,   415,   416,    -1,   418,    -1,    -1,
+     421,   422,   423,    -1,    -1,   426,   427,   428,    -1,    -1,
+     431,    -1,    -1,    -1,   435,   436,    -1,   438,   439,    -1,
+      -1,   442,   443,   444,   445,   446,    -1,    -1,   449,    -1,
+     451,   452,   453,    -1,    -1,    -1,   457,   458,   459,   460,
+     461,   462,   463,    -1,   465,    -1,   467,   468,    -1,   470,
+     471,   472,    -1,   474,    -1,    -1,   477,   478,   479,   480,
+      -1,   482,    -1,   484,   485,   486,   487,   488,    -1,   490,
+     491,    -1,    -1,    -1,   495,   496,   497,   498,    -1,    -1,
+      -1,   502,    -1,    -1,    -1,    -1,    -1,   508,   509,   510,
+     511,    -1,   513,   514,   515,   516,   517,    -1,    -1,    -1,
+      -1,    -1,   523,   524,   525,    -1,   527,    -1,    -1,   530,
+      -1,    -1,   533,    -1,   535,    -1,   537,   538,   539,   540,
+     541,   542,    -1,    -1,   545,   546,    -1,    -1,   549,   550,
+     551,   552,   553,   554,    -1,    -1,    -1,   558,   559,   560,
+      -1,   562,   563,    -1,    -1,   566,   567,   568,   569,    -1,
+     571,   572,   573,    -1,   575,   576,   577,   578,    -1,    -1,
+      -1,    -1,    -1,   584,   585,    -1,    -1,    -1,   589,   590,
+     591,    -1,    -1,   594,   595,    -1,   597,   598,    -1,   600,
+     601,    -1,    -1,   604,    -1,    -1,   607,    -1,   609,    -1,
+     611,   612,    -1,    -1,    -1,    -1,    -1,   618,    -1,   620,
+      -1,    -1,   623,    -1,    -1,    -1,   627,    -1,   629,   630,
+     631,   632,    -1,    -1,    -1,    -1,    -1,    -1,   639,   640,
+     641,    -1,   643,   644,   645,   646,    -1,    -1,   649,    -1,
+      -1,   652,   653,   654,   655,   656,    -1,   658,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   667,   668,   669,    -1,
+     671,   672,   673,    -1,   675,    -1,    -1,   678,    -1,   680,
+      -1,    -1,    -1,    -1,    -1,    -1,   687,   688,    -1,    -1,
+     691,    -1,   693,    -1,   695,   696,    -1,    -1,    -1,   700,
+     701,   702,   703,   704,   705,   706,    -1,    -1,   709,   710,
+     711,    -1,   713,   714,   715,   716,   717,   718,    -1,   720,
+     721,   722,   723,   724,   725,   726,   727,   728,   729,   730,
+     731,   732,   733,   734,   735,   736,   737,   738,   739,   740,
+     741,   742,   743,    -1,   745,   746,   747,   748,   749,   750,
+     751,    -1,   753,   754,   755,   756,   757,   758,   759,   760,
+     761,   762,   763,   764,   765,   766,   767,   768,   769,   770,
+     771,   772,   773,   774,   775,   776,   777,   778,   779,   780,
+     781,   782,   783,   784,   785,   786,   787,   788,   789,   790,
+     791,   792,   793,     5,     6,    -1,     8,     9,    10,    11,
+      12,    13,    -1,    15,    -1,    -1,    -1,    -1,    20,    -1,
+      -1,    23,    -1,    25,    26,    27,    28,    29,    30,    -1,
+      32,    -1,    -1,    -1,    36,    -1,    -1,    -1,    40,    -1,
+      -1,    43,    44,    45,    -1,    47,    -1,    49,    50,    -1,
+      -1,    53,    -1,    -1,    56,    57,    -1,    59,    60,    61,
+      -1,    63,    -1,    65,    66,    67,    68,    69,    70,    -1,
+      72,    73,    -1,    75,    76,    77,    78,    79,    80,    81,
+      82,    83,    84,    85,    -1,    87,    88,    -1,    90,    91,
+      92,    93,    94,    -1,    -1,    -1,    98,    -1,    -1,    -1,
+      -1,   103,    -1,    -1,   106,    -1,    -1,    -1,   110,   111,
+     112,    -1,    -1,   115,    -1,    -1,    -1,    -1,   120,   121,
+      -1,    -1,    -1,    -1,   126,   127,    -1,   129,    -1,    -1,
+      -1,    -1,    -1,   135,   136,   137,   138,   139,    -1,    -1,
+      -1,   143,    -1,    -1,   146,   147,   148,    -1,    -1,    -1,
+     152,    -1,   154,   155,    -1,   157,   158,   159,    -1,    -1,
+     162,   163,    -1,   165,   166,    -1,   168,   169,    -1,    -1,
+      -1,   173,   174,   175,   176,   177,    -1,    -1,   180,   181,
+      -1,    -1,   184,   185,   186,   187,    -1,    -1,   190,   191,
+      -1,    -1,    -1,   195,   196,    -1,   198,    -1,    -1,    -1,
+     202,    -1,   204,   205,   206,   207,    -1,   209,    -1,   211,
+      -1,    -1,    -1,   215,   216,    -1,   218,    -1,    -1,   221,
+     222,    -1,    -1,    -1,   226,   227,   228,   229,    -1,    -1,
+     232,   233,   234,    -1,    -1,   237,    -1,    -1,    -1,    -1,
+     242,   243,   244,    -1,    -1,    -1,   248,    -1,    -1,    -1,
+     252,   253,    -1,   255,   256,    -1,    -1,    -1,   260,    -1,
+     262,    -1,    -1,   265,   266,    -1,    -1,   269,    -1,    -1,
+     272,   273,   274,    -1,    -1,    -1,    -1,   279,   280,    -1,
+     282,    -1,   284,    -1,   286,   287,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   295,    -1,   297,   298,   299,   300,   301,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,   313,    -1,   315,   316,   317,    -1,   319,   320,   321,
+     322,    -1,   324,   325,    -1,    -1,    -1,    -1,   330,   331,
+     332,   333,   334,   335,    -1,    -1,   338,   339,    -1,   341,
+      -1,   343,    -1,   345,   346,   347,   348,   349,   350,   351,
+     352,   353,    -1,    -1,   356,   357,    -1,    -1,   360,   361,
+     362,   363,   364,    -1,    -1,    -1,   368,   369,    -1,    -1,
+      -1,   373,    -1,   375,   376,    -1,   378,   379,   380,    -1,
+      -1,   383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   393,   394,   395,    -1,   397,    -1,   399,    -1,   401,
+     402,   403,   404,   405,   406,   407,   408,   409,   410,    -1,
+     412,    -1,   414,   415,   416,    -1,   418,    -1,    -1,   421,
+     422,   423,    -1,    -1,   426,   427,   428,    -1,    -1,   431,
+      -1,    -1,    -1,   435,   436,    -1,   438,   439,    -1,    -1,
+     442,   443,   444,   445,   446,    -1,    -1,   449,    -1,   451,
+     452,   453,    -1,    -1,    -1,   457,   458,   459,   460,   461,
+     462,   463,    -1,   465,    -1,   467,   468,    -1,   470,   471,
+     472,    -1,   474,    -1,    -1,   477,   478,   479,   480,    -1,
+     482,    -1,   484,   485,   486,   487,   488,    -1,   490,   491,
+      -1,    -1,    -1,   495,   496,   497,   498,    -1,    -1,    -1,
+     502,    -1,    -1,    -1,    -1,    -1,   508,   509,   510,   511,
+      -1,   513,   514,   515,   516,   517,    -1,    -1,    -1,    -1,
+      -1,   523,   524,   525,    -1,   527,    -1,    -1,   530,    -1,
+      -1,   533,    -1,   535,    -1,   537,   538,   539,   540,   541,
+     542,    -1,    -1,   545,   546,    -1,    -1,   549,   550,   551,
+     552,   553,   554,    -1,    -1,    -1,   558,   559,   560,    -1,
+     562,   563,    -1,    -1,   566,   567,   568,   569,    -1,   571,
+     572,   573,    -1,   575,   576,   577,   578,    -1,    -1,    -1,
+      -1,    -1,   584,   585,    -1,    -1,    -1,   589,   590,   591,
+      -1,    -1,   594,   595,    -1,   597,   598,    -1,   600,   601,
+      -1,    -1,   604,    -1,    -1,   607,    -1,   609,    -1,   611,
+     612,    -1,    -1,    -1,    -1,    -1,   618,    -1,   620,    -1,
+      -1,   623,    -1,    -1,    -1,   627,    -1,   629,   630,   631,
+     632,    -1,    -1,    -1,    -1,    -1,    -1,   639,   640,   641,
+      -1,   643,   644,   645,   646,    -1,    -1,   649,    -1,    -1,
+     652,   653,   654,   655,   656,    -1,   658,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   667,   668,   669,    -1,   671,
+     672,   673,    -1,   675,    -1,    -1,   678,    -1,   680,    -1,
+      -1,    -1,    -1,    -1,    -1,   687,   688,    -1,    -1,   691,
+      -1,   693,    -1,   695,   696,    -1,    -1,    -1,   700,   701,
+     702,   703,   704,   705,   706,    -1,    -1,   709,   710,   711,
+      -1,   713,   714,   715,   716,   717,   718,    -1,   720,   721,
+     722,   723,   724,   725,   726,   727,   728,   729,   730,   731,
+     732,   733,   734,   735,   736,   737,   738,   739,   740,   741,
+     742,   743,    -1,   745,   746,   747,   748,   749,   750,   751,
+      -1,   753,   754,   755,   756,   757,   758,   759,   760,   761,
+     762,   763,   764,   765,   766,   767,   768,   769,   770,   771,
+     772,   773,   774,   775,   776,   777,   778,   779,   780,   781,
+     782,   783,   784,   785,   786,   787,   788,   789,   790,   791,
+     792,   793,     5,     6,    -1,     8,     9,    10,    11,    12,
+      13,    -1,    15,    -1,    -1,    -1,    -1,    20,    -1,    -1,
+      23,    -1,    25,    26,    27,    28,    29,    30,    -1,    32,
+      -1,    -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,
+      43,    44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,
+      53,    -1,    -1,    56,    57,    -1,    59,    60,    61,    -1,
+      63,    -1,    65,    66,    67,    68,    69,    70,    -1,    72,
+      73,    -1,    75,    76,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    -1,    87,    88,    -1,    90,    91,    92,
+      93,    94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,
+     103,    -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,
+      -1,    -1,   115,    -1,    -1,    -1,    -1,   120,   121,    -1,
+      -1,    -1,    -1,   126,   127,    -1,   129,    -1,    -1,    -1,
+      -1,    -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,
+     143,    -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,
+      -1,   154,   155,    -1,   157,   158,   159,    -1,    -1,   162,
+     163,    -1,   165,   166,    -1,   168,   169,    -1,    -1,    -1,
+     173,   174,   175,   176,   177,    -1,    -1,   180,   181,    -1,
+      -1,   184,   185,   186,   187,    -1,    -1,   190,   191,    -1,
+      -1,    -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,
+      -1,   204,   205,   206,   207,    -1,   209,    -1,   211,    -1,
+      -1,    -1,   215,   216,    -1,   218,    -1,    -1,   221,   222,
+      -1,    -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,
+     233,   234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,
+     243,   244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,
+     253,    -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,
+      -1,    -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,
+     273,   274,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,
+      -1,   284,    -1,   286,   287,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   295,    -1,   297,   298,   299,   300,   301,   302,
+     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
+     313,    -1,   315,   316,   317,    -1,   319,   320,   321,   322,
+      -1,   324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,
+     333,   334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,
+     343,    -1,   345,   346,   347,   348,   349,   350,   351,   352,
+     353,    -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,
+     363,   364,    -1,    -1,    -1,   368,   369,    -1,    -1,    -1,
+     373,    -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,
+     383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     393,   394,   395,    -1,   397,    -1,   399,    -1,   401,   402,
+     403,   404,   405,   406,   407,   408,   409,   410,    -1,   412,
+      -1,   414,   415,   416,    -1,   418,    -1,    -1,   421,   422,
+     423,    -1,    -1,   426,   427,   428,    -1,    -1,   431,    -1,
+      -1,    -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,
+     443,   444,   445,   446,    -1,    -1,   449,    -1,   451,   452,
+     453,    -1,    -1,    -1,   457,   458,   459,   460,   461,   462,
+     463,    -1,   465,    -1,   467,   468,    -1,   470,   471,   472,
+      -1,   474,    -1,    -1,   477,   478,   479,   480,    -1,   482,
+      -1,   484,   485,   486,   487,   488,    -1,   490,   491,    -1,
+      -1,    -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,
+      -1,    -1,    -1,    -1,    -1,   508,   509,   510,   511,    -1,
+     513,   514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,
+     523,   524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,
+     533,    -1,   535,    -1,   537,   538,   539,   540,   541,   542,
+      -1,    -1,   545,   546,    -1,    -1,   549,   550,   551,   552,
+     553,   554,    -1,    -1,    -1,   558,   559,   560,    -1,   562,
+     563,    -1,    -1,   566,   567,   568,   569,    -1,   571,   572,
+     573,    -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,
+      -1,   584,   585,    -1,    -1,    -1,   589,   590,   591,    -1,
+      -1,   594,   595,    -1,   597,   598,    -1,   600,   601,    -1,
+      -1,   604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,
+      -1,    -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,
+     623,    -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,
+      -1,    -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,
+     643,   644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,
+     653,   654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,
+     673,    -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,
+      -1,    -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,
+     693,    -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,
+     703,   704,   705,   706,    -1,    -1,   709,   710,   711,    -1,
+     713,   714,   715,   716,   717,   718,    -1,   720,   721,   722,
+     723,   724,   725,   726,   727,   728,   729,   730,   731,   732,
+     733,   734,   735,   736,   737,   738,   739,   740,   741,   742,
+     743,    -1,   745,   746,   747,   748,   749,   750,   751,    -1,
+     753,   754,   755,   756,   757,   758,   759,   760,   761,   762,
+     763,   764,   765,   766,   767,   768,   769,   770,   771,   772,
+     773,   774,   775,   776,   777,   778,   779,   780,   781,   782,
+     783,   784,   785,   786,   787,   788,   789,   790,   791,   792,
+     793,     5,     6,    -1,     8,     9,    10,    11,    12,    -1,
+      -1,    15,    -1,    -1,    -1,    -1,    20,    -1,    -1,    23,
+      -1,    25,    26,    27,    28,    29,    30,    -1,    32,    -1,
+      -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,
+      44,    45,    -1,    47,    -1,    49,    50,    -1,    -1,    53,
+      -1,    -1,    56,    57,    -1,    59,    60,    61,    -1,    63,
+      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
+      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
+      84,    85,    -1,    87,    88,    -1,    90,    91,    92,    93,
+      94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,
+      -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,
+      -1,   115,    -1,    -1,    -1,    -1,   120,   121,    -1,    -1,
+      -1,    -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,
+      -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,   143,
+      -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,
+     154,   155,    -1,   157,   158,   159,    -1,    -1,   162,   163,
+      -1,   165,   166,    -1,   168,   169,    -1,    -1,    -1,   173,
+     174,   175,   176,   177,    -1,    -1,   180,   181,    -1,    -1,
+     184,   185,   186,   187,    -1,    -1,   190,   191,    -1,    -1,
+      -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,
+     204,   205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,
+      -1,   215,   216,    -1,   218,    -1,    -1,   221,   222,    -1,
+      -1,    -1,   226,   227,   228,   229,    -1,    -1,   232,   233,
+     234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,
+     244,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,
+      -1,   255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,
+      -1,   265,   266,    -1,    -1,   269,    -1,    -1,   272,   273,
+     274,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,
+     284,    -1,   286,   287,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   295,    -1,   297,   298,   299,   300,   301,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
+      -1,   315,   316,   317,    -1,   319,   320,   321,   322,    -1,
+     324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,
+     334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,
+      -1,   345,   346,   347,   348,   349,   350,   351,   352,   353,
+      -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,   363,
+      -1,    -1,    -1,    -1,   368,   369,    -1,    -1,    -1,   373,
+      -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,   383,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,
+     394,   395,    -1,   397,    -1,   399,    -1,   401,   402,   403,
+     404,   405,   406,   407,   408,   409,   410,    -1,   412,    -1,
+     414,   415,   416,    -1,   418,    -1,    -1,   421,   422,   423,
+      -1,    -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,
+      -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,   443,
+     444,   445,   446,    -1,    -1,   449,    -1,   451,   452,   453,
+      -1,    -1,    -1,   457,   458,   459,   460,   461,   462,   463,
+      -1,   465,    -1,   467,   468,    -1,   470,   471,   472,    -1,
+     474,    -1,    -1,   477,   478,   479,   480,    -1,   482,    -1,
+     484,   485,   486,   487,   488,    -1,   490,   491,    -1,    -1,
+      -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,
+      -1,    -1,    -1,    -1,   508,   509,   510,   511,    -1,   513,
+     514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,
+     524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,
+      -1,   535,    -1,   537,   538,   539,   540,   541,   542,    -1,
+      -1,   545,   546,    -1,    -1,   549,   550,   551,   552,   553,
+     554,    -1,    -1,    -1,   558,   559,   560,    -1,   562,   563,
+      -1,    -1,   566,   567,   568,   569,    -1,   571,   572,   573,
+      -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,
+     584,   585,    -1,    -1,    -1,   589,   590,   591,    -1,    -1,
+     594,   595,    -1,   597,   598,    -1,   600,   601,    -1,    -1,
+     604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,
+      -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,
+      -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,
+      -1,    -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,
+     644,   645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,
+     654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,   673,
+      -1,   675,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,
+      -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,
+      -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,   703,
+     704,   705,   706,    -1,    -1,   709,   710,   711,    -1,   713,
+     714,   715,   716,   717,   718,    -1,   720,   721,   722,   723,
+     724,   725,   726,   727,   728,   729,   730,   731,   732,   733,
+     734,   735,   736,   737,   738,   739,   740,   741,   742,   743,
+      -1,   745,   746,   747,   748,   749,   750,   751,    -1,   753,
+     754,   755,   756,   757,   758,   759,   760,   761,   762,   763,
+     764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
+     774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
+     784,   785,   786,   787,   788,   789,   790,   791,   792,   793,
+       5,     6,    -1,     8,     9,    10,    11,    12,    -1,    -1,
+      15,    -1,    -1,    -1,    -1,    20,    -1,    -1,    -1,    -1,
+      25,    26,    27,    28,    29,    30,    -1,    32,    -1,    -1,
+      -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,    44,
+      45,    -1,    47,    -1,    -1,    -1,    -1,    -1,    53,    54,
+      -1,    56,    57,    -1,    59,    60,    -1,    -1,    -1,    -1,
+      65,    66,    67,    68,    69,    70,    -1,    72,    73,    -1,
+      75,    76,    -1,    78,    -1,    80,    81,    82,    83,    84,
+      85,    -1,    87,    88,    -1,    90,    91,    92,    -1,    94,
+      -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,    -1,
+      -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,    -1,
+     115,    -1,    -1,    -1,    -1,   120,    -1,    -1,    -1,    -1,
+      -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,    -1,
+     135,   136,   137,   138,   139,    -1,    -1,    -1,    -1,    -1,
+      -1,   146,   147,   148,    -1,   150,   151,   152,    -1,   154,
+     155,    -1,   157,   158,   159,    -1,    -1,   162,   163,    -1,
+     165,   166,   167,   168,   169,    -1,    -1,    -1,   173,   174,
+     175,   176,   177,    -1,    -1,   180,   181,   182,   183,   184,
+     185,   186,   187,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,   204,
+     205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,    -1,
+      -1,   216,    -1,    -1,    -1,    -1,   221,   222,    -1,    -1,
+      -1,   226,   227,   228,   229,   230,    -1,   232,    -1,   234,
+      -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,    -1,
+      -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,    -1,
+     255,   256,   257,    -1,    -1,   260,    -1,   262,    -1,    -1,
+      -1,   266,    -1,    -1,   269,   270,    -1,   272,   273,    -1,
+      -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,   284,
+      -1,   286,   287,    -1,    -1,    -1,    -1,   292,    -1,    -1,
+     295,    -1,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,    -1,
+     315,   316,   317,    -1,   319,   320,   321,   322,    -1,   324,
+     325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,   334,
+     335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,    -1,
+     345,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
+      -1,   356,   357,    -1,    -1,   360,   361,   362,   363,   364,
+      -1,    -1,    -1,    -1,   369,    -1,    -1,    -1,   373,    -1,
+     375,   376,    -1,   378,   379,   380,    -1,    -1,   383,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,   394,
+     395,    -1,   397,    -1,   399,    -1,   401,   402,   403,   404,
+     405,   406,   407,   408,   409,   410,    -1,    -1,    -1,    -1,
+     415,   416,    -1,   418,    -1,   420,   421,   422,   423,   424,
+      -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,    -1,
+     435,   436,    -1,   438,   439,    -1,    -1,   442,   443,   444,
+     445,   446,    -1,   448,   449,    -1,   451,    -1,   453,   454,
+      -1,   456,   457,   458,   459,   460,   461,   462,   463,    -1,
+      -1,    -1,   467,   468,    -1,   470,   471,   472,   473,   474,
+      -1,    -1,    -1,   478,   479,   480,    -1,   482,    -1,   484,
+     485,    -1,   487,   488,    -1,   490,   491,    -1,    -1,    -1,
+     495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,    -1,
+      -1,    -1,    -1,    -1,   509,    -1,   511,    -1,   513,   514,
+     515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,   524,
+     525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,    -1,
+     535,    -1,   537,    -1,   539,   540,   541,   542,    -1,    -1,
+      -1,   546,    -1,    -1,   549,   550,   551,   552,   553,   554,
+      -1,    -1,   557,   558,   559,   560,    -1,   562,   563,    -1,
+      -1,   566,   567,   568,   569,    -1,    -1,   572,   573,    -1,
+     575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,   584,
+     585,    -1,    -1,    -1,    -1,   590,   591,    -1,    -1,   594,
+     595,    -1,   597,   598,    -1,    -1,    -1,    -1,    -1,   604,
+      -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,    -1,
+      -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,    -1,
+      -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,    -1,
+     635,    -1,    -1,    -1,   639,   640,   641,    -1,   643,    -1,
+     645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,   654,
+     655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   667,   668,   669,    -1,   671,   672,   673,    -1,
+      -1,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,    -1,
+      -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,    -1,
+     695,   696,    -1,    -1,    -1,   700,   701,   702,   703,   704,
+     705,   706,   707,    -1,   709,   710,   711,    -1,   713,   714,
+     715,   716,   717,   718,    -1,   720,   721,   722,   723,   724,
+     725,   726,   727,   728,   729,   730,   731,   732,   733,   734,
+     735,   736,   737,   738,   739,   740,   741,   742,   743,    -1,
+     745,   746,   747,   748,   749,   750,   751,    -1,   753,   754,
+     755,   756,   757,   758,   759,   760,   761,   762,   763,   764,
+     765,   766,   767,   768,   769,   770,   771,   772,   773,   774,
+     775,   776,   777,   778,   779,   780,   781,   782,   783,   784,
+     785,   786,   787,   788,   789,   790,   791,   792,   793,     5,
+       6,    -1,     8,     9,    10,    11,    12,    -1,    -1,    15,
+      -1,    -1,    -1,    -1,    20,    -1,    -1,    -1,    -1,    25,
+      26,    27,    28,    29,    30,    -1,    32,    -1,    -1,    -1,
+      36,    -1,    -1,    -1,    40,    -1,    -1,    43,    44,    45,
+      -1,    47,    -1,    -1,    -1,    -1,    -1,    53,    54,    -1,
+      56,    57,    -1,    59,    60,    -1,    -1,    -1,    -1,    65,
+      66,    67,    68,    69,    70,    -1,    72,    73,    -1,    75,
+      76,    -1,    78,    -1,    80,    81,    82,    83,    84,    85,
+      -1,    87,    88,    -1,    90,    91,    92,    -1,    94,    -1,
+      -1,    -1,    98,    -1,    -1,    -1,    -1,   103,    -1,    -1,
+     106,    -1,    -1,    -1,   110,   111,   112,    -1,    -1,   115,
+      -1,    -1,    -1,    -1,   120,    -1,    -1,    -1,    -1,    -1,
+     126,   127,    -1,   129,    -1,    -1,    -1,    -1,    -1,   135,
+     136,   137,   138,   139,    -1,    -1,    -1,    -1,    -1,    -1,
+     146,   147,   148,    -1,   150,    -1,   152,    -1,   154,   155,
+      -1,   157,   158,   159,    -1,    -1,   162,   163,    -1,   165,
+     166,   167,   168,   169,    -1,    -1,    -1,   173,   174,   175,
+     176,   177,    -1,    -1,   180,   181,   182,   183,   184,   185,
+     186,   187,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   195,
+     196,    -1,   198,    -1,    -1,    -1,   202,    -1,   204,   205,
+     206,   207,    -1,   209,    -1,   211,    -1,    -1,    -1,    -1,
+     216,    -1,    -1,    -1,    -1,   221,   222,    -1,    -1,    -1,
+     226,   227,   228,   229,   230,    -1,   232,    -1,   234,    -1,
+      -1,   237,    -1,    -1,    -1,    -1,   242,   243,    -1,    -1,
+      -1,    -1,   248,    -1,    -1,    -1,   252,   253,    -1,   255,
+     256,   257,    -1,    -1,   260,    -1,   262,    -1,    -1,    -1,
+     266,    -1,    -1,   269,   270,    -1,   272,   273,    -1,    -1,
+      -1,    -1,    -1,   279,   280,    -1,   282,    -1,   284,    -1,
+     286,   287,    -1,    -1,    -1,    -1,   292,    -1,    -1,   295,
+      -1,   297,   298,   299,   300,   301,   302,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,   312,   313,    -1,   315,
+     316,   317,    -1,   319,   320,   321,   322,    -1,   324,   325,
+      -1,    -1,    -1,    -1,   330,   331,   332,   333,   334,   335,
+      -1,    -1,   338,   339,    -1,   341,    -1,   343,    -1,   345,
+     346,   347,   348,   349,   350,   351,   352,   353,    -1,    -1,
+     356,   357,    -1,    -1,   360,   361,   362,   363,   364,    -1,
+      -1,    -1,    -1,   369,    -1,    -1,    -1,   373,    -1,   375,
+     376,    -1,   378,   379,   380,    -1,    -1,   383,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,   394,   395,
+      -1,   397,    -1,   399,    -1,   401,   402,   403,   404,   405,
+     406,   407,   408,   409,   410,    -1,    -1,    -1,    -1,   415,
+     416,    -1,   418,    -1,   420,   421,   422,   423,   424,    -1,
+     426,   427,   428,    -1,    -1,   431,    -1,    -1,    -1,   435,
+     436,    -1,   438,   439,    -1,    -1,   442,   443,   444,   445,
+     446,    -1,   448,   449,    -1,   451,    -1,   453,   454,    -1,
+     456,   457,   458,   459,   460,   461,   462,   463,    -1,    -1,
+      -1,   467,   468,    -1,   470,   471,   472,   473,   474,    -1,
+      -1,    -1,   478,   479,   480,    -1,   482,    -1,   484,   485,
+      -1,   487,   488,    -1,   490,   491,    -1,    -1,    -1,   495,
+     496,   497,   498,    -1,    -1,    -1,   502,    -1,    -1,    -1,
+      -1,    -1,    -1,   509,    -1,   511,    -1,   513,   514,   515,
+     516,   517,    -1,    -1,    -1,    -1,    -1,   523,   524,   525,
+      -1,   527,    -1,    -1,   530,    -1,    -1,   533,    -1,   535,
+      -1,   537,    -1,   539,   540,   541,   542,    -1,    -1,    -1,
+     546,    -1,    -1,   549,   550,   551,   552,   553,   554,    -1,
+      -1,   557,   558,   559,   560,    -1,   562,   563,    -1,    -1,
+     566,   567,   568,   569,    -1,    -1,   572,   573,    -1,   575,
+     576,   577,   578,    -1,    -1,    -1,    -1,    -1,   584,   585,
+      -1,    -1,    -1,    -1,   590,   591,    -1,    -1,   594,   595,
+      -1,   597,   598,    -1,    -1,    -1,    -1,    -1,   604,    -1,
+      -1,   607,    -1,   609,    -1,   611,   612,    -1,    -1,    -1,
+      -1,    -1,   618,    -1,   620,    -1,    -1,   623,    -1,    -1,
+      -1,   627,    -1,   629,   630,   631,   632,   633,    -1,   635,
+      -1,    -1,    -1,   639,   640,   641,    -1,   643,    -1,   645,
+     646,    -1,    -1,   649,    -1,    -1,   652,   653,   654,   655,
+     656,    -1,   658,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   667,   668,   669,    -1,   671,   672,   673,    -1,    -1,
+      -1,    -1,   678,    -1,   680,    -1,    -1,    -1,    -1,    -1,
+      -1,   687,   688,    -1,    -1,   691,    -1,   693,    -1,   695,
+     696,    -1,    -1,    -1,   700,   701,   702,   703,   704,   705,
+     706,   707,    -1,   709,   710,   711,    -1,   713,   714,   715,
+     716,   717,   718,    -1,   720,   721,   722,   723,   724,   725,
+     726,   727,   728,   729,   730,   731,   732,   733,   734,   735,
+     736,   737,   738,   739,   740,   741,   742,   743,    -1,   745,
+     746,   747,   748,   749,   750,   751,    -1,   753,   754,   755,
+     756,   757,   758,   759,   760,   761,   762,   763,   764,   765,
+     766,   767,   768,   769,   770,   771,   772,   773,   774,   775,
+     776,   777,   778,   779,   780,   781,   782,   783,   784,   785,
+     786,   787,   788,   789,   790,   791,   792,   793,     5,     6,
+      -1,     8,     9,    10,    11,    12,    -1,    -1,    15,    -1,
+      -1,    -1,    -1,    20,    -1,    -1,    -1,    -1,    25,    26,
+      27,    28,    29,    30,    -1,    32,    -1,    -1,    -1,    36,
+      -1,    -1,    -1,    40,    -1,    -1,    43,    44,    45,    -1,
+      47,    -1,    -1,    -1,    -1,    -1,    53,    54,    -1,    56,
+      57,    -1,    59,    60,    -1,    -1,    -1,    -1,    65,    66,
+      67,    68,    69,    70,    -1,    72,    73,    -1,    75,    76,
+      -1,    78,    -1,    80,    81,    82,    83,    84,    85,    -1,
+      87,    88,    -1,    90,    91,    92,    -1,    94,    -1,    -1,
+      -1,    98,    -1,    -1,    -1,    -1,   103,    -1,    -1,   106,
+      -1,    -1,    -1,   110,   111,   112,    -1,    -1,   115,    -1,
+      -1,    -1,    -1,   120,    -1,    -1,    -1,    -1,    -1,   126,
+     127,    -1,   129,    -1,    -1,    -1,    -1,    -1,   135,   136,
+     137,   138,   139,    -1,    -1,    -1,    -1,    -1,    -1,   146,
+     147,   148,    -1,   150,    -1,   152,    -1,   154,   155,    -1,
+     157,   158,   159,    -1,    -1,   162,   163,    -1,   165,   166,
+     167,   168,   169,    -1,    -1,    -1,   173,   174,   175,   176,
+     177,    -1,    -1,   180,   181,   182,   183,   184,   185,   186,
+     187,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   195,   196,
+      -1,   198,    -1,    -1,    -1,   202,    -1,   204,   205,   206,
+     207,    -1,   209,    -1,   211,    -1,    -1,    -1,    -1,   216,
+      -1,    -1,    -1,    -1,   221,   222,    -1,    -1,    -1,   226,
+     227,   228,   229,   230,    -1,   232,    -1,   234,    -1,    -1,
+     237,    -1,    -1,    -1,    -1,   242,   243,    -1,    -1,    -1,
+      -1,   248,    -1,    -1,    -1,   252,   253,    -1,   255,   256,
+     257,    -1,    -1,   260,    -1,   262,    -1,    -1,    -1,   266,
+      -1,    -1,   269,   270,    -1,   272,   273,    -1,    -1,    -1,
+      -1,    -1,   279,   280,    -1,   282,    -1,   284,    -1,   286,
+     287,    -1,    -1,    -1,    -1,   292,    -1,    -1,   295,    -1,
+     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,   313,    -1,   315,   316,
+     317,    -1,   319,   320,   321,   322,    -1,   324,   325,    -1,
+      -1,    -1,    -1,   330,   331,   332,   333,   334,   335,    -1,
+      -1,   338,   339,    -1,   341,    -1,   343,    -1,   345,   346,
+     347,   348,   349,   350,   351,   352,   353,    -1,    -1,   356,
+     357,    -1,    -1,   360,   361,   362,   363,   364,    -1,    -1,
+      -1,    -1,   369,    -1,    -1,    -1,   373,    -1,   375,   376,
+      -1,   378,   379,   380,    -1,    -1,   383,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   393,   394,   395,    -1,
+     397,    -1,   399,    -1,   401,   402,   403,   404,   405,   406,
+     407,   408,   409,   410,    -1,    -1,    -1,    -1,   415,   416,
+      -1,   418,    -1,   420,   421,   422,   423,   424,    -1,   426,
+     427,   428,    -1,    -1,   431,    -1,    -1,    -1,   435,   436,
+      -1,   438,   439,    -1,    -1,   442,   443,   444,   445,   446,
+      -1,   448,   449,    -1,   451,    -1,   453,   454,    -1,   456,
+     457,   458,   459,   460,   461,   462,   463,    -1,    -1,    -1,
+     467,   468,    -1,   470,   471,   472,   473,   474,    -1,    -1,
+      -1,   478,   479,   480,    -1,   482,    -1,   484,   485,    -1,
+     487,   488,    -1,   490,   491,    -1,    -1,    -1,   495,   496,
+     497,   498,    -1,    -1,    -1,   502,    -1,    -1,    -1,    -1,
+      -1,    -1,   509,    -1,   511,    -1,   513,   514,   515,   516,
+     517,    -1,    -1,    -1,    -1,    -1,   523,   524,   525,    -1,
+     527,    -1,    -1,   530,    -1,    -1,   533,    -1,   535,    -1,
+     537,    -1,   539,   540,   541,   542,    -1,    -1,    -1,   546,
+      -1,    -1,   549,   550,   551,   552,   553,   554,    -1,    -1,
+     557,   558,   559,   560,    -1,   562,   563,    -1,    -1,   566,
+     567,   568,   569,    -1,    -1,   572,   573,    -1,   575,   576,
+     577,   578,    -1,    -1,    -1,    -1,    -1,   584,   585,    -1,
+      -1,    -1,    -1,   590,   591,    -1,    -1,   594,   595,    -1,
+     597,   598,    -1,    -1,    -1,    -1,    -1,   604,    -1,    -1,
+     607,    -1,   609,    -1,   611,   612,    -1,    -1,    -1,    -1,
+      -1,   618,    -1,   620,    -1,    -1,   623,    -1,    -1,    -1,
+     627,    -1,   629,   630,   631,   632,   633,    -1,   635,    -1,
+      -1,    -1,   639,   640,   641,    -1,   643,    -1,   645,   646,
+      -1,    -1,   649,    -1,    -1,   652,   653,   654,   655,   656,
+      -1,   658,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     667,   668,   669,    -1,   671,   672,   673,    -1,    -1,    -1,
+      -1,   678,    -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,
+     687,   688,    -1,    -1,   691,    -1,   693,    -1,   695,   696,
+      -1,    -1,    -1,   700,   701,   702,   703,   704,   705,   706,
+     707,    -1,   709,   710,   711,    -1,   713,   714,   715,   716,
+     717,   718,    -1,   720,   721,   722,   723,   724,   725,   726,
+     727,   728,   729,   730,   731,   732,   733,   734,   735,   736,
+     737,   738,   739,   740,   741,   742,   743,    -1,   745,   746,
+     747,   748,   749,   750,   751,    -1,   753,   754,   755,   756,
+     757,   758,   759,   760,   761,   762,   763,   764,   765,   766,
+     767,   768,   769,   770,   771,   772,   773,   774,   775,   776,
+     777,   778,   779,   780,   781,   782,   783,   784,   785,   786,
+     787,   788,   789,   790,   791,   792,   793,     5,     6,    -1,
+       8,     9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,
+      -1,    -1,    20,    -1,    -1,    -1,    -1,    25,    26,    27,
+      28,    29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,
+      -1,    -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,
+      -1,    -1,    -1,    -1,    -1,    53,    54,    -1,    56,    57,
+      -1,    59,    60,    -1,    -1,    -1,    -1,    65,    66,    67,
+      68,    69,    70,    -1,    72,    73,    -1,    75,    76,    -1,
+      78,    -1,    80,    81,    82,    83,    84,    85,    -1,    87,
+      88,    -1,    90,    91,    92,    -1,    94,    -1,    -1,    -1,
+      98,    -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,
+      -1,    -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,
+      -1,    -1,   120,    -1,    -1,    -1,    -1,    -1,   126,   127,
+      -1,   129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,
+     138,   139,    -1,    -1,    -1,    -1,    -1,    -1,   146,   147,
+     148,    -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,
+     158,   159,    -1,    -1,   162,   163,    -1,   165,   166,   167,
+     168,   169,    -1,    -1,    -1,   173,   174,   175,   176,   177,
+      -1,    -1,   180,   181,   182,   183,   184,   185,   186,   187,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   195,   196,    -1,
+     198,    -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,
+      -1,   209,    -1,   211,    -1,    -1,    -1,    -1,   216,    -1,
+      -1,    -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,
+     228,   229,   230,    -1,   232,    -1,   234,    -1,    -1,   237,
+      -1,    -1,    -1,    -1,   242,   243,    -1,    -1,    -1,    -1,
+     248,    -1,    -1,    -1,   252,   253,    -1,   255,   256,   257,
+      -1,    -1,   260,    -1,   262,    -1,    -1,    -1,   266,    -1,
+      -1,   269,   270,    -1,   272,   273,    -1,    -1,    -1,    -1,
+      -1,   279,   280,    -1,   282,    -1,   284,    -1,   286,   287,
+      -1,    -1,    -1,    -1,   292,    -1,    -1,   295,    -1,   297,
+     298,   299,   300,   301,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,   313,    -1,   315,   316,   317,
+      -1,   319,   320,   321,   322,    -1,   324,   325,    -1,    -1,
+      -1,    -1,   330,   331,   332,   333,   334,   335,    -1,    -1,
+     338,   339,    -1,   341,    -1,   343,    -1,   345,   346,   347,
+     348,   349,   350,   351,   352,   353,    -1,    -1,   356,   357,
+      -1,    -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,
+      -1,   369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,
+     378,   379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,
+      -1,   399,    -1,   401,   402,   403,   404,   405,   406,   407,
+     408,   409,   410,    -1,    -1,    -1,    -1,   415,   416,    -1,
+     418,    -1,   420,   421,   422,   423,   424,    -1,   426,   427,
+     428,    -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,
+     438,   439,    -1,    -1,   442,   443,   444,   445,   446,    -1,
+     448,   449,    -1,   451,    -1,   453,   454,    -1,   456,   457,
+     458,   459,   460,   461,   462,   463,    -1,    -1,    -1,   467,
+     468,    -1,   470,   471,   472,   473,   474,    -1,    -1,    -1,
+     478,   479,   480,    -1,   482,    -1,   484,   485,    -1,   487,
+     488,    -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,
+     498,    -1,    -1,    -1,   502,    -1,    -1,    -1,    -1,    -1,
+      -1,   509,    -1,   511,    -1,   513,   514,   515,   516,   517,
+      -1,    -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,
+      -1,    -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,
+      -1,   539,   540,   541,   542,    -1,    -1,    -1,   546,    -1,
+      -1,   549,   550,   551,   552,   553,   554,    -1,    -1,   557,
+     558,   559,   560,    -1,   562,   563,    -1,    -1,   566,   567,
+     568,   569,    -1,    -1,   572,   573,    -1,   575,   576,   577,
+     578,    -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,
+      -1,    -1,   590,   591,    -1,    -1,   594,   595,    -1,   597,
+     598,    -1,    -1,    -1,    -1,    -1,   604,    -1,    -1,   607,
+      -1,   609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,
+     618,    -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,
+      -1,   629,   630,   631,   632,    -1,    -1,   635,    -1,    -1,
+      -1,   639,   640,   641,    -1,   643,    -1,   645,   646,    -1,
+      -1,   649,    -1,    -1,   652,   653,   654,   655,   656,    -1,
+     658,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,
+     668,   669,    -1,   671,   672,   673,    -1,    -1,    -1,    -1,
+     678,    -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,
+     688,    -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,
+      -1,    -1,   700,   701,   702,   703,   704,   705,   706,   707,
+      -1,   709,   710,   711,    -1,   713,   714,   715,   716,   717,
+     718,    -1,   720,   721,   722,   723,   724,   725,   726,   727,
+     728,   729,   730,   731,   732,   733,   734,   735,   736,   737,
+     738,   739,   740,   741,   742,   743,    -1,   745,   746,   747,
+     748,   749,   750,   751,    -1,   753,   754,   755,   756,   757,
+     758,   759,   760,   761,   762,   763,   764,   765,   766,   767,
+     768,   769,   770,   771,   772,   773,   774,   775,   776,   777,
+     778,   779,   780,   781,   782,   783,   784,   785,   786,   787,
+     788,   789,   790,   791,   792,   793,     5,     6,    -1,     8,
        9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
       -1,    20,    -1,    -1,    -1,    -1,    25,    26,    27,    28,
       29,    30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,
@@ -22480,7 +22141,7 @@
       -1,   120,    -1,    -1,    -1,    -1,    -1,   126,   127,    -1,
      129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
      139,    -1,    -1,    -1,    -1,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,    -1,   155,    -1,   157,   158,
+      -1,    -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,
      159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
      169,    -1,    -1,    -1,   173,   174,   175,   176,   177,    -1,
       -1,   180,   181,   182,   183,   184,   185,   186,   187,    -1,
@@ -22543,147 +22204,596 @@
      749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
      759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
      769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,     5,     6,    -1,     8,
-       9,    10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,
-      -1,    20,    -1,    -1,    -1,    -1,    25,    26,    27,    28,
-      29,    30,    -1,    -1,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,
-      -1,    -1,    -1,    -1,    53,    -1,    -1,    56,    57,    -1,
-      59,    60,    -1,    -1,    -1,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    -1,    75,    76,    -1,    78,
-      -1,    80,    81,    82,    83,    84,    85,    -1,    87,    88,
-      -1,    90,    91,    92,    -1,    94,    -1,    -1,    -1,    98,
-      -1,    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-      -1,   110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,
-      -1,   120,    -1,    -1,    -1,    -1,    -1,   126,   127,    -1,
-     129,    -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,
-     139,    -1,    -1,    -1,    -1,    -1,    -1,   146,   147,   148,
-      -1,    -1,    -1,   152,    -1,    -1,   155,    -1,   157,   158,
-     159,    -1,    -1,   162,   163,    -1,   165,   166,   167,   168,
-     169,    -1,    -1,    -1,   173,   174,   175,   176,   177,    -1,
-      -1,   180,   181,    -1,   183,   184,   185,   186,   187,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   195,   196,    -1,   198,
-      -1,    -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-     209,    -1,   211,    -1,    -1,    -1,    -1,   216,    -1,    -1,
-      -1,    -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,
-     229,    -1,    -1,   232,    -1,   234,    -1,    -1,   237,    -1,
-      -1,    -1,    -1,   242,   243,    -1,    -1,    -1,    -1,   248,
-      -1,    -1,    -1,   252,   253,    -1,   255,   256,    -1,    -1,
-      -1,   260,    -1,   262,    -1,    -1,    -1,   266,    -1,    -1,
-     269,    -1,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,
-     279,   280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   295,    -1,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,    -1,   315,   316,   317,    -1,
-     319,   320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,
-      -1,   330,   331,   332,   333,   334,   335,    -1,    -1,   338,
-     339,    -1,   341,    -1,   343,    -1,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,    -1,    -1,   356,   357,    -1,
-      -1,   360,   361,   362,   363,   364,    -1,    -1,    -1,    -1,
-     369,    -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,
-     379,   380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,
-     399,    -1,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,   410,    -1,    -1,    -1,    -1,   415,   416,    -1,   418,
-      -1,   420,   421,   422,   423,   424,    -1,   426,   427,   428,
-      -1,    -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,
-     439,    -1,    -1,   442,   443,   444,   445,   446,    -1,   448,
-     449,    -1,   451,    -1,   453,    -1,    -1,   456,   457,   458,
-     459,   460,   461,   462,   463,    -1,    -1,    -1,   467,   468,
-      -1,   470,   471,   472,    -1,   474,    -1,    -1,    -1,   478,
-     479,   480,    -1,   482,    -1,   484,   485,    -1,   487,   488,
-      -1,   490,   491,    -1,    -1,    -1,   495,   496,   497,   498,
-      -1,    -1,    -1,   502,    -1,    -1,    -1,    -1,    -1,    -1,
-     509,    -1,   511,    -1,   513,   514,   515,   516,   517,    -1,
-      -1,    -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,
-      -1,   530,    -1,    -1,   533,    -1,   535,    -1,   537,    -1,
-     539,   540,   541,   542,    -1,    -1,    -1,   546,    -1,    -1,
-     549,   550,   551,   552,   553,   554,    -1,    -1,   557,   558,
-     559,   560,    -1,   562,   563,    -1,    -1,   566,   567,   568,
-     569,    -1,    -1,   572,   573,    -1,   575,   576,   577,   578,
-      -1,    -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,
-      -1,   590,   591,    -1,    -1,   594,   595,    -1,   597,   598,
-      -1,    -1,    -1,    -1,    -1,   604,    -1,    -1,   607,    -1,
-     609,    -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,
-      -1,   620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,
-     629,   630,   631,   632,    -1,    -1,    -1,    -1,    -1,    -1,
-     639,   640,   641,    -1,   643,    -1,   645,   646,    -1,    -1,
-     649,    -1,    -1,   652,   653,   654,   655,   656,    -1,   658,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,
-     669,    -1,   671,   672,   673,    -1,    -1,    -1,    -1,   678,
-      -1,   680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,
-      -1,    -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,
-      -1,   700,   701,   702,   703,   704,   705,   706,   707,    -1,
-     709,   710,   711,    -1,   713,   714,   715,   716,   717,   718,
-      -1,   720,   721,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,    -1,   745,   746,   747,   748,
-     749,   750,   751,    -1,   753,   754,   755,   756,   757,   758,
-     759,   760,   761,   762,   763,   764,   765,   766,   767,   768,
-     769,   770,   771,   772,   773,   774,   775,   776,   777,   778,
-     779,   780,   781,   782,   783,   784,    34,    35,    -1,    -1,
-      -1,    -1,    40,    -1,    42,    -1,    44,    45,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    62,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   112,    -1,    -1,   115,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   123,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   142,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   159,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   187,
-      -1,   189,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   205,   206,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   247,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   260,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   279,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     288,   289,    -1,   291,    -1,    -1,    -1,    -1,    -1,    -1,
+     779,   780,   781,   782,   783,   784,   785,   786,   787,   788,
+     789,   790,   791,   792,   793,     5,     6,    -1,     8,     9,
+      10,    11,    12,    -1,    -1,    15,    -1,    -1,    -1,    -1,
+      20,    -1,    -1,    -1,    -1,    25,    26,    27,    28,    29,
+      30,    -1,    32,    -1,    -1,    -1,    36,    -1,    -1,    -1,
+      40,    -1,    -1,    43,    44,    45,    -1,    47,    -1,    -1,
+      -1,    -1,    -1,    53,    54,    -1,    56,    57,    -1,    59,
+      60,    -1,    -1,    -1,    -1,    65,    66,    67,    68,    69,
+      70,    -1,    72,    73,    -1,    75,    76,    -1,    78,    -1,
+      80,    81,    82,    83,    84,    85,    -1,    87,    88,    -1,
+      90,    91,    92,    -1,    94,    -1,    -1,    -1,    98,    -1,
+      -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,    -1,
+     110,   111,   112,    -1,    -1,   115,    -1,    -1,    -1,    -1,
+     120,    -1,    -1,    -1,    -1,    -1,   126,   127,    -1,   129,
+      -1,    -1,    -1,    -1,    -1,   135,   136,   137,   138,   139,
+      -1,    -1,    -1,    -1,    -1,    -1,   146,   147,   148,    -1,
+      -1,    -1,   152,    -1,   154,   155,    -1,   157,   158,   159,
+      -1,    -1,   162,   163,    -1,   165,   166,   167,   168,   169,
+      -1,    -1,    -1,   173,   174,   175,   176,   177,    -1,    -1,
+     180,   181,   182,   183,   184,   185,   186,   187,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   195,   196,    -1,   198,    -1,
+      -1,    -1,   202,    -1,   204,   205,   206,   207,    -1,   209,
+      -1,   211,    -1,    -1,    -1,    -1,   216,    -1,    -1,    -1,
+      -1,   221,   222,    -1,    -1,    -1,   226,   227,   228,   229,
+     230,    -1,   232,    -1,   234,    -1,    -1,   237,    -1,    -1,
+      -1,    -1,   242,   243,    -1,    -1,    -1,    -1,   248,    -1,
+      -1,    -1,   252,   253,    -1,   255,   256,   257,    -1,    -1,
+     260,    -1,   262,    -1,    -1,    -1,   266,    -1,    -1,   269,
+     270,    -1,   272,   273,    -1,    -1,    -1,    -1,    -1,   279,
+     280,    -1,   282,    -1,   284,    -1,   286,   287,    -1,    -1,
+      -1,    -1,   292,    -1,    -1,   295,    -1,   297,   298,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,    -1,   315,   316,   317,    -1,   319,
+     320,   321,   322,    -1,   324,   325,    -1,    -1,    -1,    -1,
+     330,   331,   332,   333,   334,   335,    -1,    -1,   338,   339,
+      -1,   341,    -1,   343,    -1,   345,   346,   347,   348,   349,
+     350,   351,   352,   353,    -1,    -1,   356,   357,    -1,    -1,
+     360,   361,   362,   363,   364,    -1,    -1,    -1,    -1,   369,
+      -1,    -1,    -1,   373,    -1,   375,   376,    -1,   378,   379,
+     380,    -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   393,   394,   395,    -1,   397,    -1,   399,
+      -1,   401,   402,   403,   404,   405,   406,   407,   408,   409,
+     410,    -1,    -1,    -1,    -1,   415,   416,    -1,   418,    -1,
+     420,   421,   422,   423,   424,    -1,   426,   427,   428,    -1,
+      -1,   431,    -1,    -1,    -1,   435,   436,    -1,   438,   439,
+      -1,    -1,   442,   443,   444,   445,   446,    -1,   448,   449,
+      -1,   451,    -1,   453,   454,    -1,   456,   457,   458,   459,
+     460,   461,   462,   463,    -1,    -1,    -1,   467,   468,    -1,
+     470,   471,   472,   473,   474,    -1,    -1,    -1,   478,   479,
+     480,    -1,   482,    -1,   484,   485,    -1,   487,   488,    -1,
+     490,   491,    -1,    -1,    -1,   495,   496,   497,   498,    -1,
+      -1,    -1,   502,    -1,    -1,    -1,    -1,    -1,    -1,   509,
+      -1,   511,    -1,   513,   514,   515,   516,   517,    -1,    -1,
+      -1,    -1,    -1,   523,   524,   525,    -1,   527,    -1,    -1,
+     530,    -1,    -1,   533,    -1,   535,    -1,   537,    -1,   539,
+     540,   541,   542,    -1,    -1,    -1,   546,    -1,    -1,   549,
+     550,   551,   552,   553,   554,    -1,    -1,   557,   558,   559,
+     560,    -1,   562,   563,    -1,    -1,   566,   567,   568,   569,
+      -1,    -1,   572,   573,    -1,   575,   576,   577,   578,    -1,
+      -1,    -1,    -1,    -1,   584,   585,    -1,    -1,    -1,    -1,
+     590,   591,    -1,    -1,   594,   595,    -1,   597,   598,    -1,
+      -1,    -1,    -1,    -1,   604,    -1,    -1,   607,    -1,   609,
+      -1,   611,   612,    -1,    -1,    -1,    -1,    -1,   618,    -1,
+     620,    -1,    -1,   623,    -1,    -1,    -1,   627,    -1,   629,
+     630,   631,   632,    -1,    -1,   635,    -1,    -1,    -1,   639,
+     640,   641,    -1,   643,    -1,   645,   646,    -1,    -1,   649,
+      -1,    -1,   652,   653,   654,   655,   656,    -1,   658,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   667,   668,   669,
+      -1,   671,   672,   673,    -1,    -1,    -1,    -1,   678,    -1,
+     680,    -1,    -1,    -1,    -1,    -1,    -1,   687,   688,    -1,
+      -1,   691,    -1,   693,    -1,   695,   696,    -1,    -1,    -1,
+     700,   701,   702,   703,   704,   705,   706,   707,    -1,   709,
+     710,   711,    -1,   713,   714,   715,   716,   717,   718,    -1,
+     720,   721,   722,   723,   724,   725,   726,   727,   728,   729,
+     730,   731,   732,   733,   734,   735,   736,   737,   738,   739,
+     740,   741,   742,   743,    -1,   745,   746,   747,   748,   749,
+     750,   751,    -1,   753,   754,   755,   756,   757,   758,   759,
+     760,   761,   762,   763,   764,   765,   766,   767,   768,   769,
+     770,   771,   772,   773,   774,   775,   776,   777,   778,   779,
+     780,   781,   782,   783,   784,   785,   786,   787,   788,   789,
+     790,   791,   792,   793,     5,     6,    -1,     8,     9,    10,
+      11,    12,    -1,    -1,    15,    -1,    -1,    -1,    -1,    20,
+      -1,    -1,    -1,    -1,    25,    26,    27,    28,    29,    30,
+      -1,    32,    -1,    -1,    -1,    36,    -1,    -1,    -1,    40,
+      -1,    -1,    43,    44,    45,    -1,    47,    -1,    -1,    -1,
+      -1,    -1,    53,    54,    -1,    56,    57,    -1,    59,    60,
+      -1,    -1,    -1,    -1,    65,    66,    67,    68,    69,    70,
+      -1,    72,    73,    -1,    75,    76,    -1,    78,    -1,    80,
+      81,    82,    83,    84,    85,    -1,    87,    88,    -1,    90,
+      91,    92,    -1,    94,    -1,    -1,    -1,    98,    -1,    -1,
+      -1,    -1,   103,    -1,    -1,   106,    -1,    -1,    -1,   110,
+     111,   112,    -1,    -1,   115,    -1,    -1,    -1,    -1,   120,
+      -1,    -1,    -1,    -1,    -1,   126,   127,    -1,   129,    -1,
+      -1,    -1,    -1,    -1,   135,   136,   137,   138,   139,    -1,
+      -1,    -1,    -1,    -1,    -1,   146,   147,   148,    -1,    -1,
+      -1,   152,    -1,   154,   155,    -1,   157,   158,   159,    -1,
+      -1,   162,   163,    -1,   165,   166,   167,   168,   169,    -1,
+      -1,    -1,   173,   174,   175,   176,   177,    -1,    -1,   180,
+     181,   182,   183,   184,   185,   186,   187,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   195,   196,    -1,   198,    -1,    -1,
+      -1,   202,    -1,   204,   205,   206,   207,    -1,   209,    -1,
+     211,    -1,    -1,    -1,    -1,   216,    -1,    -1,    -1,    -1,
+     221,   222,    -1,    -1,    -1,   226,   227,   228,   229,   230,
+      -1,   232,    -1,   234,    -1,    -1,   237,    -1,    -1,    -1,
+      -1,   242,   243,    -1,    -1,    -1,    -1,   248,    -1,    -1,
+      -1,   252,   253,    -1,   255,   256,   257,    -1,    -1,   260,
+      -1,   262,    -1,    -1,    -1,   266,    -1,    -1,   269,   270,
+      -1,   272,   273,    -1,    -1,    -1,    -1,    -1,   279,   280,
+      -1,   282,    -1,   284,    -1,   286,   287,    -1,    -1,    -1,
+      -1,   292,    -1,    -1,   295,    -1,   297,   298,   299,   300,
+     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
+     311,   312,   313,    -1,   315,   316,   317,    -1,   319,   320,
+     321,   322,    -1,   324,   325,    -1,    -1,    -1,    -1,   330,
+     331,   332,   333,   334,   335,    -1,    -1,   338,   339,    -1,
+     341,    -1,   343,    -1,   345,   346,   347,   348,   349,   350,
+     351,   352,   353,    -1,    -1,   356,   357,    -1,    -1,   360,
+     361,   362,   363,   364,    -1,    -1,    -1,    -1,   369,    -1,
+      -1,    -1,   373,    -1,   375,   376,    -1,   378,   379,   380,
+      -1,    -1,   383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   393,   394,   395,    -1,   397,    -1,   399,    -1,
+     401,   402,   403,   404,   405,   406,   407,   408,   409,   410,
+      -1,    -1,    -1,    -1,   415,   416,    -1,   418,    -1,   420,
+     421,   422,   423,   424,    -1,   426,   427,   428,    -1,    -1,
+     431,    -1,    -1,    -1,   435,   436,    -1,   438,   439,    -1,
+      -1,   442,   443,   444,   445,   446,    -1,   448,   449,    -1,
+     451,    -1,   453,   454,    -1,   456,   457,   458,   459,   460,
+     461,   462,   463,    -1,    -1,    -1,   467,   468,    -1,   470,
+     471,   472,   473,   474,    -1,    -1,    -1,   478,   479,   480,
+      -1,   482,    -1,   484,   485,    -1,   487,   488,    -1,   490,
+     491,    -1,    -1,    -1,   495,   496,   497,   498,    -1,    -1,
+      -1,   502,    -1,    -1,    -1,    -1,    -1,    -1,   509,    -1,
+     511,    -1,   513,   514,   515,   516,   517,    -1,    -1,    -1,
+      -1,    -1,   523,   524,   525,    -1,   527,    -1,    -1,   530,
+      -1,    -1,   533,    -1,   535,    -1,   537,    -1,   539,   540,
+     541,   542,    -1,    -1,    -1,   546,    -1,    -1,   549,   550,
+     551,   552,   553,   554,    -1,    -1,   557,   558,   559,   560,
+      -1,   562,   563,    -1,    -1,   566,   567,   568,   569,    -1,
+      -1,   572,   573,    -1,   575,   576,   577,   578,    -1,    -1,
+      -1,    -1,    -1,   584,   585,    -1,    -1,    -1,    -1,   590,
+     591,    -1,    -1,   594,   595,    -1,   597,   598,    -1,    -1,
+      -1,    -1,    -1,   604,    -1,    -1,   607,    -1,   609,    -1,
+     611,   612,    -1,    -1,    -1,    -1,    -1,   618,    -1,   620,
+      -1,    -1,   623,    -1,    -1,    -1,   627,    -1,   629,   630,
+     631,   632,    -1,    -1,   635,    -1,    -1,    -1,   639,   640,
+     641,    -1,   643,    -1,   645,   646,    -1,    -1,   649,    -1,
+      -1,   652,   653,   654,   655,   656,    -1,   658,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   667,   668,   669,    -1,
+     671,   672,   673,    -1,    -1,    -1,    -1,   678,    -1,   680,
+      -1,    -1,    -1,    -1,    -1,    -1,   687,   688,    -1,    -1,
+     691,    -1,   693,    -1,   695,   696,    -1,    -1,    -1,   700,
+     701,   702,   703,   704,   705,   706,   707,    -1,   709,   710,
+     711,    -1,   713,   714,   715,   716,   717,   718,    -1,   720,
+     721,   722,   723,   724,   725,   726,   727,   728,   729,   730,
+     731,   732,   733,   734,   735,   736,   737,   738,   739,   740,
+     741,   742,   743,    -1,   745,   746,   747,   748,   749,   750,
+     751,    -1,   753,   754,   755,   756,   757,   758,   759,   760,
+     761,   762,   763,   764,   765,   766,   767,   768,   769,   770,
+     771,   772,   773,   774,   775,   776,   777,   778,   779,   780,
+     781,   782,   783,   784,   785,   786,   787,   788,   789,   790,
+     791,   792,   793,     5,     6,    -1,     8,     9,    10,    11,
+      12,    -1,    -1,    15,    -1,    -1,    -1,    -1,    20,    -1,
+      -1,    -1,    -1,    25,    26,    27,    28,    29,    30,    -1,
+      32,    -1,    -1,    -1,    36,    -1,    -1,    -1,    40,    -1,
+      -1,    43,    44,    45,    -1,    47,    -1,    -1,    -1,    -1,
+      -1,    53,    54,    -1,    56,    57,    -1,    59,    60,    -1,
+      -1,    -1,    -1,    65,    66,    67,    68,    69,    70,    -1,
+      72,    73,    -1,    75,    76,    -1,    78,    -1,    80,    81,
+      82,    83,    84,    85,    -1,    87,    88,    -1,    90,    91,
+      92,    -1,    94,    -1,    -1,    -1,    98,    -1,    -1,    -1,
+      -1,   103,    -1,    -1,   106,    -1,    -1,    -1,   110,   111,
+     112,    -1,    -1,   115,    -1,    -1,    -1,    -1,   120,    -1,
+      -1,    -1,    -1,    -1,   126,   127,    -1,   129,    -1,    -1,
+      -1,    -1,    -1,   135,   136,   137,   138,   139,    -1,    -1,
+      -1,    -1,    -1,    -1,   146,   147,   148,    -1,    -1,    -1,
+     152,    -1,   154,   155,    -1,   157,   158,   159,    -1,    -1,
+     162,   163,    -1,   165,   166,   167,   168,   169,    -1,    -1,
+      -1,   173,   174,   175,   176,   177,    -1,    -1,   180,   181,
+     182,   183,   184,   185,   186,   187,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   195,   196,    -1,   198,    -1,    -1,    -1,
+     202,    -1,   204,   205,   206,   207,    -1,   209,    -1,   211,
+      -1,    -1,    -1,    -1,   216,    -1,    -1,    -1,    -1,   221,
+     222,    -1,    -1,    -1,   226,   227,   228,   229,   230,    -1,
+     232,    -1,   234,    -1,    -1,   237,    -1,    -1,    -1,    -1,
+     242,   243,    -1,    -1,    -1,    -1,   248,    -1,    -1,    -1,
+     252,   253,    -1,   255,   256,   257,    -1,    -1,   260,    -1,
+     262,    -1,    -1,    -1,   266,    -1,    -1,   269,   270,    -1,
+     272,   273,    -1,    -1,    -1,    -1,    -1,   279,   280,    -1,
+     282,    -1,   284,    -1,   286,   287,    -1,    -1,    -1,    -1,
+     292,    -1,    -1,   295,    -1,   297,   298,   299,   300,   301,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,   313,    -1,   315,   316,   317,    -1,   319,   320,   321,
+     322,    -1,   324,   325,    -1,    -1,    -1,    -1,   330,   331,
+     332,   333,   334,   335,    -1,    -1,   338,   339,    -1,   341,
+      -1,   343,    -1,   345,   346,   347,   348,   349,   350,   351,
+     352,   353,    -1,    -1,   356,   357,    -1,    -1,   360,   361,
+     362,   363,   364,    -1,    -1,    -1,    -1,   369,    -1,    -1,
+      -1,   373,    -1,   375,   376,    -1,   378,   379,   380,    -1,
+      -1,   383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   393,   394,   395,    -1,   397,    -1,   399,    -1,   401,
+     402,   403,   404,   405,   406,   407,   408,   409,   410,    -1,
+      -1,    -1,    -1,   415,   416,    -1,   418,    -1,   420,   421,
+     422,   423,   424,    -1,   426,   427,   428,    -1,    -1,   431,
+      -1,    -1,    -1,   435,   436,    -1,   438,   439,    -1,    -1,
+     442,   443,   444,   445,   446,    -1,   448,   449,    -1,   451,
+      -1,   453,   454,    -1,   456,   457,   458,   459,   460,   461,
+     462,   463,    -1,    -1,    -1,   467,   468,    -1,   470,   471,
+     472,   473,   474,    -1,    -1,    -1,   478,   479,   480,    -1,
+     482,    -1,   484,   485,    -1,   487,   488,    -1,   490,   491,
+      -1,    -1,    -1,   495,   496,   497,   498,    -1,    -1,    -1,
+     502,    -1,    -1,    -1,    -1,    -1,    -1,   509,    -1,   511,
+      -1,   513,   514,   515,   516,   517,    -1,    -1,    -1,    -1,
+      -1,   523,   524,   525,    -1,   527,    -1,    -1,   530,    -1,
+      -1,   533,    -1,   535,    -1,   537,    -1,   539,   540,   541,
+     542,    -1,    -1,    -1,   546,    -1,    -1,   549,   550,   551,
+     552,   553,   554,    -1,    -1,   557,   558,   559,   560,    -1,
+     562,   563,    -1,    -1,   566,   567,   568,   569,    -1,    -1,
+     572,   573,    -1,   575,   576,   577,   578,    -1,    -1,    -1,
+      -1,    -1,   584,   585,    -1,    -1,    -1,    -1,   590,   591,
+      -1,    -1,   594,   595,    -1,   597,   598,    -1,    -1,    -1,
+      -1,    -1,   604,    -1,    -1,   607,    -1,   609,    -1,   611,
+     612,    -1,    -1,    -1,    -1,    -1,   618,    -1,   620,    -1,
+      -1,   623,    -1,    -1,    -1,   627,    -1,   629,   630,   631,
+     632,    -1,    -1,   635,    -1,    -1,    -1,   639,   640,   641,
+      -1,   643,    -1,   645,   646,    -1,    -1,   649,    -1,    -1,
+     652,   653,   654,   655,   656,    -1,   658,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   667,   668,   669,    -1,   671,
+     672,   673,    -1,    -1,    -1,    -1,   678,    -1,   680,    -1,
+      -1,    -1,    -1,    -1,    -1,   687,   688,    -1,    -1,   691,
+      -1,   693,    -1,   695,   696,    -1,    -1,    -1,   700,   701,
+     702,   703,   704,   705,   706,   707,    -1,   709,   710,   711,
+      -1,   713,   714,   715,   716,   717,   718,    -1,   720,   721,
+     722,   723,   724,   725,   726,   727,   728,   729,   730,   731,
+     732,   733,   734,   735,   736,   737,   738,   739,   740,   741,
+     742,   743,    -1,   745,   746,   747,   748,   749,   750,   751,
+      -1,   753,   754,   755,   756,   757,   758,   759,   760,   761,
+     762,   763,   764,   765,   766,   767,   768,   769,   770,   771,
+     772,   773,   774,   775,   776,   777,   778,   779,   780,   781,
+     782,   783,   784,   785,   786,   787,   788,   789,   790,   791,
+     792,   793,     5,     6,    -1,     8,     9,    10,    11,    12,
+      -1,    -1,    15,    -1,    -1,    -1,    -1,    20,    -1,    -1,
+      -1,    -1,    25,    26,    27,    28,    29,    30,    -1,    32,
+      -1,    -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,
+      43,    44,    45,    -1,    47,    -1,    -1,    -1,    -1,    -1,
+      53,    54,    -1,    56,    57,    -1,    59,    60,    -1,    -1,
+      -1,    -1,    65,    66,    67,    68,    69,    70,    -1,    72,
+      73,    -1,    75,    76,    -1,    78,    -1,    80,    81,    82,
+      83,    84,    85,    -1,    87,    88,    -1,    90,    91,    92,
+      -1,    94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,
+     103,    -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,
+      -1,    -1,   115,    -1,    -1,    -1,    -1,   120,    -1,    -1,
+      -1,    -1,    -1,   126,   127,    -1,   129,    -1,    -1,    -1,
+      -1,    -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,
+      -1,    -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,
+      -1,    -1,   155,    -1,   157,   158,   159,    -1,    -1,   162,
+     163,    -1,   165,   166,   167,   168,   169,    -1,    -1,    -1,
+     173,   174,   175,   176,   177,    -1,    -1,   180,   181,   182,
+     183,   184,   185,   186,   187,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,
+      -1,   204,   205,   206,   207,    -1,   209,    -1,   211,    -1,
+      -1,    -1,    -1,   216,    -1,    -1,    -1,    -1,   221,   222,
+      -1,    -1,    -1,   226,   227,   228,   229,   230,    -1,   232,
+      -1,   234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,
+     243,    -1,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,
+     253,    -1,   255,   256,   257,    -1,    -1,   260,    -1,   262,
+      -1,    -1,    -1,   266,    -1,    -1,   269,   270,    -1,   272,
+     273,    -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,
+      -1,   284,    -1,   286,   287,    -1,    -1,    -1,    -1,   292,
+      -1,    -1,   295,    -1,   297,   298,   299,   300,   301,   302,
+     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
+     313,    -1,   315,   316,   317,    -1,   319,   320,   321,   322,
+      -1,   324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,
+     333,   334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,
+     343,    -1,   345,   346,   347,   348,   349,   350,   351,   352,
+     353,    -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,
+     363,   364,    -1,    -1,    -1,    -1,   369,    -1,    -1,    -1,
+     373,    -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,
+     383,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     393,   394,   395,    -1,   397,    -1,   399,    -1,   401,   402,
+     403,   404,   405,   406,   407,   408,   409,   410,    -1,    -1,
+      -1,    -1,   415,   416,    -1,   418,    -1,   420,   421,   422,
+     423,   424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,
+      -1,    -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,
+     443,   444,   445,   446,    -1,   448,   449,    -1,   451,    -1,
+     453,   454,    -1,   456,   457,   458,   459,   460,   461,   462,
+     463,    -1,    -1,    -1,   467,   468,    -1,   470,   471,   472,
+     473,   474,    -1,    -1,    -1,   478,   479,   480,    -1,   482,
+      -1,   484,   485,    -1,   487,   488,    -1,   490,   491,    -1,
+      -1,    -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,
+      -1,    -1,    -1,    -1,    -1,    -1,   509,    -1,   511,    -1,
+     513,   514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,
+     523,   524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,
+     533,    -1,   535,    -1,   537,    -1,   539,   540,   541,   542,
+      -1,    -1,    -1,   546,    -1,    -1,   549,   550,   551,   552,
+     553,   554,    -1,    -1,   557,   558,   559,   560,    -1,   562,
+     563,    -1,    -1,   566,   567,   568,   569,    -1,    -1,   572,
+     573,    -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,
+      -1,   584,   585,    -1,    -1,    -1,    -1,   590,   591,    -1,
+      -1,   594,   595,    -1,   597,   598,    -1,    -1,    -1,    -1,
+      -1,   604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,
+      -1,    -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,
+     623,    -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,
+      -1,    -1,   635,    -1,    -1,    -1,   639,   640,   641,    -1,
+     643,    -1,   645,   646,    -1,    -1,   649,    -1,    -1,   652,
+     653,   654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,
+     673,    -1,    -1,    -1,    -1,   678,    -1,   680,    -1,    -1,
+      -1,    -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,
+     693,    -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,
+     703,   704,   705,   706,   707,    -1,   709,   710,   711,    -1,
+     713,   714,   715,   716,   717,   718,    -1,   720,   721,   722,
+     723,   724,   725,   726,   727,   728,   729,   730,   731,   732,
+     733,   734,   735,   736,   737,   738,   739,   740,   741,   742,
+     743,    -1,   745,   746,   747,   748,   749,   750,   751,    -1,
+     753,   754,   755,   756,   757,   758,   759,   760,   761,   762,
+     763,   764,   765,   766,   767,   768,   769,   770,   771,   772,
+     773,   774,   775,   776,   777,   778,   779,   780,   781,   782,
+     783,   784,   785,   786,   787,   788,   789,   790,   791,   792,
+     793,     5,     6,    -1,     8,     9,    10,    11,    12,    -1,
+      -1,    15,    -1,    -1,    -1,    -1,    20,    -1,    -1,    -1,
+      -1,    25,    26,    27,    28,    29,    30,    -1,    32,    -1,
+      -1,    -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,
+      44,    45,    -1,    47,    -1,    -1,    -1,    -1,    -1,    53,
+      54,    -1,    56,    57,    -1,    59,    60,    -1,    -1,    -1,
+      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
+      -1,    75,    76,    -1,    78,    -1,    80,    81,    82,    83,
+      84,    85,    -1,    87,    88,    -1,    90,    91,    92,    -1,
+      94,    -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,
+      -1,    -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,
+      -1,   115,    -1,    -1,    -1,    -1,   120,    -1,    -1,    -1,
+      -1,    -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,
+      -1,   135,   136,   137,   138,   139,    -1,    -1,    -1,    -1,
+      -1,    -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,
+      -1,   155,    -1,   157,   158,   159,    -1,    -1,   162,   163,
+      -1,   165,   166,   167,   168,   169,    -1,    -1,    -1,   173,
+     174,   175,   176,   177,    -1,    -1,   180,   181,   182,   183,
+     184,   185,   186,   187,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,
+     204,   205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,
+      -1,    -1,   216,    -1,    -1,    -1,    -1,   221,   222,    -1,
+      -1,    -1,   226,   227,   228,   229,   230,    -1,   232,    -1,
+     234,    -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,
+      -1,    -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,
+      -1,   255,   256,   257,    -1,    -1,   260,    -1,   262,    -1,
+      -1,    -1,   266,    -1,    -1,   269,   270,    -1,   272,   273,
+      -1,    -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,
+     284,    -1,   286,   287,    -1,    -1,    -1,    -1,   292,    -1,
+      -1,   295,    -1,   297,   298,   299,   300,   301,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
+      -1,   315,   316,   317,    -1,   319,   320,   321,   322,    -1,
+     324,   325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,
+     334,   335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,
+      -1,   345,   346,   347,   348,   349,   350,   351,   352,   353,
+      -1,    -1,   356,   357,    -1,    -1,   360,   361,   362,   363,
+     364,    -1,    -1,    -1,    -1,   369,    -1,    -1,    -1,   373,
+      -1,   375,   376,    -1,   378,   379,   380,    -1,    -1,   383,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,
+     394,   395,    -1,   397,    -1,   399,    -1,   401,   402,   403,
+     404,   405,   406,   407,   408,   409,   410,    -1,    -1,    -1,
+      -1,   415,   416,    -1,   418,    -1,   420,   421,   422,   423,
+     424,    -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,
+      -1,   435,   436,    -1,   438,   439,    -1,    -1,   442,   443,
+     444,   445,   446,    -1,   448,   449,    -1,   451,    -1,   453,
+     454,    -1,   456,   457,   458,   459,   460,   461,   462,   463,
+      -1,    -1,    -1,   467,   468,    -1,   470,   471,   472,   473,
+     474,    -1,    -1,    -1,   478,   479,   480,    -1,   482,    -1,
+     484,   485,    -1,   487,   488,    -1,   490,   491,    -1,    -1,
+      -1,   495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,
+      -1,    -1,    -1,    -1,    -1,   509,    -1,   511,    -1,   513,
+     514,   515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,
+     524,   525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,
+      -1,   535,    -1,   537,    -1,   539,   540,   541,   542,    -1,
+      -1,    -1,   546,    -1,    -1,   549,   550,   551,   552,   553,
+     554,    -1,    -1,   557,   558,   559,   560,    -1,   562,   563,
+      -1,    -1,   566,   567,   568,   569,    -1,    -1,   572,   573,
+      -1,   575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,
+     584,   585,    -1,    -1,    -1,    -1,   590,   591,    -1,    -1,
+     594,   595,    -1,   597,   598,    -1,    -1,    -1,    -1,    -1,
+     604,    -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,
+      -1,    -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,
+      -1,    -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,
+      -1,   635,    -1,    -1,    -1,   639,   640,   641,    -1,   643,
+      -1,   645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,
+     654,   655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   667,   668,   669,    -1,   671,   672,   673,
+      -1,    -1,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,
+      -1,    -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,
+      -1,   695,   696,    -1,    -1,    -1,   700,   701,   702,   703,
+     704,   705,   706,   707,    -1,   709,   710,   711,    -1,   713,
+     714,   715,   716,   717,   718,    -1,   720,   721,   722,   723,
+     724,   725,   726,   727,   728,   729,   730,   731,   732,   733,
+     734,   735,   736,   737,   738,   739,   740,   741,   742,   743,
+      -1,   745,   746,   747,   748,   749,   750,   751,    -1,   753,
+     754,   755,   756,   757,   758,   759,   760,   761,   762,   763,
+     764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
+     774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
+     784,   785,   786,   787,   788,   789,   790,   791,   792,   793,
+       5,     6,    -1,     8,     9,    10,    11,    12,    -1,    -1,
+      15,    -1,    -1,    -1,    -1,    20,    -1,    -1,    -1,    -1,
+      25,    26,    27,    28,    29,    30,    -1,    -1,    -1,    -1,
+      -1,    36,    -1,    -1,    -1,    40,    -1,    -1,    43,    44,
+      45,    -1,    47,    -1,    -1,    -1,    -1,    -1,    53,    -1,
+      -1,    56,    57,    -1,    59,    60,    -1,    -1,    -1,    -1,
+      65,    66,    67,    68,    69,    70,    -1,    72,    73,    -1,
+      75,    76,    -1,    78,    -1,    80,    81,    82,    83,    84,
+      85,    -1,    87,    88,    -1,    90,    91,    92,    -1,    94,
+      -1,    -1,    -1,    98,    -1,    -1,    -1,    -1,   103,    -1,
+      -1,   106,    -1,    -1,    -1,   110,   111,   112,    -1,    -1,
+     115,    -1,    -1,    -1,    -1,   120,    -1,    -1,    -1,    -1,
+      -1,   126,   127,    -1,   129,    -1,    -1,    -1,    -1,    -1,
+     135,   136,   137,   138,   139,    -1,    -1,    -1,    -1,    -1,
+      -1,   146,   147,   148,    -1,    -1,    -1,   152,    -1,    -1,
+     155,    -1,   157,   158,   159,    -1,    -1,   162,   163,    -1,
+     165,   166,   167,   168,   169,    -1,    -1,    -1,   173,   174,
+     175,   176,   177,    -1,    -1,   180,   181,    -1,   183,   184,
+     185,   186,   187,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     195,   196,    -1,   198,    -1,    -1,    -1,   202,    -1,   204,
+     205,   206,   207,    -1,   209,    -1,   211,    -1,    -1,    -1,
+      -1,   216,    -1,    -1,    -1,    -1,   221,   222,    -1,    -1,
+      -1,   226,   227,   228,   229,    -1,    -1,   232,    -1,   234,
+      -1,    -1,   237,    -1,    -1,    -1,    -1,   242,   243,    -1,
+      -1,    -1,    -1,   248,    -1,    -1,    -1,   252,   253,    -1,
+     255,   256,    -1,    -1,    -1,   260,    -1,   262,    -1,    -1,
+      -1,   266,    -1,    -1,   269,    -1,    -1,   272,   273,    -1,
+      -1,    -1,    -1,    -1,   279,   280,    -1,   282,    -1,   284,
+      -1,   286,   287,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     295,    -1,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,    -1,
+     315,   316,   317,    -1,   319,   320,   321,   322,    -1,   324,
+     325,    -1,    -1,    -1,    -1,   330,   331,   332,   333,   334,
+     335,    -1,    -1,   338,   339,    -1,   341,    -1,   343,    -1,
+     345,   346,   347,   348,   349,   350,   351,   352,   353,    -1,
+      -1,   356,   357,    -1,    -1,   360,   361,   362,   363,   364,
+      -1,    -1,    -1,    -1,   369,    -1,    -1,    -1,   373,    -1,
+     375,   376,    -1,   378,   379,   380,    -1,    -1,   383,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,   394,
+     395,    -1,   397,    -1,   399,    -1,   401,   402,   403,   404,
+     405,   406,   407,   408,   409,   410,    -1,    -1,    -1,    -1,
+     415,   416,    -1,   418,    -1,   420,   421,   422,   423,   424,
+      -1,   426,   427,   428,    -1,    -1,   431,    -1,    -1,    -1,
+     435,   436,    -1,   438,   439,    -1,    -1,   442,   443,   444,
+     445,   446,    -1,   448,   449,    -1,   451,    -1,   453,    -1,
+      -1,   456,   457,   458,   459,   460,   461,   462,   463,    -1,
+      -1,    -1,   467,   468,    -1,   470,   471,   472,    -1,   474,
+      -1,    -1,    -1,   478,   479,   480,    -1,   482,    -1,   484,
+     485,    -1,   487,   488,    -1,   490,   491,    -1,    -1,    -1,
+     495,   496,   497,   498,    -1,    -1,    -1,   502,    -1,    -1,
+      -1,    -1,    -1,    -1,   509,    -1,   511,    -1,   513,   514,
+     515,   516,   517,    -1,    -1,    -1,    -1,    -1,   523,   524,
+     525,    -1,   527,    -1,    -1,   530,    -1,    -1,   533,    -1,
+     535,    -1,   537,    -1,   539,   540,   541,   542,    -1,    -1,
+      -1,   546,    -1,    -1,   549,   550,   551,   552,   553,   554,
+      -1,    -1,   557,   558,   559,   560,    -1,   562,   563,    -1,
+      -1,   566,   567,   568,   569,    -1,    -1,   572,   573,    -1,
+     575,   576,   577,   578,    -1,    -1,    -1,    -1,    -1,   584,
+     585,    -1,    -1,    -1,    -1,   590,   591,    -1,    -1,   594,
+     595,    -1,   597,   598,    -1,    -1,    -1,    -1,    -1,   604,
+      -1,    -1,   607,    -1,   609,    -1,   611,   612,    -1,    -1,
+      -1,    -1,    -1,   618,    -1,   620,    -1,    -1,   623,    -1,
+      -1,    -1,   627,    -1,   629,   630,   631,   632,    -1,    -1,
+      -1,    -1,    -1,    -1,   639,   640,   641,    -1,   643,    -1,
+     645,   646,    -1,    -1,   649,    -1,    -1,   652,   653,   654,
+     655,   656,    -1,   658,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   667,   668,   669,    -1,   671,   672,   673,    -1,
+      -1,    -1,    -1,   678,    -1,   680,    -1,    -1,    -1,    -1,
+      -1,    -1,   687,   688,    -1,    -1,   691,    -1,   693,    -1,
+     695,   696,    -1,    -1,    -1,   700,   701,   702,   703,   704,
+     705,   706,   707,    -1,   709,   710,   711,    -1,   713,   714,
+     715,   716,   717,   718,    -1,   720,   721,   722,   723,   724,
+     725,   726,   727,   728,   729,   730,   731,   732,   733,   734,
+     735,   736,   737,   738,   739,   740,   741,   742,   743,    -1,
+     745,   746,   747,   748,   749,   750,   751,    -1,   753,   754,
+     755,   756,   757,   758,   759,   760,   761,   762,   763,   764,
+     765,   766,   767,   768,   769,   770,   771,   772,   773,   774,
+     775,   776,   777,   778,   779,   780,   781,   782,   783,   784,
+     785,   786,   787,   788,   789,   790,   791,   792,   793,     7,
+      -1,    -1,    -1,    -1,    12,    -1,    14,    -1,    -1,    17,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    26,    27,
+      28,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      34,    35,    -1,    -1,    -1,    -1,    40,    -1,    42,    -1,
+      44,    45,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      58,    -1,    -1,    -1,    -1,    63,    64,    -1,    62,    -1,
+      -1,    69,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    77,
+      -1,    -1,    -1,    -1,    -1,    83,    84,     7,    -1,    87,
+      -1,    -1,    12,    -1,    14,    -1,    -1,    -1,    96,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    26,    27,    28,    -1,
+      -1,    -1,    -1,   111,    -1,    -1,    -1,    -1,   112,    -1,
+      -1,   115,    -1,    -1,    -1,    -1,    -1,   125,    -1,   123,
+      -1,   129,    -1,    -1,    -1,    -1,    -1,    -1,    58,   137,
+     138,    -1,    -1,    63,    -1,    -1,   144,    -1,   142,    -1,
+      -1,    -1,    -1,    -1,   152,    -1,    -1,    77,    -1,    -1,
+     158,    -1,    -1,    83,    84,   159,    -1,    87,    -1,    -1,
+      -1,   169,    -1,    -1,    -1,    -1,    96,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   111,    -1,   187,   192,   189,    -1,    -1,    -1,    -1,
+     194,    -1,    -1,    -1,    -1,   125,    -1,    -1,    -1,   129,
+      -1,   205,   206,    -1,    -1,    -1,    -1,   137,    -1,    -1,
+      -1,    -1,    -1,    -1,   144,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   152,    -1,    -1,   233,    -1,   235,   158,    -1,
+      -1,    -1,    -1,    -1,   242,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   247,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   262,    -1,   260,    -1,    -1,    -1,
+      -1,    -1,   192,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   279,    -1,   285,    -1,    -1,
+      -1,    -1,    -1,    -1,   288,   289,    -1,   291,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   235,    -1,    -1,    -1,    -1,
+      -1,    -1,   242,   321,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   327,   328,   329,    -1,    -1,    -1,    -1,
+      -1,   339,   262,    -1,    -1,   343,    -1,    -1,    -1,    -1,
+      -1,    -1,   346,   347,   348,    -1,    -1,    -1,    -1,   353,
+      -1,    -1,   356,    -1,    -1,   285,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     374,   375,    -1,   381,    -1,    -1,    -1,    -1,    -1,   387,
+      -1,    -1,    -1,    -1,    -1,    -1,   394,    -1,    -1,    -1,
+      -1,   321,    -1,    -1,    -1,   403,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   408,   409,    -1,    -1,    -1,   339,
+      -1,    -1,    -1,   343,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   435,    -1,    -1,
+     434,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   450,   451,   452,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   387,    -1,    -1,
+      -1,    -1,    -1,    -1,   394,    -1,    -1,    -1,    -1,    -1,
+      34,    35,    -1,   403,   482,    -1,    40,    -1,    42,    -1,
+      44,    45,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   496,    -1,    -1,    -1,   500,    -1,    62,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   512,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     450,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     538,   539,   540,   541,    -1,    -1,    -1,    -1,   546,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   112,    -1,
+      -1,   115,   482,    -1,    -1,   563,    -1,    -1,   566,   123,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   572,    -1,
+      -1,   575,    -1,    -1,   578,   579,   580,   581,   142,    -1,
+      -1,   589,    -1,    -1,    -1,   232,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   602,   159,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   538,   539,
+     540,   541,    -1,    -1,    -1,    -1,   546,   621,   622,    -1,
+      -1,    -1,    -1,   187,    -1,   189,    -1,    -1,   636,    -1,
+      -1,   639,    -1,   563,    -1,    -1,   566,    -1,    -1,    -1,
+      -1,   205,   206,    -1,    -1,   649,    -1,    -1,   295,   296,
+     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,   313,   314,    -1,   316,
+     317,    -1,   602,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   247,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   260,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   636,    -1,    -1,   639,
+      -1,    -1,    -1,    -1,    -1,   279,   724,   725,   726,    -1,
+      -1,    -1,    -1,    -1,   288,   289,    -1,   291,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     748,   749,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   327,
-     328,   329,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   346,   347,
-     348,    -1,    -1,    -1,    -1,   353,    -1,    -1,   356,    -1,
+      -1,    -1,    -1,   327,   328,   329,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   374,   375,    -1,    -1,
+      -1,    -1,   346,   347,   348,    -1,    -1,    -1,    -1,   353,
+      -1,    -1,   356,    -1,   724,    -1,    -1,   444,   445,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     374,   375,    -1,    -1,    -1,    -1,    -1,    -1,   748,   749,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     408,   409,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   408,   409,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   434,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     434,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   496,    -1,
-      -1,    -1,   500,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   512,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   496,    -1,    -1,    -1,   500,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   512,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   572,    -1,    -1,   575,    -1,    -1,
-     578,   579,   580,   581,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   572,    -1,
+      -1,   575,    -1,    -1,   578,   579,   580,   581,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   621,   622,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   621,   622,    -1,
+      -1,    -1,    -1,   710,   711,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   649
+      -1,    -1,    -1,    -1,   731,   649,   733,   734,   735,   736,
+     737,    -1,    -1,   740,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   750,    -1,    -1,    -1,    -1,   755,   756,
+     757,   758,   759,   760,   761,   762,   763,   764,   765,   766,
+     767,   768,   769,   770,   771,   772,   773,   774,   775,   776,
+     777,   778,   779,   780,   781,   782,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   793
 };
 
   /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -22696,25 +22806,25 @@
      381,   414,   425,   447,   450,   452,   455,   465,   466,   475,
      477,   486,   492,   500,   505,   506,   507,   538,   545,   565,
      589,   601,   605,   613,   619,   636,   644,   660,   661,   662,
-     663,   675,   712,   752,   798,   810,   811,   814,   815,   816,
-     817,   818,   820,   825,   828,   881,   882,   883,   884,   886,
-     889,   911,   933,   940,   941,  1177,  1178,  1180,  1182,  1184,
-    1187,  1189,  1190,  1191,  1192,  1193,  1195,  1196,  1231,  1232,
-    1240,  1241,  1244,  1257,  1259,  1263,  1266,  1267,  1271,  1273,
-    1278,  1282,  1288,  1289,  1290,  1291,  1292,  1293,  1294,  1299,
-    1300,  1426,  1459,  1460,  1461,  1462,  1463,  1464,  1465,  1466,
-    1467,  1468,  1469,  1470,  1471,  1472,  1473,  1474,  1475,  1483,
-    1484,  1505,  1506,  1510,  1514,  1520,  1521,  1522,  1523,  1524,
-    1525,  1526,  1527,  1528,  1529,  1530,  1531,  1532,  1533,  1534,
-    1535,  1536,  1537,  1538,  1539,  1540,  1541,  1542,  1543,  1544,
-    1545,  1546,  1547,  1548,  1549,  1550,  1551,  1552,  1553,  1554,
-    1555,  1556,  1557,  1558,  1559,  1560,  1561,  1562,  1563,  1575,
-    1576,  1578,  1582,  1591,  1601,  1605,  1607,  1608,  1678,  1680,
-    1682,  1704,  1710,  1712,  1713,  1714,  1716,  1720,  1722,  1748,
-    1754,  1755,  1756,  1757,  1793,  1800,  1801,  1803,  1804,    12,
+     663,   675,   712,   752,   807,   819,   820,   823,   824,   825,
+     826,   827,   829,   834,   837,   890,   891,   892,   893,   895,
+     898,   920,   942,   949,   950,  1186,  1187,  1189,  1191,  1193,
+    1196,  1198,  1199,  1200,  1201,  1202,  1204,  1205,  1240,  1241,
+    1249,  1250,  1253,  1266,  1268,  1272,  1275,  1276,  1280,  1282,
+    1287,  1291,  1297,  1298,  1299,  1300,  1301,  1302,  1303,  1308,
+    1309,  1435,  1468,  1469,  1470,  1471,  1472,  1473,  1474,  1475,
+    1476,  1477,  1478,  1479,  1480,  1481,  1482,  1483,  1484,  1492,
+    1493,  1514,  1515,  1519,  1523,  1529,  1530,  1531,  1532,  1533,
+    1534,  1535,  1536,  1537,  1538,  1539,  1540,  1541,  1542,  1543,
+    1544,  1545,  1546,  1547,  1548,  1549,  1550,  1551,  1552,  1553,
+    1554,  1555,  1556,  1557,  1558,  1559,  1560,  1561,  1562,  1563,
+    1564,  1565,  1566,  1567,  1568,  1569,  1570,  1571,  1572,  1584,
+    1585,  1587,  1591,  1600,  1610,  1614,  1616,  1617,  1687,  1689,
+    1691,  1713,  1719,  1721,  1722,  1723,  1725,  1729,  1731,  1768,
+    1774,  1775,  1776,  1777,  1813,  1820,  1821,  1823,  1824,    12,
      108,   127,   200,   243,   286,   419,   498,   563,   565,   599,
-     611,   707,  1767,  1768,  1769,  1772,   282,   370,  1272,  1749,
-     571,  1653,   235,     5,     6,     8,     9,    10,    11,    12,
+     611,   707,  1787,  1788,  1789,  1792,   282,   370,  1281,  1769,
+     571,  1662,   235,     5,     6,     8,     9,    10,    11,    12,
       15,    20,    23,    25,    26,    27,    28,    29,    30,    32,
       36,    40,    43,    44,    45,    47,    49,    50,    53,    56,
       57,    59,    60,    61,    63,    65,    66,    67,    68,    69,
@@ -22761,810 +22871,819 @@
      753,   754,   755,   756,   757,   758,   759,   760,   761,   762,
      763,   764,   765,   766,   767,   768,   769,   770,   771,   772,
      773,   774,   775,   776,   777,   778,   779,   780,   781,   782,
-     783,   784,   905,  1650,  1659,  1669,  1670,  1671,  1673,  1674,
-    1677,   315,   456,   827,   562,   565,  1706,  1706,   640,  1750,
-     108,   199,   286,   389,   498,   518,   563,   568,   599,   603,
-     611,   653,   707,  1154,  1479,  1764,  1768,  1769,  1770,  1771,
-    1772,     8,    23,    29,    35,    37,    38,    39,    41,    54,
-      55,    61,    62,    69,    72,    96,    97,   102,   104,   107,
-     108,   113,   114,   115,   120,   122,   125,   171,   178,   179,
-     188,   195,   205,   207,   213,   219,   226,   230,   241,   245,
-     271,   279,   290,   318,   323,   334,   338,   340,   344,   345,
-     346,   347,   348,   355,   365,   366,   367,   371,   372,   396,
-     408,   409,   411,   426,   454,   455,   474,   476,   483,   484,
-     490,   543,   544,   551,   555,   556,   561,   571,   575,   576,
-     577,   578,   587,   588,   589,   593,   596,   611,   615,   616,
-     617,   619,   624,   626,   631,   632,   649,   664,   665,   670,
-     676,   677,   679,   682,   683,   684,   685,   686,   690,   692,
-     694,   745,   783,   790,   791,   792,   796,   798,   802,   806,
-     807,  1127,  1292,  1310,  1311,  1314,  1315,  1316,  1318,  1322,
-    1325,  1327,  1328,  1330,  1331,  1332,  1339,  1340,  1341,  1364,
-    1365,  1629,  1631,  1634,  1635,  1636,  1637,  1638,  1639,  1642,
-    1645,  1647,  1650,  1659,  1759,  1761,   108,   167,   200,   235,
-     286,   419,   498,   518,   563,   586,   599,   611,   627,   653,
-     707,  1479,  1659,  1272,   103,   535,   942,    13,    14,    99,
-     130,   144,   167,   170,   183,   210,   235,   241,   274,   285,
-     420,   424,   440,   448,   456,   492,   505,   506,   557,   586,
-     608,   610,  1650,  1653,  1660,  1664,  1671,  1674,  1675,  1677,
-    1726,  1727,  1648,  1659,   826,   565,   128,   220,   293,  1485,
-     406,   658,    87,   427,  1606,   111,   235,   646,  1609,   243,
-    1706,  1272,  1659,  1602,   486,   611,  1706,  1272,   128,   293,
-    1486,  1509,   652,  1592,   521,   930,   934,   935,  1659,    13,
-     424,  1726,  1750,  1659,    13,   140,   220,   526,   527,   529,
-     530,   531,   548,  1301,  1302,  1303,  1762,    61,    62,   125,
-     209,   282,   351,   403,   497,   584,   652,   653,   671,   707,
-     802,  1129,  1650,  1662,  1670,  1671,  1673,  1674,  1676,  1679,
-    1689,  1694,  1695,    35,    36,    61,    72,    97,    99,   109,
-     158,   163,   166,   176,   198,   200,   209,   211,   282,   315,
-     380,   407,   418,   419,   422,   423,   443,   497,   510,   546,
-     565,   630,   753,   754,  1129,  1239,  1565,  1566,  1568,  1569,
-    1570,  1690,   934,   204,   510,   584,  1239,   204,  1239,  1648,
-    1659,   565,  1515,   406,   658,   243,  1711,  1659,   483,  1495,
-    1499,   659,  1427,  1428,  1659,    32,    79,   154,   414,   436,
-     477,   538,  1796,  1318,  1659,  1650,   400,  1046,   798,  1760,
-    1761,   243,   282,  1314,  1289,  1290,  1292,  1426,     0,   156,
-     812,   414,   104,   274,   611,  1204,  1653,  1659,  1663,  1665,
-    1666,  1738,  1740,   126,   403,   611,  1233,  1234,  1235,  1236,
-    1237,  1238,   194,   246,   285,  1304,  1305,  1457,   387,   602,
-    1439,  1440,   276,   602,  1440,  1445,  1457,  1291,  1292,   130,
-     608,    17,   195,  1579,  1580,  1648,   160,  1208,  1659,   160,
-     905,   137,   152,   448,   479,  1715,   212,   905,  1663,  1659,
-    1648,   563,   230,  1478,   212,   167,  1186,  1767,  1706,  1750,
-    1279,  1280,  1648,   798,   912,   804,   185,   517,   582,  1476,
-    1648,  1476,    19,  1751,   230,  1077,   235,   212,   455,  1663,
-     235,   716,  1659,   563,  1077,  1077,   212,   235,   565,  1763,
-    1763,  1767,  1772,   798,   798,   798,  1325,   798,   798,   798,
-    1314,  1377,   798,   798,   798,   798,   798,   798,   798,   798,
-    1313,  1313,   798,  1115,   798,   798,   798,   571,   798,   798,
-     798,  1760,   798,   798,   798,   798,   798,   798,   798,   798,
-     798,  1314,   798,   798,   798,  1375,  1376,  1645,  1659,   798,
-     798,   798,   798,   798,   798,   798,   798,   798,  1314,  1115,
-     798,   798,   798,   798,   798,   798,   798,   798,   798,   798,
-     798,   798,   798,   798,   798,   798,  1115,   571,   798,   798,
-     798,   571,   798,   798,   798,    37,   219,   571,   798,  1313,
-    1115,  1115,   798,   798,   798,   798,   798,   798,   798,   798,
-     798,   798,   798,   798,   798,   798,   798,   798,   798,   798,
-     798,   798,   798,   798,  1325,  1325,  1325,   619,  1290,  1292,
-    1314,   802,  1366,  1663,  1659,   803,    18,    19,    21,   386,
-     389,   571,   647,  1312,  1319,  1320,  1658,  1659,   160,   161,
-     201,   214,   254,   267,   294,   358,  1323,    33,   141,   249,
-     275,   344,   365,   366,   441,   503,   504,   516,   721,   788,
-     789,   790,   791,   792,   793,   794,   795,  1321,  1325,    71,
-     388,   571,  1654,   259,   651,   798,   804,  1478,  1478,  1478,
-    1659,   212,  1478,  1478,   716,  1659,  1478,   563,  1478,  1478,
-    1478,   212,  1706,   821,  1583,   135,   418,  1725,   480,   480,
-     563,   568,   611,   627,   653,   653,   384,   798,  1741,   562,
-     377,  1741,    67,   510,  1741,   109,   627,  1741,   802,  1741,
-     377,   582,   803,   380,    68,   432,   804,  1663,   197,   231,
-    1227,  1659,  1653,  1802,  1314,   246,    85,   293,  1611,   194,
-    1705,  1706,   197,   315,  1565,  1603,  1659,  1275,  1666,  1274,
-    1706,   246,  1487,  1478,  1594,   315,   510,   753,  1593,  1595,
-     620,   931,   500,   936,  1725,   377,   197,   377,   582,  1751,
-    1310,  1303,   500,   653,   804,    35,   125,   160,   501,  1130,
-    1496,  1663,   194,   582,  1496,   255,   432,  1696,  1697,  1699,
-    1701,    13,   125,   364,  1664,  1667,  1734,   212,   802,  1663,
-      35,   125,  1132,  1133,  1663,   804,   125,   584,  1685,  1693,
-    1695,   803,  1686,  1496,   166,   275,   634,  1424,  1574,   798,
-     108,   167,   200,   419,   565,   586,   611,   627,  1574,    13,
-    1564,  1663,  1444,  1445,   197,   249,  1567,  1571,   198,    70,
-     542,   194,   542,   562,    70,   542,    13,    43,    94,    98,
-     253,   331,   395,   517,   559,  1516,  1517,  1518,   166,   222,
-     542,  1444,  1574,   542,   287,   157,   421,   585,   234,   235,
-     261,  1153,    73,   562,   542,   623,   936,   432,   636,  1245,
-    1246,  1247,   446,   533,  1252,  1253,  1254,  1252,  1648,  1659,
-    1802,  1706,   798,   803,  1427,   803,   798,  1429,    37,   219,
-    1630,  1654,  1795,  1795,  1795,    96,  1794,  1795,  1795,   156,
-     804,   798,    48,   156,  1292,   156,   197,   111,   156,   799,
-     799,  1304,   799,   801,  1659,  1313,   798,   138,   228,   802,
-     125,   138,   228,  1736,   464,   803,  1743,   160,   160,   160,
-     803,   502,   608,  1306,   146,   391,   802,  1455,  1456,  1458,
-    1663,   249,  1305,  1457,  1304,    48,    13,   140,  1758,  1444,
-     290,   372,   593,  1446,  1447,  1631,  1659,  1758,  1444,  1439,
-    1440,  1445,   231,   293,   428,  1512,  1513,  1509,   195,  1579,
-     160,   194,  1288,  1483,  1484,  1505,  1510,  1577,  1581,  1630,
-    1659,   332,   569,   595,  1179,  1666,  1183,  1659,  1659,   746,
-     784,  1663,  1659,  1181,   383,     7,    26,    84,   144,   237,
-     322,   369,   450,   629,   748,  1013,  1014,  1027,  1028,  1029,
-    1030,  1036,  1038,  1039,  1040,  1566,     7,    12,    14,    17,
-      27,    28,    58,    63,    64,    69,    77,    83,    84,    87,
-      96,   111,   125,   129,   137,   138,   144,   152,   158,   169,
-     192,   233,   235,   242,   262,   285,   321,   339,   343,   381,
-     387,   394,   403,   435,   450,   451,   452,   482,   538,   539,
-     540,   541,   546,   563,   566,   589,   602,   636,   639,   724,
-     725,   726,   748,   749,  1029,  1078,  1081,  1083,  1084,  1136,
-    1209,  1210,  1212,  1213,  1215,  1217,  1218,  1219,  1220,  1222,
-    1224,  1659,   171,  1659,   905,   532,  1773,  1774,  1185,  1476,
-     249,   803,   235,   263,   400,  1151,  1285,  1286,  1314,  1373,
-    1374,  1659,   830,   829,   176,   428,   803,  1258,    59,   176,
-     180,   194,   330,   428,  1268,  1269,  1270,    57,   368,   368,
-     447,  1752,  1321,  1659,  1659,  1659,   518,   193,  1659,   708,
-       7,  1007,  1659,  1666,  1737,  1739,  1734,  1659,  1659,  1077,
-      11,   167,   200,   419,   586,   892,  1766,  1774,  1780,  1782,
-    1783,  1788,   200,   892,  1765,  1774,  1780,  1783,  1788,  1763,
-    1314,  1314,    13,   140,  1371,  1422,  1371,  1371,  1371,   633,
-    1379,  1314,  1314,  1374,  1374,  1314,  1314,   140,  1371,  1422,
-     799,   372,   799,   799,  1314,  1314,  1314,  1314,  1645,   116,
-     117,   118,   119,   120,   223,   224,   225,   226,   334,   336,
-     337,   338,   345,   426,   489,   490,   631,   648,   649,  1417,
-    1418,  1314,  1373,   112,   115,   575,   578,  1419,   140,  1367,
-    1314,  1314,  1314,  1314,  1417,  1314,  1374,  1376,    10,   803,
-     804,   140,  1371,  1314,  1314,   140,  1371,  1314,  1314,  1374,
-    1374,  1374,  1314,  1374,  1318,  1314,  1314,  1314,  1314,  1314,
-    1314,   799,  1314,  1371,  1371,  1314,  1314,   140,  1371,  1314,
-    1418,  1418,  1314,    46,   268,   583,  1314,  1314,   799,  1646,
-    1647,  1659,  1371,  1371,  1314,  1314,  1314,  1371,  1371,  1374,
-     799,   799,  1314,  1314,  1314,  1314,  1314,   802,  1343,  1344,
-    1631,  1638,  1659,   799,   799,   799,  1325,   140,  1371,  1304,
-     799,   803,   209,   282,   497,  1691,   501,  1314,  1311,  1658,
-    1659,  1314,  1314,  1314,   179,   371,   588,   604,  1321,    13,
-      20,  1316,  1324,  1318,  1318,   798,  1760,  1325,  1318,  1318,
-    1318,  1318,   275,   666,  1317,  1318,  1318,   245,  1318,   245,
-    1318,  1318,  1318,  1318,  1318,    33,   249,   275,   441,  1663,
-    1325,  1654,  1654,  1314,  1336,  1337,  1338,   792,  1659,  1659,
-     905,  1659,   377,  1659,   905,  1663,   708,  1036,  1038,  1480,
-    1481,  1482,   905,  1659,  1666,  1733,  1476,  1734,  1659,  1478,
-     614,   822,    35,   158,   162,   202,   222,   287,   382,   418,
-     442,   467,   511,   542,  1584,  1588,  1589,  1706,    86,   802,
-     943,   944,   945,   946,  1659,  1723,   562,  1659,  1742,  1666,
-    1663,   200,   419,   565,  1724,  1733,  1727,    21,  1420,  1421,
-     186,   362,  1659,  1717,  1659,  1802,  1487,   515,   803,    50,
-     282,  1610,    30,  1648,  1707,  1708,  1476,   802,   819,  1653,
-     287,   803,   582,  1276,  1277,  1648,  1476,  1648,  1659,  1598,
-    1596,  1597,   803,  1654,    56,    66,    76,    90,    91,    92,
-     106,   333,   350,   488,   550,   567,   937,   939,   803,  1721,
-    1666,  1733,  1724,   486,  1753,  1752,   197,  1295,  1296,  1457,
-      13,   364,  1734,  1659,    71,  1135,  1314,  1666,   732,   571,
-    1656,   273,   379,   642,   803,  1700,   803,  1698,   657,  1681,
-     802,   803,  1659,   209,   282,   497,   652,   671,  1692,  1496,
-    1659,  1696,  1686,  1496,  1687,  1688,  1689,  1694,    13,    35,
-     125,   377,   483,   708,  1314,  1703,   249,  1572,  1654,  1314,
-     792,  1077,   905,   905,   905,  1648,   905,  1666,  1648,   287,
-     349,   542,  1574,  1659,   905,  1574,  1666,  1567,   905,  1574,
-     252,   560,   181,   194,  1519,   803,  1572,  1567,   194,   880,
-    1567,  1571,  1571,  1567,  1574,  1574,   379,   642,    88,   803,
-    1242,   803,   880,   125,  1314,  1500,  1501,  1502,  1499,  1428,
-    1430,  1659,    21,   803,   378,  1798,   558,  1799,   645,   258,
-     470,  1797,  1659,  1314,   277,   280,   429,  1047,  1048,  1666,
-     136,   799,   156,   813,   799,   728,    48,  1663,   653,   728,
-      48,   636,    65,   256,   364,   534,   552,   643,  1730,  1731,
-    1666,  1738,   636,  1201,  1651,  1653,  1651,  1651,  1235,   666,
-     667,   669,  1307,  1308,  1309,   571,  1655,  1655,  1663,   803,
-     502,  1314,  1441,  1643,  1292,  1293,   376,   803,  1292,  1293,
-    1444,  1444,   197,  1477,  1649,  1659,  1512,  1227,  1663,    87,
-     432,  1072,  1073,  1076,  1083,  1084,  1085,  1136,   906,  1659,
-    1659,   194,   368,   315,     7,   906,   798,   110,  1024,  1496,
-    1497,  1497,  1024,  1497,  1497,   582,  1497,   803,  1080,   158,
-      74,    89,   199,   400,   518,  1093,  1095,  1151,  1226,  1497,
-      64,    89,   235,  1226,   400,  1497,  1497,  1226,  1497,   400,
-     400,  1497,  1497,  1497,  1497,   582,   136,  1497,   261,   400,
-     563,    64,    89,   193,   400,   417,  1151,  1226,   261,  1497,
-     400,   400,   563,   136,  1497,  1497,  1497,  1497,  1497,  1226,
-     400,    48,  1497,  1497,   400,    21,    74,   160,   582,  1151,
-    1230,   400,   400,  1497,   584,  1497,  1497,  1497,   139,   331,
-    1497,  1497,   400,  1497,   618,   618,  1497,  1497,  1497,  1081,
-      71,  1129,   449,  1046,  1211,   803,   803,   500,   709,  1808,
-    1188,   491,   627,  1774,   144,   608,  1265,   125,  1281,  1659,
-    1280,  1648,   798,   798,  1286,   799,   803,   457,   458,   459,
-     460,   461,   462,   463,   831,   832,   232,   295,   296,   297,
-     298,   299,   300,   301,   302,   303,   304,   305,   306,   307,
-     308,   309,   310,   311,   312,   313,   314,   316,   317,   444,
-     445,   710,   711,   731,   733,   734,   735,   736,   737,   740,
-     750,   755,   756,   757,   758,   759,   760,   761,   762,   763,
-     764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
-     774,   775,   776,   777,   778,   779,   780,   781,   782,   844,
-     845,   846,   847,   848,   849,   850,   851,   852,   853,   854,
-     855,   856,   857,   858,   859,   860,   861,   862,   863,   864,
-     865,   866,   867,   868,   869,   870,   877,   878,   879,  1648,
-     609,  1269,    57,   447,   171,   885,   377,     7,   716,   111,
-     377,  1077,  1024,   613,  1008,     7,   228,   125,   803,   888,
-     591,   591,   614,  1166,  1167,  1648,   200,  1077,   905,  1659,
-     905,   905,  1774,   803,   799,  1371,   799,  1314,   799,   799,
-     799,  1314,   150,   633,  1378,    21,    25,   799,   614,   799,
-     799,   799,   614,   803,  1374,   799,   792,   799,   803,   803,
-     799,   799,   799,   197,   803,   799,   803,  1374,   799,   803,
-     803,   803,   791,   803,   799,   799,   798,  1645,  1659,  1371,
-     799,   799,   799,  1371,   799,   803,   799,   799,   799,   799,
-     803,   799,   249,   799,   803,   803,   799,   803,   803,   799,
-     799,   799,   803,   197,   803,  1371,   799,   799,   803,   803,
-     803,   799,   197,  1314,   197,  1314,   197,  1314,   197,   799,
-     803,   799,   799,   799,   799,   803,    21,   799,   803,   799,
-     803,   799,   799,   689,  1349,  1349,   799,   803,  1342,   799,
-    1342,   803,  1663,   799,  1349,  1349,  1349,   803,  1371,   799,
-    1374,   804,   804,   804,  1663,  1314,   808,   179,   371,   588,
-     604,  1760,    19,  1314,   165,  1318,   798,  1314,  1314,  1318,
-     798,  1760,  1325,  1318,  1312,   799,   803,   798,   804,   804,
-    1648,  1480,  1478,  1080,  1015,  1016,  1017,  1036,   803,    52,
-     469,  1228,   192,  1814,  1476,   802,   823,   824,   287,   287,
-     287,   287,   287,   287,   803,  1476,  1590,   115,   575,   578,
-     938,   948,  1365,  1636,  1645,  1663,   803,   160,   377,   799,
-     803,   582,   792,  1659,  1668,  1732,   636,  1728,  1659,   160,
-     186,   201,   214,   266,   267,   294,   362,   416,  1718,  1719,
-    1423,  1424,  1648,  1653,  1653,  1283,  1284,  1648,   236,  1421,
-     803,  1663,    31,   582,  1604,  1666,  1666,   803,   582,   176,
-     428,   612,  1260,  1261,  1262,   400,  1388,  1389,   582,  1600,
-      13,  1599,  1599,  1595,   803,   160,   210,   377,   197,  1732,
-    1659,   145,   699,   719,   798,   807,  1297,  1298,  1380,  1382,
-    1390,  1391,  1392,  1393,  1394,  1395,  1396,  1648,  1760,  1423,
-    1295,   582,   582,   582,    35,  1134,  1663,   582,  1496,   455,
-    1194,  1194,   432,   453,   495,  1702,  1699,  1697,  1734,  1663,
-    1667,   194,   804,   804,   804,   804,   804,  1695,  1314,  1703,
-     803,  1693,  1653,   197,  1573,   799,  1659,   614,  1574,   427,
-    1444,  1518,  1573,  1574,    60,  1574,  1648,  1648,  1574,   513,
-    1247,   607,  1255,  1254,   799,   803,   799,   803,  1760,  1630,
-     404,   194,   804,   799,    73,   798,    73,   798,   401,  1050,
-     216,   263,   805,  1497,   403,   571,   732,    13,   364,  1734,
-     403,   571,   732,  1656,  1663,   571,   571,   571,    19,  1729,
-     319,   320,   324,   325,  1202,  1203,     5,   403,   738,   739,
-    1198,  1199,  1200,  1477,   668,  1308,  1129,  1131,  1456,   341,
-      22,   131,  1442,  1443,   803,  1447,  1447,  1477,  1648,  1659,
-     197,   803,   804,  1511,  1298,   122,   188,   219,   290,   372,
-     593,  1450,  1453,  1454,   379,  1073,    84,    77,    93,   265,
-     342,   368,   430,   532,   908,   910,    60,   477,   263,   597,
-    1026,   108,   221,   393,   403,   410,   514,   611,   890,   891,
-    1653,  1012,  1013,   219,   290,   372,   593,  1041,  1452,  1453,
-    1650,  1653,  1012,  1041,  1041,  1659,  1653,  1815,  1014,  1497,
-    1174,  1659,  1151,  1152,  1272,  1152,    64,   193,   417,   603,
-    1094,  1150,  1165,  1174,  1659,   798,  1659,   125,  1223,  1659,
-    1659,  1659,  1659,  1659,  1272,   122,   188,   290,   372,   593,
-    1451,   122,   188,   219,   290,   372,   593,  1449,  1659,  1449,
-      13,  1216,  1416,  1659,  1272,  1653,  1653,  1653,  1653,  1129,
-    1497,  1449,  1216,  1659,  1659,   263,  1416,   263,  1659,  1659,
-    1663,  1659,  1216,  1497,   186,   266,   368,  1087,   372,   790,
-    1811,   125,  1225,  1659,  1451,  1451,  1659,  1272,  1437,  1438,
-    1646,   125,  1082,  1449,  1653,  1272,  1659,  1659,  1648,  1272,
-    1272,    80,    82,   125,   148,   187,   439,  1086,  1082,  1082,
-     125,  1449,  1659,  1449,  1216,   798,   371,  1663,  1815,  1815,
-    1497,  1497,   402,     7,   144,  1078,  1219,  1220,  1213,  1217,
-    1220,   717,   718,  1025,  1497,   706,  1812,   377,   900,  1205,
-     127,   248,  1648,   672,   672,  1216,   417,  1412,  1413,  1414,
-    1659,   249,  1314,   160,   160,   160,   160,   160,   160,   160,
-     803,   880,   160,   160,   160,   160,   160,   160,   160,   160,
-     160,   803,   880,   160,   160,   160,   160,   160,   160,   160,
+     783,   784,   785,   786,   787,   788,   789,   790,   791,   792,
+     793,   914,  1659,  1668,  1678,  1679,  1680,  1682,  1683,  1686,
+     315,   456,   836,   562,   565,  1715,  1715,   640,  1770,   108,
+     199,   286,   389,   498,   518,   563,   568,   599,   603,   611,
+     653,   707,  1163,  1488,  1784,  1788,  1789,  1790,  1791,  1792,
+       8,    23,    29,    35,    37,    38,    39,    41,    54,    55,
+      61,    62,    69,    72,    96,    97,   102,   104,   107,   108,
+     113,   114,   115,   120,   122,   125,   171,   178,   179,   188,
+     195,   205,   207,   213,   219,   226,   230,   241,   245,   271,
+     279,   290,   318,   323,   334,   338,   340,   344,   345,   346,
+     347,   348,   355,   365,   366,   367,   371,   372,   396,   408,
+     409,   411,   426,   454,   455,   474,   476,   483,   484,   490,
+     543,   544,   551,   555,   556,   561,   571,   575,   576,   577,
+     578,   587,   588,   589,   593,   596,   611,   615,   616,   617,
+     619,   624,   626,   631,   632,   649,   664,   665,   670,   676,
+     677,   679,   682,   683,   684,   685,   686,   690,   692,   694,
+     745,   783,   799,   800,   801,   805,   807,   811,   815,   816,
+    1136,  1301,  1319,  1320,  1323,  1324,  1325,  1327,  1331,  1334,
+    1336,  1337,  1339,  1340,  1341,  1348,  1349,  1350,  1373,  1374,
+    1638,  1640,  1643,  1644,  1645,  1646,  1647,  1648,  1651,  1654,
+    1656,  1659,  1668,  1779,  1781,   108,   167,   200,   235,   286,
+     419,   498,   518,   563,   586,   599,   611,   627,   653,   707,
+    1488,  1668,  1281,   103,   535,   951,    13,    14,    99,   130,
+     144,   167,   170,   183,   210,   235,   241,   274,   285,   420,
+     424,   440,   448,   456,   492,   505,   506,   557,   586,   608,
+     610,  1659,  1662,  1669,  1673,  1680,  1683,  1684,  1686,  1735,
+    1736,  1657,  1668,   835,   565,   128,   220,   293,  1494,   406,
+     658,    87,   427,  1615,   111,   235,   646,  1618,   243,  1715,
+    1281,  1668,  1611,   486,   611,  1715,  1281,   128,   293,  1495,
+    1518,   652,  1601,   521,   939,   943,   944,  1668,    13,   424,
+    1735,  1770,  1668,    13,   140,   220,   526,   527,   529,   530,
+     531,   548,  1310,  1311,  1312,  1782,    61,    62,   125,   209,
+     282,   351,   403,   497,   584,   652,   653,   671,   707,   811,
+    1138,  1659,  1671,  1679,  1680,  1682,  1683,  1685,  1688,  1698,
+    1703,  1704,    35,    36,    61,    72,    97,    99,   109,   158,
+     163,   166,   176,   198,   200,   209,   211,   282,   315,   380,
+     407,   418,   419,   422,   423,   443,   497,   510,   546,   565,
+     630,   753,   754,  1138,  1248,  1574,  1575,  1577,  1578,  1579,
+    1699,   943,   204,   510,   584,  1248,   204,  1248,  1657,  1668,
+     565,  1524,   406,   658,   243,  1720,  1668,   483,  1504,  1508,
+     659,  1436,  1437,  1668,    32,    79,   154,   414,   436,   477,
+     538,  1816,  1327,  1668,  1659,   400,  1055,   807,  1780,  1781,
+     243,   282,  1323,  1298,  1299,  1301,  1435,     0,   156,   821,
+     414,   104,   274,   611,  1213,  1662,  1668,  1672,  1674,  1675,
+    1757,  1760,   126,   403,   611,  1242,  1243,  1244,  1245,  1246,
+    1247,   194,   246,   285,  1313,  1314,  1466,   387,   602,  1448,
+    1449,   276,   602,  1449,  1454,  1466,  1300,  1301,   130,   608,
+      17,   195,  1588,  1589,  1657,   160,  1217,  1668,   160,   914,
+     137,   152,   448,   479,  1724,   212,   914,  1672,  1668,  1657,
+     563,   230,  1487,   212,   167,  1195,  1787,  1715,  1770,  1288,
+    1289,  1657,   807,   921,   813,   185,   517,   582,  1485,  1657,
+    1485,    19,  1771,   230,  1086,   235,   212,   455,  1672,   235,
+     716,  1668,   563,  1086,  1086,   212,   235,   565,  1783,  1783,
+    1787,  1792,   807,   807,   807,  1334,   807,   807,   807,  1323,
+    1386,   807,   807,   807,   807,   807,   807,   807,   807,  1322,
+    1322,   807,  1124,   807,   807,   807,   571,   807,   807,   807,
+    1780,   807,   807,   807,   807,   807,   807,   807,   807,   807,
+    1323,   807,   807,   807,  1384,  1385,  1654,  1668,   807,   807,
+     807,   807,   807,   807,   807,   807,   807,  1323,  1124,   807,
+     807,   807,   807,   807,   807,   807,   807,   807,   807,   807,
+     807,   807,   807,   807,   807,  1124,   571,   807,   807,   807,
+     571,   807,   807,   807,    37,   219,   571,   807,  1322,  1124,
+    1124,   807,   807,   807,   807,   807,   807,   807,   807,   807,
+     807,   807,   807,   807,   807,   807,   807,   807,   807,   807,
+     807,   807,   807,  1334,  1334,  1334,   619,  1299,  1301,  1323,
+     811,  1375,  1672,  1668,   812,    18,    19,    21,   386,   389,
+     571,   647,  1321,  1328,  1329,  1667,  1668,   160,   161,   201,
+     214,   254,   267,   294,   358,  1332,    33,   141,   249,   275,
+     344,   365,   366,   441,   503,   504,   516,   721,   797,   798,
+     799,   800,   801,   802,   803,   804,  1330,  1334,    71,   388,
+     571,  1663,   259,   651,   807,   813,  1487,  1487,  1487,  1668,
+     212,  1487,  1487,   716,  1668,  1487,   563,  1487,  1487,  1487,
+     212,  1715,   830,  1592,   135,   418,  1734,   480,   480,   563,
+     568,   611,   627,   653,   653,   384,   807,  1761,   562,   377,
+    1761,    67,   510,  1761,   109,   627,  1761,   811,  1761,   377,
+     582,   812,   380,    68,   432,   813,  1672,   197,   231,  1236,
+    1668,  1662,  1822,  1323,   246,    85,   293,  1620,   194,  1714,
+    1715,   197,   315,  1574,  1612,  1668,  1284,  1675,  1283,  1715,
+     246,  1496,  1487,  1603,   315,   510,   753,  1602,  1604,   620,
+     940,   500,   945,  1734,   377,   197,   377,   582,  1771,  1319,
+    1312,   500,   653,   813,    35,   125,   160,   501,  1139,  1505,
+    1672,   194,   582,  1505,   255,   432,  1705,  1706,  1708,  1710,
+      13,   125,   364,  1673,  1676,  1743,   212,   811,  1672,    35,
+     125,  1141,  1142,  1672,   813,   125,   584,  1694,  1702,  1704,
+     812,  1695,  1505,   166,   275,   634,  1433,  1583,   807,   108,
+     167,   200,   419,   565,   586,   611,   627,  1583,    13,  1573,
+    1672,  1453,  1454,   197,   249,  1576,  1580,   198,    70,   542,
+     194,   542,   562,    70,   542,    13,    43,    94,    98,   253,
+     331,   395,   517,   559,  1525,  1526,  1527,   166,   222,   542,
+    1453,  1583,   542,   287,   157,   421,   585,   234,   235,   261,
+    1162,    73,   562,   542,   623,   945,   432,   636,  1254,  1255,
+    1256,   446,   533,  1261,  1262,  1263,  1261,  1657,  1668,  1822,
+    1715,   807,   812,  1436,   812,   807,  1438,    37,   219,  1639,
+    1663,  1815,  1815,  1815,    96,  1814,  1815,  1815,   156,   813,
+     807,    48,   156,  1301,   156,   197,   111,   156,   808,   808,
+    1313,   808,   810,  1668,  1322,   807,   138,   228,   372,  1746,
+    1750,  1751,  1758,   811,     7,   125,   138,   144,   228,   343,
+    1745,  1746,  1750,  1751,  1752,  1753,  1754,  1755,   464,   812,
+    1763,   160,   160,   160,   812,   502,   608,  1315,   146,   391,
+     811,  1464,  1465,  1467,  1672,   249,  1314,  1466,  1313,    48,
+      13,   140,  1778,  1453,   290,   372,   593,  1455,  1456,  1640,
+    1668,  1778,  1453,  1448,  1449,  1454,   231,   293,   428,  1521,
+    1522,  1518,   195,  1588,   160,   194,  1297,  1492,  1493,  1514,
+    1519,  1586,  1590,  1639,  1668,   332,   569,   595,  1188,  1675,
+    1192,  1668,  1668,   746,   784,  1672,  1668,  1190,   383,     7,
+      26,    84,   144,   237,   322,   369,   450,   629,   748,  1022,
+    1023,  1036,  1037,  1038,  1039,  1045,  1047,  1048,  1049,  1575,
+       7,    12,    14,    17,    27,    28,    58,    63,    64,    69,
+      77,    83,    84,    87,    96,   111,   125,   129,   137,   138,
+     144,   152,   158,   169,   192,   233,   235,   242,   262,   285,
+     321,   339,   343,   381,   387,   394,   403,   435,   450,   451,
+     452,   482,   538,   539,   540,   541,   546,   563,   566,   589,
+     602,   636,   639,   724,   725,   726,   748,   749,  1038,  1087,
+    1090,  1092,  1093,  1145,  1218,  1219,  1221,  1222,  1224,  1226,
+    1227,  1228,  1229,  1231,  1233,  1668,   171,  1668,   914,   532,
+    1793,  1794,  1194,  1485,   249,   812,   235,   263,   400,  1160,
+    1294,  1295,  1323,  1382,  1383,  1668,   839,   838,   176,   428,
+     812,  1267,    59,   176,   180,   194,   330,   428,  1277,  1278,
+    1279,    57,   368,   368,   447,  1772,  1330,  1668,  1668,  1668,
+     518,   193,  1668,   708,     7,  1016,  1668,  1675,  1747,  1759,
+    1743,  1668,  1668,  1086,    11,   167,   200,   419,   586,   901,
+    1786,  1794,  1800,  1802,  1803,  1808,   200,   901,  1785,  1794,
+    1800,  1803,  1808,  1783,  1323,  1323,    13,   140,  1380,  1431,
+    1380,  1380,  1380,   633,  1388,  1323,  1323,  1383,  1383,  1323,
+    1323,   140,  1380,  1431,   808,   372,   808,   808,  1323,  1323,
+    1323,  1323,  1654,   116,   117,   118,   119,   120,   223,   224,
+     225,   226,   334,   336,   337,   338,   345,   426,   489,   490,
+     631,   648,   649,  1426,  1427,  1323,  1382,   112,   115,   575,
+     578,  1428,   140,  1376,  1323,  1323,  1323,  1323,  1426,  1323,
+    1383,  1385,    10,   812,   813,   140,  1380,  1323,  1323,   140,
+    1380,  1323,  1323,  1383,  1383,  1383,  1323,  1383,  1327,  1323,
+    1323,  1323,  1323,  1323,  1323,   808,  1323,  1380,  1380,  1323,
+    1323,   140,  1380,  1323,  1427,  1427,  1323,    46,   268,   583,
+    1323,  1323,   808,  1655,  1656,  1668,  1380,  1380,  1323,  1323,
+    1323,  1380,  1380,  1383,   808,   808,  1323,  1323,  1323,  1323,
+    1323,   811,  1352,  1353,  1640,  1647,  1668,   808,   808,   808,
+    1334,   140,  1380,  1313,   808,   812,   209,   282,   497,  1700,
+     501,  1323,  1320,  1667,  1668,  1323,  1323,  1323,   179,   371,
+     588,   604,  1330,    13,    20,  1325,  1333,  1327,  1327,   807,
+    1780,  1334,  1327,  1327,  1327,  1327,   275,   666,  1326,  1327,
+    1327,   245,  1327,   245,  1327,  1327,  1327,  1327,  1327,    33,
+     249,   275,   441,  1672,  1334,  1663,  1663,  1323,  1345,  1346,
+    1347,   801,  1668,  1668,   914,  1668,   377,  1668,   914,  1672,
+     708,  1045,  1047,  1489,  1490,  1491,   914,  1668,  1675,  1742,
+    1485,  1743,  1668,  1487,   614,   831,    35,   158,   162,   202,
+     222,   287,   382,   418,   442,   467,   511,   542,  1593,  1597,
+    1598,  1715,    86,   811,   952,   953,   954,   955,  1668,  1732,
+     562,  1668,  1762,  1675,  1672,   200,   419,   565,  1733,  1742,
+    1736,    21,  1429,  1430,   186,   362,  1668,  1726,  1668,  1822,
+    1496,   515,   812,    50,   282,  1619,    30,  1657,  1716,  1717,
+    1485,   811,   828,  1662,   287,   812,   582,  1285,  1286,  1657,
+    1485,  1657,  1668,  1607,  1605,  1606,   812,  1663,    56,    66,
+      76,    90,    91,    92,   106,   333,   350,   488,   550,   567,
+     946,   948,   812,  1730,  1675,  1742,  1733,   486,  1773,  1772,
+     197,  1304,  1305,  1466,    13,   364,  1743,  1668,    71,  1144,
+    1323,  1675,   732,   571,  1665,   273,   379,   642,   812,  1709,
+     812,  1707,   657,  1690,   811,   812,  1668,   209,   282,   497,
+     652,   671,  1701,  1505,  1668,  1705,  1695,  1505,  1696,  1697,
+    1698,  1703,    13,    35,   125,   377,   483,   708,  1323,  1712,
+     249,  1581,  1663,  1323,   801,  1086,   914,   914,   914,  1657,
+     914,  1675,  1657,   287,   349,   542,  1583,  1668,   914,  1583,
+    1675,  1576,   914,  1583,   252,   560,   181,   194,  1528,   812,
+    1581,  1576,   194,   889,  1576,  1580,  1580,  1576,  1583,  1583,
+     379,   642,    88,   812,  1251,   812,   889,   125,  1323,  1509,
+    1510,  1511,  1508,  1437,  1439,  1668,    21,   812,   378,  1818,
+     558,  1819,   645,   258,   470,  1817,  1668,  1323,   277,   280,
+     429,  1056,  1057,  1675,   136,   808,   156,   822,   808,   728,
+      48,   786,   455,  1203,  1203,   787,   788,   790,  1672,  1758,
+     653,   728,  1758,   636,  1758,   455,   727,  1744,   455,  1744,
+    1744,   455,  1744,  1744,    65,   256,   364,   534,   552,   643,
+    1739,  1740,  1675,  1757,   636,  1210,  1660,  1662,  1660,  1660,
+    1244,   666,   667,   669,  1316,  1317,  1318,   571,  1664,  1664,
+    1672,   812,   502,  1323,  1450,  1652,  1301,  1302,   376,   812,
+    1301,  1302,  1453,  1453,   197,  1486,  1658,  1668,  1521,  1236,
+    1672,    87,   432,  1081,  1082,  1085,  1092,  1093,  1094,  1145,
+     915,  1668,  1668,   194,   368,   315,     7,   915,   807,   110,
+    1033,  1505,  1506,  1506,  1033,  1506,  1506,   582,  1506,   812,
+    1089,   158,    74,    89,   199,   400,   518,  1102,  1104,  1160,
+    1235,  1506,    64,    89,   235,  1235,   400,  1506,  1506,  1235,
+    1506,   400,   400,  1506,  1506,  1506,  1506,   582,   136,  1506,
+     261,   400,   563,    64,    89,   193,   400,   417,  1160,  1235,
+     261,  1506,   400,   400,   563,   136,  1506,  1506,  1506,  1506,
+    1506,  1235,   400,    48,  1506,  1506,   400,    21,    74,   160,
+     582,  1160,  1239,   400,   400,  1506,   584,  1506,  1506,  1506,
+     139,   331,  1506,  1506,   400,  1506,   618,   618,  1506,  1506,
+    1506,  1090,    71,  1138,   449,  1055,  1220,   812,   812,   500,
+     709,  1828,  1197,   491,   627,  1794,   144,   608,  1274,   125,
+    1290,  1668,  1289,  1657,   807,   807,  1295,   808,   812,   457,
+     458,   459,   460,   461,   462,   463,   840,   841,   232,   295,
+     296,   297,   298,   299,   300,   301,   302,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,   312,   313,   314,   316,
+     317,   444,   445,   710,   711,   731,   733,   734,   735,   736,
+     737,   740,   750,   755,   756,   757,   758,   759,   760,   761,
+     762,   763,   764,   765,   766,   767,   768,   769,   770,   771,
+     772,   773,   774,   775,   776,   777,   778,   779,   780,   781,
+     782,   793,   853,   854,   855,   856,   857,   858,   859,   860,
+     861,   862,   863,   864,   865,   866,   867,   868,   869,   870,
+     871,   872,   873,   874,   875,   876,   877,   878,   879,   886,
+     887,   888,  1657,   609,  1278,    57,   447,   171,   894,   377,
+       7,   716,   111,   377,  1086,  1033,   613,  1017,     7,    19,
+    1748,  1749,  1750,  1751,  1752,  1753,  1754,  1755,   125,   812,
+     897,   591,   591,   614,  1175,  1176,  1657,   200,  1086,   914,
+    1668,   914,   914,  1794,   812,   808,  1380,   808,  1323,   808,
+     808,   808,  1323,   150,   633,  1387,    21,    25,   808,   614,
+     808,   808,   808,   614,   812,  1383,   808,   801,   808,   812,
+     812,   808,   808,   808,   197,   812,   808,   812,  1383,   808,
+     812,   812,   812,   800,   812,   808,   808,   807,  1654,  1668,
+    1380,   808,   808,   808,  1380,   808,   812,   808,   808,   808,
+     808,   812,   808,   249,   808,   812,   812,   808,   812,   812,
+     808,   808,   808,   812,   197,   812,  1380,   808,   808,   812,
+     812,   812,   808,   197,  1323,   197,  1323,   197,  1323,   197,
+     808,   812,   808,   808,   808,   808,   812,    21,   808,   812,
+     808,   812,   808,   808,   689,  1358,  1358,   808,   812,  1351,
+     808,  1351,   812,  1672,   808,  1358,  1358,  1358,   812,  1380,
+     808,  1383,   813,   813,   813,  1672,  1323,   817,   179,   371,
+     588,   604,  1780,    19,  1323,   165,  1327,   807,  1323,  1323,
+    1327,   807,  1780,  1334,  1327,  1321,   808,   812,   807,   813,
+     813,  1657,  1489,  1487,  1089,  1024,  1025,  1026,  1045,   812,
+      52,   469,  1237,   192,  1834,  1485,   811,   832,   833,   287,
+     287,   287,   287,   287,   287,   812,  1485,  1599,   115,   575,
+     578,   947,   957,  1374,  1645,  1654,  1672,   812,   160,   377,
+     808,   812,   582,   801,  1668,  1677,  1741,   636,  1737,  1668,
+     160,   186,   201,   214,   266,   267,   294,   362,   416,  1727,
+    1728,  1432,  1433,  1657,  1662,  1662,  1292,  1293,  1657,   236,
+    1430,   812,  1672,    31,   582,  1613,  1675,  1675,   812,   582,
+     176,   428,   612,  1269,  1270,  1271,   400,  1397,  1398,   582,
+    1609,    13,  1608,  1608,  1604,   812,   160,   210,   377,   197,
+    1741,  1668,   145,   699,   719,   807,   816,  1306,  1307,  1389,
+    1391,  1399,  1400,  1401,  1402,  1403,  1404,  1405,  1657,  1780,
+    1432,  1304,   582,   582,   582,    35,  1143,  1672,   582,  1505,
+    1203,  1203,   432,   453,   495,  1711,  1708,  1706,  1743,  1672,
+    1676,   194,   813,   813,   813,   813,   813,  1704,  1323,  1712,
+     812,  1702,  1662,   197,  1582,   808,  1668,   614,  1583,   427,
+    1453,  1527,  1582,  1583,    60,  1583,  1657,  1657,  1583,   513,
+    1256,   607,  1264,  1263,   808,   812,   808,   812,  1780,  1639,
+     404,   194,   813,   808,    73,   807,    73,   807,   401,  1059,
+     216,   263,   814,  1506,   403,   732,  1665,  1665,  1744,  1744,
+     789,   789,  1749,  1752,    13,   364,  1743,   403,   144,  1672,
+    1749,  1665,   103,  1665,  1665,   571,   571,   571,    19,  1738,
+     319,   320,   324,   325,  1211,  1212,     5,   403,   738,   739,
+    1207,  1208,  1209,  1486,   668,  1317,  1138,  1140,  1465,   341,
+      22,   131,  1451,  1452,   812,  1456,  1456,  1486,  1657,  1668,
+     197,   812,   813,  1520,  1307,   122,   188,   219,   290,   372,
+     593,  1459,  1462,  1463,   379,  1082,    84,    77,    93,   265,
+     342,   368,   430,   532,   917,   919,    60,   477,   263,   597,
+    1035,   108,   221,   393,   403,   410,   514,   611,   899,   900,
+    1662,  1021,  1022,   219,   290,   372,   593,  1050,  1461,  1462,
+    1659,  1662,  1021,  1050,  1050,  1668,  1662,  1835,  1023,  1506,
+    1183,  1668,  1160,  1161,  1281,  1161,    64,   193,   417,   603,
+    1103,  1159,  1174,  1183,  1668,   807,  1668,   125,  1232,  1668,
+    1668,  1668,  1668,  1668,  1281,   122,   188,   290,   372,   593,
+    1460,  1460,  1668,   122,   188,   219,   290,   372,   593,  1458,
+      13,  1225,  1425,  1668,  1281,  1662,  1662,  1662,  1662,  1138,
+    1506,  1458,  1225,  1668,  1668,   263,  1425,   263,  1668,  1668,
+    1672,  1668,  1225,  1506,   186,   266,   368,  1096,  1460,   125,
+    1234,  1668,  1460,  1460,  1668,  1281,  1446,  1447,  1655,   125,
+    1091,  1458,  1662,  1281,  1668,  1668,  1657,  1281,  1281,    80,
+      82,   125,   148,   187,   439,  1095,  1091,  1091,   125,  1458,
+    1668,  1458,  1225,   807,   371,  1672,  1835,  1835,  1506,  1506,
+     402,     7,   144,  1087,  1228,  1229,  1222,  1226,  1229,   717,
+     718,  1034,  1506,   706,  1832,   377,   909,  1214,   127,   248,
+    1657,   672,   672,  1225,   417,  1421,  1422,  1423,  1668,   249,
+    1323,   160,   160,   160,   160,   160,   160,   160,   812,   889,
      160,   160,   160,   160,   160,   160,   160,   160,   160,   160,
+     812,   889,   160,   160,   160,   160,   160,   160,   160,   160,
      160,   160,   160,   160,   160,   160,   160,   160,   160,   160,
-    1074,  1075,  1076,  1648,  1026,   708,   641,  1648,  1452,   286,
-      77,   177,   184,   363,  1009,  1010,  1011,  1027,  1028,  1030,
-    1031,  1034,  1035,  1036,  1037,  1038,  1039,  1040,  1024,    48,
-     636,   653,  1737,  1743,  1497,    47,   216,   485,  1169,  1169,
-     377,    21,   231,   275,   455,   798,  1042,  1043,  1044,  1045,
-    1046,  1079,  1081,  1290,  1292,  1492,  1613,  1659,   905,   798,
-     472,  1789,     9,    31,  1005,   245,  1314,   799,  1348,  1349,
-    1348,  1348,  1348,   574,  1314,  1314,   154,    35,    62,   112,
-     115,   123,   142,   189,   205,   260,   279,   346,   347,   348,
-     353,   356,   408,   409,   434,   508,   578,   606,   649,  1104,
-    1108,  1372,   282,   578,  1130,  1130,  1372,   799,  1348,   799,
-     245,   245,  1314,  1314,  1314,   387,  1369,  1314,  1314,  1314,
-    1314,  1314,  1318,   799,  1348,   799,  1348,  1314,  1314,  1314,
-    1314,  1314,  1314,  1374,  1348,  1348,   245,  1314,  1314,  1314,
-     799,  1348,  1314,  1314,  1314,  1314,   197,  1314,   197,  1314,
-     197,  1314,  1314,  1348,  1348,  1314,    35,    62,  1449,  1371,
-    1348,   798,  1350,  1351,  1352,  1659,   231,   693,  1346,  1343,
-     799,  1346,   799,  1325,  1349,   596,  1629,   799,  1348,   799,
-     804,  1175,  1316,   799,   803,  1325,  1325,  1417,  1417,    19,
-    1314,   165,  1338,  1373,   792,  1659,  1659,  1221,  1222,  1224,
-    1452,  1482,  1080,  1666,  1228,  1663,   803,   880,  1589,  1585,
-     946,   949,   950,   945,   373,   484,   947,  1724,  1659,  1733,
-     804,   804,   582,   654,  1423,   798,  1444,  1388,   803,  1285,
-    1286,  1655,   293,   432,   642,  1709,  1708,  1314,  1653,   582,
-    1277,  1648,  1262,   798,   500,   619,   620,   798,  1488,  1489,
-    1491,  1492,  1493,  1452,   880,   880,   939,   938,   384,  1724,
-    1733,   197,   798,  1760,  1298,  1382,  1391,  1392,  1393,  1394,
-     730,   803,   100,   238,   258,   271,   354,   476,   548,  1383,
-    1384,  1385,  1388,  1421,   212,  1434,  1423,  1734,  1734,  1734,
-     732,  1656,  1656,   727,  1735,  1735,    78,   594,   432,  1450,
-    1683,  1684,  1496,  1688,  1451,  1444,   163,   630,  1733,   372,
-    1444,  1651,  1567,  1567,   523,   524,   525,   879,  1256,   611,
-    1248,  1502,  1659,   803,   335,   156,   798,  1318,   798,  1318,
-    1450,   554,  1051,   798,    12,  1049,  1449,  1655,  1194,   403,
-     455,   403,  1735,    21,    48,  1730,  1449,  1449,  1449,  1449,
-    1203,   285,   605,   174,   464,   703,   704,   696,  1450,  1450,
-      77,   747,  1197,  1200,  1130,    73,  1614,  1643,   614,  1421,
-     804,  1298,  1649,   792,  1659,   500,  1497,  1497,  1653,   532,
-     532,   532,   532,   532,   491,  1659,   377,  1653,  1021,  1022,
-    1023,  1027,  1036,  1038,  1653,  1653,  1653,  1653,  1449,  1653,
-    1653,   799,   803,  1663,  1174,   401,   798,  1174,   798,   263,
-     263,  1152,   366,  1096,  1097,  1098,  1165,   798,   614,   591,
-    1089,  1090,  1091,  1093,  1659,    34,    35,    40,    42,    44,
-      45,    62,   112,   115,   123,   159,   187,   189,   205,   206,
-     247,   260,   279,   288,   289,   291,   327,   328,   329,   346,
-     347,   348,   353,   356,   374,   375,   408,   409,   496,   500,
-     512,   572,   575,   578,   579,   580,   581,   621,   622,   649,
-    1099,  1102,  1103,  1104,  1105,  1106,  1107,  1108,  1110,  1098,
-    1098,   655,   656,  1168,   144,   500,  1216,  1659,  1268,   803,
-    1450,   125,  1130,  1653,   563,  1659,  1228,   636,   563,  1653,
-     372,  1099,  1216,   803,  1442,  1216,   582,   582,  1416,  1216,
-    1590,  1134,  1130,  1015,   372,  1809,  1810,  1497,   137,   152,
-    1813,    81,   487,   450,  1206,  1429,   377,   377,   799,   799,
-     803,  1281,   798,   833,   833,   798,   838,   838,   798,   841,
-     841,   798,   836,   832,   798,  1651,  1449,  1651,   371,   873,
-    1665,  1449,   377,   741,   742,   874,  1450,   282,   571,   742,
-     875,   870,  1449,  1651,  1651,  1651,  1651,  1449,  1449,  1449,
-    1449,  1449,  1651,  1651,  1651,  1651,  1651,  1651,  1449,  1651,
-     371,   876,  1651,  1651,  1651,  1449,  1637,  1653,  1449,  1651,
-    1451,  1076,   798,   438,   598,  1018,  1019,  1020,  1027,  1032,
-    1033,  1034,  1035,  1036,  1038,  1452,  1663,   798,   887,   212,
-    1497,  1497,  1497,  1497,  1080,  1015,   732,  1656,  1663,  1734,
-    1201,   611,   708,  1807,  1648,  1492,  1648,   275,  1089,  1044,
-    1043,  1080,  1304,  1045,   472,   893,  1784,   123,   247,   434,
-     549,  1088,   798,   130,   241,   608,  1006,  1314,   799,  1348,
-    1314,   574,   798,  1119,  1120,  1120,   798,  1114,   798,  1112,
-    1113,  1119,   413,  1109,  1111,  1119,    62,   247,  1114,   247,
-    1120,   720,  1326,    21,   751,   799,   799,   799,  1348,  1348,
-    1314,  1314,   799,   799,   803,   799,    48,   494,  1368,   803,
-     803,   799,   803,   799,   249,  1333,  1334,  1348,  1348,   799,
-     799,   799,   799,   803,   799,   799,  1314,   799,   194,   799,
-     799,   803,  1348,   799,   803,   803,   799,  1314,   799,  1314,
-     799,  1314,   799,   799,   799,   798,  1141,  1141,   803,   799,
-    1351,  1353,  1354,   687,   687,  1349,   803,  1345,  1346,  1349,
-    1346,   799,   743,  1329,  1348,  1659,  1374,   799,  1316,   799,
-     803,  1325,   799,  1224,  1222,  1017,   824,   194,   636,  1586,
-     160,   803,  1732,   636,  1745,   792,   792,  1659,  1733,   384,
-    1444,  1501,   500,  1488,  1489,  1284,  1648,  1286,   231,  1287,
-    1612,  1613,   642,   282,  1666,  1415,  1416,  1507,  1508,  1646,
-     799,  1490,  1641,  1642,  1646,  1659,   798,  1494,  1498,   160,
-     197,  1732,  1733,  1314,  1421,   803,   799,   799,   799,   799,
-     799,  1380,  1381,  1382,  1390,  1380,   258,   258,   390,  1387,
-     238,   271,   476,  1386,  1387,  1390,  1380,  1380,  1421,  1429,
-      48,   217,  1425,  1434,  1194,  1194,   103,  1080,  1703,   880,
-    1423,  1574,   160,   160,   803,   160,   403,  1249,  1449,  1053,
-    1659,   799,  1053,   799,    48,   798,  1055,  1318,   160,   798,
-     228,  1735,  1194,  1656,   455,  1735,   219,  1653,  1657,   732,
-    1656,   125,   245,   360,   103,   125,  1450,   245,  1654,  1654,
-     153,   164,   385,   570,  1615,  1616,   278,  1617,  1298,  1388,
-    1659,  1423,   804,  1511,  1507,  1082,  1653,   111,   111,   127,
-     248,   368,   162,  1080,   891,   798,  1450,   400,  1056,  1057,
-     798,  1314,  1174,   729,   798,   798,  1171,  1172,  1173,  1659,
-    1169,  1169,   799,   803,  1099,  1119,  1119,  1120,    23,    35,
-      49,   600,   625,  1119,  1129,  1137,  1138,  1139,  1114,   798,
-    1139,    62,   621,  1105,  1139,  1139,    62,   622,   622,   625,
-     798,  1120,  1114,  1114,  1139,  1119,  1120,   440,  1092,  1144,
-      27,    71,    75,    77,   125,   366,   371,   377,   417,   496,
-     546,   603,   705,   748,   749,  1095,  1098,  1122,  1123,  1124,
-    1135,  1143,  1168,  1321,    35,  1119,  1140,  1119,  1119,  1120,
-     798,  1113,  1121,  1112,   125,   125,  1168,  1099,  1659,  1135,
-    1135,   565,     9,   186,  1229,  1438,  1659,  1659,   246,  1260,
-     799,   790,  1080,  1811,  1814,   366,   415,    25,   168,   894,
-     582,   137,   152,   896,  1775,  1416,  1416,  1413,   799,   834,
-     835,  1659,   799,   839,   840,  1659,  1668,   799,   842,   843,
-    1651,  1652,   798,   799,   837,   871,   872,  1449,  1172,  1497,
-    1497,  1080,   887,   383,  1172,   352,   713,   714,   715,  1659,
-    1653,  1041,  1041,  1450,  1011,   403,    21,    48,  1198,  1808,
-     798,  1648,   799,  1081,  1088,   377,   913,   914,   915,  1659,
-     515,  1790,   377,  1417,  1314,   122,   290,   372,   593,  1139,
-     372,   372,   799,  1372,   245,  1640,  1417,  1417,  1314,  1370,
-    1643,  1630,   799,  1314,  1314,  1374,    44,   354,   799,   636,
-    1335,  1314,  1417,  1314,  1314,  1314,  1314,   799,   799,   799,
-    1450,   799,   799,  1449,  1348,   799,   400,  1355,  1314,  1349,
-    1349,   197,  1347,  1372,   125,   162,   371,  1401,  1403,  1404,
-    1405,   799,  1374,  1587,   432,    56,    66,    76,    90,    91,
-      92,   106,   333,   350,   471,   488,   550,   567,   951,   950,
-     582,   210,   636,  1744,   799,  1507,    21,  1503,   377,  1504,
-    1287,   269,   246,   799,   803,  1496,  1491,  1492,   799,   803,
-     804,  1500,   803,   938,  1733,   197,   803,  1429,  1380,   808,
-     258,  1387,  1387,   258,   258,   377,   614,   377,   614,   192,
-     231,   613,  1407,  1408,  1409,  1410,  1411,  1314,  1435,  1644,
-    1314,   697,  1431,  1425,  1735,  1735,   403,  1450,  1653,  1653,
-     879,  1653,   160,   126,  1250,   799,   803,   799,  1048,  1056,
-     799,  1450,  1052,  1053,    48,  1735,  1735,  1656,  1735,   403,
-     455,  1735,  1450,   125,   722,   125,  1450,    48,    48,   153,
-      48,  1616,   536,   570,  1618,  1619,  1423,  1423,  1423,   477,
-    1023,  1172,  1659,   799,   803,  1172,   799,   798,  1172,  1314,
-     799,   803,   798,  1442,  1090,  1092,    35,    23,   600,  1129,
-      35,  1139,  1130,  1176,  1630,  1139,   625,  1176,  1139,   508,
-     606,   650,  1116,  1117,  1118,  1648,  1229,  1134,   125,   148,
-     187,  1125,  1653,   115,   575,   578,   790,   791,   798,  1127,
-    1128,  1632,  1633,  1634,  1635,   608,   125,   125,   139,   331,
-    1126,   263,  1452,  1497,  1497,  1094,    71,  1124,   203,  1100,
-     263,   371,   723,  1140,  1139,  1140,  1116,   372,  1116,  1116,
-     798,  1633,  1229,  1648,  1659,   798,   372,  1810,   415,  1314,
-    1314,   377,   900,   905,   377,    77,   901,    21,   636,  1264,
-     799,   803,   799,   803,   804,   799,   803,   835,   799,   803,
-     799,   803,   799,  1041,  1041,  1020,   798,   799,  1651,  1651,
-    1651,  1651,  1657,   732,  1656,  1197,  1812,  1172,   799,  1042,
-     515,   487,   799,   803,  1102,  1653,   239,   249,   392,   916,
-     917,   918,   919,  1648,   799,   799,   799,   799,   799,   799,
-     803,  1326,  1654,   799,   799,   799,   803,  1348,   799,   803,
-     799,   341,   265,   427,   799,   799,   799,   799,   799,   799,
-    1142,   803,    48,   387,  1356,   186,   266,  1346,  1632,   799,
-    1404,  1405,   377,   799,   175,   285,  1733,   384,   210,    21,
-    1747,  1423,  1503,  1659,  1504,   147,   565,  1508,  1502,  1491,
-    1492,  1641,  1659,   799,  1498,  1733,  1629,   799,   258,   258,
-    1314,   798,  1314,   798,  1151,  1151,  1408,   638,   803,  1436,
-    1351,  1432,  1433,  1431,  1653,   160,   405,  1251,  1659,   216,
-     263,   799,   799,  1653,  1735,  1735,  1656,   120,   120,  1630,
-    1630,    48,  1630,    48,    48,  1619,  1439,  1439,   377,   799,
-     619,  1058,  1057,   799,  1170,  1171,   799,   799,    77,   262,
-     748,   749,  1161,  1162,  1163,  1164,  1167,  1168,  1173,   372,
-    1130,  1140,   799,   803,   799,  1118,   798,  1145,  1637,  1637,
-    1314,  1127,   620,  1815,  1815,  1134,    15,    21,  1314,  1214,
-    1215,  1056,  1417,   510,  1653,   143,  1207,  1492,  1776,   372,
-     835,   840,  1659,   843,   803,   798,   872,   636,  1155,  1156,
-    1157,  1164,   890,  1158,  1159,  1160,  1164,   228,   403,  1813,
-     799,  1653,   894,  1785,   915,  1135,   799,   803,  1659,   194,
-     372,   799,    21,  1643,  1314,   341,   173,   799,  1449,  1435,
-      48,   429,   481,   681,  1357,  1363,  1349,   377,   162,   698,
-    1744,   384,  1666,  1444,  1504,  1429,   263,  1648,    73,  1397,
-    1415,  1415,   194,  1406,  1406,  1644,    21,   803,  1653,   160,
-    1243,   798,  1049,   111,   464,  1805,  1806,  1735,  1630,  1630,
-    1630,   276,  1448,  1448,   162,  1155,   249,   272,    77,   111,
-     235,   321,   339,   363,   563,  1069,  1070,  1071,  1566,  1158,
-     799,   803,  1161,  1442,  1653,  1497,  1497,  1497,  1163,   799,
-    1139,  1630,  1139,  1146,  1659,   318,  1147,   799,   798,   799,
-     799,   895,   902,   903,   636,  1777,   673,   835,   835,   397,
-    1221,  1157,   799,  1221,  1160,    48,  1161,   899,   900,   472,
-    1791,   918,  1102,   149,   799,   112,   799,   799,  1441,    33,
-     103,   245,   696,  1358,  1359,  1360,  1631,  1637,  1747,   636,
-    1746,   608,  1388,   798,   799,   799,   799,   212,   258,   387,
-     798,   798,  1352,  1433,  1653,   880,  1318,   798,   136,   368,
-     534,  1447,   798,  1060,  1062,   573,  1497,   136,   136,  1497,
-    1497,  1497,  1497,   798,  1066,  1071,   158,  1144,  1171,  1449,
-    1815,  1815,  1442,   799,   803,   198,   399,   509,   377,  1148,
-    1314,   537,   897,    54,    68,   182,   230,   257,   270,   380,
-     473,   904,   955,   957,   958,   959,   961,   962,   963,   964,
-     965,   966,   968,   976,   977,   980,   991,   994,   996,   997,
-    1650,  1661,  1672,  1673,  1674,  1677,    53,    64,   282,   799,
-     803,  1650,  1452,  1221,   896,  1102,   907,  1135,   483,  1114,
-     245,   696,  1359,  1361,  1631,  1637,   483,  1314,   691,   678,
-    1362,   691,   691,   653,  1507,  1131,   700,  1398,  1399,  1659,
-    1421,    48,    48,  1412,  1414,   799,  1053,  1497,   534,   798,
-    1061,  1062,  1063,   326,  1059,  1062,  1653,  1497,  1497,  1452,
-    1452,  1450,  1659,   554,  1067,  1068,  1497,  1659,   130,   608,
-     799,  1314,   155,   898,   978,   981,  1659,   197,   362,   969,
-     956,  1661,  1661,  1659,   960,   815,   292,   454,   635,  1000,
-      32,   998,   805,    64,   384,    64,   835,   901,  1135,   134,
-     908,   909,  1321,  1792,   191,   412,  1778,  1779,   799,  1314,
-     680,    19,   680,   680,  1417,   103,   212,   368,   695,    13,
-     125,   364,  1734,   481,  1620,   702,   799,   803,   194,  1102,
-     799,   799,   553,  1054,   799,  1655,   799,   803,   326,  1064,
-    1065,  1318,  1653,  1653,  1663,   799,   803,  1663,    52,   368,
-     469,   500,  1149,  1149,   547,   628,  1101,  1314,  1314,   633,
-     983,   987,   197,  1659,   971,   972,  1314,   921,   954,   955,
-     957,   959,   961,   963,   964,   965,   966,   968,   976,   991,
-     994,   996,   921,  1001,   999,   992,   995,   384,   384,   799,
-     143,  1786,   134,   954,  1663,  1781,  1417,  1361,   691,   483,
-     688,  1681,   228,  1614,  1629,  1399,   701,  1135,  1450,  1054,
-    1806,  1062,   799,   803,  1069,  1068,     6,   125,   371,   377,
-     377,  1122,   979,   988,   150,   987,   990,   246,   154,  1314,
-     154,   954,   801,   607,  1314,   922,  1000,   998,   902,   907,
-     954,   680,    48,  1617,  1397,   171,  1400,  1065,   608,   130,
-     633,   982,   984,  1314,   921,   154,   967,   230,   973,   292,
-     801,  1003,  1002,   124,   920,   923,   993,  1661,   993,  1787,
-    1630,   231,  1621,   702,  1149,  1149,   985,   984,   990,   989,
-      54,   970,  1659,   574,  1314,   143,    95,   172,   926,   952,
-    1659,   154,   954,   801,   954,   372,   798,  1623,  1629,  1314,
-     154,   574,   803,   921,  1004,   921,   215,   803,  1102,    86,
-     105,   801,   278,   481,  1622,   799,   802,  1624,  1625,  1646,
-     500,  1626,  1401,  1402,  1404,   986,    54,   921,  1659,   974,
-     154,   154,   194,  1659,  1135,   194,   194,  1663,   799,   803,
-    1627,  1628,  1646,  1403,  1405,   574,   150,   151,   975,   454,
-     635,   924,   125,   953,   929,   930,  1449,   925,  1625,   803,
-    1496,   377,   921,   921,   971,   520,   522,   927,   928,   929,
-     932,  1321,  1659,  1314,  1288,  1628,  1502,   803,   954,   196,
-     928
+     160,   160,   160,   160,   160,   160,   160,   160,   160,  1083,
+    1084,  1085,  1657,  1035,   708,   641,  1657,  1461,   286,    77,
+     177,   184,   363,  1018,  1019,  1020,  1036,  1037,  1039,  1040,
+    1043,  1044,  1045,  1046,  1047,  1048,  1049,  1033,  1749,  1748,
+     791,  1756,   653,  1747,  1763,  1506,    47,   216,   485,  1178,
+    1178,   377,    21,   231,   275,   455,   807,  1051,  1052,  1053,
+    1054,  1055,  1088,  1090,  1299,  1301,  1501,  1622,  1668,   914,
+     807,   472,  1809,     9,    31,  1014,   245,  1323,   808,  1357,
+    1358,  1357,  1357,  1357,   574,  1323,  1323,   154,    35,    62,
+     112,   115,   123,   142,   189,   205,   260,   279,   346,   347,
+     348,   353,   356,   408,   409,   434,   508,   578,   606,   649,
+    1113,  1117,  1381,   282,   578,  1139,  1139,  1381,   808,  1357,
+     808,   245,   245,  1323,  1323,  1323,   387,  1378,  1323,  1323,
+    1323,  1323,  1323,  1327,   808,  1357,   808,  1357,  1323,  1323,
+    1323,  1323,  1323,  1323,  1383,  1357,  1357,   245,  1323,  1323,
+    1323,   808,  1357,  1323,  1323,  1323,  1323,   197,  1323,   197,
+    1323,   197,  1323,  1323,  1357,  1357,  1323,    35,    62,  1458,
+    1380,  1357,   807,  1359,  1360,  1361,  1668,   231,   693,  1355,
+    1352,   808,  1355,   808,  1334,  1358,   596,  1638,   808,  1357,
+     808,   813,  1184,  1325,   808,   812,  1334,  1334,  1426,  1426,
+      19,  1323,   165,  1347,  1382,   801,  1668,  1668,  1230,  1231,
+    1233,  1461,  1491,  1089,  1675,  1237,  1672,   812,   889,  1598,
+    1594,   955,   958,   959,   954,   373,   484,   956,  1733,  1668,
+    1742,   813,   813,   582,   654,  1432,   807,  1453,  1397,   812,
+    1294,  1295,  1664,   293,   432,   642,  1718,  1717,  1323,  1662,
+     582,  1286,  1657,  1271,   807,   500,   619,   620,   807,  1497,
+    1498,  1500,  1501,  1502,  1461,   889,   889,   948,   947,   384,
+    1733,  1742,   197,   807,  1780,  1307,  1391,  1400,  1401,  1402,
+    1403,   730,   812,   100,   238,   258,   271,   354,   476,   548,
+    1392,  1393,  1394,  1397,  1430,   212,  1443,  1432,  1743,  1743,
+    1743,   732,  1665,  1744,  1744,    78,   594,   432,  1459,  1692,
+    1693,  1505,  1697,  1460,  1453,   163,   630,  1742,   372,  1453,
+    1660,  1576,  1576,   523,   524,   525,   888,  1265,   611,  1257,
+    1511,  1668,   812,   335,   156,   807,  1327,   807,  1327,  1459,
+     554,  1060,   807,    12,  1058,  1458,  1664,   403,   500,     7,
+    1758,    21,    48,   343,  1744,   403,  1744,  1744,  1739,  1458,
+    1458,  1458,  1458,  1212,   285,   605,   174,   464,   703,   704,
+     696,  1459,  1459,    77,   747,  1206,  1209,  1139,    73,  1623,
+    1652,   614,  1430,   813,  1307,  1658,   801,  1668,   500,  1506,
+    1506,  1662,   532,   532,   532,   532,   532,   491,  1668,   377,
+    1662,  1030,  1031,  1032,  1036,  1045,  1047,  1662,  1662,  1662,
+    1662,  1458,  1662,  1662,   808,   812,  1672,  1183,   401,   807,
+    1183,   807,   263,   263,  1161,   366,  1105,  1106,  1107,  1174,
+     807,   614,   591,  1098,  1099,  1100,  1102,  1668,    34,    35,
+      40,    42,    44,    45,    62,   112,   115,   123,   159,   187,
+     189,   205,   206,   247,   260,   279,   288,   289,   291,   327,
+     328,   329,   346,   347,   348,   353,   356,   374,   375,   408,
+     409,   496,   500,   512,   572,   575,   578,   579,   580,   581,
+     621,   622,   649,  1108,  1111,  1112,  1113,  1114,  1115,  1116,
+    1117,  1119,  1107,  1107,   655,   656,  1177,   144,   500,  1225,
+    1668,  1277,   812,  1459,   125,  1139,  1662,   563,  1668,  1237,
+     636,   563,  1662,  1108,  1225,   812,  1451,  1225,   582,   582,
+    1425,  1225,  1599,  1143,  1139,  1024,   372,  1829,  1830,  1506,
+     137,   152,  1833,    81,   487,   450,  1215,  1438,   377,   377,
+     808,   808,   812,  1290,   807,   842,   842,   807,   847,   847,
+     807,   850,   850,   807,   845,   841,   807,  1660,  1458,  1660,
+     371,   882,  1674,  1458,   377,   741,   742,   883,  1459,   282,
+     571,   742,   884,  1459,   879,  1458,  1660,  1660,  1660,  1660,
+    1458,  1458,  1458,  1458,  1458,  1660,  1660,  1660,  1660,  1660,
+    1660,  1458,  1660,   371,   885,  1660,  1660,  1660,  1458,  1646,
+    1662,  1458,  1660,  1460,  1085,   807,   438,   598,  1027,  1028,
+    1029,  1036,  1041,  1042,  1043,  1044,  1045,  1047,  1461,  1672,
+     807,   896,   212,  1506,  1506,  1506,  1506,  1089,  1024,    19,
+     785,  1743,  1210,   611,   708,  1827,  1657,  1501,  1657,   275,
+    1098,  1053,  1052,  1089,  1313,  1054,   472,   902,  1804,   123,
+     247,   434,   549,  1097,   807,   130,   241,   608,  1015,  1323,
+     808,  1357,  1323,   574,   807,  1128,  1129,  1129,   807,  1123,
+     807,  1121,  1122,  1128,   413,  1118,  1120,  1128,    62,   247,
+    1123,   247,  1129,   720,  1335,    21,   751,   808,   808,   808,
+    1357,  1357,  1323,  1323,   808,   808,   812,   808,    48,   494,
+    1377,   812,   812,   808,   812,   808,   249,  1342,  1343,  1357,
+    1357,   808,   808,   808,   808,   812,   808,   808,  1323,   808,
+     194,   808,   808,   812,  1357,   808,   812,   812,   808,  1323,
+     808,  1323,   808,  1323,   808,   808,   808,   807,  1150,  1150,
+     812,   808,  1360,  1362,  1363,   687,   687,  1358,   812,  1354,
+    1355,  1358,  1355,   808,   743,  1338,  1357,  1668,  1383,   808,
+    1325,   808,   812,  1334,   808,  1233,  1231,  1026,   833,   194,
+     636,  1595,   160,   812,  1741,   636,  1765,   801,   801,  1668,
+    1742,   384,  1453,  1510,   500,  1497,  1498,  1293,  1657,  1295,
+     231,  1296,  1621,  1622,   642,   282,  1675,  1424,  1425,  1516,
+    1517,  1655,   808,  1499,  1650,  1651,  1655,  1668,   807,  1503,
+    1507,   160,   197,  1741,  1742,  1323,  1430,   812,   808,   808,
+     808,   808,   808,  1389,  1390,  1391,  1399,  1389,   258,   258,
+     390,  1396,   238,   271,   476,  1395,  1396,  1399,  1389,  1389,
+    1430,  1438,    48,   217,  1434,  1443,  1203,  1203,  1089,  1712,
+     889,  1432,  1583,   160,   160,   812,   160,   403,  1258,  1458,
+    1062,  1668,   808,  1062,   808,    48,   807,  1064,  1327,   160,
+     807,   228,   792,  1758,   219,  1662,  1666,   732,  1665,  1758,
+     125,   245,   360,   103,   125,  1459,   245,  1663,  1663,   153,
+     164,   385,   570,  1624,  1625,   278,  1626,  1307,  1397,  1668,
+    1432,   813,  1520,  1516,  1091,  1662,   111,   111,   127,   248,
+     368,   162,  1089,   900,   807,  1459,   400,  1065,  1066,   807,
+    1323,  1183,   729,   807,   807,  1180,  1181,  1182,  1668,  1178,
+    1178,   808,   812,  1108,  1128,  1128,  1129,    23,    35,    49,
+     600,   625,  1128,  1138,  1146,  1147,  1148,  1123,   807,  1148,
+      62,   621,  1114,  1148,  1148,    62,   622,   622,   625,   807,
+    1129,  1123,  1123,  1148,  1128,  1129,   440,  1101,  1153,    27,
+      71,    75,    77,   125,   366,   371,   377,   417,   496,   546,
+     603,   705,   748,   749,  1104,  1107,  1131,  1132,  1133,  1144,
+    1152,  1177,  1330,    35,  1128,  1149,  1128,  1128,  1129,   807,
+    1122,  1130,  1121,   125,   125,  1177,  1108,  1668,  1144,  1144,
+     565,     9,   186,  1238,  1447,  1668,  1668,   246,  1269,   808,
+     799,  1089,   372,   799,  1831,  1834,   366,   415,    25,   168,
+     903,   582,   137,   152,   905,  1795,  1425,  1425,  1422,   808,
+     843,   844,  1668,   808,   848,   849,  1668,  1677,   808,   851,
+     852,  1660,  1661,   807,   808,   846,   880,   881,  1458,  1181,
+    1506,  1506,  1089,   896,   383,  1181,   352,   713,   714,   715,
+    1668,  1662,  1050,  1050,  1459,  1020,  1749,   228,  1750,  1751,
+    1753,  1207,  1828,   807,  1657,   808,  1090,  1097,   377,   922,
+     923,   924,  1668,   515,  1810,   377,  1426,  1323,   122,   290,
+     372,   593,  1148,   372,   372,   808,  1381,   245,  1649,  1426,
+    1426,  1323,  1379,  1652,  1639,   808,  1323,  1323,  1383,    44,
+     354,   808,   636,  1344,  1323,  1426,  1323,  1323,  1323,  1323,
+     808,   808,   808,  1459,   808,   808,  1458,  1357,   808,   400,
+    1364,  1323,  1358,  1358,   197,  1356,  1381,   125,   162,   371,
+    1410,  1412,  1413,  1414,   808,  1383,  1596,   432,    56,    66,
+      76,    90,    91,    92,   106,   333,   350,   471,   488,   550,
+     567,   960,   959,   582,   210,   636,  1764,   808,  1516,    21,
+    1512,   377,  1513,  1296,   269,   246,   808,   812,  1505,  1500,
+    1501,   808,   812,   813,  1509,   812,   947,  1742,   197,   812,
+    1438,  1389,   817,   258,  1396,  1396,   258,   258,   377,   614,
+     377,   614,   192,   231,   613,  1416,  1417,  1418,  1419,  1420,
+    1323,  1444,  1653,  1323,   697,  1440,  1434,  1744,  1744,  1459,
+    1662,  1662,   888,  1662,   160,   126,  1259,   808,   812,   808,
+    1057,  1065,   808,  1459,  1061,  1062,    48,    21,  1749,   403,
+    1749,  1459,   125,   722,   125,  1459,    48,    48,   153,    48,
+    1625,   536,   570,  1627,  1628,  1432,  1432,  1432,   477,  1032,
+    1181,  1668,   808,   812,  1181,   808,   807,  1181,  1323,   808,
+     812,   807,  1451,  1099,  1101,    35,    23,   600,  1138,    35,
+    1148,  1139,  1185,  1639,  1148,   625,  1185,  1148,   508,   606,
+     650,  1125,  1126,  1127,  1657,  1238,  1143,   125,   148,   187,
+    1134,  1662,   115,   575,   578,   799,   800,   807,  1136,  1137,
+    1641,  1642,  1643,  1644,   608,   125,   125,   139,   331,  1135,
+     263,  1461,  1506,  1506,  1103,    71,  1133,   203,  1109,   263,
+     371,   723,  1149,  1148,  1149,  1125,   372,  1125,  1125,   807,
+    1642,  1238,  1657,  1668,   807,   372,  1830,   372,   415,  1323,
+    1323,   377,   909,   914,   377,    77,   910,    21,   636,  1273,
+     808,   812,   808,   812,   813,   808,   812,   844,   808,   812,
+     808,   812,   808,  1050,  1050,  1029,   807,   808,  1660,  1660,
+    1660,  1660,   636,  1206,  1832,  1181,   808,  1051,   515,   487,
+     808,   812,  1111,  1662,   239,   249,   392,   925,   926,   927,
+     928,  1657,   808,   808,   808,   808,   808,   808,   812,  1335,
+    1663,   808,   808,   808,   812,  1357,   808,   812,   808,   341,
+     265,   427,   808,   808,   808,   808,   808,   808,  1151,   812,
+      48,   387,  1365,   186,   266,  1355,  1641,   808,  1413,  1414,
+     377,   808,   175,   285,  1742,   384,   210,    21,  1767,  1432,
+    1512,  1668,  1513,   147,   565,  1517,  1511,  1500,  1501,  1650,
+    1668,   808,  1507,  1742,  1638,   808,   258,   258,  1323,   807,
+    1323,   807,  1160,  1160,  1417,   638,   812,  1445,  1360,  1441,
+    1442,  1440,  1662,   160,   405,  1260,  1668,   216,   263,   808,
+     808,  1662,  1666,   120,   120,  1639,  1639,    48,  1639,    48,
+      48,  1628,  1448,  1448,   377,   808,   619,  1067,  1066,   808,
+    1179,  1180,   808,   808,    77,   262,   748,   749,  1170,  1171,
+    1172,  1173,  1176,  1177,  1182,   372,  1139,  1149,   808,   812,
+     808,  1127,   807,  1154,  1646,  1646,  1323,  1136,   620,  1835,
+    1835,  1143,    15,    21,  1323,  1223,  1224,  1065,  1426,   510,
+    1662,   143,  1216,  1501,  1796,   372,   844,   849,  1668,   852,
+     812,   807,   881,   636,  1164,  1165,  1166,  1173,   899,  1167,
+    1168,  1169,  1173,   228,  1672,  1833,   808,  1662,   903,  1805,
+     924,  1144,   808,   812,  1668,   194,   372,   808,    21,  1652,
+    1323,   341,   173,   808,  1458,  1444,    48,   429,   481,   681,
+    1366,  1372,  1358,   377,   162,   698,  1764,   384,  1675,  1453,
+    1513,  1438,   263,  1657,    73,  1406,  1424,  1424,   194,  1415,
+    1415,  1653,    21,   812,  1662,   160,  1252,   807,  1058,   111,
+     464,  1825,  1826,  1639,  1639,  1639,   276,  1457,  1457,   162,
+    1164,   249,   272,    77,   111,   235,   321,   339,   363,   563,
+    1078,  1079,  1080,  1575,  1167,   808,   812,  1170,  1451,  1662,
+    1506,  1506,  1506,  1172,   808,  1148,  1639,  1148,  1155,  1668,
+     318,  1156,   808,   807,   808,   808,   904,   911,   912,   636,
+    1797,   673,   844,   844,   397,  1230,  1166,   808,  1230,  1169,
+      48,  1170,   908,   909,   472,  1811,   927,  1111,   149,   808,
+     112,   808,   808,  1450,    33,   103,   245,   696,  1367,  1368,
+    1369,  1640,  1646,  1767,   636,  1766,   608,  1397,   807,   808,
+     808,   808,   212,   258,   387,   807,   807,  1361,  1442,  1662,
+     889,  1327,   807,   136,   368,   534,  1456,   807,  1069,  1071,
+     573,  1506,   136,   136,  1506,  1506,  1506,  1506,   807,  1075,
+    1080,   158,  1153,  1180,  1458,  1835,  1835,  1451,   808,   812,
+     198,   399,   509,   377,  1157,  1323,   537,   906,    54,    68,
+     182,   230,   257,   270,   380,   473,   913,   964,   966,   967,
+     968,   970,   971,   972,   973,   974,   975,   977,   985,   986,
+     989,  1000,  1003,  1005,  1006,  1659,  1670,  1681,  1682,  1683,
+    1686,    53,    64,   282,   808,   812,  1659,  1461,  1230,   905,
+    1111,   916,  1144,   483,  1123,   245,   696,  1368,  1370,  1640,
+    1646,   483,  1323,   691,   678,  1371,   691,   691,   653,  1516,
+    1140,   700,  1407,  1408,  1668,  1430,    48,    48,  1421,  1423,
+     808,  1062,  1506,   534,   807,  1070,  1071,  1072,   326,  1068,
+    1071,  1662,  1506,  1506,  1461,  1461,  1459,  1668,   554,  1076,
+    1077,  1506,  1668,   130,   608,   808,  1323,   155,   907,   987,
+     990,  1668,   197,   362,   978,   965,  1670,  1670,  1668,   969,
+     824,   292,   454,   635,  1009,    32,  1007,   814,    64,   384,
+      64,   844,   910,  1144,   134,   917,   918,  1330,  1812,   191,
+     412,  1798,  1799,   808,  1323,   680,    19,   680,   680,  1426,
+     103,   212,   368,   695,    13,   125,   364,  1743,   481,  1629,
+     702,   808,   812,   194,  1111,   808,   808,   553,  1063,   808,
+    1664,   808,   812,   326,  1073,  1074,  1327,  1662,  1662,  1672,
+     808,   812,  1672,    52,   368,   469,   500,  1158,  1158,   547,
+     628,  1110,  1323,  1323,   633,   992,   996,   197,  1668,   980,
+     981,  1323,   930,   963,   964,   966,   968,   970,   972,   973,
+     974,   975,   977,   985,  1000,  1003,  1005,   930,  1010,  1008,
+    1001,  1004,   384,   384,   808,   143,  1806,   134,   963,  1672,
+    1801,  1426,  1370,   691,   483,   688,  1690,   228,  1623,  1638,
+    1408,   701,  1144,  1459,  1063,  1826,  1071,   808,   812,  1078,
+    1077,     6,   125,   371,   377,   377,  1131,   988,   997,   150,
+     996,   999,   246,   154,  1323,   154,   963,   810,   607,  1323,
+     931,  1009,  1007,   911,   916,   963,   680,    48,  1626,  1406,
+     171,  1409,  1074,   608,   130,   633,   991,   993,  1323,   930,
+     154,   976,   230,   982,   292,   810,  1012,  1011,   124,   929,
+     932,  1002,  1670,  1002,  1807,  1639,   231,  1630,   702,  1158,
+    1158,   994,   993,   999,   998,    54,   979,  1668,   574,  1323,
+     143,    95,   172,   935,   961,  1668,   154,   963,   810,   963,
+     372,   807,  1632,  1638,  1323,   154,   574,   812,   930,  1013,
+     930,   215,   812,  1111,    86,   105,   810,   278,   481,  1631,
+     808,   811,  1633,  1634,  1655,   500,  1635,  1410,  1411,  1413,
+     995,    54,   930,  1668,   983,   154,   154,   194,  1668,  1144,
+     194,   194,  1672,   808,   812,  1636,  1637,  1655,  1412,  1414,
+     574,   150,   151,   984,   454,   635,   933,   125,   962,   938,
+     939,  1458,   934,  1634,   812,  1505,   377,   930,   930,   980,
+     520,   522,   936,   937,   938,   941,  1330,  1668,  1323,  1297,
+    1637,  1511,   812,   963,   196,   937
 };
 
   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint16 yyr1[] =
 {
-       0,   809,   810,   810,   810,   810,   810,   810,   811,   812,
-     811,   811,   813,   813,   814,   814,   815,   815,   815,   815,
-     815,   815,   815,   815,   815,   815,   815,   815,   815,   815,
-     815,   815,   815,   815,   815,   815,   815,   815,   815,   815,
-     815,   815,   815,   815,   815,   815,   815,   815,   815,   815,
-     815,   815,   815,   815,   815,   815,   815,   815,   815,   815,
-     815,   815,   815,   815,   815,   815,   815,   815,   815,   815,
-     815,   815,   815,   815,   815,   815,   815,   815,   815,   815,
-     815,   815,   815,   815,   815,   815,   815,   815,   815,   815,
-     815,   815,   815,   815,   815,   815,   815,   815,   815,   815,
-     815,   815,   815,   815,   815,   815,   815,   815,   815,   815,
-     815,   815,   815,   815,   815,   815,   815,   815,   815,   815,
-     815,   815,   815,   815,   815,   815,   815,   815,   815,   815,
-     815,   815,   815,   815,   815,   815,   815,   815,   815,   815,
-     815,   815,   815,   815,   815,   815,   815,   815,   815,   815,
-     815,   816,   817,   817,   818,   819,   819,   821,   820,   822,
-     822,   823,   823,   824,   826,   825,   827,   827,   829,   828,
-     830,   828,   831,   831,   832,   832,   832,   832,   832,   832,
-     832,   833,   833,   834,   834,   835,   836,   836,   837,   837,
-     838,   838,   839,   839,   840,   841,   841,   842,   842,   843,
-     844,   844,   845,   845,   846,   846,   847,   847,   848,   848,
-     849,   849,   850,   850,   851,   851,   852,   852,   853,   853,
-     854,   854,   855,   855,   856,   856,   857,   857,   858,   858,
-     859,   859,   860,   860,   861,   861,   862,   862,   863,   863,
-     864,   864,   865,   865,   866,   866,   867,   867,   868,   868,
-     869,   869,   870,   870,   870,   870,   870,   870,   870,   870,
-     870,   870,   870,   870,   870,   870,   870,   870,   870,   870,
-     870,   870,   870,   870,   870,   870,   870,   870,   870,   870,
-     870,   870,   870,   870,   870,   871,   871,   871,   872,   873,
-     873,   874,   874,   874,   875,   875,   875,   876,   876,   877,
-     877,   878,   878,   879,   879,   879,   879,   880,   880,   881,
-     881,   881,   881,   882,   883,   885,   884,   884,   884,   884,
-     884,   884,   884,   886,   886,   887,   887,   887,   887,   887,
-     888,   888,   889,   889,   889,   890,   890,   891,   891,   891,
-     891,   891,   891,   891,   893,   892,   895,   894,   894,   896,
-     896,   896,   896,   897,   897,   898,   898,   899,   899,   900,
-     900,   901,   901,   903,   902,   904,   904,   904,   904,   904,
-     904,   904,   904,   904,   904,   904,   904,   904,   905,   905,
-     906,   906,   907,   907,   908,   908,   908,   908,   908,   908,
-     908,   909,   909,   909,   910,   910,   911,   912,   912,   913,
-     913,   914,   914,   915,   916,   916,   917,   917,   918,   919,
-     919,   919,   919,   920,   920,   921,   921,   922,   922,   923,
-     923,   924,   923,   925,   923,   926,   926,   927,   927,   928,
-     929,   929,   930,   931,   931,   932,   932,   932,   932,   932,
-     933,   934,   934,   935,   935,   936,   936,   937,   937,   938,
-     938,   938,   939,   939,   939,   939,   939,   939,   939,   939,
-     939,   939,   939,   939,   940,   941,   942,   942,   942,   943,
-     943,   944,   944,   945,   946,   946,   947,   947,   948,   949,
-     949,   950,   951,   951,   951,   951,   951,   951,   951,   951,
-     951,   951,   951,   951,   951,   952,   952,   953,   953,   954,
-     954,   954,   954,   954,   954,   954,   954,   954,   954,   954,
-     954,   954,   956,   955,   958,   957,   960,   959,   962,   961,
-     963,   964,   965,   967,   966,   968,   969,   969,   969,   970,
-     970,   972,   973,   974,   971,   975,   975,   975,   976,   976,
-     978,   979,   977,   981,   980,   982,   982,   983,   983,   985,
-     986,   984,   988,   989,   987,   990,   990,   992,   991,   993,
-     993,   995,   994,   997,   996,   999,   998,  1000,  1001,  1002,
-    1000,  1003,  1004,  1000,  1005,  1005,  1006,  1006,  1006,  1007,
-    1007,  1008,  1008,  1009,  1009,  1010,  1010,  1011,  1011,  1011,
-    1011,  1011,  1011,  1011,  1011,  1011,  1011,  1011,  1012,  1012,
-    1013,  1013,  1014,  1014,  1014,  1014,  1014,  1014,  1014,  1015,
-    1015,  1016,  1016,  1017,  1018,  1018,  1019,  1019,  1020,  1020,
-    1020,  1020,  1020,  1020,  1020,  1021,  1021,  1022,  1022,  1023,
-    1023,  1023,  1024,  1025,  1025,  1026,  1027,  1028,  1029,  1030,
-    1031,  1032,  1033,  1034,  1035,  1036,  1037,  1038,  1038,  1039,
-    1040,  1041,  1041,  1042,  1042,  1043,  1043,  1044,  1044,  1044,
-    1045,  1045,  1046,  1047,  1047,  1047,  1047,  1047,  1047,  1048,
-    1048,  1049,  1049,  1050,  1050,  1051,  1051,  1051,  1052,  1052,
-    1053,  1053,  1054,  1054,  1055,  1055,  1056,  1056,  1057,  1058,
-    1058,  1058,  1059,  1059,  1060,  1060,  1061,  1061,  1063,  1062,
-    1064,  1064,  1065,  1065,  1066,  1066,  1067,  1067,  1068,  1069,
-    1069,  1070,  1070,  1071,  1071,  1071,  1071,  1071,  1071,  1071,
-    1071,  1072,  1072,  1073,  1073,  1074,  1074,  1075,  1075,  1076,
-    1076,  1076,  1077,  1077,  1078,  1078,  1079,  1079,  1080,  1080,
-    1081,  1081,  1081,  1081,  1081,  1081,  1081,  1081,  1081,  1081,
-    1081,  1081,  1081,  1081,  1081,  1081,  1081,  1081,  1081,  1081,
-    1081,  1081,  1081,  1081,  1081,  1081,  1081,  1081,  1081,  1081,
-    1081,  1081,  1081,  1081,  1081,  1082,  1082,  1083,  1084,  1085,
-    1086,  1086,  1086,  1086,  1086,  1086,  1087,  1087,  1087,  1088,
-    1088,  1088,  1088,  1089,  1089,  1090,  1090,  1091,  1092,  1092,
-    1093,  1093,  1093,  1093,  1093,  1093,  1094,  1095,  1095,  1096,
-    1096,  1097,  1097,  1098,  1099,  1099,  1100,  1100,  1101,  1101,
-    1101,  1102,  1102,  1102,  1102,  1102,  1102,  1102,  1102,  1102,
-    1102,  1102,  1102,  1102,  1102,  1102,  1102,  1102,  1102,  1102,
-    1102,  1102,  1102,  1102,  1102,  1102,  1102,  1102,  1102,  1102,
-    1102,  1102,  1102,  1102,  1102,  1102,  1102,  1102,  1103,  1103,
-    1103,  1103,  1103,  1103,  1103,  1103,  1104,  1104,  1105,  1105,
-    1106,  1106,  1106,  1106,  1106,  1107,  1107,  1107,  1107,  1107,
-    1108,  1108,  1109,  1109,  1110,  1110,  1110,  1110,  1111,  1111,
-    1112,  1112,  1112,  1113,  1114,  1114,  1115,  1115,  1115,  1116,
-    1116,  1117,  1117,  1118,  1118,  1118,  1119,  1119,  1119,  1119,
-    1120,  1120,  1121,  1121,  1122,  1122,  1123,  1123,  1124,  1124,
-    1124,  1124,  1124,  1124,  1124,  1124,  1124,  1124,  1124,  1124,
-    1124,  1124,  1124,  1124,  1124,  1124,  1124,  1124,  1124,  1125,
-    1125,  1125,  1126,  1126,  1126,  1127,  1128,  1128,  1129,  1129,
-    1130,  1130,  1131,  1131,  1132,  1132,  1133,  1133,  1134,  1134,
-    1135,  1135,  1136,  1136,  1137,  1137,  1137,  1138,  1138,  1138,
-    1139,  1139,  1139,  1139,  1139,  1139,  1139,  1140,  1140,  1142,
-    1141,  1143,  1143,  1144,  1145,  1145,  1146,  1146,  1147,  1147,
-    1147,  1147,  1148,  1148,  1148,  1148,  1148,  1149,  1149,  1149,
-    1149,  1149,  1150,  1150,  1151,  1151,  1152,  1152,  1153,  1153,
-    1153,  1154,  1154,  1155,  1155,  1156,  1156,  1157,  1157,  1158,
-    1158,  1159,  1159,  1160,  1161,  1161,  1162,  1162,  1163,  1163,
-    1164,  1164,  1164,  1164,  1164,  1165,  1165,  1165,  1166,  1166,
-    1167,  1167,  1168,  1168,  1169,  1169,  1169,  1170,  1170,  1171,
-    1171,  1172,  1172,  1173,  1173,  1174,  1174,  1175,  1175,  1176,
-    1176,  1177,  1177,  1179,  1178,  1181,  1180,  1183,  1182,  1185,
-    1184,  1186,  1184,  1188,  1187,  1189,  1190,  1190,  1190,  1190,
-    1191,  1192,  1193,  1193,  1193,  1193,  1193,  1193,  1193,  1194,
-    1194,  1195,  1196,  1197,  1197,  1197,  1198,  1198,  1199,  1199,
-    1200,  1200,  1200,  1200,  1200,  1200,  1200,  1200,  1200,  1200,
-    1200,  1200,  1200,  1200,  1200,  1200,  1201,  1201,  1202,  1202,
-    1203,  1203,  1203,  1203,  1204,  1205,  1205,  1205,  1205,  1206,
-    1206,  1207,  1207,  1208,  1208,  1209,  1209,  1210,  1210,  1211,
-    1211,  1212,  1212,  1212,  1212,  1213,  1213,  1213,  1213,  1213,
-    1213,  1213,  1213,  1213,  1213,  1213,  1213,  1213,  1213,  1213,
-    1213,  1213,  1213,  1213,  1213,  1214,  1214,  1215,  1215,  1216,
-    1216,  1217,  1217,  1217,  1217,  1217,  1218,  1218,  1219,  1219,
-    1219,  1219,  1219,  1219,  1219,  1219,  1219,  1219,  1219,  1219,
-    1219,  1219,  1219,  1219,  1219,  1219,  1219,  1219,  1219,  1219,
-    1219,  1219,  1219,  1219,  1219,  1220,  1220,  1220,  1221,  1221,
-    1221,  1221,  1221,  1222,  1223,  1223,  1224,  1225,  1225,  1226,
-    1226,  1227,  1227,  1228,  1228,  1228,  1229,  1229,  1229,  1230,
-    1230,  1230,  1230,  1231,  1231,  1232,  1233,  1233,  1234,  1234,
-    1235,  1235,  1235,  1236,  1237,  1238,  1239,  1239,  1240,  1242,
-    1243,  1241,  1244,  1245,  1245,  1246,  1246,  1247,  1247,  1247,
-    1248,  1248,  1249,  1249,  1250,  1250,  1251,  1251,  1252,  1252,
-    1253,  1253,  1254,  1254,  1255,  1255,  1256,  1256,  1256,  1256,
-    1256,  1257,  1258,  1258,  1258,  1259,  1260,  1260,  1261,  1261,
-    1262,  1262,  1262,  1263,  1264,  1264,  1265,  1265,  1265,  1266,
-    1267,  1268,  1268,  1269,  1269,  1270,  1270,  1270,  1270,  1270,
-    1270,  1271,  1272,  1272,  1272,  1274,  1273,  1273,  1275,  1275,
-    1276,  1276,  1277,  1278,  1278,  1279,  1279,  1280,  1281,  1281,
-    1282,  1282,  1283,  1283,  1284,  1285,  1286,  1286,  1287,  1287,
-    1288,  1288,  1288,  1288,  1289,  1289,  1289,  1289,  1289,  1290,
-    1290,  1290,  1290,  1290,  1290,  1290,  1291,  1291,  1291,  1291,
-    1291,  1292,  1292,  1292,  1293,  1293,  1293,  1294,  1294,  1295,
-    1295,  1296,  1297,  1297,  1298,  1298,  1299,  1300,  1301,  1301,
-    1302,  1302,  1303,  1303,  1304,  1304,  1305,  1305,  1305,  1306,
-    1306,  1307,  1308,  1308,  1309,  1309,  1310,  1310,  1310,  1311,
-    1311,  1312,  1312,  1312,  1312,  1312,  1313,  1313,  1314,  1314,
-    1314,  1314,  1314,  1314,  1314,  1314,  1314,  1314,  1314,  1315,
-    1315,  1315,  1315,  1315,  1316,  1316,  1316,  1316,  1316,  1316,
-    1316,  1316,  1316,  1316,  1316,  1316,  1316,  1316,  1316,  1316,
-    1316,  1317,  1317,  1318,  1318,  1318,  1318,  1318,  1318,  1318,
-    1318,  1318,  1318,  1318,  1318,  1318,  1318,  1318,  1319,  1319,
-    1320,  1320,  1321,  1321,  1322,  1322,  1323,  1323,  1323,  1323,
-    1323,  1323,  1323,  1324,  1324,  1325,  1325,  1325,  1325,  1325,
-    1325,  1325,  1325,  1325,  1325,  1325,  1325,  1325,  1325,  1325,
-    1325,  1325,  1325,  1325,  1325,  1325,  1325,  1325,  1325,  1325,
+       0,   818,   819,   819,   819,   819,   819,   819,   820,   821,
+     820,   820,   822,   822,   823,   823,   824,   824,   824,   824,
+     824,   824,   824,   824,   824,   824,   824,   824,   824,   824,
+     824,   824,   824,   824,   824,   824,   824,   824,   824,   824,
+     824,   824,   824,   824,   824,   824,   824,   824,   824,   824,
+     824,   824,   824,   824,   824,   824,   824,   824,   824,   824,
+     824,   824,   824,   824,   824,   824,   824,   824,   824,   824,
+     824,   824,   824,   824,   824,   824,   824,   824,   824,   824,
+     824,   824,   824,   824,   824,   824,   824,   824,   824,   824,
+     824,   824,   824,   824,   824,   824,   824,   824,   824,   824,
+     824,   824,   824,   824,   824,   824,   824,   824,   824,   824,
+     824,   824,   824,   824,   824,   824,   824,   824,   824,   824,
+     824,   824,   824,   824,   824,   824,   824,   824,   824,   824,
+     824,   824,   824,   824,   824,   824,   824,   824,   824,   824,
+     824,   824,   824,   824,   824,   824,   824,   824,   824,   824,
+     824,   825,   826,   826,   827,   828,   828,   830,   829,   831,
+     831,   832,   832,   833,   835,   834,   836,   836,   838,   837,
+     839,   837,   840,   840,   841,   841,   841,   841,   841,   841,
+     841,   842,   842,   843,   843,   844,   845,   845,   846,   846,
+     847,   847,   848,   848,   849,   850,   850,   851,   851,   852,
+     853,   853,   854,   854,   855,   855,   856,   856,   857,   857,
+     858,   858,   859,   859,   860,   860,   861,   861,   862,   862,
+     863,   863,   864,   864,   865,   865,   866,   866,   867,   867,
+     868,   868,   869,   869,   870,   870,   871,   871,   872,   872,
+     873,   873,   874,   874,   875,   875,   876,   876,   877,   877,
+     878,   878,   879,   879,   879,   879,   879,   879,   879,   879,
+     879,   879,   879,   879,   879,   879,   879,   879,   879,   879,
+     879,   879,   879,   879,   879,   879,   879,   879,   879,   879,
+     879,   879,   879,   879,   879,   879,   880,   880,   880,   881,
+     882,   882,   883,   883,   883,   884,   884,   884,   885,   885,
+     886,   886,   887,   887,   888,   888,   888,   888,   889,   889,
+     890,   890,   890,   890,   891,   892,   894,   893,   893,   893,
+     893,   893,   893,   893,   895,   895,   896,   896,   896,   896,
+     896,   897,   897,   898,   898,   898,   899,   899,   900,   900,
+     900,   900,   900,   900,   900,   902,   901,   904,   903,   903,
+     905,   905,   905,   905,   906,   906,   907,   907,   908,   908,
+     909,   909,   910,   910,   912,   911,   913,   913,   913,   913,
+     913,   913,   913,   913,   913,   913,   913,   913,   913,   914,
+     914,   915,   915,   916,   916,   917,   917,   917,   917,   917,
+     917,   917,   918,   918,   918,   919,   919,   920,   921,   921,
+     922,   922,   923,   923,   924,   925,   925,   926,   926,   927,
+     928,   928,   928,   928,   929,   929,   930,   930,   931,   931,
+     932,   932,   933,   932,   934,   932,   935,   935,   936,   936,
+     937,   938,   938,   939,   940,   940,   941,   941,   941,   941,
+     941,   942,   943,   943,   944,   944,   945,   945,   946,   946,
+     947,   947,   947,   948,   948,   948,   948,   948,   948,   948,
+     948,   948,   948,   948,   948,   949,   950,   951,   951,   951,
+     952,   952,   953,   953,   954,   955,   955,   956,   956,   957,
+     958,   958,   959,   960,   960,   960,   960,   960,   960,   960,
+     960,   960,   960,   960,   960,   960,   961,   961,   962,   962,
+     963,   963,   963,   963,   963,   963,   963,   963,   963,   963,
+     963,   963,   963,   965,   964,   967,   966,   969,   968,   971,
+     970,   972,   973,   974,   976,   975,   977,   978,   978,   978,
+     979,   979,   981,   982,   983,   980,   984,   984,   984,   985,
+     985,   987,   988,   986,   990,   989,   991,   991,   992,   992,
+     994,   995,   993,   997,   998,   996,   999,   999,  1001,  1000,
+    1002,  1002,  1004,  1003,  1006,  1005,  1008,  1007,  1009,  1010,
+    1011,  1009,  1012,  1013,  1009,  1014,  1014,  1015,  1015,  1015,
+    1016,  1016,  1017,  1017,  1018,  1018,  1019,  1019,  1020,  1020,
+    1020,  1020,  1020,  1020,  1020,  1020,  1020,  1020,  1020,  1021,
+    1021,  1022,  1022,  1023,  1023,  1023,  1023,  1023,  1023,  1023,
+    1024,  1024,  1025,  1025,  1026,  1027,  1027,  1028,  1028,  1029,
+    1029,  1029,  1029,  1029,  1029,  1029,  1030,  1030,  1031,  1031,
+    1032,  1032,  1032,  1033,  1034,  1034,  1035,  1036,  1037,  1038,
+    1039,  1040,  1041,  1042,  1043,  1044,  1045,  1046,  1047,  1047,
+    1048,  1049,  1050,  1050,  1051,  1051,  1052,  1052,  1053,  1053,
+    1053,  1054,  1054,  1055,  1056,  1056,  1056,  1056,  1056,  1056,
+    1057,  1057,  1058,  1058,  1059,  1059,  1060,  1060,  1060,  1061,
+    1061,  1062,  1062,  1063,  1063,  1064,  1064,  1065,  1065,  1066,
+    1067,  1067,  1067,  1068,  1068,  1069,  1069,  1070,  1070,  1072,
+    1071,  1073,  1073,  1074,  1074,  1075,  1075,  1076,  1076,  1077,
+    1078,  1078,  1079,  1079,  1080,  1080,  1080,  1080,  1080,  1080,
+    1080,  1080,  1081,  1081,  1082,  1082,  1083,  1083,  1084,  1084,
+    1085,  1085,  1085,  1086,  1086,  1087,  1087,  1088,  1088,  1089,
+    1089,  1090,  1090,  1090,  1090,  1090,  1090,  1090,  1090,  1090,
+    1090,  1090,  1090,  1090,  1090,  1090,  1090,  1090,  1090,  1090,
+    1090,  1090,  1090,  1090,  1090,  1090,  1090,  1090,  1090,  1090,
+    1090,  1090,  1090,  1090,  1090,  1090,  1091,  1091,  1092,  1093,
+    1094,  1095,  1095,  1095,  1095,  1095,  1095,  1096,  1096,  1096,
+    1097,  1097,  1097,  1097,  1098,  1098,  1099,  1099,  1100,  1101,
+    1101,  1102,  1102,  1102,  1102,  1102,  1102,  1103,  1104,  1104,
+    1105,  1105,  1106,  1106,  1107,  1108,  1108,  1109,  1109,  1110,
+    1110,  1110,  1111,  1111,  1111,  1111,  1111,  1111,  1111,  1111,
+    1111,  1111,  1111,  1111,  1111,  1111,  1111,  1111,  1111,  1111,
+    1111,  1111,  1111,  1111,  1111,  1111,  1111,  1111,  1111,  1111,
+    1111,  1111,  1111,  1111,  1111,  1111,  1111,  1111,  1111,  1112,
+    1112,  1112,  1112,  1112,  1112,  1112,  1112,  1113,  1113,  1114,
+    1114,  1115,  1115,  1115,  1115,  1115,  1116,  1116,  1116,  1116,
+    1116,  1117,  1117,  1118,  1118,  1119,  1119,  1119,  1119,  1120,
+    1120,  1121,  1121,  1121,  1122,  1123,  1123,  1124,  1124,  1124,
+    1125,  1125,  1126,  1126,  1127,  1127,  1127,  1128,  1128,  1128,
+    1128,  1129,  1129,  1130,  1130,  1131,  1131,  1132,  1132,  1133,
+    1133,  1133,  1133,  1133,  1133,  1133,  1133,  1133,  1133,  1133,
+    1133,  1133,  1133,  1133,  1133,  1133,  1133,  1133,  1133,  1133,
+    1134,  1134,  1134,  1135,  1135,  1135,  1136,  1137,  1137,  1138,
+    1138,  1139,  1139,  1140,  1140,  1141,  1141,  1142,  1142,  1143,
+    1143,  1144,  1144,  1145,  1145,  1146,  1146,  1146,  1147,  1147,
+    1147,  1148,  1148,  1148,  1148,  1148,  1148,  1148,  1149,  1149,
+    1151,  1150,  1152,  1152,  1153,  1154,  1154,  1155,  1155,  1156,
+    1156,  1156,  1156,  1157,  1157,  1157,  1157,  1157,  1158,  1158,
+    1158,  1158,  1158,  1159,  1159,  1160,  1160,  1161,  1161,  1162,
+    1162,  1162,  1163,  1163,  1164,  1164,  1165,  1165,  1166,  1166,
+    1167,  1167,  1168,  1168,  1169,  1170,  1170,  1171,  1171,  1172,
+    1172,  1173,  1173,  1173,  1173,  1173,  1174,  1174,  1174,  1175,
+    1175,  1176,  1176,  1177,  1177,  1178,  1178,  1178,  1179,  1179,
+    1180,  1180,  1181,  1181,  1182,  1182,  1183,  1183,  1184,  1184,
+    1185,  1185,  1186,  1186,  1188,  1187,  1190,  1189,  1192,  1191,
+    1194,  1193,  1195,  1193,  1197,  1196,  1198,  1199,  1199,  1199,
+    1199,  1200,  1201,  1202,  1202,  1202,  1202,  1202,  1202,  1202,
+    1202,  1202,  1203,  1203,  1204,  1205,  1206,  1206,  1206,  1207,
+    1207,  1208,  1208,  1209,  1209,  1209,  1209,  1209,  1209,  1209,
+    1209,  1209,  1209,  1209,  1209,  1209,  1209,  1209,  1209,  1210,
+    1210,  1211,  1211,  1212,  1212,  1212,  1212,  1213,  1214,  1214,
+    1214,  1214,  1215,  1215,  1216,  1216,  1217,  1217,  1218,  1218,
+    1219,  1219,  1220,  1220,  1221,  1221,  1221,  1221,  1222,  1222,
+    1222,  1222,  1222,  1222,  1222,  1222,  1222,  1222,  1222,  1222,
+    1222,  1222,  1222,  1222,  1222,  1222,  1222,  1222,  1223,  1223,
+    1224,  1224,  1225,  1225,  1226,  1226,  1226,  1226,  1226,  1227,
+    1227,  1228,  1228,  1228,  1228,  1228,  1228,  1228,  1228,  1228,
+    1228,  1228,  1228,  1228,  1228,  1228,  1228,  1228,  1228,  1228,
+    1228,  1228,  1228,  1228,  1228,  1228,  1228,  1228,  1229,  1229,
+    1229,  1230,  1230,  1230,  1230,  1230,  1231,  1232,  1232,  1233,
+    1234,  1234,  1235,  1235,  1236,  1236,  1237,  1237,  1237,  1238,
+    1238,  1238,  1239,  1239,  1239,  1239,  1240,  1240,  1241,  1242,
+    1242,  1243,  1243,  1244,  1244,  1244,  1245,  1246,  1247,  1248,
+    1248,  1249,  1251,  1252,  1250,  1253,  1254,  1254,  1255,  1255,
+    1256,  1256,  1256,  1257,  1257,  1258,  1258,  1259,  1259,  1260,
+    1260,  1261,  1261,  1262,  1262,  1263,  1263,  1264,  1264,  1265,
+    1265,  1265,  1265,  1265,  1266,  1267,  1267,  1267,  1268,  1269,
+    1269,  1270,  1270,  1271,  1271,  1271,  1272,  1273,  1273,  1274,
+    1274,  1274,  1275,  1276,  1277,  1277,  1278,  1278,  1279,  1279,
+    1279,  1279,  1279,  1279,  1280,  1281,  1281,  1281,  1283,  1282,
+    1282,  1284,  1284,  1285,  1285,  1286,  1287,  1287,  1288,  1288,
+    1289,  1290,  1290,  1291,  1291,  1292,  1292,  1293,  1294,  1295,
+    1295,  1296,  1296,  1297,  1297,  1297,  1297,  1298,  1298,  1298,
+    1298,  1298,  1299,  1299,  1299,  1299,  1299,  1299,  1299,  1300,
+    1300,  1300,  1300,  1300,  1301,  1301,  1301,  1302,  1302,  1302,
+    1303,  1303,  1304,  1304,  1305,  1306,  1306,  1307,  1307,  1308,
+    1309,  1310,  1310,  1311,  1311,  1312,  1312,  1313,  1313,  1314,
+    1314,  1314,  1315,  1315,  1316,  1317,  1317,  1318,  1318,  1319,
+    1319,  1319,  1320,  1320,  1321,  1321,  1321,  1321,  1321,  1322,
+    1322,  1323,  1323,  1323,  1323,  1323,  1323,  1323,  1323,  1323,
+    1323,  1323,  1324,  1324,  1324,  1324,  1324,  1325,  1325,  1325,
     1325,  1325,  1325,  1325,  1325,  1325,  1325,  1325,  1325,  1325,
-    1326,  1326,  1327,  1327,  1327,  1327,  1327,  1327,  1327,  1327,
+    1325,  1325,  1325,  1325,  1326,  1326,  1327,  1327,  1327,  1327,
     1327,  1327,  1327,  1327,  1327,  1327,  1327,  1327,  1327,  1327,
-    1327,  1327,  1327,  1327,  1327,  1327,  1327,  1327,  1327,  1327,
-    1328,  1328,  1328,  1328,  1328,  1328,  1328,  1328,  1328,  1328,
-    1328,  1328,  1328,  1328,  1328,  1328,  1328,  1328,  1328,  1328,
-    1328,  1328,  1329,  1329,  1330,  1330,  1330,  1330,  1330,  1330,
-    1330,  1330,  1330,  1330,  1330,  1330,  1330,  1330,  1330,  1330,
-    1330,  1330,  1330,  1330,  1330,  1330,  1330,  1331,  1331,  1331,
-    1331,  1331,  1331,  1331,  1332,  1332,  1333,  1333,  1334,  1334,
-    1335,  1335,  1336,  1336,  1337,  1337,  1338,  1339,  1339,  1340,
-    1340,  1340,  1340,  1340,  1340,  1340,  1340,  1340,  1340,  1340,
-    1340,  1340,  1340,  1340,  1340,  1340,  1340,  1340,  1340,  1340,
-    1340,  1340,  1341,  1341,  1341,  1341,  1341,  1341,  1341,  1341,
-    1341,  1341,  1341,  1342,  1342,  1343,  1343,  1344,  1344,  1344,
-    1345,  1345,  1346,  1346,  1346,  1347,  1347,  1347,  1348,  1348,
-    1349,  1350,  1350,  1351,  1352,  1353,  1354,  1354,  1355,  1355,
-    1356,  1356,  1357,  1357,  1358,  1358,  1359,  1359,  1359,  1359,
-    1359,  1360,  1361,  1361,  1361,  1361,  1361,  1362,  1362,  1362,
-    1362,  1362,  1363,  1363,  1363,  1364,  1365,  1366,  1366,  1366,
-    1367,  1367,  1368,  1368,  1369,  1369,  1370,  1370,  1371,  1372,
-    1372,  1372,  1372,  1372,  1372,  1372,  1372,  1372,  1372,  1372,
-    1372,  1372,  1372,  1372,  1372,  1372,  1372,  1372,  1372,  1372,
-    1372,  1373,  1373,  1374,  1374,  1375,  1375,  1376,  1376,  1377,
-    1377,  1378,  1378,  1379,  1379,  1380,  1380,  1380,  1381,  1381,
-    1382,  1382,  1382,  1382,  1382,  1382,  1383,  1383,  1383,  1384,
-    1384,  1384,  1384,  1385,  1385,  1386,  1386,  1387,  1387,  1388,
-    1388,  1389,  1390,  1390,  1390,  1390,  1390,  1390,  1391,  1391,
-    1392,  1392,  1393,  1394,  1394,  1395,  1395,  1396,  1397,  1398,
-    1398,  1399,  1399,  1399,  1400,  1400,  1401,  1401,  1401,  1401,
-    1402,  1402,  1403,  1404,  1405,  1405,  1405,  1406,  1406,  1406,
-    1406,  1407,  1407,  1408,  1408,  1409,  1409,  1410,  1410,  1411,
-    1412,  1412,  1413,  1413,  1414,  1414,  1415,  1416,  1416,  1417,
-    1417,  1417,  1417,  1417,  1417,  1417,  1417,  1417,  1417,  1417,
-    1417,  1418,  1418,  1418,  1418,  1418,  1418,  1418,  1418,  1418,
-    1419,  1419,  1419,  1419,  1420,  1420,  1421,  1421,  1422,  1422,
-    1423,  1423,  1424,  1425,  1425,  1426,  1426,  1427,  1427,  1428,
-    1429,  1429,  1430,  1430,  1431,  1431,  1432,  1432,  1433,  1434,
-    1434,  1435,  1435,  1436,  1436,  1437,  1437,  1438,  1439,  1439,
-    1440,  1441,  1441,  1442,  1442,  1443,  1443,  1444,  1444,  1445,
-    1446,  1446,  1446,  1447,  1447,  1447,  1447,  1447,  1448,  1448,
-    1449,  1449,  1449,  1449,  1449,  1449,  1450,  1450,  1450,  1450,
-    1450,  1451,  1451,  1451,  1451,  1451,  1452,  1452,  1452,  1452,
-    1452,  1453,  1454,  1454,  1455,  1455,  1456,  1456,  1457,  1458,
-    1458,  1458,  1459,  1460,  1461,  1462,  1463,  1463,  1464,  1465,
-    1466,  1467,  1468,  1469,  1470,  1471,  1472,  1473,  1474,  1475,
-    1476,  1476,  1477,  1477,  1478,  1478,  1479,  1479,  1480,  1480,
-    1481,  1481,  1482,  1482,  1483,  1483,  1483,  1484,  1484,  1484,
-    1485,  1485,  1485,  1485,  1486,  1486,  1487,  1487,  1488,  1488,
-    1488,  1489,  1489,  1489,  1490,  1490,  1491,  1492,  1492,  1492,
-    1493,  1493,  1494,  1494,  1495,  1495,  1496,  1496,  1497,  1497,
-    1498,  1499,  1500,  1500,  1501,  1501,  1502,  1502,  1503,  1503,
-    1504,  1504,  1505,  1506,  1506,  1507,  1507,  1508,  1509,  1509,
-    1510,  1510,  1510,  1511,  1511,  1512,  1512,  1513,  1513,  1513,
-    1514,  1515,  1515,  1516,  1516,  1517,  1517,  1518,  1518,  1518,
-    1518,  1518,  1518,  1518,  1518,  1518,  1519,  1519,  1520,  1521,
-    1522,  1523,  1524,  1525,  1526,  1527,  1528,  1529,  1530,  1531,
-    1532,  1532,  1533,  1534,  1535,  1536,  1537,  1538,  1539,  1540,
-    1541,  1542,  1543,  1544,  1545,  1546,  1547,  1548,  1549,  1549,
-    1549,  1550,  1551,  1552,  1553,  1554,  1555,  1556,  1557,  1558,
-    1559,  1560,  1561,  1562,  1563,  1564,  1564,  1565,  1565,  1566,
-    1566,  1567,  1567,  1568,  1568,  1569,  1569,  1570,  1570,  1570,
-    1570,  1571,  1571,  1572,  1572,  1573,  1573,  1574,  1574,  1574,
-    1575,  1576,  1577,  1577,  1577,  1577,  1577,  1577,  1578,  1578,
-    1579,  1579,  1580,  1580,  1581,  1581,  1581,  1583,  1582,  1585,
-    1584,  1584,  1586,  1586,  1587,  1586,  1588,  1588,  1589,  1589,
-    1589,  1589,  1589,  1589,  1589,  1589,  1589,  1589,  1589,  1589,
-    1590,  1590,  1592,  1591,  1591,  1593,  1593,  1594,  1594,  1596,
-    1595,  1597,  1595,  1598,  1595,  1599,  1599,  1600,  1600,  1602,
-    1601,  1603,  1604,  1604,  1605,  1606,  1606,  1606,  1607,  1608,
-    1609,  1609,  1610,  1610,  1611,  1611,  1611,  1612,  1612,  1613,
-    1613,  1614,  1614,  1615,  1615,  1616,  1616,  1616,  1616,  1617,
-    1617,  1618,  1618,  1619,  1619,  1620,  1620,  1621,  1621,  1622,
-    1622,  1623,  1623,  1623,  1624,  1624,  1625,  1625,  1626,  1626,
-    1627,  1627,  1628,  1629,  1629,  1629,  1629,  1630,  1630,  1630,
-    1631,  1632,  1632,  1632,  1633,  1633,  1634,  1635,  1635,  1635,
-    1635,  1635,  1635,  1635,  1635,  1635,  1636,  1636,  1637,  1637,
-    1637,  1638,  1638,  1638,  1639,  1639,  1639,  1640,  1640,  1641,
-    1641,  1642,  1642,  1643,  1644,  1645,  1645,  1646,  1646,  1647,
-    1647,  1648,  1648,  1649,  1649,  1650,  1650,  1651,  1652,  1653,
-    1654,  1655,  1656,  1657,  1657,  1658,  1659,  1659,  1660,  1660,
-    1661,  1661,  1662,  1662,  1663,  1663,  1663,  1664,  1664,  1664,
-    1665,  1665,  1666,  1666,  1667,  1667,  1668,  1669,  1669,  1669,
-    1669,  1669,  1670,  1670,  1670,  1671,  1671,  1671,  1671,  1671,
-    1671,  1671,  1671,  1671,  1671,  1671,  1671,  1671,  1671,  1671,
-    1671,  1671,  1671,  1671,  1671,  1671,  1671,  1671,  1671,  1671,
-    1671,  1671,  1671,  1671,  1671,  1671,  1671,  1671,  1671,  1671,
-    1672,  1672,  1672,  1673,  1673,  1673,  1673,  1673,  1673,  1673,
-    1673,  1673,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,  1674,
-    1674,  1674,  1674,  1674,  1674,  1674,  1674,  1675,  1675,  1675,
-    1676,  1676,  1676,  1676,  1677,  1677,  1677,  1677,  1677,  1678,
-    1679,  1679,  1679,  1679,  1679,  1679,  1679,  1680,  1680,  1680,
-    1680,  1680,  1680,  1680,  1681,  1681,  1682,  1682,  1683,  1683,
-    1684,  1685,  1685,  1686,  1686,  1687,  1687,  1688,  1688,  1689,
-    1689,  1689,  1689,  1689,  1690,  1690,  1690,  1690,  1691,  1691,
-    1691,  1691,  1692,  1692,  1692,  1692,  1692,  1692,  1693,  1694,
-    1694,  1694,  1694,  1694,  1694,  1694,  1695,  1695,  1695,  1696,
-    1696,  1697,  1698,  1698,  1699,  1700,  1700,  1701,  1701,  1702,
-    1702,  1702,  1702,  1703,  1703,  1703,  1703,  1703,  1703,  1703,
-    1705,  1704,  1704,  1706,  1706,  1707,  1707,  1708,  1709,  1709,
-    1709,  1709,  1711,  1710,  1710,  1712,  1713,  1714,  1715,  1715,
-    1715,  1715,  1715,  1715,  1715,  1715,  1716,  1716,  1716,  1716,
-    1716,  1717,  1717,  1718,  1718,  1718,  1718,  1719,  1719,  1719,
-    1719,  1719,  1720,  1720,  1721,  1720,  1720,  1720,  1722,  1722,
-    1723,  1722,  1722,  1724,  1724,  1724,  1724,  1725,  1725,  1726,
-    1726,  1727,  1727,  1727,  1727,  1727,  1727,  1727,  1727,  1727,
-    1727,  1727,  1727,  1727,  1727,  1727,  1727,  1727,  1727,  1727,
-    1727,  1727,  1727,  1727,  1727,  1727,  1727,  1727,  1727,  1727,
-    1727,  1727,  1727,  1727,  1727,  1728,  1728,  1729,  1729,  1730,
-    1730,  1731,  1731,  1731,  1732,  1732,  1732,  1732,  1732,  1733,
-    1733,  1734,  1734,  1735,  1735,  1736,  1736,  1737,  1737,  1737,
-    1737,  1737,  1737,  1737,  1738,  1738,  1738,  1738,  1738,  1738,
-    1738,  1738,  1738,  1738,  1739,  1739,  1740,  1740,  1741,  1741,
-    1742,  1742,  1743,  1743,  1743,  1743,  1743,  1744,  1744,  1745,
-    1745,  1746,  1746,  1746,  1746,  1746,  1747,  1747,  1749,  1748,
-    1750,  1750,  1751,  1751,  1751,  1752,  1752,  1752,  1753,  1753,
-    1754,  1755,  1755,  1756,  1757,  1758,  1758,  1758,  1759,  1760,
-    1761,  1762,  1762,  1762,  1762,  1762,  1762,  1762,  1762,  1763,
-    1764,  1764,  1764,  1765,  1765,  1765,  1765,  1765,  1766,  1766,
-    1766,  1766,  1766,  1766,  1767,  1767,  1768,  1769,  1770,  1770,
-    1770,  1771,  1772,  1772,  1772,  1773,  1773,  1773,  1775,  1774,
-    1776,  1777,  1777,  1777,  1777,  1778,  1778,  1779,  1779,  1781,
-    1780,  1782,  1782,  1784,  1785,  1786,  1787,  1783,  1789,  1790,
-    1791,  1792,  1788,  1793,  1793,  1793,  1793,  1793,  1793,  1794,
-    1794,  1795,  1795,  1795,  1796,  1796,  1797,  1797,  1797,  1798,
-    1798,  1799,  1799,  1799,  1800,  1800,  1801,  1801,  1802,  1802,
-    1803,  1804,  1804,  1805,  1805,  1806,  1806,  1806,  1807,  1807,
-    1808,  1808,  1809,  1809,  1810,  1810,  1811,  1811,  1812,  1812,
-    1813,  1813,  1813,  1814,  1814,  1815
+    1327,  1328,  1328,  1329,  1329,  1330,  1330,  1331,  1331,  1332,
+    1332,  1332,  1332,  1332,  1332,  1332,  1333,  1333,  1334,  1334,
+    1334,  1334,  1334,  1334,  1334,  1334,  1334,  1334,  1334,  1334,
+    1334,  1334,  1334,  1334,  1334,  1334,  1334,  1334,  1334,  1334,
+    1334,  1334,  1334,  1334,  1334,  1334,  1334,  1334,  1334,  1334,
+    1334,  1334,  1334,  1335,  1335,  1336,  1336,  1336,  1336,  1336,
+    1336,  1336,  1336,  1336,  1336,  1336,  1336,  1336,  1336,  1336,
+    1336,  1336,  1336,  1336,  1336,  1336,  1336,  1336,  1336,  1336,
+    1336,  1336,  1336,  1337,  1337,  1337,  1337,  1337,  1337,  1337,
+    1337,  1337,  1337,  1337,  1337,  1337,  1337,  1337,  1337,  1337,
+    1337,  1337,  1337,  1337,  1337,  1338,  1338,  1339,  1339,  1339,
+    1339,  1339,  1339,  1339,  1339,  1339,  1339,  1339,  1339,  1339,
+    1339,  1339,  1339,  1339,  1339,  1339,  1339,  1339,  1339,  1339,
+    1340,  1340,  1340,  1340,  1340,  1340,  1340,  1341,  1341,  1342,
+    1342,  1343,  1343,  1344,  1344,  1345,  1345,  1346,  1346,  1347,
+    1348,  1348,  1349,  1349,  1349,  1349,  1349,  1349,  1349,  1349,
+    1349,  1349,  1349,  1349,  1349,  1349,  1349,  1349,  1349,  1349,
+    1349,  1349,  1349,  1349,  1349,  1350,  1350,  1350,  1350,  1350,
+    1350,  1350,  1350,  1350,  1350,  1350,  1351,  1351,  1352,  1352,
+    1353,  1353,  1353,  1354,  1354,  1355,  1355,  1355,  1356,  1356,
+    1356,  1357,  1357,  1358,  1359,  1359,  1360,  1361,  1362,  1363,
+    1363,  1364,  1364,  1365,  1365,  1366,  1366,  1367,  1367,  1368,
+    1368,  1368,  1368,  1368,  1369,  1370,  1370,  1370,  1370,  1370,
+    1371,  1371,  1371,  1371,  1371,  1372,  1372,  1372,  1373,  1374,
+    1375,  1375,  1375,  1376,  1376,  1377,  1377,  1378,  1378,  1379,
+    1379,  1380,  1381,  1381,  1381,  1381,  1381,  1381,  1381,  1381,
+    1381,  1381,  1381,  1381,  1381,  1381,  1381,  1381,  1381,  1381,
+    1381,  1381,  1381,  1381,  1382,  1382,  1383,  1383,  1384,  1384,
+    1385,  1385,  1386,  1386,  1387,  1387,  1388,  1388,  1389,  1389,
+    1389,  1390,  1390,  1391,  1391,  1391,  1391,  1391,  1391,  1392,
+    1392,  1392,  1393,  1393,  1393,  1393,  1394,  1394,  1395,  1395,
+    1396,  1396,  1397,  1397,  1398,  1399,  1399,  1399,  1399,  1399,
+    1399,  1400,  1400,  1401,  1401,  1402,  1403,  1403,  1404,  1404,
+    1405,  1406,  1407,  1407,  1408,  1408,  1408,  1409,  1409,  1410,
+    1410,  1410,  1410,  1411,  1411,  1412,  1413,  1414,  1414,  1414,
+    1415,  1415,  1415,  1415,  1416,  1416,  1417,  1417,  1418,  1418,
+    1419,  1419,  1420,  1421,  1421,  1422,  1422,  1423,  1423,  1424,
+    1425,  1425,  1426,  1426,  1426,  1426,  1426,  1426,  1426,  1426,
+    1426,  1426,  1426,  1426,  1427,  1427,  1427,  1427,  1427,  1427,
+    1427,  1427,  1427,  1428,  1428,  1428,  1428,  1429,  1429,  1430,
+    1430,  1431,  1431,  1432,  1432,  1433,  1434,  1434,  1435,  1435,
+    1436,  1436,  1437,  1438,  1438,  1439,  1439,  1440,  1440,  1441,
+    1441,  1442,  1443,  1443,  1444,  1444,  1445,  1445,  1446,  1446,
+    1447,  1448,  1448,  1449,  1450,  1450,  1451,  1451,  1452,  1452,
+    1453,  1453,  1454,  1455,  1455,  1455,  1456,  1456,  1456,  1456,
+    1456,  1457,  1457,  1458,  1458,  1458,  1458,  1458,  1458,  1459,
+    1459,  1459,  1459,  1459,  1460,  1460,  1460,  1460,  1460,  1461,
+    1461,  1461,  1461,  1461,  1462,  1463,  1463,  1464,  1464,  1465,
+    1465,  1466,  1467,  1467,  1467,  1468,  1469,  1470,  1471,  1472,
+    1472,  1473,  1474,  1475,  1476,  1477,  1478,  1479,  1480,  1481,
+    1482,  1483,  1484,  1485,  1485,  1486,  1486,  1487,  1487,  1488,
+    1488,  1489,  1489,  1490,  1490,  1491,  1491,  1492,  1492,  1492,
+    1493,  1493,  1493,  1494,  1494,  1494,  1494,  1495,  1495,  1496,
+    1496,  1497,  1497,  1497,  1498,  1498,  1498,  1499,  1499,  1500,
+    1501,  1501,  1501,  1502,  1502,  1503,  1503,  1504,  1504,  1505,
+    1505,  1506,  1506,  1507,  1508,  1509,  1509,  1510,  1510,  1511,
+    1511,  1512,  1512,  1513,  1513,  1514,  1515,  1515,  1516,  1516,
+    1517,  1518,  1518,  1519,  1519,  1519,  1520,  1520,  1521,  1521,
+    1522,  1522,  1522,  1523,  1524,  1524,  1525,  1525,  1526,  1526,
+    1527,  1527,  1527,  1527,  1527,  1527,  1527,  1527,  1527,  1528,
+    1528,  1529,  1530,  1531,  1532,  1533,  1534,  1535,  1536,  1537,
+    1538,  1539,  1540,  1541,  1541,  1542,  1543,  1544,  1545,  1546,
+    1547,  1548,  1549,  1550,  1551,  1552,  1553,  1554,  1555,  1556,
+    1557,  1558,  1558,  1558,  1559,  1560,  1561,  1562,  1563,  1564,
+    1565,  1566,  1567,  1568,  1569,  1570,  1571,  1572,  1573,  1573,
+    1574,  1574,  1575,  1575,  1576,  1576,  1577,  1577,  1578,  1578,
+    1579,  1579,  1579,  1579,  1580,  1580,  1581,  1581,  1582,  1582,
+    1583,  1583,  1583,  1584,  1585,  1586,  1586,  1586,  1586,  1586,
+    1586,  1587,  1587,  1588,  1588,  1589,  1589,  1590,  1590,  1590,
+    1592,  1591,  1594,  1593,  1593,  1595,  1595,  1596,  1595,  1597,
+    1597,  1598,  1598,  1598,  1598,  1598,  1598,  1598,  1598,  1598,
+    1598,  1598,  1598,  1599,  1599,  1601,  1600,  1600,  1602,  1602,
+    1603,  1603,  1605,  1604,  1606,  1604,  1607,  1604,  1608,  1608,
+    1609,  1609,  1611,  1610,  1612,  1613,  1613,  1614,  1615,  1615,
+    1615,  1616,  1617,  1618,  1618,  1619,  1619,  1620,  1620,  1620,
+    1621,  1621,  1622,  1622,  1623,  1623,  1624,  1624,  1625,  1625,
+    1625,  1625,  1626,  1626,  1627,  1627,  1628,  1628,  1629,  1629,
+    1630,  1630,  1631,  1631,  1632,  1632,  1632,  1633,  1633,  1634,
+    1634,  1635,  1635,  1636,  1636,  1637,  1638,  1638,  1638,  1638,
+    1639,  1639,  1639,  1640,  1641,  1641,  1641,  1642,  1642,  1643,
+    1644,  1644,  1644,  1644,  1644,  1644,  1644,  1644,  1644,  1645,
+    1645,  1646,  1646,  1646,  1647,  1647,  1647,  1648,  1648,  1648,
+    1649,  1649,  1650,  1650,  1651,  1651,  1652,  1653,  1654,  1654,
+    1655,  1655,  1656,  1656,  1657,  1657,  1658,  1658,  1659,  1659,
+    1660,  1661,  1662,  1663,  1664,  1665,  1666,  1666,  1667,  1668,
+    1668,  1669,  1669,  1670,  1670,  1671,  1671,  1672,  1672,  1672,
+    1673,  1673,  1673,  1674,  1674,  1675,  1675,  1676,  1676,  1677,
+    1678,  1678,  1678,  1678,  1678,  1679,  1679,  1679,  1680,  1680,
+    1680,  1680,  1680,  1680,  1680,  1680,  1680,  1680,  1680,  1680,
+    1680,  1680,  1680,  1680,  1680,  1680,  1680,  1680,  1680,  1680,
+    1680,  1680,  1680,  1680,  1680,  1680,  1680,  1680,  1680,  1680,
+    1680,  1680,  1680,  1681,  1681,  1681,  1682,  1682,  1682,  1682,
+    1682,  1682,  1682,  1682,  1682,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,
+    1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1683,  1684,
+    1684,  1684,  1685,  1685,  1685,  1685,  1686,  1686,  1686,  1686,
+    1686,  1687,  1688,  1688,  1688,  1688,  1688,  1688,  1688,  1689,
+    1689,  1689,  1689,  1689,  1689,  1689,  1690,  1690,  1691,  1691,
+    1692,  1692,  1693,  1694,  1694,  1695,  1695,  1696,  1696,  1697,
+    1697,  1698,  1698,  1698,  1698,  1698,  1699,  1699,  1699,  1699,
+    1700,  1700,  1700,  1700,  1701,  1701,  1701,  1701,  1701,  1701,
+    1702,  1703,  1703,  1703,  1703,  1703,  1703,  1703,  1704,  1704,
+    1704,  1705,  1705,  1706,  1707,  1707,  1708,  1709,  1709,  1710,
+    1710,  1711,  1711,  1711,  1711,  1712,  1712,  1712,  1712,  1712,
+    1712,  1712,  1714,  1713,  1713,  1715,  1715,  1716,  1716,  1717,
+    1718,  1718,  1718,  1718,  1720,  1719,  1719,  1721,  1722,  1723,
+    1724,  1724,  1724,  1724,  1724,  1724,  1724,  1724,  1725,  1725,
+    1725,  1725,  1725,  1726,  1726,  1727,  1727,  1727,  1727,  1728,
+    1728,  1728,  1728,  1728,  1729,  1729,  1730,  1729,  1729,  1729,
+    1731,  1731,  1732,  1731,  1731,  1733,  1733,  1733,  1733,  1734,
+    1734,  1735,  1735,  1736,  1736,  1736,  1736,  1736,  1736,  1736,
+    1736,  1736,  1736,  1736,  1736,  1736,  1736,  1736,  1736,  1736,
+    1736,  1736,  1736,  1736,  1736,  1736,  1736,  1736,  1736,  1736,
+    1736,  1736,  1736,  1736,  1736,  1736,  1736,  1737,  1737,  1738,
+    1738,  1739,  1739,  1740,  1740,  1740,  1741,  1741,  1741,  1741,
+    1741,  1742,  1742,  1743,  1743,  1744,  1744,  1745,  1745,  1746,
+    1746,  1746,  1747,  1747,  1747,  1748,  1748,  1748,  1749,  1749,
+    1749,  1749,  1749,  1749,  1750,  1751,  1752,  1753,  1754,  1755,
+    1756,  1756,  1756,  1757,  1757,  1757,  1757,  1757,  1757,  1757,
+    1757,  1757,  1757,  1757,  1757,  1757,  1757,  1757,  1757,  1758,
+    1759,  1759,  1760,  1760,  1761,  1761,  1762,  1762,  1763,  1763,
+    1763,  1763,  1763,  1764,  1764,  1765,  1765,  1766,  1766,  1766,
+    1766,  1766,  1767,  1767,  1769,  1768,  1770,  1770,  1771,  1771,
+    1771,  1772,  1772,  1772,  1773,  1773,  1774,  1775,  1775,  1776,
+    1777,  1778,  1778,  1778,  1779,  1780,  1781,  1782,  1782,  1782,
+    1782,  1782,  1782,  1782,  1782,  1783,  1784,  1784,  1784,  1785,
+    1785,  1785,  1785,  1785,  1786,  1786,  1786,  1786,  1786,  1786,
+    1787,  1787,  1788,  1789,  1790,  1790,  1790,  1791,  1792,  1792,
+    1792,  1793,  1793,  1793,  1795,  1794,  1796,  1797,  1797,  1797,
+    1797,  1798,  1798,  1799,  1799,  1801,  1800,  1802,  1802,  1804,
+    1805,  1806,  1807,  1803,  1809,  1810,  1811,  1812,  1808,  1813,
+    1813,  1813,  1813,  1813,  1813,  1814,  1814,  1815,  1815,  1815,
+    1816,  1816,  1817,  1817,  1817,  1818,  1818,  1819,  1819,  1819,
+    1820,  1820,  1821,  1821,  1822,  1822,  1823,  1824,  1824,  1825,
+    1825,  1826,  1826,  1826,  1827,  1827,  1828,  1828,  1829,  1829,
+    1830,  1830,  1831,  1831,  1832,  1832,  1833,  1833,  1833,  1834,
+    1834,  1835
 };
 
   /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
@@ -23598,211 +23717,214 @@
        1,     1,     3,     3,     3,     3,     3,     3,     3,     3,
        3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
        3,     3,     3,     3,     3,     5,     3,     3,     3,     3,
-       3,     3,     3,     3,     1,     0,     1,     3,     1,     1,
+       3,     3,     3,     3,     3,     1,     0,     1,     3,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     3,     3,     3,     3,     0,     3,     9,
-       6,     7,     9,     4,    10,     0,     6,     2,     9,     7,
-       6,     7,    11,     8,     7,     0,     3,     3,     6,     3,
-       0,     3,    12,    11,    11,     1,     3,     2,     2,     2,
-       2,     2,     2,     2,     0,    12,     0,     6,     2,     0,
-       1,     3,     1,     0,     2,     0,     2,     0,     1,     3,
-       4,     0,     2,     0,     2,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     3,     1,
-       0,     2,     0,     2,     2,     2,     2,     2,     3,     3,
-       1,     1,     1,     2,     3,     3,     3,     0,     3,     0,
-       1,     3,     1,     3,     0,     1,     3,     1,     4,     0,
-       1,     1,     1,     0,     3,     2,     3,     0,     3,     5,
-       5,     0,     7,     0,     6,     1,     1,     1,     3,     1,
-       1,     1,     3,     0,     1,     1,     1,     1,     2,     1,
-       3,     1,     1,     0,     1,     0,     2,     3,     5,     1,
+       1,     1,     1,     1,     3,     3,     3,     3,     0,     3,
+       9,     6,     7,     9,     4,    10,     0,     6,     2,     9,
+       7,     6,     7,    11,     8,     7,     0,     3,     3,     6,
+       3,     0,     3,    12,    11,    11,     1,     3,     2,     2,
+       2,     2,     2,     2,     2,     0,    12,     0,     6,     2,
+       0,     1,     3,     1,     0,     2,     0,     2,     0,     1,
+       3,     4,     0,     2,     0,     2,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     3,
+       1,     0,     2,     0,     2,     2,     2,     2,     2,     3,
+       3,     1,     1,     1,     2,     3,     3,     3,     0,     3,
+       0,     1,     3,     1,     3,     0,     1,     3,     1,     4,
+       0,     1,     1,     1,     0,     3,     2,     3,     0,     3,
+       5,     5,     0,     7,     0,     6,     1,     1,     1,     3,
+       1,     1,     1,     3,     0,     1,     1,     1,     1,     2,
+       1,     3,     1,     1,     0,     1,     0,     2,     3,     5,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     3,     4,     0,     1,     1,     1,
-       3,     1,     3,     3,     1,     2,     1,     1,     1,     1,
-       3,     3,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     3,     0,     2,     1,
+       1,     1,     1,     1,     1,     3,     4,     0,     1,     1,
+       1,     3,     1,     3,     3,     1,     2,     1,     1,     1,
+       1,     3,     3,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     3,     0,     2,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     0,     5,     0,     2,     0,     3,     0,     2,
-       2,     2,     2,     0,     6,     2,     0,     2,     1,     1,
-       3,     0,     0,     0,     7,     0,     2,     2,     1,     1,
-       0,     0,     8,     0,     6,     1,     2,     1,     2,     0,
-       0,     6,     0,     0,     6,     0,     2,     0,     5,     0,
-       1,     0,     5,     0,     2,     0,     5,     4,     0,     0,
-       8,     0,     0,     8,     1,     1,     1,     1,     1,     0,
-       2,     0,     4,     0,     1,     1,     3,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     0,     1,
-       1,     3,     1,     1,     1,     1,     1,     1,     1,     0,
-       1,     1,     3,     1,     0,     1,     1,     3,     1,     1,
-       1,     1,     1,     1,     1,     0,     1,     1,     3,     1,
-       1,     1,     2,     1,     1,     2,     3,     1,     3,     3,
-       3,     3,     3,     3,     3,     4,     3,     1,     1,     3,
-       3,     1,     1,     2,     1,     2,     1,     0,     2,     1,
-       2,     1,     6,     6,     5,     4,     5,     4,     5,     0,
-       1,     0,     3,     0,     2,     0,     8,     9,     0,     1,
-       1,     3,     0,     2,     0,     3,     1,     3,     5,     0,
-       4,     3,     1,     1,     1,     3,     1,     3,     0,     4,
-       1,     3,     1,     1,     0,     3,     1,     3,     3,     0,
-       1,     2,     1,     3,     4,     3,     3,     3,     4,     4,
-       3,     1,     2,     1,     4,     0,     1,     1,     2,     1,
-       1,     1,     0,     3,     1,     2,     1,     3,     0,     1,
-       3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
+       1,     1,     1,     0,     5,     0,     2,     0,     3,     0,
+       2,     2,     2,     2,     0,     6,     2,     0,     2,     1,
+       1,     3,     0,     0,     0,     7,     0,     2,     2,     1,
+       1,     0,     0,     8,     0,     6,     1,     2,     1,     2,
+       0,     0,     6,     0,     0,     6,     0,     2,     0,     5,
+       0,     1,     0,     5,     0,     2,     0,     5,     4,     0,
+       0,     8,     0,     0,     8,     1,     1,     1,     1,     1,
+       0,     2,     0,     4,     0,     1,     1,     3,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     0,
+       1,     1,     3,     1,     1,     1,     1,     1,     1,     1,
+       0,     1,     1,     3,     1,     0,     1,     1,     3,     1,
+       1,     1,     1,     1,     1,     1,     0,     1,     1,     3,
+       1,     1,     1,     2,     1,     1,     2,     3,     1,     3,
+       3,     3,     3,     3,     3,     3,     4,     3,     1,     1,
+       3,     3,     1,     1,     2,     1,     2,     1,     0,     2,
+       1,     2,     1,     6,     6,     5,     4,     5,     4,     5,
+       0,     1,     0,     3,     0,     2,     0,     8,     9,     0,
+       1,     1,     3,     0,     2,     0,     3,     1,     3,     5,
+       0,     4,     3,     1,     1,     1,     3,     1,     3,     0,
+       4,     1,     3,     1,     1,     0,     3,     1,     3,     3,
+       0,     1,     2,     1,     3,     4,     3,     3,     3,     4,
+       4,     3,     1,     2,     1,     4,     0,     1,     1,     2,
+       1,     1,     1,     0,     3,     1,     2,     1,     3,     0,
+       1,     3,     3,     3,     3,     3,     3,     3,     3,     3,
        3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
-       5,     1,     1,     3,     4,     4,     3,     2,     2,     3,
-       3,     2,     3,     3,     1,     1,     1,     4,     4,     4,
+       3,     5,     1,     1,     3,     4,     4,     3,     2,     2,
+       3,     3,     2,     3,     3,     1,     1,     1,     4,     4,
+       4,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     3,     1,     1,     3,     0,
+       1,     6,     7,     7,     7,     8,     3,     4,     0,     2,
+       0,     1,     0,     1,     2,     2,     9,     0,     2,     0,
+       1,     1,     3,     3,     3,     1,     2,     1,     1,     3,
+       2,     3,     2,     2,     1,     3,     3,     2,     3,     1,
+       2,     2,     2,     1,     2,     1,     1,     1,     2,     3,
+       2,     3,     2,     2,     5,     5,     2,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     2,     2,
+       1,     2,     1,     2,     3,     2,     1,     1,     1,     1,
+       1,     1,     2,     0,     1,     1,     1,     1,     1,     0,
+       1,     0,     1,     1,     5,     0,     3,     0,     2,     3,
+       0,     1,     2,     1,     1,     1,     1,     3,     3,     3,
+       3,     0,     1,     0,     1,     0,     1,     2,     1,     1,
+       2,     2,     2,     4,     3,     1,     3,     2,     1,     2,
+       2,     2,     2,     2,     2,     2,     1,     3,     3,     1,
+       1,     1,     1,     1,     1,     1,     2,     1,     1,     2,
+       1,     1,     1,     0,     2,     1,     1,     1,     1,     1,
+       1,     0,     2,     0,     1,     1,     2,     2,     1,     2,
+       2,     0,     1,     1,     1,     3,     1,     3,     0,     1,
+       0,     4,     0,     1,     5,     0,     3,     3,     1,     0,
+       2,     2,     2,     0,     3,     3,     6,     6,     1,     1,
+       2,     2,     2,     2,     2,     1,     1,     0,     1,     1,
+       1,     1,     0,     1,     0,     1,     1,     2,     1,     3,
+       0,     1,     1,     2,     1,     0,     1,     1,     2,     1,
+       1,     3,     2,     1,     3,     3,     1,     3,     3,     0,
+       1,     2,     2,     1,     1,     1,     1,     1,     3,     1,
+       2,     5,     3,     1,     1,     4,     0,     1,     0,     2,
+       1,     3,     4,     4,     0,     5,     0,     5,     0,     5,
+       0,     5,     0,     4,     0,    10,     7,     6,     6,     6,
+       4,     7,     7,     6,     5,     5,     5,     5,     5,     5,
+       3,     3,     0,     2,     8,     3,     0,     2,     2,     0,
+       1,     1,     2,     2,     2,     2,     5,     3,     3,     3,
+       3,     5,     4,     3,     4,     4,     2,     2,     2,     0,
+       2,     2,     1,     2,     2,     2,     2,     3,     0,     3,
+       1,     4,     0,     3,     0,     2,     0,     1,     1,     2,
+       1,     3,     1,     2,     0,     1,     1,     3,     2,     2,
+       3,     6,     5,     3,     4,     4,     4,     4,     5,     4,
+       3,     3,     8,     7,     4,     4,     1,     1,     0,     1,
+       2,     2,     1,     1,     1,     3,     3,     1,     3,     1,
+       3,     6,     5,     2,     6,     5,     4,     4,     3,     3,
+       3,     3,     2,     2,     6,     8,     5,     5,     4,     4,
+       4,     3,     5,     5,     5,     5,     1,     3,     1,     1,
+       1,     0,     1,     1,     2,     2,     3,     1,     1,     3,
+       1,     1,     0,     1,     0,     1,     0,     1,     1,     0,
+       2,     1,     0,     1,     1,     1,     2,     2,     2,     0,
+       1,     1,     3,     1,     1,     1,     3,     3,     3,     1,
+       1,     4,     0,     0,    11,     3,     0,     1,     1,     3,
+       3,     2,     2,     0,     3,     0,     3,     0,     3,     0,
+       3,     0,     1,     1,     3,     1,     1,     0,     2,     1,
+       3,     3,     3,     1,     4,     0,     1,     1,     5,     0,
+       1,     1,     2,     1,     1,     1,     5,     0,     3,     0,
+       5,     4,     2,     4,     0,     1,     1,     2,     1,     1,
+       1,     1,     1,     2,     4,     0,     1,     1,     0,     4,
+       3,     3,     5,     1,     3,     3,     5,     7,     1,     3,
+       2,     1,     1,     8,     5,     1,     3,     3,     4,     0,
+       4,     0,     2,     1,     2,     1,     1,     3,     2,     3,
+       3,     2,     3,     4,     3,     4,     2,     3,     2,     1,
+       4,     4,     4,     4,     3,     3,     4,     1,     1,     1,
+       9,     8,     0,     1,     2,     1,     1,     1,     3,     2,
+       2,     0,     1,     2,     1,     1,     1,     2,     1,     3,
+       4,     4,     1,     1,     2,     0,     1,     2,     1,     3,
+       1,     1,     1,     2,     0,     2,     2,     1,     1,     0,
+       2,     3,     3,     3,     2,     3,     4,     3,     4,     3,
+       4,     1,     3,     4,     3,     4,     1,     3,     4,     5,
+       7,     6,     8,     6,     5,     6,     4,     3,     5,     4,
+       6,     3,     4,     1,     1,     0,     3,     3,     3,     3,
+       3,     3,     5,     5,     3,     3,     3,     3,     3,     3,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     3,     1,     1,     3,     0,     1,
-       6,     7,     7,     7,     8,     3,     4,     0,     2,     0,
-       1,     0,     1,     2,     2,     9,     0,     2,     0,     1,
-       1,     3,     3,     3,     1,     2,     1,     1,     3,     2,
-       3,     2,     2,     1,     3,     3,     2,     3,     1,     2,
-       2,     2,     1,     2,     1,     1,     1,     2,     3,     2,
-       3,     2,     2,     5,     5,     2,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     2,     2,     1,
-       2,     1,     2,     3,     2,     1,     1,     1,     1,     1,
-       1,     2,     0,     1,     1,     1,     1,     1,     0,     1,
-       0,     1,     1,     5,     0,     3,     0,     2,     3,     0,
-       1,     2,     1,     1,     1,     1,     3,     3,     3,     3,
-       0,     1,     0,     1,     0,     1,     2,     1,     1,     2,
-       2,     2,     4,     3,     1,     3,     2,     1,     2,     2,
-       2,     2,     2,     2,     2,     1,     3,     3,     1,     1,
-       1,     1,     1,     1,     1,     2,     1,     1,     2,     1,
-       1,     1,     0,     2,     1,     1,     1,     1,     1,     1,
-       0,     2,     0,     1,     1,     2,     2,     1,     2,     2,
-       0,     1,     1,     1,     3,     1,     3,     0,     1,     0,
-       4,     0,     1,     5,     0,     3,     3,     1,     0,     2,
-       2,     2,     0,     3,     3,     6,     6,     1,     1,     2,
-       2,     2,     2,     2,     1,     1,     0,     1,     1,     1,
-       1,     0,     1,     0,     1,     1,     2,     1,     3,     0,
-       1,     1,     2,     1,     0,     1,     1,     2,     1,     1,
-       3,     2,     1,     3,     3,     1,     3,     3,     0,     1,
-       2,     2,     1,     1,     1,     1,     1,     3,     1,     2,
-       5,     3,     1,     1,     4,     0,     1,     0,     2,     1,
-       3,     4,     4,     0,     5,     0,     5,     0,     5,     0,
-       5,     0,     4,     0,    10,     7,     6,     6,     6,     4,
-       7,     7,     6,     8,     7,     5,     5,     5,     5,     0,
-       2,     8,     3,     0,     2,     2,     0,     1,     1,     2,
-       2,     2,     2,     5,     3,     3,     3,     3,     5,     4,
-       3,     4,     4,     2,     2,     2,     0,     2,     2,     1,
-       2,     2,     2,     2,     3,     0,     3,     1,     4,     0,
-       3,     0,     2,     0,     1,     1,     2,     1,     3,     1,
-       2,     0,     1,     1,     3,     2,     2,     3,     6,     5,
-       3,     4,     4,     4,     4,     5,     4,     3,     3,     8,
-       7,     4,     4,     1,     1,     0,     1,     2,     2,     1,
-       1,     1,     3,     3,     1,     3,     1,     3,     6,     5,
-       2,     6,     5,     4,     4,     3,     3,     3,     3,     2,
-       2,     6,     8,     5,     5,     4,     4,     4,     3,     5,
-       5,     5,     5,     1,     3,     1,     1,     1,     0,     1,
-       1,     2,     2,     3,     1,     1,     3,     1,     1,     0,
-       1,     0,     1,     0,     1,     1,     0,     2,     1,     0,
-       1,     1,     1,     2,     2,     2,     0,     1,     1,     3,
-       1,     1,     1,     3,     3,     3,     1,     1,     4,     0,
-       0,    11,     3,     0,     1,     1,     3,     3,     2,     2,
-       0,     3,     0,     3,     0,     3,     0,     3,     0,     1,
-       1,     3,     1,     1,     0,     2,     1,     3,     3,     3,
-       1,     4,     0,     1,     1,     5,     0,     1,     1,     2,
-       1,     1,     1,     5,     0,     3,     0,     5,     4,     2,
-       4,     0,     1,     1,     2,     1,     1,     1,     1,     1,
-       2,     4,     0,     1,     1,     0,     4,     3,     3,     5,
-       1,     3,     3,     5,     7,     1,     3,     2,     1,     1,
-       8,     5,     1,     3,     3,     4,     0,     4,     0,     2,
-       1,     2,     1,     1,     3,     2,     3,     3,     2,     3,
-       4,     3,     4,     2,     3,     2,     1,     4,     4,     4,
-       4,     3,     3,     4,     1,     1,     1,     9,     8,     0,
-       1,     2,     1,     1,     1,     3,     2,     2,     0,     1,
-       2,     1,     1,     1,     2,     1,     3,     4,     4,     1,
-       1,     2,     0,     1,     2,     1,     3,     1,     1,     1,
-       2,     0,     2,     2,     1,     1,     0,     2,     3,     3,
-       3,     2,     3,     4,     3,     4,     3,     4,     1,     3,
-       4,     3,     4,     1,     3,     4,     5,     7,     6,     8,
-       6,     5,     6,     4,     3,     5,     4,     6,     3,     4,
-       1,     1,     0,     3,     3,     3,     3,     3,     3,     5,
-       5,     3,     3,     3,     3,     3,     3,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     3,     1,     1,     1,     1,     1,     3,
+       2,     2,     2,     2,     1,     3,     5,     6,     2,     4,
+       7,     2,     7,     9,    12,     5,     6,     6,     4,     4,
+       5,     3,     3,     0,     1,     4,     6,     2,     4,     4,
+       4,    10,     6,     8,     8,     6,     4,     4,     6,     4,
+       4,     4,     6,     4,     7,     7,     7,     6,     6,     6,
+       6,     3,     4,     6,     8,     2,     2,     8,     8,     6,
+       6,     1,     6,     6,     8,     8,     6,     8,     6,     2,
+       8,     8,     2,     2,     2,     0,     2,     4,     4,     4,
+       4,     3,     8,     6,     8,     4,     6,     4,     6,     8,
+       4,     3,     6,     4,     6,     4,     7,     7,    10,     1,
+       4,     4,     4,     4,     4,     6,     4,     4,     6,     2,
+       3,     0,     4,     0,     3,     0,     1,     1,     3,     2,
+       1,     1,     5,     6,     5,     5,     5,     7,     5,     6,
+       5,     6,     5,     6,     5,     6,     5,     6,     5,     5,
+       5,     5,     5,     6,     8,     4,     4,     4,     4,     4,
+       5,     7,     7,     6,     6,     9,     0,     3,     1,     1,
+       1,     1,     2,     0,     2,     0,     2,     2,     0,     2,
+       2,     0,     1,     2,     1,     1,     1,     3,     4,     0,
+       1,     0,     3,     0,     3,     0,     3,     1,     1,     2,
+       2,     2,     4,     2,     4,     1,     2,     2,     2,     4,
+       0,     3,     2,     2,     3,     1,     1,     1,     4,     2,
+       3,     1,     4,     0,     1,     0,     2,     0,     3,     3,
+       1,     2,     2,     3,     2,     1,     2,     1,     2,     1,
+       1,     2,     2,     2,     1,     1,     2,     1,     1,     1,
+       1,     1,     1,     1,     0,     1,     1,     3,     1,     3,
+       1,     3,     0,     1,     0,     2,     4,     5,     1,     1,
+       4,     1,     1,     5,     7,     5,     7,     3,     3,     3,
+       4,     4,     1,     2,     2,     1,     3,     3,     0,     1,
+       0,     1,     0,     1,     4,     1,     1,     1,     1,     1,
+       1,     3,     5,     3,     3,     4,     3,     3,     3,     4,
+       8,     4,     1,     3,     3,     7,     4,     0,     1,     0,
+       1,     1,     2,     1,     2,     3,     3,     1,     1,     2,
+       0,     2,     3,     3,     1,     1,     6,     6,     1,     2,
+       0,     1,     1,     0,     1,     1,     1,     1,     3,     1,
+       1,     3,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       3,     1,     1,     1,     1,     1,     3,     2,     2,     2,
-       2,     1,     3,     5,     6,     2,     4,     7,     2,     7,
-       9,    12,     5,     6,     6,     4,     4,     5,     3,     3,
-       0,     1,     4,     6,     2,     4,     4,     4,    10,     6,
-       8,     8,     6,     4,     4,     6,     4,     4,     4,     6,
-       4,     7,     7,     7,     6,     6,     6,     6,     3,     4,
-       6,     8,     2,     2,     8,     8,     6,     6,     1,     6,
-       6,     8,     8,     6,     8,     6,     2,     8,     8,     2,
-       2,     2,     0,     2,     4,     4,     4,     4,     3,     8,
-       6,     8,     4,     6,     4,     6,     8,     4,     3,     6,
-       4,     6,     4,     7,     7,    10,     1,     4,     4,     4,
-       4,     4,     6,     4,     4,     6,     2,     3,     0,     4,
-       0,     3,     0,     1,     1,     3,     2,     1,     1,     5,
-       6,     5,     5,     5,     7,     5,     6,     5,     6,     5,
-       6,     5,     6,     5,     6,     5,     5,     5,     5,     5,
-       6,     8,     4,     4,     4,     4,     4,     5,     7,     7,
-       6,     6,     9,     0,     3,     1,     1,     1,     1,     2,
-       0,     2,     0,     2,     2,     0,     2,     2,     0,     1,
-       2,     1,     1,     1,     3,     4,     0,     1,     0,     3,
-       0,     3,     0,     3,     1,     1,     2,     2,     2,     4,
-       2,     4,     1,     2,     2,     2,     4,     0,     3,     2,
-       2,     3,     1,     1,     1,     4,     2,     3,     1,     4,
-       0,     1,     0,     2,     0,     3,     3,     1,     2,     2,
-       3,     2,     1,     2,     1,     2,     1,     1,     2,     2,
-       2,     1,     1,     2,     1,     1,     1,     1,     1,     1,
-       1,     0,     1,     1,     3,     1,     3,     1,     3,     0,
-       1,     0,     2,     4,     5,     1,     1,     4,     1,     1,
-       5,     7,     5,     7,     3,     3,     3,     4,     4,     1,
-       2,     2,     1,     3,     3,     0,     1,     0,     1,     0,
-       1,     4,     1,     1,     1,     1,     1,     1,     3,     5,
-       3,     3,     4,     3,     3,     3,     4,     8,     4,     1,
-       3,     3,     7,     4,     0,     1,     0,     1,     1,     2,
-       1,     2,     3,     3,     1,     1,     2,     0,     2,     3,
-       3,     1,     1,     6,     6,     1,     2,     0,     1,     1,
-       0,     1,     1,     1,     1,     3,     1,     1,     3,     1,
+       1,     1,     1,     1,     1,     1,     1,     0,     1,     0,
+       2,     0,     1,     0,     1,     2,     0,     2,     2,     3,
+       3,     1,     4,     0,     3,     1,     3,     0,     2,     1,
+       3,     3,     0,     4,     3,     1,     0,     1,     3,     1,
+       2,     0,     1,     3,     3,     1,     0,     1,     1,     1,
+       0,     1,     2,     1,     3,     3,     1,     1,     1,     1,
+       1,     0,     2,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     3,     1,     2,
+       1,     2,     5,     2,     1,     2,     6,     6,     4,     6,
+       4,     5,     4,     4,     5,     4,     4,     4,     5,     5,
+       4,     6,     4,     1,     3,     1,     3,     0,     2,     0,
+       1,     0,     1,     1,     3,     1,     1,     9,    10,     8,
+       6,     7,     6,     0,     1,     1,     1,     1,     1,     0,
+       1,     1,     3,     4,     1,     3,     4,     3,     1,     2,
+       1,     2,     1,     1,     1,     3,     1,     3,     1,     1,
+       1,     0,     1,     3,     4,     0,     1,     3,     1,     1,
+       1,     0,     3,     0,     5,    10,     0,     1,     3,     1,
+       3,     0,     1,    10,     7,     8,     0,     2,     0,     2,
+       1,     1,     1,     3,     0,     1,     0,     1,     1,     3,
+       1,     1,     2,     2,     2,     1,     1,     1,     1,     0,
+       3,     3,     5,     5,     4,     5,     5,     2,     4,     4,
+       4,     7,     3,     3,     2,     6,     7,     7,     3,     6,
+       6,     3,     3,     2,     5,     4,     3,     4,     3,     3,
+       2,     2,     4,     6,     5,     4,     4,     3,     4,     4,
+       4,     4,     4,     4,     4,     4,     4,     4,     1,     1,
+       1,     1,     0,     1,     0,     2,     0,     1,     0,     1,
+       0,     1,     1,     2,     1,     1,     0,     2,     0,     2,
+       0,     2,     1,     3,     3,     1,     1,     1,     1,     1,
+       3,     1,     1,     0,     3,     2,     1,     0,     1,     1,
+       0,     4,     0,     4,     1,     0,     3,     0,     3,     3,
+       1,     2,     2,     2,     2,     2,     3,     1,     1,     1,
+       1,     1,     1,     0,     1,     0,     3,     3,     3,     1,
+       0,     2,     0,     4,     0,     4,     0,     3,     0,     1,
+       0,     2,     0,     3,     3,     2,     2,     3,     0,     1,
+       1,     2,    18,     1,     1,     0,     1,     0,     1,     1,
+       0,     1,     1,     1,     0,     2,     2,     1,     3,     4,
+       3,     3,     0,     2,     2,     1,     3,     3,     0,     4,
+       0,     3,     1,     1,     0,     3,     2,     3,     1,     1,
+       2,     0,     2,     3,     1,     3,     1,     1,     2,     2,
+       1,     1,     1,     1,     1,     2,     2,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     2,     2,     1,
+       1,     1,     1,     1,     1,     1,     1,     2,     2,     2,
+       0,     1,     1,     1,     3,     5,     2,     1,     1,     1,
+       1,     1,     3,     5,     1,     3,     2,     4,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     0,     1,     0,     2,     0,     1,
-       0,     1,     2,     0,     2,     2,     3,     3,     1,     4,
-       0,     3,     1,     3,     0,     2,     1,     3,     3,     0,
-       4,     3,     1,     0,     1,     3,     1,     2,     0,     1,
-       3,     3,     1,     0,     1,     1,     1,     0,     1,     2,
-       1,     3,     3,     1,     1,     1,     1,     1,     0,     2,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     3,     1,     2,     1,     3,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     3,     1,     2,     1,     2,     5,
-       2,     1,     2,     6,     6,     4,     6,     4,     5,     4,
-       4,     5,     4,     4,     4,     5,     5,     4,     6,     4,
-       1,     3,     1,     3,     0,     2,     0,     1,     0,     1,
-       1,     3,     1,     1,     9,    10,     8,     6,     7,     6,
-       0,     1,     1,     1,     1,     1,     0,     1,     1,     3,
-       4,     1,     3,     4,     3,     1,     2,     1,     2,     1,
-       1,     1,     3,     1,     3,     1,     1,     1,     0,     1,
-       3,     4,     0,     1,     3,     1,     1,     1,     0,     3,
-       0,     5,    10,     0,     1,     3,     1,     3,     0,     1,
-      10,     7,     8,     0,     2,     0,     2,     1,     1,     1,
-       3,     0,     1,     0,     1,     1,     3,     1,     1,     2,
-       2,     2,     1,     1,     1,     1,     0,     3,     3,     5,
-       5,     4,     5,     5,     2,     4,     4,     4,     7,     3,
-       3,     2,     6,     7,     7,     3,     6,     6,     3,     3,
-       2,     5,     4,     3,     4,     3,     3,     2,     2,     4,
-       6,     5,     4,     4,     3,     4,     4,     4,     4,     4,
-       4,     4,     4,     4,     4,     1,     1,     1,     1,     0,
-       1,     0,     2,     0,     1,     0,     1,     0,     1,     1,
-       2,     1,     1,     0,     2,     0,     2,     0,     2,     1,
-       3,     3,     1,     1,     1,     1,     1,     3,     1,     1,
-       0,     3,     2,     1,     0,     1,     1,     0,     4,     0,
-       4,     1,     0,     3,     0,     3,     3,     1,     2,     2,
-       2,     2,     2,     3,     1,     1,     1,     1,     1,     1,
-       0,     1,     0,     3,     3,     3,     1,     0,     2,     0,
-       4,     0,     4,     0,     3,     0,     1,     0,     2,     0,
-       3,     3,     2,     2,     3,     0,     1,     1,     2,    18,
-       1,     1,     0,     1,     0,     1,     1,     0,     1,     1,
-       1,     0,     2,     2,     1,     3,     4,     3,     3,     0,
-       2,     2,     1,     3,     3,     0,     4,     0,     3,     1,
-       1,     0,     3,     2,     3,     1,     1,     2,     0,     2,
-       3,     1,     3,     1,     1,     2,     2,     1,     1,     1,
-       1,     1,     2,     2,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     2,     2,     1,     1,     1,     1,
-       1,     1,     1,     1,     2,     2,     2,     0,     1,     1,
-       1,     3,     5,     2,     1,     1,     1,     1,     1,     3,
-       5,     1,     3,     2,     4,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     3,     1,     2,     1,     3,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
@@ -23849,46 +23971,47 @@
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     2,     2,     2,     2,     5,     5,     7,     7,     3,
+       3,     3,     6,     6,     6,     4,     0,     2,     4,     6,
+       1,     3,     1,     2,     2,     0,     2,     1,     3,     2,
+       1,     1,     1,     1,     1,     1,     0,     1,     1,     1,
+       0,     2,     2,     2,     0,     2,     2,     2,     2,     2,
+       3,     3,     4,     6,     2,     3,     3,     2,     1,     3,
+       3,     2,     2,     1,     0,     2,     3,     0,     2,     2,
+       2,     2,     2,     2,     1,     1,     1,     1,     1,     1,
+       1,     1,     0,     4,     4,     1,     1,     1,     3,     3,
+       1,     1,     2,     2,     0,     3,     2,     1,     1,     3,
+       4,     2,     6,     5,     9,     3,     3,     2,     4,     3,
+       6,     7,    10,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     4,     7,     0,     9,     8,     6,
+       5,     9,     0,    11,     7,     0,     1,     1,     1,     0,
+       1,     1,     3,     2,     3,     2,     2,     2,     2,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     2,
-       2,     2,     2,     5,     5,     7,     7,     3,     3,     3,
-       6,     6,     6,     4,     0,     2,     4,     6,     1,     3,
-       1,     2,     2,     0,     2,     1,     3,     2,     1,     1,
-       1,     1,     1,     1,     0,     1,     1,     1,     0,     2,
-       2,     2,     0,     2,     2,     2,     2,     2,     3,     3,
-       4,     6,     2,     3,     3,     2,     1,     3,     3,     2,
-       2,     1,     0,     2,     3,     0,     2,     2,     2,     2,
-       2,     2,     1,     1,     1,     1,     1,     1,     1,     1,
-       0,     4,     4,     1,     1,     1,     3,     3,     1,     1,
-       2,     2,     0,     3,     2,     1,     1,     3,     4,     2,
-       6,     5,     9,     3,     3,     2,     4,     3,     6,     7,
-      10,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     4,     7,     0,     9,     8,     6,     5,     9,
-       0,    11,     7,     0,     1,     1,     1,     0,     1,     1,
-       3,     2,     3,     2,     2,     2,     2,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     2,     2,
-       1,     3,     2,     2,     2,     2,     2,     2,     2,     2,
-       1,     1,     2,     2,     2,     0,     3,     0,     1,     3,
-       1,     2,     2,     2,     1,     3,     3,     1,     3,     1,
-       3,     1,     3,     0,     3,     0,     3,     4,     5,     4,
-       6,     6,     7,     1,     7,     9,     5,     6,     8,     4,
-       7,     7,     8,     2,     1,     3,     1,     3,     0,     3,
-       1,     3,     0,     2,     2,     2,     2,     0,     3,     0,
-       3,     0,     3,     4,     3,     3,     0,     3,     0,     3,
-       0,     1,     0,     3,     2,     0,     1,     2,     0,     1,
-       4,     4,     5,     2,     3,     0,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     0,
-       3,     3,     4,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     0,     3,     1,     2,
-       1,     2,     3,     3,     3,     0,     3,     3,     0,     7,
-       2,     0,     3,     4,     4,     1,     1,     0,     2,     0,
-      12,     7,     6,     0,     0,     0,     0,    14,     0,     0,
-       0,     0,    11,     4,     4,     3,     4,     3,     3,     0,
-       2,     1,     3,     5,     1,     1,     0,     1,     1,     0,
-       2,     0,     1,     3,     5,     3,     3,     3,     1,     3,
-       4,     6,    10,     1,     5,     0,     2,     3,     1,     1,
-       0,     3,     1,     3,     1,     3,     1,     2,     0,     3,
-       0,     1,     1,     0,     1,     1
+       2,     2,     1,     3,     2,     2,     2,     2,     2,     2,
+       2,     2,     1,     1,     2,     2,     2,     0,     3,     0,
+       1,     3,     1,     2,     2,     2,     1,     3,     3,     1,
+       3,     1,     3,     1,     3,     0,     3,     0,     3,     3,
+       2,     7,     3,     3,     2,     0,     2,     4,     1,     1,
+       1,     1,     1,     1,     3,     4,     3,     5,     5,     6,
+       3,     3,     3,     5,     5,     3,     3,     5,     2,     3,
+       3,     3,     2,     4,     7,     4,     7,     3,     5,     2,
+       1,     3,     1,     3,     0,     3,     1,     3,     0,     2,
+       2,     2,     2,     0,     3,     0,     3,     0,     3,     4,
+       3,     3,     0,     3,     0,     3,     0,     1,     0,     3,
+       2,     0,     1,     2,     0,     1,     4,     4,     5,     2,
+       3,     0,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     0,     3,     3,     4,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     0,     3,     1,     2,     1,     2,     3,     3,
+       3,     0,     3,     3,     0,     7,     2,     0,     3,     4,
+       4,     1,     1,     0,     2,     0,    12,     7,     6,     0,
+       0,     0,     0,    14,     0,     0,     0,     0,    11,     4,
+       4,     3,     4,     3,     3,     0,     2,     1,     3,     5,
+       1,     1,     0,     1,     1,     0,     2,     0,     1,     3,
+       5,     3,     3,     3,     1,     3,     4,     6,    10,     1,
+       5,     0,     2,     3,     1,     1,     0,     3,     1,     3,
+       1,     3,     1,     2,     0,     3,     0,     1,     1,     0,
+       1,     1
 };
 
 
@@ -24668,16 +24791,16 @@
   switch (yyn)
     {
         case 3:
-#line 2155 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2179 "sql_yacc.yy" /* yacc.c:1646  */
     {
             ITEMIZE((yyvsp[-1].item), &(yyvsp[-1].item));
             static_cast<Expression_parser_state *>(YYP)->result= (yyvsp[-1].item);
           }
-#line 24677 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 24800 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 4:
-#line 2160 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2184 "sql_yacc.yy" /* yacc.c:1646  */
     {
             /*
               We enter here when translating partition info string into
@@ -24687,11 +24810,11 @@
             static_cast<Partition_expr_parser_state *>(YYP)->result=
               &(yyvsp[-1].partition_clause)->part_info;
           }
-#line 24691 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 24814 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 5:
-#line 2170 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2194 "sql_yacc.yy" /* yacc.c:1646  */
     {
             /*
               We enter here when translating generated column info string into
@@ -24709,28 +24832,28 @@
             gcol_info->expr_item= (yyvsp[-2].item);
             static_cast<Gcol_expr_parser_state *>(YYP)->result= gcol_info;
           }
-#line 24713 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 24836 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 6:
-#line 2188 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2212 "sql_yacc.yy" /* yacc.c:1646  */
     {
             static_cast<Common_table_expr_parser_state *>(YYP)->result= (yyvsp[-1].subquery);
           }
-#line 24721 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 24844 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 7:
-#line 2192 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2216 "sql_yacc.yy" /* yacc.c:1646  */
     {
            ITEMIZE((yyvsp[-1].item), &(yyvsp[-1].item));
            static_cast<Derived_expr_parser_state *>(YYP)->result= (yyvsp[-1].item);
          }
-#line 24730 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 24853 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 8:
-#line 2200 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2224 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             if (!thd->is_bootstrap_system_thread() &&
@@ -24742,11 +24865,11 @@
             thd->lex->sql_command= SQLCOM_EMPTY_QUERY;
             YYLIP->found_semicolon= NULL;
           }
-#line 24746 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 24869 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 9:
-#line 2212 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2236 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex_input_stream *lip = YYLIP;
 
@@ -24769,379 +24892,379 @@
               lip->found_semicolon= NULL;
             }
           }
-#line 24773 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 24896 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 11:
-#line 2237 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2261 "sql_yacc.yy" /* yacc.c:1646  */
     {
             /* Single query, not terminated. */
             YYLIP->found_semicolon= NULL;
           }
-#line 24782 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 24905 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 14:
-#line 2249 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2273 "sql_yacc.yy" /* yacc.c:1646  */
     { *parse_tree= (yyvsp[0].top_level_node); }
-#line 24788 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 24911 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 16:
-#line 2255 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2279 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 24794 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 24917 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 17:
-#line 2256 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2280 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 24800 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 24923 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 18:
-#line 2257 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2281 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 24806 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 24929 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 20:
-#line 2259 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2283 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 24812 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 24935 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 21:
-#line 2260 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2284 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 24818 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 24941 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 23:
-#line 2262 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2286 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 24824 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 24947 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 24:
-#line 2263 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2287 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 24830 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 24953 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 25:
-#line 2264 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2288 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 24836 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 24959 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 27:
-#line 2266 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2290 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 24842 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 24965 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 28:
-#line 2267 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2291 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 24848 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 24971 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 30:
-#line 2269 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2293 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 24854 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 24977 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 32:
-#line 2271 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2295 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 24860 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 24983 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 34:
-#line 2273 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2297 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 24866 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 24989 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 35:
-#line 2274 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2298 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 24872 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 24995 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 36:
-#line 2275 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2299 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 24878 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25001 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 37:
-#line 2276 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2300 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 24884 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25007 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 43:
-#line 2282 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2306 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 24890 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25013 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 47:
-#line 2286 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2310 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 24896 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25019 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 48:
-#line 2287 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2311 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 24902 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25025 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 49:
-#line 2288 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2312 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 24908 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25031 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 51:
-#line 2290 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2314 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 24914 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25037 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 52:
-#line 2291 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2315 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 24920 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25043 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 55:
-#line 2294 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2318 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 24926 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25049 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 57:
-#line 2296 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2320 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 24932 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25055 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 58:
-#line 2297 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2321 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 24938 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25061 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 59:
-#line 2298 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2322 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 24944 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25067 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 60:
-#line 2299 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2323 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 24950 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25073 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 61:
-#line 2300 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2324 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 24956 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25079 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 62:
-#line 2301 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2325 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 24962 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25085 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 63:
-#line 2302 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2326 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 24968 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25091 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 65:
-#line 2304 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2328 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 24974 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25097 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 66:
-#line 2305 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2329 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 24980 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25103 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 67:
-#line 2306 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2330 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 24986 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25109 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 68:
-#line 2307 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2331 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 24992 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25115 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 70:
-#line 2309 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2333 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 24998 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25121 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 71:
-#line 2310 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2334 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 25004 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25127 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 73:
-#line 2312 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2336 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 25010 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25133 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 74:
-#line 2313 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2337 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 25016 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25139 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 76:
-#line 2315 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2339 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 25022 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25145 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 80:
-#line 2319 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2343 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 25028 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25151 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 81:
-#line 2320 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2344 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 25034 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25157 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 82:
-#line 2321 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2345 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 25040 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25163 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 83:
-#line 2322 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2346 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 25046 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25169 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 86:
-#line 2325 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2349 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 25052 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25175 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 87:
-#line 2326 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2350 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 25058 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25181 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 89:
-#line 2328 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2352 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 25064 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25187 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 90:
-#line 2329 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2353 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 25070 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25193 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 91:
-#line 2330 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2354 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 25076 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25199 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 93:
-#line 2332 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2356 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; CONTEXTUALIZE((yyvsp[0].set)); }
-#line 25082 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25205 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 141:
-#line 2380 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2404 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 25088 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25211 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 142:
-#line 2381 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2405 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 25094 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25217 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 143:
-#line 2382 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2406 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 25100 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25223 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 144:
-#line 2383 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2407 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 25106 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25229 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 146:
-#line 2385 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2409 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 25112 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25235 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 147:
-#line 2386 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2410 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 25118 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25241 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 149:
-#line 2388 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2412 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 25124 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25247 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 150:
-#line 2389 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2413 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.top_level_node)= nullptr; }
-#line 25130 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25253 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 151:
-#line 2394 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2418 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
             lex->sql_command= SQLCOM_DEALLOCATE_PREPARE;
             lex->prepared_stmt_name= to_lex_cstring((yyvsp[0].lexer.lex_str));
           }
-#line 25141 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25264 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 154:
-#line 2409 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2433 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -25158,61 +25281,61 @@
             */
             lex->contains_plaintext_password= true;
           }
-#line 25162 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25285 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 155:
-#line 2429 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2453 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
             lex->prepared_stmt_code= (yyvsp[0].lexer.lex_str);
             lex->prepared_stmt_code_is_varref= false;
           }
-#line 25173 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25296 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 156:
-#line 2436 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2460 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
             lex->prepared_stmt_code= (yyvsp[0].lexer.lex_str);
             lex->prepared_stmt_code_is_varref= true;
           }
-#line 25184 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25307 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 157:
-#line 2446 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2470 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
             lex->sql_command= SQLCOM_EXECUTE;
             lex->prepared_stmt_name= to_lex_cstring((yyvsp[0].lexer.lex_str));
           }
-#line 25195 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25318 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 158:
-#line 2453 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2477 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 25201 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25324 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 163:
-#line 2468 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2492 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex=Lex;
             LEX_STRING *lexstr= (LEX_STRING*)sql_memdup(&(yyvsp[0].lexer.lex_str), sizeof(LEX_STRING));
             if (!lexstr || lex->prepared_stmt_params.push_back(lexstr))
               MYSQL_YYABORT;
           }
-#line 25212 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25335 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 164:
-#line 2480 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2504 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if (Lex->sphead)
             {
@@ -25220,30 +25343,30 @@
               MYSQL_YYABORT;
             }
           }
-#line 25224 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25347 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 165:
-#line 2488 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2512 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_HELP;
             lex->help_arg= (yyvsp[0].lexer.lex_str).str;
           }
-#line 25234 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25357 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 166:
-#line 2499 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2523 "sql_yacc.yy" /* yacc.c:1646  */
     {
             push_deprecated_warn(YYTHD, "CHANGE MASTER",
                                         "CHANGE REPLICATION SOURCE");
           }
-#line 25243 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25366 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 168:
-#line 2508 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2532 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex = Lex;
             lex->sql_command = SQLCOM_CHANGE_MASTER;
@@ -25254,20 +25377,20 @@
             assert(Lex->mi.repl_ignore_server_ids.empty());
             lex->mi.set_unspecified();
           }
-#line 25258 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25381 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 169:
-#line 2519 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2543 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if (Lex->set_channel_name((yyvsp[0].lex_cstr)))
               MYSQL_YYABORT;  // OOM
           }
-#line 25267 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25390 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 170:
-#line 2524 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2548 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             LEX* lex= thd->lex;
@@ -25277,75 +25400,75 @@
             if (lex->m_sql_cmd == NULL)
               MYSQL_YYABORT;
           }
-#line 25281 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25404 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 171:
-#line 2534 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2558 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if (Lex->set_channel_name((yyvsp[0].lex_cstr)))
               MYSQL_YYABORT;  // OOM
           }
-#line 25290 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25413 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 174:
-#line 2546 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2570 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Sql_cmd_change_repl_filter * filter_sql_cmd=
               (Sql_cmd_change_repl_filter*) Lex->m_sql_cmd;
             assert(filter_sql_cmd);
             filter_sql_cmd->set_filter_value((yyvsp[0].item_list), OPT_REPLICATE_DO_DB);
           }
-#line 25301 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25424 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 175:
-#line 2553 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2577 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Sql_cmd_change_repl_filter * filter_sql_cmd=
               (Sql_cmd_change_repl_filter*) Lex->m_sql_cmd;
             assert(filter_sql_cmd);
             filter_sql_cmd->set_filter_value((yyvsp[0].item_list), OPT_REPLICATE_IGNORE_DB);
           }
-#line 25312 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25435 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 176:
-#line 2560 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2584 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Sql_cmd_change_repl_filter * filter_sql_cmd=
               (Sql_cmd_change_repl_filter*) Lex->m_sql_cmd;
             assert(filter_sql_cmd);
            filter_sql_cmd->set_filter_value((yyvsp[0].item_list), OPT_REPLICATE_DO_TABLE);
           }
-#line 25323 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25446 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 177:
-#line 2567 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2591 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Sql_cmd_change_repl_filter * filter_sql_cmd=
               (Sql_cmd_change_repl_filter*) Lex->m_sql_cmd;
             assert(filter_sql_cmd);
             filter_sql_cmd->set_filter_value((yyvsp[0].item_list), OPT_REPLICATE_IGNORE_TABLE);
           }
-#line 25334 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25457 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 178:
-#line 2574 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2598 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Sql_cmd_change_repl_filter * filter_sql_cmd=
               (Sql_cmd_change_repl_filter*) Lex->m_sql_cmd;
             assert(filter_sql_cmd);
             filter_sql_cmd->set_filter_value((yyvsp[0].item_list), OPT_REPLICATE_WILD_DO_TABLE);
           }
-#line 25345 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25468 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 179:
-#line 2581 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2605 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Sql_cmd_change_repl_filter * filter_sql_cmd=
               (Sql_cmd_change_repl_filter*) Lex->m_sql_cmd;
@@ -25353,89 +25476,89 @@
             filter_sql_cmd->set_filter_value((yyvsp[0].item_list),
                                              OPT_REPLICATE_WILD_IGNORE_TABLE);
           }
-#line 25357 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25480 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 180:
-#line 2589 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2613 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Sql_cmd_change_repl_filter * filter_sql_cmd=
               (Sql_cmd_change_repl_filter*) Lex->m_sql_cmd;
             assert(filter_sql_cmd);
             filter_sql_cmd->set_filter_value((yyvsp[0].item_list), OPT_REPLICATE_REWRITE_DB);
           }
-#line 25368 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25491 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 181:
-#line 2598 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2622 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item_list)= NEW_PTN mem_root_deque<Item *>(YYMEM_ROOT);
             if ((yyval.item_list) == NULL)
               MYSQL_YYABORT;
           }
-#line 25378 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25501 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 182:
-#line 2604 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2628 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item_list)= (yyvsp[-1].item_list);
           }
-#line 25386 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25509 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 183:
-#line 2611 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2635 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item_list)= NEW_PTN mem_root_deque<Item *>(YYMEM_ROOT);
             if ((yyval.item_list) == NULL)
               MYSQL_YYABORT;
             (yyval.item_list)->push_back((yyvsp[0].item));
           }
-#line 25397 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25520 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 184:
-#line 2618 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2642 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyvsp[-2].item_list)->push_back((yyvsp[0].item));
             (yyval.item_list)= (yyvsp[-2].item_list);
           }
-#line 25406 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25529 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 185:
-#line 2626 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2650 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             Item *db_item= NEW_PTN Item_string((yyvsp[0].lexer.lex_str).str, (yyvsp[0].lexer.lex_str).length,
                                                thd->charset());
             (yyval.item)= db_item;
           }
-#line 25417 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25540 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 186:
-#line 2635 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2659 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item_list)= NEW_PTN mem_root_deque<Item *>(YYMEM_ROOT);
             if ((yyval.item_list) == NULL)
               MYSQL_YYABORT;
           }
-#line 25427 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25550 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 187:
-#line 2641 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2665 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item_list)= (yyvsp[-1].item_list);
           }
-#line 25435 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25558 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 188:
-#line 2647 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2671 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item_list)= NEW_PTN mem_root_deque<Item *>(YYMEM_ROOT);
             if ((yyval.item_list) == NULL)
@@ -25443,59 +25566,59 @@
             (yyval.item_list)->push_back((yyvsp[-3].item));
             (yyval.item_list)->push_back((yyvsp[-1].item));
           }
-#line 25447 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25570 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 189:
-#line 2655 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2679 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyvsp[-6].item_list)->push_back((yyvsp[-3].item));
             (yyvsp[-6].item_list)->push_back((yyvsp[-1].item));
             (yyval.item_list)= (yyvsp[-6].item_list);
           }
-#line 25457 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25580 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 190:
-#line 2663 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2687 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item_list)= NEW_PTN mem_root_deque<Item *>(YYMEM_ROOT);
             if ((yyval.item_list) == NULL)
               MYSQL_YYABORT;
           }
-#line 25467 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25590 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 191:
-#line 2669 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2693 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item_list)= (yyvsp[-1].item_list);
           }
-#line 25475 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25598 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 192:
-#line 2676 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2700 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item_list)= NEW_PTN mem_root_deque<Item *>(YYMEM_ROOT);
             if ((yyval.item_list) == NULL)
               MYSQL_YYABORT;
             (yyval.item_list)->push_back((yyvsp[0].item));
           }
-#line 25486 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25609 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 193:
-#line 2683 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2707 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyvsp[-2].item_list)->push_back((yyvsp[0].item));
             (yyval.item_list)= (yyvsp[-2].item_list);
           }
-#line 25495 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25618 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 194:
-#line 2691 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2715 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             Item_string *table_item= NEW_PTN Item_string((yyvsp[-2].lexer.lex_str).str, (yyvsp[-2].lexer.lex_str).length,
@@ -25504,319 +25627,319 @@
             table_item->append((yyvsp[0].lexer.lex_str).str, (yyvsp[0].lexer.lex_str).length);
             (yyval.item)= table_item;
           }
-#line 25508 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25631 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 195:
-#line 2703 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2727 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item_list)= NEW_PTN mem_root_deque<Item *>(YYMEM_ROOT);
             if ((yyval.item_list) == NULL)
               MYSQL_YYABORT;
           }
-#line 25518 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25641 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 196:
-#line 2709 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2733 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item_list)= (yyvsp[-1].item_list);
           }
-#line 25526 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25649 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 197:
-#line 2716 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2740 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item_list)= NEW_PTN mem_root_deque<Item *>(YYMEM_ROOT);
             if ((yyval.item_list) == NULL)
               MYSQL_YYABORT;
             (yyval.item_list)->push_back((yyvsp[0].item));
           }
-#line 25537 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25660 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 198:
-#line 2723 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2747 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyvsp[-2].item_list)->push_back((yyvsp[0].item));
             (yyval.item_list)= (yyvsp[-2].item_list);
           }
-#line 25546 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25669 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 199:
-#line 2731 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2755 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             Item *string_item= NEW_PTN Item_string((yyvsp[0].lexer.lex_str).str, (yyvsp[0].lexer.lex_str).length,
                                                    thd->charset());
             (yyval.item)= string_item;
           }
-#line 25557 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25680 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 202:
-#line 2746 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2770 "sql_yacc.yy" /* yacc.c:1646  */
     {
             push_deprecated_warn(YYTHD, "MASTER_AUTO_POSITION",
                                         "SOURCE_AUTO_POSITION");
 
           }
-#line 25567 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25690 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 204:
-#line 2756 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2780 "sql_yacc.yy" /* yacc.c:1646  */
     {
             push_deprecated_warn(YYTHD, "MASTER_HOST",
                                         "SOURCE_HOST");
           }
-#line 25576 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25699 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 206:
-#line 2765 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2789 "sql_yacc.yy" /* yacc.c:1646  */
     {
             push_deprecated_warn(YYTHD, "MASTER_BIND",
                                         "SOURCE_BIND");
 
           }
-#line 25586 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25709 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 208:
-#line 2775 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2799 "sql_yacc.yy" /* yacc.c:1646  */
     {
             push_deprecated_warn(YYTHD, "MASTER_USER",
                                         "SOURCE_USER");
           }
-#line 25595 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25718 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 210:
-#line 2784 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2808 "sql_yacc.yy" /* yacc.c:1646  */
     {
             push_deprecated_warn(YYTHD, "MASTER_PASSWORD",
                                         "SOURCE_PASSWORD");
           }
-#line 25604 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25727 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 212:
-#line 2793 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2817 "sql_yacc.yy" /* yacc.c:1646  */
     {
             push_deprecated_warn(YYTHD, "MASTER_PORT",
                                         "SOURCE_PORT");
           }
-#line 25613 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25736 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 214:
-#line 2802 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2826 "sql_yacc.yy" /* yacc.c:1646  */
     {
             push_deprecated_warn(YYTHD, "MASTER_CONNECT_RETRY",
                                         "SOURCE_CONNECT_RETRY");
           }
-#line 25622 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25745 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 216:
-#line 2811 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2835 "sql_yacc.yy" /* yacc.c:1646  */
     {
             push_deprecated_warn(YYTHD, "MASTER_RETRY_COUNT",
                                         "SOURCE_RETRY_COUNT");
           }
-#line 25631 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25754 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 218:
-#line 2820 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2844 "sql_yacc.yy" /* yacc.c:1646  */
     {
             push_deprecated_warn(YYTHD, "MASTER_DELAY",
                                         "SOURCE_DELAY");
           }
-#line 25640 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25763 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 220:
-#line 2829 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2853 "sql_yacc.yy" /* yacc.c:1646  */
     {
             push_deprecated_warn(YYTHD, "MASTER_SSL",
                                         "SOURCE_SSL");
           }
-#line 25649 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25772 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 222:
-#line 2838 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2862 "sql_yacc.yy" /* yacc.c:1646  */
     {
             push_deprecated_warn(YYTHD, "MASTER_SSL_CA",
                                         "SOURCE_SSL_CA");
           }
-#line 25658 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25781 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 224:
-#line 2847 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2871 "sql_yacc.yy" /* yacc.c:1646  */
     {
             push_deprecated_warn(YYTHD, "MASTER_SSL_CAPATH",
                                         "SOURCE_SSL_CAPATH");
           }
-#line 25667 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25790 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 226:
-#line 2856 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2880 "sql_yacc.yy" /* yacc.c:1646  */
     {
             push_deprecated_warn(YYTHD, "MASTER_SSL_CIPHER",
                                         "SOURCE_SSL_CIPHER");
           }
-#line 25676 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25799 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 228:
-#line 2865 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2889 "sql_yacc.yy" /* yacc.c:1646  */
     {
             push_deprecated_warn(YYTHD, "MASTER_SSL_CRL",
                                         "SOURCE_SSL_CRL");
           }
-#line 25685 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25808 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 230:
-#line 2874 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2898 "sql_yacc.yy" /* yacc.c:1646  */
     {
             push_deprecated_warn(YYTHD, "MASTER_SSL_CRLPATH",
                                         "SOURCE_SSL_CRLPATH");
           }
-#line 25694 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25817 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 232:
-#line 2883 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2907 "sql_yacc.yy" /* yacc.c:1646  */
     {
             push_deprecated_warn(YYTHD, "MASTER_SSL_KEY",
                                         "SOURCE_SSL_KEY");
           }
-#line 25703 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25826 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 234:
-#line 2892 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2916 "sql_yacc.yy" /* yacc.c:1646  */
     {
             push_deprecated_warn(YYTHD, "MASTER_SSL_VERIFY_SERVER_CERT",
                                         "SOURCE_SSL_VERIFY_SERVER_CERT");
           }
-#line 25712 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25835 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 236:
-#line 2901 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2925 "sql_yacc.yy" /* yacc.c:1646  */
     {
              push_deprecated_warn(YYTHD, "MASTER_TLS_VERSION",
                                          "SOURCE_TLS_VERSION");
           }
-#line 25721 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25844 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 238:
-#line 2910 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2934 "sql_yacc.yy" /* yacc.c:1646  */
     {
             push_deprecated_warn(YYTHD, "MASTER_TLS_CIPHERSUITES",
                                         "SOURCE_TLS_CIPHERSUITES");
           }
-#line 25730 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25853 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 240:
-#line 2919 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2943 "sql_yacc.yy" /* yacc.c:1646  */
     {
             push_deprecated_warn(YYTHD, "MASTER_SSL_CERT",
                                         "SOURCE_SSL_CERT");
           }
-#line 25739 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25862 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 242:
-#line 2928 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2952 "sql_yacc.yy" /* yacc.c:1646  */
     {
             push_deprecated_warn(YYTHD, "MASTER_PUBLIC_KEY_PATH",
                                         "SOURCE_PUBLIC_KEY_PATH");
           }
-#line 25748 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25871 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 244:
-#line 2937 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2961 "sql_yacc.yy" /* yacc.c:1646  */
     {
             push_deprecated_warn(YYTHD, "GET_MASTER_PUBLIC_KEY",
                                         "GET_SOURCE_PUBLIC_KEY");
           }
-#line 25757 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25880 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 246:
-#line 2946 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2970 "sql_yacc.yy" /* yacc.c:1646  */
     {
             push_deprecated_warn(YYTHD, "MASTER_HEARTBEAT_PERIOD",
                                         "SOURCE_HEARTBEAT_PERIOD");
           }
-#line 25766 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25889 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 248:
-#line 2955 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2979 "sql_yacc.yy" /* yacc.c:1646  */
     {
             push_deprecated_warn(YYTHD, "MASTER_COMPRESSION_ALGORITHM",
                                         "SOURCE_COMPRESSION_ALGORITHM");
           }
-#line 25775 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25898 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 250:
-#line 2964 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2988 "sql_yacc.yy" /* yacc.c:1646  */
     {
             push_deprecated_warn(YYTHD, "MASTER_ZSTD_COMPRESSION_LEVEL",
                                         "SOURCE_ZSTD_COMPRESSION_LEVEL");
           }
-#line 25784 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25907 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 252:
-#line 2973 "sql_yacc.yy" /* yacc.c:1646  */
+#line 2997 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.host = (yyvsp[0].lexer.lex_str).str;
           }
-#line 25792 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25915 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 253:
-#line 2977 "sql_yacc.yy" /* yacc.c:1646  */
+#line 3001 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.network_namespace = (yyvsp[0].lexer.lex_str).str;
           }
-#line 25800 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25923 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 254:
-#line 2981 "sql_yacc.yy" /* yacc.c:1646  */
+#line 3005 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.bind_addr = (yyvsp[0].lexer.lex_str).str;
           }
-#line 25808 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25931 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 255:
-#line 2985 "sql_yacc.yy" /* yacc.c:1646  */
+#line 3009 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.user = (yyvsp[0].lexer.lex_str).str;
           }
-#line 25816 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25939 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 256:
-#line 2989 "sql_yacc.yy" /* yacc.c:1646  */
+#line 3013 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.password = (yyvsp[0].lexer.lex_str).str;
             if (strlen((yyvsp[0].lexer.lex_str).str) > 32)
@@ -25826,36 +25949,36 @@
             }
             Lex->contains_plaintext_password= true;
           }
-#line 25830 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25953 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 257:
-#line 2999 "sql_yacc.yy" /* yacc.c:1646  */
+#line 3023 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.port = (yyvsp[0].ulong_num);
           }
-#line 25838 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25961 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 258:
-#line 3003 "sql_yacc.yy" /* yacc.c:1646  */
+#line 3027 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.connect_retry = (yyvsp[0].ulong_num);
           }
-#line 25846 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25969 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 259:
-#line 3007 "sql_yacc.yy" /* yacc.c:1646  */
+#line 3031 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.retry_count= (yyvsp[0].ulong_num);
             Lex->mi.retry_count_opt= LEX_MASTER_INFO::LEX_MI_ENABLE;
           }
-#line 25855 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25978 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 260:
-#line 3012 "sql_yacc.yy" /* yacc.c:1646  */
+#line 3036 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyvsp[0].ulong_num) > MASTER_DELAY_MAX)
             {
@@ -25866,111 +25989,111 @@
             else
               Lex->mi.sql_delay = (yyvsp[0].ulong_num);
           }
-#line 25870 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 25993 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 261:
-#line 3023 "sql_yacc.yy" /* yacc.c:1646  */
+#line 3047 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.ssl= (yyvsp[0].ulong_num) ?
               LEX_MASTER_INFO::LEX_MI_ENABLE : LEX_MASTER_INFO::LEX_MI_DISABLE;
           }
-#line 25879 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26002 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 262:
-#line 3028 "sql_yacc.yy" /* yacc.c:1646  */
+#line 3052 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.ssl_ca= (yyvsp[0].lexer.lex_str).str;
           }
-#line 25887 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26010 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 263:
-#line 3032 "sql_yacc.yy" /* yacc.c:1646  */
+#line 3056 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.ssl_capath= (yyvsp[0].lexer.lex_str).str;
           }
-#line 25895 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26018 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 264:
-#line 3036 "sql_yacc.yy" /* yacc.c:1646  */
+#line 3060 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.tls_version= (yyvsp[0].lexer.lex_str).str;
           }
-#line 25903 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26026 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 266:
-#line 3041 "sql_yacc.yy" /* yacc.c:1646  */
+#line 3065 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.ssl_cert= (yyvsp[0].lexer.lex_str).str;
           }
-#line 25911 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26034 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 267:
-#line 3045 "sql_yacc.yy" /* yacc.c:1646  */
+#line 3069 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.ssl_cipher= (yyvsp[0].lexer.lex_str).str;
           }
-#line 25919 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26042 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 268:
-#line 3049 "sql_yacc.yy" /* yacc.c:1646  */
+#line 3073 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.ssl_key= (yyvsp[0].lexer.lex_str).str;
           }
-#line 25927 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26050 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 269:
-#line 3053 "sql_yacc.yy" /* yacc.c:1646  */
+#line 3077 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.ssl_verify_server_cert= (yyvsp[0].ulong_num) ?
               LEX_MASTER_INFO::LEX_MI_ENABLE : LEX_MASTER_INFO::LEX_MI_DISABLE;
           }
-#line 25936 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26059 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 270:
-#line 3058 "sql_yacc.yy" /* yacc.c:1646  */
+#line 3082 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.ssl_crl= (yyvsp[0].lexer.lex_str).str;
           }
-#line 25944 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26067 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 271:
-#line 3062 "sql_yacc.yy" /* yacc.c:1646  */
+#line 3086 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.ssl_crlpath= (yyvsp[0].lexer.lex_str).str;
           }
-#line 25952 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26075 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 272:
-#line 3066 "sql_yacc.yy" /* yacc.c:1646  */
+#line 3090 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.public_key_path= (yyvsp[0].lexer.lex_str).str;
           }
-#line 25960 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26083 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 273:
-#line 3070 "sql_yacc.yy" /* yacc.c:1646  */
+#line 3094 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.get_public_key= (yyvsp[0].ulong_num) ?
               LEX_MASTER_INFO::LEX_MI_ENABLE :
               LEX_MASTER_INFO::LEX_MI_DISABLE;
           }
-#line 25970 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26093 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 274:
-#line 3076 "sql_yacc.yy" /* yacc.c:1646  */
+#line 3100 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Item *num= (yyvsp[0].item_num);
             ITEMIZE(num, &num);
@@ -26004,59 +26127,65 @@
             }
             Lex->mi.heartbeat_opt=  LEX_MASTER_INFO::LEX_MI_ENABLE;
           }
-#line 26008 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26131 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 275:
-#line 3110 "sql_yacc.yy" /* yacc.c:1646  */
+#line 3134 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.repl_ignore_server_ids_opt= LEX_MASTER_INFO::LEX_MI_ENABLE;
            }
-#line 26016 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26139 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 276:
-#line 3114 "sql_yacc.yy" /* yacc.c:1646  */
+#line 3138 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.compression_algorithm = (yyvsp[0].lexer.lex_str).str;
            }
-#line 26024 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26147 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 277:
-#line 3118 "sql_yacc.yy" /* yacc.c:1646  */
+#line 3142 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.zstd_compression_level = (yyvsp[0].ulong_num);
            }
-#line 26032 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26155 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 278:
-#line 3122 "sql_yacc.yy" /* yacc.c:1646  */
+#line 3146 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.auto_position= (yyvsp[0].ulong_num) ?
               LEX_MASTER_INFO::LEX_MI_ENABLE :
               LEX_MASTER_INFO::LEX_MI_DISABLE;
           }
-#line 26042 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26165 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 280:
-#line 3129 "sql_yacc.yy" /* yacc.c:1646  */
+#line 3153 "sql_yacc.yy" /* yacc.c:1646  */
     {
-            if ((yyvsp[0].ulong_num) != 0 && (yyvsp[0].ulong_num) != 1) {
+            switch((yyvsp[0].ulong_num)) {
+            case 0:
+                Lex->mi.require_row_format =
+                  LEX_MASTER_INFO::LEX_MI_DISABLE;
+                break;
+            case 1:
+                Lex->mi.require_row_format =
+                  LEX_MASTER_INFO::LEX_MI_ENABLE;
+                break;
+            default:
               const char* wrong_value = YYTHD->strmake((yylsp[0]).raw.start, (yylsp[0]).raw.length());
               my_error(ER_REQUIRE_ROW_FORMAT_INVALID_VALUE, MYF(0), wrong_value);
             }
-            else {
-              Lex->mi.require_row_format = (yyvsp[0].ulong_num);
-            }
           }
-#line 26056 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26185 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 282:
-#line 3140 "sql_yacc.yy" /* yacc.c:1646  */
+#line 3170 "sql_yacc.yy" /* yacc.c:1646  */
     {
             switch((yyvsp[0].ulong_num)) {
             case 0:
@@ -26072,79 +26201,100 @@
                 MYSQL_YYABORT;
             }
           }
-#line 26076 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26205 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 288:
-#line 3167 "sql_yacc.yy" /* yacc.c:1646  */
+  case 284:
+#line 3187 "sql_yacc.yy" /* yacc.c:1646  */
     {
-            Lex->mi.repl_ignore_server_ids.push_back((yyvsp[0].ulong_num));
+            switch((yyvsp[0].ulong_num)) {
+            case 0:
+                Lex->mi.m_gtid_only =
+                  LEX_MASTER_INFO::LEX_MI_DISABLE;
+                break;
+            case 1:
+                Lex->mi.m_gtid_only =
+                  LEX_MASTER_INFO::LEX_MI_ENABLE;
+                break;
+            default:
+                YYTHD->syntax_error_at((yylsp[0]),
+                  "You have an error in your CHANGE REPLICATION SOURCE syntax; GTID_ONLY only accepts values 0 or 1");
+                MYSQL_YYABORT;
+            }
           }
-#line 26084 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26226 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 289:
-#line 3173 "sql_yacc.yy" /* yacc.c:1646  */
+#line 3214 "sql_yacc.yy" /* yacc.c:1646  */
+    {
+            Lex->mi.repl_ignore_server_ids.push_back((yyvsp[0].ulong_num));
+          }
+#line 26234 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+    break;
+
+  case 290:
+#line 3220 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.privilege_checks_none= false;
             Lex->mi.privilege_checks_username= (yyvsp[0].lex_user)->user.str;
             Lex->mi.privilege_checks_hostname= (yyvsp[0].lex_user)->host.str;
           }
-#line 26094 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26244 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 290:
-#line 3179 "sql_yacc.yy" /* yacc.c:1646  */
+  case 291:
+#line 3226 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.privilege_checks_none= true;
             Lex->mi.privilege_checks_username= NULL;
             Lex->mi.privilege_checks_hostname= NULL;
           }
-#line 26104 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26254 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 291:
-#line 3188 "sql_yacc.yy" /* yacc.c:1646  */
+  case 292:
+#line 3235 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.require_table_primary_key_check= LEX_MASTER_INFO::LEX_MI_PK_CHECK_STREAM;
           }
-#line 26112 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26262 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 292:
-#line 3192 "sql_yacc.yy" /* yacc.c:1646  */
+  case 293:
+#line 3239 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.require_table_primary_key_check= LEX_MASTER_INFO::LEX_MI_PK_CHECK_ON;
           }
-#line 26120 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26270 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 293:
-#line 3196 "sql_yacc.yy" /* yacc.c:1646  */
+  case 294:
+#line 3243 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.require_table_primary_key_check= LEX_MASTER_INFO::LEX_MI_PK_CHECK_OFF;
           }
-#line 26128 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26278 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 294:
-#line 3203 "sql_yacc.yy" /* yacc.c:1646  */
+  case 295:
+#line 3250 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.assign_gtids_to_anonymous_transactions_type = LEX_MASTER_INFO::LEX_MI_ANONYMOUS_TO_GTID_OFF;
           }
-#line 26136 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26286 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 295:
-#line 3207 "sql_yacc.yy" /* yacc.c:1646  */
+  case 296:
+#line 3254 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.assign_gtids_to_anonymous_transactions_type = LEX_MASTER_INFO::LEX_MI_ANONYMOUS_TO_GTID_LOCAL;
           }
-#line 26144 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26294 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 296:
-#line 3211 "sql_yacc.yy" /* yacc.c:1646  */
+  case 297:
+#line 3258 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.assign_gtids_to_anonymous_transactions_type = LEX_MASTER_INFO::LEX_MI_ANONYMOUS_TO_GTID_UUID;
             Lex->mi.assign_gtids_to_anonymous_transactions_manual_uuid = (yyvsp[0].lexer.lex_str).str;
@@ -26154,55 +26304,55 @@
               MYSQL_YYABORT;
             }
           }
-#line 26158 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26308 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 297:
-#line 3225 "sql_yacc.yy" /* yacc.c:1646  */
+  case 298:
+#line 3272 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.tls_ciphersuites = LEX_MASTER_INFO::SPECIFIED_STRING;
             Lex->mi.tls_ciphersuites_string= (yyvsp[0].lexer.lex_str).str;
           }
-#line 26167 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26317 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 298:
-#line 3230 "sql_yacc.yy" /* yacc.c:1646  */
+  case 299:
+#line 3277 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.tls_ciphersuites = LEX_MASTER_INFO::SPECIFIED_NULL;
             Lex->mi.tls_ciphersuites_string = NULL;
           }
-#line 26176 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26326 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 299:
-#line 3238 "sql_yacc.yy" /* yacc.c:1646  */
+  case 300:
+#line 3285 "sql_yacc.yy" /* yacc.c:1646  */
     {
             push_deprecated_warn(YYTHD, "MASTER_LOG_FILE",
                                         "SOURCE_LOG_FILE");
           }
-#line 26185 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26335 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 301:
-#line 3247 "sql_yacc.yy" /* yacc.c:1646  */
+  case 302:
+#line 3294 "sql_yacc.yy" /* yacc.c:1646  */
     {
             push_deprecated_warn(YYTHD, "MASTER_LOG_POS",
                                         "SOURCE_LOG_POS");
           }
-#line 26194 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26344 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 303:
-#line 3256 "sql_yacc.yy" /* yacc.c:1646  */
+  case 304:
+#line 3303 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.log_file_name = (yyvsp[0].lexer.lex_str).str;
           }
-#line 26202 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26352 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 304:
-#line 3260 "sql_yacc.yy" /* yacc.c:1646  */
+  case 305:
+#line 3307 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.pos = (yyvsp[0].ulonglong_number);
             /*
@@ -26218,42 +26368,42 @@
             */
             Lex->mi.pos = max<ulonglong>(BIN_LOG_HEADER_SIZE, Lex->mi.pos);
           }
-#line 26222 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26372 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 305:
-#line 3276 "sql_yacc.yy" /* yacc.c:1646  */
+  case 306:
+#line 3323 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.relay_log_name = (yyvsp[0].lexer.lex_str).str;
           }
-#line 26230 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26380 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 306:
-#line 3280 "sql_yacc.yy" /* yacc.c:1646  */
+  case 307:
+#line 3327 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.relay_log_pos = (yyvsp[0].ulong_num);
             /* Adjust if < BIN_LOG_HEADER_SIZE (same comment as Lex->mi.pos) */
             Lex->mi.relay_log_pos = max<ulong>(BIN_LOG_HEADER_SIZE,
                                                Lex->mi.relay_log_pos);
           }
-#line 26241 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26391 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 307:
-#line 3290 "sql_yacc.yy" /* yacc.c:1646  */
+  case 308:
+#line 3337 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lex_cstr) = {}; }
-#line 26247 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26397 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 308:
-#line 3292 "sql_yacc.yy" /* yacc.c:1646  */
+  case 309:
+#line 3339 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lex_cstr) = to_lex_cstring((yyvsp[0].lexer.lex_str)); }
-#line 26253 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26403 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 309:
-#line 3298 "sql_yacc.yy" /* yacc.c:1646  */
+  case 310:
+#line 3345 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_create_table_stmt(YYMEM_ROOT, (yyvsp[-7].is_not_empty), (yyvsp[-5].is_not_empty), (yyvsp[-4].table),
                                              (yyvsp[-2].table_element_list),
@@ -26262,11 +26412,11 @@
                                              (yyvsp[0].create_table_tail).on_duplicate,
                                              (yyvsp[0].create_table_tail).opt_query_expression);
           }
-#line 26266 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26416 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 310:
-#line 3308 "sql_yacc.yy" /* yacc.c:1646  */
+  case 311:
+#line 3355 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_create_table_stmt(YYMEM_ROOT, (yyvsp[-4].is_not_empty), (yyvsp[-2].is_not_empty), (yyvsp[-1].table),
                                              NULL,
@@ -26275,45 +26425,45 @@
                                              (yyvsp[0].create_table_tail).on_duplicate,
                                              (yyvsp[0].create_table_tail).opt_query_expression);
           }
-#line 26279 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26429 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 311:
-#line 3318 "sql_yacc.yy" /* yacc.c:1646  */
+  case 312:
+#line 3365 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_create_table_stmt(YYMEM_ROOT, (yyvsp[-5].is_not_empty), (yyvsp[-3].is_not_empty), (yyvsp[-2].table), (yyvsp[0].table));
           }
-#line 26287 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26437 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 312:
-#line 3323 "sql_yacc.yy" /* yacc.c:1646  */
+  case 313:
+#line 3370 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_create_table_stmt(YYMEM_ROOT, (yyvsp[-7].is_not_empty), (yyvsp[-5].is_not_empty), (yyvsp[-4].table), (yyvsp[-1].table));
           }
-#line 26295 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26445 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 313:
-#line 3330 "sql_yacc.yy" /* yacc.c:1646  */
+  case 314:
+#line 3377 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_create_role(!!(yyvsp[-1].is_not_empty), (yyvsp[0].user_list));
           }
-#line 26303 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26453 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 314:
-#line 3340 "sql_yacc.yy" /* yacc.c:1646  */
+  case 315:
+#line 3387 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_create_resource_group(to_lex_cstring((yyvsp[-6].lexer.lex_str)), (yyvsp[-3].resource_group_type), (yyvsp[-2].resource_group_vcpu_list_type), (yyvsp[-1].resource_group_priority_type),
                                                  (yyvsp[0].resource_group_state_type).is_default ? true :
                                                  (yyvsp[0].resource_group_state_type).value);
           }
-#line 26313 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26463 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 315:
-#line 3349 "sql_yacc.yy" /* yacc.c:1646  */
+  case 316:
+#line 3396 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->create_info= YYTHD->alloc_typed<HA_CREATE_INFO>();
             if (Lex->create_info == NULL)
@@ -26321,28 +26471,28 @@
             Lex->create_info->default_table_charset= NULL;
             Lex->create_info->used_fields= 0;
           }
-#line 26325 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26475 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 316:
-#line 3357 "sql_yacc.yy" /* yacc.c:1646  */
+  case 317:
+#line 3404 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex=Lex;
             lex->sql_command=SQLCOM_CREATE_DB;
             lex->name= (yyvsp[-2].lexer.lex_str);
             lex->create_info->options= (yyvsp[-3].is_not_empty) ? HA_LEX_CREATE_IF_NOT_EXISTS : 0;
           }
-#line 26336 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26486 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 317:
-#line 3364 "sql_yacc.yy" /* yacc.c:1646  */
+  case 318:
+#line 3411 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 26342 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26492 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 318:
-#line 3369 "sql_yacc.yy" /* yacc.c:1646  */
+  case 319:
+#line 3416 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex=Lex;
             lex->sql_command = SQLCOM_CREATE_USER;
@@ -26352,11 +26502,11 @@
               MYSQL_YYABORT; // OOM
             lex->create_info->options= (yyvsp[-6].is_not_empty) ? HA_LEX_CREATE_IF_NOT_EXISTS : 0;
           }
-#line 26356 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26506 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 319:
-#line 3380 "sql_yacc.yy" /* yacc.c:1646  */
+  case 320:
+#line 3427 "sql_yacc.yy" /* yacc.c:1646  */
     {
             auto pc= NEW_PTN Alter_tablespace_parse_context{YYTHD};
             if (pc == NULL)
@@ -26375,11 +26525,11 @@
 
             Lex->sql_command= SQLCOM_ALTER_TABLESPACE;
           }
-#line 26379 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26529 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 320:
-#line 3400 "sql_yacc.yy" /* yacc.c:1646  */
+  case 321:
+#line 3447 "sql_yacc.yy" /* yacc.c:1646  */
     {
             auto pc= NEW_PTN Alter_tablespace_parse_context{YYTHD};
             if (pc == NULL)
@@ -26397,11 +26547,11 @@
             Lex->m_sql_cmd= cmd;
             Lex->sql_command= SQLCOM_ALTER_TABLESPACE;
           }
-#line 26401 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26551 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 321:
-#line 3419 "sql_yacc.yy" /* yacc.c:1646  */
+  case 322:
+#line 3466 "sql_yacc.yy" /* yacc.c:1646  */
     {
             auto pc= NEW_PTN Alter_tablespace_parse_context{YYTHD};
             if (pc == NULL)
@@ -26420,11 +26570,11 @@
             Lex->m_sql_cmd= cmd;
             Lex->sql_command= SQLCOM_ALTER_TABLESPACE;
           }
-#line 26424 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26574 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 322:
-#line 3439 "sql_yacc.yy" /* yacc.c:1646  */
+  case 323:
+#line 3486 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->sql_command= SQLCOM_CREATE_SERVER;
             if ((yyvsp[-8].lexer.lex_str).length == 0)
@@ -26437,37 +26587,37 @@
             Lex->m_sql_cmd=
               NEW_PTN Sql_cmd_create_server(&Lex->server_options);
           }
-#line 26441 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26591 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 323:
-#line 3456 "sql_yacc.yy" /* yacc.c:1646  */
+  case 324:
+#line 3503 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_create_srs((yyvsp[-1].ulonglong_number), *(yyvsp[0].sql_cmd_srs_attributes), true, false);
           }
-#line 26449 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26599 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 324:
-#line 3461 "sql_yacc.yy" /* yacc.c:1646  */
+  case 325:
+#line 3508 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_create_srs((yyvsp[-1].ulonglong_number), *(yyvsp[0].sql_cmd_srs_attributes), false, (yyvsp[-2].is_not_empty));
           }
-#line 26457 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26607 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 325:
-#line 3468 "sql_yacc.yy" /* yacc.c:1646  */
+  case 326:
+#line 3515 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.sql_cmd_srs_attributes) = NEW_PTN Sql_cmd_srs_attributes();
             if (!(yyval.sql_cmd_srs_attributes))
               MYSQL_YYABORT_ERROR(ER_DA_OOM, MYF(0)); /* purecov: inspected */
           }
-#line 26467 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26617 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 326:
-#line 3474 "sql_yacc.yy" /* yacc.c:1646  */
+  case 327:
+#line 3521 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyvsp[-2].sql_cmd_srs_attributes)->srs_name.str != nullptr)
             {
@@ -26479,11 +26629,11 @@
               (yyvsp[-2].sql_cmd_srs_attributes)->srs_name= (yyvsp[0].lexer.lex_str);
             }
           }
-#line 26483 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26633 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 327:
-#line 3486 "sql_yacc.yy" /* yacc.c:1646  */
+  case 328:
+#line 3533 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyvsp[-2].sql_cmd_srs_attributes)->definition.str != nullptr)
             {
@@ -26495,11 +26645,11 @@
               (yyvsp[-2].sql_cmd_srs_attributes)->definition= (yyvsp[0].lexer.lex_str);
             }
           }
-#line 26499 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26649 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 328:
-#line 3499 "sql_yacc.yy" /* yacc.c:1646  */
+  case 329:
+#line 3546 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyvsp[-5].sql_cmd_srs_attributes)->organization.str != nullptr)
             {
@@ -26512,11 +26662,11 @@
               (yyvsp[-5].sql_cmd_srs_attributes)->organization_coordsys_id= (yyvsp[0].ulonglong_number);
             }
           }
-#line 26516 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26666 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 329:
-#line 3512 "sql_yacc.yy" /* yacc.c:1646  */
+  case 330:
+#line 3559 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyvsp[-2].sql_cmd_srs_attributes)->description.str != nullptr)
             {
@@ -26528,117 +26678,117 @@
               (yyvsp[-2].sql_cmd_srs_attributes)->description= (yyvsp[0].lexer.lex_str);
             }
           }
-#line 26532 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26682 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 330:
-#line 3527 "sql_yacc.yy" /* yacc.c:1646  */
+  case 331:
+#line 3574 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.user_list)= 0;
           }
-#line 26540 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26690 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 331:
-#line 3532 "sql_yacc.yy" /* yacc.c:1646  */
+  case 332:
+#line 3579 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.user_list)= (yyvsp[0].user_list);
           }
-#line 26548 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26698 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 332:
-#line 3541 "sql_yacc.yy" /* yacc.c:1646  */
+  case 333:
+#line 3588 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_create_index_stmt(YYMEM_ROOT, (yyvsp[-10].key_type), (yyvsp[-8].lexer.lex_str), (yyvsp[-7].index_option),
                                              (yyvsp[-5].table), (yyvsp[-3].index_column_list), (yyvsp[-1].index_options),
                                              (yyvsp[0].opt_index_lock_and_algorithm).algo.get_or_default(),
                                              (yyvsp[0].opt_index_lock_and_algorithm).lock.get_or_default());
           }
-#line 26559 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26709 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 333:
-#line 3549 "sql_yacc.yy" /* yacc.c:1646  */
+  case 334:
+#line 3596 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_create_index_stmt(YYMEM_ROOT, KEYTYPE_FULLTEXT, (yyvsp[-7].lexer.lex_str),
                                              NULL, (yyvsp[-5].table), (yyvsp[-3].index_column_list), (yyvsp[-1].index_options),
                                              (yyvsp[0].opt_index_lock_and_algorithm).algo.get_or_default(),
                                              (yyvsp[0].opt_index_lock_and_algorithm).lock.get_or_default());
           }
-#line 26570 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26720 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 334:
-#line 3557 "sql_yacc.yy" /* yacc.c:1646  */
+  case 335:
+#line 3604 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_create_index_stmt(YYMEM_ROOT, KEYTYPE_SPATIAL, (yyvsp[-7].lexer.lex_str),
                                              NULL, (yyvsp[-5].table), (yyvsp[-3].index_column_list), (yyvsp[-1].index_options),
                                              (yyvsp[0].opt_index_lock_and_algorithm).algo.get_or_default(),
                                              (yyvsp[0].opt_index_lock_and_algorithm).lock.get_or_default());
           }
-#line 26581 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26731 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 337:
-#line 3572 "sql_yacc.yy" /* yacc.c:1646  */
+  case 338:
+#line 3619 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->server_options.set_username((yyvsp[0].lexer.lex_str));
           }
-#line 26589 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26739 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 338:
-#line 3576 "sql_yacc.yy" /* yacc.c:1646  */
+  case 339:
+#line 3623 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->server_options.set_host((yyvsp[0].lexer.lex_str));
           }
-#line 26597 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26747 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 339:
-#line 3580 "sql_yacc.yy" /* yacc.c:1646  */
+  case 340:
+#line 3627 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->server_options.set_db((yyvsp[0].lexer.lex_str));
           }
-#line 26605 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26755 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 340:
-#line 3584 "sql_yacc.yy" /* yacc.c:1646  */
+  case 341:
+#line 3631 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->server_options.set_owner((yyvsp[0].lexer.lex_str));
           }
-#line 26613 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26763 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 341:
-#line 3588 "sql_yacc.yy" /* yacc.c:1646  */
+  case 342:
+#line 3635 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->server_options.set_password((yyvsp[0].lexer.lex_str));
             Lex->contains_plaintext_password= true;
           }
-#line 26622 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26772 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 342:
-#line 3593 "sql_yacc.yy" /* yacc.c:1646  */
+  case 343:
+#line 3640 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->server_options.set_socket((yyvsp[0].lexer.lex_str));
           }
-#line 26630 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26780 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 343:
-#line 3597 "sql_yacc.yy" /* yacc.c:1646  */
+  case 344:
+#line 3644 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->server_options.set_port((yyvsp[0].ulong_num));
           }
-#line 26638 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26788 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 344:
-#line 3604 "sql_yacc.yy" /* yacc.c:1646  */
+  case 345:
+#line 3651 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             LEX *lex=Lex;
@@ -26654,11 +26804,11 @@
             lex->sql_command= SQLCOM_CREATE_EVENT;
             /* We need that for disallowing subqueries */
           }
-#line 26658 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26808 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 345:
-#line 3624 "sql_yacc.yy" /* yacc.c:1646  */
+  case 346:
+#line 3671 "sql_yacc.yy" /* yacc.c:1646  */
     {
             /*
               sql_command is set here because some rules in ev_sql_stmt
@@ -26666,140 +26816,140 @@
             */
             Lex->sql_command= SQLCOM_CREATE_EVENT;
           }
-#line 26670 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26820 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 346:
-#line 3635 "sql_yacc.yy" /* yacc.c:1646  */
+  case 347:
+#line 3682 "sql_yacc.yy" /* yacc.c:1646  */
     {
             ITEMIZE((yyvsp[-1].item), &(yyvsp[-1].item));
 
             Lex->event_parse_data->item_expression= (yyvsp[-1].item);
             Lex->event_parse_data->interval= (yyvsp[0].interval);
           }
-#line 26681 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26831 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 348:
-#line 3644 "sql_yacc.yy" /* yacc.c:1646  */
+  case 349:
+#line 3691 "sql_yacc.yy" /* yacc.c:1646  */
     {
             ITEMIZE((yyvsp[0].item), &(yyvsp[0].item));
 
             Lex->event_parse_data->item_execute_at= (yyvsp[0].item);
           }
-#line 26691 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26841 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 349:
-#line 3652 "sql_yacc.yy" /* yacc.c:1646  */
+  case 350:
+#line 3699 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= 0; }
-#line 26697 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26847 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 350:
-#line 3654 "sql_yacc.yy" /* yacc.c:1646  */
+  case 351:
+#line 3701 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->event_parse_data->status= Event_parse_data::ENABLED;
             Lex->event_parse_data->status_changed= true;
             (yyval.num)= 1;
           }
-#line 26707 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26857 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 351:
-#line 3660 "sql_yacc.yy" /* yacc.c:1646  */
+  case 352:
+#line 3707 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->event_parse_data->status= Event_parse_data::SLAVESIDE_DISABLED;
             Lex->event_parse_data->status_changed= true;
             (yyval.num)= 1;
           }
-#line 26717 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26867 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 352:
-#line 3666 "sql_yacc.yy" /* yacc.c:1646  */
+  case 353:
+#line 3713 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->event_parse_data->status= Event_parse_data::DISABLED;
             Lex->event_parse_data->status_changed= true;
             (yyval.num)= 1;
           }
-#line 26727 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26877 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 353:
-#line 3675 "sql_yacc.yy" /* yacc.c:1646  */
+  case 354:
+#line 3722 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Item *item= NEW_PTN Item_func_now_local(0);
             if (item == NULL)
               MYSQL_YYABORT;
             Lex->event_parse_data->item_starts= item;
           }
-#line 26738 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26888 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 354:
-#line 3682 "sql_yacc.yy" /* yacc.c:1646  */
+  case 355:
+#line 3729 "sql_yacc.yy" /* yacc.c:1646  */
     {
             ITEMIZE((yyvsp[0].item), &(yyvsp[0].item));
 
             Lex->event_parse_data->item_starts= (yyvsp[0].item);
           }
-#line 26748 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26898 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 356:
-#line 3692 "sql_yacc.yy" /* yacc.c:1646  */
+  case 357:
+#line 3739 "sql_yacc.yy" /* yacc.c:1646  */
     {
             ITEMIZE((yyvsp[0].item), &(yyvsp[0].item));
 
             Lex->event_parse_data->item_ends= (yyvsp[0].item);
           }
-#line 26758 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26908 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 357:
-#line 3700 "sql_yacc.yy" /* yacc.c:1646  */
+  case 358:
+#line 3747 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= 0; }
-#line 26764 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26914 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 359:
-#line 3706 "sql_yacc.yy" /* yacc.c:1646  */
+  case 360:
+#line 3753 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->event_parse_data->on_completion=
                                   Event_parse_data::ON_COMPLETION_PRESERVE;
             (yyval.num)= 1;
           }
-#line 26774 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26924 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 360:
-#line 3712 "sql_yacc.yy" /* yacc.c:1646  */
+  case 361:
+#line 3759 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->event_parse_data->on_completion=
                                   Event_parse_data::ON_COMPLETION_DROP;
             (yyval.num)= 1;
           }
-#line 26784 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26934 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 361:
-#line 3720 "sql_yacc.yy" /* yacc.c:1646  */
+  case 362:
+#line 3767 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= 0; }
-#line 26790 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26940 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 362:
-#line 3722 "sql_yacc.yy" /* yacc.c:1646  */
+  case 363:
+#line 3769 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->event_parse_data->comment= (yyvsp[0].lexer.lex_str);
             (yyval.num)= 1;
           }
-#line 26799 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26949 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 363:
-#line 3729 "sql_yacc.yy" /* yacc.c:1646  */
+  case 364:
+#line 3776 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -26845,11 +26995,11 @@
             */
             sp->set_body_start(thd, (yylsp[0]).cpp.end);
           }
-#line 26849 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 26999 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 364:
-#line 3775 "sql_yacc.yy" /* yacc.c:1646  */
+  case 365:
+#line 3822 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -26859,11 +27009,11 @@
             lex->sp_chistics.suid= SP_IS_SUID;  //always the definer!
             lex->event_parse_data->body_changed= true;
           }
-#line 26863 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27013 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 378:
-#line 3804 "sql_yacc.yy" /* yacc.c:1646  */
+  case 379:
+#line 3851 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if (!(yyvsp[-2].lexer.lex_str).str ||
                 (check_and_convert_db_name(&(yyvsp[-2].lexer.lex_str), false) != Ident_name_check::OK))
@@ -26877,11 +27027,11 @@
               MYSQL_YYABORT;
             (yyval.spname)->init_qname(YYTHD);
           }
-#line 26881 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27031 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 379:
-#line 3818 "sql_yacc.yy" /* yacc.c:1646  */
+  case 380:
+#line 3865 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -26897,133 +27047,133 @@
               MYSQL_YYABORT;
             (yyval.spname)->init_qname(thd);
           }
-#line 26901 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
-    break;
-
-  case 380:
-#line 3836 "sql_yacc.yy" /* yacc.c:1646  */
-    {}
-#line 26907 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27051 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 381:
-#line 3837 "sql_yacc.yy" /* yacc.c:1646  */
+#line 3883 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 26913 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27057 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 382:
-#line 3841 "sql_yacc.yy" /* yacc.c:1646  */
+#line 3884 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 26919 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27063 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 383:
-#line 3842 "sql_yacc.yy" /* yacc.c:1646  */
+#line 3888 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 26925 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27069 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 384:
-#line 3848 "sql_yacc.yy" /* yacc.c:1646  */
-    { Lex->sp_chistics.comment= to_lex_cstring((yyvsp[0].lexer.lex_str)); }
-#line 26931 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 3889 "sql_yacc.yy" /* yacc.c:1646  */
+    {}
+#line 27075 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 385:
-#line 3850 "sql_yacc.yy" /* yacc.c:1646  */
-    { /* Just parse it, we only have one language for now. */ }
-#line 26937 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 3895 "sql_yacc.yy" /* yacc.c:1646  */
+    { Lex->sp_chistics.comment= to_lex_cstring((yyvsp[0].lexer.lex_str)); }
+#line 27081 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 386:
-#line 3852 "sql_yacc.yy" /* yacc.c:1646  */
-    { Lex->sp_chistics.daccess= SP_NO_SQL; }
-#line 26943 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 3897 "sql_yacc.yy" /* yacc.c:1646  */
+    { /* Just parse it, we only have one language for now. */ }
+#line 27087 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 387:
-#line 3854 "sql_yacc.yy" /* yacc.c:1646  */
-    { Lex->sp_chistics.daccess= SP_CONTAINS_SQL; }
-#line 26949 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 3899 "sql_yacc.yy" /* yacc.c:1646  */
+    { Lex->sp_chistics.daccess= SP_NO_SQL; }
+#line 27093 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 388:
-#line 3856 "sql_yacc.yy" /* yacc.c:1646  */
-    { Lex->sp_chistics.daccess= SP_READS_SQL_DATA; }
-#line 26955 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 3901 "sql_yacc.yy" /* yacc.c:1646  */
+    { Lex->sp_chistics.daccess= SP_CONTAINS_SQL; }
+#line 27099 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 389:
-#line 3858 "sql_yacc.yy" /* yacc.c:1646  */
-    { Lex->sp_chistics.daccess= SP_MODIFIES_SQL_DATA; }
-#line 26961 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 3903 "sql_yacc.yy" /* yacc.c:1646  */
+    { Lex->sp_chistics.daccess= SP_READS_SQL_DATA; }
+#line 27105 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 390:
-#line 3860 "sql_yacc.yy" /* yacc.c:1646  */
-    {}
-#line 26967 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 3905 "sql_yacc.yy" /* yacc.c:1646  */
+    { Lex->sp_chistics.daccess= SP_MODIFIES_SQL_DATA; }
+#line 27111 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 391:
-#line 3865 "sql_yacc.yy" /* yacc.c:1646  */
-    { }
-#line 26973 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 3907 "sql_yacc.yy" /* yacc.c:1646  */
+    {}
+#line 27117 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 392:
-#line 3866 "sql_yacc.yy" /* yacc.c:1646  */
-    { Lex->sp_chistics.detistic= true; }
-#line 26979 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 3912 "sql_yacc.yy" /* yacc.c:1646  */
+    { }
+#line 27123 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 393:
-#line 3867 "sql_yacc.yy" /* yacc.c:1646  */
-    { Lex->sp_chistics.detistic= false; }
-#line 26985 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 3913 "sql_yacc.yy" /* yacc.c:1646  */
+    { Lex->sp_chistics.detistic= true; }
+#line 27129 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 394:
-#line 3872 "sql_yacc.yy" /* yacc.c:1646  */
+#line 3914 "sql_yacc.yy" /* yacc.c:1646  */
+    { Lex->sp_chistics.detistic= false; }
+#line 27135 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+    break;
+
+  case 395:
+#line 3919 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->sp_chistics.suid= SP_IS_SUID;
           }
-#line 26993 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27143 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 395:
-#line 3876 "sql_yacc.yy" /* yacc.c:1646  */
+  case 396:
+#line 3923 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->sp_chistics.suid= SP_IS_NOT_SUID;
           }
-#line 27001 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27151 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 396:
-#line 3883 "sql_yacc.yy" /* yacc.c:1646  */
+  case 397:
+#line 3930 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_call((yyvsp[-1].spname), (yyvsp[0].item_list2));
           }
-#line 27009 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27159 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 397:
-#line 3889 "sql_yacc.yy" /* yacc.c:1646  */
+  case 398:
+#line 3936 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.item_list2)= NULL; }
-#line 27015 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27165 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 398:
-#line 3891 "sql_yacc.yy" /* yacc.c:1646  */
+  case 399:
+#line 3938 "sql_yacc.yy" /* yacc.c:1646  */
     {
               (yyval.item_list2)= (yyvsp[-1].item_list2);
             }
-#line 27023 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27173 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 403:
-#line 3909 "sql_yacc.yy" /* yacc.c:1646  */
+  case 404:
+#line 3956 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -27071,11 +27221,11 @@
             spvar->field_def.field_name= spvar->name.str;
             spvar->field_def.is_nullable= true;
           }
-#line 27075 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27225 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 408:
-#line 3971 "sql_yacc.yy" /* yacc.c:1646  */
+  case 409:
+#line 4018 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -27122,55 +27272,55 @@
             spvar->field_def.field_name= spvar->name.str;
             spvar->field_def.is_nullable= true;
           }
-#line 27126 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27276 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 409:
-#line 4020 "sql_yacc.yy" /* yacc.c:1646  */
+  case 410:
+#line 4067 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= sp_variable::MODE_IN; }
-#line 27132 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27282 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 410:
-#line 4021 "sql_yacc.yy" /* yacc.c:1646  */
+  case 411:
+#line 4068 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= sp_variable::MODE_IN; }
-#line 27138 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27288 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 411:
-#line 4022 "sql_yacc.yy" /* yacc.c:1646  */
+  case 412:
+#line 4069 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= sp_variable::MODE_OUT; }
-#line 27144 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27294 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 412:
-#line 4023 "sql_yacc.yy" /* yacc.c:1646  */
+  case 413:
+#line 4070 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= sp_variable::MODE_INOUT; }
-#line 27150 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27300 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 413:
-#line 4027 "sql_yacc.yy" /* yacc.c:1646  */
+  case 414:
+#line 4074 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 27156 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27306 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 415:
-#line 4032 "sql_yacc.yy" /* yacc.c:1646  */
+  case 416:
+#line 4079 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 27162 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27312 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 417:
-#line 4038 "sql_yacc.yy" /* yacc.c:1646  */
+  case 418:
+#line 4085 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.spblock).vars= (yyval.spblock).conds= (yyval.spblock).hndlrs= (yyval.spblock).curs= 0;
           }
-#line 27170 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27320 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 418:
-#line 4042 "sql_yacc.yy" /* yacc.c:1646  */
+  case 419:
+#line 4089 "sql_yacc.yy" /* yacc.c:1646  */
     {
             /* We check for declarations out of (standard) order this way
               because letting the grammar rules reflect it caused tricky
@@ -27191,11 +27341,11 @@
             (yyval.spblock).hndlrs= (yyvsp[-2].spblock).hndlrs + (yyvsp[-1].spblock).hndlrs;
             (yyval.spblock).curs= (yyvsp[-2].spblock).curs + (yyvsp[-1].spblock).curs;
           }
-#line 27195 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27345 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 419:
-#line 4070 "sql_yacc.yy" /* yacc.c:1646  */
+  case 420:
+#line 4117 "sql_yacc.yy" /* yacc.c:1646  */
     {                     /*$6*/
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -27290,11 +27440,11 @@
             (yyval.spblock).vars= (yyvsp[-3].num);
             (yyval.spblock).conds= (yyval.spblock).hndlrs= (yyval.spblock).curs= 0;
           }
-#line 27294 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27444 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 420:
-#line 4165 "sql_yacc.yy" /* yacc.c:1646  */
+  case 421:
+#line 4212 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -27311,11 +27461,11 @@
             (yyval.spblock).vars= (yyval.spblock).hndlrs= (yyval.spblock).curs= 0;
             (yyval.spblock).conds= 1;
           }
-#line 27315 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27465 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 421:
-#line 4182 "sql_yacc.yy" /* yacc.c:1646  */
+  case 422:
+#line 4229 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -27356,11 +27506,11 @@
 
             lex->keep_diagnostics= DA_KEEP_DIAGNOSTICS; // DECL HANDLER FOR
           }
-#line 27360 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27510 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 422:
-#line 4223 "sql_yacc.yy" /* yacc.c:1646  */
+  case 423:
+#line 4270 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -27394,11 +27544,11 @@
             (yyval.spblock).vars= (yyval.spblock).conds= (yyval.spblock).curs= 0;
             (yyval.spblock).hndlrs= 1;
           }
-#line 27398 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27548 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 423:
-#line 4260 "sql_yacc.yy" /* yacc.c:1646  */
+  case 424:
+#line 4307 "sql_yacc.yy" /* yacc.c:1646  */
     {             /*$5*/
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -27407,11 +27557,11 @@
             sp->reset_lex(thd);
             sp->m_parser_data.set_current_stmt_start_ptr((yylsp[0]).raw.end);
           }
-#line 27411 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27561 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 424:
-#line 4269 "sql_yacc.yy" /* yacc.c:1646  */
+  case 425:
+#line 4316 "sql_yacc.yy" /* yacc.c:1646  */
     {             /*$7*/
             MAKE_CMD((yyvsp[0].top_level_node));
 
@@ -27473,35 +27623,35 @@
             (yyval.spblock).vars= (yyval.spblock).conds= (yyval.spblock).hndlrs= 0;
             (yyval.spblock).curs= 1;
           }
-#line 27477 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27627 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 425:
-#line 4333 "sql_yacc.yy" /* yacc.c:1646  */
+  case 426:
+#line 4380 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= sp_handler::EXIT; }
-#line 27483 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27633 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 426:
-#line 4334 "sql_yacc.yy" /* yacc.c:1646  */
+  case 427:
+#line 4381 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= sp_handler::CONTINUE; }
-#line 27489 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27639 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 427:
-#line 4340 "sql_yacc.yy" /* yacc.c:1646  */
+  case 428:
+#line 4387 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= 1; }
-#line 27495 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27645 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 428:
-#line 4342 "sql_yacc.yy" /* yacc.c:1646  */
+  case 429:
+#line 4389 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)+= 1; }
-#line 27501 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27651 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 429:
-#line 4347 "sql_yacc.yy" /* yacc.c:1646  */
+  case 430:
+#line 4394 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -27521,11 +27671,11 @@
               i->add_condition((yyvsp[0].spcondvalue));
             }
           }
-#line 27525 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27675 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 430:
-#line 4370 "sql_yacc.yy" /* yacc.c:1646  */
+  case 431:
+#line 4417 "sql_yacc.yy" /* yacc.c:1646  */
     { /* mysql errno */
             if ((yyvsp[0].ulong_num) == 0)
             {
@@ -27536,11 +27686,11 @@
             if ((yyval.spcondvalue) == NULL)
               MYSQL_YYABORT;
           }
-#line 27540 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27690 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 432:
-#line 4385 "sql_yacc.yy" /* yacc.c:1646  */
+  case 433:
+#line 4432 "sql_yacc.yy" /* yacc.c:1646  */
     { /* SQLSTATE */
 
             /*
@@ -27559,31 +27709,31 @@
             if ((yyval.spcondvalue) == NULL)
               MYSQL_YYABORT;
           }
-#line 27563 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27713 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 433:
-#line 4406 "sql_yacc.yy" /* yacc.c:1646  */
+  case 434:
+#line 4453 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 27569 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27719 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 434:
-#line 4407 "sql_yacc.yy" /* yacc.c:1646  */
+  case 435:
+#line 4454 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 27575 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27725 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 435:
-#line 4412 "sql_yacc.yy" /* yacc.c:1646  */
+  case 436:
+#line 4459 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.spcondvalue)= (yyvsp[0].spcondvalue);
           }
-#line 27583 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27733 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 436:
-#line 4416 "sql_yacc.yy" /* yacc.c:1646  */
+  case 437:
+#line 4463 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
@@ -27596,41 +27746,41 @@
               MYSQL_YYABORT;
             }
           }
-#line 27600 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27750 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 437:
-#line 4429 "sql_yacc.yy" /* yacc.c:1646  */
+  case 438:
+#line 4476 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.spcondvalue)= NEW_PTN sp_condition_value(sp_condition_value::WARNING);
             if ((yyval.spcondvalue) == NULL)
               MYSQL_YYABORT;
           }
-#line 27610 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27760 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 438:
-#line 4435 "sql_yacc.yy" /* yacc.c:1646  */
+  case 439:
+#line 4482 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.spcondvalue)= NEW_PTN sp_condition_value(sp_condition_value::NOT_FOUND);
             if ((yyval.spcondvalue) == NULL)
               MYSQL_YYABORT;
           }
-#line 27620 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27770 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 439:
-#line 4441 "sql_yacc.yy" /* yacc.c:1646  */
+  case 440:
+#line 4488 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.spcondvalue)= NEW_PTN sp_condition_value(sp_condition_value::EXCEPTION);
             if ((yyval.spcondvalue) == NULL)
               MYSQL_YYABORT;
           }
-#line 27630 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27780 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 440:
-#line 4450 "sql_yacc.yy" /* yacc.c:1646  */
+  case 441:
+#line 4497 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -27640,11 +27790,11 @@
             if (lex->m_sql_cmd == NULL)
               MYSQL_YYABORT;
           }
-#line 27644 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27794 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 441:
-#line 4463 "sql_yacc.yy" /* yacc.c:1646  */
+  case 442:
+#line 4510 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
@@ -27670,67 +27820,67 @@
             }
             (yyval.spcondvalue)= cond;
           }
-#line 27674 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27824 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 442:
-#line 4489 "sql_yacc.yy" /* yacc.c:1646  */
+  case 443:
+#line 4536 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.spcondvalue)= (yyvsp[0].spcondvalue); }
-#line 27680 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27830 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 443:
-#line 4494 "sql_yacc.yy" /* yacc.c:1646  */
+  case 444:
+#line 4541 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.spcondvalue)= NULL; }
-#line 27686 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27836 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 444:
-#line 4496 "sql_yacc.yy" /* yacc.c:1646  */
+  case 445:
+#line 4543 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.spcondvalue)= (yyvsp[0].spcondvalue); }
-#line 27692 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27842 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 445:
-#line 4501 "sql_yacc.yy" /* yacc.c:1646  */
+  case 446:
+#line 4548 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.signal_item_list)= NEW_PTN Set_signal_information(); }
-#line 27698 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27848 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 446:
-#line 4503 "sql_yacc.yy" /* yacc.c:1646  */
+  case 447:
+#line 4550 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.signal_item_list)= (yyvsp[0].signal_item_list); }
-#line 27704 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27854 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 447:
-#line 4508 "sql_yacc.yy" /* yacc.c:1646  */
+  case 448:
+#line 4555 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.signal_item_list)= NEW_PTN Set_signal_information();
             if ((yyval.signal_item_list)->set_item((yyvsp[-2].da_condition_item_name), (yyvsp[0].item)))
               MYSQL_YYABORT;
           }
-#line 27714 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27864 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 448:
-#line 4515 "sql_yacc.yy" /* yacc.c:1646  */
+  case 449:
+#line 4562 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.signal_item_list)= (yyvsp[-4].signal_item_list);
             if ((yyval.signal_item_list)->set_item((yyvsp[-2].da_condition_item_name), (yyvsp[0].item)))
               MYSQL_YYABORT;
           }
-#line 27724 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27874 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 449:
-#line 4527 "sql_yacc.yy" /* yacc.c:1646  */
+  case 450:
+#line 4574 "sql_yacc.yy" /* yacc.c:1646  */
     { ITEMIZE((yyvsp[0].item), &(yyval.item)); }
-#line 27730 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27880 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 450:
-#line 4529 "sql_yacc.yy" /* yacc.c:1646  */
+  case 451:
+#line 4576 "sql_yacc.yy" /* yacc.c:1646  */
     {
             ITEMIZE((yyvsp[0].item), &(yyvsp[0].item));
 
@@ -27750,89 +27900,89 @@
             }
             (yyval.item)= (yyvsp[0].item);
           }
-#line 27754 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27904 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 451:
-#line 4549 "sql_yacc.yy" /* yacc.c:1646  */
+  case 452:
+#line 4596 "sql_yacc.yy" /* yacc.c:1646  */
     { ITEMIZE((yyvsp[0].item), &(yyval.item)); }
-#line 27760 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27910 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 452:
-#line 4555 "sql_yacc.yy" /* yacc.c:1646  */
+  case 453:
+#line 4602 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.da_condition_item_name)= CIN_CLASS_ORIGIN; }
-#line 27766 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27916 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 453:
-#line 4557 "sql_yacc.yy" /* yacc.c:1646  */
+  case 454:
+#line 4604 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.da_condition_item_name)= CIN_SUBCLASS_ORIGIN; }
-#line 27772 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27922 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 454:
-#line 4559 "sql_yacc.yy" /* yacc.c:1646  */
+  case 455:
+#line 4606 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.da_condition_item_name)= CIN_CONSTRAINT_CATALOG; }
-#line 27778 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27928 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 455:
-#line 4561 "sql_yacc.yy" /* yacc.c:1646  */
+  case 456:
+#line 4608 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.da_condition_item_name)= CIN_CONSTRAINT_SCHEMA; }
-#line 27784 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27934 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 456:
-#line 4563 "sql_yacc.yy" /* yacc.c:1646  */
+  case 457:
+#line 4610 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.da_condition_item_name)= CIN_CONSTRAINT_NAME; }
-#line 27790 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27940 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 457:
-#line 4565 "sql_yacc.yy" /* yacc.c:1646  */
+  case 458:
+#line 4612 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.da_condition_item_name)= CIN_CATALOG_NAME; }
-#line 27796 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27946 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 458:
-#line 4567 "sql_yacc.yy" /* yacc.c:1646  */
+  case 459:
+#line 4614 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.da_condition_item_name)= CIN_SCHEMA_NAME; }
-#line 27802 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27952 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 459:
-#line 4569 "sql_yacc.yy" /* yacc.c:1646  */
+  case 460:
+#line 4616 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.da_condition_item_name)= CIN_TABLE_NAME; }
-#line 27808 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27958 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 460:
-#line 4571 "sql_yacc.yy" /* yacc.c:1646  */
+  case 461:
+#line 4618 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.da_condition_item_name)= CIN_COLUMN_NAME; }
-#line 27814 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27964 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 461:
-#line 4573 "sql_yacc.yy" /* yacc.c:1646  */
+  case 462:
+#line 4620 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.da_condition_item_name)= CIN_CURSOR_NAME; }
-#line 27820 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27970 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 462:
-#line 4575 "sql_yacc.yy" /* yacc.c:1646  */
+  case 463:
+#line 4622 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.da_condition_item_name)= CIN_MESSAGE_TEXT; }
-#line 27826 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27976 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 463:
-#line 4577 "sql_yacc.yy" /* yacc.c:1646  */
+  case 464:
+#line 4624 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.da_condition_item_name)= CIN_MYSQL_ERRNO; }
-#line 27832 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27982 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 464:
-#line 4582 "sql_yacc.yy" /* yacc.c:1646  */
+  case 465:
+#line 4629 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -27843,11 +27993,11 @@
             if (lex->m_sql_cmd == NULL)
               MYSQL_YYABORT;
           }
-#line 27847 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 27997 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 465:
-#line 4596 "sql_yacc.yy" /* yacc.c:1646  */
+  case 466:
+#line 4643 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Diagnostics_information *info= (yyvsp[0].diag_info);
 
@@ -27860,79 +28010,79 @@
             if (Lex->m_sql_cmd == NULL)
               MYSQL_YYABORT;
           }
-#line 27864 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28014 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 466:
-#line 4612 "sql_yacc.yy" /* yacc.c:1646  */
+  case 467:
+#line 4659 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.diag_area)= Diagnostics_information::CURRENT_AREA; }
-#line 27870 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28020 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 467:
-#line 4614 "sql_yacc.yy" /* yacc.c:1646  */
+  case 468:
+#line 4661 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.diag_area)= Diagnostics_information::CURRENT_AREA; }
-#line 27876 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28026 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 468:
-#line 4616 "sql_yacc.yy" /* yacc.c:1646  */
+  case 469:
+#line 4663 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.diag_area)= Diagnostics_information::STACKED_AREA; }
-#line 27882 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28032 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 469:
-#line 4621 "sql_yacc.yy" /* yacc.c:1646  */
+  case 470:
+#line 4668 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.diag_info)= NEW_PTN Statement_information((yyvsp[0].stmt_info_list));
             if ((yyval.diag_info) == NULL)
               MYSQL_YYABORT;
           }
-#line 27892 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28042 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 470:
-#line 4627 "sql_yacc.yy" /* yacc.c:1646  */
+  case 471:
+#line 4674 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.diag_info)= NEW_PTN Condition_information((yyvsp[-1].item), (yyvsp[0].cond_info_list));
             if ((yyval.diag_info) == NULL)
               MYSQL_YYABORT;
           }
-#line 27902 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28052 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 471:
-#line 4636 "sql_yacc.yy" /* yacc.c:1646  */
+  case 472:
+#line 4683 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.stmt_info_list)= NEW_PTN List<Statement_information_item>;
             if ((yyval.stmt_info_list) == NULL || (yyval.stmt_info_list)->push_back((yyvsp[0].stmt_info_item)))
               MYSQL_YYABORT;
           }
-#line 27912 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28062 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 472:
-#line 4642 "sql_yacc.yy" /* yacc.c:1646  */
+  case 473:
+#line 4689 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyvsp[-2].stmt_info_list)->push_back((yyvsp[0].stmt_info_item)))
               MYSQL_YYABORT;
             (yyval.stmt_info_list)= (yyvsp[-2].stmt_info_list);
           }
-#line 27922 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28072 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 473:
-#line 4651 "sql_yacc.yy" /* yacc.c:1646  */
+  case 474:
+#line 4698 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.stmt_info_item)= NEW_PTN Statement_information_item((yyvsp[0].stmt_info_item_name), (yyvsp[-2].item));
             if ((yyval.stmt_info_item) == NULL)
               MYSQL_YYABORT;
           }
-#line 27932 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28082 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 474:
-#line 4659 "sql_yacc.yy" /* yacc.c:1646  */
+  case 475:
+#line 4706 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -27960,146 +28110,146 @@
             if ((yyval.item) == NULL)
               MYSQL_YYABORT;
           }
-#line 27964 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28114 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 475:
-#line 4687 "sql_yacc.yy" /* yacc.c:1646  */
+  case 476:
+#line 4734 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_get_user_var((yyloc), (yyvsp[0].lexer.lex_str));
             ITEMIZE((yyval.item), &(yyval.item));
           }
-#line 27973 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28123 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 476:
-#line 4695 "sql_yacc.yy" /* yacc.c:1646  */
+  case 477:
+#line 4742 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.stmt_info_item_name)= Statement_information_item::NUMBER; }
-#line 27979 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28129 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 477:
-#line 4697 "sql_yacc.yy" /* yacc.c:1646  */
+  case 478:
+#line 4744 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.stmt_info_item_name)= Statement_information_item::ROW_COUNT; }
-#line 27985 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28135 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 478:
-#line 4706 "sql_yacc.yy" /* yacc.c:1646  */
+  case 479:
+#line 4753 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.item)= (yyvsp[0].item); }
-#line 27991 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28141 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 479:
-#line 4711 "sql_yacc.yy" /* yacc.c:1646  */
+  case 480:
+#line 4758 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.cond_info_list)= NEW_PTN List<Condition_information_item>;
             if ((yyval.cond_info_list) == NULL || (yyval.cond_info_list)->push_back((yyvsp[0].cond_info_item)))
               MYSQL_YYABORT;
           }
-#line 28001 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28151 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 480:
-#line 4717 "sql_yacc.yy" /* yacc.c:1646  */
+  case 481:
+#line 4764 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyvsp[-2].cond_info_list)->push_back((yyvsp[0].cond_info_item)))
               MYSQL_YYABORT;
             (yyval.cond_info_list)= (yyvsp[-2].cond_info_list);
           }
-#line 28011 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28161 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 481:
-#line 4726 "sql_yacc.yy" /* yacc.c:1646  */
+  case 482:
+#line 4773 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.cond_info_item)= NEW_PTN Condition_information_item((yyvsp[0].cond_info_item_name), (yyvsp[-2].item));
             if ((yyval.cond_info_item) == NULL)
               MYSQL_YYABORT;
           }
-#line 28021 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28171 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 482:
-#line 4734 "sql_yacc.yy" /* yacc.c:1646  */
+  case 483:
+#line 4781 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.cond_info_item_name)= Condition_information_item::CLASS_ORIGIN; }
-#line 28027 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28177 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 483:
-#line 4736 "sql_yacc.yy" /* yacc.c:1646  */
+  case 484:
+#line 4783 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.cond_info_item_name)= Condition_information_item::SUBCLASS_ORIGIN; }
-#line 28033 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28183 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 484:
-#line 4738 "sql_yacc.yy" /* yacc.c:1646  */
+  case 485:
+#line 4785 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.cond_info_item_name)= Condition_information_item::CONSTRAINT_CATALOG; }
-#line 28039 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28189 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 485:
-#line 4740 "sql_yacc.yy" /* yacc.c:1646  */
+  case 486:
+#line 4787 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.cond_info_item_name)= Condition_information_item::CONSTRAINT_SCHEMA; }
-#line 28045 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28195 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 486:
-#line 4742 "sql_yacc.yy" /* yacc.c:1646  */
+  case 487:
+#line 4789 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.cond_info_item_name)= Condition_information_item::CONSTRAINT_NAME; }
-#line 28051 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28201 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 487:
-#line 4744 "sql_yacc.yy" /* yacc.c:1646  */
+  case 488:
+#line 4791 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.cond_info_item_name)= Condition_information_item::CATALOG_NAME; }
-#line 28057 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28207 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 488:
-#line 4746 "sql_yacc.yy" /* yacc.c:1646  */
+  case 489:
+#line 4793 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.cond_info_item_name)= Condition_information_item::SCHEMA_NAME; }
-#line 28063 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28213 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 489:
-#line 4748 "sql_yacc.yy" /* yacc.c:1646  */
+  case 490:
+#line 4795 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.cond_info_item_name)= Condition_information_item::TABLE_NAME; }
-#line 28069 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28219 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 490:
-#line 4750 "sql_yacc.yy" /* yacc.c:1646  */
+  case 491:
+#line 4797 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.cond_info_item_name)= Condition_information_item::COLUMN_NAME; }
-#line 28075 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28225 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 491:
-#line 4752 "sql_yacc.yy" /* yacc.c:1646  */
+  case 492:
+#line 4799 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.cond_info_item_name)= Condition_information_item::CURSOR_NAME; }
-#line 28081 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28231 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 492:
-#line 4754 "sql_yacc.yy" /* yacc.c:1646  */
+  case 493:
+#line 4801 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.cond_info_item_name)= Condition_information_item::MESSAGE_TEXT; }
-#line 28087 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28237 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 493:
-#line 4756 "sql_yacc.yy" /* yacc.c:1646  */
+  case 494:
+#line 4803 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.cond_info_item_name)= Condition_information_item::MYSQL_ERRNO; }
-#line 28093 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28243 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 494:
-#line 4758 "sql_yacc.yy" /* yacc.c:1646  */
+  case 495:
+#line 4805 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.cond_info_item_name)= Condition_information_item::RETURNED_SQLSTATE; }
-#line 28099 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28249 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 495:
-#line 4763 "sql_yacc.yy" /* yacc.c:1646  */
+  case 496:
+#line 4810 "sql_yacc.yy" /* yacc.c:1646  */
     {
             /* NOTE: field definition is filled in sp_decl section. */
 
@@ -28119,11 +28269,11 @@
                                sp_variable::MODE_IN);
             (yyval.num)= 1;
           }
-#line 28123 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28273 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 496:
-#line 4783 "sql_yacc.yy" /* yacc.c:1646  */
+  case 497:
+#line 4830 "sql_yacc.yy" /* yacc.c:1646  */
     {
             /* NOTE: field definition is filled in sp_decl section. */
 
@@ -28143,45 +28293,45 @@
                                sp_variable::MODE_IN);
             (yyval.num)= (yyvsp[-2].num) + 1;
           }
-#line 28147 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28297 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 497:
-#line 4806 "sql_yacc.yy" /* yacc.c:1646  */
+  case 498:
+#line 4853 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.sp_default).expr_start= NULL;
             (yyval.sp_default).expr = NULL;
           }
-#line 28156 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28306 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 498:
-#line 4811 "sql_yacc.yy" /* yacc.c:1646  */
+  case 499:
+#line 4858 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.sp_default).expr_start= (yylsp[-1]).raw.end;
             (yyval.sp_default).expr= (yyvsp[0].item);
           }
-#line 28165 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28315 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 512:
-#line 4835 "sql_yacc.yy" /* yacc.c:1646  */
+  case 513:
+#line 4882 "sql_yacc.yy" /* yacc.c:1646  */
     { Lex->sphead->m_parser_data.new_cont_backpatch(); }
-#line 28171 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28321 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 513:
-#line 4837 "sql_yacc.yy" /* yacc.c:1646  */
+  case 514:
+#line 4884 "sql_yacc.yy" /* yacc.c:1646  */
     {
             sp_head *sp= Lex->sphead;
 
             sp->m_parser_data.do_cont_backpatch(sp->instructions());
           }
-#line 28181 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28331 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 514:
-#line 4845 "sql_yacc.yy" /* yacc.c:1646  */
+  case 515:
+#line 4892 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -28190,11 +28340,11 @@
             sp->reset_lex(thd);
             sp->m_parser_data.set_current_stmt_start_ptr(yylloc.raw.start);
           }
-#line 28194 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28344 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 515:
-#line 4854 "sql_yacc.yy" /* yacc.c:1646  */
+  case 516:
+#line 4901 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyvsp[0].top_level_node) != nullptr)
               MAKE_CMD((yyvsp[0].top_level_node));
@@ -28247,11 +28397,11 @@
             if (sp->restore_lex(thd))
               MYSQL_YYABORT;
           }
-#line 28251 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28401 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 516:
-#line 4910 "sql_yacc.yy" /* yacc.c:1646  */
+  case 517:
+#line 4957 "sql_yacc.yy" /* yacc.c:1646  */
     {             /*$2*/
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -28259,11 +28409,11 @@
 
             sp->reset_lex(thd);
           }
-#line 28263 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28413 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 517:
-#line 4918 "sql_yacc.yy" /* yacc.c:1646  */
+  case 518:
+#line 4965 "sql_yacc.yy" /* yacc.c:1646  */
     {             /*$4*/
             ITEMIZE((yyvsp[0].item), &(yyvsp[0].item));
 
@@ -28309,11 +28459,11 @@
               MYSQL_YYABORT;
             }
           }
-#line 28313 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28463 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 518:
-#line 4966 "sql_yacc.yy" /* yacc.c:1646  */
+  case 519:
+#line 5013 "sql_yacc.yy" /* yacc.c:1646  */
     { /* Unlabeled controls get a secret label. */
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -28324,11 +28474,11 @@
                              EMPTY_CSTR,
                              sp->instructions());
           }
-#line 28328 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28478 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 519:
-#line 4977 "sql_yacc.yy" /* yacc.c:1646  */
+  case 520:
+#line 5024 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -28337,11 +28487,11 @@
             sp->m_parser_data.do_backpatch(pctx->pop_label(),
                                            sp->instructions());
           }
-#line 28341 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28491 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 520:
-#line 4989 "sql_yacc.yy" /* yacc.c:1646  */
+  case 521:
+#line 5036 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -28395,11 +28545,11 @@
                 sp->add_instr(thd, i))
               MYSQL_YYABORT;
           }
-#line 28399 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28549 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 521:
-#line 5046 "sql_yacc.yy" /* yacc.c:1646  */
+  case 522:
+#line 5093 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -28443,11 +28593,11 @@
             if (!i || sp->add_instr(thd, i))
               MYSQL_YYABORT;
           }
-#line 28447 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28597 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 522:
-#line 5093 "sql_yacc.yy" /* yacc.c:1646  */
+  case 523:
+#line 5140 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -28467,11 +28617,11 @@
             if (!i || sp->add_instr(thd, i))
               MYSQL_YYABORT;
           }
-#line 28471 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28621 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 523:
-#line 5116 "sql_yacc.yy" /* yacc.c:1646  */
+  case 524:
+#line 5163 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -28491,17 +28641,17 @@
             if (!i || sp->add_instr(thd, i))
               MYSQL_YYABORT;
           }
-#line 28495 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28645 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 524:
-#line 5136 "sql_yacc.yy" /* yacc.c:1646  */
+  case 525:
+#line 5183 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 28501 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28651 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 525:
-#line 5141 "sql_yacc.yy" /* yacc.c:1646  */
+  case 526:
+#line 5188 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -28521,11 +28671,11 @@
             if (!i || sp->add_instr(thd, i))
               MYSQL_YYABORT;
           }
-#line 28525 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28675 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 529:
-#line 5170 "sql_yacc.yy" /* yacc.c:1646  */
+  case 530:
+#line 5217 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -28543,11 +28693,11 @@
 
             i->add_to_varlist(spv);
           }
-#line 28547 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28697 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 530:
-#line 5188 "sql_yacc.yy" /* yacc.c:1646  */
+  case 531:
+#line 5235 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -28565,11 +28715,11 @@
 
             i->add_to_varlist(spv);
           }
-#line 28569 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28719 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 531:
-#line 5208 "sql_yacc.yy" /* yacc.c:1646  */
+  case 532:
+#line 5255 "sql_yacc.yy" /* yacc.c:1646  */
     {                     /*$1*/
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -28577,11 +28727,11 @@
 
             sp->reset_lex(thd);
           }
-#line 28581 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28731 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 532:
-#line 5216 "sql_yacc.yy" /* yacc.c:1646  */
+  case 533:
+#line 5263 "sql_yacc.yy" /* yacc.c:1646  */
     {                     /*$3*/
             ITEMIZE((yyvsp[0].item), &(yyvsp[0].item));
 
@@ -28618,11 +28768,11 @@
               MYSQL_YYABORT;
             }
           }
-#line 28622 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28772 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 533:
-#line 5254 "sql_yacc.yy" /* yacc.c:1646  */
+  case 534:
+#line 5301 "sql_yacc.yy" /* yacc.c:1646  */
     {                     /*$6*/
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -28640,11 +28790,11 @@
             sp->m_parser_data.add_backpatch_entry(
               i, pctx->push_label(thd, EMPTY_CSTR, 0));
           }
-#line 28644 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28794 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 534:
-#line 5272 "sql_yacc.yy" /* yacc.c:1646  */
+  case 535:
+#line 5319 "sql_yacc.yy" /* yacc.c:1646  */
     {                     /*$8*/
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -28653,11 +28803,11 @@
             sp->m_parser_data.do_backpatch(pctx->pop_label(),
                                            sp->instructions());
           }
-#line 28657 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28807 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 540:
-#line 5295 "sql_yacc.yy" /* yacc.c:1646  */
+  case 541:
+#line 5342 "sql_yacc.yy" /* yacc.c:1646  */
     {                             /*$2*/
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -28667,11 +28817,11 @@
 
             sp->reset_lex(thd); /* For CASE-expr $3 */
           }
-#line 28671 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28821 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 541:
-#line 5305 "sql_yacc.yy" /* yacc.c:1646  */
+  case 542:
+#line 5352 "sql_yacc.yy" /* yacc.c:1646  */
     {                             /*$4*/
             ITEMIZE((yyvsp[0].item), &(yyvsp[0].item));
 
@@ -28713,35 +28863,35 @@
               MYSQL_YYABORT;
             }
           }
-#line 28717 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28867 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 542:
-#line 5350 "sql_yacc.yy" /* yacc.c:1646  */
+  case 543:
+#line 5397 "sql_yacc.yy" /* yacc.c:1646  */
     {                             /*$9*/
             case_stmt_action_end_case(Lex, true);
           }
-#line 28725 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28875 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 543:
-#line 5357 "sql_yacc.yy" /* yacc.c:1646  */
+  case 544:
+#line 5404 "sql_yacc.yy" /* yacc.c:1646  */
     {
             case_stmt_action_case(YYTHD);
           }
-#line 28733 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28883 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 544:
-#line 5364 "sql_yacc.yy" /* yacc.c:1646  */
+  case 545:
+#line 5411 "sql_yacc.yy" /* yacc.c:1646  */
     {
             case_stmt_action_end_case(Lex, false);
           }
-#line 28741 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28891 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 549:
-#line 5381 "sql_yacc.yy" /* yacc.c:1646  */
+  case 550:
+#line 5428 "sql_yacc.yy" /* yacc.c:1646  */
     {                             /*$2*/
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -28749,11 +28899,11 @@
 
             sp->reset_lex(thd);
           }
-#line 28753 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28903 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 550:
-#line 5389 "sql_yacc.yy" /* yacc.c:1646  */
+  case 551:
+#line 5436 "sql_yacc.yy" /* yacc.c:1646  */
     {                             /*$4*/
             /* Simple case: <caseval> = <whenval> */
 
@@ -28794,20 +28944,20 @@
               MYSQL_YYABORT;
             }
           }
-#line 28798 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28948 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 551:
-#line 5431 "sql_yacc.yy" /* yacc.c:1646  */
+  case 552:
+#line 5478 "sql_yacc.yy" /* yacc.c:1646  */
     {                             /*$7*/
             if (case_stmt_action_then(YYTHD, Lex))
               MYSQL_YYABORT;
           }
-#line 28807 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28957 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 552:
-#line 5439 "sql_yacc.yy" /* yacc.c:1646  */
+  case 553:
+#line 5486 "sql_yacc.yy" /* yacc.c:1646  */
     {                             /*$2*/
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -28815,11 +28965,11 @@
 
             sp->reset_lex(thd);
           }
-#line 28819 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 28969 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 553:
-#line 5447 "sql_yacc.yy" /* yacc.c:1646  */
+  case 554:
+#line 5494 "sql_yacc.yy" /* yacc.c:1646  */
     {                             /*$4*/
             ITEMIZE((yyvsp[0].item), &(yyvsp[0].item));
 
@@ -28856,20 +29006,20 @@
               MYSQL_YYABORT;
             }
           }
-#line 28860 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29010 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 554:
-#line 5485 "sql_yacc.yy" /* yacc.c:1646  */
+  case 555:
+#line 5532 "sql_yacc.yy" /* yacc.c:1646  */
     {                             /*$8*/
             if (case_stmt_action_then(YYTHD, Lex))
               MYSQL_YYABORT;
           }
-#line 28869 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29019 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 555:
-#line 5493 "sql_yacc.yy" /* yacc.c:1646  */
+  case 556:
+#line 5540 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -28883,11 +29033,11 @@
             if (!i || sp->add_instr(thd, i))
               MYSQL_YYABORT;
           }
-#line 28887 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29037 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 557:
-#line 5511 "sql_yacc.yy" /* yacc.c:1646  */
+  case 558:
+#line 5558 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -28905,11 +29055,11 @@
               lab->type= sp_label::ITERATION;
             }
           }
-#line 28909 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29059 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 558:
-#line 5529 "sql_yacc.yy" /* yacc.c:1646  */
+  case 559:
+#line 5576 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -28926,23 +29076,23 @@
             }
             sp->m_parser_data.do_backpatch(lab, sp->instructions());
           }
-#line 28930 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29080 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 559:
-#line 5548 "sql_yacc.yy" /* yacc.c:1646  */
+  case 560:
+#line 5595 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lex_cstr)= NULL_CSTR; }
-#line 28936 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29086 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 560:
-#line 5549 "sql_yacc.yy" /* yacc.c:1646  */
+  case 561:
+#line 5596 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lex_cstr)= (yyvsp[0].lex_cstr); }
-#line 28942 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29092 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 561:
-#line 5554 "sql_yacc.yy" /* yacc.c:1646  */
+  case 562:
+#line 5601 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -28958,11 +29108,11 @@
             lab= pctx->push_label(YYTHD, (yyvsp[-1].lex_cstr), sp->instructions());
             lab->type= sp_label::BEGIN;
           }
-#line 28962 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29112 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 562:
-#line 5570 "sql_yacc.yy" /* yacc.c:1646  */
+  case 563:
+#line 5617 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
@@ -28977,11 +29127,11 @@
               }
             }
           }
-#line 28981 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29131 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 563:
-#line 5587 "sql_yacc.yy" /* yacc.c:1646  */
+  case 564:
+#line 5634 "sql_yacc.yy" /* yacc.c:1646  */
     { /* Unlabeled blocks get a secret label. */
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -28992,20 +29142,20 @@
 
             lab->type= sp_label::BEGIN;
           }
-#line 28996 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29146 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 564:
-#line 5598 "sql_yacc.yy" /* yacc.c:1646  */
+  case 565:
+#line 5645 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             lex->get_sp_current_parsing_ctx()->pop_label();
           }
-#line 29005 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29155 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 565:
-#line 5606 "sql_yacc.yy" /* yacc.c:1646  */
+  case 566:
+#line 5653 "sql_yacc.yy" /* yacc.c:1646  */
     { /* QQ This is just a dummy for grouping declarations and statements
               together. No [[NOT] ATOMIC] yet, and we need to figure out how
               make it coexist with the existing BEGIN COMMIT/ROLLBACK. */
@@ -29018,11 +29168,11 @@
 
             lex->set_sp_current_parsing_ctx(child_pctx);
           }
-#line 29022 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29172 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 566:
-#line 5621 "sql_yacc.yy" /* yacc.c:1646  */
+  case 567:
+#line 5668 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -29052,11 +29202,11 @@
 
             lex->set_sp_current_parsing_ctx(pctx->pop_context());
           }
-#line 29056 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29206 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 567:
-#line 5655 "sql_yacc.yy" /* yacc.c:1646  */
+  case 568:
+#line 5702 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -29069,11 +29219,11 @@
             if (!i || sp->add_instr(thd, i))
               MYSQL_YYABORT;
           }
-#line 29073 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29223 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 568:
-#line 5668 "sql_yacc.yy" /* yacc.c:1646  */
+  case 569:
+#line 5715 "sql_yacc.yy" /* yacc.c:1646  */
     {                             /*$2*/
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -29081,11 +29231,11 @@
 
             sp->reset_lex(thd);
           }
-#line 29085 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29235 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 569:
-#line 5676 "sql_yacc.yy" /* yacc.c:1646  */
+  case 570:
+#line 5723 "sql_yacc.yy" /* yacc.c:1646  */
     {                             /*$4*/
             ITEMIZE((yyvsp[0].item), &(yyvsp[0].item));
 
@@ -29123,11 +29273,11 @@
               MYSQL_YYABORT;
             }
           }
-#line 29127 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29277 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 570:
-#line 5717 "sql_yacc.yy" /* yacc.c:1646  */
+  case 571:
+#line 5764 "sql_yacc.yy" /* yacc.c:1646  */
     {                             /*$14*/
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -29142,11 +29292,11 @@
 
             sp->m_parser_data.do_cont_backpatch(sp->instructions());
           }
-#line 29146 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29296 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 571:
-#line 5734 "sql_yacc.yy" /* yacc.c:1646  */
+  case 572:
+#line 5781 "sql_yacc.yy" /* yacc.c:1646  */
     {                             /*$4*/
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -29154,11 +29304,11 @@
 
             sp->reset_lex(thd);
           }
-#line 29158 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29308 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 572:
-#line 5742 "sql_yacc.yy" /* yacc.c:1646  */
+  case 573:
+#line 5789 "sql_yacc.yy" /* yacc.c:1646  */
     {                             /*$6*/
             ITEMIZE((yyvsp[0].item), &(yyvsp[0].item));
 
@@ -29196,347 +29346,347 @@
             /* We can shortcut the cont_backpatch here */
             i->set_cont_dest(ip + 1);
           }
-#line 29200 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29350 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 574:
-#line 5785 "sql_yacc.yy" /* yacc.c:1646  */
+  case 575:
+#line 5832 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= TRG_ACTION_BEFORE; }
-#line 29206 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29356 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 575:
-#line 5787 "sql_yacc.yy" /* yacc.c:1646  */
+  case 576:
+#line 5834 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= TRG_ACTION_AFTER; }
-#line 29212 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29362 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 576:
-#line 5792 "sql_yacc.yy" /* yacc.c:1646  */
+  case 577:
+#line 5839 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= TRG_EVENT_INSERT; }
-#line 29218 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29368 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 577:
-#line 5794 "sql_yacc.yy" /* yacc.c:1646  */
+  case 578:
+#line 5841 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= TRG_EVENT_UPDATE; }
-#line 29224 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29374 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 578:
-#line 5796 "sql_yacc.yy" /* yacc.c:1646  */
+  case 579:
+#line 5843 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= TRG_EVENT_DELETE; }
-#line 29230 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29380 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 579:
-#line 5810 "sql_yacc.yy" /* yacc.c:1646  */
+  case 580:
+#line 5857 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lexer.lex_str)= { nullptr, 0}; }
-#line 29236 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29386 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 580:
-#line 5812 "sql_yacc.yy" /* yacc.c:1646  */
+  case 581:
+#line 5859 "sql_yacc.yy" /* yacc.c:1646  */
     {
         (yyval.lexer.lex_str) = (yyvsp[0].lexer.lex_str);
       }
-#line 29244 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29394 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 581:
-#line 5818 "sql_yacc.yy" /* yacc.c:1646  */
+  case 582:
+#line 5865 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lexer.lex_str)= { nullptr, 0}; }
-#line 29250 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29400 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 582:
-#line 5820 "sql_yacc.yy" /* yacc.c:1646  */
+  case 583:
+#line 5867 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.lexer.lex_str)= (yyvsp[0].lexer.lex_str);
           }
-#line 29258 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29408 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 583:
-#line 5826 "sql_yacc.yy" /* yacc.c:1646  */
+  case 584:
+#line 5873 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ts_options)= NULL; }
-#line 29264 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29414 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 585:
-#line 5832 "sql_yacc.yy" /* yacc.c:1646  */
+  case 586:
+#line 5879 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.ts_options)= NEW_PTN Mem_root_array<PT_alter_tablespace_option_base*>(YYMEM_ROOT);
             if ((yyval.ts_options) == NULL || (yyval.ts_options)->push_back((yyvsp[0].ts_option)))
               MYSQL_YYABORT; /* purecov: inspected */ // OOM
           }
-#line 29274 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29424 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 586:
-#line 5838 "sql_yacc.yy" /* yacc.c:1646  */
+  case 587:
+#line 5885 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.ts_options)= (yyvsp[-2].ts_options);
             if ((yyval.ts_options)->push_back((yyvsp[0].ts_option)))
               MYSQL_YYABORT; /* purecov: inspected */ // OOM
           }
-#line 29284 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29434 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 598:
-#line 5860 "sql_yacc.yy" /* yacc.c:1646  */
+  case 599:
+#line 5907 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ts_options)= NULL; }
-#line 29290 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29440 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 600:
-#line 5866 "sql_yacc.yy" /* yacc.c:1646  */
+  case 601:
+#line 5913 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.ts_options)= NEW_PTN Mem_root_array<PT_alter_tablespace_option_base*>(YYMEM_ROOT);
             if ((yyval.ts_options) == NULL || (yyval.ts_options)->push_back((yyvsp[0].ts_option)))
               MYSQL_YYABORT; /* purecov: inspected */ // OOM
           }
-#line 29300 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29450 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 601:
-#line 5872 "sql_yacc.yy" /* yacc.c:1646  */
+  case 602:
+#line 5919 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.ts_options)= (yyvsp[-2].ts_options);
             if ((yyval.ts_options)->push_back((yyvsp[0].ts_option)))
               MYSQL_YYABORT; /* purecov: inspected */ // OOM
           }
-#line 29310 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29460 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 609:
-#line 5890 "sql_yacc.yy" /* yacc.c:1646  */
+  case 610:
+#line 5937 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ts_options)= NULL; }
-#line 29316 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29466 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 611:
-#line 5896 "sql_yacc.yy" /* yacc.c:1646  */
+  case 612:
+#line 5943 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.ts_options)= NEW_PTN Mem_root_array<PT_alter_tablespace_option_base*>(YYMEM_ROOT);
             if ((yyval.ts_options) == NULL || (yyval.ts_options)->push_back((yyvsp[0].ts_option)))
               MYSQL_YYABORT; // OOM
           }
-#line 29326 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29476 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 612:
-#line 5902 "sql_yacc.yy" /* yacc.c:1646  */
+  case 613:
+#line 5949 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.ts_options)= (yyvsp[-2].ts_options);
             if ((yyval.ts_options)->push_back((yyvsp[0].ts_option)))
               MYSQL_YYABORT; // OOM
           }
-#line 29336 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29486 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 614:
-#line 5914 "sql_yacc.yy" /* yacc.c:1646  */
+  case 615:
+#line 5961 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ts_options)= NULL; }
-#line 29342 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29492 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 616:
-#line 5920 "sql_yacc.yy" /* yacc.c:1646  */
+  case 617:
+#line 5967 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.ts_options)= NEW_PTN Mem_root_array<PT_alter_tablespace_option_base*>(YYMEM_ROOT);
             if ((yyval.ts_options) == NULL || (yyval.ts_options)->push_back((yyvsp[0].ts_option)))
               MYSQL_YYABORT; /* purecov: inspected */ // OOM
           }
-#line 29352 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29502 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 617:
-#line 5926 "sql_yacc.yy" /* yacc.c:1646  */
+  case 618:
+#line 5973 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.ts_options)= (yyvsp[-2].ts_options);
             if ((yyval.ts_options)->push_back((yyvsp[0].ts_option)))
               MYSQL_YYABORT; /* purecov: inspected */ // OOM
           }
-#line 29362 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29512 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 625:
-#line 5944 "sql_yacc.yy" /* yacc.c:1646  */
+  case 626:
+#line 5991 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ts_options)= NULL; }
-#line 29368 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29518 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 627:
-#line 5950 "sql_yacc.yy" /* yacc.c:1646  */
+  case 628:
+#line 5997 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.ts_options)= NEW_PTN Mem_root_array<PT_alter_tablespace_option_base*>(YYMEM_ROOT);
             if ((yyval.ts_options) == NULL || (yyval.ts_options)->push_back((yyvsp[0].ts_option)))
               MYSQL_YYABORT; /* purecov: inspected */ // OOM
           }
-#line 29378 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29528 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 628:
-#line 5956 "sql_yacc.yy" /* yacc.c:1646  */
+  case 629:
+#line 6003 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.ts_options)= (yyvsp[-2].ts_options);
             if ((yyval.ts_options)->push_back((yyvsp[0].ts_option)))
               MYSQL_YYABORT; /* purecov: inspected */ // OOM
           }
-#line 29388 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29538 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 632:
-#line 5970 "sql_yacc.yy" /* yacc.c:1646  */
+  case 633:
+#line 6017 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lexer.lex_str)= (yyvsp[0].lexer.lex_str); }
-#line 29394 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29544 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 633:
-#line 5974 "sql_yacc.yy" /* yacc.c:1646  */
+  case 634:
+#line 6021 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.alter_tablespace_type)= ALTER_UNDO_TABLESPACE_SET_ACTIVE; }
-#line 29400 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29550 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 634:
-#line 5975 "sql_yacc.yy" /* yacc.c:1646  */
+  case 635:
+#line 6022 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.alter_tablespace_type)= ALTER_UNDO_TABLESPACE_SET_INACTIVE; }
-#line 29406 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29556 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 635:
-#line 5979 "sql_yacc.yy" /* yacc.c:1646  */
+  case 636:
+#line 6026 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lexer.lex_str)= (yyvsp[0].lexer.lex_str); }
-#line 29412 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29562 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 636:
-#line 5984 "sql_yacc.yy" /* yacc.c:1646  */
+  case 637:
+#line 6031 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.ts_option)= NEW_PTN PT_alter_tablespace_option_initial_size((yyvsp[0].ulonglong_number));
           }
-#line 29420 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29570 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 637:
-#line 5991 "sql_yacc.yy" /* yacc.c:1646  */
+  case 638:
+#line 6038 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.ts_option) = NEW_PTN PT_alter_tablespace_option_autoextend_size((yyvsp[0].ulonglong_number));
           }
-#line 29428 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29578 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 638:
-#line 5997 "sql_yacc.yy" /* yacc.c:1646  */
+  case 639:
+#line 6044 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ulonglong_number) = (yyvsp[0].ulonglong_number); }
-#line 29434 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29584 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 639:
-#line 6002 "sql_yacc.yy" /* yacc.c:1646  */
+  case 640:
+#line 6049 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.ts_option)= NEW_PTN PT_alter_tablespace_option_max_size((yyvsp[0].ulonglong_number));
           }
-#line 29442 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29592 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 640:
-#line 6009 "sql_yacc.yy" /* yacc.c:1646  */
+  case 641:
+#line 6056 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.ts_option)= NEW_PTN PT_alter_tablespace_option_extent_size((yyvsp[0].ulonglong_number));
           }
-#line 29450 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29600 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 641:
-#line 6016 "sql_yacc.yy" /* yacc.c:1646  */
+  case 642:
+#line 6063 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.ts_option)= NEW_PTN PT_alter_tablespace_option_undo_buffer_size((yyvsp[0].ulonglong_number));
           }
-#line 29458 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29608 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 642:
-#line 6023 "sql_yacc.yy" /* yacc.c:1646  */
+  case 643:
+#line 6070 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.ts_option)= NEW_PTN PT_alter_tablespace_option_redo_buffer_size((yyvsp[0].ulonglong_number));
           }
-#line 29466 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29616 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 643:
-#line 6030 "sql_yacc.yy" /* yacc.c:1646  */
+  case 644:
+#line 6077 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.ts_option)= NEW_PTN PT_alter_tablespace_option_nodegroup((yyvsp[0].ulong_num));
           }
-#line 29474 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29624 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 644:
-#line 6037 "sql_yacc.yy" /* yacc.c:1646  */
+  case 645:
+#line 6084 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.ts_option)= NEW_PTN PT_alter_tablespace_option_comment((yyvsp[0].lexer.lex_str));
           }
-#line 29482 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29632 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 645:
-#line 6044 "sql_yacc.yy" /* yacc.c:1646  */
+  case 646:
+#line 6091 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.ts_option)= NEW_PTN PT_alter_tablespace_option_engine(to_lex_cstring((yyvsp[0].lexer.lex_str)));
           }
-#line 29490 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29640 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 646:
-#line 6051 "sql_yacc.yy" /* yacc.c:1646  */
+  case 647:
+#line 6098 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.ts_option)= NEW_PTN PT_alter_tablespace_option_file_block_size((yyvsp[0].ulonglong_number));
           }
-#line 29498 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29648 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 647:
-#line 6058 "sql_yacc.yy" /* yacc.c:1646  */
+  case 648:
+#line 6105 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.ts_option)= NEW_PTN PT_alter_tablespace_option_wait_until_completed(true);
           }
-#line 29506 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29656 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 648:
-#line 6062 "sql_yacc.yy" /* yacc.c:1646  */
+  case 649:
+#line 6109 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.ts_option)= NEW_PTN PT_alter_tablespace_option_wait_until_completed(false);
           }
-#line 29514 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29664 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 649:
-#line 6069 "sql_yacc.yy" /* yacc.c:1646  */
+  case 650:
+#line 6116 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.ts_option)= NEW_PTN PT_alter_tablespace_option_encryption((yyvsp[0].lexer.lex_str));
           }
-#line 29522 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29672 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 650:
-#line 6076 "sql_yacc.yy" /* yacc.c:1646  */
+  case 651:
+#line 6123 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.ts_option) = make_tablespace_engine_attribute(YYMEM_ROOT, (yyvsp[0].lex_cstr));
           }
-#line 29530 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29680 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 651:
-#line 6082 "sql_yacc.yy" /* yacc.c:1646  */
+  case 652:
+#line 6129 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ulonglong_number)= (yyvsp[0].ulonglong_number);}
-#line 29536 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29686 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 652:
-#line 6084 "sql_yacc.yy" /* yacc.c:1646  */
+  case 653:
+#line 6131 "sql_yacc.yy" /* yacc.c:1646  */
     {
             ulonglong number;
             uint text_shift_number= 0;
@@ -29553,11 +29703,11 @@
                 case 'g':
                 case 'G':
                   text_shift_number+=10;
-                  // Fall through.
+                  [[fallthrough]];
                 case 'm':
                 case 'M':
                   text_shift_number+=10;
-                  // Fall through.
+                  [[fallthrough]];
                 case 'k':
                 case 'K':
                   text_shift_number+=10;
@@ -29582,148 +29732,148 @@
             }
             (yyval.ulonglong_number)= number;
           }
-#line 29586 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29736 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 653:
-#line 6160 "sql_yacc.yy" /* yacc.c:1646  */
+  case 654:
+#line 6207 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_tail)= (yyvsp[0].create_table_tail);
             (yyval.create_table_tail).opt_create_table_options= (yyvsp[-1].create_table_options);
           }
-#line 29595 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29745 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 655:
-#line 6169 "sql_yacc.yy" /* yacc.c:1646  */
+  case 656:
+#line 6216 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_tail)= (yyvsp[0].create_table_tail);
             (yyval.create_table_tail).opt_partitioning= (yyvsp[-1].partition_clause);
           }
-#line 29604 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29754 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 657:
-#line 6178 "sql_yacc.yy" /* yacc.c:1646  */
+  case 658:
+#line 6225 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_tail).opt_create_table_options= NULL;
             (yyval.create_table_tail).opt_partitioning= NULL;
             (yyval.create_table_tail).on_duplicate= On_duplicate::ERROR;
             (yyval.create_table_tail).opt_query_expression= NULL;
           }
-#line 29615 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29765 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 658:
-#line 6186 "sql_yacc.yy" /* yacc.c:1646  */
+  case 659:
+#line 6233 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_tail).opt_create_table_options= NULL;
             (yyval.create_table_tail).opt_partitioning= NULL;
             (yyval.create_table_tail).on_duplicate= (yyvsp[-1].on_duplicate);
             (yyval.create_table_tail).opt_query_expression= (yyvsp[0].query_primary);
           }
-#line 29626 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29776 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 659:
-#line 6193 "sql_yacc.yy" /* yacc.c:1646  */
+  case 660:
+#line 6240 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_tail).opt_create_table_options= NULL;
             (yyval.create_table_tail).opt_partitioning= NULL;
             (yyval.create_table_tail).on_duplicate= On_duplicate::ERROR;
             (yyval.create_table_tail).opt_query_expression= (yyvsp[0].query_primary);
           }
-#line 29637 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29787 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 660:
-#line 6202 "sql_yacc.yy" /* yacc.c:1646  */
+  case 661:
+#line 6249 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.query_primary) = (yyvsp[0].query_primary); }
-#line 29643 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29793 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 661:
-#line 6203 "sql_yacc.yy" /* yacc.c:1646  */
+  case 662:
+#line 6250 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.query_primary) = (yyvsp[0].query_primary); }
-#line 29649 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29799 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 662:
-#line 6219 "sql_yacc.yy" /* yacc.c:1646  */
+  case 663:
+#line 6266 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.partition_clause)= NEW_PTN PT_partition((yyvsp[-3].part_type_def), (yyvsp[-2].ulong_num), (yyvsp[-1].opt_sub_part), (yylsp[0]), (yyvsp[0].part_def_list));
           }
-#line 29657 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29807 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 663:
-#line 6226 "sql_yacc.yy" /* yacc.c:1646  */
+  case 664:
+#line 6273 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.part_type_def)= NEW_PTN PT_part_type_def_key((yyvsp[-5].is_not_empty), (yyvsp[-3].opt_key_algo), (yyvsp[-1].name_list));
           }
-#line 29665 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29815 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 664:
-#line 6230 "sql_yacc.yy" /* yacc.c:1646  */
+  case 665:
+#line 6277 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.part_type_def)= NEW_PTN PT_part_type_def_hash((yyvsp[-4].is_not_empty), (yylsp[-1]), (yyvsp[-1].item));
           }
-#line 29673 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29823 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 665:
-#line 6234 "sql_yacc.yy" /* yacc.c:1646  */
+  case 666:
+#line 6281 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.part_type_def)= NEW_PTN PT_part_type_def_range_expr((yylsp[-1]), (yyvsp[-1].item));
           }
-#line 29681 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29831 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 666:
-#line 6238 "sql_yacc.yy" /* yacc.c:1646  */
+  case 667:
+#line 6285 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.part_type_def)= NEW_PTN PT_part_type_def_range_columns((yyvsp[-1].name_list));
           }
-#line 29689 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29839 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 667:
-#line 6242 "sql_yacc.yy" /* yacc.c:1646  */
+  case 668:
+#line 6289 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.part_type_def)= NEW_PTN PT_part_type_def_list_expr((yylsp[-1]), (yyvsp[-1].item));
           }
-#line 29697 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29847 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 668:
-#line 6246 "sql_yacc.yy" /* yacc.c:1646  */
+  case 669:
+#line 6293 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.part_type_def)= NEW_PTN PT_part_type_def_list_columns((yyvsp[-1].name_list));
           }
-#line 29705 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29855 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 669:
-#line 6252 "sql_yacc.yy" /* yacc.c:1646  */
+  case 670:
+#line 6299 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.is_not_empty)= false; }
-#line 29711 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29861 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 670:
-#line 6253 "sql_yacc.yy" /* yacc.c:1646  */
+  case 671:
+#line 6300 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.is_not_empty)= true; }
-#line 29717 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29867 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 671:
-#line 6258 "sql_yacc.yy" /* yacc.c:1646  */
+  case 672:
+#line 6305 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.opt_key_algo)= enum_key_algorithm::KEY_ALGORITHM_NONE; }
-#line 29723 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29873 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 672:
-#line 6260 "sql_yacc.yy" /* yacc.c:1646  */
+  case 673:
+#line 6307 "sql_yacc.yy" /* yacc.c:1646  */
     {
             switch ((yyvsp[0].ulong_num)) {
             case 1:
@@ -29737,17 +29887,17 @@
               MYSQL_YYABORT;
             }
           }
-#line 29741 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29891 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 673:
-#line 6277 "sql_yacc.yy" /* yacc.c:1646  */
+  case 674:
+#line 6324 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ulong_num)= 0; }
-#line 29747 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29897 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 674:
-#line 6279 "sql_yacc.yy" /* yacc.c:1646  */
+  case 675:
+#line 6326 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyvsp[0].ulong_num) == 0)
             {
@@ -29756,65 +29906,65 @@
             }
             (yyval.ulong_num)= (yyvsp[0].ulong_num);
           }
-#line 29760 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29910 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 675:
-#line 6290 "sql_yacc.yy" /* yacc.c:1646  */
+  case 676:
+#line 6337 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.opt_sub_part)= NULL; }
-#line 29766 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29916 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 676:
-#line 6293 "sql_yacc.yy" /* yacc.c:1646  */
+  case 677:
+#line 6340 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.opt_sub_part)= NEW_PTN PT_sub_partition_by_hash((yyvsp[-5].is_not_empty), (yylsp[-2]), (yyvsp[-2].item), (yyvsp[0].ulong_num));
           }
-#line 29774 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29924 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 677:
-#line 6298 "sql_yacc.yy" /* yacc.c:1646  */
+  case 678:
+#line 6345 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.opt_sub_part)= NEW_PTN PT_sub_partition_by_key((yyvsp[-6].is_not_empty), (yyvsp[-4].opt_key_algo), (yyvsp[-2].name_list), (yyvsp[0].ulong_num));
           }
-#line 29782 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29932 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 678:
-#line 6305 "sql_yacc.yy" /* yacc.c:1646  */
+  case 679:
+#line 6352 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.name_list)= NULL; }
-#line 29788 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29938 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 680:
-#line 6312 "sql_yacc.yy" /* yacc.c:1646  */
+  case 681:
+#line 6359 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.name_list)= NEW_PTN List<char>;
             if ((yyval.name_list) == NULL || (yyval.name_list)->push_back((yyvsp[0].lexer.lex_str).str))
               MYSQL_YYABORT;
           }
-#line 29798 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29948 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 681:
-#line 6318 "sql_yacc.yy" /* yacc.c:1646  */
+  case 682:
+#line 6365 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.name_list)= (yyvsp[-2].name_list);
             if ((yyval.name_list)->push_back((yyvsp[0].lexer.lex_str).str))
               MYSQL_YYABORT;
           }
-#line 29808 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29958 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 682:
-#line 6327 "sql_yacc.yy" /* yacc.c:1646  */
+  case 683:
+#line 6374 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ulong_num)= 0; }
-#line 29814 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29964 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 683:
-#line 6329 "sql_yacc.yy" /* yacc.c:1646  */
+  case 684:
+#line 6376 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyvsp[0].ulong_num) == 0)
             {
@@ -29823,121 +29973,121 @@
             }
             (yyval.ulong_num)= (yyvsp[0].ulong_num);
           }
-#line 29827 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29977 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 684:
-#line 6340 "sql_yacc.yy" /* yacc.c:1646  */
+  case 685:
+#line 6387 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.part_def_list)= NULL; }
-#line 29833 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29983 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 685:
-#line 6341 "sql_yacc.yy" /* yacc.c:1646  */
+  case 686:
+#line 6388 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.part_def_list)= (yyvsp[-1].part_def_list); }
-#line 29839 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29989 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 686:
-#line 6346 "sql_yacc.yy" /* yacc.c:1646  */
+  case 687:
+#line 6393 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.part_def_list)= NEW_PTN Mem_root_array<PT_part_definition*>(YYMEM_ROOT);
             if ((yyval.part_def_list) == NULL || (yyval.part_def_list)->push_back((yyvsp[0].part_definition)))
               MYSQL_YYABORT; // OOM
           }
-#line 29849 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 29999 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 687:
-#line 6352 "sql_yacc.yy" /* yacc.c:1646  */
+  case 688:
+#line 6399 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.part_def_list)= (yyvsp[-2].part_def_list);
             if ((yyval.part_def_list)->push_back((yyvsp[0].part_definition)))
               MYSQL_YYABORT; // OOM
           }
-#line 29859 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30009 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 688:
-#line 6361 "sql_yacc.yy" /* yacc.c:1646  */
+  case 689:
+#line 6408 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.part_definition)= NEW_PTN PT_part_definition((yylsp[-5]), (yyvsp[-3].lexer.lex_str), (yyvsp[-2].opt_part_values).type, (yyvsp[-2].opt_part_values).values, (yylsp[-2]),
                                            (yyvsp[-1].partition_option_list), (yyvsp[0].sub_part_list), (yylsp[0]));
           }
-#line 29868 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30018 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 689:
-#line 6369 "sql_yacc.yy" /* yacc.c:1646  */
+  case 690:
+#line 6416 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.opt_part_values).type= partition_type::HASH;
           }
-#line 29876 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30026 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 690:
-#line 6373 "sql_yacc.yy" /* yacc.c:1646  */
+  case 691:
+#line 6420 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.opt_part_values).type= partition_type::RANGE;
             (yyval.opt_part_values).values= (yyvsp[0].part_value_item_list_paren);
           }
-#line 29885 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30035 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 691:
-#line 6378 "sql_yacc.yy" /* yacc.c:1646  */
+  case 692:
+#line 6425 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.opt_part_values).type= partition_type::LIST;
             (yyval.opt_part_values).values= (yyvsp[0].part_values);
           }
-#line 29894 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30044 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 692:
-#line 6385 "sql_yacc.yy" /* yacc.c:1646  */
+  case 693:
+#line 6432 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.part_value_item_list_paren)= NULL; }
-#line 29900 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30050 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 694:
-#line 6391 "sql_yacc.yy" /* yacc.c:1646  */
+  case 695:
+#line 6438 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.part_values)= NEW_PTN PT_part_values_in_item((yylsp[0]), (yyvsp[0].part_value_item_list_paren));
           }
-#line 29908 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30058 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 695:
-#line 6395 "sql_yacc.yy" /* yacc.c:1646  */
+  case 696:
+#line 6442 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.part_values)= NEW_PTN PT_part_values_in_list((yylsp[0]), (yyvsp[-1].part_value_list));
           }
-#line 29916 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30066 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 696:
-#line 6402 "sql_yacc.yy" /* yacc.c:1646  */
+  case 697:
+#line 6449 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.part_value_list)= NEW_PTN
               Mem_root_array<PT_part_value_item_list_paren *>(YYMEM_ROOT);
             if ((yyval.part_value_list) == NULL || (yyval.part_value_list)->push_back((yyvsp[0].part_value_item_list_paren)))
               MYSQL_YYABORT; // OOM
           }
-#line 29927 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30077 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 697:
-#line 6409 "sql_yacc.yy" /* yacc.c:1646  */
+  case 698:
+#line 6456 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.part_value_list)= (yyvsp[-2].part_value_list);
             if ((yyval.part_value_list)->push_back((yyvsp[0].part_value_item_list_paren)))
               MYSQL_YYABORT; // OOM
           }
-#line 29937 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30087 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 698:
-#line 6418 "sql_yacc.yy" /* yacc.c:1646  */
+  case 699:
+#line 6465 "sql_yacc.yy" /* yacc.c:1646  */
     {
             /*
               This empty action is required because it resolves 2 reduce/reduce
@@ -29948,165 +30098,165 @@
                       | '(' expr ',' expr_list ')'
             */
           }
-#line 29952 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30102 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 699:
-#line 6429 "sql_yacc.yy" /* yacc.c:1646  */
+  case 700:
+#line 6476 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.part_value_item_list_paren)= NEW_PTN PT_part_value_item_list_paren((yyvsp[-1].part_value_item_list), (yylsp[0]));
           }
-#line 29960 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30110 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 700:
-#line 6436 "sql_yacc.yy" /* yacc.c:1646  */
+  case 701:
+#line 6483 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.part_value_item_list)= NEW_PTN Mem_root_array<PT_part_value_item *>(YYMEM_ROOT);
             if ((yyval.part_value_item_list) == NULL || (yyval.part_value_item_list)->push_back((yyvsp[0].part_value_item)))
               MYSQL_YYABORT; // OOM
           }
-#line 29970 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30120 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 701:
-#line 6442 "sql_yacc.yy" /* yacc.c:1646  */
+  case 702:
+#line 6489 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.part_value_item_list)= (yyvsp[-2].part_value_item_list);
             if ((yyval.part_value_item_list)->push_back((yyvsp[0].part_value_item)))
               MYSQL_YYABORT; // OOM
           }
-#line 29980 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30130 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 702:
-#line 6450 "sql_yacc.yy" /* yacc.c:1646  */
+  case 703:
+#line 6497 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.part_value_item)= NEW_PTN PT_part_value_item_max((yylsp[0])); }
-#line 29986 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30136 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 703:
-#line 6451 "sql_yacc.yy" /* yacc.c:1646  */
+  case 704:
+#line 6498 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.part_value_item)= NEW_PTN PT_part_value_item_expr((yylsp[0]), (yyvsp[0].item)); }
-#line 29992 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30142 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 704:
-#line 6456 "sql_yacc.yy" /* yacc.c:1646  */
+  case 705:
+#line 6503 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.sub_part_list)= NULL; }
-#line 29998 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30148 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 705:
-#line 6457 "sql_yacc.yy" /* yacc.c:1646  */
+  case 706:
+#line 6504 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.sub_part_list)= (yyvsp[-1].sub_part_list); }
-#line 30004 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30154 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 706:
-#line 6462 "sql_yacc.yy" /* yacc.c:1646  */
+  case 707:
+#line 6509 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.sub_part_list)= NEW_PTN Mem_root_array<PT_subpartition *>(YYMEM_ROOT);
             if ((yyval.sub_part_list) == NULL || (yyval.sub_part_list)->push_back((yyvsp[0].sub_part_definition)))
               MYSQL_YYABORT; // OOM
           }
-#line 30014 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30164 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 707:
-#line 6468 "sql_yacc.yy" /* yacc.c:1646  */
+  case 708:
+#line 6515 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.sub_part_list)= (yyvsp[-2].sub_part_list);
             if ((yyval.sub_part_list)->push_back((yyvsp[0].sub_part_definition)))
               MYSQL_YYABORT; // OOM
           }
-#line 30024 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30174 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 708:
-#line 6477 "sql_yacc.yy" /* yacc.c:1646  */
+  case 709:
+#line 6524 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.sub_part_definition)= NEW_PTN PT_subpartition((yylsp[-2]), (yyvsp[-1].lexer.lex_str).str, (yyvsp[0].partition_option_list));
           }
-#line 30032 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30182 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 709:
-#line 6483 "sql_yacc.yy" /* yacc.c:1646  */
+  case 710:
+#line 6530 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.partition_option_list)= NULL; }
-#line 30038 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30188 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 711:
-#line 6489 "sql_yacc.yy" /* yacc.c:1646  */
+  case 712:
+#line 6536 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.partition_option_list)= (yyvsp[-1].partition_option_list);
             if ((yyval.partition_option_list)->push_back((yyvsp[0].partition_option)))
               MYSQL_YYABORT; // OOM
           }
-#line 30048 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30198 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 712:
-#line 6495 "sql_yacc.yy" /* yacc.c:1646  */
+  case 713:
+#line 6542 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.partition_option_list)= NEW_PTN Mem_root_array<PT_partition_option *>(YYMEM_ROOT);
             if ((yyval.partition_option_list) == NULL || (yyval.partition_option_list)->push_back((yyvsp[0].partition_option)))
               MYSQL_YYABORT; // OOM
           }
-#line 30058 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30208 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 713:
-#line 6504 "sql_yacc.yy" /* yacc.c:1646  */
+  case 714:
+#line 6551 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.partition_option)= NEW_PTN PT_partition_tablespace((yyvsp[0].lexer.lex_str).str); }
-#line 30064 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30214 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 714:
-#line 6506 "sql_yacc.yy" /* yacc.c:1646  */
+  case 715:
+#line 6553 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.partition_option)= NEW_PTN PT_partition_engine(to_lex_cstring((yyvsp[0].lexer.lex_str))); }
-#line 30070 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30220 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 715:
-#line 6508 "sql_yacc.yy" /* yacc.c:1646  */
+  case 716:
+#line 6555 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.partition_option)= NEW_PTN PT_partition_nodegroup((yyvsp[0].ulong_num)); }
-#line 30076 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30226 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 716:
-#line 6510 "sql_yacc.yy" /* yacc.c:1646  */
+  case 717:
+#line 6557 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.partition_option)= NEW_PTN PT_partition_max_rows((yyvsp[0].ulonglong_number)); }
-#line 30082 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30232 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 717:
-#line 6512 "sql_yacc.yy" /* yacc.c:1646  */
+  case 718:
+#line 6559 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.partition_option)= NEW_PTN PT_partition_min_rows((yyvsp[0].ulonglong_number)); }
-#line 30088 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30238 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 718:
-#line 6514 "sql_yacc.yy" /* yacc.c:1646  */
+  case 719:
+#line 6561 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.partition_option)= NEW_PTN PT_partition_data_directory((yyvsp[0].lexer.lex_str).str); }
-#line 30094 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30244 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 719:
-#line 6516 "sql_yacc.yy" /* yacc.c:1646  */
+  case 720:
+#line 6563 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.partition_option)= NEW_PTN PT_partition_index_directory((yyvsp[0].lexer.lex_str).str); }
-#line 30100 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30250 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 720:
-#line 6518 "sql_yacc.yy" /* yacc.c:1646  */
+  case 721:
+#line 6565 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.partition_option)= NEW_PTN PT_partition_comment((yyvsp[0].lexer.lex_str).str); }
-#line 30106 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30256 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 724:
-#line 6533 "sql_yacc.yy" /* yacc.c:1646  */
+  case 725:
+#line 6580 "sql_yacc.yy" /* yacc.c:1646  */
     {
             /*
               If the statement has set READ ONLY already, and we repeat the
@@ -30124,53 +30274,53 @@
             Lex->create_info->schema_read_only = ((yyvsp[0].ternary_option) == Ternary_option::ON);
             Lex->create_info->used_fields |= HA_CREATE_USED_READ_ONLY;
           }
-#line 30128 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
-    break;
-
-  case 725:
-#line 6553 "sql_yacc.yy" /* yacc.c:1646  */
-    {}
-#line 30134 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30278 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 726:
-#line 6554 "sql_yacc.yy" /* yacc.c:1646  */
+#line 6600 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 30140 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30284 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 727:
-#line 6558 "sql_yacc.yy" /* yacc.c:1646  */
+#line 6601 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 30146 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30290 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 728:
-#line 6559 "sql_yacc.yy" /* yacc.c:1646  */
+#line 6605 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 30152 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30296 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 729:
-#line 6564 "sql_yacc.yy" /* yacc.c:1646  */
+#line 6606 "sql_yacc.yy" /* yacc.c:1646  */
+    {}
+#line 30302 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+    break;
+
+  case 730:
+#line 6611 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if (set_default_collation(Lex->create_info, (yyvsp[0].lexer.charset)))
               MYSQL_YYABORT;
           }
-#line 30161 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30311 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 730:
-#line 6569 "sql_yacc.yy" /* yacc.c:1646  */
+  case 731:
+#line 6616 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if (set_default_charset(Lex->create_info, (yyvsp[0].lexer.charset)))
               MYSQL_YYABORT;
           }
-#line 30170 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30320 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 731:
-#line 6574 "sql_yacc.yy" /* yacc.c:1646  */
+  case 732:
+#line 6621 "sql_yacc.yy" /* yacc.c:1646  */
     {
             // Validate if we have either 'y|Y' or 'n|N'
             if (my_strcasecmp(system_charset_info, (yyvsp[0].lexer.lex_str).str, "Y") != 0 &&
@@ -30182,175 +30332,184 @@
             Lex->create_info->encrypt_type= (yyvsp[0].lexer.lex_str);
             Lex->create_info->used_fields |= HA_CREATE_USED_DEFAULT_ENCRYPTION;
           }
-#line 30186 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30336 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 732:
-#line 6588 "sql_yacc.yy" /* yacc.c:1646  */
+  case 733:
+#line 6635 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.is_not_empty)= false; }
-#line 30192 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30342 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 733:
-#line 6589 "sql_yacc.yy" /* yacc.c:1646  */
+  case 734:
+#line 6636 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.is_not_empty)= true; }
-#line 30198 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30348 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 734:
-#line 6594 "sql_yacc.yy" /* yacc.c:1646  */
+  case 735:
+#line 6641 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.space_separated_alter_table_opts)= NEW_PTN Mem_root_array<PT_ddl_table_option *>(YYMEM_ROOT);
             if ((yyval.space_separated_alter_table_opts) == NULL || (yyval.space_separated_alter_table_opts)->push_back((yyvsp[0].create_table_option)))
               MYSQL_YYABORT; // OOM
           }
-#line 30208 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30358 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 735:
-#line 6600 "sql_yacc.yy" /* yacc.c:1646  */
+  case 736:
+#line 6647 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.space_separated_alter_table_opts)= (yyvsp[-1].space_separated_alter_table_opts);
             if ((yyval.space_separated_alter_table_opts)->push_back((yyvsp[0].create_table_option)))
               MYSQL_YYABORT; // OOM
           }
-#line 30218 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30368 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 736:
-#line 6609 "sql_yacc.yy" /* yacc.c:1646  */
+  case 737:
+#line 6656 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_options)= NEW_PTN Mem_root_array<PT_create_table_option *>(YYMEM_ROOT);
             if ((yyval.create_table_options) == NULL || (yyval.create_table_options)->push_back((yyvsp[0].create_table_option)))
               MYSQL_YYABORT; // OOM
           }
-#line 30228 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30378 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 737:
-#line 6615 "sql_yacc.yy" /* yacc.c:1646  */
+  case 738:
+#line 6662 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_options)= (yyvsp[-2].create_table_options);
             if ((yyval.create_table_options)->push_back((yyvsp[0].create_table_option)))
               MYSQL_YYABORT; // OOM
           }
-#line 30238 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30388 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 740:
-#line 6629 "sql_yacc.yy" /* yacc.c:1646  */
+  case 741:
+#line 6676 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_option)= NEW_PTN PT_create_table_engine_option(to_lex_cstring((yyvsp[0].lexer.lex_str)));
           }
-#line 30246 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30396 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 741:
-#line 6633 "sql_yacc.yy" /* yacc.c:1646  */
+  case 742:
+#line 6680 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_option)= NEW_PTN PT_create_table_secondary_engine_option();
           }
-#line 30254 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30404 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 742:
-#line 6637 "sql_yacc.yy" /* yacc.c:1646  */
+  case 743:
+#line 6684 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_option)= NEW_PTN PT_create_table_secondary_engine_option(to_lex_cstring((yyvsp[0].lexer.lex_str)));
           }
-#line 30262 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30412 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 743:
-#line 6641 "sql_yacc.yy" /* yacc.c:1646  */
+  case 744:
+#line 6688 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_option)= NEW_PTN PT_create_max_rows_option((yyvsp[0].ulonglong_number));
           }
-#line 30270 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30420 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 744:
-#line 6645 "sql_yacc.yy" /* yacc.c:1646  */
+  case 745:
+#line 6692 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_option)= NEW_PTN PT_create_min_rows_option((yyvsp[0].ulonglong_number));
           }
-#line 30278 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30428 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 745:
-#line 6649 "sql_yacc.yy" /* yacc.c:1646  */
+  case 746:
+#line 6696 "sql_yacc.yy" /* yacc.c:1646  */
     {
-            (yyval.create_table_option)= NEW_PTN PT_create_avg_row_length_option((yyvsp[0].ulong_num));
+            // The frm-format only allocated 4 bytes for avg_row_length, and
+            // there is code which assumes it can be represented as an uint,
+            // so we constrain it here.
+            if ((yyvsp[0].ulonglong_number) > std::numeric_limits<std::uint32_t>::max()) {
+              YYTHD->syntax_error_at((yylsp[0]),
+              "The valid range for avg_row_length is [0,4294967295]. Error"
+              );
+              MYSQL_YYABORT;
+            }
+            (yyval.create_table_option)= NEW_PTN PT_create_avg_row_length_option((yyvsp[0].ulonglong_number));
           }
-#line 30286 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30445 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 746:
-#line 6653 "sql_yacc.yy" /* yacc.c:1646  */
+  case 747:
+#line 6709 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_option)= NEW_PTN PT_create_password_option((yyvsp[0].lexer.lex_str).str);
           }
-#line 30294 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30453 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 747:
-#line 6657 "sql_yacc.yy" /* yacc.c:1646  */
+  case 748:
+#line 6713 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_option)= NEW_PTN PT_create_commen_option((yyvsp[0].lexer.lex_str));
           }
-#line 30302 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30461 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 748:
-#line 6661 "sql_yacc.yy" /* yacc.c:1646  */
+  case 749:
+#line 6717 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_option)= NEW_PTN PT_create_compress_option((yyvsp[0].lexer.lex_str));
           }
-#line 30310 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30469 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 749:
-#line 6665 "sql_yacc.yy" /* yacc.c:1646  */
+  case 750:
+#line 6721 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_option)= NEW_PTN PT_create_encryption_option((yyvsp[0].lexer.lex_str));
           }
-#line 30318 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30477 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 750:
-#line 6669 "sql_yacc.yy" /* yacc.c:1646  */
+  case 751:
+#line 6725 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_option)= NEW_PTN PT_create_auto_increment_option((yyvsp[0].ulonglong_number));
           }
-#line 30326 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30485 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 751:
-#line 6673 "sql_yacc.yy" /* yacc.c:1646  */
+  case 752:
+#line 6729 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_option)= NEW_PTN PT_create_pack_keys_option((yyvsp[0].ternary_option));
           }
-#line 30334 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30493 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 752:
-#line 6677 "sql_yacc.yy" /* yacc.c:1646  */
+  case 753:
+#line 6733 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_option)= NEW_PTN PT_create_stats_auto_recalc_option((yyvsp[0].ternary_option));
           }
-#line 30342 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30501 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 753:
-#line 6681 "sql_yacc.yy" /* yacc.c:1646  */
+  case 754:
+#line 6737 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_option)= NEW_PTN PT_create_stats_persistent_option((yyvsp[0].ternary_option));
           }
-#line 30350 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30509 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 754:
-#line 6685 "sql_yacc.yy" /* yacc.c:1646  */
+  case 755:
+#line 6741 "sql_yacc.yy" /* yacc.c:1646  */
     {
             /* From user point of view STATS_SAMPLE_PAGES can be specified as
             STATS_SAMPLE_PAGES=N (where 0<N<=65535, it does not make sense to
@@ -30362,177 +30521,187 @@
             we can store the higher bits from stats_sample_pages in .frm too. */
             if ((yyvsp[0].ulong_num) == 0 || (yyvsp[0].ulong_num) > 0xffff)
             {
-              YYTHD->syntax_error();
+              YYTHD->syntax_error_at((yylsp[0]),
+              "The valid range for stats_sample_pages is [1, 65535]. Error");
               MYSQL_YYABORT;
             }
             (yyval.create_table_option)= NEW_PTN PT_create_stats_stable_pages((yyvsp[0].ulong_num));
           }
-#line 30371 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30531 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 755:
-#line 6702 "sql_yacc.yy" /* yacc.c:1646  */
+  case 756:
+#line 6759 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_option)= NEW_PTN PT_create_stats_stable_pages;
           }
-#line 30379 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30539 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 756:
-#line 6706 "sql_yacc.yy" /* yacc.c:1646  */
+  case 757:
+#line 6763 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_option)= NEW_PTN PT_create_checksum_option((yyvsp[0].ulong_num));
           }
-#line 30387 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30547 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 757:
-#line 6710 "sql_yacc.yy" /* yacc.c:1646  */
+  case 758:
+#line 6767 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_option)= NEW_PTN PT_create_checksum_option((yyvsp[0].ulong_num));
           }
-#line 30395 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30555 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 758:
-#line 6714 "sql_yacc.yy" /* yacc.c:1646  */
+  case 759:
+#line 6771 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_option)= NEW_PTN PT_create_delay_key_write_option((yyvsp[0].ulong_num));
           }
-#line 30403 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30563 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 759:
-#line 6718 "sql_yacc.yy" /* yacc.c:1646  */
+  case 760:
+#line 6775 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_option)= NEW_PTN PT_create_row_format_option((yyvsp[0].row_type));
           }
-#line 30411 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30571 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 760:
-#line 6722 "sql_yacc.yy" /* yacc.c:1646  */
+  case 761:
+#line 6779 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_option)= NEW_PTN PT_create_union_option((yyvsp[-1].table_list));
           }
-#line 30419 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30579 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 761:
-#line 6726 "sql_yacc.yy" /* yacc.c:1646  */
+  case 762:
+#line 6783 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_option)= NEW_PTN PT_create_table_default_charset((yyvsp[0].lexer.charset));
           }
-#line 30427 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30587 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 762:
-#line 6730 "sql_yacc.yy" /* yacc.c:1646  */
+  case 763:
+#line 6787 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_option)= NEW_PTN PT_create_table_default_collation((yyvsp[0].lexer.charset));
           }
-#line 30435 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30595 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 763:
-#line 6734 "sql_yacc.yy" /* yacc.c:1646  */
+  case 764:
+#line 6791 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_option)= NEW_PTN PT_create_insert_method_option((yyvsp[0].ulong_num));
           }
-#line 30443 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30603 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 764:
-#line 6738 "sql_yacc.yy" /* yacc.c:1646  */
+  case 765:
+#line 6795 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_option)= NEW_PTN PT_create_data_directory_option((yyvsp[0].lexer.lex_str).str);
           }
-#line 30451 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30611 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 765:
-#line 6742 "sql_yacc.yy" /* yacc.c:1646  */
+  case 766:
+#line 6799 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_option)= NEW_PTN PT_create_index_directory_option((yyvsp[0].lexer.lex_str).str);
           }
-#line 30459 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30619 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 766:
-#line 6746 "sql_yacc.yy" /* yacc.c:1646  */
+  case 767:
+#line 6803 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_option)= NEW_PTN PT_create_tablespace_option((yyvsp[0].lexer.lex_str).str);
           }
-#line 30467 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30627 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 767:
-#line 6750 "sql_yacc.yy" /* yacc.c:1646  */
+  case 768:
+#line 6807 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_option)= NEW_PTN PT_create_storage_option(HA_SM_DISK);
           }
-#line 30475 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30635 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 768:
-#line 6754 "sql_yacc.yy" /* yacc.c:1646  */
+  case 769:
+#line 6811 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_option)= NEW_PTN PT_create_storage_option(HA_SM_MEMORY);
           }
-#line 30483 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30643 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 769:
-#line 6758 "sql_yacc.yy" /* yacc.c:1646  */
+  case 770:
+#line 6815 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_option)= NEW_PTN PT_create_connection_option((yyvsp[0].lexer.lex_str));
           }
-#line 30491 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30651 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 770:
-#line 6762 "sql_yacc.yy" /* yacc.c:1646  */
+  case 771:
+#line 6819 "sql_yacc.yy" /* yacc.c:1646  */
     {
+            // The frm-format only allocated 2 bytes for key_block_size,
+            // even if it is represented as std::uint32_t in HA_CREATE_INFO and
+            // elsewhere.
+            if ((yyvsp[0].ulonglong_number) > std::numeric_limits<std::uint16_t>::max()) {
+              YYTHD->syntax_error_at((yylsp[0]),
+              "The valid range for key_block_size is [0,65535]. Error");
+              MYSQL_YYABORT;
+            }
+
             (yyval.create_table_option)= NEW_PTN
-            PT_create_key_block_size_option(static_cast<std::uint32_t>((yyvsp[0].num)));
+            PT_create_key_block_size_option(static_cast<std::uint32_t>((yyvsp[0].ulonglong_number)));
           }
-#line 30500 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30669 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 771:
-#line 6767 "sql_yacc.yy" /* yacc.c:1646  */
+  case 772:
+#line 6833 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_option)= NEW_PTN PT_create_start_transaction_option(true);
 	  }
-#line 30508 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30677 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 772:
-#line 6771 "sql_yacc.yy" /* yacc.c:1646  */
+  case 773:
+#line 6837 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_option) = make_table_engine_attribute(YYMEM_ROOT, (yyvsp[0].lex_cstr));
           }
-#line 30516 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30685 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 773:
-#line 6775 "sql_yacc.yy" /* yacc.c:1646  */
+  case 774:
+#line 6841 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_option) = make_table_secondary_engine_attribute(YYMEM_ROOT, (yyvsp[0].lex_cstr));
           }
-#line 30524 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30693 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 774:
-#line 6779 "sql_yacc.yy" /* yacc.c:1646  */
+  case 775:
+#line 6845 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.create_table_option) = NEW_PTN PT_create_ts_autoextend_size_option((yyvsp[0].ulonglong_number));
           }
-#line 30532 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30701 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 775:
-#line 6786 "sql_yacc.yy" /* yacc.c:1646  */
+  case 776:
+#line 6852 "sql_yacc.yy" /* yacc.c:1646  */
     {
             switch((yyvsp[0].ulong_num)) {
             case 0:
@@ -30546,194 +30715,194 @@
                 MYSQL_YYABORT;
             }
           }
-#line 30550 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30719 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 776:
-#line 6799 "sql_yacc.yy" /* yacc.c:1646  */
+  case 777:
+#line 6865 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ternary_option)= Ternary_option::DEFAULT; }
-#line 30556 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30725 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 777:
-#line 6803 "sql_yacc.yy" /* yacc.c:1646  */
+  case 778:
+#line 6869 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lexer.charset) = (yyvsp[0].lexer.charset); }
-#line 30562 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30731 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 778:
-#line 6807 "sql_yacc.yy" /* yacc.c:1646  */
+  case 779:
+#line 6873 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lexer.charset) = (yyvsp[0].lexer.charset);}
-#line 30568 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30737 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 779:
-#line 6811 "sql_yacc.yy" /* yacc.c:1646  */
+  case 780:
+#line 6877 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lexer.lex_str) = (yyvsp[0].lexer.lex_str);}
-#line 30574 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30743 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 780:
-#line 6815 "sql_yacc.yy" /* yacc.c:1646  */
+  case 781:
+#line 6881 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.row_type)= ROW_TYPE_DEFAULT; }
-#line 30580 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30749 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 781:
-#line 6816 "sql_yacc.yy" /* yacc.c:1646  */
+  case 782:
+#line 6882 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.row_type)= ROW_TYPE_FIXED; }
-#line 30586 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30755 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 782:
-#line 6817 "sql_yacc.yy" /* yacc.c:1646  */
+  case 783:
+#line 6883 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.row_type)= ROW_TYPE_DYNAMIC; }
-#line 30592 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30761 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 783:
-#line 6818 "sql_yacc.yy" /* yacc.c:1646  */
+  case 784:
+#line 6884 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.row_type)= ROW_TYPE_COMPRESSED; }
-#line 30598 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30767 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 784:
-#line 6819 "sql_yacc.yy" /* yacc.c:1646  */
+  case 785:
+#line 6885 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.row_type)= ROW_TYPE_REDUNDANT; }
-#line 30604 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30773 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 785:
-#line 6820 "sql_yacc.yy" /* yacc.c:1646  */
+  case 786:
+#line 6886 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.row_type)= ROW_TYPE_COMPACT; }
-#line 30610 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30779 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 786:
-#line 6824 "sql_yacc.yy" /* yacc.c:1646  */
+  case 787:
+#line 6890 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ulong_num)= MERGE_INSERT_DISABLED; }
-#line 30616 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30785 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 787:
-#line 6825 "sql_yacc.yy" /* yacc.c:1646  */
+  case 788:
+#line 6891 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ulong_num)= MERGE_INSERT_TO_FIRST; }
-#line 30622 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30791 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 788:
-#line 6826 "sql_yacc.yy" /* yacc.c:1646  */
+  case 789:
+#line 6892 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ulong_num)= MERGE_INSERT_TO_LAST; }
-#line 30628 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30797 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 789:
-#line 6830 "sql_yacc.yy" /* yacc.c:1646  */
+  case 790:
+#line 6896 "sql_yacc.yy" /* yacc.c:1646  */
     {(yyval.num) = (int) STRING_RESULT; }
-#line 30634 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30803 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 790:
-#line 6831 "sql_yacc.yy" /* yacc.c:1646  */
+  case 791:
+#line 6897 "sql_yacc.yy" /* yacc.c:1646  */
     {(yyval.num) = (int) REAL_RESULT; }
-#line 30640 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30809 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 791:
-#line 6832 "sql_yacc.yy" /* yacc.c:1646  */
+  case 792:
+#line 6898 "sql_yacc.yy" /* yacc.c:1646  */
     {(yyval.num) = (int) DECIMAL_RESULT; }
-#line 30646 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30815 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 792:
-#line 6833 "sql_yacc.yy" /* yacc.c:1646  */
+  case 793:
+#line 6899 "sql_yacc.yy" /* yacc.c:1646  */
     {(yyval.num) = (int) INT_RESULT; }
-#line 30652 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30821 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 793:
-#line 6838 "sql_yacc.yy" /* yacc.c:1646  */
+  case 794:
+#line 6904 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.table_element_list)= NEW_PTN Mem_root_array<PT_table_element *>(YYMEM_ROOT);
             if ((yyval.table_element_list) == NULL || (yyval.table_element_list)->push_back((yyvsp[0].table_element)))
               MYSQL_YYABORT; // OOM
           }
-#line 30662 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30831 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 794:
-#line 6844 "sql_yacc.yy" /* yacc.c:1646  */
+  case 795:
+#line 6910 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.table_element_list)= (yyvsp[-2].table_element_list);
             if ((yyval.table_element_list)->push_back((yyvsp[0].table_element)))
               MYSQL_YYABORT; // OOM
           }
-#line 30672 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30841 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 795:
-#line 6852 "sql_yacc.yy" /* yacc.c:1646  */
+  case 796:
+#line 6918 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.table_element)= (yyvsp[0].column_def); }
-#line 30678 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30847 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 796:
-#line 6853 "sql_yacc.yy" /* yacc.c:1646  */
+  case 797:
+#line 6919 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.table_element)= (yyvsp[0].table_constraint_def); }
-#line 30684 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30853 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 797:
-#line 6858 "sql_yacc.yy" /* yacc.c:1646  */
+  case 798:
+#line 6924 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.column_def)= NEW_PTN PT_column_def((yyvsp[-2].lexer.lex_str), (yyvsp[-1].field_def), (yyvsp[0].table_constraint_def));
           }
-#line 30692 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30861 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 798:
-#line 6864 "sql_yacc.yy" /* yacc.c:1646  */
+  case 799:
+#line 6930 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.table_constraint_def)= NULL; }
-#line 30698 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30867 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 799:
-#line 6866 "sql_yacc.yy" /* yacc.c:1646  */
+  case 800:
+#line 6932 "sql_yacc.yy" /* yacc.c:1646  */
     {
             /* Currently we ignore FK references here: */
             (yyval.table_constraint_def)= NULL;
           }
-#line 30707 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30876 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 800:
-#line 6875 "sql_yacc.yy" /* yacc.c:1646  */
+  case 801:
+#line 6941 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.table_constraint_def)= NEW_PTN PT_inline_index_definition(KEYTYPE_MULTIPLE,
                                                    (yyvsp[-4].index_name_and_type).name, (yyvsp[-4].index_name_and_type).type, (yyvsp[-2].index_column_list), (yyvsp[0].index_options));
           }
-#line 30716 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30885 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 801:
-#line 6881 "sql_yacc.yy" /* yacc.c:1646  */
+  case 802:
+#line 6947 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.table_constraint_def)= NEW_PTN PT_inline_index_definition(KEYTYPE_FULLTEXT, (yyvsp[-4].lexer.lex_str), NULL,
                                                    (yyvsp[-2].index_column_list), (yyvsp[0].index_options));
           }
-#line 30725 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30894 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 802:
-#line 6887 "sql_yacc.yy" /* yacc.c:1646  */
+  case 803:
+#line 6953 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.table_constraint_def)= NEW_PTN PT_inline_index_definition(KEYTYPE_SPATIAL, (yyvsp[-4].lexer.lex_str), NULL, (yyvsp[-2].index_column_list), (yyvsp[0].index_options));
           }
-#line 30733 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30902 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 803:
-#line 6892 "sql_yacc.yy" /* yacc.c:1646  */
+  case 804:
+#line 6958 "sql_yacc.yy" /* yacc.c:1646  */
     {
             /*
               Constraint-implementing indexes are named by the constraint type
@@ -30742,11 +30911,11 @@
             LEX_STRING name= (yyvsp[-4].index_name_and_type).name.str != NULL ? (yyvsp[-4].index_name_and_type).name : (yyvsp[-6].lexer.lex_str);
             (yyval.table_constraint_def)= NEW_PTN PT_inline_index_definition((yyvsp[-5].key_type), name, (yyvsp[-4].index_name_and_type).type, (yyvsp[-2].index_column_list), (yyvsp[0].index_options));
           }
-#line 30746 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30915 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 804:
-#line 6901 "sql_yacc.yy" /* yacc.c:1646  */
+  case 805:
+#line 6967 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.table_constraint_def)= NEW_PTN PT_foreign_key_definition((yyvsp[-7].lexer.lex_str), (yyvsp[-4].lexer.lex_str), (yyvsp[-2].index_column_list), (yyvsp[0].fk_references).table_name,
                                                   (yyvsp[0].fk_references).reference_list,
@@ -30754,76 +30923,76 @@
                                                   (yyvsp[0].fk_references).fk_update_opt,
                                                   (yyvsp[0].fk_references).fk_delete_opt);
           }
-#line 30758 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30927 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 805:
-#line 6909 "sql_yacc.yy" /* yacc.c:1646  */
+  case 806:
+#line 6975 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.table_constraint_def)= NEW_PTN PT_check_constraint((yyvsp[-2].lexer.lex_str), (yyvsp[-1].item), (yyvsp[0].is_not_empty));
             if ((yyval.table_constraint_def) == nullptr) MYSQL_YYABORT; // OOM
           }
-#line 30767 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30936 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 806:
-#line 6916 "sql_yacc.yy" /* yacc.c:1646  */
+  case 807:
+#line 6982 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.item)= (yyvsp[-1].item); }
-#line 30773 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30942 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 807:
-#line 6920 "sql_yacc.yy" /* yacc.c:1646  */
+  case 808:
+#line 6986 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lexer.lex_str)= NULL_STR; }
-#line 30779 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30948 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 808:
-#line 6921 "sql_yacc.yy" /* yacc.c:1646  */
+  case 809:
+#line 6987 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lexer.lex_str)= (yyvsp[0].lexer.lex_str); }
-#line 30785 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30954 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 809:
-#line 6925 "sql_yacc.yy" /* yacc.c:1646  */
+  case 810:
+#line 6991 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.is_not_empty)= false; }
-#line 30791 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30960 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 810:
-#line 6926 "sql_yacc.yy" /* yacc.c:1646  */
+  case 811:
+#line 6992 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.is_not_empty)= true; }
-#line 30797 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30966 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 811:
-#line 6930 "sql_yacc.yy" /* yacc.c:1646  */
+  case 812:
+#line 6996 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.is_not_empty)= true; }
-#line 30803 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30972 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 812:
-#line 6931 "sql_yacc.yy" /* yacc.c:1646  */
+  case 813:
+#line 6997 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.is_not_empty)= (yyvsp[0].is_not_empty); }
-#line 30809 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30978 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 813:
-#line 6935 "sql_yacc.yy" /* yacc.c:1646  */
+  case 814:
+#line 7001 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.is_not_empty)= !((yyvsp[-1].is_not_empty)); }
-#line 30815 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30984 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 814:
-#line 6940 "sql_yacc.yy" /* yacc.c:1646  */
+  case 815:
+#line 7006 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.field_def)= NEW_PTN PT_field_def((yyvsp[-1].type), (yyvsp[0].col_attr_list));
           }
-#line 30823 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 30992 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 815:
-#line 6946 "sql_yacc.yy" /* yacc.c:1646  */
+  case 816:
+#line 7012 "sql_yacc.yy" /* yacc.c:1646  */
     {
             auto *opt_attrs= (yyvsp[0].col_attr_list);
             if ((yyvsp[-7].lexer.charset) != NULL)
@@ -30840,103 +31009,103 @@
             }
             (yyval.field_def)= NEW_PTN PT_generated_field_def((yyvsp[-8].type), (yyvsp[-3].item), (yyvsp[-1].virtual_or_stored), opt_attrs);
           }
-#line 30844 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31013 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 818:
-#line 6970 "sql_yacc.yy" /* yacc.c:1646  */
+  case 819:
+#line 7036 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.virtual_or_stored)= Virtual_or_stored::VIRTUAL; }
-#line 30850 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31019 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 819:
-#line 6971 "sql_yacc.yy" /* yacc.c:1646  */
+  case 820:
+#line 7037 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.virtual_or_stored)= Virtual_or_stored::VIRTUAL; }
-#line 30856 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31025 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 820:
-#line 6972 "sql_yacc.yy" /* yacc.c:1646  */
+  case 821:
+#line 7038 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.virtual_or_stored)= Virtual_or_stored::STORED; }
-#line 30862 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31031 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 821:
-#line 6977 "sql_yacc.yy" /* yacc.c:1646  */
+  case 822:
+#line 7043 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.type)= NEW_PTN PT_numeric_type(YYTHD, (yyvsp[-2].int_type), (yyvsp[-1].c_str), (yyvsp[0].field_option));
           }
-#line 30870 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31039 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 822:
-#line 6981 "sql_yacc.yy" /* yacc.c:1646  */
+  case 823:
+#line 7047 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.type)= NEW_PTN PT_numeric_type(YYTHD, (yyvsp[-2].numeric_type), (yyvsp[-1].precision).length, (yyvsp[-1].precision).dec, (yyvsp[0].field_option));
           }
-#line 30878 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31047 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 823:
-#line 6985 "sql_yacc.yy" /* yacc.c:1646  */
+  case 824:
+#line 7051 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.type)= NEW_PTN PT_numeric_type(YYTHD, (yyvsp[-2].numeric_type), (yyvsp[-1].precision).length, (yyvsp[-1].precision).dec, (yyvsp[0].field_option));
           }
-#line 30886 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31055 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 824:
-#line 6989 "sql_yacc.yy" /* yacc.c:1646  */
+  case 825:
+#line 7055 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.type)= NEW_PTN PT_bit_type;
           }
-#line 30894 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31063 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 825:
-#line 6993 "sql_yacc.yy" /* yacc.c:1646  */
+  case 826:
+#line 7059 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.type)= NEW_PTN PT_bit_type((yyvsp[0].c_str));
           }
-#line 30902 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31071 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 826:
-#line 6997 "sql_yacc.yy" /* yacc.c:1646  */
+  case 827:
+#line 7063 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.type)= NEW_PTN PT_boolean_type;
           }
-#line 30910 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31079 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 827:
-#line 7001 "sql_yacc.yy" /* yacc.c:1646  */
+  case 828:
+#line 7067 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.type)= NEW_PTN PT_boolean_type;
           }
-#line 30918 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31087 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 828:
-#line 7005 "sql_yacc.yy" /* yacc.c:1646  */
+  case 829:
+#line 7071 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.type)= NEW_PTN PT_char_type(Char_type::CHAR, (yyvsp[-1].c_str), (yyvsp[0].charset_with_opt_binary).charset,
                                      (yyvsp[0].charset_with_opt_binary).force_binary);
           }
-#line 30927 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31096 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 829:
-#line 7010 "sql_yacc.yy" /* yacc.c:1646  */
+  case 830:
+#line 7076 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.type)= NEW_PTN PT_char_type(Char_type::CHAR, (yyvsp[0].charset_with_opt_binary).charset,
                                      (yyvsp[0].charset_with_opt_binary).force_binary);
           }
-#line 30936 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31105 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 830:
-#line 7015 "sql_yacc.yy" /* yacc.c:1646  */
+  case 831:
+#line 7081 "sql_yacc.yy" /* yacc.c:1646  */
     {
             const CHARSET_INFO *cs= (yyvsp[0].is_not_empty) ?
               get_bin_collation(national_charset_info) : national_charset_info;
@@ -30945,11 +31114,11 @@
             (yyval.type)= NEW_PTN PT_char_type(Char_type::CHAR, (yyvsp[-1].c_str), cs);
             warn_about_deprecated_national(YYTHD);
           }
-#line 30949 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31118 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 831:
-#line 7024 "sql_yacc.yy" /* yacc.c:1646  */
+  case 832:
+#line 7090 "sql_yacc.yy" /* yacc.c:1646  */
     {
             const CHARSET_INFO *cs= (yyvsp[0].is_not_empty) ?
               get_bin_collation(national_charset_info) : national_charset_info;
@@ -30958,36 +31127,36 @@
             (yyval.type)= NEW_PTN PT_char_type(Char_type::CHAR, cs);
             warn_about_deprecated_national(YYTHD);
           }
-#line 30962 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31131 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 832:
-#line 7033 "sql_yacc.yy" /* yacc.c:1646  */
+  case 833:
+#line 7099 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.type)= NEW_PTN PT_char_type(Char_type::CHAR, (yyvsp[0].c_str), &my_charset_bin);
           }
-#line 30970 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31139 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 833:
-#line 7037 "sql_yacc.yy" /* yacc.c:1646  */
+  case 834:
+#line 7103 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.type)= NEW_PTN PT_char_type(Char_type::CHAR, &my_charset_bin);
           }
-#line 30978 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31147 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 834:
-#line 7041 "sql_yacc.yy" /* yacc.c:1646  */
+  case 835:
+#line 7107 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.type)= NEW_PTN PT_char_type(Char_type::VARCHAR, (yyvsp[-1].c_str), (yyvsp[0].charset_with_opt_binary).charset,
                                      (yyvsp[0].charset_with_opt_binary).force_binary);
           }
-#line 30987 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31156 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 835:
-#line 7046 "sql_yacc.yy" /* yacc.c:1646  */
+  case 836:
+#line 7112 "sql_yacc.yy" /* yacc.c:1646  */
     {
             const CHARSET_INFO *cs= (yyvsp[0].is_not_empty) ?
               get_bin_collation(national_charset_info) : national_charset_info;
@@ -30996,19 +31165,19 @@
             (yyval.type)= NEW_PTN PT_char_type(Char_type::VARCHAR, (yyvsp[-1].c_str), cs);
             warn_about_deprecated_national(YYTHD);
           }
-#line 31000 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31169 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 836:
-#line 7055 "sql_yacc.yy" /* yacc.c:1646  */
+  case 837:
+#line 7121 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.type)= NEW_PTN PT_char_type(Char_type::VARCHAR, (yyvsp[0].c_str), &my_charset_bin);
           }
-#line 31008 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31177 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 837:
-#line 7059 "sql_yacc.yy" /* yacc.c:1646  */
+  case 838:
+#line 7125 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyvsp[-1].c_str))
             {
@@ -31031,500 +31200,500 @@
             // We can ignore field length and UNSIGNED/ZEROFILL attributes here.
             (yyval.type)= NEW_PTN PT_year_type;
           }
-#line 31035 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31204 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 838:
-#line 7082 "sql_yacc.yy" /* yacc.c:1646  */
+  case 839:
+#line 7148 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.type)= NEW_PTN PT_date_type;
           }
-#line 31043 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31212 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 839:
-#line 7086 "sql_yacc.yy" /* yacc.c:1646  */
+  case 840:
+#line 7152 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.type)= NEW_PTN PT_time_type(Time_type::TIME, (yyvsp[0].c_str));
           }
-#line 31051 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31220 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 840:
-#line 7090 "sql_yacc.yy" /* yacc.c:1646  */
+  case 841:
+#line 7156 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.type)= NEW_PTN PT_timestamp_type((yyvsp[0].c_str));
           }
-#line 31059 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31228 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 841:
-#line 7094 "sql_yacc.yy" /* yacc.c:1646  */
+  case 842:
+#line 7160 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.type)= NEW_PTN PT_time_type(Time_type::DATETIME, (yyvsp[0].c_str));
           }
-#line 31067 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31236 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 842:
-#line 7098 "sql_yacc.yy" /* yacc.c:1646  */
+  case 843:
+#line 7164 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.type)= NEW_PTN PT_blob_type(Blob_type::TINY, &my_charset_bin);
           }
-#line 31075 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31244 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 843:
-#line 7102 "sql_yacc.yy" /* yacc.c:1646  */
+  case 844:
+#line 7168 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.type)= NEW_PTN PT_blob_type((yyvsp[0].c_str));
           }
-#line 31083 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31252 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 845:
-#line 7107 "sql_yacc.yy" /* yacc.c:1646  */
+  case 846:
+#line 7173 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.type)= NEW_PTN PT_blob_type(Blob_type::MEDIUM, &my_charset_bin);
           }
-#line 31091 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31260 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 846:
-#line 7111 "sql_yacc.yy" /* yacc.c:1646  */
+  case 847:
+#line 7177 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.type)= NEW_PTN PT_blob_type(Blob_type::LONG, &my_charset_bin);
           }
-#line 31099 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31268 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 847:
-#line 7115 "sql_yacc.yy" /* yacc.c:1646  */
+  case 848:
+#line 7181 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.type)= NEW_PTN PT_blob_type(Blob_type::MEDIUM, &my_charset_bin);
           }
-#line 31107 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31276 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 848:
-#line 7119 "sql_yacc.yy" /* yacc.c:1646  */
+  case 849:
+#line 7185 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.type)= NEW_PTN PT_blob_type(Blob_type::MEDIUM, (yyvsp[0].charset_with_opt_binary).charset,
                                      (yyvsp[0].charset_with_opt_binary).force_binary);
           }
-#line 31116 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31285 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 849:
-#line 7124 "sql_yacc.yy" /* yacc.c:1646  */
+  case 850:
+#line 7190 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.type)= NEW_PTN PT_blob_type(Blob_type::TINY, (yyvsp[0].charset_with_opt_binary).charset,
                                      (yyvsp[0].charset_with_opt_binary).force_binary);
           }
-#line 31125 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31294 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 850:
-#line 7129 "sql_yacc.yy" /* yacc.c:1646  */
+  case 851:
+#line 7195 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.type)= NEW_PTN PT_char_type(Char_type::TEXT, (yyvsp[-1].c_str), (yyvsp[0].charset_with_opt_binary).charset,
                                      (yyvsp[0].charset_with_opt_binary).force_binary);
           }
-#line 31134 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31303 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 851:
-#line 7134 "sql_yacc.yy" /* yacc.c:1646  */
+  case 852:
+#line 7200 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.type)= NEW_PTN PT_blob_type(Blob_type::MEDIUM, (yyvsp[0].charset_with_opt_binary).charset,
                                      (yyvsp[0].charset_with_opt_binary).force_binary);
           }
-#line 31143 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31312 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 852:
-#line 7139 "sql_yacc.yy" /* yacc.c:1646  */
+  case 853:
+#line 7205 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.type)= NEW_PTN PT_blob_type(Blob_type::LONG, (yyvsp[0].charset_with_opt_binary).charset,
                                      (yyvsp[0].charset_with_opt_binary).force_binary);
           }
-#line 31152 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
-    break;
-
-  case 853:
-#line 7144 "sql_yacc.yy" /* yacc.c:1646  */
-    {
-            (yyval.type)= NEW_PTN PT_enum_type((yyvsp[-2].string_list), (yyvsp[0].charset_with_opt_binary).charset, (yyvsp[0].charset_with_opt_binary).force_binary);
-          }
-#line 31160 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31321 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 854:
-#line 7148 "sql_yacc.yy" /* yacc.c:1646  */
+#line 7210 "sql_yacc.yy" /* yacc.c:1646  */
     {
-            (yyval.type)= NEW_PTN PT_set_type((yyvsp[-2].string_list), (yyvsp[0].charset_with_opt_binary).charset, (yyvsp[0].charset_with_opt_binary).force_binary);
+            (yyval.type)= NEW_PTN PT_enum_type((yyvsp[-2].string_list), (yyvsp[0].charset_with_opt_binary).charset, (yyvsp[0].charset_with_opt_binary).force_binary);
           }
-#line 31168 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31329 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 855:
-#line 7152 "sql_yacc.yy" /* yacc.c:1646  */
+#line 7214 "sql_yacc.yy" /* yacc.c:1646  */
     {
-            (yyval.type)= NEW_PTN PT_blob_type(Blob_type::MEDIUM, (yyvsp[0].charset_with_opt_binary).charset,
-                                     (yyvsp[0].charset_with_opt_binary).force_binary);
+            (yyval.type)= NEW_PTN PT_set_type((yyvsp[-2].string_list), (yyvsp[0].charset_with_opt_binary).charset, (yyvsp[0].charset_with_opt_binary).force_binary);
           }
-#line 31177 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31337 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 856:
-#line 7157 "sql_yacc.yy" /* yacc.c:1646  */
+#line 7218 "sql_yacc.yy" /* yacc.c:1646  */
     {
-            (yyval.type)= NEW_PTN PT_serial_type;
+            (yyval.type)= NEW_PTN PT_blob_type(Blob_type::MEDIUM, (yyvsp[0].charset_with_opt_binary).charset,
+                                     (yyvsp[0].charset_with_opt_binary).force_binary);
           }
-#line 31185 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31346 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 857:
-#line 7161 "sql_yacc.yy" /* yacc.c:1646  */
+#line 7223 "sql_yacc.yy" /* yacc.c:1646  */
     {
-            (yyval.type)= NEW_PTN PT_json_type;
+            (yyval.type)= NEW_PTN PT_serial_type;
           }
-#line 31193 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31354 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 858:
-#line 7168 "sql_yacc.yy" /* yacc.c:1646  */
-    { (yyval.type)= NEW_PTN PT_spacial_type(Field::GEOM_GEOMETRY); }
-#line 31199 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 7227 "sql_yacc.yy" /* yacc.c:1646  */
+    {
+            (yyval.type)= NEW_PTN PT_json_type;
+          }
+#line 31362 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 859:
-#line 7170 "sql_yacc.yy" /* yacc.c:1646  */
-    { (yyval.type)= NEW_PTN PT_spacial_type(Field::GEOM_GEOMETRYCOLLECTION); }
-#line 31205 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 7234 "sql_yacc.yy" /* yacc.c:1646  */
+    { (yyval.type)= NEW_PTN PT_spacial_type(Field::GEOM_GEOMETRY); }
+#line 31368 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 860:
-#line 7172 "sql_yacc.yy" /* yacc.c:1646  */
-    { (yyval.type)= NEW_PTN PT_spacial_type(Field::GEOM_POINT); }
-#line 31211 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 7236 "sql_yacc.yy" /* yacc.c:1646  */
+    { (yyval.type)= NEW_PTN PT_spacial_type(Field::GEOM_GEOMETRYCOLLECTION); }
+#line 31374 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 861:
-#line 7174 "sql_yacc.yy" /* yacc.c:1646  */
-    { (yyval.type)= NEW_PTN PT_spacial_type(Field::GEOM_MULTIPOINT); }
-#line 31217 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 7238 "sql_yacc.yy" /* yacc.c:1646  */
+    { (yyval.type)= NEW_PTN PT_spacial_type(Field::GEOM_POINT); }
+#line 31380 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 862:
-#line 7176 "sql_yacc.yy" /* yacc.c:1646  */
-    { (yyval.type)= NEW_PTN PT_spacial_type(Field::GEOM_LINESTRING); }
-#line 31223 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 7240 "sql_yacc.yy" /* yacc.c:1646  */
+    { (yyval.type)= NEW_PTN PT_spacial_type(Field::GEOM_MULTIPOINT); }
+#line 31386 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 863:
-#line 7178 "sql_yacc.yy" /* yacc.c:1646  */
-    { (yyval.type)= NEW_PTN PT_spacial_type(Field::GEOM_MULTILINESTRING); }
-#line 31229 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 7242 "sql_yacc.yy" /* yacc.c:1646  */
+    { (yyval.type)= NEW_PTN PT_spacial_type(Field::GEOM_LINESTRING); }
+#line 31392 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 864:
-#line 7180 "sql_yacc.yy" /* yacc.c:1646  */
-    { (yyval.type)= NEW_PTN PT_spacial_type(Field::GEOM_POLYGON); }
-#line 31235 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 7244 "sql_yacc.yy" /* yacc.c:1646  */
+    { (yyval.type)= NEW_PTN PT_spacial_type(Field::GEOM_MULTILINESTRING); }
+#line 31398 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 865:
-#line 7182 "sql_yacc.yy" /* yacc.c:1646  */
-    { (yyval.type)= NEW_PTN PT_spacial_type(Field::GEOM_MULTIPOLYGON); }
-#line 31241 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 7246 "sql_yacc.yy" /* yacc.c:1646  */
+    { (yyval.type)= NEW_PTN PT_spacial_type(Field::GEOM_POLYGON); }
+#line 31404 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 866:
-#line 7186 "sql_yacc.yy" /* yacc.c:1646  */
-    {}
-#line 31247 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 7248 "sql_yacc.yy" /* yacc.c:1646  */
+    { (yyval.type)= NEW_PTN PT_spacial_type(Field::GEOM_MULTIPOLYGON); }
+#line 31410 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 867:
-#line 7187 "sql_yacc.yy" /* yacc.c:1646  */
+#line 7252 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 31253 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31416 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 868:
-#line 7191 "sql_yacc.yy" /* yacc.c:1646  */
+#line 7253 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 31259 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31422 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 869:
-#line 7192 "sql_yacc.yy" /* yacc.c:1646  */
+#line 7257 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 31265 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31428 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 870:
-#line 7196 "sql_yacc.yy" /* yacc.c:1646  */
+#line 7258 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 31271 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31434 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 871:
-#line 7197 "sql_yacc.yy" /* yacc.c:1646  */
+#line 7262 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 31277 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31440 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 872:
-#line 7198 "sql_yacc.yy" /* yacc.c:1646  */
+#line 7263 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 31283 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31446 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 873:
-#line 7199 "sql_yacc.yy" /* yacc.c:1646  */
+#line 7264 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 31289 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31452 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 874:
-#line 7200 "sql_yacc.yy" /* yacc.c:1646  */
+#line 7265 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 31295 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31458 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 875:
-#line 7204 "sql_yacc.yy" /* yacc.c:1646  */
-    { (yyval.int_type)=Int_type::INT; }
-#line 31301 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 7266 "sql_yacc.yy" /* yacc.c:1646  */
+    {}
+#line 31464 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 876:
-#line 7205 "sql_yacc.yy" /* yacc.c:1646  */
-    { (yyval.int_type)=Int_type::TINYINT; }
-#line 31307 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 7270 "sql_yacc.yy" /* yacc.c:1646  */
+    { (yyval.int_type)=Int_type::INT; }
+#line 31470 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 877:
-#line 7206 "sql_yacc.yy" /* yacc.c:1646  */
-    { (yyval.int_type)=Int_type::SMALLINT; }
-#line 31313 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 7271 "sql_yacc.yy" /* yacc.c:1646  */
+    { (yyval.int_type)=Int_type::TINYINT; }
+#line 31476 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 878:
-#line 7207 "sql_yacc.yy" /* yacc.c:1646  */
-    { (yyval.int_type)=Int_type::MEDIUMINT; }
-#line 31319 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 7272 "sql_yacc.yy" /* yacc.c:1646  */
+    { (yyval.int_type)=Int_type::SMALLINT; }
+#line 31482 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 879:
-#line 7208 "sql_yacc.yy" /* yacc.c:1646  */
-    { (yyval.int_type)=Int_type::BIGINT; }
-#line 31325 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 7273 "sql_yacc.yy" /* yacc.c:1646  */
+    { (yyval.int_type)=Int_type::MEDIUMINT; }
+#line 31488 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 880:
-#line 7213 "sql_yacc.yy" /* yacc.c:1646  */
+#line 7274 "sql_yacc.yy" /* yacc.c:1646  */
+    { (yyval.int_type)=Int_type::BIGINT; }
+#line 31494 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+    break;
+
+  case 881:
+#line 7279 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.numeric_type)= YYTHD->variables.sql_mode & MODE_REAL_AS_FLOAT ?
               Numeric_type::FLOAT : Numeric_type::DOUBLE;
           }
-#line 31334 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31503 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 881:
-#line 7218 "sql_yacc.yy" /* yacc.c:1646  */
+  case 882:
+#line 7284 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.numeric_type)= Numeric_type::DOUBLE; }
-#line 31340 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
-    break;
-
-  case 884:
-#line 7227 "sql_yacc.yy" /* yacc.c:1646  */
-    { (yyval.numeric_type)= Numeric_type::FLOAT; }
-#line 31346 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31509 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 885:
-#line 7228 "sql_yacc.yy" /* yacc.c:1646  */
-    { (yyval.numeric_type)= Numeric_type::DECIMAL; }
-#line 31352 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 7293 "sql_yacc.yy" /* yacc.c:1646  */
+    { (yyval.numeric_type)= Numeric_type::FLOAT; }
+#line 31515 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 886:
-#line 7229 "sql_yacc.yy" /* yacc.c:1646  */
+#line 7294 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.numeric_type)= Numeric_type::DECIMAL; }
-#line 31358 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31521 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 887:
-#line 7230 "sql_yacc.yy" /* yacc.c:1646  */
+#line 7295 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.numeric_type)= Numeric_type::DECIMAL; }
-#line 31364 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31527 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 888:
-#line 7235 "sql_yacc.yy" /* yacc.c:1646  */
+#line 7296 "sql_yacc.yy" /* yacc.c:1646  */
+    { (yyval.numeric_type)= Numeric_type::DECIMAL; }
+#line 31533 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+    break;
+
+  case 889:
+#line 7301 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.precision).length = nullptr;
             (yyval.precision).dec = nullptr;
           }
-#line 31373 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31542 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 889:
-#line 7240 "sql_yacc.yy" /* yacc.c:1646  */
+  case 890:
+#line 7306 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.precision).length = (yyvsp[0].c_str);
             (yyval.precision).dec = nullptr;
           }
-#line 31382 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31551 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 890:
-#line 7248 "sql_yacc.yy" /* yacc.c:1646  */
+  case 891:
+#line 7314 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.precision).length= NULL;
             (yyval.precision).dec= NULL;
           }
-#line 31391 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31560 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 891:
-#line 7253 "sql_yacc.yy" /* yacc.c:1646  */
+  case 892:
+#line 7319 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.precision).length= (yyvsp[0].c_str);
             (yyval.precision).dec= NULL;
           }
-#line 31400 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31569 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 893:
-#line 7262 "sql_yacc.yy" /* yacc.c:1646  */
+  case 894:
+#line 7328 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.precision).length= (yyvsp[-3].lexer.lex_str).str;
             (yyval.precision).dec= (yyvsp[-1].lexer.lex_str).str;
           }
-#line 31409 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31578 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 894:
-#line 7270 "sql_yacc.yy" /* yacc.c:1646  */
+  case 895:
+#line 7336 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.c_str)= NULL; }
-#line 31415 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31584 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 895:
-#line 7271 "sql_yacc.yy" /* yacc.c:1646  */
+  case 896:
+#line 7337 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.c_str)= (yyvsp[-1].lexer.lex_str).str; }
-#line 31421 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31590 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 896:
-#line 7275 "sql_yacc.yy" /* yacc.c:1646  */
+  case 897:
+#line 7341 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ulong_num)= 0; }
-#line 31427 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31596 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 897:
-#line 7276 "sql_yacc.yy" /* yacc.c:1646  */
+  case 898:
+#line 7342 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ulong_num)= 0; }
-#line 31433 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31602 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 898:
-#line 7278 "sql_yacc.yy" /* yacc.c:1646  */
+  case 899:
+#line 7344 "sql_yacc.yy" /* yacc.c:1646  */
     {
              int error;
              (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[-1].lexer.lex_str).str, NULL, &error);
            }
-#line 31442 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31611 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 899:
-#line 7285 "sql_yacc.yy" /* yacc.c:1646  */
+  case 900:
+#line 7351 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.field_option) = 0; }
-#line 31448 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31617 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 901:
-#line 7291 "sql_yacc.yy" /* yacc.c:1646  */
+  case 902:
+#line 7357 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.field_option) = (yyvsp[-1].field_option) | (yyvsp[0].field_option);
           }
-#line 31456 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31625 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 903:
-#line 7298 "sql_yacc.yy" /* yacc.c:1646  */
+  case 904:
+#line 7364 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.field_option) = 0; }
-#line 31462 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31631 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 904:
-#line 7299 "sql_yacc.yy" /* yacc.c:1646  */
+  case 905:
+#line 7365 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.field_option) = UNSIGNED_FLAG; }
-#line 31468 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31637 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 905:
-#line 7300 "sql_yacc.yy" /* yacc.c:1646  */
+  case 906:
+#line 7366 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.field_option) = ZEROFILL_FLAG;
             push_warning(YYTHD, Sql_condition::SL_WARNING,
                          ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT,
                          ER_THD(YYTHD, ER_WARN_DEPRECATED_ZEROFILL));
           }
-#line 31479 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
-    break;
-
-  case 906:
-#line 7309 "sql_yacc.yy" /* yacc.c:1646  */
-    { (yyval.c_str)= (yyvsp[-1].lexer.lex_str).str; }
-#line 31485 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31648 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 907:
-#line 7310 "sql_yacc.yy" /* yacc.c:1646  */
+#line 7375 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.c_str)= (yyvsp[-1].lexer.lex_str).str; }
-#line 31491 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31654 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 908:
-#line 7311 "sql_yacc.yy" /* yacc.c:1646  */
+#line 7376 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.c_str)= (yyvsp[-1].lexer.lex_str).str; }
-#line 31497 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31660 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 909:
-#line 7312 "sql_yacc.yy" /* yacc.c:1646  */
+#line 7377 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.c_str)= (yyvsp[-1].lexer.lex_str).str; }
-#line 31503 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31666 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 910:
-#line 7315 "sql_yacc.yy" /* yacc.c:1646  */
+#line 7378 "sql_yacc.yy" /* yacc.c:1646  */
+    { (yyval.c_str)= (yyvsp[-1].lexer.lex_str).str; }
+#line 31672 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+    break;
+
+  case 911:
+#line 7381 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.c_str)= NULL; /* use default length */ }
-#line 31509 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31678 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 912:
-#line 7321 "sql_yacc.yy" /* yacc.c:1646  */
+  case 913:
+#line 7387 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.precision).length= NULL;
             (yyval.precision).dec = NULL;
           }
-#line 31518 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31687 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 914:
-#line 7329 "sql_yacc.yy" /* yacc.c:1646  */
+  case 915:
+#line 7395 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.col_attr_list)= NULL; }
-#line 31524 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31693 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 916:
-#line 7335 "sql_yacc.yy" /* yacc.c:1646  */
+  case 917:
+#line 7401 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.col_attr_list)= (yyvsp[-1].col_attr_list);
             if ((yyvsp[0].col_attr) == nullptr)
@@ -31543,11 +31712,11 @@
                 MYSQL_YYABORT; // OOM
             }
           }
-#line 31547 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31716 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 917:
-#line 7354 "sql_yacc.yy" /* yacc.c:1646  */
+  case 918:
+#line 7420 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyvsp[0].col_attr) == nullptr)
               MYSQL_YYABORT; // OOM
@@ -31563,131 +31732,131 @@
             if ((yyval.col_attr_list) == NULL || (yyval.col_attr_list)->push_back((yyvsp[0].col_attr)))
               MYSQL_YYABORT; // OOM
           }
-#line 31567 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31736 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 918:
-#line 7373 "sql_yacc.yy" /* yacc.c:1646  */
+  case 919:
+#line 7439 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.col_attr)= NEW_PTN PT_null_column_attr;
           }
-#line 31575 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31744 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 919:
-#line 7377 "sql_yacc.yy" /* yacc.c:1646  */
+  case 920:
+#line 7443 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.col_attr)= NEW_PTN PT_not_null_column_attr;
           }
-#line 31583 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31752 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 920:
-#line 7381 "sql_yacc.yy" /* yacc.c:1646  */
+  case 921:
+#line 7447 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.col_attr)= NEW_PTN PT_secondary_column_attr;
           }
-#line 31591 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31760 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 921:
-#line 7385 "sql_yacc.yy" /* yacc.c:1646  */
+  case 922:
+#line 7451 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.col_attr)= NEW_PTN PT_default_column_attr((yyvsp[0].item));
           }
-#line 31599 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31768 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 922:
-#line 7389 "sql_yacc.yy" /* yacc.c:1646  */
+  case 923:
+#line 7455 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.col_attr)= NEW_PTN PT_generated_default_val_column_attr((yyvsp[-1].item));
           }
-#line 31607 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31776 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 923:
-#line 7393 "sql_yacc.yy" /* yacc.c:1646  */
+  case 924:
+#line 7459 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.col_attr)= NEW_PTN PT_on_update_column_attr(static_cast<uint8>((yyvsp[0].ulong_num)));
           }
-#line 31615 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31784 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 924:
-#line 7397 "sql_yacc.yy" /* yacc.c:1646  */
+  case 925:
+#line 7463 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.col_attr)= NEW_PTN PT_auto_increment_column_attr;
           }
-#line 31623 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31792 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 925:
-#line 7401 "sql_yacc.yy" /* yacc.c:1646  */
+  case 926:
+#line 7467 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.col_attr)= NEW_PTN PT_serial_default_value_column_attr;
           }
-#line 31631 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31800 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 926:
-#line 7405 "sql_yacc.yy" /* yacc.c:1646  */
+  case 927:
+#line 7471 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.col_attr)= NEW_PTN PT_primary_key_column_attr;
           }
-#line 31639 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31808 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 927:
-#line 7409 "sql_yacc.yy" /* yacc.c:1646  */
+  case 928:
+#line 7475 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.col_attr)= NEW_PTN PT_unique_key_column_attr;
           }
-#line 31647 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31816 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 928:
-#line 7413 "sql_yacc.yy" /* yacc.c:1646  */
+  case 929:
+#line 7479 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.col_attr)= NEW_PTN PT_unique_key_column_attr;
           }
-#line 31655 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31824 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 929:
-#line 7417 "sql_yacc.yy" /* yacc.c:1646  */
+  case 930:
+#line 7483 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.col_attr)= NEW_PTN PT_comment_column_attr(to_lex_cstring((yyvsp[0].lexer.lex_str)));
           }
-#line 31663 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31832 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 930:
-#line 7421 "sql_yacc.yy" /* yacc.c:1646  */
+  case 931:
+#line 7487 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.col_attr)= NEW_PTN PT_collate_column_attr((yylsp[0]), (yyvsp[0].lexer.charset));
           }
-#line 31671 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31840 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 931:
-#line 7425 "sql_yacc.yy" /* yacc.c:1646  */
+  case 932:
+#line 7491 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.col_attr)= NEW_PTN PT_column_format_column_attr((yyvsp[0].column_format));
           }
-#line 31679 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31848 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 932:
-#line 7429 "sql_yacc.yy" /* yacc.c:1646  */
+  case 933:
+#line 7495 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.col_attr)= NEW_PTN PT_storage_media_column_attr((yyvsp[0].storage_media));
           }
-#line 31687 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31856 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 933:
-#line 7433 "sql_yacc.yy" /* yacc.c:1646  */
+  case 934:
+#line 7499 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyvsp[0].ulonglong_number) > std::numeric_limits<gis::srid_t>::max())
             {
@@ -31696,103 +31865,103 @@
             }
             (yyval.col_attr)= NEW_PTN PT_srid_column_attr(static_cast<gis::srid_t>((yyvsp[0].ulonglong_number)));
           }
-#line 31700 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31869 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 934:
-#line 7443 "sql_yacc.yy" /* yacc.c:1646  */
+  case 935:
+#line 7509 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.col_attr)= NEW_PTN PT_check_constraint_column_attr((yyvsp[-1].lexer.lex_str), (yyvsp[0].item));
           }
-#line 31708 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31877 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 935:
-#line 7456 "sql_yacc.yy" /* yacc.c:1646  */
+  case 936:
+#line 7522 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.col_attr) = NEW_PTN PT_constraint_enforcement_attr((yyvsp[0].is_not_empty));
           }
-#line 31716 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31885 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 936:
-#line 7460 "sql_yacc.yy" /* yacc.c:1646  */
+  case 937:
+#line 7526 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.col_attr) = make_column_engine_attribute(YYMEM_ROOT, (yyvsp[0].lex_cstr));
           }
-#line 31724 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31893 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 937:
-#line 7464 "sql_yacc.yy" /* yacc.c:1646  */
+  case 938:
+#line 7530 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.col_attr) = make_column_secondary_engine_attribute(YYMEM_ROOT, (yyvsp[0].lex_cstr));
           }
-#line 31732 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31901 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 938:
-#line 7468 "sql_yacc.yy" /* yacc.c:1646  */
+  case 939:
+#line 7534 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.col_attr) = NEW_PTN PT_column_visibility_attr((yyvsp[0].visibility));
           }
-#line 31740 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31909 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 939:
-#line 7474 "sql_yacc.yy" /* yacc.c:1646  */
+  case 940:
+#line 7540 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.column_format)= COLUMN_FORMAT_TYPE_DEFAULT; }
-#line 31746 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31915 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 940:
-#line 7475 "sql_yacc.yy" /* yacc.c:1646  */
+  case 941:
+#line 7541 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.column_format)= COLUMN_FORMAT_TYPE_FIXED; }
-#line 31752 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31921 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 941:
-#line 7476 "sql_yacc.yy" /* yacc.c:1646  */
+  case 942:
+#line 7542 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.column_format)= COLUMN_FORMAT_TYPE_DYNAMIC; }
-#line 31758 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31927 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 942:
-#line 7480 "sql_yacc.yy" /* yacc.c:1646  */
+  case 943:
+#line 7546 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.storage_media)= HA_SM_DEFAULT; }
-#line 31764 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31933 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 943:
-#line 7481 "sql_yacc.yy" /* yacc.c:1646  */
+  case 944:
+#line 7547 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.storage_media)= HA_SM_DISK; }
-#line 31770 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31939 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 944:
-#line 7482 "sql_yacc.yy" /* yacc.c:1646  */
+  case 945:
+#line 7548 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.storage_media)= HA_SM_MEMORY; }
-#line 31776 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31945 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 945:
-#line 7487 "sql_yacc.yy" /* yacc.c:1646  */
+  case 946:
+#line 7553 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.ulong_num)= (yyvsp[0].ulong_num);
           }
-#line 31784 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31953 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 946:
-#line 7493 "sql_yacc.yy" /* yacc.c:1646  */
+  case 947:
+#line 7559 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_now_local((yyloc), static_cast<uint8>((yyvsp[0].ulong_num)));
           }
-#line 31792 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31961 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 950:
-#line 7506 "sql_yacc.yy" /* yacc.c:1646  */
+  case 951:
+#line 7572 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if (!((yyval.lexer.charset)=get_charset_by_csname((yyvsp[0].lexer.lex_str).str,MY_CS_PRIMARY,MYF(0))))
             {
@@ -31801,29 +31970,29 @@
             }
             YYLIP->warn_on_deprecated_charset((yyval.lexer.charset), (yyvsp[0].lexer.lex_str).str);
           }
-#line 31805 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31974 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 951:
-#line 7514 "sql_yacc.yy" /* yacc.c:1646  */
+  case 952:
+#line 7580 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lexer.charset)= &my_charset_bin; }
-#line 31811 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31980 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 952:
-#line 7518 "sql_yacc.yy" /* yacc.c:1646  */
+  case 953:
+#line 7584 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lexer.charset)= NULL; }
-#line 31817 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31986 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 953:
-#line 7519 "sql_yacc.yy" /* yacc.c:1646  */
+  case 954:
+#line 7585 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lexer.charset) = (yyvsp[0].lexer.charset); }
-#line 31823 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 31992 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 954:
-#line 7524 "sql_yacc.yy" /* yacc.c:1646  */
+  case 955:
+#line 7590 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if (!((yyval.lexer.charset)=get_charset_by_csname((yyvsp[0].lexer.lex_str).str,MY_CS_PRIMARY,MYF(0))) &&
                 !((yyval.lexer.charset)=get_old_charset_by_name((yyvsp[0].lexer.lex_str).str)))
@@ -31832,93 +32001,93 @@
               MYSQL_YYABORT;
             }
           }
-#line 31836 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32005 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 955:
-#line 7532 "sql_yacc.yy" /* yacc.c:1646  */
+  case 956:
+#line 7598 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lexer.charset)= &my_charset_bin; }
-#line 31842 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32011 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 956:
-#line 7536 "sql_yacc.yy" /* yacc.c:1646  */
+  case 957:
+#line 7602 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lexer.charset)=(yyvsp[0].lexer.charset);   }
-#line 31848 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32017 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 957:
-#line 7537 "sql_yacc.yy" /* yacc.c:1646  */
+  case 958:
+#line 7603 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lexer.charset)=NULL; }
-#line 31854 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32023 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 958:
-#line 7542 "sql_yacc.yy" /* yacc.c:1646  */
+  case 959:
+#line 7608 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if (!((yyval.lexer.charset)= mysqld_collation_get_by_name((yyvsp[0].lexer.lex_str).str)))
               MYSQL_YYABORT;
             YYLIP->warn_on_deprecated_collation((yyval.lexer.charset));
           }
-#line 31864 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32033 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 959:
-#line 7547 "sql_yacc.yy" /* yacc.c:1646  */
+  case 960:
+#line 7613 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lexer.charset)= &my_charset_bin; }
-#line 31870 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32039 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 960:
-#line 7551 "sql_yacc.yy" /* yacc.c:1646  */
+  case 961:
+#line 7617 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lexer.charset) = nullptr; }
-#line 31876 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32045 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 961:
-#line 7552 "sql_yacc.yy" /* yacc.c:1646  */
+  case 962:
+#line 7618 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lexer.charset) = (yyvsp[0].lexer.charset); }
-#line 31882 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32051 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 962:
-#line 7556 "sql_yacc.yy" /* yacc.c:1646  */
+  case 963:
+#line 7622 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 31888 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32057 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 963:
-#line 7557 "sql_yacc.yy" /* yacc.c:1646  */
+  case 964:
+#line 7623 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 31894 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32063 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 964:
-#line 7562 "sql_yacc.yy" /* yacc.c:1646  */
+  case 965:
+#line 7628 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lexer.charset)= &my_charset_latin1; }
-#line 31900 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32069 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 965:
-#line 7563 "sql_yacc.yy" /* yacc.c:1646  */
+  case 966:
+#line 7629 "sql_yacc.yy" /* yacc.c:1646  */
     {
             warn_about_deprecated_binary(YYTHD);
             (yyval.lexer.charset)= &my_charset_latin1_bin;
         }
-#line 31909 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32078 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 966:
-#line 7567 "sql_yacc.yy" /* yacc.c:1646  */
+  case 967:
+#line 7633 "sql_yacc.yy" /* yacc.c:1646  */
     {
             warn_about_deprecated_binary(YYTHD);
             (yyval.lexer.charset)= &my_charset_latin1_bin;
         }
-#line 31918 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32087 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 967:
-#line 7575 "sql_yacc.yy" /* yacc.c:1646  */
+  case 968:
+#line 7641 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if (!((yyval.lexer.charset)= get_charset_by_csname("ucs2", MY_CS_PRIMARY,MYF(0))))
             {
@@ -31926,88 +32095,88 @@
               MYSQL_YYABORT;
             }
           }
-#line 31930 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32099 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 968:
-#line 7583 "sql_yacc.yy" /* yacc.c:1646  */
+  case 969:
+#line 7649 "sql_yacc.yy" /* yacc.c:1646  */
     {
             warn_about_deprecated_binary(YYTHD);
             if (!((yyval.lexer.charset)= mysqld_collation_get_by_name("ucs2_bin")))
               MYSQL_YYABORT;
           }
-#line 31940 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32109 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 969:
-#line 7589 "sql_yacc.yy" /* yacc.c:1646  */
+  case 970:
+#line 7655 "sql_yacc.yy" /* yacc.c:1646  */
     {
             warn_about_deprecated_binary(YYTHD);
             if (!((yyval.lexer.charset)= mysqld_collation_get_by_name("ucs2_bin")))
               my_error(ER_UNKNOWN_COLLATION, MYF(0), "ucs2_bin");
           }
-#line 31950 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32119 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 970:
-#line 7598 "sql_yacc.yy" /* yacc.c:1646  */
+  case 971:
+#line 7664 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.charset_with_opt_binary).charset= NULL;
             (yyval.charset_with_opt_binary).force_binary= false;
           }
-#line 31959 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32128 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 971:
-#line 7603 "sql_yacc.yy" /* yacc.c:1646  */
+  case 972:
+#line 7669 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.charset_with_opt_binary).charset= (yyvsp[0].lexer.charset);
             (yyval.charset_with_opt_binary).force_binary= false;
           }
-#line 31968 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32137 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 972:
-#line 7608 "sql_yacc.yy" /* yacc.c:1646  */
+  case 973:
+#line 7674 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.charset_with_opt_binary).charset= (yyvsp[0].lexer.charset);
             (yyval.charset_with_opt_binary).force_binary= false;
           }
-#line 31977 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32146 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 973:
-#line 7613 "sql_yacc.yy" /* yacc.c:1646  */
+  case 974:
+#line 7679 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.charset_with_opt_binary).charset= &my_charset_bin;
             (yyval.charset_with_opt_binary).force_binary= false;
           }
-#line 31986 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32155 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 974:
-#line 7618 "sql_yacc.yy" /* yacc.c:1646  */
+  case 975:
+#line 7684 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.charset_with_opt_binary).charset= (yyvsp[0].is_not_empty) ? get_bin_collation((yyvsp[-1].lexer.charset)) : (yyvsp[-1].lexer.charset);
             if ((yyval.charset_with_opt_binary).charset == NULL)
               MYSQL_YYABORT;
             (yyval.charset_with_opt_binary).force_binary= false;
           }
-#line 31997 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32166 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 975:
-#line 7625 "sql_yacc.yy" /* yacc.c:1646  */
+  case 976:
+#line 7691 "sql_yacc.yy" /* yacc.c:1646  */
     {
             warn_about_deprecated_binary(YYTHD);
             (yyval.charset_with_opt_binary).charset= NULL;
             (yyval.charset_with_opt_binary).force_binary= true;
           }
-#line 32007 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32176 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 976:
-#line 7631 "sql_yacc.yy" /* yacc.c:1646  */
+  case 977:
+#line 7697 "sql_yacc.yy" /* yacc.c:1646  */
     {
             warn_about_deprecated_binary(YYTHD);
             (yyval.charset_with_opt_binary).charset= get_bin_collation((yyvsp[0].lexer.charset));
@@ -32015,26 +32184,26 @@
               MYSQL_YYABORT;
             (yyval.charset_with_opt_binary).force_binary= false;
           }
-#line 32019 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32188 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 977:
-#line 7641 "sql_yacc.yy" /* yacc.c:1646  */
+  case 978:
+#line 7707 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.is_not_empty)= false; }
-#line 32025 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32194 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 978:
-#line 7642 "sql_yacc.yy" /* yacc.c:1646  */
+  case 979:
+#line 7708 "sql_yacc.yy" /* yacc.c:1646  */
     {
             warn_about_deprecated_binary(YYTHD);
             (yyval.is_not_empty)= true;
           }
-#line 32034 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32203 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 979:
-#line 7650 "sql_yacc.yy" /* yacc.c:1646  */
+  case 980:
+#line 7716 "sql_yacc.yy" /* yacc.c:1646  */
     {
           if ((yyvsp[0].ulong_num) == 0)
           {
@@ -32042,17 +32211,17 @@
             MYSQL_YYABORT;
           }
         }
-#line 32046 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32215 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 980:
-#line 7658 "sql_yacc.yy" /* yacc.c:1646  */
+  case 981:
+#line 7724 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ulong_num)= (yyvsp[-2].ulong_num); }
-#line 32052 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32221 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 983:
-#line 7672 "sql_yacc.yy" /* yacc.c:1646  */
+  case 984:
+#line 7738 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.fk_references).table_name= (yyvsp[-3].table);
             (yyval.fk_references).reference_list= (yyvsp[-2].reference_list);
@@ -32060,230 +32229,230 @@
             (yyval.fk_references).fk_update_opt= (yyvsp[0].fk_options).fk_update_opt;
             (yyval.fk_references).fk_delete_opt= (yyvsp[0].fk_options).fk_delete_opt;
           }
-#line 32064 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32233 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 984:
-#line 7682 "sql_yacc.yy" /* yacc.c:1646  */
+  case 985:
+#line 7748 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.reference_list)= NULL; }
-#line 32070 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32239 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 985:
-#line 7683 "sql_yacc.yy" /* yacc.c:1646  */
+  case 986:
+#line 7749 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.reference_list)= (yyvsp[-1].reference_list); }
-#line 32076 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32245 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 986:
-#line 7688 "sql_yacc.yy" /* yacc.c:1646  */
+  case 987:
+#line 7754 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.reference_list)= (yyvsp[-2].reference_list);
             auto key= NEW_PTN Key_part_spec(to_lex_cstring((yyvsp[0].lexer.lex_str)), 0, ORDER_ASC);
             if (key == NULL || (yyval.reference_list)->push_back(key))
               MYSQL_YYABORT;
           }
-#line 32087 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32256 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 987:
-#line 7695 "sql_yacc.yy" /* yacc.c:1646  */
+  case 988:
+#line 7761 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.reference_list)= NEW_PTN List<Key_part_spec>;
             auto key= NEW_PTN Key_part_spec(to_lex_cstring((yyvsp[0].lexer.lex_str)), 0, ORDER_ASC);
             if ((yyval.reference_list) == NULL || key == NULL || (yyval.reference_list)->push_back(key))
               MYSQL_YYABORT;
           }
-#line 32098 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32267 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 988:
-#line 7704 "sql_yacc.yy" /* yacc.c:1646  */
+  case 989:
+#line 7770 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.opt_match_clause)= FK_MATCH_UNDEF; }
-#line 32104 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32273 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 989:
-#line 7705 "sql_yacc.yy" /* yacc.c:1646  */
+  case 990:
+#line 7771 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.opt_match_clause)= FK_MATCH_FULL; }
-#line 32110 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32279 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 990:
-#line 7706 "sql_yacc.yy" /* yacc.c:1646  */
+  case 991:
+#line 7772 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.opt_match_clause)= FK_MATCH_PARTIAL; }
-#line 32116 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32285 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 991:
-#line 7707 "sql_yacc.yy" /* yacc.c:1646  */
+  case 992:
+#line 7773 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.opt_match_clause)= FK_MATCH_SIMPLE; }
-#line 32122 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32291 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 992:
-#line 7712 "sql_yacc.yy" /* yacc.c:1646  */
+  case 993:
+#line 7778 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.fk_options).fk_update_opt= FK_OPTION_UNDEF;
             (yyval.fk_options).fk_delete_opt= FK_OPTION_UNDEF;
           }
-#line 32131 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32300 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 993:
-#line 7717 "sql_yacc.yy" /* yacc.c:1646  */
+  case 994:
+#line 7783 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.fk_options).fk_update_opt= (yyvsp[0].m_fk_option);
             (yyval.fk_options).fk_delete_opt= FK_OPTION_UNDEF;
           }
-#line 32140 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32309 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 994:
-#line 7722 "sql_yacc.yy" /* yacc.c:1646  */
+  case 995:
+#line 7788 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.fk_options).fk_update_opt= FK_OPTION_UNDEF;
             (yyval.fk_options).fk_delete_opt= (yyvsp[0].m_fk_option);
           }
-#line 32149 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32318 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 995:
-#line 7728 "sql_yacc.yy" /* yacc.c:1646  */
+  case 996:
+#line 7794 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.fk_options).fk_update_opt= (yyvsp[-3].m_fk_option);
             (yyval.fk_options).fk_delete_opt= (yyvsp[0].m_fk_option);
           }
-#line 32158 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32327 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 996:
-#line 7734 "sql_yacc.yy" /* yacc.c:1646  */
+  case 997:
+#line 7800 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.fk_options).fk_update_opt= (yyvsp[0].m_fk_option);
             (yyval.fk_options).fk_delete_opt= (yyvsp[-3].m_fk_option);
           }
-#line 32167 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
-    break;
-
-  case 997:
-#line 7741 "sql_yacc.yy" /* yacc.c:1646  */
-    { (yyval.m_fk_option)= FK_OPTION_RESTRICT; }
-#line 32173 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32336 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 998:
-#line 7742 "sql_yacc.yy" /* yacc.c:1646  */
-    { (yyval.m_fk_option)= FK_OPTION_CASCADE; }
-#line 32179 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 7807 "sql_yacc.yy" /* yacc.c:1646  */
+    { (yyval.m_fk_option)= FK_OPTION_RESTRICT; }
+#line 32342 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 999:
-#line 7743 "sql_yacc.yy" /* yacc.c:1646  */
-    { (yyval.m_fk_option)= FK_OPTION_SET_NULL; }
-#line 32185 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 7808 "sql_yacc.yy" /* yacc.c:1646  */
+    { (yyval.m_fk_option)= FK_OPTION_CASCADE; }
+#line 32348 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 1000:
-#line 7744 "sql_yacc.yy" /* yacc.c:1646  */
-    { (yyval.m_fk_option)= FK_OPTION_NO_ACTION; }
-#line 32191 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 7809 "sql_yacc.yy" /* yacc.c:1646  */
+    { (yyval.m_fk_option)= FK_OPTION_SET_NULL; }
+#line 32354 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 1001:
-#line 7745 "sql_yacc.yy" /* yacc.c:1646  */
-    { (yyval.m_fk_option)= FK_OPTION_DEFAULT;  }
-#line 32197 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 7810 "sql_yacc.yy" /* yacc.c:1646  */
+    { (yyval.m_fk_option)= FK_OPTION_NO_ACTION; }
+#line 32360 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 1002:
-#line 7749 "sql_yacc.yy" /* yacc.c:1646  */
-    { (yyval.key_type)= KEYTYPE_PRIMARY; }
-#line 32203 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 7811 "sql_yacc.yy" /* yacc.c:1646  */
+    { (yyval.m_fk_option)= FK_OPTION_DEFAULT;  }
+#line 32366 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 1003:
-#line 7750 "sql_yacc.yy" /* yacc.c:1646  */
-    { (yyval.key_type)= KEYTYPE_UNIQUE; }
-#line 32209 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 7815 "sql_yacc.yy" /* yacc.c:1646  */
+    { (yyval.key_type)= KEYTYPE_PRIMARY; }
+#line 32372 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 1004:
-#line 7754 "sql_yacc.yy" /* yacc.c:1646  */
-    {}
-#line 32215 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 7816 "sql_yacc.yy" /* yacc.c:1646  */
+    { (yyval.key_type)= KEYTYPE_UNIQUE; }
+#line 32378 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 1005:
-#line 7755 "sql_yacc.yy" /* yacc.c:1646  */
+#line 7820 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 32221 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32384 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 1006:
-#line 7759 "sql_yacc.yy" /* yacc.c:1646  */
+#line 7821 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 32227 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32390 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1008:
-#line 7764 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1007:
+#line 7825 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 32233 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32396 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 1009:
-#line 7765 "sql_yacc.yy" /* yacc.c:1646  */
+#line 7830 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 32239 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32402 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 1010:
-#line 7766 "sql_yacc.yy" /* yacc.c:1646  */
+#line 7831 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 32245 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32408 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 1011:
-#line 7770 "sql_yacc.yy" /* yacc.c:1646  */
-    { (yyval.key_type)= KEYTYPE_MULTIPLE; }
-#line 32251 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 7832 "sql_yacc.yy" /* yacc.c:1646  */
+    {}
+#line 32414 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 1012:
-#line 7771 "sql_yacc.yy" /* yacc.c:1646  */
-    { (yyval.key_type)= KEYTYPE_UNIQUE; }
-#line 32257 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 7836 "sql_yacc.yy" /* yacc.c:1646  */
+    { (yyval.key_type)= KEYTYPE_MULTIPLE; }
+#line 32420 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 1013:
-#line 7775 "sql_yacc.yy" /* yacc.c:1646  */
+#line 7837 "sql_yacc.yy" /* yacc.c:1646  */
+    { (yyval.key_type)= KEYTYPE_UNIQUE; }
+#line 32426 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+    break;
+
+  case 1014:
+#line 7841 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.index_options).init(YYMEM_ROOT); }
-#line 32263 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32432 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1015:
-#line 7781 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1016:
+#line 7847 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.index_options).init(YYMEM_ROOT);
             if ((yyval.index_options).push_back((yyvsp[0].index_option)))
               MYSQL_YYABORT; // OOM
           }
-#line 32273 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32442 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1016:
-#line 7787 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1017:
+#line 7853 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyvsp[-1].index_options).push_back((yyvsp[0].index_option)))
               MYSQL_YYABORT; // OOM
             (yyval.index_options)= (yyvsp[-1].index_options);
           }
-#line 32283 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32452 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1018:
-#line 7797 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1019:
+#line 7863 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX_CSTRING plugin_name= {(yyvsp[0].lexer.lex_str).str, (yyvsp[0].lexer.lex_str).length};
             if (!plugin_is_ready(plugin_name, MYSQL_FTPARSER_PLUGIN))
@@ -32294,210 +32463,210 @@
             else
               (yyval.index_option)= NEW_PTN PT_fulltext_index_parser_name(to_lex_cstring((yyvsp[0].lexer.lex_str)));
           }
-#line 32298 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32467 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1019:
-#line 7810 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1020:
+#line 7876 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.index_options).init(YYMEM_ROOT); }
-#line 32304 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32473 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1021:
-#line 7816 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1022:
+#line 7882 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.index_options).init(YYMEM_ROOT);
             if ((yyval.index_options).push_back((yyvsp[0].index_option)))
               MYSQL_YYABORT; // OOM
           }
-#line 32314 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32483 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1022:
-#line 7822 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1023:
+#line 7888 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyvsp[-1].index_options).push_back((yyvsp[0].index_option)))
               MYSQL_YYABORT; // OOM
             (yyval.index_options)= (yyvsp[-1].index_options);
           }
-#line 32324 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32493 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1024:
-#line 7834 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1025:
+#line 7900 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.index_options).init(YYMEM_ROOT); }
-#line 32330 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32499 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1026:
-#line 7840 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1027:
+#line 7906 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.index_options).init(YYMEM_ROOT);
             if ((yyval.index_options).push_back((yyvsp[0].index_option)))
               MYSQL_YYABORT; // OOM
           }
-#line 32340 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32509 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1027:
-#line 7846 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1028:
+#line 7912 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyvsp[-1].index_options).push_back((yyvsp[0].index_option)))
               MYSQL_YYABORT; // OOM
             (yyval.index_options)= (yyvsp[-1].index_options);
           }
-#line 32350 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32519 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1028:
-#line 7854 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1029:
+#line 7920 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.index_option)= (yyvsp[0].index_option); }
-#line 32356 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32525 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1029:
-#line 7855 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1030:
+#line 7921 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.index_option)= (yyvsp[0].index_option); }
-#line 32362 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32531 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1030:
-#line 7860 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1031:
+#line 7926 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.index_option)= NEW_PTN PT_block_size((yyvsp[0].ulong_num)); }
-#line 32368 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32537 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1031:
-#line 7862 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1032:
+#line 7928 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.index_option)= NEW_PTN PT_index_comment(to_lex_cstring((yyvsp[0].lexer.lex_str)));
           }
-#line 32376 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32545 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1032:
-#line 7866 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1033:
+#line 7932 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.index_option)= NEW_PTN PT_index_visibility((yyvsp[0].visibility));
           }
-#line 32384 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32553 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1033:
-#line 7870 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1034:
+#line 7936 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.index_option) = make_index_engine_attribute(YYMEM_ROOT, (yyvsp[0].lex_cstr));
           }
-#line 32392 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32561 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1034:
-#line 7874 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1035:
+#line 7940 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.index_option) = make_index_secondary_engine_attribute(YYMEM_ROOT, (yyvsp[0].lex_cstr));
           }
-#line 32400 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32569 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1035:
-#line 7897 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1036:
+#line 7963 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.index_name_and_type)= {(yyvsp[0].lexer.lex_str), NULL}; }
-#line 32406 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32575 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1036:
-#line 7898 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1037:
+#line 7964 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.index_name_and_type)= {(yyvsp[-2].lexer.lex_str), NEW_PTN PT_index_type((yyvsp[0].key_alg))}; }
-#line 32412 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32581 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1037:
-#line 7899 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1038:
+#line 7965 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.index_name_and_type)= {(yyvsp[-2].lexer.lex_str), NEW_PTN PT_index_type((yyvsp[0].key_alg))}; }
-#line 32418 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32587 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1038:
-#line 7903 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1039:
+#line 7969 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.index_option) = nullptr; }
-#line 32424 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32593 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1040:
-#line 7908 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1041:
+#line 7974 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.index_option)= NEW_PTN PT_index_type((yyvsp[0].key_alg)); }
-#line 32430 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32599 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1041:
-#line 7909 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1042:
+#line 7975 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.index_option)= NEW_PTN PT_index_type((yyvsp[0].key_alg)); }
-#line 32436 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32605 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1042:
-#line 7913 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1043:
+#line 7979 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.visibility)= true; }
-#line 32442 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32611 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1043:
-#line 7914 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1044:
+#line 7980 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.visibility)= false; }
-#line 32448 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32617 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1044:
-#line 7918 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1045:
+#line 7984 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.key_alg)= HA_KEY_ALG_BTREE; }
-#line 32454 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32623 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1045:
-#line 7919 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1046:
+#line 7985 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.key_alg)= HA_KEY_ALG_RTREE; }
-#line 32460 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32629 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1046:
-#line 7920 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1047:
+#line 7986 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.key_alg)= HA_KEY_ALG_HASH; }
-#line 32466 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32635 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1047:
-#line 7925 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1048:
+#line 7991 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyvsp[-2].index_column_list)->push_back((yyvsp[0].key_part)))
               MYSQL_YYABORT; // OOM
             (yyval.index_column_list)= (yyvsp[-2].index_column_list);
           }
-#line 32476 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32645 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1048:
-#line 7931 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1049:
+#line 7997 "sql_yacc.yy" /* yacc.c:1646  */
     {
             // The order is ignored.
             (yyval.index_column_list)= NEW_PTN List<PT_key_part_specification>;
             if ((yyval.index_column_list) == NULL || (yyval.index_column_list)->push_back((yyvsp[0].key_part)))
               MYSQL_YYABORT; // OOM
           }
-#line 32487 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32656 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1049:
-#line 7941 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1050:
+#line 8007 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.key_part)= NEW_PTN PT_key_part_specification(to_lex_cstring((yyvsp[-1].lexer.lex_str)), (yyvsp[0].order_direction), 0);
             if ((yyval.key_part) == NULL)
               MYSQL_YYABORT;
           }
-#line 32497 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32666 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1050:
-#line 7947 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1051:
+#line 8013 "sql_yacc.yy" /* yacc.c:1646  */
     {
             int key_part_length= atoi((yyvsp[-2].lexer.lex_str).str);
             if (!key_part_length)
@@ -32509,79 +32678,79 @@
             if ((yyval.key_part) == NULL)
               MYSQL_YYABORT; /* purecov: deadcode */
           }
-#line 32513 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32682 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1051:
-#line 7962 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1052:
+#line 8028 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyvsp[-2].index_column_list)->push_back((yyvsp[0].key_part)))
               MYSQL_YYABORT; /* purecov: deadcode */
             (yyval.index_column_list)= (yyvsp[-2].index_column_list);
           }
-#line 32523 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32692 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1052:
-#line 7968 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1053:
+#line 8034 "sql_yacc.yy" /* yacc.c:1646  */
     {
             // The order is ignored.
             (yyval.index_column_list)= NEW_PTN List<PT_key_part_specification>;
             if ((yyval.index_column_list) == NULL || (yyval.index_column_list)->push_back((yyvsp[0].key_part)))
               MYSQL_YYABORT; /* purecov: deadcode */
           }
-#line 32534 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32703 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1054:
-#line 7979 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1055:
+#line 8045 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.key_part)= NEW_PTN PT_key_part_specification((yyvsp[-2].item), (yyvsp[0].order_direction));
             if ((yyval.key_part) == NULL)
               MYSQL_YYABORT;
           }
-#line 32544 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32713 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1055:
-#line 7987 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1056:
+#line 8053 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lexer.lex_str)= NULL_STR; }
-#line 32550 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32719 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1057:
-#line 7992 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1058:
+#line 8058 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lexer.lex_str)= null_lex_str; }
-#line 32556 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32725 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1058:
-#line 7993 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1059:
+#line 8059 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lexer.lex_str)= (yyvsp[0].lexer.lex_str); }
-#line 32562 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32731 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1059:
-#line 7998 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1060:
+#line 8064 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.string_list)= NEW_PTN List<String>;
             if ((yyval.string_list) == NULL || (yyval.string_list)->push_back((yyvsp[0].string)))
               MYSQL_YYABORT; // OOM
           }
-#line 32572 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32741 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1060:
-#line 8004 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1061:
+#line 8070 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyval.string_list)->push_back((yyvsp[0].string)))
               MYSQL_YYABORT;
           }
-#line 32581 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32750 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1061:
-#line 8016 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1062:
+#line 8082 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_alter_table_stmt(
                   YYMEM_ROOT,
@@ -32591,11 +32760,11 @@
                   (yyvsp[0].alter_list).flags.lock.get_or_default(),
                   (yyvsp[0].alter_list).flags.validation.get_or_default());
           }
-#line 32595 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32764 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1062:
-#line 8026 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1063:
+#line 8092 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_alter_table_standalone_stmt(
                   YYMEM_ROOT,
@@ -32605,11 +32774,11 @@
                   (yyvsp[0].standalone_alter_table_action).flags.lock.get_or_default(),
                   (yyvsp[0].standalone_alter_table_action).flags.validation.get_or_default());
           }
-#line 32609 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32778 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1063:
-#line 8039 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1064:
+#line 8105 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->create_info= YYTHD->alloc_typed<HA_CREATE_INFO>();
             if (Lex->create_info == NULL)
@@ -32617,11 +32786,11 @@
             Lex->create_info->default_table_charset= NULL;
             Lex->create_info->used_fields= 0;
           }
-#line 32621 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32790 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1064:
-#line 8047 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1065:
+#line 8113 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex=Lex;
             lex->sql_command=SQLCOM_ALTER_DB;
@@ -32630,11 +32799,11 @@
                 lex->copy_db_to(&lex->name.str, &lex->name.length))
               MYSQL_YYABORT;
           }
-#line 32634 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32803 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1065:
-#line 8059 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1066:
+#line 8125 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
 
@@ -32645,22 +32814,22 @@
             }
             memset(&lex->sp_chistics, 0, sizeof(st_sp_chistics));
           }
-#line 32649 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32818 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1066:
-#line 8070 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1067:
+#line 8136 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex=Lex;
 
             lex->sql_command= SQLCOM_ALTER_PROCEDURE;
             lex->spname= (yyvsp[-2].spname);
           }
-#line 32660 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32829 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1067:
-#line 8080 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1068:
+#line 8146 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
 
@@ -32671,22 +32840,22 @@
             }
             memset(&lex->sp_chistics, 0, sizeof(st_sp_chistics));
           }
-#line 32675 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32844 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1068:
-#line 8091 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1069:
+#line 8157 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex=Lex;
 
             lex->sql_command= SQLCOM_ALTER_FUNCTION;
             lex->spname= (yyvsp[-2].spname);
           }
-#line 32686 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32855 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1069:
-#line 8101 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1070:
+#line 8167 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
 
@@ -32697,17 +32866,17 @@
             }
             lex->create_view_mode= enum_view_create_mode::VIEW_ALTER;
           }
-#line 32701 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32870 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1070:
-#line 8112 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1071:
+#line 8178 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 32707 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32876 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1071:
-#line 8119 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1072:
+#line 8185 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
 
@@ -32719,17 +32888,17 @@
             lex->create_view_algorithm= VIEW_ALGORITHM_UNDEFINED;
             lex->create_view_mode= enum_view_create_mode::VIEW_ALTER;
           }
-#line 32723 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32892 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1072:
-#line 8131 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1073:
+#line 8197 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 32729 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32898 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1073:
-#line 8136 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1074:
+#line 8202 "sql_yacc.yy" /* yacc.c:1646  */
     {
             /*
               It is safe to use Lex->spname because
@@ -32745,11 +32914,11 @@
 
             Lex->sql_command= SQLCOM_ALTER_EVENT;
           }
-#line 32749 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32918 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1074:
-#line 8156 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1075:
+#line 8222 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if (!((yyvsp[-4].num) || (yyvsp[-3].num) || (yyvsp[-2].num) || (yyvsp[-1].num) || (yyvsp[0].num)))
             {
@@ -32762,11 +32931,11 @@
             */
             Lex->sql_command= SQLCOM_ALTER_EVENT;
           }
-#line 32766 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32935 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1075:
-#line 8173 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1076:
+#line 8239 "sql_yacc.yy" /* yacc.c:1646  */
     {
             auto pc= NEW_PTN Alter_tablespace_parse_context{YYTHD};
             if (pc == NULL)
@@ -32785,11 +32954,11 @@
 
             Lex->sql_command= SQLCOM_ALTER_TABLESPACE;
           }
-#line 32789 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32958 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1076:
-#line 8195 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1077:
+#line 8261 "sql_yacc.yy" /* yacc.c:1646  */
     {
             auto pc= NEW_PTN Alter_tablespace_parse_context{YYTHD};
             if (pc == NULL)
@@ -32807,11 +32976,11 @@
 
             Lex->sql_command= SQLCOM_ALTER_TABLESPACE;
           }
-#line 32811 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 32980 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1077:
-#line 8214 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1078:
+#line 8280 "sql_yacc.yy" /* yacc.c:1646  */
     {
             auto pc= NEW_PTN Alter_tablespace_parse_context{YYTHD};
             if (pc == NULL)
@@ -32830,11 +32999,11 @@
 
             Lex->sql_command= SQLCOM_ALTER_TABLESPACE;
           }
-#line 32834 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33003 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1078:
-#line 8233 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1079:
+#line 8299 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->m_sql_cmd= NEW_PTN Sql_cmd_alter_tablespace_rename{(yyvsp[-3].lexer.lex_str), (yyvsp[0].lexer.lex_str)};
             if (!Lex->m_sql_cmd)
@@ -32842,11 +33011,11 @@
 
             Lex->sql_command= SQLCOM_ALTER_TABLESPACE;
           }
-#line 32846 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33015 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1079:
-#line 8241 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1080:
+#line 8307 "sql_yacc.yy" /* yacc.c:1646  */
     {
             auto pc= NEW_PTN Alter_tablespace_parse_context{YYTHD};
             if (pc == NULL)
@@ -32865,11 +33034,11 @@
 
             Lex->sql_command= SQLCOM_ALTER_TABLESPACE;
           }
-#line 32869 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33038 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1080:
-#line 8264 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1081:
+#line 8330 "sql_yacc.yy" /* yacc.c:1646  */
     {
             auto pc= NEW_PTN Alter_tablespace_parse_context{YYTHD};
             if (pc == NULL)
@@ -32889,11 +33058,11 @@
             Lex->m_sql_cmd= cmd;
             Lex->sql_command= SQLCOM_ALTER_TABLESPACE;
           }
-#line 32893 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33062 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1081:
-#line 8287 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1082:
+#line 8353 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_ALTER_SERVER;
@@ -32901,56 +33070,50 @@
             lex->m_sql_cmd=
               NEW_PTN Sql_cmd_alter_server(&Lex->server_options);
           }
-#line 32905 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33074 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1083:
-#line 8301 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1084:
+#line 8368 "sql_yacc.yy" /* yacc.c:1646  */
     {
-            (yyvsp[-6].lex_user)->auth.str= nullptr;
-            (yyvsp[-6].lex_user)->auth.length= 0;
-            (yyvsp[-6].lex_user)->has_password_generator= true;
-            (yyvsp[-6].lex_user)->uses_identified_by_clause= true;
+            (yyvsp[-3].lex_user)->first_factor_auth_info = *(yyvsp[-2].lex_mfa);
+
             if ((yyvsp[-1].lex_cstr).str != nullptr) {
-              (yyvsp[-6].lex_user)->current_auth= (yyvsp[-1].lex_cstr);
-              (yyvsp[-6].lex_user)->uses_replace_clause= true;
+              (yyvsp[-3].lex_user)->current_auth = (yyvsp[-1].lex_cstr);
+              (yyvsp[-3].lex_user)->uses_replace_clause = true;
             }
-            Lex->contains_plaintext_password= true;
-            (yyvsp[-6].lex_user)->discard_old_password= false;
-            (yyvsp[-6].lex_user)->retain_current_password= (yyvsp[0].is_not_empty);
+            (yyvsp[-3].lex_user)->discard_old_password = false;
+            (yyvsp[-3].lex_user)->retain_current_password = (yyvsp[0].is_not_empty);
           }
-#line 32923 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33089 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1084:
-#line 8316 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1085:
+#line 8380 "sql_yacc.yy" /* yacc.c:1646  */
     {
-            (yyvsp[-5].lex_user)->auth.str= (yyvsp[-2].lexer.lex_str).str;
-            (yyvsp[-5].lex_user)->auth.length= (yyvsp[-2].lexer.lex_str).length;
-            (yyvsp[-5].lex_user)->uses_identified_by_clause= true;
+            (yyvsp[-3].lex_user)->first_factor_auth_info = *(yyvsp[-2].lex_mfa);
+
             if ((yyvsp[-1].lex_cstr).str != nullptr) {
-              (yyvsp[-5].lex_user)->current_auth= (yyvsp[-1].lex_cstr);
-              (yyvsp[-5].lex_user)->uses_replace_clause= true;
+              (yyvsp[-3].lex_user)->current_auth = (yyvsp[-1].lex_cstr);
+              (yyvsp[-3].lex_user)->uses_replace_clause = true;
             }
-            Lex->contains_plaintext_password= true;
-            (yyvsp[-5].lex_user)->discard_old_password= false;
-            (yyvsp[-5].lex_user)->retain_current_password= (yyvsp[0].is_not_empty);
+            (yyvsp[-3].lex_user)->discard_old_password = false;
+            (yyvsp[-3].lex_user)->retain_current_password = (yyvsp[0].is_not_empty);
           }
-#line 32940 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33104 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1085:
-#line 8329 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1086:
+#line 8391 "sql_yacc.yy" /* yacc.c:1646  */
     {
-            (yyvsp[-3].lex_user)->discard_old_password= true;
-            (yyvsp[-3].lex_user)->retain_current_password= false;
-            (yyvsp[-3].lex_user)->auth= NULL_CSTR;
+            (yyvsp[-3].lex_user)->discard_old_password = true;
+            (yyvsp[-3].lex_user)->retain_current_password = false;
           }
-#line 32950 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33113 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1086:
-#line 8335 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1087:
+#line 8396 "sql_yacc.yy" /* yacc.c:1646  */
     {
             List<LEX_USER> *users= new (YYMEM_ROOT) List<LEX_USER>;
             if (users == NULL || users->push_back((yyvsp[-3].lex_user)))
@@ -32962,11 +33125,11 @@
                                                    role_enum::ROLE_ALL);
               MAKE_CMD(tmp);
           }
-#line 32966 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33129 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1087:
-#line 8347 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1088:
+#line 8408 "sql_yacc.yy" /* yacc.c:1646  */
     {
             List<LEX_USER> *users= new (YYMEM_ROOT) List<LEX_USER>;
             if (users == NULL || users->push_back((yyvsp[-3].lex_user)))
@@ -32978,11 +33141,11 @@
                                                    role_enum::ROLE_NONE);
               MAKE_CMD(tmp);
           }
-#line 32982 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33145 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1088:
-#line 8359 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1089:
+#line 8420 "sql_yacc.yy" /* yacc.c:1646  */
     {
             List<LEX_USER> *users= new (YYMEM_ROOT) List<LEX_USER>;
             if (users == NULL || users->push_back((yyvsp[-3].lex_user)))
@@ -32993,100 +33156,120 @@
                                                  role_enum::ROLE_NAME);
             MAKE_CMD(tmp);
           }
-#line 32997 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33160 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1089:
-#line 8372 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1090:
+#line 8431 "sql_yacc.yy" /* yacc.c:1646  */
+    {
+            if ((yyvsp[-1].lex_user)->mfa_list.push_back((yyvsp[0].lex_mfa)))
+              MYSQL_YYABORT;  // OOM
+            LEX *lex=Lex;
+            lex->users_list.push_front ((yyvsp[-1].lex_user));
+          }
+#line 33171 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+    break;
+
+  case 1091:
+#line 8438 "sql_yacc.yy" /* yacc.c:1646  */
+    {
+            if ((yyvsp[-1].lex_user)->mfa_list.push_back((yyvsp[0].lex_mfa)))
+              MYSQL_YYABORT;  // OOM
+          }
+#line 33180 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+    break;
+
+  case 1092:
+#line 8445 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lex_cstr) = LEX_CSTRING{nullptr, 0}; }
-#line 33003 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33186 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1090:
-#line 8373 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1093:
+#line 8446 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lex_cstr) = to_lex_cstring((yyvsp[0].lexer.lex_str)); }
-#line 33009 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33192 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1091:
-#line 8380 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1094:
+#line 8453 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_alter_resource_group(to_lex_cstring((yyvsp[-4].lexer.lex_str)),
                                                 (yyvsp[-3].resource_group_vcpu_list_type), (yyvsp[-2].resource_group_priority_type), (yyvsp[-1].resource_group_state_type), (yyvsp[0].resource_group_flag_type));
           }
-#line 33018 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33201 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1092:
-#line 8388 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1095:
+#line 8461 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_ALTER_USER;
             lex->drop_if_exists= (yyvsp[0].num);
           }
-#line 33028 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33211 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1093:
-#line 8397 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1096:
+#line 8470 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             lex->alter_user_attribute =
               enum_alter_user_attribute::ALTER_USER_COMMENT_NOT_USED;
           }
-#line 33038 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33221 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1094:
-#line 8403 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1097:
+#line 8476 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             lex->alter_user_attribute =
               enum_alter_user_attribute::ALTER_USER_ATTRIBUTE;
             lex->alter_user_comment_text = (yyvsp[0].lexer.lex_str);
           }
-#line 33049 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33232 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1095:
-#line 8410 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1098:
+#line 8483 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             lex->alter_user_attribute =
               enum_alter_user_attribute::ALTER_USER_COMMENT;
             lex->alter_user_comment_text = (yyvsp[0].lexer.lex_str);
           }
-#line 33060 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33243 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1096:
-#line 8418 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1099:
+#line 8491 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 33066 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33249 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1100:
-#line 8429 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1103:
+#line 8502 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex=Lex;
             lex->alter_password.update_account_locked_column= true;
             lex->alter_password.account_locked= false;
           }
-#line 33076 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33259 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1101:
-#line 8435 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1104:
+#line 8508 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex=Lex;
             lex->alter_password.update_account_locked_column= true;
             lex->alter_password.account_locked= true;
           }
-#line 33086 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33269 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1102:
-#line 8441 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1105:
+#line 8514 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             lex->alter_password.expire_after_days= 0;
@@ -33094,11 +33277,11 @@
             lex->alter_password.update_password_expired_fields= true;
             lex->alter_password.use_default_password_lifetime= true;
           }
-#line 33098 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33281 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1103:
-#line 8449 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1106:
+#line 8522 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             if ((yyvsp[-1].ulong_num) == 0 || (yyvsp[-1].ulong_num) > UINT_MAX16)
@@ -33113,11 +33296,11 @@
             lex->alter_password.update_password_expired_fields= true;
             lex->alter_password.use_default_password_lifetime= false;
           }
-#line 33117 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33300 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1104:
-#line 8464 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1107:
+#line 8537 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             lex->alter_password.expire_after_days= 0;
@@ -33125,11 +33308,11 @@
             lex->alter_password.update_password_expired_fields= true;
             lex->alter_password.use_default_password_lifetime= false;
           }
-#line 33129 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33312 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1105:
-#line 8472 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1108:
+#line 8545 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             lex->alter_password.expire_after_days= 0;
@@ -33137,85 +33320,85 @@
             Lex->alter_password.update_password_expired_fields= true;
             lex->alter_password.use_default_password_lifetime= true;
           }
-#line 33141 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33324 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1106:
-#line 8480 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1109:
+#line 8553 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             lex->alter_password.password_history_length= (yyvsp[0].ulong_num);
             lex->alter_password.update_password_history= true;
             lex->alter_password.use_default_password_history= false;
           }
-#line 33152 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33335 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1107:
-#line 8487 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1110:
+#line 8560 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             lex->alter_password.password_history_length= 0;
             lex->alter_password.update_password_history= true;
             lex->alter_password.use_default_password_history= true;
           }
-#line 33163 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33346 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1108:
-#line 8494 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1111:
+#line 8567 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             lex->alter_password.password_reuse_interval= (yyvsp[-1].ulong_num);
             lex->alter_password.update_password_reuse_interval= true;
             lex->alter_password.use_default_password_reuse_interval= false;
           }
-#line 33174 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33357 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1109:
-#line 8501 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1112:
+#line 8574 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             lex->alter_password.password_reuse_interval= 0;
             lex->alter_password.update_password_reuse_interval= true;
             lex->alter_password.use_default_password_reuse_interval= true;
           }
-#line 33185 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33368 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1110:
-#line 8508 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1113:
+#line 8581 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             lex->alter_password.update_password_require_current=
                 Lex_acl_attrib_udyn::YES;
           }
-#line 33195 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33378 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1111:
-#line 8514 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1114:
+#line 8587 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             lex->alter_password.update_password_require_current=
                 Lex_acl_attrib_udyn::DEFAULT;
           }
-#line 33205 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33388 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1112:
-#line 8520 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1115:
+#line 8593 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             lex->alter_password.update_password_require_current=
                 Lex_acl_attrib_udyn::NO;
           }
-#line 33215 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33398 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1113:
-#line 8526 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1116:
+#line 8599 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             if ((yyvsp[0].ulong_num) > INT_MAX16) {
@@ -33227,11 +33410,11 @@
             lex->alter_password.update_failed_login_attempts= true;
             lex->alter_password.failed_login_attempts= (yyvsp[0].ulong_num);
           }
-#line 33231 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33414 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1114:
-#line 8538 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1117:
+#line 8611 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             if ((yyvsp[0].ulong_num) > INT_MAX16) {
@@ -33243,124 +33426,123 @@
             lex->alter_password.update_password_lock_time= true;
             lex->alter_password.password_lock_time= (yyvsp[0].ulong_num);
           }
-#line 33247 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33430 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1115:
-#line 8550 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1118:
+#line 8623 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             lex->alter_password.update_password_lock_time= true;
             lex->alter_password.password_lock_time= -1;
           }
-#line 33257 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33440 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1116:
-#line 8558 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1119:
+#line 8631 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 33263 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33446 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1118:
-#line 8563 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1121:
+#line 8636 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 33269 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33452 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1119:
-#line 8564 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1122:
+#line 8637 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 33275 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33458 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1120:
-#line 8569 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1123:
+#line 8642 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex=Lex;
             lex->mqh.questions=(yyvsp[0].ulong_num);
             lex->mqh.specified_limits|= USER_RESOURCES::QUERIES_PER_HOUR;
           }
-#line 33285 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33468 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1121:
-#line 8575 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1124:
+#line 8648 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex=Lex;
             lex->mqh.updates=(yyvsp[0].ulong_num);
             lex->mqh.specified_limits|= USER_RESOURCES::UPDATES_PER_HOUR;
           }
-#line 33295 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33478 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1122:
-#line 8581 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1125:
+#line 8654 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex=Lex;
             lex->mqh.conn_per_hour= (yyvsp[0].ulong_num);
             lex->mqh.specified_limits|= USER_RESOURCES::CONNECTIONS_PER_HOUR;
           }
-#line 33305 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33488 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1123:
-#line 8587 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1126:
+#line 8660 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex=Lex;
             lex->mqh.user_conn= (yyvsp[0].ulong_num);
             lex->mqh.specified_limits|= USER_RESOURCES::USER_CONNECTIONS;
           }
-#line 33315 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33498 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1124:
-#line 8596 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1127:
+#line 8669 "sql_yacc.yy" /* yacc.c:1646  */
     {
             /* empty LEX_USER means current_user */
             LEX_USER *curr_user;
-            if (!(curr_user= (LEX_USER*) Lex->thd->alloc(sizeof(LEX_USER))))
+            if (!(curr_user= LEX_USER::alloc(YYTHD)))
               MYSQL_YYABORT;
 
-            memset(curr_user, 0, sizeof(LEX_USER));
             Lex->users_list.push_back(curr_user);
             (yyval.lex_user)= curr_user;
           }
-#line 33330 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33512 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1125:
-#line 8609 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1128:
+#line 8681 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= 0;}
-#line 33336 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33518 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1126:
-#line 8610 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1129:
+#line 8682 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= 1; }
-#line 33342 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33524 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1127:
-#line 8611 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1130:
+#line 8683 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= 1; }
-#line 33348 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33530 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1128:
-#line 8612 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1131:
+#line 8684 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= 1; }
-#line 33354 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33536 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1129:
-#line 8616 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1132:
+#line 8688 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= 0;}
-#line 33360 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33542 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1130:
-#line 8618 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1133:
+#line 8690 "sql_yacc.yy" /* yacc.c:1646  */
     {
             /*
               Use lex's spname to hold the new name.
@@ -33369,35 +33551,35 @@
             Lex->spname= (yyvsp[0].spname);
             (yyval.num)= 1;
           }
-#line 33373 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33555 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1131:
-#line 8629 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1134:
+#line 8701 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= 0;}
-#line 33379 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33561 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1132:
-#line 8630 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1135:
+#line 8702 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= 1; }
-#line 33385 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33567 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1133:
-#line 8634 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1136:
+#line 8706 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lexer.lex_str).str= 0; (yyval.lexer.lex_str).length= 0; }
-#line 33391 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33573 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1134:
-#line 8635 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1137:
+#line 8707 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lexer.lex_str)= (yyvsp[0].lexer.lex_str); }
-#line 33397 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33579 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1136:
-#line 8641 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1139:
+#line 8713 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_list)= (yyvsp[-1].alter_list);
             if ((yyval.alter_list).actions == NULL)
@@ -33409,300 +33591,300 @@
             if ((yyval.alter_list).actions->push_back((yyvsp[0].alter_table_action)))
               MYSQL_YYABORT; // OOM
           }
-#line 33413 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33595 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1137:
-#line 8656 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1140:
+#line 8728 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.standalone_alter_table_action).flags.init();
             (yyval.standalone_alter_table_action).action= (yyvsp[0].alter_table_standalone_action);
           }
-#line 33422 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33604 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1138:
-#line 8661 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1141:
+#line 8733 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.standalone_alter_table_action).flags= (yyvsp[-2].algo_and_lock_and_validation);
             (yyval.standalone_alter_table_action).action= (yyvsp[0].alter_table_standalone_action);
           }
-#line 33431 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33613 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1139:
-#line 8669 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1142:
+#line 8741 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_action)= NEW_PTN PT_alter_table_partition_by((yyvsp[0].partition_clause));
           }
-#line 33439 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33621 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1140:
-#line 8673 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1143:
+#line 8745 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_action)= NEW_PTN PT_alter_table_remove_partitioning;
           }
-#line 33447 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33629 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1141:
-#line 8680 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1144:
+#line 8752 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_list).flags.init();
             (yyval.alter_list).actions= NULL;
           }
-#line 33456 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33638 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1142:
-#line 8685 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1145:
+#line 8757 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_list).flags= (yyvsp[0].algo_and_lock_and_validation);
             (yyval.alter_list).actions= NULL;
           }
-#line 33465 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33647 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1144:
-#line 8691 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1147:
+#line 8763 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_list).flags= (yyvsp[-2].algo_and_lock_and_validation);
             (yyval.alter_list).flags.merge((yyvsp[0].alter_list).flags);
             (yyval.alter_list).actions= (yyvsp[0].alter_list).actions;
           }
-#line 33475 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33657 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1145:
-#line 8700 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1148:
+#line 8772 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_standalone_action)= NEW_PTN PT_alter_table_discard_tablespace;
           }
-#line 33483 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33665 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1146:
-#line 8704 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1149:
+#line 8776 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_standalone_action)= NEW_PTN PT_alter_table_import_tablespace;
           }
-#line 33491 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33673 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1147:
-#line 8715 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1150:
+#line 8787 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_standalone_action)= NEW_PTN PT_alter_table_add_partition((yyvsp[0].num));
           }
-#line 33499 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33681 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1148:
-#line 8719 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1151:
+#line 8791 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_standalone_action)= NEW_PTN PT_alter_table_add_partition_def_list((yyvsp[-3].num), (yyvsp[-1].part_def_list));
           }
-#line 33507 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33689 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1149:
-#line 8723 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1152:
+#line 8795 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_standalone_action)= NEW_PTN PT_alter_table_add_partition_num((yyvsp[-2].num), (yyvsp[0].ulong_num));
           }
-#line 33515 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33697 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1150:
-#line 8727 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1153:
+#line 8799 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_standalone_action)= NEW_PTN PT_alter_table_drop_partition(*(yyvsp[0].string_list));
           }
-#line 33523 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33705 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1151:
-#line 8732 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1154:
+#line 8804 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_standalone_action)= NEW_PTN PT_alter_table_rebuild_partition((yyvsp[-1].num), (yyvsp[0].string_list));
           }
-#line 33531 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33713 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1152:
-#line 8737 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1155:
+#line 8809 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_standalone_action)= NEW_PTN PT_alter_table_optimize_partition((yyvsp[-1].num), (yyvsp[0].string_list));
           }
-#line 33539 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33721 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1153:
-#line 8742 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1156:
+#line 8814 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_standalone_action)= NEW_PTN PT_alter_table_analyze_partition((yyvsp[-1].num), (yyvsp[0].string_list));
           }
-#line 33547 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33729 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1154:
-#line 8746 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1157:
+#line 8818 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_standalone_action)= NEW_PTN PT_alter_table_check_partition((yyvsp[-1].string_list),
                                                        (yyvsp[0].mi_type).flags, (yyvsp[0].mi_type).sql_flags);
           }
-#line 33556 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33738 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1155:
-#line 8753 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1158:
+#line 8825 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_standalone_action)= NEW_PTN PT_alter_table_repair_partition((yyvsp[-2].num), (yyvsp[-1].string_list),
                                                         (yyvsp[0].mi_type).flags, (yyvsp[0].mi_type).sql_flags);
           }
-#line 33565 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33747 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1156:
-#line 8758 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1159:
+#line 8830 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_standalone_action)= NEW_PTN PT_alter_table_coalesce_partition((yyvsp[-1].num), (yyvsp[0].ulong_num));
           }
-#line 33573 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33755 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1157:
-#line 8762 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1160:
+#line 8834 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_standalone_action)= NEW_PTN PT_alter_table_truncate_partition((yyvsp[0].string_list));
           }
-#line 33581 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33763 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1158:
-#line 8766 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1161:
+#line 8838 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_standalone_action)= NEW_PTN PT_alter_table_reorganize_partition((yyvsp[0].num));
           }
-#line 33589 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33771 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1159:
-#line 8771 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1162:
+#line 8843 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_standalone_action)= NEW_PTN PT_alter_table_reorganize_partition_into((yyvsp[-5].num), *(yyvsp[-4].string_list), (yyvsp[-1].part_def_list));
           }
-#line 33597 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33779 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1160:
-#line 8776 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1163:
+#line 8848 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_standalone_action)= NEW_PTN PT_alter_table_exchange_partition((yyvsp[-4].lexer.lex_str), (yyvsp[-1].table), (yyvsp[0].with_validation));
           }
-#line 33605 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33787 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1161:
-#line 8781 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1164:
+#line 8853 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_standalone_action)= NEW_PTN PT_alter_table_discard_partition_tablespace((yyvsp[-1].string_list));
           }
-#line 33613 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33795 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1162:
-#line 8786 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1165:
+#line 8858 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_standalone_action)= NEW_PTN PT_alter_table_import_partition_tablespace((yyvsp[-1].string_list));
           }
-#line 33621 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33803 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1163:
-#line 8790 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1166:
+#line 8862 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_standalone_action)= NEW_PTN PT_alter_table_secondary_load;
           }
-#line 33629 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33811 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1164:
-#line 8794 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1167:
+#line 8866 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_standalone_action)= NEW_PTN PT_alter_table_secondary_unload;
           }
-#line 33637 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33819 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1165:
-#line 8800 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1168:
+#line 8872 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.with_validation)= Alter_info::ALTER_VALIDATION_DEFAULT; }
-#line 33643 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33825 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1167:
-#line 8806 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1170:
+#line 8878 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.with_validation)= Alter_info::ALTER_WITH_VALIDATION;
           }
-#line 33651 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33833 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1168:
-#line 8810 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1171:
+#line 8882 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.with_validation)= Alter_info::ALTER_WITHOUT_VALIDATION;
           }
-#line 33659 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33841 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1169:
-#line 8816 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1172:
+#line 8888 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.string_list)= NULL; }
-#line 33665 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33847 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1171:
-#line 8826 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1174:
+#line 8898 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_list).flags.init();
             (yyval.alter_list).actions= NEW_PTN Mem_root_array<PT_ddl_table_option *>(YYMEM_ROOT);
             if ((yyval.alter_list).actions == NULL || (yyval.alter_list).actions->push_back((yyvsp[0].alter_table_action)))
               MYSQL_YYABORT; // OOM
           }
-#line 33676 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33858 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1172:
-#line 8833 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1175:
+#line 8905 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyval.alter_list).actions->push_back((yyvsp[0].alter_table_action)))
               MYSQL_YYABORT; // OOM
           }
-#line 33685 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33867 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1173:
-#line 8838 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1176:
+#line 8910 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_list).flags.merge((yyvsp[0].algo_and_lock_and_validation));
           }
-#line 33693 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33875 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1174:
-#line 8842 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1177:
+#line 8914 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_list).flags.init();
             (yyval.alter_list).actions= (yyvsp[0].space_separated_alter_table_opts);
           }
-#line 33702 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33884 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1175:
-#line 8847 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1178:
+#line 8919 "sql_yacc.yy" /* yacc.c:1646  */
     {
             for (auto *option : *(yyvsp[0].space_separated_alter_table_opts))
             {
@@ -33710,324 +33892,324 @@
                 MYSQL_YYABORT; // OOM
             }
           }
-#line 33714 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33896 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1177:
-#line 8859 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1180:
+#line 8931 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.algo_and_lock_and_validation)= (yyvsp[-2].algo_and_lock_and_validation);
             (yyval.algo_and_lock_and_validation).merge((yyvsp[0].algo_and_lock_and_validation));
           }
-#line 33723 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33905 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1178:
-#line 8867 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1181:
+#line 8939 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_action)= NEW_PTN PT_alter_table_add_column((yyvsp[-3].lexer.lex_str), (yyvsp[-2].field_def), (yyvsp[-1].table_constraint_def), (yyvsp[0].c_str));
           }
-#line 33731 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33913 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1179:
-#line 8871 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1182:
+#line 8943 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_action)= NEW_PTN PT_alter_table_add_columns((yyvsp[-1].table_element_list));
           }
-#line 33739 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33921 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1180:
-#line 8875 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1183:
+#line 8947 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_action)= NEW_PTN PT_alter_table_add_constraint((yyvsp[0].table_constraint_def));
           }
-#line 33747 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33929 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1181:
-#line 8879 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1184:
+#line 8951 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_action)= NEW_PTN PT_alter_table_change_column((yyvsp[-3].lexer.lex_str), (yyvsp[-2].lexer.lex_str), (yyvsp[-1].field_def), (yyvsp[0].c_str));
           }
-#line 33755 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33937 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1182:
-#line 8883 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1185:
+#line 8955 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_action)= NEW_PTN PT_alter_table_change_column((yyvsp[-2].lexer.lex_str), (yyvsp[-1].field_def), (yyvsp[0].c_str));
           }
-#line 33763 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33945 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1183:
-#line 8887 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1186:
+#line 8959 "sql_yacc.yy" /* yacc.c:1646  */
     {
             // Note: opt_restrict ($4) is ignored!
             (yyval.alter_table_action)= NEW_PTN PT_alter_table_drop_column((yyvsp[-1].lexer.lex_str).str);
           }
-#line 33772 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33954 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1184:
-#line 8892 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1187:
+#line 8964 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_action)= NEW_PTN PT_alter_table_drop_foreign_key((yyvsp[0].lexer.lex_str).str);
           }
-#line 33780 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33962 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1185:
-#line 8896 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1188:
+#line 8968 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_action)= NEW_PTN PT_alter_table_drop_key(primary_key_name);
           }
-#line 33788 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33970 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1186:
-#line 8900 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1189:
+#line 8972 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_action)= NEW_PTN PT_alter_table_drop_key((yyvsp[0].lexer.lex_str).str);
           }
-#line 33796 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33978 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1187:
-#line 8904 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1190:
+#line 8976 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_action)= NEW_PTN PT_alter_table_drop_check_constraint((yyvsp[0].lexer.lex_str).str);
           }
-#line 33804 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33986 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1188:
-#line 8908 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1191:
+#line 8980 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_action)= NEW_PTN PT_alter_table_drop_constraint((yyvsp[0].lexer.lex_str).str);
           }
-#line 33812 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 33994 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1189:
-#line 8912 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1192:
+#line 8984 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_action)= NEW_PTN PT_alter_table_enable_keys(false);
           }
-#line 33820 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34002 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1190:
-#line 8916 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1193:
+#line 8988 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_action)= NEW_PTN PT_alter_table_enable_keys(true);
           }
-#line 33828 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34010 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1191:
-#line 8920 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1194:
+#line 8992 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_action)= NEW_PTN PT_alter_table_set_default((yyvsp[-3].lexer.lex_str).str, (yyvsp[0].item));
           }
-#line 33836 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34018 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1192:
-#line 8924 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1195:
+#line 8996 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_action)= NEW_PTN PT_alter_table_set_default((yyvsp[-5].lexer.lex_str).str, (yyvsp[-1].item));
           }
-#line 33844 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34026 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1193:
-#line 8928 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1196:
+#line 9000 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_action)= NEW_PTN PT_alter_table_set_default((yyvsp[-2].lexer.lex_str).str, NULL);
           }
-#line 33852 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34034 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1194:
-#line 8933 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1197:
+#line 9005 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_action)= NEW_PTN PT_alter_table_column_visibility((yyvsp[-2].lexer.lex_str).str, (yyvsp[0].visibility));
           }
-#line 33860 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34042 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1195:
-#line 8937 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1198:
+#line 9009 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_action)= NEW_PTN PT_alter_table_index_visible((yyvsp[-1].lexer.lex_str).str, (yyvsp[0].visibility));
           }
-#line 33868 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34050 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1196:
-#line 8941 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1199:
+#line 9013 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_action) = NEW_PTN PT_alter_table_enforce_check_constraint((yyvsp[-1].lexer.lex_str).str, (yyvsp[0].is_not_empty));
           }
-#line 33876 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34058 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1197:
-#line 8945 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1200:
+#line 9017 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_action) = NEW_PTN PT_alter_table_enforce_constraint((yyvsp[-1].lexer.lex_str).str, (yyvsp[0].is_not_empty));
           }
-#line 33884 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34066 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1198:
-#line 8949 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1201:
+#line 9021 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_action)= NEW_PTN PT_alter_table_rename((yyvsp[0].table));
           }
-#line 33892 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34074 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1199:
-#line 8953 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1202:
+#line 9025 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_action)= NEW_PTN PT_alter_table_rename_key((yyvsp[-2].lexer.lex_str).str, (yyvsp[0].lexer.lex_str).str);
           }
-#line 33900 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34082 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1200:
-#line 8957 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1203:
+#line 9029 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_action)= NEW_PTN PT_alter_table_rename_column((yyvsp[-2].lexer.lex_str).str, (yyvsp[0].lexer.lex_str).str);
           }
-#line 33908 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34090 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1201:
-#line 8961 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1204:
+#line 9033 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_action)= NEW_PTN PT_alter_table_convert_to_charset((yyvsp[-1].lexer.charset), (yyvsp[0].lexer.charset));
           }
-#line 33916 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34098 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1202:
-#line 8965 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1205:
+#line 9037 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_action) = NEW_PTN PT_alter_table_convert_to_charset(
                 YYTHD->variables.collation_database,
                 (yyvsp[0].lexer.charset) ? (yyvsp[0].lexer.charset) : YYTHD->variables.collation_database);
           }
-#line 33926 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34108 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1203:
-#line 8971 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1206:
+#line 9043 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_action)= NEW_PTN PT_alter_table_force;
           }
-#line 33934 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34116 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1204:
-#line 8975 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1207:
+#line 9047 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_action)= NEW_PTN PT_alter_table_order((yyvsp[0].order_list));
           }
-#line 33942 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34124 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1205:
-#line 8982 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1208:
+#line 9054 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.algo_and_lock_and_validation).init();
             (yyval.algo_and_lock_and_validation).algo.set((yyvsp[0].alter_table_algorithm));
           }
-#line 33951 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34133 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1206:
-#line 8987 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1209:
+#line 9059 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.algo_and_lock_and_validation).init();
             (yyval.algo_and_lock_and_validation).lock.set((yyvsp[0].alter_table_lock));
           }
-#line 33960 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34142 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1207:
-#line 8992 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1210:
+#line 9064 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.algo_and_lock_and_validation).init();
             (yyval.algo_and_lock_and_validation).validation.set((yyvsp[0].with_validation));
           }
-#line 33969 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34151 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1208:
-#line 8999 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1211:
+#line 9071 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.opt_index_lock_and_algorithm).init(); }
-#line 33975 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34157 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1209:
-#line 9001 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1212:
+#line 9073 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.opt_index_lock_and_algorithm).init();
             (yyval.opt_index_lock_and_algorithm).lock.set((yyvsp[0].alter_table_lock));
           }
-#line 33984 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34166 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1210:
-#line 9006 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1213:
+#line 9078 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.opt_index_lock_and_algorithm).init();
             (yyval.opt_index_lock_and_algorithm).algo.set((yyvsp[0].alter_table_algorithm));
           }
-#line 33993 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34175 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1211:
-#line 9011 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1214:
+#line 9083 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.opt_index_lock_and_algorithm).init();
             (yyval.opt_index_lock_and_algorithm).lock.set((yyvsp[-1].alter_table_lock));
             (yyval.opt_index_lock_and_algorithm).algo.set((yyvsp[0].alter_table_algorithm));
           }
-#line 34003 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34185 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1212:
-#line 9017 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1215:
+#line 9089 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.opt_index_lock_and_algorithm).init();
             (yyval.opt_index_lock_and_algorithm).algo.set((yyvsp[-1].alter_table_algorithm));
             (yyval.opt_index_lock_and_algorithm).lock.set((yyvsp[0].alter_table_lock));
           }
-#line 34013 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34195 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1213:
-#line 9025 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1216:
+#line 9097 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.alter_table_algorithm)= (yyvsp[0].alter_table_algorithm); }
-#line 34019 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34201 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1214:
-#line 9030 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1217:
+#line 9102 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_algorithm)= Alter_info::ALTER_TABLE_ALGORITHM_DEFAULT;
           }
-#line 34027 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34209 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1215:
-#line 9034 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1218:
+#line 9106 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if (is_identifier((yyvsp[0].lexer.lex_str), "INPLACE"))
               (yyval.alter_table_algorithm)= Alter_info::ALTER_TABLE_ALGORITHM_INPLACE;
@@ -34041,25 +34223,25 @@
               MYSQL_YYABORT;
             }
           }
-#line 34045 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34227 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1216:
-#line 9050 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1219:
+#line 9122 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.alter_table_lock)= (yyvsp[0].alter_table_lock); }
-#line 34051 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34233 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1217:
-#line 9055 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1220:
+#line 9127 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_table_lock)= Alter_info::ALTER_TABLE_LOCK_DEFAULT;
           }
-#line 34059 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34241 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1218:
-#line 9059 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1221:
+#line 9131 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if (is_identifier((yyvsp[0].lexer.lex_str), "NONE"))
               (yyval.alter_table_lock)= Alter_info::ALTER_TABLE_LOCK_NONE;
@@ -34073,102 +34255,102 @@
               MYSQL_YYABORT;
             }
           }
-#line 34077 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34259 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1221:
-#line 9080 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1224:
+#line 9152 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.is_not_empty)= false; }
-#line 34083 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34265 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1222:
-#line 9081 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1225:
+#line 9153 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.is_not_empty)= true; }
-#line 34089 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34271 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1223:
-#line 9085 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1226:
+#line 9157 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.opt_restrict)= DROP_DEFAULT; }
-#line 34095 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34277 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1224:
-#line 9086 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1227:
+#line 9158 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.opt_restrict)= DROP_RESTRICT; }
-#line 34101 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34283 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1225:
-#line 9087 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1228:
+#line 9159 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.opt_restrict)= DROP_CASCADE; }
-#line 34107 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34289 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1226:
-#line 9091 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1229:
+#line 9163 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.c_str)= NULL; }
-#line 34113 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34295 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1227:
-#line 9092 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1230:
+#line 9164 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.c_str)= (yyvsp[0].lexer.lex_str).str; }
-#line 34119 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34301 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1228:
-#line 9093 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1231:
+#line 9165 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.c_str)= first_keyword; }
-#line 34125 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34307 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1229:
-#line 9097 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1232:
+#line 9169 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 34131 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34313 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1230:
-#line 9098 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1233:
+#line 9170 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 34137 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34319 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1231:
-#line 9099 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1234:
+#line 9171 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 34143 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34325 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1232:
-#line 9100 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1235:
+#line 9172 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 34149 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34331 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1234:
-#line 9106 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1237:
+#line 9178 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex = Lex;
             lex->sql_command = SQLCOM_STOP_GROUP_REPLICATION;
           }
-#line 34158 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34340 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1235:
-#line 9114 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1238:
+#line 9186 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex = Lex;
             lex->slave_connection.reset();
             lex->sql_command = SQLCOM_START_GROUP_REPLICATION;
           }
-#line 34168 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34350 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1243:
-#line 9139 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1246:
+#line 9211 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->slave_connection.user = (yyvsp[0].lexer.lex_str).str;
             if ((yyvsp[0].lexer.lex_str).length == 0)
@@ -34177,11 +34359,11 @@
               MYSQL_YYABORT;
             }
           }
-#line 34181 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34363 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1244:
-#line 9151 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1247:
+#line 9223 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->slave_connection.password = (yyvsp[0].lexer.lex_str).str;
             Lex->contains_plaintext_password = true;
@@ -34191,25 +34373,25 @@
               MYSQL_YYABORT;
             }
           }
-#line 34195 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34377 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1245:
-#line 9164 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1248:
+#line 9236 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->slave_connection.plugin_auth= (yyvsp[0].lexer.lex_str).str;
           }
-#line 34203 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34385 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1246:
-#line 9170 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1249:
+#line 9242 "sql_yacc.yy" /* yacc.c:1646  */
     { Lex->set_replication_deprecated_syntax_used(); }
-#line 34209 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34391 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1248:
-#line 9176 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1251:
+#line 9248 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex=Lex;
             lex->sql_command = SQLCOM_SLAVE_STOP;
@@ -34220,11 +34402,11 @@
             if (lex->set_channel_name((yyvsp[0].lex_cstr)))
               MYSQL_YYABORT;  // OOM
           }
-#line 34224 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34406 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1249:
-#line 9190 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1252:
+#line 9262 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex=Lex;
             /* Clean previous replica connection values */
@@ -34237,11 +34419,11 @@
             if (lex->is_replication_deprecated_syntax_used())
               push_deprecated_warn(YYTHD, "START SLAVE", "START REPLICA");
           }
-#line 34241 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34423 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1250:
-#line 9205 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1253:
+#line 9277 "sql_yacc.yy" /* yacc.c:1646  */
     {
             /*
               It is not possible to set user's information when
@@ -34258,20 +34440,20 @@
               MYSQL_YYABORT;
             }
           }
-#line 34262 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34444 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1251:
-#line 9222 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1254:
+#line 9294 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if (Lex->set_channel_name((yyvsp[0].lex_cstr)))
               MYSQL_YYABORT;  // OOM
           }
-#line 34271 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34453 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1252:
-#line 9230 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1255:
+#line 9302 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_BEGIN;
@@ -34284,189 +34466,189 @@
             }
             lex->start_transaction_opt= (yyvsp[0].num);
           }
-#line 34288 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34470 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1253:
-#line 9246 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1256:
+#line 9318 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.num)= 0;
           }
-#line 34296 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34478 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1254:
-#line 9250 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1257:
+#line 9322 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.num)= (yyvsp[0].num);
           }
-#line 34304 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34486 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1255:
-#line 9257 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1258:
+#line 9329 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.num)= (yyvsp[0].num);
           }
-#line 34312 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34494 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1256:
-#line 9261 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1259:
+#line 9333 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.num)= (yyvsp[-2].num) | (yyvsp[0].num);
           }
-#line 34320 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34502 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1257:
-#line 9268 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1260:
+#line 9340 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.num)= MYSQL_START_TRANS_OPT_WITH_CONS_SNAPSHOT;
           }
-#line 34328 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34510 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1258:
-#line 9272 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1261:
+#line 9344 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.num)= MYSQL_START_TRANS_OPT_READ_ONLY;
           }
-#line 34336 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34518 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1259:
-#line 9276 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1262:
+#line 9348 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.num)= MYSQL_START_TRANS_OPT_READ_WRITE;
           }
-#line 34344 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34526 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1260:
-#line 9282 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1263:
+#line 9354 "sql_yacc.yy" /* yacc.c:1646  */
     {
             /* empty */
           }
-#line 34352 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34534 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1261:
-#line 9286 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1264:
+#line 9358 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->slave_connection.user= (yyvsp[0].lexer.lex_str).str;
           }
-#line 34360 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34542 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1262:
-#line 9292 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1265:
+#line 9364 "sql_yacc.yy" /* yacc.c:1646  */
     {
             /* empty */
           }
-#line 34368 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34550 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1263:
-#line 9296 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1266:
+#line 9368 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->slave_connection.password= (yyvsp[0].lexer.lex_str).str;
             Lex->contains_plaintext_password= true;
           }
-#line 34377 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34559 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1264:
-#line 9302 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1267:
+#line 9374 "sql_yacc.yy" /* yacc.c:1646  */
     {
             /* empty */
           }
-#line 34385 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34567 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1265:
-#line 9306 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1268:
+#line 9378 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->slave_connection.plugin_auth= (yyvsp[0].lexer.lex_str).str;
           }
-#line 34393 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34575 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1266:
-#line 9312 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1269:
+#line 9384 "sql_yacc.yy" /* yacc.c:1646  */
     {
             /* empty */
           }
-#line 34401 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34583 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1267:
-#line 9316 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1270:
+#line 9388 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->slave_connection.plugin_dir= (yyvsp[0].lexer.lex_str).str;
           }
-#line 34409 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34591 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1268:
-#line 9323 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1271:
+#line 9395 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.num)= 0;
           }
-#line 34417 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34599 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1269:
-#line 9327 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1272:
+#line 9399 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.num)= (yyvsp[0].num);
           }
-#line 34425 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34607 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1270:
-#line 9334 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1273:
+#line 9406 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.num)= (yyvsp[0].num);
           }
-#line 34433 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34615 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1271:
-#line 9338 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1274:
+#line 9410 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.num)= (yyvsp[-2].num) | (yyvsp[0].num);
           }
-#line 34441 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34623 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1272:
-#line 9345 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1275:
+#line 9417 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.num)= SLAVE_SQL;
           }
-#line 34449 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34631 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1273:
-#line 9349 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1276:
+#line 9421 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.num)= SLAVE_IO;
           }
-#line 34457 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34639 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1274:
-#line 9356 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1277:
+#line 9428 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             lex->mi.slave_until= false;
           }
-#line 34466 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34648 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1275:
-#line 9361 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1278:
+#line 9433 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex=Lex;
             if (((lex->mi.log_file_name || lex->mi.pos) &&
@@ -34488,37 +34670,37 @@
             }
             lex->mi.slave_until= true;
           }
-#line 34492 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34674 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1278:
-#line 9388 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1281:
+#line 9460 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.gtid= (yyvsp[0].lexer.lex_str).str;
             Lex->mi.gtid_until_condition= LEX_MASTER_INFO::UNTIL_SQL_BEFORE_GTIDS;
           }
-#line 34501 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34683 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1279:
-#line 9393 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1282:
+#line 9465 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.gtid= (yyvsp[0].lexer.lex_str).str;
             Lex->mi.gtid_until_condition= LEX_MASTER_INFO::UNTIL_SQL_AFTER_GTIDS;
           }
-#line 34510 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34692 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1280:
-#line 9398 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1283:
+#line 9470 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->mi.until_after_gaps= true;
           }
-#line 34518 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34700 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1281:
-#line 9405 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1284:
+#line 9477 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex=Lex;
             lex->sql_command = SQLCOM_CHECKSUM;
@@ -34529,87 +34711,87 @@
               MYSQL_YYABORT;
             Lex->check_opt.flags= (yyvsp[0].ulong_num);
           }
-#line 34533 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34715 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1282:
-#line 9418 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1285:
+#line 9490 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ulong_num)= 0; }
-#line 34539 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34721 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1283:
-#line 9419 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1286:
+#line 9491 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ulong_num)= T_QUICK; }
-#line 34545 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34727 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1284:
-#line 9420 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1287:
+#line 9492 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ulong_num)= T_EXTEND; }
-#line 34551 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34733 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1285:
-#line 9426 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1288:
+#line 9498 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_repair_table_stmt(YYMEM_ROOT, (yyvsp[-3].num), (yyvsp[-1].table_list),
                                              (yyvsp[0].mi_type).flags, (yyvsp[0].mi_type).sql_flags);
           }
-#line 34560 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34742 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1286:
-#line 9433 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1289:
+#line 9505 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.mi_type).flags = T_MEDIUM; (yyval.mi_type).sql_flags= 0; }
-#line 34566 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34748 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1289:
-#line 9440 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1292:
+#line 9512 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.mi_type).flags= (yyvsp[-1].mi_type).flags | (yyvsp[0].mi_type).flags;
             (yyval.mi_type).sql_flags= (yyvsp[-1].mi_type).sql_flags | (yyvsp[0].mi_type).sql_flags;
           }
-#line 34575 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34757 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1290:
-#line 9447 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1293:
+#line 9519 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.mi_type).flags= T_QUICK;  (yyval.mi_type).sql_flags= 0; }
-#line 34581 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34763 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1291:
-#line 9448 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1294:
+#line 9520 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.mi_type).flags= T_EXTEND; (yyval.mi_type).sql_flags= 0; }
-#line 34587 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34769 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1292:
-#line 9449 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1295:
+#line 9521 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.mi_type).flags= 0;        (yyval.mi_type).sql_flags= TT_USEFRM; }
-#line 34593 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34775 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1293:
-#line 9455 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1296:
+#line 9527 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_analyze_table_stmt(YYMEM_ROOT, (yyvsp[-3].num), (yyvsp[-1].table_list),
                                               (yyvsp[0].histogram).command, (yyvsp[0].histogram).num_buckets,
                                               (yyvsp[0].histogram).columns);
           }
-#line 34603 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34785 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1294:
-#line 9463 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1297:
+#line 9535 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= DEFAULT_NUMBER_OF_HISTOGRAM_BUCKETS; }
-#line 34609 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34791 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1295:
-#line 9465 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1298:
+#line 9537 "sql_yacc.yy" /* yacc.c:1646  */
     {
             int error;
             longlong num= my_strtoll10((yyvsp[-1].lexer.lex_str).str, nullptr, &error);
@@ -34624,178 +34806,178 @@
 
             (yyval.num)= num;
           }
-#line 34628 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34810 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1296:
-#line 9483 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1299:
+#line 9555 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.histogram).command= Sql_cmd_analyze_table::Histogram_command::NONE;
             (yyval.histogram).columns= nullptr;
             (yyval.histogram).num_buckets= 0;
           }
-#line 34638 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34820 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1297:
-#line 9489 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1300:
+#line 9561 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.histogram).command=
               Sql_cmd_analyze_table::Histogram_command::UPDATE_HISTOGRAM;
             (yyval.histogram).columns= (yyvsp[-1].string_list);
             (yyval.histogram).num_buckets= (yyvsp[0].num);
           }
-#line 34649 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34831 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1298:
-#line 9496 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1301:
+#line 9568 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.histogram).command=
               Sql_cmd_analyze_table::Histogram_command::DROP_HISTOGRAM;
             (yyval.histogram).columns= (yyvsp[0].string_list);
             (yyval.histogram).num_buckets= 0;
           }
-#line 34660 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34842 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1299:
-#line 9506 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1302:
+#line 9578 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->sql_command = SQLCOM_BINLOG_BASE64_EVENT;
             Lex->binlog_stmt_arg= (yyvsp[0].lexer.lex_str);
           }
-#line 34669 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34851 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1300:
-#line 9514 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1303:
+#line 9586 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_check_table_stmt(YYMEM_ROOT, (yyvsp[-1].table_list),
                                             (yyvsp[0].mi_type).flags, (yyvsp[0].mi_type).sql_flags);
           }
-#line 34678 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34860 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1301:
-#line 9521 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1304:
+#line 9593 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.mi_type).flags = T_MEDIUM; (yyval.mi_type).sql_flags= 0; }
-#line 34684 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34866 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1304:
-#line 9528 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1307:
+#line 9600 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.mi_type).flags= (yyvsp[-1].mi_type).flags | (yyvsp[0].mi_type).flags;
             (yyval.mi_type).sql_flags= (yyvsp[-1].mi_type).sql_flags | (yyvsp[0].mi_type).sql_flags;
           }
-#line 34693 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34875 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1305:
-#line 9536 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1308:
+#line 9608 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.mi_type).flags= T_QUICK;              (yyval.mi_type).sql_flags= 0; }
-#line 34699 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34881 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1306:
-#line 9538 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1309:
+#line 9610 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.mi_type).flags= T_FAST;               (yyval.mi_type).sql_flags= 0; }
-#line 34705 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34887 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1307:
-#line 9540 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1310:
+#line 9612 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.mi_type).flags= T_MEDIUM;             (yyval.mi_type).sql_flags= 0; }
-#line 34711 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34893 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1308:
-#line 9542 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1311:
+#line 9614 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.mi_type).flags= T_EXTEND;             (yyval.mi_type).sql_flags= 0; }
-#line 34717 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34899 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1309:
-#line 9544 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1312:
+#line 9616 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.mi_type).flags= T_CHECK_ONLY_CHANGED; (yyval.mi_type).sql_flags= 0; }
-#line 34723 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34905 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1310:
-#line 9546 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1313:
+#line 9618 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.mi_type).flags= 0;                    (yyval.mi_type).sql_flags= TT_FOR_UPGRADE; }
-#line 34729 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34911 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1311:
-#line 9551 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1314:
+#line 9623 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_optimize_table_stmt(YYMEM_ROOT, (yyvsp[-2].num), (yyvsp[0].table_list));
           }
-#line 34737 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34919 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1312:
-#line 9557 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1315:
+#line 9629 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= 0; }
-#line 34743 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34925 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1313:
-#line 9558 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1316:
+#line 9630 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= 1; }
-#line 34749 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34931 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1314:
-#line 9559 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1317:
+#line 9631 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= 1; }
-#line 34755 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34937 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1315:
-#line 9564 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1318:
+#line 9636 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->sql_command= SQLCOM_RENAME_TABLE;
           }
-#line 34763 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34945 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1316:
-#line 9568 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1319:
+#line 9640 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 34769 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34951 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1317:
-#line 9570 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1320:
+#line 9642 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->sql_command = SQLCOM_RENAME_USER;
           }
-#line 34777 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34959 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1318:
-#line 9577 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1321:
+#line 9649 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if (Lex->users_list.push_back((yyvsp[-2].lex_user)) || Lex->users_list.push_back((yyvsp[0].lex_user)))
               MYSQL_YYABORT;
           }
-#line 34786 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34968 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1319:
-#line 9582 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1322:
+#line 9654 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if (Lex->users_list.push_back((yyvsp[-2].lex_user)) || Lex->users_list.push_back((yyvsp[0].lex_user)))
               MYSQL_YYABORT;
           }
-#line 34795 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34977 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1322:
-#line 9595 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1325:
+#line 9667 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex=Lex;
             Query_block *sl= Select;
@@ -34805,347 +34987,347 @@
                                        TL_IGNORE, MDL_EXCLUSIVE))
               MYSQL_YYABORT;
           }
-#line 34809 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34991 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1323:
-#line 9608 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1326:
+#line 9680 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_cache_index_stmt(YYMEM_ROOT, (yyvsp[-2].keycache_list), (yyvsp[0].lex_cstr));
           }
-#line 34817 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 34999 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1324:
-#line 9613 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1327:
+#line 9685 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_cache_index_partitions_stmt(YYMEM_ROOT,
                                                        (yyvsp[-4].table), (yyvsp[-3].adm_partition), (yyvsp[-2].key_usage_list), (yyvsp[0].lex_cstr));
           }
-#line 34826 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35008 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1325:
-#line 9621 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1328:
+#line 9693 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.keycache_list)= NEW_PTN Mem_root_array<PT_assign_to_keycache *>(YYMEM_ROOT);
             if ((yyval.keycache_list) == NULL || (yyval.keycache_list)->push_back((yyvsp[0].assign_to_keycache)))
               MYSQL_YYABORT; // OOM
           }
-#line 34836 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35018 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1326:
-#line 9627 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1329:
+#line 9699 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.keycache_list)= (yyvsp[-2].keycache_list);
             if ((yyval.keycache_list)->push_back((yyvsp[0].assign_to_keycache)))
               MYSQL_YYABORT; // OOM
           }
-#line 34846 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35028 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1327:
-#line 9636 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1330:
+#line 9708 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.assign_to_keycache)= NEW_PTN PT_assign_to_keycache((yyvsp[-1].table), (yyvsp[0].key_usage_list));
           }
-#line 34854 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35036 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1328:
-#line 9642 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1331:
+#line 9714 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lex_cstr)= to_lex_cstring((yyvsp[0].lexer.lex_str)); }
-#line 34860 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35042 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1329:
-#line 9643 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1332:
+#line 9715 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lex_cstr) = default_key_cache_base; }
-#line 34866 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35048 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1330:
-#line 9649 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1333:
+#line 9721 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_load_index_partitions_stmt(YYMEM_ROOT, (yyvsp[-3].table),(yyvsp[-2].adm_partition), (yyvsp[-1].key_usage_list), (yyvsp[0].is_not_empty));
           }
-#line 34874 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35056 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1331:
-#line 9653 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1334:
+#line 9725 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_load_index_stmt(YYMEM_ROOT, (yyvsp[0].preload_list));
           }
-#line 34882 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35064 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1332:
-#line 9660 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1335:
+#line 9732 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.preload_list)= NEW_PTN Mem_root_array<PT_preload_keys *>(YYMEM_ROOT);
             if ((yyval.preload_list)->push_back((yyvsp[0].preload_keys)))
               MYSQL_YYABORT; // OOM
           }
-#line 34892 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35074 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1333:
-#line 9666 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1336:
+#line 9738 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.preload_list)= (yyvsp[-2].preload_list);
             if ((yyval.preload_list) == NULL || (yyval.preload_list)->push_back((yyvsp[0].preload_keys)))
               MYSQL_YYABORT; // OOM
           }
-#line 34902 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35084 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1334:
-#line 9675 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1337:
+#line 9747 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.preload_keys)= NEW_PTN PT_preload_keys((yyvsp[-2].table), (yyvsp[-1].key_usage_list), (yyvsp[0].is_not_empty));
           }
-#line 34910 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35092 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1335:
-#line 9682 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1338:
+#line 9754 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.adm_partition)= NEW_PTN PT_adm_partition((yyvsp[-1].string_list));
           }
-#line 34918 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35100 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1336:
-#line 9688 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1339:
+#line 9760 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.key_usage_list)= NULL; }
-#line 34924 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35106 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1337:
-#line 9690 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1340:
+#line 9762 "sql_yacc.yy" /* yacc.c:1646  */
     {
             init_index_hints((yyvsp[-1].key_usage_list), INDEX_HINT_USE,
                              old_mode ? INDEX_HINT_MASK_JOIN
                                       : INDEX_HINT_MASK_ALL);
             (yyval.key_usage_list)= (yyvsp[-1].key_usage_list);
           }
-#line 34935 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35117 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1338:
-#line 9699 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1341:
+#line 9771 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.is_not_empty)= false; }
-#line 34941 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35123 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1339:
-#line 9700 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1342:
+#line 9772 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.is_not_empty)= true; }
-#line 34947 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35129 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1340:
-#line 9705 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1343:
+#line 9777 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_select_stmt((yyvsp[0].query_expression));
           }
-#line 34955 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35137 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1341:
-#line 9709 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1344:
+#line 9781 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_select_stmt(NEW_PTN PT_locking((yyvsp[-1].query_expression), (yyvsp[0].locking_clause_list)),
                                         nullptr, true);
           }
-#line 34964 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35146 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1342:
-#line 9714 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1345:
+#line 9786 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_select_stmt((yyvsp[0].query_primary));
           }
-#line 34972 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35154 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1344:
-#line 9754 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1347:
+#line 9826 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = (yyvsp[-1].top_level_node);
           }
-#line 34980 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35162 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1345:
-#line 9758 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1348:
+#line 9830 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_select_stmt((yyvsp[-1].query_expression), (yyvsp[0].into_destination));
           }
-#line 34988 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35170 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1346:
-#line 9762 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1349:
+#line 9834 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_select_stmt(NEW_PTN PT_locking((yyvsp[-2].query_expression), (yyvsp[0].locking_clause_list)), (yyvsp[-1].into_destination), true);
           }
-#line 34996 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35178 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1347:
-#line 9766 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1350:
+#line 9838 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_select_stmt(NEW_PTN PT_locking((yyvsp[-2].query_expression), (yyvsp[-1].locking_clause_list)), (yyvsp[0].into_destination));
           }
-#line 35004 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35186 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1348:
-#line 9770 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1351:
+#line 9842 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_select_stmt((yyvsp[-1].query_primary), (yyvsp[0].into_destination));
           }
-#line 35012 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35194 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1349:
-#line 9811 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1352:
+#line 9883 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.query_expression) = NEW_PTN PT_query_expression((yyvsp[-2].query_expression_body), (yyvsp[-1].order), (yyvsp[0].limit_clause));
           }
-#line 35020 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35202 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1350:
-#line 9818 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1353:
+#line 9890 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.query_expression)= NEW_PTN PT_query_expression((yyvsp[-3].with_clause), (yyvsp[-2].query_expression_body), (yyvsp[-1].order), (yyvsp[0].limit_clause));
           }
-#line 35028 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35210 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1351:
-#line 9824 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1354:
+#line 9896 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.query_expression)= NEW_PTN PT_query_expression((yyvsp[-2].query_primary), (yyvsp[-1].order), (yyvsp[0].limit_clause));
           }
-#line 35036 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35218 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1352:
-#line 9831 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1355:
+#line 9903 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.query_expression)= NEW_PTN PT_query_expression((yyvsp[-3].with_clause), (yyvsp[-2].query_primary), (yyvsp[-1].order), (yyvsp[0].limit_clause));
           }
-#line 35044 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35226 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1353:
-#line 9836 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1356:
+#line 9908 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.query_expression) = NEW_PTN PT_query_expression((yyvsp[-1].query_primary), nullptr, (yyvsp[0].limit_clause));
           }
-#line 35052 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35234 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1354:
-#line 9842 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1357:
+#line 9914 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.query_expression) = NEW_PTN PT_query_expression((yyvsp[-2].with_clause), (yyvsp[-1].query_primary), nullptr, (yyvsp[0].limit_clause));
           }
-#line 35060 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35242 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1355:
-#line 9847 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1358:
+#line 9919 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.query_expression) = NEW_PTN PT_query_expression((yyvsp[-1].with_clause), (yyvsp[0].query_primary), nullptr, nullptr);
           }
-#line 35068 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35250 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1356:
-#line 9854 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1359:
+#line 9926 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.query_expression_body) = (yyvsp[0].query_primary);
           }
-#line 35076 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35258 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1357:
-#line 9858 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1360:
+#line 9930 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.query_expression_body) = NEW_PTN PT_union((yyvsp[-3].query_expression_body), (yylsp[-3]), (yyvsp[-1].num), (yyvsp[0].query_primary));
           }
-#line 35084 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35266 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1358:
-#line 9862 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1361:
+#line 9934 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.query_expression_body) = NEW_PTN PT_union((yyvsp[-3].query_primary), (yylsp[-3]), (yyvsp[-1].num), (yyvsp[0].query_primary));
           }
-#line 35092 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35274 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1359:
-#line 9866 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1362:
+#line 9938 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.query_expression_body) = NEW_PTN PT_union((yyvsp[-3].query_expression_body), (yylsp[-3]), (yyvsp[-1].num), (yyvsp[0].query_primary), true);
           }
-#line 35100 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35282 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1360:
-#line 9870 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1363:
+#line 9942 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.query_expression_body) = NEW_PTN PT_union((yyvsp[-3].query_primary), (yylsp[-3]), (yyvsp[-1].num), (yyvsp[0].query_primary), true);
           }
-#line 35108 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35290 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1361:
-#line 9877 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1364:
+#line 9949 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.query_primary)= (yyvsp[-1].query_primary); }
-#line 35114 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35296 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1362:
-#line 9878 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1365:
+#line 9950 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.query_primary)= (yyvsp[-1].query_expression); }
-#line 35120 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35302 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1363:
-#line 9880 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1366:
+#line 9952 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.query_primary) = NEW_PTN PT_locking((yyvsp[-2].query_expression), (yyvsp[-1].locking_clause_list));
           }
-#line 35128 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35310 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1364:
-#line 9887 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1367:
+#line 9959 "sql_yacc.yy" /* yacc.c:1646  */
     {
             // Bison doesn't get polymorphism.
             (yyval.query_primary)= (yyvsp[0].query_primary);
           }
-#line 35137 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35319 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1365:
-#line 9892 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1368:
+#line 9964 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.query_primary)= NEW_PTN PT_table_value_constructor((yyvsp[0].values_list));
           }
-#line 35145 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35327 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1366:
-#line 9896 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1369:
+#line 9968 "sql_yacc.yy" /* yacc.c:1646  */
     {
             auto item_list= NEW_PTN PT_select_item_list;
             auto asterisk= NEW_PTN Item_asterisk((yyloc), nullptr, nullptr);
@@ -35154,11 +35336,11 @@
               MYSQL_YYABORT;
             (yyval.query_primary)= NEW_PTN PT_explicit_table({}, item_list, (yyvsp[0].table_reference_list));
           }
-#line 35158 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35340 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1367:
-#line 9916 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1370:
+#line 9988 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.query_primary)= NEW_PTN PT_query_specification(
                                       (yyvsp[-8].lexer.optimizer_hints),  // SELECT_SYM
@@ -35172,11 +35354,11 @@
                                       (yyvsp[0].windows),  // windows
                                       (yylsp[-4]).raw.is_empty()); // implicit FROM
           }
-#line 35176 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35358 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1368:
-#line 9937 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1371:
+#line 10009 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.query_primary)= NEW_PTN PT_query_specification(
                                       (yyvsp[-7].lexer.optimizer_hints),  // SELECT_SYM
@@ -35190,57 +35372,57 @@
                                       (yyvsp[0].windows),  // windows
                                       (yylsp[-4]).raw.is_empty()); // implicit FROM
           }
-#line 35194 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35376 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1369:
-#line 9953 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1372:
+#line 10025 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.table_reference_list).init(YYMEM_ROOT); }
-#line 35200 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35382 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1371:
-#line 9958 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1374:
+#line 10030 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.table_reference_list)= (yyvsp[0].table_reference_list); }
-#line 35206 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35388 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1372:
-#line 9962 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1375:
+#line 10034 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.table_reference_list).init(YYMEM_ROOT); }
-#line 35212 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35394 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1374:
-#line 9968 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1377:
+#line 10040 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.table_reference_list).init(YYMEM_ROOT);
             if ((yyval.table_reference_list).push_back((yyvsp[0].table_reference)))
               MYSQL_YYABORT; // OOM
           }
-#line 35222 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35404 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1375:
-#line 9974 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1378:
+#line 10046 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.table_reference_list)= (yyvsp[-2].table_reference_list);
             if ((yyval.table_reference_list).push_back((yyvsp[0].table_reference)))
               MYSQL_YYABORT; // OOM
           }
-#line 35232 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35414 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1376:
-#line 9983 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1379:
+#line 10055 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.values_list)= (yyvsp[0].values_list);
           }
-#line 35240 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35422 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1377:
-#line 9990 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1380:
+#line 10062 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.table_reference_list).init(YYMEM_ROOT);
             auto table= NEW_PTN
@@ -35248,322 +35430,322 @@
             if ((yyval.table_reference_list).push_back(table))
               MYSQL_YYABORT; // OOM
           }
-#line 35252 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35434 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1378:
-#line 10001 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1381:
+#line 10073 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.select_options).query_spec_options= 0;
           }
-#line 35260 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35442 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1380:
-#line 10009 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1383:
+#line 10081 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyval.select_options).merge((yyvsp[-1].select_options), (yyvsp[0].select_options)))
               MYSQL_YYABORT;
           }
-#line 35269 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35451 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1382:
-#line 10018 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1385:
+#line 10090 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.select_options).query_spec_options= (yyvsp[0].ulonglong_number);
           }
-#line 35277 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35459 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1383:
-#line 10022 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1386:
+#line 10094 "sql_yacc.yy" /* yacc.c:1646  */
     {
             push_deprecated_warn_no_replacement(YYTHD, "SQL_NO_CACHE");
             /* Ignored since MySQL 8.0. */
             (yyval.select_options).query_spec_options= 0;
           }
-#line 35287 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35469 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1384:
-#line 10031 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1387:
+#line 10103 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.locking_clause_list)= (yyvsp[-1].locking_clause_list);
             if ((yyval.locking_clause_list)->push_back((yyvsp[0].locking_clause)))
               MYSQL_YYABORT; // OOM
           }
-#line 35297 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35479 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1385:
-#line 10037 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1388:
+#line 10109 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.locking_clause_list)= NEW_PTN PT_locking_clause_list(YYTHD->mem_root);
             if ((yyval.locking_clause_list) == nullptr || (yyval.locking_clause_list)->push_back((yyvsp[0].locking_clause)))
               MYSQL_YYABORT; // OOM
           }
-#line 35307 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35489 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1386:
-#line 10046 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1389:
+#line 10118 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.locking_clause)= NEW_PTN PT_query_block_locking_clause((yyvsp[-1].lock_strength), (yyvsp[0].locked_row_action));
           }
-#line 35315 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35497 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1387:
-#line 10050 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1390:
+#line 10122 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.locking_clause)= NEW_PTN PT_table_locking_clause((yyvsp[-2].lock_strength), (yyvsp[-1].table_ident_list), (yyvsp[0].locked_row_action));
           }
-#line 35323 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35505 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1388:
-#line 10054 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1391:
+#line 10126 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.locking_clause)= NEW_PTN PT_query_block_locking_clause(Lock_strength::SHARE);
           }
-#line 35331 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35513 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1389:
-#line 10060 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1392:
+#line 10132 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lock_strength)= Lock_strength::UPDATE; }
-#line 35337 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35519 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1390:
-#line 10061 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1393:
+#line 10133 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lock_strength)= Lock_strength::SHARE; }
-#line 35343 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35525 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1391:
-#line 10065 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1394:
+#line 10137 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.table_ident_list)= (yyvsp[0].table_ident_list); }
-#line 35349 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35531 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1392:
-#line 10069 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1395:
+#line 10141 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.locked_row_action)= Locked_row_action::WAIT; }
-#line 35355 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35537 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1394:
-#line 10074 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1397:
+#line 10146 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.locked_row_action)= Locked_row_action::SKIP; }
-#line 35361 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35543 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1395:
-#line 10075 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1398:
+#line 10147 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.locked_row_action)= Locked_row_action::NOWAIT; }
-#line 35367 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35549 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1396:
-#line 10080 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1399:
+#line 10152 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyvsp[-2].item_list2) == NULL || (yyvsp[-2].item_list2)->push_back((yyvsp[0].item)))
               MYSQL_YYABORT;
             (yyval.item_list2)= (yyvsp[-2].item_list2);
           }
-#line 35377 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35559 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1397:
-#line 10086 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1400:
+#line 10158 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item_list2)= NEW_PTN PT_select_item_list;
             if ((yyval.item_list2) == NULL || (yyval.item_list2)->push_back((yyvsp[0].item)))
               MYSQL_YYABORT;
           }
-#line 35387 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35569 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1398:
-#line 10092 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1401:
+#line 10164 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Item *item = NEW_PTN Item_asterisk((yyloc), nullptr, nullptr);
             (yyval.item_list2) = NEW_PTN PT_select_item_list;
             if ((yyval.item_list2) == nullptr || item == nullptr || (yyval.item_list2)->push_back(item))
               MYSQL_YYABORT;
           }
-#line 35398 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35580 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1399:
-#line 10101 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1402:
+#line 10173 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.item)= (yyvsp[0].item); }
-#line 35404 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35586 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1400:
-#line 10103 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1403:
+#line 10175 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN PTI_expr_with_alias((yyloc), (yyvsp[-1].item), (yylsp[-1]).cpp, to_lex_cstring((yyvsp[0].lexer.lex_str)));
           }
-#line 35412 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35594 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1401:
-#line 10110 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1404:
+#line 10182 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lexer.lex_str)=null_lex_str;}
-#line 35418 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35600 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1402:
-#line 10111 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1405:
+#line 10183 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lexer.lex_str)=(yyvsp[0].lexer.lex_str); }
-#line 35424 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35606 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1403:
-#line 10112 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1406:
+#line 10184 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lexer.lex_str)=(yyvsp[0].lexer.lex_str); }
-#line 35430 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35612 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1404:
-#line 10113 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1407:
+#line 10185 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lexer.lex_str)=(yyvsp[0].lexer.lex_str); }
-#line 35436 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35618 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1405:
-#line 10114 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1408:
+#line 10186 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lexer.lex_str)=(yyvsp[0].lexer.lex_str); }
-#line 35442 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35624 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1406:
-#line 10118 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1409:
+#line 10190 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 35448 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35630 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1407:
-#line 10119 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1410:
+#line 10191 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 35454 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35636 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1408:
-#line 10125 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1411:
+#line 10197 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= flatten_associative_operator<Item_cond_or,
                                              Item_func::COND_OR_FUNC>(
                                                  YYMEM_ROOT, (yyloc), (yyvsp[-2].item), (yyvsp[0].item));
           }
-#line 35464 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35646 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1409:
-#line 10131 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1412:
+#line 10203 "sql_yacc.yy" /* yacc.c:1646  */
     {
             /* XOR is a proprietary extension */
             (yyval.item) = NEW_PTN Item_func_xor((yyloc), (yyvsp[-2].item), (yyvsp[0].item));
           }
-#line 35473 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35655 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1410:
-#line 10136 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1413:
+#line 10208 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= flatten_associative_operator<Item_cond_and,
                                              Item_func::COND_AND_FUNC>(
                                                  YYMEM_ROOT, (yyloc), (yyvsp[-2].item), (yyvsp[0].item));
           }
-#line 35483 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35665 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1411:
-#line 10142 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1414:
+#line 10214 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN PTI_truth_transform((yyloc), (yyvsp[0].item), Item::BOOL_NEGATED);
           }
-#line 35491 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35673 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1412:
-#line 10146 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1415:
+#line 10218 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN PTI_truth_transform((yyloc), (yyvsp[-2].item), Item::BOOL_IS_TRUE);
           }
-#line 35499 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35681 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1413:
-#line 10150 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1416:
+#line 10222 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN PTI_truth_transform((yyloc), (yyvsp[-3].item), Item::BOOL_NOT_TRUE);
           }
-#line 35507 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35689 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1414:
-#line 10154 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1417:
+#line 10226 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN PTI_truth_transform((yyloc), (yyvsp[-2].item), Item::BOOL_IS_FALSE);
           }
-#line 35515 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35697 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1415:
-#line 10158 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1418:
+#line 10230 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN PTI_truth_transform((yyloc), (yyvsp[-3].item), Item::BOOL_NOT_FALSE);
           }
-#line 35523 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35705 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1416:
-#line 10162 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1419:
+#line 10234 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_isnull((yyloc), (yyvsp[-2].item));
           }
-#line 35531 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35713 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1417:
-#line 10166 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1420:
+#line 10238 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_isnotnull((yyloc), (yyvsp[-3].item));
           }
-#line 35539 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35721 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1419:
-#line 10174 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1422:
+#line 10246 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_isnull((yyloc), (yyvsp[-2].item));
           }
-#line 35547 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35729 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1420:
-#line 10178 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1423:
+#line 10250 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_isnotnull((yyloc), (yyvsp[-3].item));
           }
-#line 35555 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35737 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1421:
-#line 10182 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1424:
+#line 10254 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN PTI_comp_op((yyloc), (yyvsp[-2].item), (yyvsp[-1].boolfunc2creator), (yyvsp[0].item));
           }
-#line 35563 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35745 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1422:
-#line 10186 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1425:
+#line 10258 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyvsp[-2].boolfunc2creator) == &comp_equal_creator)
               /*
@@ -35576,55 +35758,55 @@
               YYTHD->syntax_error_at((yylsp[-2]));
             (yyval.item)= NEW_PTN PTI_comp_op_all((yyloc), (yyvsp[-3].item), (yyvsp[-2].boolfunc2creator), (yyvsp[-1].num), (yyvsp[0].subquery));
           }
-#line 35580 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35762 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1424:
-#line 10203 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1427:
+#line 10275 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_in_subselect((yyloc), (yyvsp[-2].item), (yyvsp[0].subquery));
           }
-#line 35588 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35770 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1425:
-#line 10207 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1428:
+#line 10279 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Item *item= NEW_PTN Item_in_subselect((yyloc), (yyvsp[-3].item), (yyvsp[0].subquery));
             (yyval.item)= NEW_PTN PTI_truth_transform((yyloc), item, Item::BOOL_NEGATED);
           }
-#line 35597 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35779 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1426:
-#line 10212 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1429:
+#line 10284 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN PTI_handle_sql2003_note184_exception((yyloc), (yyvsp[-4].item), true, (yyvsp[-1].item));
           }
-#line 35605 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35787 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1427:
-#line 10216 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1430:
+#line 10288 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyvsp[-1].item_list2) == NULL || (yyvsp[-1].item_list2)->push_front((yyvsp[-3].item)) || (yyvsp[-1].item_list2)->push_front((yyvsp[-6].item)))
               MYSQL_YYABORT;
 
             (yyval.item)= NEW_PTN Item_func_in((yyloc), (yyvsp[-1].item_list2), false);
           }
-#line 35616 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35798 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1428:
-#line 10223 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1431:
+#line 10295 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN PTI_handle_sql2003_note184_exception((yyloc), (yyvsp[-5].item), false, (yyvsp[-1].item));
           }
-#line 35624 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35806 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1429:
-#line 10227 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1432:
+#line 10299 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyvsp[-1].item_list2) == nullptr)
               MYSQL_YYABORT;
@@ -35633,35 +35815,35 @@
 
             (yyval.item)= NEW_PTN Item_func_in((yyloc), (yyvsp[-1].item_list2), true);
           }
-#line 35637 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35819 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1430:
-#line 10236 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1433:
+#line 10308 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_member_of((yyloc), (yyvsp[-5].item), (yyvsp[-1].item));
           }
-#line 35645 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35827 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1431:
-#line 10240 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1434:
+#line 10312 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_between((yyloc), (yyvsp[-4].item), (yyvsp[-2].item), (yyvsp[0].item), false);
           }
-#line 35653 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35835 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1432:
-#line 10244 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1435:
+#line 10316 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_between((yyloc), (yyvsp[-5].item), (yyvsp[-2].item), (yyvsp[0].item), true);
           }
-#line 35661 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35843 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1433:
-#line 10248 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1436:
+#line 10320 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Item *item1= NEW_PTN Item_func_soundex((yyloc), (yyvsp[-3].item));
             Item *item4= NEW_PTN Item_func_soundex((yyloc), (yyvsp[0].item));
@@ -35669,45 +35851,45 @@
               MYSQL_YYABORT;
             (yyval.item)= NEW_PTN Item_func_eq((yyloc), item1, item4);
           }
-#line 35673 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35855 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1434:
-#line 10256 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1437:
+#line 10328 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item) = NEW_PTN Item_func_like((yyloc), (yyvsp[-2].item), (yyvsp[0].item));
           }
-#line 35681 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35863 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1435:
-#line 10260 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1438:
+#line 10332 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item) = NEW_PTN Item_func_like((yyloc), (yyvsp[-4].item), (yyvsp[-2].item), (yyvsp[0].item));
           }
-#line 35689 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35871 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1436:
-#line 10264 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1439:
+#line 10336 "sql_yacc.yy" /* yacc.c:1646  */
     {
             auto item = NEW_PTN Item_func_like((yyloc), (yyvsp[-3].item), (yyvsp[0].item));
             (yyval.item) = NEW_PTN Item_func_not((yyloc), item);
           }
-#line 35698 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35880 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1437:
-#line 10269 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1440:
+#line 10341 "sql_yacc.yy" /* yacc.c:1646  */
     {
             auto item = NEW_PTN Item_func_like((yyloc), (yyvsp[-5].item), (yyvsp[-2].item), (yyvsp[0].item));
             (yyval.item) = NEW_PTN Item_func_not((yyloc), item);
           }
-#line 35707 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35889 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1438:
-#line 10274 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1441:
+#line 10346 "sql_yacc.yy" /* yacc.c:1646  */
     {
             auto args= NEW_PTN PT_item_list;
             args->push_back((yyvsp[-2].item));
@@ -35715,11 +35897,11 @@
 
             (yyval.item)= NEW_PTN Item_func_regexp_like((yylsp[-2]), args);
           }
-#line 35719 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35901 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1439:
-#line 10282 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1442:
+#line 10354 "sql_yacc.yy" /* yacc.c:1646  */
     {
             auto args= NEW_PTN PT_item_list;
             args->push_back((yyvsp[-3].item));
@@ -35727,393 +35909,394 @@
             Item *item= NEW_PTN Item_func_regexp_like((yyloc), args);
             (yyval.item)= NEW_PTN PTI_truth_transform((yyloc), item, Item::BOOL_NEGATED);
           }
-#line 35731 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35913 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1443:
-#line 10299 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1446:
+#line 10371 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_bit_or((yyloc), (yyvsp[-2].item), (yyvsp[0].item));
           }
-#line 35739 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35921 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1444:
-#line 10303 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1447:
+#line 10375 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_bit_and((yyloc), (yyvsp[-2].item), (yyvsp[0].item));
           }
-#line 35747 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35929 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1445:
-#line 10307 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1448:
+#line 10379 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_shift_left((yyloc), (yyvsp[-2].item), (yyvsp[0].item));
           }
-#line 35755 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35937 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1446:
-#line 10311 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1449:
+#line 10383 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_shift_right((yyloc), (yyvsp[-2].item), (yyvsp[0].item));
           }
-#line 35763 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35945 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1447:
-#line 10315 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1450:
+#line 10387 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_plus((yyloc), (yyvsp[-2].item), (yyvsp[0].item));
           }
-#line 35771 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35953 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1448:
-#line 10319 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1451:
+#line 10391 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_minus((yyloc), (yyvsp[-2].item), (yyvsp[0].item));
           }
-#line 35779 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35961 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1449:
-#line 10323 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1452:
+#line 10395 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_date_add_interval((yyloc), (yyvsp[-4].item), (yyvsp[-1].item), (yyvsp[0].interval), 0);
           }
-#line 35787 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35969 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1450:
-#line 10327 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1453:
+#line 10399 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_date_add_interval((yyloc), (yyvsp[-4].item), (yyvsp[-1].item), (yyvsp[0].interval), 1);
           }
-#line 35795 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35977 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1451:
-#line 10331 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1454:
+#line 10403 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_mul((yyloc), (yyvsp[-2].item), (yyvsp[0].item));
           }
-#line 35803 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35985 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1452:
-#line 10335 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1455:
+#line 10407 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_div((yyloc), (yyvsp[-2].item),(yyvsp[0].item));
           }
-#line 35811 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 35993 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1453:
-#line 10339 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1456:
+#line 10411 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_mod((yyloc), (yyvsp[-2].item),(yyvsp[0].item));
           }
-#line 35819 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36001 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1454:
-#line 10343 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1457:
+#line 10415 "sql_yacc.yy" /* yacc.c:1646  */
     {
-            (yyval.item)= NEW_PTN Item_func_int_div((yyloc), (yyvsp[-2].item),(yyvsp[0].item));
+            (yyval.item)= NEW_PTN Item_func_div_int((yyloc), (yyvsp[-2].item),(yyvsp[0].item));
           }
-#line 35827 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36009 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1455:
-#line 10347 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1458:
+#line 10419 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_mod((yyloc), (yyvsp[-2].item), (yyvsp[0].item));
           }
-#line 35835 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36017 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1456:
-#line 10351 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1459:
+#line 10423 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_bit_xor((yyloc), (yyvsp[-2].item), (yyvsp[0].item));
           }
-#line 35843 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36025 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1461:
-#line 10365 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1464:
+#line 10437 "sql_yacc.yy" /* yacc.c:1646  */
     {
            push_deprecated_warn(YYTHD, "&&", "AND");
          }
-#line 35851 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36033 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1464:
-#line 10376 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1467:
+#line 10448 "sql_yacc.yy" /* yacc.c:1646  */
     { push_deprecated_warn(YYTHD, "!", "NOT"); }
-#line 35857 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36039 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1466:
-#line 10381 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1469:
+#line 10453 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.boolfunc2creator) = &comp_eq_creator; }
-#line 35863 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36045 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1467:
-#line 10382 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1470:
+#line 10454 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.boolfunc2creator) = &comp_equal_creator; }
-#line 35869 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36051 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1468:
-#line 10383 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1471:
+#line 10455 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.boolfunc2creator) = &comp_ge_creator; }
-#line 35875 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36057 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1469:
-#line 10384 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1472:
+#line 10456 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.boolfunc2creator) = &comp_gt_creator; }
-#line 35881 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36063 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1470:
-#line 10385 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1473:
+#line 10457 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.boolfunc2creator) = &comp_le_creator; }
-#line 35887 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36069 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1471:
-#line 10386 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1474:
+#line 10458 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.boolfunc2creator) = &comp_lt_creator; }
-#line 35893 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36075 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1472:
-#line 10387 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1475:
+#line 10459 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.boolfunc2creator) = &comp_ne_creator; }
-#line 35899 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36081 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1473:
-#line 10391 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1476:
+#line 10463 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num) = 1; }
-#line 35905 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36087 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1474:
-#line 10392 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1477:
+#line 10464 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num) = 0; }
-#line 35911 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36093 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1480:
-#line 10402 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1483:
+#line 10474 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_set_collation((yyloc), (yyvsp[-2].item), (yyvsp[0].lexer.lex_str));
           }
-#line 35919 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36101 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1482:
-#line 10406 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1485:
+#line 10478 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.item)= (yyvsp[0].param_marker); }
-#line 35925 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36107 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1486:
-#line 10411 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1489:
+#line 10483 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_concat((yyloc), (yyvsp[-2].item), (yyvsp[0].item));
           }
-#line 35933 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36115 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1487:
-#line 10415 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1490:
+#line 10487 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= (yyvsp[0].item); // TODO: do we really want to ignore unary '+' before any kind of literals?
           }
-#line 35941 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36123 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1488:
-#line 10419 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1491:
+#line 10491 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_neg((yyloc), (yyvsp[0].item));
           }
-#line 35949 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36131 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1489:
-#line 10423 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1492:
+#line 10495 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_bit_neg((yyloc), (yyvsp[0].item));
           }
-#line 35957 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36139 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1490:
-#line 10427 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1493:
+#line 10499 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN PTI_truth_transform((yyloc), (yyvsp[0].item), Item::BOOL_NEGATED);
           }
-#line 35965 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36147 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1491:
-#line 10431 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1494:
+#line 10503 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN PTI_singlerow_subselect((yyloc), (yyvsp[0].subquery));
           }
-#line 35973 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36155 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1492:
-#line 10434 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1495:
+#line 10506 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.item)= (yyvsp[-1].item); }
-#line 35979 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36161 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1493:
-#line 10436 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1496:
+#line 10508 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_row((yyloc), (yyvsp[-3].item), (yyvsp[-1].item_list2)->value);
           }
-#line 35987 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36169 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1494:
-#line 10440 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1497:
+#line 10512 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_row((yyloc), (yyvsp[-3].item), (yyvsp[-1].item_list2)->value);
           }
-#line 35995 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36177 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1495:
-#line 10444 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1498:
+#line 10516 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN PTI_exists_subselect((yyloc), (yyvsp[0].subquery));
           }
-#line 36003 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36185 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1496:
-#line 10448 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1499:
+#line 10520 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN PTI_odbc_date((yyloc), (yyvsp[-2].lexer.lex_str), (yyvsp[-1].item));
           }
-#line 36011 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36193 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1497:
-#line 10452 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1500:
+#line 10524 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_match((yyloc), (yyvsp[-5].item_list2), (yyvsp[-2].item), (yyvsp[-1].num));
           }
-#line 36019 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36201 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1498:
-#line 10456 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1501:
+#line 10528 "sql_yacc.yy" /* yacc.c:1646  */
     {
+            push_deprecated_warn(YYTHD, "BINARY expr", "CAST");
             (yyval.item)= create_func_cast(YYTHD, (yylsp[0]), (yyvsp[0].item), ITEM_CAST_CHAR, &my_charset_bin);
           }
-#line 36027 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36210 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1499:
-#line 10460 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1502:
+#line 10533 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= create_func_cast(YYTHD, (yylsp[-4]), (yyvsp[-4].item), (yyvsp[-2].cast_type), (yyvsp[-1].num));
           }
-#line 36035 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36218 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1500:
-#line 10464 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1503:
+#line 10537 "sql_yacc.yy" /* yacc.c:1646  */
     {
             my_error(ER_NOT_SUPPORTED_YET, MYF(0), "AT LOCAL");
           }
-#line 36043 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36226 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1501:
-#line 10469 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1504:
+#line 10542 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Cast_type cast_type{ITEM_CAST_DATETIME, nullptr, nullptr, (yyvsp[-1].c_str)};
             auto datetime_factor =
                 NEW_PTN Item_func_at_time_zone((yylsp[-9]), (yyvsp[-9].item), (yyvsp[-4].lexer.lex_str).str, (yyvsp[-5].is_not_empty));
             (yyval.item) = create_func_cast(YYTHD, (yylsp[-9]), datetime_factor, cast_type, false);
           }
-#line 36054 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36237 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1502:
-#line 10476 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1505:
+#line 10549 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_case((yyloc), (yyvsp[-2].item_list), (yyvsp[-3].item), (yyvsp[-1].item) );
           }
-#line 36062 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36245 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1503:
-#line 10480 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1506:
+#line 10553 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= create_func_cast(YYTHD, (yylsp[-3]), (yyvsp[-3].item), (yyvsp[-1].cast_type), false);
           }
-#line 36070 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36253 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1504:
-#line 10484 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1507:
+#line 10557 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_conv_charset((yyloc), (yyvsp[-3].item),(yyvsp[-1].lexer.charset));
           }
-#line 36078 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36261 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1505:
-#line 10488 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1508:
+#line 10561 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_default_value((yyloc), (yyvsp[-1].item));
           }
-#line 36086 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36269 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1506:
-#line 10492 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1509:
+#line 10565 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_insert_value((yyloc), (yyvsp[-1].item));
           }
-#line 36094 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36277 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1507:
-#line 10497 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1510:
+#line 10570 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_date_add_interval((yyloc), (yyvsp[0].item), (yyvsp[-3].item), (yyvsp[-2].interval), 0);
           }
-#line 36102 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36285 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1508:
-#line 10501 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1511:
+#line 10574 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Item_string *path=
               NEW_PTN Item_string((yyloc), (yyvsp[0].lexer.lex_str).str, (yyvsp[0].lexer.lex_str).length,
                                   YYTHD->variables.collation_connection);
             (yyval.item)= NEW_PTN Item_func_json_extract(YYTHD, (yyloc), (yyvsp[-2].item), path);
           }
-#line 36113 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36296 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1509:
-#line 10508 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1512:
+#line 10581 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Item_string *path=
               NEW_PTN Item_string((yyloc), (yyvsp[0].lexer.lex_str).str, (yyvsp[0].lexer.lex_str).length,
@@ -36121,713 +36304,713 @@
             Item *extr= NEW_PTN Item_func_json_extract(YYTHD, (yyloc), (yyvsp[-2].item), path);
             (yyval.item)= NEW_PTN Item_func_json_unquote((yyloc), extr);
           }
-#line 36125 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36308 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1510:
-#line 10518 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1513:
+#line 10591 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= false; }
-#line 36131 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36314 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1511:
-#line 10519 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1514:
+#line 10592 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= true; }
-#line 36137 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36320 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1512:
-#line 10530 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1515:
+#line 10603 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_char((yyloc), (yyvsp[-1].item_list2));
           }
-#line 36145 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36328 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1513:
-#line 10534 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1516:
+#line 10607 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_char((yyloc), (yyvsp[-3].item_list2), (yyvsp[-1].lexer.charset));
           }
-#line 36153 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36336 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1514:
-#line 10538 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1517:
+#line 10611 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_current_user((yyloc));
           }
-#line 36161 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36344 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1515:
-#line 10542 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1518:
+#line 10615 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_typecast_date((yyloc), (yyvsp[-1].item));
           }
-#line 36169 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36352 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1516:
-#line 10546 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1519:
+#line 10619 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_dayofmonth((yyloc), (yyvsp[-1].item));
           }
-#line 36177 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36360 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1517:
-#line 10550 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1520:
+#line 10623 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_hour((yyloc), (yyvsp[-1].item));
           }
-#line 36185 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36368 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1518:
-#line 10554 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1521:
+#line 10627 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_insert((yyloc), (yyvsp[-7].item), (yyvsp[-5].item), (yyvsp[-3].item), (yyvsp[-1].item));
           }
-#line 36193 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36376 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1519:
-#line 10558 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1522:
+#line 10631 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_interval((yyloc), YYMEM_ROOT, (yyvsp[-3].item), (yyvsp[-1].item));
           }
-#line 36201 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36384 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1520:
-#line 10562 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1523:
+#line 10635 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_interval((yyloc), YYMEM_ROOT, (yyvsp[-5].item), (yyvsp[-3].item), (yyvsp[-1].item_list2));
           }
-#line 36209 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36392 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1521:
-#line 10567 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1524:
+#line 10640 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= create_func_json_value(YYTHD, (yylsp[-5]), (yyvsp[-5].item), (yyvsp[-3].text_literal), (yyvsp[-2].cast_type),
                                        (yyvsp[-1].json_on_error_or_empty).empty.type, (yyvsp[-1].json_on_error_or_empty).empty.default_string,
                                        (yyvsp[-1].json_on_error_or_empty).error.type, (yyvsp[-1].json_on_error_or_empty).error.default_string);
           }
-#line 36219 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36402 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1522:
-#line 10573 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1525:
+#line 10646 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_left((yyloc), (yyvsp[-3].item), (yyvsp[-1].item));
           }
-#line 36227 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36410 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1523:
-#line 10577 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1526:
+#line 10650 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_minute((yyloc), (yyvsp[-1].item));
           }
-#line 36235 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36418 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1524:
-#line 10581 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1527:
+#line 10654 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_month((yyloc), (yyvsp[-1].item));
           }
-#line 36243 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36426 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1525:
-#line 10585 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1528:
+#line 10658 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_right((yyloc), (yyvsp[-3].item), (yyvsp[-1].item));
           }
-#line 36251 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36434 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1526:
-#line 10589 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1529:
+#line 10662 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_second((yyloc), (yyvsp[-1].item));
           }
-#line 36259 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36442 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1527:
-#line 10593 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1530:
+#line 10666 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_typecast_time((yyloc), (yyvsp[-1].item));
           }
-#line 36267 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36450 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1528:
-#line 10597 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1531:
+#line 10670 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_typecast_datetime((yyloc), (yyvsp[-1].item));
           }
-#line 36275 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36458 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1529:
-#line 10601 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1532:
+#line 10674 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_add_time((yyloc), (yyvsp[-3].item), (yyvsp[-1].item), 1, 0);
           }
-#line 36283 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36466 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1530:
-#line 10605 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1533:
+#line 10678 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_trim((yyloc), (yyvsp[-1].item),
                                        Item_func_trim::TRIM_BOTH_DEFAULT);
           }
-#line 36292 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36475 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1531:
-#line 10610 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1534:
+#line 10683 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_trim((yyloc), (yyvsp[-1].item), (yyvsp[-3].item),
                                        Item_func_trim::TRIM_LEADING);
           }
-#line 36301 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36484 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1532:
-#line 10615 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1535:
+#line 10688 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_trim((yyloc), (yyvsp[-1].item), (yyvsp[-3].item),
                                        Item_func_trim::TRIM_TRAILING);
           }
-#line 36310 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36493 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1533:
-#line 10620 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1536:
+#line 10693 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_trim((yyloc), (yyvsp[-1].item), (yyvsp[-3].item), Item_func_trim::TRIM_BOTH);
           }
-#line 36318 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36501 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1534:
-#line 10624 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1537:
+#line 10697 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_trim((yyloc), (yyvsp[-1].item), Item_func_trim::TRIM_LEADING);
           }
-#line 36326 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36509 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1535:
-#line 10628 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1538:
+#line 10701 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_trim((yyloc), (yyvsp[-1].item), Item_func_trim::TRIM_TRAILING);
           }
-#line 36334 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36517 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1536:
-#line 10632 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1539:
+#line 10705 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_trim((yyloc), (yyvsp[-1].item), Item_func_trim::TRIM_BOTH);
           }
-#line 36342 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36525 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1537:
-#line 10636 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1540:
+#line 10709 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_trim((yyloc), (yyvsp[-1].item), (yyvsp[-3].item),
                                        Item_func_trim::TRIM_BOTH_DEFAULT);
           }
-#line 36351 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36534 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1538:
-#line 10641 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1541:
+#line 10714 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_user((yyloc));
           }
-#line 36359 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36542 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1539:
-#line 10645 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1542:
+#line 10718 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_year((yyloc), (yyvsp[-1].item));
           }
-#line 36367 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36550 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1540:
-#line 10664 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1543:
+#line 10737 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_date_add_interval((yyloc), (yyvsp[-3].item), (yyvsp[-1].item), INTERVAL_DAY, 0);
           }
-#line 36375 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36558 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1541:
-#line 10668 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1544:
+#line 10741 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_date_add_interval((yyloc), (yyvsp[-5].item), (yyvsp[-2].item), (yyvsp[-1].interval), 0);
           }
-#line 36383 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36566 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1542:
-#line 10672 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1545:
+#line 10745 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_curdate_local((yyloc));
           }
-#line 36391 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36574 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1543:
-#line 10676 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1546:
+#line 10749 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_curtime_local((yyloc), static_cast<uint8>((yyvsp[0].ulong_num)));
           }
-#line 36399 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36582 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1544:
-#line 10681 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1547:
+#line 10754 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_date_add_interval((yyloc), (yyvsp[-5].item), (yyvsp[-2].item), (yyvsp[-1].interval), 0);
           }
-#line 36407 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36590 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1545:
-#line 10686 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1548:
+#line 10759 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_date_add_interval((yyloc), (yyvsp[-5].item), (yyvsp[-2].item), (yyvsp[-1].interval), 1);
           }
-#line 36415 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36598 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1546:
-#line 10690 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1549:
+#line 10763 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_extract((yyloc),  (yyvsp[-3].interval), (yyvsp[-1].item));
           }
-#line 36423 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36606 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1547:
-#line 10694 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1550:
+#line 10767 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_get_format((yyloc), (yyvsp[-3].date_time_type), (yyvsp[-1].item));
           }
-#line 36431 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36614 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1548:
-#line 10698 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1551:
+#line 10771 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN PTI_function_call_nonkeyword_now((yyloc),
               static_cast<uint8>((yyvsp[0].ulong_num)));
           }
-#line 36440 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36623 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1549:
-#line 10703 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1552:
+#line 10776 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_locate((yyloc), (yyvsp[-1].item),(yyvsp[-3].item));
           }
-#line 36448 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36631 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1550:
-#line 10707 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1553:
+#line 10780 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_date_add_interval((yyloc), (yyvsp[-3].item), (yyvsp[-1].item), INTERVAL_DAY, 1);
           }
-#line 36456 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36639 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1551:
-#line 10711 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1554:
+#line 10784 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_date_add_interval((yyloc), (yyvsp[-5].item), (yyvsp[-2].item), (yyvsp[-1].interval), 1);
           }
-#line 36464 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36647 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1552:
-#line 10715 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1555:
+#line 10788 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_substr((yyloc), (yyvsp[-5].item),(yyvsp[-3].item),(yyvsp[-1].item));
           }
-#line 36472 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36655 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1553:
-#line 10719 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1556:
+#line 10792 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_substr((yyloc), (yyvsp[-3].item),(yyvsp[-1].item));
           }
-#line 36480 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36663 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1554:
-#line 10723 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1557:
+#line 10796 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_substr((yyloc), (yyvsp[-5].item),(yyvsp[-3].item),(yyvsp[-1].item));
           }
-#line 36488 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36671 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1555:
-#line 10727 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1558:
+#line 10800 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_substr((yyloc), (yyvsp[-3].item),(yyvsp[-1].item));
           }
-#line 36496 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36679 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1556:
-#line 10731 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1559:
+#line 10804 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN PTI_function_call_nonkeyword_sysdate((yyloc),
               static_cast<uint8>((yyvsp[0].ulong_num)));
           }
-#line 36505 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36688 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1557:
-#line 10736 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1560:
+#line 10809 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_date_add_interval((yyloc), (yyvsp[-1].item), (yyvsp[-3].item), (yyvsp[-5].interval_time_st), 0);
           }
-#line 36513 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36696 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1558:
-#line 10740 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1561:
+#line 10813 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_timestamp_diff((yyloc), (yyvsp[-3].item),(yyvsp[-1].item),(yyvsp[-5].interval_time_st));
           }
-#line 36521 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36704 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1559:
-#line 10744 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1562:
+#line 10817 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_curdate_utc((yyloc));
           }
-#line 36529 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36712 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1560:
-#line 10748 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1563:
+#line 10821 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_curtime_utc((yyloc), static_cast<uint8>((yyvsp[0].ulong_num)));
           }
-#line 36537 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36720 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1561:
-#line 10752 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1564:
+#line 10825 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_now_utc((yyloc), static_cast<uint8>((yyvsp[0].ulong_num)));
           }
-#line 36545 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36728 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1562:
-#line 10762 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1565:
+#line 10835 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.cast_type)= {ITEM_CAST_CHAR, nullptr, "512", nullptr};
           }
-#line 36553 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36736 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1563:
-#line 10766 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1566:
+#line 10839 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.cast_type)= (yyvsp[0].cast_type);
           }
-#line 36561 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36744 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1564:
-#line 10777 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1567:
+#line 10850 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_ascii((yyloc), (yyvsp[-1].item));
           }
-#line 36569 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36752 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1565:
-#line 10781 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1568:
+#line 10854 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_charset((yyloc), (yyvsp[-1].item));
           }
-#line 36577 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36760 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1566:
-#line 10785 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1569:
+#line 10858 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_coalesce((yyloc), (yyvsp[-1].item_list2));
           }
-#line 36585 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36768 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1567:
-#line 10789 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1570:
+#line 10862 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_collation((yyloc), (yyvsp[-1].item));
           }
-#line 36593 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36776 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1568:
-#line 10793 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1571:
+#line 10866 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_database((yyloc));
           }
-#line 36601 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36784 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1569:
-#line 10797 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1572:
+#line 10870 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_if((yyloc), (yyvsp[-5].item),(yyvsp[-3].item),(yyvsp[-1].item));
           }
-#line 36609 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36792 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1570:
-#line 10801 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1573:
+#line 10874 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_format((yyloc), (yyvsp[-3].item), (yyvsp[-1].item));
           }
-#line 36617 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36800 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1571:
-#line 10805 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1574:
+#line 10878 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_format((yyloc), (yyvsp[-5].item), (yyvsp[-3].item), (yyvsp[-1].item));
           }
-#line 36625 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36808 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1572:
-#line 10809 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1575:
+#line 10882 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_microsecond((yyloc), (yyvsp[-1].item));
           }
-#line 36633 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36816 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1573:
-#line 10813 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1576:
+#line 10886 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_mod((yyloc), (yyvsp[-3].item), (yyvsp[-1].item));
           }
-#line 36641 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36824 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1574:
-#line 10817 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1577:
+#line 10890 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_quarter((yyloc), (yyvsp[-1].item));
           }
-#line 36649 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36832 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1575:
-#line 10821 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1578:
+#line 10894 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_repeat((yyloc), (yyvsp[-3].item),(yyvsp[-1].item));
           }
-#line 36657 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36840 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1576:
-#line 10825 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1579:
+#line 10898 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_replace((yyloc), (yyvsp[-5].item),(yyvsp[-3].item),(yyvsp[-1].item));
           }
-#line 36665 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36848 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1577:
-#line 10829 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1580:
+#line 10902 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_reverse((yyloc), (yyvsp[-1].item));
           }
-#line 36673 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36856 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1578:
-#line 10833 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1581:
+#line 10906 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_row_count((yyloc));
           }
-#line 36681 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36864 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1579:
-#line 10837 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1582:
+#line 10910 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_round((yyloc), (yyvsp[-3].item),(yyvsp[-1].item),1);
           }
-#line 36689 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36872 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1580:
-#line 10841 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1583:
+#line 10914 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_week((yyloc), (yyvsp[-1].item), NULL);
           }
-#line 36697 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36880 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1581:
-#line 10845 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1584:
+#line 10918 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_week((yyloc), (yyvsp[-3].item), (yyvsp[-1].item));
           }
-#line 36705 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36888 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1582:
-#line 10849 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1585:
+#line 10922 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_weight_string((yyloc), (yyvsp[-1].item), 0, 0, 0);
           }
-#line 36713 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36896 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1583:
-#line 10853 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1586:
+#line 10926 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_weight_string((yyloc), (yyvsp[-4].item), 0, (yyvsp[-1].ulong_num), 0);
           }
-#line 36721 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36904 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1584:
-#line 10857 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1587:
+#line 10930 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_weight_string((yyloc), (yyvsp[-4].item), 0, (yyvsp[-1].ulong_num), 0, true);
           }
-#line 36729 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36912 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1585:
-#line 10861 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1588:
+#line 10934 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_weight_string((yyloc), (yyvsp[-7].item), (yyvsp[-5].ulong_num), (yyvsp[-3].ulong_num), (yyvsp[-1].ulong_num));
           }
-#line 36737 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36920 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1587:
-#line 10869 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1590:
+#line 10942 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_spatial_collection((yyloc), (yyvsp[-1].item_list2),
                         Geometry::wkb_geometrycollection,
                         Geometry::wkb_point);
           }
-#line 36747 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36930 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1588:
-#line 10875 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1591:
+#line 10948 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_spatial_collection((yyloc), (yyvsp[-1].item_list2),
                         Geometry::wkb_linestring,
                         Geometry::wkb_point);
           }
-#line 36757 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36940 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1589:
-#line 10881 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1592:
+#line 10954 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_spatial_collection((yyloc), (yyvsp[-1].item_list2),
                         Geometry::wkb_multilinestring,
                         Geometry::wkb_linestring);
           }
-#line 36767 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36950 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1590:
-#line 10887 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1593:
+#line 10960 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_spatial_collection((yyloc), (yyvsp[-1].item_list2),
                         Geometry::wkb_multipoint,
                         Geometry::wkb_point);
           }
-#line 36777 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36960 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1591:
-#line 10893 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1594:
+#line 10966 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_spatial_collection((yyloc), (yyvsp[-1].item_list2),
                         Geometry::wkb_multipolygon,
                         Geometry::wkb_polygon);
           }
-#line 36787 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36970 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1592:
-#line 10899 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1595:
+#line 10972 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_point((yyloc), (yyvsp[-3].item),(yyvsp[-1].item));
           }
-#line 36795 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36978 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1593:
-#line 10903 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1596:
+#line 10976 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_spatial_collection((yyloc), (yyvsp[-1].item_list2),
                         Geometry::wkb_polygon,
                         Geometry::wkb_linestring);
           }
-#line 36805 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36988 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1594:
-#line 10921 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1597:
+#line 10994 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN PTI_function_call_generic_ident_sys((yylsp[-3]), (yyvsp[-3].lexer.lex_str), (yyvsp[-1].item_list2));
           }
-#line 36813 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 36996 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1595:
-#line 10925 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1598:
+#line 10998 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN PTI_function_call_generic_2d((yyloc), (yyvsp[-5].lexer.lex_str), (yyvsp[-3].lexer.lex_str), (yyvsp[-1].item_list2));
           }
-#line 36821 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37004 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1596:
-#line 10932 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1599:
+#line 11005 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= (yyvsp[-1].num) | (yyvsp[0].num); }
-#line 36827 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37010 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1597:
-#line 10934 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1600:
+#line 11007 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.num)= FT_BOOL;
             DBUG_EXECUTE_IF("simulate_bug18831513",
@@ -36837,107 +37020,107 @@
                                 YYTHD->syntax_error();
                             });
           }
-#line 36841 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37024 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1598:
-#line 10946 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1601:
+#line 11019 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= FT_NL; }
-#line 36847 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37030 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1599:
-#line 10947 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1602:
+#line 11020 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= FT_NL; }
-#line 36853 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37036 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1600:
-#line 10951 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1603:
+#line 11024 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= 0;         }
-#line 36859 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37042 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1601:
-#line 10952 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1604:
+#line 11025 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= FT_EXPAND; }
-#line 36865 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37048 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1602:
-#line 10956 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1605:
+#line 11029 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.item_list2)= NULL; }
-#line 36871 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37054 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1603:
-#line 10957 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1606:
+#line 11030 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.item_list2)= (yyvsp[0].item_list2); }
-#line 36877 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37060 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1604:
-#line 10962 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1607:
+#line 11035 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item_list2)= NEW_PTN PT_item_list;
             if ((yyval.item_list2) == NULL || (yyval.item_list2)->push_back((yyvsp[0].item)))
               MYSQL_YYABORT;
           }
-#line 36887 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37070 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1605:
-#line 10968 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1608:
+#line 11041 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyvsp[-2].item_list2) == NULL || (yyvsp[-2].item_list2)->push_back((yyvsp[0].item)))
               MYSQL_YYABORT;
             (yyval.item_list2)= (yyvsp[-2].item_list2);
           }
-#line 36897 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37080 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1606:
-#line 10977 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1609:
+#line 11050 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN PTI_udf_expr((yyloc), (yyvsp[-1].item), (yyvsp[0].lexer.lex_str), (yylsp[-1]).cpp);
           }
-#line 36905 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37088 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1609:
-#line 10989 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1612:
+#line 11062 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_sum_avg((yyloc), (yyvsp[-2].item), false, (yyvsp[0].window));
           }
-#line 36913 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37096 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1610:
-#line 10993 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1613:
+#line 11066 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_sum_avg((yyloc), (yyvsp[-2].item), true, (yyvsp[0].window));
           }
-#line 36921 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37104 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1611:
-#line 10997 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1614:
+#line 11070 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_sum_and((yyloc), (yyvsp[-2].item), (yyvsp[0].window));
           }
-#line 36929 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37112 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1612:
-#line 11001 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1615:
+#line 11074 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_sum_or((yyloc), (yyvsp[-2].item), (yyvsp[0].window));
           }
-#line 36937 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37120 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1613:
-#line 11005 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1616:
+#line 11078 "sql_yacc.yy" /* yacc.c:1646  */
     {
             auto wrapper = make_unique_destroy_only<Json_wrapper>(YYMEM_ROOT);
             if (wrapper == nullptr) YYABORT;
@@ -36947,11 +37130,11 @@
             (yyval.item) = NEW_PTN Item_sum_json_array((yyloc), (yyvsp[-2].item), (yyvsp[0].window), std::move(wrapper),
                                              std::move(array));
           }
-#line 36951 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37134 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1614:
-#line 11015 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1617:
+#line 11088 "sql_yacc.yy" /* yacc.c:1646  */
     {
             auto wrapper = make_unique_destroy_only<Json_wrapper>(YYMEM_ROOT);
             if (wrapper == nullptr) YYABORT;
@@ -36961,195 +37144,195 @@
             (yyval.item) = NEW_PTN Item_sum_json_object(
                 (yyloc), (yyvsp[-4].item), (yyvsp[-2].item), (yyvsp[0].window), std::move(wrapper), std::move(object));
           }
-#line 36965 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37148 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1615:
-#line 11025 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1618:
+#line 11098 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_sum_collect((yyloc), (yyvsp[-2].item), (yyvsp[0].window), false);
           }
-#line 36973 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37156 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1616:
-#line 11029 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1619:
+#line 11102 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_sum_collect((yyloc), (yyvsp[-2].item), (yyvsp[0].window), true );
           }
-#line 36981 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37164 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1617:
-#line 11033 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1620:
+#line 11106 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_sum_xor((yyloc), (yyvsp[-2].item), (yyvsp[0].window));
           }
-#line 36989 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37172 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1618:
-#line 11037 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1621:
+#line 11110 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN PTI_count_sym((yyloc), (yyvsp[0].window));
           }
-#line 36997 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37180 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1619:
-#line 11041 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1622:
+#line 11114 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_sum_count((yyloc), (yyvsp[-2].item), (yyvsp[0].window));
           }
-#line 37005 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37188 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1620:
-#line 11045 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1623:
+#line 11118 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= new Item_sum_count((yyloc), (yyvsp[-2].item_list2), (yyvsp[0].window));
           }
-#line 37013 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37196 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1621:
-#line 11049 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1624:
+#line 11122 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_sum_min((yyloc), (yyvsp[-2].item), (yyvsp[0].window));
           }
-#line 37021 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37204 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1622:
-#line 11058 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1625:
+#line 11131 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_sum_min((yyloc), (yyvsp[-2].item), (yyvsp[0].window));
           }
-#line 37029 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37212 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1623:
-#line 11062 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1626:
+#line 11135 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_sum_max((yyloc), (yyvsp[-2].item), (yyvsp[0].window));
           }
-#line 37037 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37220 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1624:
-#line 11066 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1627:
+#line 11139 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_sum_max((yyloc), (yyvsp[-2].item), (yyvsp[0].window));
           }
-#line 37045 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37228 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1625:
-#line 11070 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1628:
+#line 11143 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_sum_std((yyloc), (yyvsp[-2].item), 0, (yyvsp[0].window));
           }
-#line 37053 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37236 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1626:
-#line 11074 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1629:
+#line 11147 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_sum_variance((yyloc), (yyvsp[-2].item), 0, (yyvsp[0].window));
           }
-#line 37061 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37244 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1627:
-#line 11078 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1630:
+#line 11151 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_sum_std((yyloc), (yyvsp[-2].item), 1, (yyvsp[0].window));
           }
-#line 37069 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37252 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1628:
-#line 11082 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1631:
+#line 11155 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_sum_variance((yyloc), (yyvsp[-2].item), 1, (yyvsp[0].window));
           }
-#line 37077 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37260 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1629:
-#line 11086 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1632:
+#line 11159 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_sum_sum((yyloc), (yyvsp[-2].item), false, (yyvsp[0].window));
           }
-#line 37085 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37268 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1630:
-#line 11090 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1633:
+#line 11163 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_sum_sum((yyloc), (yyvsp[-2].item), true, (yyvsp[0].window));
           }
-#line 37093 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37276 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1631:
-#line 11097 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1634:
+#line 11170 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_group_concat((yyloc), (yyvsp[-5].num), (yyvsp[-4].item_list2), (yyvsp[-3].order_list), (yyvsp[-2].string), (yyvsp[0].window));
           }
-#line 37101 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37284 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1632:
-#line 11104 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1635:
+#line 11177 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)=  NEW_PTN Item_row_number((yyloc), (yyvsp[0].window));
           }
-#line 37109 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37292 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1633:
-#line 11108 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1636:
+#line 11181 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_rank((yyloc), false, (yyvsp[0].window));
           }
-#line 37117 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37300 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1634:
-#line 11112 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1637:
+#line 11185 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_rank((yyloc), true, (yyvsp[0].window));
           }
-#line 37125 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37308 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1635:
-#line 11116 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1638:
+#line 11189 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)=  NEW_PTN Item_cume_dist((yyloc), (yyvsp[0].window));
           }
-#line 37133 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37316 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1636:
-#line 11120 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1639:
+#line 11193 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_percent_rank((yyloc), (yyvsp[0].window));
           }
-#line 37141 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37324 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1637:
-#line 11124 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1640:
+#line 11197 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)=NEW_PTN Item_ntile((yyloc), (yyvsp[-2].item), (yyvsp[0].window));
           }
-#line 37149 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37332 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1638:
-#line 11128 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1641:
+#line 11201 "sql_yacc.yy" /* yacc.c:1646  */
     {
             PT_item_list *args= NEW_PTN PT_item_list;
             if (args == NULL || args->push_back((yyvsp[-4].item)))
@@ -37160,11 +37343,11 @@
               MYSQL_YYABORT; // OOM
             (yyval.item)= NEW_PTN Item_lead_lag((yyloc), true, args, (yyvsp[-1].null_treatment), (yyvsp[0].window));
           }
-#line 37164 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37347 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1639:
-#line 11139 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1642:
+#line 11212 "sql_yacc.yy" /* yacc.c:1646  */
     {
             PT_item_list *args= NEW_PTN PT_item_list;
             if (args == NULL || args->push_back((yyvsp[-4].item)))
@@ -37175,27 +37358,27 @@
               MYSQL_YYABORT; // OOM
             (yyval.item)= NEW_PTN Item_lead_lag((yyloc), false, args, (yyvsp[-1].null_treatment), (yyvsp[0].window));
           }
-#line 37179 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37362 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1640:
-#line 11150 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1643:
+#line 11223 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_first_last_value((yyloc), true, (yyvsp[-3].item), (yyvsp[-1].null_treatment), (yyvsp[0].window));
           }
-#line 37187 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37370 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1641:
-#line 11154 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1644:
+#line 11227 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_first_last_value((yyloc), false, (yyvsp[-3].item), (yyvsp[-1].null_treatment), (yyvsp[0].window));
           }
-#line 37195 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37378 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1642:
-#line 11158 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1645:
+#line 11231 "sql_yacc.yy" /* yacc.c:1646  */
     {
             PT_item_list *args= NEW_PTN PT_item_list;
             if (args == NULL ||
@@ -37204,173 +37387,173 @@
               MYSQL_YYABORT;
             (yyval.item)= NEW_PTN Item_nth_value((yyloc), args, (yyvsp[-2].from_first_last) == NFL_FROM_LAST, (yyvsp[-1].null_treatment), (yyvsp[0].window));
           }
-#line 37208 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37391 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1643:
-#line 11170 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1646:
+#line 11243 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.lead_lag_info).offset= NULL;
             (yyval.lead_lag_info).default_value= NULL;
           }
-#line 37217 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37400 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1644:
-#line 11175 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1647:
+#line 11248 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.lead_lag_info).offset= (yyvsp[-1].item);
             (yyval.lead_lag_info).default_value= (yyvsp[0].item);
           }
-#line 37226 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37409 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1645:
-#line 11186 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1648:
+#line 11259 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.item) = (yyvsp[0].item_num); }
-#line 37232 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37415 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1647:
-#line 11191 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1650:
+#line 11264 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.item) = (yyvsp[0].param_marker); }
-#line 37238 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37421 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1648:
-#line 11192 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1651:
+#line 11265 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.item) = NEW_PTN PTI_int_splocal((yyloc), to_lex_cstring((yyvsp[0].lexer.lex_str))); }
-#line 37244 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37427 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1649:
-#line 11193 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1652:
+#line 11266 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.item) = NEW_PTN PTI_user_variable((yyloc), (yyvsp[0].lexer.lex_str)); }
-#line 37250 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37433 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1650:
-#line 11198 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1653:
+#line 11271 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NULL;
           }
-#line 37258 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37441 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1651:
-#line 11202 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1654:
+#line 11275 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= (yyvsp[0].item);
           }
-#line 37266 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37449 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1652:
-#line 11209 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1655:
+#line 11282 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.null_treatment)= NT_NONE;
           }
-#line 37274 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37457 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1653:
-#line 11213 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1656:
+#line 11286 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.null_treatment)= NT_RESPECT_NULLS;
           }
-#line 37282 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37465 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1654:
-#line 11217 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1657:
+#line 11290 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.null_treatment)= NT_IGNORE_NULLS;
           }
-#line 37290 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37473 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1655:
-#line 11225 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1658:
+#line 11298 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.from_first_last)= NFL_NONE;
           }
-#line 37298 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37481 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1656:
-#line 11229 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1659:
+#line 11302 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.from_first_last)= NFL_FROM_FIRST;
           }
-#line 37306 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37489 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1657:
-#line 11233 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1660:
+#line 11306 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.from_first_last)= NFL_FROM_LAST;
           }
-#line 37314 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37497 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1658:
-#line 11240 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1661:
+#line 11313 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.window)= NULL;
           }
-#line 37322 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37505 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1659:
-#line 11244 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1662:
+#line 11317 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.window)= (yyvsp[0].window);
           }
-#line 37330 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37513 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1660:
-#line 11251 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1663:
+#line 11324 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.window)= (yyvsp[0].window);
           }
-#line 37338 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37521 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1661:
-#line 11258 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1664:
+#line 11331 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.window)= NEW_PTN PT_window((yyvsp[0].item_string));
           }
-#line 37346 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37529 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1662:
-#line 11262 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1665:
+#line 11335 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.window)= (yyvsp[0].window);
           }
-#line 37354 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37537 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1663:
-#line 11269 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1666:
+#line 11342 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item_string)= NEW_PTN Item_string((yyvsp[0].lexer.lex_str).str, (yyvsp[0].lexer.lex_str).length, YYTHD->charset());
           }
-#line 37362 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37545 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1664:
-#line 11276 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1667:
+#line 11349 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.window)= (yyvsp[-1].window);
           }
-#line 37370 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37553 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1665:
-#line 11286 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1668:
+#line 11359 "sql_yacc.yy" /* yacc.c:1646  */
     {
              auto frame= (yyvsp[0].window_frame);
              if (!frame) // build an equivalent frame spec
@@ -37384,357 +37567,357 @@
              }
              (yyval.window)= NEW_PTN PT_window((yyvsp[-2].order_list), (yyvsp[-1].order_list), frame, (yyvsp[-3].item_string));
            }
-#line 37388 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37571 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1666:
-#line 11303 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1669:
+#line 11376 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item_string)= NULL;
           }
-#line 37396 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37579 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1667:
-#line 11307 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1670:
+#line 11380 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item_string)= (yyvsp[0].item_string);
           }
-#line 37404 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37587 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1668:
-#line 11314 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1671:
+#line 11387 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.order_list)= NULL;
           }
-#line 37412 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37595 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1669:
-#line 11318 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1672:
+#line 11391 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.order_list)= (yyvsp[0].order_list);
           }
-#line 37420 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37603 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1670:
-#line 11325 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1673:
+#line 11398 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.order_list)= NULL;
           }
-#line 37428 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37611 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1671:
-#line 11329 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1674:
+#line 11402 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.order_list)= (yyvsp[0].order_list);
           }
-#line 37436 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37619 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1672:
-#line 11336 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1675:
+#line 11409 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.window_frame)= NULL;
           }
-#line 37444 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37627 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1673:
-#line 11342 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1676:
+#line 11415 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.window_frame)= NEW_PTN PT_frame((yyvsp[-2].frame_units), (yyvsp[-1].frame_extent), (yyvsp[0].frame_exclusion));
           }
-#line 37452 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37635 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1674:
-#line 11349 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1677:
+#line 11422 "sql_yacc.yy" /* yacc.c:1646  */
     {
             auto end_bound= NEW_PTN PT_border(WBT_CURRENT_ROW);
             (yyval.frame_extent)= NEW_PTN PT_borders((yyvsp[0].bound), end_bound);
           }
-#line 37461 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37644 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1675:
-#line 11354 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1678:
+#line 11427 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.frame_extent)= (yyvsp[0].frame_extent);
           }
-#line 37469 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37652 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1676:
-#line 11361 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1679:
+#line 11434 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.bound)= NEW_PTN PT_border(WBT_UNBOUNDED_PRECEDING);
           }
-#line 37477 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37660 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1677:
-#line 11365 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1680:
+#line 11438 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.bound)= NEW_PTN PT_border(WBT_VALUE_PRECEDING, (yyvsp[-1].item_num));
           }
-#line 37485 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37668 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1678:
-#line 11369 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1681:
+#line 11442 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.bound)= NEW_PTN PT_border(WBT_VALUE_PRECEDING, (yyvsp[-1].param_marker));
           }
-#line 37493 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37676 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1679:
-#line 11373 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1682:
+#line 11446 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.bound)= NEW_PTN PT_border(WBT_VALUE_PRECEDING, (yyvsp[-2].item), (yyvsp[-1].interval));
           }
-#line 37501 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37684 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1680:
-#line 11377 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1683:
+#line 11450 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.bound)= NEW_PTN PT_border(WBT_CURRENT_ROW);
           }
-#line 37509 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37692 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1681:
-#line 11384 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1684:
+#line 11457 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.frame_extent)= NEW_PTN PT_borders((yyvsp[-2].bound), (yyvsp[0].bound));
           }
-#line 37517 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37700 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1682:
-#line 11391 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1685:
+#line 11464 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.bound)= (yyvsp[0].bound);
           }
-#line 37525 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37708 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1683:
-#line 11395 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1686:
+#line 11468 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.bound)= NEW_PTN PT_border(WBT_UNBOUNDED_FOLLOWING);
           }
-#line 37533 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37716 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1684:
-#line 11399 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1687:
+#line 11472 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.bound)= NEW_PTN PT_border(WBT_VALUE_FOLLOWING, (yyvsp[-1].item_num));
           }
-#line 37541 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37724 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1685:
-#line 11403 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1688:
+#line 11476 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.bound)= NEW_PTN PT_border(WBT_VALUE_FOLLOWING, (yyvsp[-1].param_marker));
           }
-#line 37549 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37732 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1686:
-#line 11407 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1689:
+#line 11480 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.bound)= NEW_PTN PT_border(WBT_VALUE_FOLLOWING, (yyvsp[-2].item), (yyvsp[-1].interval));
           }
-#line 37557 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37740 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1687:
-#line 11414 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1690:
+#line 11487 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.frame_exclusion)= NULL;
           }
-#line 37565 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37748 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1688:
-#line 11418 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1691:
+#line 11491 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.frame_exclusion)= NEW_PTN PT_exclusion(WFX_CURRENT_ROW);
           }
-#line 37573 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37756 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1689:
-#line 11422 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1692:
+#line 11495 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.frame_exclusion)= NEW_PTN PT_exclusion(WFX_GROUP);
           }
-#line 37581 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37764 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1690:
-#line 11426 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1693:
+#line 11499 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.frame_exclusion)= NEW_PTN PT_exclusion(WFX_TIES);
           }
-#line 37589 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37772 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1691:
-#line 11430 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1694:
+#line 11503 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.frame_exclusion)= NEW_PTN PT_exclusion(WFX_NO_OTHERS);
           }
-#line 37596 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37779 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1692:
-#line 11435 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1695:
+#line 11508 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.frame_units)= WFU_ROWS; }
-#line 37602 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37785 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1693:
-#line 11436 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1696:
+#line 11509 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.frame_units)= WFU_RANGE; }
-#line 37608 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37791 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1694:
-#line 11437 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1697:
+#line 11510 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.frame_units)= WFU_GROUPS; }
-#line 37614 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37797 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1695:
-#line 11442 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1698:
+#line 11515 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_grouping((yyloc), (yyvsp[-1].item_list2));
           }
-#line 37622 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37805 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1696:
-#line 11448 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1699:
+#line 11521 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.item)= (yyvsp[0].item); }
-#line 37628 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37811 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1697:
-#line 11453 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1700:
+#line 11526 "sql_yacc.yy" /* yacc.c:1646  */
     {
             push_warning(YYTHD, Sql_condition::SL_WARNING,
                          ER_WARN_DEPRECATED_SYNTAX,
                          ER_THD(YYTHD, ER_WARN_DEPRECATED_USER_SET_EXPR));
             (yyval.item)= NEW_PTN PTI_variable_aux_set_var((yyloc), (yyvsp[-2].lexer.lex_str), (yyvsp[0].item));
           }
-#line 37639 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37822 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1698:
-#line 11460 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1701:
+#line 11533 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN PTI_user_variable((yyloc), (yyvsp[0].lexer.lex_str));
           }
-#line 37647 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37830 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1699:
-#line 11464 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1702:
+#line 11537 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN PTI_variable_aux_3d((yyloc), (yyvsp[-2].var_type), (yyvsp[-1].lexer.lex_str), (yylsp[-1]), (yyvsp[0].lexer.lex_str));
           }
-#line 37655 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37838 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1700:
-#line 11470 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1703:
+#line 11543 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num) = 0; }
-#line 37661 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37844 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1701:
-#line 11471 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1704:
+#line 11544 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num) = 1; }
-#line 37667 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37850 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1702:
-#line 11476 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1705:
+#line 11549 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.string)= NEW_PTN String(",", 1, &my_charset_latin1);
             if ((yyval.string) == NULL)
               MYSQL_YYABORT;
           }
-#line 37677 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37860 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1703:
-#line 11481 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1706:
+#line 11554 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.string) = (yyvsp[0].string); }
-#line 37683 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37866 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1704:
-#line 11485 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1707:
+#line 11558 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.order_list)= NULL; }
-#line 37689 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37872 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1705:
-#line 11486 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1708:
+#line 11559 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.order_list)= (yyvsp[0].order_list); }
-#line 37695 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37878 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1706:
-#line 11491 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1709:
+#line 11564 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyvsp[-2].order_list)->push_back((yyvsp[0].order_expr));
             (yyval.order_list)= (yyvsp[-2].order_list);
           }
-#line 37704 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37887 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1707:
-#line 11496 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1710:
+#line 11569 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.order_list)= NEW_PTN PT_gorder_list();
             if ((yyval.order_list) == NULL)
               MYSQL_YYABORT;
             (yyval.order_list)->push_back((yyvsp[0].order_expr));
           }
-#line 37715 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37898 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1708:
-#line 11506 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1711:
+#line 11579 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN PTI_in_sum_expr((yylsp[-1]), (yyvsp[0].item));
           }
-#line 37723 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37906 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1709:
-#line 11513 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1712:
+#line 11586 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.cast_type).target= ITEM_CAST_CHAR;
             (yyval.cast_type).charset= &my_charset_bin;
             (yyval.cast_type).length= (yyvsp[0].c_str);
             (yyval.cast_type).dec= NULL;
           }
-#line 37734 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37917 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1710:
-#line 11520 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1713:
+#line 11593 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.cast_type).target= ITEM_CAST_CHAR;
             (yyval.cast_type).length= (yyvsp[-1].c_str);
@@ -37753,11 +37936,11 @@
             else
               (yyval.cast_type).charset= (yyvsp[0].charset_with_opt_binary).charset;
           }
-#line 37757 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37940 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1711:
-#line 11539 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1714:
+#line 11612 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.cast_type).target= ITEM_CAST_CHAR;
             (yyval.cast_type).charset= national_charset_info;
@@ -37765,121 +37948,121 @@
             (yyval.cast_type).dec= NULL;
             warn_about_deprecated_national(YYTHD);
           }
-#line 37769 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37952 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1712:
-#line 11547 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1715:
+#line 11620 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.cast_type).target= ITEM_CAST_SIGNED_INT;
             (yyval.cast_type).charset= NULL;
             (yyval.cast_type).length= NULL;
             (yyval.cast_type).dec= NULL;
           }
-#line 37780 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37963 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1713:
-#line 11554 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1716:
+#line 11627 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.cast_type).target= ITEM_CAST_SIGNED_INT;
             (yyval.cast_type).charset= NULL;
             (yyval.cast_type).length= NULL;
             (yyval.cast_type).dec= NULL;
           }
-#line 37791 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37974 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1714:
-#line 11561 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1717:
+#line 11634 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.cast_type).target= ITEM_CAST_UNSIGNED_INT;
             (yyval.cast_type).charset= NULL;
             (yyval.cast_type).length= NULL;
             (yyval.cast_type).dec= NULL;
           }
-#line 37802 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37985 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1715:
-#line 11568 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1718:
+#line 11641 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.cast_type).target= ITEM_CAST_UNSIGNED_INT;
             (yyval.cast_type).charset= NULL;
             (yyval.cast_type).length= NULL;
             (yyval.cast_type).dec= NULL;
           }
-#line 37813 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 37996 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1716:
-#line 11575 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1719:
+#line 11648 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.cast_type).target= ITEM_CAST_DATE;
             (yyval.cast_type).charset= NULL;
             (yyval.cast_type).length= NULL;
             (yyval.cast_type).dec= NULL;
           }
-#line 37824 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38007 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1717:
-#line 11582 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1720:
+#line 11655 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.cast_type).target= ITEM_CAST_YEAR;
             (yyval.cast_type).charset= NULL;
             (yyval.cast_type).length= NULL;
             (yyval.cast_type).dec= NULL;
           }
-#line 37835 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38018 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1718:
-#line 11589 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1721:
+#line 11662 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.cast_type).target= ITEM_CAST_TIME;
             (yyval.cast_type).charset= NULL;
             (yyval.cast_type).length= NULL;
             (yyval.cast_type).dec= (yyvsp[0].c_str);
           }
-#line 37846 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38029 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1719:
-#line 11596 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1722:
+#line 11669 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.cast_type).target= ITEM_CAST_DATETIME;
             (yyval.cast_type).charset= NULL;
             (yyval.cast_type).length= NULL;
             (yyval.cast_type).dec= (yyvsp[0].c_str);
           }
-#line 37857 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38040 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1720:
-#line 11603 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1723:
+#line 11676 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.cast_type).target=ITEM_CAST_DECIMAL;
             (yyval.cast_type).charset= NULL;
             (yyval.cast_type).length= (yyvsp[0].precision).length;
             (yyval.cast_type).dec= (yyvsp[0].precision).dec;
           }
-#line 37868 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38051 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1721:
-#line 11610 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1724:
+#line 11683 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.cast_type).target=ITEM_CAST_JSON;
             (yyval.cast_type).charset= NULL;
             (yyval.cast_type).length= NULL;
             (yyval.cast_type).dec= NULL;
           }
-#line 37879 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38062 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1722:
-#line 11617 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1725:
+#line 11690 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.cast_type).target = ((yyvsp[0].numeric_type) == Numeric_type::DOUBLE) ?
               ITEM_CAST_DOUBLE : ITEM_CAST_FLOAT;
@@ -37887,181 +38070,181 @@
             (yyval.cast_type).length = nullptr;
             (yyval.cast_type).dec = nullptr;
           }
-#line 37891 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38074 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1723:
-#line 11625 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1726:
+#line 11698 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.cast_type).target = ITEM_CAST_FLOAT;
             (yyval.cast_type).charset = nullptr;
             (yyval.cast_type).length = (yyvsp[0].precision).length;
             (yyval.cast_type).dec = nullptr;
           }
-#line 37902 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38085 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1724:
-#line 11632 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1727:
+#line 11705 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.cast_type).target = ITEM_CAST_POINT;
             (yyval.cast_type).charset = nullptr;
             (yyval.cast_type).length = nullptr;
             (yyval.cast_type).dec = nullptr;
           }
-#line 37913 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38096 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1725:
-#line 11639 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1728:
+#line 11712 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.cast_type).target = ITEM_CAST_LINESTRING;
             (yyval.cast_type).charset = nullptr;
             (yyval.cast_type).length = nullptr;
             (yyval.cast_type).dec = nullptr;
           }
-#line 37924 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38107 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1726:
-#line 11646 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1729:
+#line 11719 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.cast_type).target = ITEM_CAST_POLYGON;
             (yyval.cast_type).charset = nullptr;
             (yyval.cast_type).length = nullptr;
             (yyval.cast_type).dec = nullptr;
           }
-#line 37935 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38118 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1727:
-#line 11653 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1730:
+#line 11726 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.cast_type).target = ITEM_CAST_MULTIPOINT;
             (yyval.cast_type).charset = nullptr;
             (yyval.cast_type).length = nullptr;
             (yyval.cast_type).dec = nullptr;
           }
-#line 37946 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38129 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1728:
-#line 11660 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1731:
+#line 11733 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.cast_type).target = ITEM_CAST_MULTILINESTRING;
             (yyval.cast_type).charset = nullptr;
             (yyval.cast_type).length = nullptr;
             (yyval.cast_type).dec = nullptr;
           }
-#line 37957 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38140 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1729:
-#line 11667 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1732:
+#line 11740 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.cast_type).target = ITEM_CAST_MULTIPOLYGON;
             (yyval.cast_type).charset = nullptr;
             (yyval.cast_type).length = nullptr;
             (yyval.cast_type).dec = nullptr;
           }
-#line 37968 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38151 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1730:
-#line 11674 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1733:
+#line 11747 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.cast_type).target = ITEM_CAST_GEOMETRYCOLLECTION;
             (yyval.cast_type).charset = nullptr;
             (yyval.cast_type).length = nullptr;
             (yyval.cast_type).dec = nullptr;
           }
-#line 37979 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38162 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1731:
-#line 11683 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1734:
+#line 11756 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.item_list2)= NULL; }
-#line 37985 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38168 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1733:
-#line 11689 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1736:
+#line 11762 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item_list2)= NEW_PTN PT_item_list;
             if ((yyval.item_list2) == NULL || (yyval.item_list2)->push_back((yyvsp[0].item)))
               MYSQL_YYABORT;
           }
-#line 37995 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38178 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1734:
-#line 11695 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1737:
+#line 11768 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyvsp[-2].item_list2) == NULL || (yyvsp[-2].item_list2)->push_back((yyvsp[0].item)))
               MYSQL_YYABORT;
             (yyval.item_list2)= (yyvsp[-2].item_list2);
           }
-#line 38005 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38188 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1735:
-#line 11703 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1738:
+#line 11776 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.item_list2)= (yyvsp[0].item_list2); }
-#line 38011 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38194 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1736:
-#line 11704 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1739:
+#line 11777 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.item_list2)= (yyvsp[-1].item_list2); }
-#line 38017 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38200 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1737:
-#line 11709 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1740:
+#line 11782 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item_list2)= NEW_PTN PT_item_list;
             if ((yyval.item_list2) == NULL || (yyval.item_list2)->push_back((yyvsp[0].item)))
               MYSQL_YYABORT;
           }
-#line 38027 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38210 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1738:
-#line 11715 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1741:
+#line 11788 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyvsp[-2].item_list2) == NULL || (yyvsp[-2].item_list2)->push_back((yyvsp[0].item)))
               MYSQL_YYABORT;
             (yyval.item_list2)= (yyvsp[-2].item_list2);
           }
-#line 38037 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38220 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1739:
-#line 11723 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1742:
+#line 11796 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.item)= NULL; }
-#line 38043 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38226 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1740:
-#line 11724 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1743:
+#line 11797 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.item)= (yyvsp[0].item); }
-#line 38049 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38232 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1741:
-#line 11728 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1744:
+#line 11801 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.item)= NULL; }
-#line 38055 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38238 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1742:
-#line 11729 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1745:
+#line 11802 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.item)= (yyvsp[0].item); }
-#line 38061 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38244 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1743:
-#line 11734 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1746:
+#line 11807 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item_list)= new (YYMEM_ROOT) mem_root_deque<Item *>(YYMEM_ROOT);
             if ((yyval.item_list) == NULL)
@@ -38069,33 +38252,33 @@
             (yyval.item_list)->push_back((yyvsp[-2].item));
             (yyval.item_list)->push_back((yyvsp[0].item));
           }
-#line 38073 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38256 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1744:
-#line 11742 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1747:
+#line 11815 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyvsp[-4].item_list)->push_back((yyvsp[-2].item));
             (yyvsp[-4].item_list)->push_back((yyvsp[0].item));
             (yyval.item_list)= (yyvsp[-4].item_list);
           }
-#line 38083 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38266 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1745:
-#line 11750 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1748:
+#line 11823 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.table_reference)= (yyvsp[0].table_reference); }
-#line 38089 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38272 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1746:
-#line 11751 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1749:
+#line 11824 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.table_reference)= (yyvsp[0].join_table); }
-#line 38095 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38278 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1747:
-#line 11753 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1750:
+#line 11826 "sql_yacc.yy" /* yacc.c:1646  */
     {
             /*
               The ODBC escape syntax for Outer Join.
@@ -38105,55 +38288,55 @@
             */
             (yyval.table_reference) = (yyvsp[-1].table_reference);
           }
-#line 38109 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38292 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1748:
-#line 11765 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1751:
+#line 11838 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.table_reference)= (yyvsp[0].table_reference); }
-#line 38115 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38298 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1749:
-#line 11766 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1752:
+#line 11839 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.table_reference)= (yyvsp[0].join_table); }
-#line 38121 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38304 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1750:
-#line 11848 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1753:
+#line 11921 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.join_table)= NEW_PTN PT_joined_table_on((yyvsp[-4].table_reference), (yylsp[-3]), (yyvsp[-3].join_type), (yyvsp[-2].table_reference), (yyvsp[0].item));
           }
-#line 38129 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38312 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1751:
-#line 11853 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1754:
+#line 11926 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.join_table)= NEW_PTN PT_joined_table_using((yyvsp[-6].table_reference), (yylsp[-5]), (yyvsp[-5].join_type), (yyvsp[-4].table_reference), (yyvsp[-1].string_list));
           }
-#line 38137 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38320 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1752:
-#line 11857 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1755:
+#line 11930 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.join_table)= NEW_PTN PT_joined_table_on((yyvsp[-4].table_reference), (yylsp[-3]), (yyvsp[-3].join_type), (yyvsp[-2].table_reference), (yyvsp[0].item));
           }
-#line 38145 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38328 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1753:
-#line 11861 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1756:
+#line 11934 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.join_table)= NEW_PTN PT_joined_table_using((yyvsp[-6].table_reference), (yylsp[-5]), (yyvsp[-5].join_type), (yyvsp[-4].table_reference), (yyvsp[-1].string_list));
           }
-#line 38153 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38336 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1754:
-#line 11866 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1757:
+#line 11939 "sql_yacc.yy" /* yacc.c:1646  */
     {
             auto this_cross_join= NEW_PTN PT_cross_join((yyvsp[-2].table_reference), (yylsp[-1]), (yyvsp[-1].join_type), NULL);
 
@@ -38162,159 +38345,159 @@
 
             (yyval.join_table)= (yyvsp[0].table_reference)->add_cross_join(this_cross_join);
           }
-#line 38166 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38349 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1755:
-#line 11875 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1758:
+#line 11948 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.join_table)= NEW_PTN PT_joined_table_using((yyvsp[-2].table_reference), (yylsp[-1]), (yyvsp[-1].join_type), (yyvsp[0].table_reference));
           }
-#line 38174 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38357 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1756:
-#line 11881 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1759:
+#line 11954 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.join_type)= JTT_NATURAL_INNER; }
-#line 38180 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38363 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1757:
-#line 11882 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1760:
+#line 11955 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.join_type)= JTT_NATURAL_RIGHT; }
-#line 38186 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38369 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1758:
-#line 11883 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1761:
+#line 11956 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.join_type)= JTT_NATURAL_LEFT; }
-#line 38192 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38375 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1759:
-#line 11887 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1762:
+#line 11960 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.join_type)= JTT_INNER; }
-#line 38198 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38381 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1760:
-#line 11888 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1763:
+#line 11961 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.join_type)= JTT_INNER; }
-#line 38204 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38387 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1761:
-#line 11889 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1764:
+#line 11962 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.join_type)= JTT_INNER; }
-#line 38210 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38393 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1762:
-#line 11890 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1765:
+#line 11963 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.join_type)= JTT_STRAIGHT_INNER; }
-#line 38216 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38399 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1763:
-#line 11893 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1766:
+#line 11966 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.join_type)= JTT_LEFT; }
-#line 38222 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38405 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1764:
-#line 11894 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1767:
+#line 11967 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.join_type)= JTT_RIGHT; }
-#line 38228 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38411 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1769:
-#line 11912 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1772:
+#line 11985 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.string_list)= NULL; }
-#line 38234 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38417 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1771:
-#line 11918 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1774:
+#line 11991 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.string_list)= (yyvsp[-1].string_list);
           }
-#line 38242 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38425 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1774:
-#line 11948 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1777:
+#line 12021 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.table_reference) = (yyvsp[0].derived_table); }
-#line 38248 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38431 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1775:
-#line 11950 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1778:
+#line 12023 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.table_reference)= NEW_PTN PT_table_factor_joined_table((yyvsp[0].join_table)); }
-#line 38254 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38437 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1776:
-#line 11952 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1779:
+#line 12025 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.table_reference)= NEW_PTN PT_table_reference_list_parens((yyvsp[0].table_reference_list)); }
-#line 38260 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38443 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1777:
-#line 11953 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1780:
+#line 12026 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.table_reference) = (yyvsp[0].table_reference); }
-#line 38266 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38449 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1778:
-#line 11957 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1781:
+#line 12030 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.table_reference_list)= (yyvsp[-1].table_reference_list); }
-#line 38272 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38455 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1779:
-#line 11959 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1782:
+#line 12032 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.table_reference_list)= (yyvsp[-3].table_reference_list);
             if ((yyval.table_reference_list).push_back((yyvsp[-1].table_reference)))
               MYSQL_YYABORT; // OOM
           }
-#line 38282 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38465 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1780:
-#line 11967 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1783:
+#line 12040 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.table_reference)= (yyvsp[-1].table_reference); }
-#line 38288 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38471 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1781:
-#line 11968 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1784:
+#line 12041 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.table_reference)= (yyvsp[-1].table_reference); }
-#line 38294 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38477 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1782:
-#line 11973 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1785:
+#line 12046 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.table_reference)= NEW_PTN PT_table_factor_table_ident((yyvsp[-3].table), (yyvsp[-2].string_list), (yyvsp[-1].lex_cstr), (yyvsp[0].key_usage_list));
           }
-#line 38302 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38485 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1783:
-#line 11979 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1786:
+#line 12052 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.join_table)= (yyvsp[-1].join_table); }
-#line 38308 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38491 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1784:
-#line 11980 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1787:
+#line 12053 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.join_table)= (yyvsp[-1].join_table); }
-#line 38314 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38497 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1785:
-#line 11985 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1788:
+#line 12058 "sql_yacc.yy" /* yacc.c:1646  */
     {
             /*
               The alias is actually not optional at all, but being MySQL we
@@ -38327,11 +38510,11 @@
 
             (yyval.derived_table)= NEW_PTN PT_derived_table(false, (yyvsp[-2].subquery), (yyvsp[-1].lex_cstr), &(yyvsp[0].simple_ident_list));
           }
-#line 38331 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38514 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1786:
-#line 11998 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1789:
+#line 12071 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyvsp[-1].lex_cstr).str == nullptr)
               my_message(ER_DERIVED_MUST_HAVE_ALIAS,
@@ -38339,11 +38522,11 @@
 
             (yyval.derived_table)= NEW_PTN PT_derived_table(true, (yyvsp[-2].subquery), (yyvsp[-1].lex_cstr), &(yyvsp[0].simple_ident_list));
           }
-#line 38343 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38526 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1787:
-#line 12010 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1790:
+#line 12083 "sql_yacc.yy" /* yacc.c:1646  */
     {
             // Alias isn't optional, follow derived's behavior
             if ((yyvsp[0].lex_cstr) == NULL_CSTR)
@@ -38355,47 +38538,47 @@
 
             (yyval.table_reference)= NEW_PTN PT_table_factor_function((yyvsp[-5].item), (yyvsp[-3].text_literal), (yyvsp[-2].jtc_list), to_lex_string((yyvsp[0].lex_cstr)));
           }
-#line 38359 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38542 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1788:
-#line 12025 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1791:
+#line 12098 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.jtc_list)= (yyvsp[-1].jtc_list);
           }
-#line 38367 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38550 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1789:
-#line 12032 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1792:
+#line 12105 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.jtc_list)= NEW_PTN Mem_root_array<PT_json_table_column *>(YYMEM_ROOT);
             if ((yyval.jtc_list) == NULL || (yyval.jtc_list)->push_back((yyvsp[0].jt_column)))
               MYSQL_YYABORT; // OOM
           }
-#line 38377 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38560 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1790:
-#line 12038 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1793:
+#line 12111 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.jtc_list)= (yyvsp[-2].jtc_list);
             if ((yyval.jtc_list)->push_back((yyvsp[0].jt_column)))
               MYSQL_YYABORT; // OOM
           }
-#line 38387 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38570 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1791:
-#line 12047 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1794:
+#line 12120 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.jt_column)= NEW_PTN PT_json_table_column_for_ordinality((yyvsp[-2].lexer.lex_str));
           }
-#line 38395 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38578 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1792:
-#line 12052 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1795:
+#line 12125 "sql_yacc.yy" /* yacc.c:1646  */
     {
             auto column = make_unique_destroy_only<Json_table_column>(
                 YYMEM_ROOT, (yyvsp[-3].jt_column_type), (yyvsp[-1].text_literal), (yyvsp[0].json_on_error_or_empty).error.type, (yyvsp[0].json_on_error_or_empty).error.default_string,
@@ -38404,77 +38587,77 @@
             (yyval.jt_column) = NEW_PTN PT_json_table_column_with_path(std::move(column), (yyvsp[-6].lexer.lex_str),
                                                         (yyvsp[-5].type), (yyvsp[-4].lexer.charset));
           }
-#line 38408 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38591 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1793:
-#line 12061 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1796:
+#line 12134 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.jt_column)= NEW_PTN PT_json_table_column_with_nested_path((yyvsp[-1].text_literal), (yyvsp[0].jtc_list));
           }
-#line 38416 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38599 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1794:
-#line 12067 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1797:
+#line 12140 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.jt_column_type)= enum_jt_column::JTC_PATH;
           }
-#line 38424 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38607 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1795:
-#line 12071 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1798:
+#line 12144 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.jt_column_type)= enum_jt_column::JTC_EXISTS;
           }
-#line 38432 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38615 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1796:
-#line 12081 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1799:
+#line 12154 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.json_on_error_or_empty).empty = {Json_on_response_type::IMPLICIT, nullptr};
             (yyval.json_on_error_or_empty).error = {Json_on_response_type::IMPLICIT, nullptr};
           }
-#line 38441 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38624 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1797:
-#line 12086 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1800:
+#line 12159 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.json_on_error_or_empty).empty = (yyvsp[0].json_on_response);
             (yyval.json_on_error_or_empty).error = {Json_on_response_type::IMPLICIT, nullptr};
           }
-#line 38450 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38633 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1798:
-#line 12091 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1801:
+#line 12164 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.json_on_error_or_empty).error = (yyvsp[0].json_on_response);
             (yyval.json_on_error_or_empty).empty = {Json_on_response_type::IMPLICIT, nullptr};
           }
-#line 38459 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38642 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1799:
-#line 12096 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1802:
+#line 12169 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.json_on_error_or_empty).empty = (yyvsp[-1].json_on_response);
             (yyval.json_on_error_or_empty).error = (yyvsp[0].json_on_response);
           }
-#line 38468 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38651 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1800:
-#line 12104 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1803:
+#line 12177 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.json_on_error_or_empty) = (yyvsp[0].json_on_error_or_empty); }
-#line 38474 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38657 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1801:
-#line 12106 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1804:
+#line 12179 "sql_yacc.yy" /* yacc.c:1646  */
     {
             push_warning(
               YYTHD, Sql_condition::SL_WARNING, ER_WARN_DEPRECATED_SYNTAX,
@@ -38482,168 +38665,168 @@
             (yyval.json_on_error_or_empty).error = (yyvsp[-1].json_on_response);
             (yyval.json_on_error_or_empty).empty = (yyvsp[0].json_on_response);
           }
-#line 38486 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38669 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1802:
-#line 12116 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1805:
+#line 12189 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.json_on_response)= (yyvsp[-2].json_on_response); }
-#line 38492 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38675 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1803:
-#line 12119 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1806:
+#line 12192 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.json_on_response)= (yyvsp[-2].json_on_response); }
-#line 38498 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38681 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1804:
-#line 12123 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1807:
+#line 12196 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.json_on_response) = {Json_on_response_type::ERROR, nullptr};
           }
-#line 38506 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38689 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1805:
-#line 12127 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1808:
+#line 12200 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.json_on_response) = {Json_on_response_type::NULL_VALUE, nullptr};
           }
-#line 38514 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38697 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1806:
-#line 12131 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1809:
+#line 12204 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.json_on_response) = {Json_on_response_type::DEFAULT, (yyvsp[0].item)};
           }
-#line 38522 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38705 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1807:
-#line 12138 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1810:
+#line 12211 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.num)= old_mode ?  INDEX_HINT_MASK_JOIN : INDEX_HINT_MASK_ALL;
           }
-#line 38530 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38713 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1808:
-#line 12141 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1811:
+#line 12214 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= INDEX_HINT_MASK_JOIN;  }
-#line 38536 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38719 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1809:
-#line 12142 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1812:
+#line 12215 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= INDEX_HINT_MASK_ORDER; }
-#line 38542 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38725 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1810:
-#line 12143 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1813:
+#line 12216 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= INDEX_HINT_MASK_GROUP; }
-#line 38548 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38731 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1811:
-#line 12147 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1814:
+#line 12220 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.index_hint)= INDEX_HINT_FORCE; }
-#line 38554 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38737 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1812:
-#line 12148 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1815:
+#line 12221 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.index_hint)= INDEX_HINT_IGNORE; }
-#line 38560 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38743 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1813:
-#line 12154 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1816:
+#line 12227 "sql_yacc.yy" /* yacc.c:1646  */
     {
             init_index_hints((yyvsp[-1].key_usage_list), (yyvsp[-5].index_hint), (yyvsp[-3].num));
             (yyval.key_usage_list)= (yyvsp[-1].key_usage_list);
           }
-#line 38569 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38752 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1814:
-#line 12160 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1817:
+#line 12233 "sql_yacc.yy" /* yacc.c:1646  */
     {
             init_index_hints((yyvsp[-1].key_usage_list), INDEX_HINT_USE, (yyvsp[-3].num));
             (yyval.key_usage_list)= (yyvsp[-1].key_usage_list);
           }
-#line 38578 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38761 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1816:
-#line 12169 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1819:
+#line 12242 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyvsp[0].key_usage_list)->concat((yyvsp[-1].key_usage_list));
             (yyval.key_usage_list)= (yyvsp[0].key_usage_list);
           }
-#line 38587 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38770 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1817:
-#line 12176 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1820:
+#line 12249 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.key_usage_list)= NULL; }
-#line 38593 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38776 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1820:
-#line 12186 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1823:
+#line 12259 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.key_usage_list)= NEW_PTN List<Index_hint>;
             Index_hint *hint= NEW_PTN Index_hint(NULL, 0);
             if ((yyval.key_usage_list) == NULL || hint == NULL || (yyval.key_usage_list)->push_front(hint))
               MYSQL_YYABORT;
           }
-#line 38604 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38787 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1822:
-#line 12197 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1825:
+#line 12270 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.key_usage_element)= NEW_PTN Index_hint((yyvsp[0].lexer.lex_str).str, (yyvsp[0].lexer.lex_str).length);
             if ((yyval.key_usage_element) == NULL)
               MYSQL_YYABORT;
           }
-#line 38614 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38797 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1823:
-#line 12203 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1826:
+#line 12276 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.key_usage_element)= NEW_PTN Index_hint(STRING_WITH_LEN("PRIMARY"));
             if ((yyval.key_usage_element) == NULL)
               MYSQL_YYABORT;
           }
-#line 38624 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38807 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1824:
-#line 12212 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1827:
+#line 12285 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.key_usage_list)= NEW_PTN List<Index_hint>;
             if ((yyval.key_usage_list) == NULL || (yyval.key_usage_list)->push_front((yyvsp[0].key_usage_element)))
               MYSQL_YYABORT;
           }
-#line 38634 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38817 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1825:
-#line 12218 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1828:
+#line 12291 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyval.key_usage_list)->push_front((yyvsp[0].key_usage_element)))
               MYSQL_YYABORT;
           }
-#line 38643 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38826 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1827:
-#line 12230 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1830:
+#line 12303 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.string_list)= NEW_PTN List<String>;
             String *s= NEW_PTN String(const_cast<const char *>((yyvsp[0].lexer.lex_str).str),
@@ -38652,11 +38835,11 @@
             if ((yyval.string_list) == NULL || s == NULL || (yyval.string_list)->push_back(s))
               MYSQL_YYABORT;
           }
-#line 38656 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38839 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1828:
-#line 12239 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1831:
+#line 12312 "sql_yacc.yy" /* yacc.c:1646  */
     {
             String *s= NEW_PTN String(const_cast<const char *>((yyvsp[0].lexer.lex_str).str),
                                                (yyvsp[0].lexer.lex_str).length,
@@ -38665,234 +38848,234 @@
               MYSQL_YYABORT;
             (yyval.string_list)= (yyvsp[-2].string_list);
           }
-#line 38669 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38852 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1829:
-#line 12250 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1832:
+#line 12323 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 38675 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38858 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1830:
-#line 12251 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1833:
+#line 12324 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.interval)=INTERVAL_DAY_HOUR; }
-#line 38681 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38864 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1831:
-#line 12252 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1834:
+#line 12325 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.interval)=INTERVAL_DAY_MICROSECOND; }
-#line 38687 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38870 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1832:
-#line 12253 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1835:
+#line 12326 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.interval)=INTERVAL_DAY_MINUTE; }
-#line 38693 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38876 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1833:
-#line 12254 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1836:
+#line 12327 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.interval)=INTERVAL_DAY_SECOND; }
-#line 38699 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38882 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1834:
-#line 12255 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1837:
+#line 12328 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.interval)=INTERVAL_HOUR_MICROSECOND; }
-#line 38705 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38888 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1835:
-#line 12256 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1838:
+#line 12329 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.interval)=INTERVAL_HOUR_MINUTE; }
-#line 38711 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38894 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1836:
-#line 12257 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1839:
+#line 12330 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.interval)=INTERVAL_HOUR_SECOND; }
-#line 38717 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38900 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1837:
-#line 12258 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1840:
+#line 12331 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.interval)=INTERVAL_MINUTE_MICROSECOND; }
-#line 38723 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38906 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1838:
-#line 12259 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1841:
+#line 12332 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.interval)=INTERVAL_MINUTE_SECOND; }
-#line 38729 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38912 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1839:
-#line 12260 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1842:
+#line 12333 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.interval)=INTERVAL_SECOND_MICROSECOND; }
-#line 38735 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38918 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1840:
-#line 12261 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1843:
+#line 12334 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.interval)=INTERVAL_YEAR_MONTH; }
-#line 38741 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38924 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1841:
-#line 12265 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1844:
+#line 12338 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.interval_time_st)=INTERVAL_DAY; }
-#line 38747 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38930 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1842:
-#line 12266 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1845:
+#line 12339 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.interval_time_st)=INTERVAL_WEEK; }
-#line 38753 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38936 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1843:
-#line 12267 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1846:
+#line 12340 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.interval_time_st)=INTERVAL_HOUR; }
-#line 38759 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38942 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1844:
-#line 12268 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1847:
+#line 12341 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.interval_time_st)=INTERVAL_MINUTE; }
-#line 38765 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38948 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1845:
-#line 12269 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1848:
+#line 12342 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.interval_time_st)=INTERVAL_MONTH; }
-#line 38771 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38954 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1846:
-#line 12270 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1849:
+#line 12343 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.interval_time_st)=INTERVAL_QUARTER; }
-#line 38777 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38960 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1847:
-#line 12271 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1850:
+#line 12344 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.interval_time_st)=INTERVAL_SECOND; }
-#line 38783 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38966 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1848:
-#line 12272 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1851:
+#line 12345 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.interval_time_st)=INTERVAL_MICROSECOND; }
-#line 38789 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38972 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1849:
-#line 12273 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1852:
+#line 12346 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.interval_time_st)=INTERVAL_YEAR; }
-#line 38795 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38978 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1850:
-#line 12277 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1853:
+#line 12350 "sql_yacc.yy" /* yacc.c:1646  */
     {(yyval.date_time_type)= MYSQL_TIMESTAMP_DATE; }
-#line 38801 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38984 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1851:
-#line 12278 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1854:
+#line 12351 "sql_yacc.yy" /* yacc.c:1646  */
     {(yyval.date_time_type)= MYSQL_TIMESTAMP_TIME; }
-#line 38807 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38990 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1852:
-#line 12279 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1855:
+#line 12352 "sql_yacc.yy" /* yacc.c:1646  */
     {(yyval.date_time_type)= MYSQL_TIMESTAMP_DATETIME; }
-#line 38813 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 38996 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1853:
-#line 12280 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1856:
+#line 12353 "sql_yacc.yy" /* yacc.c:1646  */
     {(yyval.date_time_type)= MYSQL_TIMESTAMP_DATETIME; }
-#line 38819 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39002 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1856:
-#line 12289 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1859:
+#line 12362 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lex_cstr) = NULL_CSTR; }
-#line 38825 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39008 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1857:
-#line 12290 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1860:
+#line 12363 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lex_cstr) = to_lex_cstring((yyvsp[0].lexer.lex_str)); }
-#line 38831 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39014 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1860:
-#line 12299 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1863:
+#line 12372 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.item) = nullptr; }
-#line 38837 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39020 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1862:
-#line 12304 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1865:
+#line 12377 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.item) = NEW_PTN PTI_where((yylsp[0]), (yyvsp[0].item)); }
-#line 38843 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39026 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1863:
-#line 12308 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1866:
+#line 12381 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.item)= NULL; }
-#line 38849 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39032 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1864:
-#line 12310 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1867:
+#line 12383 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= new PTI_having((yyloc), (yyvsp[0].item));
           }
-#line 38857 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39040 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1865:
-#line 12317 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1868:
+#line 12390 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.with_clause)= NEW_PTN PT_with_clause((yyvsp[0].with_list), false);
           }
-#line 38865 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39048 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1866:
-#line 12321 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1869:
+#line 12394 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.with_clause)= NEW_PTN PT_with_clause((yyvsp[0].with_list), true);
           }
-#line 38873 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39056 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1867:
-#line 12328 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1870:
+#line 12401 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyvsp[-2].with_list)->push_back((yyvsp[0].common_table_expr)))
               MYSQL_YYABORT;
           }
-#line 38882 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39065 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1868:
-#line 12333 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1871:
+#line 12406 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.with_list)= NEW_PTN PT_with_list(YYTHD->mem_root);
             if ((yyval.with_list) == NULL || (yyval.with_list)->push_back((yyvsp[0].common_table_expr)))
               MYSQL_YYABORT;    /* purecov: inspected */
           }
-#line 38892 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39075 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1869:
-#line 12342 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1872:
+#line 12415 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX_STRING subq_text;
             subq_text.length= (yylsp[0]).cpp.length();
@@ -38905,11 +39088,11 @@
             if ((yyval.common_table_expr) == NULL)
               MYSQL_YYABORT;   /* purecov: inspected */
           }
-#line 38909 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39092 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1870:
-#line 12358 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1873:
+#line 12431 "sql_yacc.yy" /* yacc.c:1646  */
     {
             /*
               Because () isn't accepted by the rule of
@@ -38918,516 +39101,516 @@
             */
             (yyval.simple_ident_list).init(YYTHD->mem_root);
           }
-#line 38922 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39105 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1871:
-#line 12367 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1874:
+#line 12440 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.simple_ident_list)= (yyvsp[-1].simple_ident_list);
           }
-#line 38930 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39113 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1872:
-#line 12374 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1875:
+#line 12447 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.simple_ident_list).init(YYTHD->mem_root);
             if ((yyval.simple_ident_list).push_back(to_lex_cstring((yyvsp[0].lexer.lex_str))))
               MYSQL_YYABORT; /* purecov: inspected */
           }
-#line 38940 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39123 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1873:
-#line 12380 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1876:
+#line 12453 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.simple_ident_list)= (yyvsp[-2].simple_ident_list);
             if ((yyval.simple_ident_list).push_back(to_lex_cstring((yyvsp[0].lexer.lex_str))))
               MYSQL_YYABORT;  /* purecov: inspected */
           }
-#line 38950 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39133 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1874:
-#line 12389 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1877:
+#line 12462 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.windows)= NULL;
           }
-#line 38958 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39141 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1875:
-#line 12393 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1878:
+#line 12466 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.windows)= (yyvsp[0].windows);
           }
-#line 38966 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39149 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1876:
-#line 12400 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1879:
+#line 12473 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.windows)= NEW_PTN PT_window_list();
             if ((yyval.windows) == NULL || (yyval.windows)->push_back((yyvsp[0].window)))
               MYSQL_YYABORT; // OOM
           }
-#line 38976 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39159 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1877:
-#line 12406 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1880:
+#line 12479 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyvsp[-2].windows)->push_back((yyvsp[0].window)))
               MYSQL_YYABORT; // OOM
             (yyval.windows)= (yyvsp[-2].windows);
           }
-#line 38986 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39169 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1878:
-#line 12415 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1881:
+#line 12488 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.window)= (yyvsp[0].window);
             if ((yyval.window) == NULL)
               MYSQL_YYABORT; // OOM
             (yyval.window)->set_name((yyvsp[-2].item_string));
           }
-#line 38997 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39180 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1879:
-#line 12428 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1882:
+#line 12501 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.group)= NULL; }
-#line 39003 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39186 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1880:
-#line 12430 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1883:
+#line 12503 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.group)= NEW_PTN PT_group((yyvsp[-1].order_list), (yyvsp[0].olap_type));
           }
-#line 39011 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39194 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1881:
-#line 12437 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1884:
+#line 12510 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyvsp[-2].order_list)->push_back((yyvsp[0].order_expr));
             (yyval.order_list)= (yyvsp[-2].order_list);
           }
-#line 39020 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39203 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1882:
-#line 12442 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1885:
+#line 12515 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.order_list)= NEW_PTN PT_order_list();
             if ((yyval.order_list) == NULL)
               MYSQL_YYABORT;
             (yyval.order_list)->push_back((yyvsp[0].order_expr));
           }
-#line 39031 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39214 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1883:
-#line 12452 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1886:
+#line 12525 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.olap_type)= UNSPECIFIED_OLAP_TYPE; }
-#line 39037 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39220 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1884:
-#line 12453 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1887:
+#line 12526 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.olap_type)= ROLLUP_TYPE; }
-#line 39043 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39226 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1885:
-#line 12469 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1888:
+#line 12542 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.order_list)= (yyvsp[-2].order_list);
             (yyval.order_list)->push_back((yyvsp[0].order_expr));
           }
-#line 39052 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39235 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1886:
-#line 12474 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1889:
+#line 12547 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.order_list)= NEW_PTN PT_order_list();
             if ((yyval.order_list) == NULL)
               MYSQL_YYABORT;
             (yyval.order_list)->push_back((yyvsp[0].order_expr));
           }
-#line 39063 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39246 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1887:
-#line 12484 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1890:
+#line 12557 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.order_expr)= NEW_PTN PT_order_expr((yyvsp[-1].item), (yyvsp[0].order_direction));
           }
-#line 39071 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39254 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1888:
-#line 12490 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1891:
+#line 12563 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.order)= NULL; }
-#line 39077 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39260 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1890:
-#line 12496 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1893:
+#line 12569 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.order)= NEW_PTN PT_order((yyvsp[0].order_list));
           }
-#line 39085 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39268 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1891:
-#line 12503 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1894:
+#line 12576 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyvsp[-2].order_list)->push_back((yyvsp[0].order_expr));
             (yyval.order_list)= (yyvsp[-2].order_list);
           }
-#line 39094 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39277 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1892:
-#line 12508 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1895:
+#line 12581 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.order_list)= NEW_PTN PT_order_list();
             if ((yyval.order_list) == NULL)
               MYSQL_YYABORT;
             (yyval.order_list)->push_back((yyvsp[0].order_expr));
           }
-#line 39105 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39288 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1893:
-#line 12517 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1896:
+#line 12590 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.order_direction)= ORDER_NOT_RELEVANT; }
-#line 39111 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39294 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1895:
-#line 12522 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1898:
+#line 12595 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.order_direction)= ORDER_ASC; }
-#line 39117 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39300 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1896:
-#line 12523 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1899:
+#line 12596 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.order_direction)= ORDER_DESC; }
-#line 39123 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39306 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1897:
-#line 12527 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1900:
+#line 12600 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.limit_clause)= NULL; }
-#line 39129 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39312 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1899:
-#line 12533 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1902:
+#line 12606 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.limit_clause)= NEW_PTN PT_limit_clause((yyvsp[0].limit_options));
           }
-#line 39137 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39320 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1900:
-#line 12540 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1903:
+#line 12613 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.limit_options).limit= (yyvsp[0].item);
             (yyval.limit_options).opt_offset= NULL;
             (yyval.limit_options).is_offset_first= false;
           }
-#line 39147 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39330 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1901:
-#line 12546 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1904:
+#line 12619 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.limit_options).limit= (yyvsp[0].item);
             (yyval.limit_options).opt_offset= (yyvsp[-2].item);
             (yyval.limit_options).is_offset_first= true;
           }
-#line 39157 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39340 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1902:
-#line 12552 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1905:
+#line 12625 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.limit_options).limit= (yyvsp[-2].item);
             (yyval.limit_options).opt_offset= (yyvsp[0].item);
             (yyval.limit_options).is_offset_first= false;
           }
-#line 39167 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39350 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1903:
-#line 12561 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1906:
+#line 12634 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN PTI_limit_option_ident((yyloc), to_lex_cstring((yyvsp[0].lexer.lex_str)));
           }
-#line 39175 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39358 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1904:
-#line 12565 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1907:
+#line 12638 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN PTI_limit_option_param_marker((yyloc), (yyvsp[0].param_marker));
           }
-#line 39183 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
-    break;
-
-  case 1905:
-#line 12569 "sql_yacc.yy" /* yacc.c:1646  */
-    {
-            (yyval.item)= NEW_PTN Item_uint((yyloc), (yyvsp[0].lexer.lex_str).str, (yyvsp[0].lexer.lex_str).length);
-          }
-#line 39191 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39366 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1906:
-#line 12573 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1908:
+#line 12642 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_uint((yyloc), (yyvsp[0].lexer.lex_str).str, (yyvsp[0].lexer.lex_str).length);
           }
-#line 39199 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39374 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1907:
-#line 12577 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1909:
+#line 12646 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_uint((yyloc), (yyvsp[0].lexer.lex_str).str, (yyvsp[0].lexer.lex_str).length);
           }
-#line 39207 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
-    break;
-
-  case 1908:
-#line 12583 "sql_yacc.yy" /* yacc.c:1646  */
-    { (yyval.item)= NULL; }
-#line 39213 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
-    break;
-
-  case 1909:
-#line 12584 "sql_yacc.yy" /* yacc.c:1646  */
-    { (yyval.item)= (yyvsp[0].item); }
-#line 39219 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39382 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 1910:
-#line 12588 "sql_yacc.yy" /* yacc.c:1646  */
-    { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[0].lexer.lex_str).str, nullptr, &error); }
-#line 39225 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 12650 "sql_yacc.yy" /* yacc.c:1646  */
+    {
+            (yyval.item)= NEW_PTN Item_uint((yyloc), (yyvsp[0].lexer.lex_str).str, (yyvsp[0].lexer.lex_str).length);
+          }
+#line 39390 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 1911:
-#line 12589 "sql_yacc.yy" /* yacc.c:1646  */
-    { (yyval.ulong_num)= (ulong) my_strtoll((yyvsp[0].lexer.lex_str).str, (char**) 0, 16); }
-#line 39231 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 12656 "sql_yacc.yy" /* yacc.c:1646  */
+    { (yyval.item)= NULL; }
+#line 39396 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 1912:
-#line 12590 "sql_yacc.yy" /* yacc.c:1646  */
-    { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[0].lexer.lex_str).str, nullptr, &error); }
-#line 39237 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 12657 "sql_yacc.yy" /* yacc.c:1646  */
+    { (yyval.item)= (yyvsp[0].item); }
+#line 39402 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 1913:
-#line 12591 "sql_yacc.yy" /* yacc.c:1646  */
+#line 12661 "sql_yacc.yy" /* yacc.c:1646  */
     { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[0].lexer.lex_str).str, nullptr, &error); }
-#line 39243 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39408 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 1914:
-#line 12592 "sql_yacc.yy" /* yacc.c:1646  */
-    { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[0].lexer.lex_str).str, nullptr, &error); }
-#line 39249 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 12662 "sql_yacc.yy" /* yacc.c:1646  */
+    { (yyval.ulong_num)= (ulong) my_strtoll((yyvsp[0].lexer.lex_str).str, (char**) 0, 16); }
+#line 39414 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 1915:
-#line 12593 "sql_yacc.yy" /* yacc.c:1646  */
+#line 12663 "sql_yacc.yy" /* yacc.c:1646  */
     { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[0].lexer.lex_str).str, nullptr, &error); }
-#line 39255 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39420 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 1916:
-#line 12597 "sql_yacc.yy" /* yacc.c:1646  */
+#line 12664 "sql_yacc.yy" /* yacc.c:1646  */
     { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[0].lexer.lex_str).str, nullptr, &error); }
-#line 39261 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39426 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 1917:
-#line 12598 "sql_yacc.yy" /* yacc.c:1646  */
-    { (yyval.ulong_num)= (ulong) my_strtoll((yyvsp[0].lexer.lex_str).str, (char**) 0, 16); }
-#line 39267 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 12665 "sql_yacc.yy" /* yacc.c:1646  */
+    { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[0].lexer.lex_str).str, nullptr, &error); }
+#line 39432 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 1918:
-#line 12599 "sql_yacc.yy" /* yacc.c:1646  */
+#line 12666 "sql_yacc.yy" /* yacc.c:1646  */
     { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[0].lexer.lex_str).str, nullptr, &error); }
-#line 39273 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39438 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 1919:
-#line 12600 "sql_yacc.yy" /* yacc.c:1646  */
+#line 12670 "sql_yacc.yy" /* yacc.c:1646  */
     { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[0].lexer.lex_str).str, nullptr, &error); }
-#line 39279 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39444 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 1920:
-#line 12601 "sql_yacc.yy" /* yacc.c:1646  */
-    { MYSQL_YYABORT; }
-#line 39285 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 12671 "sql_yacc.yy" /* yacc.c:1646  */
+    { (yyval.ulong_num)= (ulong) my_strtoll((yyvsp[0].lexer.lex_str).str, (char**) 0, 16); }
+#line 39450 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 1921:
-#line 12605 "sql_yacc.yy" /* yacc.c:1646  */
-    { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[0].lexer.lex_str).str, nullptr, &error); }
-#line 39291 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 12672 "sql_yacc.yy" /* yacc.c:1646  */
+    { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[0].lexer.lex_str).str, nullptr, &error); }
+#line 39456 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 1922:
-#line 12606 "sql_yacc.yy" /* yacc.c:1646  */
-    { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[0].lexer.lex_str).str, nullptr, &error); }
-#line 39297 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 12673 "sql_yacc.yy" /* yacc.c:1646  */
+    { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[0].lexer.lex_str).str, nullptr, &error); }
+#line 39462 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 1923:
-#line 12607 "sql_yacc.yy" /* yacc.c:1646  */
-    { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[0].lexer.lex_str).str, nullptr, &error); }
-#line 39303 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 12674 "sql_yacc.yy" /* yacc.c:1646  */
+    { MYSQL_YYABORT; }
+#line 39468 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 1924:
-#line 12608 "sql_yacc.yy" /* yacc.c:1646  */
+#line 12678 "sql_yacc.yy" /* yacc.c:1646  */
     { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[0].lexer.lex_str).str, nullptr, &error); }
-#line 39309 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39474 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 1925:
-#line 12609 "sql_yacc.yy" /* yacc.c:1646  */
+#line 12679 "sql_yacc.yy" /* yacc.c:1646  */
     { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[0].lexer.lex_str).str, nullptr, &error); }
-#line 39315 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39480 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 1926:
-#line 12613 "sql_yacc.yy" /* yacc.c:1646  */
+#line 12680 "sql_yacc.yy" /* yacc.c:1646  */
     { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[0].lexer.lex_str).str, nullptr, &error); }
-#line 39321 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39486 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 1927:
-#line 12614 "sql_yacc.yy" /* yacc.c:1646  */
-    { (yyval.ulonglong_number)= (ulonglong) my_strtoll((yyvsp[0].lexer.lex_str).str, (char**) 0, 16); }
-#line 39327 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 12681 "sql_yacc.yy" /* yacc.c:1646  */
+    { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[0].lexer.lex_str).str, nullptr, &error); }
+#line 39492 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 1928:
-#line 12615 "sql_yacc.yy" /* yacc.c:1646  */
+#line 12682 "sql_yacc.yy" /* yacc.c:1646  */
     { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[0].lexer.lex_str).str, nullptr, &error); }
-#line 39333 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39498 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 1929:
-#line 12616 "sql_yacc.yy" /* yacc.c:1646  */
+#line 12686 "sql_yacc.yy" /* yacc.c:1646  */
     { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[0].lexer.lex_str).str, nullptr, &error); }
-#line 39339 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39504 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 1930:
-#line 12617 "sql_yacc.yy" /* yacc.c:1646  */
-    { MYSQL_YYABORT; }
-#line 39345 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 12687 "sql_yacc.yy" /* yacc.c:1646  */
+    { (yyval.ulonglong_number)= (ulonglong) my_strtoll((yyvsp[0].lexer.lex_str).str, (char**) 0, 16); }
+#line 39510 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 1931:
-#line 12622 "sql_yacc.yy" /* yacc.c:1646  */
-    { YYTHD->syntax_error(ER_ONLY_INTEGERS_ALLOWED); }
-#line 39351 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 12688 "sql_yacc.yy" /* yacc.c:1646  */
+    { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[0].lexer.lex_str).str, nullptr, &error); }
+#line 39516 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+    break;
+
+  case 1932:
+#line 12689 "sql_yacc.yy" /* yacc.c:1646  */
+    { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[0].lexer.lex_str).str, nullptr, &error); }
+#line 39522 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+    break;
+
+  case 1933:
+#line 12690 "sql_yacc.yy" /* yacc.c:1646  */
+    { MYSQL_YYABORT; }
+#line 39528 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
   case 1934:
-#line 12632 "sql_yacc.yy" /* yacc.c:1646  */
+#line 12695 "sql_yacc.yy" /* yacc.c:1646  */
+    { YYTHD->syntax_error(ER_ONLY_INTEGERS_ALLOWED); }
+#line 39534 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+    break;
+
+  case 1937:
+#line 12705 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.select_var_list)= (yyvsp[-2].select_var_list);
             if ((yyval.select_var_list) == NULL || (yyval.select_var_list)->push_back((yyvsp[0].select_var_ident)))
               MYSQL_YYABORT;
           }
-#line 39361 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39544 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1935:
-#line 12638 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1938:
+#line 12711 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.select_var_list)= NEW_PTN PT_select_var_list((yyloc));
             if ((yyval.select_var_list) == NULL || (yyval.select_var_list)->push_back((yyvsp[0].select_var_ident)))
               MYSQL_YYABORT;
           }
-#line 39371 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39554 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1936:
-#line 12647 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1939:
+#line 12720 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.select_var_ident)= NEW_PTN PT_select_var((yyvsp[0].lexer.lex_str));
           }
-#line 39379 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39562 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1937:
-#line 12651 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1940:
+#line 12724 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.select_var_ident)= NEW_PTN PT_select_sp_var((yyvsp[0].lexer.lex_str));
           }
-#line 39387 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39570 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1938:
-#line 12658 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1941:
+#line 12731 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.into_destination)= (yyvsp[0].into_destination);
           }
-#line 39395 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39578 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1939:
-#line 12667 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1942:
+#line 12740 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.into_destination)= NEW_PTN PT_into_destination_outfile((yyloc), (yyvsp[-3].lexer.lex_str), (yyvsp[-2].lexer.charset), (yyvsp[-1].field_separators), (yyvsp[0].line_separators));
           }
-#line 39403 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39586 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1940:
-#line 12671 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1943:
+#line 12744 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.into_destination)= NEW_PTN PT_into_destination_dumpfile((yyloc), (yyvsp[0].lexer.lex_str));
           }
-#line 39411 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39594 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1941:
-#line 12674 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1944:
+#line 12747 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.into_destination)= (yyvsp[0].select_var_list); }
-#line 39417 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39600 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1942:
-#line 12683 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1945:
+#line 12756 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_select_stmt(SQLCOM_DO,
                   NEW_PTN PT_query_expression(
                     NEW_PTN PT_query_specification({}, (yyvsp[0].item_list2))));
           }
-#line 39427 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39610 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1943:
-#line 12696 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1946:
+#line 12769 "sql_yacc.yy" /* yacc.c:1646  */
     {
             // Note: opt_restrict ($6) is ignored!
             LEX *lex=Lex;
@@ -39440,32 +39623,32 @@
                                    YYPS->m_lock_type, YYPS->m_mdl_type))
               MYSQL_YYABORT;
           }
-#line 39444 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39627 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1944:
-#line 12712 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1947:
+#line 12785 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_drop_index_stmt(YYMEM_ROOT, (yyvsp[-3].lexer.lex_str).str, (yyvsp[-1].table),
                                            (yyvsp[0].opt_index_lock_and_algorithm).algo.get_or_default(),
                                            (yyvsp[0].opt_index_lock_and_algorithm).lock.get_or_default());
           }
-#line 39454 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39637 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1945:
-#line 12721 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1948:
+#line 12794 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_DROP_DB;
             lex->drop_if_exists=(yyvsp[-1].num);
             lex->name= (yyvsp[0].lexer.lex_str);
           }
-#line 39465 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39648 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1946:
-#line 12731 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1949:
+#line 12804 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -39488,11 +39671,11 @@
             spname->init_qname(thd);
             lex->spname= spname;
           }
-#line 39492 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39675 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1947:
-#line 12754 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1950:
+#line 12827 "sql_yacc.yy" /* yacc.c:1646  */
     {
             /*
               Unlike DROP PROCEDURE, "DROP FUNCTION ident" should work
@@ -39524,19 +39707,19 @@
             spname->init_qname(thd);
             lex->spname= spname;
           }
-#line 39528 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39711 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1948:
-#line 12789 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1951:
+#line 12862 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_drop_resource_group(to_lex_cstring((yyvsp[-1].lexer.lex_str)), (yyvsp[0].resource_group_flag_type));
           }
-#line 39536 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39719 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1949:
-#line 12796 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1952:
+#line 12869 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex=Lex;
             if (lex->sphead)
@@ -39548,22 +39731,22 @@
             lex->drop_if_exists= (yyvsp[-1].num);
             lex->spname= (yyvsp[0].spname);
           }
-#line 39552 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39735 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1950:
-#line 12811 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1953:
+#line 12884 "sql_yacc.yy" /* yacc.c:1646  */
     {
              LEX *lex=Lex;
              lex->sql_command= SQLCOM_DROP_USER;
              lex->drop_if_exists= (yyvsp[-1].num);
              lex->users_list= *(yyvsp[0].user_list);
           }
-#line 39563 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39746 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1951:
-#line 12821 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1954:
+#line 12894 "sql_yacc.yy" /* yacc.c:1646  */
     {
             // Note: opt_restrict ($5) is ignored!
             LEX *lex= Lex;
@@ -39575,21 +39758,21 @@
                                    YYPS->m_lock_type, YYPS->m_mdl_type))
               MYSQL_YYABORT;
           }
-#line 39579 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39762 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1952:
-#line 12836 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1955:
+#line 12909 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->drop_if_exists= (yyvsp[-1].num);
             Lex->spname= (yyvsp[0].spname);
             Lex->sql_command = SQLCOM_DROP_EVENT;
           }
-#line 39589 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39772 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1953:
-#line 12845 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1956:
+#line 12918 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_DROP_TRIGGER;
@@ -39597,11 +39780,11 @@
             lex->spname= (yyvsp[0].spname);
             Lex->m_sql_cmd= new (YYTHD->mem_root) Sql_cmd_drop_trigger();
           }
-#line 39601 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39784 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1954:
-#line 12856 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1957:
+#line 12929 "sql_yacc.yy" /* yacc.c:1646  */
     {
             auto pc= NEW_PTN Alter_tablespace_parse_context{YYTHD};
             if (pc == NULL)
@@ -39619,11 +39802,11 @@
             Lex->m_sql_cmd= cmd;
             Lex->sql_command= SQLCOM_ALTER_TABLESPACE;
           }
-#line 39623 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39806 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1955:
-#line 12876 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1958:
+#line 12949 "sql_yacc.yy" /* yacc.c:1646  */
     {
             auto pc= NEW_PTN Alter_tablespace_parse_context{YYTHD};
             if (pc == NULL)
@@ -39642,11 +39825,11 @@
             Lex->m_sql_cmd= cmd;
             Lex->sql_command= SQLCOM_ALTER_TABLESPACE;
           }
-#line 39646 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39829 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1956:
-#line 12898 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1959:
+#line 12971 "sql_yacc.yy" /* yacc.c:1646  */
     {
             auto pc= NEW_PTN Alter_tablespace_parse_context{YYTHD};
             if (pc == NULL)
@@ -39665,126 +39848,126 @@
             Lex->m_sql_cmd= cmd;
             Lex->sql_command= SQLCOM_ALTER_TABLESPACE;
           }
-#line 39669 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39852 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1957:
-#line 12921 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1960:
+#line 12994 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->sql_command = SQLCOM_DROP_SERVER;
             Lex->m_sql_cmd= NEW_PTN Sql_cmd_drop_server((yyvsp[0].lexer.lex_str), (yyvsp[-1].num));
           }
-#line 39678 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39861 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1958:
-#line 12929 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1961:
+#line 13002 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_drop_srs((yyvsp[0].ulonglong_number), (yyvsp[-1].num));
           }
-#line 39686 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39869 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1959:
-#line 12936 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1962:
+#line 13009 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_drop_role((yyvsp[-1].num), (yyvsp[0].user_list));
           }
-#line 39694 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39877 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1960:
-#line 12943 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1963:
+#line 13016 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.table_list)= NEW_PTN Mem_root_array<Table_ident *>(YYMEM_ROOT);
             if ((yyval.table_list)->push_back((yyvsp[0].table)))
               MYSQL_YYABORT; // OOM
           }
-#line 39704 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39887 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1961:
-#line 12949 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1964:
+#line 13022 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.table_list)= (yyvsp[-2].table_list);
             if ((yyval.table_list) == NULL || (yyval.table_list)->push_back((yyvsp[0].table)))
               MYSQL_YYABORT; // OOM
           }
-#line 39714 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39897 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1962:
-#line 12958 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1965:
+#line 13031 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.table_ident_list).init(YYMEM_ROOT);
             if ((yyval.table_ident_list).push_back((yyvsp[0].table_ident)))
               MYSQL_YYABORT; // OOM
           }
-#line 39724 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39907 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1963:
-#line 12964 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1966:
+#line 13037 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.table_ident_list)= (yyvsp[-2].table_ident_list);
             if ((yyval.table_ident_list).push_back((yyvsp[0].table_ident)))
               MYSQL_YYABORT; // OOM
           }
-#line 39734 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39917 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1964:
-#line 12972 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1967:
+#line 13045 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= 0; }
-#line 39740 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39923 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1965:
-#line 12973 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1968:
+#line 13046 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= 1; }
-#line 39746 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39929 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1966:
-#line 12977 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1969:
+#line 13050 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.is_not_empty)= false; }
-#line 39752 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39935 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1967:
-#line 12978 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1970:
+#line 13051 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.is_not_empty)= true; }
-#line 39758 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39941 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1968:
-#line 12982 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1971:
+#line 13055 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ts_options)= NULL; }
-#line 39764 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39947 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1970:
-#line 12988 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1973:
+#line 13061 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.ts_options)= NEW_PTN Mem_root_array<PT_alter_tablespace_option_base*>(YYMEM_ROOT);
             if ((yyval.ts_options) == NULL || (yyval.ts_options)->push_back((yyvsp[0].ts_option)))
               MYSQL_YYABORT; /* purecov: inspected */ // OOM
           }
-#line 39774 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39957 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1971:
-#line 12994 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1974:
+#line 13067 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.ts_options)= (yyvsp[-2].ts_options);
             if ((yyval.ts_options)->push_back((yyvsp[0].ts_option)))
               MYSQL_YYABORT; /* purecov: inspected */ // OOM
           }
-#line 39784 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39967 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1974:
-#line 13019 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1977:
+#line 13092 "sql_yacc.yy" /* yacc.c:1646  */
     {
             DBUG_EXECUTE_IF("bug29614521_simulate_oom",
                              DBUG_SET("+d,simulate_out_of_memory"););
@@ -39796,11 +39979,11 @@
             DBUG_EXECUTE_IF("bug29614521_simulate_oom",
                             DBUG_SET("-d,bug29614521_simulate_oom"););
           }
-#line 39800 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39983 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1975:
-#line 13040 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1978:
+#line 13113 "sql_yacc.yy" /* yacc.c:1646  */
     {
             PT_insert_values_list *one_row= NEW_PTN PT_insert_values_list(YYMEM_ROOT);
             if (one_row == NULL || one_row->push_back(&(yyvsp[-2].column_value_list_pair).value_list->value))
@@ -39811,11 +39994,11 @@
                                   (yyvsp[-1].insert_update_values_reference).table_alias, (yyvsp[-1].insert_update_values_reference).column_list,
                                   (yyvsp[0].column_value_list_pair).column_list, (yyvsp[0].column_value_list_pair).value_list);
           }
-#line 39815 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 39998 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1976:
-#line 13058 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1979:
+#line 13131 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_insert(false, (yyvsp[-7].lexer.optimizer_hints), (yyvsp[-6].lock_type), (yyvsp[-5].is_not_empty), (yyvsp[-3].table), (yyvsp[-2].string_list),
                                   (yyvsp[-1].insert_query_expression).column_list, NULL,
@@ -39823,11 +40006,11 @@
                                   NULL_CSTR, NULL,
                                   (yyvsp[0].column_value_list_pair).column_list, (yyvsp[0].column_value_list_pair).value_list);
           }
-#line 39827 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40010 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1977:
-#line 13074 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1980:
+#line 13147 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_insert(true, (yyvsp[-5].lexer.optimizer_hints), (yyvsp[-4].lock_type), false, (yyvsp[-2].table), (yyvsp[-1].string_list),
                                   (yyvsp[0].column_row_value_list_pair).column_list, (yyvsp[0].column_row_value_list_pair).row_value_list,
@@ -39835,11 +40018,11 @@
                                   NULL_CSTR, NULL,
                                   NULL, NULL);
           }
-#line 39839 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40022 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1978:
-#line 13088 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1981:
+#line 13161 "sql_yacc.yy" /* yacc.c:1646  */
     {
             PT_insert_values_list *one_row= NEW_PTN PT_insert_values_list(YYMEM_ROOT);
             if (one_row == NULL || one_row->push_back(&(yyvsp[0].column_value_list_pair).value_list->value))
@@ -39850,11 +40033,11 @@
                                   NULL_CSTR, NULL,
                                   NULL, NULL);
           }
-#line 39854 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40037 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1979:
-#line 13104 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1982:
+#line 13177 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_insert(true, (yyvsp[-5].lexer.optimizer_hints), (yyvsp[-4].lock_type), false, (yyvsp[-2].table), (yyvsp[-1].string_list),
                                   (yyvsp[0].insert_query_expression).column_list, NULL,
@@ -39862,23 +40045,23 @@
                                   NULL_CSTR, NULL,
                                   NULL, NULL);
           }
-#line 39866 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40049 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1980:
-#line 13114 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1983:
+#line 13187 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lock_type)= TL_WRITE_CONCURRENT_DEFAULT; }
-#line 39872 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40055 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1981:
-#line 13115 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1984:
+#line 13188 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lock_type)= TL_WRITE_LOW_PRIORITY; }
-#line 39878 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40061 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1982:
-#line 13117 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1985:
+#line 13190 "sql_yacc.yy" /* yacc.c:1646  */
     {
           (yyval.lock_type)= TL_WRITE_CONCURRENT_DEFAULT;
 
@@ -39887,23 +40070,23 @@
                               ER_THD(YYTHD, ER_WARN_LEGACY_SYNTAX_CONVERTED),
                               "INSERT DELAYED", "INSERT");
         }
-#line 39891 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40074 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1983:
-#line 13125 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1986:
+#line 13198 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lock_type)= TL_WRITE; }
-#line 39897 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40080 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1984:
-#line 13129 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1987:
+#line 13202 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lock_type)= (yyvsp[0].lock_type); }
-#line 39903 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40086 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1985:
-#line 13131 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1988:
+#line 13204 "sql_yacc.yy" /* yacc.c:1646  */
     {
           (yyval.lock_type)= TL_WRITE_DEFAULT;
 
@@ -39912,210 +40095,210 @@
                               ER_THD(YYTHD, ER_WARN_LEGACY_SYNTAX_CONVERTED),
                               "REPLACE DELAYED", "REPLACE");
         }
-#line 39916 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40099 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1988:
-#line 13148 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1991:
+#line 13221 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.column_row_value_list_pair).column_list= NEW_PTN PT_item_list;
             (yyval.column_row_value_list_pair).row_value_list= (yyvsp[0].values_list);
           }
-#line 39925 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40108 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1989:
-#line 13153 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1992:
+#line 13226 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.column_row_value_list_pair).column_list= NEW_PTN PT_item_list;
             (yyval.column_row_value_list_pair).row_value_list= (yyvsp[0].values_list);
           }
-#line 39934 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40117 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1990:
-#line 13158 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1993:
+#line 13231 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.column_row_value_list_pair).column_list= (yyvsp[-2].item_list2);
             (yyval.column_row_value_list_pair).row_value_list= (yyvsp[0].values_list);
           }
-#line 39943 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40126 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1991:
-#line 13166 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1994:
+#line 13239 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.insert_query_expression).column_list= NEW_PTN PT_item_list;
             (yyval.insert_query_expression).insert_query_expression= (yyvsp[0].query_primary);
           }
-#line 39952 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40135 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1992:
-#line 13171 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1995:
+#line 13244 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.insert_query_expression).column_list= NEW_PTN PT_item_list;
             (yyval.insert_query_expression).insert_query_expression= (yyvsp[0].query_primary);
           }
-#line 39961 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40144 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1993:
-#line 13176 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1996:
+#line 13249 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.insert_query_expression).column_list= (yyvsp[-2].item_list2);
             (yyval.insert_query_expression).insert_query_expression= (yyvsp[0].query_primary);
           }
-#line 39970 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40153 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1994:
-#line 13184 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1997:
+#line 13257 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyval.item_list2)->push_back((yyvsp[0].item)))
               MYSQL_YYABORT;
             (yyval.item_list2)= (yyvsp[-2].item_list2);
           }
-#line 39980 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40163 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1995:
-#line 13190 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1998:
+#line 13263 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item_list2)= NEW_PTN PT_item_list;
             if ((yyval.item_list2) == NULL || (yyval.item_list2)->push_back((yyvsp[0].item)))
               MYSQL_YYABORT;
           }
-#line 39990 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40173 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1996:
-#line 13199 "sql_yacc.yy" /* yacc.c:1646  */
+  case 1999:
+#line 13272 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.values_list)= (yyvsp[0].values_list);
           }
-#line 39998 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40181 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1997:
-#line 13205 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2000:
+#line 13278 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.query_primary) = (yyvsp[0].query_expression); }
-#line 40004 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40187 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1998:
-#line 13207 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2001:
+#line 13280 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.query_primary) = NEW_PTN PT_locking((yyvsp[-1].query_expression), (yyvsp[0].locking_clause_list));
           }
-#line 40012 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40195 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 1999:
-#line 13210 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2002:
+#line 13283 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.query_primary) = (yyvsp[0].query_primary); }
-#line 40018 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40201 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2002:
-#line 13220 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2005:
+#line 13293 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyval.values_list)->push_back(&(yyvsp[0].item_list2)->value))
               MYSQL_YYABORT;
           }
-#line 40027 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40210 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2003:
-#line 13225 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2006:
+#line 13298 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.values_list)= NEW_PTN PT_insert_values_list(YYMEM_ROOT);
             if ((yyval.values_list) == NULL || (yyval.values_list)->push_back(&(yyvsp[0].item_list2)->value))
               MYSQL_YYABORT;
           }
-#line 40037 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40220 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2004:
-#line 13235 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2007:
+#line 13308 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyval.values_list)->push_back(&(yyvsp[0].item_list2)->value))
               MYSQL_YYABORT;
           }
-#line 40046 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40229 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2005:
-#line 13240 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2008:
+#line 13313 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.values_list)= NEW_PTN PT_insert_values_list(YYMEM_ROOT);
             if ((yyval.values_list) == nullptr || (yyval.values_list)->push_back(&(yyvsp[0].item_list2)->value))
               MYSQL_YYABORT;
           }
-#line 40056 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40239 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2010:
-#line 13258 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2013:
+#line 13331 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.item_list2)= (yyvsp[-1].item_list2); }
-#line 40062 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40245 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2011:
-#line 13262 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2014:
+#line 13335 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.item_list2)= (yyvsp[-1].item_list2); }
-#line 40068 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40251 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2012:
-#line 13267 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2015:
+#line 13340 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item_list2)= NEW_PTN PT_item_list;
             if ((yyval.item_list2) == NULL)
               MYSQL_YYABORT;
           }
-#line 40078 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40261 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2014:
-#line 13277 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2017:
+#line 13350 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyvsp[-2].item_list2)->push_back((yyvsp[0].item)))
               MYSQL_YYABORT;
             (yyval.item_list2)= (yyvsp[-2].item_list2);
           }
-#line 40088 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40271 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2015:
-#line 13283 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2018:
+#line 13356 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item_list2)= NEW_PTN PT_item_list;
             if ((yyval.item_list2) == NULL || (yyval.item_list2)->push_back((yyvsp[0].item)))
               MYSQL_YYABORT;
           }
-#line 40098 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40281 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2017:
-#line 13293 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2020:
+#line 13366 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_default_value((yyloc));
           }
-#line 40106 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40289 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2018:
-#line 13300 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2021:
+#line 13373 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.insert_update_values_reference).table_alias = NULL_CSTR;
             (yyval.insert_update_values_reference).column_list = NULL;
           }
-#line 40115 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40298 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2019:
-#line 13305 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2022:
+#line 13378 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.insert_update_values_reference).table_alias = to_lex_cstring((yyvsp[-1].lexer.lex_str));
             /* The column list object is short-lived, requiring duplication. */
@@ -40125,60 +40308,60 @@
             (yyval.insert_update_values_reference).column_list =
               static_cast<Create_col_name_list *>(column_list_raw_mem);
           }
-#line 40129 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40312 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2020:
-#line 13318 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2023:
+#line 13391 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.column_value_list_pair).value_list= NULL;
             (yyval.column_value_list_pair).column_list= NULL;
           }
-#line 40138 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40321 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2021:
-#line 13323 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2024:
+#line 13396 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.column_value_list_pair)= (yyvsp[0].column_value_list_pair);
           }
-#line 40146 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40329 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2022:
-#line 13341 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2025:
+#line 13414 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_update((yyvsp[-9].with_clause), (yyvsp[-8].lexer.optimizer_hints), (yyvsp[-7].lock_type), (yyvsp[-6].is_not_empty), (yyvsp[-5].table_reference_list), (yyvsp[-3].column_value_list_pair).column_list, (yyvsp[-3].column_value_list_pair).value_list,
                                   (yyvsp[-2].item), (yyvsp[-1].order), (yyvsp[0].item));
           }
-#line 40155 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40338 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2023:
-#line 13348 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2026:
+#line 13421 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.with_clause)= NULL; }
-#line 40161 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40344 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2024:
-#line 13349 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2027:
+#line 13422 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.with_clause)= (yyvsp[0].with_clause); }
-#line 40167 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40350 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2025:
-#line 13354 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2028:
+#line 13427 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.column_value_list_pair)= (yyvsp[-2].column_value_list_pair);
             if ((yyval.column_value_list_pair).column_list->push_back((yyvsp[0].column_value_pair).column) ||
                 (yyval.column_value_list_pair).value_list->push_back((yyvsp[0].column_value_pair).value))
               MYSQL_YYABORT; // OOM
           }
-#line 40178 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40361 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2026:
-#line 13361 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2029:
+#line 13434 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.column_value_list_pair).column_list= NEW_PTN PT_item_list;
             (yyval.column_value_list_pair).value_list= NEW_PTN PT_item_list;
@@ -40187,257 +40370,257 @@
                 (yyval.column_value_list_pair).value_list->push_back((yyvsp[0].column_value_pair).value))
               MYSQL_YYABORT; // OOM
           }
-#line 40191 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40374 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2027:
-#line 13373 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2030:
+#line 13446 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.column_value_pair).column= (yyvsp[-2].item);
             (yyval.column_value_pair).value= (yyvsp[0].item);
           }
-#line 40200 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40383 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2028:
-#line 13380 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2031:
+#line 13453 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lock_type)= TL_WRITE_DEFAULT; }
-#line 40206 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40389 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2029:
-#line 13381 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2032:
+#line 13454 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lock_type)= TL_WRITE_LOW_PRIORITY; }
-#line 40212 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40395 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2030:
-#line 13397 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2033:
+#line 13470 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_delete((yyvsp[-9].with_clause), (yyvsp[-8].lexer.optimizer_hints), (yyvsp[-7].num), (yyvsp[-5].table), (yyvsp[-4].lex_cstr), (yyvsp[-3].string_list), (yyvsp[-2].item), (yyvsp[-1].order), (yyvsp[0].item));
           }
-#line 40220 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40403 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2031:
-#line 13407 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2034:
+#line 13480 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_delete((yyvsp[-6].with_clause), (yyvsp[-5].lexer.optimizer_hints), (yyvsp[-4].num), (yyvsp[-3].table_ident_list), (yyvsp[-1].table_reference_list), (yyvsp[0].item));
           }
-#line 40228 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40411 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2032:
-#line 13418 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2035:
+#line 13491 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_delete((yyvsp[-7].with_clause), (yyvsp[-6].lexer.optimizer_hints), (yyvsp[-5].num), (yyvsp[-3].table_ident_list), (yyvsp[-1].table_reference_list), (yyvsp[0].item));
           }
-#line 40236 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40419 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2035:
-#line 13429 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2038:
+#line 13502 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= 0; }
-#line 40242 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40425 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2036:
-#line 13430 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2039:
+#line 13503 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= (yyvsp[-1].opt_delete_option) | (yyvsp[0].num); }
-#line 40248 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40431 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2037:
-#line 13434 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2040:
+#line 13507 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.opt_delete_option)= DELETE_QUICK; }
-#line 40254 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40437 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2038:
-#line 13435 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2041:
+#line 13508 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.opt_delete_option)= DELETE_LOW_PRIORITY; }
-#line 40260 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40443 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2039:
-#line 13436 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2042:
+#line 13509 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.opt_delete_option)= DELETE_IGNORE; }
-#line 40266 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40449 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2040:
-#line 13441 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2043:
+#line 13514 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_truncate_table_stmt((yyvsp[0].table));
           }
-#line 40274 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40457 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2043:
-#line 13452 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2046:
+#line 13525 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ulong_num) = 0; }
-#line 40280 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40463 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2046:
-#line 13458 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2049:
+#line 13531 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ulong_num) = (yyvsp[-2].ulong_num) | (yyvsp[0].ulong_num); }
-#line 40286 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40469 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2047:
-#line 13462 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2050:
+#line 13535 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ulong_num) = PROFILE_CPU; }
-#line 40292 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40475 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2048:
-#line 13463 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2051:
+#line 13536 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ulong_num) = PROFILE_MEMORY; }
-#line 40298 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40481 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2049:
-#line 13464 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2052:
+#line 13537 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ulong_num) = PROFILE_BLOCK_IO; }
-#line 40304 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40487 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2050:
-#line 13465 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2053:
+#line 13538 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ulong_num) = PROFILE_CONTEXT; }
-#line 40310 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40493 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2051:
-#line 13466 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2054:
+#line 13539 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ulong_num) = PROFILE_PAGE_FAULTS; }
-#line 40316 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40499 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2052:
-#line 13467 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2055:
+#line 13540 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ulong_num) = PROFILE_IPC; }
-#line 40322 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40505 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2053:
-#line 13468 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2056:
+#line 13541 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ulong_num) = PROFILE_SWAPS; }
-#line 40328 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40511 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2054:
-#line 13469 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2057:
+#line 13542 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ulong_num) = PROFILE_SOURCE; }
-#line 40334 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40517 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2055:
-#line 13470 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2058:
+#line 13543 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ulong_num) = PROFILE_ALL; }
-#line 40340 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40523 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2056:
-#line 13474 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2059:
+#line 13547 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.query_id) = 0; }
-#line 40346 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40529 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2057:
-#line 13476 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2060:
+#line 13549 "sql_yacc.yy" /* yacc.c:1646  */
     {
             int error;
             (yyval.query_id) = static_cast<my_thread_id>(my_strtoll10((yyvsp[0].lexer.lex_str).str, NULL, &error));
             if (error != 0)
               MYSQL_YYABORT;
           }
-#line 40357 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40540 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2058:
-#line 13488 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2061:
+#line 13561 "sql_yacc.yy" /* yacc.c:1646  */
     {
              (yyval.top_level_node) = NEW_PTN PT_show_databases((yyloc), (yyvsp[0].wild_or_where).wild, (yyvsp[0].wild_or_where).where);
            }
-#line 40365 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40548 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2059:
-#line 13494 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2062:
+#line 13567 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_tables((yyloc), (yyvsp[-3].show_cmd_type), (yyvsp[-1].simple_string), (yyvsp[0].wild_or_where).wild, (yyvsp[0].wild_or_where).where);
           }
-#line 40373 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40556 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2060:
-#line 13501 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2063:
+#line 13574 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_triggers((yyloc), (yyvsp[-3].is_not_empty), (yyvsp[-1].simple_string), (yyvsp[0].wild_or_where).wild, (yyvsp[0].wild_or_where).where);
           }
-#line 40381 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40564 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2061:
-#line 13508 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2064:
+#line 13581 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_events((yyloc), (yyvsp[-1].simple_string), (yyvsp[0].wild_or_where).wild, (yyvsp[0].wild_or_where).where);
           }
-#line 40389 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40572 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2062:
-#line 13515 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2065:
+#line 13588 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_table_status((yyloc), (yyvsp[-1].simple_string), (yyvsp[0].wild_or_where).wild, (yyvsp[0].wild_or_where).where);
           }
-#line 40397 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40580 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2063:
-#line 13522 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2066:
+#line 13595 "sql_yacc.yy" /* yacc.c:1646  */
     {
              (yyval.top_level_node) = NEW_PTN PT_show_open_tables((yyloc), (yyvsp[-1].simple_string), (yyvsp[0].wild_or_where).wild, (yyvsp[0].wild_or_where).where);
           }
-#line 40405 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40588 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2064:
-#line 13529 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2067:
+#line 13602 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_plugins((yyloc));
           }
-#line 40413 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40596 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2065:
-#line 13536 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2068:
+#line 13609 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_engine_logs((yyloc), (yyvsp[-1].lexer.lex_str));
           }
-#line 40421 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40604 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2066:
-#line 13543 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2069:
+#line 13616 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_engine_mutex((yyloc), (yyvsp[-1].lexer.lex_str));
           }
-#line 40429 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40612 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2067:
-#line 13550 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2070:
+#line 13623 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_engine_status((yyloc), (yyvsp[-1].lexer.lex_str));
           }
-#line 40437 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40620 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2068:
-#line 13563 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2071:
+#line 13636 "sql_yacc.yy" /* yacc.c:1646  */
     {
             // TODO: error if table_ident is <db>.<table> and opt_db is set.
             if ((yyvsp[-1].simple_string))
@@ -40445,54 +40628,54 @@
 
             (yyval.top_level_node) = NEW_PTN PT_show_fields((yyloc), (yyvsp[-5].show_cmd_type), (yyvsp[-2].table), (yyvsp[0].wild_or_where).wild, (yyvsp[0].wild_or_where).where);
           }
-#line 40449 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40632 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2069:
-#line 13574 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2072:
+#line 13647 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_binlogs((yyloc));
           }
-#line 40457 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40640 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2070:
-#line 13581 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2073:
+#line 13654 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->set_replication_deprecated_syntax_used();
             push_deprecated_warn(YYTHD, "SHOW SLAVE HOSTS", "SHOW REPLICAS");
 
             (yyval.top_level_node) = NEW_PTN PT_show_replicas((yyloc));
           }
-#line 40468 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40651 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2071:
-#line 13588 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2074:
+#line 13661 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_replicas((yyloc));
           }
-#line 40476 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40659 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2072:
-#line 13595 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2075:
+#line 13668 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_binlog_events((yyloc), (yyvsp[-2].lexer.lex_str), (yyvsp[0].limit_clause));
           }
-#line 40484 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40667 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2073:
-#line 13603 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2076:
+#line 13676 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_relaylog_events((yyloc), (yyvsp[-3].lexer.lex_str), (yyvsp[-1].limit_clause), (yyvsp[0].lex_cstr));
           }
-#line 40492 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40675 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2074:
-#line 13616 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2077:
+#line 13689 "sql_yacc.yy" /* yacc.c:1646  */
     {
             // TODO: error if table_ident is <db>.<table> and opt_db is set.
             if ((yyvsp[-1].simple_string))
@@ -40500,51 +40683,51 @@
 
             (yyval.top_level_node) = NEW_PTN PT_show_keys((yyloc), (yyvsp[-5].is_not_empty), (yyvsp[-2].table), (yyvsp[0].item));
           }
-#line 40504 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40687 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2075:
-#line 13627 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2078:
+#line 13700 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_engines((yyloc));
           }
-#line 40512 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40695 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2076:
-#line 13634 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2079:
+#line 13707 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_count_warnings((yyloc));
           }
-#line 40520 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40703 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2077:
-#line 13641 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2080:
+#line 13714 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_count_errors((yyloc));
           }
-#line 40528 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40711 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2078:
-#line 13648 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2081:
+#line 13721 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_warnings((yyloc), (yyvsp[0].limit_clause));
           }
-#line 40536 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40719 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2079:
-#line 13655 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2082:
+#line 13728 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_errors((yyloc), (yyvsp[0].limit_clause));
           }
-#line 40544 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40727 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2080:
-#line 13662 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2083:
+#line 13735 "sql_yacc.yy" /* yacc.c:1646  */
     {
             push_warning_printf(YYTHD, Sql_condition::SL_WARNING,
                                 ER_WARN_DEPRECATED_SYNTAX,
@@ -40552,345 +40735,345 @@
                                 "SHOW PROFILES", "Performance Schema");
             (yyval.top_level_node) = NEW_PTN PT_show_profiles((yyloc));
           }
-#line 40556 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40739 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2081:
-#line 13673 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2084:
+#line 13746 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_profile((yyloc), (yyvsp[-2].ulong_num), (yyvsp[-1].query_id), (yyvsp[0].limit_clause));
           }
-#line 40564 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40747 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2082:
-#line 13680 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2085:
+#line 13753 "sql_yacc.yy" /* yacc.c:1646  */
     {
              (yyval.top_level_node) = NEW_PTN PT_show_status((yyloc), (yyvsp[-2].var_type), (yyvsp[0].wild_or_where).wild, (yyvsp[0].wild_or_where).where);
           }
-#line 40572 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40755 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2083:
-#line 13687 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2086:
+#line 13760 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_processlist((yyloc), (yyvsp[-1].is_not_empty));
           }
-#line 40580 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40763 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2084:
-#line 13694 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2087:
+#line 13767 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_variables((yyloc), (yyvsp[-2].var_type), (yyvsp[0].wild_or_where).wild, (yyvsp[0].wild_or_where).where);
           }
-#line 40588 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40771 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2085:
-#line 13701 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2088:
+#line 13774 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_charsets((yyloc), (yyvsp[0].wild_or_where).wild, (yyvsp[0].wild_or_where).where);
           }
-#line 40596 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40779 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2086:
-#line 13708 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2089:
+#line 13781 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_collations((yyloc), (yyvsp[0].wild_or_where).wild, (yyvsp[0].wild_or_where).where);
           }
-#line 40604 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40787 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2087:
-#line 13715 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2090:
+#line 13788 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_privileges((yyloc));
           }
-#line 40612 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40795 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2088:
-#line 13722 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2091:
+#line 13795 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_grants((yyloc), nullptr, nullptr);
           }
-#line 40620 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40803 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2089:
-#line 13726 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2092:
+#line 13799 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_grants((yyloc), (yyvsp[0].lex_user), nullptr);
           }
-#line 40628 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40811 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2090:
-#line 13730 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2093:
+#line 13803 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_grants((yyloc), (yyvsp[-2].lex_user), (yyvsp[0].user_list));
           }
-#line 40636 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40819 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2091:
-#line 13737 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2094:
+#line 13810 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_create_database((yyloc), (yyvsp[-1].is_not_empty), (yyvsp[0].lexer.lex_str));
           }
-#line 40644 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40827 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2092:
-#line 13744 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2095:
+#line 13817 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_create_table((yyloc), (yyvsp[0].table));
           }
-#line 40652 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40835 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2093:
-#line 13751 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2096:
+#line 13824 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_create_view((yyloc), (yyvsp[0].table));
           }
-#line 40660 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40843 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2094:
-#line 13758 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2097:
+#line 13831 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_master_status((yyloc));
           }
-#line 40668 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40851 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2095:
-#line 13765 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2098:
+#line 13838 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if (Lex->is_replication_deprecated_syntax_used())
               push_deprecated_warn(YYTHD, "SHOW SLAVE STATUS", "SHOW REPLICA STATUS");
             (yyval.top_level_node) = NEW_PTN PT_show_replica_status((yyloc), (yyvsp[0].lex_cstr));
           }
-#line 40678 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40861 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2096:
-#line 13774 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2099:
+#line 13847 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_create_procedure((yyloc), (yyvsp[0].spname));
           }
-#line 40686 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40869 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2097:
-#line 13781 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2100:
+#line 13854 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_create_function((yyloc), (yyvsp[0].spname));
           }
-#line 40694 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40877 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2098:
-#line 13788 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2101:
+#line 13861 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_create_trigger((yyloc), (yyvsp[0].spname));
           }
-#line 40702 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40885 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2099:
-#line 13795 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2102:
+#line 13868 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_status_proc((yyloc), (yyvsp[0].wild_or_where).wild, (yyvsp[0].wild_or_where).where);
           }
-#line 40710 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40893 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2100:
-#line 13802 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2103:
+#line 13875 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_status_func((yyloc), (yyvsp[0].wild_or_where).wild, (yyvsp[0].wild_or_where).where);
           }
-#line 40718 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40901 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2101:
-#line 13809 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2104:
+#line 13882 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_procedure_code((yyloc), (yyvsp[0].spname));
           }
-#line 40726 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40909 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2102:
-#line 13816 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2105:
+#line 13889 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_function_code((yyloc), (yyvsp[0].spname));
           }
-#line 40734 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40917 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2103:
-#line 13823 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2106:
+#line 13896 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_create_event((yyloc), (yyvsp[0].spname));
           }
-#line 40742 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40925 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2104:
-#line 13830 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2107:
+#line 13903 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node) = NEW_PTN PT_show_create_user((yyloc), (yyvsp[0].lex_user));
           }
-#line 40750 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40933 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2106:
-#line 13837 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2109:
+#line 13910 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lexer.lex_str) = {}; }
-#line 40756 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40939 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2111:
-#line 13851 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2114:
+#line 13924 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.simple_string)= 0; }
-#line 40762 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40945 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2112:
-#line 13852 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2115:
+#line 13925 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.simple_string)= (yyvsp[0].lexer.lex_str).str; }
-#line 40768 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40951 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2113:
-#line 13856 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2116:
+#line 13929 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.is_not_empty)= 0; }
-#line 40774 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40957 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2114:
-#line 13857 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2117:
+#line 13930 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.is_not_empty)= 1; }
-#line 40780 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40963 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2115:
-#line 13861 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2118:
+#line 13934 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.is_not_empty)= 0; }
-#line 40786 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40969 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2116:
-#line 13862 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2119:
+#line 13935 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.is_not_empty)= 1; }
-#line 40792 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40975 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2117:
-#line 13866 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2120:
+#line 13939 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.show_cmd_type)= Show_cmd_type::STANDARD; }
-#line 40798 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40981 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2118:
-#line 13867 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2121:
+#line 13940 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.show_cmd_type)= Show_cmd_type::FULL_SHOW; }
-#line 40804 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40987 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2119:
-#line 13868 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2122:
+#line 13941 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.show_cmd_type)= Show_cmd_type::EXTENDED_SHOW; }
-#line 40810 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40993 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2120:
-#line 13869 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2123:
+#line 13942 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.show_cmd_type)= Show_cmd_type::EXTENDED_FULL_SHOW; }
-#line 40816 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 40999 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2123:
-#line 13878 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2126:
+#line 13951 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lexer.lex_str) = {}; }
-#line 40822 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41005 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2124:
-#line 13879 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2127:
+#line 13952 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lexer.lex_str) = (yyvsp[0].lexer.lex_str); }
-#line 40828 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41011 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2125:
-#line 13883 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2128:
+#line 13956 "sql_yacc.yy" /* yacc.c:1646  */
     { Lex->mi.pos = 4; /* skip magic number */ }
-#line 40834 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41017 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2126:
-#line 13884 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2129:
+#line 13957 "sql_yacc.yy" /* yacc.c:1646  */
     { Lex->mi.pos = (yyvsp[0].ulonglong_number); }
-#line 40840 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41023 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2127:
-#line 13888 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2130:
+#line 13961 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.wild_or_where) = {}; }
-#line 40846 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41029 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2128:
-#line 13889 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2131:
+#line 13962 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.wild_or_where) = { (yyvsp[0].lexer.lex_str), {} }; }
-#line 40852 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41035 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2129:
-#line 13890 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2132:
+#line 13963 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.wild_or_where) = { {}, (yyvsp[0].item) }; }
-#line 40858 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41041 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2130:
-#line 13896 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2133:
+#line 13969 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_show_fields((yyloc), Show_cmd_type::STANDARD, (yyvsp[-1].table), (yyvsp[0].lexer.lex_str));
           }
-#line 40866 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41049 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2131:
-#line 13903 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2134:
+#line 13976 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_explain((yyvsp[-1].explain_format_type), (yyvsp[0].top_level_node));
           }
-#line 40874 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41057 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2137:
-#line 13915 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2140:
+#line 13988 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_explain_for_connection(static_cast<my_thread_id>((yyvsp[0].ulong_num)));
           }
-#line 40882 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41065 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2140:
-#line 13927 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2143:
+#line 14000 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.explain_format_type)= Explain_format_type::DEFAULT;
           }
-#line 40890 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41073 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2141:
-#line 13931 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2144:
+#line 14004 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if (is_identifier((yyvsp[0].lexer.lex_str), "JSON"))
               (yyval.explain_format_type)= Explain_format_type::JSON;
@@ -40904,11 +41087,11 @@
               MYSQL_YYABORT;
             }
           }
-#line 40908 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41091 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2142:
-#line 13947 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2145:
+#line 14020 "sql_yacc.yy" /* yacc.c:1646  */
     {
             switch ((yyvsp[0].explain_format_type))
             {
@@ -40926,54 +41109,54 @@
                 MYSQL_YYABORT;
             }
           }
-#line 40930 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41113 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2143:
-#line 13965 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2146:
+#line 14038 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyvsp[0].explain_format_type) == Explain_format_type::DEFAULT)
               (yyval.explain_format_type)= Explain_format_type::TRADITIONAL;
             else
               (yyval.explain_format_type)= (yyvsp[0].explain_format_type);
           }
-#line 40941 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41124 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2144:
-#line 13974 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2147:
+#line 14047 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lexer.lex_str)= LEX_STRING{ nullptr, 0 }; }
-#line 40947 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41130 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2145:
-#line 13976 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2148:
+#line 14049 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyvsp[0].string) != nullptr)
               (yyval.lexer.lex_str)= (yyvsp[0].string)->lex_string();
           }
-#line 40956 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41139 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2147:
-#line 13988 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2150:
+#line 14061 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_FLUSH;
             lex->type= 0;
             lex->no_write_to_binlog= (yyvsp[0].num);
           }
-#line 40967 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41150 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2148:
-#line 13995 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2151:
+#line 14068 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 40973 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41156 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2149:
-#line 14000 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2152:
+#line 14073 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->type|= REFRESH_TABLES;
             /*
@@ -40986,23 +41169,23 @@
                                    YYPS->m_lock_type, YYPS->m_mdl_type))
               MYSQL_YYABORT;
           }
-#line 40990 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41173 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2150:
-#line 14012 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2153:
+#line 14085 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 40996 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41179 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2152:
-#line 14017 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2155:
+#line 14090 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 41002 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41185 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2153:
-#line 14019 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2156:
+#line 14092 "sql_yacc.yy" /* yacc.c:1646  */
     {
             TABLE_LIST *tables= Lex->query_tables;
             Lex->type|= REFRESH_READ_LOCK;
@@ -41014,11 +41197,11 @@
               tables->open_type= OT_BASE_ONLY;      /* Ignore temporary tables. */
             }
           }
-#line 41018 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41201 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2154:
-#line 14031 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2157:
+#line 14104 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if (Lex->query_tables == NULL) // Table list can't be empty
             {
@@ -41026,11 +41209,11 @@
               MYSQL_YYABORT;
             }
           }
-#line 41030 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41213 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2155:
-#line 14039 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2158:
+#line 14112 "sql_yacc.yy" /* yacc.c:1646  */
     {
             TABLE_LIST *tables= Lex->query_tables;
             Lex->type|= REFRESH_FOR_EXPORT;
@@ -41042,179 +41225,179 @@
               tables->open_type= OT_BASE_ONLY;      /* Ignore temporary tables. */
             }
           }
-#line 41046 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41229 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2157:
-#line 14055 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2160:
+#line 14128 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 41052 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41235 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2158:
-#line 14060 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2161:
+#line 14133 "sql_yacc.yy" /* yacc.c:1646  */
     { Lex->type|= REFRESH_ERROR_LOG; }
-#line 41058 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41241 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2159:
-#line 14062 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2162:
+#line 14135 "sql_yacc.yy" /* yacc.c:1646  */
     { Lex->type|= REFRESH_ENGINE_LOG; }
-#line 41064 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41247 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2160:
-#line 14064 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2163:
+#line 14137 "sql_yacc.yy" /* yacc.c:1646  */
     { Lex->type|= REFRESH_GENERAL_LOG; }
-#line 41070 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41253 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2161:
-#line 14066 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2164:
+#line 14139 "sql_yacc.yy" /* yacc.c:1646  */
     { Lex->type|= REFRESH_SLOW_LOG; }
-#line 41076 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41259 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2162:
-#line 14068 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2165:
+#line 14141 "sql_yacc.yy" /* yacc.c:1646  */
     { Lex->type|= REFRESH_BINARY_LOG; }
-#line 41082 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41265 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2163:
-#line 14070 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2166:
+#line 14143 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->type|= REFRESH_RELAY_LOG;
             if (Lex->set_channel_name((yyvsp[0].lex_cstr)))
               MYSQL_YYABORT;  // OOM
           }
-#line 41092 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41275 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2164:
-#line 14076 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2167:
+#line 14149 "sql_yacc.yy" /* yacc.c:1646  */
     { Lex->type|= REFRESH_HOSTS; }
-#line 41098 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41281 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2165:
-#line 14078 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2168:
+#line 14151 "sql_yacc.yy" /* yacc.c:1646  */
     { Lex->type|= REFRESH_GRANT; }
-#line 41104 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41287 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2166:
-#line 14080 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2169:
+#line 14153 "sql_yacc.yy" /* yacc.c:1646  */
     { Lex->type|= REFRESH_LOG; }
-#line 41110 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41293 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2167:
-#line 14082 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2170:
+#line 14155 "sql_yacc.yy" /* yacc.c:1646  */
     { Lex->type|= REFRESH_STATUS; }
-#line 41116 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41299 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2168:
-#line 14084 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2171:
+#line 14157 "sql_yacc.yy" /* yacc.c:1646  */
     { Lex->type|= REFRESH_USER_RESOURCES; }
-#line 41122 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41305 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2169:
-#line 14086 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2172:
+#line 14159 "sql_yacc.yy" /* yacc.c:1646  */
     { Lex->type|= REFRESH_OPTIMIZER_COSTS; }
-#line 41128 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41311 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2170:
-#line 14090 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2173:
+#line 14163 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.table_list)= NULL; }
-#line 41134 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41317 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2172:
-#line 14096 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2175:
+#line 14169 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_RESET; lex->type=0;
           }
-#line 41143 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41326 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2173:
-#line 14101 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2176:
+#line 14174 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 41149 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41332 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2174:
-#line 14103 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2177:
+#line 14176 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_RESET;
             lex->type|= REFRESH_PERSIST;
             lex->option_type= OPT_PERSIST;
           }
-#line 41160 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41343 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2177:
-#line 14118 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2180:
+#line 14191 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex=Lex;
             lex->drop_if_exists= false;
             lex->name= NULL_STR;
           }
-#line 41170 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41353 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2178:
-#line 14124 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2181:
+#line 14197 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex=Lex;
             lex->drop_if_exists= (yyvsp[-1].num);
             lex->name= (yyvsp[0].lexer.lex_str);
           }
-#line 41180 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41363 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2179:
-#line 14133 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2182:
+#line 14206 "sql_yacc.yy" /* yacc.c:1646  */
     {
               Lex->type|= REFRESH_SLAVE;
               Lex->set_replication_deprecated_syntax_used();
               push_deprecated_warn(YYTHD, "RESET SLAVE", "RESET REPLICA");
             }
-#line 41190 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41373 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2180:
-#line 14139 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2183:
+#line 14212 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if (Lex->set_channel_name((yyvsp[0].lex_cstr)))
               MYSQL_YYABORT;  // OOM
           }
-#line 41199 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41382 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2181:
-#line 14144 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2184:
+#line 14217 "sql_yacc.yy" /* yacc.c:1646  */
     { Lex->type|= REFRESH_REPLICA; }
-#line 41205 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41388 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2182:
-#line 14146 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2185:
+#line 14219 "sql_yacc.yy" /* yacc.c:1646  */
     {
           if (Lex->set_channel_name((yyvsp[0].lex_cstr)))
             MYSQL_YYABORT;  // OOM
           }
-#line 41214 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41397 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2183:
-#line 14151 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2186:
+#line 14224 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->type|= REFRESH_MASTER;
             /*
@@ -41230,29 +41413,29 @@
             if (!(YYTHD)->global_read_lock.is_acquired())
               Lex->type|= REFRESH_TABLES | REFRESH_READ_LOCK;
           }
-#line 41234 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41417 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2185:
-#line 14170 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2188:
+#line 14243 "sql_yacc.yy" /* yacc.c:1646  */
     { Lex->reset_slave_info.all= false; }
-#line 41240 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41423 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2186:
-#line 14171 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2189:
+#line 14244 "sql_yacc.yy" /* yacc.c:1646  */
     { Lex->reset_slave_info.all= true; }
-#line 41246 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41429 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2187:
-#line 14175 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2190:
+#line 14248 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 41252 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41435 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2188:
-#line 14177 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2191:
+#line 14250 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyvsp[0].ulonglong_number) == 0 || (yyvsp[0].ulonglong_number) > MAX_ALLOWED_FN_EXT_RESET_MASTER)
             {
@@ -41263,35 +41446,35 @@
             else
               Lex->next_binlog_file_nr = (yyvsp[0].ulonglong_number);
           }
-#line 41267 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41450 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2189:
-#line 14191 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2192:
+#line 14264 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex=Lex;
             lex->type=0;
             lex->sql_command = SQLCOM_PURGE;
           }
-#line 41277 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41460 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2190:
-#line 14197 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2193:
+#line 14270 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 41283 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41466 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2192:
-#line 14206 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2195:
+#line 14279 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->to_log = (yyvsp[0].lexer.lex_str).str;
           }
-#line 41291 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41474 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2193:
-#line 14210 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2196:
+#line 14283 "sql_yacc.yy" /* yacc.c:1646  */
     {
             ITEMIZE((yyvsp[0].item), &(yyvsp[0].item));
 
@@ -41300,11 +41483,11 @@
             lex->purge_value_list.push_front((yyvsp[0].item));
             lex->sql_command= SQLCOM_PURGE_BEFORE;
           }
-#line 41304 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41487 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2194:
-#line 14224 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2197:
+#line 14297 "sql_yacc.yy" /* yacc.c:1646  */
     {
             ITEMIZE((yyvsp[0].item), &(yyvsp[0].item));
 
@@ -41313,39 +41496,39 @@
             lex->kill_value_list.push_front((yyvsp[0].item));
             lex->sql_command= SQLCOM_KILL;
           }
-#line 41317 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41500 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2195:
-#line 14235 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2198:
+#line 14308 "sql_yacc.yy" /* yacc.c:1646  */
     { Lex->type= 0; }
-#line 41323 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41506 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2196:
-#line 14236 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2199:
+#line 14309 "sql_yacc.yy" /* yacc.c:1646  */
     { Lex->type= 0; }
-#line 41329 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41512 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2197:
-#line 14237 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2200:
+#line 14310 "sql_yacc.yy" /* yacc.c:1646  */
     { Lex->type= ONLY_KILL_QUERY; }
-#line 41335 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41518 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2198:
-#line 14244 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2201:
+#line 14317 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex=Lex;
             lex->sql_command=SQLCOM_CHANGE_DB;
             lex->query_block->db= (yyvsp[0].lexer.lex_str).str;
           }
-#line 41345 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41528 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2199:
-#line 14272 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2202:
+#line 14345 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_load_table((yyvsp[-16].filetype),  // data_or_xml
                                       (yyvsp[-15].lock_type),  // load_data_lock
@@ -41364,250 +41547,250 @@
                                       (yyvsp[0].load_set_list).set_expr_list,
                                       (yyvsp[0].load_set_list).set_expr_str_list);
           }
-#line 41368 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41551 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2200:
-#line 14293 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2203:
+#line 14366 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.filetype)= FILETYPE_CSV; }
-#line 41374 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41557 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2201:
-#line 14294 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2204:
+#line 14367 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.filetype)= FILETYPE_XML; }
-#line 41380 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41563 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2202:
-#line 14298 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2205:
+#line 14371 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.is_not_empty)= false; }
-#line 41386 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41569 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2203:
-#line 14299 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2206:
+#line 14372 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.is_not_empty)= true; }
-#line 41392 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41575 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2204:
-#line 14303 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2207:
+#line 14376 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lock_type)= TL_WRITE_DEFAULT; }
-#line 41398 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41581 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2205:
-#line 14304 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2208:
+#line 14377 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lock_type)= TL_WRITE_CONCURRENT_INSERT; }
-#line 41404 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41587 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2206:
-#line 14305 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2209:
+#line 14378 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lock_type)= TL_WRITE_LOW_PRIORITY; }
-#line 41410 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41593 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2207:
-#line 14309 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2210:
+#line 14382 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.on_duplicate)= On_duplicate::ERROR; }
-#line 41416 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41599 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2209:
-#line 14314 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2212:
+#line 14387 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.on_duplicate)= On_duplicate::REPLACE_DUP; }
-#line 41422 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41605 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2210:
-#line 14315 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2213:
+#line 14388 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.on_duplicate)= On_duplicate::IGNORE_DUP; }
-#line 41428 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41611 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2211:
-#line 14319 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2214:
+#line 14392 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.field_separators).cleanup(); }
-#line 41434 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41617 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2212:
-#line 14320 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2215:
+#line 14393 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.field_separators)= (yyvsp[0].field_separators); }
-#line 41440 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41623 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2213:
-#line 14325 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2216:
+#line 14398 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.field_separators)= (yyvsp[-1].field_separators);
             (yyval.field_separators).merge_field_separators((yyvsp[0].field_separators));
           }
-#line 41449 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41632 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2215:
-#line 14334 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2218:
+#line 14407 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.field_separators).cleanup();
             (yyval.field_separators).field_term= (yyvsp[0].string);
           }
-#line 41458 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41641 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2216:
-#line 14339 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2219:
+#line 14412 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.field_separators).cleanup();
             (yyval.field_separators).enclosed= (yyvsp[0].string);
             (yyval.field_separators).opt_enclosed= 1;
           }
-#line 41468 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41651 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2217:
-#line 14345 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2220:
+#line 14418 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.field_separators).cleanup();
             (yyval.field_separators).enclosed= (yyvsp[0].string);
           }
-#line 41477 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41660 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2218:
-#line 14350 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2221:
+#line 14423 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.field_separators).cleanup();
             (yyval.field_separators).escaped= (yyvsp[0].string);
           }
-#line 41486 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41669 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2219:
-#line 14357 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2222:
+#line 14430 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.line_separators).cleanup(); }
-#line 41492 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41675 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2220:
-#line 14358 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2223:
+#line 14431 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.line_separators)= (yyvsp[0].line_separators); }
-#line 41498 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41681 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2221:
-#line 14363 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2224:
+#line 14436 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.line_separators)= (yyvsp[-1].line_separators);
             (yyval.line_separators).merge_line_separators((yyvsp[0].line_separators));
           }
-#line 41507 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41690 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2223:
-#line 14372 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2226:
+#line 14445 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.line_separators).cleanup();
             (yyval.line_separators).line_term= (yyvsp[0].string);
           }
-#line 41516 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41699 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2224:
-#line 14377 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2227:
+#line 14450 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.line_separators).cleanup();
             (yyval.line_separators).line_start= (yyvsp[0].string);
           }
-#line 41525 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41708 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2225:
-#line 14384 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2228:
+#line 14457 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.string)= nullptr; }
-#line 41531 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41714 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2226:
-#line 14385 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2229:
+#line 14458 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.string)= (yyvsp[0].string); }
-#line 41537 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41720 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2227:
-#line 14389 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2230:
+#line 14462 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ulong_num)= 0; }
-#line 41543 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41726 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2228:
-#line 14390 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2231:
+#line 14463 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ulong_num)= atol((yyvsp[-1].lexer.lex_str).str); }
-#line 41549 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41732 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2231:
-#line 14399 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2234:
+#line 14472 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.item_list2)= nullptr; }
-#line 41555 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41738 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2232:
-#line 14400 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2235:
+#line 14473 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.item_list2)= (yyvsp[-1].item_list2); }
-#line 41561 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41744 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2233:
-#line 14401 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2236:
+#line 14474 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.item_list2)= nullptr; }
-#line 41567 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41750 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2234:
-#line 14406 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2237:
+#line 14479 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item_list2)= (yyvsp[-2].item_list2);
             if ((yyval.item_list2)->push_back((yyvsp[0].item)))
               MYSQL_YYABORT; // OOM
           }
-#line 41577 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41760 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2235:
-#line 14412 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2238:
+#line 14485 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item_list2)= NEW_PTN PT_item_list;
             if ((yyval.item_list2) == nullptr || (yyval.item_list2)->push_back((yyvsp[0].item)))
               MYSQL_YYABORT; // OOM
           }
-#line 41587 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41770 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2237:
-#line 14422 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2240:
+#line 14495 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_user_var_as_out_param((yyloc), (yyvsp[0].lexer.lex_str));
           }
-#line 41595 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41778 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2238:
-#line 14428 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2241:
+#line 14501 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.load_set_list)= {nullptr, nullptr, nullptr}; }
-#line 41601 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41784 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2239:
-#line 14429 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2242:
+#line 14502 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.load_set_list)= (yyvsp[0].load_set_list); }
-#line 41607 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41790 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2240:
-#line 14434 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2243:
+#line 14507 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.load_set_list)= (yyvsp[-2].load_set_list);
             if ((yyval.load_set_list).set_var_list->push_back((yyvsp[0].load_set_element).set_var) ||
@@ -41615,11 +41798,11 @@
                 (yyval.load_set_list).set_expr_str_list->push_back((yyvsp[0].load_set_element).set_expr_str))
               MYSQL_YYABORT; // OOM
           }
-#line 41619 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41802 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2241:
-#line 14442 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2244:
+#line 14515 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.load_set_list).set_var_list= NEW_PTN PT_item_list;
             if ((yyval.load_set_list).set_var_list == nullptr ||
@@ -41636,11 +41819,11 @@
                 (yyval.load_set_list).set_expr_str_list->push_back((yyvsp[0].load_set_element).set_expr_str))
               MYSQL_YYABORT; // OOM
           }
-#line 41640 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41823 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2242:
-#line 14462 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2245:
+#line 14535 "sql_yacc.yy" /* yacc.c:1646  */
     {
             size_t length= (yylsp[0]).cpp.end - (yylsp[-1]).cpp.start;
 
@@ -41656,81 +41839,81 @@
             if ((yyval.load_set_element).set_expr_str == nullptr)
               MYSQL_YYABORT; // OOM
           }
-#line 41660 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41843 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2243:
-#line 14483 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2246:
+#line 14556 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.text_literal)= NEW_PTN PTI_text_literal_text_string((yyloc),
                 YYTHD->m_parser_state->m_lip.text_string_is_7bit(), (yyvsp[0].lexer.lex_str));
           }
-#line 41669 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41852 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2244:
-#line 14488 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2247:
+#line 14561 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.text_literal)= NEW_PTN PTI_text_literal_nchar_string((yyloc),
                 YYTHD->m_parser_state->m_lip.text_string_is_7bit(), (yyvsp[0].lexer.lex_str));
             warn_about_deprecated_national(YYTHD);
           }
-#line 41679 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41862 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2245:
-#line 14494 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2248:
+#line 14567 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.text_literal)= NEW_PTN PTI_text_literal_underscore_charset((yyloc),
                 YYTHD->m_parser_state->m_lip.text_string_is_7bit(), (yyvsp[-1].lexer.charset), (yyvsp[0].lexer.lex_str));
           }
-#line 41688 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41871 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2246:
-#line 14499 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2249:
+#line 14572 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.text_literal)= NEW_PTN PTI_text_literal_concat((yyloc),
                 YYTHD->m_parser_state->m_lip.text_string_is_7bit(), (yyvsp[-1].text_literal), (yyvsp[0].lexer.lex_str));
           }
-#line 41697 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41880 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2247:
-#line 14507 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2250:
+#line 14580 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.string)= NEW_PTN String((yyvsp[0].lexer.lex_str).str, (yyvsp[0].lexer.lex_str).length,
                                YYTHD->variables.collation_connection);
             if ((yyval.string) == NULL)
               MYSQL_YYABORT;
           }
-#line 41708 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41891 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2248:
-#line 14514 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2251:
+#line 14587 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX_CSTRING s= Item_hex_string::make_hex_str((yyvsp[0].lexer.lex_str).str, (yyvsp[0].lexer.lex_str).length);
             (yyval.string)= NEW_PTN String(s.str, s.length, &my_charset_bin);
             if ((yyval.string) == NULL)
               MYSQL_YYABORT;
           }
-#line 41719 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41902 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2249:
-#line 14521 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2252:
+#line 14594 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX_CSTRING s= Item_bin_string::make_bin_str((yyvsp[0].lexer.lex_str).str, (yyvsp[0].lexer.lex_str).length);
             (yyval.string)= NEW_PTN String(s.str, s.length, &my_charset_bin);
             if ((yyval.string) == NULL)
               MYSQL_YYABORT;
           }
-#line 41730 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41913 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2250:
-#line 14531 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2253:
+#line 14604 "sql_yacc.yy" /* yacc.c:1646  */
     {
             auto *i= NEW_PTN Item_param((yyloc), YYMEM_ROOT,
                                         (uint) ((yylsp[0]).raw.start - YYLIP->get_buf()));
@@ -41746,28 +41929,28 @@
               MYSQL_YYABORT;
             (yyval.param_marker)= i;
           }
-#line 41750 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41933 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2252:
-#line 14550 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2255:
+#line 14623 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.item)= (yyvsp[0].item_num); }
-#line 41756 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41939 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2253:
-#line 14552 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2256:
+#line 14625 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyvsp[0].item_num) == NULL)
               MYSQL_YYABORT; // OOM
             (yyvsp[0].item_num)->max_length++;
             (yyval.item)= (yyvsp[0].item_num)->neg();
           }
-#line 41767 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41950 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2256:
-#line 14567 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2259:
+#line 14640 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex_input_stream *lip= YYLIP;
             /*
@@ -41779,220 +41962,220 @@
             lip->reduce_digest_token(TOK_GENERIC_VALUE, NULL_SYM);
             (yyval.item)= NEW_PTN Item_null((yyloc));
           }
-#line 41783 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41966 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2257:
-#line 14581 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2260:
+#line 14654 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.item)= (yyvsp[0].text_literal); }
-#line 41789 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41972 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2258:
-#line 14582 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2261:
+#line 14655 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.item)= (yyvsp[0].item_num); }
-#line 41795 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41978 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2260:
-#line 14585 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2263:
+#line 14658 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_false((yyloc));
           }
-#line 41803 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41986 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2261:
-#line 14589 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2264:
+#line 14662 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_func_true((yyloc));
           }
-#line 41811 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 41994 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2262:
-#line 14593 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2265:
+#line 14666 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_hex_string((yyloc), (yyvsp[0].lexer.lex_str));
           }
-#line 41819 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42002 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2263:
-#line 14597 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2266:
+#line 14670 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_bin_string((yyloc), (yyvsp[0].lexer.lex_str));
           }
-#line 41827 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42010 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2264:
-#line 14601 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2267:
+#line 14674 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN PTI_literal_underscore_charset_hex_num((yyloc), (yyvsp[-1].lexer.charset), (yyvsp[0].lexer.lex_str));
           }
-#line 41835 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42018 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2265:
-#line 14605 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2268:
+#line 14678 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN PTI_literal_underscore_charset_bin_num((yyloc), (yyvsp[-1].lexer.charset), (yyvsp[0].lexer.lex_str));
           }
-#line 41843 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42026 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2269:
-#line 14618 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2272:
+#line 14691 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item_num)= NEW_PTN Item_decimal((yyloc), (yyvsp[0].lexer.lex_str).str, (yyvsp[0].lexer.lex_str).length, YYCSCL);
           }
-#line 41851 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42034 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2270:
-#line 14622 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2273:
+#line 14695 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item_num)= NEW_PTN Item_float((yyloc), (yyvsp[0].lexer.lex_str).str, (yyvsp[0].lexer.lex_str).length);
           }
-#line 41859 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42042 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2271:
-#line 14632 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2274:
+#line 14705 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.item_num) = NEW_PTN Item_int((yyloc), (yyvsp[0].lexer.lex_str)); }
-#line 41865 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42048 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2272:
-#line 14633 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2275:
+#line 14706 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.item_num) = NEW_PTN Item_int((yyloc), (yyvsp[0].lexer.lex_str)); }
-#line 41871 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42054 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2273:
-#line 14634 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2276:
+#line 14707 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.item_num) = NEW_PTN Item_uint((yyloc), (yyvsp[0].lexer.lex_str).str, (yyvsp[0].lexer.lex_str).length); }
-#line 41877 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42060 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2274:
-#line 14640 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2277:
+#line 14713 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN PTI_temporal_literal((yyloc), (yyvsp[0].lexer.lex_str), MYSQL_TYPE_DATE, YYCSCL);
           }
-#line 41885 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42068 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2275:
-#line 14644 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2278:
+#line 14717 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN PTI_temporal_literal((yyloc), (yyvsp[0].lexer.lex_str), MYSQL_TYPE_TIME, YYCSCL);
           }
-#line 41893 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42076 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2276:
-#line 14648 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2279:
+#line 14721 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN PTI_temporal_literal((yyloc), (yyvsp[0].lexer.lex_str), MYSQL_TYPE_DATETIME, YYCSCL);
           }
-#line 41901 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42084 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2277:
-#line 14654 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2280:
+#line 14727 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.is_not_empty) = false; }
-#line 41907 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42090 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2278:
-#line 14655 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2281:
+#line 14728 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.is_not_empty) = true; }
-#line 41913 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42096 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2281:
-#line 14670 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2284:
+#line 14743 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item) = NEW_PTN Item_asterisk((yyloc), nullptr, (yyvsp[-2].lexer.lex_str).str);
           }
-#line 41921 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42104 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2282:
-#line 14674 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2285:
+#line 14747 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if (check_and_convert_db_name(&(yyvsp[-4].lexer.lex_str), false) != Ident_name_check::OK)
               MYSQL_YYABORT;
             auto schema_name = YYCLIENT_NO_SCHEMA ? nullptr : (yyvsp[-4].lexer.lex_str).str;
             (yyval.item) = NEW_PTN Item_asterisk((yyloc), schema_name, (yyvsp[-2].lexer.lex_str).str);
           }
-#line 41932 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42115 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2283:
-#line 14684 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2286:
+#line 14757 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.order_expr)= NEW_PTN PT_order_expr((yyvsp[-1].item), (yyvsp[0].order_direction));
           }
-#line 41940 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42123 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2284:
-#line 14691 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2287:
+#line 14764 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.order_expr)= NEW_PTN PT_order_expr((yyvsp[0].item), ORDER_NOT_RELEVANT);
           }
-#line 41948 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42131 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2285:
-#line 14698 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2288:
+#line 14771 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN PTI_simple_ident_ident((yyloc), to_lex_cstring((yyvsp[0].lexer.lex_str)));
           }
-#line 41956 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42139 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2287:
-#line 14706 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2290:
+#line 14779 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN PTI_simple_ident_nospvar_ident((yyloc), (yyvsp[0].lexer.lex_str));
           }
-#line 41964 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42147 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2289:
-#line 14714 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2292:
+#line 14787 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN PTI_simple_ident_q_2d((yyloc), (yyvsp[-2].lexer.lex_str).str, (yyvsp[0].lexer.lex_str).str);
           }
-#line 41972 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42155 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2290:
-#line 14718 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2293:
+#line 14791 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if (check_and_convert_db_name(&(yyvsp[-4].lexer.lex_str), false) != Ident_name_check::OK)
               MYSQL_YYABORT;
             (yyval.item)= NEW_PTN PTI_simple_ident_q_3d((yyloc), (yyvsp[-4].lexer.lex_str).str, (yyvsp[-2].lexer.lex_str).str, (yyvsp[0].lexer.lex_str).str);
           }
-#line 41982 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42165 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2291:
-#line 14727 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2294:
+#line 14800 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.table)= NEW_PTN Table_ident(to_lex_cstring((yyvsp[0].lexer.lex_str)));
             if ((yyval.table) == NULL)
               MYSQL_YYABORT;
           }
-#line 41992 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42175 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2292:
-#line 14733 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2295:
+#line 14806 "sql_yacc.yy" /* yacc.c:1646  */
     {
             auto schema_name = YYCLIENT_NO_SCHEMA ? LEX_CSTRING{}
                                                   : to_lex_cstring((yyvsp[-2].lexer.lex_str).str);
@@ -42000,21 +42183,21 @@
             if ((yyval.table) == NULL)
               MYSQL_YYABORT;
           }
-#line 42004 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42187 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2293:
-#line 14744 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2296:
+#line 14817 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.table_ident)= NEW_PTN Table_ident(to_lex_cstring((yyvsp[-1].lexer.lex_str)));
             if ((yyval.table_ident) == NULL)
               MYSQL_YYABORT;
           }
-#line 42014 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42197 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2294:
-#line 14750 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2297:
+#line 14823 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.table_ident)= NEW_PTN Table_ident(YYTHD->get_protocol(),
                                     to_lex_cstring((yyvsp[-3].lexer.lex_str)),
@@ -42022,17 +42205,17 @@
             if ((yyval.table_ident) == NULL)
               MYSQL_YYABORT;
           }
-#line 42026 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42209 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2295:
-#line 14760 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2298:
+#line 14833 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lexer.lex_str)= (yyvsp[0].lexer.lex_str); }
-#line 42032 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42215 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2296:
-#line 14762 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2299:
+#line 14835 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
 
@@ -42059,11 +42242,11 @@
                 MYSQL_YYABORT;
             }
           }
-#line 42063 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42246 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2297:
-#line 14792 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2300:
+#line 14865 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if (!strcont((yyvsp[0].lexer.lex_str).str, "\n"))
               (yyval.lexer.lex_str)= (yyvsp[0].lexer.lex_str);
@@ -42073,11 +42256,11 @@
               MYSQL_YYABORT;
             }
           }
-#line 42077 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42260 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2298:
-#line 14805 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2301:
+#line 14878 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if (strcont((yyvsp[0].lexer.lex_str).str, "."))
               (yyval.lexer.lex_str)= (yyvsp[0].lexer.lex_str);
@@ -42087,11 +42270,11 @@
               MYSQL_YYABORT;
             }
           }
-#line 42091 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42274 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2299:
-#line 14818 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2302:
+#line 14891 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
 
@@ -42104,11 +42287,11 @@
                 MYSQL_YYABORT;
             }
           }
-#line 42108 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42291 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2300:
-#line 14834 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2303:
+#line 14907 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
 
@@ -42121,11 +42304,11 @@
                 MYSQL_YYABORT;
             }
           }
-#line 42125 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42308 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2301:
-#line 14850 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2304:
+#line 14923 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
 
@@ -42139,19 +42322,19 @@
                 MYSQL_YYABORT;
             }
           }
-#line 42143 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42326 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2304:
-#line 14872 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2307:
+#line 14945 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.lexer.lex_str)= to_lex_string(Item_hex_string::make_hex_str((yyvsp[0].lexer.lex_str).str, (yyvsp[0].lexer.lex_str).length));
           }
-#line 42151 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42334 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2305:
-#line 14879 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2308:
+#line 14952 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
 
@@ -42164,17 +42347,17 @@
                 MYSQL_YYABORT;
             }
           }
-#line 42168 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42351 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2306:
-#line 14894 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2309:
+#line 14967 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lexer.lex_str)=(yyvsp[0].lexer.lex_str); }
-#line 42174 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42357 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2307:
-#line 14896 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2310:
+#line 14969 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             (yyval.lexer.lex_str).str= thd->strmake((yyvsp[0].lexer.keyword).str, (yyvsp[0].lexer.keyword).length);
@@ -42182,28 +42365,28 @@
               MYSQL_YYABORT;
             (yyval.lexer.lex_str).length= (yyvsp[0].lexer.keyword).length;
           }
-#line 42186 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42369 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2309:
-#line 14908 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2312:
+#line 14981 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.lexer.lex_str).str= YYTHD->strmake((yyvsp[0].lexer.keyword).str, (yyvsp[0].lexer.keyword).length);
             if ((yyval.lexer.lex_str).str == NULL)
               MYSQL_YYABORT;
             (yyval.lexer.lex_str).length= (yyvsp[0].lexer.keyword).length;
           }
-#line 42197 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42380 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2310:
-#line 14917 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2313:
+#line 14990 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lex_cstr)=to_lex_cstring((yyvsp[0].lexer.lex_str)); }
-#line 42203 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42386 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2311:
-#line 14919 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2314:
+#line 14992 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             (yyval.lex_cstr).str= thd->strmake((yyvsp[0].lexer.keyword).str, (yyvsp[0].lexer.keyword).length);
@@ -42211,152 +42394,151 @@
               MYSQL_YYABORT;
             (yyval.lex_cstr).length= (yyvsp[0].lexer.keyword).length;
           }
-#line 42215 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42398 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2313:
-#line 14931 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2316:
+#line 15004 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.lexer.lex_str).str= YYTHD->strmake((yyvsp[0].lexer.keyword).str, (yyvsp[0].lexer.keyword).length);
             if ((yyval.lexer.lex_str).str == NULL)
               MYSQL_YYABORT;
             (yyval.lexer.lex_str).length= (yyvsp[0].lexer.keyword).length;
           }
-#line 42226 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42409 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2314:
-#line 14940 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2317:
+#line 15013 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lexer.lex_str)=(yyvsp[0].lexer.lex_str);}
-#line 42232 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42415 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2315:
-#line 14941 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2318:
+#line 15014 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lexer.lex_str)=(yyvsp[0].lexer.lex_str);}
-#line 42238 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42421 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2316:
-#line 14942 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2319:
+#line 15015 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lexer.lex_str)=(yyvsp[0].lexer.lex_str);}
-#line 42244 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42427 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2320:
-#line 14953 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2323:
+#line 15026 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if (!((yyval.lex_user)= LEX_USER::alloc(YYTHD, &(yyvsp[0].lexer.lex_str), NULL)))
               MYSQL_YYABORT;
           }
-#line 42253 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42436 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2321:
-#line 14958 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2324:
+#line 15031 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if (!((yyval.lex_user)= LEX_USER::alloc(YYTHD, &(yyvsp[-2].lexer.lex_str), &(yyvsp[0].lexer.lex_str))))
               MYSQL_YYABORT;
           }
-#line 42262 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42445 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2322:
-#line 14966 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2325:
+#line 15039 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.lex_user)=(yyvsp[0].lex_user);
           }
-#line 42270 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42453 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2323:
-#line 14970 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2326:
+#line 15043 "sql_yacc.yy" /* yacc.c:1646  */
     {
-            if (!((yyval.lex_user)=(LEX_USER*) YYTHD->alloc(sizeof(LEX_USER))))
+            if (!((yyval.lex_user)= LEX_USER::alloc(YYTHD)))
               MYSQL_YYABORT;
             /*
               empty LEX_USER means current_user and
               will be handled in the  get_current_user() function
               later
             */
-            memset((yyval.lex_user), 0, sizeof(LEX_USER));
           }
-#line 42285 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42467 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2324:
-#line 14984 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2327:
+#line 15056 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if (!((yyval.lex_user)= LEX_USER::alloc(YYTHD, &(yyvsp[0].lexer.lex_str), NULL)))
               MYSQL_YYABORT;
           }
-#line 42294 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42476 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2325:
-#line 14989 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2328:
+#line 15061 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if (!((yyval.lex_user)= LEX_USER::alloc(YYTHD, &(yyvsp[-2].lexer.lex_str), &(yyvsp[0].lexer.lex_str))))
               MYSQL_YYABORT;
           }
-#line 42303 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42485 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2326:
-#line 14997 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2329:
+#line 15069 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.lexer.lex_str) = (yyvsp[0].lexer.lex_str);
             if (check_and_convert_db_name(&(yyval.lexer.lex_str), false) != Ident_name_check::OK)
               MYSQL_YYABORT;
           }
-#line 42313 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42495 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2809:
-#line 15582 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2821:
+#line 15663 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.set)= NEW_PTN PT_set((yylsp[-1]), (yyvsp[0].start_option_value_list));
           }
-#line 42321 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42503 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2810:
-#line 15591 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2822:
+#line 15672 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.start_option_value_list)= NEW_PTN PT_start_option_value_list_no_type((yyvsp[-1].option_value_no_option_type), (yylsp[-1]), (yyvsp[0].option_value_list));
           }
-#line 42329 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42511 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2811:
-#line 15595 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2823:
+#line 15676 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.start_option_value_list)= NEW_PTN PT_start_option_value_list_transaction((yyvsp[0].transaction_characteristics), (yylsp[0]));
           }
-#line 42337 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42519 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2812:
-#line 15599 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2824:
+#line 15680 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.start_option_value_list)= NEW_PTN PT_start_option_value_list_type((yyvsp[-1].var_type), (yyvsp[0].start_option_value_list_following_option_type));
           }
-#line 42345 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42527 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2813:
-#line 15603 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2825:
+#line 15684 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.start_option_value_list)= NEW_PTN PT_option_value_no_option_type_password((yyvsp[-2].lexer.lex_str).str, (yyvsp[-1].lex_cstr).str,
                                                                 (yyvsp[0].is_not_empty),
                                                                 false,
                                                                 (yylsp[-1]));
           }
-#line 42356 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42538 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2814:
-#line 15610 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2826:
+#line 15691 "sql_yacc.yy" /* yacc.c:1646  */
     {
             // RANDOM PASSWORD GENERATION AND RETURN RESULT SET...
             (yyval.start_option_value_list)= NEW_PTN PT_option_value_no_option_type_password((yyvsp[-2].lexer.keyword).str, (yyvsp[-1].lex_cstr).str,
@@ -42364,11 +42546,11 @@
                                                                 true,
                                                                 (yylsp[-1]));
           }
-#line 42368 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42550 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2815:
-#line 15618 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2827:
+#line 15699 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.start_option_value_list)= NEW_PTN PT_option_value_no_option_type_password_for((yyvsp[-4].lex_user), (yyvsp[-2].lexer.lex_str).str,
                                                                     (yyvsp[-1].lex_cstr).str,
@@ -42376,11 +42558,11 @@
                                                                     false,
                                                                     (yylsp[-1]));
           }
-#line 42380 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42562 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2816:
-#line 15626 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2828:
+#line 15707 "sql_yacc.yy" /* yacc.c:1646  */
     {
             // RANDOM PASSWORD GENERATION AND RETURN RESULT SET...
             (yyval.start_option_value_list)= NEW_PTN PT_option_value_no_option_type_password_for((yyvsp[-4].lex_user), (yyvsp[-2].lexer.keyword).str,
@@ -42389,533 +42571,533 @@
                                                                     true,
                                                                     (yylsp[-1]));
           }
-#line 42393 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42575 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2817:
-#line 15638 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2829:
+#line 15719 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_set_role((yyvsp[0].user_list));
           }
-#line 42401 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42583 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2818:
-#line 15642 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2830:
+#line 15723 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_set_role(role_enum::ROLE_NONE);
             Lex->sql_command= SQLCOM_SET_ROLE;
           }
-#line 42410 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42592 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2819:
-#line 15647 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2831:
+#line 15728 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_set_role(role_enum::ROLE_DEFAULT);
             Lex->sql_command= SQLCOM_SET_ROLE;
           }
-#line 42419 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42601 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2820:
-#line 15652 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2832:
+#line 15733 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_alter_user_default_role(false, (yyvsp[0].user_list), (yyvsp[-2].user_list),
                                                     role_enum::ROLE_NAME);
           }
-#line 42428 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42610 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2821:
-#line 15657 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2833:
+#line 15738 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_alter_user_default_role(false, (yyvsp[0].user_list), NULL,
                                                    role_enum::ROLE_NONE);
           }
-#line 42437 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42619 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2822:
-#line 15662 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2834:
+#line 15743 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_alter_user_default_role(false, (yyvsp[0].user_list), NULL,
                                                    role_enum::ROLE_ALL);
           }
-#line 42446 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42628 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2823:
-#line 15667 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2835:
+#line 15748 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_set_role(role_enum::ROLE_ALL, (yyvsp[0].user_list));
             Lex->sql_command= SQLCOM_SET_ROLE;
           }
-#line 42455 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42637 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2824:
-#line 15674 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2836:
+#line 15755 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.user_list)= NULL; }
-#line 42461 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42643 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2825:
-#line 15675 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2837:
+#line 15756 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.user_list)= (yyvsp[0].user_list); }
-#line 42467 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42649 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2826:
-#line 15680 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2838:
+#line 15761 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_set_resource_group(to_lex_cstring((yyvsp[0].lexer.lex_str)), nullptr);
           }
-#line 42475 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42657 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2827:
-#line 15684 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2839:
+#line 15765 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_set_resource_group(to_lex_cstring((yyvsp[-2].lexer.lex_str)), (yyvsp[0].thread_id_list_type));
           }
-#line 42483 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42665 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2828:
-#line 15691 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2840:
+#line 15772 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.thread_id_list_type)= NEW_PTN Mem_root_array<ulonglong>(YYMEM_ROOT);
             if ((yyval.thread_id_list_type) == nullptr || (yyval.thread_id_list_type)->push_back((yyvsp[0].ulong_num)))
               MYSQL_YYABORT; // OOM
           }
-#line 42493 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42675 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2829:
-#line 15697 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2841:
+#line 15778 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.thread_id_list_type)= (yyvsp[-2].thread_id_list_type);
             if ((yyval.thread_id_list_type)->push_back((yyvsp[0].ulong_num)))
               MYSQL_YYABORT; // OOM
           }
-#line 42503 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42685 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2830:
-#line 15705 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2842:
+#line 15786 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.thread_id_list_type)= (yyvsp[0].thread_id_list_type); }
-#line 42509 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42691 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2831:
-#line 15711 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2843:
+#line 15792 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.start_option_value_list_following_option_type)=
               NEW_PTN PT_start_option_value_list_following_option_type_eq((yyvsp[-1].option_value_following_option_type),
                                                                           (yylsp[-1]),
                                                                           (yyvsp[0].option_value_list));
           }
-#line 42520 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42702 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2832:
-#line 15718 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2844:
+#line 15799 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.start_option_value_list_following_option_type)= NEW_PTN
               PT_start_option_value_list_following_option_type_transaction((yyvsp[0].transaction_characteristics),
                                                                            (yylsp[0]));
           }
-#line 42530 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42712 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2833:
-#line 15727 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2845:
+#line 15808 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.option_value_list)= NULL; }
-#line 42536 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42718 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2834:
-#line 15728 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2846:
+#line 15809 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.option_value_list)= (yyvsp[0].option_value_list); }
-#line 42542 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42724 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2835:
-#line 15734 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2847:
+#line 15815 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.option_value_list)= NEW_PTN PT_option_value_list_head((yylsp[-1]), (yyvsp[0].node), (yylsp[0]));
           }
-#line 42550 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42732 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2836:
-#line 15738 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2848:
+#line 15819 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.option_value_list)= NEW_PTN PT_option_value_list((yyvsp[-2].option_value_list), (yylsp[-1]), (yyvsp[0].node), (yylsp[0]));
           }
-#line 42558 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42740 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2837:
-#line 15746 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2849:
+#line 15827 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.node)= NEW_PTN PT_option_value_type((yyvsp[-1].var_type), (yyvsp[0].option_value_following_option_type));
           }
-#line 42566 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42748 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2838:
-#line 15749 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2850:
+#line 15830 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.node)= (yyvsp[0].option_value_no_option_type); }
-#line 42572 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42754 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2839:
-#line 15753 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2851:
+#line 15834 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.var_type)=OPT_GLOBAL; }
-#line 42578 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42760 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2840:
-#line 15754 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2852:
+#line 15835 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.var_type)=OPT_PERSIST; }
-#line 42584 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42766 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2841:
-#line 15755 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2853:
+#line 15836 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.var_type)=OPT_PERSIST_ONLY; }
-#line 42590 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42772 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2842:
-#line 15756 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2854:
+#line 15837 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.var_type)=OPT_SESSION; }
-#line 42596 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42778 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2843:
-#line 15757 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2855:
+#line 15838 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.var_type)=OPT_SESSION; }
-#line 42602 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42784 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2844:
-#line 15761 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2856:
+#line 15842 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.var_type)=OPT_SESSION; }
-#line 42608 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42790 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2845:
-#line 15762 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2857:
+#line 15843 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.var_type)=OPT_GLOBAL; }
-#line 42614 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42796 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2846:
-#line 15763 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2858:
+#line 15844 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.var_type)=OPT_SESSION; }
-#line 42620 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42802 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2847:
-#line 15764 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2859:
+#line 15845 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.var_type)=OPT_SESSION; }
-#line 42626 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42808 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2848:
-#line 15768 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2860:
+#line 15849 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.var_type)=OPT_DEFAULT; }
-#line 42632 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42814 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2849:
-#line 15769 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2861:
+#line 15850 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.var_type)=OPT_GLOBAL; }
-#line 42638 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42820 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2850:
-#line 15770 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2862:
+#line 15851 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.var_type)=OPT_SESSION; }
-#line 42644 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42826 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2851:
-#line 15771 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2863:
+#line 15852 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.var_type)=OPT_SESSION; }
-#line 42650 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42832 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2852:
-#line 15775 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2864:
+#line 15856 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.var_type)=OPT_DEFAULT; }
-#line 42656 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42838 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2853:
-#line 15776 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2865:
+#line 15857 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.var_type)=OPT_PERSIST; }
-#line 42662 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42844 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2854:
-#line 15777 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2866:
+#line 15858 "sql_yacc.yy" /* yacc.c:1646  */
     {(yyval.var_type)=OPT_PERSIST_ONLY; }
-#line 42668 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42850 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2855:
-#line 15778 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2867:
+#line 15859 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.var_type)=OPT_GLOBAL; }
-#line 42674 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42856 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2856:
-#line 15779 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2868:
+#line 15860 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.var_type)=OPT_SESSION; }
-#line 42680 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42862 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2857:
-#line 15780 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2869:
+#line 15861 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.var_type)=OPT_SESSION; }
-#line 42686 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42868 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2858:
-#line 15786 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2870:
+#line 15867 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.option_value_following_option_type)= NEW_PTN PT_option_value_following_option_type((yyloc), (yyvsp[-2].internal_variable_name), (yyvsp[0].item));
           }
-#line 42694 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42876 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2859:
-#line 15796 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2871:
+#line 15877 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.option_value_no_option_type)= NEW_PTN PT_option_value_no_option_type_internal((yyvsp[-2].internal_variable_name), (yyvsp[0].item), (yylsp[0]));
           }
-#line 42702 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42884 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2860:
-#line 15800 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2872:
+#line 15881 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.option_value_no_option_type)= NEW_PTN PT_option_value_no_option_type_user_var((yyvsp[-2].lexer.lex_str), (yyvsp[0].item));
           }
-#line 42710 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42892 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2861:
-#line 15805 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2873:
+#line 15886 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.option_value_no_option_type)= NEW_PTN PT_option_value_no_option_type_sys_var((yyvsp[-3].var_type), (yyvsp[-2].internal_variable_name), (yyvsp[0].item));
           }
-#line 42718 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42900 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2862:
-#line 15809 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2874:
+#line 15890 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.option_value_no_option_type)= NEW_PTN PT_option_value_no_option_type_charset((yyvsp[0].lexer.charset));
           }
-#line 42726 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42908 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2863:
-#line 15813 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2875:
+#line 15894 "sql_yacc.yy" /* yacc.c:1646  */
     {
             /*
               Bad syntax, always fails with an error
             */
             (yyval.option_value_no_option_type)= NEW_PTN PT_option_value_no_option_type_names((yylsp[-1]));
           }
-#line 42737 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42919 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2864:
-#line 15820 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2876:
+#line 15901 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.option_value_no_option_type)= NEW_PTN PT_set_names((yyvsp[-1].lexer.charset), (yyvsp[0].lexer.charset));
           }
-#line 42745 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42927 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2865:
-#line 15824 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2877:
+#line 15905 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.option_value_no_option_type) = NEW_PTN PT_set_names(nullptr, nullptr);
           }
-#line 42753 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42935 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2866:
-#line 15831 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2878:
+#line 15912 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.internal_variable_name)= NEW_PTN PT_internal_variable_name_1d(to_lex_cstring((yyvsp[0].lexer.lex_str)));
           }
-#line 42761 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42943 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2867:
-#line 15835 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2879:
+#line 15916 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.internal_variable_name)= NEW_PTN PT_internal_variable_name_2d((yyloc), to_lex_cstring((yyvsp[-2].lexer.lex_str)), to_lex_cstring((yyvsp[0].lexer.lex_str)));
           }
-#line 42769 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42951 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2868:
-#line 15839 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2880:
+#line 15920 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.internal_variable_name)= NEW_PTN PT_internal_variable_name_default((yyvsp[0].lexer.lex_str));
           }
-#line 42777 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42959 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2869:
-#line 15846 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2881:
+#line 15927 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.transaction_characteristics)= NEW_PTN PT_transaction_characteristics((yyvsp[-1].transaction_access_mode), (yyvsp[0].isolation_level));
           }
-#line 42785 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42967 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2870:
-#line 15850 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2882:
+#line 15931 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.transaction_characteristics)= NEW_PTN PT_transaction_characteristics((yyvsp[-1].isolation_level), (yyvsp[0].transaction_access_mode));
           }
-#line 42793 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42975 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2871:
-#line 15857 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2883:
+#line 15938 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.transaction_access_mode)= NEW_PTN PT_transaction_access_mode((yyvsp[0].num));
           }
-#line 42801 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42983 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2872:
-#line 15863 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2884:
+#line 15944 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.transaction_access_mode)= NULL; }
-#line 42807 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42989 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2873:
-#line 15864 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2885:
+#line 15945 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.transaction_access_mode)= (yyvsp[0].transaction_access_mode); }
-#line 42813 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 42995 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2874:
-#line 15869 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2886:
+#line 15950 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.isolation_level)= NEW_PTN PT_isolation_level((yyvsp[0].tx_isolation));
           }
-#line 42821 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43003 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2875:
-#line 15875 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2887:
+#line 15956 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.isolation_level)= NULL; }
-#line 42827 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43009 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2876:
-#line 15876 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2888:
+#line 15957 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.isolation_level)= (yyvsp[0].isolation_level); }
-#line 42833 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43015 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2877:
-#line 15880 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2889:
+#line 15961 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= true; }
-#line 42839 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43021 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2878:
-#line 15881 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2890:
+#line 15962 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= false; }
-#line 42845 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43027 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2879:
-#line 15885 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2891:
+#line 15966 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.tx_isolation)= ISO_READ_UNCOMMITTED; }
-#line 42851 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43033 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2880:
-#line 15886 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2892:
+#line 15967 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.tx_isolation)= ISO_READ_COMMITTED; }
-#line 42857 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43039 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2881:
-#line 15887 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2893:
+#line 15968 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.tx_isolation)= ISO_REPEATABLE_READ; }
-#line 42863 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43045 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2882:
-#line 15888 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2894:
+#line 15969 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.tx_isolation)= ISO_SERIALIZABLE; }
-#line 42869 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43051 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2884:
-#line 15893 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2896:
+#line 15974 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.item)= NULL; }
-#line 42875 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43057 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2885:
-#line 15895 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2897:
+#line 15976 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_string((yyloc), "ON", 2, system_charset_info);
           }
-#line 42883 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43065 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2886:
-#line 15899 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2898:
+#line 15980 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_string((yyloc), "ALL", 3, system_charset_info);
           }
-#line 42891 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43073 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2887:
-#line 15903 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2899:
+#line 15984 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_string((yyloc), "binary", 6, system_charset_info);
           }
-#line 42899 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43081 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2888:
-#line 15907 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2900:
+#line 15988 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_string((yyloc), "ROW", 3, system_charset_info);
           }
-#line 42907 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43089 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2889:
-#line 15911 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2901:
+#line 15992 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.item)= NEW_PTN Item_string((yyloc), "SYSTEM", 6, system_charset_info);
           }
-#line 42915 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43097 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2890:
-#line 15920 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2902:
+#line 16001 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
 
@@ -42926,28 +43108,28 @@
             }
             lex->sql_command= SQLCOM_LOCK_TABLES;
           }
-#line 42930 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43112 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2891:
-#line 15931 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2903:
+#line 16012 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 42936 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43118 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2892:
-#line 15933 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2904:
+#line 16014 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->sql_command= SQLCOM_LOCK_INSTANCE;
             Lex->m_sql_cmd= NEW_PTN Sql_cmd_lock_instance();
             if (Lex->m_sql_cmd == nullptr)
               MYSQL_YYABORT; // OOM
           }
-#line 42947 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43129 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2897:
-#line 15953 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2909:
+#line 16034 "sql_yacc.yy" /* yacc.c:1646  */
     {
             thr_lock_type lock_type= (thr_lock_type) (yyvsp[0].num);
             enum_mdl_type mdl_lock_type;
@@ -42972,38 +43154,38 @@
                                            mdl_lock_type))
               MYSQL_YYABORT;
           }
-#line 42976 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43158 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2898:
-#line 15980 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2910:
+#line 16061 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= TL_READ_NO_INSERT; }
-#line 42982 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43164 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2899:
-#line 15981 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2911:
+#line 16062 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= TL_WRITE_DEFAULT; }
-#line 42988 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43170 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2900:
-#line 15983 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2912:
+#line 16064 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.num)= TL_WRITE_LOW_PRIORITY;
             push_deprecated_warn(YYTHD, "LOW_PRIORITY WRITE", "WRITE");
           }
-#line 42997 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43179 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2901:
-#line 15987 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2913:
+#line 16068 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= TL_READ; }
-#line 43003 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43185 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2902:
-#line 15992 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2914:
+#line 16073 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
 
@@ -43014,54 +43196,54 @@
             }
             lex->sql_command= SQLCOM_UNLOCK_TABLES;
           }
-#line 43018 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43200 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2903:
-#line 16003 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2915:
+#line 16084 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 43024 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43206 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2904:
-#line 16005 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2916:
+#line 16086 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->sql_command= SQLCOM_UNLOCK_INSTANCE;
             Lex->m_sql_cmd= NEW_PTN Sql_cmd_unlock_instance();
             if (Lex->m_sql_cmd == nullptr)
               MYSQL_YYABORT; // OOM
           }
-#line 43035 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43217 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2905:
-#line 16016 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2917:
+#line 16097 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->sql_command= SQLCOM_SHUTDOWN;
             (yyval.top_level_node)= NEW_PTN PT_shutdown();
           }
-#line 43044 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43226 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2906:
-#line 16024 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2918:
+#line 16105 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_restart_server();
           }
-#line 43052 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43234 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2907:
-#line 16031 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2919:
+#line 16112 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->sql_command= SQLCOM_ALTER_INSTANCE;
             (yyval.top_level_node)= (yyvsp[0].alter_instance_cmd);
           }
-#line 43061 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43243 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2908:
-#line 16038 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2920:
+#line 16119 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if (is_identifier((yyvsp[-2].lexer.lex_str), "INNODB"))
             {
@@ -43077,43 +43259,43 @@
               MYSQL_YYABORT;
             }
           }
-#line 43081 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43263 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2909:
-#line 16054 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2921:
+#line 16135 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_instance_cmd) = NEW_PTN PT_alter_instance(ALTER_INSTANCE_RELOAD_TLS_ROLLBACK_ON_ERROR, to_lex_cstring("mysql_main"));
           }
-#line 43089 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43271 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2910:
-#line 16058 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2922:
+#line 16139 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_instance_cmd) = NEW_PTN PT_alter_instance(ALTER_INSTANCE_RELOAD_TLS, to_lex_cstring("mysql_main"));
           }
-#line 43097 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43279 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2911:
-#line 16061 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2923:
+#line 16142 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_instance_cmd) = NEW_PTN PT_alter_instance(ALTER_INSTANCE_RELOAD_TLS_ROLLBACK_ON_ERROR, to_lex_cstring((yyvsp[0].lexer.lex_str)));
           }
-#line 43105 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43287 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2912:
-#line 16064 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2924:
+#line 16145 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_instance_cmd) = NEW_PTN PT_alter_instance(ALTER_INSTANCE_RELOAD_TLS, to_lex_cstring((yyvsp[-4].lexer.lex_str)));
           }
-#line 43113 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43295 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2913:
-#line 16068 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2925:
+#line 16149 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if (!is_identifier((yyvsp[-1].lexer.lex_str), "INNODB"))
             {
@@ -43128,11 +43310,11 @@
             }
             (yyval.alter_instance_cmd) = NEW_PTN PT_alter_instance(ALTER_INSTANCE_ENABLE_INNODB_REDO, EMPTY_CSTR);
           }
-#line 43132 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43314 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2914:
-#line 16083 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2926:
+#line 16164 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if (!is_identifier((yyvsp[-1].lexer.lex_str), "INNODB"))
             {
@@ -43147,137 +43329,137 @@
             }
             (yyval.alter_instance_cmd) = NEW_PTN PT_alter_instance(ALTER_INSTANCE_DISABLE_INNODB_REDO, EMPTY_CSTR);
           }
-#line 43151 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43333 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2915:
-#line 16097 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2927:
+#line 16178 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.alter_instance_cmd) = NEW_PTN PT_alter_instance(RELOAD_KEYRING, EMPTY_CSTR);
           }
-#line 43159 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43341 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2916:
-#line 16108 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2928:
+#line 16189 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_handler_open((yyvsp[-2].table), (yyvsp[0].lex_cstr));
           }
-#line 43167 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43349 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2917:
-#line 16112 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2929:
+#line 16193 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_handler_close(to_lex_cstring((yyvsp[-1].lexer.lex_str)));
           }
-#line 43175 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43357 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2918:
-#line 16121 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2930:
+#line 16202 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_handler_table_scan(to_lex_cstring((yyvsp[-4].lexer.lex_str)), (yyvsp[-2].ha_read_mode), (yyvsp[-1].item), (yyvsp[0].limit_clause));
           }
-#line 43183 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43365 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2919:
-#line 16131 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2931:
+#line 16212 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_handler_index_scan(to_lex_cstring((yyvsp[-5].lexer.lex_str)),
                                               to_lex_cstring((yyvsp[-3].lexer.lex_str)), (yyvsp[-2].ha_read_mode), (yyvsp[-1].item), (yyvsp[0].limit_clause));
           }
-#line 43192 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43374 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2920:
-#line 16143 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2932:
+#line 16224 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.top_level_node)= NEW_PTN PT_handler_index_range_scan(to_lex_cstring((yyvsp[-8].lexer.lex_str)),
                                                     to_lex_cstring((yyvsp[-6].lexer.lex_str)),
                                                     (yyvsp[-5].ha_rkey_mode), (yyvsp[-3].item_list2), (yyvsp[-1].item), (yyvsp[0].limit_clause));
           }
-#line 43202 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43384 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2921:
-#line 16151 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2933:
+#line 16232 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ha_read_mode)= enum_ha_read_modes::RFIRST; }
-#line 43208 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43390 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2922:
-#line 16152 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2934:
+#line 16233 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ha_read_mode)= enum_ha_read_modes::RNEXT;  }
-#line 43214 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43396 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2923:
-#line 16156 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2935:
+#line 16237 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ha_read_mode)= enum_ha_read_modes::RFIRST; }
-#line 43220 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43402 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2924:
-#line 16157 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2936:
+#line 16238 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ha_read_mode)= enum_ha_read_modes::RNEXT;  }
-#line 43226 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43408 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2925:
-#line 16158 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2937:
+#line 16239 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ha_read_mode)= enum_ha_read_modes::RPREV;  }
-#line 43232 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43414 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2926:
-#line 16159 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2938:
+#line 16240 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ha_read_mode)= enum_ha_read_modes::RLAST;  }
-#line 43238 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43420 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2927:
-#line 16163 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2939:
+#line 16244 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ha_rkey_mode)=HA_READ_KEY_EXACT;   }
-#line 43244 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43426 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2928:
-#line 16164 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2940:
+#line 16245 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ha_rkey_mode)=HA_READ_KEY_OR_NEXT; }
-#line 43250 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43432 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2929:
-#line 16165 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2941:
+#line 16246 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ha_rkey_mode)=HA_READ_KEY_OR_PREV; }
-#line 43256 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43438 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2930:
-#line 16166 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2942:
+#line 16247 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ha_rkey_mode)=HA_READ_AFTER_KEY;   }
-#line 43262 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43444 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2931:
-#line 16167 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2943:
+#line 16248 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ha_rkey_mode)=HA_READ_BEFORE_KEY;  }
-#line 43268 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43450 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2932:
-#line 16174 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2944:
+#line 16255 "sql_yacc.yy" /* yacc.c:1646  */
     {
             auto *tmp= NEW_PTN PT_revoke_roles((yyvsp[-2].role_or_privilege_list), (yyvsp[0].user_list));
             MAKE_CMD(tmp);
           }
-#line 43277 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43459 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2933:
-#line 16179 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2945:
+#line 16260 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             if (apply_privileges(YYTHD, *(yyvsp[-5].role_or_privilege_list)))
@@ -43292,20 +43474,20 @@
             lex->type= static_cast<ulong>((yyvsp[-3].acl_type));
             lex->users_list= *(yyvsp[0].user_list);
           }
-#line 43296 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43478 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2934:
-#line 16194 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2946:
+#line 16275 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->all_privileges= 1;
             Lex->grant= GLOBAL_ACLS;
           }
-#line 43305 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43487 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2935:
-#line 16199 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2947:
+#line 16280 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             lex->sql_command= (lex->grant == (GLOBAL_ACLS & ~GRANT_ACL)) ?
@@ -43319,20 +43501,20 @@
             lex->type= static_cast<ulong>((yyvsp[-3].acl_type));
             lex->users_list= *(yyvsp[0].user_list);
           }
-#line 43323 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43505 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2936:
-#line 16213 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2948:
+#line 16294 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->sql_command = SQLCOM_REVOKE_ALL;
             Lex->users_list= *(yyvsp[0].user_list);
           }
-#line 43332 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43514 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2937:
-#line 16218 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2949:
+#line 16299 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_REVOKE;
@@ -43340,20 +43522,20 @@
             lex->users_list.push_front ((yyvsp[-2].lex_user));
             lex->type= TYPE_ENUM_PROXY;
           }
-#line 43344 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43526 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2938:
-#line 16229 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2950:
+#line 16310 "sql_yacc.yy" /* yacc.c:1646  */
     {
             auto *tmp= NEW_PTN PT_grant_roles((yyvsp[-3].role_or_privilege_list), (yyvsp[-1].user_list), (yyvsp[0].is_not_empty));
             MAKE_CMD(tmp);
           }
-#line 43353 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43535 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2939:
-#line 16235 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2951:
+#line 16316 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_GRANT;
@@ -43368,20 +43550,20 @@
             lex->type= static_cast<ulong>((yyvsp[-5].acl_type));
             lex->users_list= *(yyvsp[-2].user_list);
           }
-#line 43372 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43554 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2940:
-#line 16250 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2952:
+#line 16331 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->all_privileges= 1;
             Lex->grant= GLOBAL_ACLS;
           }
-#line 43381 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43563 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2941:
-#line 16255 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2953:
+#line 16336 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_GRANT;
@@ -43393,11 +43575,11 @@
             lex->type= static_cast<ulong>((yyvsp[-5].acl_type));
             lex->users_list= *(yyvsp[-2].user_list);
           }
-#line 43397 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43579 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2942:
-#line 16267 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2954:
+#line 16348 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_GRANT;
@@ -43407,177 +43589,177 @@
             lex->users_list.push_front ((yyvsp[-3].lex_user));
             lex->type= TYPE_ENUM_PROXY;
           }
-#line 43411 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43593 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2943:
-#line 16279 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2955:
+#line 16360 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.acl_type)= Acl_type::TABLE; }
-#line 43417 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43599 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2944:
-#line 16280 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2956:
+#line 16361 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.acl_type)= Acl_type::TABLE; }
-#line 43423 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43605 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2945:
-#line 16281 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2957:
+#line 16362 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.acl_type)= Acl_type::FUNCTION; }
-#line 43429 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43611 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2946:
-#line 16282 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2958:
+#line 16363 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.acl_type)= Acl_type::PROCEDURE; }
-#line 43435 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43617 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2949:
-#line 16292 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2961:
+#line 16373 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.role_or_privilege_list)= NEW_PTN Mem_root_array<PT_role_or_privilege *>(YYMEM_ROOT);
             if ((yyval.role_or_privilege_list) == NULL || (yyval.role_or_privilege_list)->push_back((yyvsp[0].role_or_privilege)))
               MYSQL_YYABORT; // OOM
           }
-#line 43445 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43627 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2950:
-#line 16298 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2962:
+#line 16379 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.role_or_privilege_list)= (yyvsp[-2].role_or_privilege_list);
             if ((yyval.role_or_privilege_list)->push_back((yyvsp[0].role_or_privilege)))
               MYSQL_YYABORT; // OOM
           }
-#line 43455 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43637 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2951:
-#line 16307 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2963:
+#line 16388 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyvsp[0].lex_cstring_list) == NULL)
               (yyval.role_or_privilege)= NEW_PTN PT_role_or_dynamic_privilege((yylsp[-1]), (yyvsp[-1].lexer.lex_str));
             else
               (yyval.role_or_privilege)= NEW_PTN PT_dynamic_privilege((yylsp[-1]), (yyvsp[-1].lexer.lex_str));
           }
-#line 43466 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43648 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2952:
-#line 16314 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2964:
+#line 16395 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.role_or_privilege)= NEW_PTN PT_role_at_host((yylsp[-2]), (yyvsp[-2].lexer.lex_str), (yyvsp[0].lexer.lex_str)); }
-#line 43472 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43654 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2953:
-#line 16316 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2965:
+#line 16397 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.role_or_privilege)= NEW_PTN PT_static_privilege((yylsp[-1]), SELECT_ACL, (yyvsp[0].lex_cstring_list)); }
-#line 43478 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43660 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2954:
-#line 16318 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2966:
+#line 16399 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.role_or_privilege)= NEW_PTN PT_static_privilege((yylsp[-1]), INSERT_ACL, (yyvsp[0].lex_cstring_list)); }
-#line 43484 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43666 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2955:
-#line 16320 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2967:
+#line 16401 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.role_or_privilege)= NEW_PTN PT_static_privilege((yylsp[-1]), UPDATE_ACL, (yyvsp[0].lex_cstring_list)); }
-#line 43490 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43672 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2956:
-#line 16322 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2968:
+#line 16403 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.role_or_privilege)= NEW_PTN PT_static_privilege((yylsp[-1]), REFERENCES_ACL, (yyvsp[0].lex_cstring_list)); }
-#line 43496 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43678 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2957:
-#line 16324 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2969:
+#line 16405 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.role_or_privilege)= NEW_PTN PT_static_privilege((yylsp[0]), DELETE_ACL); }
-#line 43502 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43684 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2958:
-#line 16326 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2970:
+#line 16407 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.role_or_privilege)= NEW_PTN PT_static_privilege((yylsp[0]), 0); }
-#line 43508 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43690 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2959:
-#line 16328 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2971:
+#line 16409 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.role_or_privilege)= NEW_PTN PT_static_privilege((yylsp[0]), INDEX_ACL); }
-#line 43514 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43696 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2960:
-#line 16330 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2972:
+#line 16411 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.role_or_privilege)= NEW_PTN PT_static_privilege((yylsp[0]), ALTER_ACL); }
-#line 43520 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43702 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2961:
-#line 16332 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2973:
+#line 16413 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.role_or_privilege)= NEW_PTN PT_static_privilege((yylsp[0]), CREATE_ACL); }
-#line 43526 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43708 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2962:
-#line 16334 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2974:
+#line 16415 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.role_or_privilege)= NEW_PTN PT_static_privilege((yylsp[0]), DROP_ACL); }
-#line 43532 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43714 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2963:
-#line 16336 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2975:
+#line 16417 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.role_or_privilege)= NEW_PTN PT_static_privilege((yylsp[0]), EXECUTE_ACL); }
-#line 43538 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43720 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2964:
-#line 16338 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2976:
+#line 16419 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.role_or_privilege)= NEW_PTN PT_static_privilege((yylsp[0]), RELOAD_ACL); }
-#line 43544 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43726 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2965:
-#line 16340 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2977:
+#line 16421 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.role_or_privilege)= NEW_PTN PT_static_privilege((yylsp[0]), SHUTDOWN_ACL); }
-#line 43550 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43732 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2966:
-#line 16342 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2978:
+#line 16423 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.role_or_privilege)= NEW_PTN PT_static_privilege((yylsp[0]), PROCESS_ACL); }
-#line 43556 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43738 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2967:
-#line 16344 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2979:
+#line 16425 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.role_or_privilege)= NEW_PTN PT_static_privilege((yylsp[0]), FILE_ACL); }
-#line 43562 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43744 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2968:
-#line 16346 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2980:
+#line 16427 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.role_or_privilege)= NEW_PTN PT_static_privilege((yylsp[-1]), GRANT_ACL);
             Lex->grant_privilege= true;
           }
-#line 43571 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43753 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2969:
-#line 16351 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2981:
+#line 16432 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.role_or_privilege)= NEW_PTN PT_static_privilege((yylsp[-1]), SHOW_DB_ACL); }
-#line 43577 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43759 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2970:
-#line 16353 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2982:
+#line 16434 "sql_yacc.yy" /* yacc.c:1646  */
     {
             /* DEPRECATED */
             (yyval.role_or_privilege)= NEW_PTN PT_static_privilege((yylsp[0]), SUPER_ACL);
@@ -43591,107 +43773,107 @@
                            "The SUPER privilege identifier is deprecated");
             }
           }
-#line 43595 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43777 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2971:
-#line 16367 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2983:
+#line 16448 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.role_or_privilege)= NEW_PTN PT_static_privilege((yylsp[-2]), CREATE_TMP_ACL); }
-#line 43601 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43783 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2972:
-#line 16369 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2984:
+#line 16450 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.role_or_privilege)= NEW_PTN PT_static_privilege((yylsp[-1]), LOCK_TABLES_ACL); }
-#line 43607 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43789 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2973:
-#line 16371 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2985:
+#line 16452 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.role_or_privilege)= NEW_PTN PT_static_privilege((yylsp[-1]), REPL_SLAVE_ACL); }
-#line 43613 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43795 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2974:
-#line 16373 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2986:
+#line 16454 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.role_or_privilege)= NEW_PTN PT_static_privilege((yylsp[-1]), REPL_CLIENT_ACL); }
-#line 43619 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43801 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2975:
-#line 16375 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2987:
+#line 16456 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.role_or_privilege)= NEW_PTN PT_static_privilege((yylsp[-1]), CREATE_VIEW_ACL); }
-#line 43625 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43807 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2976:
-#line 16377 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2988:
+#line 16458 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.role_or_privilege)= NEW_PTN PT_static_privilege((yylsp[-1]), SHOW_VIEW_ACL); }
-#line 43631 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43813 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2977:
-#line 16379 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2989:
+#line 16460 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.role_or_privilege)= NEW_PTN PT_static_privilege((yylsp[-1]), CREATE_PROC_ACL); }
-#line 43637 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43819 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2978:
-#line 16381 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2990:
+#line 16462 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.role_or_privilege)= NEW_PTN PT_static_privilege((yylsp[-1]), ALTER_PROC_ACL); }
-#line 43643 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43825 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2979:
-#line 16383 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2991:
+#line 16464 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.role_or_privilege)= NEW_PTN PT_static_privilege((yylsp[-1]), CREATE_USER_ACL); }
-#line 43649 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43831 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2980:
-#line 16385 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2992:
+#line 16466 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.role_or_privilege)= NEW_PTN PT_static_privilege((yylsp[0]), EVENT_ACL); }
-#line 43655 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43837 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2981:
-#line 16387 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2993:
+#line 16468 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.role_or_privilege)= NEW_PTN PT_static_privilege((yylsp[0]), TRIGGER_ACL); }
-#line 43661 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43843 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2982:
-#line 16389 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2994:
+#line 16470 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.role_or_privilege)= NEW_PTN PT_static_privilege((yylsp[-1]), CREATE_TABLESPACE_ACL); }
-#line 43667 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43849 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2983:
-#line 16391 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2995:
+#line 16472 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.role_or_privilege)= NEW_PTN PT_static_privilege((yylsp[-1]), CREATE_ROLE_ACL); }
-#line 43673 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43855 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2984:
-#line 16393 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2996:
+#line 16474 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.role_or_privilege)= NEW_PTN PT_static_privilege((yylsp[-1]), DROP_ROLE_ACL); }
-#line 43679 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43861 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2985:
-#line 16397 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2997:
+#line 16478 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.is_not_empty)= false; }
-#line 43685 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43867 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2986:
-#line 16398 "sql_yacc.yy" /* yacc.c:1646  */
+  case 2998:
+#line 16479 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.is_not_empty)= true; }
-#line 43691 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43873 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2991:
-#line 16413 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3003:
+#line 16494 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex=Lex;
             if (lex->x509_subject)
@@ -43701,11 +43883,11 @@
             }
             lex->x509_subject=(yyvsp[0].lexer.lex_str).str;
           }
-#line 43705 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43887 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2992:
-#line 16423 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3004:
+#line 16504 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex=Lex;
             if (lex->x509_issuer)
@@ -43715,11 +43897,11 @@
             }
             lex->x509_issuer=(yyvsp[0].lexer.lex_str).str;
           }
-#line 43719 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43901 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2993:
-#line 16433 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3005:
+#line 16514 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex=Lex;
             if (lex->ssl_cipher)
@@ -43729,11 +43911,11 @@
             }
             lex->ssl_cipher=(yyvsp[0].lexer.lex_str).str;
           }
-#line 43733 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43915 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2994:
-#line 16446 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3006:
+#line 16527 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             size_t dummy;
@@ -43747,11 +43929,11 @@
               MYSQL_YYABORT;
             }
           }
-#line 43751 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43933 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2995:
-#line 16460 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3007:
+#line 16541 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             lex->current_query_block()->db = (yyvsp[-2].lexer.lex_str).str;
@@ -43763,11 +43945,11 @@
               MYSQL_YYABORT;
             }
           }
-#line 43767 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43949 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2996:
-#line 16472 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3008:
+#line 16553 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             lex->current_query_block()->db = NULL;
@@ -43779,11 +43961,11 @@
               MYSQL_YYABORT;
             }
           }
-#line 43783 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43965 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2997:
-#line 16484 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3009:
+#line 16565 "sql_yacc.yy" /* yacc.c:1646  */
     {
             auto tmp = NEW_PTN Table_ident(to_lex_cstring((yyvsp[0].lexer.lex_str)));
             if (tmp == NULL)
@@ -43795,11 +43977,11 @@
             if (lex->grant == GLOBAL_ACLS)
               lex->grant =  TABLE_OP_ACLS;
           }
-#line 43799 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43981 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2998:
-#line 16496 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3010:
+#line 16577 "sql_yacc.yy" /* yacc.c:1646  */
     {
             auto schema_name = YYCLIENT_NO_SCHEMA ? LEX_CSTRING{}
                                                   : to_lex_cstring((yyvsp[-2].lexer.lex_str).str);
@@ -43813,598 +43995,784 @@
             if (lex->grant == GLOBAL_ACLS)
               lex->grant =  TABLE_OP_ACLS;
           }
-#line 43817 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 43999 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 2999:
-#line 16513 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3011:
+#line 16594 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.user_list)= new (YYMEM_ROOT) List<LEX_USER>;
             if ((yyval.user_list) == NULL || (yyval.user_list)->push_back((yyvsp[0].lex_user)))
               MYSQL_YYABORT;
           }
-#line 43827 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44009 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3000:
-#line 16519 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3012:
+#line 16600 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.user_list)= (yyvsp[-2].user_list);
             if ((yyval.user_list)->push_back((yyvsp[0].lex_user)))
               MYSQL_YYABORT;
           }
-#line 43837 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44019 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3001:
-#line 16528 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3013:
+#line 16609 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.user_list)= new (YYMEM_ROOT) List<LEX_USER>;
             if ((yyval.user_list) == NULL || (yyval.user_list)->push_back((yyvsp[0].lex_user)))
               MYSQL_YYABORT;
           }
-#line 43847 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44029 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3002:
-#line 16534 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3014:
+#line 16615 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.user_list)= (yyvsp[-2].user_list);
             if ((yyval.user_list)->push_back((yyvsp[0].lex_user)))
               MYSQL_YYABORT;
           }
-#line 43857 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44039 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3003:
-#line 16542 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3015:
+#line 16623 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.is_not_empty)= false; }
-#line 43863 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44045 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3004:
-#line 16543 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3016:
+#line 16624 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.is_not_empty)= true; }
-#line 43869 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44051 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3005:
-#line 16547 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3017:
+#line 16628 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.is_not_empty)= false; }
-#line 43875 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44057 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3006:
-#line 16548 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3018:
+#line 16629 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.is_not_empty)= true; }
-#line 43881 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44063 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3007:
-#line 16552 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3019:
+#line 16634 "sql_yacc.yy" /* yacc.c:1646  */
     {
-            (yyval.lex_user)=(yyvsp[-3].lex_user);
-            (yyvsp[-3].lex_user)->auth.str= (yyvsp[0].lexer.lex_str).str;
-            (yyvsp[-3].lex_user)->auth.length= (yyvsp[0].lexer.lex_str).length;
-            (yyvsp[-3].lex_user)->has_password_generator= false;
-            (yyvsp[-3].lex_user)->uses_identified_by_clause= true;
-            (yyvsp[-3].lex_user)->discard_old_password= false;
-            (yyvsp[-3].lex_user)->retain_current_password= false;
-            Lex->contains_plaintext_password= true;
+            LEX_MFA *m = NEW_PTN LEX_MFA;
+            if (m == nullptr)
+              MYSQL_YYABORT;  // OOM
+            m->nth_factor= (yyvsp[-2].ulong_num);
+            m->init_registration= true;
+            m->requires_registration= true;
+            (yyval.lex_mfa) = m;
           }
-#line 43896 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44077 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3008:
-#line 16563 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3020:
+#line 16644 "sql_yacc.yy" /* yacc.c:1646  */
     {
-            (yyval.lex_user)= (yyvsp[-4].lex_user);
-            (yyvsp[-4].lex_user)->has_password_generator= true;
-            (yyvsp[-4].lex_user)->auth= EMPTY_CSTR;
-            (yyvsp[-4].lex_user)->uses_identified_by_clause= true;
-            (yyvsp[-4].lex_user)->uses_identified_with_clause= false;
-            (yyvsp[-4].lex_user)->discard_old_password= false;
-            (yyvsp[-4].lex_user)->retain_current_password= false;
-            Lex->contains_plaintext_password= true;
+            LEX_MFA *m = NEW_PTN LEX_MFA;
+            if (m == nullptr)
+              MYSQL_YYABORT;  // OOM
+            m->nth_factor= (yyvsp[-1].ulong_num);
+            m->unregister= true;
+            (yyval.lex_mfa) = m;
           }
-#line 43911 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44090 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3009:
-#line 16574 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3021:
+#line 16653 "sql_yacc.yy" /* yacc.c:1646  */
     {
-            (yyval.lex_user)= (yyvsp[-3].lex_user);
-            (yyvsp[-3].lex_user)->plugin.str= (yyvsp[0].lexer.lex_str).str;
-            (yyvsp[-3].lex_user)->plugin.length= (yyvsp[0].lexer.lex_str).length;
-            (yyvsp[-3].lex_user)->auth= EMPTY_CSTR;
-            (yyvsp[-3].lex_user)->uses_identified_with_clause= true;
-            (yyvsp[-3].lex_user)->discard_old_password= false;
-            (yyvsp[-3].lex_user)->retain_current_password= false;
-            (yyvsp[-3].lex_user)->has_password_generator= false;
+            LEX_MFA *m = NEW_PTN LEX_MFA;
+            if (m == nullptr)
+              MYSQL_YYABORT;  // OOM
+            m->nth_factor= (yyvsp[-6].ulong_num);
+            m->finish_registration= true;
+            m->requires_registration= true;
+            m->challenge_response= to_lex_cstring((yyvsp[0].lexer.lex_str));
+            (yyval.lex_mfa) = m;
           }
-#line 43926 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44105 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3010:
-#line 16585 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3022:
+#line 16667 "sql_yacc.yy" /* yacc.c:1646  */
     {
-            (yyval.lex_user)= (yyvsp[-5].lex_user);
-            (yyvsp[-5].lex_user)->plugin.str= (yyvsp[-2].lexer.lex_str).str;
-            (yyvsp[-5].lex_user)->plugin.length= (yyvsp[-2].lexer.lex_str).length;
-            (yyvsp[-5].lex_user)->auth.str= (yyvsp[0].lexer.lex_str).str;
-            (yyvsp[-5].lex_user)->auth.length= (yyvsp[0].lexer.lex_str).length;
-            (yyvsp[-5].lex_user)->uses_identified_with_clause= true;
-            (yyvsp[-5].lex_user)->uses_authentication_string_clause= true;
-            (yyvsp[-5].lex_user)->discard_old_password= false;
-            (yyvsp[-5].lex_user)->retain_current_password= false;
-            (yyvsp[-5].lex_user)->has_password_generator= false;
+            (yyval.lex_user) = (yyvsp[-2].lex_user);
+            (yyval.lex_user)->first_factor_auth_info = *(yyvsp[-1].lex_mfa);
+            if ((yyval.lex_user)->add_mfa_identifications((yyvsp[0].lex_mfas).mfa2, (yyvsp[0].lex_mfas).mfa3))
+              MYSQL_YYABORT;  // OOM
           }
-#line 43943 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44116 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3011:
-#line 16598 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3023:
+#line 16674 "sql_yacc.yy" /* yacc.c:1646  */
     {
-            (yyval.lex_user)= (yyvsp[-5].lex_user);
-            (yyvsp[-5].lex_user)->plugin.str= (yyvsp[-2].lexer.lex_str).str;
-            (yyvsp[-5].lex_user)->plugin.length= (yyvsp[-2].lexer.lex_str).length;
-            (yyvsp[-5].lex_user)->auth.str= (yyvsp[0].lexer.lex_str).str;
-            (yyvsp[-5].lex_user)->auth.length= (yyvsp[0].lexer.lex_str).length;
-            (yyvsp[-5].lex_user)->uses_identified_with_clause= true;
-            (yyvsp[-5].lex_user)->uses_identified_by_clause= true;
-            (yyvsp[-5].lex_user)->discard_old_password= false;
-            (yyvsp[-5].lex_user)->retain_current_password= false;
-            Lex->contains_plaintext_password= true;
-            (yyvsp[-5].lex_user)->has_password_generator= false;
+            (yyval.lex_user)= (yyvsp[-2].lex_user);
+            /* set $3 as first factor auth method */
+            (yyvsp[0].lex_mfa)->nth_factor = 1;
+            (yyvsp[0].lex_mfa)->passwordless = false;
+            (yyval.lex_user)->first_factor_auth_info = *(yyvsp[0].lex_mfa);
+            /* set $2 as second factor auth method */
+            (yyvsp[-1].lex_mfa)->nth_factor = 2;
+            (yyvsp[-1].lex_mfa)->passwordless = true;
+            if ((yyval.lex_user)->mfa_list.push_back((yyvsp[-1].lex_mfa)))
+              MYSQL_YYABORT;  // OOM
+            (yyval.lex_user)->with_initial_auth = true;
           }
-#line 43961 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44134 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3012:
-#line 16612 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3024:
+#line 16688 "sql_yacc.yy" /* yacc.c:1646  */
     {
-            (yyval.lex_user)= (yyvsp[-6].lex_user);
-            (yyvsp[-6].lex_user)->plugin.str= (yyvsp[-3].lexer.lex_str).str;
-            (yyvsp[-6].lex_user)->plugin.length= (yyvsp[-3].lexer.lex_str).length;
-            (yyvsp[-6].lex_user)->uses_identified_with_clause= true;
-            (yyvsp[-6].lex_user)->uses_identified_by_clause= true;
-            (yyvsp[-6].lex_user)->discard_old_password= false;
-            (yyvsp[-6].lex_user)->retain_current_password= false;
-            Lex->contains_plaintext_password= true;
-            (yyvsp[-6].lex_user)->has_password_generator= true;
+            (yyval.lex_user) = (yyvsp[-1].lex_user);
+            if ((yyval.lex_user)->add_mfa_identifications((yyvsp[0].lex_mfas).mfa2, (yyvsp[0].lex_mfas).mfa3))
+              MYSQL_YYABORT;  // OOM
           }
-#line 43977 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44144 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3013:
-#line 16624 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3025:
+#line 16696 "sql_yacc.yy" /* yacc.c:1646  */
+    { (yyval.lex_mfas) = {}; }
+#line 44150 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+    break;
+
+  case 3026:
+#line 16698 "sql_yacc.yy" /* yacc.c:1646  */
     {
-            (yyval.lex_user)= (yyvsp[0].lex_user);
-            (yyvsp[0].lex_user)->auth= NULL_CSTR;
-            (yyvsp[0].lex_user)->discard_old_password= false;
-            (yyvsp[0].lex_user)->retain_current_password= false;
-            (yyvsp[0].lex_user)->has_password_generator= false;
+            (yyvsp[0].lex_mfa)->nth_factor = 2;
+            (yyval.lex_mfas) = {(yyvsp[0].lex_mfa), nullptr};
           }
-#line 43989 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44159 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3014:
-#line 16635 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3027:
+#line 16703 "sql_yacc.yy" /* yacc.c:1646  */
     {
-            (yyval.lex_user)=(yyvsp[-6].lex_user);
-            (yyvsp[-6].lex_user)->has_password_generator= false;
-            (yyvsp[-6].lex_user)->auth.str= (yyvsp[-3].lexer.lex_str).str;
-            (yyvsp[-6].lex_user)->auth.length= (yyvsp[-3].lexer.lex_str).length;
-            (yyvsp[-6].lex_user)->uses_identified_by_clause= true;
-            (yyvsp[-6].lex_user)->current_auth.str= (yyvsp[-1].lexer.lex_str).str;
-            (yyvsp[-6].lex_user)->current_auth.length= (yyvsp[-1].lexer.lex_str).length;
-            (yyvsp[-6].lex_user)->uses_replace_clause= true;
-            (yyvsp[-6].lex_user)->discard_old_password= false;
-            (yyvsp[-6].lex_user)->retain_current_password= (yyvsp[0].is_not_empty);
-            Lex->contains_plaintext_password= true;
+            (yyvsp[-2].lex_mfa)->nth_factor = 2;
+            (yyvsp[0].lex_mfa)->nth_factor = 3;
+            (yyval.lex_mfas) = {(yyvsp[-2].lex_mfa), (yyvsp[0].lex_mfa)};
           }
-#line 44007 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44169 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3015:
-#line 16650 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3034:
+#line 16721 "sql_yacc.yy" /* yacc.c:1646  */
     {
-            (yyval.lex_user)= (yyvsp[-8].lex_user);
-            (yyvsp[-8].lex_user)->has_password_generator= false;
-            (yyvsp[-8].lex_user)->plugin.str= (yyvsp[-5].lexer.lex_str).str;
-            (yyvsp[-8].lex_user)->plugin.length= (yyvsp[-5].lexer.lex_str).length;
-            (yyvsp[-8].lex_user)->auth.str= (yyvsp[-3].lexer.lex_str).str;
-            (yyvsp[-8].lex_user)->auth.length= (yyvsp[-3].lexer.lex_str).length;
-            (yyvsp[-8].lex_user)->current_auth.str= (yyvsp[-1].lexer.lex_str).str;
-            (yyvsp[-8].lex_user)->current_auth.length= (yyvsp[-1].lexer.lex_str).length;
-            (yyvsp[-8].lex_user)->uses_replace_clause= true;
-            (yyvsp[-8].lex_user)->uses_identified_with_clause= true;
-            (yyvsp[-8].lex_user)->uses_identified_by_clause= true;
-            (yyvsp[-8].lex_user)->discard_old_password= false;
-            (yyvsp[-8].lex_user)->retain_current_password= (yyvsp[0].is_not_empty);
+            LEX_MFA *m = NEW_PTN LEX_MFA;
+            if (m == nullptr)
+              MYSQL_YYABORT;  // OOM
+            m->auth = to_lex_cstring((yyvsp[0].lexer.lex_str));
+            m->uses_identified_by_clause = true;
+            (yyval.lex_mfa) = m;
             Lex->contains_plaintext_password= true;
           }
-#line 44028 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44183 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3016:
-#line 16667 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3035:
+#line 16734 "sql_yacc.yy" /* yacc.c:1646  */
     {
-            (yyval.lex_user)=(yyvsp[-4].lex_user);
-            (yyvsp[-4].lex_user)->has_password_generator= false;
-            (yyvsp[-4].lex_user)->auth.str= (yyvsp[-1].lexer.lex_str).str;
-            (yyvsp[-4].lex_user)->auth.length= (yyvsp[-1].lexer.lex_str).length;
-            (yyvsp[-4].lex_user)->uses_identified_by_clause= true;
-            (yyvsp[-4].lex_user)->discard_old_password= false;
-            (yyvsp[-4].lex_user)->retain_current_password= (yyvsp[0].is_not_empty);
-            Lex->contains_plaintext_password= true;
+            LEX_MFA *m = NEW_PTN LEX_MFA;
+            if (m == nullptr)
+              MYSQL_YYABORT;  // OOM
+            m->auth = EMPTY_CSTR;
+            m->has_password_generator = true;
+            m->uses_identified_by_clause = true;
+            (yyval.lex_mfa) = m;
+            Lex->contains_plaintext_password = true;
           }
-#line 44043 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44198 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3017:
-#line 16678 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3036:
+#line 16748 "sql_yacc.yy" /* yacc.c:1646  */
+    {
+            LEX_MFA *m = NEW_PTN LEX_MFA;
+            if (m == nullptr)
+              MYSQL_YYABORT;  // OOM
+            m->plugin = to_lex_cstring((yyvsp[0].lexer.lex_str));
+            m->auth = EMPTY_CSTR;
+            m->uses_identified_by_clause = false;
+            m->uses_identified_with_clause = true;
+            (yyval.lex_mfa) = m;
+          }
+#line 44213 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+    break;
+
+  case 3037:
+#line 16762 "sql_yacc.yy" /* yacc.c:1646  */
+    {
+            LEX_MFA *m = NEW_PTN LEX_MFA;
+            if (m == nullptr)
+              MYSQL_YYABORT;  // OOM
+            m->plugin = to_lex_cstring((yyvsp[-2].lexer.lex_str));
+            m->auth = to_lex_cstring((yyvsp[0].lexer.lex_str));
+            m->uses_authentication_string_clause = true;
+            m->uses_identified_with_clause = true;
+            (yyval.lex_mfa) = m;
+          }
+#line 44228 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+    break;
+
+  case 3038:
+#line 16776 "sql_yacc.yy" /* yacc.c:1646  */
     {
-            (yyval.lex_user)= (yyvsp[-5].lex_user);
-            (yyvsp[-5].lex_user)->has_password_generator= true;
-            (yyvsp[-5].lex_user)->auth= EMPTY_CSTR;
-            (yyvsp[-5].lex_user)->uses_identified_by_clause= true;
-            (yyvsp[-5].lex_user)->uses_identified_with_clause= false;
-            (yyvsp[-5].lex_user)->discard_old_password= false;
-            (yyvsp[-5].lex_user)->retain_current_password= (yyvsp[0].is_not_empty);
+            LEX_MFA *m = NEW_PTN LEX_MFA;
+            if (m == nullptr)
+              MYSQL_YYABORT;  // OOM
+            m->plugin = to_lex_cstring((yyvsp[-2].lexer.lex_str));
+            m->auth = to_lex_cstring((yyvsp[0].lexer.lex_str));
+            m->uses_identified_by_clause = true;
+            m->uses_identified_with_clause = true;
+            (yyval.lex_mfa) = m;
             Lex->contains_plaintext_password= true;
           }
-#line 44058 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44244 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3018:
-#line 16689 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3039:
+#line 16791 "sql_yacc.yy" /* yacc.c:1646  */
     {
-            (yyval.lex_user)= (yyvsp[-7].lex_user);
-            (yyvsp[-7].lex_user)->has_password_generator= true;
-            (yyvsp[-7].lex_user)->auth= EMPTY_CSTR;
-            (yyvsp[-7].lex_user)->uses_identified_by_clause= true;
-            (yyvsp[-7].lex_user)->uses_identified_with_clause= false;
-            (yyvsp[-7].lex_user)->uses_replace_clause= true;
-            (yyvsp[-7].lex_user)->discard_old_password= false;
-            (yyvsp[-7].lex_user)->retain_current_password= (yyvsp[0].is_not_empty);
-            (yyvsp[-7].lex_user)->current_auth.str= (yyvsp[-1].lexer.lex_str).str;
-            (yyvsp[-7].lex_user)->current_auth.length= (yyvsp[-1].lexer.lex_str).length;
+            LEX_MFA *m = NEW_PTN LEX_MFA;
+            if (m == nullptr)
+              MYSQL_YYABORT;  // OOM
+            m->plugin = to_lex_cstring((yyvsp[-3].lexer.lex_str));
+            m->uses_identified_by_clause = true;
+            m->uses_identified_with_clause = true;
+            m->has_password_generator = true;
+            (yyval.lex_mfa) = m;
             Lex->contains_plaintext_password= true;
           }
-#line 44076 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44260 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3019:
-#line 16703 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3040:
+#line 16806 "sql_yacc.yy" /* yacc.c:1646  */
     {
-            (yyval.lex_user)= (yyvsp[-3].lex_user);
-            (yyvsp[-3].lex_user)->plugin.str= (yyvsp[0].lexer.lex_str).str;
-            (yyvsp[-3].lex_user)->plugin.length= (yyvsp[0].lexer.lex_str).length;
-            (yyvsp[-3].lex_user)->auth= EMPTY_CSTR;
-            (yyvsp[-3].lex_user)->uses_identified_with_clause= true;
-            (yyvsp[-3].lex_user)->discard_old_password= false;
-            (yyvsp[-3].lex_user)->retain_current_password= false;
-            (yyvsp[-3].lex_user)->has_password_generator= false;
+            (yyval.lex_mfa) = (yyvsp[0].lex_mfa);
+            (yyvsp[0].lex_mfa)->passwordless = true;
+            (yyvsp[0].lex_mfa)->nth_factor = 2;
           }
-#line 44091 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44270 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3020:
-#line 16715 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3041:
+#line 16812 "sql_yacc.yy" /* yacc.c:1646  */
     {
-            (yyval.lex_user)= (yyvsp[-6].lex_user);
-            (yyvsp[-6].lex_user)->plugin.str= (yyvsp[-3].lexer.lex_str).str;
-            (yyvsp[-6].lex_user)->plugin.length= (yyvsp[-3].lexer.lex_str).length;
-            (yyvsp[-6].lex_user)->auth.str= (yyvsp[-1].lexer.lex_str).str;
-            (yyvsp[-6].lex_user)->auth.length= (yyvsp[-1].lexer.lex_str).length;
-            (yyvsp[-6].lex_user)->uses_identified_with_clause= true;
-            (yyvsp[-6].lex_user)->uses_authentication_string_clause= true;
-            (yyvsp[-6].lex_user)->discard_old_password= false;
-            (yyvsp[-6].lex_user)->retain_current_password= (yyvsp[0].is_not_empty);
-            (yyvsp[-6].lex_user)->has_password_generator= false;
+            (yyval.lex_mfa) = (yyvsp[0].lex_mfa);
+            (yyvsp[0].lex_mfa)->passwordless = true;
+            (yyvsp[0].lex_mfa)->nth_factor = 2;
           }
-#line 44108 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44280 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3021:
-#line 16729 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3042:
+#line 16818 "sql_yacc.yy" /* yacc.c:1646  */
     {
-            (yyval.lex_user)= (yyvsp[-6].lex_user);
-            (yyvsp[-6].lex_user)->plugin.str= (yyvsp[-3].lexer.lex_str).str;
-            (yyvsp[-6].lex_user)->plugin.length= (yyvsp[-3].lexer.lex_str).length;
-            (yyvsp[-6].lex_user)->auth.str= (yyvsp[-1].lexer.lex_str).str;
-            (yyvsp[-6].lex_user)->auth.length= (yyvsp[-1].lexer.lex_str).length;
-            (yyvsp[-6].lex_user)->uses_identified_with_clause= true;
-            (yyvsp[-6].lex_user)->uses_identified_by_clause= true;
-            (yyvsp[-6].lex_user)->discard_old_password= false;
-            (yyvsp[-6].lex_user)->retain_current_password= (yyvsp[0].is_not_empty);
-            Lex->contains_plaintext_password= true;
-            (yyvsp[-6].lex_user)->has_password_generator= false;
+            (yyval.lex_mfa) = (yyvsp[0].lex_mfa);
+            (yyvsp[0].lex_mfa)->passwordless = true;
+            (yyvsp[0].lex_mfa)->nth_factor = 2;
           }
-#line 44126 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44290 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3022:
-#line 16744 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3043:
+#line 16829 "sql_yacc.yy" /* yacc.c:1646  */
+    {
+            (yyval.lex_user) = (yyvsp[-4].lex_user);
+            (yyvsp[-4].lex_user)->first_factor_auth_info = *(yyvsp[-3].lex_mfa);
+            (yyvsp[-4].lex_user)->current_auth = to_lex_cstring((yyvsp[-1].lexer.lex_str));
+            (yyvsp[-4].lex_user)->uses_replace_clause = true;
+            (yyvsp[-4].lex_user)->discard_old_password = false;
+            (yyvsp[-4].lex_user)->retain_current_password = (yyvsp[0].is_not_empty);
+          }
+#line 44303 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+    break;
+
+  case 3044:
+#line 16840 "sql_yacc.yy" /* yacc.c:1646  */
+    {
+            (yyval.lex_user) = (yyvsp[-4].lex_user);
+            (yyvsp[-4].lex_user)->first_factor_auth_info = *(yyvsp[-3].lex_mfa);
+            (yyvsp[-4].lex_user)->current_auth = to_lex_cstring((yyvsp[-1].lexer.lex_str));
+            (yyvsp[-4].lex_user)->uses_replace_clause = true;
+            (yyvsp[-4].lex_user)->discard_old_password = false;
+            (yyvsp[-4].lex_user)->retain_current_password = (yyvsp[0].is_not_empty);
+          }
+#line 44316 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+    break;
+
+  case 3045:
+#line 16849 "sql_yacc.yy" /* yacc.c:1646  */
+    {
+            (yyval.lex_user) = (yyvsp[-2].lex_user);
+            (yyvsp[-2].lex_user)->first_factor_auth_info = *(yyvsp[-1].lex_mfa);
+            (yyvsp[-2].lex_user)->discard_old_password = false;
+            (yyvsp[-2].lex_user)->retain_current_password = (yyvsp[0].is_not_empty);
+          }
+#line 44327 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+    break;
+
+  case 3046:
+#line 16856 "sql_yacc.yy" /* yacc.c:1646  */
+    {
+            (yyval.lex_user) = (yyvsp[-2].lex_user);
+            (yyvsp[-2].lex_user)->first_factor_auth_info = *(yyvsp[-1].lex_mfa);
+            (yyvsp[-2].lex_user)->discard_old_password = false;
+            (yyvsp[-2].lex_user)->retain_current_password = (yyvsp[0].is_not_empty);
+          }
+#line 44338 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+    break;
+
+  case 3047:
+#line 16865 "sql_yacc.yy" /* yacc.c:1646  */
+    {
+            (yyval.lex_user) = (yyvsp[-4].lex_user);
+            (yyvsp[-4].lex_user)->first_factor_auth_info = *(yyvsp[-3].lex_mfa);
+            (yyvsp[-4].lex_user)->uses_replace_clause = true;
+            (yyvsp[-4].lex_user)->discard_old_password = false;
+            (yyvsp[-4].lex_user)->retain_current_password = (yyvsp[0].is_not_empty);
+            (yyvsp[-4].lex_user)->current_auth = to_lex_cstring((yyvsp[-1].lexer.lex_str));
+          }
+#line 44351 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+    break;
+
+  case 3048:
+#line 16874 "sql_yacc.yy" /* yacc.c:1646  */
+    {
+            (yyval.lex_user) = (yyvsp[-1].lex_user);
+            (yyvsp[-1].lex_user)->first_factor_auth_info = *(yyvsp[0].lex_mfa);
+            (yyvsp[-1].lex_user)->discard_old_password = false;
+            (yyvsp[-1].lex_user)->retain_current_password = false;
+          }
+#line 44362 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+    break;
+
+  case 3049:
+#line 16881 "sql_yacc.yy" /* yacc.c:1646  */
+    {
+            (yyval.lex_user) = (yyvsp[-2].lex_user);
+            (yyvsp[-2].lex_user)->first_factor_auth_info = *(yyvsp[-1].lex_mfa);
+            (yyvsp[-2].lex_user)->discard_old_password = false;
+            (yyvsp[-2].lex_user)->retain_current_password = (yyvsp[0].is_not_empty);
+          }
+#line 44373 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+    break;
+
+  case 3050:
+#line 16888 "sql_yacc.yy" /* yacc.c:1646  */
+    {
+            (yyval.lex_user) = (yyvsp[-2].lex_user);
+            (yyvsp[-2].lex_user)->first_factor_auth_info = *(yyvsp[-1].lex_mfa);
+            (yyvsp[-2].lex_user)->discard_old_password = false;
+            (yyvsp[-2].lex_user)->retain_current_password = (yyvsp[0].is_not_empty);
+          }
+#line 44384 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+    break;
+
+  case 3051:
+#line 16896 "sql_yacc.yy" /* yacc.c:1646  */
+    {
+            (yyval.lex_user) = (yyvsp[-2].lex_user);
+            (yyvsp[-2].lex_user)->first_factor_auth_info = *(yyvsp[-1].lex_mfa);
+            (yyvsp[-2].lex_user)->discard_old_password= false;
+            (yyvsp[-2].lex_user)->retain_current_password= (yyvsp[0].is_not_empty);
+          }
+#line 44395 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+    break;
+
+  case 3052:
+#line 16903 "sql_yacc.yy" /* yacc.c:1646  */
+    {
+            (yyval.lex_user) = (yyvsp[-1].lex_user);
+            (yyvsp[-1].lex_user)->discard_old_password = (yyvsp[0].is_not_empty);
+            (yyvsp[-1].lex_user)->retain_current_password = false;
+          }
+#line 44405 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+    break;
+
+  case 3053:
+#line 16909 "sql_yacc.yy" /* yacc.c:1646  */
+    {
+            (yyvsp[0].lex_mfa)->nth_factor = (yyvsp[-1].ulong_num);
+            (yyvsp[0].lex_mfa)->add_factor = true;
+            if ((yyvsp[-3].lex_user)->add_mfa_identifications((yyvsp[0].lex_mfa)))
+              MYSQL_YYABORT;  // OOM
+            (yyval.lex_user) = (yyvsp[-3].lex_user);
+           }
+#line 44417 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+    break;
+
+  case 3054:
+#line 16917 "sql_yacc.yy" /* yacc.c:1646  */
+    {
+            if ((yyvsp[-4].ulong_num) == (yyvsp[-1].ulong_num)) {
+              my_error(ER_MFA_METHODS_IDENTICAL, MYF(0));
+              MYSQL_YYABORT;
+            } else if ((yyvsp[-4].ulong_num) > (yyvsp[-1].ulong_num)) {
+              my_error(ER_MFA_METHODS_INVALID_ORDER, MYF(0), (yyvsp[-1].ulong_num), (yyvsp[-4].ulong_num));
+              MYSQL_YYABORT;
+            }
+            (yyvsp[-3].lex_mfa)->nth_factor = (yyvsp[-4].ulong_num);
+            (yyvsp[-3].lex_mfa)->add_factor = true;
+            (yyvsp[0].lex_mfa)->nth_factor = (yyvsp[-1].ulong_num);
+            (yyvsp[0].lex_mfa)->add_factor = true;
+            if ((yyvsp[-6].lex_user)->add_mfa_identifications((yyvsp[-3].lex_mfa), (yyvsp[0].lex_mfa)))
+              MYSQL_YYABORT;  // OOM
+            (yyval.lex_user) = (yyvsp[-6].lex_user);
+          }
+#line 44438 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+    break;
+
+  case 3055:
+#line 16934 "sql_yacc.yy" /* yacc.c:1646  */
+    {
+            (yyvsp[0].lex_mfa)->nth_factor = (yyvsp[-1].ulong_num);
+            (yyvsp[0].lex_mfa)->modify_factor = true;
+            if ((yyvsp[-3].lex_user)->add_mfa_identifications((yyvsp[0].lex_mfa)))
+              MYSQL_YYABORT;  // OOM
+            (yyval.lex_user) = (yyvsp[-3].lex_user);
+           }
+#line 44450 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+    break;
+
+  case 3056:
+#line 16942 "sql_yacc.yy" /* yacc.c:1646  */
+    {
+            if ((yyvsp[-4].ulong_num) == (yyvsp[-1].ulong_num)) {
+              my_error(ER_MFA_METHODS_IDENTICAL, MYF(0));
+              MYSQL_YYABORT;
+            }
+            (yyvsp[-3].lex_mfa)->nth_factor = (yyvsp[-4].ulong_num);
+            (yyvsp[-3].lex_mfa)->modify_factor = true;
+            (yyvsp[0].lex_mfa)->nth_factor = (yyvsp[-1].ulong_num);
+            (yyvsp[0].lex_mfa)->modify_factor = true;
+            if ((yyvsp[-6].lex_user)->add_mfa_identifications((yyvsp[-3].lex_mfa), (yyvsp[0].lex_mfa)))
+              MYSQL_YYABORT;  // OOM
+            (yyval.lex_user) = (yyvsp[-6].lex_user);
+          }
+#line 44468 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+    break;
+
+  case 3057:
+#line 16956 "sql_yacc.yy" /* yacc.c:1646  */
+    {
+            LEX_MFA *m = NEW_PTN LEX_MFA;
+            if (m == nullptr)
+              MYSQL_YYABORT;  // OOM
+            m->nth_factor = (yyvsp[0].ulong_num);
+            m->drop_factor = true;
+            if ((yyvsp[-2].lex_user)->add_mfa_identifications(m))
+              MYSQL_YYABORT;  // OOM
+            (yyval.lex_user) = (yyvsp[-2].lex_user);
+           }
+#line 44483 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+    break;
+
+  case 3058:
+#line 16967 "sql_yacc.yy" /* yacc.c:1646  */
     {
-            (yyval.lex_user)= (yyvsp[-7].lex_user);
-            (yyvsp[-7].lex_user)->plugin.str= (yyvsp[-4].lexer.lex_str).str;
-            (yyvsp[-7].lex_user)->plugin.length= (yyvsp[-4].lexer.lex_str).length;
-            (yyvsp[-7].lex_user)->uses_identified_with_clause= true;
-            (yyvsp[-7].lex_user)->uses_identified_by_clause= true;
-            (yyvsp[-7].lex_user)->discard_old_password= false;
-            (yyvsp[-7].lex_user)->retain_current_password= (yyvsp[0].is_not_empty);
-            Lex->contains_plaintext_password= true;
-            (yyvsp[-7].lex_user)->has_password_generator= true;
-          }
-#line 44142 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+            if ((yyvsp[-2].ulong_num) == (yyvsp[0].ulong_num)) {
+              my_error(ER_MFA_METHODS_IDENTICAL, MYF(0));
+              MYSQL_YYABORT;
+            }
+            LEX_MFA *m1 = NEW_PTN LEX_MFA;
+            if (m1 == nullptr)
+              MYSQL_YYABORT;  // OOM
+            m1->nth_factor = (yyvsp[-2].ulong_num);
+            m1->drop_factor = true;
+            LEX_MFA *m2 = NEW_PTN LEX_MFA;
+            if (m2 == nullptr)
+              MYSQL_YYABORT;  // OOM
+            m2->nth_factor = (yyvsp[0].ulong_num);
+            m2->drop_factor = true;
+            if ((yyvsp[-4].lex_user)->add_mfa_identifications(m1, m2))
+              MYSQL_YYABORT;  // OOM
+            (yyval.lex_user) = (yyvsp[-4].lex_user);
+           }
+#line 44507 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3023:
-#line 16756 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3059:
+#line 16990 "sql_yacc.yy" /* yacc.c:1646  */
     {
-            (yyval.lex_user)= (yyvsp[-1].lex_user);
-            (yyvsp[-1].lex_user)->discard_old_password= (yyvsp[0].is_not_empty);
-            (yyvsp[-1].lex_user)->retain_current_password= false;
-            (yyvsp[-1].lex_user)->auth= NULL_CSTR;
-            (yyvsp[-1].lex_user)->has_password_generator= false;
+            if (my_strcasecmp(system_charset_info, (yyvsp[-1].lexer.lex_str).str, "2") == 0) {
+              (yyval.ulong_num) = 2;
+            } else if (my_strcasecmp(system_charset_info, (yyvsp[-1].lexer.lex_str).str, "3") == 0) {
+              (yyval.ulong_num) = 3;
+            } else {
+               my_error(ER_WRONG_VALUE, MYF(0), "nth factor", (yyvsp[-1].lexer.lex_str).str);
+               MYSQL_YYABORT;
+            }
           }
-#line 44154 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44522 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3024:
-#line 16767 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3060:
+#line 17004 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if (Lex->users_list.push_back((yyvsp[0].lex_user)))
               MYSQL_YYABORT;
           }
-#line 44163 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44531 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3025:
-#line 16772 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3061:
+#line 17009 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if (Lex->users_list.push_back((yyvsp[0].lex_user)))
               MYSQL_YYABORT;
           }
-#line 44172 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44540 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3026:
-#line 16780 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3062:
+#line 17017 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if (Lex->users_list.push_back((yyvsp[0].lex_user)))
               MYSQL_YYABORT;
          }
-#line 44181 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44549 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3027:
-#line 16785 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3063:
+#line 17022 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if (Lex->users_list.push_back((yyvsp[0].lex_user)))
               MYSQL_YYABORT;
           }
-#line 44190 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44558 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3028:
-#line 16792 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3064:
+#line 17029 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lex_cstring_list)= NULL; }
-#line 44196 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44564 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3029:
-#line 16793 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3065:
+#line 17030 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.lex_cstring_list)= (yyvsp[-1].lex_cstring_list); }
-#line 44202 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44570 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3030:
-#line 16798 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3066:
+#line 17035 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.lex_cstring_list)= NEW_PTN Mem_root_array<LEX_CSTRING>(YYMEM_ROOT);
             if ((yyval.lex_cstring_list) == NULL || (yyval.lex_cstring_list)->push_back(to_lex_cstring((yyvsp[0].lexer.lex_str))))
               MYSQL_YYABORT; // OOM
           }
-#line 44212 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44580 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3031:
-#line 16804 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3067:
+#line 17041 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.lex_cstring_list)= (yyvsp[-2].lex_cstring_list);
             if ((yyval.lex_cstring_list)->push_back(to_lex_cstring((yyvsp[0].lexer.lex_str))))
               MYSQL_YYABORT; // OOM
           }
-#line 44222 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44590 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3033:
-#line 16814 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3069:
+#line 17051 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->ssl_type=SSL_TYPE_SPECIFIED;
           }
-#line 44230 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44598 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3034:
-#line 16818 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3070:
+#line 17055 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->ssl_type=SSL_TYPE_ANY;
           }
-#line 44238 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44606 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3035:
-#line 16822 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3071:
+#line 17059 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->ssl_type=SSL_TYPE_X509;
           }
-#line 44246 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44614 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3036:
-#line 16826 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3072:
+#line 17063 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->ssl_type=SSL_TYPE_NONE;
           }
-#line 44254 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44622 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3037:
-#line 16832 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3073:
+#line 17069 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 44260 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44628 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3038:
-#line 16834 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3074:
+#line 17071 "sql_yacc.yy" /* yacc.c:1646  */
     { Lex->grant |= GRANT_ACL;}
-#line 44266 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44634 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3039:
-#line 16838 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3075:
+#line 17075 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.is_not_empty)= false; }
-#line 44272 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44640 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3040:
-#line 16839 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3076:
+#line 17076 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.is_not_empty)= true; }
-#line 44278 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44646 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3041:
-#line 16843 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3077:
+#line 17080 "sql_yacc.yy" /* yacc.c:1646  */
     { Lex->grant_as.role_type = role_enum::ROLE_NONE; }
-#line 44284 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44652 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3042:
-#line 16845 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3078:
+#line 17082 "sql_yacc.yy" /* yacc.c:1646  */
     { Lex->grant_as.role_type = role_enum::ROLE_NAME;
             Lex->grant_as.role_list = (yyvsp[0].user_list);
           }
-#line 44292 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44660 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3043:
-#line 16849 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3079:
+#line 17086 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->grant_as.role_type = role_enum::ROLE_ALL;
             Lex->grant_as.role_list = (yyvsp[0].user_list);
           }
-#line 44301 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44669 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3044:
-#line 16854 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3080:
+#line 17091 "sql_yacc.yy" /* yacc.c:1646  */
     { Lex->grant_as.role_type = role_enum::ROLE_NONE; }
-#line 44307 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44675 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3045:
-#line 16856 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3081:
+#line 17093 "sql_yacc.yy" /* yacc.c:1646  */
     { Lex->grant_as.role_type = role_enum::ROLE_DEFAULT; }
-#line 44313 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44681 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3046:
-#line 16860 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3082:
+#line 17097 "sql_yacc.yy" /* yacc.c:1646  */
     { Lex->grant_as.grant_as_used = false; }
-#line 44319 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44687 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3047:
-#line 16862 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3083:
+#line 17099 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->grant_as.grant_as_used = true;
             Lex->grant_as.user = (yyvsp[-1].lex_user);
           }
-#line 44328 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44696 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3048:
-#line 16869 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3084:
+#line 17106 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex=Lex;
             lex->sql_command = SQLCOM_BEGIN;
             lex->start_transaction_opt= 0;
           }
-#line 44338 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44706 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3049:
-#line 16874 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3085:
+#line 17111 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 44344 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44712 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3050:
-#line 16878 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3086:
+#line 17115 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 44350 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44718 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3051:
-#line 16879 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3087:
+#line 17116 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 44356 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44724 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3052:
-#line 16884 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3088:
+#line 17121 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.m_yes_no_unk)= TVL_UNKNOWN; }
-#line 44362 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44730 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3053:
-#line 16885 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3089:
+#line 17122 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.m_yes_no_unk)= TVL_NO; }
-#line 44368 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44736 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3054:
-#line 16886 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3090:
+#line 17123 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.m_yes_no_unk)= TVL_YES; }
-#line 44374 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44742 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3055:
-#line 16891 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3091:
+#line 17128 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.m_yes_no_unk)= TVL_UNKNOWN; }
-#line 44380 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44748 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3056:
-#line 16892 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3092:
+#line 17129 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.m_yes_no_unk)= TVL_YES; }
-#line 44386 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44754 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3057:
-#line 16893 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3093:
+#line 17130 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.m_yes_no_unk)= TVL_NO; }
-#line 44392 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44760 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3058:
-#line 16897 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3094:
+#line 17134 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 44398 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44766 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3059:
-#line 16898 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3095:
+#line 17135 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 44404 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44772 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3060:
-#line 16903 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3096:
+#line 17140 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_COMMIT;
@@ -44413,11 +44781,11 @@
             lex->tx_chain= (yyvsp[-1].m_yes_no_unk);
             lex->tx_release= (yyvsp[0].m_yes_no_unk);
           }
-#line 44417 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44785 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3061:
-#line 16915 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3097:
+#line 17152 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_ROLLBACK;
@@ -44426,149 +44794,149 @@
             lex->tx_chain= (yyvsp[-1].m_yes_no_unk);
             lex->tx_release= (yyvsp[0].m_yes_no_unk);
           }
-#line 44430 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44798 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3062:
-#line 16925 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3098:
+#line 17162 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_ROLLBACK_TO_SAVEPOINT;
             lex->ident= (yyvsp[0].lexer.lex_str);
           }
-#line 44440 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44808 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3063:
-#line 16934 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3099:
+#line 17171 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_SAVEPOINT;
             lex->ident= (yyvsp[0].lexer.lex_str);
           }
-#line 44450 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44818 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3064:
-#line 16943 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3100:
+#line 17180 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_RELEASE_SAVEPOINT;
             lex->ident= (yyvsp[0].lexer.lex_str);
           }
-#line 44460 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44828 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3065:
-#line 16956 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3101:
+#line 17193 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)=1; }
-#line 44466 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44834 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3066:
-#line 16957 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3102:
+#line 17194 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)=1; }
-#line 44472 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44840 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3067:
-#line 16958 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3103:
+#line 17195 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)=0; }
-#line 44478 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44846 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3070:
-#line 16971 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3106:
+#line 17208 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.subquery)= NEW_PTN PT_subquery((yyloc), (yyvsp[0].query_primary));
           }
-#line 44486 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44854 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3071:
-#line 16977 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3107:
+#line 17214 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ulonglong_number)= SELECT_STRAIGHT_JOIN; }
-#line 44492 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44860 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3072:
-#line 16978 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3108:
+#line 17215 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ulonglong_number)= SELECT_HIGH_PRIORITY; }
-#line 44498 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44866 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3073:
-#line 16979 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3109:
+#line 17216 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ulonglong_number)= SELECT_DISTINCT; }
-#line 44504 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44872 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3074:
-#line 16980 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3110:
+#line 17217 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ulonglong_number)= SELECT_SMALL_RESULT; }
-#line 44510 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44878 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3075:
-#line 16981 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3111:
+#line 17218 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ulonglong_number)= SELECT_BIG_RESULT; }
-#line 44516 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44884 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3076:
-#line 16982 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3112:
+#line 17219 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ulonglong_number)= OPTION_BUFFER_RESULT; }
-#line 44522 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44890 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3077:
-#line 16983 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3113:
+#line 17220 "sql_yacc.yy" /* yacc.c:1646  */
     {
             push_warning(YYTHD, Sql_condition::SL_WARNING,
                          ER_WARN_DEPRECATED_SYNTAX,
                          ER_THD(YYTHD, ER_WARN_DEPRECATED_SQL_CALC_FOUND_ROWS));
             (yyval.ulonglong_number)= OPTION_FOUND_ROWS;
           }
-#line 44533 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44901 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3078:
-#line 16989 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3114:
+#line 17226 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.ulonglong_number)= SELECT_ALL; }
-#line 44539 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44907 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3079:
-#line 17000 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3115:
+#line 17237 "sql_yacc.yy" /* yacc.c:1646  */
     {
             // Initialize context for 'CREATE view_or_trigger_or_sp_or_event'
             Lex->create_info= YYTHD->alloc_typed<HA_CREATE_INFO>();
             if (Lex->create_info == NULL)
               MYSQL_YYABORT; // OOM
           }
-#line 44550 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44918 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3080:
-#line 17010 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3116:
+#line 17247 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 44556 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44924 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3081:
-#line 17012 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3117:
+#line 17249 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 44562 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44930 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3082:
-#line 17014 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3118:
+#line 17251 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 44568 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44936 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3096:
-#line 17047 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3132:
+#line 17284 "sql_yacc.yy" /* yacc.c:1646  */
     {
             /*
               We have to distinguish missing DEFINER-clause from case when
@@ -44579,79 +44947,79 @@
             */
             YYTHD->lex->definer= 0;
           }
-#line 44583 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44951 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3097:
-#line 17061 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3133:
+#line 17298 "sql_yacc.yy" /* yacc.c:1646  */
     {
             YYTHD->lex->definer= get_current_user(YYTHD, (yyvsp[0].lex_user));
           }
-#line 44591 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44959 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3098:
-#line 17074 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3134:
+#line 17311 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 44597 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44965 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3099:
-#line 17076 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3135:
+#line 17313 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 44603 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44971 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3100:
-#line 17078 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3136:
+#line 17315 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 44609 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44977 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3101:
-#line 17083 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3137:
+#line 17320 "sql_yacc.yy" /* yacc.c:1646  */
     { Lex->create_view_mode= enum_view_create_mode::VIEW_CREATE_OR_REPLACE; }
-#line 44615 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44983 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3102:
-#line 17088 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3138:
+#line 17325 "sql_yacc.yy" /* yacc.c:1646  */
     { Lex->create_view_algorithm= VIEW_ALGORITHM_UNDEFINED; }
-#line 44621 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44989 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3103:
-#line 17090 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3139:
+#line 17327 "sql_yacc.yy" /* yacc.c:1646  */
     { Lex->create_view_algorithm= VIEW_ALGORITHM_MERGE; }
-#line 44627 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 44995 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3104:
-#line 17092 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3140:
+#line 17329 "sql_yacc.yy" /* yacc.c:1646  */
     { Lex->create_view_algorithm= VIEW_ALGORITHM_TEMPTABLE; }
-#line 44633 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45001 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3105:
-#line 17097 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3141:
+#line 17334 "sql_yacc.yy" /* yacc.c:1646  */
     { Lex->create_view_suid= VIEW_SUID_DEFAULT; }
-#line 44639 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45007 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3106:
-#line 17099 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3142:
+#line 17336 "sql_yacc.yy" /* yacc.c:1646  */
     { Lex->create_view_suid= VIEW_SUID_DEFINER; }
-#line 44645 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45013 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3107:
-#line 17101 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3143:
+#line 17338 "sql_yacc.yy" /* yacc.c:1646  */
     { Lex->create_view_suid= VIEW_SUID_INVOKER; }
-#line 44651 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45019 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3108:
-#line 17106 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3144:
+#line 17343 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -44687,11 +45055,11 @@
                 set_derived_column_names(static_cast<Create_col_name_list* >(rawmem));
             }
           }
-#line 44691 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45059 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3110:
-#line 17146 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3146:
+#line 17383 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -44739,65 +45107,65 @@
             lex->parsing_options.allows_variable= true;
             lex->parsing_options.allows_select_into= true;
           }
-#line 44743 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45111 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3111:
-#line 17196 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3147:
+#line 17433 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= VIEW_CHECK_NONE; }
-#line 44749 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45117 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3112:
-#line 17197 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3148:
+#line 17434 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= VIEW_CHECK_CASCADED; }
-#line 44755 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45123 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3113:
-#line 17198 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3149:
+#line 17435 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= VIEW_CHECK_CASCADED; }
-#line 44761 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45129 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3114:
-#line 17199 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3150:
+#line 17436 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= VIEW_CHECK_LOCAL; }
-#line 44767 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45135 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3115:
-#line 17210 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3151:
+#line 17447 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.trigger_action_order_type)= TRG_ORDER_FOLLOWS; }
-#line 44773 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45141 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3116:
-#line 17212 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3152:
+#line 17449 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.trigger_action_order_type)= TRG_ORDER_PRECEDES; }
-#line 44779 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45147 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3117:
-#line 17217 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3153:
+#line 17454 "sql_yacc.yy" /* yacc.c:1646  */
     {
               (yyval.trg_characteristics).ordering_clause= TRG_ORDER_NONE;
               (yyval.trg_characteristics).anchor_trigger_name= NULL_CSTR;
             }
-#line 44788 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45156 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3118:
-#line 17223 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3154:
+#line 17460 "sql_yacc.yy" /* yacc.c:1646  */
     {
               (yyval.trg_characteristics).ordering_clause= (yyvsp[-1].trigger_action_order_type);
               (yyval.trg_characteristics).anchor_trigger_name= { (yyvsp[0].lexer.lex_str).str, (yyvsp[0].lexer.lex_str).length };
             }
-#line 44797 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45165 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3119:
-#line 17240 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3155:
+#line 17477 "sql_yacc.yy" /* yacc.c:1646  */
     {                 /* $11 */
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -44829,11 +45197,11 @@
             sp->m_chistics= &lex->sp_chistics;
             sp->set_body_start(thd, (yylsp[0]).cpp.end);
           }
-#line 44833 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45201 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3120:
-#line 17272 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3156:
+#line 17509 "sql_yacc.yy" /* yacc.c:1646  */
     { /* $13 */
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -44860,11 +45228,11 @@
 
             Lex->m_sql_cmd= new (YYTHD->mem_root) Sql_cmd_create_trigger();
           }
-#line 44864 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45232 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3121:
-#line 17309 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3157:
+#line 17546 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -44881,11 +45249,11 @@
             lex->udf.returns=(Item_result) (yyvsp[-2].num);
             lex->udf.dl=(yyvsp[0].lexer.lex_str).str;
           }
-#line 44885 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45253 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3122:
-#line 17327 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3158:
+#line 17564 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -44902,11 +45270,11 @@
             lex->udf.returns=(Item_result) (yyvsp[-2].num);
             lex->udf.dl=(yyvsp[0].lexer.lex_str).str;
           }
-#line 44906 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45274 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3123:
-#line 17349 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3159:
+#line 17586 "sql_yacc.yy" /* yacc.c:1646  */
     { /* $4 */
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -44929,19 +45297,19 @@
 
             sp->m_parser_data.set_parameter_start_ptr((yylsp[0]).cpp.end);
           }
-#line 44933 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45301 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3124:
-#line 17373 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3160:
+#line 17610 "sql_yacc.yy" /* yacc.c:1646  */
     { /* $7 */
             Lex->sphead->m_parser_data.set_parameter_end_ptr((yylsp[0]).cpp.start);
           }
-#line 44941 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45309 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3125:
-#line 17379 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3161:
+#line 17616 "sql_yacc.yy" /* yacc.c:1646  */
     { /* $11 */
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -44982,11 +45350,11 @@
 
             memset(&lex->sp_chistics, 0, sizeof(st_sp_chistics));
           }
-#line 44986 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45354 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3126:
-#line 17420 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3162:
+#line 17657 "sql_yacc.yy" /* yacc.c:1646  */
     { /* $13 */
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -44994,11 +45362,11 @@
             lex->sphead->m_chistics= &lex->sp_chistics;
             lex->sphead->set_body_start(thd, yylloc.cpp.start);
           }
-#line 44998 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45366 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3127:
-#line 17428 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3163:
+#line 17665 "sql_yacc.yy" /* yacc.c:1646  */
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -45053,11 +45421,11 @@
                                   sp->m_name.str);
             }
           }
-#line 45057 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45425 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3128:
-#line 17487 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3164:
+#line 17724 "sql_yacc.yy" /* yacc.c:1646  */
     {                     /*$3*/
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -45077,19 +45445,19 @@
 
             lex->sphead= sp;
           }
-#line 45081 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45449 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3129:
-#line 17507 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3165:
+#line 17744 "sql_yacc.yy" /* yacc.c:1646  */
     {                     /*$5*/
             Lex->sphead->m_parser_data.set_parameter_start_ptr((yylsp[0]).cpp.end);
           }
-#line 45089 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45457 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3130:
-#line 17512 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3166:
+#line 17749 "sql_yacc.yy" /* yacc.c:1646  */
     {                     /*$8*/
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -45097,11 +45465,11 @@
             lex->sphead->m_parser_data.set_parameter_end_ptr((yylsp[0]).cpp.start);
             memset(&lex->sp_chistics, 0, sizeof(st_sp_chistics));
           }
-#line 45101 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45469 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3131:
-#line 17520 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3167:
+#line 17757 "sql_yacc.yy" /* yacc.c:1646  */
     {                     /*$10*/
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -45109,11 +45477,11 @@
             lex->sphead->m_chistics= &lex->sp_chistics;
             lex->sphead->set_body_start(thd, yylloc.cpp.start);
           }
-#line 45113 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45481 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3132:
-#line 17528 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3168:
+#line 17765 "sql_yacc.yy" /* yacc.c:1646  */
     {                     /*$12*/
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -45122,77 +45490,77 @@
 
             lex->sql_command= SQLCOM_CREATE_PROCEDURE;
           }
-#line 45126 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45494 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3133:
-#line 17542 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3169:
+#line 17779 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->sql_command = SQLCOM_XA_START;
             Lex->m_sql_cmd= NEW_PTN Sql_cmd_xa_start((yyvsp[-1].xid), (yyvsp[0].xa_option_type));
           }
-#line 45135 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45503 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3134:
-#line 17547 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3170:
+#line 17784 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->sql_command = SQLCOM_XA_END;
             Lex->m_sql_cmd= NEW_PTN Sql_cmd_xa_end((yyvsp[-1].xid), (yyvsp[0].xa_option_type));
           }
-#line 45144 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45512 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3135:
-#line 17552 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3171:
+#line 17789 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->sql_command = SQLCOM_XA_PREPARE;
             Lex->m_sql_cmd= NEW_PTN Sql_cmd_xa_prepare((yyvsp[0].xid));
           }
-#line 45153 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45521 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3136:
-#line 17557 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3172:
+#line 17794 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->sql_command = SQLCOM_XA_COMMIT;
             Lex->m_sql_cmd= NEW_PTN Sql_cmd_xa_commit((yyvsp[-1].xid), (yyvsp[0].xa_option_type));
           }
-#line 45162 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45530 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3137:
-#line 17562 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3173:
+#line 17799 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->sql_command = SQLCOM_XA_ROLLBACK;
             Lex->m_sql_cmd= NEW_PTN Sql_cmd_xa_rollback((yyvsp[0].xid));
           }
-#line 45171 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45539 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3138:
-#line 17567 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3174:
+#line 17804 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->sql_command = SQLCOM_XA_RECOVER;
             Lex->m_sql_cmd= NEW_PTN Sql_cmd_xa_recover((yyvsp[0].is_not_empty));
           }
-#line 45180 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45548 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3139:
-#line 17574 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3175:
+#line 17811 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.is_not_empty)= false; }
-#line 45186 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45554 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3140:
-#line 17575 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3176:
+#line 17812 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.is_not_empty)= true; }
-#line 45192 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45560 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3141:
-#line 17579 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3177:
+#line 17816 "sql_yacc.yy" /* yacc.c:1646  */
     {
             MYSQL_YYABORT_UNLESS((yyvsp[0].string)->length() <= MAXGTRIDSIZE);
             XID *xid;
@@ -45201,11 +45569,11 @@
             xid->set(1L, (yyvsp[0].string)->ptr(), (yyvsp[0].string)->length(), 0, 0);
             (yyval.xid)= xid;
           }
-#line 45205 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45573 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3142:
-#line 17588 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3178:
+#line 17825 "sql_yacc.yy" /* yacc.c:1646  */
     {
             MYSQL_YYABORT_UNLESS((yyvsp[-2].string)->length() <= MAXGTRIDSIZE &&
                                  (yyvsp[0].string)->length() <= MAXBQUALSIZE);
@@ -45215,11 +45583,11 @@
             xid->set(1L, (yyvsp[-2].string)->ptr(), (yyvsp[-2].string)->length(), (yyvsp[0].string)->ptr(), (yyvsp[0].string)->length());
             (yyval.xid)= xid;
           }
-#line 45219 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45587 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3143:
-#line 17598 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3179:
+#line 17835 "sql_yacc.yy" /* yacc.c:1646  */
     {
             // check for overwflow of xid format id
             bool format_id_overflow_detected= ((yyvsp[0].ulong_num) > LONG_MAX);
@@ -45234,131 +45602,131 @@
             xid->set((yyvsp[0].ulong_num), (yyvsp[-4].string)->ptr(), (yyvsp[-4].string)->length(), (yyvsp[-2].string)->ptr(), (yyvsp[-2].string)->length());
             (yyval.xid)= xid;
           }
-#line 45238 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45606 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3144:
-#line 17615 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3180:
+#line 17852 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 45244 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45612 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3145:
-#line 17616 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3181:
+#line 17853 "sql_yacc.yy" /* yacc.c:1646  */
     {}
-#line 45250 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45618 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3146:
-#line 17620 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3182:
+#line 17857 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.xa_option_type)= XA_NONE;        }
-#line 45256 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45624 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3147:
-#line 17621 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3183:
+#line 17858 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.xa_option_type)= XA_JOIN;        }
-#line 45262 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45630 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3148:
-#line 17622 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3184:
+#line 17859 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.xa_option_type)= XA_RESUME;      }
-#line 45268 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45636 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3149:
-#line 17626 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3185:
+#line 17863 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.xa_option_type)= XA_NONE;        }
-#line 45274 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45642 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3150:
-#line 17627 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3186:
+#line 17864 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.xa_option_type)= XA_ONE_PHASE;   }
-#line 45280 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45648 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3151:
-#line 17632 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3187:
+#line 17869 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.xa_option_type)= XA_NONE;        }
-#line 45286 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45654 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3152:
-#line 17634 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3188:
+#line 17871 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.xa_option_type)= XA_SUSPEND;     }
-#line 45292 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45660 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3153:
-#line 17636 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3189:
+#line 17873 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.xa_option_type)= XA_FOR_MIGRATE; }
-#line 45298 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45666 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3154:
-#line 17641 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3190:
+#line 17878 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_INSTALL_PLUGIN;
             lex->m_sql_cmd= new (YYMEM_ROOT) Sql_cmd_install_plugin(to_lex_cstring((yyvsp[-2].lexer.lex_str)), (yyvsp[0].lexer.lex_str));
           }
-#line 45308 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45676 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3155:
-#line 17647 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3191:
+#line 17884 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_INSTALL_COMPONENT;
             lex->m_sql_cmd= new (YYMEM_ROOT) Sql_cmd_install_component((yyvsp[0].lex_str_list));
           }
-#line 45318 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45686 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3156:
-#line 17656 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3192:
+#line 17893 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_UNINSTALL_PLUGIN;
             lex->m_sql_cmd= new (YYMEM_ROOT) Sql_cmd_uninstall_plugin(to_lex_cstring((yyvsp[0].lexer.lex_str)));
           }
-#line 45328 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45696 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3157:
-#line 17662 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3193:
+#line 17899 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_UNINSTALL_COMPONENT;
             lex->m_sql_cmd= new (YYMEM_ROOT) Sql_cmd_uninstall_component((yyvsp[0].lex_str_list));
           }
-#line 45338 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45706 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3158:
-#line 17671 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3194:
+#line 17908 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.lex_str_list).init(YYTHD->mem_root);
             if ((yyval.lex_str_list).push_back((yyvsp[0].lexer.lex_str)))
               MYSQL_YYABORT; // OOM
           }
-#line 45348 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45716 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3159:
-#line 17677 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3195:
+#line 17914 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.lex_str_list)= (yyvsp[-2].lex_str_list);
             if ((yyval.lex_str_list).push_back((yyvsp[0].lexer.lex_str)))
               MYSQL_YYABORT; // OOM
           }
-#line 45358 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45726 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3160:
-#line 17686 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3196:
+#line 17923 "sql_yacc.yy" /* yacc.c:1646  */
     {
             LEX *lex= Lex;
             lex->m_sql_cmd=
@@ -45367,22 +45735,22 @@
               MYSQL_YYABORT;
             lex->sql_command= SQLCOM_IMPORT;
           }
-#line 45371 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45739 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3161:
-#line 17704 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3197:
+#line 17941 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->sql_command= SQLCOM_CLONE;
             Lex->m_sql_cmd= NEW_PTN Sql_cmd_clone(to_lex_cstring((yyvsp[0].lexer.lex_str)));
             if (Lex->m_sql_cmd == nullptr)
               MYSQL_YYABORT;
           }
-#line 45382 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45750 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3162:
-#line 17714 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3198:
+#line 17951 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->sql_command= SQLCOM_CLONE;
             /* Reject space characters around ':' */
@@ -45390,9 +45758,8 @@
               YYTHD->syntax_error_at((yylsp[-5]));
               MYSQL_YYABORT;
             }
-            (yyvsp[-6].lex_user)->auth.str= (yyvsp[-1].lexer.lex_str).str;
-            (yyvsp[-6].lex_user)->auth.length= (yyvsp[-1].lexer.lex_str).length;
-            (yyvsp[-6].lex_user)->uses_identified_by_clause= true;
+            (yyvsp[-6].lex_user)->first_factor_auth_info.auth = to_lex_cstring((yyvsp[-1].lexer.lex_str));
+            (yyvsp[-6].lex_user)->first_factor_auth_info.uses_identified_by_clause = true;
             Lex->contains_plaintext_password= true;
 
             Lex->m_sql_cmd= NEW_PTN Sql_cmd_clone((yyvsp[-6].lex_user), (yyvsp[-4].ulong_num), to_lex_cstring((yyvsp[0].lexer.lex_str)));
@@ -45400,113 +45767,113 @@
             if (Lex->m_sql_cmd == nullptr)
               MYSQL_YYABORT;
           }
-#line 45404 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45771 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3163:
-#line 17735 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3199:
+#line 17971 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.lexer.lex_str)= null_lex_str;
           }
-#line 45412 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45779 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3164:
-#line 17739 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3200:
+#line 17975 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.lexer.lex_str)= (yyvsp[-1].lexer.lex_str);
           }
-#line 45420 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45787 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3165:
-#line 17746 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3201:
+#line 17982 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->ssl_type= SSL_TYPE_NOT_SPECIFIED;
           }
-#line 45428 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45795 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3166:
-#line 17750 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3202:
+#line 17986 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->ssl_type= SSL_TYPE_SPECIFIED;
           }
-#line 45436 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45803 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3167:
-#line 17754 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3203:
+#line 17990 "sql_yacc.yy" /* yacc.c:1646  */
     {
             Lex->ssl_type= SSL_TYPE_NONE;
           }
-#line 45444 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45811 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3168:
-#line 17760 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3204:
+#line 17996 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.resource_group_type)= resourcegroups::Type::USER_RESOURCE_GROUP; }
-#line 45450 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45817 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3169:
-#line 17761 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3205:
+#line 17997 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.resource_group_type)= resourcegroups::Type::SYSTEM_RESOURCE_GROUP; }
-#line 45456 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45823 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3170:
-#line 17766 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3206:
+#line 18002 "sql_yacc.yy" /* yacc.c:1646  */
     {
             /* Make an empty list. */
             (yyval.resource_group_vcpu_list_type)= NEW_PTN Mem_root_array<resourcegroups::Range>(YYMEM_ROOT);
             if ((yyval.resource_group_vcpu_list_type) == nullptr)
               MYSQL_YYABORT;
           }
-#line 45467 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45834 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3171:
-#line 17772 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3207:
+#line 18008 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.resource_group_vcpu_list_type)= (yyvsp[0].resource_group_vcpu_list_type); }
-#line 45473 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45840 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3172:
-#line 17777 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3208:
+#line 18013 "sql_yacc.yy" /* yacc.c:1646  */
     {
             resourcegroups::Range r((yyvsp[0].vcpu_range_type).start, (yyvsp[0].vcpu_range_type).end);
             (yyval.resource_group_vcpu_list_type)= NEW_PTN Mem_root_array<resourcegroups::Range>(YYMEM_ROOT);
             if ((yyval.resource_group_vcpu_list_type) == nullptr || (yyval.resource_group_vcpu_list_type)->push_back(r))
               MYSQL_YYABORT;
           }
-#line 45484 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45851 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3173:
-#line 17784 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3209:
+#line 18020 "sql_yacc.yy" /* yacc.c:1646  */
     {
             resourcegroups::Range r((yyvsp[0].vcpu_range_type).start, (yyvsp[0].vcpu_range_type).end);
             (yyval.resource_group_vcpu_list_type)= (yyvsp[-2].resource_group_vcpu_list_type);
             if ((yyval.resource_group_vcpu_list_type) == nullptr || (yyval.resource_group_vcpu_list_type)->push_back(r))
               MYSQL_YYABORT;
           }
-#line 45495 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45862 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3174:
-#line 17794 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3210:
+#line 18030 "sql_yacc.yy" /* yacc.c:1646  */
     {
             auto cpu_id= my_strtoull((yyvsp[0].lexer.lex_str).str, nullptr, 10);
             (yyval.vcpu_range_type).start= (yyval.vcpu_range_type).end=
               static_cast<resourcegroups::platform::cpu_id_t>(cpu_id);
             assert((yyval.vcpu_range_type).start == cpu_id); // truncation check
           }
-#line 45506 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45873 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3175:
-#line 17801 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3211:
+#line 18037 "sql_yacc.yy" /* yacc.c:1646  */
     {
             auto start= my_strtoull((yyvsp[-2].lexer.lex_str).str, nullptr, 10);
             (yyval.vcpu_range_type).start= static_cast<resourcegroups::platform::cpu_id_t>(start);
@@ -45516,74 +45883,74 @@
             (yyval.vcpu_range_type).end= static_cast<resourcegroups::platform::cpu_id_t>(end);
             assert((yyval.vcpu_range_type).end == end); // truncation check
           }
-#line 45520 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45887 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3176:
-#line 17813 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3212:
+#line 18049 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= static_cast<int>(my_strtoll((yyvsp[0].lexer.lex_str).str, nullptr, 10)); }
-#line 45526 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45893 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3177:
-#line 17814 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3213:
+#line 18050 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.num)= -static_cast<int>(my_strtoll((yyvsp[0].lexer.lex_str).str, nullptr, 10)); }
-#line 45532 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45899 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3178:
-#line 17818 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3214:
+#line 18054 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.resource_group_priority_type).is_default= true; }
-#line 45538 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45905 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3179:
-#line 17820 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3215:
+#line 18056 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.resource_group_priority_type).is_default= false;
             (yyval.resource_group_priority_type).value= (yyvsp[0].num);
           }
-#line 45547 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45914 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3180:
-#line 17827 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3216:
+#line 18063 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.resource_group_state_type).is_default= true; }
-#line 45553 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45920 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3181:
-#line 17829 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3217:
+#line 18065 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.resource_group_state_type).is_default= false;
             (yyval.resource_group_state_type).value= true;
           }
-#line 45562 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45929 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3182:
-#line 17834 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3218:
+#line 18070 "sql_yacc.yy" /* yacc.c:1646  */
     {
             (yyval.resource_group_state_type).is_default= false;
             (yyval.resource_group_state_type).value= false;
           }
-#line 45571 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45938 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3183:
-#line 17841 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3219:
+#line 18077 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.resource_group_flag_type)= false; }
-#line 45577 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45944 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3184:
-#line 17842 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3220:
+#line 18078 "sql_yacc.yy" /* yacc.c:1646  */
     { (yyval.resource_group_flag_type)= true; }
-#line 45583 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45950 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
-  case 3185:
-#line 17848 "sql_yacc.yy" /* yacc.c:1646  */
+  case 3221:
+#line 18084 "sql_yacc.yy" /* yacc.c:1646  */
     {
             if ((yyvsp[0].lexer.lex_str).str[0] != '\0') {
               size_t eoff = 0;
@@ -45596,11 +45963,11 @@
             }
             (yyval.lex_cstr) = to_lex_cstring((yyvsp[0].lexer.lex_str));
           }
-#line 45600 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45967 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
     break;
 
 
-#line 45604 "/var/lib/pb2/sb_1-3692345-1625126119.25/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
+#line 45971 "/var/lib/pb2/sb_1-4617039-1632834178.1/dist_GPL/sql/sql_yacc.cc" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
diff -Nru mysql-8.0-8.0.26/sql/sql_yacc.h mysql-8.0-8.0.27/sql/sql_yacc.h
--- mysql-8.0-8.0.26/sql/sql_yacc.h	2021-07-01 08:15:39.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_yacc.h	2021-09-28 13:21:33.000000000 +0000
@@ -30,8 +30,8 @@
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
-#ifndef YY_MYSQL_VAR_LIB_PB2_SB_1_3692345_1625126119_25_DIST_GPL_SQL_SQL_YACC_H_INCLUDED
-# define YY_MYSQL_VAR_LIB_PB2_SB_1_3692345_1625126119_25_DIST_GPL_SQL_SQL_YACC_H_INCLUDED
+#ifndef YY_MYSQL_VAR_LIB_PB2_SB_1_4617039_1632834178_1_DIST_GPL_SQL_SQL_YACC_H_INCLUDED
+# define YY_MYSQL_VAR_LIB_PB2_SB_1_4617039_1632834178_1_DIST_GPL_SQL_SQL_YACC_H_INCLUDED
 /* Debug traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
@@ -827,11 +827,20 @@
     SOURCE_ZSTD_COMPRESSION_LEVEL_SYM = 1188,
     ST_COLLECT_SYM = 1189,
     KEYRING_SYM = 1190,
-    KEYWORD_USED_AS_IDENT = 1192,
-    KEYWORD_USED_AS_KEYWORD = 1193,
-    CONDITIONLESS_JOIN = 1194,
-    SUBQUERY_AS_EXPR = 1195,
-    EMPTY_FROM_CLAUSE = 1196
+    AUTHENTICATION_SYM = 1191,
+    FACTOR_SYM = 1192,
+    FINISH_SYM = 1193,
+    INITIATE_SYM = 1194,
+    REGISTRATION_SYM = 1195,
+    UNREGISTER_SYM = 1196,
+    INITIAL_SYM = 1197,
+    CHALLENGE_RESPONSE_SYM = 1198,
+    GTID_ONLY_SYM = 1199,
+    KEYWORD_USED_AS_IDENT = 1201,
+    KEYWORD_USED_AS_KEYWORD = 1202,
+    CONDITIONLESS_JOIN = 1203,
+    SUBQUERY_AS_EXPR = 1204,
+    EMPTY_FROM_CLAUSE = 1205
   };
 #endif
 /* Tokens.  */
@@ -1617,11 +1626,20 @@
 #define SOURCE_ZSTD_COMPRESSION_LEVEL_SYM 1188
 #define ST_COLLECT_SYM 1189
 #define KEYRING_SYM 1190
-#define KEYWORD_USED_AS_IDENT 1192
-#define KEYWORD_USED_AS_KEYWORD 1193
-#define CONDITIONLESS_JOIN 1194
-#define SUBQUERY_AS_EXPR 1195
-#define EMPTY_FROM_CLAUSE 1196
+#define AUTHENTICATION_SYM 1191
+#define FACTOR_SYM 1192
+#define FINISH_SYM 1193
+#define INITIATE_SYM 1194
+#define REGISTRATION_SYM 1195
+#define UNREGISTER_SYM 1196
+#define INITIAL_SYM 1197
+#define CHALLENGE_RESPONSE_SYM 1198
+#define GTID_ONLY_SYM 1199
+#define KEYWORD_USED_AS_IDENT 1201
+#define KEYWORD_USED_AS_KEYWORD 1202
+#define CONDITIONLESS_JOIN 1203
+#define SUBQUERY_AS_EXPR 1204
+#define EMPTY_FROM_CLAUSE 1205
 
 /* Value type.  */
 
@@ -1643,4 +1661,4 @@
 
 int MYSQLparse (class THD *YYTHD, class Parse_tree_root **parse_tree);
 
-#endif /* !YY_MYSQL_VAR_LIB_PB2_SB_1_3692345_1625126119_25_DIST_GPL_SQL_SQL_YACC_H_INCLUDED  */
+#endif /* !YY_MYSQL_VAR_LIB_PB2_SB_1_4617039_1632834178_1_DIST_GPL_SQL_SQL_YACC_H_INCLUDED  */
diff -Nru mysql-8.0-8.0.26/sql/sql_yacc.yy mysql-8.0-8.0.27/sql/sql_yacc.yy
--- mysql-8.0-8.0.26/sql/sql_yacc.yy	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sql_yacc.yy	2021-09-28 11:46:34.000000000 +0000
@@ -1325,7 +1325,6 @@
                                                             table expressions. */
 %token<lexer.keyword> REPLICA_SYM 1159
 %token<lexer.keyword> REPLICAS_SYM 1160
-
 %token<lexer.keyword> ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS_SYM 1161      /* MYSQL */
 %token<lexer.keyword> GET_SOURCE_PUBLIC_KEY_SYM 1162           /* MYSQL */
 %token<lexer.keyword> SOURCE_AUTO_POSITION_SYM 1163            /* MYSQL */
@@ -1356,8 +1355,19 @@
 %token<lexer.keyword> SOURCE_ZSTD_COMPRESSION_LEVEL_SYM 1188   /* MYSQL */
 
 %token<lexer.keyword> ST_COLLECT_SYM 1189                      /* MYSQL */
-
 %token<lexer.keyword> KEYRING_SYM 1190                         /* MYSQL */
+
+%token<lexer.keyword> AUTHENTICATION_SYM         1191      /* MYSQL */
+%token<lexer.keyword> FACTOR_SYM                 1192      /* MYSQL */
+%token<lexer.keyword> FINISH_SYM                 1193      /* SQL-2016-N */
+%token<lexer.keyword> INITIATE_SYM               1194      /* MYSQL */
+%token<lexer.keyword> REGISTRATION_SYM           1195      /* MYSQL */
+%token<lexer.keyword> UNREGISTER_SYM             1196      /* MYSQL */
+%token<lexer.keyword> INITIAL_SYM                1197      /* SQL-2016-R */
+%token<lexer.keyword> CHALLENGE_RESPONSE_SYM     1198      /* MYSQL */
+
+%token<lexer.keyword> GTID_ONLY_SYM 1199                       /* MYSQL */
+
 /*
   Precedence rules used to resolve the ambiguity when using keywords as idents
   in the case e.g.:
@@ -1491,6 +1501,7 @@
         opt_profile_defs
         profile_defs
         profile_def
+        factor
 
 %type <ulonglong_number>
         ulonglong_num real_ulonglong_num size_number
@@ -1613,6 +1624,19 @@
 
 %type <lex_user> user_ident_or_text user create_user alter_user user_func role
 
+%type <lex_mfa>
+        identification
+        identified_by_password
+        identified_by_random_password
+        identified_with_plugin
+        identified_with_plugin_as_auth
+        identified_with_plugin_by_random_password
+        identified_with_plugin_by_password
+        opt_initial_auth
+        opt_user_registration
+
+%type <lex_mfas> opt_create_user_with_mfa
+
 %type <lexer.charset>
         opt_collate
         charset_name
@@ -3127,13 +3151,19 @@
         | PRIVILEGE_CHECKS_USER_SYM EQ privilege_check_def
         | REQUIRE_ROW_FORMAT_SYM EQ ulong_num
           {
-            if ($3 != 0 && $3 != 1) {
+            switch($3) {
+            case 0:
+                Lex->mi.require_row_format =
+                  LEX_MASTER_INFO::LEX_MI_DISABLE;
+                break;
+            case 1:
+                Lex->mi.require_row_format =
+                  LEX_MASTER_INFO::LEX_MI_ENABLE;
+                break;
+            default:
               const char* wrong_value = YYTHD->strmake(@3.raw.start, @3.raw.length());
               my_error(ER_REQUIRE_ROW_FORMAT_INVALID_VALUE, MYF(0), wrong_value);
             }
-            else {
-              Lex->mi.require_row_format = $3;
-            }
           }
         | REQUIRE_TABLE_PRIMARY_KEY_CHECK_SYM EQ table_primary_key_check_def
         | SOURCE_CONNECTION_AUTO_FAILOVER_SYM EQ real_ulong_num
@@ -3153,6 +3183,23 @@
             }
           }
         | ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS_SYM EQ assign_gtids_to_anonymous_transactions_def
+        | GTID_ONLY_SYM EQ real_ulong_num
+          {
+            switch($3) {
+            case 0:
+                Lex->mi.m_gtid_only =
+                  LEX_MASTER_INFO::LEX_MI_DISABLE;
+                break;
+            case 1:
+                Lex->mi.m_gtid_only =
+                  LEX_MASTER_INFO::LEX_MI_ENABLE;
+                break;
+            default:
+                YYTHD->syntax_error_at(@3,
+                  "You have an error in your CHANGE REPLICATION SOURCE syntax; GTID_ONLY only accepts values 0 or 1");
+                MYSQL_YYABORT;
+            }
+          }
         | source_file_def
         ;
 
@@ -6097,11 +6144,11 @@
                 case 'g':
                 case 'G':
                   text_shift_number+=10;
-                  // Fall through.
+                  [[fallthrough]];
                 case 'm':
                 case 'M':
                   text_shift_number+=10;
-                  // Fall through.
+                  [[fallthrough]];
                 case 'k':
                 case 'K':
                   text_shift_number+=10;
@@ -6645,8 +6692,17 @@
           {
             $$= NEW_PTN PT_create_min_rows_option($3);
           }
-        | AVG_ROW_LENGTH opt_equal ulong_num
+        | AVG_ROW_LENGTH opt_equal ulonglong_num
           {
+            // The frm-format only allocated 4 bytes for avg_row_length, and
+            // there is code which assumes it can be represented as an uint,
+            // so we constrain it here.
+            if ($3 > std::numeric_limits<std::uint32_t>::max()) {
+              YYTHD->syntax_error_at(@3,
+              "The valid range for avg_row_length is [0,4294967295]. Error"
+              );
+              MYSQL_YYABORT;
+            }
             $$= NEW_PTN PT_create_avg_row_length_option($3);
           }
         | PASSWORD opt_equal TEXT_STRING_sys
@@ -6693,7 +6749,8 @@
             we can store the higher bits from stats_sample_pages in .frm too. */
             if ($3 == 0 || $3 > 0xffff)
             {
-              YYTHD->syntax_error();
+              YYTHD->syntax_error_at(@3,
+              "The valid range for stats_sample_pages is [1, 65535]. Error");
               MYSQL_YYABORT;
             }
             $$= NEW_PTN PT_create_stats_stable_pages($3);
@@ -6758,8 +6815,17 @@
           {
             $$= NEW_PTN PT_create_connection_option($3);
           }
-        | KEY_BLOCK_SIZE opt_equal signed_num
+        | KEY_BLOCK_SIZE opt_equal ulonglong_num
           {
+            // The frm-format only allocated 2 bytes for key_block_size,
+            // even if it is represented as std::uint32_t in HA_CREATE_INFO and
+            // elsewhere.
+            if ($3 > std::numeric_limits<std::uint16_t>::max()) {
+              YYTHD->syntax_error_at(@3,
+              "The valid range for key_block_size is [0,65535]. Error");
+              MYSQL_YYABORT;
+            }
+
             $$= NEW_PTN
             PT_create_key_block_size_option(static_cast<std::uint32_t>($3));
           }
@@ -8295,41 +8361,36 @@
 
 alter_user_stmt:
           alter_user_command alter_user_list require_clause
-          connect_options opt_account_lock_password_expire_options opt_user_attribute
-        | alter_user_command user_func IDENTIFIED_SYM BY RANDOM_SYM PASSWORD
+          connect_options opt_account_lock_password_expire_options
+          opt_user_attribute
+        | alter_user_command user_func identified_by_random_password
           opt_replace_password opt_retain_current_password
           {
-            $2->auth.str= nullptr;
-            $2->auth.length= 0;
-            $2->has_password_generator= true;
-            $2->uses_identified_by_clause= true;
-            if ($7.str != nullptr) {
-              $2->current_auth= $7;
-              $2->uses_replace_clause= true;
+            $2->first_factor_auth_info = *$3;
+
+            if ($4.str != nullptr) {
+              $2->current_auth = $4;
+              $2->uses_replace_clause = true;
             }
-            Lex->contains_plaintext_password= true;
-            $2->discard_old_password= false;
-            $2->retain_current_password= $8;
+            $2->discard_old_password = false;
+            $2->retain_current_password = $5;
           }
-        | alter_user_command user_func IDENTIFIED_SYM BY TEXT_STRING
+        | alter_user_command user_func identified_by_password
           opt_replace_password opt_retain_current_password
           {
-            $2->auth.str= $5.str;
-            $2->auth.length= $5.length;
-            $2->uses_identified_by_clause= true;
-            if ($6.str != nullptr) {
-              $2->current_auth= $6;
-              $2->uses_replace_clause= true;
+            $2->first_factor_auth_info = *$3;
+
+            if ($4.str != nullptr) {
+              $2->current_auth = $4;
+              $2->uses_replace_clause = true;
             }
-            Lex->contains_plaintext_password= true;
-            $2->discard_old_password= false;
-            $2->retain_current_password= $7;
+            $2->discard_old_password = false;
+            $2->retain_current_password = $5;
           }
         | alter_user_command user_func DISCARD_SYM OLD_SYM PASSWORD
           {
-            $2->discard_old_password= true;
-            $2->retain_current_password= false;
-            $2->auth= NULL_CSTR;
+            $2->discard_old_password = true;
+            $2->retain_current_password = false;
           }
         | alter_user_command user DEFAULT_SYM ROLE_SYM ALL
           {
@@ -8366,6 +8427,18 @@
                                                  role_enum::ROLE_NAME);
             MAKE_CMD(tmp);
           }
+        | alter_user_command user opt_user_registration
+          {
+            if ($2->mfa_list.push_back($3))
+              MYSQL_YYABORT;  // OOM
+            LEX *lex=Lex;
+            lex->users_list.push_front ($2);
+          }
+        | alter_user_command user_func opt_user_registration
+          {
+            if ($2->mfa_list.push_back($3))
+              MYSQL_YYABORT;  // OOM
+          }
         ;
 
 opt_replace_password:
@@ -8596,10 +8669,9 @@
           {
             /* empty LEX_USER means current_user */
             LEX_USER *curr_user;
-            if (!(curr_user= (LEX_USER*) Lex->thd->alloc(sizeof(LEX_USER))))
+            if (!(curr_user= LEX_USER::alloc(YYTHD)))
               MYSQL_YYABORT;
 
-            memset(curr_user, 0, sizeof(LEX_USER));
             Lex->users_list.push_back(curr_user);
             $$= curr_user;
           }
@@ -10341,7 +10413,7 @@
           }
         | bit_expr DIV_SYM bit_expr %prec DIV_SYM
           {
-            $$= NEW_PTN Item_func_int_div(@$, $1,$3);
+            $$= NEW_PTN Item_func_div_int(@$, $1,$3);
           }
         | bit_expr MOD_SYM bit_expr %prec MOD_SYM
           {
@@ -10454,6 +10526,7 @@
           }
         | BINARY_SYM simple_expr %prec NEG
           {
+            push_deprecated_warn(YYTHD, "BINARY expr", "CAST");
             $$= create_func_cast(YYTHD, @2, $2, ITEM_CAST_CHAR, &my_charset_bin);
           }
         | CAST_SYM '(' expr AS cast_type opt_array_cast ')'
@@ -14968,14 +15041,13 @@
           }
         | CURRENT_USER optional_braces
           {
-            if (!($$=(LEX_USER*) YYTHD->alloc(sizeof(LEX_USER))))
+            if (!($$= LEX_USER::alloc(YYTHD)))
               MYSQL_YYABORT;
             /*
               empty LEX_USER means current_user and
               will be handled in the  get_current_user() function
               later
             */
-            memset($$, 0, sizeof(LEX_USER));
           }
         ;
 
@@ -15125,6 +15197,7 @@
         | ARRAY_SYM
         | AT_SYM
         | ATTRIBUTE_SYM
+        | AUTHENTICATION_SYM
         | AUTOEXTEND_SIZE_SYM
         | AUTO_INC
         | AVG_ROW_LENGTH
@@ -15140,6 +15213,7 @@
         | CASCADED
         | CATALOG_NAME_SYM
         | CHAIN_SYM
+        | CHALLENGE_RESPONSE_SYM
         | CHANGED
         | CHANNEL_SYM
         | CIPHER_SYM
@@ -15206,11 +15280,13 @@
         | EXPORT_SYM
         | EXTENDED_SYM
         | EXTENT_SIZE_SYM
+        | FACTOR_SYM
         | FAILED_LOGIN_ATTEMPTS_SYM
         | FAST_SYM
         | FAULTS_SYM
         | FILE_BLOCK_SIZE_SYM
         | FILTER_SYM
+        | FINISH_SYM
         | FIRST_SYM
         | FIXED_SYM
         | FOLLOWING_SYM
@@ -15225,6 +15301,7 @@
         | GET_SOURCE_PUBLIC_KEY_SYM
         | GRANTS
         | GROUP_REPLICATION
+        | GTID_ONLY_SYM
         | HASH_SYM
         | HISTOGRAM_SYM
         | HISTORY_SYM
@@ -15236,6 +15313,8 @@
         | INACTIVE_SYM
         | INDEXES
         | INITIAL_SIZE_SYM
+        | INITIAL_SYM
+        | INITIATE_SYM
         | INSERT_METHOD
         | INSTANCE_SYM
         | INVISIBLE_SYM
@@ -15369,6 +15448,7 @@
         | REDO_BUFFER_SIZE_SYM
         | REDUNDANT_SYM
         | REFERENCE_SYM
+        | REGISTRATION_SYM
         | RELAY
         | RELAYLOG_SYM
         | RELAY_LOG_FILE_SYM
@@ -15504,6 +15584,7 @@
         | UNDOFILE_SYM
         | UNDO_BUFFER_SIZE_SYM
         | UNKNOWN_SYM
+        | UNREGISTER_SYM
         | UNTIL_SYM
         | UPGRADE_SYM
         | USER
@@ -16547,218 +16628,374 @@
           /* empty */   { $$= false; }
         | DISCARD_SYM OLD_SYM PASSWORD { $$= true; }
 
+
+opt_user_registration:
+          factor INITIATE_SYM REGISTRATION_SYM
+          {
+            LEX_MFA *m = NEW_PTN LEX_MFA;
+            if (m == nullptr)
+              MYSQL_YYABORT;  // OOM
+            m->nth_factor= $1;
+            m->init_registration= true;
+            m->requires_registration= true;
+            $$ = m;
+          }
+        | factor UNREGISTER_SYM
+          {
+            LEX_MFA *m = NEW_PTN LEX_MFA;
+            if (m == nullptr)
+              MYSQL_YYABORT;  // OOM
+            m->nth_factor= $1;
+            m->unregister= true;
+            $$ = m;
+          }
+        | factor FINISH_SYM REGISTRATION_SYM SET_SYM CHALLENGE_RESPONSE_SYM AS TEXT_STRING_hash
+          {
+            LEX_MFA *m = NEW_PTN LEX_MFA;
+            if (m == nullptr)
+              MYSQL_YYABORT;  // OOM
+            m->nth_factor= $1;
+            m->finish_registration= true;
+            m->requires_registration= true;
+            m->challenge_response= to_lex_cstring($7);
+            $$ = m;
+          }
+        ;
+
 create_user:
-          user IDENTIFIED_SYM BY TEXT_STRING_password
+          user identification opt_create_user_with_mfa
           {
-            $$=$1;
-            $1->auth.str= $4.str;
-            $1->auth.length= $4.length;
-            $1->has_password_generator= false;
-            $1->uses_identified_by_clause= true;
-            $1->discard_old_password= false;
-            $1->retain_current_password= false;
-            Lex->contains_plaintext_password= true;
+            $$ = $1;
+            $$->first_factor_auth_info = *$2;
+            if ($$->add_mfa_identifications($3.mfa2, $3.mfa3))
+              MYSQL_YYABORT;  // OOM
           }
-        | user IDENTIFIED_SYM BY RANDOM_SYM PASSWORD
+        | user identified_with_plugin opt_initial_auth
           {
             $$= $1;
-            $1->has_password_generator= true;
-            $1->auth= EMPTY_CSTR;
-            $1->uses_identified_by_clause= true;
-            $1->uses_identified_with_clause= false;
-            $1->discard_old_password= false;
-            $1->retain_current_password= false;
-            Lex->contains_plaintext_password= true;
+            /* set $3 as first factor auth method */
+            $3->nth_factor = 1;
+            $3->passwordless = false;
+            $$->first_factor_auth_info = *$3;
+            /* set $2 as second factor auth method */
+            $2->nth_factor = 2;
+            $2->passwordless = true;
+            if ($$->mfa_list.push_back($2))
+              MYSQL_YYABORT;  // OOM
+            $$->with_initial_auth = true;
           }
-        | user IDENTIFIED_SYM WITH ident_or_text
+        | user opt_create_user_with_mfa
           {
-            $$= $1;
-            $1->plugin.str= $4.str;
-            $1->plugin.length= $4.length;
-            $1->auth= EMPTY_CSTR;
-            $1->uses_identified_with_clause= true;
-            $1->discard_old_password= false;
-            $1->retain_current_password= false;
-            $1->has_password_generator= false;
+            $$ = $1;
+            if ($$->add_mfa_identifications($2.mfa2, $2.mfa3))
+              MYSQL_YYABORT;  // OOM
           }
-        | user IDENTIFIED_SYM WITH ident_or_text AS TEXT_STRING_hash
+        ;
+
+opt_create_user_with_mfa:
+          /* empty */                                   { $$ = {}; }
+        | AND_SYM identification
           {
-            $$= $1;
-            $1->plugin.str= $4.str;
-            $1->plugin.length= $4.length;
-            $1->auth.str= $6.str;
-            $1->auth.length= $6.length;
-            $1->uses_identified_with_clause= true;
-            $1->uses_authentication_string_clause= true;
-            $1->discard_old_password= false;
-            $1->retain_current_password= false;
-            $1->has_password_generator= false;
+            $2->nth_factor = 2;
+            $$ = {$2, nullptr};
           }
-        | user IDENTIFIED_SYM WITH ident_or_text BY TEXT_STRING_password
+        | AND_SYM identification AND_SYM identification
           {
-            $$= $1;
-            $1->plugin.str= $4.str;
-            $1->plugin.length= $4.length;
-            $1->auth.str= $6.str;
-            $1->auth.length= $6.length;
-            $1->uses_identified_with_clause= true;
-            $1->uses_identified_by_clause= true;
-            $1->discard_old_password= false;
-            $1->retain_current_password= false;
-            Lex->contains_plaintext_password= true;
-            $1->has_password_generator= false;
+            $2->nth_factor = 2;
+            $4->nth_factor = 3;
+            $$ = {$2, $4};
           }
-        | user IDENTIFIED_SYM WITH ident_or_text BY RANDOM_SYM PASSWORD
+        ;
+
+identification:
+          identified_by_password
+        | identified_by_random_password
+        | identified_with_plugin
+        | identified_with_plugin_as_auth
+        | identified_with_plugin_by_password
+        | identified_with_plugin_by_random_password
+        ;
+
+identified_by_password:
+          IDENTIFIED_SYM BY TEXT_STRING_password
           {
-            $$= $1;
-            $1->plugin.str= $4.str;
-            $1->plugin.length= $4.length;
-            $1->uses_identified_with_clause= true;
-            $1->uses_identified_by_clause= true;
-            $1->discard_old_password= false;
-            $1->retain_current_password= false;
+            LEX_MFA *m = NEW_PTN LEX_MFA;
+            if (m == nullptr)
+              MYSQL_YYABORT;  // OOM
+            m->auth = to_lex_cstring($3);
+            m->uses_identified_by_clause = true;
+            $$ = m;
             Lex->contains_plaintext_password= true;
-            $1->has_password_generator= true;
           }
-        | user
+        ;
+
+identified_by_random_password:
+          IDENTIFIED_SYM BY RANDOM_SYM PASSWORD
           {
-            $$= $1;
-            $1->auth= NULL_CSTR;
-            $1->discard_old_password= false;
-            $1->retain_current_password= false;
-            $1->has_password_generator= false;
+            LEX_MFA *m = NEW_PTN LEX_MFA;
+            if (m == nullptr)
+              MYSQL_YYABORT;  // OOM
+            m->auth = EMPTY_CSTR;
+            m->has_password_generator = true;
+            m->uses_identified_by_clause = true;
+            $$ = m;
+            Lex->contains_plaintext_password = true;
           }
         ;
 
-alter_user:
-         user IDENTIFIED_SYM BY TEXT_STRING REPLACE_SYM TEXT_STRING_password opt_retain_current_password
+identified_with_plugin:
+          IDENTIFIED_SYM WITH ident_or_text
           {
-            $$=$1;
-            $1->has_password_generator= false;
-            $1->auth.str= $4.str;
-            $1->auth.length= $4.length;
-            $1->uses_identified_by_clause= true;
-            $1->current_auth.str= $6.str;
-            $1->current_auth.length= $6.length;
-            $1->uses_replace_clause= true;
-            $1->discard_old_password= false;
-            $1->retain_current_password= $7;
-            Lex->contains_plaintext_password= true;
+            LEX_MFA *m = NEW_PTN LEX_MFA;
+            if (m == nullptr)
+              MYSQL_YYABORT;  // OOM
+            m->plugin = to_lex_cstring($3);
+            m->auth = EMPTY_CSTR;
+            m->uses_identified_by_clause = false;
+            m->uses_identified_with_clause = true;
+            $$ = m;
           }
-        | user IDENTIFIED_SYM WITH ident_or_text BY TEXT_STRING_password REPLACE_SYM TEXT_STRING_password
-          opt_retain_current_password
+        ;
+
+identified_with_plugin_as_auth:
+          IDENTIFIED_SYM WITH ident_or_text AS TEXT_STRING_hash
           {
-            $$= $1;
-            $1->has_password_generator= false;
-            $1->plugin.str= $4.str;
-            $1->plugin.length= $4.length;
-            $1->auth.str= $6.str;
-            $1->auth.length= $6.length;
-            $1->current_auth.str= $8.str;
-            $1->current_auth.length= $8.length;
-            $1->uses_replace_clause= true;
-            $1->uses_identified_with_clause= true;
-            $1->uses_identified_by_clause= true;
-            $1->discard_old_password= false;
-            $1->retain_current_password= $9;
-            Lex->contains_plaintext_password= true;
+            LEX_MFA *m = NEW_PTN LEX_MFA;
+            if (m == nullptr)
+              MYSQL_YYABORT;  // OOM
+            m->plugin = to_lex_cstring($3);
+            m->auth = to_lex_cstring($5);
+            m->uses_authentication_string_clause = true;
+            m->uses_identified_with_clause = true;
+            $$ = m;
           }
-        | user IDENTIFIED_SYM BY TEXT_STRING_password opt_retain_current_password
+        ;
+
+identified_with_plugin_by_password:
+          IDENTIFIED_SYM WITH ident_or_text BY TEXT_STRING_password
           {
-            $$=$1;
-            $1->has_password_generator= false;
-            $1->auth.str= $4.str;
-            $1->auth.length= $4.length;
-            $1->uses_identified_by_clause= true;
-            $1->discard_old_password= false;
-            $1->retain_current_password= $5;
+            LEX_MFA *m = NEW_PTN LEX_MFA;
+            if (m == nullptr)
+              MYSQL_YYABORT;  // OOM
+            m->plugin = to_lex_cstring($3);
+            m->auth = to_lex_cstring($5);
+            m->uses_identified_by_clause = true;
+            m->uses_identified_with_clause = true;
+            $$ = m;
             Lex->contains_plaintext_password= true;
           }
-        | user IDENTIFIED_SYM BY RANDOM_SYM PASSWORD opt_retain_current_password
+        ;
+
+identified_with_plugin_by_random_password:
+          IDENTIFIED_SYM WITH ident_or_text BY RANDOM_SYM PASSWORD
           {
-            $$= $1;
-            $1->has_password_generator= true;
-            $1->auth= EMPTY_CSTR;
-            $1->uses_identified_by_clause= true;
-            $1->uses_identified_with_clause= false;
-            $1->discard_old_password= false;
-            $1->retain_current_password= $6;
+            LEX_MFA *m = NEW_PTN LEX_MFA;
+            if (m == nullptr)
+              MYSQL_YYABORT;  // OOM
+            m->plugin = to_lex_cstring($3);
+            m->uses_identified_by_clause = true;
+            m->uses_identified_with_clause = true;
+            m->has_password_generator = true;
+            $$ = m;
             Lex->contains_plaintext_password= true;
           }
-        | user IDENTIFIED_SYM BY RANDOM_SYM PASSWORD REPLACE_SYM TEXT_STRING_password opt_retain_current_password
+        ;
+
+opt_initial_auth:
+          INITIAL_SYM AUTHENTICATION_SYM identified_by_random_password
+           {
+            $$ = $3;
+            $3->passwordless = true;
+            $3->nth_factor = 2;
+          }
+        | INITIAL_SYM AUTHENTICATION_SYM identified_with_plugin_as_auth
           {
-            $$= $1;
-            $1->has_password_generator= true;
-            $1->auth= EMPTY_CSTR;
-            $1->uses_identified_by_clause= true;
-            $1->uses_identified_with_clause= false;
-            $1->uses_replace_clause= true;
-            $1->discard_old_password= false;
-            $1->retain_current_password= $8;
-            $1->current_auth.str= $7.str;
-            $1->current_auth.length= $7.length;
-            Lex->contains_plaintext_password= true;
+            $$ = $3;
+            $3->passwordless = true;
+            $3->nth_factor = 2;
           }
-        | user IDENTIFIED_SYM WITH ident_or_text
+        | INITIAL_SYM AUTHENTICATION_SYM identified_by_password
           {
-            $$= $1;
-            $1->plugin.str= $4.str;
-            $1->plugin.length= $4.length;
-            $1->auth= EMPTY_CSTR;
-            $1->uses_identified_with_clause= true;
-            $1->discard_old_password= false;
-            $1->retain_current_password= false;
-            $1->has_password_generator= false;
+            $$ = $3;
+            $3->passwordless = true;
+            $3->nth_factor = 2;
           }
-        | user IDENTIFIED_SYM WITH ident_or_text AS TEXT_STRING_hash
+        ;
+
+alter_user:
+          user identified_by_password
+          REPLACE_SYM TEXT_STRING_password
           opt_retain_current_password
           {
-            $$= $1;
-            $1->plugin.str= $4.str;
-            $1->plugin.length= $4.length;
-            $1->auth.str= $6.str;
-            $1->auth.length= $6.length;
-            $1->uses_identified_with_clause= true;
-            $1->uses_authentication_string_clause= true;
-            $1->discard_old_password= false;
-            $1->retain_current_password= $7;
-            $1->has_password_generator= false;
+            $$ = $1;
+            $1->first_factor_auth_info = *$2;
+            $1->current_auth = to_lex_cstring($4);
+            $1->uses_replace_clause = true;
+            $1->discard_old_password = false;
+            $1->retain_current_password = $5;
           }
-        | user IDENTIFIED_SYM WITH ident_or_text BY TEXT_STRING_password
+        | user identified_with_plugin_by_password
+          REPLACE_SYM TEXT_STRING_password
           opt_retain_current_password
           {
-            $$= $1;
-            $1->plugin.str= $4.str;
-            $1->plugin.length= $4.length;
-            $1->auth.str= $6.str;
-            $1->auth.length= $6.length;
-            $1->uses_identified_with_clause= true;
-            $1->uses_identified_by_clause= true;
-            $1->discard_old_password= false;
-            $1->retain_current_password= $7;
-            Lex->contains_plaintext_password= true;
-            $1->has_password_generator= false;
+            $$ = $1;
+            $1->first_factor_auth_info = *$2;
+            $1->current_auth = to_lex_cstring($4);
+            $1->uses_replace_clause = true;
+            $1->discard_old_password = false;
+            $1->retain_current_password = $5;
+          }
+        | user identified_by_password opt_retain_current_password
+          {
+            $$ = $1;
+            $1->first_factor_auth_info = *$2;
+            $1->discard_old_password = false;
+            $1->retain_current_password = $3;
           }
-        | user IDENTIFIED_SYM WITH ident_or_text BY RANDOM_SYM PASSWORD
+        | user identified_by_random_password opt_retain_current_password
+           {
+            $$ = $1;
+            $1->first_factor_auth_info = *$2;
+            $1->discard_old_password = false;
+            $1->retain_current_password = $3;
+          }
+        | user identified_by_random_password
+          REPLACE_SYM TEXT_STRING_password
           opt_retain_current_password
           {
-            $$= $1;
-            $1->plugin.str= $4.str;
-            $1->plugin.length= $4.length;
-            $1->uses_identified_with_clause= true;
-            $1->uses_identified_by_clause= true;
+            $$ = $1;
+            $1->first_factor_auth_info = *$2;
+            $1->uses_replace_clause = true;
+            $1->discard_old_password = false;
+            $1->retain_current_password = $5;
+            $1->current_auth = to_lex_cstring($4);
+          }
+        | user identified_with_plugin
+          {
+            $$ = $1;
+            $1->first_factor_auth_info = *$2;
+            $1->discard_old_password = false;
+            $1->retain_current_password = false;
+          }
+        | user identified_with_plugin_as_auth opt_retain_current_password
+          {
+            $$ = $1;
+            $1->first_factor_auth_info = *$2;
+            $1->discard_old_password = false;
+            $1->retain_current_password = $3;
+          }
+        | user identified_with_plugin_by_password opt_retain_current_password
+          {
+            $$ = $1;
+            $1->first_factor_auth_info = *$2;
+            $1->discard_old_password = false;
+            $1->retain_current_password = $3;
+          }
+        | user identified_with_plugin_by_random_password
+          opt_retain_current_password
+          {
+            $$ = $1;
+            $1->first_factor_auth_info = *$2;
             $1->discard_old_password= false;
-            $1->retain_current_password= $8;
-            Lex->contains_plaintext_password= true;
-            $1->has_password_generator= true;
+            $1->retain_current_password= $3;
           }
         | user opt_discard_old_password
           {
-            $$= $1;
-            $1->discard_old_password= $2;
-            $1->retain_current_password= false;
-            $1->auth= NULL_CSTR;
-            $1->has_password_generator= false;
+            $$ = $1;
+            $1->discard_old_password = $2;
+            $1->retain_current_password = false;
+          }
+        | user ADD factor identification
+          {
+            $4->nth_factor = $3;
+            $4->add_factor = true;
+            if ($1->add_mfa_identifications($4))
+              MYSQL_YYABORT;  // OOM
+            $$ = $1;
+           }
+        | user ADD factor identification ADD factor identification
+          {
+            if ($3 == $6) {
+              my_error(ER_MFA_METHODS_IDENTICAL, MYF(0));
+              MYSQL_YYABORT;
+            } else if ($3 > $6) {
+              my_error(ER_MFA_METHODS_INVALID_ORDER, MYF(0), $6, $3);
+              MYSQL_YYABORT;
+            }
+            $4->nth_factor = $3;
+            $4->add_factor = true;
+            $7->nth_factor = $6;
+            $7->add_factor = true;
+            if ($1->add_mfa_identifications($4, $7))
+              MYSQL_YYABORT;  // OOM
+            $$ = $1;
+          }
+        | user MODIFY_SYM factor identification
+          {
+            $4->nth_factor = $3;
+            $4->modify_factor = true;
+            if ($1->add_mfa_identifications($4))
+              MYSQL_YYABORT;  // OOM
+            $$ = $1;
+           }
+        | user MODIFY_SYM factor identification MODIFY_SYM factor identification
+          {
+            if ($3 == $6) {
+              my_error(ER_MFA_METHODS_IDENTICAL, MYF(0));
+              MYSQL_YYABORT;
+            }
+            $4->nth_factor = $3;
+            $4->modify_factor = true;
+            $7->nth_factor = $6;
+            $7->modify_factor = true;
+            if ($1->add_mfa_identifications($4, $7))
+              MYSQL_YYABORT;  // OOM
+            $$ = $1;
+          }
+        | user DROP factor
+          {
+            LEX_MFA *m = NEW_PTN LEX_MFA;
+            if (m == nullptr)
+              MYSQL_YYABORT;  // OOM
+            m->nth_factor = $3;
+            m->drop_factor = true;
+            if ($1->add_mfa_identifications(m))
+              MYSQL_YYABORT;  // OOM
+            $$ = $1;
+           }
+        | user DROP factor DROP factor
+          {
+            if ($3 == $5) {
+              my_error(ER_MFA_METHODS_IDENTICAL, MYF(0));
+              MYSQL_YYABORT;
+            }
+            LEX_MFA *m1 = NEW_PTN LEX_MFA;
+            if (m1 == nullptr)
+              MYSQL_YYABORT;  // OOM
+            m1->nth_factor = $3;
+            m1->drop_factor = true;
+            LEX_MFA *m2 = NEW_PTN LEX_MFA;
+            if (m2 == nullptr)
+              MYSQL_YYABORT;  // OOM
+            m2->nth_factor = $5;
+            m2->drop_factor = true;
+            if ($1->add_mfa_identifications(m1, m2))
+              MYSQL_YYABORT;  // OOM
+            $$ = $1;
+           }
+         ;
+
+factor:
+          NUM FACTOR_SYM
+          {
+            if (my_strcasecmp(system_charset_info, $1.str, "2") == 0) {
+              $$ = 2;
+            } else if (my_strcasecmp(system_charset_info, $1.str, "3") == 0) {
+              $$ = 3;
+            } else {
+               my_error(ER_WRONG_VALUE, MYF(0), "nth factor", $1.str);
+               MYSQL_YYABORT;
+            }
           }
         ;
 
@@ -17718,9 +17955,8 @@
               YYTHD->syntax_error_at(@5);
               MYSQL_YYABORT;
             }
-            $4->auth.str= $9.str;
-            $4->auth.length= $9.length;
-            $4->uses_identified_by_clause= true;
+            $4->first_factor_auth_info.auth = to_lex_cstring($9);
+            $4->first_factor_auth_info.uses_identified_by_clause = true;
             Lex->contains_plaintext_password= true;
 
             Lex->m_sql_cmd= NEW_PTN Sql_cmd_clone($4, $6, to_lex_cstring($10));
diff -Nru mysql-8.0-8.0.26/sql/srv_session.cc mysql-8.0-8.0.27/sql/srv_session.cc
--- mysql-8.0-8.0.26/sql/srv_session.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/srv_session.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1144,48 +1144,6 @@
 }
 
 /**
-  Template class for scanning the thd list in the Global_THD_manager and
-  modifying and element from the list. This template is for functions that
-  need to change data of a THD without getting into races.
-
-  If the THD is found, a callback is executed under THD::Lock_thd_data.
-  A pointer to a member variable is passed as a second parameter to the
-  callback. The callback should store its result there.
-
-  After the search has been completed the result value can be obtained by
-  calling get_result().
-*/
-template <typename INPUT_TYPE>
-class Find_thd_by_id_with_callback_set : public Find_THD_Impl {
- public:
-  typedef void (*callback_t)(THD *thd, INPUT_TYPE *result);
-
-  Find_thd_by_id_with_callback_set(my_thread_id t_id, callback_t cb,
-                                   INPUT_TYPE in)
-      : thread_id(t_id), callback(cb), input(in) {}
-
-  /**
-    Callback called for every THD in the thd_list.
-
-    When a thread is found the callback function passed to the constructor
-    is invoked under THD::Lock_thd_data
-  */
-  bool operator()(THD *thd) override {
-    if (thd->thread_id() == thread_id) {
-      MUTEX_LOCK(lock, &thd->LOCK_thd_data);
-      callback(thd, &input);
-      return true;
-    }
-    return false;
-  }
-
- private:
-  my_thread_id thread_id;
-  callback_t callback;
-  INPUT_TYPE input;
-};
-
-/**
   Callback for inspecting a THD object and modifying the peer_port member
 */
 static void set_client_port_in_thd(THD *thd, uint16_t *input) {
@@ -1201,9 +1159,10 @@
   @param port  Port number
 */
 void Srv_session::set_client_port(uint16_t port) {
-  Find_thd_by_id_with_callback_set<uint16_t> find_thd_with_id(
-      thd.thread_id(), set_client_port_in_thd, port);
-  Global_THD_manager::get_instance()->find_thd(&find_thd_with_id);
+  Find_thd_with_id find_thd_with_id(thd.thread_id());
+  THD_ptr thd_ptr =
+      Global_THD_manager::get_instance()->find_thd(&find_thd_with_id);
+  if (thd_ptr) set_client_port_in_thd(thd_ptr.get(), &port);
 }
 
 /**
diff -Nru mysql-8.0-8.0.26/sql/ssl_acceptor_context_data.cc mysql-8.0-8.0.27/sql/ssl_acceptor_context_data.cc
--- mysql-8.0-8.0.26/sql/ssl_acceptor_context_data.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/ssl_acceptor_context_data.cc	2021-09-28 11:46:34.000000000 +0000
@@ -360,7 +360,7 @@
       break;
     }
     case Ssl_acceptor_context_property_type::last:
-      // Fall through
+      [[fallthrough]];
     default:
       output.assign("");
   }
diff -Nru mysql-8.0-8.0.26/sql/stateless_allocator.h mysql-8.0-8.0.27/sql/stateless_allocator.h
--- mysql-8.0-8.0.26/sql/stateless_allocator.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/stateless_allocator.h	2021-09-28 11:46:34.000000000 +0000
@@ -115,8 +115,7 @@
   template <class U>
   Stateless_allocator &operator=(const Stateless_allocator_type<U> &) {}
 
-  pointer allocate(size_type n,
-                   const_pointer hint MY_ATTRIBUTE((unused)) = nullptr) {
+  pointer allocate(size_type n, const_pointer hint [[maybe_unused]] = nullptr) {
     if (n == 0) return nullptr;
     if (n > max_size()) throw std::bad_alloc();
 
diff -Nru mysql-8.0-8.0.26/sql/string_service.cc mysql-8.0-8.0.27/sql/string_service.cc
--- mysql-8.0-8.0.26/sql/string_service.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/string_service.cc	2021-09-28 11:46:34.000000000 +0000
@@ -47,10 +47,10 @@
 
   TODO: Marking charset_name as unused for now, see Bug#25533463.
 */
-int mysql_string_convert_to_char_ptr(
-    mysql_string_handle string_handle,
-    const char *charset_name MY_ATTRIBUTE((unused)), char *buffer,
-    unsigned int buffer_size, int *error) {
+int mysql_string_convert_to_char_ptr(mysql_string_handle string_handle,
+                                     const char *charset_name [[maybe_unused]],
+                                     char *buffer, unsigned int buffer_size,
+                                     int *error) {
   String *str = (String *)string_handle;
   int len =
       (int)my_convert(buffer, buffer_size - 1, &my_charset_utf8_general_ci,
diff -Nru mysql-8.0-8.0.26/sql/sys_vars.cc mysql-8.0-8.0.27/sql/sys_vars.cc
--- mysql-8.0-8.0.26/sql/sys_vars.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sys_vars.cc	2021-09-28 11:46:34.000000000 +0000
@@ -91,6 +91,7 @@
 #include "sql/auth/auth_acls.h"
 #include "sql/auth/auth_common.h"  // validate_user_plugins
 #include "sql/binlog.h"            // mysql_bin_log
+#include "sql/changestreams/apply/replication_thread_status.h"
 #include "sql/clone_handler.h"
 #include "sql/conn_handler/connection_handler_impl.h"  // Per_thread_connection_handler
 #include "sql/conn_handler/connection_handler_manager.h"  // Connection_handler_manager
@@ -153,7 +154,7 @@
                         nullptr};
 
 static bool update_buffer_size(THD *, KEY_CACHE *key_cache,
-                               ptrdiff_t offset MY_ATTRIBUTE((unused)),
+                               ptrdiff_t offset [[maybe_unused]],
                                ulonglong new_value) {
   bool error = false;
   assert(offset == offsetof(KEY_CACHE, param_buff_size));
@@ -234,8 +235,10 @@
   @param thd the session context
   @param setv the SET operations metadata
  */
-static bool check_session_admin_or_replication_applier(
-    sys_var *self MY_ATTRIBUTE((unused)), THD *thd, set_var *setv) {
+static bool check_session_admin_or_replication_applier(sys_var *self
+                                                       [[maybe_unused]],
+                                                       THD *thd,
+                                                       set_var *setv) {
   assert(self->scope() != sys_var::GLOBAL);
   Security_context *sctx = thd->security_context();
   if ((setv->type == OPT_SESSION || setv->type == OPT_DEFAULT) &&
@@ -254,6 +257,52 @@
 }
 
 /**
+  Utility method that checks if user has correct session administrative
+  dynamic privileges.
+  @return 0 on success, 1 on failure.
+*/
+static bool check_session_admin_privileges_only(sys_var *self [[maybe_unused]],
+                                                THD *thd, set_var *setv) {
+  // Privilege check for global variable must have already done before.
+  assert(self->scope() != sys_var::GLOBAL);
+  Security_context *sctx = thd->security_context();
+  if ((setv->type == OPT_SESSION || setv->type == OPT_DEFAULT) &&
+      !sctx->has_global_grant(STRING_WITH_LEN("SESSION_VARIABLES_ADMIN"))
+           .first &&
+      !sctx->has_global_grant(STRING_WITH_LEN("SYSTEM_VARIABLES_ADMIN"))
+           .first) {
+    return true;
+  }
+  return false;
+}
+
+/**
+  Check if SESSION_VARIABLES_ADMIN granted. Throw SQL error if not.
+
+  Use this when setting session variables that are sensitive and should
+  be protected.
+
+  We also accept SYSTEM_VARIABLES_ADMIN since it doesn't make a lot of
+  sense to be allowed to set the global variable and not the session ones.
+
+  @retval true failure
+  @retval false success
+
+  @param self the system variable to set value for
+  @param thd the session context
+  @param setv the SET operations metadata
+ */
+static bool check_session_admin_no_super(sys_var *self, THD *thd,
+                                         set_var *setv) {
+  if (check_session_admin_privileges_only(self, thd, setv)) {
+    my_error(ER_SPECIFIC_ACCESS_DENIED_ERROR, MYF(0),
+             "SYSTEM_VARIABLES_ADMIN or SESSION_VARIABLES_ADMIN");
+    return true;
+  }
+  return false;
+}
+
+/**
   Check if SESSION_VARIABLES_ADMIN granted. Throw SQL error if not.
 
   Use this when setting session variables that are sensitive and should
@@ -271,16 +320,9 @@
   @param thd the session context
   @param setv the SET operations metadata
  */
-static bool check_session_admin(sys_var *self MY_ATTRIBUTE((unused)), THD *thd,
-                                set_var *setv) {
-  assert(self->scope() !=
-         sys_var::GLOBAL);  // don't abuse check_session_admin()
+static bool check_session_admin(sys_var *self, THD *thd, set_var *setv) {
   Security_context *sctx = thd->security_context();
-  if ((setv->type == OPT_SESSION || setv->type == OPT_DEFAULT) &&
-      !sctx->has_global_grant(STRING_WITH_LEN("SESSION_VARIABLES_ADMIN"))
-           .first &&
-      !sctx->has_global_grant(STRING_WITH_LEN("SYSTEM_VARIABLES_ADMIN"))
-           .first &&
+  if (check_session_admin_privileges_only(self, thd, setv) &&
       !sctx->check_access(SUPER_ACL)) {
     my_error(ER_SPECIFIC_ACCESS_DENIED_ERROR, MYF(0),
              "SUPER, SYSTEM_VARIABLES_ADMIN or SESSION_VARIABLES_ADMIN");
@@ -909,12 +951,19 @@
     READ_ONLY NON_PERSIST GLOBAL_VAR(mysql_home_ptr),
     CMD_LINE(REQUIRED_ARG, 'b'), IN_FS_CHARSET, DEFAULT(nullptr));
 
+/*
+  --authentication_policy will take precendence over this variable
+  except in case where plugin name for first factor is not a concrete
+  value. Please refer authentication_policy variable.
+*/
 static Sys_var_charptr Sys_default_authentication_plugin(
     "default_authentication_plugin",
     "The default authentication plugin "
     "used by the server to hash the password.",
     READ_ONLY NON_PERSIST GLOBAL_VAR(default_auth_plugin),
-    CMD_LINE(REQUIRED_ARG), IN_FS_CHARSET, DEFAULT("caching_sha2_password"));
+    CMD_LINE(REQUIRED_ARG), IN_FS_CHARSET, DEFAULT("caching_sha2_password"),
+    NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(nullptr), ON_UPDATE(nullptr),
+    DEPRECATED_VAR("authentication_policy"));
 
 static PolyLock_mutex Plock_default_password_lifetime(
     &LOCK_default_password_lifetime);
@@ -1322,8 +1371,8 @@
     DEFAULT(RBR_EXEC_MODE_STRICT), NO_MUTEX_GUARD, NOT_IN_BINLOG,
     ON_CHECK(prevent_global_rbr_exec_mode_idempotent), ON_UPDATE(nullptr));
 
-static bool check_binlog_row_image(sys_var *self MY_ATTRIBUTE((unused)),
-                                   THD *thd, set_var *var) {
+static bool check_binlog_row_image(sys_var *self [[maybe_unused]], THD *thd,
+                                   set_var *var) {
   DBUG_TRACE;
   if (check_session_admin(self, thd, var)) return true;
   if (var->save_result.ulonglong_value == BINLOG_ROW_IMAGE_FULL) {
@@ -1367,7 +1416,7 @@
     binlog_row_metadata_names, DEFAULT(BINLOG_ROW_METADATA_MINIMAL),
     NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(nullptr), ON_UPDATE(nullptr));
 
-static bool check_binlog_trx_compression(sys_var *self MY_ATTRIBUTE((unused)),
+static bool check_binlog_trx_compression(sys_var *self [[maybe_unused]],
                                          THD *thd, set_var *var) {
   DBUG_TRACE;
   if (check_session_admin(self, thd, var)) return true;
@@ -1506,19 +1555,30 @@
     lock_slave_threads(mi);
     init_thread_mask(&running, mi, false);
     if (!running) {
+      bool is_pos_info_invalid{false};
       switch (thread_mask) {
         case SLAVE_THD_IO:
+          is_pos_info_invalid = mi->is_receiver_position_info_invalid();
+          mysql_mutex_lock(&mi->data_lock);
+          mi->flush_info(true);
+          mysql_mutex_unlock(&mi->data_lock);
           if (Rpl_info_factory::change_mi_repository(
                   mi, static_cast<uint>(var->save_result.ulonglong_value),
                   &msg)) {
             ret = true;
             my_error(ER_CHANGE_RPL_INFO_REPOSITORY_FAILURE, MYF(0), msg);
           }
+          mi->set_receiver_position_info_invalid(is_pos_info_invalid);
           break;
         case SLAVE_THD_SQL:
           mts_recovery_groups(mi->rli);
           if (!mi->rli->is_mts_recovery()) {
+            is_pos_info_invalid =
+                mi->rli->is_applier_source_position_info_invalid();
             if (Rpl_info_factory::reset_workers(mi->rli) ||
+                mi->rli->flush_info(
+                    Relay_log_info::RLI_FLUSH_IGNORE_SYNC_OPT |
+                    Relay_log_info::RLI_FLUSH_IGNORE_GTID_ONLY) ||
                 Rpl_info_factory::change_rli_repository(
                     mi->rli,
                     static_cast<uint>(var->save_result.ulonglong_value),
@@ -1526,6 +1586,8 @@
               ret = true;
               my_error(ER_CHANGE_RPL_INFO_REPOSITORY_FAILURE, MYF(0), msg);
             }
+            mi->rli->set_applier_source_position_info_invalid(
+                is_pos_info_invalid);
           } else
             LogErr(WARNING_LEVEL, ER_RPL_REPO_HAS_GAPS);
           break;
@@ -1611,7 +1673,8 @@
     "select_into_buffer_size", "Buffer size for SELECT INTO OUTFILE/DUMPFILE.",
     HINT_UPDATEABLE SESSION_VAR(select_into_buffer_size), CMD_LINE(OPT_ARG),
     VALID_RANGE(IO_SIZE * 2, INT_MAX32), DEFAULT(128 * 1024),
-    BLOCK_SIZE(IO_SIZE));
+    BLOCK_SIZE(IO_SIZE), NO_MUTEX_GUARD, NOT_IN_BINLOG,
+    ON_CHECK(check_session_admin_no_super));
 
 static Sys_var_bool Sys_select_into_disk_sync(
     "select_into_disk_sync",
@@ -1624,7 +1687,8 @@
     "The delay in milliseconds after each buffer sync "
     "for SELECT INTO OUTFILE/DUMPFILE. Requires select_into_sync_disk = ON.",
     HINT_UPDATEABLE SESSION_VAR(select_into_disk_sync_delay), CMD_LINE(OPT_ARG),
-    VALID_RANGE(0, LONG_TIMEOUT), DEFAULT(0), BLOCK_SIZE(1));
+    VALID_RANGE(0, LONG_TIMEOUT), DEFAULT(0), BLOCK_SIZE(1), NO_MUTEX_GUARD,
+    NOT_IN_BINLOG, ON_CHECK(check_session_admin_no_super));
 
 static bool check_not_null(sys_var *, THD *, set_var *var) {
   return var->value && var->value->is_null();
@@ -2459,9 +2523,8 @@
   return false;
 }
 
-static bool fix_log_error_services(sys_var *self MY_ATTRIBUTE((unused)),
-                                   THD *thd,
-                                   enum_var_type type MY_ATTRIBUTE((unused))) {
+static bool fix_log_error_services(sys_var *self [[maybe_unused]], THD *thd,
+                                   enum_var_type type [[maybe_unused]]) {
   bool ret = false;
   // syntax is OK and services exist; try to initialize them!
   size_t pos;
@@ -2527,9 +2590,10 @@
   return false;
 }
 
-static bool fix_log_error_suppression_list(
-    sys_var *self MY_ATTRIBUTE((unused)), THD *thd MY_ATTRIBUTE((unused)),
-    enum_var_type type MY_ATTRIBUTE((unused))) {
+static bool fix_log_error_suppression_list(sys_var *self [[maybe_unused]],
+                                           THD *thd [[maybe_unused]],
+                                           enum_var_type type
+                                           [[maybe_unused]]) {
   // syntax is OK and errcodes have messages; try to make filter rules for
   // them!
   int rr = log_builtins_filter_parse_suppression_list(
@@ -2667,7 +2731,7 @@
     "low_priority_updates",
     "INSERT/DELETE/UPDATE has lower priority than selects",
     SESSION_VAR(low_priority_updates), CMD_LINE(OPT_ARG), DEFAULT(false),
-    NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(nullptr),
+    NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_session_admin_no_super),
     ON_UPDATE(fix_low_prio_updates));
 
 static Sys_var_bool Sys_lower_case_file_system(
@@ -2792,7 +2856,8 @@
     READ_ONLY GLOBAL_VAR(max_digest_length), CMD_LINE(REQUIRED_ARG),
     VALID_RANGE(0, 1024 * 1024), DEFAULT(1024), BLOCK_SIZE(1));
 
-static bool check_max_delayed_threads(sys_var *, THD *, set_var *var) {
+static bool check_max_delayed_threads(sys_var *self, THD *thd, set_var *var) {
+  if (check_session_admin_no_super(self, thd, var)) return true;
   return (!var->is_global_persist()) && var->save_result.ulonglong_value != 0 &&
          var->save_result.ulonglong_value !=
              global_system_variables.max_insert_delayed_threads;
@@ -2822,7 +2887,8 @@
 static Sys_var_ulong Sys_max_error_count(
     "max_error_count", "Max number of errors/warnings to store for a statement",
     HINT_UPDATEABLE SESSION_VAR(max_error_count), CMD_LINE(REQUIRED_ARG),
-    VALID_RANGE(0, 65535), DEFAULT(DEFAULT_ERROR_COUNT), BLOCK_SIZE(1));
+    VALID_RANGE(0, 65535), DEFAULT(DEFAULT_ERROR_COUNT), BLOCK_SIZE(1),
+    NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_session_admin_no_super));
 
 static Sys_var_ulonglong Sys_max_heap_table_size(
     "max_heap_table_size",
@@ -2947,7 +3013,8 @@
     "Don't write queries to slow log that examine fewer rows "
     "than that",
     SESSION_VAR(min_examined_row_limit), CMD_LINE(REQUIRED_ARG),
-    VALID_RANGE(0, ULONG_MAX), DEFAULT(0), BLOCK_SIZE(1));
+    VALID_RANGE(0, ULONG_MAX), DEFAULT(0), BLOCK_SIZE(1), NO_MUTEX_GUARD,
+    NOT_IN_BINLOG, ON_CHECK(check_session_admin_no_super));
 
 #ifdef _WIN32
 static Sys_var_bool Sys_named_pipe("named_pipe", "Enable the named pipe (NT)",
@@ -3178,7 +3245,7 @@
   global_system_variables.parser_max_mem_size = new_val;
 }
 
-static bool check_optimizer_switch(sys_var *, THD *thd MY_ATTRIBUTE((unused)),
+static bool check_optimizer_switch(sys_var *, THD *thd [[maybe_unused]],
                                    set_var *var) {
   const bool current_hypergraph_optimizer =
       thd->optimizer_switch_flag(OPTIMIZER_SWITCH_HYPERGRAPH_OPTIMIZER);
@@ -3343,7 +3410,8 @@
     "preload_buffer_size",
     "The size of the buffer that is allocated when preloading indexes",
     SESSION_VAR(preload_buff_size), CMD_LINE(REQUIRED_ARG),
-    VALID_RANGE(1024, 1024 * 1024 * 1024), DEFAULT(32768), BLOCK_SIZE(1));
+    VALID_RANGE(1024, 1024 * 1024 * 1024), DEFAULT(32768), BLOCK_SIZE(1),
+    NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_session_admin_no_super));
 
 static Sys_var_uint Sys_protocol_version(
     "protocol_version",
@@ -3377,8 +3445,8 @@
   return false;
 }
 
-static bool check_require_secure_transport(
-    sys_var *, THD *, set_var *var MY_ATTRIBUTE((unused))) {
+static bool check_require_secure_transport(sys_var *, THD *,
+                                           set_var *var [[maybe_unused]]) {
 #if !defined(_WIN32)
   /*
     always allow require_secure_transport to be enabled on
@@ -3699,9 +3767,8 @@
     "thread_stack", "The stack size for each thread",
     READ_ONLY GLOBAL_VAR(my_thread_stack_size), CMD_LINE(REQUIRED_ARG),
 #if defined(__clang__) && defined(HAVE_UBSAN)
-    // DEFAULT_THREAD_STACK is multiplied by 3 for clang/UBSAN
-    // We need to increase the minimum value as well.
-    VALID_RANGE(DEFAULT_THREAD_STACK / 2, ULONG_MAX),
+    // Clang with DEBUG needs more stack, esp. with UBSAN.
+    VALID_RANGE(DEFAULT_THREAD_STACK, ULONG_MAX),
 #else
     VALID_RANGE(128 * 1024, ULONG_MAX),
 #endif
@@ -3911,15 +3978,17 @@
 static Sys_var_enum Sys_replica_parallel_type(
     "replica_parallel_type",
     "The method used by the replication applier to parallelize "
-    "transactions. DATABASE, which is the default, indicates that it "
+    "transactions. DATABASE, indicates that it "
     "may apply transactions in parallel in case they update different "
-    "databases. LOGICAL_CLOCK indicates that it decides whether two "
+    "databases. LOGICAL_CLOCK, which is the default, indicates that it decides "
+    "whether two "
     "transactions can be applied in parallel using the logical timestamps "
     "computed by the source, according to "
     "binlog_transaction_dependency_tracking.",
     PERSIST_AS_READONLY GLOBAL_VAR(mts_parallel_option), CMD_LINE(REQUIRED_ARG),
-    mts_parallel_type_names, DEFAULT(MTS_PARALLEL_TYPE_DB_NAME), NO_MUTEX_GUARD,
-    NOT_IN_BINLOG, ON_CHECK(check_slave_stopped), ON_UPDATE(nullptr));
+    mts_parallel_type_names, DEFAULT(MTS_PARALLEL_TYPE_LOGICAL_CLOCK),
+    NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_slave_stopped),
+    ON_UPDATE(nullptr));
 
 static Sys_var_deprecated_alias Sys_slave_parallel_type(
     "slave_parallel_type", Sys_replica_parallel_type);
@@ -3977,9 +4046,9 @@
 static Sys_var_bool Sys_replica_preserve_commit_order(
     "replica_preserve_commit_order",
     "Force replication worker threads to commit in the same order as on the "
-    "source.",
+    "source. Enabled by default",
     PERSIST_AS_READONLY GLOBAL_VAR(opt_replica_preserve_commit_order),
-    CMD_LINE(OPT_ARG, OPT_REPLICA_PRESERVE_COMMIT_ORDER), DEFAULT(false),
+    CMD_LINE(OPT_ARG, OPT_REPLICA_PRESERVE_COMMIT_ORDER), DEFAULT(true),
     NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_slave_stopped),
     ON_UPDATE(nullptr));
 
@@ -4117,7 +4186,7 @@
 
 */
 static void issue_deprecation_warnings_gtid_mode(
-    THD *thd, Gtid_mode::value_type oldmode MY_ATTRIBUTE((unused)),
+    THD *thd, Gtid_mode::value_type oldmode [[maybe_unused]],
     Gtid_mode::value_type newmode) {
   channel_map.assert_some_lock();
 
@@ -4286,10 +4355,11 @@
                  "Execute CHANGE MASTER TO "
                  "ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS = OFF "
                  "FOR CHANNEL '%.192s' before you set "
-                 "@@GLOBAL.GTID_MODE = '%s'.",
+                 "@@GLOBAL.GTID_MODE = '%s'",
                  mi->get_channel(), mi->get_channel(),
                  Gtid_mode::to_string(new_gtid_mode));
-        my_error(ER_CANT_SET_GTID_MODE, MYF(0), "OFF", buf);
+        my_error(ER_CANT_SET_GTID_MODE, MYF(0),
+                 Gtid_mode::to_string(new_gtid_mode), buf);
         goto err;
       }
     }
@@ -4309,6 +4379,29 @@
       }
     }
   }
+  /*
+    Cannot set to <> ON when gtid_only is enabled for any channel.
+  */
+  if (old_gtid_mode == Gtid_mode::ON && new_gtid_mode != Gtid_mode::ON) {
+    for (auto it : channel_map) {
+      Master_info *mi = it.second;
+      if (mi != nullptr && mi->is_gtid_only_mode()) {
+        char buf[1024];
+        snprintf(buf, sizeof(buf),
+                 "replication channel '%.192s' is configured "
+                 "with GTID_ONLY = 1. "
+                 "Execute CHANGE REPLICATION SOURCE TO "
+                 "GTID_ONLY = 0 "
+                 "FOR CHANNEL '%.192s' before you set "
+                 "@@GLOBAL.GTID_MODE = '%s'",
+                 mi->get_channel(), mi->get_channel(),
+                 Gtid_mode::to_string(new_gtid_mode));
+        my_error(ER_CANT_SET_GTID_MODE, MYF(0),
+                 Gtid_mode::to_string(new_gtid_mode), buf);
+        goto err;
+      }
+    }
+  }
 
   // Can't set GTID_MODE != ON when group replication is enabled.
   if (is_group_replication_running()) {
@@ -4710,7 +4803,7 @@
   char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
   if (set_fips_mode(opt_ssl_fips_mode, ssl_err_string) != 1) {
     opt_ssl_fips_mode = get_fips_mode();
-    my_error(ER_SSL_FIPS_MODE_ERROR, MYF(0), "Openssl is not fips enabled");
+    my_error(ER_DA_SSL_FIPS_MODE_ERROR, MYF(0), "Openssl is not fips enabled");
     return true;
   } else {
     return false;
@@ -5026,7 +5119,8 @@
     "The default storage engine for in-memory internal temporary tables.",
     HINT_UPDATEABLE SESSION_VAR(internal_tmp_mem_storage_engine),
     CMD_LINE(REQUIRED_ARG), internal_tmp_mem_storage_engine_names,
-    DEFAULT(TMP_TABLE_TEMPTABLE));
+    DEFAULT(TMP_TABLE_TEMPTABLE), NO_MUTEX_GUARD, NOT_IN_BINLOG,
+    ON_CHECK(check_session_admin_no_super));
 
 static Sys_var_ulonglong Sys_temptable_max_ram(
     "temptable_max_ram",
@@ -5182,8 +5276,8 @@
 
   @return @c false.
 */
-static bool fix_sql_log_bin_after_update(
-    sys_var *, THD *thd, enum_var_type type MY_ATTRIBUTE((unused))) {
+static bool fix_sql_log_bin_after_update(sys_var *, THD *thd,
+                                         enum_var_type type [[maybe_unused]]) {
   assert(type == OPT_SESSION);
 
   if (thd->variables.sql_log_bin)
@@ -5619,7 +5713,7 @@
     DEFAULT(nullptr), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_log_path),
     ON_UPDATE(fix_general_log_file));
 
-static bool fix_slow_log_file(sys_var *, THD *thd MY_ATTRIBUTE((unused)),
+static bool fix_slow_log_file(sys_var *, THD *thd [[maybe_unused]],
                               enum_var_type) {
   bool res;
 
@@ -5676,7 +5770,7 @@
     "have_geometry", "have_geometry",
     READ_ONLY NON_PERSIST GLOBAL_VAR(have_geometry), NO_CMD_LINE);
 
-static SHOW_COMP_OPTION have_ssl_func(THD *thd MY_ATTRIBUTE((unused))) {
+static SHOW_COMP_OPTION have_ssl_func(THD *thd [[maybe_unused]]) {
   return have_ssl() ? SHOW_OPTION_YES : SHOW_OPTION_DISABLED;
 }
 
@@ -5882,10 +5976,13 @@
 
 static Sys_var_bool Sys_relay_log_recovery(
     "relay_log_recovery",
-    "If enabled, existing relay logs will be skipped by the replication "
-    "threads. The receiver will start a new relay log and request "
-    "transactions from the source starting at the last applied position. "
-    "The applier will start in this new relay log.",
+    "If enabled, existing relay logs will be skipped by the "
+    "replication threads. The receiver will start a new relay "
+    "log and the applier will start reading from the beginning of that file. "
+    "The receiver's position relative to the source will be reset to the "
+    "applier's "
+    "position relative to the source; the receiver uses this in case "
+    "SOURCE_AUTO_POSITION=0.",
     READ_ONLY GLOBAL_VAR(relay_log_recovery), CMD_LINE(OPT_ARG),
     DEFAULT(false));
 
@@ -6104,7 +6201,7 @@
     "replica_parallel_workers",
     "Number of worker threads for executing events in parallel ",
     PERSIST_AS_READONLY GLOBAL_VAR(opt_mts_replica_parallel_workers),
-    CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, MTS_MAX_WORKERS), DEFAULT(0),
+    CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, MTS_MAX_WORKERS), DEFAULT(4),
     BLOCK_SIZE(1));
 
 static Sys_var_deprecated_alias Sys_slave_parallel_workers(
@@ -6618,8 +6715,9 @@
     "table as a comment in COLUMN_TYPE field. "
     "This variable is deprecated and will be removed in a future release.",
     SESSION_VAR(show_old_temporals), CMD_LINE(OPT_ARG, OPT_SHOW_OLD_TEMPORALS),
-    DEFAULT(false), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(nullptr),
-    ON_UPDATE(nullptr), DEPRECATED_VAR(""));
+    DEFAULT(false), NO_MUTEX_GUARD, NOT_IN_BINLOG,
+    ON_CHECK(check_session_admin_no_super), ON_UPDATE(nullptr),
+    DEPRECATED_VAR(""));
 
 static Sys_var_charptr Sys_disabled_storage_engines(
     "disabled_storage_engines",
@@ -7043,8 +7141,9 @@
     BLOCK_SIZE(1), NO_MUTEX_GUARD, IN_BINLOG,
     ON_CHECK(check_session_admin_or_replication_applier));
 
-static bool check_set_default_table_encryption_access(
-    sys_var *self MY_ATTRIBUTE((unused)), THD *thd, set_var *var) {
+static bool check_set_default_table_encryption_access(sys_var *self
+                                                      [[maybe_unused]],
+                                                      THD *thd, set_var *var) {
   DBUG_EXECUTE_IF("skip_table_encryption_admin_check_for_set",
                   { return false; });
   if ((var->type == OPT_GLOBAL || var->type == OPT_PERSIST) &&
@@ -7233,6 +7332,46 @@
     DEFAULT(false), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(nullptr),
     ON_UPDATE(nullptr));
 
+static bool check_authentication_policy(sys_var *, THD *, set_var *var) {
+  if (!(var->save_result.string_value.str)) return true;
+  return validate_authentication_policy(var->save_result.string_value.str);
+}
+
+static bool fix_authentication_policy(sys_var *, THD *, enum_var_type) {
+  DBUG_TRACE;
+  update_authentication_policy();
+  return false;
+}
+/**
+  This is a mutex used to protect @@global.authentication_policy variable.
+*/
+static PolyLock_mutex PLock_authentication_policy(&LOCK_authentication_policy);
+/*
+  when authentication_policy = 'mysql_native_password,,' and
+  --default-authentication-plugin = 'caching_sha2_password'
+  set default as mysql_native_password.
+  --authentication_policy has precedence over --default-authentication-plugin
+  with 1 exception as below: when authentication_policy = '*,,' and
+  --default-authentication-plugin = 'mysql_native_password'
+  set default as mysql_native_password
+  in case no concrete plugin can be extracted from --authentication_policy
+  for first factor, server picks plugin name from
+  --default-authentication-plugin
+*/
+static Sys_var_charptr Sys_authentication_policy(
+    "authentication_policy",
+    "Defines policies around how user account can be configured with Multi "
+    "Factor authentication methods during CREATE/ALTER USER statement. "
+    "This variable accepts at-most 3 comma separated list of authentication "
+    "plugin names where each value refers to what authentication plugin should "
+    "be used in place of 1st Factor Authentication (FA), 2FA and 3FA method. "
+    "Value * indicates any plugin is allowed for 1FA, 2FA and 3FA method. "
+    "An empty value means nth FA method is optional.",
+    GLOBAL_VAR(opt_authentication_policy), CMD_LINE(REQUIRED_ARG),
+    IN_FS_CHARSET, DEFAULT("*,,"), &PLock_authentication_policy, NOT_IN_BINLOG,
+    ON_CHECK(check_authentication_policy),
+    ON_UPDATE(fix_authentication_policy));
+
 static Sys_var_deprecated_alias Sys_skip_slave_start("skip_slave_start",
                                                      Sys_skip_replica_start);
 
diff -Nru mysql-8.0-8.0.26/sql/sys_vars.h mysql-8.0-8.0.27/sql/sys_vars.h
--- mysql-8.0-8.0.26/sql/sys_vars.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/sys_vars.h	2021-09-28 11:46:34.000000000 +0000
@@ -183,7 +183,7 @@
  public:
   Sys_var_integer(
       const char *name_arg, const char *comment, int flag_args,
-      ptrdiff_t off, size_t size MY_ATTRIBUTE((unused)), CMD_LINE getopt,
+      ptrdiff_t off, size_t size [[maybe_unused]], CMD_LINE getopt,
       T min_val, T max_val, T def_val, uint block_size,
       PolyLock *lock = nullptr,
       enum binlog_status_enum binlog_status_arg = VARIABLE_NOT_IN_BINLOG,
@@ -635,7 +635,7 @@
  public:
   Sys_var_enum(
       const char *name_arg, const char *comment, int flag_args, ptrdiff_t off,
-      size_t size MY_ATTRIBUTE((unused)), CMD_LINE getopt, const char *values[],
+      size_t size [[maybe_unused]], CMD_LINE getopt, const char *values[],
       uint def_val, PolyLock *lock = nullptr,
       enum binlog_status_enum binlog_status_arg = VARIABLE_NOT_IN_BINLOG,
       on_check_function on_check_func = nullptr,
@@ -688,7 +688,7 @@
  public:
   Sys_var_bool(
       const char *name_arg, const char *comment, int flag_args, ptrdiff_t off,
-      size_t size MY_ATTRIBUTE((unused)), CMD_LINE getopt, bool def_val,
+      size_t size [[maybe_unused]], CMD_LINE getopt, bool def_val,
       PolyLock *lock = nullptr,
       enum binlog_status_enum binlog_status_arg = VARIABLE_NOT_IN_BINLOG,
       on_check_function on_check_func = nullptr,
@@ -801,9 +801,9 @@
   */
   Sys_var_multi_enum(
       const char *name_arg, const char *comment, int flag_args, ptrdiff_t off,
-      size_t size MY_ATTRIBUTE((unused)), CMD_LINE getopt,
-      const ALIAS aliases_arg[], uint value_count_arg, uint def_val,
-      uint command_line_no_value_arg, PolyLock *lock = nullptr,
+      size_t size [[maybe_unused]], CMD_LINE getopt, const ALIAS aliases_arg[],
+      uint value_count_arg, uint def_val, uint command_line_no_value_arg,
+      PolyLock *lock = nullptr,
       enum binlog_status_enum binlog_status_arg = VARIABLE_NOT_IN_BINLOG,
       on_check_function on_check_func = nullptr,
       on_update_function on_update_func = nullptr,
@@ -1011,7 +1011,7 @@
  public:
   Sys_var_charptr(
       const char *name_arg, const char *comment, int flag_args, ptrdiff_t off,
-      size_t size MY_ATTRIBUTE((unused)), CMD_LINE getopt,
+      size_t size [[maybe_unused]], CMD_LINE getopt,
       enum charset_enum is_os_charset_arg, const char *def_val,
       PolyLock *lock = nullptr,
       enum binlog_status_enum binlog_status_arg = VARIABLE_NOT_IN_BINLOG,
@@ -1191,7 +1191,7 @@
  public:
   Sys_var_lexstring(
       const char *name_arg, const char *comment, int flag_args, ptrdiff_t off,
-      size_t size MY_ATTRIBUTE((unused)), CMD_LINE getopt,
+      size_t size [[maybe_unused]], CMD_LINE getopt,
       enum charset_enum is_os_charset_arg, const char *def_val,
       PolyLock *lock = nullptr,
       enum binlog_status_enum binlog_status_arg = VARIABLE_NOT_IN_BINLOG,
@@ -1275,12 +1275,12 @@
   }
   const uchar *session_value_ptr(THD *running_thd, THD *,
                                  LEX_STRING *) override {
-    char buf[256];
+    char buf[512];
     DBUG_EXPLAIN(buf, sizeof(buf));
     return (uchar *)running_thd->mem_strdup(buf);
   }
   const uchar *global_value_ptr(THD *thd, LEX_STRING *) override {
-    char buf[256];
+    char buf[512];
     DBUG_EXPLAIN_INITIAL(buf, sizeof(buf));
     return (uchar *)thd->mem_strdup(buf);
   }
@@ -1391,7 +1391,7 @@
  public:
   Sys_var_double(
       const char *name_arg, const char *comment, int flag_args, ptrdiff_t off,
-      size_t size MY_ATTRIBUTE((unused)), CMD_LINE getopt, double min_val,
+      size_t size [[maybe_unused]], CMD_LINE getopt, double min_val,
       double max_val, double def_val, PolyLock *lock = nullptr,
       enum binlog_status_enum binlog_status_arg = VARIABLE_NOT_IN_BINLOG,
       on_check_function on_check_func = nullptr,
@@ -1522,7 +1522,7 @@
  public:
   Sys_var_flagset(
       const char *name_arg, const char *comment, int flag_args, ptrdiff_t off,
-      size_t size MY_ATTRIBUTE((unused)), CMD_LINE getopt, const char *values[],
+      size_t size [[maybe_unused]], CMD_LINE getopt, const char *values[],
       ulonglong def_val, PolyLock *lock = nullptr,
       enum binlog_status_enum binlog_status_arg = VARIABLE_NOT_IN_BINLOG,
       on_check_function on_check_func = nullptr,
@@ -1622,7 +1622,7 @@
  public:
   Sys_var_set(
       const char *name_arg, const char *comment, int flag_args, ptrdiff_t off,
-      size_t size MY_ATTRIBUTE((unused)), CMD_LINE getopt, const char *values[],
+      size_t size [[maybe_unused]], CMD_LINE getopt, const char *values[],
       ulonglong def_val, PolyLock *lock = nullptr,
       enum binlog_status_enum binlog_status_arg = VARIABLE_NOT_IN_BINLOG,
       on_check_function on_check_func = nullptr,
@@ -1725,7 +1725,7 @@
  public:
   Sys_var_plugin(
       const char *name_arg, const char *comment, int flag_args, ptrdiff_t off,
-      size_t size MY_ATTRIBUTE((unused)), CMD_LINE getopt, int plugin_type_arg,
+      size_t size [[maybe_unused]], CMD_LINE getopt, int plugin_type_arg,
       const char **def_val, PolyLock *lock = nullptr,
       enum binlog_status_enum binlog_status_arg = VARIABLE_NOT_IN_BINLOG,
       on_check_function on_check_func = nullptr,
@@ -1917,8 +1917,8 @@
  public:
   Sys_var_bit(
       const char *name_arg, const char *comment, int flag_args, ptrdiff_t off,
-      size_t size MY_ATTRIBUTE((unused)), CMD_LINE getopt,
-      ulonglong bitmask_arg, bool def_val, PolyLock *lock = nullptr,
+      size_t size [[maybe_unused]], CMD_LINE getopt, ulonglong bitmask_arg,
+      bool def_val, PolyLock *lock = nullptr,
       enum binlog_status_enum binlog_status_arg = VARIABLE_NOT_IN_BINLOG,
       on_check_function on_check_func = nullptr,
       pre_update_function pre_update_func = nullptr,
@@ -2097,8 +2097,7 @@
  public:
   Sys_var_have(
       const char *name_arg, const char *comment, int flag_args, ptrdiff_t off,
-      size_t size MY_ATTRIBUTE((unused)), CMD_LINE getopt,
-      PolyLock *lock = nullptr,
+      size_t size [[maybe_unused]], CMD_LINE getopt, PolyLock *lock = nullptr,
       enum binlog_status_enum binlog_status_arg = VARIABLE_NOT_IN_BINLOG,
       on_check_function on_check_func = nullptr,
       on_update_function on_update_func = nullptr,
@@ -2197,7 +2196,7 @@
  public:
   Sys_var_struct(
       const char *name_arg, const char *comment, int flag_args, ptrdiff_t off,
-      size_t size MY_ATTRIBUTE((unused)), CMD_LINE getopt, void *def_val,
+      size_t size [[maybe_unused]], CMD_LINE getopt, void *def_val,
       PolyLock *lock = nullptr,
       enum binlog_status_enum binlog_status_arg = VARIABLE_NOT_IN_BINLOG,
       on_check_function on_check_func = nullptr,
@@ -2268,7 +2267,7 @@
 class Sys_var_tz : public sys_var {
  public:
   Sys_var_tz(const char *name_arg, const char *comment, int flag_args,
-             ptrdiff_t off, size_t size MY_ATTRIBUTE((unused)), CMD_LINE getopt,
+             ptrdiff_t off, size_t size [[maybe_unused]], CMD_LINE getopt,
              Time_zone **def_val, PolyLock *lock = nullptr,
              enum binlog_status_enum binlog_status_arg = VARIABLE_NOT_IN_BINLOG,
              on_check_function on_check_func = nullptr,
@@ -2401,7 +2400,7 @@
  public:
   Sys_var_gtid_next(
       const char *name_arg, const char *comment, int flag_args, ptrdiff_t off,
-      size_t size MY_ATTRIBUTE((unused)), CMD_LINE getopt, const char *def_val,
+      size_t size [[maybe_unused]], CMD_LINE getopt, const char *def_val,
       PolyLock *lock = nullptr,
       enum binlog_status_enum binlog_status_arg = VARIABLE_NOT_IN_BINLOG,
       on_check_function on_check_func = nullptr,
diff -Nru mysql-8.0-8.0.26/sql/table_cache.cc mysql-8.0-8.0.27/sql/table_cache.cc
--- mysql-8.0-8.0.26/sql/table_cache.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/table_cache.cc	2021-09-28 11:46:34.000000000 +0000
@@ -282,9 +282,9 @@
    @note Caller should own LOCK_open and locks on all table cache
          instances.
 */
-void Table_cache_manager::free_table(THD *thd MY_ATTRIBUTE((unused)),
+void Table_cache_manager::free_table(THD *thd [[maybe_unused]],
                                      enum_tdc_remove_table_type remove_type
-                                         MY_ATTRIBUTE((unused)),
+                                     [[maybe_unused]],
                                      TABLE_SHARE *share) {
   Table_cache_element *cache_el[MAX_TABLE_CACHES];
 
diff -Nru mysql-8.0-8.0.26/sql/table.cc mysql-8.0-8.0.27/sql/table.cc
--- mysql-8.0-8.0.26/sql/table.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/table.cc	2021-09-28 11:46:34.000000000 +0000
@@ -81,8 +81,9 @@
 #include "sql/item.h"
 #include "sql/item_cmpfunc.h"    // and_conds
 #include "sql/item_json_func.h"  // Item_func_array_cast
-#include "sql/json_diff.h"       // Json_diff_vector
-#include "sql/json_dom.h"        // Json_wrapper
+#include "sql/join_optimizer/bit_utils.h"
+#include "sql/json_diff.h"  // Json_diff_vector
+#include "sql/json_dom.h"   // Json_wrapper
 #include "sql/json_path.h"
 #include "sql/key.h"  // find_ref_key
 #include "sql/log.h"
@@ -544,8 +545,6 @@
   }
   /* The mutex is initialized only for shares that are part of the TDC */
   if (tmp_table == NO_TMP_TABLE) mysql_mutex_destroy(&LOCK_ha_data);
-  delete name_hash;
-  name_hash = nullptr;
 
   delete m_histograms;
   m_histograms = nullptr;
@@ -576,10 +575,10 @@
 
   /*
     Make a copy since the share is allocated in its own root,
-    and free_root() updates its argument after freeing the memory.
+    and ~MEM_ROOT() updates its argument after freeing the memory.
   */
   MEM_ROOT own_root = std::move(mem_root);
-  free_root(&own_root, MYF(0));
+  own_root.Clear();
 }
 
 /**
@@ -742,8 +741,9 @@
     contains prefix keys.
     Note that prefix keys in the extended PK key parts
     (part_of_key_not_extended is false) are not considered.
+    Full-text keys are not considered prefix keys.
   */
-  if (full_length_key_part) {
+  if (full_length_key_part || Overlaps(keyinfo->flags, HA_FULLTEXT)) {
     field->part_of_key.set_bit(key_n);
     if (part_of_key_not_extended)
       field->part_of_key_not_extended.set_bit(key_n);
@@ -1140,8 +1140,6 @@
   @param         frm_context           FRM_context for the structures removed
                                        from TABLE_SHARE.
   @param         new_frm_ver           .FRM file version.
-  @param         use_hash              Indicates whether we use hash or linear
-                                       search to lookup fields by name.
   @param         field_idx             Field index in TABLE_SHARE::field array.
   @param         strpos                Pointer to part of .FRM's screens
                                        section describing the field to be
@@ -1174,7 +1172,7 @@
 
 static int make_field_from_frm(THD *thd, TABLE_SHARE *share,
                                FRM_context *frm_context, uint new_frm_ver,
-                               bool use_hash, uint field_idx, uchar *strpos,
+                               uint field_idx, uchar *strpos,
                                uchar *format_section_fields, char **comment_pos,
                                char **gcol_screen_pos, uchar **null_pos,
                                uint *null_bit_pos, int *errarg) {
@@ -1357,11 +1355,6 @@
   if (unireg == FRM_context::NEXT_NUMBER)
     share->found_next_number_field = share->field + field_idx;
 
-  if (use_hash) {
-    Field **field = share->field + field_idx;
-    share->name_hash->emplace((*field)->field_name, field);
-  }
-
   if (format_section_fields) {
     const uchar field_flags = format_section_fields[field_idx];
     const uchar field_storage = (field_flags & STORAGE_TYPE_MASK);
@@ -1412,7 +1405,6 @@
   uint extra_rec_buf_length;
   uint i, j;
   bool use_extended_sk;  // Supported extending of secondary keys with PK parts
-  bool use_hash;
   char *keynames, *names, *comment_pos, *gcol_screen_pos;
   char *orig_comment_pos, *orig_gcol_screen_pos;
   uchar forminfo[288];
@@ -1946,11 +1938,6 @@
     null_bit_pos = 0;
   }
 
-  use_hash = share->fields >= MAX_FIELDS_BEFORE_HASH;
-  if (use_hash)
-    share->name_hash = new collation_unordered_map<std::string, Field **>(
-        system_charset_info, PSI_INSTRUMENT_ME);
-
   for (i = 0; i < share->fields; i++, strpos += field_pack_length) {
     if (new_frm_ver >= 3 &&
         (strpos[10] &
@@ -1967,10 +1954,10 @@
       gcol_screen_pos += uint2korr(gcol_screen_pos + 1) + FRM_GCOL_HEADER_SIZE;
       has_vgc = true;
     } else {
-      if ((error = make_field_from_frm(
-               thd, share, frm_context, new_frm_ver, use_hash, i, strpos,
-               format_section_fields, &comment_pos, &gcol_screen_pos, &null_pos,
-               &null_bit_pos, &errarg)))
+      if ((error = make_field_from_frm(thd, share, frm_context, new_frm_ver, i,
+                                       strpos, format_section_fields,
+                                       &comment_pos, &gcol_screen_pos,
+                                       &null_pos, &null_bit_pos, &errarg)))
         goto err;
     }
   }
@@ -1991,10 +1978,10 @@
            FRM_context::GENERATED_FIELD) &&   // former Field::unireg_check
           !(bool)(uint)(gcol_screen_pos[3]))  // Field::stored_in_db
       {
-        if ((error = make_field_from_frm(
-                 thd, share, frm_context, new_frm_ver, use_hash, i, strpos,
-                 format_section_fields, &comment_pos, &gcol_screen_pos,
-                 &null_pos, &null_bit_pos, &errarg)))
+        if ((error = make_field_from_frm(thd, share, frm_context, new_frm_ver,
+                                         i, strpos, format_section_fields,
+                                         &comment_pos, &gcol_screen_pos,
+                                         &null_pos, &null_bit_pos, &errarg)))
           goto err;
       } else {
         /*
@@ -2250,8 +2237,6 @@
   my_free(disk_buff);
   my_free(extra_segment_buff);
   destroy(handler_file);
-  delete share->name_hash;
-  share->name_hash = nullptr;
 
   open_table_error(thd, share, error, my_errno());
   return error;
@@ -3081,7 +3066,10 @@
                                    (*field_ptr)->field_name, *field_ptr,
                                    is_create_table, &error_reported)) {
           *vfield_ptr = nullptr;
-          error = 4;  // in case no error is reported
+          if (thd->is_error())
+            error_reported = true;
+          else
+            error = 4;  // in case no error is reported
           goto err;
         }
 
@@ -3280,7 +3268,7 @@
   }
   outparam->file = nullptr;  // For easier error checking
   outparam->db_stat = 0;
-  if (!internal_tmp) free_root(root, MYF(0));
+  if (!internal_tmp) root->Clear();
   my_free(const_cast<char *>(outparam->alias));
   return error;
 }
@@ -3328,7 +3316,7 @@
     else
       free_table_share(table->s);
   }
-  free_root(&table->mem_root, MYF(0));
+  table->mem_root.Clear();
   return error;
 }
 
@@ -3712,7 +3700,7 @@
   return last_char_is_space || (name_length > NAME_CHAR_LEN);
 }
 
-bool Table_check_intact::check(THD *thd MY_ATTRIBUTE((unused)), TABLE *table,
+bool Table_check_intact::check(THD *thd [[maybe_unused]], TABLE *table,
                                const TABLE_FIELD_DEF *table_def) {
   uint i;
   bool error = false;
@@ -4055,12 +4043,11 @@
   return table_map_id.id();
 }
 
-Blob_mem_storage::Blob_mem_storage() : truncated_value(false) {
-  init_alloc_root(key_memory_blob_mem_storage, &storage,
-                  MAX_FIELD_VARCHARLENGTH, 0);
-}
+Blob_mem_storage::Blob_mem_storage()
+    : storage(key_memory_blob_mem_storage, MAX_FIELD_VARCHARLENGTH),
+      truncated_value(false) {}
 
-Blob_mem_storage::~Blob_mem_storage() { free_root(&storage, MYF(0)); }
+Blob_mem_storage::~Blob_mem_storage() { storage.Clear(); }
 
 /**
   Initialize TABLE instance (newly created, or coming either from table
@@ -4085,6 +4072,9 @@
   if (thd->lex->need_correct_ident())
     alias_name_used =
         my_strcasecmp(table_alias_charset, s->table_name.str, tl->alias);
+  else
+    alias_name_used = false;
+
   /* Fix alias if table name changes. */
   if (strcmp(alias, tl->alias)) {
     size_t length = strlen(tl->alias) + 1;
@@ -7266,6 +7256,55 @@
   return false;
 }
 
+void LEX_MFA::copy(LEX_MFA *m, MEM_ROOT *alloc) {
+  nth_factor = m->nth_factor;
+  uses_identified_by_clause = m->uses_identified_by_clause;
+  uses_authentication_string_clause = m->uses_authentication_string_clause;
+  uses_identified_with_clause = m->uses_identified_with_clause;
+  has_password_generator = m->has_password_generator;
+  passwordless = m->passwordless;
+  add_factor = m->add_factor;
+  modify_factor = m->modify_factor;
+  drop_factor = m->drop_factor;
+  requires_registration = m->requires_registration;
+  unregister = m->unregister;
+  init_registration = m->init_registration;
+  finish_registration = m->finish_registration;
+
+  auto alloc_str = [&](size_t len, LEX_CSTRING &dest, const LEX_CSTRING &src) {
+    dest.length = len;
+    dest.str = static_cast<const char *>(alloc->Alloc(dest.length + 1));
+    memset(const_cast<char *>(dest.str), 0, dest.length + 1);
+    memcpy(const_cast<char *>(dest.str), const_cast<char *>(src.str),
+           src.length);
+  };
+  if (m->plugin.length) alloc_str(m->plugin.length, plugin, m->plugin);
+  if (m->auth.length)
+    alloc_str(m->auth.length, auth, m->auth);
+  else
+    auth = EMPTY_CSTR;
+  if (m->challenge_response.length)
+    alloc_str(m->challenge_response.length, challenge_response,
+              m->challenge_response);
+
+  if (m->generated_password.length)
+    alloc_str(m->generated_password.length, generated_password,
+              m->generated_password);
+}
+
+LEX_USER *LEX_USER::alloc(THD *thd) {
+  LEX_USER *ret = static_cast<LEX_USER *>(thd->alloc(sizeof(LEX_USER)));
+  if (ret == nullptr) return nullptr;
+  ret->init();
+  return ret;
+}
+
+bool LEX_USER::add_mfa_identifications(LEX_MFA *factor2, LEX_MFA *factor3) {
+  if (factor2 != nullptr && mfa_list.push_back(factor2)) return true;  // OOM
+  if (factor3 != nullptr && mfa_list.push_back(factor3)) return true;  // OOM
+  return false;
+}
+
 LEX_USER *LEX_USER::alloc(THD *thd, LEX_STRING *user_arg,
                           LEX_STRING *host_arg) {
   LEX_USER *ret = static_cast<LEX_USER *>(thd->alloc(sizeof(LEX_USER)));
@@ -7275,6 +7314,7 @@
 
 LEX_USER *LEX_USER::init(LEX_USER *ret, THD *thd, LEX_STRING *user_arg,
                          LEX_STRING *host_arg) {
+  ret->init();
   /*
     Trim whitespace as the values will go to a CHAR field
     when stored.
@@ -7286,31 +7326,6 @@
   ret->user.length = user_arg->length;
   ret->host.str = host_arg ? host_arg->str : "%";
   ret->host.length = host_arg ? host_arg->length : 1;
-  ret->plugin = EMPTY_CSTR;
-  ret->auth = NULL_CSTR;
-  ret->current_auth = NULL_CSTR;
-  ret->uses_replace_clause = false;
-  ret->uses_identified_by_clause = false;
-  ret->uses_identified_with_clause = false;
-  ret->uses_authentication_string_clause = false;
-  ret->has_password_generator = false;
-  ret->retain_current_password = false;
-  ret->discard_old_password = false;
-  ret->alter_status.account_locked = false;
-  ret->alter_status.expire_after_days = 0;
-  ret->alter_status.update_account_locked_column = false;
-  ret->alter_status.update_password_expired_column = false;
-  ret->alter_status.update_password_expired_fields = false;
-  ret->alter_status.use_default_password_lifetime = true;
-  ret->alter_status.use_default_password_history = true;
-  ret->alter_status.update_password_require_current =
-      Lex_acl_attrib_udyn::UNCHANGED;
-  ret->alter_status.password_history_length = 0;
-  ret->alter_status.password_reuse_interval = 0;
-  ret->alter_status.failed_login_attempts = 0;
-  ret->alter_status.password_lock_time = 0;
-  ret->alter_status.update_failed_login_attempts = false;
-  ret->alter_status.update_password_lock_time = false;
   if (check_string_char_length(ret->user, ER_THD(thd, ER_USERNAME),
                                USERNAME_CHAR_LENGTH, system_charset_info,
                                false) ||
diff -Nru mysql-8.0-8.0.26/sql/table_function.cc mysql-8.0-8.0.27/sql/table_function.cc
--- mysql-8.0-8.0.26/sql/table_function.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/table_function.cc	2021-09-28 11:46:34.000000000 +0000
@@ -71,7 +71,9 @@
 
   if ((error = table->file->ha_write_row(table->record[0]))) {
     if (!table->file->is_ignorable_error(error) &&
-        create_ondisk_from_heap(current_thd, table, error, true, nullptr))
+        create_ondisk_from_heap(
+            current_thd, table, error, /*insert_last_record=*/true,
+            /*ignore_last_dup=*/true, /*is_duplicate=*/nullptr))
       return true;  // Not a table_is_full error
   }
   return false;
@@ -287,23 +289,14 @@
   if (m_vt_list.elements == 0) {
     uint nest_idx = 0;
     if (init_json_table_col_lists(&nest_idx, &top)) return true;
-    List_iterator<Json_table_column> li(m_vt_list);
 
-    /*
-      Check for duplicate names.
-      Two iterators over vt_list are used. First is used to get a field,
-      second - to compare the field with fields in the rest of the list.
-      For each iteration of the first list, we skip fields prior to the
-      first iterator's field.
-    */
-    Json_table_column *first;
-    while ((first = li++)) {
-      Json_table_column *col;
-      List_iterator<Json_table_column> li2(m_vt_list);
-      // Compare 'first' with all columns prior to it
-      while ((col = li2++) && col != first) {
-        if (!strncmp(first->field_name, col->field_name, NAME_CHAR_LEN)) {
-          my_error(ER_DUP_FIELDNAME, MYF(0), first->field_name);
+    // Check for duplicate field names.
+    for (Create_field &outer : m_vt_list) {
+      Name_string outer_name(to_lex_cstring(outer.field_name));
+      for (Create_field &inner : m_vt_list) {
+        if (&outer == &inner) break;
+        if (outer_name.eq(inner.field_name)) {
+          my_error(ER_DUP_FIELDNAME, MYF(0), inner.field_name);
           return true;
         }
       }
@@ -664,6 +657,26 @@
     str->append(STRING_WITH_LEN(" on error"));
 }
 
+/// Prints the type of a column in a JSON_TABLE expression.
+static bool print_json_table_column_type(const Field *field, String *str) {
+  StringBuffer<STRING_BUFFER_USUAL_SIZE> type;
+  field->sql_type(type);
+  if (str->append(type)) return true;
+  if (field->has_charset()) {
+    // Append the character set.
+    if (str->append(STRING_WITH_LEN(" character set ")) ||
+        str->append(field->charset()->csname))
+      return true;
+    // Append the collation, if it is not the primary collation of the
+    // character set.
+    if ((field->charset()->state & MY_CS_PRIMARY) == 0 &&
+        (str->append(STRING_WITH_LEN(" collate ")) ||
+         str->append(field->charset()->name)))
+      return true;
+  }
+  return false;
+}
+
 /**
   Helper function to print a single NESTED PATH column.
 
@@ -695,21 +708,13 @@
       case enum_jt_column::JTC_PATH: {
         append_identifier(thd, str, jtc.field_name, strlen(jtc.field_name));
         if (str->append(' ')) return true;
-        const Field *field = table->field[jtc.m_field_idx];
-        StringBuffer<STRING_BUFFER_USUAL_SIZE> type;
-        field->sql_type(type);
-        if (str->append(type)) return true;
-        if (field->has_charset()) {
-          // Append the character set.
-          if (str->append(STRING_WITH_LEN(" character set ")) ||
-              str->append(field->charset()->csname))
-            return true;
-          // Append the collation, if it is not the primary collation of the
-          // character set.
-          if ((field->charset()->state & MY_CS_PRIMARY) == 0 &&
-              (str->append(STRING_WITH_LEN(" collate ")) ||
-               str->append(field->charset()->name)))
+        if (table == nullptr) {
+          if (str->append(STRING_WITH_LEN("<column type not resolved yet>"))) {
             return true;
+          }
+        } else if (print_json_table_column_type(table->field[jtc.m_field_idx],
+                                                str)) {
+          return true;
         }
         if (jtc.m_jtc_type == enum_jt_column::JTC_EXISTS) {
           if (str->append(STRING_WITH_LEN(" exists"))) return true;
diff -Nru mysql-8.0-8.0.26/sql/table.h mysql-8.0-8.0.27/sql/table.h
--- mysql-8.0-8.0.26/sql/table.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/table.h	2021-09-28 11:46:34.000000000 +0000
@@ -717,8 +717,6 @@
   /** Category of this table. */
   TABLE_CATEGORY table_category{TABLE_UNKNOWN_CATEGORY};
 
-  /* hash of field names (contains pointers to elements of field array) */
-  collation_unordered_map<std::string, Field **> *name_hash{nullptr};
   MEM_ROOT mem_root;
   /**
     Used to allocate new handler for internal temporary table when the
@@ -1284,7 +1282,7 @@
   ~Blob_mem_storage();
 
   void reset() {
-    free_root(&storage, MYF(MY_MARK_BLOCKS_FREE));
+    storage.ClearForReuse();
     truncated_value = false;
   }
   /**
@@ -2453,6 +2451,65 @@
   NO         /* Value that maps to False is specified */
 };
 
+struct LEX_MFA {
+  LEX_CSTRING plugin;
+  LEX_CSTRING auth;
+  LEX_CSTRING generated_password;
+  LEX_CSTRING challenge_response;
+  uint nth_factor;
+  /*
+    The following flags are indicators for the SQL syntax used while
+    parsing CREATE/ALTER user. While other members are self-explanatory,
+    'uses_authentication_string_clause' signifies if the password is in
+    hash form (if the var was set to true) or not.
+  */
+  bool uses_identified_by_clause;
+  bool uses_authentication_string_clause;
+  bool uses_identified_with_clause;
+  bool has_password_generator;
+  /* flag set during CREATE USER .. INITIAL AUTHENTICATION BY */
+  bool passwordless;
+  /* flag set during ALTER USER .. ADD nth FACTOR */
+  bool add_factor;
+  /* flag set during ALTER USER .. MODIFY nth FACTOR */
+  bool modify_factor;
+  /* flag set during ALTER USER .. DROP nth FACTOR */
+  bool drop_factor;
+  /*
+    flag used during authentication and to decide if server should
+    be in sandbox mode or not
+  */
+  bool requires_registration;
+  /* flag set during ALTER USER .. nth FACTOR UNREGISTER */
+  bool unregister;
+  /* flag set during ALTER USER .. INITIATE REGISTRATION */
+  bool init_registration;
+  /* flag set during ALTER USER .. FINISH REGISTRATION */
+  bool finish_registration;
+
+  LEX_MFA() { reset(); }
+  void reset() {
+    plugin = EMPTY_CSTR;
+    auth = NULL_CSTR;
+    generated_password = NULL_CSTR;
+    challenge_response = NULL_CSTR;
+    nth_factor = 1;
+    uses_identified_by_clause = false;
+    uses_authentication_string_clause = false;
+    uses_identified_with_clause = false;
+    has_password_generator = false;
+    passwordless = false;
+    add_factor = false;
+    drop_factor = false;
+    modify_factor = false;
+    requires_registration = false;
+    unregister = false;
+    init_registration = false;
+    finish_registration = false;
+  }
+  void copy(LEX_MFA *m, MEM_ROOT *alloc);
+};
+
 /*
   This structure holds the specifications relating to
   ALTER user ... PASSWORD EXPIRE ...
@@ -2504,29 +2561,54 @@
 struct LEX_USER {
   LEX_CSTRING user;
   LEX_CSTRING host;
-  LEX_CSTRING plugin;
-  LEX_CSTRING auth;
   LEX_CSTRING current_auth;
-  /*
-    The following flags are indicators for the SQL syntax used while
-    parsing CREATE/ALTER user. While other members are self-explanatory,
-    'uses_authentication_string_clause' signifies if the password is in
-    hash form (if the var was set to true) or not.
-  */
-  bool uses_identified_by_clause;
-  bool uses_identified_with_clause;
-  bool uses_authentication_string_clause;
   bool uses_replace_clause;
   bool retain_current_password;
   bool discard_old_password;
-  bool has_password_generator;
   LEX_ALTER alter_status;
+  /* restrict MFA methods to atmost 3 authentication plugins */
+  LEX_MFA first_factor_auth_info;
+  List<LEX_MFA> mfa_list;
+  bool with_initial_auth;
+
+  void init() {
+    user = NULL_CSTR;
+    host = NULL_CSTR;
+    current_auth = NULL_CSTR;
+    uses_replace_clause = false;
+    retain_current_password = false;
+    discard_old_password = false;
+    alter_status.account_locked = false;
+    alter_status.expire_after_days = 0;
+    alter_status.update_account_locked_column = false;
+    alter_status.update_password_expired_column = false;
+    alter_status.update_password_expired_fields = false;
+    alter_status.use_default_password_lifetime = true;
+    alter_status.use_default_password_history = true;
+    alter_status.update_password_require_current =
+        Lex_acl_attrib_udyn::UNCHANGED;
+    alter_status.password_history_length = 0;
+    alter_status.password_reuse_interval = 0;
+    alter_status.failed_login_attempts = 0;
+    alter_status.password_lock_time = 0;
+    alter_status.update_failed_login_attempts = false;
+    alter_status.update_password_lock_time = false;
+    first_factor_auth_info.reset();
+    mfa_list.clear();
+    with_initial_auth = false;
+  }
+
+  LEX_USER() { init(); }
+
+  bool add_mfa_identifications(LEX_MFA *factor2, LEX_MFA *factor3 = nullptr);
+
   /*
     Allocates the memory in the THD mem pool and initialize the members of
     this struct. It is preferable to use this method to create a LEX_USER
     rather allocating the memory in the THD and initializing the members
     explicitly.
   */
+  static LEX_USER *alloc(THD *thd);
   static LEX_USER *alloc(THD *thd, LEX_STRING *user, LEX_STRING *host);
   /*
     Initialize the members of this struct. It is preferable to use this method
@@ -3005,7 +3087,7 @@
   /// Set table as full-text search (default is not fulltext searched)
   void set_fulltext_searched() { m_fulltext_searched = true; }
 
-  /// Return true if table is insertable-into
+  /// Returns true if a MATCH function references this table.
   bool is_fulltext_searched() const { return m_fulltext_searched; }
 
   /**
@@ -3919,9 +4001,10 @@
 
 /* The following is only needed for debugging */
 
-static inline my_bitmap_map *dbug_tmp_use_all_columns(
-    TABLE *table MY_ATTRIBUTE((unused)),
-    MY_BITMAP *bitmap MY_ATTRIBUTE((unused))) {
+static inline my_bitmap_map *dbug_tmp_use_all_columns(TABLE *table
+                                                      [[maybe_unused]],
+                                                      MY_BITMAP *bitmap
+                                                      [[maybe_unused]]) {
 #ifndef NDEBUG
   return tmp_use_all_columns(table, bitmap);
 #else
@@ -3929,9 +4012,10 @@
 #endif
 }
 
-static inline void dbug_tmp_restore_column_map(
-    MY_BITMAP *bitmap MY_ATTRIBUTE((unused)),
-    my_bitmap_map *old MY_ATTRIBUTE((unused))) {
+static inline void dbug_tmp_restore_column_map(MY_BITMAP *bitmap
+                                               [[maybe_unused]],
+                                               my_bitmap_map *old
+                                               [[maybe_unused]]) {
 #ifndef NDEBUG
   tmp_restore_column_map(bitmap, old);
 #endif
@@ -3942,10 +4026,9 @@
   Provide for the possiblity of the read set being the same as the write set
 */
 static inline void dbug_tmp_use_all_columns(
-    TABLE *table MY_ATTRIBUTE((unused)),
-    my_bitmap_map **save MY_ATTRIBUTE((unused)),
-    MY_BITMAP *read_set MY_ATTRIBUTE((unused)),
-    MY_BITMAP *write_set MY_ATTRIBUTE((unused))) {
+    TABLE *table [[maybe_unused]], my_bitmap_map **save [[maybe_unused]],
+    MY_BITMAP *read_set [[maybe_unused]],
+    MY_BITMAP *write_set [[maybe_unused]]) {
 #ifndef NDEBUG
   save[0] = read_set->bitmap;
   save[1] = write_set->bitmap;
@@ -3955,9 +4038,8 @@
 }
 
 static inline void dbug_tmp_restore_column_maps(
-    MY_BITMAP *read_set MY_ATTRIBUTE((unused)),
-    MY_BITMAP *write_set MY_ATTRIBUTE((unused)),
-    my_bitmap_map **old MY_ATTRIBUTE((unused))) {
+    MY_BITMAP *read_set [[maybe_unused]], MY_BITMAP *write_set [[maybe_unused]],
+    my_bitmap_map **old [[maybe_unused]]) {
 #ifndef NDEBUG
   tmp_restore_column_map(read_set, old[0]);
   tmp_restore_column_map(write_set, old[1]);
@@ -4158,6 +4240,8 @@
       : references(mem_root), recursive(false), tmp_tables(mem_root) {}
   TABLE *clone_tmp_table(THD *thd, TABLE_LIST *tl);
   bool substitute_recursive_reference(THD *thd, Query_block *sl);
+  /// Remove one table reference.
+  void remove_table(TABLE_LIST *tr);
   /// Empties the materialized CTE and informs all of its clones.
   bool clear_all_references();
   /**
diff -Nru mysql-8.0-8.0.26/sql/tc_log.cc mysql-8.0-8.0.27/sql/tc_log.cc
--- mysql-8.0-8.0.26/sql/tc_log.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/tc_log.cc	2021-09-28 11:46:34.000000000 +0000
@@ -429,7 +429,7 @@
   cookie points directly to the memory where xid was logged.
 */
 
-void TC_LOG_MMAP::unlog(ulong cookie, my_xid xid MY_ATTRIBUTE((unused))) {
+void TC_LOG_MMAP::unlog(ulong cookie, my_xid xid [[maybe_unused]]) {
   PAGE *p = pages + (cookie / tc_log_page_size);
   my_xid *x = (my_xid *)(data + cookie);
 
@@ -454,23 +454,23 @@
     case 6:
       mysql_mutex_destroy(&LOCK_tc);
       mysql_cond_destroy(&COND_pool);
-      // Fall through.
+      [[fallthrough]];
     case 5:
       data[0] = 'A';  // garble the first (signature) byte, in case
                       // mysql_file_delete fails
-      // Fall through.
+      [[fallthrough]];
     case 4:
       for (i = 0; i < npages; i++) {
         if (pages[i].ptr == nullptr) break;
         mysql_cond_destroy(&pages[i].cond);
       }
-      // Fall through.
+      [[fallthrough]];
     case 3:
       my_free(pages);
-      // Fall through.
+      [[fallthrough]];
     case 2:
       my_munmap((char *)data, (size_t)file_length);
-      // Fall through.
+      [[fallthrough]];
     case 1:
       mysql_file_close(fd, MYF(0));
   }
diff -Nru mysql-8.0-8.0.26/sql/thr_malloc.cc mysql-8.0-8.0.27/sql/thr_malloc.cc
--- mysql-8.0-8.0.26/sql/thr_malloc.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/thr_malloc.cc	2021-09-28 11:46:34.000000000 +0000
@@ -43,8 +43,8 @@
 extern "C" void sql_alloc_error_handler(void);
 
 void init_sql_alloc(PSI_memory_key key, MEM_ROOT *mem_root, size_t block_size,
-                    size_t pre_alloc) {
-  init_alloc_root(key, mem_root, block_size, pre_alloc);
+                    size_t) {
+  ::new ((void *)mem_root) MEM_ROOT(key, block_size);
   mem_root->set_error_handler(sql_alloc_error_handler);
 }
 
diff -Nru mysql-8.0-8.0.26/sql/time_zone_common.cc mysql-8.0-8.0.27/sql/time_zone_common.cc
--- mysql-8.0-8.0.26/sql/time_zone_common.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/time_zone_common.cc	2021-09-28 11:46:34.000000000 +0000
@@ -33,7 +33,6 @@
 #include <sys/types.h>
 #include <time.h>
 
-#include "guard.h"
 #include "lex_string.h"
 #include "m_ctype.h"
 #include "m_string.h"  // strmake
diff -Nru mysql-8.0-8.0.26/sql/timing_iterator.h mysql-8.0-8.0.27/sql/timing_iterator.h
--- mysql-8.0-8.0.26/sql/timing_iterator.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/timing_iterator.h	2021-09-28 11:46:34.000000000 +0000
@@ -76,13 +76,7 @@
   using duration = std::chrono::duration<T>;
 
   steady_clock::time_point now() const {
-#ifdef __SUNPRO_CC
-    // This no-op cast works around an optimization bug in Developer Studio
-    // where it attempts to dereference an integral time value, leading to
-    // crashes.
-    return std::chrono::time_point_cast<std::chrono::nanoseconds>(
-        steady_clock::now());
-#elif defined(__linux__)
+#if defined(__linux__)
     // Work around very slow libstdc++ implementations of std::chrono
     // (those compiled with _GLIBCXX_USE_CLOCK_GETTIME_SYSCALL).
     timespec tp;
diff -Nru mysql-8.0-8.0.26/sql/transaction_info.h mysql-8.0-8.0.27/sql/transaction_info.h
--- mysql-8.0-8.0.26/sql/transaction_info.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/transaction_info.h	2021-09-28 11:46:34.000000000 +0000
@@ -218,7 +218,7 @@
   void store_commit_parent(int64 last_arg) { last_committed = last_arg; }
 
   Transaction_ctx();
-  virtual ~Transaction_ctx() { free_root(&m_mem_root, MYF(0)); }
+  virtual ~Transaction_ctx() { m_mem_root.Clear(); }
 
   void cleanup() {
     DBUG_TRACE;
@@ -227,7 +227,7 @@
     m_rpl_transaction_ctx.cleanup();
     m_transaction_write_set_ctx.reset_state();
     trans_begin_hook_invoked = false;
-    free_root(&m_mem_root, MYF(MY_KEEP_PREALLOC));
+    m_mem_root.ClearForReuse();
     return;
   }
 
@@ -258,9 +258,7 @@
 
   void claim_memory_ownership(bool claim) { m_mem_root.Claim(claim); }
 
-  void free_memory(myf root_alloc_flags) {
-    free_root(&m_mem_root, root_alloc_flags);
-  }
+  void free_memory() { m_mem_root.Clear(); }
 
   char *strmake(const char *str, size_t len) {
     return strmake_root(&m_mem_root, str, len);
diff -Nru mysql-8.0-8.0.26/sql/tztime.cc mysql-8.0-8.0.27/sql/tztime.cc
--- mysql-8.0-8.0.26/sql/tztime.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/tztime.cc	2021-09-28 11:46:34.000000000 +0000
@@ -40,11 +40,11 @@
 #include <sys/types.h>
 #include <time.h>
 
-#include "guard.h"
 #include "lex_string.h"
 #include "m_ctype.h"
 #include "m_string.h"  // strmake
 #include "map_helpers.h"
+#include "mutex_lock.h"  // MUTEX_LOCK
 #include "my_alloc.h"
 #include "my_base.h"
 #include "my_compiler.h"
@@ -769,8 +769,9 @@
   RETURN VALUE
     Corresponding my_time_t value, or 0 in case of error.
 */
-my_time_t Time_zone_utc::TIME_to_gmt_sec(
-    const MYSQL_TIME *mt, bool *in_dst_time_gap MY_ATTRIBUTE((unused))) const {
+my_time_t Time_zone_utc::TIME_to_gmt_sec(const MYSQL_TIME *mt,
+                                         bool *in_dst_time_gap
+                                         [[maybe_unused]]) const {
   return sec_since_epoch(*mt);
 }
 
@@ -953,8 +954,9 @@
 
   @return Corresponding my_time_t value or 0 for invalid datetime values.
 */
-my_time_t Time_zone_offset::TIME_to_gmt_sec(
-    const MYSQL_TIME *t, bool *in_dst_time_gap MY_ATTRIBUTE((unused))) const {
+my_time_t Time_zone_offset::TIME_to_gmt_sec(const MYSQL_TIME *t,
+                                            bool *in_dst_time_gap
+                                            [[maybe_unused]]) const {
   /*
     Check timestamp range. We have to do this as the caller relies on
     us to make all validation checks here.
@@ -1346,7 +1348,7 @@
     mysql_mutex_destroy(&tz_LOCK);
     offset_tzs.clear();
     tz_names.clear();
-    free_root(&tz_storage, MYF(0));
+    tz_storage.Clear();
   }
 }
 
@@ -1793,7 +1795,7 @@
 
   if (!name || name->is_empty()) return nullptr;
 
-  Mutex_guard guard(&tz_LOCK);
+  MUTEX_LOCK(guard, &tz_LOCK);
 
   int displacement;
   if (!str_to_offset(name->ptr(), name->length(), &displacement)) {
diff -Nru mysql-8.0-8.0.26/sql/udf_service_impl.cc mysql-8.0-8.0.27/sql/udf_service_impl.cc
--- mysql-8.0-8.0.26/sql/udf_service_impl.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/udf_service_impl.cc	2021-09-28 11:46:34.000000000 +0000
@@ -33,6 +33,7 @@
 #include "sql/rpl_async_conn_failover_add_source_udf.h"
 #include "sql/rpl_async_conn_failover_delete_managed_udf.h"
 #include "sql/rpl_async_conn_failover_delete_source_udf.h"
+#include "sql/rpl_async_conn_failover_reset_udf.h"
 
 bool Udf_service_impl::register_udf(Udf_data &udf) {
   DBUG_TRACE;
@@ -124,6 +125,7 @@
   add<Rpl_async_conn_failover_delete_source>();
   add<Rpl_async_conn_failover_add_managed>();
   add<Rpl_async_conn_failover_delete_managed>();
+  add<Rpl_async_conn_failover_reset>();
 }
 
 void Udf_load_service::unregister_udf() {
diff -Nru mysql-8.0-8.0.26/sql/uniques.cc mysql-8.0-8.0.27/sql/uniques.cc
--- mysql-8.0-8.0.26/sql/uniques.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/uniques.cc	2021-09-28 11:46:34.000000000 +0000
@@ -153,7 +153,7 @@
 static int merge_buffers(THD *thd, Uniq_param *param, IO_CACHE *from_file,
                          IO_CACHE *to_file, Sort_buffer sort_buffer,
                          Merge_chunk *last_chunk, Merge_chunk_array chunk_array,
-                         int flag MY_ATTRIBUTE((unused))) {
+                         int flag [[maybe_unused]]) {
   int error = 0;
   uint rec_length;
   ha_rows maxcount;
@@ -978,7 +978,9 @@
   if (res) {
     bool dup = false;
     if (res == HA_ERR_FOUND_DUPP_KEY) return true;
-    if (create_ondisk_from_heap(thd, m_table, res, false, &dup) || dup)
+    if (create_ondisk_from_heap(thd, m_table, res, /*insert_last_record=*/true,
+                                /*ignore_last_dup=*/false, &dup) ||
+        dup)
       return true;
   }
   return false;
diff -Nru mysql-8.0-8.0.26/sql/window.cc mysql-8.0-8.0.27/sql/window.cc
--- mysql-8.0-8.0.26/sql/window.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/window.cc	2021-09-28 11:46:34.000000000 +0000
@@ -49,6 +49,9 @@
 #include "sql/item_func.h"
 #include "sql/item_sum.h"       // Item_sum
 #include "sql/item_timefunc.h"  // Item_date_add_interval
+#include "sql/join_optimizer/finalize_plan.h"
+#include "sql/join_optimizer/join_optimizer.h"
+#include "sql/join_optimizer/replace_item.h"
 #include "sql/key_spec.h"
 #include "sql/mem_root_array.h"
 #include "sql/parse_tree_nodes.h"   // PT_*
@@ -115,9 +118,6 @@
 }
 
 bool Window::check_window_functions1(THD *thd, Query_block *select) {
-  List_iterator<Item_sum> li(m_functions);
-  Item *wf;
-
   m_static_aggregates =
       (m_frame->m_from->m_border_type == WBT_UNBOUNDED_PRECEDING &&
        m_frame->m_to->m_border_type == WBT_UNBOUNDED_FOLLOWING);
@@ -128,11 +128,10 @@
   m_range_optimizable =
       (m_frame->m_query_expression == WFU_RANGE) && !m_static_aggregates;
 
-  while ((wf = li++)) {
+  for (Item_sum &wf : m_functions) {
     Window_evaluation_requirements reqs;
 
-    Item_sum *wfs = down_cast<Item_sum *>(wf);
-    if (wfs->check_wf_semantics1(thd, select, &reqs)) return true;
+    if (wf.check_wf_semantics1(thd, select, &reqs)) return true;
 
     // [Not] buffering depends only on facts known at resolution time
     m_needs_frame_buffering |= reqs.needs_buffer;
@@ -142,15 +141,15 @@
         the peers, but it's irrelevant: what matters is the frame's set, not
         the peer set in itself).
       */
-      assert(!wfs->framing());
+      assert(!wf.framing());
       m_needs_peerset = true;
     }
     if (reqs.needs_last_peer_in_frame) {
-      assert(wfs->framing());
+      assert(wf.framing());
       m_needs_last_peer_in_frame = true;
     }
-    if (wfs->needs_partition_cardinality()) {
-      assert(!wfs->framing());
+    if (wf.needs_partition_cardinality()) {
+      assert(!wf.framing());
       m_needs_partition_cardinality = true;
     }
     m_opt_first_row |= reqs.opt_first_row;
@@ -159,7 +158,7 @@
     m_range_optimizable &= reqs.range_optimizable;
 
     if (thd->lex->is_explain() && !m_frame->m_originally_absent &&
-        !wfs->framing()) {
+        !wf.framing()) {
       /*
         SQL2014 <window clause> SR6b: functions which do not respect frames
         shouldn't have any frame specification in their window; we are more
@@ -170,7 +169,7 @@
       push_warning_printf(thd, Sql_condition::SL_NOTE,
                           ER_WINDOW_FUNCTION_IGNORES_FRAME,
                           ER_THD(thd, ER_WINDOW_FUNCTION_IGNORES_FRAME),
-                          wfs->func_name(), printable_name());
+                          wf.func_name(), printable_name());
     }
   }
 
@@ -180,8 +179,20 @@
 static Item_cache *make_result_item(Item *value) {
   Item *order_expr = *down_cast<Item_ref *>(value)->ref;
   Item_cache *result = nullptr;
+  Item_result result_type = order_expr->result_type();
+
+  // In case of enum/set type, ordering is based on numeric
+  // comparison. So, we need to create items that will
+  // evalute to integers.
+  if (order_expr->real_item()->type() == Item::FIELD_ITEM) {
+    Item_field *field = down_cast<Item_field *>(order_expr->real_item());
+    if (field->field->real_type() == MYSQL_TYPE_ENUM ||
+        field->field->real_type() == MYSQL_TYPE_SET) {
+      result_type = INT_RESULT;
+    }
+  }
 
-  switch (order_expr->result_type()) {
+  switch (result_type) {
     case INT_RESULT:
       result = new Item_cache_int(value->data_type());
       break;
@@ -245,9 +256,6 @@
   }
 
   for (PT_border *border : {m_frame->m_from, m_frame->m_to}) {
-    Item_func *cmp = nullptr, **cmp_ptr = nullptr /* to silence warning */;
-    Item_func *inv_cmp = nullptr,
-              **inv_cmp_ptr = nullptr /* to silence warning */;
     enum_window_border_type border_type = border->m_border_type;
     switch (border_type) {
       case WBT_UNBOUNDED_PRECEDING:
@@ -260,7 +268,7 @@
           Frame uses RANGE <value>, require ORDER BY with one column
           cf. SQL 2014 7.15 <window clause>, SR 13.a.ii
         */
-        if (!o || o->value.elements != 1) {
+        if (!o || o->value.size() != 1) {
           my_error(ER_WINDOW_RANGE_FRAME_ORDER_TYPE, MYF(0), printable_name());
           return true;
         }
@@ -280,24 +288,11 @@
         return true;
       ok:;
       }
-      // fall through
+        [[fallthrough]];
       case WBT_CURRENT_ROW: {
-        /*
-          We compute lower than (LT) as
-          oe-1 < ? OR (!(oe1 > ?) AND
-          (oe-2 < ? OR (!(oe-2 > ?) AND
-            .....
-             (oe-N < ?))));
-
-          WBT_VALUE_PRECEDING and WBT_VALUE_FOLLOWING requires the tree to have
-          exactly one oe-1 LT (for the one ORDER BY expession allowed for such
-          queries).
-        */
-        cmp = new Item_func_false();
-        inv_cmp = new Item_func_false();
-
-        // Build OR tree from bottom up, so left most expression ends up on top
-        for (int i = o->value.elements - 1; i >= 0; i--) {
+        auto comparators = Bounds_checked_array<Arg_comparator>::Alloc(
+            thd->mem_root, o->value.size());
+        for (size_t i = 0; i < o->value.size(); ++i) {
           bool asc = elt(o->value, i)->direction == ORDER_ASC;
           Item *nr = m_order_by_items[i]->get_item();
 
@@ -308,33 +303,26 @@
             which we want to determine whether resided in the specified RANGE.
 
             We poke in the actual value of expr of the current row (cached) into
-            value in Cached_item_xxx:cmp.
+            value in reset_order_by_peer_set().
           */
 
           Item_cache *value = make_result_item(nr);
           if (value == nullptr) return true;
 
           /*
+            See comments on m_comparator.
+
             WBT_CURRENT_ROW:
-              if FROM:
-                asc ? nr < value : nr > value ;
-              if TO: < becomes > and vice-versa.
-
-              If we have multiple ORDER BY expressions we build and
-              OR tree with several levels of conditions. These gets flattened
-              into a single OR node at execution time, which we evaluate
-              explicitly in before_or_after_frame, inclucing null handling
+              nr â‹› value   (where â‹› is three-way comparison)
+
+            If we have multiple ORDER BY expressions, before_or_after_frame()
+            calls them in turn as needed, including special NULL handling.
 
             WBT_VALUE_PRECEDING:
-              if FROM:
-                asc ? nr < value - border->val_int() :
-                      nr > value + border->val_int())
-              if TO: < becomes > and vice-versa.
-            WBT_VALUE_FOLLOWING:
-              If FROM:
-                asc ? nr < value + border->val_int() :
-                      nr > value - border->val_int()
-              if TO: < becomes > and vice-versa.
+               asc ? nr â‹› value - border->val_int() :
+                     nr â‹› value + border->val_int())
+
+            For WBT_VALUE_FOLLOWING, - becomes + and vice versa.
           */
           Item *cmp_arg;
           if (border_type == WBT_VALUE_PRECEDING ||
@@ -347,52 +335,36 @@
             cmp_arg = value;
           }
 
-          Item_bool_func2 *new_cmp;
-          Item_bool_func2 *new_inverse_cmp;
-          if ((border == m_frame->m_from) ? asc : !asc) {
-            new_cmp = new Item_func_lt(nr, cmp_arg);
-            /*
-              Inverse the above comparison operator to check if comparison has
-              to be continued using the next element in the order by list. We
-              continue to the next element in the list when the current elements
-              are found to be equal.
-            */
-            new_inverse_cmp = new Item_func_gt(nr, cmp_arg);
-          } else {
-            new_cmp = new Item_func_gt(nr, cmp_arg);
-            // See explanation in the if block
-            new_inverse_cmp = new Item_func_lt(nr, cmp_arg);
+          Item **left_args = new (thd->mem_root) Item *(nr);
+          Item **right_args = new (thd->mem_root) Item *(cmp_arg);
+          if (!cmp_arg->fixed) {
+            if (cmp_arg->fix_fields(thd, right_args)) {
+              return true;
+            }
           }
-
-          if (nr->result_type() == STRING_RESULT && !nr->is_temporal() &&
-              nr->data_type() != MYSQL_TYPE_JSON) {
-            /*
-              ORDER BY in window clause should work like plain ORDER BY,
-              ie.e. compare only the first max_sort_length bytes:
-            */
-            auto max_length = thd->variables.max_sort_length;
-            new_cmp->set_max_str_length(max_length);
-            new_inverse_cmp->set_max_str_length(max_length);
+          comparators[i] = Arg_comparator(left_args, right_args);
+          bool compare_func_set = false;
+          // In case of enum/set type, as ordering is based on
+          // numeric comparison we need to setup comparison
+          // functions to do numeric comparison.
+          if (nr->real_item()->type() == Item::FIELD_ITEM) {
+            Item_field *field = down_cast<Item_field *>(nr->real_item());
+            if (field->field->real_type() == MYSQL_TYPE_ENUM ||
+                field->field->real_type() == MYSQL_TYPE_SET) {
+              comparators[i].set_cmp_func(/*owner_arg=*/nullptr, left_args,
+                                          right_args, /*set_null_arg=*/true,
+                                          INT_RESULT);
+              compare_func_set = true;
+            }
           }
-          cmp = new Item_cond_or(new_cmp, cmp);
-          if (cmp == nullptr) return true;
-          inv_cmp = new Item_cond_or(new_inverse_cmp, inv_cmp);
-          if (inv_cmp == nullptr) return true;
+          if (!compare_func_set)
+            comparators[i].set_cmp_func(/*owner_arg=*/nullptr, left_args,
+                                        right_args, /*set_null_arg=*/true);
         }
-
-        cmp_ptr = &m_comparators[border_type][border == m_frame->m_to];
-        *cmp_ptr = cmp;
-        inv_cmp_ptr =
-            &m_inverse_comparators[border_type][border == m_frame->m_to];
-        *inv_cmp_ptr = inv_cmp;
-
+        m_comparators[border == m_frame->m_to] = comparators;
         break;
       }
     }
-
-    if (cmp != nullptr && cmp->fix_fields(thd, (Item **)cmp_ptr)) return true;
-    if (inv_cmp != nullptr && inv_cmp->fix_fields(thd, (Item **)inv_cmp_ptr))
-      return true;
   }
 
   return false;
@@ -443,17 +415,15 @@
 
   Query_block *curr = thd->lex->current_query_block();
 
-  List_iterator<Window> wi(curr->m_windows);
-  Window *w;
-  while ((w = wi++)) {
-    if (w->name() == nullptr) continue;
+  for (Window &w : curr->m_windows) {
+    if (w.name() == nullptr) continue;
 
     if (my_strcasecmp(system_charset_info, (*m_window)->printable_name(),
-                      w->printable_name()) == 0) {
+                      w.printable_name()) == 0) {
       (*m_window)->~PT_window();  // destroy the reference, no further need
 
       /* Replace with pointer to the definition */
-      (*m_window) = static_cast<PT_window *>(w);
+      (*m_window) = static_cast<PT_window *>(&w);
       (*m_window)->m_functions.base_list::push_back(wf);
       return false;
     }
@@ -472,14 +442,11 @@
     anything_changed = true;
   }
 
-  List_iterator<Cached_item> li(m_partition_items);
-  Cached_item *item;
-
   /**
     If we have partitioning and any one of the partitioning columns have
     changed since last row, we have a new partition.
   */
-  while ((item = li++)) {
+  for (Cached_item *item : m_partition_items) {
     anything_changed |= item->cmp();
   }
 
@@ -493,29 +460,56 @@
   }
 }
 
+/*
+  For a comparator from m_comparators, locate the Item_cache to update
+  with a new reference value (see Window::m_comparators).
+
+  The comparator is one of
+
+    candidate {<, >} current row
+    candidate {<, >} current row {-,+} constant
+
+  The second form is used when the the RANGE frame boundary is
+  WBT_VALUE_PRECEDING/WBT_VALUE_FOLLOWING, "constant" above being the
+  value specified in the query, cf. the setup in
+  Window::setup_range_expressions.
+*/
+static Item_cache *FindCacheInComparator(const Arg_comparator &cmp) {
+  Item *to_update;
+  if (cmp.get_right()->type() == Item::CACHE_ITEM) {
+    to_update = cmp.get_right();
+  } else {
+    to_update = down_cast<Item_func *>(cmp.get_right())->get_arg(0);
+  }
+  return down_cast<Item_cache *>(to_update);
+}
+
 void Window::reset_order_by_peer_set() {
   DBUG_TRACE;
 
-  List_iterator<Cached_item> li(m_order_by_items);
-  Cached_item *item;
-
-  while ((item = li++)) {
+  for (Cached_item *item : m_order_by_items) {
     /*
       A side-effect of doing this comparison, is to update the cache, so that
       when we compare the new value to itself later, it is in its peer set.
     */
     (void)item->cmp();
   }
+
+  // Update the reference value for ORDER BY elements as used by
+  // before_or_after_frame(). These are the actual items used in the three-way
+  // comparisons, whereas cached_item is used in in_new_order_by_peer_set().
+  for (int i = 0; i < 2; ++i) {
+    for (Arg_comparator &cmp : m_comparators[i]) {
+      FindCacheInComparator(cmp)->cache_value();
+    }
+  }
 }
 
 bool Window::in_new_order_by_peer_set(bool compare_all_order_by_items) {
   DBUG_TRACE;
   bool anything_changed = false;
 
-  List_iterator<Cached_item> li(m_order_by_items);
-  Cached_item *item;
-
-  while ((item = li++)) {
+  for (Cached_item *item : m_order_by_items) {
     anything_changed |= item->cmp();
     if (!compare_all_order_by_items) break;
   }
@@ -544,26 +538,18 @@
   */
   assert(
       border_type == WBT_CURRENT_ROW ||
-      (m_order_by_items.elements == 1 && (border_type == WBT_VALUE_PRECEDING ||
-                                          border_type == WBT_VALUE_FOLLOWING)));
+      (m_order_by_items.size() == 1 && (border_type == WBT_VALUE_PRECEDING ||
+                                        border_type == WBT_VALUE_FOLLOWING)));
 
-  List_iterator<Cached_item> li(m_order_by_items);
-  Cached_item *cur_row;
-  uint i = 0, j = 0;
-  Item_func *comparator = m_comparators[border_type][!before];
-  Item_func *inv_comparator = m_inverse_comparators[border_type][!before];
-  assert(comparator->functype() == Item_func::COND_OR_FUNC);
-  assert(inv_comparator->functype() == Item_func::COND_OR_FUNC);
-
-  // fix_items will have flattened the OR tree into a single multi-arg OR
-  List<Item> &args = *down_cast<Item_cond_or *>(comparator)->argument_list();
-  List<Item> &inv_args =
-      *down_cast<Item_cond_or *>(inv_comparator)->argument_list();
-  const PT_order_list *eff_ob = effective_order_by();
-  const SQL_I_List<ORDER> order = eff_ob->value;
-  ORDER *o_expr = order.first;
+  uint i = 0;
+  Bounds_checked_array<Arg_comparator> comparators = m_comparators[!before];
+
+  ORDER *o_expr = effective_order_by()->value.first;
+
+  for (auto it = m_order_by_items.begin(); it != m_order_by_items.end();
+       ++it, o_expr = o_expr->next, ++i) {
+    Cached_item *cur_row = *it;
 
-  while ((cur_row = li++)) {
     /*
       'cur_row' represents the value of the current row's windowing ORDER BY
       expression, and 'candidate' represents the same expression in the
@@ -578,14 +564,10 @@
     if (candidate->update_null_value()) return true;
 
     const bool asc = o_expr->direction == ORDER_ASC;
-    o_expr = o_expr->next;
 
     const bool nulls_at_infinity =  // true if NULLs stick to 'infinity'
         before ? asc : !asc;
 
-    Item_func *func = down_cast<Item_func *>(args[i++]);
-    Item_func *inv_func = down_cast<Item_func *>(inv_args[j++]);
-
     if (cur_row->null_value)  // Current row is NULL
     {
       /*
@@ -604,57 +586,33 @@
 
     if (candidate->null_value) return nulls_at_infinity;
 
-    /*
-      'comparator' is set to compare 'cur_row' with 'candidate' but it has an
-      old value of 'cur_row', update it.
-
-      'comparator' is one of
-      candidate {<, >} cur_row
-      candidate {<, >} cur_row {-,+} constant
-
-      The second form is used when the the RANGE frame boundary is
-      WBT_VALUE_PRECEDING/WBT_VALUE_FOLLOWING, "constant" above being the value
-      specified in the query, cf. setup in Window::setup_range_expressions.
-    */
-    Item *to_update = func->arguments()[1];
-    if (border_type == WBT_CURRENT_ROW) {
-    } else {
-      assert(i == 1);
-      Item_func *addop = down_cast<Item_func *>(func->arguments()[1]);
-      to_update = addop->arguments()[0];
+    // Figure out if the candidate row is before/after the frame defined
+    // wrt. the current row for which the window function value needs to be
+    // calculated (see m_comparators for more details). If we are unequal,
+    // we can say for sure based on this element alone that we are before
+    // or after; if we are equal, we need to go on to the next element (if any).
+    //
+    // NOTE: The reference value has already been set in
+    // reset_order_by_peer_set().
+    int val = comparators[i].compare();
+    if (val != 0) {
+      if (!asc) val = -val;
+      return before ? (val < 0) : (val > 0);
     }
 
-    cur_row->copy_to_Item_cache(down_cast<Item_cache *>(to_update));
-    if (func->val_int()) return true;
-    /*
-      Continue with the comparison for the next element in order by list
-      only when the current elements are found to be equal.
-      For Ex:
-      If we want to know if (2,x) is before (1,y): 2<1 is false, and 2>1
-      is true, so we exit below with a "no" reply.
-      If we want to know if (2,x) is before (2,y): 2<2 is false, and 2>2
-      is false, so they are equal and we compare x with y.
-      If only one element: if we want to know if x is before y: knowing
-      if x<y is true is enough; in that case we return "yes"; in other
-      cases, we know that x>=y is true and can return "no" without more
-      testing.
-    */
-    if (!li.is_last())
-      if (inv_func->val_int()) return false;
+    // Compared equal, so move to the next in the lexicographic comparison
+    // (if any).
   }
   return false;
 }
 
-bool Window::check_unique_name(List<Window> &windows) {
-  List_iterator<Window> w_it(windows);
-  Window *w;
-
+bool Window::check_unique_name(const List<Window> &windows) {
   if (m_name == nullptr) return false;
 
-  while ((w = w_it++)) {
-    if (w->name() == nullptr) continue;
+  for (const Window &w : windows) {
+    if (w.name() == nullptr) continue;
 
-    if (w != this && m_name->eq(w->name(), false)) {
+    if (&w != this && m_name->eq(w.name(), false)) {
       my_error(ER_WINDOW_DUPLICATE_NAME, MYF(0), printable_name());
       return true;
     }
@@ -771,15 +729,15 @@
   return o1 == nullptr && o2 == nullptr;  // equal so far, now also same length
 }
 
-void Window::reorder_and_eliminate_sorts(List<Window> &windows) {
-  const size_t n = windows.elements;
+void Window::reorder_and_eliminate_sorts(List<Window> *windows) {
+  const size_t n = windows->size();
   std::vector<bool> redundant(n, false);
   for (uint i = 0; i < n - 1; i++) {
     for (uint j = i + 1; j < n; j++) {
-      if (equal_sort(windows[i], windows[j])) {
+      if (equal_sort((*windows)[i], (*windows)[j])) {
         if (j > i + 1) {
           // move up to right after window[i], so we can share sort
-          windows.swap_elts(i + 1, j);
+          windows->swap_elts(i + 1, j);
         }  // else already in right place
         redundant[i + 1] = true;
         break;
@@ -788,7 +746,7 @@
   }
 
   for (uint i = 0; i < n; i++)
-    if (redundant[i]) windows[i]->m_sorting_order = nullptr;
+    if (redundant[i]) (*windows)[i]->m_sorting_order = nullptr;
 }
 
 bool Window::check_constant_bound(THD *thd, PT_border *border) {
@@ -1043,28 +1001,27 @@
   }
 };
 
-void Window::eliminate_unused_objects(List<Window> &windows) {
+void Window::eliminate_unused_objects(List<Window> *windows) {
   /*
     Go through the list. Check if a window is used by any function. If not,
     check if any other window (used by window functions) is actually inheriting
     from this window. If not, remove this window definition.
   */
-  List_iterator<Window> wi1(windows);
+  List_iterator<Window> wi1(*windows);
   for (Window *w1 = wi1++; w1 != nullptr; w1 = wi1++) {
-    if (w1->m_functions.elements == 0) {
+    if (w1->m_functions.is_empty()) {
       /*
         No window functions use this window, so check if other used window
         definitions inherit from this window.
       */
       bool window_used = false;
-      List_iterator<Window> wi2(windows);
-      for (const Window *w2 = wi2++; w2 != nullptr; w2 = wi2++) {
-        if (w2->m_functions.elements > 0) {
+      for (const Window &w2 : *windows) {
+        if (!w2.m_functions.is_empty()) {
           /*
             Go through the ancestor list and see if the current window
             definition is used by this window.
           */
-          for (const Window *w_a = w2->m_ancestor; w_a != nullptr;
+          for (const Window *w_a = w2.m_ancestor; w_a != nullptr;
                w_a = w_a->m_ancestor) {
             // Can't inherit from unnamed window:
             assert(w_a->m_name != nullptr);
@@ -1103,17 +1060,17 @@
   // Eliminate redundant ordering after unused window definitions are removed.
   // Otherwise we risk removing order for a window based on ordering of an
   // unused window.
-  if (windows.elements > 0) {
+  if (!windows->is_empty()) {
     reorder_and_eliminate_sorts(windows);
     /* Do this last, after any re-ordering */
-    windows[windows.elements - 1]->m_last = true;
+    (*windows)[windows->size() - 1]->m_last = true;
   }
 }
 
 bool Window::setup_windows1(THD *thd, Query_block *select,
                             Ref_item_array ref_item_array, TABLE_LIST *tables,
                             mem_root_deque<Item *> *fields,
-                            List<Window> &windows) {
+                            List<Window> *windows) {
   // Only possible at resolution time.
   assert(thd->lex->current_query_block()->first_execution);
   /*
@@ -1123,19 +1080,17 @@
   nesting_map save_allow_sum_func = thd->lex->allow_sum_func;
   thd->lex->allow_sum_func |= (nesting_map)1 << select->nest_level;
 
-  List_iterator<Window> w_it(windows);
-  Window *w;
-  while ((w = w_it++)) {
-    w->m_query_block = select;
-
-    if (w->m_partition_by != nullptr &&
-        w->resolve_window_ordering(thd, ref_item_array, tables, fields,
-                                   w->m_partition_by->value.first, true))
+  for (Window &w : *windows) {
+    w.m_query_block = select;
+
+    if (w.m_partition_by != nullptr &&
+        w.resolve_window_ordering(thd, ref_item_array, tables, fields,
+                                  w.m_partition_by->value.first, true))
       return true;
 
-    if (w->m_order_by != nullptr &&
-        w->resolve_window_ordering(thd, ref_item_array, tables, fields,
-                                   w->m_order_by->value.first, false))
+    if (w.m_order_by != nullptr &&
+        w.resolve_window_ordering(thd, ref_item_array, tables, fields,
+                                  w.m_order_by->value.first, false))
       return true;
   }
 
@@ -1148,34 +1103,36 @@
       we add the relation n->m to the adjacency list, cf.
       w1->set_ancestor(w2) vs. adj.add(i, j) below.
     */
-    AdjacencyList adj(windows.elements);
+    AdjacencyList adj(windows->size());
 
     /* Resolve inter-window references */
-    List_iterator<Window> wi1(windows);
-    Window *w1 = wi1++;
-    for (uint i = 0; i < windows.elements; i++, (w1 = wi1++)) {
-      if (w1->m_inherit_from != nullptr) {
-        bool resolved = false;
-        List_iterator<Window> wi2(windows);
-        Window *w2 = wi2++;
-        for (uint j = 0; j < windows.elements; j++, (w2 = wi2++)) {
-          if (w2->m_name == nullptr) continue;
-          String str;
-          if (my_strcasecmp(system_charset_info,
-                            w1->m_inherit_from->val_str(&str)->ptr(),
-                            w2->printable_name()) == 0) {
-            w1->set_ancestor(w2);
-            resolved = true;
-            adj.add(i, j);
-            break;
+    {
+      uint i = 0;
+      for (auto wi1 = windows->begin(); wi1 != windows->end(); ++wi1, ++i) {
+        Window *w1 = &*wi1;
+        if (w1->m_inherit_from != nullptr) {
+          bool resolved = false;
+          uint j = 0;
+          for (auto wi2 = windows->begin(); wi2 != windows->end(); ++wi2, ++j) {
+            Window *w2 = &*wi2;
+            if (w2->m_name == nullptr) continue;
+            String str;
+            if (my_strcasecmp(system_charset_info,
+                              w1->m_inherit_from->val_str(&str)->ptr(),
+                              w2->printable_name()) == 0) {
+              w1->set_ancestor(w2);
+              resolved = true;
+              adj.add(i, j);
+              break;
+            }
           }
-        }
 
-        if (!resolved) {
-          String str;
-          my_error(ER_WINDOW_NO_SUCH_WINDOW, MYF(0),
-                   w1->m_inherit_from->val_str(&str)->ptr());
-          return true;
+          if (!resolved) {
+            String str;
+            my_error(ER_WINDOW_NO_SUCH_WINDOW, MYF(0),
+                     w1->m_inherit_from->val_str(&str)->ptr());
+            return true;
+          }
         }
       }
     }
@@ -1186,10 +1143,10 @@
     }
 
     /* We now know all references are resolved and they form a DAG */
-    for (uint i = 0; i < windows.elements; i++) {
+    for (uint i = 0; i < windows->size(); i++) {
       if (adj.out_degree(i) != 0) {
         /* Only the root can specify partition. SR 10.c) */
-        const Window *const non_root = windows[i];
+        const Window *const non_root = (*windows)[i];
 
         if (non_root->m_partition_by != nullptr) {
           my_error(ER_WINDOW_NO_CHILD_PARTITIONING, MYF(0));
@@ -1199,7 +1156,7 @@
 
       if (adj.in_degree(i) == 0) {
         /* All windows that nobody depend on (leaves in DAG tree). */
-        const Window *const leaf = windows[i];
+        const Window *const leaf = (*windows)[i];
         const Window *seen_orderer = nullptr;
 
         /* SR 10.d) No redefines of ORDER BY along inheritance path */
@@ -1219,7 +1176,7 @@
           This window has at least one dependant SQL 2014 section
           7.15 <window clause> SR 10.e
         */
-        const Window *const ancestor = windows[i];
+        const Window *const ancestor = (*windows)[i];
         if (!ancestor->m_frame->m_originally_absent) {
           my_error(ER_WINDOW_NO_INHERIT_FRAME, MYF(0),
                    ancestor->printable_name());
@@ -1234,38 +1191,37 @@
     /* purecov: end */
   }
 
-  w_it.rewind();
-  while ((w = w_it++)) {
-    const PT_frame *f = w->frame();
-    const PT_order_list *o = w->effective_order_by();
+  for (Window &w : *windows) {
+    const PT_frame *f = w.frame();
+    const PT_order_list *o = w.effective_order_by();
 
-    if (w->m_order_by == nullptr && o != nullptr &&
-        w->m_frame->m_originally_absent) {
+    if (w.m_order_by == nullptr && o != nullptr &&
+        w.m_frame->m_originally_absent) {
       /*
         Since we had an empty frame specification, but inherit an ORDER BY (we
         cannot inherit a frame specification), we need to adjust the a priori
         border type now that we know what we inherit (not known before binding
         above).
       */
-      assert(w->m_frame->m_query_expression == WFU_RANGE);
-      w->m_frame->m_to->m_border_type = WBT_CURRENT_ROW;
+      assert(w.m_frame->m_query_expression == WFU_RANGE);
+      w.m_frame->m_to->m_border_type = WBT_CURRENT_ROW;
     }
 
-    if (w->check_unique_name(windows)) return true;
+    if (w.check_unique_name(*windows)) return true;
 
-    if (w->setup_ordering_cached_items(thd, select, o, false)) return true;
+    if (w.setup_ordering_cached_items(thd, select, o, false)) return true;
 
-    if (w->setup_ordering_cached_items(thd, select, w->effective_partition_by(),
-                                       true))
+    if (w.setup_ordering_cached_items(thd, select, w.effective_partition_by(),
+                                      true))
       return true;
 
-    if (w->check_window_functions1(thd, select)) return true;
+    if (w.check_window_functions1(thd, select)) return true;
 
     /*
       initialize the physical sorting order by merging the partition clause
       and the ordering clause of the window specification.
     */
-    (void)w->sorting_order(thd, select->is_implicitly_grouped());
+    (void)w.sorting_order(thd, select->is_implicitly_grouped());
 
     /* For now, we do not support EXCLUDE */
     if (f->m_exclusion != nullptr) {
@@ -1281,28 +1237,24 @@
     /*
       So we can determine if a row's value falls within range of current row
     */
-    if (f->m_query_expression == WFU_RANGE && w->setup_range_expressions(thd))
+    if (f->m_query_expression == WFU_RANGE && w.setup_range_expressions(thd))
       return true;
 
-    if (w->check_border_sanity1(thd)) return true;
+    if (w.check_border_sanity1(thd)) return true;
   }
 
   return false;
 }
 
 bool Window::check_window_functions2(THD *thd) {
-  List_iterator<Item_sum> li(m_functions);
-  Item *wf;
-
   m_opt_nth_row.m_offsets.clear();
   m_opt_lead_lag.m_offsets.clear();
   m_opt_nth_row.m_offsets.init(thd->mem_root);
   m_opt_lead_lag.m_offsets.init(thd->mem_root);
 
-  while ((wf = li++)) {
+  for (Item_sum &wf : m_functions) {
     Window_evaluation_requirements reqs;
-    Item_sum *wfs = down_cast<Item_sum *>(wf);
-    if (wfs->check_wf_semantics2(&reqs)) return true;
+    if (wf.check_wf_semantics2(&reqs)) return true;
     if (reqs.opt_nth_row.m_rowno > 0)
       m_opt_nth_row.m_offsets.push_back(reqs.opt_nth_row);
     /*
@@ -1327,25 +1279,28 @@
   return false;
 }
 
-bool Window::setup_windows2(THD *thd, List<Window> &windows) {
-  List_iterator<Window> w_it(windows);
-  Window *w;
-  while ((w = w_it++)) {
+bool Window::setup_windows2(THD *thd, List<Window> *windows) {
+  for (Window &w : *windows) {
     /*
       In execution of PS we need to check again in case ? parameters are used
       for window borders, or for offsets in window functions..
     */
-    if (w->check_border_sanity2(thd) || w->check_window_functions2(thd))
+    if (w.check_border_sanity2(thd) || w.check_window_functions2(thd))
       return true;
   }
   return false;
 }
 
 bool Window::make_special_rows_cache(THD *thd, TABLE *out_tbl) {
-  assert(m_special_rows_cache_max_length == 0);
   // Each row may come either from frame buffer or out-table
   size_t l = std::max((needs_buffering() ? m_frame_buffer->s->reclength : 0),
                       out_tbl->s->reclength);
+  if (m_special_rows_cache_max_length != 0) {
+    // Could already be set up, if the query block is planned twice
+    // (for in2exists).
+    assert(m_special_rows_cache_max_length == l);
+    return false;
+  }
   m_special_rows_cache_max_length = l;
   return !(m_special_rows_cache =
                (uchar *)thd->alloc((FBC_FIRST_KEY - FBC_LAST_KEY + 1) * l));
@@ -1368,42 +1323,33 @@
 
 void Window::destroy()  // called only at stmt destruction
 {
-  List_iterator<Cached_item> order_by_iter(m_order_by_items);
-  List_iterator<Cached_item> partition_iter(m_partition_items);
-  Cached_item *ci;
-  while ((ci = order_by_iter++)) {
-    if (ci != nullptr) ci->~Cached_item();
+  for (Cached_item *ci : m_order_by_items) {
+    ::destroy(ci);
   }
-  while ((ci = partition_iter++)) {
-    if (ci != nullptr) ci->~Cached_item();
+  for (Cached_item *ci : m_partition_items) {
+    ::destroy(ci);
   }
+  destroy_array(m_comparators[0].data(), m_comparators[0].size());
+  destroy_array(m_comparators[1].data(), m_comparators[1].size());
 }
 
 void Window::reset_lead_lag() {
-  List_iterator<Item_sum> li(m_functions);
-  Item_sum *f;
-  while ((f = li++)) {
-    if (f->sum_func() == Item_sum::LEAD_LAG_FUNC) {
-      down_cast<Item_lead_lag *>(f)->set_has_value(false);
-      down_cast<Item_lead_lag *>(f)->set_use_default(false);
+  for (Item_sum &f : m_functions) {
+    if (f.sum_func() == Item_sum::LEAD_LAG_FUNC) {
+      down_cast<Item_lead_lag &>(f).set_has_value(false);
+      down_cast<Item_lead_lag &>(f).set_use_default(false);
     }
   }
 }
 
 void Window::reset_execution_state(Reset_level level) {
   switch (level) {
-    case RL_FULL:
-      // Prepare a clean sheet for any new query resolution:
-      m_partition_items.clear();
-      m_order_by_items.clear();
-      m_sorting_order = nullptr;
-    // fall-through
     case RL_ROUND:
       if (m_frame_buffer != nullptr) (void)m_frame_buffer->empty_result_table();
       m_frame_buffer_total_rows = 0;
       m_frame_buffer_partition_offset = 0;
       m_part_row_number = 0;
-    // fall-through
+      [[fallthrough]];
     case RL_PARTITION:
       /*
         Forget positions in the frame buffer: they won't be valid in a new
@@ -1532,11 +1478,10 @@
 }
 
 void Window::reset_all_wf_state() {
-  List_iterator<Item_sum> ls(m_functions);
-  Item_sum *sum;
-  while ((sum = ls++)) {
-    for (bool f : {false, true}) {
-      (void)sum->walk(&Item::reset_wf_state, enum_walk::POSTFIX, (uchar *)&f);
+  for (Item_sum &sum : m_functions) {
+    for (bool framing : {false, true}) {
+      (void)sum.walk(&Item::reset_wf_state, enum_walk::POSTFIX,
+                     (uchar *)&framing);
     }
   }
 }
@@ -1546,11 +1491,44 @@
          m_query_block->join->m_windowing_steps;
 }
 
-double Window::compute_cost(double cost, List<Window> &windows) {
+double Window::compute_cost(double cost, const List<Window> &windows) {
   double total_cost = 0.0;
-  List_iterator<Window> li(windows);
-  Window *w;
-  while ((w = li++))
-    if (w->needs_sorting()) total_cost += cost;
+  for (const Window &w : windows)
+    if (w.needs_sorting()) total_cost += cost;
   return total_cost;
 }
+
+void Window::apply_temp_table(THD *thd, const Func_ptr_array &items_to_copy) {
+  for (Cached_item *&ci : m_partition_items) {
+    Item *item = FindReplacementOrReplaceMaterializedItems(
+        thd, ci->get_item()->real_item(), items_to_copy,
+        /*need_exact_match=*/true);
+    thd->change_item_tree(ci->get_item_ptr(), item);
+  }
+  for (Cached_item *&ci : m_order_by_items) {
+    Item *item = FindReplacementOrReplaceMaterializedItems(
+        thd, ci->get_item()->real_item(), items_to_copy,
+        /*need_exact_match=*/true);
+    thd->change_item_tree(ci->get_item_ptr(), item);
+  }
+  // Item_rank looks directly into the ORDER *, so we need to update
+  // that as well.
+  if (m_order_by != nullptr) {
+    ReplaceOrderItemsWithTempTableFields(thd, m_order_by->value.first,
+                                         items_to_copy);
+  }
+  for (int i = 0; i < 2; ++i) {
+    for (Arg_comparator &cmp : m_comparators[i]) {
+      Item **left_ptr = cmp.get_left_ptr();
+      Item *new_item = FindReplacementOrReplaceMaterializedItems(
+          thd, (*left_ptr)->real_item(), items_to_copy,
+          /*need_exact_match=*/true);
+      thd->change_item_tree(left_ptr, new_item);
+
+      Item_cache *cache = FindCacheInComparator(cmp);
+      cache->store(FindReplacementOrReplaceMaterializedItems(
+          thd, cache->get_example()->real_item(), items_to_copy,
+          /*need_exact_match=*/true));
+    }
+  }
+}
diff -Nru mysql-8.0-8.0.26/sql/window.h mysql-8.0-8.0.27/sql/window.h
--- mysql-8.0-8.0.26/sql/window.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/window.h	2021-09-28 11:46:34.000000000 +0000
@@ -178,13 +178,6 @@
   bool m_opt_last_row;
 
   /**
-    Can be true if first window after a join: we may need to restore the input
-    record after buffered window processing if EQRefIterator's caching logic
-    presumes the record hasn't been modified (when last qep_tab uses JT_EQ_REF).
-  */
-  bool m_needs_restore_input_row;
-
-  /**
     The last window to be evaluated at execution time.
   */
   bool m_last;
@@ -230,10 +223,12 @@
   st_lead_lag m_opt_lead_lag;
 
  protected:
-  const Window *m_ancestor;             ///< resolved from existing window name
-  List<Item_sum> m_functions;           ///< window functions based on 'this'
-  List<Cached_item> m_partition_items;  ///< items for the PARTITION BY columns
-  List<Cached_item> m_order_by_items;   ///< items for the ORDER BY exprs.
+  const Window *m_ancestor;    ///< resolved from existing window name
+  List<Item_sum> m_functions;  ///< window functions based on 'this'
+  Mem_root_array<Cached_item *>
+      m_partition_items;  ///< items for the PARTITION BY columns
+  Mem_root_array<Cached_item *>
+      m_order_by_items;  ///< items for the ORDER BY exprs.
 
   /*------------------------------------------------------------------------
    *
@@ -344,13 +339,16 @@
   }
 
   /**
-     Keys for m_frame_buffer_cache and m_special_rows_cache, for special
+     Keys for m_special_rows_cache, for special
      rows (see the comment on m_special_row_cache). Note that they are negative,
      so that they will never collide with actual row numbers in the frame.
      This allows us to treat them interchangeably with real row numbers
      as function arguments; e.g., bring_back_frame_row() can restore either
      a “normal� row from the frame, or one of the special rows, and does not
      need to take in separate flags for the two.
+     TODO(Chaithra): We have only one special key. Do we need the enum?
+     Also m_special_rows_cache/cache_length/max_cache_length should be looked
+     into.
   */
   enum Special_keys {
     /**
@@ -360,12 +358,10 @@
      the partition, and restore it later.
     */
     FBC_FIRST_IN_NEXT_PARTITION = -1,
-    /// The last row cached in the frame buffer; needed to resurrect input row
-    FBC_LAST_BUFFERED_ROW = -2,
     // Insert new values here.
     // And keep the ones below up to date.
     FBC_FIRST_KEY = FBC_FIRST_IN_NEXT_PARTITION,
-    FBC_LAST_KEY = FBC_LAST_BUFFERED_ROW,
+    FBC_LAST_KEY = FBC_FIRST_IN_NEXT_PARTITION,
   };
 
  protected:
@@ -503,18 +499,67 @@
    *
    *------------------------------------------------------------------------*/
  public:
+  /*
+    For RANGE bounds, we need to be able to check if a given row is
+    before the lower bound, or after the upper bound, as we don't know
+    ahead of time how many rows to skip (unlike for ROW bounds).
+    Often, the lower and upper bounds are the same, as they are
+    inclusive.
+
+    We solve this by having an array of comparators of the type
+
+       value â‹› <cache>(ref_value)
+
+    where â‹› is a three-way comparator, and <cache>(ref_value) is an
+    Item_cache where we can store the value of the reference row
+    before we invoke the comparison. For instance, if we have a
+    row bound such as
+
+        ... OVER (ORDER BY a,b) FROM t1
+
+     we will have an array with the two comparators
+
+        t1.a â‹› <cache>(a)
+        t1.b â‹› <cache>(b)
+
+     and when we evaluate the frame bounds for a given row, we insert
+     the reference values in the caches and then do the comparison to
+     figure out if we're before, in or after the bound. As this is a
+     lexicographic comparison, we only need to evaluate the second
+     comparator if the first one returns equality.
+
+     The expressions on the right-hand side can be somewhat more
+     complicated; say that we have a window specification like
+
+        ... OVER (ORDER BY a RANGE BETWEEN 2 PRECEDING AND 3 FOLLOWING)
+
+     In this case, the lower bound and upper bound are different
+     (both arrays will always contain only a single element):
+
+        Lower: t1.a â‹› <cache>(a) - 2
+        Upper: t1.a â‹› <cache>(a) + 3
+
+     ie., there is an Item_func_plus or Item_func_minus with some
+     constant expression as the second argument.
+
+     The comparators for the lower bound is stored in [0], and for
+     the upper bound in [1].
+   */
+  Bounds_checked_array<Arg_comparator> m_comparators[2];
+
   /**
-    RANGE bound determination computation; first index is a value of the
-    enum_window_border_type enum; second index 0 for the start bound, 1 for
-    the end bound. Each item is Item_func_lt/gt.
-  */
-  Item_func *m_comparators[WBT_VALUE_FOLLOWING + 1][2];
+    The logical ordering index (into LogicalOrderings) needed by this window's
+    PARTITION BY and ORDER BY clauses together (if any; else, 0). Used only by
+    the hypergraph join optimizer.
+   */
+  int m_ordering_idx;
+
   /**
-    Each item has inverse operation of the corresponding
-    comparator in m_comparators. Determines if comparison
-    should continue with next field in order by list.
-  */
-  Item_func *m_inverse_comparators[WBT_VALUE_FOLLOWING + 1][2];
+    Used temporarily by the hypergraph join optimizer to mark which windows
+    are referred to by a given ordering (so that one doesn't try to satisfy
+    a window's ordering by an ordering referring to that window).
+   */
+  bool m_mark;
 
  protected:
   /**
@@ -620,9 +665,10 @@
         m_static_aggregates(false),
         m_opt_first_row(false),
         m_opt_last_row(false),
-        m_needs_restore_input_row(false),
         m_last(false),
         m_ancestor(nullptr),
+        m_partition_items(*THR_MALLOC),
+        m_order_by_items(*THR_MALLOC),
         m_tmp_pos(nullptr, -1),
         m_frame_buffer_param(nullptr),
         m_frame_buffer(nullptr),
@@ -916,7 +962,7 @@
   static bool setup_windows1(THD *thd, Query_block *select,
                              Ref_item_array ref_item_array, TABLE_LIST *tables,
                              mem_root_deque<Item *> *fields,
-                             List<Window> &windows);
+                             List<Window> *windows);
   /**
     Like setup_windows1() but contains operations which must wait until
     the start of the execution phase.
@@ -926,7 +972,7 @@
 
     @return false if success, true if error
   */
-  static bool setup_windows2(THD *thd, List<Window> &windows);
+  static bool setup_windows2(THD *thd, List<Window> *windows);
 
   /**
     Check window definitions to remove unused windows. We do this
@@ -935,7 +981,7 @@
 
     @param windows         The list of windows defined for this select
   */
-  static void eliminate_unused_objects(List<Window> &windows);
+  static void eliminate_unused_objects(List<Window> *windows);
 
   /**
     Resolve and set up the PARTITION BY or an ORDER BY list of a window.
@@ -956,7 +1002,21 @@
   /**
     Return true if this window's name is not unique in windows
   */
-  bool check_unique_name(List<Window> &windows);
+  bool check_unique_name(const List<Window> &windows);
+
+  /**
+    Specify that this window is to be evaluated after a given
+    temporary table. This means that all expressions that have been
+    materialized (as given by items_to_copy) will be replaced with the
+    given temporary table fields. (If there are multiple materializations,
+    this function must be called for each of them in order.)
+
+    Only the hypergraph join optimizer uses this currently; the old
+    join optimizer instead uses Item_ref objects that point to the
+    base slice, which is then replaced at runtime depending on which
+    temporary table we are to evaluate from.
+  */
+  void apply_temp_table(THD *thd, const Func_ptr_array &items_to_copy);
 
   /**
     Set up cached items for an partition or an order by list
@@ -1048,14 +1108,9 @@
   bool is_last() const { return m_last; }
 
   /**
-    See #m_needs_restore_input_row
+    An override used by the hypergraph join optimizer only.
   */
-  void set_needs_restore_input_row(bool b) { m_needs_restore_input_row = b; }
-
-  /**
-    See #m_needs_restore_input_row
-  */
-  bool needs_restore_input_row() const { return m_needs_restore_input_row; }
+  void set_is_last(bool last) { m_last = last; }
 
   /**
     See #m_opt_nth_row
@@ -1329,19 +1384,13 @@
   void reset_round() { reset_execution_state(RL_ROUND); }
 
   /**
-    Reset resolution and execution state to prepare for next execution of a
-    prepared statement.
-  */
-  void reinit_before_use() { reset_execution_state(RL_FULL); }
-
-  /**
     Reset execution state for LEAD/LAG for the current row in partition.
   */
   void reset_lead_lag();
 
-  enum Reset_level { RL_FULL, RL_ROUND, RL_PARTITION };
-
  private:
+  enum Reset_level { RL_ROUND, RL_PARTITION };
+
   /// Common function for all types of resetting
   void reset_execution_state(Reset_level level);
 
@@ -1366,7 +1415,7 @@
 
     @returns the aggregated sorting costs of the windowing
   */
-  static double compute_cost(double cost, List<Window> &windows);
+  static double compute_cost(double cost, const List<Window> &windows);
 
  private:
   /**
@@ -1386,14 +1435,22 @@
     SQL standard when it comes to repeatability of non-deterministic (partially
     ordered) result sets for windowing inside a query, cf. #equal_sort.
     If more than two have the same ordering, the same applies, we only sort
-    before the first (sort equivalent) window.
+    before the first (sort equivalent) window. The hypergraph optimizer uses
+    the interesting order framework instead, eliding all sorts eliminated by
+    this function and possibly more.
+
+    Note that we do not merge windows that have the same ordering requirements,
+    so we may still get the extra materialization and multiple rounds of
+    buffering. Yet, we should get _correctness_, as long as materialization
+    preserves row ordering (which it does for all of our supported temporary
+    table types).
 
     If the result set is implicitly grouped, we also skip any sorting for
     windows.
 
     @param windows     list of windows
   */
-  static void reorder_and_eliminate_sorts(List<Window> &windows);
+  static void reorder_and_eliminate_sorts(List<Window> *windows);
 
   /**
     Return true of the physical[1] sort orderings for the two windows are the
diff -Nru mysql-8.0-8.0.26/sql/window_iterators.cc mysql-8.0-8.0.27/sql/window_iterators.cc
--- mysql-8.0-8.0.26/sql/window_iterators.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/window_iterators.cc	2021-09-28 11:46:34.000000000 +0000
@@ -61,7 +61,7 @@
 namespace {
 
 void SwitchSlice(JOIN *join, int slice_num) {
-  if (!join->ref_items[slice_num].is_null()) {
+  if (slice_num != -1 && !join->ref_items[slice_num].is_null()) {
     join->set_ref_item_slice(slice_num);
   }
 }
@@ -156,7 +156,8 @@
 
     /* Other error than duplicate error: Attempt to create a temporary table. */
     bool is_duplicate;
-    if (create_ondisk_from_heap(thd, t, error, true, &is_duplicate))
+    if (create_ondisk_from_heap(thd, t, error, /*insert_last_record=*/true,
+                                /*ignore_last_dup=*/true, &is_duplicate))
       return true;
 
     assert(t->s->db_type() == innodb_hton);
@@ -269,21 +270,6 @@
     }
   }
 
-  /*
-    The record is now ready in TABLE and can be saved. The window
-    function(s) on the window have not yet been evaluated, but
-    will be evaluated when we read frame rows back, before the end wf result
-    (usually ready in the last read when the last frame row has been read back)
-    can be produced. E.g. SUM(i): we save away all rows in partition.
-    We read back rows in current row's frame, producing the total SUM in the
-    last read back row. That value for SUM will then be used for the current row
-    output.
-  */
-
-  if (w->needs_restore_input_row()) {
-    w->save_special_row(Window::FBC_LAST_BUFFERED_ROW, w->frame_buffer());
-  }
-
   if (buffer_record_somewhere(thd, w, w->partition_rowno())) return true;
 
   w->set_last_rowno_in_cache(w->partition_rowno());
@@ -299,7 +285,7 @@
 #ifndef NDEBUG
                            bool for_nth_value)
 #else
-                           bool for_nth_value MY_ATTRIBUTE((unused)))
+                           bool for_nth_value [[maybe_unused]])
 #endif
 {
   int use_idx = 0;  // closest prior position found, a priori 0 (row 1)
@@ -404,8 +390,6 @@
 
   @param thd       The current thread
   @param w         The current window
-  @param out_param OUT table; if not nullptr, does copy_funcs() to OUT
-                   (fields only)
   @param rowno     The row number (in the partition) to set up
   @param reason    What kind of row to retrieve
   @param fno       Used with NTH_VALUE and LEAD/LAG to specify which
@@ -416,8 +400,8 @@
 
   @return true on error
 */
-bool bring_back_frame_row(THD *thd, Window *w, Temp_table_param *out_param,
-                          int64 rowno, Window_retrieve_cached_row_reason reason,
+bool bring_back_frame_row(THD *thd, Window *w, int64 rowno,
+                          Window_retrieve_cached_row_reason reason,
                           int fno = 0) {
   DBUG_TRACE;
   DBUG_PRINT("enter", ("rowno: %" PRId64 " reason: %d fno: %d", rowno,
@@ -441,9 +425,6 @@
   if (rowno == Window::FBC_FIRST_IN_NEXT_PARTITION) {
     do_fetch = true;
     w->restore_special_row(rowno, fb_rec);
-  } else if (rowno == Window::FBC_LAST_BUFFERED_ROW) {
-    do_fetch = w->row_has_fields_in_out_table() != w->last_rowno_in_cache();
-    if (do_fetch) w->restore_special_row(rowno, fb_rec);
   } else {
     assert(reason != Window_retrieve_cached_row_reason::WONT_UPDATE_HINT);
     do_fetch = w->row_has_fields_in_out_table() != rowno;
@@ -469,7 +450,7 @@
 
 #if !defined(NDEBUG)
   /*
-    Since we are copying back a row from the frame buffer to the input table's
+    Since we are copying back a row from the frame buffer to the output table's
     buffer, we will be copying into fields that are not necessarily marked as
     writeable. To eliminate problems with ASSERT_COLUMN_MARKED_FOR_WRITE, we
     set all fields writeable. This is only
@@ -491,15 +472,9 @@
 #endif
 
   if (!rc) {
-    if (out_param) {
-      if (copy_funcs(out_param, thd, CFT_FIELDS)) return true;
-      // fields are in IN and in OUT
-      if (rowno >= 1) w->set_row_has_fields_in_out_table(rowno);
-    } else
-      // we only wrote IN record, so OUT and IN are inconsistent
-      w->set_row_has_fields_in_out_table(0);
+    // fields are in OUT
+    if (rowno >= 1) w->set_row_has_fields_in_out_table(rowno);
   }
-
   return rc;
 }
 
@@ -572,7 +547,7 @@
 
       if (rowno_to_visit >= 1 && rowno_to_visit <= w->last_rowno_in_cache()) {
         if (bring_back_frame_row(
-                thd, w, param, rowno_to_visit,
+                thd, w, rowno_to_visit,
                 Window_retrieve_cached_row_reason::MISC_POSITIONS,
                 nths + fno++))
           return true;
@@ -582,7 +557,7 @@
         return true;
     }
     /* Bring back the fields for the output row */
-    if (bring_back_frame_row(thd, w, param, current_row, current_row_reason))
+    if (bring_back_frame_row(thd, w, current_row, current_row_reason))
       return true;
   }
 
@@ -949,7 +924,7 @@
       We need to reset functions. As part of it, their comparators need to
       update themselves to use the new row as base line. So, restore it:
     */
-    if (bring_back_frame_row(thd, &w, param, current_row,
+    if (bring_back_frame_row(thd, &w, current_row,
                              Window_retrieve_cached_row_reason::CURRENT))
       return true;
 
@@ -1033,7 +1008,7 @@
       w.save_pos(reason);
 
       /* Set up the non-wf fields for aggregating to the output row. */
-      if (bring_back_frame_row(thd, &w, param, rowno, reason)) return true;
+      if (bring_back_frame_row(thd, &w, rowno, reason)) return true;
 
       if (range_frame) {
         if (w.before_frame()) {
@@ -1111,7 +1086,7 @@
   */
   if (static_aggregate && current_row != 1) {
     /* Set up the correct non-wf fields for copying to the output row */
-    if (bring_back_frame_row(thd, &w, param, current_row,
+    if (bring_back_frame_row(thd, &w, current_row,
                              Window_retrieve_cached_row_reason::CURRENT))
       return true;
 
@@ -1144,7 +1119,7 @@
         bool is_last_row_in_peerset = true;
         if (rowno < upper) {
           if (bring_back_frame_row(
-                  thd, &w, param, rowno,
+                  thd, &w, rowno,
                   Window_retrieve_cached_row_reason::LAST_IN_PEERSET))
             return true;
           // Establish current row as base-line for peer set.
@@ -1157,7 +1132,7 @@
           rowno++;
           if (rowno < upper) {
             if (bring_back_frame_row(
-                    thd, &w, param, rowno,
+                    thd, &w, rowno,
                     Window_retrieve_cached_row_reason::LAST_IN_PEERSET))
               return true;
             // Compare only the first order by item.
@@ -1170,7 +1145,7 @@
       }
 
       if (bring_back_frame_row(
-              thd, &w, param, lower_limit - 1,
+              thd, &w, lower_limit - 1,
               Window_retrieve_cached_row_reason::FIRST_IN_FRAME))
         return true;
 
@@ -1194,7 +1169,7 @@
     if (have_first_value && (lower_limit <= last_rowno_in_cache)) {
       // We have seen first row of frame, FIRST_VALUE can be computed:
       if (bring_back_frame_row(
-              thd, &w, param, lower_limit,
+              thd, &w, lower_limit,
               Window_retrieve_cached_row_reason::FIRST_IN_FRAME))
         return true;
 
@@ -1211,8 +1186,7 @@
     if (have_last_value && !new_last_row) {
       // We have seen last row of frame, LAST_VALUE can be computed:
       if (bring_back_frame_row(
-              thd, &w, param, upper,
-              Window_retrieve_cached_row_reason::LAST_IN_FRAME))
+              thd, &w, upper, Window_retrieve_cached_row_reason::LAST_IN_FRAME))
         return true;
 
       w.set_rowno_in_frame(rn_in_frame);
@@ -1229,7 +1203,7 @@
       for (Window::st_offset nth : have_nth_value.m_offsets) {
         if (lower_limit + nth.m_rowno - 1 <= upper) {
           if (bring_back_frame_row(
-                  thd, &w, param, lower_limit + nth.m_rowno - 1,
+                  thd, &w, lower_limit + nth.m_rowno - 1,
                   Window_retrieve_cached_row_reason::MISC_POSITIONS, fno++))
             return true;
 
@@ -1243,8 +1217,7 @@
     if (new_last_row)  // Add new last row to framing WF's value
     {
       if (bring_back_frame_row(
-              thd, &w, param, upper,
-              Window_retrieve_cached_row_reason::LAST_IN_FRAME))
+              thd, &w, upper, Window_retrieve_cached_row_reason::LAST_IN_FRAME))
         return true;
 
       w.set_rowno_in_frame(upper - lower_limit + 1)
@@ -1302,7 +1275,7 @@
              rowno++) {
           /* Set up the non-wf fields for aggregating to the output row. */
           if (bring_back_frame_row(
-                  thd, &w, param, rowno,
+                  thd, &w, rowno,
                   Window_retrieve_cached_row_reason::FIRST_IN_FRAME))
             return true;
 
@@ -1353,6 +1326,12 @@
           }
         }
 
+        // Empty frame
+        if (rowno > upper && !found_first) {
+          w.set_first_rowno_in_range_frame(rowno);
+          w.set_last_rowno_in_range_frame(rowno - 1);
+        }
+
         if ((have_first_value || have_last_value) &&
             (rowno <= last_rowno_in_cache) && found_first) {
           /*
@@ -1368,7 +1347,7 @@
           if (have_last_value && w.last_rowno_in_range_frame() > rowno) {
             /* Set up the non-wf fields for aggregating to the output row. */
             if (bring_back_frame_row(
-                    thd, &w, param, w.last_rowno_in_range_frame(),
+                    thd, &w, w.last_rowno_in_range_frame(),
                     Window_retrieve_cached_row_reason::LAST_IN_FRAME))
               return true;
 
@@ -1394,7 +1373,7 @@
       for (rowno = first; rowno <= upper; rowno++) {
         w.save_pos(Window_retrieve_cached_row_reason::LAST_IN_FRAME);
         if (bring_back_frame_row(
-                thd, &w, param, rowno,
+                thd, &w, rowno,
                 Window_retrieve_cached_row_reason::LAST_IN_FRAME))
           return true;
 
@@ -1462,7 +1441,7 @@
               w.first_rowno_in_range_frame() + nth.m_rowno - 1;
           if (row_to_get <= w.last_rowno_in_range_frame()) {
             if (bring_back_frame_row(
-                    thd, &w, param, row_to_get,
+                    thd, &w, row_to_get,
                     Window_retrieve_cached_row_reason::MISC_POSITIONS, fno++))
               return true;
 
@@ -1491,7 +1470,7 @@
       int64 rowno;
       for (rowno = current_row; rowno <= last_rowno_in_cache; rowno++) {
         if (bring_back_frame_row(
-                thd, &w, param, rowno,
+                thd, &w, rowno,
                 Window_retrieve_cached_row_reason::LAST_IN_PEERSET))
           return true;
 
@@ -1511,7 +1490,7 @@
 
   if (optimizable && optimizable_primed) w.set_aggregates_primed(true);
 
-  if (bring_back_frame_row(thd, &w, param, current_row,
+  if (bring_back_frame_row(thd, &w, current_row,
                            Window_retrieve_cached_row_reason::CURRENT))
     return true;
 
@@ -1634,8 +1613,7 @@
         Bring back saved row for next partition.
       */
       if (bring_back_frame_row(
-              thd(), m_window, m_temp_table_param,
-              Window::FBC_FIRST_IN_NEXT_PARTITION,
+              thd(), m_window, Window::FBC_FIRST_IN_NEXT_PARTITION,
               Window_retrieve_cached_row_reason::WONT_UPDATE_HINT)) {
         return 1;
       }
@@ -1694,23 +1672,6 @@
       return 1;
     }
 
-    if (m_window->needs_restore_input_row()) {
-      /*
-        Reestablish last row read from input table in case it is needed
-        again before reading a new row. May be necessary if this is the
-        first window following after a join, cf. the caching presumption
-        in EQRefIterator. This logic can be removed if we move to copying
-        between out tmp record and frame buffer record, instead of
-        involving the in record. FIXME.
-      */
-      if (bring_back_frame_row(
-              thd(), m_window, nullptr /* no copy to OUT */,
-              Window::FBC_LAST_BUFFERED_ROW,
-              Window_retrieve_cached_row_reason::WONT_UPDATE_HINT)) {
-        return 1;
-      }
-    }
-
     if (err == 0) {
       return 0;
     }
diff -Nru mysql-8.0-8.0.26/sql/window_iterators.h mysql-8.0-8.0.27/sql/window_iterators.h
--- mysql-8.0-8.0.26/sql/window_iterators.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/window_iterators.h	2021-09-28 11:46:34.000000000 +0000
@@ -136,6 +136,69 @@
 /**
   BufferingWindowIterator is like WindowIterator, but deals with window
   functions that need to buffer rows.
+
+  If we don't need to buffer rows to evaluate the window functions, execution
+  is simple; see WindowIterator for details. In that case, we can just evaluate
+  the window functions as we go here, similar to the non-windowing flow.
+
+  If we do need buffering, though, we buffer the row in Read(). Next, we enter a
+  loop calling process_buffered_windowing_record, and conditionally return
+  the row. That is, if process_buffered_windowing_record was able to complete
+  evaluation of a row (cf. output_row_ready), including its window functions
+  given how much has already been buffered, we return a row, else we read more
+  rows, and postpone evaluation and returning till we have enough rows in the
+  buffer.
+
+  When we have read a full partition (or reach EOF), we evaluate any remaining
+  rows. Note that since we have to read one row past the current partition to
+  detect that that previous row was indeed the last row in a partition, we
+  need to re-establish the first row of the next partition when we are done
+  processing the current one. This is because the record will be overwritten
+  (many times) during evaluation of window functions in the current partition.
+
+  Usually [1], for window execution we have two or three tmp tables per
+  windowing step involved (although not all are always materialized;
+  they may be just streaming through StreamingIterator):
+
+  - The input table, corresponding to the parent iterator. Holds (possibly
+    sorted) records ready for windowing, sorted on expressions concatenated from
+    any PARTITION BY and ORDER BY clauses.
+
+  - The output table, as given by temp_table_param: where we write the evaluated
+    records from this step. Note that we may optimize away this last write if
+    we have no final ORDER BY or DISTINCT.
+
+  - If we have buffering, the frame buffer, held by
+    Window::m_frame_buffer[_param].
+
+  [1] This is not always the case. For the first window, if we have no
+  PARTITION BY or ORDER BY in the window, and there is more than one table
+  in the join, the logical input can consist of more than one table
+  (e.g. a NestedLoopIterator).
+
+  The first thing we do in Read() is:
+  We copy fields from IN to OUT (copy_fields), and evaluate non-WF functions
+  (copy_funcs): those functions then read their arguments from IN and store
+  their result into their result_field which is a field in OUT.
+
+  Then, let's take SUM(A+FLOOR(B)) OVER (ROWS 2 FOLLOWING) as example. Above,
+  we have stored A and the result of FLOOR in OUT. Now we buffer (save) the row
+  from OUT into the FB: For that, we copy both field A and FLOOR's result_field
+  from OUT to FB; a single copy_fields() call handles both copy jobs. Then we
+  look at the rows we have buffered and may realize that we have enough of the
+  frame to calculate SUM for a certain row (not necessarily the one we just
+  buffered; might be an earlier row, in our example it is the row which is 2
+  rows above the buffered row). If we do, to calculate WFs, we bring back the
+  frame's rows; which is done by: first copying field A and FLOOR's result_field
+  back from FB to OUT, thus getting in OUT all that SUM needs (A and FLOOR),
+  then giving that OUT row to SUM (SUM will then add the row's value to its
+  total; that happens in copy_funcs). After we have done that on all rows of the
+  frame, we have the values of SUM ready in OUT, we also restore the row which
+  owns this SUM value, in the same way as we restored the frame's rows, and we
+  return from Read() - we're done for this row. However, on the next Read()
+  call, we loop to check if we can calculate one more row with the frame
+  we have, and if so, we do, until we can't calculate any more rows -- in which
+  case we're back to just buffering.
  */
 class BufferingWindowIterator final : public RowIterator {
  public:
diff -Nru mysql-8.0-8.0.26/sql/xa.cc mysql-8.0-8.0.27/sql/xa.cc
--- mysql-8.0-8.0.26/sql/xa.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql/xa.cc	2021-09-28 11:46:34.000000000 +0000
@@ -304,7 +304,7 @@
 
       m_prepared_xa_trans.pop_front();
     }
-    free_root(&m_mem_root, MYF(0));
+    m_mem_root.Clear();
     m_mem_root_inited = false;
   }
 
diff -Nru mysql-8.0-8.0.26/sql-common/client_async_authentication.h mysql-8.0-8.0.27/sql-common/client_async_authentication.h
--- mysql-8.0-8.0.26/sql-common/client_async_authentication.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql-common/client_async_authentication.h	2021-09-28 11:46:34.000000000 +0000
@@ -42,6 +42,8 @@
   struct {
     uchar *pkt; /**< pointer into NET::buff */
     uint pkt_len;
+    /** a flag indicating that pkt, pkt_len contain valid packet to be reused */
+    bool pkt_received;
   } cached_server_reply;
   int packets_read, packets_written; /**< counters for send/received packets */
   int mysql_change_user;             /**< if it's mysql_change_user() */
@@ -106,6 +108,7 @@
   /** Used by caching_sha256_password plugin */
   int client_auth_plugin_state;
   authsm_function state_function;
+  uint current_factor_index;
 };
 
 /*
diff -Nru mysql-8.0-8.0.26/sql-common/client_authentication.cc mysql-8.0-8.0.27/sql-common/client_authentication.cc
--- mysql-8.0-8.0.26/sql-common/client_authentication.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql-common/client_authentication.cc	2021-09-28 11:46:34.000000000 +0000
@@ -323,7 +323,7 @@
     }
       ctx->client_auth_plugin_state =
           client_auth_sha256_password_plugin_status::SHA256_READ_PUBLIC_KEY;
-      /* FALLTHROUGH */
+      [[fallthrough]];
     case client_auth_sha256_password_plugin_status::SHA256_READ_PUBLIC_KEY:
       if (public_key == nullptr) {
         status = vio->read_packet_nonblocking(vio, &pkt, &io_result);
@@ -347,7 +347,7 @@
       ctx->client_auth_plugin_state =
           client_auth_sha256_password_plugin_status::
               SHA256_SEND_ENCRYPTED_PASSWORD;
-      /* FALLTHROUGH */
+      [[fallthrough]];
     case client_auth_sha256_password_plugin_status::
         SHA256_SEND_ENCRYPTED_PASSWORD: {
       char passwd_scramble[512];
@@ -419,9 +419,9 @@
     case VIO_TYPE_SSL: {
       if (mysql_get_ssl_cipher(mysql) == nullptr) return false;
     }
-    // Fall through
+      [[fallthrough]];
     case VIO_TYPE_SHARED_MEMORY:
-    // Fall through
+      [[fallthrough]];
     case VIO_TYPE_SOCKET:
       return true;
     default:
@@ -645,7 +645,7 @@
       ctx->client_auth_plugin_state =
           client_auth_caching_sha2_password_plugin_status::
               CACHING_SHA2_WRITING_RESPONSE;
-      /* FALLTHROUGH */
+      [[fallthrough]];
     case client_auth_caching_sha2_password_plugin_status::
         CACHING_SHA2_WRITING_RESPONSE:
       if (mysql->passwd[0] == 0) {
@@ -689,7 +689,7 @@
       ctx->client_auth_plugin_state =
           client_auth_caching_sha2_password_plugin_status::
               CACHING_SHA2_CHALLENGE_RESPONSE;
-      /* FALLTHROUGH */
+      [[fallthrough]];
     case client_auth_caching_sha2_password_plugin_status::
         CACHING_SHA2_CHALLENGE_RESPONSE:
       status = vio->read_packet_nonblocking(vio, &pkt, &io_result);
@@ -718,7 +718,7 @@
             client_auth_caching_sha2_password_plugin_status::
                 CACHING_SHA2_SEND_PLAIN_PASSWORD;
       return NET_ASYNC_NOT_READY;
-      /* FALLTHROUGH */
+      [[fallthrough]];
     case client_auth_caching_sha2_password_plugin_status::
         CACHING_SHA2_REQUEST_PUBLIC_KEY:
       /* If connection isn't secure attempt to get the RSA public key file */
@@ -741,7 +741,7 @@
       ctx->client_auth_plugin_state =
           client_auth_caching_sha2_password_plugin_status::
               CACHING_SHA2_READ_PUBLIC_KEY;
-      /* FALLTHROUGH */
+      [[fallthrough]];
     case client_auth_caching_sha2_password_plugin_status::
         CACHING_SHA2_READ_PUBLIC_KEY: {
       if (public_key == nullptr && mysql->options.extension &&
@@ -809,7 +809,7 @@
       ctx->client_auth_plugin_state =
           client_auth_caching_sha2_password_plugin_status::
               CACHING_SHA2_SEND_ENCRYPTED_PASSWORD;
-    /* FALLTHROUGH */
+      [[fallthrough]];
     case client_auth_caching_sha2_password_plugin_status::
         CACHING_SHA2_SEND_ENCRYPTED_PASSWORD: {
       status = vio->write_packet_nonblocking(vio, (uchar *)encrypted_password,
diff -Nru mysql-8.0-8.0.26/sql-common/client.cc mysql-8.0-8.0.27/sql-common/client.cc
--- mysql-8.0-8.0.26/sql-common/client.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql-common/client.cc	2021-09-28 11:46:34.000000000 +0000
@@ -62,6 +62,7 @@
 #include <algorithm>
 #include <string>
 
+#include "base64.h"
 #include "client_async_authentication.h"
 #include "compression.h"  // validate_compression_attributes
 #include "errmsg.h"
@@ -1026,8 +1027,8 @@
             default:
               assert(type <= SESSION_TRACK_END);
               /*
-               Unknown/unsupported type received, get the total length and move
-               past it.
+               Unknown/unsupported type received, get the total length and
+               move past it.
                */
 
               len = (size_t)net_field_length_ll_safe(mysql, &pos, length,
@@ -1040,7 +1041,7 @@
         }
         if (info) {
           int itype;
-          for (itype = SESSION_TRACK_BEGIN; itype < SESSION_TRACK_END;
+          for (itype = SESSION_TRACK_BEGIN; itype <= SESSION_TRACK_END;
                itype++) {
             if (info->info_list[itype].head_node) {
               info->info_list[itype].current_node =
@@ -1269,7 +1270,7 @@
 
 void free_rows(MYSQL_DATA *cur) {
   if (cur) {
-    free_root(cur->alloc, MYF(0));
+    cur->alloc->Clear();
     my_free(cur->alloc);
     my_free(cur);
   }
@@ -1382,9 +1383,9 @@
       break;
 
     /*
-      No server reply is expected after these commands so we reamin ready
-      for the next command.
-   */
+            No server reply is expected after these commands so we reamin
+            ready for the next command.
+     */
     case COM_STMT_SEND_LONG_DATA:
     case COM_STMT_CLOSE:
     case COM_REGISTER_SLAVE:
@@ -1392,9 +1393,9 @@
       break;
 
     /*
-      These replication commands are not supported and we bail out
-      by pretending that connection has been closed.
-    */
+            These replication commands are not supported and we bail out
+            by pretending that connection has been closed.
+     */
     case COM_BINLOG_DUMP:
     case COM_BINLOG_DUMP_GTID:
     case COM_TABLE_DUMP:
@@ -1402,25 +1403,25 @@
       break;
 
     /*
-      After COM_CHANGE_USER a regular authentication exchange
-      is performed.
-    */
+            After COM_CHANGE_USER a regular authentication exchange
+            is performed.
+     */
     case COM_CHANGE_USER:
       MYSQL_TRACE_STAGE(mysql, AUTHENTICATE);
       break;
 
     /*
-      Server replies to COM_STATISTICS with a single packet
-      containing a string with statistics information.
-    */
+            Server replies to COM_STATISTICS with a single packet
+            containing a string with statistics information.
+     */
     case COM_STATISTICS:
       MYSQL_TRACE_STAGE(mysql, WAIT_FOR_PACKET);
       break;
 
     /*
-      For all other commands we expect server to send regular reply which
-      is either OK, ERR or a result-set header.
-    */
+            For all other commands we expect server to send regular reply
+            which is either OK, ERR or a result-set header.
+     */
     default:
       MYSQL_TRACE_STAGE(mysql, WAIT_FOR_RESULT);
       break;
@@ -1567,9 +1568,7 @@
 void free_old_query(MYSQL *mysql) {
   DBUG_TRACE;
   if (mysql->field_alloc) {
-    free_root(mysql->field_alloc, MYF(0));
-    init_alloc_root(PSI_NOT_INSTRUMENTED, mysql->field_alloc, 8192,
-                    0); /* Assume rowlength < 8192 */
+    mysql->field_alloc->Clear();
   }
   mysql->fields = nullptr;
   mysql->field_count = 0; /* For API */
@@ -1675,6 +1674,24 @@
   return false;
 }
 
+static bool is_OK_packet(MYSQL *mysql, ulong length) {
+  return ((mysql->net.read_pos[0] == 0) ||
+          ((mysql->server_capabilities & CLIENT_DEPRECATE_EOF) &&
+           mysql->net.read_pos[0] == 254 && length < MAX_PACKET_LENGTH));
+}
+
+/**
+  Helper method to check if received packet is AuthNextFactor packet.
+
+  @param[in]   mysql              connection handle
+
+  @retval      true packet is AuthNextFactor packet
+  @retval      false if its not AuthNextFactor packet
+*/
+static bool is_auth_next_factor_packet(MYSQL *mysql) {
+  return ((mysql->server_capabilities & MULTI_FACTOR_AUTHENTICATION) &&
+          (mysql->net.read_pos[0] == AUTH_NEXT_FACTOR_PACKETTYPE));
+}
 /**
   Read a packet from network. If it's an OK packet, flush it.
 
@@ -1692,10 +1709,7 @@
   /* cli_safe_read always reads a non-empty packet. */
   assert(packet_length);
 
-  *is_ok_packet =
-      ((mysql->net.read_pos[0] == 0) ||
-       ((mysql->server_capabilities & CLIENT_DEPRECATE_EOF) &&
-        mysql->net.read_pos[0] == 254 && packet_length < MAX_PACKET_LENGTH));
+  *is_ok_packet = is_OK_packet(mysql, packet_length);
   if (*is_ok_packet) {
     read_ok_ex(mysql, packet_length);
 #if defined(CLIENT_PROTOCOL_TRACING)
@@ -1709,8 +1723,9 @@
   return false;
 }
 
-static net_async_status cli_flush_use_result_nonblocking(
-    MYSQL *mysql, bool flush_all_results MY_ATTRIBUTE((unused))) {
+static net_async_status cli_flush_use_result_nonblocking(MYSQL *mysql,
+                                                         bool flush_all_results
+                                                         [[maybe_unused]]) {
   DBUG_TRACE;
   /*
     flush_all_results is only used for mysql_stmt_close, and async is not
@@ -1762,7 +1777,7 @@
       if (read_com_query_metadata(mysql, pos, field_count)) {
         return;
       } else {
-        free_root(mysql->field_alloc, MYF(0));
+        mysql->field_alloc->Clear();
       }
     }
     MYSQL_TRACE_STAGE(mysql, WAIT_FOR_ROW);
@@ -1877,7 +1892,7 @@
   }
   free_rows(result->data);
   if (result->field_alloc) {
-    free_root(result->field_alloc, MYF(0));
+    result->field_alloc->Clear();
     my_free(result->field_alloc);
   }
   my_free(result->row);
@@ -1903,7 +1918,7 @@
     }
     free_rows(result->data);
     if (result->field_alloc) {
-      free_root(result->field_alloc, MYF(0));
+      result->field_alloc->Clear();
       my_free(result->field_alloc);
     }
     my_free(result->row);
@@ -2579,6 +2594,11 @@
   DBUG_TRACE;
 
   len = (ulong *)alloc->Alloc(sizeof(ulong) * field);
+  if (!len) {
+    set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate);
+    end_server(mysql);
+    return nullptr;
+  }
   size = sizeof(MYSQL_FIELD) * field_count;
 
   if (field_count != (size / sizeof(MYSQL_FIELD))) {
@@ -2622,14 +2642,13 @@
 
 static int alloc_field_alloc(MYSQL *mysql) {
   if (mysql->field_alloc == nullptr) {
-    mysql->field_alloc = (MEM_ROOT *)my_malloc(
-        key_memory_MYSQL, sizeof(MEM_ROOT), MYF(MY_WME | MY_ZEROFILL));
+    mysql->field_alloc =
+        new (my_malloc(key_memory_MYSQL, sizeof(MEM_ROOT), MYF(MY_WME)))
+            MEM_ROOT(PSI_NOT_INSTRUMENTED, 8192); /* Assume rowlength < 8192 */
     if (mysql->field_alloc == nullptr) {
       set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate);
       return 1;
     }
-    init_alloc_root(PSI_NOT_INSTRUMENTED, mysql->field_alloc, 8192,
-                    0); /* Assume rowlength < 8192 */
   }
   /* At this point the NET is receiving a resultset. max packet should be set */
   assert(mysql->net.max_packet_size != 0);
@@ -2697,7 +2716,7 @@
 
       if (!(mysql->fields = cli_read_metadata(mysql, field_count,
                                               protocol_41(mysql) ? 7 : 5))) {
-        free_root(mysql->field_alloc, MYF(0));
+        mysql->field_alloc->Clear();
         return 1;
       }
       break;
@@ -2757,7 +2776,7 @@
       }
 
       if (!mysql->fields) {
-        free_root(mysql->field_alloc, MYF(0));
+        mysql->field_alloc->Clear();
         *res = 1;
         return NET_ASYNC_COMPLETE;
       }
@@ -2825,8 +2844,8 @@
       return NET_ASYNC_COMPLETE;
     }
     async_context->rows_result_buffer = result;
-    init_alloc_root(PSI_NOT_INSTRUMENTED, result->alloc, 8192,
-                    0); /* Assume rowlength < 8192 */
+    ::new ((void *)result->alloc)
+        MEM_ROOT(PSI_NOT_INSTRUMENTED, 8192); /* Assume rowlength < 8192 */
     async_context->prev_row_ptr = &result->data;
     result->rows = 0;
     result->fields = fields;
@@ -2948,8 +2967,8 @@
     free_rows(result);
     return nullptr;
   }
-  init_alloc_root(PSI_NOT_INSTRUMENTED, result->alloc, 8192,
-                  0); /* Assume rowlength < 8192 */
+  ::new ((void *)result->alloc)
+      MEM_ROOT(PSI_NOT_INSTRUMENTED, 8192); /* Assume rowlength < 8192 */
   prev_ptr = &result->data;
   result->rows = 0;
   result->fields = fields;
@@ -2960,6 +2979,7 @@
   */
 
   while (*(cp = net->read_pos) == 0 || is_data_packet) {
+    ulong packet_left = pkt_len;
     result->rows++;
     if (!(cur = (MYSQL_ROWS *)result->alloc->Alloc(sizeof(MYSQL_ROWS))) ||
         !(cur->data = ((MYSQL_ROW)result->alloc->Alloc(
@@ -2973,9 +2993,17 @@
     to = (char *)(cur->data + fields + 1);
     end_to = to + pkt_len - 1;
     for (field = 0; field < fields; field++) {
+      uint length_len = 0;
+      if (packet_left < 1 ||
+          packet_left < (length_len = net_field_length_size(cp))) {
+        free_rows(result);
+        set_mysql_error(mysql, CR_MALFORMED_PACKET, unknown_sqlstate);
+        return nullptr;
+      }
       if ((len = (ulong)net_field_length(&cp)) ==
           NULL_LENGTH) { /* null field */
         cur->data[field] = nullptr;
+        packet_left -= length_len;
       } else {
         cur->data[field] = to;
         DBUG_EXECUTE_IF("simulate_invalid_packet_data", {
@@ -2991,6 +3019,7 @@
         to[len] = 0;
         to += len + 1;
         cp += len;
+        packet_left -= len + length_len;
         if (mysql_fields) {
           if (mysql_fields[field].max_length < len)
             mysql_fields[field].max_length = len;
@@ -3212,7 +3241,7 @@
   of MYSQL_EXTENSION structure).
 */
 
-MYSQL_EXTENSION *mysql_extension_init(MYSQL *mysql MY_ATTRIBUTE((unused))) {
+MYSQL_EXTENSION *mysql_extension_init(MYSQL *mysql [[maybe_unused]]) {
   MYSQL_EXTENSION *ext;
   DBUG_TRACE;
 
@@ -3279,12 +3308,12 @@
   NB! Errors are not reported until you do mysql_real_connect.
 */
 
-bool STDCALL mysql_ssl_set(MYSQL *mysql MY_ATTRIBUTE((unused)),
-                           const char *key MY_ATTRIBUTE((unused)),
-                           const char *cert MY_ATTRIBUTE((unused)),
-                           const char *ca MY_ATTRIBUTE((unused)),
-                           const char *capath MY_ATTRIBUTE((unused)),
-                           const char *cipher MY_ATTRIBUTE((unused))) {
+bool STDCALL mysql_ssl_set(MYSQL *mysql [[maybe_unused]],
+                           const char *key [[maybe_unused]],
+                           const char *cert [[maybe_unused]],
+                           const char *ca [[maybe_unused]],
+                           const char *capath [[maybe_unused]],
+                           const char *cipher [[maybe_unused]]) {
   bool result = false;
   DBUG_TRACE;
   result = mysql_options(mysql, MYSQL_OPT_SSL_KEY, key) +
@@ -3316,6 +3345,16 @@
     my_free(mysql->options.extension->ssl_crlpath);
     my_free(mysql->options.extension->tls_ciphersuites);
     my_free(mysql->options.extension->load_data_dir);
+    for (unsigned int idx = 0; idx < MAX_AUTHENTICATION_FACTOR; idx++) {
+      if (mysql->options.extension->client_auth_info[idx].plugin_name) {
+        my_free(mysql->options.extension->client_auth_info[idx].plugin_name);
+        mysql->options.extension->client_auth_info[idx].plugin_name = nullptr;
+      }
+      if (mysql->options.extension->client_auth_info[idx].password) {
+        my_free(mysql->options.extension->client_auth_info[idx].password);
+        mysql->options.extension->client_auth_info[idx].password = nullptr;
+      }
+    }
   }
   mysql->options.ssl_key = nullptr;
   mysql->options.ssl_cert = nullptr;
@@ -3345,7 +3384,7 @@
 
 */
 
-const char *STDCALL mysql_get_ssl_cipher(MYSQL *mysql MY_ATTRIBUTE((unused))) {
+const char *STDCALL mysql_get_ssl_cipher(MYSQL *mysql [[maybe_unused]]) {
   DBUG_TRACE;
   if (mysql->net.vio && mysql->net.vio->ssl_arg)
     return SSL_get_cipher_name((SSL *)mysql->net.vio->ssl_arg);
@@ -3789,6 +3828,7 @@
     nullptr,
     nullptr,
     nullptr,
+    nullptr,
     native_password_auth_client,
     native_password_auth_client_nonblocking};
 
@@ -3804,6 +3844,7 @@
     nullptr,
     nullptr,
     nullptr,
+    nullptr,
     clear_password_auth_client,
     nullptr};
 
@@ -3819,6 +3860,7 @@
     sha256_password_init,
     sha256_password_deinit,
     nullptr,
+    nullptr,
     sha256_password_auth_client,
     sha256_password_auth_client_nonblocking};
 
@@ -3834,6 +3876,7 @@
     caching_sha2_password_init,
     caching_sha2_password_deinit,
     nullptr,
+    nullptr,
     caching_sha2_password_auth_client,
     caching_sha2_password_auth_client_nonblocking};
 #ifdef AUTHENTICATION_WIN
@@ -4065,7 +4108,7 @@
   send_client_reply_packet()
 */
 static char *mysql_fill_packet_header(MYSQL *mysql, char *buff,
-                                      size_t buff_size MY_ATTRIBUTE((unused))) {
+                                      size_t buff_size [[maybe_unused]]) {
   NET *net = &mysql->net;
   char *end;
   uchar *buff_p = (uchar *)buff;
@@ -4479,6 +4522,11 @@
 static mysql_state_machine_status authsm_handle_second_authenticate_user(
     mysql_async_auth *ctx);
 static mysql_state_machine_status authsm_finish_auth(mysql_async_auth *ctx);
+static mysql_state_machine_status authsm_init_multi_auth(mysql_async_auth *ctx);
+static mysql_state_machine_status authsm_do_multi_plugin_auth(
+    mysql_async_auth *ctx);
+static mysql_state_machine_status authsm_handle_multi_auth_response(
+    mysql_async_auth *ctx);
 
 /**
   Asynchronous connection phase is divided into several smaller modules
@@ -4947,11 +4995,14 @@
   ulong pkt_len;
 
   /* there are cached data left, feed it to a plugin */
-  if (mpvio->cached_server_reply.pkt) {
+  if (mpvio->cached_server_reply.pkt_received) {
     *buf = mpvio->cached_server_reply.pkt;
     mpvio->cached_server_reply.pkt = nullptr;
     mpvio->packets_read++;
-    return mpvio->cached_server_reply.pkt_len;
+    pkt_len = mpvio->cached_server_reply.pkt_len;
+    mpvio->cached_server_reply.pkt_len = 0;
+    mpvio->cached_server_reply.pkt_received = false;
+    return pkt_len;
   }
 
   if (mpvio->packets_read == 0) {
@@ -5005,11 +5056,13 @@
   int error;
 
   /* there are cached data left, feed it to a plugin */
-  if (mpvio->cached_server_reply.pkt) {
+  if (mpvio->cached_server_reply.pkt_received) {
     *buf = mpvio->cached_server_reply.pkt;
     mpvio->cached_server_reply.pkt = nullptr;
     mpvio->packets_read++;
     *result = mpvio->cached_server_reply.pkt_len;
+    mpvio->cached_server_reply.pkt_len = 0;
+    mpvio->cached_server_reply.pkt_received = false;
     return NET_ASYNC_COMPLETE;
   }
 
@@ -5081,7 +5134,7 @@
   to send data to the server.
 
   It transparently wraps the data into a change user or authentication
-  handshake packet, if neccessary.
+  handshake packet, if necessary.
 */
 static int client_mpvio_write_packet(MYSQL_PLUGIN_VIO *mpv, const uchar *pkt,
                                      int pkt_len) {
@@ -5266,6 +5319,8 @@
   ctx.data_plugin = data_plugin;
   ctx.db = db;
   ctx.non_blocking = false;
+  /* set intial auth factor to be first factor */
+  ctx.current_factor_index = 0;
   ctx.state_function = authsm_begin_plugin_auth;
 
   do {
@@ -5311,6 +5366,7 @@
     ctx->data_plugin = data_plugin;
     ctx->db = db;
     ctx->non_blocking = true;
+    ctx->current_factor_index = 0;
     ctx->state_function = authsm_begin_plugin_auth;
     ASYNC_DATA(mysql)->connect_context->auth_context = ctx;
   }
@@ -5403,6 +5459,16 @@
   ctx->mpvio.mysql_change_user = ctx->data_plugin == nullptr;
   ctx->mpvio.cached_server_reply.pkt = (uchar *)ctx->data;
   ctx->mpvio.cached_server_reply.pkt_len = ctx->data_len;
+  /*
+    Sometimes plugin provided data (like scramble) can be optional, in such a
+    case we set pkt_received flag to false based on data length. This flag is
+    later checked in client_mpvio_read_packet() to decide on to read from
+    network or return the cached data.
+  */
+  if (ctx->data_len == 0)
+    ctx->mpvio.cached_server_reply.pkt_received = false;
+  else
+    ctx->mpvio.cached_server_reply.pkt_received = true;
   ctx->mpvio.read_packet = client_mpvio_read_packet;
   ctx->mpvio.write_packet = client_mpvio_write_packet;
   ctx->mpvio.read_packet_nonblocking = client_mpvio_read_packet_nonblocking;
@@ -5536,8 +5602,14 @@
 
   if (mysql->net.read_pos[0] == 254) {
     ctx->state_function = authsm_run_second_authenticate_user;
-  } else
-    ctx->state_function = authsm_finish_auth;
+  } else if (is_auth_next_factor_packet(mysql)) {
+    ctx->state_function = authsm_init_multi_auth;
+  } else {
+    if (is_OK_packet(mysql, ctx->pkt_length)) {
+      read_ok_ex(mysql, ctx->pkt_length);
+      ctx->state_function = authsm_finish_auth;
+    }
+  }
 
   return STATE_MACHINE_CONTINUE;
 }
@@ -5563,6 +5635,7 @@
         ctx->auth_plugin_name); /* safe as my_net_read always appends \0 */
     ctx->mpvio.cached_server_reply.pkt_len = ctx->pkt_length - len - 2;
     ctx->mpvio.cached_server_reply.pkt = mysql->net.read_pos + len + 2;
+    ctx->mpvio.cached_server_reply.pkt_received = true;
     DBUG_PRINT("info", ("change plugin packet from server for plugin %s",
                         ctx->auth_plugin_name));
   }
@@ -5574,6 +5647,11 @@
 
   MYSQL_TRACE(AUTH_PLUGIN, mysql, (ctx->auth_plugin->name));
 
+  DBUG_EXECUTE_IF("simulate_fido_testing", {
+    bool is_fido_testing = true;
+    mysql_plugin_options((struct st_mysql_client_plugin *)ctx->auth_plugin,
+                         "is_fido_testing", &is_fido_testing);
+  });
   ctx->mpvio.plugin = ctx->auth_plugin;
   ctx->res = ctx->auth_plugin->authenticate_user(
       (struct MYSQL_PLUGIN_VIO *)&ctx->mpvio, mysql);
@@ -5605,15 +5683,23 @@
 
   if (ctx->res != CR_OK_HANDSHAKE_COMPLETE) {
     /* Read what server thinks about out new auth message report */
-    if (cli_safe_read(mysql, nullptr) == packet_error) {
+    if ((ctx->pkt_length = cli_safe_read(mysql, nullptr)) == packet_error) {
       if (mysql->net.last_errno == CR_SERVER_LOST)
         set_mysql_extended_error(mysql, CR_SERVER_LOST, unknown_sqlstate,
                                  ER_CLIENT(CR_SERVER_LOST_EXTENDED),
                                  "reading final connect information", errno);
       return STATE_MACHINE_FAILED;
     }
+    if (is_auth_next_factor_packet(mysql)) {
+      ctx->state_function = authsm_init_multi_auth;
+      return STATE_MACHINE_CONTINUE;
+    } else if (is_OK_packet(mysql, ctx->pkt_length)) {
+      read_ok_ex(mysql, ctx->pkt_length);
+    } else {
+      set_mysql_error(mysql, CR_MALFORMED_PACKET, unknown_sqlstate);
+      return STATE_MACHINE_FAILED;
+    }
   }
-
   ctx->state_function = authsm_finish_auth;
   return STATE_MACHINE_CONTINUE;
 }
@@ -5632,6 +5718,127 @@
   return ctx->res ? STATE_MACHINE_FAILED : STATE_MACHINE_DONE;
 }
 
+/** Start multi factor authentication */
+static mysql_state_machine_status authsm_init_multi_auth(
+    mysql_async_auth *ctx) {
+  DBUG_TRACE;
+  MYSQL *mysql = ctx->mysql;
+  /*
+    If previous factor authentication is a success, read AuthNextFactor packet,
+    extract client plugin name and plugin specific data and initiate next factor
+    authentication.
+  */
+  size_t len;
+  ctx->auth_plugin_name = (char *)mysql->net.read_pos + 1;
+  len = strlen(ctx->auth_plugin_name);
+  /* adjust cached plugin data packet */
+  ctx->mpvio.cached_server_reply.pkt_len = ctx->pkt_length - len - 2;
+  ctx->mpvio.cached_server_reply.pkt = mysql->net.read_pos + len + 2;
+  ctx->mpvio.cached_server_reply.pkt_received = true;
+  DBUG_PRINT("info", ("AuthNextFactor plugin packet from server %s",
+                      ctx->auth_plugin_name));
+
+  /* update current factor index to point to nth factor */
+  ctx->current_factor_index++;
+  if (!(ctx->auth_plugin = (auth_plugin_t *)mysql_client_find_plugin(
+            mysql, ctx->auth_plugin_name,
+            MYSQL_CLIENT_AUTHENTICATION_PLUGIN))) {
+    set_mysql_extended_error(mysql, CR_AUTH_PLUGIN_CANNOT_LOAD,
+                             unknown_sqlstate,
+                             ER_CLIENT(CR_AUTH_PLUGIN_CANNOT_LOAD),
+                             ctx->auth_plugin->name, "plugin not available");
+    return STATE_MACHINE_FAILED;
+  }
+  if (mysql->options.extension) {
+    char **plugin_name =
+        &mysql->options.extension->client_auth_info[ctx->current_factor_index]
+             .plugin_name;
+    *plugin_name = static_cast<char *>(
+        my_malloc(PSI_NOT_INSTRUMENTED, len + 1, MYF(MY_WME | MY_ZEROFILL)));
+    if (!*plugin_name) {
+      set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate);
+      return STATE_MACHINE_FAILED;
+    }
+    memcpy(*plugin_name, ctx->auth_plugin_name, len);
+  }
+  DBUG_EXECUTE_IF("simulate_fido_testing", {
+    bool is_fido_testing = true;
+    mysql_plugin_options((struct st_mysql_client_plugin *)ctx->auth_plugin,
+                         "is_fido_testing", &is_fido_testing);
+  });
+  /* check if plugin is enabled */
+  if (check_plugin_enabled(mysql, ctx)) return STATE_MACHINE_FAILED;
+
+  /* reset password for next client auth plugin */
+  if (mysql->passwd) mysql->passwd[0] = 0;
+  /* get password */
+  if (mysql->options.extension &&
+      mysql->options.extension->client_auth_info[ctx->current_factor_index]
+          .password) {
+    my_free(mysql->passwd);
+    mysql->passwd = my_strdup(
+        key_memory_MYSQL,
+        mysql->options.extension->client_auth_info[ctx->current_factor_index]
+            .password,
+        MYF(0));
+  }
+  ctx->state_function = authsm_do_multi_plugin_auth;
+  return STATE_MACHINE_CONTINUE;
+}
+
+/** Invoke client plugins authentication method */
+static mysql_state_machine_status authsm_do_multi_plugin_auth(
+    mysql_async_auth *ctx) {
+  DBUG_TRACE;
+  MYSQL *mysql = ctx->mysql;
+  MYSQL_TRACE(AUTH_PLUGIN, mysql, (ctx->auth_plugin->name));
+
+  ctx->mpvio.plugin = ctx->auth_plugin;
+  ctx->res = ctx->auth_plugin->authenticate_user(
+      (struct MYSQL_PLUGIN_VIO *)&ctx->mpvio, mysql);
+
+  ctx->state_function = authsm_handle_multi_auth_response;
+  return STATE_MACHINE_CONTINUE;
+}
+
+/** Handle response from client plugins authentication method */
+static mysql_state_machine_status authsm_handle_multi_auth_response(
+    mysql_async_auth *ctx) {
+  DBUG_TRACE;
+  MYSQL *mysql = ctx->mysql;
+
+  if (ctx->res > CR_OK) {
+    if (ctx->res > CR_ERROR)
+      set_mysql_error(mysql, ctx->res, unknown_sqlstate);
+    else if (!mysql->net.last_errno)
+      set_mysql_error(mysql, CR_UNKNOWN_ERROR, unknown_sqlstate);
+    return STATE_MACHINE_FAILED;
+  }
+
+  if (ctx->res != CR_OK_HANDSHAKE_COMPLETE) {
+    /* Read what server thinks about new auth message report */
+    if ((ctx->pkt_length = cli_safe_read(mysql, nullptr)) == packet_error) {
+      if (mysql->net.last_errno == CR_SERVER_LOST)
+        set_mysql_extended_error(mysql, CR_SERVER_LOST, unknown_sqlstate,
+                                 ER_CLIENT(CR_SERVER_LOST_EXTENDED),
+                                 "reading final connect information", errno);
+      return STATE_MACHINE_FAILED;
+    }
+    if (is_auth_next_factor_packet(mysql)) {
+      ctx->state_function = authsm_init_multi_auth;
+      return STATE_MACHINE_CONTINUE;
+    } else if (is_OK_packet(mysql, ctx->pkt_length)) {
+      read_ok_ex(mysql, ctx->pkt_length);
+    } else {
+      set_mysql_error(mysql, CR_MALFORMED_PACKET, unknown_sqlstate);
+      return STATE_MACHINE_FAILED;
+    }
+  }
+  ctx->state_function = authsm_finish_auth;
+  assert(ctx->current_factor_index < 3);
+  return STATE_MACHINE_CONTINUE;
+}
+
 /** set some default attributes */
 static int set_connect_attributes(MYSQL *mysql, char *buff, size_t buf_len) {
   DBUG_TRACE;
@@ -5687,7 +5894,12 @@
   ctx.port = port;
   ctx.db = db;
   ctx.user = user;
-  ctx.passwd = passwd;
+  ENSURE_EXTENSIONS_PRESENT(&mysql->options);
+  /* password will be extracted from mysql options */
+  if (mysql->options.extension->client_auth_info[0].password)
+    ctx.passwd = mysql->options.extension->client_auth_info[0].password;
+  else
+    ctx.passwd = passwd;
   ctx.unix_socket = unix_socket;
   mysql->options.client_flag |= client_flag;
   ctx.client_flag = mysql->options.client_flag;
@@ -5753,7 +5965,12 @@
     ctx->port = port;
     ctx->db = db;
     ctx->user = user;
-    ctx->passwd = passwd;
+    ENSURE_EXTENSIONS_PRESENT(&mysql->options);
+    /* password will be extracted from mysql options */
+    if (mysql->options.extension->client_auth_info[0].password)
+      ctx->passwd = mysql->options.extension->client_auth_info[0].password;
+    else
+      ctx->passwd = passwd;
     ctx->unix_socket = unix_socket;
     mysql->options.client_flag |= client_flag;
     ctx->client_flag = mysql->options.client_flag;
@@ -6002,13 +6219,9 @@
     });
 
     if (gai_errno != 0) {
-      /*
-        For DBUG we are keeping the right message but for client we default to
-        historical error message.
-      */
       DBUG_PRINT("info", ("IPV6 getaddrinfo error %d", gai_errno));
       set_mysql_extended_error(mysql, CR_UNKNOWN_HOST, unknown_sqlstate,
-                               ER_CLIENT(CR_UNKNOWN_HOST), host, errno);
+                               ER_CLIENT(CR_UNKNOWN_HOST), host, gai_errno);
       return STATE_MACHINE_FAILED;
     }
 
@@ -7041,8 +7254,8 @@
     should also be reflected there.
 */
 
-void mysql_detach_stmt_list(LIST **stmt_list MY_ATTRIBUTE((unused)),
-                            const char *func_name MY_ATTRIBUTE((unused))) {
+void mysql_detach_stmt_list(LIST **stmt_list [[maybe_unused]],
+                            const char *func_name [[maybe_unused]]) {
 #ifndef MYSQL_SERVER
   /* Reset connection handle in all prepared statements. */
   LIST *element = *stmt_list;
@@ -8075,7 +8288,8 @@
     case MYSQL_OPT_SSL_FIPS_MODE: {
       char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
       ENSURE_EXTENSIONS_PRESENT(&mysql->options);
-      mysql->options.extension->ssl_fips_mode = *static_cast<const uint *>(arg);
+      mysql->options.extension->ssl_fips_mode =
+          *static_cast<const ulong *>(arg);
       if (set_fips_mode(mysql->options.extension->ssl_fips_mode,
                         ssl_err_string) != 1) {
         DBUG_PRINT("error", ("fips mode set error %s:", ssl_err_string));
@@ -8214,7 +8428,6 @@
                                             static_cast<const char *>(arg)))
         return 1;
       break;
-
     default:
       return 1;
   }
@@ -8434,7 +8647,6 @@
           mysql->options.extension ? mysql->options.extension->load_data_dir
                                    : nullptr;
       break;
-
     case MYSQL_OPT_NAMED_PIPE:          /* This option is deprecated */
     case MYSQL_INIT_COMMAND:            /* Cumulative */
     case MYSQL_OPT_CONNECT_ATTR_RESET:  /* Cumulative */
@@ -8502,7 +8714,34 @@
 
       break;
     }
-
+    case MYSQL_OPT_USER_PASSWORD: {
+      unsigned int factor = *static_cast<const uint *>(arg1) - 1;
+      ENSURE_EXTENSIONS_PRESENT(&mysql->options);
+      switch (factor) {
+        case 0:
+          my_free(mysql->options.extension->client_auth_info[0].password);
+          mysql->options.extension->client_auth_info[0].password =
+              my_strdup(key_memory_mysql_options,
+                        static_cast<const char *>(arg2), MYF(MY_FAE));
+          break;
+        case 1:
+          my_free(mysql->options.extension->client_auth_info[1].password);
+          mysql->options.extension->client_auth_info[1].password =
+              my_strdup(key_memory_mysql_options,
+                        static_cast<const char *>(arg2), MYF(MY_FAE));
+          break;
+        case 2:
+          my_free(mysql->options.extension->client_auth_info[2].password);
+          mysql->options.extension->client_auth_info[2].password =
+              my_strdup(key_memory_mysql_options,
+                        static_cast<const char *>(arg2), MYF(MY_FAE));
+          break;
+        default:
+          set_mysql_error(mysql, CR_INVALID_FACTOR_NO, unknown_sqlstate);
+          return 1;
+      }
+      break;
+    }
     default:
       return 1;
   }
@@ -8790,7 +9029,7 @@
       ctx->client_auth_plugin_state = (int)
           client_auth_native_password_plugin_status::NATIVE_WRITING_RESPONSE;
 
-      /* fallthrough */
+      [[fallthrough]];
 
     case client_auth_native_password_plugin_status::NATIVE_WRITING_RESPONSE:
       if (mysql->passwd[0]) {
diff -Nru mysql-8.0-8.0.26/sql-common/client_plugin.cc mysql-8.0-8.0.27/sql-common/client_plugin.cc
--- mysql-8.0-8.0.26/sql-common/client_plugin.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql-common/client_plugin.cc	2021-09-28 11:46:34.000000000 +0000
@@ -331,7 +331,7 @@
 
   mysql_mutex_init(key_mutex_LOCK_load_client_plugin, &LOCK_load_client_plugin,
                    MY_MUTEX_INIT_SLOW);
-  init_alloc_root(key_memory_root, &mem_root, 128, 128);
+  ::new ((void *)&mem_root) MEM_ROOT(key_memory_root, 128);
 
   memset(&plugin_list, 0, sizeof(plugin_list));
 
@@ -370,7 +370,7 @@
 
   memset(&plugin_list, 0, sizeof(plugin_list));
   initialized = false;
-  free_root(&mem_root, MYF(0));
+  mem_root.Clear();
   mysql_mutex_destroy(&LOCK_load_client_plugin);
 }
 
@@ -584,3 +584,12 @@
   if (!plugin || !plugin->options) return 1;
   return plugin->options(option, value);
 }
+
+/* see <mysql/client_plugin.h> for a full description */
+int mysql_plugin_get_option(struct st_mysql_client_plugin *plugin,
+                            const char *option, void *value) {
+  DBUG_TRACE;
+  /* does the plugin support options call? */
+  if (!plugin || !plugin->get_options) return 1;
+  return plugin->get_options(option, value);
+}
diff -Nru mysql-8.0-8.0.26/sql-common/compression.cc mysql-8.0-8.0.27/sql-common/compression.cc
--- mysql-8.0-8.0.26/sql-common/compression.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql-common/compression.cc	2021-09-28 11:46:34.000000000 +0000
@@ -91,10 +91,9 @@
   @retval 0  success
   @retval 1  error or warnings
 */
-bool validate_compression_attributes(
-    std::string algorithm_names,
-    std::string channel_name MY_ATTRIBUTE((unused)),
-    bool ignore_errors MY_ATTRIBUTE((unused))) {
+bool validate_compression_attributes(std::string algorithm_names,
+                                     std::string channel_name [[maybe_unused]],
+                                     bool ignore_errors [[maybe_unused]]) {
   DBUG_TRACE;
   /*
     Note: there's no real limit like that to the string. But, since the
diff -Nru mysql-8.0-8.0.26/sql-common/net_serv.cc mysql-8.0-8.0.27/sql-common/net_serv.cc
--- mysql-8.0-8.0.26/sql-common/net_serv.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/sql-common/net_serv.cc	2021-09-28 11:46:34.000000000 +0000
@@ -261,7 +261,7 @@
   @param check_buffer  Whether to check the socket buffer.
 */
 
-void net_clear(NET *net, bool check_buffer MY_ATTRIBUTE((unused))) {
+void net_clear(NET *net, bool check_buffer [[maybe_unused]]) {
   DBUG_TRACE;
 
   DBUG_EXECUTE_IF("simulate_bad_field_length_1", {
@@ -305,8 +305,7 @@
   @retval false   Operation should not be retried. Fatal error.
 */
 
-static bool net_should_retry(NET *net,
-                             uint *retry_count MY_ATTRIBUTE((unused))) {
+static bool net_should_retry(NET *net, uint *retry_count [[maybe_unused]]) {
   bool retry;
 
 #ifndef MYSQL_SERVER
@@ -810,7 +809,7 @@
         goto done;
       }
       net_async->async_operation = NET_ASYNC_OP_WRITING;
-      /* fallthrough */
+      [[fallthrough]];
     case NET_ASYNC_OP_WRITING:
       status = net_write_vector_nonblocking(net, &rc);
       if (status == NET_ASYNC_COMPLETE) {
@@ -1582,7 +1581,7 @@
       net_async->async_bytes_wanted = count;
       net_async->async_operation = NET_ASYNC_OP_READING;
       net_async->cur_pos = net->buff + net->where_b;
-      /* fallthrough */
+      [[fallthrough]];
     case NET_ASYNC_OP_READING:
       rc = net_read_available(net, net_async->async_bytes_wanted);
       if (rc == packet_error) {
@@ -1599,7 +1598,7 @@
         return NET_ASYNC_NOT_READY;
       }
       net_async->async_operation = NET_ASYNC_OP_COMPLETE;
-      /* fallthrough */
+      [[fallthrough]];
     case NET_ASYNC_OP_COMPLETE:
       net_async->async_bytes_wanted = 0;
       net_async->async_operation = NET_ASYNC_OP_IDLE;
@@ -1677,8 +1676,14 @@
     case NET_ASYNC_PACKET_READ_IDLE:
       net_async->async_packet_read_state = NET_ASYNC_PACKET_READ_HEADER;
       net->reading_or_writing = 0;
-      /* fallthrough */
+      [[fallthrough]];
     case NET_ASYNC_PACKET_READ_HEADER:
+      /*
+        We should reset compress_packet_nr even before reading the header
+        because reading can fail and then the compressed packet number wont get
+        reset
+      */
+      net->compress_pkt_nr = net->pkt_nr;
       if (net_read_packet_header_nonblocking(net, &err) ==
           NET_ASYNC_NOT_READY) {
         return NET_ASYNC_NOT_READY;
@@ -1721,7 +1726,7 @@
         goto error;
 
       net_async->async_packet_read_state = NET_ASYNC_PACKET_READ_BODY;
-      /* fallthrough */
+      [[fallthrough]];
     case NET_ASYNC_PACKET_READ_BODY:
       if (net_read_data_nonblocking(net, net_async->async_packet_length,
                                     &err) == NET_ASYNC_NOT_READY) {
@@ -1731,7 +1736,7 @@
       if (err) goto error;
 
       net_async->async_packet_read_state = NET_ASYNC_PACKET_READ_COMPLETE;
-      /* fallthrough */
+      [[fallthrough]];
 
     case NET_ASYNC_PACKET_READ_COMPLETE:
       net_async->async_packet_read_state = NET_ASYNC_PACKET_READ_IDLE;
@@ -2057,6 +2062,12 @@
 
   net->reading_or_writing = 1;
 
+  /*
+    We should reset compress_packet_nr even before reading the header because
+    reading can fail and then the compressed packet number wont get reset
+  */
+  net->compress_pkt_nr = net->pkt_nr;
+
   /* Retrieve packet length and number. */
   if (net_read_packet_header(net)) goto error;
 
diff -Nru mysql-8.0-8.0.26/sql-common/oci/signing_key.cc mysql-8.0-8.0.27/sql-common/oci/signing_key.cc
--- mysql-8.0-8.0.26/sql-common/oci/signing_key.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql-common/oci/signing_key.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,154 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA  */
+
+#include "sql-common/oci/signing_key.h"
+#include <openssl/crypto.h>
+#include <iostream>
+#include <memory>
+#include "sql-common/oci/ssl.h"
+
+namespace oci {
+// custom unique_ptr deleter since OPENSSL_free is a macro
+static void SSL_memory_deallocator(void *p) { OPENSSL_free(p); }
+
+void log_error(const std::string &message) { std::cerr << message; }
+
+Data Signing_Key::sign(const std::string &message) {
+  return sign(message.c_str(), message.length());
+}
+
+Data Signing_Key::sign(const void *message, size_t length) {
+  if (m_private_key == nullptr) return {};
+
+  size_t slen = 0;
+
+  /* Create the Message Digest Context */
+  ssl::EVP_MD_CTX_ptr evp_md_ctx{EVP_MD_CTX_create()};
+  if (!evp_md_ctx) return {};
+
+  /* Initialise the DigestSign operation, using SHA-256 message digest. */
+  if (1 != EVP_DigestSignInit(evp_md_ctx.get(), nullptr, EVP_sha256(), nullptr,
+                              m_private_key.get()))
+    return {};
+
+  /* Call update with the message */
+  if (1 != EVP_DigestSignUpdate(evp_md_ctx.get(), message, length)) return {};
+
+  /* Finalise the DigestSign operation */
+  /* First call EVP_DigestSignFinal with a nullptr sig parameter to obtain the
+   * length of the signature. Length is returned in slen */
+  if (1 != EVP_DigestSignFinal(evp_md_ctx.get(), nullptr, &slen)) return {};
+  /* Allocate memory for the signature based on size in slen */
+  std::unique_ptr<unsigned char, decltype(&SSL_memory_deallocator)> signature(
+      static_cast<unsigned char *>(
+          OPENSSL_malloc(sizeof(unsigned char) * slen)),
+      &SSL_memory_deallocator);
+
+  if (!signature) return {};
+
+  /* Obtain the signature */
+  if (1 != EVP_DigestSignFinal(evp_md_ctx.get(), signature.get(), &slen))
+    return {};
+
+  // Success.
+  return {signature.get(), signature.get() + slen};
+}
+
+/**
+ * Constructor.
+ * Read the key from the file.
+ */
+Signing_Key::Signing_Key(const std::string &file_name)
+    : m_private_key{EVP_PKEY_new()} {
+  std::unique_ptr<FILE, decltype(&fclose)> fp(fopen(file_name.c_str(), "rb"),
+                                              &fclose);
+  if (!fp) {
+    log_error("Cannot open signing key file " + file_name + "\n");
+    return;
+  }
+
+  if (!m_private_key) {
+    log_error("Cannot create private key");
+    return;
+  }
+
+  auto key = m_private_key.release();
+  key = PEM_read_PrivateKey(fp.get(), &key, nullptr, nullptr);
+  if (key == nullptr) {
+    log_error("Cannot read signing key file " + file_name);
+    return;
+  }
+  m_private_key = ssl::EVP_PKEY_ptr{key};
+}
+
+/**
+ * Constructor.
+ * Read the key from the memory string.
+ */
+Signing_Key::Signing_Key(ssl::Key_Content key_content) {
+  void *ptr;
+  ptr = static_cast<void *>(const_cast<char *>(key_content.c_str()));
+  oci::ssl::BIO_ptr key_bio{BIO_new_mem_buf(ptr, key_content.size())};
+  if (!key_bio) return;
+
+  m_private_key = ssl::EVP_PKEY_ptr{
+      PEM_read_bio_PrivateKey(key_bio.get(), nullptr, nullptr, nullptr)};
+  if (!m_private_key) {
+    log_error("Error reading the private key " + key_content);
+    return;
+  }
+}
+
+/**
+ * Constructor.
+ * Generate a key.
+ */
+Signing_Key::Signing_Key() {
+  // Generate a new RSA private key to be used for request signing.
+  std::unique_ptr<RSA, decltype(&::RSA_free)> rsa(RSA_new(), ::RSA_free);
+  std::unique_ptr<BIGNUM, decltype(&::BN_free)> bn(BN_new(), ::BN_free);
+
+  if (1 == BN_set_word(bn.get(), RSA_F4)) {
+    if (1 == RSA_generate_key_ex(rsa.get(), 2048, bn.get(), nullptr)) {
+      m_private_key = ssl::EVP_PKEY_ptr{EVP_PKEY_new()};
+      // Convert RSA to PKEY
+      if (1 == EVP_PKEY_set1_RSA(m_private_key.get(), rsa.get())) {
+        // Extract the public key from the private key.
+        oci::ssl::BIO_ptr bio{BIO_new(BIO_s_mem())};
+        if (PEM_write_bio_RSA_PUBKEY(bio.get(), rsa.get())) {
+          size_t len = BIO_pending(bio.get());
+          std::vector<char> read_buffer;
+          read_buffer.resize(len + 1, '\0');
+          BIO_read(bio.get(), read_buffer.data(), len);
+          m_public_key = read_buffer.data();
+        }
+      }
+    }
+  }
+}
+
+}  // namespace oci
diff -Nru mysql-8.0-8.0.26/sql-common/oci/signing_key.h mysql-8.0-8.0.27/sql-common/oci/signing_key.h
--- mysql-8.0-8.0.26/sql-common/oci/signing_key.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql-common/oci/signing_key.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,62 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA  */
+
+#ifndef OCI_SIGNING_KEYS_H
+#define OCI_SIGNING_KEYS_H
+
+#include <string>
+
+#include "sql-common/oci/ssl.h"
+#include "sql-common/oci/ssl_ptr.h"
+
+namespace oci {
+class Signing_Key {
+  /**
+   * @brief Private key from a local file, used to Signing_Key::sign() requests.
+   *
+   */
+ private:
+  ssl::EVP_PKEY_ptr m_private_key;
+  std::string m_public_key;
+
+ public:
+  Signing_Key(const std::string &file_name);
+  Signing_Key(ssl::Key_Content);
+  Signing_Key();
+  Signing_Key(const Signing_Key &) = delete;
+  Signing_Key &operator=(const Signing_Key &) = delete;
+  Signing_Key(Signing_Key &&) = default;
+  Signing_Key &operator=(Signing_Key &&) = delete;
+  operator bool() const { return m_private_key.operator bool(); }
+  std::string get_public_key() { return m_public_key; }
+
+  // main operation
+  Data sign(const std::string &message);
+  Data sign(const void *message, size_t length);
+};
+}  // namespace oci
+#endif
diff -Nru mysql-8.0-8.0.26/sql-common/oci/ssl.cc mysql-8.0-8.0.27/sql-common/oci/ssl.cc
--- mysql-8.0-8.0.26/sql-common/oci/ssl.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql-common/oci/ssl.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,153 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA  */
+
+#include "ssl.h"
+#include <openssl/err.h>
+#include <regex>
+#include <sstream>
+#include "ssl_ptr.h"
+
+#include <cassert>
+#include <fstream>
+#include <iomanip>
+#include <ios>
+#include <iostream>
+
+namespace oci {
+
+namespace ssl {
+/**
+ * BASE64 encode encrypted data.
+ */
+std::string base64_encode(const void *binary, size_t length) {
+  std::unique_ptr<BIO, decltype(&BIO_free_all)> b64(BIO_new(BIO_f_base64()),
+                                                    &BIO_free_all);
+  BIO_set_flags(b64.get(), BIO_FLAGS_BASE64_NO_NL);
+  auto *sink = BIO_new(BIO_s_mem());
+  BIO_push(b64.get(), sink);
+  BIO_write(b64.get(), binary, static_cast<int>(length));
+  if (BIO_flush(b64.get()) != 1) return {};
+  const char *encoded;
+  const size_t result_length = BIO_get_mem_data(sink, &encoded);
+  return {encoded, result_length};
+}
+
+std::string base64_encode(const Data &data) {
+  if (data.empty()) return {};
+  return base64_encode(data.data(), data.size());
+}
+
+/**
+ * BASE64 decode an encoded string.
+ */
+Data base64_decode(const std::string &encoded) {
+  if (encoded.empty()) return {};
+  std::unique_ptr<BIO, decltype(&BIO_free_all)> b64(BIO_new(BIO_f_base64()),
+                                                    &BIO_free_all);
+  BIO_set_flags(b64.get(), BIO_FLAGS_BASE64_NO_NL);
+  auto *source = BIO_new_mem_buf(
+      const_cast<void *>(static_cast<const void *>(encoded.c_str())),
+      -1);  // read-only source
+  BIO_push(b64.get(), source);
+
+  // Each byte gets encoded into 3 characters. +1 for \0
+  const auto maxlen = encoded.length() / 4 * 3 + 1;
+  Data decoded(maxlen);
+  assert(decoded.size() == maxlen);
+  const int len = BIO_read(b64.get(), decoded.data(), static_cast<int>(maxlen));
+  decoded.resize(len);
+  return decoded;
+}
+
+std::string load_public_key_file(const std::string &public_key_file) {
+  std::ifstream inFile;
+  inFile.open(public_key_file);  // open the input file
+
+  std::stringstream strStream;
+  strStream << inFile.rdbuf();  // read the file
+  return strStream.str();       // str holds the content of the file
+}
+
+/**
+ * Create public key BIO from in-memory public key buffer
+ */
+EVP_PKEY_ptr load_public_key(const std::string &public_key_content) {
+  void *ptr;
+  ptr = static_cast<void *>(const_cast<char *>(public_key_content.c_str()));
+  BIO_ptr bio{BIO_new_mem_buf(ptr, public_key_content.size())};
+  if (!bio) return {nullptr};
+  EVP_PKEY *result;
+
+  std::cout << "BIO_new_mem_buf " << std::endl;
+  result = PEM_read_bio_PUBKEY(bio.get(), &result, nullptr, nullptr);
+  std::cout << "PEM_read_bio_PUBKEY" << std::endl;
+  return EVP_PKEY_ptr{result};
+}
+
+/**
+ * Verify a message signed by the private key pair of the provided public key.
+ */
+bool verify(const std::string &digest, const std::string &message,
+            const std::string &public_key_content) {
+  EVP_PKEY *pkey;
+  EVP_MD_CTX *ctx;
+  {
+    FILE *f = fopen(public_key_content.c_str(), "rb");
+    pkey = PEM_read_PUBKEY(f, NULL, NULL, NULL);
+    if (pkey == nullptr) return false;
+  }
+  ctx = EVP_MD_CTX_create();
+  if (ctx == nullptr) {
+    std::cerr << "Error: EVP_MD_CTX_create" << std::endl;
+    return false;
+  }
+
+  auto digest_raw = base64_decode(digest);
+
+  if (1 != EVP_DigestVerifyInit(ctx, nullptr, EVP_sha256(), nullptr, pkey)) {
+    //  public_key.get());
+    std::cout << "EVP_DigestVerifyInit" << std::endl;
+    ERR_print_errors_fp(stderr);
+    return false;
+  }
+
+  if (1 != EVP_DigestVerifyUpdate(ctx, message.c_str(), message.length())) {
+    std::cout << "EVP_DigestVerifyUpdate" << std::endl;
+    ERR_print_errors_fp(stderr);
+    return false;
+  }
+
+  if (1 != EVP_DigestVerifyFinal(ctx, digest_raw.data(), digest_raw.size())) {
+    std::cout << "EVP_DigestVerifyFinal" << std::endl;
+    ERR_print_errors_fp(stderr);
+    return false;
+  }
+  std::cerr << "Match!\n";
+  return true;
+}
+}  // namespace ssl
+}  // namespace oci
diff -Nru mysql-8.0-8.0.26/sql-common/oci/ssl.h mysql-8.0-8.0.27/sql-common/oci/ssl.h
--- mysql-8.0-8.0.26/sql-common/oci/ssl.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql-common/oci/ssl.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,47 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA  */
+
+#ifndef OCI_SSL_H
+#define OCI_SSL_H
+
+#include <string>
+#include <vector>
+
+namespace oci {
+using Data = std::vector<unsigned char>;
+namespace ssl {
+// Using extra class to allow using the key content directly.
+class Key_Content : public std::string {};
+
+enum class Algorithm { SHA_1, SHA_256 };
+
+std::string base64_encode(const void *binary, size_t length);
+std::string base64_encode(const Data &data);
+std::vector<unsigned char> base64_decode(const std::string &encoded);
+}  // namespace ssl
+}  // namespace oci
+#endif  // OCI_SSL_H
diff -Nru mysql-8.0-8.0.26/sql-common/oci/ssl_ptr.h mysql-8.0-8.0.27/sql-common/oci/ssl_ptr.h
--- mysql-8.0-8.0.26/sql-common/oci/ssl_ptr.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql-common/oci/ssl_ptr.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,80 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA  */
+
+#ifndef OCI_SSL_DELETERS_H
+#define OCI_SSL_DELETERS_H
+
+#include <openssl/evp.h>
+#include <openssl/pem.h>
+
+#include <memory>
+
+namespace oci {
+namespace ssl {
+struct BIO_deleter {
+  void operator()(BIO *p) const {
+    if (p) BIO_free(p);
+  }
+};
+
+struct X509_deleter {
+  void operator()(X509 *p) const {
+    if (p) X509_free(p);
+  }
+};
+
+struct ASN1_TIME_deleter {
+  void operator()(ASN1_TIME *p) const {
+    if (p) ASN1_STRING_free(p);
+  }
+};
+struct EVP_PKEY_deleter {
+  void operator()(EVP_PKEY *p) const {
+    if (p) EVP_PKEY_free(p);
+  }
+};
+
+struct EVP_MD_CTX_deleter {
+  void operator()(EVP_MD_CTX *p) const {
+#if OPENSSL_VERSION_NUMBER > 0x10100000L
+    if (p) EVP_MD_CTX_free(p);
+#else
+    // 1.0.x
+    if (p) EVP_MD_CTX_destroy(p);
+#endif
+  }
+};
+
+using BIO_ptr = std::unique_ptr<BIO, BIO_deleter>;
+using X509_ptr = std::unique_ptr<X509, X509_deleter>;
+using ASN1_TIME_ptr = std::unique_ptr<ASN1_TIME, ASN1_TIME_deleter>;
+using EVP_PKEY_ptr = std::unique_ptr<EVP_PKEY, EVP_PKEY_deleter>;
+using EVP_MD_CTX_ptr = std::unique_ptr<EVP_MD_CTX, EVP_MD_CTX_deleter>;
+
+}  // namespace ssl
+}  // namespace oci
+#endif  // OCI_SSL_DELETERS_H
diff -Nru mysql-8.0-8.0.26/sql-common/oci/utilities.cc mysql-8.0-8.0.27/sql-common/oci/utilities.cc
--- mysql-8.0-8.0.26/sql-common/oci/utilities.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql-common/oci/utilities.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,116 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA  */
+
+#include <fstream>
+#include <regex>
+
+#include "sql-common/oci/utilities.h"
+
+#if defined(_WIN32)
+#include <stdio.h>
+#include <stdlib.h>
+#else  // defined(_WIN32)
+#include <pwd.h>
+#include <unistd.h>
+#endif  // defined(_WIN32)
+
+namespace oci {
+/**
+ * Return the realpath(~)
+ */
+std::string get_home_folder() {
+#if defined(_WIN32)
+  return {getenv("USERPROFILE")};
+#else   // defined(_WIN32)
+  struct passwd *pw = getpwuid(getuid());
+  const char *homedir = pw->pw_dir;
+  return homedir;
+#endif  // defined(_WIN32)
+}
+
+/**
+ * Parse ~/.oci/config file to extract location of the private key.
+ */
+OCI_config_file parse_oci_config_file(const std::string &oci_config) {
+  constexpr char KEY_FILE[]{"key_file="};
+  constexpr char FINGERPRINT[]{"fingerprint="};
+  std::ifstream file(oci_config);
+  if (!file.good()) return {};
+  bool isDefault = false;  // Are we in the [DEFAULT] section?
+  std::string line;
+  OCI_config_file result;
+  while (std::getline(file, line)) {
+    if (line.rfind(KEY_FILE, 0) == 0) {
+      // Found 'key_file='.
+      if (isDefault || result.key_file.empty()) {
+        // Replace the non-default value with the one from the [DEFAULT] section
+        line.erase(0, sizeof(KEY_FILE) - 1);
+        result.key_file = std::regex_replace(line, std::regex("[[:s:]]+$"), "");
+      }
+      continue;
+    }
+    if (line.rfind(FINGERPRINT, 0) == 0) {
+      // Found 'fingerprint='.
+      if (isDefault || result.fingerprint.empty()) {
+        // Replace the non-default value with the one from the [DEFAULT] section
+        line.erase(0, sizeof(FINGERPRINT) - 1);
+        result.fingerprint =
+            std::regex_replace(line, std::regex("[[:s:]]+$"), "");
+      }
+      continue;
+    }
+    auto default_pos = line.find("[DEFAULT]");
+    if (default_pos != std::string::npos) {
+      isDefault = true;
+      continue;
+    }
+    if (isDefault && line[0] == '[') {
+      // Non-default section
+      isDefault = false;
+      continue;
+    }
+  }
+  return result;
+}
+
+/**
+ * Return the default location of ~/.oci/config file if not specified.
+ */
+std::string get_oci_config_file_location(const char *oci_config) {
+  if (oci_config != nullptr && oci_config[0] != '\0') return {oci_config};
+  return {get_home_folder() + "/.oci/config"};
+}
+
+/**
+ * JSON format the client signed response.
+ */
+std::string prepare_response(const std::string &fingerprint,
+                             const std::string &signature) {
+  return "{\"fingerprint\":\"" + fingerprint + "\",\"signature\":\"" +
+         signature + "\"}";
+}
+}  // namespace oci
diff -Nru mysql-8.0-8.0.26/sql-common/oci/utilities.h mysql-8.0-8.0.27/sql-common/oci/utilities.h
--- mysql-8.0-8.0.26/sql-common/oci/utilities.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/sql-common/oci/utilities.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,43 @@
+/* Copyright (c) 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA  */
+
+#ifndef AUTH_OCI_CLIENT_UTILITIES_H
+#define AUTH_OCI_CLIENT_UTILITIES_H
+
+#include <string>
+
+namespace oci {
+struct OCI_config_file {
+  std::string key_file;
+  std::string fingerprint;
+};
+OCI_config_file parse_oci_config_file(const std::string &oci_config);
+std::string get_oci_config_file_location(const char *oci_config);
+std::string prepare_response(const std::string &fingerprint,
+                             const std::string &signature);
+}  // namespace oci
+#endif  // AUTH_OCI_CLIENT_UTILITIES_H
diff -Nru mysql-8.0-8.0.26/storage/archive/ha_archive.cc mysql-8.0-8.0.27/storage/archive/ha_archive.cc
--- mysql-8.0-8.0.26/storage/archive/ha_archive.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/archive/ha_archive.cc	2021-09-28 11:46:34.000000000 +0000
@@ -188,8 +188,8 @@
 #endif /* HAVE_PSI_MEMORY_INTERFACE */
 
 static void init_archive_psi_keys(void) {
-  const char *category MY_ATTRIBUTE((unused)) = "archive";
-  int count MY_ATTRIBUTE((unused));
+  const char *category [[maybe_unused]] = "archive";
+  int count [[maybe_unused]];
 
 #ifdef HAVE_PSI_MUTEX_INTERFACE
   count = static_cast<int>(array_elements(all_archive_mutexes));
@@ -536,7 +536,7 @@
       break;
     case HA_ERR_CRASHED_ON_USAGE:
       if (open_options & HA_OPEN_FOR_REPAIR) break;
-      /* fall through */
+      [[fallthrough]];
     default:
       return rc;
   }
@@ -1410,7 +1410,7 @@
     @return != 0 Error
 */
 
-int ha_archive::extra(enum ha_extra_function operation MY_ATTRIBUTE((unused))) {
+int ha_archive::extra(enum ha_extra_function operation [[maybe_unused]]) {
   int ret = 0;
   DBUG_TRACE;
   /* On windows we need to close all files before rename/delete. */
diff -Nru mysql-8.0-8.0.26/storage/archive/ha_archive.h mysql-8.0-8.0.27/storage/archive/ha_archive.h
--- mysql-8.0-8.0.26/storage/archive/ha_archive.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/archive/ha_archive.h	2021-09-28 11:46:34.000000000 +0000
@@ -122,8 +122,8 @@
                           ulonglong *nb_reserved_values) override;
   uint max_supported_keys() const override { return 1; }
   uint max_supported_key_length() const override { return sizeof(ulonglong); }
-  uint max_supported_key_part_length(
-      HA_CREATE_INFO *create_info MY_ATTRIBUTE((unused))) const override {
+  uint max_supported_key_part_length(HA_CREATE_INFO *create_info
+                                     [[maybe_unused]]) const override {
     return sizeof(ulonglong);
   }
   int records(ha_rows *num_rows) override {
diff -Nru mysql-8.0-8.0.26/storage/blackhole/ha_blackhole.h mysql-8.0-8.0.27/storage/blackhole/ha_blackhole.h
--- mysql-8.0-8.0.26/storage/blackhole/ha_blackhole.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/blackhole/ha_blackhole.h	2021-09-28 11:46:34.000000000 +0000
@@ -69,15 +69,15 @@
                       HA_KEYREAD_ONLY);
   }
   /* The following defines can be increased if necessary */
-#define BLACKHOLE_MAX_KEY 64     /* Max allowed keys */
-#define BLACKHOLE_MAX_KEY_SEG 16 /* Max segments for key */
-#define BLACKHOLE_MAX_KEY_LENGTH 1000
+#define BLACKHOLE_MAX_KEY 64          /* Max allowed keys */
+#define BLACKHOLE_MAX_KEY_SEG 16      /* Max segments for key */
+#define BLACKHOLE_MAX_KEY_LENGTH 3072 /* Keep compatible with innoDB */
   uint max_supported_keys() const override { return BLACKHOLE_MAX_KEY; }
   uint max_supported_key_length() const override {
     return BLACKHOLE_MAX_KEY_LENGTH;
   }
-  uint max_supported_key_part_length(
-      HA_CREATE_INFO *create_info MY_ATTRIBUTE((unused))) const override {
+  uint max_supported_key_part_length(HA_CREATE_INFO *create_info
+                                     [[maybe_unused]]) const override {
     return BLACKHOLE_MAX_KEY_LENGTH;
   }
   int open(const char *name, int mode, uint test_if_locked,
diff -Nru mysql-8.0-8.0.26/storage/csv/ha_tina.h mysql-8.0-8.0.27/storage/csv/ha_tina.h
--- mysql-8.0-8.0.26/storage/csv/ha_tina.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/csv/ha_tina.h	2021-09-28 11:46:34.000000000 +0000
@@ -107,7 +107,7 @@
   ~ha_tina() override {
     if (chain_alloced) my_free(chain);
     if (file_buff) delete file_buff;
-    free_root(&blobroot, MYF(0));
+    blobroot.Clear();
   }
   const char *table_type() const override { return "CSV"; }
   ulonglong table_flags() const override {
diff -Nru mysql-8.0-8.0.26/storage/example/ha_example.h mysql-8.0-8.0.27/storage/example/ha_example.h
--- mysql-8.0-8.0.26/storage/example/ha_example.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/example/ha_example.h	2021-09-28 11:46:34.000000000 +0000
@@ -110,9 +110,8 @@
     If all_parts is set, MySQL wants to know the flags for the combined
     index, up to and including 'part'.
   */
-  ulong index_flags(uint inx MY_ATTRIBUTE((unused)),
-                    uint part MY_ATTRIBUTE((unused)),
-                    bool all_parts MY_ATTRIBUTE((unused))) const override {
+  ulong index_flags(uint inx [[maybe_unused]], uint part [[maybe_unused]],
+                    bool all_parts [[maybe_unused]]) const override {
     return 0;
   }
 
diff -Nru mysql-8.0-8.0.26/storage/federated/ha_federated.cc mysql-8.0-8.0.27/storage/federated/ha_federated.cc
--- mysql-8.0-8.0.26/storage/federated/ha_federated.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/federated/ha_federated.cc	2021-09-28 11:46:34.000000000 +0000
@@ -459,8 +459,8 @@
 
 #ifdef HAVE_PSI_INTERFACE
 static void init_federated_psi_keys(void) {
-  const char *category MY_ATTRIBUTE((unused)) = "federated";
-  int count MY_ATTRIBUTE((unused));
+  const char *category [[maybe_unused]] = "federated";
+  int count [[maybe_unused]];
 
 #ifdef HAVE_PSI_MUTEX_INTERFACE
   count = static_cast<int>(array_elements(all_federated_mutexes));
@@ -1370,7 +1370,7 @@
             }
             break;
           }
-          // Fall through.
+          [[fallthrough]];
         case HA_READ_KEY_OR_NEXT:
           DBUG_PRINT("info", ("federated HA_READ_KEY_OR_NEXT %d", i));
           if (emit_key_part_name(&tmp, key_part) ||
@@ -1389,7 +1389,7 @@
               goto err;
             break;
           }
-          // Fall through.
+          [[fallthrough]];
         case HA_READ_KEY_OR_PREV:
           DBUG_PRINT("info", ("federated HA_READ_KEY_OR_PREV %d", i));
           if (emit_key_part_name(&tmp, key_part) ||
@@ -1448,7 +1448,6 @@
   Field **field;
   String query(query_buffer, sizeof(query_buffer), &my_charset_bin);
   FEDERATED_SHARE *share = nullptr, tmp_share;
-  MEM_ROOT mem_root;
   DBUG_TRACE;
 
   /*
@@ -1457,7 +1456,7 @@
   */
   query.length(0);
 
-  init_alloc_root(fe_key_memory_federated_share, &mem_root, 256, 0);
+  MEM_ROOT mem_root(fe_key_memory_federated_share, 256);
 
   mysql_mutex_lock(&federated_mutex);
 
@@ -1529,7 +1528,7 @@
     thr_lock_delete(&share->lock);
     mysql_mutex_destroy(&share->mutex);
     MEM_ROOT mem_root = std::move(share->mem_root);
-    free_root(&mem_root, MYF(0));
+    mem_root.Clear();
   }
   mysql_mutex_unlock(&federated_mutex);
 
@@ -2537,7 +2536,7 @@
   @param[in]  record  record data (unused)
 */
 
-void ha_federated::position(const uchar *record MY_ATTRIBUTE((unused))) {
+void ha_federated::position(const uchar *record [[maybe_unused]]) {
   DBUG_TRACE;
 
   assert(stored_result);
diff -Nru mysql-8.0-8.0.26/storage/federated/ha_federated.h mysql-8.0-8.0.27/storage/federated/ha_federated.h
--- mysql-8.0-8.0.26/storage/federated/ha_federated.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/federated/ha_federated.h	2021-09-28 11:46:34.000000000 +0000
@@ -176,8 +176,8 @@
   uint max_supported_key_length() const override {
     return FEDERATED_MAX_KEY_LENGTH;
   }
-  uint max_supported_key_part_length(
-      HA_CREATE_INFO *create_info MY_ATTRIBUTE((unused))) const override {
+  uint max_supported_key_part_length(HA_CREATE_INFO *create_info
+                                     [[maybe_unused]]) const override {
     return FEDERATED_MAX_KEY_LENGTH;
   }
   /*
diff -Nru mysql-8.0-8.0.26/storage/heap/ha_heap.h mysql-8.0-8.0.27/storage/heap/ha_heap.h
--- mysql-8.0-8.0.26/storage/heap/ha_heap.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/heap/ha_heap.h	2021-09-28 11:46:34.000000000 +0000
@@ -66,8 +66,8 @@
                 : HA_ONLY_WHOLE_INDEX | HA_KEY_SCAN_NOT_ROR);
   }
   uint max_supported_keys() const override { return MAX_KEY; }
-  uint max_supported_key_part_length(
-      HA_CREATE_INFO *create_info MY_ATTRIBUTE((unused))) const override {
+  uint max_supported_key_part_length(HA_CREATE_INFO *create_info
+                                     [[maybe_unused]]) const override {
     return MAX_KEY_LENGTH;
   }
   double scan_time() override {
diff -Nru mysql-8.0-8.0.26/storage/heap/hp_create.cc mysql-8.0-8.0.27/storage/heap/hp_create.cc
--- mysql-8.0-8.0.26/storage/heap/hp_create.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/heap/hp_create.cc	2021-09-28 11:46:34.000000000 +0000
@@ -101,7 +101,7 @@
           case HA_KEYTYPE_VARBINARY1:
             /* Case-insensitiveness is handled in coll->hash_sort */
             keyinfo->seg[j].type = HA_KEYTYPE_VARTEXT1;
-            /* Fall through. */
+            [[fallthrough]];
           case HA_KEYTYPE_VARTEXT1:
             keyinfo->flag |= HA_VAR_LENGTH_KEY;
             /*
@@ -117,7 +117,7 @@
             break;
           case HA_KEYTYPE_VARBINARY2:
             /* Case-insensitiveness is handled in coll->hash_sort */
-            /* fall_through */
+            [[fallthrough]];
           case HA_KEYTYPE_VARTEXT2:
             keyinfo->flag |= HA_VAR_LENGTH_KEY;
             /*
diff -Nru mysql-8.0-8.0.26/storage/heap/hp_hash.cc mysql-8.0-8.0.27/storage/heap/hp_hash.cc
--- mysql-8.0-8.0.26/storage/heap/hp_hash.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/heap/hp_hash.cc	2021-09-28 11:46:34.000000000 +0000
@@ -686,8 +686,7 @@
   return (uint)(key - start_key);
 }
 
-uint hp_rb_key_length(HP_KEYDEF *keydef,
-                      const uchar *key MY_ATTRIBUTE((unused))) {
+uint hp_rb_key_length(HP_KEYDEF *keydef, const uchar *key [[maybe_unused]]) {
   return keydef->length;
 }
 
diff -Nru mysql-8.0-8.0.26/storage/heap/hp_test2.cc mysql-8.0-8.0.27/storage/heap/hp_test2.cc
--- mysql-8.0-8.0.26/storage/heap/hp_test2.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/heap/hp_test2.cc	2021-09-28 11:46:34.000000000 +0000
@@ -548,7 +548,7 @@
   return (int)((rand() & 32767) / 32767.0 * max_value);
 } /* rnd */
 
-static void endprog(int sig_number MY_ATTRIBUTE((unused))) {
+static void endprog(int sig_number [[maybe_unused]]) {
   {
     hp_panic(HA_PANIC_CLOSE);
     my_end(1);
diff -Nru mysql-8.0-8.0.26/storage/innobase/api/api0api.cc mysql-8.0-8.0.27/storage/innobase/api/api0api.cc
--- mysql-8.0-8.0.26/storage/innobase/api/api0api.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/api/api0api.cc	2021-09-28 11:46:34.000000000 +0000
@@ -50,12 +50,12 @@
 #include "lock0lock.h"
 #include "lock0types.h"
 
+#include "ddl0ddl.h"
 #include "dict0sdi-decompress.h"
 #include "dict0sdi.h"
 #include "pars0pars.h"
 #include "rem0cmp.h"
 #include "row0ins.h"
-#include "row0merge.h"
 #include "row0sel.h"
 #include "row0upd.h"
 #include "row0vers.h"
@@ -157,7 +157,7 @@
 struct ib_table_def_t;
 
 /** InnoDB index schema used during index creation */
-struct ib_index_def_t {
+struct ib_Index_defn {
   mem_heap_t *heap; /*!< Heap used to build this and all
                     its columns in the list */
 
@@ -512,7 +512,7 @@
 
   trx_start_if_not_started(trx, read_write);
 
-  trx->isolation_level = ib_trx_level;
+  trx->isolation_level = static_cast<trx_t::isolation_level_t>(ib_trx_level);
 
   /* FIXME: This is a place holder, we should add an arg that comes
   from the client. */
@@ -845,7 +845,8 @@
   trx_t *trx = static_cast<trx_t *>(ib_trx);
   MDL_ticket *mdl = nullptr;
 
-  normalized_name = static_cast<char *>(ut_malloc_nokey(ut_strlen(name) + 1));
+  normalized_name = static_cast<char *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, ut_strlen(name) + 1));
   ib_normalize_table_name(normalized_name, name);
 
   ut_ad(ib_trx != nullptr);
@@ -858,7 +859,7 @@
     table = ib_lookup_table_by_name(normalized_name);
   }
 
-  ut_free(normalized_name);
+  ut::free(normalized_name);
   normalized_name = nullptr;
 
   /* It can happen that another thread has created the table but
@@ -1668,7 +1669,8 @@
   if (prebuilt->innodb_api) {
     prebuilt->cursor_heap = cursor->heap;
   }
-  buf = static_cast<unsigned char *>(ut_malloc_nokey(UNIV_PAGE_SIZE));
+  buf = static_cast<unsigned char *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, UNIV_PAGE_SIZE));
   prebuilt->clear_search_tuples();
 
   /* We want to position at one of the ends, row_search_for_mysql()
@@ -1677,7 +1679,7 @@
   err = static_cast<ib_err_t>(row_search_for_mysql(
       buf, static_cast<page_cur_mode_t>(mode), prebuilt, 0, 0));
 
-  ut_free(buf);
+  ut::free(buf);
 
   return (err);
 }
@@ -1750,7 +1752,8 @@
 
   prebuilt->innodb_api_rec = nullptr;
 
-  buf = static_cast<unsigned char *>(ut_malloc_nokey(UNIV_PAGE_SIZE));
+  buf = static_cast<unsigned char *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, UNIV_PAGE_SIZE));
 
   if (prebuilt->innodb_api) {
     prebuilt->cursor_heap = cursor->heap;
@@ -1759,7 +1762,7 @@
       row_search_for_mysql(buf, static_cast<page_cur_mode_t>(ib_srch_mode),
                            prebuilt, cursor->match_mode, direction));
 
-  ut_free(buf);
+  ut::free(buf);
 
   return (err);
 }
@@ -3365,8 +3368,8 @@
   ut_ad(*sdi_len < UINT32_MAX);
   uint32_t uncompressed_sdi_len;
   uint32_t compressed_sdi_len = static_cast<uint32_t>(*sdi_len);
-  byte *compressed_sdi =
-      static_cast<byte *>(ut_malloc_nokey(compressed_sdi_len));
+  byte *compressed_sdi = static_cast<byte *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, compressed_sdi_len));
 
   err = ib_sdi_get(tablespace_id, &sk, compressed_sdi, &compressed_sdi_len,
                    &uncompressed_sdi_len, trx);
diff -Nru mysql-8.0-8.0.26/storage/innobase/api/api0misc.cc mysql-8.0-8.0.27/storage/innobase/api/api0misc.cc
--- mysql-8.0-8.0.26/storage/innobase/api/api0misc.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/api/api0misc.cc	2021-09-28 11:46:34.000000000 +0000
@@ -78,7 +78,7 @@
         trx_rollback_for_mysql(trx);
       }
       break;
-      /* fall through */
+      [[fallthrough]];
     case DB_DUPLICATE_KEY:
     case DB_FOREIGN_DUPLICATE_KEY:
     case DB_TOO_BIG_RECORD:
diff -Nru mysql-8.0-8.0.26/storage/innobase/arch/arch0arch.cc mysql-8.0-8.0.27/storage/innobase/arch/arch0arch.cc
--- mysql-8.0-8.0.26/storage/innobase/arch/arch0arch.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/arch/arch0arch.cc	2021-09-28 11:46:34.000000000 +0000
@@ -116,7 +116,8 @@
 @return error code */
 dberr_t arch_init() {
   if (arch_log_sys == nullptr) {
-    arch_log_sys = UT_NEW(Arch_Log_Sys(), mem_key_archive);
+    arch_log_sys =
+        ut::new_withkey<Arch_Log_Sys>(ut::make_psi_memory_key(mem_key_archive));
 
     if (arch_log_sys == nullptr) {
       return (DB_OUT_OF_MEMORY);
@@ -126,7 +127,8 @@
   }
 
   if (arch_page_sys == nullptr) {
-    arch_page_sys = UT_NEW(Arch_Page_Sys(), mem_key_archive);
+    arch_page_sys = ut::new_withkey<Arch_Page_Sys>(
+        ut::make_psi_memory_key(mem_key_archive));
 
     if (arch_page_sys == nullptr) {
       return (DB_OUT_OF_MEMORY);
@@ -148,14 +150,14 @@
 /** Free Page and Log archiver system */
 void arch_free() {
   if (arch_log_sys != nullptr) {
-    UT_DELETE(arch_log_sys);
+    ut::delete_(arch_log_sys);
     arch_log_sys = nullptr;
 
     os_event_destroy(log_archiver_thread_event);
   }
 
   if (arch_page_sys != nullptr) {
-    UT_DELETE(arch_page_sys);
+    ut::delete_(arch_page_sys);
     arch_page_sys = nullptr;
 
     os_event_destroy(page_archiver_thread_event);
@@ -301,11 +303,12 @@
 
   /* In case of reinitialise. */
   if (m_name_buf != nullptr) {
-    ut_free(m_name_buf);
+    ut::free(m_name_buf);
     m_name_buf = nullptr;
   }
 
-  m_name_buf = static_cast<char *>(ut_malloc(m_name_len, mem_key_archive));
+  m_name_buf = static_cast<char *>(
+      ut::malloc_withkey(ut::make_psi_memory_key(mem_key_archive), m_name_len));
 
   if (m_name_buf == nullptr) {
     return (DB_OUT_OF_MEMORY);
@@ -339,12 +342,6 @@
 
 dberr_t Arch_File_Ctx::open(bool read_only, lsn_t start_lsn, uint file_index,
                             uint64_t file_offset) {
-  os_file_create_t option;
-  os_file_type_t type;
-
-  bool success;
-  bool exists;
-
   /* Close current file, if open. */
   close();
 
@@ -355,12 +352,17 @@
 
   build_name(m_index, start_lsn, nullptr, 0);
 
-  success = os_file_status(m_name_buf, &exists, &type);
+  bool exists;
+  os_file_type_t type;
+
+  bool success = os_file_status(m_name_buf, &exists, &type);
 
   if (!success) {
     return (DB_CANNOT_OPEN_FILE);
   }
 
+  os_file_create_t option;
+
   if (read_only) {
     if (!exists) {
       return (DB_CANNOT_OPEN_FILE);
@@ -379,7 +381,19 @@
     return (DB_CANNOT_OPEN_FILE);
   }
 
-  success = os_file_seek(m_name_buf, m_file.m_file, file_offset);
+  /* For newly created file, zero fill the header section. This is required
+  for archived redo files that are just created. Clone expects the header
+  length to be written. */
+  if (!exists && file_offset != 0) {
+    /* This call would extend the length by multiple of UNIV_PAGE_SIZE. This is
+    not an issue but we need to lseek to keep the current position at offset. */
+    success =
+        os_file_set_size(m_name_buf, m_file, 0, file_offset, false, false);
+  }
+
+  if (success) {
+    success = os_file_seek(m_name_buf, m_file.m_file, file_offset);
+  }
 
   return (success ? DB_SUCCESS : DB_IO_ERROR);
 }
@@ -513,7 +527,7 @@
 
   if (ret) {
     srv_threads.m_log_archiver =
-        os_thread_create(log_archiver_thread_key, log_archiver_thread);
+        os_thread_create(log_archiver_thread_key, 0, log_archiver_thread);
 
     srv_threads.m_log_archiver.start();
 
@@ -535,7 +549,7 @@
 
   if (ret) {
     srv_threads.m_page_archiver =
-        os_thread_create(page_archiver_thread_key, page_archiver_thread);
+        os_thread_create(page_archiver_thread_key, 0, page_archiver_thread);
 
     srv_threads.m_page_archiver.start();
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/arch/arch0log.cc mysql-8.0-8.0.27/storage/innobase/arch/arch0log.cc
--- mysql-8.0-8.0.26/storage/innobase/arch/arch0log.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/arch/arch0log.cc	2021-09-28 11:46:34.000000000 +0000
@@ -199,17 +199,14 @@
   m_state = ARCH_CLIENT_STATE_INIT;
 }
 
-/** Update checkpoint LSN and related information in redo
-log header block.
-@param[in,out]	header		redo log header buffer
-@param[in]	checkpoint_lsn	checkpoint LSN for recovery */
-void Arch_Log_Sys::update_header(byte *header, lsn_t checkpoint_lsn) {
+void Arch_Log_Sys::update_header(const Arch_Group *group, byte *header,
+                                 lsn_t checkpoint_lsn) {
   lsn_t start_lsn;
   lsn_t lsn_offset;
   ib_uint64_t file_size;
 
-  start_lsn = m_current_group->get_begin_lsn();
-  file_size = m_current_group->get_file_size();
+  start_lsn = group->get_begin_lsn();
+  file_size = group->get_file_size();
 
   start_lsn = ut_uint64_align_down(start_lsn, OS_FILE_LOG_BLOCK_SIZE);
 
@@ -342,8 +339,9 @@
 
   /* Create a new group. */
   if (create_new_group) {
-    m_current_group = UT_NEW(Arch_Group(start_lsn, LOG_FILE_HDR_SIZE, &m_mutex),
-                             mem_key_archive);
+    m_current_group =
+        ut::new_withkey<Arch_Group>(ut::make_psi_memory_key(mem_key_archive),
+                                    start_lsn, LOG_FILE_HDR_SIZE, &m_mutex);
 
     if (m_current_group == nullptr) {
       arch_mutex_exit();
@@ -382,8 +380,11 @@
 
   arch_mutex_exit();
 
-  /* Update header with checkpoint LSN. */
-  update_header(header, start_lsn);
+  /* Update header with checkpoint LSN. We need to pass the saved
+  group pointer as arch mutex is released and m_current_group should
+  no longer be accessed. The group cannot be freed as we have already
+  attached to it. */
+  update_header(group, header, start_lsn);
 
   return (0);
 }
@@ -401,6 +402,26 @@
                   blk_len = OS_FILE_LOG_BLOCK_SIZE;
                   stop_lsn += 64;);
 }
+
+void Arch_Group::adjust_copy_length(lsn_t arch_lsn, uint32_t &copy_len) {
+  lsn_t end_lsn = LSN_MAX;
+  uint32_t blk_len = 0;
+  adjust_end_lsn(end_lsn, blk_len);
+
+  if (end_lsn <= arch_lsn) {
+    copy_len = 0;
+    return;
+  }
+
+  /* Adjust if copying beyond end LSN. */
+  auto len_left = end_lsn - arch_lsn;
+  len_left = ut_uint64_align_down(len_left, OS_FILE_LOG_BLOCK_SIZE);
+
+  if (len_left < copy_len) {
+    copy_len = static_cast<uint32_t>(len_left);
+  }
+}
+
 #endif /* UNIV_DEBUG */
 
 /** Stop redo log archiving.
@@ -491,7 +512,7 @@
 
   m_group_list.remove(group);
 
-  UT_DELETE(group);
+  ut::delete_(group);
 
   arch_mutex_exit();
 }
@@ -554,7 +575,7 @@
         log_writer_mutex_exit(*log_sys);
         break;
       }
-      /* fall through */
+      [[fallthrough]];
 
     case ARCH_STATE_PREPARE_IDLE: {
       /* No active clients. Mark the group inactive and move
@@ -565,7 +586,7 @@
       if (!m_current_group->is_referenced()) {
         m_group_list.remove(m_current_group);
 
-        UT_DELETE(m_current_group);
+        ut::delete_(m_current_group);
       }
 
       m_current_group = nullptr;
@@ -574,7 +595,7 @@
       m_state = ARCH_STATE_IDLE;
       log_writer_mutex_exit(*log_sys);
     }
-      /* fall through */
+      [[fallthrough]];
 
     case ARCH_STATE_IDLE:
     case ARCH_STATE_INIT:
@@ -797,7 +818,7 @@
 bool Arch_Log_Sys::archive(bool init, Arch_File_Ctx *curr_ctx, lsn_t *arch_lsn,
                            bool *wait) {
   Arch_State curr_state;
-  uint arch_len;
+  uint32_t arch_len;
 
   dberr_t err = DB_SUCCESS;
   bool is_abort = false;
@@ -820,6 +841,10 @@
   curr_state = check_set_state(is_abort, arch_lsn, &arch_len);
 
   if (curr_state == ARCH_STATE_ACTIVE) {
+    /* Adjust archiver length to no go beyond file end. */
+    DBUG_EXECUTE_IF("clone_arch_log_stop_file_end",
+                    m_current_group->adjust_copy_length(*arch_lsn, arch_len););
+
     /* Simulate archive error. */
     DBUG_EXECUTE_IF("clone_redo_no_archive", arch_len = 0;);
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/arch/arch0page.cc mysql-8.0-8.0.27/storage/innobase/arch/arch0page.cc
--- mysql-8.0-8.0.26/storage/innobase/arch/arch0page.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/arch/arch0page.cc	2021-09-28 11:46:34.000000000 +0000
@@ -94,11 +94,11 @@
   }
 
   if (m_active_file_name != nullptr) {
-    ut_free(m_active_file_name);
+    ut::free(m_active_file_name);
   }
 
   if (m_durable_file_name != nullptr) {
-    ut_free(m_durable_file_name);
+    ut::free(m_durable_file_name);
   }
 
   if (!is_durable()) {
@@ -157,7 +157,8 @@
     return (err);
   }
 
-  byte *buf = static_cast<byte *>(ut_zalloc(file_size, mem_key_archive));
+  byte *buf = static_cast<byte *>(
+      ut::zalloc_withkey(ut::make_psi_memory_key(mem_key_archive), file_size));
 
   /* Make sure that the physical file size is the same as logical by filling
   the file with all-zeroes. Page archiver recovery expects that the physical
@@ -168,7 +169,7 @@
     s_dblwr_file_ctx.flush();
   }
 
-  ut_free(buf);
+  ut::free(buf);
 
   return (err);
 }
@@ -181,7 +182,8 @@
     return (DB_SUCCESS);
   }
 
-  m_active_file_name = static_cast<char *>(ut_malloc(length, mem_key_archive));
+  m_active_file_name = static_cast<char *>(
+      ut::malloc_withkey(ut::make_psi_memory_key(mem_key_archive), length));
 
   if (m_active_file_name == nullptr) {
     return (DB_OUT_OF_MEMORY);
@@ -203,7 +205,8 @@
     return (DB_SUCCESS);
   }
 
-  m_durable_file_name = static_cast<char *>(ut_malloc(length, mem_key_archive));
+  m_durable_file_name = static_cast<char *>(
+      ut::malloc_withkey(ut::make_psi_memory_key(mem_key_archive), length));
 
   if (m_durable_file_name == nullptr) {
     return (DB_OUT_OF_MEMORY);
@@ -1508,8 +1511,9 @@
 
   /* Create memory blocks. */
   for (index = 0; index < m_num_data_blocks; index++) {
-    cur_blk = UT_NEW(Arch_Block(mem_ptr, m_block_size, ARCH_DATA_BLOCK),
-                     mem_key_archive);
+    cur_blk =
+        ut::new_withkey<Arch_Block>(ut::make_psi_memory_key(mem_key_archive),
+                                    mem_ptr, m_block_size, ARCH_DATA_BLOCK);
 
     if (cur_blk == nullptr) {
       return (false);
@@ -1519,8 +1523,9 @@
     mem_ptr += m_block_size;
   }
 
-  m_reset_block = UT_NEW(Arch_Block(mem_ptr, m_block_size, ARCH_RESET_BLOCK),
-                         mem_key_archive);
+  m_reset_block =
+      ut::new_withkey<Arch_Block>(ut::make_psi_memory_key(mem_key_archive),
+                                  mem_ptr, m_block_size, ARCH_RESET_BLOCK);
 
   if (m_reset_block == nullptr) {
     return (false);
@@ -1528,8 +1533,9 @@
 
   mem_ptr += m_block_size;
 
-  m_partial_flush_block = UT_NEW(
-      Arch_Block(mem_ptr, m_block_size, ARCH_DATA_BLOCK), mem_key_archive);
+  m_partial_flush_block =
+      ut::new_withkey<Arch_Block>(ut::make_psi_memory_key(mem_key_archive),
+                                  mem_ptr, m_block_size, ARCH_DATA_BLOCK);
 
   if (m_partial_flush_block == nullptr) {
     return (false);
@@ -1541,17 +1547,17 @@
 /** Delete blocks and buffer */
 void ArchPageData::clean() {
   for (auto &block : m_data_blocks) {
-    UT_DELETE(block);
+    ut::delete_(block);
     block = nullptr;
   }
 
   if (m_reset_block != nullptr) {
-    UT_DELETE(m_reset_block);
+    ut::delete_(m_reset_block);
     m_reset_block = nullptr;
   }
 
   if (m_partial_flush_block != nullptr) {
-    UT_DELETE(m_partial_flush_block);
+    ut::delete_(m_partial_flush_block);
     m_partial_flush_block = nullptr;
   }
 
@@ -1586,7 +1592,8 @@
   mutex_create(LATCH_ID_PAGE_ARCH, &m_mutex);
   mutex_create(LATCH_ID_PAGE_ARCH_OPER, &m_oper_mutex);
 
-  m_ctx = UT_NEW(Page_Arch_Client_Ctx(true), mem_key_archive);
+  m_ctx = ut::new_withkey<Page_Arch_Client_Ctx>(
+      ut::make_psi_memory_key(mem_key_archive), true);
 
   DBUG_EXECUTE_IF("page_archiver_simulate_more_archived_files",
                   ARCH_PAGE_FILE_CAPACITY = 8;
@@ -1600,14 +1607,14 @@
   ut_ad(m_current_group == nullptr);
 
   for (auto group : m_group_list) {
-    UT_DELETE(group);
+    ut::delete_(group);
   }
 
   Arch_Group::shutdown();
 
   m_data.clean();
 
-  UT_DELETE(m_ctx);
+  ut::delete_(m_ctx);
   mutex_free(&m_mutex);
   mutex_free(&m_oper_mutex);
 }
@@ -2391,7 +2398,7 @@
 
     case ARCH_STATE_INIT:
     case ARCH_STATE_IDLE:
-      /* Fall through */
+      [[fallthrough]];
 
     case ARCH_STATE_ACTIVE:
 
@@ -2480,9 +2487,9 @@
     m_last_lsn = log_sys_lsn;
     m_last_reset_file_index = 0;
 
-    m_current_group =
-        UT_NEW(Arch_Group(log_sys_lsn, ARCH_PAGE_FILE_HDR_SIZE, &m_mutex),
-               mem_key_archive);
+    m_current_group = ut::new_withkey<Arch_Group>(
+        ut::make_psi_memory_key(mem_key_archive), log_sys_lsn,
+        ARCH_PAGE_FILE_HDR_SIZE, &m_mutex);
 
     if (m_current_group == nullptr) {
       acquired_oper_mutex = false;
@@ -2703,7 +2710,7 @@
 
   if (!group->is_referenced()) {
     m_group_list.remove(group);
-    UT_DELETE(group);
+    ut::delete_(group);
   }
 
   arch_mutex_exit();
@@ -2913,7 +2920,7 @@
     /* Cleanup group, if no reference. */
     if (!m_current_group->is_referenced()) {
       m_group_list.remove(m_current_group);
-      UT_DELETE(m_current_group);
+      ut::delete_(m_current_group);
     }
 
     m_current_group = nullptr;
@@ -3155,7 +3162,7 @@
 
     if (!group->is_active() && group->get_end_lsn() <= group_purged_lsn) {
       it = m_group_list.erase(it);
-      UT_DELETE(group);
+      ut::delete_(group);
 
       DBUG_PRINT("page_archiver", ("Purged entire group."));
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/arch/arch0recv.cc mysql-8.0-8.0.27/storage/innobase/arch/arch0recv.cc
--- mysql-8.0-8.0.26/storage/innobase/arch/arch0recv.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/arch/arch0recv.cc	2021-09-28 11:46:34.000000000 +0000
@@ -83,14 +83,13 @@
                              uint64_t dblwr_file_size) {
   m_file_size = dblwr_file_size;
 
-  m_buf = static_cast<byte *>(UT_NEW_ARRAY_NOKEY(byte, m_file_size));
+  m_buf = static_cast<byte *>(
+      ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, m_file_size));
 
   if (m_buf == nullptr) {
     return DB_OUT_OF_MEMORY;
   }
 
-  memset(m_buf, 0, m_file_size);
-
   auto err = m_file_ctx.init(ARCH_DIR, dblwr_path, dblwr_base_file,
                              dblwr_num_files, m_file_size);
 
@@ -395,10 +394,9 @@
        info != m_dir_group_info_map.end(); ++info) {
     auto &group_info = info->second;
 
-    auto group =
-        UT_NEW(Arch_Group(group_info.m_start_lsn, ARCH_PAGE_FILE_HDR_SIZE,
-                          m_page_sys->get_mutex()),
-               mem_key_archive);
+    Arch_Group *group = ut::new_withkey<Arch_Group>(
+        ut::make_psi_memory_key(mem_key_archive), group_info.m_start_lsn,
+        ARCH_PAGE_FILE_HDR_SIZE, m_page_sys->get_mutex());
 
     if (group == nullptr) {
       return DB_OUT_OF_MEMORY;
@@ -407,12 +405,12 @@
     err = group->recover(group_info, &m_dblwr_ctx);
 
     if (err != DB_SUCCESS) {
-      UT_DELETE(group);
+      ut::delete_(group);
       break;
     }
 
     if (group_info.m_num_files == 0) {
-      UT_DELETE(group);
+      ut::delete_(group);
       continue;
     }
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/btr/btr0btr.cc mysql-8.0-8.0.27/storage/innobase/btr/btr0btr.cc
--- mysql-8.0-8.0.26/storage/innobase/btr/btr0btr.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/btr/btr0btr.cc	2021-09-28 11:46:34.000000000 +0000
@@ -393,7 +393,7 @@
  @retval block, rw_lock_x_lock_count(&block->lock) == 1 if allocation succeeded
  (init_mtr == mtr, or the page was not previously freed in mtr),
  returned block is not allocated nor initialized otherwise */
-static MY_ATTRIBUTE((warn_unused_result)) buf_block_t *btr_page_alloc_low(
+[[nodiscard]] static buf_block_t *btr_page_alloc_low(
     dict_index_t *index,    /*!< in: index */
     page_no_t hint_page_no, /*!< in: hint of a good page */
     byte file_direction,    /*!< in: direction where a possible
@@ -440,22 +440,14 @@
                                        reserved_ext > 0, mtr, init_mtr));
 }
 
-/** Allocates a new file page to be used in an index tree. NOTE: we assume
-that the caller has made the reservation for free extents!
-@param[in] index Index tree
-@param[in] hint_page_no Hint of a good page
-@param[in] file_direction Direction where a possible page split is made
-@param[in] level Level where the page is placed in the tree
-@param[in,out] mtr Mini-transaction for the allocation
-@param[in,out] init_mtr Mini-transaction for x-latching and initializing the
-page
-@retval NULL if no page could be allocated
-@retval block, rw_lock_x_lock_count(&block->lock) == 1 if allocation succeeded
-(init_mtr == mtr, or the page was not previously freed in mtr),
-returned block is not allocated nor initialized otherwise */
-buf_block_t *btr_page_alloc(dict_index_t *index, page_no_t hint_page_no,
-                            byte file_direction, ulint level, mtr_t *mtr,
-                            mtr_t *init_mtr) {
+buf_block_t *btr_page_alloc_priv(dict_index_t *index, page_no_t hint_page_no,
+                                 byte file_direction, ulint level, mtr_t *mtr,
+                                 mtr_t *init_mtr
+#ifdef UNIV_DEBUG
+                                 ,
+                                 const ut::Location &loc
+#endif /* UNIV_DEBUG */
+) {
   buf_block_t *new_block;
 
   if (dict_index_is_ibuf(index)) {
@@ -536,14 +528,13 @@
   ut_ad(flst_validate(root + PAGE_HEADER + PAGE_BTR_IBUF_FREE_LIST, mtr));
 }
 
-/** Frees a file page used in an index tree. Can be used also to (BLOB)
- external storage pages. */
-void btr_page_free_low(
-    dict_index_t *index, /*!< in: index tree */
-    buf_block_t *block,  /*!< in: block to be freed, x-latched */
-    ulint level,         /*!< in: page level (ULINT_UNDEFINED=BLOB) */
-    mtr_t *mtr)          /*!< in: mtr */
-{
+void btr_page_free_lower(dict_index_t *index, buf_block_t *block, ulint level,
+                         mtr_t *mtr
+#ifdef UNIV_DEBUG
+                         ,
+                         const ut::Location &loc
+#endif /* UNIV_DEBUG */
+) {
   fseg_header_t *seg_header;
   page_t *root;
 
@@ -713,10 +704,11 @@
     offsets = rec_get_offsets(node_ptr, index, offsets, ULINT_UNDEFINED, &heap);
     page_rec_print(node_ptr, offsets);
 
-    ib::fatal(ER_IB_MSG_29) << "You should dump + drop + reimport the table to"
-                            << " fix the corruption. If the crash happens at"
-                            << " database startup. " << FORCE_RECOVERY_MSG
-                            << " Then dump + drop + reimport.";
+    ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_29)
+        << "You should dump + drop + reimport the table to"
+        << " fix the corruption. If the crash happens at"
+        << " database startup. " << FORCE_RECOVERY_MSG
+        << " Then dump + drop + reimport.";
   }
 
   return (offsets);
@@ -811,7 +803,7 @@
 @param[in,out]	mtr		Mini-transaction
 @return root block, to invoke btr_free_but_not_root() and btr_free_root()
 @retval NULL if the page is no longer a matching B-tree page */
-static MY_ATTRIBUTE((warn_unused_result)) buf_block_t *btr_free_root_check(
+[[nodiscard]] static buf_block_t *btr_free_root_check(
     const page_id_t &page_id, const page_size_t &page_size,
     space_index_t index_id, mtr_t *mtr) {
   ut_ad(!fsp_is_system_temporary(page_id.space()));
@@ -1871,7 +1863,7 @@
 /** Returns TRUE if the insert fits on the appropriate half-page with the
  chosen split_rec.
  @return true if fits */
-static MY_ATTRIBUTE((warn_unused_result)) bool btr_page_insert_fits(
+[[nodiscard]] static bool btr_page_insert_fits(
     btr_cur_t *cursor,      /*!< in: cursor at which insert
                             should be made */
     const rec_t *split_rec, /*!< in: suggestion for first record
@@ -2159,7 +2151,7 @@
 
 /** Determine if a tuple is smaller than any record on the page.
  @return true if smaller */
-static MY_ATTRIBUTE((warn_unused_result)) bool btr_page_tuple_smaller(
+[[nodiscard]] static bool btr_page_tuple_smaller(
     btr_cur_t *cursor,     /*!< in: b-tree cursor */
     const dtuple_t *tuple, /*!< in: tuple to consider */
     ulint **offsets,       /*!< in/out: temporary storage */
@@ -2466,8 +2458,9 @@
   insert_empty:
     ut_ad(!split_rec);
     ut_ad(!insert_left);
-    buf =
-        UT_NEW_ARRAY_NOKEY(byte, rec_get_converted_size(cursor->index, tuple));
+    buf = ut::new_arr_withkey<byte>(
+        UT_NEW_THIS_FILE_PSI_KEY,
+        ut::Count{rec_get_converted_size(cursor->index, tuple)});
 
     first_rec = rec_convert_dtuple_to_rec(buf, cursor->index, tuple);
     move_limit = page_rec_get_next(btr_cur_get_rec(cursor));
@@ -2489,7 +2482,7 @@
         btr_page_insert_fits(cursor, split_rec, offsets, tuple, heap);
   } else {
     if (!insert_left) {
-      UT_DELETE_ARRAY(buf);
+      ut::delete_arr(buf);
       buf = nullptr;
     }
 
@@ -3216,8 +3209,9 @@
       page_no_t page_no = btr_node_ptr_get_child_page_no(my_rec, offsets);
 
       if (page_no != block->page.id.page_no()) {
-        ib::fatal(ER_IB_MSG_33) << "father positioned on " << page_no
-                                << " instead of " << block->page.id.page_no();
+        ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_33)
+            << "father positioned on " << page_no << " instead of "
+            << block->page.id.page_no();
 
         ut_ad(0);
       }
@@ -4570,6 +4564,36 @@
 
   mtr_t mtr;
 
+#ifdef UNIV_DEBUG
+  /* Check the FSEG_NOT_FULL_N_USED field stored in the segment inode. */
+  {
+    const space_id_t space_id = dict_index_get_space(index);
+
+    fil_space_t *space = fil_space_acquire(space_id);
+
+    if (space == nullptr) {
+      return true;
+    }
+
+    mtr_start(&mtr);
+    const page_t *const root = btr_root_get(index, &mtr);
+    mtr_x_lock(&space->latch, &mtr);
+    const page_size_t page_size = dict_table_page_size(index->table);
+
+    for (auto offset : {PAGE_BTR_SEG_LEAF, PAGE_BTR_SEG_TOP}) {
+      const fseg_header_t *const seg_header = root + PAGE_HEADER + offset;
+      fseg_inode_t *inode =
+          fseg_inode_get(seg_header, space_id, page_size, &mtr);
+      File_segment_inode fsi(space_id, page_size, inode, &mtr);
+      ut_ad(fsi.verify_not_full_n_used());
+    }
+
+    mtr_commit(&mtr);
+
+    fil_space_release(space);
+  }
+#endif /* UNIV_DEBUG */
+
   mtr_start(&mtr);
 
   if (!srv_read_only_mode) {
diff -Nru mysql-8.0-8.0.26/storage/innobase/btr/btr0bulk.cc mysql-8.0-8.0.27/storage/innobase/btr/btr0bulk.cc
--- mysql-8.0-8.0.26/storage/innobase/btr/btr0bulk.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/btr/btr0bulk.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,1128 +0,0 @@
-/*****************************************************************************
-
-Copyright (c) 2014, 2021, Oracle 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, as published by the
-Free Software Foundation.
-
-This program is also distributed with certain software (including but not
-limited to OpenSSL) that is licensed under separate terms, as designated in a
-particular file or component or in included license documentation. The authors
-of MySQL hereby grant you an additional permission to link the program and
-your derivative works with the separately licensed software that they have
-included with MySQL.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
-for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-*****************************************************************************/
-
-/** @file btr/btr0bulk.cc
- The B-tree bulk load
-
- Created 03/11/2014 Shaohua Wang
- *******************************************************/
-
-#include "btr0bulk.h"
-#include "btr0btr.h"
-#include "btr0cur.h"
-#include "btr0pcur.h"
-#include "ibuf0ibuf.h"
-#include "lob0lob.h"
-
-/** Innodb B-tree index fill factor for bulk load. */
-long innobase_fill_factor;
-
-/** Initialize members, allocate page if needed and start mtr.
-Note: we commit all mtrs on failure.
-@return error code. */
-dberr_t PageBulk::init() {
-  buf_block_t *new_block;
-  page_t *new_page;
-  page_zip_des_t *new_page_zip;
-  page_no_t new_page_no;
-
-  ut_ad(m_heap == nullptr);
-
-  m_heap = mem_heap_create(1000);
-
-  auto mtr_alloc = mem_heap_alloc(m_heap, sizeof(mtr_t));
-  mtr_t *mtr = new (mtr_alloc) mtr_t();
-  mtr_start(mtr);
-
-  if (!dict_index_is_online_ddl(m_index)) {
-    mtr_x_lock(dict_index_get_lock(m_index), mtr);
-  }
-
-  mtr_set_log_mode(mtr, MTR_LOG_NO_REDO);
-  mtr_set_flush_observer(mtr, m_flush_observer);
-
-  if (m_page_no == FIL_NULL) {
-    mtr_t alloc_mtr;
-
-    /* We commit redo log for allocation by a separate mtr,
-    because we don't guarantee pages are committed following
-    the allocation order, and we will always generate redo log
-    for page allocation, even when creating a new tablespace. */
-    mtr_start(&alloc_mtr);
-
-    ulint n_reserved;
-    bool success = fsp_reserve_free_extents(&n_reserved, m_index->space, 1,
-                                            FSP_NORMAL, &alloc_mtr);
-    if (!success) {
-      mtr_commit(&alloc_mtr);
-      mtr_commit(mtr);
-      return (DB_OUT_OF_FILE_SPACE);
-    }
-
-    /* Allocate a new page. */
-    new_block = btr_page_alloc(m_index, 0, FSP_UP, m_level, &alloc_mtr, mtr);
-
-    if (n_reserved > 0) {
-      fil_space_release_free_extents(m_index->space, n_reserved);
-    }
-
-    mtr_commit(&alloc_mtr);
-
-    new_page = buf_block_get_frame(new_block);
-    new_page_zip = buf_block_get_page_zip(new_block);
-    new_page_no = page_get_page_no(new_page);
-
-    ut_ad(!dict_index_is_spatial(m_index));
-    ut_ad(!dict_index_is_sdi(m_index));
-
-    if (new_page_zip) {
-      page_create_zip(new_block, m_index, m_level, 0, mtr, FIL_PAGE_INDEX);
-    } else {
-      ut_ad(!dict_index_is_spatial(m_index));
-      page_create(new_block, mtr, dict_table_is_comp(m_index->table),
-                  FIL_PAGE_INDEX);
-      btr_page_set_level(new_page, nullptr, m_level, mtr);
-    }
-
-    btr_page_set_next(new_page, nullptr, FIL_NULL, mtr);
-    btr_page_set_prev(new_page, nullptr, FIL_NULL, mtr);
-
-    btr_page_set_index_id(new_page, nullptr, m_index->id, mtr);
-  } else {
-    page_id_t page_id(dict_index_get_space(m_index), m_page_no);
-    page_size_t page_size(dict_table_page_size(m_index->table));
-
-    new_block = btr_block_get(page_id, page_size, RW_X_LATCH, m_index, mtr);
-
-    new_page = buf_block_get_frame(new_block);
-    new_page_zip = buf_block_get_page_zip(new_block);
-    new_page_no = page_get_page_no(new_page);
-    ut_ad(m_page_no == new_page_no);
-
-    ut_ad(page_dir_get_n_heap(new_page) == PAGE_HEAP_NO_USER_LOW);
-
-    btr_page_set_level(new_page, nullptr, m_level, mtr);
-  }
-
-  if (dict_index_is_sec_or_ibuf(m_index) && !m_index->table->is_temporary() &&
-      page_is_leaf(new_page)) {
-    page_update_max_trx_id(new_block, nullptr, m_trx_id, mtr);
-  }
-
-  m_mtr = mtr;
-  m_block = new_block;
-  m_page = new_page;
-  m_page_zip = new_page_zip;
-  m_page_no = new_page_no;
-  m_cur_rec = page_get_infimum_rec(new_page);
-  ut_ad(m_is_comp == !!page_is_comp(new_page));
-  m_free_space = page_get_free_space_of_empty(m_is_comp);
-
-  if (innobase_fill_factor == 100 && m_index->is_clustered()) {
-    /* Keep default behavior compatible with 5.6 */
-    m_reserved_space = dict_index_get_space_reserve();
-  } else {
-    m_reserved_space = UNIV_PAGE_SIZE * (100 - innobase_fill_factor) / 100;
-  }
-
-  m_padding_space =
-      UNIV_PAGE_SIZE - dict_index_zip_pad_optimal_page_size(m_index);
-  m_heap_top = page_header_get_ptr(new_page, PAGE_HEAP_TOP);
-  m_rec_no = page_header_get_field(new_page, PAGE_N_RECS);
-
-  m_last_slotted_rec = page_get_infimum_rec(m_page);
-  m_slotted_rec_no = 0;
-
-  m_modified = true;
-
-  ut_d(m_total_data = 0);
-
-  return (DB_SUCCESS);
-}
-
-/** Insert a tuple in the page.
-@param[in]  tuple     tuple to insert
-@param[in]  big_rec   external record
-@param[in]  rec_size  record size
-@return error code */
-dberr_t PageBulk::insert(const dtuple_t *tuple, const big_rec_t *big_rec,
-                         ulint rec_size) {
-  ulint *offsets = nullptr;
-
-  DBUG_EXECUTE_IF("BtrBulk_insert_inject_error", return DB_INTERRUPTED;);
-
-  /* Convert tuple to record. */
-  byte *rec_mem = static_cast<byte *>(mem_heap_alloc(m_heap, rec_size));
-
-  rec_t *rec = rec_convert_dtuple_to_rec(rec_mem, m_index, tuple);
-  offsets = rec_get_offsets(rec, m_index, offsets, ULINT_UNDEFINED, &m_heap);
-
-  /* Insert the record.*/
-  insert(rec, offsets);
-  ut_ad(m_modified);
-
-  dberr_t err = DB_SUCCESS;
-
-  if (big_rec) {
-    /* The page must be valid as MTR may be committed
-    during LOB insertion. */
-    finish();
-    err = storeExt(big_rec, offsets);
-  }
-
-  return err;
-}
-
-/** Insert a record in the page.
-@param[in]	rec		record
-@param[in]	offsets		record offsets */
-void PageBulk::insert(const rec_t *rec, ulint *offsets) {
-  ulint rec_size;
-
-  ut_ad(m_heap != nullptr);
-
-  rec_size = rec_offs_size(offsets);
-
-#ifdef UNIV_DEBUG
-  /* Check whether records are in order. */
-  if (!page_rec_is_infimum(m_cur_rec)) {
-    rec_t *old_rec = m_cur_rec;
-    ulint *old_offsets =
-        rec_get_offsets(old_rec, m_index, nullptr, ULINT_UNDEFINED, &m_heap);
-
-    ut_ad(cmp_rec_rec(rec, old_rec, offsets, old_offsets, m_index,
-                      page_is_spatial_non_leaf(old_rec, m_index)) > 0 ||
-          (m_index->is_multi_value() &&
-           cmp_rec_rec(rec, old_rec, offsets, old_offsets, m_index,
-                       page_is_spatial_non_leaf(old_rec, m_index)) >= 0));
-  }
-
-  m_total_data += rec_size;
-#endif /* UNIV_DEBUG */
-
-  /* 0. Mark space for record as used (checked e.g. in page_rec_set_next). */
-  page_header_set_ptr(m_page, nullptr, PAGE_HEAP_TOP, m_heap_top + rec_size);
-
-  /* 1. Copy the record to page. */
-  rec_t *insert_rec = rec_copy(m_heap_top, rec, offsets);
-  rec_offs_make_valid(insert_rec, m_index, offsets);
-
-  /* 2. Insert the record in the linked list. */
-  rec_t *next_rec = page_rec_get_next(m_cur_rec);
-
-  page_rec_set_next(insert_rec, next_rec);
-  page_rec_set_next(m_cur_rec, insert_rec);
-
-  /* 3. Set the n_owned field in the inserted record to zero,
-  and set the heap_no field. */
-  if (m_is_comp) {
-    rec_set_n_owned_new(insert_rec, nullptr, 0);
-    rec_set_heap_no_new(insert_rec, PAGE_HEAP_NO_USER_LOW + m_rec_no);
-  } else {
-    rec_set_n_owned_old(insert_rec, 0);
-    rec_set_heap_no_old(insert_rec, PAGE_HEAP_NO_USER_LOW + m_rec_no);
-  }
-
-  /* 4. Set member variables. */
-  ulint slot_size = page_dir_calc_reserved_space(m_rec_no + 1) -
-                    page_dir_calc_reserved_space(m_rec_no);
-
-  ut_ad(m_free_space >= rec_size + slot_size);
-  ut_ad(m_heap_top + rec_size < m_page + UNIV_PAGE_SIZE);
-
-  m_free_space -= rec_size + slot_size;
-  m_heap_top += rec_size;
-  m_rec_no += 1;
-  m_cur_rec = insert_rec;
-
-  m_modified = true;
-}
-
-/** Mark end of insertion to the page. Scan records to set page dirs,
-and set page header members. The scan is incremental (slots and records
-which assignment could be "finalized" are not checked again. Check the
-m_slotted_rec_no usage, note it could be reset in some cases like
-during split.
-Note: we refer to page_copy_rec_list_end_to_created_page. */
-void PageBulk::finish() {
-  ut_ad(!dict_index_is_spatial(m_index));
-
-  if (!m_modified) {
-    return;
-  }
-
-  ut_ad(m_total_data + page_dir_calc_reserved_space(m_rec_no) <=
-        page_get_free_space_of_empty(m_is_comp));
-
-  ulint n_rec_to_assign = m_rec_no - m_slotted_rec_no;
-
-  /* Fill slots for non-supremum records if possible.
-   Slot for supremum record could store up to
-   PAGE_DIR_SLOT_MAX_N_OWNED-1 records. */
-  while (n_rec_to_assign >= PAGE_DIR_SLOT_MAX_N_OWNED) {
-    static constexpr ulint RECORDS_PER_SLOT =
-        (PAGE_DIR_SLOT_MAX_N_OWNED + 1) / 2;
-
-    for (ulint i = 0; i < RECORDS_PER_SLOT; ++i) {
-      m_last_slotted_rec = page_rec_get_next(m_last_slotted_rec);
-    }
-    m_slotted_rec_no += RECORDS_PER_SLOT;
-
-    /* Reserve next slot (must be done before slot is used). */
-    auto n_slots = page_dir_get_n_slots(m_page);
-    page_dir_set_n_slots(m_page, nullptr, n_slots + 1);
-
-    /* Fill the slot data. */
-    auto slot = page_dir_get_nth_slot(m_page, n_slots - 1);
-    page_dir_slot_set_rec(slot, m_last_slotted_rec);
-    page_dir_slot_set_n_owned(slot, nullptr, RECORDS_PER_SLOT);
-
-    n_rec_to_assign -= RECORDS_PER_SLOT;
-  }
-
-  /* Assign remaining records to slot with supremum record. */
-  auto n_slots = page_dir_get_n_slots(m_page);
-  auto slot = page_dir_get_nth_slot(m_page, n_slots - 1);
-  auto sup_rec = page_get_supremum_rec(m_page);
-
-  page_dir_slot_set_rec(slot, sup_rec);
-  page_dir_slot_set_n_owned(slot, nullptr, n_rec_to_assign + 1);
-
-  page_header_set_ptr(m_page, nullptr, PAGE_HEAP_TOP, m_heap_top);
-  page_dir_set_n_heap(m_page, nullptr, PAGE_HEAP_NO_USER_LOW + m_rec_no);
-  page_header_set_field(m_page, nullptr, PAGE_N_RECS, m_rec_no);
-
-  page_header_set_ptr(m_page, nullptr, PAGE_LAST_INSERT, m_cur_rec);
-  page_header_set_field(m_page, nullptr, PAGE_DIRECTION, PAGE_RIGHT);
-  page_header_set_field(m_page, nullptr, PAGE_N_DIRECTION, 0);
-
-  m_modified = false;
-}
-
-/** Commit inserts done to the page
-@param[in]	success		Flag whether all inserts succeed. */
-void PageBulk::commit(bool success) {
-  /* It is assumed that finish() was called before commit */
-  ut_ad(!m_modified);
-  ut_ad(page_validate(m_page, m_index));
-
-  if (success) {
-    ut_ad(m_rec_no > 0);
-
-    /* Set no free space left and no buffered changes in ibuf. */
-    if (!m_index->is_clustered() && !m_index->table->is_temporary() &&
-        page_is_leaf(m_page)) {
-      ibuf_set_bitmap_for_bulk_load(m_block, innobase_fill_factor == 100);
-    }
-  }
-
-  mtr_commit(m_mtr);
-}
-
-/** Compress a page of compressed table
-@return	true	compress successfully or no need to compress
-@return	false	compress failed. */
-bool PageBulk::compress() {
-  ut_ad(!m_modified);
-  ut_ad(m_page_zip != nullptr);
-
-  return (
-      page_zip_compress(m_page_zip, m_page, m_index, page_zip_level, m_mtr));
-}
-
-/** Get node pointer
-@return node pointer */
-dtuple_t *PageBulk::getNodePtr() {
-  /* Create node pointer */
-  rec_t *first_rec = page_rec_get_next(page_get_infimum_rec(m_page));
-  ut_a(page_rec_is_user_rec(first_rec));
-  dtuple_t *node_ptr =
-      dict_index_build_node_ptr(m_index, first_rec, m_page_no, m_heap, m_level);
-
-  return (node_ptr);
-}
-
-/** Split the page records between this and given bulk.
- @param new_page_bulk  The new bulk to store split records. */
-void PageBulk::split(PageBulk &new_page_bulk) {
-  auto split_point = getSplitRec();
-
-  new_page_bulk.copyRecords(split_point.m_rec);
-  splitTrim(split_point);
-
-  ut_ad(new_page_bulk.m_modified);
-  ut_ad(m_modified);
-}
-
-/** Get page split point. We split a page in half when compression
-fails, and the split record and all following records should be copied
-to the new page.
-@return split record descriptor */
-PageBulk::SplitPoint PageBulk::getSplitRec() {
-  ut_ad(m_page_zip != nullptr);
-  ut_ad(m_rec_no >= 2);
-
-  ut_ad(page_get_free_space_of_empty(m_is_comp) > m_free_space);
-
-  ulint total_used_size =
-      page_get_free_space_of_empty(m_is_comp) - m_free_space;
-
-  ulint total_recs_size = 0;
-  ulint n_recs = 0;
-  ulint *offsets = nullptr;
-
-  rec_t *rec = page_get_infimum_rec(m_page);
-  do {
-    rec = page_rec_get_next(rec);
-    ut_ad(page_rec_is_user_rec(rec));
-
-    offsets =
-        rec_get_offsets(rec, m_index, offsets, ULINT_UNDEFINED, &(m_heap));
-    total_recs_size += rec_offs_size(offsets);
-    n_recs++;
-  } while (total_recs_size + page_dir_calc_reserved_space(n_recs) <
-           total_used_size / 2);
-
-  /* Keep at least one record on left page */
-  if (page_rec_is_infimum(page_rec_get_prev(rec))) {
-    rec = page_rec_get_next(rec);
-    ut_ad(page_rec_is_user_rec(rec));
-  } else {
-    /* rec is to be moved, and this is used as number of records
-     before split */
-    n_recs--;
-  }
-
-  return (SplitPoint{rec, n_recs});
-}
-
-/** Copy all records from page.
-@param[in]  src_page  Page with records to copy. */
-void PageBulk::copyAll(const page_t *src_page) {
-  auto inf_rec = page_get_infimum_rec(src_page);
-  auto first_rec = page_rec_get_next_const(inf_rec);
-
-  ut_ad(page_rec_is_user_rec(first_rec));
-
-  copyRecords(first_rec);
-
-  ut_ad(m_modified);
-}
-
-/** Copy given and all following records.
-@param[in]  first_rec  first record to copy */
-void PageBulk::copyRecords(const rec_t *first_rec) {
-  const rec_t *rec = first_rec;
-  ulint *offsets = nullptr;
-
-  ut_ad(m_rec_no == 0);
-  ut_ad(page_rec_is_user_rec(rec));
-
-  do {
-    offsets =
-        rec_get_offsets(rec, m_index, offsets, ULINT_UNDEFINED, &(m_heap));
-
-    insert(rec, offsets);
-
-    rec = page_rec_get_next_const(rec);
-  } while (!page_rec_is_supremum(rec));
-
-  ut_ad(m_rec_no > 0);
-}
-
-/** Remove all records after split rec including itself.
-@param[in]  split_point  split point descriptor */
-void PageBulk::splitTrim(const SplitPoint &split_point) {
-  /* Suppose before copyOut, we have 5 records on the page:
-  infimum->r1->r2->r3->r4->r5->supremum, and r3 is the split rec.
-
-  after copyOut, we have 2 records on the page:
-  infimum->r1->r2->supremum. slot adjustment is not done. */
-
-  /* Set number of user records. */
-  ulint new_rec_no = split_point.m_n_rec_before;
-  ut_ad(new_rec_no > 0);
-
-  /* Set last record's next in page */
-  rec_t *new_last_user_rec = page_rec_get_prev(split_point.m_rec);
-  page_rec_set_next(new_last_user_rec, page_get_supremum_rec(m_page));
-
-  /* Set related members */
-  auto old_heap_top = m_heap_top;
-
-  ulint *offsets = nullptr;
-  offsets = rec_get_offsets(new_last_user_rec, m_index, offsets,
-                            ULINT_UNDEFINED, &(m_heap));
-  m_heap_top = rec_get_end(new_last_user_rec, offsets);
-
-  m_free_space +=
-      (old_heap_top - m_heap_top) + (page_dir_calc_reserved_space(m_rec_no) -
-                                     page_dir_calc_reserved_space(new_rec_no));
-  ut_ad(m_free_space > 0);
-
-  m_cur_rec = new_last_user_rec;
-  m_rec_no = new_rec_no;
-
-#ifdef UNIV_DEBUG
-  m_total_data -= old_heap_top - m_heap_top;
-#endif /* UNIV_DEBUG */
-
-  /* Invalidate all slots except infimum. */
-  ulint n_slots = page_dir_get_n_slots(m_page);
-  for (ulint slot_idx = 1; slot_idx < n_slots; ++slot_idx) {
-    auto slot = page_dir_get_nth_slot(m_page, slot_idx);
-    page_dir_slot_set_n_owned(slot, nullptr, 0);
-  }
-  page_dir_set_n_slots(m_page, nullptr, 2);
-
-  /* No records assigned to slots. */
-  m_last_slotted_rec = page_get_infimum_rec(m_page);
-  m_slotted_rec_no = 0;
-
-  m_modified = true;
-}
-
-/** Set next page
-@param[in]	next_page_no	next page no */
-void PageBulk::setNext(page_no_t next_page_no) {
-  btr_page_set_next(m_page, nullptr, next_page_no, m_mtr);
-}
-
-/** Set previous page
-@param[in]	prev_page_no	previous page no */
-void PageBulk::setPrev(page_no_t prev_page_no) {
-  btr_page_set_prev(m_page, nullptr, prev_page_no, m_mtr);
-}
-
-/** Check if required space is available in the page for the rec
-to be inserted.	We check fill factor & padding here.
-@param[in]	rec_size	required space
-@return true	if space is available */
-bool PageBulk::isSpaceAvailable(ulint rec_size) const {
-  ulint slot_size = page_dir_calc_reserved_space(m_rec_no + 1) -
-                    page_dir_calc_reserved_space(m_rec_no);
-
-  ulint required_space = rec_size + slot_size;
-
-  if (required_space > m_free_space) {
-    ut_ad(m_rec_no > 0);
-    return (false);
-  }
-
-  /* Fillfactor & Padding apply to both leaf and non-leaf pages.
-  Note: we keep at least 2 records in a page to avoid B-tree level
-  growing too high. */
-  if (m_rec_no >= 2 && ((m_page_zip == nullptr &&
-                         m_free_space - required_space < m_reserved_space) ||
-                        (m_page_zip != nullptr &&
-                         m_free_space - required_space < m_padding_space))) {
-    return (false);
-  }
-
-  return (true);
-}
-
-/** Check whether the record needs to be stored externally.
-@return false if the entire record can be stored locally on the page */
-bool PageBulk::needExt(const dtuple_t *tuple, ulint rec_size) const {
-  return (page_zip_rec_needs_ext(
-      rec_size, m_is_comp, dtuple_get_n_fields(tuple), m_block->page.size));
-}
-
-/** Store external record
-Since the record is not logged yet, so we don't log update to the record.
-the blob data is logged first, then the record is logged in bulk mode.
-@param[in]	big_rec		external record
-@param[in]	offsets		record offsets
-@return	error code */
-dberr_t PageBulk::storeExt(const big_rec_t *big_rec, ulint *offsets) {
-  ut_ad(m_index->is_clustered());
-
-  /* Note: not all fields are initialized in btr_pcur. */
-  btr_pcur_t btr_pcur;
-  btr_pcur.m_pos_state = BTR_PCUR_IS_POSITIONED;
-  btr_pcur.m_latch_mode = BTR_MODIFY_LEAF;
-  btr_pcur.m_btr_cur.index = m_index;
-
-  page_cur_t *page_cur = &btr_pcur.m_btr_cur.page_cur;
-  page_cur->index = m_index;
-  page_cur->rec = m_cur_rec;
-  page_cur->offsets = offsets;
-  page_cur->block = m_block;
-
-  dberr_t err = lob::btr_store_big_rec_extern_fields(
-      nullptr, &btr_pcur, nullptr, offsets, big_rec, m_mtr,
-      lob::OPCODE_INSERT_BULK);
-
-  ut_ad(page_offset(m_cur_rec) == page_offset(page_cur->rec));
-
-  /* Reset m_block and m_cur_rec from page cursor, because
-  block may be changed during blob insert. */
-  m_block = page_cur->block;
-  m_cur_rec = page_cur->rec;
-  m_page = buf_block_get_frame(m_block);
-
-  return (err);
-}
-
-/** Release block by committing mtr
-Note: log_free_check requires holding no lock/latch in current thread. */
-void PageBulk::release() {
-  /* Make sure page is valid before it is released. */
-  if (m_modified) {
-    finish();
-    ut_ad(!m_modified);
-  }
-  ut_ad(page_validate(m_page, m_index));
-
-  ut_ad(!dict_index_is_spatial(m_index));
-
-  ut_ad(m_block->page.buf_fix_count > 0);
-  /* We fix the block because we will re-pin it soon. */
-  buf_block_buf_fix_inc(m_block, __FILE__, __LINE__);
-
-  /* No other threads can modify this block. */
-  m_modify_clock = buf_block_get_modify_clock(m_block);
-
-  mtr_commit(m_mtr);
-}
-
-/** Start mtr and latch the block */
-void PageBulk::latch() {
-  mtr_start(m_mtr);
-
-  if (!dict_index_is_online_ddl(m_index)) {
-    mtr_x_lock(dict_index_get_lock(m_index), m_mtr);
-  }
-
-  mtr_set_log_mode(m_mtr, MTR_LOG_NO_REDO);
-  mtr_set_flush_observer(m_mtr, m_flush_observer);
-
-  ut_ad(m_block->page.buf_fix_count > 0);
-
-  /* TODO: need a simple and wait version of buf_page_optimistic_get. */
-  auto ret =
-      buf_page_optimistic_get(RW_X_LATCH, m_block, m_modify_clock,
-                              Page_fetch::NORMAL, __FILE__, __LINE__, m_mtr);
-  /* In case the block is S-latched by page_cleaner. */
-  if (!ret) {
-    page_id_t page_id(dict_index_get_space(m_index), m_page_no);
-    page_size_t page_size(dict_table_page_size(m_index->table));
-
-    m_block =
-        buf_page_get_gen(page_id, page_size, RW_X_LATCH, m_block,
-                         Page_fetch::IF_IN_POOL, __FILE__, __LINE__, m_mtr);
-    ut_ad(m_block != nullptr);
-  }
-
-  buf_block_buf_fix_dec(m_block);
-  /*
-  The caller is going to use the m_block, so it needs to be buffer-fixed even
-  after the decrement above. This works like this:
-  release(){ //initially buf_fix_count == N > 0
-    buf_fix_count++ // N+1
-    mtr_commit(){
-      buf_fix_count-- // N
-    }
-  }//at the end buf_fix_count == N > 0
-  latch(){//initially buf_fix_count == M > 0
-    buf_page_get_gen/buf_page_optimistic_get internally(){
-      buf_fix_count++ // M+1
-    }
-    buf_fix_count-- // M
-  }//at the end buf_fix_count == M > 0
-  */
-  ut_ad(m_block->page.buf_fix_count > 0);
-
-  ut_ad(m_cur_rec > m_page && m_cur_rec < m_heap_top);
-}
-
-#ifdef UNIV_DEBUG
-/* Check if an index is locked */
-bool PageBulk::isIndexXLocked() {
-  return (dict_index_is_online_ddl(m_index) &&
-          mtr_memo_contains_flagged(m_mtr, dict_index_get_lock(m_index),
-                                    MTR_MEMO_X_LOCK | MTR_MEMO_SX_LOCK));
-}
-#endif  // UNIV_DEBUG
-
-/** Split a page
-@param[in]	page_bulk	page to split
-@param[in]	next_page_bulk	next page
-@return	error code */
-dberr_t BtrBulk::pageSplit(PageBulk *page_bulk, PageBulk *next_page_bulk) {
-  ut_ad(page_bulk->isTableCompressed());
-
-  /* 1. Check if we have only one user record on the page. */
-  if (page_bulk->getRecNo() <= 1) {
-    return (DB_TOO_BIG_RECORD);
-  }
-
-  /* 2. create a new page. */
-  PageBulk new_page_bulk(m_index, m_trx_id, FIL_NULL, page_bulk->getLevel(),
-                         m_flush_observer);
-  dberr_t err = new_page_bulk.init();
-  if (err != DB_SUCCESS) {
-    return (err);
-  }
-
-  /* 3. copy the upper half to new page. */
-  page_bulk->split(new_page_bulk);
-
-  /* 4. finish page bulk modifications. */
-  page_bulk->finish();
-  new_page_bulk.finish();
-
-  /* 5. commit the split page. */
-  err = pageCommit(page_bulk, &new_page_bulk, true);
-  if (err != DB_SUCCESS) {
-    pageAbort(&new_page_bulk);
-    return (err);
-  }
-
-  /* 6. commit the new page. */
-  err = pageCommit(&new_page_bulk, next_page_bulk, true);
-  if (err != DB_SUCCESS) {
-    pageAbort(&new_page_bulk);
-    return (err);
-  }
-
-  return (err);
-}
-
-/** Commit(finish) a page. We set next/prev page no, compress a page of
-compressed table and split the page if compression fails, insert a node
-pointer to father page if needed, and commit mini-transaction.
-@param[in]	page_bulk	page to commit
-@param[in]	next_page_bulk	next page
-@param[in]	insert_father	false when page_bulk is a root page and
-                                true when it's a non-root page
-@return	error code */
-dberr_t BtrBulk::pageCommit(PageBulk *page_bulk, PageBulk *next_page_bulk,
-                            bool insert_father) {
-  /* Set page links */
-  if (next_page_bulk != nullptr) {
-    ut_ad(page_bulk->getLevel() == next_page_bulk->getLevel());
-
-    page_bulk->setNext(next_page_bulk->getPageNo());
-    next_page_bulk->setPrev(page_bulk->getPageNo());
-  } else {
-    /** Suppose a page is released and latched again, we need to
-    mark it modified in mini-transaction.  */
-    page_bulk->setNext(FIL_NULL);
-  }
-
-  /* Assert that no locks are held during bulk load operation
-  in case of a online ddl operation. Insert thread acquires index->lock
-  to check the online status of index. During bulk load index,
-  there are no concurrent insert or reads and hence, there is no
-  need to acquire a lock in that case. */
-  ut_ad(!page_bulk->isIndexXLocked());
-
-  DBUG_EXECUTE_IF("innodb_bulk_load_sleep",
-                  std::this_thread::sleep_for(std::chrono::seconds(1)););
-
-  /* Compress page if it's a compressed table. */
-  if (page_bulk->isTableCompressed() && !page_bulk->compress()) {
-    return (pageSplit(page_bulk, next_page_bulk));
-  }
-
-  /* Insert node pointer to father page. */
-  if (insert_father) {
-    dtuple_t *node_ptr = page_bulk->getNodePtr();
-    dberr_t err = insert(node_ptr, page_bulk->getLevel() + 1);
-
-    if (err != DB_SUCCESS) {
-      return (err);
-    }
-  }
-
-  /* Commit mtr. */
-  page_bulk->commit(true);
-
-  return (DB_SUCCESS);
-}
-
-/** Log free check */
-void BtrBulk::logFreeCheck() {
-  if (log_needs_free_check()) {
-    release();
-
-    log_free_check();
-
-    latch();
-  }
-}
-
-/** Constructor
-@param[in]  index   B-tree index
-@param[in]  trx_id    transaction id
-@param[in]  observer  flush observer */
-BtrBulk::BtrBulk(dict_index_t *index, trx_id_t trx_id, FlushObserver *observer)
-    : m_index(index),
-      m_trx_id(trx_id),
-      m_root_level(0),
-      m_flush_observer(observer),
-      m_page_bulks(nullptr) {
-  ut_ad(m_flush_observer != nullptr);
-#ifdef UNIV_DEBUG
-  fil_space_inc_redo_skipped_count(m_index->space);
-  m_index_online = m_index->online_status;
-#endif /* UNIV_DEBUG */
-}
-
-/** Destructor */
-BtrBulk::~BtrBulk() {
-  if (m_page_bulks) {
-    UT_DELETE(m_page_bulks);
-  }
-
-#ifdef UNIV_DEBUG
-  fil_space_dec_redo_skipped_count(m_index->space);
-#endif /* UNIV_DEBUG */
-}
-
-/** Initialization
-@note Must be called right after constructor. */
-dberr_t BtrBulk::init() {
-  ut_ad(m_page_bulks == nullptr);
-
-  m_page_bulks = UT_NEW_NOKEY(page_bulk_vector());
-  if (m_page_bulks == nullptr) {
-    return (DB_OUT_OF_MEMORY);
-  }
-
-  return (DB_SUCCESS);
-}
-
-/** Release all latches */
-void BtrBulk::release() {
-  ut_ad(m_page_bulks);
-  ut_ad(m_root_level + 1 == m_page_bulks->size());
-
-  for (ulint level = 0; level <= m_root_level; level++) {
-    PageBulk *page_bulk = m_page_bulks->at(level);
-
-    page_bulk->release();
-  }
-}
-
-/** Re-latch all latches */
-void BtrBulk::latch() {
-  ut_ad(m_page_bulks);
-  ut_ad(m_root_level + 1 == m_page_bulks->size());
-
-  for (ulint level = 0; level <= m_root_level; level++) {
-    PageBulk *page_bulk = m_page_bulks->at(level);
-    page_bulk->latch();
-  }
-}
-
-/** Prepare space to insert a tuple.
-@param[in,out]  page_bulk   page bulk that will be used to store the record.
-                            It may be replaced if there is not enough space
-                            to hold the record.
-@param[in]  level           B-tree level
-@param[in]  rec_size        record size
-@return error code */
-dberr_t BtrBulk::prepareSpace(PageBulk *&page_bulk, ulint level,
-                              ulint rec_size) {
-  if (page_bulk->isSpaceAvailable(rec_size)) {
-    return (DB_SUCCESS);
-  }
-
-  /* Finish page modifications. */
-  page_bulk->finish();
-
-  DBUG_EXECUTE_IF("ib_btr_bulk_prepare_space_error",
-                  { return (DB_OUT_OF_MEMORY); });
-
-  /* Create a sibling page_bulk. */
-  PageBulk *sibling_page_bulk = UT_NEW_NOKEY(
-      PageBulk(m_index, m_trx_id, FIL_NULL, level, m_flush_observer));
-  if (sibling_page_bulk == nullptr) {
-    return (DB_OUT_OF_MEMORY);
-  }
-
-  auto init_err = sibling_page_bulk->init();
-  if (init_err != DB_SUCCESS) {
-    UT_DELETE(sibling_page_bulk);
-    return (init_err);
-  }
-
-  /* Commit page bulk. */
-  auto commit_err = pageCommit(page_bulk, sibling_page_bulk, true);
-  if (commit_err != DB_SUCCESS) {
-    pageAbort(sibling_page_bulk);
-    UT_DELETE(sibling_page_bulk);
-    return (commit_err);
-  }
-
-  /* Set new page bulk to page_bulks. */
-  ut_ad(sibling_page_bulk->getLevel() <= m_root_level);
-  m_page_bulks->at(level) = sibling_page_bulk;
-
-  UT_DELETE(page_bulk);
-  page_bulk = sibling_page_bulk;
-
-  /* Important: log_free_check whether we need a checkpoint. */
-  if (page_is_leaf(sibling_page_bulk->getPage())) {
-    /* Check whether trx is interrupted */
-    if (m_flush_observer->check_interrupted()) {
-      return (DB_INTERRUPTED);
-    }
-
-    /* Wake up page cleaner to flush dirty pages. */
-    srv_inc_activity_count();
-    os_event_set(buf_flush_event);
-
-    logFreeCheck();
-  }
-
-  return (DB_SUCCESS);
-}
-
-/** Insert a tuple to a page.
-@param[in]  page_bulk   page bulk object
-@param[in]  tuple       tuple to insert
-@param[in]  big_rec     big record vector, could be nullptr if there is no
-                        data to be stored externally.
-@param[in]  rec_size    record size
-@return error code */
-dberr_t BtrBulk::insert(PageBulk *page_bulk, dtuple_t *tuple,
-                        big_rec_t *big_rec, ulint rec_size) {
-  dberr_t err = DB_SUCCESS;
-
-  if (big_rec != nullptr) {
-    ut_ad(m_index->is_clustered());
-    ut_ad(page_bulk->getLevel() == 0);
-    ut_ad(page_bulk == m_page_bulks->at(0));
-
-    /* Release all latched but leaf node. */
-    for (ulint level = 1; level <= m_root_level; level++) {
-      PageBulk *level_page_bulk = m_page_bulks->at(level);
-
-      level_page_bulk->release();
-    }
-  }
-
-  err = page_bulk->insert(tuple, big_rec, rec_size);
-
-  if (big_rec != nullptr) {
-    /* Restore latches */
-    for (ulint level = 1; level <= m_root_level; level++) {
-      PageBulk *level_page_bulk = m_page_bulks->at(level);
-      level_page_bulk->latch();
-    }
-  }
-
-  return (err);
-}
-
-/** Insert a tuple to page in a level
-@param[in]	tuple	tuple to insert
-@param[in]	level	B-tree level
-@return error code */
-dberr_t BtrBulk::insert(dtuple_t *tuple, ulint level) {
-  bool is_left_most = false;
-  dberr_t err = DB_SUCCESS;
-
-  ut_ad(m_page_bulks != nullptr);
-
-  /* Check if we need to create a PageBulk for the level. */
-  if (level + 1 > m_page_bulks->size()) {
-    PageBulk *new_page_bulk = UT_NEW_NOKEY(
-        PageBulk(m_index, m_trx_id, FIL_NULL, level, m_flush_observer));
-    if (new_page_bulk == nullptr) {
-      return (DB_OUT_OF_MEMORY);
-    }
-
-    err = new_page_bulk->init();
-    if (err != DB_SUCCESS) {
-      return (err);
-    }
-
-    DEBUG_SYNC_C("bulk_load_insert");
-    m_page_bulks->push_back(new_page_bulk);
-    ut_ad(level + 1 == m_page_bulks->size());
-    m_root_level = level;
-
-    is_left_most = true;
-  }
-
-  ut_ad(m_page_bulks->size() > level);
-
-  PageBulk *page_bulk = m_page_bulks->at(level);
-
-  if (is_left_most && level > 0 && page_bulk->getRecNo() == 0) {
-    /* The node pointer must be marked as the predefined minimum
-    record,	as there is no lower alphabetical limit to records in
-    the leftmost node of a level: */
-    dtuple_set_info_bits(tuple,
-                         dtuple_get_info_bits(tuple) | REC_INFO_MIN_REC_FLAG);
-  }
-
-  ulint rec_size = rec_get_converted_size(m_index, tuple);
-  big_rec_t *big_rec = nullptr;
-
-  if (page_bulk->needExt(tuple, rec_size)) {
-    /* The record is so big that we have to store some fields
-    externally on separate database pages */
-    big_rec = dtuple_convert_big_rec(m_index, nullptr, tuple);
-    if (big_rec == nullptr) {
-      return (DB_TOO_BIG_RECORD);
-    }
-
-    rec_size = rec_get_converted_size(m_index, tuple);
-  }
-
-  if (page_bulk->isTableCompressed() && page_zip_is_too_big(m_index, tuple)) {
-    err = DB_TOO_BIG_RECORD;
-    goto func_exit;
-  }
-
-  err = prepareSpace(page_bulk, level, rec_size);
-  if (err != DB_SUCCESS) {
-    goto func_exit;
-  }
-
-  DBUG_EXECUTE_IF("ib_btr_bulk_insert_inject_error", {
-    static int rec_cnt = 0;
-    if (++rec_cnt == 10) {
-      err = DB_TOO_BIG_RECORD;
-      rec_cnt = 0;
-      goto func_exit;
-    }
-  });
-
-  err = insert(page_bulk, tuple, big_rec, rec_size);
-
-func_exit:
-  if (big_rec != nullptr) {
-    dtuple_convert_back_big_rec(tuple, big_rec);
-  }
-
-  return (err);
-}
-
-dberr_t BtrBulk::finishAllPageBulks(dberr_t err, page_no_t &last_page_no) {
-  ut_ad(m_root_level + 1 == m_page_bulks->size());
-
-  last_page_no = FIL_NULL;
-
-  /* Finish all page bulks */
-  for (ulint level = 0; level <= m_root_level; level++) {
-    PageBulk *page_bulk = m_page_bulks->at(level);
-
-    page_bulk->finish();
-
-    last_page_no = page_bulk->getPageNo();
-
-    if (err == DB_SUCCESS) {
-      err = pageCommit(page_bulk, nullptr, level != m_root_level);
-    }
-
-    if (err != DB_SUCCESS) {
-      pageAbort(page_bulk);
-    }
-
-    UT_DELETE(page_bulk);
-  }
-
-  return (err);
-}
-
-/** Btree bulk load finish. We commit the last page in each level
-and copy the last page in top level to the root page of the index
-if no error occurs.
-@param[in]	err	whether bulk load was successful until now
-@return error code  */
-dberr_t BtrBulk::finish(dberr_t err) {
-  ut_ad(m_page_bulks);
-  ut_ad(!m_index->table->is_temporary());
-
-#ifdef UNIV_DEBUG
-  /* Assert that the index online status has not changed */
-  ut_ad(m_index->online_status == m_index_online);
-#endif  // UNIV_DEBUG
-
-  page_no_t last_page_no = FIL_NULL;
-
-  if (m_page_bulks->size() == 0) {
-    /* The table is empty. The root page of the index tree
-    is already in a consistent state. No need to flush. */
-    return (err);
-  }
-
-  err = finishAllPageBulks(err, last_page_no);
-
-  if (err == DB_SUCCESS) {
-    ut_ad(last_page_no != FIL_NULL);
-
-    page_id_t last_page_id(dict_index_get_space(m_index), last_page_no);
-    page_size_t page_size(dict_table_page_size(m_index->table));
-    page_no_t root_page_no = dict_index_get_page(m_index);
-    PageBulk root_page_bulk(m_index, m_trx_id, root_page_no, m_root_level,
-                            m_flush_observer);
-
-    mtr_t mtr;
-    mtr_start(&mtr);
-    mtr_x_lock(dict_index_get_lock(m_index), &mtr);
-
-    buf_block_t *last_block =
-        btr_block_get(last_page_id, page_size, RW_X_LATCH, m_index, &mtr);
-    page_t *last_page = buf_block_get_frame(last_block);
-
-    /* Copy last page to root page. */
-    err = root_page_bulk.init();
-    if (err == DB_SUCCESS) {
-      root_page_bulk.copyAll(last_page);
-      root_page_bulk.finish();
-
-      /* Remove last page. */
-      btr_page_free_low(m_index, last_block, m_root_level, &mtr);
-
-      /* Do not flush the last page. */
-      last_block->page.reset_flush_observer();
-
-      mtr_commit(&mtr);
-
-      err = pageCommit(&root_page_bulk, nullptr, false);
-      ut_ad(err == DB_SUCCESS);
-    } else {
-      mtr_commit(&mtr);
-    }
-  }
-
-#ifdef UNIV_DEBUG
-  dict_sync_check check(true);
-
-  ut_ad(!sync_check_iterate(check));
-#endif /* UNIV_DEBUG */
-
-  ut_ad(err != DB_SUCCESS || btr_validate_index(m_index, nullptr, false));
-  return (err);
-}
diff -Nru mysql-8.0-8.0.26/storage/innobase/btr/btr0cur.cc mysql-8.0-8.0.27/storage/innobase/btr/btr0cur.cc
--- mysql-8.0-8.0.26/storage/innobase/btr/btr0cur.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/btr/btr0cur.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1495,10 +1495,11 @@
         retrying_for_search_prev = true;
 
         prev_tree_blocks = static_cast<buf_block_t **>(
-            ut_malloc_nokey(sizeof(buf_block_t *) * leftmost_from_level));
+            ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY,
+                               sizeof(buf_block_t *) * leftmost_from_level));
 
-        prev_tree_savepoints = static_cast<ulint *>(
-            ut_malloc_nokey(sizeof(ulint) * leftmost_from_level));
+        prev_tree_savepoints = static_cast<ulint *>(ut::malloc_withkey(
+            UT_NEW_THIS_FILE_PSI_KEY, sizeof(ulint) * leftmost_from_level));
 
         /* back to the level (leftmost_from_level+1) */
         ulint idx = n_blocks - (leftmost_from_level - 1);
@@ -1676,8 +1677,8 @@
   }
 
   if (retrying_for_search_prev) {
-    ut_free(prev_tree_blocks);
-    ut_free(prev_tree_savepoints);
+    ut::free(prev_tree_blocks);
+    ut::free(prev_tree_savepoints);
   }
 
   if (has_search_latch) {
@@ -2299,7 +2300,7 @@
     case BTR_CONT_MODIFY_TREE:
     case BTR_CONT_SEARCH_TREE:
       ut_ad(0);
-      /* fall through */
+      [[fallthrough]];
     default:
       if (!srv_read_only_mode) {
         mtr_s_lock(dict_index_get_lock(index), mtr);
@@ -2507,7 +2508,7 @@
  or by invoking ibuf_reset_free_bits() before mtr_commit().
 
  @return pointer to inserted record if succeed, else NULL */
-static MY_ATTRIBUTE((warn_unused_result)) rec_t *btr_cur_insert_if_possible(
+[[nodiscard]] static rec_t *btr_cur_insert_if_possible(
     btr_cur_t *cursor,     /*!< in: cursor on page after which to insert;
                            cursor stays valid */
     const dtuple_t *tuple, /*!< in: tuple to insert; the size info need not
@@ -2544,18 +2545,17 @@
 
 /** For an insert, checks the locks and does the undo logging if desired.
  @return DB_SUCCESS, DB_WAIT_LOCK, DB_FAIL, or error number */
-static inline MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    btr_cur_ins_lock_and_undo(
-        ulint flags,       /*!< in: undo logging and locking flags: if
-                           not zero, the parameters index and thr
-                           should be specified */
-        btr_cur_t *cursor, /*!< in: cursor on page after which to insert */
-        dtuple_t *entry,   /*!< in/out: entry to insert */
-        que_thr_t *thr,    /*!< in: query thread or NULL */
-        mtr_t *mtr,        /*!< in/out: mini-transaction */
-        ibool *inherit)    /*!< out: TRUE if the inserted new record maybe
-                           should inherit LOCK_GAP type locks from the
-                           successor record */
+[[nodiscard]] static inline dberr_t btr_cur_ins_lock_and_undo(
+    ulint flags,       /*!< in: undo logging and locking flags: if
+                       not zero, the parameters index and thr
+                       should be specified */
+    btr_cur_t *cursor, /*!< in: cursor on page after which to insert */
+    dtuple_t *entry,   /*!< in/out: entry to insert */
+    que_thr_t *thr,    /*!< in: query thread or NULL */
+    mtr_t *mtr,        /*!< in/out: mini-transaction */
+    ibool *inherit)    /*!< out: TRUE if the inserted new record maybe
+                       should inherit LOCK_GAP type locks from the
+                       successor record */
 {
   dict_index_t *index;
   dberr_t err = DB_SUCCESS;
@@ -2869,7 +2869,7 @@
     *rec = page_cur_tuple_insert(page_cursor, entry, index, offsets, heap, mtr);
 
     if (UNIV_UNLIKELY(!*rec)) {
-      ib::fatal(ER_IB_MSG_44)
+      ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_44)
           << "Cannot insert tuple " << *entry << "into index " << index->name
           << " of table " << index->table->name << ". Max size: " << max_size;
     }
@@ -3069,18 +3069,17 @@
 
 /** For an update, checks the locks and does the undo logging.
  @return DB_SUCCESS, DB_WAIT_LOCK, or error number */
-static inline MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    btr_cur_upd_lock_and_undo(
-        ulint flags,          /*!< in: undo logging and locking flags */
-        btr_cur_t *cursor,    /*!< in: cursor on record to update */
-        const ulint *offsets, /*!< in: rec_get_offsets() on cursor */
-        const upd_t *update,  /*!< in: update vector */
-        ulint cmpl_info,      /*!< in: compiler info on secondary index
-                            updates */
-        que_thr_t *thr,       /*!< in: query thread
-                              (can be NULL if BTR_NO_LOCKING_FLAG) */
-        mtr_t *mtr,           /*!< in/out: mini-transaction */
-        roll_ptr_t *roll_ptr) /*!< out: roll pointer */
+[[nodiscard]] static inline dberr_t btr_cur_upd_lock_and_undo(
+    ulint flags,          /*!< in: undo logging and locking flags */
+    btr_cur_t *cursor,    /*!< in: cursor on record to update */
+    const ulint *offsets, /*!< in: rec_get_offsets() on cursor */
+    const upd_t *update,  /*!< in: update vector */
+    ulint cmpl_info,      /*!< in: compiler info on secondary index
+                        updates */
+    que_thr_t *thr,       /*!< in: query thread
+                          (can be NULL if BTR_NO_LOCKING_FLAG) */
+    mtr_t *mtr,           /*!< in/out: mini-transaction */
+    roll_ptr_t *roll_ptr) /*!< out: roll pointer */
 {
   dict_index_t *index;
   const rec_t *rec;
@@ -5446,7 +5445,7 @@
     case SRV_STATS_NULLS_IGNORED:
       n_not_null =
           (ib_uint64_t *)mem_heap_zalloc(heap, n_cols * sizeof *n_not_null);
-      /* fall through */
+      [[fallthrough]];
 
     case SRV_STATS_NULLS_UNEQUAL:
       /* for both SRV_STATS_NULLS_IGNORED and SRV_STATS_NULLS_UNEQUAL
diff -Nru mysql-8.0-8.0.26/storage/innobase/btr/btr0load.cc mysql-8.0-8.0.27/storage/innobase/btr/btr0load.cc
--- mysql-8.0-8.0.26/storage/innobase/btr/btr0load.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/btr/btr0load.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,1329 @@
+/*****************************************************************************
+
+Copyright (c) 2014, 2021, Oracle and/or its affiliates. All Rights Reserved.
+
+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, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
+/** @file btr/btr0load.cc
+ The B-tree bulk load
+
+ Created 03/11/2014 Shaohua Wang
+ *******************************************************/
+
+#include "btr0load.h"
+#include "btr0btr.h"
+#include "btr0cur.h"
+#include "btr0pcur.h"
+#include "ibuf0ibuf.h"
+#include "lob0lob.h"
+
+namespace ddl {
+/** Innodb B-tree index fill factor for bulk load. */
+long fill_factor;
+}  // namespace ddl
+
+/** The proper function call sequence of Page_load is as below:
+-- Page_load::init
+-- Page_load::insert
+-- Page_load::finish
+-- Page_load::compress(COMPRESSED table only)
+-- Page_load::page_split(COMPRESSED table only)
+-- Page_load::commit */
+class Page_load : private ut::Non_copyable {
+  using Rec_offsets = ulint *;
+
+  /** Page split point descriptor. */
+  struct Split_point {
+    /** Record being the point of split.
+    All records before this record should stay on current on page.
+    This record and all following records should be moved to new page. */
+    rec_t *m_rec{};
+
+    /** Number of records before this record. */
+    size_t m_n_rec_before{};
+  };
+
+ public:
+  /** Constructor
+  @param[in]	index		          B-tree index
+  @param[in]	trx_id		        Transaction id
+  @param[in]	page_no		        Page number
+  @param[in]	level		          Page level
+  @param[in]	observer	        Flush observer */
+  Page_load(dict_index_t *index, trx_id_t trx_id, page_no_t page_no,
+            size_t level, Flush_observer *observer) noexcept
+      : m_index(index),
+        m_trx_id(trx_id),
+        m_page_no(page_no),
+        m_level(level),
+        m_is_comp(dict_table_is_comp(index->table)),
+        m_flush_observer(observer) {
+    ut_ad(!dict_index_is_spatial(m_index));
+  }
+
+  /** Destructor */
+  ~Page_load() noexcept {
+    if (m_heap != nullptr) {
+      /* mtr is allocated using heap. */
+      if (m_mtr != nullptr) {
+        ut_a(!m_mtr->is_active());
+        m_mtr->~mtr_t();
+      }
+      mem_heap_free(m_heap);
+    }
+  }
+
+ private:
+  /** Initialize members and allocate page if needed and start mtr.
+  @note Must be called and only once right after constructor.
+  @return error code */
+  [[nodiscard]] dberr_t init() noexcept;
+
+  /** Insert a tuple in the page.
+  @param[in]  tuple             Tuple to insert
+  @param[in]  big_rec           External record
+  @param[in]  rec_size          Record size
+  @return error code */
+  [[nodiscard]] dberr_t insert(const dtuple_t *tuple, const big_rec_t *big_rec,
+                               size_t rec_size) noexcept;
+
+  /** Mark end of insertion to the page. Scan records to set page dirs,
+  and set page header members. The scan is incremental (slots and records
+  which assignment could be "finalized" are not checked again. Check the
+  m_slotted_rec_no usage, note it could be reset in some cases like
+  during split.
+  Note: we refer to page_copy_rec_list_end_to_created_page. */
+  void finish() noexcept;
+
+  /** Commit mtr for a page */
+  void commit() noexcept;
+
+  /** Commit mtr for a page */
+  void rollback() noexcept;
+
+  /** Compress if it is compressed table
+  @return	true	compress successfully or no need to compress
+  @return	false	compress failed. */
+  [[nodiscard]] bool compress() noexcept;
+
+  /** Check whether the record needs to be stored externally.
+  @return false if the entire record can be stored locally on the page */
+  [[nodiscard]] bool need_ext(const dtuple_t *tuple,
+                              size_t rec_size) const noexcept;
+
+  /** Get node pointer
+  @return node pointer */
+  [[nodiscard]] dtuple_t *get_node_ptr() noexcept;
+
+  /** Split the page records between this and given bulk.
+   * @param new_page_load  The new bulk to store split records. */
+  void split(Page_load &new_page_load) noexcept;
+
+  /** Copy all records from page.
+  @param[in]  src_page          Page with records to copy. */
+  void copy_all(const page_t *src_page) noexcept;
+
+  /** Set next page
+  @param[in]	next_page_no	    Next page no */
+  void set_next(page_no_t next_page_no) noexcept;
+
+  /** Set previous page
+  @param[in]	prev_page_no	    Previous page no */
+  void set_prev(page_no_t prev_page_no) noexcept;
+
+  /** Release block by committing mtr */
+  inline void release() noexcept;
+
+  /** Start mtr and latch block */
+  inline void latch() noexcept;
+
+  /** Check if required space is available in the page for the rec
+  to be inserted.	We check fill factor & padding here.
+  @param[in]	rec_size	        Required space
+  @return true	if space is available */
+  [[nodiscard]] inline bool is_space_available(size_t rec_size) const noexcept;
+
+  /** Get page no */
+  [[nodiscard]] page_no_t get_page_no() const noexcept { return m_page_no; }
+
+  /** Get page level */
+  [[nodiscard]] size_t get_level() const noexcept { return m_level; }
+
+  /** Get record no */
+  [[nodiscard]] size_t get_rec_no() const { return m_rec_no; }
+
+  /** Get page */
+  [[nodiscard]] const page_t *get_page() const noexcept { return m_page; }
+
+  /** Check if table is compressed.
+  @return true if table is compressed, false otherwise. */
+  [[nodiscard]] bool is_table_compressed() const noexcept {
+    return m_page_zip != nullptr;
+  }
+
+#ifdef UNIV_DEBUG
+  /** Check if index is X locked
+  @return true if index is locked. */
+  bool is_index_locked() noexcept;
+#endif /* UNIV_DEBUG */
+
+  /** Get page split point. We split a page in half when compression
+  fails, and the split record and all following records should be copied
+  to the new page.
+  @return split record descriptor */
+  [[nodiscard]] Split_point get_split_rec() noexcept;
+
+  /** Copy given and all following records.
+  @param[in]  first_rec         First record to copy */
+  void copy_records(const rec_t *first_rec) noexcept;
+
+  /** Remove all records after split rec including itself.
+  @param[in]  split_point       Split point descriptor */
+  void split_trim(const Split_point &split_point) noexcept;
+
+  /** Insert a record in the page, check for duplicates too.
+  @param[in]  rec               Record
+  @param[in]  offsets           Record offsets
+  @return DB_SUCCESS or error code. */
+  dberr_t insert(const rec_t *rec, Rec_offsets offsets) noexcept;
+
+  /** Store external record
+  Since the record is not logged yet, so we don't log update to the record.
+  the blob data is logged first, then the record is logged in bulk mode.
+  @param[in]  big_rec           External record
+  @param[in]  offsets           Record offsets
+  @return error code */
+  [[nodiscard]] dberr_t store_ext(const big_rec_t *big_rec,
+                                  Rec_offsets offsets) noexcept;
+
+ private:
+  /** Memory heap for internal allocation */
+  mem_heap_t *m_heap{};
+
+  /** The index B-tree */
+  dict_index_t *m_index{};
+
+  /** The min-transaction */
+  mtr_t *m_mtr{};
+
+  /** The transaction id */
+  trx_id_t m_trx_id{};
+
+  /** The buffer block */
+  buf_block_t *m_block{};
+
+  /** The page */
+  page_t *m_page{};
+
+  /** The page zip descriptor */
+  page_zip_des_t *m_page_zip{};
+
+  /** The current rec, just before the next insert rec */
+  rec_t *m_cur_rec{};
+
+  /** The page no */
+  page_no_t m_page_no{};
+
+  /** The page level in B-tree */
+  size_t m_level{};
+
+  /** Flag: is page in compact format */
+  const bool m_is_comp{};
+
+  /** The heap top in page for next insert */
+  byte *m_heap_top{};
+
+  /** User record no */
+  size_t m_rec_no{};
+
+  /** The free space left in the page */
+  size_t m_free_space{};
+
+  /** The reserved space for fill factor */
+  size_t m_reserved_space{};
+
+  /** The padding space for compressed page */
+  size_t m_padding_space{};
+
+  /** Total data in the page */
+  IF_DEBUG(size_t m_total_data{};)
+
+  /** The modify clock value of the buffer block
+  when the block is re-pinned */
+  uint64_t m_modify_clock{};
+
+  /** Flush observer */
+  Flush_observer *m_flush_observer{};
+
+  /** Last record assigned to a slot. */
+  rec_t *m_last_slotted_rec{};
+
+  /** Number of records assigned to slots. */
+  size_t m_slotted_rec_no{};
+
+  /** Page modified flag. */
+  bool m_modified{};
+
+  friend class Btree_load;
+};
+
+dberr_t Page_load::init() noexcept {
+  page_t *new_page;
+  page_no_t new_page_no;
+  buf_block_t *new_block;
+  page_zip_des_t *new_page_zip;
+
+  ut_ad(m_heap == nullptr);
+
+  m_heap = mem_heap_create(1024);
+
+  auto mtr_alloc = mem_heap_alloc(m_heap, sizeof(mtr_t));
+
+  auto mtr = new (mtr_alloc) mtr_t();
+
+  mtr->start();
+
+  if (!dict_index_is_online_ddl(m_index)) {
+    mtr->x_lock(dict_index_get_lock(m_index), __FILE__, __LINE__);
+  }
+
+  mtr->set_log_mode(MTR_LOG_NO_REDO);
+  mtr->set_flush_observer(m_flush_observer);
+
+  if (m_page_no == FIL_NULL) {
+    mtr_t alloc_mtr;
+
+    /* We commit redo log for allocation by a separate mtr,
+    because we don't guarantee pages are committed following
+    the allocation order, and we will always generate redo log
+    for page allocation, even when creating a new tablespace. */
+    alloc_mtr.start();
+
+    ulint n_reserved;
+    bool success = fsp_reserve_free_extents(&n_reserved, m_index->space, 1,
+                                            FSP_NORMAL, &alloc_mtr);
+    if (!success) {
+      alloc_mtr.commit();
+      mtr->commit();
+      return DB_OUT_OF_FILE_SPACE;
+    }
+
+    /* Allocate a new page. */
+    new_block = btr_page_alloc(m_index, 0, FSP_UP, m_level, &alloc_mtr, mtr);
+
+    if (n_reserved > 0) {
+      fil_space_release_free_extents(m_index->space, n_reserved);
+    }
+
+    alloc_mtr.commit();
+
+    new_page = buf_block_get_frame(new_block);
+    new_page_zip = buf_block_get_page_zip(new_block);
+    new_page_no = page_get_page_no(new_page);
+
+    ut_ad(!dict_index_is_spatial(m_index));
+    ut_ad(!dict_index_is_sdi(m_index));
+
+    if (new_page_zip) {
+      page_create_zip(new_block, m_index, m_level, 0, mtr, FIL_PAGE_INDEX);
+    } else {
+      ut_ad(!dict_index_is_spatial(m_index));
+      page_create(new_block, mtr, dict_table_is_comp(m_index->table),
+                  FIL_PAGE_INDEX);
+      btr_page_set_level(new_page, nullptr, m_level, mtr);
+    }
+
+    btr_page_set_next(new_page, nullptr, FIL_NULL, mtr);
+    btr_page_set_prev(new_page, nullptr, FIL_NULL, mtr);
+
+    btr_page_set_index_id(new_page, nullptr, m_index->id, mtr);
+  } else {
+    page_id_t page_id(dict_index_get_space(m_index), m_page_no);
+    page_size_t page_size(dict_table_page_size(m_index->table));
+
+    new_block = btr_block_get(page_id, page_size, RW_X_LATCH, m_index, mtr);
+
+    new_page = buf_block_get_frame(new_block);
+    new_page_zip = buf_block_get_page_zip(new_block);
+    new_page_no = page_get_page_no(new_page);
+    ut_ad(m_page_no == new_page_no);
+
+    ut_ad(page_dir_get_n_heap(new_page) == PAGE_HEAP_NO_USER_LOW);
+
+    btr_page_set_level(new_page, nullptr, m_level, mtr);
+  }
+
+  if (dict_index_is_sec_or_ibuf(m_index) && !m_index->table->is_temporary() &&
+      page_is_leaf(new_page)) {
+    page_update_max_trx_id(new_block, nullptr, m_trx_id, mtr);
+  }
+
+  m_mtr = mtr;
+  m_block = new_block;
+  m_page = new_page;
+  m_page_zip = new_page_zip;
+  m_page_no = new_page_no;
+  m_cur_rec = page_get_infimum_rec(new_page);
+  ut_ad(m_is_comp == !!page_is_comp(new_page));
+  m_free_space = page_get_free_space_of_empty(m_is_comp);
+
+  if (ddl::fill_factor == 100 && m_index->is_clustered()) {
+    /* Keep default behavior compatible with 5.6 */
+    m_reserved_space = dict_index_get_space_reserve();
+  } else {
+    m_reserved_space = UNIV_PAGE_SIZE * (100 - ddl::fill_factor) / 100;
+  }
+
+  m_padding_space =
+      UNIV_PAGE_SIZE - dict_index_zip_pad_optimal_page_size(m_index);
+  m_heap_top = page_header_get_ptr(new_page, PAGE_HEAP_TOP);
+  m_rec_no = page_header_get_field(new_page, PAGE_N_RECS);
+
+  m_last_slotted_rec = page_get_infimum_rec(m_page);
+  m_slotted_rec_no = 0;
+
+  m_modified = true;
+
+  ut_d(m_total_data = 0);
+
+  return DB_SUCCESS;
+}
+
+dberr_t Page_load::insert(const rec_t *rec, Rec_offsets offsets) noexcept {
+  ut_ad(m_heap != nullptr);
+
+  auto rec_size = rec_offs_size(offsets);
+
+#ifdef UNIV_DEBUG
+  /* Check whether records are in order. */
+  if (!page_rec_is_infimum(m_cur_rec)) {
+    auto old_rec = m_cur_rec;
+
+    auto old_offsets =
+        rec_get_offsets(old_rec, m_index, nullptr, ULINT_UNDEFINED, &m_heap);
+
+    ut_ad(cmp_rec_rec(rec, old_rec, offsets, old_offsets, m_index,
+                      page_is_spatial_non_leaf(old_rec, m_index)) > 0 ||
+          (m_index->is_multi_value() &&
+           cmp_rec_rec(rec, old_rec, offsets, old_offsets, m_index,
+                       page_is_spatial_non_leaf(old_rec, m_index)) >= 0));
+  }
+
+  m_total_data += rec_size;
+#endif /* UNIV_DEBUG */
+
+  /* 0. Mark space for record as used (checked e.g. in page_rec_set_next). */
+  page_header_set_ptr(m_page, nullptr, PAGE_HEAP_TOP, m_heap_top + rec_size);
+
+  /* 1. Copy the record to page. */
+  auto insert_rec = rec_copy(m_heap_top, rec, offsets);
+  rec_offs_make_valid(insert_rec, m_index, offsets);
+
+  /* 2. Insert the record in the linked list. */
+  rec_t *next_rec = page_rec_get_next(m_cur_rec);
+
+  page_rec_set_next(insert_rec, next_rec);
+  page_rec_set_next(m_cur_rec, insert_rec);
+
+  /* 3. Set the n_owned field in the inserted record to zero,
+  and set the heap_no field. */
+  if (m_is_comp) {
+    rec_set_n_owned_new(insert_rec, nullptr, 0);
+    rec_set_heap_no_new(insert_rec, PAGE_HEAP_NO_USER_LOW + m_rec_no);
+  } else {
+    rec_set_n_owned_old(insert_rec, 0);
+    rec_set_heap_no_old(insert_rec, PAGE_HEAP_NO_USER_LOW + m_rec_no);
+  }
+
+  /* 4. Set member variables. */
+  auto slot_size = page_dir_calc_reserved_space(m_rec_no + 1) -
+                   page_dir_calc_reserved_space(m_rec_no);
+
+  ut_ad(m_free_space >= rec_size + slot_size);
+  ut_ad(m_heap_top + rec_size < m_page + UNIV_PAGE_SIZE);
+
+  m_free_space -= rec_size + slot_size;
+  m_heap_top += rec_size;
+  m_rec_no += 1;
+  m_cur_rec = insert_rec;
+
+  m_modified = true;
+
+  return DB_SUCCESS;
+}
+
+dberr_t Page_load::insert(const dtuple_t *tuple, const big_rec_t *big_rec,
+                          size_t rec_size) noexcept {
+  IF_ENABLED("ddl_btree_build_insert_return_interrupt", return DB_INTERRUPTED;)
+
+  /* Convert tuple to record. */
+  auto rec_mem = static_cast<byte *>(mem_heap_alloc(m_heap, rec_size));
+
+  auto rec = rec_convert_dtuple_to_rec(rec_mem, m_index, tuple);
+
+  Rec_offsets offsets{};
+
+  offsets = rec_get_offsets(rec, m_index, offsets, ULINT_UNDEFINED, &m_heap);
+
+  /* Insert the record.*/
+  const auto err = insert(rec, offsets);
+
+  if (err != DB_SUCCESS) {
+    return err;
+  }
+
+  ut_ad(m_modified);
+
+  if (big_rec != nullptr) {
+    /* The page must be valid as MTR may be committed during LOB insertion. */
+    finish();
+    return store_ext(big_rec, offsets);
+  } else {
+    return DB_SUCCESS;
+  }
+}
+
+void Page_load::finish() noexcept {
+  ut_ad(!dict_index_is_spatial(m_index));
+
+  if (!m_modified) {
+    return;
+  }
+
+  ut_ad(m_total_data + page_dir_calc_reserved_space(m_rec_no) <=
+        page_get_free_space_of_empty(m_is_comp));
+
+  auto n_rec_to_assign = m_rec_no - m_slotted_rec_no;
+
+  /* Fill slots for non-supremum records if possible.
+   * Slot for supremum record could store up to
+   * PAGE_DIR_SLOT_MAX_N_OWNED-1 records. */
+  while (n_rec_to_assign >= PAGE_DIR_SLOT_MAX_N_OWNED) {
+    static constexpr size_t RECORDS_PER_SLOT =
+        (PAGE_DIR_SLOT_MAX_N_OWNED + 1) / 2;
+
+    for (size_t i = 0; i < RECORDS_PER_SLOT; ++i) {
+      m_last_slotted_rec = page_rec_get_next(m_last_slotted_rec);
+    }
+    m_slotted_rec_no += RECORDS_PER_SLOT;
+
+    /* Reserve next slot (must be done before slot is used). */
+    auto n_slots = page_dir_get_n_slots(m_page);
+    page_dir_set_n_slots(m_page, nullptr, n_slots + 1);
+
+    /* Fill the slot data. */
+    auto slot = page_dir_get_nth_slot(m_page, n_slots - 1);
+    page_dir_slot_set_rec(slot, m_last_slotted_rec);
+    page_dir_slot_set_n_owned(slot, nullptr, RECORDS_PER_SLOT);
+
+    n_rec_to_assign -= RECORDS_PER_SLOT;
+  }
+
+  /* Assign remaining records to slot with supremum record. */
+  auto n_slots = page_dir_get_n_slots(m_page);
+  auto slot = page_dir_get_nth_slot(m_page, n_slots - 1);
+  auto sup_rec = page_get_supremum_rec(m_page);
+
+  page_dir_slot_set_rec(slot, sup_rec);
+  page_dir_slot_set_n_owned(slot, nullptr, n_rec_to_assign + 1);
+
+  page_header_set_ptr(m_page, nullptr, PAGE_HEAP_TOP, m_heap_top);
+  page_dir_set_n_heap(m_page, nullptr, PAGE_HEAP_NO_USER_LOW + m_rec_no);
+  page_header_set_field(m_page, nullptr, PAGE_N_RECS, m_rec_no);
+
+  page_header_set_ptr(m_page, nullptr, PAGE_LAST_INSERT, m_cur_rec);
+  page_header_set_field(m_page, nullptr, PAGE_DIRECTION, PAGE_RIGHT);
+  page_header_set_field(m_page, nullptr, PAGE_N_DIRECTION, 0);
+
+  m_modified = false;
+}
+
+void Page_load::commit() noexcept {
+  /* It is assumed that finish() was called before commit */
+  ut_a(!m_modified);
+  ut_a(page_validate(m_page, m_index));
+  ut_a(m_rec_no > 0);
+
+  /* Set no free space left and no buffered changes in ibuf. */
+  if (!m_index->is_clustered() && !m_index->table->is_temporary() &&
+      page_is_leaf(m_page)) {
+    ibuf_set_bitmap_for_bulk_load(m_block, ddl::fill_factor == 100);
+  }
+
+  m_mtr->commit();
+}
+
+void Page_load::rollback() noexcept {
+  /* It is assumed that finish() was called before commit */
+  ut_a(!m_modified);
+  ut_a(page_validate(m_page, m_index));
+
+  m_mtr->commit();
+}
+
+bool Page_load::compress() noexcept {
+  ut_ad(!m_modified);
+  ut_ad(m_page_zip != nullptr);
+
+  return page_zip_compress(m_page_zip, m_page, m_index, page_zip_level, m_mtr);
+}
+
+dtuple_t *Page_load::get_node_ptr() noexcept {
+  /* Create node pointer */
+  auto first_rec = page_rec_get_next(page_get_infimum_rec(m_page));
+  ut_a(page_rec_is_user_rec(first_rec));
+
+  auto node_ptr =
+      dict_index_build_node_ptr(m_index, first_rec, m_page_no, m_heap, m_level);
+
+  return node_ptr;
+}
+
+void Page_load::split(Page_load &new_page_loader) noexcept {
+  auto split_point = get_split_rec();
+
+  new_page_loader.copy_records(split_point.m_rec);
+  split_trim(split_point);
+
+  ut_ad(new_page_loader.m_modified);
+  ut_ad(m_modified);
+}
+
+Page_load::Split_point Page_load::get_split_rec() noexcept {
+  ut_a(m_rec_no >= 2);
+  ut_a(m_page_zip != nullptr);
+  ut_a(page_get_free_space_of_empty(m_is_comp) > m_free_space);
+
+  auto total_used_size = page_get_free_space_of_empty(m_is_comp) - m_free_space;
+
+  size_t n_recs{};
+  Rec_offsets offsets{};
+  size_t total_recs_size{};
+
+  auto rec = page_get_infimum_rec(m_page);
+
+  do {
+    rec = page_rec_get_next(rec);
+    ut_ad(page_rec_is_user_rec(rec));
+
+    offsets =
+        rec_get_offsets(rec, m_index, offsets, ULINT_UNDEFINED, &(m_heap));
+    total_recs_size += rec_offs_size(offsets);
+    n_recs++;
+  } while (total_recs_size + page_dir_calc_reserved_space(n_recs) <
+           total_used_size / 2);
+
+  /* Keep at least one record on left page */
+  if (page_rec_is_infimum(page_rec_get_prev(rec))) {
+    rec = page_rec_get_next(rec);
+    ut_ad(page_rec_is_user_rec(rec));
+  } else {
+    /* rec is to be moved, and this is used as number of records before split */
+    --n_recs;
+  }
+
+  return Split_point{rec, n_recs};
+}
+
+void Page_load::copy_all(const page_t *src_page) noexcept {
+  auto inf_rec = page_get_infimum_rec(src_page);
+  auto first_rec = page_rec_get_next_const(inf_rec);
+
+  ut_ad(page_rec_is_user_rec(first_rec));
+
+  copy_records(first_rec);
+
+  ut_ad(m_modified);
+}
+
+void Page_load::copy_records(const rec_t *first_rec) noexcept {
+  Rec_offsets offsets{};
+  const rec_t *rec = first_rec;
+
+  ut_ad(m_rec_no == 0);
+  ut_ad(page_rec_is_user_rec(rec));
+
+  do {
+    offsets =
+        rec_get_offsets(rec, m_index, offsets, ULINT_UNDEFINED, &(m_heap));
+
+    insert(rec, offsets);
+
+    rec = page_rec_get_next_const(rec);
+  } while (!page_rec_is_supremum(rec));
+
+  ut_ad(m_rec_no > 0);
+}
+
+void Page_load::split_trim(const Split_point &split_point) noexcept {
+  /* Suppose before copyOut, we have 5 records on the page:
+  infimum->r1->r2->r3->r4->r5->supremum, and r3 is the split rec.
+
+  after copyOut, we have 2 records on the page:
+  infimum->r1->r2->supremum. slot adjustment is not done. */
+
+  /* Set number of user records. */
+  auto new_rec_no = split_point.m_n_rec_before;
+  ut_a(new_rec_no > 0);
+
+  /* Set last record's next in page */
+  rec_t *new_last_user_rec = page_rec_get_prev(split_point.m_rec);
+  page_rec_set_next(new_last_user_rec, page_get_supremum_rec(m_page));
+
+  /* Set related members */
+  auto old_heap_top = m_heap_top;
+
+  Rec_offsets offsets{};
+  offsets = rec_get_offsets(new_last_user_rec, m_index, offsets,
+                            ULINT_UNDEFINED, &(m_heap));
+  m_heap_top = rec_get_end(new_last_user_rec, offsets);
+
+  m_free_space +=
+      (old_heap_top - m_heap_top) + (page_dir_calc_reserved_space(m_rec_no) -
+                                     page_dir_calc_reserved_space(new_rec_no));
+  ut_ad(m_free_space > 0);
+
+  m_cur_rec = new_last_user_rec;
+  m_rec_no = new_rec_no;
+
+  ut_d(m_total_data -= old_heap_top - m_heap_top);
+
+  /* Invalidate all slots except infimum. */
+  auto n_slots = page_dir_get_n_slots(m_page);
+
+  for (size_t slot_idx = 1; slot_idx < n_slots; ++slot_idx) {
+    auto slot = page_dir_get_nth_slot(m_page, slot_idx);
+    page_dir_slot_set_n_owned(slot, nullptr, 0);
+  }
+
+  page_dir_set_n_slots(m_page, nullptr, 2);
+
+  /* No records assigned to slots. */
+  m_last_slotted_rec = page_get_infimum_rec(m_page);
+  m_slotted_rec_no = 0;
+
+  m_modified = true;
+}
+
+void Page_load::set_next(page_no_t next_page_no) noexcept {
+  btr_page_set_next(m_page, nullptr, next_page_no, m_mtr);
+}
+
+void Page_load::set_prev(page_no_t prev_page_no) noexcept {
+  btr_page_set_prev(m_page, nullptr, prev_page_no, m_mtr);
+}
+
+bool Page_load::is_space_available(size_t rec_size) const noexcept {
+  auto slot_size = page_dir_calc_reserved_space(m_rec_no + 1) -
+                   page_dir_calc_reserved_space(m_rec_no);
+
+  auto required_space = rec_size + slot_size;
+
+  if (required_space > m_free_space) {
+    ut_a(m_rec_no > 0);
+    return false;
+  }
+
+  /* Fillfactor & Padding apply to both leaf and non-leaf pages.
+  Note: we keep at least 2 records in a page to avoid B-tree level
+  growing too high. */
+  if (m_rec_no >= 2 && ((m_page_zip == nullptr &&
+                         m_free_space - required_space < m_reserved_space) ||
+                        (m_page_zip != nullptr &&
+                         m_free_space - required_space < m_padding_space))) {
+    return false;
+  }
+
+  return true;
+}
+
+bool Page_load::need_ext(const dtuple_t *tuple,
+                         size_t rec_size) const noexcept {
+  return page_zip_rec_needs_ext(rec_size, m_is_comp, dtuple_get_n_fields(tuple),
+                                m_block->page.size);
+}
+
+dberr_t Page_load::store_ext(const big_rec_t *big_rec,
+                             Rec_offsets offsets) noexcept {
+  ut_ad(m_index->is_clustered());
+
+  /* Note: not all fields are initialized in btr_pcur. */
+  btr_pcur_t btr_pcur;
+  btr_pcur.m_pos_state = BTR_PCUR_IS_POSITIONED;
+  btr_pcur.m_latch_mode = BTR_MODIFY_LEAF;
+  btr_pcur.m_btr_cur.index = m_index;
+
+  page_cur_t *page_cur = &btr_pcur.m_btr_cur.page_cur;
+  page_cur->index = m_index;
+  page_cur->rec = m_cur_rec;
+  page_cur->offsets = offsets;
+  page_cur->block = m_block;
+
+  dberr_t err = lob::btr_store_big_rec_extern_fields(
+      nullptr, &btr_pcur, nullptr, offsets, big_rec, m_mtr,
+      lob::OPCODE_INSERT_BULK);
+
+  ut_ad(page_offset(m_cur_rec) == page_offset(page_cur->rec));
+
+  /* Reset m_block and m_cur_rec from page cursor, because
+  block may be changed during blob insert. */
+  m_block = page_cur->block;
+  m_cur_rec = page_cur->rec;
+  m_page = buf_block_get_frame(m_block);
+
+  return err;
+}
+
+void Page_load::release() noexcept {
+  /* Make sure page is valid before it is released. */
+  if (m_modified) {
+    finish();
+    ut_ad(!m_modified);
+  }
+
+  ut_ad(page_validate(m_page, m_index));
+  ut_ad(!dict_index_is_spatial(m_index));
+  ut_ad(m_block->page.buf_fix_count > 0);
+
+  /* We fix the block because we will re-pin it soon. */
+  buf_block_buf_fix_inc(m_block, __FILE__, __LINE__);
+
+  m_modify_clock = m_block->get_modify_clock(IF_DEBUG(true));
+
+  m_mtr->commit();
+}
+
+/** Start mtr and latch the block */
+void Page_load::latch() noexcept {
+  m_mtr->start();
+
+  if (!dict_index_is_online_ddl(m_index)) {
+    m_mtr->x_lock(dict_index_get_lock(m_index), __FILE__, __LINE__);
+  }
+
+  m_mtr->set_log_mode(MTR_LOG_NO_REDO);
+  m_mtr->set_flush_observer(m_flush_observer);
+
+  ut_a(m_block->page.buf_fix_count > 0);
+
+  /* TODO: need a simple and wait version of buf_page_optimistic_get. */
+
+  /* Since we using the mtr_t mechanism, we have to follow the existing
+  rules. We are going to write to the page, for which we need an X latch
+  on the page. mtr_t infrastructure uses the X latch to determine
+  if the page was dirtied or not. We have to hack around the fix count
+  rules to make it work. */
+  auto success =
+      buf_page_optimistic_get(RW_X_LATCH, m_block, m_modify_clock,
+                              Page_fetch::NORMAL, __FILE__, __LINE__, m_mtr);
+
+  /* In case the block is S-latched by page_cleaner. */
+  if (!success) {
+    page_id_t page_id(dict_index_get_space(m_index), m_page_no);
+    page_size_t page_size(dict_table_page_size(m_index->table));
+
+    m_block =
+        buf_page_get_gen(page_id, page_size, RW_X_LATCH, m_block,
+                         Page_fetch::IF_IN_POOL, __FILE__, __LINE__, m_mtr);
+    ut_ad(m_block != nullptr);
+  }
+
+  buf_block_buf_fix_dec(m_block);
+
+  /* The caller is going to use the m_block, so it needs to be buffer-fixed
+  even after the decrement above. This works like this:
+  release(){
+    // Initially buf_fix_count == N > 0
+    ++buf_fix_count; // N + 1
+    mtr.commit() {
+      --buf_fix_count // N
+    }
+  }
+  // At the end buf_fix_count == N > 0
+  latch(){
+    // Initially buf_fix_count == M > 0
+    buf_page_get_gen/buf_page_optimistic_get internally(){
+      ++buf_fix_count // M+1
+    }
+    --buf_fix_count // M
+  }
+  / At the end buf_fix_count == M > 0 */
+
+  ut_a(m_block->page.buf_fix_count > 0);
+  ut_a(m_cur_rec > m_page && m_cur_rec < m_heap_top);
+}
+
+#ifdef UNIV_DEBUG
+bool Page_load::is_index_locked() noexcept {
+  return dict_index_is_online_ddl(m_index) &&
+         m_mtr->memo_contains_flagged(dict_index_get_lock(m_index),
+                                      MTR_MEMO_X_LOCK | MTR_MEMO_SX_LOCK);
+}
+#endif /* UNIV_DEBUG */
+
+dberr_t Btree_load::page_split(Page_load *page_loader,
+                               Page_load *next_page_loader) noexcept {
+  ut_ad(page_loader->is_table_compressed());
+
+  /* 1. Check if we have only one user record on the page. */
+  if (page_loader->get_rec_no() <= 1) {
+    return DB_TOO_BIG_RECORD;
+  }
+
+  /* 2. create a new page. */
+  Page_load new_page_loader(m_index, m_trx_id, FIL_NULL,
+                            page_loader->get_level(), m_flush_observer);
+
+  auto err = new_page_loader.init();
+
+  if (err != DB_SUCCESS) {
+    return err;
+  }
+
+  /* 3. copy the upper half to new page. */
+  page_loader->split(new_page_loader);
+
+  /* 4. finish page bulk modifications. */
+  page_loader->finish();
+  new_page_loader.finish();
+
+  /* 5. commit the split page. */
+  err = page_commit(page_loader, &new_page_loader, true);
+  if (err != DB_SUCCESS) {
+    new_page_loader.rollback();
+    return err;
+  }
+
+  /* 6. commit the new page. */
+  err = page_commit(&new_page_loader, next_page_loader, true);
+  if (err != DB_SUCCESS) {
+    new_page_loader.rollback();
+    return err;
+  }
+
+  return err;
+}
+
+dberr_t Btree_load::page_commit(Page_load *page_loader,
+                                Page_load *next_page_loader,
+                                bool insert_father) noexcept {
+  /* Set page links */
+  if (next_page_loader != nullptr) {
+    ut_ad(page_loader->get_level() == next_page_loader->get_level());
+
+    page_loader->set_next(next_page_loader->get_page_no());
+    next_page_loader->set_prev(page_loader->get_page_no());
+  } else {
+    /* Suppose a page is released and latched again, we need to
+    mark it modified in mini-transaction.  */
+    page_loader->set_next(FIL_NULL);
+  }
+
+  /* Assert that no locks are held during bulk load operation
+  in case of a online ddl operation. Insert thread acquires index->lock
+  to check the online status of index. During bulk load index,
+  there are no concurrent insert or reads and hence, there is no
+  need to acquire a lock in that case. */
+  ut_ad(!page_loader->is_index_locked());
+
+  IF_ENABLED("ddl_btree_build_sleep", os_thread_sleep(1000000);)
+
+  /* Compress page if it's a compressed table. */
+  if (page_loader->is_table_compressed() && !page_loader->compress()) {
+    return page_split(page_loader, next_page_loader);
+  }
+
+  /* Insert node pointer to father page. */
+  if (insert_father) {
+    auto node_ptr = page_loader->get_node_ptr();
+    const dberr_t err = insert(node_ptr, page_loader->get_level() + 1);
+
+    if (err != DB_SUCCESS) {
+      return err;
+    }
+  }
+
+  /* Commit mtr. */
+  page_loader->commit();
+
+  return DB_SUCCESS;
+}
+
+void Btree_load::log_free_check() noexcept {
+  if (log_needs_free_check()) {
+    release();
+
+    ::log_free_check();
+
+    latch();
+  }
+}
+
+Btree_load::Btree_load(dict_index_t *index, trx_id_t trx_id,
+                       Flush_observer *observer) noexcept
+    : m_index(index), m_trx_id(trx_id), m_flush_observer(observer) {
+  ut_a(m_flush_observer != nullptr);
+  ut_d(fil_space_inc_redo_skipped_count(m_index->space));
+  ut_d(m_index_online = m_index->online_status);
+}
+
+Btree_load::~Btree_load() noexcept {
+  ut_d(fil_space_dec_redo_skipped_count(m_index->space));
+}
+
+void Btree_load::release() noexcept {
+  ut_a(m_root_level + 1 == m_page_loaders.size());
+
+  for (size_t level = 0; level <= m_root_level; level++) {
+    auto page_loader = m_page_loaders[level];
+    page_loader->release();
+  }
+}
+
+void Btree_load::latch() noexcept {
+  if (m_n_recs == 0) {
+    /* Nothing to latch. */
+    return;
+  }
+
+  ut_ad(m_root_level + 1 == m_page_loaders.size());
+
+  for (size_t level = 0; level <= m_root_level; level++) {
+    auto page_loader = m_page_loaders[level];
+    page_loader->latch();
+  }
+}
+
+dberr_t Btree_load::prepare_space(Page_load *&page_loader, size_t level,
+                                  size_t rec_size) noexcept {
+  if (page_loader->is_space_available(rec_size)) {
+    return DB_SUCCESS;
+  }
+
+  /* Finish page modifications. */
+  page_loader->finish();
+
+  IF_ENABLED("ddl_btree_build_oom", return DB_OUT_OF_MEMORY;)
+
+  /* Create a sibling page_loader. */
+  auto sibling_page_loader =
+      ut::new_withkey<Page_load>(UT_NEW_THIS_FILE_PSI_KEY, m_index, m_trx_id,
+                                 FIL_NULL, level, m_flush_observer);
+
+  if (sibling_page_loader == nullptr) {
+    return DB_OUT_OF_MEMORY;
+  }
+
+  {
+    auto err = sibling_page_loader->init();
+
+    if (err != DB_SUCCESS) {
+      ut::delete_(sibling_page_loader);
+      return err;
+    }
+  }
+
+  /* Commit page bulk. */
+  {
+    auto err = page_commit(page_loader, sibling_page_loader, true);
+
+    if (err != DB_SUCCESS) {
+      sibling_page_loader->rollback();
+      ut::delete_(sibling_page_loader);
+      return err;
+    }
+  }
+
+  /* Set new page bulk to page_loaders. */
+  ut_a(sibling_page_loader->get_level() <= m_root_level);
+
+  m_page_loaders[level] = sibling_page_loader;
+
+  ut::delete_(page_loader);
+
+  page_loader = sibling_page_loader;
+
+  /* Important: log_free_check whether we need a checkpoint. */
+  if (page_is_leaf(sibling_page_loader->get_page())) {
+    /* Wake up page cleaner to flush dirty pages. */
+    srv_inc_activity_count();
+    os_event_set(buf_flush_event);
+
+    log_free_check();
+  }
+
+  return DB_SUCCESS;
+}
+
+dberr_t Btree_load::insert(Page_load *page_loader, dtuple_t *tuple,
+                           big_rec_t *big_rec, size_t rec_size) noexcept {
+  if (big_rec != nullptr) {
+    ut_a(m_index->is_clustered());
+    ut_a(page_loader->get_level() == 0);
+    ut_a(page_loader == m_page_loaders[0]);
+
+    /* Release all latched but leaf node. */
+    for (size_t level = 1; level <= m_root_level; ++level) {
+      auto page_loader = m_page_loaders[level];
+
+      page_loader->release();
+    }
+  }
+
+  auto err = page_loader->insert(tuple, big_rec, rec_size);
+
+  if (big_rec != nullptr) {
+    /* Restore latches */
+    for (size_t level = 1; level <= m_root_level; ++level) {
+      auto page_loader = m_page_loaders[level];
+      page_loader->latch();
+    }
+  }
+
+  return err;
+}
+
+dberr_t Btree_load::insert(dtuple_t *tuple, size_t level) noexcept {
+  bool is_left_most{};
+  dberr_t err{DB_SUCCESS};
+
+  /* Check if we need to create a Page_load for the level. */
+  if (level + 1 > m_page_loaders.size()) {
+    auto page_loader =
+        ut::new_withkey<Page_load>(UT_NEW_THIS_FILE_PSI_KEY, m_index, m_trx_id,
+                                   FIL_NULL, level, m_flush_observer);
+
+    if (page_loader == nullptr) {
+      return DB_OUT_OF_MEMORY;
+    }
+
+    err = page_loader->init();
+
+    if (err != DB_SUCCESS) {
+      return err;
+    }
+
+    DEBUG_SYNC_C("bulk_load_insert");
+
+    m_page_loaders.push_back(page_loader);
+
+    ut_a(level + 1 == m_page_loaders.size());
+
+    m_root_level = level;
+
+    is_left_most = true;
+  }
+
+  ut_a(m_page_loaders.size() > level);
+
+  auto page_loader = m_page_loaders[level];
+
+  if (is_left_most && level > 0 && page_loader->get_rec_no() == 0) {
+    /* The node pointer must be marked as the predefined minimum
+    record,	as there is no lower alphabetical limit to records in
+    the leftmost node of a level: */
+    const auto info_bits = dtuple_get_info_bits(tuple) | REC_INFO_MIN_REC_FLAG;
+    dtuple_set_info_bits(tuple, info_bits);
+  }
+
+  big_rec_t *big_rec{};
+  auto rec_size = rec_get_converted_size(m_index, tuple);
+
+  if (page_loader->need_ext(tuple, rec_size)) {
+    /* The record is so big that we have to store some fields
+    externally on separate database pages */
+    big_rec = dtuple_convert_big_rec(m_index, nullptr, tuple);
+    if (big_rec == nullptr) {
+      return DB_TOO_BIG_RECORD;
+    }
+
+    rec_size = rec_get_converted_size(m_index, tuple);
+  }
+
+  if (page_loader->is_table_compressed() &&
+      page_zip_is_too_big(m_index, tuple)) {
+    err = DB_TOO_BIG_RECORD;
+  } else {
+    err = prepare_space(page_loader, level, rec_size);
+
+    if (err == DB_SUCCESS) {
+      IF_ENABLED(
+          "ddl_btree_build_too_big_record", static int rec_cnt = 0;
+
+          if (++rec_cnt == 10) {
+            rec_cnt = 0;
+            if (big_rec != nullptr) {
+              dtuple_convert_back_big_rec(tuple, big_rec);
+            }
+            return DB_TOO_BIG_RECORD;
+          })
+
+      err = insert(page_loader, tuple, big_rec, rec_size);
+    }
+  }
+
+  if (big_rec != nullptr) {
+    dtuple_convert_back_big_rec(tuple, big_rec);
+  }
+
+  return err;
+}
+
+dberr_t Btree_load::finalize_page_loads(dberr_t err,
+                                        page_no_t &last_page_no) noexcept {
+  ut_a(last_page_no == FIL_NULL);
+  ut_a(m_root_level + 1 == m_page_loaders.size());
+
+  /* Finish all page bulks */
+  for (size_t level = 0; level <= m_root_level; level++) {
+    auto page_loader = m_page_loaders[level];
+
+    page_loader->finish();
+
+    last_page_no = page_loader->get_page_no();
+
+    if (err == DB_SUCCESS) {
+      err = page_commit(page_loader, nullptr, level != m_root_level);
+    }
+
+    if (err != DB_SUCCESS) {
+      page_loader->rollback();
+    }
+
+    ut::delete_(page_loader);
+  }
+
+  return err;
+}
+
+dberr_t Btree_load::load_root_page(page_no_t last_page_no) noexcept {
+  ut_ad(last_page_no != FIL_NULL);
+
+  page_id_t page_id(dict_index_get_space(m_index), last_page_no);
+  page_size_t page_size(dict_table_page_size(m_index->table));
+  page_no_t page_no = dict_index_get_page(m_index);
+
+  Page_load page_loader(m_index, m_trx_id, page_no, m_root_level,
+                        m_flush_observer);
+
+  mtr_t mtr;
+
+  mtr.start();
+  mtr.x_lock(dict_index_get_lock(m_index), __FILE__, __LINE__);
+
+  auto last_block =
+      btr_block_get(page_id, page_size, RW_X_LATCH, m_index, &mtr);
+
+  auto last_page = buf_block_get_frame(last_block);
+
+  /* Copy last page to root page. */
+  auto err = page_loader.init();
+
+  if (err == DB_SUCCESS) {
+    page_loader.copy_all(last_page);
+    page_loader.finish();
+
+    /* Remove last page. */
+    btr_page_free_low(m_index, last_block, m_root_level, &mtr);
+
+    /* Do not flush the last page. */
+    last_block->page.m_flush_observer = nullptr;
+
+    mtr.commit();
+
+    err = page_commit(&page_loader, nullptr, false);
+    ut_a(err == DB_SUCCESS);
+  } else {
+    mtr.commit();
+  }
+
+  return err;
+}
+
+dberr_t Btree_load::finish(dberr_t err) noexcept {
+  ut_ad(!m_index->table->is_temporary());
+
+  /* Assert that the index online status has not changed */
+  ut_ad(m_index->online_status == m_index_online);
+
+  if (m_page_loaders.empty()) {
+    /* The table is empty. The root page of the index tree
+    is already in a consistent state. No need to flush. */
+    return err;
+  }
+
+  page_no_t last_page_no{FIL_NULL};
+
+  err = finalize_page_loads(err, last_page_no);
+
+  if (err == DB_SUCCESS) {
+    err = load_root_page(last_page_no);
+  }
+
+  ut_d(dict_sync_check check(true));
+  ut_ad(!sync_check_iterate(check));
+
+  return err;
+}
+
+/** The transaction interrupted check is expensive, we check after this
+many rows. */
+static constexpr uint64_t TRX_INTERRUPTED_CHECK = 25000;
+
+dberr_t Btree_load::build(Cursor &cursor) noexcept {
+  dberr_t err;
+  dtuple_t *dtuple{};
+  uint64_t interrupt_check{};
+
+  while ((err = cursor.fetch(dtuple)) == DB_SUCCESS) {
+    if (cursor.duplicates_detected()) {
+      err = DB_DUPLICATE_KEY;
+      break;
+    }
+
+    err = insert(dtuple, 0);
+
+    if (err != DB_SUCCESS) {
+      return err;
+    }
+
+    err = cursor.next();
+
+    if (err != DB_SUCCESS) {
+      break;
+    }
+
+    ++m_n_recs;
+
+    IF_ENABLED("ddl_btree_load_interrupt",
+               interrupt_check = TRX_INTERRUPTED_CHECK;);
+
+    if (!(interrupt_check++ % TRX_INTERRUPTED_CHECK) &&
+        m_flush_observer->check_interrupted()) {
+      err = DB_INTERRUPTED;
+      break;
+    }
+  }
+
+  return err == DB_END_OF_INDEX ? DB_SUCCESS : err;
+}
diff -Nru mysql-8.0-8.0.26/storage/innobase/btr/btr0pcur.cc mysql-8.0-8.0.27/storage/innobase/btr/btr0pcur.cc
--- mysql-8.0-8.0.26/storage/innobase/btr/btr0pcur.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/btr/btr0pcur.cc	2021-09-28 11:46:34.000000000 +0000
@@ -109,8 +109,8 @@
 
   m_block_when_stored.store(block);
 
-  /* Function try to check if block is S/X latch. */
-  m_modify_clock = buf_block_get_modify_clock(block);
+  m_modify_clock = block->get_modify_clock(
+      IF_DEBUG(fsp_is_system_temporary(block->page.id.space())));
 }
 
 void btr_pcur_t::copy_stored_position(btr_pcur_t *dst, const btr_pcur_t *src) {
@@ -127,13 +127,13 @@
   if (src->m_old_rec != nullptr) {
     /* We have an old buffer, but it is too small. */
     if (dst->m_old_rec_buf != nullptr && dst->m_buf_size < src->m_buf_size) {
-      ut_free(dst->m_old_rec_buf);
+      ut::free(dst->m_old_rec_buf);
       dst->m_old_rec_buf = nullptr;
     }
     /* We don't have a buffer, but we should have one. */
     if (dst->m_old_rec_buf == nullptr) {
-      dst->m_old_rec_buf =
-          static_cast<byte *>(ut_malloc_nokey(src->m_buf_size));
+      dst->m_old_rec_buf = static_cast<byte *>(
+          ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, src->m_buf_size));
       dst->m_buf_size = src->m_buf_size;
     }
 
@@ -268,7 +268,9 @@
     But we can retain the value of old_rec */
     auto block = get_block();
     m_block_when_stored.store(block);
-    m_modify_clock = buf_block_get_modify_clock(block);
+
+    m_modify_clock = block->get_modify_clock(
+        IF_DEBUG(fsp_is_system_temporary(block->page.id.space())));
 
     m_old_stored = true;
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/btr/btr0sea.cc mysql-8.0-8.0.27/storage/innobase/btr/btr0sea.cc
--- mysql-8.0-8.0.26/storage/innobase/btr/btr0sea.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/btr/btr0sea.cc	2021-09-28 11:46:34.000000000 +0000
@@ -117,16 +117,15 @@
 @param[in]	n_fields	number of complete fields
 @param[in]	n_bytes		number of bytes in an incomplete last field
 @return	number of complete or incomplete fields */
-inline MY_ATTRIBUTE((warn_unused_result)) ulint
-    btr_search_get_n_fields(ulint n_fields, ulint n_bytes) {
+[[nodiscard]] inline ulint btr_search_get_n_fields(ulint n_fields,
+                                                   ulint n_bytes) {
   return (n_fields + (n_bytes > 0 ? 1 : 0));
 }
 
 /** Determine the number of accessed key fields.
 @param[in]	cursor		b-tree cursor
 @return	number of complete or incomplete fields */
-inline MY_ATTRIBUTE((warn_unused_result)) ulint
-    btr_search_get_n_fields(const btr_cur_t *cursor) {
+[[nodiscard]] inline ulint btr_search_get_n_fields(const btr_cur_t *cursor) {
   return (btr_search_get_n_fields(cursor->n_fields, cursor->n_bytes));
 }
 
@@ -192,22 +191,24 @@
 
   /* Step-1: Allocate latches (1 per part). */
   btr_search_latches = reinterpret_cast<rw_lock_t **>(
-      ut_malloc(sizeof(rw_lock_t *) * btr_ahi_parts, mem_key_ahi));
+      ut::malloc_withkey(ut::make_psi_memory_key(mem_key_ahi),
+                         sizeof(rw_lock_t *) * btr_ahi_parts));
 
   for (ulint i = 0; i < btr_ahi_parts; ++i) {
-    btr_search_latches[i] = reinterpret_cast<rw_lock_t *>(
-        ut_malloc(sizeof(rw_lock_t), mem_key_ahi));
+    btr_search_latches[i] = reinterpret_cast<rw_lock_t *>(ut::malloc_withkey(
+        ut::make_psi_memory_key(mem_key_ahi), sizeof(rw_lock_t)));
 
     rw_lock_create(btr_search_latch_key, btr_search_latches[i],
                    SYNC_SEARCH_SYS);
   }
 
   /* Step-2: Allocate hash tablees. */
-  btr_search_sys = reinterpret_cast<btr_search_sys_t *>(
-      ut_malloc(sizeof(btr_search_sys_t), mem_key_ahi));
+  btr_search_sys = reinterpret_cast<btr_search_sys_t *>(ut::malloc_withkey(
+      ut::make_psi_memory_key(mem_key_ahi), sizeof(btr_search_sys_t)));
 
   btr_search_sys->hash_tables = reinterpret_cast<hash_table_t **>(
-      ut_malloc(sizeof(hash_table_t *) * btr_ahi_parts, mem_key_ahi));
+      ut::malloc_withkey(ut::make_psi_memory_key(mem_key_ahi),
+                         sizeof(hash_table_t *) * btr_ahi_parts));
 
   for (ulint i = 0; i < btr_ahi_parts; ++i) {
     btr_search_sys->hash_tables[i] =
@@ -268,17 +269,17 @@
     hash_table_free(btr_search_sys->hash_tables[i]);
   }
 
-  ut_free(btr_search_sys->hash_tables);
-  ut_free(btr_search_sys);
+  ut::free(btr_search_sys->hash_tables);
+  ut::free(btr_search_sys);
   btr_search_sys = nullptr;
 
   /* Step-2: Release all allocates latches. */
   for (ulint i = 0; i < btr_ahi_parts; ++i) {
     rw_lock_free(btr_search_latches[i]);
-    ut_free(btr_search_latches[i]);
+    ut::free(btr_search_latches[i]);
   }
 
-  ut_free(btr_search_latches);
+  ut::free(btr_search_latches);
   btr_search_latches = nullptr;
 }
 
@@ -1151,7 +1152,8 @@
   /* Calculate and cache fold values into an array for fast deletion
   from the hash index */
 
-  folds = (ulint *)ut_malloc_nokey(n_recs * sizeof(ulint));
+  folds = (ulint *)ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY,
+                                      n_recs * sizeof(ulint));
 
   n_cached = 0;
 
@@ -1205,7 +1207,7 @@
 
     rw_lock_x_unlock(latch);
 
-    ut_free(folds);
+    ut::free(folds);
     goto retry;
   }
 
@@ -1227,7 +1229,7 @@
   assert_block_ahi_valid(block);
   rw_lock_x_unlock(latch);
 
-  ut_free(folds);
+  ut::free(folds);
 }
 
 /** Drop any adaptive hash index entries that may point to an index
@@ -1459,8 +1461,10 @@
   /* Calculate and cache fold values and corresponding records into
   an array for fast insertion to the hash index */
 
-  folds = (ulint *)ut_malloc_nokey(n_recs * sizeof(ulint));
-  recs = (rec_t **)ut_malloc_nokey(n_recs * sizeof(rec_t *));
+  folds = (ulint *)ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY,
+                                      n_recs * sizeof(ulint));
+  recs = (rec_t **)ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY,
+                                      n_recs * sizeof(rec_t *));
 
   n_cached = 0;
 
@@ -1562,8 +1566,8 @@
   assert_block_ahi_valid(block);
   btr_search_x_unlock(index);
 
-  ut_free(folds);
-  ut_free(recs);
+  ut::free(folds);
+  ut::free(recs);
   if (UNIV_LIKELY_NULL(heap)) {
     mem_heap_free(heap);
   }
diff -Nru mysql-8.0-8.0.26/storage/innobase/buf/buf0buddy.cc mysql-8.0-8.0.27/storage/innobase/buf/buf0buddy.cc
--- mysql-8.0-8.0.26/storage/innobase/buf/buf0buddy.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/buf/buf0buddy.cc	2021-09-28 11:46:34.000000000 +0000
@@ -107,7 +107,7 @@
 
 /** Check if a buddy is stamped free.
  @return whether the buddy is free */
-static inline MY_ATTRIBUTE((warn_unused_result)) bool buf_buddy_stamp_is_free(
+[[nodiscard]] static inline bool buf_buddy_stamp_is_free(
     const buf_buddy_free_t *buf) /*!< in: block to check */
 {
   return (mach_read_from_4(buf->stamp.bytes + BUF_BUDDY_STAMP_OFFSET) ==
@@ -205,10 +205,10 @@
  @retval BUF_BUDDY_STATE_FREE if fully free
  @retval BUF_BUDDY_STATE_USED if currently in use
  @retval BUF_BUDDY_STATE_PARTIALLY_USED if partially in use. */
-static MY_ATTRIBUTE((warn_unused_result)) buf_buddy_state_t
-    buf_buddy_is_free(buf_buddy_free_t *buf, /*!< in: block to check */
-                      ulint i)               /*!< in: index of
-                                             buf_pool->zip_free[] */
+[[nodiscard]] static buf_buddy_state_t buf_buddy_is_free(
+    buf_buddy_free_t *buf, /*!< in: block to check */
+    ulint i)               /*!< in: index of
+                           buf_pool->zip_free[] */
 {
 #ifdef UNIV_DEBUG
   const ulint size = BUF_BUDDY_LOW << i;
diff -Nru mysql-8.0-8.0.26/storage/innobase/buf/buf0buf.cc mysql-8.0-8.0.27/storage/innobase/buf/buf0buf.cc
--- mysql-8.0-8.0.26/storage/innobase/buf/buf0buf.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/buf/buf0buf.cc	2021-09-28 11:46:34.000000000 +0000
@@ -307,7 +307,7 @@
 in parallel. We don't use a mutex during resize because that is still single
 threaded. */
 typedef std::map<const byte *, buf_chunk_t *, std::less<const byte *>,
-                 ut_allocator<std::pair<const byte *const, buf_chunk_t *>>>
+                 ut::allocator<std::pair<const byte *const, buf_chunk_t *>>>
     buf_pool_chunk_map_t;
 
 static buf_pool_chunk_map_t *buf_chunk_map_reg;
@@ -869,7 +869,9 @@
 
 bool buf_pool_t::allocate_chunk(ulonglong mem_size, buf_chunk_t *chunk) {
   ut_ad(mutex_own(&chunks_mutex));
-  chunk->mem = allocator.allocate_large(mem_size);
+  chunk->mem = static_cast<uint8_t *>(ut::malloc_large_page_withkey(
+      ut::make_psi_memory_key(mem_key_buf_buf_pool), mem_size,
+      ut::fallback_to_normal_page_t{}));
   if (chunk->mem == nullptr) {
     return false;
   }
@@ -890,7 +892,7 @@
       innobase_disable_core_dump();
     }
   }
-  allocator.deallocate_large(chunk->mem);
+  ut::free_large_page(chunk->mem, ut::fallback_to_normal_page_t{});
 }
 
 bool buf_pool_t::madvise_dump() {
@@ -1009,9 +1011,8 @@
   it is bigger, we may allocate more blocks than requested. */
 
   frame = (byte *)ut_align(chunk->mem, UNIV_PAGE_SIZE);
-  chunk->size =
-      ut_allocator<byte>::large_page_size(chunk->mem) / UNIV_PAGE_SIZE -
-      (frame != chunk->mem);
+  chunk->size = ut::large_page_allocation_size(chunk->mem) / UNIV_PAGE_SIZE -
+                (frame != chunk->mem);
 
   /* Subtract the space needed for block descriptors. */
   {
@@ -1219,15 +1220,13 @@
   mutex_create(LATCH_ID_BUF_POOL_ZIP, &buf_pool->zip_mutex);
   mutex_create(LATCH_ID_BUF_POOL_FLUSH_STATE, &buf_pool->flush_state_mutex);
 
-  new (&buf_pool->allocator) ut_allocator<unsigned char>(mem_key_buf_buf_pool);
-
   if (buf_pool_size > 0) {
     mutex_enter(&buf_pool->chunks_mutex);
     buf_pool->n_chunks = buf_pool_size / srv_buf_pool_chunk_unit;
     chunk_size = srv_buf_pool_chunk_unit;
 
-    buf_pool->chunks = reinterpret_cast<buf_chunk_t *>(
-        ut_zalloc_nokey(buf_pool->n_chunks * sizeof(*chunk)));
+    buf_pool->chunks = reinterpret_cast<buf_chunk_t *>(ut::zalloc_withkey(
+        UT_NEW_THIS_FILE_PSI_KEY, buf_pool->n_chunks * sizeof(*chunk)));
     buf_pool->chunks_old = nullptr;
 
     UT_LIST_INIT(buf_pool->LRU);
@@ -1261,7 +1260,7 @@
           }
           buf_pool->deallocate_chunk(chunk);
         }
-        ut_free(buf_pool->chunks);
+        ut::free(buf_pool->chunks);
         buf_pool->chunks = nullptr;
 
         err = DB_ERROR;
@@ -1306,13 +1305,14 @@
     buf_pool->no_flush[i] = os_event_create();
   }
 
-  buf_pool->watch = (buf_page_t *)ut_zalloc_nokey(sizeof(*buf_pool->watch) *
-                                                  BUF_POOL_WATCH_SIZE);
+  buf_pool->watch = (buf_page_t *)ut::zalloc_withkey(
+      UT_NEW_THIS_FILE_PSI_KEY, sizeof(*buf_pool->watch) * BUF_POOL_WATCH_SIZE);
   for (i = 0; i < BUF_POOL_WATCH_SIZE; i++) {
     buf_pool->watch[i].buf_pool_index = buf_pool->instance_no;
   }
 
-  /* All fields are initialized by ut_zalloc_nokey(). */
+  /* All fields are initialized by ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY).
+   */
 
   buf_pool->try_LRU_scan = TRUE;
 
@@ -1342,7 +1342,7 @@
 void buf_page_free_descriptor(buf_page_t *bpage) {
   bpage->reset_page_id();
 
-  ut_free(bpage);
+  ut::free(bpage);
 }
 
 /** Free one buffer pool instance
@@ -1377,7 +1377,7 @@
     }
   }
 
-  ut_free(buf_pool->watch);
+  ut::free(buf_pool->watch);
   buf_pool->watch = nullptr;
   mutex_enter(&buf_pool->chunks_mutex);
   chunks = buf_pool->chunks;
@@ -1400,24 +1400,22 @@
     os_event_destroy(buf_pool->no_flush[i]);
   }
 
-  ut_free(buf_pool->chunks);
+  ut::free(buf_pool->chunks);
   mutex_exit(&buf_pool->chunks_mutex);
   mutex_free(&buf_pool->chunks_mutex);
   ha_clear(buf_pool->page_hash);
   hash_table_free(buf_pool->page_hash);
   hash_table_free(buf_pool->zip_hash);
-
-  buf_pool->allocator.~ut_allocator();
 }
 
 /** Frees the buffer pool global data structures. */
 static void buf_pool_free() {
-  UT_DELETE(buf_stat_per_index);
+  ut::delete_(buf_stat_per_index);
 
-  UT_DELETE(buf_chunk_map_reg);
+  ut::delete_(buf_chunk_map_reg);
   buf_chunk_map_reg = nullptr;
 
-  ut_free(buf_pool_ptr);
+  ut::free(buf_pool_ptr);
   buf_pool_ptr = nullptr;
 }
 
@@ -1443,10 +1441,11 @@
 
   buf_pool_resizing = false;
 
-  buf_pool_ptr =
-      (buf_pool_t *)ut_zalloc_nokey(n_instances * sizeof *buf_pool_ptr);
+  buf_pool_ptr = (buf_pool_t *)ut::zalloc_withkey(
+      UT_NEW_THIS_FILE_PSI_KEY, n_instances * sizeof *buf_pool_ptr);
 
-  buf_chunk_map_reg = UT_NEW_NOKEY(buf_pool_chunk_map_t());
+  buf_chunk_map_reg =
+      ut::new_withkey<buf_pool_chunk_map_t>(UT_NEW_THIS_FILE_PSI_KEY);
 
   std::vector<dberr_t> errs;
 
@@ -1514,8 +1513,8 @@
 
   btr_search_sys_create(buf_pool_get_curr_size() / sizeof(void *) / 64);
 
-  buf_stat_per_index =
-      UT_NEW(buf_stat_per_index_t(), mem_key_buf_stat_per_index_t);
+  buf_stat_per_index = ut::new_withkey<buf_stat_per_index_t>(
+      ut::make_psi_memory_key(mem_key_buf_stat_per_index_t));
 
   return (DB_SUCCESS);
 }
@@ -1628,9 +1627,6 @@
     new_block->n_fields = 1;
     new_block->left_side = TRUE;
 
-    new_block->lock_hash_val = block->lock_hash_val;
-    ut_ad(new_block->lock_hash_val == lock_rec_hash(new_block->page.id));
-
     rw_lock_x_unlock(hash_lock);
     mutex_exit(&block->mutex);
     mutex_exit(&new_block->mutex);
@@ -1970,7 +1966,7 @@
   static int count = 0;
 
   if (count == 1) {
-    ut_free(*new_chunks);
+    ut::free(*new_chunks);
     *new_chunks = nullptr;
   }
 
@@ -2241,8 +2237,9 @@
     mutex_enter(&(buf_pool_from_array(i)->flush_state_mutex));
   }
 
-  UT_DELETE(buf_chunk_map_reg);
-  buf_chunk_map_reg = UT_NEW_NOKEY(buf_pool_chunk_map_t());
+  ut::delete_(buf_chunk_map_reg);
+  buf_chunk_map_reg =
+      ut::new_withkey<buf_pool_chunk_map_t>(UT_NEW_THIS_FILE_PSI_KEY);
 
   /* add/delete chunks */
   for (ulint i = 0; i < srv_buf_pool_instances; ++i) {
@@ -2295,8 +2292,8 @@
       /* reallocate buf_pool->chunks */
       const ulint new_chunks_size = buf_pool->n_chunks_new * sizeof(*chunk);
 
-      buf_chunk_t *new_chunks =
-          reinterpret_cast<buf_chunk_t *>(ut_zalloc_nokey(new_chunks_size));
+      buf_chunk_t *new_chunks = reinterpret_cast<buf_chunk_t *>(
+          ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, new_chunks_size));
 
       DBUG_EXECUTE_IF("buf_pool_resize_chunk_null",
                       buf_pool_resize_chunk_make_null(&new_chunks););
@@ -2376,7 +2373,7 @@
     buf_pool->n_chunks_new = buf_pool->n_chunks;
 
     if (buf_pool->chunks_old) {
-      ut_free(buf_pool->chunks_old);
+      ut::free(buf_pool->chunks_old);
       buf_pool->chunks_old = nullptr;
     }
   }
@@ -3760,8 +3757,6 @@
   /* Set after buf_relocate(). */
   block->page.buf_fix_count.store(1);
 
-  block->lock_hash_val = lock_rec_hash(m_page_id);
-
   UNIV_MEM_DESC(&block->page.zip.data, page_zip_get_size(&block->page.zip));
 
   if (buf_page_get_state(&block->page) == BUF_BLOCK_ZIP_PAGE) {
@@ -3919,7 +3914,7 @@
     DBUG_EXECUTE_IF("innodb_page_corruption_retries",
                     m_retries = BUF_PAGE_READ_MAX_RETRIES;);
   } else {
-    ib::fatal(ER_IB_MSG_74)
+    ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_74)
         << "Unable to read page " << m_page_id << " into the buffer pool after "
         << BUF_PAGE_READ_MAX_RETRIES
         << " attempts. The most probable cause of this error may"
@@ -4255,7 +4250,7 @@
     case Page_fetch::POSSIBLY_FREED:
       break;
     default:
-      ib::fatal(ER_IB_ERR_UNKNOWN_PAGE_FETCH_MODE)
+      ib::fatal(UT_LOCATION_HERE, ER_IB_ERR_UNKNOWN_PAGE_FETCH_MODE)
           << "Unknown fetch mode: " << (int)mode;
       ut_error;
   }
@@ -4610,8 +4605,6 @@
 
   buf_block_init_low(block);
 
-  block->lock_hash_val = lock_rec_hash(page_id);
-
   buf_page_init_low(&block->page);
 
   /* Insert into the hash table of file pages */
@@ -5090,7 +5083,7 @@
         }
         break;
       }
-      /* fall through */
+      [[fallthrough]];
     case FIL_PAGE_RTREE:
       if (is_leaf) {
         counter = MONITOR_RW_COUNTER(io_type, MONITOR_INDEX_LEAF_PAGE);
@@ -5505,7 +5498,7 @@
     byte *frame{};
     page_no_t read_page_no;
     space_id_t read_space_id;
-    bool is_wrong_page_id MY_ATTRIBUTE((unused)) = false;
+    bool is_wrong_page_id [[maybe_unused]] = false;
 
     if (bpage->size.is_compressed()) {
       frame = bpage->zip.data;
@@ -5776,7 +5769,7 @@
     mutex_exit(&buf_pool->LRU_list_mutex);
 
     if (block) {
-      ib::fatal(ER_IB_MSG_83)
+      ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_83)
           << "Page " << block->page.id << " still fixed or dirty";
     }
   }
@@ -5972,7 +5965,7 @@
       case BUF_BLOCK_ZIP_DIRTY:
         n_lru++;
         n_zip++;
-        /* fallthrough */
+        [[fallthrough]];
       case BUF_BLOCK_FILE_PAGE:
         if (b->is_io_fix_write()) {
           switch (buf_page_get_flush_type(b)) {
@@ -6011,7 +6004,7 @@
 
   if (buf_pool->curr_size == buf_pool->old_size &&
       n_lru + n_free > buf_pool->curr_size + n_zip) {
-    ib::fatal(ER_IB_MSG_84)
+    ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_84)
         << "n_LRU " << n_lru << ", n_free " << n_free << ", pool "
         << buf_pool->curr_size << " zip " << n_zip << ". Aborting...";
   }
@@ -6023,7 +6016,7 @@
 
   if (buf_pool->curr_size == buf_pool->old_size &&
       UT_LIST_GET_LEN(buf_pool->free) > n_free) {
-    ib::fatal(ER_IB_MSG_85)
+    ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_85)
         << "Free list len " << UT_LIST_GET_LEN(buf_pool->free)
         << ", free blocks " << n_free << ". Aborting...";
   }
@@ -6075,10 +6068,11 @@
 
   size = buf_pool->curr_size;
 
-  index_ids =
-      static_cast<index_id_t *>(ut_malloc_nokey(size * sizeof *index_ids));
+  index_ids = static_cast<index_id_t *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, size * sizeof *index_ids));
 
-  counts = static_cast<ulint *>(ut_malloc_nokey(sizeof(ulint) * size));
+  counts = static_cast<ulint *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sizeof(ulint) * size));
 
   mutex_enter(&buf_pool->LRU_list_mutex);
   mutex_enter(&buf_pool->free_list_mutex);
@@ -6137,8 +6131,8 @@
          << counts[i];
   }
 
-  ut_free(index_ids);
-  ut_free(counts);
+  ut::free(index_ids);
+  ut::free(counts);
 
   ut_a(buf_pool_validate_instance(buf_pool));
 }
@@ -6548,15 +6542,16 @@
   one extra buf_pool_info_t, the last one stores
   aggregated/total values from all pools */
   if (srv_buf_pool_instances > 1) {
-    pool_info = (buf_pool_info_t *)ut_zalloc_nokey(
+    pool_info = (buf_pool_info_t *)ut::zalloc_withkey(
+        UT_NEW_THIS_FILE_PSI_KEY,
         (srv_buf_pool_instances + 1) * sizeof *pool_info);
 
     pool_info_total = &pool_info[srv_buf_pool_instances];
   } else {
     ut_a(srv_buf_pool_instances == 1);
 
-    pool_info_total = pool_info =
-        static_cast<buf_pool_info_t *>(ut_zalloc_nokey(sizeof *pool_info));
+    pool_info_total = pool_info = static_cast<buf_pool_info_t *>(
+        ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sizeof *pool_info));
   }
 
   os_rmb;
@@ -6595,7 +6590,7 @@
     }
   }
 
-  ut_free(pool_info);
+  ut::free(pool_info);
 }
 
 /** Refreshes the statistics used to print per-second averages. */
diff -Nru mysql-8.0-8.0.26/storage/innobase/buf/buf0dblwr.cc mysql-8.0-8.0.27/storage/innobase/buf/buf0dblwr.cc
--- mysql-8.0-8.0.26/storage/innobase/buf/buf0dblwr.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/buf/buf0dblwr.cc	2021-09-28 11:46:34.000000000 +0000
@@ -102,7 +102,7 @@
 
   /** Serialize the object into JSON format.
   @return the object in JSON format. */
-  std::string to_json() const noexcept MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] std::string to_json() const noexcept {
     std::ostringstream out;
     out << "{";
     out << "\"className\": \"dblwr::File\",";
@@ -173,7 +173,7 @@
 /** Pages recovered from the doublewrite buffer */
 class Pages {
  public:
-  using Buffers = std::vector<Page *, ut_allocator<Page *>>;
+  using Buffers = std::vector<Page *, ut::allocator<Page *>>;
 
   /** Default constructor */
   Pages() : m_pages() {}
@@ -181,7 +181,7 @@
   /** Destructor */
   ~Pages() noexcept {
     for (auto &page : m_pages) {
-      UT_DELETE(page);
+      ut::delete_(page);
     }
 
     m_pages.clear();
@@ -210,9 +210,7 @@
 
   /** Object the vector of pages.
   @return the vector of pages. */
-  Buffers &get_pages() noexcept MY_ATTRIBUTE((warn_unused_result)) {
-    return m_pages;
-  }
+  [[nodiscard]] Buffers &get_pages() noexcept { return m_pages; }
 
  private:
   /** Recovered doublewrite buffer page frames */
@@ -288,12 +286,12 @@
     uint32_t size() const noexcept { return m_size; }
 
     /** @return the capacity of the collection. */
-    uint32_t capacity() const noexcept MY_ATTRIBUTE((warn_unused_result)) {
+    [[nodiscard]] uint32_t capacity() const noexcept {
       return m_pages.capacity();
     }
 
     typedef std::tuple<buf_page_t *, const file::Block *, uint32_t> Dblwr_tuple;
-    using Pages = std::vector<Dblwr_tuple, ut_allocator<Dblwr_tuple>>;
+    using Pages = std::vector<Dblwr_tuple, ut::allocator<Dblwr_tuple>>;
 
     /** Collection of pages. */
     Pages m_pages{};
@@ -311,9 +309,7 @@
   ~Double_write() noexcept;
 
   /** @return instance ID */
-  uint16_t id() const noexcept MY_ATTRIBUTE((warn_unused_result)) {
-    return m_id;
-  }
+  [[nodiscard]] uint16_t id() const noexcept { return m_id; }
 
   /** Process the requests in the flush queue, write the blocks to the
   double write file, sync the file if required and then write to the
@@ -324,9 +320,8 @@
   @param[in] buf_pool_index     Buffer pool instance number.
   @param[in] flush_type         LRU or Flush list write.
   @return instance that will handle the flush to disk. */
-  static Double_write *instance(buf_flush_t flush_type,
-                                uint32_t buf_pool_index) noexcept
-      MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] static Double_write *instance(
+      buf_flush_t flush_type, uint32_t buf_pool_index) noexcept {
     ut_a(buf_pool_index < srv_buf_pool_instances);
 
     auto midpoint = s_instances->size() / 2;
@@ -463,14 +458,14 @@
   /** Create the batch write segments.
   @param[in] segments_per_file  Number of configured segments per file.
   @return DB_SUCCESS or error code. */
-  static dberr_t create_batch_segments(uint32_t segments_per_file) noexcept
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static dberr_t create_batch_segments(
+      uint32_t segments_per_file) noexcept;
 
   /** Create the single page flush segments.
   @param[in] segments_per_file  Number of configured segments per file.
   @return DB_SUCCESS or error code. */
-  static dberr_t create_single_segments(uint32_t segments_per_file) noexcept
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static dberr_t create_single_segments(
+      uint32_t segments_per_file) noexcept;
 
   /** Get the instance that handles a particular page's IO. Submit the
   write request to the a double write queue that is empty.
@@ -494,40 +489,39 @@
   @param[in]	e_block           Encrypted data block.
   @param[in]	e_len             Encrypted data length.
   @return DB_SUCCESS or error code */
-  static dberr_t sync_page_flush(buf_page_t *bpage, file::Block *e_block,
-                                 uint32_t e_len) noexcept
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static dberr_t sync_page_flush(buf_page_t *bpage,
+                                               file::Block *e_block,
+                                               uint32_t e_len) noexcept;
 
-  // clang-format off
   /** @return the double write instance to use for flushing.
   @param[in] flush_type         LRU or Flush list write.
   @param[in] bpage              Page to write to disk.
   @return instance that will handle the flush to disk. */
-  static Double_write *instance(buf_flush_t flush_type, const buf_page_t *bpage)
-      noexcept MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] static Double_write *instance(
+      buf_flush_t flush_type, const buf_page_t *bpage) noexcept {
     return instance(flush_type, buf_pool_index(buf_pool_from_bpage(bpage)));
   }
 
   /** Updates the double write buffer when a write request is completed.
   @param[in,out] bpage          Block that has just been written to disk.
   @param[in] flush_type         Flush type that triggered the write. */
-  static void write_complete(buf_page_t *bpage, buf_flush_t flush_type)
-      noexcept;
+  static void write_complete(buf_page_t *bpage,
+                             buf_flush_t flush_type) noexcept;
 
   /** REad the V1 doublewrite buffer extents boundaries.
   @param[in,out] block1         Starting block number for the first extent.
   @param[in,out] block2         Starting block number for the second extent.
   @return true if successful, false if not. */
-  static bool init_v1(page_no_t &block1, page_no_t &block2) noexcept
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static bool init_v1(page_no_t &block1,
+                                    page_no_t &block2) noexcept;
 
   /** Creates the V1 doublewrite buffer extents. The header of the
   doublewrite buffer is placed on the trx system header page.
   @param[in,out] block1         Starting block number for the first extent.
   @param[in,out] block2         Starting block number for the second extent.
   @return true if successful, false if not. */
-  static bool create_v1(page_no_t &block1, page_no_t &block2) noexcept
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static bool create_v1(page_no_t &block1,
+                                      page_no_t &block2) noexcept;
 
   /** Writes a page that has already been written to the
   doublewrite buffer to the data file. It is the job of the
@@ -537,15 +531,16 @@
   @param[in]  e_block           block containing encrypted data frame.
   @param[in]  e_len             encrypted data length.
   @return DB_SUCCESS or error code */
-  static dberr_t write_to_datafile(const buf_page_t *in_bpage, bool sync,
-      const file::Block* e_block, uint32_t e_len)
-      noexcept MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static dberr_t write_to_datafile(const buf_page_t *in_bpage,
+                                                 bool sync,
+                                                 const file::Block *e_block,
+                                                 uint32_t e_len) noexcept;
 
   /** Force a flush of the page queue.
   @param[in] flush_type           FLUSH LIST or LRU LIST flush.
   @param[in] buf_pool_index       Buffer pool instance for which called. */
-  static void force_flush(buf_flush_t flush_type, uint32_t buf_pool_index)
-      noexcept {
+  static void force_flush(buf_flush_t flush_type,
+                          uint32_t buf_pool_index) noexcept {
     if (s_instances == nullptr) {
       return;
     }
@@ -559,15 +554,15 @@
   @param[in,out]	pages		      For storing the doublewrite pages
                                 read from the file
   @return DB_SUCCESS or error code */
-  static dberr_t load(dblwr::File &file, recv::Pages *pages) noexcept
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static dberr_t load(dblwr::File &file,
+                                    recv::Pages *pages) noexcept;
 
   /** Write zeros to the file if it is "empty"
   @param[in]	file		          File instance.
   @param[in]	n_pages           Size in physical pages.
   @return DB_SUCCESS or error code */
-  static dberr_t init_file(dblwr::File &file, uint32_t n_pages) noexcept
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static dberr_t init_file(dblwr::File &file,
+                                         uint32_t n_pages) noexcept;
 
   /** Reset the size in bytes to the configured size.
   @param[in,out] file						File to reset.
@@ -584,11 +579,11 @@
 
   /** Create the v2 data structures
   @return DB_SUCCESS or error code */
-  static dberr_t create_v2() noexcept MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static dberr_t create_v2() noexcept;
 
 #ifndef _WIN32
   /** @return true if we need to fsync to disk */
-  static bool is_fsync_required() noexcept MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] static bool is_fsync_required() noexcept {
     /* srv_unix_file_flush_method is a dynamic variable. */
     return srv_unix_file_flush_method != SRV_UNIX_O_DIRECT &&
            srv_unix_file_flush_method != SRV_UNIX_O_DIRECT_NO_FSYNC;
@@ -599,8 +594,8 @@
   @param[in]	bpage		          Page to write
   @param[out]	ptr		            Start of buffer to write
   @param[out]	len		            Length of the data to write */
-  static void prepare(const buf_page_t *bpage, void **ptr, uint32_t *len)
-      noexcept;
+  static void prepare(const buf_page_t *bpage, void **ptr,
+                      uint32_t *len) noexcept;
 
   /** Free the data structures. */
   static void shutdown() noexcept;
@@ -619,8 +614,6 @@
     }
   }
 
-  // clang-format on
-
   /** Write the data to disk synchronously.
   @param[in]    segment      Segment to write to.
   @param[in]	bpage        Page to write.
@@ -632,7 +625,7 @@
  private:
   /** Create the singleton instance, start the flush thread
   @return DB_SUCCESS or error code */
-  static dberr_t start() noexcept MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static dberr_t start() noexcept;
 
   /** Asserts when a corrupt block is found during writing out
   data to the disk.
@@ -653,7 +646,7 @@
   @param[in,out]	mtr		        To manage the page latches
   @return pointer to the doublewrite buffer within the filespace
           header page. */
-  static byte *get(mtr_t *mtr) noexcept MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static byte *get(mtr_t *mtr) noexcept;
 
  private:
   using Segments = mpmc_bq<Segment *>;
@@ -781,7 +774,7 @@
 
   /** Called on page write completion.
   @return if batch ended. */
-  bool write_complete() noexcept MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] bool write_complete() noexcept {
     const auto n = m_written.fetch_add(1, std::memory_order_relaxed);
     return n + 1 == m_batch_size.load(std::memory_order_relaxed);
   }
@@ -876,7 +869,7 @@
 
   } else {
     if (state != BUF_BLOCK_FILE_PAGE) {
-      ib::fatal(ER_IB_MSG_DBLWR_1297)
+      ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_DBLWR_1297)
           << "Invalid page state: state: " << static_cast<unsigned>(state)
           << " block state: "
           << static_cast<unsigned>(buf_page_get_state(bpage));
@@ -918,7 +911,7 @@
   ut_a(!s_files.empty());
   ut_a(s_instances == nullptr);
 
-  s_instances = UT_NEW_NOKEY(Instances{});
+  s_instances = ut::new_withkey<Instances>(UT_NEW_THIS_FILE_PSI_KEY);
 
   if (s_instances == nullptr) {
     return DB_OUT_OF_MEMORY;
@@ -927,7 +920,8 @@
   dberr_t err{DB_SUCCESS};
 
   for (uint32_t i = 0; i < s_n_instances; ++i) {
-    auto ptr = UT_NEW_NOKEY(Double_write(i, dblwr::n_pages));
+    auto ptr = ut::new_withkey<Double_write>(UT_NEW_THIS_FILE_PSI_KEY, i,
+                                             dblwr::n_pages);
 
     if (ptr == nullptr) {
       err = DB_OUT_OF_MEMORY;
@@ -939,9 +933,9 @@
 
   if (err != DB_SUCCESS) {
     for (auto &dblwr : *s_instances) {
-      UT_DELETE(dblwr);
+      ut::delete_(dblwr);
     }
-    UT_DELETE(s_instances);
+    ut::delete_(s_instances);
     s_instances = nullptr;
   }
 
@@ -954,7 +948,7 @@
   }
 
   for (auto dblwr : *s_instances) {
-    UT_DELETE(dblwr);
+    ut::delete_(dblwr);
   }
 
   for (auto &file : s_files) {
@@ -968,31 +962,31 @@
   if (s_LRU_batch_segments != nullptr) {
     Batch_segment *s{};
     while (s_LRU_batch_segments->dequeue(s)) {
-      UT_DELETE(s);
+      ut::delete_(s);
     }
-    UT_DELETE(s_LRU_batch_segments);
+    ut::delete_(s_LRU_batch_segments);
     s_LRU_batch_segments = nullptr;
   }
 
   if (s_flush_list_batch_segments != nullptr) {
     Batch_segment *s{};
     while (s_flush_list_batch_segments->dequeue(s)) {
-      UT_DELETE(s);
+      ut::delete_(s);
     }
-    UT_DELETE(s_flush_list_batch_segments);
+    ut::delete_(s_flush_list_batch_segments);
     s_flush_list_batch_segments = nullptr;
   }
 
   if (s_single_segments != nullptr) {
     Segment *s{};
     while (s_single_segments->dequeue(s)) {
-      UT_DELETE(s);
+      ut::delete_(s);
     }
-    UT_DELETE(s_single_segments);
+    ut::delete_(s_single_segments);
     s_single_segments = nullptr;
   }
 
-  UT_DELETE(s_instances);
+  ut::delete_(s_instances);
   s_instances = nullptr;
 }
 
@@ -1018,7 +1012,7 @@
 void Double_write::croak(const buf_block_t *block) noexcept {
   buf_page_print(block->frame, univ_page_size, BUF_PAGE_PRINT_NO_CRASH);
 
-  ib::fatal(ER_IB_MSG_112)
+  ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_112)
       << "Apparent corruption of an index page " << block->page.id
       << " to be written to data file. We intentionally crash"
          " the server to prevent corrupt data from ending up in"
@@ -1210,7 +1204,7 @@
     auto success = os_file_truncate(file.m_name.c_str(), pfs_file, new_size);
 
     if (!success) {
-      ib::fatal(ER_IB_MSG_DBLWR_1320, file.m_name.c_str());
+      ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_DBLWR_1320, file.m_name.c_str());
     }
 
   } else if (new_size > cur_size) {
@@ -1219,7 +1213,7 @@
                                    new_size - cur_size, srv_read_only_mode);
 
     if (err != DB_SUCCESS) {
-      ib::fatal(ER_IB_MSG_DBLWR_1321, file.m_name.c_str());
+      ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_DBLWR_1321, file.m_name.c_str());
     }
 
     ib::info(ER_IB_MSG_DBLWR_1307)
@@ -1508,9 +1502,17 @@
                           std::get<2>(m_buf_pages.m_pages[i]));
 
     if (err == DB_PAGE_IS_STALE || err == DB_TABLESPACE_DELETED) {
-      write_complete(bpage, flush_type);
-      buf_page_free_stale_during_write(
-          bpage, buf_page_get_state(bpage) == BUF_BLOCK_FILE_PAGE);
+      /* For async operation, if space is deleted, fil_io already
+      does buf_page_io_complete and returns DB_TABLESPACE_DELETED.
+      buf_page_free_stale_during_write() asserts if not IO fixed
+      and does similar things as buf_page_io_complete(). This is a
+      temp fix to address this situation. Ideally we should handle
+      these errors in single place possibly by one function. */
+      if (bpage->was_io_fixed()) {
+        write_complete(bpage, flush_type);
+        buf_page_free_stale_during_write(
+            bpage, buf_page_get_state(bpage) == BUF_BLOCK_FILE_PAGE);
+      }
 
       const file::Block *block = std::get<1>(m_buf_pages.m_pages[i]);
       if (block != nullptr) {
@@ -1546,7 +1548,8 @@
 
   ut_a(s_LRU_batch_segments == nullptr);
 
-  s_LRU_batch_segments = UT_NEW_NOKEY(Batch_segments(n));
+  s_LRU_batch_segments =
+      ut::new_withkey<Batch_segments>(UT_NEW_THIS_FILE_PSI_KEY, n);
 
   if (s_LRU_batch_segments == nullptr) {
     return DB_OUT_OF_MEMORY;
@@ -1554,7 +1557,8 @@
 
   ut_a(s_flush_list_batch_segments == nullptr);
 
-  s_flush_list_batch_segments = UT_NEW_NOKEY(Batch_segments(n));
+  s_flush_list_batch_segments =
+      ut::new_withkey<Batch_segments>(UT_NEW_THIS_FILE_PSI_KEY, n);
 
   if (s_flush_list_batch_segments == nullptr) {
     return DB_OUT_OF_MEMORY;
@@ -1566,7 +1570,8 @@
 
   for (auto &file : s_files) {
     for (uint32_t i = 0; i < total_pages; i += dblwr::n_pages, ++id) {
-      auto s = UT_NEW_NOKEY(Batch_segment(id, file, i, dblwr::n_pages));
+      auto s = ut::new_withkey<Batch_segment>(UT_NEW_THIS_FILE_PSI_KEY, id,
+                                              file, i, dblwr::n_pages);
 
       if (s == nullptr) {
         return DB_OUT_OF_MEMORY;
@@ -1597,7 +1602,8 @@
   const auto n_segments =
       std::max(ulint{2}, ut_2_power_up(SYNC_PAGE_FLUSH_SLOTS));
 
-  s_single_segments = UT_NEW_NOKEY(Segments(n_segments));
+  s_single_segments =
+      ut::new_withkey<Segments>(UT_NEW_THIS_FILE_PSI_KEY, n_segments);
 
   if (s_single_segments == nullptr) {
     return DB_OUT_OF_MEMORY;
@@ -1619,7 +1625,7 @@
     const auto start = dblwr::File::s_n_pages;
 
     for (uint32_t i = start; i < start + n_pages; ++i) {
-      auto s = UT_NEW_NOKEY(Segment(file, i, 1UL));
+      auto s = ut::new_withkey<Segment>(UT_NEW_THIS_FILE_PSI_KEY, file, i, 1UL);
 
       if (s == nullptr) {
         return DB_OUT_OF_MEMORY;
@@ -1650,7 +1656,7 @@
   }
 
   fil_space_t *space = bpage->get_space();
-  if (space->encryption_op_in_progress == DECRYPTION ||
+  if (space->encryption_op_in_progress == Encryption::Progress::DECRYPTION ||
       !space->is_encrypted()) {
     return nullptr;
   }
@@ -1729,8 +1735,10 @@
     bpage->set_dblwr_batch_id(std::numeric_limits<uint16_t>::max());
     err = Double_write::write_to_datafile(bpage, sync, nullptr, 0);
     if (err == DB_PAGE_IS_STALE || err == DB_TABLESPACE_DELETED) {
-      buf_page_free_stale_during_write(
-          bpage, buf_page_get_state(bpage) == BUF_BLOCK_FILE_PAGE);
+      if (bpage->was_io_fixed()) {
+        buf_page_free_stale_during_write(
+            bpage, buf_page_get_state(bpage) == BUF_BLOCK_FILE_PAGE);
+      }
       err = DB_SUCCESS;
     } else if (sync) {
       ut_ad(flush_type == BUF_FLUSH_LRU || flush_type == BUF_FLUSH_SINGLE_PAGE);
@@ -1879,7 +1887,7 @@
     os_file_status(file.m_name.c_str(), &file_exists, &type);
 
     if (type == OS_FILE_TYPE_FILE) {
-      mode = OS_FILE_OPEN;
+      mode = OS_FILE_OPEN_RETRY;
     } else if (type == OS_FILE_TYPE_MISSING) {
       mode = OS_FILE_CREATE;
     } else {
@@ -2215,7 +2223,7 @@
 
       buf_page_print(page, page_size, BUF_PAGE_PRINT_NO_CRASH);
 
-      ib::fatal(ER_IB_MSG_DBLWR_1306);
+      ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_DBLWR_1306);
     }
 
   } else {
@@ -2308,7 +2316,7 @@
   if (!dblwr::enabled) {
     return nullptr;
   }
-  using Matches = std::vector<const byte *, ut_allocator<const byte *>>;
+  using Matches = std::vector<const byte *, ut::allocator<const byte *>>;
 
   Matches matches;
   const byte *page = nullptr;
@@ -2347,7 +2355,8 @@
     return;
   }
   /* Make a copy of the page contents. */
-  auto dblwr_page = UT_NEW_NOKEY(Page(page_no, page, n_bytes));
+  auto dblwr_page =
+      ut::new_withkey<Page>(UT_NEW_THIS_FILE_PSI_KEY, page_no, page, n_bytes);
 
   m_pages.push_back(dblwr_page);
 }
@@ -2514,12 +2523,12 @@
 
 void dblwr::recv::create(recv::Pages *&pages) noexcept {
   ut_a(pages == nullptr);
-  pages = UT_NEW_NOKEY(recv::Pages{});
+  pages = ut::new_withkey<recv::Pages>(UT_NEW_THIS_FILE_PSI_KEY);
 }
 
 void dblwr::recv::destroy(recv::Pages *&pages) noexcept {
   if (pages != nullptr) {
-    UT_DELETE(pages);
+    ut::delete_(pages);
     pages = nullptr;
   }
 }
diff -Nru mysql-8.0-8.0.26/storage/innobase/buf/buf0dump.cc mysql-8.0-8.0.27/storage/innobase/buf/buf0dump.cc
--- mysql-8.0-8.0.26/storage/innobase/buf/buf0dump.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/buf/buf0dump.cc	2021-09-28 11:46:34.000000000 +0000
@@ -275,7 +275,8 @@
       }
     }
 
-    dump = static_cast<buf_dump_t *>(ut_malloc_nokey(n_pages * sizeof(*dump)));
+    dump = static_cast<buf_dump_t *>(
+        ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, n_pages * sizeof(*dump)));
 
     if (dump == nullptr) {
       mutex_exit(&buf_pool->LRU_list_mutex);
@@ -303,7 +304,7 @@
       ret = fprintf(f, SPACE_ID_PF "," PAGE_NO_PF "\n", BUF_DUMP_SPACE(dump[j]),
                     BUF_DUMP_PAGE(dump[j]));
       if (ret < 0) {
-        ut_free(dump);
+        ut::free(dump);
         fclose(f);
         buf_dump_status(STATUS_ERR, "Cannot write to '%s': %s", tmp_filename,
                         strerror(errno));
@@ -319,7 +320,7 @@
       }
     }
 
-    ut_free(dump);
+    ut::free(dump);
   }
 
   ret = fclose(f);
@@ -484,7 +485,8 @@
   }
 
   if (dump_n != 0) {
-    dump = static_cast<buf_dump_t *>(ut_malloc_nokey(dump_n * sizeof(*dump)));
+    dump = static_cast<buf_dump_t *>(
+        ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, dump_n * sizeof(*dump)));
   } else {
     fclose(f);
     ut_sprintf_timestamp(now);
@@ -513,7 +515,7 @@
       }
       /* else */
 
-      ut_free(dump);
+      ut::free(dump);
       fclose(f);
       buf_load_status(STATUS_ERR,
                       "Error parsing '%s', unable"
@@ -523,7 +525,7 @@
     }
 
     if (space_id > ULINT32_MASK || page_no > ULINT32_MASK) {
-      ut_free(dump);
+      ut::free(dump);
       fclose(f);
       buf_load_status(STATUS_ERR,
                       "Error parsing '%s': bogus"
@@ -545,7 +547,7 @@
   fclose(f);
 
   if (dump_n == 0) {
-    ut_free(dump);
+    ut::free(dump);
     ut_sprintf_timestamp(now);
     buf_load_status(STATUS_INFO,
                     "Buffer pool(s) load completed at %s"
@@ -622,7 +624,7 @@
         fil_space_release(space);
       }
       buf_load_abort_flag = FALSE;
-      ut_free(dump);
+      ut::free(dump);
       buf_load_status(STATUS_INFO, "Buffer pool(s) load aborted on request");
       /* Premature end, set estimated = completed = i and
       end the current stage event. */
@@ -641,7 +643,7 @@
     fil_space_release(space);
   }
 
-  ut_free(dump);
+  ut::free(dump);
 
   ut_sprintf_timestamp(now);
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/buf/buf0flu.cc mysql-8.0-8.0.27/storage/innobase/buf/buf0flu.cc
--- mysql-8.0-8.0.26/storage/innobase/buf/buf0flu.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/buf/buf0flu.cc	2021-09-28 11:46:34.000000000 +0000
@@ -448,9 +448,8 @@
 @see @ref sect_redo_log_add_dirty_pages */
 MY_COMPILER_DIAGNOSTIC_POP()
 
-MY_ATTRIBUTE((unused))
-static inline bool buf_flush_list_order_validate(lsn_t earlier_added_lsn,
-                                                 lsn_t new_added_lsn) {
+[[maybe_unused]] static inline bool buf_flush_list_order_validate(
+    lsn_t earlier_added_lsn, lsn_t new_added_lsn) {
   return (earlier_added_lsn <=
           new_added_lsn + log_buffer_flush_order_lag(*log_sys));
 }
@@ -690,7 +689,7 @@
   ut_ad(bpage->in_LRU_list);
 
   if (!buf_page_in_file(bpage)) {
-    ib::fatal(ER_IB_MSG_123)
+    ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_123)
         << "Buffer block " << bpage << " state "
         << static_cast<unsigned>(bpage->state) << " in the LRU list!";
   }
@@ -1033,7 +1032,7 @@
         if (page_zip->data != page) {
           memcpy(page_zip->data, page, size);
         }
-        /* fall through */
+        [[fallthrough]];
       case FIL_PAGE_TYPE_ZBLOB:
       case FIL_PAGE_TYPE_ZBLOB2:
       case FIL_PAGE_SDI_ZBLOB:
@@ -2825,8 +2824,8 @@
 void buf_flush_page_cleaner_init(size_t n_page_cleaners) {
   ut_ad(page_cleaner == nullptr);
 
-  page_cleaner =
-      static_cast<page_cleaner_t *>(ut_zalloc_nokey(sizeof(*page_cleaner)));
+  page_cleaner = static_cast<page_cleaner_t *>(
+      ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sizeof(*page_cleaner)));
 
   mutex_create(LATCH_ID_PAGE_CLEANER, &page_cleaner->mutex);
 
@@ -2836,14 +2835,15 @@
   page_cleaner->n_slots = static_cast<ulint>(srv_buf_pool_instances);
 
   page_cleaner->slots = static_cast<page_cleaner_slot_t *>(
-      ut_zalloc_nokey(page_cleaner->n_slots * sizeof(*page_cleaner->slots)));
+      ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY,
+                         page_cleaner->n_slots * sizeof(*page_cleaner->slots)));
 
   ut_d(page_cleaner->n_disabled_debug = 0);
 
   page_cleaner->is_running = true;
 
   srv_threads.m_page_cleaner_coordinator =
-      os_thread_create(page_flush_coordinator_thread_key,
+      os_thread_create(page_flush_coordinator_thread_key, 0,
                        buf_flush_page_coordinator_thread, n_page_cleaners);
 
   srv_threads.m_page_cleaner_workers[0] =
@@ -2867,12 +2867,12 @@
 
   mutex_destroy(&page_cleaner->mutex);
 
-  ut_free(page_cleaner->slots);
+  ut::free(page_cleaner->slots);
 
   os_event_destroy(page_cleaner->is_finished);
   os_event_destroy(page_cleaner->is_requested);
 
-  ut_free(page_cleaner);
+  ut::free(page_cleaner);
 
   page_cleaner = nullptr;
 }
@@ -3196,7 +3196,7 @@
   ulint last_activity = srv_get_activity_count();
   ulint last_pages = 0;
 
-  THD *thd = create_thd(false, true, true, 0);
+  THD *thd = create_internal_thd();
 
 #ifdef UNIV_LINUX
   /* linux might be able to set different setting for each thread.
@@ -3214,8 +3214,8 @@
   /* We start from 1 because the coordinator thread is part of the
   same set */
   for (size_t i = 1; i < srv_threads.m_page_cleaner_workers_n; ++i) {
-    srv_threads.m_page_cleaner_workers[i] =
-        os_thread_create(page_flush_thread_key, buf_flush_page_cleaner_thread);
+    srv_threads.m_page_cleaner_workers[i] = os_thread_create(
+        page_flush_thread_key, i, buf_flush_page_cleaner_thread);
 
     srv_threads.m_page_cleaner_workers[i].start();
   }
@@ -3572,7 +3572,7 @@
 
   buf_flush_page_cleaner_close();
 
-  destroy_thd(thd);
+  destroy_internal_thd(thd);
 }
 
 /** Worker thread of page_cleaner. */
@@ -3703,9 +3703,9 @@
  list in a particular buffer pool.
  @return number of dirty pages present in a single buffer pool */
 ulint buf_pool_get_dirty_pages_count(
-    buf_pool_t *buf_pool,    /*!< in: buffer pool */
-    space_id_t id,           /*!< in: space id to check */
-    FlushObserver *observer) /*!< in: flush observer to check */
+    buf_pool_t *buf_pool,     /*!< in: buffer pool */
+    space_id_t id,            /*!< in: space id to check */
+    Flush_observer *observer) /*!< in: flush observer to check */
 
 {
   ulint count = 0;
@@ -3733,8 +3733,8 @@
  list.
  @return number of dirty pages present in all the buffer pools */
 static ulint buf_flush_get_dirty_pages_count(
-    space_id_t id,           /*!< in: space id to check */
-    FlushObserver *observer) /*!< in: flush observer to check */
+    space_id_t id,            /*!< in: space id to check */
+    Flush_observer *observer) /*!< in: flush observer to check */
 {
   ulint count = 0;
 
@@ -3749,32 +3749,32 @@
   return (count);
 }
 
-FlushObserver::FlushObserver(space_id_t space_id, trx_t *trx,
-                             ut_stage_alter_t *stage) noexcept
+Flush_observer::Flush_observer(space_id_t space_id, trx_t *trx,
+                               Alter_stage *stage) noexcept
     : m_space_id(space_id),
       m_trx(trx),
       m_stage(stage),
       m_flushed(srv_buf_pool_instances),
       m_removed(srv_buf_pool_instances) {
 #ifdef FLUSH_LIST_OBSERVER_DEBUG
-  ib::info(ER_IB_MSG_130) << "FlushObserver : ID= " << m_id
+  ib::info(ER_IB_MSG_130) << "Flush_observer : ID= " << m_id
                           << ", space_id=" << space_id << ", trx_id="
                           << (m_trx == nullptr ? TRX_ID_MAX : trx->id);
 #endif /* FLUSH_LIST_OBSERVER_DEBUG */
 }
 
-FlushObserver::~FlushObserver() noexcept {
+Flush_observer::~Flush_observer() noexcept {
   ut_a(m_n_ref_count.fetch_add(0, std::memory_order_relaxed) == 0);
   ut_ad(buf_flush_get_dirty_pages_count(m_space_id, this) == 0);
 
 #ifdef FLUSH_LIST_OBSERVER_DEBUG
-  ib::info(ER_IB_MSG_131) << "~FlushObserver : ID= " << m_id
+  ib::info(ER_IB_MSG_131) << "~Flush_observer : ID= " << m_id
                           << ", space_id=" << space_id << ", trx_id="
                           << (m_trx == nullptr ? TRX_ID_MAX : trx->id);
 #endif /* FLUSH_LIST_OBSERVER_DEBUG */
 }
 
-bool FlushObserver::check_interrupted() {
+bool Flush_observer::check_interrupted() {
   if (m_trx != nullptr && trx_is_interrupted(m_trx)) {
     interrupted();
 
@@ -3784,19 +3784,19 @@
   return false;
 }
 
-void FlushObserver::notify_flush(buf_pool_t *buf_pool, buf_page_t *bpage) {
+void Flush_observer::notify_flush(buf_pool_t *buf_pool, buf_page_t *bpage) {
   m_flushed.at(buf_pool->instance_no).fetch_add(1, std::memory_order_relaxed);
 
   if (m_stage != nullptr) {
-    m_stage->inc();
+    m_stage->inc(1);
   }
 }
 
-void FlushObserver::notify_remove(buf_pool_t *buf_pool, buf_page_t *bpage) {
+void Flush_observer::notify_remove(buf_pool_t *buf_pool, buf_page_t *bpage) {
   m_removed.at(buf_pool->instance_no).fetch_add(1, std::memory_order_relaxed);
 }
 
-void FlushObserver::flush() {
+void Flush_observer::flush() {
   buf_remove_t buf_remove;
 
   if (m_interrupted) {
@@ -3805,8 +3805,7 @@
     buf_remove = BUF_REMOVE_FLUSH_WRITE;
 
     if (m_stage != nullptr) {
-      ulint pages_to_flush = buf_flush_get_dirty_pages_count(m_space_id, this);
-
+      auto pages_to_flush = buf_flush_get_dirty_pages_count(m_space_id, this);
       m_stage->begin_phase_flush(pages_to_flush);
     }
   }
diff -Nru mysql-8.0-8.0.26/storage/innobase/buf/buf0lru.cc mysql-8.0-8.0.27/storage/innobase/buf/buf0lru.cc
--- mysql-8.0-8.0.26/storage/innobase/buf/buf0lru.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/buf/buf0lru.cc	2021-09-28 11:46:34.000000000 +0000
@@ -153,8 +153,9 @@
 caller needs to free the page to the free list
 @retval false if BUF_BLOCK_ZIP_PAGE was removed from page_hash. In
 this case the block is already returned to the buddy allocator. */
-static MY_ATTRIBUTE((warn_unused_result)) bool buf_LRU_block_remove_hashed(
-    buf_page_t *bpage, bool zip, bool ignore_content);
+[[nodiscard]] static bool buf_LRU_block_remove_hashed(buf_page_t *bpage,
+                                                      bool zip,
+                                                      bool ignore_content);
 
 /** Puts a file page whose has no hash index to the free list.
 @param[in,out] block            Must contain a file page and be in a state
@@ -255,8 +256,8 @@
     return;
   }
 
-  page_no_t *page_arr = static_cast<page_no_t *>(
-      ut_malloc_nokey(sizeof(page_no_t) * BUF_LRU_DROP_SEARCH_SIZE));
+  page_no_t *page_arr = static_cast<page_no_t *>(ut::malloc_withkey(
+      UT_NEW_THIS_FILE_PSI_KEY, sizeof(page_no_t) * BUF_LRU_DROP_SEARCH_SIZE));
 
   ulint num_entries = 0;
 
@@ -348,181 +349,311 @@
 
   /* Drop any remaining batch of search hashed pages. */
   buf_LRU_drop_page_hash_batch(space_id, page_size, page_arr, num_entries);
-  ut_free(page_arr);
+  ut::free(page_arr);
 }
 
-/** While flushing (or removing dirty) pages from a tablespace we don't
-want to hog the CPU and resources. Release the LRU list and block
-mutexes and try to force a context switch. Then reacquire the same mutexes.
-The current page is "fixed" before the release of the mutexes and then
-"unfixed" again once we have reacquired the mutexes.
-@param[in,out]	buf_pool	buffer pool instance
-@param[in,out]	bpage		current page */
-static void buf_flush_yield(buf_pool_t *buf_pool, buf_page_t *bpage) {
-  BPageMutex *block_mutex = buf_page_get_mutex(bpage);
+/** Try to pin the block in buffer pool. Once pinned, the block cannot be moved
+within flush list or removed. The dirty page can be flushed when we release the
+flush list mutex. We return without pinning in that case.
+@param[in,out]  buf_pool  buffer pool instance
+@param[in,out]  bpage     page to remove
+@return true if page could be pinned successfully. */
+static bool buf_page_try_pin(buf_pool_t *buf_pool, buf_page_t *bpage) {
+  /* Allow pin/unpin with NULL. */
+  if (bpage == nullptr) {
+    return true;
+  }
 
   ut_ad(mutex_own(&buf_pool->LRU_list_mutex));
-  ut_ad(mutex_own(block_mutex));
-  ut_ad(buf_page_in_file(bpage));
+  ut_ad(buf_flush_list_mutex_own(buf_pool));
+  ut_ad(bpage->in_flush_list);
 
-  /* "Fix" the block so that the position cannot be
-  changed after we release the buffer pool and
-  block mutexes. */
-  buf_page_set_sticky(bpage);
+  /* To take care of the ABA problem that the block get flushed and
+  re-inserted into flush list, we can check the oldest LSN. It is
+  safe to access oldest LSN with flush list mutex protection as it
+  is set and reset while adding and removing from flush list. */
+  auto saved_oldest_lsn = bpage->get_oldest_lsn();
 
-  /* Now it is safe to release the LRU list mutex. */
-  mutex_exit(&buf_pool->LRU_list_mutex);
+  buf_flush_list_mutex_exit(buf_pool);
 
-  mutex_exit(block_mutex);
-  /* Try and force a context switch. */
-  std::this_thread::yield();
+  /* The LRU list mutex ensures that the page descriptor cannot be freed
+  for both compressed and uncompressed page. */
+  BPageMutex *block_mutex = buf_page_get_mutex(bpage);
+  mutex_enter(block_mutex);
 
-  mutex_enter(&buf_pool->LRU_list_mutex);
+  bool pinned = false;
 
-  mutex_enter(block_mutex);
+  /* Recheck the I/O fix and the flush list presence now that we
+  hold the right mutex */
+  if (buf_page_get_io_fix(bpage) == BUF_IO_NONE && bpage->is_dirty() &&
+      saved_oldest_lsn == bpage->get_oldest_lsn()) {
+    /* "Fix" the block so that the position cannot be
+    changed after we release the buffer pool and
+    block mutexes. */
+    buf_page_set_sticky(bpage);
+    pinned = true;
+    ut_ad(bpage->in_flush_list);
+  }
 
-  /* "Unfix" the block now that we have both the
-  LRU list and block mutexes again. */
-  buf_page_unset_sticky(bpage);
   mutex_exit(block_mutex);
+  buf_flush_list_mutex_enter(buf_pool);
+
+  return pinned;
 }
 
-/** If we have hogged the resources for too long then release the LRU list and
- flush list mutexes and do a thread yield. Set the current page
- to "sticky" so that it is not relocated during the yield.
- @return true if yielded */
-static MY_ATTRIBUTE((warn_unused_result)) bool buf_flush_try_yield(
-    buf_pool_t *buf_pool, /*!< in/out: buffer pool instance */
-    buf_page_t *bpage,    /*!< in/out: bpage to remove */
-    ulint processed,      /*!< in: number of pages processed */
-    bool *must_restart)   /*!< in/out: if true, we have to
-                          restart the flush list scan */
-{
-  /* Every BUF_LRU_DROP_SEARCH_SIZE iterations in the
-  loop we release buf_pool->LRU_list_mutex to let other threads
-  do their job but only if the block is not IO fixed. This
-  ensures that the block stays in its position in the
-  flush_list.
-  We read io_fix without block_mutex, because we will recheck with block_mutex.
-  And in case io_fixed is not NONE now we do the same thing as when is not NONE
-  later: return false.
-  */
+/** Unpin the block in buffer pool. Ensure that the dirty page cannot be
+flushed even though we need to release the flush list mutex momentarily.
+@param[in,out]  buf_pool  buffer pool instance
+@param[in,out]  bpage     page to remove */
+static void buf_page_unpin(buf_pool_t *buf_pool, buf_page_t *bpage) {
+  /* Allow pin/unpin with NULL. */
+  if (bpage == nullptr) {
+    return;
+  }
 
-  if (bpage != nullptr && processed >= BUF_LRU_DROP_SEARCH_SIZE &&
-      bpage->was_io_fix_none()) {
-    BPageMutex *block_mutex = buf_page_get_mutex(bpage);
+  ut_ad(mutex_own(&buf_pool->LRU_list_mutex));
+  ut_ad(buf_flush_list_mutex_own(buf_pool));
 
-    buf_flush_list_mutex_exit(buf_pool);
+  buf_flush_list_mutex_exit(buf_pool);
 
-    /* We don't have to worry about bpage becoming a dangling
-    pointer by a compressed page flush list relocation because
-    buf_page_get_gen() won't be called for pages from this
-    tablespace.  */
+  BPageMutex *block_mutex = buf_page_get_mutex(bpage);
+  mutex_enter(block_mutex);
 
-    mutex_enter(block_mutex);
-    /* Recheck the I/O fix and the flush list presence now that we
-    hold the right mutex */
-    if (buf_page_get_io_fix(bpage) != BUF_IO_NONE || !bpage->is_dirty()) {
-      mutex_exit(block_mutex);
+  /* "Unfix" the block now that we have both the LRU list and block mutexes . */
+  buf_page_unset_sticky(bpage);
+
+  buf_flush_list_mutex_enter(buf_pool);
+
+  /* Release block mutex only after re-acquiring the flush list mutex to
+  avoid any window where the page could have been flushed concurrently. The
+  block mutex must be acquired before flushing a page. */
+  mutex_exit(block_mutex);
+}
 
-      *must_restart = true;
+/** If we have hogged the resources for too long then release the LRU list and
+flush list mutexes and do a thread yield. Set the current page to "sticky" so
+that it is not relocated during the yield. If I/O is started before sticky BIT
+could be set, we skip yielding. The caller should restart the scan.
+@param[in,out]	buf_pool	buffer pool instance
+@param[in,out]	bpage		page to remove
+@param[in]      processed       number of pages processed
+@param[out]     restart         if caller needs to restart scan
+@return true if yielded. */
+[[nodiscard]] static bool buf_flush_try_yield(buf_pool_t *buf_pool,
+                                              buf_page_t *bpage,
+                                              size_t processed, bool &restart) {
+  ut_ad(mutex_own(&buf_pool->LRU_list_mutex));
+  ut_ad(buf_flush_list_mutex_own(buf_pool));
 
-      buf_flush_list_mutex_enter(buf_pool);
+  restart = false;
 
+  /* Every BUF_LRU_DROP_SEARCH_SIZE iterations in the loop we release
+  buf_pool->LRU_list_mutex to let other threads do their job but only if the
+  block is not IO fixed. This ensures that the block stays in its position in
+  the flush_list. We read io_fix without block_mutex, because we will recheck
+  with block_mutex.*/
+  if (bpage != nullptr && processed >= BUF_LRU_DROP_SEARCH_SIZE &&
+      bpage->was_io_fix_none()) {
+    if (!buf_page_try_pin(buf_pool, bpage)) {
+      restart = true;
       return false;
     }
 
-    *must_restart = false;
+    ut_ad(bpage->in_flush_list);
+    ut_d(auto oldest_lsn = bpage->get_oldest_lsn());
 
-    /* Release the LRU list and buf_page_get_mutex() mutex
-    to give the other threads a go. */
+    /* Now it is safe to release the LRU list mutex. */
+    buf_flush_list_mutex_exit(buf_pool);
+    mutex_exit(&buf_pool->LRU_list_mutex);
 
-    buf_flush_yield(buf_pool, bpage);
+    /* Try and force a context switch. */
+    std::this_thread::yield();
 
+    mutex_enter(&buf_pool->LRU_list_mutex);
     buf_flush_list_mutex_enter(buf_pool);
 
-    /* Should not have been removed from the flush
-    list during the yield. However, this check is
-    not sufficient to catch a remove -> add. */
+    buf_page_unpin(buf_pool, bpage);
 
+    /* Should not have been removed from the flush list during the yield. */
     ut_ad(bpage->in_flush_list);
 
-    return (true);
-  }
+    /* The oldest LSN change would mean the page is removed and inserted back.
+    This ABA issue is handled during pinning and should not be the case. */
+    ut_ad(oldest_lsn == bpage->get_oldest_lsn());
 
-  return (false);
+    return true;
+  }
+  return false;
 }
 
-/** Removes a single page from a given tablespace inside a specific
-buffer pool instance.
-@param[in,out]	buf_pool	buffer pool instance
-@param[in,out]	bpage		bpage to remove
-@param[in]	flush		flush to disk if true but don't remove
-                                else remove without flushing to disk
-@param[in,out]	must_restart	flag if must restart the flush list scan
-@return true if page was removed. */
-static MY_ATTRIBUTE((warn_unused_result)) bool buf_flush_or_remove_page(
-    buf_pool_t *buf_pool, buf_page_t *bpage, bool flush, bool *must_restart) {
+/** Check if a dirty page should be flushed or removed based on space ID and
+flush observer.
+@param[in]  page        dirty page in flush list
+@param[in]  observer    Flush observer
+@param[in]  space       Space ID
+@return true, if page should considered for flush or removal. */
+static inline bool check_page_flush_observer(buf_page_t *page,
+                                             const Flush_observer *observer,
+                                             space_id_t space) {
+  /* If no flush observer then compare space ID. */
+  if (observer == nullptr) {
+    return (space == page->id.space());
+  }
+  /* Otherwise, match the flush observer pointer. */
+  return (observer == page->get_flush_observer());
+}
+
+/** Attempts to remove a single page from flush list. It is fine to
+skip flush if the page flush is already in progress.
+@param[in,out]  buf_pool  buffer pool instance
+@param[in,out]  bpage     page to remove
+@return true if page could be removed successfully. */
+static bool remove_page_flush_list(buf_pool_t *buf_pool, buf_page_t *bpage) {
   ut_ad(mutex_own(&buf_pool->LRU_list_mutex));
   ut_ad(buf_flush_list_mutex_own(buf_pool));
 
   /* It is safe to check bpage->space and bpage->io_fix while holding
-  buf_pool->LRU_list_mutex only.
-  We will repeat the check of io_fix under block_mutex later, this is just an
-  optimization to avoid the mutex acquisition if its likely io_fix is not NONE.
-  */
-
+  buf_pool->LRU_list_mutex only. We will repeat the check of io_fix
+  under block_mutex later, this is just an optimization to avoid the
+  mutex acquisition if its likely io_fix is not NONE. */
   if (bpage->was_io_fixed()) {
-    /* We cannot remove this page during this scan
-    yet; maybe the system is currently reading it
-    in, or flushing the modifications to the file */
-    return (false);
+    /* We cannot remove this page during this scan. */
+    return false;
   }
-
   BPageMutex *block_mutex = buf_page_get_mutex(bpage);
-  bool processed = false;
-
-  /* We don't have to worry about bpage becoming a dangling
-  pointer by a compressed page flush list relocation because
-  buf_page_get_gen() won't be called for pages from this
-  tablespace.  */
 
+  /* We don't have to worry about bpage becoming a dangling pointer by a
+  compressed page flush list relocation because we hold LRU mutex. */
   buf_flush_list_mutex_exit(buf_pool);
-
   mutex_enter(block_mutex);
 
-  /* Recheck the page I/O fix and the flush list presence now
-  that we hold the right mutex. */
-  if (buf_page_get_io_fix(bpage) != BUF_IO_NONE || !bpage->is_dirty()) {
-    /* The page became I/O-fixed or is not on the flush
-    list anymore, this invalidates any flush-list-page
-    pointers we have. */
+  bool removed = false;
+  /* Recheck the page I/O fix and the flush list presence now that we hold
+  the right mutex. */
+  if (buf_page_get_io_fix(bpage) == BUF_IO_NONE && bpage->is_dirty()) {
+    buf_flush_remove(bpage);
+    removed = true;
+  }
 
-    mutex_exit(block_mutex);
+  mutex_exit(block_mutex);
+  buf_flush_list_mutex_enter(buf_pool);
+
+  ut_ad(mutex_own(&buf_pool->LRU_list_mutex));
+  return removed;
+}
 
-    *must_restart = true;
-    processed = false;
+/** Remove all dirty pages belonging to a given tablespace inside a specific
+buffer pool instance. The pages still remain a part of LRU and are evicted from
+the list as they age towards the tail of the LRU. We don't check for interrupt
+as we must finish the operation. Usually this function is called as a cleanup
+work after an interrupt is received.
+@param[in,out]  buf_pool  buffer pool instance
+@param[in]      id        space id for which to remove or flush pages
+@param[in]      observer  flush observer to identify specific pages
+@retval DB_SUCCESS if all freed
+@retval DB_FAIL if not all freed and caller should call function again. */
+[[nodiscard]] static dberr_t remove_pages_flush_list(buf_pool_t *buf_pool,
+                                                     space_id_t id,
+                                                     Flush_observer *observer) {
+  ut_ad(mutex_own(&buf_pool->LRU_list_mutex));
 
-  } else if (!flush) {
-    buf_flush_remove(bpage);
+  buf_flush_list_mutex_enter(buf_pool);
 
-    mutex_exit(block_mutex);
+  buf_page_t *prev = nullptr;
+  size_t processed = 0;
+  dberr_t error = DB_SUCCESS;
 
-    processed = true;
+  for (buf_page_t *bpage = UT_LIST_GET_LAST(buf_pool->flush_list);
+       bpage != nullptr; bpage = prev) {
+    ut_a(buf_page_in_file(bpage));
 
-  } else if (buf_flush_ready_for_flush(bpage, BUF_FLUSH_SINGLE_PAGE)) {
-    /* The following call will release the LRU list
-    and block mutexes. */
-    processed = buf_flush_page(buf_pool, bpage, BUF_FLUSH_SINGLE_PAGE, false);
-
-    if (processed) {
-      /* Wake possible simulated aio thread to actually
-      post the writes to the operating system */
-      os_aio_simulated_wake_handler_threads();
-      mutex_enter(&buf_pool->LRU_list_mutex);
-    } else {
-      mutex_exit(block_mutex);
+    /* Save the previous page before freeing the current one. */
+    prev = UT_LIST_GET_PREV(list, bpage);
+
+    if (check_page_flush_observer(bpage, observer, id)) {
+      /* Try to PIN the previous page before removing. This would let us
+      continue the current iteration after removal. */
+      bool pinned = buf_page_try_pin(buf_pool, prev);
+
+      /* Try to remove the current page even if pin failed. */
+      bool removed = remove_page_flush_list(buf_pool, bpage);
+
+      if (!pinned) {
+        /* We should not trust prev pointer as PIN was unsuccessful. */
+        error = DB_FAIL;
+        break;
+      }
+
+      if (!removed) {
+        /* Currently we come back and re-check. The iteration can continue.
+        In future, it is also possible to wait for the concurrent IO to complete
+        to avoid re-scanning. */
+        error = DB_FAIL;
+      }
+
+      buf_page_unpin(buf_pool, prev);
     }
+
+    ++processed;
+
+    /* Yield if we have hogged the CPU and mutexes for too long. */
+    bool restart = false;
+    if (buf_flush_try_yield(buf_pool, prev, processed, restart)) {
+      ut_ad(!restart);
+      /* Reset the batch size counter if we had to yield. */
+      processed = 0;
+    }
+
+    if (restart) {
+      /* The previous page is already flushed or being flushed. We need at least
+      another iteration. Current iteration can continue. */
+      error = DB_FAIL;
+    }
+  }
+
+  buf_flush_list_mutex_exit(buf_pool);
+  return error;
+}
+
+/** Flushes a single page inside a buffer pool instance.
+@param[in,out]  buf_pool  buffer pool instance
+@param[in,out]  bpage     page to flush
+@return true if page was flushed. */
+static bool flush_page_flush_list(buf_pool_t *buf_pool, buf_page_t *bpage) {
+  ut_ad(mutex_own(&buf_pool->LRU_list_mutex));
+  ut_ad(buf_flush_list_mutex_own(buf_pool));
+
+  if (bpage->was_io_fixed()) {
+    return false;
+  }
+
+  BPageMutex *block_mutex = buf_page_get_mutex(bpage);
+
+  /* We don't have to worry about bpage becoming a dangling pointer by a
+  compressed page flush list relocation because we hold LRU mutex. */
+  buf_flush_list_mutex_exit(buf_pool);
+
+  mutex_enter(block_mutex);
+  bool flushed = false;
+
+  if (buf_flush_ready_for_flush(bpage, BUF_FLUSH_SINGLE_PAGE)) {
+    /* We trigger single page flush and async IO. However, if double write is
+    used, dblwr::write() forces all single page flush to sync IO.
+    1. It makes the function behaviour change from sync to async for temp
+       tablespaces and if redo is disabled. The caller must not assume
+       the page is flushed when we return flushed = T.
+    2. For bulk flush aysnc trigger could be better for performance and seems
+       to be the case in 5.7. Need to validate if 8.0 forcing sync flush
+       is intentional - No functional impact. */
+    flushed = buf_flush_page(buf_pool, bpage, BUF_FLUSH_SINGLE_PAGE, false);
+  }
+
+  if (flushed) {
+    /* During flush, we have already released the LRU list and block mutexes.
+    Wake up possible simulated aio thread to actually post the writes to the
+    operating system */
+    os_aio_simulated_wake_handler_threads();
+    mutex_enter(&buf_pool->LRU_list_mutex);
   } else {
     mutex_exit(block_mutex);
   }
@@ -532,119 +663,92 @@
   ut_ad(!mutex_own(block_mutex));
   ut_ad(mutex_own(&buf_pool->LRU_list_mutex));
 
-  return (processed);
+  return flushed;
 }
 
 /** Remove all dirty pages belonging to a given tablespace inside a specific
 buffer pool instance when we are deleting the data file(s) of that
 tablespace. The pages still remain a part of LRU and are evicted from
 the list as they age towards the tail of the LRU.
-@param[in,out]	buf_pool	buffer pool instance
-@param[in]	id		space id for which to remove or flush pages
-@param[in]	observer	flush observer
-@param[in]	flush		flush to disk if true but don't remove,
-                                otherwise remove without flushing to disk
-@param[in]	trx		transaction to check if the operation must be
-                                interrupted, can be NULL
+@param[in,out]  buf_pool  buffer pool instance
+@param[in]      id        space id for which to remove or flush pages
+@param[in]      observer  flush observer
+@param[in]      trx       transaction to check if the operation must be
+                          interrupted, can be NULL
 @retval DB_SUCCESS if all freed
 @retval DB_FAIL if not all freed
 @retval DB_INTERRUPTED if the transaction was interrupted */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    buf_flush_or_remove_pages(buf_pool_t *buf_pool, space_id_t id,
-                              FlushObserver *observer, bool flush,
-                              const trx_t *trx) {
-  buf_page_t *prev;
-  buf_page_t *bpage;
-  ulint processed = 0;
-
+[[nodiscard]] static dberr_t flush_pages_flush_list(buf_pool_t *buf_pool,
+                                                    space_id_t id,
+                                                    Flush_observer *observer,
+                                                    const trx_t *trx) {
   ut_ad(mutex_own(&buf_pool->LRU_list_mutex));
 
   buf_flush_list_mutex_enter(buf_pool);
 
-rescan:
-  bool must_restart = false;
-  bool all_freed = true;
+  buf_page_t *prev = nullptr;
+  size_t processed = 0;
 
-  for (bpage = UT_LIST_GET_LAST(buf_pool->flush_list); bpage != nullptr;
-       bpage = prev) {
-    ut_a(buf_page_in_file(bpage));
+  dberr_t error = DB_SUCCESS;
 
-    /* Save the previous link because once we free the page we can't rely
-    on the links. */
+  for (buf_page_t *bpage = UT_LIST_GET_LAST(buf_pool->flush_list);
+       bpage != nullptr; bpage = prev) {
+    ut_a(buf_page_in_file(bpage));
 
+    /* Save the previous page before flushing the current one. */
     prev = UT_LIST_GET_PREV(list, bpage);
 
-    /* If flush observer is NULL, flush page for space id,
-    or flush page for flush observer. */
-    if ((observer != nullptr && observer != bpage->get_flush_observer()) ||
-        (observer == nullptr && id != bpage->id.space())) {
-      /* Skip this block, as it does not belong to the target space. */
-
-    } else if (!buf_flush_or_remove_page(buf_pool, bpage, flush,
-                                         &must_restart)) {
-      /* Remove was unsuccessful, we have to try again
-      by scanning the entire list from the end.
-      This also means that we never released the
-      flush list mutex. Therefore we can trust the prev
-      pointer.
-      buf_flush_or_remove_page() released the
-      flush list mutex but not the LRU list mutex.
-      Therefore it is possible that a new page was
-      added to the flush list. For example, in case
-      where we are at the head of the flush list and
-      prev == NULL. That is OK because we have the
-      tablespace quiesced and no new pages for this
-      space-id should enter flush_list. This is
-      because the only callers of this function are
-      DROP TABLE and FLUSH TABLE FOR EXPORT.
-      We know that we'll have to do at least one more
-      scan but we don't break out of loop here and
-      try to do as much work as we can in this
-      iteration. */
-
-      all_freed = false;
-    } else if (flush) {
-      /* The processing was successful. And during the
-      processing we have released all the buf_pool mutexes
-      when calling buf_page_flush(). We cannot trust
-      prev pointer. */
-      goto rescan;
-    } else if (must_restart) {
-      ut_ad(!all_freed);
-      break;
+    if (check_page_flush_observer(bpage, observer, id)) {
+      /* Try to PIN the previous page before flushing. This would let us
+      continue the current iteration after flush. */
+      bool pinned = buf_page_try_pin(buf_pool, prev);
+
+      /* Try to flush the current page even if pin failed. */
+      flush_page_flush_list(buf_pool, bpage);
+
+      /* Currently we come back and re-check once flush is triggered. If the
+      flush is unsuccessful we need to rescan too. So, we set the error for
+      rescan unconditionally here. The iteration can continue if PIN was
+      successful. */
+      error = DB_FAIL;
+
+      if (!pinned) {
+        /* We should not trust prev pointer as PIN was unsuccessful. */
+        break;
+      }
+
+      buf_page_unpin(buf_pool, prev);
     }
 
     ++processed;
 
     /* Yield if we have hogged the CPU and mutexes for too long. */
-    if (buf_flush_try_yield(buf_pool, prev, processed, &must_restart)) {
-      ut_ad(!must_restart);
+    bool restart = false;
+    if (buf_flush_try_yield(buf_pool, prev, processed, restart)) {
+      ut_ad(!restart);
       /* Reset the batch size counter if we had to yield. */
-
       processed = 0;
     }
 
-    /* The check for trx is interrupted is expensive, we want
-    to check every N iterations. */
-    if (!processed && trx && trx_is_interrupted(trx)) {
+    if (restart) {
+      /* The previous page is already flushed or being flushed. We need at least
+      another iteration. Current iteration can continue. */
+      error = DB_FAIL;
+    }
+
+    /* The check for trx is interrupted is expensive, we want to check every
+    N iterations. */
+    if (processed == 0 && trx && trx_is_interrupted(trx)) {
       if (trx->flush_observer != nullptr) {
-        if (flush) {
-          trx->flush_observer->interrupted();
-        } else {
-          /* We should remove all pages with the
-          the flush observer. */
-          continue;
-        }
+        trx->flush_observer->interrupted();
       }
-
-      buf_flush_list_mutex_exit(buf_pool);
-      return (DB_INTERRUPTED);
+      error = DB_INTERRUPTED;
+      break;
     }
   }
 
   buf_flush_list_mutex_exit(buf_pool);
-
-  return (all_freed ? DB_SUCCESS : DB_FAIL);
+  return error;
 }
 
 /** Remove or flush all the dirty pages that belong to a given tablespace
@@ -661,7 +765,7 @@
 @param[in]	strict		true, if no page from tablespace
                                 can be in buffer pool just after flush */
 static void buf_flush_dirty_pages(buf_pool_t *buf_pool, space_id_t id,
-                                  FlushObserver *observer, bool flush,
+                                  Flush_observer *observer, bool flush,
                                   const trx_t *trx, bool strict) {
   dberr_t err;
 
@@ -670,7 +774,12 @@
     mutex here. */
     mutex_enter(&buf_pool->LRU_list_mutex);
 
-    err = buf_flush_or_remove_pages(buf_pool, id, observer, flush, trx);
+    if (flush) {
+      err = flush_pages_flush_list(buf_pool, id, observer, trx);
+
+    } else {
+      err = remove_pages_flush_list(buf_pool, id, observer);
+    }
 
     mutex_exit(&buf_pool->LRU_list_mutex);
 
@@ -694,7 +803,7 @@
 
   } while (err == DB_FAIL);
 
-  ut_ad(err == DB_INTERRUPTED || !strict ||
+  ut_ad(observer != nullptr || err == DB_INTERRUPTED || !strict ||
         buf_pool_get_dirty_pages_count(buf_pool, id, observer) == 0);
 }
 
@@ -848,7 +957,7 @@
     bool strict)             /*!< in: true if no page from tablespace
                              can be in buffer pool just after flush */
 {
-  FlushObserver *observer = (trx == nullptr) ? nullptr : trx->flush_observer;
+  Flush_observer *observer = (trx == nullptr) ? nullptr : trx->flush_observer;
 
   switch (buf_remove) {
     case BUF_REMOVE_ALL_NO_WRITE:
@@ -1167,7 +1276,7 @@
   if (!recv_recovery_is_on() && buf_pool->curr_size == buf_pool->old_size &&
       UT_LIST_GET_LEN(buf_pool->free) + UT_LIST_GET_LEN(buf_pool->LRU) <
           buf_pool->curr_size / 20) {
-    ib::fatal(ER_IB_MSG_132)
+    ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_132)
         << "Over 95 percent of the buffer pool is"
            " occupied by lock heaps or the adaptive hash index!"
            " Check that your transactions do not set too many"
@@ -2110,7 +2219,7 @@
         }
       }
     }
-    /* fall through */
+      [[fallthrough]];
     case BUF_BLOCK_ZIP_PAGE:
       ut_a(!bpage->is_dirty());
       if (bpage->size.is_compressed()) {
diff -Nru mysql-8.0-8.0.26/storage/innobase/clone/clone0api.cc mysql-8.0-8.0.27/storage/innobase/clone/clone0api.cc
--- mysql-8.0-8.0.26/storage/innobase/clone/clone0api.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/clone/clone0api.cc	2021-09-28 11:46:34.000000000 +0000
@@ -38,6 +38,7 @@
 
 #include "sql/clone_handler.h"
 #include "sql/mysqld.h"
+#include "sql/sql_backup_lock.h"
 #include "sql/sql_class.h"
 #include "sql/sql_prepare.h"
 #include "sql/sql_table.h"
@@ -55,10 +56,13 @@
 #include "sql/dd/types/table.h"
 #include "sql/rpl_msr.h"  // is_slave_configured()
 
+/* To get current session thread default THD */
+THD *thd_get_current_thd();
+
 /** Check if clone status file exists.
 @param[in]	file_name	file name
 @return true if file exists. */
-static bool file_exists(std::string &file_name) {
+static bool file_exists(const std::string &file_name) {
   std::ifstream file(file_name.c_str());
 
   if (file.is_open()) {
@@ -76,7 +80,7 @@
   auto ret = std::rename(from_file.c_str(), to_file.c_str());
 
   if (ret != 0) {
-    ib::fatal(ER_IB_CLONE_STATUS_FILE)
+    ib::fatal(UT_LOCATION_HERE, ER_IB_CLONE_STATUS_FILE)
         << "Error renaming file from: " << from_file.c_str()
         << " to: " << to_file.c_str();
   }
@@ -97,7 +101,13 @@
 
 /** Delete clone status file.
 @param[in]	file	name of file */
-static void remove_file(std::string &file) {
+static void remove_file(const std::string &file) {
+  /* Allow non existent file, as the server could have crashed or returned with
+  error before creating the file. This is needed during error cleanup. */
+  if (!file_exists(file)) {
+    return;
+  }
+
   auto ret = std::remove(file.c_str());
 
   if (ret != 0) {
@@ -176,21 +186,24 @@
 void clone_init_list_files() {
   /* Remove any existing list files. */
   std::string new_files(CLONE_INNODB_NEW_FILES);
-  if (file_exists(new_files)) {
-    remove_file(new_files);
-  }
+  remove_file(new_files);
+
   std::string old_files(CLONE_INNODB_OLD_FILES);
-  if (file_exists(old_files)) {
-    remove_file(old_files);
-  }
+  remove_file(old_files);
+
   std::string replaced_files(CLONE_INNODB_REPLACED_FILES);
-  if (file_exists(replaced_files)) {
-    remove_file(replaced_files);
-  }
+  remove_file(replaced_files);
+
   std::string recovery_file(CLONE_INNODB_RECOVERY_FILE);
-  if (file_exists(recovery_file)) {
-    remove_file(recovery_file);
-  }
+  remove_file(recovery_file);
+
+  std::string ddl_file(CLONE_INNODB_DDL_FILES);
+  remove_file(ddl_file);
+}
+
+void clone_remove_list_file(const char *file_name) {
+  std::string list_file(file_name);
+  remove_file(list_file);
 }
 
 int clone_add_to_list_file(const char *list_file_name, const char *file_name) {
@@ -257,8 +270,9 @@
 static void clone_init_compression(THD *thd);
 
 /** Open all Innodb tablespaces.
-@param[in,out]	thd	session THD */
-static void clone_init_tablespaces(THD *thd);
+@param[in,out]	thd	session THD
+@return error code. */
+static int clone_init_tablespaces(THD *thd);
 
 /** Set security context to skip privilege check.
 @param[in,out]	thd	session THD
@@ -280,6 +294,82 @@
   flags.set(HA_CLONE_RESTART);
 }
 
+/** Check if clone can be started.
+@param[in,out]	thd	session THD
+@return error code. */
+static int clone_begin_check(THD *thd) {
+  ut_ad(mutex_own(clone_sys->get_mutex()));
+  int err = 0;
+
+  if (!mtr_t::s_logging.is_enabled()) {
+    err = ER_INNODB_REDO_DISABLED;
+
+  } else if (Clone_Sys::s_clone_sys_state == CLONE_SYS_ABORT) {
+    err = ER_CLONE_DDL_IN_PROGRESS;
+  }
+
+  if (err != 0 && thd != nullptr) {
+    my_error(err, MYF(0));
+  }
+  return err;
+}
+
+/** Get clone timeout configuration value.
+@param[in,out]	thd		server thread handle
+@param[in]	config_name	timeout configuration name
+@param[out]	timeout		timeout value
+@return true iff successful. */
+static bool get_clone_timeout_config(THD *thd, const std::string &config_name,
+                                     int &timeout) {
+  timeout = 0;
+
+  ut_ad(clone_protocol_svc != nullptr);
+  if (clone_protocol_svc == nullptr) {
+    return false;
+  }
+
+  /* Get timeout configuration in string format and convert to integer.
+  Currently there is no interface to get the integer value directly. The
+  variable is in clone plugin and innodb cannot access it directly. */
+  Mysql_Clone_Key_Values timeout_confs = {{config_name, ""}};
+
+  auto err = clone_protocol_svc->mysql_clone_get_configs(thd, timeout_confs);
+
+  std::string err_str("Error reading configuration: ");
+  err_str.append(config_name);
+
+  if (err != 0) {
+    ib::error(ER_IB_CLONE_INTERNAL) << err_str;
+    return false;
+  }
+
+  try {
+    timeout = std::stoi(timeout_confs[0].second);
+  } catch (const std::exception &e) {
+    err_str.append(" Exception: ");
+    err_str.append(e.what());
+    ib::error(ER_IB_CLONE_INTERNAL) << err_str;
+    ut_ad(false);
+    return false;
+  }
+
+  return true;
+}
+
+/** Timeout while waiting for DDL commands.
+@param[in,out]	thd	server thread handle
+@return donor timeout in seconds. */
+static int get_ddl_timeout(THD *thd) {
+  int timeout = 0;
+  std::string config_timeout("clone_ddl_timeout");
+
+  if (!get_clone_timeout_config(thd, config_timeout, timeout)) {
+    /* Default to five minutes in case error reading configuration. */
+    timeout = 300;
+  }
+  return timeout;
+}
+
 int innodb_clone_begin(handlerton *hton, THD *thd, const byte *&loc,
                        uint &loc_len, uint &task_id, Ha_clone_type type,
                        Ha_clone_mode mode) {
@@ -295,26 +385,15 @@
   IB_mutex_guard sys_mutex(clone_sys->get_mutex());
 
   /* Check if concurrent ddl has marked abort. */
-  if (Clone_Sys::s_clone_sys_state == CLONE_SYS_ABORT) {
-    if (thd != nullptr) {
-      my_error(ER_CLONE_DDL_IN_PROGRESS, MYF(0));
-    }
-
-    return (ER_CLONE_DDL_IN_PROGRESS);
-  }
+  int err = clone_begin_check(thd);
 
-  if (!mtr_t::s_logging.is_enabled()) {
-    if (thd != nullptr) {
-      my_error(ER_INNODB_REDO_DISABLED, MYF(0));
-    }
-    return (ER_INNODB_REDO_DISABLED);
+  if (err != 0) {
+    return err;
   }
 
   /* Check of clone is already in progress for the reference locator. */
   auto clone_hdl = clone_sys->find_clone(loc, loc_len, CLONE_HDL_COPY);
 
-  int err = 0;
-
   switch (mode) {
     case HA_CLONE_MODE_RESTART:
       /* Error out if existing clone is not found */
@@ -391,9 +470,20 @@
 
     /* Check and wait if clone is marked for wait. */
     if (err == 0) {
+      auto timeout = get_ddl_timeout(thd);
+      /* zero timeout is special mode when DDL can abort running clone. */
+      if (timeout == 0) {
+        clone_hdl->set_ddl_abort();
+      }
       err = clone_sys->wait_for_free(thd);
     }
 
+    /* Re-check for initial errors as we could have released sys mutex
+    before allocating clone handle. */
+    if (err == 0) {
+      err = clone_begin_check(thd);
+    }
+
     if (err != 0) {
       clone_sys->drop_clone(clone_hdl);
       return (err);
@@ -411,8 +501,11 @@
     /* 1. Open all tablespaces in Innodb if not done during bootstrap.
        2. Initialize compression option for all compressed tablesapces. */
     if (err == 0 && task_id == 0) {
-      clone_init_tablespaces(thd);
-      clone_init_compression(thd);
+      err = clone_init_tablespaces(thd);
+
+      if (err == 0) {
+        clone_init_compression(thd);
+      }
     }
 
     mutex_enter(clone_sys->get_mutex());
@@ -509,39 +602,13 @@
 @param[in,out]	thd	server thread handle
 @return donor timeout in minutes. */
 static Clone_Min get_donor_timeout(THD *thd) {
-  int timeout = 5;
+  int timeout = 0;
+  std::string config_timeout("clone_donor_timeout_after_network_failure");
 
-  ut_ad(clone_protocol_svc != nullptr);
-  if (clone_protocol_svc == nullptr) {
-    return Clone_Min(timeout);
-  }
-
-  /* Get timeout configuration in string format and convert to integer.
-  Currently there is no interface to get the integer value directly. The
-  variable is in clone plugin and innodb cannot access it directly. */
-  Mysql_Clone_Key_Values timeout_confs = {
-      {"clone_donor_timeout_after_network_failure", ""}};
-
-  auto err = clone_protocol_svc->mysql_clone_get_configs(thd, timeout_confs);
-
-  std::string err_str(
-      "Error reading clone_donor_timeout_after_network_failure"
-      " configuration");
-  if (err != 0) {
-    ib::error(ER_IB_CLONE_INTERNAL) << err_str;
-    return Clone_Min(timeout);
-  }
-
-  try {
-    timeout = std::stoi(timeout_confs[0].second);
-  } catch (const std::exception &e) {
-    err_str.append(" Exception: ");
-    err_str.append(e.what());
-    ib::error(ER_IB_CLONE_INTERNAL) << err_str;
-    ut_ad(false);
+  if (!get_clone_timeout_config(thd, config_timeout, timeout)) {
+    /* Default to five minutes in case error reading configuration. */
     timeout = 5;
   }
-
   return Clone_Min(timeout);
 }
 
@@ -574,10 +641,10 @@
       if (is_abort) {
         ib::info(ER_IB_CLONE_RESTART)
             << "Clone Master aborted by concurrent clone";
-
+        clone_hdl->set_abort();
       } else if (in_err != 0) {
         /* Make sure re-start attempt fails immediately */
-        clone_hdl->set_state(CLONE_STATE_ABORT);
+        clone_hdl->set_abort();
       }
     }
 
@@ -678,6 +745,15 @@
            "for restart timed out after "
         << time_out.count() << " minutes. Dropping Snapshot";
   }
+
+  /* If Clone snapshot is not restarted, at this point mark it for
+  abort and end the snapshot to allow any waiting DDL to unpin the
+  handle and exit. */
+  if (!clone_hdl->is_active()) {
+    ut_ad(err != 0 || is_timeout);
+    clone_hdl->set_abort();
+  }
+
   /* Last task should drop the clone handle. */
   clone_sys->drop_clone(clone_hdl);
   return (0);
@@ -777,7 +853,7 @@
       return (err);
     }
 
-    err = clone_hdl->init(loc, loc_len, HA_CLONE_BLOCKING, data_dir);
+    err = clone_hdl->init(loc, loc_len, HA_CLONE_HYBRID, data_dir);
 
     if (err != 0) {
       clone_sys->drop_clone(clone_hdl);
@@ -976,7 +1052,7 @@
           << "Clone File Roll Forward: Save data file " << data_file
           << " state: " << cur_state;
     }
-      /* Fall through */
+      [[fallthrough]];
 
     case FILE_STATE_CLONE_SAVED: {
       if (final_state == FILE_STATE_CLONE_SAVED) {
@@ -990,7 +1066,7 @@
           << "Clone File Roll Forward: Rename clone to data file " << data_file
           << " state: " << cur_state;
     }
-      /* Fall through */
+      [[fallthrough]];
 
     case FILE_STATE_REPLACED: {
       if (final_state == FILE_STATE_REPLACED) {
@@ -1004,14 +1080,14 @@
           << "Clone File Roll Forward: Remove saved data file " << data_file
           << " state: " << cur_state;
     }
-      /* Fall through */
+      [[fallthrough]];
 
     case FILE_STATE_NORMAL:
       /* Nothing to do. */
       break;
 
     default:
-      ib::fatal(ER_IB_CLONE_STATUS_FILE)
+      ib::fatal(UT_LOCATION_HERE, ER_IB_CLONE_STATUS_FILE)
           << "Clone File Roll Forward: Invalid File State: " << cur_state;
   }
   return (cur_state);
@@ -1032,7 +1108,7 @@
           << "Clone File Roll Back: Rename data to cloned file " << data_file
           << " state: " << cur_state;
     }
-      /* Fall through */
+      [[fallthrough]];
 
     case FILE_STATE_CLONE_SAVED: {
       /* Replace data file with saved file. */
@@ -1043,7 +1119,7 @@
           << "Clone File Roll Back: Rename saved to data file " << data_file
           << " state: " << cur_state;
     }
-      /* Fall through */
+      [[fallthrough]];
 
     case FILE_STATE_CLONED: {
       /* Remove cloned data file. */
@@ -1054,14 +1130,14 @@
           << "Clone File Roll Back: Remove cloned file " << data_file
           << " state: " << cur_state;
     }
-      /* Fall through */
+      [[fallthrough]];
 
     case FILE_STATE_NORMAL:
       /* Nothing to do. */
       break;
 
     default:
-      ib::fatal(ER_IB_CLONE_STATUS_FILE)
+      ib::fatal(UT_LOCATION_HERE, ER_IB_CLONE_STATUS_FILE)
           << "Clone File Roll Back: Invalid File State: " << cur_state;
   }
 }
@@ -1112,7 +1188,7 @@
           << "Clone Old File Roll Forward: Saved data file " << data_file
           << " state: " << cur_state;
     }
-      /* Fall through */
+      [[fallthrough]];
 
     case FILE_STATE_SAVED: {
       if (final_state == FILE_STATE_SAVED) {
@@ -1126,14 +1202,14 @@
           << "Clone Old File Roll Forward: Remove saved file " << data_file
           << " state: " << cur_state;
     }
-      /* Fall through */
+      [[fallthrough]];
 
     case FILE_STATE_NONE:
       /* Nothing to do. */
       break;
 
     default:
-      ib::fatal(ER_IB_CLONE_STATUS_FILE)
+      ib::fatal(UT_LOCATION_HERE, ER_IB_CLONE_STATUS_FILE)
           << "Clone Old File Roll Forward: Invalid File State: " << cur_state;
   }
 }
@@ -1163,7 +1239,7 @@
           << "Clone Old File Roll Back: Renamed saved data file " << data_file
           << " state: " << cur_state;
     }
-      /* Fall through */
+      [[fallthrough]];
 
     case FILE_STATE_NORMAL:
     case FILE_STATE_NONE:
@@ -1171,7 +1247,7 @@
       break;
 
     default:
-      ib::fatal(ER_IB_CLONE_STATUS_FILE)
+      ib::fatal(UT_LOCATION_HERE, ER_IB_CLONE_STATUS_FILE)
           << "Clone Old File Roll Back: Invalid File State: " << cur_state;
   }
 }
@@ -1359,6 +1435,29 @@
   remove_file(replace_files);
 }
 
+/** Callback to process entries before removing status file. */
+using Remove_cbk = std::function<void(std::string &)>;
+
+/** Process all entries and remove status file.
+@param[in]	file_name	status file name
+@param[in]	process		callback to process entries */
+static void process_remove_file(const char *file_name, Remove_cbk &process) {
+  std::ifstream files;
+  std::string data_file;
+
+  /* Open file to get all file entries. */
+  files.open(file_name);
+  if (files.is_open()) {
+    /* Extract and process all files. */
+    while (std::getline(files, data_file)) {
+      process(data_file);
+    }
+    files.close();
+    std::string file_str(file_name);
+    remove_file(file_str);
+  }
+}
+
 void clone_files_error() {
   /* Check if clone file directory exists. */
   if (!os_file_exists(CLONE_FILES_DIR)) {
@@ -1372,44 +1471,20 @@
     create_file(err_file);
   }
 
-  std::ifstream files;
-  std::string data_file;
+  /* Process all old files to be moved. */
+  Remove_cbk cbk = old_file_rollback;
+  process_remove_file(CLONE_INNODB_OLD_FILES, cbk);
+
+  /* Process all files to be replaced. */
+  cbk = file_rollback;
+  process_remove_file(CLONE_INNODB_REPLACED_FILES, cbk);
+
+  /* Process all new files to be deleted. */
+  cbk = remove_file;
+  process_remove_file(CLONE_INNODB_NEW_FILES, cbk);
 
-  /* Open old file to get all files to be moved. */
-  files.open(CLONE_INNODB_OLD_FILES);
-  if (files.is_open()) {
-    /* Extract and process all files to be moved */
-    while (std::getline(files, data_file)) {
-      old_file_rollback(data_file);
-    }
-    files.close();
-    std::string old_files(CLONE_INNODB_OLD_FILES);
-    remove_file(old_files);
-  }
-
-  /* Open file to get all files to be replaced. */
-  files.open(CLONE_INNODB_REPLACED_FILES);
-  if (files.is_open()) {
-    /* Extract and process all files to be replaced */
-    while (std::getline(files, data_file)) {
-      file_rollback(data_file);
-    }
-    files.close();
-    std::string replace_files(CLONE_INNODB_REPLACED_FILES);
-    remove_file(replace_files);
-  }
-
-  /* Open file to get all new files to delete. */
-  files.open(CLONE_INNODB_NEW_FILES);
-  if (files.is_open()) {
-    /* Extract and process all files to be replaced */
-    while (std::getline(files, data_file)) {
-      remove_file(data_file);
-    }
-    files.close();
-    std::string new_files(CLONE_INNODB_NEW_FILES);
-    remove_file(new_files);
-  }
+  /* Process all temp ddl files to be deleted. */
+  process_remove_file(CLONE_INNODB_DDL_FILES, cbk);
 
   /* Remove error status file. */
   remove_file(err_file);
@@ -1529,7 +1604,8 @@
 
   if (clone_sys == nullptr) {
     ut_ad(Clone_Sys::s_clone_sys_state == CLONE_SYS_INACTIVE);
-    clone_sys = UT_NEW(Clone_Sys(), mem_key_clone);
+    clone_sys =
+        ut::new_withkey<Clone_Sys>(ut::make_psi_memory_key(mem_key_clone));
   }
   Clone_Sys::s_clone_sys_state = CLONE_SYS_ACTIVE;
   Clone_handler::init_xa();
@@ -1542,34 +1618,14 @@
   if (clone_sys != nullptr) {
     ut_ad(Clone_Sys::s_clone_sys_state == CLONE_SYS_ACTIVE);
 
-    UT_DELETE(clone_sys);
+    ut::delete_(clone_sys);
     clone_sys = nullptr;
   }
 
   Clone_Sys::s_clone_sys_state = CLONE_SYS_INACTIVE;
 }
 
-bool clone_mark_abort(bool force) {
-  bool aborted;
-
-  mutex_enter(clone_sys->get_mutex());
-
-  aborted = clone_sys->mark_abort(force);
-
-  mutex_exit(clone_sys->get_mutex());
-
-  DEBUG_SYNC_C("clone_marked_abort2");
-
-  return (aborted);
-}
-
-void clone_mark_active() {
-  mutex_enter(clone_sys->get_mutex());
-
-  clone_sys->mark_active();
-
-  mutex_exit(clone_sys->get_mutex());
-}
+bool clone_check_provisioning() { return Clone_handler::is_provisioning(); }
 
 bool clone_check_active() {
   mutex_enter(clone_sys->get_mutex());
@@ -1579,19 +1635,6 @@
   return (is_active || Clone_handler::is_provisioning());
 }
 
-bool clone_mark_wait() {
-  mutex_enter(clone_sys->get_mutex());
-  auto success = clone_sys->mark_wait();
-  mutex_exit(clone_sys->get_mutex());
-  return (success);
-}
-
-void clone_mark_free() {
-  mutex_enter(clone_sys->get_mutex());
-  clone_sys->mark_free();
-  mutex_exit(clone_sys->get_mutex());
-}
-
 template <typename T>
 using DD_Objs = std::vector<const T *>;
 
@@ -1950,7 +1993,7 @@
 
   /* For newly spawned threads, create server THD */
   if (thread_number != get_num_tasks()) {
-    thd = create_thd(false, true, true, PSI_NOT_INSTRUMENTED);
+    thd = create_internal_thd();
     thread_created = true;
   }
 
@@ -1998,7 +2041,7 @@
 
   /* Destroy thread if newly spawned task */
   if (thread_created) {
-    destroy_thd(thd);
+    destroy_internal_thd(thd);
   }
 }
 
@@ -2355,19 +2398,30 @@
     return;
   }
 
+  ib::info(ER_IB_CLONE_SQL) << "Clone: Started initializing compressed tables";
+
   auto dc = dd::get_dd_client(thd);
   Releaser releaser(dc);
 
-  /* We don't bother about MDL lock here as clone holds X backup lock
-  preventing all DDL. */
-  DD_Objs<dd::Table> dd_tables;
+  std::vector<dd::Object_id> dd_table_ids;
 
-  if (dc->fetch_global_components(&dd_tables)) {
+  if (dc->fetch_global_component_ids<dd::Table>(&dd_table_ids)) {
     ut_ad(false);
     return;
   }
 
-  for (auto dd_table : dd_tables) {
+  for (auto dd_table_id : dd_table_ids) {
+    Releaser releaser_loop(dc);
+    dd::Table *dd_table = nullptr;
+
+    /* Acquire a local copy, without MDL lock. Any transaction consistent
+    snapshot from DD metadata tables should do here. */
+    auto fail = dc->acquire_uncached<dd::Table>(dd_table_id, &dd_table);
+
+    if (fail || dd_table == nullptr) {
+      continue;
+    }
+
     /* Skip non-innodb tables. */
     auto se =
         ha_resolve_by_name_raw(thd, lex_cstring_handle(dd_table->engine()));
@@ -2398,22 +2452,234 @@
                                   dd_index->tablespace_id());
   }
   compression_initialized = true;
+  ib::info(ER_IB_CLONE_SQL) << "Clone: Finished initializing compressed tables";
 }
 
-static void clone_init_tablespaces(THD *thd) {
-  if (clone_sys->is_space_initialized()) {
+Clone_notify::Clone_notify(Clone_notify::Type type, space_id_t space,
+                           bool no_wait)
+    : m_space_id(space),
+      m_type(type),
+      m_wait(Wait_at::NONE),
+      m_blocked_state(),
+      m_error() {
+  DEBUG_SYNC_C("clone_notify_ddl");
+
+  if (fsp_is_system_temporary(space) || m_type == Type::SPACE_ALTER_INPLACE) {
+    /* No need to block clone. */
+    return;
+  }
+
+  std::string ntfn_mesg;
+  IB_mutex_guard sys_mutex(clone_sys->get_mutex());
+
+  bool clone_active = false;
+  Clone_Handle *clone_donor = nullptr;
+
+  std::tie(clone_active, clone_donor) = clone_sys->check_active_clone();
+
+  /* This is for special case when clone_ddl_timeout is set to zero. DDL
+  needs to abort any running clone in this case. */
+  if (clone_active && clone_donor->abort_by_ddl()) {
+    clone_sys->mark_abort(true);
+    m_wait = Wait_at::ABORT;
+    return;
+  }
+
+  if (type == Type::SYSTEM_REDO_DISABLE || type == Type::SPACE_IMPORT) {
+    if (clone_active) {
+      get_mesg(true, ntfn_mesg);
+      ib::info(ER_IB_MSG_CLONE_DDL_NTFN) << ntfn_mesg;
+
+      m_error = ER_CLONE_IN_PROGRESS;
+      my_error(ER_CLONE_IN_PROGRESS, MYF(0));
+      return;
+    }
+
+    clone_sys->mark_abort(false);
+    m_wait = Wait_at::ABORT;
     return;
   }
+
+  if (!clone_active) {
+    /* Let any new clone block at the beginning. */
+    clone_sys->mark_wait();
+    m_wait = Wait_at::ENTER;
+    return;
+  }
+
+  bool abort_if_failed = false;
+
+  if (type == Type::SPACE_ALTER_ENCRYPT_GENERAL ||
+      type == Type::SPACE_ALTER_ENCRYPT_GENERAL_FLAGS) {
+    /* For general tablespace, Encryption of data pages are always rolled
+    forward as of today. Since we cannot rollback the DDL, clone is aborted
+    on any failure here. */
+    abort_if_failed = true;
+
+  } else if (type == Type::SPACE_DROP) {
+    /* Post DDL operations should not fail, the transaction is already
+    committed. */
+    abort_if_failed = true;
+  }
+
+  get_mesg(true, ntfn_mesg);
+  ib::info(ER_IB_MSG_CLONE_DDL_NTFN) << ntfn_mesg;
+
+  DEBUG_SYNC_C("clone_notify_ddl_before_state_block");
+
+  /* Check if clone needs to block at state change. */
+  if (clone_sys->begin_ddl_state(m_type, m_space_id, no_wait, true,
+                                 m_blocked_state, m_error)) {
+    m_wait = Wait_at::STATE_CHANGE;
+    ut_ad(!failed());
+    return;
+  }
+
+  DEBUG_SYNC_C("clone_notify_ddl_after_state_block");
+
+  DBUG_EXECUTE_IF("clone_ddl_error_abort", abort_if_failed = true;);
+
+  /* Abort clone on failure, if requested. This is required when caller cannot
+  rollback on failure. Currently enable & disable encryption needs this. In
+  this case we need to force clone to abort. */
+  if (failed() && abort_if_failed) {
+    /* Clear any error raised. */
+    m_error = 0;
+    auto thd = thd_get_current_thd();
+    if (thd != nullptr) {
+      thd->clear_error();
+      thd->get_stmt_da()->reset_condition_info(thd);
+    }
+
+    clone_sys->mark_abort(true);
+    m_wait = Wait_at::ABORT;
+    return;
+  }
+  ut_ad(m_wait == Wait_at::NONE);
+}
+
+Clone_notify::~Clone_notify() {
+  IB_mutex_guard sys_mutex(clone_sys->get_mutex());
+
+  switch (m_wait) {
+    case Wait_at::ENTER:
+      clone_sys->mark_free();
+      break;
+
+    case Wait_at::STATE_CHANGE:
+      clone_sys->end_ddl_state(m_type, m_space_id, m_blocked_state);
+      break;
+
+    case Wait_at::ABORT:
+      clone_sys->mark_active();
+      break;
+
+    case Wait_at::NONE:
+      [[fallthrough]];
+
+    default:
+      return;
+  }
+
+  if (clone_sys->check_active_clone(false)) {
+    std::string ntfn_mesg;
+    get_mesg(false, ntfn_mesg);
+    ib::info(ER_IB_MSG_CLONE_DDL_NTFN) << ntfn_mesg;
+  }
+}
+
+void Clone_notify::get_mesg(bool begin, std::string &mesg) {
+  if (begin) {
+    mesg.assign("BEGIN ");
+  } else {
+    mesg.assign("END ");
+  }
+
+  switch (m_type) {
+    case Type::SPACE_CREATE:
+      mesg.append("[SPACE_CREATE] ");
+      break;
+    case Type::SPACE_DROP:
+      mesg.append("[SPACE_DROP] : ");
+      break;
+    case Type::SPACE_RENAME:
+      mesg.append("[SPACE_RENAME] ");
+      break;
+    case Type::SPACE_ALTER_ENCRYPT:
+      mesg.append("[SPACE_ALTER_ENCRYPT] ");
+      break;
+    case Type::SPACE_IMPORT:
+      mesg.append("[SPACE_IMPORT] ");
+      break;
+    case Type::SPACE_ALTER_ENCRYPT_GENERAL:
+      mesg.append("[SPACE_ALTER_ENCRYPT_GENERAL] ");
+      break;
+    case Type::SPACE_ALTER_ENCRYPT_GENERAL_FLAGS:
+      mesg.append("[SPACE_ALTER_ENCRYPT_GENERAL_FLAGS] ");
+      break;
+    /* purecov: begin deadcode */
+    case Type::SPACE_ALTER_INPLACE:
+      mesg.append("[SPACE_ALTER_INPLACE] ");
+      break;
+    /* purecov: end */
+    case Type::SPACE_ALTER_INPLACE_BULK:
+      mesg.append("[SPACE_ALTER_INPLACE_BULK] ");
+      break;
+    case Type::SPACE_UNDO_DDL:
+      mesg.append("[SPACE_UNDO_DDL] ");
+      break;
+    case Type::SYSTEM_REDO_DISABLE:
+      mesg.append("[SYSTEM_REDO_DISABLE] Space ID");
+      break;
+    default:
+      mesg.append("[UNKNOWN] ");
+      break;
+  }
+
+  mesg.append("Space ID: ");
+  mesg.append(std::to_string(m_space_id));
+
+  if (m_space_id == dict_sys_t::s_invalid_space_id) {
+    return;
+  }
+  auto fil_space = fil_space_get(m_space_id);
+  if (fil_space == nullptr) {
+    return;
+  }
+  auto &file = fil_space->files.front();
+  mesg.append(" File: ");
+  mesg.append(file.name);
+}
+
+static int clone_init_tablespaces(THD *thd) {
+  if (clone_sys->is_space_initialized()) {
+    return 0;
+  }
+
+  /* We need to acquire X backup lock here to prevent DDLs. Clone by default
+  skips DDL lock. The API can handle recursive calls and it is not an issue
+  if clone has already acquired backup lock. */
+  auto timeout = static_cast<ulong>(get_ddl_timeout(thd));
+
+  if (acquire_exclusive_backup_lock(thd, timeout, false)) {
+    /* Timeout on backup lock. */
+    my_error(ER_LOCK_WAIT_TIMEOUT, MYF(0));
+    return ER_LOCK_WAIT_TIMEOUT;
+  }
+
+  ib::info(ER_IB_CLONE_SQL) << "Clone: Started loading tablespaces";
   auto dc = dd::get_dd_client(thd);
   Releaser releaser(dc);
 
-  /* We don't bother about MDL lock here as clone holds X backup lock
-  preventing all DDL. */
   DD_Objs<dd::Tablespace> dd_spaces;
 
   if (dc->fetch_global_components(&dd_spaces)) {
     ut_ad(false);
-    return;
+    my_error(ER_INTERNAL_ERROR, MYF(0),
+             "Innodb Clone failed to load tablespaces");
+
+    release_backup_lock(thd);
+    return ER_INTERNAL_ERROR;
   }
 
   for (auto dd_space : dd_spaces) {
@@ -2483,4 +2749,26 @@
   }
 
   clone_sys->set_space_initialized();
+  ib::info(ER_IB_CLONE_SQL) << "Clone: Finished loading tablespaces";
+
+  release_backup_lock(thd);
+  return 0;
+}
+
+Clone_Sys::Wait_stage::Wait_stage(const char *new_info) {
+  m_saved_info = nullptr;
+  THD *thd = thd_get_current_thd();
+
+  if (thd != nullptr) {
+    m_saved_info = thd->proc_info();
+    thd->set_proc_info(new_info);
+  }
+}
+
+Clone_Sys::Wait_stage::~Wait_stage() {
+  THD *thd = thd_get_current_thd();
+
+  if (thd != nullptr && m_saved_info != nullptr) {
+    thd->set_proc_info(m_saved_info);
+  }
 }
diff -Nru mysql-8.0-8.0.26/storage/innobase/clone/clone0apply.cc mysql-8.0-8.0.27/storage/innobase/clone/clone0apply.cc
--- mysql-8.0-8.0.26/storage/innobase/clone/clone0apply.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/clone/clone0apply.cc	2021-09-28 11:46:34.000000000 +0000
@@ -39,34 +39,33 @@
 #include "log0log.h"
 #include "sql/handler.h"
 
-int Clone_Snapshot::get_file_from_desc(Clone_File_Meta *&file_desc,
+int Clone_Snapshot::get_file_from_desc(const Clone_File_Meta *file_meta,
                                        const char *data_dir, bool desc_create,
-                                       bool &desc_exists) {
+                                       bool &desc_exists,
+                                       Clone_file_ctx *&file_ctx) {
   int err = 0;
 
   mutex_enter(&m_snapshot_mutex);
 
-  auto idx = file_desc->m_file_index;
+  auto idx = file_meta->m_file_index;
 
   ut_ad(m_snapshot_handle_type == CLONE_HDL_APPLY);
 
   ut_ad(m_snapshot_state == CLONE_SNAPSHOT_FILE_COPY ||
+        m_snapshot_state == CLONE_SNAPSHOT_PAGE_COPY ||
         m_snapshot_state == CLONE_SNAPSHOT_REDO_COPY);
 
-  Clone_File_Vec &file_vector = (m_snapshot_state == CLONE_SNAPSHOT_FILE_COPY)
-                                    ? m_data_file_vector
-                                    : m_redo_file_vector;
-
   desc_exists = false;
 
   /* File metadata is already there, possibly sent by another task. */
-  if (file_vector[idx] != nullptr) {
-    file_desc = file_vector[idx];
+  file_ctx = get_file_ctx_by_index(idx);
+
+  if (file_ctx != nullptr) {
     desc_exists = true;
 
   } else if (desc_create) {
     /* Create the descriptor. */
-    err = create_desc(data_dir, file_desc);
+    err = create_desc(data_dir, file_meta, false, file_ctx);
   }
 
   mutex_exit(&m_snapshot_mutex);
@@ -74,21 +73,64 @@
   return (err);
 }
 
-int Clone_Snapshot::update_file_name(const char *data_dir,
-                                     Clone_File_Meta *file_desc, char *path,
-                                     size_t path_len) {
-  auto space_id = file_desc->m_space_id;
+int Clone_Snapshot::rename_desc(const Clone_File_Meta *file_meta,
+                                const char *data_dir,
+                                Clone_file_ctx *&file_ctx) {
+  /* Create new file context with new name. */
+  auto err = create_desc(data_dir, file_meta, true, file_ctx);
+
+  if (err != 0) {
+    return err; /* purecov: inspected */
+  }
+
+  file_ctx->m_state.store(Clone_file_ctx::State::RENAMED);
+
+  /* Overwrite with the renamed file context. */
+  add_file_from_desc(file_ctx, false);
+
+  return 0;
+}
+
+int Clone_Snapshot::fix_ddl_extension(const char *data_dir,
+                                      Clone_file_ctx *file_ctx) {
+  ut_ad(file_ctx->m_extension == Clone_file_ctx::Extension::DDL);
 
-  if (data_dir != nullptr || m_snapshot_state == CLONE_SNAPSHOT_REDO_COPY) {
+  /* If data directory is being replaced. */
+  bool replace_dir = (data_dir == nullptr);
+
+  auto file_meta = file_ctx->get_file_meta();
+  bool is_undo_file = fsp_is_undo_tablespace(file_meta->m_space_id);
+
+  auto extn = Clone_file_ctx::Extension::NONE;
+  const std::string file_path(file_meta->m_file_name);
+
+  /* Check if file is already present and extension is needed. */
+  auto err = handle_existing_file(replace_dir, is_undo_file,
+                                  file_meta->m_file_index, file_path, extn);
+  if (err == 0) {
+    file_ctx->m_extension = extn;
+  }
+
+  return err;
+}
+
+int Clone_Snapshot::update_sys_file_name(bool replace,
+                                         const Clone_File_Meta *file_meta,
+                                         std::string &file_name) {
+  /* Currently needed only while replacing data directory. */
+  if (!replace) {
     return (0);
   }
+  auto space_id = file_meta->m_space_id;
 
   /* Update buffer pool dump file path for provisioning. */
-  if (file_desc->m_space_id == dict_sys_t::s_invalid_space_id) {
-    ut_ad(0 == strcmp(file_desc->m_file_name, SRV_BUF_DUMP_FILENAME_DEFAULT));
-    buf_dump_generate_path(path, path_len);
-    file_desc->m_file_name = path;
-    file_desc->m_file_name_len = strlen(path) + 1;
+  if (space_id == dict_sys_t::s_invalid_space_id) {
+    ut_ad(0 == strcmp(file_name.c_str(), SRV_BUF_DUMP_FILENAME_DEFAULT));
+
+    char path[OS_FILE_MAX_PATH];
+    buf_dump_generate_path(path, sizeof(path));
+
+    file_name.assign(path);
     return (0);
   }
 
@@ -98,12 +140,23 @@
   }
 
   /* Find out the node index of the file within system tablespace. */
-  auto loop_index = file_desc->m_file_index;
+  auto loop_index = file_meta->m_file_index;
+
+  if (loop_index >= num_data_files()) {
+    /* purecov: begin deadcode */
+    ut_ad(false);
+    int err = ER_CLONE_PROTOCOL;
+    my_error(err, MYF(0), "Wrong Clone RPC: Invalid File Index");
+    return err;
+    /* purecov: end */
+  }
+
   decltype(loop_index) node_index = 0;
 
   while (loop_index > 0) {
     --loop_index;
-    auto cur_desc = m_data_file_vector[loop_index];
+    auto file_ctx = get_file_ctx_by_index(loop_index);
+    auto cur_desc = file_ctx->get_file_meta();
     /* Loop through all files of current tablespace. */
     if (cur_desc->m_space_id != space_id) {
       break;
@@ -134,80 +187,36 @@
   size_bytes *= page_sz.physical();
 
   /* Check if the file size matches with configured files. */
-  if (file_desc->m_file_size != size_bytes) {
+  if (file_meta->m_file_size != size_bytes) {
     /* For last file it could mismatch if auto extend is specified. */
     if (node_index != last_file_index ||
         !srv_sys_space.can_auto_extend_last_file()) {
+      /* purecov: begin tested */
       std::ostringstream err_strm;
 
       err_strm << "innodb_data_file_path: Recipient value for " << node_index
                << "th file size: " << size_bytes
-               << " doesn't match Donor file size: " << file_desc->m_file_size;
+               << " doesn't match Donor file size: " << file_meta->m_file_size;
 
       std::string err_str(err_strm.str());
 
       my_error(ER_CLONE_SYS_CONFIG, MYF(0), err_str.c_str());
 
       return (ER_CLONE_SYS_CONFIG);
+      /* purecov: end */
     }
   }
-  /* Change filename to currently configured name. */
-  file_desc->m_file_name = file.filepath();
-  file_desc->m_file_name_len = strlen(file_desc->m_file_name) + 1;
 
+  /* Change filename to currently configured name. */
+  file_name.assign(file.filepath());
   return (0);
 }
 
-size_t Clone_Snapshot::compute_path_length(const char *data_dir,
-                                           const Clone_File_Meta *file_desc) {
-  bool is_absolute_path = false;
-  auto alloc_len = sizeof(Clone_File_Meta);
-
-  alloc_len += sizeof(CLONE_INNODB_REPLACED_FILE_EXTN);
-
-  if (file_desc->m_file_name == nullptr) {
-    alloc_len += MAX_LOG_FILE_NAME;
-  } else {
-    alloc_len += file_desc->m_file_name_len;
-    std::string name;
-    name.assign(file_desc->m_file_name, file_desc->m_file_name_len);
-    is_absolute_path = Fil_path::is_absolute_path(name);
-  }
-
-  /* For absolute path, name length is the total length. */
-  if (is_absolute_path) {
-    return (alloc_len);
-  }
-
-  /* Add data directory length for relative path. */
-  if (data_dir != nullptr) {
-    alloc_len += strlen(data_dir);
-    ++alloc_len;
-    return (alloc_len);
-  }
-
-  /* While replacing current data directory, calculate length
-  based on current system configuration. */
-
-  /* Use server redo file location */
-  if (m_snapshot_state == CLONE_SNAPSHOT_REDO_COPY) {
-    alloc_len += strlen(srv_log_group_home_dir);
-    ++alloc_len;
-    return (alloc_len);
-  }
-
-  ut_ad(m_snapshot_state == CLONE_SNAPSHOT_FILE_COPY);
-
-  /* Use server undo file location */
-  if (fsp_is_undo_tablespace(file_desc->m_space_id)) {
-    alloc_len += strlen(srv_undo_dir);
-    ++alloc_len;
-  }
-  return (alloc_len);
-}
-
-int Clone_Snapshot::handle_existing_file(bool replace,
-                                         Clone_File_Meta *file_desc) {
+int Clone_Snapshot::handle_existing_file(bool replace, bool undo_file,
+                                         uint32_t data_file_index,
+                                         const std::string &data_file,
+                                         Clone_file_ctx::Extension &extn) {
+  extn = Clone_file_ctx::Extension::NONE;
   /* For undo tablespace, check for duplicate file name. Currently it
   is possible to create multiple undo tablespaces of same name under
   different directory. This should not be recommended and in future
@@ -215,237 +224,276 @@
   it internally based on space ID. Till that time, Clone needs to identify
   and disallow undo tablespaces of same name as Clone creates all undo
   tablespaces under innodb_undo_directory configuration in recipient. */
-  if (fsp_is_undo_tablespace(file_desc->m_space_id)) {
-    std::string clone_file(file_desc->m_file_name);
-    clone_file.append(CLONE_INNODB_REPLACED_FILE_EXTN);
-
+  if (undo_file) {
     for (auto undo_index : m_undo_file_indexes) {
-      auto undo_meta = m_data_file_vector[undo_index];
-      if (undo_meta == nullptr) {
+      auto undo_file_ctx = get_file_ctx_by_index(undo_index);
+      if (undo_file_ctx == nullptr || undo_file_ctx->deleted()) {
         continue;
       }
+      auto undo_meta = undo_file_ctx->get_file_meta();
 
-      /* undo_meta: already added undo file with or without #clone extension.
-      The #clone extension is present when recipient also has the same file.
-      file_desc: current undo file name without #clone extension.
-      clone_file: current undo file name with #clone extension.
-      Since the existing undo file may or may not have the #clone extension
-      we need to match both. */
-      if (0 == strcmp(undo_meta->m_file_name, file_desc->m_file_name) ||
-          0 == strcmp(undo_meta->m_file_name, clone_file.c_str())) {
+      if (0 == strcmp(undo_meta->m_file_name, data_file.c_str())) {
+        /* purecov: begin tested */
         std::ostringstream err_strm;
-        err_strm << "Found multiple undo files with same name: "
-                 << file_desc->m_file_name;
+        err_strm << "Found multiple undo files with same name: " << data_file;
         std::string err_str(err_strm.str());
         my_error(ER_CLONE_SYS_CONFIG, MYF(0), err_str.c_str());
         return (ER_CLONE_SYS_CONFIG);
+        /* purecov: end */
       }
     }
-    m_undo_file_indexes.push_back(file_desc->m_file_index);
-    ut_ad(m_undo_file_indexes.size() <= FSP_MAX_UNDO_TABLESPACES);
+    m_undo_file_indexes.push_back(data_file_index);
+    /* With concurrent DDL support there could be deleted undo file
+    indexes here. At the end of every stage, new undo files could be
+    added limited by FSP_MAX_UNDO_TABLESPACES. */
+    ut_ad(m_undo_file_indexes.size() <=
+          CLONE_MAX_TRANSFER_STAGES * FSP_MAX_UNDO_TABLESPACES);
   }
 
-  std::string file_name;
-  file_name.assign(file_desc->m_file_name);
-
-  auto type = Fil_path::get_file_type(file_name);
+  auto type = Fil_path::get_file_type(data_file);
+  int err = 0;
 
   /* Nothing to do if file doesn't exist */
   if (type == OS_FILE_TYPE_MISSING) {
-    int err = 0;
     if (replace) {
       /* Add file to new file list to enable rollback. */
-      err = clone_add_to_list_file(CLONE_INNODB_NEW_FILES,
-                                   file_desc->m_file_name);
+      err = clone_add_to_list_file(CLONE_INNODB_NEW_FILES, data_file.c_str());
     }
-    return (err);
+    extn = Clone_file_ctx::Extension::NONE;
+    return err;
   }
 
   if (type != OS_FILE_TYPE_FILE) {
+    /* purecov: begin inspected */
     /* Either the stat() call failed or the name is a
     directory/block device, or permission error etc. */
     char errbuf[MYSYS_STRERROR_SIZE];
-    my_error(ER_ERROR_ON_WRITE, MYF(0), file_name.c_str(), errno,
+    my_error(ER_ERROR_ON_WRITE, MYF(0), data_file.c_str(), errno,
              my_strerror(errbuf, sizeof(errbuf), errno));
-    return (ER_ERROR_ON_WRITE);
+    return ER_ERROR_ON_WRITE;
+    /* purecov: end */
   }
 
-  ut_a(type == OS_FILE_TYPE_FILE);
-
   /* For cloning to different data directory, we must ensure that the
   file is not present. This would always fail for local clone. */
   if (!replace) {
-    my_error(ER_FILE_EXISTS_ERROR, MYF(0), file_name.c_str());
-    return (ER_FILE_EXISTS_ERROR);
+    my_error(ER_FILE_EXISTS_ERROR, MYF(0), data_file.c_str());
+    return ER_FILE_EXISTS_ERROR;
   }
 
-  /* Save original data file name. */
-  std::string data_file(file_desc->m_file_name);
-
-  /* For clone to current data directory, we need to clone system files
-  to a file with different name and then move back during restart. */
-  auto file_extn_loc = const_cast<char *>(file_desc->m_file_name);
-  file_extn_loc += file_desc->m_file_name_len;
-
-  /* Overwrite null terminator. */
-  --file_extn_loc;
-  strcpy(file_extn_loc, CLONE_INNODB_REPLACED_FILE_EXTN);
-
-  file_desc->m_file_name_len += sizeof(CLONE_INNODB_REPLACED_FILE_EXTN);
+  std::string clone_file(data_file);
+  clone_file.append(CLONE_INNODB_REPLACED_FILE_EXTN);
 
   /* Check that file with clone extension is not present */
-  file_name.assign(file_desc->m_file_name);
-  type = Fil_path::get_file_type(file_name);
+  type = Fil_path::get_file_type(clone_file);
 
   if (type != OS_FILE_TYPE_MISSING) {
-    my_error(ER_FILE_EXISTS_ERROR, MYF(0), file_name.c_str());
-    return (ER_FILE_EXISTS_ERROR);
+    /* purecov: begin inspected */
+    my_error(ER_FILE_EXISTS_ERROR, MYF(0), clone_file.c_str());
+    return ER_FILE_EXISTS_ERROR;
+    /* purecov: end */
   }
 
+  extn = Clone_file_ctx::Extension::REPLACE;
+
   /* Add file name to files to be replaced before recovery. */
-  auto err =
-      clone_add_to_list_file(CLONE_INNODB_REPLACED_FILES, data_file.c_str());
-  return (err);
-}
+  err = clone_add_to_list_file(CLONE_INNODB_REPLACED_FILES, data_file.c_str());
 
-int Clone_Snapshot::build_file_path(const char *data_dir, ulint alloc_size,
-                                    Clone_File_Meta *&file_desc) {
-  /* Check if data directory is being replaced. */
-  bool replace_dir = (data_dir == nullptr);
+  return err;
+}
 
-  /* Allocate for file path string. */
-  auto path = static_cast<char *>(mem_heap_alloc(m_snapshot_heap, alloc_size));
+int Clone_Snapshot::build_file_path(const char *data_dir,
+                                    const Clone_File_Meta *file_meta,
+                                    std::string &built_path) {
+  std::string source;
 
-  if (path == nullptr) {
-    my_error(ER_OUTOFMEMORY, MYF(0), alloc_size);
-    return (ER_OUTOFMEMORY);
-  }
+  bool redo_file = (m_snapshot_state == CLONE_SNAPSHOT_REDO_COPY);
+  bool absolute_path = false;
 
-  /* Copy file metadata */
-  auto file_meta = reinterpret_cast<Clone_File_Meta *>(path);
-  path += sizeof(Clone_File_Meta);
-  *file_meta = *file_desc;
+  if (!redo_file) {
+    source.assign(file_meta->m_file_name);
 
-  bool is_absolute_path = false;
-  std::string file_name;
+    bool replace = (data_dir == nullptr);
+    auto err = update_sys_file_name(replace, file_meta, source);
 
-  /* Check if absolute or relative path. */
-  if (file_desc->m_file_name != nullptr) {
-    file_name.assign(file_desc->m_file_name, file_desc->m_file_name_len);
-    is_absolute_path = Fil_path::is_absolute_path(file_name);
+    if (err != 0) {
+      return err; /* purecov: inspected */
+    }
+    absolute_path = Fil_path::is_absolute_path(source);
   }
 
-  file_meta->m_file_name = static_cast<const char *>(path);
-
-  /* Copy path and file name together for absolute path. */
-  if (is_absolute_path) {
-    ut_ad(m_snapshot_state == CLONE_SNAPSHOT_FILE_COPY);
-    auto is_hard_path = test_if_hard_path(file_desc->m_file_name);
+  /* For absolute path, copy the name and return. */
+  if (absolute_path) {
+    auto is_hard_path = test_if_hard_path(source.c_str());
 
     /* Check if the absolute path is not in right format */
     if (is_hard_path == 0) {
-      my_error(ER_WRONG_VALUE, MYF(0), "file path", file_desc->m_file_name);
+      /* purecov: begin inspected */
+      my_error(ER_WRONG_VALUE, MYF(0), "file path", source.c_str());
       return (ER_WRONG_VALUE);
+      /* purecov: end */
     }
 
-    strcpy(path, file_desc->m_file_name);
+    built_path.assign(source);
+    return 0;
+  }
 
-    auto err = handle_existing_file(replace_dir, file_meta);
+  bool undo_file = fsp_is_undo_tablespace(file_meta->m_space_id);
 
-    file_desc = file_meta;
+  /* Append appropriate data directory path. */
+  if (data_dir != nullptr) {
+    built_path.assign(data_dir);
 
-    return (err);
-  }
+  } else if (redo_file) {
+    /* Use configured path when cloning into current data directory. */
+    built_path.assign(srv_log_group_home_dir);
 
-  const char *file_path = data_dir;
+  } else if (undo_file) {
+    built_path.assign(srv_undo_dir);
+  }
 
-  /* Use configured path when cloning into current data directory. */
-  if (file_path == nullptr) {
-    /* Get file path from redo configuration. */
-    if (m_snapshot_state == CLONE_SNAPSHOT_REDO_COPY) {
-      file_path = srv_log_group_home_dir;
+  /* Add path separator if required. */
+  if (!built_path.empty() && built_path.back() != OS_PATH_SEPARATOR) {
+    built_path.append(1, OS_PATH_SEPARATOR); /* purecov: inspected */
+  }
 
-      /* Get file path from undo configuration. */
-    } else if (fsp_is_undo_tablespace(file_desc->m_space_id)) {
-      file_path = srv_undo_dir;
-    }
+  /* Add file name. For redo file use standard name. */
+  if (redo_file) {
+    std::ostringstream redo_name;
+    redo_name << built_path << ib_logfile_basename << file_meta->m_file_index;
+    built_path.assign(redo_name.str());
+    return 0;
   }
 
-  /* Copy file path. */
-  if (file_path != nullptr) {
-    auto path_len = strlen(file_path);
-    strcpy(path, file_path);
+  ut_ad(!source.empty());
 
-    /* Add path separator at the end of file path, if not there. */
-    if (file_path[path_len - 1] != OS_PATH_SEPARATOR) {
-      path[path_len] = OS_PATH_SEPARATOR;
-      ++path;
-    }
-    path += path_len;
+  if (Fil_path::has_prefix(source, Fil_path::DOT_SLASH)) {
+    source.erase(0, 2);
   }
 
-  /* Copy file name */
-  if (m_snapshot_state == CLONE_SNAPSHOT_REDO_COPY) {
-    /* This is redo file. Use standard name. */
-    snprintf(path, MAX_LOG_FILE_NAME, "%s%u", ib_logfile_basename,
-             file_desc->m_file_index);
-  } else {
-    ut_ad(m_snapshot_state == CLONE_SNAPSHOT_FILE_COPY);
-    ut_ad(file_desc->m_file_name != nullptr);
-    /* For relative path remove "./" if there. */
-    if (Fil_path::has_prefix(file_name, Fil_path::DOT_SLASH)) {
-      file_name.erase(0, 2);
-    }
+  built_path.append(source);
+  return 0;
+}
+
+int Clone_Snapshot::build_file_ctx(Clone_file_ctx::Extension extn,
+                                   const Clone_File_Meta *file_meta,
+                                   const std::string &file_path,
+                                   Clone_file_ctx *&file_ctx) {
+  size_t alloc_size = sizeof(Clone_file_ctx) + file_path.length() + 1;
+
+  /* Allocate for file path string. */
+  auto path = static_cast<char *>(mem_heap_alloc(m_snapshot_heap, alloc_size));
 
-    /* Copy adjusted file name */
-    strcpy(path, file_name.c_str());
+  if (path == nullptr) {
+    /* purecov: begin inspected */
+    my_error(ER_OUTOFMEMORY, MYF(0), alloc_size);
+    return (ER_OUTOFMEMORY);
+    /* purecov: end */
   }
 
-  file_meta->m_file_name_len = strlen(file_meta->m_file_name) + 1;
+  /* Copy file metadata */
+  file_ctx = reinterpret_cast<Clone_file_ctx *>(path);
+  file_ctx->init(extn);
+  path += sizeof(Clone_file_ctx);
 
-  /* Check and handle when file is already present in recipient. */
-  auto err = handle_existing_file(replace_dir, file_meta);
-  file_desc = file_meta;
+  strcpy(path, file_path.c_str());
 
-  return (err);
+  auto ctx_file_meta = file_ctx->get_file_meta();
+  *ctx_file_meta = *file_meta;
+
+  ctx_file_meta->m_file_name = static_cast<const char *>(path);
+
+  ctx_file_meta->m_file_name_len = file_path.length() + 1;
+
+  ctx_file_meta->m_file_name_alloc_len = ctx_file_meta->m_file_name_len;
+
+  return 0;
+}
+
+/** Add directory path to file
+@param[in]	dir	directory
+@param[in]	file	file name
+@param[out]	path	file along with path. */
+static void add_directory_path(const char *dir, const char *file,
+                               std::string &path) {
+  path.clear();
+  /* Append directory */
+  if (dir != nullptr) {
+    path.assign(dir);
+    if (path.back() != OS_PATH_SEPARATOR) {
+      path.append(OS_PATH_SEPARATOR_STR); /* purecov: inspected */
+    }
+  }
+  /* Append file */
+  if (file != nullptr) {
+    path.append(file);
+  }
 }
 
 int Clone_Snapshot::create_desc(const char *data_dir,
-                                Clone_File_Meta *&file_desc) {
-  /* Update file name from configuration for system space */
-  char path[OS_FILE_MAX_PATH];
-  auto err = update_file_name(data_dir, file_desc, &path[0], sizeof(path));
+                                const Clone_File_Meta *file_meta, bool is_ddl,
+                                Clone_file_ctx *&file_ctx) {
+  /* Update file path from configuration. */
+  std::string file_path;
+
+  auto err = build_file_path(data_dir, file_meta, file_path);
 
   if (err != 0) {
     return (err);
   }
 
-  /* Find out length of complete path string for file */
-  auto alloc_size =
-      static_cast<ulint>(compute_path_length(data_dir, file_desc));
+  auto extn = Clone_file_ctx::Extension::NONE;
+
+  if (is_ddl) {
+    extn = Clone_file_ctx::Extension::DDL;
+
+    std::string ddl_list_file;
+    add_directory_path(data_dir, CLONE_INNODB_DDL_FILES, ddl_list_file);
+
+    err = clone_add_to_list_file(ddl_list_file.c_str(), file_path.c_str());
 
-  /* Build complete path for the new file to be added. */
-  err = build_file_path(data_dir, alloc_size, file_desc);
+  } else {
+    /* If data directory is being replaced. */
+    bool replace_dir = (data_dir == nullptr);
+    bool is_undo_file = fsp_is_undo_tablespace(file_meta->m_space_id);
+
+    /* Check if file is already present in recipient. */
+    err = handle_existing_file(replace_dir, is_undo_file,
+                               file_meta->m_file_index, file_path, extn);
+  }
 
+  if (err == 0) {
+    /* Build complete path for the new file to be added. */
+    err = build_file_ctx(extn, file_meta, file_path, file_ctx);
+  }
   return (err);
 }
 
-bool Clone_Snapshot::add_file_from_desc(Clone_File_Meta *&file_desc) {
+bool Clone_Snapshot::add_file_from_desc(Clone_file_ctx *&file_ctx,
+                                        bool ddl_create) {
   mutex_enter(&m_snapshot_mutex);
 
   ut_ad(m_snapshot_handle_type == CLONE_HDL_APPLY);
+  auto file_meta = file_ctx->get_file_meta();
 
-  if (m_snapshot_state == CLONE_SNAPSHOT_FILE_COPY) {
-    m_data_file_vector[file_desc->m_file_index] = file_desc;
+  if (m_snapshot_state == CLONE_SNAPSHOT_FILE_COPY ||
+      m_snapshot_state == CLONE_SNAPSHOT_PAGE_COPY) {
+    if (ddl_create) {
+      ut_a(file_meta->m_file_index == num_data_files());
+      /* Add data file at the end and extend length. */
+      m_data_file_vector.push_back(file_ctx);
+    } else {
+      m_data_file_vector[file_meta->m_file_index] = file_ctx;
+    }
   } else {
     ut_ad(m_snapshot_state == CLONE_SNAPSHOT_REDO_COPY);
-    m_redo_file_vector[file_desc->m_file_index] = file_desc;
+    m_redo_file_vector[file_meta->m_file_index] = file_ctx;
   }
 
   mutex_exit(&m_snapshot_mutex);
 
   /** Check if it the last file */
-  if (file_desc->m_file_index == m_num_data_files - 1) {
+  if (file_meta->m_file_index == num_data_files() - 1) {
     return true;
   }
 
@@ -471,9 +519,10 @@
   return (0);
 }
 
-int Clone_Handle::check_space() {
+int Clone_Handle::check_space(const Clone_Task *task) {
   /* Do space check only during file copy. */
-  if (m_clone_task_manager.get_state() != CLONE_SNAPSHOT_FILE_COPY) {
+  auto current_state = m_clone_task_manager.get_state();
+  if (!task->m_is_master || current_state != CLONE_SNAPSHOT_FILE_COPY) {
     return (0);
   }
   uint64_t free_space;
@@ -547,12 +596,19 @@
 #ifdef UNIV_DEBUG
     /* Network failure before moving to new state */
     err = m_clone_task_manager.debug_restart(task, err, 5);
+    if (err != 0) {
+      return err;
+    }
 #endif /* UNIV_DEBUG */
 
     /** Notify state change via callback. */
     notify_state_change(task, callback, &state_desc);
 
-    err = move_to_next_state(task, nullptr, &state_desc);
+    err = fix_all_renamed(task);
+
+    if (err == 0) {
+      err = move_to_next_state(task, nullptr, &state_desc);
+    }
 
 #ifdef UNIV_DEBUG
     /* Network failure after moving to new state */
@@ -561,7 +617,7 @@
 
     /* Check if enough space available on disk */
     if (err == 0) {
-      err = check_space();
+      err = check_space(task);
     }
 
     return (err);
@@ -591,6 +647,9 @@
 
   /* Send acknowledgement back to remote server */
   if (err == 0 && task->m_is_master) {
+    if (state_desc.m_state == CLONE_SNAPSHOT_FILE_COPY) {
+      DEBUG_SYNC_C("clone_file_copy_end_before_ack");
+    }
     err = ack_state_metadata(task, callback, &state_desc);
 
     if (err != 0) {
@@ -638,6 +697,397 @@
   return (err);
 }
 
+int Clone_Handle::apply_file_delete(Clone_Task *task, Clone_file_ctx *file_ctx,
+                                    const Clone_File_Meta *new_meta) {
+  auto err = close_file(task);
+  if (err != 0) {
+    return err; /* purecov: inspected */
+  }
+
+  auto file_meta = file_ctx->get_file_meta();
+
+  if (task->m_current_file_index != file_meta->m_file_index) {
+    task->m_current_file_index = file_meta->m_file_index;
+  }
+
+  auto snapshot = m_clone_task_manager.get_snapshot();
+
+  auto begin_chunk = file_meta->m_begin_chunk;
+  auto end_chunk = file_meta->m_end_chunk;
+  auto block_num = snapshot->get_blocks_per_chunk();
+  auto data_size = snapshot->get_chunk_size();
+
+  /* For page copy, we reset one page of the current chunk passed. Chunks
+  in file_meta corresponds to chunk in file copy. */
+  if (snapshot->get_state() == CLONE_SNAPSHOT_PAGE_COPY) {
+    begin_chunk = new_meta->m_begin_chunk;
+    end_chunk = begin_chunk;
+    block_num = 0;
+    data_size = UNIV_PAGE_SIZE;
+  }
+
+  Clone_Task_Meta new_task_meta = task->m_task_meta;
+
+  /* Consume all chunks of deleted file. */
+  for (auto cur_chunk = begin_chunk; cur_chunk <= end_chunk; ++cur_chunk) {
+    /* Set current chunk details. */
+    new_task_meta.m_chunk_num = cur_chunk;
+    new_task_meta.m_block_num = block_num;
+
+    if (m_clone_task_manager.is_chunk_reserved(cur_chunk)) {
+      continue;
+    }
+
+    m_clone_task_manager.set_chunk(task, &new_task_meta);
+
+    /* Set data size for progress estimation. */
+    task->m_data_size = data_size;
+  }
+
+  if (!file_ctx->deleted()) {
+    file_ctx->m_state.store(Clone_file_ctx::State::DROPPED);
+  }
+
+  std::string old_file;
+  file_ctx->get_file_name(old_file);
+
+  std::string mesg("FILE : ");
+  mesg.append(old_file);
+  mesg.append(" Space ID: ");
+  mesg.append(std::to_string(file_meta->m_space_id));
+  mesg.append(" Chunks : ");
+  mesg.append(std::to_string(begin_chunk));
+  mesg.append(" - ");
+  mesg.append(std::to_string(end_chunk));
+
+  ib::info(ER_IB_MSG_CLONE_DDL_INVALIDATE) << mesg;
+  return 0;
+}
+
+int Clone_Handle::apply_ddl(const Clone_File_Meta *new_meta,
+                            Clone_file_ctx *file_ctx) {
+  auto snapshot = m_clone_task_manager.get_snapshot();
+  ut_ad(snapshot->get_state() == CLONE_SNAPSHOT_FILE_COPY ||
+        snapshot->get_state() == CLONE_SNAPSHOT_PAGE_COPY);
+
+  std::string old_file;
+  file_ctx->get_file_name(old_file);
+
+  std::string mesg("DELETE FILE : ");
+
+  if (new_meta->is_deleted()) {
+    /* Check if we have already deleted the file context. This is possible
+    in case of a network error and restart where donor could send the delete
+    request again. */
+    if (file_ctx->m_state.load() == Clone_file_ctx::State::DROPPED_HANDLED) {
+      mesg.append(" IGNORE : ");
+
+    } else {
+      /* File needs to be deleted. */
+      if (!os_file_delete(innodb_clone_file_key, old_file.c_str())) {
+        /* purecov: begin inspected */
+        mesg.append("Innodb Clone Apply Failed to delete file: ");
+        mesg.append(old_file);
+        my_error(ER_INTERNAL_ERROR, MYF(0), mesg.c_str());
+        return ER_INTERNAL_ERROR;
+        /* purecov: end */
+      }
+      file_ctx->m_state.store(Clone_file_ctx::State::DROPPED_HANDLED);
+    }
+    mesg.append(old_file);
+    mesg.append(" Space ID: ");
+    mesg.append(std::to_string(new_meta->m_space_id));
+
+    ib::info(ER_IB_MSG_CLONE_DDL_APPLY) << mesg;
+    return 0;
+  }
+
+  auto old_meta = file_ctx->get_file_meta();
+
+  /* Check if file needs to be renamed. */
+  if (!new_meta->is_renamed()) {
+    std::string update_mesg;
+    /* Set new encryption and compression type. */
+    if (old_meta->m_encrypt_type != new_meta->m_encrypt_type) {
+      old_meta->m_encrypt_type = new_meta->m_encrypt_type;
+      if (new_meta->m_encrypt_type == Encryption::NONE) {
+        update_mesg.assign("UNENCRYPTED ");
+      } else {
+        update_mesg.assign("ENCRYPTED ");
+      }
+    }
+
+    if (old_meta->m_compress_type != new_meta->m_compress_type) {
+      old_meta->m_compress_type = new_meta->m_compress_type;
+      if (new_meta->m_compress_type == Compression::NONE) {
+        update_mesg.assign("UNCOMPRESSED ");
+      } else {
+        update_mesg.assign("COMPRESSED ");
+      }
+    }
+
+    auto err = set_compression(file_ctx);
+
+    std::string mesg("SET FILE ");
+    mesg.append(update_mesg);
+    mesg.append(": ");
+    mesg.append(old_file);
+    mesg.append(" Space ID: ");
+    mesg.append(std::to_string(new_meta->m_space_id));
+
+    ib::info(ER_IB_MSG_CLONE_DDL_APPLY) << mesg;
+    return err;
+  }
+
+  Clone_file_ctx *new_ctx = nullptr;
+
+  /* Rename file context. */
+  auto err = snapshot->rename_desc(new_meta, m_clone_dir, new_ctx);
+
+  if (err != 0) {
+    return err; /* purecov: inspected */
+  }
+
+  std::string new_file;
+  new_ctx->get_file_name(new_file);
+
+  /* Preserve the old file size which could have been extended while applying
+  page 0 changes and set it to new descriptor. */
+  auto file_meta = new_ctx->get_file_meta();
+  auto file_size = file_meta->m_file_size;
+
+  if (file_size < old_meta->m_file_size) {
+    file_size = old_meta->m_file_size;
+  }
+  file_meta->m_file_size = file_size;
+
+  /* Do the actual rename. At this point we rename the files with temp DDL
+  extension. After all rename and delete requests are received we rename
+  the files again removing the ddl extension. This is required as file rename
+  requests are not in the real order and there could be conflicts. */
+  ut_ad(new_ctx->m_extension == Clone_file_ctx::Extension::DDL);
+
+  std::string rename_mesg("RENAME FILE WITH EXTN: ");
+
+  if (old_file.compare(new_file) == 0) {
+    rename_mesg.append(" IGNORE : ");
+
+  } else {
+    bool success =
+        os_file_rename(OS_CLONE_DATA_FILE, old_file.c_str(), new_file.c_str());
+
+    if (!success) {
+      /* purecov: begin inspected */
+      char errbuf[MYSYS_STRERROR_SIZE];
+      err = ER_ERROR_ON_RENAME;
+
+      my_error(ER_ERROR_ON_RENAME, MYF(0), old_file.c_str(), new_file.c_str(),
+               errno, my_strerror(errbuf, sizeof(errbuf), errno));
+      /* purecov: end */
+    }
+  }
+
+  rename_mesg.append(old_file);
+  rename_mesg.append(" to ");
+  rename_mesg.append(new_file);
+  rename_mesg.append(" Space ID: ");
+  rename_mesg.append(std::to_string(new_meta->m_space_id));
+
+  ib::info(ER_IB_MSG_CLONE_DDL_APPLY) << rename_mesg;
+
+  if (err == 0) {
+    err = set_compression(new_ctx);
+  }
+  return err;
+}
+
+int Clone_Handle::fix_all_renamed(const Clone_Task *task) {
+  /* Do space check only during file copy and page copy. */
+  auto current_state = m_clone_task_manager.get_state();
+
+  bool fix_needed = current_state == CLONE_SNAPSHOT_FILE_COPY ||
+                    current_state == CLONE_SNAPSHOT_PAGE_COPY;
+
+  if (!task->m_is_master || !fix_needed) {
+    return 0;
+  }
+
+  auto snapshot = m_clone_task_manager.get_snapshot();
+
+  ut_ad(snapshot->get_state() == CLONE_SNAPSHOT_FILE_COPY ||
+        snapshot->get_state() == CLONE_SNAPSHOT_PAGE_COPY);
+
+  auto fix_func = [&](Clone_file_ctx *file_ctx) {
+    /* Need to handle files with DDL extension. */
+    if (file_ctx->deleted() ||
+        file_ctx->m_extension != Clone_file_ctx::Extension::DDL) {
+      return 0;
+    }
+    /* Save old file name */
+    std::string old_file;
+    file_ctx->get_file_name(old_file);
+
+    auto err = snapshot->fix_ddl_extension(m_clone_dir, file_ctx);
+    if (err != 0) {
+      return err; /* purecov: inspected */
+    }
+    /* Get new file name. */
+    std::string new_file;
+    file_ctx->get_file_name(new_file);
+
+    /* Rename file */
+    bool success =
+        os_file_rename(OS_CLONE_DATA_FILE, old_file.c_str(), new_file.c_str());
+    if (!success) {
+      /* purecov: begin inspected */
+      char errbuf[MYSYS_STRERROR_SIZE];
+      err = ER_ERROR_ON_RENAME;
+
+      my_error(ER_ERROR_ON_RENAME, MYF(0), old_file.c_str(), new_file.c_str(),
+               errno, my_strerror(errbuf, sizeof(errbuf), errno));
+      /* purecov: end */
+    }
+
+    std::string mesg("RENAMED FILE REMOVED EXTN : ");
+    mesg.append(old_file);
+    mesg.append(" to ");
+    mesg.append(new_file);
+    mesg.append(" Space ID: ");
+    auto file_meta = file_ctx->get_file_meta_read();
+    mesg.append(std::to_string(file_meta->m_space_id));
+
+    ib::info(ER_IB_MSG_CLONE_DDL_APPLY) << mesg;
+    return err;
+  };
+
+  auto err = snapshot->iterate_data_files(fix_func);
+
+  /* Delete ddl list file. */
+  if (err == 0) {
+    std::string ddl_list_file;
+    add_directory_path(m_clone_dir, CLONE_INNODB_DDL_FILES, ddl_list_file);
+
+    clone_remove_list_file(ddl_list_file.c_str());
+  }
+
+  return err;
+}
+
+/* Check and set punch hole for compressed page table. */
+int Clone_Handle::set_compression(Clone_file_ctx *file_ctx) {
+  auto file_meta = file_ctx->get_file_meta();
+
+  if (file_meta->m_compress_type == Compression::NONE || file_ctx->deleted()) {
+    return 0;
+  }
+
+  /* Disable punch hole if donor compression is not effective. */
+  page_size_t page_size(file_meta->m_fsp_flags);
+
+  if (page_size.is_compressed() ||
+      file_meta->m_fsblk_size * 2 > srv_page_size) {
+    /* purecov: begin inspected */
+    file_meta->m_punch_hole = false;
+    return 0;
+    /* purecov: end */
+  }
+
+  os_file_stat_t stat_info;
+  std::string file_name;
+  file_ctx->get_file_name(file_name);
+
+  os_file_get_status(file_name.c_str(), &stat_info, false, false);
+
+  /* Check and disable punch hole if recipient cannot support it. */
+  if (!IORequest::is_punch_hole_supported() ||
+      stat_info.block_size * 2 > srv_page_size) {
+    file_meta->m_punch_hole = false; /* purecov: inspected */
+  } else {
+    file_meta->m_punch_hole = true;
+  }
+
+  /* Old format for compressed and encrypted page is
+  dependent on file system block size. */
+  if (file_meta->m_encrypt_type != Encryption::NONE &&
+      file_meta->m_fsblk_size != stat_info.block_size) {
+    /* purecov: begin tested */
+    auto donor_str = std::to_string(file_meta->m_fsblk_size);
+    auto recipient_str = std::to_string(stat_info.block_size);
+
+    my_error(ER_CLONE_CONFIG, MYF(0), "FS Block Size", donor_str.c_str(),
+             recipient_str.c_str());
+    return ER_CLONE_CONFIG;
+    /* purecov: end */
+  }
+
+  return 0;
+}
+
+int Clone_Handle::file_create_init(const Clone_file_ctx *file_ctx,
+                                   ulint file_type, bool init) {
+  /* Create the file and path. */
+  File_init_cbk init_cbk = [&](pfs_os_file_t file) {
+    if (!init) {
+      return DB_SUCCESS;
+    }
+
+    bool atomic = false;
+    bool punch_hole = false;
+
+    std::string file_name;
+    file_ctx->get_file_name(file_name);
+
+    const auto file_meta = file_ctx->get_file_meta_read();
+    auto flags = file_meta->m_fsp_flags;
+
+    bool is_undo_file = fsp_is_undo_tablespace(file_meta->m_space_id);
+
+    page_no_t size_in_pages =
+        is_undo_file ? UNDO_INITIAL_SIZE_IN_PAGES : FIL_IBD_FILE_INITIAL_SIZE;
+
+    byte encryption_info[Encryption::INFO_SIZE];
+    byte *encryption_ptr = nullptr;
+
+    dberr_t db_err = DB_SUCCESS;
+    std::string mesg("CREATE NEW FILE : ");
+
+    if (file_meta->m_transfer_encryption_key) {
+      encryption_ptr = &encryption_info[0];
+      mesg.append(" WRITE KEY: ");
+
+      bool success = Encryption::fill_encryption_info(
+          file_meta->m_encryption_key, file_meta->m_encryption_iv,
+          encryption_info, false, true);
+
+      if (!success) {
+        db_err = DB_ERROR; /* purecov: inspected */
+      }
+    }
+
+    if (db_err == DB_SUCCESS) {
+      db_err = fil_write_initial_pages(
+          file, file_name.c_str(), FIL_TYPE_TABLESPACE, size_in_pages,
+          encryption_ptr, file_meta->m_space_id, flags, atomic, punch_hole);
+    }
+
+    mesg.append(file_name);
+    mesg.append(" Space ID: ");
+    mesg.append(std::to_string(file_meta->m_space_id));
+
+    if (db_err != DB_SUCCESS) {
+      mesg.append(" FAILED"); /* purecov: inspected */
+    }
+
+    ib::info(ER_IB_MSG_CLONE_DDL_APPLY) << mesg;
+
+    return db_err;
+  };
+
+  auto err = open_file(nullptr, file_ctx, file_type, true, init_cbk);
+
+  return err;
+}
+
 int Clone_Handle::apply_file_metadata(Clone_Task *task,
                                       Ha_clone_cbk *callback) {
   ut_ad(m_clone_handle_type == CLONE_HDL_APPLY);
@@ -654,115 +1104,126 @@
     my_error(err, MYF(0), "Wrong Clone RPC: Invalid File Descriptor");
     return (err);
   }
-  auto file_meta = &file_desc.m_file_meta;
+  const auto file_desc_meta = &file_desc.m_file_meta;
   auto snapshot = m_clone_task_manager.get_snapshot();
 
-  ut_ad(snapshot->get_state() == file_desc.m_state);
+  /* At end of current state DDL file alterations are communicated. */
+  bool ddl_desc = (file_desc.m_state == snapshot->get_next_state());
+
+  ut_ad(ddl_desc || snapshot->get_state() == file_desc.m_state);
 
-  bool desc_exists;
+  bool file_deleted = file_desc_meta->is_deleted();
+
+  bool desc_exists = false;
+  Clone_file_ctx *file_ctx = nullptr;
 
   /* Check file metadata entry based on the descriptor. */
-  auto err =
-      snapshot->get_file_from_desc(file_meta, m_clone_dir, false, desc_exists);
-  if (err != 0 || desc_exists) {
+  auto err = snapshot->get_file_from_desc(file_desc_meta, m_clone_dir, false,
+                                          desc_exists, file_ctx);
+  if (err != 0) {
     return (err);
   }
 
+  if (desc_exists) {
+    if (ddl_desc) {
+      err = apply_ddl(file_desc_meta, file_ctx);
+
+    } else if (file_deleted) {
+      /* File delete notification sent immediately for chunk adjustment. */
+      err = apply_file_delete(task, file_ctx, file_desc_meta);
+    }
+    return err;
+  }
+
   mutex_enter(m_clone_task_manager.get_mutex());
 
   /* Create file metadata entry based on the descriptor. */
-  err = snapshot->get_file_from_desc(file_meta, m_clone_dir, true, desc_exists);
-  file_meta->m_punch_hole = false;
-
+  err = snapshot->get_file_from_desc(file_desc_meta, m_clone_dir, true,
+                                     desc_exists, file_ctx);
   if (err != 0 || desc_exists) {
     mutex_exit(m_clone_task_manager.get_mutex());
 
     /* Save error with file name. */
     if (err != 0) {
-      m_clone_task_manager.set_error(err, file_meta->m_file_name);
+      m_clone_task_manager.set_error(err, file_desc_meta->m_file_name);
     }
     return (err);
   }
 
-  if (file_desc.m_state == CLONE_SNAPSHOT_FILE_COPY) {
+  auto file_meta = file_ctx->get_file_meta();
+  file_meta->m_punch_hole = false;
+
+  bool is_file_copy = snapshot->get_state() == CLONE_SNAPSHOT_FILE_COPY;
+  bool is_page_copy = snapshot->get_state() == CLONE_SNAPSHOT_PAGE_COPY;
+
+  if (is_file_copy || is_page_copy) {
+    ut_ad(is_file_copy || ddl_desc);
+
     auto file_type = OS_CLONE_DATA_FILE;
 
     if (file_meta->m_space_id == dict_sys_t::s_invalid_space_id) {
       file_type = OS_CLONE_LOG_FILE;
     }
 
-    /* Create the file */
-    err = open_file(nullptr, file_meta, file_type, true, false);
+    if (file_deleted) {
+      /* Mark the newly created descriptor deleted. */
+      file_ctx->m_state.store(Clone_file_ctx::State::DROPPED_HANDLED);
+
+      std::string file_name;
+      file_ctx->get_file_name(file_name);
+
+      std::string mesg("ADD DELETED FILE : ");
+      mesg.append(file_name);
+      mesg.append(" Space ID: ");
+      mesg.append(std::to_string(file_meta->m_space_id));
+      ib::info(ER_IB_MSG_CLONE_DDL_APPLY) << mesg;
+
+    } else {
+      /* Create the file and write initial pages if created by DDL. */
+      err = file_create_init(file_ctx, file_type, ddl_desc);
+    }
 
     /* If last file is received, set all file metadata transferred */
-    if (snapshot->add_file_from_desc(file_meta)) {
+    if (snapshot->add_file_from_desc(file_ctx, ddl_desc)) {
       m_clone_task_manager.set_file_meta_transferred();
     }
 
     mutex_exit(m_clone_task_manager.get_mutex());
 
-    if (err != 0) {
-      return (err);
+    if (err == 0 && file_type == OS_CLONE_DATA_FILE) {
+      err = set_compression(file_ctx);
     }
-
-    /* Check and set punch hole for compressed page table. */
-    if (file_type == OS_CLONE_DATA_FILE &&
-        file_meta->m_compress_type != Compression::NONE) {
-      page_size_t page_size(file_meta->m_fsp_flags);
-
-      /* Disable punch hole if donor compression is not effective. */
-      if (page_size.is_compressed() ||
-          file_meta->m_fsblk_size * 2 > srv_page_size) {
-        file_meta->m_punch_hole = false;
-        return (0);
-      }
-
-      os_file_stat_t stat_info;
-      os_file_get_status(file_meta->m_file_name, &stat_info, false, false);
-
-      /* Check and disable punch hole if recipient cannot support it. */
-      if (!IORequest::is_punch_hole_supported() ||
-          stat_info.block_size * 2 > srv_page_size) {
-        file_meta->m_punch_hole = false;
-      } else {
-        file_meta->m_punch_hole = true;
-      }
-
-      /* Currently the format for compressed and encrypted page is
-      dependent on file system block size. */
-      if (file_meta->m_encrypt_type != Encryption::NONE &&
-          file_meta->m_fsblk_size != stat_info.block_size) {
-        auto donor_str = std::to_string(file_meta->m_fsblk_size);
-        auto recipient_str = std::to_string(stat_info.block_size);
-
-        my_error(ER_CLONE_CONFIG, MYF(0), "FS Block Size", donor_str.c_str(),
-                 recipient_str.c_str());
-        err = ER_CLONE_CONFIG;
-      }
-    }
-    return (err);
+    return err;
   }
 
+  ut_ad(snapshot->get_state() == CLONE_SNAPSHOT_REDO_COPY);
   ut_ad(file_desc.m_state == CLONE_SNAPSHOT_REDO_COPY);
+  ut_ad(!ddl_desc);
 
   /* open and reserve the redo file size */
-  err = open_file(nullptr, file_meta, OS_CLONE_LOG_FILE, true, true);
+  File_init_cbk empty_cbk;
+
+  err = open_file(nullptr, file_ctx, OS_CLONE_LOG_FILE, true, empty_cbk);
 
-  snapshot->add_file_from_desc(file_meta);
+  snapshot->add_file_from_desc(file_ctx, false);
 
   /* For redo copy, check and add entry for the second file. */
   if (err == 0 && file_meta->m_file_index == 0) {
-    file_meta = &file_desc.m_file_meta;
-    file_meta->m_file_index++;
+    ut_ad(file_desc.m_file_meta.m_file_index == 0);
+    file_desc.m_file_meta.m_file_index++;
 
-    err =
-        snapshot->get_file_from_desc(file_meta, m_clone_dir, true, desc_exists);
+    const auto file_desc_meta = &file_desc.m_file_meta;
 
-    file_meta->m_punch_hole = false;
+    file_ctx = nullptr;
+    err = snapshot->get_file_from_desc(file_desc_meta, m_clone_dir, true,
+                                       desc_exists, file_ctx);
 
     if (err == 0 && !desc_exists) {
-      err = open_file(nullptr, file_meta, OS_CLONE_LOG_FILE, true, true);
-      snapshot->add_file_from_desc(file_meta);
+      auto file_meta = file_ctx->get_file_meta();
+      file_meta->m_punch_hole = false;
+
+      err = open_file(nullptr, file_ctx, OS_CLONE_LOG_FILE, true, empty_cbk);
+      snapshot->add_file_from_desc(file_ctx, false);
     }
   }
 
@@ -781,18 +1242,24 @@
     auto page_type = mach_read_from_2(buffer + FIL_PAGE_TYPE);
     if (page_type == FIL_PAGE_COMPRESSED ||
         page_type == FIL_PAGE_COMPRESSED_AND_ENCRYPTED) {
-      auto comp_len = mach_read_from_2(buffer + FIL_PAGE_COMPRESS_SIZE_V1);
+      uint32_t comp_len = mach_read_from_2(buffer + FIL_PAGE_COMPRESS_SIZE_V1);
       comp_len += FIL_PAGE_DATA;
 
       /* Align compressed length */
       comp_len = ut_calc_align(comp_len, block_size);
 
-      auto offset = static_cast<ulint>(start_off + comp_len);
-      auto hole_size = static_cast<ulint>(page_len - comp_len);
-
-      err = os_file_punch_hole(file, offset, hole_size);
-      if (err != DB_SUCCESS) {
-        break;
+      /* In rare case during file copy the page could be a torn page
+      and the size may not be correct. In such case the page is going to
+      be replaced later during page copy. We avoid setting punch hole
+      beyond the page in such case. */
+      if (comp_len < page_len) {
+        os_offset_t offset = start_off + comp_len;
+        os_offset_t hole_size = page_len - comp_len;
+
+        err = os_file_punch_hole(file, offset, hole_size);
+        if (err != DB_SUCCESS) {
+          break; /* purecov: inspected */
+        }
       }
     }
     start_off += page_len;
@@ -897,7 +1364,26 @@
 
   auto snapshot = m_clone_task_manager.get_snapshot();
 
-  auto file_meta = snapshot->get_file_by_index(task->m_current_file_index);
+  auto file_ctx = snapshot->get_file_ctx_by_index(task->m_current_file_index);
+  auto file_meta = file_ctx->get_file_meta();
+
+  std::string file_name;
+  file_ctx->get_file_name(file_name);
+
+  /* If the file is deleted, then fetch the data and ignore. */
+  if (file_ctx->deleted()) {
+    unsigned char *data_buf = nullptr;
+    uint32_t data_len = 0;
+    callback->apply_buffer_cbk(data_buf, data_len);
+
+    std::string mesg("IGNORE DATA for DELETED FILE: ");
+    mesg.append(file_name);
+    mesg.append(" Space ID: ");
+    mesg.append(std::to_string(file_meta->m_space_id));
+
+    ib::info(ER_IB_MSG_CLONE_DDL_APPLY) << mesg;
+    return 0;
+  }
 
   bool is_page_copy = (snapshot->get_state() == CLONE_SNAPSHOT_PAGE_COPY);
   bool is_log_file = (snapshot->get_state() == CLONE_SNAPSHOT_REDO_COPY);
@@ -924,12 +1410,15 @@
   if (task->m_current_file_des.m_file == OS_FILE_CLOSED) {
     ut_ad(file_meta != nullptr);
 
-    auto err = open_file(task, file_meta, file_type, true, false);
+    File_init_cbk empty_cbk;
+    auto err = open_file(task, file_ctx, file_type, true, empty_cbk);
 
     if (err != 0) {
       /* Save error with file name. */
-      m_clone_task_manager.set_error(err, file_meta->m_file_name);
+      /* purecov: begin inspected */
+      m_clone_task_manager.set_error(err, file_name.c_str());
       return (err);
+      /* purecov: end */
     }
   }
 
@@ -942,11 +1431,13 @@
   auto success = os_file_seek(nullptr, file_hdl, offset);
 
   if (!success) {
-    my_error(ER_ERROR_ON_READ, MYF(0), file_meta->m_file_name, errno,
+    /* purecov: begin inspected */
+    my_error(ER_ERROR_ON_READ, MYF(0), file_name.c_str(), errno,
              my_strerror(errbuf, sizeof(errbuf), errno));
     /* Save error with file name. */
-    m_clone_task_manager.set_error(ER_ERROR_ON_READ, file_meta->m_file_name);
+    m_clone_task_manager.set_error(ER_ERROR_ON_READ, file_name.c_str());
     return (ER_ERROR_ON_READ);
+    /* purecov: end */
   }
 
   if (task->m_file_cache) {
@@ -982,7 +1473,9 @@
 
   if (err != 0) {
     /* Save error with file name. */
-    m_clone_task_manager.set_error(err, file_meta->m_file_name);
+    /* purecov: begin inspected */
+    m_clone_task_manager.set_error(err, file_name.c_str());
+    /* purecov: end */
   }
   return (err);
 }
@@ -1122,7 +1615,7 @@
   while (file_size > cur_file->m_file_size) {
     ++file_index;
 
-    if (file_index >= m_num_data_files) {
+    if (file_index >= num_data_files()) {
       /* Update file size for the last file. */
       cur_file->m_file_size = file_size;
       break;
@@ -1145,9 +1638,11 @@
 }
 
 int Clone_Snapshot::init_apply_state(Clone_Desc_State *state_desc) {
-  set_state_info(state_desc);
+  IB_mutex_guard guard(&m_snapshot_mutex);
 
+  set_state_info(state_desc);
   int err = 0;
+
   switch (m_snapshot_state) {
     case CLONE_SNAPSHOT_FILE_COPY:
       ib::info(ER_IB_CLONE_OPERATION) << "Clone Apply State FILE COPY: ";
@@ -1195,27 +1690,52 @@
 int Clone_Snapshot::extend_and_flush_files(bool flush_redo) {
   auto &file_vector = (flush_redo) ? m_redo_file_vector : m_data_file_vector;
 
-  for (auto file_meta : file_vector) {
+  for (auto file_ctx : file_vector) {
+    if (file_ctx->deleted()) {
+      ut_ad(file_ctx->m_state.load() == Clone_file_ctx::State::DROPPED_HANDLED);
+      continue;
+    }
     char errbuf[MYSYS_STRERROR_SIZE];
     bool success = true;
+    auto file_meta = file_ctx->get_file_meta();
+
+    std::string file_name;
+    file_ctx->get_file_name(file_name);
 
     auto file =
-        os_file_create(innodb_clone_file_key, file_meta->m_file_name,
+        os_file_create(innodb_clone_file_key, file_name.c_str(),
                        OS_FILE_OPEN | OS_FILE_ON_ERROR_NO_EXIT, OS_FILE_NORMAL,
                        OS_CLONE_DATA_FILE, false, &success);
 
     if (!success) {
-      my_error(ER_CANT_OPEN_FILE, MYF(0), file_meta->m_file_name, errno,
+      /* purecov: begin inspected */
+      my_error(ER_CANT_OPEN_FILE, MYF(0), file_name.c_str(), errno,
                my_strerror(errbuf, sizeof(errbuf), errno));
 
       return (ER_CANT_OPEN_FILE);
+      /* purecov: end */
     }
 
     auto file_size = os_file_get_size(file);
 
+    size_t aligned_size = 0;
+    /* If file size is not aligned to extent size, recovery handling has
+    some issues. This work around eliminates dependency with that. */
+    if (file_meta->m_fsp_flags != UINT32_UNDEFINED) {
+      page_size_t page_size(file_meta->m_fsp_flags);
+      auto extent_size = page_size.physical() * FSP_EXTENT_SIZE;
+      /* Skip extending files smaller than one extent. */
+      if (file_size > extent_size) {
+        aligned_size = ut_uint64_align_up(file_size, extent_size);
+      }
+    }
+
     if (file_size < file_meta->m_file_size) {
-      success = os_file_set_size(file_meta->m_file_name, file, file_size,
+      success = os_file_set_size(file_name.c_str(), file, file_size,
                                  file_meta->m_file_size, false, true);
+    } else if (file_size < aligned_size) {
+      success = os_file_set_size(file_name.c_str(), file, file_size,
+                                 aligned_size, false, true);
     } else {
       success = os_file_flush(file);
     }
@@ -1223,10 +1743,12 @@
     os_file_close(file);
 
     if (!success) {
-      my_error(ER_ERROR_ON_WRITE, MYF(0), file_meta->m_file_name, errno,
+      /* purecov: begin inspected */
+      my_error(ER_ERROR_ON_WRITE, MYF(0), file_name.c_str(), errno,
                my_strerror(errbuf, sizeof(errbuf), errno));
 
       return (ER_ERROR_ON_WRITE);
+      /* purecov: end */
     }
   }
   return (0);
diff -Nru mysql-8.0-8.0.26/storage/innobase/clone/clone0clone.cc mysql-8.0-8.0.27/storage/innobase/clone/clone0clone.cc
--- mysql-8.0-8.0.26/storage/innobase/clone/clone0clone.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/clone/clone0clone.cc	2021-09-28 11:46:34.000000000 +0000
@@ -196,7 +196,13 @@
           return (ER_CLONE_DDL_IN_PROGRESS);
 
         } else if (result) {
-          ut_ad(current_clone->is_abort());
+          if (!current_clone->is_abort()) {
+            /* Another clone has taken over the free index. */
+            ib::info(ER_IB_CLONE_START_STOP)
+                << "Clone Begin Master wait for abort interrupted";
+            my_error(ER_QUERY_INTERRUPTED, MYF(0));
+            return ER_QUERY_INTERRUPTED;
+          }
         }
 
         if (!result) {
@@ -235,7 +241,8 @@
   }
 
   /* Create a new clone. */
-  clone_hdl = UT_NEW(Clone_Handle(hdl_type, version, free_idx), mem_key_clone);
+  clone_hdl = ut::new_withkey<Clone_Handle>(
+      ut::make_psi_memory_key(mem_key_clone), hdl_type, version, free_idx);
 
   if (clone_hdl == nullptr) {
     my_error(ER_OUTOFMEMORY, MYF(0), sizeof(Clone_Handle));
@@ -278,7 +285,7 @@
     --m_num_apply_clones;
   }
 
-  UT_DELETE(clone_handle);
+  ut::delete_(clone_handle);
 }
 
 Clone_Handle *Clone_Sys::get_clone_by_index(const byte *loc, uint loc_len) {
@@ -328,8 +335,9 @@
   }
 
   /* Create a new snapshot. */
-  snapshot = UT_NEW(Clone_Snapshot(hdl_type, clone_type, free_idx, snapshot_id),
-                    mem_key_clone);
+  snapshot = ut::new_withkey<Clone_Snapshot>(
+      ut::make_psi_memory_key(mem_key_clone), hdl_type, clone_type, free_idx,
+      snapshot_id);
 
   if (snapshot == nullptr) {
     my_error(ER_OUTOFMEMORY, MYF(0), sizeof(Clone_Snapshot));
@@ -352,22 +360,16 @@
 
 void Clone_Sys::detach_snapshot(Clone_Snapshot *snapshot,
                                 Clone_Handle_Type hdl_type) {
-  uint num_clones;
-
   ut_ad(mutex_own(&m_clone_sys_mutex));
-  num_clones = snapshot->detach();
-
-  if (num_clones != 0) {
-    return;
-  }
+  snapshot->detach();
 
-  /* All clones are detached. Drop the snapshot. */
+  /* Drop the snapshot. */
   uint index;
 
   index = snapshot->get_index();
   ut_ad(m_snapshot_arr[index] == snapshot);
 
-  UT_DELETE(snapshot);
+  ut::delete_(snapshot);
 
   m_snapshot_arr[index] = nullptr;
 
@@ -382,24 +384,57 @@
   }
 }
 
+Clone_Sys::Acquire_clone::Acquire_clone() {
+  std::tie(std::ignore, m_clone) = clone_sys->check_active_clone();
+
+  if (m_clone != nullptr) {
+    m_clone->attach();
+  }
+}
+
+Clone_Sys::Acquire_clone::~Acquire_clone() {
+  if (m_clone != nullptr) {
+    clone_sys->drop_clone(m_clone);
+  }
+  m_clone = nullptr;
+}
+
+Clone_Snapshot *Clone_Sys::Acquire_clone::get_snapshot() {
+  if (m_clone == nullptr) {
+    return nullptr; /* purecov: inspected */
+  }
+  return m_clone->get_snapshot();
+}
+
 bool Clone_Sys::check_active_clone(bool print_alert) {
+  bool active_clone = false;
+  std::tie(active_clone, std::ignore) = check_active_clone();
+
+  if (active_clone && print_alert) {
+    /* purecov: begin inspected */
+    ib::info(ER_IB_CLONE_TIMEOUT) << "DDL waiting for CLONE to abort";
+    /* purecov: end */
+  }
+  return (active_clone);
+}
+
+std::tuple<bool, Clone_Handle *> Clone_Sys::check_active_clone() {
   ut_ad(mutex_own(&m_clone_sys_mutex));
 
   bool active_clone = false;
+  Clone_Handle *active_handle = nullptr;
+
   /* Check for active clone operations. */
   for (int idx = 0; idx < CLONE_ARR_SIZE; idx++) {
     auto clone_hdl = m_clone_arr[idx];
 
     if (clone_hdl != nullptr && clone_hdl->is_copy_clone()) {
       active_clone = true;
+      active_handle = clone_hdl;
       break;
     }
   }
-
-  if (active_clone && print_alert) {
-    ib::info(ER_IB_CLONE_TIMEOUT) << "DDL waiting for CLONE to abort";
-  }
-  return (active_clone);
+  return std::make_tuple(active_clone, active_handle);
 }
 
 bool Clone_Sys::mark_abort(bool force) {
@@ -469,20 +504,10 @@
   }
 }
 
-bool Clone_Sys::mark_wait() {
+void Clone_Sys::mark_wait() {
   ut_ad(mutex_own(&m_clone_sys_mutex));
-
-  /* Check for active clone operations. */
-  auto active_clone = check_active_clone(false);
-
-  /* If active clone is running return. */
-  if (active_clone) {
-    return (false);
-  }
-
   /* Let any new clone operation wait till mark_free is called. */
   ++s_clone_wait_count;
-  return (true);
 }
 
 void Clone_Sys::mark_free() {
@@ -491,6 +516,14 @@
   --s_clone_wait_count;
 }
 
+#ifdef UNIV_DEBUG
+void Clone_Sys::debug_wait_clone_begin() {
+  mutex_exit(&m_clone_sys_mutex);
+  DEBUG_SYNC_C("clone_begin_wait_ddl");
+  mutex_enter(&m_clone_sys_mutex);
+}
+#endif /* UNIV_DEBUG */
+
 int Clone_Sys::wait_for_free(THD *thd) {
   ut_ad(mutex_own(&m_clone_sys_mutex));
 
@@ -500,15 +533,27 @@
 
   auto wait_condition = [&](bool alert, bool &result) {
     ut_ad(mutex_own(&m_clone_sys_mutex));
-    result = (s_clone_wait_count == 0);
+    result = (s_clone_wait_count > 0);
     if (alert) {
+      /* purecov: begin inspected */
       ib::info(ER_IB_CLONE_OPERATION)
-          << "CLONE waiting for redo/undo encryption";
+          << "CLONE BEGIN waiting for DDL in critical section";
+      /* purecov: end */
     }
+
+    ut_d(debug_wait_clone_begin());
+
     if (thd_killed(thd)) {
       my_error(ER_QUERY_INTERRUPTED, MYF(0));
       return (ER_QUERY_INTERRUPTED);
     }
+
+    if (s_clone_sys_state == CLONE_SYS_ABORT) {
+      /* purecov: begin inspected */
+      my_error(ER_CLONE_DDL_IN_PROGRESS, MYF(0));
+      return ER_CLONE_DDL_IN_PROGRESS;
+      /* purecov: end */
+    }
     return (0);
   };
 
@@ -530,13 +575,69 @@
   if (is_timeout) {
     ut_ad(false);
     my_error(ER_INTERNAL_ERROR, MYF(0),
-             "Innodb Clone timeout waiting for background");
+             "Clone BEGIN timeout waiting for DDL in critical section");
     return (ER_INTERNAL_ERROR);
   }
 
   return (0);
 }
 
+bool Clone_Sys::begin_ddl_state(Clone_notify::Type type, space_id_t space,
+                                bool no_wait, bool check_intr,
+                                uint32_t &blocked_state, int &error) {
+  ut_ad(mutex_own(get_mutex()));
+  Acquire_clone clone_handle;
+
+  auto snapshot = clone_handle.get_snapshot();
+  ut_ad(snapshot != nullptr);
+  blocked_state = CLONE_SNAPSHOT_NONE;
+
+  if (snapshot == nullptr) {
+    return false; /* purecov: inspected */
+  }
+
+  DBUG_EXECUTE_IF("clone_ddl_error_abort", {
+    error = ER_INTERNAL_ERROR;
+    my_error(error, MYF(0), "Simulated Clone DDL error");
+    return false;
+  });
+
+  /* Safe to release mutex after pinning the clone handle. */
+  mutex_exit(get_mutex());
+  bool blocked =
+      snapshot->begin_ddl_state(type, space, no_wait, check_intr, error);
+  mutex_enter(get_mutex());
+
+  blocked_state = blocked ? snapshot->get_state() : CLONE_SNAPSHOT_NONE;
+
+  return blocked;
+}
+
+void Clone_Sys::end_ddl_state(Clone_notify::Type type, space_id_t space,
+                              uint32_t blocked_state) {
+  ut_ad(mutex_own(get_mutex()));
+  Acquire_clone clone_handle;
+
+  auto snapshot = clone_handle.get_snapshot();
+
+  /* Clone might have exited with error. */
+  if (snapshot == nullptr) {
+    return; /* purecov: inspected */
+  }
+
+  if (blocked_state != snapshot->get_state()) {
+    /* purecov: begin deadcode */
+    ut_ad(false);
+    ib::error(ER_IB_CLONE_INTERNAL);
+    /* purecov: end */
+  }
+
+  /* Safe to release mutex after pinning the clone handle. */
+  mutex_exit(get_mutex());
+  snapshot->end_ddl_state(type, space);
+  mutex_enter(get_mutex());
+}
+
 ib_uint64_t Clone_Sys::get_next_id() {
   ut_ad(mutex_own(&m_clone_sys_mutex));
 
@@ -544,16 +645,74 @@
 }
 
 #ifdef UNIV_DEBUG
-void Clone_Task_Manager::debug_wait(uint chunk_num, Clone_Task *task) {
-  auto state = m_clone_snapshot->get_state();
+bool Clone_Task_Manager::debug_sync_check(uint32_t chunk_num,
+                                          Clone_Task *task) {
   auto nchunks = m_clone_snapshot->get_num_chunks();
 
   /* Stop somewhere in the middle of current stage */
   if (!task->m_is_master || task->m_ignore_sync ||
       (chunk_num != 0 && chunk_num < (nchunks / 2 + 1))) {
+    return false;
+  }
+
+  /* Ignore sync request for all future requests. */
+  task->m_ignore_sync = true;
+  return true;
+}
+
+void Clone_Task_Manager::debug_wait_ddl_meta() {
+  auto state = m_clone_snapshot->get_state();
+
+  /* We send DDL metadata of previous state. */
+  if (state == CLONE_SNAPSHOT_PAGE_COPY) {
+    DEBUG_SYNC_C("clone_before_file_ddl_meta");
+
+  } else if (state == CLONE_SNAPSHOT_REDO_COPY) {
+    DEBUG_SYNC_C("clone_before_page_ddl_meta");
+  }
+}
+
+Clone_Task *Clone_Task_Manager::find_master_task() {
+  Clone_Task *task = nullptr;
+
+  for (uint32_t index = 0; index < m_num_tasks; ++index) {
+    task = &m_clone_tasks[index];
+    if (task->m_is_master) {
+      break;
+    }
+  }
+  return task;
+}
+
+void Clone_Handle::close_master_file() {
+  auto task = m_clone_task_manager.find_master_task();
+  close_and_unpin_file(task);
+}
+
+void Clone_Sys::close_donor_master_file() {
+  IB_mutex_guard sys_mutex(get_mutex());
+
+  Clone_Handle *clone_donor = nullptr;
+  std::tie(std::ignore, clone_donor) = clone_sys->check_active_clone();
+
+  clone_donor->close_master_file();
+}
+
+void Clone_Task_Manager::debug_wait(uint chunk_num, Clone_Task *task) {
+  auto state = m_clone_snapshot->get_state();
+
+  if (!debug_sync_check(chunk_num, task)) {
     return;
   }
 
+  /* We are releasing the donor PIN early in debug mode to allow concurrent DDL
+  after blocking here. The test need to ensure that it is local clone so that
+  donor master task context can be found. This is in recipient path. */
+  DBUG_EXECUTE_IF("local_release_clone_file_pin", {
+    clone_sys->close_donor_master_file();
+    ib::info(ER_IB_CLONE_OPERATION) << "Clone debug close donor master file";
+  });
+
   if (state == CLONE_SNAPSHOT_FILE_COPY) {
     DBUG_SIGNAL_WAIT_FOR(current_thd, "gr_clone_wait", "gr_clone_paused",
                          "gr_clone_continue");
@@ -566,8 +725,6 @@
   } else if (state == CLONE_SNAPSHOT_REDO_COPY) {
     DEBUG_SYNC_C("clone_redo_copy");
   }
-
-  task->m_ignore_sync = true;
 }
 
 int Clone_Task_Manager::debug_restart(Clone_Task *task, int in_err,
@@ -634,6 +791,7 @@
     task->m_alloc_len = 0;
 
     task->m_current_file_des.m_file = OS_FILE_CLOSED;
+    task->m_pinned_file = false;
     task->m_current_file_index = 0;
     task->m_file_cache = true;
 
@@ -656,19 +814,8 @@
   m_transferred_file_meta = false;
   m_saved_error = 0;
 
-  /* Allocate error file name */
-  auto heap = m_clone_snapshot->lock_heap();
-
-  m_err_file_name = static_cast<char *>(mem_heap_alloc(heap, FN_REFLEN_SE));
-
-  m_err_file_len = FN_REFLEN_SE;
-
-  m_clone_snapshot->release_heap(heap);
-
   /* Initialize error file name */
-  memset(m_err_file_name, 0, m_err_file_len);
-
-  strncpy(m_err_file_name, "Clone File", m_err_file_len);
+  m_err_file_name.assign("Clone File");
 }
 
 void Clone_Task_Manager::reserve_task(THD *thd, uint &task_id) {
@@ -750,7 +897,7 @@
 
   ut_ad(task->m_serial_desc == nullptr);
 
-  task->m_serial_desc = static_cast<byte *>(mem_heap_alloc(heap, alloc_len));
+  task->m_serial_desc = static_cast<byte *>(mem_heap_zalloc(heap, alloc_len));
 
   m_clone_snapshot->release_heap(heap);
 
@@ -815,22 +962,18 @@
     case ER_CANT_CREATE_FILE:
     case ER_ERROR_ON_READ:
     case ER_ERROR_ON_WRITE:
-      ut_ad(m_err_file_name != nullptr);
-      ut_ad(m_err_file_len != 0);
-      my_error(m_saved_error, MYF(0), m_err_file_name, errno,
+      /* purecov: begin inspected */
+      my_error(m_saved_error, MYF(0), m_err_file_name.c_str(), errno,
                my_strerror(errbuf, sizeof(errbuf), errno));
       break;
+      /* purecov: end */
 
     case ER_FILE_EXISTS_ERROR:
-      ut_ad(m_err_file_name != nullptr);
-      ut_ad(m_err_file_len != 0);
-      my_error(m_saved_error, MYF(0), m_err_file_name);
+      my_error(m_saved_error, MYF(0), m_err_file_name.c_str());
       break;
 
     case ER_WRONG_VALUE:
-      ut_ad(m_err_file_name != nullptr);
-      ut_ad(m_err_file_len != 0);
-      my_error(m_saved_error, MYF(0), "file path", m_err_file_name);
+      my_error(m_saved_error, MYF(0), "file path", m_err_file_name.c_str());
       break;
 
     case ER_CLONE_DONOR:
@@ -1289,7 +1432,7 @@
       break;
 
     case CLONE_SNAPSHOT_NONE:
-      /* fall through */
+      [[fallthrough]];
 
     default:
       ut_ad(false);
@@ -1386,7 +1529,7 @@
       break;
 
     case CLONE_SNAPSHOT_NONE:
-      /* fall through */
+      [[fallthrough]];
 
     default:
       ut_ad(false);
@@ -1673,8 +1816,6 @@
   ut_ad(task->m_is_master);
   mutex_exit(&m_state_mutex);
 
-  uint num_pending = 0;
-
   if (m_clone_snapshot->is_copy()) {
     ib::info(ER_IB_CLONE_OPERATION)
         << "Clone State Change : Number of tasks = " << m_num_tasks;
@@ -1683,58 +1824,14 @@
         << "Clone Apply State Change : Number of tasks = " << m_num_tasks;
   }
 
-  err = m_clone_snapshot->change_state(
-      state_desc, m_next_state, task->m_current_buffer,
-      task->m_buffer_alloc_len, cbk, num_pending);
+  err = m_clone_snapshot->change_state(state_desc, m_next_state,
+                                       task->m_current_buffer,
+                                       task->m_buffer_alloc_len, cbk);
+
   if (err != 0) {
     return (err);
   }
 
-  /* Need to wait for other concurrent clone attached to current snapshot. */
-  if (num_pending > 0) {
-    bool is_timeout = false;
-    int alert_count = 0;
-    err = Clone_Sys::wait_default(
-        [&](bool alert, bool &result) {
-          num_pending = m_clone_snapshot->check_state(m_next_state, false);
-          result = (num_pending > 0);
-
-          /* Check for possible shutdown/kill */
-          mutex_enter(&m_state_mutex);
-          err = handle_error_other_task(task->m_has_thd);
-          mutex_exit(&m_state_mutex);
-
-          if (err == 0 && result && alert) {
-            /* Print messages every 1 minute - default is 5 seconds. */
-            if (++alert_count == 12) {
-              alert_count = 0;
-              ib::info(ER_IB_CLONE_TIMEOUT)
-                  << "Clone: master state change waiting for other clone";
-            }
-          }
-          return (err);
-        },
-        nullptr, is_timeout);
-
-    if (err != 0) {
-      /* Exit from state transition */
-      num_pending = m_clone_snapshot->check_state(m_next_state, true);
-      return (err);
-
-    } else if (is_timeout) {
-      /* Exit from state transition */
-      num_pending = m_clone_snapshot->check_state(m_next_state, true);
-      if (num_pending != 0) {
-        ut_ad(false);
-        ib::info(ER_IB_CLONE_TIMEOUT) << "Clone: master state change timed out";
-        my_error(ER_INTERNAL_ERROR, MYF(0),
-                 "Clone: master state change wait for other clones timed out: "
-                 "Wait too long for state transition");
-        return (ER_INTERNAL_ERROR);
-      }
-    }
-  }
-
   mutex_enter(&m_state_mutex);
 
   /* Check for error from other tasks. Must finish the state transition
@@ -1824,6 +1921,7 @@
       m_clone_id(),
       m_ref_count(),
       m_allow_restart(false),
+      m_abort_ddl(false),
       m_clone_dir(),
       m_clone_task_manager() {
   mutex_create(LATCH_ID_CLONE_TASK, m_clone_task_manager.get_mutex());
@@ -2114,23 +2212,39 @@
   return (err);
 }
 
-int Clone_Handle::open_file(Clone_Task *task, Clone_File_Meta *file_meta,
+void Clone_Handle::set_abort() {
+  set_state(CLONE_STATE_ABORT);
+
+  Clone_Snapshot *snapshot = m_clone_task_manager.get_snapshot();
+
+  /* Clone is set to abort state and snapshot can never be reused. It is
+  safe to mark the snapshot aborted to let any waiting DDL exit. There
+  could be other tasks on their way to exit and we should not change
+  the snapshot state yet. */
+  if (snapshot != nullptr) {
+    snapshot->set_abort();
+  }
+}
+
+int Clone_Handle::open_file(Clone_Task *task, const Clone_file_ctx *file_ctx,
                             ulint file_type, bool create_file,
-                            bool set_and_close) {
-  pfs_os_file_t handle;
+                            File_init_cbk &init_cbk) {
   os_file_type_t type;
-  ulint option;
-
-  bool success;
   bool exists;
-  bool read_only;
+  std::string file_name;
+
+  file_ctx->get_file_name(file_name);
 
   /* Check if file exists */
-  auto status = os_file_status(file_meta->m_file_name, &exists, &type);
+  auto status = os_file_status(file_name.c_str(), &exists, &type);
+
   if (!status) {
     return (0);
   }
 
+  ulint option;
+  bool read_only;
+
   if (create_file) {
     option = exists ? OS_FILE_OPEN : OS_FILE_CREATE_PATH;
     read_only = false;
@@ -2141,35 +2255,42 @@
   }
 
   option |= OS_FILE_ON_ERROR_NO_EXIT;
+  bool success = false;
 
-  handle = os_file_create(innodb_clone_file_key, file_meta->m_file_name, option,
-                          OS_FILE_NORMAL, file_type, read_only, &success);
-
-  if (success && set_and_close) {
-    ut_ad(create_file);
+  auto handle = os_file_create(innodb_clone_file_key, file_name.c_str(), option,
+                               OS_FILE_NORMAL, file_type, read_only, &success);
 
-    os_file_close(handle);
+  int err = 0;
 
-    if (success) {
-      return (0);
+  if (!success) {
+    /* purecov: begin inspected */
+    err = (option == OS_FILE_OPEN) ? ER_CANT_OPEN_FILE : ER_CANT_CREATE_FILE;
+    /* purecov: end */
+
+  } else if (create_file && init_cbk) {
+    auto db_err = init_cbk(handle);
+
+    if (db_err != DB_SUCCESS) {
+      /* purecov: begin inspected */
+      os_file_close(handle);
+      err = ER_ERROR_ON_WRITE;
+      /* purecov: end */
     }
   }
 
-  if (!success) {
+  if (err != 0) {
+    /* purecov: begin inspected */
     char errbuf[MYSYS_STRERROR_SIZE];
-
-    int err =
-        (option == OS_FILE_OPEN) ? ER_CANT_OPEN_FILE : ER_CANT_CREATE_FILE;
-
-    my_error(err, MYF(0), file_meta->m_file_name, errno,
+    my_error(err, MYF(0), file_name.c_str(), errno,
              my_strerror(errbuf, sizeof(errbuf), errno));
-
-    return (err);
+    return err;
+    /* purecov: end */
   }
 
   if (task == nullptr) {
+    ut_ad(create_file);
     os_file_close(handle);
-    return (0);
+    return 0;
   }
 
   /* Set file descriptor in task. */
@@ -2187,9 +2308,15 @@
     DBUG_EXECUTE_IF("clone_no_zero_copy", task->m_file_cache = false;);
   }
 
+  auto file_meta = file_ctx->get_file_meta_read();
+
+  /* If the task has pinned file, the index should be set. */
+  ut_ad(!task->m_pinned_file ||
+        task->m_current_file_index == file_meta->m_file_index);
+
   task->m_current_file_index = file_meta->m_file_index;
 
-  return (0);
+  return 0;
 }
 
 int Clone_Handle::close_file(Clone_Task *task) {
@@ -2201,7 +2328,6 @@
   }
 
   task->m_current_file_des.m_file = OS_FILE_CLOSED;
-  task->m_current_file_index = 0;
   task->m_file_cache = true;
 
   if (!success) {
diff -Nru mysql-8.0-8.0.26/storage/innobase/clone/clone0copy.cc mysql-8.0-8.0.27/storage/innobase/clone/clone0copy.cc
--- mysql-8.0-8.0.26/storage/innobase/clone/clone0copy.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/clone/clone0copy.cc	2021-09-28 11:46:34.000000000 +0000
@@ -107,22 +107,45 @@
     }
 
     /* Always the first file in list */
-    ut_ad(m_num_data_files == 0);
+    ut_ad(num_data_files() == 0);
 
     m_data_bytes_disk += size_bytes;
     m_monitor.add_estimate(size_bytes);
 
-    err = add_file(path, size_bytes, size_bytes, nullptr, true);
+    err = add_file(path, size_bytes, size_bytes, nullptr, false);
   }
 
   return (err);
 }
 
-int Clone_Snapshot::init_file_copy() {
-  int err = 0;
+#ifdef UNIV_DEBUG
+void Clone_Snapshot::debug_wait_state_transit() {
+  mutex_own(&m_snapshot_mutex);
+
+  /* Allow DDL to enter and check. */
+  mutex_exit(&m_snapshot_mutex);
+
+  DEBUG_SYNC_C("clone_state_transit_file_copy");
+
+  mutex_enter(&m_snapshot_mutex);
+}
+#endif /* UNIV_DEBUG */
 
+int Clone_Snapshot::init_file_copy(Snapshot_State new_state) {
   ut_ad(m_snapshot_handle_type == CLONE_HDL_COPY);
 
+  State_transit transit_guard(this, new_state);
+
+  int err = transit_guard.get_error();
+
+  if (err != 0) {
+    return err; /* purecov: inspected */
+  }
+
+  ut_d(debug_wait_state_transit());
+
+  m_monitor.init_state(srv_stage_clone_file_copy.m_key, m_enable_pfs);
+
   /* If not blocking clone, allocate redo header and trailer buffer. */
   if (m_snapshot_type != HA_CLONE_BLOCKING) {
     m_redo_ctx.get_header_size(m_redo_file_size, m_redo_header_size,
@@ -133,10 +156,12 @@
         m_redo_header_size + m_redo_trailer_size + UNIV_SECTOR_SIZE));
 
     if (m_redo_header == nullptr) {
+      /* purecov: begin inspected */
       my_error(ER_OUTOFMEMORY, MYF(0),
                m_redo_header_size + m_redo_trailer_size);
 
-      return (ER_OUTOFMEMORY);
+      return ER_OUTOFMEMORY;
+      /* purecov: end */
     }
 
     m_redo_header =
@@ -158,7 +183,7 @@
   }
 
   if (err != 0) {
-    return (err);
+    return err; /* purecov: inspected */
   }
 
   /* Initialize estimation about on disk bytes. */
@@ -168,7 +193,7 @@
   err = add_buf_pool_file();
 
   if (err != 0) {
-    return (err);
+    return err; /* purecov: inspected */
   }
 
   /* Do not include redo files in file list. */
@@ -176,10 +201,10 @@
 
   /* Iterate all tablespace files and add persistent data files. */
   auto error = Fil_iterator::for_each_file(
-      include_log, [&](fil_node_t *file) { return (add_node(file)); });
+      include_log, [&](fil_node_t *file) { return (add_node(file, false)); });
 
   if (error != DB_SUCCESS) {
-    return (ER_INTERNAL_ERROR);
+    return ER_INTERNAL_ERROR; /* purecov: inspected */
   }
 
   ib::info(ER_IB_CLONE_OPERATION)
@@ -187,14 +212,24 @@
       << " chunk size : " << (chunk_size() * UNIV_PAGE_SIZE) / (1024 * 1024)
       << " M";
 
-  return (0);
+  m_monitor.change_phase();
+  return 0;
 }
 
-int Clone_Snapshot::init_page_copy(byte *page_buffer, uint page_buffer_len) {
-  int err = 0;
-
+int Clone_Snapshot::init_page_copy(Snapshot_State new_state, byte *page_buffer,
+                                   uint page_buffer_len) {
   ut_ad(m_snapshot_handle_type == CLONE_HDL_COPY);
 
+  State_transit transit_guard(this, new_state);
+
+  int err = transit_guard.get_error();
+
+  if (err != 0) {
+    return err; /* purecov: inspected */
+  }
+
+  m_monitor.init_state(srv_stage_clone_page_copy.m_key, m_enable_pfs);
+
   if (m_snapshot_type == HA_CLONE_HYBRID) {
     /* Start Redo Archiving */
     err = m_redo_ctx.start(m_redo_header, m_redo_header_size);
@@ -207,8 +242,10 @@
   }
 
   if (err != 0) {
+    /* purecov: begin inspected */
     m_page_ctx.release();
-    return (err);
+    return err;
+    /* purecov: end */
   }
 
   /* Stop modified page archiving. */
@@ -217,8 +254,18 @@
   DEBUG_SYNC_C("clone_stop_page_archiving_without_releasing");
 
   if (err != 0) {
+    /* purecov: begin inspected */
     m_page_ctx.release();
-    return (err);
+    return err;
+    /* purecov: end */
+  }
+
+  /* Iterate all tablespace files and add new data files created. */
+  auto error = Fil_iterator::for_each_file(
+      false, [&](fil_node_t *file) { return (add_node(file, true)); });
+
+  if (error != DB_SUCCESS) {
+    return ER_INTERNAL_ERROR; /* purecov: inspected */
   }
 
   /* Collect modified page Ids from Page Archiver. */
@@ -249,7 +296,9 @@
       << " chunk size : " << (chunk_size() * UNIV_PAGE_SIZE) / (1024 * 1024)
       << " M";
   m_page_ctx.release();
-  return (err);
+
+  m_monitor.change_phase();
+  return err;
 }
 
 int Clone_Snapshot::synchronize_binlog_gtid(Clone_Alert_Func cbk) {
@@ -394,7 +443,8 @@
   return (0);
 }
 
-int Clone_Snapshot::init_redo_copy(Clone_Alert_Func cbk) {
+int Clone_Snapshot::init_redo_copy(Snapshot_State new_state,
+                                   Clone_Alert_Func cbk) {
   ut_ad(m_snapshot_handle_type == CLONE_HDL_COPY);
   ut_ad(m_snapshot_type != HA_CLONE_BLOCKING);
 
@@ -426,16 +476,45 @@
     binlog_error = synchronize_binlog_gtid(cbk);
   }
 
+  /* Save all dynamic metadata to DD buffer table and let all future operations
+  to save data immediately after generation. This makes clone recovery
+  independent of dynamic metadata stored in redo log and avoids generating
+  redo log during recovery. */
+  dict_persist_t::Enable_immediate dyn_metadata_guard(dict_persist);
+
+  /* Use it only for local clone. For remote clone, donor session is different
+  from the sessions created within mtr test case. */
+  DEBUG_SYNC_C("clone_donor_after_saving_dynamic_metadata");
+
+  /* Start transition to next state. */
+  State_transit transit_guard(this, new_state);
+
   /* Stop redo archiving even on error. */
   auto redo_error = m_redo_ctx.stop(m_redo_trailer, m_redo_trailer_size,
                                     m_redo_trailer_offset);
 
   if (binlog_error != 0) {
-    return (binlog_error);
+    return binlog_error; /* purecov: inspected */
   }
 
   if (redo_error != 0) {
-    return (redo_error);
+    return redo_error; /* purecov: inspected */
+  }
+
+  int transit_error = transit_guard.get_error();
+
+  if (transit_error != 0) {
+    return transit_error; /* purecov: inspected */
+  }
+
+  m_monitor.init_state(srv_stage_clone_redo_copy.m_key, m_enable_pfs);
+
+  /* Iterate all tablespace files and add new data files created. */
+  auto error = Fil_iterator::for_each_file(
+      false, [&](fil_node_t *file) { return (add_node(file, true)); });
+
+  if (error != DB_SUCCESS) {
+    return ER_INTERNAL_ERROR; /* purecov: inspected */
   }
 
   /* Collect archived redo log files from Log Archiver. */
@@ -462,46 +541,85 @@
       << " chunk size : " << (chunk_size() * UNIV_PAGE_SIZE) / (1024 * 1024)
       << " M";
 
-  return (redo_error);
+  m_monitor.change_phase();
+  return redo_error;
 }
 
-Clone_File_Meta *Clone_Snapshot::build_file(const char *file_name,
-                                            uint64_t file_size,
-                                            uint64_t file_offset,
-                                            uint &num_chunks,
-                                            bool copy_file_name) {
-  Clone_File_Meta *file_meta;
+bool Clone_Snapshot::build_file_name(Clone_File_Meta *file_meta,
+                                     const char *file_name) {
+  size_t new_len = strlen(file_name) + 1;
+  auto new_name = const_cast<char *>(file_meta->m_file_name);
 
-  ib_uint64_t aligned_size;
-  ib_uint64_t size_in_pages;
+  /* Check if allocation required. */
+  if (new_len <= file_meta->m_file_name_alloc_len) {
+    strcpy(new_name, file_name);
+    file_meta->m_file_name_len = new_len;
+    return true;
+  }
 
-  /* Allocate for file metadata from snapshot heap. */
-  aligned_size = sizeof(Clone_File_Meta);
+  if (new_len > FN_REFLEN_SE) {
+    /* purecov: begin deadcode */
+    ut_ad(false);
+    my_error(ER_PATH_LENGTH, MYF(0), "CLONE FILE NAME");
+    return false;
+    /* purecov: end */
+  }
 
-  if (file_name != nullptr && copy_file_name) {
-    aligned_size += strlen(file_name) + 1;
+  size_t alloc_len = new_len;
+
+  /* For reallocation, allocate in multple of base size to avoid frequent
+  allocation by rename DDL. */
+  if (file_meta->m_file_name_alloc_len > 0) {
+    alloc_len = ut_calc_align(new_len, S_FILE_NAME_BASE_LEN);
+  }
+
+  new_name = static_cast<char *>(mem_heap_zalloc(m_snapshot_heap, alloc_len));
+
+  if (new_name == nullptr) {
+    /* purecov: begin inspected */
+    my_error(ER_OUTOFMEMORY, MYF(0), static_cast<int>(alloc_len));
+    return false;
+    /* purecov: end */
   }
 
-  file_meta = static_cast<Clone_File_Meta *>(
+  strcpy(new_name, file_name);
+
+  file_meta->m_file_name = new_name;
+  file_meta->m_file_name_len = new_len;
+  file_meta->m_file_name_alloc_len = alloc_len;
+
+  return true;
+}
+
+Clone_file_ctx *Clone_Snapshot::build_file(const char *file_name,
+                                           uint64_t file_size,
+                                           uint64_t file_offset,
+                                           uint &num_chunks) {
+  /* Allocate for file metadata from snapshot heap. */
+  uint64_t aligned_size = sizeof(Clone_file_ctx);
+
+  auto file_ctx = static_cast<Clone_file_ctx *>(
       mem_heap_alloc(m_snapshot_heap, aligned_size));
 
-  if (file_meta == nullptr) {
+  if (file_ctx == nullptr) {
+    /* purecov: begin inspected */
     my_error(ER_OUTOFMEMORY, MYF(0), static_cast<int>(aligned_size));
-    return (file_meta);
+    return nullptr;
+    /* purecov: end */
   }
 
+  file_ctx->init(Clone_file_ctx::Extension::NONE);
+
+  auto file_meta = file_ctx->get_file_meta();
+
   /* For redo file with no data, add dummy entry. */
   if (file_name == nullptr) {
     num_chunks = 1;
 
-    file_meta->m_file_name = nullptr;
-    file_meta->m_file_name_len = 0;
-    file_meta->m_file_size = 0;
-
     file_meta->m_begin_chunk = 1;
     file_meta->m_end_chunk = 1;
 
-    return (file_meta);
+    return file_ctx;
   }
 
   file_meta->m_file_size = file_size;
@@ -511,7 +629,7 @@
   file_size -= file_offset;
 
   /* Calculate and set chunk parameters. */
-  size_in_pages = ut_uint64_align_up(file_size, UNIV_PAGE_SIZE);
+  uint64_t size_in_pages = ut_uint64_align_up(file_size, UNIV_PAGE_SIZE);
   size_in_pages /= UNIV_PAGE_SIZE;
 
   aligned_size = ut_uint64_align_up(size_in_pages, chunk_size());
@@ -521,120 +639,206 @@
   file_meta->m_begin_chunk = m_num_current_chunks + 1;
   file_meta->m_end_chunk = m_num_current_chunks + num_chunks;
 
-  file_meta->m_file_name_len = strlen(file_name) + 1;
+  bool success = build_file_name(file_meta, file_name);
+
+  return success ? file_ctx : nullptr;
+}
 
-  if (copy_file_name) {
-    char *tmp_name = reinterpret_cast<char *>(file_meta + 1);
+bool Clone_Snapshot::file_ctx_changed(const fil_node_t *node,
+                                      Clone_file_ctx *&file_ctx) {
+  file_ctx = nullptr;
 
-    strcpy(tmp_name, file_name);
-    file_meta->m_file_name = const_cast<const char *>(tmp_name);
-  } else {
-    /* We use the same pointer as the tablespace and files
-    should not be dropped or changed during clone. */
-    file_meta->m_file_name = file_name;
+  auto space = node->space;
+  auto count = m_data_file_map.count(space->id);
+
+  /* This is a new file after clone has started. */
+  if (count == 0) {
+    return true;
   }
+  auto file_index = m_data_file_map[space->id];
 
-  return (file_meta);
-}
+  if (file_index == 0) {
+    /* purecov: begin deadcode */
+    ut_ad(false);
+    return true;
+    /* purecov: end */
+  }
 
-/** Check if the tablespace file is temporary file created by DDL
-@param[in]	node	file node
-@return true if created by DDL */
-static bool is_ddl_temp_table(fil_node_t *node) {
-  const char *name_ptr;
+  /* File descriptor already exists. */
+  --file_index;
+  auto num_data_files = m_data_file_vector.size();
 
-  name_ptr = strrchr(node->name, OS_PATH_SEPARATOR);
+  ut_ad(file_index < num_data_files);
 
-  if (name_ptr == nullptr) {
-    name_ptr = node->name;
-  } else {
-    name_ptr++;
+  if (file_index < num_data_files) {
+    file_ctx = m_data_file_vector[file_index];
+  }
+
+  if (file_ctx == nullptr) {
+    /* purecov: begin deadcode */
+    ut_ad(false);
+    return false;
+    /* purecov: end */
+  }
+
+  ut_ad(!file_ctx->modifying());
+
+  bool file_changed =
+      file_ctx->m_state.load() != Clone_file_ctx::State::CREATED;
+
+  /* Consider file modification only from previous state. */
+  if (file_changed && file_ctx->by_ddl(get_state())) {
+    return true;
+  }
+
+  /* The file is not modified in previous state. Next we consider
+  encryption or compression type changes. The information is not
+  useful for "redo copy" state. Such changes would be applied
+  during redo recovery. */
+  if (get_state() == CLONE_SNAPSHOT_REDO_COPY) {
+    return false;
   }
 
-  /* Check if it is a temporary table created by DDL. This is work
-  around to identify concurrent DDL till server provides MDL lock
-  for blocking DDL. */
-  if (strncmp(name_ptr, TEMP_FILE_PREFIX, TEMP_FILE_PREFIX_LENGTH) == 0) {
-    return (true);
+  const auto file_meta = file_ctx->get_file_meta_read();
+
+  /* Check if encryption property has changed. */
+  if (file_meta->m_encrypt_type != space->encryption_type ||
+      space->encryption_op_in_progress != Encryption::Progress::NONE) {
+    return true;
+  }
+
+  /* Check if compression property has changed. */
+  if (file_meta->m_compress_type != space->compression_type) {
+    return true;
   }
 
-  return (false);
+  return false;
 }
 
 int Clone_Snapshot::add_file(const char *name, uint64_t size_bytes,
                              uint64_t alloc_bytes, fil_node_t *node,
-                             bool copy_name) {
+                             bool by_ddl) {
   ut_ad(m_snapshot_handle_type == CLONE_HDL_COPY);
 
-  uint num_chunks;
-
-  /* Build file metadata entry and add to data file vector. */
-  auto file_meta = build_file(name, size_bytes, 0, num_chunks, copy_name);
+  Clone_file_ctx *file_ctx = nullptr;
 
-  if (file_meta == nullptr) {
-    return (ER_OUTOFMEMORY);
+  /* Check if ddl has modified this space. */
+  if (by_ddl && !file_ctx_changed(node, file_ctx)) {
+    return 0;
   }
 
-  file_meta->m_alloc_size = alloc_bytes;
+  if (file_ctx == nullptr) {
+    uint32_t num_chunks = 0;
+    /* Build file metadata entry and add to data file vector. */
+    file_ctx = build_file(name, size_bytes, 0, num_chunks);
 
-  /* Set space ID, compression and encryption attribute */
-  if (node == nullptr) {
-    file_meta->m_space_id = dict_sys_t::s_invalid_space_id;
-    file_meta->m_compress_type = Compression::NONE;
-    file_meta->m_encrypt_type = Encryption::NONE;
-    file_meta->m_fsp_flags = UINT32_UNDEFINED;
-    file_meta->m_punch_hole = false;
-    file_meta->m_fsblk_size = 0;
+    if (file_ctx == nullptr) {
+      return (ER_OUTOFMEMORY); /* purecov: inspected */
+    }
+    auto file_meta = file_ctx->get_file_meta();
 
-  } else {
-    auto space = node->space;
-    file_meta->m_space_id = space->id;
-    file_meta->m_compress_type = space->compression_type;
-    file_meta->m_encrypt_type = space->encryption_type;
-    file_meta->m_fsp_flags = static_cast<uint32_t>(space->flags);
-    file_meta->m_punch_hole = node->punch_hole;
-    file_meta->m_fsblk_size = node->block_size;
-
-    /* If file node supports punch hole then check if we need it. */
-    if (file_meta->m_punch_hole) {
-      page_size_t page_size(space->flags);
-      /* Transparent compression is skipped if table compression is enabled. */
-      if (page_size.is_compressed() ||
-          space->compression_type == Compression::NONE) {
-        file_meta->m_punch_hole = false;
-      }
+    file_meta->m_alloc_size = alloc_bytes;
+    file_meta->m_file_index = num_data_files();
+    m_data_file_vector.push_back(file_ctx);
+
+    if (!by_ddl) {
+      /* Update total number of chunks. */
+      m_num_data_chunks += num_chunks;
+      m_num_current_chunks = m_num_data_chunks;
     }
   }
 
-  file_meta->m_file_index = m_num_data_files;
-
-  m_data_file_vector.push_back(file_meta);
-
-  ++m_num_data_files;
-
-  ut_ad(m_data_file_vector.size() == m_num_data_files);
+  /* All done if not a space file node like buffer pool dump file. */
+  if (node == nullptr) {
+    return 0;
+  }
 
-  /* Update total number of chunks. */
-  m_num_data_chunks += num_chunks;
-  m_num_current_chunks = m_num_data_chunks;
+  auto file_meta = file_ctx->get_file_meta();
 
   /* Update maximum file name length in snapshot. */
   if (file_meta->m_file_name_len > m_max_file_name_len) {
     m_max_file_name_len = static_cast<uint32_t>(file_meta->m_file_name_len);
   }
 
-  return (0);
-}
+  ut_ad(file_meta->m_deleted == file_ctx->deleted());
+  ut_ad(file_meta->m_renamed == file_ctx->renamed());
 
-dberr_t Clone_Snapshot::add_node(fil_node_t *node) {
-  ut_ad(m_snapshot_handle_type == CLONE_HDL_COPY);
+  if (by_ddl) {
+    file_ctx->set_ddl(get_state());
 
-  /* Exit if concurrent DDL in progress. */
-  if (is_ddl_temp_table(node)) {
-    my_error(ER_CLONE_DDL_IN_PROGRESS, MYF(0));
-    return (DB_ERROR);
+    /* Rebuild file name for renamed descriptor. */
+    if (file_ctx->renamed()) {
+      build_file_name(file_meta, name);
+    }
   }
 
+  /* Set space ID, compression and encryption attribute */
+  auto space = node->space;
+  file_meta->m_space_id = space->id;
+  file_meta->m_compress_type = space->compression_type;
+  file_meta->m_encrypt_type = space->encryption_type;
+  file_meta->m_fsp_flags = static_cast<uint32_t>(space->flags);
+  file_meta->m_punch_hole = node->punch_hole;
+  file_meta->m_fsblk_size = node->block_size;
+
+  /* Modify file meta encryption flag if space encryption or decryption
+  already started. This would allow clone to send pages accordingly
+  during page copy and persist the flag. */
+  if (space->encryption_op_in_progress == Encryption::Progress::DECRYPTION) {
+    fsp_flags_unset_encryption(file_meta->m_fsp_flags);
+
+  } else if (space->encryption_op_in_progress ==
+             Encryption::Progress::ENCRYPTION) {
+    fsp_flags_set_encryption(file_meta->m_fsp_flags);
+  }
+
+  /* If file node supports punch hole then check if we need it. */
+  if (file_meta->m_punch_hole) {
+    page_size_t page_size(space->flags);
+    /* Transparent compression is skipped if table compression is enabled. */
+    if (page_size.is_compressed() ||
+        space->compression_type == Compression::NONE) {
+      file_meta->m_punch_hole = false;
+    }
+  }
+
+  bool is_redo_copy = (get_state() == CLONE_SNAPSHOT_REDO_COPY);
+
+  /* Save current encryption key information. */
+  if (file_meta->m_encrypt_type != Encryption::NONE) {
+    memcpy(file_meta->m_encryption_key, space->encryption_key,
+           Encryption::KEY_LEN);
+    memcpy(file_meta->m_encryption_iv, space->encryption_iv,
+           Encryption::KEY_LEN);
+
+    /* All encrypted files created during PAGE_COPY state have their keys redo
+    logged. The recovered keys from redo log are encrypted by donor master key
+    and cannot be used is recipient. We send the keys explicitly in this case
+    to be encrypted by recipient with its own master key.
+
+    NOTE: encrypted files created during FILE_COPY state don't have this issue
+    as page-0 is always sent during PAGE_COPY with unencrypted data file key.
+
+    We always check for SSL connection before sending keys for encrypted tables
+    and error out for security. */
+    if (is_redo_copy && by_ddl) {
+      file_meta->m_transfer_encryption_key = true;
+    }
+  }
+
+  /* Add to hash map only for first node of the tablespace. */
+  auto space_id = file_meta->m_space_id;
+
+  if (m_data_file_map[space_id] == 0) {
+    m_data_file_map[space_id] = file_meta->m_file_index + 1;
+  }
+
+  return 0;
+}
+
+dberr_t Clone_Snapshot::add_node(fil_node_t *node, bool by_ddl) {
+  ut_ad(m_snapshot_handle_type == CLONE_HDL_COPY);
+
   auto space = node->space;
 
   /* Skip deleted tablespaces. Their pages may still be in
@@ -643,7 +847,9 @@
     return (DB_SUCCESS);
   }
 
-  if (space->encryption_type != Encryption::NONE) {
+  bool is_page_copy = (get_state() == CLONE_SNAPSHOT_PAGE_COPY);
+
+  if (by_ddl && is_page_copy && space->encryption_type != Encryption::NONE) {
     /* Add page 0 always for encrypted tablespace. */
     Clone_Page page_zero;
     page_zero.m_space_id = space->id;
@@ -672,22 +878,15 @@
   }
 
   /* Update estimation */
-  m_data_bytes_disk += alloc_size;
-  m_monitor.add_estimate(size_bytes);
-
-  /* Add file to snapshot. */
-  auto err = add_file(node->name, size_bytes, alloc_size, node, false);
-
-  if (err != 0) {
-    return (DB_ERROR);
+  if (!by_ddl) {
+    m_data_bytes_disk += alloc_size;
+    m_monitor.add_estimate(size_bytes);
   }
 
-  /* Add to hash map only for first node of the tablespace. */
-  if (m_data_file_map[space->id] == 0) {
-    m_data_file_map[space->id] = m_num_data_files;
-  }
+  /* Add file to snapshot. */
+  auto err = add_file(node->name, size_bytes, alloc_size, node, by_ddl);
 
-  return (DB_SUCCESS);
+  return (err != 0 ? DB_ERROR : DB_SUCCESS);
 }
 
 int Clone_Snapshot::add_page(space_id_t space_id, ib_uint32_t page_num) {
@@ -720,53 +919,51 @@
                                   uint64_t file_offset) {
   ut_ad(m_snapshot_handle_type == CLONE_HDL_COPY);
 
-  Clone_File_Meta *file_meta;
   uint num_chunks;
 
   /* Build redo file metadata and add to redo vector. */
-  file_meta = build_file(file_name, file_size, file_offset, num_chunks, true);
-
-  m_monitor.add_estimate(file_meta->m_file_size - file_offset);
-
-  if (file_meta == nullptr) {
+  auto file_ctx = build_file(file_name, file_size, file_offset, num_chunks);
+  if (file_ctx == nullptr) {
     return (ER_OUTOFMEMORY);
   }
 
+  auto file_meta = file_ctx->get_file_meta();
+  m_monitor.add_estimate(file_meta->m_file_size - file_offset);
+
   /* Set the start offset for first redo file. This could happen
   if redo archiving was already in progress, possibly by another
   concurrent snapshot. */
-  if (m_num_redo_files == 0) {
+  if (num_redo_files() == 0) {
     m_redo_start_offset = file_offset;
   } else {
     ut_ad(file_offset == 0);
   }
 
   file_meta->m_alloc_size = 0;
-
   file_meta->m_space_id = dict_sys_t::s_log_space_first_id;
-  file_meta->m_compress_type = Compression::NONE;
 
   /* Fill encryption type from redo tablespace. */
   auto redo_space = fil_space_get(dict_sys_t::s_log_space_first_id);
   file_meta->m_encrypt_type = redo_space->encryption_type;
 
-  file_meta->m_fsp_flags = UINT32_UNDEFINED;
-  file_meta->m_punch_hole = false;
-  file_meta->m_fsblk_size = 0;
+  if (file_meta->m_encrypt_type != Encryption::NONE) {
+    const byte *key = redo_space->encryption_key;
+    const byte *iv = redo_space->encryption_iv;
+    byte *dest = m_redo_header + LOG_ENCRYPTION;
 
-  file_meta->m_file_index = m_num_redo_files;
+    log_file_header_fill_encryption(dest, key, iv, false, false);
+  }
 
-  m_redo_file_vector.push_back(file_meta);
-  ++m_num_redo_files;
+  file_meta->m_file_index = num_redo_files();
 
-  ut_ad(m_redo_file_vector.size() == m_num_redo_files);
+  m_redo_file_vector.push_back(file_ctx);
 
   m_num_redo_chunks += num_chunks;
   m_num_current_chunks = m_num_redo_chunks;
 
   /* In rare case of small redo file, large concurrent DMLs and
   slow data transfer. Currently we support maximum 1k redo files. */
-  if (m_num_redo_files > SRV_N_LOG_FILES_CLONE_MAX) {
+  if (num_redo_files() > SRV_N_LOG_FILES_CLONE_MAX) {
     my_error(ER_INTERNAL_ERROR, MYF(0),
              "More than 1000 archived redo files. Please retry clone.");
     return (ER_INTERNAL_ERROR);
@@ -826,6 +1023,14 @@
                                       bool is_start) {
   ut_ad(m_clone_handle_type == CLONE_HDL_COPY);
 
+  /* Before starting state, check and send any new metadata added by DDL. */
+  if (is_start) {
+    auto err = send_all_ddl_metadata(task, callback);
+    if (err != 0) {
+      return err; /* purecov: inspected */
+    }
+  }
+
   Clone_Desc_State state_desc;
   state_desc.init_header(get_version());
 
@@ -885,22 +1090,32 @@
   ut_ad(m_clone_handle_type == CLONE_HDL_COPY);
 
   if (!task->m_is_master) {
-    return (0);
+    return 0;
   }
 
+  DEBUG_SYNC_C("clone_before_init_meta");
+
   auto snapshot = m_clone_task_manager.get_snapshot();
+  bool is_redo = (snapshot->get_state() == CLONE_SNAPSHOT_REDO_COPY);
 
   /* Send all file metadata for data/redo files */
-  auto err = snapshot->iterate_files([&](Clone_File_Meta *file_meta) {
-    return (send_file_metadata(task, file_meta, callback));
+  auto err = snapshot->iterate_files([&](Clone_file_ctx *file_ctx) {
+    auto file_meta = file_ctx->get_file_meta();
+    /* While sending initial metadata, reset the DDL state so that
+    recipient could create the files as new file. */
+    Clone_File_Meta local_meta = *file_meta;
+    local_meta.reset_ddl();
+
+    auto err_file = send_file_metadata(task, &local_meta, is_redo, callback);
+    return err_file;
   });
 
-  return (err);
+  return err;
 }
 
 int Clone_Handle::send_file_metadata(Clone_Task *task,
-                                     Clone_File_Meta *file_meta,
-                                     Ha_clone_cbk *callback) {
+                                     const Clone_File_Meta *file_meta,
+                                     bool is_redo, Ha_clone_cbk *callback) {
   ut_ad(m_clone_handle_type == CLONE_HDL_COPY);
 
   auto snapshot = m_clone_task_manager.get_snapshot();
@@ -910,12 +1125,13 @@
   file_desc.m_file_meta = *file_meta;
   file_desc.m_state = snapshot->get_state();
 
-  if (file_desc.m_state == CLONE_SNAPSHOT_REDO_COPY) {
+  if (is_redo) {
     /* For Redo log always send the fixed redo file size. */
     file_desc.m_file_meta.m_file_size = snapshot->get_redo_file_size();
 
     file_desc.m_file_meta.m_file_name = nullptr;
     file_desc.m_file_meta.m_file_name_len = 0;
+    file_desc.m_file_meta.m_file_name_alloc_len = 0;
 
   } else if (file_meta->m_space_id == dict_sys_t::s_invalid_space_id) {
     /* Server buffer dump file ib_buffer_pool. */
@@ -927,11 +1143,11 @@
     file_desc.m_file_meta.m_file_name_len =
         static_cast<uint32_t>(strlen(SRV_BUF_DUMP_FILENAME_DEFAULT)) + 1;
 
+    file_desc.m_file_meta.m_file_name_alloc_len = 0;
+
   } else if (!fsp_is_ibd_tablespace(
                  static_cast<space_id_t>(file_meta->m_space_id))) {
     /* For system tablespace, remove path. */
-    ut_ad(file_desc.m_state == CLONE_SNAPSHOT_FILE_COPY);
-
     auto name_ptr = strrchr(file_meta->m_file_name, OS_PATH_SEPARATOR);
 
     if (name_ptr != nullptr) {
@@ -941,6 +1157,7 @@
       file_desc.m_file_meta.m_file_name_len =
           static_cast<uint32_t>(strlen(name_ptr)) + 1;
     }
+    file_desc.m_file_meta.m_file_name_alloc_len = 0;
   }
 
   file_desc.init_header(get_version());
@@ -962,12 +1179,13 @@
   return (err);
 }
 
-int Clone_Handle::send_data(Clone_Task *task, Clone_File_Meta *file_meta,
-                            uint64_t offset, byte *buffer, uint size,
-                            Ha_clone_cbk *callback) {
+int Clone_Handle::send_data(Clone_Task *task, const Clone_file_ctx *file_ctx,
+                            uint64_t offset, byte *buffer, uint32_t size,
+                            uint64_t new_file_size, Ha_clone_cbk *callback) {
   ut_ad(m_clone_handle_type == CLONE_HDL_COPY);
 
   auto snapshot = m_clone_task_manager.get_snapshot();
+  auto file_meta = file_ctx->get_file_meta_read();
 
   /* Build data descriptor */
   Clone_Desc_Data data_desc;
@@ -981,6 +1199,13 @@
   data_desc.m_file_offset = offset;
   data_desc.m_file_size = file_meta->m_file_size;
 
+  /* Adjust file size to extend automatically while copying page 0. */
+  if (new_file_size > data_desc.m_file_size) {
+    ut_ad(snapshot->get_state() == CLONE_SNAPSHOT_PAGE_COPY);
+    ut_ad(offset == 0);
+    data_desc.m_file_size = new_file_size;
+  }
+
   /* Serialize data descriptor and set in callback */
   auto desc_len = task->m_alloc_len;
   data_desc.serialize(task->m_serial_desc, desc_len, nullptr);
@@ -1004,7 +1229,8 @@
   } else {
     /* Send data from file. */
     if (task->m_current_file_des.m_file == OS_FILE_CLOSED) {
-      err = open_file(task, file_meta, file_type, false, false);
+      File_init_cbk empty_cbk;
+      err = open_file(task, file_ctx, file_type, false, empty_cbk);
 
       if (err != 0) {
         return (err);
@@ -1143,7 +1369,7 @@
       /* No more chunks in current state. Transit to next state. */
 
       /* Close the last open file before proceeding to next state */
-      err = close_file(task);
+      err = close_and_unpin_file(task);
 
       if (err != 0) {
         break;
@@ -1181,9 +1407,11 @@
     }
   }
 
-  /* Close the last open file after error. */
-  if (err != 0) {
-    close_file(task);
+  /* Close the last open file. */
+  auto err2 = close_and_unpin_file(task);
+
+  if (err == 0) {
+    err = err2;
   }
 
   return (err);
@@ -1193,33 +1421,133 @@
                                 uint32_t block_num, Ha_clone_cbk *callback) {
   ut_ad(m_clone_handle_type == CLONE_HDL_COPY);
 
-  Clone_File_Meta file_meta;
-
   auto &task_meta = task->m_task_meta;
 
-  file_meta.m_file_index = 0;
-
   /* If chunks are in increasing order, optimize file
   search by index */
+  uint32_t file_index_hint = 0;
+
   if (task_meta.m_chunk_num <= chunk_num) {
-    file_meta.m_file_index = task->m_current_file_index;
+    file_index_hint = task->m_current_file_index;
   }
 
-  auto snapshot = m_clone_task_manager.get_snapshot();
   auto state = m_clone_task_manager.get_state();
+  bool is_page_copy = (state == CLONE_SNAPSHOT_PAGE_COPY);
+  bool is_redo_copy = (state == CLONE_SNAPSHOT_REDO_COPY);
+
+  /* Except for page copy, file remains same for all blocks of a chunk. */
+  auto snapshot = m_clone_task_manager.get_snapshot();
+
+  const auto *file_ctx =
+      snapshot->get_file_ctx(chunk_num, block_num, file_index_hint);
+
+  const Clone_File_Meta *file_meta = nullptr;
+
+  /* For page copy, file context is null if current chunk is over. */
+  ut_ad(is_page_copy || file_ctx != nullptr);
+
+  if (file_ctx != nullptr) {
+    file_meta = file_ctx->get_file_meta_read();
+  }
 
   /* Loop over all the blocks of current chunk and send data. */
   int err = 0;
 
+  uint32_t pin_loop_count = 0;
+  uint32_t unpin_count = snapshot->get_max_blocks_pin();
+
   while (err == 0) {
+    /* For page copy same chunk might have pages from different files. */
+    if (is_page_copy) {
+      file_ctx = snapshot->get_file_ctx(chunk_num, block_num, 0);
+      if (file_ctx == nullptr) {
+        /* Already handled all pages. */
+        break;
+      }
+      file_meta = file_ctx->get_file_meta_read();
+    }
+
+    bool pins_other;
+    bool pins_current;
+
+    std::tie(pins_current, pins_other) = pins_file(task, file_ctx);
+
+    /* Let any waiting DDL file operation to proceed after handling a
+    set of data blocks. */
+    bool allow_ddl =
+        snapshot->blocks_clone(file_ctx) && (pin_loop_count >= unpin_count);
+
+    if (pins_other || (pins_current && allow_ddl)) {
+      err = close_and_unpin_file(task);
+      if (err != 0) {
+        break; /* purecov: inspected */
+      }
+      pin_loop_count = 0;
+    }
+
+    bool delete_action = false;
+
+    auto mutable_ctx = const_cast<Clone_file_ctx *>(file_ctx);
+
+    err = check_and_pin_file(task, mutable_ctx, delete_action);
+
+    if (err != 0) {
+      break; /* purecov: inspected */
+    }
+
+    ++pin_loop_count;
+
+    /* Check if file is already deleted. */
+    if (file_ctx->deleted()) {
+      /* One task get to handle the deleted file chunks. Other tasks can ignore
+      the chunks of a deleted file */
+      if (delete_action) {
+        auto delete_file_meta = *file_meta;
+        delete_file_meta.set_deleted_chunk(chunk_num);
+        err = send_file_metadata(task, &delete_file_meta, false, callback);
+      }
+
+      auto err2 = close_and_unpin_file(task);
+      if (err == 0) {
+        err = err2;
+      }
+
+      if (err != 0) {
+        break; /* purecov: inspected */
+      }
+
+      /* Send deleted block, to check recipient can handle it. It otherwise is
+      hit only in rare concurrency case. */
+      DBUG_EXECUTE_IF("clone_send_deleted_block", {
+        if (delete_action && is_page_copy) {
+          auto data_buf = task->m_current_buffer;
+          send_data(task, file_ctx, 0, data_buf, UNIV_PAGE_SIZE, 0, callback);
+        }
+      });
+
+      snapshot->skip_deleted_blocks(chunk_num, block_num);
+
+      /* No more blocks in current chunk. */
+      if (block_num == 0) {
+        break;
+      }
+
+      /* Only in page copy state we can have more blocks belonging to
+      another tablespace. */
+      ut_ad(is_page_copy);
+      continue;
+    }
+
+    /* Get next block from snapshot */
     auto data_buf = task->m_current_buffer;
     auto data_size = task->m_buffer_alloc_len;
+    uint64_t data_offset = 0;
+    uint64_t file_size = 0;
 
-    /* Get next block from snapshot */
-    ib_uint64_t data_offset;
+    err = snapshot->get_next_block(chunk_num, block_num, file_ctx, data_offset,
+                                   data_buf, data_size, file_size);
 
-    err = snapshot->get_next_block(chunk_num, block_num, &file_meta,
-                                   data_offset, data_buf, data_size);
+    file_meta = file_ctx->get_file_meta_read();
 
     /* '0' block number indicates no more blocks. */
     if (err != 0 || block_num == 0) {
@@ -1236,40 +1564,35 @@
     task->m_task_meta.m_block_num = block_num;
     task->m_task_meta.m_chunk_num = chunk_num;
 
-    if (state != CLONE_SNAPSHOT_PAGE_COPY &&
-        (task->m_current_file_des.m_file == OS_FILE_CLOSED ||
-         task->m_current_file_index != file_meta.m_file_index)) {
-      /* We are moving to next file. Close the current file and
-      send metadata for the next file. */
-
-      err = close_file(task);
-
+    /* During redo copy, worker could be ahead of master and needs to
+    send the metadata */
+    if (is_redo_copy && !pins_current) {
+      err = send_file_metadata(task, file_meta, true, callback);
       if (err != 0) {
         break;
       }
+    }
 
-      /* During redo copy, worker could be ahead of master and needs to
-      send the metadata */
-      if (state == CLONE_SNAPSHOT_REDO_COPY) {
-        err = send_file_metadata(task, &file_meta, callback);
-      }
-
-      if (err != 0) {
-        break;
+    /* For remote clone, donor clone threads cannot be controlled
+    by debug sync and hence need to release PIN after every page so as
+    to fire concurrent DDLs after blocking clone in apply. In file copy
+    state we cannot release the PIN as we could be reading the file
+    while sending data after this point. */
+    DBUG_EXECUTE_IF("remote_release_clone_file_pin", {
+      if (is_page_copy) {
+        close_and_unpin_file(task);
       }
-    }
+    };);
 
-    if (data_size == 0) {
-      continue;
+    if (data_size != 0) {
+      err = send_data(task, file_ctx, data_offset, data_buf, data_size,
+                      file_size, callback);
     }
-
-    err =
-        send_data(task, &file_meta, data_offset, data_buf, data_size, callback);
   }
 
   /* Save current error and file name. */
   if (err != 0) {
-    m_clone_task_manager.set_error(err, file_meta.m_file_name);
+    m_clone_task_manager.set_error(err, file_meta->m_file_name);
   }
 
   return (err);
@@ -1342,3 +1665,119 @@
 
   return (0);
 }
+
+int Clone_Handle::check_and_pin_file(Clone_Task *task, Clone_file_ctx *file_ctx,
+                                     bool &handle_deleted) {
+  bool pin_current;
+  bool pin_other;
+  std::tie(pin_current, pin_other) = pins_file(task, file_ctx);
+
+  handle_deleted = false;
+
+  /* Nothing to do, the file is already pinned. */
+  if (pin_current) {
+    ut_ad(task->m_pinned_file);
+    return 0;
+  }
+
+  /* If pinning any other file, release it. */
+  if (pin_other) {
+    /* purecov: begin inspected */
+    auto err2 = close_and_unpin_file(task);
+    if (err2 != 0) {
+      return err2;
+    }
+    /* purecov: end */
+  }
+
+  auto snapshot = m_clone_task_manager.get_snapshot();
+  auto err = snapshot->pin_file(file_ctx, handle_deleted);
+
+  if (err == 0) {
+    task->m_pinned_file = true;
+    const auto file_meta = file_ctx->get_file_meta_read();
+    task->m_current_file_index = file_meta->m_file_index;
+  }
+
+  return err;
+}
+
+int Clone_Handle::close_and_unpin_file(Clone_Task *task) {
+  /* Close open file if there. */
+  auto err = close_file(task);
+
+  /* Task doesn't hold any pin. */
+  if (!task->m_pinned_file) {
+    return err;
+  }
+
+  auto snapshot = m_clone_task_manager.get_snapshot();
+  auto file_ctx = snapshot->get_file_ctx_by_index(task->m_current_file_index);
+
+  if (file_ctx == nullptr) {
+    /* purecov: begin deadcode */
+    ut_ad(false);
+    err = ER_INTERNAL_ERROR;
+    my_error(ER_INTERNAL_ERROR, MYF(0), "Clone file missing before unpin");
+    return err;
+    /* purecov: end */
+  }
+
+  snapshot->unpin_file(file_ctx);
+
+  task->m_pinned_file = false;
+  task->m_current_file_index = 0;
+  return err;
+}
+
+std::tuple<bool, bool> Clone_Handle::pins_file(const Clone_Task *task,
+                                               const Clone_file_ctx *file_ctx) {
+  /* Task doesn't hold any pin. */
+  if (!task->m_pinned_file) {
+    return std::make_tuple(false, false);
+  }
+
+  const auto file_meta = file_ctx->get_file_meta_read();
+  /* Task pins input file. */
+  if (task->m_current_file_index == file_meta->m_file_index) {
+    return std::make_tuple(true, false);
+  }
+
+  /* Task pins other file. */
+  return std::make_tuple(false, true);
+}
+
+int Clone_Handle::send_all_ddl_metadata(Clone_Task *task,
+                                        Ha_clone_cbk *callback) {
+  ut_ad(m_clone_handle_type == CLONE_HDL_COPY);
+
+  if (!task->m_is_master) {
+    return 0;
+  }
+  auto state = m_clone_task_manager.get_state();
+
+  /* Send DDL metadata added during 'file copy' and 'page copy' in the
+  beginning of next stage. */
+  if (state != CLONE_SNAPSHOT_PAGE_COPY && state != CLONE_SNAPSHOT_REDO_COPY) {
+    return 0;
+  }
+
+  ut_d(m_clone_task_manager.debug_wait_ddl_meta());
+
+  auto snapshot = m_clone_task_manager.get_snapshot();
+
+  /* Send all file metadata for data/redo files */
+  auto err = snapshot->iterate_data_files([&](Clone_file_ctx *file_ctx) {
+    /* Skip entries if not modified by ddl in previous state. */
+    if (!file_ctx->by_ddl(state)) {
+      return 0;
+    }
+
+    auto file_meta = file_ctx->get_file_meta();
+    auto err_file = send_file_metadata(task, file_meta, false, callback);
+
+    return err_file;
+  });
+
+  return err;
+}
diff -Nru mysql-8.0-8.0.26/storage/innobase/clone/clone0desc.cc mysql-8.0-8.0.27/storage/innobase/clone/clone0desc.cc
--- mysql-8.0-8.0.26/storage/innobase/clone/clone0desc.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/clone/clone0desc.cc	2021-09-28 11:46:34.000000000 +0000
@@ -30,6 +30,7 @@
  *******************************************************/
 
 #include "clone0desc.h"
+#include "dict0dict.h"
 #include "mach0data.h"
 
 /** Maximum supported descriptor version. The version represents the current
@@ -624,6 +625,12 @@
 static const uint CLONE_DESC_FILE_FLAG_LZ4 = 2;
 /** Clone File Flag: Encryption type AES */
 static const uint CLONE_DESC_FILE_FLAG_AES = 3;
+/** Clone File Flag: File is renamed. */
+static const uint CLONE_DESC_FILE_FLAG_RENAMED = 4;
+/** Clone File Flag: File is deleted. */
+static const uint CLONE_DESC_FILE_FLAG_DELETED = 5;
+/** Clone File Flag: File metadata has encryption key. */
+static const uint CLONE_DESC_FILE_HAS_KEY = 6;
 
 /** File Metadata: Tablespace ID in 4 bytes */
 static const uint CLONE_FILE_SPACE_ID_OFFSET = CLONE_FILE_FLAGS_OFFSET + 2;
@@ -652,6 +659,11 @@
   m_header.m_length = CLONE_FILE_BASE_LEN;
   m_header.m_length += static_cast<uint>(m_file_meta.m_file_name_len);
 
+  if (m_file_meta.m_transfer_encryption_key) {
+    m_header.m_length += sizeof(m_file_meta.m_encryption_key);
+    m_header.m_length += sizeof(m_file_meta.m_encryption_iv);
+  }
+
   m_header.m_type = CLONE_DESC_FILE_METADATA;
 }
 
@@ -690,6 +702,19 @@
   if (m_file_meta.m_encrypt_type == Encryption::AES) {
     DESC_SET_FLAG(file_flags, CLONE_DESC_FILE_FLAG_AES);
   }
+  /* Set file renamed attribute */
+  if (m_file_meta.m_renamed) {
+    DESC_SET_FLAG(file_flags, CLONE_DESC_FILE_FLAG_RENAMED);
+  }
+  /* Set file deleted attribute */
+  if (m_file_meta.m_deleted) {
+    DESC_SET_FLAG(file_flags, CLONE_DESC_FILE_FLAG_DELETED);
+  }
+
+  if (m_file_meta.m_transfer_encryption_key) {
+    DESC_SET_FLAG(file_flags, CLONE_DESC_FILE_HAS_KEY);
+  }
+
   mach_write_to_2(desc_file + CLONE_FILE_FLAGS_OFFSET, file_flags);
 
   mach_write_to_4(desc_file + CLONE_FILE_SPACE_ID_OFFSET,
@@ -710,6 +735,20 @@
            static_cast<const void *>(m_file_meta.m_file_name),
            m_file_meta.m_file_name_len);
   }
+
+  auto dest_key =
+      desc_file + CLONE_FILE_FNAME_OFFSET + m_file_meta.m_file_name_len;
+
+  /* Append Encryption key information if requested. */
+  if (m_file_meta.m_transfer_encryption_key) {
+    memcpy(dest_key, m_file_meta.m_encryption_key,
+           sizeof(m_file_meta.m_encryption_key));
+
+    dest_key += sizeof(m_file_meta.m_encryption_key);
+
+    memcpy(dest_key, m_file_meta.m_encryption_iv,
+           sizeof(m_file_meta.m_encryption_iv));
+  }
 }
 
 bool Clone_Desc_File_MetaData::deserialize(const byte *desc_file,
@@ -754,6 +793,14 @@
     m_file_meta.m_encrypt_type = Encryption::AES;
   }
 
+  /* Get file renamed attribute */
+  m_file_meta.m_renamed =
+      DESC_CHECK_FLAG(file_flags, CLONE_DESC_FILE_FLAG_RENAMED);
+
+  /* Get file renamed attribute */
+  m_file_meta.m_deleted =
+      DESC_CHECK_FLAG(file_flags, CLONE_DESC_FILE_FLAG_DELETED);
+
   m_file_meta.m_space_id =
       mach_read_from_4(desc_file + CLONE_FILE_SPACE_ID_OFFSET);
   m_file_meta.m_file_index =
@@ -767,14 +814,15 @@
   m_file_meta.m_file_name_len =
       mach_read_from_4(desc_file + CLONE_FILE_FNAMEL_OFFSET);
 
-  ut_ad(m_header.m_length ==
-        CLONE_FILE_FNAME_OFFSET + m_file_meta.m_file_name_len);
+  m_file_meta.m_file_name_alloc_len = 0;
 
   /* Check if we have enough length. */
   if (desc_len < m_file_meta.m_file_name_len) {
     return (false);
   }
 
+  desc_len -= m_file_meta.m_file_name_len;
+
   if (m_file_meta.m_file_name_len == 0) {
     m_file_meta.m_file_name = nullptr;
   } else {
@@ -787,6 +835,39 @@
       return (false);
     }
   }
+
+  /* Check if encryption key is transferred. */
+  m_file_meta.m_transfer_encryption_key =
+      DESC_CHECK_FLAG(file_flags, CLONE_DESC_FILE_HAS_KEY);
+
+  /* Extract Encryption key information if transferred. */
+  if (m_file_meta.m_transfer_encryption_key) {
+    auto src_key =
+        desc_file + CLONE_FILE_FNAME_OFFSET + m_file_meta.m_file_name_len;
+
+    /* Check if we have enough length. */
+    if (desc_len < (sizeof(m_file_meta.m_encryption_key) +
+                    sizeof(m_file_meta.m_encryption_iv))) {
+      return false; /* purecov: inspected */
+    }
+
+    memcpy(m_file_meta.m_encryption_key, src_key,
+           sizeof(m_file_meta.m_encryption_key));
+
+    src_key += sizeof(m_file_meta.m_encryption_key);
+
+    memcpy(m_file_meta.m_encryption_iv, src_key,
+           sizeof(m_file_meta.m_encryption_iv));
+
+    ut_ad(m_header.m_length == CLONE_FILE_FNAME_OFFSET +
+                                   sizeof(m_file_meta.m_encryption_key) +
+                                   sizeof(m_file_meta.m_encryption_iv) +
+                                   m_file_meta.m_file_name_len);
+  } else {
+    ut_ad(m_header.m_length ==
+          CLONE_FILE_FNAME_OFFSET + m_file_meta.m_file_name_len);
+  }
+
   return (true);
 }
 
@@ -985,3 +1066,31 @@
 
   return (true);
 }
+
+void Clone_File_Meta::init() {
+  m_file_index = 0;
+  m_file_name = nullptr;
+  m_file_name_len = 0;
+  m_file_name_alloc_len = 0;
+
+  m_file_size = 0;
+  m_alloc_size = 0;
+
+  m_space_id = dict_sys_t::s_invalid_space_id;
+  m_fsp_flags = UINT32_UNDEFINED;
+
+  m_compress_type = Compression::NONE;
+  m_encrypt_type = Encryption::NONE;
+  m_punch_hole = false;
+  m_fsblk_size = 0;
+
+  memset(m_encryption_key, 0, sizeof(m_encryption_key));
+  memset(m_encryption_iv, 0, sizeof(m_encryption_iv));
+
+  m_transfer_encryption_key = false;
+
+  m_begin_chunk = 0;
+  m_end_chunk = 0;
+
+  reset_ddl();
+}
diff -Nru mysql-8.0-8.0.26/storage/innobase/clone/clone0repl.cc mysql-8.0-8.0.27/storage/innobase/clone/clone0repl.cc
--- mysql-8.0-8.0.26/storage/innobase/clone/clone0repl.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/clone/clone0repl.cc	2021-09-28 11:46:34.000000000 +0000
@@ -51,15 +51,13 @@
   }
   ut_ad(trx_sys_serialisation_mutex_own());
 
-  /* If too many GTIDs are accumulated, wait for all to get flushed. */
-  while (check_max_gtid_threshold()) {
+  /* If too many GTIDs are accumulated, wait for all to get flushed. Ignore
+  timeout and loop to avoid possible hang. The insert should already be
+  slowed down by the wait here. */
+  if (check_max_gtid_threshold() && is_thread_active()) {
     trx_sys_serialisation_mutex_exit();
     wait_flush(false, false, nullptr);
     trx_sys_serialisation_mutex_enter();
-    /* Starvation is possible theoretically here, if the active list gets
-    filled to threshold before a transaction could get hold of the mutex
-    after being woken up. Practically not feasible as the number of waiting
-    transactions at any point in time is far less than the threshold. */
   }
 
   ut_ad(trx_sys_serialisation_mutex_own());
@@ -562,7 +560,7 @@
 }
 
 void Clone_persist_gtid::periodic_write() {
-  auto thd = create_thd(false, true, true, PSI_NOT_INSTRUMENTED);
+  auto thd = create_internal_thd();
 
   /* Allow GTID to be persisted on read only server. */
   thd->set_skip_readonly_check();
@@ -621,7 +619,7 @@
   }
 
   m_active.store(false);
-  destroy_thd(thd);
+  destroy_internal_thd(thd);
   m_thread_active.store(false);
 }
 
@@ -700,7 +698,7 @@
   }
 
   srv_threads.m_gtid_persister =
-      os_thread_create(clone_gtid_thread_key, clone_gtid_thread, this);
+      os_thread_create(clone_gtid_thread_key, 0, clone_gtid_thread, this);
   srv_threads.m_gtid_persister.start();
 
   if (!wait_thread(true, false, 0, false, false, nullptr)) {
diff -Nru mysql-8.0-8.0.26/storage/innobase/clone/clone0snapshot.cc mysql-8.0-8.0.27/storage/innobase/clone/clone0snapshot.cc
--- mysql-8.0-8.0.26/storage/innobase/clone/clone0snapshot.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/clone/clone0snapshot.cc	2021-09-28 11:46:34.000000000 +0000
@@ -30,6 +30,7 @@
  *******************************************************/
 
 #include "clone0snapshot.h"
+#include "clone0clone.h"
 #include "page0zip.h"
 #include "sql/handler.h"
 
@@ -46,15 +47,14 @@
       m_snapshot_type(clone_type),
       m_snapshot_id(snap_id),
       m_snapshot_arr_idx(arr_idx),
-      m_allow_new_clone(true),
+      m_num_blockers(),
+      m_aborted(false),
       m_num_clones(),
-      m_num_clones_current(),
-      m_num_clones_next(),
+      m_num_clones_transit(),
       m_snapshot_state(CLONE_SNAPSHOT_INIT),
       m_snapshot_next_state(CLONE_SNAPSHOT_NONE),
       m_num_current_chunks(),
       m_max_file_name_len(),
-      m_num_data_files(),
       m_num_data_chunks(),
       m_data_bytes_disk(),
       m_page_ctx(false),
@@ -68,7 +68,6 @@
       m_redo_trailer_size(),
       m_redo_trailer_offset(),
       m_redo_file_size(),
-      m_num_redo_files(),
       m_num_redo_chunks(),
       m_enable_pfs(false) {
   mutex_create(LATCH_ID_CLONE_SNAPSHOT, &m_snapshot_mutex);
@@ -109,7 +108,7 @@
 
   switch (m_snapshot_state) {
     case CLONE_SNAPSHOT_FILE_COPY:
-      state_desc->m_num_files = m_num_data_files;
+      state_desc->m_num_files = num_data_files();
       break;
 
     case CLONE_SNAPSHOT_PAGE_COPY:
@@ -117,7 +116,7 @@
       break;
 
     case CLONE_SNAPSHOT_REDO_COPY:
-      state_desc->m_num_files = m_num_redo_files;
+      state_desc->m_num_files = num_redo_files();
 
       /* Minimum of two redo files need to be created. */
       if (state_desc->m_num_files < 2) {
@@ -126,7 +125,7 @@
       break;
 
     case CLONE_SNAPSHOT_DONE:
-      /* fall thorugh */
+      [[fallthrough]];
 
     case CLONE_SNAPSHOT_INIT:
       state_desc->m_num_files = 0;
@@ -139,15 +138,14 @@
 
 void Clone_Snapshot::set_state_info(Clone_Desc_State *state_desc) {
   ut_ad(mutex_own(&m_snapshot_mutex));
-  ut_ad(state_desc->m_state == m_snapshot_state);
 
+  m_snapshot_state = state_desc->m_state;
   m_num_current_chunks = state_desc->m_num_chunks;
 
   if (m_snapshot_state == CLONE_SNAPSHOT_FILE_COPY) {
-    m_num_data_files = state_desc->m_num_files;
     m_num_data_chunks = state_desc->m_num_chunks;
     m_data_bytes_disk = state_desc->m_estimate_disk;
-    m_data_file_vector.resize(m_num_data_files, nullptr);
+    m_data_file_vector.resize(state_desc->m_num_files, nullptr);
 
     m_monitor.init_state(srv_stage_clone_file_copy.m_key, m_enable_pfs);
     m_monitor.add_estimate(state_desc->m_estimate);
@@ -161,9 +159,8 @@
     m_monitor.change_phase();
 
   } else if (m_snapshot_state == CLONE_SNAPSHOT_REDO_COPY) {
-    m_num_redo_files = state_desc->m_num_files;
     m_num_redo_chunks = state_desc->m_num_chunks;
-    m_redo_file_vector.resize(m_num_redo_files, nullptr);
+    m_redo_file_vector.resize(state_desc->m_num_files, nullptr);
 
     m_monitor.init_state(srv_stage_clone_redo_copy.m_key, m_enable_pfs);
     m_monitor.add_estimate(state_desc->m_estimate);
@@ -214,178 +211,160 @@
   bool ret = false;
   mutex_enter(&m_snapshot_mutex);
 
-  if (m_num_clones == 0) {
-    m_enable_pfs = pfs_monitor;
-  }
-
-  if (m_allow_new_clone && hdl_type == m_snapshot_handle_type &&
+  if (hdl_type == m_snapshot_handle_type &&
       m_num_clones < MAX_CLONES_PER_SNAPSHOT) {
     ++m_num_clones;
+    m_enable_pfs = pfs_monitor;
 
-    if (in_transit_state()) {
-      ++m_num_clones_current;
-    }
-
+    ut_ad(!in_transit_state());
     ret = true;
   }
 
   mutex_exit(&m_snapshot_mutex);
-  return (ret);
+  return ret;
 }
 
-uint Clone_Snapshot::detach() {
-  uint num_clones_left;
-
+void Clone_Snapshot::detach() {
   mutex_enter(&m_snapshot_mutex);
 
   ut_ad(m_num_clones > 0);
+  ut_ad(!in_transit_state());
 
-  if (in_transit_state()) {
-    --m_num_clones_current;
-  }
-
-  num_clones_left = --m_num_clones;
+  --m_num_clones;
+  ut_ad(m_num_clones == 0);
 
   mutex_exit(&m_snapshot_mutex);
-
-  return (num_clones_left);
 }
 
-int Clone_Snapshot::change_state(Clone_Desc_State *state_desc,
-                                 Snapshot_State new_state, byte *temp_buffer,
-                                 uint temp_buffer_len, Clone_Alert_Func cbk,
-                                 uint &pending_clones) {
-  ut_ad(m_snapshot_state != CLONE_SNAPSHOT_NONE);
-
-  mutex_enter(&m_snapshot_mutex);
+bool Clone_Snapshot::is_aborted() const {
+  ut_ad(mutex_own(&m_snapshot_mutex));
+  return m_aborted;
+}
 
-  if (m_snapshot_state != CLONE_SNAPSHOT_INIT) {
-    m_allow_new_clone = false;
-  }
+void Clone_Snapshot::set_abort() {
+  IB_mutex_guard guard(&m_snapshot_mutex);
+  m_aborted = true;
+  ib::info(ER_IB_CLONE_OPERATION) << "Clone Snapshot aborted";
+}
 
-  /* Initialize transition if not started yet by other clones. */
-  if (!in_transit_state()) {
-    m_num_clones_current = m_num_clones;
+Clone_Snapshot::State_transit::State_transit(Clone_Snapshot *snapshot,
+                                             Snapshot_State new_state)
+    : m_snapshot(snapshot) {
+  mutex_enter(&m_snapshot->m_snapshot_mutex);
 
-    m_snapshot_next_state = new_state;
-    m_num_clones_next = 0;
-  }
+  ut_ad(!m_snapshot->in_transit_wait());
+  ut_ad(!m_snapshot->in_transit_state());
 
-  /* Move clone over to next state */
-  --m_num_clones_current;
-  ++m_num_clones_next;
+  m_snapshot->begin_transit_ddl_wait();
+  ut_ad(m_snapshot->in_transit_wait());
 
-  pending_clones = m_num_clones_current;
+  /* Wait for DDLs blocking clone state transition. */
+  m_error = m_snapshot->wait(Wait_type::STATE_BLOCKER, nullptr, false, true);
 
-  /* Need to wait for other clones to move over. */
-  if (pending_clones > 0) {
-    mutex_exit(&m_snapshot_mutex);
-    return (0);
+  if (m_error != 0) {
+    return; /* purecov: inspected */
   }
 
-  /* Last clone requesting the state change. All other clones have
-  already moved over to next state and waiting for the transition
-  to complete. Now it is safe to do the snapshot state transition. */
-  m_snapshot_state = m_snapshot_next_state;
-
-  m_snapshot_next_state = CLONE_SNAPSHOT_NONE;
-
-  m_num_clones_current = 0;
-  m_num_clones_next = 0;
+  m_snapshot->begin_transit(new_state);
+  ut_ad(m_snapshot->in_transit_state());
+}
 
-  /* Initialize the new state. */
-  auto err = init_state(state_desc, temp_buffer, temp_buffer_len, cbk);
+Clone_Snapshot::State_transit::~State_transit() {
+  if (m_error == 0) {
+    m_snapshot->end_transit(m_error);
+  }
 
-  mutex_exit(&m_snapshot_mutex);
+  ut_ad(!m_snapshot->in_transit_state());
+  ut_ad(!m_snapshot->in_transit_wait());
 
-  return (err);
+  mutex_exit(&m_snapshot->m_snapshot_mutex);
 }
 
-uint Clone_Snapshot::check_state(Snapshot_State new_state, bool exit_on_wait) {
-  uint pending_clones;
-
-  mutex_enter(&m_snapshot_mutex);
-
-  pending_clones = 0;
-  if (in_transit_state() && new_state == m_snapshot_next_state) {
-    pending_clones = m_num_clones_current;
-  }
+Clone_File_Meta *Clone_Snapshot::get_file_by_index(uint index) {
+  auto file_ctx = get_file_ctx_by_index(index);
 
-  if (pending_clones != 0 && exit_on_wait) {
-    ++m_num_clones_current;
-    --m_num_clones_next;
+  if (file_ctx == nullptr) {
+    return nullptr;
   }
-
-  mutex_exit(&m_snapshot_mutex);
-
-  return (pending_clones);
+  return file_ctx->get_file_meta();
 }
 
-Clone_File_Meta *Clone_Snapshot::get_file_by_index(uint index) {
-  Clone_File_Meta *file_meta;
+Clone_file_ctx *Clone_Snapshot::get_file_ctx_by_index(uint index) {
+  Clone_file_ctx *file_ctx = nullptr;
 
   if (m_snapshot_state == CLONE_SNAPSHOT_FILE_COPY ||
       m_snapshot_state == CLONE_SNAPSHOT_PAGE_COPY) {
-    ut_ad(index < m_num_data_files);
-    file_meta = m_data_file_vector[index];
+    auto num_data_files = m_data_file_vector.size();
+
+    if (index < num_data_files) {
+      file_ctx = m_data_file_vector[index];
+    }
 
   } else if (m_snapshot_state == CLONE_SNAPSHOT_REDO_COPY) {
-    ut_ad(index < m_num_redo_files);
-    file_meta = m_redo_file_vector[index];
+    auto num_redo_files = m_redo_file_vector.size();
 
-  } else {
-    ut_ad(false);
-    file_meta = nullptr;
+    if (index < num_redo_files) {
+      file_ctx = m_redo_file_vector[index];
+    }
   }
 
-  return (file_meta);
+  return (file_ctx);
 }
 
 int Clone_Snapshot::iterate_files(File_Cbk_Func &&func) {
-  if (m_snapshot_state != CLONE_SNAPSHOT_FILE_COPY &&
-      m_snapshot_state != CLONE_SNAPSHOT_REDO_COPY) {
-    return (0);
+  int err = 0;
+
+  switch (m_snapshot_state) {
+    case CLONE_SNAPSHOT_FILE_COPY:
+      err = iterate_data_files(std::forward<File_Cbk_Func>(func));
+      break;
+    case CLONE_SNAPSHOT_REDO_COPY:
+      err = iterate_redo_files(std::forward<File_Cbk_Func>(func));
+      break;
+    default:
+      err = 0;
   }
+  return err;
+}
 
-  auto &file_vector = (m_snapshot_state == CLONE_SNAPSHOT_FILE_COPY)
-                          ? m_data_file_vector
-                          : m_redo_file_vector;
+int Clone_Snapshot::iterate_data_files(File_Cbk_Func &&func) {
+  IB_mutex_guard guard(&m_snapshot_mutex);
 
-  for (auto file_meta : file_vector) {
-    auto err = func(file_meta);
+  for (auto file_ctx : m_data_file_vector) {
+    auto err = func(file_ctx);
     if (err != 0) {
-      return (err);
+      return err; /* purecov: inspected */
     }
   }
+  return 0;
+}
 
-  return (0);
+int Clone_Snapshot::iterate_redo_files(File_Cbk_Func &&func) {
+  for (auto file_ctx : m_redo_file_vector) {
+    auto err = func(file_ctx);
+    if (err != 0) {
+      return err; /* purecov: inspected */
+    }
+  }
+  return 0;
 }
 
 int Clone_Snapshot::get_next_block(uint chunk_num, uint &block_num,
-                                   Clone_File_Meta *file_meta,
-                                   ib_uint64_t &data_offset, byte *&data_buf,
-                                   uint &data_size) {
+                                   const Clone_file_ctx *&file_ctx,
+                                   uint64_t &data_offset, byte *&data_buf,
+                                   uint32_t &data_size, uint64_t &file_size) {
   uint64_t start_offset = 0;
-  uint start_index;
-  Clone_File_Meta *current_file;
-
-  /* File index for last chunk. This index value is always increasing
-  for a task. We skip all previous index while searching for new file. */
-  start_index = file_meta->m_file_index;
+  const auto file_meta = file_ctx->get_file_meta_read();
+  file_size = 0;
 
   if (m_snapshot_state == CLONE_SNAPSHOT_PAGE_COPY) {
     /* Copy the page from buffer pool. */
-    auto err = get_next_page(chunk_num, block_num, file_meta, data_offset,
-                             data_buf, data_size);
+    auto err = get_next_page(chunk_num, block_num, file_ctx, data_offset,
+                             data_buf, data_size, file_size);
     return (err);
 
-  } else if (m_snapshot_state == CLONE_SNAPSHOT_FILE_COPY) {
-    /* Get file for the chunk. */
-    current_file =
-        get_file(m_data_file_vector, m_num_data_files, chunk_num, start_index);
-  } else {
+  } else if (m_snapshot_state == CLONE_SNAPSHOT_REDO_COPY) {
     /* For redo copy header and trailer are returned in buffer. */
-    ut_ad(m_snapshot_state == CLONE_SNAPSHOT_REDO_COPY);
 
     if (chunk_num == (m_num_current_chunks - 1)) {
       /* Last but one chunk is the redo header. */
@@ -397,9 +376,6 @@
 
       ++block_num;
 
-      current_file = m_redo_file_vector.front();
-      *file_meta = *current_file;
-
       data_offset = 0;
 
       data_buf = m_redo_header;
@@ -419,9 +395,6 @@
 
       ++block_num;
 
-      current_file = m_redo_file_vector.back();
-      *file_meta = *current_file;
-
       data_offset = m_redo_trailer_offset;
 
       data_buf = m_redo_trailer;
@@ -434,23 +407,19 @@
 
     /* This is not header or trailer chunk. Need to get redo
     data from archived file. */
-    current_file =
-        get_file(m_redo_file_vector, m_num_redo_files, chunk_num, start_index);
-
-    if (current_file->m_begin_chunk == 1) {
+    if (file_meta->m_begin_chunk == 1) {
       /* Set start offset for the first file. */
       start_offset = m_redo_start_offset;
     }
 
     /* Dummy redo file entry. Need to send metadata. */
-    if (current_file->m_file_size == 0) {
+    if (file_meta->m_file_size == 0) {
       if (block_num != 0) {
         block_num = 0;
         return (0);
       }
       ++block_num;
 
-      *file_meta = *current_file;
       data_buf = nullptr;
       data_size = 0;
       data_offset = 0;
@@ -465,19 +434,19 @@
 
   data_buf = nullptr;
 
-  uint64_t file_chnuk_num = chunk_num - current_file->m_begin_chunk;
+  uint64_t file_chnuk_num = chunk_num - file_meta->m_begin_chunk;
 
   /* Offset in pages for current chunk. */
   uint64_t chunk_offset = file_chnuk_num << m_chunk_size_pow2;
 
   /* Find number of blocks in current chunk. */
-  if (chunk_num == current_file->m_end_chunk) {
+  if (chunk_num == file_meta->m_end_chunk) {
     /* If it is last chunk, we need to adjust the size. */
     ib_uint64_t size_in_pages;
     uint aligned_sz;
 
-    ut_ad(current_file->m_file_size >= start_offset);
-    size_in_pages = ut_uint64_align_up(current_file->m_file_size - start_offset,
+    ut_ad(file_meta->m_file_size >= start_offset);
+    size_in_pages = ut_uint64_align_up(file_meta->m_file_size - start_offset,
                                        UNIV_PAGE_SIZE);
     size_in_pages /= UNIV_PAGE_SIZE;
 
@@ -513,25 +482,25 @@
 
   ++block_num;
 
-  *file_meta = *current_file;
-
   /* Convert offset and length in bytes. */
   data_size *= UNIV_PAGE_SIZE;
   data_offset *= UNIV_PAGE_SIZE;
   data_offset += start_offset;
 
-  ut_ad(data_offset < current_file->m_file_size);
+  ut_ad(data_offset < file_meta->m_file_size);
 
   /* Adjust length for last block in last chunk. */
-  if (chunk_num == current_file->m_end_chunk && block_num == num_blocks) {
-    ut_ad((data_offset + data_size) >= current_file->m_file_size);
-    data_size = static_cast<uint>(current_file->m_file_size - data_offset);
+  if (chunk_num == file_meta->m_end_chunk && block_num == num_blocks) {
+    ut_ad((data_offset + data_size) >= file_meta->m_file_size);
+    data_size = static_cast<uint>(file_meta->m_file_size - data_offset);
   }
 
 #ifdef UNIV_DEBUG
   if (m_snapshot_state == CLONE_SNAPSHOT_REDO_COPY) {
     /* Current file is the last redo file */
-    if (current_file == m_redo_file_vector.back() && m_redo_trailer_size != 0) {
+    auto redo_file_ctx = m_redo_file_vector.back();
+    if (file_meta == redo_file_ctx->get_file_meta() &&
+        m_redo_trailer_size != 0) {
       /* Should not exceed/overwrite the trailer */
       ut_ad(data_offset + data_size <= m_redo_trailer_offset);
     }
@@ -559,8 +528,36 @@
   mutex_exit(&m_snapshot_mutex);
 }
 
-int Clone_Snapshot::init_state(Clone_Desc_State *state_desc, byte *temp_buffer,
-                               uint temp_buffer_len, Clone_Alert_Func cbk) {
+uint32_t Clone_Snapshot::get_blocks_per_chunk() const {
+  IB_mutex_guard guard(&m_snapshot_mutex);
+  uint32_t num_blocks = 0;
+
+  switch (m_snapshot_state) {
+    case CLONE_SNAPSHOT_PAGE_COPY:
+      num_blocks = chunk_size();
+      break;
+
+    case CLONE_SNAPSHOT_FILE_COPY:
+      [[fallthrough]];
+
+    case CLONE_SNAPSHOT_REDO_COPY:
+      num_blocks = blocks_per_chunk();
+      break;
+
+    default:
+      /* purecov: begin deadcode */
+      num_blocks = 0;
+      break;
+      /* purecov: end */
+  }
+  return num_blocks;
+}
+
+int Clone_Snapshot::change_state(Clone_Desc_State *state_desc,
+                                 Snapshot_State new_state, byte *temp_buffer,
+                                 uint temp_buffer_len, Clone_Alert_Func cbk) {
+  ut_ad(m_snapshot_state != CLONE_SNAPSHOT_NONE);
+
   int err = 0;
   m_num_current_chunks = 0;
 
@@ -569,7 +566,7 @@
     return (err);
   }
 
-  switch (m_snapshot_state) {
+  switch (new_state) {
     case CLONE_SNAPSHOT_NONE:
     case CLONE_SNAPSHOT_INIT:
       ut_ad(false);
@@ -581,9 +578,8 @@
     case CLONE_SNAPSHOT_FILE_COPY:
       ib::info(ER_IB_CLONE_OPERATION) << "Clone State BEGIN FILE COPY";
 
-      m_monitor.init_state(srv_stage_clone_file_copy.m_key, m_enable_pfs);
-      err = init_file_copy();
-      m_monitor.change_phase();
+      err = init_file_copy(new_state);
+
       DEBUG_SYNC_C("clone_start_page_archiving");
       DBUG_EXECUTE_IF("clone_crash_during_page_archiving", DBUG_SUICIDE(););
       break;
@@ -591,84 +587,100 @@
     case CLONE_SNAPSHOT_PAGE_COPY:
       ib::info(ER_IB_CLONE_OPERATION) << "Clone State BEGIN PAGE COPY";
 
-      m_monitor.init_state(srv_stage_clone_page_copy.m_key, m_enable_pfs);
-      err = init_page_copy(temp_buffer, temp_buffer_len);
-      m_monitor.change_phase();
+      err = init_page_copy(new_state, temp_buffer, temp_buffer_len);
+
       DEBUG_SYNC_C("clone_start_redo_archiving");
       break;
 
     case CLONE_SNAPSHOT_REDO_COPY:
       ib::info(ER_IB_CLONE_OPERATION) << "Clone State BEGIN REDO COPY";
 
-      m_monitor.init_state(srv_stage_clone_redo_copy.m_key, m_enable_pfs);
-      err = init_redo_copy(cbk);
-      m_monitor.change_phase();
+      err = init_redo_copy(new_state, cbk);
+
       break;
 
-    case CLONE_SNAPSHOT_DONE:
+    case CLONE_SNAPSHOT_DONE: {
       ib::info(ER_IB_CLONE_OPERATION) << "Clone State DONE ";
 
+      State_transit transit_guard(this, new_state);
       m_monitor.init_state(PSI_NOT_INSTRUMENTED, m_enable_pfs);
+
       m_redo_ctx.release();
+
+      err = transit_guard.get_error();
       break;
+    }
   }
-  return (err);
+  return err;
 }
 
-Clone_File_Meta *Clone_Snapshot::get_file(Clone_File_Vec &file_vector,
-                                          uint num_files, uint chunk_num,
-                                          uint start_index) {
-  Clone_File_Meta *current_file = nullptr;
+Clone_file_ctx *Clone_Snapshot::get_file(Clone_File_Vec &file_vector,
+                                         uint32_t chunk_num,
+                                         uint32_t start_index) {
+  Clone_file_ctx *current_file = nullptr;
   uint idx;
 
-  ut_ad(file_vector.size() >= num_files);
+  auto num_files = file_vector.size();
 
   /* Scan through the file vector matching chunk number. */
   for (idx = start_index; idx < num_files; idx++) {
     current_file = file_vector[idx];
+    auto file_meta = current_file->get_file_meta();
 
-    ut_ad(chunk_num >= current_file->m_begin_chunk);
+    ut_ad(chunk_num >= file_meta->m_begin_chunk);
 
-    if (chunk_num <= current_file->m_end_chunk) {
+    if (chunk_num <= file_meta->m_end_chunk) {
       break;
     }
   }
 
-  ut_ad(idx < num_files);
-
   return (current_file);
 }
 
-int Clone_Snapshot::get_next_page(uint chunk_num, uint &block_num,
-                                  Clone_File_Meta *file_meta,
-                                  ib_uint64_t &data_offset, byte *&data_buf,
-                                  uint &data_size) {
-  Clone_Page clone_page;
-  Clone_File_Meta *page_file;
+void Clone_Snapshot::skip_deleted_blocks(uint32_t chunk_num,
+                                         uint32_t &block_num) {
+  /* For file copy entire chunk can be ignored because chunk
+  doesn't span across files. */
+  if (m_snapshot_state != CLONE_SNAPSHOT_PAGE_COPY) {
+    ut_ad(m_snapshot_state == CLONE_SNAPSHOT_FILE_COPY);
+    block_num = 0;
+    return;
+  }
 
-  uint page_index;
-  uint file_index;
+  const auto *cur_file_ctx = get_page_file_ctx(chunk_num, block_num);
+  const auto *next_file_ctx = cur_file_ctx;
 
-  ut_ad(data_size >= UNIV_PAGE_SIZE);
+  ut_ad(cur_file_ctx->deleted());
 
-  if (block_num == chunk_size()) {
-    block_num = 0;
-    return (0);
+  /* Skip over the deleted file pages of current file context. */
+  while (next_file_ctx == cur_file_ctx) {
+    ++block_num;
+    next_file_ctx = get_page_file_ctx(chunk_num, block_num);
+
+    /* End of current chunk. */
+    if (next_file_ctx == nullptr || block_num >= chunk_size()) {
+      block_num = 0;
+      break;
+    }
   }
+}
+
+int Clone_Snapshot::get_next_page(uint chunk_num, uint &block_num,
+                                  const Clone_file_ctx *&file_ctx,
+                                  uint64_t &data_offset, byte *&data_buf,
+                                  uint32_t &data_size, uint64_t &file_size) {
+  ut_ad(data_size >= UNIV_PAGE_SIZE);
+  file_size = 0;
+
+  ut_ad(file_ctx->is_pinned());
+  ut_ad(block_num < chunk_size());
 
   /* For "page copy", each block is a page. */
-  page_index = chunk_size() * (chunk_num - 1);
+  uint32_t page_index = chunk_size() * (chunk_num - 1);
   page_index += block_num;
 
-  /* For last chunk, actual number of blocks could be less
-  than chunk_size. */
-  if (page_index >= m_page_vector.size()) {
-    ut_ad(page_index == m_page_vector.size());
-    block_num = 0;
-    return (0);
-  }
-
-  clone_page = m_page_vector[page_index];
+  ut_a(page_index < m_page_vector.size());
+  auto clone_page = m_page_vector[page_index];
 
   ++block_num;
 
@@ -677,45 +689,40 @@
   const page_size_t &page_size =
       fil_space_get_page_size(clone_page.m_space_id, &found);
 
-  ut_ad(found);
+  auto file_meta = file_ctx->get_file_meta_read();
 
-  file_index = m_data_file_map[clone_page.m_space_id];
-
-  ut_ad(file_index > 0);
-  --file_index;
-
-  page_file = m_data_file_vector[file_index];
-  ut_ad(page_file->m_space_id == clone_page.m_space_id);
+  ut_ad(found);
+  ut_ad(file_meta->m_space_id == clone_page.m_space_id);
 
   /* Data offset could be beyond 32 BIT integer. */
   data_offset = static_cast<ib_uint64_t>(clone_page.m_page_no);
   data_offset *= page_size.physical();
 
-  /* Check if the page belongs to other nodes of the tablespace. */
-  while (m_num_data_files > file_index + 1) {
-    Clone_File_Meta *page_file_next;
+  auto file_index = file_meta->m_file_index;
 
-    page_file_next = m_data_file_vector[file_index + 1];
+  /* Check if the page belongs to other nodes of the tablespace. */
+  while (num_data_files() > file_index + 1) {
+    const auto file_next = m_data_file_vector[file_index + 1];
+    const auto file_meta_next = file_next->get_file_meta();
 
     /* Next node belongs to same tablespace and data offset
     exceeds current node size */
-    if (page_file_next->m_space_id == clone_page.m_space_id &&
-        data_offset >= page_file->m_file_size) {
-      data_offset -= page_file->m_file_size;
-      file_index++;
-      page_file = m_data_file_vector[file_index];
+    if (file_meta_next->m_space_id == file_meta->m_space_id &&
+        data_offset >= file_meta->m_file_size) {
+      data_offset -= file_meta->m_file_size;
+      file_meta = file_meta_next;
+      file_index = file_meta->m_file_index;
+      file_ctx = file_next;
     } else {
       break;
     }
   }
 
-  *file_meta = *page_file;
-
   /* Get page from buffer pool. */
   page_id_t page_id(clone_page.m_space_id, clone_page.m_page_no);
 
   auto err =
-      get_page_for_write(page_id, page_size, file_meta, data_buf, data_size);
+      get_page_for_write(page_id, page_size, file_ctx, data_buf, data_size);
 
   /* Update size from space header page. */
   if (clone_page.m_page_no == 0) {
@@ -726,7 +733,7 @@
     size_bytes *= page_size.physical();
 
     if (file_meta->m_file_size < size_bytes) {
-      file_meta->m_file_size = size_bytes;
+      file_size = size_bytes;
     }
   }
   return (err);
@@ -789,14 +796,15 @@
   return (true);
 }
 
-void Clone_Snapshot::decrypt_key_in_header(fil_space_t *space,
+void Clone_Snapshot::decrypt_key_in_header(const Clone_File_Meta *file_meta,
                                            const page_size_t &page_size,
                                            byte *&page_data) {
   byte encryption_info[Encryption::INFO_SIZE];
 
   /* Get tablespace encryption information. */
-  Encryption::fill_encryption_info(space->encryption_key, space->encryption_iv,
-                                   encryption_info, false, false);
+  Encryption::fill_encryption_info(file_meta->m_encryption_key,
+                                   file_meta->m_encryption_iv, encryption_info,
+                                   false, false);
 
   /* Set encryption information in page. */
   auto offset = fsp_header_get_encryption_offset(page_size);
@@ -826,11 +834,34 @@
   }
 }
 
+/** Set Page encryption information for IORequest.
+@param[in,out]	request		IO request
+@param[in]	page_id		page id
+@param[in]	file_ctx	clone file context */
+static void set_page_encryption(IORequest &request, const page_id_t &page_id,
+                                const Clone_file_ctx *file_ctx) {
+  auto file_meta = file_ctx->get_file_meta_read();
+
+  /* Page zero is never encrypted. Need to also check the FSP encryption
+  flag in case decryption is in progress. */
+  if (file_meta->m_encrypt_type == Encryption::NONE ||
+      !FSP_FLAGS_GET_ENCRYPTION(file_meta->m_fsp_flags) ||
+      page_id.page_no() == 0) {
+    request.clear_encrypted();
+    return;
+  }
+
+  request.encryption_key(file_meta->m_encryption_key, Encryption::KEY_LEN,
+                         file_meta->m_encryption_iv);
+
+  request.encryption_algorithm(Encryption::AES);
+}
+
 int Clone_Snapshot::get_page_for_write(const page_id_t &page_id,
                                        const page_size_t &page_size,
-                                       Clone_File_Meta *file_meta,
+                                       const Clone_file_ctx *file_ctx,
                                        byte *&page_data, uint &data_size) {
-  auto space = fil_space_get(page_id.space());
+  auto file_meta = file_ctx->get_file_meta_read();
 
   mtr_t mtr;
   mtr_start(&mtr);
@@ -881,10 +912,10 @@
       static_cast<lsn_t>(mach_read_from_8(page_data + FIL_PAGE_LSN));
 
   /* First page of a encrypted tablespace. */
-  if (space->encryption_type != Encryption::NONE && page_id.page_no() == 0) {
+  if (file_meta->m_encrypt_type != Encryption::NONE && page_id.page_no() == 0) {
     /* Update unencrypted tablespace key in page 0 to be send over
     SSL connection. */
-    decrypt_key_in_header(space, page_size, page_data);
+    decrypt_key_in_header(file_meta, page_size, page_data);
 
     /* Force to recalculate the checksum if the page is not dirty. */
     if (!page_is_dirty) {
@@ -930,12 +961,12 @@
 
   /* Do transparent page compression if needed. */
   if (page_id.page_no() != 0 && file_meta->m_punch_hole &&
-      space->compression_type != Compression::NONE) {
+      file_meta->m_compress_type != Compression::NONE) {
     auto compressed_data = page_data + data_size;
     memset(compressed_data, 0, data_size);
 
     IORequest request(IORequest::WRITE);
-    request.compression_algorithm(space->compression_type);
+    request.compression_algorithm(file_meta->m_compress_type);
     ulint compressed_len = 0;
 
     auto buf_ptr = os_file_compress_page(
@@ -950,7 +981,7 @@
   }
 
   IORequest request(IORequest::WRITE);
-  fil_io_set_encryption(request, page_id, space);
+  set_page_encryption(request, page_id, file_ctx);
 
   /* Encrypt page if TDE is enabled. */
   if (err == 0 && request.is_encrypted()) {
@@ -969,3 +1000,669 @@
   mtr_commit(&mtr);
   return (err);
 }
+
+uint32_t Clone_Snapshot::get_max_blocks_pin() const {
+  return (m_snapshot_state == CLONE_SNAPSHOT_PAGE_COPY) ? S_MAX_PAGES_PIN
+                                                        : S_MAX_BLOCKS_PIN;
+}
+
+Clone_file_ctx *Clone_Snapshot::get_file_ctx(uint32_t chunk_num,
+                                             uint32_t block_num,
+                                             uint32_t hint_index) {
+  Clone_file_ctx *file = nullptr;
+
+  switch (m_snapshot_state) {
+    case CLONE_SNAPSHOT_FILE_COPY:
+      file = get_data_file_ctx(chunk_num, hint_index);
+      break;
+    case CLONE_SNAPSHOT_PAGE_COPY:
+      file = get_page_file_ctx(chunk_num, block_num);
+      break;
+    case CLONE_SNAPSHOT_REDO_COPY:
+      file = get_redo_file_ctx(chunk_num, hint_index);
+      break;
+    default:
+      ut_ad(false); /* purecov: deadcode */
+  }
+  return file;
+}
+
+Clone_file_ctx *Clone_Snapshot::get_data_file_ctx(uint32_t chunk_num,
+                                                  uint32_t hint_index) {
+  return get_file(m_data_file_vector, chunk_num, hint_index);
+}
+
+Clone_file_ctx *Clone_Snapshot::get_redo_file_ctx(uint32_t chunk_num,
+                                                  uint32_t hint_index) {
+  /* Last but one chunk is redo header */
+  if (chunk_num == (m_num_current_chunks - 1)) {
+    return m_redo_file_vector.front();
+  }
+  /* Last chunk is the redo trailer. */
+  if (chunk_num == m_num_current_chunks) {
+    return m_redo_file_vector.back();
+  }
+  return get_file(m_redo_file_vector, chunk_num, hint_index);
+}
+
+Clone_file_ctx *Clone_Snapshot::get_page_file_ctx(uint32_t chunk_num,
+                                                  uint32_t block_num) {
+  /* Check if block is beyond the current chunk. */
+  if (block_num >= chunk_size()) {
+    ut_ad(block_num == chunk_size());
+    return nullptr;
+  }
+
+  auto page_index = chunk_size() * (chunk_num - 1);
+  page_index += block_num;
+
+  /* Check if all blocks are over. For last chunk, actual number of blocks
+  could be less than chunk_size. */
+  if (page_index >= m_page_vector.size()) {
+    ut_ad(page_index == m_page_vector.size());
+    return nullptr;
+  }
+
+  auto clone_page = m_page_vector[page_index];
+  auto file_index = m_data_file_map[clone_page.m_space_id];
+  if (file_index == 0) {
+    /* purecov: begin deadcode */
+    ut_ad(false);
+    return nullptr;
+    /* purecov: end */
+  }
+  --file_index;
+
+  auto page_file = get_file_ctx_by_index(file_index);
+
+#ifdef UNIV_DEBUG
+  auto file_meta = page_file->get_file_meta();
+  ut_ad(file_meta->m_space_id == clone_page.m_space_id);
+#endif  // UNIV_DEBUG
+
+  return page_file;
+}
+
+void Clone_file_ctx::get_file_name(std::string &name) const {
+  name.assign(m_meta.m_file_name);
+
+  /* Add file name extension. */
+  switch (m_extension) {
+    case Extension::REPLACE:
+      name.append(CLONE_INNODB_REPLACED_FILE_EXTN);
+      break;
+
+    case Extension::DDL:
+      name.append(CLONE_INNODB_DDL_FILE_EXTN);
+      break;
+
+    case Extension::NONE:
+    default:
+      break;
+  }
+}
+
+bool Clone_Snapshot::begin_ddl_state(Clone_notify::Type type, space_id_t space,
+                                     bool no_wait, bool check_intr,
+                                     int &error) {
+  IB_mutex_guard guard(&m_snapshot_mutex);
+  error = 0;
+  bool blocked = false;
+
+  for (;;) {
+    ut_ad(mutex_own(&m_snapshot_mutex));
+    auto state = get_state();
+
+    switch (state) {
+      case CLONE_SNAPSHOT_NONE:
+        /* purecov: begin deadcode */
+        /* Clone must have started at this point. */
+        ut_ad(false);
+        break;
+        /* purecov: end */
+
+      case CLONE_SNAPSHOT_INIT:
+        /* Fall through. */
+      case CLONE_SNAPSHOT_FILE_COPY:
+        /* Allow clone to enter next stage only after the DDL file operation
+        is complete. */
+        blocked = block_state_change(type, space, no_wait, check_intr, error);
+        ut_ad(mutex_own(&m_snapshot_mutex));
+
+        if (error != 0) {
+          /* We should not have blocked in case of error but it is not fatal. */
+          ut_ad(!blocked);
+          break;
+        }
+
+        if (state != get_state()) {
+          /* purecov: begin inspected */
+          /* State is modified. Start again and recheck. This is safe
+          as clone has to eventually exit from the above two states. */
+          ut_ad(!blocked);
+          continue;
+          /* purecov: end */
+        }
+
+        ut_ad(blocked);
+
+        if (state == CLONE_SNAPSHOT_FILE_COPY) {
+          error = begin_ddl_file(type, space, no_wait, check_intr);
+        }
+        break;
+
+      case CLONE_SNAPSHOT_PAGE_COPY:
+        /* 1. Bulk operation currently need to wait if clone has entered page
+              copy. This is because bulk changes don't generate any redo log.
+           2. We don't let new encryption alter to begin during page copy state.
+              We currently cannot handle encryption key in redo log which is
+              encrypted by donor master key. */
+        ut_ad(!blocked);
+        if (type == Clone_notify::Type::SPACE_ALTER_INPLACE_BULK ||
+            type == Clone_notify::Type::SPACE_ALTER_ENCRYPT_GENERAL ||
+            type == Clone_notify::Type::SPACE_ALTER_ENCRYPT) {
+          error =
+              wait(Wait_type::STATE_END_PAGE_COPY, nullptr, false, check_intr);
+          break;
+        }
+        /* Try to block state change. If state is already modified then nothing
+        to do as the next states don't require blocking. */
+        blocked = block_state_change(type, space, no_wait, check_intr, error);
+        if (error != 0 || state != get_state()) {
+          /* We should not have blocked in case of error but it is not fatal. */
+          ut_ad(!blocked);
+          break;
+        }
+        ut_ad(blocked);
+
+        error = begin_ddl_file(type, space, no_wait, check_intr);
+        break;
+      case CLONE_SNAPSHOT_REDO_COPY:
+        /* Snapshot end point is already taken. This changes are not part of
+        snapshot. */
+        break;
+      case CLONE_SNAPSHOT_DONE:
+        /* Clone has already finished. */
+        break;
+      default:
+        /* purecov: begin deadcode */
+        ut_ad(false);
+        break;
+        /* purecov: end */
+    }
+    break;
+  } /* purecov: inspected */
+
+  /* Unblock clone, in case of error. */
+  if (blocked && error != 0) {
+    /* purecov: begin inspected */
+    unblock_state_change();
+    blocked = false;
+    /* purecov: end */
+  }
+  return blocked;
+}
+
+void Clone_Snapshot::end_ddl_state(Clone_notify::Type type, space_id_t space) {
+  /* Caller is responsible to call if we have blocked state change. */
+  IB_mutex_guard guard(&m_snapshot_mutex);
+  auto state = get_state();
+
+  if (state == CLONE_SNAPSHOT_FILE_COPY || state == CLONE_SNAPSHOT_PAGE_COPY) {
+    end_ddl_file(type, space);
+  }
+  unblock_state_change();
+}
+
+void Clone_Snapshot::get_wait_mesg(Wait_type wait_type, std::string &info,
+                                   std::string &error) {
+  switch (wait_type) {
+    case Wait_type::STATE_TRANSIT_WAIT:
+      break;
+    case Wait_type::STATE_TRANSIT:
+      info.assign("DDL waiting for clone state transition");
+      error.assign("DDL wait for clone state transition timed out");
+      break;
+    case Wait_type::STATE_END_PAGE_COPY:
+      info.assign("DDL waiting for Clone PAGE COPY to finish");
+      error.assign("DDL wait for Clone PAGE COPY timed out");
+      break;
+    case Wait_type::STATE_BLOCKER:
+      info.assign("Clone state transition waiting for DDL file operation");
+      error.assign(
+          "Clone state transition wait for DDL file operation timed out");
+      break;
+    case Wait_type::DATA_FILE_WAIT:
+      info.assign("DDL waiting for clone threads to exit from previous wait");
+      error.assign(
+          "DDL wait for clone threads to exit from wait state timed out");
+      break;
+    case Wait_type::DATA_FILE_CLOSE:
+      info.assign("DDL waiting for clone to close the open data file");
+      error.assign("DDL wait for clone data file close timed out");
+      break;
+    case Wait_type::DDL_FILE_OPERATION:
+      info.assign("Clone waiting for DDL file operation");
+      error.assign("Clone wait for DDL file operation timed out");
+      break;
+    default:
+      ut_ad(false); /* purecov: deadcode */
+  }
+}
+
+const char *Clone_Snapshot::wait_string(Wait_type wait_type) const {
+  const char *wait_info = nullptr;
+
+  switch (wait_type) {
+    /* DDL waiting for clone state transition */
+    case Wait_type::STATE_TRANSIT_WAIT:
+      [[fallthrough]];
+    case Wait_type::STATE_TRANSIT:
+      wait_info = "Waiting for clone state transition";
+      break;
+
+    /* DDL waiting till Clone PAGE COPY state is over. */
+    case Wait_type::STATE_END_PAGE_COPY:
+      wait_info = "Waiting for clone PAGE_COPY state";
+      break;
+
+    /*DDL waiting for clone file operation. */
+    case Wait_type::DATA_FILE_WAIT:
+      [[fallthrough]];
+    case Wait_type::DATA_FILE_CLOSE:
+      wait_info = "Waiting for clone to close files";
+      break;
+
+    /* Clone waiting for DDL. */
+    case Wait_type::DDL_FILE_OPERATION:
+      wait_info = "Waiting for ddl file operation";
+      break;
+
+    case Wait_type::STATE_BLOCKER:
+      wait_info = "Waiting for ddl before state transition";
+      [[fallthrough]];
+
+    default:
+      break;
+  }
+
+  return wait_info;
+}
+
+int Clone_Snapshot::wait(Wait_type wait_type, const Clone_file_ctx *ctx,
+                         bool no_wait, bool check_intr) {
+  ut_ad(mutex_own(&m_snapshot_mutex));
+
+  std::string info_mesg;
+  std::string error_mesg;
+
+  get_wait_mesg(wait_type, info_mesg, error_mesg);
+
+  auto wait_cond = [&](bool alert, bool &wait) {
+    ut_ad(mutex_own(&m_snapshot_mutex));
+    bool early_exit = false;
+
+    switch (wait_type) {
+      case Wait_type::STATE_TRANSIT_WAIT:
+        wait = in_transit_wait();
+        /* For state transition wait by DDL, exit on alert to avoid
+        possible deadlock between DDLs. */
+        early_exit = true;
+        break;
+      case Wait_type::STATE_TRANSIT:
+        wait = in_transit_state();
+        break;
+      case Wait_type::STATE_END_PAGE_COPY:
+        /* If clone has aborted, don't wait for state to end. */
+        wait = !is_aborted() && (get_state() == CLONE_SNAPSHOT_PAGE_COPY);
+        DBUG_EXECUTE_IF("clone_ddl_abort_wait_page_copy", {
+          if (wait) {
+            my_error(ER_INTERNAL_ERROR, MYF(0), "Simulated Clone DDL error");
+            return ER_INTERNAL_ERROR;
+          }
+        });
+        break;
+      case Wait_type::STATE_BLOCKER:
+        wait = (m_num_blockers > 0);
+        break;
+      case Wait_type::DATA_FILE_WAIT:
+        wait = ctx->is_waiting();
+        early_exit = true;
+        break;
+      case Wait_type::DATA_FILE_CLOSE:
+        wait = ctx->is_pinned();
+        break;
+      case Wait_type::DDL_FILE_OPERATION:
+        wait = blocks_clone(ctx);
+        break;
+      default:
+        /* purecov: begin deadcode */
+        wait = false;
+        ut_ad(false);
+        /* purecov: end */
+    }
+
+    if (wait) {
+      if (no_wait || (alert && early_exit)) {
+        return ER_QUERY_TIMEOUT; /* purecov: inspected */
+      }
+
+      if (alert) {
+        ib::info(ER_IB_CLONE_TIMEOUT) << info_mesg; /* purecov: tested */
+      }
+
+      if (check_intr && thd_killed(nullptr)) {
+        /* For early exit the caller would ignore error. */
+        if (!early_exit) {
+          my_error(ER_QUERY_INTERRUPTED, MYF(0));
+        }
+        return ER_QUERY_INTERRUPTED;
+      }
+    }
+    return 0;
+  };
+
+  /* SET THD information string to display waiting state in PROCESS LIST. */
+  Clone_Sys::Wait_stage wait_guard(wait_string(wait_type));
+
+  bool is_timeout = false;
+  int err = 0;
+
+  /* Increase the defaults to wait more while waiting for page copy state. */
+  if (wait_type == Wait_type::STATE_END_PAGE_COPY) {
+    /* Generate alert message every 5 minutes. */
+    Clone_Sec alert_interval(Clone_Min(5));
+    /* Wait for 2 hours for clone to finish. */
+    Clone_Sec time_out(Clone_Min(120));
+
+    err = Clone_Sys::wait(CLONE_DEF_SLEEP, time_out, alert_interval, wait_cond,
+                          &m_snapshot_mutex, is_timeout);
+  } else {
+    err = Clone_Sys::wait_default(wait_cond, &m_snapshot_mutex, is_timeout);
+  }
+
+  if (!err && is_timeout) {
+    /* purecov: begin deadcode */
+    ut_ad(false);
+    err = ER_INTERNAL_ERROR;
+    my_error(err, MYF(0), error_mesg.c_str());
+    /* purecov: end */
+  }
+  return err;
+}
+
+bool Clone_Snapshot::block_state_change(Clone_notify::Type type,
+                                        space_id_t space, bool no_wait,
+                                        bool check_intr, int &error) {
+  ut_ad(mutex_own(&m_snapshot_mutex));
+
+  bool undo_ddl_ntfn = (type == Clone_notify::Type::SPACE_UNDO_DDL);
+  bool undo_space = fsp_is_undo_tablespace(space);
+
+  /* For undo DDL, there could be recursive notification for file create
+  and drop which are !undo_ddl_ntfn. For such notifications we don't need
+  to wait for clone as we must have already blocked it. */
+  bool wait_clone = (!undo_space || undo_ddl_ntfn);
+
+  /* If no wait option is used, override any waiting clone. Used for undo
+  truncate background currently. We don't want to block purge threads. */
+  if (no_wait) {
+    wait_clone = false;
+  }
+
+  auto saved_state = get_state();
+
+  /* Wait for the waiting clone. That is if clone is blocked by other DDL and
+  waiting. This is an attempt to prevent starvation of clone by DDLs. We wait
+  here for limited time to prevent possible deadlock between DDLs.
+  e.g. DDL-2 <- DDL-1 (Critical section) <- Clone <- DDL-2. */
+  if (wait_clone) {
+    static_cast<void>(
+        wait(Wait_type::STATE_TRANSIT_WAIT, nullptr, false, false));
+    ut_ad(mutex_own(&m_snapshot_mutex));
+    if (saved_state != get_state()) {
+      /* State is modified. Return for possible recheck. */
+      return false; /* purecov: inspected */
+    }
+  }
+
+  /* Wait for state transition to get over. */
+  error = wait(Wait_type::STATE_TRANSIT, nullptr, no_wait, check_intr);
+
+  if (error != 0) {
+    return false;
+  }
+
+  ut_ad(mutex_own(&m_snapshot_mutex));
+  if (saved_state != get_state()) {
+    /* State is modified. Return for possible recheck. */
+    return false; /* purecov: inspected */
+  }
+
+  ut_ad(mutex_own(&m_snapshot_mutex));
+  ++m_num_blockers;
+
+  return true;
+}
+
+inline void Clone_Snapshot::unblock_state_change() {
+  ut_ad(mutex_own(&m_snapshot_mutex));
+  --m_num_blockers;
+}
+
+Clone_file_ctx::State Clone_Snapshot::get_target_file_state(
+    Clone_notify::Type type, bool begin) {
+  auto target_state = Clone_file_ctx::State::NONE;
+
+  switch (type) {
+    case Clone_notify::Type::SPACE_DROP:
+      target_state = begin ? Clone_file_ctx::State::DROPPING
+                           : Clone_file_ctx::State::DROPPED;
+      break;
+    case Clone_notify::Type::SPACE_RENAME:
+      target_state = begin ? Clone_file_ctx::State::RENAMING
+                           : Clone_file_ctx::State::RENAMED;
+      break;
+    default:
+      target_state = Clone_file_ctx::State::NONE;
+      break;
+  }
+  return target_state;
+}
+
+bool Clone_Snapshot::blocks_clone(const Clone_file_ctx *file_ctx) {
+  bool block = false;
+  auto clone_state = get_state();
+
+  switch (clone_state) {
+    case CLONE_SNAPSHOT_FILE_COPY:
+      /* Block clone operation for both rename and delete operation
+      as we directly access the file. */
+      block = file_ctx->modifying();
+      break;
+    case CLONE_SNAPSHOT_PAGE_COPY:
+      /* Block clone operation only if deleting. In page copy state we don't
+      bother about space/file rename. If the page is not found in buffer pool,
+      it would need to be read from underlying file but this IO needs to be
+      synchronized with file operation irrespective of clone. */
+      block = file_ctx->deleting();
+      break;
+    default:
+      block = false;
+      break;
+  }
+  return block;
+}
+
+int Clone_Snapshot::begin_ddl_file(Clone_notify::Type type, space_id_t space,
+                                   bool no_wait, bool check_intr) {
+  ut_ad(mutex_own(&m_snapshot_mutex));
+  ut_ad(get_state() == CLONE_SNAPSHOT_FILE_COPY ||
+        get_state() == CLONE_SNAPSHOT_PAGE_COPY);
+
+  auto target_state = get_target_file_state(type, true);
+
+  /* The type doesn't need any file operation. */
+  if (target_state == Clone_file_ctx::State::NONE) {
+    return 0;
+  }
+  auto count = m_data_file_map.count(space);
+
+  /* The space is added concurrently and then modified again. */
+  if (count == 0) {
+    return 0;
+  }
+  /* If the space is already added for clone, we would have that in the map
+  with a valid file index (starts from 1). */
+  auto file_index = m_data_file_map[space];
+
+  if (file_index == 0) {
+    /* purecov: begin deadcode */
+    ut_ad(false);
+    return 0;
+    /* purecov: end */
+  }
+  --file_index;
+
+  auto file_ctx = get_file_ctx_by_index(file_index);
+
+  auto saved_state = file_ctx->m_state.load();
+
+  ut_ad(saved_state != Clone_file_ctx::State::DROPPING);
+  ut_ad(saved_state != Clone_file_ctx::State::RENAMING);
+  ut_ad(saved_state != Clone_file_ctx::State::DROPPED);
+
+  file_ctx->m_state.store(target_state);
+
+  /* Wait for all data files to be closed by clone threads. */
+  if (blocks_clone(file_ctx)) {
+    auto err = wait(Wait_type::DATA_FILE_CLOSE, file_ctx, no_wait, check_intr);
+
+    if (err != 0) {
+      /* purecov: begin inspected */
+      file_ctx->m_state.store(saved_state);
+      return err;
+      /* purecov: end */
+    }
+  }
+  return 0;
+}
+
+void Clone_Snapshot::end_ddl_file(Clone_notify::Type type, space_id_t space) {
+  ut_ad(mutex_own(&m_snapshot_mutex));
+  ut_ad(get_state() == CLONE_SNAPSHOT_FILE_COPY ||
+        get_state() == CLONE_SNAPSHOT_PAGE_COPY);
+
+  auto target_state = get_target_file_state(type, false);
+
+  /* The type doesn't need any file operation. */
+  if (target_state == Clone_file_ctx::State::NONE) {
+    return;
+  }
+  auto count = m_data_file_map.count(space);
+
+  /* The space is added concurrently and then modified again. */
+  if (count == 0) {
+    return;
+  }
+  uint32_t file_index = m_data_file_map[space];
+
+  if (file_index == 0) {
+    /* purecov: begin deadcode */
+    ut_ad(false);
+    return;
+    /* purecov: end */
+  }
+  --file_index;
+
+  auto file_ctx = get_file_ctx_by_index(file_index);
+  auto file_meta = file_ctx->get_file_meta();
+
+  file_ctx->set_ddl(get_next_state());
+
+  if (type == Clone_notify::Type::SPACE_DROP) {
+    file_meta->m_deleted = true;
+    file_ctx->m_state.store(target_state);
+    return;
+  }
+
+  bool blocking_clone = blocks_clone(file_ctx);
+
+  /* We need file handling for drop and rename. */
+  ut_ad(type == Clone_notify::Type::SPACE_RENAME);
+  file_meta->m_renamed = true;
+  file_ctx->m_state.store(target_state);
+
+  if (blocking_clone) {
+    auto fil_space = fil_space_get(space);
+
+    ut_ad(fil_space->files.size() == 1);
+
+    auto &file = fil_space->files.front();
+    build_file_name(file_meta, file.name);
+
+    /* Wait for any previously waiting clone threads to restart. This is to
+    avoid starvation of clone by repeated renames. We ignore any error. Although
+    not expected there is no functional impact of a timeout here. */
+    static_cast<void>(wait(Wait_type::DATA_FILE_WAIT, file_ctx, false, false));
+  }
+}
+
+bool Clone_Snapshot::update_deleted_state(Clone_file_ctx *file_ctx) {
+  ut_ad(mutex_own(&m_snapshot_mutex));
+
+  if (file_ctx->m_state == Clone_file_ctx::State::DROPPED_HANDLED) {
+    return false;
+  }
+
+  ut_ad(file_ctx->m_state == Clone_file_ctx::State::DROPPED);
+  /* The deleted file to be handled by current task. Set the
+  state here so that other tasks can ignore the deleted file. */
+  file_ctx->m_state = Clone_file_ctx::State::DROPPED_HANDLED;
+  return true;
+}
+
+int Clone_Snapshot::pin_file(Clone_file_ctx *file_ctx, bool &handle_delete) {
+  handle_delete = false;
+  file_ctx->pin();
+
+  /* Quick return without acquiring mutex if no DDL. */
+  if (!blocks_clone(file_ctx)) {
+    /* Check and update deleted state. */
+    if (file_ctx->deleted()) {
+      IB_mutex_guard guard(&m_snapshot_mutex);
+      handle_delete = update_deleted_state(file_ctx);
+    }
+    return 0;
+  }
+  file_ctx->unpin();
+
+  IB_mutex_guard guard(&m_snapshot_mutex);
+
+  if (!blocks_clone(file_ctx)) {
+    /* purecov: begin inspected */
+    file_ctx->pin();
+    /* Check and update deleted state. */
+    if (file_ctx->deleted()) {
+      handle_delete = update_deleted_state(file_ctx);
+    }
+    return 0;
+    /* purecov: end */
+  }
+
+  file_ctx->begin_wait();
+
+  /* Wait for DDL file operation to complete. */
+  auto err = wait(Wait_type::DDL_FILE_OPERATION, file_ctx, false, true);
+
+  if (err == 0) {
+    file_ctx->pin();
+    /* Check and update deleted state. */
+    if (file_ctx->deleted()) {
+      handle_delete = update_deleted_state(file_ctx);
+    }
+  }
+
+  file_ctx->end_wait();
+  return err;
+}
diff -Nru mysql-8.0-8.0.26/storage/innobase/CMakeLists.txt mysql-8.0-8.0.27/storage/innobase/CMakeLists.txt
--- mysql-8.0-8.0.26/storage/innobase/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -29,6 +29,11 @@
 # Expand PSI_XXX_CALL into direct calls to the performance_schema.
 ADD_DEFINITIONS(-DPFS_DIRECT_CALL)
 
+# Treat warnings as errors on MSVC for InnoDB
+IF(MSVC AND NOT WIN32_CLANG)
+  ADD_COMPILE_OPTIONS("/WX")
+ENDIF()
+
 # TODO: Fix up all non-canonical include paths and remove this.
 INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/sql
@@ -52,7 +57,8 @@
   page/zipdecompress.cc
   rem/rec.cc
   ut/crc32.cc
-  ut/ut.cc)
+  ut/ut.cc
+  ut/ut0new.cc)
 
 SET(INNOBASE_SOURCES
   api/api0api.cc
@@ -65,13 +71,13 @@
   btr/btr0cur.cc
   btr/btr0pcur.cc
   btr/btr0sea.cc
-  btr/btr0bulk.cc
   buf/buf0block_hint.cc
   buf/buf0buddy.cc
   buf/buf0buf.cc
   buf/buf0dblwr.cc
   buf/buf0dump.cc
   buf/buf0flu.cc
+  btr/btr0load.cc
   buf/buf0lru.cc
   buf/buf0rea.cc
   clone/clone0api.cc
@@ -93,6 +99,16 @@
   dict/dict0stats.cc
   dict/dict0stats_bg.cc
   dict/dict0upgrade.cc
+  ddl/ddl0buffer.cc
+  ddl/ddl0builder.cc
+  ddl/ddl0ctx.cc
+  ddl/ddl0ddl.cc
+  ddl/ddl0fts.cc
+  ddl/ddl0file-reader.cc
+  ddl/ddl0loader.cc
+  ddl/ddl0merge.cc
+  ddl/ddl0rtree.cc
+  ddl/ddl0par-scan.cc
   eval/eval0eval.cc
   eval/eval0proc.cc
   fil/fil0fil.cc
@@ -173,10 +189,8 @@
   rem/rem0cmp.cc
   rem/rem0rec.cc
   row/row0ext.cc
-  row/row0ftsort.cc
   row/row0import.cc
   row/row0ins.cc
-  row/row0merge.cc
   row/row0mysql.cc
   row/row0log.cc
   row/row0pread.cc
@@ -244,7 +258,7 @@
 
 ADD_LIBRARY(innodb_zipdecompress STATIC ${INNOBASE_ZIP_DECOMPRESS_SOURCES})
 TARGET_COMPILE_DEFINITIONS(
-  innodb_zipdecompress PRIVATE UNIV_LIBRARY UNIV_NO_ERR_MSGS)
+    innodb_zipdecompress PRIVATE DISABLE_PSI_MEMORY UNIV_LIBRARY UNIV_NO_ERR_MSGS)
 ADD_DEPENDENCIES(innodb_zipdecompress GenError)
 
 MY_CHECK_CXX_COMPILER_WARNING("-Wmissing-profile" HAS_MISSING_PROFILE)
@@ -265,17 +279,6 @@
   LINK_LIBRARIES sql_dd sql_gis ${ZLIB_LIBRARY} ${LZ4_LIBRARY} ${NUMA_LIBRARY})
 
 
-# Avoid generating Hardware Capabilities due to crc32 instructions
-IF(SOLARIS_INTEL)
-  MY_CHECK_CXX_COMPILER_FLAG("-Wa,-nH" HAVE_WA_NH)
-  IF(HAVE_WA_NH)
-    ADD_COMPILE_FLAGS(
-      ut/crc32.cc
-      COMPILE_FLAGS "-Wa,-nH"
-    )
-  ENDIF()
-ENDIF()
-
 # On linux: /usr/include/stdio.h:#define BUFSIZ 8192
 # On Solaris: /usr/include/iso/stdio_iso.h:#define    BUFSIZ  1024
 IF(SOLARIS AND MY_COMPILER_IS_GNU)
diff -Nru mysql-8.0-8.0.26/storage/innobase/data/data0data.cc mysql-8.0-8.0.27/storage/innobase/data/data0data.cc
--- mysql-8.0-8.0.26/storage/innobase/data/data0data.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/data/data0data.cc	2021-09-28 11:46:34.000000000 +0000
@@ -64,8 +64,8 @@
 
   ut_ad(tuple1 != nullptr);
   ut_ad(tuple2 != nullptr);
-  ut_ad(tuple1->magic_n == DATA_TUPLE_MAGIC_N);
-  ut_ad(tuple2->magic_n == DATA_TUPLE_MAGIC_N);
+  ut_ad(tuple1->magic_n == dtuple_t::MAGIC_N);
+  ut_ad(tuple2->magic_n == dtuple_t::MAGIC_N);
   ut_ad(dtuple_check_typed(tuple1));
   ut_ad(dtuple_check_typed(tuple2));
 
@@ -146,7 +146,7 @@
 bool dfield_check_typed(const dfield_t *field) {
   if (dfield_get_type(field)->mtype > DATA_MTYPE_CURRENT_MAX ||
       dfield_get_type(field)->mtype < DATA_MTYPE_CURRENT_MIN) {
-    ib::fatal(ER_IB_MSG_158)
+    ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_158)
         << "Data field type " << dfield_get_type(field)->mtype << ", len "
         << dfield_get_len(field);
   }
@@ -168,7 +168,7 @@
 }
 
 bool dtuple_validate(const dtuple_t *tuple) {
-  ut_ad(tuple->magic_n == DATA_TUPLE_MAGIC_N);
+  ut_ad(tuple->magic_n == dtuple_t::MAGIC_N);
 
   auto n_fields = dtuple_get_n_fields(tuple);
 
@@ -330,7 +330,7 @@
       }
 
       data = static_cast<byte *>(dfield_get_data(dfield));
-      /* fall through */
+      [[fallthrough]];
 
     case DATA_BINARY:
     default:
diff -Nru mysql-8.0-8.0.26/storage/innobase/ddl/ddl0buffer.cc mysql-8.0-8.0.27/storage/innobase/ddl/ddl0buffer.cc
--- mysql-8.0-8.0.26/storage/innobase/ddl/ddl0buffer.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/ddl/ddl0buffer.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,222 @@
+/*****************************************************************************
+
+Copyright (c) 2020, 2021, Oracle and/or its affiliates. All Rights Reserved.
+
+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, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
+/** @file ddl/ddl0buffer.cc
+ DDL key buffer implementation.
+Created 2020-11-01 by Sunny Bains. */
+
+#include "ddl0impl-buffer.h"
+#include "ddl0impl-compare.h"
+
+namespace ddl {
+
+/** Merge sort a given array.
+@param[in, out] arr              Array to sort.
+@param[in, out] aux_arr          Auxiliary space to use for sort.
+@param[in] low                   First element (inclusive).
+@param[in] high                  Number of elements to sort from low.
+@param[in] compare               Function to compare two elements. */
+template <typename T, typename Compare>
+inline void merge_sort(T *arr, T *aux_arr, const size_t low, const size_t high,
+                       Compare compare) {
+  ut_a(low < high);
+
+  if (low == high - 2) {
+    if (compare(arr[low], arr[high - 1]) > 0) {
+      aux_arr[low] = arr[low];
+      arr[low] = arr[high - 1];
+      arr[high - 1] = aux_arr[low];
+    }
+    return;
+  } else if (unlikely(low == high - 1)) {
+    return;
+  }
+
+  auto l = low;
+  auto h = (low + high) >> 1;
+  const auto m = h;
+
+  merge_sort(arr, aux_arr, low, m, compare);
+  merge_sort(arr, aux_arr, m, high, compare);
+
+  for (auto i = low; i < high; ++i) {
+    if (l >= m) {
+      aux_arr[i] = arr[h++];
+    } else if (h >= high) {
+      aux_arr[i] = arr[l++];
+    } else if (compare(arr[l], arr[h]) > 0) {
+      aux_arr[i] = arr[h++];
+    } else {
+      aux_arr[i] = arr[l++];
+    }
+  }
+
+  memcpy(arr + low, aux_arr + low, (high - low) * sizeof(*arr));
+}
+
+Key_sort_buffer::Key_sort_buffer(dict_index_t *index, size_t size) noexcept
+    : m_index(index), m_buffer_size(size) {
+  m_max_tuples = m_buffer_size / std::max(ulint{1}, m_index->get_min_size());
+  m_dtuples.resize(m_max_tuples);
+  m_heap = mem_heap_create(1024);
+}
+
+void Key_sort_buffer::deep_copy(size_t n_fields, size_t data_size) noexcept {
+  auto field = m_dtuples[m_n_tuples++];
+
+  do {
+    dfield_dup(field++, m_heap);
+  } while (--n_fields > 0);
+
+  m_total_size += data_size;
+}
+
+void Key_sort_buffer::clear() noexcept {
+  m_n_tuples = 0;
+  m_total_size = 0;
+  mem_heap_empty(m_heap);
+}
+
+void Key_sort_buffer::sort(Dup *dup) noexcept {
+  ut_ad(!dict_index_is_spatial(m_index));
+
+  DTuples aux{};
+
+  aux.resize(m_n_tuples);
+
+  /* Compare all the columns of the key to preserve order in the index. */
+  Compare_key compare_key(m_index, dup, true);
+
+  merge_sort(&m_dtuples[0], &aux[0], 0, m_n_tuples, compare_key);
+}
+
+dberr_t Key_sort_buffer::serialize(IO_buffer io_buffer, Function &&f) noexcept {
+  std::pair<const byte *, const byte *> bounds{
+      io_buffer.first, io_buffer.first + io_buffer.second};
+
+  size_t i{};
+  auto ptr = io_buffer.first;
+  const auto n_fields = dict_index_get_n_fields(m_index);
+
+  auto write = [=](decltype(io_buffer) &io_buffer,
+                   decltype(ptr) &ptr) -> dberr_t {
+    auto persist_buffer = io_buffer;
+
+    const size_t to_write = ptr - io_buffer.first;
+    persist_buffer.second = to_write;
+
+    os_offset_t n_written{};
+    auto err = f(persist_buffer, n_written);
+
+    if (err != DB_SUCCESS) {
+      return err;
+    }
+
+    ut_a(n_written <= to_write);
+    const auto n_move = to_write - n_written;
+
+    ptr = io_buffer.first;
+    memmove(ptr, ptr + n_written, n_move);
+    ptr += n_move;
+
+    return DB_SUCCESS;
+  };
+
+  for (const auto &fields : m_dtuples) {
+    if (i++ >= m_n_tuples) {
+      break;
+    }
+
+    ulint extra_size;
+
+    const auto size =
+        rec_get_serialize_size(m_index, fields, n_fields, nullptr, &extra_size);
+
+    {
+      const auto rec_size = size + extra_size + 2;
+
+      if (rec_size >= io_buffer.second) {
+        /* Single row doesn't fit into our IO buffer. */
+        return DB_TOO_BIG_RECORD;
+      }
+
+      ut_a(size >= extra_size);
+    }
+
+    size_t need;
+    char prefix[sizeof(uint16_t)];
+
+    /* Encode extra_size + 1 */
+    if (extra_size + 1 < 0x80) {
+      need = 1;
+      prefix[0] = (byte)(extra_size + 1);
+    } else {
+      need = 2;
+      ut_a((extra_size + 1) < 0x8000);
+      prefix[0] = (byte)(0x80 | ((extra_size + 1) >> 8));
+      prefix[1] = (byte)(extra_size + 1);
+    }
+
+    const auto rec_size = need + size;
+
+    if (unlikely(ptr + rec_size >= bounds.second)) {
+      const auto err = write(io_buffer, ptr);
+      if (err != DB_SUCCESS) {
+        return err;
+      }
+    }
+
+    memcpy(ptr, prefix, need);
+    ptr += need;
+
+    {
+      const auto p = ptr + extra_size;
+      rec_serialize_dtuple(p, m_index, fields, n_fields, nullptr);
+    }
+
+    ptr += size;
+  }
+
+  /* Write an "end-of-chunk" marker. */
+  ut_a(ptr < bounds.second);
+
+  *ptr++ = 0;
+
+  io_buffer.second = ptr - io_buffer.first;
+
+  return f(io_buffer, io_buffer.second);
+}
+
+int Key_sort_buffer::compare(const dfield_t *lhs, const dfield_t *rhs,
+                             Dup *dup) noexcept {
+  ut_ad(dup->m_index->is_clustered());
+
+  Compare_key compare_key(dup->m_index, dup, false);
+
+  return compare_key(lhs, rhs);
+}
+
+}  // namespace ddl
diff -Nru mysql-8.0-8.0.26/storage/innobase/ddl/ddl0builder.cc mysql-8.0-8.0.27/storage/innobase/ddl/ddl0builder.cc
--- mysql-8.0-8.0.26/storage/innobase/ddl/ddl0builder.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/ddl/ddl0builder.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,2145 @@
+/*****************************************************************************
+
+Copyright (c) 2020, 2021 Oracle and/or its affiliates. All Rights Reserved.
+
+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, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
+/** @file ddl/ddl0builder.cc
+ DDL build index implementation.
+Created 2020-11-01 by Sunny Bains. */
+
+#include "clone0api.h"
+#include "ddl0fts.h"
+#include "ddl0impl-builder.h"
+#include "ddl0impl-compare.h"
+#include "ddl0impl-cursor.h"
+#include "ddl0impl-loader.h"
+#include "ddl0impl-merge.h"
+#include "ddl0impl-rtree.h"
+#include "lob0lob.h"
+#include "os0thread-create.h"
+#include "row0ext.h"
+#include "row0vers.h"
+#include "ut0stage.h"
+
+namespace ddl {
+
+/** Context for copying cluster index row for the index to being created. */
+struct Copy_ctx {
+  /** Constructor.
+  @param[in] row                Row to copy.
+  @param[in,out] my_table       Server table definition.
+  @param[in] thread_id          ID of current thread. */
+  Copy_ctx(const Row &row, TABLE *my_table, size_t thread_id) noexcept
+      : m_row(row), m_my_table(my_table), m_thread_id(thread_id) {}
+
+  /** Row to copy. */
+  const Row &m_row;
+
+  /** MySQL table definition. */
+  TABLE *m_my_table{};
+
+  /** Number of columns to copy. */
+  size_t m_n_fields{};
+
+  /** Number of multivalue rows to add. */
+  size_t m_n_mv_rows_to_add{};
+
+  /** For storing multi value data. */
+  const multi_value_data *m_mv{};
+
+  /** Number of rows added or UNIV_NO_INDEX_VALUE if this is a multi-value
+  index and current row has nothing valid to be indexed. */
+  size_t m_n_rows_added{};
+
+  /** Number of bytes copied. */
+  size_t m_data_size{};
+
+  /** Number of extra bytes used. */
+  size_t m_extra_size{};
+
+  /** Number of rows added during copy. */
+  size_t m_n_recs{};
+
+  /** ID of the current thread. */
+  size_t m_thread_id{std::numeric_limits<size_t>::max()};
+};
+
+/** Generate the next document ID using a monotonic sequence. */
+struct Gen_sequence : public ddl::Context::FTS::Sequence {
+  /** Constructor.
+  @param[in] current            Current (maximum document ID) (> 0). */
+  explicit Gen_sequence(doc_id_t current) noexcept {
+    ut_a(current > 0);
+    m_doc_id = current;
+  }
+
+  /** Destructor. */
+  ~Gen_sequence() noexcept override {}
+
+  /** Get the next document ID.
+  @return the current document ID and advance the sequence. */
+  doc_id_t current() noexcept override { return m_doc_id; }
+
+  /** No supported.
+  @param[in] dtuple             Row from which to fetch ID (ignored).
+  @return the current document ID. */
+  doc_id_t fetch(const dtuple_t *dtuple = nullptr) noexcept override {
+    ut_error;
+    return 0;
+  }
+
+  /** Advance the document ID. */
+  void increment() noexcept override {
+    ++m_doc_id;
+    ++m_n_generated;
+  }
+
+  /** @return the maximum document ID seen so far. */
+  [[nodiscard]] doc_id_t max_doc_id() const noexcept override {
+    return m_doc_id;
+  }
+
+  /** @return true, because we always generate the document ID. */
+  [[nodiscard]] bool is_generated() const noexcept override { return true; }
+
+  /** @return the number of document IDs generated. */
+  doc_id_t generated_count() const noexcept override { return m_n_generated; }
+
+  /** Number of document IDs generated. */
+  doc_id_t m_n_generated{};
+};
+
+/** For loading an index from a sorted buffer. */
+struct Key_sort_buffer_cursor : public Load_cursor {
+  /** Constructor.
+  @param[in,out] builder  Index builer.
+  @param[in,out] key_buffer     Key buffer to load from. */
+  Key_sort_buffer_cursor(Builder *builder, Key_sort_buffer *key_buffer) noexcept
+      : Load_cursor(builder, nullptr), m_key_buffer(key_buffer) {}
+
+  /** Open the cursor.
+  @return DB_SUCCESS or error code. */
+  dberr_t open() noexcept;
+
+  /** Fetch the current row as a tuple. Note: Tuple columns are shallow copies.
+  @param[out] dtuple          Row represented as a tuple.
+  @return DB_SUCCESS, DB_END_OF_INDEX or error code. */
+  [[nodiscard]] dberr_t fetch(dtuple_t *&dtuple) noexcept override;
+
+  /** Move to the next record.
+  @return DB_SUCCESS, DB_END_OF_INDEX or error code. */
+  [[nodiscard]] dberr_t next() noexcept override;
+
+ private:
+  /** Tuple to return. */
+  dtuple_t *m_dtuple{};
+
+  /** Number of rows read from the key buffer. */
+  size_t m_n_rows{};
+
+  /** Row offsets. */
+  ulint *m_offsets{};
+
+  /** Heap for m_offsets and m_buf. */
+  Scoped_heap m_heap{};
+
+  /** Current merge row in m_aligned_buffer. */
+  const mrec_t *m_mrec{};
+
+  /** Key buffer to read from. */
+  Key_sort_buffer *m_key_buffer{};
+};
+
+/** For loading a Btree index from a file. */
+struct File_cursor : public Load_cursor {
+  /** Constructor.
+  @param[in] builder            The index build driver.
+  @param[in] fd                 File descriptor to read from.
+  @param[in] buffer_size        IO buffer size to use for reads.
+  @param[in] size               Size of the file in bytes.
+  @param[in,out] stage          PFS observability. */
+  File_cursor(Builder *builder, os_fd_t fd, size_t buffer_size,
+              os_offset_t size, Alter_stage *stage) noexcept;
+
+  /** Destructor. */
+  ~File_cursor() override = default;
+
+  /** Open the cursor.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t open() noexcept;
+
+  /** Fetch the current row as a tuple. Note: Tuple columns are shallow copies.
+  @param[out] dtuple            Row represented as a tuple.
+  @return DB_SUCCESS, DB_END_OF_INDEX or error code. */
+  [[nodiscard]] dberr_t fetch(dtuple_t *&dtuple) noexcept override;
+
+  /** Fetch the current row.
+  @param[out] mrec              Current row.
+  @param[out] offsets           Column offsets inside mrec.
+  @return DB_SUCCESS, DB_END_OF_INDEX or error code. */
+  [[nodiscard]] dberr_t fetch(const mrec_t *&mrec, ulint *&offsets) noexcept;
+
+  /** Move to the next record.
+  @return DB_SUCCESS, DB_END_OF_INDEX or error code. */
+  [[nodiscard]] dberr_t next() noexcept override;
+
+ private:
+  /** Prepare to fetch the current row.
+  @return DB_SUCCESS, DB_END_OF_INDEX or error code. */
+  [[nodiscard]] dberr_t fetch() noexcept;
+
+ private:
+  /** Instance ID. */
+  size_t m_id{};
+
+  /** File reader. */
+  File_reader m_reader;
+
+  /** Number of rows read the file. */
+  uint64_t m_n_rows{};
+
+  /** PFS monitoring. */
+  Alter_stage *m_stage{};
+
+  friend struct Merge_cursor;
+};
+
+bool Load_cursor::duplicates_detected() const noexcept {
+  return m_dup != nullptr && !m_dup->empty();
+}
+
+dberr_t File_reader::get_tuple(Builder *builder, mem_heap_t *heap,
+                               dtuple_t *&dtuple) noexcept {
+  dtuple = row_rec_to_index_entry_low(m_mrec, m_index, &m_offsets[0], heap);
+  if (!builder->is_fts_index()) {
+    return builder->dtuple_copy_blobs(dtuple, &m_offsets[0], m_mrec, heap);
+  } else {
+    return DB_SUCCESS;
+  }
+}
+
+File_cursor::File_cursor(Builder *builder, os_fd_t fd, size_t buffer_size,
+                         os_offset_t size, Alter_stage *stage) noexcept
+    : Load_cursor(builder, nullptr),
+      m_reader(fd, builder->index(), buffer_size, size),
+      m_stage(stage) {
+  ut_a(fd != OS_FD_CLOSED);
+}
+
+dberr_t File_cursor::open() noexcept {
+  MEM_HEAP_CREATE(m_tuple_heap, 2048);
+
+  return m_reader.prepare();
+}
+
+dberr_t File_cursor::fetch() noexcept {
+  m_tuple_heap.clear();
+
+  if (m_stage != nullptr) {
+    m_stage->inc(1);
+  }
+
+  return m_builder->get_error();
+}
+
+dberr_t File_cursor::fetch(dtuple_t *&dtuple) noexcept {
+  m_err = fetch();
+
+  if (unlikely(m_err != DB_SUCCESS)) {
+    return m_err;
+  }
+
+  m_err = m_reader.get_tuple(m_builder, m_tuple_heap.get(), dtuple);
+
+  ut_a(m_err != DB_END_OF_INDEX);
+
+  return m_err;
+}
+
+dberr_t File_cursor::fetch(const mrec_t *&mrec, ulint *&offsets) noexcept {
+  m_err = fetch();
+
+  if (unlikely(m_err != DB_SUCCESS)) {
+    return m_err;
+  }
+
+  mrec = m_reader.m_mrec;
+  offsets = &m_reader.m_offsets[0];
+
+  return DB_SUCCESS;
+}
+
+dberr_t File_cursor::next() noexcept {
+  auto err = m_reader.next();
+
+  if (unlikely(err != DB_END_OF_INDEX)) {
+    m_err = err;
+  }
+
+  ++m_n_rows;
+
+  return err;
+}
+
+Merge_cursor::File_readers Merge_cursor::file_readers() noexcept {
+  File_readers file_readers{};
+
+  for (auto file_cursor : m_cursors) {
+    file_readers.push_back(&file_cursor->m_reader);
+  }
+
+  return file_readers;
+}
+
+Merge_cursor::Merge_cursor(Builder *builder, Dup *dup,
+                           Alter_stage *stage) noexcept
+    : Load_cursor(builder, dup),
+      m_pq(Compare(builder->index(), dup)),
+      m_stage(stage) {}
+
+Merge_cursor::~Merge_cursor() noexcept {
+  for (auto cursor : m_cursors) {
+    ut::delete_(cursor);
+  }
+}
+
+bool Merge_cursor::Compare::operator()(const File_cursor *lhs,
+                                       const File_cursor *rhs) const noexcept {
+  const auto &l = lhs->m_reader;
+  const auto &r = rhs->m_reader;
+
+  ut_a(l.m_index == r.m_index);
+
+  auto cmp = cmp_rec_rec_simple(r.m_mrec, l.m_mrec, &r.m_offsets[0],
+                                &l.m_offsets[0], r.m_index,
+                                m_dup != nullptr ? m_dup->m_table : nullptr);
+
+  /* Check for duplicates. */
+  if (unlikely(cmp == 0 && m_dup != nullptr)) {
+    m_dup->report(l.m_mrec, &l.m_offsets[0]);
+  }
+
+  return cmp < 0;
+}
+
+dberr_t Merge_cursor::add_file(const ddl::file_t &file,
+                               size_t buffer_size) noexcept {
+  ut_a(file.m_fd != OS_FD_CLOSED);
+
+  auto cursor = ut::new_withkey<File_cursor>(
+      ut::make_psi_memory_key(mem_key_ddl), m_builder, file.m_fd, buffer_size,
+      file.m_size, m_stage);
+
+  if (cursor == nullptr) {
+    m_err = DB_OUT_OF_MEMORY;
+    return m_err;
+  }
+
+  m_cursors.push_back(cursor);
+
+  return DB_SUCCESS;
+}
+
+dberr_t Merge_cursor::add_file(const ddl::file_t &file, size_t buffer_size,
+                               os_offset_t offset) noexcept {
+  auto err = add_file(file, buffer_size);
+
+  if (err != DB_SUCCESS) {
+    return err;
+  } else {
+    m_cursors.back()->m_reader.set_offset(offset);
+    return DB_SUCCESS;
+  }
+}
+
+void Merge_cursor::clear_eof() noexcept {
+  ut_a(m_pq.empty());
+  ut_a(!m_cursors.empty());
+  ut_a(m_err == DB_END_OF_INDEX);
+
+  m_err = DB_SUCCESS;
+
+  for (auto cursor : m_cursors) {
+    ut_a(cursor->m_err == DB_END_OF_INDEX);
+    if (!cursor->m_reader.eof()) {
+      cursor->m_err = DB_SUCCESS;
+      m_pq.push(cursor);
+    }
+  }
+}
+
+dberr_t Merge_cursor::open() noexcept {
+  ut_a(m_pq.empty());
+  ut_a(!m_cursors.empty());
+
+  /* Prime the priority queue and skip empty files. */
+  for (auto cursor : m_cursors) {
+    ut_a(cursor != nullptr);
+    m_err = cursor->open();
+    if (m_err == DB_SUCCESS) {
+      m_pq.push(cursor);
+    } else if (m_err != DB_END_OF_INDEX) {
+      return m_err;
+    }
+  }
+
+  m_err = m_pq.empty() ? DB_END_OF_INDEX : DB_SUCCESS;
+
+  return m_err;
+}
+
+File_cursor *Merge_cursor::pop() noexcept {
+  ut_a(!m_pq.empty());
+  ut_a(m_cursor == nullptr);
+  ut_a(m_err == DB_SUCCESS);
+
+  auto cursor = m_pq.top();
+
+  m_pq.pop();
+
+  return cursor;
+}
+
+dberr_t Merge_cursor::fetch(dtuple_t *&dtuple) noexcept {
+  const auto err = m_builder->check_state_of_online_build_log();
+
+  if (err != DB_SUCCESS) {
+    return err;
+  } else {
+    m_cursor = pop();
+    return m_cursor->fetch(dtuple);
+  }
+}
+
+dberr_t Merge_cursor::fetch(const mrec_t *&rec, ulint *&offsets) noexcept {
+  const auto err = m_builder->check_state_of_online_build_log();
+
+  if (err != DB_SUCCESS) {
+    return err;
+  } else {
+    m_cursor = pop();
+    return m_cursor->fetch(rec, offsets);
+  }
+}
+
+dberr_t Merge_cursor::next() noexcept {
+  ut_a(m_err == DB_SUCCESS);
+
+  m_err = m_cursor->next();
+
+  if (likely(m_err == DB_SUCCESS)) {
+    m_pq.push(m_cursor);
+    m_cursor = nullptr;
+  } else if (unlikely(m_err == DB_END_OF_INDEX)) {
+    m_cursor->m_err = m_err;
+    m_cursor = nullptr;
+    m_err = m_pq.empty() ? m_err : DB_SUCCESS;
+  }
+
+  return m_err;
+}
+
+uint64_t Merge_cursor::get_n_rows() const noexcept {
+  uint64_t n_rows{};
+
+  for (auto cursor : m_cursors) {
+    n_rows += cursor->m_n_rows;
+  }
+
+  return n_rows;
+}
+
+void Builder::convert(trx_t *trx, const dict_index_t *clust_index,
+                      const dfield_t *row_field, dfield_t *field, ulint len,
+                      const page_size_t &page_size,
+                      IF_DEBUG(bool is_sdi, ) mem_heap_t *heap) noexcept {
+  ut_ad(DATA_MBMAXLEN(field->type.mbminmaxlen) > 1);
+  ut_ad(DATA_MBMINLEN(field->type.mbminmaxlen) == 1);
+
+  auto field_len = row_field->len;
+
+  ut_a(field_len <= len);
+
+  const auto buf = reinterpret_cast<byte *>(mem_heap_alloc(heap, len));
+
+  if (row_field->ext) {
+    const byte *field_data = static_cast<byte *>(dfield_get_data(row_field));
+    ulint ext_len;
+
+    ut_a(field_len >= BTR_EXTERN_FIELD_REF_SIZE);
+    ut_ad(memcmp(field_data + field_len - BTR_EXTERN_FIELD_REF_SIZE,
+                 field_ref_zero, BTR_EXTERN_FIELD_REF_SIZE));
+
+    const auto data = lob::btr_copy_externally_stored_field_func(
+        nullptr, clust_index, &ext_len, nullptr, field_data, page_size,
+        field_len, IF_DEBUG(is_sdi, ) heap);
+
+    ut_a(ext_len < len);
+
+    memcpy(buf, data, ext_len);
+    field_len = ext_len;
+  } else {
+    memcpy(buf, row_field->data, field_len);
+  }
+
+  memset(buf + field_len, 0x20, len - field_len);
+
+  dfield_set_data(field, buf, len);
+}
+
+dberr_t Key_sort_buffer_cursor::open() noexcept {
+  auto index = m_builder->index();
+  const auto n_fields = dict_index_get_n_fields(index);
+
+  {
+    const auto i = 1 + REC_OFFS_HEADER_SIZE + n_fields;
+
+    MEM_HEAP_CREATE(m_heap, 1024 + i * sizeof(ulint));
+
+    const size_t n = i * sizeof(*m_offsets);
+
+    m_offsets = reinterpret_cast<decltype(m_offsets)>(m_heap.alloc(n));
+
+    m_offsets[0] = i;
+  }
+
+  m_offsets[1] = n_fields;
+
+  DBUG_EXECUTE_IF("ddl_read_failure", m_err = DB_CORRUPTION; return m_err;);
+
+  m_dtuple = dtuple_create(m_heap.get(), n_fields);
+
+  dtuple_set_n_fields_cmp(m_dtuple, dict_index_get_n_unique_in_tree(index));
+
+  MEM_HEAP_CREATE(m_tuple_heap, 2048);
+
+  return DB_SUCCESS;
+}
+
+dberr_t Key_sort_buffer_cursor::fetch(dtuple_t *&dtuple) noexcept {
+  m_tuple_heap.clear();
+
+  if (m_n_rows >= m_key_buffer->size()) {
+    return DB_END_OF_INDEX;
+  }
+
+  const auto fields = m_key_buffer->m_dtuples[m_n_rows];
+
+  memcpy(m_dtuple->fields, fields, m_dtuple->n_fields * sizeof(dfield_t));
+
+  /* "nullptr" - LOB pointers must be copied from the dtuple. */
+  m_err = m_builder->dtuple_copy_blobs(m_dtuple, m_offsets, nullptr,
+                                       m_tuple_heap.get());
+
+  if (m_err == DB_SUCCESS) {
+    dtuple = m_dtuple;
+  }
+
+  return m_err;
+}
+
+dberr_t Key_sort_buffer_cursor::next() noexcept {
+  ++m_n_rows;
+  return DB_SUCCESS;
+}
+
+Builder::Thread_ctx::Thread_ctx(size_t id, Key_sort_buffer *key_buffer) noexcept
+    : m_id(id), m_key_buffer(key_buffer) {}
+
+Builder::Thread_ctx::~Thread_ctx() noexcept {
+  file_destroy(&m_file);
+
+  if (m_key_buffer != nullptr) {
+    ut::delete_(m_key_buffer);
+  }
+
+  if (m_rtree_inserter != nullptr) {
+    ut::delete_(m_rtree_inserter);
+  }
+}
+
+Builder::Builder(ddl::Context &ctx, Loader &loader, size_t i) noexcept
+    : m_id(i),
+      m_ctx(ctx),
+      m_loader(loader),
+      m_index(ctx.m_indexes[m_id]),
+      m_clust_dup({ctx.m_indexes[0], ctx.m_table, ctx.m_col_map, 0}) {
+  m_tmpdir = thd_innodb_tmpdir(m_ctx.thd());
+
+  m_sort_index = is_fts_index() ? m_ctx.m_fts.m_ptr->sort_index() : m_index;
+
+  if (dict_table_is_comp(m_ctx.m_old_table) &&
+      !dict_table_is_comp(m_ctx.m_new_table)) {
+    MEM_HEAP_CREATE(m_conv_heap, sizeof(mrec_buf_t));
+  }
+}
+
+Builder::~Builder() noexcept {
+  for (auto thread_ctx : m_thread_ctxs) {
+    ut::delete_(thread_ctx);
+  }
+
+  m_thread_ctxs.clear();
+
+  if (m_local_stage != nullptr) {
+    m_local_stage->begin_phase_end();
+    ut::delete_(m_local_stage);
+  }
+
+  if (m_btr_load != nullptr) {
+    ut::delete_(m_btr_load);
+    m_btr_load = nullptr;
+  }
+}
+
+dberr_t Builder::check_state_of_online_build_log() noexcept {
+  const auto err = m_ctx.check_state_of_online_build_log();
+
+  if (err != DB_SUCCESS) {
+    set_error(err);
+  }
+
+  return get_error();
+}
+
+dberr_t Builder::init(Cursor &cursor, size_t n_threads) noexcept {
+  ut_a(m_thread_ctxs.empty());
+  ut_a(get_state() == State::INIT);
+
+  if (m_ctx.m_stage != nullptr) {
+    ut_a(m_local_stage == nullptr);
+    m_local_stage = ut::new_withkey<Alter_stage>(
+        ut::make_psi_memory_key(mem_key_ddl), *m_ctx.m_stage);
+
+    if (m_local_stage == nullptr) {
+      return DB_OUT_OF_MEMORY;
+    }
+
+    /* Each builder is responsible for building a single index. */
+    m_local_stage->begin_phase_read_pk(1);
+  }
+
+  auto buffer_size = m_ctx.scan_buffer_size(n_threads);
+  auto create_thread_ctx = [&](size_t id, dict_index_t *index) -> dberr_t {
+    auto key_buffer = ut::new_withkey<Key_sort_buffer>(
+        ut::make_psi_memory_key(mem_key_ddl), index, buffer_size.first);
+
+    if (key_buffer == nullptr) {
+      return DB_OUT_OF_MEMORY;
+    }
+
+    auto thread_ctx = ut::new_withkey<Thread_ctx>(
+        ut::make_psi_memory_key(mem_key_ddl), id, key_buffer);
+
+    if (thread_ctx == nullptr) {
+      ut::delete_(key_buffer);
+      key_buffer = nullptr;
+    }
+
+    m_thread_ctxs.push_back(thread_ctx);
+
+    if (!thread_ctx->m_aligned_buffer.allocate(buffer_size.second)) {
+      return DB_OUT_OF_MEMORY;
+    }
+
+    if (is_spatial_index()) {
+      thread_ctx->m_rtree_inserter = ut::new_withkey<RTree_inserter>(
+          ut::make_psi_memory_key(mem_key_ddl), m_ctx, index);
+
+      if (thread_ctx->m_rtree_inserter == nullptr ||
+          !thread_ctx->m_rtree_inserter->is_initialized()) {
+        ut::delete_(key_buffer);
+        return DB_OUT_OF_MEMORY;
+      }
+    }
+
+    return DB_SUCCESS;
+  };
+
+  if (is_fts_index()) {
+    auto &fts = m_ctx.m_fts;
+    auto new_table = m_ctx.m_new_table;
+
+    ut_a(fts.m_doc_id == nullptr);
+
+    if (DICT_TF2_FLAG_IS_SET(new_table, DICT_TF2_FTS_ADD_DOC_ID)) {
+      /* Generate the document ID. */
+      doc_id_t current{};
+      auto table = reinterpret_cast<dict_table_t *>(new_table);
+
+      /* Fetch the FTS Doc ID from the row. */
+      fts_get_next_doc_id(table, &current);
+
+      fts.m_doc_id = ut::new_withkey<Gen_sequence>(
+          ut::make_psi_memory_key(mem_key_ddl), current);
+    } else {
+      fts.m_doc_id = ut::new_withkey<Fetch_sequence>(
+          ut::make_psi_memory_key(mem_key_ddl), fts.m_ptr->index());
+    }
+
+    if (fts.m_doc_id == nullptr) {
+      set_error(DB_OUT_OF_MEMORY);
+      set_next_state();
+      return get_error();
+    }
+
+    ut_a(m_sort_index == fts.m_ptr->sort_index());
+
+    fts.m_ptr->start_parse_threads(this);
+  } else {
+    ut_a(m_sort_index == m_index);
+  }
+
+  for (size_t i = 0; i < n_threads; ++i) {
+    auto err = create_thread_ctx(i, m_sort_index);
+
+    if (err != DB_SUCCESS) {
+      set_error(err);
+      set_next_state();
+      return get_error();
+    }
+  }
+
+  if (cursor.m_row_heap.get() == nullptr) {
+    MEM_HEAP_CREATE(cursor.m_row_heap, sizeof(mrec_buf_t));
+
+    if (cursor.m_row_heap.get() == nullptr) {
+      set_error(DB_OUT_OF_MEMORY);
+      set_next_state();
+      return get_error();
+    }
+  }
+
+  if (is_skip_file_sort()) {
+    ut_a(m_btr_load == nullptr);
+    const auto trx_id = m_ctx.m_trx->id;
+    auto observer = m_ctx.flush_observer();
+
+    m_btr_load = ut::new_withkey<Btree_load>(
+        ut::make_psi_memory_key(mem_key_ddl), m_index, trx_id, observer);
+
+    if (m_btr_load == nullptr) {
+      set_error(DB_OUT_OF_MEMORY);
+      set_next_state();
+      return get_error();
+    }
+  }
+
+  set_next_state();
+  ut_a(get_state() != State::INIT);
+
+  return DB_SUCCESS;
+}
+
+void Builder::fts_add_doc_id(dfield_t *dst, const dict_field_t *src,
+                             doc_id_t &write_doc_id) noexcept {
+  auto &fts = m_ctx.m_fts;
+  const auto doc_id = fts.m_doc_id->current();
+
+  ut_a(doc_id <= 4294967295u);
+
+  fts_write_doc_id(reinterpret_cast<byte *>(&write_doc_id), doc_id);
+
+  dfield_set_data(dst, &write_doc_id, sizeof(write_doc_id));
+
+  dst->type.len = src->col->len;
+  dst->type.mtype = src->col->mtype;
+  dst->type.prtype = src->col->prtype;
+  dst->type.mbminmaxlen = DATA_MBMINMAXLEN(0, 0);
+}
+
+dberr_t Builder::get_virtual_column(Copy_ctx &ctx, const dict_field_t *ifield,
+                                    dict_col_t *col, dfield_t *&src_field,
+                                    size_t &mv_rows_added) noexcept {
+  const auto n_added = mv_rows_added;
+  auto v_col = reinterpret_cast<const dict_v_col_t *>(col);
+  const auto clust_index = m_ctx.m_new_table->first_index();
+  auto key_buffer = m_thread_ctxs[ctx.m_thread_id]->m_key_buffer;
+
+  if (col->is_multi_value()) {
+    ut_a(m_index->is_multi_value());
+
+    auto &mv = ctx.m_mv;
+
+    src_field = dtuple_get_nth_v_field(ctx.m_row.m_ptr, v_col->v_pos);
+
+    if (ctx.m_n_mv_rows_to_add == 0) {
+      auto p = m_v_heap.get();
+
+      src_field = innobase_get_computed_value(
+          ctx.m_row.m_ptr, v_col, clust_index, &p, key_buffer->heap(), ifield,
+          m_ctx.thd(), ctx.m_my_table, m_ctx.m_old_table, nullptr, nullptr);
+
+      m_v_heap.reset(p);
+
+      if (src_field == nullptr) {
+        ctx.m_n_rows_added = 0;
+        return DB_COMPUTE_VALUE_FAILED;
+      } else if (dfield_is_null(src_field)) {
+        ctx.m_n_mv_rows_to_add = 1;
+      } else if (src_field->len == UNIV_NO_INDEX_VALUE) {
+        /* Nothing to be indexed */
+        ctx.m_n_rows_added = UNIV_NO_INDEX_VALUE;
+        return DB_FAIL;
+      } else {
+        mv = static_cast<const multi_value_data *>(src_field->data);
+
+        ut_a(mv->num_v > n_added);
+        ctx.m_n_mv_rows_to_add = mv->num_v - n_added;
+
+        src_field->len = mv->data_len[n_added];
+        src_field->data = const_cast<void *>(mv->datap[n_added]);
+      }
+    } else {
+      src_field->data = const_cast<void *>(mv->datap[n_added]);
+      src_field->len = mv->data_len[n_added];
+    }
+  } else {
+    auto p = m_v_heap.get();
+
+    src_field = innobase_get_computed_value(
+        ctx.m_row.m_ptr, v_col, clust_index, &p, nullptr, ifield, m_ctx.thd(),
+        ctx.m_my_table, m_ctx.m_old_table, nullptr, nullptr);
+
+    m_v_heap.reset(p);
+
+    if (src_field == nullptr) {
+      ctx.m_n_rows_added = 0;
+      return DB_COMPUTE_VALUE_FAILED;
+    }
+  }
+
+  return DB_SUCCESS;
+}
+
+dberr_t Builder::copy_fts_column(Copy_ctx &ctx, dfield_t *field) noexcept {
+  doc_id_t doc_id;
+  auto &fts = m_ctx.m_fts;
+
+  if (!fts.m_doc_id->is_generated()) {
+    /* Fetch Doc ID if it already exists in the row, and not supplied by
+    the caller. Even if the value column is nullptr, we still need to
+    get the Doc ID to maintain the correct max Doc ID. */
+    doc_id = fts.m_doc_id->fetch(ctx.m_row.m_ptr);
+
+    if (unlikely(doc_id == 0)) {
+      ctx.m_n_rows_added = 0;
+      ib::warn(ER_IB_MSG_964) << "FTS Doc ID is zero. Record skipped";
+      return DB_FAIL;
+    }
+  } else {
+    doc_id = fts.m_doc_id->current();
+  }
+
+  ut_a(doc_id <= 4294967295u);
+
+  if (unlikely(!dfield_is_null(field))) {
+    auto ptr = ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY,
+                                  sizeof(FTS::Doc_item) + field->len);
+    auto doc_item = static_cast<FTS::Doc_item *>(ptr);
+    auto value = static_cast<byte *>(ptr) + sizeof(*doc_item);
+
+    memcpy(value, field->data, field->len);
+
+    field->data = value;
+
+    doc_item->m_field = field;
+    doc_item->m_doc_id = doc_id;
+
+    fts.m_ptr->enqueue(doc_item);
+  }
+
+  ctx.m_n_rows_added = 1;
+
+  return DB_SUCCESS;
+}
+
+dberr_t Builder::copy_columns(Copy_ctx &ctx, size_t &mv_rows_added,
+                              doc_id_t &write_doc_id) noexcept {
+  auto &fts = m_ctx.m_fts;
+  auto key_buffer = m_thread_ctxs[ctx.m_thread_id]->m_key_buffer;
+  auto &fields = key_buffer->m_dtuples[key_buffer->size()];
+
+  const dict_field_t *ifield = m_index->get_field(0);
+  auto field = fields = key_buffer->alloc(ctx.m_n_fields);
+  const auto page_size = dict_table_page_size(m_ctx.m_old_table);
+
+  for (size_t i = 0; i < ctx.m_n_fields; ++i, ++field, ++ifield) {
+    const auto col = ifield->col;
+    const auto col_no = dict_col_get_no(col);
+
+    /* Process the Doc ID column. */
+    if (likely(fts.m_doc_id == nullptr || !fts.m_doc_id->is_generated() ||
+               col_no != m_index->table->fts->doc_col || col->is_virtual())) {
+      dfield_t *src_field;
+
+      /* Use callback to get the virtual column value */
+      if (col->is_virtual()) {
+        auto err =
+            get_virtual_column(ctx, ifield, col, src_field, mv_rows_added);
+        if (err != DB_SUCCESS) {
+          return err;
+        }
+      } else {
+        src_field = dtuple_get_nth_field(ctx.m_row.m_ptr, col_no);
+      }
+
+      dfield_copy(field, src_field);
+
+      /* Tokenize and process data for FTS */
+      if (unlikely(is_fts_index())) {
+        auto err = copy_fts_column(ctx, field);
+        if (err != DB_SUCCESS) {
+          return err;
+        }
+        continue;
+      }
+
+      if (field->len != UNIV_SQL_NULL && col->mtype == DATA_MYSQL &&
+          col->len != field->len) {
+        if (m_conv_heap.get() != nullptr) {
+          convert(m_ctx.m_trx, m_ctx.m_old_table->first_index(), src_field,
+                  field, col->len, page_size,
+                  IF_DEBUG(dict_table_is_sdi(m_ctx.m_old_table->id), )
+                      m_conv_heap.get());
+        } else {
+          /* Field length mismatch should not happen when rebuilding
+          redundant row format table. */
+          ut_a(dict_table_is_comp(m_index->table));
+        }
+      }
+    } else {
+      fts_add_doc_id(field, ifield, write_doc_id);
+    }
+
+    ulint len = dfield_get_len(field);
+
+    if (dfield_is_null(field)) {
+      ut_a(!(col->prtype & DATA_NOT_NULL));
+      continue;
+    } else if (ctx.m_row.m_ext == nullptr) {
+      /* Not an externally stored column. */
+    } else if (m_index->is_clustered()) {
+      /* Flag externally stored fields. */
+      const byte *buf = row_ext_lookup(ctx.m_row.m_ext, col_no, &len);
+
+      if (buf != nullptr) {
+        ut_a(buf != field_ref_zero);
+        if (i < dict_index_get_n_unique(m_index)) {
+          dfield_set_data(field, buf, len);
+        } else {
+          dfield_set_ext(field);
+          len = dfield_get_len(field);
+        }
+      }
+    } else if (!col->is_virtual()) {
+      /* Only non-virtual column are stored externally */
+      const byte *buf = row_ext_lookup(ctx.m_row.m_ext, col_no, &len);
+
+      if (buf != nullptr) {
+        ut_a(buf != field_ref_zero);
+        dfield_set_data(field, buf, len);
+      }
+    }
+
+    /* If a column prefix index, take only the prefix */
+
+    if (ifield->prefix_len > 0) {
+      len = dtype_get_at_most_n_mbchars(
+          col->prtype, col->mbminmaxlen, ifield->prefix_len, len,
+          static_cast<char *>(dfield_get_data(field)));
+
+      dfield_set_len(field, len);
+    }
+
+    ut_a(len <= col->len || DATA_LARGE_MTYPE(col->mtype) ||
+         (col->mtype == DATA_POINT && len == DATA_MBR_LEN));
+
+    auto fixed_len = ifield->fixed_len;
+
+    if (fixed_len > 0 && !dict_table_is_comp(m_index->table) &&
+        DATA_MBMINLEN(col->mbminmaxlen) != DATA_MBMAXLEN(col->mbminmaxlen)) {
+      /* CHAR in ROW_FORMAT=REDUNDANT is always fixed-length, but
+      in the temporary file it is variable-length for variable-length
+      character sets. */
+      fixed_len = 0;
+    }
+
+    if (fixed_len > 0) {
+#ifdef UNIV_DEBUG
+      const auto mbminlen = DATA_MBMINLEN(col->mbminmaxlen);
+      const auto mbmaxlen = DATA_MBMAXLEN(col->mbminmaxlen);
+
+      /* len should be between size calcualted base on mbmaxlen and mbminlen
+       */
+      ut_a(len <= fixed_len);
+      ut_a(!mbmaxlen || len >= mbminlen * (fixed_len / mbmaxlen));
+      ut_a(!dfield_is_ext(field));
+#endif /* UNIV_DEBUG */
+    } else if (dfield_is_ext(field)) {
+      ctx.m_extra_size += 2;
+    } else if (len < 128 || !DATA_BIG_COL(col)) {
+      ++ctx.m_extra_size;
+    } else {
+      /* For variable-length columns, we look up the maximum length from
+      the column itself.  If this is a prefix index column shorter than
+      256 bytes, this will waste one byte. */
+      ctx.m_extra_size += 2;
+    }
+    ctx.m_data_size += len;
+  }
+
+  return DB_SUCCESS;
+}
+
+dberr_t Builder::copy_row(Copy_ctx &ctx, size_t &mv_rows_added) noexcept {
+  auto key_buffer = m_thread_ctxs[ctx.m_thread_id]->m_key_buffer;
+  const auto is_multi_value_index = m_index->is_multi_value();
+
+  ut_a(ctx.m_n_rows_added == 0);
+
+  if (unlikely(key_buffer->full())) {
+    return DB_OVERFLOW;
+  }
+
+  // clang-format off
+  DBUG_EXECUTE_IF(
+      "ddl_buf_add_two",
+      if (key_buffer->size()>= 2) {
+        return DB_OVERFLOW;
+      });
+  // clang-format on
+
+  /* Create spatial index should not come here. */
+  ut_a(!is_spatial_index());
+
+  doc_id_t write_doc_id{};
+
+  for (;;) {
+    if (unlikely(key_buffer->full())) {
+      return ctx.m_n_rows_added == 0 ? DB_OVERFLOW : DB_SUCCESS;
+    }
+
+    // clang-format off
+    DBUG_EXECUTE_IF(
+        "ddl_add_multi_value",
+        if (ctx.m_n_rows_added == 5) {
+          return DB_OVERFLOW;
+        });
+    // clang-format on
+
+    ctx.m_data_size = 0;
+    ctx.m_n_fields = dict_index_get_n_fields(m_index);
+    ctx.m_extra_size = UT_BITS_IN_BYTES(m_index->n_nullable);
+
+    /* Note: field->data will point to a value on the
+    stack: "write_doc_id" after dfield_set_data(). Because
+    there is only one doc_id per row, it shouldn't matter.
+    We allocate a new buffer before we leave the function
+    later below. */
+
+    auto err = copy_columns(ctx, mv_rows_added, write_doc_id);
+
+    if (unlikely(err != DB_SUCCESS)) {
+      return err;
+    }
+
+    /* If this is an FTS index, we already populated the sort buffer. */
+    if (unlikely(is_fts_index())) {
+      return DB_SUCCESS;
+    }
+
+#ifdef UNIV_DEBUG
+    {
+      ulint extra;
+      auto fields = key_buffer->m_dtuples[key_buffer->size()];
+
+      auto size = rec_get_serialize_size(m_index, fields, ctx.m_n_fields,
+                                         nullptr, &extra);
+
+      ut_a(ctx.m_data_size + ctx.m_extra_size == size);
+      ut_a(ctx.m_extra_size == extra);
+    }
+#endif /* UNIV_DEBUG */
+
+    /* Add to the total size of the record in the output buffer,
+    the encoded length of extra_size and the extra bytes (extra_size).
+    See Key_sort_buffer::write() for the variable-length encoding
+    of extra_size. */
+    ctx.m_data_size +=
+        (ctx.m_extra_size + 1) + ((ctx.m_extra_size + 1) >= 0x80);
+
+    /* Record size can exceed page size while converting to redundant row
+    format. There is an assert ut_ad(size < UNIV_PAGE_SIZE) in
+    rec_offs_data_size(). It may hit the assert before attempting to
+    insert the row. */
+    if (unlikely(m_conv_heap.get() != nullptr &&
+                 ctx.m_data_size > UNIV_PAGE_SIZE)) {
+      ctx.m_n_rows_added = 0;
+      return DB_TOO_BIG_RECORD;
+    }
+
+    if (unlikely(!key_buffer->will_fit(ctx.m_data_size))) {
+      if (!is_multi_value_index) {
+        ctx.m_n_rows_added = 0;
+        return DB_OVERFLOW;
+      } else {
+        return DB_SUCCESS;
+      }
+    }
+
+    key_buffer->deep_copy(ctx.m_n_fields, ctx.m_data_size);
+
+    /* Note row added and all fields copied. */
+    ctx.m_n_fields = 0;
+    ++ctx.m_n_rows_added;
+
+    if (m_conv_heap.get() != nullptr) {
+      mem_heap_empty(m_conv_heap.get());
+    }
+
+    if (ctx.m_n_rows_added < ctx.m_n_mv_rows_to_add) {
+      ut_a(is_multi_value_index);
+      ++mv_rows_added;
+
+      // clang-format off
+      DBUG_EXECUTE_IF(
+          "ddl_add_multi_value",
+          if (mv_rows_added == 7) {
+            return DB_OVERFLOW;
+          });
+      // clang-format on
+
+      continue;
+    }
+    break;
+  }
+
+  if (is_multi_value_index) {
+    mv_rows_added = 0;
+  }
+
+  ut_a(ctx.m_n_rows_added > 0 && ctx.m_n_rows_added != UNIV_NO_INDEX_VALUE);
+  return DB_SUCCESS;
+}
+
+os_fd_t Builder::create_file(ddl::file_t &file) noexcept {
+  ut_a(file.m_fd == OS_FD_CLOSED);
+
+  if (ddl::file_create(&file, m_tmpdir) != OS_FD_CLOSED) {
+    MONITOR_ATOMIC_INC(MONITOR_ALTER_TABLE_SORT_FILES);
+    ut_a(file.m_fd != OS_FD_CLOSED);
+    return file.m_fd;
+  } else {
+    return OS_FD_CLOSED;
+  }
+}
+
+dberr_t Builder::append(ddl::file_t &file, IO_buffer io_buffer) noexcept {
+  const auto fd = file.m_fd;
+  auto err = ddl::pwrite(fd, io_buffer.first, io_buffer.second, file.m_size);
+
+  if (err != DB_SUCCESS) {
+    set_error(DB_TEMP_FILE_WRITE_FAIL);
+    return get_error();
+  } else {
+    file.m_size += io_buffer.second;
+    return err;
+  }
+}
+
+dberr_t Builder::batch_insert(size_t thread_id,
+                              Latch_release &&latch_release) noexcept {
+  ut_a(is_spatial_index());
+
+  auto rtree_inserter = m_thread_ctxs[thread_id]->m_rtree_inserter;
+  const auto trx_id = m_ctx.m_trx->id;
+
+  return rtree_inserter->batch_insert(trx_id, std::move(latch_release));
+}
+
+void Builder::batch_insert_deep_copy_tuples(size_t thread_id) noexcept {
+  ut_a(is_spatial_index());
+  auto rtree_inserter = m_thread_ctxs[thread_id]->m_rtree_inserter;
+  return rtree_inserter->deep_copy_tuples();
+}
+
+dberr_t Builder::key_buffer_sort(size_t thread_id) noexcept {
+  auto key_buffer = m_thread_ctxs[thread_id]->m_key_buffer;
+
+  if (key_buffer->is_unique()) {
+    auto index = key_buffer->m_index;
+    Dup dup = {index, m_ctx.m_table, m_ctx.m_col_map, 0};
+
+    key_buffer->sort(&dup);
+
+    if (dup.m_n_dup > 0) {
+      set_error(DB_DUPLICATE_KEY);
+      return get_error();
+    }
+  } else {
+    key_buffer->sort(nullptr);
+  }
+
+  return DB_SUCCESS;
+}
+
+dberr_t Builder::insert_direct(Cursor &cursor, const Row &row,
+                               size_t thread_id) noexcept {
+  ut_a(m_id == 0);
+  ut_ad(is_skip_file_sort());
+  ut_a(!is_fts_index());
+  ut_a(m_ctx.m_trx->id > 0);
+  ut_a(!is_spatial_index());
+  ut_a(!srv_read_only_mode);
+  ut_a(!dict_index_is_ibuf(m_index));
+
+  {
+    auto err = m_ctx.check_state_of_online_build_log();
+
+    if (err != DB_SUCCESS) {
+      set_error(err);
+      return get_error();
+    }
+  }
+
+  m_btr_load->latch();
+
+  auto thread_ctx = m_thread_ctxs[thread_id];
+  auto key_buffer = thread_ctx->m_key_buffer;
+
+  /* Temporary File is not used. Insert sorted block directly into the index. */
+  cursor.m_tuple_heap.clear();
+
+  {
+    /* Copy the last row for duplicate key check. */
+    auto p = cursor.m_tuple_heap.get();
+    auto fields = key_buffer->back();
+
+    memcpy(cursor.m_prev_fields, fields, m_ctx.m_n_uniq * sizeof(dfield_t));
+
+    for (size_t i = 0; i < m_ctx.m_n_uniq; ++i) {
+      dfield_dup(&cursor.m_prev_fields[i], p);
+    }
+  }
+
+  m_prev_fields = cursor.m_prev_fields;
+
+  {
+    Key_sort_buffer_cursor key_buffer_cursor(this, key_buffer);
+
+    auto err = key_buffer_cursor.open();
+
+    if (err == DB_SUCCESS) {
+      err = m_btr_load->build(key_buffer_cursor);
+
+      /* Load didn't return an internal error, check cursor for errors. */
+      if (err == DB_SUCCESS) {
+        err = key_buffer_cursor.get_err();
+      }
+    }
+
+    if (cursor.eof() || err != DB_SUCCESS) {
+      err = m_btr_load->finish(err);
+      ut::delete_(m_btr_load);
+      m_btr_load = nullptr;
+    } else {
+      m_btr_load->release();
+    }
+
+    if (err != DB_SUCCESS) {
+      return err;
+    }
+  }
+
+  return DB_SUCCESS;
+}
+
+dberr_t Builder::batch_add_row(Row &row, size_t thread_id) noexcept {
+  ut_a(is_spatial_index());
+
+  auto key_buffer = m_thread_ctxs[thread_id]->m_key_buffer;
+  auto rtree_inserter = m_thread_ctxs[thread_id]->m_rtree_inserter;
+
+  ut_a(rtree_inserter->get_index() == key_buffer->m_index);
+
+  /* If the geometry field is invalid, report error. */
+  {
+    const auto ind_field = key_buffer->m_index->get_field(0);
+    const auto col = ind_field->col;
+    auto col_no = dict_col_get_no(col);
+    const auto dfield = dtuple_get_nth_field(row.m_ptr, col_no);
+
+    if (dfield_is_null(dfield) ||
+        dfield_get_len(dfield) < GEO_DATA_HEADER_SIZE) {
+      return DB_CANT_CREATE_GEOMETRY_OBJECT;
+    }
+  }
+
+  /* Note: This is a shallow copy. */
+  rtree_inserter->add_to_batch(row.m_ptr, row.m_ext);
+
+  return DB_SUCCESS;
+}
+
+dberr_t Builder::add_to_key_buffer(Copy_ctx &ctx,
+                                   size_t &mv_rows_added) noexcept {
+  const size_t old_mv_rows_added = mv_rows_added;
+  auto err = copy_row(ctx, mv_rows_added);
+  auto thread_ctx = m_thread_ctxs[ctx.m_thread_id];
+  auto key_buffer = thread_ctx->m_key_buffer;
+
+  if (unlikely(ctx.m_n_rows_added <= 0 || mv_rows_added != 0)) {
+    if (unlikely(mv_rows_added != 0)) {
+      /* This signals that a partial row was added to the key buffer
+      due to reaching its size limit. We need to increment the
+      file size by this amount */
+      thread_ctx->m_n_recs += (mv_rows_added - old_mv_rows_added);
+    }
+
+    if (unlikely(err == DB_COMPUTE_VALUE_FAILED)) {
+      set_error(err);
+    }
+
+    return err;
+  }
+
+  if (unlikely(ctx.m_n_rows_added == UNIV_NO_INDEX_VALUE)) {
+    ut_a(err == DB_FAIL);
+
+    /* Nothing to be indexed from current row, skip this index. */
+    ut_a(key_buffer->m_index->is_multi_value());
+    return DB_SUCCESS;
+  }
+
+  /* If we are creating FTS index, a single row can generate multiple
+  records for a tokenized word. */
+  thread_ctx->m_n_recs += ctx.m_n_rows_added;
+
+  if (unlikely(err != DB_SUCCESS)) {
+    ut_a(err == DB_TOO_BIG_RECORD || err == DB_COMPUTE_VALUE_FAILED);
+    return err;
+  }
+
+  if (unlikely(is_fts_index())) {
+    auto &fts = m_ctx.m_fts;
+
+    err = fts.m_ptr->check_for_errors();
+
+    if (unlikely(err != DB_SUCCESS)) {
+      return err;
+    }
+  }
+
+  if (is_skip_file_sort()) {
+    ut_a(!key_buffer->empty());
+    auto &fields = key_buffer->back();
+
+    ut_ad(m_id == 0);
+    ut_ad(key_buffer->is_clustered());
+
+    /* Detect duplicates by comparing the current record with previous record.*/
+    if (m_prev_fields != nullptr &&
+        Key_sort_buffer::compare(m_prev_fields, fields, &m_clust_dup) == 0) {
+      set_error(DB_DUPLICATE_KEY);
+      return get_error();
+    }
+
+    m_prev_fields = fields;
+  }
+
+  return DB_SUCCESS;
+}
+
+dberr_t Builder::bulk_add_row(Cursor &cursor, Row &row, size_t thread_id,
+                              Latch_release &&latch_release) noexcept {
+  /* Non-zero indicates this number of multi-value data have been added to the
+  key buffer, and it should just continue from this point, otherwise, this is
+  a new row to be added to the key buffer. For the output, non-zero means the
+  new number of multi-value data which have been handled, while zero means
+  this is a normal row or all data of the multi-value data in this row have
+  been parsed. */
+  size_t mv_rows_added{};
+  auto thread_ctx = m_thread_ctxs[thread_id];
+  auto key_buffer = thread_ctx->m_key_buffer;
+
+  do {
+    dberr_t err{DB_SUCCESS};
+    Copy_ctx ctx{row, m_ctx.m_eval_table, thread_id};
+
+    if (likely(!cursor.eof())) {
+      err = add_to_key_buffer(ctx, mv_rows_added);
+
+      if (err != DB_OVERFLOW) {
+        return err;
+      }
+      /* Need to make room, flush the current key buffer to disk and retry. */
+    } else if (unlikely(thread_ctx->m_n_recs == 0 && key_buffer->empty())) {
+      /* Table is empty. */
+      return DB_END_OF_INDEX;
+    }
+
+    if (unlikely(is_fts_index() &&
+                 (cursor.eof() || !m_ctx.m_fts.m_doc_id->is_generated()))) {
+      return DB_SUCCESS;
+    }
+
+    ut_ad(m_ctx.m_old_table == m_ctx.m_new_table
+              ? !key_buffer->is_clustered()
+              : (m_id == 0) == key_buffer->is_clustered());
+
+    if (!key_buffer->empty()) {
+      ut_a(err == DB_SUCCESS || err == DB_OVERFLOW);
+      err = key_buffer_sort(thread_id);
+
+      if (err != DB_SUCCESS) {
+        set_error(err);
+        return get_error();
+      }
+
+      if (is_skip_file_sort()) {
+        if (!cursor.eof()) {
+          /* Copy the row data and release any latches held by the parallel
+          scan thread. Required for the log_free_check() during mtr.commit(). */
+          err = cursor.copy_row(thread_id, row);
+
+          if (err != DB_SUCCESS) {
+            set_error(err);
+            return get_error();
+          }
+
+          err = latch_release();
+
+          if (err != DB_SUCCESS) {
+            set_error(err);
+            return get_error();
+          }
+        }
+
+        err = insert_direct(cursor, ctx.m_row, thread_id);
+
+        key_buffer->clear();
+
+        if (err != DB_SUCCESS) {
+          ut_a(m_btr_load == nullptr);
+          set_error(err);
+          return get_error();
+        }
+
+        m_ctx.note_max_trx_id(key_buffer->m_index);
+
+        if (!cursor.eof()) {
+          continue;
+        }
+
+        ut_a(m_btr_load == nullptr);
+        return DB_END_OF_INDEX;
+      }
+    }
+
+    /* Fulltext index read threads should not write to the temporary file
+    directly, @see copy_fts_column(). */
+    if (unlikely(key_buffer->is_fts())) {
+      return DB_SUCCESS;
+    }
+
+    IF_ENABLED("ddl_tmpfile_fail", set_error(DB_OUT_OF_MEMORY);
+               return get_error();)
+
+    IF_ENABLED("ddl_ins_spatial_fail", set_error(DB_FAIL); return get_error();)
+
+    if (thread_ctx->m_file.m_fd == OS_FD_CLOSED) {
+      auto fd = create_file(thread_ctx->m_file);
+
+      if (fd == OS_FD_CLOSED) {
+        set_error(DB_IO_ERROR);
+        return get_error();
+      }
+    }
+
+    IF_ENABLED("ddl_write_failure", set_error(DB_TEMP_FILE_WRITE_FAIL);
+               return get_error();)
+
+    auto persistor = [&](IO_buffer io_buffer, os_offset_t &n) -> dberr_t {
+      auto &file = thread_ctx->m_file;
+
+      ut_a(!(file.m_size % IO_BLOCK_SIZE));
+
+      if (n == 0) {
+        n = ut_uint64_align_down(io_buffer.second, IO_BLOCK_SIZE);
+      } else {
+        ut_a(n == io_buffer.second);
+        n = ut_uint64_align_up(io_buffer.second, IO_BLOCK_SIZE);
+      }
+      ut_a(n >= IO_BLOCK_SIZE);
+
+      auto err = ddl::pwrite(file.m_fd, io_buffer.first, n, file.m_size);
+
+      if (err != DB_SUCCESS) {
+        set_error(DB_TEMP_FILE_WRITE_FAIL);
+        return get_error();
+      }
+
+      file.m_size += n;
+
+      return DB_SUCCESS;
+    };
+
+    auto &file = thread_ctx->m_file;
+
+    thread_ctx->m_offsets.push_back(file.m_size);
+
+    auto io_buffer = thread_ctx->m_aligned_buffer.io_buffer();
+
+    err = key_buffer->serialize(io_buffer, persistor);
+
+    if (err != DB_SUCCESS) {
+      return err;
+    }
+
+    key_buffer->clear();
+
+    m_ctx.note_max_trx_id(key_buffer->m_index);
+
+  } while (!cursor.eof());
+
+  return DB_END_OF_INDEX;
+}
+
+dberr_t Builder::add_row(Cursor &cursor, Row &row, size_t thread_id,
+                         Latch_release &&latch_release) noexcept {
+  auto err = m_ctx.check_state_of_online_build_log();
+
+  if (err != DB_SUCCESS) {
+    set_error(err);
+  } else if (is_spatial_index()) {
+    if (!cursor.eof()) {
+      err = batch_add_row(row, thread_id);
+    }
+  } else {
+    err = bulk_add_row(cursor, row, thread_id, std::move(latch_release));
+    clear_virtual_heap();
+  }
+
+  return err;
+}
+
+void Builder::copy_blobs(trx_t *trx, const dict_index_t *index,
+                         const mrec_t *mrec, const ulint *offsets,
+                         const page_size_t &page_size, dtuple_t *tuple,
+                         IF_DEBUG(bool is_sdi, ) mem_heap_t *heap) noexcept {
+  ut_ad(mrec == nullptr || rec_offs_any_extern(offsets));
+
+  for (size_t i = 0; i < dtuple_get_n_fields(tuple); i++) {
+    ulint len;
+    const void *data;
+    auto field = dtuple_get_nth_field(tuple, i);
+
+    if (likely(!dfield_is_ext(field))) {
+      continue;
+    }
+
+    ut_ad(!dfield_is_null(field));
+
+    /* During the creation of a PRIMARY KEY, the table is X-locked, and we
+    skip copying records that have been marked for deletion. Therefore,
+    externally stored columns cannot possibly be freed between the time the
+    BLOB pointers are read (Loader::*read()) and dereferenced (below). */
+    if (mrec == nullptr) {
+      const auto field_data = static_cast<byte *>(dfield_get_data(field));
+      const auto field_len = dfield_get_len(field);
+
+      ut_a(field_len >= BTR_EXTERN_FIELD_REF_SIZE);
+
+      ut_a(memcmp(field_data + field_len - BTR_EXTERN_FIELD_REF_SIZE,
+                  field_ref_zero, BTR_EXTERN_FIELD_REF_SIZE));
+
+      data = lob::btr_copy_externally_stored_field_func(
+          nullptr, index, &len, nullptr, field_data, page_size, field_len,
+          IF_DEBUG(is_sdi, ) heap);
+    } else {
+      data = lob::btr_rec_copy_externally_stored_field_func(
+          nullptr, index, mrec, offsets, page_size, i, &len, nullptr,
+          IF_DEBUG(is_sdi, ) heap);
+    }
+
+    /* Because we have locked the table, any records
+    written by incomplete transactions must have been
+    rolled back already. There must not be any incomplete
+    BLOB columns. */
+    ut_a(data != nullptr);
+
+    dfield_set_data(field, data, len);
+  }
+}
+
+dberr_t Builder::dtuple_copy_blobs(dtuple_t *dtuple, ulint *offsets,
+                                   const mrec_t *mrec,
+                                   mem_heap_t *heap) noexcept {
+  const auto old_index = m_ctx.m_old_table->first_index();
+
+  if (m_index->is_clustered() && dict_index_is_online_ddl(old_index)) {
+    auto err = row_log_table_get_error(old_index);
+
+    if (err != DB_SUCCESS) {
+      return err;
+    }
+  }
+
+  if (dtuple->has_ext()) {
+    ut_a(m_index->is_clustered());
+
+    /* Off-page columns can be fetched safely when concurrent modifications
+    to the table are disabled. (Purge can process delete-marked records, but
+    Loader::*read() would have skipped them.)
+
+    When concurrent modifications are enabled, Loader::*read() will only
+    see rows from transactions that were committed before the ALTER TABLE
+    started (REPEATABLE READ).
+
+    Any modifications after the Loader::*read() scan will go through
+    row_log_table_apply(). Any modifications to off-page columns will be
+    tracked by row_log_table_blob_alloc() and row_log_table_blob_free(). */
+    Builder::copy_blobs(m_ctx.m_trx, old_index, mrec, offsets,
+                        dict_table_page_size(m_ctx.m_old_table), dtuple,
+                        IF_DEBUG(dict_index_is_sdi(m_index), ) heap);
+  }
+
+  ut_ad(dtuple_validate(dtuple));
+
+  return DB_SUCCESS;
+}
+
+void Builder::file_destroy(ddl::file_t *file) noexcept {
+  ut_ad(!srv_read_only_mode);
+
+  if (file->m_fd != OS_FD_CLOSED) {
+    ddl::file_destroy_low(file->m_fd);
+    file->m_fd = OS_FD_CLOSED;
+  }
+}
+
+dberr_t Builder::check_duplicates(Thread_ctxs &dupcheck, Dup *dup) noexcept {
+  Merge_cursor cursor(this, nullptr, m_local_stage);
+  const auto buffer_size = m_ctx.scan_buffer_size(m_thread_ctxs.size());
+
+  size_t n_files_to_check{};
+
+  for (auto thread_ctx : dupcheck) {
+    if (thread_ctx->m_offsets.size() == 1) {
+      auto err = cursor.add_file(thread_ctx->m_file, buffer_size.second);
+
+      if (err != DB_SUCCESS) {
+        return err;
+      }
+      ++n_files_to_check;
+    }
+  }
+
+  auto err = n_files_to_check > 0 ? cursor.open() : DB_END_OF_INDEX;
+
+  if (err != DB_SUCCESS) {
+    return err == DB_END_OF_INDEX ? DB_SUCCESS : err;
+  }
+
+  dtuple_t *dtuple{};
+  auto prev_dtuple = dtuple;
+  Scoped_heap prev_tuple_heap;
+
+  /* For secondary indexes we have to compare all the columns for the index,
+  this includes the cluster index primary key columns too. */
+  Compare_key compare_key(m_index, dup, !m_sort_index->is_clustered());
+
+  const auto n_compare = dict_index_get_n_unique_in_tree(m_index);
+
+  MEM_HEAP_CREATE(prev_tuple_heap, 2048);
+
+  while ((err = cursor.fetch(dtuple)) == DB_SUCCESS) {
+    if (prev_dtuple != nullptr) {
+      const auto cmp = compare_key(prev_dtuple->fields, dtuple->fields);
+
+      if (cmp > 0) {
+        /* Rows are out of order. */
+        return DB_CORRUPTION;
+      }
+      if (cmp == 0) {
+        return DB_DUPLICATE_KEY;
+      }
+    }
+
+    prev_tuple_heap.clear();
+
+    /* Do a deep copy. */
+    prev_dtuple = dtuple_copy(dtuple, prev_tuple_heap.get());
+    dtuple_set_n_fields_cmp(prev_dtuple, n_compare);
+
+    for (size_t i = 0; i < n_compare; ++i) {
+      dfield_dup(&prev_dtuple->fields[i], prev_tuple_heap.get());
+    }
+
+    err = cursor.next();
+
+    if (err != DB_SUCCESS) {
+      break;
+    }
+  }
+
+  return err == DB_END_OF_INDEX ? DB_SUCCESS : err;
+}
+
+dberr_t Builder::btree_build() noexcept {
+  ut_a(!is_skip_file_sort());
+
+  DEBUG_SYNC_C_IF_THD(m_ctx.thd(), "ddl_btree_build_interrupt");
+  if (m_local_stage != nullptr) {
+    m_local_stage->begin_phase_insert();
+  }
+
+  auto observer = m_ctx.m_trx->flush_observer;
+  Dup dup = {m_index, m_ctx.m_table, m_ctx.m_col_map, 0};
+  Merge_cursor cursor(this, &dup, m_local_stage);
+  const auto io_buffer_size = m_ctx.load_io_buffer_size(m_thread_ctxs.size());
+
+  size_t total_files{};
+  uint64_t total_rows{};
+  dberr_t err{DB_SUCCESS};
+
+  for (auto thread_ctx : m_thread_ctxs) {
+    if (thread_ctx->m_file.m_fd == OS_FD_CLOSED) {
+      continue;
+    }
+
+    err = cursor.add_file(thread_ctx->m_file, io_buffer_size);
+
+    if (err != DB_SUCCESS) {
+      set_error(err);
+      return get_error();
+    }
+
+    ut_a(thread_ctx->m_n_recs == thread_ctx->m_file.m_n_recs);
+
+    ++total_files;
+    total_rows += thread_ctx->m_n_recs;
+  }
+
+  Btree_load btr_load(m_index, m_ctx.m_trx->id, observer);
+
+  dberr_t cursor_err{DB_SUCCESS};
+
+  if (total_rows > 0) {
+    err = cursor.open();
+
+    if (err == DB_SUCCESS) {
+      err = btr_load.build(cursor);
+    } else if (err == DB_END_OF_INDEX) {
+      err = DB_SUCCESS;
+    }
+
+    cursor_err = cursor.get_err();
+
+    if (cursor_err == DB_END_OF_INDEX) {
+      cursor_err = DB_SUCCESS;
+    }
+
+    ut_a(err != DB_SUCCESS || total_rows == cursor.get_n_rows());
+  }
+
+  /* First we check if the Btree loader returned an internal error.
+  If loader succeeded then we check if the cursor returned an error. */
+  err = btr_load.finish(err != DB_SUCCESS ? err : cursor_err);
+
+  if (err != DB_SUCCESS) {
+    set_error(err);
+  }
+
+  set_next_state();
+
+  if (err == DB_SUCCESS) {
+    m_loader.add_task(Loader::Task{this});
+  }
+
+  return get_error();
+}
+
+dberr_t Builder::create_merge_sort_tasks() noexcept {
+  ut_a(!is_fts_index());
+  ut_a(m_ctx.m_trx->id > 0);
+  ut_a(!is_spatial_index());
+  ut_a(!srv_read_only_mode);
+  ut_a(!dict_index_is_ibuf(m_index));
+  ut_a(get_state() == State::SETUP_SORT);
+
+  ut_a(!m_thread_ctxs.empty());
+
+  os_offset_t size{};
+  Thread_ctxs dupcheck{};
+  size_t n_runs_to_merge{};
+  Dup dup = {m_index, m_ctx.m_table, m_ctx.m_col_map, 0};
+
+  for (auto thread_ctx : m_thread_ctxs) {
+    ut_a(thread_ctx->m_file.m_n_recs == 0);
+    thread_ctx->m_file.m_n_recs = thread_ctx->m_n_recs;
+
+    n_runs_to_merge += thread_ctx->m_offsets.size();
+
+    /* If there is a single file then there is nothing to merge and the
+    file must already be sorted. */
+    if (thread_ctx->m_offsets.size() < 2 && is_unique_index()) {
+      /* We have to check these files using a merge cursor. */
+      dupcheck.push_back(thread_ctx);
+    }
+
+    size += thread_ctx->m_file.m_size;
+  }
+
+  if (!dupcheck.empty()) {
+#ifdef UNIV_DEBUG
+    {
+      size_t n_empty{};
+      size_t n_single{};
+      size_t n_multiple{};
+
+      for (auto thread_ctx : m_thread_ctxs) {
+        if (thread_ctx->m_offsets.empty()) {
+          ++n_empty;
+        } else if (thread_ctx->m_offsets.size() == 1) {
+          ++n_single;
+        } else {
+          ++n_multiple;
+        }
+      }
+      ut_a(n_single + n_empty == dupcheck.size() ||
+           (n_empty == 0 && n_single == dupcheck.size()) ||
+           (n_single == 0 && n_multiple + n_empty == dupcheck.size()));
+    }
+#endif /* UNIV_DEBUG */
+    auto err = check_duplicates(dupcheck, &dup);
+
+    if (err != DB_SUCCESS) {
+      return err;
+    }
+  }
+
+  if (m_local_stage != nullptr) {
+    m_local_stage->begin_phase_sort(log2(n_runs_to_merge));
+  }
+
+  ut_a(m_n_sort_tasks == 0);
+
+  /* Set the next state so that the tasks are executed in the context
+  of the next state. */
+  set_next_state();
+
+  m_n_sort_tasks.fetch_add(m_thread_ctxs.size(), std::memory_order_relaxed);
+
+  for (auto thread_ctx : m_thread_ctxs) {
+    if (thread_ctx->m_key_buffer != nullptr) {
+      /* Free up memory that is not going to be used anymore. */
+      ut::delete_(thread_ctx->m_key_buffer);
+      thread_ctx->m_key_buffer = nullptr;
+    }
+
+    m_loader.add_task(Loader::Task{this, thread_ctx->m_id});
+  }
+
+  return DB_SUCCESS;
+}
+
+void Builder::write_redo(const dict_index_t *index) noexcept {
+  ut_ad(!index->table->is_temporary());
+
+  mtr_t mtr;
+  mtr.start();
+
+  byte *log_ptr{};
+
+  if (mlog_open(&mtr, 11 + 8, log_ptr)) {
+    log_ptr = mlog_write_initial_log_record_low(MLOG_INDEX_LOAD, index->space,
+                                                index->page, log_ptr, &mtr);
+
+    mach_write_to_8(log_ptr, index->id);
+    mlog_close(&mtr, log_ptr + 8);
+  }
+
+  mtr.commit();
+}
+
+dberr_t Builder::fts_sort_and_build() noexcept {
+  ut_a(is_fts_index());
+
+  auto &fts = m_ctx.m_fts;
+  auto err = fts.m_ptr->insert(this);
+
+  for (auto thread_ctx : m_thread_ctxs) {
+    if (thread_ctx->m_file.m_fd != OS_FD_CLOSED) {
+      file_destroy(&thread_ctx->m_file);
+    }
+  }
+
+  if (fts.m_ptr != nullptr) {
+    ut::delete_(fts.m_ptr);
+    fts.m_ptr = nullptr;
+  }
+
+  if (err != DB_SUCCESS) {
+    set_error(err);
+    set_next_state();
+    return get_error();
+  } else {
+    set_state(State::FINISH);
+    return DB_SUCCESS;
+  }
+}
+
+dberr_t Builder::finalize() noexcept {
+  ut_a(m_ctx.m_need_observer);
+  ut_a(get_state() == State::FINISH);
+
+  auto observer = m_ctx.m_trx->flush_observer;
+
+  observer->flush();
+
+  dberr_t err = DB_SUCCESS;
+  auto new_table = m_ctx.m_new_table;
+  auto space_id =
+      new_table != nullptr ? new_table->space : dict_sys_t::s_invalid_space_id;
+
+  Clone_notify notifier(Clone_notify::Type::SPACE_ALTER_INPLACE_BULK, space_id,
+                        false);
+  if (notifier.failed()) {
+    err = DB_ERROR;
+  }
+
+  if (err == DB_SUCCESS) {
+    write_redo(m_index);
+
+    DEBUG_SYNC_C_IF_THD(m_ctx.thd(), "row_log_apply_before");
+
+    err = row_log_apply(m_ctx.m_trx, m_index, m_ctx.m_table, m_local_stage);
+
+    DEBUG_SYNC_C_IF_THD(m_ctx.thd(), "row_log_apply_after");
+  }
+
+  if (err != DB_SUCCESS) {
+    set_error(err);
+  }
+
+  return err;
+}
+
+dberr_t Builder::merge_sort(size_t thread_id) noexcept {
+  dberr_t err{DB_SUCCESS};
+  auto thread_ctx = m_thread_ctxs[thread_id];
+
+  /* If there is a single (or no) list of rows then there is nothing to merge
+  and the file must already be sorted. */
+  if (thread_ctx->m_file.m_fd != OS_FD_CLOSED &&
+      thread_ctx->m_offsets.size() > 1) {
+    Merge_file_sort::Context merge_ctx;
+    Dup dup = {m_index, m_ctx.m_table, m_ctx.m_col_map, 0};
+
+    merge_ctx.m_dup = &dup;
+    merge_ctx.m_stage = m_local_stage;
+    merge_ctx.m_file = &thread_ctx->m_file;
+    merge_ctx.m_n_threads = m_thread_ctxs.size();
+
+    Merge_file_sort merge_file_sort{&merge_ctx};
+
+    err = merge_file_sort.sort(this, thread_ctx->m_offsets);
+
+    ut_a(err != DB_SUCCESS ||
+         merge_file_sort.get_n_rows() == thread_ctx->m_n_recs);
+  }
+
+  const auto n = m_n_sort_tasks.fetch_sub(1, std::memory_order_seq_cst);
+  ut_a(n > 0);
+
+  if (err != DB_SUCCESS) {
+    set_error(err);
+    set_next_state();
+  } else if (n == 1 && get_state() == State::SORT) {
+    set_next_state();
+    m_loader.add_task(Loader::Task{this});
+  }
+
+  return get_error();
+}
+
+dberr_t Builder::setup_sort() noexcept {
+  ut_a(!is_skip_file_sort());
+  ut_a(get_state() == State::SETUP_SORT);
+
+  DEBUG_SYNC_C_IF_THD(m_ctx.thd(), "ddl_merge_sort_interrupt");
+
+  const auto err = create_merge_sort_tasks();
+
+  if (err != DB_SUCCESS) {
+    set_error(err);
+    return get_error();
+  } else {
+    return DB_SUCCESS;
+  }
+}
+
+dberr_t Builder::finish() noexcept {
+  if (get_error() != DB_SUCCESS) {
+    set_next_state();
+    return get_error();
+  }
+
+  ut_a(m_n_sort_tasks == 0);
+  ut_a(get_state() == State::FINISH);
+
+  for (auto thread_ctx : m_thread_ctxs) {
+    if (thread_ctx->m_file.m_fd != OS_FD_CLOSED) {
+      file_destroy(&thread_ctx->m_file);
+    }
+  }
+
+  dberr_t err{DB_SUCCESS};
+
+  if (get_error() != DB_SUCCESS || !m_ctx.m_online) {
+    /* Do not apply any online log. */
+  } else if (m_ctx.m_old_table != m_ctx.m_new_table) {
+    ut_a(!m_index->online_log);
+    ut_a(m_index->online_status == ONLINE_INDEX_COMPLETE);
+
+    auto observer = m_ctx.m_trx->flush_observer;
+    observer->flush();
+
+  } else {
+    err = finalize();
+
+    if (err != DB_SUCCESS) {
+      set_error(err);
+    }
+  }
+
+  set_next_state();
+
+  return get_error();
+}
+
+void Builder::fallback_to_single_thread() noexcept {
+  for (size_t i = 0; i < m_thread_ctxs.size(); ++i) {
+    if (i > 0) {
+      ut::delete_(m_thread_ctxs[i]);
+      m_thread_ctxs[i] = nullptr;
+    }
+  }
+  m_thread_ctxs.resize(1);
+}
+
+void Builder::set_next_state() noexcept {
+  if (get_error() != DB_SUCCESS) {
+    set_state(State::ERROR);
+    return;
+  }
+
+  switch (get_state()) {
+    case State::INIT:
+      set_state(State::ADD);
+      break;
+
+    case State::ADD:
+      if (is_fts_index()) {
+        set_state(State::FTS_SORT_AND_BUILD);
+      } else if (!is_skip_file_sort()) {
+        set_state(State::SETUP_SORT);
+      } else {
+        set_state(State::FINISH);
+        break;
+      }
+      break;
+
+    case State::SETUP_SORT:
+      set_state(State::SORT);
+      break;
+
+    case State::SORT:
+      set_state(State::BTREE_BUILD);
+      break;
+
+    case State::BTREE_BUILD:
+      set_state(State::FINISH);
+      break;
+
+    case State::FTS_SORT_AND_BUILD:
+      set_state(State::FINISH);
+      break;
+
+    case State::FINISH:
+      set_state(State::STOP);
+      break;
+
+    case State::STOP:
+    case State::ERROR:
+      ut_error;
+  }
+}
+
+dberr_t Loader::Task::operator()() noexcept {
+  dberr_t err;
+
+  switch (m_builder->get_state()) {
+    case Builder::State::SETUP_SORT:
+      ut_a(!m_builder->is_skip_file_sort());
+      err = m_builder->setup_sort();
+      break;
+
+    case Builder::State::SORT:
+      ut_a(!m_builder->is_skip_file_sort());
+      err = m_builder->merge_sort(m_thread_id);
+      break;
+
+    case Builder::State::BTREE_BUILD:
+      err = m_builder->btree_build();
+      break;
+
+    case Builder::State::FTS_SORT_AND_BUILD:
+      ut_a(m_builder->is_fts_index());
+      err = m_builder->fts_sort_and_build();
+      break;
+
+    case Builder::State::FINISH:
+      err = m_builder->finish();
+      break;
+
+    case Builder::State::ERROR:
+      err = m_builder->get_error();
+      break;
+
+    case Builder::State::ADD:
+    case Builder::State::INIT:
+    case Builder::State::STOP:
+    default:
+      ut_error;
+  }
+
+  return err;
+}
+
+void file_destroy(ddl::file_t *file) noexcept { Builder::file_destroy(file); }
+
+}  // namespace ddl
diff -Nru mysql-8.0-8.0.26/storage/innobase/ddl/ddl0ctx.cc mysql-8.0-8.0.27/storage/innobase/ddl/ddl0ctx.cc
--- mysql-8.0-8.0.26/storage/innobase/ddl/ddl0ctx.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/ddl/ddl0ctx.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,563 @@
+/*****************************************************************************
+
+Copyright (c) 2020, 2021, Oracle and/or its affiliates. All Rights Reserved.
+
+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, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
+/** @file ddl/ddl0ctx.cc
+ DDL context implementation.
+Created 2020-11-01 by Sunny Bains. */
+
+#include "btr0load.h"
+#include "clone0api.h"
+#include "ddl0fts.h"
+#include "ddl0impl-builder.h"
+#include "ddl0impl-cursor.h"
+#include "ddl0impl-loader.h"
+#include "ddl0impl-merge.h"
+#include "dict0dd.h"
+#include "ha_prototypes.h"
+#include "handler0alter.h"
+#include "row0log.h"
+
+namespace ddl {
+
+Context::Context(trx_t *trx, dict_table_t *old_table, dict_table_t *new_table,
+                 bool online, dict_index_t **indexes, const ulint *key_numbers,
+                 size_t n_indexes, TABLE *table, const dtuple_t *add_cols,
+                 const ulint *col_map, size_t add_autoinc,
+                 ddl::Sequence &sequence, bool skip_pk_sort, Alter_stage *stage,
+                 const dict_add_v_col_t *add_v, TABLE *eval_table,
+                 size_t max_buffer_size, size_t max_threads) noexcept
+    : m_trx(trx),
+      m_fts(ddl::fts_parser_threads),
+      m_old_table(old_table),
+      m_new_table(new_table),
+      m_online(online),
+      m_table(table),
+      m_add_cols(add_cols),
+      m_col_map(col_map),
+      m_add_autoinc(add_autoinc),
+      m_sequence(sequence),
+      m_stage(stage),
+      m_add_v(add_v),
+      m_eval_table(eval_table),
+      m_skip_pk_sort(skip_pk_sort),
+      m_max_buffer_size(max_buffer_size),
+      m_max_threads(max_threads) {
+  ut_a(max_threads > 0);
+
+  ut_a(!m_online ||
+       trx->isolation_level == trx_t::isolation_level_t::REPEATABLE_READ);
+
+  /* Check if we need a flush observer to flush dirty pages.
+  Since we disable redo logging in bulk load, so we should flush
+  dirty pages before online log apply, because online log apply enables
+  redo logging (we can do further optimization here).
+
+  1. Online add index: flush dirty pages right before row_log_apply().
+  2. Table rebuild: flush dirty pages before row_log_table_apply().
+
+  We use bulk load to create all types of indexes except spatial index,
+  for which redo logging is enabled. If we create only spatial indexes,
+  we don't need to flush dirty pages at all. */
+  m_need_observer = m_old_table != m_new_table;
+
+  for (size_t i = 0; i < n_indexes; ++i) {
+    m_indexes.push_back(indexes[i]);
+
+    if (i == 0) {
+      ut_a(!m_skip_pk_sort || m_indexes.back()->is_clustered());
+      m_n_uniq = dict_index_get_n_unique(m_indexes.back());
+    }
+
+    if (!dict_index_is_spatial(m_indexes.back())) {
+      m_need_observer = true;
+    }
+    m_key_numbers.push_back(key_numbers[i]);
+  }
+
+  ut_a(m_trx->mysql_thd != nullptr);
+  ut_a(m_add_cols == nullptr || m_col_map != nullptr);
+  ut_a((m_old_table == m_new_table) == (m_col_map == nullptr));
+
+  trx_start_if_not_started_xa(m_trx, true);
+
+  if (m_need_observer) {
+    const auto space_id = m_new_table->space;
+
+    auto observer = ut::new_withkey<Flush_observer>(
+        ut::make_psi_memory_key(mem_key_ddl), space_id, m_trx, m_stage);
+
+    trx_set_flush_observer(m_trx, observer);
+  }
+
+  mutex_create(LATCH_ID_DDL_AUTOINC, &m_autoinc_mutex);
+
+  m_trx->error_key_num = ULINT_UNDEFINED;
+
+  if (m_add_cols != nullptr) {
+    m_dtuple_heap = mem_heap_create(512);
+    ut_a(m_dtuple_heap != nullptr);
+  }
+}
+
+Context::~Context() noexcept {
+  if (m_dtuple_heap != nullptr) {
+    ut_a(m_add_cols != nullptr);
+    mem_heap_free(m_dtuple_heap);
+  }
+  mutex_destroy(&m_autoinc_mutex);
+}
+
+Context::FTS::Sequence::~Sequence() noexcept {}
+
+Flush_observer *Context::flush_observer() noexcept {
+  return m_trx->flush_observer;
+}
+
+THD *Context::thd() noexcept {
+  ut_a(m_trx->mysql_thd != nullptr);
+  return m_trx->mysql_thd;
+}
+
+const dict_index_t *Context::index() const noexcept {
+  return m_old_table->first_index();
+}
+
+Context::Scan_buffer_size Context::scan_buffer_size(
+    size_t n_threads) const noexcept {
+  ut_a(n_threads > 0);
+  auto n_buffers{n_threads};
+
+  /* If there is an FTS index being built, take that into account. */
+  if (m_fts.m_ptr != nullptr) {
+    n_buffers *= FTS_NUM_AUX_INDEX;
+  } else {
+    n_buffers *= m_indexes.size();
+  }
+
+  /* A single row *must* fit into an IO block. The IO buffer should be
+  greater than the IO physical size buffer makes it easier to handle
+  FS block aligned writes. */
+  const auto io_block_size = IO_BLOCK_SIZE + ((IO_BLOCK_SIZE * 25) / 100);
+  const auto io_size = std::max(size_t(srv_page_size / 2), io_block_size);
+
+  Scan_buffer_size size{m_max_buffer_size / n_buffers, io_size};
+
+  if (size.first <= 64 * 1024) {
+    if (size.first < srv_page_size) {
+      size.first = srv_page_size;
+    } else if (size.first >= size.second * 2) {
+      size.first -= size.second;
+    }
+  } else {
+    if (size.first >= 2 * 1024 * 1024) {
+      size.second = 1024 * 1024;
+    } else if (size.first >= 1024 * 1024) {
+      size.second = 512 * 1024;
+    } else if (size.first >= 512 * 1024) {
+      size.second = 128 * 1024;
+    } else if (size.first >= 256 * 1024) {
+      size.second = 64 * 1024;
+    } else {
+      size.second = 32 * 1024;
+    }
+    size.first -= size.second;
+  }
+
+  return size;
+}
+
+size_t Context::merge_io_buffer_size(size_t n_buffers) const noexcept {
+  ut_a(n_buffers > 0);
+
+  const auto io_size = load_io_buffer_size(n_buffers);
+
+  /* We aim to do IO_BLOCK_SIZE writes all the time. */
+  ut_a(!(io_size % IO_BLOCK_SIZE));
+
+  return std::max(std::max((ulong)srv_page_size, (ulong)IO_BLOCK_SIZE),
+                  (ulong)io_size);
+}
+
+size_t Context::load_io_buffer_size(size_t n_buffers) const noexcept {
+  ut_a(n_buffers > 0);
+  const auto io_size = m_max_buffer_size / n_buffers;
+
+  return std::max(std::max((ulong)srv_page_size, (ulong)IO_BLOCK_SIZE),
+                  (ulong)((io_size / IO_BLOCK_SIZE) * IO_BLOCK_SIZE));
+}
+
+bool Context::has_virtual_columns() const noexcept {
+  if (m_add_v != nullptr || dict_index_has_virtual(index())) {
+    return true;
+  }
+
+  /* Find out if there are any virtual coumns defined on the table. */
+  for (size_t i = 0; i < m_table->s->fields; ++i) {
+    if (innobase_is_v_fld(m_table->field[i])) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+dberr_t Context::handle_autoinc(const dtuple_t *dtuple) noexcept {
+  ut_ad(m_add_autoinc != ULINT_UNDEFINED);
+  ut_ad(m_add_autoinc < m_new_table->get_n_user_cols());
+
+  const auto dfield = dtuple_get_nth_field(dtuple, m_add_autoinc);
+
+  if (dfield_is_null(dfield)) {
+    return DB_SUCCESS;
+  }
+
+  const auto dtype = dfield_get_type(dfield);
+  const auto b = static_cast<byte *>(dfield_get_data(dfield));
+
+  if (m_sequence.eof()) {
+    m_trx->error_key_num = SERVER_CLUSTER_INDEX_ID;
+    return DB_AUTOINC_READ_ERROR;
+  }
+
+  mutex_enter(&m_autoinc_mutex);
+
+  auto value = m_sequence++;
+
+  mutex_exit(&m_autoinc_mutex);
+
+  switch (dtype_get_mtype(dtype)) {
+    case DATA_INT: {
+      auto len = dfield_get_len(dfield);
+      auto usign = dtype_get_prtype(dtype) & DATA_UNSIGNED;
+      mach_write_ulonglong(b, value, len, usign);
+      break;
+    }
+
+    case DATA_FLOAT:
+      mach_float_write(b, static_cast<float>(value));
+      break;
+
+    case DATA_DOUBLE:
+      mach_double_write(b, static_cast<double>(value));
+      break;
+
+    default:
+      ut_ad(0);
+  }
+
+  return DB_SUCCESS;
+}
+
+dberr_t Context::fts_create(dict_index_t *index) noexcept {
+  /* There can only be one FTS index per table. */
+  ut_a(m_fts.m_ptr == nullptr);
+
+  m_fts.m_ptr = ut::new_withkey<ddl::FTS>(ut::make_psi_memory_key(mem_key_ddl),
+                                          *this, index, m_old_table);
+
+  if (m_fts.m_ptr != nullptr) {
+    return m_fts.m_ptr->init(m_fts.m_n_parser_threads);
+  } else {
+    return DB_OUT_OF_MEMORY;
+  }
+}
+
+dberr_t Context::cleanup(dberr_t err) noexcept {
+  ut_a(err == m_err);
+
+  if (m_err != DB_SUCCESS &&
+      m_err_key_number != std::numeric_limits<size_t>::max()) {
+    m_trx->error_key_num = m_err_key_number;
+  }
+
+  if (m_online && m_old_table == m_new_table && err != DB_SUCCESS) {
+    /* On error, flag all online secondary index creation as aborted. */
+    for (auto index : m_indexes) {
+      ut_a(!index->is_committed());
+      ut_a(!index->is_clustered());
+      ut_a(!(index->type & DICT_FTS));
+
+      /* Completed indexes should be dropped as well, and indexes whose
+      creation was aborted should be dropped from the persistent storage.
+      However, at this point we can only set some flags in the
+      not-yet-published indexes. These indexes will be dropped later in
+      drop_indexes(), called by rollback_inplace_alter_table(). */
+
+      auto latch = dict_index_get_lock(index);
+
+      switch (dict_index_get_online_status(index)) {
+        case ONLINE_INDEX_COMPLETE:
+          break;
+        case ONLINE_INDEX_CREATION:
+          rw_lock_x_lock(latch);
+          row_log_abort_sec(index);
+          index->type |= DICT_CORRUPT;
+          rw_lock_x_unlock(latch);
+          m_new_table->drop_aborted = true;
+          [[fallthrough]];
+        case ONLINE_INDEX_ABORTED:
+        case ONLINE_INDEX_ABORTED_DROPPED:
+          break;
+      }
+    }
+  }
+
+  DBUG_EXECUTE_IF("ib_index_crash_after_bulk_load", DBUG_SUICIDE(););
+
+  auto observer = m_trx->flush_observer;
+
+  if (observer != nullptr) {
+    ut_a(m_need_observer);
+
+    DBUG_EXECUTE_IF("ib_index_build_fail_before_flush", err = DB_FAIL;);
+
+    if (err != DB_SUCCESS) {
+      observer->interrupted();
+    }
+
+    observer->flush();
+
+    ut::delete_(observer);
+
+    m_trx->flush_observer = nullptr;
+
+    auto space_id = m_new_table != nullptr ? m_new_table->space
+                                           : dict_sys_t::s_invalid_space_id;
+
+    /* Notify clone after flushing all pages. */
+    Clone_notify notifier(Clone_notify::Type::SPACE_ALTER_INPLACE_BULK,
+                          space_id, false);
+
+    if (notifier.failed()) {
+      err = DB_ERROR;
+
+    } else if (is_interrupted()) {
+      err = DB_INTERRUPTED;
+    }
+
+    if (err == DB_SUCCESS) {
+      auto first_index = m_new_table->first_index();
+
+      for (auto index = first_index; index != nullptr; index = index->next()) {
+        if (m_old_table != m_new_table) {
+          Builder::write_redo(index);
+        }
+      }
+    }
+  }
+
+  return err;
+}
+
+void Context::setup_nonnull() noexcept {
+  ut_a(m_nonnull.empty());
+
+  if (m_old_table == m_new_table) {
+    return;
+  }
+
+  /* The table is being rebuilt.  Identify the columns
+  that were flagged NOT nullptr in the new table, so that
+  we can quickly check that the records in the old table
+  do not violate the added NOT nullptr constraints. */
+
+  for (size_t i = 0; i < m_old_table->get_n_cols(); ++i) {
+    if (m_old_table->get_col(i)->prtype & DATA_NOT_NULL) {
+      continue;
+    }
+
+    const auto col_no = m_col_map[i];
+
+    if (col_no == ULINT_UNDEFINED) {
+      /* The column was dropped. */
+      continue;
+    }
+
+    if (m_new_table->get_col(col_no)->prtype & DATA_NOT_NULL) {
+      m_nonnull.push_back(col_no);
+    }
+  }
+}
+
+bool Context::check_null_constraints(const dtuple_t *row) const noexcept {
+  for (const auto i : m_nonnull) {
+    auto field = &row->fields[i];
+
+    ut_ad(dfield_get_type(field)->prtype & DATA_NOT_NULL);
+
+    if (dfield_is_null(field)) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+bool Context::has_fts_indexes() const noexcept {
+  if (dict_table_has_fts_index(m_old_table)) {
+    return true;
+  }
+
+  for (auto index : m_indexes) {
+    if (index->type & DICT_FTS) {
+      return true;
+    }
+  }
+  return false;
+}
+
+dberr_t Context::setup_fts_build() noexcept {
+  for (auto index : m_indexes) {
+    if (!(index->type & DICT_FTS)) {
+      continue;
+    }
+
+    /* There can be only one FTS index on a table. */
+    auto err = fts_create(index);
+
+    if (err != DB_SUCCESS) {
+      return err;
+    }
+  }
+
+  return DB_SUCCESS;
+}
+
+dberr_t Context::check_state_of_online_build_log() noexcept {
+  if (m_online && m_old_table != m_new_table) {
+    const auto err = row_log_table_get_error(index());
+
+    if (err != DB_SUCCESS) {
+      m_trx->error_key_num = SERVER_CLUSTER_INDEX_ID;
+      return err;
+    }
+  }
+
+  return DB_SUCCESS;
+}
+
+void Context::note_max_trx_id(dict_index_t *index) noexcept {
+  if (!m_online || m_new_table != m_old_table) {
+    return;
+  }
+
+  auto rw_latch = dict_index_get_lock(index);
+
+  rw_lock_x_lock(rw_latch);
+
+  ut_a(dict_index_get_online_status(index) == ONLINE_INDEX_CREATION);
+
+  const auto max_trx_id = row_log_get_max_trx(index);
+
+  if (max_trx_id > index->trx_id) {
+    index->trx_id = max_trx_id;
+  }
+
+  rw_lock_x_unlock(rw_latch);
+}
+
+dberr_t Context::setup_pk_sort(Cursor *cursor) noexcept {
+  if (m_skip_pk_sort) {
+    return cursor->setup_pk_sort(m_n_uniq);
+  } else {
+    return DB_SUCCESS;
+  }
+}
+
+dberr_t Context::read_init(Cursor *cursor) noexcept {
+  ut_a(m_cursor == nullptr);
+
+  m_cursor = cursor;
+  setup_nonnull();
+
+  return setup_pk_sort(cursor);
+}
+
+dberr_t Context::build() noexcept {
+  Loader loader{*this};
+
+  const auto err = cleanup(loader.build_all());
+
+  /* Validate the indexes  after the pages have been flushed to disk.
+  Otherwise we can deadlock between flushing and is_free page check. */
+  ut_ad(err != DB_SUCCESS || loader.validate_indexes());
+
+  return err;
+}
+
+bool Context::is_interrupted() noexcept { return trx_is_interrupted(m_trx); }
+
+dtuple_t *Context::create_add_cols() noexcept {
+  ut_a(m_add_cols != nullptr);
+  ut_a(m_dtuple_heap != nullptr);
+
+  auto dtuple = dtuple_copy(m_add_cols, m_dtuple_heap);
+
+  for (size_t i = 0; i < m_add_cols->n_fields; ++i) {
+    dfield_dup(&dtuple->fields[i], m_dtuple_heap);
+  }
+
+  return dtuple;
+}
+
+Sequence::Sequence(THD *thd, ulonglong start_value,
+                   ulonglong max_value) noexcept
+    : m_max_value(max_value), m_next_value(start_value) {
+  if (thd != nullptr && m_max_value > 0) {
+    thd_get_autoinc(thd, &m_offset, &m_increment);
+
+    if (m_increment > 1 || m_offset > 1) {
+      /* If there is an offset or increment specified
+      then we need to work out the exact next value. */
+
+      m_next_value = innobase_next_autoinc(start_value, 1, m_increment,
+                                           m_offset, m_max_value);
+
+    } else if (start_value == 0) {
+      /* The next value can never be 0. */
+      m_next_value = 1;
+    }
+  } else {
+    m_eof = true;
+  }
+}
+
+ulonglong Sequence::operator++(int) noexcept {
+  const auto current = m_next_value;
+
+  ut_ad(!m_eof);
+  ut_ad(m_max_value > 0);
+
+  m_next_value =
+      innobase_next_autoinc(current, 1, m_increment, m_offset, m_max_value);
+
+  if (m_next_value == m_max_value && current == m_next_value) {
+    m_eof = true;
+  }
+
+  return current;
+}
+}  // namespace ddl
diff -Nru mysql-8.0-8.0.26/storage/innobase/ddl/ddl0ddl.cc mysql-8.0-8.0.27/storage/innobase/ddl/ddl0ddl.cc
--- mysql-8.0-8.0.26/storage/innobase/ddl/ddl0ddl.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/ddl/ddl0ddl.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,553 @@
+/*****************************************************************************
+
+Copyright (c) 2005, 2021, Oracle and/or its affiliates. All Rights Reserved.
+
+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, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
+/** @file ddl/ddl0ddl.cc
+ DDL implementation misc functions.
+Created 2020-11-01 by Sunny Bains. */
+
+#include "btr0load.h"
+#include "ddl0fts.h"
+#include "ddl0impl-cursor.h"
+#include "ddl0impl-merge.h"
+#include "dict0dd.h"
+#include "handler0alter.h"
+#include "lock0lock.h"
+#include "row0log.h"
+
+/* Ignore posix_fadvise() on those platforms where it does not exist */
+#if defined _WIN32
+#define posix_fadvise(fd, offset, len, advice) /* nothing */
+#endif                                         /* _WIN32 */
+
+/** Whether to disable file system cache */
+bool srv_disable_sort_file_cache;
+
+namespace ddl {
+
+/** Note that an index build has failed.
+@param[in,out] index            Index that failed to build. */
+static void index_build_failed(dict_index_t *index) noexcept;
+
+doc_id_t Fetch_sequence::fetch(const dtuple_t *dtuple) noexcept {
+  const auto doc_field =
+      dtuple_get_nth_field(dtuple, m_index->table->fts->doc_col);
+
+  const auto doc_id = static_cast<doc_id_t>(
+      mach_read_from_8(static_cast<byte *>(dfield_get_data(doc_field))));
+
+  if (doc_id > m_max_doc_id) {
+    m_max_doc_id = doc_id;
+  }
+
+  return doc_id;
+}
+
+void Dup::report(const mrec_t *mrec, const ulint *offsets) noexcept {
+  ++m_n_dup;
+
+  if (m_n_dup == 1) {
+    auto heap = mem_heap_create(1024);
+    auto dtuple = row_rec_to_index_entry_low(mrec, m_index, offsets, heap);
+
+    /* Report the first duplicate record, but count all duplicate records. */
+    innobase_fields_to_mysql(m_table, m_index, dtuple->fields);
+
+    mem_heap_free(heap);
+  }
+}
+
+void Dup::report(const dfield_t *dfield) noexcept {
+  ++m_n_dup;
+
+  if (m_n_dup == 1) {
+    /* Report the first duplicate record, but count all duplicate records. */
+    innobase_fields_to_mysql(m_table, m_index, dfield);
+  }
+}
+
+dberr_t pread(os_fd_t fd, void *ptr, size_t len, os_offset_t offset) noexcept {
+  IF_ENABLED("ddl_read_failure", return DB_IO_ERROR;)
+
+  IORequest request;
+
+  /* Merge sort pages are never compressed. */
+  request.disable_compression();
+
+  auto err = os_file_read_no_error_handling_int_fd(request, "(ddl)", fd, ptr,
+                                                   offset, len, nullptr);
+
+#ifdef POSIX_FADV_DONTNEED
+  /* Each block is read exactly once.  Free up the file cache. */
+  posix_fadvise(fd, offset, len, POSIX_FADV_DONTNEED);
+#endif /* POSIX_FADV_DONTNEED */
+
+  return err;
+}
+
+dberr_t pwrite(os_fd_t fd, void *ptr, size_t len, os_offset_t offset) noexcept {
+  IF_ENABLED("ddl_write_failure", return DB_IO_ERROR;)
+
+  IORequest request(IORequest::WRITE);
+
+  request.disable_compression();
+
+  auto err = os_file_write_int_fd(request, "(ddl)", fd, ptr, offset, len);
+
+#ifdef POSIX_FADV_DONTNEED
+  /* The block will be needed on the next merge pass,
+  but it can be evicted from the file cache meanwhile. */
+  posix_fadvise(fd, offset, len, POSIX_FADV_DONTNEED);
+#endif /* POSIX_FADV_DONTNEED */
+
+  return err;
+}
+
+os_fd_t file_create_low(const char *path) noexcept {
+  if (path == nullptr) {
+    path = innobase_mysql_tmpdir();
+  }
+#ifdef UNIV_PFS_IO
+  /* This temp file open does not go through normal file APIs, add
+ instrumentation to register with performance schema */
+  Datafile df;
+
+  df.make_filepath(path, "Innodb Merge Temp File", NO_EXT);
+
+  PSI_file_locker *locker{};
+  PSI_file_locker_state state;
+
+  locker = PSI_FILE_CALL(get_thread_file_name_locker)(
+      &state, innodb_temp_file_key.m_value, PSI_FILE_OPEN, df.filepath(),
+      &locker);
+
+  if (locker != nullptr) {
+    PSI_FILE_CALL(start_file_open_wait)(locker, __FILE__, __LINE__);
+  }
+
+#endif /* UNIV_PFS_IO */
+
+  auto fd = innobase_mysql_tmpfile(path);
+
+#ifdef UNIV_PFS_IO
+  if (locker != nullptr) {
+    PSI_FILE_CALL(end_file_open_wait_and_bind_to_descriptor)(locker, fd);
+  }
+#endif /* UNIV_PFS_IO */
+
+  if (fd < 0) {
+    ib::error(ER_IB_MSG_967) << "Cannot create temporary merge file";
+    return OS_FD_CLOSED;
+  }
+
+  return fd;
+}
+
+os_fd_t file_create(ddl::file_t *file, const char *path) noexcept {
+  file->m_size = 0;
+  file->m_n_recs = 0;
+  file->m_fd = ddl::file_create_low(path);
+
+  if (file->m_fd >= 0 && srv_disable_sort_file_cache) {
+    os_file_set_nocache(file->m_fd, "ddl0ddl.cc", "sort");
+  }
+
+  return file->m_fd;
+}
+
+void file_destroy_low(os_fd_t fd) noexcept {
+#ifdef UNIV_PFS_IO
+  struct PSI_file_locker *locker = nullptr;
+  PSI_file_locker_state state;
+  locker = PSI_FILE_CALL(get_thread_file_descriptor_locker)(&state, fd,
+                                                            PSI_FILE_CLOSE);
+  if (locker != nullptr) {
+    PSI_FILE_CALL(start_file_wait)(locker, 0, __FILE__, __LINE__);
+  }
+#endif /* UNIV_PFS_IO */
+  if (fd != OS_FD_CLOSED) {
+    close(fd);
+  }
+#ifdef UNIV_PFS_IO
+  if (locker != nullptr) {
+    PSI_FILE_CALL(end_file_wait)(locker, 0);
+  }
+#endif /* UNIV_PFS_IO */
+}
+
+dict_index_t *create_index(trx_t *trx, dict_table_t *table,
+                           const Index_defn *index_def,
+                           const dict_add_v_col_t *add_v) noexcept {
+  const size_t n_fields = index_def->m_n_fields;
+
+  ut_ad(!srv_read_only_mode);
+
+  /* Create the index prototype, using the passed in def, this is not
+  a persistent operation. We pass 0 as the space id, and determine at
+  a lower level the space id where to row the table. */
+
+  auto index = dict_mem_index_create(table->name.m_name, index_def->m_name, 0,
+                                     index_def->m_ind_type, n_fields);
+
+  ut_a(index);
+
+  index->set_committed(index_def->m_rebuild);
+
+  bool has_new_v_col{};
+
+  for (size_t i = 0; i < n_fields; i++) {
+    const char *name;
+    auto ifield = &index_def->m_fields[i];
+
+    if (ifield->m_is_v_col) {
+      if (ifield->m_col_no >= table->n_v_def) {
+        ut_ad(ifield->m_col_no < table->n_v_def + add_v->n_v_col);
+        ut_ad(ifield->m_col_no >= table->n_v_def);
+        name = add_v->v_col_name[ifield->m_col_no - table->n_v_def];
+
+        has_new_v_col = true;
+      } else {
+        name = dict_table_get_v_col_name(table, ifield->m_col_no);
+      }
+    } else {
+      name = table->get_col_name(ifield->m_col_no);
+    }
+
+    index->add_field(name, ifield->m_prefix_len, ifield->m_is_ascending);
+  }
+
+  /* Create B-tree */
+  dict_sys_mutex_exit();
+
+  dict_build_index_def(table, index, trx);
+
+  auto err = dict_index_add_to_cache_w_vcol(table, index, add_v, index->page,
+                                            trx_is_strict(trx));
+
+  if (err != DB_SUCCESS) {
+    trx->error_state = err;
+    dict_sys_mutex_enter();
+    return nullptr;
+  }
+
+  index = dict_table_get_index_on_name(table, index_def->m_name,
+                                       index_def->m_rebuild);
+  ut_ad(index != nullptr);
+
+  err = dict_create_index_tree_in_mem(index, trx);
+
+  dict_sys_mutex_enter();
+
+  if (err != DB_SUCCESS) {
+    if ((index->type & DICT_FTS) && table->fts) {
+      fts_cache_index_cache_remove(table, index);
+    }
+
+    trx->error_state = err;
+    return nullptr;
+  }
+
+  if (dict_index_is_spatial(index)) {
+    index->fill_srid_value(index_def->m_srid, index_def->m_srid_is_valid);
+  }
+
+  /* Adjust field name for newly added virtual columns. */
+  for (size_t i = 0; i < n_fields; i++) {
+    auto ifield = &index_def->m_fields[i];
+
+    if (ifield->m_is_v_col && ifield->m_col_no >= table->n_v_def) {
+      ut_ad(ifield->m_col_no < table->n_v_def + add_v->n_v_col);
+      ut_ad(ifield->m_col_no >= table->n_v_def);
+      dict_field_t *field = index->get_field(i);
+      field->name = add_v->v_col_name[ifield->m_col_no - table->n_v_def];
+    }
+  }
+
+  if (dict_index_is_spatial(index)) {
+    index->fill_srid_value(index_def->m_srid, index_def->m_srid_is_valid);
+    index->rtr_srs.reset(fetch_srs(index->srid));
+  }
+
+  index->parser = index_def->m_parser;
+  index->is_ngram = index_def->m_is_ngram;
+  index->has_new_v_col = has_new_v_col;
+
+  /* Note the id of the transaction that created this
+  index, we use it to restrict readers from accessing
+  this index, to ensure read consistency. */
+  ut_ad(index->trx_id == trx->id);
+
+  index->table->def_trx_id = trx->id;
+
+  return index;
+}
+
+dberr_t drop_table(trx_t *trx, dict_table_t *table) noexcept {
+  ut_ad(!srv_read_only_mode);
+
+  /* There must be no open transactions on the table. */
+  ut_a(table->get_ref_count() == 0);
+
+  return row_drop_table_for_mysql(table->name.m_name, trx, false, nullptr);
+}
+
+dberr_t lock_table(trx_t *trx, dict_table_t *table,
+                   enum lock_mode mode) noexcept {
+  ut_ad(!srv_read_only_mode);
+  ut_ad(mode == LOCK_X || mode == LOCK_S);
+
+  trx->op_info = "setting table lock for creating or dropping index";
+  /* Trx for DDL should not be forced to rollback for now */
+  trx->in_innodb |= TRX_FORCE_ROLLBACK_DISABLE;
+
+  return lock_table_for_trx(table, trx, mode);
+}
+
+static void index_build_failed(dict_index_t *index) noexcept {
+  DEBUG_SYNC_C("merge_drop_index_after_abort");
+
+  rw_lock_x_lock(dict_index_get_lock(index));
+
+  dict_index_set_online_status(index, ONLINE_INDEX_ABORTED_DROPPED);
+
+  rw_lock_x_unlock(dict_index_get_lock(index));
+
+  index->table->drop_aborted = true;
+
+  if (dict_index_has_virtual(index)) {
+    /* If multi-value index, a virtual column would be created too.
+    This is same for a virtual column along with an index on it case.
+    In this rollback case, the metadata for this index would be
+    inconsistent with metadata of table, because table metadata
+    doesn't have the virtual column for this index yet. So set
+    this index to be corrupted and any further use of this index
+    would be prevented. */
+    index->type |= DICT_CORRUPT;
+  }
+}
+
+/** We will have to drop the secondary indexes later, when the table is
+in use, unless the the DDL has already been externalized. Mark the indexes
+as incomplete and corrupted, so that other threads will stop using them.
+Let dict_table_close() or crash recovery or the next invocation of
+prepare_inplace_alter_table() take care of dropping the indexes.
+@param[in,out] trx              Transaction
+@param[in] table                Table that owns the indexes. */
+static void mark_secondary_indexes(trx_t *trx, dict_table_t *table) noexcept {
+  auto index = table->first_index();
+
+  while ((index = index->next()) != nullptr) {
+    ut_ad(!index->is_clustered());
+
+    switch (dict_index_get_online_status(index)) {
+      case ONLINE_INDEX_ABORTED_DROPPED:
+        continue;
+
+      case ONLINE_INDEX_COMPLETE:
+        if (index->is_committed()) {
+          /* Do nothing to already published indexes. */
+        } else if (index->type & DICT_FTS) {
+          /* Drop a completed FULLTEXT index, due to a timeout during
+          MDL upgrade for commit_inplace_alter_table(). Because only
+          concurrent reads are allowed (and they are not seeing this
+          index yet) we are safe to drop the index. */
+          auto prev = UT_LIST_GET_PREV(indexes, index);
+
+          /* At least there should be the clustered index before this one. */
+          ut_ad(prev != nullptr);
+          ut_a(table->fts);
+
+          fts_drop_index(table, index, trx, nullptr);
+
+          /* Since INNOBASE_SHARE::idx_trans_tbl is shared between all open
+          ha_innobase handles to this table, no thread should be accessing
+          this dict_index_t object. Also, we should be holding LOCK=SHARED
+          MDL on the table even after the MDL upgrade timeout. */
+
+          /* We can remove a DICT_FTS index from the cache, because we do
+          not allow ADD FULLTEXT INDEX with LOCK=NONE. If we allowed that,
+          we should exclude FTS entries from prebuilt->ins_node->entry_list
+          in ins_node_create_entry_list(). */
+          dict_index_remove_from_cache(table, index);
+
+          index = prev;
+
+        } else {
+          rw_lock_x_lock(dict_index_get_lock(index));
+
+          dict_index_set_online_status(index, ONLINE_INDEX_ABORTED);
+
+          index->type |= DICT_CORRUPT;
+
+          table->drop_aborted = true;
+
+          rw_lock_x_unlock(dict_index_get_lock(index));
+
+          ut_a(table == index->table);
+
+          ddl::index_build_failed(index);
+        }
+        break;
+
+      case ONLINE_INDEX_CREATION:
+        rw_lock_x_lock(dict_index_get_lock(index));
+        ut_ad(!index->is_committed());
+        row_log_abort_sec(index);
+        rw_lock_x_unlock(dict_index_get_lock(index));
+
+        [[fallthrough]];
+
+      case ONLINE_INDEX_ABORTED:
+        ut_a(table == index->table);
+        ddl::index_build_failed(index);
+        break;
+
+      default:
+        ut_error;
+    }
+  }
+}
+
+/** Invalidate all row_prebuilt_t::ins_graph that are referring
+to this table. That is, force row_get_prebuilt_insert_row() to
+rebuild prebuilt->ins_node->entry_list).
+@param[in,out] trx              Transaction
+@param[in] table                Table that owns the indexes. */
+static void drop_secondary_indexes(trx_t *trx, dict_table_t *table) noexcept {
+  ut_ad(table->def_trx_id <= trx->id);
+
+  table->def_trx_id = trx->id;
+
+  auto index = table->first_index();
+  auto next_index = index->next();
+
+  while ((index = next_index) != nullptr) {
+    /* read the next pointer before freeing the index */
+    next_index = index->next();
+
+    ut_ad(!index->is_clustered());
+
+    if (!index->is_committed()) {
+      /* For FTS index, drop from table->fts along with its aux tables */
+      if (index->type & DICT_FTS) {
+        ut_a(table->fts);
+        fts_drop_index(table, index, trx, nullptr);
+      }
+
+      switch (dict_index_get_online_status(index)) {
+        case ONLINE_INDEX_CREATION:
+          /* This state should only be possible when
+          prepare_inplace_alter_table() fails after invoking
+          ddl::create_index(). In inplace_alter_table(),
+          ddl::Context::cleanup() should never leave the index in
+          this state. It would invoke row_log_abort_sec() on failure. */
+        case ONLINE_INDEX_COMPLETE:
+          /* In these cases, we are able to drop the index
+          straight. The DROP INDEX was never deferred. */
+          break;
+        case ONLINE_INDEX_ABORTED:
+        case ONLINE_INDEX_ABORTED_DROPPED:
+          break;
+      }
+
+      dict_index_remove_from_cache(table, index);
+    }
+  }
+
+  table->drop_aborted = false;
+
+  ut_d(dict_table_check_for_dup_indexes(table, CHECK_ALL_COMPLETE));
+}
+
+void drop_indexes(trx_t *trx, dict_table_t *table, bool locked) noexcept {
+  ut_ad(!srv_read_only_mode);
+  ut_ad(dict_sys_mutex_own());
+  ut_ad(trx->dict_operation_lock_mode == RW_X_LATCH);
+  ut_ad(rw_lock_own(dict_operation_lock, RW_LOCK_X));
+
+  ut_d(auto index = table->first_index());
+  ut_ad(index->is_clustered());
+  ut_ad(dict_index_get_online_status(index) == ONLINE_INDEX_COMPLETE);
+
+  /* the caller should have an open handle to the table */
+  ut_ad(table->get_ref_count() >= 1);
+
+  /* It is possible that table->n_ref_count > 1 when
+  locked=TRUE. In this case, all code that should have an open
+  handle to the table be waiting for the next statement to execute,
+  or waiting for a meta-data lock.
+
+  A concurrent purge will be prevented by dict_operation_lock. */
+
+  if (!locked && table->get_ref_count() > 1) {
+    /* Mark the secondary indexes as aborted/offline. */
+    mark_secondary_indexes(trx, table);
+  } else {
+    drop_secondary_indexes(trx, table);
+  }
+}
+
+dberr_t Row::build(ddl::Context &ctx, dict_index_t *index, mem_heap_t *heap,
+                   size_t type) noexcept {
+  ut_ad(rec_offs_any_null_extern(m_rec, m_offsets) == nullptr);
+
+  /* Build a row based on the clustered index. */
+
+  m_ptr = row_build_w_add_vcol(type, index, m_rec, m_offsets, ctx.m_new_table,
+                               m_add_cols, ctx.m_add_v, ctx.m_col_map, &m_ext,
+                               heap);
+
+  if (!ctx.check_null_constraints(m_ptr)) {
+    ctx.m_trx->error_key_num = SERVER_CLUSTER_INDEX_ID;
+    return DB_INVALID_NULL;
+  }
+
+  auto &fts = ctx.m_fts;
+
+  if (fts.m_doc_id != nullptr && fts.m_doc_id->is_generated()) {
+    fts.m_doc_id->increment();
+  }
+
+  if (ctx.m_add_autoinc != ULINT_UNDEFINED) {
+    auto err = ctx.handle_autoinc(m_ptr);
+
+    if (err != DB_SUCCESS) {
+      return err;
+    }
+  }
+
+  return DB_SUCCESS;
+}
+
+dberr_t Cursor::finish(dberr_t err) noexcept {
+  if (m_ctx.m_fts.m_ptr != nullptr) {
+    /* Wait for the FTS parser threads to complete and prepare to insert. */
+    return m_ctx.m_fts.m_ptr->scan_finished(err);
+  } else {
+    return err;
+  }
+}
+
+}  // namespace ddl
diff -Nru mysql-8.0-8.0.26/storage/innobase/ddl/ddl0file-reader.cc mysql-8.0-8.0.27/storage/innobase/ddl/ddl0file-reader.cc
--- mysql-8.0-8.0.26/storage/innobase/ddl/ddl0file-reader.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/ddl/ddl0file-reader.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,249 @@
+/*****************************************************************************
+
+Copyright (c) 2020, 2021 Oracle and/or its affiliates. All Rights Reserved.
+
+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, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
+/** @file ddl/ddl0file-reader.cc
+ For reading the DDL temporary files.
+ Created 2020-11-01 by Sunny Bains. */
+
+#include "ddl0impl-file-reader.h"
+#include "dict0dict.h"
+#include "rem/rec.h"
+#include "rem0rec.h"
+
+namespace ddl {
+
+dberr_t File_reader::prepare() noexcept {
+  ut_a(m_ptr == nullptr);
+  ut_a(m_mrec == nullptr);
+  ut_a(m_buffer_size > 0);
+  ut_a(m_bounds.first == nullptr && m_bounds.second == nullptr);
+
+  if (m_offset == m_size) {
+    return DB_END_OF_INDEX;
+  }
+
+  if (!m_aligned_buffer.allocate(m_buffer_size)) {
+    return DB_OUT_OF_MEMORY;
+  }
+
+  m_io_buffer = m_aligned_buffer.io_buffer();
+
+  m_mrec = m_io_buffer.first;
+  m_bounds.first = m_io_buffer.first;
+  m_bounds.second = m_bounds.first + m_io_buffer.second,
+
+  m_ptr = m_io_buffer.first;
+
+  const auto n_fields = dict_index_get_n_fields(m_index);
+  const auto n = 1 + REC_OFFS_HEADER_SIZE + n_fields;
+
+  ut_a(m_offsets.empty());
+
+  m_offsets.resize(n);
+
+  m_offsets[0] = n;
+  m_offsets[1] = n_fields;
+
+  ut_a(m_aux_buf == nullptr);
+  m_aux_buf = ut::new_arr_withkey<byte>(ut::make_psi_memory_key(mem_key_ddl),
+                                        ut::Count{UNIV_PAGE_SIZE_MAX / 2});
+
+  if (m_aux_buf == nullptr) {
+    return DB_OUT_OF_MEMORY;
+  }
+
+  ut_a(m_size > m_offset);
+  const auto len = std::min(m_io_buffer.second, m_size - m_offset);
+  const auto err = ddl::pread(m_fd, m_io_buffer.first, len, m_offset);
+
+  if (err != DB_SUCCESS) {
+    return err;
+  }
+
+  /* Fetch and advance to the next record. */
+  m_ptr = m_io_buffer.first;
+
+  /* Position m_mrec on the first record. */
+  return next();
+}
+
+dberr_t File_reader::seek(os_offset_t offset) noexcept {
+  ut_a(m_size > offset);
+
+  m_offset = offset;
+
+  const auto len = std::min(m_io_buffer.second, m_size - m_offset);
+  const auto err = ddl::pread(m_fd, m_io_buffer.first, len, m_offset);
+
+  m_ptr = m_io_buffer.first;
+
+  return err;
+}
+
+dberr_t File_reader::read(os_offset_t offset) noexcept {
+  const auto err = seek(offset);
+
+  if (err == DB_SUCCESS) {
+    /* Position m_mrec on the first record. */
+    return next();
+  } else {
+    return err;
+  }
+}
+
+dberr_t File_reader::read_next() noexcept {
+  ut_a(m_size > m_offset);
+  return seek(m_offset + m_io_buffer.second);
+}
+
+dberr_t File_reader::next() noexcept {
+  ut_a(m_ptr >= m_bounds.first && m_ptr < m_bounds.second);
+
+  size_t extra_size = *m_ptr++;
+
+  if (extra_size == 0) {
+    /* Mark as eof. */
+    m_offset = m_size;
+    return DB_END_OF_INDEX;
+  }
+
+  if (extra_size >= 0x80) {
+    /* Read another byte of extra_size. */
+    if (m_ptr >= m_bounds.second) {
+      const auto err = read_next();
+      if (err != DB_SUCCESS) {
+        return err;
+      }
+    }
+
+    extra_size = (extra_size & 0x7f) << 8;
+    extra_size |= *m_ptr++;
+  }
+
+  /* Normalize extra_size. Above, value 0 signals "end of list". */
+  --extra_size;
+
+  /* Read the extra bytes. */
+
+  auto rec = const_cast<byte *>(m_ptr);
+
+  if (unlikely(rec + extra_size >= m_bounds.second)) {
+    /* The record spans two blocks. Copy the entire record to the auxiliary
+    buffer and handle this as a special case. */
+    const auto partial_size = std::ptrdiff_t(m_bounds.second - m_ptr);
+
+    ut_a(static_cast<size_t>(partial_size) < UNIV_PAGE_SIZE_MAX);
+
+    rec = m_aux_buf;
+
+    /* Copy the partial record from the file buffer to the aux buffer. */
+    memcpy(rec, m_ptr, partial_size);
+
+    {
+      const auto err = read_next();
+
+      if (err != DB_SUCCESS) {
+        return err;
+      }
+    }
+
+    {
+      /* Copy the reamining record from the file buffer to the aux buffer. */
+      const auto len = extra_size - partial_size;
+
+      memcpy(rec + partial_size, m_ptr, len);
+
+      m_ptr += len;
+    }
+
+    rec_deserialize_init_offsets(rec + extra_size, m_index, &m_offsets[0]);
+
+    const auto data_size = rec_offs_data_size(&m_offsets[0]);
+
+    /* These overflows should be impossible given that records are much
+    smaller than either buffer, and the record starts near the beginning
+    of each buffer. */
+    ut_a(m_ptr + data_size < m_bounds.second);
+    ut_a(extra_size + data_size < UNIV_PAGE_SIZE_MAX);
+
+    /* Copy the data bytes. */
+    memcpy(rec + extra_size, m_ptr, data_size);
+
+    m_ptr += data_size;
+
+  } else {
+    rec_deserialize_init_offsets(rec + extra_size, m_index, &m_offsets[0]);
+
+    const auto data_size = rec_offs_data_size(&m_offsets[0]);
+
+    ut_a(extra_size + data_size < UNIV_PAGE_SIZE_MAX);
+
+    const auto required = extra_size + data_size;
+
+    /* Check if the record fits entirely in the block. */
+    if (unlikely(m_ptr + required >= m_bounds.second)) {
+      /* The record spans two blocks. Copy prefix it to buf. */
+      const auto partial_size = std::ptrdiff_t(m_bounds.second - m_ptr);
+
+      rec = m_aux_buf;
+
+      memcpy(rec, m_ptr, partial_size);
+
+      /* We cannot invoke rec_offs_make_valid() here, because there
+      are no REC_N_NEW_EXTRA_BYTES between extra_size and data_size.
+      Similarly, rec_offs_validate() would fail, because it invokes
+      rec_get_status(). */
+      ut_d(m_offsets[3] = (ulint)m_index);
+      ut_d(m_offsets[2] = (ulint)rec + extra_size);
+
+      {
+        const auto err = read_next();
+
+        if (err != DB_SUCCESS) {
+          return err;
+        }
+      }
+
+      {
+        /* Copy the rest of the record. */
+        const auto len = extra_size + data_size - partial_size;
+
+        memcpy(rec + partial_size, m_ptr, len);
+        m_ptr += len;
+      }
+    } else {
+      m_ptr += required;
+    }
+  }
+
+  ++m_n_rows_read;
+
+  m_mrec = rec + extra_size;
+
+  return DB_SUCCESS;
+}
+
+}  // namespace ddl
diff -Nru mysql-8.0-8.0.26/storage/innobase/ddl/ddl0fts.cc mysql-8.0-8.0.27/storage/innobase/ddl/ddl0fts.cc
--- mysql-8.0-8.0.26/storage/innobase/ddl/ddl0fts.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/ddl/ddl0fts.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,1670 @@
+/****************************************************************************
+
+Copyright (c) 2010, 2021, Oracle and/or its affiliates. All Rights Reserved.
+
+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, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
+/** @file ddl/ddl0fts.cc
+Create Full Text Index with (parallel) merge sort.
+Created 10/13/2010 Jimmy Yang */
+
+#include <sys/types.h>
+
+#include "ddl0ddl.h"
+#include "ddl0fts.h"
+#include "ddl0impl-builder.h"
+#include "ddl0impl-merge.h"
+#include "dict0dd.h"
+#include "fts0plugin.h"
+#include "lob0lob.h"
+#include "os0thread-create.h"
+
+#include <current_thd.h>
+
+/** Parallel sort degree, must be a power of 2. */
+ulong ddl::fts_parser_threads = 2;
+
+/** Maximum pending doc memory limit in bytes for a fts tokenization thread */
+static constexpr size_t PENDING_DOC_MEMORY_LIMIT = 1000000;
+
+/** Must be a power of 2. */
+static constexpr size_t DOC_ITEM_QUEUE_SIZE = 64;
+
+namespace ddl {
+
+/** status bit used for communication between parent and child thread */
+enum class Thread_state : uint8_t { UNKNOWN, COMPLETE, EXITING, ABORT };
+
+/** Row fts token for plugin parser */
+struct Token {
+  /** Token */
+  fts_string_t *m_text{};
+
+  /** Token position in the document */
+  size_t m_position{};
+
+  /** Next token link */
+  UT_LIST_NODE_T(Token) m_token_list;
+};
+
+/** Structure stores information needed for the insertion phase of FTS
+parallel sort. */
+struct Insert {
+  /** Charset info */
+  CHARSET_INFO *m_charset{};
+
+  /** Heap */
+  mem_heap_t *m_heap{};
+
+  /** Whether to use smaller (4 bytes) integer for Doc ID */
+  bool m_doc_id_32_bit{};
+
+  /** Bulk load instance */
+  Btree_load *m_btr_bulk{};
+
+  /** Tuple to insert */
+  dtuple_t *m_tuple{};
+
+#ifdef UNIV_DEBUG
+  /** Auxiliary index id */
+  size_t m_handler_id{};
+#endif /* UNIV_DEBUG */
+};
+
+/** Structure stores information from string tokenization operation */
+struct Tokenize_ctx {
+  using Token_list = UT_LIST_BASE_NODE_T(Token, m_token_list);
+
+  /** Processed string length */
+  size_t m_processed_len{};
+
+  /** Doc start position */
+  size_t m_init_pos{};
+
+  /** The handler that triggered a buffer full event. */
+  size_t m_handler_id{};
+
+  /** Stopword list */
+  ib_rbt_t *m_cached_stopword{};
+
+  /** Token list. */
+  Token_list m_token_list{};
+};
+
+/** For parsing and sorting the documents. */
+struct FTS::Parser {
+  /** Constructor.
+  @param[in] id               Parser ID.
+  @param[in,out] ctx          DDL context.
+  @param[in,out] dup          Descriptor of FTS index being created.
+  @param[in] doc_id_32_bit      Size of the doc ID column to use for sort. */
+  Parser(size_t id, Context &ctx, Dup *dup, bool doc_id_32_bit) noexcept;
+
+  /** Destructor. */
+  ~Parser() noexcept;
+
+  /** @return the parser ID. */
+  size_t id() const noexcept { return m_id; }
+
+  /** Initialize the data structures.
+  @param[in] n_threads        Number of parsing threads.
+  @return DB_SUCCESS or error code. */
+  dberr_t init(size_t n_threads) noexcept;
+
+  /** @return the i'th file. */
+  const file_t &get_file(size_t id) noexcept { return m_handlers[id]->m_file; }
+
+  /** Data structures for building an index. */
+  struct Handler {
+    /** Constructor.
+    @param[in] id             Auxilliary index ID.
+    @param[in,out] index      Index to create.
+    @param[in] size           IO buffer size. */
+    explicit Handler(size_t id, dict_index_t *index, size_t size) noexcept;
+
+    /** Destructor. */
+    ~Handler() noexcept;
+
+    /** Aux index id. */
+    size_t m_id{};
+
+    /** Sort file */
+    file_t m_file{};
+
+    /** Sort buffer */
+    Key_sort_buffer m_key_buffer;
+
+    /** Buffer to use for temporary file writes. */
+    Aligned_buffer m_aligned_buffer;
+
+    /** Record list start offsets. */
+    Merge_offsets m_offsets{};
+  };
+
+  /** @return the parser error status. */
+  dberr_t get_error() const noexcept { return m_ctx.get_error(); }
+
+  /** Set the error code.
+  @param[in] err                Error code to set. */
+  void set_error(dberr_t err) noexcept { m_ctx.set_error(err); }
+
+  /** Enqueue a document to parse.
+  @param[in,out] doc_item       Document to parse.
+  @return DB_SUCCESS or error code. */
+  dberr_t enqueue(FTS::Doc_item *doc_item) noexcept;
+
+  /** Function performs parallel tokenization of the incoming doc strings.
+  @param[in,out] builder        Index builder instance. */
+  void parse(Builder *builder) noexcept;
+
+  /** Set the parent thread state.
+  @param[in] state              The parent state. */
+  void set_parent_state(Thread_state state) noexcept { m_parent_state = state; }
+
+ private:
+  /** Tokenize incoming text data and add to the sort buffer.
+  @param[in] doc_id             Doc ID.
+  @param[in] doc                Doc to be tokenized.
+  @param[in] word_dtype         Data structure for word col.
+  @param[in,out] t_ctx          Tokenize context.
+  @return true if the record passed, false if out of space */
+  bool doc_tokenize(doc_id_t doc_id, fts_doc_t *doc, dtype_t *word_dtype,
+                    Tokenize_ctx *t_ctx) noexcept;
+
+  /** Get next doc item from fts_doc_lis.
+  @param[in,out] doc_item         Doc item. */
+  void get_next_doc_item(FTS::Doc_item *&doc_item) noexcept;
+
+  /** Tokenize by fts plugin parser.
+  @param[in] doc                To tokenize
+  @param[in] parser             Plugin parser instance.
+  @param[in,out] t_ctx          Tokenize ctx instance. */
+  void tokenize(fts_doc_t *doc, st_mysql_ftparser *parser,
+                Tokenize_ctx *t_ctx) noexcept;
+
+  /** FTS plugin parser 'myql_add_word' callback function for row merge.
+  Refer to 'MYSQL_FTPARSER_PARAM' for more detail.
+  @param[in] param              Parser paramter.
+  @param[in] word               Token word.
+  @param[in] word_len           Word len.
+  @param[in] boolean_info       Boolean info.
+  @return always 0 - plugin requirement. */
+  static int add_word(MYSQL_FTPARSER_PARAM *param, char *word, int word_len,
+                      MYSQL_FTPARSER_BOOLEAN_INFO *boolean_info) noexcept;
+
+ private:
+  using Docq = mpmc_bq<FTS::Doc_item *>;
+  using Docq_ptr = std::unique_ptr<Docq, std::function<void(Docq *)>>;
+  using Handler_ptr = std::unique_ptr<Handler, std::function<void(Handler *)>>;
+  using Handlers = std::array<Handler_ptr, FTS_NUM_AUX_INDEX>;
+
+  /** Parallel sort ID */
+  size_t m_id{};
+
+  /** Descriptor of FTS index. */
+  Dup *m_dup{};
+
+  /** DDL context. */
+  Context &m_ctx;
+
+  /** Buffers etc. */
+  Handlers m_handlers{};
+
+  /** Whether to use 4 bytes instead of 8 bytes integer to store Doc ID during
+  sort, if Doc ID will not be big enough to use 8 bytes value. */
+  bool m_doc_id_32_bit{};
+
+  /** Doc queue to process */
+  Docq_ptr m_docq{};
+
+  /** Memory used by fts_doc_list */
+  std::atomic_size_t m_memory_used{};
+
+  /** Parent thread state */
+  Thread_state m_parent_state{Thread_state::UNKNOWN};
+};
+
+struct FTS::Inserter {
+  /** Data structures for building an index. */
+  struct Handler {
+    /** Constructor. */
+    Handler() = default;
+
+    /** Destructor. */
+    ~Handler() = default;
+
+    using Buffer = Aligned_buffer;
+    using Files = std::vector<file_t, ut::allocator<file_t>>;
+    using Buffers = std::vector<Buffer *, ut::allocator<Buffer *>>;
+
+    /** Aux index id. */
+    size_t m_id{};
+
+    /** Sort file */
+    Files m_files{};
+  };
+
+  /** Constructor.
+  @param[in,out] ctx            DDL context.
+  @param[in,out] dup            Descriptor of FTS index being created.
+  @param[in] doc_id_32_bit      Size of the doc ID column to use for sort. */
+  Inserter(Context &ctx, Dup *dup, bool doc_id_32_bit) noexcept;
+
+  /** Destructor. */
+  ~Inserter() noexcept {}
+
+  /** Read sorted file(s) containing index data tuples and insert these data
+  tuples to the index
+  @param[in,out] builder        Index builder.
+  @param[in,out] handler        Insert handler.
+  @return DB_SUCCESS or error number */
+  [[nodiscard]] dberr_t insert(Builder *builder, Handler *handler) noexcept;
+
+  /** Add a file to the handler for merging and inserting.
+  @param[in] id                 Aux index ID.
+  @param[in] file               File to merge and insert.
+  @return DB_SUCCESS or error code. */
+  dberr_t add_file(size_t id, const file_t &file) noexcept {
+    auto &handler = m_handlers[id];
+
+    handler.m_files.push_back(file);
+
+    return DB_SUCCESS;
+  }
+
+  /** Write out a single word's data as new entry/entries in the INDEX table.
+  @param[in] ins_ctx	            Insert context.
+  @param[in] word	                Word string.
+  @param[in] node	                Node colmns.
+  @return	DB_SUCCUESS if insertion runs fine, otherwise error code */
+  dberr_t write_node(const Insert *ins_ctx, const fts_string_t *word,
+                     const fts_node_t *node) noexcept;
+
+  /** Insert processed FTS data to auxillary index tables.
+  @param[in] ins_ctx              Insert context.
+  @param[in] word                 Sorted and tokenized word.
+  @return DB_SUCCESS if insertion runs fine */
+  dberr_t write_word(Insert *ins_ctx, fts_tokenizer_word_t *word) noexcept;
+
+  /** Read sorted FTS data files and insert data tuples to auxillary tables.
+  @param[in] ins_ctx              Insert context.
+  @param[in] word                 Last processed tokenized word.
+  @param[in] positions            Word position.
+  @param[in] in_doc_id            Last item doc id.
+  @param[in] dtuple               Entry to insert or nullptr on end. */
+  void insert_tuple(Insert *ins_ctx, fts_tokenizer_word_t *word,
+                    ib_vector_t *positions, doc_id_t *in_doc_id,
+                    const dtuple_t *dtuple) noexcept;
+
+  using Handlers = std::array<Handler, FTS_NUM_AUX_INDEX>;
+
+  /** For duplicate reporting. */
+  Dup *m_dup{};
+
+  /** DDL context. */
+  Context &m_ctx;
+
+  /** 32 or 64 bit doc id. */
+  bool m_doc_id_32_bit{};
+
+  /** There is one handler per parser. */
+  Handlers m_handlers{};
+};
+
+FTS::Parser::Handler::Handler(size_t id, dict_index_t *index,
+                              size_t size) noexcept
+    : m_file(), m_key_buffer(index, size), m_aligned_buffer() {}
+
+FTS::Parser::Handler::~Handler() noexcept {}
+
+FTS::Parser::Parser(size_t id, Context &ctx, Dup *dup,
+                    bool doc_id_32_bit) noexcept
+    : m_id(id), m_dup(dup), m_ctx(ctx), m_doc_id_32_bit(doc_id_32_bit) {}
+
+dberr_t FTS::Parser::init(size_t n_threads) noexcept {
+  m_docq = Docq_ptr(ut::new_withkey<Docq>(ut::make_psi_memory_key(mem_key_ddl),
+                                          DOC_ITEM_QUEUE_SIZE),
+                    [](Docq *docq) { ut::delete_(docq); });
+
+  if (m_docq == nullptr) {
+    return DB_OUT_OF_MEMORY;
+  }
+
+  const auto path = thd_innodb_tmpdir(m_ctx.thd());
+  const auto buffer_size = m_ctx.scan_buffer_size(n_threads);
+
+  for (size_t i = 0; i < FTS_NUM_AUX_INDEX; ++i) {
+    m_handlers[i] = Handler_ptr(
+        ut::new_withkey<Handler>(ut::make_psi_memory_key(mem_key_ddl), i,
+                                 m_dup->m_index, buffer_size.first),
+        [](Handler *handler) { ut::delete_(handler); });
+
+    auto &handler = m_handlers[i];
+
+    if (handler == nullptr) {
+      return DB_OUT_OF_MEMORY;
+    }
+
+    if (!handler->m_aligned_buffer.allocate(buffer_size.first)) {
+      return DB_OUT_OF_MEMORY;
+    }
+
+    if (file_create(&handler->m_file, path) < 0) {
+      return DB_OUT_OF_MEMORY;
+    }
+  }
+
+  return DB_SUCCESS;
+}
+
+FTS::Parser::~Parser() noexcept {}
+
+dberr_t FTS::Parser::enqueue(FTS::Doc_item *doc_item) noexcept {
+  auto err = get_error();
+
+  if (err != DB_SUCCESS) {
+    ut::free(doc_item);
+    return err;
+  }
+
+  const auto sz = sizeof(*doc_item) + doc_item->m_field->len;
+
+  m_memory_used.fetch_add(sz, std::memory_order_relaxed);
+
+  while (!m_docq->enqueue(doc_item)) {
+    auto err = get_error();
+
+    if (err != DB_SUCCESS) {
+      ut::delete_(doc_item);
+      m_memory_used.fetch_sub(sz, std::memory_order_relaxed);
+      return err;
+    }
+
+    std::this_thread::sleep_for(std::chrono::microseconds(1000));
+  }
+
+  size_t retries{};
+  constexpr size_t MAX_RETRIES{10000};
+  constexpr auto LIMIT = PENDING_DOC_MEMORY_LIMIT;
+
+  /* Sleep when memory used exceeds limit. */
+  while (m_memory_used.load(std::memory_order_relaxed) > LIMIT &&
+         retries < MAX_RETRIES) {
+    ++retries;
+    std::this_thread::sleep_for(std::chrono::microseconds(1000));
+  }
+
+  return DB_SUCCESS;
+}
+
+FTS::Inserter::Inserter(Context &ctx, Dup *dup, bool doc_id_32_bit) noexcept
+    : m_dup(dup), m_ctx(ctx), m_doc_id_32_bit(doc_id_32_bit) {
+  size_t i{};
+  for (auto &handler : m_handlers) {
+    handler.m_id = i++;
+  }
+}
+
+dict_index_t *FTS::create_index(dict_index_t *index, dict_table_t *table,
+                                bool *doc_id_32_bit) noexcept {
+  // FIXME: This name shouldn't be hard coded here.
+  auto new_index = dict_mem_index_create(index->table->name.m_name,
+                                         "tmp_fts_idx", 0, DICT_FTS, 3);
+
+  new_index->id = index->id;
+  new_index->table = table;
+  new_index->n_uniq = FTS_NUM_FIELDS_SORT;
+  new_index->n_def = FTS_NUM_FIELDS_SORT;
+  new_index->cached = true;
+  new_index->parser = index->parser;
+  new_index->is_ngram = index->is_ngram;
+
+  auto idx_field = index->get_field(0);
+  auto charset = fts_index_get_charset(index);
+
+  /* The first field is on the Tokenized Word */
+  auto field = new_index->get_field(0);
+
+  field->name = nullptr;
+  field->prefix_len = 0;
+  field->is_ascending = true;
+
+  field->col = static_cast<dict_col_t *>(
+      mem_heap_alloc(new_index->heap, sizeof(dict_col_t)));
+
+  field->col->len = FTS_MAX_WORD_LEN;
+
+  field->col->mtype =
+      (charset == &my_charset_latin1) ? DATA_VARCHAR : DATA_VARMYSQL;
+
+  field->col->prtype = idx_field->col->prtype | DATA_NOT_NULL;
+  field->col->mbminmaxlen = idx_field->col->mbminmaxlen;
+  field->fixed_len = 0;
+
+  /* Doc ID */
+  field = new_index->get_field(1);
+  field->name = nullptr;
+  field->prefix_len = 0;
+  field->is_ascending = true;
+
+  field->col = static_cast<dict_col_t *>(
+      mem_heap_alloc(new_index->heap, sizeof(dict_col_t)));
+
+  field->col->mtype = DATA_INT;
+  *doc_id_32_bit = false;
+
+  /* Check whether we can use 4 bytes instead of 8 bytes integer
+  field to hold the Doc ID, thus reduce the overall sort size */
+  if (DICT_TF2_FLAG_IS_SET(table, DICT_TF2_FTS_ADD_DOC_ID)) {
+    /* If Doc ID column is being added by this create
+    index, then just check the number of rows in the table */
+    if (dict_table_get_n_rows(table) < MAX_DOC_ID_OPT_VAL) {
+      *doc_id_32_bit = true;
+    }
+  } else {
+    doc_id_t max_doc_id;
+
+    /* If the Doc ID column is supplied by user, then
+    check the maximum Doc ID in the table */
+    max_doc_id = fts_get_max_doc_id((dict_table_t *)table);
+
+    if (max_doc_id && max_doc_id < MAX_DOC_ID_OPT_VAL) {
+      *doc_id_32_bit = true;
+    }
+  }
+
+  if (*doc_id_32_bit) {
+    field->col->len = sizeof(uint32_t);
+    field->fixed_len = sizeof(uint32_t);
+  } else {
+    field->col->len = FTS_DOC_ID_LEN;
+    field->fixed_len = FTS_DOC_ID_LEN;
+  }
+
+  field->col->prtype = DATA_NOT_NULL | DATA_BINARY_TYPE;
+
+  field->col->mbminmaxlen = 0;
+
+  /* The third field is on the word's position in the original doc */
+  field = new_index->get_field(2);
+  field->name = nullptr;
+  field->prefix_len = 0;
+  field->is_ascending = true;
+
+  field->col = static_cast<dict_col_t *>(
+      mem_heap_alloc(new_index->heap, sizeof(dict_col_t)));
+
+  field->col->mtype = DATA_INT;
+  field->col->len = 4;
+  field->fixed_len = 4;
+  field->col->prtype = DATA_NOT_NULL;
+  field->col->mbminmaxlen = 0;
+
+  return new_index;
+}
+
+int FTS::Parser::add_word(MYSQL_FTPARSER_PARAM *param, char *word, int word_len,
+                          MYSQL_FTPARSER_BOOLEAN_INFO *boolean_info) noexcept {
+  auto t_ctx = static_cast<Tokenize_ctx *>(param->mysql_ftparam);
+  ut_a(t_ctx != nullptr);
+
+  fts_string_t str;
+
+  str.f_len = word_len;
+  str.f_str = reinterpret_cast<byte *>(word);
+  str.f_n_char = fts_get_token_size((CHARSET_INFO *)param->cs, word, word_len);
+
+  ut_ad(boolean_info->position >= 0);
+
+  auto ptr = static_cast<byte *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY,
+                         sizeof(Token) + sizeof(fts_string_t) + str.f_len));
+
+  auto fts_token = reinterpret_cast<Token *>(ptr);
+
+  fts_token->m_text = reinterpret_cast<fts_string_t *>(ptr + sizeof(Token));
+
+  fts_token->m_text->f_str =
+      static_cast<byte *>(ptr + sizeof(Token) + sizeof(fts_string_t));
+
+  fts_token->m_text->f_len = str.f_len;
+
+  fts_token->m_text->f_n_char = str.f_n_char;
+
+  memcpy(fts_token->m_text->f_str, str.f_str, str.f_len);
+
+  fts_token->m_position = boolean_info->position;
+
+  /* Add token to list */
+  UT_LIST_ADD_LAST(t_ctx->m_token_list, fts_token);
+
+  return 0;
+}
+
+void FTS::Parser::tokenize(fts_doc_t *doc, st_mysql_ftparser *parser,
+                           Tokenize_ctx *t_ctx) noexcept {
+  MYSQL_FTPARSER_PARAM param;
+
+  param.cs = doc->charset;
+  param.mysql_ftparam = t_ctx;
+  param.mysql_add_word = add_word;
+  param.mode = MYSQL_FTPARSER_SIMPLE_MODE;
+  param.length = static_cast<int>(doc->text.f_len);
+  param.mysql_parse = fts_tokenize_document_internal;
+  param.doc = reinterpret_cast<char *>(doc->text.f_str);
+
+  int ret{};
+
+  if (parser->init != nullptr) {
+    ret = parser->init(&param);
+  }
+
+  if (ret == 0) {
+    ret = parser->parse(&param);
+    if (ret != 0) {
+      set_error(DB_UNSUPPORTED);
+    }
+  } else {
+    set_error(DB_ERROR);
+  }
+
+  if (parser->deinit != nullptr) {
+    ut_a(parser->init != nullptr);
+    ret = parser->deinit(&param);
+    if (ret != 0) {
+      set_error(DB_ERROR);
+    }
+  }
+}
+
+bool FTS::Parser::doc_tokenize(doc_id_t doc_id, fts_doc_t *doc,
+                               dtype_t *word_dtype,
+                               Tokenize_ctx *t_ctx) noexcept {
+  size_t inc = 0;
+  bool buf_full{};
+  fts_string_t str;
+  fts_string_t t_str;
+  std::array<byte, FTS_MAX_WORD_LEN + 1> str_buf;
+
+  t_str.f_n_char = 0;
+  t_ctx->m_handler_id = 0;
+
+  auto parser = m_dup->m_index->parser;
+  auto is_ngram = m_dup->m_index->is_ngram;
+
+  /* Tokenize the data and add each word string, its corresponding
+  doc id and position to sort buffer */
+  while (t_ctx->m_processed_len < doc->text.f_len) {
+    Token *fts_token{};
+
+    if (parser != nullptr) {
+      if (t_ctx->m_processed_len == 0) {
+        /* Parse the whole doc and cache tokens. */
+        tokenize(doc, parser, t_ctx);
+
+        /* Just indictate we have parsed all the word. */
+        t_ctx->m_processed_len += 1;
+      }
+
+      /* Then get a token. */
+      fts_token = UT_LIST_GET_FIRST(t_ctx->m_token_list);
+
+      if (fts_token != nullptr) {
+        str.f_len = fts_token->m_text->f_len;
+        str.f_n_char = fts_token->m_text->f_n_char;
+        str.f_str = fts_token->m_text->f_str;
+      } else {
+        ut_a(UT_LIST_GET_LEN(t_ctx->m_token_list) == 0);
+        /* Reach the end of the list */
+        t_ctx->m_processed_len = doc->text.f_len;
+        break;
+      }
+    } else {
+      inc = innobase_mysql_fts_get_token(
+          doc->charset, doc->text.f_str + t_ctx->m_processed_len,
+          doc->text.f_str + doc->text.f_len, &str);
+
+      ut_a(inc > 0);
+    }
+
+    /* Ignore string whose character number is less than
+    "fts_min_token_size" or more than "fts_max_token_size" */
+    if (!fts_check_token(&str, nullptr, is_ngram, nullptr)) {
+      if (parser != nullptr) {
+        UT_LIST_REMOVE(t_ctx->m_token_list, fts_token);
+        ut::free(fts_token);
+      } else {
+        t_ctx->m_processed_len += inc;
+      }
+      continue;
+    }
+
+    t_str.f_len =
+        innobase_fts_casedn_str(doc->charset, (char *)str.f_str, str.f_len,
+                                (char *)&str_buf, FTS_MAX_WORD_LEN + 1);
+
+    t_str.f_str = (byte *)&str_buf;
+
+    /* If "cached_stopword" is defined, ignore words in the stopword list */
+    if (!fts_check_token(&str, t_ctx->m_cached_stopword, is_ngram,
+                         doc->charset)) {
+      if (parser != nullptr) {
+        UT_LIST_REMOVE(t_ctx->m_token_list, fts_token);
+        ut::free(fts_token);
+      } else {
+        t_ctx->m_processed_len += inc;
+      }
+      continue;
+    }
+
+    /* There are FTS_NUM_AUX_INDEX auxiliary tables, find
+    out which sort buffer to put this word record in */
+    t_ctx->m_handler_id =
+        fts_select_index(doc->charset, t_str.f_str, t_str.f_len);
+
+    auto key_buffer = &m_handlers[t_ctx->m_handler_id]->m_key_buffer;
+
+    ut_a(t_ctx->m_handler_id < FTS_NUM_AUX_INDEX);
+
+    auto &fields = key_buffer->m_dtuples[key_buffer->m_n_tuples];
+    auto field = fields = key_buffer->alloc(FTS_NUM_FIELDS_SORT);
+
+    /* The first field is the tokenized word */
+    dfield_set_data(field, t_str.f_str, t_str.f_len);
+    auto len = dfield_get_len(field);
+
+    field->type.mtype = word_dtype->mtype;
+    field->type.prtype = word_dtype->prtype | DATA_NOT_NULL;
+
+    /* Variable length field, set to max size. */
+    field->type.len = FTS_MAX_WORD_LEN;
+    field->type.mbminmaxlen = word_dtype->mbminmaxlen;
+
+    auto cur_len = len;
+
+    ++field;
+
+    /* The second field is the Doc ID */
+
+    doc_id_t write_doc_id;
+    uint32_t doc_id_32_bit;
+
+    if (!m_doc_id_32_bit) {
+      fts_write_doc_id((byte *)&write_doc_id, doc_id);
+      dfield_set_data(field, &write_doc_id, sizeof(write_doc_id));
+    } else {
+      mach_write_to_4((byte *)&doc_id_32_bit, (uint32_t)doc_id);
+      dfield_set_data(field, &doc_id_32_bit, sizeof(doc_id_32_bit));
+    }
+
+    len = field->len;
+    ut_a(len == FTS_DOC_ID_LEN || len == sizeof(uint32_t));
+
+    field->type.len = len;
+    field->type.mbminmaxlen = 0;
+    field->type.mtype = DATA_INT;
+    field->type.prtype = DATA_NOT_NULL | DATA_BINARY_TYPE;
+
+    cur_len += len;
+
+    ++field;
+
+    uint32_t position;
+
+    {
+      auto p = reinterpret_cast<byte *>(&position);
+      /* The third field is the position. */
+      if (parser != nullptr) {
+        mach_write_to_4(p, fts_token->m_position + t_ctx->m_init_pos);
+      } else {
+        const auto n =
+            t_ctx->m_processed_len + inc - str.f_len + t_ctx->m_init_pos;
+        mach_write_to_4(p, n);
+      }
+    }
+
+    dfield_set_data(field, &position, sizeof(position));
+    len = dfield_get_len(field);
+    ut_a(len == sizeof(uint32_t));
+
+    field->type.len = len;
+    field->type.mbminmaxlen = 0;
+    field->type.mtype = DATA_INT;
+    field->type.prtype = DATA_NOT_NULL;
+    cur_len += len;
+
+    /* One variable length column, word with its length less than
+    fts_max_token_size, add one extra size and one extra byte.
+
+    Since the max length for FTS token now is larger than 255, so we will
+    need to signify length byte itself, so only 1 to 128 bytes can be used
+    for 1 bytes, larger than that 2 bytes. */
+    cur_len += t_str.f_len < 128 ? 2 : 3;
+
+    /* Reserve one byte for the end marker of Aligned_buffer. */
+    if (key_buffer->m_total_size + cur_len >= key_buffer->m_buffer_size - 1) {
+      buf_full = true;
+      break;
+    }
+
+    key_buffer->deep_copy(FTS_NUM_FIELDS_SORT, cur_len);
+
+    if (parser != nullptr) {
+      UT_LIST_REMOVE(t_ctx->m_token_list, fts_token);
+      ut::free(fts_token);
+    } else {
+      t_ctx->m_processed_len += inc;
+    }
+  }
+
+  if (!buf_full) {
+    /* we pad one byte between text accross two fields */
+    t_ctx->m_init_pos += doc->text.f_len + 1;
+  }
+
+  return !buf_full;
+}
+
+void FTS::Parser::get_next_doc_item(FTS::Doc_item *&doc_item) noexcept {
+  if (doc_item != nullptr) {
+    ut::free(doc_item);
+    doc_item = nullptr;
+  }
+
+  if (!m_docq->dequeue(doc_item)) {
+    return;
+  }
+
+  if (doc_item != nullptr) {
+    const auto sz = sizeof(FTS::Doc_item) + doc_item->m_field->len;
+    ut_a(m_memory_used >= sz);
+
+    m_memory_used.fetch_sub(sz, std::memory_order_relaxed);
+  }
+}
+
+void FTS::Parser::parse(Builder *builder) noexcept {
+  fts_doc_t doc;
+  size_t retried{};
+  dtype_t word_dtype;
+  uint64_t total_rec{};
+  dberr_t err{DB_SUCCESS};
+  Tokenize_ctx t_ctx{};
+  size_t n_doc_processed{};
+  FTS::Doc_item *doc_item{};
+
+  auto table = m_ctx.new_table();
+  auto old_table = m_ctx.old_table();
+  auto blob_heap = mem_heap_create(512);
+
+  memset(&doc, 0, sizeof(doc));
+
+  doc.charset = fts_index_get_charset(m_dup->m_index);
+
+  auto idx_field = m_dup->m_index->get_field(0);
+
+  word_dtype.prtype = idx_field->col->prtype;
+  word_dtype.mbminmaxlen = idx_field->col->mbminmaxlen;
+
+  word_dtype.mtype =
+      (doc.charset == &my_charset_latin1) ? DATA_VARCHAR : DATA_VARMYSQL;
+
+  const page_size_t &page_size = dict_table_page_size(table);
+
+  get_next_doc_item(doc_item);
+
+  t_ctx.m_cached_stopword = table->fts->cache->stopword_info.cached_stopword;
+
+  auto processed{true};
+
+  auto clean_up = [&](dberr_t err) {
+    mem_heap_free(blob_heap);
+
+    IF_ENABLED("ddl_fts_write_failure", err = DB_TEMP_FILE_WRITE_FAIL;)
+
+    if (err != DB_SUCCESS) {
+      builder->set_error(err);
+      set_error(err);
+    }
+
+    if (!m_docq->empty()) {
+      /* Child can exit either with error or told by parent. */
+      ut_a(err != DB_SUCCESS || m_parent_state == Thread_state::ABORT);
+    }
+
+    /* Free fts doc list in case of err. */
+    do {
+      get_next_doc_item(doc_item);
+    } while (doc_item != nullptr);
+  };
+
+  auto handle_tail_end = [&]() {
+    /* Do a final sort of the last (or latest) batch of records
+    in block memory. Flush them to temp file if records cannot
+    be held in one block of memory. */
+    for (size_t i = 0; i < FTS_NUM_AUX_INDEX; ++i) {
+      auto &handler = m_handlers[i];
+
+      if (!handler->m_key_buffer.empty()) {
+        auto key_buffer = &handler->m_key_buffer;
+        auto io_buffer = handler->m_aligned_buffer.io_buffer();
+
+        const auto n_tuples = key_buffer->size();
+
+        key_buffer->sort(nullptr);
+
+        auto &file = handler->m_file;
+        handler->m_offsets.push_back(file.m_size);
+
+        auto persistor = [&](IO_buffer io_buffer, os_offset_t &n) -> dberr_t {
+          return builder->append(file, io_buffer);
+        };
+
+        err = key_buffer->serialize(io_buffer, persistor);
+
+        if (err != DB_SUCCESS) {
+          clean_up(DB_TEMP_FILE_WRITE_FAIL);
+          return;
+        }
+
+        key_buffer->clear();
+
+        file.m_n_recs += n_tuples;
+      }
+    }
+
+    for (size_t i = 0; i < FTS_NUM_AUX_INDEX; i++) {
+      auto &handler = m_handlers[i];
+
+      if (handler->m_offsets.size() <= 1) {
+        continue;
+      }
+
+      Merge_file_sort::Context merge_ctx;
+
+      merge_ctx.m_dup = m_dup;
+      merge_ctx.m_file = &handler->m_file;
+
+      merge_ctx.m_n_threads =
+          m_ctx.m_fts.m_ptr->get_n_parsers() * FTS_NUM_AUX_INDEX;
+
+      Merge_file_sort merge_file_sort{&merge_ctx};
+
+      err = merge_file_sort.sort(builder, handler->m_offsets);
+
+      if (err != DB_SUCCESS) {
+        clean_up(err);
+        return;
+      }
+
+      total_rec += handler->m_file.m_n_recs;
+    }
+
+    clean_up(DB_SUCCESS);
+  };
+
+  for (;;) {
+    doc_id_t last_doc_id{};
+
+    while (doc_item != nullptr) {
+      auto dfield = doc_item->m_field;
+
+      last_doc_id = doc_item->m_doc_id;
+
+      ut_a(dfield->data != nullptr && dfield_get_len(dfield) != UNIV_SQL_NULL);
+
+      /* If finish processing the last item, update "doc" with strings in the
+      doc_item, otherwise continue processing last item. */
+      if (processed) {
+        dfield = doc_item->m_field;
+        auto data = static_cast<byte *>(dfield_get_data(dfield));
+        auto data_len = dfield_get_len(dfield);
+
+        if (dfield_is_ext(dfield)) {
+          auto clust_index = old_table->first_index();
+
+          doc.text.f_str = lob::btr_copy_externally_stored_field(
+              nullptr, clust_index, &doc.text.f_len, nullptr, data, page_size,
+              data_len, false, blob_heap);
+        } else {
+          doc.text.f_str = data;
+          doc.text.f_len = data_len;
+        }
+
+        doc.tokens = nullptr;
+        t_ctx.m_processed_len = 0;
+      } else {
+        /* Finish processing the current "doc", continue processing it. */
+        ut_a(doc.text.f_str != nullptr);
+        ut_a(t_ctx.m_processed_len < doc.text.f_len);
+      }
+
+      processed = doc_tokenize(doc_item->m_doc_id, &doc, &word_dtype, &t_ctx);
+
+      /* Current sort buffer full, need to recycle */
+      if (!processed) {
+        ut_a(t_ctx.m_processed_len < doc.text.f_len);
+        break;
+      }
+
+      ++n_doc_processed;
+
+      mem_heap_empty(blob_heap);
+
+      get_next_doc_item(doc_item);
+
+      if (doc_item != nullptr && last_doc_id != doc_item->m_doc_id) {
+        t_ctx.m_init_pos = 0;
+      }
+    }
+
+    auto &handler = m_handlers[t_ctx.m_handler_id];
+
+    /* If we run out of current sort buffer, need to sort and flush the
+    sort buffer to disk. */
+    if (handler->m_key_buffer.size() > 0 && !processed) {
+      auto &file = handler->m_file;
+      auto key_buffer = &handler->m_key_buffer;
+      auto io_buffer = handler->m_aligned_buffer.io_buffer();
+      const auto n_tuples = key_buffer->size();
+
+      key_buffer->sort(nullptr);
+
+      handler->m_offsets.push_back(file.m_size);
+
+      auto persistor = [&](IO_buffer io_buffer, os_offset_t &n) -> dberr_t {
+        return builder->append(file, io_buffer);
+      };
+
+      err = key_buffer->serialize(io_buffer, persistor);
+
+      if (err != DB_SUCCESS) {
+        clean_up(DB_TEMP_FILE_WRITE_FAIL);
+        return;
+      }
+
+      key_buffer->clear();
+
+      file.m_n_recs += n_tuples;
+
+      ut_a(doc_item != nullptr);
+      continue;
+    }
+
+    /* Parent done scanning, and if finish processing all the docs, exit. */
+    if (m_parent_state == Thread_state::COMPLETE) {
+      if (m_docq->empty()) {
+        handle_tail_end();
+        break;
+      }
+
+      if (retried > 10000) {
+        ut_a(doc_item == nullptr);
+        /* retied too many times and cannot get new record */
+        ib::error(ER_IB_MSG_930)
+            << "FTS parallel sort processed " << n_doc_processed
+            << " records, the sort queue is not empty but tokenizer"
+            << " cannot dequeue records.";
+        handle_tail_end();
+        break;
+      }
+    } else if (m_parent_state == Thread_state::ABORT) {
+      /* Parent abort. */
+      clean_up(err);
+      break;
+    }
+
+    if (doc_item == nullptr) {
+      std::this_thread::yield();
+    }
+
+    get_next_doc_item(doc_item);
+
+    if (doc_item != nullptr) {
+      if (last_doc_id != doc_item->m_doc_id) {
+        t_ctx.m_init_pos = 0;
+      }
+
+      retried = 0;
+    } else if (m_parent_state == Thread_state::COMPLETE) {
+      ++retried;
+    }
+  }
+}
+
+dberr_t FTS::Inserter::write_node(const Insert *ins_ctx,
+                                  const fts_string_t *word,
+                                  const fts_node_t *node) noexcept {
+  auto tuple = ins_ctx->m_tuple;
+
+  /* We don't do a deep copy. Be careful moving these around. */
+  uint32_t doc_count{};
+  doc_id_t last_doc_id{};
+  doc_id_t first_doc_id{};
+
+  {
+    /* The first field is the tokenized word */
+    auto field = dtuple_get_nth_field(tuple, 0);
+    dfield_set_data(field, word->f_str, word->f_len);
+  }
+
+  {
+    /* The second field is first_doc_id */
+    auto field = dtuple_get_nth_field(tuple, 1);
+    fts_write_doc_id((byte *)&first_doc_id, node->first_doc_id);
+    dfield_set_data(field, &first_doc_id, sizeof(first_doc_id));
+  }
+
+  {
+    /* The third and fourth fileds(TRX_ID, ROLL_PTR) are filled already.*/
+    /* The fifth field is last_doc_id */
+    auto field = dtuple_get_nth_field(tuple, 4);
+    fts_write_doc_id((byte *)&last_doc_id, node->last_doc_id);
+    dfield_set_data(field, &last_doc_id, sizeof(last_doc_id));
+  }
+
+  {
+    /* The sixth field is doc_count */
+    auto field = dtuple_get_nth_field(tuple, 5);
+    mach_write_to_4((byte *)&doc_count, (uint32_t)node->doc_count);
+    dfield_set_data(field, &doc_count, sizeof(doc_count));
+  }
+
+  {
+    /* The seventh field is ilist */
+    auto field = dtuple_get_nth_field(tuple, 6);
+    dfield_set_data(field, node->ilist, node->ilist_size);
+  }
+
+  return ins_ctx->m_btr_bulk->insert(tuple, 0);
+}
+
+dberr_t FTS::Inserter::write_word(Insert *ins_ctx,
+                                  fts_tokenizer_word_t *word) noexcept {
+  dberr_t ret{DB_SUCCESS};
+
+  ut_ad(ins_ctx->m_handler_id == fts_select_index(ins_ctx->m_charset,
+                                                  word->text.f_str,
+                                                  word->text.f_len));
+
+  /* Pop out each fts_node in word->nodes write them to auxiliary table */
+  for (size_t i = 0; i < ib_vector_size(word->nodes); i++) {
+    auto fts_node = static_cast<fts_node_t *>(ib_vector_get(word->nodes, i));
+
+    auto err = write_node(ins_ctx, &word->text, fts_node);
+
+    if (err != DB_SUCCESS) {
+      ib::error(ER_IB_MSG_931) << "Failed to write word " << word->text.f_str
+                               << " to FTS auxiliary"
+                                  " index table, error ("
+                               << ut_strerr(err) << ")";
+      ret = err;
+    }
+
+    ut::free(fts_node->ilist);
+    fts_node->ilist = nullptr;
+  }
+
+  ib_vector_reset(word->nodes);
+
+  return ret;
+}
+
+void FTS::Inserter::insert_tuple(Insert *ins_ctx, fts_tokenizer_word_t *word,
+                                 ib_vector_t *positions, doc_id_t *in_doc_id,
+                                 const dtuple_t *dtuple) noexcept {
+  fts_node_t *fts_node;
+
+  /* Get fts_node for the FTS auxillary INDEX table */
+  if (ib_vector_size(word->nodes) > 0) {
+    fts_node = static_cast<fts_node_t *>(ib_vector_last(word->nodes));
+  } else {
+    fts_node = nullptr;
+  }
+
+  if (fts_node == nullptr || fts_node->ilist_size > FTS_ILIST_MAX_SIZE) {
+    fts_node = static_cast<fts_node_t *>(ib_vector_push(word->nodes, nullptr));
+
+    memset(fts_node, 0x0, sizeof(*fts_node));
+  }
+
+  /* If dtuple == nullptr, this is the last word to be processed */
+  if (dtuple == nullptr) {
+    if (fts_node != nullptr && ib_vector_size(positions) > 0) {
+      fts_cache_node_add_positions(nullptr, fts_node, *in_doc_id, positions);
+
+      /* Write out the current word */
+      write_word(ins_ctx, word);
+    }
+
+    return;
+  }
+
+  /* Get the first field for the tokenized word */
+  auto dfield = dtuple_get_nth_field(dtuple, 0);
+
+  fts_string_t token_word;
+
+  token_word.f_n_char = 0;
+  token_word.f_len = dfield->len;
+  token_word.f_str = static_cast<byte *>(dfield_get_data(dfield));
+
+  if (word->text.f_str == nullptr) {
+    fts_string_dup(&word->text, &token_word, ins_ctx->m_heap);
+  }
+
+  /* Compare to the last word, to see if they are the same word */
+  if (innobase_fts_text_cmp(ins_ctx->m_charset, &word->text, &token_word) !=
+      0) {
+    /* Getting a new word, flush the last position info
+    for the currnt word in fts_node */
+    if (ib_vector_size(positions) > 0) {
+      fts_cache_node_add_positions(nullptr, fts_node, *in_doc_id, positions);
+    }
+
+    /* Write out the current word */
+    write_word(ins_ctx, word);
+
+    /* Copy the new word */
+    fts_string_dup(&word->text, &token_word, ins_ctx->m_heap);
+
+    const auto n_item = ib_vector_size(positions);
+
+    /* Clean up position queue */
+    for (size_t i = 0; i < n_item; i++) {
+      ib_vector_pop(positions);
+    }
+
+    /* Reset Doc ID */
+    *in_doc_id = 0;
+    memset(fts_node, 0x0, sizeof(*fts_node));
+  }
+
+  /* Get the word's Doc ID */
+  dfield = dtuple_get_nth_field(dtuple, 1);
+
+  doc_id_t doc_id;
+
+  {
+    const auto ptr = static_cast<byte *>(dfield_get_data(dfield));
+
+    if (ins_ctx->m_doc_id_32_bit == 0) {
+      doc_id = fts_read_doc_id(ptr);
+    } else {
+      doc_id = mach_read_from_4(ptr);
+    }
+  }
+
+  /* Get the word's position info. */
+  dfield = dtuple_get_nth_field(dtuple, 2);
+
+  const auto ptr = static_cast<byte *>(dfield_get_data(dfield));
+  const doc_id_t position = mach_read_from_4(ptr);
+
+  /* If this is the same word as the last word, and they
+  have the same Doc ID, we just need to add its position
+  info. Otherwise, we will flush position info to the
+  fts_node and initiate a new position vector  */
+  if (*in_doc_id == 0 || *in_doc_id == doc_id) {
+    ib_vector_push(positions, &position);
+  } else {
+    const auto n_pos = ib_vector_size(positions);
+
+    fts_cache_node_add_positions(nullptr, fts_node, *in_doc_id, positions);
+
+    for (size_t i = 0; i < n_pos; i++) {
+      ib_vector_pop(positions);
+    }
+
+    ib_vector_push(positions, &position);
+  }
+
+  /* Record the current Doc ID */
+  *in_doc_id = doc_id;
+}
+
+dberr_t FTS::Inserter::insert(Builder *builder,
+                              Inserter::Handler *handler) noexcept {
+  ut_a(!handler->m_files.empty());
+
+  /* We use the insert query graph as the dummy graph needed in the
+  row module call */
+
+  auto trx = trx_allocate_for_background();
+
+  trx_start_if_not_started(trx, true);
+
+  trx->op_info = "inserting index entries";
+
+  Insert ins_ctx;
+
+  ins_ctx.m_doc_id_32_bit = m_doc_id_32_bit;
+
+  auto tuple_heap = mem_heap_create(512);
+
+  auto index = m_dup->m_index;
+
+  ins_ctx.m_heap = tuple_heap;
+  ins_ctx.m_charset = fts_index_get_charset(index);
+
+  /* Initialize related variables if creating FTS indexes */
+  auto heap_alloc = ib_heap_allocator_create(tuple_heap);
+
+  fts_tokenizer_word_t new_word;
+
+  memset(&new_word, 0, sizeof(new_word));
+
+  new_word.nodes = ib_vector_create(heap_alloc, sizeof(fts_node_t), 4);
+
+  dict_table_t *aux_table{};
+  {
+    fts_table_t fts_table;
+
+    fts_table.index_id = index->id;
+    fts_table.table_id = m_ctx.new_table()->id;
+    fts_table.table = index->table;
+    fts_table.type = FTS_INDEX_TABLE;
+    fts_table.suffix = fts_get_suffix(handler->m_id);
+    fts_table.parent = index->table->name.m_name;
+
+    std::array<char, MAX_FULL_NAME_LEN> aux_table_name;
+
+    /* Get aux index */
+    fts_get_table_name(&fts_table, aux_table_name.data());
+
+    aux_table = dd_table_open_on_name(nullptr, nullptr, aux_table_name.data(),
+                                      false, DICT_ERR_IGNORE_NONE);
+  }
+
+  ut_ad(aux_table != nullptr);
+  dd_table_close(aux_table, nullptr, nullptr, false);
+
+  auto observer = m_ctx.flush_observer();
+  auto aux_index = aux_table->first_index();
+
+  auto func_exit = [&](dberr_t err) {
+    fts_sql_commit(trx);
+
+    trx->op_info = "";
+
+    if (ins_ctx.m_btr_bulk != nullptr) {
+      err = ins_ctx.m_btr_bulk->finish(err);
+      ut::delete_(ins_ctx.m_btr_bulk);
+    }
+
+    trx_free_for_background(trx);
+
+    mem_heap_free(tuple_heap);
+
+    return err;
+  };
+
+  /* Create bulk load instance */
+  ins_ctx.m_btr_bulk = ut::new_withkey<Btree_load>(
+      ut::make_psi_memory_key(mem_key_ddl), aux_index, trx->id, observer);
+
+  /* Create tuple for insert. */
+  ins_ctx.m_tuple =
+      dtuple_create(tuple_heap, dict_index_get_n_fields(aux_index));
+
+  const auto n_fields = dict_index_get_n_fields(aux_index);
+
+  dict_index_copy_types(ins_ctx.m_tuple, aux_index, n_fields);
+
+  /* Set TRX_ID and ROLL_PTR */
+  roll_ptr_t roll_ptr{};
+  byte trx_id_buf[DATA_TRX_ID_LEN];
+
+  {
+    auto field = dtuple_get_nth_field(ins_ctx.m_tuple, 2);
+
+    trx_write_trx_id(trx_id_buf, trx->id);
+    dfield_set_data(field, &trx_id_buf, DATA_TRX_ID_LEN);
+  }
+
+  {
+    auto field = dtuple_get_nth_field(ins_ctx.m_tuple, 3);
+
+    dfield_set_data(field, &roll_ptr, 7);
+  }
+
+  ut_d(ins_ctx.m_handler_id = handler->m_id);
+
+  size_t total_rows{};
+  Merge_cursor cursor(builder, nullptr, nullptr);
+
+  {
+    size_t i{};
+    const auto n_buffers = handler->m_files.size();
+    const auto io_buffer_size = m_ctx.merge_io_buffer_size(n_buffers);
+
+    for (auto &file : handler->m_files) {
+      ut_a(file.m_n_recs > 0);
+
+      auto err = cursor.add_file(file, io_buffer_size);
+
+      if (err != DB_SUCCESS) {
+        return err;
+      }
+
+      ++i;
+
+      total_rows += file.m_n_recs;
+    }
+  }
+
+  if (total_rows == 0) {
+    return func_exit(DB_SUCCESS);
+  }
+
+  auto err = cursor.open();
+
+  if (err != DB_SUCCESS) {
+    return func_exit(err);
+  }
+
+  /* Fetch sorted records from the run files and insert them into
+  corresponding FTS index auxiliary tables. */
+
+  doc_id_t doc_id{};
+  dtuple_t *dtuple{};
+  auto heap = mem_heap_create(1000);
+  auto positions = ib_vector_create(heap_alloc, sizeof(doc_id_t), 32);
+
+  while ((err = cursor.fetch(dtuple)) == DB_SUCCESS) {
+    mem_heap_empty(heap);
+
+    insert_tuple(&ins_ctx, &new_word, positions, &doc_id, dtuple);
+
+    --total_rows;
+
+    err = cursor.next();
+
+    if (err != DB_SUCCESS) {
+      break;
+    }
+  }
+
+  if (err == DB_SUCCESS || err == DB_END_OF_INDEX) {
+    ut_a(total_rows == 0);
+    insert_tuple(&ins_ctx, &new_word, positions, &doc_id, nullptr);
+  }
+
+  mem_heap_free(heap);
+
+  return func_exit(err == DB_END_OF_INDEX ? DB_SUCCESS : err);
+}
+
+FTS::FTS(Context &ctx, dict_index_t *index, dict_table_t *table) noexcept
+    : m_ctx(ctx), m_index(index), m_table(table) {
+  m_dup.m_n_dup = 0;
+  m_dup.m_index = nullptr;
+  m_dup.m_table = ctx.m_table;
+  m_dup.m_col_map = m_ctx.m_col_map;
+}
+
+FTS::~FTS() noexcept {
+  destroy();
+
+  if (m_dup.m_index != nullptr) {
+    dict_mem_index_free(m_dup.m_index);
+  }
+}
+
+dberr_t FTS::create(size_t n_threads) noexcept {
+  ut_a(m_parsers.empty());
+
+  for (size_t i = 0; i < n_threads; ++i) {
+    auto parser = ut::new_withkey<Parser>(ut::make_psi_memory_key(mem_key_ddl),
+                                          i, m_ctx, &m_dup, m_doc_id_32_bit);
+
+    if (parser == nullptr) {
+      destroy();
+      return DB_OUT_OF_MEMORY;
+    }
+
+    m_parsers.push_back(parser);
+
+    auto err = parser->init(n_threads);
+
+    if (err != DB_SUCCESS) {
+      destroy();
+      return err;
+    }
+  }
+
+  m_inserter = ut::new_withkey<Inserter>(ut::make_psi_memory_key(mem_key_ddl),
+                                         m_ctx, &m_dup, m_doc_id_32_bit);
+
+  if (m_inserter == nullptr) {
+    destroy();
+    return DB_OUT_OF_MEMORY;
+  }
+
+  return DB_SUCCESS;
+}
+
+void FTS::destroy() noexcept {
+  for (auto parser : m_parsers) {
+    ut::delete_(parser);
+  }
+
+  m_parsers.clear();
+
+  if (m_inserter != nullptr) {
+    ut::delete_(m_inserter);
+    m_inserter = nullptr;
+  }
+}
+
+dberr_t FTS::init(size_t n_threads) noexcept {
+  ut_a(m_dup.m_index == nullptr);
+
+  m_dup.m_index = create_index(m_index, m_table, &m_doc_id_32_bit);
+
+  m_sort_index = m_dup.m_index;
+
+  return create(n_threads);
+}
+
+dberr_t FTS::start_parse_threads(Builder *builder) noexcept {
+  auto fn = [&](PSI_thread_seqnum seqnum, Parser *parser, Builder *builder) {
+    ut_a(seqnum > 0);
+    Runnable runnable{fts_parallel_tokenization_thread_key, seqnum};
+
+    auto old_thd = current_thd;
+
+    current_thd = m_ctx.thd();
+
+    parser->parse(builder);
+
+    current_thd = old_thd;
+  };
+
+  size_t seqnum{1};
+
+  for (auto parser : m_parsers) {
+    try {
+      m_threads.push_back(std::thread(fn, seqnum++, parser, builder));
+    } catch (...) {
+      parser->set_error(DB_OUT_OF_RESOURCES);
+      return DB_OUT_OF_RESOURCES;
+    }
+  }
+
+  return DB_SUCCESS;
+}
+
+dberr_t FTS::enqueue(FTS::Doc_item *doc_item) noexcept {
+  auto parser = m_parsers[doc_item->m_doc_id % m_parsers.size()];
+
+  return parser->enqueue(doc_item);
+}
+
+dberr_t FTS::check_for_errors() noexcept {
+  for (auto parser : m_parsers) {
+    auto err = parser->get_error();
+
+    if (err != DB_SUCCESS) {
+      m_ctx.m_trx->error_key_num = parser->id();
+      return err;
+    }
+  }
+
+  return DB_SUCCESS;
+}
+
+dberr_t FTS::insert(Builder *builder) noexcept {
+  Threads threads{};
+  std::vector<dberr_t, ut::allocator<dberr_t>> errs{};
+
+  errs.assign(FTS_NUM_AUX_INDEX, DB_SUCCESS);
+
+  auto fn = [&](PSI_thread_seqnum seqnum, FTS::Inserter::Handler *handler,
+                dberr_t &err) {
+    ut_a(seqnum > 0);
+    Runnable runnable{fts_parallel_merge_thread_key, seqnum};
+
+    if (!handler->m_files.empty()) {
+      err = m_inserter->insert(builder, handler);
+    }
+  };
+
+  dberr_t err{DB_SUCCESS};
+  const auto last = FTS_NUM_AUX_INDEX - 1;
+
+  for (size_t i = 0; i < last; ++i) {
+    auto handler = &m_inserter->m_handlers[i];
+    try {
+      threads.push_back(std::thread{fn, i + 1, handler, std::ref(errs[i])});
+    } catch (...) {
+      err = errs[i] = DB_OUT_OF_RESOURCES;
+      break;
+    }
+  }
+
+  if (err == DB_SUCCESS) {
+    auto handler = &m_inserter->m_handlers[last];
+    if (!handler->m_files.empty()) {
+      errs[last] = m_inserter->insert(builder, handler);
+    }
+    if (errs[last] != DB_SUCCESS) {
+      builder->set_error(errs[last]);
+    }
+  }
+
+  {
+    size_t i{};
+
+    for (auto &thread : threads) {
+      thread.join();
+      if (errs[i] != DB_SUCCESS) {
+        builder->set_error(errs[i]);
+      }
+      ++i;
+    }
+  }
+
+  return builder->get_error();
+}
+
+dberr_t FTS::setup_insert_phase() noexcept {
+  for (auto parser : m_parsers) {
+    for (size_t i = 0; i < FTS_NUM_AUX_INDEX; ++i) {
+      auto &file = parser->get_file(i);
+
+      if (file.m_n_recs == 0) {
+        /* Ignore empty files. */
+        continue;
+      }
+
+      const auto err = m_inserter->add_file(i, file);
+
+      if (err != DB_SUCCESS) {
+        break;
+      }
+    }
+  }
+
+  return DB_SUCCESS;
+}
+
+dberr_t FTS::scan_finished(dberr_t err) noexcept {
+  for (auto parser : m_parsers) {
+    if (err == DB_SUCCESS) {
+      parser->set_parent_state(Thread_state::COMPLETE);
+    } else {
+      parser->set_parent_state(Thread_state::ABORT);
+    }
+  }
+
+  for (auto &thread : m_threads) {
+    thread.join();
+  }
+
+  if (err == DB_SUCCESS) {
+    err = check_for_errors();
+  }
+
+  if (err != DB_SUCCESS) {
+    return err;
+  }
+
+  auto &fts = m_ctx.m_fts;
+
+  /* Update the next Doc ID we used. Table should be locked, so
+  no concurrent DML */
+  if (fts.m_doc_id != nullptr && err == DB_SUCCESS) {
+    const auto generated = fts.m_doc_id->is_generated();
+
+    if ((generated && fts.m_doc_id->generated_count() > 0) ||
+        (!generated && fts.m_doc_id->max_doc_id() > 0)) {
+      /* Sync fts cache for other fts indexes to keep all fts indexes
+      consistent in sync_doc_id. */
+      auto table = const_cast<dict_table_t *>(m_ctx.m_new_table);
+
+      err = fts_sync_table(table, false, true, false);
+
+      if (err == DB_SUCCESS) {
+        auto name = m_ctx.m_old_table->name.m_name;
+        const auto max_doc_id{fts.m_doc_id->max_doc_id()};
+
+        fts_update_next_doc_id(0, m_ctx.m_new_table, name, max_doc_id);
+      }
+    }
+  }
+
+  if (err == DB_SUCCESS) {
+    err = setup_insert_phase();
+  }
+
+  for (auto parser : m_parsers) {
+    ut::delete_(parser);
+  }
+
+  m_parsers.clear();
+
+  return err;
+}
+
+}  // namespace ddl
diff -Nru mysql-8.0-8.0.26/storage/innobase/ddl/ddl0loader.cc mysql-8.0-8.0.27/storage/innobase/ddl/ddl0loader.cc
--- mysql-8.0-8.0.26/storage/innobase/ddl/ddl0loader.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/ddl/ddl0loader.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,520 @@
+/*****************************************************************************
+
+Copyright (c) 2020, 2021, Oracle and/or its affiliates. All Rights Reserved.
+
+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, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
+/** @file ddl/ddl0loader.cc
+ DDL index loader implementation.
+ Created 2020-11-01 by Sunny Bains. */
+
+#include "btr0load.h"
+#include "ddl0impl-builder.h"
+#include "ddl0impl-cursor.h"
+#include "ddl0impl-loader.h"
+#include "handler0alter.h"
+#include "os0thread-create.h"
+#include "ut0stage.h"
+
+#include "sql/table.h"
+#include "sql_class.h"
+
+namespace ddl {
+
+/** Unbounded task queue. */
+class Loader::Task_queue {
+ public:
+  /** Constructor.
+  @param[in] ctx                DDL context.
+  @param[in] sync               True for syncronous execution. */
+  explicit Task_queue(const Context &ctx, bool sync) noexcept;
+
+  /** Destructor. */
+  ~Task_queue() noexcept;
+
+  /** Enqueue a task to execute.
+  @param[in] task               Task to queue. */
+  void enqueue(const Task &task) noexcept {
+    if (!m_sync) {
+      mutex_enter(&m_mutex);
+    }
+
+    m_tasks.push_back(task);
+    IF_DEBUG(++m_n_tasks_submitted;)
+
+    if (!m_sync) {
+      mutex_exit(&m_mutex);
+      os_event_set(m_consumer_event);
+    }
+  }
+
+  /** Dequeue and execute a task.
+  @return DB_SUCCESS or error code. */
+  dberr_t execute() {
+    if (!m_sync) {
+      ut_a(m_n_threads >= 1);
+      return mt_execute();
+    } else {
+      m_n_threads = 0;
+      return st_execute();
+    }
+  }
+
+  /** Note that we failed to create the configued number of threads. */
+  void thread_create_failed() noexcept {
+    ut_a(!m_sync);
+    mutex_enter(&m_mutex);
+    ut_a(m_n_threads > 0);
+    --m_n_threads;
+    mutex_exit(&m_mutex);
+  }
+
+#ifdef UNIV_DEBUG
+  /** @return true if number of tasks submitted == number of tasks executed. */
+  bool validate() const noexcept {
+    return m_n_tasks_executed == m_n_tasks_submitted && m_n_threads == 0 &&
+           m_n_idle == 0;
+  }
+#endif /* UNIV_DEBUG */
+
+  /** Wakeup the other threads e.g., on error. */
+  void signal() noexcept { os_event_set(m_consumer_event); }
+
+ private:
+  /** Execute function when there is more than one thread. The general idea
+  is as follows:
+   1. Some initial tasks are added before threads come here to execute tasks.
+   2. While executing, a task can generate more tasks. That is the only way
+     a task can be added.
+
+  [1] & [2] implies that when all threads are idle, all tasks are completed
+  and no more tasks can be added.
+
+  We exit here when all running threads are idle. */
+  dberr_t mt_execute() {
+    ut_a(!m_sync);
+
+    dberr_t err{DB_SUCCESS};
+
+    do {
+      mutex_enter(&m_mutex);
+
+      while (m_tasks.empty()) {
+        const auto sig_count = os_event_reset(m_consumer_event);
+
+        ++m_n_idle;
+
+        if (m_n_idle >= m_n_threads) {
+          ut_a(m_n_threads > 0);
+          --m_n_threads;
+
+          ut_a(m_n_idle > 0);
+          --m_n_idle;
+
+          mutex_exit(&m_mutex);
+
+          os_event_set(m_consumer_event);
+
+          return DB_SUCCESS;
+        }
+
+        mutex_exit(&m_mutex);
+
+        os_event_wait_low(m_consumer_event, sig_count);
+
+        err = m_ctx.get_error();
+
+        if (err != DB_SUCCESS) {
+          mutex_enter(&m_mutex);
+
+          ut_a(m_n_threads > 0);
+          --m_n_threads;
+
+          ut_a(m_n_idle > 0);
+          --m_n_idle;
+
+          mutex_exit(&m_mutex);
+
+          os_event_set(m_consumer_event);
+
+          return err;
+        }
+
+        os_event_reset(m_consumer_event);
+
+        mutex_enter(&m_mutex);
+
+        --m_n_idle;
+      }
+
+      auto task = m_tasks.front();
+      m_tasks.pop_front();
+
+      IF_DEBUG(++m_n_tasks_executed;)
+
+      mutex_exit(&m_mutex);
+
+      err = task();
+
+    } while (err == DB_SUCCESS);
+
+    mutex_enter(&m_mutex);
+
+    ut_a(m_n_threads > 0);
+    --m_n_threads;
+
+    mutex_exit(&m_mutex);
+
+    os_event_set(m_consumer_event);
+
+    return err;
+  }
+
+  /** Execute function when there is a singe thread. */
+  dberr_t st_execute() {
+    ut_a(m_sync);
+
+    dberr_t err{DB_SUCCESS};
+
+    while (!m_tasks.empty()) {
+      auto task = m_tasks.front();
+      m_tasks.pop_front();
+
+      IF_DEBUG(++m_n_tasks_executed;)
+
+      err = task();
+
+      if (err != DB_SUCCESS) {
+        break;
+      }
+    }
+
+    return err;
+  }
+
+ private:
+  using Tasks = std::deque<Task, ut::allocator<Task>>;
+
+  /** DDL context. */
+  const Context &m_ctx;
+
+  /** true if synchronous execution model. */
+  bool m_sync{};
+
+  /** The task queue. */
+  Tasks m_tasks{};
+
+  /** Mutex protecting m_tasks access. */
+  ib_mutex_t m_mutex;
+
+  /** Task queue consumer event. */
+  os_event_t m_consumer_event{};
+
+  /** Number of threads (including foreground thread). */
+  size_t m_n_threads{};
+
+  /** Number of threads idle. */
+  size_t m_n_idle{};
+
+  /** Number of tasks executed. */
+  IF_DEBUG(size_t m_n_tasks_executed{};)
+
+  /** Number of tasks submitted. */
+  IF_DEBUG(size_t m_n_tasks_submitted{};)
+};
+
+Loader::Task_queue::Task_queue(const Context &ctx, bool sync) noexcept
+    : m_ctx(ctx), m_sync(sync), m_n_threads(ctx.m_max_threads) {
+  if (!m_sync) {
+    m_consumer_event = os_event_create();
+    mutex_create(LATCH_ID_WORK_QUEUE, &m_mutex);
+  }
+}
+
+Loader::Task_queue::~Task_queue() noexcept {
+  if (!m_sync) {
+    mutex_destroy(&m_mutex);
+
+    if (m_consumer_event != nullptr) {
+      os_event_destroy(m_consumer_event);
+    }
+  }
+}
+
+Loader::Loader(Context &ctx) noexcept : m_ctx(ctx) {}
+
+Loader::~Loader() noexcept {
+  if (m_ctx.m_stage != nullptr) {
+    Alter_stages alter_stages{};
+
+    for (auto &builder : m_builders) {
+      alter_stages.push_back(builder->stage());
+    }
+
+    m_ctx.m_stage->aggregate(alter_stages);
+  }
+
+  for (auto builder : m_builders) {
+    ut::delete_(builder);
+  }
+
+  if (m_taskq != nullptr) {
+    ut::delete_(m_taskq);
+  }
+}
+
+void Loader::add_task(Task task) noexcept { m_taskq->enqueue(task); }
+
+dberr_t Loader::load() noexcept {
+  ut_a(m_taskq == nullptr);
+
+  const bool sync = m_ctx.m_max_threads <= 1;
+
+  m_taskq = ut::new_withkey<Task_queue>(ut::make_psi_memory_key(mem_key_ddl),
+                                        m_ctx, sync);
+
+  if (m_taskq == nullptr) {
+    return DB_OUT_OF_MEMORY;
+  }
+
+  for (auto builder : m_builders) {
+    ut_a(builder->get_state() == Builder::State::ADD);
+    /* RTrees are built during the scan phase, using row by row insert. */
+    if (!builder->is_spatial_index()) {
+      builder->set_next_state();
+      add_task(Task{builder});
+    }
+  }
+
+  std::vector<std::thread> threads{};
+
+  if (!sync) {
+    auto fn = [=](PSI_thread_seqnum seqnum) -> dberr_t {
+      Runnable runnable{ddl_thread_key, seqnum};
+
+      auto old_thd = current_thd;
+
+      current_thd = m_ctx.thd();
+
+      const auto err = runnable(&Task_queue::execute, m_taskq);
+
+      if (err != DB_SUCCESS) {
+        m_taskq->signal();
+      }
+
+      current_thd = old_thd;
+
+      return err;
+    };
+
+    for (size_t i = 1; i < m_ctx.m_max_threads; ++i) {
+      try {
+        threads.push_back(std::thread{fn, i});
+      } catch (...) {
+        ib::warn(ER_DDL_MSG_1);
+        m_taskq->thread_create_failed();
+        break;
+      }
+    }
+  }
+
+  auto err = m_taskq->execute();
+
+  if (!sync) {
+    if (err != DB_SUCCESS) {
+      m_taskq->signal();
+    }
+
+    for (auto &thread : threads) {
+      thread.join();
+    }
+  }
+
+  if (err == DB_SUCCESS) {
+    err = m_ctx.get_error();
+  }
+
+  ut_ad(m_taskq->validate() || err != DB_SUCCESS);
+
+  ut::delete_(m_taskq);
+  m_taskq = nullptr;
+
+  return err;
+}
+
+dberr_t Loader::prepare() noexcept {
+  ut_a(m_builders.empty());
+  ut_a(!srv_read_only_mode);
+  ut_a(!m_ctx.m_add_cols || m_ctx.m_col_map != nullptr);
+  ut_a((m_ctx.m_old_table == m_ctx.m_new_table) == !m_ctx.m_col_map);
+
+  /* Allocate memory for merge file data structure and initialize fields */
+
+  auto err = m_ctx.setup_fts_build();
+
+  if (err != DB_SUCCESS) {
+    return err;
+  }
+
+  for (size_t i = 0; i < m_ctx.m_indexes.size(); ++i) {
+    auto builder = ut::new_withkey<Builder>(
+        ut::make_psi_memory_key(mem_key_ddl), m_ctx, *this, i);
+
+    if (builder == nullptr) {
+      return DB_OUT_OF_MEMORY;
+    }
+
+    m_builders.push_back(builder);
+  }
+
+  return DB_SUCCESS;
+}
+
+#define SYNC_POINT_ADD(t, n)                      \
+  DBUG_EXECUTE_IF((n), Sync_point::add((t), (n)); \
+                  sync_points.push_back({(t), (n)});)
+
+dberr_t Loader::scan_and_build_indexes() noexcept {
+#ifdef UNIV_DEBUG
+  using Sync_points = std::vector<std::pair<THD *, const std::string>>;
+
+  auto thd = m_ctx.thd();
+  Sync_points sync_points{};
+
+  SYNC_POINT_ADD(thd, "ddl_tmpfile_fail");
+  SYNC_POINT_ADD(thd, "ddl_read_failure");
+  SYNC_POINT_ADD(thd, "ddl_write_failure");
+  SYNC_POINT_ADD(thd, "ddl_ins_spatial_fail");
+  SYNC_POINT_ADD(thd, "ddl_fts_write_failure");
+  SYNC_POINT_ADD(thd, "ddl_merge_sort_interrupt");
+  SYNC_POINT_ADD(thd, "ddl_instrument_log_check_flush");
+  SYNC_POINT_ADD(thd, "fts_instrument_sync_interrupted");
+  SYNC_POINT_ADD(thd, "ddl_btree_build_too_big_record");
+  SYNC_POINT_ADD(thd, "ddl_btree_build_oom");
+  SYNC_POINT_ADD(thd, "ddl_btree_build_interrupt");
+  SYNC_POINT_ADD(thd, "ddl_btree_build_sleep");
+  SYNC_POINT_ADD(thd, "ddl_btree_build_insert_return_interrupt");
+
+  auto cleanup = [&]() {
+    for (auto &s : sync_points) {
+      Sync_point::erase(s.first, s.second);
+    }
+  };
+
+#endif /* UNIV_DEBUG */
+
+  auto cursor = Cursor::create_cursor(m_ctx);
+
+  if (cursor == nullptr) {
+    ut_d(cleanup());
+    return DB_OUT_OF_MEMORY;
+  }
+
+  auto err = m_ctx.read_init(cursor);
+
+  if (err == DB_SUCCESS) {
+    cursor->open();
+
+    /* Reset the MySQL row buffer that is used when reporting duplicate keys.
+    Return needs to be checked since innobase_rec_reset tries to evaluate
+    set_default() which can also be a function and might return errors */
+    innobase_rec_reset(m_ctx.m_table);
+
+    if (m_ctx.m_table->in_use->is_error()) {
+      err = DB_COMPUTE_VALUE_FAILED;
+    } else {
+      /* Read clustered index of the table and create files for secondary
+      index entries for merge sort and bulk build of the indexes. */
+      err = cursor->scan(m_builders);
+    }
+
+    /* Close the mtr and release any locks, wait for FTS etc. */
+    err = cursor->finish(err);
+
+    DBUG_EXECUTE_IF("force_virtual_col_build_fail",
+                    err = DB_COMPUTE_VALUE_FAILED;);
+
+    DEBUG_SYNC_C("ddl_after_scan");
+
+    if (err == DB_SUCCESS) {
+      err = load();
+    }
+
+    DBUG_EXECUTE_IF("ddl_insert_big_row", err = DB_TOO_BIG_RECORD;);
+  }
+
+  if (cursor != nullptr) {
+    ut::delete_(cursor);
+    cursor = nullptr;
+  }
+
+  ut_d(cleanup());
+
+  return err;
+}
+
+dberr_t Loader::build_all() noexcept {
+  auto err = prepare();
+
+  if (err == DB_SUCCESS) {
+    err = scan_and_build_indexes();
+  }
+
+  DBUG_EXECUTE_IF("ib_build_indexes_too_many_concurrent_trxs",
+                  err = DB_TOO_MANY_CONCURRENT_TRXS;
+                  m_ctx.m_trx->error_state = err;);
+
+  if (m_ctx.m_fts.m_ptr != nullptr) {
+    /* Clean up FTS psort related resource */
+    ut::delete_(m_ctx.m_fts.m_ptr);
+    m_ctx.m_fts.m_ptr = nullptr;
+  }
+
+  DICT_TF2_FLAG_UNSET(m_ctx.m_new_table, DICT_TF2_FTS_ADD_DOC_ID);
+
+  if (err == DB_AUTOINC_READ_ERROR) {
+    auto trx = m_ctx.m_trx;
+    ib_senderrf(trx->mysql_thd, IB_LOG_LEVEL_ERROR, ER_AUTOINC_READ_FAILED);
+  }
+
+  if (err != DB_SUCCESS) {
+    m_ctx.set_error(err);
+  }
+
+  return err;
+}
+
+#ifdef UNIV_DEBUG
+bool Loader::validate_indexes() const noexcept {
+  for (auto &builder : m_builders) {
+    if (!builder->is_fts_index() &&
+        !btr_validate_index(builder->index(), nullptr, false)) {
+      return false;
+    }
+  }
+
+  return true;
+}
+#endif /* UNIV_DEBUG */
+
+}  // namespace ddl
diff -Nru mysql-8.0-8.0.26/storage/innobase/ddl/ddl0merge.cc mysql-8.0-8.0.27/storage/innobase/ddl/ddl0merge.cc
--- mysql-8.0-8.0.26/storage/innobase/ddl/ddl0merge.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/ddl/ddl0merge.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,529 @@
+/*****************************************************************************
+
+Copyright (c) 2020, 2021, Oracle and/or its affiliates. All Rights Reserved.
+
+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, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
+/** @file ddl/ddl0merge.cc
+ DDL merge sort implementation.
+Created 2020-11-01 by Sunny Bains. */
+
+#include "ddl0impl-buffer.h"
+#include "ddl0impl-builder.h"
+#include "ddl0impl-merge.h"
+#include "trx0trx.h"
+#include "ut0stage.h"
+
+namespace ddl {
+
+#ifdef UNIV_DEBUG
+/** Print range.
+@param[in,out] out              Output stream.
+@param[in] range                Range to print.
+@return output stream. */
+std::ostream &operator<<(std::ostream &out,
+                         const Merge_file_sort::Range &range) noexcept {
+  out << "<" << range.first << ", " << range.second << ">";
+  return out;
+}
+#endif /* UNIV_DEBUG */
+
+/** Cursor for merging blocks from the same file. */
+struct Merge_file_sort::Cursor : private ut::Non_copyable {
+  /** Constructor.
+  @param[in,out] builder        Index builder instance.
+  @param[in] file               File to iterate over.
+  @param[in,out] dup            For reporting duplicates.
+  @param[in,out] stage          PFS staging. */
+  Cursor(Builder *builder, file_t *file, Dup *dup, Alter_stage *stage) noexcept
+      : m_file(file), m_cursor(builder, dup, stage) {
+    ut_a(m_file->m_size > 0);
+    ut_a(m_file->m_n_recs > 0);
+#ifdef POSIX_FADV_SEQUENTIAL
+    /* The input file will be read sequentially, starting from the
+    beginning and the middle. In Linux, the POSIX_FADV_SEQUENTIAL
+    affects the entire file. Each block will be read exactly once. */
+    {
+      const auto flags = POSIX_FADV_SEQUENTIAL | POSIX_FADV_NOREUSE;
+      posix_fadvise(m_file->m_fd, 0, 0, flags);
+    }
+#endif /* POSIX_FADV_SEQUENTIAL */
+  }
+
+  /** Prepare the cursor for reading.
+  @param[in] range              Rangs to merge in a pass.
+  @param[in] buffer_size        IO Buffer size to use for reading.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t prepare(Range range, size_t buffer_size) noexcept;
+
+  /** Fetch the next record.
+  @param[out] mrec              Row read from the file.
+  @param[out] offsets           Column offsets inside mrec.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t fetch(const mrec_t *&mrec, ulint *&offsets) noexcept;
+
+  /** Move to the next record.
+  @return DB_SUCCESS, DB_END_OF_INDEX or error code. */
+  [[nodiscard]] dberr_t next() noexcept;
+
+  /** Move the cursor to the start of the new records lists to merge.
+  @param[in] file               File being scanned.
+  @param[in] range              Seek to these offsets.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t seek(const file_t *file, Range range) noexcept;
+
+  /** @return the number of active readers. */
+  [[nodiscard]] size_t size() const noexcept { return m_cursor.size(); }
+
+ private:
+  /** File to iterate over. */
+  file_t *m_file{};
+
+  /** Cursor to use for the merge. */
+  Merge_cursor m_cursor;
+};
+
+/** For writing out the merged rows. */
+struct Merge_file_sort::Output_file : private ut::Non_copyable {
+  /** The transaction interrupted check is expensive, we check after this
+  many page writes. */
+  static constexpr uint64_t TRX_INTERRUPTED_CHECK = 64;
+
+  /** Constructor.
+  @param[in,out] ctx            DDL context.
+  @param[in] fd                 File to write to.
+  @param[in] io_buffer          Buffer to store records and write to file. */
+  Output_file(ddl::Context &ctx, os_fd_t fd, IO_buffer io_buffer) noexcept
+      : m_ctx(ctx), m_fd(fd), m_buffer(io_buffer), m_ptr(m_buffer.first) {}
+
+  /** Destructor. */
+  ~Output_file() = default;
+
+  /** Initialize the duplicate check infrastructure.
+  @param[in] index              DDL index. */
+  void init(const dict_index_t *index) noexcept {
+    const auto n_fields = dict_index_get_n_fields(index);
+    const auto i = 1 + REC_OFFS_HEADER_SIZE + n_fields;
+
+    ut_a(m_offsets.empty());
+
+    m_offsets.resize(i);
+
+    m_offsets[0] = i;
+    m_offsets[1] = n_fields;
+  }
+
+  /** Write the row to the buffer. If the buffer fills up write the
+  buffer to the output file.
+  @param[in] mrec               Row to write.
+  @param[in] offsets            Column offsets in row.
+  @param[in,out] dup            For duplicate checks.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t write(const mrec_t *mrec, const ulint *offsets,
+                              Dup *dup) noexcept;
+
+  /** Write end of block marker and flush buffer to disk.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t flush() noexcept;
+
+  /** @return the current size of the output file in bytes. */
+  [[nodiscard]] os_offset_t get_size() const { return m_offset; }
+
+  /** @return number of rows in the output file. */
+  [[nodiscard]] uint64_t get_n_rows() const noexcept { return m_n_rows; }
+
+ private:
+  /** @return the number of bytes copied so far. */
+  [[nodiscard]] size_t copied() const noexcept {
+    return std::ptrdiff_t(m_ptr - m_buffer.first);
+  }
+
+  /** Do a duplicate check against the incoming record.
+  @param[in] mrec               Row to write.
+  @param[in] offsets            Column offsets in row.
+  @param[in,out] dup            For duplicate checks.
+  @return DB_SUCCESS or error code. */
+  void duplicate_check(const mrec_t *mrec, const ulint *offsets,
+                       Dup *dup) noexcept;
+
+ private:
+  /** Limit is [start, end]. */
+  using Offsets = std::vector<ulint, ut::allocator<ulint>>;
+
+  /** DDL context. */
+  ddl::Context &m_ctx;
+
+  /** File to write to. */
+  os_fd_t m_fd{OS_FD_CLOSED};
+
+  /** Buffer to write to (output buffer). */
+  IO_buffer m_buffer;
+
+  /** Start writing new bytes at this offset. */
+  byte *m_ptr{};
+
+  /** Total number of bytes written. */
+  os_offset_t m_offset{};
+
+  /** Offsets of the last inserted row. */
+  Offsets m_offsets{};
+
+  /** Pointer to last record in the output buffer. */
+  mrec_t *m_last_mrec{};
+
+  /** Number of rows read/written. */
+  uint64_t m_n_rows{};
+
+  /** Counter for checking trx_is_interrupted. */
+  uint64_t m_interrupt_check{};
+};
+
+dberr_t Merge_file_sort::Cursor::prepare(Range range,
+                                         size_t buffer_size) noexcept {
+  {
+    auto err = m_cursor.add_file(*m_file, buffer_size, range.first);
+
+    if (err != DB_SUCCESS && err != DB_END_OF_INDEX) {
+      return err;
+    }
+  }
+
+  {
+    auto err = m_cursor.add_file(*m_file, buffer_size, range.second);
+
+    if (err != DB_SUCCESS) {
+      return err;
+    }
+  }
+
+  return m_cursor.open();
+}
+
+dberr_t Merge_file_sort::Cursor::fetch(const mrec_t *&mrec,
+                                       ulint *&offsets) noexcept {
+  return m_cursor.fetch(mrec, offsets);
+}
+
+dberr_t Merge_file_sort::Cursor::next() noexcept { return m_cursor.next(); }
+
+dberr_t Merge_file_sort::Cursor::seek(const file_t *file,
+                                      Range range) noexcept {
+  auto file_readers = m_cursor.file_readers();
+  ut_a(file_readers.size() == 2);
+
+  dberr_t err;
+
+  if (range.first == file->m_size) {
+    err = DB_END_OF_INDEX;
+  } else {
+    err = file_readers[0]->read(range.first);
+  }
+
+  if ((err == DB_SUCCESS || err == DB_END_OF_INDEX) &&
+      range.second != file->m_size) {
+    err = file_readers[1]->read(range.second);
+  }
+
+  if (err == DB_SUCCESS) {
+    m_cursor.clear_eof();
+  }
+
+  return err;
+}
+
+void Merge_file_sort::Output_file::duplicate_check(const mrec_t *mrec,
+                                                   const ulint *offsets,
+                                                   Dup *dup) noexcept {
+  if (m_offsets.empty()) {
+    const auto n_fields = dict_index_get_n_fields(dup->m_index);
+    const auto n = 1 + REC_OFFS_HEADER_SIZE + n_fields;
+
+    m_offsets.resize(n);
+
+    m_offsets[0] = n;
+    m_offsets[1] = n_fields;
+
+  } else if (m_last_mrec != nullptr && m_offsets[2] != 0) {
+    auto last_mrec = m_last_mrec;
+    size_t extra_size = *last_mrec++;
+
+    if (extra_size > 0x80) {
+      extra_size = (extra_size & 0x7f) << 8;
+      extra_size |= *last_mrec++;
+    }
+
+    /* Normalize extra_size. Above, value 0 signals "end of list". */
+    --extra_size;
+
+    last_mrec += extra_size;
+
+    auto cmp = cmp_rec_rec_simple(mrec, last_mrec, offsets, &m_offsets[0],
+                                  dup->m_index, dup->m_table);
+
+    if (cmp <= 0) {
+      ut_a(cmp == 0);
+      dup->report(mrec, offsets);
+    }
+  }
+
+  memcpy(&m_offsets[2], &offsets[2], (m_offsets.size() - 2) * sizeof(*offsets));
+}
+
+dberr_t Merge_file_sort::Output_file::write(const mrec_t *mrec,
+                                            const ulint *offsets,
+                                            Dup *dup) noexcept {
+  if (unlikely(dup != nullptr)) {
+    duplicate_check(mrec, offsets, dup);
+  }
+
+  ++m_n_rows;
+
+  size_t need;
+  char prefix[sizeof(uint16_t)];
+
+  /* Normalize extra_size. Value 0 signals "end of list". */
+  const auto extra_size = rec_offs_extra_size(offsets);
+  const auto nes = extra_size + 1;
+
+  if (likely(nes < 0x80)) {
+    need = 1;
+    prefix[0] = (byte)nes;
+  } else {
+    need = 2;
+    prefix[0] = (byte)(0x80 | (nes >> 8));
+    prefix[1] = (byte)nes;
+  }
+
+  const auto rec_size = extra_size + rec_offs_data_size(offsets);
+  ut_ad(rec_size == rec_offs_size(offsets));
+
+  if (unlikely(m_ptr + rec_size + need >= m_buffer.first + m_buffer.second)) {
+    const size_t n_write = m_ptr - m_buffer.first;
+    const auto len = ut_uint64_align_down(n_write, IO_BLOCK_SIZE);
+    auto err = ddl::pwrite(m_fd, m_buffer.first, len, m_offset);
+
+    if (err != DB_SUCCESS) {
+      return err;
+    }
+
+    ut_a(n_write >= len);
+    const auto n_move = n_write - len;
+
+    m_ptr = m_buffer.first;
+    memmove(m_ptr, m_ptr + len, n_move);
+    m_ptr += n_move;
+
+    m_offset += len;
+  }
+
+  m_last_mrec = m_ptr;
+
+  memcpy(m_ptr, prefix, need);
+  m_ptr += need;
+
+  ut_a(m_ptr + rec_size <= m_buffer.first + m_buffer.second);
+
+  memcpy(m_ptr, mrec - extra_size, rec_size);
+  m_ptr += rec_size;
+
+  return DB_SUCCESS;
+}
+
+dberr_t Merge_file_sort::Output_file::flush() noexcept {
+  /* There must always be room to write the end of list marker. */
+  ut_a(copied() < m_buffer.second);
+
+  *m_ptr++ = 0;
+
+  /* Reset the duplicate checks because we are going to start merging
+  a new range after the flush. */
+  m_last_mrec = nullptr;
+
+  if (!m_offsets.empty()) {
+    memset(&m_offsets[2], 0x0, (m_offsets.size() - 2) * sizeof(m_offsets[0]));
+  }
+
+  const auto len = ut_uint64_align_up(m_ptr - m_buffer.first, IO_BLOCK_SIZE);
+  const auto err = ddl::pwrite(m_fd, m_buffer.first, len, m_offset);
+
+  m_offset += len;
+
+  /* Start writing the next page from the start. */
+  m_ptr = m_buffer.first;
+
+  IF_ENABLED("ddl_merge_sort_interrupt", ut_a(err == DB_SUCCESS);
+             m_interrupt_check = TRX_INTERRUPTED_CHECK;);
+
+  if (err == DB_SUCCESS && !(m_interrupt_check++ % TRX_INTERRUPTED_CHECK) &&
+      m_ctx.is_interrupted()) {
+    return DB_INTERRUPTED;
+  } else {
+    return err;
+  }
+}
+
+Merge_file_sort::Range Merge_file_sort::next_range(
+    Merge_offsets &offsets) noexcept {
+  const auto size = m_merge_ctx->m_file->m_size;
+  Range range{size, size};
+
+  if (!offsets.empty()) {
+    range.first = offsets.front();
+    offsets.pop_front();
+  }
+
+  if (!offsets.empty()) {
+    range.second = offsets.front();
+    offsets.pop_front();
+  }
+
+  return range;
+}
+
+dberr_t Merge_file_sort::merge_rows(Cursor &cursor,
+                                    Output_file &output_file) noexcept {
+  dberr_t err;
+  ulint *offsets{};
+  const mrec_t *mrec{};
+
+  while ((err = cursor.fetch(mrec, offsets)) == DB_SUCCESS) {
+    /* If we are simply appending from a single partion then enable duplicate
+    key checking for the write phase. */
+    auto dup = cursor.size() == 0 ? m_merge_ctx->m_dup : nullptr;
+
+    err = output_file.write(mrec, offsets, dup);
+
+    if (unlikely(err != DB_SUCCESS)) {
+      break;
+    }
+
+    err = cursor.next();
+
+    if (unlikely(err != DB_SUCCESS)) {
+      break;
+    }
+  }
+
+  return err;
+}
+
+dberr_t Merge_file_sort::merge_ranges(Cursor &cursor, Merge_offsets &offsets,
+                                      Output_file &output_file,
+                                      size_t buffer_size) noexcept {
+  auto range = next_range(offsets);
+  auto err = cursor.prepare(range, buffer_size);
+
+  if (err != DB_SUCCESS) {
+    return err;
+  }
+
+  m_next_offsets.push_back(output_file.get_size());
+
+  do {
+    err = merge_rows(cursor, output_file);
+
+    if (unlikely(err == DB_END_OF_INDEX)) {
+      err = output_file.flush();
+      m_next_offsets.push_back(output_file.get_size());
+    }
+
+    if (unlikely(err != DB_SUCCESS)) {
+      return err;
+    }
+
+    if (unlikely(m_merge_ctx->m_dup != nullptr &&
+                 m_merge_ctx->m_dup->m_n_dup > 0)) {
+      return DB_DUPLICATE_KEY;
+    }
+
+    range = next_range(offsets);
+
+    /* Reposition the merge cursor on the new ranges to merge next. */
+  } while ((err = cursor.seek(m_merge_ctx->m_file, range)) == DB_SUCCESS);
+
+  m_next_offsets.pop_back();
+
+  return err == DB_END_OF_INDEX ? DB_SUCCESS : err;
+}
+
+dberr_t Merge_file_sort::sort(Builder *builder,
+                              Merge_offsets &offsets) noexcept {
+  ut_a(m_merge_ctx->m_dup != nullptr);
+
+  auto &ctx = builder->ctx();
+  auto file = m_merge_ctx->m_file;
+  const auto n_buffers = (m_merge_ctx->m_n_threads * N_WAY_MERGE) + 1;
+  const auto io_buffer_size = ctx.merge_io_buffer_size(n_buffers);
+
+  Aligned_buffer aligned_buffer{};
+
+  if (!aligned_buffer.allocate(io_buffer_size)) {
+    return DB_OUT_OF_MEMORY;
+  }
+
+  /* Buffer for writing the merged rows to the output file. */
+  auto io_buffer = aligned_buffer.io_buffer();
+
+  /* This is the output file for the first pass. */
+  auto tmpfd = ddl::file_create_low(builder->tmpdir());
+
+  if (tmpfd != OS_FD_CLOSED) {
+    MONITOR_ATOMIC_INC(MONITOR_ALTER_TABLE_SORT_FILES);
+  } else {
+    return DB_OUT_OF_RESOURCES;
+  }
+
+  dberr_t err{DB_SUCCESS};
+
+  /* Merge until there is a single list of rows in the file. */
+  while (offsets.size() > 1) {
+    Output_file output_file(ctx, tmpfd, io_buffer);
+    Cursor cursor{builder, file, m_merge_ctx->m_dup, m_merge_ctx->m_stage};
+
+    err = merge_ranges(cursor, offsets, output_file, io_buffer_size);
+
+    m_n_rows = output_file.get_n_rows();
+
+    if (unlikely(err != DB_SUCCESS)) {
+      break;
+    }
+
+    /* Swap the input file with the output file and repeat. */
+    std::swap(tmpfd, file->m_fd);
+    std::swap(offsets, m_next_offsets);
+
+    ut_a(m_next_offsets.empty());
+
+    if (!offsets.empty()) {
+      file->m_size = output_file.get_size();
+    }
+  }
+
+  file_destroy_low(tmpfd);
+
+  ut_a(err != DB_SUCCESS || file->m_n_recs == m_n_rows);
+
+  return err;
+}
+
+}  // namespace ddl
diff -Nru mysql-8.0-8.0.26/storage/innobase/ddl/ddl0par-scan.cc mysql-8.0-8.0.27/storage/innobase/ddl/ddl0par-scan.cc
--- mysql-8.0-8.0.26/storage/innobase/ddl/ddl0par-scan.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/ddl/ddl0par-scan.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,410 @@
+/*****************************************************************************
+
+Copyright (c) 2020, 2021, Oracle and/or its affiliates. All Rights Reserved.
+
+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, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
+/** @file ddl/ddl0par-scan.cc
+ DDL cluster index parallel scan implementation.
+ Created 2020-11-01 by Sunny Bains. */
+
+#include "ddl0impl-builder.h"
+#include "ddl0impl-cursor.h"
+#include "row0pread.h"
+#include "row0row.h"
+#include "ut0stage.h"
+
+#ifdef UNIV_DEBUG
+#include <current_thd.h>
+#endif /* UNIV_DEBUG */
+
+namespace ddl {
+
+/** Cursor used for parallel reads. */
+struct Parallel_cursor : public Cursor {
+  /** Constructor.
+  @param[in,out] ctx            DDL context. */
+  explicit Parallel_cursor(ddl::Context &ctx) noexcept
+      : Cursor(ctx),
+        m_index(const_cast<dict_index_t *>(m_ctx.index())),
+        m_single_threaded_mode(m_ctx.has_virtual_columns() ||
+                               m_ctx.has_fts_indexes()) {}
+
+  /** Destructor. */
+  ~Parallel_cursor() noexcept override = default;
+
+  /** Open the cursor. */
+  void open() noexcept override {}
+
+  /** @return the index being iterated over. */
+  [[nodiscard]] dict_index_t *index() noexcept override { return m_index; }
+
+  /** Reads clustered index of the table and create temporary files
+  containing the index entries for the indexes to be built.
+  @param[in,out] builders Merge buffers to use for reading.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t scan(Builders &builders) noexcept override;
+
+  /** Copy the row data, by default only the pointers are copied.
+  @param[in] thread_id          Scan thread ID.
+  @param[in,out] row            Row to copy.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] virtual dberr_t copy_row(size_t thread_id,
+                                         Row &row) noexcept override;
+
+  /** @return true if EOF reached. */
+  [[nodiscard]] virtual bool eof() const noexcept override { return m_eof; }
+
+ private:
+  using Heaps = std::vector<mem_heap_t *, ut::allocator<mem_heap_t *>>;
+
+  /** If true then no more rows to scan. */
+  bool m_eof{};
+
+  /** Heap per thread. */
+  Heaps m_heaps{};
+
+  /** Index to iterate over. */
+  dict_index_t *m_index{};
+
+  /** true if scan should be in single threaded mode. */
+  bool m_single_threaded_mode{};
+};
+
+dberr_t Parallel_cursor::scan(Builders &builders) noexcept {
+  ut_a(!builders.empty());
+
+  ut_a(!m_ctx.m_online || m_ctx.m_trx->isolation_level ==
+                              trx_t::isolation_level_t::REPEATABLE_READ);
+
+  size_t n_threads{};
+
+  if (!m_single_threaded_mode) {
+    auto use_n_threads = thd_parallel_read_threads(m_ctx.m_trx->mysql_thd);
+
+    if (use_n_threads > 1) {
+      for (auto &builder : builders) {
+        if (builder->is_skip_file_sort() || builder->is_spatial_index()) {
+          /* Note: Parallel scan will break the order. If in the future we
+          decide to force a parallel scan then we will need to force a file
+          sort later. Or, figure out how to "stitch" the lists together after
+          the dumping the rows from the scan. */
+          m_single_threaded_mode = true;
+          break;
+        }
+      }
+
+      if (!m_single_threaded_mode) {
+        /* Check how many threads can actually be allocated. */
+        n_threads = Parallel_reader::available_threads(use_n_threads, false);
+
+        /* May as well do a synchronous read. */
+        if (n_threads == 1) {
+          Parallel_reader::release_threads(n_threads);
+          n_threads = 0;
+        }
+      }
+    }
+  }
+
+  const auto use_n_threads = n_threads == 0 ? 1 : n_threads;
+
+  Builders batch_insert{};
+
+  for (auto &builder : builders) {
+    auto err = builder->init(*this, use_n_threads);
+    if (err != DB_SUCCESS) {
+      return err;
+    }
+
+    if (builder->is_spatial_index()) {
+      batch_insert.push_back(builder);
+    }
+  }
+
+  using Rows = std::vector<Row, ut::allocator<Row>>;
+  using Row_counters = std::vector<size_t, ut::allocator<size_t>>;
+
+  /* Each thread has its own row instance and row count instance. */
+  Rows rows{};
+  Row_counters n_rows{};
+
+  ut_a(m_heaps.empty());
+
+  rows.resize(use_n_threads);
+  n_rows.resize(rows.size());
+
+  /* Delete the per thread heaps. */
+  auto cleanup = [](Heaps &heaps, dberr_t err) {
+    for (auto heap : heaps) {
+      if (heap != nullptr) {
+        mem_heap_free(heap);
+      }
+    }
+    heaps.clear();
+    return err == DB_END_OF_INDEX ? DB_SUCCESS : err;
+  };
+
+  /* Create the per thread heap for transient memory allocations. */
+  for (size_t i = 0; i < use_n_threads; ++i) {
+    m_heaps.push_back(mem_heap_create(1024));
+
+    if (m_heaps.back() == nullptr) {
+      return cleanup(m_heaps, DB_OUT_OF_MEMORY);
+    }
+
+    if (m_ctx.m_dtuple_heap != nullptr) {
+      rows[i].m_add_cols = m_ctx.create_add_cols();
+      if (rows[i].m_add_cols == nullptr) {
+        return cleanup(m_heaps, DB_OUT_OF_MEMORY);
+      }
+    }
+  }
+
+  Parallel_reader reader{n_threads};
+
+  const Parallel_reader::Scan_range FULL_SCAN;
+
+  using Thread_ctx = Parallel_reader::Thread_ctx;
+
+  auto batch_inserter = [&](Thread_ctx *thread_ctx) {
+    size_t i{};
+    bool latches_released{};
+    dberr_t err{DB_SUCCESS};
+    const auto thread_id = thread_ctx->m_thread_id;
+
+    /* End of page scan. */
+    for (auto builder : batch_insert) {
+      /* Do a batch insert of the cached rows, instead of one by one. */
+      err = builder->batch_insert(thread_id, [&]() {
+        if (!latches_released) {
+          /* We are going to commit the mini-transaction, this will release
+          the latches and so we must do a deep copy of the rows before we
+          can commit the mini-transaction. */
+          for (size_t j = i + 1; j < batch_insert.size(); ++j) {
+            batch_insert[j]->batch_insert_deep_copy_tuples(thread_id);
+          }
+          thread_ctx->savepoint();
+          latches_released = true;
+        }
+        return DB_SUCCESS;
+      });
+
+      if (err != DB_SUCCESS && err != DB_END_OF_INDEX) {
+        return err;
+      }
+
+      ++i;
+    }
+
+    if (latches_released) {
+      return thread_ctx->restore_from_savepoint();
+    }
+
+    return DB_SUCCESS;
+  };
+
+  /* Handle the case when the bulk loader wants to do an mtr commit. The
+  log_free_checks require that the caller can't be holding any latches. */
+  auto bulk_inserter = [&](Thread_ctx *thread_ctx, Row &row) {
+    bool latches_released{};
+    const auto thread_id = thread_ctx->m_thread_id;
+
+    for (auto builder : builders) {
+      const auto err = builder->add_row(*this, row, thread_id, [&]() {
+        if (!latches_released &&
+            thread_ctx->get_state() != Parallel_reader::State::THREAD) {
+          thread_ctx->savepoint();
+          latches_released = true;
+        }
+        return DB_SUCCESS;
+      });
+
+      if (err != DB_SUCCESS && err != DB_END_OF_INDEX) {
+        return err;
+      }
+
+      if (builder->stage() != nullptr) {
+        builder->stage()->end_phase_read_pk();
+      }
+    }
+
+    if (latches_released) {
+      ut_a(row.m_ptr != nullptr);
+      /* Resume from the savepoint (above). */
+      return thread_ctx->restore_from_savepoint();
+    }
+
+    return DB_SUCCESS;
+  };
+
+  size_t nr{};
+
+  /* current_thread is a thread local variable. Set current_thd it
+  to the user thread's THD  instance so that the debug sync calls
+  will trigger for the spawned threads too. */
+  IF_DEBUG(reader.set_start_callback([&](Thread_ctx *thread_ctx) {
+    if (thread_ctx->get_state() == Parallel_reader::State::THREAD) {
+      current_thd = m_ctx.thd();
+    }
+    return DB_SUCCESS;
+  });)
+
+  /* Called when a thread finishes traversing a page and when it completes. */
+  reader.set_finish_callback([&](Thread_ctx *thread_ctx) {
+    dberr_t err{DB_SUCCESS};
+    const auto thread_id = thread_ctx->m_thread_id;
+
+    switch (thread_ctx->get_state()) {
+      case Parallel_reader::State::PAGE:
+        if (!batch_insert.empty()) {
+          err = batch_inserter(thread_ctx);
+        }
+
+        /* Reset the heap. Note: row.m_offsets and row.m_ptr are invalid now. */
+        mem_heap_empty(m_heaps[thread_id]);
+
+        nr += n_rows[thread_id];
+
+        for (auto &builder : builders) {
+          if (builder->stage() != nullptr) {
+            builder->stage()->n_pk_recs_inc(n_rows[thread_id]);
+            builder->stage()->inc(1);
+          }
+        }
+
+        n_rows[thread_id] = 0;
+
+        /* End of page counter. */
+        return err;
+
+      case Parallel_reader::State::THREAD: {
+        ut_a(n_rows[thread_id] == 0);
+
+        /* End of index scan. */
+        auto &row = rows[thread_id];
+
+        row.m_ptr = nullptr;
+
+        m_eof = true;
+
+        return bulk_inserter(thread_ctx, row);
+      }
+
+      case Parallel_reader::State::CTX:
+        return DB_SUCCESS;
+
+      case Parallel_reader::State::UNKNOWN:
+        ut_error;
+    }
+    return DB_ERROR;
+  });
+
+  Parallel_reader::Config config(FULL_SCAN, index());
+
+  /* Called for each row during the scan. */
+  auto err = reader.add_scan(
+      /* Ignore read views for non-online scans. */
+      m_ctx.m_online ? m_ctx.m_trx : nullptr, config,
+      [&](const Parallel_reader::Ctx *read_ctx) {
+        const auto thread_id = read_ctx->thread_id();
+
+        auto &row = rows[thread_id];
+        auto heap = m_heaps[thread_id];
+
+        row.m_rec = read_ctx->m_rec;
+
+        row.m_offsets = rec_get_offsets(row.m_rec, index(), nullptr,
+                                        ULINT_UNDEFINED, &heap);
+
+#ifdef UNIV_DEBUG
+        {
+          const auto rec = row.m_rec;
+          const auto is_comp = dict_table_is_comp(m_ctx.m_old_table);
+
+          ut_ad(!rec_get_deleted_flag(rec, is_comp));
+
+          /* When !online, we are holding a lock on old_table, preventing
+          any inserts that could have written a record 'stub' before
+          writing out off-page columns. */
+          ut_ad(m_ctx.m_online ||
+                !rec_offs_any_null_extern(rec, row.m_offsets));
+        }
+#endif /* UNIV_DEBUG */
+
+        /* We only need to copy the data when the heap is emptied.
+        @see Parallel_cursor::copy_row */
+        auto err = row.build(m_ctx, m_index, heap, ROW_COPY_POINTERS);
+
+        if (err != DB_SUCCESS) {
+          return err;
+        }
+
+        err = bulk_inserter(read_ctx->thread_ctx(), row);
+
+        ++n_rows[thread_id];
+
+        return err;
+      });
+
+  if (err == DB_SUCCESS) {
+    err = reader.run(n_threads);
+
+    if (err == DB_OUT_OF_RESOURCES) {
+      ut_a(!m_single_threaded_mode);
+
+      ib::warn(ER_INNODB_OUT_OF_RESOURCES)
+          << "Resource not available to create threads for parallel scan."
+          << " Falling back to single thread mode.";
+
+      reader.release_threads(n_threads);
+
+      /* No need to for the extra thread states, release them. */
+      for (auto builder : builders) {
+        builder->fallback_to_single_thread();
+      }
+
+      err = reader.run(0);
+    }
+  }
+
+  return cleanup(m_heaps, err);
+}
+
+dberr_t Parallel_cursor::copy_row(size_t thread_id, Row &row) noexcept {
+  ut_a(!eof());
+
+  auto heap = m_heaps[thread_id];
+
+  row.m_offsets =
+      rec_get_offsets(row.m_rec, index(), nullptr, ULINT_UNDEFINED, &heap);
+
+  return row.build(m_ctx, index(), heap, ROW_COPY_DATA);
+}
+
+Cursor *Cursor::create_cursor(ddl::Context &ctx) noexcept {
+  return ut::new_withkey<Parallel_cursor>(ut::make_psi_memory_key(mem_key_ddl),
+                                          ctx);
+}
+
+}  // namespace ddl
diff -Nru mysql-8.0-8.0.26/storage/innobase/ddl/ddl0rtree.cc mysql-8.0-8.0.27/storage/innobase/ddl/ddl0rtree.cc
--- mysql-8.0-8.0.26/storage/innobase/ddl/ddl0rtree.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/ddl/ddl0rtree.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,210 @@
+/*****************************************************************************
+
+Copyright (c) 2020, 2021, Oracle and/or its affiliates. All Rights Reserved.
+
+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, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
+/** @file ddl/ddl0rtree.cc
+ DDL cluster index scan implementation.
+ Created 2020-11-01 by Sunny Bains. */
+
+#include "btr0load.h"
+#include "ddl0impl-cursor.h"
+#include "ddl0impl-rtree.h"
+#include "row0vers.h"
+
+namespace ddl {
+
+RTree_inserter::RTree_inserter(Context &ctx, dict_index_t *index) noexcept
+    : m_dtuples(ut::new_withkey<Tuples>(ut::make_psi_memory_key(mem_key_ddl))),
+      m_index(index),
+      m_ctx(ctx) {
+  m_dml_heap = mem_heap_create(512);
+  m_dtuple_heap = mem_heap_create(512);
+}
+
+RTree_inserter::~RTree_inserter() noexcept {
+  if (m_dtuples != nullptr) {
+    ut::delete_(m_dtuples);
+  }
+  if (m_dtuple_heap != nullptr) {
+    mem_heap_free(m_dtuple_heap);
+  }
+  if (m_dml_heap != nullptr) {
+    mem_heap_free(m_dml_heap);
+  }
+}
+
+void RTree_inserter::deep_copy_tuples(Tuples::iterator it) noexcept {
+  /* Since the data of the tuple pk fields are pointers to cluster index rows.
+  After mtr commit, these pointers could point to invalid data. Therefore,
+  we need to do a deep copy of the data from scanned index buffer.  */
+  for (; it != m_dtuples->end(); ++it) {
+    auto dtuple = *it;
+
+    /* The first field is the spatial MBR field, which is the key for
+    spatial indexes.  So skip it. */
+    for (size_t i = 1; i < dtuple_get_n_fields(dtuple); ++i) {
+      dfield_dup(&dtuple->fields[i], m_dtuple_heap);
+    }
+  }
+}
+
+void RTree_inserter::add_to_batch(const dtuple_t *row,
+                                  const row_ext_t *ext) noexcept {
+  auto dtuple = row_build_index_entry(row, ext, m_index, m_dtuple_heap);
+  ut_a(dtuple != nullptr);
+  m_dtuples->push_back(dtuple);
+}
+
+dberr_t RTree_inserter::batch_insert(trx_id_t trx_id,
+                                     Latch_release &&latch_release) noexcept {
+  rec_t *rec{};
+  btr_cur_t cursor;
+  ulint *offsets{};
+  rtr_info_t rtr_info;
+  big_rec_t *big_rec{};
+  bool latches_released{};
+  dberr_t err{DB_SUCCESS};
+  IF_DEBUG(bool force_log_free_check{};)
+
+  static constexpr ulint flag = BTR_NO_UNDO_LOG_FLAG | BTR_NO_LOCKING_FLAG |
+                                BTR_KEEP_SYS_FLAG | BTR_CREATE_FLAG;
+
+  ut_a(dict_index_is_spatial(m_index));
+
+  IF_ENABLED("ddl_instrument_log_check_flush", force_log_free_check = true;)
+
+  mtr_t mtr;
+
+  cursor.index = m_index;
+
+  for (auto it = m_dtuples->begin(); it != m_dtuples->end(); ++it) {
+    auto dtuple = *it;
+
+    ut_ad(dtuple != nullptr);
+
+    if (log_needs_free_check() IF_DEBUG(|| force_log_free_check)) {
+      if (!latches_released) {
+        deep_copy_tuples(it);
+
+        err = latch_release();
+
+        if (err != DB_SUCCESS) {
+          return err;
+        }
+
+        latches_released = true;
+
+        IF_DEBUG(force_log_free_check = false;)
+      }
+    }
+
+    mtr.start();
+
+    rtr_init_rtr_info(&rtr_info, false, &cursor, m_index, false);
+
+    rtr_info_update_btr(&cursor, &rtr_info);
+
+    btr_cur_search_to_nth_level(m_index, 0, dtuple, PAGE_CUR_RTREE_INSERT,
+                                BTR_MODIFY_LEAF, &cursor, 0, __FILE__, __LINE__,
+                                &mtr);
+
+    /* Update MBR in parent entry, change search mode to BTR_MODIFY_TREE */
+    if (rtr_info.mbr_adj) {
+      mtr.commit();
+
+      rtr_clean_rtr_info(&rtr_info, true);
+
+      rtr_init_rtr_info(&rtr_info, false, &cursor, m_index, false);
+
+      rtr_info_update_btr(&cursor, &rtr_info);
+
+      mtr.start();
+
+      btr_cur_search_to_nth_level(m_index, 0, dtuple, PAGE_CUR_RTREE_INSERT,
+                                  BTR_MODIFY_TREE, &cursor, 0, __FILE__,
+                                  __LINE__, &mtr);
+    }
+
+    err = btr_cur_optimistic_insert(flag, &cursor, &offsets, &m_dml_heap,
+                                    dtuple, &rec, &big_rec, nullptr, &mtr);
+
+    if (err == DB_FAIL) {
+      ut_ad(big_rec == nullptr);
+
+      mtr.commit();
+
+      mtr.start();
+
+      rtr_clean_rtr_info(&rtr_info, true);
+
+      rtr_init_rtr_info(&rtr_info, false, &cursor, m_index, false);
+
+      rtr_info_update_btr(&cursor, &rtr_info);
+
+      btr_cur_search_to_nth_level(m_index, 0, dtuple, PAGE_CUR_RTREE_INSERT,
+                                  BTR_MODIFY_TREE, &cursor, 0, __FILE__,
+                                  __LINE__, &mtr);
+
+      err = btr_cur_pessimistic_insert(flag, &cursor, &offsets, &m_dml_heap,
+                                       dtuple, &rec, &big_rec, nullptr, &mtr);
+    }
+
+    IF_ENABLED("ddl_ins_spatial_fail", err = DB_FAIL;)
+
+    if (err == DB_SUCCESS) {
+      if (rtr_info.mbr_adj) {
+        err = rtr_ins_enlarge_mbr(&cursor, nullptr, &mtr);
+      }
+
+      if (err == DB_SUCCESS) {
+        page_update_max_trx_id(btr_cur_get_block(&cursor),
+                               btr_cur_get_page_zip(&cursor), trx_id, &mtr);
+      }
+    }
+
+    mtr.commit();
+
+    rtr_clean_rtr_info(&rtr_info, true);
+
+    if (err != DB_SUCCESS) {
+      m_ctx.set_error(err);
+    } else {
+      err = m_ctx.get_error();
+    }
+
+    if (err != DB_SUCCESS) {
+      break;
+    }
+  }
+
+  m_dtuples->clear();
+
+  mem_heap_empty(m_dml_heap);
+  mem_heap_empty(m_dtuple_heap);
+
+  return err;
+}
+
+}  // namespace ddl
diff -Nru mysql-8.0-8.0.26/storage/innobase/dict/dict0boot.cc mysql-8.0-8.0.27/storage/innobase/dict/dict0boot.cc
--- mysql-8.0-8.0.26/storage/innobase/dict/dict0boot.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/dict/dict0boot.cc	2021-09-28 11:46:34.000000000 +0000
@@ -117,8 +117,9 @@
     entering into reserved range of table_ids for SDI
     tables */
     if (id >= dict_sdi_get_table_id(0)) {
-      ib::fatal(ER_IB_MSG_160) << "InnoDB is running out of table_ids"
-                               << " Please dump and reload the database";
+      ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_160)
+          << "InnoDB is running out of table_ids"
+          << " Please dump and reload the database";
     }
 
     mlog_write_ull(dict_hdr + DICT_HDR_TABLE_ID, id, &mtr);
diff -Nru mysql-8.0-8.0.26/storage/innobase/dict/dict0crea.cc mysql-8.0-8.0.27/storage/innobase/dict/dict0crea.cc
--- mysql-8.0-8.0.26/storage/innobase/dict/dict0crea.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/dict/dict0crea.cc	2021-09-28 11:46:34.000000000 +0000
@@ -232,18 +232,18 @@
     bool exists;
     if (os_file_status(filepath, &exists, &type)) {
       if (exists) {
-        ut_free(filepath);
+        ut::free(filepath);
         return DB_TABLESPACE_EXISTS;
       }
     } else {
-      ut_free(filepath);
+      ut::free(filepath);
       return DB_IO_ERROR;
     }
 
     err = log_ddl->write_delete_space_log(trx, table, space, filepath, false,
                                           false);
     if (err != DB_SUCCESS) {
-      ut_free(filepath);
+      ut::free(filepath);
       return err;
     }
 
@@ -266,7 +266,7 @@
     err = fil_ibd_create(space, tablespace_name.c_str(), filepath, fsp_flags,
                          size);
 
-    ut_free(filepath);
+    ut::free(filepath);
 
     DBUG_INJECT_CRASH("ddl_crash_after_create_tablespace",
                       crash_injection_after_create_counter++);
diff -Nru mysql-8.0-8.0.26/storage/innobase/dict/dict0dd.cc mysql-8.0-8.0.27/storage/innobase/dict/dict0dd.cc
--- mysql-8.0-8.0.26/storage/innobase/dict/dict0dd.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/dict/dict0dd.cc	2021-09-28 11:46:34.000000000 +0000
@@ -77,7 +77,8 @@
                                              size_t *out_len) {
   cleanup();
 
-  m_result = UT_NEW_ARRAY_NOKEY(byte, in_len * 2);
+  m_result = ut::new_arr_withkey<byte>(UT_NEW_THIS_FILE_PSI_KEY,
+                                       ut::Count{in_len * 2});
   char *result = reinterpret_cast<char *>(m_result);
 
   for (size_t i = 0; i < in_len; ++i) {
@@ -99,7 +100,8 @@
 
   cleanup();
 
-  m_result = UT_NEW_ARRAY_NOKEY(byte, in_len / 2);
+  m_result = ut::new_arr_withkey<byte>(UT_NEW_THIS_FILE_PSI_KEY,
+                                       ut::Count{in_len / 2});
 
   for (size_t i = 0; i < in_len / 2; ++i) {
     char c1 = stream[i * 2];
@@ -559,8 +561,7 @@
 @param[in,out]	table	InnoDB table or partition
 @return error code
 @retval 0 on success (DD_SUVCCESS) */
-static MY_ATTRIBUTE((warn_unused_result)) int dd_check_corrupted(
-    dict_table_t *&table) {
+[[nodiscard]] static int dd_check_corrupted(dict_table_t *&table) {
   if (table->is_corrupted()) {
     if (dict_table_is_sdi(table->id)
 #ifndef UNIV_HOTBACKUP
@@ -570,7 +571,8 @@
 #ifndef UNIV_HOTBACKUP
       my_error(ER_TABLE_CORRUPT, MYF(0), "", table->name.m_name);
 #else  /* !UNIV_HOTBACKUP */
-      ib::fatal(ER_IB_MSG_168) << "table is corrupt: " << table->name.m_name;
+      ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_168)
+          << "table is corrupt: " << table->name.m_name;
 #endif /* !UNIV_HOTBACKUP */
     } else {
 #ifndef UNIV_HOTBACKUP
@@ -580,7 +582,8 @@
 
       my_error(ER_TABLE_CORRUPT, MYF(0), db_str.c_str(), tbl_str.c_str());
 #else  /* !UNIV_HOTBACKUP */
-      ib::fatal(ER_IB_MSG_169) << "table is corrupt: " << table->name.m_name;
+      ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_169)
+          << "table is corrupt: " << table->name.m_name;
 #endif /* !UNIV_HOTBACKUP */
     }
     table = nullptr;
@@ -592,7 +595,7 @@
 #ifndef UNIV_HOTBACKUP
     my_error(ER_TABLESPACE_MISSING, MYF(0), table->name.m_name);
 #else  /* !UNIV_HOTBACKUP */
-    ib::fatal(ER_IB_MSG_170)
+    ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_170)
         << "table space is missing: " << table->name.m_name;
 #endif /* !UNIV_HOTBACKUP */
     table = nullptr;
@@ -1289,7 +1292,7 @@
             ER_DEFAULT(ER_ILLEGAL_HA_CREATE_OPTION), innobase_hton_name, name);
       }
     }
-      /* fall through */
+      [[fallthrough]];
     case ROW_TYPE_DEFAULT:
       switch (real_type) {
         case ROW_TYPE_FIXED:
@@ -1298,7 +1301,7 @@
         case ROW_TYPE_DEFAULT:
           /* get_real_row_type() should not return these */
           ut_ad(0);
-          /* fall through */
+          [[fallthrough]];
         case ROW_TYPE_DYNAMIC:
           ut_ad(*zip_ssize == 0);
           break;
@@ -1323,7 +1326,7 @@
         }
         break;
       }
-      /* fall through */
+      [[fallthrough]];
     case ROW_TYPE_COMPRESSED:
       if (is_temporary) {
         if (strict) {
@@ -2214,9 +2217,11 @@
 @retval		0 on success
 @retval		HA_ERR_INDEX_COL_TOO_LONG if a column is too long
 @retval		HA_ERR_TOO_BIG_ROW if the record is too long */
-static MY_ATTRIBUTE((warn_unused_result)) int dd_fill_one_dict_index(
-    const dd::Index *dd_index, dict_table_t *table, bool strict,
-    const TABLE_SHARE *form, uint key_num) {
+[[nodiscard]] static int dd_fill_one_dict_index(const dd::Index *dd_index,
+                                                dict_table_t *table,
+                                                bool strict,
+                                                const TABLE_SHARE *form,
+                                                uint key_num) {
   const KEY &key = form->key_info[key_num];
   ulint type = 0;
   unsigned n_fields = key.user_defined_key_parts;
@@ -3360,8 +3365,7 @@
                                    const char *algorithm,
                                    dd::Object_id dd_space_id) {
   dd::Tablespace *dd_space{};
-  auto fail = client->acquire_uncached_uncommitted<dd::Tablespace>(dd_space_id,
-                                                                   &dd_space);
+  auto fail = client->acquire_uncached<dd::Tablespace>(dd_space_id, &dd_space);
 
   if (fail || dd_space == nullptr) {
     return true;
@@ -3744,7 +3748,7 @@
 @param[in,out]	heap		heap for store file name.
 @param[in]	table		dict table
 @param[in]	dd_table	dd table obj
-@return First filepath (caller must invoke ut_free() on it)
+@return First filepath (caller must invoke ut::free() on it)
 @retval nullptr if no mysql.tablespace_datafiles entry was found. */
 template <typename Table>
 char *dd_get_first_path(mem_heap_t *heap, dict_table_t *table,
@@ -3840,7 +3844,7 @@
   if (heap != nullptr) {
     mem_heap_free(heap);
   } else {
-    ut_free(path);
+    ut::free(path);
   }
 }
 
@@ -3869,7 +3873,7 @@
 
   strcpy(filename, filepath);
 
-  ut_free(filepath);
+  ut::free(filepath);
 }
 
 /** Opens a tablespace for dd_load_table_one()
@@ -3924,8 +3928,8 @@
       dict_sys_mutex_enter();
     } else {
       /* Make the temporary tablespace name. */
-      shared_space_name =
-          static_cast<char *>(ut_malloc_nokey(strlen(general_space_name) + 20));
+      shared_space_name = static_cast<char *>(ut::malloc_withkey(
+          UT_NEW_THIS_FILE_PSI_KEY, strlen(general_space_name) + 20));
 
       sprintf(shared_space_name, "%s_" ULINTPF, general_space_name,
               static_cast<ulint>(table->space));
@@ -3944,7 +3948,7 @@
   auto is_already_opened = [&]() {
     if (fil_space_exists_in_mem(table->space, space_name, false, true)) {
       dd_get_and_save_data_dir_path(table, dd_table, true);
-      ut_free(shared_space_name);
+      ut::free(shared_space_name);
       return true;
     }
     return false;
@@ -3972,8 +3976,8 @@
     have happened yet. */
     table->ibd_file_missing = TRUE;
 
-    ut_free(shared_space_name);
-    ut_free(filepath);
+    ut::free(shared_space_name);
+    ut::free(filepath);
     return;
   }
 
@@ -4012,7 +4016,7 @@
     table->ibd_file_missing = TRUE;
   }
 
-  ut_free(shared_space_name);
+  ut::free(shared_space_name);
 }
 
 /** Get the space name from mysql.tablespaces for a given space_id.
@@ -4020,7 +4024,7 @@
 @param[in,out]	heap		heap for store file name.
 @param[in]	table		dict table
 @param[in]	dd_table	dd table obj
-@return First filepath (caller must invoke ut_free() on it)
+@return First filepath (caller must invoke ut::free() on it)
 @retval nullptr if no mysql.tablespace_datafiles entry was found. */
 template <typename Table>
 char *dd_space_get_name(mem_heap_t *heap, dict_table_t *table,
@@ -4551,7 +4555,7 @@
   bool is_comp = dict_table_is_comp(pcur->index()->table);
 
   while (!rec || rec_get_deleted_flag(rec, is_comp)) {
-    btr_pcur_move_to_next_user_rec(pcur, mtr);
+    pcur->move_to_next_user_rec(mtr);
 
     rec = btr_pcur_get_rec(pcur);
 
@@ -5434,7 +5438,7 @@
                                         table->name.m_name, filename, false,
                                         dd_space_id);
 
-    ut_free(filename);
+    ut::free(filename);
     if (ret) {
       return false;
     }
@@ -5918,7 +5922,7 @@
       ut_a(false);
     }
 
-    ut_free(new_path);
+    ut::free(new_path);
   }
 
   if (client->update(dd_table)) {
diff -Nru mysql-8.0-8.0.26/storage/innobase/dict/dict0dict.cc mysql-8.0-8.0.27/storage/innobase/dict/dict0dict.cc
--- mysql-8.0-8.0.26/storage/innobase/dict/dict0dict.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/dict/dict0dict.cc	2021-09-28 11:46:34.000000000 +0000
@@ -109,7 +109,7 @@
 #include "row0ins.h"
 #include "row0log.h"
 #ifndef UNIV_HOTBACKUP
-#include "row0merge.h"
+#include "ddl0ddl.h"
 #include "row0mysql.h"
 #endif /* !UNIV_HOTBACKUP */
 #include "row0upd.h"
@@ -315,8 +315,8 @@
 
   /* Note: rw_lock_create() will call the constructor */
 
-  table->stats_latch =
-      static_cast<rw_lock_t *>(ut_malloc_nokey(sizeof(rw_lock_t)));
+  table->stats_latch = static_cast<rw_lock_t *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sizeof(rw_lock_t)));
 
   ut_a(table->stats_latch != nullptr);
 
@@ -328,7 +328,7 @@
 @param[in,out]	table	table whose stats latch to free */
 static void dict_table_stats_latch_free(dict_table_t *table) {
   rw_lock_free(table->stats_latch);
-  ut_free(table->stats_latch);
+  ut::free(table->stats_latch);
 }
 
 /** Create a dict_table_t's stats latch or delay for lazy creation.
@@ -385,7 +385,7 @@
       rw_lock_x_lock(table->stats_latch);
       break;
     case RW_NO_LATCH:
-      /* fall through */
+      [[fallthrough]];
     default:
       ut_error;
   }
@@ -413,7 +413,7 @@
       rw_lock_x_unlock(table->stats_latch);
       break;
     case RW_NO_LATCH:
-      /* fall through */
+      [[fallthrough]];
     default:
       ut_error;
   }
@@ -447,9 +447,9 @@
   }
 
   if (table && table->get_ref_count() == ref_count && table->drop_aborted) {
-    /* Silence a debug assertion in row_merge_drop_indexes(). */
+    /* Silence a debug assertion in ddl::drop_indexes(). */
     ut_d(table->acquire());
-    row_merge_drop_indexes(trx, table, TRUE);
+    ddl::drop_indexes(trx, table, true);
     ut_d(table->release());
     ut_ad(table->get_ref_count() == ref_count);
     trx_commit_for_mysql(trx);
@@ -584,7 +584,7 @@
   ut_a(!table->stat_initialized);
 #endif /* UNIV_DEBUG || UNIV_DDL_DEBUG */
 
-  row_merge_drop_table(trx, table);
+  ddl::drop_table(trx, table);
 }
 
 /** Check if the table has a given (non_virtual) column.
@@ -707,11 +707,12 @@
 static void dict_table_autoinc_alloc(void *table_void) {
   dict_table_t *table = static_cast<dict_table_t *>(table_void);
 
-  table->autoinc_mutex = UT_NEW_NOKEY(ib_mutex_t());
+  table->autoinc_mutex = ut::new_withkey<ib_mutex_t>(UT_NEW_THIS_FILE_PSI_KEY);
   ut_a(table->autoinc_mutex != nullptr);
   mutex_create(LATCH_ID_AUTOINC, table->autoinc_mutex);
 
-  table->autoinc_persisted_mutex = UT_NEW_NOKEY(ib_mutex_t());
+  table->autoinc_persisted_mutex =
+      ut::new_withkey<ib_mutex_t>(UT_NEW_THIS_FILE_PSI_KEY);
   ut_a(table->autoinc_persisted_mutex != nullptr);
   mutex_create(LATCH_ID_PERSIST_AUTOINC, table->autoinc_persisted_mutex);
 }
@@ -721,7 +722,7 @@
 @param[in,out]	index_void	index whose zip_pad_mutex to create */
 static void dict_index_zip_pad_alloc(void *index_void) {
   dict_index_t *index = static_cast<dict_index_t *>(index_void);
-  index->zip_pad.mutex = UT_NEW_NOKEY(SysMutex());
+  index->zip_pad.mutex = ut::new_withkey<SysMutex>(UT_NEW_THIS_FILE_PSI_KEY);
   ut_a(index->zip_pad.mutex != nullptr);
   mutex_create(LATCH_ID_ZIP_PAD_MUTEX, index->zip_pad.mutex);
 }
@@ -753,12 +754,7 @@
   table->autoinc = value;
 }
 
-/** Write redo logs for autoinc counter that is to be inserted, or to
-update some existing smaller one to bigger.
-@param[in,out]	table	InnoDB table object
-@param[in]	value	AUTOINC counter to log
-@param[in,out]	mtr	Mini-transaction */
-void dict_table_autoinc_log(dict_table_t *table, uint64_t value, mtr_t *mtr) {
+bool dict_table_autoinc_log(dict_table_t *table, uint64_t value, mtr_t *mtr) {
   bool log = false;
 
   mutex_enter(table->autoinc_persisted_mutex);
@@ -804,6 +800,9 @@
     persister->write_log(table->id, metadata, mtr);
     /* No need to flush due to performance reason */
   }
+
+  /* Check and return if auto increment is to be persisted. */
+  return (log && dict_persist->check_persist_immediately());
 }
 
 /** Get all the FTS indexes on a table.
@@ -1013,10 +1012,11 @@
 
 /** Inits the data dictionary module. */
 void dict_init(void) {
-  dict_operation_lock =
-      static_cast<rw_lock_t *>(ut_zalloc_nokey(sizeof(*dict_operation_lock)));
+  dict_operation_lock = static_cast<rw_lock_t *>(ut::zalloc_withkey(
+      UT_NEW_THIS_FILE_PSI_KEY, sizeof(*dict_operation_lock)));
 
-  dict_sys = static_cast<dict_sys_t *>(ut_zalloc_nokey(sizeof(*dict_sys)));
+  dict_sys = static_cast<dict_sys_t *>(
+      ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sizeof(*dict_sys)));
 
   UT_LIST_INIT(dict_sys->table_LRU);
   UT_LIST_INIT(dict_sys->table_non_LRU);
@@ -1486,8 +1486,9 @@
   if (strlen(table->name.m_name) + 1 <= sizeof(old_name)) {
     strcpy(old_name, table->name.m_name);
   } else {
-    ib::fatal(ER_IB_MSG_177) << "Too long table name: " << table->name
-                             << ", max length is " << MAX_FULL_NAME_LEN;
+    ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_177)
+        << "Too long table name: " << table->name << ", max length is "
+        << MAX_FULL_NAME_LEN;
   }
 
   fold = ut_fold_string(new_name);
@@ -1551,7 +1552,7 @@
       ib::info(ER_IB_MSG_180) << "Delete of " << filepath << " failed.";
     }
 
-    ut_free(filepath);
+    ut::free(filepath);
 
   } else if (dict_table_is_file_per_table(table)) {
     char *new_path = nullptr;
@@ -1572,8 +1573,8 @@
       in this remote location. */
       err = os_file_create_subdirs_if_needed(new_path);
       if (err != DB_SUCCESS) {
-        ut_free(old_path);
-        ut_free(new_path);
+        ut::free(old_path);
+        ut::free(new_path);
         return (err);
       }
     } else {
@@ -1583,23 +1584,19 @@
     /* New filepath must not exist. */
     err = fil_rename_tablespace_check(table->space, old_path, new_path, false);
     if (err != DB_SUCCESS) {
-      ut_free(old_path);
-      ut_free(new_path);
+      ut::free(old_path);
+      ut::free(new_path);
       return (err);
     }
 
-    clone_mark_abort(true);
-
     std::string new_tablespace_name(new_name);
     dict_name::convert_to_space(new_tablespace_name);
 
     dberr_t err = fil_rename_tablespace(table->space, old_path,
                                         new_tablespace_name.c_str(), new_path);
 
-    clone_mark_active();
-
-    ut_free(old_path);
-    ut_free(new_path);
+    ut::free(old_path);
+    ut::free(new_path);
 
     if (err != DB_SUCCESS) {
       return (err);
@@ -1621,8 +1618,8 @@
     ut_realloc() with the same size do not cause fragmentation */
     ut_a(strlen(new_name) <= MAX_FULL_NAME_LEN);
 
-    table->name.m_name = static_cast<char *>(
-        ut_realloc(table->name.m_name, MAX_FULL_NAME_LEN + 1));
+    table->name.m_name = static_cast<char *>(ut::realloc_withkey(
+        UT_NEW_THIS_FILE_PSI_KEY, table->name.m_name, MAX_FULL_NAME_LEN + 1));
   }
   strcpy(table->name.m_name, new_name);
 
@@ -1808,7 +1805,7 @@
         strcpy(foreign->id + db_len, dict_remove_db_name(old_id));
       }
 
-      ut_free(old_id);
+      ut::free(old_id);
     }
 
     table->foreign_set.erase(it);
@@ -1892,7 +1889,7 @@
       /* Write back the dirty metadata to DDTableBuffer */
       dict_table_persist_to_dd_table_buffer(table);
       ut_ad(table->dirty_status.load() != METADATA_DIRTY);
-      /* Fall through */
+      [[fallthrough]];
     case METADATA_BUFFERED:
       /* We have to remove it away here, since it's evicted.
       And we will add it again once it's re-loaded if possible */
@@ -1947,7 +1944,7 @@
   /* Free virtual column template if any */
   if (table->vc_templ != nullptr) {
     dict_free_vc_templ(table->vc_templ);
-    UT_DELETE(table->vc_templ);
+    ut::delete_(table->vc_templ);
   }
 
   size = mem_heap_get_size(table->heap) + strlen(table->name.m_name) + 1;
@@ -2736,8 +2733,8 @@
 static ibool dict_index_find_and_set_cols(const dict_table_t *table,
                                           dict_index_t *index,
                                           const dict_add_v_col_t *add_v) {
-  std::vector<ulint, ut_allocator<ulint>> col_added;
-  std::vector<ulint, ut_allocator<ulint>> v_col_added;
+  std::vector<ulint, ut::allocator<ulint>> col_added;
+  std::vector<ulint, ut::allocator<ulint>> v_col_added;
 
   ut_ad(table != nullptr && index != nullptr);
   ut_ad(table->magic_n == DICT_TABLE_MAGIC_N);
@@ -3043,8 +3040,8 @@
   }
 
   /* Remember the table columns already contained in new_index */
-  indexed =
-      static_cast<ibool *>(ut_zalloc_nokey(table->n_cols * sizeof *indexed));
+  indexed = static_cast<ibool *>(ut::zalloc_withkey(
+      UT_NEW_THIS_FILE_PSI_KEY, table->n_cols * sizeof *indexed));
 
   /* Mark the table columns already contained in new_index */
   for (i = 0; i < new_index->n_def; i++) {
@@ -3070,7 +3067,7 @@
     }
   }
 
-  ut_free(indexed);
+  ut::free(indexed);
 
   ut_ad(UT_LIST_GET_LEN(table->indexes) == 0);
 
@@ -3122,8 +3119,8 @@
   dict_index_copy(new_index, index, table, 0, index->n_fields);
 
   /* Remember the table columns already contained in new_index */
-  indexed =
-      static_cast<ibool *>(ut_zalloc_nokey(table->n_cols * sizeof *indexed));
+  indexed = static_cast<ibool *>(ut::zalloc_withkey(
+      UT_NEW_THIS_FILE_PSI_KEY, table->n_cols * sizeof *indexed));
 
   /* Mark the table columns already contained in new_index */
   for (i = 0; i < new_index->n_def; i++) {
@@ -3158,7 +3155,7 @@
     }
   }
 
-  ut_free(indexed);
+  ut::free(indexed);
 
   if (dict_index_is_unique(index)) {
     new_index->n_uniq = index->n_fields;
@@ -3825,8 +3822,8 @@
 
 /** Inits the structure for persisting dynamic metadata */
 void dict_persist_init(void) {
-  dict_persist =
-      static_cast<dict_persist_t *>(ut_zalloc_nokey(sizeof(*dict_persist)));
+  dict_persist = static_cast<dict_persist_t *>(
+      ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sizeof(*dict_persist)));
 
   mutex_create(LATCH_ID_DICT_PERSIST_DIRTY_TABLES, &dict_persist->mutex);
 
@@ -3836,7 +3833,10 @@
 
   dict_persist->num_dirty_tables = 0;
 
-  dict_persist->persisters = UT_NEW_NOKEY(Persisters());
+  dict_persist->m_persist_immediately.store(false);
+
+  dict_persist->persisters =
+      ut::new_withkey<Persisters>(UT_NEW_THIS_FILE_PSI_KEY);
   dict_persist->persisters->add(PM_INDEX_CORRUPTED);
   dict_persist->persisters->add(PM_TABLE_AUTO_INC);
 
@@ -3847,15 +3847,15 @@
 
 /** Clear the structure */
 void dict_persist_close(void) {
-  UT_DELETE(dict_persist->persisters);
+  ut::delete_(dict_persist->persisters);
 
 #ifndef UNIV_HOTBACKUP
-  UT_DELETE(dict_persist->table_buffer);
+  ut::delete_(dict_persist->table_buffer);
 #endif /* !UNIV_HOTBACKUP */
 
   mutex_free(&dict_persist->mutex);
 
-  ut_free(dict_persist);
+  ut::free(dict_persist);
 }
 
 #ifndef UNIV_HOTBACKUP
@@ -4038,9 +4038,8 @@
 
   mutex_exit(&dict_persist->mutex);
 
-  UT_DELETE(readmeta);
+  ut::delete_(readmeta);
 }
-#endif /* !UNIV_HOTBACKUP */
 
 /** Mark the dirty_status of a table as METADATA_DIRTY, and add it to the
 dirty_dict_tables list if necessary.
@@ -4048,11 +4047,9 @@
 void dict_table_mark_dirty(dict_table_t *table) {
   ut_ad(!table->is_temporary());
 
-#ifndef UNIV_HOTBACKUP
   /* We should not adding dynamic metadata so late in shutdown phase and
   this data would only be retrieved during recovery. */
   ut_ad(srv_shutdown_state.load() < SRV_SHUTDOWN_FLUSH_PHASE);
-#endif /* !UNIV_HOTBACKUP */
 
   mutex_enter(&dict_persist->mutex);
 
@@ -4061,17 +4058,14 @@
       break;
     case METADATA_CLEAN:
       /* Not in dirty_tables list, add it now */
-#ifndef UNIV_HOTBACKUP
       UT_LIST_ADD_LAST(dict_persist->dirty_dict_tables, table);
-#endif
       ut_d(table->in_dirty_dict_tables_list = true);
-      /* Fall through */
+      [[fallthrough]];
     case METADATA_BUFFERED:
       table->dirty_status.store(METADATA_DIRTY);
       ++dict_persist->num_dirty_tables;
-#ifndef UNIV_HOTBACKUP
+
       dict_persist_update_log_margin();
-#endif /* !UNIV_HOTBACKUP */
   }
 
   ut_ad(table->in_dirty_dict_tables_list);
@@ -4104,7 +4098,6 @@
     Persister *persister = dict_persist->persisters->get(PM_INDEX_CORRUPTED);
     ut_ad(persister != nullptr);
 
-#ifndef UNIV_HOTBACKUP
     mtr_t mtr;
 
     mtr.start();
@@ -4113,13 +4106,11 @@
 
     /* Make sure the corruption bit won't be lost */
     log_write_up_to(*log_sys, mtr.commit_lsn(), true);
-#endif /* !UNIV_HOTBACKUP */
 
     dict_table_mark_dirty(table);
   }
 }
 
-#ifndef UNIV_HOTBACKUP
 /** Write the dirty persistent dynamic metadata for a table to
 DD TABLE BUFFER table. This is the low level function to write back.
 @param[in,out]	table	table to write */
@@ -4150,18 +4141,13 @@
 
   ut_ad(dict_persist->num_dirty_tables > 0);
   --dict_persist->num_dirty_tables;
-#ifndef UNIV_HOTBACKUP
   dict_persist_update_log_margin();
-#endif /* !UNIV_HOTBACKUP */
 }
 
 /** Write back the dirty persistent dynamic metadata of the table
 to DDTableBuffer
 @param[in,out]	table	table object */
 void dict_table_persist_to_dd_table_buffer(dict_table_t *table) {
-  ut_ad(dict_sys != nullptr);
-  ut_ad(dict_sys_mutex_own());
-
   mutex_enter(&dict_persist->mutex);
 
   if (table->dirty_status.load() != METADATA_DIRTY) {
@@ -4177,7 +4163,7 @@
 
   mutex_exit(&dict_persist->mutex);
 }
-#ifndef UNIV_HOTBACKUP
+
 /** Check if any table has any dirty persistent data, if so
 write dirty persistent data of table to mysql.innodb_dynamic_metadata
 accordingly. */
@@ -4278,7 +4264,6 @@
     log_set_dict_persist_margin(*log_sys, margin);
   }
 }
-#endif /* !UNIV_HOTBACKUP */
 
 #ifdef UNIV_DEBUG
 /** Sets merge_threshold for all indexes in the list of tables
@@ -4456,7 +4441,7 @@
             case ONLINE_INDEX_ABORTED_DROPPED:
               break;
           }
-          /* fall through */
+          [[fallthrough]];
         case CHECK_PARTIAL_OK:
           break;
       }
@@ -4561,6 +4546,12 @@
 
   dict_sys_mutex_exit();
 }
+#else
+/* Dummy implementation for satisfying compiler for MEB. This can be removed
+once the callers in dict0dd.cc is factored out from MEB compilation. */
+/* purecov: begin deadcode */
+void dict_set_corrupted(dict_index_t *index [[maybe_unused]]) {}
+/* purecov: end */
 #endif /* !UNIV_HOTBACKUP */
 
 /** Closes the data dictionary module. */
@@ -4621,7 +4612,7 @@
 
   rw_lock_free(dict_operation_lock);
 
-  ut_free(dict_operation_lock);
+  ut::free(dict_operation_lock);
   dict_operation_lock = nullptr;
 
   mutex_free(&dict_foreign_err_mutex);
@@ -4635,7 +4626,7 @@
 
   ut_ad(dict_sys->size == 0);
 
-  ut_free(dict_sys);
+  ut::free(dict_sys);
   dict_sys = nullptr;
 }
 
@@ -5356,7 +5347,7 @@
 }
 
 /** Get the buffered metadata for a specific table, the caller
-has to delete the returned std::string object by UT_DELETE
+has to delete the returned std::string object by ut::delete_
 @param[in]	id	table id
 @param[out]	version	table dynamic metadata version
 @return the metadata saved in a string object, if nothing, the
@@ -5398,8 +5389,8 @@
     *version = 0;
   }
 
-  std::string *metadata =
-      UT_NEW_NOKEY(std::string(reinterpret_cast<const char *>(field), len));
+  std::string *metadata = ut::new_withkey<std::string>(
+      UT_NEW_THIS_FILE_PSI_KEY, reinterpret_cast<const char *>(field), len);
 
   mtr.commit();
 
@@ -5636,7 +5627,7 @@
 Persisters::~Persisters() {
   persisters_t::iterator iter;
   for (iter = m_persisters.begin(); iter != m_persisters.end(); ++iter) {
-    UT_DELETE(iter->second);
+    ut::delete_(iter->second);
   }
 }
 
@@ -5669,10 +5660,11 @@
 
   switch (type) {
     case PM_INDEX_CORRUPTED:
-      persister = UT_NEW_NOKEY(CorruptedIndexPersister());
+      persister =
+          ut::new_withkey<CorruptedIndexPersister>(UT_NEW_THIS_FILE_PSI_KEY);
       break;
     case PM_TABLE_AUTO_INC:
-      persister = UT_NEW_NOKEY(AutoIncPersister());
+      persister = ut::new_withkey<AutoIncPersister>(UT_NEW_THIS_FILE_PSI_KEY);
       break;
     default:
       ut_ad(0);
@@ -5690,7 +5682,7 @@
   persisters_t::iterator iter = m_persisters.find(type);
 
   if (iter != m_persisters.end()) {
-    UT_DELETE(iter->second);
+    ut::delete_(iter->second);
     m_persisters.erase(iter);
   }
 }
@@ -6001,4 +5993,40 @@
 
   return err;
 }
+
+dict_persist_t::Enable_immediate::Enable_immediate(dict_persist_t *persister)
+    : m_persister(persister) {
+  /* 1. Make sure all new auto increment operations save metadata to
+  DD buffer table immediately. */
+  m_persister->m_persist_immediately.store(true);
+
+  /* 2. Save all existing metadata to DD buffer table. */
+  dict_persist_to_dd_table_buffer();
+}
+
+dict_persist_t::Enable_immediate::~Enable_immediate() {
+  m_persister->m_persist_immediately.store(false);
+  m_persister = nullptr;
+}
+
+/** @return number of base columns of virtual column in foreign key column
+@param[in]      vcol    in-memory virtual column
+@param[in]      foreign in-memory Foreign key constraint */
+uint32_t dict_vcol_base_is_foreign_key(dict_v_col_t *vcol,
+                                       dict_foreign_t *foreign) {
+  const dict_table_t *table = foreign->foreign_table;
+  uint32_t foreign_col_count = 0;
+
+  for (uint32_t i = 0; i < foreign->n_fields; i++) {
+    const char *foreign_col_name = foreign->foreign_col_names[i];
+    for (uint32_t j = 0; j < vcol->num_base; j++) {
+      if (strcmp(foreign_col_name,
+                 table->get_col_name(vcol->base_col[j]->ind)) == 0) {
+        foreign_col_count++;
+      }
+    }
+  }
+  return foreign_col_count;
+}
+
 #endif /* !UNIV_HOTBACKUP */
diff -Nru mysql-8.0-8.0.26/storage/innobase/dict/dict0load.cc mysql-8.0-8.0.27/storage/innobase/dict/dict0load.cc
--- mysql-8.0-8.0.26/storage/innobase/dict/dict0load.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/dict/dict0load.cc	2021-09-28 11:46:34.000000000 +0000
@@ -223,7 +223,7 @@
     return (table_name);
   }
 
-  btr_pcur_move_to_next_user_rec(&pcur, &mtr);
+  pcur.move_to_next_user_rec(&mtr);
 
   goto loop;
 }
@@ -238,7 +238,7 @@
   rec_t *rec = nullptr;
 
   while (!rec || rec_get_deleted_flag(rec, 0)) {
-    btr_pcur_move_to_next_user_rec(pcur, mtr);
+    pcur->move_to_next_user_rec(mtr);
 
     rec = btr_pcur_get_rec(pcur);
 
@@ -776,7 +776,7 @@
 
     if (err_msg) {
       if (err_msg != dict_load_virtual_del) {
-        ib::fatal(ER_IB_MSG_187) << err_msg;
+        ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_187) << err_msg;
       } else {
         skipped++;
       }
@@ -784,7 +784,7 @@
       ut_ad(pos == vcol_pos);
     }
 
-    btr_pcur_move_to_next_user_rec(&pcur, &mtr);
+    pcur.move_to_next_user_rec(&mtr);
   }
 
   btr_pcur_close(&pcur);
@@ -981,7 +981,7 @@
 
 /** Get the first filepath from SYS_DATAFILES for a given space_id.
 @param[in]	space_id	Tablespace ID
-@return First filepath (caller must invoke ut_free() on it)
+@return First filepath (caller must invoke ut::free() on it)
 @retval NULL if no SYS_DATAFILES entry was found. */
 char *dict_get_first_path(ulint space_id) {
   mtr_t mtr;
@@ -1316,7 +1316,7 @@
       max_space_id = ut_max(max_space_id, space_id);
     }
 
-    ut_free(filepath);
+    ut::free(filepath);
   }
 
   mtr_commit(&mtr);
@@ -1456,7 +1456,7 @@
     if (flags == UINT32_UNDEFINED ||
         fsp_is_system_or_temp_tablespace(space_id)) {
       ut_ad(!fsp_is_undo_tablespace(space_id));
-      ut_free(table_name.m_name);
+      ut::free(table_name.m_name);
       continue;
     }
 
@@ -1465,7 +1465,7 @@
           << "Tablespace " << table_name
           << " is set as DISCARDED. Upgrade will stop, please make sure "
              "there are no discarded Tables/Partitions before upgrading.";
-      ut_free(table_name.m_name);
+      ut::free(table_name.m_name);
       has_discarded_tablespaces = true;
       continue;
     }
@@ -1520,8 +1520,8 @@
     tablespace, look to see if it is already in the tablespace
     cache. */
     if (fil_space_exists_in_mem(space_id, space_name, false, true)) {
-      ut_free(table_name.m_name);
-      ut_free(space_name_from_dict);
+      ut::free(table_name.m_name);
+      ut::free(space_name_from_dict);
       continue;
     }
 
@@ -1546,7 +1546,7 @@
         filepath = Fil_path::make_ibd_from_table_name(tbl_name);
       } else {
         std::string dict_path(filepath);
-        ut_free(filepath);
+        ut::free(filepath);
         /* Convert 5.7 name to 8.0 for partitioned table path. */
         fil_update_partition_name(space_id, fsp_flags, true, tablespace_name,
                                   dict_path);
@@ -1589,9 +1589,9 @@
       max_space_id = ut_max(max_space_id, space_id);
     }
 
-    ut_free(table_name.m_name);
-    ut_free(space_name_from_dict);
-    ut_free(filepath);
+    ut::free(table_name.m_name);
+    ut::free(space_name_from_dict);
+    ut::free(filepath);
   }
 
   mtr_commit(&mtr);
@@ -1659,7 +1659,7 @@
       n_skipped++;
       goto next_rec;
     } else if (err_msg) {
-      ib::fatal(ER_IB_MSG_195) << err_msg;
+      ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_195) << err_msg;
     }
 
     /* Note: Currently we have one DOC_ID column that is
@@ -1700,7 +1700,7 @@
       table->fts->doc_col = i - n_skipped;
     }
   next_rec:
-    btr_pcur_move_to_next_user_rec(&pcur, &mtr);
+    pcur.move_to_next_user_rec(&mtr);
   }
 
   btr_pcur_close(&pcur);
@@ -1767,7 +1767,7 @@
       goto func_exit;
     }
   next_rec:
-    btr_pcur_move_to_next_user_rec(&pcur, &mtr);
+    pcur.move_to_next_user_rec(&mtr);
   }
 
   error = DB_SUCCESS;
@@ -1971,7 +1971,7 @@
       }
     }
   next_rec:
-    btr_pcur_move_to_next_user_rec(&pcur, &mtr);
+    pcur.move_to_next_user_rec(&mtr);
   }
 
   ut_ad(table->fts_doc_id_index == nullptr);
@@ -2077,7 +2077,7 @@
     }
   }
 
-  ut_free(default_filepath);
+  ut::free(default_filepath);
 }
 
 /** Make sure the data_dir_path is saved in dict_table_t if DATA DIRECTORY
@@ -2102,7 +2102,7 @@
 
   if (path != nullptr) {
     dict_save_data_dir_path(table, path);
-    ut_free(path);
+    ut::free(path);
   }
 
   ut_ad(table->data_dir_path != nullptr);
@@ -2235,8 +2235,8 @@
 
     } else {
       /* Make the temporary tablespace name. */
-      shared_space_name =
-          static_cast<char *>(ut_malloc_nokey(strlen(general_space_name) + 20));
+      shared_space_name = static_cast<char *>(ut::malloc_withkey(
+          UT_NEW_THIS_FILE_PSI_KEY, strlen(general_space_name) + 20));
 
       sprintf(shared_space_name, "%s_" ULINTPF, general_space_name,
               static_cast<ulint>(table->space));
@@ -2254,7 +2254,7 @@
 
   /* The tablespace may already be open. */
   if (fil_space_exists_in_mem(table->space, space_name, false, true)) {
-    ut_free(shared_space_name);
+    ut::free(shared_space_name);
     return;
   }
 
@@ -2312,8 +2312,8 @@
     table->ibd_file_missing = TRUE;
   }
 
-  ut_free(shared_space_name);
-  ut_free(filepath);
+  ut::free(shared_space_name);
+  ut::free(filepath);
 }
 
 static dict_table_t *dict_load_table_one(table_name_t &name, bool cached,
@@ -2664,7 +2664,7 @@
       ref_col_name = rec_get_nth_field_old(
           rec, DICT_FLD__SYS_FOREIGN_COLS__REF_COL_NAME, &ref_col_name_len);
 
-      ib::fatal sout;
+      ib::fatal sout(UT_LOCATION_HERE);
 
       sout << "Unable to load column names for foreign"
               " key '"
@@ -2695,7 +2695,7 @@
     foreign->referenced_col_names[i] =
         mem_heap_strdupl(foreign->heap, (char *)field, len);
 
-    btr_pcur_move_to_next_user_rec(&pcur, &mtr);
+    pcur.move_to_next_user_rec(&mtr);
   }
 
   btr_pcur_close(&pcur);
@@ -2705,23 +2705,23 @@
 /** Loads a foreign key constraint to the dictionary cache. If the referenced
  table is not yet loaded, it is added in the output parameter (fk_tables).
  @return DB_SUCCESS or error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    dict_load_foreign(const char *id,
-                      /*!< in: foreign constraint id, must be
-                      '\0'-terminated */
-                      const char **col_names,
-                      /*!< in: column names, or NULL
-                      to use foreign->foreign_table->col_names */
-                      bool check_recursive,
-                      /*!< in: whether to record the foreign table
-                      parent count to avoid unlimited recursive
-                      load of chained foreign tables */
-                      bool check_charsets,
-                      /*!< in: whether to check charset
-                      compatibility */
-                      dict_err_ignore_t ignore_err,
-                      /*!< in: error to be ignored */
-                      dict_names_t &fk_tables)
+[[nodiscard]] static dberr_t dict_load_foreign(
+    const char *id,
+    /*!< in: foreign constraint id, must be
+    '\0'-terminated */
+    const char **col_names,
+    /*!< in: column names, or NULL
+    to use foreign->foreign_table->col_names */
+    bool check_recursive,
+    /*!< in: whether to record the foreign table
+    parent count to avoid unlimited recursive
+    load of chained foreign tables */
+    bool check_charsets,
+    /*!< in: whether to check charset
+    compatibility */
+    dict_err_ignore_t ignore_err,
+    /*!< in: error to be ignored */
+    dict_names_t &fk_tables)
 /*!< out: the foreign key constraint is added
 to the dictionary cache only if the referenced
 table is already in cache.  Otherwise, the
@@ -3020,8 +3020,7 @@
 
   btr_pcur_restore_position(BTR_SEARCH_LEAF, &pcur, &mtr);
 next_rec:
-  btr_pcur_move_to_next_user_rec(&pcur, &mtr);
-
+  pcur.move_to_next_user_rec(&mtr);
   goto loop;
 
 load_next_index:
diff -Nru mysql-8.0-8.0.26/storage/innobase/dict/dict0mem.cc mysql-8.0-8.0.27/storage/innobase/dict/dict0mem.cc
--- mysql-8.0-8.0.26/storage/innobase/dict/dict0mem.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/dict/dict0mem.cc	2021-09-28 11:46:34.000000000 +0000
@@ -136,7 +136,7 @@
   v_col->num_base = num_base;
 
   /* Initialize the index list for virtual columns */
-  v_col->v_indexes = UT_NEW_NOKEY(dict_v_idx_list());
+  v_col->v_indexes = ut::new_withkey<dict_v_idx_list>(UT_NEW_THIS_FILE_PSI_KEY);
 
   v_col->m_col.is_visible = is_visible;
   return (v_col);
@@ -153,7 +153,7 @@
   ut_ad(col != nullptr);
 
   if (table->s_cols == nullptr) {
-    table->s_cols = UT_NEW_NOKEY(dict_s_col_list());
+    table->s_cols = ut::new_withkey<dict_s_col_list>(UT_NEW_THIS_FILE_PSI_KEY);
   }
 
   s_col.m_col = col;
@@ -423,7 +423,7 @@
 
       if (v_idx.index == index) {
         if (*v_cols == nullptr) {
-          *v_cols = UT_NEW_NOKEY(dict_vcol_set());
+          *v_cols = ut::new_withkey<dict_vcol_set>(UT_NEW_THIS_FILE_PSI_KEY);
         }
 
         (*v_cols)->insert(v_col);
@@ -479,7 +479,7 @@
     for (ulint j = 0; j < v_col->num_base; j++) {
       if (strcmp(col_name, table->get_col_name(v_col->base_col[j]->ind)) == 0) {
         if (*v_cols == nullptr) {
-          *v_cols = UT_NEW_NOKEY(dict_vcol_set());
+          *v_cols = ut::new_withkey<dict_vcol_set>(UT_NEW_THIS_FILE_PSI_KEY);
         }
 
         (*v_cols)->insert(v_col);
@@ -537,7 +537,7 @@
     foreign = *it;
 
     if (foreign->v_cols != nullptr) {
-      UT_DELETE(foreign->v_cols);
+      ut::delete_(foreign->v_cols);
       foreign->v_cols = nullptr;
     }
   }
@@ -725,7 +725,7 @@
 
     mutex_destroy(&index->rtr_ssn.mutex);
     mutex_destroy(&index->rtr_track->rtr_active_mutex);
-    UT_DELETE(index->rtr_track->rtr_active);
+    ut::delete_(index->rtr_track->rtr_active);
   }
   dict_index_remove_from_v_col_list(index);
 #endif /* !UNIV_HOTBACKUP */
diff -Nru mysql-8.0-8.0.26/storage/innobase/dict/dict0sdi.cc mysql-8.0-8.0.27/storage/innobase/dict/dict0sdi.cc
--- mysql-8.0-8.0.26/storage/innobase/dict/dict0sdi.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/dict/dict0sdi.cc	2021-09-28 11:46:34.000000000 +0000
@@ -273,7 +273,7 @@
 	uint32_t	uncompressed_sdi_len;
 	uint32_t	compressed_sdi_len = static_cast<uint32_t>(*sdi_len);
 	byte*		compressed_sdi = static_cast<byte*>(
-		ut_malloc_nokey(compressed_sdi_len));
+		ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, compressed_sdi_len));
 
 	dberr_t	err = ib_sdi_get(
 		space_id, &ib_sdi_key,
@@ -295,7 +295,7 @@
 		decompressor.decompress();
         }
 
-	ut_free(compressed_sdi);
+	ut::free(compressed_sdi);
 
 	return(err != DB_SUCCESS);
 #endif /* TODO: Enable in WL#9761 */
diff -Nru mysql-8.0-8.0.26/storage/innobase/dict/dict0stats_bg.cc mysql-8.0-8.0.27/storage/innobase/dict/dict0stats_bg.cc
--- mysql-8.0-8.0.26/storage/innobase/dict/dict0stats_bg.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/dict/dict0stats_bg.cc	2021-09-28 11:46:34.000000000 +0000
@@ -70,7 +70,7 @@
 static const ulint RECALC_POOL_INITIAL_SLOTS = 128;
 
 /** Allocator type, used by std::vector */
-typedef ut_allocator<table_id_t> recalc_pool_allocator_t;
+typedef ut::allocator<table_id_t> recalc_pool_allocator_t;
 
 /** The multitude of tables whose stats are to be automatically
 recalculated - an STL vector */
@@ -90,7 +90,8 @@
 
   const PSI_memory_key key = mem_key_dict_stats_bg_recalc_pool_t;
 
-  recalc_pool = UT_NEW(recalc_pool_t(recalc_pool_allocator_t(key)), key);
+  recalc_pool = ut::new_withkey<recalc_pool_t>(ut::make_psi_memory_key(key),
+                                               recalc_pool_allocator_t(key));
 
   recalc_pool->reserve(RECALC_POOL_INITIAL_SLOTS);
 }
@@ -102,7 +103,7 @@
 
   recalc_pool->clear();
 
-  UT_DELETE(recalc_pool);
+  ut::delete_(recalc_pool);
   recalc_pool = nullptr;
 }
 
@@ -356,7 +357,7 @@
 statistics. */
 void dict_stats_thread() {
   ut_a(!srv_read_only_mode);
-  THD *thd = create_thd(false, true, true, 0);
+  THD *thd = create_internal_thd();
 
   while (!SHUTTING_DOWN()) {
     /* Wake up periodically even if not signaled. This is
@@ -385,7 +386,7 @@
     os_event_reset(dict_stats_event);
   }
 
-  destroy_thd(thd);
+  destroy_internal_thd(thd);
 }
 
 /** Shutdown the dict stats thread. */
diff -Nru mysql-8.0-8.0.26/storage/innobase/dict/dict0stats.cc mysql-8.0-8.0.27/storage/innobase/dict/dict0stats.cc
--- mysql-8.0-8.0.26/storage/innobase/dict/dict0stats.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/dict/dict0stats.cc	2021-09-28 11:46:34.000000000 +0000
@@ -142,10 +142,10 @@
 index: 0,1,2,3,4,5,6,7,8,9,10,11,12
 data:  b,b,b,b,b,b,g,g,j,j,j, x, y
 then we would store 5,7,10,11,12 in the array. */
-typedef std::vector<ib_uint64_t, ut_allocator<ib_uint64_t>> boundaries_t;
+typedef std::vector<ib_uint64_t, ut::allocator<ib_uint64_t>> boundaries_t;
 
 /** Allocator type used for index_map_t. */
-typedef ut_allocator<std::pair<const char *const, dict_index_t *>>
+typedef ut::allocator<std::pair<const char *const, dict_index_t *>>
     index_map_t_allocator;
 
 /** Auxiliary map used for sorting indexes by name in dict_stats_save(). */
@@ -891,8 +891,7 @@
   /* iterate over all user records on this level
   and compare each two adjacent ones, even the last on page
   X and the fist on page X+1 */
-  for (; btr_pcur_is_on_user_rec(&pcur);
-       btr_pcur_move_to_next_user_rec(&pcur, mtr)) {
+  for (; pcur.is_on_user_rec(); pcur.move_to_next_user_rec(mtr)) {
     bool rec_is_last_on_page;
 
     rec = btr_pcur_get_rec(&pcur);
@@ -1079,7 +1078,7 @@
   btr_leaf_page_release(btr_pcur_get_block(&pcur), BTR_SEARCH_LEAF, mtr);
 
   btr_pcur_close(&pcur);
-  ut_free(prev_rec_buf);
+  ut::free(prev_rec_buf);
   mem_heap_free(heap);
 
   return success;
@@ -1532,7 +1531,7 @@
 
     /* seek to the record with index dive_below_idx */
     while (rec_idx < dive_below_idx && btr_pcur_is_on_user_rec(&pcur)) {
-      btr_pcur_move_to_next_user_rec(&pcur, mtr);
+      pcur.move_to_next_user_rec(mtr);
       rec_idx++;
     }
 
@@ -1778,17 +1777,20 @@
 
   /* For each level that is being scanned in the btree, this contains the
   number of different key values for all possible n-column prefixes. */
-  ib_uint64_t *n_diff_on_level =
-      UT_NEW_ARRAY(ib_uint64_t, n_uniq, mem_key_dict_stats_n_diff_on_level);
+  ib_uint64_t *n_diff_on_level = ut::new_arr_withkey<ib_uint64_t>(
+      ut::make_psi_memory_key(mem_key_dict_stats_n_diff_on_level),
+      ut::Count{n_uniq});
 
   /* For each level that is being scanned in the btree, this contains the
   index of the last record from each group of equal records (when
   comparing only the first n columns, n=1..n_uniq). */
-  boundaries_t *n_diff_boundaries = UT_NEW_ARRAY_NOKEY(boundaries_t, n_uniq);
+  boundaries_t *n_diff_boundaries = ut::new_arr_withkey<boundaries_t>(
+      UT_NEW_THIS_FILE_PSI_KEY, ut::Count{n_uniq});
 
   /* For each n-column prefix this array contains the input data that is
   used to calculate dict_index_t::stat_n_diff_key_vals[]. */
-  n_diff_data_t *n_diff_data = UT_NEW_ARRAY_NOKEY(n_diff_data_t, n_uniq);
+  n_diff_data_t *n_diff_data = ut::new_arr_withkey<n_diff_data_t>(
+      UT_NEW_THIS_FILE_PSI_KEY, ut::Count{n_uniq});
 
   /* total_recs is also used to estimate the number of pages on one
   level below, so at the start we have 1 page (the root) */
@@ -1963,9 +1965,9 @@
 end:
   mtr_commit(&mtr);
 
-  UT_DELETE_ARRAY(n_diff_boundaries);
+  ut::delete_arr(n_diff_boundaries);
 
-  UT_DELETE_ARRAY(n_diff_on_level);
+  ut::delete_arr(n_diff_on_level);
 
   /* n_prefix == 0 means that the above loop did not end up prematurely
   due to tree being changed and so n_diff_data[] is set up. */
@@ -1973,7 +1975,7 @@
     dict_stats_index_set_n_diff(n_diff_data, index);
   }
 
-  UT_DELETE_ARRAY(n_diff_data);
+  ut::delete_arr(n_diff_data);
 
   if (succeeded) {
     dict_stats_assert_initialized_index(index);
diff -Nru mysql-8.0-8.0.26/storage/innobase/dict/dict0upgrade.cc mysql-8.0-8.0.27/storage/innobase/dict/dict0upgrade.cc
--- mysql-8.0-8.0.26/storage/innobase/dict/dict0upgrade.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/dict/dict0upgrade.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1184,7 +1184,7 @@
       dict_sys_mutex_exit();
 
       std::string orig_name(filename);
-      ut_free(filename);
+      ut::free(filename);
       filename = nullptr;
 
       /* To migrate statistics from 57 satistics tables, we rename the
diff -Nru mysql-8.0-8.0.26/storage/innobase/dict/mem.cc mysql-8.0-8.0.27/storage/innobase/dict/mem.cc
--- mysql-8.0-8.0.26/storage/innobase/dict/mem.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/dict/mem.cc	2021-09-28 11:46:34.000000000 +0000
@@ -117,7 +117,7 @@
 #endif /* !UNIV_LIBRARY */
 #endif /* !UNIV_HOTBACKUP */
 
-  ut_free(table->name.m_name);
+  ut::free(table->name.m_name);
   table->name.m_name = nullptr;
 
 #ifndef UNIV_HOTBACKUP
@@ -127,19 +127,19 @@
   for (ulint i = 0; i < table->n_v_def; i++) {
     dict_v_col_t *vcol = dict_table_get_nth_v_col(table, i);
 
-    UT_DELETE(vcol->v_indexes);
+    ut::delete_(vcol->v_indexes);
   }
 #endif /* !UNIV_LIBRARY */
 #endif /* !UNIV_HOTBACKUP */
 
   if (table->s_cols != nullptr) {
-    UT_DELETE(table->s_cols);
+    ut::delete_(table->s_cols);
   }
 
 #ifndef UNIV_HOTBACKUP
   if (table->temp_prebuilt != nullptr) {
     ut_ad(table->is_intrinsic());
-    UT_DELETE(table->temp_prebuilt);
+    ut::delete_(table->temp_prebuilt);
   }
 #endif /* !UNIV_HOTBACKUP */
 
@@ -314,7 +314,8 @@
         mem_heap_alloc(heap, sizeof(*index->rtr_track)));
     mutex_create(LATCH_ID_RTR_ACTIVE_MUTEX,
                  &index->rtr_track->rtr_active_mutex);
-    index->rtr_track->rtr_active = UT_NEW_NOKEY(rtr_info_active());
+    index->rtr_track->rtr_active =
+        ut::new_withkey<rtr_info_active>(UT_NEW_THIS_FILE_PSI_KEY);
   }
 #endif /* !UNIV_LIBRARY */
 #endif /* !UNIV_HOTBACKUP */
diff -Nru mysql-8.0-8.0.26/storage/innobase/eval/eval0eval.cc mysql-8.0-8.0.27/storage/innobase/eval/eval0eval.cc
--- mysql-8.0-8.0.26/storage/innobase/eval/eval0eval.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/eval/eval0eval.cc	2021-09-28 11:46:34.000000000 +0000
@@ -75,13 +75,14 @@
   data = static_cast<byte *>(dfield_get_data(dfield));
 
   if (data != &eval_dummy) {
-    ut_free(data);
+    ut::free(data);
   }
 
   if (size == 0) {
     data = &eval_dummy;
   } else {
-    data = static_cast<byte *>(ut_malloc_nokey(size));
+    data =
+        static_cast<byte *>(ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, size));
   }
 
   que_node_set_val_buf_size(node, size);
@@ -109,7 +110,7 @@
   if (que_node_get_val_buf_size(node) > 0) {
     ut_a(data);
 
-    ut_free(data);
+    ut::free(data);
   }
 }
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/fil/fil0fil.cc mysql-8.0-8.0.27/storage/innobase/fil/fil0fil.cc
--- mysql-8.0-8.0.26/storage/innobase/fil/fil0fil.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/fil/fil0fil.cc	2021-09-28 11:46:34.000000000 +0000
@@ -52,6 +52,7 @@
 #include "mtr0log.h"
 #include "my_dbug.h"
 #include "ut0new.h"
+#include "ut0ut.h"
 
 #include "clone0api.h"
 #include "os0file.h"
@@ -384,7 +385,7 @@
 /** Tablespace files disovered during startup. */
 class Tablespace_files {
  public:
-  using Names = std::vector<std::string, ut_allocator<std::string>>;
+  using Names = std::vector<std::string, ut::allocator<std::string>>;
   using Paths = std::unordered_map<space_id_t, Names>;
   using Undo_num2id = std::unordered_map<space_id_t, space_id_t>;
 
@@ -396,13 +397,12 @@
   @param[in]	space_id	Tablespace ID
   @param[in]	name		File name.
   @return number of files that map to the space ID */
-  size_t add(space_id_t space_id, const std::string &name)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] size_t add(space_id_t space_id, const std::string &name);
 
   /** Get the file names that map to a space ID
   @param[in]	space_id	Tablespace ID
   @return the filenames that map to space id */
-  Names *find_by_id(space_id_t space_id) MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] Names *find_by_id(space_id_t space_id) {
     ut_ad(space_id != TRX_SYS_SPACE);
 
     if (undo::is_reserved(space_id)) {
@@ -427,8 +427,7 @@
   @param[in]   space_num  undo tablespace number
   @param[out]  space_id   undo tablespace ID
   @return the file name that maps to the space number */
-  Names *find_by_num(space_id_t space_num, space_id_t &space_id)
-      MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] Names *find_by_num(space_id_t space_num, space_id_t &space_id) {
     ut_ad(space_num > 0 && space_num <= FSP_MAX_UNDO_TABLESPACES);
     auto it_nums = m_undo_nums.find(space_num);
     if (it_nums == m_undo_nums.end()) {
@@ -445,7 +444,7 @@
   /** Remove the entry for the space ID.
   @param[in]	space_id	Tablespace ID mapping to remove
   @return true if erase successful */
-  bool erase_path(space_id_t space_id) MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] bool erase_path(space_id_t space_id) {
     ut_ad(space_id != TRX_SYS_SPACE);
 
     if (undo::is_reserved(space_id)) {
@@ -500,17 +499,7 @@
   using Result = std::pair<std::string, Tablespace_files::Names *>;
 
   /** Constructor */
-  Tablespace_dirs()
-      : m_dirs()
-#if !defined(__SUNPRO_CC)
-        ,
-        m_checked()
-#endif /* !__SUNPRO_CC */
-  {
-#if defined(__SUNPRO_CC)
-    m_checked = ATOMIC_VAR_INIT(0);
-#endif /* __SUNPRO_CC */
-  }
+  Tablespace_dirs() : m_dirs(), m_checked() {}
 
   /** Normalize and save a directory to scan for IBD and IBU datafiles
   before recovery.
@@ -525,7 +514,7 @@
 
   /** Discover tablespaces by reading the header from .ibd files.
   @return DB_SUCCESS if all goes well */
-  dberr_t scan() MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t scan();
 
   /** Clear all the tablespace file data but leave the list of
   scanned directories in place. */
@@ -540,7 +529,7 @@
   /** Erase a space ID to filename mapping.
   @param[in]	space_id	Tablespace ID to erase
   @return true if successful */
-  bool erase_path(space_id_t space_id) MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] bool erase_path(space_id_t space_id) {
     for (auto &dir : m_dirs) {
       if (dir.erase_path(space_id)) {
         return true;
@@ -554,7 +543,7 @@
   @param[in]	space_id	Tablespace ID
   @return directory searched and pointer to names that map to the
           tablespace ID */
-  Result find_by_id(space_id_t space_id) MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] Result find_by_id(space_id_t space_id) {
     for (auto &dir : m_dirs) {
       const auto names = dir.find_by_id(space_id);
 
@@ -571,8 +560,7 @@
   @param[out]  space_id   undo tablespace ID
   @return directory searched and pointer to name that maps to the
           tablespace number */
-  Result find_by_num(space_id_t space_num, space_id_t &space_id)
-      MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] Result find_by_num(space_id_t space_num, space_id_t &space_id) {
     for (auto &dir : m_dirs) {
       const auto names = dir.find_by_num(space_num, space_id);
 
@@ -587,8 +575,7 @@
   /** Determine if this Fil_path contains the path provided.
   @param[in]  path  file or directory path to compare.
   @return true if this Fil_path contains path */
-  bool contains(const std::string &path) const
-      MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] bool contains(const std::string &path) const {
     const Fil_path descendant{path};
 
     for (const auto &dir : m_dirs) {
@@ -729,8 +716,7 @@
   /** Fetch the fil_space_t instance that maps to space_id.
   @param[in]	space_id	Tablespace ID to lookup
   @return tablespace instance or nullptr if not found. */
-  fil_space_t *get_space_by_id(space_id_t space_id) const
-      MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] fil_space_t *get_space_by_id(space_id_t space_id) const {
     ut_ad(m_id == REDO_SHARD || mutex_owned());
 
     auto it = m_spaces.find(space_id);
@@ -747,8 +733,7 @@
   /** Fetch the fil_space_t instance that maps to the name.
   @param[in]	name		Tablespace name to lookup
   @return tablespace instance or nullptr if not found. */
-  fil_space_t *get_space_by_name(const char *name) const
-      MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] fil_space_t *get_space_by_name(const char *name) const {
     ut_ad(mutex_owned());
 
     auto it = m_names.find(name);
@@ -767,7 +752,7 @@
   @param[in] print_info		if true, prints information
                                   why it cannot close a file
   @return true if success, false if should retry later */
-  bool close_files_in_LRU(bool print_info) MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool close_files_in_LRU(bool print_info);
 
   /** Remove the file node from the LRU list.
   @param[in,out]	file		File for the tablespace */
@@ -824,8 +809,7 @@
   @param[in,out]  rotate_count  A cumulative count of all tablespaces rotated
   in the Fil_system.
   @return the number of tablespaces that failed to rotate. */
-  size_t encryption_rotate(size_t *rotate_count)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] size_t encryption_rotate(size_t *rotate_count);
 
   /** Detach a space object from the tablespace memory cache and
   closes the tablespace files but does not delete them.
@@ -941,8 +925,7 @@
   There must not be any pending I/O's or flushes on the files.
   @param[in]	space_id	Tablespace ID
   @return fil_space_t instance on success or nullptr */
-  fil_space_t *space_free(space_id_t space_id)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] fil_space_t *space_free(space_id_t space_id);
 
   /** Map the space ID and name to the tablespace instance.
   @param[in]	space		Tablespace instance */
@@ -972,8 +955,7 @@
   @param[in]	file		Tablespace file for IO
   @param[in]	extend		true if file is being extended
   @return false if the file can't be opened, otherwise true */
-  bool prepare_file_for_io(fil_node_t *file, bool extend)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool prepare_file_for_io(fil_node_t *file, bool extend);
 
   /** Reserves the mutex and tries to make sure we can
   open at least one file while holding it. This should be called
@@ -982,8 +964,8 @@
   @param[in]	space_id	Tablespace ID
   @param[out]	space		Tablespace instance
   @return true if a slot was reserved. */
-  bool mutex_acquire_and_get_space(space_id_t space_id, fil_space_t *&space)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool mutex_acquire_and_get_space(space_id_t space_id,
+                                                 fil_space_t *&space);
 
   /** Remap the tablespace to the new name.
   @param[in]	space		Tablespace instance, with old name.
@@ -1002,8 +984,7 @@
   @param[in,out]	space		tablespace
   @param[in]	size		desired size in pages
   @return whether the tablespace is at least as big as requested */
-  bool space_extend(fil_space_t *space, page_no_t size)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool space_extend(fil_space_t *space, page_no_t size);
 
   /** Flushes to disk possible writes cached by the OS. If the space does
   not exist or is being dropped, does not do anything.
@@ -1017,38 +998,35 @@
   @param[in,out]	file		Tablespace file
   @param[in]	extend		true if the file is being extended
   @return false if the file can't be opened, otherwise true */
-  bool open_file(fil_node_t *file, bool extend)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool open_file(fil_node_t *file, bool extend);
 
   /** Checks if all the file nodes in a space are flushed. The caller must hold
   the fil_system mutex.
   @param[in]	space		Tablespace to check
   @return true if all are flushed */
-  bool space_is_flushed(const fil_space_t *space)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool space_is_flushed(const fil_space_t *space);
 
   /** Open each file of a tablespace if not already open.
   @param[in]	space_id	tablespace identifier
   @retval	true	if all file nodes were opened
   @retval	false	on failure */
-  bool space_open(space_id_t space_id) MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool space_open(space_id_t space_id);
 
   /** Opens the files associated with a tablespace and returns a
   pointer to the fil_space_t that is in the memory cache associated
   with a space id.
   @param[in]	space_id	Get the tablespace instance or this ID
   @return file_space_t pointer, nullptr if space not found */
-  fil_space_t *space_load(space_id_t space_id)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] fil_space_t *space_load(space_id_t space_id);
 
   /** Wait for pending operations on a tablespace to stop.
   @param[in]   space_id  Tablespace ID
   @param[out]  space     tablespace instance in memory
   @param[out]  path      tablespace path
   @return DB_SUCCESS or DB_TABLESPACE_NOT_FOUND. */
-  dberr_t wait_for_pending_operations(space_id_t space_id, fil_space_t *&space,
-                                      char **path) const
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t wait_for_pending_operations(space_id_t space_id,
+                                                    fil_space_t *&space,
+                                                    char **path) const;
 
   /** Rename a single-table tablespace.
   The tablespace must exist in the memory cache.
@@ -1058,9 +1036,9 @@
   @param[in]	new_path_in	New file name, or nullptr if it
                                   is located in the normal data directory
   @return InnoDB error code */
-  dberr_t space_rename(space_id_t space_id, const char *old_path,
-                       const char *new_name, const char *new_path_in)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t space_rename(space_id_t space_id, const char *old_path,
+                                     const char *new_name,
+                                     const char *new_path_in);
 
   /** Deletes an IBD or IBU tablespace.
   The tablespace must be cached in the memory cache. This will delete the
@@ -1069,15 +1047,15 @@
   @param[in]	buf_remove	Specify the action to take on the pages
                                   for this table in the buffer pool.
   @return DB_SUCCESS, DB_TABLESPCE_NOT_FOUND or DB_IO_ERROR */
-  dberr_t space_delete(space_id_t space_id, buf_remove_t buf_remove)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t space_delete(space_id_t space_id,
+                                     buf_remove_t buf_remove);
 
   /** Truncate the tablespace to needed size.
   @param[in]	space_id	Tablespace ID to truncate
   @param[in]	size_in_pages	Truncate size.
   @return true if truncate was successful. */
-  bool space_truncate(space_id_t space_id, page_no_t size_in_pages)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool space_truncate(space_id_t space_id,
+                                    page_no_t size_in_pages);
 
   /** Create a space memory object and put it to the fil_system hash table.
   The tablespace name is independent from the tablespace file-name.
@@ -1088,9 +1066,8 @@
   @param[in]	purpose		Tablespace purpose
   @return pointer to created tablespace, to be filled in with fil_node_create()
   @retval nullptr on failure (such as when the same tablespace exists) */
-  fil_space_t *space_create(const char *name, space_id_t space_id,
-                            uint32_t flags, fil_type_t purpose)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] fil_space_t *space_create(const char *name, space_id_t space_id,
+                                          uint32_t flags, fil_type_t purpose);
 
   /** Adjust temporary auto-generated names created during
   file discovery with correct tablespace names from the DD.
@@ -1108,8 +1085,8 @@
                                 not found from memory.
   @param[in]	adjust_space	Whether to adjust space id on mismatch
   @return true if a matching tablespace exists in the memory cache */
-  bool space_check_exists(space_id_t space_id, const char *name, bool print_err,
-                          bool adjust_space) MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool space_check_exists(space_id_t space_id, const char *name,
+                                        bool print_err, bool adjust_space);
 
   /** Read or write log file data synchronously.
   @param[in]	type		IO context
@@ -1125,9 +1102,10 @@
                                   from where to write
   @return error code
   @retval DB_SUCCESS on success */
-  dberr_t do_redo_io(const IORequest &type, const page_id_t &page_id,
-                     const page_size_t &page_size, ulint byte_offset, ulint len,
-                     void *buf) MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t do_redo_io(const IORequest &type,
+                                   const page_id_t &page_id,
+                                   const page_size_t &page_size,
+                                   ulint byte_offset, ulint len, void *buf);
 
   /** Read or write data. This operation could be asynchronous (aio).
   @param[in]	type		IO context
@@ -1149,17 +1127,17 @@
   @return error code
   @retval DB_SUCCESS on success
   @retval DB_TABLESPACE_DELETED if the tablespace does not exist */
-  dberr_t do_io(const IORequest &type, bool sync, const page_id_t &page_id,
-                const page_size_t &page_size, ulint byte_offset, ulint len,
-                void *buf, void *message) MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t do_io(const IORequest &type, bool sync,
+                              const page_id_t &page_id,
+                              const page_size_t &page_size, ulint byte_offset,
+                              ulint len, void *buf, void *message);
 
   /** Iterate through all persistent tablespace files (FIL_TYPE_TABLESPACE)
   returning the nodes via callback function cbk.
   @param[in]	include_log	Include log files, if true
   @param[in]	f		Callback
   @return any error returned by the callback function. */
-  dberr_t iterate(bool include_log, Fil_iterator::Function &f)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t iterate(bool include_log, Fil_iterator::Function &f);
 
   /** Open an ibd tablespace and add it to the InnoDB data structures.
   This is similar to fil_ibd_open() except that it is used while
@@ -1174,10 +1152,9 @@
   @param[in]	path		path/to/databasename/tablename.ibd
   @param[out]	space		the tablespace, or nullptr on error
   @return status of the operation */
-  fil_load_status ibd_open_for_recovery(space_id_t space_id,
-                                        const std::string &path,
-                                        fil_space_t *&space)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] fil_load_status ibd_open_for_recovery(space_id_t space_id,
+                                                      const std::string &path,
+                                                      fil_space_t *&space);
 
   /** Attach a file to a tablespace
   @param[in]	name		file name of a file that is not open
@@ -1189,10 +1166,10 @@
   @param[in]	max_pages	maximum number of pages in file
   @return pointer to the file name
   @retval nullptr if error */
-  fil_node_t *create_node(const char *name, page_no_t size, fil_space_t *space,
-                          bool is_raw, bool punch_hole, bool atomic_write,
-                          page_no_t max_pages = PAGE_NO_MAX)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] fil_node_t *create_node(const char *name, page_no_t size,
+                                        fil_space_t *space, bool is_raw,
+                                        bool punch_hole, bool atomic_write,
+                                        page_no_t max_pages = PAGE_NO_MAX);
 
 #ifdef UNIV_DEBUG
   /** Validate a shard. */
@@ -1215,8 +1192,7 @@
 
   /** Wait for an empty slot to reserve for opening a file.
   @return true on success. */
-  static bool reserve_open_slot(size_t shard_id)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static bool reserve_open_slot(size_t shard_id);
 
   /** Release the slot reserved for opening a file.
   @param[in]	shard_id	ID of shard releasing the slot */
@@ -1236,8 +1212,7 @@
   waiting in this function.
   @param[in]  space_id  Tablespace ID to look up
   @return tablespace instance */
-  fil_space_t *get_reserved_space(space_id_t space_id)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] fil_space_t *get_reserved_space(space_id_t space_id);
 
   /** Prepare for truncating a single-table tablespace.
   1) Wait for pending operations on the tablespace to stop;
@@ -1245,8 +1220,8 @@
   @param[in]   space_id  Tablespace ID
   @param[out]  space     Instance that maps to the space ID.
   @return DB_SUCCESS or error */
-  dberr_t space_prepare_for_truncate(space_id_t space_id, fil_space_t *&space)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t space_prepare_for_truncate(space_id_t space_id,
+                                                   fil_space_t *&space);
 
   /** Note that a write IO has completed.
   @param[in,out]  file  File on which a write was completed */
@@ -1260,16 +1235,17 @@
   @param[in]	space	tablespace
   @param[in]	count	number of attempts so far
   @return 0 if no pending operations else count + 1. */
-  ulint space_check_pending_operations(fil_space_t *space, ulint count) const
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] ulint space_check_pending_operations(fil_space_t *space,
+                                                     ulint count) const;
 
   /** Check for pending IO.
   @param[in]	space		Tablespace to check
   @param[in]	file		File in space list
   @param[in]	count		number of attempts so far
   @return 0 if no pending else count + 1. */
-  ulint check_pending_io(const fil_space_t *space, const fil_node_t &file,
-                         ulint count) const MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] ulint check_pending_io(const fil_space_t *space,
+                                       const fil_node_t &file,
+                                       ulint count) const;
 
   /** Flushes to disk possible writes cached by the OS. */
   void redo_space_flush();
@@ -1281,15 +1257,14 @@
   @param[in,out]	file		Get the size of this file
   @param[in]	read_only_mode	true if read only mode set
   @return DB_SUCCESS or error */
-  dberr_t get_file_size(fil_node_t *file, bool read_only_mode)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t get_file_size(fil_node_t *file, bool read_only_mode);
 
   /** Get the AIO mode.
   @param[in]	req_type	IO request type
   @param[in]	sync		true if Synchronous IO
   return the AIO mode */
-  static AIO_mode get_AIO_mode(const IORequest &req_type, bool sync)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static AIO_mode get_AIO_mode(const IORequest &req_type,
+                                             bool sync);
 
   /** Get the file name for IO and the local offset within that file.
   @param[in]      req_type  IO context
@@ -1299,9 +1274,10 @@
   @retval DB_SUCCESS if the file is found with the page_no
   @retval DB_ERROR if the file is not found or does not contain the page.
                    in this case file == nullptr */
-  static dberr_t get_file_for_io(const IORequest &req_type, fil_space_t *space,
-                                 page_no_t *page_no, fil_node_t *&file)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static dberr_t get_file_for_io(const IORequest &req_type,
+                                               fil_space_t *space,
+                                               page_no_t *page_no,
+                                               fil_node_t *&file);
 
  private:
   /** Fil_shard ID */
@@ -1315,7 +1291,7 @@
 
 #ifndef UNIV_HOTBACKUP
   using Pair = std::pair<space_id_t, fil_space_t *>;
-  using Deleted_spaces = std::vector<Pair, ut_allocator<Pair>>;
+  using Deleted_spaces = std::vector<Pair, ut::allocator<Pair>>;
 
   /** Deleted tablespaces. All pages for these tablespaces in the buffer pool
   will be passively deleted. They need not be written. Once the reference count
@@ -1393,8 +1369,8 @@
   @param[in]	space_id	Tablespace ID to lookup
   @return pair of top level directory scanned and names that map
           to space_id or nullptr if not found. */
-  Tablespace_dirs::Result get_scanned_filename_by_space_id(space_id_t space_id)
-      MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] Tablespace_dirs::Result get_scanned_filename_by_space_id(
+      space_id_t space_id) {
     return m_dirs.find_by_id(space_id);
   }
 
@@ -1403,9 +1379,8 @@
   @param[out]  space_id   Tablespace ID found
   @return pair of top level directory scanned and name that maps
           to the space_num or nullptr if not found. */
-  Tablespace_dirs::Result get_scanned_filename_by_space_num(
-      space_id_t space_num, space_id_t &space_id)
-      MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] Tablespace_dirs::Result get_scanned_filename_by_space_num(
+      space_id_t space_num, space_id_t &space_id) {
     return (m_dirs.find_by_num(space_num, space_id));
   }
 
@@ -1414,8 +1389,8 @@
   @param[out]  name      the scanned filename
   @return true if the space_id is found. The name is set to an
   empty string if the space_id is not found. */
-  bool get_file_by_space_id(space_id_t space_id, std::string &name)
-      MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] bool get_file_by_space_id(space_id_t space_id,
+                                          std::string &name) {
     auto result = get_scanned_filename_by_space_id(space_id);
 
     if (result.second != nullptr) {
@@ -1435,9 +1410,9 @@
   @param[out]  name       the scanned filename
   @return true if the space_id is found. The name is set to an
   empty string if the space_id is not found. */
-  bool get_file_by_space_num(space_id_t space_num, space_id_t &space_id,
-                             std::string &name)
-      MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] bool get_file_by_space_num(space_id_t space_num,
+                                           space_id_t &space_id,
+                                           std::string &name) {
     auto result = get_scanned_filename_by_space_num(space_num, space_id);
 
     if (result.second != nullptr) {
@@ -1454,7 +1429,7 @@
   /** Erase a tablespace ID and its mapping from the scanned files.
   @param[in]	space_id	Tablespace ID to erase
   @return true if successful */
-  bool erase_path(space_id_t space_id) MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] bool erase_path(space_id_t space_id) {
     return m_dirs.erase_path(space_id);
   }
 
@@ -1476,16 +1451,14 @@
   /** Get the top level directory where this filename was found.
   @param[in]	path		Path to look for.
   @return the top level directory under which this file was found. */
-  const std::string &get_root(const std::string &path) const
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] const std::string &get_root(const std::string &path) const;
 
   /** Update the DD if any files were moved to a new location.
   Free the Tablespace_files instance.
   @param[in]	read_only_mode	true if InnoDB is started in
                                   read only mode.
   @return DB_SUCCESS if all OK */
-  dberr_t prepare_open_for_business(bool read_only_mode)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t prepare_open_for_business(bool read_only_mode);
 
   /** Flush the redo log writes to disk, possibly cached by the OS. */
   void flush_file_redo();
@@ -1534,8 +1507,7 @@
   /** Fetch the fil_space_t instance that maps to the name.
   @param[in]	name		Tablespace name to lookup
   @return tablespace instance or nullptr if not found. */
-  fil_space_t *get_space_by_name(const char *name)
-      MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] fil_space_t *get_space_by_name(const char *name) {
     for (auto shard : m_shards) {
       shard->mutex_acquire();
 
@@ -1554,8 +1526,7 @@
   /** Check a space ID against the maximum known tablespace ID.
   @param[in]	space_id	Tablespace ID to check
   @return true if it is > than maximum known tablespace ID. */
-  bool is_greater_than_max_id(space_id_t space_id) const
-      MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] bool is_greater_than_max_id(space_id_t space_id) const {
     ut_ad(mutex_owned_all());
 
     return space_id > m_max_assigned_id;
@@ -1594,15 +1565,13 @@
   is not enough, we may need to recycle ids.
   @param[out]	space_id	Set this to the new tablespace ID
   @return true if assigned, false if not */
-  bool assign_new_space_id(space_id_t *space_id)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool assign_new_space_id(space_id_t *space_id);
 
   /** Tries to close a file in all the LRU lists.
   The caller must hold the mutex.
   @param[in]	print_info	if true, prints information why it close a file
   @return true if success, false if should retry later */
-  bool close_file_in_all_LRU(bool print_info)
-      MY_ATTRIBUTE((warn_unused_result));
+  bool close_file_in_all_LRU(bool print_info);
 
   /** Opens all log files and system tablespace data files in
   all shards. */
@@ -1624,12 +1593,11 @@
   @param[in]	include_log	Include log files, if true
   @param[in]	f		Callback
   @return any error returned by the callback function. */
-  dberr_t iterate(bool include_log, Fil_iterator::Function &f)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t iterate(bool include_log, Fil_iterator::Function &f);
 
   /** Rotate the tablespace keys by new master key.
   @return the number of tablespaces that failed to rotate. */
-  size_t encryption_rotate() MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] size_t encryption_rotate();
 
   /** Reencrypt tablespace keys by current master key. */
   void encryption_reencrypt(std::vector<space_id_t> &sid_vector);
@@ -1646,14 +1614,12 @@
   /** Lookup the tablespace ID.
   @param[in]	space_id	Tablespace ID to lookup
   @return true if the space ID is known. */
-  bool lookup_for_recovery(space_id_t space_id)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool lookup_for_recovery(space_id_t space_id);
 
   /** Open a tablespace that has a redo log record to apply.
   @param[in]	space_id		Tablespace ID
   @return true if the open was successful */
-  bool open_for_recovery(space_id_t space_id)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool open_for_recovery(space_id_t space_id);
 
   /** This function should be called after recovery has completed.
   Check for tablespace files for which we did not see any
@@ -1661,7 +1627,7 @@
   be recovered.
   @return true if there were some filenames missing for which we had to
           ignore redo log records during the apply phase */
-  bool check_missing_tablespaces() MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool check_missing_tablespaces();
 
   /** Note that a file has been relocated.
   @param[in]	object_id	Server DD tablespace ID
@@ -1692,8 +1658,7 @@
   /** Determines if a file belongs to the least-recently-used list.
   @param[in]	space		Tablespace to check
   @return true if the file belongs to fil_system->m_LRU mutex. */
-  static bool space_belongs_in_LRU(const fil_space_t *space)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static bool space_belongs_in_LRU(const fil_space_t *space);
 
   /** Normalize and save a directory to scan for IBD and IBU datafiles
   before recovery.
@@ -1718,14 +1683,13 @@
   0 on the first page then try finding the ID with Datafile::find_space_id().
   @param[in]	filename	File name to check
   @return s_invalid_space_id if not found, otherwise the space ID */
-  static space_id_t get_tablespace_id(const std::string &filename)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static space_id_t get_tablespace_id(
+      const std::string &filename);
 
   /** Fil_shard by space ID.
   @param[in]	space_id	Tablespace ID
   @return reference to the shard */
-  Fil_shard *shard_by_id(space_id_t space_id) const
-      MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] Fil_shard *shard_by_id(space_id_t space_id) const {
 #ifndef UNIV_HOTBACKUP
     if (space_id == dict_sys_t::s_log_space_first_id) {
       return m_shards[REDO_SHARD];
@@ -1772,11 +1736,11 @@
 
   /** Checks the consistency of the tablespace cache.
   @return true if ok */
-  bool validate() const MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool validate() const;
 
   /** Check if all mutexes are owned
   @return true if all owned. */
-  bool mutex_owned_all() const MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] bool mutex_owned_all() const {
 #ifdef UNIV_HOTBACKUP
     ut_ad(m_shards.size() == 1);
 #endif /* UNIV_HOTBACKUP */
@@ -1795,13 +1759,18 @@
   @param[in]	old_name	old tablespace name
   @param[in]	new_name	new tablespace name
   @return DB_SUCCESS on success */
-  dberr_t rename_tablespace_name(space_id_t space_id, const char *old_name,
-                                 const char *new_name)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t rename_tablespace_name(space_id_t space_id,
+                                               const char *old_name,
+                                               const char *new_name);
 
   /** Free the data structures required for recovery. */
   void free_scanned_files() { m_dirs.clear(); }
 
+  /** Throttles info messages when closing files in LRU lists. */
+  bool should_print_close_by_lru_info() {
+    return m_close_by_LRU_info_throttler.apply();
+  }
+
 #ifdef UNIV_HOTBACKUP
   /** Extends all tablespaces to the size stored in the space header.
   During the mysqlbackup --apply-log phase we extended the spaces
@@ -1844,10 +1813,9 @@
   @param[in]	path		path/to/databasename/tablename.ibd
   @param[out]	space		the tablespace, or nullptr on error
   @return status of the operation */
-  fil_load_status ibd_open_for_recovery(space_id_t space_id,
-                                        const std::string &path,
-                                        fil_space_t *&space)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] fil_load_status ibd_open_for_recovery(space_id_t space_id,
+                                                      const std::string &path,
+                                                      fil_space_t *&space);
 
  private:
   /** Fil_shards managed */
@@ -1856,6 +1824,9 @@
   /** n_open is not allowed to exceed this */
   const size_t m_max_n_open;
 
+  /** Throttles info messages when closing files in LRU lists. */
+  ib::Throttler m_close_by_LRU_info_throttler;
+
   /** Maximum space id in the existing tables, or assigned during
   the time mysqld has been up; at an InnoDB startup we scan the
   data dictionary and set here the maximum of the space id's of
@@ -1906,10 +1877,9 @@
 @param[in]	new_name	new file name
 @return	whether the operation was successfully applied (the name did not exist,
 or new_name did not exist and name was successfully renamed to new_name) */
-static bool fil_op_replay_rename(const page_id_t &page_id,
-                                 const std::string &old_name,
-                                 const std::string &new_name)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static bool fil_op_replay_rename(const page_id_t &page_id,
+                                               const std::string &old_name,
+                                               const std::string &new_name);
 
 #ifndef UNIV_HOTBACKUP
 /** Rename partition file.
@@ -2027,7 +1997,7 @@
   Fil_shard::s_open_slot = EMPTY_OPEN_SLOT;
 
   for (size_t i = 0; i < n_shards; ++i) {
-    auto shard = UT_NEW_NOKEY(Fil_shard(i));
+    auto shard = ut::new_withkey<Fil_shard>(UT_NEW_THIS_FILE_PSI_KEY, i);
 
     m_shards.push_back(shard);
   }
@@ -2040,7 +2010,7 @@
   Fil_shard::s_open_slot = 0;
 
   for (auto shard : m_shards) {
-    UT_DELETE(shard);
+    ut::delete_(shard);
   }
 
   m_shards.clear();
@@ -2597,8 +2567,9 @@
   ut_a(space->purpose != FIL_TYPE_LOG);
 
   /* Align memory for file I/O if we might have O_DIRECT set */
-  auto page =
-      static_cast<byte *>(ut::aligned_alloc(UNIV_PAGE_SIZE, UNIV_PAGE_SIZE));
+  const ulint buf_size =
+      recv_recovery_is_on() ? (UNIV_PAGE_SIZE * 2) : UNIV_PAGE_SIZE;
+  auto page = static_cast<byte *>(ut::aligned_alloc(buf_size, UNIV_PAGE_SIZE));
 
   ut_ad(page == page_align(page));
 
@@ -2607,7 +2578,7 @@
   IORequest request(IORequest::READ);
 
   dberr_t err = os_file_read_first_page(request, file->name, file->handle, page,
-                                        UNIV_PAGE_SIZE);
+                                        buf_size);
 
   ut_a(err == DB_SUCCESS);
 
@@ -2657,16 +2628,17 @@
   }
 
   if (space_id != space->id) {
-    ib::fatal(ER_IB_MSG_270) << "Tablespace id is " << space->id
-                             << " in the data dictionary but in file "
-                             << file->name << " it is " << space_id << "!";
+    ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_270)
+        << "Tablespace id is " << space->id
+        << " in the data dictionary but in file " << file->name << " it is "
+        << space_id << "!";
   }
 
   /* We need to adjust for compressed pages. */
   const page_size_t space_page_size(space->flags);
 
   if (!page_size.equals_to(space_page_size)) {
-    ib::fatal(ER_IB_MSG_271)
+    ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_271)
         << "Tablespace file " << file->name << " has page size " << page_size
         << " (flags=" << ib::hex(flags) << ") but the data dictionary expects"
         << " page size " << space_page_size
@@ -2718,6 +2690,21 @@
     ut_a(free_len < std::numeric_limits<uint32_t>::max());
 
     space->free_len = (uint32_t)free_len;
+
+    /* TODO: Get consistent flag from recovered DD. For that, DD should be
+    recovered already. */
+    /* Set estimated value for space->compression_type
+    during recovery process. */
+
+    if (recv_recovery_is_on() &&
+        (Compression::is_compressed_page(page + page_size.physical()) ||
+         Compression::is_compressed_encrypted_page(page +
+                                                   page_size.physical()))) {
+      ut_ad(buf_size >= (UNIV_PAGE_SIZE * 2));
+      Compression::meta_t header;
+      Compression::deserialize_header(page + page_size.physical(), &header);
+      space->compression_type = header.m_algorithm;
+    }
   }
 
   ut::aligned_free(page);
@@ -2789,6 +2776,12 @@
     return true;
   }
 
+  /* Since we might have released shard mutex temporarily above, the space
+  could have been deleted. */
+  if (m_id != REDO_SHARD && space->is_deleted()) {
+    return false;
+  }
+
   bool read_only_mode;
 
   read_only_mode = !fsp_is_system_temporary(space->id) && srv_read_only_mode;
@@ -2920,8 +2913,10 @@
     shard->mutex_acquire();
 
     if (print_info) {
-      ib::info(ER_IB_MSG_277, shard->id(),
-               ulonglong{UT_LIST_GET_LEN(shard->m_LRU)});
+      const auto len = ulonglong{UT_LIST_GET_LEN(shard->m_LRU)};
+      if (len > 0) {
+        ib::info(ER_IB_MSG_277, shard->id(), len);
+      }
     }
 
     bool success = shard->close_files_in_LRU(print_info);
@@ -3062,8 +3057,10 @@
     /* Reserve an open slot for this shard. So that this
     shard's open file succeeds. */
 
-    while (fil_system->m_max_n_open <= s_n_spaces_in_lru &&
-           !fil_system->close_file_in_all_LRU(i > 1)) {
+    while (fil_system->m_max_n_open <= s_n_spaces_in_lru) {
+      if (!fil_system->close_file_in_all_LRU(false)) {
+        std::this_thread::yield();
+      }
       if (ut_time_monotonic() - start_time >= PRINT_INTERVAL_SECS) {
         start_time = ut_time_monotonic();
 
@@ -3071,6 +3068,9 @@
                                 << start_time - begin_time << " seconds"
                                 << ". Configuration only allows for "
                                 << fil_system->m_max_n_open << " open files.";
+        fil_system->close_file_in_all_LRU(
+            fil_system->should_print_close_by_lru_info());
+        break;
       }
     }
 
@@ -3183,7 +3183,7 @@
 
     os_event_destroy(file.sync_event);
 
-    ut_free(file.name);
+    ut::free(file.name);
   }
 
   call_destructor(&space->files);
@@ -3191,8 +3191,8 @@
   ut_ad(space->size == 0);
 
   rw_lock_free(&space->latch);
-  ut_free(space->name);
-  ut_free(space);
+  ut::free(space->name);
+  ut::free(space);
 
   space = nullptr;
 }
@@ -3304,7 +3304,8 @@
     return nullptr;
   }
 
-  space = static_cast<fil_space_t *>(ut_zalloc_nokey(sizeof(*space)));
+  space = static_cast<fil_space_t *>(
+      ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sizeof(*space)));
   /* This could be just a placement new constructor call if, only if it compiles
   OK on SunPro. */
   space->initialize();
@@ -3329,6 +3330,7 @@
   space->magic_n = FIL_SPACE_MAGIC_N;
 
   space->encryption_type = Encryption::NONE;
+  space->encryption_op_in_progress = Encryption::Progress::NONE;
 
   rw_lock_create(fil_space_latch_key, &space->latch, SYNC_FSP);
 
@@ -3359,13 +3361,6 @@
 
   DBUG_EXECUTE_IF("fil_space_create_failure", return nullptr;);
 
-  if (purpose != FIL_TYPE_TEMPORARY) {
-    /* Mark the clone as aborted only while executing a DDL which creates
-    a base table, as any temporary table is ignored while cloning the database.
-    Clone state must be set back to active before returning from function. */
-    clone_mark_abort(true);
-  }
-
   fil_system->mutex_acquire_all();
 
   auto shard = fil_system->shard_by_id(space_id);
@@ -3375,11 +3370,6 @@
   if (space == nullptr) {
     /* Duplicate error. */
     fil_system->mutex_release_all();
-
-    if (purpose != FIL_TYPE_TEMPORARY) {
-      clone_mark_active();
-    }
-
     return nullptr;
   }
 
@@ -3400,10 +3390,6 @@
 
   fil_system->mutex_release_all();
 
-  if (purpose != FIL_TYPE_TEMPORARY) {
-    clone_mark_active();
-  }
-
   return space;
 }
 
@@ -3703,7 +3689,8 @@
 
   ut_a(max_n_open > 0);
 
-  fil_system = UT_NEW_NOKEY(Fil_system(MAX_SHARDS, max_n_open));
+  fil_system = ut::new_withkey<Fil_system>(UT_NEW_THIS_FILE_PSI_KEY, MAX_SHARDS,
+                                           max_n_open);
 }
 
 /** Open all the system files.
@@ -4012,7 +3999,7 @@
 @param[in]	max_id		Maximum known tablespace ID */
 void fil_set_max_space_id_if_bigger(space_id_t max_id) {
   if (dict_sys_t::is_reserved(max_id)) {
-    ib::fatal(ER_IB_MSG_285, ulong{max_id});
+    ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_285, ulong{max_id});
   }
 
   fil_system->update_maximum_space_id(max_id);
@@ -4442,7 +4429,7 @@
   if (cfg_name != nullptr) {
     os_file_delete_if_exists(innodb_data_file_key, cfg_name, nullptr);
 
-    ut_free(cfg_name);
+    ut::free(cfg_name);
   }
 
   auto cfp_name = Fil_path::make_cfp(path);
@@ -4450,10 +4437,10 @@
   if (cfp_name != nullptr) {
     os_file_delete_if_exists(innodb_data_file_key, cfp_name, nullptr);
 
-    ut_free(cfp_name);
+    ut::free(cfp_name);
   }
 
-  ut_free(path);
+  ut::free(path);
 
   return err;
 }
@@ -4585,6 +4572,21 @@
     buf_LRU_flush_or_remove_pages(space_id, buf_remove, nullptr);
   }
 
+  /* Ensure that we write redo log for the operation also within the Clone
+  notifier block. This is needed because we don't have any mechanism today
+  to avoid checkpoint crossing the redo log before the actual operation
+  is complete. Make sure we are not holding shard mutex. */
+  ut_ad(!mutex_owned());
+  Clone_notify notifier(Clone_notify::Type::SPACE_DROP, space_id, false);
+
+  if (notifier.failed()) {
+    /* Currently post DDL operations are never rolled back. */
+    /* purecov: begin deadcode */
+    ut_ad(false);
+    ut::free(path);
+    return DB_ERROR;
+    /* purecov: end */
+  }
 #endif /* !UNIV_HOTBACKUP */
 
   /* If it is a delete then also delete any generated files, otherwise
@@ -4615,7 +4617,7 @@
     if (cfg_name != nullptr) {
       os_file_delete_if_exists(innodb_data_file_key, cfg_name, nullptr);
 
-      ut_free(cfg_name);
+      ut::free(cfg_name);
     }
 
     char *cfp_name = Fil_path::make_cfp(path);
@@ -4623,13 +4625,10 @@
     if (cfp_name != nullptr) {
       os_file_delete_if_exists(innodb_data_file_key, cfp_name, nullptr);
 
-      ut_free(cfp_name);
+      ut::free(cfp_name);
     }
   }
 
-  /* Must set back to active before returning from function. */
-  clone_mark_abort(true);
-
   mutex_acquire();
 
   /* Double check the sanity of pending ops after reacquiring
@@ -4681,10 +4680,7 @@
     err = DB_TABLESPACE_NOT_FOUND;
   }
 
-  ut_free(path);
-
-  clone_mark_active();
-
+  ut::free(path);
   return err;
 }
 
@@ -4703,7 +4699,7 @@
   char *path{};
   auto err = wait_for_pending_operations(space_id, space, &path);
 
-  ut_free(path);
+  ut::free(path);
 
   return err;
 }
@@ -4897,9 +4893,10 @@
 @param[in]	size		Number of bytes by which the file
                                 is extended starting from the offset
 @param[in,out]	mtr		Mini-transaction */
-MY_ATTRIBUTE((unused))
-static void fil_op_write_space_extend(space_id_t space_id, os_offset_t offset,
-                                      os_offset_t size, mtr_t *mtr) {
+[[maybe_unused]] static void fil_op_write_space_extend(space_id_t space_id,
+                                                       os_offset_t offset,
+                                                       os_offset_t size,
+                                                       mtr_t *mtr) {
   ut_ad(space_id != TRX_SYS_SPACE);
 
   byte *log_ptr;
@@ -4944,7 +4941,7 @@
                                 name
 @param[in]	ext		the file extension to use
 @param[in]	trim		whether last name on the path should be trimmed
-@return own: file name; must be freed by ut_free() */
+@return own: file name; must be freed by ut::free() */
 char *Fil_path::make(const std::string &path_in, const std::string &name_in,
                      ib_file_suffix ext, bool trim) {
   /* The path should be a directory and should not contain the
@@ -5268,7 +5265,7 @@
       old file name with new file name. */
       dberr_t err = log_ddl->write_rename_space_log(space_id, new_file_name,
                                                     old_file_name);
-      ut_free(new_file_name);
+      ut::free(new_file_name);
       if (err != DB_SUCCESS) {
         return err;
       }
@@ -5308,13 +5305,23 @@
       close_file(file, false);
     }
 
-    mutex_release();
-
     if (!retry) {
       ut_ad(space->stop_ios);
+      /* Ensure that any file open call is blocked till rename operation is
+      over. "space->stop_ios" variable which is set only here and used to
+      check and wait in "mutex_acquire_and_get_space" (only when file is already
+      opened) doesn't prevent the file being opened concurrently afterwards.
+      "file->in_use" in fact seems sufficient to protect the rename operation
+      and "space->stop_ios" should be possible to remove in future. */
+      ut_ad(!file->is_open);
+      ut_ad(file->in_use == 0);
+      ++file->in_use;
+
+      mutex_release();
       break;
     }
 
+    mutex_release();
     std::this_thread::sleep_for(std::chrono::milliseconds(100));
 
     if (flush) {
@@ -5328,6 +5335,21 @@
 
   ut_ad(space->stop_ios);
 
+#ifndef UNIV_HOTBACKUP
+  /* Make sure we re not holding shard mutex. */
+  ut_ad(!mutex_owned());
+  Clone_notify notifier(Clone_notify::Type::SPACE_RENAME, space_id, false);
+
+  if (notifier.failed()) {
+    mutex_acquire();
+    space->stop_ios = false;
+    --file->in_use;
+    mutex_release();
+
+    return DB_ERROR;
+  }
+#endif /* !UNIV_HOTBACKUP */
+
   char *new_file_name;
 
   if (new_path_in == nullptr) {
@@ -5368,6 +5390,9 @@
   DBUG_INJECT_CRASH("ddl_crash_before_rename_tablespace",
                     crash_injection_rename_tablespace_counter++);
 
+  file = &space->files.front();
+  ut_ad(!file->is_open);
+
   success = os_file_rename(innodb_data_file_key, old_file_name, new_file_name);
 
   DBUG_EXECUTE_IF("fil_rename_tablespace_failure_2", skip_rename
@@ -5392,11 +5417,12 @@
 
   ut_ad(space->stop_ios);
   space->stop_ios = false;
+  --file->in_use;
 
   mutex_release();
 
-  ut_free(old_file_name);
-  ut_free(old_space_name);
+  ut::free(old_file_name);
+  ut::free(old_space_name);
 
   return success ? DB_SUCCESS : DB_ERROR;
 }
@@ -5480,7 +5506,7 @@
 
   mutex_release_all();
 
-  ut_free(old_space_name);
+  ut::free(old_space_name);
 
   return DB_SUCCESS;
 }
@@ -5490,83 +5516,18 @@
   return fil_system->rename_tablespace_name(space_id, old_name, new_name);
 }
 
-/** Create a tablespace (an IBD or IBT) file
-@param[in]	space_id	Tablespace ID
-@param[in]	name		Tablespace name in dbname/tablename format.
-                                For general tablespaces, the 'dbname/' part
-                                may be missing.
-@param[in]	path		Path and filename of the datafile to create.
-@param[in]	flags		Tablespace flags
-@param[in]	size		Initial size of the tablespace file in pages,
-                                must be >= FIL_IBD_FILE_INITIAL_SIZE
-@param[in]	type		FIL_TYPE_TABLESPACE or FIL_TYPE_TEMPORARY
-@return DB_SUCCESS or error code */
-static dberr_t fil_create_tablespace(space_id_t space_id, const char *name,
-                                     const char *path, uint32_t flags,
-                                     page_no_t size, fil_type_t type) {
-  pfs_os_file_t file;
-  dberr_t err;
-  byte *page;
-  bool success;
-  bool has_shared_space = FSP_FLAGS_GET_SHARED(flags);
-  fil_space_t *space = nullptr;
-
-  ut_ad(!fsp_is_system_tablespace(space_id));
-  ut_ad(!fsp_is_global_temporary(space_id));
-  ut_a(fsp_flags_is_valid(flags));
-  ut_a(type == FIL_TYPE_TEMPORARY || type == FIL_TYPE_TABLESPACE);
-
-  const page_size_t page_size(flags);
-
-  /* Create the subdirectories in the path, if they are
-  not there already. */
-  if (!has_shared_space) {
-    err = os_file_create_subdirs_if_needed(path);
-
-    if (err != DB_SUCCESS) {
-      return err;
-    }
-  }
-
-  file = os_file_create(
-      type == FIL_TYPE_TEMPORARY ? innodb_temp_file_key : innodb_data_file_key,
-      path, OS_FILE_CREATE | OS_FILE_ON_ERROR_NO_EXIT, OS_FILE_NORMAL,
-      OS_DATA_FILE, srv_read_only_mode && (type != FIL_TYPE_TEMPORARY),
-      &success);
-
-  if (!success) {
-    /* The following call will print an error message */
-    ulint error = os_file_get_last_error(true);
-
-    ib::error(ER_IB_MSG_301, path);
-
-    switch (error) {
-      case OS_FILE_ALREADY_EXISTS:
-#ifndef UNIV_HOTBACKUP
-        ib::error(ER_IB_MSG_UNEXPECTED_FILE_EXISTS, path, path);
-        return DB_TABLESPACE_EXISTS;
-#else  /* !UNIV_HOTBACKUP */
-        return DB_SUCCESS; /* Already existing file not an error here. */
-#endif /* !UNIV_HOTBACKUP */
-
-      case OS_FILE_NAME_TOO_LONG:
-        ib::error(ER_IB_MSG_TOO_LONG_PATH, path);
-        return DB_TOO_LONG_PATH;
-
-      case OS_FILE_DISK_FULL:
-        return DB_OUT_OF_DISK_SPACE;
-
-      default:
-        return DB_ERROR;
-    }
-  }
+dberr_t fil_write_initial_pages(pfs_os_file_t file, const char *path,
+                                fil_type_t type, page_no_t size,
+                                const byte *encrypt_info, space_id_t space_id,
+                                uint32_t &space_flags, bool &atomic_write,
+                                bool &punch_hole) {
+  bool success = false;
+  atomic_write = false;
+  punch_hole = false;
 
-  bool atomic_write = false;
+  const page_size_t page_size(space_flags);
   const auto sz = ulonglong{size * page_size.physical()};
 
-  ut_a(success);
-  success = false;
-
 #if !defined(NO_FALLOCATE) && defined(UNIV_LINUX)
   {
     int ret = 0;
@@ -5610,8 +5571,6 @@
   }
 
   if (!success) {
-    os_file_close(file);
-    os_file_delete(innodb_data_file_key, path);
     return DB_OUT_OF_DISK_SPACE;
   }
 
@@ -5619,7 +5578,7 @@
   be lost after this call, if it succeeds. In this case the file
   should be full of NULs. */
 
-  bool punch_hole = os_is_sparse_file_supported(path, file);
+  punch_hole = os_is_sparse_file_supported(path, file);
 
   /* Should not make large punch hole as initialization of large file,
   for crash-recovery safeness around disk-full. */
@@ -5634,20 +5593,26 @@
   flush would write to it. */
 
   /* Align the memory for file i/o if we might have O_DIRECT set */
-  page = static_cast<byte *>(
+  auto page = static_cast<byte *>(
       ut::aligned_zalloc(2 * page_size.logical(), page_size.logical()));
 
   /* Add the UNIV_PAGE_SIZE to the table flags and write them to the
   tablespace header. */
-  flags = fsp_flags_set_page_size(flags, page_size);
-  fsp_header_init_fields(page, space_id, flags);
+  space_flags = fsp_flags_set_page_size(space_flags, page_size);
+  fsp_header_init_fields(page, space_id, space_flags);
   mach_write_to_4(page + FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID, space_id);
 
   mach_write_to_4(page + FIL_PAGE_SRV_VERSION, DD_SPACE_CURRENT_SRV_VERSION);
   mach_write_to_4(page + FIL_PAGE_SPACE_VERSION,
                   DD_SPACE_CURRENT_SPACE_VERSION);
 
+  if (encrypt_info != nullptr) {
+    auto key_offset = fsp_header_get_encryption_offset(page_size);
+    memcpy(page + key_offset, encrypt_info, Encryption::INFO_SIZE);
+  }
+
   IORequest request(IORequest::WRITE);
+  dberr_t err = DB_SUCCESS;
 
   if (!page_size.is_compressed()) {
     buf_flush_init_for_writing(nullptr, page, nullptr, 0,
@@ -5681,14 +5646,88 @@
   }
 
   ut::aligned_free(page);
+  return err;
+}
+
+/** Create a tablespace (an IBD or IBT) file
+@param[in]	space_id	Tablespace ID
+@param[in]	name		Tablespace name in dbname/tablename format.
+                                For general tablespaces, the 'dbname/' part
+                                may be missing.
+@param[in]	path		Path and filename of the datafile to create.
+@param[in]	flags		Tablespace flags
+@param[in]	size		Initial size of the tablespace file in pages,
+                                must be >= FIL_IBD_FILE_INITIAL_SIZE
+@param[in]	type		FIL_TYPE_TABLESPACE or FIL_TYPE_TEMPORARY
+@return DB_SUCCESS or error code */
+static dberr_t fil_create_tablespace(space_id_t space_id, const char *name,
+                                     const char *path, uint32_t flags,
+                                     page_no_t size, fil_type_t type) {
+  ut_ad(!fsp_is_system_tablespace(space_id));
+  ut_ad(!fsp_is_global_temporary(space_id));
+  ut_a(fsp_flags_is_valid(flags));
+  ut_a(type == FIL_TYPE_TEMPORARY || type == FIL_TYPE_TABLESPACE);
+
+  bool has_shared_space = FSP_FLAGS_GET_SHARED(flags);
+  /* Create the subdirectories in the path, if they are
+  not there already. */
+  if (!has_shared_space) {
+    auto err = os_file_create_subdirs_if_needed(path);
+
+    if (err != DB_SUCCESS) {
+      return err; /* purecov: inspected */
+    }
+  }
+
+  bool success = false;
+
+  auto file = os_file_create(
+      type == FIL_TYPE_TEMPORARY ? innodb_temp_file_key : innodb_data_file_key,
+      path, OS_FILE_CREATE | OS_FILE_ON_ERROR_NO_EXIT, OS_FILE_NORMAL,
+      OS_DATA_FILE, srv_read_only_mode && (type != FIL_TYPE_TEMPORARY),
+      &success);
+
+  if (!success) {
+    /* purecov: begin inspected */
+    /* The following call will print an error message */
+    ulint error = os_file_get_last_error(true);
 
+    ib::error(ER_IB_MSG_301, path);
+
+    switch (error) {
+      case OS_FILE_ALREADY_EXISTS:
+#ifndef UNIV_HOTBACKUP
+        ib::error(ER_IB_MSG_UNEXPECTED_FILE_EXISTS, path, path);
+        return DB_TABLESPACE_EXISTS;
+#else  /* !UNIV_HOTBACKUP */
+        return DB_SUCCESS; /* Already existing file not an error here. */
+#endif /* !UNIV_HOTBACKUP */
+
+      case OS_FILE_NAME_TOO_LONG:
+        ib::error(ER_IB_MSG_TOO_LONG_PATH, path);
+        return DB_TOO_LONG_PATH;
+
+      case OS_FILE_DISK_FULL:
+        return DB_OUT_OF_DISK_SPACE;
+
+      default:
+        return DB_ERROR;
+    }
+    /* purecov: end */
+  }
+
+  bool atomic_write = false;
+  bool punch_hole = false;
+
+  auto err = fil_write_initial_pages(file, path, type, size, nullptr, space_id,
+                                     flags, atomic_write, punch_hole);
   if (err != DB_SUCCESS) {
     ib::error(ER_IB_MSG_304, path);
 
     os_file_close(file);
     os_file_delete(innodb_data_file_key, path);
 
-    return DB_ERROR;
+    return err;
   }
 
   success = os_file_flush(file);
@@ -5701,7 +5740,17 @@
     return DB_ERROR;
   }
 
-  space = fil_space_create(name, space_id, flags, type);
+#ifndef UNIV_HOTBACKUP
+  /* Notifier block covers space creation and initialization. */
+  Clone_notify notifier(Clone_notify::Type::SPACE_CREATE, space_id, false);
+
+  if (notifier.failed()) {
+    os_file_close(file);
+    return DB_ERROR;
+  }
+#endif /* !UNIV_HOTBACKUP */
+
+  auto space = fil_space_create(name, space_id, flags, type);
 
   if (space == nullptr) {
     os_file_close(file);
@@ -5744,6 +5793,8 @@
     ut_ad(err == DB_SUCCESS);
   }
 
+  space->encryption_op_in_progress = Encryption::Progress::NONE;
+
   os_file_close(file);
   if (err != DB_SUCCESS) {
     os_file_delete(innodb_data_file_key, path);
@@ -5923,7 +5974,7 @@
 #else  /* !UNIV_HOTBACKUP */
 
 /** Allocates a file name for an old version of a single-table tablespace.
-The string must be freed by caller with ut_free()!
+The string must be freed by caller with ut::free()!
 @param[in]	name		Original file name
 @return own: file name */
 static char *meb_make_ibbackup_old_name(const char *name) {
@@ -5931,7 +5982,8 @@
   ulint len = strlen(name);
   static const char suffix[] = "_ibbackup_old_vers_";
 
-  path = static_cast<char *>(ut_malloc_nokey(len + 15 + sizeof(suffix)));
+  path = static_cast<char *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, len + 15 + sizeof(suffix)));
 
   memcpy(path, name, len);
   memcpy(path + len, suffix, sizeof(suffix) - 1);
@@ -5979,7 +6031,7 @@
 /** Convert a file name to a tablespace name. Strip the file name
 prefix and suffix, leaving only databasename/tablename.
 @param[in]	filename	directory/databasename/tablename.ibd
-@return database/tablename string, to be freed with ut_free() */
+@return database/tablename string, to be freed with ut::free() */
 char *fil_path_to_space_name(const char *filename) {
   std::string path{filename};
   auto pos = path.find_last_of(Fil_path::SEPARATOR);
@@ -6079,8 +6131,12 @@
 
   ut_ad(df.is_open());
 
-  /* Read and validate the first page of the tablespace.
-  Assign a tablespace name based on the tablespace type. */
+  /* Get and test the file size. */
+  os_offset_t size = os_file_get_size(df.handle());
+
+  /* Read and validate the first page of the tablespace. Assign a tablespace
+  name based on the tablespace type. This will close the file, but will leave
+  the flags and names to be queried. */
   dberr_t err = df.validate_for_recovery(space_id);
 
   ut_a(err == DB_SUCCESS || err == DB_INVALID_ENCRYPTION_META);
@@ -6092,9 +6148,6 @@
 
   ut_a(df.space_id() == space_id);
 
-  /* Get and test the file size. */
-  os_offset_t size = os_file_get_size(df.handle());
-
   /* Every .ibd file is created >= 4 pages in size.
   Smaller files cannot be OK. */
   os_offset_t minimum_size;
@@ -6152,7 +6205,7 @@
 
     ut_a(success);
 
-    ut_free(new_path);
+    ut::free(new_path);
 
     return FIL_LOAD_ID_CHANGED;
   }
@@ -6188,7 +6241,7 @@
 
     ut_a(success);
 
-    ut_free(new_path);
+    ut::free(new_path);
     return FIL_LOAD_OK;
   }
 #endif /* UNIV_HOTBACKUP */
@@ -6311,7 +6364,7 @@
 
     space->name = new_space_name;
 
-    ut_free(old_space_name);
+    ut::free(old_space_name);
   }
 
   /* Update the undo::Tablespace::name. Since the fil_shard mutex is held by
@@ -6814,7 +6867,8 @@
 void Fil_shard::meb_extend_tablespaces_to_stored_len() {
   ut_ad(mutex_owned());
 
-  byte *buf = static_cast<byte *>(ut_malloc_nokey(UNIV_PAGE_SIZE));
+  byte *buf = static_cast<byte *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, UNIV_PAGE_SIZE));
 
   ut_a(buf != nullptr);
 
@@ -6868,7 +6922,7 @@
     mutex_acquire();
   }
 
-  ut_free(buf);
+  ut::free(buf);
 }
 
 /** Extends all tablespaces to the size stored in the space header. During the
@@ -6978,7 +7032,7 @@
 /** Map of dirty tablespaces during recovery */
 using MEB_recv_spaces =
     std::map<space_id_t, MEB_file_name, std::less<space_id_t>,
-             ut_allocator<std::pair<const space_id_t, MEB_file_name>>>;
+             ut::allocator<std::pair<const space_id_t, MEB_file_name>>>;
 
 static MEB_recv_spaces recv_spaces;
 
@@ -7008,8 +7062,8 @@
                                << " for tablespace" << space->name << "!";
     }
 
-    ut_free(key.iv);
-    ut_free(key.ptr);
+    ut::free(key.iv);
+    ut::free(key.ptr);
 
     key.iv = nullptr;
     key.ptr = nullptr;
@@ -7125,7 +7179,7 @@
 
   fil_system->meb_name_process(file_name, space_id, false);
 
-  ut_free(file_name);
+  ut::free(file_name);
 }
 
 /** Test, if a file path name contains a back-link ("../").
@@ -7179,8 +7233,8 @@
       }
 
       if (pos == std::string::npos) {
-        ib::fatal(ER_IB_MSG_325)
-            << "Could not extract the tabelspace"
+        ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_325)
+            << "Could not extract the tablespace"
             << " file name from the in the path : " << name;
       }
 
@@ -7263,7 +7317,7 @@
                                    FIL_IBD_FILE_INITIAL_SIZE);
 
       if (ret != DB_SUCCESS) {
-        ib::fatal(ER_IB_MSG_326)
+        ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_326)
             << "Could not create the tablespace : " << abs_file_path
             << " with space Id : " << page_id.space();
       }
@@ -7330,7 +7384,7 @@
 
   meb_fil_name_process(to_name, page_id.space());
 
-  ut_free(new_name);
+  ut::free(new_name);
 }
 
 /** Process a MLOG_FILE_DELETE redo record.
@@ -7357,7 +7411,7 @@
     ut_a(err == DB_SUCCESS);
   }
 
-  ut_free(file_name);
+  ut::free(file_name);
 }
 
 #endif /* UNIV_HOTBACKUP */
@@ -7585,21 +7639,22 @@
                            fil_space_t *space) {
   /* Don't encrypt page 0 of all tablespaces except redo log
   tablespace, all pages from the system tablespace. */
-  if ((space->encryption_op_in_progress == DECRYPTION && req_type.is_write()) ||
+  if ((space->encryption_op_in_progress == Encryption::Progress::DECRYPTION &&
+       req_type.is_write()) ||
       space->encryption_type == Encryption::NONE ||
       (page_id.page_no() == 0 && !req_type.is_log())) {
     req_type.clear_encrypted();
     return;
   }
 
-  /* For writting redo log, if encryption for redo log is disabled,
+  /* For writing redo log, if encryption for redo log is disabled,
   skip set encryption. */
   if (req_type.is_log() && req_type.is_write() && !srv_redo_log_encrypt) {
     req_type.clear_encrypted();
     return;
   }
 
-  /* For writting undo log, if encryption for undo log is disabled,
+  /* For writing undo log, if encryption for undo log is disabled,
   skip set encryption. */
   if (fsp_is_undo_tablespace(space->id) && !srv_undo_log_encrypt &&
       req_type.is_write()) {
@@ -7925,6 +7980,7 @@
       mutex_release();
 
       if (!sync) {
+        ut_d(bpage->take_io_responsibility());
         buf_page_io_complete(bpage, false);
       }
 
@@ -8196,8 +8252,11 @@
 #ifdef UNIV_DEBUG
   /* If the error prevented async io, then we haven't actually transfered the
   io responsibility at all, so we revert the debug io responsibility info. */
-  if (err != DB_SUCCESS && !sync) {
-    static_cast<buf_page_t *>(message)->take_io_responsibility();
+  auto bpage = static_cast<buf_page_t *>(message);
+
+  /* When space is deleted, we could have marked the io complete. */
+  if (err != DB_SUCCESS && !sync && bpage->was_io_fixed()) {
+    bpage->take_io_responsibility();
   }
 #endif
   return err;
@@ -8585,7 +8644,7 @@
     return;
   }
 
-  UT_DELETE(fil_system);
+  ut::delete_(fil_system);
 
   fil_system = nullptr;
 }
@@ -8928,7 +8987,7 @@
                                 " open the tablespace file "
                              << filepath;
 
-    ut_free(filepath);
+    ut::free(filepath);
 
     return DB_TABLESPACE_NOT_FOUND;
 
@@ -8955,7 +9014,8 @@
   /* The block we will use for every physical page */
   buf_block_t *block;
 
-  block = reinterpret_cast<buf_block_t *>(ut_zalloc_nokey(sizeof(*block)));
+  block = reinterpret_cast<buf_block_t *>(
+      ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sizeof(*block)));
 
   mutex_create(LATCH_ID_BUF_BLOCK_MUTEX, &block->mutex);
 
@@ -9053,11 +9113,11 @@
   os_file_close(file);
 
   ut::aligned_free(page);
-  ut_free(filepath);
+  ut::free(filepath);
 
   mutex_free(&block->mutex);
 
-  ut_free(block);
+  ut::free(block);
 
   return err;
 }
@@ -9084,7 +9144,7 @@
   if (cfg_filepath != nullptr) {
     os_file_delete_if_exists(innodb_data_file_key, cfg_filepath, nullptr);
 
-    ut_free(cfg_filepath);
+    ut::free(cfg_filepath);
   }
 
   char *cfp_filepath = Fil_path::make_cfp(path);
@@ -9092,7 +9152,7 @@
   if (cfp_filepath != nullptr) {
     os_file_delete_if_exists(innodb_data_file_key, cfp_filepath, nullptr);
 
-    ut_free(cfp_filepath);
+    ut::free(cfp_filepath);
   }
 
   return success;
@@ -9140,7 +9200,7 @@
     }
 
     path.assign(path_ptr);
-    ut_free(path_ptr);
+    ut::free(path_ptr);
 
     return DB_SUCCESS;
   };
@@ -9965,8 +10025,8 @@
                                << " for tablespace" << space->name << "!";
     }
 
-    ut_free(key.iv);
-    ut_free(key.ptr);
+    ut::free(key.iv);
+    ut::free(key.ptr);
 
     key.iv = nullptr;
     key.ptr = nullptr;
@@ -10209,7 +10269,8 @@
 
   if (status == FIL_LOAD_OK) {
     if ((FSP_FLAGS_GET_ENCRYPTION(space->flags) ||
-         space->encryption_op_in_progress == ENCRYPTION) &&
+         space->encryption_op_in_progress ==
+             Encryption::Progress::ENCRYPTION) &&
         recv_sys->keys != nullptr) {
       fil_tablespace_encryption_init(space);
     }
@@ -10849,9 +10910,7 @@
   /* Get the final size of the file and adjust file->size accordingly. */
   os_offset_t end_fsize = os_file_get_size(file->handle);
 
-  page_no_t pages_added = (end_fsize - initial_fsize) / phy_page_size;
-
-  file->size += pages_added;
+  file->size = end_fsize / phy_page_size;
   space->size = file->size;
 
   fil_flush(space->id);
@@ -11040,7 +11099,8 @@
   DBUG_EXECUTE_IF("dont_update_key_found_during_REDO_scan", return ptr;);
 
   if (recv_sys->keys == nullptr) {
-    recv_sys->keys = UT_NEW_NOKEY(recv_sys_t::Encryption_Keys());
+    recv_sys->keys =
+        ut::new_withkey<recv_sys_t::Encryption_Keys>(UT_NEW_THIS_FILE_PSI_KEY);
   }
 
   /* Search if key entry already exists for this tablespace, update it. */
@@ -11055,9 +11115,11 @@
 
   /* No existing entry found, create new one and insert it. */
   recv_sys_t::Encryption_Key new_key;
-  new_key.iv = static_cast<byte *>(ut_malloc_nokey(Encryption::KEY_LEN));
+  new_key.iv = static_cast<byte *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, Encryption::KEY_LEN));
   memcpy(new_key.iv, iv, Encryption::KEY_LEN);
-  new_key.ptr = static_cast<byte *>(ut_malloc_nokey(Encryption::KEY_LEN));
+  new_key.ptr = static_cast<byte *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, Encryption::KEY_LEN));
   memcpy(new_key.ptr, key, Encryption::KEY_LEN);
   new_key.space_id = space_id;
   new_key.lsn = lsn;
@@ -11164,8 +11226,10 @@
 @param[in]	df		Target file that exists on disk
 @return DB_SUCCESS if all OK */
 static dberr_t fil_rename_validate(fil_space_t *space, const std::string &name,
-                                   Datafile &df) {
+                                   Datafile &&df) {
   dberr_t err = df.validate_for_recovery(space->id);
+  /* The validate_for_recovery will set space_id, but will close the file. It is
+  safe to access filepath and space_id. */
 
   if (err == DB_TABLESPACE_NOT_FOUND) {
     /* Tablespace header doesn't contain the expected
@@ -11197,7 +11261,7 @@
 
   } else if (df.space_id() != space->id) {
     /* Target file exists on disk but has a different
-    tablespce ID. The user should manually delete it. */
+    tablespace ID. The user should manually delete it. */
 
     ib::error(ER_IB_MSG_369)
         << "Cannot rename '" << name << "' to '" << df.filepath() << "'. File '"
@@ -11247,22 +11311,21 @@
     return true;
   }
 
-  Datafile df;
   std::string name{new_name};
+  {
+    Datafile df;
 
-  df.set_filepath(name.c_str());
+    df.set_filepath(name.c_str());
 
-  if (df.open_read_only(false) == DB_SUCCESS) {
-    dberr_t err = fil_rename_validate(space, old_name, df);
+    if (df.open_read_only(false) == DB_SUCCESS) {
+      dberr_t err = fil_rename_validate(space, old_name, std::move(df));
 
-    if (err == DB_TABLESPACE_NOT_FOUND) {
-      /* This can happend during truncate. */
-      ib::info(ER_IB_MSG_371) << "Tablespace ID mismatch in '" << name << "'";
+      if (err == DB_TABLESPACE_NOT_FOUND) {
+        /* This can happen during truncate. */
+        ib::info(ER_IB_MSG_371) << "Tablespace ID mismatch in '" << name << "'";
+      }
+      return (err == DB_SUCCESS);
     }
-
-    df.close();
-
-    return (err == DB_SUCCESS);
   }
 
   auto path_sep_pos = name.find_last_of(Fil_path::SEPARATOR);
@@ -11293,8 +11356,6 @@
 
   ut_ad(!Fil_path::has_suffix(IBD, name));
 
-  clone_mark_abort(true);
-
   const auto ptr = name.c_str();
 
   dberr_t err =
@@ -11303,8 +11364,6 @@
   /* Stop recovery if this does not succeed. */
   ut_a(err == DB_SUCCESS);
 
-  clone_mark_active();
-
   return true;
 }
 
@@ -12097,11 +12156,11 @@
       before we open the file */
       return &f;
     }
-
-    /* The page is outside the current bounds of the file.
-    Return DB_ERROR.  This should not occur for undo tablespaces
-    since each truncation assigns a new space ID. */
-    ut_ad(!fsp_is_undo_tablespace(id));
+    /* The page is outside the current bounds of the file. We should not assert
+    here as we could be loading pages in buffer pool from dump file having pages
+    from dropped tablespaces. Specifically, for undo tablespace it is possible
+    to re-use the dropped space ID and the page could be out of bound. We need
+    to ignore such cases. */
   }
 
   return nullptr;
diff -Nru mysql-8.0-8.0.26/storage/innobase/fsp/fsp0file.cc mysql-8.0-8.0.27/storage/innobase/fsp/fsp0file.cc
--- mysql-8.0-8.0.26/storage/innobase/fsp/fsp0file.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/fsp/fsp0file.cc	2021-09-28 11:46:34.000000000 +0000
@@ -43,6 +43,8 @@
 #include "trx0purge.h"
 #include "ut0new.h"
 
+#include <scope_guard.h>
+
 #ifdef UNIV_HOTBACKUP
 #include "my_sys.h"
 #endif /* UNIV_HOTBACKUP */
@@ -64,7 +66,7 @@
 void Datafile::shutdown() {
   close();
 
-  ut_free(m_name);
+  ut::free(m_name);
   m_name = nullptr;
 
   free_filepath();
@@ -72,12 +74,12 @@
   free_first_page();
 
   if (m_encryption_key != nullptr) {
-    ut_free(m_encryption_key);
+    ut::free(m_encryption_key);
     m_encryption_key = nullptr;
   }
 
   if (m_encryption_iv != nullptr) {
-    ut_free(m_encryption_iv);
+    ut::free(m_encryption_iv);
     m_encryption_iv = nullptr;
   }
 }
@@ -227,7 +229,8 @@
 @param[in]	filepath	filepath to set */
 void Datafile::set_filepath(const char *filepath) {
   free_filepath();
-  m_filepath = static_cast<char *>(ut_malloc_nokey(strlen(filepath) + 1));
+  m_filepath = static_cast<char *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, strlen(filepath) + 1));
   ::strcpy(m_filepath, filepath);
   set_filename();
 }
@@ -235,7 +238,7 @@
 /** Free the filepath buffer. */
 void Datafile::free_filepath() {
   if (m_filepath != nullptr) {
-    ut_free(m_filepath);
+    ut::free(m_filepath);
     m_filepath = nullptr;
     m_filename = nullptr;
   }
@@ -273,7 +276,7 @@
 will be freed in the destructor.
 @param[in]	name	Tablespace Name if known, nullptr if not */
 void Datafile::set_name(const char *name) {
-  ut_free(m_name);
+  ut::free(m_name);
 
   if (name != nullptr) {
     m_name = mem_strdup(name);
@@ -288,8 +291,8 @@
   } else {
 #ifndef UNIV_HOTBACKUP
     /* Give this general tablespace a temporary name. */
-    m_name =
-        static_cast<char *>(ut_malloc_nokey(strlen(general_space_name) + 20));
+    m_name = static_cast<char *>(ut::malloc_withkey(
+        UT_NEW_THIS_FILE_PSI_KEY, strlen(general_space_name) + 20));
 
     sprintf(m_name, "%s_" SPACE_ID_PF, general_space_name, m_space_id);
 #else  /* !UNIV_HOTBACKUP */
@@ -299,7 +302,8 @@
     It will also not cause name clashes with remote tablespaces or
     tables in schema directory. */
     size_t len = strlen(m_filepath);
-    m_name = static_cast<char *>(ut_malloc_nokey(len + 1));
+    m_name = static_cast<char *>(
+        ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, len + 1));
     memcpy(m_name, m_filepath, len);
     m_name[len] = '\0';
 #endif /* !UNIV_HOTBACKUP */
@@ -453,14 +457,6 @@
   return (DB_ERROR);
 }
 
-/** Validates this datafile for the purpose of recovery.  The file should
-exist and be successfully opened. We initially open it in read-only mode
-because we just want to read the SpaceID.  However, if the first page is
-corrupt and needs to be restored from the doublewrite buffer, we will
-reopen it in write mode and ry to restore that page.
-@param[in]	space_id	Expected space ID
-@retval DB_SUCCESS  on success
-m_is_valid is also set true on success, else false. */
 dberr_t Datafile::validate_for_recovery(space_id_t space_id) {
   dberr_t err;
 
@@ -486,7 +482,6 @@
       /* Re-open the file in read-write mode  Attempt to restore
       page 0 from doublewrite and read the space ID from a survey
       of the first few pages. */
-      close();
       err = open_read_write(srv_read_only_mode);
       if (err != DB_SUCCESS) {
         ib::error(ER_IB_MSG_395) << "Datafile '" << m_filepath
@@ -523,21 +518,6 @@
   return (err);
 }
 
-/** Checks the consistency of the first page of a datafile when the
-tablespace is opened.  This occurs before the fil_space_t is created
-so the Space ID found here must not already be open.
-m_is_valid is set true on success, else false.
-@param[in]	space_id	Expected space ID
-@param[out]	flush_lsn	contents of FIL_PAGE_FILE_FLUSH_LSN
-@param[in]	for_import	if it is for importing
-(only valid for the first file of the system tablespace)
-@retval DB_WRONG_FILE_NAME tablespace in file header doesn't match
-        expected value
-@retval DB_SUCCESS on if the datafile is valid
-@retval DB_CORRUPTION if the datafile is not readable
-@retval DB_INVALID_ENCRYPTION_META if the encrypption meta data
-        is not readable
-@retval DB_TABLESPACE_EXISTS if there is a duplicate space_id */
 dberr_t Datafile::validate_first_page(space_id_t space_id, lsn_t *flush_lsn,
                                       bool for_import) {
   char *prev_name;
@@ -546,6 +526,12 @@
 
   m_is_valid = true;
 
+  /* fil_space_read_name_and_filepath will acquire the fil shard mutex. If there
+  is any other thread that tries to open this file, it will have the fil
+  mutex and will wait for this file to open. It will not succeed on Windows
+  as we don't open the file for shared write. */
+  auto guard = create_scope_guard([this]() { close(); });
+
   if (m_first_page == nullptr &&
       read_first_page(srv_read_only_mode) != DB_SUCCESS) {
     error_txt = "Cannot read first page";
@@ -653,9 +639,10 @@
   first page can be decrypt by master key, otherwise, this table
   can't be open. And for importing, we skip checking it. */
   if (FSP_FLAGS_GET_ENCRYPTION(m_flags) && !for_import) {
-    m_encryption_key =
-        static_cast<byte *>(ut_zalloc_nokey(Encryption::KEY_LEN));
-    m_encryption_iv = static_cast<byte *>(ut_zalloc_nokey(Encryption::KEY_LEN));
+    m_encryption_key = static_cast<byte *>(
+        ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, Encryption::KEY_LEN));
+    m_encryption_iv = static_cast<byte *>(
+        ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, Encryption::KEY_LEN));
 #ifdef UNIV_ENCRYPT_DEBUG
     fprintf(stderr, "Got from file %u:", m_space_id);
 #endif
@@ -669,22 +656,24 @@
 
       m_is_valid = false;
       free_first_page();
-      ut_free(m_encryption_key);
-      ut_free(m_encryption_iv);
+      ut::free(m_encryption_key);
+      ut::free(m_encryption_iv);
       m_encryption_key = nullptr;
       m_encryption_iv = nullptr;
       return (DB_INVALID_ENCRYPTION_META);
     } else {
+#ifdef UNIV_DEBUG
       ib::info(ER_IB_MSG_402) << "Read encryption metadata from " << m_filepath
                               << " successfully, encryption"
                               << " of this tablespace enabled.";
+#endif
       m_encryption_master_key_id = e_key.m_master_key_id;
     }
 
     if (recv_recovery_is_on() &&
         memcmp(m_encryption_key, m_encryption_iv, Encryption::KEY_LEN) == 0) {
-      ut_free(m_encryption_key);
-      ut_free(m_encryption_iv);
+      ut::free(m_encryption_key);
+      ut::free(m_encryption_iv);
       m_encryption_key = nullptr;
       m_encryption_iv = nullptr;
     }
@@ -699,8 +688,8 @@
   if (fil_space_read_name_and_filepath(m_space_id, &prev_name,
                                        &prev_filepath)) {
     if (0 == strcmp(m_filepath, prev_filepath)) {
-      ut_free(prev_name);
-      ut_free(prev_filepath);
+      ut::free(prev_name);
+      ut::free(prev_filepath);
       return (DB_SUCCESS);
     }
 
@@ -712,8 +701,8 @@
                              << ". Cannot open filepath: " << m_filepath
                              << " which uses the same space ID.";
 
-    ut_free(prev_name);
-    ut_free(prev_filepath);
+    ut::free(prev_name);
+    ut::free(prev_filepath);
 
     m_is_valid = false;
 
@@ -748,7 +737,7 @@
        page_size <<= 1) {
     /* map[space_id] = count of pages */
     typedef std::map<space_id_t, ulint, std::less<space_id_t>,
-                     ut_allocator<std::pair<const space_id_t, ulint>>>
+                     ut::allocator<std::pair<const space_id_t, ulint>>>
         Pages;
 
     Pages verify;
@@ -883,6 +872,7 @@
 @param[in]	restore_page_no		Page number to restore
 @return DB_SUCCESS if page was restored from doublewrite, else DB_ERROR */
 dberr_t Datafile::restore_from_doublewrite(page_no_t restore_page_no) {
+  ut_a(is_open());
   auto page_id = page_id_t{m_space_id, restore_page_no};
 
   /* Find if double write buffer contains page_no of given space id. */
diff -Nru mysql-8.0-8.0.26/storage/innobase/fsp/fsp0fsp.cc mysql-8.0-8.0.27/storage/innobase/fsp/fsp0fsp.cc
--- mysql-8.0-8.0.26/storage/innobase/fsp/fsp0fsp.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/fsp/fsp0fsp.cc	2021-09-28 11:46:34.000000000 +0000
@@ -57,6 +57,7 @@
 #include "log0log.h"
 #include "srv0srv.h"
 #endif /* !UNIV_HOTBACKUP */
+#include "clone0api.h"
 #include "dict0mem.h"
 #include "fsp0sysspace.h"
 #include "srv0start.h"
@@ -161,7 +162,7 @@
 @retval block	rw_lock_x_lock_count(&block->lock) == 1 if allocation succeeded
 (init_mtr == mtr, or the page was not previously freed in mtr),
 returned block is not allocated nor initialized otherwise */
-static buf_block_t *fseg_alloc_free_page_low(
+[[nodiscard]] static buf_block_t *fseg_alloc_free_page_low(
     fil_space_t *space, const page_size_t &page_size, fseg_inode_t *seg_inode,
     page_no_t hint, byte direction, rw_lock_type_t rw_latch, mtr_t *mtr,
     mtr_t *init_mtr
@@ -169,7 +170,7 @@
     ,
     ibool has_done_reservation
 #endif /* UNIV_DEBUG */
-    ) MY_ATTRIBUTE((warn_unused_result));
+);
 #endif /* !UNIV_HOTBACKUP */
 
 /** Get the segment identifier to which the extent belongs to.
@@ -547,11 +548,9 @@
 the same as the tablespace header
 @return pointer to the extent descriptor, NULL if the page does not
 exist in the space or if the offset exceeds free limit */
-static inline MY_ATTRIBUTE((warn_unused_result)) xdes_t
-    *xdes_get_descriptor_with_space_hdr(fsp_header_t *sp_header,
-                                        space_id_t space, page_no_t offset,
-                                        mtr_t *mtr, bool init_space = false,
-                                        buf_block_t **desc_block = nullptr) {
+[[nodiscard]] static inline xdes_t *xdes_get_descriptor_with_space_hdr(
+    fsp_header_t *sp_header, space_id_t space, page_no_t offset, mtr_t *mtr,
+    bool init_space = false, buf_block_t **desc_block = nullptr) {
   ulint limit;
   ulint size;
   page_no_t descr_page_no;
@@ -625,9 +624,10 @@
 @param[in,out]	mtr		Mini-transaction
 @return pointer to the extent descriptor, NULL if the page does not
 exist in the space or if the offset exceeds the free limit */
-static MY_ATTRIBUTE((warn_unused_result)) xdes_t *xdes_get_descriptor(
-    space_id_t space_id, page_no_t offset, const page_size_t &page_size,
-    mtr_t *mtr) {
+[[nodiscard]] static xdes_t *xdes_get_descriptor(space_id_t space_id,
+                                                 page_no_t offset,
+                                                 const page_size_t &page_size,
+                                                 mtr_t *mtr) {
   buf_block_t *block;
   fsp_header_t *sp_header;
 
@@ -767,10 +767,10 @@
 
 /** Parses a redo log record of a file page init.
  @return end of log record or NULL */
-byte *fsp_parse_init_file_page(
-    byte *ptr,                            /*!< in: buffer */
-    byte *end_ptr MY_ATTRIBUTE((unused)), /*!< in: buffer end */
-    buf_block_t *block)                   /*!< in: block or NULL */
+byte *fsp_parse_init_file_page(byte *ptr, /*!< in: buffer */
+                               byte *end_ptr
+                               [[maybe_unused]],   /*!< in: buffer end */
+                               buf_block_t *block) /*!< in: block or NULL */
 {
   if (block) {
     fsp_init_file_page_low(block);
@@ -877,28 +877,27 @@
 @param[in]	page_size	tablespace page size
 @return operation type
 */
-encryption_op_type fsp_header_encryption_op_type_in_progress(
+Encryption::Progress fsp_header_encryption_op_type_in_progress(
     const page_t *page, page_size_t page_size) {
-  ulint offset;
-  encryption_op_type op;
-  offset = fsp_header_get_encryption_progress_offset(page_size);
+  auto offset = fsp_header_get_encryption_progress_offset(page_size);
   ut_ad(offset != 0 && offset < UNIV_PAGE_SIZE);
 
+  auto op = Encryption::Progress::NONE;
   /* Read operation type (1 byte) */
   byte operation = mach_read_from_1(page + offset);
   switch (operation) {
     case Encryption::ENCRYPT_IN_PROGRESS:
-      op = ENCRYPTION;
+      op = Encryption::Progress::ENCRYPTION;
       break;
     case Encryption::DECRYPT_IN_PROGRESS:
-      op = DECRYPTION;
+      op = Encryption::Progress::DECRYPTION;
       break;
     default:
-      op = NONE;
+      op = Encryption::Progress::NONE;
       break;
   }
 
-  return (op);
+  return op;
 }
 
 /** Write the encryption info into the space header.
@@ -1084,9 +1083,20 @@
       return (false);
     }
 
+    bool master_key_encrypt = true;
+
+    /* Generate redo log encryption info that cannot be extracted with master
+    key during recovery. This is to validate that clone ignores encryption
+    information in redo log and works fine. Clone needs to ignore it as the
+    encryption information in redo log is encrypted using donor master key which
+    is not available in recipient. This is otherwise difficult to test in mtr
+    test environment where recipient uses same keyring as donor. */
+    DBUG_EXECUTE_IF("log_redo_with_invalid_master_key",
+                    master_key_encrypt = false;);
+
     if (!Encryption::fill_encryption_info(space->encryption_key,
                                           space->encryption_iv, encryption_info,
-                                          is_boot, true)) {
+                                          is_boot, master_key_encrypt)) {
       space->encryption_type = Encryption::NONE;
       memset(space->encryption_key, 0, Encryption::KEY_LEN);
       memset(space->encryption_iv, 0, Encryption::KEY_LEN);
@@ -1095,8 +1105,18 @@
 
     mlog_write_string(page + offset, encryption_info, Encryption::INFO_SIZE,
                       mtr);
+
+    /* Correct the master key stored in page. We only intend to generate
+    incorrect redo log. */
+    DBUG_EXECUTE_IF("log_redo_with_invalid_master_key", {
+      ut_ad(!master_key_encrypt);
+      Encryption::fill_encryption_info(space->encryption_key,
+                                       space->encryption_iv, encryption_info,
+                                       is_boot, true);
+      memcpy(page + offset, encryption_info, Encryption::INFO_SIZE);
+    });
   }
-  space->encryption_op_in_progress = NONE;
+  space->encryption_op_in_progress = Encryption::Progress::NONE;
 
   if (space_id == TRX_SYS_SPACE) {
     if (btr_create(DICT_CLUSTERED | DICT_IBUF, 0, univ_page_size,
@@ -1223,8 +1243,7 @@
 @param[in,out]	header	Tablespace header
 @param[in,out]	mtr	Mini-transaction
 @return true if success */
-static UNIV_COLD
-MY_ATTRIBUTE((warn_unused_result)) bool fsp_try_extend_data_file_with_pages(
+[[nodiscard]] static UNIV_COLD bool fsp_try_extend_data_file_with_pages(
     fil_space_t *space, page_no_t page_no, fsp_header_t *header, mtr_t *mtr) {
   DBUG_TRACE;
 
@@ -1700,7 +1719,7 @@
 @retval block	rw_lock_x_lock_count(&block->lock) == 1 if allocation succeeded
 (init_mtr == mtr, or the page was not previously freed in mtr),
 returned block is not allocated nor initialized otherwise */
-static MY_ATTRIBUTE((warn_unused_result)) buf_block_t *fsp_alloc_free_page(
+[[nodiscard]] static buf_block_t *fsp_alloc_free_page(
     space_id_t space, const page_size_t &page_size, page_no_t hint,
     rw_lock_type_t rw_latch, mtr_t *mtr, mtr_t *init_mtr) {
   fsp_header_t *header;
@@ -2135,7 +2154,8 @@
 @param[in,out]	mtr		Mini-transaction
 @param[out]	block		Inode block, or NULL to ignore
 @return segment inode, page x-latched; NULL if the inode is free */
-static fseg_inode_t *fseg_inode_try_get(fseg_header_t *header, space_id_t space,
+static fseg_inode_t *fseg_inode_try_get(const fseg_header_t *header,
+                                        space_id_t space,
                                         const page_size_t &page_size,
                                         mtr_t *mtr, buf_block_t **block) {
   fil_addr_t inode_addr;
@@ -2156,16 +2176,9 @@
   return (inode);
 }
 
-/** Returns the file segment inode, page x-latched.
-@param[in]	header		Segment header
-@param[in]	space		Space id
-@param[in]	page_size	Page size
-@param[in,out]	mtr		Mini-transaction
-@param[out]	block		Inode block
-@return segment inode, page x-latched */
-static fseg_inode_t *fseg_inode_get(fseg_header_t *header, space_id_t space,
-                                    const page_size_t &page_size, mtr_t *mtr,
-                                    buf_block_t **block = nullptr) {
+fseg_inode_t *fseg_inode_get(const fseg_header_t *header, space_id_t space,
+                             const page_size_t &page_size, mtr_t *mtr,
+                             buf_block_t **block) {
   fseg_inode_t *inode =
       fseg_inode_try_get(header, space, page_size, mtr, block);
   ut_a(inode);
@@ -2177,7 +2190,7 @@
 static inline page_no_t fseg_get_nth_frag_page_no(
     fseg_inode_t *inode, /*!< in: segment inode */
     ulint n,             /*!< in: slot index */
-    mtr_t *mtr MY_ATTRIBUTE((unused)))
+    mtr_t *mtr [[maybe_unused]])
 /*!< in/out: mini-transaction */
 {
 #ifdef UNIV_DEBUG
@@ -3416,7 +3429,7 @@
                                 " corrupt. You may need to dump your tables and"
                                 " recreate the whole database!";
   crash:
-    ib::fatal(ER_IB_MSG_422) << FORCE_RECOVERY_MSG;
+    ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_422) << FORCE_RECOVERY_MSG;
   }
 
   xdes_state_t state = xdes_get_state(descr, mtr);
@@ -4119,7 +4132,7 @@
                                               page_no_t total_pages,
                                               page_no_t from_page) {
 #ifdef HAVE_PSI_STAGE_INTERFACE
-  ut_stage_alter_ts progress_monitor;
+  Alter_stage_ts progress_monitor;
 #endif
   page_size_t pageSize(space_flags);
   page_no_t current_page = from_page;
@@ -4236,8 +4249,11 @@
   return progress;
 }
 
-static dberr_t init_before_encrypt_processing(fil_space_t *space,
-                                              space_id_t space_id) {
+/** Initialize space encrypt operation and persist in page-0.
+@param[in,out]	space	innodb tablespace
+@return innodb error code */
+static dberr_t encrypt_begin_persist(fil_space_t *space) {
+  DBUG_TRACE;
   dberr_t err = DB_SUCCESS;
 
   /* Fill key, iv and prepare encryption_info to be written in page 0 */
@@ -4253,6 +4269,38 @@
   if (!Encryption::fill_encryption_info(key, iv, encryption_info, false,
                                         true)) {
     ut_ad(false);
+    return DB_ERROR;
+  }
+
+  {
+    /* Write Encryption information and notify clone. Do this before persisting
+    encryption information because clone needs to know that the table is being
+    encrypted before the key is persisted in page-0. This is because clone needs
+    to copy and re-encrypt the key with recipients master key.
+
+    There is an existinge issue here that other pages could get encrypted and
+    flushed after this point before page-0 is flushed. It could eventually
+    cause issue during recovery in case of a crash. It needs to be fixed
+    separately (may be) by encrypting pages only if space flag is set. Note that
+    we haven't yet set the space flag to FSP_FLAGS_MASK_ENCRYPTION yet.
+
+    Also, we should introduce some concurrency control (atomics) to prevent race
+    while accessing space encryption related information during IO. */
+    Clone_notify notifier(Clone_notify::Type::SPACE_ALTER_ENCRYPT_GENERAL,
+                          space->id, false);
+    ut_ad(!notifier.failed());
+
+    /* Set encryption for tablespace */
+    rw_lock_x_lock(&space->latch);
+    err = fil_set_encryption(space->id, Encryption::AES, key, iv);
+    rw_lock_x_unlock(&space->latch);
+
+    if (err != DB_SUCCESS) {
+      /* purecov: begin deadcode */
+      ut_ad(false);
+      return err;
+      /* purecov: end */
+    }
   }
 
   /* Write Encryption information and space flags now on page 0
@@ -4260,26 +4308,19 @@
   the changes on disk and then modify in memory flags. */
   mtr_t mtr;
   mtr_start(&mtr);
-  if (!fsp_header_write_encryption(space_id,
+
+  if (!fsp_header_write_encryption(space->id,
                                    space->flags | FSP_FLAGS_MASK_ENCRYPTION,
                                    encryption_info, true, false, &mtr)) {
     ut_ad(false);
+    err = DB_ERROR;
   }
 
   /* Write operation type and progress (0 now) on page 0 */
   fsp_header_write_encryption_progress(
-      space_id, space->flags, 0, Encryption::ENCRYPT_IN_PROGRESS, true, &mtr);
-  mtr_commit(&mtr);
+      space->id, space->flags, 0, Encryption::ENCRYPT_IN_PROGRESS, true, &mtr);
 
-  /* Set encryption for tablespace */
-  rw_lock_x_lock(&space->latch);
-  err = fil_set_encryption(space_id, Encryption::AES, key, iv);
-  rw_lock_x_unlock(&space->latch);
-
-  if (err != DB_SUCCESS) {
-    ut_ad(false);
-    return err;
-  }
+  mtr_commit(&mtr);
 
   /* Make sure encryption information is persisted on disk. Following scenario:
   [1] Encryption key is written on page 0 but Page 0 is not flushed.
@@ -4287,233 +4328,399 @@
   [3] checkpoint hasn't reached [1] yet and has REDO for P before [1].
   [4] Server crashed. During recovery REDO scan batch REDO [1] is not reached.
   [5] Although REDO for P is to be discarded, but to confirm that page LSN is
-      to be checked, thus  P is read from disk. ERROR. */
-  buf_LRU_flush_or_remove_pages(space_id, BUF_REMOVE_FLUSH_WRITE, nullptr,
+      to be checked, thus  P is read from disk. ERROR. We should replace this
+  expensive call to flush all by an interface that would flush only page-0. */
+  buf_LRU_flush_or_remove_pages(space->id, BUF_REMOVE_FLUSH_WRITE, nullptr,
                                 false);
+  return DB_SUCCESS;
+}
+
+/** Initialize space encrypt memory flags.
+@param[in,out]	space	innodb tablespace */
+static void encrypt_begin_memory(fil_space_t *space) {
+  DBUG_TRACE;
+  /* Don't allow operation to change while clone is evaluating the state of the
+  space during state transition. */
+  Clone_notify notifier(Clone_notify::Type::SPACE_ALTER_ENCRYPT_GENERAL_FLAGS,
+                        space->id, false);
+  ut_ad(!notifier.failed());
 
   /* Set encryption operation in progress flag */
-  space->encryption_op_in_progress = ENCRYPTION;
+  space->encryption_op_in_progress = Encryption::Progress::ENCRYPTION;
 
   /* Update In-mem Encryption flag for tablespace */
   fsp_flags_set_encryption(space->flags);
+}
+
+/** Force all pages of a space to be loaded and flushed back to disk
+@param[in,out]	thd		server session THD
+@param[in,out]	space		innodb tablespace
+@param[in]	from_page	page number to resume from */
+static void process_all_pages(THD *thd, fil_space_t *space,
+                              page_no_t from_page) {
+  DBUG_TRACE;
+  /* Mark all pages in tablespace dirty */
+  mark_all_page_dirty_in_tablespace(thd, space->id, space->flags, space->size,
+                                    from_page);
+
+  /* As DMLs are allowed in parallel, pass false for 'strict' */
+  buf_LRU_flush_or_remove_pages(space->id, BUF_REMOVE_FLUSH_WRITE, nullptr,
+                                false);
+}
+
+/** Finish space encrypt operation.
+@param[in,out]	space	innodb tablespace */
+static void encrypt_end(fil_space_t *space) {
+  DBUG_TRACE;
+  /* Crash before resetting progress on page 0 */
+  DBUG_EXECUTE_IF("alter_encrypt_tablespace_crash_before_resetting_progress",
+                  log_buffer_flush_to_disk();
+                  DBUG_SUICIDE(););
+
+  /* Erase Operation type and encryption progress from page 0 */
+  mtr_t mtr;
+  mtr_start(&mtr);
+
+  fsp_header_write_encryption_progress(space->id, space->flags, 0, 0, true,
+                                       &mtr);
+  mtr_commit(&mtr);
+
+  /* Don't allow operation to change while clone is evaluating the state of the
+  space during state transition. */
+  Clone_notify notifier(Clone_notify::Type::SPACE_ALTER_ENCRYPT_GENERAL_FLAGS,
+                        space->id, false);
+  ut_ad(!notifier.failed());
+
+  /* Reset encryption in progress flag */
+  space->encryption_op_in_progress = Encryption::Progress::NONE;
+}
+
+/** Find out the place to resume the operation.
+@param[in,out]	space		innodb tablespace
+@param[out]	from_page	page number to resume from
+@return state to resume from */
+static Encryption::Resume_point encrypt_resume_point(fil_space_t *space,
+                                                     page_no_t &from_page) {
+  DBUG_TRACE;
+  bool encryption_flag = FSP_FLAGS_GET_ENCRYPTION(space->flags);
+  from_page = 1;
+
+  if (!encryption_flag) {
+    /* Encryption is not yet started. */
+    return Encryption::Resume_point::INIT;
+  }
+
+  /* Read page 0 and get encryption progress */
+  byte operation;
+  from_page = get_encryption_progress(space, operation) + 1;
+
+  if (operation != Encryption::ENCRYPT_IN_PROGRESS) {
+    ut_ad(operation != Encryption::DECRYPT_IN_PROGRESS);
+    ut_ad(space->encryption_op_in_progress == Encryption::Progress::NONE);
+    /* Encryption is already done. */
+    return Encryption::Resume_point::DONE;
+  }
+
+  ut_ad(space->encryption_op_in_progress == Encryption::Progress::ENCRYPTION);
+
+  if (from_page == space->size) {
+    return Encryption::Resume_point::END;
+  }
+
+  return Encryption::Resume_point::PROCESS;
+}
+
+/** Encrypt all pages of a tablespace.
+@param[in,out]	thd		server session THD
+@param[in]	space_id	Tablespace id
+@param[in]	resume		true if resumed after server restart
+@return innodb error code */
+static dberr_t encrypt_tablespace(THD *thd, space_id_t space_id, bool resume) {
+  DBUG_TRACE;
+
+  dberr_t err = DB_SUCCESS;
+  fil_space_t *space = fil_space_get(space_id);
+
+  Encryption::Resume_point resume_point = Encryption::Resume_point::INIT;
+  page_no_t from_page = 1;
+
+  if (resume) {
+    resume_point = encrypt_resume_point(space, from_page);
+  }
+
+  switch (resume_point) {
+    case Encryption::Resume_point::INIT:
+      /* Set and persist encryption key information. We also persist
+      the initialized progress information together in same mtr (atomic).*/
+      err = encrypt_begin_persist(space);
+
+      ut_ad(err == DB_SUCCESS);
+
+      if (err != DB_SUCCESS) {
+        break; /* purecov: deadcode */
+      }
+      /* Set encryption flag and initialize progress information. */
+      encrypt_begin_memory(space);
+      [[fallthrough]];
+
+    case Encryption::Resume_point::PROCESS:
+      /* Load and flush all pages so that they are all encrypted on disk. */
+      process_all_pages(thd, space, from_page);
+      [[fallthrough]];
+
+    case Encryption::Resume_point::END:
+      /* Reset progress information. */
+      encrypt_end(space);
+      [[fallthrough]];
+
+    case Encryption::Resume_point::DONE:
+      break;
+  }
 
   return err;
 }
 
-static dberr_t init_before_decrypt_processing(fil_space_t *space,
-                                              space_id_t space_id) {
+/** Initialize space decrypt operation and persist in page-0.
+@param[in,out]	space	innodb tablespace
+@return innodb error code */
+static dberr_t decrypt_begin_persist(fil_space_t *space) {
+  DBUG_TRACE;
+  /* Write Decryption progress and notify clone. Do this before persisting the
+  progress information. Clone needs to identify the state before page-0 is
+  updated. */
+  {
+    Clone_notify notifier(Clone_notify::Type::SPACE_ALTER_ENCRYPT_GENERAL,
+                          space->id, false);
+    ut_ad(!notifier.failed());
+    space->encryption_op_in_progress = Encryption::Progress::DECRYPTION;
+  }
+
   dberr_t err = DB_SUCCESS;
 
   mtr_t mtr;
   mtr_start(&mtr);
   /* Write operation type and progress (0 now) on page 0 */
-  if (!fsp_header_write_encryption_progress(space_id, space->flags, 0,
+  if (!fsp_header_write_encryption_progress(space->id, space->flags, 0,
                                             Encryption::DECRYPT_IN_PROGRESS,
                                             true, &mtr)) {
     ut_ad(false);
-    mtr_commit(&mtr);
-    return DB_ERROR;
+    err = DB_ERROR;
   }
 
   mtr_commit(&mtr);
+  return err;
+}
+
+/** Initialize space decrypt memory flags.
+@param[in,out]	space	innodb tablespace */
+static void decrypt_begin_memory(fil_space_t *space) {
+  DBUG_TRACE;
+  /* Notify clone before starting decryption. */
+  Clone_notify notifier(Clone_notify::Type::SPACE_ALTER_ENCRYPT_GENERAL_FLAGS,
+                        space->id, false);
+  ut_ad(!notifier.failed());
 
   /* Set encryption operation in progress flag */
-  space->encryption_op_in_progress = DECRYPTION;
+  space->encryption_op_in_progress = Encryption::Progress::DECRYPTION;
 
-  /* Update In-mem Encryption flag for tablespace */
+  /* Update In-memory Encryption flag for tablespace. We cannot erase Encryption
+  info in page-0 till all pages are decrypted. */
   fsp_flags_unset_encryption(space->flags);
+}
+
+/** Finish space decrypt operation.
+@param[in,out]	space	innodb tablespace
+@return innodb error code */
+static dberr_t decrypt_end(fil_space_t *space) {
+  DBUG_TRACE;
+  ut_ad(!FSP_FLAGS_GET_ENCRYPTION(space->flags));
+
+  DBUG_EXECUTE_IF("alter_encrypt_tablespace_crash_before_updating_flags",
+                  log_buffer_flush_to_disk();
+                  DBUG_SUICIDE(););
+
+  dberr_t err = DB_SUCCESS;
+  {
+    Clone_notify notifier(Clone_notify::Type::SPACE_ALTER_ENCRYPT_GENERAL_FLAGS,
+                          space->id, false);
+    ut_ad(!notifier.failed());
+
+    /* Reset encryption in progress flag */
+    space->encryption_op_in_progress = Encryption::Progress::NONE;
+
+    rw_lock_x_lock(&space->latch);
+    /* Reset In-memory encryption for tablespace */
+    err = fil_reset_encryption(space->id);
+    rw_lock_x_unlock(&space->latch);
+    ut_ad(err == DB_SUCCESS);
+  }
+
+  if (err != DB_SUCCESS) {
+    return err; /* purecov: inspected */
+  }
+
+  byte encryption_info[Encryption::INFO_SIZE];
+  memset(encryption_info, 0, Encryption::INFO_SIZE);
 
-  /* Don't erase Encryption info from page 0 yet */
+  /* Erase encryption information in page-0 and update space flag. Also reset
+  the progress information in same mtr. */
+  mtr_t mtr;
+
+  mtr_start(&mtr);
 
+  if (!fsp_header_write_encryption(space->id, space->flags, encryption_info,
+                                   true, false, &mtr)) {
+    err = DB_ERROR; /* purecov: inspected */
+  }
+
+  /* Crash before resetting progress on page 0 */
+  DBUG_EXECUTE_IF("alter_encrypt_tablespace_crash_before_resetting_progress",
+                  log_buffer_flush_to_disk();
+                  DBUG_SUICIDE(););
+
+  fsp_header_write_encryption_progress(space->id, space->flags, 0, 0, true,
+                                       &mtr);
+  mtr_commit(&mtr);
+
+  ut_ad(err == DB_SUCCESS);
   return err;
 }
 
-static inline dberr_t init_before_processing(fil_space_t *space,
-                                             space_id_t space_id,
-                                             bool to_encrypt) {
-  /* After following call, following would have been done
-  - For encryption, In-mem encryption information set for tablesapace.
-  - For encryption, encryption Info and space updated flags write to page 0.
-  - In-mem space flags update.
-  - Page 0 update to indicate operation type. */
+/** Find out the place to resume the operation.
+@param[in,out]	space		innodb tablespace
+@param[out]	from_page	page number to resume from
+@return state to resume from */
+static Encryption::Resume_point decrypt_resume_point(fil_space_t *space,
+                                                     page_no_t &from_page) {
+  DBUG_TRACE;
+  bool encryption_flag = FSP_FLAGS_GET_ENCRYPTION(space->flags);
+  from_page = 1;
+
+  if (!encryption_flag) {
+    /* Decryption must have finished already. The encryption flag is reset and
+    persisted at very end. */
+    ut_ad(space->encryption_op_in_progress == Encryption::Progress::NONE);
+
+    return Encryption::Resume_point::DONE;
+  }
+
+  /* Read page 0 and get encryption progress */
+  byte operation;
+  from_page = get_encryption_progress(space, operation) + 1;
 
-  return (to_encrypt ? init_before_encrypt_processing(space, space_id)
-                     : init_before_decrypt_processing(space, space_id));
+  if (operation != Encryption::DECRYPT_IN_PROGRESS) {
+    ut_ad(operation != Encryption::ENCRYPT_IN_PROGRESS);
+    ut_ad(space->encryption_op_in_progress == Encryption::Progress::NONE);
+    /* Decryption is not started. */
+    return Encryption::Resume_point::INIT;
+  }
+
+  ut_ad(space->encryption_op_in_progress == Encryption::Progress::DECRYPTION);
+
+  if (from_page == space->size) {
+    return Encryption::Resume_point::END;
+  }
+
+  return Encryption::Resume_point::PROCESS;
 }
 
-dberr_t fsp_alter_encrypt_tablespace(THD *thd, space_id_t space_id,
-                                     bool to_encrypt, void *dd_space_in) {
+/** Decrypt all pages of a tablespace.
+@param[in,out]	thd		server session THD
+@param[in]	space_id	Tablespace id
+@param[in]	resume		true if resumed after server restart
+@return innodb error code */
+static dberr_t decrypt_tablespace(THD *thd, space_id_t space_id, bool resume) {
+  DBUG_TRACE;
+
   dberr_t err = DB_SUCCESS;
   fil_space_t *space = fil_space_get(space_id);
-  dd::Tablespace *dd_space = reinterpret_cast<dd::Tablespace *>(dd_space_in);
 
-  DBUG_TRACE;
+  Encryption::Resume_point resume_point = Encryption::Resume_point::INIT;
+  page_no_t from_page = 1;
 
-  /* Make an entry in DDL LOG for this tablespace. If an entry for tablespace
-  exists then remove that entry and insert a new one. */
-  encryption_op_type op_type_ddl_log = (to_encrypt) ? ENCRYPTION : DECRYPTION;
-  DDL_Record *old_ddl_rec = log_ddl->find_alter_encrypt_record(space_id);
-  if (DB_SUCCESS != log_ddl->write_alter_encrypt_space_log(
-                        space_id, op_type_ddl_log, old_ddl_rec)) {
-    ib::error(ER_IB_MSG_1283) << "Couldn't write DDL LOG for " << space_id;
-    return DB_ERROR;
+  if (resume) {
+    resume_point = decrypt_resume_point(space, from_page);
   }
 
-  DBUG_EXECUTE_IF("alter_encrypt_tablespace_crash_after_ddl_entry",
-                  DBUG_SUICIDE(););
+  /* While resuming we need to initialize the flags as they
+  are not yet persisted. */
+  if (resume_point == Encryption::Resume_point::END) {
+    /* Set encryption flag and progress information. */
+    decrypt_begin_memory(space);
+  }
 
-  page_no_t from_page = 1;
-  bool initialize = true;
+  switch (resume_point) {
+    case Encryption::Resume_point::INIT:
+      /* Set and persist encryption progress information. */
+      err = decrypt_begin_persist(space);
 
-  if (old_ddl_rec != nullptr) {
-    /* Read page 0 and get encryption progress */
-    byte operation;
-    from_page = get_encryption_progress(space, operation) + 1;
-
-    /* A corner case when crash happened after last page was processed but
-    page 0 wasn't updated with this information. */
-    if (from_page == space->size) {
-      goto all_done;
-    }
-
-    if (from_page == 1) {
-      if ((to_encrypt && FSP_FLAGS_GET_ENCRYPTION(space->flags)) ||
-          (!to_encrypt && !FSP_FLAGS_GET_ENCRYPTION(space->flags))) {
-        /* Crash just before the commit when all the pages have been processed
-        and progress/operation flag was reset. Just update space flags in DD
-        and return. */
-        space->encryption_op_in_progress = NONE;
-
-        /* Update space flags in DD Tablespace object */
-        ut_ad(dd_space != nullptr);
-        dd_space->se_private_data().set(dd_space_key_strings[DD_SPACE_FLAGS],
-                                        static_cast<uint32>(space->flags));
-
-        if (!FSP_FLAGS_GET_ENCRYPTION(space->flags)) {
-          /* Reset In-mem encryption for tablespace */
-          err = fil_reset_encryption(space_id);
-          ut_ad(err == DB_SUCCESS);
-        }
+      ut_ad(err == DB_SUCCESS);
 
-        return err;
-      } else {
-        /* Crash even before the first page could have been processed. In this
-        case, start processing again. */
-        initialize = true;
+      if (err != DB_SUCCESS) {
+        break; /* purecov: deadcode */
       }
-    } else {
-      initialize = false;
-    }
-  }
+      [[fallthrough]];
 
-#ifdef UNIV_DEBUG
-  if (initialize) {
-    if (to_encrypt) {
-      /* Assert that tablespace is not encrypted */
-      ut_ad(!FSP_FLAGS_GET_ENCRYPTION(space->flags));
-    } else {
-      /* Assert that tablespace is encrypted */
-      ut_ad(FSP_FLAGS_GET_ENCRYPTION(space->flags));
-    }
-    ut_ad(space->encryption_op_in_progress == NONE);
-  } else {
-    if (to_encrypt) {
-      /* Updated tablespace flags were written on page 0 before crash. It must
-      say encrypted tablespace. */
-      ut_ad(FSP_FLAGS_GET_ENCRYPTION(space->flags));
-
-      /* In mem operation should have already been set */
-      ut_ad(space->encryption_op_in_progress == ENCRYPTION);
-    } else {
-      /* Updated tablespace flags were not written on page 0 before crash. It
-      must still say encrypted tablespace. */
-      ut_ad(FSP_FLAGS_GET_ENCRYPTION(space->flags));
+    case Encryption::Resume_point::PROCESS:
+      /* Set encryption flag and progress information. */
+      decrypt_begin_memory(space);
+
+      /* Load and flush all pages so that they are all encrypted on disk. */
+      process_all_pages(thd, space, from_page);
+      [[fallthrough]];
+
+    case Encryption::Resume_point::END:
+      /* Reset and persist encryption key and progress information. */
+      err = decrypt_end(space);
+      ut_ad(err == DB_SUCCESS);
+      [[fallthrough]];
 
-      /* In mem operation should have already been set */
-      ut_ad(space->encryption_op_in_progress == DECRYPTION);
-    }
+    case Encryption::Resume_point::DONE:
+      break;
   }
-#endif
 
-  if (initialize) {
-    /* Initialize for encrypt/decrypt */
-    err = init_before_processing(space, space_id, to_encrypt);
-    if (err != DB_SUCCESS) {
-      ut_ad(false);
-      return err;
-    }
-  } else {
-    if (!to_encrypt) {
-      /* Update In mem encryption flag for tablespace */
-      fsp_flags_unset_encryption(space->flags);
-      /* Don't erase Encryption information from page 0 yet */
-    }
-  }
+  return err;
+}
 
-  /* Mark all pages in tablespace dirty */
-  mark_all_page_dirty_in_tablespace(thd, space_id, space->flags, space->size,
-                                    from_page);
+dberr_t fsp_alter_encrypt_tablespace(THD *thd, space_id_t space_id,
+                                     bool to_encrypt, void *dd_space_in) {
+  DBUG_TRACE;
 
-  /* As DMLs are allowed in parallel, pass false for 'strict' */
-  buf_LRU_flush_or_remove_pages(space_id, BUF_REMOVE_FLUSH_WRITE, nullptr,
-                                false);
+  /* Make an entry in DDL LOG for this tablespace. If an entry for tablespace
+  exists then remove that entry and insert a new one. */
+  auto op_type_ddl_log = (to_encrypt) ? Encryption::Progress::ENCRYPTION
+                                      : Encryption::Progress::DECRYPTION;
 
-all_done:
-  /* For unencryption, if server crashed, before tablespace flags were flushed
-  on disk. Set them now. */
-  if (old_ddl_rec && !to_encrypt) {
-    fsp_flags_unset_encryption(space->flags);
+  DDL_Record *old_ddl_rec = log_ddl->find_alter_encrypt_record(space_id);
+
+  if (DB_SUCCESS != log_ddl->write_alter_encrypt_space_log(
+                        space_id, op_type_ddl_log, old_ddl_rec)) {
+    ib::error(ER_IB_MSG_1283) << "Couldn't write DDL LOG for " << space_id;
+    return DB_ERROR;
   }
 
-  mtr_t mtr;
+  DBUG_EXECUTE_IF("alter_encrypt_tablespace_crash_after_ddl_entry",
+                  DBUG_SUICIDE(););
 
-  /* If it was an Unencryption operation */
-  if (!to_encrypt) {
-    /* Crash before updating tablespace flags on page 0 */
-    DBUG_EXECUTE_IF("alter_encrypt_tablespace_crash_before_updating_flags",
-                    log_buffer_flush_to_disk();
-                    DBUG_SUICIDE(););
+  bool resume = (old_ddl_rec != nullptr);
 
-    ut_ad(!FSP_FLAGS_GET_ENCRYPTION(space->flags));
+  dberr_t err = DB_SUCCESS;
 
-    byte encryption_info[Encryption::INFO_SIZE];
-    memset(encryption_info, 0, Encryption::INFO_SIZE);
-    /* Now on page 0
-            - erase Encryption information
-            - write updated Tablespace flag */
-    mtr_start(&mtr);
-    if (!fsp_header_write_encryption(space_id, space->flags, encryption_info,
-                                     true, false, &mtr)) {
-      ut_ad(0);
-    }
-    mtr_commit(&mtr);
+  if (to_encrypt) {
+    err = encrypt_tablespace(thd, space_id, resume);
 
-    rw_lock_x_lock(&space->latch);
-    /* Reset In-mem encryption for tablespace */
-    err = fil_reset_encryption(space_id);
-    rw_lock_x_unlock(&space->latch);
-    ut_ad(err == DB_SUCCESS);
+  } else {
+    err = decrypt_tablespace(thd, space_id, resume);
   }
 
-  /* Reset encryption in progress flag */
-  space->encryption_op_in_progress = NONE;
-
   /* Update space flags in DD Tablespace object */
+  dd::Tablespace *dd_space = reinterpret_cast<dd::Tablespace *>(dd_space_in);
   ut_ad(dd_space != nullptr);
+  fil_space_t *space = fil_space_get(space_id);
+
   dd_space->se_private_data().set(dd_space_key_strings[DD_SPACE_FLAGS],
                                   static_cast<uint32>(space->flags));
 
-  /* Crash before resetting progress on page 0 */
-  DBUG_EXECUTE_IF("alter_encrypt_tablespace_crash_before_resetting_progress",
-                  log_buffer_flush_to_disk();
-                  DBUG_SUICIDE(););
-
-  /* Erase Operation type and encryption progress from page 0 */
-  mtr_start(&mtr);
-  fsp_header_write_encryption_progress(space_id, space->flags, 0, 0, true,
-                                       &mtr);
-  mtr_commit(&mtr);
-
   /* Crash before flushing page 0 on disk */
   DBUG_EXECUTE_IF("alter_encrypt_tablespace_crash_before_flushing_page_0",
                   log_buffer_flush_to_disk();
@@ -4521,7 +4728,9 @@
 
   /* Flush page 0 here because MEB backup needs to read the key from page 0
   before redo log is applied. This is not needed for innodb recovery and
-  ideally we would like to get rid of all such special purpose code. */
+  ideally we would like to get rid of all such special purpose code. We should
+  replace this expensive call to flush all by an interface that would flush only
+  page-0.*/
   buf_LRU_flush_or_remove_pages(space_id, BUF_REMOVE_FLUSH_WRITE, nullptr,
                                 false);
 
@@ -4529,7 +4738,6 @@
   DBUG_EXECUTE_IF("alter_encrypt_tablespace_crash_after_flushing_page_0",
                   log_buffer_flush_to_disk();
                   DBUG_SUICIDE(););
-
   return err;
 }
 
@@ -4550,7 +4758,7 @@
     ut_ad(space->encryption_klen == 0);
     ut_ad(space->encryption_type == Encryption::NONE);
   }
-  ut_ad(space->encryption_op_in_progress == NONE);
+  ut_ad(space->encryption_op_in_progress == Encryption::Progress::NONE);
 }
 #endif
 
@@ -4584,7 +4792,7 @@
       return true;
     }
   } else {
-    dberr_t err MY_ATTRIBUTE((unused)) = fil_set_encryption(
+    dberr_t err [[maybe_unused]] = fil_set_encryption(
         space->id, Encryption::AES, encryption_key, encryption_iv);
     ut_ad(err == DB_SUCCESS);
     if (err != DB_SUCCESS) {
@@ -4599,12 +4807,13 @@
 static const std::string dec("DECRYPTION");
 static const std::string none("NONE");
 
-static inline const std::string &get_encryption_op_str(encryption_op_type op) {
+static inline const std::string &get_encryption_op_str(
+    Encryption::Progress op) {
   switch (op) {
-    case ENCRYPTION:
+    case Encryption::Progress::ENCRYPTION:
       return enc;
       break;
-    case DECRYPTION:
+    case Encryption::Progress::DECRYPTION:
       return dec;
       break;
     default:
@@ -4635,7 +4844,7 @@
 
     /* If encryption was going on, make sure encryption information is
     read/loaded from disk. */
-    if (it->get_encryption_type() == ENCRYPTION &&
+    if (it->get_encryption_type() == Encryption::Progress::ENCRYPTION &&
         space->encryption_type == Encryption::NONE) {
       if (load_encryption_from_header(space)) {
         ib::error() << "Encryption information can't be read for tablesapce "
@@ -4669,7 +4878,7 @@
 
   std::list<MDL_ticket *>::iterator mdl_it = shared_mdl_list.begin();
   for (auto it : ts_encrypt_ddl_records) {
-    ut_ad(it->get_encryption_type() != NONE);
+    ut_ad(it->get_encryption_type() != Encryption::Progress::NONE);
     ut_ad(mdl_it != shared_mdl_list.end());
 
     space_id_t space_id = it->get_space_id();
@@ -4690,7 +4899,8 @@
 
     /* Call server API to resume operation */
     bool res = dd::alter_tablespace_encryption(
-        thd, space->name, (it->get_encryption_type() == ENCRYPTION));
+        thd, space->name,
+        (it->get_encryption_type() == Encryption::Progress::ENCRYPTION));
     if (res) {
       ib::error(ER_IB_MSG_1280)
           << get_encryption_op_str(it->get_encryption_type())
@@ -4720,7 +4930,7 @@
 
   for (auto &record : ts_encrypt_ddl_records) {
     ut_ad(!record->get_deletable());
-    UT_DELETE(record);
+    ut::delete_(record);
   }
   ts_encrypt_ddl_records.clear();
 
@@ -4734,16 +4944,11 @@
 
 /* Initiate roll-forward of alter encrypt in background thread */
 void fsp_init_resume_alter_encrypt_tablespace() {
-#ifdef UNIV_PFS_THREAD
-  THD *thd =
-      create_thd(false, true, true, srv_ts_alter_encrypt_thread_key.m_value);
-#else
-  THD *thd = create_thd(false, true, true, 0);
-#endif
+  THD *thd = create_internal_thd();
 
   resume_alter_encrypt_tablespace(thd);
 
-  destroy_thd(thd);
+  destroy_internal_thd(thd);
 }
 
 void File_segment_inode::write_not_full_n_used(uint32_t n_used) {
diff -Nru mysql-8.0-8.0.26/storage/innobase/fsp/fsp0sysspace.cc mysql-8.0-8.0.27/storage/innobase/fsp/fsp0sysspace.cc
--- mysql-8.0-8.0.26/storage/innobase/fsp/fsp0sysspace.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/fsp/fsp0sysspace.cc	2021-09-28 11:46:34.000000000 +0000
@@ -154,7 +154,7 @@
       ib::error(ER_IB_MSG_431) << "File Path Specification '" << filepath_spec
                                << "' is missing a file name.";
 
-      ut_free(input_str);
+      ut::free(input_str);
       return (false);
     }
 
@@ -162,7 +162,7 @@
       ib::error(ER_IB_MSG_432) << "File Path Specification '" << filepath_spec
                                << "' is missing a file size.";
 
-      ut_free(input_str);
+      ut::free(input_str);
       return (false);
     }
 
@@ -176,7 +176,7 @@
           << "Invalid File Path Specification: '" << filepath_spec
           << "'. An invalid file size was specified.";
 
-      ut_free(input_str);
+      ut::free(input_str);
       return (false);
     }
 
@@ -199,7 +199,7 @@
             << "'. Only the last"
                " file defined can be 'autoextend'.";
 
-        ut_free(input_str);
+        ut::free(input_str);
         return (false);
       }
     }
@@ -215,7 +215,7 @@
             << "' Tablespace"
                " doesn't support raw devices";
 
-        ut_free(input_str);
+        ut::free(input_str);
         return (false);
       }
 
@@ -232,7 +232,7 @@
           << "File Path Specification: '" << filepath_spec
           << "' has unrecognized characters after '" << input_str << "'";
 
-      ut_free(input_str);
+      ut::free(input_str);
       return (false);
     }
   }
@@ -242,7 +242,7 @@
                              << "' must contain"
                                 " at least one data file definition";
 
-    ut_free(input_str);
+    ut::free(input_str);
     return (false);
   }
 
@@ -307,7 +307,7 @@
 
   ut_ad(n_files == ulint(m_files.size()));
 
-  ut_free(input_str);
+  ut::free(input_str);
 
   return (true);
 }
@@ -424,13 +424,13 @@
       written over */
       m_created_new_raw = true;
 
-      /* Fall through. */
+      [[fallthrough]];
 
     case SRV_OLD_RAW:
 
       srv_start_raw_disk_in_use = TRUE;
 
-      /* Fall through. */
+      [[fallthrough]];
 
     case SRV_NOT_RAW:
       err =
@@ -459,7 +459,7 @@
       written over */
       m_created_new_raw = true;
 
-      /* Fall through */
+      [[fallthrough]];
 
     case SRV_OLD_RAW:
       srv_start_raw_disk_in_use = TRUE;
@@ -473,7 +473,7 @@
         return (DB_ERROR);
       }
 
-      /* Fall through */
+      [[fallthrough]];
 
     case SRV_NOT_RAW:
       err =
@@ -541,7 +541,8 @@
     err = it->validate_first_page(it->m_space_id, flushed_lsn, false);
 
     if (err != DB_SUCCESS &&
-        (retry == 1 || it->restore_from_doublewrite(0) != DB_SUCCESS)) {
+        (retry == 1 || it->open_or_create(srv_read_only_mode) != DB_SUCCESS ||
+         it->restore_from_doublewrite(0) != DB_SUCCESS)) {
       it->close();
 
       return (err);
diff -Nru mysql-8.0-8.0.26/storage/innobase/fts/fts0ast.cc mysql-8.0-8.0.27/storage/innobase/fts/fts0ast.cc
--- mysql-8.0-8.0.26/storage/innobase/fts/fts0ast.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/fts/fts0ast.cc	2021-09-28 11:46:34.000000000 +0000
@@ -54,7 +54,8 @@
 static fts_ast_node_t *fts_ast_node_create(void) {
   fts_ast_node_t *node;
 
-  node = (fts_ast_node_t *)ut_zalloc_nokey(sizeof(*node));
+  node = (fts_ast_node_t *)ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY,
+                                              sizeof(*node));
 
   return (node);
 }
@@ -322,7 +323,7 @@
   /*!< Get next node before freeing the node itself */
   next_node = node->next;
 
-  ut_free(node);
+  ut::free(node);
 
   return (next_node);
 }
@@ -408,7 +409,7 @@
       node->term.ptr = nullptr;
     }
 
-    ut_free(node);
+    ut::free(node);
     node = next;
   }
 
@@ -657,9 +658,10 @@
   ut_ad(len > 0);
 
   ast_str = static_cast<fts_ast_string_t *>(
-      ut_malloc_nokey(sizeof(fts_ast_string_t)));
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sizeof(fts_ast_string_t)));
 
-  ast_str->str = static_cast<byte *>(ut_malloc_nokey(len + 1));
+  ast_str->str = static_cast<byte *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, len + 1));
 
   ast_str->len = len;
   memcpy(ast_str->str, str, len);
@@ -673,8 +675,8 @@
 @param[in,out] ast_str		string to free */
 void fts_ast_string_free(fts_ast_string_t *ast_str) {
   if (ast_str != nullptr) {
-    ut_free(ast_str->str);
-    ut_free(ast_str);
+    ut::free(ast_str->str);
+    ut::free(ast_str);
   }
 }
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/fts/fts0blex.cc mysql-8.0-8.0.27/storage/innobase/fts/fts0blex.cc
--- mysql-8.0-8.0.26/storage/innobase/fts/fts0blex.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/fts/fts0blex.cc	2021-09-28 11:46:34.000000000 +0000
@@ -344,9 +344,9 @@
 YY_BUFFER_STATE fts0b_scan_string (yyconst char *yy_str ,yyscan_t yyscanner );
 YY_BUFFER_STATE fts0b_scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner );
 
-void *fts0balloc (yy_size_t , yyscan_t yyscanner MY_ATTRIBUTE((unused)) );
-void *fts0brealloc (void *,yy_size_t , yyscan_t yyscanner MY_ATTRIBUTE((unused)) );
-void fts0bfree (void * , yyscan_t yyscanner MY_ATTRIBUTE((unused)) );
+void *fts0balloc (yy_size_t , yyscan_t yyscanner [[maybe_unused]] );
+void *fts0brealloc (void *,yy_size_t , yyscan_t yyscanner [[maybe_unused]] );
+void fts0bfree (void * , yyscan_t yyscanner [[maybe_unused]] );
 
 #define yy_new_buffer fts0b_create_buffer
 
@@ -386,7 +386,7 @@
 static yy_state_type yy_get_previous_state (yyscan_t yyscanner );
 static yy_state_type yy_try_NUL_trans (yy_state_type current_state  ,yyscan_t yyscanner);
 static int yy_get_next_buffer (yyscan_t yyscanner );
-static void yy_fatal_error (yyconst char msg[] , yyscan_t yyscanner MY_ATTRIBUTE((unused)) );
+static void yy_fatal_error (yyconst char msg[] , yyscan_t yyscanner [[maybe_unused]] );
 
 /* Done after the current pattern has been matched and before the
  * corresponding action - sets up yytext.
@@ -600,11 +600,11 @@
 #endif
 
 #ifndef yytext_ptr
-static void yy_flex_strncpy (char *,yyconst char *,int , yyscan_t yyscanner MY_ATTRIBUTE((unused)));
+static void yy_flex_strncpy (char *,yyconst char *,int , yyscan_t yyscanner [[maybe_unused]]);
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * , yyscan_t yyscanner MY_ATTRIBUTE((unused)));
+static int yy_flex_strlen (yyconst char * , yyscan_t yyscanner [[maybe_unused]]);
 #endif
 
 #ifndef YY_NO_INPUT
@@ -1631,7 +1631,7 @@
 #define YY_EXIT_FAILURE 2
 #endif
 
-static void yy_fatal_error (yyconst char* msg ,  yyscan_t yyscanner MY_ATTRIBUTE((unused)))
+static void yy_fatal_error (yyconst char* msg ,  yyscan_t yyscanner [[maybe_unused]])
 {
     	(void) fprintf( stderr, "%s\n", msg );
 	exit( YY_EXIT_FAILURE );
@@ -1932,7 +1932,7 @@
  */
 
 #ifndef yytext_ptr
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ,  yyscan_t yyscanner MY_ATTRIBUTE((unused)))
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ,  yyscan_t yyscanner [[maybe_unused]])
 {
 	int i;
 	for ( i = 0; i < n; ++i )
@@ -1941,7 +1941,7 @@
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * s ,  yyscan_t yyscanner MY_ATTRIBUTE((unused)))
+static int yy_flex_strlen (yyconst char * s ,  yyscan_t yyscanner [[maybe_unused]])
 {
 	int n;
 	for ( n = 0; s[n]; ++n )
@@ -1951,12 +1951,12 @@
 }
 #endif
 
-void *fts0balloc (yy_size_t  size ,  yyscan_t yyscanner MY_ATTRIBUTE((unused)))
+void *fts0balloc (yy_size_t  size ,  yyscan_t yyscanner [[maybe_unused]])
 {
 	return (void *) malloc( size );
 }
 
-void *fts0brealloc  (void * ptr, yy_size_t  size ,  yyscan_t yyscanner MY_ATTRIBUTE((unused)))
+void *fts0brealloc  (void * ptr, yy_size_t  size ,  yyscan_t yyscanner [[maybe_unused]])
 {
 	/* The cast to (char *) in the following accommodates both
 	 * implementations that use char* generic pointers, and those
@@ -1968,7 +1968,7 @@
 	return (void *) realloc( (char *) ptr, size );
 }
 
-void fts0bfree (void * ptr ,  yyscan_t yyscanner MY_ATTRIBUTE((unused)))
+void fts0bfree (void * ptr ,  yyscan_t yyscanner [[maybe_unused]])
 {
 	free( (char *) ptr );	/* see fts0brealloc() for (char *) cast */
 }
diff -Nru mysql-8.0-8.0.26/storage/innobase/fts/fts0config.cc mysql-8.0-8.0.27/storage/innobase/fts/fts0config.cc
--- mysql-8.0-8.0.26/storage/innobase/fts/fts0config.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/fts/fts0config.cc	2021-09-28 11:46:34.000000000 +0000
@@ -134,8 +134,8 @@
   len = strlen(param);
 
   /* Caller is responsible for deleting name. */
-  name = static_cast<char *>(
-      ut_malloc_nokey(len + FTS_AUX_MIN_TABLE_ID_LENGTH + 2));
+  name = static_cast<char *>(ut::malloc_withkey(
+      UT_NEW_THIS_FILE_PSI_KEY, len + FTS_AUX_MIN_TABLE_ID_LENGTH + 2));
   ::strcpy(name, param);
   name[len] = '_';
 
@@ -167,7 +167,7 @@
 
   error = fts_config_get_value(trx, &fts_table, name, value);
 
-  ut_free(name);
+  ut::free(name);
 
   return (error);
 }
@@ -259,7 +259,7 @@
 
   error = fts_config_set_value(trx, &fts_table, name, value);
 
-  ut_free(name);
+  ut::free(name);
 
   return (error);
 }
@@ -278,7 +278,8 @@
   /* We set the length of value to the max bytes it can hold. This
   information is used by the callback that reads the value.*/
   value.f_len = FTS_MAX_CONFIG_VALUE_LEN;
-  value.f_str = static_cast<byte *>(ut_malloc_nokey(value.f_len + 1));
+  value.f_str = static_cast<byte *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, value.f_len + 1));
 
   error = fts_config_get_index_value(trx, index, name, &value);
 
@@ -289,7 +290,7 @@
     *int_value = strtoul((char *)value.f_str, NULL, 10);
   }
 
-  ut_free(value.f_str);
+  ut::free(value.f_str);
 
   return (error);
 }
@@ -307,7 +308,8 @@
   /* We set the length of value to the max bytes it can hold. This
   information is used by the callback that reads the value.*/
   value.f_len = FTS_MAX_CONFIG_VALUE_LEN;
-  value.f_str = static_cast<byte *>(ut_malloc_nokey(value.f_len + 1));
+  value.f_str = static_cast<byte *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, value.f_len + 1));
 
   // FIXME: Get rid of snprintf
   ut_a(FTS_MAX_INT_LEN < FTS_MAX_CONFIG_VALUE_LEN);
@@ -322,7 +324,7 @@
         << "(" << ut_strerr(error) << ") writing `" << name << "'";
   }
 
-  ut_free(value.f_str);
+  ut::free(value.f_str);
 
   return (error);
 }
@@ -342,7 +344,8 @@
   /* We set the length of value to the max bytes it can hold. This
   information is used by the callback that reads the value.*/
   value.f_len = FTS_MAX_CONFIG_VALUE_LEN;
-  value.f_str = static_cast<byte *>(ut_malloc_nokey(value.f_len + 1));
+  value.f_str = static_cast<byte *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, value.f_len + 1));
 
   error = fts_config_get_value(trx, fts_table, name, &value);
 
@@ -353,7 +356,7 @@
     *int_value = strtoul((char *)value.f_str, nullptr, 10);
   }
 
-  ut_free(value.f_str);
+  ut::free(value.f_str);
 
   return (error);
 }
@@ -372,7 +375,8 @@
   /* We set the length of value to the max bytes it can hold. This
   information is used by the callback that reads the value.*/
   value.f_len = FTS_MAX_CONFIG_VALUE_LEN;
-  value.f_str = static_cast<byte *>(ut_malloc_nokey(value.f_len + 1));
+  value.f_str = static_cast<byte *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, value.f_len + 1));
 
   ut_a(FTS_MAX_INT_LEN < FTS_MAX_CONFIG_VALUE_LEN);
 
@@ -386,7 +390,7 @@
         << "(" << ut_strerr(error) << ") writing `" << name << "'";
   }
 
-  ut_free(value.f_str);
+  ut::free(value.f_str);
 
   return (error);
 }
diff -Nru mysql-8.0-8.0.26/storage/innobase/fts/fts0fts.cc mysql-8.0-8.0.27/storage/innobase/fts/fts0fts.cc
--- mysql-8.0-8.0.26/storage/innobase/fts/fts0fts.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/fts/fts0fts.cc	2021-09-28 11:46:34.000000000 +0000
@@ -205,7 +205,7 @@
 @param[in]	fts_indexes	affected FTS indexes
 @return true if successful */
 static ulint fts_add_doc_by_id(fts_trx_table_t *ftt, doc_id_t doc_id,
-                               ib_vector_t *fts_indexes MY_ATTRIBUTE((unused)));
+                               ib_vector_t *fts_indexes [[maybe_unused]]);
 
 /** Update the last document id. This function could create a new
  transaction to update the last document id.
@@ -284,7 +284,8 @@
     return (cs);
   }
 
-  ib::fatal(ER_IB_MSG_461) << "Unable to find charset-collation " << cs_num;
+  ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_461)
+      << "Unable to find charset-collation " << cs_num;
   return (nullptr);
 }
 
@@ -504,6 +505,7 @@
   cache->sync_heap->arg = mem_heap_create(1024);
 
   cache->total_size = 0;
+  cache->total_size_before_sync = 0;
 
   mutex_enter((ib_mutex_t *)&cache->deleted_lock);
   cache->deleted_doc_ids =
@@ -898,12 +900,12 @@
       fts_node_t *fts_node =
           static_cast<fts_node_t *>(ib_vector_get(word->nodes, i));
 
-      ut_free(fts_node->ilist);
+      ut::free(fts_node->ilist);
       fts_node->ilist = nullptr;
     }
 
     /* NOTE: We are responsible for free'ing the node */
-    ut_free(rbt_remove_node(words, rbt_node));
+    ut::free(rbt_remove_node(words, rbt_node));
   }
 }
 
@@ -1108,7 +1110,8 @@
       new_size = (ulint)(1.2 * new_size);
     }
 
-    ilist = static_cast<byte *>(ut_malloc_nokey(new_size));
+    ilist = static_cast<byte *>(
+        ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, new_size));
     ptr = ilist + node->ilist_size;
 
     node->ilist_size_alloc = new_size;
@@ -1139,7 +1142,7 @@
     new one into place in the node. */
     if (node->ilist_size > 0) {
       memcpy(ilist, node->ilist, node->ilist_size);
-      ut_free(node->ilist);
+      ut::free(node->ilist);
       if (cache) {
         cache->total_size -= node->ilist_size;
       }
@@ -1186,7 +1189,7 @@
     word = fts_tokenizer_word_get(cache, index_cache, &token->text);
 
     if (!word) {
-      ut_free(rbt_remove_node(tokens, node));
+      ut::free(rbt_remove_node(tokens, node));
       continue;
     }
 
@@ -1207,7 +1210,7 @@
 
     fts_cache_node_add_positions(cache, fts_node, doc_id, token->positions);
 
-    ut_free(rbt_remove_node(tokens, node));
+    ut::free(rbt_remove_node(tokens, node));
   }
 
   ut_a(rbt_empty(tokens));
@@ -1260,7 +1263,7 @@
 
   while (aux_vec->aux_name.size() > 0) {
     char *name = aux_vec->aux_name.back();
-    ut_free(name);
+    ut::free(name);
     aux_vec->aux_name.pop_back();
   }
 
@@ -1328,7 +1331,7 @@
 
 /** Rename a single auxiliary table due to database name change.
  @return DB_SUCCESS or error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t fts_rename_one_aux_table(
+[[nodiscard]] static dberr_t fts_rename_one_aux_table(
     const char *new_name,           /*!< in: new parent tbl name */
     const char *fts_table_old_name, /*!< in: old aux tbl name */
     trx_t *trx,                     /*!< in: transaction */
@@ -1446,9 +1449,9 @@
 @param[in,out]	fts_table	table with fts index
 @param[in,out]	aux_vec		fts table name vector
 @return DB_SUCCESS or error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    fts_drop_common_tables(trx_t *trx, fts_table_t *fts_table,
-                           aux_name_vec_t *aux_vec) {
+[[nodiscard]] static dberr_t fts_drop_common_tables(trx_t *trx,
+                                                    fts_table_t *fts_table,
+                                                    aux_name_vec_t *aux_vec) {
   ulint i;
   dberr_t error = DB_SUCCESS;
 
@@ -1610,8 +1613,8 @@
 @param[in]	fts	fts instance
 @param[in,out]	aux_vec	fts aux table name vector
 @return DB_SUCCESS or error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    fts_drop_all_index_tables(trx_t *trx, fts_t *fts, aux_name_vec_t *aux_vec) {
+[[nodiscard]] static dberr_t fts_drop_all_index_tables(
+    trx_t *trx, fts_t *fts, aux_name_vec_t *aux_vec) {
   dberr_t error = DB_SUCCESS;
 
   for (ulint i = 0; fts->indexes != nullptr && i < ib_vector_size(fts->indexes);
@@ -1658,8 +1661,8 @@
 @param[in]	thd	thread locking the AUX table
 @param[in,out]	fts_table	table with fts index
 @return DB_SUCCESS or error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    fts_lock_common_tables(THD *thd, fts_table_t *fts_table) {
+[[nodiscard]] static dberr_t fts_lock_common_tables(THD *thd,
+                                                    fts_table_t *fts_table) {
   for (ulint i = 0; fts_common_tables[i] != nullptr; ++i) {
     fts_table->suffix = fts_common_tables[i];
 
@@ -1713,8 +1716,7 @@
 @param[in]	thd	thread locking the AUX table
 @param[in]	fts	fts instance
 @return DB_SUCCESS or error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    fts_lock_all_index_tables(THD *thd, fts_t *fts) {
+[[nodiscard]] static dberr_t fts_lock_all_index_tables(THD *thd, fts_t *fts) {
   dberr_t error = DB_SUCCESS;
 
   for (ulint i = 0; fts->indexes != nullptr && i < ib_vector_size(fts->indexes);
@@ -2609,7 +2611,7 @@
         ib_vector_free(row->fts_indexes);
       }
 
-      ut_free(rbt_remove_node(rows, parent.last));
+      ut::free(rbt_remove_node(rows, parent.last));
       row = nullptr;
     } else if (row->fts_indexes != nullptr) {
       ib_vector_free(row->fts_indexes);
@@ -2697,7 +2699,7 @@
   information is used by the callback that reads the value. */
   value.f_n_char = 0;
   value.f_len = FTS_MAX_CONFIG_VALUE_LEN;
-  value.f_str = ut_malloc_nokey(value.f_len + 1);
+  value.f_str = ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, value.f_len + 1);
 
   error =
       fts_config_get_value(trx, fts_table, FTS_MAX_CACHE_SIZE_IN_MB, &value);
@@ -2734,7 +2736,7 @@
                                 " cache config value from config table";
   }
 
-  ut_free(value.f_str);
+  ut::free(value.f_str);
 
   return (cache_size_in_mb * 1024 * 1024);
 }
@@ -3021,9 +3023,9 @@
 
 /** Do commit-phase steps necessary for the deletion of a row.
  @return DB_SUCCESS or error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    fts_delete(fts_trx_table_t *ftt, /*!< in: FTS trx table */
-               fts_trx_row_t *row)   /*!< in: row */
+[[nodiscard]] static dberr_t fts_delete(
+    fts_trx_table_t *ftt, /*!< in: FTS trx table */
+    fts_trx_row_t *row)   /*!< in: row */
 {
   que_t *graph;
   fts_table_t fts_table;
@@ -3110,9 +3112,9 @@
 
 /** Do commit-phase steps necessary for the modification of a row.
  @return DB_SUCCESS or error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    fts_modify(fts_trx_table_t *ftt, /*!< in: FTS trx table */
-               fts_trx_row_t *row)   /*!< in: row */
+[[nodiscard]] static dberr_t fts_modify(
+    fts_trx_table_t *ftt, /*!< in: FTS trx table */
+    fts_trx_row_t *row)   /*!< in: row */
 {
   dberr_t error;
 
@@ -3172,8 +3174,8 @@
 /** The given transaction is about to be committed; do whatever is necessary
  from the FTS system's POV.
  @return DB_SUCCESS or error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    fts_commit_table(fts_trx_table_t *ftt) /*!< in: FTS table to commit*/
+[[nodiscard]] static dberr_t fts_commit_table(
+    fts_trx_table_t *ftt) /*!< in: FTS table to commit*/
 {
   const ib_rbt_node_t *node;
   ib_rbt_t *rows;
@@ -3556,8 +3558,7 @@
 @param[in]	fts_indexes	affected FTS indexes
 @return true if successful */
 static ulint fts_add_doc_by_id(fts_trx_table_t *ftt, doc_id_t doc_id,
-                               ib_vector_t *fts_indexes
-                                   MY_ATTRIBUTE((unused))) {
+                               ib_vector_t *fts_indexes [[maybe_unused]]) {
   mtr_t mtr;
   mem_heap_t *heap;
   btr_pcur_t pcur;
@@ -3668,7 +3669,7 @@
                              offsets, &doc);
 
       if (doc.found) {
-        ibool success MY_ATTRIBUTE((unused));
+        ibool success [[maybe_unused]];
 
         btr_pcur_store_position(doc_pcur, &mtr);
         mtr_commit(&mtr);
@@ -3684,9 +3685,12 @@
                           doc.tokens);
 
         bool need_sync = false;
-        if ((cache->total_size > fts_max_cache_size / 10 || fts_need_sync) &&
+        if ((cache->total_size - cache->total_size_before_sync >
+                 fts_max_cache_size / 10 ||
+             fts_need_sync) &&
             !cache->sync->in_progress) {
           need_sync = true;
+          cache->total_size_before_sync = cache->total_size;
         }
 
         rw_lock_x_unlock(&table->fts->cache->lock);
@@ -3762,7 +3766,7 @@
 doc_id_t fts_get_max_doc_id(dict_table_t *table) /*!< in: user table */
 {
   dict_index_t *index;
-  dict_field_t *dfield MY_ATTRIBUTE((unused)) = nullptr;
+  dict_field_t *dfield [[maybe_unused]] = nullptr;
   doc_id_t doc_id = 0;
   mtr_t mtr;
   btr_pcur_t pcur;
@@ -4006,9 +4010,9 @@
 
 /** Add rows to the DELETED_CACHE table.
  @return DB_SUCCESS if all went well else error code*/
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    fts_sync_add_deleted_cache(fts_sync_t *sync,     /*!< in: sync state */
-                               ib_vector_t *doc_ids) /*!< in: doc ids to add */
+[[nodiscard]] static dberr_t fts_sync_add_deleted_cache(
+    fts_sync_t *sync,     /*!< in: sync state */
+    ib_vector_t *doc_ids) /*!< in: doc ids to add */
 {
   ulint i;
   pars_info_t *info;
@@ -4061,7 +4065,7 @@
 @param[in]      sync_start_time Holds the timestamp of start of sync
                                 for deducing the length of sync time
 @return DB_SUCCESS if all went well else error code */
-static MY_ATTRIBUTE((nonnull, warn_unused_result)) dberr_t
+[[nodiscard]] static MY_ATTRIBUTE((nonnull)) dberr_t
     fts_sync_write_words(trx_t *trx, fts_index_cache_t *index_cache,
                          bool unlock_cache, ib_time_t sync_start_time) {
   fts_table_t fts_table;
@@ -4193,9 +4197,9 @@
 /** Run SYNC on the table, i.e., write out data from the index specific
  cache to the FTS aux INDEX table and FTS aux doc id stats table.
  @return DB_SUCCESS if all OK */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    fts_sync_index(fts_sync_t *sync,               /*!< in: sync state */
-                   fts_index_cache_t *index_cache) /*!< in: index cache */
+[[nodiscard]] static dberr_t fts_sync_index(
+    fts_sync_t *sync,               /*!< in: sync state */
+    fts_index_cache_t *index_cache) /*!< in: index cache */
 {
   trx_t *trx = sync->trx;
 
@@ -4253,8 +4257,7 @@
 /** Commit the SYNC, change state of processed doc ids etc.
 @param[in,out]	sync	sync state
 @return DB_SUCCESS if all OK */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    fts_sync_commit(fts_sync_t *sync) {
+[[nodiscard]] static dberr_t fts_sync_commit(fts_sync_t *sync) {
   dberr_t error;
   trx_t *trx = sync->trx;
   fts_cache_t *cache = sync->table->fts->cache;
@@ -5070,7 +5073,7 @@
       row->fts_indexes = nullptr;
     }
 
-    ut_free(rbt_remove_node(rows, node));
+    ut::free(rbt_remove_node(rows, node));
   }
 
   ut_a(rbt_empty(rows));
@@ -5114,7 +5117,7 @@
     }
 
     /* NOTE: We are responsible for free'ing the node */
-    ut_free(rbt_remove_node(tables, node));
+    ut::free(rbt_remove_node(tables, node));
   }
 
   ut_a(rbt_empty(tables));
@@ -5651,14 +5654,14 @@
 
       switch (l_row->state) {
         case FTS_INSERT:
-          ut_free(rbt_remove_node(s_rows, parent.last));
+          ut::free(rbt_remove_node(s_rows, parent.last));
           break;
 
         case FTS_DELETE:
           if (s_row->state == FTS_NOTHING) {
             s_row->state = FTS_INSERT;
           } else if (s_row->state == FTS_DELETE) {
-            ut_free(rbt_remove_node(s_rows, parent.last));
+            ut::free(rbt_remove_node(s_rows, parent.last));
           }
           break;
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/fts/fts0opt.cc mysql-8.0-8.0.27/storage/innobase/fts/fts0opt.cc
--- mysql-8.0-8.0.26/storage/innobase/fts/fts0opt.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/fts/fts0opt.cc	2021-09-28 11:46:34.000000000 +0000
@@ -386,7 +386,8 @@
 
       case 4: /* ILIST */
         node->ilist_size_alloc = node->ilist_size = len;
-        node->ilist = static_cast<byte *>(ut_malloc_nokey(len));
+        node->ilist = static_cast<byte *>(
+            ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, len));
         if (len > 0) memcpy(node->ilist, data, len);
         break;
 
@@ -564,7 +565,7 @@
 
         ut_a(zip->pos < ib_vector_size(zip->blocks));
 
-        ut_free(ib_vector_getp(zip->blocks, prev));
+        ut::free(ib_vector_getp(zip->blocks, prev));
         ib_vector_set(zip->blocks, prev, &null);
       }
 
@@ -614,7 +615,7 @@
   if (zip->status != Z_OK) {
     for (ulint i = 0; i < ib_vector_size(zip->blocks); ++i) {
       if (ib_vector_getp(zip->blocks, i)) {
-        ut_free(ib_vector_getp(zip->blocks, i));
+        ut::free(ib_vector_getp(zip->blocks, i));
         ib_vector_set(zip->blocks, i, &null);
       }
     }
@@ -665,7 +666,8 @@
     if (zip->zp->avail_out == 0) {
       byte *block;
 
-      block = static_cast<byte *>(ut_malloc_nokey(zip->block_sz));
+      block = static_cast<byte *>(
+          ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, zip->block_sz));
 
       ib_vector_push(zip->blocks, &block);
 
@@ -719,7 +721,8 @@
 
     ut_a(zip->zp->avail_out == 0);
 
-    block = static_cast<byte *>(ut_malloc_nokey(FTS_MAX_WORD_LEN + 1));
+    block = static_cast<byte *>(
+        ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, FTS_MAX_WORD_LEN + 1));
 
     ib_vector_push(zip->blocks, &block);
 
@@ -741,7 +744,7 @@
 /** Read the words from the FTS INDEX.
  @return DB_SUCCESS if all OK, DB_TABLE_NOT_FOUND if no more indexes
          to search else error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t fts_index_fetch_words(
+[[nodiscard]] static dberr_t fts_index_fetch_words(
     fts_optimize_t *optim,    /*!< in: optimize scratch pad */
     const fts_string_t *word, /*!< in: get words greater than this
                                word */
@@ -1078,16 +1081,18 @@
 
     new_size = enc_len > FTS_ILIST_MAX_SIZE ? enc_len : FTS_ILIST_MAX_SIZE;
 
-    node->ilist = static_cast<byte *>(ut_malloc_nokey(new_size));
+    node->ilist = static_cast<byte *>(
+        ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, new_size));
     node->ilist_size_alloc = new_size;
 
   } else if ((node->ilist_size + enc_len) > node->ilist_size_alloc) {
     ulint new_size = node->ilist_size + enc_len;
-    byte *ilist = static_cast<byte *>(ut_malloc_nokey(new_size));
+    byte *ilist = static_cast<byte *>(
+        ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, new_size));
 
     memcpy(ilist, node->ilist, node->ilist_size);
 
-    ut_free(node->ilist);
+    ut::free(node->ilist);
 
     node->ilist = ilist;
     node->ilist_size_alloc = new_size;
@@ -1206,7 +1211,7 @@
 
 /** Determine the starting pos within the deleted doc id vector for a word.
  @return delete position */
-static MY_ATTRIBUTE((warn_unused_result)) int fts_optimize_deleted_pos(
+[[nodiscard]] static int fts_optimize_deleted_pos(
     fts_optimize_t *optim, /*!< in: optimize state data */
     fts_word_t *word)      /*!< in: the word data to check */
 {
@@ -1296,7 +1301,7 @@
       enc.src_last_doc_id = 0;
       enc.src_ilist_ptr = nullptr;
 
-      ut_free(src_node->ilist);
+      ut::free(src_node->ilist);
 
       src_node->ilist = nullptr;
       src_node->ilist_size = src_node->ilist_size_alloc = 0;
@@ -1320,7 +1325,7 @@
 
 /** Update the FTS index table. This is a delete followed by an insert.
  @return DB_SUCCESS or error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t fts_optimize_write_word(
+[[nodiscard]] static dberr_t fts_optimize_write_word(
     trx_t *trx,             /*!< in: transaction */
     fts_table_t *fts_table, /*!< in: table of FTS index */
     fts_string_t *word,     /*!< in: word data to write */
@@ -1386,7 +1391,7 @@
       }
     }
 
-    ut_free(node->ilist);
+    ut::free(node->ilist);
     node->ilist = nullptr;
     node->ilist_size = node->ilist_size_alloc = 0;
   }
@@ -1412,7 +1417,7 @@
 
 /** Optimize the word ilist and rewrite data to the FTS index.
  @return status one of RESTART, EXIT, ERROR */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t fts_optimize_compact(
+[[nodiscard]] static dberr_t fts_optimize_compact(
     fts_optimize_t *optim,          /*!< in: optimize state data */
     dict_index_t *index,            /*!< in: current FTS being optimized */
     ib_time_monotonic_t start_time) /*!< in: optimize start time */
@@ -1495,11 +1500,10 @@
 #ifdef FTS_OPTIMIZE_DEBUG
 /** Get optimize start time of an FTS index.
  @return DB_SUCCESS if all OK else error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    fts_optimize_get_index_start_time(
-        trx_t *trx,            /*!< in: transaction */
-        dict_index_t *index,   /*!< in: FTS index */
-        ib_time_t *start_time) /*!< out: time in secs */
+[[nodiscard]] static dberr_t fts_optimize_get_index_start_time(
+    trx_t *trx,            /*!< in: transaction */
+    dict_index_t *index,   /*!< in: FTS index */
+    ib_time_t *start_time) /*!< out: time in secs */
 {
   return (fts_config_get_index_ulint(trx, index, FTS_OPTIMIZE_START_TIME,
                                      (ulint *)start_time));
@@ -1507,11 +1511,10 @@
 
 /** Set the optimize start time of an FTS index.
  @return DB_SUCCESS if all OK else error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    fts_optimize_set_index_start_time(
-        trx_t *trx,           /*!< in: transaction */
-        dict_index_t *index,  /*!< in: FTS index */
-        ib_time_t start_time) /*!< in: start time */
+[[nodiscard]] static dberr_t fts_optimize_set_index_start_time(
+    trx_t *trx,           /*!< in: transaction */
+    dict_index_t *index,  /*!< in: FTS index */
+    ib_time_t start_time) /*!< in: start time */
 {
   return (fts_config_set_index_ulint(trx, index, FTS_OPTIMIZE_START_TIME,
                                      (ulint)start_time));
@@ -1519,11 +1522,10 @@
 
 /** Get optimize end time of an FTS index.
  @return DB_SUCCESS if all OK else error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    fts_optimize_get_index_end_time(
-        trx_t *trx,          /*!< in: transaction */
-        dict_index_t *index, /*!< in: FTS index */
-        ib_time_t *end_time) /*!< out: time in secs */
+[[nodiscard]] static dberr_t fts_optimize_get_index_end_time(
+    trx_t *trx,          /*!< in: transaction */
+    dict_index_t *index, /*!< in: FTS index */
+    ib_time_t *end_time) /*!< out: time in secs */
 {
   return (fts_config_get_index_ulint(trx, index, FTS_OPTIMIZE_END_TIME,
                                      (ulint *)end_time));
@@ -1531,10 +1533,10 @@
 
 /** Set the optimize end time of an FTS index.
  @return DB_SUCCESS if all OK else error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    fts_optimize_set_index_end_time(trx_t *trx,          /*!< in: transaction */
-                                    dict_index_t *index, /*!< in: FTS index */
-                                    ib_time_t end_time)  /*!< in: end time */
+[[nodiscard]] static dberr_t fts_optimize_set_index_end_time(
+    trx_t *trx,          /*!< in: transaction */
+    dict_index_t *index, /*!< in: FTS index */
+    ib_time_t end_time)  /*!< in: end time */
 {
   return (fts_config_set_index_ulint(trx, index, FTS_OPTIMIZE_END_TIME,
                                      (ulint)end_time));
@@ -1578,7 +1580,7 @@
   fts_doc_ids_free(optim->to_delete);
   fts_optimize_graph_free(&optim->graph);
 
-  ut_free(optim->name_prefix);
+  ut::free(optim->name_prefix);
 
   /* This will free the heap from which optim itself was allocated. */
   mem_heap_free(heap);
@@ -1686,7 +1688,7 @@
 /** Optimize is complete. Set the completion time, and reset the optimize
  start string for this FTS index to "".
  @return DB_SUCCESS if all OK */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t fts_optimize_index_completed(
+[[nodiscard]] static dberr_t fts_optimize_index_completed(
     fts_optimize_t *optim, /*!< in: optimize instance */
     dict_index_t *index)   /*!< in: table with one FTS index */
 {
@@ -1721,7 +1723,7 @@
 /** Read the list of words from the FTS auxiliary index that will be
  optimized in this pass.
  @return DB_SUCCESS if all OK */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t fts_optimize_index_read_words(
+[[nodiscard]] static dberr_t fts_optimize_index_read_words(
     fts_optimize_t *optim, /*!< in: optimize instance */
     dict_index_t *index,   /*!< in: table with one FTS index */
     fts_string_t *word)    /*!< in: buffer to use */
@@ -1764,9 +1766,9 @@
 /** Run OPTIMIZE on the given FTS index. Note: this can take a very long
  time (hours).
  @return DB_SUCCESS if all OK */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    fts_optimize_index(fts_optimize_t *optim, /*!< in: optimize instance */
-                       dict_index_t *index) /*!< in: table with one FTS index */
+[[nodiscard]] static dberr_t fts_optimize_index(
+    fts_optimize_t *optim, /*!< in: optimize instance */
+    dict_index_t *index)   /*!< in: table with one FTS index */
 {
   fts_string_t word;
   dberr_t error;
@@ -1829,9 +1831,8 @@
 
 /** Delete the document ids in the delete, and delete cache tables.
  @return DB_SUCCESS if all OK */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    fts_optimize_purge_deleted_doc_ids(
-        fts_optimize_t *optim) /*!< in: optimize instance */
+[[nodiscard]] static dberr_t fts_optimize_purge_deleted_doc_ids(
+    fts_optimize_t *optim) /*!< in: optimize instance */
 {
   ulint i;
   pars_info_t *info;
@@ -1925,9 +1926,8 @@
 
 /** Delete the document ids in the pending delete, and delete tables.
  @return DB_SUCCESS if all OK */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    fts_optimize_purge_deleted_doc_id_snapshot(
-        fts_optimize_t *optim) /*!< in: optimize instance */
+[[nodiscard]] static dberr_t fts_optimize_purge_deleted_doc_id_snapshot(
+    fts_optimize_t *optim) /*!< in: optimize instance */
 {
   dberr_t error = DB_SUCCESS;
   que_t *graph;
@@ -2009,9 +2009,8 @@
  to the being deleted FTS auxiliary tables. The transaction is committed
  upon successful copy and rolled back on DB_DUPLICATE_KEY error.
  @return DB_SUCCESS if all OK */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    fts_optimize_create_deleted_doc_id_snapshot(
-        fts_optimize_t *optim) /*!< in: optimize instance */
+[[nodiscard]] static dberr_t fts_optimize_create_deleted_doc_id_snapshot(
+    fts_optimize_t *optim) /*!< in: optimize instance */
 {
   dberr_t error = DB_SUCCESS;
   que_t *graph;
@@ -2119,9 +2118,8 @@
 /** Read in the document ids that are to be purged during optimize. The
  transaction is committed upon successfully read.
  @return DB_SUCCESS if all OK */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    fts_optimize_read_deleted_doc_id_snapshot(
-        fts_optimize_t *optim) /*!< in: optimize instance */
+[[nodiscard]] static dberr_t fts_optimize_read_deleted_doc_id_snapshot(
+    fts_optimize_t *optim) /*!< in: optimize instance */
 {
   dberr_t error;
 
@@ -2151,8 +2149,8 @@
  optimized, since the FTS auxiliary indexes are not guaranteed to be
  of the same cardinality.
  @return DB_SUCCESS if all OK */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    fts_optimize_indexes(fts_optimize_t *optim) /*!< in: optimize instance */
+[[nodiscard]] static dberr_t fts_optimize_indexes(
+    fts_optimize_t *optim) /*!< in: optimize instance */
 {
   ulint i;
   dberr_t error = DB_SUCCESS;
@@ -2213,7 +2211,7 @@
 
 /** Cleanup the snapshot tables and the master deleted table.
  @return DB_SUCCESS if all OK */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t fts_optimize_purge_snapshot(
+[[nodiscard]] static dberr_t fts_optimize_purge_snapshot(
     fts_optimize_t *optim) /*!< in: optimize instance */
 {
   dberr_t error;
@@ -2238,7 +2236,7 @@
 
 /** Reset the start time to 0 so that a new optimize can be started.
  @return DB_SUCCESS if all OK */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t fts_optimize_reset_start_time(
+[[nodiscard]] static dberr_t fts_optimize_reset_start_time(
     fts_optimize_t *optim) /*!< in: optimize instance */
 {
   dberr_t error = DB_SUCCESS;
@@ -2516,6 +2514,9 @@
   msg->ptr = table_id;
 
   ib_wqueue_add(fts_optimize_wq, msg, msg->heap);
+  DBUG_EXECUTE_IF(
+      "fts_optimize_wq_count_check",
+      if (ib_wqueue_get_count(fts_optimize_wq) > 1000) { DBUG_SUICIDE(); });
 }
 
 /** Find the slot for a particular table.
@@ -2803,7 +2804,7 @@
 
   ut_ad(!srv_read_only_mode);
 
-  THD *thd = create_thd(false, true, true, 0);
+  THD *thd = create_internal_thd();
 
   heap = mem_heap_create(sizeof(dict_table_t *) * 64);
   heap_alloc = ib_heap_allocator_create(heap);
@@ -2924,7 +2925,7 @@
 
   ib::info(ER_IB_MSG_505) << "FTS optimize thread exiting.";
 
-  destroy_thd(thd);
+  destroy_internal_thd(thd);
 }
 
 /** Startup the optimize thread and create the work queue. */
@@ -2939,7 +2940,7 @@
   last_check_sync_time = ut_time_monotonic();
 
   srv_threads.m_fts_optimize = os_thread_create(
-      fts_optimize_thread_key, fts_optimize_thread, fts_optimize_wq);
+      fts_optimize_thread_key, 0, fts_optimize_thread, fts_optimize_wq);
 
   srv_threads.m_fts_optimize.start();
 }
diff -Nru mysql-8.0-8.0.26/storage/innobase/fts/fts0pars.cc mysql-8.0-8.0.27/storage/innobase/fts/fts0pars.cc
--- mysql-8.0-8.0.26/storage/innobase/fts/fts0pars.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/fts/fts0pars.cc	2021-09-28 11:46:34.000000000 +0000
@@ -738,11 +738,6 @@
 # else
   YYUSE (yyoutput);
 # endif
-  switch (yytype)
-    {
-      default:
-	break;
-    }
 }
 
 
@@ -947,7 +942,7 @@
 	  case '\\':
 	    if (*++yyp != '\\')
 	      goto do_not_strip_quotes;
-	    /* Fall through.  */
+	    [[fallthrough]];
 	  default:
 	    if (yyres)
 	      yyres[yyn] = *yyp;
@@ -1128,13 +1123,6 @@
   if (!yymsg)
     yymsg = "Deleting";
   YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
-
-  switch (yytype)
-    {
-
-      default:
-	break;
-    }
 }
 
 
@@ -1938,28 +1926,24 @@
 	const byte*	query,
 	ulint		query_len)
 {
-	fts_lexer_t*	fts_lexer = static_cast<fts_lexer_t*>(
-		ut_malloc_nokey(sizeof(fts_lexer_t)));
+  fts_lexer_t *fts_lexer = static_cast<fts_lexer_t *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sizeof(fts_lexer_t)));
 
-	if (boolean_mode) {
-		fts0blex_init(&fts_lexer->yyscanner);
-		fts0b_scan_bytes(
-			reinterpret_cast<const char*>(query),
-			static_cast<int>(query_len),
-			fts_lexer->yyscanner);
-		fts_lexer->scanner = reinterpret_cast<fts_scan>(fts_blexer);
-		/* FIXME: Debugging */
-		/* fts0bset_debug(1 , fts_lexer->yyscanner); */
-	} else {
-		fts0tlex_init(&fts_lexer->yyscanner);
-		fts0t_scan_bytes(
-			reinterpret_cast<const char*>(query),
-			static_cast<int>(query_len),
-			fts_lexer->yyscanner);
-		fts_lexer->scanner = reinterpret_cast<fts_scan>(fts_tlexer);
-	}
+  if (boolean_mode) {
+    fts0blex_init(&fts_lexer->yyscanner);
+    fts0b_scan_bytes(reinterpret_cast<const char *>(query),
+                     static_cast<int>(query_len), fts_lexer->yyscanner);
+    fts_lexer->scanner = reinterpret_cast<fts_scan>(fts_blexer);
+    /* FIXME: Debugging */
+    /* fts0bset_debug(1 , fts_lexer->yyscanner); */
+  } else {
+    fts0tlex_init(&fts_lexer->yyscanner);
+    fts0t_scan_bytes(reinterpret_cast<const char *>(query),
+                     static_cast<int>(query_len), fts_lexer->yyscanner);
+    fts_lexer->scanner = reinterpret_cast<fts_scan>(fts_tlexer);
+  }
 
-	return(fts_lexer);
+  return (fts_lexer);
 }
 
 /********************************************************************
@@ -1976,7 +1960,7 @@
 		fts0tlex_destroy(fts_lexer->yyscanner);
 	}
 
-	ut_free(fts_lexer);
+        ut::free(fts_lexer);
 }
 
 /********************************************************************
diff -Nru mysql-8.0-8.0.26/storage/innobase/fts/fts0pars.y mysql-8.0-8.0.27/storage/innobase/fts/fts0pars.y
--- mysql-8.0-8.0.26/storage/innobase/fts/fts0pars.y	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/fts/fts0pars.y	2021-09-28 11:46:34.000000000 +0000
@@ -241,7 +241,7 @@
 	ulint		query_len)
 {
 	fts_lexer_t*	fts_lexer = static_cast<fts_lexer_t*>(
-		ut_malloc_nokey(sizeof(fts_lexer_t)));
+		ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sizeof(fts_lexer_t)));
 
 	if (boolean_mode) {
 		fts0blex_init(&fts_lexer->yyscanner);
@@ -272,7 +272,7 @@
 		fts0tlex_destroy(fts_lexer->yyscanner);
 	}
 
-	ut_free(fts_lexer);
+	ut::free(fts_lexer);
 }
 
 /********************************************************************
diff -Nru mysql-8.0-8.0.26/storage/innobase/fts/fts0plugin.cc mysql-8.0-8.0.27/storage/innobase/fts/fts0plugin.cc
--- mysql-8.0-8.0.26/storage/innobase/fts/fts0plugin.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/fts/fts0plugin.cc	2021-09-28 11:46:34.000000000 +0000
@@ -112,7 +112,7 @@
       if (cur_node->type != FTS_AST_PARSER_PHRASE_LIST) {
         break;
       }
-      // Fall through.
+      [[fallthrough]];
 
     case FT_TOKEN_WORD:
       term_node = fts_ast_create_node_term_for_parser(state, word, word_len);
diff -Nru mysql-8.0-8.0.26/storage/innobase/fts/fts0que.cc mysql-8.0-8.0.27/storage/innobase/fts/fts0que.cc
--- mysql-8.0-8.0.26/storage/innobase/fts/fts0que.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/fts/fts0que.cc	2021-09-28 11:46:34.000000000 +0000
@@ -76,7 +76,7 @@
 
 // FIXME: Need to have a generic iterator that traverses the ilist.
 
-typedef std::vector<fts_string_t, ut_allocator<fts_string_t>> word_vector_t;
+typedef std::vector<fts_string_t, ut::allocator<fts_string_t>> word_vector_t;
 
 struct fts_word_freq_t;
 
@@ -207,7 +207,7 @@
                               the FTS index */
 };
 
-typedef std::vector<ulint, ut_allocator<ulint>> pos_vector_t;
+typedef std::vector<ulint, ut::allocator<ulint>> pos_vector_t;
 
 /** structure defines a set of ranges for original documents, each of which
 has a minimum position and maximum position. Text in such range should
@@ -340,11 +340,10 @@
  search arguments to search the document again, thus "expand"
  the search result set.
  @return DB_SUCCESS if success, otherwise the error code */
-static dberr_t fts_expand_query(
+[[nodiscard]] static dberr_t fts_expand_query(
     dict_index_t *index, /*!< in: FTS index to search */
-    fts_query_t *query)  /*!< in: query result, to be freed
-                         by the client */
-    MY_ATTRIBUTE((warn_unused_result));
+    fts_query_t *query); /*!< in: query result, to be freed
+                        by the client */
 /** This function finds documents that contain all words in a
  phrase or proximity search. And if proximity search, verify
  the words are close enough to each other, as in specified distance.
@@ -437,7 +436,7 @@
 	ulint	r = len_p1;
 	ulint	c = len_p2;
 	ulint	size = (r + 1) * (c + 1) * sizeof(ulint);
-	ulint*	table = (ulint*) ut_malloc_nokey(size);
+	ulint*	table = (ulint*) ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, size);
 
 	/* Traverse the table backwards, from the last row to the first and
 	also from the last column to the first. We compute the smaller
@@ -475,7 +474,7 @@
 	fts_print_lcs_table(table, r, c);
 	printf("\nLen=%lu\n", len);
 
-	ut_free(table);
+	ut::free(table);
 
 	return(len);
 }
@@ -723,7 +722,7 @@
   /* Check if the doc id is deleted and it's in our set. */
   if (fts_bsearch(array, 0, static_cast<int>(size), doc_id) < 0 &&
       rbt_search(query->doc_ids, &parent, &doc_id) == 0) {
-    ut_free(rbt_remove_node(query->doc_ids, parent.last));
+    ut::free(rbt_remove_node(query->doc_ids, parent.last));
 
     ut_ad(query->total_size >= SIZEOF_RBT_NODE_ADD + sizeof(fts_ranking_t));
     query->total_size -= SIZEOF_RBT_NODE_ADD + sizeof(fts_ranking_t);
@@ -854,7 +853,7 @@
       ranking->words = nullptr;
     }
 
-    ut_free(rbt_remove_node(doc_ids, node));
+    ut::free(rbt_remove_node(doc_ids, node));
 
     ut_ad(query->total_size >= SIZEOF_RBT_NODE_ADD + sizeof(fts_ranking_t));
     query->total_size -= SIZEOF_RBT_NODE_ADD + sizeof(fts_ranking_t);
@@ -1011,9 +1010,9 @@
 
 /** Set difference.
  @return DB_SUCCESS if all go well */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    fts_query_difference(fts_query_t *query,        /*!< in: query instance */
-                         const fts_string_t *token) /*!< in: token to search */
+[[nodiscard]] static dberr_t fts_query_difference(
+    fts_query_t *query,        /*!< in: query instance */
+    const fts_string_t *token) /*!< in: token to search */
 {
   ulint n_doc_ids = 0;
   trx_t *trx = query->trx;
@@ -1102,7 +1101,7 @@
 
 /** Intersect the token doc ids with the current set.
  @return DB_SUCCESS if all go well */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t fts_query_intersect(
+[[nodiscard]] static dberr_t fts_query_intersect(
     fts_query_t *query,        /*!< in: query instance */
     const fts_string_t *token) /*!< in: the token to search */
 {
@@ -1275,9 +1274,9 @@
 
 /** Set union.
  @return DB_SUCCESS if all go well */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    fts_query_union(fts_query_t *query,  /*!< in: query instance */
-                    fts_string_t *token) /*!< in: token to search */
+[[nodiscard]] static dberr_t fts_query_union(
+    fts_query_t *query,  /*!< in: query instance */
+    fts_string_t *token) /*!< in: token to search */
 {
   fts_fetch_t fetch;
   ulint n_doc_ids = 0;
@@ -1933,7 +1932,7 @@
 Read the rows from the FTS index, that match word and where the
 doc id is between first and last doc id.
 @return DB_SUCCESS if all go well else error code */
-static MY_ATTRIBUTE((warn_unused_result))
+[[nodiscard]] static
 dberr_t
 fts_query_find_term(
 	fts_query_t*		query,	/*!< in: FTS query state */
@@ -2073,7 +2072,7 @@
 /********************************************************************
 Calculate the total documents that contain a particular word (term).
 @return DB_SUCCESS if all go well else error code */
-static MY_ATTRIBUTE((warn_unused_result))
+[[nodiscard]] static
 dberr_t
 fts_query_total_docs_containing_term(
 	fts_query_t*		query,	/*!< in: FTS query state */
@@ -2154,7 +2153,7 @@
 /********************************************************************
 Get the total number of words in a documents.
 @return DB_SUCCESS if all go well else error code */
-static MY_ATTRIBUTE((warn_unused_result))
+[[nodiscard]] static
 dberr_t
 fts_query_terms_in_document(
 	fts_query_t*	query,		/*!< in: FTS query state */
@@ -2235,7 +2234,7 @@
 
 /** Retrieve the document and match the phrase tokens.
  @return DB_SUCCESS or error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t fts_query_match_document(
+[[nodiscard]] static dberr_t fts_query_match_document(
     ib_vector_t *tokens,       /*!< in: phrase tokens */
     fts_get_doc_t *get_doc,    /*!< in: table and prepared statements */
     fts_match_t *match,        /*!< in: doc id and positions */
@@ -2274,7 +2273,7 @@
 /** This function fetches the original documents and count the
  words in between matching words to see that is in specified distance
  @return DB_SUCCESS if all OK */
-static MY_ATTRIBUTE((warn_unused_result)) bool fts_query_is_in_proximity_range(
+[[nodiscard]] static bool fts_query_is_in_proximity_range(
     const fts_query_t *query,       /*!< in:  query instance */
     fts_match_t **match,            /*!< in: query instance */
     fts_proximity_t *qualified_pos) /*!< in: position info for
@@ -2323,15 +2322,15 @@
 /** Iterate over the matched document ids and search the for the
  actual phrase in the text.
  @return DB_SUCCESS if all OK */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    fts_query_search_phrase(fts_query_t *query,       /*!< in: query instance */
-                            ib_vector_t *orig_tokens, /*!< in: tokens to search,
-                                                      with any stopwords in the
-                                                      original phrase */
-                            ib_vector_t *tokens)      /*!< in: tokens that does
-                                                      not include stopwords and
-                                                      can be used to calculate
-                                                      ranking */
+[[nodiscard]] static dberr_t fts_query_search_phrase(
+    fts_query_t *query,       /*!< in: query instance */
+    ib_vector_t *orig_tokens, /*!< in: tokens to search,
+                              with any stopwords in the
+                              original phrase */
+    ib_vector_t *tokens)      /*!< in: tokens that does
+                              not include stopwords and
+                              can be used to calculate
+                              ranking */
 {
   ulint i;
   fts_get_doc_t get_doc;
@@ -2494,7 +2493,7 @@
 
 /** Text/Phrase search.
  @return DB_SUCCESS or error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t fts_query_phrase_search(
+[[nodiscard]] static dberr_t fts_query_phrase_search(
     fts_query_t *query,         /*!< in: query instance */
     const fts_ast_node_t *node) /*!< in: node to search */
 {
@@ -2665,9 +2664,9 @@
 
 /** Find the word and evaluate.
  @return DB_SUCCESS if all go well */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    fts_query_execute(fts_query_t *query,  /*!< in: query instance */
-                      fts_string_t *token) /*!< in: token to search */
+[[nodiscard]] static dberr_t fts_query_execute(
+    fts_query_t *query,  /*!< in: query instance */
+    fts_string_t *token) /*!< in: token to search */
 {
   switch (query->oper) {
     case FTS_NONE:
@@ -2693,7 +2692,8 @@
 }
 
 /** Create a wildcard string. It's the responsibility of the caller to
- free the byte* pointer. It's allocated using ut_malloc_nokey().
+ free the byte* pointer. It's allocated using
+ ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY).
  @return ptr to allocated memory */
 static byte *fts_query_get_token(
     fts_ast_node_t *node, /*!< in: the current sub tree */
@@ -2710,7 +2710,8 @@
   token->f_str = node->term.ptr->str;
 
   if (node->term.wildcard) {
-    token->f_str = static_cast<byte *>(ut_malloc_nokey(str_len + 2));
+    token->f_str = static_cast<byte *>(
+        ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, str_len + 2));
     token->f_len = str_len + 1;
 
     memcpy(token->f_str, node->term.ptr->str, str_len);
@@ -2796,7 +2797,7 @@
       query->error = fts_query_execute(query, &token);
 
       if (ptr) {
-        ut_free(ptr);
+        ut::free(ptr);
       }
 
       break;
@@ -3354,7 +3355,8 @@
   DBUG_TRACE;
 
   if (result == nullptr) {
-    result = static_cast<fts_result_t *>(ut_zalloc_nokey(sizeof(*result)));
+    result = static_cast<fts_result_t *>(
+        ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sizeof(*result)));
 
     result->rankings_by_id =
         rbt_create(sizeof(fts_ranking_t), fts_ranking_doc_id_cmp);
@@ -3469,7 +3471,8 @@
     result = fts_query_prepare_result(query, result);
   } else {
     /* Create an empty result instance. */
-    result = static_cast<fts_result_t *>(ut_zalloc_nokey(sizeof(*result)));
+    result = static_cast<fts_result_t *>(
+        ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sizeof(*result)));
   }
 
   return result;
@@ -3528,7 +3531,7 @@
   }
 
   if (query->word_vector != nullptr) {
-    UT_DELETE(query->word_vector);
+    ut::delete_(query->word_vector);
   }
 
   if (query->heap) {
@@ -3658,7 +3661,7 @@
 
   query.word_map =
       rbt_create_arg_cmp(sizeof(fts_string_t), innobase_fts_text_cmp, charset);
-  query.word_vector = UT_NEW_NOKEY(word_vector_t());
+  query.word_vector = ut::new_withkey<word_vector_t>(UT_NEW_THIS_FILE_PSI_KEY);
   query.error = DB_SUCCESS;
 
   /* Setup the RB tree that will be used to collect per term
@@ -3710,7 +3713,8 @@
   the ut_malloc'ed result and so remember to free it before return. */
 
   lc_query_str_len = query_len * charset->casedn_multiply + charset->mbmaxlen;
-  lc_query_str = static_cast<byte *>(ut_zalloc_nokey(lc_query_str_len));
+  lc_query_str = static_cast<byte *>(
+      ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, lc_query_str_len));
 
   /* For binary collations, a case sensitive search is
   performed. Hence don't convert to lower case. */
@@ -3760,7 +3764,7 @@
     query.error = fts_ast_visit(FTS_NONE, ast, fts_query_visitor, &query,
                                 &will_be_ignored);
     if (query.error == DB_INTERRUPTED) {
-      ut_free(lc_query_str);
+      ut::free(lc_query_str);
       error = DB_INTERRUPTED;
       goto func_exit;
     }
@@ -3781,7 +3785,7 @@
       *result = fts_query_get_result(&query, *result);
     }
     if (trx_is_interrupted(trx)) {
-      ut_free(lc_query_str);
+      ut::free(lc_query_str);
       if (result != nullptr) {
         fts_query_free_result(*result);
       }
@@ -3791,10 +3795,11 @@
     error = query.error;
   } else {
     /* still return an empty result set */
-    *result = static_cast<fts_result_t *>(ut_zalloc_nokey(sizeof(**result)));
+    *result = static_cast<fts_result_t *>(
+        ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sizeof(**result)));
   }
 
-  ut_free(lc_query_str);
+  ut::free(lc_query_str);
 
   if (fts_enable_diag_print && (*result)) {
     auto diff_time = ut_time_monotonic_ms() - start_time_ms;
@@ -3834,7 +3839,7 @@
       result->rankings_by_rank = nullptr;
     }
 
-    ut_free(result);
+    ut::free(result);
     result = nullptr;
   }
 }
@@ -3899,9 +3904,9 @@
  search arguments to search the document again, thus "expand"
  the search result set.
  @return DB_SUCCESS if success, otherwise the error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    fts_expand_query(dict_index_t *index, /*!< in: FTS index to search */
-                     fts_query_t *query)  /*!< in: FTS query instance */
+[[nodiscard]] static dberr_t fts_expand_query(
+    dict_index_t *index, /*!< in: FTS index to search */
+    fts_query_t *query)  /*!< in: FTS query instance */
 {
   const ib_rbt_node_t *node;
   const ib_rbt_node_t *token_node;
@@ -3980,7 +3985,7 @@
       it as prefix. */
       while (rbt_search_cmp(result_doc.tokens, &parent, &word, nullptr,
                             innobase_fts_text_cmp_prefix) == 0) {
-        ut_free(rbt_remove_node(result_doc.tokens, parent.last));
+        ut::free(rbt_remove_node(result_doc.tokens, parent.last));
       }
     } else {
       /* We don't check return value, because the word may
diff -Nru mysql-8.0-8.0.26/storage/innobase/fts/fts0sql.cc mysql-8.0-8.0.27/storage/innobase/fts/fts0sql.cc
--- mysql-8.0-8.0.26/storage/innobase/fts/fts0sql.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/fts/fts0sql.cc	2021-09-28 11:46:34.000000000 +0000
@@ -95,7 +95,7 @@
 /** Construct the prefix name of an FTS table.
 @param[in]	fts_table	Auxiliary FTS table
 @param[in]	is_5_7		true if we need 5.7 compatible name
-@return own: table name, must be freed with ut_free() */
+@return own: table name, must be freed with ut::free() */
 static char *fts_get_table_name_prefix_low(const fts_table_t *fts_table,
                                            bool is_5_7) {
   int len;
@@ -117,7 +117,8 @@
 
   prefix_name_len = dbname_len + 4 + len + 1;
 
-  prefix_name = static_cast<char *>(ut_malloc_nokey(prefix_name_len));
+  prefix_name = static_cast<char *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, prefix_name_len));
 
   len = sprintf(prefix_name, "%.*s%s%s", dbname_len, fts_table->parent,
                 is_5_7 ? FTS_PREFIX_5_7 : FTS_PREFIX, table_id);
@@ -129,7 +130,7 @@
 }
 
 /** Construct the prefix name of an FTS table.
- @return own: table name, must be freed with ut_free() */
+ @return own: table name, must be freed with ut::free() */
 char *fts_get_table_name_prefix(
     const fts_table_t *fts_table) /*!< in: Auxiliary table type */
 {
@@ -138,7 +139,7 @@
 
 /** Construct the prefix name of an FTS table in 5.7 compatible name
 @param[in]	fts_table	Auxiliary FTS table
-@return own: table name, must be freed with ut_free() */
+@return own: table name, must be freed with ut::free() */
 char *fts_get_table_name_prefix_5_7(const fts_table_t *fts_table) {
   return (fts_get_table_name_prefix_low(fts_table, true));
 }
@@ -163,7 +164,7 @@
   ut_a(strlen(prefix_name) + 1 + strlen(fts_table->suffix) ==
        static_cast<uint>(len));
 
-  ut_free(prefix_name);
+  ut::free(prefix_name);
 }
 
 /** Construct the name of an ancillary FTS table for the given table.
@@ -237,7 +238,7 @@
     dd_table_close(aux_table, thd, &mdl, false);
   }
 
-  ut_free(str);
+  ut::free(str);
 
   return (graph);
 }
diff -Nru mysql-8.0-8.0.26/storage/innobase/fts/fts0tlex.cc mysql-8.0-8.0.27/storage/innobase/fts/fts0tlex.cc
--- mysql-8.0-8.0.26/storage/innobase/fts/fts0tlex.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/fts/fts0tlex.cc	2021-09-28 11:46:34.000000000 +0000
@@ -343,9 +343,9 @@
 YY_BUFFER_STATE fts0t_scan_string (yyconst char *yy_str ,yyscan_t yyscanner );
 YY_BUFFER_STATE fts0t_scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner );
 
-void *fts0talloc (yy_size_t , yyscan_t yyscanner MY_ATTRIBUTE((unused)) );
-void *fts0trealloc (void *,yy_size_t , yyscan_t yyscanner MY_ATTRIBUTE((unused)) );
-void fts0tfree (void * , yyscan_t yyscanner MY_ATTRIBUTE((unused)) );
+void *fts0talloc (yy_size_t , yyscan_t yyscanner [[maybe_unused]] );
+void *fts0trealloc (void *,yy_size_t , yyscan_t yyscanner [[maybe_unused]] );
+void fts0tfree (void * , yyscan_t yyscanner [[maybe_unused]] );
 
 #define yy_new_buffer fts0t_create_buffer
 
@@ -385,7 +385,7 @@
 static yy_state_type yy_get_previous_state (yyscan_t yyscanner );
 static yy_state_type yy_try_NUL_trans (yy_state_type current_state  ,yyscan_t yyscanner);
 static int yy_get_next_buffer (yyscan_t yyscanner );
-static void yy_fatal_error (yyconst char msg[] , yyscan_t yyscanner MY_ATTRIBUTE((unused)) );
+static void yy_fatal_error (yyconst char msg[] , yyscan_t yyscanner [[maybe_unused]] );
 
 /* Done after the current pattern has been matched and before the
  * corresponding action - sets up yytext.
@@ -596,11 +596,11 @@
 #endif
 
 #ifndef yytext_ptr
-static void yy_flex_strncpy (char *,yyconst char *,int , yyscan_t yyscanner MY_ATTRIBUTE((unused)));
+static void yy_flex_strncpy (char *,yyconst char *,int , yyscan_t yyscanner [[maybe_unused]]);
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * , yyscan_t yyscanner MY_ATTRIBUTE((unused)));
+static int yy_flex_strlen (yyconst char * , yyscan_t yyscanner [[maybe_unused]]);
 #endif
 
 #ifndef YY_NO_INPUT
@@ -1623,7 +1623,7 @@
 #define YY_EXIT_FAILURE 2
 #endif
 
-static void yy_fatal_error (yyconst char* msg ,  yyscan_t yyscanner MY_ATTRIBUTE((unused)))
+static void yy_fatal_error (yyconst char* msg ,  yyscan_t yyscanner [[maybe_unused]])
 {
     	(void) fprintf( stderr, "%s\n", msg );
 	exit( YY_EXIT_FAILURE );
@@ -1924,7 +1924,7 @@
  */
 
 #ifndef yytext_ptr
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ,  yyscan_t yyscanner MY_ATTRIBUTE((unused)))
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ,  yyscan_t yyscanner [[maybe_unused]])
 {
 	int i;
 	for ( i = 0; i < n; ++i )
@@ -1933,7 +1933,7 @@
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * s ,  yyscan_t yyscanner MY_ATTRIBUTE((unused)))
+static int yy_flex_strlen (yyconst char * s ,  yyscan_t yyscanner [[maybe_unused]])
 {
 	int n;
 	for ( n = 0; s[n]; ++n )
@@ -1943,12 +1943,12 @@
 }
 #endif
 
-void *fts0talloc (yy_size_t  size ,  yyscan_t yyscanner MY_ATTRIBUTE((unused)))
+void *fts0talloc (yy_size_t  size ,  yyscan_t yyscanner [[maybe_unused]])
 {
 	return (void *) malloc( size );
 }
 
-void *fts0trealloc  (void * ptr, yy_size_t  size ,  yyscan_t yyscanner MY_ATTRIBUTE((unused)))
+void *fts0trealloc  (void * ptr, yy_size_t  size ,  yyscan_t yyscanner [[maybe_unused]])
 {
 	/* The cast to (char *) in the following accommodates both
 	 * implementations that use char* generic pointers, and those
@@ -1960,7 +1960,7 @@
 	return (void *) realloc( (char *) ptr, size );
 }
 
-void fts0tfree (void * ptr ,  yyscan_t yyscanner MY_ATTRIBUTE((unused)))
+void fts0tfree (void * ptr ,  yyscan_t yyscanner [[maybe_unused]])
 {
 	free( (char *) ptr );	/* see fts0trealloc() for (char *) cast */
 }
diff -Nru mysql-8.0-8.0.26/storage/innobase/fts/Makefile.query mysql-8.0-8.0.27/storage/innobase/fts/Makefile.query
--- mysql-8.0-8.0.26/storage/innobase/fts/Makefile.query	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/fts/Makefile.query	2021-09-28 11:46:34.000000000 +0000
@@ -33,7 +33,7 @@
 fts0tlex.cc: fts0tlex.l
 
 .l.cc:
-	$(LEX) -P$(subst lex,,$*) -o $*.cc --stdout --header-file=../include/$*.h $< | sed -e 's/^\(static.*void.*yy_fatal_error.*msg.*,\)\(.*yyscanner\)/\1 \2 MY_ATTRIBUTE((unused))/;s/^\(static.*void.*yy_flex_strncpy.*n.*,\)\(.*yyscanner\)/\1 \2 MY_ATTRIBUTE((unused))/;s/^\(static.*int.*yy_flex_strlen.*s.*,\)\(.*yyscanner\)/\1 \2 MY_ATTRIBUTE((unused))/;s/^\(\(static\|void\).*fts0[bt]alloc.*,\)\(.*yyscanner\)/\1 \3 MY_ATTRIBUTE((unused))/;s/^\(\(static\|void\).*fts0[bt]realloc.*,\)\(.*yyscanner\)/\1 \3 MY_ATTRIBUTE((unused))/;s/^\(\(static\|void\).*fts0[bt]free.*,\)\(.*yyscanner\)/\1 \3 MY_ATTRIBUTE((unused))/;s/\<register\> *//;' > $*.cc
+	$(LEX) -P$(subst lex,,$*) -o $*.cc --stdout --header-file=../include/$*.h $< | sed -e 's/^\(static.*void.*yy_fatal_error.*msg.*,\)\(.*yyscanner\)/\1 \2 [[maybe_unused]]/;s/^\(static.*void.*yy_flex_strncpy.*n.*,\)\(.*yyscanner\)/\1 \2 [[maybe_unused]]/;s/^\(static.*int.*yy_flex_strlen.*s.*,\)\(.*yyscanner\)/\1 \2 [[maybe_unused]]/;s/^\(\(static\|void\).*fts0[bt]alloc.*,\)\(.*yyscanner\)/\1 \3 [[maybe_unused]]/;s/^\(\(static\|void\).*fts0[bt]realloc.*,\)\(.*yyscanner\)/\1 \3 [[maybe_unused]]/;s/^\(\(static\|void\).*fts0[bt]free.*,\)\(.*yyscanner\)/\1 \3 [[maybe_unused]]/;s/\<register\> *//;' > $*.cc
 
 .y.cc:
 	$(YACC) -p $(PREFIX) -o $*.cc -d $<
diff -Nru mysql-8.0-8.0.26/storage/innobase/gis/gis0rtree.cc mysql-8.0-8.0.27/storage/innobase/gis/gis0rtree.cc
--- mysql-8.0-8.0.26/storage/innobase/gis/gis0rtree.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/gis/gis0rtree.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1401,7 +1401,7 @@
               ulong{new_block->page.id.page_no()},
               ulong{block->page.id.page_no()});
 
-      ib::fatal(ER_IB_MSG_520)
+      ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_520)
           << "rec offset " << page_offset(rec) << ", cur1 offset "
           << page_offset(page_cur_get_rec(&cur1)) << ", cur_rec offset "
           << page_offset(cur_rec);
@@ -1515,7 +1515,7 @@
               (long)new_block->page.id.page_no(),
               (long)block->page.id.page_no());
 
-      ib::fatal(ER_IB_MSG_521)
+      ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_521)
           << "rec offset " << page_offset(rec) << ", cur1 offset "
           << page_offset(page_cur_get_rec(&cur1)) << ", cur_rec offset "
           << page_offset(cur_rec);
@@ -1733,7 +1733,7 @@
 
   /* Read mbr from tuple. */
   const dfield_t *dtuple_field;
-  ulint dtuple_f_len MY_ATTRIBUTE((unused));
+  ulint dtuple_f_len [[maybe_unused]];
   rtr_mbr_t range_mbr;
   double range_area;
   byte *range_mbr_ptr;
diff -Nru mysql-8.0-8.0.26/storage/innobase/gis/gis0sea.cc mysql-8.0-8.0.27/storage/innobase/gis/gis0sea.cc
--- mysql-8.0-8.0.26/storage/innobase/gis/gis0sea.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/gis/gis0sea.cc	2021-09-28 11:46:34.000000000 +0000
@@ -69,7 +69,7 @@
     } else {
       if (rtr_info->parent_path->back().cursor) {
         btr_pcur_close(rtr_info->parent_path->back().cursor);
-        ut_free(rtr_info->parent_path->back().cursor);
+        ut::free(rtr_info->parent_path->back().cursor);
       }
 
       rtr_info->parent_path->pop_back();
@@ -173,7 +173,7 @@
       /* Cleanup unused parent info */
       if (rtr_info->parent_path->back().cursor) {
         btr_pcur_close(rtr_info->parent_path->back().cursor);
-        ut_free(rtr_info->parent_path->back().cursor);
+        ut::free(rtr_info->parent_path->back().cursor);
       }
 
       old_level = rtr_info->parent_path->back().level;
@@ -647,7 +647,7 @@
   if (child_page != page_no) {
     const rec_t *print_rec;
 
-    ib::fatal error;
+    ib::fatal error(UT_LOCATION_HERE);
 
     error << "Corruption of index " << index->name << " of table "
           << index->table->name << " parent page " << page_no << " child page "
@@ -837,7 +837,8 @@
   index = index ? index : cursor->index;
   ut_ad(index);
 
-  rtr_info = static_cast<rtr_info_t *>(ut_zalloc_nokey(sizeof(*rtr_info)));
+  rtr_info = static_cast<rtr_info_t *>(
+      ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sizeof(*rtr_info)));
 
   rtr_info->allocated = true;
   rtr_info->cursor = cursor;
@@ -849,7 +850,8 @@
     rtr_info->matches = static_cast<matched_rec_t *>(
         mem_heap_zalloc(rtr_info->heap, sizeof(*rtr_info->matches)));
 
-    rtr_info->matches->matched_recs = UT_NEW_NOKEY(rtr_rec_vector());
+    rtr_info->matches->matched_recs =
+        ut::new_withkey<rtr_rec_vector>(UT_NEW_THIS_FILE_PSI_KEY);
 
     rtr_info->matches->bufp =
         page_align(rtr_info->matches->rec_buf + UNIV_PAGE_SIZE_MAX + 1);
@@ -858,8 +860,9 @@
                    SYNC_LEVEL_VARYING);
   }
 
-  rtr_info->path = UT_NEW_NOKEY(rtr_node_path_t());
-  rtr_info->parent_path = UT_NEW_NOKEY(rtr_node_path_t());
+  rtr_info->path = ut::new_withkey<rtr_node_path_t>(UT_NEW_THIS_FILE_PSI_KEY);
+  rtr_info->parent_path =
+      ut::new_withkey<rtr_node_path_t>(UT_NEW_THIS_FILE_PSI_KEY);
   rtr_info->need_prdt_lock = need_prdt;
   mutex_create(LATCH_ID_RTR_PATH_MUTEX, &rtr_info->rtr_path_mutex);
 
@@ -920,8 +923,9 @@
 
   ut_ad(!rtr_info->matches || rtr_info->matches->matched_recs->empty());
 
-  rtr_info->path = UT_NEW_NOKEY(rtr_node_path_t());
-  rtr_info->parent_path = UT_NEW_NOKEY(rtr_node_path_t());
+  rtr_info->path = ut::new_withkey<rtr_node_path_t>(UT_NEW_THIS_FILE_PSI_KEY);
+  rtr_info->parent_path =
+      ut::new_withkey<rtr_node_path_t>(UT_NEW_THIS_FILE_PSI_KEY);
   rtr_info->need_prdt_lock = need_prdt;
   rtr_info->cursor = cursor;
   rtr_info->index = index;
@@ -955,15 +959,15 @@
 
     if (cur) {
       btr_pcur_close(cur);
-      ut_free(cur);
+      ut::free(cur);
     }
   }
 
-  UT_DELETE(rtr_info->parent_path);
+  ut::delete_(rtr_info->parent_path);
   rtr_info->parent_path = nullptr;
 
   if (rtr_info->path != nullptr) {
-    UT_DELETE(rtr_info->path);
+    ut::delete_(rtr_info->path);
     rtr_info->path = nullptr;
     initialized = true;
   }
@@ -983,7 +987,7 @@
   if (free_all) {
     if (rtr_info->matches) {
       if (rtr_info->matches->matched_recs != nullptr) {
-        UT_DELETE(rtr_info->matches->matched_recs);
+        ut::delete_(rtr_info->matches->matched_recs);
       }
 
       /* Clear any space references in the page copied. */
@@ -1002,7 +1006,7 @@
     }
 
     if (rtr_info->allocated) {
-      ut_free(rtr_info);
+      ut::free(rtr_info);
     }
   }
 }
@@ -1012,7 +1016,8 @@
     rtr_info_t *rtr_info, /*!< in: RTree search info */
     page_no_t page_no)    /*!< in: need to free rtr_info itself */
 {
-  rtr_node_path_t *new_path = UT_NEW_NOKEY(rtr_node_path_t());
+  rtr_node_path_t *new_path =
+      ut::new_withkey<rtr_node_path_t>(UT_NEW_THIS_FILE_PSI_KEY);
 
   rtr_node_path_t::iterator rit;
 #ifdef UNIV_DEBUG
@@ -1033,14 +1038,15 @@
 #endif /* UNIV_DEBUG */
   }
 
-  UT_DELETE(rtr_info->path);
+  ut::delete_(rtr_info->path);
 
   ut_ad(new_path->size() == before_size - 1);
 
   rtr_info->path = new_path;
 
   if (!rtr_info->parent_path->empty()) {
-    rtr_node_path_t *new_parent_path = UT_NEW_NOKEY(rtr_node_path_t());
+    rtr_node_path_t *new_parent_path =
+        ut::new_withkey<rtr_node_path_t>(UT_NEW_THIS_FILE_PSI_KEY);
 
     for (rit = rtr_info->parent_path->begin();
          rit != rtr_info->parent_path->end(); ++rit) {
@@ -1051,7 +1057,7 @@
 
         if (cur) {
           btr_pcur_close(cur);
-          ut_free(cur);
+          ut::free(cur);
         }
 
         continue;
@@ -1059,7 +1065,7 @@
 
       new_parent_path->push_back(next_rec);
     }
-    UT_DELETE(rtr_info->parent_path);
+    ut::delete_(rtr_info->parent_path);
     rtr_info->parent_path = new_parent_path;
   }
 }
@@ -1355,7 +1361,8 @@
   btr_pcur_t *my_cursor;
   page_no_t page_no = block->page.id.page_no();
 
-  my_cursor = static_cast<btr_pcur_t *>(ut_malloc_nokey(sizeof(*my_cursor)));
+  my_cursor = static_cast<btr_pcur_t *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sizeof(*my_cursor)));
 
   btr_pcur_init(my_cursor);
 
@@ -1390,7 +1397,6 @@
   /* Skip buf_block_t::lock as it was already initialized by rtr_create_rtr_info
    */
   ut_ad(rw_lock_validate(&matches->block.lock));
-  matches->block.lock_hash_val = block->lock_hash_val;
   matches->block.n_hash_helps = block->n_hash_helps;
   matches->block.n_bytes = block->n_bytes;
   matches->block.n_fields = block->n_fields;
diff -Nru mysql-8.0-8.0.26/storage/innobase/ha/ha0ha.cc mysql-8.0-8.0.27/storage/innobase/ha/ha0ha.cc
--- mysql-8.0-8.0.26/storage/innobase/ha/ha0ha.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/ha/ha0ha.cc	2021-09-28 11:46:34.000000000 +0000
@@ -85,7 +85,7 @@
     rw_lock_free(&table->rw_locks[i]);
   }
 
-  ut_free(table->rw_locks);
+  ut::free(table->rw_locks);
   table->rw_locks = nullptr;
 
   table->n_sync_obj = 0;
diff -Nru mysql-8.0-8.0.26/storage/innobase/ha/hash0hash.cc mysql-8.0-8.0.27/storage/innobase/ha/hash0hash.cc
--- mysql-8.0-8.0.26/storage/innobase/ha/hash0hash.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/ha/hash0hash.cc	2021-09-28 11:46:34.000000000 +0000
@@ -108,10 +108,11 @@
 
   prime = ut_find_prime(n);
 
-  table = static_cast<hash_table_t *>(ut_malloc_nokey(sizeof(hash_table_t)));
+  table = static_cast<hash_table_t *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sizeof(hash_table_t)));
 
-  array =
-      static_cast<hash_cell_t *>(ut_malloc_nokey(sizeof(hash_cell_t) * prime));
+  array = static_cast<hash_cell_t *>(ut::malloc_withkey(
+      UT_NEW_THIS_FILE_PSI_KEY, sizeof(hash_cell_t) * prime));
 
   /* The default type of hash_table is HASH_TABLE_SYNC_NONE i.e.:
   the caller is responsible for access control to the table. */
@@ -139,8 +140,8 @@
 {
   ut_ad(table->magic_n == HASH_TABLE_MAGIC_N);
 
-  ut_free(table->cells);
-  ut_free(table);
+  ut::free(table->cells);
+  ut::free(table);
 }
 
 #ifndef UNIV_HOTBACKUP
@@ -155,8 +156,8 @@
 
   ut_a(level != SYNC_UNKNOWN);
 
-  table->rw_locks =
-      static_cast<rw_lock_t *>(ut_malloc_nokey(n_sync_obj * sizeof(rw_lock_t)));
+  table->rw_locks = static_cast<rw_lock_t *>(ut::malloc_withkey(
+      UT_NEW_THIS_FILE_PSI_KEY, n_sync_obj * sizeof(rw_lock_t)));
 
   for (ulint i = 0; i < n_sync_obj; i++) {
     rw_lock_create(hash_table_locks_key, table->rw_locks + i, level);
diff -Nru mysql-8.0-8.0.26/storage/innobase/handler/ha_innodb.cc mysql-8.0-8.0.27/storage/innobase/handler/ha_innodb.cc
--- mysql-8.0-8.0.26/storage/innobase/handler/ha_innodb.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/handler/ha_innodb.cc	2021-09-28 11:46:34.000000000 +0000
@@ -84,7 +84,6 @@
 #include "arch0page.h"
 #include "auth_acls.h"
 #include "btr0btr.h"
-#include "btr0bulk.h"
 #include "btr0cur.h"
 #include "btr0sea.h"
 #include "buf0dblwr.h"
@@ -103,6 +102,7 @@
 #include "dd/types/partition.h"
 #include "dd/types/table.h"
 #include "dd/types/tablespace.h"
+#include "ddl0ddl.h"
 #include "dict0boot.h"
 #include "dict0crea.h"
 #include "dict0dd.h"
@@ -149,7 +149,6 @@
 #include "row0ext.h"
 #include "row0import.h"
 #include "row0ins.h"
-#include "row0merge.h"
 #include "row0mysql.h"
 #include "row0quiesce.h"
 #include "row0sel.h"
@@ -534,7 +533,7 @@
 
 /** Array of data files of the system tablespace */
 static std::vector<Plugin_tablespace::Plugin_tablespace_file *,
-                   ut_allocator<Plugin_tablespace::Plugin_tablespace_file *>>
+                   ut::allocator<Plugin_tablespace::Plugin_tablespace_file *>>
     innobase_sys_files;
 
 /** Allowed values of innodb_change_buffering */
@@ -631,6 +630,8 @@
 /* All RWLOCK used in Innodb are SX-locks */
 #define PSI_RWLOCK_KEY(n, volatility, doc) \
   { &n##_key.m_value, #n, PSI_FLAG_RWLOCK_SX, volatility, doc }
+#define PSI_THREAD_KEY(n, osn, flag, volatility, doc) \
+  { &(n##_key.m_value), #n, osn, flag, volatility, doc }
 
 /* Keys to register pthread mutexes/cond in the current file with
 performance schema */
@@ -670,6 +671,7 @@
     PSI_MUTEX_KEY(clone_snapshot_mutex, 0, 0, PSI_DOCUMENT_ME),
     PSI_MUTEX_KEY(clone_sys_mutex, 0, 0, PSI_DOCUMENT_ME),
     PSI_MUTEX_KEY(clone_task_mutex, 0, 0, PSI_DOCUMENT_ME),
+    PSI_MUTEX_KEY(ddl_autoinc_mutex, 0, 0, PSI_DOCUMENT_ME),
     PSI_MUTEX_KEY(dict_foreign_err_mutex, 0, 0, PSI_DOCUMENT_ME),
     PSI_MUTEX_KEY(dict_persist_dirty_tables_mutex, 0, 0, PSI_DOCUMENT_ME),
     PSI_MUTEX_KEY(dict_sys_mutex, 0, 0, PSI_DOCUMENT_ME),
@@ -785,40 +787,70 @@
 performance schema instrumented if "UNIV_PFS_THREAD"
 is defined */
 static PSI_thread_info all_innodb_threads[] = {
-    PSI_KEY(log_archiver_thread, 0, 0, PSI_DOCUMENT_ME),
-    PSI_KEY(page_archiver_thread, 0, 0, PSI_DOCUMENT_ME),
-    PSI_KEY(buf_dump_thread, 0, 0, PSI_DOCUMENT_ME),
-    PSI_KEY(clone_ddl_thread, 0, 0, PSI_DOCUMENT_ME),
-    PSI_KEY(clone_gtid_thread, 0, 0, PSI_DOCUMENT_ME),
-    PSI_KEY(dict_stats_thread, 0, 0, PSI_DOCUMENT_ME),
-    PSI_KEY(io_handler_thread, 0, 0, PSI_DOCUMENT_ME),
-    PSI_KEY(io_ibuf_thread, 0, 0, PSI_DOCUMENT_ME),
-    PSI_KEY(io_log_thread, 0, 0, PSI_DOCUMENT_ME),
-    PSI_KEY(io_read_thread, 0, 0, PSI_DOCUMENT_ME),
-    PSI_KEY(io_write_thread, 0, 0, PSI_DOCUMENT_ME),
-    PSI_KEY(buf_resize_thread, 0, 0, PSI_DOCUMENT_ME),
-    PSI_KEY(log_writer_thread, 0, 0, PSI_DOCUMENT_ME),
-    PSI_KEY(log_checkpointer_thread, 0, 0, PSI_DOCUMENT_ME),
-    PSI_KEY(log_flusher_thread, 0, 0, PSI_DOCUMENT_ME),
-    PSI_KEY(log_write_notifier_thread, 0, 0, PSI_DOCUMENT_ME),
-    PSI_KEY(log_flush_notifier_thread, 0, 0, PSI_DOCUMENT_ME),
-    PSI_KEY(recv_writer_thread, 0, 0, PSI_DOCUMENT_ME),
-    PSI_KEY(srv_error_monitor_thread, 0, 0, PSI_DOCUMENT_ME),
-    PSI_KEY(srv_lock_timeout_thread, 0, 0, PSI_DOCUMENT_ME),
-    PSI_KEY(srv_master_thread, 0, 0, PSI_DOCUMENT_ME),
-    PSI_KEY(srv_monitor_thread, 0, 0, PSI_DOCUMENT_ME),
-    PSI_KEY(srv_purge_thread, 0, 0, PSI_DOCUMENT_ME),
-    PSI_KEY(srv_worker_thread, 0, 0, PSI_DOCUMENT_ME),
-    PSI_KEY(trx_recovery_rollback_thread, 0, 0, PSI_DOCUMENT_ME),
-    PSI_KEY(page_flush_thread, 0, 0, PSI_DOCUMENT_ME),
-    PSI_KEY(page_flush_coordinator_thread, 0, 0, PSI_DOCUMENT_ME),
-    PSI_KEY(fts_optimize_thread, 0, 0, PSI_DOCUMENT_ME),
-    PSI_KEY(fts_parallel_merge_thread, 0, 0, PSI_DOCUMENT_ME),
-    PSI_KEY(fts_parallel_tokenization_thread, 0, 0, PSI_DOCUMENT_ME),
-    PSI_KEY(srv_ts_alter_encrypt_thread, 0, 0, PSI_DOCUMENT_ME),
-    PSI_KEY(parallel_read_thread, 0, 0, PSI_DOCUMENT_ME),
-    PSI_KEY(parallel_rseg_init_thread, 0, 0, PSI_DOCUMENT_ME),
-    PSI_KEY(meb::redo_log_archive_consumer_thread, 0, 0, PSI_DOCUMENT_ME)};
+    PSI_THREAD_KEY(log_archiver_thread, "ib_log_arch", PSI_FLAG_SINGLETON, 0,
+                   PSI_DOCUMENT_ME),
+    PSI_THREAD_KEY(page_archiver_thread, "ib_page_arch", PSI_FLAG_SINGLETON, 0,
+                   PSI_DOCUMENT_ME),
+    PSI_THREAD_KEY(buf_dump_thread, "ib_buf_dump", PSI_FLAG_SINGLETON, 0,
+                   PSI_DOCUMENT_ME),
+    PSI_THREAD_KEY(clone_ddl_thread, "ib_clone_ddl", PSI_FLAG_SINGLETON, 0,
+                   PSI_DOCUMENT_ME),
+    PSI_THREAD_KEY(clone_gtid_thread, "ib_clone_gtid", PSI_FLAG_SINGLETON, 0,
+                   PSI_DOCUMENT_ME),
+    PSI_THREAD_KEY(ddl_thread, "ib_ddl", 0, 0, PSI_DOCUMENT_ME),
+    PSI_THREAD_KEY(dict_stats_thread, "ib_dict_stats", PSI_FLAG_SINGLETON, 0,
+                   PSI_DOCUMENT_ME),
+    PSI_THREAD_KEY(io_handler_thread, "ib_io_handler", PSI_FLAG_SINGLETON, 0,
+                   PSI_DOCUMENT_ME),
+    PSI_THREAD_KEY(io_ibuf_thread, "ib_io_ibuf", PSI_FLAG_SINGLETON, 0,
+                   PSI_DOCUMENT_ME),
+    PSI_THREAD_KEY(io_log_thread, "ib_io_log", PSI_FLAG_SINGLETON, 0,
+                   PSI_DOCUMENT_ME),
+    PSI_THREAD_KEY(io_read_thread, "ib_io_rd", 0, 0, PSI_DOCUMENT_ME),
+    PSI_THREAD_KEY(io_write_thread, "ib_io_wr", 0, 0, PSI_DOCUMENT_ME),
+    PSI_THREAD_KEY(buf_resize_thread, "ib_buf_resize", PSI_FLAG_SINGLETON, 0,
+                   PSI_DOCUMENT_ME),
+    PSI_THREAD_KEY(log_writer_thread, "ib_log_writer", PSI_FLAG_SINGLETON, 0,
+                   PSI_DOCUMENT_ME),
+    PSI_THREAD_KEY(log_checkpointer_thread, "ib_log_checkpt",
+                   PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME),
+    PSI_THREAD_KEY(log_flusher_thread, "ib_log_flush", PSI_FLAG_SINGLETON, 0,
+                   PSI_DOCUMENT_ME),
+    PSI_THREAD_KEY(log_write_notifier_thread, "ib_log_wr_notif",
+                   PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME),
+    PSI_THREAD_KEY(log_flush_notifier_thread, "ib_log_fl_notif",
+                   PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME),
+    PSI_THREAD_KEY(recv_writer_thread, "ib_recv_write", PSI_FLAG_SINGLETON, 0,
+                   PSI_DOCUMENT_ME),
+    PSI_THREAD_KEY(srv_error_monitor_thread, "ib_srv_err_mon",
+                   PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME),
+    PSI_THREAD_KEY(srv_lock_timeout_thread, "ib_srv_lock_to",
+                   PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME),
+    PSI_THREAD_KEY(srv_master_thread, "ib_src_main", PSI_FLAG_SINGLETON, 0,
+                   PSI_DOCUMENT_ME),
+    PSI_THREAD_KEY(srv_monitor_thread, "ib_srv_mon", PSI_FLAG_SINGLETON, 0,
+                   PSI_DOCUMENT_ME),
+    PSI_THREAD_KEY(srv_purge_thread, "ib_srv_purge", PSI_FLAG_SINGLETON, 0,
+                   PSI_DOCUMENT_ME),
+    PSI_THREAD_KEY(srv_worker_thread, "ib_srv_wkr", 0, 0, PSI_DOCUMENT_ME),
+    PSI_THREAD_KEY(trx_recovery_rollback_thread, "ib_tx_recov", 0, 0,
+                   PSI_DOCUMENT_ME),
+    PSI_THREAD_KEY(page_flush_thread, "ib_pg_flush", 0, 0, PSI_DOCUMENT_ME),
+    PSI_THREAD_KEY(page_flush_coordinator_thread, "ib_pg_flush_co",
+                   PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME),
+    PSI_THREAD_KEY(fts_optimize_thread, "ib_fts_opt", PSI_FLAG_SINGLETON, 0,
+                   PSI_DOCUMENT_ME),
+    PSI_THREAD_KEY(fts_parallel_merge_thread, "ib_fts_merge", 0, 0,
+                   PSI_DOCUMENT_ME),
+    PSI_THREAD_KEY(fts_parallel_tokenization_thread, "ib_fts_token", 0, 0,
+                   PSI_DOCUMENT_ME),
+    PSI_THREAD_KEY(srv_ts_alter_encrypt_thread, "ib_ts_encrypt",
+                   PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME),
+    PSI_THREAD_KEY(parallel_read_thread, "ib_par_rd", 0, 0, PSI_DOCUMENT_ME),
+    PSI_THREAD_KEY(parallel_rseg_init_thread, "ib_par_rseg", 0, 0,
+                   PSI_DOCUMENT_ME),
+    PSI_THREAD_KEY(meb::redo_log_archive_consumer_thread, "ib_meb_rl",
+                   PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME)};
 #endif /* UNIV_PFS_THREAD */
 
 #ifdef UNIV_PFS_IO
@@ -982,6 +1014,18 @@
                           Parallel_reader::MAX_THREADS, /* Maxumum. */
                           0);
 
+static MYSQL_THDVAR_ULONG(ddl_buffer_size, PLUGIN_VAR_RQCMDARG,
+                          "Maximum size of memory to use (in bytes) for DDL.",
+                          nullptr, nullptr, 1048576, /* Default. */
+                          65536,                     /* Minimum. */
+                          4294967295, 0);            /* Maximum. */
+
+static MYSQL_THDVAR_ULONG(ddl_threads, PLUGIN_VAR_RQCMDARG,
+                          "Maximum number of threads to use for  DDL.", nullptr,
+                          nullptr, 4, /* Default. */
+                          1,          /* Minimum. */
+                          64, 0);     /* Maximum. */
+
 static SHOW_VAR innodb_status_variables[] = {
     {"buffer_pool_dump_status",
      (char *)&export_vars.innodb_buffer_pool_dump_status, SHOW_CHAR,
@@ -1406,7 +1450,7 @@
     innobase_open_tables = nullptr;
 
     for (auto file : innobase_sys_files) {
-      UT_DELETE(file);
+      ut::delete_(file);
     }
     innobase_sys_files.clear();
     innobase_sys_files.shrink_to_fit();
@@ -1506,9 +1550,9 @@
 @param[in]	idx_cond	(unused) Intended for conditional pushdown
 @param[in]	idx		Table id that indicates which I_S table to fill
 @return Operation status */
-static int innobase_fill_i_s_table(handlerton *hton MY_ATTRIBUTE((unused)),
-                                   THD *thd, TABLE_LIST *tables,
-                                   Item *idx_cond MY_ATTRIBUTE((unused)),
+static int innobase_fill_i_s_table(handlerton *hton [[maybe_unused]], THD *thd,
+                                   TABLE_LIST *tables,
+                                   Item *idx_cond [[maybe_unused]],
                                    enum_schema_tables idx) {
   assert(idx == SCH_TABLESPACES);
 
@@ -1797,15 +1841,13 @@
   }
 }
 
-/** Get the value of innodb_tmpdir.
-@param[in]	thd	thread handle, or NULL to query
-                        the global innodb_tmpdir.
-@retval NULL if innodb_tmpdir="" */
 const char *thd_innodb_tmpdir(THD *thd) {
 #ifdef UNIV_DEBUG
   if (thd != nullptr) {
-    trx_t *trx = thd_to_trx(thd);
+    auto trx = thd_to_trx(thd);
+
     btrsea_sync_check check(trx->has_search_latch);
+
     ut_ad(!sync_check_iterate(check));
   }
 #endif /* UNIV_DEBUG */
@@ -1816,14 +1858,14 @@
     tmp_dir = nullptr;
   }
 
-  return (tmp_dir);
+  return tmp_dir;
 }
 
 /** Obtain the private handler of InnoDB session specific data.
 @param[in,out]	thd	MySQL thread handler.
 @return reference to private handler */
-MY_ATTRIBUTE((warn_unused_result))
-innodb_session_t *&thd_to_innodb_session(THD *thd) {
+
+[[nodiscard]] innodb_session_t *&thd_to_innodb_session(THD *thd) {
   innodb_session_t *&innodb_session =
       *(innodb_session_t **)thd_ha_data(thd, innodb_hton_ptr);
 
@@ -1831,28 +1873,29 @@
     return (innodb_session);
   }
 
-  innodb_session = UT_NEW_NOKEY(innodb_session_t());
+  innodb_session = ut::new_withkey<innodb_session_t>(UT_NEW_THIS_FILE_PSI_KEY);
   return (innodb_session);
 }
 
 /** Obtain the InnoDB transaction of a MySQL thread.
 @param[in,out]	thd	MySQL thread handler.
 @return reference to transaction pointer */
-MY_ATTRIBUTE((warn_unused_result))
-trx_t *&thd_to_trx(THD *thd) {
+
+[[nodiscard]] trx_t *&thd_to_trx(THD *thd) {
   innodb_session_t *&innodb_session = thd_to_innodb_session(thd);
   ut_ad(innodb_session != nullptr);
 
   return (innodb_session->m_trx);
 }
 
-/** Return the number of read threads for this session.
-@param[in]      thd       Session instance, or nullptr to query the global
-                          innodb_parallel_read_threads value. */
 ulong thd_parallel_read_threads(THD *thd) {
-  return (THDVAR(thd, parallel_read_threads));
+  return THDVAR(thd, parallel_read_threads);
 }
 
+ulong thd_ddl_buffer_size(THD *thd) { return THDVAR(thd, ddl_buffer_size); }
+
+size_t thd_ddl_threads(THD *thd) noexcept { return THDVAR(thd, ddl_threads); }
+
 /** Check if statement is of type INSERT .... SELECT that involves
 use of intrinsic tables.
 @param[in]	user_thd	thread handler
@@ -2279,21 +2322,13 @@
 
 char *innobase_mysql_tmpdir() { return (mysql_tmpdir); }
 
-/** Creates a temporary file in the location specified by the parameter
-path. If the path is NULL, then it will be created in --tmpdir.
-@param[in]	path	location for creating temporary file
-@return temporary file descriptor, or < 0 on error */
-int innobase_mysql_tmpfile(const char *path) {
-  int fd2 = -1;
-  File fd;
-
+os_fd_t innobase_mysql_tmpfile(const char *path) {
   DBUG_EXECUTE_IF("innobase_tmpfile_creation_failure", return (-1););
 
-  if (path == nullptr) {
-    fd = mysql_tmpfile("ib");
-  } else {
-    fd = mysql_tmpfile_path(path, "ib");
-  }
+  auto fd =
+      (path == nullptr) ? mysql_tmpfile("ib") : mysql_tmpfile_path(path, "ib");
+
+  os_fd_t fd2{OS_FD_CLOSED};
 
   if (fd >= 0) {
     /* Copy the file descriptor, so that the additional resources
@@ -2311,31 +2346,39 @@
     to call my_get_osfhandle to get the HANDLE and then convert it
     to C runtime filedescriptor. */
     {
-      HANDLE hFile = my_get_osfhandle(fd);
       HANDLE hDup;
-      BOOL bOK =
+
+      auto hFile = my_get_osfhandle(fd);
+
+      auto bOK =
           DuplicateHandle(GetCurrentProcess(), hFile, GetCurrentProcess(),
                           &hDup, 0, FALSE, DUPLICATE_SAME_ACCESS);
       if (bOK) {
         fd2 = _open_osfhandle((intptr_t)hDup, 0);
       } else {
         my_osmaperr(GetLastError());
-        fd2 = -1;
+        fd2 = OS_FD_CLOSED;
       }
     }
 #else
     fd2 = dup(fd);
 #endif
+
     if (fd2 < 0) {
       char errbuf[MYSYS_STRERROR_SIZE];
+
       DBUG_PRINT("error", ("Got error %d on dup", fd2));
+
       set_my_errno(errno);
+
       my_error(EE_OUT_OF_FILERESOURCES, MYF(0), "ib*", my_errno(),
                my_strerror(errbuf, sizeof(errbuf), my_errno()));
     }
+
     my_close(fd, MYF(MY_WME));
   }
-  return (fd2);
+
+  return fd2;
 }
 
 /** Wrapper around MySQL's copy_and_convert function.
@@ -3064,9 +3107,9 @@
 @param[in]	dict_init_mode	whether to create or open the files
 @param[in,out]	tablespaces	predefined tablespaces created by the DDSE
 @return 0 on success, 1 on failure */
-static int innobase_init_files(dict_init_mode_t dict_init_mode,
-                               List<const Plugin_tablespace> *tablespaces)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static int innobase_init_files(
+    dict_init_mode_t dict_init_mode,
+    List<const Plugin_tablespace> *tablespaces);
 
 /** Initialize InnoDB for being used to store the DD tables.
 Create the required files according to the dict_init_mode.
@@ -3160,33 +3203,19 @@
       : m_mutex(),
         m_space_max_id(),
         m_n_to_check(),
-        m_n_threads()
-#if !defined(__SUNPRO_CC)
-        ,
+        m_n_threads(),
         m_n_validated(),
         m_n_skipped(),
         m_n_moved(),
         m_n_missing(),
         m_n_deleted(),
-        m_n_errors()
-#endif /* !__SUNPRO_CC */
-  {
-#if defined(__SUNPRO_CC)
-    m_n_validated = ATOMIC_VAR_INIT(0);
-    m_n_skipped = ATOMIC_VAR_INIT(0);
-    m_n_moved = ATOMIC_VAR_INIT(0);
-    m_n_missing = ATOMIC_VAR_INIT(0);
-    m_n_deleted = ATOMIC_VAR_INIT(0);
-    m_n_errors = ATOMIC_VAR_INIT(0);
-#endif /* __SUNPRO_CC */
-  }
+        m_n_errors() {}
 
   /** Validate the discovered tablespaces against the DD and attempt to open
   any DD tablespace not already open using a Parallel For Loop (par_for).
   @param[in]	tablespaces	Tablespace files read from the DD
   @return DB_SUCCESS if all OK */
-  dberr_t validate(const DD_tablespaces &tablespaces)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t validate(const DD_tablespaces &tablespaces);
 
  private:
   /** Validate a range of tablespaces from the DD.
@@ -3645,7 +3674,7 @@
 @param[in,out]	thd		thread handle
 @retval	true	on error
 @retval	false	on success */
-static MY_ATTRIBUTE((warn_unused_result)) bool boot_tablespaces(THD *thd) {
+[[nodiscard]] static bool boot_tablespaces(THD *thd) {
   auto dc = dd::get_dd_client(thd);
 
   using DD_tablespaces = std::vector<const dd::Tablespace *>;
@@ -3702,6 +3731,63 @@
                                false, dd_space_id));
 }
 
+/** Check if InnoDB is in a mode where the data dictionary is read-only.
+@return true if srv_read_only_mode is true or if srv_force_recovery > 0 */
+static bool innobase_is_dict_readonly() {
+  DBUG_TRACE;
+  return srv_read_only_mode || srv_force_recovery > 0;
+}
+
+#ifndef UNIV_HOTBACKUP
+/** Update metadata for innodb_temporary tablespace at server startup.
+This information is used by the information_schema.files to show the
+filename for the temporary tablespace innodb_temporary.
+@param[in,out]	thd		THD
+@retval false	on success
+@retval true	on failure */
+static bool update_innodb_temporary_metadata(THD *thd) {
+  if (innobase_is_dict_readonly()) {
+    /* Metadata cannot be updated if the server is started in read_only
+    mode. This means that the values for innodb_temp_data_file_path and
+    file_name in information_schema.files will not be in same. */
+    LogErr(WARNING_LEVEL, ER_SKIP_UPDATING_METADATA_IN_SE_RO_MODE,
+           "information_schema");
+    return false;
+  }
+
+  /* Get the filename from srv_tmp_space */
+  auto fpath = srv_tmp_space.first_datafile()->filepath();
+  auto &dc = *thd->dd_client();
+  dd::cache::Dictionary_client::Auto_releaser releaser(&dc);
+  const dd::String_type tbsp_name{dict_sys_t::s_temp_space_name};
+  dd::Tablespace *tmp_tbsp{nullptr};
+
+  if (!dc.acquire_for_modification<dd::Tablespace>(tbsp_name, &tmp_tbsp) &&
+      tmp_tbsp != nullptr) {
+    ut_ad(tmp_tbsp->files().size() == 1);
+
+    /* Get the tablespace file for innodb_temporary tablespace. */
+    dd::Tablespace_file *dd_file =
+        const_cast<dd::Tablespace_file *>(*(tmp_tbsp->files().begin()));
+
+    ut_ad(dd_file);
+
+    dd_file->set_filename(fpath);
+
+    if (dc.update(tmp_tbsp)) {
+      /* Unable to update the metadata. */
+      ut_ad(false);
+      return true;
+    }
+  } else {
+    /* Unable to acquire innodb_temporary tablespace for modification. */
+    ut_ad(false);
+    return true;
+  }
+  return false;
+}
+#endif /* !UNIV_HOTBACKUP */
+
 /** Predefine the undo tablespace metadata at server initialization.
 @param[in,out]	dd_client	data dictionary client
 @param[in,out]	thd		THD
@@ -3794,13 +3880,14 @@
     case DICT_RECOVERY_INITIALIZE_TABLESPACES:
       break;
     case DICT_RECOVERY_RESTART_SERVER:
-      /* Fall through */
+      [[fallthrough]];
     case DICT_RECOVERY_INITIALIZE_SERVER:
       if (dict_sys->dynamic_metadata == nullptr) {
         dict_sys->dynamic_metadata =
             dd_table_open_on_name(thd, nullptr, "mysql/innodb_dynamic_metadata",
                                   false, DICT_ERR_IGNORE_NONE);
-        dict_persist->table_buffer = UT_NEW_NOKEY(DDTableBuffer());
+        dict_persist->table_buffer =
+            ut::new_withkey<DDTableBuffer>(UT_NEW_THIS_FILE_PSI_KEY);
       }
 
       dict_sys->table_stats =
@@ -3811,7 +3898,7 @@
                                 DICT_ERR_IGNORE_NONE);
       dict_sys->ddl_log = dd_table_open_on_name(
           thd, nullptr, "mysql/innodb_ddl_log", false, DICT_ERR_IGNORE_NONE);
-      log_ddl = UT_NEW_NOKEY(Log_DDL());
+      log_ddl = ut::new_withkey<Log_DDL>(UT_NEW_THIS_FILE_PSI_KEY);
   }
 
   switch (dict_recovery_mode) {
@@ -3856,6 +3943,14 @@
 
   srv_start_threads(dict_recovery_mode != DICT_RECOVERY_RESTART_SERVER);
 
+#ifndef UNIV_HOTBACKUP
+  /* Update the metadata for innodb_temporary tablespace to reflect
+  the correct filename. */
+  if (update_innodb_temporary_metadata(thd)) {
+    return true;
+  }
+#endif /* !UNIV_HOTBACKUP */
+
   return (fil_open_for_business(srv_read_only_mode) != DB_SUCCESS);
 }
 
@@ -3869,7 +3964,7 @@
 
     /* Abort post recovery startup if this is not successful. */
     if (err != DB_SUCCESS) {
-      ib::fatal(ER_IB_MSG_POST_RECOVER_DDL_LOG_RECOVER);
+      ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_POST_RECOVER_DDL_LOG_RECOVER);
     }
   }
 
@@ -4090,13 +4185,6 @@
   arch_page_sys->get_status(status);
 }
 
-/** Check if InnoDB is in a mode where the data dictionary is read-only.
-@return true if srv_read_only_mode is true or if srv_force_recovery > 0 */
-static bool innobase_is_dict_readonly() {
-  DBUG_TRACE;
-  return srv_read_only_mode || srv_force_recovery > 0;
-}
-
 /** Gives the file extension of an InnoDB single-table tablespace. */
 static const char *ha_innobase_exts[] = {dot_ext[IBD], NullS};
 
@@ -4482,7 +4570,6 @@
 
   static char current_dir[3];
   char *default_path;
-  ulong num_pll_degree;
 
   /* First calculate the default path for innodb_data_home_dir etc.,
   in case the user has not given any value. */
@@ -4674,13 +4761,16 @@
   srv_max_n_open_files = (ulint)innobase_open_files;
   srv_innodb_status = (ibool)innobase_create_status_file;
 
-  /* Round up fts_sort_pll_degree to nearest power of 2 number */
-  for (num_pll_degree = 1; num_pll_degree < fts_sort_pll_degree;
-       num_pll_degree <<= 1) {
-    /* No op */
-  }
+  /* Round up ddl:fts_parser_threads to nearest power of 2 number */
+  {
+    ulong n_parser_threads = 1;
 
-  fts_sort_pll_degree = num_pll_degree;
+    while (n_parser_threads < ddl::fts_parser_threads) {
+      n_parser_threads <<= 1;
+    }
+
+    ddl::fts_parser_threads = n_parser_threads;
+  }
 
   /* Store the default charset-collation number of this MySQL
   installation */
@@ -4833,7 +4923,7 @@
 
     /* If this fails, do not continue startup. */
     if (err != DB_SUCCESS) {
-      ib::fatal(ER_IB_MSG_DDL_LOG_FAIL_POST_DDL);
+      ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_DDL_LOG_FAIL_POST_DDL);
     }
   }
 }
@@ -5101,7 +5191,7 @@
 }
 
 /** De initialize the InnoDB storage engine plugin. */
-static int innodb_deinit(MYSQL_PLUGIN plugin_info MY_ATTRIBUTE((unused))) {
+static int innodb_deinit(MYSQL_PLUGIN plugin_info [[maybe_unused]]) {
   release_plugin_services();
   return 0;
 }
@@ -5294,8 +5384,9 @@
     Tablespace::files_t::const_iterator end = srv_sys_space.m_files.end();
     Tablespace::files_t::const_iterator begin = srv_sys_space.m_files.begin();
     for (Tablespace::files_t::const_iterator it = begin; it != end; ++it) {
-      innobase_sys_files.push_back(UT_NEW_NOKEY(
-          Plugin_tablespace::Plugin_tablespace_file(it->name(), "")));
+      innobase_sys_files.push_back(
+          ut::new_withkey<Plugin_tablespace::Plugin_tablespace_file>(
+              UT_NEW_THIS_FILE_PSI_KEY, it->name(), ""));
       innodb.add_file(innobase_sys_files.back());
     }
     tablespaces->push_back(&innodb);
@@ -5409,7 +5500,7 @@
 void innobase_commit_low(trx_t *trx) /*!< in: transaction handle */
 {
   if (trx_is_started(trx)) {
-    const dberr_t error MY_ATTRIBUTE((unused)) = trx_commit_for_mysql(trx);
+    const dberr_t error [[maybe_unused]] = trx_commit_for_mysql(trx);
     // This is ut_ad not ut_a, because previously we did not have an assert
     // and nobody has noticed for a long time, so probably there is no much
     // harm in silencing this error. OTOH we believe it should no longer happen
@@ -5930,7 +6021,7 @@
     trx_free_for_mysql(trx);
   }
 
-  UT_DELETE(thd_to_innodb_session(thd));
+  ut::delete_(thd_to_innodb_session(thd));
 
   thd_to_innodb_session(thd) = nullptr;
 
@@ -6397,12 +6488,12 @@
               mtype == DATA_BLOB) {
             break;
           }
-          /* Fall through */
+          [[fallthrough]];
         case DATA_GEOMETRY:
           if (mtype == DATA_BLOB) {
             break;
           }
-          /* Fall through */
+          [[fallthrough]];
         default:
           /* Column type mismatches */
           return false;
@@ -6525,13 +6616,13 @@
 
   memset(marker, 0, sizeof(bool) * ncol);
 
-  s_templ->vtempl = static_cast<mysql_row_templ_t **>(
-      ut_zalloc_nokey((ncol + n_v_col) * sizeof *s_templ->vtempl));
+  s_templ->vtempl = static_cast<mysql_row_templ_t **>(ut::zalloc_withkey(
+      UT_NEW_THIS_FILE_PSI_KEY, (ncol + n_v_col) * sizeof *s_templ->vtempl));
   s_templ->n_col = ncol;
   s_templ->n_v_col = n_v_col;
   s_templ->rec_len = table->s->reclength;
-  s_templ->default_rec =
-      static_cast<byte *>(ut_malloc_nokey(table->s->reclength));
+  s_templ->default_rec = static_cast<byte *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, table->s->reclength));
   memcpy(s_templ->default_rec, table->s->default_values, table->s->reclength);
 
   /* Mark those columns could be base columns */
@@ -6584,8 +6675,9 @@
         vcol = dict_table_get_nth_v_col(ib_table, z);
       }
 
-      s_templ->vtempl[z + s_templ->n_col] = static_cast<mysql_row_templ_t *>(
-          ut_malloc_nokey(sizeof *s_templ->vtempl[j]));
+      s_templ->vtempl[z + s_templ->n_col] =
+          static_cast<mysql_row_templ_t *>(ut::malloc_withkey(
+              UT_NEW_THIS_FILE_PSI_KEY, sizeof *s_templ->vtempl[j]));
 
       innobase_vcol_build_templ(table, clust_index, field, &vcol->m_col,
                                 s_templ->vtempl[z + s_templ->n_col], z);
@@ -6605,8 +6697,8 @@
       ut_ad(!ut_strcmp(name, field->field_name));
 #endif
 
-      s_templ->vtempl[j] = static_cast<mysql_row_templ_t *>(
-          ut_malloc_nokey(sizeof *s_templ->vtempl[j]));
+      s_templ->vtempl[j] = static_cast<mysql_row_templ_t *>(ut::malloc_withkey(
+          UT_NEW_THIS_FILE_PSI_KEY, sizeof *s_templ->vtempl[j]));
 
       innobase_vcol_build_templ(table, clust_index, field, col,
                                 s_templ->vtempl[j], j);
@@ -6676,7 +6768,8 @@
   /* The number of index increased, rebuild the mapping table */
   if (mysql_num_index > share->idx_trans_tbl.array_size) {
     index_mapping = reinterpret_cast<dict_index_t **>(
-        ut_realloc(index_mapping, mysql_num_index * sizeof(*index_mapping)));
+        ut::realloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, index_mapping,
+                            mysql_num_index * sizeof(*index_mapping)));
 
     if (index_mapping == nullptr) {
       /* Report an error if index_mapping continues to be
@@ -6723,7 +6816,7 @@
 func_exit:
   if (!ret) {
     /* Build translation table failed. */
-    ut_free(index_mapping);
+    ut::free(index_mapping);
 
     share->idx_trans_tbl.array_size = 0;
     share->idx_trans_tbl.index_count = 0;
@@ -7116,7 +7209,8 @@
 
     if (m_prebuilt->m_temp_read_shared) {
       if (ib_table->temp_prebuilt == nullptr) {
-        ib_table->temp_prebuilt = UT_NEW_NOKEY(temp_prebuilt_vec());
+        ib_table->temp_prebuilt =
+            ut::new_withkey<temp_prebuilt_vec>(UT_NEW_THIS_FILE_PSI_KEY);
       }
 
       ib_table->temp_prebuilt->push_back(m_prebuilt);
@@ -7129,7 +7223,8 @@
   if (ib_table->n_v_cols) {
     dict_sys_mutex_enter();
     if (ib_table->vc_templ == nullptr) {
-      ib_table->vc_templ = UT_NEW_NOKEY(dict_vcol_templ_t());
+      ib_table->vc_templ =
+          ut::new_withkey<dict_vcol_templ_t>(UT_NEW_THIS_FILE_PSI_KEY);
       ib_table->vc_templ->vtempl = nullptr;
     } else if (ib_table->get_ref_count() == 1) {
       /* Clean and refresh the template if no one else
@@ -7686,8 +7781,9 @@
         case MYSQL_TYPE_DATETIME:
         case MYSQL_TYPE_TIMESTAMP:
           return (DATA_INT);
-        default: /* Fall through */
+        default:
           assert((ulint)MYSQL_TYPE_DECIMAL < 256);
+          [[fallthrough]];
         case MYSQL_TYPE_TIME2:
         case MYSQL_TYPE_DATETIME2:
         case MYSQL_TYPE_TIMESTAMP2:
@@ -8146,8 +8242,8 @@
   n_fields = (ulint)table->s->fields; /* number of columns */
 
   if (!m_prebuilt->mysql_template) {
-    m_prebuilt->mysql_template = (mysql_row_templ_t *)ut_malloc_nokey(
-        n_fields * sizeof(mysql_row_templ_t));
+    m_prebuilt->mysql_template = (mysql_row_templ_t *)ut::malloc_withkey(
+        UT_NEW_THIS_FILE_PSI_KEY, n_fields * sizeof(mysql_row_templ_t));
   }
 
   m_prebuilt->template_type =
@@ -8431,6 +8527,7 @@
         }
       }
       /* Fall through to old style locking. */
+      [[fallthrough]];
 
     case AUTOINC_OLD_STYLE_LOCKING:
       DBUG_EXECUTE_IF("die_if_autoinc_old_lock_style_used", ut_ad(0););
@@ -9706,7 +9803,7 @@
       if (!m_prebuilt->trx->allow_semi_consistent()) {
         break;
       }
-      /* fall through */
+      [[fallthrough]];
     case ROW_READ_TRY_SEMI_CONSISTENT:
       row_unlock_for_mysql(m_prebuilt, FALSE);
       break;
@@ -10394,14 +10491,15 @@
   }
 
   /* Parallel read is not currently supported for sampling. */
-  size_t max_threads = Parallel_reader::available_threads(1);
+  size_t max_threads = Parallel_reader::available_threads(1, false);
 
   if (max_threads == 0) {
     return HA_ERR_SAMPLING_INIT_FAILED;
   }
 
-  Histogram_sampler *sampler = UT_NEW_NOKEY(Histogram_sampler(
-      max_threads, sampling_seed, sampling_percentage, sampling_method));
+  Histogram_sampler *sampler = ut::new_withkey<Histogram_sampler>(
+      UT_NEW_THIS_FILE_PSI_KEY, max_threads, sampling_seed, sampling_percentage,
+      sampling_method);
 
   if (sampler == nullptr) {
     Parallel_reader::release_threads(max_threads);
@@ -10447,7 +10545,7 @@
 int ha_innobase::sample_end(void *scan_ctx) {
   Histogram_sampler *sampler = static_cast<Histogram_sampler *>(scan_ctx);
 
-  UT_DELETE(sampler);
+  ut::delete_(sampler);
 
   return 0;
 }
@@ -11008,8 +11106,8 @@
 /** Create a table definition to an InnoDB database.
 @param[in]	dd_table	dd::Table or nullptr for intrinsic table
 @return HA_* level error */
-inline MY_ATTRIBUTE((warn_unused_result)) int create_table_info_t::
-    create_table_def(const dd::Table *dd_table) {
+[[nodiscard]] inline int create_table_info_t::create_table_def(
+    const dd::Table *dd_table) {
   dict_table_t *table;
   ulint n_cols;
   dberr_t err;
@@ -11842,7 +11940,7 @@
     is_valid = false;
   }
 
-  ut_free(filepath);
+  ut::free(filepath);
 #endif /* UNIV_HOTBACKUP */
 
   return (is_valid);
@@ -12879,13 +12977,14 @@
       }
       zip_allowed = false;
       /* fall through to set row_type = DYNAMIC */
+      [[fallthrough]];
     case ROW_TYPE_NOT_USED:
     case ROW_TYPE_FIXED:
     case ROW_TYPE_PAGED:
       push_warning(m_thd, Sql_condition::SL_WARNING,
                    ER_ILLEGAL_HA_CREATE_OPTION,
                    "InnoDB: assuming ROW_FORMAT=DYNAMIC.");
-      // Fall through.
+      [[fallthrough]];
     case ROW_TYPE_DYNAMIC:
       innodb_row_format = REC_FORMAT_DYNAMIC;
       break;
@@ -13619,12 +13718,12 @@
     if (dd_create_implicit_tablespace(client, m_thd, m_table->space,
                                       m_table->name.m_name, filename, false,
                                       dd_space_id)) {
-      ut_free(filename);
+      ut::free(filename);
       return HA_ERR_GENERIC;
     }
 
     ut_ad(dd_space_id != dd::INVALID_OBJECT_ID);
-    ut_free(filename);
+    ut::free(filename);
   } else {
     ut_ad(DICT_TF_HAS_SHARED_SPACE(m_table->flags));
 
@@ -13969,7 +14068,7 @@
     error = dd_tablespace_rename(dd_space_id, false, norm_to, new_path);
 
     if (new_path != nullptr) {
-      ut_free(new_path);
+      ut::free(new_path);
     }
   }
 
@@ -14227,7 +14326,7 @@
   } else {
     char *ptr = Fil_path::make_ibd_from_table_name(temp_name);
     new_path.assign(ptr);
-    ut_free(ptr);
+    ut::free(ptr);
   }
 
   /* New filepath must not exist. */
@@ -14236,10 +14335,8 @@
 
   if (err == DB_SUCCESS) {
     dict_sys_mutex_enter();
-    clone_mark_abort(true);
     err = fil_rename_tablespace(m_table->space, old_path, temp_name,
                                 new_path.c_str());
-    clone_mark_active();
     dict_sys_mutex_exit();
 
     if (err == DB_SUCCESS) {
@@ -14247,7 +14344,7 @@
     }
   }
 
-  ut_free(old_path);
+  ut::free(old_path);
 
   return (convert_error_code_to_mysql(err, m_table->flags, nullptr));
 }
@@ -14265,8 +14362,8 @@
   char *tablespace = const_cast<char *>(m_create_info.tablespace);
   char *data_file_name = const_cast<char *>(m_create_info.data_file_name);
 
-  ut_free(tablespace);
-  ut_free(data_file_name);
+  ut::free(tablespace);
+  ut::free(data_file_name);
 }
 
 template <typename Table>
@@ -14421,14 +14518,14 @@
         case dd::Index::IT_PRIMARY:
           /* PRIMARY!=FTS_DOC_ID_INDEX */
           ut_ad(!"wrong fts_doc_id_index");
-          /* fall through */
+          [[fallthrough]];
         case dd::Index::IT_UNIQUE:
           /* We already checked for this. */
           ut_ad(fts_doc_id_index->algorithm() == dd::Index::IA_BTREE);
           if (dd_is_only_column(fts_doc_id_index, fts_doc_id)) {
             break;
           }
-          /* fall through */
+          [[fallthrough]];
         case dd::Index::IT_MULTIPLE:
         case dd::Index::IT_FULLTEXT:
         case dd::Index::IT_SPATIAL:
@@ -14494,7 +14591,7 @@
   2. full PRIMARY KEY columns which don't exist in the secondary index */
 
   std::vector<const dd::Index_element *,
-              ut_allocator<const dd::Index_element *>>
+              ut::allocator<const dd::Index_element *>>
       pk_elements;
 
   for (dd::Index *index : *dd_table->indexes()) {
@@ -14740,7 +14837,19 @@
 
   if (err != DB_SUCCESS) {
     /* unable to lock the table: do nothing */
-  } else if (discard) {
+    /* purecov: begin inspected */
+    return convert_error_code_to_mysql(err, dict_table->flags, nullptr);
+    /* purecov: end */
+  }
+
+  /* Concurrent clone operation is not supported. */
+  Clone_notify notifier(Clone_notify::Type::SPACE_IMPORT,
+                        dict_sys_t::s_invalid_space_id, false);
+  if (notifier.failed()) {
+    return notifier.get_error();
+  }
+
+  if (discard) {
     /* Discarding an already discarded tablespace should be an
     idempotent operation. Also, if the .ibd file is missing the
     user may want to set the DISCARD flag in order to IMPORT
@@ -15404,10 +15513,8 @@
   DBUG_EXECUTE_IF("alter_encrypt_tablespace_crash_before_processing",
                   DBUG_SUICIDE(););
 
-  clone_mark_abort(true);
   /* do encryption/unencryption processing now. */
   err = fsp_alter_encrypt_tablespace(thd, space_id, to_encrypt, new_dd_space);
-  clone_mark_active();
 
   DBUG_EXECUTE_IF("alter_encrypt_tablespace_crash_after_processing",
                   DBUG_SUICIDE(););
@@ -15626,6 +15733,15 @@
     return error;
   }
 
+  /* Notify clone about the UNDO DDL and possibly wait. We don't
+  need similar notification for drop which is recoverable with DDL
+  log. */
+  Clone_notify notifier(Clone_notify::Type::SPACE_UNDO_DDL,
+                        dict_sys_t::s_invalid_space_id, false);
+  if (notifier.failed()) {
+    return notifier.get_error();
+  }
+
   /* Create the tablespace object. */
 
   /* Serialize all undo tablespace DDLs */
@@ -17097,7 +17213,7 @@
 
   mutex_exit(&dict_persist->mutex);
 
-  UT_DELETE(readmeta);
+  ut::delete_(readmeta);
 
   return (std::max(meta_autoinc, autoinc));
 }
@@ -17874,7 +17990,9 @@
   }
 
   /* Restore the original isolation level */
-  m_prebuilt->trx->isolation_level = old_isolation_level;
+  m_prebuilt->trx->isolation_level =
+      static_cast<trx_t::isolation_level_t>(old_isolation_level);
+
 #if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG
   /* We validate the whole adaptive hash index for all tables
   at every CHECK TABLE only when QUICK flag is not present. */
@@ -18630,7 +18748,7 @@
     }
   };
 
-  typedef std::vector<Value, ut_allocator<Value>> Values;
+  typedef std::vector<Value, ut::allocator<Value>> Values;
 
   /** Collect the individual latch counts */
   struct GetCount {
@@ -18948,7 +19066,7 @@
                 share);
 
     /* Free any memory from index translation table */
-    ut_free(share->idx_trans_tbl.index_mapping);
+    ut::free(share->idx_trans_tbl.index_mapping);
 
     my_free(share);
 
@@ -20007,7 +20125,7 @@
 static void innodb_extend_and_initialize_update(THD *thd, SYS_VAR *var,
                                                 void *var_ptr,
                                                 const void *save) {
-  bool extend_and_initialize MY_ATTRIBUTE((unused)) =
+  bool extend_and_initialize [[maybe_unused]] =
       *static_cast<const bool *>(save);
 #if !defined(NO_FALLOCATE) && defined(UNIV_LINUX)
   *static_cast<bool *>(var_ptr) = extend_and_initialize;
@@ -20679,8 +20797,7 @@
 /** Evict all uncompressed pages of compressed tables from the buffer pool.
 Keep the compressed pages in the buffer pool.
 @return whether all uncompressed pages were evicted */
-static MY_ATTRIBUTE(
-    (warn_unused_result)) bool innodb_buffer_pool_evict_uncompressed(void) {
+[[nodiscard]] static bool innodb_buffer_pool_evict_uncompressed(void) {
   bool all_evicted = true;
 
   for (ulint i = 0; i < srv_buf_pool_instances; i++) {
@@ -20796,10 +20913,10 @@
 @param[in]	var       pointer to system variable
 @param[in]	var_ptr   where the formal string goes
 @param[in]	save      immediate result from check function */
-static void innodb_undo_tablespaces_update(
-    THD *thd MY_ATTRIBUTE((unused)), SYS_VAR *var MY_ATTRIBUTE((unused)),
-    void *var_ptr MY_ATTRIBUTE((unused)),
-    const void *save MY_ATTRIBUTE((unused))) {
+static void innodb_undo_tablespaces_update(THD *thd [[maybe_unused]],
+                                           SYS_VAR *var [[maybe_unused]],
+                                           void *var_ptr [[maybe_unused]],
+                                           const void *save [[maybe_unused]]) {
   innodb_undo_tablespaces_deprecate();
 }
 
@@ -20834,11 +20951,6 @@
   /* If encryption is to be disabled. This will just make sure I/O doesn't
   write UNDO pages encrypted from now on. */
   if (target == false) {
-    /* Check and exit if concurrent clone in progress. */
-    if (clone_check_active()) {
-      my_error(ER_CLONE_IN_PROGRESS, MYF(0));
-      return (ER_CLONE_IN_PROGRESS);
-    }
     *static_cast<bool *>(save) = false;
     return (0);
   }
@@ -20851,13 +20963,6 @@
     return (0);
   }
 
-  /* Check and exit if concurrent clone in progress. The mark ensures
-  that any new clone waits while we set encryption information. */
-  if (!clone_mark_wait()) {
-    my_error(ER_CLONE_IN_PROGRESS, MYF(0));
-    return (ER_CLONE_IN_PROGRESS);
-  }
-
   /* UNDO tablespace encryption to be mutually exclusive with any UNDO DDL */
   mutex_enter(&undo::ddl_mutex);
 
@@ -20870,7 +20975,6 @@
   }
 
   mutex_exit(&undo::ddl_mutex);
-  clone_mark_free();
   return (0);
 }
 
@@ -20901,11 +21005,6 @@
   /* If encryption is to be disabled. This will just make sure I/O doesn't
   write REDO encrypted from now on. */
   if (target == false) {
-    /* Check and exit if concurrent clone in progress. */
-    if (clone_check_active()) {
-      my_error(ER_CLONE_IN_PROGRESS, MYF(0));
-      return (ER_CLONE_IN_PROGRESS);
-    }
     *static_cast<bool *>(save) = false;
     return (0);
   }
@@ -20915,13 +21014,6 @@
     return (0);
   }
 
-  /* Check and exit if concurrent clone in progress. The mark ensures
-  that any new clone waits while we set encryption information. */
-  if (!clone_mark_wait()) {
-    my_error(ER_CLONE_IN_PROGRESS, MYF(0));
-    return (ER_CLONE_IN_PROGRESS);
-  }
-
   /* Enable encryption for REDO tablespaces */
   bool ret = srv_enable_redo_encryption(false);
 
@@ -20929,7 +21021,6 @@
     /* At this point, REDO log is set to be encrypted. */
     *static_cast<bool *>(save) = true;
   }
-  clone_mark_free();
   return (0);
 }
 
@@ -21060,7 +21151,7 @@
 @return the relevance ranking value */
 static float innobase_fts_retrieve_ranking(FT_INFO *fts_hdl) {
   fts_result_t *result;
-  row_prebuilt_t *ft_prebuilt MY_ATTRIBUTE((unused));
+  row_prebuilt_t *ft_prebuilt [[maybe_unused]];
 
   result = reinterpret_cast<NEW_FT_INFO *>(fts_hdl)->ft_result;
 
@@ -21117,9 +21208,10 @@
 @param[in]  var       pointer to system variable
 @param[out] var_ptr   where the formal string goes
 @param[in]  save      immediate result from check function */
-static void wait_background_drop_list_empty(
-    THD *thd MY_ATTRIBUTE((unused)), SYS_VAR *var MY_ATTRIBUTE((unused)),
-    void *var_ptr MY_ATTRIBUTE((unused)), const void *save) {
+static void wait_background_drop_list_empty(THD *thd [[maybe_unused]],
+                                            SYS_VAR *var [[maybe_unused]],
+                                            void *var_ptr [[maybe_unused]],
+                                            const void *save) {
   row_wait_for_background_drop_list_empty();
 }
 
@@ -21129,9 +21221,9 @@
 @param[in]  var       pointer to system variable
 @param[out] var_ptr   where the formal string goes
 @param[in]  save      immediate result from check function */
-static void purge_run_now_set(THD *thd MY_ATTRIBUTE((unused)),
-                              SYS_VAR *var MY_ATTRIBUTE((unused)),
-                              void *var_ptr MY_ATTRIBUTE((unused)),
+static void purge_run_now_set(THD *thd [[maybe_unused]],
+                              SYS_VAR *var [[maybe_unused]],
+                              void *var_ptr [[maybe_unused]],
                               const void *save) {
   if (*(bool *)save && trx_purge_state() != PURGE_STATE_DISABLED) {
     trx_purge_run();
@@ -21144,9 +21236,9 @@
 @param[in]  var       pointer to system variable
 @param[out] var_ptr   where the formal string goes
 @param[in]  save      immediate result from check function */
-static void purge_stop_now_set(THD *thd MY_ATTRIBUTE((unused)),
-                               SYS_VAR *var MY_ATTRIBUTE((unused)),
-                               void *var_ptr MY_ATTRIBUTE((unused)),
+static void purge_stop_now_set(THD *thd [[maybe_unused]],
+                               SYS_VAR *var [[maybe_unused]],
+                               void *var_ptr [[maybe_unused]],
                                const void *save) {
   if (*(bool *)save && trx_purge_state() != PURGE_STATE_DISABLED) {
     trx_purge_stop();
@@ -21159,9 +21251,9 @@
 @param[in]      var       pointer to system variable, ignored
 @param[in,out]  var_ptr   where the formal string goes, ignored
 @param[in]      save      immediate result from check function */
-static void log_flush_now_set(THD *thd MY_ATTRIBUTE((unused)),
-                              SYS_VAR *var MY_ATTRIBUTE((unused)),
-                              void *var_ptr MY_ATTRIBUTE((unused)),
+static void log_flush_now_set(THD *thd [[maybe_unused]],
+                              SYS_VAR *var [[maybe_unused]],
+                              void *var_ptr [[maybe_unused]],
                               const void *save) {
   if (!*(bool *)save) {
     return;
@@ -21176,9 +21268,9 @@
 @param[in]  var       pointer to system variable
 @param[out] var_ptr   where the formal string goes
 @param[in]  save      immediate result from check function */
-static void checkpoint_now_set(THD *thd MY_ATTRIBUTE((unused)),
-                               SYS_VAR *var MY_ATTRIBUTE((unused)),
-                               void *var_ptr MY_ATTRIBUTE((unused)),
+static void checkpoint_now_set(THD *thd [[maybe_unused]],
+                               SYS_VAR *var [[maybe_unused]],
+                               void *var_ptr [[maybe_unused]],
                                const void *save) {
   if (*(bool *)save && !srv_checkpoint_disabled) {
     /* Note that it's defined only when UNIV_DEBUG is defined.
@@ -21206,9 +21298,9 @@
 @param[in]  var       pointer to system variable
 @param[out] var_ptr   where the formal string goes
 @param[in]  save      immediate result from check function */
-static void checkpoint_fuzzy_now_set(THD *thd MY_ATTRIBUTE((unused)),
-                                     SYS_VAR *var MY_ATTRIBUTE((unused)),
-                                     void *var_ptr MY_ATTRIBUTE((unused)),
+static void checkpoint_fuzzy_now_set(THD *thd [[maybe_unused]],
+                                     SYS_VAR *var [[maybe_unused]],
+                                     void *var_ptr [[maybe_unused]],
                                      const void *save) {
   if (*(bool *)save && !srv_checkpoint_disabled) {
     /* Note that it's defined only when UNIV_DEBUG is defined.
@@ -21252,9 +21344,9 @@
 @param[in]  var       pointer to system variable
 @param[out] var_ptr   where the formal string goes
 @param[in]  save      immediate result from check function */
-static void buf_flush_list_now_set(THD *thd MY_ATTRIBUTE((unused)),
-                                   SYS_VAR *var MY_ATTRIBUTE((unused)),
-                                   void *var_ptr MY_ATTRIBUTE((unused)),
+static void buf_flush_list_now_set(THD *thd [[maybe_unused]],
+                                   SYS_VAR *var [[maybe_unused]],
+                                   void *var_ptr [[maybe_unused]],
                                    const void *save) {
   if (*(bool *)save) {
     buf_flush_sync_all_buf_pools();
@@ -21317,9 +21409,9 @@
 @param[in]  var       pointer to system variable
 @param[out] var_ptr   where the formal string goes
 @param[in]  save      immediate result from check function */
-static void buffer_pool_dump_now(THD *thd MY_ATTRIBUTE((unused)),
-                                 SYS_VAR *var MY_ATTRIBUTE((unused)),
-                                 void *var_ptr MY_ATTRIBUTE((unused)),
+static void buffer_pool_dump_now(THD *thd [[maybe_unused]],
+                                 SYS_VAR *var [[maybe_unused]],
+                                 void *var_ptr [[maybe_unused]],
                                  const void *save) {
   if (*(bool *)save && !srv_read_only_mode) {
     buf_dump_start();
@@ -21332,9 +21424,9 @@
 @param[in]  var       pointer to system variable
 @param[out] var_ptr   where the formal string goes
 @param[in]  save      immediate result from check function */
-static void buffer_pool_load_now(THD *thd MY_ATTRIBUTE((unused)),
-                                 SYS_VAR *var MY_ATTRIBUTE((unused)),
-                                 void *var_ptr MY_ATTRIBUTE((unused)),
+static void buffer_pool_load_now(THD *thd [[maybe_unused]],
+                                 SYS_VAR *var [[maybe_unused]],
+                                 void *var_ptr [[maybe_unused]],
                                  const void *save) {
   if (*(bool *)save) {
     buf_load_start();
@@ -21347,9 +21439,9 @@
 @param[in]  var       pointer to system variable
 @param[out] var_ptr   where the formal string goes
 @param[in]  save      immediate result from check function */
-static void buffer_pool_load_abort(THD *thd MY_ATTRIBUTE((unused)),
-                                   SYS_VAR *var MY_ATTRIBUTE((unused)),
-                                   void *var_ptr MY_ATTRIBUTE((unused)),
+static void buffer_pool_load_abort(THD *thd [[maybe_unused]],
+                                   SYS_VAR *var [[maybe_unused]],
+                                   void *var_ptr [[maybe_unused]],
                                    const void *save) {
   if (*(bool *)save) {
     buf_load_abort();
@@ -22006,7 +22098,7 @@
     " and we rely on innodb_lock_wait_timeout in case of deadlock.",
     nullptr, innobase_deadlock_detect_update, TRUE);
 
-static MYSQL_SYSVAR_LONG(fill_factor, innobase_fill_factor, PLUGIN_VAR_RQCMDARG,
+static MYSQL_SYSVAR_LONG(fill_factor, ddl::fill_factor, PLUGIN_VAR_RQCMDARG,
                          "Percentage of B-tree page filled during bulk insert",
                          nullptr, nullptr, 100, 10, 100, 0);
 
@@ -22059,7 +22151,7 @@
                           "for each optimize table call ",
                           nullptr, nullptr, 2000, 1000, 10000, 0);
 
-static MYSQL_SYSVAR_ULONG(ft_sort_pll_degree, fts_sort_pll_degree,
+static MYSQL_SYSVAR_ULONG(ft_sort_pll_degree, ddl::fts_parser_threads,
                           PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
                           "InnoDB Fulltext search parallel sort degree, will "
                           "round up to nearest power of 2 number",
@@ -22750,6 +22842,8 @@
     MYSQL_SYSVAR(commit_concurrency),
     MYSQL_SYSVAR(concurrency_tickets),
     MYSQL_SYSVAR(compression_level),
+    MYSQL_SYSVAR(ddl_buffer_size),
+    MYSQL_SYSVAR(ddl_threads),
     MYSQL_SYSVAR(data_file_path),
     MYSQL_SYSVAR(temp_data_file_path),
     MYSQL_SYSVAR(data_home_dir),
@@ -23056,7 +23150,8 @@
     return;
   }
 
-  table->vc_templ = UT_NEW_NOKEY(dict_vcol_templ_t());
+  table->vc_templ =
+      ut::new_withkey<dict_vcol_templ_t>(UT_NEW_THIS_FILE_PSI_KEY);
   table->vc_templ->vtempl = nullptr;
 
   std::string schema_name;
@@ -23091,29 +23186,23 @@
   table->vc_templ->tb_name.assign(table_name);
 }
 
-/** Get the updated parent field value from the update vector for the
-given col_no.
-@param[in]	foreign		foreign key information
-@param[in]	update		updated parent vector.
-@param[in]	col_no		base column position of the child table to check
-@return updated field from the parent update vector, else NULL */
-static dfield_t *innobase_get_field_from_update_vector(dict_foreign_t *foreign,
-                                                       upd_t *update,
-                                                       ulint col_no) {
+dfield_t *innobase_get_field_from_update_vector(dict_foreign_t *foreign,
+                                                upd_t *update,
+                                                uint32_t col_no) {
   dict_table_t *parent_table = foreign->referenced_table;
   dict_index_t *parent_index = foreign->referenced_index;
-  ulint parent_field_no;
-  ulint parent_col_no;
-  ulint child_col_no;
+  uint32_t parent_field_no;
+  uint32_t parent_col_no;
+  uint32_t child_col_no;
 
-  for (ulint i = 0; i < foreign->n_fields; i++) {
+  for (uint32_t i = 0; i < foreign->n_fields; i++) {
     child_col_no = foreign->foreign_index->get_col_no(i);
     if (child_col_no != col_no) {
       continue;
     }
     parent_col_no = parent_index->get_col_no(i);
     parent_field_no = dict_table_get_nth_col_pos(parent_table, parent_col_no);
-    for (ulint j = 0; j < update->n_fields; j++) {
+    for (uint32_t j = 0; j < update->n_fields; j++) {
       upd_field_t *parent_ufield = &update->fields[j];
       if (parent_ufield->field_no == parent_field_no) {
         return (&parent_ufield->new_val);
@@ -23191,7 +23280,7 @@
   for (ulint i = 0; i < col->num_base; i++) {
     dict_col_t *base_col = col->base_col[i];
     const dfield_t *row_field = nullptr;
-    ulint col_no = base_col->ind;
+    uint32_t col_no = base_col->ind;
     const mysql_row_templ_t *templ = index->table->vc_templ->vtempl[col_no];
     const byte *data;
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/handler/ha_innodb.h mysql-8.0-8.0.27/storage/innobase/handler/ha_innodb.h
--- mysql-8.0-8.0.26/storage/innobase/handler/ha_innodb.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/handler/ha_innodb.h	2021-09-28 11:46:34.000000000 +0000
@@ -729,13 +729,12 @@
  matches, this function pushes an warning message to the client,
  and returns true.
  @return true if the index name matches the reserved name */
-bool innobase_index_name_is_reserved(
+[[nodiscard]] bool innobase_index_name_is_reserved(
     THD *thd,            /*!< in/out: MySQL connection */
     const KEY *key_info, /*!< in: Indexes to be
                          created */
-    ulint num_of_keys)   /*!< in: Number of indexes to
+    ulint num_of_keys);  /*!< in: Number of indexes to
                          be created. */
-    MY_ATTRIBUTE((warn_unused_result));
 
 /** Check if the explicit tablespace targeted is file_per_table.
 @param[in]	create_info	Metadata for the table to create.
@@ -1185,11 +1184,10 @@
 /**
 Initialize the table FTS stopword list
 @return true if success */
-ibool innobase_fts_load_stopword(
+[[nodiscard]] ibool innobase_fts_load_stopword(
     dict_table_t *table, /*!< in: Table has the FTS */
     trx_t *trx,          /*!< in: transaction */
-    THD *thd)            /*!< in: current thread */
-    MY_ATTRIBUTE((warn_unused_result));
+    THD *thd);           /*!< in: current thread */
 
 /** Some defines for innobase_fts_check_doc_id_index() return value */
 enum fts_doc_id_index_enum {
@@ -1202,23 +1200,21 @@
 Check whether the table has a unique index with FTS_DOC_ID_INDEX_NAME
 on the Doc ID column.
 @return the status of the FTS_DOC_ID index */
-fts_doc_id_index_enum innobase_fts_check_doc_id_index(
+[[nodiscard]] fts_doc_id_index_enum innobase_fts_check_doc_id_index(
     const dict_table_t *table,  /*!< in: table definition */
     const TABLE *altered_table, /*!< in: MySQL table
                                 that is being altered */
-    ulint *fts_doc_col_no)      /*!< out: The column number for
-                                Doc ID */
-    MY_ATTRIBUTE((warn_unused_result));
+    ulint *fts_doc_col_no);     /*!< out: The column number for
+                               Doc ID */
 
 /**
 Check whether the table has a unique index with FTS_DOC_ID_INDEX_NAME
 on the Doc ID column in MySQL create index definition.
 @return FTS_EXIST_DOC_ID_INDEX if there exists the FTS_DOC_ID index,
 FTS_INCORRECT_DOC_ID_INDEX if the FTS_DOC_ID index is of wrong format */
-fts_doc_id_index_enum innobase_fts_check_doc_id_index_in_def(
-    ulint n_key,         /*!< in: Number of keys */
-    const KEY *key_info) /*!< in: Key definitions */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] fts_doc_id_index_enum innobase_fts_check_doc_id_index_in_def(
+    ulint n_key,          /*!< in: Number of keys */
+    const KEY *key_info); /*!< in: Key definitions */
 
 /**
 Copy table flags from MySQL's TABLE_SHARE into an InnoDB table object.
@@ -1246,9 +1242,6 @@
 /** whether this is a stored column */
 #define innobase_is_s_fld(field) ((field)->gcol_info && (field)->stored_in_db)
 
-/** whether this is a computed virtual column */
-#define innobase_is_v_fld(field) ((field)->gcol_info && !(field)->stored_in_db)
-
 /** Whether this is a computed multi-value virtual column.
 This condition check should be equal to the following one:
 (innobase_is_v_fld(field) && (field)->gcol_info->expr_item &&
diff -Nru mysql-8.0-8.0.26/storage/innobase/handler/ha_innopart.cc mysql-8.0-8.0.27/storage/innobase/handler/ha_innopart.cc
--- mysql-8.0-8.0.26/storage/innobase/handler/ha_innopart.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/handler/ha_innopart.cc	2021-09-28 11:46:34.000000000 +0000
@@ -54,6 +54,7 @@
 
 /* Include necessary InnoDB headers */
 #include "btr0sea.h"
+#include "ddl0ddl.h"
 #include "dict0dd.h"
 #include "dict0dict.h"
 #include "dict0priv.h"
@@ -73,7 +74,6 @@
 #include "partition_info.h"
 #include "row0import.h"
 #include "row0ins.h"
-#include "row0merge.h"
 #include "row0mysql.h"
 #include "row0quiesce.h"
 #include "row0sel.h"
@@ -95,11 +95,11 @@
 Ha_innopart_share::~Ha_innopart_share() {
   ut_ad(m_ref_count == 0);
   if (m_table_parts != nullptr) {
-    ut_free(m_table_parts);
+    ut::free(m_table_parts);
     m_table_parts = nullptr;
   }
   if (m_index_mapping != nullptr) {
-    ut_free(m_index_mapping);
+    ut::free(m_index_mapping);
     m_index_mapping = nullptr;
   }
 }
@@ -208,7 +208,8 @@
   if (ib_table->n_v_cols > 0) {
     for (ulint i = 0; i < m_tot_parts; i++) {
       if (m_table_parts[i]->vc_templ == nullptr) {
-        m_table_parts[i]->vc_templ = UT_NEW_NOKEY(dict_vcol_templ_t());
+        m_table_parts[i]->vc_templ =
+            ut::new_withkey<dict_vcol_templ_t>(UT_NEW_THIS_FILE_PSI_KEY);
         m_table_parts[i]->vc_templ->vtempl = nullptr;
       } else if (m_table_parts[i]->get_ref_count() == 1) {
         /* Clean and refresh the template */
@@ -272,8 +273,8 @@
 
   uint tot_parts = part_info->get_tot_partitions();
   size_t table_parts_size = sizeof(dict_table_t *) * tot_parts;
-  dict_table_t **table_parts = static_cast<dict_table_t **>(
-      ut_zalloc(table_parts_size, mem_key_partitioning));
+  dict_table_t **table_parts = static_cast<dict_table_t **>(ut::zalloc_withkey(
+      ut::make_psi_memory_key(mem_key_partitioning), table_parts_size));
   if (table_parts == nullptr) {
     return (nullptr);
   }
@@ -296,7 +297,7 @@
                             &table_parts[i])) {
       ut_ad(table_parts[i] == nullptr);
       close_table_parts(table_parts, i);
-      ut_free(table_parts);
+      ut::free(table_parts);
       return (nullptr);
     }
     i++;
@@ -339,7 +340,7 @@
       ut_ad(m_table_parts[i] == table_parts[i]);
     }
 #endif /* UNIV_DEBUG */
-    ut_free(table_parts);
+    ut::free(table_parts);
     return (false);
   }
 
@@ -366,8 +367,8 @@
   if (mysql_num_index != 0) {
     size_t alloc_size =
         mysql_num_index * m_tot_parts * sizeof(*m_index_mapping);
-    m_index_mapping = static_cast<dict_index_t **>(
-        ut_zalloc(alloc_size, mem_key_partitioning));
+    m_index_mapping = static_cast<dict_index_t **>(ut::zalloc_withkey(
+        ut::make_psi_memory_key(mem_key_partitioning), alloc_size));
     if (m_index_mapping == nullptr) {
       /* Report an error if index_mapping continues to be
       NULL and mysql_num_index is a non-zero value. */
@@ -419,7 +420,7 @@
     }
   }
   if (!index_loaded && m_index_mapping != nullptr) {
-    ut_free(m_index_mapping);
+    ut::free(m_index_mapping);
     m_index_mapping = nullptr;
   }
 
@@ -472,12 +473,12 @@
 
   if (m_table_parts != nullptr) {
     close_table_parts(m_table_parts, m_tot_parts);
-    ut_free(m_table_parts);
+    ut::free(m_table_parts);
     m_table_parts = nullptr;
   }
 
   if (m_index_mapping != nullptr) {
-    ut_free(m_index_mapping);
+    ut::free(m_index_mapping);
     m_index_mapping = nullptr;
   }
 
@@ -637,8 +638,8 @@
 Therefore there's no need for a covering lock.
 @param[in]	no_lock	If locking should be skipped. Not used!
 @return	0 for success or error code. */
-inline int ha_innopart::initialize_auto_increment(
-    bool no_lock MY_ATTRIBUTE((unused))) {
+inline int ha_innopart::initialize_auto_increment(bool no_lock
+                                                  [[maybe_unused]]) {
   int error = 0;
   ulonglong auto_inc = 0;
   const Field *field = table->found_next_number_field;
@@ -1121,25 +1122,26 @@
 #endif /* HA_INNOPART_SUPPORTS_FULLTEXT */
 
   size_t alloc_size = sizeof(*m_ins_node_parts) * m_tot_parts;
-  m_ins_node_parts =
-      static_cast<ins_node_t **>(ut_zalloc(alloc_size, mem_key_partitioning));
+  m_ins_node_parts = static_cast<ins_node_t **>(ut::zalloc_withkey(
+      ut::make_psi_memory_key(mem_key_partitioning), alloc_size));
 
   alloc_size = sizeof(*m_upd_node_parts) * m_tot_parts;
-  m_upd_node_parts =
-      static_cast<upd_node_t **>(ut_zalloc(alloc_size, mem_key_partitioning));
+  m_upd_node_parts = static_cast<upd_node_t **>(ut::zalloc_withkey(
+      ut::make_psi_memory_key(mem_key_partitioning), alloc_size));
 
   alloc_blob_heap_array();
 
   alloc_size = sizeof(*m_trx_id_parts) * m_tot_parts;
-  m_trx_id_parts =
-      static_cast<trx_id_t *>(ut_zalloc(alloc_size, mem_key_partitioning));
+  m_trx_id_parts = static_cast<trx_id_t *>(ut::zalloc_withkey(
+      ut::make_psi_memory_key(mem_key_partitioning), alloc_size));
 
   alloc_size = sizeof(*m_row_read_type_parts) * m_tot_parts;
-  m_row_read_type_parts =
-      static_cast<ulint *>(ut_zalloc(alloc_size, mem_key_partitioning));
+  m_row_read_type_parts = static_cast<ulint *>(ut::zalloc_withkey(
+      ut::make_psi_memory_key(mem_key_partitioning), alloc_size));
 
   alloc_size = sizeof(*m_bitset) * UT_BITS_IN_BYTES(m_tot_parts);
-  m_bitset = static_cast<byte *>(ut_zalloc(alloc_size, mem_key_partitioning));
+  m_bitset = static_cast<byte *>(ut::zalloc_withkey(
+      ut::make_psi_memory_key(mem_key_partitioning), alloc_size));
 
   if (m_ins_node_parts == nullptr || m_upd_node_parts == nullptr ||
       m_blob_heap_parts == nullptr || m_trx_id_parts == nullptr ||
@@ -1260,23 +1262,23 @@
   }
 
   if (m_ins_node_parts != nullptr) {
-    ut_free(m_ins_node_parts);
+    ut::free(m_ins_node_parts);
     m_ins_node_parts = nullptr;
   }
   if (m_upd_node_parts != nullptr) {
-    ut_free(m_upd_node_parts);
+    ut::free(m_upd_node_parts);
     m_upd_node_parts = nullptr;
   }
   if (m_trx_id_parts != nullptr) {
-    ut_free(m_trx_id_parts);
+    ut::free(m_trx_id_parts);
     m_trx_id_parts = nullptr;
   }
   if (m_row_read_type_parts != nullptr) {
-    ut_free(m_row_read_type_parts);
+    ut::free(m_row_read_type_parts);
     m_row_read_type_parts = nullptr;
   }
 
-  ut_free(m_bitset);
+  ut::free(m_bitset);
   m_bitset = nullptr;
 
   MONITOR_INC(MONITOR_TABLE_CLOSE);
@@ -1583,7 +1585,8 @@
   if (need_clust_index) {
     alloc_size *= 2;
   }
-  buf = ut_zalloc(alloc_size, mem_key_partitioning);
+  buf = ut::zalloc_withkey(ut::make_psi_memory_key(mem_key_partitioning),
+                           alloc_size);
   if (buf == nullptr) {
     return true;
   }
@@ -1593,7 +1596,8 @@
   }
   /* mapping from part_id to pcur. */
   alloc_size = m_tot_parts * sizeof(*m_pcur_map);
-  buf = ut_zalloc(alloc_size, mem_key_partitioning);
+  buf = ut::zalloc_withkey(ut::make_psi_memory_key(mem_key_partitioning),
+                           alloc_size);
   if (buf == nullptr) {
     return true;
   }
@@ -1621,7 +1625,7 @@
         btr_pcur_free(&m_clust_pcur_parts[i]);
       }
     }
-    ut_free(m_pcur_parts);
+    ut::free(m_pcur_parts);
     m_clust_pcur_parts = nullptr;
     m_pcur_parts = nullptr;
     /* Reset the original m_prebuilt->pcur. */
@@ -1629,7 +1633,7 @@
     m_prebuilt->clust_pcur = m_clust_pcur;
   }
   if (m_pcur_map != nullptr) {
-    ut_free(m_pcur_map);
+    ut::free(m_pcur_map);
     m_pcur_map = nullptr;
   }
 }
@@ -2046,14 +2050,15 @@
   }
 
   /* Parallel read is not currently supported for sampling. */
-  size_t max_threads = Parallel_reader::available_threads(1);
+  size_t max_threads = Parallel_reader::available_threads(1, false);
 
   if (max_threads == 0) {
     return HA_ERR_SAMPLING_INIT_FAILED;
   }
 
-  Histogram_sampler *sampler = UT_NEW_NOKEY(Histogram_sampler(
-      max_threads, sampling_seed, sampling_percentage, sampling_method));
+  Histogram_sampler *sampler = ut::new_withkey<Histogram_sampler>(
+      UT_NEW_THIS_FILE_PSI_KEY, max_threads, sampling_seed, sampling_percentage,
+      sampling_method);
 
   if (sampler == nullptr) {
     Parallel_reader::release_threads(max_threads);
@@ -2114,7 +2119,7 @@
 
 int ha_innopart::sample_end(void *scan_ctx) {
   auto sampler = static_cast<Histogram_sampler *>(scan_ctx);
-  UT_DELETE(sampler);
+  ut::delete_(sampler);
 
   return 0;
 }
@@ -3187,7 +3192,7 @@
   auto trx = thd_to_trx(ha_thd());
   size_t n_threads = thd_parallel_read_threads(m_prebuilt->trx->mysql_thd);
 
-  n_threads = Parallel_reader::available_threads(n_threads);
+  n_threads = Parallel_reader::available_threads(n_threads, false);
 
   if (n_threads > 0 && trx->isolation_level > TRX_ISO_READ_UNCOMMITTED &&
       m_prebuilt->select_lock_type == LOCK_NONE &&
@@ -4142,8 +4147,8 @@
   DBUG_TRACE;
 
   const ulint len = sizeof(mem_heap_t *) * m_tot_parts;
-  m_blob_heap_parts =
-      static_cast<mem_heap_t **>(ut_zalloc(len, mem_key_partitioning));
+  m_blob_heap_parts = static_cast<mem_heap_t **>(
+      ut::zalloc_withkey(ut::make_psi_memory_key(mem_key_partitioning), len));
   if (m_blob_heap_parts == nullptr) {
     return nullptr;
   }
@@ -4157,7 +4162,7 @@
 
   if (m_blob_heap_parts != nullptr) {
     clear_blob_heaps();
-    ut_free(m_blob_heap_parts);
+    ut::free(m_blob_heap_parts);
     m_blob_heap_parts = nullptr;
   }
 }
diff -Nru mysql-8.0-8.0.26/storage/innobase/handler/ha_innopart.h mysql-8.0-8.0.27/storage/innobase/handler/ha_innopart.h
--- mysql-8.0-8.0.26/storage/innobase/handler/ha_innopart.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/handler/ha_innopart.h	2021-09-28 11:46:34.000000000 +0000
@@ -543,7 +543,7 @@
                                                      part_id);
   }
 
-  uint alter_flags(uint flags MY_ATTRIBUTE((unused))) const override {
+  uint alter_flags(uint flags [[maybe_unused]]) const override {
     return (HA_PARTITION_FUNCTION_SUPPORTED | HA_INPLACE_CHANGE_PARTITION);
   }
 
@@ -719,7 +719,7 @@
   Therefore there's no need for a covering lock.
   @param[in]	no_lock	If locking should be skipped. Not used!
   @return	0 for success or error code. */
-  int initialize_auto_increment(bool no_lock MY_ATTRIBUTE((unused))) override;
+  int initialize_auto_increment(bool no_lock [[maybe_unused]]) override;
 
   /** Save currently highest auto increment value.
   @param[in]	nr	Auto increment value to save. */
diff -Nru mysql-8.0-8.0.26/storage/innobase/handler/handler0alter.cc mysql-8.0-8.0.27/storage/innobase/handler/handler0alter.cc
--- mysql-8.0-8.0.26/storage/innobase/handler/handler0alter.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/handler/handler0alter.cc	2021-09-28 11:46:34.000000000 +0000
@@ -78,6 +78,7 @@
 #include "my_io.h"
 
 #include "clone0api.h"
+#include "ddl0ddl.h"
 #include "dict0dd.h"
 #include "fts0plugin.h"
 #include "fts0priv.h"
@@ -88,7 +89,6 @@
 #include "rem0types.h"
 #include "row0ins.h"
 #include "row0log.h"
-#include "row0merge.h"
 #include "row0sel.h"
 #include "sql/create_field.h"
 #include "srv0mon.h"
@@ -217,7 +217,7 @@
   /** default values of ADD COLUMN, or NULL */
   const dtuple_t *add_cols;
   /** autoinc sequence to use */
-  ib_sequence_t sequence;
+  ddl::Sequence sequence;
   /** maximum auto-increment value */
   ulonglong max_autoinc;
   /** temporary table name to use for old table when renaming tables */
@@ -231,7 +231,7 @@
   dict_v_col_t *drop_vcol;
   const char **drop_vcol_name;
   /** ALTER TABLE stage progress recorder */
-  ut_stage_alter_t *m_stage;
+  Alter_stage *m_stage;
   /** FTS AUX Tables to drop */
   aux_name_vec_t *fts_drop_aux_vec;
 
@@ -295,7 +295,7 @@
       fts_free_aux_names(fts_drop_aux_vec);
       delete fts_drop_aux_vec;
     }
-    UT_DELETE(m_stage);
+    ut::delete_(m_stage);
     mem_heap_free(heap);
   }
 
@@ -308,7 +308,7 @@
   @param[in] ctx        handler context */
   void set_shared_data(const inplace_alter_handler_ctx *ctx) override {
     ut_ad(ctx != nullptr);
-    if (this->add_autoinc == ULINT_UNDEFINED) {
+    if (add_autoinc == ULINT_UNDEFINED) {
       return;
     }
     const ha_innobase_inplace_ctx *ha_ctx =
@@ -317,7 +317,7 @@
     /* In InnoDB table, if it's adding AUTOINC column,
     the sequence value should be shared among contexts */
     ut_ad(ha_ctx->add_autoinc != ULINT_UNDEFINED);
-    this->sequence = ha_ctx->sequence;
+    sequence = ha_ctx->sequence;
   }
 
  private:
@@ -644,7 +644,7 @@
 /** Determine if ALTER TABLE needs to rebuild the table.
 @param[in]	ha_alter_info	The DDL operation
 @return whether it is necessary to rebuild the table */
-static MY_ATTRIBUTE((warn_unused_result)) bool innobase_need_rebuild(
+[[nodiscard]] static bool innobase_need_rebuild(
     const Alter_inplace_info *ha_alter_info) {
   if (is_instant(ha_alter_info)) {
     return (false);
@@ -767,7 +767,7 @@
           may not be empty. Have to fall back to INPLACE */
           break;
         }
-        /* Fall through */
+        [[fallthrough]];
       case Instant_Type::INSTANT_NO_CHANGE:
       case Instant_Type::INSTANT_VIRTUAL_ONLY:
         ha_alter_info->handler_trivial_ctx = instant_type_to_int(instant_type);
@@ -1052,7 +1052,7 @@
 @return	false	On success
 @retval	true	On failure */
 template <typename Table>
-static MY_ATTRIBUTE((warn_unused_result)) bool dd_prepare_inplace_alter_table(
+[[nodiscard]] static bool dd_prepare_inplace_alter_table(
     THD *thd, const dict_table_t *old_table, dict_table_t *new_table,
     const Table *old_dd_tab, Table *new_dd_tab);
 
@@ -1192,7 +1192,8 @@
 
   const auto row_len = m_prebuilt->mysql_row_len;
 
-  auto adapter = UT_NEW_NOKEY(Parallel_reader_adapter(max_threads, row_len));
+  auto adapter = ut::new_withkey<Parallel_reader_adapter>(
+      UT_NEW_THIS_FILE_PSI_KEY, max_threads, row_len);
 
   if (adapter == nullptr) {
     Parallel_reader::release_threads(max_threads);
@@ -1209,7 +1210,7 @@
       });
 
   if (err != DB_SUCCESS) {
-    UT_DELETE(adapter);
+    ut::delete_(adapter);
     return (convert_error_code_to_mysql(err, 0, ha_thd()));
   }
 
@@ -1249,7 +1250,7 @@
 void ha_innobase::parallel_scan_end(void *parallel_scan_ctx) {
   Parallel_reader_adapter *parallel_reader =
       static_cast<Parallel_reader_adapter *>(parallel_scan_ctx);
-  UT_DELETE(parallel_reader);
+  ut::delete_(parallel_reader);
 }
 
 /** Alter the table structure in-place with operations
@@ -1275,14 +1276,14 @@
   ut_ad(old_dd_tab != nullptr);
   ut_ad(new_dd_tab != nullptr);
 
-  /* Don't allow database clone during in place operations */
-  clone_mark_abort(true);
+  /* Notify clone during in place operations */
+  Clone_notify notifier(Clone_notify::Type::SPACE_ALTER_INPLACE,
+                        dict_sys_t::s_invalid_space_id, false);
+  ut_ad(!notifier.failed());
 
   auto ret = inplace_alter_table_impl<dd::Table>(altered_table, ha_alter_info,
                                                  old_dd_tab, new_dd_tab);
 
-  clone_mark_active();
-
   return ret;
 }
 
@@ -1451,7 +1452,7 @@
 
 /** Check whether the foreign key options is legit
  @return true if it is */
-static MY_ATTRIBUTE((warn_unused_result)) bool innobase_check_fk_option(
+[[nodiscard]] static bool innobase_check_fk_option(
     const dict_foreign_t *foreign) /*!< in: foreign key */
 {
   if (!foreign->foreign_index) {
@@ -1475,7 +1476,7 @@
 
 /** Set foreign key options
  @return true if successfully set */
-static MY_ATTRIBUTE((warn_unused_result)) bool innobase_set_foreign_key_option(
+[[nodiscard]] static bool innobase_set_foreign_key_option(
     dict_foreign_t *foreign,        /*!< in:InnoDB Foreign key */
     const Foreign_key_spec *fk_key) /*!< in: Foreign key info from
                                     MySQL */
@@ -1520,7 +1521,7 @@
 /** Check if a foreign key constraint can make use of an index
  that is being created.
  @return useable index, or NULL if none found */
-static MY_ATTRIBUTE((warn_unused_result)) const KEY *innobase_find_equiv_index(
+[[nodiscard]] static const KEY *innobase_find_equiv_index(
     const char *const *col_names,
     /*!< in: column names */
     uint n_cols,     /*!< in: number of columns */
@@ -1574,7 +1575,7 @@
 /** Find an index whose first fields are the columns in the array
  in the same order and is not marked for deletion
  @return matching index, NULL if not found */
-static MY_ATTRIBUTE((warn_unused_result)) dict_index_t *innobase_find_fk_index(
+[[nodiscard]] static dict_index_t *innobase_find_fk_index(
     Alter_inplace_info *ha_alter_info,
     /*!< in: alter table info */
     dict_table_t *table, /*!< in: table */
@@ -1678,7 +1679,7 @@
 @param[in]	s_cols		list of stored column information
 @retval true if successful
 @retval false on error (will call my_error()) */
-static MY_ATTRIBUTE((warn_unused_result)) bool innobase_get_foreign_key_info(
+[[nodiscard]] static bool innobase_get_foreign_key_info(
     Alter_inplace_info *ha_alter_info, const TABLE_SHARE *table_share,
     dict_table_t *table, const char **col_names, dict_index_t **drop_index,
     ulint n_drop_index, dict_foreign_t **add_fk, ulint *n_add_fk,
@@ -1965,7 +1966,7 @@
     case DATA_POINT:
       /* Above are the valid column types for MySQL data. */
       ut_ad(flen == len);
-      /* fall through */
+      [[fallthrough]];
     case DATA_FIXBINARY:
     case DATA_CHAR:
       /* We may have flen > len when there is a shorter
@@ -2124,7 +2125,7 @@
 
 /** This function checks that index keys are sensible.
  @return 0 or error number */
-static MY_ATTRIBUTE((warn_unused_result)) int innobase_check_index_keys(
+[[nodiscard]] static int innobase_check_index_keys(
     const Alter_inplace_info *info,
     /*!< in: indexes to be created or dropped */
     const dict_table_t *innodb_table)
@@ -2260,7 +2261,7 @@
 @param[in]	new_clustered		new cluster */
 static void innobase_create_index_field_def(const TABLE *altered_table,
                                             const KEY_PART_INFO *key_part,
-                                            index_field_t *index_field,
+                                            ddl::Index_field *index_field,
                                             bool new_clustered) {
   const Field *field;
   ibool is_unsigned;
@@ -2284,26 +2285,26 @@
 
   col_type = get_innobase_type_from_mysql_type(&is_unsigned, field);
 
-  index_field->is_multi_value = innobase_is_multi_value_fld(field);
+  index_field->m_is_multi_value = innobase_is_multi_value_fld(field);
   if (!field->stored_in_db && field->gcol_info) {
-    index_field->is_v_col = true;
-    index_field->col_no = num_v;
+    index_field->m_is_v_col = true;
+    index_field->m_col_no = num_v;
   } else {
-    index_field->is_v_col = false;
-    index_field->col_no = key_part->fieldnr - num_v;
+    index_field->m_is_v_col = false;
+    index_field->m_col_no = key_part->fieldnr - num_v;
   }
-  index_field->is_ascending = !(key_part->key_part_flag & HA_REVERSE_SORT);
+  index_field->m_is_ascending = !(key_part->key_part_flag & HA_REVERSE_SORT);
 
   /* No prefix index on multi-value field */
-  if (!index_field->is_multi_value &&
+  if (!index_field->m_is_multi_value &&
       (DATA_LARGE_MTYPE(col_type) ||
        (key_part->length < field->pack_length() &&
         field->type() != MYSQL_TYPE_VARCHAR) ||
        (field->type() == MYSQL_TYPE_VARCHAR &&
         key_part->length < field->pack_length() - field->get_length_bytes()))) {
-    index_field->prefix_len = key_part->length;
+    index_field->m_prefix_len = key_part->length;
   } else {
-    index_field->prefix_len = 0;
+    index_field->m_prefix_len = 0;
   }
 }
 
@@ -2322,37 +2323,38 @@
 }
 
 /** Create index definition for key
-@param[in]	altered_table		MySQL table that is being altered
-@param[in]	new_dd_tab		new dd table
-@param[in]	keys			key definitions
-@param[in]	key_number		MySQL key number
-@param[in]	new_clustered		true if generating a new clustered
-index on the table
-@param[in]	key_clustered		true if this is the new clustered index
-@param[out]	index			index definition
-@param[in]	heap			heap where memory is allocated */
+@param[in] altered_table        MySQL table that is being altered
+@param[in] new_dd_tab           New dd table
+@param[in] keys                 Key definitions
+@param[in] key_number           MySQL key number
+@param[in] new_clustered        true if generating a new clustered index
+                                on the table
+@param[in] key_clustered        true if this is the new clustered index
+@param[out] index_def           Index definition
+@param[in] heap                 heap where memory is allocated */
 template <typename Table>
 static void innobase_create_index_def(const TABLE *altered_table,
                                       const Table *new_dd_tab, const KEY *keys,
                                       ulint key_number, bool new_clustered,
-                                      bool key_clustered, index_def_t *index,
+                                      bool key_clustered,
+                                      ddl::Index_defn *index_def,
                                       mem_heap_t *heap) {
-  const KEY *key = &keys[key_number];
   ulint i;
+  const KEY *key = &keys[key_number];
   ulint n_fields = key->user_defined_key_parts;
 
   DBUG_TRACE;
   assert(!key_clustered || new_clustered);
 
-  index->fields = static_cast<index_field_t *>(
-      mem_heap_alloc(heap, n_fields * sizeof *index->fields));
+  index_def->m_fields = static_cast<ddl::Index_field *>(
+      mem_heap_alloc(heap, n_fields * sizeof *index_def->m_fields));
 
-  index->parser = nullptr;
-  index->is_ngram = false;
-  index->key_number = key_number;
-  index->n_fields = n_fields;
-  index->name = mem_heap_strdup(heap, key->name);
-  index->rebuild = new_clustered;
+  index_def->m_parser = nullptr;
+  index_def->m_is_ngram = false;
+  index_def->m_key_number = key_number;
+  index_def->m_n_fields = n_fields;
+  index_def->m_name = mem_heap_strdup(heap, key->name);
+  index_def->m_rebuild = new_clustered;
 
   /* If this is a spatial index, we need to fetch the SRID */
   if (key->flags & HA_SPATIAL) {
@@ -2360,7 +2362,7 @@
         key_number + ((altered_table->s->primary_key == MAX_KEY) ? 1 : 0);
 
     const auto *dd_index_auto =
-        (index->key_number != ULINT_UNDEFINED)
+        (index_def->m_key_number != ULINT_UNDEFINED)
             ? const_cast<const Table *>(new_dd_tab)->indexes()[dd_key_num]
             : nullptr;
 
@@ -2376,20 +2378,20 @@
       }
       const dd::Column &col = dd_index->elements()[geom_col_idx]->column();
       bool has_value = col.srs_id().has_value();
-      index->srid_is_valid = has_value;
-      index->srid = has_value ? col.srs_id().value() : 0;
+      index_def->m_srid_is_valid = has_value;
+      index_def->m_srid = has_value ? col.srs_id().value() : 0;
     }
   }
 
   if (key_clustered) {
     assert(!(key->flags & (HA_FULLTEXT | HA_SPATIAL)));
     assert(key->flags & HA_NOSAME);
-    index->ind_type = DICT_CLUSTERED | DICT_UNIQUE;
+    index_def->m_ind_type = DICT_CLUSTERED | DICT_UNIQUE;
   } else if (key->flags & HA_FULLTEXT) {
     assert(!(key->flags & (HA_SPATIAL | HA_NOSAME)));
     assert(!(key->flags & HA_KEYFLAG_MASK &
              ~(HA_FULLTEXT | HA_PACK_KEY | HA_BINARY_PACK_KEY)));
-    index->ind_type = DICT_FTS;
+    index_def->m_ind_type = DICT_FTS;
 
     /* Set plugin parser */
     /* Note: key->parser is only parser name,
@@ -2400,10 +2402,10 @@
           ut_ad(altered_table->key_info[j].flags & HA_USES_PARSER);
 
           plugin_ref parser = altered_table->key_info[j].parser;
-          index->parser =
+          index_def->m_parser =
               static_cast<st_mysql_ftparser *>(plugin_decl(parser)->info);
 
-          index->is_ngram =
+          index_def->m_is_ngram =
               strncmp(plugin_name(parser)->str, FTS_NGRAM_PARSER_NAME,
                       plugin_name(parser)->length) == 0;
 
@@ -2412,12 +2414,12 @@
       }
 
       DBUG_EXECUTE_IF("fts_instrument_use_default_parser",
-                      index->parser = &fts_default_parser;);
-      ut_ad(index->parser);
+                      index_def->m_parser = &fts_default_parser;);
+      ut_ad(index_def->m_parser);
     }
   } else if (key->flags & HA_SPATIAL) {
     assert(!(key->flags & HA_NOSAME));
-    index->ind_type = DICT_SPATIAL;
+    index_def->m_ind_type = DICT_SPATIAL;
     ut_ad(n_fields == 1);
     ulint num_v = 0;
 
@@ -2428,14 +2430,14 @@
         num_v++;
       }
     }
-    index->fields[0].col_no = key->key_part[0].fieldnr - num_v;
-    index->fields[0].prefix_len = 0;
-    index->fields[0].is_v_col = false;
+    index_def->m_fields[0].m_col_no = key->key_part[0].fieldnr - num_v;
+    index_def->m_fields[0].m_prefix_len = 0;
+    index_def->m_fields[0].m_is_v_col = false;
 
     /* Currently only ascending order is supported in spatial
     index. */
     ut_ad(!(key->key_part[0].key_part_flag & HA_REVERSE_SORT));
-    index->fields[0].is_ascending = true;
+    index_def->m_fields[0].m_is_ascending = true;
 
     if (!key->key_part[0].field->stored_in_db &&
         key->key_part[0].field->gcol_info) {
@@ -2443,25 +2445,25 @@
       on virtual columns. It is blocked in server
       layer */
       ut_ad(0);
-      index->fields[0].is_v_col = true;
+      index_def->m_fields[0].m_is_v_col = true;
     } else {
-      index->fields[0].is_v_col = false;
+      index_def->m_fields[0].m_is_v_col = false;
     }
   } else {
-    index->ind_type = (key->flags & HA_NOSAME) ? DICT_UNIQUE : 0;
+    index_def->m_ind_type = (key->flags & HA_NOSAME) ? DICT_UNIQUE : 0;
   }
 
   if (!(key->flags & HA_SPATIAL)) {
     for (i = 0; i < n_fields; i++) {
       innobase_create_index_field_def(altered_table, &key->key_part[i],
-                                      &index->fields[i], new_clustered);
+                                      &index_def->m_fields[i], new_clustered);
 
-      if (index->fields[i].is_v_col) {
-        index->ind_type |= DICT_VIRTUAL;
+      if (index_def->m_fields[i].m_is_v_col) {
+        index_def->m_ind_type |= DICT_VIRTUAL;
       }
 
-      if (index->fields[i].is_multi_value) {
-        index->ind_type |= DICT_MULTI_VALUE;
+      if (index_def->m_fields[i].m_is_multi_value) {
+        index_def->m_ind_type |= DICT_MULTI_VALUE;
       }
     }
   }
@@ -2681,7 +2683,7 @@
 
  @return key definitions */
 template <typename Table>
-static MY_ATTRIBUTE((warn_unused_result, malloc)) index_def_t
+[[nodiscard]] static MY_ATTRIBUTE((malloc)) ddl::Index_defn
     *innobase_create_key_defs(mem_heap_t *heap,
                               /*!< in/out: memory heap where space for key
                               definitions are allocated */
@@ -2706,8 +2708,8 @@
 /*!< in: whether we need to add new DOC ID
 index for FTS index */
 {
-  index_def_t *indexdef;
-  index_def_t *indexdefs;
+  ddl::Index_defn *indexdef;
+  ddl::Index_defn *index_defs;
   bool new_primary;
   const uint *const add = ha_alter_info->index_add_buffer;
   const KEY *const key_info = ha_alter_info->key_info_buffer;
@@ -2740,7 +2742,7 @@
 
   /* Reserve one more space if new_primary is true, and we might
   need to add the FTS_DOC_ID_INDEX */
-  indexdef = indexdefs = static_cast<index_def_t *>(mem_heap_alloc(
+  indexdef = index_defs = static_cast<ddl::Index_defn *>(mem_heap_alloc(
       heap, sizeof *indexdef *
                 (ha_alter_info->key_count + rebuild + got_default_clust)));
 
@@ -2760,15 +2762,15 @@
       }
     } else if (got_default_clust) {
       /* Create the GEN_CLUST_INDEX */
-      index_def_t *index = indexdef++;
+      ddl::Index_defn *index_def = indexdef++;
 
-      index->fields = nullptr;
-      index->n_fields = 0;
-      index->ind_type = DICT_CLUSTERED;
-      index->name = innobase_index_reserve_name;
-      index->rebuild = true;
-      index->key_number = ~0;
-      index->is_ngram = false;
+      index_def->m_fields = nullptr;
+      index_def->m_n_fields = 0;
+      index_def->m_ind_type = DICT_CLUSTERED;
+      index_def->m_name = innobase_index_reserve_name;
+      index_def->m_rebuild = true;
+      index_def->m_key_number = ~0;
+      index_def->m_is_ngram = false;
       primary_key_number = ULINT_UNDEFINED;
       goto created_clustered;
     } else {
@@ -2790,7 +2792,7 @@
       innobase_create_index_def(altered_table, new_dd_table, key_info, i, true,
                                 false, indexdef, heap);
 
-      if (indexdef->ind_type & DICT_FTS) {
+      if (indexdef->m_ind_type & DICT_FTS) {
         n_fts_add++;
       }
 
@@ -2833,7 +2835,7 @@
       innobase_create_index_def(altered_table, new_dd_table, key_info, add[i],
                                 false, false, indexdef, heap);
 
-      if (indexdef->ind_type & DICT_FTS) {
+      if (indexdef->m_ind_type & DICT_FTS) {
         n_fts_add++;
       }
 
@@ -2841,41 +2843,42 @@
     }
   }
 
-  assert(indexdefs + n_add == indexdef);
+  assert(index_defs + n_add == indexdef);
 
   if (add_fts_doc_idx) {
-    index_def_t *index = indexdef++;
+    ddl::Index_defn *index_def = indexdef++;
 
-    index->fields = static_cast<index_field_t *>(
-        mem_heap_alloc(heap, sizeof *index->fields));
-    index->n_fields = 1;
-    index->fields->col_no = fts_doc_id_col;
-    index->fields->prefix_len = 0;
-    index->fields->is_ascending = true;
-    index->fields->is_v_col = false;
-    index->ind_type = DICT_UNIQUE;
+    index_def->m_fields = static_cast<ddl::Index_field *>(
+        mem_heap_alloc(heap, sizeof *index_def->m_fields));
+
+    index_def->m_n_fields = 1;
+    index_def->m_fields->m_col_no = fts_doc_id_col;
+    index_def->m_fields->m_prefix_len = 0;
+    index_def->m_fields->m_is_ascending = true;
+    index_def->m_fields->m_is_v_col = false;
+    index_def->m_ind_type = DICT_UNIQUE;
     ut_ad(!rebuild || !add_fts_doc_id ||
           fts_doc_id_col <= altered_table->s->fields);
 
-    index->name = FTS_DOC_ID_INDEX_NAME;
-    index->is_ngram = false;
-    index->rebuild = rebuild;
+    index_def->m_name = FTS_DOC_ID_INDEX_NAME;
+    index_def->m_is_ngram = false;
+    index_def->m_rebuild = rebuild;
 
     /* TODO: assign a real MySQL key number for this */
-    index->key_number = ULINT_UNDEFINED;
+    index_def->m_key_number = ULINT_UNDEFINED;
     n_add++;
   }
 
-  assert(indexdef > indexdefs);
-  assert((ulint)(indexdef - indexdefs) <=
+  assert(indexdef > index_defs);
+  assert((ulint)(indexdef - index_defs) <=
          ha_alter_info->key_count + add_fts_doc_idx + got_default_clust);
   assert(ha_alter_info->index_add_count <= n_add);
-  return indexdefs;
+  return index_defs;
 }
 
 /** Check each index column size, make sure they do not exceed the max limit
  @return true if index column size exceeds limit */
-static MY_ATTRIBUTE((warn_unused_result)) bool innobase_check_column_length(
+[[nodiscard]] static bool innobase_check_column_length(
     ulint max_col_len,   /*!< in: maximum column length */
     const KEY *key_info) /*!< in: Indexes to be created */
 {
@@ -2970,7 +2973,7 @@
 
   if (modify) {
     /* Since the table has been modified, table->def_trx_id should be
-    adjusted like row_merge_drop_indexes(). However, this function may
+    adjusted like ddl::drop_indexes(). However, this function may
     be called before the DDL transaction starts, so it is impossible to
     get current DDL transaction ID. Thus advancing def_trx_id by 1 to
     simply inform other threads about this change. */
@@ -2989,7 +2992,7 @@
 @param drop_fk constraints being dropped
 @param n_drop_fk number of constraints that are being dropped
 @return whether the constraint is being dropped */
-inline MY_ATTRIBUTE((warn_unused_result)) bool innobase_dropping_foreign(
+[[nodiscard]] inline bool innobase_dropping_foreign(
     const dict_foreign_t *foreign, dict_foreign_t **drop_fk, ulint n_drop_fk) {
   while (n_drop_fk--) {
     if (*drop_fk++ == foreign) {
@@ -3035,7 +3038,7 @@
 @param heap Memory heap where allocated
 @return array of integers, mapping column numbers in the table
 to column numbers in altered_table */
-static MY_ATTRIBUTE((warn_unused_result)) const ulint *innobase_build_col_map(
+[[nodiscard]] static const ulint *innobase_build_col_map(
     Alter_inplace_info *ha_alter_info, const TABLE *altered_table,
     const TABLE *table, const dict_table_t *new_table,
     const dict_table_t *old_table, dtuple_t *add_cols, mem_heap_t *heap) {
@@ -3172,7 +3175,7 @@
 @param user_table	InnoDB table as it is before the ALTER operation
 @param heap		Memory heap for the allocation
 @return array of new column names in rebuilt_table, or NULL if not renamed */
-static MY_ATTRIBUTE((warn_unused_result)) const char **innobase_get_col_names(
+[[nodiscard]] static const char **innobase_get_col_names(
     Alter_inplace_info *ha_alter_info, const TABLE *altered_table,
     const TABLE *table, const dict_table_t *user_table, mem_heap_t *heap) {
   const char **cols;
@@ -3285,7 +3288,7 @@
 @param[in]	new_clust_index index to be compared
 @retval true if both indexes have same order.
 @retval false. */
-static MY_ATTRIBUTE((warn_unused_result)) bool innobase_pk_order_preserved(
+[[nodiscard]] static bool innobase_pk_order_preserved(
     const ulint *col_map, const dict_index_t *old_clust_index,
     const dict_index_t *new_clust_index) {
   ulint old_n_uniq = dict_index_get_n_ordering_defined_by_user(old_clust_index);
@@ -3726,21 +3729,21 @@
 @param[in,out]	index_def	index definition */
 static void innodb_v_adjust_idx_col(const Alter_inplace_info *ha_alter_info,
                                     const TABLE *old_table, ulint num_v_dropped,
-                                    index_def_t *index_def) {
+                                    ddl::Index_defn *index_def) {
   List_iterator_fast<Create_field> cf_it(
       ha_alter_info->alter_info->create_list);
-  for (ulint i = 0; i < index_def->n_fields; i++) {
+  for (ulint i = 0; i < index_def->m_n_fields; i++) {
 #ifdef UNIV_DEBUG
     bool col_found = false;
 #endif /* UNIV_DEBUG */
     ulint num_v = 0;
 
-    index_field_t *index_field = &index_def->fields[i];
+    auto index_field = &index_def->m_fields[i];
 
     /* Only adjust virtual column col_no, since non-virtual
     column position (in non-vcol list) won't change unless
     table rebuild */
-    if (!index_field->is_v_col) {
+    if (!index_field->m_is_v_col) {
       continue;
     }
 
@@ -3756,7 +3759,7 @@
 
       field = new_field->field;
 
-      if (num_v == index_field->col_no) {
+      if (num_v == index_field->m_col_no) {
         break;
       }
       num_v++;
@@ -3779,7 +3782,7 @@
       if (old_table->field[old_i] == field) {
         /* Found it, adjust its col_no to its position
         in old table */
-        index_def->fields[i].col_no = num_v;
+        index_def->m_fields[i].m_col_no = num_v;
         ut_d(col_found = true);
         break;
       }
@@ -3832,7 +3835,7 @@
 @return	false	On success
 @retval	true	On failure */
 template <typename Table>
-static MY_ATTRIBUTE((warn_unused_result)) bool dd_prepare_inplace_alter_table(
+[[nodiscard]] static bool dd_prepare_inplace_alter_table(
     THD *thd, const dict_table_t *old_table, dict_table_t *new_table,
     const Table *old_dd_tab, Table *new_dd_tab) {
   if (new_table->is_temporary() || old_table == new_table) {
@@ -3865,7 +3868,7 @@
     char *path = fil_space_get_first_path(new_table->space);
     char filename[FN_REFLEN + 1];
     replace_table_name(path, filename, old_table->name.m_name);
-    ut_free(path);
+    ut::free(path);
 
     bool discarded = false;
     if (dict_table_is_file_per_table(old_table)) {
@@ -4239,14 +4242,14 @@
 @retval true Failure
 @retval false Success */
 template <typename Table>
-static MY_ATTRIBUTE((warn_unused_result)) bool prepare_inplace_alter_table_dict(
+[[nodiscard]] static bool prepare_inplace_alter_table_dict(
     Alter_inplace_info *ha_alter_info, const TABLE *altered_table,
     const TABLE *old_table, const Table *old_dd_tab, Table *new_dd_tab,
     const char *table_name, uint32_t flags, uint32_t flags2,
     ulint fts_doc_id_col, bool add_fts_doc_id, bool add_fts_doc_id_idx) {
   bool dict_locked = false;
-  ulint *add_key_nums;     /* MySQL key numbers */
-  index_def_t *index_defs; /* index definitions */
+  ulint *add_key_nums;         /* MySQL key numbers */
+  ddl::Index_defn *index_defs; /* index definitions */
   dict_table_t *user_table;
   dict_index_t *fts_index = nullptr;
   ulint new_clustered = 0;
@@ -4345,7 +4348,7 @@
       row_table_got_default_clust_index(ctx->new_table), fts_doc_id_col,
       add_fts_doc_id, add_fts_doc_id_idx);
 
-  new_clustered = DICT_CLUSTERED & index_defs[0].ind_type;
+  new_clustered = DICT_CLUSTERED & index_defs[0].m_ind_type;
 
   if (num_fts_index > 1) {
     my_error(ER_INNODB_FT_LIMIT, MYF(0));
@@ -4398,7 +4401,7 @@
   if (ctx->online) {
     error = DB_SUCCESS;
   } else {
-    error = row_merge_lock_table(ctx->prebuilt->trx, ctx->new_table, LOCK_S);
+    error = ddl::lock_table(ctx->prebuilt->trx, ctx->new_table, LOCK_S);
 
     if (error != DB_SUCCESS) {
       goto error_handling;
@@ -4749,7 +4752,7 @@
   /* Create the indexes and load into dictionary. */
 
   for (ulint a = 0; a < ctx->num_to_add_index; a++) {
-    if (index_defs[a].ind_type & DICT_VIRTUAL &&
+    if (index_defs[a].m_ind_type & DICT_VIRTUAL &&
         ha_alter_info->virtual_column_drop_count > 0 && !new_clustered) {
       innodb_v_adjust_idx_col(ha_alter_info, old_table,
                               ha_alter_info->virtual_column_drop_count,
@@ -4757,9 +4760,9 @@
     }
 
     ctx->add_index[a] =
-        row_merge_create_index(ctx->trx, ctx->new_table, &index_defs[a], add_v);
+        ddl::create_index(ctx->trx, ctx->new_table, &index_defs[a], add_v);
 
-    add_key_nums[a] = index_defs[a].key_number;
+    add_key_nums[a] = index_defs[a].m_key_number;
 
     if (!ctx->add_index[a]) {
       error = ctx->trx->error_state;
@@ -4836,8 +4839,7 @@
   }
 
   if (ctx->online) {
-    /* Assign a consistent read view for
-    row_merge_read_clustered_index(). */
+    /* Assign a consistent read view for the index build scan. */
     trx_assign_read_view(ctx->prebuilt->trx);
   }
 
@@ -5013,7 +5015,7 @@
     assert(user_table->get_ref_count() == 1 || ctx->online);
   } else {
     ut_ad(!ctx->need_rebuild());
-    row_merge_drop_indexes(ctx->trx, user_table, TRUE);
+    ddl::drop_indexes(ctx->trx, user_table, true);
   }
 
   ut_d(dict_table_check_for_dup_indexes(user_table, CHECK_ALL_COMPLETE));
@@ -5041,7 +5043,7 @@
 /* Check whether an index is needed for the foreign key constraint.
 If so, if it is dropped, is there an equivalent index can play its role.
 @return true if the index is needed and can't be dropped */
-static MY_ATTRIBUTE((warn_unused_result)) bool innobase_check_foreign_key_index(
+[[nodiscard]] static bool innobase_check_foreign_key_index(
     Alter_inplace_info *ha_alter_info, /*!< in: Structure describing
                                        changes to be done by ALTER
                                        TABLE */
@@ -5206,7 +5208,7 @@
     s_col.s_pos = i;
 
     if (*s_cols == nullptr) {
-      *s_cols = UT_NEW_NOKEY(dict_s_col_list());
+      *s_cols = ut::new_withkey<dict_s_col_list>(UT_NEW_THIS_FILE_PSI_KEY);
       *s_heap = mem_heap_create(1000);
     }
 
@@ -5768,7 +5770,7 @@
       }
 
       if (s_cols != nullptr) {
-        UT_DELETE(s_cols);
+        ut::delete_(s_cols);
         mem_heap_free(s_heap);
       }
 
@@ -5776,7 +5778,7 @@
     }
 
     if (s_cols != nullptr) {
-      UT_DELETE(s_cols);
+      ut::delete_(s_cols);
       mem_heap_free(s_heap);
     }
   }
@@ -6022,7 +6024,6 @@
                                            Alter_inplace_info *ha_alter_info,
                                            const Table *old_dd_tab,
                                            Table *new_dd_tab) {
-  dberr_t error;
   dict_add_v_col_t *add_v = nullptr;
   dict_vcol_templ_t *s_templ = nullptr;
   dict_vcol_templ_t *old_templ = nullptr;
@@ -6036,17 +6037,29 @@
 
   DEBUG_SYNC(m_user_thd, "innodb_inplace_alter_table_enter");
 
-  if (!(ha_alter_info->handler_flags & INNOBASE_ALTER_DATA) ||
-      is_instant(ha_alter_info)) {
-  ok_exit:
+  auto all_ok = [=]() -> bool {
     DEBUG_SYNC(m_user_thd, "innodb_after_inplace_alter_table");
     return false;
+  };
+
+  auto success = [&]() -> bool {
+    ut_d(dict_sys_mutex_enter());
+    ut_d(dict_table_check_for_dup_indexes(m_prebuilt->table, CHECK_PARTIAL_OK));
+    ut_d(dict_sys_mutex_exit());
+    /* prebuilt->table->n_ref_count can be anything here,
+    given that we hold at most a shared lock on the table. */
+    return all_ok();
+  };
+
+  if (!(ha_alter_info->handler_flags & INNOBASE_ALTER_DATA) ||
+      is_instant(ha_alter_info)) {
+    return all_ok();
   }
 
   if (((ha_alter_info->handler_flags & ~INNOBASE_INPLACE_IGNORE) ==
            Alter_inplace_info::CHANGE_CREATE_OPTION &&
        !innobase_need_rebuild(ha_alter_info))) {
-    goto ok_exit;
+    return all_ok();
   }
 
   ha_innobase_inplace_ctx *ctx =
@@ -6061,13 +6074,13 @@
 
   /* For partitioned tables this could be already allocated from a
   previous partition invocation. For normal tables this is NULL. */
-  UT_DELETE(ctx->m_stage);
+  ut::delete_(ctx->m_stage);
 
-  ctx->m_stage = UT_NEW_NOKEY(ut_stage_alter_t(pk));
+  ctx->m_stage = ut::new_withkey<Alter_stage>(UT_NEW_THIS_FILE_PSI_KEY, pk);
 
   if (m_prebuilt->table->ibd_file_missing ||
       dict_table_is_discarded(m_prebuilt->table)) {
-    goto all_done;
+    return success();
   }
 
   /* If we are doing a table rebuilding or having added virtual
@@ -6090,7 +6103,7 @@
     if (ctx->new_table->vc_templ != nullptr && !ctx->need_rebuild()) {
       old_templ = ctx->new_table->vc_templ;
     }
-    s_templ = UT_NEW_NOKEY(dict_vcol_templ_t());
+    s_templ = ut::new_withkey<dict_vcol_templ_t>(UT_NEW_THIS_FILE_PSI_KEY);
     s_templ->vtempl = nullptr;
 
     innobase_build_v_templ(altered_table, ctx->new_table, s_templ, nullptr,
@@ -6104,7 +6117,7 @@
     not need to come in here to rebuild template with add_v.
     Please also see the assertion in innodb_v_adjust_idx_col() */
 
-    s_templ = UT_NEW_NOKEY(dict_vcol_templ_t());
+    s_templ = ut::new_withkey<dict_vcol_templ_t>(UT_NEW_THIS_FILE_PSI_KEY);
 
     add_v = static_cast<dict_add_v_col_t *>(
         mem_heap_alloc(ctx->heap, sizeof *add_v));
@@ -6127,102 +6140,129 @@
     eval_table = table;
   }
 
-  /* Read the clustered index of the table and build
-  indexes based on this information using temporary
-  files and merge sort. */
-  DBUG_EXECUTE_IF("innodb_OOM_inplace_alter", error = DB_OUT_OF_MEMORY;
-                  goto oom;);
-  error = row_merge_build_indexes(
-      m_prebuilt->trx, m_prebuilt->table, ctx->new_table, ctx->online,
-      ctx->add_index, ctx->add_key_numbers, ctx->num_to_add_index,
-      altered_table, ctx->add_cols, ctx->col_map, ctx->add_autoinc,
-      ctx->sequence, ctx->skip_pk_sort, ctx->m_stage, add_v, eval_table);
+  auto clean_up = [&](dberr_t err) -> bool {
+    DEBUG_SYNC_C("alter_table_update_log");
 
-#ifdef UNIV_DEBUG
-oom:
-#endif /* UNIV_DEBUG */
-  DEBUG_SYNC_C("alter_table_update_log");
-  if (error == DB_SUCCESS && ctx->online && ctx->need_rebuild()) {
-    DEBUG_SYNC_C("row_log_table_apply1_before");
-    error = row_log_table_apply(ctx->thr, m_prebuilt->table, altered_table,
+    if (err == DB_SUCCESS && ctx->online && ctx->need_rebuild()) {
+      DEBUG_SYNC_C("row_log_table_apply1_before");
+      err = row_log_table_apply(ctx->thr, m_prebuilt->table, altered_table,
                                 ctx->m_stage);
-  }
+    }
 
-  if (s_templ) {
-    ut_ad(ctx->need_rebuild() || ha_alter_info->virtual_column_add_count > 0 ||
-          rebuild_templ);
-    dict_free_vc_templ(s_templ);
-    UT_DELETE(s_templ);
+    if (s_templ) {
+      ut_ad(ctx->need_rebuild() ||
+            ha_alter_info->virtual_column_add_count > 0 || rebuild_templ);
+      dict_free_vc_templ(s_templ);
+      ut::delete_(s_templ);
 
-    ctx->new_table->vc_templ = old_templ;
-  }
+      ctx->new_table->vc_templ = old_templ;
+    }
 
-  DEBUG_SYNC_C("inplace_after_index_build");
+    DEBUG_SYNC_C("inplace_after_index_build");
 
-  DBUG_EXECUTE_IF("create_index_fail", error = DB_DUPLICATE_KEY;
-                  m_prebuilt->trx->error_key_num = ULINT_UNDEFINED;);
+    DBUG_EXECUTE_IF("create_index_fail", err = DB_DUPLICATE_KEY;
+                    m_prebuilt->trx->error_key_num = ULINT_UNDEFINED;);
 
-  /* After an error, remove all those index definitions
-  from the dictionary which were defined. */
+    /* After an error, remove all those index definitions
+    from the dictionary which were defined. */
 
-  switch (error) {
-    KEY *dup_key;
-  all_done:
-  case DB_SUCCESS:
-    ut_d(dict_sys_mutex_enter());
-    ut_d(dict_table_check_for_dup_indexes(m_prebuilt->table, CHECK_PARTIAL_OK));
-    ut_d(dict_sys_mutex_exit());
-    /* prebuilt->table->n_ref_count can be anything here,
-    given that we hold at most a shared lock on the table. */
-    goto ok_exit;
-    case DB_DUPLICATE_KEY:
-      if (m_prebuilt->trx->error_key_num == ULINT_UNDEFINED ||
-          ha_alter_info->key_count == 0) {
-        /* This should be the hidden index on
-        FTS_DOC_ID, or there is no PRIMARY KEY in the
-        table. Either way, we should be seeing and
-        reporting a bogus duplicate key error. */
-        dup_key = nullptr;
-      } else if (m_prebuilt->trx->error_key_num == 0) {
-        dup_key =
-            &ha_alter_info->key_info_buffer[m_prebuilt->trx->error_key_num];
-      } else {
-        /* Check if there is generated cluster index column */
-        if (ctx->num_to_add_index > ha_alter_info->key_count) {
-          assert(m_prebuilt->trx->error_key_num <= ha_alter_info->key_count);
-          dup_key = &ha_alter_info
-                         ->key_info_buffer[m_prebuilt->trx->error_key_num - 1];
-        } else {
-          assert(m_prebuilt->trx->error_key_num < ha_alter_info->key_count);
+    switch (err) {
+      case DB_SUCCESS:
+        return success();
+      case DB_DUPLICATE_KEY: {
+        KEY *dup_key{};
+        if (m_prebuilt->trx->error_key_num == ULINT_UNDEFINED ||
+            ha_alter_info->key_count == 0) {
+          /* This should be the hidden index on
+          FTS_DOC_ID, or there is no PRIMARY KEY in the
+          table. Either way, we should be seeing and
+          reporting a bogus duplicate key error. */
+        } else if (m_prebuilt->trx->error_key_num == 0) {
           dup_key =
               &ha_alter_info->key_info_buffer[m_prebuilt->trx->error_key_num];
+        } else {
+          /* Check if there is generated cluster index column */
+          if (ctx->num_to_add_index > ha_alter_info->key_count) {
+            assert(m_prebuilt->trx->error_key_num <= ha_alter_info->key_count);
+            dup_key =
+                &ha_alter_info
+                     ->key_info_buffer[m_prebuilt->trx->error_key_num - 1];
+          } else {
+            assert(m_prebuilt->trx->error_key_num < ha_alter_info->key_count);
+            dup_key =
+                &ha_alter_info->key_info_buffer[m_prebuilt->trx->error_key_num];
+          }
         }
+        print_keydup_error(altered_table, dup_key, MYF(0),
+                           table_share->table_name.str);
+        break;
       }
-      print_keydup_error(altered_table, dup_key, MYF(0),
-                         table_share->table_name.str);
-      break;
-    case DB_ONLINE_LOG_TOO_BIG:
-      assert(ctx->online);
-      my_error(ER_INNODB_ONLINE_LOG_TOO_BIG, MYF(0),
-               get_error_key_name(m_prebuilt->trx->error_key_num, ha_alter_info,
-                                  m_prebuilt->table));
-      break;
-    case DB_INDEX_CORRUPT:
-      my_error(ER_INDEX_CORRUPT, MYF(0),
-               get_error_key_name(m_prebuilt->trx->error_key_num, ha_alter_info,
-                                  m_prebuilt->table));
-      break;
-    default:
-      my_error_innodb(error, table_share->table_name.str,
-                      m_prebuilt->table->flags);
-  }
+      case DB_ONLINE_LOG_TOO_BIG:
+        assert(ctx->online);
+        my_error(ER_INNODB_ONLINE_LOG_TOO_BIG, MYF(0),
+                 get_error_key_name(m_prebuilt->trx->error_key_num,
+                                    ha_alter_info, m_prebuilt->table));
+        break;
+      case DB_INDEX_CORRUPT:
+        my_error(ER_INDEX_CORRUPT, MYF(0),
+                 get_error_key_name(m_prebuilt->trx->error_key_num,
+                                    ha_alter_info, m_prebuilt->table));
+        break;
+      default:
+        my_error_innodb(err, table_share->table_name.str,
+                        m_prebuilt->table->flags);
+    }
 
-  /* prebuilt->table->n_ref_count can be anything here, given
-  that we hold at most a shared lock on the table. */
-  m_prebuilt->trx->error_index = nullptr;
-  ctx->trx->error_state = DB_SUCCESS;
+    /* prebuilt->table->n_ref_count can be anything here, given
+    that we hold at most a shared lock on the table. */
+    m_prebuilt->trx->error_index = nullptr;
+    ctx->trx->error_state = DB_SUCCESS;
 
-  return true;
+    return true;
+  };
+
+  /* Read the clustered index of the table and build
+  indexes based on this information using temporary
+  files and merge sort. */
+  DBUG_EXECUTE_IF("innodb_OOM_inplace_alter",
+                  return clean_up(DB_OUT_OF_MEMORY););
+
+  const auto trx = m_prebuilt->trx;
+  const auto old_isolation_level = trx->isolation_level;
+
+  if (ctx->online &&
+      trx->isolation_level != trx_t::isolation_level_t::REPEATABLE_READ) {
+    /* We must scan the index at an isolation level >= READ COMMITTED, because
+    a dirty read will see half written blob references.
+
+    ** Perform a REPEATABLE READ.
+    When rebuilding the table online, row_log_table_apply() must not see
+    a newer state of the table when applying the log. This is mainly to
+    prevent false duplicate key errors, because the log will identify records
+    by the PRIMARY KEY, and also to prevent unsafe BLOB access.
+
+    When creating a secondary index online, this table scan must not see
+    records that have only been inserted to the clustered index, but have
+    not been written to the online_log of index[]. If we performed
+    READ UNCOMMITTED, it could happen that the ADD INDEX reaches
+    ONLINE_INDEX_COMPLETE state between the time the DML thread has updated
+    the clustered index but has not yet accessed secondary index. */
+
+    trx->isolation_level = trx_t::isolation_level_t::REPEATABLE_READ;
+  }
+
+  ddl::Context ddl(trx, m_prebuilt->table, ctx->new_table, ctx->online,
+                   ctx->add_index, ctx->add_key_numbers, ctx->num_to_add_index,
+                   altered_table, ctx->add_cols, ctx->col_map, ctx->add_autoinc,
+                   ctx->sequence, ctx->skip_pk_sort, ctx->m_stage, add_v,
+                   eval_table, thd_ddl_buffer_size(m_prebuilt->trx->mysql_thd),
+                   thd_ddl_threads(m_prebuilt->trx->mysql_thd));
+
+  const auto err = clean_up(ddl.build());
+
+  trx->isolation_level = old_isolation_level;
+
+  return err;
 }
 
 /** Free the modification log for online table rebuild.
@@ -6256,7 +6296,7 @@
 static void innobase_rollback_sec_index(dict_table_t *user_table,
                                         const TABLE *table, ibool locked,
                                         trx_t *trx) {
-  row_merge_drop_indexes(trx, user_table, locked);
+  ddl::drop_indexes(trx, user_table, locked);
 
   /* Free the table->fts only if there is no FTS_DOC_ID
   in the table */
@@ -6280,7 +6320,7 @@
 @retval true Failure
 @retval false Success
 */
-inline MY_ATTRIBUTE((warn_unused_result)) bool rollback_inplace_alter_table(
+[[nodiscard]] inline bool rollback_inplace_alter_table(
     const Alter_inplace_info *ha_alter_info, const TABLE *table,
     row_prebuilt_t *prebuilt) {
   bool fail = false;
@@ -6451,9 +6491,10 @@
 @param[in] old_table MySQL table as it is before the ALTER operation
 @retval true Failure
 @retval false Success*/
-static MY_ATTRIBUTE((warn_unused_result)) bool commit_get_autoinc(
-    Alter_inplace_info *ha_alter_info, ha_innobase_inplace_ctx *ctx,
-    const TABLE *altered_table, const TABLE *old_table) {
+[[nodiscard]] static bool commit_get_autoinc(Alter_inplace_info *ha_alter_info,
+                                             ha_innobase_inplace_ctx *ctx,
+                                             const TABLE *altered_table,
+                                             const TABLE *old_table) {
   DBUG_TRACE;
 
   if (!altered_table->found_next_number_field) {
@@ -6543,7 +6584,7 @@
 @retval true Failure
 @retval false Success
 */
-static MY_ATTRIBUTE((warn_unused_result)) bool innobase_update_foreign_try(
+[[nodiscard]] static bool innobase_update_foreign_try(
     ha_innobase_inplace_ctx *ctx, trx_t *trx, const char *table_name) {
   ulint foreign_id;
   ulint i;
@@ -6602,9 +6643,8 @@
 @param[in]	user_thd	MySQL connection
 @param[in,out]	dd_table	dd table instance
 @return		InnoDB error code (should always be DB_SUCCESS) */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    innobase_update_foreign_cache(ha_innobase_inplace_ctx *ctx, THD *user_thd,
-                                  dd::Table *dd_table) {
+[[nodiscard]] static dberr_t innobase_update_foreign_cache(
+    ha_innobase_inplace_ctx *ctx, THD *user_thd, dd::Table *dd_table) {
   dict_table_t *user_table;
   dberr_t err = DB_SUCCESS;
 
@@ -6771,10 +6811,11 @@
 @retval true Failure
 @retval false Success
 */
-inline MY_ATTRIBUTE((warn_unused_result)) bool commit_try_rebuild(
-    Alter_inplace_info *ha_alter_info, ha_innobase_inplace_ctx *ctx,
-    TABLE *altered_table, const TABLE *old_table, trx_t *trx,
-    const char *table_name) {
+[[nodiscard]] inline bool commit_try_rebuild(Alter_inplace_info *ha_alter_info,
+                                             ha_innobase_inplace_ctx *ctx,
+                                             TABLE *altered_table,
+                                             const TABLE *old_table, trx_t *trx,
+                                             const char *table_name) {
   dict_table_t *rebuilt_table = ctx->new_table;
   dict_table_t *user_table = ctx->old_table;
 
@@ -6821,7 +6862,7 @@
     dict_vcol_templ_t *s_templ = nullptr;
 
     if (ctx->new_table->n_v_cols > 0) {
-      s_templ = UT_NEW_NOKEY(dict_vcol_templ_t());
+      s_templ = ut::new_withkey<dict_vcol_templ_t>(UT_NEW_THIS_FILE_PSI_KEY);
       s_templ->vtempl = nullptr;
 
       innobase_build_v_templ(altered_table, ctx->new_table, s_templ, nullptr,
@@ -6837,7 +6878,7 @@
     if (s_templ) {
       ut_ad(ctx->need_rebuild());
       dict_free_vc_templ(s_templ);
-      UT_DELETE(s_templ);
+      ut::delete_(s_templ);
       ctx->new_table->vc_templ = nullptr;
     }
 
@@ -6952,7 +6993,7 @@
 }
 
 /** Set of column numbers */
-typedef std::set<ulint, std::less<ulint>, ut_allocator<ulint>> col_set;
+typedef std::set<ulint, std::less<ulint>, ut::allocator<ulint>> col_set;
 
 /** Store the column number of the columns in a list belonging
 to indexes which are not being dropped.
@@ -6996,7 +7037,7 @@
 @param[in]	table_name	Table name in MySQL
 @retval true Failure
 @retval false Success */
-inline MY_ATTRIBUTE((warn_unused_result)) bool commit_try_norebuild(
+[[nodiscard]] inline bool commit_try_norebuild(
     Alter_inplace_info *ha_alter_info, ha_innobase_inplace_ctx *ctx,
     TABLE *altered_table, const TABLE *old_table, trx_t *trx,
     const char *table_name) {
@@ -7056,8 +7097,9 @@
 @param trx Data dictionary transaction object
 (will be started and committed)
 @return whether all replacements were found for dropped indexes */
-inline MY_ATTRIBUTE((warn_unused_result)) bool commit_cache_norebuild(
-    ha_innobase_inplace_ctx *ctx, const TABLE *table, trx_t *trx) {
+[[nodiscard]] inline bool commit_cache_norebuild(ha_innobase_inplace_ctx *ctx,
+                                                 const TABLE *table,
+                                                 trx_t *trx) {
   DBUG_TRACE;
 
   bool found = true;
@@ -7361,7 +7403,7 @@
     transactions collected during crash recovery could be
     holding InnoDB locks only, not MySQL locks. */
 
-    error = row_merge_lock_table(m_prebuilt->trx, ctx->old_table, LOCK_X);
+    error = ddl::lock_table(m_prebuilt->trx, ctx->old_table, LOCK_X);
 
     if (error != DB_SUCCESS) {
       my_error_innodb(error, table_share->table_name.str, 0);
@@ -7781,7 +7823,7 @@
       transaction commit.  If the system crashes
       before this is completed, some orphan tables
       with ctx->tmp_name may be recovered. */
-      row_merge_drop_table(trx, ctx->old_table);
+      ddl::drop_table(trx, ctx->old_table);
 
       /* Rebuild the prebuilt object. */
       ctx->prebuilt =
@@ -7883,11 +7925,11 @@
       for (uint i = 0; i < m_tot_parts; i++) {
         destroy(ctx_array[i]);
       }
-      ut_free(ctx_array);
+      ut::free(ctx_array);
     }
 
     if (m_old_info != nullptr) {
-      ut_free(m_old_info);
+      ut::free(m_old_info);
     }
 
     if (prebuilt_array) {
@@ -7897,7 +7939,7 @@
         prebuilt_array[i]->table = nullptr;
         row_prebuilt_free(prebuilt_array[i], false);
       }
-      ut_free(prebuilt_array);
+      ut::free(prebuilt_array);
     }
   }
 };
@@ -7997,7 +8039,7 @@
       }
     }
 
-    ut_free(m_new_table_parts);
+    ut::free(m_new_table_parts);
   }
 
   if (m_ins_nodes != nullptr) {
@@ -8014,37 +8056,38 @@
       }
     }
 
-    ut_free(m_ins_nodes);
+    ut::free(m_ins_nodes);
   }
 
-  ut_free(m_bitset);
-  ut_free(m_trx_ids);
+  ut::free(m_bitset);
+  ut::free(m_trx_ids);
 }
 
 /** Initialize the object.
 @return false on success else true. */
 bool Altered_partitions::initialize() {
   size_t alloc_size = sizeof(*m_new_table_parts) * m_num_new_parts;
-  m_new_table_parts =
-      static_cast<dict_table_t **>(ut_zalloc(alloc_size, mem_key_partitioning));
+  m_new_table_parts = static_cast<dict_table_t **>(ut::zalloc_withkey(
+      ut::make_psi_memory_key(mem_key_partitioning), alloc_size));
 
   alloc_size = sizeof(*m_ins_nodes) * m_num_new_parts;
-  m_ins_nodes =
-      static_cast<ins_node_t **>(ut_zalloc(alloc_size, mem_key_partitioning));
+  m_ins_nodes = static_cast<ins_node_t **>(ut::zalloc_withkey(
+      ut::make_psi_memory_key(mem_key_partitioning), alloc_size));
 
   alloc_size = sizeof(*m_bitset) * UT_BITS_IN_BYTES(m_num_new_parts);
-  m_bitset = static_cast<byte *>(ut_zalloc(alloc_size, mem_key_partitioning));
+  m_bitset = static_cast<byte *>(ut::zalloc_withkey(
+      ut::make_psi_memory_key(mem_key_partitioning), alloc_size));
 
   alloc_size = sizeof(*m_trx_ids) * m_num_new_parts;
-  m_trx_ids =
-      static_cast<trx_id_t *>(ut_zalloc(alloc_size, mem_key_partitioning));
+  m_trx_ids = static_cast<trx_id_t *>(ut::zalloc_withkey(
+      ut::make_psi_memory_key(mem_key_partitioning), alloc_size));
 
   if (m_new_table_parts == nullptr || m_ins_nodes == nullptr ||
       m_bitset == nullptr || m_trx_ids == nullptr) {
-    ut_free(m_new_table_parts);
-    ut_free(m_ins_nodes);
-    ut_free(m_bitset);
-    ut_free(m_trx_ids);
+    ut::free(m_new_table_parts);
+    ut::free(m_ins_nodes);
+    ut::free(m_bitset);
+    ut::free(m_trx_ids);
 
     return (true);
   }
@@ -8291,7 +8334,7 @@
       false, false, 0, 0));
 }
 
-typedef std::vector<alter_part *, ut_allocator<alter_part *>> alter_part_array;
+typedef std::vector<alter_part *, ut::allocator<alter_part *>> alter_part_array;
 
 /** Construct all necessary alter_part_* objects according to the given
 partition states in both old and new tables */
@@ -9125,38 +9168,31 @@
 
   switch (state) {
     case PART_NORMAL:
-      alter_part = UT_NEW(
-          alter_part_normal(part_id, state,
-                            m_part_share->get_table_part_ref(old_part_id)),
-          mem_key_partitioning);
+      alter_part = ut::new_withkey<alter_part_normal>(
+          ut::make_psi_memory_key(mem_key_partitioning), part_id, state,
+          m_part_share->get_table_part_ref(old_part_id));
       break;
     case PART_TO_BE_ADDED:
-      alter_part = UT_NEW(
-          alter_part_add(part_id, state,
-                         m_part_share->get_table_share()->normalized_path.str,
-                         tablespace, m_trx, m_ha_alter_info, m_file_per_table,
-                         m_part_share->next_auto_inc_val, conflict),
-          mem_key_partitioning);
+      alter_part = ut::new_withkey<alter_part_add>(
+          ut::make_psi_memory_key(mem_key_partitioning), part_id, state,
+          m_part_share->get_table_share()->normalized_path.str, tablespace,
+          m_trx, m_ha_alter_info, m_file_per_table,
+          m_part_share->next_auto_inc_val, conflict);
       break;
     case PART_TO_BE_DROPPED:
     case PART_TO_BE_REORGED:
     case PART_REORGED_DROPPED:
-      alter_part = UT_NEW(
-          alter_part_drop(part_id, state,
-                          m_part_share->get_table_share()->normalized_path.str,
-                          m_trx, m_part_share->get_table_part_ref(old_part_id),
-                          conflict),
-          mem_key_partitioning);
+      alter_part = ut::new_withkey<alter_part_drop>(
+          ut::make_psi_memory_key(mem_key_partitioning), part_id, state,
+          m_part_share->get_table_share()->normalized_path.str, m_trx,
+          m_part_share->get_table_part_ref(old_part_id), conflict);
       break;
     case PART_CHANGED:
-      alter_part = UT_NEW(
-          alter_part_change(
-              part_id, state,
-              m_part_share->get_table_share()->normalized_path.str, tablespace,
-              m_trx, m_part_share->get_table_part_ref(old_part_id),
-              m_ha_alter_info, m_file_per_table,
-              m_part_share->next_auto_inc_val),
-          mem_key_partitioning);
+      alter_part = ut::new_withkey<alter_part_change>(
+          ut::make_psi_memory_key(mem_key_partitioning), part_id, state,
+          m_part_share->get_table_share()->normalized_path.str, tablespace,
+          m_trx, m_part_share->get_table_part_ref(old_part_id), m_ha_alter_info,
+          m_file_per_table, m_part_share->next_auto_inc_val);
       break;
     default:
       ut_ad(0);
@@ -9550,11 +9586,11 @@
 /** Destructor */
 alter_parts::~alter_parts() {
   for (alter_part *alter_part : m_news) {
-    UT_DELETE(alter_part);
+    ut::delete_(alter_part);
   }
 
   for (alter_part *alter_part : m_to_drop) {
-    UT_DELETE(alter_part);
+    ut::delete_(alter_part);
   }
 }
 
@@ -9792,7 +9828,8 @@
 
   const auto row_len = m_prebuilt->mysql_row_len;
 
-  auto adapter = UT_NEW_NOKEY(Parallel_reader_adapter(max_threads, row_len));
+  auto adapter = ut::new_withkey<Parallel_reader_adapter>(
+      UT_NEW_THIS_FILE_PSI_KEY, max_threads, row_len);
 
   if (adapter == nullptr) {
     Parallel_reader::release_threads(max_threads);
@@ -9807,20 +9844,6 @@
 
   trx_assign_read_view(trx);
 
-  auto dd_client = ha_thd()->dd_client();
-  dd::cache::Dictionary_client::Auto_releaser releaser(dd_client);
-  const dd::Table *dd_table = nullptr;
-
-  if (dd_client->acquire(table_share->db.str, table_share->table_name.str,
-                         &dd_table)) {
-    ib::error(ER_INNODB_UNABLE_TO_ACQUIRE_DD_OBJECT)
-        << "InnoDB can't get table object for table"
-        << table_share->table_name.str;
-    return HA_ERR_INTERNAL_ERROR;
-  }
-
-  auto dd_partitions = dd_table->leaf_partitions();
-
   const Parallel_reader::Scan_range FULL_SCAN{};
   const auto first_used_partition = m_part_info->get_first_used_partition();
 
@@ -9832,14 +9855,14 @@
       ib_senderrf(ha_thd(), IB_LOG_LEVEL_ERROR, ER_TABLESPACE_DISCARDED,
                   m_prebuilt->table->name.m_name);
 
-      UT_DELETE(adapter);
+      ut::delete_(adapter);
       return HA_ERR_NO_SUCH_TABLE;
     }
 
     build_template(true);
 
     Parallel_reader::Config config(FULL_SCAN, m_prebuilt->table->first_index(),
-                                   0, dd_partitions[i]->number());
+                                   0, i);
 
     dberr_t err =
         adapter->add_scan(trx, config, [=](const Parallel_reader::Ctx *ctx) {
@@ -9847,7 +9870,7 @@
         });
 
     if (err != DB_SUCCESS) {
-      UT_DELETE(adapter);
+      ut::delete_(adapter);
       return (convert_error_code_to_mysql(err, 0, ha_thd()));
     }
   }
@@ -9873,7 +9896,7 @@
 
 void ha_innopart::parallel_scan_end(void *parallel_scan_ctx) {
   auto adapter = static_cast<Parallel_reader_adapter *>(parallel_scan_ctx);
-  UT_DELETE(adapter);
+  ut::delete_(adapter);
 }
 
 /** Check if InnoDB supports a particular alter table in-place.
@@ -9994,7 +10017,7 @@
         may not be empty. Have to fall back to INPLACE */
         break;
       }
-      /* Fall through */
+      [[fallthrough]];
     case Instant_Type::INSTANT_NO_CHANGE:
     case Instant_Type::INSTANT_VIRTUAL_ONLY:
       if (altered_table->s->fields > REC_MAX_N_USER_FIELDS) {
@@ -10077,8 +10100,8 @@
     return HA_ALTER_ERROR;
   }
 
-  ctx_parts->ctx_array =
-      UT_NEW_ARRAY_NOKEY(inplace_alter_handler_ctx *, m_tot_parts + 1);
+  ctx_parts->ctx_array = ut::new_arr_withkey<inplace_alter_handler_ctx *>(
+      UT_NEW_THIS_FILE_PSI_KEY, ut::Count{m_tot_parts + 1});
   if (ctx_parts->ctx_array == nullptr) {
     return HA_ALTER_ERROR;
   }
@@ -10086,13 +10109,14 @@
   memset(ctx_parts->ctx_array, 0,
          sizeof(inplace_alter_handler_ctx *) * (m_tot_parts + 1));
 
-  ctx_parts->m_old_info =
-      UT_NEW_ARRAY_NOKEY(alter_table_old_info_t, m_tot_parts);
+  ctx_parts->m_old_info = ut::new_arr_withkey<alter_table_old_info_t>(
+      UT_NEW_THIS_FILE_PSI_KEY, ut::Count{m_tot_parts});
   if (ctx_parts->m_old_info == nullptr) {
     return HA_ALTER_ERROR;
   }
 
-  ctx_parts->prebuilt_array = UT_NEW_ARRAY_NOKEY(row_prebuilt_t *, m_tot_parts);
+  ctx_parts->prebuilt_array = ut::new_arr_withkey<row_prebuilt_t *>(
+      UT_NEW_THIS_FILE_PSI_KEY, ut::Count{m_tot_parts});
   if (ctx_parts->prebuilt_array == nullptr) {
     return HA_ALTER_ERROR;
   }
@@ -10408,13 +10432,13 @@
     total_parts *= ha_alter_info->modified_part_info->num_subparts;
   }
 
-  m_new_partitions =
-      UT_NEW(Altered_partitions(total_parts), mem_key_partitioning);
+  m_new_partitions = ut::new_withkey<Altered_partitions>(
+      ut::make_psi_memory_key(mem_key_partitioning), total_parts);
 
   if (m_new_partitions == nullptr) {
     return (true);
   } else if (m_new_partitions->initialize()) {
-    UT_DELETE(m_new_partitions);
+    ut::delete_(m_new_partitions);
     m_new_partitions = nullptr;
     return (true);
   }
@@ -10470,9 +10494,9 @@
     return (true);
   }
 
-  alter_parts *ctx =
-      UT_NEW_NOKEY(alter_parts(m_prebuilt->trx, m_part_share, ha_alter_info,
-                               m_part_info, m_new_partitions));
+  alter_parts *ctx = ut::new_withkey<alter_parts>(
+      UT_NEW_THIS_FILE_PSI_KEY, m_prebuilt->trx, m_part_share, ha_alter_info,
+      m_part_info, m_new_partitions);
 
   if (ctx == nullptr) {
     my_error(ER_OUT_OF_RESOURCES, MYF(0));
@@ -10567,10 +10591,10 @@
   if (commit) {
     int error = ctx->try_commit(*old_dd_tab, *new_dd_tab, table, altered_table);
     if (!error) {
-      UT_DELETE(ctx);
+      ut::delete_(ctx);
       ha_alter_info->handler_ctx = nullptr;
 
-      UT_DELETE(m_new_partitions);
+      ut::delete_(m_new_partitions);
       m_new_partitions = nullptr;
 
       if (altered_table->found_next_number_field) {
@@ -10590,10 +10614,10 @@
   }
 
   ctx->rollback();
-  UT_DELETE(ctx);
+  ut::delete_(ctx);
   ha_alter_info->handler_ctx = nullptr;
 
-  UT_DELETE(m_new_partitions);
+  ut::delete_(m_new_partitions);
   m_new_partitions = nullptr;
 
   return (false);
@@ -10871,54 +10895,3 @@
 
   return error;
 }
-
-/**
-@param thd the session
-@param start_value the lower bound
-@param max_value the upper bound (inclusive) */
-
-ib_sequence_t::ib_sequence_t(THD *thd, ulonglong start_value,
-                             ulonglong max_value)
-    : m_max_value(max_value),
-      m_increment(0),
-      m_offset(0),
-      m_next_value(start_value),
-      m_eof(false) {
-  if (thd != nullptr && m_max_value > 0) {
-    thd_get_autoinc(thd, &m_offset, &m_increment);
-
-    if (m_increment > 1 || m_offset > 1) {
-      /* If there is an offset or increment specified
-      then we need to work out the exact next value. */
-
-      m_next_value = innobase_next_autoinc(start_value, 1, m_increment,
-                                           m_offset, m_max_value);
-
-    } else if (start_value == 0) {
-      /* The next value can never be 0. */
-      m_next_value = 1;
-    }
-  } else {
-    m_eof = true;
-  }
-}
-
-/**
-Postfix increment
-@return the next value to insert */
-
-ulonglong ib_sequence_t::operator++(int) UNIV_NOTHROW {
-  ulonglong current = m_next_value;
-
-  ut_ad(!m_eof);
-  ut_ad(m_max_value > 0);
-
-  m_next_value =
-      innobase_next_autoinc(current, 1, m_increment, m_offset, m_max_value);
-
-  if (m_next_value == m_max_value && current == m_next_value) {
-    m_eof = true;
-  }
-
-  return (current);
-}
diff -Nru mysql-8.0-8.0.26/storage/innobase/handler/i_s.cc mysql-8.0-8.0.27/storage/innobase/handler/i_s.cc
--- mysql-8.0-8.0.26/storage/innobase/handler/i_s.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/handler/i_s.cc	2021-09-28 11:46:34.000000000 +0000
@@ -2572,7 +2572,8 @@
 
   index_charset = index_cache->charset;
   conv_str.f_len = system_charset_info->mbmaxlen * FTS_MAX_WORD_LEN_IN_CHAR;
-  conv_str.f_str = static_cast<byte *>(ut_malloc_nokey(conv_str.f_len));
+  conv_str.f_str = static_cast<byte *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, conv_str.f_len));
   conv_str.f_n_char = 0;
 
   /* Go through each word in the index cache */
@@ -2638,7 +2639,7 @@
     }
   }
 
-  ut_free(conv_str.f_str);
+  ut::free(conv_str.f_str);
 
   return 0;
 }
@@ -2881,7 +2882,7 @@
       fts_node_t *node;
 
       node = static_cast<fts_node_t *>(ib_vector_get(word->nodes, j));
-      ut_free(node->ilist);
+      ut::free(node->ilist);
     }
 
     fts_word_free(word);
@@ -3012,7 +3013,8 @@
 
   index_charset = fts_index_get_charset(index);
   conv_str.f_len = system_charset_info->mbmaxlen * FTS_MAX_WORD_LEN_IN_CHAR;
-  conv_str.f_str = static_cast<byte *>(ut_malloc_nokey(conv_str.f_len));
+  conv_str.f_str = static_cast<byte *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, conv_str.f_len));
   conv_str.f_n_char = 0;
 
   /* Iterate through each auxiliary table as described in
@@ -3060,7 +3062,7 @@
   }
 
 func_exit:
-  ut_free(conv_str.f_str);
+  ut::free(conv_str.f_str);
   mem_heap_free(heap);
 
   return ret;
@@ -3300,7 +3302,7 @@
     fts_config_get_value(trx, &fts_table, key_name, &value);
 
     if (allocated) {
-      ut_free(key_name);
+      ut::free(key_name);
     }
 
     OK(field_store_string(fields[FTS_CONFIG_KEY], fts_config_key[i]));
@@ -3432,7 +3434,7 @@
   unsigned m_space_id;
 };
 
-typedef std::vector<temp_table_info_t, ut_allocator<temp_table_info_t>>
+typedef std::vector<temp_table_info_t, ut::allocator<temp_table_info_t>>
     temp_table_info_cache_t;
 
 /** Fill Information Schema table INNODB_TEMP_TABLE_INFO for a particular
@@ -3954,8 +3956,8 @@
     return 0;
   }
 
-  pool_info = (buf_pool_info_t *)ut_zalloc_nokey(srv_buf_pool_instances *
-                                                 sizeof *pool_info);
+  pool_info = (buf_pool_info_t *)ut::zalloc_withkey(
+      UT_NEW_THIS_FILE_PSI_KEY, srv_buf_pool_instances * sizeof *pool_info);
 
   /* Walk through each buffer pool */
   for (ulint i = 0; i < srv_buf_pool_instances; i++) {
@@ -3974,7 +3976,7 @@
     }
   }
 
-  ut_free(pool_info);
+  ut::free(pool_info);
 
   return status;
 }
@@ -6787,7 +6789,7 @@
         break;
     }
 
-    ut_free(filepath);
+    ut::free(filepath);
   }
 
   if (file.m_total_size == static_cast<os_offset_t>(~0)) {
diff -Nru mysql-8.0-8.0.26/storage/innobase/ibuf/ibuf0ibuf.cc mysql-8.0-8.0.27/storage/innobase/ibuf/ibuf0ibuf.cc
--- mysql-8.0-8.0.26/storage/innobase/ibuf/ibuf0ibuf.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/ibuf/ibuf0ibuf.cc	2021-09-28 11:46:34.000000000 +0000
@@ -225,7 +225,7 @@
     return;
   }
 
-  ib::fatal(ER_IB_MSG_605)
+  ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_605)
       << "UNIV_IBUF_COUNT_DEBUG limits space_id and page_no"
          " and breaks crash recovery. space_id="
       << page_id.space() << ", should be 0<=space_id<" << IBUF_COUNT_N_SPACES
@@ -438,7 +438,7 @@
   dict_mem_index_free(ibuf->index);
   dict_mem_table_free(ibuf_table);
 
-  ut_free(ibuf);
+  ut::free(ibuf);
   ibuf = nullptr;
 }
 
@@ -465,7 +465,8 @@
   ulint n_used;
   page_t *header_page;
 
-  ibuf = static_cast<ibuf_t *>(ut_zalloc_nokey(sizeof(ibuf_t)));
+  ibuf = static_cast<ibuf_t *>(
+      ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sizeof(ibuf_t)));
 
   /* At startup we intialize ibuf to have a maximum of
   CHANGE_BUFFER_DEFAULT_SIZE in terms of percentage of the
@@ -570,7 +571,7 @@
  @return end of log record or NULL */
 byte *ibuf_parse_bitmap_init(byte *ptr, /*!< in: buffer */
                              byte *end_ptr
-                                 MY_ATTRIBUTE((unused)), /*!< in: buffer end */
+                             [[maybe_unused]],   /*!< in: buffer end */
                              buf_block_t *block, /*!< in: block or NULL */
                              mtr_t *mtr)         /*!< in: mtr or NULL */
 {
@@ -1684,7 +1685,7 @@
     case 1:
       /* set the flag for ROW_FORMAT=COMPACT */
       *ti++ = 0;
-      /* fall through */
+      [[fallthrough]];
     case 0:
       /* the old format does not allow delete buffering */
       ut_ad(op == IBUF_OP_INSERT);
@@ -2234,7 +2235,7 @@
 
 /** Get the matching records for space id.
  @return current rec or NULL */
-static MY_ATTRIBUTE((warn_unused_result)) const rec_t *ibuf_get_user_rec(
+[[nodiscard]] static const rec_t *ibuf_get_user_rec(
     btr_pcur_t *pcur, /*!< in: the current cursor */
     mtr_t *mtr)       /*!< in: mini-transaction */
 {
@@ -2252,14 +2253,14 @@
 /** Reads page numbers for a space id from an ibuf tree.
  @return a lower limit for the combined volume of records which will be
  merged */
-static MY_ATTRIBUTE((warn_unused_result)) ulint
-    ibuf_get_merge_pages(btr_pcur_t *pcur, /*!< in/out: cursor */
-                         space_id_t space, /*!< in: space for which to merge */
-                         ulint limit,      /*!< in: max page numbers to read */
-                         page_no_t *pages, /*!< out: pages read */
-                         space_id_t *spaces, /*!< out: spaces read */
-                         ulint *n_pages,     /*!< out: number of pages read */
-                         mtr_t *mtr)         /*!< in: mini-transaction */
+[[nodiscard]] static ulint ibuf_get_merge_pages(
+    btr_pcur_t *pcur,   /*!< in/out: cursor */
+    space_id_t space,   /*!< in: space for which to merge */
+    ulint limit,        /*!< in: max page numbers to read */
+    page_no_t *pages,   /*!< out: pages read */
+    space_id_t *spaces, /*!< out: spaces read */
+    ulint *n_pages,     /*!< out: number of pages read */
+    mtr_t *mtr)         /*!< in: mini-transaction */
 {
   const rec_t *rec;
   ulint volume = 0;
@@ -2417,8 +2418,7 @@
 @return a lower limit for the combined size in bytes of entries which
 will be merged from ibuf trees to the pages read, 0 if ibuf is
 empty */
-static MY_ATTRIBUTE((warn_unused_result)) ulint
-    ibuf_merge(ulint *n_pages, bool sync) {
+[[nodiscard]] static ulint ibuf_merge(ulint *n_pages, bool sync) {
   *n_pages = 0;
 
   /* We perform a dirty read of ibuf->empty, without latching
@@ -3047,11 +3047,10 @@
 @param[in]	page_size	page size
 @param[in,out]	thr		query thread
 @return DB_SUCCESS, DB_STRONG_FAIL or other error */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    ibuf_insert_low(ulint mode, ibuf_op_t op, ibool no_counter,
-                    const dtuple_t *entry, ulint entry_size,
-                    dict_index_t *index, const page_id_t &page_id,
-                    const page_size_t &page_size, que_thr_t *thr) {
+[[nodiscard]] static dberr_t ibuf_insert_low(
+    ulint mode, ibuf_op_t op, ibool no_counter, const dtuple_t *entry,
+    ulint entry_size, dict_index_t *index, const page_id_t &page_id,
+    const page_size_t &page_size, que_thr_t *thr) {
   big_rec_t *dummy_big_rec;
   btr_pcur_t pcur;
   btr_cur_t *cursor;
@@ -3899,7 +3898,8 @@
 
     rec_print_old(stderr, page_rec_get_next(btr_pcur_get_rec(pcur)));
 
-    ib::fatal(ER_IB_MSG_622) << "Failed to restore ibuf position.";
+    ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_622)
+        << "Failed to restore ibuf position.";
   }
 
   return (FALSE);
@@ -3909,7 +3909,7 @@
  resort to a pessimistic delete, this function commits mtr and closes
  the cursor.
  @return true if mtr was committed and pcur closed in this operation */
-static MY_ATTRIBUTE((warn_unused_result)) ibool ibuf_delete_rec(
+[[nodiscard]] static ibool ibuf_delete_rec(
     space_id_t space,  /*!< in: space id */
     page_no_t page_no, /*!< in: index page number that the record
                        should belong to */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/api0api.h mysql-8.0-8.0.27/storage/innobase/include/api0api.h
--- mysql-8.0-8.0.26/storage/innobase/include/api0api.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/api0api.h	2021-09-28 11:46:34.000000000 +0000
@@ -61,12 +61,6 @@
 typedef struct ib_sdi_key ib_sdi_key_t;
 typedef struct ib_sdi_vector ib_sdi_vector_t;
 
-#if defined(__GNUC__)
-#define UNIV_NO_IGNORE MY_ATTRIBUTE((warn_unused_result))
-#else
-#define UNIV_NO_IGNORE
-#endif /* __GNUC__ */
-
 /* See comment about ib_bool_t as to why the two macros are unsigned long. */
 /** The boolean value of "true" used internally within InnoDB */
 #define IB_TRUE 0x1UL
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/arch0arch.h mysql-8.0-8.0.27/storage/innobase/include/arch0arch.h
--- mysql-8.0-8.0.26/storage/innobase/include/arch0arch.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/arch0arch.h	2021-09-28 11:46:34.000000000 +0000
@@ -544,7 +544,7 @@
     close();
 
     if (m_name_buf != nullptr) {
-      ut_free(m_name_buf);
+      ut::free(m_name_buf);
     }
   }
 
@@ -1039,14 +1039,15 @@
 #ifdef UNIV_DEBUG
   /** Adjust end LSN to end of file. This is used in debug
   mode to test the case when LSN is at file boundary.
-  @param[in,out]        stop_lsn        stop lsn for client
-  @param[out]   blk_len         last block length */
+  @param[in,out]  stop_lsn  stop lsn for client
+  @param[out]     blk_len   last block length */
   void adjust_end_lsn(lsn_t &stop_lsn, uint32_t &blk_len);
 
   /** Adjust redo copy length to end of file. This is used
   in debug mode to archive only till end of file.
-  @param[in,out]        length  data to copy in bytes */
-  void adjust_copy_length(uint32_t &length);
+  @param[in]      arch_lsn  LSN up to which data is already archived
+  @param[in,out]  copy_len  length of data to copy in bytes */
+  void adjust_copy_length(lsn_t arch_lsn, uint32_t &copy_len);
 
   /** Check if the information maintained in the memory is the same
   as the information maintained in the files.
@@ -1248,7 +1249,7 @@
 };
 
 /** A list of archive groups */
-using Arch_Grp_List = std::list<Arch_Group *, ut_allocator<Arch_Group *>>;
+using Arch_Grp_List = std::list<Arch_Group *, ut::allocator<Arch_Group *>>;
 
 /** An iterator for archive group */
 using Arch_Grp_List_Iter = Arch_Grp_List::iterator;
@@ -1365,9 +1366,11 @@
 
   /** Update checkpoint LSN and related information in redo
   log header block.
-  @param[in,out]	header		redo log header buffer
+  @param[in]		group	archiving group
+  @param[in,out]	header	redo log header buffer
   @param[in]	checkpoint_lsn	checkpoint LSN for recovery */
-  void update_header(byte *header, lsn_t checkpoint_lsn);
+  void update_header(const Arch_Group *group, byte *header,
+                     lsn_t checkpoint_lsn);
 
   /** Check and set log archive system state and output the
   amount of redo log available for archiving.
@@ -1413,7 +1416,7 @@
 };
 
 /** Vector of page archive in memory blocks */
-using Arch_Block_Vec = std::vector<Arch_Block *, ut_allocator<Arch_Block *>>;
+using Arch_Block_Vec = std::vector<Arch_Block *, ut::allocator<Arch_Block *>>;
 
 /** Page archiver in memory data */
 struct ArchPageData {
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/arch0recv.h mysql-8.0-8.0.27/storage/innobase/include/arch0recv.h
--- mysql-8.0-8.0.26/storage/innobase/include/arch0recv.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/arch0recv.h	2021-09-28 11:46:34.000000000 +0000
@@ -44,15 +44,15 @@
     m_reset_pos.init();
     m_write_pos.init();
 
-    m_last_reset_block =
-        static_cast<byte *>(ut_zalloc(ARCH_PAGE_BLK_SIZE, mem_key_archive));
-    m_last_data_block =
-        static_cast<byte *>(ut_zalloc(ARCH_PAGE_BLK_SIZE, mem_key_archive));
+    m_last_reset_block = static_cast<byte *>(ut::zalloc_withkey(
+        ut::make_psi_memory_key(mem_key_archive), ARCH_PAGE_BLK_SIZE));
+    m_last_data_block = static_cast<byte *>(ut::zalloc_withkey(
+        ut::make_psi_memory_key(mem_key_archive), ARCH_PAGE_BLK_SIZE));
   }
 
   ~Arch_Recv_Group_Info() {
-    ut_free(m_last_reset_block);
-    ut_free(m_last_data_block);
+    ut::free(m_last_reset_block);
+    ut::free(m_last_data_block);
   }
 
   /** Disable assignment. */
@@ -137,10 +137,7 @@
   Arch_Dblwr_Ctx() = default;
 
   ~Arch_Dblwr_Ctx() {
-    if (m_buf != nullptr) {
-      UT_DELETE_ARRAY(m_buf);
-    }
-
+    ut::free(m_buf);
     m_file_ctx.close();
   }
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/btr0btr.h mysql-8.0-8.0.27/storage/innobase/include/btr0btr.h
--- mysql-8.0-8.0.26/storage/innobase/include/btr0btr.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/btr0btr.h	2021-09-28 11:46:34.000000000 +0000
@@ -160,17 +160,15 @@
 
 /** Checks and adjusts the root node of a tree during IMPORT TABLESPACE.
  @return error code, or DB_SUCCESS */
-dberr_t btr_root_adjust_on_import(
-    const dict_index_t *index) /*!< in: index tree */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t btr_root_adjust_on_import(
+    const dict_index_t *index); /*!< in: index tree */
 
 /** Gets the height of the B-tree (the level of the root, when the leaf
  level is assumed to be 0). The caller must hold an S or X latch on
  the index.
  @return tree height (level of the root) */
-ulint btr_height_get(dict_index_t *index, /*!< in: index tree */
-                     mtr_t *mtr)          /*!< in/out: mini-transaction */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] ulint btr_height_get(dict_index_t *index, /*!< in: index tree */
+                                   mtr_t *mtr); /*!< in/out: mini-transaction */
 
 #ifndef UNIV_HOTBACKUP
 /** Gets a buffer page and declares its latching order level.
@@ -229,27 +227,23 @@
   buf_block_get_frame(btr_block_get(page_id, page_size, mode, index, mtr))
 /** Gets the index id field of a page.
  @return index id */
-static inline space_index_t btr_page_get_index_id(
-    const page_t *page) /*!< in: index page */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline space_index_t btr_page_get_index_id(
+    const page_t *page); /*!< in: index page */
 /** Gets the node level field in an index page.
  @return level, leaf level == 0 */
-static inline ulint btr_page_get_level_low(
-    const page_t *page) /*!< in: index page */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ulint btr_page_get_level_low(
+    const page_t *page); /*!< in: index page */
 #define btr_page_get_level(page, mtr) btr_page_get_level_low(page)
 /** Gets the next index page number.
  @return next page number */
-static inline page_no_t btr_page_get_next(
+[[nodiscard]] static inline page_no_t btr_page_get_next(
     const page_t *page, /*!< in: index page */
-    mtr_t *mtr)         /*!< in: mini-transaction handle */
-    MY_ATTRIBUTE((warn_unused_result));
+    mtr_t *mtr);        /*!< in: mini-transaction handle */
 /** Gets the previous index page number.
  @return prev page number */
-static inline page_no_t btr_page_get_prev(
+[[nodiscard]] static inline page_no_t btr_page_get_prev(
     const page_t *page, /*!< in: index page */
-    mtr_t *mtr)         /*!< in: mini-transaction handle */
-    MY_ATTRIBUTE((warn_unused_result));
+    mtr_t *mtr);        /*!< in: mini-transaction handle */
 
 #ifndef UNIV_HOTBACKUP
 /** Releases the latch on a leaf page and bufferunfixes it.
@@ -266,10 +260,9 @@
  the child page number. In other words offsets must have been retrieved
  with rec_get_offsets(n_fields=ULINT_UNDEFINED).
  @return child node address */
-static inline page_no_t btr_node_ptr_get_child_page_no(
-    const rec_t *rec,     /*!< in: node pointer record */
-    const ulint *offsets) /*!< in: array returned by rec_get_offsets() */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline page_no_t btr_node_ptr_get_child_page_no(
+    const rec_t *rec,      /*!< in: node pointer record */
+    const ulint *offsets); /*!< in: array returned by rec_get_offsets() */
 
 /** Returns the child page of a node pointer and sx-latches it.
 @param[in]  node_ptr  node pointer
@@ -326,7 +319,7 @@
  we cannot reverse it: therefore enough free disk space must be
  guaranteed to be available before this function is called.
  @return inserted record */
-rec_t *btr_root_raise_and_insert(
+[[nodiscard]] rec_t *btr_root_raise_and_insert(
     uint32_t flags,        /*!< in: undo logging and locking flags */
     btr_cur_t *cursor,     /*!< in: cursor at which to insert: must be
                            on the root page; when the function returns,
@@ -336,8 +329,7 @@
     mem_heap_t **heap,     /*!< in/out: pointer to memory heap
                            that can be emptied, or NULL */
     const dtuple_t *tuple, /*!< in: tuple to insert */
-    mtr_t *mtr)            /*!< in: mtr */
-    MY_ATTRIBUTE((warn_unused_result));
+    mtr_t *mtr);           /*!< in: mtr */
 /** Reorganizes an index page.
 
  IMPORTANT: On success, the caller will have to update IBUF_BITMAP_FREE
@@ -348,7 +340,7 @@
 
  @retval true if the operation was successful
  @retval false if it is a compressed page, and recompression failed */
-bool btr_page_reorganize_low(
+[[nodiscard]] bool btr_page_reorganize_low(
     bool recovery,       /*!< in: true if called in recovery:
                         locks should not be updated, i.e.,
                         there cannot exist locks on the
@@ -358,8 +350,7 @@
                          if dealing with compressed page */
     page_cur_t *cursor,  /*!< in/out: page cursor */
     dict_index_t *index, /*!< in: the index tree of the page */
-    mtr_t *mtr)          /*!< in/out: mini-transaction */
-    MY_ATTRIBUTE((warn_unused_result));
+    mtr_t *mtr);         /*!< in/out: mini-transaction */
 
 /** Reorganizes an index page.
 
@@ -379,21 +370,19 @@
 /** Decides if the page should be split at the convergence point of
  inserts converging to left.
  @return true if split recommended */
-ibool btr_page_get_split_rec_to_left(
-    btr_cur_t *cursor, /*!< in: cursor at which to insert */
-    rec_t **split_rec) /*!< out: if split recommended,
+[[nodiscard]] ibool btr_page_get_split_rec_to_left(
+    btr_cur_t *cursor,  /*!< in: cursor at which to insert */
+    rec_t **split_rec); /*!< out: if split recommended,
                      the first record on upper half page,
                      or NULL if tuple should be first */
-    MY_ATTRIBUTE((warn_unused_result));
 /** Decides if the page should be split at the convergence point of
  inserts converging to right.
  @return true if split recommended */
-ibool btr_page_get_split_rec_to_right(
-    btr_cur_t *cursor, /*!< in: cursor at which to insert */
-    rec_t **split_rec) /*!< out: if split recommended,
+[[nodiscard]] ibool btr_page_get_split_rec_to_right(
+    btr_cur_t *cursor,  /*!< in: cursor at which to insert */
+    rec_t **split_rec); /*!< out: if split recommended,
                      the first record on upper half page,
                      or NULL if tuple should be first */
-    MY_ATTRIBUTE((warn_unused_result));
 
 /** Splits an index page to halves and inserts the tuple. It is assumed
  that mtr holds an x-latch to the index tree. NOTE: the tree x-latch is
@@ -403,7 +392,7 @@
  this function is called.
 
  @return inserted record */
-rec_t *btr_page_split_and_insert(
+[[nodiscard]] rec_t *btr_page_split_and_insert(
     uint32_t flags,        /*!< in: undo logging and locking flags */
     btr_cur_t *cursor,     /*!< in: cursor at which to insert; when the
                            function returns, the cursor is positioned
@@ -412,8 +401,7 @@
     mem_heap_t **heap,     /*!< in/out: pointer to memory heap
                            that can be emptied, or NULL */
     const dtuple_t *tuple, /*!< in: tuple to insert */
-    mtr_t *mtr)            /*!< in: mtr */
-    MY_ATTRIBUTE((warn_unused_result));
+    mtr_t *mtr);           /*!< in: mtr */
 /** Inserts a data tuple to a tree on a non-leaf level. It is assumed
  that mtr holds an x-latch on the tree. */
 void btr_insert_on_non_leaf_level_func(
@@ -442,11 +430,11 @@
 #ifdef UNIV_DEBUG
 /** Checks that the node pointer to a page is appropriate.
  @return true */
-ibool btr_check_node_ptr(dict_index_t *index, /*!< in: index tree */
-                         buf_block_t *block,  /*!< in: index page */
-                         mtr_t *mtr)          /*!< in: mtr */
-    MY_ATTRIBUTE((warn_unused_result));
-#endif /* UNIV_DEBUG */
+[[nodiscard]] ibool btr_check_node_ptr(
+    dict_index_t *index, /*!< in: index tree */
+    buf_block_t *block,  /*!< in: index page */
+    mtr_t *mtr);         /*!< in: mtr */
+#endif                   /* UNIV_DEBUG */
 /** Tries to merge the page first to the left immediate brother if such a
  brother exists, and the node pointers to the current page and to the
  brother reside on the same page. If the left brother does not satisfy these
@@ -473,30 +461,39 @@
 /** Parses the redo log record for setting an index record as the predefined
  minimum record.
  @return end of log record or NULL */
-byte *btr_parse_set_min_rec_mark(
+[[nodiscard]] byte *btr_parse_set_min_rec_mark(
     byte *ptr,     /*!< in: buffer */
     byte *end_ptr, /*!< in: buffer end */
     ulint comp,    /*!< in: nonzero=compact page format */
     page_t *page,  /*!< in: page or NULL */
-    mtr_t *mtr)    /*!< in: mtr or NULL */
-    MY_ATTRIBUTE((warn_unused_result));
+    mtr_t *mtr);   /*!< in: mtr or NULL */
 /** Parses a redo log record of reorganizing a page.
  @return end of log record or NULL */
-byte *btr_parse_page_reorganize(
+[[nodiscard]] byte *btr_parse_page_reorganize(
     byte *ptr,           /*!< in: buffer */
     byte *end_ptr,       /*!< in: buffer end */
     dict_index_t *index, /*!< in: record descriptor */
     bool compressed,     /*!< in: true if compressed page */
     buf_block_t *block,  /*!< in: page to be reorganized, or NULL */
-    mtr_t *mtr)          /*!< in: mtr or NULL */
-    MY_ATTRIBUTE((warn_unused_result));
+    mtr_t *mtr);         /*!< in: mtr or NULL */
 /** Gets the number of pages in a B-tree.
  @return number of pages, or ULINT_UNDEFINED if the index is unavailable */
-ulint btr_get_size(dict_index_t *index, /*!< in: index */
-                   ulint flag, /*!< in: BTR_N_LEAF_PAGES or BTR_TOTAL_SIZE */
-                   mtr_t *mtr) /*!< in/out: mini-transaction where index
-                               is s-latched */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] ulint btr_get_size(
+    dict_index_t *index, /*!< in: index */
+    ulint flag,          /*!< in: BTR_N_LEAF_PAGES or BTR_TOTAL_SIZE */
+    mtr_t *mtr);         /*!< in/out: mini-transaction where index
+                        is s-latched */
+
+#ifdef UNIV_DEBUG
+#define btr_page_alloc(index, hint_page_no, file_direction, level, mtr, \
+                       init_mtr)                                        \
+  btr_page_alloc_priv(index, hint_page_no, file_direction, level, mtr,  \
+                      init_mtr, UT_LOCATION_HERE)
+#else /* UNIV_DEBUG */
+#define btr_page_alloc(index, hint_page_no, file_direction, level, mtr, \
+                       init_mtr)                                        \
+  btr_page_alloc_priv(index, hint_page_no, file_direction, level, mtr, init_mtr)
+#endif /* UNIV_DEBUG */
 
 /** Allocates a new file page to be used in an index tree. NOTE: we assume
 that the caller has made the reservation for free extents!
@@ -507,13 +504,20 @@
 @param[in,out] mtr Mini-transaction for the allocation
 @param[in,out] init_mtr Mini-transaction for x-latching and initializing the
 page
+@param[in]   loc   debug only parameter providing caller source location.
 @retval NULL if no page could be allocated
 @retval block, rw_lock_x_lock_count(&block->lock) == 1 if allocation succeeded
 (init_mtr == mtr, or the page was not previously freed in mtr),
 returned block is not allocated nor initialized otherwise */
-buf_block_t *btr_page_alloc(dict_index_t *index, page_no_t hint_page_no,
-                            byte file_direction, ulint level, mtr_t *mtr,
-                            mtr_t *init_mtr) MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] buf_block_t *btr_page_alloc_priv(dict_index_t *index,
+                                               page_no_t hint_page_no,
+                                               byte file_direction, ulint level,
+                                               mtr_t *mtr, mtr_t *init_mtr
+#ifdef UNIV_DEBUG
+                                               ,
+                                               const ut::Location &loc
+#endif /* UNIV_DEBUG */
+);
 
 /** Frees a file page used in an index tree. NOTE: cannot free field external
  storage pages because the page must contain info on its level. */
@@ -528,13 +532,31 @@
     dict_index_t *index,      /*!< in: index */
     ulint level,              /*!< in: the B-tree level of the page */
     mtr_t *mtr);              /*!< in: mtr */
+
+#ifdef UNIV_DEBUG
+#define btr_page_free_low(index, block, level, mtr) \
+  btr_page_free_lower(index, block, level, mtr, UT_LOCATION_HERE)
+#else /* UNIV_DEBUG */
+#define btr_page_free_low(index, block, level, mtr) \
+  btr_page_free_lower(index, block, level, mtr)
+#endif /* UNIV_DEBUG */
+
 /** Frees a file page used in an index tree. Can be used also to BLOB
- external storage pages. */
-void btr_page_free_low(
-    dict_index_t *index, /*!< in: index tree */
-    buf_block_t *block,  /*!< in: block to be freed, x-latched */
-    ulint level,         /*!< in: page level (ULINT_UNDEFINED=BLOB) */
-    mtr_t *mtr);         /*!< in: mtr */
+ external storage pages.
+@param[in]   index   the index to which the page belongs
+@param[in]   block   block to be freed, x-latched
+@param[in]   level   page level (ULINT_UNDEFINED=BLOB)
+@param[in]   mtr     mini transaction context.
+@param[in]   file    caller source code file location
+@param[in]   line    caller source code line location */
+void btr_page_free_lower(dict_index_t *index, buf_block_t *block, ulint level,
+                         mtr_t *mtr
+#ifdef UNIV_DEBUG
+                         ,
+                         const ut::Location &loc
+#endif /* UNIV_DEBUG */
+);
+
 /** Gets the root node of a tree and x- or s-latches it.
  @return root page, x- or s-latched */
 buf_block_t *btr_root_block_get(
@@ -554,19 +576,18 @@
 /** Checks the size and number of fields in a record based on the definition of
  the index.
  @return true if ok */
-ibool btr_index_rec_validate(const rec_t *rec,          /*!< in: index record */
-                             const dict_index_t *index, /*!< in: index */
-                             ibool dump_on_error) /*!< in: TRUE if the function
-                                                  should print hex dump of
-                                                  record and page on error */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] ibool btr_index_rec_validate(
+    const rec_t *rec,          /*!< in: index record */
+    const dict_index_t *index, /*!< in: index */
+    ibool dump_on_error);      /*!< in: TRUE if the function
+                              should print hex dump of
+                              record and page on error */
 /** Checks the consistency of an index tree.
  @return true if ok */
-bool btr_validate_index(
+[[nodiscard]] bool btr_validate_index(
     dict_index_t *index, /*!< in: index */
     const trx_t *trx,    /*!< in: transaction or 0 */
-    bool lockout)        /*!< in: true if X-latch index is intended */
-    MY_ATTRIBUTE((warn_unused_result));
+    bool lockout);       /*!< in: true if X-latch index is intended */
 
 /** Creates SDI index and stores the root page numbers in page 1 & 2
 @param[in]	space_id	tablespace id
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/btr0btr.ic mysql-8.0-8.0.27/storage/innobase/include/btr0btr.ic
--- mysql-8.0-8.0.26/storage/innobase/include/btr0btr.ic	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/btr0btr.ic	2021-09-28 11:46:34.000000000 +0000
@@ -152,7 +152,7 @@
  @return next page number */
 static inline page_no_t btr_page_get_next(
     const page_t *page, /*!< in: index page */
-    mtr_t *mtr MY_ATTRIBUTE((unused)))
+    mtr_t *mtr [[maybe_unused]])
 /*!< in: mini-transaction handle */
 {
   ut_ad(page != nullptr);
@@ -183,8 +183,8 @@
 /** Gets the previous index page number.
  @return prev page number */
 static inline page_no_t btr_page_get_prev(
-    const page_t *page,                /*!< in: index page */
-    mtr_t *mtr MY_ATTRIBUTE((unused))) /*!< in: mini-transaction handle */
+    const page_t *page,          /*!< in: index page */
+    mtr_t *mtr [[maybe_unused]]) /*!< in: mini-transaction handle */
 {
   ut_ad(page != nullptr);
   ut_ad(mtr != nullptr);
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/btr0bulk.h mysql-8.0-8.0.27/storage/innobase/include/btr0bulk.h
--- mysql-8.0-8.0.26/storage/innobase/include/btr0bulk.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/btr0bulk.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,427 +0,0 @@
-/*****************************************************************************
-
-Copyright (c) 2014, 2021, Oracle 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, as published by the
-Free Software Foundation.
-
-This program is also distributed with certain software (including but not
-limited to OpenSSL) that is licensed under separate terms, as designated in a
-particular file or component or in included license documentation. The authors
-of MySQL hereby grant you an additional permission to link the program and
-your derivative works with the separately licensed software that they have
-included with MySQL.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
-for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-*****************************************************************************/
-
-/** @file include/btr0bulk.h
- The B-tree bulk load
-
- Created 03/11/2014 Shaohua Wang
- *************************************************************************/
-
-#ifndef btr0bulk_h
-#define btr0bulk_h
-
-#include <stddef.h>
-#include <vector>
-
-#include "dict0dict.h"
-#include "page0cur.h"
-#include "ut0class_life_cycle.h"
-#include "ut0new.h"
-
-/** Innodb B-tree index fill factor for bulk load. */
-extern long innobase_fill_factor;
-
-/*
-The proper function call sequence of PageBulk is as below:
--- PageBulk::init
--- PageBulk::insert
--- PageBulk::finish
--- PageBulk::compress(COMPRESSED table only)
--- PageBulk::pageSplit(COMPRESSED table only)
--- PageBulk::commit
-*/
-
-class PageBulk : private ut::Non_copyable {
- public:
-  /** Page split point descriptor. */
-  struct SplitPoint {
-    /** Record being the point of split.
-     * All records before this record should stay on current on page.
-     * This record and all following records should be moved to new page. */
-    rec_t *m_rec;
-    /** Number of records before this record. */
-    ulint m_n_rec_before;
-  };
-
-  /** Constructor
-  @param[in]	index		B-tree index
-  @param[in]	page_no		page number
-  @param[in]	level		page level
-  @param[in]	trx_id		transaction id
-  @param[in]	observer	flush observer */
-  PageBulk(dict_index_t *index, trx_id_t trx_id, page_no_t page_no, ulint level,
-           FlushObserver *observer)
-      : m_heap(nullptr),
-        m_index(index),
-        m_mtr(nullptr),
-        m_trx_id(trx_id),
-        m_block(nullptr),
-        m_page(nullptr),
-        m_page_zip(nullptr),
-        m_cur_rec(nullptr),
-        m_page_no(page_no),
-        m_level(level),
-        m_is_comp(dict_table_is_comp(index->table)),
-        m_heap_top(nullptr),
-        m_rec_no(0),
-        m_free_space(0),
-        m_reserved_space(0),
-        m_padding_space(0),
-#ifdef UNIV_DEBUG
-        m_total_data(0),
-#endif /* UNIV_DEBUG */
-        m_modify_clock(0),
-        m_flush_observer(observer),
-        m_last_slotted_rec(nullptr),
-        m_slotted_rec_no(0),
-        m_modified(false) {
-    ut_ad(!dict_index_is_spatial(m_index));
-  }
-
-  /** Destructor */
-  ~PageBulk() {
-    if (m_heap) {
-      /* mtr is allocated using heap. */
-      if (m_mtr != nullptr) {
-        m_mtr->~mtr_t();
-      }
-      mem_heap_free(m_heap);
-    }
-  }
-
-  /** Initialize members and allocate page if needed and start mtr.
-  @note Must be called and only once right after constructor.
-  @return error code */
-  dberr_t init() MY_ATTRIBUTE((warn_unused_result));
-
-  /** Insert a tuple in the page.
-  @param[in]  tuple     tuple to insert
-  @param[in]  big_rec   external record
-  @param[in]  rec_size  record size
-  @return error code */
-  dberr_t insert(const dtuple_t *tuple, const big_rec_t *big_rec,
-                 ulint rec_size) MY_ATTRIBUTE((warn_unused_result));
-
-  /** Mark end of insertion to the page. Scan records to set page dirs,
-  and set page header members. The scan is incremental (slots and records
-  which assignment could be "finalized" are not checked again. Check the
-  m_slotted_rec_no usage, note it could be reset in some cases like
-  during split.
-  Note: we refer to page_copy_rec_list_end_to_created_page. */
-  void finish();
-
-  /** Commit mtr for a page
-  @param[in]	success		Flag whether all inserts succeed. */
-  void commit(bool success);
-
-  /** Compress if it is compressed table
-  @return	true	compress successfully or no need to compress
-  @return	false	compress failed. */
-  bool compress() MY_ATTRIBUTE((warn_unused_result));
-
-  /** Check whether the record needs to be stored externally.
-  @return false if the entire record can be stored locally on the page */
-  bool needExt(const dtuple_t *tuple, ulint rec_size) const
-      MY_ATTRIBUTE((warn_unused_result));
-
-  /** Get node pointer
-  @return node pointer */
-  dtuple_t *getNodePtr();
-
-  /** Split the page records between this and given bulk.
-   * @param new_page_bulk  The new bulk to store split records. */
-  void split(PageBulk &new_page_bulk);
-
-  /** Copy all records from page.
-  @param[in]  src_page  Page with records to copy. */
-  void copyAll(const page_t *src_page);
-
-  /** Set next page
-  @param[in]	next_page_no	next page no */
-  void setNext(page_no_t next_page_no);
-
-  /** Set previous page
-  @param[in]	prev_page_no	previous page no */
-  void setPrev(page_no_t prev_page_no);
-
-  /** Release block by committing mtr */
-  inline void release();
-
-  /** Start mtr and latch block */
-  inline void latch();
-
-  /** Check if required space is available in the page for the rec
-  to be inserted.	We check fill factor & padding here.
-  @param[in]	rec_size	required space
-  @return true	if space is available */
-  inline bool isSpaceAvailable(ulint rec_size) const;
-
-  /** Get page no */
-  page_no_t getPageNo() const { return (m_page_no); }
-
-  /** Get page level */
-  ulint getLevel() const { return (m_level); }
-
-  /** Get record no */
-  ulint getRecNo() const { return (m_rec_no); }
-
-  /** Get page */
-  const page_t *getPage() const { return (m_page); }
-
-  /** Check if table is compressed.
-  @return true if table is compressed, false otherwise. */
-  bool isTableCompressed() const { return (m_page_zip != nullptr); }
-
-#ifdef UNIV_DEBUG
-  /** Check if index is X locked */
-  bool isIndexXLocked();
-#endif  // UNIV_DEBUG
-
- private:
-  /** Get page split point. We split a page in half when compression
-  fails, and the split record and all following records should be copied
-  to the new page.
-  @return split record descriptor */
-  SplitPoint getSplitRec();
-
-  /** Copy given and all following records.
-  @param[in]  first_rec  first record to copy */
-  void copyRecords(const rec_t *first_rec);
-
-  /** Remove all records after split rec including itself.
-  @param[in]  split_point  split point descriptor */
-  void splitTrim(const SplitPoint &split_point);
-
-  /** Insert a record in the page.
-  @param[in]  rec   record
-  @param[in]  offsets   record offsets */
-  void insert(const rec_t *rec, ulint *offsets);
-
-  /** Store external record
-  Since the record is not logged yet, so we don't log update to the record.
-  the blob data is logged first, then the record is logged in bulk mode.
-  @param[in]  big_rec   external record
-  @param[in]  offsets   record offsets
-  @return error code */
-  dberr_t storeExt(const big_rec_t *big_rec, ulint *offsets)
-      MY_ATTRIBUTE((warn_unused_result));
-
-  /** Memory heap for internal allocation */
-  mem_heap_t *m_heap;
-
-  /** The index B-tree */
-  dict_index_t *m_index;
-
-  /** The min-transaction */
-  mtr_t *m_mtr;
-
-  /** The transaction id */
-  trx_id_t m_trx_id;
-
-  /** The buffer block */
-  buf_block_t *m_block;
-
-  /** The page */
-  page_t *m_page;
-
-  /** The page zip descriptor */
-  page_zip_des_t *m_page_zip;
-
-  /** The current rec, just before the next insert rec */
-  rec_t *m_cur_rec;
-
-  /** The page no */
-  page_no_t m_page_no;
-
-  /** The page level in B-tree */
-  ulint m_level;
-
-  /** Flag: is page in compact format */
-  const bool m_is_comp;
-
-  /** The heap top in page for next insert */
-  byte *m_heap_top;
-
-  /** User record no */
-  ulint m_rec_no;
-
-  /** The free space left in the page */
-  ulint m_free_space;
-
-  /** The reserved space for fill factor */
-  ulint m_reserved_space;
-
-  /** The padding space for compressed page */
-  ulint m_padding_space;
-
-#ifdef UNIV_DEBUG
-  /** Total data in the page */
-  ulint m_total_data;
-#endif /* UNIV_DEBUG */
-
-  /** The modify clock value of the buffer block
-  when the block is re-pinned */
-  ib_uint64_t m_modify_clock;
-
-  /** Flush observer */
-  FlushObserver *m_flush_observer;
-
-  /** Last record assigned to a slot. */
-  rec_t *m_last_slotted_rec;
-
-  /** Number of records assigned to slots. */
-  ulint m_slotted_rec_no;
-
-  /** Page modified flag. */
-  bool m_modified;
-};
-
-class BtrBulk {
- public:
-  using page_bulk_vector = std::vector<PageBulk *, ut_allocator<PageBulk *>>;
-
-  /** Constructor
-  @param[in]	index		B-tree index
-  @param[in]	trx_id		transaction id
-  @param[in]	observer	flush observer */
-  BtrBulk(dict_index_t *index, trx_id_t trx_id, FlushObserver *observer);
-
-  /** Destructor */
-  ~BtrBulk();
-
-  /** Initialization
-  @note Must be called right after constructor. */
-  dberr_t init() MY_ATTRIBUTE((warn_unused_result));
-
-  /** Insert a tuple
-  @param[in]	tuple	tuple to insert.
-  @return error code */
-  dberr_t insert(dtuple_t *tuple) MY_ATTRIBUTE((warn_unused_result)) {
-    return (insert(tuple, 0));
-  }
-
-  /** Btree bulk load finish. We commit the last page in each level
-  and copy the last page in top level to the root page of the index
-  if no error occurs.
-  @param[in]	err	whether bulk load was successful until now
-  @return error code  */
-  dberr_t finish(dberr_t err) MY_ATTRIBUTE((warn_unused_result));
-
-  /** Release all latches */
-  void release();
-
-  /** Re-latch all latches */
-  void latch();
-
- private:
-  /** Insert a tuple to a page in a level
-  @param[in]	tuple	tuple to insert
-  @param[in]	level	B-tree level
-  @return error code */
-  dberr_t insert(dtuple_t *tuple, ulint level)
-      MY_ATTRIBUTE((warn_unused_result));
-
-  /** Split a page
-  @param[in]	page_bulk	page to split
-  @param[in]	next_page_bulk	next page
-  @return	error code */
-  dberr_t pageSplit(PageBulk *page_bulk, PageBulk *next_page_bulk)
-      MY_ATTRIBUTE((warn_unused_result));
-
-  /** Commit(finish) a page. We set next/prev page no, compress a page of
-  compressed table and split the page if compression fails, insert a node
-  pointer to father page if needed, and commit mini-transaction.
-  @param[in]	page_bulk	page to commit
-  @param[in]	next_page_bulk	next page
-  @param[in]	insert_father	false when page_bulk is a root page and
-                                  true when it's a non-root page
-  @return	error code */
-  dberr_t pageCommit(PageBulk *page_bulk, PageBulk *next_page_bulk,
-                     bool insert_father) MY_ATTRIBUTE((warn_unused_result));
-
-  /** Abort a page when an error occurs
-  @param[in]	page_bulk	page bulk object
-  @note We should call pageAbort for a PageBulk object, which is not in
-  m_page_bulks after pageCommit, and we will commit or abort PageBulk
-  objects in function "finish". */
-  void pageAbort(PageBulk *page_bulk) { page_bulk->commit(false); }
-
-  /** Prepare space to insert a tuple.
-  @param[in,out]  page_bulk   page bulk that will be used to store the record.
-                              It may be replaced if there is not enough space
-                              to hold the record.
-  @param[in]  level           B-tree level
-  @param[in]  rec_size        record size
-  @return error code */
-  dberr_t prepareSpace(PageBulk *&page_bulk, ulint level, ulint rec_size)
-      MY_ATTRIBUTE((warn_unused_result));
-
-  /** Insert a tuple to a page.
-  @param[in]  page_bulk   page bulk object
-  @param[in]  tuple       tuple to insert
-  @param[in]  big_rec     big record vector, could be nullptr if there is no
-                          data to be stored externally.
-  @param[in]  rec_size    record size
-  @return error code */
-  dberr_t insert(PageBulk *page_bulk, dtuple_t *tuple, big_rec_t *big_rec,
-                 ulint rec_size) MY_ATTRIBUTE((warn_unused_result));
-
-  /** Log free check */
-  void logFreeCheck();
-
-  /** Btree page bulk load finish. Commits the last page in each level
-  if no error occurs. Also releases all page bulks.
-  @param[in]  err           whether bulk load was successful until now
-  @param[out] last_page_no  last page number
-  @return error code  */
-  dberr_t finishAllPageBulks(dberr_t err, page_no_t &last_page_no)
-      MY_ATTRIBUTE((warn_unused_result));
-
- private:
-  /** B-tree index */
-  dict_index_t *m_index;
-
-  /** Transaction id */
-  trx_id_t m_trx_id;
-
-  /** Root page level */
-  ulint m_root_level;
-
-  /** Flush observer */
-  FlushObserver *m_flush_observer;
-
-  /** Page cursor vector for all level */
-  page_bulk_vector *m_page_bulks;
-
-#ifdef UNIV_DEBUG
-  /** State of the index. Used for asserting at the end of a
-  bulk load operation to ensure that the online status of the
-  index does not change */
-  unsigned m_index_online;
-#endif  // UNIV_DEBUG
-};
-
-#endif
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/btr0cur.h mysql-8.0-8.0.27/storage/innobase/include/btr0cur.h
--- mysql-8.0-8.0.26/storage/innobase/include/btr0cur.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/btr0cur.h	2021-09-28 11:46:34.000000000 +0000
@@ -245,7 +245,7 @@
  one record on the page, the insert will always succeed; this is to
  prevent trying to split a page with just one record.
  @return DB_SUCCESS, DB_WAIT_LOCK, DB_FAIL, or error number */
-dberr_t btr_cur_optimistic_insert(
+[[nodiscard]] dberr_t btr_cur_optimistic_insert(
     ulint flags,         /*!< in: undo logging and locking flags: if not
                          zero, the parameters index and thr should be
                          specified */
@@ -260,19 +260,18 @@
                          be stored externally by the caller, or
                          NULL */
     que_thr_t *thr,      /*!< in: query thread or NULL */
-    mtr_t *mtr)          /*!< in/out: mini-transaction;
-                         if this function returns DB_SUCCESS on
-                         a leaf page of a secondary index in a
-                         compressed tablespace, the caller must
-                         mtr_commit(mtr) before latching
-                         any further pages */
-    MY_ATTRIBUTE((warn_unused_result));
+    mtr_t *mtr);         /*!< in/out: mini-transaction;
+                        if this function returns DB_SUCCESS on
+                        a leaf page of a secondary index in a
+                        compressed tablespace, the caller must
+                        mtr_commit(mtr) before latching
+                        any further pages */
 /** Performs an insert on a page of an index tree. It is assumed that mtr
  holds an x-latch on the tree and on the cursor page. If the insert is
  made on the leaf level, to avoid deadlocks, mtr must also own x-latches
  to brothers of page, if those brothers exist.
  @return DB_SUCCESS or error number */
-dberr_t btr_cur_pessimistic_insert(
+[[nodiscard]] dberr_t btr_cur_pessimistic_insert(
     uint32_t flags,      /*!< in: undo logging and locking flags: if not
                          zero, the parameter thr should be
                          specified; if no undo logging is specified,
@@ -291,8 +290,7 @@
                          be stored externally by the caller, or
                          NULL */
     que_thr_t *thr,      /*!< in: query thread or NULL */
-    mtr_t *mtr)          /*!< in/out: mini-transaction */
-    MY_ATTRIBUTE((warn_unused_result));
+    mtr_t *mtr);         /*!< in/out: mini-transaction */
 /** See if there is enough place in the page modification log to log
  an update-in-place.
 
@@ -304,7 +302,7 @@
  a secondary index leaf page. This has to be done either within the
  same mini-transaction, or by invoking ibuf_reset_free_bits() before
  mtr_commit(mtr). */
-bool btr_cur_update_alloc_zip_func(
+[[nodiscard]] bool btr_cur_update_alloc_zip_func(
     page_zip_des_t *page_zip, /*!< in/out: compressed page */
     page_cur_t *cursor,       /*!< in/out: B-tree page cursor */
     dict_index_t *index,      /*!< in: the index corresponding to cursor */
@@ -314,8 +312,7 @@
     ulint length,   /*!< in: size needed */
     bool create,    /*!< in: true=delete-and-insert,
                     false=update-in-place */
-    mtr_t *mtr)     /*!< in/out: mini-transaction */
-    MY_ATTRIBUTE((warn_unused_result));
+    mtr_t *mtr);    /*!< in/out: mini-transaction */
 #ifdef UNIV_DEBUG
 #define btr_cur_update_alloc_zip(page_zip, cursor, index, offsets, len, cr, \
                                  mtr)                                       \
@@ -342,10 +339,11 @@
 @retval DB_SUCCESS on success
 @retval DB_ZIP_OVERFLOW if there is not enough space left
 on the compressed page (IBUF_BITMAP_FREE was reset outside mtr) */
-dberr_t btr_cur_update_in_place(ulint flags, btr_cur_t *cursor, ulint *offsets,
-                                const upd_t *update, ulint cmpl_info,
-                                que_thr_t *thr, trx_id_t trx_id, mtr_t *mtr)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t btr_cur_update_in_place(ulint flags, btr_cur_t *cursor,
+                                              ulint *offsets,
+                                              const upd_t *update,
+                                              ulint cmpl_info, que_thr_t *thr,
+                                              trx_id_t trx_id, mtr_t *mtr);
 
 /** Writes a redo log record of updating a record in-place.
 @param[in] flags Undo logging and locking flags
@@ -371,7 +369,7 @@
 @retval DB_UNDERFLOW if the page would become too empty
 @retval DB_ZIP_OVERFLOW if there is not enough space left
 on the compressed page (IBUF_BITMAP_FREE was reset outside mtr) */
-dberr_t btr_cur_optimistic_update(
+[[nodiscard]] dberr_t btr_cur_optimistic_update(
     ulint flags,         /*!< in: undo logging and locking flags */
     btr_cur_t *cursor,   /*!< in: cursor on the record to update;
                          cursor stays valid and positioned on the
@@ -388,11 +386,10 @@
                          | BTR_CREATE_FLAG
                          | BTR_KEEP_SYS_FLAG) */
     trx_id_t trx_id,     /*!< in: transaction id */
-    mtr_t *mtr)          /*!< in/out: mini-transaction; if this
-                         is a secondary index, the caller must
-                         mtr_commit(mtr) before latching any
-                         further pages */
-    MY_ATTRIBUTE((warn_unused_result));
+    mtr_t *mtr);         /*!< in/out: mini-transaction; if this
+                        is a secondary index, the caller must
+                        mtr_commit(mtr) before latching any
+                        further pages */
 
 /** Performs an update of a record on a page of a tree. It is assumed
 that mtr holds an x-latch on the tree and on the cursor page. If the
@@ -425,18 +422,18 @@
 latching any further pages
 @param[in]     pcur          The persistent cursor on the record to update.
 @return DB_SUCCESS or error code */
-dberr_t btr_cur_pessimistic_update(
+[[nodiscard]] dberr_t btr_cur_pessimistic_update(
     ulint flags, btr_cur_t *cursor, ulint **offsets, mem_heap_t **offsets_heap,
     mem_heap_t *entry_heap, big_rec_t **big_rec, upd_t *update, ulint cmpl_info,
     que_thr_t *thr, trx_id_t trx_id, undo_no_t undo_no, mtr_t *mtr,
-    btr_pcur_t *pcur = nullptr) MY_ATTRIBUTE((warn_unused_result));
+    btr_pcur_t *pcur = nullptr);
 
 /** Marks a clustered index record deleted. Writes an undo log record to
  undo log on this delete marking. Writes in the trx id field the id
  of the deleting transaction, and in the roll ptr field pointer to the
  undo log record created.
  @return DB_SUCCESS, DB_LOCK_WAIT, or error number */
-dberr_t btr_cur_del_mark_set_clust_rec(
+[[nodiscard]] dberr_t btr_cur_del_mark_set_clust_rec(
     ulint flags,           /*!< in: undo logging and locking flags */
     buf_block_t *block,    /*!< in/out: buffer block of the record */
     rec_t *rec,            /*!< in/out: record */
@@ -444,17 +441,15 @@
     const ulint *offsets,  /*!< in: rec_get_offsets(rec) */
     que_thr_t *thr,        /*!< in: query thread */
     const dtuple_t *entry, /*!< in: dtuple for the deleting record */
-    mtr_t *mtr)            /*!< in/out: mini-transaction */
-    MY_ATTRIBUTE((warn_unused_result));
+    mtr_t *mtr);           /*!< in/out: mini-transaction */
 /** Sets a secondary index record delete mark to TRUE or FALSE.
  @return DB_SUCCESS, DB_LOCK_WAIT, or error number */
-dberr_t btr_cur_del_mark_set_sec_rec(
+[[nodiscard]] dberr_t btr_cur_del_mark_set_sec_rec(
     ulint flags,       /*!< in: locking flag */
     btr_cur_t *cursor, /*!< in: cursor */
     ibool val,         /*!< in: value to set */
     que_thr_t *thr,    /*!< in: query thread */
-    mtr_t *mtr)        /*!< in/out: mini-transaction */
-    MY_ATTRIBUTE((warn_unused_result));
+    mtr_t *mtr);       /*!< in/out: mini-transaction */
 /** Tries to compress a page of the tree if it seems useful. It is assumed
  that mtr holds an x-latch on the tree and on the cursor page. To avoid
  deadlocks, mtr must also own x-latches to brothers of page, if those
@@ -472,7 +467,7 @@
  that the mtr has an x-latch on the page where the cursor is positioned,
  but no latch on the whole tree.
  @return true if success, i.e., the page did not become too empty */
-ibool btr_cur_optimistic_delete_func(
+[[nodiscard]] ibool btr_cur_optimistic_delete_func(
     btr_cur_t *cursor, /*!< in: cursor on the record to delete;
                        cursor stays valid: if deletion succeeds,
                        on function exit it points to the successor
@@ -480,11 +475,10 @@
 #ifdef UNIV_DEBUG
     ulint flags, /*!< in: BTR_CREATE_FLAG or 0 */
 #endif           /* UNIV_DEBUG */
-    mtr_t *mtr)  /*!< in: mtr; if this function returns
-                 TRUE on a leaf page of a secondary
-                 index, the mtr must be committed
-                 before latching any further pages */
-    MY_ATTRIBUTE((warn_unused_result));
+    mtr_t *mtr); /*!< in: mtr; if this function returns
+                TRUE on a leaf page of a secondary
+                index, the mtr must be committed
+                before latching any further pages */
 #ifdef UNIV_DEBUG
 #define btr_cur_optimistic_delete(cursor, flags, mtr) \
   btr_cur_optimistic_delete_func(cursor, flags, mtr)
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/btr0load.h mysql-8.0-8.0.27/storage/innobase/include/btr0load.h
--- mysql-8.0-8.0.26/storage/innobase/include/btr0load.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/btr0load.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,190 @@
+/*****************************************************************************
+
+Copyright (c) 2014, 2021, Oracle and/or its affiliates. All Rights Reserved.
+
+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, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
+/** @file include/btr0load.h
+ The B-tree bulk load
+
+ Created 03/11/2014 Shaohua Wang
+ *************************************************************************/
+
+#ifndef btr0load_h
+#define btr0load_h
+
+#include <stddef.h>
+#include <vector>
+
+#include "dict0dict.h"
+#include "page0cur.h"
+#include "ut0class_life_cycle.h"
+#include "ut0new.h"
+
+// Forward declaration.
+class Page_load;
+
+/** @note We should call commit(false) for a Page_load object, which is not in
+m_page_loaders after page_commit, and we will commit or abort Page_load
+objects in function "finish". */
+class Btree_load : private ut::Non_copyable {
+ public:
+  /** Interface to consume from. */
+  struct Cursor {
+    /** Constructor. */
+    Cursor() = default;
+
+    /** Destructor. */
+    virtual ~Cursor() = default;
+
+    /** Fetch the current row as a tuple.
+    @param[out] dtuple          Row represented as a tuple.
+    @return DB_SUCCESS, DB_END_OF_INDEX or error code. */
+    [[nodiscard]] virtual dberr_t fetch(dtuple_t *&dtuple) noexcept = 0;
+
+    /** @return true if duplicates detected. */
+    virtual bool duplicates_detected() const noexcept = 0;
+
+    /** Move to the next record.
+    @return DB_SUCCESS, DB_END_OF_INDEX or error code. */
+    [[nodiscard]] virtual dberr_t next() noexcept = 0;
+  };
+
+ public:
+  using Page_loaders = std::vector<Page_load *, ut::allocator<Page_load *>>;
+
+  /** Constructor
+  @param[in]	index		          B-tree index.
+  @param[in]	trx_id		        Transaction id.
+  @param[in]	observer	        Flush observer */
+  Btree_load(dict_index_t *index, trx_id_t trx_id,
+             Flush_observer *observer) noexcept;
+
+  /** Destructor */
+  ~Btree_load() noexcept;
+
+  /** Load the btree from the cursor.
+  @param[in,out] cursor         Cursor to read tuples from.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t build(Cursor &cursor) noexcept;
+
+  /** Btree bulk load finish. We commit the last page in each level
+  and copy the last page in top level to the root page of the index
+  if no error occurs.
+  @param[in]	err	              Whether bulk load was successful until now
+  @return error code  */
+  [[nodiscard]] dberr_t finish(dberr_t err) noexcept;
+
+  /** Release all latches. */
+  void release() noexcept;
+
+  /** Re-latch all latches. */
+  void latch() noexcept;
+
+  /** Insert a tuple to a page in a level
+  @param[in] dtuple             Tuple to insert
+  @param[in] level	            B-tree level
+  @return error code */
+  [[nodiscard]] dberr_t insert(dtuple_t *dtuple, size_t level) noexcept;
+
+ private:
+  /** Set the root page on completion.
+  @param[in] last_page_no       Last page number (the new root).
+  @return DB_SUCCESS or error code. */
+  dberr_t load_root_page(page_no_t last_page_no) noexcept;
+
+  /** Split a page
+  @param[in]	page_load	        Page to split
+  @param[in]	next_page_load	  Next page
+  @return	error code */
+  [[nodiscard]] dberr_t page_split(Page_load *page_load,
+                                   Page_load *next_page_load) noexcept;
+
+  /** Commit(finish) a page. We set next/prev page no, compress a page of
+  compressed table and split the page if compression fails, insert a node
+  pointer to father page if needed, and commit mini-transaction.
+  @param[in]	page_load	        Page to commit
+  @param[in]	next_page_load    Next page
+  @param[in]	insert_father	    Flag whether need to insert node ptr
+  @return	error code */
+  [[nodiscard]] dberr_t page_commit(Page_load *page_load,
+                                    Page_load *next_page_load,
+                                    bool insert_father) noexcept;
+
+  /** Prepare space to insert a tuple.
+  @param[in,out] page_load      Page bulk that will be used to store the record.
+                                It may be replaced if there is not enough space
+                                to hold the record.
+  @param[in]  level             B-tree level
+  @param[in]  rec_size          Record size
+  @return error code */
+  [[nodiscard]] dberr_t prepare_space(Page_load *&page_load, size_t level,
+                                      size_t rec_size) noexcept;
+
+  /** Insert a tuple to a page.
+  @param[in]  page_load         Page bulk object
+  @param[in]  tuple             Tuple to insert
+  @param[in]  big_rec           Big record vector, maybe NULL if there is no
+                                Data to be stored externally.
+  @param[in]  rec_size          Record size
+  @return error code */
+  [[nodiscard]] dberr_t insert(Page_load *page_load, dtuple_t *tuple,
+                               big_rec_t *big_rec, size_t rec_size) noexcept;
+
+  /** Log free check */
+  void log_free_check() noexcept;
+
+  /** Btree page bulk load finish. Commits the last page in each level
+  if no error occurs. Also releases all page bulks.
+  @param[in]  err               Whether bulk load was successful until now
+  @param[out] last_page_no      Last page number
+  @return error code  */
+  [[nodiscard]] dberr_t finalize_page_loads(dberr_t err,
+                                            page_no_t &last_page_no) noexcept;
+
+ private:
+  /** Number of records inserted. */
+  uint64_t m_n_recs{};
+
+  /** B-tree index */
+  dict_index_t *m_index{};
+
+  /** Transaction id */
+  trx_id_t m_trx_id{};
+
+  /** Root page level */
+  size_t m_root_level{};
+
+  /** Flush observer */
+  Flush_observer *m_flush_observer{};
+
+  /** Page cursor vector for all level */
+  Page_loaders m_page_loaders{};
+
+  /** State of the index. Used for asserting at the end of a
+  bulk load operation to ensure that the online status of the
+  index does not change */
+  IF_DEBUG(unsigned m_index_online{};)
+};
+
+#endif /* btr0load_h */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/btr0pcur.h mysql-8.0-8.0.27/storage/innobase/include/btr0pcur.h
--- mysql-8.0-8.0.26/storage/innobase/include/btr0pcur.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/btr0pcur.h	2021-09-28 11:46:34.000000000 +0000
@@ -322,7 +322,7 @@
 
   /** Free old_rec_buf. */
   void free_rec_buf() {
-    ut_free(m_old_rec_buf);
+    ut::free(m_old_rec_buf);
     m_old_rec_buf = nullptr;
   }
 
@@ -487,7 +487,7 @@
   the cursor.
   @return own: persistent cursor */
   static btr_pcur_t *create_for_mysql() {
-    auto pcur = UT_NEW_NOKEY(btr_pcur_t());
+    auto pcur = ut::new_withkey<btr_pcur_t>(UT_NEW_THIS_FILE_PSI_KEY);
 
     pcur->m_btr_cur.index = nullptr;
 
@@ -501,7 +501,7 @@
   static void free_for_mysql(btr_pcur_t *&pcur) {
     pcur->free_rec_buf();
 
-    UT_DELETE(pcur);
+    ut::delete_(pcur);
 
     pcur = nullptr;
   }
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/buf0buf.h mysql-8.0-8.0.27/storage/innobase/include/buf0buf.h
--- mysql-8.0-8.0.26/storage/innobase/include/buf0buf.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/buf0buf.h	2021-09-28 11:46:34.000000000 +0000
@@ -520,14 +520,12 @@
 #endif /* UNIV_DEBUG */
 /** Reads the freed_page_clock of a buffer block.
  @return freed_page_clock */
-static inline ulint buf_page_get_freed_page_clock(
-    const buf_page_t *bpage) /*!< in: block */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ulint buf_page_get_freed_page_clock(
+    const buf_page_t *bpage); /*!< in: block */
 /** Reads the freed_page_clock of a buffer block.
  @return freed_page_clock */
-static inline ulint buf_block_get_freed_page_clock(
-    const buf_block_t *block) /*!< in: block */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ulint buf_block_get_freed_page_clock(
+    const buf_block_t *block); /*!< in: block */
 
 /** Tells, for heuristics, if a block is still close enough to the MRU end of
 the LRU list meaning that it is not in danger of getting evicted and also
@@ -559,11 +557,6 @@
 @param[in,out]	block	buffer block */
 static inline void buf_block_modify_clock_inc(buf_block_t *block);
 
-/** Read the modify clock.
-@param[in]	block	buffer block
-@return modify_clock value */
-static inline uint64_t buf_block_get_modify_clock(const buf_block_t *block);
-
 /** Increments the bufferfix count. */
 #ifdef UNIV_DEBUG
 /**
@@ -630,12 +623,6 @@
 static inline void buf_ptr_get_fsp_addr(const void *ptr, space_id_t *space,
                                         fil_addr_t *addr);
 
-/** Gets the hash value of a block. This can be used in searches in the
- lock hash table.
- @return lock hash value */
-static inline ulint buf_block_get_lock_hash_val(
-    const buf_block_t *block) /*!< in: block */
-    MY_ATTRIBUTE((warn_unused_result));
 #ifdef UNIV_DEBUG
 /** Finds a block in the buffer pool that points to a
 given compressed page. Used only to confirm that buffer pool does not contain a
@@ -744,9 +731,8 @@
     const buf_page_t *bpage); /*!< in: pointer to the control block */
 /** Gets the state of a block.
  @return state */
-static inline enum buf_page_state buf_block_get_state(
-    const buf_block_t *block) /*!< in: pointer to the control block */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline enum buf_page_state buf_block_get_state(
+    const buf_block_t *block); /*!< in: pointer to the control block */
 
 /** Sets the state of a block.
 @param[in,out]	bpage	pointer to control block
@@ -762,27 +748,23 @@
 
 /** Determines if a block is mapped to a tablespace.
  @return true if mapped */
-static inline ibool buf_page_in_file(
-    const buf_page_t *bpage) /*!< in: pointer to control block */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ibool buf_page_in_file(
+    const buf_page_t *bpage); /*!< in: pointer to control block */
 #ifndef UNIV_HOTBACKUP
 /** Determines if a block should be on unzip_LRU list.
  @return true if block belongs to unzip_LRU */
-static inline bool buf_page_belongs_to_unzip_LRU(
-    const buf_page_t *bpage) /*!< in: pointer to control block */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline bool buf_page_belongs_to_unzip_LRU(
+    const buf_page_t *bpage); /*!< in: pointer to control block */
 
 /** Gets the mutex of a block.
  @return pointer to mutex protecting bpage */
-static inline BPageMutex *buf_page_get_mutex(
-    const buf_page_t *bpage) /*!< in: pointer to control block */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline BPageMutex *buf_page_get_mutex(
+    const buf_page_t *bpage); /*!< in: pointer to control block */
 
 /** Get the flush type of a page.
  @return flush type */
-static inline buf_flush_t buf_page_get_flush_type(
-    const buf_page_t *bpage) /*!< in: buffer page */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline buf_flush_t buf_page_get_flush_type(
+    const buf_page_t *bpage); /*!< in: buffer page */
 
 /** Set the flush type of a page.
 @param[in]	bpage		buffer page
@@ -798,14 +780,12 @@
 
 /** Gets the io_fix state of a block.
  @return io_fix state */
-static inline enum buf_io_fix buf_page_get_io_fix(
-    const buf_page_t *bpage) /*!< in: pointer to the control block */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline enum buf_io_fix buf_page_get_io_fix(
+    const buf_page_t *bpage); /*!< in: pointer to the control block */
 /** Gets the io_fix state of a block.
  @return io_fix state */
-static inline enum buf_io_fix buf_block_get_io_fix(
-    const buf_block_t *block) /*!< in: pointer to the control block */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline enum buf_io_fix buf_block_get_io_fix(
+    const buf_block_t *block); /*!< in: pointer to the control block */
 
 /** Sets the io_fix state of a block.
 @param[in,out]	bpage	control block
@@ -835,15 +815,13 @@
     buf_page_t *bpage); /*!< in/out: control block */
 /** Determine if a buffer block can be relocated in memory.  The block
  can be dirty, but it must not be I/O-fixed or bufferfixed. */
-static inline ibool buf_page_can_relocate(
-    const buf_page_t *bpage) /*!< control block being relocated */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ibool buf_page_can_relocate(
+    const buf_page_t *bpage); /*!< control block being relocated */
 
 /** Determine if a block has been flagged old.
 @param[in]	bpage	control block
 @return true if old */
-static inline ibool buf_page_is_old(const buf_page_t *bpage)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ibool buf_page_is_old(const buf_page_t *bpage);
 
 /** Flag a block old.
 @param[in,out]	bpage	control block
@@ -853,9 +831,8 @@
 /** Determine the time of first access of a block in the buffer pool.
  @return ut_time_monotonic_ms() at the time of first access, 0 if not accessed
  */
-static inline unsigned buf_page_is_accessed(
-    const buf_page_t *bpage) /*!< in: control block */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline unsigned buf_page_is_accessed(
+    const buf_page_t *bpage); /*!< in: control block */
 /** Flag a block accessed. */
 static inline void buf_page_set_accessed(
     buf_page_t *bpage); /*!< in/out: control block */
@@ -867,24 +844,18 @@
 to make this pure.
 @param[in]	bpage	control block, or NULL
 @return control block, or NULL */
-static inline buf_block_t *buf_page_get_block(buf_page_t *bpage)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline buf_block_t *buf_page_get_block(buf_page_t *bpage);
 #ifdef UNIV_DEBUG
 /** Gets a pointer to the memory frame of a block.
  @return pointer to the frame */
-static inline buf_frame_t *buf_block_get_frame(
-    const buf_block_t *block) /*!< in: pointer to the control block */
-    MY_ATTRIBUTE((warn_unused_result));
-#else /* UNIV_DEBUG */
+[[nodiscard]] static inline buf_frame_t *buf_block_get_frame(
+    const buf_block_t *block); /*!< in: pointer to the control block */
+#else                          /* UNIV_DEBUG */
 #define buf_block_get_frame(block) (block)->frame
 #endif /* UNIV_DEBUG */
 #else  /* !UNIV_HOTBACKUP */
 #define buf_block_get_frame(block) (block)->frame
 #endif /* !UNIV_HOTBACKUP */
-/** Gets the compressed page descriptor corresponding to an uncompressed page
- if applicable. */
-#define buf_block_get_page_zip(block) \
-  ((block)->page.zip.data ? &(block)->page.zip : NULL)
 
 /** Get a buffer block from an adaptive hash index pointer.
 This function does not return if the block is not identified.
@@ -964,9 +935,8 @@
 
 /** Calculates the index of a buffer pool to the buf_pool[] array.
  @return the position of the buffer pool in buf_pool[] */
-static inline ulint buf_pool_index(
-    const buf_pool_t *buf_pool) /*!< in: buffer pool */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ulint buf_pool_index(
+    const buf_pool_t *buf_pool); /*!< in: buffer pool */
 /** Returns the buffer pool instance given a page instance
  @return buf_pool */
 static inline buf_pool_t *buf_pool_from_bpage(
@@ -1064,10 +1034,9 @@
 
 /** Determine if a block is a sentinel for a buffer pool watch.
  @return true if a sentinel for a buffer pool watch, false if not */
-ibool buf_pool_watch_is_sentinel(
+[[nodiscard]] ibool buf_pool_watch_is_sentinel(
     const buf_pool_t *buf_pool, /*!< buffer pool instance */
-    const buf_page_t *bpage)    /*!< in: block */
-    MY_ATTRIBUTE((warn_unused_result));
+    const buf_page_t *bpage);   /*!< in: block */
 
 /** Stop watching if the page has been read in.
 buf_pool_watch_set(same_page_id) must have returned NULL before.
@@ -1079,8 +1048,7 @@
 has returned NULL and before invoking buf_pool_watch_unset(same_page_id).
 @param[in]	page_id	page id
 @return false if the given page was not read in, true if it was */
-ibool buf_pool_watch_occurred(const page_id_t &page_id)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] ibool buf_pool_watch_occurred(const page_id_t &page_id);
 
 /** Get total buffer pool statistics.
 @param[out] LRU_len Length of all lru lists
@@ -1199,21 +1167,15 @@
   void set_dblwr_batch_id(uint16_t batch_id) { m_dblwr_id = batch_id; }
 
   /** @return the double write batch id, or uint16_t max if undefined. */
-  uint16_t get_dblwr_batch_id() const MY_ATTRIBUTE((warn_unused_result)) {
-    return (m_dblwr_id);
-  }
+  [[nodiscard]] uint16_t get_dblwr_batch_id() const { return (m_dblwr_id); }
 
   /** Retrieve the tablespace id.
   @return tablespace id */
-  space_id_t space() const noexcept MY_ATTRIBUTE((warn_unused_result)) {
-    return id.space();
-  }
+  [[nodiscard]] space_id_t space() const noexcept { return id.space(); }
 
   /** Retrieve the page number.
   @return page number */
-  page_no_t page_no() const noexcept MY_ATTRIBUTE((warn_unused_result)) {
-    return id.page_no();
-  }
+  [[nodiscard]] page_no_t page_no() const noexcept { return id.page_no(); }
 
   /** Checks if this space reference saved during last page ID initialization
   was deleted or truncated since.
@@ -1303,11 +1265,11 @@
 
  public:
   /** @return the flush observer instance. */
-  FlushObserver *get_flush_observer() noexcept { return m_flush_observer; }
+  Flush_observer *get_flush_observer() noexcept { return m_flush_observer; }
 
   /** Set the flush observer for the page.
   @param[in] flush_observer     The flush observer to set. */
-  void set_flush_observer(FlushObserver *flush_observer) noexcept {
+  void set_flush_observer(Flush_observer *flush_observer) noexcept {
     /* Don't allow to set flush observer from non-null to null, or from one
     observer to another. */
     ut_a(m_flush_observer == nullptr || m_flush_observer == flush_observer);
@@ -1631,7 +1593,7 @@
 
 #ifndef UNIV_HOTBACKUP
   /** Flush observer instance. */
-  FlushObserver *m_flush_observer{};
+  Flush_observer *m_flush_observer{};
 
   /** Tablespace instance that this page belongs to. */
   fil_space_t *m_space{};
@@ -1720,10 +1682,6 @@
   bool in_withdraw_list;
 #endif /* UNIV_DEBUG */
 
-  /** hashed value of the page address in the record lock hash table;
-  protected by buf_block_t::lock (or buf_block_t::mutex in buf_page_get_gen(),
-  buf_page_init_for_read() and buf_page_create()) */
-  uint32_t lock_hash_val;
   /** @} */
 
   /** @name Hash search fields (unprotected)
@@ -1850,6 +1808,21 @@
   new mutex in InnoDB-5.1 to relieve contention on the buffer pool mutex */
   BPageMutex mutex;
 
+  /** Get the modified clock (version) value.
+  @param[in] single_threaded    Thread can only be written to or read by a
+                                single thread
+  @return the modified clock vlue. */
+  uint64_t get_modify_clock(IF_DEBUG(bool single_threaded)) const noexcept {
+#if defined(UNIV_DEBUG) && !defined(UNIV_LIBRARY) && !defined(UNIV_HOTBACKUP)
+    /* No block latch is acquired when blocks access is guaranteed to be
+    in single threaded mode. */
+    constexpr auto mode = RW_LOCK_FLAG_X | RW_LOCK_FLAG_SX | RW_LOCK_FLAG_S;
+    ut_ad(single_threaded || rw_lock_own_flagged(&lock, mode));
+#endif /* UNIV_DEBUG && !UNIV_LIBRARY */
+
+    return modify_clock;
+  }
+
   /** Get the page number and space id of the current buffer block.
   @return page number of the current buffer block. */
   const page_id_t &get_page_id() const { return page.id; }
@@ -1878,8 +1851,20 @@
 
   /** Get the page type of the current buffer block as string.
   @return page type of the current buffer block as string. */
-  const char *get_page_type_str() const noexcept
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] const char *get_page_type_str() const noexcept;
+
+  /** Gets the compressed page descriptor corresponding to an uncompressed page
+  if applicable.
+  @return page descriptor or nullptr. */
+  page_zip_des_t *get_page_zip() noexcept {
+    return page.zip.data != nullptr ? &page.zip : nullptr;
+  }
+
+  /** Const version.
+  @return page descriptor or nullptr. */
+  page_zip_des_t const *get_page_zip() const noexcept {
+    return page.zip.data != nullptr ? &page.zip : nullptr;
+  }
 };
 
 /** Check if a buf_block_t object is in a valid state
@@ -2196,8 +2181,6 @@
   Protected by zip_hash_mutex. */
   ulint buddy_n_frames;
 #endif
-  /** Allocator used for allocating memory for the the "chunks" member. */
-  ut_allocator<unsigned char> allocator;
 
   /** Number of buffer pool chunks */
   volatile ulint n_chunks;
@@ -2581,6 +2564,21 @@
 }
 #endif /* !UNIV_HOTBACKUP */
 
+/** Gets the compressed page descriptor corresponding to an uncompressed
+page if applicable.
+@param[in] block                Get the zip descriptor for this block. */
+inline page_zip_des_t *buf_block_get_page_zip(buf_block_t *block) noexcept {
+  return block->get_page_zip();
+}
+
+/** Gets the compressed page descriptor corresponding to an uncompressed
+page if applicable. Const version.
+@param[in] block                Get the zip descriptor for this block.
+@return page descriptor or nullptr. */
+inline const page_zip_des_t *buf_block_get_page_zip(
+    const buf_block_t *block) noexcept {
+  return block->get_page_zip();
+}
 #include "buf0buf.ic"
 
 #endif /* !buf0buf_h */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/buf0buf.ic mysql-8.0-8.0.27/storage/innobase/include/buf0buf.ic
--- mysql-8.0-8.0.26/storage/innobase/include/buf0buf.ic	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/buf0buf.ic	2021-09-28 11:46:34.000000000 +0000
@@ -56,7 +56,7 @@
   buf_block_t *blocks; /*!< array of buffer control blocks */
 
   /** Get the size of 'mem' in bytes. */
-  size_t mem_size() const { return ut_allocator<byte>::large_page_size(mem); }
+  size_t mem_size() const { return ut::large_page_allocation_size(mem); }
 
   /** Advices the OS that this chunk should not be dumped to a core file.
   Emits a warning to the log if could not succeed.
@@ -633,7 +633,7 @@
       break;
     case BUF_BLOCK_FILE_PAGE:
       ut_a(block->page.buf_fix_count > 0);
-      /* fall through */
+      [[fallthrough]];
     case BUF_BLOCK_READY_FOR_USE:
     case BUF_BLOCK_MEMORY:
     case BUF_BLOCK_REMOVE_HASH:
@@ -676,19 +676,6 @@
 }
 
 #ifndef UNIV_HOTBACKUP
-/** Gets the hash value of the page the pointer is pointing to. This can be used
- in searches in the lock hash table.
- @return lock hash value */
-static inline ulint buf_block_get_lock_hash_val(
-    const buf_block_t *block) /*!< in: block */
-{
-  ut_ad(block);
-  ut_ad(buf_page_in_file(&block->page));
-  ut_ad(rw_lock_own(&(((buf_block_t *)block)->lock), RW_LOCK_X) ||
-        rw_lock_own(&(((buf_block_t *)block)->lock), RW_LOCK_S));
-
-  return (block->lock_hash_val);
-}
 
 /** Allocates a buf_page_t descriptor. This function must succeed. In case
  of failure we assert in this function.
@@ -696,7 +683,8 @@
 static inline buf_page_t *buf_page_alloc_descriptor(void) {
   buf_page_t *bpage;
 
-  bpage = (buf_page_t *)ut_zalloc_nokey(sizeof *bpage);
+  bpage =
+      (buf_page_t *)ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sizeof *bpage);
   ut_ad(bpage);
   UNIV_MEM_ALLOC(bpage, sizeof *bpage);
   /* This is required for valgrind to work correctly. */
@@ -762,18 +750,6 @@
   block->modify_clock++;
 }
 
-/** Read the modify clock.
-@param[in]	block	buffer block
-@return modify_clock value */
-static inline ib_uint64_t buf_block_get_modify_clock(const buf_block_t *block) {
-  /* No block latch is acquired for internal temporary tables. */
-  ut_ad(fsp_is_system_temporary(block->page.id.space()) ||
-        rw_lock_own_flagged(&block->lock,
-                            RW_LOCK_FLAG_X | RW_LOCK_FLAG_SX | RW_LOCK_FLAG_S));
-
-  return (block->modify_clock);
-}
-
 inline void buf_page_t::set_oldest_lsn(lsn_t lsn) noexcept {
   ut_ad(buf_page_get_state(this) == BUF_BLOCK_POOL_WATCH ||
         mutex_own(buf_page_get_mutex(this)));
@@ -1071,7 +1047,7 @@
       }
     }
 #endif /* UNIV_DEBUG */
-       /* Fall through */
+      [[fallthrough]];
 
     case BUF_BLOCK_ZIP_PAGE:
     case BUF_BLOCK_ZIP_DIRTY:
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/buf0checksum.h mysql-8.0-8.0.27/storage/innobase/include/buf0checksum.h
--- mysql-8.0-8.0.26/storage/innobase/include/buf0checksum.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/buf0checksum.h	2021-09-28 11:46:34.000000000 +0000
@@ -93,12 +93,12 @@
   /** Checks if a page is corrupt.
   @retval	true	if page is corrupt
   @retval	false	if page is not corrupt */
-  bool MY_ATTRIBUTE((warn_unused_result)) is_corrupted() const;
+  [[nodiscard]] bool is_corrupted() const;
 
   /** Checks if a page is encrypted.
   @retval	true	if page is encrypted
   @retval	false	if page is not encrypted */
-  bool is_encrypted() const noexcept MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool is_encrypted() const noexcept;
 
   /** Print message if page is empty.
   @param[in]	empty		true if page is empty */
@@ -191,8 +191,8 @@
   uint32_t calc_zip_checksum(srv_checksum_algorithm_t algo,
                              bool use_legacy_big_endian = false) const;
 
-  static bool is_lsn_valid(const byte *frame, uint32_t page_size) noexcept
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static bool is_lsn_valid(const byte *frame,
+                                         uint32_t page_size) noexcept;
 
  private:
   /** Checks if the page is in innodb checksum format.
@@ -230,8 +230,8 @@
                                  srv_checksum_algorithm_t page_checksum,
                                  const page_id_t &page_id) const;
 
-  space_id_t space_id() const noexcept MY_ATTRIBUTE((warn_unused_result));
-  page_no_t page_no() const noexcept MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] space_id_t space_id() const noexcept;
+  [[nodiscard]] page_no_t page_no() const noexcept;
 
  protected:
   /** If true, do a LSN check during innodb recovery. */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/buf0dblwr.h mysql-8.0-8.0.27/storage/innobase/include/buf0dblwr.h
--- mysql-8.0-8.0.26/storage/innobase/include/buf0dblwr.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/buf0dblwr.h	2021-09-28 11:46:34.000000000 +0000
@@ -151,7 +151,7 @@
 /** Startup the background thread(s) and create the instance.
 @param[in]  create_new_db Create new database.
 @return DB_SUCCESS or error code */
-dberr_t open(bool create_new_db) noexcept MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t open(bool create_new_db) noexcept;
 
 /** Shutdown the background thread and destroy the instance */
 void close() noexcept;
@@ -167,15 +167,15 @@
 @param[in]	bpage		            Buffer block to write
 @param[in]	sync		            True if sync IO requested
 @return DB_SUCCESS or error code */
-dberr_t write(buf_flush_t flush_type, buf_page_t *bpage, bool sync) noexcept
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t write(buf_flush_t flush_type, buf_page_t *bpage,
+                            bool sync) noexcept;
 
 /** Obtain the encrypted frame and store it in bpage->m_io_frame
 @param[in,out]  bpage  the buffer page containing the unencrypted frame.
 @param[out]     len    the encrypted data length.
 @return the memory block containing the compressed + encrypted frame. */
-file::Block *get_encrypted_frame(buf_page_t *bpage, uint32_t &len) noexcept
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] file::Block *get_encrypted_frame(buf_page_t *bpage,
+                                               uint32_t &len) noexcept;
 
 /** Updates the double write buffer when a write request is completed.
 @param[in] bpage               Block that has just been writtent to disk.
@@ -188,19 +188,16 @@
 namespace v1 {
 /** Read the boundaries of the legacy dblwr buffer extents.
 @return DB_SUCCESS or error code. */
-dberr_t init() noexcept MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t init() noexcept;
 
 /** Create the dblwr data structures in the system tablespace.
 @return DB_SUCCESS or error code. */
-dberr_t create() noexcept MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t create() noexcept;
 
 /** Check if the read is of a page inside the legacy dblwr buffer.
 @param[in] page_no              Page number to check.
 @return true if offset inside legacy dblwr buffer. */
-// clang-format off
-bool is_inside(page_no_t page_no) noexcept
-    MY_ATTRIBUTE((warn_unused_result));
-// clang-format on
+[[nodiscard]] bool is_inside(page_no_t page_no) noexcept;
 
 }  // namespace v1
 }  // namespace dblwr
@@ -237,7 +234,7 @@
 @param[in,out] pages           For storing the doublewrite pages read
                                from the double write buffer
 @return DB_SUCCESS or error code */
-dberr_t load(Pages *pages) noexcept MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t load(Pages *pages) noexcept;
 
 /** Restore pages from the double write buffer to the tablespace.
 @param[in,out]	pages		Pages from the doublewrite buffer
@@ -250,8 +247,8 @@
 @param[in]	page_id		Page number to lookup
 @return	page frame
 @retval NULL if no page was found */
-const byte *find(const Pages *pages, const page_id_t &page_id) noexcept
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] const byte *find(const Pages *pages,
+                               const page_id_t &page_id) noexcept;
 
 /** Check if some pages from the double write buffer could not be
 restored because of the missing tablespace IDs.
@@ -276,9 +273,7 @@
 
   /** Load the doublewrite buffer pages. Doesn't create the doublewrite
   @return DB_SUCCESS or error code */
-  dberr_t load() noexcept MY_ATTRIBUTE((warn_unused_result)) {
-    return (dblwr::recv::load(m_pages));
-  }
+  [[nodiscard]] dberr_t load() noexcept { return (dblwr::recv::load(m_pages)); }
 
   /** Restore pages from the double write buffer to the tablespace.
   @param[in]	space		Tablespace pages to restore,
@@ -288,16 +283,13 @@
     dblwr::recv::recover(m_pages, space);
   }
 
-  // clang-format off
   /** Find a doublewrite copy of a page.
   @param[in]	page_id		Page number to lookup
   @return	page frame
   @retval nullptr if no page was found */
-  const byte *find(const page_id_t &page_id) noexcept
-      MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] const byte *find(const page_id_t &page_id) noexcept {
     return (dblwr::recv::find(m_pages, page_id));
   }
-  // clang-format on
 
   /** Check if some pages from the double write buffer
   could not be restored because of the missing tablespace IDs. */
@@ -326,7 +318,7 @@
 /** Check if the dblwr files contain encrypted pages.
 @return true if dblwr file contains any encrypted pages,
         false if dblwr file contains no encrypted pages. */
-bool has_encrypted_pages() noexcept MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool has_encrypted_pages() noexcept;
 #endif /* UNIV_DEBUG */
 }  // namespace dblwr
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/buf0flu.h mysql-8.0-8.0.27/storage/innobase/include/buf0flu.h
--- mysql-8.0-8.0.26/storage/innobase/include/buf0flu.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/buf0flu.h	2021-09-28 11:46:34.000000000 +0000
@@ -55,7 +55,7 @@
 /** Event to wait for one flushing step */
 extern os_event_t buf_flush_tick_event;
 
-class ut_stage_alter_t;
+class Alter_stage;
 
 /** Remove a block from the flush list of modified blocks.
 @param[in]	bpage	pointer to the block in question */
@@ -99,8 +99,7 @@
 @param[in,out]	buf_pool	buffer pool instance
 @param[in,out]	block		buffer control block
 @return true if the page was flushed and the mutex released */
-bool buf_flush_page_try(buf_pool_t *buf_pool, buf_block_t *block)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool buf_flush_page_try(buf_pool_t *buf_pool, buf_block_t *block);
 #endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */
 
 /** Do flushing batch of a given type.
@@ -165,7 +164,7 @@
 @param[in]	observer	flush observer */
 static inline void buf_flush_note_modification(buf_block_t *block,
                                                lsn_t start_lsn, lsn_t end_lsn,
-                                               FlushObserver *observer);
+                                               Flush_observer *observer);
 
 /** This function should be called when recovery has modified a buffer page.
 @param[in]	block		block which is modified
@@ -237,16 +236,16 @@
 @param[in]	bpage		buffer control block, must be buf_page_in_file()
 @param[in]	flush_type	type of flush
 @return true if can flush immediately */
-bool buf_flush_ready_for_flush(buf_page_t *bpage, buf_flush_t flush_type)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool buf_flush_ready_for_flush(buf_page_t *bpage,
+                                             buf_flush_t flush_type);
 
 /** Check if there are any dirty pages that belong to a space id in the flush
  list in a particular buffer pool.
  @return number of dirty pages present in a single buffer pool */
 ulint buf_pool_get_dirty_pages_count(
-    buf_pool_t *buf_pool,     /*!< in: buffer pool */
-    space_id_t id,            /*!< in: space id to check */
-    FlushObserver *observer); /*!< in: flush observer to check */
+    buf_pool_t *buf_pool,      /*!< in: buffer pool */
+    space_id_t id,             /*!< in: space id to check */
+    Flush_observer *observer); /*!< in: flush observer to check */
 
 /** Synchronously flush dirty blocks from the end of the flush list of all
  buffer pool instances. NOTE: The calling thread is not allowed to own any
@@ -260,24 +259,23 @@
 @return true if all flush lists were empty. */
 bool buf_are_flush_lists_empty_validate();
 
-/** We use FlushObserver to track flushing of non-redo logged pages in bulk
-create index(BtrBulk.cc).Since we disable redo logging during a index build,
+/** We use Flush_observer to track flushing of non-redo logged pages in bulk
+create index(btr0load.cc).Since we disable redo logging during a index build,
 we need to make sure that all dirty pages modifed by the index build are
 flushed to disk before any redo logged operations go to the index. */
 
-class FlushObserver {
+class Flush_observer {
  public:
   /** Constructor
   @param[in] space_id	table space id
   @param[in] trx		trx instance
-  @param[in] stage		performance schema accounting object,
-  used by ALTER TABLE. It is passed to log_preflush_pool_modified_pages()
-  for accounting. */
-  FlushObserver(space_id_t space_id, trx_t *trx,
-                ut_stage_alter_t *stage) noexcept;
+  @param[in,out] stage PFS progresss monitoring instance, it's used by
+  ALTER TABLE. It is passed to log_preflush_pool_modified_pages() for
+  accounting. */
+  Flush_observer(space_id_t space_id, trx_t *trx, Alter_stage *stage) noexcept;
 
   /** Destructor */
-  ~FlushObserver() noexcept;
+  ~Flush_observer() noexcept;
 
   /** Check pages have been flushed and removed from the flush list
   in a buffer pool instance.
@@ -311,7 +309,7 @@
 
  private:
   using Counter = std::atomic_int;
-  using Counters = std::vector<Counter, ut_allocator<Counter>>;
+  using Counters = std::vector<Counter, ut::allocator<Counter>>;
 
   /** Tablespace ID. */
   space_id_t m_space_id{};
@@ -324,7 +322,7 @@
   specifying the number of pages to be attempted to be flushed and
   subsequently, stage->inc() will be called for each page we attempt to
   flush. */
-  ut_stage_alter_t *m_stage{};
+  Alter_stage *m_stage{};
 
   /** Flush request sent, per buffer pool. */
   Counters m_flushed{};
@@ -338,6 +336,7 @@
   /** True if the operation was interrupted. */
   bool m_interrupted{};
 };
+
 lsn_t get_flush_sync_lsn() noexcept;
 #endif /* !UNIV_HOTBACKUP */
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/buf0flu.ic mysql-8.0-8.0.27/storage/innobase/include/buf0flu.ic
--- mysql-8.0-8.0.26/storage/innobase/include/buf0flu.ic	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/buf0flu.ic	2021-09-28 11:46:34.000000000 +0000
@@ -54,12 +54,12 @@
  modified in it. Puts the block to the list of modified blocks, if it is not
  already in it. */
 static inline void buf_flush_note_modification(
-    buf_block_t *block,      /*!< in: block which is modified */
-    lsn_t start_lsn,         /*!< in: start lsn of the mtr that
-                             modified this block */
-    lsn_t end_lsn,           /*!< in: end lsn of the mtr that
-                             modified this block */
-    FlushObserver *observer) /*!< in: flush observer */
+    buf_block_t *block,       /*!< in: block which is modified */
+    lsn_t start_lsn,          /*!< in: start lsn of the mtr that
+                              modified this block */
+    lsn_t end_lsn,            /*!< in: end lsn of the mtr that
+                              modified this block */
+    Flush_observer *observer) /*!< in: flush observer */
 {
 #ifdef UNIV_DEBUG
   {
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/buf0lru.h mysql-8.0-8.0.27/storage/innobase/include/buf0lru.h
--- mysql-8.0-8.0.26/storage/innobase/include/buf0lru.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/buf0lru.h	2021-09-28 11:46:34.000000000 +0000
@@ -86,16 +86,15 @@
 @param[in]	zip	true if should remove also the compressed page of
                         an uncompressed page
 @return true if freed, false otherwise. */
-bool buf_LRU_free_page(buf_page_t *bpage, bool zip)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool buf_LRU_free_page(buf_page_t *bpage, bool zip);
 
 /** Try to free a replaceable block.
 @param[in,out]	buf_pool	buffer pool instance
 @param[in]	scan_all	scan whole LRU list if ture, otherwise scan
                                 only BUF_LRU_SEARCH_SCAN_THRESHOLD blocks
 @return true if found and freed */
-bool buf_LRU_scan_and_free_block(buf_pool_t *buf_pool, bool scan_all)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool buf_LRU_scan_and_free_block(buf_pool_t *buf_pool,
+                                               bool scan_all);
 
 /** Returns a free block from the buf_pool.  The block is taken off the
 free list.  If it is empty, returns NULL.
@@ -127,8 +126,7 @@
   * same as iteration 1 but sleep 10ms
 @param[in,out]	buf_pool	buffer pool instance
 @return the free control block, in state BUF_BLOCK_READY_FOR_USE */
-buf_block_t *buf_LRU_get_free_block(buf_pool_t *buf_pool)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] buf_block_t *buf_LRU_get_free_block(buf_pool_t *buf_pool);
 
 /** Determines if the unzip_LRU list should be used for evicting a victim
 instead of the general LRU list.
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/buf0stats.h mysql-8.0-8.0.27/storage/innobase/include/buf0stats.h
--- mysql-8.0-8.0.26/storage/innobase/include/buf0stats.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/buf0stats.h	2021-09-28 11:46:34.000000000 +0000
@@ -39,7 +39,7 @@
 #include "fsp0sysspace.h"      /* srv_tmp_space */
 #include "ibuf0ibuf.h"         /* IBUF_SPACE_ID */
 #include "ut0lock_free_hash.h" /* ut_lock_free_hash_t */
-#include "ut0new.h"            /* UT_NEW(), UT_DELETE() */
+#include "ut0new.h"            /* ut::new_withkey(), ut::delete_() */
 
 /** Per index buffer pool statistics - contains how many pages for each index
 are cached in the buffer pool(s). This is a key,value store where the key is
@@ -49,12 +49,12 @@
  public:
   /** Constructor. */
   buf_stat_per_index_t() {
-    m_store =
-        UT_NEW(ut_lock_free_hash_t(1024, true), mem_key_buf_stat_per_index_t);
+    m_store = ut::new_withkey<ut_lock_free_hash_t>(
+        ut::make_psi_memory_key(mem_key_buf_stat_per_index_t), 1024, true);
   }
 
   /** Destructor. */
-  ~buf_stat_per_index_t() { UT_DELETE(m_store); }
+  ~buf_stat_per_index_t() { ut::delete_(m_store); }
 
   /** Increment the number of pages for a given index with 1.
   @param[in]	id	id of the index whose count to increment */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/buf0types.h mysql-8.0-8.0.27/storage/innobase/include/buf0types.h
--- mysql-8.0-8.0.26/storage/innobase/include/buf0types.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/buf0types.h	2021-09-28 11:46:34.000000000 +0000
@@ -56,7 +56,7 @@
 /** Doublewrite memory struct */
 struct buf_dblwr_t;
 /** Flush observer for bulk create index */
-class FlushObserver;
+class Flush_observer;
 
 /** A buffer frame. @see page_t */
 typedef byte buf_frame_t;
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/clone0api.h mysql-8.0-8.0.27/storage/innobase/include/clone0api.h
--- mysql-8.0-8.0.26/storage/innobase/include/clone0api.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/clone0api.h	2021-09-28 11:46:34.000000000 +0000
@@ -127,12 +127,16 @@
 /** Check and delete any old list files. */
 void clone_init_list_files();
 
-/** Add fine name to clone list file for future replacement or rollback.
+/** Add file name to clone list file for future replacement or rollback.
 @param[in]	list_file_name	list file name where to add the file
 @param[in]	file_name	file name to add to the list
 @return error code */
 int clone_add_to_list_file(const char *list_file_name, const char *file_name);
 
+/** Remove one of the clone list files.
+@param[in]	file_name	list file name to delete */
+void clone_remove_list_file(const char *file_name);
+
 /** Revert back clone changes in case of an error. */
 void clone_files_error();
 
@@ -157,34 +161,108 @@
 /** Uninitialize Clone system */
 void clone_free();
 
-/** Mark clone system for abort to disallow database clone
-@param[in]	force	abort running database clones
-@return true if successful. */
-bool clone_mark_abort(bool force);
-
-/** Mark clone system as active to allow database clone. */
-void clone_mark_active();
-
 /** Check if active clone is running.
 @return true, if any active clone is found. */
 bool clone_check_active();
 
-/** Check for any active clone. If none, set a marker so that new clones
-operation waits till the marker is freed.
-@return true, if no active clone and marker is set successfully. */
-bool clone_mark_wait();
-
-/** Free the wait marker set earlier and allow clone to proceed. */
-void clone_mark_free();
-
-#else                         /* !UNIV_HOTBACKUP */
-#define clone_mark_abort(_P_) /*clone_mark_abort()*/
-#define clone_mark_active()   /*clone_mark_active()*/
-#endif                        /* !UNIV_HOTBACKUP */
+/** @return true, if clone provisioning in progress. */
+bool clone_check_provisioning();
+#endif /* !UNIV_HOTBACKUP */
 
 /** Fix cloned non-Innodb tables during recovery.
 @param[in,out]  thd     current THD
 @return true if error */
 bool fix_cloned_tables(THD *thd);
 
+/** Clone Notification handler. */
+class Clone_notify {
+ public:
+  /** Notification type. Currently used by various DDL commands. */
+  enum class Type {
+    /* Space is being created. */
+    SPACE_CREATE,
+    /* Space is being dropped. */
+    SPACE_DROP,
+    /* Space is being renamed. */
+    SPACE_RENAME,
+    /* Space is being discarded or imported. */
+    SPACE_IMPORT,
+    /* Space encryption property is altered. */
+    SPACE_ALTER_ENCRYPT,
+    /* Space encryption property of general tablespace is altered. */
+    SPACE_ALTER_ENCRYPT_GENERAL,
+    /* Space encryption flags of general tablespace are altered. */
+    SPACE_ALTER_ENCRYPT_GENERAL_FLAGS,
+    /* In place Alter general notification. */
+    SPACE_ALTER_INPLACE,
+    /* Inplace Alter bulk operation. */
+    SPACE_ALTER_INPLACE_BULK,
+    /* Special consideration is needed for UNDO as these DDLs
+    don't use DDL log and needs special consideration during recovery. */
+    SPACE_UNDO_DDL,
+    /* Redo logging is being disabled. */
+    SYSTEM_REDO_DISABLE
+  };
+
+#ifdef UNIV_HOTBACKUP
+  Clone_notify(Type, space_id_t, bool) : m_error() {}
+  ~Clone_notify() {}
+#else
+  /** Constructor to initiate notification.
+  @param[in]	type	notification type
+  @param[in]	space	tablespace ID for which notification is sent
+  @param[in]	no_wait	set error and return immediately if needs to wait */
+  Clone_notify(Type type, space_id_t space, bool no_wait);
+
+  /** Destructor to automatically end notification. */
+  ~Clone_notify();
+#endif /* UNIV_HOTBACKUP */
+
+  /** Get notification message for printing.
+  @param[in]	begin	 true if notification begin otherwise end
+  @param[out]	mesg	notification message */
+  void get_mesg(bool begin, std::string &mesg);
+
+  /** @return true iff notification failed. */
+  bool failed() const { return m_error != 0; }
+
+  /** @return saved error code. */
+  int get_error() const { return m_error; }
+
+  /** Disable copy construction */
+  Clone_notify(Clone_notify &) = delete;
+
+  /** Disable assignment */
+  Clone_notify &operator=(Clone_notify const &) = delete;
+
+ private:
+  /** Notification wait type set. */
+  enum class Wait_at {
+    /* Clone doesn't need to wait. */
+    NONE,
+    /* Clone needs to wait before entering. */
+    ENTER,
+    /* Clone needs to wait before state change. */
+    STATE_CHANGE,
+    /* Clone needs to abort. */
+    ABORT
+  };
+
+ private:
+  /** Tablespace ID for which notification is sent. */
+  space_id_t m_space_id;
+
+  /** Notification type. */
+  Type m_type;
+
+  /** Wait type set. */
+  Wait_at m_wait;
+
+  /** Blocked clone state if clone is blocked. */
+  uint32_t m_blocked_state;
+
+  /** Saved error. */
+  int m_error;
+};
+
 #endif /* CLONE_API_INCLUDE */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/clone0clone.h mysql-8.0-8.0.27/storage/innobase/include/clone0clone.h
--- mysql-8.0-8.0.26/storage/innobase/include/clone0clone.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/clone0clone.h	2021-09-28 11:46:34.000000000 +0000
@@ -39,10 +39,13 @@
 #include "univ.i"
 #include "ut0mutex.h"
 
+#include "clone0api.h"
 #include "clone0desc.h"
 #include "clone0repl.h"
 #include "clone0snapshot.h"
 
+#include <tuple>
+
 /** Directory under data directory for all clone status files. */
 #define CLONE_FILES_DIR OS_FILE_PREFIX "clone" OS_PATH_SEPARATOR_STR
 
@@ -83,12 +86,19 @@
 const char CLONE_INNODB_OLD_FILES[] =
     CLONE_FILES_DIR OS_FILE_PREFIX "old_files";
 
+/** Clone file name for list of temp files renamed by ddl. */
+const char CLONE_INNODB_DDL_FILES[] =
+    CLONE_FILES_DIR OS_FILE_PREFIX "ddl_files";
+
 /** Clone file extension for files to be replaced. */
 const char CLONE_INNODB_REPLACED_FILE_EXTN[] = "." OS_FILE_PREFIX "clone";
 
 /** Clone file extension for saved old files. */
 const char CLONE_INNODB_SAVED_FILE_EXTN[] = "." OS_FILE_PREFIX "clone_save";
 
+/** Clone file extension for temporary renamed file. */
+const char CLONE_INNODB_DDL_FILE_EXTN[] = "." OS_FILE_PREFIX "clone_ddl";
+
 using Clone_Msec = std::chrono::milliseconds;
 using Clone_Sec = std::chrono::seconds;
 using Clone_Min = std::chrono::minutes;
@@ -149,6 +159,10 @@
   /** Serial descriptor allocated length */
   uint m_alloc_len;
 
+  /** If task is currently pinning file. Before opening
+  the file we must have a pin on file metadata. */
+  bool m_pinned_file;
+
   /** Current file descriptor */
   pfs_os_file_t m_current_file_des;
 
@@ -215,10 +229,7 @@
       m_saved_error = err;
 
       if (file_name != nullptr) {
-        ut_ad(m_err_file_name != nullptr);
-        ut_ad(m_err_file_len != 0);
-
-        strncpy(m_err_file_name, file_name, m_err_file_len);
+        m_err_file_name.assign(file_name);
       }
     }
 
@@ -240,6 +251,13 @@
   @return true if needs to wait for re-start */
   bool drop_task(THD *thd, uint task_id, bool &is_master);
 
+  /** Check if chunk is already reserved.
+  @param[in]	chunk_num	chunk number
+  @return true, iff chunk is reserved. */
+  bool is_chunk_reserved(uint32_t chunk_num) {
+    return m_chunk_info.m_reserved_chunks[chunk_num];
+  }
+
   /** Reset chunk information for task
   @param[in]	task	current task */
   void reset_chunk(Clone_Task *task) {
@@ -318,7 +336,7 @@
   /** Reset error information */
   void reset_error() {
     m_saved_error = 0;
-    strncpy(m_err_file_name, "Clone File", m_err_file_len);
+    m_err_file_name.assign("Clone File");
   }
 
   /** Get current clone state
@@ -422,17 +440,29 @@
   int alloc_buffer(Clone_Task *task);
 
 #ifdef UNIV_DEBUG
+  /** Check if needs to wait for debug sync point
+  @param[in]	chunk_num	chunk number to process
+  @param[in]	task		current task
+  @return true, if clone needs to check and wait */
+  bool debug_sync_check(uint32_t chunk_num, Clone_Task *task);
+
   /** Wait during clone operation
   @param[in]	chunk_num	chunk number to process
   @param[in]	task		current task */
   void debug_wait(uint chunk_num, Clone_Task *task);
 
+  /** Wait before sending DDL metadata. */
+  void debug_wait_ddl_meta();
+
   /** Force restart clone operation by raising network error
   @param[in]	task		current task
   @param[in]	in_err		any err that has occurred
   @param[in]	restart_count	restart counter
   @return error code */
   int debug_restart(Clone_Task *task, int in_err, int restart_count);
+
+  /** @return clone master task. */
+  Clone_Task *find_master_task();
 #endif /* UNIV_DEBUG */
 
  private:
@@ -535,10 +565,7 @@
   int m_saved_error;
 
   /** File name related to the saved error */
-  char *m_err_file_name;
-
-  /** File name length */
-  size_t m_err_file_len;
+  std::string m_err_file_name;
 
   /** Attached snapshot handle */
   Clone_Snapshot *m_clone_snapshot;
@@ -646,6 +673,9 @@
   @return version */
   uint get_version() { return (m_clone_desc_version); }
 
+  /** @return active snapshot */
+  Clone_Snapshot *get_snapshot() { return m_clone_task_manager.get_snapshot(); }
+
   /** Check if it is copy clone
   @return true if copy clone handle */
   bool is_copy_clone() const { return (m_clone_handle_type == CLONE_HDL_COPY); }
@@ -661,6 +691,9 @@
   @param[in]	state	clone handle state */
   void set_state(Clone_Handle_State state) { m_clone_handle_state = state; }
 
+  /** Set clone to ABORT sate end any attached snapshot. */
+  void set_abort();
+
   /** Check if clone state is active
   @return true if in active state */
   bool is_active() { return (m_clone_handle_state == CLONE_STATE_ACTIVE); }
@@ -711,10 +744,22 @@
   @return error code */
   int send_keep_alive(Clone_Task *task, Ha_clone_cbk *callback);
 
+  /** @return true iff DDL should abort running clone. */
+  bool abort_by_ddl() const { return m_abort_ddl; }
+
+  /** Allow concurrent DDL to abort clone. */
+  void set_ddl_abort() { m_abort_ddl = true; }
+
+#ifdef UNIV_DEBUG
+  /** Close master task file if open and unpin. */
+  void close_master_file();
+#endif /* UNIV_DEBUG */
+
  private:
   /** Check if enough space is there to clone.
+  @param[in]	task	current task
   @return error if not enough space */
-  int check_space();
+  int check_space(const Clone_Task *task);
 
   /** Create clone data directory.
   @return error code */
@@ -729,21 +774,52 @@
                         uint32_t &percent_done,
                         ib_time_monotonic_ms_t &disp_time);
 
+  /** Create a tablespace file and initialize.
+  @param[in]	file_ctx	file information
+  @param[in]	file_type	file type (data, log etc.)
+  @param[in]	init		true, if needs to write initial pages.
+  @return error code */
+  int file_create_init(const Clone_file_ctx *file_ctx, ulint file_type,
+                       bool init);
+
+  using File_init_cbk = std::function<dberr_t(pfs_os_file_t)>;
+
   /** Open file for the task
   @param[in]	task		clone task
-  @param[in]	file_meta	file information
+  @param[in]	file_ctx	file information
   @param[in]	file_type	file type (data, log etc.)
   @param[in]	create_file	create if not present
-  @param[in]	set_and_close	set size and close
+  @param[in]	init_cbk	callback to fill initial data
   @return error code */
-  int open_file(Clone_Task *task, Clone_File_Meta *file_meta, ulint file_type,
-                bool create_file, bool set_and_close);
+  int open_file(Clone_Task *task, const Clone_file_ctx *file_ctx,
+                ulint file_type, bool create_file, File_init_cbk &init_cbk);
 
   /** Close file for the task
   @param[in]	task	clone task
   @return error code */
   int close_file(Clone_Task *task);
 
+  /** Check and pin a file context if not already pinned.
+  @param[in,out]	task		clone task
+  @param[in,out]	file_ctx	snapshot file context
+  @param[out]		handle_deleted	true, iff caller needs to handle
+                                        deleted file state
+  @return error code */
+  int check_and_pin_file(Clone_Task *task, Clone_file_ctx *file_ctx,
+                         bool &handle_deleted);
+
+  /** Unpin and close currently pinned file.
+  @param[in,out]	task	clone task
+  @return error code */
+  int close_and_unpin_file(Clone_Task *task);
+
+  /** Check if the task pins a file context.
+  @param[in]	task		clone task
+  @param[in]	file_ctx	snapshot file context
+  @return true, if task pins the file, other file. */
+  std::tuple<bool, bool> pins_file(const Clone_Task *task,
+                                   const Clone_file_ctx *file_ctx);
+
   /** Callback providing the file reference and data length to copy
   @param[in]	cbk	callback interface
   @param[in]	task	clone task
@@ -783,6 +859,12 @@
   @return error code */
   int send_task_metadata(Clone_Task *task, Ha_clone_cbk *callback);
 
+  /** Send all DDL metadata generated.
+  @param[in]	task		task that is sending the information
+  @param[in]	callback	callback interface
+  @return error code */
+  int send_all_ddl_metadata(Clone_Task *task, Ha_clone_cbk *callback);
+
   /** Send all file information via callback
   @param[in]	task		task that is sending the information
   @param[in]	callback	callback interface
@@ -792,22 +874,24 @@
   /** Send current file information via callback
   @param[in]	task		task that is sending the information
   @param[in]	file_meta	file meta information
+  @param[in]	is_redo		true if redo file
   @param[in]	callback	callback interface
   @return error code */
-  int send_file_metadata(Clone_Task *task, Clone_File_Meta *file_meta,
-                         Ha_clone_cbk *callback);
+  int send_file_metadata(Clone_Task *task, const Clone_File_Meta *file_meta,
+                         bool is_redo, Ha_clone_cbk *callback);
 
   /** Send cloned data via callback
   @param[in]	task		task that is sending the information
-  @param[in]	file_meta	file information
+  @param[in]	file_ctx	file information
   @param[in]	offset		file offset
   @param[in]	buffer		data buffer or NULL if send from file
   @param[in]	size		data buffer size
+  @param[in]	new_file_size	updated file size from page 0
   @param[in]	callback	callback interface
   @return error code */
-  int send_data(Clone_Task *task, Clone_File_Meta *file_meta,
-                ib_uint64_t offset, byte *buffer, uint size,
-                Ha_clone_cbk *callback);
+  int send_data(Clone_Task *task, const Clone_file_ctx *file_ctx,
+                uint64_t offset, byte *buffer, uint32_t size,
+                uint64_t new_file_size, Ha_clone_cbk *callback);
 
   /** Process a data chunk and send data blocks via callback
   @param[in]	task		task that is sending the information
@@ -853,6 +937,31 @@
   @return error code */
   int apply_file_metadata(Clone_Task *task, Ha_clone_cbk *callback);
 
+  /** Apply DDL delete to existing file to update chunk and block information.
+  @param[in,out]	task		task performing the operation
+  @param[in,out]	file_ctx	current file context
+  @param[in]		new_meta	new file metadata
+  @return error code */
+  int apply_file_delete(Clone_Task *task, Clone_file_ctx *file_ctx,
+                        const Clone_File_Meta *new_meta);
+
+  /** Apply DDL changes to file at the end of FILE_COPY stage.
+  @param[in]		new_meta	new file metadata
+  @param[in,out]	file_ctx	current file context
+  @return error code. */
+  int apply_ddl(const Clone_File_Meta *new_meta, Clone_file_ctx *file_ctx);
+
+  /** Set compression type based on local capability.
+  @param[in,out]	file_ctx	file context
+  @return error code. */
+  int set_compression(Clone_file_ctx *file_ctx);
+
+  /** Fix the file name and meta information for all files that are renamed
+  with DDL extension.
+  @param[in]	task	current task
+  @return error code. */
+  int fix_all_renamed(const Clone_Task *task);
+
   /** Apply data received via callback
   @param[in]	task		current task
   @param[in]	callback	callback interface
@@ -927,6 +1036,9 @@
   /** Allow restart of clone operation after network failure */
   bool m_allow_restart;
 
+  /** If concurrent DDL should abort clone. */
+  bool m_abort_ddl;
+
   /** Clone data directory */
   const char *m_clone_dir;
 
@@ -937,6 +1049,37 @@
 /** Clone System */
 class Clone_Sys {
  public:
+  /** RAII style wrapper to enter and exit wait stage. */
+  class Wait_stage : private ut::Non_copyable {
+   public:
+    /** Constructor to change the THD information string.
+    @param[in]	new_info	new information string */
+    explicit Wait_stage(const char *new_info);
+
+    /** Destructor to revert back the old information string. */
+    ~Wait_stage();
+
+   private:
+    /** Saved old THD information string. */
+    const char *m_saved_info;
+  };
+
+  class Acquire_clone : private ut::Non_copyable {
+   public:
+    /** Constructor to get and pin clone handle. */
+    explicit Acquire_clone();
+
+    /** Destructor to release and free clone handle if necessary. */
+    ~Acquire_clone();
+
+    /** Get current clone snapshot. */
+    Clone_Snapshot *get_snapshot();
+
+   private:
+    /** Acquired clone handle */
+    Clone_Handle *m_clone{};
+  };
+
   /** Construct clone system */
   Clone_Sys();
 
@@ -994,18 +1137,43 @@
   /** Mark clone state to active if no other abort request */
   void mark_active();
 
-  /** Mark to indicate that new clone operations should wait.
-  @return true, if no active clone and mark is set successfully */
-  bool mark_wait();
+  /** Mark to indicate that new clone operations should wait. */
+  void mark_wait();
 
   /** Free the wait marker. */
   void mark_free();
 
+#ifdef UNIV_DEBUG
+  /** Debug wait while starting clone and waiting for free marker. */
+  void debug_wait_clone_begin();
+
+  /** Close donor master task file if open and unpin. */
+  void close_donor_master_file();
+#endif /* UNIV_DEBUG */
+
   /** Wait for marker to get freed.
   @param[in,out]	thd	user session
   @return, error if timeout */
   int wait_for_free(THD *thd);
 
+  /** Begin restricted state during some critical ddl phase.
+  @param[in]	type		ddl notification type
+  @param[in]	space		tablespace ID for which notification is sent
+  @param[in]	no_wait		return with error if needs to wait
+  @param[in]	check_intr	check for interrupt during wait
+  @param[out]	blocked_state	blocked state when state change is blocked
+  @param[out]	error		mysql error code
+  @return true iff clone needs to wait for state change. */
+  bool begin_ddl_state(Clone_notify::Type type, space_id_t space, bool no_wait,
+                       bool check_intr, uint32_t &blocked_state, int &error);
+
+  /** End restricted state during some critical ddl phase.
+  @param[in]	type		ddl notification type
+  @param[in]	space		tablespace ID for which notification is sent
+  @param[in]	blocked_state	blocked state when state change is blocked */
+  void end_ddl_state(Clone_notify::Type type, space_id_t space,
+                     uint32_t blocked_state);
+
   /** Get next unique ID
   @return unique ID */
   ib_uint64_t get_next_id();
@@ -1113,6 +1281,10 @@
   @return true, if concurrent clone in progress */
   bool check_active_clone(bool print_alert);
 
+  /** Check if any active clone is running.
+  @return (true, handle) if concurrent clone in progress */
+  std::tuple<bool, Clone_Handle *> check_active_clone();
+
   /** @return GTID persistor */
   Clone_persist_gtid &get_gtid_persistor() { return (m_gtid_persister); }
 
@@ -1129,6 +1301,14 @@
   @return error code */
   int find_free_index(Clone_Handle_Type hdl_type, uint &free_index);
 
+  /** Handle restricted state during critical ddl phase.
+  @param[in]	type	ddl notification type
+  @param[in]	space	tablespace ID for which notification is sent
+  @param[in]	begin	true, if beginning state
+                        false, if ending
+  @return true iff clone needs to wait for state change. */
+  bool handle_ddl_state(Clone_notify::Type type, space_id_t space, bool begin);
+
  private:
   /** Array of clone handles */
   Clone_Handle *m_clone_arr[CLONE_ARR_SIZE];
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/clone0desc.h mysql-8.0-8.0.27/storage/innobase/include/clone0desc.h
--- mysql-8.0-8.0.26/storage/innobase/include/clone0desc.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/clone0desc.h	2021-09-28 11:46:34.000000000 +0000
@@ -41,8 +41,8 @@
 
 /** Maximum base length for any serialized descriptor. This is only used for
 optimal allocation and has no impact on version compatibility. */
-const uint32_t CLONE_DESC_MAX_BASE_LEN = 64;
-
+const uint32_t CLONE_DESC_MAX_BASE_LEN =
+    64 + Encryption::KEY_LEN + Encryption::KEY_LEN;
 /** Align by 4K for O_DIRECT */
 const uint32_t CLONE_ALIGN_DIRECT_IO = 4 * 1024;
 
@@ -89,7 +89,7 @@
 
 Clone Type: HA_CLONE_PAGE: Not implemented
 */
-enum Snapshot_State {
+enum Snapshot_State : uint32_t {
   /** Invalid state */
   CLONE_SNAPSHOT_NONE = 0,
 
@@ -109,6 +109,9 @@
   CLONE_SNAPSHOT_DONE
 };
 
+/** Total number of data transfer stages in clone. */
+const size_t CLONE_MAX_TRANSFER_STAGES = 3;
+
 /** Choose lowest descriptor version between reference locator
 and currently supported version.
 @param[in]	ref_loc	reference locator
@@ -480,6 +483,29 @@
 
 /** Clone file information */
 struct Clone_File_Meta {
+  /** Set file as deleted chunk.
+  @param[in]	chunk	chunk number that is found deleted. */
+  inline void set_deleted_chunk(uint32 chunk) {
+    m_begin_chunk = chunk;
+    m_end_chunk = 0;
+    m_deleted = true;
+  }
+
+  /** @return true, iff file is deleted. */
+  bool is_deleted() const { return m_deleted; }
+
+  /** @return true, iff file is deleted. */
+  bool is_renamed() const { return m_renamed; }
+
+  /** Reset DDL state of file metadata. */
+  void reset_ddl() {
+    m_renamed = false;
+    m_deleted = false;
+  }
+
+  /* Initialize parameters. */
+  void init();
+
   /** File size in bytes */
   uint64_t m_file_size;
 
@@ -499,6 +525,15 @@
   and is not transferred. */
   bool m_punch_hole;
 
+  /* Set file metadata as deleted. */
+  bool m_deleted;
+
+  /* Set file metadata as renamed. */
+  bool m_renamed;
+
+  /* Contains encryption key to be transferred. */
+  bool m_transfer_encryption_key;
+
   /** File system block size. */
   size_t m_fsblk_size;
 
@@ -517,8 +552,17 @@
   /** File name length in bytes */
   size_t m_file_name_len;
 
+  /** Allocation length of name buffer. */
+  size_t m_file_name_alloc_len;
+
   /** File name */
   const char *m_file_name;
+
+  /** Encryption Key. */
+  byte m_encryption_key[Encryption::KEY_LEN]{};
+
+  /** Encryption Vector. */
+  byte m_encryption_iv[Encryption::KEY_LEN]{};
 };
 
 /** CLONE_DESC_FILE_METADATA: Descriptor for file metadata */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/clone0snapshot.h mysql-8.0-8.0.27/storage/innobase/include/clone0snapshot.h
--- mysql-8.0-8.0.26/storage/innobase/include/clone0snapshot.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/clone0snapshot.h	2021-09-28 11:46:34.000000000 +0000
@@ -36,6 +36,7 @@
 
 #include "arch0log.h"
 #include "arch0page.h"
+#include "clone0api.h"
 #include "clone0desc.h"
 #include "clone0monitor.h"
 #include "fil0fil.h"
@@ -44,8 +45,156 @@
 #include <map>
 #include <vector>
 
+struct Clone_file_ctx {
+  /** File state:
+  [CREATED] -------------> [DROPPING] --> [DROPPED] --> [DROPPED_HANDLED]
+      |                        ^
+      |                        |
+       ----> [RENAMING] -> [RENAMED]
+                 |             |
+                  <------------
+  */
+  enum class State {
+    /* Invalid state. */
+    NONE,
+    /* File is being dropped. */
+    DROPPING,
+    /* File is being renamed. */
+    RENAMING,
+    /* Newly created file or pre-existing before clone. */
+    CREATED,
+    /* File is renamed during clone. */
+    RENAMED,
+    /* File is deleted during clone. */
+    DROPPED,
+    /* File is deleted and chunk information is handled. */
+    DROPPED_HANDLED
+  };
+
+  /** File extension to use with name. */
+  enum class Extension {
+    /* No extension. */
+    NONE,
+    /* Replace extension - clone file to be replaced during recovery. */
+    REPLACE,
+    /* DDL extension - temporary extension used during rename. */
+    DDL
+  };
+
+  /** Initialize file state.
+  @param[in]	extn	file name extension */
+  void init(Extension extn) {
+    m_state.store(State::CREATED);
+    m_extension = extn;
+
+    m_pin.store(0);
+    m_modified_ddl = false;
+    m_waiting = 0;
+
+    m_next_state = CLONE_SNAPSHOT_NONE;
+
+    m_meta.init();
+  }
+
+  /** Get file name with extension.
+  @param[out]	name	file name. */
+  void get_file_name(std::string &name) const;
+
+  /** Mark file added by DDL.
+  @param[in]	next_state	next snapshot state */
+  void set_ddl(Snapshot_State next_state) {
+    m_modified_ddl = true;
+    m_next_state = next_state;
+  }
+
+  /** @return true iff added or modified by ddl in previous state.
+  @param[in]	state	current snapshot state */
+  bool by_ddl(Snapshot_State state) const {
+    return m_modified_ddl && (state <= m_next_state);
+  }
+
+  /** Start waiting for DDL */
+  void begin_wait() { ++m_waiting; }
+
+  /** Finish waiting for DDL */
+  void end_wait() {
+    ut_a(m_waiting > 0);
+    --m_waiting;
+  }
+
+  /** @return true, iff there are waiting clone tasks. */
+  bool is_waiting() const { return (m_waiting > 0); }
+
+  /** Pin the file. */
+  void pin() { ++m_pin; }
+
+  /** Unpin the file. */
+  void unpin() {
+    ut_a(m_pin > 0);
+    --m_pin;
+  }
+
+  /** @return true, iff clone tasks are using the file. */
+  bool is_pinned() const { return (m_pin.load() > 0); }
+
+  /** @return true, iff DDL is modifying file. */
+  bool modifying() const {
+    State state = m_state.load();
+    return (state == State::RENAMING || state == State::DROPPING);
+  }
+
+  /** @return true, iff DDL is deleting file. */
+  bool deleting() const {
+    State state = m_state.load();
+    return (state == State::DROPPING);
+  }
+
+  /** @return true, iff file is already deleted. */
+  bool deleted() const {
+    State state = m_state.load();
+    return (state == State::DROPPED || state == State::DROPPED_HANDLED);
+  }
+
+  /** @return true, iff file is already renamed. */
+  bool renamed() const {
+    State state = m_state.load();
+    return (state == State::RENAMED);
+  }
+
+  /** @return file metadata. */
+  Clone_File_Meta *get_file_meta() { return &m_meta; }
+
+  /** @return file metadata for read. */
+  const Clone_File_Meta *get_file_meta_read() const { return &m_meta; }
+
+  /** File metadata state. Modified by DDL commands. Protected by snapshot
+  mutex. Atomic operation helps clone to skip mutex when no ddl. */
+  std::atomic<State> m_state;
+
+  /** File name extension. */
+  Extension m_extension;
+
+ private:
+  /** Pin count incremented and decremented by clone tasks to synchronize with
+  concurrent DDL. Protected by snapshot mutex. */
+  std::atomic<uint32_t> m_pin;
+
+  /** Waiting count incremented and decremented by clone tasks while waiting
+  DDL file operation in progress. Protected by snapshot mutex. */
+  uint32_t m_waiting;
+
+  /** true, if file created or modified after clone is started. */
+  bool m_modified_ddl{false};
+
+  /** Next state when ddl last modified file. */
+  Snapshot_State m_next_state{CLONE_SNAPSHOT_DONE};
+
+  /** File metadata. */
+  Clone_File_Meta m_meta;
+};
+
 /** Vector type for storing clone files */
-using Clone_File_Vec = std::vector<Clone_File_Meta *>;
+using Clone_File_Vec = std::vector<Clone_file_ctx *>;
 
 /** Map type for mapping space ID to clone file index */
 using Clone_File_Map = std::map<space_id_t, uint>;
@@ -115,6 +264,34 @@
 /** Dynamic database snapshot: Holds metadata and handle to data */
 class Clone_Snapshot {
  public:
+  /** RAII style guard for begin & end  of snapshot state transition. */
+  class State_transit {
+   public:
+    /** Constructor to begin state transition.
+    @param[in,out]	snapshot	Clone Snapshot
+    @param[in]		new_state	State to transit */
+    explicit State_transit(Clone_Snapshot *snapshot, Snapshot_State new_state);
+
+    /** Destructor to end state transition. */
+    ~State_transit();
+
+    /** @return error code */
+    int get_error() const { return m_error; }
+
+    /** Disable copy construction */
+    State_transit(State_transit const &) = delete;
+
+    /** Disable assignment */
+    State_transit &operator=(State_transit const &) = delete;
+
+   private:
+    /** Clone Snapshot */
+    Clone_Snapshot *m_snapshot;
+
+    /** Saved error while beginning transition. */
+    int m_error;
+  };
+
   /** Construct snapshot
   @param[in]	hdl_type	copy, apply
   @param[in]	clone_type	clone type
@@ -126,6 +303,36 @@
   /** Release contexts and free heap */
   ~Clone_Snapshot();
 
+  /** DDL notification before the operation.
+  @param[in]	type		type of DDL notification
+  @param[in]	space		space ID for the ddl operation
+  @param[in]	no_wait		return with error if needs to wait
+  @param[in]	check_intr	check for interrupt during wait
+  @param[out]	error		mysql error code
+  @return true iff clone state change is blocked. */
+  bool begin_ddl_state(Clone_notify::Type type, space_id_t space, bool no_wait,
+                       bool check_intr, int &error);
+
+  /** DDL notification after the operation.
+  @param[in]	type	type of DDL notification
+  @param[in]	space	space ID for the ddl operation */
+  void end_ddl_state(Clone_notify::Type type, space_id_t space);
+
+  /** Wait for concurrent DDL file operation and pin file.
+  @param[in,out]	file_ctx	file context
+  @param[out]		handle_delete	if caller needs to handle deleted state
+  @return mysql error code. */
+  int pin_file(Clone_file_ctx *file_ctx, bool &handle_delete);
+
+  /** Unpin a file.
+  @param[in,out]	file_ctx	file context */
+  void unpin_file(Clone_file_ctx *file_ctx) { file_ctx->unpin(); }
+
+  /** Check if DDL needs to block clone operation.
+  @param[in]	file_ctx	file context
+  @return true iff clone operation needs to be blocked. */
+  bool blocks_clone(const Clone_file_ctx *file_ctx);
+
   /** @return estimated bytes on disk */
   uint64_t get_disk_estimate() const { return (m_data_bytes_disk); }
 
@@ -183,13 +390,23 @@
     return (ret_len);
   }
 
-  using File_Cbk_Func = std::function<int(Clone_File_Meta *)>;
+  using File_Cbk_Func = std::function<int(Clone_file_ctx *)>;
 
   /** Iterate through all files in current state
   @param[in]	func	callback function
   @return error code */
   int iterate_files(File_Cbk_Func &&func);
 
+  /** Iterate through all data files
+  @param[in]	func	callback function
+  @return error code */
+  int iterate_data_files(File_Cbk_Func &&func);
+
+  /** Iterate through all redo files
+  @param[in]	func	callback function
+  @return error code */
+  int iterate_redo_files(File_Cbk_Func &&func);
+
   /** Fill state descriptor from snapshot
   @param[in]	do_estimate	estimate data bytes to transfer
   @param[out]	state_desc	snapshot state descriptor */
@@ -209,9 +426,15 @@
   @return true if successfully attached */
   bool attach(Clone_Handle_Type hdl_type, bool pfs_monitor);
 
-  /** Detach from snapshot
-  @return number of clones attached */
-  uint detach();
+  /** Detach from snapshot. */
+  void detach();
+
+  /** Set current snapshot aborted state. Used in error cases before exiting
+  clone to make sure any DDL notifier exits waiting. */
+  void set_abort();
+
+  /** @return true, iff clone has aborted. */
+  bool is_aborted() const;
 
   /** Start transition to new state
   @param[in]	state_desc	descriptor for next state
@@ -219,43 +442,48 @@
   @param[in]	temp_buffer	buffer used for collecting page IDs
   @param[in]	temp_buffer_len	buffer length
   @param[in]	cbk		alter callback for long wait
-  @param[out]	pending_clones	clones yet to transit to next state
   @return error code */
   int change_state(Clone_Desc_State *state_desc, Snapshot_State new_state,
                    byte *temp_buffer, uint temp_buffer_len,
-                   Clone_Alert_Func cbk, uint &pending_clones);
-
-  /** Check if transition is complete
-  @param[in]	new_state	new state after transition
-  @param[in]	exit_on_wait	exit from transition if needs to wait
-  @return number of clones yet to transit to next state */
-  uint check_state(Snapshot_State new_state, bool exit_on_wait);
-
-  /* Don't allow to attach new clone - Not supported
-  void stop_attach_new_clone()
-  {
-          m_allow_new_clone = false;
-  }
-  */
+                   Clone_Alert_Func cbk);
 
   /** Add file metadata entry at destination
-  @param[in,out]	file_desc	if there, set to current descriptor
+  @param[in]	file_meta	file metadata from donor
   @param[in]	data_dir	destination data directory
   @param[in]	desc_create	create if doesn't exist
   @param[out]	desc_exists	descriptor already exists
+  @param[out]	file_ctx	if there, set to current file context
+  @return error code */
+  int get_file_from_desc(const Clone_File_Meta *file_meta, const char *data_dir,
+                         bool desc_create, bool &desc_exists,
+                         Clone_file_ctx *&file_ctx);
+
+  /** Rename an existing file descriptor.
+  @param[in]	file_meta	renamed file metadata from donor
+  @param[in]	data_dir	destination data directory
+  @param[out]	file_ctx	if there, set to current file context
+  @return error code */
+  int rename_desc(const Clone_File_Meta *file_meta, const char *data_dir,
+                  Clone_file_ctx *&file_ctx);
+
+  /** Fix files renamed with ddl extension. The file name is checked against
+  existing file and added to appropriate status file.
+  @param[in]		data_dir	destination data directory
+  @param[in,out]	file_ctx	Set to correct extension
   @return error code */
-  int get_file_from_desc(Clone_File_Meta *&file_desc, const char *data_dir,
-                         bool desc_create, bool &desc_exists);
+  int fix_ddl_extension(const char *data_dir, Clone_file_ctx *file_ctx);
 
   /** Add file descriptor to file list
-  @param[in,out]	file_desc	current file descriptor
+  @param[in,out]	file_ctx	current file context
+  @param[in]		ddl_create	added by DDL concurrently
   @return true, if it is the last file. */
-  bool add_file_from_desc(Clone_File_Meta *&file_desc);
+  bool add_file_from_desc(Clone_file_ctx *&file_ctx, bool ddl_create);
 
   /** Extract file information from node and add to snapshot
   @param[in]	node	file node
+  @param[in]	by_ddl	node is added concurrently by DDL
   @return error code */
-  dberr_t add_node(fil_node_t *node);
+  dberr_t add_node(fil_node_t *node, bool by_ddl);
 
   /** Add page ID to to the set of pages in snapshot
   @param[in]	space_id	page tablespace
@@ -276,22 +504,44 @@
   @return file metadata entry */
   Clone_File_Meta *get_file_by_index(uint index);
 
+  /** Get clone file context by index for current state
+  @param[in]	index	file index
+  @return file context */
+  Clone_file_ctx *get_file_ctx_by_index(uint index);
+
+  /** Get clone file context by chunk and block number.
+  @param[in]	chunk_num	chunk number
+  @param[in]	block_num	block number
+  @param[in]	hint_index	hint file index number to start search.
+  @return file context */
+  Clone_file_ctx *get_file_ctx(uint32_t chunk_num, uint32_t block_num,
+                               uint32_t hint_index);
+
   /** Get next block of data to transfer
   @param[in]	chunk_num	current chunk
   @param[in,out]	block_num	current/next block
-  @param[in,out]	file_meta	current/next block file metadata
+  @param[in,out]	file_ctx	current/next block file context
   @param[out]	data_offset	block offset in file
   @param[out]	data_buf	data buffer or NULL if transfer from file
   @param[out]	data_size	size of data in bytes
+  @param[out]	file_size	updated file size if extended
   @return error code */
   int get_next_block(uint chunk_num, uint &block_num,
-                     Clone_File_Meta *file_meta, ib_uint64_t &data_offset,
-                     byte *&data_buf, uint &data_size);
+                     const Clone_file_ctx *&file_ctx, uint64_t &data_offset,
+                     byte *&data_buf, uint32_t &data_size, uint64_t &file_size);
 
   /** Update snapshot block size based on caller's buffer size
   @param[in]	buff_size	buffer size for clone transfer */
   void update_block_size(uint buff_size);
 
+  /** @return chunk size in bytes. */
+  inline uint32_t get_chunk_size() const {
+    return chunk_size() * UNIV_PAGE_SIZE;
+  }
+
+  /** @return number of blocks per chunk for different states. */
+  uint32_t get_blocks_per_chunk() const;
+
   /** Check if copy snapshot
   @return true if snapshot is for copy */
   bool is_copy() const { return (m_snapshot_handle_type == CLONE_HDL_COPY); }
@@ -314,13 +564,133 @@
   bool encrypt_key_in_log_header(byte *log_header, uint32_t header_len);
 
   /** Decrypt tablespace key in header page with master key.
-  @param[in]		space		tablespace
+  @param[in]		file_meta	clone file metadata
   @param[in]		page_size	page size descriptor
   @param[in,out]	page_data	page data to update */
-  void decrypt_key_in_header(fil_space_t *space, const page_size_t &page_size,
-                             byte *&page_data);
+  void decrypt_key_in_header(const Clone_File_Meta *file_meta,
+                             const page_size_t &page_size, byte *&page_data);
+
+  /** @return maximum blocks to transfer with file pinned. */
+  uint32_t get_max_blocks_pin() const;
+
+  /** Skip all blocks belonging to currently deleted file context.
+  @param[in]		chunk_num	current chunk
+  @param[in,out]	block_num	current, next block */
+  void skip_deleted_blocks(uint32_t chunk_num, uint32_t &block_num);
 
  private:
+  /** Allow DDL file operation after 64 pages. */
+  const static uint32_t S_MAX_PAGES_PIN = 64;
+
+  /** Allow DDL file operation after every block (1M data by default) */
+  const static uint32_t S_MAX_BLOCKS_PIN = 1;
+
+  /** File name allocation size base. */
+  const static size_t S_FILE_NAME_BASE_LEN = 256;
+
+  /** Various wait types related to snapshot state. */
+  enum class Wait_type {
+    /* DDL- limited wait if clone is waiting for another DDL. */
+    STATE_TRANSIT_WAIT,
+    /* DDL- Wait till snapshot state transition is over. */
+    STATE_TRANSIT,
+    /* DDL- Wait till PAGE COPY state is over. */
+    STATE_END_PAGE_COPY,
+    /* Clone - Wait till there are no blockers for state transition. */
+    STATE_BLOCKER,
+    /*DDL - Wait till the waiting clone threads are active. This are
+    clone threads from last DDL and useful to prevent starvation. */
+    DATA_FILE_WAIT,
+    /* DDL - Wait till all threads have closed active data files. */
+    DATA_FILE_CLOSE,
+    /* Clone - Wait till DDL file operation is complete. */
+    DDL_FILE_OPERATION
+  };
+
+#ifdef UNIV_DEBUG
+  /** Debug sync Wait during state transition. */
+  void debug_wait_state_transit();
+#endif /* UNIV_DEBUG */
+
+  /** Update deleted state of a file if not yet done.
+  @param[in,out]	file_ctx	file context
+  @return true, if updated state */
+  bool update_deleted_state(Clone_file_ctx *file_ctx);
+
+  /** Get clone data file context by chunk number.
+  @param[in]	chunk_num	chunk number
+  @param[in]	hint_index	hint file index number to start search.
+  @return file context */
+  Clone_file_ctx *get_data_file_ctx(uint32_t chunk_num, uint32_t hint_index);
+
+  /** Get clone page file context by chunk number and block number.
+  @param[in]	chunk_num	chunk number
+  @param[in]	block_num	block number
+  @return file context */
+  Clone_file_ctx *get_page_file_ctx(uint32_t chunk_num, uint32_t block_num);
+
+  /** Get clone redo file context by chunk number.
+  @param[in]	chunk_num	chunk number
+  @param[in]	hint_index	hint file index number to start search.
+  @return file context */
+  Clone_file_ctx *get_redo_file_ctx(uint32_t chunk_num, uint32_t hint_index);
+
+  /** Get wait information string based on wait type.
+  @param[in]	wait_type	wait type
+  @return wait information string. */
+  const char *wait_string(Wait_type wait_type) const;
+
+  /** Wait for various operations based on type.
+  @param[in]	type		wait type
+  @param[in]	ctx		file context when relevant
+  @param[in]	no_wait		return with error if needs to wait
+  @param[in]	check_intr	check for interrupt during wait
+  @return mysql error code. */
+  int wait(Wait_type type, const Clone_file_ctx *ctx, bool no_wait,
+           bool check_intr);
+
+  /** During wait get relevant message string for logging.
+  @param[in]	wait_type	wait type
+  @param[out]	info		notification to log while waiting
+  @param[out]	error		error message to log on timeout */
+  void get_wait_mesg(Wait_type wait_type, std::string &info,
+                     std::string &error);
+
+  /** Block clone state transition. Clone must wait.
+  @param[in]	type		type of DDL notification
+  @param[in]	space		space ID for the ddl operation
+  @param[in]	no_wait		return with error if needs to wait
+  @param[in]	check_intr	check for interrupt during wait`
+  @param[out]	error		mysql error code
+  @return true iff clone state change is blocked. */
+  bool block_state_change(Clone_notify::Type type, space_id_t space,
+                          bool no_wait, bool check_intr, int &error);
+
+  /** Unblock clone state transition. */
+  void unblock_state_change();
+
+  /** Get next file state while being modified by ddl.
+  @param[in]	type	ddl notification type
+  @param[in]	begin	true, if DDL begin notification
+                        false, if DDL end notification
+  @return target file state. */
+  Clone_file_ctx::State get_target_file_state(Clone_notify::Type type,
+                                              bool begin);
+
+  /** Handle files for DDL begin notification.
+  @param[in]	type		type of DDL notification
+  @param[in]	space		space ID for the ddl operation
+  @param[in]	no_wait		return with error if needs to wait
+  @param[in]	check_intr	check for interrupt during wait
+  @return mysql error code */
+  int begin_ddl_file(Clone_notify::Type type, space_id_t space, bool no_wait,
+                     bool check_intr);
+
+  /** Handle files for DDL end notification.
+  @param[in]	type	type of DDL notification
+  @param[in]	space	space ID for the ddl operation */
+  void end_ddl_file(Clone_notify::Type type, space_id_t space);
+
   /** Synchronize snapshot with binary log and GTID.
   @param[in]	cbk	alert callback for long wait
   @return error code. */
@@ -343,25 +713,53 @@
   @return error code. */
   int wait_trx_end(THD *thd, trx_id_t trx_id);
 
+  /** Begin state transition before waiting for DDL. */
+  void begin_transit_ddl_wait() {
+    mutex_own(&m_snapshot_mutex);
+    /* Update number of clones to transit to new state. Set this prior to
+    waiting for DDLs blocking state transfer. This would help a new DDL to
+    find if clone is blocked by other DDL before state transition. */
+    m_num_clones_transit = m_num_clones;
+  }
+
+  /** Begin state transition.
+  @param[in]	new_state	state to transit to */
+  void begin_transit(Snapshot_State new_state) {
+    mutex_own(&m_snapshot_mutex);
+    m_snapshot_next_state = new_state;
+    /* Move to next state. This is ok as the snapshot
+    mutex is not released till transition is ended, This
+    could change later when we ideally should release
+    the snapshot mutex during transition. */
+    m_snapshot_state = m_snapshot_next_state;
+  }
+
+  /** End state transition.
+  @param[in]	error	error code */
+  void end_transit(int error) {
+    mutex_own(&m_snapshot_mutex);
+    m_num_clones_transit = 0;
+    m_snapshot_next_state = CLONE_SNAPSHOT_NONE;
+  }
+
   /** Check if state transition is in progress
   @return true during state transition */
-  bool in_transit_state() {
+  bool in_transit_state() const {
     mutex_own(&m_snapshot_mutex);
     return (m_snapshot_next_state != CLONE_SNAPSHOT_NONE);
   }
 
-  /** Initialize current state
-  @param[in]	state_desc	descriptor for the state
-  @param[in]	temp_buffer	buffer used during page copy initialize
-  @param[in]	temp_buffer_len	buffer length
-  @param[in]	cbk		alert callback for long wait
-  @return error code */
-  int init_state(Clone_Desc_State *state_desc, byte *temp_buffer,
-                 uint temp_buffer_len, Clone_Alert_Func cbk);
+  /** @return true, if waiting before starting transition. Generally the
+  case when some DDL blocks state transition. */
+  bool in_transit_wait() const {
+    mutex_own(&m_snapshot_mutex);
+    return (!in_transit_state() && m_num_clones_transit != 0);
+  }
 
   /** Initialize snapshot state for file copy
+  @param[in]	new_state	state to move for apply
   @return error code */
-  int init_file_copy();
+  int init_file_copy(Snapshot_State new_state);
 
   /** Initialize disk byte estimate. */
   void init_disk_estimate() {
@@ -370,15 +768,18 @@
   }
 
   /** Initialize snapshot state for page copy
+  @param[in]	new_state	state to move for apply
   @param[in]	page_buffer	temporary buffer to copy page IDs
   @param[in]	page_buffer_len	buffer length
   @return error code */
-  int init_page_copy(byte *page_buffer, uint page_buffer_len);
+  int init_page_copy(Snapshot_State new_state, byte *page_buffer,
+                     uint page_buffer_len);
 
   /** Initialize snapshot state for redo copy
-  @param[in]	cbk	alert callback for long wait
+  @param[in]	new_state	state to move for apply
+  @param[in]	cbk		alert callback for long wait
   @return error code */
-  int init_redo_copy(Clone_Alert_Func cbk);
+  int init_redo_copy(Snapshot_State new_state, Clone_Alert_Func cbk);
 
   /** Initialize state while applying cloned data
   @param[in]	state_desc	snapshot state descriptor
@@ -392,39 +793,43 @@
 
   /** Create file descriptor and add to current file list
   @param[in]	data_dir	destination data directory
-  @param[in,out]	file_desc	file descriptor
+  @param[in]	file_meta	file metadata from donor
+  @param[in]	is_ddl		if ddl temporary file
+  @param[out]	file_ctx	file context
   @return error code */
-  int create_desc(const char *data_dir, Clone_File_Meta *&file_desc);
+  int create_desc(const char *data_dir, const Clone_File_Meta *file_meta,
+                  bool is_ddl, Clone_file_ctx *&file_ctx);
 
-  /** Get file metadata for current chunk
+  /** Get file context for current chunk
   @param[in]	file_vector	clone file vector
-  @param[in]	num_files	total number of files
   @param[in]	chunk_num	current chunk number
   @param[in]	start_index	index for starting the search
-  @return file metadata */
-  Clone_File_Meta *get_file(Clone_File_Vec &file_vector, uint num_files,
-                            uint chunk_num, uint start_index);
+  @return file context */
+  Clone_file_ctx *get_file(Clone_File_Vec &file_vector, uint32_t chunk_num,
+                           uint32_t start_index);
 
   /** Get next page from buffer pool
   @param[in]	chunk_num	current chunk
   @param[in,out]	block_num	current, next block
-  @param[in]	file_meta	file metadata for page
+  @param[in,out]	file_ctx	current, next block file context
   @param[out]	data_offset	offset in file
   @param[out]	data_buf	page data
   @param[out]	data_size	page data size
+  @param[out]	file_size	updated file size if extended
   @return error code */
-  int get_next_page(uint chunk_num, uint &block_num, Clone_File_Meta *file_meta,
-                    ib_uint64_t &data_offset, byte *&data_buf, uint &data_size);
+  int get_next_page(uint chunk_num, uint &block_num,
+                    const Clone_file_ctx *&file_ctx, uint64_t &data_offset,
+                    byte *&data_buf, uint32_t &data_size, uint64_t &file_size);
 
   /** Get page from buffer pool and make ready for write
   @param[in]	page_id		page ID chunk
   @param[in]	page_size	page size descriptor
-  @param[in]	file_meta	file metadata for page
+  @param[in]	file_ctx	clone file context
   @param[out]	page_data	data page
   @param[out]	data_size	page size in bytes
   @return error code */
   int get_page_for_write(const page_id_t &page_id, const page_size_t &page_size,
-                         Clone_File_Meta *file_meta, byte *&page_data,
+                         const Clone_file_ctx *file_ctx, byte *&page_data,
                          uint &data_size);
 
   /* Make page ready for flush by updating LSN anc checksum
@@ -439,11 +844,15 @@
   @param[in]	file_size	file size in bytes
   @param[in]	file_offset	start offset
   @param[in]	num_chunks	total number of chunks in the file
-  @param[in]	copy_file_name	copy the file name or use reference
-  @return file metadata entry */
-  Clone_File_Meta *build_file(const char *file_name, uint64_t file_size,
-                              uint64_t file_offset, uint &num_chunks,
-                              bool copy_file_name);
+  @return file context */
+  Clone_file_ctx *build_file(const char *file_name, uint64_t file_size,
+                             uint64_t file_offset, uint &num_chunks);
+
+  /** Allocate and set clone file name.
+  @param[in,out]	file_meta	file metadata
+  @param[in]		file_name	file name
+  @return true iff successful. */
+  bool build_file_name(Clone_File_Meta *file_meta, const char *file_name);
 
   /** Add buffer pool dump file to the file list
   @return error code */
@@ -454,67 +863,84 @@
   @param[in]	size_bytes	file size in bytes
   @param[in]	alloc_bytes	allocation size on disk for sparse file
   @param[in]	node		file node
-  @param[in]	copy_name	copy the file name or use reference
+  @param[in]	by_ddl		node is added concurrently by DDL
   @return error code. */
   int add_file(const char *name, uint64_t size_bytes, uint64_t alloc_bytes,
-               fil_node_t *node, bool copy_name);
+               fil_node_t *node, bool by_ddl);
+
+  /** Check if file context has been changed by ddl.
+  @param[in]	node		tablespace file node
+  @param[out]	file_ctx	file context if exists
+  @return true iff file is created or modified by DDL. */
+  bool file_ctx_changed(const fil_node_t *node, Clone_file_ctx *&file_ctx);
 
   /** Get chunk size
   @return chunk size in pages */
-  uint chunk_size() {
-    uint size;
-
-    size = static_cast<uint>(ut_2_exp(m_chunk_size_pow2));
-    return (size);
+  inline uint32_t chunk_size() const {
+    auto size = static_cast<uint32_t>(ut_2_exp(m_chunk_size_pow2));
+    return size;
   }
 
-  /** Get block size
+  /** Get block size for file copy
   @return block size in pages */
-  uint block_size() {
-    uint size;
-
+  uint32_t block_size() {
     ut_a(m_block_size_pow2 <= SNAPSHOT_MAX_BLOCK_SIZE_POW2);
-    size = static_cast<uint>(ut_2_exp(m_block_size_pow2));
+    auto size = static_cast<uint32_t>(ut_2_exp(m_block_size_pow2));
 
-    return (size);
+    return size;
   }
 
-  /** Get number of blocks per chunk
+  /** Get number of blocks per chunk for file copy
   @return blocks per chunk */
-  uint blocks_per_chunk() {
+  inline uint32_t blocks_per_chunk() const {
     ut_a(m_block_size_pow2 <= m_chunk_size_pow2);
     return (1 << (m_chunk_size_pow2 - m_block_size_pow2));
   }
 
-  /** Update file name in descriptor from configuration.
-  @param[in]		data_dir	clone data directory
-  @param[in,out]	file_desc	file descriptor
-  @param[in,out]	path		buffer for updated path
-  @param[in]		path_len	path buffer length
+  /** Update system file name from configuration.
+  @param[in]		replace		if replacing current data directory
+  @param[in]		file_meta	file descriptor
+  @param[in,out]	file_name	file name to update
   @return error code */
-  int update_file_name(const char *data_dir, Clone_File_Meta *file_desc,
-                       char *path, size_t path_len);
+  int update_sys_file_name(bool replace, const Clone_File_Meta *file_meta,
+                           std::string &file_name);
 
   /** Build file name along with path for cloned data files.
   @param[in]		data_dir	clone data directory
-  @param[in]		alloc_size	new file size to be allocated
-  @param[in,out]	file_desc	file descriptor
+  @param[in]		file_meta	file descriptor
+  @param[out]		built_path	file name with path
+  @return error code */
+  int build_file_path(const char *data_dir, const Clone_File_Meta *file_meta,
+                      std::string &built_path);
+
+  /** Build file context from file path.
+  @param[in]	extn		file extension type
+  @param[in]	file_meta	file descriptor
+  @param[in]	file_path	data file along with path
+  @param[out]	file_ctx	created file context
   @return error code */
-  int build_file_path(const char *data_dir, ulint alloc_size,
-                      Clone_File_Meta *&file_desc);
+  int build_file_ctx(Clone_file_ctx::Extension extn,
+                     const Clone_File_Meta *file_meta,
+                     const std::string &file_path, Clone_file_ctx *&file_ctx);
+
+  /** Check for existing file and if clone extension is needed. This function
+  has the side effect to add undo file indexes.
+  @param[in]	replace		if data directory is replaced
+  @param[in]	undo_file	if undo tablespace file
+  @param[in]	data_file_index	index of file
+  @param[in]	data_file	data file name
+  @param[out]	extn	        file extension needs to be used
+  @return error code */
+  int handle_existing_file(bool replace, bool undo_file,
+                           uint32_t data_file_index,
+                           const std::string &data_file,
+                           Clone_file_ctx::Extension &extn);
+
+  /** @return number of data files to transfer. */
+  inline size_t num_data_files() const { return m_data_file_vector.size(); }
 
-  /** Check for existing file and add clone extension.
-  @param[in]		replace		if data directory is replaced
-  @param[in,out]	file_desc	file descriptor
-  @return error code */
-  int handle_existing_file(bool replace, Clone_File_Meta *file_desc);
-
-  /** Compute total length of cloned data file name and path.
-  @param[in]	data_dir	clone data directory
-  @param[in]	file_desc	file descriptor
-  @return total size in bytes */
-  size_t compute_path_length(const char *data_dir,
-                             const Clone_File_Meta *file_desc);
+  /** @return number of redo files to transfer. */
+  inline size_t num_redo_files() const { return m_redo_file_vector.size(); }
 
  private:
   /** @name Snapshot type and ID */
@@ -534,19 +960,19 @@
   /** @name Snapshot State  */
 
   /** Mutex to handle access by concurrent clones */
-  ib_mutex_t m_snapshot_mutex;
+  mutable ib_mutex_t m_snapshot_mutex;
+
+  /** Number of blockers for state change. Usually DDLs for short duration. */
+  uint32_t m_num_blockers;
 
-  /** Allow new clones to get attached to this snapshot */
-  bool m_allow_new_clone;
+  /** Set to TRUE only if clone is aborted after error. */
+  bool m_aborted;
 
   /** Number of clones attached to this snapshot */
   uint m_num_clones;
 
-  /** Number of clones in current state */
-  uint m_num_clones_current;
-
-  /** Number of clones moved over to next state */
-  uint m_num_clones_next;
+  /** Number of clones in in state transition */
+  uint m_num_clones_transit;
 
   /** Current state */
   Snapshot_State m_snapshot_state;
@@ -579,9 +1005,6 @@
   /** Map space ID to file vector index */
   Clone_File_Map m_data_file_map;
 
-  /** Number of data files to transfer */
-  uint m_num_data_files;
-
   /** Total number of data chunks */
   uint m_num_data_chunks;
 
@@ -637,9 +1060,6 @@
   /** Archived redo file size */
   ib_uint64_t m_redo_file_size;
 
-  /** Number of archived redo files to transfer */
-  uint m_num_redo_files;
-
   /** Total number of redo data chunks */
   uint m_num_redo_chunks;
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/data0data.h mysql-8.0-8.0.27/storage/innobase/include/data0data.h
--- mysql-8.0-8.0.26/storage/innobase/include/data0data.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/data0data.h	2021-09-28 11:46:34.000000000 +0000
@@ -52,14 +52,13 @@
 #ifdef UNIV_DEBUG
 /** Gets pointer to the type struct of SQL data field.
  @return pointer to the type struct */
-static inline dtype_t *dfield_get_type(
-    const dfield_t *field) /*!< in: SQL data field */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline dtype_t *dfield_get_type(
+    const dfield_t *field); /*!< in: SQL data field */
 /** Gets pointer to the data in a field.
  @return pointer to data */
-static inline void *dfield_get_data(const dfield_t *field) /*!< in: field */
-    MY_ATTRIBUTE((warn_unused_result));
-#else /* UNIV_DEBUG */
+[[nodiscard]] static inline void *dfield_get_data(
+    const dfield_t *field); /*!< in: field */
+#else                       /* UNIV_DEBUG */
 #define dfield_get_type(field) (&(field)->type)
 #define dfield_get_data(field) ((field)->data)
 #endif /* UNIV_DEBUG */
@@ -71,8 +70,8 @@
 
 /** Gets length of field data.
  @return length of data; UNIV_SQL_NULL if SQL null data */
-static inline uint32_t dfield_get_len(const dfield_t *field) /*!< in: field */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline uint32_t dfield_get_len(
+    const dfield_t *field); /*!< in: field */
 
 /** Sets length in a field.
 @param[in]	field	field
@@ -81,12 +80,12 @@
 
 /** Determines if a field is SQL NULL
  @return nonzero if SQL null data */
-static inline ulint dfield_is_null(const dfield_t *field) /*!< in: field */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ulint dfield_is_null(
+    const dfield_t *field); /*!< in: field */
 /** Determines if a field is externally stored
  @return nonzero if externally stored */
-static inline ulint dfield_is_ext(const dfield_t *field) /*!< in: field */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ulint dfield_is_ext(
+    const dfield_t *field); /*!< in: field */
 /** Sets the "external storage" flag */
 static inline void dfield_set_ext(dfield_t *field); /*!< in/out: field */
 
@@ -155,20 +154,19 @@
                                 or 0 to compare the whole field length.
                                 This works only if !multi_val
 @return true if both fields are NULL or if they are equal */
-inline bool dfield_datas_are_binary_equal(const dfield_t *field1,
-                                          const dfield_t *field2, ulint len)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] inline bool dfield_datas_are_binary_equal(const dfield_t *field1,
+                                                        const dfield_t *field2,
+                                                        ulint len);
 /** Tests if dfield data length and content is equal to the given.
  @return true if equal */
-static inline bool dfield_data_is_binary_equal(
+[[nodiscard]] static inline bool dfield_data_is_binary_equal(
     const dfield_t *field, /*!< in: field */
     ulint len,             /*!< in: data length or UNIV_SQL_NULL */
-    const byte *data)      /*!< in: data */
-    MY_ATTRIBUTE((warn_unused_result));
+    const byte *data);     /*!< in: data */
 /** Gets number of fields in a data tuple.
  @return number of fields */
-static inline ulint dtuple_get_n_fields(const dtuple_t *tuple) /*!< in: tuple */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ulint dtuple_get_n_fields(
+    const dtuple_t *tuple); /*!< in: tuple */
 
 /** Gets number of virtual fields in a data tuple.
 @param[in]	tuple	dtuple to check
@@ -195,9 +193,8 @@
 #endif /* UNIV_DEBUG */
 /** Gets info bits in a data tuple.
  @return info bits */
-static inline ulint dtuple_get_info_bits(
-    const dtuple_t *tuple) /*!< in: tuple */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ulint dtuple_get_info_bits(
+    const dtuple_t *tuple); /*!< in: tuple */
 
 /** Sets info bits in a data tuple.
 @param[in]	tuple		tuple
@@ -206,9 +203,8 @@
 
 /** Gets number of fields used in record comparisons.
  @return number of fields used in comparisons in rem0cmp.* */
-static inline ulint dtuple_get_n_fields_cmp(
-    const dtuple_t *tuple) /*!< in: tuple */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ulint dtuple_get_n_fields_cmp(
+    const dtuple_t *tuple); /*!< in: tuple */
 
 /** Gets number of fields used in record comparisons.
 @param[in]	tuple		tuple
@@ -230,9 +226,10 @@
  @param[in]	n_fields	number of field
  @param[in]	n_v_fields	number of fields on virtual columns
  @return created tuple (inside buf) */
-static inline dtuple_t *dtuple_create_from_mem(void *buf, ulint buf_size,
-                                               ulint n_fields, ulint n_v_fields)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline dtuple_t *dtuple_create_from_mem(void *buf,
+                                                             ulint buf_size,
+                                                             ulint n_fields,
+                                                             ulint n_v_fields);
 /** Creates a data tuple to a memory heap. The default value for number
  of fields used in record comparisons for this tuple is n_fields.
  @return own: created tuple */
@@ -290,8 +287,8 @@
 @param[in] tuple1 first data tuple
 @param[in] tuple2 second data tuple
 @return whether tuple1==tuple2 */
-bool dtuple_coll_eq(const dtuple_t *tuple1, const dtuple_t *tuple2)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool dtuple_coll_eq(const dtuple_t *tuple1,
+                                  const dtuple_t *tuple2);
 
 /** Compute a hash value of a prefix of an index record.
 @param[in]	tuple		index record
@@ -299,9 +296,9 @@
 @param[in]	n_bytes		number of bytes to fold in the last field
 @param[in]	fold		fold value of the index identifier
 @return the folded value */
-static inline ulint dtuple_fold(const dtuple_t *tuple, ulint n_fields,
-                                ulint n_bytes, ulint fold)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ulint dtuple_fold(const dtuple_t *tuple,
+                                              ulint n_fields, ulint n_bytes,
+                                              ulint fold);
 
 /** Sets types of fields binary in a tuple.
 @param[in]	tuple	data tuple
@@ -310,24 +307,21 @@
 
 /** Checks if a dtuple contains an SQL null value.
  @return true if some field is SQL null */
-static inline bool dtuple_contains_null(
-    const dtuple_t *tuple) /*!< in: dtuple */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline bool dtuple_contains_null(
+    const dtuple_t *tuple); /*!< in: dtuple */
 /** Checks that a data field is typed. Asserts an error if not.
  @return true if ok */
-bool dfield_check_typed(const dfield_t *field) /*!< in: data field */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool dfield_check_typed(
+    const dfield_t *field); /*!< in: data field */
 /** Checks that a data tuple is typed. Asserts an error if not.
  @return true if ok */
-bool dtuple_check_typed(const dtuple_t *tuple) /*!< in: tuple */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool dtuple_check_typed(const dtuple_t *tuple); /*!< in: tuple */
 #ifdef UNIV_DEBUG
 /** Validates the consistency of a tuple which must be complete, i.e,
  all fields must have been set.
  @return true if ok */
-bool dtuple_validate(const dtuple_t *tuple) /*!< in: tuple */
-    MY_ATTRIBUTE((warn_unused_result));
-#endif /* UNIV_DEBUG */
+[[nodiscard]] bool dtuple_validate(const dtuple_t *tuple); /*!< in: tuple */
+#endif                                                     /* UNIV_DEBUG */
 /** Pretty prints a dfield value according to its data type. Also the hex string
  is printed if a string contains non-printable characters. */
 void dfield_print_also_hex(const dfield_t *dfield); /*!< in: dfield */
@@ -366,9 +360,9 @@
 @return own: created big record vector, NULL if we are not able to
 shorten the entry enough, i.e., if there are too many fixed-length or
 short fields in entry or the index is clustered */
-big_rec_t *dtuple_convert_big_rec(dict_index_t *index, upd_t *upd,
-                                  dtuple_t *entry)
-    MY_ATTRIBUTE((malloc, warn_unused_result));
+[[nodiscard]] big_rec_t *dtuple_convert_big_rec(dict_index_t *index, upd_t *upd,
+                                                dtuple_t *entry)
+    MY_ATTRIBUTE((malloc));
 
 /** Puts back to entry the data stored in vector. Note that to ensure the
 fields in entry can accommodate the data, vector must have been created
@@ -681,37 +675,37 @@
 struct dtuple_t {
   /** info bits of an index record: the default is 0; this field is used if an
   index record is built from a data tuple */
-  ulint info_bits;
+  uint16_t info_bits;
 
   /** Number of fields in dtuple */
-  ulint n_fields;
+  uint16_t n_fields;
 
   /** number of fields which should be used in comparison services of rem0cmp.*;
   the index search is performed by comparing only these fields, others are
   ignored; the default value in dtuple creation is the same value as n_fields */
-  ulint n_fields_cmp;
+  uint16_t n_fields_cmp;
 
   /** Fields. */
   dfield_t *fields;
 
   /** Number of virtual fields. */
-  ulint n_v_fields;
+  uint16_t n_v_fields;
 
   /** Fields on virtual column */
   dfield_t *v_fields;
 
   /** Data tuples can be linked into a list using this field */
   UT_LIST_NODE_T(dtuple_t) tuple_list;
-#ifdef UNIV_DEBUG
-  /** memory heap where this tuple is allocated. */
-  mem_heap_t *m_heap;
 
-  /** Magic number, used in debug assertions */
-  ulint magic_n;
+#ifdef UNIV_DEBUG
+  /** Memory heap where this tuple is allocated. */
+  mem_heap_t *m_heap{};
 
-/** Value of dtuple_t::magic_n */
-#define DATA_TUPLE_MAGIC_N 65478679
+  /** Value of dtuple_t::magic_n */
+  static constexpr size_t MAGIC_N = 614679;
 
+  /** Magic number, used in debug assertions */
+  size_t magic_n{MAGIC_N};
 #endif /* UNIV_DEBUG */
 
   /** Print the tuple to the output stream.
@@ -719,7 +713,7 @@
   @return stream */
   std::ostream &print(std::ostream &out) const {
     dtuple_print(out, this);
-    return (out);
+    return out;
   }
 
   /** Read the trx id from the tuple (DB_TRX_ID)
@@ -760,25 +754,25 @@
 
   /** Get number of externally stored fields.
   @retval number of externally stored fields. */
-  inline ulint get_n_ext() const {
-    ulint n_ext = 0;
-    for (size_t i = 0; i < n_fields; ++i) {
+  inline size_t get_n_ext() const {
+    size_t n_ext = 0;
+    for (uint32_t i = 0; i < n_fields; ++i) {
       if (dfield_is_ext(&fields[i])) {
-        n_ext++;
+        ++n_ext;
       }
     }
-    return (n_ext);
+    return n_ext;
   }
 
   /** Does tuple has externally stored fields.
   @retval true if there is externally stored fields. */
   inline bool has_ext() const {
-    for (size_t i = 0; i < n_fields; ++i) {
+    for (uint32_t i = 0; i < n_fields; ++i) {
       if (dfield_is_ext(&fields[i])) {
-        return (true);
+        return true;
       }
     }
-    return (false);
+    return false;
   }
 };
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/data0data.ic mysql-8.0-8.0.27/storage/innobase/include/data0data.ic
--- mysql-8.0-8.0.26/storage/innobase/include/data0data.ic	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/data0data.ic	2021-09-28 11:46:34.000000000 +0000
@@ -423,7 +423,7 @@
   }
 
 #ifdef UNIV_DEBUG
-  tuple->magic_n = DATA_TUPLE_MAGIC_N;
+  tuple->magic_n = dtuple_t::MAGIC_N;
 
   { /* In the debug version, initialize fields to an error value */
     ulint i;
@@ -568,7 +568,7 @@
 
   ut_ad(tuple);
   ut_ad(dtuple_check_typed(tuple));
-  ut_ad(tuple->magic_n == DATA_TUPLE_MAGIC_N);
+  ut_ad(tuple->magic_n == dtuple_t::MAGIC_N);
 
   n_fields = tuple->n_fields;
 
@@ -610,7 +610,7 @@
   ulint len;
 
   ut_ad(tuple);
-  ut_ad(tuple->magic_n == DATA_TUPLE_MAGIC_N);
+  ut_ad(tuple->magic_n == dtuple_t::MAGIC_N);
   ut_ad(dtuple_check_typed(tuple));
 
   for (i = 0; i < n_fields; i++) {
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/data0type.ic mysql-8.0-8.0.27/storage/innobase/include/data0type.ic
--- mysql-8.0-8.0.26/storage/innobase/include/data0type.ic	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/data0type.ic	2021-09-28 11:46:34.000000000 +0000
@@ -432,8 +432,8 @@
           ut_ad(0);
           return (0);
       }
+      [[fallthrough]];
 #endif /* UNIV_DEBUG */
-    // Fall through.
     case DATA_CHAR:
     case DATA_FIXBINARY:
     case DATA_INT:
@@ -465,7 +465,8 @@
 #else  /* !UNIV_LIBRARY */
       return (len);
 #endif /* !UNIV_LIBRARY */
-       /* fall through for variable-length charsets */
+      /* fall through for variable-length charsets */
+      [[fallthrough]];
     case DATA_VARCHAR:
     case DATA_BINARY:
     case DATA_DECIMAL:
@@ -506,7 +507,7 @@
           return (0);
       }
 #endif /* UNIV_DEBUG */
-    // Fall through.
+      [[fallthrough]];
     case DATA_CHAR:
     case DATA_FIXBINARY:
     case DATA_INT:
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/db0err.h mysql-8.0-8.0.27/storage/innobase/include/db0err.h
--- mysql-8.0-8.0.26/storage/innobase/include/db0err.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/db0err.h	2021-09-28 11:46:34.000000000 +0000
@@ -197,6 +197,8 @@
   DB_OUT_OF_RESOURCES,
   /** Page was discarded, was not written to storage. */
   DB_PAGE_IS_STALE,
+  /** Error reading the auto-increment value. */
+  DB_AUTOINC_READ_ERROR,
   /** Failed to read as read was beyond file size. */
   DB_FILE_READ_BEYOND_SIZE,
 
@@ -219,8 +221,6 @@
 
   /** Column update or read failed because the types mismatch */
   DB_DATA_MISMATCH = 2000,
-  /** Request the caller to cache records. */
-  DB_CACHE_RECORDS,
   /* Too many nested sub expression in full-text search string */
   DB_FTS_TOO_MANY_NESTED_EXP
 };
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/ddl0ddl.h mysql-8.0-8.0.27/storage/innobase/include/ddl0ddl.h
--- mysql-8.0-8.0.26/storage/innobase/include/ddl0ddl.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/ddl0ddl.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,617 @@
+/*****************************************************************************
+
+Copyright (c) 2005, 2021, Oracle and/or its affiliates. All Rights Reserved.
+
+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, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
+/** @file include/ddl0ddl.h
+ DDL context */
+
+#ifndef ddl0ddl_h
+#define ddl0ddl_h
+
+#include "fts0fts.h"
+#include "lock0types.h"
+#include "os0file.h"
+
+// Forward declaration
+class Flush_observer;
+class Alter_stage;
+
+namespace ddl {
+// Forward declaration
+struct Dup;
+struct Row;
+struct FTS;
+class Loader;
+struct Cursor;
+struct Context;
+struct Builder;
+struct Sequence;
+struct Merge_file_sort;
+struct Load_cursor;
+struct Btree_cursor;
+struct Parallel_cursor;
+
+/** Innodb B-tree index fill factor for bulk load. */
+extern long fill_factor;
+
+/** Variable specifying the number of FTS parser threads to use. */
+extern ulong fts_parser_threads;
+
+/** Minimum IO buffer size. */
+constexpr size_t IO_BLOCK_SIZE = 4 * 1024;
+
+/** @brief Secondary buffer for I/O operations of merge records.
+
+This buffer is used for writing or reading a record that spans two
+Aligned_buffer.  Thus, it must be able to hold one merge record,
+whose maximum size is the same as the minimum size of Aligned_buffer. */
+using mrec_buf_t = byte[UNIV_PAGE_SIZE_MAX];
+
+/** @brief Merge record in Aligned_buffer.
+
+The format is the same as a record in ROW_FORMAT=COMPACT with the
+exception that the REC_N_NEW_EXTRA_BYTES are omitted. */
+using mrec_t = byte;
+
+/** Index field definition */
+struct Index_field {
+  /** Column offset */
+  size_t m_col_no{};
+
+  /** Column prefix length, or 0 if indexing the whole column */
+  size_t m_prefix_len{};
+
+  /** Whether this is a virtual column */
+  bool m_is_v_col{};
+
+  /** Whether it has multi-value */
+  bool m_is_multi_value{};
+
+  /** true=ASC, false=DESC */
+  bool m_is_ascending{};
+};
+
+/** Definition of an index being created */
+struct Index_defn {
+  /** Index name */
+  const char *m_name{};
+
+  /** Whether the table is rebuilt */
+  bool m_rebuild{};
+
+  /** 0, DICT_UNIQUE, or DICT_CLUSTERED */
+  size_t m_ind_type{};
+
+  /** MySQL key number, or ULINT_UNDEFINED if none */
+  size_t m_key_number{ULINT_UNDEFINED};
+
+  /** Number of fields in index */
+  size_t m_n_fields{};
+
+  /** Field definitions */
+  Index_field *m_fields{};
+
+  /** Fulltext parser plugin */
+  st_mysql_ftparser *m_parser{};
+
+  /** true if it's ngram parser */
+  bool m_is_ngram{};
+
+  /** true if we want to check SRID while inserting to index */
+  bool m_srid_is_valid{};
+
+  /** SRID obtained from dd column */
+  uint32_t m_srid{};
+};
+
+/** Structure for reporting duplicate records. */
+struct Dup {
+  /** Report a duplicate key.
+  @param[in] entry              For reporting duplicate key. */
+  void report(const dfield_t *entry) noexcept;
+
+  /** Report a duplicate key.
+  @param[in] entry              For reporting duplicate key.
+  @param[in] offsets            Row offsets */
+  void report(const mrec_t *entry, const ulint *offsets) noexcept;
+
+  /** @return true if no duplicates reported yet. */
+  [[nodiscard]] bool empty() const noexcept { return m_n_dup == 0; }
+
+  /** Index being sorted */
+  dict_index_t *m_index{};
+
+  /** MySQL table object */
+  TABLE *m_table{};
+
+  /** Mapping of column numbers in table to the rebuilt table
+  (index->table), or NULL if not rebuilding table */
+  const ulint *m_col_map{};
+
+  /** Number of duplicates */
+  size_t m_n_dup{};
+};
+
+/** Sets an exclusive lock on a table, for the duration of creating indexes.
+@param[in,out] trx              Transaction
+@param[in] table                Table to lock.
+@param[in] mode                 Lock mode LOCK_X or LOCK_S
+@return error code or DB_SUCCESS */
+[[nodiscard]] dberr_t lock_table(trx_t *trx, dict_table_t *table,
+                                 lock_mode mode) noexcept;
+
+/** Drop those indexes which were created before an error occurred.
+The data dictionary must have been locked exclusively by the caller,
+because the transaction will not be committed.
+@param[in,out] trx              Transaction
+@param[in] table                Table to lock.
+@param[in] locked               true=table locked, false=may need to do a lazy
+                                drop */
+void drop_indexes(trx_t *trx, dict_table_t *table, bool locked) noexcept;
+
+/**Create temporary merge files in the given paramater path, and if
+UNIV_PFS_IO defined, register the file descriptor with Performance Schema.
+@param[in] path                 Location for creating temporary merge files.
+@return File descriptor */
+[[nodiscard]] os_fd_t file_create_low(const char *path) noexcept;
+
+/** Destroy a merge file. And de-register the file from Performance Schema
+if UNIV_PFS_IO is defined.
+@param[in] fd                   Merge file descriptor. */
+void file_destroy_low(os_fd_t fd) noexcept;
+
+/** Create the index and load in to the dictionary.
+@param[in,out] trx              Trx (sets error_state)
+@param[in,out] table            The index is on this table
+@param[in] index_def            The index definition
+@param[in] add_v                New virtual columns added along with add
+                                index call
+@return index, or nullptr on error */
+[[nodiscard]] dict_index_t *create_index(
+    trx_t *trx, dict_table_t *table, const Index_defn *index_def,
+    const dict_add_v_col_t *add_v) noexcept;
+
+/** Drop a table. The caller must have ensured that the background stats
+thread is not processing the table. This can be done by calling
+dict_stats_wait_bg_to_stop_using_table() after locking the dictionary and
+before calling this function.
+@param[in,out] trx              Transaction
+@param[in,out] table            Table to drop.
+@return DB_SUCCESS or error code */
+dberr_t drop_table(trx_t *trx, dict_table_t *table) noexcept;
+
+/** Generate the next autoinc based on a snapshot of the session
+auto_increment_increment and auto_increment_offset variables.
+Assingnment operator would be used during the inplace_alter_table()
+phase only **/
+struct Sequence {
+  /** Constructor.
+  @param[in,out]  thd           The session
+  @param[in] start_value        The lower bound
+  @param[in] max_value          The upper bound (inclusive) */
+  Sequence(THD *thd, ulonglong start_value, ulonglong max_value) noexcept;
+
+  /** Destructor. */
+  ~Sequence() = default;
+
+  /** Postfix increment
+  @return the value to insert */
+  ulonglong operator++(int) noexcept;
+
+  /** Check if the autoinc "sequence" is exhausted.
+  @return true if the sequence is exhausted */
+  bool eof() const noexcept { return m_eof; }
+
+  /** Assignment operator to copy the sequence values
+  @param[in] rhs                Sequence to copy from */
+  ddl::Sequence &operator=(const ddl::Sequence &rhs) noexcept {
+    ut_ad(rhs.m_next_value > 0);
+    ut_ad(rhs.m_max_value == m_max_value);
+    m_next_value = rhs.m_next_value;
+    m_increment = rhs.m_increment;
+    m_offset = rhs.m_offset;
+    m_eof = rhs.m_eof;
+    return *this;
+  }
+
+  /** @return the next value in the sequence */
+  ulonglong last() const noexcept {
+    ut_ad(m_next_value > 0);
+    return m_next_value;
+  }
+
+  /** Maximum calumn value if adding an AUTOINC column else 0. Once
+  we reach the end of the sequence it will be set to ~0. */
+  const ulonglong m_max_value{};
+
+  /** Value of auto_increment_increment */
+  ulong m_increment{};
+
+  /** Value of auto_increment_offset */
+  ulong m_offset{};
+
+  /** Next value in the sequence */
+  ulonglong m_next_value{};
+
+  /** true if no more values left in the sequence */
+  bool m_eof{};
+};
+
+/** DDL context/configuration. */
+struct Context {
+  /** Full text search context information and state. */
+  struct FTS {
+    /** Document ID sequence */
+    struct Sequence {
+      /** Destructor. */
+      virtual ~Sequence() noexcept;
+
+      /** Get the next document ID.
+      @param[in] dtuple         Row from which to fetch ID.
+      @return the next document ID. */
+      virtual doc_id_t fetch(const dtuple_t *dtuple = nullptr) noexcept = 0;
+
+      /** Get the current document ID.
+      @return the current document ID. */
+      virtual doc_id_t current() noexcept = 0;
+
+      /** @return the number of document IDs generated. */
+      virtual doc_id_t generated_count() const noexcept = 0;
+
+      /** @return the maximum document ID seen so far. */
+      virtual doc_id_t max_doc_id() const noexcept = 0;
+
+      /** @return true if the document ID is generated, instead of fetched
+                  from a column from the row. */
+      virtual bool is_generated() const noexcept = 0;
+
+      /** Advance the document ID. */
+      virtual void increment() noexcept = 0;
+
+      /** Current document ID. */
+      doc_id_t m_doc_id{};
+    };
+
+    /** Constructor.
+    @param[in] n_parser_threads Number of FTS parser threads. */
+    explicit FTS(size_t n_parser_threads) noexcept
+        : m_n_parser_threads(n_parser_threads) {}
+
+    /** Destructor. */
+    ~FTS() noexcept { ut::delete_(m_doc_id); }
+
+    /** FTS index. */
+    dict_index_t *m_index{};
+
+    /** Maximum number of FTS parser and sort threads to use. */
+    const size_t m_n_parser_threads{};
+
+    /** Document ID sequence generator. */
+    Sequence *m_doc_id{};
+
+    /** FTS instance. */
+    ddl::FTS *m_ptr{};
+  };
+
+  /** Scan sort and IO buffer size. */
+  using Scan_buffer_size = std::pair<size_t, size_t>;
+
+  /** Build indexes on a table by reading a clustered index, creating a
+  temporary file containing index entries, merge sorting these index entries and
+  inserting sorted index entries to indexes.
+  @param[in] trx                Transaction.
+  @param[in] old_table          Table where rows are read from
+  @param[in] new_table          Table where indexes are created; identical to
+                                old_table unless creating a PRIMARY KEY
+  @param[in] online             True if creating indexes online
+  @param[in] indexes            Indexes to be created
+  @param[in] key_numbers        MySQL key numbers
+  @param[in] n_indexes          Size of indexes[]
+  @param[in,out] table          MySQL table, for reporting erroneous key
+                                value if applicable
+  @param[in] add_cols           Default values of added columns, or NULL
+  @param[in] col_map            Mapping of old column numbers to new
+                                ones, or nullptr if old_table == new_table
+  @param[in] add_autoinc        Number of added AUTO_INCREMENT columns, or
+                                ULINT_UNDEFINED if none is added
+  @param[in,out] sequence       Autoinc sequence
+  @param[in] skip_pk_sort       Whether the new PRIMARY KEY will follow
+                                existing order
+  @param[in,out] stage          Performance schema accounting object,
+                                used by ALTER TABLE.
+                                stage->begin_phase_read_pk() will be called
+                                at the beginning of this function and it will
+                                be passed to other functions for further
+                                accounting.
+  @param[in] add_v              New virtual columns added along with indexes
+  @param[in] eval_table         MySQL table used to evaluate virtual column
+                                value, see innobase_get_computed_value().
+  @param[in] max_buffer_size    Memory use upper limit.
+  @param[in] max_threads        true if DDL should use multiple threads. */
+  Context(trx_t *trx, dict_table_t *old_table, dict_table_t *new_table,
+          bool online, dict_index_t **indexes, const ulint *key_numbers,
+          size_t n_indexes, TABLE *table, const dtuple_t *add_cols,
+          const ulint *col_map, size_t add_autoinc, ddl::Sequence &sequence,
+          bool skip_pk_sort, Alter_stage *stage, const dict_add_v_col_t *add_v,
+          TABLE *eval_table, size_t max_buffer_size,
+          size_t max_threads) noexcept;
+
+  /** Destructor. */
+  ~Context() noexcept;
+
+  /** @return the DDL error status. */
+  dberr_t get_error() const noexcept { return m_err; }
+
+  /** Set the error code, when it's not specific to an index.
+  @param[in] err                Error code. */
+  void set_error(dberr_t err) noexcept {
+    ut_a(err != DB_SUCCESS && err != DB_END_OF_INDEX);
+
+    /* This should only be settable by the the thread that encounters the
+    first error, therefore try only once. */
+
+    dberr_t expected{DB_SUCCESS};
+    m_err.compare_exchange_strong(expected, err);
+  }
+
+  /** Set the error code and index number where the error occurred.
+  @param[in] err                Error code.
+  @param[in] id                 Index ordinal value where error occurred. */
+  void set_error(dberr_t err, size_t id) noexcept {
+    /* This should only be settable by the the thread that encounters the
+    first error, therefore try only once. */
+
+    ut_a(err != DB_SUCCESS);
+
+    dberr_t expected{DB_SUCCESS};
+
+    if (m_err.compare_exchange_strong(expected, err)) {
+      ut_a(m_err_key_number == std::numeric_limits<size_t>::max());
+      m_err_key_number = m_key_numbers[id];
+    }
+  }
+
+  /** Build the indexes.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t build() noexcept;
+
+  /** @return the flush observer to use for flushing. */
+  [[nodiscard]] Flush_observer *flush_observer() noexcept;
+
+  /** @return the old table. */
+  [[nodiscard]] dict_table_t *old_table() noexcept { return m_old_table; }
+
+  /** @return the new table. */
+  [[nodiscard]] dict_table_t *new_table() noexcept { return m_new_table; }
+
+  /** Calculate the sort and  buffer size per thread.
+  @param[in] n_threads          Total number of threads used for scanning.
+  @return the sort and IO buffer size per thread. */
+  [[nodiscard]] Scan_buffer_size scan_buffer_size(
+      size_t n_threads) const noexcept;
+
+  /** Calculate the io buffer size per file for the sort phase.
+  @param[in] n_buffers          Total number of buffers to use for the merge.
+  @return the sort buffer size for one instance. */
+  [[nodiscard]] size_t merge_io_buffer_size(size_t n_buffers) const noexcept;
+
+  /** Calculate the io buffer size per file for the load phase.
+  @param[in] n_buffers          Total number of buffers to use for the loading.
+  @return the per thread io buffer size. */
+  [[nodiscard]] size_t load_io_buffer_size(size_t n_buffers) const noexcept;
+
+  /** Request number of bytes for a buffer.
+  @param[in] n                  Number of bytes requested.
+  @return the number of bytes available. */
+  [[nodiscard]] size_t allocate(size_t n) const;
+
+  /** @return the server session/connection context. */
+  [[nodiscard]] THD *thd() noexcept;
+
+  /** Copy the added columns dtuples so that we don't use the same
+  column data buffer for the added column across multiple threads.
+  @return new instance or nullptr if out of memory. */
+  [[nodiscard]] dtuple_t *create_add_cols() noexcept;
+
+ private:
+  /** @return the cluster index read cursor. */
+  [[nodiscard]] Cursor *cursor() noexcept { return m_cursor; }
+
+  /** @return the original table cluster index. */
+  [[nodiscard]] const dict_index_t *index() const noexcept;
+
+  /** Initialize the context for a cluster index scan.
+  @param[in,out] cursor         Cursor used for the cluster index read. */
+  [[nodiscard]] dberr_t read_init(Cursor *cursor) noexcept;
+
+  /** Initialize the FTS build infrastructue.
+  @param[in,out] index          Index prototype to build.
+  @return DB_SUCCESS or error code. */
+  dberr_t fts_create(dict_index_t *index) noexcept;
+
+  /** Setup the FTS index build data structres.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t setup_fts_build() noexcept;
+
+  /** Get the next Doc ID and increment the current value.
+  @return a document ID. */
+  [[nodiscard]] doc_id_t next_doc_id() noexcept;
+
+  /** Update the FTS document ID. */
+  void update_fts_doc_id() noexcept;
+
+  /** Check the state of the online build log for the index.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t check_state_of_online_build_log() noexcept;
+
+  /** Track the highest TxID that modified this index when the scan
+  was completed. We prevent older readers from accessing this index, to
+  ensure read consistency.
+  @param[in,out] index          Index to track. */
+  void note_max_trx_id(dict_index_t *index) noexcept;
+
+  /** Setup the primary key sort.
+  @param[in,out] cursor         Setup the primary key data structures.
+  @return DB_SUCCESS or erro code. */
+  [[nodiscard]] dberr_t setup_pk_sort(Cursor *cursor) noexcept;
+
+  /** Init the non-null column constraints checks (if required). */
+  void setup_nonnull() noexcept;
+
+  /** Check if the nonnull columns satisy the constraint.
+  @param[in] row                Row to check.
+  @return true on success. */
+  [[nodiscard]] bool check_null_constraints(const dtuple_t *row) const noexcept;
+
+  /** Clean up the data structures at the end of the DDL.
+  @param[in] err                Status of the DDL.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t cleanup(dberr_t err) noexcept;
+
+  /** Handle auto increment.
+  @param[in] row                Row with autoinc column.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t handle_autoinc(const dtuple_t *row) noexcept;
+
+  /** @return true if any virtual columns are involved. */
+  [[nodiscard]] bool has_virtual_columns() const noexcept;
+
+  /** @return true if any FTS indexes are involved. */
+  [[nodiscard]] bool has_fts_indexes() const noexcept;
+
+  /** @return true if the DDL was interrupted. */
+  [[nodiscard]] bool is_interrupted() noexcept;
+
+ private:
+  using Key_numbers = std::vector<size_t, ut::allocator<size_t>>;
+  using Indexes = std::vector<dict_index_t *, ut::allocator<dict_index_t *>>;
+
+  /** Common error code for all index builders running in prallel. */
+  std::atomic<dberr_t> m_err{DB_SUCCESS};
+
+  /** Index where the error occurred. */
+  size_t m_err_key_number{std::numeric_limits<size_t>::max()};
+
+  /** Transaction covering the index build. */
+  trx_t *m_trx{};
+
+  /** The FTS builder. There is one FTS per table. */
+  FTS m_fts;
+
+  /** Source table, read rows from this table. */
+  dict_table_t *m_old_table{};
+
+  /** Table where indexes are created; identical to old_table unless creating
+  a PRIMARY KEY. */
+  dict_table_t *m_new_table{};
+
+  /** True if creating index online. Non-online implies that we have an
+  S latch on the table, therefore there can't be concurrent updates to
+  the table while we are executing the DDL. We don't log the changes to
+  the row log. */
+  bool m_online{};
+
+  /** Indexes to be created. */
+  Indexes m_indexes{};
+
+  /** MySQL key numbers. */
+  Key_numbers m_key_numbers{};
+
+  /** MySQL table for reporting errors/warnings. */
+  TABLE *m_table{};
+
+  /** Default value for added columns or null. */
+  const dtuple_t *m_add_cols{};
+
+  /** Mapping of old column numbers to new ones, or nullptr if none
+  were added. */
+  const ulint *m_col_map{};
+
+  /** Number of added AUTO_INCREMENT columns, or ULINT_UNDEFINED if
+  none added. */
+  size_t m_add_autoinc{ULINT_UNDEFINED};
+
+  /** Autoinc sequence. */
+  ddl::Sequence &m_sequence;
+
+  /** Performance schema accounting object, used by ALTER TABLE.
+  stage->begin_phase_read_pk() will be called at the beginning of
+  this function and it will be passed to other functions for further
+  accounting. */
+  Alter_stage *m_stage{};
+
+  /** New virtual columns added along with indexes */
+  const dict_add_v_col_t *m_add_v{};
+
+  /** MySQL table used to evaluate virtual column value, see
+  innobase_get_computed_value(). */
+  TABLE *m_eval_table{};
+
+  /** Skip the sorting phase if true. */
+  bool m_skip_pk_sort{};
+
+  /** Non null columns. */
+  std::vector<size_t, ut::allocator<size_t>> m_nonnull{};
+
+  /** Number of unique columns in the key. */
+  size_t m_n_uniq{};
+
+  /** true if need flush observer. */
+  bool m_need_observer{};
+
+  /** Cursor for reading the cluster index. */
+  Cursor *m_cursor{};
+
+  /** Number of bytes used. */
+  size_t m_n_allocated{};
+
+  /** Maximum number of bytes to use. */
+  const size_t m_max_buffer_size{};
+
+  /** Maximum number of threads to use. We don't do a parallel scan of the
+  clustered index when FTS and/or virtual columns are involved. The build
+  phase is parallel though. */
+  const size_t m_max_threads{};
+
+  /** For parallel access to the autoincrement generator. */
+  ib_mutex_t m_autoinc_mutex;
+
+  /** Heap for copies of m_add_cols. */
+  mem_heap_t *m_dtuple_heap{};
+
+  friend struct Row;
+  friend class Loader;
+  friend struct Cursor;
+  friend struct Builder;
+  friend struct ddl::FTS;
+  friend struct Load_cursor;
+  friend struct Btree_cursor;
+  friend struct Merge_file_sort;
+  friend struct Parallel_cursor;
+};
+
+}  // namespace ddl
+
+#endif /* ddl0ddl_h */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/ddl0fts.h mysql-8.0-8.0.27/storage/innobase/include/ddl0fts.h
--- mysql-8.0-8.0.26/storage/innobase/include/ddl0fts.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/ddl0fts.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,191 @@
+/*****************************************************************************
+
+Copyright (c) 2010, 2021, Oracle and/or its affiliates. All Rights Reserved.
+
+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, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
+/** @file include/ddl0fts.h
+ Create Full Text Index with (parallel) merge sort.
+ Created 10/13/2010 Jimmy Yang */
+
+#ifndef ddl0fts_h
+#define ddl0fts_h
+
+#include "btr0load.h"
+#include "data0data.h"
+#include "ddl0impl-buffer.h"
+#include "dict0types.h"
+#include "fts0priv.h"
+#include "fts0types.h"
+#include "ut0mpmcbq.h"
+
+/** The general architecture is that the work is done in two phases,
+roughly the read and write phase. The scanner pushes the document to
+a read handler queue for processing.
+
+Phase I:
+ Start several parsing/tokenization threads that read the document from
+ a queue, parse the document, tokenize the document, add them to a buffer,
+ sort the rows in the buffer and then write the buffer to a temporary file.
+ There is one file per auxiliary table per parser instance. So, if you
+ have 2 parse threads you will end up with:
+
+   2 x FTS_NUM_AUX_INDEX files.
+
+Phase 2:
+ The temporary files generated during phase I are not closed but passed to
+ the second (write) phase so that these temporary files can be merged and
+ the rows inserted into the new FTS index. Using the example from above,
+ create FTS_NUM_AUX_INDEX threads and each thread will merge 2 files. */
+
+namespace ddl {
+// Forward declaration
+struct Builder;
+
+/** Full text search index builder. */
+struct FTS {
+  /** Information about temporary files used in merge sort. This structure
+  defines information the scan thread will fetch and put to the linked list
+  for parallel tokenization/sort threads to process */
+  struct Doc_item {
+    /** Field contains document string */
+    dfield_t *m_field{};
+
+    /** Document ID */
+    doc_id_t m_doc_id{};
+  };
+
+  /** Constructor.
+  @param[in, out] ctx           DDL context.
+  @param[in, out] index         DDL index.
+  @param[in, out] table         DDL table. */
+  FTS(Context &ctx, dict_index_t *index, dict_table_t *table) noexcept;
+
+  /** ~Destructor. */
+  ~FTS() noexcept;
+
+  /** Create the internal data structures.
+  @param[in] n_threads          Number of parse threads to create.
+  @return DB_SUCCESS or error code. */
+  dberr_t init(size_t n_threads) noexcept;
+
+  /** @return the DDL index. */
+  dict_index_t *index() noexcept { return m_index; }
+
+  /** @return the temporary sort index. */
+  dict_index_t *sort_index() noexcept { return m_dup.m_index; }
+
+  /** Start the parsing, create the threads.
+  @return DB_SUCCESS or error code. */
+  dberr_t start_parse_threads(Builder *builder) noexcept;
+
+  /** For sending the documents to parse to the parsing threads.
+  @param[in,out] doc_item       Document to parse, takes ownership.
+  @return DB_SUCCESS or error code, doc_item will be deleted either way. */
+  dberr_t enqueue(Doc_item *doc_item) noexcept;
+
+  /** Check for error status after the parsing has finished.
+  @return DB_SUCCESS or error code. */
+  dberr_t check_for_errors() noexcept;
+
+  /** Start the merging and insert threads.
+  @param[in,out] builder        Builder instance to use.
+  @return DB_SUCCESS or error code. */
+  dberr_t insert(Builder *builder) noexcept;
+
+  /** Inform the parser threads that the scanning phase is complete so
+  that they can shutdown after emptying the doc item queue.
+  @param[in] err                Error status of the scanning thread(s).
+  @return DB_SUCCESS or error code. */
+  dberr_t scan_finished(dberr_t err) noexcept;
+
+ private:
+  /** Create the data structures required to build the FTS index.
+  @param[in] n_threads          Number of parser threads.
+  @return DB_SUCCESS or error code. */
+  dberr_t create(size_t n_threads) noexcept;
+
+  /** @return the number of parses. */
+  size_t get_n_parsers() const noexcept { return m_parsers.size(); }
+
+  /** Destroy the data structures and clean up. */
+  void destroy() noexcept;
+
+  /** Create a temporary "fts sort index" used to merge sort the
+   tokenized doc string. The index has three "fields":
+
+   1. Tokenized word,
+   2. Doc ID
+   3. Word's position in original 'doc'.
+
+  @param[in,out] index          Index to sort.
+  @param[in,out] table          Table that the FTS index is created on.
+  @param[out] doc_id_32_bit       Whether to use 4 bytes instead of 7 bytes
+                                integer to store the DOC ID during sort.
+  @return dict_index_t structure for the fts sort index */
+  [[nodiscard]] static dict_index_t *create_index(dict_index_t *index,
+                                                  dict_table_t *table,
+                                                  bool *doc_id_32_bit) noexcept;
+
+  /** Setup the insert phase inoput files generated by the parsers.
+  @return DB_SUCCESS or error code. */
+  dberr_t setup_insert_phase() noexcept;
+
+ private:
+  // Forward declaration
+  struct Parser;
+  struct Inserter;
+
+  using Threads = std::vector<std::thread>;
+  using Parsers = std::vector<Parser *, ut::allocator<Parser *>>;
+
+  /** For parsing the documents, there is one per thread. */
+  Parsers m_parsers{};
+
+  /** For inserting the rows parsed by the m_parsers. */
+  Inserter *m_inserter{};
+
+  /** DDL context. */
+  Context &m_ctx;
+
+  /** Duplicate key reporting. */
+  Dup m_dup;
+
+  /** true if document ID should be stored as a 32 bit instead of a 64 bit. */
+  bool m_doc_id_32_bit{};
+
+  /** DDL index instance. */
+  dict_index_t *m_index{};
+
+  /** DDL table instance. */
+  dict_table_t *m_table{};
+
+  /** Temporary index instance with relevant FTS columns. */
+  dict_index_t *m_sort_index{};
+
+  /** For tracking parser threads. */
+  Threads m_threads{};
+};
+
+}  // namespace ddl
+#endif /* ddl0fts_h */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/ddl0impl-buffer.h mysql-8.0-8.0.27/storage/innobase/include/ddl0impl-buffer.h
--- mysql-8.0-8.0.26/storage/innobase/include/ddl0impl-buffer.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/ddl0impl-buffer.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,249 @@
+/*****************************************************************************
+
+Copyright (c) 2020, 2021, Oracle and/or its affiliates. All Rights Reserved.
+
+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, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
+/** @file include/ddl0impl-buffer.h
+ DDL buffer infrastrucure.
+ Created 2020-11-01 by Sunny Bains. */
+
+#ifndef ddl0impl_buffer_h
+#define ddl0impl_buffer_h
+
+#include "ddl0impl.h"
+#include "dict0dict.h"
+
+namespace ddl {
+
+/** For DDL memory allocations that use the mem_key_ddl handle. */
+struct PFS_buffer : private ut::Non_copyable {
+  using Type = byte;
+  using Allocator = ut::allocator<Type>;
+
+  /** Constructor. */
+  PFS_buffer() = default;
+
+  /** Destructor. */
+  ~PFS_buffer() noexcept { deallocate(); }
+
+  /** @return allocated and initialized memory or nullptr on failure.
+  @param[in] size               Number of bytes to allocate. */
+  byte *allocate(size_t size) noexcept {
+    ut_a(m_size == 0);
+    ut_a(m_ptr == nullptr);
+
+    m_ptr = static_cast<byte *>(
+        ut::malloc_large_page_withkey(ut::make_psi_memory_key(mem_key_ddl),
+                                      size, ut::fallback_to_normal_page_t{}));
+
+    if (m_ptr != nullptr) {
+      m_size = size;
+      memset(m_ptr, 0x0, m_size);
+    }
+
+    return m_ptr;
+  }
+
+  /** Deallocate the memory. */
+  void deallocate() noexcept {
+    ut::free_large_page(m_ptr, ut::fallback_to_normal_page_t{});
+    m_ptr = nullptr;
+  }
+
+  /** Pointer to allocated buffer. */
+  byte *m_ptr{};
+
+  /** Number of bytes allocated. */
+  size_t m_size{};
+};
+
+/** Buffer used for reading and writing to the temporary files. */
+struct Aligned_buffer : private ut::Non_copyable {
+  /** Constructor. */
+  Aligned_buffer() = default;
+
+  /** Destructor. */
+  ~Aligned_buffer() = default;
+
+  /** Allocate the buffer.
+  @param[in] size               Size of the buffer.
+  @return true on success. */
+  bool allocate(size_t size) noexcept {
+    ut_a(m_io_buffer.second == 0);
+    ut_a(m_io_buffer.first == nullptr);
+
+    /* Extra space to align memory for O_DIRECT. */
+    auto ptr = m_buffer.allocate(size + UNIV_SECTOR_SIZE);
+
+    if (ptr == nullptr) {
+      return false;
+    }
+
+    m_io_buffer.second = size;
+    m_io_buffer.first = static_cast<byte *>(ut_align(ptr, UNIV_SECTOR_SIZE));
+
+    return true;
+  }
+
+  /** Get the IO buffer.
+  @return the io buffer suitably aligned. */
+  IO_buffer io_buffer() noexcept { return m_io_buffer; }
+
+ private:
+  /** Raw buffer (unaligned pointer). */
+  PFS_buffer m_buffer{};
+
+  /** The IO buffer. */
+  IO_buffer m_io_buffer{};
+};
+
+/** Buffer for sorting in main memory. */
+struct Key_sort_buffer : private ut::Non_copyable {
+  /** Callback for writing serialized data to to disk.
+  @param[in] io_buffer          Buffer to persist.
+  @param[in,out] n              Number of bytes written is returned.
+                                Input value semantics:
+                                0  - Write up to aligned length.
+                                >0 - All data will be written and
+                                     last block will be padded with zeros.
+  @return DB_SUCCES or error code. */
+  using Function = std::function<dberr_t(IO_buffer io_buffer, os_offset_t &n)>;
+
+  /** Constructor.
+  @param[in,out] index          Sort buffer is for this index.
+  @param[in] size               Sort buffer size in bytes. */
+  explicit Key_sort_buffer(dict_index_t *index, size_t size) noexcept;
+
+  /** Destructor. */
+  ~Key_sort_buffer() noexcept { mem_heap_free(m_heap); }
+
+  /** Sort the elements in m_dtuples.
+  @param[in,out] dup            For collecting the duplicate rows. */
+  void sort(ddl::Dup *dup) noexcept;
+
+  /** Serialize the contents for storing to disk.
+  @param[in] io_buffer          Buffer for serializing.
+  @param[in] f                  Function for persisting the data.
+  @return DB_SUCCESS or error code. */
+  dberr_t serialize(IO_buffer io_buffer, Function &&f) noexcept;
+
+  /** Reset the sort buffer. clear the heap and entries. */
+  void clear() noexcept;
+
+  /** @return true if the index is clustered. */
+  [[nodiscard]] bool is_clustered() const noexcept {
+    return m_index->is_clustered();
+  }
+
+  /** @return true if the index is an FTS index. */
+  [[nodiscard]] bool is_fts() const noexcept {
+    return m_index->type & DICT_FTS;
+  }
+
+  /** @return true if the index has a unique constraint. */
+  [[nodiscard]] bool is_unique() const noexcept {
+    return dict_index_is_unique(m_index);
+  }
+
+  /** @return the heap to use. */
+  [[nodiscard]] mem_heap_t *heap() noexcept { return m_heap; }
+
+  /** @return number of tuples stored so far. */
+  [[nodiscard]] size_t size() const noexcept { return m_n_tuples; }
+
+  /** @return true if the buffer is full. */
+  [[nodiscard]] bool full() const noexcept { return size() >= m_max_tuples; }
+
+  /** @return true if the buffer is empty. */
+  [[nodiscard]] bool empty() const noexcept { return size() == 0; }
+
+  /** @return a references to the last element. */
+  [[nodiscard]] dfield_t *&back() noexcept {
+    ut_a(!empty());
+    return m_dtuples[size() - 1];
+  }
+
+  /** Allocate fields from the heap.
+  @param[in] n                  Number of fields to allocate.
+  @return an array of n dfields. */
+  dfield_t *alloc(size_t n) noexcept {
+    const auto sz = sizeof(dfield_t) * n;
+    return static_cast<dfield_t *>(mem_heap_alloc(m_heap, sz));
+  }
+
+  /** Check if n bytes will fit in the buffer.
+  @param[in] n                  Number of bytes to check.
+  @return true if n bytes will fit in the buffer. */
+  bool will_fit(size_t n) const noexcept {
+    /* Reserve one byte for the end marker and adjust for meta-data overhead. */
+    return m_total_size + n +
+               (sizeof(std::remove_pointer<decltype(
+                           m_dtuples)::value_type>::type) *
+                (m_n_tuples + 1)) <=
+           m_buffer_size - 1;
+  }
+
+  /** Deep copy the field data starting from the back.
+  @param[in] n_fields           Number of fields to copy.
+  @param[in] data_size          Size in bytes of the data to copy. */
+  void deep_copy(size_t n_fields, size_t data_size) noexcept;
+
+  /** Compare two merge data tuples.
+  @param[in] lhs                Fields to compare on the LHS
+  @param[in] rhs                Fields to comapre on the RHS
+  @param[in,out] dup            For capturing duplicates (or nullptr).
+  @retval +ve - if lhs > rhs
+  @retval -ve - if lhs < rhs
+  @retval 0 - if lhs == rhs */
+  [[nodiscard]] static int compare(const dfield_t *lhs, const dfield_t *rhs,
+                                   Dup *dup) noexcept;
+
+  using DTuple = dfield_t *;
+  using DTuples = std::vector<DTuple, ut::allocator<DTuple>>;
+
+  /** Memory heap where allocated */
+  mem_heap_t *m_heap{};
+
+  /** The index the tuples belong to */
+  dict_index_t *m_index{};
+
+  /** Total amount of data bytes */
+  size_t m_total_size{};
+
+  /** Number of data tuples */
+  size_t m_n_tuples{};
+
+  /** Maximum number of data tuples */
+  size_t m_max_tuples{};
+
+  /** Array of data tuples */
+  DTuples m_dtuples{};
+
+  /** Buffer size. */
+  size_t m_buffer_size{};
+};
+
+}  // namespace ddl
+
+#endif /* !ddl0impl_buffer_h */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/ddl0impl-builder.h mysql-8.0-8.0.27/storage/innobase/include/ddl0impl-builder.h
--- mysql-8.0-8.0.26/storage/innobase/include/ddl0impl-builder.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/ddl0impl-builder.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,595 @@
+/*****************************************************************************
+
+Copyright (c) 2020, 2021, Oracle and/or its affiliates. All Rights Reserved.
+
+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, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
+/** @file include/ddl0impl-builder.h
+ DDL index builder data interface.
+ Created 2020-11-01 by Sunny Bains. */
+
+#ifndef ddl0impl_builder_h
+#define ddl0impl_builder_h
+
+#include "btr0load.h"
+#include "ddl0impl-buffer.h"
+#include "ddl0impl-file-reader.h"
+#include "row0pread.h"
+
+namespace ddl {
+
+// Forward declaration.
+struct Copy_ctx;
+struct File_cursor;
+class RTree_inserter;
+
+/** For loading indexes. */
+struct Builder {
+  /** Build phase/states. */
+  enum class State : uint8_t {
+    /** Initial phase. */
+    INIT,
+
+    /** Collect the rows for the index to build. */
+    ADD,
+
+    /** Setup the merge sort and add the tasks to the task queue. */
+    SETUP_SORT,
+
+    /** Sort the collected rows, if required. The builder moves to state
+    BTREE_BUILD after all sort tasks are completed successfully or there
+    was an error during the sort phase. */
+    SORT,
+
+    /** Build the btree. */
+    BTREE_BUILD,
+
+    /** FTS sort and build, this is done in one "step" */
+    FTS_SORT_AND_BUILD,
+
+    /** Finish the loading of the index. */
+    FINISH,
+
+    /** Stop on success. */
+    STOP,
+
+    /** Stop on error. */
+    ERROR
+  };
+
+  /** Constructor.
+  @param[in,out] ctx            DDL context.
+  @param[in,out] loader         Owner of the instance.
+  @param[in] i                  Index ordinal value. */
+  Builder(ddl::Context &ctx, Loader &loader, size_t i) noexcept;
+
+  /** Destructor/ */
+  ~Builder() noexcept;
+
+  /** @return the error status. */
+  dberr_t get_error() const noexcept { return m_ctx.get_error(); }
+
+  /** Set the error code.
+  @param[in] err                Error code to set. */
+  void set_error(dberr_t err) noexcept { m_ctx.set_error(err, m_id); }
+
+  /** @return the instance ID. */
+  [[nodiscard]] size_t id() const noexcept { return m_id; }
+
+  /** @return the index being built. */
+  [[nodiscard]] dict_index_t *index() noexcept { return m_sort_index; }
+
+  /** @return the DDL context. */
+  Context &ctx() noexcept { return m_ctx; }
+
+  /** Parallel scan thread spawn failed, release the extra thread states. */
+  void fallback_to_single_thread() noexcept;
+
+  /** @return true if the index is a spatial index. */
+  [[nodiscard]] bool is_spatial_index() const noexcept {
+    return dict_index_is_spatial(m_index);
+  }
+
+  /** @return true if the index is an FTS index. */
+  [[nodiscard]] bool is_fts_index() const noexcept {
+    return m_index->type & DICT_FTS;
+  }
+
+  /** @return true if the index is a unique index. */
+  [[nodiscard]] bool is_unique_index() const noexcept {
+    ut_a(!is_fts_index());
+    return dict_index_is_unique(m_sort_index);
+  }
+
+  /** @return the current builder state. */
+  [[nodiscard]] State get_state() const noexcept {
+    return m_state.load(std::memory_order_seq_cst);
+  }
+
+  /** Set the next state.
+  @param[in] state              State to set. */
+  void set_state(State state) noexcept {
+    m_state.store(state, std::memory_order_seq_cst);
+  }
+
+  /** @return the PFS instance that is used to report progress (or nullptr). */
+  Alter_stage *stage() noexcept { return m_local_stage; }
+
+  /** Set the next state. */
+  void set_next_state() noexcept;
+
+  /** Initialize the cursor.
+  @param[in,out] cursor         Cursor to initialize.
+  @param[in] n_threads          Number of threads used for reading.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t init(Cursor &cursor, size_t n_threads) noexcept;
+
+  /** Add a row to the merge buffer.
+  @param[in,out]	cursor        Current scan cursor.
+  @param[in,out] row            Row to add.
+  @param[in] thread_id          ID of current thread.
+  @param[in,out] latch_release  Called when a log free check is required.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t add_row(Cursor &cursor, Row &row, size_t thread_id,
+                                Latch_release &&latch_release) noexcept;
+
+  /** @return true if file sorting can be skipped. */
+  bool is_skip_file_sort() const noexcept {
+    return m_ctx.m_skip_pk_sort && m_sort_index->is_clustered();
+  }
+
+  /** FTS: Sort and insert the rows read.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t fts_sort_and_build() noexcept;
+
+  /** Non-FTS: Sort the rows read.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t setup_sort() noexcept;
+
+  /** Non-FTS: Sort the rows read.
+  @param[in] thread_id           Thread state ID.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t merge_sort(size_t thread_id) noexcept;
+
+  /** Load the sorted data into the B+Tree.
+  @return DB_SUCESS or error code. */
+  [[nodiscard]] dberr_t btree_build() noexcept;
+
+  /** Close temporary files, Flush all dirty pages, apply the row log
+  and write the redo log record.
+  @return DB_SUCCESS or error code. */
+  dberr_t finish() noexcept;
+
+  /** Copy blobs to the tuple.
+  @param[out] dtuple            Tuple to copy to.
+  @param[in,out] offsets        Column offsets in the row.
+  @param[in] mrec               Current row.
+  @param[in,out] heap           Heap for the allocating tuple memory.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t dtuple_copy_blobs(dtuple_t *dtuple, ulint *offsets,
+                                          const mrec_t *mrec,
+                                          mem_heap_t *heap) noexcept;
+
+  /** Write data to disk - in append mode. Increment the file size.
+  @param[in,out] file           File handle.
+  @param[in] file_buffer        Write the buffer contents to disk.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t append(ddl::file_t &file,
+                               IO_buffer file_buffer) noexcept;
+
+  /** @return the path for temporary files. */
+  const char *tmpdir() const noexcept { return m_tmpdir; }
+
+  /** Insert cached rows.
+  @param[in] thread_id          Insert cached rows for this thread ID.
+  @param[in,out] latch_release  Called when a log free check is required.
+  @return DB_SUCCESS or error number */
+  [[nodiscard]] dberr_t batch_insert(size_t thread_id,
+                                     Latch_release &&latch_release) noexcept;
+
+  /** Note that the latches are going to be released. Do a deep copy of the
+  tuples that are being inserted in batches by batch_insert
+  @param[in] thread_id          Deep copy cached rows for this thread ID. */
+  void batch_insert_deep_copy_tuples(size_t thread_id) noexcept;
+
+  /** Check the state of the online build log for the index.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t check_state_of_online_build_log() noexcept;
+
+  /** Destroy a merge file.
+  @param[in,out] file           Merge file to delete. */
+  static void file_destroy(ddl::file_t *file) noexcept;
+
+  /** Write an MLOG_INDEX_LOAD record to indicate in the redo-log
+  that redo-logging of individual index pages was disabled, and
+  the flushing of such pages to the data files was completed.
+  @param[in] index              Index on which redo logging was disabled */
+  static void write_redo(const dict_index_t *index) noexcept;
+
+ private:
+  /** State of a cluster index reader thread. */
+  struct Thread_ctx {
+    /** Constructor.
+    @param[in] id               Thread state ID.
+    @param[in,out] key_buffer   Buffer for building the target index. Note, the
+                                thread state will own the key buffer and is
+                                responsible for deleting it. */
+    explicit Thread_ctx(size_t id, Key_sort_buffer *key_buffer) noexcept;
+
+    /** Destructor. */
+    ~Thread_ctx() noexcept;
+
+    /** Thread ID. */
+    size_t m_id{};
+
+    /** Key sort buffer. */
+    Key_sort_buffer *m_key_buffer{};
+
+    /** Total number of records added to the key sort buffer. */
+    size_t m_n_recs{};
+
+    /** Merge file handle. */
+    ddl::file_t m_file{};
+
+    /** Buffer to use for file writes. */
+    Aligned_buffer m_aligned_buffer{};
+
+    /** Record list starting offset in the output file. */
+    Merge_offsets m_offsets{};
+
+    /** For spatial/Rtree rows handling. */
+    RTree_inserter *m_rtree_inserter{};
+  };
+
+  using Allocator = ut::allocator<Thread_ctx *>;
+  using Thread_ctxs = std::vector<Thread_ctx *, Allocator>;
+
+  /** Create the tasks to merge Sort the file before we load the file into
+  the Btree index.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t create_merge_sort_tasks() noexcept;
+
+  /** Flush all dirty pages, apply the row log and write the redo log record.
+  @return DB_SUCCESS or error code. */
+  dberr_t finalize() noexcept;
+
+  /** Convert the field data from compact to redundant format.
+  @param[in]	trx		            Current transaction
+  @param[in]	clust_index	      Clustered index being built
+  @param[in]	row_field	        Field to copy from
+  @param[out]	field		          Field to copy to
+  @param[in]	len		            Length of the field data
+  @param[in]	page_size	        Compressed BLOB page size
+  @param[in]	is_sdi		        true for SDI Indexes
+  @param[in,out]	heap		      Memory heap where to allocate
+                                data when converting to ROW_FORMAT=REDUNDANT,
+                                or nullptr */
+  static void convert(trx_t *trx, const dict_index_t *clust_index,
+                      const dfield_t *row_field, dfield_t *field, ulint len,
+                      const page_size_t &page_size,
+                      IF_DEBUG(bool is_sdi, ) mem_heap_t *heap) noexcept;
+
+  /** Copy externally stored columns to the data tuple.
+  @param[in] trx                Current transaction
+  @param[in] index              Index dictionary object.
+  @param[in] mrec               Record containing BLOB pointers, or
+                                nullptr to use tuple instead.
+  @param[in] offsets            Offsets of mrec.
+  @param[in] page_size          Compressed page size in bytes, or 0
+  @param[in,out] tuple          Data tuple.
+  @param[in] is_sdi             True for SDI Indexes
+  @param[in,out] heap           Memory heap */
+  static void copy_blobs(trx_t *trx, const dict_index_t *index,
+                         const mrec_t *mrec, const ulint *offsets,
+                         const page_size_t &page_size, dtuple_t *tuple,
+                         IF_DEBUG(bool is_sdi, ) mem_heap_t *heap) noexcept;
+
+  /** Cache a row for batch inserts. Currently used by spatial indexes.
+  @param[in,out] row            Row to add.
+  @param[in] thread_id          ID of current thread.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t batch_add_row(Row &row, size_t thread_id) noexcept;
+
+  /** Add a row to the merge buffer.
+  @param[in,out]	cursor        Current scan cursor.
+  @param[in,out] row            Row to add.
+  @param[in] thread_id          ID of current thread.
+  @param[in,out] latch_release  Called when a log free check is required.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t bulk_add_row(Cursor &cursor, Row &row, size_t thread_id,
+                                     Latch_release &&latch_release) noexcept;
+
+  /** Clear the heap used for virtual columns. */
+  void clear_virtual_heap() noexcept { m_v_heap.clear(); }
+
+  /** Add the FTS document ID to the destination field.
+  @param[in,out] dst            Field to write to.
+  @param[in] src                Field to copy meta data from.
+  @param[out] write_doc_id      Buffer for copying the doc id. */
+  void fts_add_doc_id(dfield_t *dst, const dict_field_t *src,
+                      doc_id_t &write_doc_id) noexcept;
+
+  /** Add a row to the write buffer.
+  @param[in,out] ctx             Copy context.
+  @param[in,out] mv_rows_added   Number of multi-value rows added.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t copy_row(Copy_ctx &ctx, size_t &mv_rows_added) noexcept;
+
+  /** Setup the virtual column src column.
+  @param[in,out] ctx            Copy context.
+  @param[in] ifield             Index field.
+  @param[in] col                Table column.
+  @param[out] src_field         Computed value.
+  @param[in,out] mv_rows_added  Number of multi-value rows added.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t get_virtual_column(Copy_ctx &ctx,
+                                           const dict_field_t *ifield,
+                                           dict_col_t *col,
+                                           dfield_t *&src_field,
+                                           size_t &mv_rows_added) noexcept;
+
+  /** Copy the FTS columns.
+  @param[in,out] ctx            Copy context.
+  @param[in,out] field          Field to write to.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t copy_fts_column(Copy_ctx &ctx,
+                                        dfield_t *field) noexcept;
+
+  /** Copy the columns to the temporary file buffer.
+  @param[in,out] ctx            Copy context.
+  @param[in,out] mv_rows_added  Multi value rows added.
+  @param[in,out] write_doc_id   Buffer for storing the FTS doc ID.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t copy_columns(Copy_ctx &ctx, size_t &mv_rows_added,
+                                     doc_id_t &write_doc_id) noexcept;
+
+  /** Add row to the key buffer.
+  @param[in,out] ctx            Copy context.
+  @param[in,out] mv_rows_added  Number of multi-value index rows added.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t add_to_key_buffer(Copy_ctx &ctx,
+                                          size_t &mv_rows_added) noexcept;
+
+  /** Wait for FTS completion.
+  @param[in] index             Index being built. */
+  void fts_wait_for_completion(const dict_index_t *index) noexcept;
+
+  /** Sort the data in the key buffer.
+  @param[in] thread_id          Thread ID of current thread.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t key_buffer_sort(size_t thread_id) noexcept;
+
+  /** Sort the buffer in memory and insert directly in the BTree loader,
+  don't write to a temporary file.
+  @param[in,out]	cursor        Current scan cursor.
+  @param[in,out] row            Row to add.
+  @param[in] thread_id          ID of current thread.
+  @return DB_SUCCESS or error code. */
+  dberr_t insert_direct(Cursor &cursor, const Row &row,
+                        size_t thread_id) noexcept;
+
+  /** Create the file, if needed.
+  @param[in,out] file           File handle.
+  @return file handle for the merge file. */
+  [[nodiscard]] os_fd_t create_file(ddl::file_t &file) noexcept;
+
+  /** Check for duplicates in the first block
+  @param[in] dupcheck           Files to check for duplicates.
+  @param[in,out] dup            For collecting duplicate key information.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t check_duplicates(Thread_ctxs &dupcheck,
+                                         Dup *dup) noexcept;
+
+ private:
+  /** Buffer ID. */
+  size_t m_id{};
+
+  /** Initial phase. */
+  std::atomic<State> m_state{State::INIT};
+
+  /** DDL Context. */
+  ddl::Context &m_ctx;
+
+  /** Loader that owns the instance. */
+  Loader &m_loader;
+
+  /** Index to create (if not FTS index). */
+  dict_index_t *m_index{};
+
+  /** Temporary file path. */
+  const char *m_tmpdir{};
+
+  /** Per thread context. */
+  Thread_ctxs m_thread_ctxs{};
+
+  /** For tracking duplicates. */
+  dfield_t *m_prev_fields{};
+
+  /** For collecting duplicate entries (error reporting). */
+  Dup m_clust_dup{};
+
+  /** Scoped virtual column heap. */
+  Scoped_heap m_v_heap{};
+
+  /** Scoped conversion heap. */
+  Scoped_heap m_conv_heap{};
+
+  /** The index to be built, FTS or non-FTS. */
+  dict_index_t *m_sort_index{};
+
+  /** Number of active sort tasks. */
+  std::atomic<size_t> m_n_sort_tasks{};
+
+  /** Cluster index bulk load instance to use, direct insert without
+  a file sort. */
+  Btree_load *m_btr_load{};
+
+  /** Stage per builder. */
+  Alter_stage *m_local_stage{};
+};
+
+struct Load_cursor : Btree_load::Cursor {
+  /** Default constructor. */
+  explicit Load_cursor(Builder *builder, Dup *dup) noexcept
+      : m_dup(dup), m_builder(builder) {}
+
+  /** Default destructor. */
+  virtual ~Load_cursor() override = default;
+
+  /** @return the cursor error status. */
+  [[nodiscard]] dberr_t get_err() const noexcept { return m_err; }
+
+  /** @return true if duplicates detected. */
+  [[nodiscard]] bool duplicates_detected() const noexcept override;
+
+  /** Duplicate checking and reporting. */
+  Dup *m_dup{};
+
+  /** Operation error code. */
+  dberr_t m_err{DB_SUCCESS};
+
+  /** Index meta data. */
+  Builder *m_builder{};
+
+  /** Heap for the raw row to dtuple_t conversion. */
+  Scoped_heap m_tuple_heap{};
+};
+
+/** Merge the sorted files. */
+struct Merge_cursor : public Load_cursor {
+  /** File cursors to use for the scan. */
+  using File_readers = std::vector<File_reader *, ut::allocator<File_reader *>>;
+
+  /** Constructor.
+  @param[in,out] builder        Index builder.
+  @param[in,out] dup            If not nullptr, then report duplicates.
+  @param[in,out] stage          PFS stage monitoring. */
+  explicit Merge_cursor(Builder *builder, Dup *dup,
+                        Alter_stage *stage) noexcept;
+
+  /** Destructor. */
+  ~Merge_cursor() noexcept override;
+
+  /** Add the cursor to use for merge load.
+  @param[in] file               File to merge from.
+  @param[in] buffer_size        IO buffer size to use for reading.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t add_file(const ddl::file_t &file,
+                                 size_t buffer_size) noexcept;
+
+  /** Add the cursor to use for merge load.
+  @param[in] file               File file to read.
+  @param[in] buffer_size        IO buffer size to use for reading.
+  @param[in] offset             Page to read from.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t add_file(const ddl::file_t &file, size_t buffer_size,
+                                 os_offset_t offset) noexcept;
+
+  /** Open the cursor.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t open() noexcept;
+
+  /** Fetch the current row as a tuple. Note: Tuple columns are shallow copies.
+  @param[out] dtuple            Row represented as a tuple.
+  @return DB_SUCCESS, DB_END_OF_INDEX or error code. */
+  [[nodiscard]] dberr_t fetch(dtuple_t *&dtuple) noexcept override;
+
+  /** Fetch the current row.
+  @param[out] mrec              Current merge record.
+  @param[out] offsets           Columns offsets inside mrec.
+  @return DB_SUCCESS, DB_END_OF_INDEX or error code. */
+  [[nodiscard]] dberr_t fetch(const mrec_t *&mrec, ulint *&offsets) noexcept;
+
+  /** Move to the next record.
+  @return DB_SUCCESS, DB_END_OF_INDEX or error code. */
+  [[nodiscard]] dberr_t next() noexcept override;
+
+  /** @return the file reader instances. */
+  [[nodiscard]] File_readers file_readers() noexcept;
+
+  /** Add the active cursors to the priority queue. */
+  void clear_eof() noexcept;
+
+  /** @return the number of active readers. */
+  [[nodiscard]] size_t size() const noexcept { return m_pq.size(); }
+
+  /** @return the number of rows read from the files. */
+  [[nodiscard]] uint64_t get_n_rows() const noexcept;
+
+  /** @return the number of cursors being merged. */
+  [[nodiscard]] size_t number_of_cursors() const noexcept {
+    return m_cursors.size();
+  }
+
+ private:
+  /** @return the current cursor at the head of the queue. */
+  [[nodiscard]] File_cursor *pop() noexcept;
+
+ private:
+  /** Comparator. */
+  struct Compare {
+    /** Constructor.
+    @param[in] index            Index that the rows belong to.
+    @param[in,out] dup          For reporting duplicates, can be nullptr.  */
+    explicit Compare(const dict_index_t *index, Dup *dup)
+        : m_dup(dup), m_index(index) {}
+
+    /** Destructor. */
+    Compare() = default;
+
+    /** Compare the keys of two cursors.
+    @param[in] lhs              Left hand side.
+    @param[in] rhs              Right hand side.
+    @return true if lhs strictly less than rhs. */
+    bool operator()(const File_cursor *lhs,
+                    const File_cursor *rhs) const noexcept;
+
+    /** For reporting duplicates. */
+    Dup *m_dup{};
+
+    /** Index being built. */
+    const dict_index_t *m_index{};
+  };
+
+  /** File cursors to use for the scan. */
+  using File_cursors = std::vector<File_cursor *, ut::allocator<File_cursor *>>;
+
+  /** Priority queue for ordering the rows. */
+  using Queue = std::priority_queue<File_cursor *, File_cursors, Compare>;
+
+  /** Priority queue for merging the file cursors. */
+  Queue m_pq{};
+
+  /** Cursors to use for parallel loading of the index. */
+  File_cursors m_cursors{};
+
+  /** Current cursor. */
+  File_cursor *m_cursor{};
+
+  /** PFS stage monitoring. */
+  Alter_stage *m_stage{};
+};
+
+}  // namespace ddl
+
+#endif /* !ddl0impl_builder_h */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/ddl0impl-compare.h mysql-8.0-8.0.27/storage/innobase/include/ddl0impl-compare.h
--- mysql-8.0-8.0.26/storage/innobase/include/ddl0impl-compare.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/ddl0impl-compare.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,135 @@
+/*****************************************************************************
+
+Copyright (c) 2020, 2021, Oracle and/or its affiliates. All Rights Reserved.
+
+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, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
+/** @file include/ddl0impl-compare.h
+ DDL key comparison.
+ Created 2020-11-01 by Sunny Bains. */
+
+#ifndef ddl0impl_compare_h
+#define ddl0impl_compare_h
+
+#include "ddl0impl.h"
+#include "rem0cmp.h"
+
+namespace ddl {
+
+/** Compare the keys of an index. */
+struct Compare_key {
+  /** Constructor.
+  @param[in] index              Compare the keys of this index.
+  @param[in,out] dups           For capturing the duplicate entries.
+  @param[in] compare_all        If set, compare all columns in the key. */
+  Compare_key(const dict_index_t *index, Dup *dups, bool compare_all) noexcept
+      : m_dups(dups),
+        m_n_unique(dict_index_get_n_unique(index)),
+        m_n_fields(compare_all ? dict_index_get_n_fields(index) : m_n_unique),
+        m_fields(index->fields) {
+    ut_a(m_n_unique <= m_n_fields);
+    ut_a(m_dups == nullptr || index == m_dups->m_index);
+  }
+
+  Compare_key(const Compare_key &) = default;
+
+  /** Destructor. */
+  ~Compare_key() = default;
+
+  /** Compare two tuples.
+  @param[in] lhs                Tuple to comapre on the left hand side
+  @param[in] rhs                Tuple to compare on the Right hand side
+  @retval +ve - if lhs > rhs
+  @retval -ve - if lhs < rhs
+  @retval 0 - if lhs == rhs */
+  int operator()(const dfield_t *lhs, const dfield_t *rhs) const noexcept {
+    auto f = m_fields;
+    auto lhs_f = lhs;
+    auto rhs_f = rhs;
+    auto n = m_n_unique;
+
+    ut_a(n > 0);
+
+    /* Compare the fields of the tuples until a difference is
+    found or we run out of fields to compare. If cmp == 0 at
+    the end, then the tuples are equal. */
+    int cmp;
+
+    do {
+      cmp = cmp_dfield_dfield(lhs_f++, rhs_f++, (f++)->is_ascending);
+    } while (cmp == 0 && --n);
+
+    if (cmp != 0) {
+      return cmp;
+    }
+
+    if (m_dups != nullptr) {
+      bool report{true};
+
+      /* Report a duplicate value error if the tuples are
+      logically equal.  nullptr columns are logically inequal,
+      although they are equal in the sorting order.  Find
+      out if any of the fields are nullptr. */
+      for (auto df = lhs; df != lhs_f; ++df) {
+        if (dfield_is_null(df)) {
+          report = false;
+          break;
+        }
+      }
+
+      if (report) {
+        m_dups->report(lhs);
+      }
+    }
+
+    /* The m_n_unique fields were equal, but we compare all fields so
+    that we will get the same (internal) order as in the B-tree. */
+    for (auto n = m_n_fields - m_n_unique + 1; --n;) {
+      cmp = cmp_dfield_dfield(lhs_f++, rhs_f++, (f++)->is_ascending);
+      if (cmp != 0) {
+        return cmp;
+      }
+    }
+
+    /* Creating a secondary index and a PRIMARY KEY and there is a duplicate
+    in the PRIMARY KEY that has not been detected yet. Internally, an index
+    must never contain duplicates. */
+    return cmp;
+  }
+
+  /** For collecting duplicates. */
+  Dup *m_dups{};
+
+  /** Number of unique fields in the index key. */
+  const size_t m_n_unique{};
+
+  /** Total number of fields in the index key. */
+  const size_t m_n_fields{};
+
+  /** Index key fields. */
+  const dict_field_t *m_fields{};
+};
+
+}  // namespace ddl
+
+#endif /* !ddl0impl_compare_h */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/ddl0impl-cursor.h mysql-8.0-8.0.27/storage/innobase/include/ddl0impl-cursor.h
--- mysql-8.0-8.0.26/storage/innobase/include/ddl0impl-cursor.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/ddl0impl-cursor.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,121 @@
+/*****************************************************************************
+
+Copyright (c) 2020, 2021, Oracle and/or its affiliates. All Rights Reserved.
+
+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, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
+/** @file include/ddl0impl-cursor.h
+ DDL scan cursor interface.
+ Created 2020-11-01 by Sunny Bains. */
+
+#ifndef ddl0impl_cursor_h
+#define ddl0impl_cursor_h
+
+#include "ddl0fts.h"
+#include "ddl0impl.h"
+
+namespace ddl {
+
+/** Cursor for reading the data. */
+struct Cursor {
+  using Post_row = std::function<dberr_t()>;
+
+  /** Constructor.
+  @param[in,out] ctx            DDL context. */
+  explicit Cursor(ddl::Context &ctx) noexcept : m_ctx(ctx) {}
+
+  /** Destructor. */
+  virtual ~Cursor() noexcept {
+    if (m_prev_fields != nullptr) {
+      ut::free(m_prev_fields);
+      m_prev_fields = nullptr;
+    }
+  }
+
+  /** Open the cursor. */
+  virtual void open() noexcept = 0;
+
+  /** Do any post processing.
+  @param[in] err                Error code.
+  @return DB_SUCCESS or error code. */
+  virtual dberr_t finish(dberr_t err) noexcept;
+
+  /** @return the index to iterate over. */
+  [[nodiscard]] virtual dict_index_t *index() noexcept = 0;
+
+  /** Copy the row data, by default only the pointers are copied.
+  @param[in] thread_id          Scan thread ID.
+  @param[in,out] row            Row to copy.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] virtual dberr_t copy_row(size_t thread_id,
+                                         Row &row) noexcept = 0;
+
+  /** Setup the primary key sort data structures.
+  @param[in] n_uniq             Number of columns to make they unique key.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t setup_pk_sort(size_t n_uniq) noexcept {
+    auto p =
+        ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, n_uniq * sizeof(dfield_t));
+
+    if (p == nullptr) {
+      return DB_OUT_OF_MEMORY;
+    }
+
+    m_prev_fields = static_cast<dfield_t *>(p);
+
+    MEM_HEAP_CREATE(m_tuple_heap, sizeof(mrec_buf_t));
+
+    return m_tuple_heap.get() == nullptr ? DB_OUT_OF_MEMORY : DB_SUCCESS;
+  }
+
+  /** Reads clustered index of the table and create temporary file(s)
+  containing the index entries for the indexes to be built.
+  @param[in,out] builders Merge buffers to use for reading.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] virtual dberr_t scan(Builders &builders) noexcept = 0;
+
+  /** @return true if EOF reached. */
+  [[nodiscard]] virtual bool eof() const noexcept = 0;
+
+  /** Create a cluster index scan cursor.
+  @param[in,out] ctx            DDL context.
+  @return a cursor instance or nullptr (if OOM). */
+  static Cursor *create_cursor(ddl::Context &ctx) noexcept;
+
+ public:
+  /** DDL context. */
+  ddl::Context &m_ctx;
+
+  /** Scoped heap to use for rows. */
+  Scoped_heap m_row_heap{};
+
+  /** Scoped heap to use for tuple instances. */
+  Scoped_heap m_tuple_heap{};
+
+  /** Previous fields. */
+  dfield_t *m_prev_fields{};
+};
+
+}  // namespace ddl
+
+#endif /* !ddl0impl-cursor_h */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/ddl0impl-file-reader.h mysql-8.0-8.0.27/storage/innobase/include/ddl0impl-file-reader.h
--- mysql-8.0-8.0.26/storage/innobase/include/ddl0impl-file-reader.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/ddl0impl-file-reader.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,157 @@
+/*****************************************************************************
+
+Copyright (c) 2020, 2021, Oracle and/or its affiliates. All Rights Reserved.
+
+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, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
+/** @file include/ddl0impl-file-reader.h
+ For scanning the temporary file.
+ Created 2020-11-01 by Sunny Bains. */
+
+#ifndef ddl0impl_file_reader_h
+#define ddl0impl_file_reader_h
+
+#include "ddl0impl-buffer.h"
+
+namespace ddl {
+
+// Forward declaration
+struct File_cursor;
+
+/** Read rows from the temporary file. */
+struct File_reader : private ut::Non_copyable {
+  /** Constructor.
+  @param[in] fd                 Open file descriptors.
+  @param[in,out] index          Index that the rows belong to.
+  @param[in] buffer_size        Size of file buffer for reading.
+  @param[in] size               File size in bytes. */
+  File_reader(os_fd_t fd, dict_index_t *index, size_t buffer_size,
+              os_offset_t size) noexcept
+      : m_index(index), m_fd(fd), m_size(size), m_buffer_size(buffer_size) {
+    ut_a(size > 0);
+    ut_a(m_buffer_size > 0);
+    ut_a(m_index != nullptr);
+    ut_a(fd != OS_FD_CLOSED);
+  }
+
+  /** Destructor. */
+  ~File_reader() noexcept {
+    if (m_aux_buf != nullptr) {
+      ut::delete_arr(m_aux_buf);
+    }
+  }
+
+  /** Prepare the file for reading.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t prepare() noexcept;
+
+  /** The current row as a tuple. Note: the tuple only does a shallow copy.
+  @param[in,out] builder        Index builder instance.
+  @param[in,out] heap           Heap to use for allocation.
+  @param[out] dtuple            Row converted to a tuple.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t get_tuple(Builder *builder, mem_heap_t *heap,
+                                  dtuple_t *&dtuple) noexcept;
+
+  /** Seek to the offset and read the page in.
+  @param[in] offset              Offset to read in.
+  @return DB_SUCCESS or error code. */
+  dberr_t read(os_offset_t offset) noexcept;
+
+  /** Set the range or rows to traverse.
+  @param[in] offset              New offset to read from. */
+  void set_offset(os_offset_t offset) noexcept { m_offset = offset; }
+
+  /** @return true if the range first == second. */
+  [[nodiscard]] bool eof() const noexcept { return m_offset == m_size; }
+
+  /** @return the number of rows read from the file. */
+  [[nodiscard]] uint64_t get_n_rows_read() const noexcept {
+    return m_n_rows_read;
+  }
+
+ private:
+  /** Seek to the start of the range and load load the page.
+  @param[in] offset              Offset to read in.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t seek(os_offset_t offset) noexcept;
+
+  /** Advance page number to the next and read in.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t read_next() noexcept;
+
+  /** Advance the "cursor".
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t next() noexcept;
+
+ public:
+  using Offsets = std::vector<ulint, ut::allocator<ulint>>;
+
+  /** Index that the records belong to. */
+  dict_index_t *m_index{};
+
+  /** Pointer to current row. */
+  const mrec_t *m_mrec{};
+
+  /** Columns offsets. */
+  Offsets m_offsets{};
+
+  /** File handle to read from. */
+  os_fd_t m_fd{OS_FD_CLOSED};
+
+ private:
+  using Bounds = std::pair<const byte *, const byte *>;
+
+  /** Size of the file in bytes. */
+  os_offset_t m_size{};
+
+  /** Offset to read. */
+  os_offset_t m_offset{};
+
+  /** Pointer current offset within file buffer. */
+  const byte *m_ptr{};
+
+  /** File buffer bounds. */
+  Bounds m_bounds{};
+
+  /** Auxilliary buffer for records that span across pages. */
+  byte *m_aux_buf{};
+
+  /** IO buffer size in bytes. */
+  size_t m_buffer_size{};
+
+  /** Aligned IO buffer. */
+  Aligned_buffer m_aligned_buffer{};
+
+  /** File buffer for reading. */
+  IO_buffer m_io_buffer{};
+
+  /** Number of rows read from the file. */
+  uint64_t m_n_rows_read{};
+
+  friend File_cursor;
+};
+
+}  // namespace ddl
+
+#endif /* ddl0impl_file_reader_h */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/ddl0impl.h mysql-8.0-8.0.27/storage/innobase/include/ddl0impl.h
--- mysql-8.0-8.0.26/storage/innobase/include/ddl0impl.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/ddl0impl.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,189 @@
+/*****************************************************************************
+
+Copyright (c) 2005, 2021, Oracle and/or its affiliates. All Rights Reserved.
+
+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, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
+/** @file include/ddl0impl.h
+ DDL implementation include file.
+ Created 2020-11-01 by Sunny Bains. */
+
+#ifndef ddl0impl_h
+#define ddl0impl_h
+
+#include "ddl0ddl.h"
+#include "dict0mem.h"
+#include "ut0class_life_cycle.h"
+#include "ut0mpmcbq.h"
+
+namespace ddl {
+
+/** Cluster index ID (always the first index). */
+static constexpr size_t SERVER_CLUSTER_INDEX_ID = 0;
+
+/** @brief Block size for DDL I/O operations. The minimum is UNIV_PAGE_SIZE,
+or page_get_free_space_of_empty() rounded to a power of 2. */
+using IO_buffer = std::pair<byte *, os_offset_t>;
+
+/** Called when a log free check is required. */
+using Latch_release = std::function<dberr_t()>;
+
+/* Ignore posix_fadvise() on those platforms where it does not exist */
+#if defined _WIN32
+#define posix_fadvise(fd, offset, len, advice) /* nothing */
+#endif                                         /* _WIN32 */
+
+// Forward declaration.
+struct Cursor;
+struct Builder;
+
+using Builders = std::vector<Builder *, ut::allocator<Builder *>>;
+
+/** Start offsets in the file, from where to merge records. */
+using Merge_offsets = std::deque<os_offset_t, ut::allocator<os_offset_t>>;
+
+/** Information about temporary files used in merge sort */
+struct file_t {
+  /** File descriptor */
+  os_fd_t m_fd{OS_FD_CLOSED};
+
+  /** Size of the file in bytes. */
+  os_offset_t m_size;
+
+  /** Number of records in the file */
+  uint64_t m_n_recs{};
+};
+
+/** Fetch the document ID from the table. */
+struct Fetch_sequence : public Context::FTS::Sequence {
+  /** Constructor.
+  @param[in] index              Document ID index. */
+  explicit Fetch_sequence(dict_index_t *index) noexcept : m_index(index) {
+    ut_a(m_index->type & DICT_FTS);
+    m_max_doc_id = m_doc_id = 0;
+  }
+
+  /** Destructor. */
+  ~Fetch_sequence() noexcept override {}
+
+  /** Not supported.
+  @return the current document ID. */
+  [[nodiscard]] doc_id_t current() noexcept override {
+    ut_error;
+    return 0;
+  }
+
+  /** Not supported. */
+  void increment() noexcept override { ut_error; }
+
+  /** Get the next document ID.
+  @param[in] dtuple             Row from which to fetch ID.
+  @return the document ID from the row. */
+  [[nodiscard]] doc_id_t fetch(const dtuple_t *dtuple) noexcept override;
+
+  /** @return the number of document IDs generated. */
+  doc_id_t generated_count() const noexcept override {
+    ut_error;
+    return 0;
+  }
+
+  /** @return the maximum document ID seen so far. */
+  [[nodiscard]] doc_id_t max_doc_id() const noexcept override {
+    return m_max_doc_id;
+  }
+
+  /** @return false, because we never generate the document ID. */
+  [[nodiscard]] bool is_generated() const noexcept override { return false; }
+
+  /** The document ID index. */
+  dict_index_t *m_index{};
+
+  /** Maximum document ID seen so far. */
+  doc_id_t m_max_doc_id{};
+};
+
+/** Physical row context. */
+struct Row {
+  /** Constructor. */
+  Row() = default;
+
+  Row(const Row &) = default;
+
+  /** Destructor. */
+  ~Row() = default;
+
+  /** Build a row from a raw record.
+  @param[in,out] ctx            DDL context.
+  @param[in,out] index          Index the record belongs to.
+  @param[in,out] heap           Heap to use for allocation.
+  @param[in] type               Copy pointers or copy data.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t build(ddl::Context &ctx, dict_index_t *index,
+                              mem_heap_t *heap, size_t type) noexcept;
+
+  /** Externally stored fields. */
+  row_ext_t *m_ext{};
+
+  /** Column offsets. */
+  ulint *m_offsets{};
+
+  /** Row data. */
+  const rec_t *m_rec{};
+
+  /** DTuple data, mapped over m_rec. */
+  const dtuple_t *m_ptr{};
+
+  /** Add column data values. */
+  dtuple_t *m_add_cols{};
+};
+
+/** Create a merge file int the given location.
+@param[out] file                Temporary generated during DDL.
+@param[in] path                 Location for creating temporary file
+@return file descriptor, or OS_FD_CLOSED  on failure */
+[[nodiscard]] os_fd_t file_create(file_t *file, const char *path) noexcept;
+
+/** Write a merge block to the file system.
+@param[in] fd                   File descriptor
+@param[in] ptr                  Buffer to write.
+@param[in] size                 Number of bytes to write.
+@param[in] offset               Byte offset where to write.
+@return DB_SUCCESS or error code */
+dberr_t pwrite(os_fd_t fd, void *ptr, size_t size, os_offset_t offset) noexcept;
+
+/** Read a merge block from the file system.
+@param[in] fd                   file descriptor.
+@param[out] ptr                 Buffer to read into.
+@param[in] len                  Number of bytes to read.
+@param[in] offset               Byte offset to start reading from.
+@return DB_SUCCESS or error code */
+[[nodiscard]] dberr_t pread(os_fd_t fd, void *ptr, size_t len,
+                            os_offset_t offset) noexcept;
+
+/** Destroy a merge file.
+@param[out] file                Temporary generated during DDL. */
+void file_destroy(file_t *file) noexcept;
+
+}  // namespace ddl
+
+#endif /* ddl0impl_h */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/ddl0impl-loader.h mysql-8.0-8.0.27/storage/innobase/include/ddl0impl-loader.h
--- mysql-8.0-8.0.26/storage/innobase/include/ddl0impl-loader.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/ddl0impl-loader.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,131 @@
+/*****************************************************************************
+
+Copyright (c) 2020, 2021, Oracle and/or its affiliates. All Rights Reserved.
+
+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, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
+/** @file include/ddl0impl-loader.h
+ DDL index loader interface.
+ Created 2020-11-01 by Sunny Bains. */
+
+#ifndef ddl0impl_loader_h
+#define ddl0impl_loader_h
+
+#include "ddl0fts.h"
+#include "ddl0impl-buffer.h"
+#include "ut0mpmcbq.h"
+
+namespace ddl {
+
+/** Build indexes on a table by reading a clustered index, creating a temporary
+file containing index entries, merge sorting these index entries and inserting
+sorted index entries to indexes. */
+class Loader {
+ public:
+  /** Builder task. */
+  struct Task {
+    /** Constructor. */
+    Task() = default;
+
+    /** Constructor.
+    @param[in,out] builder        Builder that performs the operation. */
+    explicit Task(Builder *builder) : m_builder(builder) {}
+
+    /** Constructor.
+    @param[in,out] builder        Builder that performs the operation.
+    @param[in] thread_id          Index value of the thread_state to work on. */
+    explicit Task(Builder *builder, size_t thread_id)
+        : m_builder(builder), m_thread_id(thread_id) {}
+
+    /** Do the operation.
+    @return DB_SUCCESS or error code. */
+    [[nodiscard]] dberr_t operator()() noexcept;
+
+   private:
+    /** Builder instance. */
+    Builder *m_builder{};
+
+    /** Thread state index. */
+    size_t m_thread_id{std::numeric_limits<size_t>::max()};
+
+    friend class Loader;
+  };
+
+  // Forward declaration
+  class Task_queue;
+
+  /** Constructor.
+  @param[in,out] ctx            DDL context. */
+  explicit Loader(ddl::Context &ctx) noexcept;
+
+  /** Destructor. */
+  ~Loader() noexcept;
+
+  /** Build the read instance.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t build_all() noexcept;
+
+  /** Add a task to the task queue.
+  @param[in] task               Task to add. */
+  void add_task(Task task) noexcept;
+
+  /** Validate the indexes (except FTS).
+  @return true on success. */
+  [[nodiscard]] bool validate_indexes() const noexcept;
+
+ private:
+  /** Prepare to build and load the indexes.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t prepare() noexcept;
+
+  /** Load the indexes.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t load() noexcept;
+
+  /** Scan and build the indexes.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t scan_and_build_indexes() noexcept;
+
+ private:
+  /** DDL context, shared by the loader threads. */
+  ddl::Context &m_ctx;
+
+  /** If true then use parallel scan and index build. */
+  bool m_parallel{};
+
+  /** Sort buffer size. */
+  size_t m_sort_buffer_size{};
+
+  /** IO buffer size. */
+  size_t m_io_buffer_size{};
+
+  /** Index builders. */
+  Builders m_builders{};
+
+  /** Task queue. */
+  Task_queue *m_taskq{};
+};
+
+}  // namespace ddl
+
+#endif /* !ddl0impl_loader_h */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/ddl0impl-merge.h mysql-8.0-8.0.27/storage/innobase/include/ddl0impl-merge.h
--- mysql-8.0-8.0.26/storage/innobase/include/ddl0impl-merge.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/ddl0impl-merge.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,122 @@
+/*****************************************************************************
+
+Copyright (c) 2020, 2021, Oracle and/or its affiliates. All Rights Reserved.
+
+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, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
+/** @file include/ddl0impl-merge.h
+ DDL cluster merge sort data structures.
+ Created 2020-11-01 by Sunny Bains. */
+
+#ifndef ddl0impl_merge_h
+#define ddl0impl_merge_h
+
+#include "ddl0impl-file-reader.h"
+
+namespace ddl {
+
+// Forward declaration.
+struct Builder;
+
+/** Merge the blocks in the file. */
+struct Merge_file_sort {
+  // Forward declarations.
+  struct Cursor;
+  struct Output_file;
+
+  /** The design is generalized as an N way merge, however we stick
+  with 2 for now. */
+  static constexpr size_t N_WAY_MERGE = 2;
+
+  /** Context to use for merging the files/runs. */
+  struct Context {
+    /** File to sort. */
+    ddl::file_t *m_file{};
+
+    /** For reporting duplicates, it has the index instance too. */
+    Dup *m_dup{};
+
+    /** Number of scan threads used, for memory buffer calculation. */
+    size_t m_n_threads{};
+
+    /** PFS progress monitoring. */
+    Alter_stage *m_stage{};
+  };
+
+  /** Start of the record lists to merge. */
+  using Range = std::pair<os_offset_t, os_offset_t>;
+
+  /** Constructor.
+  @param[in,out] merge_ctx      Data blocks merge meta data. */
+  explicit Merge_file_sort(Context *merge_ctx) noexcept
+      : m_merge_ctx(merge_ctx) {}
+
+  /** Merge the the blocks.
+  @param[in,out] builder        Builder instance used for building index.
+  @param[in,out] offsets        Offsets from where to start the merge.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t sort(Builder *builder, Merge_offsets &offsets) noexcept;
+
+  /** @return the number of rows in the sorted file. */
+  [[nodiscard]] uint64_t get_n_rows() const noexcept { return m_n_rows; }
+
+ private:
+  /** Merge the rows.
+  @param[in,out] cursor         To iterate over the rows to merge.
+  @param[in,out] output_file    Output file to write the merged rows.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t merge_rows(Cursor &cursor,
+                                   Output_file &output_file) noexcept;
+
+  /** Merge the blocks in the ranges.
+  @param[in,out] cursor         To iterate over the rows to merge.
+  @param[in,out] offsets        Starting offsets of record lists to merge.
+  @param[in,out] output_file    Output file to write the merged rows.
+  @param[in] buffer_size        IO buffer size for reads.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t merge_ranges(Cursor &cursor, Merge_offsets &offsets,
+                                     Output_file &output_file,
+                                     size_t buffer_size) noexcept;
+
+  /** Move to the next range of pages to merge.
+  @param[in,out] offsets         Current offsets to start the merge from.
+  @return the next range to merge. */
+  Range next_range(Merge_offsets &offsets) noexcept;
+
+ private:
+  /** To check and report duplicates. */
+  Dup *m_dup{};
+
+  /** Meta data for merging blocks. */
+  Context *m_merge_ctx{};
+
+  /** Page numbers to merge for the next pass. */
+  Merge_offsets m_next_offsets{};
+
+  /** Number of rows in the sorted file. */
+  uint64_t m_n_rows{};
+};
+
+}  // namespace ddl
+
+#endif /* !ddl0impl_merge_h */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/ddl0impl-rtree.h mysql-8.0-8.0.27/storage/innobase/include/ddl0impl-rtree.h
--- mysql-8.0-8.0.26/storage/innobase/include/ddl0impl-rtree.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/ddl0impl-rtree.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,109 @@
+
+/*****************************************************************************
+
+Copyright (c) 2020, 2021, Oracle and/or its affiliates. All Rights Reserved.
+
+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, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
+/** @file include/ddl0impl-rtree.h
+ DDL RTree insert interface.
+ Created 2020-11-01 by Sunny Bains. */
+
+#ifndef ddl0impl_rtree_h
+#define ddl0impl_rtree_h
+
+#include "ddl0fts.h"
+#include "ddl0impl.h"
+#include "row0pread.h"
+
+namespace ddl {
+
+/** Class that caches RTree index tuples made from a single cluster
+index page scan, and then insert into corresponding index tree. */
+class RTree_inserter {
+ public:
+  /** Constructor.
+  @param[in,out] ctx            DDL context.
+  @param[in]	index	            Index to be created */
+  RTree_inserter(Context &ctx, dict_index_t *index) noexcept;
+
+  /** Destructor */
+  ~RTree_inserter() noexcept;
+
+  /** @return true if initialization succeeded . */
+  [[nodiscard]] bool is_initialized() noexcept {
+    return m_dtuple_heap != nullptr && m_dml_heap != nullptr;
+  }
+
+  /** Get the index instance.
+  @return the index instance. */
+  [[nodiscard]] dict_index_t *get_index() noexcept { return m_index; }
+
+  /** Caches an index row into index tuple vector
+  @param[in] row	              Table row
+  @param[in] ext	              Externally stored column
+  prefixes, or nullptr */
+  void add_to_batch(const dtuple_t *row, const row_ext_t *ext) noexcept;
+
+  /** Insert the rows cached in the batch (m_dtuples).
+  @param[in]	trx_id		        Transaction id.
+  @param[in,out] latch_release  Called when a log free check is required.
+  @return DB_SUCCESS if successful, else error number */
+  [[nodiscard]] dberr_t batch_insert(trx_id_t trx_id,
+                                     Latch_release &&latch_release) noexcept;
+
+  /** Deep copy the fields pointing to the clustered index record. */
+  void deep_copy_tuples() noexcept { deep_copy_tuples(m_dtuples->begin()); }
+
+ private:
+  /** Cache index rows made from a cluster index scan. Usually
+  for rows on single cluster index page */
+  using Tuples = std::vector<dtuple_t *, ut::allocator<dtuple_t *>>;
+
+  /** Deep copy the fields pointing to the clustered index record.
+  @param[in] it                 Deep copy from this tuple onwards. */
+  void deep_copy_tuples(Tuples::iterator it) noexcept;
+
+ private:
+  /** vector used to cache index rows made from cluster index scan */
+  Tuples *m_dtuples{};
+
+  /** Memory heap for creating index tuples */
+  mem_heap_t *m_dtuple_heap{};
+
+  /** Memory heap for inserting the tuples */
+  mem_heap_t *m_dml_heap{};
+
+  /** the index being built */
+  dict_index_t *m_index{};
+
+  /** Iterator to process m_dtuples */
+  Tuples::iterator m_iter{};
+
+  /** DDL context. */
+  Context &m_ctx;
+};
+
+}  // namespace ddl
+
+#endif /* !ddl0impl-rtree_h */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/detail/ut/aligned_alloc.h mysql-8.0-8.0.27/storage/innobase/include/detail/ut/aligned_alloc.h
--- mysql-8.0-8.0.26/storage/innobase/include/detail/ut/aligned_alloc.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/detail/ut/aligned_alloc.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,713 @@
+/*****************************************************************************
+
+Copyright (c) 2021, Oracle 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, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
+/** @file include/detail/ut/aligned_alloc.h
+ Implementation bits and pieces for aligned allocations. */
+
+#ifndef detail_ut_aligned_alloc_h
+#define detail_ut_aligned_alloc_h
+
+#include <cassert>
+#include <cstddef>
+#include <cstdint>
+#include <cstdlib>
+#include <cstring>
+#include <limits>
+#include <memory>
+#include <utility>
+
+#include "my_compiler.h"
+#include "storage/innobase/include/detail/ut/allocator_traits.h"
+#include "storage/innobase/include/detail/ut/helper.h"
+#include "storage/innobase/include/detail/ut/pfs.h"
+
+namespace ut {
+namespace detail {
+
+struct Aligned_alloc_impl {
+  /** Block of memory returned by this functor will have an additional
+      (metadata) segment (at no additional cost of higher memory consumption)
+      which is guaranteed to be this big, and which can be used to store
+      whatever arbitrary data. See Aligned_alloc and Aligned_alloc_arr for
+      exemplary usages of it.
+   */
+  static constexpr uint32_t metadata_size = alignof(max_align_t);
+
+  /** Alias that we will be using to denote ptr to DATA segment. */
+  using data_segment_ptr = void *;
+
+  /** Dynamically allocates storage of given size and at the address aligned to
+      the requested alignment.
+
+      It is guaranteed that storage allocated by this functor is always
+      (size + alignment) big _and_ that there is always
+      alignof(std::max_align_t) spare bytes within that segment which can be
+      freely used. This means that pointer which is returned by this function
+      can always be safely reversed by alignof(std::max_align_t) bytes and hence
+      make this sub-segment accessible to any subsequent implementation.
+
+      Reversing the pointer for a value which is bigger than
+      alignof(std::max_align_t) bytes is in certain cases possible and can be
+      checked by inspecting the returned offset value. Some more specialized
+      implementations can take advantage of that fact too.
+
+      This property is very important because it can be taken advantage of by
+      other implementations so they are able to store whatever metadata they
+      would like into this segment of alignof(std::max_align_t) bytes, or FWIW
+      (pointer - offset) bytes in more specialized cases.
+
+      For example, let's say that size=10, alignment=32, and underlying
+      allocation function used by this function implementation returns a pointer
+      at address 128. This address must be a multiple of
+      alignof(std::max_align_t) which in this example is 16.
+
+           ------------------------------
+           | VARLEN |   META  |   DATA  |
+           ------------------------------
+           128      144       160     170
+
+      DATA is an actual data which has been requested with given size (10) and
+      alignment (32).
+      META is the alignof(std::max_align_t) segment that can always be freely
+      used by other implementations.
+      VARLEN is the leftover variable-length segment that specialized
+      implementations can further make use of by deducing its size from returned
+      offset.
+
+      See Aligned_alloc and Aligned_alloc_arr implementations to see an example
+      of how META segment can be used.
+
+      @param[in] size Size of storage (in bytes) requested to be allocated.
+      @param[in] alignment Alignment requirement for storage to be allocated.
+      Must be power of two and larger than alignof(std::max_align_t).
+      @return {pointer, offset} where pointer is a pointer to dynamically
+      allocated storage aligned to requested alignment, and offset is distance
+      in bytes from pointer which has been originally returned by underlying
+      dynamic allocation function (e.g. std::malloc). Otherwise {nullptr, 0} if
+      dynamic storage allocation failed.
+   */
+  template <bool Zero_initialized>
+  static inline std::pair<data_segment_ptr, std::size_t> alloc(
+      std::size_t size, std::size_t alignment) noexcept {
+    // This API is only about the extended alignments. Non-extended are
+    // already handled with std::malloc.
+    assert(alignment > alignof(std::max_align_t));
+
+    // Here we can take advantage of the fact that std::malloc is always
+    // guaranteed to return suitably aligned pointer P. In other words, this
+    // means that pointer P will be aligned to the value of
+    // alignof(std::max_align_t). That value on Linux implementations is
+    // typically 8 bytes (x86) or 16 bytes (x86-64) but this is completely
+    // implementation-defined. Windows implementation, for example, defines this
+    // value to be 8 bytes for both x86 _and_ x86-64.
+    //
+    // Question which arises is how many bytes do we need to ask std::malloc in
+    // order to satisfy the requested alignment, A, and requested size, S.
+    //
+    // Short answer is (size + alignment) and you can skip the following section
+    // if you're not interested in how we got to that value.
+    //
+    // Long answer is that we can model the problem mathematically as follows:
+    //    A = alignment
+    //    S = size
+    //    P = std::malloc(N);
+    //    P % alignof(std::max_align_t) = 0;
+    // where
+    //    N is our unknown and for which we can only say that:
+    //      N = S + K
+    //    is true where K is also some unknown value.
+    //
+    // (A) In cases when P % A = 0, we know that we are already at suitable
+    // address so we can deduce that:
+    //    K = 0
+    // from which it follows that:
+    //    N = S + K = S
+    //
+    // (B) In cases when P % A != 0, our K must be sufficiently large so that
+    //    <P, P + K]
+    // range contains value, P', so that
+    //    P' % A = 0
+    // If K = A, then
+    //    <P, P + A]
+    // which can be expanded as
+    //    <P, P + 1, P + 2, P + 3, ..., P + A]
+    //
+    // If we know that
+    //    P % A != 0
+    // then we also know that
+    //    (P + A) % A = P % A + A % A = P % A + 0 = P % A != 0
+    // which implies that our P' value is in
+    //    <P, P + A>
+    // range.
+    //
+    // Given that
+    //    P % alignof(std::max_align_t) = 0
+    //    P' % A = 0
+    //    A % alignof(std::max_align_t) = 0
+    //    P' % alignof(std::max_align_t) = 0
+    // it follows that our P' value can only be found at
+    //    P' = P + L*alignof(std::max_align_t)
+    // increments where L is some constant value in range of
+    //    L = [1, x>
+    // Expanding <P, P + A> into what we know so far:
+    //    <P, ..., P + L*alignof(std::max_align_t), ..., P + A>
+    // it follows that
+    //    P + L*alignof(std::max_align_t) < P + A
+    // which equals to
+    //    L*alignof(std::max_align_t) < A
+    //
+    // We now just need to prove that
+    //    L*alignof(std::max_align_t) < A
+    // is always true for some L value in which case this would mean that our
+    // <P, P + A> range contains at least one value for which P' % = 0.
+    //
+    // Picking the first available L value from L = [1, x> range,
+    // we will get
+    //    1*alignof(std::max_align_t) < A
+    // Given that
+    //    A > 2*alignof(std::max_align_t) - 1
+    // must be true, it follows that
+    //    1*alignof(std::max_align_t) < 2*alignof(std::max_align_t) - 1 < A
+    // and
+    //    1*alignof(std::max_align_t) < 2*alignof(std::max_align_t) - 1
+    //    alignof(std::max_align_t) > 1
+    // is always true.
+    //
+    // To conclude:
+    //    (1) N = S       for P % A = 0
+    //    (2) N = S + A   for P % A != 0
+    //
+    // Given that P is a runtime value which we cannot know upfront we must opt
+    // for N = S + A.
+    const std::size_t data_len = size + alignment;
+    void *mem = Alloc_fn<Zero_initialized>::alloc(data_len);
+    if (unlikely(!mem)) return {nullptr, 0};
+
+    // To guarantee that storage allocated by this function is as advertised
+    // (exactly (size + alignment) big with at least alignof(std::max_align_t)
+    // spare bytes to be used from within that segment) we must handle the N = S
+    // case (see above) and offset the memory by 1 byte. Given the above proof
+    // we know that the next suitable address aligned to requested alignment
+    // must be at least alignof(std::max_align_t) bytes far away.
+    void *buf =
+        reinterpret_cast<void *>(reinterpret_cast<std::uintptr_t>(mem) + 1);
+    std::size_t buf_size = data_len - 1;
+
+    // TODO(jbakamovic): wrap following std::align expression with ut_a(...)
+    // after we clean up circular-dependencies from our headers. Until then, it
+    // is not possible as including ut0dbg.h header makes the build fail in
+    // mysterious ways.
+    [[maybe_unused]] auto ret = std::align(alignment, size, buf, buf_size);
+    assert(ret != nullptr);
+
+    return {buf, reinterpret_cast<std::uintptr_t>(buf) -
+                     reinterpret_cast<std::uintptr_t>(mem)};
+  }
+
+  /** Releases storage allocated through alloc().
+
+      @param[in] ptr data_segment_pointer decreased by offset bytes. Both are
+      obtained through alloc().
+  */
+  static inline void free(void *ptr) noexcept { std::free(ptr); }
+};
+
+/** Memory layout representation of metadata segment guaranteed by
+    the inner workings of Aligned_alloc_impl.
+
+     ----------------------------------------------------
+     | VARLEN | ALIGNED-ALLOC-META |    ... DATA ...    |
+     ----------------------------------------------------
+                 ^                  ^
+                 |                  |
+                 |                  |
+                 |         ptr returned by Aligned_alloc_impl
+                 |
+                --------------------------------
+                |    META_2    |     META_1    |
+                --------------------------------
+                 \                              \
+                  0                              \
+                                                  \
+                                        alignof(max_align_t) - 1
+
+   VARLEN and ALIGNED-ALLOC-META are direct byproduct of Aligned_alloc_impl
+   layout and guarantees.
+
+   VARLEN is the leftover variable-length segment that specialized
+   implementations can further make use of by deducing its size from returned
+   offset. Not used by this implementation.
+
+   ALIGNED-ALLOC-META is the segment which this abstraction is about. It
+   can hold up to sizeof(META_1) + sizeof(META_2) bytes which is, due to
+   Aligned_alloc_impl guarantees, at most alignof(max_align_t) bytes large.
+   Providing larger data than supported is not possible and it is guarded
+   through the means of static_assert. META_1 and META_2 fields can be
+   arbitrarily sized meaning that they can even be of different sizes each.
+
+   DATA is an actual segment which will keep the user data.
+  */
+template <typename Meta_1_type, typename Meta_2_type>
+struct Aligned_alloc_metadata {
+  /** Convenience types that we will be using to serialize necessary details
+      into the metadata segment.
+   */
+  using meta_1_t = Meta_1_type;
+  using meta_2_t = Meta_2_type;
+  using unaligned_meta_2_t = meta_2_t;
+
+  /** Metadata size */
+  static constexpr auto allocator_metadata_size =
+      sizeof(meta_1_t) + sizeof(meta_2_t);
+  /** Max metadata size */
+  static constexpr auto max_metadata_size = Aligned_alloc_impl::metadata_size;
+  /** Bail out if we cannot fit the requested data size. */
+  static_assert(allocator_metadata_size <= max_metadata_size,
+                "Aligned_alloc_impl provides a strong guarantee "
+                "of only up to Aligned_alloc_impl::metadata_size bytes.");
+
+  /** Helper function which stores user-provided detail into the META_1 field.
+   */
+  static inline void meta_1(Aligned_alloc_impl::data_segment_ptr data,
+                            std::size_t meta_1_v) noexcept {
+    assert(meta_1_v <= std::numeric_limits<meta_1_t>::max());
+    *ptr_to_meta_1(data) = meta_1_v;
+  }
+  /** Helper function which stores user-provided detail into the META_2 field.
+   */
+  static inline void meta_2(Aligned_alloc_impl::data_segment_ptr data,
+                            std::size_t meta_2_v) noexcept {
+    assert(meta_2_v <= std::numeric_limits<meta_2_t>::max());
+    memcpy(ptr_to_meta_2(data), &meta_2_v, sizeof(meta_2_t));
+  }
+  /** Helper function which recovers the information user previously stored in
+      META_1 field.
+   */
+  static inline meta_1_t meta_1(
+      Aligned_alloc_impl::data_segment_ptr data) noexcept {
+    return *ptr_to_meta_1(data);
+  }
+  /** Helper function which recovers the information user previously stored in
+      META_2 field.
+   */
+  static inline meta_2_t meta_2(
+      Aligned_alloc_impl::data_segment_ptr data) noexcept {
+    meta_2_t meta_2_v;
+    memcpy(&meta_2_v, ptr_to_meta_2(data), sizeof(meta_2_t));
+    return meta_2_v;
+  }
+
+ private:
+  /** Helper accessor function to metadata (offset). */
+  static inline meta_1_t *ptr_to_meta_1(
+      Aligned_alloc_impl::data_segment_ptr data) noexcept {
+    return reinterpret_cast<meta_1_t *>(data) - 1;
+  }
+  /** Helper accessor function to metadata (data length). */
+  static inline unaligned_meta_2_t *ptr_to_meta_2(
+      Aligned_alloc_impl::data_segment_ptr data) noexcept {
+    return reinterpret_cast<meta_2_t *>(ptr_to_meta_1(data)) - 1;
+  }
+};
+
+/** Aligned allocation routines.
+
+    They're implemented in terms of Aligned_alloc_impl (and
+    Aligned_alloc_metadata), and given the guarantees it provides,
+    Aligned_alloc::alloc() is able to encode offset and requested
+    allocation datalen into the metadata section without sacrificing memory or
+    making the implementation or end usage more complex.
+
+    Serializing offset into the metadata is what will enable
+    Aligned_alloc::free() to later on recover original pointer returned by
+    the underlying Aligned_alloc_impl allocation mechanism (std::malloc,
+    std::calloc) and consequently be able to appropriately release it
+    (std::free).
+
+    Serializing requested allocation datalen into the metadata is what will
+    enable higher-kinded functions, implemented on top of Aligned_alloc, to
+    take necessary actions such as cleaning up the resources by invoking
+    appropriate number of destructors of non-trivially-destructible types.
+    Otherwise, this would create a burden on end users by having to remember and
+    carry the array size all around the code. This is equivalent to what we find
+    in other standard implementations. For example, new int x[10] is always
+    released without passing the array size: delete[] x; The same holds with
+    this design.
+
+    Memory layout representation looks like the following:
+
+     ----------------------------------------------------
+     | VARLEN | ALIGNED-ALLOC-META |    ... DATA ...    |
+     ----------------------------------------------------
+                 ^                  ^
+                 |                  |
+                 |                  |
+                 |          ptr returned by Aligned_alloc_impl
+                 |
+                -----------------------------------
+                |   DATALEN    |   VARLEN-OFFSET  |
+                -----------------------------------
+                 \                                 \
+                  0                                 \
+                                                     \
+                                           alignof(max_align_t) - 1
+
+    VARLEN and ALIGNED-ALLOC-META are direct byproduct of Aligned_alloc_impl
+    layout and guarantees.
+
+    VARLEN is the leftover variable segment of bytes that specialized
+    implementations can further make use of by deducing its size from returned
+    offset. Not used by this implementation.
+
+    DATALEN field in ALIGNED-ALLOC-META segment encodes the total length of DATA
+    segment, which is the actual allocation size that client code has requested.
+
+    VARLEN-OFFSET in ALIGNED-ALLOC-META segment encodes the offset to VARLEN
+    segment which represents the original pointer obtained by underlying
+    allocation Aligned_alloc_impl mechanism.
+ */
+struct Aligned_alloc : public allocator_traits<false> {
+  using allocator_metadata = Aligned_alloc_metadata<uint32_t, uint32_t>;
+
+  /** Dynamically allocates storage of given size and at the address aligned
+      to the requested alignment.
+
+      @param[in] size Size of storage (in bytes) requested to be allocated.
+      @param[in] alignment Alignment requirement for storage to be allocated.
+      @return Pointer to the allocated storage. nullptr if dynamic storage
+      allocation failed.
+   */
+  template <bool Zero_initialized>
+  static inline void *alloc(std::size_t size, std::size_t alignment) {
+    auto ret = Aligned_alloc_impl::alloc<Zero_initialized>(size, alignment);
+    if (likely(ret.first)) {
+      // We are here taking advantage of Aligned_alloc_impl(S, A) for which
+      // we know that it will always return pointer P and offset O such that:
+      //   1. (P - O) expression is always well-defined.
+      //   2. And O is never less than alignof(std::max_align_t), that is
+      //      Aligned_alloc_impl::metadata_size.
+      //
+      // Practically, this means that we can encode whatever metadata we want
+      // into [P - O, P> segment of memory whose length corresponds to
+      // the value of alignof(std::max_align_t). Commonly, this value is 8 bytes
+      // on 32-bit platforms and 16 bytes on 64-bit platforms but not always
+      // (e.g. Windows) and which is why we have to handle it in more generic
+      // way to be fully portable.
+      //
+      // Here we encode the offset so we can later on recover the
+      // original pointer, P' = (P - O), from within Aligned_alloc::free(P)
+      // context. Similarly, we encode the requested allocation datalen.
+      allocator_metadata::meta_1(ret.first, ret.second);
+      allocator_metadata::meta_2(ret.first, size);
+    }
+    return ret.first;
+  }
+
+  /** Releases storage dynamically allocated through
+      Aligned_alloc::alloc().
+
+      @param[in] data Pointer to storage allocated through
+      Aligned_alloc::alloc()
+   */
+  static inline void free(Aligned_alloc_impl::data_segment_ptr data) noexcept {
+    if (unlikely(!data)) return;
+    // Here we make use of the offset which has been encoded by
+    // Aligned_alloc::alloc() to be able to deduce the original pointer and
+    // simply forward it to std::free.
+    Aligned_alloc_impl::free(deduce(data));
+  }
+
+  /** Returns the number of bytes requested to be allocated.
+
+      @param[in] data Pointer to storage allocated through
+      Aligned_alloc::alloc()
+      @return Number of bytes.
+   */
+  static inline allocator_metadata::meta_2_t datalen(
+      Aligned_alloc_impl::data_segment_ptr data) {
+    // Deducing the datalen field is straightforward, provided that
+    // data points to the DATA segment, which it is expected to do so.
+    return allocator_metadata::meta_2(data);
+  }
+
+ private:
+  /** Helper function which deduces the original pointer returned by
+      Aligned_alloc_impl from a pointer which is passed to us by the call-site.
+   */
+  static inline void *deduce(
+      Aligned_alloc_impl::data_segment_ptr data) noexcept {
+    // To recover the original pointer we just need to read the offset
+    // we have serialized into the first (allocator) metadata field.
+    auto offset = allocator_metadata::meta_1(data);
+    return reinterpret_cast<void *>(reinterpret_cast<std::uintptr_t>(data) -
+                                    offset);
+  }
+};
+
+/** Aligned allocation routines which are instrumented through PFS
+    (performance-schema).
+
+    They're implemented in terms of Aligned_alloc_impl (and
+    Aligned_alloc_metadata), and given the guarantees it provides,
+    Aligned_alloc::alloc() is able to encode offset and requested
+    allocation datalen into the metadata section without sacrificing memory or
+    making the implementation or end usage more complex.
+
+    Serializing offset into the metadata is what will enable
+    Aligned_alloc_pfs::free() to later on recover original pointer returned
+    by the underlying Aligned_alloc_impl allocation mechanism (std::malloc,
+    std::calloc) and consequently be able to appropriately release it
+    (std::free).
+
+    Serializing requested allocation datalen into the metadata is what will
+    enable higher-kinded functions, implemented on top of
+    Aligned_alloc_pfs, to take necessary actions such as cleaning up the
+    resources by invoking appropriate number of destructors of
+    non-trivially-destructible types. Otherwise, this would create a burden on
+    end users by having to remember and carry the array size all around the
+    code. This is equivalent to what we find in other standard implementations.
+    For example, new int x[10] is always released without passing the array
+    size: delete[] x; The same holds with this design.
+
+    PFS-wise this allocation routine will be storing the information that PFS
+    needs to do its own work:
+     * Owning thread
+     * Total length of bytes allocated
+     * Key
+
+    Memory layout representation looks like the following:
+
+  ------------------------------------------------------------------------------
+  | VARLEN1 | ALIGNED-ALLOC-META | PFS-META | VARLEN2 | PFS-META-OFFSET | DATA |
+  ------------------------------------------------------------------------------
+                ^                 ^    ^                                 ^
+                |                 |    |                                 |
+                |                 |   ---------------------------        |
+                |                 |   | OWNER |  DATALEN' | KEY |        |
+                |                 |   ---------------------------        |
+                |                 |                                      |
+                |            ptr returned by                             |
+                |           Aligned_alloc_impl                           |
+                |                                                        |
+                |                                ptr to be returned to call-site
+                |                                   will be pointing here
+                |
+               ------------------------------
+               |  DATALEN  | VARLEN1-OFFSET |
+               ------------------------------
+                \                            \
+                 0                            \
+                                               \
+                                     alignof(max_align_t) - 1
+
+    VARLEN1 and ALIGNED-ALLOC-META are direct byproduct of Aligned_alloc_impl
+    (and Aligned_alloc_metadata) layout and guarantees.
+
+    VARLEN1 is the leftover variable-length segment that specialized
+    implementations can further make use of by deducing its size from returned
+    offset. Not used by this implementation.
+
+    DATALEN field in ALIGNED-ALLOC-META segment encodes the total length of DATA
+    segment, which is the actual allocation size that client code has requested.
+
+    VARLEN1-OFFSET in ALIGNED-ALLOC-META segment encodes the offset to VARLEN1
+    segment which represents the original pointer obtained by underlying
+    allocation Aligned_alloc_impl mechanism.
+
+    PFS-META, VARLEN2 and PFS-META-OFFSET are memory layout representation of
+    PFS_metadata.
+
+    OWNER field encode the owning thread. DATALEN' field encodes total size
+    of memory consumed and not only the size of the DATA segment. KEY field
+    encodes the PFS/PSI key.
+
+    VARLEN2 is the leftover variable-length segment that specialized
+    implementations can further make use of by deducing its size from the
+    following formulae: requested_alignment - sizeof(PFS-META-OFFSET) -
+    sizeof(PFS-META). In code that would be alignment -
+    PFS_metadata::size. Not used by this implementation.
+
+    PFS-META-OFFSET is a field which allows us to recover the pointer to
+    PFS-META segment from a pointer to DATA segment. Having a pointer to
+    PFS-META segment allows us to deduce the VARLEN1-OFFSET field from
+    ALIGNED-ALLOC-META segment which finally gives us a pointer obtained by the
+    underlying allocation Aligned_alloc_impl mechanism.
+ */
+struct Aligned_alloc_pfs : public allocator_traits<true> {
+  using allocator_metadata = Aligned_alloc_metadata<uint32_t, uint32_t>;
+  using pfs_metadata = PFS_metadata;
+
+  /** Dynamically allocates storage of given size at the address aligned to the
+      requested alignment.
+
+      @param[in] size Size of storage (in bytes) requested to be allocated.
+      @param[in] alignment Alignment requirement for storage to be allocated.
+      @param[in] key PSI memory key to be used for PFS memory instrumentation.
+      @return Pointer to the allocated storage. nullptr if dynamic storage
+      allocation failed.
+   */
+  template <bool Zero_initialized>
+  static inline void *alloc(std::size_t size, std::size_t alignment,
+                            pfs_metadata::pfs_memory_key_t key) {
+    // We must take special care to allocate enough extra space to hold the
+    // PFS metadata (PFS-META + PFS-META-OFFSET) but we also need to take
+    // special care that the pointer which will be returned to the callee by
+    // this function will still be suitably over-aligned as requested. Both of
+    // these requirements can be fulfilled by finding the smallest multiple of
+    // requested alignment that is not smaller than actual PFS metadata size.
+    const auto metadata_len = calc_align(pfs_metadata::size, alignment);
+    const auto total_len = size + metadata_len;
+    auto ret =
+        Aligned_alloc_impl::alloc<Zero_initialized>(total_len, alignment);
+    if (unlikely(!ret.first)) return nullptr;
+
+    // Same as we do with non-PFS variant of Aligned_alloc::alloc(), here we
+    // encode the offset so we can later on recover the original pointer, P' =
+    // (P - O), from within Aligned_alloc_pfs::free(P) context. Similarly, we
+    // encode the requested allocation datalen.
+    allocator_metadata::meta_1(ret.first, ret.second);
+    allocator_metadata::meta_2(ret.first, size);
+
+#ifdef HAVE_PSI_MEMORY_INTERFACE
+    // When computing total number of bytes allocated. we must not only account
+    // for the size that we have requested (total_len) but we also need
+    // to account for extra memory Aligned_alloc_impl may have allocated in
+    // order to be able to accomodate the request. Amount of extra memory
+    // allocated corresponds to the offset value returned by Aligned_alloc_impl.
+    const auto datalen = total_len + ret.second;
+    // The point of this allocator variant is to trace the memory allocations
+    // through PFS (PSI) so do it.
+    pfs_metadata::pfs_owning_thread_t owner;
+    key = PSI_MEMORY_CALL(memory_alloc)(key, datalen, &owner);
+    // To be able to do the opposite action of tracing when we are releasing the
+    // memory, we need right about the same data we passed to the tracing
+    // memory_alloc function. Let's encode this it into our allocator so we
+    // don't have to carry and keep this data around.
+    pfs_metadata::pfs_owning_thread(ret.first, owner);
+    pfs_metadata::pfs_datalen(ret.first, datalen);
+    pfs_metadata::pfs_key(ret.first, key);
+    pfs_metadata::pfs_metaoffset(ret.first, metadata_len);
+#endif
+
+    return static_cast<uint8_t *>(ret.first) + metadata_len;
+  }
+
+  /** Releases storage dynamically allocated through
+      Aligned_alloc_pfs::alloc().
+
+      @param[in] data Pointer to storage allocated through
+      Aligned_alloc_pfs::alloc()
+   */
+  static inline void free(PFS_metadata::data_segment_ptr data) noexcept {
+    if (unlikely(!data)) return;
+
+#ifdef HAVE_PSI_MEMORY_INTERFACE
+    // Deduce the PFS data we encoded in Aligned_alloc_pfs::alloc()
+    auto key = pfs_metadata::pfs_key(data);
+    auto owner = pfs_metadata::pfs_owning_thread(data);
+    auto datalen = pfs_metadata::pfs_datalen(data);
+    // With the deduced PFS data, now trace the memory release action.
+    PSI_MEMORY_CALL(memory_free)
+    (key, datalen, owner);
+#endif
+
+    // Here we make use of the offset which has been encoded by
+    // Aligned_alloc_pfs::alloc() to be able to deduce the original pointer and
+    // simply forward it to std::free.
+    Aligned_alloc_impl::free(deduce(data));
+  }
+
+  /** Returns the number of bytes requested to be allocated.
+
+      @param[in] data Pointer to storage allocated through
+      Aligned_alloc_pfs::alloc()
+      @return Number of bytes.
+   */
+  static inline allocator_metadata::meta_2_t datalen(
+      PFS_metadata::data_segment_ptr data) {
+    // In order to be able to deduce the datalen field, we have to deduce the
+    // beginning of PFS metadata segment first.
+    return allocator_metadata::meta_2(pfs_metadata::deduce_pfs_meta(data));
+  }
+
+ private:
+  /** Helper function which deduces the original pointer returned by
+      Aligned_alloc_impl from a pointer which is passed to us by the call-site.
+   */
+  static inline void *deduce(PFS_metadata::data_segment_ptr data) noexcept {
+    // To recover the original pointer we need to read the offset
+    // we have serialized into the first (allocator) metadata field. But to read
+    // that offset we have to jump over the PFS metadata first. We use PFS meta
+    // offset for that.
+    auto pfs_meta = pfs_metadata::deduce_pfs_meta(data);
+    auto offset = allocator_metadata::meta_1(pfs_meta);
+    return reinterpret_cast<void *>(reinterpret_cast<std::uintptr_t>(pfs_meta) -
+                                    offset);
+  }
+};
+
+/** Simple utility metafunction which selects appropriate allocator variant
+    (implementation) depending on the input parameter(s).
+  */
+template <bool Pfs_memory_instrumentation_on>
+struct select_alloc_impl {
+  using type =
+      Aligned_alloc;  // When PFS is OFF, pick ordinary, non-PFS, variant
+};
+
+template <>
+struct select_alloc_impl<true> {
+  using type = Aligned_alloc_pfs;  // Otherwise, pick PFS variant
+};
+
+/** Just a small helper type which saves us some keystrokes. */
+template <bool Pfs_memory_instrumentation_on>
+using select_alloc_impl_t =
+    typename select_alloc_impl<Pfs_memory_instrumentation_on>::type;
+
+/** Small wrapper which utilizes SFINAE to dispatch the call to appropriate
+    aligned allocator implementation.
+  */
+template <typename Impl>
+struct Aligned_alloc_ {
+  template <bool Zero_initialized, typename T = Impl>
+  static inline typename std::enable_if<T::is_pfs_instrumented_v, void *>::type
+  alloc(size_t size, size_t alignment, PSI_memory_key key) {
+    return Impl::template alloc<Zero_initialized>(size, alignment, key);
+  }
+  template <bool Zero_initialized, typename T = Impl>
+  static inline typename std::enable_if<!T::is_pfs_instrumented_v, void *>::type
+  alloc(size_t size, size_t alignment, PSI_memory_key /*key*/) {
+    return Impl::template alloc<Zero_initialized>(size, alignment);
+  }
+  static inline void free(void *ptr) { Impl::free(ptr); }
+  static inline size_t datalen(void *ptr) { return Impl::datalen(ptr); }
+};
+
+}  // namespace detail
+}  // namespace ut
+
+#endif
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/detail/ut/allocator_traits.h mysql-8.0-8.0.27/storage/innobase/include/detail/ut/allocator_traits.h
--- mysql-8.0-8.0.26/storage/innobase/include/detail/ut/allocator_traits.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/detail/ut/allocator_traits.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,57 @@
+/*****************************************************************************
+
+Copyright (c) 2021, Oracle 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, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
+/** @file include/detail/ut/allocator_traits.h
+    Simple allocator traits.
+ */
+
+#ifndef detail_ut_allocator_traits_h
+#define detail_ut_allocator_traits_h
+
+namespace ut {
+namespace detail {
+
+/** Simple allocator traits. */
+template <bool Pfs_instrumented>
+struct allocator_traits {
+  // Is allocator PFS instrumented or not
+  static constexpr auto is_pfs_instrumented_v = Pfs_instrumented;
+};
+
+/** Simple wrapping type around malloc, calloc and friends.*/
+template <bool Zero_initialized>
+struct Alloc_fn {
+  static void *alloc(size_t nbytes) { return std::malloc(nbytes); }
+};
+template <>
+struct Alloc_fn<true> {
+  static void *alloc(size_t nbytes) { return std::calloc(1, nbytes); }
+};
+
+}  // namespace detail
+}  // namespace ut
+
+#endif
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/detail/ut/alloc.h mysql-8.0-8.0.27/storage/innobase/include/detail/ut/alloc.h
--- mysql-8.0-8.0.26/storage/innobase/include/detail/ut/alloc.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/detail/ut/alloc.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,472 @@
+/*****************************************************************************
+
+Copyright (c) 2021, Oracle 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, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
+/** @file include/detail/ut/alloc.h
+    Implementation bits and pieces for PFS and non-PFS variants for normal
+    allocations and deallocations through new, delete, malloc, zalloc, free etc.
+ */
+
+#ifndef detail_ut_alloc_h
+#define detail_ut_alloc_h
+
+#include <cassert>
+#include <cstddef>
+#include <cstdint>
+#include <cstdlib>
+#include <memory>
+#include <utility>
+
+#include "my_compiler.h"
+#include "mysql/psi/mysql_memory.h"
+#include "storage/innobase/include/detail/ut/allocator_traits.h"
+#include "storage/innobase/include/detail/ut/helper.h"
+#include "storage/innobase/include/detail/ut/pfs.h"
+
+namespace ut {
+namespace detail {
+
+/** Allocation routines for non-extended alignment types, as opposed to
+    Aligned_alloc for example.
+
+    These are only a mere wrappers around standard allocation routines so
+    memory layout representation doesn't look any other than the following:
+
+     --------------------------------
+     |         ... DATA ...         |
+     --------------------------------
+      ^
+      |
+      |
+    ptr to be returned to call-site
+
+    DATA segment is a segment that will be returned to the call-site.
+ */
+struct Alloc : public allocator_traits<false> {
+  /** Dynamically allocates storage of given size.
+
+      @param[in] size Size of storage (in bytes) requested to be allocated.
+      @return Pointer to the allocated storage. nullptr if dynamic storage
+      allocation failed.
+   */
+  template <bool Zero_initialized>
+  static inline void *alloc(std::size_t size) noexcept {
+    return Alloc_fn<Zero_initialized>::alloc(size);
+  }
+
+  /** Reallocates the given area of memory. Behaves as std::realloc()
+      implementation on given platform.
+
+      @param[in] ptr  Pointer to the memory to be reallocated.
+      @param[in] size New size of storage (in bytes) requested to be allocated.
+      @return Pointer to the reallocated storage. Or nullptr if realloc
+      operation failed.
+   */
+  static inline void *realloc(void *ptr, std::size_t size) noexcept {
+    return std::realloc(ptr, size);
+  }
+
+  /** Releases storage dynamically allocated through
+      Alloc::alloc() or Alloc::realloc().
+
+      @param[in] ptr Pointer to storage allocated through
+      Alloc::alloc() or Alloc::realloc()
+   */
+  static inline void free(void *ptr) noexcept { std::free(ptr); }
+};
+
+/** Specialization of allocation routines for non-extended alignment types
+    but which in comparison to Alloc are providing support for arrays.
+
+    To provide support for arrays, these allocation routines will allocate extra
+    (metadata) space so that they can serialize the requested size of an array
+    (in bytes) into the memory. That will enable higher-kinded functions,
+    implemented on top of Alloc, to take necessary actions such as cleaning up
+    the resources by invoking appropriate number of destructors of
+    non-trivially-destructible types. Otherwise, this would create a burden on
+    end users by having to remember and carry the array size all around the
+    code. This is equivalent to what we find in other standard implementations.
+    For example, new int x[10] is always released without passing the array
+    size: delete[] x; The same holds with this design.
+
+    Memory layout representation looks like the following:
+
+     ---------------------------------------
+     | ALLOC-ARR-META |    ... DATA ...    |
+     ---------------------------------------
+       ^               ^
+       |               |
+       |               |
+       |              ptr to be returned to call-site
+       |
+      -----------------
+      |    DATALEN    |
+      -----------------
+       \               \
+        0               \
+                  alignof(max_align_t) - 1
+
+    DATALEN segment encodes the total length of DATA segment, which is the
+    actual allocation size that client code has requested.
+
+    DATA segment is a segment that will be returned to the call-site.
+ */
+struct Alloc_arr : public allocator_traits<false> {
+  /** This is how much the metadata (ALLOC-ARR-META) segment will be big. */
+  static constexpr auto metadata_len = alignof(max_align_t);
+
+  /** This is the type we will be using to store the size of an array. */
+  using datalen_t = size_t;
+
+  /** Sanity check so that we can be sure that our metadata segment can fit
+      the datalen_t.
+    */
+  static_assert(sizeof(datalen_t) <= metadata_len, "Metadata does not fit!");
+
+  /** Sanity check so that we can be sure that the size of our metadata segment
+      is such so that the pointer to DATA segment is always suitably aligned
+      (multiple of alignof(max_align_t).
+    */
+  static_assert(metadata_len % alignof(max_align_t) == 0,
+                "metadata_len must be divisible by alignof(max_align_t)");
+
+  /** Dynamically allocates storage of given size.
+
+    @param[in] size Size of storage (in bytes) requested to be allocated.
+    @return Pointer to the allocated storage. nullptr if dynamic storage
+    allocation failed.
+ */
+  template <bool Zero_initialized>
+  static inline void *alloc(std::size_t size) noexcept {
+    const auto total_len = size + Alloc_arr::metadata_len;
+    auto mem = Alloc_fn<Zero_initialized>::alloc(total_len);
+    *(static_cast<datalen_t *>(mem)) = size;
+    return static_cast<uint8_t *>(mem) + Alloc_arr::metadata_len;
+  }
+
+  /** Releases storage dynamically allocated through Alloc_arr::alloc().
+
+      @param[in] ptr Pointer to storage allocated through Alloc_arr::alloc().
+   */
+  static inline void free(void *ptr) noexcept {
+    if (unlikely(!ptr)) return;
+    std::free(deduce(ptr));
+  }
+
+  /** Returns the size of an array in bytes.
+
+      @param[in] ptr Pointer to storage allocated through
+      Alloc_arr::alloc().
+      @return Size of an array in bytes (or number of bytes allocated).
+   */
+  static inline datalen_t datalen(void *ptr) {
+    return *reinterpret_cast<datalen_t *>(deduce(ptr));
+  }
+
+ private:
+  /** Helper function which deduces the original pointer returned by
+      Alloc_arr::alloc() from a pointer which is passed to us by the call-site.
+   */
+  static inline void *deduce(void *ptr) noexcept {
+    return static_cast<uint8_t *>(ptr) - Alloc_arr::metadata_len;
+  }
+};
+
+/** Allocation routines for non-extended alignment types, as opposed to
+    Aligned_alloc_pfs for example, but which are instrumented through PFS
+    (performance-schema).
+
+    Implemented in terms of PFS_metadata.
+
+    Memory layout representation looks like the following:
+
+     --------------------------------------------------
+     | PFS-META | VARLEN | PFS-META-OFFSET |   DATA   |
+     --------------------------------------------------
+      ^    ^                                ^
+      |    |                                |
+      |   ---------------------------       |
+      |   | OWNER |  DATALEN  | KEY |       |
+      |   ---------------------------       |
+      |                                     |
+   ptr returned by                          |
+      Alloc_fn                              |
+                                            |
+                               ptr to be returned to call-site
+                                   will be pointing here
+
+    OWNER field encodes the owning thread.
+    DATALEN field encodes total size of memory consumed and not only the size of
+    the DATA segment.
+    KEY field encodes the PFS/PSI key.
+
+    VARLEN is the leftover variable-length segment that specialized
+    implementations can further make use of by deducing its size from the
+    following formulae: abs(alignof(max_align_t) - sizeof(PFS-META-OFFSET) -
+    sizeof(PFS-META)). In code that would be std::abs(alignof(max_align_t) -
+    PFS_metadata::size). Not used by this implementation.
+
+    PFS-META-OFFSET, strictly speaking, isn't neccesary in this case of
+    non-extended alignments, where alignment is always known in compile-time and
+    thus the offset we will be storing into the PFS-META-OFFSET field is always
+    going to be the same for the given platform. So, rather than serializing
+    this piece of information into the memory as we do right now, we could very
+    well be storing it into the compile-time evaluated constexpr constant. The
+    reason why we don't do it is that there is no advantage (*) of doing so
+    while we would be introducing a disadvantage of having to maintain separate
+    specialization of PFS_metadata and code would be somewhat more fragmented.
+
+      (*) Extra space that we need to allocate in order to be able to fit the
+          PFS_metadata is going to be the same regardless if there is
+          PFS-META-OFFSET field or not. This is due to the fact that PFS-META
+          segment alone is larger than alignof(max_align_t) so in order to
+          keep the DATA segment suitably aligned (% alignof(max_align_t) == 0)
+          we must choose the size for the whole PFS segment that is a multiple
+          of alignof(max_align_t).
+
+    PFS-META-OFFSET is a field which allows us to recover the pointer to
+    PFS-META segment from a pointer to DATA segment.
+
+    DATA is an actual segment which will keep the user data.
+*/
+struct Alloc_pfs : public allocator_traits<true> {
+  using pfs_metadata = PFS_metadata;
+
+  /** This is how much the metadata (PFS-META | VARLEN | PFS-META-OFFSET)
+      segment will be big.
+    */
+  static constexpr auto metadata_len =
+      calc_align(pfs_metadata::size, alignof(max_align_t));
+
+  /** Dynamically allocates storage of given size at the address aligned to the
+      requested alignment.
+
+      @param[in] size Size of storage (in bytes) requested to be allocated.
+      @param[in] alignment Alignment requirement for storage to be allocated.
+      @param[in] key PSI memory key to be used for PFS memory instrumentation.
+      @return Pointer to the allocated storage. nullptr if dynamic storage
+      allocation failed.
+   */
+  template <bool Zero_initialized>
+  static inline void *alloc(std::size_t size,
+                            pfs_metadata::pfs_memory_key_t key) {
+    const auto total_len = size + Alloc_pfs::metadata_len;
+    auto mem = Alloc_fn<Zero_initialized>::alloc(total_len);
+    if (unlikely(!mem)) return nullptr;
+
+#ifdef HAVE_PSI_MEMORY_INTERFACE
+    // The point of this allocator variant is to trace the memory allocations
+    // through PFS (PSI) so do it.
+    pfs_metadata::pfs_owning_thread_t owner;
+    key = PSI_MEMORY_CALL(memory_alloc)(key, total_len, &owner);
+    // To be able to do the opposite action of tracing when we are releasing the
+    // memory, we need right about the same data we passed to the tracing
+    // memory_alloc function. Let's encode this it into our allocator so we
+    // don't have to carry and keep this data around.
+    pfs_metadata::pfs_owning_thread(mem, owner);
+    pfs_metadata::pfs_datalen(mem, total_len);
+    pfs_metadata::pfs_key(mem, key);
+    pfs_metadata::pfs_metaoffset(mem, Alloc_pfs::metadata_len);
+#endif
+
+    return static_cast<uint8_t *>(mem) + Alloc_pfs::metadata_len;
+  }
+
+  /** Reallocates the given area of memory, which if not nullptr, must be
+      previously allocated by Alloc_pfs::alloc() or Alloc_pfs::realloc().
+
+      Mimics unfortunate realloc() design so that:
+        * If pointer passed is nullptr, then behavior is as if
+          Alloc_pfs::alloc() had been called.
+        * If new size of storage requested is 0, then behavior is as if
+          Alloc_pfs::free() had been called.
+
+      @param[in] ptr  Pointer to the memory to be reallocated.
+      @param[in] size New size of storage (in bytes) requested to be allocated.
+      @return Pointer to the reallocated storage. nullptr if dynamic storage
+      allocation or reallocation failed or if new size requested was 0.
+   */
+  static inline void *realloc(PFS_metadata::data_segment_ptr data,
+                              std::size_t size,
+                              pfs_metadata::pfs_memory_key_t key) {
+    // Allocate memory if pointer passed in is nullptr
+    if (!data) {
+      return Alloc_pfs::alloc<false>(size, key);
+    }
+
+    // Free the memory if passed in size is zero
+    if (size == 0) {
+      Alloc_pfs::free(data);
+      return nullptr;
+    }
+
+#ifdef HAVE_PSI_MEMORY_INTERFACE
+    // Deduce the PFS data we encoded in Alloc_pfs::alloc()
+    auto key_curr = pfs_metadata::pfs_key(data);
+    auto owner_curr = pfs_metadata::pfs_owning_thread(data);
+    auto datalen_curr = pfs_metadata::pfs_datalen(data);
+    // With the deduced PFS data, now trace the memory release action.
+    PSI_MEMORY_CALL(memory_free)
+    (key_curr, datalen_curr, owner_curr);
+#endif
+
+    // Otherwise, continue with the plain realloc
+    const auto total_len = size + Alloc_pfs::metadata_len;
+    auto mem = std::realloc(deduce(data), total_len);
+    if (unlikely(!mem)) return nullptr;
+
+#ifdef HAVE_PSI_MEMORY_INTERFACE
+    // The point of this allocator variant is to trace the memory allocations
+    // through PFS (PSI) so do it.
+    pfs_metadata::pfs_owning_thread_t owner;
+    key = PSI_MEMORY_CALL(memory_alloc)(key, total_len, &owner);
+    // To be able to do the opposite action of tracing when we are releasing the
+    // memory, we need right about the same data we passed to the tracing
+    // memory_alloc function. Let's encode this it into our allocator so we
+    // don't have to carry and keep this data around.
+    pfs_metadata::pfs_owning_thread(mem, owner);
+    pfs_metadata::pfs_datalen(mem, total_len);
+    pfs_metadata::pfs_key(mem, key);
+    pfs_metadata::pfs_metaoffset(mem, Alloc_pfs::metadata_len);
+#endif
+
+    return static_cast<uint8_t *>(mem) + Alloc_pfs::metadata_len;
+  }
+
+  /** Releases storage dynamically allocated through
+      Alloc_pfs::alloc().
+
+      @param[in] data Pointer to storage allocated through
+      Alloc_pfs::alloc()
+   */
+  static inline void free(PFS_metadata::data_segment_ptr data) noexcept {
+    if (unlikely(!data)) return;
+
+#ifdef HAVE_PSI_MEMORY_INTERFACE
+    // Deduce the PFS data we encoded in Alloc_pfs::alloc()
+    auto key = pfs_metadata::pfs_key(data);
+    auto owner = pfs_metadata::pfs_owning_thread(data);
+    auto datalen = pfs_metadata::pfs_datalen(data);
+    // With the deduced PFS data, now trace the memory release action.
+    PSI_MEMORY_CALL(memory_free)
+    (key, datalen, owner);
+#endif
+
+    // Here we make use of the offset which has been encoded by
+    // Alloc_pfs::alloc() to be able to deduce the original pointer and
+    // simply forward it to std::free.
+    std::free(deduce(data));
+  }
+
+  /** Returns the number of bytes requested to be allocated.
+
+    @param[in] data Pointer to storage allocated through
+    Alloc_pfs::alloc()
+    @return Number of bytes.
+   */
+  static inline size_t datalen(PFS_metadata::data_segment_ptr data) {
+    return pfs_metadata::pfs_datalen(data) - Alloc_pfs::metadata_len;
+  }
+
+ private:
+  /** Helper function which deduces the original pointer returned by
+      Alloc_pfs::alloc() from a pointer which is passed to us by the call-site.
+   */
+  static inline void *deduce(PFS_metadata::data_segment_ptr data) noexcept {
+    return pfs_metadata::deduce_pfs_meta(data);
+  }
+};
+
+/** Simple utility metafunction which selects appropriate allocator variant
+    (implementation) depending on the input parameter(s).
+  */
+template <bool Pfs_memory_instrumentation_on, bool Array_specialization>
+struct select_malloc_impl {};
+
+template <>
+struct select_malloc_impl<false, false> {
+  using type = Alloc;  // When PFS is OFF, pick ordinary, non-PFS, variant
+};
+
+template <>
+struct select_malloc_impl<false, true> {
+  using type = Alloc_arr;  // When needed, take special care to pick the variant
+                           // which specializes for arrays
+};
+
+template <bool Array_specialization>
+struct select_malloc_impl<true, Array_specialization> {
+  using type = Alloc_pfs;  // Otherwise, pick PFS variant
+};
+
+/** Just a small helper type which saves us some keystrokes. */
+template <bool Pfs_memory_instrumentation_on, bool Array_specialization>
+using select_malloc_impl_t =
+    typename select_malloc_impl<Pfs_memory_instrumentation_on,
+                                Array_specialization>::type;
+
+/** Small wrapper which utilizes SFINAE to dispatch the call to appropriate
+    allocator implementation.
+  */
+template <typename Impl>
+struct Alloc_ {
+  template <bool Zero_initialized, typename T = Impl>
+  static inline typename std::enable_if<T::is_pfs_instrumented_v, void *>::type
+  alloc(size_t size, PSI_memory_key key) {
+    return Impl::template alloc<Zero_initialized>(size, key);
+  }
+  template <bool Zero_initialized, typename T = Impl>
+  static inline typename std::enable_if<!T::is_pfs_instrumented_v, void *>::type
+  alloc(size_t size, PSI_memory_key /*key*/) {
+    return Impl::template alloc<Zero_initialized>(size);
+  }
+  template <typename T = Impl>
+  static inline typename std::enable_if<T::is_pfs_instrumented_v, void *>::type
+  realloc(void *ptr, size_t size, PSI_memory_key key) {
+    return Impl::realloc(ptr, size, key);
+  }
+  template <typename T = Impl>
+  static inline typename std::enable_if<!T::is_pfs_instrumented_v, void *>::type
+  realloc(void *ptr, size_t size, PSI_memory_key /*key*/) {
+    return Impl::realloc(ptr, size);
+  }
+  static inline void free(void *ptr) { Impl::free(ptr); }
+  static inline size_t datalen(void *ptr) { return Impl::datalen(ptr); }
+  template <typename T = Impl>
+  static inline typename std::enable_if<T::is_pfs_instrumented_v, size_t>::type
+  pfs_overhead() {
+    return Alloc_pfs::metadata_len;
+  }
+  template <typename T = Impl>
+  static inline typename std::enable_if<!T::is_pfs_instrumented_v, size_t>::type
+  pfs_overhead() {
+    return 0;
+  }
+};
+
+}  // namespace detail
+}  // namespace ut
+
+#endif
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/detail/ut/helper.h mysql-8.0-8.0.27/storage/innobase/include/detail/ut/helper.h
--- mysql-8.0-8.0.26/storage/innobase/include/detail/ut/helper.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/detail/ut/helper.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,74 @@
+/*****************************************************************************
+
+Copyright (c) 2021, Oracle 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, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
+/** @file include/detail/ut/helper.h
+    Small helper functions. Exists mostly because ut0ut.h is not usable from
+    every translation unit.
+ */
+
+#ifndef detail_ut_helper_h
+#define detail_ut_helper_h
+
+namespace ut {
+namespace detail {
+
+/** Calculates the smallest multiple of m that is not smaller than n
+    when m is a power of two. In other words, rounds n up to m * k.
+    @param n in: number to round up
+    @param m in: alignment, must be a power of two
+    @return n rounded up to the smallest possible integer multiple of m
+ */
+constexpr size_t calc_align(size_t n, size_t m) {
+  // This is a copy pasta from ut0ut.h but consuming that header from
+  // this file bursts the build into flames. Let's at least stick to the
+  // similar name.
+  return (n + (m - 1)) & ~(m - 1);
+}
+
+/** Calculates the biggest multiple of m that is not bigger than n
+    when m is a power of two.  In other words, rounds n down to m * k.
+    @param n in: number to round down
+    @param m in: alignment, must be a power of two
+    @return n rounded down to the biggest possible integer multiple of m */
+constexpr size_t pow2_round(size_t n, size_t m) {
+  // This is a copy pasta from ut0ut.h but consuming that header from
+  // this file bursts the build into flames. Let's at least stick to the
+  // similar name.
+  return (n & ~(m - 1));
+}
+
+/** Calculates the next multiple of m that is bigger or equal to n.
+    @param n in: number to find the next multiple of in terms of m
+    @param m in: alignment, must be a power of two
+    @return next next multiple of m bigger or equal than n */
+constexpr size_t round_to_next_multiple(size_t n, size_t m) {
+  return pow2_round(n + (m - 1), m);
+}
+
+}  // namespace detail
+}  // namespace ut
+
+#endif
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/detail/ut/large_page_alloc.h mysql-8.0-8.0.27/storage/innobase/include/detail/ut/large_page_alloc.h
--- mysql-8.0-8.0.26/storage/innobase/include/detail/ut/large_page_alloc.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/detail/ut/large_page_alloc.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,353 @@
+/*****************************************************************************
+
+Copyright (c) 2021, Oracle 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, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
+/** @file include/detail/ut/large_page_alloc.h
+ Implementation bits and pieces for large (huge) page allocations. */
+
+#ifndef detail_ut_large_page_alloc_h
+#define detail_ut_large_page_alloc_h
+
+#include <cstddef>
+#include <fstream>
+
+#include "my_compiler.h"
+#ifdef _WIN32
+#include "storage/innobase/include/detail/ut/large_page_alloc-win.h"
+#elif defined(__APPLE__)
+#include "storage/innobase/include/detail/ut/large_page_alloc-osx.h"
+#elif defined(__sun)
+#include "storage/innobase/include/detail/ut/large_page_alloc-solaris.h"
+#else
+#include "storage/innobase/include/detail/ut/large_page_alloc-linux.h"
+#endif
+#include "storage/innobase/include/detail/ut/allocator_traits.h"
+#include "storage/innobase/include/detail/ut/helper.h"
+#include "storage/innobase/include/detail/ut/page_metadata.h"
+#include "storage/innobase/include/detail/ut/pfs.h"
+
+extern const size_t large_page_default_size;
+
+namespace ut {
+namespace detail {
+
+/** Allocation routines which are purposed for allocating memory through the
+    means of what is known as large (huge) pages.
+
+    large_page_aligned_alloc() and large_page_aligned_free() are taking care of
+    OS specific details and Large_page_alloc is a convenience wrapper which only
+    makes the use of large pages more ergonomic so that it serializes the actual
+    size being allocated into the raw memory. This size is then automagically
+    deduced when large page memory is being freed. Otherwise, client code would
+    have been responsible to store and keep that value somewhere until it frees
+    the large page memory segment. Additionally, information on type of page
+    used to back up requested allocation is also serialized into the memory
+    allowing to build higher-kinded abstractions more easily. See
+    ut::malloc_large_page with option to fallback to regular pages through
+    ut::malloc_page.
+
+    Cost associated with this abstraction is the size of a single CPU page. In
+    terms of virtual memory, especially in 64-bit address space, this cost is
+    negligible. In practice this means that for each N huge-page sized
+    allocation request, application code will get to use CPU_PAGE_SIZE bytes
+    less. In other words, for a request that is backed up by three 2MiB
+    huge-pages, application code will get to use 3 * 2MiB - CPU_PAGE_SIZE of
+    total bytes. CPU_PAGE_SIZE is normally 4K but some architectures such as
+    SPARC have it set to 8K. ARM64 can be set to 4K, 8K or 64K.
+
+    Memory layout representation looks like the following:
+
+     -------------------------------------------
+     | PAGE-ALLOC-METADATA |    ... DATA ...   |
+     -------------------------------------------
+       ^                    ^
+       |                    |
+       |                    |
+       |           ptr (large-page) to be returned to call-site
+       |
+      --------------------------------
+      | DATALEN | PAGE-TYPE | VARLEN |
+      --------------------------------
+       \                              \
+        0                              \
+                               CPU_PAGE_SIZE - 1
+
+    For details on DATALEN, PAGE-TYPE and VARLEN fields see Page_alloc_metadata.
+
+    DATA is an actual page-aligned (!) segment backed by large (huge) page
+    memory that will be returned to the call-site and which the client code will
+    be able to use for the application data.
+ */
+struct Large_page_alloc : public allocator_traits<false> {
+  using page_allocation_metadata = Page_alloc_metadata;
+
+  /** Allocates memory through large-page support.
+
+      @param[in] size Size of storage (in bytes) requested to be allocated.
+      @return Pointer to the allocated storage. nullptr if allocation failed.
+   */
+  static inline void *alloc(std::size_t size) {
+    auto total_len = round_to_next_multiple(
+        size + page_allocation_metadata::len, large_page_default_size);
+    auto mem = large_page_aligned_alloc(total_len);
+    if (unlikely(!mem)) return nullptr;
+    page_allocation_metadata::datalen(mem, total_len);
+    page_allocation_metadata::page_type(mem, Page_type::large_page);
+    return static_cast<uint8_t *>(mem) + page_allocation_metadata::len;
+  }
+
+  /** Releases storage allocated through
+      Large_page_alloc::alloc().
+
+      @param[in] data Pointer to storage allocated through
+      Large_page_alloc::alloc()
+      @return True if releasing the memory was successful.
+   */
+  static inline bool free(void *data) noexcept {
+    if (unlikely(!data)) return false;
+    return large_page_aligned_free(
+        deduce(data), datalen(data) + page_allocation_metadata::len);
+  }
+
+  /** Returns the number of bytes that have been allocated.
+
+      @param[in] data Pointer to storage allocated through
+      Large_page_alloc::alloc()
+      @return Number of bytes.
+   */
+  static inline page_allocation_metadata::datalen_t datalen(void *data) {
+    return page_allocation_metadata::datalen(data) -
+           page_allocation_metadata::len;
+  }
+
+  /** Returns the type of the page.
+
+      @param[in] data Pointer to storage allocated through
+      Large_page_alloc::alloc()
+      @return Page type.
+   */
+  static inline Page_type page_type(void *data) {
+    return page_allocation_metadata::page_type(data);
+  }
+
+ private:
+  /** Helper function which deduces the original pointer returned by
+      Large_page_alloc from a pointer which is passed to us by the call-site.
+   */
+  static inline void *deduce(void *data) noexcept {
+    return reinterpret_cast<void *>(static_cast<uint8_t *>(data) -
+                                    page_allocation_metadata::len);
+  }
+};
+
+/** Allocation routines which are purposed for allocating memory through the
+    means of what is known as large (huge) pages. This is a PFS
+    (performance-schema) variant of Large_page_alloc. Implemented in terms
+    of Page_alloc_metadata_pfs.
+
+    large_page_aligned_alloc() and large_page_aligned_free() are taking care of
+    OS specific details and Large_page_alloc is a convenience wrapper which only
+    makes the use of large pages more ergonomic so that it serializes all the
+    relevant PFS details into the raw memory. Otherwise, client code would have
+    been responsible to store and keep those details somewhere until the memory
+    segment is freed. Additionally, information on type of page used to back up
+    requested allocation is also serialized into the memory allowing to build
+    higher-kinded abstractions more easily. See ut::malloc_large_page with
+    option to fallback to regular pages through ut::malloc_page.
+
+    Cost associated with this abstraction is the size of a single CPU page. In
+    terms of virtual memory, especially in 64-bit address space, this cost is
+    negligible. In practice this means that for each N huge-page sized
+    allocation request, application code will get to use CPU_PAGE_SIZE bytes
+    less. In other words, for a request that is backed up by three 2MiB
+    huge-pages, application code will get to use 3 * 2MiB - CPU_PAGE_SIZE of
+    total bytes. CPU_PAGE_SIZE is normally 4K but some architectures such as
+    SPARC have it set to 8K. ARM64 can be set to 4K, 8K or 64K.
+
+    Memory layout representation looks like the following:
+
+     ----------------------------------------------
+     | PAGE-ALLOC-METADATA-PFS |   ... DATA ...   |
+     ----------------------------------------------
+      ^                         ^
+      |                         |
+      |                         |
+      |               ptr (large-page) to be
+      |                returned to call-site
+      |
+     ---------------------------------------------------
+     | PFS-META | PAGE-TYPE | VARLEN | PFS-META-OFFSET |
+     ---------------------------------------------------
+      ^   ^
+      |   |
+      |  ---------------------------
+      |  | OWNER |  DATALEN  | KEY |
+      |  ---------------------------
+      |
+     ptr returned by
+    large_page_aligned_alloc
+
+    For details on PFS-META, PAGE-TYPE, VARLEN and PFS-META-OFFSET fields
+    see Page_alloc_metadata_pfs.
+
+    DATA is an actual page-aligned (!) segment backed by large (huge) page
+    memory that will be returned to the call-site and which the client code will
+    be able to use for the application data.
+ */
+struct Large_page_alloc_pfs : public allocator_traits<true> {
+  using page_allocation_metadata = Page_alloc_metadata_pfs;
+
+  /** Allocates memory through large-page support.
+
+      @param[in] size Size of storage (in bytes) requested to be allocated.
+      @param[in] key PSI memory key to be used for PFS memory instrumentation.
+      @return Pointer to the allocated storage. nullptr if allocation failed.
+    */
+  static inline void *alloc(
+      std::size_t size,
+      page_allocation_metadata::pfs_metadata::pfs_memory_key_t key) {
+    auto total_len = round_to_next_multiple(
+        size + page_allocation_metadata::len, large_page_default_size);
+    auto mem = large_page_aligned_alloc(total_len);
+    if (unlikely(!mem)) return nullptr;
+
+#ifdef HAVE_PSI_MEMORY_INTERFACE
+    // The point of this allocator variant is to trace the memory allocations
+    // through PFS (PSI) so do it.
+    page_allocation_metadata::pfs_metadata::pfs_owning_thread_t owner;
+    key = PSI_MEMORY_CALL(memory_alloc)(key, total_len, &owner);
+    // To be able to do the opposite action of tracing when we are releasing the
+    // memory, we need right about the same data we passed to the tracing
+    // memory_alloc function. Let's encode this it into our allocator so we
+    // don't have to carry and keep this data around.
+    page_allocation_metadata::pfs_metadata::pfs_owning_thread(mem, owner);
+    page_allocation_metadata::pfs_metadata::pfs_datalen(mem, total_len);
+    page_allocation_metadata::pfs_metadata::pfs_key(mem, key);
+    page_allocation_metadata::pfs_metadata::pfs_metaoffset(
+        mem, page_allocation_metadata::len);
+    page_allocation_metadata::page_type(mem, Page_type::large_page);
+#endif
+
+    return static_cast<uint8_t *>(mem) + page_allocation_metadata::len;
+  }
+
+  /** Releases storage allocated through Large_page_alloc_pfs::alloc().
+
+      @param[in] data Pointer to storage allocated through
+      Large_page_alloc_pfs::alloc()
+      @return True if releasing the memory was successful.
+   */
+  static inline bool free(PFS_metadata::data_segment_ptr data) noexcept {
+    if (unlikely(!data)) return false;
+
+    PFS_metadata::pfs_datalen_t total_len = {};
+#ifdef HAVE_PSI_MEMORY_INTERFACE
+    // Deduce the PFS data we encoded in Large_page_alloc_pfs::alloc()
+    auto key = page_allocation_metadata::pfs_metadata::pfs_key(data);
+    auto owner =
+        page_allocation_metadata::pfs_metadata::pfs_owning_thread(data);
+    total_len = page_allocation_metadata::pfs_metadata::pfs_datalen(data);
+    // With the deduced PFS data, now trace the memory release action.
+    PSI_MEMORY_CALL(memory_free)
+    (key, total_len, owner);
+#endif
+
+    return large_page_aligned_free(deduce(data), total_len);
+  }
+
+  /** Returns the number of bytes that have been allocated.
+
+      @param[in] data Pointer to storage allocated through
+      Large_page_alloc_pfs::alloc()
+      @return Number of bytes.
+   */
+  static inline size_t datalen(PFS_metadata::data_segment_ptr data) {
+    return page_allocation_metadata::pfs_metadata::pfs_datalen(data) -
+           page_allocation_metadata::len;
+  }
+
+  /** Returns the Page_type.
+
+      @param[in] data Pointer to storage allocated through
+      Large_page_alloc_pfs::alloc()
+      @return Page type.
+   */
+  static inline Page_type page_type(PFS_metadata::data_segment_ptr data) {
+    return page_allocation_metadata::page_type(data);
+  }
+
+ private:
+  /** Helper function which deduces the original pointer returned by
+      Large_page_alloc_pfs from a pointer which is passed to us by the
+      call-site.
+   */
+  static inline void *deduce(PFS_metadata::data_segment_ptr data) noexcept {
+    return page_allocation_metadata::pfs_metadata::deduce_pfs_meta(data);
+  }
+};
+
+/** Simple utility metafunction which selects appropriate allocator variant
+    (implementation) depending on the input parameter(s).
+  */
+template <bool Pfs_memory_instrumentation_on>
+struct select_large_page_alloc_impl {
+  using type =
+      Large_page_alloc;  // When PFS is OFF, pick ordinary, non-PFS, variant
+};
+
+template <>
+struct select_large_page_alloc_impl<true> {
+  using type = Large_page_alloc_pfs;  // Otherwise, pick PFS variant
+};
+
+/** Just a small helper type which saves us some keystrokes. */
+template <bool Pfs_memory_instrumentation_on>
+using select_large_page_alloc_impl_t =
+    typename select_large_page_alloc_impl<Pfs_memory_instrumentation_on>::type;
+
+/** Small wrapper which utilizes SFINAE to dispatch the call to appropriate
+    aligned allocator implementation.
+  */
+template <typename Impl>
+struct Large_alloc_ {
+  template <typename T = Impl>
+  static inline typename std::enable_if<T::is_pfs_instrumented_v, void *>::type
+  alloc(size_t size, PSI_memory_key key) {
+    return Impl::alloc(size, key);
+  }
+  template <typename T = Impl>
+  static inline typename std::enable_if<!T::is_pfs_instrumented_v, void *>::type
+  alloc(size_t size, PSI_memory_key /*key*/) {
+    return Impl::alloc(size);
+  }
+  static inline bool free(void *ptr) { return Impl::free(ptr); }
+  static inline size_t datalen(void *ptr) { return Impl::datalen(ptr); }
+  static inline Page_type page_type(void *ptr) { return Impl::page_type(ptr); }
+};
+
+}  // namespace detail
+}  // namespace ut
+
+#endif
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/detail/ut/large_page_alloc-linux.h mysql-8.0-8.0.27/storage/innobase/include/detail/ut/large_page_alloc-linux.h
--- mysql-8.0-8.0.26/storage/innobase/include/detail/ut/large_page_alloc-linux.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/detail/ut/large_page_alloc-linux.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,95 @@
+/*****************************************************************************
+
+Copyright (c) 2021, Oracle 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, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
+/** @file include/detail/ut/large_page_alloc-linux.h
+ Linux-specific implementation bits and pieces for large (huge) page
+ allocations. */
+
+#ifndef detail_ut_large_page_alloc_linux_h
+#define detail_ut_large_page_alloc_linux_h
+
+#include <sys/mman.h>
+#include <sys/types.h>
+
+#include "storage/innobase/include/detail/ut/helper.h"
+
+extern const size_t large_page_default_size;
+
+namespace ut {
+namespace detail {
+
+/** Allocates memory backed by large (huge) pages.
+
+    @param[in] n_bytes Size of storage (in bytes) requested to be allocated.
+    @return Pointer to the allocated storage. nullptr if allocation failed.
+*/
+inline void *large_page_aligned_alloc(size_t n_bytes) {
+  // mmap will internally round n_bytes to the multiple of huge-page size if it
+  // is not already
+  void *ptr = mmap(nullptr, n_bytes, PROT_READ | PROT_WRITE,
+                   MAP_PRIVATE | MAP_ANON | MAP_HUGETLB, -1, 0);
+  return (ptr != (void *)-1) ? ptr : nullptr;
+}
+
+/** Releases memory backed by large (huge) pages.
+
+    @param[in] ptr Pointer to large (huge) page aligned storage.
+    @param[in] n_bytes Size of the storage.
+    @return Returns true if releasing the large (huge) page succeeded.
+ */
+inline bool large_page_aligned_free(void *ptr, size_t n_bytes) {
+  if (unlikely(!ptr)) return false;
+  // Freeing huge-pages require size to be the multiple of huge-page size
+  auto ret = munmap(ptr, pow2_round(n_bytes + (large_page_default_size - 1),
+                                    large_page_default_size));
+  return ret == 0;
+}
+
+/** Queries the current size of large (huge) pages on running system.
+
+    @return Large (huge) page size in bytes.
+*/
+inline size_t large_page_size() {
+  std::string key;
+  std::ifstream meminfo("/proc/meminfo");
+  if (meminfo) {
+    while (meminfo >> key) {
+      if (key == "Hugepagesize:") {
+        unsigned long long value;
+        meminfo >> value;
+        if (value == 0 && meminfo.fail()) return 0;
+        return value * 1024;
+      }
+      meminfo.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
+    }
+  }
+  return 0;
+}
+
+}  // namespace detail
+}  // namespace ut
+
+#endif
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/detail/ut/large_page_alloc-osx.h mysql-8.0-8.0.27/storage/innobase/include/detail/ut/large_page_alloc-osx.h
--- mysql-8.0-8.0.26/storage/innobase/include/detail/ut/large_page_alloc-osx.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/detail/ut/large_page_alloc-osx.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,99 @@
+/*****************************************************************************
+
+Copyright (c) 2021, Oracle 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, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
+/** @file include/detail/ut/large_page_alloc-osx.h
+ OSX-specific implementation bits and pieces for large (huge) page
+ allocations. */
+
+#ifndef detail_ut_large_page_alloc_osx_h
+#define detail_ut_large_page_alloc_osx_h
+
+#include <mach/vm_statistics.h>
+#include <sys/mman.h>
+#include <sys/types.h>
+
+#include "storage/innobase/include/detail/ut/helper.h"
+
+extern const size_t large_page_default_size;
+
+namespace ut {
+namespace detail {
+
+/** Superpage size to be used (2MB). */
+static constexpr auto SUPER_PAGE_SIZE = VM_FLAGS_SUPERPAGE_SIZE_2MB;
+
+/** Allocates memory backed by large (huge) pages.
+
+    @param[in] n_bytes Size of storage (in bytes) requested to be allocated.
+    @return Pointer to the allocated storage. nullptr if allocation failed.
+*/
+inline void *large_page_aligned_alloc(size_t n_bytes) {
+  void *ptr =
+      mmap(0,
+           pow2_round(n_bytes + (large_page_default_size - 1),
+                      large_page_default_size),
+           PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, SUPER_PAGE_SIZE, 0);
+  return (ptr != (void *)-1) ? ptr : nullptr;
+}
+
+/** Releases memory backed by large (huge) pages.
+
+    @param[in] ptr Pointer to large (huge) page aligned storage.
+    @param[in] n_bytes Size of the storage.
+    @return Returns true if releasing the large (huge) page succeeded.
+ */
+inline bool large_page_aligned_free(void *ptr, size_t n_bytes) {
+  if (unlikely(!ptr)) return false;
+  // Freeing huge-pages require size to be the multiple of huge-page size
+  auto ret = munmap(ptr, pow2_round(n_bytes + (large_page_default_size - 1),
+                                    large_page_default_size));
+  return ret == 0;
+}
+
+/** Queries the current size of large (huge) pages on running system.
+
+    @return Large (huge) page size in bytes.
+*/
+inline size_t large_page_size() {
+  // Return value of this function is hard-coded because of the way how
+  // large_page_aligned_alloc is allocating superpages
+  // (VM_FLAGS_SUPERPAGE_SIZE_2MB).
+  //
+  // Nonetheless we can make a compile-time check to detect situations when and
+  // if that value may change, in which case we can at least provide a
+  // guideline through static_assert message.
+  static_assert(
+      SUPER_PAGE_SIZE == VM_FLAGS_SUPERPAGE_SIZE_2MB,
+      "superpage size is not the one that has been expected (2MB). In case this \
+      is a wanted change, please tweak this static_assert _and_ modify this function \
+      to return appropriate new superpage size value.");
+  return 2 * 1024 * 1024;
+}
+
+}  // namespace detail
+}  // namespace ut
+
+#endif
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/detail/ut/large_page_alloc-solaris.h mysql-8.0-8.0.27/storage/innobase/include/detail/ut/large_page_alloc-solaris.h
--- mysql-8.0-8.0.26/storage/innobase/include/detail/ut/large_page_alloc-solaris.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/detail/ut/large_page_alloc-solaris.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,102 @@
+/*****************************************************************************
+
+Copyright (c) 2021, Oracle 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, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
+/** @file include/detail/ut/large_page_alloc-solaris.h
+ Solaris-specific implementation bits and pieces for large (huge) page
+ allocations. */
+
+#ifndef detail_ut_large_page_alloc_solaris_h
+#define detail_ut_large_page_alloc_solaris_h
+
+#include <sys/mman.h>
+#include <sys/types.h>
+
+#include "storage/innobase/include/detail/ut/helper.h"
+
+extern const size_t large_page_default_size;
+
+namespace ut {
+namespace detail {
+
+/** Allocates memory backed by large (huge) pages.
+
+    @param[in] n_bytes Size of storage (in bytes) requested to be allocated.
+    @return Pointer to the allocated storage. nullptr if allocation failed.
+*/
+inline void *large_page_aligned_alloc(size_t n_bytes) {
+  // mmap on Solaris requires for n_bytes to be a multiple of large-page size
+  size_t n_bytes_rounded = pow2_round(n_bytes + (large_page_default_size - 1),
+                                      large_page_default_size);
+  void *ptr = mmap(nullptr, n_bytes_rounded, PROT_READ | PROT_WRITE,
+                   MAP_PRIVATE | MAP_ANON, -1, 0);
+  // We also must do additional step to make it happen
+  struct memcntl_mha m = {};
+  m.mha_cmd = MHA_MAPSIZE_VA;
+  m.mha_pagesize = large_page_default_size;
+  if (memcntl(ptr, n_bytes_rounded, MC_HAT_ADVISE, (caddr_t)&m, 0, 0) == -1)
+    return nullptr;
+  return (ptr != (void *)-1) ? ptr : nullptr;
+}
+
+/** Releases memory backed by large (huge) pages.
+
+    @param[in] ptr Pointer to large (huge) page aligned storage.
+    @param[in] n_bytes Size of the storage.
+    @return Returns true if releasing the large (huge) page succeeded.
+ */
+inline bool large_page_aligned_free(void *ptr, size_t n_bytes) {
+  if (unlikely(!ptr)) return false;
+  // Freeing huge-pages require size to be the multiple of huge-page size
+  auto ret = munmap(ptr, pow2_round(n_bytes + (large_page_default_size - 1),
+                                    large_page_default_size));
+  return ret == 0;
+}
+
+/** Queries all possible page-sizes. Solaris allows picking one at _runtime_
+    which is contrary to how Linux, Windows and OSX does.
+
+    @return std::vector of supported page sizes (in bytes).
+*/
+inline std::vector<size_t> large_page_all_supported_sizes() {
+  int nr_of_pages = getpagesizes(NULL, 0);
+  std::vector<size_t> supported_page_sizes(nr_of_pages);
+  if (nr_of_pages > 0) {
+    getpagesizes(supported_page_sizes.data(), nr_of_pages);
+  }
+  return supported_page_sizes;
+}
+
+/** Queries the page-size that is next to the minimum supported page-size
+    Lowest supported page size is usually 4K on x86_64 whereas it's 8K on SPARC.
+
+    @return Minimum supported large (huge) page size in bytes.
+*/
+inline size_t large_page_size() { return large_page_all_supported_sizes()[1]; }
+
+}  // namespace detail
+}  // namespace ut
+
+#endif
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/detail/ut/large_page_alloc-win.h mysql-8.0-8.0.27/storage/innobase/include/detail/ut/large_page_alloc-win.h
--- mysql-8.0-8.0.26/storage/innobase/include/detail/ut/large_page_alloc-win.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/detail/ut/large_page_alloc-win.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,83 @@
+/*****************************************************************************
+
+Copyright (c) 2021, Oracle 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, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
+/** @file include/detail/ut/large_page_alloc-win.h
+ Windows-specific implementation bits and pieces for large (huge) page
+ allocations. */
+
+#ifndef detail_ut_large_page_alloc_win_h
+#define detail_ut_large_page_alloc_win_h
+
+#include <windows.h>
+// _must_ go after windows.h, this comment makes clang-format to preserve
+// the include order
+#include <memoryapi.h>
+
+#include "storage/innobase/include/detail/ut/helper.h"
+
+extern const size_t large_page_default_size;
+
+namespace ut {
+namespace detail {
+
+/** Allocates memory backed by large (huge) pages.
+
+    @param[in] n_bytes Size of storage (in bytes) requested to be allocated.
+    @return Pointer to the allocated storage. nullptr if allocation failed.
+*/
+inline void *large_page_aligned_alloc(size_t n_bytes) {
+  // VirtualAlloc requires for n_bytes to be a multiple of large-page size
+  void *ptr =
+      VirtualAlloc(nullptr,
+                   pow2_round(n_bytes + (large_page_default_size - 1),
+                              large_page_default_size),
+                   MEM_COMMIT | MEM_RESERVE | MEM_LARGE_PAGES, PAGE_READWRITE);
+  return ptr;
+}
+
+/** Releases memory backed by large (huge) pages.
+
+    @param[in] ptr Pointer to large (huge) page aligned storage.
+    @param[in] n_bytes Size of the storage.
+    @return Returns true if releasing the large (huge) page succeeded.
+ */
+inline bool large_page_aligned_free(void *ptr, size_t n_bytes) {
+  if (unlikely(!ptr)) return false;
+  auto ret = VirtualFree(ptr, 0, MEM_RELEASE);
+  (void)n_bytes;
+  return ret != 0;
+}
+
+/** Queries the current size of large (huge) pages on running system.
+
+    @return Large (huge) page size in bytes.
+*/
+inline size_t large_page_size() { return GetLargePageMinimum(); }
+
+}  // namespace detail
+}  // namespace ut
+
+#endif
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/detail/ut/page_alloc.h mysql-8.0-8.0.27/storage/innobase/include/detail/ut/page_alloc.h
--- mysql-8.0-8.0.26/storage/innobase/include/detail/ut/page_alloc.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/detail/ut/page_alloc.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,390 @@
+/*****************************************************************************
+
+Copyright (c) 2021, Oracle 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, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
+/** @file include/detail/ut/page_alloc.h
+ Implementation bits and pieces for page-aligned allocations. */
+
+#ifndef detail_ut_page_alloc_h
+#define detail_ut_page_alloc_h
+
+#ifdef _WIN32
+#include <windows.h>
+// _must_ go after windows.h, this comment makes clang-format to preserve
+// the include order
+#include <memoryapi.h>
+#else
+#include <sys/mman.h>
+#endif
+
+#include <cassert>
+#include <cstddef>
+#include <cstdint>
+#include <cstdlib>
+#include <memory>
+#include <utility>
+
+#include "my_compiler.h"
+#include "my_config.h"
+#include "storage/innobase/include/detail/ut/allocator_traits.h"
+#include "storage/innobase/include/detail/ut/helper.h"
+#include "storage/innobase/include/detail/ut/page_metadata.h"
+#include "storage/innobase/include/detail/ut/pfs.h"
+
+namespace ut {
+namespace detail {
+
+/** Allocates system page-aligned memory.
+
+    @param[in] n_bytes Size of storage (in bytes) requested to be allocated.
+    @return Pointer to the allocated storage. nullptr if allocation failed.
+*/
+inline void *page_aligned_alloc(size_t n_bytes) {
+#ifdef _WIN32
+  // With lpAddress set to nullptr, VirtualAlloc will internally round n_bytes
+  // to the multiple of system page size if it is not already
+  void *ptr =
+      VirtualAlloc(nullptr, n_bytes, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
+  return ptr;
+#else
+  // With addr set to nullptr, mmap will internally round n_bytes to the
+  // multiple of system page size if it is not already
+  void *ptr = mmap(nullptr, n_bytes, PROT_READ | PROT_WRITE,
+                   MAP_PRIVATE | MAP_ANON, -1, 0);
+  return (ptr != (void *)-1) ? ptr : nullptr;
+#endif
+}
+
+/** Releases system page-aligned storage.
+
+    @param[in] ptr Pointer to system page-aligned storage.
+    @param[in] n_bytes Size of the storage.
+    @return True if releasing the page-aligned memory was successful.
+ */
+inline bool page_aligned_free(void *ptr, size_t n_bytes) {
+  if (unlikely(!ptr)) return false;
+#ifdef _WIN32
+  auto ret = VirtualFree(ptr, 0, MEM_RELEASE);
+  (void)n_bytes;
+  return ret != 0;
+#else
+  // length aka n_bytes does not need to be aligned to page-size
+  auto ret = munmap(ptr, n_bytes);
+  return ret == 0;
+#endif
+}
+
+/** Allocation routines which are purposed for allocating system page-aligned
+    memory.
+
+    page_aligned_alloc() and page_aligned_free() are taking care of
+    OS specific details and Page_alloc is a convenience wrapper which only
+    makes the use of system page-aligned memory more ergonomic so that it
+    serializes the actual size being allocated into the raw memory. This size
+    is then automagically deduced when system page-aligned memory is being
+    freed. Otherwise, client code would have been responsible to store and keep
+    that value somewhere until the memory segment is freed. Additionally,
+    information on type of page used to back up requested allocation is also
+    serialized into the memory allowing to build higher-kinded abstractions more
+    easily. See ut::malloc_large_page with option to fallback to regular pages
+    through ut::malloc_page.
+
+    Cost associated with this abstraction is the size of a single CPU page. In
+    terms of virtual memory, especially in 64-bit address space, this cost is
+    negligible. In practice this means that for each N pages allocation
+    request there will be N+1 pages allocated beneath.
+
+    Memory layout representation looks like the following:
+
+     ------------------------------------------
+     | PAGE-ALLOC-METADATA |   ... DATA ...   |
+     ------------------------------------------
+      ^                     ^
+      |                     |
+      |                     |
+      |          ptr (system-page) to be
+      |           returned to call-site
+      |
+     --------------------------------
+     | DATALEN | PAGE-TYPE | VARLEN |
+     --------------------------------
+      ^
+      |
+      |
+     ptr returned by
+    page_aligned_alloc
+
+
+    For details on DATALEN, PAGE-TYPE and VARLEN fields see Page_alloc_metadata.
+
+    DATA is an actual page-aligned segment that will be returned to the
+    call-site and which the client code will be able to use for the application
+    data.
+ */
+struct Page_alloc : public allocator_traits<false> {
+  using page_allocation_metadata = Page_alloc_metadata;
+
+  /** Allocates memory through large-page support.
+
+      @param[in] size Size of storage (in bytes) requested to be allocated.
+      @return Pointer to the allocated storage. nullptr if allocation failed.
+   */
+  static inline void *alloc(std::size_t size) {
+    auto total_len = round_to_next_multiple(
+        size + page_allocation_metadata::len, CPU_PAGE_SIZE);
+    auto mem = page_aligned_alloc(total_len);
+    if (unlikely(!mem)) return nullptr;
+    page_allocation_metadata::datalen(mem, total_len);
+    page_allocation_metadata::page_type(mem, Page_type::system_page);
+    return static_cast<uint8_t *>(mem) + page_allocation_metadata::len;
+  }
+
+  /** Releases storage allocated through Page_alloc::alloc().
+
+      @param[in] data Pointer to storage allocated through
+      Page_alloc::alloc()
+      @return True if releasing the page-aligned memory was successful.
+   */
+  static inline bool free(void *data) noexcept {
+    if (unlikely(!data)) return false;
+    return page_aligned_free(deduce(data),
+                             datalen(data) + page_allocation_metadata::len);
+  }
+
+  /** Returns the number of bytes that have been allocated.
+
+      @param[in] data Pointer to storage allocated through
+      Page_alloc::alloc()
+      @return Number of bytes.
+   */
+  static inline page_allocation_metadata::datalen_t datalen(void *data) {
+    return page_allocation_metadata::datalen(data) -
+           page_allocation_metadata::len;
+  }
+
+  /** Returns the the type of the page..
+
+      @param[in] data Pointer to storage allocated through
+      Page_alloc::alloc()
+      @return Page type.
+   */
+  static inline Page_type page_type(void *data) {
+    return page_allocation_metadata::page_type(data);
+  }
+
+ private:
+  /** Helper function which deduces the original pointer returned by
+      Page_alloc from a pointer which is passed to us by the call-site.
+   */
+  static inline void *deduce(void *data) noexcept {
+    return reinterpret_cast<void *>(static_cast<uint8_t *>(data) -
+                                    page_allocation_metadata::len);
+  }
+};
+
+/** Allocation routines which are purposed for allocating system page-aligned
+    memory. This is a PFS (performance-schema) variant of Page_alloc.
+    Implemented in terms of Page_alloc_metadata_pfs.
+
+    page_aligned_alloc() and page_aligned_free() are taking care of
+    OS specific details and Page_alloc_pfs is a convenience wrapper which
+    only makes the use of system page-aligned memory more ergonomic so that
+    it serializes all the relevant PFS details into the raw memory. Otherwise,
+    client code would have been responsible to store and keep those details
+    somewhere until the memory segment is freed. Additionally, information on
+    type of page used to back up requested allocation is also serialized into
+    the memory allowing to build higher-kinded abstractions more easily. See
+    ut::malloc_large_page with option to fallback to regular pages through
+    ut::malloc_page.
+
+    Cost associated with this abstraction is the size of a single CPU page. In
+    terms of virtual memory, especially in 64-bit address space, this cost is
+    negligible. In practice this means that for each N pages allocation
+    request there will be N+1 pages allocated beneath.
+
+    Memory layout representation looks like the following:
+
+     ----------------------------------------------
+     | PAGE-ALLOC-METADATA-PFS |   ... DATA ...   |
+     ----------------------------------------------
+      ^                         ^
+      |                         |
+      |                         |
+      |               ptr (system-page) to be
+      |                returned to call-site
+      |
+     ---------------------------------------------------
+     | PFS-META | PAGE-TYPE | VARLEN | PFS-META-OFFSET |
+     ---------------------------------------------------
+      ^   ^
+      |   |
+      |  ---------------------------
+      |  | OWNER |  DATALEN  | KEY |
+      |  ---------------------------
+      |
+     ptr returned by
+    page_aligned_alloc
+
+    For details on PFS-META, PAGE-TYPE, VARLEN and PFS-META-OFFSET fields
+    see Page_alloc_metadata_pfs.
+
+    DATA is an actual page-aligned segment that will be returned to the
+    call-site and which the client code will be able to use for the application
+    data.
+ */
+struct Page_alloc_pfs : public allocator_traits<true> {
+  using page_allocation_metadata = Page_alloc_metadata_pfs;
+
+  /** Allocates system page-aligned memory.
+
+      @param[in] size Size of storage (in bytes) requested to be allocated.
+      @param[in] key PSI memory key to be used for PFS memory instrumentation.
+      @return Pointer to the allocated storage. nullptr if allocation failed.
+    */
+  static inline void *alloc(
+      std::size_t size,
+      page_allocation_metadata::pfs_metadata::pfs_memory_key_t key) {
+    auto total_len = round_to_next_multiple(
+        size + page_allocation_metadata::len, CPU_PAGE_SIZE);
+    auto mem = page_aligned_alloc(total_len);
+    if (unlikely(!mem)) return nullptr;
+
+#ifdef HAVE_PSI_MEMORY_INTERFACE
+    // The point of this allocator variant is to trace the memory allocations
+    // through PFS (PSI) so do it.
+    page_allocation_metadata::pfs_metadata::pfs_owning_thread_t owner;
+    key = PSI_MEMORY_CALL(memory_alloc)(key, total_len, &owner);
+    // To be able to do the opposite action of tracing when we are releasing the
+    // memory, we need right about the same data we passed to the tracing
+    // memory_alloc function. Let's encode this it into our allocator so we
+    // don't have to carry and keep this data around.
+    page_allocation_metadata::pfs_metadata::pfs_owning_thread(mem, owner);
+    page_allocation_metadata::pfs_metadata::pfs_datalen(mem, total_len);
+    page_allocation_metadata::pfs_metadata::pfs_key(mem, key);
+    page_allocation_metadata::pfs_metadata::pfs_metaoffset(
+        mem, page_allocation_metadata::len);
+    page_allocation_metadata::page_type(mem, Page_type::system_page);
+#endif
+
+    return static_cast<uint8_t *>(mem) + page_allocation_metadata::len;
+  }
+
+  /** Releases storage allocated through Page_alloc_pfs::alloc().
+
+      @param[in] data Pointer to storage allocated through
+      Page_alloc_pfs::alloc()
+      @return True if releasing the page-aligned memory was successful.
+   */
+  static inline bool free(PFS_metadata::data_segment_ptr data) noexcept {
+    if (unlikely(!data)) return false;
+
+    PFS_metadata::pfs_datalen_t total_len = {};
+#ifdef HAVE_PSI_MEMORY_INTERFACE
+    // Deduce the PFS data we encoded in Page_alloc_pfs::alloc()
+    auto key = page_allocation_metadata::pfs_metadata::pfs_key(data);
+    auto owner =
+        page_allocation_metadata::pfs_metadata::pfs_owning_thread(data);
+    total_len = page_allocation_metadata::pfs_metadata::pfs_datalen(data);
+    // With the deduced PFS data, now trace the memory release action.
+    PSI_MEMORY_CALL(memory_free)
+    (key, total_len, owner);
+#endif
+
+    return page_aligned_free(deduce(data), total_len);
+  }
+
+  /** Returns the number of bytes that have been allocated.
+
+      @param[in] data Pointer to storage allocated through
+      Page_alloc_pfs::alloc()
+      @return Number of bytes.
+   */
+  static inline size_t datalen(PFS_metadata::data_segment_ptr data) {
+    return page_allocation_metadata::pfs_metadata::pfs_datalen(data) -
+           page_allocation_metadata::len;
+  }
+
+  /** Returns the Page_type.
+
+      @param[in] data Pointer to storage allocated through
+      Page_alloc_pfs::alloc()
+      @return Page type.
+   */
+  static inline Page_type page_type(PFS_metadata::data_segment_ptr data) {
+    return page_allocation_metadata::page_type(data);
+  }
+
+ private:
+  /** Helper function which deduces the original pointer returned by
+      Page_alloc_pfs from a pointer which is passed to us by the
+      call-site.
+   */
+  static inline void *deduce(PFS_metadata::data_segment_ptr data) noexcept {
+    return page_allocation_metadata::pfs_metadata::deduce_pfs_meta(data);
+  }
+};
+
+/** Simple utility metafunction which selects appropriate allocator variant
+    (implementation) depending on the input parameter(s).
+  */
+template <bool Pfs_memory_instrumentation_on>
+struct select_page_alloc_impl {
+  using type = Page_alloc;  // When PFS is OFF, pick ordinary, non-PFS, variant
+};
+
+template <>
+struct select_page_alloc_impl<true> {
+  using type = Page_alloc_pfs;  // Otherwise, pick PFS variant
+};
+
+/** Just a small helper type which saves us some keystrokes. */
+template <bool Pfs_memory_instrumentation_on>
+using select_page_alloc_impl_t =
+    typename select_page_alloc_impl<Pfs_memory_instrumentation_on>::type;
+
+/** Small wrapper which utilizes SFINAE to dispatch the call to appropriate
+    aligned allocator implementation.
+  */
+template <typename Impl>
+struct Page_alloc_ {
+  template <typename T = Impl>
+  static inline typename std::enable_if<T::is_pfs_instrumented_v, void *>::type
+  alloc(size_t size, PSI_memory_key key) {
+    return Impl::alloc(size, key);
+  }
+  template <typename T = Impl>
+  static inline typename std::enable_if<!T::is_pfs_instrumented_v, void *>::type
+  alloc(size_t size, PSI_memory_key /*key*/) {
+    return Impl::alloc(size);
+  }
+  static inline bool free(void *ptr) { return Impl::free(ptr); }
+  static inline size_t datalen(void *ptr) { return Impl::datalen(ptr); }
+  static inline Page_type page_type(void *ptr) { return Impl::page_type(ptr); }
+};
+
+}  // namespace detail
+}  // namespace ut
+
+#endif
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/detail/ut/page_metadata.h mysql-8.0-8.0.27/storage/innobase/include/detail/ut/page_metadata.h
--- mysql-8.0-8.0.26/storage/innobase/include/detail/ut/page_metadata.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/detail/ut/page_metadata.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,243 @@
+/*****************************************************************************
+
+Copyright (c) 2021, Oracle 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, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
+/** @file include/detail/ut/page_metadata.h
+    Implementation bits and pieces for metadata for normal and large (huge) page
+    allocations.
+ */
+
+#ifndef detail_ut_page_metadata_h
+#define detail_ut_page_metadata_h
+
+#include "storage/innobase/include/detail/ut/helper.h"
+#include "storage/innobase/include/detail/ut/pfs.h"
+
+namespace ut {
+namespace detail {
+
+/** Types of pages currently supported by ut:: library functions */
+enum class Page_type { system_page = 0x10, large_page = 0x20 };
+
+/** Helper struct implementing the type which represents the metadata for all
+    types of page-aligned allocations, be it regular pages or huge-pages.
+
+    Concrete implementations such as Page_alloc or Large_page_alloc are
+    both implemented in terms of this basic building block. This is one way
+    which enables an easier implementation of higher-kinded convenience
+    library functions, e.g. huge-page allocation with fallback to regular pages.
+
+    Memory layout representation looks like the following:
+
+     --------------------------------
+     | DATALEN | PAGE-TYPE | VARLEN |
+     --------------------------------
+      \                              \
+       0                              \
+                              CPU_PAGE_SIZE - 1
+
+    DATALEN field encodes total size of memory consumed and not only the size of
+    the DATA segment.
+
+    PAGE-TYPE field encodes the type of page this memory is backed up with.
+
+    VARLEN is the leftover variable-length segment that specialized
+    implementations can further make use of by deducing its size from the
+    following formulae: abs(CPU_PAGE_SIZE - sizeof(DATALEN) -
+    sizeof(PAGE-TYPE)). In code that would be std::abs(CPU_PAGE_SIZE -
+    sizeof(Page_alloc_metadata::datalen_t) -
+    sizeof(Page_alloc_metadata::page_type_t)).
+    Not used by this implementation.
+ */
+struct Page_alloc_metadata {
+  /** This is how much tise metadata segment will be big. */
+  static constexpr auto len = CPU_PAGE_SIZE;
+
+  /** These are the types representing our memory fields. */
+  using datalen_t = size_t;
+  using page_type_t = size_t;
+
+  /** Sanity check so that we can be sure that the size of our metadata segment
+      is such so that the next segment coming after it (DATA) is always suitably
+      aligned (multiple of alignof(max_align_t).
+    */
+  static_assert(len % alignof(max_align_t) == 0,
+                "len must be divisible by alignof(max_align_t)");
+
+  /** Sanity check so that we can be sure that our metadata segment can fit
+      all our fields (datalen_t and page_type_t).
+    */
+  static_assert(sizeof(datalen_t) + sizeof(page_type_t) <= len,
+                "Metadata does not fit!");
+
+  /** Accessor to the datalen_t field. Returns its value.
+
+      @param[in] data Pointer to the DATA segment.
+      @return Value held by datalen_t field.
+   */
+  static inline datalen_t datalen(void *data) {
+    return *reinterpret_cast<datalen_t *>(static_cast<uint8_t *>(data) - len);
+  }
+
+  /** Accessor to the page_type_t field. Returns its value.
+
+      @param[in] data Pointer to the DATA segment.
+      @return Value held by page_type_t field, in particular Page_type.
+   */
+  static inline Page_type page_type(void *data) {
+    auto type = *reinterpret_cast<page_type_t *>(static_cast<uint8_t *>(data) -
+                                                 len + sizeof(datalen_t));
+    return static_cast<Page_type>(type);
+  }
+
+  /** Accessor to the datalen_t field. Sets its value.
+
+      @param[in] mem Pointer to the memory, usually allocated through
+      large_page_alloc or page_alloc.
+      @param[in] length New value to be set into the field.
+   */
+  static inline void datalen(void *mem, size_t length) {
+    *reinterpret_cast<datalen_t *>(mem) = length;
+  }
+
+  /** Accessor to the page_type_t field. Sets its value.
+
+      @param[in] mem Pointer to the memory, usually allocated through
+      large_page_alloc or page_alloc.
+      @param[in] type New value to be set into the field.
+   */
+  static inline void page_type(void *mem, Page_type type) {
+    *reinterpret_cast<page_type_t *>(static_cast<uint8_t *>(mem) +
+                                     sizeof(datalen_t)) =
+        static_cast<page_type_t>(type);
+  }
+};
+
+/**
+    Helper struct implementing the type which represents the metadata for all
+    types of PFS-aware page-aligned allocations, be it regular pages or
+    huge-pages.
+
+    Concrete implementations such as Page_alloc_pfs or Large_page_alloc_pfs are
+    both implemented in terms of this basic building block. This is one way
+    which enables an easier implementation of higher-kinded convenience
+    library functions, e.g. huge-page allocation with fallback to regular
+    pages.
+
+    Memory layout representation looks like the following:
+
+     ---------------------------------------------------
+     | PFS-META | PAGE-TYPE | VARLEN | PFS-META-OFFSET |
+     ---------------------------------------------------
+      \   ^                                             \
+       0  |                                              \
+          |                                       CPU_PAGE_SIZE - 1
+          |
+          |
+         ---------------------------
+         | OWNER |  DATALEN  | KEY |
+         ---------------------------
+
+    OWNER field encodes the owning thread.
+    DATALEN field encodes total size of memory consumed and not only the size of
+    the DATA segment.
+    KEY field encodes the PFS/PSI key.
+
+    PAGE-TYPE field encodes the type of page this memory is backed up with.
+
+    VARLEN is the leftover variable-length segment that specialized
+    implementations can further make use of by deducing its size from the
+    following formulae: abs(CPU_PAGE_SIZE - sizeof(PFS-META-OFFSET) -
+    sizeof(PFS-META)). In code that would be std::abs(CPU_PAGE_SIZE -
+    PFS_metadata::size). Not used by this implementation.
+
+    PFS-META-OFFSET, strictly speaking, isn't neccesary in this case of
+    system-pages, where alignment is always known in compile-time and thus the
+    offset we will be storing into the PFS-META-OFFSET field is always going
+    to be the same for the given platform. So, rather than serializing this
+    piece of information into the memory as we do right now, we could very
+    well be storing it into the compile-time evaluated constexpr constant. The
+    reason why we don't do it is that there is no advantage (*) of doing so
+    while we would be introducing a disadvantage of having to maintain separate
+    specialization of PFS_metadata and code would be somewhat more fragmented.
+
+     (*) Extra space that we need to allocate in order to be able to fit the
+         PFS_metadata is going to be the same regardless if there is
+         PFS-META-OFFSET field or not. This is due to the fact that PFS-META
+         segment alone is larger than alignof(max_align_t) so in order to
+         keep the DATA segment suitably aligned (% alignof(max_align_t) == 0)
+         we must choose the size for the whole PFS segment that is a multiple
+         of alignof(max_align_t).
+
+    PFS-META-OFFSET is a field which allows us to recover the pointer to
+    PFS-META segment from a pointer to DATA segment.
+ */
+struct Page_alloc_metadata_pfs {
+  using pfs_metadata = PFS_metadata;
+  using page_type_t = size_t;
+
+  /** This is how much this metadata segment will be big. */
+  static constexpr auto len = CPU_PAGE_SIZE;
+
+  /** Suitably-aligned offset for PAGE-TYPE field. */
+  static constexpr auto page_type_offset =
+      calc_align(pfs_metadata::meta_size, alignof(page_type_t));
+
+  /** Sanity check so that we can be sure that the size of our metadata segment
+      is such so that the pointer to DATA segment is always suitably aligned
+      (multiple of alignof(max_align_t).
+    */
+  static_assert(len % alignof(max_align_t) == 0,
+                "len must be divisible by alignof(max_align_t)");
+
+  /** Accessor to the page_type_t field. Returns its value.
+
+      @param[in] data Pointer to the DATA segment.
+      @return Value held by page_type_t field, in particular Page_type.
+   */
+  static inline Page_type page_type(void *data) {
+    auto type = *reinterpret_cast<page_type_t *>(
+        static_cast<uint8_t *>(pfs_metadata::deduce_pfs_meta(data)) +
+        page_type_offset);
+    return static_cast<Page_type>(type);
+  }
+
+  /** Accessor to the page_type_t field. Sets its value.
+
+      @param[in] mem Pointer to the memory, usually allocated through
+      large_page_alloc or page_alloc.
+      @param[in] type New value to be set into the field.
+   */
+  static inline void page_type(void *mem, Page_type type) {
+    *reinterpret_cast<page_type_t *>(static_cast<uint8_t *>(mem) +
+                                     page_type_offset) =
+        static_cast<page_type_t>(type);
+  }
+};
+
+}  // namespace detail
+}  // namespace ut
+
+#endif
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/detail/ut/pfs.h mysql-8.0-8.0.27/storage/innobase/include/detail/ut/pfs.h
--- mysql-8.0-8.0.26/storage/innobase/include/detail/ut/pfs.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/detail/ut/pfs.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,196 @@
+/*****************************************************************************
+
+Copyright (c) 2021, Oracle 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, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
+/** @file include/detail/ut/pfs.h
+    Implementation bits and pieces for PFS metadata handling. Shared by
+    different allocators.
+ */
+
+#ifndef detail_ut_pfs_h
+#define detail_ut_pfs_h
+
+#include <cassert>
+#include <cstddef>
+#include <cstdint>
+#include <cstdlib>
+#include <limits>
+#include <memory>
+#include <utility>
+
+#include "mysql/psi/mysql_memory.h"
+
+namespace ut {
+namespace detail {
+
+/** Memory layout representation of PFS metadata segment that is used by
+    the allocator variants which also want to trace the memory consumption
+    through PFS (PSI) interface.
+
+     --------------------------------------------------
+     | PFS-META | VARLEN | PFS-META-OFFSET |   DATA   |
+     --------------------------------------------------
+      ^    ^                                ^
+      |    |                                |
+      |   ---------------------------       |
+      |   | OWNER |  DATALEN  | KEY |       |
+      |   ---------------------------       |
+      |                                     |
+   ptr returned by                          |
+   Aligned_alloc_impl                       |
+                                            |
+                               ptr to be returned to call-site
+                                   will be pointing here
+
+   PFS-META is a segment that will hold all the necessary details one needs
+   to otherwise carry around in order to exercise the PFS memory tracing.
+   Following data will be serialized into this segment:
+     * Owning thread
+     * Total length of bytes allocated
+     * Key
+
+   VARLEN is the leftover variable-length segment that specialized
+   implementations can further make use of by deducing its size from the
+   following formulae: requested_alignment - sizeof(PFS-META-OFFSET) -
+   sizeof(PFS-META). In code that would be alignment -
+   PFS_metadata::size. Not used by this implementation.
+
+   PFS-META-OFFSET is a field which allows us to recover the pointer to PFS-META
+   segment from a pointer to DATA segment.
+
+   DATA is an actual segment which will keep the user data.
+ */
+struct PFS_metadata {
+  /** Convenience types that we will be using to serialize necessary details
+      into the Aligned_alloc metadata (allocator and PFS) segments.
+   */
+  using pfs_owning_thread_t = PSI_thread *;
+  using pfs_datalen_t = std::size_t;
+  using pfs_memory_key_t = PSI_memory_key;
+  using pfs_meta_offset_t = std::uint32_t;
+  using data_segment_ptr = void *;
+
+  /** Metadata size */
+  static constexpr auto meta_size = sizeof(pfs_memory_key_t) +
+                                    sizeof(pfs_owning_thread_t) +
+                                    sizeof(pfs_datalen_t);
+  static constexpr auto size = meta_size + sizeof(pfs_meta_offset_t);
+
+  /** Helper function which stores the PFS thread info into the OWNER field. */
+  static inline void pfs_owning_thread(data_segment_ptr data,
+                                       pfs_owning_thread_t thread) noexcept {
+    *ptr_to_pfs_owning_thread(data) = thread;
+  }
+  /** Helper function which stores the PFS datalen info into the DATALEN field.
+   */
+  static inline void pfs_datalen(data_segment_ptr data,
+                                 size_t datalen) noexcept {
+    assert(datalen <= std::numeric_limits<pfs_datalen_t>::max());
+    *ptr_to_pfs_datalen(data) = datalen;
+  }
+  /** Helper function which stores the PFS key info into the KEY field. */
+  static inline void pfs_key(data_segment_ptr data,
+                             pfs_memory_key_t key) noexcept {
+    *ptr_to_pfs_key(data) = key;
+  }
+  /** Helper function which stores the offset to PFS metadata segment into the
+   * PFS-META-OFFSET field.
+   */
+  static inline void pfs_metaoffset(data_segment_ptr data,
+                                    std::size_t alignment) noexcept {
+    assert(size <= alignment);
+    *ptr_to_pfs_meta_offset(data, alignment) = alignment;
+  }
+  /** Helper function which recovers the information user previously stored in
+      OWNER field.
+   */
+  static inline pfs_owning_thread_t pfs_owning_thread(
+      data_segment_ptr data) noexcept {
+    auto offset = pfs_meta_offset(data);
+    return *reinterpret_cast<pfs_owning_thread_t *>(
+        static_cast<uint8_t *>(data) - offset);
+  }
+  /** Helper function which recovers the information user previously stored in
+      DATALEN field.
+   */
+  static inline pfs_datalen_t pfs_datalen(data_segment_ptr data) noexcept {
+    auto offset = pfs_meta_offset(data);
+    return *reinterpret_cast<pfs_datalen_t *>(
+        static_cast<uint8_t *>(data) - offset + sizeof(pfs_owning_thread_t));
+  }
+  /** Helper function which recovers the information user previously stored in
+      KEY field.
+   */
+  static inline pfs_memory_key_t pfs_key(data_segment_ptr data) noexcept {
+    auto offset = pfs_meta_offset(data);
+    return *reinterpret_cast<pfs_memory_key_t *>(
+        static_cast<uint8_t *>(data) - offset + sizeof(pfs_datalen_t) +
+        sizeof(pfs_owning_thread_t));
+  }
+  /** Helper function which deduces the pointer to the beginning of PFS metadata
+      segment given the pointer to DATA segment.
+    */
+  static inline void *deduce_pfs_meta(data_segment_ptr data) noexcept {
+    auto offset = pfs_meta_offset(data);
+    return reinterpret_cast<void *>(reinterpret_cast<std::uintptr_t>(data) -
+                                    offset);
+  }
+
+ private:
+  /** Helper accessor function to OWNER metadata. */
+  static inline pfs_owning_thread_t *ptr_to_pfs_owning_thread(
+      data_segment_ptr data) noexcept {
+    return reinterpret_cast<pfs_owning_thread_t *>(data);
+  }
+  /** Helper accessor function to DATALEN metadata. */
+  static inline pfs_datalen_t *ptr_to_pfs_datalen(
+      data_segment_ptr data) noexcept {
+    return reinterpret_cast<pfs_datalen_t *>(ptr_to_pfs_owning_thread(data) +
+                                             1);
+  }
+  /** Helper accessor function to PFS metadata. */
+  static inline pfs_memory_key_t *ptr_to_pfs_key(
+      data_segment_ptr data) noexcept {
+    return reinterpret_cast<pfs_memory_key_t *>(ptr_to_pfs_datalen(data) + 1);
+  }
+  /** Helper accessor function to PFS-META-OFFSET metadata. */
+  static inline pfs_meta_offset_t *ptr_to_pfs_meta_offset(
+      data_segment_ptr data, std::size_t alignment) noexcept {
+    return reinterpret_cast<pfs_meta_offset_t *>(
+        static_cast<uint8_t *>(data) + alignment - sizeof(pfs_meta_offset_t));
+  }
+  /** Helper function which deduces PFS-META-OFFSET metadata value given the
+      pointer to DATA segment. */
+  static inline pfs_meta_offset_t pfs_meta_offset(
+      data_segment_ptr data) noexcept {
+    return *(reinterpret_cast<pfs_meta_offset_t *>(
+        static_cast<uint8_t *>(data) - sizeof(pfs_meta_offset_t)));
+  }
+};
+
+}  // namespace detail
+}  // namespace ut
+
+#endif
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/detail/ut0new.h mysql-8.0-8.0.27/storage/innobase/include/detail/ut0new.h
--- mysql-8.0-8.0.26/storage/innobase/include/detail/ut0new.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/detail/ut0new.h	2021-09-28 11:46:34.000000000 +0000
@@ -30,864 +30,30 @@
 #ifndef detail_ut0new_h
 #define detail_ut0new_h
 
-#include <cassert>
 #include <cstddef>
-#include <limits>
-#include <memory>
 #include <utility>
 
-#include "my_compiler.h"
-#include "my_dbug.h"
-#include "mysql/psi/mysql_memory.h"
+#include "storage/innobase/include/detail/ut/aligned_alloc.h"
+#include "storage/innobase/include/detail/ut/alloc.h"
+#include "storage/innobase/include/detail/ut/large_page_alloc.h"
+#include "storage/innobase/include/detail/ut/page_alloc.h"
 #include "storage/innobase/include/ut0tuple.h"
 
 namespace ut {
 namespace detail {
 
-#ifdef HAVE_PSI_MEMORY_INTERFACE
-constexpr bool WITH_PFS_MEMORY = true;
-#else
-constexpr bool WITH_PFS_MEMORY = false;
-#endif
-
-/** Calculates the smallest multiple of m that is not smaller than n
-    when m is a power of two. In other words, rounds n up to m * k.
-    @param n in: number to round up
-    @param m in: alignment, must be a power of two
-    @return n rounded up to the smallest possible integer multiple of m
- */
-constexpr size_t calc_align(size_t n, size_t m) {
-  // This is a copy pasta from ut0ut.h but consuming that header from
-  // this file bursts the build into flames. Let's at least stick to the
-  // similar name.
-  return (n + (m - 1)) & ~(m - 1);
+template <typename T, typename Tuple, size_t... Args_index_seq>
+inline void construct_impl(void *mem, size_t offset, Tuple &&tuple,
+                           std::index_sequence<Args_index_seq...>) {
+  new (reinterpret_cast<uint8_t *>(mem) + offset)
+      T{std::get<Args_index_seq>(std::forward<Tuple>(tuple))...};
 }
 
-/** Simple wrapping type around malloc, calloc and friends.*/
-template <bool Zero_initialized>
-struct Alloc_fn {
-  static void *alloc(size_t nbytes) { return std::malloc(nbytes); }
-};
-template <>
-struct Alloc_fn<true> {
-  static void *alloc(size_t nbytes) { return std::calloc(1, nbytes); }
-};
-
-struct Aligned_alloc_impl {
-  /** Block of memory returned by this functor will have an additional
-      (metadata) segment (at no additional cost of higher memory consumption)
-      which is guaranteed to be this big, and which can be used to store
-      whatever arbitrary data. See Aligned_alloc and Aligned_alloc_arr for
-      exemplary usages of it.
-   */
-  static constexpr uint32_t metadata_size = alignof(max_align_t);
-
-  /** Alias that we will be using to denote ptr to DATA segment. */
-  using data_segment_ptr = void *;
-
-  /** Dynamically allocates storage of given size and at the address aligned to
-      the requested alignment.
-
-      It is guaranteed that storage allocated by this functor is always
-      (size + alignment) big _and_ that there is always
-      alignof(std::max_align_t) spare bytes within that segment which can be
-      freely used. This means that pointer which is returned by this function
-      can always be safely reversed by alignof(std::max_align_t) bytes and hence
-      make this sub-segment accessible to any subsequent implementation.
-
-      Reversing the pointer for a value which is bigger than
-      alignof(std::max_align_t) bytes is in certain cases possible and can be
-      checked by inspecting the returned offset value. Some more specialized
-      implementations can take advantage of that fact too.
-
-      This property is very important because it can be taken advantage of by
-      other implementations so they are able to store whatever metadata they
-      would like into this segment of alignof(std::max_align_t) bytes, or FWIW
-      (pointer - offset) bytes in more specialized cases.
-
-      For example, let's say that size=10, alignment=32, and underlying
-      allocation function used by this function implementation returns a pointer
-      at address 128. This address must be a multiple of
-      alignof(std::max_align_t) which in this example is 16.
-
-           ------------------------------
-           | VARLEN |   META  |   DATA  |
-           ------------------------------
-           128      144       160     170
-
-      DATA is an actual data which has been requested with given size (10) and
-      alignment (32).
-      META is the alignof(std::max_align_t) segment that can always be freely
-      used by other implementations.
-      VARLEN is the leftover variable-length segment that specialized
-      implementations can further make use of by deducing its size from returned
-      offset.
-
-      See Aligned_alloc and Aligned_alloc_arr implementations to see an example
-      of how META segment can be used.
-
-      @param[in] size Size of storage (in bytes) requested to be allocated.
-      @param[in] alignment Alignment requirement for storage to be allocated.
-      Must be power of two and larger than alignof(std::max_align_t).
-      @return {pointer, offset} where pointer is a pointer to dynamically
-      allocated storage aligned to requested alignment, and offset is distance
-      in bytes from pointer which has been originally returned by underlying
-      dynamic allocation function (e.g. std::malloc). Otherwise {nullptr, 0} if
-      dynamic storage allocation failed.
-   */
-  template <bool Zero_initialized>
-  static inline std::pair<data_segment_ptr, std::size_t> alloc(
-      std::size_t size, std::size_t alignment) noexcept {
-    // This API is only about the extended alignments. Non-extended are
-    // already handled with std::malloc.
-    assert(alignment > alignof(std::max_align_t));
-
-    // Here we can take advantage of the fact that std::malloc is always
-    // guaranteed to return suitably aligned pointer P. In other words, this
-    // means that pointer P will be aligned to the value of
-    // alignof(std::max_align_t). That value on Linux implementations is
-    // typically 8 bytes (x86) or 16 bytes (x86-64) but this is completely
-    // implementation-defined. Windows implementation, for example, defines this
-    // value to be 8 bytes for both x86 _and_ x86-64.
-    //
-    // Question which arises is how many bytes do we need to ask std::malloc in
-    // order to satisfy the requested alignment, A, and requested size, S.
-    //
-    // Short answer is (size + alignment) and you can skip the following section
-    // if you're not interested in how we got to that value.
-    //
-    // Long answer is that we can model the problem mathematically as follows:
-    //    A = alignment
-    //    S = size
-    //    P = std::malloc(N);
-    //    P % alignof(std::max_align_t) = 0;
-    // where
-    //    N is our unknown and for which we can only say that:
-    //      N = S + K
-    //    is true where K is also some unknown value.
-    //
-    // (A) In cases when P % A = 0, we know that we are already at suitable
-    // address so we can deduce that:
-    //    K = 0
-    // from which it follows that:
-    //    N = S + K = S
-    //
-    // (B) In cases when P % A != 0, our K must be sufficiently large so that
-    //    <P, P + K]
-    // range contains value, P', so that
-    //    P' % A = 0
-    // If K = A, then
-    //    <P, P + A]
-    // which can be expanded as
-    //    <P, P + 1, P + 2, P + 3, ..., P + A]
-    //
-    // If we know that
-    //    P % A != 0
-    // then we also know that
-    //    (P + A) % A = P % A + A % A = P % A + 0 = P % A != 0
-    // which implies that our P' value is in
-    //    <P, P + A>
-    // range.
-    //
-    // Given that
-    //    P % alignof(std::max_align_t) = 0
-    //    P' % A = 0
-    //    A % alignof(std::max_align_t) = 0
-    //    P' % alignof(std::max_align_t) = 0
-    // it follows that our P' value can only be found at
-    //    P' = P + L*alignof(std::max_align_t)
-    // increments where L is some constant value in range of
-    //    L = [1, x>
-    // Expanding <P, P + A> into what we know so far:
-    //    <P, ..., P + L*alignof(std::max_align_t), ..., P + A>
-    // it follows that
-    //    P + L*alignof(std::max_align_t) < P + A
-    // which equals to
-    //    L*alignof(std::max_align_t) < A
-    //
-    // We now just need to prove that
-    //    L*alignof(std::max_align_t) < A
-    // is always true for some L value in which case this would mean that our
-    // <P, P + A> range contains at least one value for which P' % = 0.
-    //
-    // Picking the first available L value from L = [1, x> range,
-    // we will get
-    //    1*alignof(std::max_align_t) < A
-    // Given that
-    //    A > 2*alignof(std::max_align_t) - 1
-    // must be true, it follows that
-    //    1*alignof(std::max_align_t) < 2*alignof(std::max_align_t) - 1 < A
-    // and
-    //    1*alignof(std::max_align_t) < 2*alignof(std::max_align_t) - 1
-    //    alignof(std::max_align_t) > 1
-    // is always true.
-    //
-    // To conclude:
-    //    (1) N = S       for P % A = 0
-    //    (2) N = S + A   for P % A != 0
-    //
-    // Given that P is a runtime value which we cannot know upfront we must opt
-    // for N = S + A.
-    const std::size_t data_len = size + alignment;
-    void *mem = Alloc_fn<Zero_initialized>::alloc(data_len);
-    if (unlikely(!mem)) return {nullptr, 0};
-
-    // To guarantee that storage allocated by this function is as advertised
-    // (exactly (size + alignment) big with at least alignof(std::max_align_t)
-    // spare bytes to be used from within that segment) we must handle the N = S
-    // case (see above) and offset the memory by 1 byte. Given the above proof
-    // we know that the next suitable address aligned to requested alignment
-    // must be at least alignof(std::max_align_t) bytes far away.
-    void *buf =
-        reinterpret_cast<void *>(reinterpret_cast<std::uintptr_t>(mem) + 1);
-    std::size_t buf_size = data_len - 1;
-
-    // TODO(jbakamovic): wrap following std::align expression with ut_a(...)
-    // after we clean up circular-dependencies from our headers. Until then, it
-    // is not possible as including ut0dbg.h header makes the build fail in
-    // mysterious ways.
-    MY_ATTRIBUTE((unused))
-    auto ret = std::align(alignment, size, buf, buf_size);
-    assert(ret != nullptr);
-
-    return {buf, reinterpret_cast<std::uintptr_t>(buf) -
-                     reinterpret_cast<std::uintptr_t>(mem)};
-  }
-
-  /** Releases storage allocated through alloc().
-
-      @param[in] ptr data_segment_pointer decreased by offset bytes. Both are
-      obtained through alloc().
-  */
-  static inline void free(void *ptr) noexcept { std::free(ptr); }
-};
-
-/** Memory layout representation of metadata segment guaranteed by
-    the inner workings of Aligned_alloc_impl.
-
-     ----------------------------------------------------
-     | VARLEN | ALIGNED-ALLOC-META |    ... DATA ...    |
-     ----------------------------------------------------
-                 ^                  ^
-                 |                  |
-                 |                  |
-                 |         ptr returned by Aligned_alloc_impl
-                 |
-                --------------------------------
-                |    META_2    |     META_1    |
-                --------------------------------
-                 \                              \
-                  0                              \
-                                                  \
-                                        alignof(max_align_t) - 1
-
-   VARLEN and ALIGNED-ALLOC-META are direct byproduct of Aligned_alloc_impl
-   layout and guarantees.
-
-   VARLEN is the leftover variable-length segment that specialized
-   implementations can further make use of by deducing its size from returned
-   offset. Not used by this implementation.
-
-   ALIGNED-ALLOC-META is the segment which this abstraction is about. It
-   can hold up to sizeof(META_1) + sizeof(META_2) bytes which is, due to
-   Aligned_alloc_impl guarantees, at most alignof(max_align_t) bytes large.
-   Providing larger data than supported is not possible and it is guarded
-   through the means of static_assert. META_1 and META_2 fields can be
-   arbitrarily sized meaning that they can even be of different sizes each.
-
-   DATA is an actual segment which will keep the user data.
-  */
-template <typename Meta_1_type, typename Meta_2_type>
-struct Aligned_alloc_metadata {
-  /** Convenience types that we will be using to serialize necessary details
-      into the metadata segment.
-   */
-  using meta_1_t = Meta_1_type;
-  using meta_2_t = Meta_2_type;
-  using unaligned_meta_2_t = meta_2_t;
-
-  /** Metadata size */
-  static constexpr auto allocator_metadata_size =
-      sizeof(meta_1_t) + sizeof(meta_2_t);
-  /** Max metadata size */
-  static constexpr auto max_metadata_size = Aligned_alloc_impl::metadata_size;
-  /** Bail out if we cannot fit the requested data size. */
-  static_assert(allocator_metadata_size <= max_metadata_size,
-                "Aligned_alloc_impl provides a strong guarantee "
-                "of only up to Aligned_alloc_impl::metadata_size bytes.");
-
-  /** Helper function which stores user-provided detail into the META_1 field.
-   */
-  static inline void meta_1(Aligned_alloc_impl::data_segment_ptr data,
-                            std::size_t meta_1_v) noexcept {
-    assert(meta_1_v <= std::numeric_limits<meta_1_t>::max());
-    *ptr_to_meta_1(data) = meta_1_v;
-  }
-  /** Helper function which stores user-provided detail into the META_2 field.
-   */
-  static inline void meta_2(Aligned_alloc_impl::data_segment_ptr data,
-                            std::size_t meta_2_v) noexcept {
-    assert(meta_2_v <= std::numeric_limits<meta_2_t>::max());
-    memcpy(ptr_to_meta_2(data), &meta_2_v, sizeof(meta_2_t));
-  }
-  /** Helper function which recovers the information user previously stored in
-      META_1 field.
-   */
-  static inline meta_1_t meta_1(
-      Aligned_alloc_impl::data_segment_ptr data) noexcept {
-    return *ptr_to_meta_1(data);
-  }
-  /** Helper function which recovers the information user previously stored in
-      META_2 field.
-   */
-  static inline meta_2_t meta_2(
-      Aligned_alloc_impl::data_segment_ptr data) noexcept {
-    meta_2_t meta_2_v;
-    memcpy(&meta_2_v, ptr_to_meta_2(data), sizeof(meta_2_t));
-    return meta_2_v;
-  }
-
- private:
-  /** Helper accessor function to metadata (offset). */
-  static inline meta_1_t *ptr_to_meta_1(
-      Aligned_alloc_impl::data_segment_ptr data) noexcept {
-    return reinterpret_cast<meta_1_t *>(data) - 1;
-  }
-  /** Helper accessor function to metadata (data length). */
-  static inline unaligned_meta_2_t *ptr_to_meta_2(
-      Aligned_alloc_impl::data_segment_ptr data) noexcept {
-    return reinterpret_cast<meta_2_t *>(ptr_to_meta_1(data)) - 1;
-  }
-};
-
-/** Memory layout representation of PFS metadata segment that is used by
-    the allocator variants which also want to trace the memory consumption
-    through PFS (PSI) interface.
-
-     --------------------------------------------------
-     | PFS-META | VARLEN | PFS-META-OFFSET |   DATA   |
-     --------------------------------------------------
-      ^    ^                                ^
-      |    |                                |
-      |   ---------------------------       |
-      |   | OWNER |  DATALEN  | KEY |       |
-      |   ---------------------------       |
-      |                                     |
-   ptr returned by                          |
-   Aligned_alloc_impl                       |
-                                            |
-                               ptr to be returned to call-site
-                                   will be pointing here
-
-   PFS-META is a segment that will hold all the necessary details one needs
-   to otherwise carry around in order to exercise the PFS memory tracing.
-   Following data will be serialized into this segment:
-     * Owning thread
-     * Total length of bytes allocated
-     * Key
-
-   VARLEN is the leftover variable-length segment that specialized
-   implementations can further make use of by deducing its size from the
-   following formulae: requested_alignment - sizeof(PFS-META-OFFSET) -
-   sizeof(PFS-META). In code that would be alignment -
-   PFS_metadata::pfs_metadata_size. Not used by this implementation.
-
-   PFS-META-OFFSET is a field which allows us to recover the pointer to PFS-META
-   segment from a pointer to DATA segment.
-
-   DATA is an actual segment which will keep the user data.
- */
-struct PFS_metadata {
-  /** Convenience types that we will be using to serialize necessary details
-      into the Aligned_alloc metadata (allocator and PFS) segments.
-   */
-  using pfs_owning_thread_t = PSI_thread *;
-  using pfs_datalen_t = std::size_t;
-  using pfs_memory_key_t = PSI_memory_key;
-  using pfs_meta_offset_t = std::uint32_t;
-  using data_segment_ptr = void *;
-
-  /** Metadata size */
-  static constexpr auto pfs_metadata_size =
-      sizeof(pfs_memory_key_t) + sizeof(pfs_owning_thread_t) +
-      sizeof(pfs_datalen_t) + sizeof(pfs_meta_offset_t);
-
-  /** Helper function which stores the PFS thread info into the OWNER field. */
-  static inline void pfs_owning_thread(
-      Aligned_alloc_impl::data_segment_ptr data,
-      pfs_owning_thread_t thread) noexcept {
-    *ptr_to_pfs_owning_thread(data) = thread;
-  }
-  /** Helper function which stores the PFS datalen info into the DATALEN field.
-   */
-  static inline void pfs_datalen(Aligned_alloc_impl::data_segment_ptr data,
-                                 size_t datalen) noexcept {
-    assert(datalen <= std::numeric_limits<pfs_datalen_t>::max());
-    *ptr_to_pfs_datalen(data) = datalen;
-  }
-  /** Helper function which stores the PFS key info into the KEY field. */
-  static inline void pfs_key(Aligned_alloc_impl::data_segment_ptr data,
-                             pfs_memory_key_t key) noexcept {
-    *ptr_to_pfs_key(data) = key;
-  }
-  /** Helper function which stores the offset to PFS metadata segment into the
-   * PFS-META-OFFSET field.
-   */
-  static inline void pfs_metaoffset(Aligned_alloc_impl::data_segment_ptr data,
-                                    std::size_t alignment) noexcept {
-    assert(pfs_metadata_size <= alignment);
-    *ptr_to_pfs_meta_offset(data, alignment) = alignment;
-  }
-  /** Helper function which recovers the information user previously stored in
-      OWNER field.
-   */
-  static inline pfs_owning_thread_t pfs_owning_thread(
-      data_segment_ptr data) noexcept {
-    auto offset = pfs_meta_offset(data);
-    return *reinterpret_cast<pfs_owning_thread_t *>(
-        static_cast<uint8_t *>(data) - offset);
-  }
-  /** Helper function which recovers the information user previously stored in
-      DATALEN field.
-   */
-  static inline pfs_datalen_t pfs_datalen(data_segment_ptr data) noexcept {
-    auto offset = pfs_meta_offset(data);
-    return *reinterpret_cast<pfs_datalen_t *>(
-        static_cast<uint8_t *>(data) - offset + sizeof(pfs_owning_thread_t));
-  }
-  /** Helper function which recovers the information user previously stored in
-      KEY field.
-   */
-  static inline pfs_memory_key_t pfs_key(data_segment_ptr data) noexcept {
-    auto offset = pfs_meta_offset(data);
-    return *reinterpret_cast<pfs_memory_key_t *>(
-        static_cast<uint8_t *>(data) - offset + sizeof(pfs_datalen_t) +
-        sizeof(pfs_owning_thread_t));
-  }
-  /** Helper function which deduces the pointer to the beginning of PFS metadata
-      segment given the pointer to DATA segment.
-    */
-  static inline void *deduce_pfs_meta(data_segment_ptr data) noexcept {
-    auto offset = pfs_meta_offset(data);
-    return reinterpret_cast<void *>(reinterpret_cast<std::uintptr_t>(data) -
-                                    offset);
-  }
-
- private:
-  /** Helper accessor function to OWNER metadata. */
-  static inline pfs_owning_thread_t *ptr_to_pfs_owning_thread(
-      Aligned_alloc_impl::data_segment_ptr data) noexcept {
-    return reinterpret_cast<pfs_owning_thread_t *>(data);
-  }
-  /** Helper accessor function to DATALEN metadata. */
-  static inline pfs_datalen_t *ptr_to_pfs_datalen(
-      Aligned_alloc_impl::data_segment_ptr data) noexcept {
-    return reinterpret_cast<pfs_datalen_t *>(ptr_to_pfs_owning_thread(data) +
-                                             1);
-  }
-  /** Helper accessor function to PFS metadata. */
-  static inline pfs_memory_key_t *ptr_to_pfs_key(
-      Aligned_alloc_impl::data_segment_ptr data) noexcept {
-    return reinterpret_cast<pfs_memory_key_t *>(ptr_to_pfs_datalen(data) + 1);
-  }
-  /** Helper accessor function to PFS-META-OFFSET metadata. */
-  static inline pfs_meta_offset_t *ptr_to_pfs_meta_offset(
-      Aligned_alloc_impl::data_segment_ptr data,
-      std::size_t alignment) noexcept {
-    return reinterpret_cast<pfs_meta_offset_t *>(
-        static_cast<uint8_t *>(data) + alignment - sizeof(pfs_meta_offset_t));
-  }
-  /** Helper function which deduces PFS-META-OFFSET metadata value given the
-      pointer to DATA segment. */
-  static inline pfs_meta_offset_t pfs_meta_offset(
-      data_segment_ptr data) noexcept {
-    return *(reinterpret_cast<pfs_meta_offset_t *>(
-        static_cast<uint8_t *>(data) - sizeof(pfs_meta_offset_t)));
-  }
-};
-
-/** Simple allocator traits. */
-template <bool Pfs_instrumented>
-struct allocator_traits {
-  // Is allocator PFS instrumented or not
-  static constexpr auto is_pfs_instrumented_v = Pfs_instrumented;
-};
-
-/** Aligned allocation routines.
-
-    They're implemented in terms of Aligned_alloc_impl (and
-    Aligned_alloc_metadata), and given the guarantees it provides,
-    Aligned_alloc::alloc() is able to encode offset and requested
-    allocation datalen into the metadata section without sacrificing memory or
-    making the implementation or end usage more complex.
-
-    Serializing offset into the metadata is what will enable
-    Aligned_alloc::free() to later on recover original pointer returned by
-    the underlying Aligned_alloc_impl allocation mechanism (std::malloc,
-    std::calloc) and consequently be able to appropriately release it
-    (std::free).
-
-    Serializing requested allocation datalen into the metadata is what will
-    enable higher-kinded functions, implemented on top of Aligned_alloc, to
-    take necessary actions such as cleaning up the resources by invoking
-    appropriate number of destructors of non-trivially-destructible types.
-    Otherwise, this would create a burden on end users by having to remember and
-    carry the array size all around the code. This is equivalent to what we find
-    in other standard implementations. For example, new int x[10] is always
-    released without passing the array size: delete[] x; The same holds with
-    this design.
-
-    Memory layout representation looks like the following:
-
-     ----------------------------------------------------
-     | VARLEN | ALIGNED-ALLOC-META |    ... DATA ...    |
-     ----------------------------------------------------
-                 ^                  ^
-                 |                  |
-                 |                  |
-                 |          ptr returned by Aligned_alloc_impl
-                 |
-                -----------------------------------
-                |   DATALEN    |   VARLEN-OFFSET  |
-                -----------------------------------
-                 \                                 \
-                  0                                 \
-                                                     \
-                                           alignof(max_align_t) - 1
-
-    VARLEN and ALIGNED-ALLOC-META are direct byproduct of Aligned_alloc_impl
-    layout and guarantees.
-
-    VARLEN is the leftover variable segment of bytes that specialized
-    implementations can further make use of by deducing its size from returned
-    offset. Not used by this implementation.
-
-    DATALEN field in ALIGNED-ALLOC-META segment encodes the total length of DATA
-    segment, which is the actual allocation size that client code has requested.
-
-    VARLEN-OFFSET in ALIGNED-ALLOC-META segment encodes the offset to VARLEN
-    segment which represents the original pointer obtained by underlying
-    allocation Aligned_alloc_impl mechanism.
- */
-struct Aligned_alloc : public allocator_traits<false> {
-  using allocator_metadata = Aligned_alloc_metadata<uint32_t, uint32_t>;
-
-  /** Dynamically allocates storage of given size and at the address aligned
-      to the requested alignment.
-
-      @param[in] size Size of storage (in bytes) requested to be allocated.
-      @param[in] alignment Alignment requirement for storage to be allocated.
-      @return Pointer to the allocated storage. nullptr if dynamic storage
-      allocation failed.
-   */
-  template <bool Zero_initialized>
-  static inline void *alloc(std::size_t size, std::size_t alignment) {
-    auto ret = Aligned_alloc_impl::alloc<Zero_initialized>(size, alignment);
-    if (likely(ret.first)) {
-      // We are here taking advantage of Aligned_alloc_impl(S, A) for which
-      // we know that it will always return pointer P and offset O such that:
-      //   1. (P - O) expression is always well-defined.
-      //   2. And O is never less than alignof(std::max_align_t), that is
-      //      Aligned_alloc_impl::metadata_size.
-      //
-      // Practically, this means that we can encode whatever metadata we want
-      // into [P - O, P> segment of memory whose length corresponds to
-      // the value of alignof(std::max_align_t). Commonly, this value is 8 bytes
-      // on 32-bit platforms and 16 bytes on 64-bit platforms but not always
-      // (e.g. Windows) and which is why we have to handle it in more generic
-      // way to be fully portable.
-      //
-      // Here we encode the offset so we can later on recover the
-      // original pointer, P' = (P - O), from within Aligned_alloc::free(P)
-      // context. Similarly, we encode the requested allocation datalen.
-      allocator_metadata::meta_1(ret.first, ret.second);
-      allocator_metadata::meta_2(ret.first, size);
-    }
-    return ret.first;
-  }
-
-  /** Releases storage dynamically allocated through
-      Aligned_alloc::alloc().
-
-      @param[in] data Pointer to storage allocated through
-      Aligned_alloc::alloc()
-   */
-  static inline void free(Aligned_alloc_impl::data_segment_ptr data) noexcept {
-    if (unlikely(!data)) return;
-    // Here we make use of the offset which has been encoded by
-    // Aligned_alloc::alloc() to be able to deduce the original pointer and
-    // simply forward it to std::free.
-    Aligned_alloc_impl::free(deduce(data));
-  }
-
-  /** Returns the number of bytes requested to be allocated.
-
-      @param[in] data Pointer to storage allocated through
-      Aligned_alloc::alloc()
-      @return Number of bytes.
-   */
-  static inline allocator_metadata::meta_2_t datalen(
-      Aligned_alloc_impl::data_segment_ptr data) {
-    // Deducing the datalen field is straightforward, provided that
-    // data points to the DATA segment, which it is expected to do so.
-    return allocator_metadata::meta_2(data);
-  }
-
- private:
-  /** Helper function which deduces the original pointer returned by
-      Aligned_alloc_impl from a pointer which is passed to us by the call-site.
-   */
-  static inline void *deduce(
-      Aligned_alloc_impl::data_segment_ptr data) noexcept {
-    // To recover the original pointer we just need to read the offset
-    // we have serialized into the first (allocator) metadata field.
-    auto offset = allocator_metadata::meta_1(data);
-    return reinterpret_cast<void *>(reinterpret_cast<std::uintptr_t>(data) -
-                                    offset);
-  }
-};
-
-/** Aligned allocation routines which are instrumented through PFS
-    (performance-schema).
-
-    They're implemented in terms of Aligned_alloc_impl (and
-    Aligned_alloc_metadata), and given the guarantees it provides,
-    Aligned_alloc::alloc() is able to encode offset and requested
-    allocation datalen into the metadata section without sacrificing memory or
-    making the implementation or end usage more complex.
-
-    Serializing offset into the metadata is what will enable
-    Aligned_alloc_pfs::free() to later on recover original pointer returned
-    by the underlying Aligned_alloc_impl allocation mechanism (std::malloc,
-    std::calloc) and consequently be able to appropriately release it
-    (std::free).
-
-    Serializing requested allocation datalen into the metadata is what will
-    enable higher-kinded functions, implemented on top of
-    Aligned_alloc_pfs, to take necessary actions such as cleaning up the
-    resources by invoking appropriate number of destructors of
-    non-trivially-destructible types. Otherwise, this would create a burden on
-    end users by having to remember and carry the array size all around the
-    code. This is equivalent to what we find in other standard implementations.
-    For example, new int x[10] is always released without passing the array
-    size: delete[] x; The same holds with this design.
-
-    PFS-wise this allocation routine will be storing the information that PFS
-    needs to do its own work:
-     * Owning thread
-     * Total length of bytes allocated
-     * Key
-
-    Memory layout representation looks like the following:
-
-  ------------------------------------------------------------------------------
-  | VARLEN1 | ALIGNED-ALLOC-META | PFS-META | VARLEN2 | PFS-META-OFFSET | DATA |
-  ------------------------------------------------------------------------------
-                ^                 ^    ^                                 ^
-                |                 |    |                                 |
-                |                 |   ---------------------------        |
-                |                 |   | OWNER |  DATALEN' | KEY |        |
-                |                 |   ---------------------------        |
-                |                 |                                      |
-                |            ptr returned by                             |
-                |           Aligned_alloc_impl                           |
-                |                                                        |
-                |                                ptr to be returned to call-site
-                |                                   will be pointing here
-                |
-               ------------------------------
-               |  DATALEN  | VARLEN1-OFFSET |
-               ------------------------------
-                \                            \
-                 0                            \
-                                               \
-                                     alignof(max_align_t) - 1
-
-    VARLEN1 and ALIGNED-ALLOC-META are direct byproduct of Aligned_alloc_impl
-    (and Aligned_alloc_metadata) layout and guarantees.
-
-    VARLEN1 is the leftover variable-length segment that specialized
-    implementations can further make use of by deducing its size from returned
-    offset. Not used by this implementation.
-
-    DATALEN field in ALIGNED-ALLOC-META segment encodes the total length of DATA
-    segment, which is the actual allocation size that client code has requested.
-
-    VARLEN1-OFFSET in ALIGNED-ALLOC-META segment encodes the offset to VARLEN1
-    segment which represents the original pointer obtained by underlying
-    allocation Aligned_alloc_impl mechanism.
-
-    PFS-META, VARLEN2 and PFS-META-OFFSET are memory layout representation of
-    PFS_metadata.
-
-    OWNER field encode the owning thread. DATALEN' field encodes total size
-    of memory consumed and not only the size of the DATA segment. KEY field
-    encodes the PFS/PSI key.
-
-    VARLEN2 is the leftover variable-length segment that specialized
-    implementations can further make use of by deducing its size from the
-    following formulae: requested_alignment - sizeof(PFS-META-OFFSET) -
-    sizeof(PFS-META). In code that would be alignment -
-    PFS_metadata::pfs_metadata_size. Not used by this implementation.
-
-    PFS-META-OFFSET is a field which allows us to recover the pointer to
-    PFS-META segment from a pointer to DATA segment. Having a pointer to
-    PFS-META segment allows us to deduce the VARLEN1-OFFSET field from
-    ALIGNED-ALLOC-META segment which finally gives us a pointer obtained by the
-    underlying allocation Aligned_alloc_impl mechanism.
- */
-struct Aligned_alloc_pfs : public allocator_traits<true> {
-  using allocator_metadata = Aligned_alloc_metadata<uint32_t, uint32_t>;
-  using pfs_metadata = PFS_metadata;
-
-  /** Dynamically allocates storage of given size at the address aligned to the
-      requested alignment.
-
-      @param[in] size Size of storage (in bytes) requested to be allocated.
-      @param[in] alignment Alignment requirement for storage to be allocated.
-      @param[in] key PSI memory key to be used for PFS memory instrumentation.
-      @return Pointer to the allocated storage. nullptr if dynamic storage
-      allocation failed.
-   */
-  template <bool Zero_initialized>
-  static inline void *alloc(std::size_t size, std::size_t alignment,
-                            pfs_metadata::pfs_memory_key_t key) {
-    // We must take special care to allocate enough extra space to hold the
-    // PFS metadata (PFS-META + PFS-META-OFFSET) but we also need to take
-    // special care that the pointer which will be returned to the callee by
-    // this function will still be suitably over-aligned as requested. Both of
-    // these requirements can be fulfilled by finding the smallest multiple of
-    // requested alignment that is not smaller than actual PFS metadata size.
-    const auto metadata_len =
-        calc_align(pfs_metadata::pfs_metadata_size, alignment);
-    const auto total_len = size + metadata_len;
-    auto ret =
-        Aligned_alloc_impl::alloc<Zero_initialized>(total_len, alignment);
-    if (unlikely(!ret.first)) return nullptr;
-
-    // Same as we do with non-PFS variant of Aligned_alloc::alloc(), here we
-    // encode the offset so we can later on recover the original pointer, P' =
-    // (P - O), from within Aligned_alloc_pfs::free(P) context. Similarly, we
-    // encode the requested allocation datalen.
-    allocator_metadata::meta_1(ret.first, ret.second);
-    allocator_metadata::meta_2(ret.first, size);
-
-#ifdef HAVE_PSI_MEMORY_INTERFACE
-    // When computing total number of bytes allocated. we must not only account
-    // for the size that we have requested (total_len) but we also need
-    // to account for extra memory Aligned_alloc_impl may have allocated in
-    // order to be able to accomodate the request. Amount of extra memory
-    // allocated corresponds to the offset value returned by Aligned_alloc_impl.
-    const auto datalen = total_len + ret.second;
-    // The point of this allocator variant is to trace the memory allocations
-    // through PFS (PSI) so do it.
-    pfs_metadata::pfs_owning_thread_t owner;
-    key = PSI_MEMORY_CALL(memory_alloc)(key, datalen, &owner);
-    // To be able to do the opposite action of tracing when we are releasing the
-    // memory, we need right about the same data we passed to the tracing
-    // memory_alloc function. Let's encode this it into our allocator so we
-    // don't have to carry and keep this data around.
-    pfs_metadata::pfs_owning_thread(ret.first, owner);
-    pfs_metadata::pfs_datalen(ret.first, datalen);
-    pfs_metadata::pfs_key(ret.first, key);
-    pfs_metadata::pfs_metaoffset(ret.first, metadata_len);
-#endif
-
-    return static_cast<uint8_t *>(ret.first) + metadata_len;
-  }
-
-  /** Releases storage dynamically allocated through
-      Aligned_alloc_pfs::alloc().
-
-      @param[in] data Pointer to storage allocated through
-      Aligned_alloc_pfs::alloc()
-   */
-  static inline void free(PFS_metadata::data_segment_ptr data) noexcept {
-    if (unlikely(!data)) return;
-
-#ifdef HAVE_PSI_MEMORY_INTERFACE
-    // Deduce the PFS data we encoded in Aligned_alloc_pfs::alloc()
-    auto key = pfs_metadata::pfs_key(data);
-    auto owner = pfs_metadata::pfs_owning_thread(data);
-    auto datalen = pfs_metadata::pfs_datalen(data);
-    // With the deduced PFS data, now trace the memory release action.
-    PSI_MEMORY_CALL(memory_free)
-    (key, datalen, owner);
-#endif
-
-    // Here we make use of the offset which has been encoded by
-    // Aligned_alloc_pfs::alloc() to be able to deduce the original pointer and
-    // simply forward it to std::free.
-    Aligned_alloc_impl::free(deduce(data));
-  }
-
-  /** Returns the number of bytes requested to be allocated.
-
-      @param[in] data Pointer to storage allocated through
-      Aligned_alloc_pfs::alloc()
-      @return Number of bytes.
-   */
-  static inline allocator_metadata::meta_2_t datalen(
-      PFS_metadata::data_segment_ptr data) {
-    // In order to be able to deduce the datalen field, we have to deduce the
-    // beginning of PFS metadata segment first.
-    return allocator_metadata::meta_2(pfs_metadata::deduce_pfs_meta(data));
-  }
-
- private:
-  /** Helper function which deduces the original pointer returned by
-      Aligned_alloc_impl from a pointer which is passed to us by the call-site.
-   */
-  static inline void *deduce(PFS_metadata::data_segment_ptr data) noexcept {
-    // To recover the original pointer we need to read the offset
-    // we have serialized into the first (allocator) metadata field. But to read
-    // that offset we have to jump over the PFS metadata first. We use PFS meta
-    // offset for that.
-    auto pfs_meta = pfs_metadata::deduce_pfs_meta(data);
-    auto offset = allocator_metadata::meta_1(pfs_meta);
-    return reinterpret_cast<void *>(reinterpret_cast<std::uintptr_t>(pfs_meta) -
-                                    offset);
-  }
-};
-
-/** Simple utility metafunction which selects appropriate allocator variant
-    (implementation) depending on the input parameter(s).
-  */
-template <bool Pfs_memory_instrumentation_on>
-struct select_alloc_impl {
-  using type =
-      Aligned_alloc;  // When PFS is OFF, pick ordinary, non-PFS, variant
-};
-
-template <>
-struct select_alloc_impl<true> {
-  using type = Aligned_alloc_pfs;  // Otherwise, pick PFS variant
-};
-
-/** Just a small helper type which saves us some keystrokes. */
-template <bool Pfs_memory_instrumentation_on>
-using select_alloc_impl_t =
-    typename select_alloc_impl<Pfs_memory_instrumentation_on>::type;
-
-/** Small wrapper which utilizes SFINAE to dispatch the call to appropriate
-    aligned allocator implementation.
-  */
-template <typename Impl = select_alloc_impl_t<WITH_PFS_MEMORY>>
-struct Aligned_alloc_ {
-  template <bool Zero_initialized, typename T = Impl>
-  static inline typename std::enable_if<T::is_pfs_instrumented_v, void *>::type
-  alloc(size_t size, size_t alignment, PSI_memory_key key) {
-    return Impl::template alloc<Zero_initialized>(size, alignment, key);
-  }
-  template <bool Zero_initialized, typename T = Impl>
-  static inline typename std::enable_if<!T::is_pfs_instrumented_v, void *>::type
-  alloc(size_t size, size_t alignment, PSI_memory_key /*key*/) {
-    return Impl::template alloc<Zero_initialized>(size, alignment);
-  }
-  static inline void free(void *ptr) { Impl::free(ptr); }
-  static inline size_t datalen(void *ptr) { return Impl::datalen(ptr); }
-};
-
+template <typename T, typename Tuple>
+inline void construct(void *mem, size_t offset, Tuple &&tuple) {
+  using N_args_seq = std::make_index_sequence<std::tuple_size<Tuple>::value>;
+  construct_impl<T>(mem, offset, tuple, N_args_seq{});
+}
 /** Generic utility function which invokes placement-new statement on type T.
     Arguments to be passed to T constructor are contained within tuple-like
     container. To be able to unpack arguments from tuple-like container at
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/dict0boot.h mysql-8.0-8.0.27/storage/innobase/include/dict0boot.h
--- mysql-8.0-8.0.26/storage/innobase/include/dict0boot.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/dict0boot.h	2021-09-28 11:46:34.000000000 +0000
@@ -78,18 +78,17 @@
 /** Check if a table id belongs to old innodb internal system table.
 @param[in]	id		table id
 @return true if the table id belongs to a system table. */
-static inline bool dict_is_old_sys_table(table_id_t id)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline bool dict_is_old_sys_table(table_id_t id);
 #endif /* !UNIV_HOTBACKUP */
 
 /** Initializes the data dictionary memory structures when the database is
  started. This function is also called when the data dictionary is created.
  @return DB_SUCCESS or error code. */
-dberr_t dict_boot(void) MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t dict_boot(void);
 
 /** Creates and initializes the data dictionary at the server bootstrap.
  @return DB_SUCCESS or error code. */
-dberr_t dict_create(void) MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t dict_create(void);
 
 /* Space id and page no where the dictionary header resides */
 #define DICT_HDR_SPACE 0 /* the SYSTEM tablespace */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/dict0crea.ic mysql-8.0-8.0.27/storage/innobase/include/dict0crea.ic
--- mysql-8.0-8.0.26/storage/innobase/include/dict0crea.ic	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/dict0crea.ic	2021-09-28 11:46:34.000000000 +0000
@@ -37,8 +37,7 @@
 /** Checks if a table name contains the string "/#sql" which denotes temporary
  tables in MySQL.
  @return true if temporary table */
-bool row_is_mysql_tmp_table_name(const char *name)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool row_is_mysql_tmp_table_name(const char *name);
 /*!< in: table name in the form
 'database/tablename' */
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/dict0dd.h mysql-8.0-8.0.27/storage/innobase/include/dict0dd.h
--- mysql-8.0-8.0.26/storage/innobase/include/dict0dd.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/dict0dd.h	2021-09-28 11:46:34.000000000 +0000
@@ -350,7 +350,7 @@
 
  private:
   /** Clean-up last result */
-  void cleanup() { UT_DELETE_ARRAY(m_result); }
+  void cleanup() { ut::delete_arr(m_result); }
 
  private:
   /** The encoded or decoded stream */
@@ -685,8 +685,9 @@
 @param[in]	table	table name
 @retval false if acquired, or trylock timed out
 @retval true if failed (my_error() will have been called) */
-static inline MY_ATTRIBUTE((warn_unused_result)) bool dd_mdl_acquire(
-    THD *thd, MDL_ticket **mdl, const char *db, const char *table);
+[[nodiscard]] static inline bool dd_mdl_acquire(THD *thd, MDL_ticket **mdl,
+                                                const char *db,
+                                                const char *table);
 
 /** Release a metadata lock.
 @param[in,out]	thd	current thread
@@ -1097,8 +1098,8 @@
 /** Obtain the private handler of InnoDB session specific data.
 @param[in,out]	thd	MySQL thread handler.
 @return reference to private handler */
-MY_ATTRIBUTE((warn_unused_result))
-innodb_session_t *&thd_to_innodb_session(THD *thd);
+
+[[nodiscard]] innodb_session_t *&thd_to_innodb_session(THD *thd);
 
 /** Look up a column in a table using the system_charset_info collation.
 @param[in]	dd_table	data dictionary table
@@ -1341,8 +1342,8 @@
 @param[in,out]	thd	thread handle
 @retval	true	on error
 @retval	false	on success */
-MY_ATTRIBUTE((warn_unused_result))
-bool dd_tablespace_update_cache(THD *thd);
+
+[[nodiscard]] bool dd_tablespace_update_cache(THD *thd);
 
 /* Check if the table belongs to an encrypted tablespace.
 @return true if it does. */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/dict0dd.ic mysql-8.0-8.0.27/storage/innobase/include/dict0dd.ic
--- mysql-8.0-8.0.26/storage/innobase/include/dict0dd.ic	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/dict0dd.ic	2021-09-28 11:46:34.000000000 +0000
@@ -279,8 +279,9 @@
 @param[in]	table	table name
 @retval false if acquired
 @retval true if failed (my_error() will have been called) */
-static inline MY_ATTRIBUTE((warn_unused_result)) bool dd_mdl_acquire(
-    THD *thd, MDL_ticket **mdl, const char *db, const char *table) {
+[[nodiscard]] static inline bool dd_mdl_acquire(THD *thd, MDL_ticket **mdl,
+                                                const char *db,
+                                                const char *table) {
   bool ret = false;
   char table_name[MAX_TABLE_NAME_LEN + 1];
   const char *table_p = table;
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/dict0dict.h mysql-8.0-8.0.27/storage/innobase/include/dict0dict.h
--- mysql-8.0-8.0.26/storage/innobase/include/dict0dict.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/dict0dict.h	2021-09-28 11:46:34.000000000 +0000
@@ -77,9 +77,9 @@
 
 /** Get the database name length in a table name.
  @return database name length */
-ulint dict_get_db_name_len(const char *name) /*!< in: table name in the form
-                                             dbname '/' tablename */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] ulint dict_get_db_name_len(
+    const char *name); /*!< in: table name in the form
+         dbname '/' tablename */
 #ifndef UNIV_HOTBACKUP
 /** Frees a foreign key struct. */
 void dict_foreign_free(
@@ -94,9 +94,9 @@
 #endif                    /* !UNIV_HOTBACKUP */
 /** Return the end of table name where we have removed dbname and '/'.
  @return table name */
-const char *dict_remove_db_name(const char *name) /*!< in: table name in the
-                                                  form dbname '/' tablename */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] const char *dict_remove_db_name(
+    const char *name); /*!< in: table name in the
+         form dbname '/' tablename */
 
 /** Operation to perform when opening a table */
 enum dict_table_op_t {
@@ -153,11 +153,10 @@
  note that if !dict_table_has_atomic_blobs(table), no prefix
  needs to be stored in the undo log.
  @return bytes of column prefix to be stored in the undo log */
-static inline ulint dict_max_field_len_store_undo(
-    dict_table_t *table,   /*!< in: table */
-    const dict_col_t *col) /*!< in: column which index prefix
+[[nodiscard]] static inline ulint dict_max_field_len_store_undo(
+    dict_table_t *table,    /*!< in: table */
+    const dict_col_t *col); /*!< in: column which index prefix
                            is based on */
-    MY_ATTRIBUTE((warn_unused_result));
 
 /** Determine maximum bytes of a virtual column need to be stored
 in the undo log.
@@ -170,28 +169,26 @@
 #endif /* !UNIV_HOTBACKUP */
 /** Gets the column number.
  @return col->ind, table column position (starting from 0) */
-static inline ulint dict_col_get_no(const dict_col_t *col) /*!< in: column */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ulint dict_col_get_no(
+    const dict_col_t *col); /*!< in: column */
 /** Gets the column position in the clustered index. */
-static inline ulint dict_col_get_clust_pos(
-    const dict_col_t *col,           /*!< in: table column */
-    const dict_index_t *clust_index) /*!< in: clustered index */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ulint dict_col_get_clust_pos(
+    const dict_col_t *col,            /*!< in: table column */
+    const dict_index_t *clust_index); /*!< in: clustered index */
 
 #ifndef UNIV_HOTBACKUP
 /** Gets the column position in the given index.
 @param[in]	col	table column
 @param[in]	index	index to be searched for column
 @return position of column in the given index. */
-static inline ulint dict_col_get_index_pos(const dict_col_t *col,
-                                           const dict_index_t *index)
-    MY_ATTRIBUTE((nonnull, warn_unused_result));
+[[nodiscard]] static inline ulint dict_col_get_index_pos(
+    const dict_col_t *col, const dict_index_t *index) MY_ATTRIBUTE((nonnull));
 
 /** If the given column name is reserved for InnoDB system columns, return
  TRUE.
  @return true if name is reserved */
-ibool dict_col_name_is_reserved(const char *name) /*!< in: column name */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] ibool dict_col_name_is_reserved(
+    const char *name); /*!< in: column name */
 /** Acquire the autoinc lock. */
 void dict_table_autoinc_lock(dict_table_t *table); /*!< in/out: table */
 
@@ -203,8 +200,8 @@
 /** Reads the next autoinc value (== autoinc counter value), 0 if not yet
  initialized.
  @return value for a new row, or 0 */
-ib_uint64_t dict_table_autoinc_read(const dict_table_t *table) /*!< in: table */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] ib_uint64_t dict_table_autoinc_read(
+    const dict_table_t *table); /*!< in: table */
 
 /** Updates the autoinc counter if the value supplied is greater than the
  current value.
@@ -233,8 +230,9 @@
 update some existing smaller one to bigger.
 @param[in,out]	table	InnoDB table object
 @param[in]	value	AUTOINC counter to log
-@param[in,out]	mtr	Mini-transaction */
-void dict_table_autoinc_log(dict_table_t *table, uint64_t value, mtr_t *mtr);
+@param[in,out]	mtr	Mini-transaction
+@return true if auto increment needs to be persisted to DD table buffer. */
+bool dict_table_autoinc_log(dict_table_t *table, uint64_t value, mtr_t *mtr);
 
 /** Check if a table has an autoinc counter column.
 @param[in]	table	table
@@ -279,13 +277,13 @@
 
 /** Renames a table object.
  @return true if success */
-dberr_t dict_table_rename_in_cache(dict_table_t *table,  /*!< in/out: table */
-                                   const char *new_name, /*!< in: new name */
-                                   ibool rename_also_foreigns)
-    /*!< in: in ALTER TABLE we want
-    to preserve the original table name
-    in constraints which reference it */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t dict_table_rename_in_cache(
+    dict_table_t *table,  /*!< in/out: table */
+    const char *new_name, /*!< in: new name */
+    ibool rename_also_foreigns);
+/*!< in: in ALTER TABLE we want
+to preserve the original table name
+in constraints which reference it */
 
 /** Removes an index from the dictionary cache.
 @param[in,out]	table	table whose index to remove
@@ -306,35 +304,33 @@
  At least one of foreign table or referenced table must already be in
  the dictionary cache!
  @return DB_SUCCESS or error code */
-dberr_t dict_foreign_add_to_cache(dict_foreign_t *foreign,
-                                  /*!< in, own: foreign key constraint */
-                                  const char **col_names,
-                                  /*!< in: column names, or NULL to use
-                                  foreign->foreign_table->col_names */
-                                  bool check_charsets,
-                                  /*!< in: whether to check charset
-                                  compatibility */
-                                  bool can_free_fk,
-                                  /*!< in: whether free existing FK */
-                                  dict_err_ignore_t ignore_err)
-    /*!< in: error to be ignored */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t dict_foreign_add_to_cache(
+    dict_foreign_t *foreign,
+    /*!< in, own: foreign key constraint */
+    const char **col_names,
+    /*!< in: column names, or NULL to use
+    foreign->foreign_table->col_names */
+    bool check_charsets,
+    /*!< in: whether to check charset
+    compatibility */
+    bool can_free_fk,
+    /*!< in: whether free existing FK */
+    dict_err_ignore_t ignore_err);
+/*!< in: error to be ignored */
 /** Checks if a table is referenced by foreign keys.
  @return true if table is referenced by a foreign key */
-ibool dict_table_is_referenced_by_foreign_key(
-    const dict_table_t *table) /*!< in: InnoDB table */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] ibool dict_table_is_referenced_by_foreign_key(
+    const dict_table_t *table); /*!< in: InnoDB table */
 /** Replace the index passed in with another equivalent index in the
  foreign key lists of the table.
  @return whether all replacements were found */
-bool dict_foreign_replace_index(
+[[nodiscard]] bool dict_foreign_replace_index(
     dict_table_t *table, /*!< in/out: table */
     const char **col_names,
     /*!< in: column names, or NULL
     to use table->col_names */
-    const dict_index_t *index) /*!< in: index to be replaced */
-    MY_ATTRIBUTE((warn_unused_result));
-#endif /* !UNIV_HOTBACKUP */
+    const dict_index_t *index); /*!< in: index to be replaced */
+#endif                          /* !UNIV_HOTBACKUP */
 /** Returns a table object and increments its open handle count.
  NOTE! This is a high-level function to be used mainly from outside the
  'dict' directory. Inside this directory dict_table_get_low
@@ -345,16 +341,15 @@
                                  an aborted online index creation
  @param[in] ignore_err error to be ignored when loading the table
  @return table, NULL if does not exist */
-dict_table_t *dict_table_open_on_name(const char *table_name, ibool dict_locked,
-                                      ibool try_drop,
-                                      dict_err_ignore_t ignore_err)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dict_table_t *dict_table_open_on_name(
+    const char *table_name, ibool dict_locked, ibool try_drop,
+    dict_err_ignore_t ignore_err);
 
 /** Tries to find an index whose first fields are the columns in the array,
  in the same order and is not marked for deletion and is not the same
  as types_idx.
  @return matching index, NULL if not found */
-dict_index_t *dict_foreign_find_index(
+[[nodiscard]] dict_index_t *dict_foreign_find_index(
     const dict_table_t *table, /*!< in: table */
     const char **col_names,
     /*!< in: column names, or NULL
@@ -369,11 +364,10 @@
     /*!< in: whether to check
     charsets.  only has an effect
     if types_idx != NULL */
-    ulint check_null)
-    /*!< in: nonzero if none of
-    the columns must be declared
-    NOT NULL */
-    MY_ATTRIBUTE((warn_unused_result));
+    ulint check_null);
+/*!< in: nonzero if none of
+the columns must be declared
+NOT NULL */
 
 /** Returns a virtual column's name.
 @param[in]	table	target table
@@ -404,7 +398,7 @@
  in the same order and is not marked for deletion and is not the same
  as types_idx.
  @return matching index, NULL if not found */
-bool dict_foreign_qualify_index(
+[[nodiscard]] bool dict_foreign_qualify_index(
     const dict_table_t *table, /*!< in: table */
     const char **col_names,
     /*!< in: column names, or NULL
@@ -420,11 +414,10 @@
     /*!< in: whether to check
     charsets.  only has an effect
     if types_idx != NULL */
-    ulint check_null)
-    /*!< in: nonzero if none of
-    the columns must be declared
-    NOT NULL */
-    MY_ATTRIBUTE((warn_unused_result));
+    ulint check_null);
+/*!< in: nonzero if none of
+the columns must be declared
+NOT NULL */
 
 /* Skip corrupted index */
 #define dict_table_skip_corrupt_index(index) \
@@ -447,35 +440,30 @@
 
 /** Check whether the index is unique.
  @return nonzero for unique index, zero for other indexes */
-static inline ulint dict_index_is_unique(
-    const dict_index_t *index) /*!< in: index */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ulint dict_index_is_unique(
+    const dict_index_t *index); /*!< in: index */
 /** Check whether the index is a Spatial Index.
  @return	nonzero for Spatial Index, zero for other indexes */
-static inline ulint dict_index_is_spatial(
-    const dict_index_t *index) /*!< in: index */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ulint dict_index_is_spatial(
+    const dict_index_t *index); /*!< in: index */
 /** Check whether the index contains a virtual column.
 @param[in]	index	index
 @return	nonzero for index on virtual column, zero for other indexes */
 static inline ulint dict_index_has_virtual(const dict_index_t *index);
 /** Check whether the index is the insert buffer tree.
  @return nonzero for insert buffer, zero for other indexes */
-static inline ulint dict_index_is_ibuf(
-    const dict_index_t *index) /*!< in: index */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ulint dict_index_is_ibuf(
+    const dict_index_t *index); /*!< in: index */
 
 /** Check whether the index consists of descending columns only.
 @param[in]	index  index tree
 @retval true if index has any descending column
 @retval false if index has only ascending columns */
-static inline bool dict_index_has_desc(const dict_index_t *index)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline bool dict_index_has_desc(const dict_index_t *index);
 /** Check whether the index is a secondary index or the insert buffer tree.
  @return nonzero for insert buffer, zero for other indexes */
-static inline ulint dict_index_is_sec_or_ibuf(
-    const dict_index_t *index) /*!< in: index */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ulint dict_index_is_sec_or_ibuf(
+    const dict_index_t *index); /*!< in: index */
 
 /** Get all the FTS indexes on a table.
 @param[in]	table	table
@@ -498,9 +486,8 @@
 #ifndef UNIV_HOTBACKUP
 /** Gets the approximately estimated number of rows in the table.
  @return estimated number of rows */
-static inline ib_uint64_t dict_table_get_n_rows(
-    const dict_table_t *table) /*!< in: table */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ib_uint64_t dict_table_get_n_rows(
+    const dict_table_t *table); /*!< in: table */
 /** Increment the number of rows in the table by one.
  Notice that this operation is not protected by any latch, the number is
  approximate. */
@@ -534,21 +521,19 @@
 #endif /* UNIV_DEBUG */
 /** Gets the given system column number of a table.
  @return column number */
-static inline ulint dict_table_get_sys_col_no(
+[[nodiscard]] static inline ulint dict_table_get_sys_col_no(
     const dict_table_t *table, /*!< in: table */
-    ulint sys)                 /*!< in: DATA_ROW_ID, ... */
-    MY_ATTRIBUTE((warn_unused_result));
+    ulint sys);                /*!< in: DATA_ROW_ID, ... */
 /** Check whether the table uses the compact page format.
  @return true if table uses the compact page format */
-static inline ibool dict_table_is_comp(
-    const dict_table_t *table) /*!< in: table */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ibool dict_table_is_comp(
+    const dict_table_t *table); /*!< in: table */
 
 /** Determine if a table uses atomic BLOBs (no locally stored prefix).
 @param[in]	table	InnoDB table
 @return whether BLOBs are atomic */
-static inline bool dict_table_has_atomic_blobs(const dict_table_t *table)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline bool dict_table_has_atomic_blobs(
+    const dict_table_t *table);
 
 #ifndef UNIV_HOTBACKUP
 /** Set the various values in a dict_table_t::flags pointer.
@@ -602,8 +587,8 @@
 /** Get the table page size.
 @param[in]	table	table
 @return compressed page size, or 0 if not compressed */
-static inline const page_size_t dict_table_page_size(const dict_table_t *table)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline const page_size_t dict_table_page_size(
+    const dict_table_t *table);
 
 #ifndef UNIV_HOTBACKUP
 /** Obtain exclusive locks on all index trees of the table. This is to prevent
@@ -616,17 +601,15 @@
     dict_table_t *table); /*!< in: table */
 /** Check if the table has an FTS index.
  @return true if table has an FTS index */
-static inline ibool dict_table_has_fts_index(
-    dict_table_t *table) /*!< in: table */
-    MY_ATTRIBUTE((warn_unused_result));
-#endif /* !UNIV_HOTBACKUP */
+[[nodiscard]] static inline ibool dict_table_has_fts_index(
+    dict_table_t *table); /*!< in: table */
+#endif                    /* !UNIV_HOTBACKUP */
 /** Checks if a column is in the ordering columns of the clustered index of a
  table. Column prefixes are treated like whole columns.
  @return true if the column, or its prefix, is in the clustered key */
-ibool dict_table_col_in_clustered_key(
+[[nodiscard]] ibool dict_table_col_in_clustered_key(
     const dict_table_t *table, /*!< in: table */
-    ulint n)                   /*!< in: column number */
-    MY_ATTRIBUTE((warn_unused_result));
+    ulint n);                  /*!< in: column number */
 /** Copies types of virtual columns contained in table to tuple and sets all
 fields of the tuple to the SQL NULL value.  This function should
 be called right after dtuple_create().
@@ -650,8 +633,7 @@
 /** Look up an index.
 @param[in]	id	index identifier
 @return index or NULL if not found */
-const dict_index_t *dict_index_find(const index_id_t &id)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] const dict_index_t *dict_index_find(const index_id_t &id);
 /** Make room in the table cache by evicting an unused table. The unused table
  should not be part of FK relationship and currently not used in any user
  transaction. There is no guarantee that it will remove a table.
@@ -671,9 +653,9 @@
                         if records could be too big to fit in
                         an B-tree page
 @return DB_SUCCESS, DB_TOO_BIG_RECORD, or DB_CORRUPTION */
-dberr_t dict_index_add_to_cache(dict_table_t *table, dict_index_t *index,
-                                page_no_t page_no, ibool strict)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t dict_index_add_to_cache(dict_table_t *table,
+                                              dict_index_t *index,
+                                              page_no_t page_no, ibool strict);
 
 /** Clears the virtual column's index list before index is being freed.
 @param[in]  index   Index being freed */
@@ -691,36 +673,32 @@
                         if records could be too big to fit in
                         an B-tree page
 @return DB_SUCCESS, DB_TOO_BIG_RECORD, or DB_CORRUPTION */
-dberr_t dict_index_add_to_cache_w_vcol(dict_table_t *table, dict_index_t *index,
-                                       const dict_add_v_col_t *add_v,
-                                       page_no_t page_no, ibool strict)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t dict_index_add_to_cache_w_vcol(
+    dict_table_t *table, dict_index_t *index, const dict_add_v_col_t *add_v,
+    page_no_t page_no, ibool strict);
 #endif /* !UNIV_HOTBACKUP */
 /** Gets the number of fields in the internal representation of an index,
  including fields added by the dictionary system.
  @return number of fields */
-static inline ulint dict_index_get_n_fields(
-    const dict_index_t *index) /*!< in: an internal
+[[nodiscard]] static inline ulint dict_index_get_n_fields(
+    const dict_index_t *index); /*!< in: an internal
                                representation of index (in
                                the dictionary cache) */
-    MY_ATTRIBUTE((warn_unused_result));
 /** Gets the number of fields in the internal representation of an index
  that uniquely determine the position of an index entry in the index, if
  we do not take multiversioning into account: in the B-tree use the value
  returned by dict_index_get_n_unique_in_tree.
  @return number of fields */
-static inline ulint dict_index_get_n_unique(
-    const dict_index_t *index) /*!< in: an internal representation
+[[nodiscard]] static inline ulint dict_index_get_n_unique(
+    const dict_index_t *index); /*!< in: an internal representation
                                of index (in the dictionary cache) */
-    MY_ATTRIBUTE((warn_unused_result));
 /** Gets the number of fields in the internal representation of an index
  which uniquely determine the position of an index entry in the index, if
  we also take multiversioning into account.
  @return number of fields */
-static inline ulint dict_index_get_n_unique_in_tree(
-    const dict_index_t *index) /*!< in: an internal representation
+[[nodiscard]] static inline ulint dict_index_get_n_unique_in_tree(
+    const dict_index_t *index); /*!< in: an internal representation
                                of index (in the dictionary cache) */
-    MY_ATTRIBUTE((warn_unused_result));
 
 /** The number of fields in the nonleaf page of spatial index, except
 the page no field. */
@@ -732,41 +710,38 @@
 include page no field.
 @param[in]	index	index
 @return number of fields */
-static inline uint16_t dict_index_get_n_unique_in_tree_nonleaf(
-    const dict_index_t *index) MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline uint16_t dict_index_get_n_unique_in_tree_nonleaf(
+    const dict_index_t *index);
 /** Gets the number of user-defined ordering fields in the index. In the
  internal representation we add the row id to the ordering fields to make all
  indexes unique, but this function returns the number of fields the user defined
  in the index as ordering fields.
  @return number of fields */
-static inline ulint dict_index_get_n_ordering_defined_by_user(
-    const dict_index_t *index) /*!< in: an internal representation
+[[nodiscard]] static inline ulint dict_index_get_n_ordering_defined_by_user(
+    const dict_index_t *index); /*!< in: an internal representation
                                of index (in the dictionary cache) */
-    MY_ATTRIBUTE((warn_unused_result));
 /** Returns TRUE if the index contains a column or a prefix of that column.
  @return true if contains the column or its prefix */
-ibool dict_index_contains_col_or_prefix(
+[[nodiscard]] ibool dict_index_contains_col_or_prefix(
     const dict_index_t *index, /*!< in: index */
     ulint n,                   /*!< in: column number */
-    bool is_virtual)
-    /*!< in: whether it is a virtual col */
-    MY_ATTRIBUTE((warn_unused_result));
+    bool is_virtual);
+/*!< in: whether it is a virtual col */
 /** Looks for a matching field in an index. The column has to be the same. The
  column in index must be complete, or must contain a prefix longer than the
  column in index2. That is, we must be able to construct the prefix in index2
  from the prefix in index.
  @return position in internal representation of the index;
  ULINT_UNDEFINED if not contained */
-ulint dict_index_get_nth_field_pos(
+[[nodiscard]] ulint dict_index_get_nth_field_pos(
     const dict_index_t *index,  /*!< in: index from which to search */
     const dict_index_t *index2, /*!< in: index */
-    ulint n)                    /*!< in: field number in index2 */
-    MY_ATTRIBUTE((warn_unused_result));
+    ulint n);                   /*!< in: field number in index2 */
 /** Looks for non-virtual column n position in the clustered index.
  @return position in internal representation of the clustered index */
-ulint dict_table_get_nth_col_pos(const dict_table_t *table, /*!< in: table */
-                                 ulint n) /*!< in: column number */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] ulint dict_table_get_nth_col_pos(
+    const dict_table_t *table, /*!< in: table */
+    ulint n);                  /*!< in: column number */
 
 /** Get the innodb column position for a non-virtual column according to
 its original MySQL table position n
@@ -786,10 +761,9 @@
 /** Checks that a tuple has n_fields_cmp value in a sensible range, so that
  no comparison can occur with the page number field in a node pointer.
  @return true if ok */
-ibool dict_index_check_search_tuple(
+[[nodiscard]] ibool dict_index_check_search_tuple(
     const dict_index_t *index, /*!< in: index tree */
-    const dtuple_t *tuple)     /*!< in: tuple used in a search */
-    MY_ATTRIBUTE((warn_unused_result));
+    const dtuple_t *tuple);    /*!< in: tuple used in a search */
 /** Whether and when to allow temporary index names */
 enum check_name {
   /** Require all indexes to be complete. */
@@ -814,41 +788,38 @@
 #endif /* UNIV_DEBUG */
 /** Builds a node pointer out of a physical record and a page number.
  @return own: node pointer */
-dtuple_t *dict_index_build_node_ptr(const dict_index_t *index, /*!< in: index */
-                                    const rec_t *rec,  /*!< in: record for which
-                                                       to build node  pointer */
-                                    page_no_t page_no, /*!< in: page number to
-                                                       put in node pointer */
-                                    mem_heap_t *heap, /*!< in: memory heap where
-                                                      pointer created */
-                                    ulint level) /*!< in: level of rec in tree:
-                                                 0 means leaf level */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dtuple_t *dict_index_build_node_ptr(
+    const dict_index_t *index, /*!< in: index */
+    const rec_t *rec,          /*!< in: record for which
+                               to build node  pointer */
+    page_no_t page_no,         /*!< in: page number to
+                               put in node pointer */
+    mem_heap_t *heap,          /*!< in: memory heap where
+                               pointer created */
+    ulint level);              /*!< in: level of rec in tree:
+                              0 means leaf level */
 /** Copies an initial segment of a physical record, long enough to specify an
  index entry uniquely.
  @return pointer to the prefix record */
-rec_t *dict_index_copy_rec_order_prefix(
+[[nodiscard]] rec_t *dict_index_copy_rec_order_prefix(
     const dict_index_t *index, /*!< in: index */
     const rec_t *rec,          /*!< in: record for which to
                                copy prefix */
     ulint *n_fields,           /*!< out: number of fields copied */
     byte **buf,                /*!< in/out: memory buffer for the
                                copied prefix, or NULL */
-    size_t *buf_size)          /*!< in/out: buffer size */
-    MY_ATTRIBUTE((warn_unused_result));
+    size_t *buf_size);         /*!< in/out: buffer size */
 /** Builds a typed data tuple out of a physical record.
  @return own: data tuple */
-dtuple_t *dict_index_build_data_tuple(
+[[nodiscard]] dtuple_t *dict_index_build_data_tuple(
     dict_index_t *index, /*!< in: index */
     rec_t *rec,          /*!< in: record for which to build data tuple */
     ulint n_fields,      /*!< in: number of data fields */
-    mem_heap_t *heap)    /*!< in: memory heap where tuple created */
-    MY_ATTRIBUTE((warn_unused_result));
+    mem_heap_t *heap);   /*!< in: memory heap where tuple created */
 /** Gets the space id of the root of the index tree.
  @return space id */
-static inline space_id_t dict_index_get_space(
-    const dict_index_t *index) /*!< in: index */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline space_id_t dict_index_get_space(
+    const dict_index_t *index); /*!< in: index */
 
 /** Sets the space id of the root of the index tree.
 @param[in,out]	index	index
@@ -857,14 +828,12 @@
 
 /** Gets the page number of the root of the index tree.
  @return page number */
-static inline page_no_t dict_index_get_page(
-    const dict_index_t *tree) /*!< in: index */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline page_no_t dict_index_get_page(
+    const dict_index_t *tree); /*!< in: index */
 /** Gets the read-write lock of the index tree.
  @return read-write lock */
-static inline rw_lock_t *dict_index_get_lock(
-    dict_index_t *index) /*!< in: index */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline rw_lock_t *dict_index_get_lock(
+    dict_index_t *index); /*!< in: index */
 /** Returns free space reserved for future updates of records. This is
  relevant only in the case of many consecutive inserts, as updates
  which make the records bigger might fragment the index.
@@ -874,9 +843,9 @@
 /* Online index creation @{ */
 /** Gets the status of online index creation.
  @return the status */
-static inline enum online_index_status dict_index_get_online_status(
-    const dict_index_t *index) /*!< in: secondary index */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline enum online_index_status
+dict_index_get_online_status(
+    const dict_index_t *index); /*!< in: secondary index */
 
 /** Sets the status of online index creation.
 @param[in,out]	index	index
@@ -891,12 +860,11 @@
  if this is a clustered index and the table is being or has been rebuilt online
  @retval false if the index has been created or the table has been
  rebuilt completely */
-static inline bool dict_index_is_online_ddl(
-    const dict_index_t *index) /*!< in: index */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline bool dict_index_is_online_ddl(
+    const dict_index_t *index); /*!< in: index */
 /** Calculates the minimum record length in an index. */
-ulint dict_index_calc_min_rec_len(const dict_index_t *index) /*!< in: index */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] ulint dict_index_calc_min_rec_len(
+    const dict_index_t *index); /*!< in: index */
 /** Reserves the dictionary system mutex for MySQL. */
 void dict_mutex_enter_for_mysql(void);
 /** Releases the dictionary system mutex for MySQL. */
@@ -929,21 +897,20 @@
 
 /** Checks if the database name in two table names is the same.
  @return true if same db name */
-ibool dict_tables_have_same_db(const char *name1, /*!< in: table name in the
-                                                  form dbname '/' tablename */
-                               const char *name2) /*!< in: table name in the
-                                                  form dbname '/' tablename */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] ibool dict_tables_have_same_db(
+    const char *name1,  /*!< in: table name in the
+           form dbname '/' tablename */
+    const char *name2); /*!< in: table name in the
+                       form dbname '/' tablename */
 /** Get an index by name.
 @param[in]	table		the table where to look for the index
 @param[in]	name		the index name to look for
 @param[in]	committed	true=search for committed,
 false=search for uncommitted
 @return index, NULL if does not exist */
-dict_index_t *dict_table_get_index_on_name(dict_table_t *table,
-                                           const char *name,
-                                           bool committed = true)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dict_index_t *dict_table_get_index_on_name(dict_table_t *table,
+                                                         const char *name,
+                                                         bool committed = true);
 /** Get an index by name.
 @param[in]	table		the table where to look for the index
 @param[in]	name		the index name to look for
@@ -958,13 +925,12 @@
 
 /***************************************************************
 Check whether a column exists in an FTS index. */
-static inline ulint dict_table_is_fts_column(
+[[nodiscard]] static inline ulint dict_table_is_fts_column(
     /*!< out: ULINT_UNDEFINED if no match else
     the offset within the vector */
     ib_vector_t *indexes, /*!< in: vector containing only FTS indexes */
     ulint col_no,         /*!< in: col number to search for */
-    bool is_virtual)      /*!< in: whether it is a virtual column */
-    MY_ATTRIBUTE((warn_unused_result));
+    bool is_virtual);     /*!< in: whether it is a virtual column */
 /** Prevent table eviction by moving a table to the non-LRU list from the
  LRU list if it is not already there. */
 static inline void dict_table_prevent_eviction(
@@ -1185,6 +1151,44 @@
 
 /** Structure for persisting dynamic metadata of data dictionary */
 struct dict_persist_t {
+#ifndef UNIV_HOTBACKUP
+  /** Write dynamic metadata to DD buffer table immediately when such data is
+  generated. By default, the metadata is first written to redo log and then to
+  the DD buffer table during checkpoint. This is going to hurt auto increment
+  performance and Currently enabled by clone for short time to eliminate
+  dependency with dynamic metadata recovered from redo log. */
+  class Enable_immediate {
+   public:
+    /** Constructor to immediate persisting mode.
+    @param[in,out]	persister	dictionary persister */
+    Enable_immediate(dict_persist_t *persister);
+
+    /** Destructor to switch back to default mode. */
+    ~Enable_immediate();
+
+    /** Disable copy construction */
+    Enable_immediate(Enable_immediate const &) = delete;
+
+    /** Disable assignment */
+    Enable_immediate &operator=(Enable_immediate const &) = delete;
+
+   private:
+    /** Dictionary persister */
+    dict_persist_t *m_persister;
+  };
+
+  /** @return true if need to write dynamic metadata to DD buffer table
+  immediately after logging. */
+  bool check_persist_immediately() const {
+    return m_persist_immediately.load();
+  }
+
+  /** List of tables whose dirty_status are marked as METADATA_DIRTY,
+  or METADATA_BUFFERED. It's protected by the mutex */
+  UT_LIST_BASE_NODE_T(dict_table_t, dirty_dict_tables)
+  dirty_dict_tables;
+#endif
+
   /** Mutex to protect data in this structure, also the
   dict_table_t::dirty_status and
   dict_table_t::in_dirty_dict_tables_list
@@ -1194,16 +1198,16 @@
   tree latch, the latch level of this mutex then has to be right
   before the SYNC_INDEX_TREE. */
   ib_mutex_t mutex;
-#ifndef UNIV_HOTBACKUP
-  /** List of tables whose dirty_status are marked as METADATA_DIRTY,
-  or METADATA_BUFFERED. It's protected by the mutex */
-  UT_LIST_BASE_NODE_T(dict_table_t, dirty_dict_tables)
-  dirty_dict_tables;
-#endif
+
   /** Number of the tables which are of status METADATA_DIRTY.
   It's protected by the mutex */
   std::atomic<uint32_t> num_dirty_tables;
 
+  /** If set, dynamic metadata is saved to DD buffer table immediately.
+  Currently we consider only auto increment PM_TABLE_AUTO_INC. Corrupt
+  index PM_INDEX_CORRUPTED is not needed to be saved immediately. */
+  std::atomic<bool> m_persist_immediately;
+
 #ifndef UNIV_HOTBACKUP
   /** DDTableBuffer table for persistent dynamic metadata */
   DDTableBuffer *table_buffer;
@@ -1269,7 +1273,7 @@
   void truncate(void);
 
   /** Get the buffered metadata for a specific table, the caller
-  has to delete the returned std::string object by UT_DELETE
+  has to delete the returned std::string object by ut::delete_
   @param[in]	id	table id
   @param[out]	version	table dynamic metadata version
   @return the metadata saved in a string object, if nothing, the
@@ -1424,9 +1428,8 @@
 
 /** Check if the tablespace for the table has been discarded.
  @return true if the tablespace has been discarded. */
-static inline bool dict_table_is_discarded(
-    const dict_table_t *table) /*!< in: table to check */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline bool dict_table_is_discarded(
+    const dict_table_t *table); /*!< in: table to check */
 
 /** Check whether the table is DDTableBuffer. See class DDTableBuffer
 @param[in]	table	table to check
@@ -1436,8 +1439,8 @@
 /** Check if the table is in a shared tablespace (System or General).
 @param[in]	table	table to check
 @return true if table is a shared tablespace, false if not. */
-static inline bool dict_table_in_shared_tablespace(const dict_table_t *table)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline bool dict_table_in_shared_tablespace(
+    const dict_table_t *table);
 
 /** Check whether locking is disabled for this table.
 Currently this is done for intrinsic table as their visibility is limited
@@ -1446,8 +1449,8 @@
 
 @param[in]	table	table to check
 @return true if locking is disabled. */
-static inline bool dict_table_is_locking_disabled(const dict_table_t *table)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline bool dict_table_is_locking_disabled(
+    const dict_table_t *table);
 
 /** Turn-off redo-logging if temporary table.
 @param[in]	table	Table to check
@@ -1483,18 +1486,17 @@
     dict_index_t *index); /*!< in/out: index to be updated. */
 /** Return the optimal page size, for which page will likely compress.
  @return page size beyond which page may not compress*/
-ulint dict_index_zip_pad_optimal_page_size(
-    dict_index_t *index) /*!< in: index for which page size
+[[nodiscard]] ulint dict_index_zip_pad_optimal_page_size(
+    dict_index_t *index); /*!< in: index for which page size
                          is requested */
-    MY_ATTRIBUTE((warn_unused_result));
 /** Convert table flag to row format string.
  @return row format name */
 const char *dict_tf_to_row_format_string(
     uint32_t table_flag); /*!< in: row format setting */
 /** Return maximum size of the node pointer record.
  @return maximum size of the record in bytes */
-ulint dict_index_node_ptr_max_size(const dict_index_t *index) /*!< in: index */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] ulint dict_index_node_ptr_max_size(
+    const dict_index_t *index); /*!< in: index */
 
 /** Get index by first field of the index.
 @param[in]	table		table
@@ -1660,17 +1662,22 @@
 
 /** Get the tablespace data directory if set, otherwise empty string.
 @return the data directory */
-std::string dict_table_get_datadir(const dict_table_t *table)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] std::string dict_table_get_datadir(const dict_table_t *table);
 
 /** Set the compression type for the tablespace of a table
 @param[in]  table         The table that should be compressed
 @param[in]  algorithm     Text representation of the algorithm
 @param[in]  is_import_op  True if it's being set during import operation
 @return DB_SUCCESS or error code */
-dberr_t dict_set_compression(dict_table_t *table, const char *algorithm,
-                             bool is_import_op)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t dict_set_compression(dict_table_t *table,
+                                           const char *algorithm,
+                                           bool is_import_op);
+
+/** @return true if all base column of virtual column is foreign key column
+@param[in]	vcol	in-memory virtul column
+@param[in]	foreign	in-memory Foreign key constraint */
+uint32_t dict_vcol_base_is_foreign_key(dict_v_col_t *vcol,
+                                       dict_foreign_t *foreign);
 
 #include "dict0dict.ic"
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/dict0dict.ic mysql-8.0-8.0.27/storage/innobase/include/dict0dict.ic
--- mysql-8.0-8.0.26/storage/innobase/include/dict0dict.ic	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/dict0dict.ic	2021-09-28 11:46:34.000000000 +0000
@@ -1202,7 +1202,7 @@
 inline void dict_table_mutex_alloc(void *table_void) {
   dict_table_t *table = static_cast<dict_table_t *>(table_void);
 
-  table->mutex = UT_NEW_NOKEY(ib_mutex_t());
+  table->mutex = ut::new_withkey<ib_mutex_t>(UT_NEW_THIS_FILE_PSI_KEY);
   ut_ad(table->mutex != nullptr);
   mutex_create(LATCH_ID_DICT_TABLE, table->mutex);
 }
@@ -1296,11 +1296,11 @@
     ut_ad(vc_templ->n_v_col > 0);
     for (ulint i = 0; i < vc_templ->n_col + vc_templ->n_v_col; i++) {
       if (vc_templ->vtempl[i] != nullptr) {
-        ut_free(vc_templ->vtempl[i]);
+        ut::free(vc_templ->vtempl[i]);
       }
     }
-    ut_free(vc_templ->default_rec);
-    ut_free(vc_templ->vtempl);
+    ut::free(vc_templ->default_rec);
+    ut::free(vc_templ->vtempl);
     vc_templ->vtempl = nullptr;
   }
 }
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/dict0load.h mysql-8.0-8.0.27/storage/innobase/include/dict0load.h
--- mysql-8.0-8.0.26/storage/innobase/include/dict0load.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/dict0load.h	2021-09-28 11:46:34.000000000 +0000
@@ -46,7 +46,7 @@
 #include <deque>
 
 /** A stack of table names related through foreign key constraints */
-typedef std::deque<const char *, ut_allocator<const char *>> dict_names_t;
+typedef std::deque<const char *, ut::allocator<const char *>> dict_names_t;
 
 /** enum that defines all system table IDs. @see SYSTEM_TABLE_NAME[] */
 enum dict_system_id_t {
@@ -83,7 +83,7 @@
 
 /** Get the first filepath from SYS_DATAFILES for a given space_id.
 @param[in]	space_id	Tablespace ID
-@return First filepath (caller must invoke ut_free() on it)
+@return First filepath (caller must invoke ut::free() on it)
 @retval NULL if no SYS_DATAFILES entry was found. */
 char *dict_get_first_path(ulint space_id);
 
@@ -132,7 +132,7 @@
  cache, then it is added to the output parameter (fk_tables).
 
  @return DB_SUCCESS or error code */
-dberr_t dict_load_foreigns(
+[[nodiscard]] dberr_t dict_load_foreigns(
     const char *table_name,       /*!< in: table name */
     const char **col_names,       /*!< in: column names, or NULL
                                   to use table->col_names */
@@ -142,11 +142,10 @@
     bool check_charsets,          /*!< in: whether to check
                                   charset compatibility */
     dict_err_ignore_t ignore_err, /*!< in: error to be ignored */
-    dict_names_t &fk_tables)      /*!< out: stack of table names
-                                  which must be loaded
-                                  subsequently to load all the
-                                  foreign key constraints. */
-    MY_ATTRIBUTE((warn_unused_result));
+    dict_names_t &fk_tables);     /*!< out: stack of table names
+                                 which must be loaded
+                                 subsequently to load all the
+                                 foreign key constraints. */
 
 /** This function opens a system table, and return the first record.
  @return first record of the system table */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/dict0mem.h mysql-8.0-8.0.27/storage/innobase/include/dict0mem.h
--- mysql-8.0-8.0.26/storage/innobase/include/dict0mem.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/dict0mem.h	2021-09-28 11:46:34.000000000 +0000
@@ -637,7 +637,7 @@
 };
 
 /** Index list to put in dict_v_col_t */
-typedef std::list<dict_v_idx_t, ut_allocator<dict_v_idx_t>> dict_v_idx_list;
+typedef std::list<dict_v_idx_t, ut::allocator<dict_v_idx_t>> dict_v_idx_list;
 
 /** Data structure for a virtual column in a table */
 struct dict_v_col_t {
@@ -684,7 +684,7 @@
 };
 
 /** list to put stored column for dict_table_t */
-typedef std::list<dict_s_col_t, ut_allocator<dict_s_col_t>> dict_s_col_list;
+typedef std::list<dict_s_col_t, ut::allocator<dict_s_col_t>> dict_s_col_list;
 
 /** @brief DICT_ANTELOPE_MAX_INDEX_COL_LEN is measured in bytes and
 is the maximum indexed column length (or indexed prefix length) in
@@ -1258,7 +1258,7 @@
 /** Set to store the virtual columns which are affected by Foreign
 key constraint. */
 typedef std::set<dict_v_col_t *, std::less<dict_v_col_t *>,
-                 ut_allocator<dict_v_col_t *>>
+                 ut::allocator<dict_v_col_t *>>
     dict_vcol_set;
 
 /** Data structure for a foreign key constraint; an example:
@@ -1344,7 +1344,7 @@
 };
 
 typedef std::set<dict_foreign_t *, dict_foreign_compare,
-                 ut_allocator<dict_foreign_t *>>
+                 ut::allocator<dict_foreign_t *>>
     dict_foreign_set;
 
 std::ostream &operator<<(std::ostream &out, const dict_foreign_set &fk_set);
@@ -1380,7 +1380,7 @@
     dict_foreign_t *foreign) /*!< in, own: foreign key struct */
 {
   if (foreign->v_cols != nullptr) {
-    UT_DELETE(foreign->v_cols);
+    ut::delete_(foreign->v_cols);
   }
 
   mem_heap_free(foreign->heap);
@@ -2214,7 +2214,7 @@
   PM_BIGGEST_TYPE = 3
 };
 
-typedef std::vector<index_id_t, ut_allocator<index_id_t>> corrupted_ids_t;
+typedef std::vector<index_id_t, ut::allocator<index_id_t>> corrupted_ids_t;
 
 /** Persistent dynamic metadata for a table */
 class PersistentTableMetadata {
@@ -2407,7 +2407,7 @@
 class Persisters {
   typedef std::map<
       persistent_type_t, Persister *, std::less<persistent_type_t>,
-      ut_allocator<std::pair<const persistent_type_t, Persister *>>>
+      ut::allocator<std::pair<const persistent_type_t, Persister *>>>
       persisters_t;
 
  public:
@@ -2475,7 +2475,7 @@
   if (table->mutex_created == os_once::DONE) {
     if (table->mutex != nullptr) {
       mutex_free(table->mutex);
-      UT_DELETE(table->mutex);
+      ut::delete_(table->mutex);
     }
   }
 }
@@ -2488,12 +2488,12 @@
   if (table->autoinc_mutex_created == os_once::DONE) {
     if (table->autoinc_mutex != nullptr) {
       mutex_free(table->autoinc_mutex);
-      UT_DELETE(table->autoinc_mutex);
+      ut::delete_(table->autoinc_mutex);
     }
 
     if (table->autoinc_persisted_mutex != nullptr) {
       mutex_free(table->autoinc_persisted_mutex);
-      UT_DELETE(table->autoinc_persisted_mutex);
+      ut::delete_(table->autoinc_persisted_mutex);
     }
   }
 }
@@ -2525,7 +2525,7 @@
   if (index->zip_pad.mutex_created == os_once::DONE &&
       index->zip_pad.mutex != nullptr) {
     mutex_free(index->zip_pad.mutex);
-    UT_DELETE(index->zip_pad.mutex);
+    ut::delete_(index->zip_pad.mutex);
   }
 }
 #endif /* !UNIV_HOTBACKUP */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/dict0sdi-decompress.h mysql-8.0-8.0.27/storage/innobase/include/dict0sdi-decompress.h
--- mysql-8.0-8.0.26/storage/innobase/include/dict0sdi-decompress.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/dict0sdi-decompress.h	2021-09-28 11:46:34.000000000 +0000
@@ -63,9 +63,9 @@
       switch (ret) {
         case Z_BUF_ERROR:
 #ifdef UNIV_NO_ERR_MSGS
-          ib::fatal()
+          ib::fatal(UT_LOCATION_HERE)
 #else
-          ib::fatal(ER_IB_ERR_ZLIB_BUF_ERROR)
+          ib::fatal(UT_LOCATION_HERE, ER_IB_ERR_ZLIB_BUF_ERROR)
 #endif
 
               << "retval = Z_BUF_ERROR";
@@ -73,27 +73,27 @@
 
         case Z_MEM_ERROR:
 #ifdef UNIV_NO_ERR_MSGS
-          ib::fatal()
+          ib::fatal(UT_LOCATION_HERE)
 #else
-          ib::fatal(ER_IB_ERR_ZLIB_MEM_ERROR)
+          ib::fatal(UT_LOCATION_HERE, ER_IB_ERR_ZLIB_MEM_ERROR)
 #endif
               << "retval = Z_MEM_ERROR";
           break;
 
         case Z_DATA_ERROR:
 #ifdef UNIV_NO_ERR_MSGS
-          ib::fatal()
+          ib::fatal(UT_LOCATION_HERE)
 #else
-          ib::fatal(ER_IB_ERR_ZLIB_DATA_ERROR)
+          ib::fatal(UT_LOCATION_HERE, ER_IB_ERR_ZLIB_DATA_ERROR)
 #endif
               << "retval = Z_DATA_ERROR";
           break;
 
         default:
 #ifdef UNIV_NO_ERR_MSGS
-          ib::fatal()
+          ib::fatal(UT_LOCATION_HERE)
 #else
-          ib::fatal(ER_IB_ERR_ZLIB_UNKNOWN_ERROR)
+          ib::fatal(UT_LOCATION_HERE, ER_IB_ERR_ZLIB_UNKNOWN_ERROR)
 #endif
               << "retval = UNKNOWN_ERROR";
           break;
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/dict0sdi.h mysql-8.0-8.0.27/storage/innobase/include/dict0sdi.h
--- mysql-8.0-8.0.26/storage/innobase/include/dict0sdi.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/dict0sdi.h	2021-09-28 11:46:34.000000000 +0000
@@ -42,28 +42,29 @@
   Sdi_Compressor(uint32_t src_len, const void *sdi)
       : m_src_len(src_len), m_comp_len(), m_sdi(sdi), m_comp_sdi() {}
 
-  ~Sdi_Compressor() { ut_free(m_comp_sdi); }
+  ~Sdi_Compressor() { ut::free(m_comp_sdi); }
 
   /** Compress the SDI */
   inline void compress() {
     uLongf zlen = compressBound(static_cast<uLong>(m_src_len));
     auto src = reinterpret_cast<const Bytef *>(m_sdi);
 
-    m_comp_sdi = static_cast<byte *>(ut_malloc_nokey(zlen));
+    m_comp_sdi =
+        static_cast<byte *>(ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, zlen));
     ut_ad(m_comp_sdi != nullptr);
 
     switch (
         compress2(m_comp_sdi, &zlen, src, static_cast<uLong>(m_src_len), 6)) {
       case Z_BUF_ERROR:
-        ib::fatal(ER_IB_MSG_FAILED_SDI_Z_BUF_ERROR);
+        ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_FAILED_SDI_Z_BUF_ERROR);
         break;
 
       case Z_MEM_ERROR:
-        ib::fatal(ER_IB_MSG_FAILED_SDI_Z_MEM_ERROR);
+        ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_FAILED_SDI_Z_MEM_ERROR);
         break;
 
       case Z_STREAM_ERROR:
-        ib::fatal(ER_IB_MSG_SDI_Z_STREAM_ERROR);
+        ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_SDI_Z_STREAM_ERROR);
         break;
 
       case Z_OK:
@@ -71,7 +72,7 @@
         break;
 
       default:
-        ib::fatal(ER_IB_MSG_SDI_Z_UNKNOWN_ERROR);
+        ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_SDI_Z_UNKNOWN_ERROR);
         break;
     }
   }
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/dict0stats_bg.h mysql-8.0-8.0.27/storage/innobase/include/dict0stats_bg.h
--- mysql-8.0-8.0.26/storage/innobase/include/dict0stats_bg.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/dict0stats_bg.h	2021-09-28 11:46:34.000000000 +0000
@@ -77,8 +77,8 @@
 /** Request the background collection of statistics to stop for a table.
  @retval true when no background process is active
  @retval false when it is not safe to modify the table definition */
-static inline bool dict_stats_stop_bg(dict_table_t *table) /*!< in/out: table */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline bool dict_stats_stop_bg(
+    dict_table_t *table); /*!< in/out: table */
 
 /** Wait until background stats thread has stopped using the specified table.
  The caller must have locked the data dictionary using
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/dict0stats.h mysql-8.0-8.0.27/storage/innobase/include/dict0stats.h
--- mysql-8.0-8.0.26/storage/innobase/include/dict0stats.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/dict0stats.h	2021-09-28 11:46:34.000000000 +0000
@@ -72,9 +72,8 @@
 
 /** Check whether persistent statistics is enabled for a given table.
  @return true if enabled, false otherwise */
-static inline ibool dict_stats_is_persistent_enabled(
-    const dict_table_t *table) /*!< in: table */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ibool dict_stats_is_persistent_enabled(
+    const dict_table_t *table); /*!< in: table */
 
 /** Set the auto recalc flag for a given table (only honored for a persistent
 stats enabled table). The flag is set only in the in-memory table object and is
@@ -145,12 +144,11 @@
  This function creates its own transaction and commits it.
  @return DB_SUCCESS or error code. DB_STATS_DO_NOT_EXIST will be returned
  if the persistent stats do not exist. */
-dberr_t dict_stats_rename_index(
-    const dict_table_t *table,  /*!< in: table whose index
-                                is renamed */
-    const char *old_index_name, /*!< in: old index name */
-    const char *new_index_name) /*!< in: new index name */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t dict_stats_rename_index(
+    const dict_table_t *table,   /*!< in: table whose index
+                                 is renamed */
+    const char *old_index_name,  /*!< in: old index name */
+    const char *new_index_name); /*!< in: new index name */
 
 /** Evict the stats tables if they loaded in tablespace cache and also
 close the stats .ibd files. We have to close stats tables because
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/dyn0buf.h mysql-8.0-8.0.27/storage/innobase/include/dyn0buf.h
--- mysql-8.0-8.0.26/storage/innobase/include/dyn0buf.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/dyn0buf.h	2021-09-28 11:46:34.000000000 +0000
@@ -51,7 +51,6 @@
   class block_t;
 
   typedef UT_LIST_NODE_T(block_t) block_node_t;
-  typedef UT_LIST_BASE_NODE_T(block_t, m_node) block_list_t;
 
   class block_t {
    public:
@@ -65,36 +64,30 @@
     /**
     Gets the number of used bytes in a block.
     @return	number of bytes used */
-    ulint used() const MY_ATTRIBUTE((warn_unused_result)) {
+    [[nodiscard]] ulint used() const {
       return (static_cast<ulint>(m_used & ~DYN_BLOCK_FULL_FLAG));
     }
 
     /**
     Gets pointer to the start of data.
     @return	pointer to data */
-    byte *start() MY_ATTRIBUTE((warn_unused_result)) { return (m_data); }
+    [[nodiscard]] byte *start() { return (m_data); }
 
     /**
     @return start of data - non const version */
-    byte *begin() MY_ATTRIBUTE((warn_unused_result)) { return (m_data); }
+    [[nodiscard]] byte *begin() { return (m_data); }
 
     /**
     @return end of used data - non const version */
-    byte *end() MY_ATTRIBUTE((warn_unused_result)) {
-      return (begin() + m_used);
-    }
+    [[nodiscard]] byte *end() { return (begin() + m_used); }
 
     /**
     @return start of data - const version */
-    const byte *begin() const MY_ATTRIBUTE((warn_unused_result)) {
-      return (m_data);
-    }
+    [[nodiscard]] const byte *begin() const { return (m_data); }
 
     /**
     @return end of used data - const version */
-    const byte *end() const MY_ATTRIBUTE((warn_unused_result)) {
-      return (begin() + m_used);
-    }
+    [[nodiscard]] const byte *end() const { return (begin() + m_used); }
 
    private:
     /**
@@ -155,6 +148,7 @@
 
     friend class dyn_buf_t;
   };
+  typedef UT_LIST_BASE_NODE_T(block_t, m_node) block_list_t;
 
   static constexpr auto MAX_DATA_SIZE = block_t::MAX_DATA_SIZE;
 
@@ -186,7 +180,7 @@
   copying the elements, the caller must close the buffer using close().
   @param size	in bytes of the buffer; MUST be <= MAX_DATA_SIZE!
   @return	pointer to the buffer */
-  byte *open(ulint size) MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] byte *open(ulint size) {
     ut_ad(size > 0);
     ut_ad(size <= MAX_DATA_SIZE);
 
@@ -282,7 +276,7 @@
   /**
   Returns the size of the total stored data.
   @return	data size in bytes */
-  ulint size() const MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] ulint size() const {
 #ifdef UNIV_DEBUG
     ulint total_size = 0;
 
@@ -326,16 +320,14 @@
 
   /**
   @return the first block */
-  block_t *front() MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] block_t *front() {
     ut_ad(UT_LIST_GET_LEN(m_list) > 0);
     return (UT_LIST_GET_FIRST(m_list));
   }
 
   /**
   @return true if m_first_block block was not filled fully */
-  bool is_small() const MY_ATTRIBUTE((warn_unused_result)) {
-    return (m_heap == NULL);
-  }
+  [[nodiscard]] bool is_small() const { return (m_heap == NULL); }
 
  private:
   // Disable copying
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/dyn0types.h mysql-8.0-8.0.27/storage/innobase/include/dyn0types.h
--- mysql-8.0-8.0.26/storage/innobase/include/dyn0types.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/dyn0types.h	2021-09-28 11:46:34.000000000 +0000
@@ -33,14 +33,16 @@
 #ifndef dyn0types_h
 #define dyn0types_h
 
+#include <cstddef>
+
 /** Value of dyn_block_t::magic_n */
-#define DYN_BLOCK_MAGIC_N 375767
+constexpr size_t DYN_BLOCK_MAGIC_N = 375767;
 
 /** This is the initial 'payload' size of a dynamic array;
 this must be > MLOG_BUF_MARGIN + 30! */
-#define DYN_ARRAY_DATA_SIZE 512
+constexpr size_t DYN_ARRAY_DATA_SIZE = 512;
 
 /** Flag for dyn_block_t::used that indicates a full block */
-#define DYN_BLOCK_FULL_FLAG 0x1000000UL
+constexpr size_t DYN_BLOCK_FULL_FLAG = 0x1000000UL;
 
 #endif /* dyn0types_h */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/fil0fil.h mysql-8.0-8.0.27/storage/innobase/include/fil0fil.h
--- mysql-8.0-8.0.26/storage/innobase/include/fil0fil.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/fil0fil.h	2021-09-28 11:46:34.000000000 +0000
@@ -109,8 +109,8 @@
 struct trx_t;
 class page_id_t;
 
-using Filenames = std::vector<std::string, ut_allocator<std::string>>;
-using Space_ids = std::vector<space_id_t, ut_allocator<space_id_t>>;
+using Filenames = std::vector<std::string, ut::allocator<std::string>>;
+using Space_ids = std::vector<space_id_t, ut::allocator<space_id_t>>;
 
 /** File types */
 enum fil_type_t : uint8_t {
@@ -226,13 +226,10 @@
   size_t magic_n;
 };
 
-/* Type of (un)encryption operation in progress for Tablespace. */
-enum encryption_op_type { ENCRYPTION = 1, DECRYPTION = 2, NONE };
-
 /** Tablespace or log data space */
 struct fil_space_t {
   using List_node = UT_LIST_NODE_T(fil_space_t);
-  using Files = std::vector<fil_node_t, ut_allocator<fil_node_t>>;
+  using Files = std::vector<fil_node_t, ut::allocator<fil_node_t>>;
 
   /** Release the reserved free extents.
   @param[in]	n_reserved	number of reserved extents */
@@ -303,8 +300,8 @@
 #endif /* UNIV_DEBUG */
 
  public:
-  using Observer = FlushObserver;
-  using FlushObservers = std::vector<Observer *, ut_allocator<Observer *>>;
+  using Observer = Flush_observer;
+  using Flush_observers = std::vector<Observer *, ut::allocator<Observer *>>;
 
   /** When the tablespace was extended last. */
   ib::Timer m_last_extended{};
@@ -504,7 +501,7 @@
   byte encryption_iv[Encryption::KEY_LEN];
 
   /** Encryption is in progress */
-  encryption_op_type encryption_op_in_progress;
+  Encryption::Progress encryption_op_in_progress{Encryption::Progress::NONE};
 
   /** Flush lsn of header page. It is used only during recovery */
   lsn_t m_header_page_flush_lsn;
@@ -520,20 +517,20 @@
 
   /** Check if the tablespace is compressed.
   @return true if compressed, false otherwise. */
-  bool is_compressed() const noexcept MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] bool is_compressed() const noexcept {
     return compression_type != Compression::NONE;
   }
 
   /** Check if the tablespace is encrypted.
   @return true if encrypted, false otherwise. */
-  bool is_encrypted() const noexcept MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] bool is_encrypted() const noexcept {
     return FSP_FLAGS_GET_ENCRYPTION(flags);
   }
 
   /** Check if the encryption details, like the encryption key, type and
   other details, that are needed to carry out encryption are available.
   @return true if encryption can be done, false otherwise. */
-  bool can_encrypt() const noexcept MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] bool can_encrypt() const noexcept {
     return encryption_type != Encryption::Type::NONE;
   }
 
@@ -555,8 +552,7 @@
                             the returned file node. For tablespaces containing
                             only one file, the given page_no will not change.
   @return the file node object. */
-  fil_node_t *get_file_node(page_no_t *page_no) noexcept
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] fil_node_t *get_file_node(page_no_t *page_no) noexcept;
 };
 
 /** Value of fil_space_t::magic_n */
@@ -640,32 +636,24 @@
 
   /** Implicit type conversion
   @return pointer to m_path.c_str() */
-  operator const char *() const MY_ATTRIBUTE((warn_unused_result)) {
-    return m_path.c_str();
-  }
+  [[nodiscard]] operator const char *() const { return m_path.c_str(); }
 
   /** Explicit type conversion
   @return pointer to m_path.c_str() */
-  const char *operator()() const MY_ATTRIBUTE((warn_unused_result)) {
-    return m_path.c_str();
-  }
+  [[nodiscard]] const char *operator()() const { return m_path.c_str(); }
 
   /** @return the value of m_path */
-  const std::string &path() const MY_ATTRIBUTE((warn_unused_result)) {
-    return (m_path);
-  }
+  [[nodiscard]] const std::string &path() const { return (m_path); }
 
   /** @return the length of m_path */
-  size_t len() const MY_ATTRIBUTE((warn_unused_result)) {
-    return (m_path.length());
-  }
+  [[nodiscard]] size_t len() const { return (m_path.length()); }
 
   /** Return the absolute path by value. If m_abs_path is null, calculate
   it and return it by value without trying to reset this const object.
   m_abs_path can be empty if the path did not exist when this object
   was constructed.
   @return the absolute path by value. */
-  const std::string abs_path() const MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] const std::string abs_path() const {
     if (m_abs_path.empty()) {
       return (get_real_path(m_path));
     }
@@ -674,9 +662,7 @@
   }
 
   /** @return the length of m_abs_path */
-  size_t abs_len() const MY_ATTRIBUTE((warn_unused_result)) {
-    return (m_abs_path.length());
-  }
+  [[nodiscard]] size_t abs_len() const { return (m_abs_path.length()); }
 
   /** Determine if this path is equal to the other path.
   @param[in]  other		path to compare to
@@ -686,22 +672,20 @@
   /** Check if m_path is the same as this other path.
   @param[in]  other  directory path to compare to
   @return true if m_path is the same as path */
-  bool is_same_as(const Fil_path &other) const
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool is_same_as(const Fil_path &other) const;
 
   /** Check if this path is the same as the other path.
   @param[in]  other  directory path to compare to
   @return true if this path is the same as the other path */
-  bool is_same_as(const std::string &other) const
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool is_same_as(const std::string &other) const;
 
   /** Check if two path strings are equal. Put them into Fil_path objects
   so that they can be compared correctly.
   @param[in]  first   first path to check
   @param[in]  second  socond path to check
   @return true if these two paths are the same */
-  static bool is_same_as(const std::string &first, const std::string &second)
-      MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] static bool is_same_as(const std::string &first,
+                                       const std::string &second) {
     if (first.empty() || second.empty()) {
       return (false);
     }
@@ -720,14 +704,12 @@
   /** Check if m_path is the parent of the other path.
   @param[in]  other  path to compare to
   @return true if m_path is an ancestor of name */
-  bool is_ancestor(const Fil_path &other) const
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool is_ancestor(const Fil_path &other) const;
 
   /** Check if this Fil_path is an ancestor of the other path.
   @param[in]  other  path to compare to
   @return true if this Fil_path is an ancestor of the other path */
-  bool is_ancestor(const std::string &other) const
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool is_ancestor(const std::string &other) const;
 
   /** Check if the first path is an ancestor of the second.
   Do not assume that these paths have been converted to real paths
@@ -736,8 +718,8 @@
   @param[in]  first   Parent path to check
   @param[in]  second  Descendent path to check
   @return true if the first path is an ancestor of the second */
-  static bool is_ancestor(const std::string &first, const std::string &second)
-      MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] static bool is_ancestor(const std::string &first,
+                                        const std::string &second) {
     if (first.empty() || second.empty()) {
       return (false);
     }
@@ -749,19 +731,19 @@
   }
 
   /** @return true if m_path exists and is a file. */
-  bool is_file_and_exists() const MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool is_file_and_exists() const;
 
   /** @return true if m_path exists and is a directory. */
-  bool is_directory_and_exists() const MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool is_directory_and_exists() const;
 
   /** This validation is only for ':'.
   @return true if the path is valid. */
-  bool is_valid() const MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool is_valid() const;
 
   /** Determine if m_path contains a circular section like "/anydir/../"
   Fil_path::normalize() must be run before this.
   @return true if a circular section if found, false if not */
-  bool is_circular() const MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool is_circular() const;
 
   /** Determine if the file or directory is considered HIDDEN.
   Most file systems identify the HIDDEN attribute by a '.' preceeding the
@@ -806,13 +788,12 @@
   @param[in]  path  OS directory or file path to evaluate
   @retval true if the path is relative
   @retval false if the path is absolute or file_name_only */
-  static bool is_relative_path(const std::string &path)
-      MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] static bool is_relative_path(const std::string &path) {
     return (type_of_path(path) == relative);
   }
 
   /** @return true if the path is an absolute path. */
-  bool is_absolute_path() const MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] bool is_absolute_path() const {
     return (type_of_path(m_path) == absolute);
   }
 
@@ -820,8 +801,7 @@
   @param[in]  path  OS directory or file path to evaluate
   @retval true if the path is absolute
   @retval false if the path is relative or file_name_only */
-  static bool is_absolute_path(const std::string &path)
-      MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] static bool is_absolute_path(const std::string &path) {
     return (type_of_path(path) == absolute);
   }
 
@@ -829,8 +809,7 @@
   @param[in]  path  OS directory or file path to evaluate
   @return the type of filepath; 'absolute', 'relative',
   'file_name_only', or 'invalid' if the path is empty. */
-  static path_type type_of_path(const std::string &path)
-      MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] static path_type type_of_path(const std::string &path) {
     if (path.empty()) {
       return (invalid);
     }
@@ -863,8 +842,8 @@
 
   /* Check if the path is prefixed with pattern.
   @return true if prefix matches */
-  static bool has_prefix(const std::string &path, const std::string prefix)
-      MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] static bool has_prefix(const std::string &path,
+                                       const std::string prefix) {
     return (path.size() >= prefix.size() &&
             std::equal(prefix.begin(), prefix.end(), path.begin()));
   }
@@ -900,8 +879,7 @@
   }
 
   /** @return true if the path exists and is a file . */
-  static os_file_type_t get_file_type(const std::string &path)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static os_file_type_t get_file_type(const std::string &path);
 
   /** Return a string to display the file type of a path.
   @param[in]  path  path name
@@ -924,29 +902,26 @@
                      if false and my_realpath() fails, return a null string.
   @return  the absolute path prepared for making comparisons with other real
            paths. */
-  static std::string get_real_path(const std::string &path, bool force = true)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static std::string get_real_path(const std::string &path,
+                                                 bool force = true);
 
   /** Get the basename of the file path. This is the file name without any
   directory separators. In other words, the file name after the last separator.
   @param[in]  filepath  The name of a file, optionally with a path. */
-  static std::string get_basename(const std::string &filepath)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static std::string get_basename(const std::string &filepath);
 
   /** Separate the portion of a directory path that exists and the portion that
   does not exist.
   @param[in]      path   Path to evaluate
   @param[in,out]  ghost  The portion of the path that does not exist.
   @return the existing portion of a path. */
-  static std::string get_existing_path(const std::string &path,
-                                       std::string &ghost)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static std::string get_existing_path(const std::string &path,
+                                                     std::string &ghost);
 
   /** Check if the name is an undo tablespace name.
   @param[in]	name		Tablespace name
   @return true if it is an undo tablespace name */
-  static bool is_undo_tablespace_name(const std::string &name)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static bool is_undo_tablespace_name(const std::string &name);
 
   /** Check if the file has the the specified suffix
   @param[in]	sfx		suffix to look for
@@ -1012,24 +987,22 @@
   @param[in]	ext		the file extension to use
   @param[in]      trim            whether last name on the path should
                                   be trimmed
-  @return own: file name; must be freed by ut_free() */
-  static char *make(const std::string &path_in, const std::string &name_in,
-                    ib_file_suffix ext, bool trim = false)
-      MY_ATTRIBUTE((warn_unused_result));
+  @return own: file name; must be freed by ut::free() */
+  [[nodiscard]] static char *make(const std::string &path_in,
+                                  const std::string &name_in,
+                                  ib_file_suffix ext, bool trim = false);
 
   /** Allocate and build a CFG file name from a path.
   @param[in]	path_in		Full path to the filename
-  @return own: file name; must be freed by ut_free() */
-  static char *make_cfg(const std::string &path_in)
-      MY_ATTRIBUTE((warn_unused_result)) {
+  @return own: file name; must be freed by ut::free() */
+  [[nodiscard]] static char *make_cfg(const std::string &path_in) {
     return (make(path_in, "", CFG));
   }
 
   /** Allocate and build a CFP file name from a path.
   @param[in]	path_in		Full path to the filename
-  @return own: file name; must be freed by ut_free() */
-  static char *make_cfp(const std::string &path_in)
-      MY_ATTRIBUTE((warn_unused_result)) {
+  @return own: file name; must be freed by ut::free() */
+  [[nodiscard]] static char *make_cfp(const std::string &path_in) {
     return (make(path_in, "", CFP));
   }
 
@@ -1039,18 +1012,18 @@
                                   the full path and filename
   @param[in]	name_in		nullptr if path is full, or
                                   Table/Tablespace name
-  @return own: file name; must be freed by ut_free() */
-  static char *make_ibd(const std::string &path_in, const std::string &name_in)
-      MY_ATTRIBUTE((warn_unused_result)) {
+  @return own: file name; must be freed by ut::free() */
+  [[nodiscard]] static char *make_ibd(const std::string &path_in,
+                                      const std::string &name_in) {
     return (make(path_in, name_in, IBD));
   }
 
   /** Allocate and build a file name from a path, a table or
   tablespace name and a suffix.
   @param[in]	name_in		Table/Tablespace name
-  @return own: file name; must be freed by ut_free() */
-  static char *make_ibd_from_table_name(const std::string &name_in)
-      MY_ATTRIBUTE((warn_unused_result)) {
+  @return own: file name; must be freed by ut::free() */
+  [[nodiscard]] static char *make_ibd_from_table_name(
+      const std::string &name_in) {
     return (make("", name_in, IBD));
   }
 
@@ -1061,10 +1034,9 @@
   @param[in]	name_in		Contains new base name
   @param[in]	extn		File extension
   @return new full pathname */
-  static std::string make_new_path(const std::string &path_in,
-                                   const std::string &name_in,
-                                   ib_file_suffix extn)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static std::string make_new_path(const std::string &path_in,
+                                                 const std::string &name_in,
+                                                 ib_file_suffix extn);
 
   /** Parse file-per-table file name and build Innodb dictionary table name.
   @param[in]	file_path	File name with complete path
@@ -1349,22 +1321,19 @@
 should be used instead.
 @param[in]	space_id	Tablespace ID
 @return tablespace, or nullptr if not found */
-fil_space_t *fil_space_get(space_id_t space_id)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] fil_space_t *fil_space_get(space_id_t space_id);
 
 #ifndef UNIV_HOTBACKUP
 /** Returns the latch of a file space.
 @param[in]	space_id	Tablespace ID
 @return latch protecting storage allocation */
-rw_lock_t *fil_space_get_latch(space_id_t space_id)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] rw_lock_t *fil_space_get_latch(space_id_t space_id);
 
 #ifdef UNIV_DEBUG
 /** Gets the type of a file space.
 @param[in]	space_id	Tablespace ID
 @return file type */
-fil_type_t fil_space_get_type(space_id_t space_id)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] fil_type_t fil_space_get_type(space_id_t space_id);
 #endif /* UNIV_DEBUG */
 
 /** Note that a tablespace has been imported.
@@ -1386,10 +1355,10 @@
 @param[in]	max_pages	maximum number of pages in file
 @return pointer to the file name
 @retval nullptr if error */
-char *fil_node_create(const char *name, page_no_t size, fil_space_t *space,
-                      bool is_raw, bool atomic_write,
-                      page_no_t max_pages = PAGE_NO_MAX)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] char *fil_node_create(const char *name, page_no_t size,
+                                    fil_space_t *space, bool is_raw,
+                                    bool atomic_write,
+                                    page_no_t max_pages = PAGE_NO_MAX);
 
 /** Create a space memory object and put it to the fil_system hash table.
 The tablespace name is independent from the tablespace file-name.
@@ -1400,17 +1369,16 @@
 @param[in]	purpose		Tablespace purpose
 @return pointer to created tablespace, to be filled in with fil_node_create()
 @retval nullptr on failure (such as when the same tablespace exists) */
-fil_space_t *fil_space_create(const char *name, space_id_t space_id,
-                              uint32_t flags, fil_type_t purpose)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] fil_space_t *fil_space_create(const char *name,
+                                            space_id_t space_id, uint32_t flags,
+                                            fil_type_t purpose);
 
 /** Assigns a new space id for a new single-table tablespace. This works
 simply by incrementing the global counter. If 4 billion id's is not enough,
 we may need to recycle id's.
 @param[out]	space_id		Set this to the new tablespace ID
 @return true if assigned, false if not */
-bool fil_assign_new_space_id(space_id_t *space_id)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool fil_assign_new_space_id(space_id_t *space_id);
 
 /** Returns the path from the first fil_node_t found with this space ID.
 The caller is responsible for freeing the memory allocated here for the
@@ -1418,21 +1386,18 @@
 @param[in]	space_id	Tablespace ID
 @return own: A copy of fil_node_t::path, nullptr if space ID is zero
         or not found. */
-char *fil_space_get_first_path(space_id_t space_id)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] char *fil_space_get_first_path(space_id_t space_id);
 
 /** Returns the size of the space in pages. The tablespace must be cached
 in the memory cache.
 @param[in]	space_id	Tablespace ID
 @return space size, 0 if space not found */
-page_no_t fil_space_get_size(space_id_t space_id)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] page_no_t fil_space_get_size(space_id_t space_id);
 
 /** Returns the size of an undo space just after it was initialized.
 @param[in]	space_id	Tablespace ID
 @return initial space size, 0 if space not found */
-page_no_t fil_space_get_undo_initial_size(space_id_t space_id)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] page_no_t fil_space_get_undo_initial_size(space_id_t space_id);
 
 /** This is called for an undo tablespace after it has been initialized
 or opened.  It sets the minimum size in pages at which it should be truncated
@@ -1448,8 +1413,7 @@
 in the memory cache.
 @param[in]	space_id	Tablespace ID for which to get the flags
 @return flags, ULINT_UNDEFINED if space not found */
-uint32_t fil_space_get_flags(space_id_t space_id)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] uint32_t fil_space_get_flags(space_id_t space_id);
 
 /** Sets the flags of the tablespace. The tablespace must be locked
 in MDL_EXCLUSIVE MODE.
@@ -1461,7 +1425,7 @@
 @param[in]	space_id	Tablespace ID
 @retval	true	if all file nodes were opened
 @retval	false	on failure */
-bool fil_space_open(space_id_t space_id) MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool fil_space_open(space_id_t space_id);
 
 /** Close each file of a tablespace if open.
 @param[in]	space_id	Tablespace ID */
@@ -1472,8 +1436,8 @@
 @param[in]	space_id	Tablespace ID
 @param[out]	found		true if tablespace was found
 @return page size */
-const page_size_t fil_space_get_page_size(space_id_t space_id, bool *found)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] const page_size_t fil_space_get_page_size(space_id_t space_id,
+                                                        bool *found);
 
 /** Initializes the tablespace memory cache.
 @param[in]	max_n_open	Maximum number of open files */
@@ -1531,7 +1495,7 @@
 system tablespace.
 @param[in]	lsn		Flushed LSN
 @return DB_SUCCESS or error number */
-dberr_t fil_write_flushed_lsn(lsn_t lsn) MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t fil_write_flushed_lsn(lsn_t lsn);
 
 #else /* !UNIV_HOTBACKUP */
 /** Frees a space object from the tablespace memory cache.
@@ -1559,16 +1523,14 @@
 for concurrency control.
 @param[in]	space_id	Tablespace ID
 @return the tablespace, or nullptr if missing or being deleted */
-fil_space_t *fil_space_acquire(space_id_t space_id)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] fil_space_t *fil_space_acquire(space_id_t space_id);
 
 /** Acquire a tablespace that may not exist.
 Used by background threads that do not necessarily hold proper locks
 for concurrency control.
 @param[in]	space_id	Tablespace ID
 @return the tablespace, or nullptr if missing or being deleted */
-fil_space_t *fil_space_acquire_silent(space_id_t space_id)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] fil_space_t *fil_space_acquire_silent(space_id_t space_id);
 
 /** Release a tablespace acquired with fil_space_acquire().
 @param[in,out]	space	Tablespace to release  */
@@ -1594,16 +1556,15 @@
 @param[in]	space_id	Tablespace ID to truncate
 @param[in]	size_in_pages	Truncate size.
 @return true if truncate was successful. */
-bool fil_truncate_tablespace(space_id_t space_id, page_no_t size_in_pages)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool fil_truncate_tablespace(space_id_t space_id,
+                                           page_no_t size_in_pages);
 
 /** Closes a single-table tablespace. The tablespace must be cached in the
 memory cache. Free all pages used by the tablespace.
 @param[in,out]	trx		Transaction covering the close
 @param[in]	space_id	Tablespace ID
 @return DB_SUCCESS or error */
-dberr_t fil_close_tablespace(trx_t *trx, space_id_t space_id)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t fil_close_tablespace(trx_t *trx, space_id_t space_id);
 
 /** Discards a single-table tablespace. The tablespace must be cached in the
 memory cache. Discarding is like deleting a tablespace, but
@@ -1619,8 +1580,7 @@
  4. Free all the pages in use by the tablespace if rename=true.
 @param[in]	space_id	Tablespace ID
 @return DB_SUCCESS or error */
-dberr_t fil_discard_tablespace(space_id_t space_id)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t fil_discard_tablespace(space_id_t space_id);
 
 /** Test if a tablespace file can be renamed to a new filepath by checking
 if that the old filepath exists and the new filepath does not exist.
@@ -1629,9 +1589,10 @@
 @param[in]	new_path	New filepath
 @param[in]	is_discarded	Whether the tablespace is discarded
 @return innodb error code */
-dberr_t fil_rename_tablespace_check(space_id_t space_id, const char *old_path,
-                                    const char *new_path, bool is_discarded)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t fil_rename_tablespace_check(space_id_t space_id,
+                                                  const char *old_path,
+                                                  const char *new_path,
+                                                  bool is_discarded);
 
 /** Rename a single-table tablespace.
 The tablespace must exist in the memory cache.
@@ -1641,9 +1602,10 @@
 @param[in]	new_path_in	New file name, or nullptr if it is located in
 the normal data directory
 @return InnoDB error code */
-dberr_t fil_rename_tablespace(space_id_t space_id, const char *old_path,
-                              const char *new_name, const char *new_path_in)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t fil_rename_tablespace(space_id_t space_id,
+                                            const char *old_path,
+                                            const char *new_name,
+                                            const char *new_path_in);
 
 /** Create an IBD tablespace file.
 @param[in]	space_id	Tablespace ID
@@ -1655,9 +1617,9 @@
 @param[in]	size		Initial size of the tablespace file in pages,
                                 must be >= FIL_IBD_FILE_INITIAL_SIZE
 @return DB_SUCCESS or error code */
-dberr_t fil_ibd_create(space_id_t space_id, const char *name, const char *path,
-                       uint32_t flags, page_no_t size)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t fil_ibd_create(space_id_t space_id, const char *name,
+                                     const char *path, uint32_t flags,
+                                     page_no_t size);
 
 /** Create a session temporary tablespace (IBT) file.
 @param[in]	space_id	Tablespace ID
@@ -1667,9 +1629,9 @@
 @param[in]	size		Initial size of the tablespace file in pages,
                                 must be >= FIL_IBT_FILE_INITIAL_SIZE
 @return DB_SUCCESS or error code */
-dberr_t fil_ibt_create(space_id_t space_id, const char *name, const char *path,
-                       uint32_t flags, page_no_t size)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t fil_ibt_create(space_id_t space_id, const char *name,
+                                     const char *path, uint32_t flags,
+                                     page_no_t size);
 
 /** Deletes an IBD  or IBU tablespace.
 The tablespace must be cached in the memory cache. This will delete the
@@ -1678,8 +1640,8 @@
 @param[in]	buf_remove	Specify the action to take on the pages
 for this table in the buffer pool.
 @return DB_SUCCESS, DB_TABLESPCE_NOT_FOUND or DB_IO_ERROR */
-dberr_t fil_delete_tablespace(space_id_t space_id, buf_remove_t buf_remove)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t fil_delete_tablespace(space_id_t space_id,
+                                            buf_remove_t buf_remove);
 
 /** Open a single-table tablespace and optionally do some validation such
 as checking that the space id is correct. If the file is already open,
@@ -1707,10 +1669,10 @@
 @param[in]	old_space	whether it is a 5.7 tablespace opening
                                 by upgrade
 @return DB_SUCCESS or error code */
-dberr_t fil_ibd_open(bool validate, fil_type_t purpose, space_id_t space_id,
-                     uint32_t flags, const char *space_name,
-                     const char *path_in, bool strict, bool old_space)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t fil_ibd_open(bool validate, fil_type_t purpose,
+                                   space_id_t space_id, uint32_t flags,
+                                   const char *space_name, const char *path_in,
+                                   bool strict, bool old_space);
 
 /** Returns true if a matching tablespace exists in the InnoDB tablespace
 memory cache.
@@ -1721,9 +1683,9 @@
                                 not found from memory.
 @param[in]	adjust_space	Whether to adjust space id on mismatch
 @return true if a matching tablespace exists in the memory cache */
-bool fil_space_exists_in_mem(space_id_t space_id, const char *name,
-                             bool print_err, bool adjust_space)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool fil_space_exists_in_mem(space_id_t space_id,
+                                           const char *name, bool print_err,
+                                           bool adjust_space);
 
 /** Extends all tablespaces to the size stored in the space header. During the
 mysqlbackup --apply-log phase we extended the spaces on-demand so that log
@@ -1735,17 +1697,16 @@
 @param[in,out]	space		Tablespace ID
 @param[in]	size		desired size in pages
 @return whether the tablespace is at least as big as requested */
-bool fil_space_extend(fil_space_t *space, page_no_t size)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool fil_space_extend(fil_space_t *space, page_no_t size);
 
 /** Tries to reserve free extents in a file space.
 @param[in]	space_id	Tablespace ID
 @param[in]	n_free_now	Number of free extents now
 @param[in]	n_to_reserve	How many one wants to reserve
 @return true if succeed */
-bool fil_space_reserve_free_extents(space_id_t space_id, ulint n_free_now,
-                                    ulint n_to_reserve)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool fil_space_reserve_free_extents(space_id_t space_id,
+                                                  ulint n_free_now,
+                                                  ulint n_to_reserve);
 
 /** Releases free extents in a file space.
 @param[in]	space_id	Tablespace ID
@@ -1756,8 +1717,7 @@
 number should be zero.
 @param[in]	space_id	Tablespace ID
 @return the number of reserved extents */
-ulint fil_space_get_n_reserved_extents(space_id_t space_id)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] ulint fil_space_get_n_reserved_extents(space_id_t space_id);
 
 /** Read or write redo log data (synchronous buffered IO).
 @param[in]	type		IO context
@@ -1768,9 +1728,10 @@
 @param[in,out]	buf		buffer where to store read data or from where
                                 to write
 @retval DB_SUCCESS if all OK */
-dberr_t fil_redo_io(const IORequest &type, const page_id_t &page_id,
-                    const page_size_t &page_size, ulint byte_offset, ulint len,
-                    void *buf) MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t fil_redo_io(const IORequest &type,
+                                  const page_id_t &page_id,
+                                  const page_size_t &page_size,
+                                  ulint byte_offset, ulint len, void *buf);
 
 /** Read or write data from a file.
 @param[in]	type		IO context
@@ -1789,9 +1750,10 @@
 @return error code
 @retval DB_SUCCESS on success
 @retval DB_TABLESPACE_DELETED if the tablespace does not exist */
-dberr_t fil_io(const IORequest &type, bool sync, const page_id_t &page_id,
-               const page_size_t &page_size, ulint byte_offset, ulint len,
-               void *buf, void *message) MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t fil_io(const IORequest &type, bool sync,
+                             const page_id_t &page_id,
+                             const page_size_t &page_size, ulint byte_offset,
+                             ulint len, void *buf, void *message);
 
 /** Waits for an AIO operation to complete. This function is used to write the
 handler for completed requests. The aio array of pending requests is divided
@@ -1826,20 +1788,17 @@
 /** Returns true if file address is undefined.
 @param[in]	addr		File address to check
 @return true if undefined */
-bool fil_addr_is_null(const fil_addr_t &addr)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool fil_addr_is_null(const fil_addr_t &addr);
 
 /** Get the predecessor of a file page.
 @param[in]	page		File page
 @return FIL_PAGE_PREV */
-page_no_t fil_page_get_prev(const byte *page)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] page_no_t fil_page_get_prev(const byte *page);
 
 /** Get the successor of a file page.
 @param[in]	page		File page
 @return FIL_PAGE_NEXT */
-page_no_t fil_page_get_next(const byte *page)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] page_no_t fil_page_get_next(const byte *page);
 
 /** Sets the file page type.
 @param[in,out]	page		File page
@@ -1904,15 +1863,14 @@
 /** Check whether a single-table tablespace is redo skipped.
 @param[in]	space_id	Tablespace ID
 @return true if redo skipped */
-bool fil_space_is_redo_skipped(space_id_t space_id)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool fil_space_is_redo_skipped(space_id_t space_id);
 #endif /* UNIV_DEBUG */
 
 /** Delete the tablespace file and any related files like .cfg.
 This should not be called for temporary tables.
 @param[in]	path		File path of the IBD tablespace
 @return true on success */
-bool fil_delete_file(const char *path) MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool fil_delete_file(const char *path);
 
 /** Callback functor. */
 struct PageCallback {
@@ -1925,8 +1883,8 @@
   @param file_size size of the file in bytes
   @param block contents of the first page in the tablespace file
   @retval DB_SUCCESS or error code. */
-  virtual dberr_t init(os_offset_t file_size, const buf_block_t *block)
-      MY_ATTRIBUTE((warn_unused_result)) UNIV_NOTHROW = 0;
+  [[nodiscard]] virtual dberr_t init(os_offset_t file_size,
+                                     const buf_block_t *block) UNIV_NOTHROW = 0;
 
   /** Called for every page in the tablespace. If the page was not
   updated then its state must be set to BUF_PAGE_NOT_USED. For
@@ -1935,8 +1893,8 @@
   @param offset physical offset within the file
   @param block block read from file, note it is not from the buffer pool
   @retval DB_SUCCESS or error code. */
-  virtual dberr_t operator()(os_offset_t offset, buf_block_t *block)
-      MY_ATTRIBUTE((warn_unused_result)) UNIV_NOTHROW = 0;
+  [[nodiscard]] virtual dberr_t operator()(os_offset_t offset,
+                                           buf_block_t *block) UNIV_NOTHROW = 0;
 
   /** Set the name of the physical file and the file handle that is used
   to open it for the file that is being iterated over.
@@ -1948,13 +1906,11 @@
   }
 
   /** @return the space id of the tablespace */
-  virtual space_id_t get_space_id() const
-      MY_ATTRIBUTE((warn_unused_result)) UNIV_NOTHROW = 0;
+  [[nodiscard]] virtual space_id_t get_space_id() const UNIV_NOTHROW = 0;
 
   /**
   @retval the space flags of the tablespace being iterated over */
-  virtual ulint get_space_flags() const
-      MY_ATTRIBUTE((warn_unused_result)) UNIV_NOTHROW = 0;
+  [[nodiscard]] virtual ulint get_space_flags() const UNIV_NOTHROW = 0;
 
   /** Set the tablespace table size.
   @param[in] page a page belonging to the tablespace */
@@ -1962,7 +1918,7 @@
 
   /** The compressed page size
   @return the compressed page size */
-  const page_size_t &get_page_size() const MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] const page_size_t &get_page_size() const {
     return (m_page_size);
   }
 
@@ -1988,10 +1944,10 @@
 else Compression::Type::NONE
 @param[in,out]  callback functor that will do the page updates
 @return DB_SUCCESS or error code */
-dberr_t fil_tablespace_iterate(dict_table_t *table, ulint n_io_buffers,
-                               Compression::Type compression_type,
-                               PageCallback &callback)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t fil_tablespace_iterate(dict_table_t *table,
+                                             ulint n_io_buffers,
+                                             Compression::Type compression_type,
+                                             PageCallback &callback);
 
 /** Looks for a pre-existing fil_space_t with the given tablespace ID
 and, if found, returns the name and filepath in newly allocated buffers
@@ -2001,46 +1957,43 @@
 @param[out]	filepath	The filepath of the first datafile for the
 tablespace.
 @return true if tablespace is found, false if not. */
-bool fil_space_read_name_and_filepath(space_id_t space_id, char **name,
-                                      char **filepath)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool fil_space_read_name_and_filepath(space_id_t space_id,
+                                                    char **name,
+                                                    char **filepath);
 
 /** Convert a file name to a tablespace name. Strip the file name
 prefix and suffix, leaving only databasename/tablename.
 @param[in]	filename	directory/databasename/tablename.ibd
-@return database/tablename string, to be freed with ut_free() */
-char *fil_path_to_space_name(const char *filename)
-    MY_ATTRIBUTE((warn_unused_result));
+@return database/tablename string, to be freed with ut::free() */
+[[nodiscard]] char *fil_path_to_space_name(const char *filename);
 
 /** Returns the space ID based on the tablespace name.
 The tablespace must be found in the tablespace memory cache.
 This call is made from external to this module, so the mutex is not owned.
 @param[in]	name		Tablespace name
 @return space ID if tablespace found, SPACE_UNKNOWN if space not. */
-space_id_t fil_space_get_id_by_name(const char *name)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] space_id_t fil_space_get_id_by_name(const char *name);
 
 /** Check if swapping two .ibd files can be done without failure
 @param[in]	old_table	old table
 @param[in]	new_table	new table
 @param[in]	tmp_name	temporary table name
 @return innodb error code */
-dberr_t fil_rename_precheck(const dict_table_t *old_table,
-                            const dict_table_t *new_table, const char *tmp_name)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t fil_rename_precheck(const dict_table_t *old_table,
+                                          const dict_table_t *new_table,
+                                          const char *tmp_name);
 
 /** Set the compression type for the tablespace
 @param[in]	space_id	Space ID of the tablespace
 @param[in]	algorithm	Text representation of the algorithm
 @return DB_SUCCESS or error code */
-dberr_t fil_set_compression(space_id_t space_id, const char *algorithm)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t fil_set_compression(space_id_t space_id,
+                                          const char *algorithm);
 
 /** Get the compression algorithm for a tablespace.
 @param[in]	space_id	Space ID to check
 @return the compression algorithm */
-Compression::Type fil_get_compression(space_id_t space_id)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] Compression::Type fil_get_compression(space_id_t space_id);
 
 /** Set encryption information for IORequest.
 @param[in,out]	req_type	IO request
@@ -2055,9 +2008,9 @@
 @param[in] key			Encryption key
 @param[in] iv			Encryption iv
 @return DB_SUCCESS or error code */
-dberr_t fil_set_encryption(space_id_t space_id, Encryption::Type algorithm,
-                           byte *key, byte *iv)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t fil_set_encryption(space_id_t space_id,
+                                         Encryption::Type algorithm, byte *key,
+                                         byte *iv);
 
 /** Set the autoextend_size attribute for the tablespace
 @param[in] space_id		Space ID of tablespace for which to set
@@ -2068,12 +2021,11 @@
 /** Reset the encryption type for the tablespace
 @param[in] space_id		Space ID of tablespace for which to set
 @return DB_SUCCESS or error code */
-dberr_t fil_reset_encryption(space_id_t space_id)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t fil_reset_encryption(space_id_t space_id);
 
 /** Rotate the tablespace keys by new master key.
 @return the number of tablespaces that failed to rotate. */
-size_t fil_encryption_rotate() MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] size_t fil_encryption_rotate();
 
 /** Roencrypt the tablespace keys by current master key. */
 void fil_encryption_reencrypt(std::vector<space_id_t> &sid_vector);
@@ -2098,8 +2050,7 @@
 Try and enable FusionIO atomic writes.
 @param[in] file		OS file handle
 @return true if successful */
-bool fil_fusionio_enable_atomic_write(pfs_os_file_t file)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool fil_fusionio_enable_atomic_write(pfs_os_file_t file);
 #endif /* !NO_FALLOCATE && UNIV_LINUX */
 
 /** Note that the file system where the file resides doesn't support PUNCH HOLE.
@@ -2122,10 +2073,10 @@
 @param[in]	parse_only	Don't apply, parse only
 @return pointer to next redo log record
 @retval nullptr if this log record was truncated */
-byte *fil_tablespace_redo_create(byte *ptr, const byte *end,
-                                 const page_id_t &page_id, ulint parsed_bytes,
-                                 bool parse_only)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] byte *fil_tablespace_redo_create(byte *ptr, const byte *end,
+                                               const page_id_t &page_id,
+                                               ulint parsed_bytes,
+                                               bool parse_only);
 
 /** Redo a tablespace delete.
 @param[in]	ptr		redo log record
@@ -2135,10 +2086,10 @@
 @param[in]	parse_only	Don't apply, parse only
 @return pointer to next redo log record
 @retval nullptr if this log record was truncated */
-byte *fil_tablespace_redo_delete(byte *ptr, const byte *end,
-                                 const page_id_t &page_id, ulint parsed_bytes,
-                                 bool parse_only)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] byte *fil_tablespace_redo_delete(byte *ptr, const byte *end,
+                                               const page_id_t &page_id,
+                                               ulint parsed_bytes,
+                                               bool parse_only);
 
 /** Redo a tablespace rename.
 This function doesn't do anything, simply parses the redo log record.
@@ -2149,10 +2100,10 @@
 @param[in]	parse_only	Don't apply, parse only
 @return pointer to next redo log record
 @retval nullptr if this log record was truncated */
-byte *fil_tablespace_redo_rename(byte *ptr, const byte *end,
-                                 const page_id_t &page_id, ulint parsed_bytes,
-                                 bool parse_only)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] byte *fil_tablespace_redo_rename(byte *ptr, const byte *end,
+                                               const page_id_t &page_id,
+                                               ulint parsed_bytes,
+                                               bool parse_only);
 
 /** Redo a tablespace extend
 @param[in]	ptr		redo log record
@@ -2162,10 +2113,10 @@
 @param[in]	parse_only	Don't apply the log if true
 @return pointer to next redo log record
 @retval nullptr if this log record was truncated */
-byte *fil_tablespace_redo_extend(byte *ptr, const byte *end,
-                                 const page_id_t &page_id, ulint parsed_bytes,
-                                 bool parse_only)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] byte *fil_tablespace_redo_extend(byte *ptr, const byte *end,
+                                               const page_id_t &page_id,
+                                               ulint parsed_bytes,
+                                               bool parse_only);
 
 /** Parse and process an encryption redo record.
 @param[in]	ptr		redo log record
@@ -2173,9 +2124,9 @@
 @param[in]	space_id	the tablespace ID
 @param[in]	lsn		lsn for REDO record
 @return log record end, nullptr if not a complete record */
-byte *fil_tablespace_redo_encryption(byte *ptr, const byte *end,
-                                     space_id_t space_id, lsn_t lsn)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] byte *fil_tablespace_redo_encryption(byte *ptr, const byte *end,
+                                                   space_id_t space_id,
+                                                   lsn_t lsn);
 
 /** Read the tablespace id to path mapping from the file
 @param[in]	recovery	true if called from crash recovery */
@@ -2184,8 +2135,7 @@
 /** Lookup the tablespace ID.
 @param[in]	space_id		Tablespace ID to lookup
 @return true if the space ID is known. */
-bool fil_tablespace_lookup_for_recovery(space_id_t space_id)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool fil_tablespace_lookup_for_recovery(space_id_t space_id);
 
 /** Compare and update space name and dd path for partitioned table. Uniformly
 converts partition separators and names to lower case.
@@ -2219,19 +2169,16 @@
 @param[in]  old_path      the path found in dd:Tablespace_files
 @param[out] new_path      the scanned path for this space_id
 @return status of the match. */
-Fil_state fil_tablespace_path_equals(dd::Object_id dd_object_id,
-                                     space_id_t space_id,
-                                     const char *space_name, ulint fsp_flags,
-                                     std::string old_path,
-                                     std::string *new_path)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] Fil_state fil_tablespace_path_equals(
+    dd::Object_id dd_object_id, space_id_t space_id, const char *space_name,
+    ulint fsp_flags, std::string old_path, std::string *new_path);
 
 /** This function should be called after recovery has completed.
 Check for tablespace files for which we did not see any MLOG_FILE_DELETE
 or MLOG_FILE_RENAME record. These could not be recovered
 @return true if there were some filenames missing for which we had to
 ignore redo log records during the apply phase */
-bool fil_check_missing_tablespaces() MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool fil_check_missing_tablespaces();
 
 /** Normalize and save a directory to scan for datafiles.
 @param[in]  directory    directory to scan for ibd and ibu files
@@ -2251,8 +2198,7 @@
 already be known.
 @param[in]	space_id	Tablespace ID to lookup
 @return true if open was successful */
-bool fil_tablespace_open_for_recovery(space_id_t space_id)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool fil_tablespace_open_for_recovery(space_id_t space_id);
 
 /** Replay a file rename operation for ddl replay.
 @param[in]	page_id		Space ID and first page number in the file
@@ -2267,28 +2213,42 @@
 /** Free the Tablespace_files instance.
 @param[in]	read_only_mode	true if InnoDB is started in read only mode.
 @return DB_SUCCESS if all OK */
-dberr_t fil_open_for_business(bool read_only_mode)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t fil_open_for_business(bool read_only_mode);
 
 /** Check if a path is known to InnoDB meaning that it is in or under
 one of the four path settings scanned at startup for file discovery.
 @param[in]  path    Path to check
 @return true if path is known to InnoDB */
-bool fil_path_is_known(const std::string &path)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool fil_path_is_known(const std::string &path);
 
 /** Get the list of directories that datafiles can reside in.
 @return the list of directories 'dir1;dir2;....;dirN' */
-std::string fil_get_dirs() MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] std::string fil_get_dirs();
 
 /** Rename a tablespace.  Use the space_id to find the shard.
 @param[in]	space_id	tablespace ID
 @param[in]	old_name	old tablespace name
 @param[in]	new_name	new tablespace name
 @return DB_SUCCESS on success */
-dberr_t fil_rename_tablespace_by_id(space_id_t space_id, const char *old_name,
-                                    const char *new_name)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t fil_rename_tablespace_by_id(space_id_t space_id,
+                                                  const char *old_name,
+                                                  const char *new_name);
+
+/** Write initial pages for a new tablespace file created.
+@param[in]	file		open file handle
+@param[in]	path		path and filename of the datafile
+@param[in]	type		file type
+@param[in]	size		Initial size of the tablespace file in pages
+@param[in]	encrypt_info	encryption key information
+@param[in]	space_id	tablespace ID
+@param[in,out]	space_flags	tablespace flags
+@param[out]	atomic_write	if atomic write is used
+@param[out]	punch_hole	if punch hole is used
+@return DB_SUCCESS on success */
+[[nodiscard]] dberr_t fil_write_initial_pages(
+    pfs_os_file_t file, const char *path, fil_type_t type, page_no_t size,
+    const byte *encrypt_info, space_id_t space_id, uint32_t &space_flags,
+    bool &atomic_write, bool &punch_hole);
 
 /** Free the data structures required for recovery. */
 void fil_free_scanned_files();
@@ -2323,13 +2283,11 @@
 /** Get the page type as a string.
 @param[in]  type  page type to be converted to string.
 @return the page type as a string. */
-const char *fil_get_page_type_str(page_type_t type) noexcept
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] const char *fil_get_page_type_str(page_type_t type) noexcept;
 
 /** Check if the given page type is valid.
 @param[in]  type  the page type to be checked for validity.
 @return true if it is valid page type, false otherwise. */
-bool fil_is_page_type_valid(page_type_t type) noexcept
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool fil_is_page_type_valid(page_type_t type) noexcept;
 
 #endif /* fil0fil_h */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/fil0types.h mysql-8.0-8.0.27/storage/innobase/include/fil0types.h
--- mysql-8.0-8.0.26/storage/innobase/include/fil0types.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/fil0types.h	2021-09-28 11:46:34.000000000 +0000
@@ -137,15 +137,15 @@
 
   /** Get the space id from the page header.
   @return the space identifier. */
-  space_id_t get_space_id() const noexcept MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] space_id_t get_space_id() const noexcept;
 
   /** Get the page number from the page header.
   @return the page number. */
-  page_no_t get_page_no() const noexcept MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] page_no_t get_page_no() const noexcept;
 
   /** Get the page type from the page header.
   @return the page type. */
-  uint16_t get_page_type() const noexcept MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] uint16_t get_page_type() const noexcept;
 
   /** Print the page header to the given output stream.
   @param[in]  out  the output stream.
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/fsp0file.h mysql-8.0-8.0.27/storage/innobase/include/fsp0file.h
--- mysql-8.0-8.0.26/storage/innobase/include/fsp0file.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/fsp0file.h	2021-09-28 11:46:34.000000000 +0000
@@ -92,7 +92,7 @@
         m_file_info(),
         m_encryption_key(),
         m_encryption_iv(),
-        m_encryption_op_in_progress(NONE),
+        m_encryption_op_in_progress(Encryption::Progress::NONE),
         m_encryption_master_key_id(0) {
     m_handle.m_file = OS_FILE_CLOSED;
   }
@@ -115,7 +115,7 @@
         m_file_info(),
         m_encryption_key(),
         m_encryption_iv(),
-        m_encryption_op_in_progress(NONE),
+        m_encryption_op_in_progress(Encryption::Progress::NONE),
         m_encryption_master_key_id(0) {
     ut_ad(m_name != nullptr);
     m_handle.m_file = OS_FILE_CLOSED;
@@ -138,7 +138,7 @@
         m_file_info(),
         m_encryption_key(),
         m_encryption_iv(),
-        m_encryption_op_in_progress(NONE),
+        m_encryption_op_in_progress(Encryption::Progress::NONE),
         m_encryption_master_key_id(0) {
     m_name = mem_strdup(file.m_name);
     ut_ad(m_name != nullptr);
@@ -177,7 +177,7 @@
     m_last_os_error = 0;
 
     if (m_filepath != nullptr) {
-      ut_free(m_filepath);
+      ut::free(m_filepath);
       m_filepath = nullptr;
       m_filename = nullptr;
     }
@@ -193,7 +193,7 @@
     m_first_page = nullptr;
     m_encryption_key = nullptr;
     m_encryption_iv = nullptr;
-    m_encryption_op_in_progress = NONE;
+    m_encryption_op_in_progress = Encryption::Progress::NONE;
     m_encryption_master_key_id = 0;
 
     m_atomic_write = file.m_atomic_write;
@@ -213,15 +213,14 @@
   so that it can be validated.
   @param[in]	strict	whether to issue error messages
   @return DB_SUCCESS or error code */
-  dberr_t open_read_only(bool strict) MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t open_read_only(bool strict);
 
   /** Open a data file in read-write mode during start-up so that
   doublewrite pages can be restored and then it can be validated.
   @param[in]	read_only_mode	if true, then readonly mode checks
                                   are enforced.
   @return DB_SUCCESS or error code */
-  dberr_t open_read_write(bool read_only_mode)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t open_read_write(bool read_only_mode);
 
   /** Initialize OS specific file info. */
   void init_file_info();
@@ -265,25 +264,25 @@
   @param[in]	for_import	if it is for importing
   @retval DB_SUCCESS if tablespace is valid, DB_ERROR if not.
   m_is_valid is also set true on success, else false. */
-  dberr_t validate_to_dd(space_id_t space_id, uint32_t flags, bool for_import)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t validate_to_dd(space_id_t space_id, uint32_t flags,
+                                       bool for_import);
 
-  /** Validates this datafile for the purpose of recovery.
-  The file should exist and be successfully opened. We initially
-  open it in read-only mode because we just want to read the SpaceID.
-  However, if the first page is corrupt and needs to be restored
-  from the doublewrite buffer, we will reopen it in write mode and
-  ry to restore that page.
+  /** Validates this datafile for the purpose of recovery.  The file should
+  exist and be successfully opened. We initially open it in read-only mode
+  because we just want to read the SpaceID.  However, if the first page is
+  corrupt and needs to be restored from the doublewrite buffer, we will reopen
+  it in write mode and try to restore that page. The file will be closed when
+  returning from this method.
   @param[in]	space_id	Expected space ID
   @retval DB_SUCCESS on success
   m_is_valid is also set true on success, else false. */
-  dberr_t validate_for_recovery(space_id_t space_id)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t validate_for_recovery(space_id_t space_id);
 
-  /** Checks the consistency of the first page of a datafile when the
-  tablespace is opened.  This occurs before the fil_space_t is created
-  so the Space ID found here must not already be open.
-  m_is_valid is set true on success, else false.
+  /**  Checks the consistency of the first page of a datafile when the
+  tablespace is opened. This occurs before the fil_space_t is created so the
+  Space ID found here must not already be open. m_is_valid is set true on
+  success, else false. The datafile is always closed when returning from this
+  method.
   @param[in]	space_id	Expected space ID
   @param[out]	flush_lsn	contents of FIL_PAGE_FILE_FLUSH_LSN
   @param[in]	for_import	if it is for importing
@@ -292,12 +291,11 @@
           expected value
   @retval DB_SUCCESS on if the datafile is valid
   @retval DB_CORRUPTION if the datafile is not readable
-  @retval DB_INVALID_ENCRYPTION_META if the encrypption meta data
+  @retval DB_INVALID_ENCRYPTION_META if the encryption meta data
           is not readable
   @retval DB_TABLESPACE_EXISTS if there is a duplicate space_id */
-  dberr_t validate_first_page(space_id_t space_id, lsn_t *flush_lsn,
-                              bool for_import)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t validate_first_page(space_id_t space_id,
+                                            lsn_t *flush_lsn, bool for_import);
 
   /** Get LSN of first page */
   lsn_t get_flush_lsn() {
@@ -315,7 +313,10 @@
 
   /** Get Datafile::m_handle.
   @return m_handle */
-  pfs_os_file_t handle() const { return (m_handle); }
+  pfs_os_file_t handle() const {
+    ut_ad(is_open());
+    return (m_handle);
+  }
 
   /** Get Datafile::m_order.
   @return m_order */
@@ -404,16 +405,14 @@
   @param[in]	read_only_mode	if true, then readonly mode checks
                                   are enforced.
   @return DB_SUCCESS or error code */
-  dberr_t open_or_create(bool read_only_mode)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t open_or_create(bool read_only_mode);
 
   /** Reads a few significant fields from the first page of the
   datafile, which must already be open.
   @param[in]	read_only_mode	If true, then readonly mode checks
                                   are enforced.
   @return DB_SUCCESS or DB_IO_ERROR if page cannot be read */
-  dberr_t read_first_page(bool read_only_mode)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t read_first_page(bool read_only_mode);
 
   /** Free the first page from memory when it is no longer needed. */
   void free_first_page();
@@ -509,7 +508,7 @@
   byte *m_encryption_iv;
 
   /** Encryption operation in progress */
-  encryption_op_type m_encryption_op_in_progress;
+  Encryption::Progress m_encryption_op_in_progress;
 
   /** Master key id read from first page */
   uint32_t m_encryption_master_key_id;
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/fsp0fsp.h mysql-8.0-8.0.27/storage/innobase/include/fsp0fsp.h
--- mysql-8.0-8.0.26/storage/innobase/include/fsp0fsp.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/fsp0fsp.h	2021-09-28 11:46:34.000000000 +0000
@@ -182,6 +182,7 @@
   4 /* this many free extents are added \
     to the free list from above         \
     FSP_FREE_LIMIT at a time */
+
 /** @} */
 
 /* Maximum allowed value of AUTOEXTEND_SIZE attribue */
@@ -433,7 +434,7 @@
 @param[in]	page_size	tablespace page size
 @return operation type
 */
-encryption_op_type fsp_header_encryption_op_type_in_progress(
+Encryption::Progress fsp_header_encryption_op_type_in_progress(
     const page_t *page, page_size_t page_size);
 
 /** Check if the tablespace size information is valid.
@@ -577,11 +578,9 @@
 @retval block, rw_lock_x_lock_count(&block->lock) == 1 if allocation succeeded
 (init_mtr == mtr, or the page was not previously freed in mtr),
 returned block is not allocated nor initialized otherwise */
-buf_block_t *fseg_alloc_free_page_general(fseg_header_t *seg_header,
-                                          page_no_t hint, byte direction,
-                                          ibool has_done_reservation,
-                                          mtr_t *mtr, mtr_t *init_mtr)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] buf_block_t *fseg_alloc_free_page_general(
+    fseg_header_t *seg_header, page_no_t hint, byte direction,
+    ibool has_done_reservation, mtr_t *mtr, mtr_t *init_mtr);
 
 /** Reserves free pages from a tablespace. All mini-transactions which may
 use several pages from the tablespace should call this function beforehand
@@ -650,34 +649,32 @@
 
 /** Checks if a single page of a segment is free.
  @return true if free */
-bool fseg_page_is_free(fseg_header_t *seg_header, /*!< in: segment header */
-                       space_id_t space_id,       /*!< in: space id */
-                       page_no_t page)            /*!< in: page offset */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool fseg_page_is_free(
+    fseg_header_t *seg_header, /*!< in: segment header */
+    space_id_t space_id,       /*!< in: space id */
+    page_no_t page);           /*!< in: page offset */
 /** Frees part of a segment. This function can be used to free a segment
  by repeatedly calling this function in different mini-transactions.
  Doing the freeing in a single mini-transaction might result in
  too big a mini-transaction.
  @return true if freeing completed */
-ibool fseg_free_step(
+[[nodiscard]] ibool fseg_free_step(
     fseg_header_t *header, /*!< in, own: segment header; NOTE: if the header
                            resides on the first page of the frag list
                            of the segment, this pointer becomes obsolete
                            after the last freeing step */
     bool ahi,              /*!< in: whether we may need to drop
                            the adaptive hash index */
-    mtr_t *mtr)            /*!< in/out: mini-transaction */
-    MY_ATTRIBUTE((warn_unused_result));
+    mtr_t *mtr);           /*!< in/out: mini-transaction */
 /** Frees part of a segment. Differs from fseg_free_step because this function
  leaves the header page unfreed.
  @return true if freeing completed, except the header page */
-ibool fseg_free_step_not_header(
+[[nodiscard]] ibool fseg_free_step_not_header(
     fseg_header_t *header, /*!< in: segment header which must reside on
                            the first fragment page of the segment */
     bool ahi,              /*!< in: whether we may need to drop
                            the adaptive hash index */
-    mtr_t *mtr)            /*!< in/out: mini-transaction */
-    MY_ATTRIBUTE((warn_unused_result));
+    mtr_t *mtr);           /*!< in/out: mini-transaction */
 
 /** Checks if a page address is an extent descriptor page address.
 @param[in]	page_id		page id
@@ -1012,11 +1009,12 @@
   mtr_t *m_mtr;
 
 #ifdef UNIV_DEBUG
- private:
+ public:
   /** Verify the stored FSEG_NOT_FULL_N_USED value.
   @return true if correct value, false if incorrect. */
   bool verify_not_full_n_used();
 
+ private:
   /** Calculate the value of FSEG_NOT_FULL_N_USED by traversing
   the FSEG_NOT_FULL list.
   @return the calculated value of FSEG_NOT_FULL_N_USED. */
@@ -1043,4 +1041,14 @@
   return (obj.print(out));
 }
 
+/** Returns the file segment inode, page x-latched.
+@param[in]	header		Segment header
+@param[in]	space		Space id
+@param[in]	page_size	Page size
+@param[in,out]	mtr		Mini-transaction
+@param[out]	block		Inode block
+@return segment inode, page x-latched */
+fseg_inode_t *fseg_inode_get(const fseg_header_t *header, space_id_t space,
+                             const page_size_t &page_size, mtr_t *mtr,
+                             buf_block_t **block = nullptr);
 #endif
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/fsp0space.h mysql-8.0-8.0.27/storage/innobase/include/fsp0space.h
--- mysql-8.0-8.0.26/storage/innobase/include/fsp0space.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/fsp0space.h	2021-09-28 11:46:34.000000000 +0000
@@ -45,7 +45,7 @@
 Currently this can be the system tablespace or a temporary table tablespace */
 class Tablespace {
  public:
-  typedef std::vector<Datafile, ut_allocator<Datafile>> files_t;
+  typedef std::vector<Datafile, ut::allocator<Datafile>> files_t;
 
   /** Data file information - each Datafile can be accessed globally */
   files_t m_files;
@@ -66,11 +66,11 @@
     ut_ad(m_files.empty());
     ut_ad(m_space_id == SPACE_UNKNOWN);
     if (m_name != nullptr) {
-      ut_free(m_name);
+      ut::free(m_name);
       m_name = nullptr;
     }
     if (m_path != nullptr) {
-      ut_free(m_path);
+      ut::free(m_path);
       m_path = nullptr;
     }
   }
@@ -156,7 +156,7 @@
   /** Open or Create the data files if they do not exist.
   @param[in]	is_temp	whether this is a temporary tablespace
   @return DB_SUCCESS or error code */
-  dberr_t open_or_create(bool is_temp) MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t open_or_create(bool is_temp);
 
   /** Delete all the data files. */
   void delete_files();
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/fsp0sysspace.h mysql-8.0-8.0.27/storage/innobase/include/fsp0sysspace.h
--- mysql-8.0-8.0.26/storage/innobase/include/fsp0sysspace.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/fsp0sysspace.h	2021-09-28 11:46:34.000000000 +0000
@@ -149,9 +149,9 @@
   @param[out] sum_new_sizes	sum of sizes of the new files added
   @param[out] flush_lsn		FIL_PAGE_FILE_FLUSH_LSN of first file
   @return DB_SUCCESS or error code */
-  dberr_t open_or_create(bool is_temp, bool create_new_db,
-                         page_no_t *sum_new_sizes, lsn_t *flush_lsn)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t open_or_create(bool is_temp, bool create_new_db,
+                                       page_no_t *sum_new_sizes,
+                                       lsn_t *flush_lsn);
 
  private:
   /** Check the tablespace header for this tablespace.
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/fsp0types.h mysql-8.0-8.0.27/storage/innobase/include/fsp0types.h
--- mysql-8.0-8.0.26/storage/innobase/include/fsp0types.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/fsp0types.h	2021-09-28 11:46:34.000000000 +0000
@@ -194,7 +194,7 @@
 the DICT_TF_COMPACT bit set.
 @param[in]	flags	Tablespace flags
 @return true if valid, false if not */
-bool fsp_flags_is_valid(uint32_t flags) MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool fsp_flags_is_valid(uint32_t flags);
 
 /** Check if tablespace is system temporary.
 @param[in]	space_id	tablespace ID
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/fts0ast.h mysql-8.0-8.0.27/storage/innobase/include/fts0ast.h
--- mysql-8.0-8.0.26/storage/innobase/include/fts0ast.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/fts0ast.h	2021-09-28 11:46:34.000000000 +0000
@@ -36,14 +36,6 @@
 #include "ha_prototypes.h"
 #include "mem0mem.h"
 
-#ifdef UNIV_PFS_MEMORY
-
-#define malloc(A) ut_malloc_nokey(A)
-#define free(A) ut_free(A)
-#define realloc(P, A) ut_realloc(P, A)
-
-#endif /* UNIV_PFS_MEMORY */
-
 /* The type of AST Node */
 enum fts_ast_type_t {
   FTS_AST_OPER,               /*!< Operator */
@@ -165,21 +157,22 @@
 
 /** Traverse the AST - in-order traversal.
  @return DB_SUCCESS if all went well */
-dberr_t fts_ast_visit(fts_ast_oper_t oper,      /*!< in: FTS operator */
-                      fts_ast_node_t *node,     /*!< in: instance to traverse*/
-                      fts_ast_callback visitor, /*!< in: callback */
-                      void *arg,                /*!< in: callback arg */
-                      bool *has_ignore)         /*!< out: whether we encounter
-                                                and ignored processing an
-                                                operator, currently we only
-                                                ignore FTS_IGNORE operator */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t fts_ast_visit(
+    fts_ast_oper_t oper,      /*!< in: FTS operator */
+    fts_ast_node_t *node,     /*!< in: instance to traverse*/
+    fts_ast_callback visitor, /*!< in: callback */
+    void *arg,                /*!< in: callback arg */
+    bool *has_ignore);        /*!< out: whether we encounter
+                             and ignored processing an
+                             operator, currently we only
+                             ignore FTS_IGNORE operator */
 /********************************************************************
 Create a lex instance.*/
-fts_lexer_t *fts_lexer_create(ibool boolean_mode, /*!< in: query type */
-                              const byte *query,  /*!< in: query string */
-                              ulint query_len)    /*!< in: query string len */
-    MY_ATTRIBUTE((malloc, warn_unused_result));
+[[nodiscard]] fts_lexer_t *fts_lexer_create(
+    ibool boolean_mode, /*!< in: query type */
+    const byte *query,  /*!< in: query string */
+    ulint query_len)    /*!< in: query string len */
+    MY_ATTRIBUTE((malloc));
 /********************************************************************
 Free an fts_lexer_t instance.*/
 void fts_lexer_free(fts_lexer_t *fts_lexer); /*!< in: lexer instance to
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/fts0fts.h mysql-8.0-8.0.27/storage/innobase/include/fts0fts.h
--- mysql-8.0-8.0.26/storage/innobase/include/fts0fts.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/fts0fts.h	2021-09-28 11:46:34.000000000 +0000
@@ -73,7 +73,7 @@
 #define MAX_DOC_ID_OPT_VAL 1073741824
 
 /** Document id type. */
-typedef ib_uint64_t doc_id_t;
+typedef uint64_t doc_id_t;
 
 /** doc_id_t printf format */
 #define FTS_DOC_ID_FORMAT IB_ID_FMT
@@ -101,11 +101,11 @@
 #define FTS_INDEX_TABLE_IND_NAME "FTS_INDEX_TABLE_IND"
 #define FTS_COMMON_TABLE_IND_NAME "FTS_COMMON_TABLE_IND"
 
-/** The number of FTS index partitions for a fulltext idnex */
-#define FTS_NUM_AUX_INDEX 6
+/** The number of FTS index partitions for a fulltext index. */
+constexpr size_t FTS_NUM_AUX_INDEX = 6;
 
-/** The number of FTS AUX common table for a fulltext idnex */
-#define FTS_NUM_AUX_COMMON 5
+/** The number of FTS AUX common table for a fulltext index. */
+constexpr size_t FTS_NUM_AUX_COMMON = 5;
 
 /** Threshold where our optimize thread automatically kicks in */
 #define FTS_OPTIMIZE_THRESHOLD 10000000
@@ -150,9 +150,6 @@
 extern const char *FTS_PREFIX_5_7;
 extern const char *FTS_SUFFIX_CONFIG_5_7;
 
-/** Variable specifying the FTS parallel sort degree */
-extern ulong fts_sort_pll_degree;
-
 /** Variable specifying the number of word to optimize for each optimize table
 call */
 extern ulong fts_num_word_optimize;
@@ -518,9 +515,10 @@
 @param[in]	name			table name normalized
 @param[in]	skip_doc_id_index	Skip index on doc id
 @return DB_SUCCESS if succeed */
-dberr_t fts_create_common_tables(trx_t *trx, const dict_table_t *table,
-                                 const char *name, bool skip_doc_id_index)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t fts_create_common_tables(trx_t *trx,
+                                               const dict_table_t *table,
+                                               const char *name,
+                                               bool skip_doc_id_index);
 
 /** Creates the column specific ancillary tables needed for supporting an
 FTS index on the given table. row_mysql_lock_data_dictionary must have
@@ -537,8 +535,7 @@
 @param[in,out]	trx	transaction
 @param[in]	index	index instance
 @return DB_SUCCESS or error code */
-dberr_t fts_create_index_tables(trx_t *trx, dict_index_t *index)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t fts_create_index_tables(trx_t *trx, dict_index_t *index);
 
 /** Create auxiliary index tables for an FTS index.
 @param[in,out]	trx		transaction
@@ -546,9 +543,10 @@
 @param[in]	table_name	table name
 @param[in]	table_id	the table id
 @return DB_SUCCESS or error code */
-dberr_t fts_create_index_tables_low(trx_t *trx, dict_index_t *index,
-                                    const char *table_name, table_id_t table_id)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t fts_create_index_tables_low(trx_t *trx,
+                                                  dict_index_t *index,
+                                                  const char *table_name,
+                                                  table_id_t table_id);
 
 /** Add the FTS document id hidden column.
 @param[in,out] table Table with FTS index
@@ -585,8 +583,7 @@
 /** The given transaction is about to be committed; do whatever is necessary
  from the FTS system's POV.
  @return DB_SUCCESS or error code */
-dberr_t fts_commit(trx_t *trx) /*!< in: transaction */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t fts_commit(trx_t *trx); /*!< in: transaction */
 
 /** FTS Query entry point.
 @param[in]	trx		transaction
@@ -597,9 +594,9 @@
 @param[in,out]	result		result doc ids
 @param[in]	limit		limit value
 @return DB_SUCCESS if successful otherwise error code */
-dberr_t fts_query(trx_t *trx, dict_index_t *index, uint flags,
-                  const byte *query_str, ulint query_len, fts_result_t **result,
-                  ulonglong limit) MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t fts_query(trx_t *trx, dict_index_t *index, uint flags,
+                                const byte *query_str, ulint query_len,
+                                fts_result_t **result, ulonglong limit);
 
 /** Retrieve the FTS Relevance Ranking result for doc with doc_id
  @return the relevance ranking value. */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/fts0priv.h mysql-8.0-8.0.27/storage/innobase/include/fts0priv.h
--- mysql-8.0-8.0.26/storage/innobase/include/fts0priv.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/fts0priv.h	2021-09-28 11:46:34.000000000 +0000
@@ -121,16 +121,15 @@
 
 /** Parse an SQL string. %s is replaced with the table's id.
  @return query graph */
-que_t *fts_parse_sql(fts_table_t *fts_table, /*!< in: FTS aux table */
-                     pars_info_t *info,      /*!< in: info struct, or NULL */
-                     const char *sql)        /*!< in: SQL string to evaluate */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] que_t *fts_parse_sql(
+    fts_table_t *fts_table, /*!< in: FTS aux table */
+    pars_info_t *info,      /*!< in: info struct, or NULL */
+    const char *sql);       /*!< in: SQL string to evaluate */
 
 /** Evaluate a parsed SQL statement
  @return DB_SUCCESS or error code */
-dberr_t fts_eval_sql(trx_t *trx,   /*!< in: transaction */
-                     que_t *graph) /*!< in: Parsed statement */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t fts_eval_sql(trx_t *trx,    /*!< in: transaction */
+                                   que_t *graph); /*!< in: Parsed statement */
 
 /** Construct the name of an ancillary FTS table for the given table.
  Caller must allocate enough memory(usually size of MAX_FULL_NAME_LEN)
@@ -160,11 +159,10 @@
   "$sel0, $sel1",
   info/ids: sel0 -> "subject", sel1 -> "content",
  @return heap-allocated WHERE string */
-const char *fts_get_select_columns_str(
+[[nodiscard]] const char *fts_get_select_columns_str(
     dict_index_t *index, /*!< in: FTS index */
     pars_info_t *info,   /*!< in/out: parser info */
-    mem_heap_t *heap)    /*!< in: memory heap */
-    MY_ATTRIBUTE((warn_unused_result));
+    mem_heap_t *heap);   /*!< in: memory heap */
 
 /** define for fts_doc_fetch_by_doc_id() "option" value, defines whether
 we want to get Doc whose ID is equal to or greater or smaller than supplied
@@ -195,12 +193,12 @@
 /********************************************************************
 Write out a single word's data as new entry/entries in the INDEX table.
 @return DB_SUCCESS if all OK. */
-dberr_t fts_write_node(trx_t *trx,             /*!< in: transaction */
-                       que_t **graph,          /*!< in: query graph */
-                       fts_table_t *fts_table, /*!< in: the FTS aux index */
-                       fts_string_t *word,     /*!< in: word in UTF-8 */
-                       fts_node_t *node)       /*!< in: node columns */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t fts_write_node(
+    trx_t *trx,             /*!< in: transaction */
+    que_t **graph,          /*!< in: query graph */
+    fts_table_t *fts_table, /*!< in: the FTS aux index */
+    fts_string_t *word,     /*!< in: word in UTF-8 */
+    fts_node_t *node);      /*!< in: node columns */
 
 /** Check fts token
 1. for ngram token, check whether the token contains any words in stopwords
@@ -221,11 +219,10 @@
 /** Do a binary search for a doc id in the array
  @return +ve index if found -ve index where it should be
          inserted if not found */
-int fts_bsearch(fts_update_t *array, /*!< in: array to sort */
-                int lower,           /*!< in: lower bound of array*/
-                int upper,           /*!< in: upper bound of array*/
-                doc_id_t doc_id)     /*!< in: doc id to lookup */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] int fts_bsearch(fts_update_t *array, /*!< in: array to sort */
+                              int lower,        /*!< in: lower bound of array*/
+                              int upper,        /*!< in: upper bound of array*/
+                              doc_id_t doc_id); /*!< in: doc id to lookup */
 /** Free document. */
 void fts_doc_free(fts_doc_t *doc); /*!< in: document */
 
@@ -276,13 +273,13 @@
  must ensure that enough space is allocated for value to hold the
  column contents.
  @return DB_SUCCESS or error code */
-dberr_t fts_config_get_index_value(trx_t *trx,          /*!< transaction */
-                                   dict_index_t *index, /*!< in: index */
-                                   const char *param, /*!< in: get config value
-                                                      for this parameter name */
-                                   fts_string_t *value) /*!< out: value read
-                                                        from config table */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t fts_config_get_index_value(
+    trx_t *trx,           /*!< transaction */
+    dict_index_t *index,  /*!< in: index */
+    const char *param,    /*!< in: get config value
+                          for this parameter name */
+    fts_string_t *value); /*!< out: value read
+                         from config table */
 
 /** Set the value in the config table for name.
  @return DB_SUCCESS or error code */
@@ -295,40 +292,39 @@
 
 /** Set an ulint value in the config table.
  @return DB_SUCCESS if all OK else error code */
-dberr_t fts_config_set_ulint(
+[[nodiscard]] dberr_t fts_config_set_ulint(
     trx_t *trx,             /*!< in: transaction */
     fts_table_t *fts_table, /*!< in: the indexed FTS table */
     const char *name,       /*!< in: param name */
-    ulint int_value)        /*!< in: value */
-    MY_ATTRIBUTE((warn_unused_result));
+    ulint int_value);       /*!< in: value */
 
 /** Set the value specific to an FTS index in the config table.
  @return DB_SUCCESS or error code */
-dberr_t fts_config_set_index_value(trx_t *trx,          /*!< transaction */
-                                   dict_index_t *index, /*!< in: index */
-                                   const char *param, /*!< in: get config value
-                                                      for this parameter name */
-                                   fts_string_t *value) /*!< out: value read
-                                                        from config table */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t fts_config_set_index_value(
+    trx_t *trx,           /*!< transaction */
+    dict_index_t *index,  /*!< in: index */
+    const char *param,    /*!< in: get config value
+                          for this parameter name */
+    fts_string_t *value); /*!< out: value read
+                         from config table */
 
 #ifdef FTS_OPTIMIZE_DEBUG
 /** Get an ulint value from the config table.
  @return DB_SUCCESS or error code */
-dberr_t fts_config_get_index_ulint(trx_t *trx,          /*!< in: transaction */
-                                   dict_index_t *index, /*!< in: FTS index */
-                                   const char *name,    /*!< in: param name */
-                                   ulint *int_value)    /*!< out: value */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t fts_config_get_index_ulint(
+    trx_t *trx,          /*!< in: transaction */
+    dict_index_t *index, /*!< in: FTS index */
+    const char *name,    /*!< in: param name */
+    ulint *int_value);   /*!< out: value */
 
 /** Set an ulint value int the config table.
  @return DB_SUCCESS or error code */
-dberr_t fts_config_set_index_ulint(trx_t *trx,          /*!< in: transaction */
-                                   dict_index_t *index, /*!< in: FTS index */
-                                   const char *name,    /*!< in: param name */
-                                   ulint int_value)     /*!< in: value */
-    MY_ATTRIBUTE((warn_unused_result));
-#endif /* FTS_OPTIMIZE_DEBUG */
+[[nodiscard]] dberr_t fts_config_set_index_ulint(
+    trx_t *trx,          /*!< in: transaction */
+    dict_index_t *index, /*!< in: FTS index */
+    const char *name,    /*!< in: param name */
+    ulint int_value);    /*!< in: value */
+#endif                   /* FTS_OPTIMIZE_DEBUG */
 
 /** Get an ulint value from the config table.
  @return DB_SUCCESS or error code */
@@ -340,10 +336,9 @@
 
 /** Search cache for word.
  @return the word node vector if found else NULL */
-const ib_vector_t *fts_cache_find_word(
+[[nodiscard]] const ib_vector_t *fts_cache_find_word(
     const fts_index_cache_t *index_cache, /*!< in: cache to search */
-    const fts_string_t *text)             /*!< in: word to search for */
-    MY_ATTRIBUTE((warn_unused_result));
+    const fts_string_t *text);            /*!< in: word to search for */
 
 /** Append deleted doc ids to vector and sort the vector. */
 void fts_cache_append_deleted_doc_ids(
@@ -361,10 +356,9 @@
                          checking */
 /** Search the index specific cache for a particular FTS index.
  @return the index specific cache else NULL */
-fts_index_cache_t *fts_find_index_cache(
-    const fts_cache_t *cache,  /*!< in: cache to search */
-    const dict_index_t *index) /*!< in: index to search for */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] fts_index_cache_t *fts_find_index_cache(
+    const fts_cache_t *cache,   /*!< in: cache to search */
+    const dict_index_t *index); /*!< in: index to search for */
 
 /** Write the table id to the given buffer (including final NUL). Buffer must
 be at least FTS_AUX_MIN_TABLE_ID_LENGTH bytes long.
@@ -375,28 +369,25 @@
 
 /** Read the table id from the string generated by fts_write_object_id().
  @return true if parse successful */
-static inline ibool fts_read_object_id(
-    ib_id_t *id,     /*!< out: a table id */
-    const char *str) /*!< in: buffer to read from */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ibool fts_read_object_id(
+    ib_id_t *id,      /*!< out: a table id */
+    const char *str); /*!< in: buffer to read from */
 
 /** Get the table id.
  @return number of bytes written */
-int fts_get_table_id(
+[[nodiscard]] int fts_get_table_id(
     const fts_table_t *fts_table, /*!< in: FTS Auxiliary table */
-    char *table_id)               /*!< out: table id, must be at least
-                                  FTS_AUX_MIN_TABLE_ID_LENGTH bytes
-                                  long */
-    MY_ATTRIBUTE((warn_unused_result));
+    char *table_id);              /*!< out: table id, must be at least
+                                 FTS_AUX_MIN_TABLE_ID_LENGTH bytes
+                                 long */
 
 /** Add the table to add to the OPTIMIZER's list. */
 void fts_optimize_add_table(dict_table_t *table); /*!< in: table to add */
 
 /** Construct the prefix name of an FTS table.
- @return own: table name, must be freed with ut_free() */
-char *fts_get_table_name_prefix(
-    const fts_table_t *fts_table) /*!< in: Auxiliary table type */
-    MY_ATTRIBUTE((warn_unused_result));
+ @return own: table name, must be freed with ut::free() */
+[[nodiscard]] char *fts_get_table_name_prefix(
+    const fts_table_t *fts_table); /*!< in: Auxiliary table type */
 
 /** Add node positions. */
 void fts_cache_node_add_positions(
@@ -407,10 +398,9 @@
 
 /** Create the config table name for retrieving index specific value.
  @return index config parameter name */
-char *fts_config_create_index_param_name(
-    const char *param,         /*!< in: base name of param */
-    const dict_index_t *index) /*!< in: index for config */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] char *fts_config_create_index_param_name(
+    const char *param,          /*!< in: base name of param */
+    const dict_index_t *index); /*!< in: index for config */
 
 #include "fts0priv.ic"
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/fts0types.h mysql-8.0-8.0.27/storage/innobase/include/fts0types.h
--- mysql-8.0-8.0.26/storage/innobase/include/fts0types.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/fts0types.h	2021-09-28 11:46:34.000000000 +0000
@@ -169,15 +169,17 @@
                          the document from the table. Each
                          element is of type fts_doc_t */
 
-  ulint total_size;      /*!< total size consumed by the ilist
-                         field of all nodes. SYNC is run
-                         whenever this gets too big */
-  fts_sync_t *sync;      /*!< sync structure to sync data to
-                         disk */
-  ib_alloc_t *sync_heap; /*!< The heap allocator, for indexes
-                         and deleted_doc_ids, ie. transient
-                         objects, they are recreated after
-                         a SYNC is completed */
+  ulint total_size;                /*!< total size consumed by the ilist
+                                   field of all nodes. SYNC is run
+                                   whenever this gets too big */
+  uint64_t total_size_before_sync; /*!< total size of fts cache,
+                                   when last SYNC request was sent */
+  fts_sync_t *sync;                /*!< sync structure to sync data to
+                                   disk */
+  ib_alloc_t *sync_heap;           /*!< The heap allocator, for indexes
+                                   and deleted_doc_ids, ie. transient
+                                   objects, they are recreated after
+                                   a SYNC is completed */
 
   ib_alloc_t *self_heap; /*!< This heap is the heap out of
                          which an instance of the cache itself
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/fut0fut.h mysql-8.0-8.0.27/storage/innobase/include/fut0fut.h
--- mysql-8.0-8.0.26/storage/innobase/include/fut0fut.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/fut0fut.h	2021-09-28 11:46:34.000000000 +0000
@@ -48,10 +48,9 @@
 @param[in,out]	mtr		Mini-transaction
 @return pointer to a byte in (*ptr_block)->frame; the *ptr_block is
 bufferfixed and latched */
-static inline byte *fut_get_ptr(space_id_t space, const page_size_t &page_size,
-                                fil_addr_t addr, rw_lock_type_t rw_latch,
-                                mtr_t *mtr, buf_block_t **ptr_block = nullptr)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline byte *fut_get_ptr(
+    space_id_t space, const page_size_t &page_size, fil_addr_t addr,
+    rw_lock_type_t rw_latch, mtr_t *mtr, buf_block_t **ptr_block = nullptr);
 
 #include "fut0fut.ic"
 #endif /* !UNIV_HOTBACKUP */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/gis0type.h mysql-8.0-8.0.27/storage/innobase/include/gis0type.h
--- mysql-8.0-8.0.26/storage/innobase/include/gis0type.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/gis0type.h	2021-09-28 11:46:34.000000000 +0000
@@ -71,14 +71,14 @@
                       enlarged for insertion */
 } node_visit_t;
 
-typedef std::vector<node_visit_t, ut_allocator<node_visit_t>> rtr_node_path_t;
+typedef std::vector<node_visit_t, ut::allocator<node_visit_t>> rtr_node_path_t;
 
 typedef struct rtr_rec {
   rec_t *r_rec; /*!< matched record */
   bool locked;  /*!< whether the record locked */
 } rtr_rec_t;
 
-typedef std::vector<rtr_rec_t, ut_allocator<rtr_rec_t>> rtr_rec_vector;
+typedef std::vector<rtr_rec_t, ut::allocator<rtr_rec_t>> rtr_rec_vector;
 
 /* Structure for matched records on the leaf page */
 typedef struct matched_rec {
@@ -145,7 +145,7 @@
   /*!< whether the current rec is a duplicate record. */
 } rtr_info_t;
 
-typedef std::list<rtr_info_t *, ut_allocator<rtr_info_t *>> rtr_info_active;
+typedef std::list<rtr_info_t *, ut::allocator<rtr_info_t *>> rtr_info_active;
 
 /* Tracking structure for all onoging search for an index */
 typedef struct rtr_info_track {
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/handler0alter.h mysql-8.0-8.0.27/storage/innobase/include/handler0alter.h
--- mysql-8.0-8.0.26/storage/innobase/include/handler0alter.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/handler0alter.h	2021-09-28 11:46:34.000000000 +0000
@@ -58,59 +58,4 @@
 /** Resets table->record[0]. */
 void innobase_rec_reset(struct TABLE *table); /*!< in/out: MySQL table */
 
-/** Generate the next autoinc based on a snapshot of the session
-auto_increment_increment and auto_increment_offset variables.
-Assingnment operator would be used during the inplace_alter_table()
-phase only **/
-struct ib_sequence_t {
-  /**
-  @param thd the session
-  @param start_value the lower bound
-  @param max_value the upper bound (inclusive) */
-  ib_sequence_t(THD *thd, ulonglong start_value, ulonglong max_value);
-
-  /** Postfix increment
-  @return the value to insert */
-  ulonglong operator++(int) UNIV_NOTHROW;
-
-  /** Check if the autoinc "sequence" is exhausted.
-  @return true if the sequence is exhausted */
-  bool eof() const UNIV_NOTHROW { return (m_eof); }
-
-  /** assignment operator to copy the sequence values
-  @param in 		sequence to copy from */
-  ib_sequence_t &operator=(const ib_sequence_t &in) {
-    ut_ad(in.m_next_value > 0);
-    ut_ad(in.m_max_value == m_max_value);
-    m_next_value = in.m_next_value;
-    m_increment = in.m_increment;
-    m_offset = in.m_offset;
-    m_eof = in.m_eof;
-    return (*this);
-  }
-  /**
-  @return the next value in the sequence */
-  ulonglong last() const UNIV_NOTHROW {
-    ut_ad(m_next_value > 0);
-
-    return (m_next_value);
-  }
-
-  /** Maximum calumn value if adding an AUTOINC column else 0. Once
-  we reach the end of the sequence it will be set to ~0. */
-  const ulonglong m_max_value;
-
-  /** Value of auto_increment_increment */
-  ulong m_increment;
-
-  /** Value of auto_increment_offset */
-  ulong m_offset;
-
-  /** Next value in the sequence */
-  ulonglong m_next_value;
-
-  /** true if no more values left in the sequence */
-  bool m_eof;
-};
-
 #endif /* handler0alter_h */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/ha_prototypes.h mysql-8.0-8.0.27/storage/innobase/include/ha_prototypes.h
--- mysql-8.0-8.0.26/storage/innobase/include/ha_prototypes.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/ha_prototypes.h	2021-09-28 11:46:34.000000000 +0000
@@ -194,9 +194,8 @@
                             ulint value); /*!< in: time waited for the lock */
 
 /** Get the value of innodb_tmpdir.
-@param[in]	thd	thread handle, or NULL to query
-                        the global innodb_tmpdir.
-@retval NULL if innodb_tmpdir="" */
+@param[in] thd	thread handle, or nullptr to query the global innodb_tmpdir.
+@return nullptr if innodb_tmpdir="" */
 const char *thd_innodb_tmpdir(THD *thd);
 
 #ifdef UNIV_DEBUG
@@ -341,13 +340,12 @@
  autoinc_lock_mode != TRADITIONAL because we want to reserve 3 values for
  the multi-value INSERT above.
  @return the next value */
-ulonglong innobase_next_autoinc(
-    ulonglong current,   /*!< in: Current value */
-    ulonglong need,      /*!< in: count of values needed */
-    ulonglong step,      /*!< in: AUTOINC increment step */
-    ulonglong offset,    /*!< in: AUTOINC offset */
-    ulonglong max_value) /*!< in: max value for type */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] ulonglong innobase_next_autoinc(
+    ulonglong current,    /*!< in: Current value */
+    ulonglong need,       /*!< in: count of values needed */
+    ulonglong step,       /*!< in: AUTOINC increment step */
+    ulonglong offset,     /*!< in: AUTOINC offset */
+    ulonglong max_value); /*!< in: max value for type */
 
 /**********************************************************************
 Check if the length of the identifier exceeds the maximum allowed.
@@ -381,9 +379,8 @@
 
 #include <my_icp.h>
 
-ICP_RESULT
-innobase_index_cond(ha_innobase *h) /*!< in/out: pointer to ha_innobase */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] ICP_RESULT innobase_index_cond(
+    ha_innobase *h); /*!< in/out: pointer to ha_innobase */
 
 /** Gets information on the durability property requested by thread.
  Used when writing either a prepare or commit record to the log
@@ -392,9 +389,8 @@
 
 #include <dur_prop.h>
 
-enum durability_properties thd_requested_durability(
-    const THD *thd) /*!< in: thread handle */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] enum durability_properties thd_requested_durability(
+    const THD *thd); /*!< in: thread handle */
 
 /** Update the system variable with the given value of the InnoDB
 buffer pool size.
@@ -412,4 +408,21 @@
 @param[in]	trx	Transaction handle. */
 void innobase_commit_low(trx_t *trx);
 
+/** Return the number of read threads for this session.
+@param[in]      thd       Session instance, or nullptr to query the global
+                          innodb_parallel_read_threads value. */
+ulong thd_parallel_read_threads(THD *thd);
+
+/** Return the maximum buffer size to use for DDL.
+@param[in]      thd       Session instance, or nullptr to query the global
+                          innodb_parallel_read_threads value.
+@return memory upper limit in bytes. */
+[[nodiscard]] ulong thd_ddl_buffer_size(THD *thd);
+
+/** Whether this is a computed virtual column */
+#define innobase_is_v_fld(field) ((field)->gcol_info && !(field)->stored_in_db)
+
+/** @return the number of DDL threads to use (global/session). */
+[[nodiscard]] size_t thd_ddl_threads(THD *thd) noexcept;
+
 #endif /* HA_INNODB_PROTOTYPES_H */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/ibuf0ibuf.h mysql-8.0-8.0.27/storage/innobase/include/ibuf0ibuf.h
--- mysql-8.0-8.0.26/storage/innobase/include/ibuf0ibuf.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/ibuf0ibuf.h	2021-09-28 11:46:34.000000000 +0000
@@ -197,8 +197,8 @@
  For instance, a read-ahead of non-ibuf pages is forbidden by threads
  that are executing an insert buffer routine.
  @return true if inside an insert buffer routine */
-static inline ibool ibuf_inside(const mtr_t *mtr) /*!< in: mini-transaction */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ibool ibuf_inside(
+    const mtr_t *mtr); /*!< in: mini-transaction */
 
 /** Checks if a page address is an ibuf bitmap page (level 3 page) address.
 @param[in]	page_id		page id
@@ -223,12 +223,12 @@
 bitmap page if the page is not one of the fixed address ibuf pages, or NULL,
 in which case a new transaction is created.
 @return true if level 2 or level 3 page */
-ibool ibuf_page_low(const page_id_t &page_id, const page_size_t &page_size,
+[[nodiscard]] ibool ibuf_page_low(const page_id_t &page_id,
+                                  const page_size_t &page_size,
 #ifdef UNIV_DEBUG
-                    ibool x_latch,
+                                  ibool x_latch,
 #endif /* UNIV_DEBUG */
-                    const char *file, ulint line, mtr_t *mtr)
-    MY_ATTRIBUTE((warn_unused_result));
+                                  const char *file, ulint line, mtr_t *mtr);
 
 #ifdef UNIV_DEBUG
 
@@ -349,10 +349,9 @@
 
 /** Checks the insert buffer bitmaps on IMPORT TABLESPACE.
  @return DB_SUCCESS or error code */
-dberr_t ibuf_check_bitmap_on_import(
-    const trx_t *trx,    /*!< in: transaction */
-    space_id_t space_id) /*!< in: tablespace identifier */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t ibuf_check_bitmap_on_import(
+    const trx_t *trx,     /*!< in: transaction */
+    space_id_t space_id); /*!< in: tablespace identifier */
 
 /** Updates free bits and buffered bits for bulk loaded page.
 @param[in]      block   index page
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/ibuf0ibuf.ic mysql-8.0-8.0.27/storage/innobase/include/ibuf0ibuf.ic
--- mysql-8.0-8.0.26/storage/innobase/include/ibuf0ibuf.ic	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/ibuf0ibuf.ic	2021-09-28 11:46:34.000000000 +0000
@@ -193,7 +193,6 @@
     const buf_block_t *block) /*!< in: buffer block */
 {
   ulint max_ins_size;
-  const page_zip_des_t *page_zip;
   lint zip_max_ins;
 
   ut_ad(block->page.size.is_compressed());
@@ -208,7 +207,7 @@
   by using the page modification log. */
   max_ins_size = page_get_max_insert_size(buf_block_get_frame(block), 1);
 
-  page_zip = buf_block_get_page_zip(block);
+  const auto page_zip = block->get_page_zip();
   zip_max_ins = page_zip_max_ins_size(page_zip, FALSE /* not clustered */);
 
   if (zip_max_ins < 0) {
@@ -267,7 +266,7 @@
   ulint before;
   ulint after;
 
-  ut_ad(buf_block_get_page_zip(block) == NULL);
+  ut_ad(block->get_page_zip() == nullptr);
 
   before =
       ibuf_index_page_calc_free_bits(block->page.size.physical(), max_ins_size);
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/lob0lob.h mysql-8.0-8.0.27/storage/innobase/include/lob0lob.h
--- mysql-8.0-8.0.26/storage/innobase/include/lob0lob.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/lob0lob.h	2021-09-28 11:46:34.000000000 +0000
@@ -272,12 +272,6 @@
   @param[in]	ptr	the new external field reference. */
   void set_ref(byte *ptr) { m_ref = ptr; }
 
-  /** Set the external field reference to null.
-  @param[in,out]	mtr	Mini-transaction. */
-  void set_null(mtr_t *mtr) {
-    mlog_write_string(m_ref, field_ref_zero, FIELD_REF_SIZE, mtr);
-  }
-
   /** Check if the field reference is made of zeroes except the being_modified
   bit.
   @return true if field reference is made of zeroes, false otherwise. */
@@ -589,11 +583,9 @@
                                 index. can be committed and restarted.
 @param[in]	op		operation code
 @return DB_SUCCESS or DB_OUT_OF_FILE_SPACE */
-dberr_t btr_store_big_rec_extern_fields(trx_t *trx, btr_pcur_t *pcur,
-                                        const upd_t *upd, ulint *offsets,
-                                        const big_rec_t *big_rec_vec,
-                                        mtr_t *btr_mtr, opcode op)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t btr_store_big_rec_extern_fields(
+    trx_t *trx, btr_pcur_t *pcur, const upd_t *upd, ulint *offsets,
+    const big_rec_t *big_rec_vec, mtr_t *btr_mtr, opcode op);
 
 /** Copies an externally stored field of a record to mem heap.
 @param[in]	trx		the current transaction.
@@ -1021,7 +1013,7 @@
 
   /** Get flush observer
   @return flush observer */
-  FlushObserver *get_flush_observer() const {
+  Flush_observer *get_flush_observer() const {
     return (m_mtr->get_flush_observer());
   }
 
@@ -1554,21 +1546,14 @@
                                 part; must be protected by a lock or a page
                                 latch.
 @param[in]	page_size	BLOB page size
-@param[in]	local_len	length of data */
-#ifdef UNIV_DEBUG
-/**
-@param[in]	is_sdi		true for SDI Indexes */
-#endif /* UNIV_DEBUG */
-/**
+@param[in]	local_len	length of data
+@param[in]	is_sdi		true for SDI Indexes
 @param[in,out]	heap		mem heap
 @return the whole field copied to heap */
 byte *btr_copy_externally_stored_field_func(
     trx_t *trx, const dict_index_t *index, ulint *len, size_t *lob_version,
     const byte *data, const page_size_t &page_size, ulint local_len,
-#ifdef UNIV_DEBUG
-    bool is_sdi,
-#endif /* UNIV_DEBUG */
-    mem_heap_t *heap);
+    IF_DEBUG(bool is_sdi, ) mem_heap_t *heap);
 
 /** Gets the externally stored size of a record, in units of a database page.
 @param[in]	rec	record
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/lob0undo.h mysql-8.0-8.0.27/storage/innobase/include/lob0undo.h
--- mysql-8.0-8.0.26/storage/innobase/include/lob0undo.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/lob0undo.h	2021-09-28 11:46:34.000000000 +0000
@@ -111,7 +111,8 @@
   @param[in]	u1	the undo log record information. */
   void push_back(undo_data_t &u1) {
     if (m_undo_list == nullptr) {
-      m_undo_list = UT_NEW_NOKEY(std::list<undo_data_t>());
+      m_undo_list =
+          ut::new_withkey<std::list<undo_data_t>>(UT_NEW_THIS_FILE_PSI_KEY);
     }
     m_undo_list->push_back(u1);
   }
@@ -122,7 +123,7 @@
       std::for_each(m_undo_list->begin(), m_undo_list->end(),
                     [](undo_data_t &obj) { obj.destroy(); });
       m_undo_list->clear();
-      UT_DELETE(m_undo_list);
+      ut::delete_(m_undo_list);
       m_undo_list = nullptr;
     }
   }
@@ -167,7 +168,8 @@
   @return the undo sequence object. */
   undo_seq_t *get_undo_sequence(ulint field_no) {
     if (m_versions == nullptr) {
-      m_versions = UT_NEW_NOKEY(std::list<undo_seq_t *>());
+      m_versions =
+          ut::new_withkey<std::list<undo_seq_t *>>(UT_NEW_THIS_FILE_PSI_KEY);
     } else {
       for (auto iter = m_versions->begin(); iter != m_versions->end(); ++iter) {
         if ((*iter)->get_field_no() == field_no) {
@@ -176,7 +178,8 @@
       }
     }
 
-    undo_seq_t *seq = UT_NEW_NOKEY(undo_seq_t(field_no));
+    undo_seq_t *seq =
+        ut::new_withkey<undo_seq_t>(UT_NEW_THIS_FILE_PSI_KEY, field_no);
     m_versions->push_back(seq);
 
     return (seq);
@@ -187,7 +190,7 @@
     if (m_versions != nullptr) {
       for (auto iter = m_versions->begin(); iter != m_versions->end(); ++iter) {
         (*iter)->destroy();
-        UT_DELETE(*iter);
+        ut::delete_(*iter);
       }
       m_versions->clear();
     }
@@ -213,7 +216,7 @@
   void destroy() {
     if (m_versions != nullptr) {
       reset();
-      UT_DELETE(m_versions);
+      ut::delete_(m_versions);
       m_versions = nullptr;
     }
   }
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/lock0lock.h mysql-8.0-8.0.27/storage/innobase/include/lock0lock.h
--- mysql-8.0-8.0.26/storage/innobase/include/lock0lock.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/lock0lock.h	2021-09-28 11:46:34.000000000 +0000
@@ -394,15 +394,14 @@
 /** Determines if there are explicit record locks on a page.
 @param[in]    page_id     space id and page number
 @return true iff an explicit record lock on the page exists */
-bool lock_rec_expl_exist_on_page(const page_id_t &page_id)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool lock_rec_expl_exist_on_page(const page_id_t &page_id);
 /** Checks if locks of other transactions prevent an immediate insert of
  a record. If they do, first tests if the query thread should anyway
  be suspended for some reason; if not, then puts the transaction and
  the query thread to the lock wait state and inserts a waiting request
  for a gap x-lock to the lock queue.
  @return DB_SUCCESS, DB_LOCK_WAIT, or DB_DEADLOCK */
-dberr_t lock_rec_insert_check_and_lock(
+[[nodiscard]] dberr_t lock_rec_insert_check_and_lock(
     ulint flags,         /*!< in: if BTR_NO_LOCKING_FLAG bit is
                          set, does nothing */
     const rec_t *rec,    /*!< in: record after which to insert */
@@ -410,11 +409,10 @@
     dict_index_t *index, /*!< in: index */
     que_thr_t *thr,      /*!< in: query thread */
     mtr_t *mtr,          /*!< in/out: mini-transaction */
-    ibool *inherit)      /*!< out: set to TRUE if the new
-                         inserted record maybe should inherit
-                         LOCK_GAP type locks from the successor
-                         record */
-    MY_ATTRIBUTE((warn_unused_result));
+    ibool *inherit);     /*!< out: set to TRUE if the new
+                        inserted record maybe should inherit
+                        LOCK_GAP type locks from the successor
+                        record */
 
 /** Checks if locks of other transactions prevent an immediate modify (update,
  delete mark, or delete unmark) of a clustered index record. If they do,
@@ -423,7 +421,7 @@
  lock wait state and inserts a waiting request for a record x-lock to the
  lock queue.
  @return DB_SUCCESS, DB_LOCK_WAIT, or DB_DEADLOCK */
-dberr_t lock_clust_rec_modify_check_and_lock(
+[[nodiscard]] dberr_t lock_clust_rec_modify_check_and_lock(
     ulint flags,              /*!< in: if BTR_NO_LOCKING_FLAG
                               bit is set, does nothing */
     const buf_block_t *block, /*!< in: buffer block of rec */
@@ -431,12 +429,11 @@
                               modified */
     dict_index_t *index,      /*!< in: clustered index */
     const ulint *offsets,     /*!< in: rec_get_offsets(rec, index) */
-    que_thr_t *thr)           /*!< in: query thread */
-    MY_ATTRIBUTE((warn_unused_result));
+    que_thr_t *thr);          /*!< in: query thread */
 /** Checks if locks of other transactions prevent an immediate modify
  (delete mark or delete unmark) of a secondary index record.
  @return DB_SUCCESS, DB_LOCK_WAIT, or DB_DEADLOCK */
-dberr_t lock_sec_rec_modify_check_and_lock(
+[[nodiscard]] dberr_t lock_sec_rec_modify_check_and_lock(
     ulint flags,         /*!< in: if BTR_NO_LOCKING_FLAG
                          bit is set, does nothing */
     buf_block_t *block,  /*!< in/out: buffer block of rec */
@@ -448,8 +445,7 @@
     dict_index_t *index, /*!< in: secondary index */
     que_thr_t *thr,      /*!< in: query thread
                          (can be NULL if BTR_NO_LOCKING_FLAG) */
-    mtr_t *mtr)          /*!< in/out: mini-transaction */
-    MY_ATTRIBUTE((warn_unused_result));
+    mtr_t *mtr);         /*!< in/out: mini-transaction */
 
 /** Called to inform lock-sys that a statement processing for a trx has just
 finished.
@@ -534,7 +530,7 @@
  lock_clust_rec_read_check_and_lock() that does not require the parameter
  "offsets".
  @return DB_SUCCESS, DB_LOCK_WAIT, or DB_DEADLOCK */
-dberr_t lock_clust_rec_read_check_and_lock_alt(
+[[nodiscard]] dberr_t lock_clust_rec_read_check_and_lock_alt(
     const buf_block_t *block, /*!< in: buffer block of rec */
     const rec_t *rec,         /*!< in: user record or page
                               supremum record which should
@@ -548,8 +544,7 @@
                               SELECT FOR UPDATE */
     ulint gap_mode,           /*!< in: LOCK_ORDINARY, LOCK_GAP, or
                              LOCK_REC_NOT_GAP */
-    que_thr_t *thr)           /*!< in: query thread */
-    MY_ATTRIBUTE((warn_unused_result));
+    que_thr_t *thr);          /*!< in: query thread */
 /** Checks that a record is seen in a consistent read.
  @return true if sees, or false if an earlier version of the record
  should be retrieved */
@@ -568,23 +563,22 @@
 
  @return true if certainly sees, or false if an earlier version of the
  clustered index record might be needed */
-bool lock_sec_rec_cons_read_sees(
+[[nodiscard]] bool lock_sec_rec_cons_read_sees(
     const rec_t *rec,          /*!< in: user record which
                                should be read or passed over
                                by a read cursor */
     const dict_index_t *index, /*!< in: index */
-    const ReadView *view)      /*!< in: consistent read view */
-    MY_ATTRIBUTE((warn_unused_result));
+    const ReadView *view);     /*!< in: consistent read view */
 /** Locks the specified database table in the mode given. If the lock cannot
  be granted immediately, the query thread is put to wait.
  @return DB_SUCCESS, DB_LOCK_WAIT, or DB_DEADLOCK */
-dberr_t lock_table(ulint flags, /*!< in: if BTR_NO_LOCKING_FLAG bit is set,
-                                does nothing */
-                   dict_table_t *table, /*!< in/out: database table
-                                        in dictionary cache */
-                   lock_mode mode,      /*!< in: lock mode */
-                   que_thr_t *thr)      /*!< in: query thread */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t lock_table(
+    ulint flags,         /*!< in: if BTR_NO_LOCKING_FLAG bit is set,
+            does nothing */
+    dict_table_t *table, /*!< in/out: database table
+                         in dictionary cache */
+    lock_mode mode,      /*!< in: lock mode */
+    que_thr_t *thr);     /*!< in: query thread */
 
 /** Creates a table IX lock object for a resurrected transaction.
 @param[in,out] table Table
@@ -596,8 +590,9 @@
 @param[in,out]	trx	transaction
 @param[in]	mode	LOCK_X or LOCK_S
 @return error code or DB_SUCCESS. */
-dberr_t lock_table_for_trx(dict_table_t *table, trx_t *trx, enum lock_mode mode)
-    MY_ATTRIBUTE((nonnull, warn_unused_result));
+[[nodiscard]] dberr_t lock_table_for_trx(dict_table_t *table, trx_t *trx,
+                                         enum lock_mode mode)
+    MY_ATTRIBUTE((nonnull));
 
 /** Removes a granted record lock of a transaction from the queue and grants
  locks to other transactions waiting in the queue if they now are entitled
@@ -711,14 +706,12 @@
  The caller must be holding exclusive global lock_sys latch.
  @param[in] trx_lock  transaction locks
  */
-ulint lock_number_of_rows_locked(const trx_lock_t *trx_lock)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] ulint lock_number_of_rows_locked(const trx_lock_t *trx_lock);
 
 /** Return the number of table locks for a transaction.
  The caller must be holding trx->mutex.
 @param[in]  trx   the transaction for which we want the number of table locks */
-ulint lock_number_of_tables_locked(const trx_t *trx)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] ulint lock_number_of_tables_locked(const trx_t *trx);
 
 /** Gets the type of a lock. Non-inline version for using outside of the
  lock module.
@@ -831,12 +824,11 @@
 #ifdef UNIV_DEBUG
 /** Checks that a transaction id is sensible, i.e., not in the future.
  @return true if ok */
-bool lock_check_trx_id_sanity(
+[[nodiscard]] bool lock_check_trx_id_sanity(
     trx_id_t trx_id,           /*!< in: trx id */
     const rec_t *rec,          /*!< in: user record */
     const dict_index_t *index, /*!< in: index */
-    const ulint *offsets)      /*!< in: rec_get_offsets(rec, index) */
-    MY_ATTRIBUTE((warn_unused_result));
+    const ulint *offsets);     /*!< in: rec_get_offsets(rec, index) */
 
 /** Check if the transaction holds an exclusive lock on a record.
 @param[in]  thr     query thread of the transaction
@@ -844,9 +836,10 @@
 @param[in]  block   buffer block of the record
 @param[in]  heap_no record heap number
 @return whether the locks are held */
-bool lock_trx_has_rec_x_lock(que_thr_t *thr, const dict_table_t *table,
-                             const buf_block_t *block, ulint heap_no)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool lock_trx_has_rec_x_lock(que_thr_t *thr,
+                                           const dict_table_t *table,
+                                           const buf_block_t *block,
+                                           ulint heap_no);
 
 /** Validates the lock system.
  @return true if ok */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/lock0priv.h mysql-8.0-8.0.27/storage/innobase/include/lock0priv.h
--- mysql-8.0-8.0.26/storage/innobase/include/lock0priv.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/lock0priv.h	2021-09-28 11:46:34.000000000 +0000
@@ -899,11 +899,10 @@
 /** Checks if some transaction has an implicit x-lock on a record in a clustered
  index.
  @return transaction id of the transaction which has the x-lock, or 0 */
-static inline trx_id_t lock_clust_rec_some_has_impl(
+[[nodiscard]] static inline trx_id_t lock_clust_rec_some_has_impl(
     const rec_t *rec,          /*!< in: user record */
     const dict_index_t *index, /*!< in: clustered index */
-    const ulint *offsets)      /*!< in: rec_get_offsets(rec, index) */
-    MY_ATTRIBUTE((warn_unused_result));
+    const ulint *offsets);     /*!< in: rec_get_offsets(rec, index) */
 
 /** Gets the first or next record lock on a page.
  @return next lock, NULL if none exists */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/lock0priv.ic mysql-8.0-8.0.27/storage/innobase/include/lock0priv.ic
--- mysql-8.0-8.0.26/storage/innobase/include/lock0priv.ic	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/lock0priv.ic	2021-09-28 11:46:34.000000000 +0000
@@ -121,20 +121,7 @@
     hash_table_t *lock_hash,  /*!< in: lock hash table */
     const buf_block_t *block) /*!< in: buffer block */
 {
-  ut_ad(locksys::owns_page_shard(block->get_page_id()));
-
-  const page_id_t page_id = block->page.id;
-  ulint hash = buf_block_get_lock_hash_val(block);
-
-  for (lock_t *lock = static_cast<lock_t *>(HASH_GET_FIRST(lock_hash, hash));
-       lock != nullptr;
-       lock = static_cast<lock_t *>(HASH_GET_NEXT(hash, lock))) {
-    if (page_id == lock->rec_lock.page_id) {
-      return (lock);
-    }
-  }
-
-  return (nullptr);
+  return lock_rec_get_first_on_page_addr(lock_hash, block->page.id);
 }
 
 /** Gets the next explicit lock request on a record.
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/log0ddl.h mysql-8.0-8.0.27/storage/innobase/include/log0ddl.h
--- mysql-8.0-8.0.26/storage/innobase/include/log0ddl.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/log0ddl.h	2021-09-28 11:46:34.000000000 +0000
@@ -148,11 +148,14 @@
   bool get_deletable() const { return (m_deletable); }
 
   /** Get encryption operation type */
-  encryption_op_type get_encryption_type() const {
-    ut_ad(get_type() == Log_Type::ALTER_ENCRYPT_TABLESPACE_LOG ||
-          get_type() == Log_Type::ALTER_UNENCRYPT_TABLESPACE_LOG);
-    return get_type() == Log_Type::ALTER_ENCRYPT_TABLESPACE_LOG ? ENCRYPTION
-                                                                : DECRYPTION;
+  Encryption::Progress get_encryption_type() const {
+    auto type = get_type();
+
+    if (type == Log_Type::ALTER_ENCRYPT_TABLESPACE_LOG) {
+      return Encryption::Progress::ENCRYPTION;
+    }
+    ut_ad(type == Log_Type::ALTER_UNENCRYPT_TABLESPACE_LOG);
+    return Encryption::Progress::DECRYPTION;
   }
 
   /** Get the old file path/name present in the DDL log record.
@@ -448,7 +451,7 @@
   @param[out]	existing_rec	alter_encrypt ddl record, nullptr if none
   @return DB_SUCCESS or error */
   dberr_t write_alter_encrypt_space_log(space_id_t space_id,
-                                        encryption_op_type type,
+                                        Encryption::Progress type,
                                         DDL_Record *existing_rec);
 
   /** Write a DROP log to indicate the entry in innodb_table_metadata
@@ -556,7 +559,7 @@
   @return DB_SUCCESS or error */
   dberr_t insert_alter_encrypt_space_log(uint64_t id, ulint thread_id,
                                          space_id_t space_id,
-                                         encryption_op_type type,
+                                         Encryption::Progress type,
                                          DDL_Record *existing_rec);
 
   /** Replay an ALTER ENCRYPT TABLESPACE log record
@@ -650,7 +653,7 @@
 extern Log_DDL *log_ddl;
 
 /** Close the DDL log system */
-inline void ddl_log_close() { UT_DELETE(log_ddl); }
+inline void ddl_log_close() { ut::delete_(log_ddl); }
 
 #ifdef UNIV_DEBUG
 struct SYS_VAR;
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/log0log.h mysql-8.0-8.0.27/storage/innobase/include/log0log.h
--- mysql-8.0-8.0.26/storage/innobase/include/log0log.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/log0log.h	2021-09-28 11:46:34.000000000 +0000
@@ -1299,7 +1299,7 @@
 @param[in]      iv           encryption iv
 @param[in]      is_boot      if it's for bootstrap
 @param[in]      encrypt_key  encrypt with master key */
-bool log_file_header_fill_encryption(byte *buf, byte *key, byte *iv,
+bool log_file_header_fill_encryption(byte *buf, const byte *key, const byte *iv,
                                      bool is_boot, bool encrypt_key);
 
 /** Disable redo logging and persist the information.
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/log0meb.h mysql-8.0-8.0.27/storage/innobase/include/log0meb.h
--- mysql-8.0-8.0.26/storage/innobase/include/log0meb.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/log0meb.h	2021-09-28 11:46:34.000000000 +0000
@@ -53,9 +53,9 @@
   @param[in]	value     incoming string
   @return 0 for valid contents
 */
-int validate_redo_log_archive_dirs(THD *thd MY_ATTRIBUTE((unused)),
-                                   SYS_VAR *var MY_ATTRIBUTE((unused)),
-                                   void *save, st_mysql_value *value);
+int validate_redo_log_archive_dirs(THD *thd [[maybe_unused]],
+                                   SYS_VAR *var [[maybe_unused]], void *save,
+                                   st_mysql_value *value);
 
 /**
   Initialize redo log archiving.
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/log0recv.h mysql-8.0-8.0.27/storage/innobase/include/log0recv.h
--- mysql-8.0-8.0.26/storage/innobase/include/log0recv.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/log0recv.h	2021-09-28 11:46:34.000000000 +0000
@@ -197,7 +197,7 @@
 
 /** Returns true if recovery is currently running.
 @return recv_recovery_on */
-static inline bool recv_recovery_is_on() MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline bool recv_recovery_is_on();
 
 /** Returns true if the page is brand new (the next log record is init_file_page
 or no records to apply).
@@ -211,15 +211,15 @@
 @param[in]	flush_lsn	FIL_PAGE_FILE_FLUSH_LSN
                                 of first system tablespace page
 @return error code or DB_SUCCESS */
-dberr_t recv_recovery_from_checkpoint_start(log_t &log, lsn_t flush_lsn)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t recv_recovery_from_checkpoint_start(log_t &log,
+                                                          lsn_t flush_lsn);
 
 /** Complete the recovery from the latest checkpoint.
 @param[in,out]	log		redo log
 @param[in]	aborting	true if the server has to abort due to an error
 @return recovered persistent metadata or nullptr if aborting*/
-MetadataRecover *recv_recovery_from_checkpoint_finish(log_t &log, bool aborting)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] MetadataRecover *recv_recovery_from_checkpoint_finish(
+    log_t &log, bool aborting);
 
 /** Creates the recovery system. */
 void recv_sys_create();
@@ -343,7 +343,7 @@
 class MetadataRecover {
   using PersistentTables = std::map<
       table_id_t, PersistentTableMetadata *, std::less<table_id_t>,
-      ut_allocator<std::pair<const table_id_t, PersistentTableMetadata *>>>;
+      ut::allocator<std::pair<const table_id_t, PersistentTableMetadata *>>>;
 
  public:
   /** Default constructor */
@@ -444,7 +444,7 @@
     size_t size;
   };
 
-  using Mlog_records = std::vector<Mlog_record, ut_allocator<Mlog_record>>;
+  using Mlog_records = std::vector<Mlog_record, ut::allocator<Mlog_record>>;
 
   /** While scanning logs for multi-record mini transaction (mtr), we have two
   passes. In first pass, we check if all the logs of the mtr is present in
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/mach0data.h mysql-8.0-8.0.27/storage/innobase/include/mach0data.h
--- mysql-8.0-8.0.26/storage/innobase/include/mach0data.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/mach0data.h	2021-09-28 11:46:34.000000000 +0000
@@ -54,8 +54,7 @@
 /** The following function is used to fetch data from one byte.
 @param[in]	b	pointer to a byte to read
 @return ulint integer, >= 0, < 256 */
-static inline uint8_t mach_read_from_1(const byte *b)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline uint8_t mach_read_from_1(const byte *b);
 
 /** The following function is used to store data in two consecutive bytes. We
 store the most significant byte to the lower address.
@@ -67,8 +66,7 @@
 bytes. The most significant byte is at the lowest address.
 @param[in]	b	pointer to 2 bytes where to store
 @return 2-byte integer, >= 0, < 64k */
-static inline uint16_t mach_read_from_2(const byte *b)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline uint16_t mach_read_from_2(const byte *b);
 
 /** The following function is used to convert a 16-bit data item to the
 canonical format, for fast bytewise equality test against memory.
@@ -92,8 +90,7 @@
 bytes. The most significant byte is at the lowest address.
 @param[in]	b	pointer to 3 bytes to read
 @return 32 bit integer */
-static inline uint32_t mach_read_from_3(const byte *b)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline uint32_t mach_read_from_3(const byte *b);
 
 /** The following function is used to store data in 4 consecutive
 bytes. We store the most significant byte to the lowest address.
@@ -105,8 +102,7 @@
 bytes. The most significant byte is at the lowest address.
 @param[in]	b	pointer to 4 bytes to read
 @return 32 bit integer */
-static inline uint32_t mach_read_from_4(const byte *b)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline uint32_t mach_read_from_4(const byte *b);
 
 /** Write a ulint in a compressed form (1..5 bytes).
 @param[in]	b	pointer to memory where to store
@@ -135,8 +131,7 @@
 bytes. The most significant byte is at the lowest address.
 @param[in]	b	pointer to 6 bytes to read
 @return 48-bit integer */
-static inline ib_uint64_t mach_read_from_6(const byte *b)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ib_uint64_t mach_read_from_6(const byte *b);
 
 /** The following function is used to store data in 7 consecutive
 bytes. We store the most significant byte to the lowest address.
@@ -148,8 +143,7 @@
 bytes. The most significant byte is at the lowest address.
 @param[in]	b	pointer to 7 bytes to read
 @return 56-bit integer */
-static inline ib_uint64_t mach_read_from_7(const byte *b)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ib_uint64_t mach_read_from_7(const byte *b);
 
 /** The following function is used to store data in 8 consecutive
 bytes. We store the most significant byte to the lowest address.
@@ -161,8 +155,7 @@
 bytes. The most significant byte is at the lowest address.
 @param[in]	b	pointer to 8 bytes to read
 @return 64-bit integer */
-static inline ib_uint64_t mach_read_from_8(const byte *b)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ib_uint64_t mach_read_from_8(const byte *b);
 
 /** Writes a 64-bit integer in a compressed form (5..9 bytes).
 @param[in]	b	pointer to memory where to store
@@ -185,8 +178,8 @@
 /** Reads a 64-bit integer in a compressed form.
 @param[in]	b	pointer to memory from where to read
 @return the value read */
-static inline ib_uint64_t mach_u64_read_much_compressed(const byte *b)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ib_uint64_t mach_u64_read_much_compressed(
+    const byte *b);
 
 /** Read a 64-bit integer in a much compressed form.
 @param[in,out]	ptr	pointer to memory from where to read,
@@ -213,9 +206,8 @@
 
 /** Reads a double. It is stored in a little-endian format.
  @return double read */
-static inline double mach_double_read(
-    const byte *b) /*!< in: pointer to memory from where to read */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline double mach_double_read(
+    const byte *b); /*!< in: pointer to memory from where to read */
 
 /** Writes a double. It is stored in a little-endian format.
 @param[in]	b	pointer to memory where to write
@@ -224,9 +216,8 @@
 
 /** Reads a float. It is stored in a little-endian format.
  @return float read */
-static inline float mach_float_read(
-    const byte *b) /*!< in: pointer to memory from where to read */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline float mach_float_read(
+    const byte *b); /*!< in: pointer to memory from where to read */
 
 /** Writes a float. It is stored in a little-endian format.
 @param[in]	b	pointer to memory where to write
@@ -236,10 +227,9 @@
 #ifndef UNIV_HOTBACKUP
 /** Reads a ulint stored in the little-endian format.
  @return unsigned long int */
-static inline ulint mach_read_from_n_little_endian(
+[[nodiscard]] static inline ulint mach_read_from_n_little_endian(
     const byte *buf, /*!< in: from where to read */
-    ulint buf_size)  /*!< in: from how many bytes to read */
-    MY_ATTRIBUTE((warn_unused_result));
+    ulint buf_size); /*!< in: from how many bytes to read */
 
 /** Writes a ulint in the little-endian format.
 @param[in]	dest		where to write
@@ -250,9 +240,8 @@
 
 /** Reads a ulint stored in the little-endian format.
  @return unsigned long int */
-static inline ulint mach_read_from_2_little_endian(
-    const byte *buf) /*!< in: from where to read */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ulint mach_read_from_2_little_endian(
+    const byte *buf); /*!< in: from where to read */
 
 /** Writes a ulint in the little-endian format.
 @param[in]	dest		where to write
@@ -292,8 +281,8 @@
 @param[in]	ptr	pointer where to read
 @param[in]	type	MLOG_1BYTE, MLOG_2BYTES, or MLOG_4BYTES
 @return value read */
-static inline uint32_t mach_read_ulint(const byte *ptr, mlog_id_t type)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline uint32_t mach_read_ulint(const byte *ptr,
+                                                     mlog_id_t type);
 
 #include "mach0data.ic"
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/mach0data.ic mysql-8.0-8.0.27/storage/innobase/include/mach0data.ic
--- mysql-8.0-8.0.26/storage/innobase/include/mach0data.ic	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/mach0data.ic	2021-09-28 11:46:34.000000000 +0000
@@ -755,19 +755,26 @@
 
   switch (len & 0x7) {
     case 0:
-      *--dest = *from++;  // Fall through.
+      *--dest = *from++;
+      [[fallthrough]];
     case 7:
-      *--dest = *from++;  // Fall through.
+      *--dest = *from++;
+      [[fallthrough]];
     case 6:
-      *--dest = *from++;  // Fall through.
+      *--dest = *from++;
+      [[fallthrough]];
     case 5:
-      *--dest = *from++;  // Fall through.
+      *--dest = *from++;
+      [[fallthrough]];
     case 4:
-      *--dest = *from++;  // Fall through.
+      *--dest = *from++;
+      [[fallthrough]];
     case 3:
-      *--dest = *from++;  // Fall through.
+      *--dest = *from++;
+      [[fallthrough]];
     case 2:
-      *--dest = *from++;  // Fall through.
+      *--dest = *from++;
+      [[fallthrough]];
     case 1:
       *--dest = *from;
   }
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/mem0mem.h mysql-8.0-8.0.27/storage/innobase/include/mem0mem.h
--- mysql-8.0-8.0.26/storage/innobase/include/mem0mem.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/mem0mem.h	2021-09-28 11:46:34.000000000 +0000
@@ -34,14 +34,15 @@
 #define mem0mem_h
 
 #include "mach0data.h"
-#include "univ.i"
 #include "ut0byte.h"
 #include "ut0mem.h"
 #include "ut0rnd.h"
 
 #include <limits.h>
 
+#include <functional>
 #include <memory>
+#include <type_traits>
 
 /* -------------------- MEMORY HEAPS ----------------------------- */
 
@@ -210,9 +211,8 @@
 @param[in]	buf	presumed topmost element
 @param[in]	buf_sz	size of buf in bytes
 @return true if topmost */
-static inline bool mem_heap_is_top(mem_heap_t *heap, const void *buf,
-                                   ulint buf_sz)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline bool mem_heap_is_top(mem_heap_t *heap,
+                                                 const void *buf, ulint buf_sz);
 
 /** Allocate a new chunk of memory from a memory heap, possibly discarding the
 topmost element. If the memory chunk specified with (top, top_sz) is the
@@ -464,4 +464,88 @@
   return (left.get_mem_heap() != right.get_mem_heap());
 }
 
+/** Heap wrapper that destroys the heap instance when it goes out of scope. */
+struct Scoped_heap {
+  using Type = mem_heap_t;
+
+  /** Default constructor. */
+  Scoped_heap() : m_ptr(nullptr, &mem_heap_free) {}
+
+  /** Debug constructor.
+  @param[in] n                  Initial size of the heap to allocate. */
+#ifdef UNIV_DEBUG
+  /**
+  @param[in] file               File name from where called.
+  @param[in] line               Line number if filenane from where called. */
+#endif /* UNIV_DEBUG */
+  Scoped_heap(size_t n IF_DEBUG(, const char *file, int line)) noexcept
+      : m_ptr(mem_heap_create_func(n, IF_DEBUG(file, line, ) MEM_HEAP_DYNAMIC),
+              &Scoped_heap::free) {}
+
+  /** Destructor. */
+  ~Scoped_heap() = default;
+
+  /** Create the heap, it must not already be created.
+  @param[in] n                  Initial size of the heap to allocate.
+  @param[in] file               File name from where called.
+  @param[in] line               Line number if filenane from where called. */
+  void create(size_t n IF_DEBUG(, const char *file, int line)) noexcept {
+    ut_a(get() == nullptr);
+    auto ptr = mem_heap_create_func(n, IF_DEBUG(file, line, ) MEM_HEAP_DYNAMIC);
+    reset(ptr);
+  }
+
+  /** @return the heap pointer. */
+  Type *get() noexcept { return m_ptr.get(); }
+
+  /** Set the pointer to p.
+  @param[in] p                  New pointer value. */
+  void reset(Type *p) {
+    if (get() != p) {
+      m_ptr.reset(p);
+    }
+  }
+
+  /** Empty the heap. */
+  void clear() noexcept {
+    if (get() != nullptr) {
+      mem_heap_empty(get());
+    }
+  }
+
+  /** Allocate memory in the heap.
+  @param[in] n_bytes            Number of bytes to allocate.
+  @return pointer to allocated memory. */
+  void *alloc(size_t n_bytes) noexcept {
+    ut_ad(n_bytes > 0);
+    return mem_heap_alloc(get(), n_bytes);
+  }
+
+ private:
+  /** Free the heap.
+  @param[in,out] p              Heap to free. */
+  static void free(mem_heap_t *p) {
+    if (p != nullptr) {
+      mem_heap_free(p);
+    }
+  }
+
+ private:
+  using Free = std::function<decltype(Scoped_heap::free)>;
+  using Ptr = std::unique_ptr<Type, Free>;
+
+  /** Heap to use. */
+  Ptr m_ptr{};
+
+  Scoped_heap(Scoped_heap &&) = delete;
+  Scoped_heap(const Scoped_heap &) = delete;
+  Scoped_heap &operator=(Scoped_heap &&) = delete;
+  Scoped_heap &operator=(const Scoped_heap &) = delete;
+};
+
+#define HEAP_NEW_EMPTY(h) \
+  Scoped_heap h {}
+#define MEM_HEAP_CREATE(h, n) (h).create((n)IF_DEBUG(, __FILE__, __LINE__))
+#define MEM_HEAP_NEW(h, n) Scoped_heap h((n)IF_DEBUG(, __FILE__, __LINE__))
+
 #endif
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/mem0mem.ic mysql-8.0-8.0.27/storage/innobase/include/mem0mem.ic
--- mysql-8.0-8.0.26/storage/innobase/include/mem0mem.ic	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/mem0mem.ic	2021-09-28 11:46:34.000000000 +0000
@@ -121,7 +121,7 @@
 @param[in]	heap	Memory heap to check */
 static inline void mem_block_validate(const mem_block_t *block) {
   if (block->magic_n != MEM_BLOCK_MAGIC_N) {
-    ib::fatal error;
+    ib::fatal error(UT_LOCATION_HERE);
     error << "Memory block is invalid (correctness field value"
              " should be "
           << MEM_BLOCK_MAGIC_N << ", but it is " << block->magic_n
@@ -530,7 +530,8 @@
 static inline char *mem_strdup(const char *str) /*!< in: string to be copied */
 {
   ulint len = strlen(str) + 1;
-  return (static_cast<char *>(memcpy(ut_malloc_nokey(len), str, len)));
+  return (static_cast<char *>(
+      memcpy(ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, len), str, len)));
 }
 
 /** Makes a NUL-terminated copy of a nonterminated string.
@@ -541,7 +542,8 @@
   if (static_cast<long>(len) < 0) {
     return nullptr;  // GCC bug #91397.
   }
-  char *s = static_cast<char *>(ut_malloc_nokey(len + 1));
+  char *s = static_cast<char *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, len + 1));
   s[len] = 0;
   if (len > 0) {
     memcpy(s, str, len);
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/mtr0log.h mysql-8.0-8.0.27/storage/innobase/include/mtr0log.h
--- mysql-8.0-8.0.26/storage/innobase/include/mtr0log.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/mtr0log.h	2021-09-28 11:46:34.000000000 +0000
@@ -109,9 +109,8 @@
 @param[out]	buffer  mlog buffer pointer if opened successfully
 @retval true if opened successfully.
 @retval false if not opened. One case is when redo is disabled for mtr. */
-static inline MY_ATTRIBUTE((warn_unused_result)) bool mlog_open(mtr_t *mtr,
-                                                                ulint size,
-                                                                byte *&buffer);
+[[nodiscard]] static inline bool mlog_open(mtr_t *mtr, ulint size,
+                                           byte *&buffer);
 
 /** Opens a buffer to mlog. It must be closed with mlog_close.
 This is used for writing log for metadata changes
@@ -121,8 +120,8 @@
 @param[out]	buffer  mlog buffer pointer if opened successfully
 @retval true if opened successfully.
 @retval false if not opened. One case is when redo is disabled for mtr. */
-static inline MY_ATTRIBUTE((warn_unused_result)) bool mlog_open_metadata(
-    mtr_t *mtr, ulint size, byte *&buffer);
+[[nodiscard]] static inline bool mlog_open_metadata(mtr_t *mtr, ulint size,
+                                                    byte *&buffer);
 
 /** Closes a buffer opened to mlog.
 @param[in]	mtr	mtr
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/mtr0mtr.h mysql-8.0-8.0.27/storage/innobase/include/mtr0mtr.h
--- mysql-8.0-8.0.26/storage/innobase/include/mtr0mtr.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/mtr0mtr.h	2021-09-28 11:46:34.000000000 +0000
@@ -158,13 +158,26 @@
 
 /** Mini-transaction memo stack slot. */
 struct mtr_memo_slot_t {
-  /** pointer to the object */
+  /** Pointer to the object - either buf_block_t or rw_lock_t */
   void *object;
 
   /** type of the stored object (MTR_MEMO_S_LOCK, ...) */
   ulint type;
+
+  /** Check if the object stored in this slot is a lock (rw_lock_t).
+  @return true if it is a lock object, false otherwise. */
+  bool is_lock() const {
+    return type == MTR_MEMO_S_LOCK || type == MTR_MEMO_X_LOCK ||
+           type == MTR_MEMO_SX_LOCK;
+  }
+
+  std::ostream &print(std::ostream &out) const;
 };
 
+inline std::ostream &operator<<(std::ostream &out, const mtr_memo_slot_t &obj) {
+  return obj.print(out);
+}
+
 /** Mini-transaction handle and buffer */
 struct mtr_t {
   /** State variables of the mtr */
@@ -205,7 +218,7 @@
     mtr_state_t m_state;
 
     /** Flush Observer */
-    FlushObserver *m_flush_observer;
+    Flush_observer *m_flush_observer;
 
 #ifdef UNIV_DEBUG
     /** For checking corruption. */
@@ -395,7 +408,7 @@
 
   /** Return current size of the buffer.
   @return	savepoint */
-  ulint get_savepoint() const MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] ulint get_savepoint() const {
     ut_ad(is_active());
     ut_ad(m_impl.m_magic_n == MTR_MAGIC_N);
 
@@ -419,7 +432,7 @@
 
   /** Get the logging mode.
   @return	logging mode */
-  inline mtr_log_t get_log_mode() const MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] inline mtr_log_t get_log_mode() const;
 
   /** Change the logging mode.
   @param mode	 logging mode
@@ -430,8 +443,8 @@
   @param ptr	pointer from where to read
   @param type	MLOG_1BYTE, MLOG_2BYTES, MLOG_4BYTES
   @return	value read */
-  inline uint32_t read_ulint(const byte *ptr, mlog_id_t type) const
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] inline uint32_t read_ulint(const byte *ptr,
+                                           mlog_id_t type) const;
 
   /** Locks a rw-latch in S mode.
   NOTE: use mtr_s_lock().
@@ -483,7 +496,7 @@
   @return the commit LSN
   @retval 0 if the transaction only modified temporary tablespaces or logging
   is disabled globally. */
-  lsn_t commit_lsn() const MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] lsn_t commit_lsn() const {
     ut_ad(has_committed());
     ut_ad(m_impl.m_log_mode == MTR_LOG_ALL);
     return (m_commit_lsn);
@@ -496,46 +509,49 @@
   void exit_ibuf() { m_impl.m_inside_ibuf = false; }
 
   /** @return true if we are inside the change buffer code */
-  bool is_inside_ibuf() const MY_ATTRIBUTE((warn_unused_result)) {
-    return (m_impl.m_inside_ibuf);
-  }
+  [[nodiscard]] bool is_inside_ibuf() const { return (m_impl.m_inside_ibuf); }
 
   /*
   @return true if the mini-transaction is active */
-  bool is_active() const MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] bool is_active() const {
     return (m_impl.m_state == MTR_STATE_ACTIVE);
   }
 
   /** Get flush observer
   @return flush observer */
-  FlushObserver *get_flush_observer() const MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] Flush_observer *get_flush_observer() const {
     return (m_impl.m_flush_observer);
   }
 
   /** Set flush observer
   @param[in]	observer	flush observer */
-  void set_flush_observer(FlushObserver *observer) {
+  void set_flush_observer(Flush_observer *observer) {
     ut_ad(observer == nullptr || m_impl.m_log_mode == MTR_LOG_NO_REDO);
 
     m_impl.m_flush_observer = observer;
   }
 
+  /** Print the memo objects (mtr_memo_slot_t) of mtr_t to the given output
+  stream.
+  @param[in]   out   the output stream for printing
+  @return the output stream.  */
+  std::ostream &print_memos(std::ostream &out) const;
+
 #ifdef UNIV_DEBUG
   /** Check if memo contains the given item.
   @param memo	memo stack
   @param object	object to search
   @param type	type of object
   @return	true if contains */
-  static bool memo_contains(const mtr_buf_t *memo, const void *object,
-                            ulint type) MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static bool memo_contains(const mtr_buf_t *memo,
+                                          const void *object, ulint type);
 
   /** Check if memo contains the given item.
   @param ptr		object to search
   @param flags		specify types of object (can be ORred) of
                           MTR_MEMO_PAGE_S_FIX ... values
   @return true if contains */
-  bool memo_contains_flagged(const void *ptr, ulint flags) const
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool memo_contains_flagged(const void *ptr, ulint flags) const;
 
   /** Check if memo contains the given page.
   @param[in]	ptr	pointer to within buffer frame
@@ -543,8 +559,8 @@
                           MTR_MEMO_PAGE_S_FIX... values
   @return	the block
   @retval	NULL	if not found */
-  buf_block_t *memo_contains_page_flagged(const byte *ptr, ulint flags) const
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] buf_block_t *memo_contains_page_flagged(const byte *ptr,
+                                                        ulint flags) const;
 
   /** Mark the given latched page as modified.
   @param[in]	ptr	pointer to within buffer frame */
@@ -554,7 +570,7 @@
   void print() const;
 
   /** @return true if the mini-transaction has committed */
-  bool has_committed() const MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] bool has_committed() const {
     return (m_impl.m_state == MTR_STATE_COMMITTED);
   }
 
@@ -564,7 +580,7 @@
   }
 
   /** @return true if mini-transaction contains modifications. */
-  bool has_modifications() const MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] bool has_modifications() const {
     return (m_impl.m_modifications);
   }
 
@@ -573,18 +589,13 @@
   they modify the same buffer block.
   @param[in]   mtr2  the given mtr.
   @return true if there is conflict, false otherwise. */
-  bool conflicts_with(const mtr_t *mtr2) const
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool conflicts_with(const mtr_t *mtr2) const;
 
   /** @return the memo stack */
-  const mtr_buf_t *get_memo() const MY_ATTRIBUTE((warn_unused_result)) {
-    return (&m_impl.m_memo);
-  }
+  [[nodiscard]] const mtr_buf_t *get_memo() const { return (&m_impl.m_memo); }
 
   /** @return the memo stack */
-  mtr_buf_t *get_memo() MY_ATTRIBUTE((warn_unused_result)) {
-    return (&m_impl.m_memo);
-  }
+  [[nodiscard]] mtr_buf_t *get_memo() { return (&m_impl.m_memo); }
 
   /** Computes the number of bytes that would be written to the redo
   log if mtr was committed right now (excluding headers of log blocks).
@@ -598,16 +609,14 @@
 #endif /* UNIV_DEBUG */
 
   /** @return true if a record was added to the mini-transaction */
-  bool is_dirty() const MY_ATTRIBUTE((warn_unused_result)) {
-    return (m_impl.m_made_dirty);
-  }
+  [[nodiscard]] bool is_dirty() const { return (m_impl.m_made_dirty); }
 
   /** Note that a record has been added to the log */
   void added_rec() { ++m_impl.m_n_log_recs; }
 
   /** Get the buffered redo log of this mini-transaction.
   @return	redo log */
-  const mtr_buf_t *get_log() const MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] const mtr_buf_t *get_log() const {
     ut_ad(m_impl.m_magic_n == MTR_MAGIC_N);
 
     return (&m_impl.m_log);
@@ -615,7 +624,7 @@
 
   /** Get the buffered redo log of this mini-transaction.
   @return	redo log */
-  mtr_buf_t *get_log() MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] mtr_buf_t *get_log() {
     ut_ad(m_impl.m_magic_n == MTR_MAGIC_N);
 
     return (&m_impl.m_log);
@@ -640,8 +649,7 @@
   /** Check if this mini-transaction is dirtying a clean page.
   @param block	block being x-fixed
   @return true if the mtr is dirtying a clean page. */
-  static bool is_block_dirtied(const buf_block_t *block)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static bool is_block_dirtied(const buf_block_t *block);
 
   /** Matrix to check if a mode update request should be ignored. */
   static bool s_mode_update[MTR_LOG_MODE_MAX][MTR_LOG_MODE_MAX];
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/mtr0types.h mysql-8.0-8.0.27/storage/innobase/include/mtr0types.h
--- mysql-8.0-8.0.26/storage/innobase/include/mtr0types.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/mtr0types.h	2021-09-28 11:46:34.000000000 +0000
@@ -275,6 +275,32 @@
   MTR_MEMO_SX_LOCK = 256
 };
 
+inline const char *mtr_memo_type(const ulint type) {
+  switch (type) {
+    case MTR_MEMO_PAGE_S_FIX:
+      return "MTR_MEMO_PAGE_S_FIX";
+    case MTR_MEMO_PAGE_X_FIX:
+      return "MTR_MEMO_PAGE_X_FIX";
+    case MTR_MEMO_PAGE_SX_FIX:
+      return "MTR_MEMO_PAGE_SX_FIX";
+    case MTR_MEMO_BUF_FIX:
+      return "MTR_MEMO_BUF_FIX";
+#ifdef UNIV_DEBUG
+    case MTR_MEMO_MODIFY:
+      return "MTR_MEMO_MODIFY";
+#endif /* UNIV_DEBUG */
+    case MTR_MEMO_S_LOCK:
+      return "MTR_MEMO_S_LOCK";
+    case MTR_MEMO_X_LOCK:
+      return "MTR_MEMO_X_LOCK";
+    case MTR_MEMO_SX_LOCK:
+      return "MTR_MEMO_SX_LOCK";
+    default:
+      ut_ad(0);
+  }
+  return "MTR_MEMO_UNKNOWN";
+}
+
 #ifdef UNIV_DEBUG
 #define MTR_MAGIC_N 54551
 #endif /* UNIV_DEBUG */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/os0enc.h mysql-8.0-8.0.27/storage/innobase/include/os0enc.h
--- mysql-8.0-8.0.26/storage/innobase/include/os0enc.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/os0enc.h	2021-09-28 11:46:34.000000000 +0000
@@ -72,6 +72,28 @@
     VERSION_3 = 2,
   };
 
+  /** Encryption progress type. */
+  enum class Progress {
+    /* Space encryption in progress */
+    ENCRYPTION,
+    /* Space decryption in progress */
+    DECRYPTION,
+    /* Nothing in progress */
+    NONE
+  };
+
+  /** Encryption operation resume point after server restart. */
+  enum class Resume_point {
+    /* Resume from the beginning. */
+    INIT,
+    /* Resume processing. */
+    PROCESS,
+    /* Operation has ended. */
+    END,
+    /* All done. */
+    DONE
+  };
+
   /** Encryption magic bytes for 5.7.11, it's for checking the encryption
   information version. */
   static constexpr char KEY_MAGIC_V1[] = "lCA";
@@ -158,39 +180,34 @@
   /** Check if page is encrypted page or not
   @param[in]  page  page which need to check
   @return true if it is an encrypted page */
-  static bool is_encrypted_page(const byte *page) noexcept
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static bool is_encrypted_page(const byte *page) noexcept;
 
   /** Check if a log block is encrypted or not
   @param[in]  block block which need to check
   @return true if it is an encrypted block */
-  static bool is_encrypted_log(const byte *block) noexcept
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static bool is_encrypted_log(const byte *block) noexcept;
 
   /** Check the encryption option and set it
   @param[in]      option      encryption option
   @param[in,out]  type        The encryption type
   @return DB_SUCCESS or DB_UNSUPPORTED */
-  dberr_t set_algorithm(const char *option, Encryption *type) noexcept
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t set_algorithm(const char *option,
+                                      Encryption *type) noexcept;
 
   /** Validate the algorithm string.
   @param[in]  option  Encryption option
   @return DB_SUCCESS or error code */
-  static dberr_t validate(const char *option) noexcept
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static dberr_t validate(const char *option) noexcept;
 
   /** Convert to a "string".
   @param[in]  type  The encryption type
   @return the string representation */
-  static const char *to_string(Type type) noexcept
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static const char *to_string(Type type) noexcept;
 
   /** Check if the string is "empty" or "none".
   @param[in]  algorithm  Encryption algorithm to check
   @return true if no algorithm requested */
-  static bool is_none(const char *algorithm) noexcept
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static bool is_none(const char *algorithm) noexcept;
 
   /** Generate random encryption value for key and iv.
   @param[in,out]  value Encryption value */
@@ -220,8 +237,9 @@
   @param[in]      is_boot       if it's for bootstrap
   @param[in]      encrypt_key   encrypt with master key
   @return true if success. */
-  static bool fill_encryption_info(byte *key, byte *iv, byte *encrypt_info,
-                                   bool is_boot, bool encrypt_key) noexcept;
+  static bool fill_encryption_info(const byte *key, const byte *iv,
+                                   byte *encrypt_info, bool is_boot,
+                                   bool encrypt_key) noexcept;
 
   /** Get master key from encryption information
   @param[in]      encrypt_info  encryption information
@@ -272,8 +290,8 @@
   @param[in,out]  dst       destination area
   @param[in,out]  dst_len   size of the destination in bytes
   @return buffer data, dst_len will have the length of the data */
-  byte *encrypt(const IORequest &type, byte *src, ulint src_len, byte *dst,
-                ulint *dst_len) noexcept MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] byte *encrypt(const IORequest &type, byte *src, ulint src_len,
+                              byte *dst, ulint *dst_len) noexcept;
 
   /** Decrypt the log block.
   @param[in]      type  IORequest
@@ -306,8 +324,8 @@
   @param[in,out]  dst     scratch area to use for decrypt
   @param[in]  dst_len     size of the scratch area in bytes
   @return DB_SUCCESS or error code */
-  dberr_t decrypt(const IORequest &type, byte *src, ulint src_len, byte *dst,
-                  ulint dst_len) noexcept MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t decrypt(const IORequest &type, byte *src, ulint src_len,
+                                byte *dst, ulint dst_len) noexcept;
 
   /** Check if keyring plugin loaded. */
   static bool check_keyring() noexcept;
@@ -318,21 +336,15 @@
 
   /** Check if the encryption algorithm is NONE.
   @return true if no algorithm is set, false otherwise. */
-  bool is_none() const noexcept MY_ATTRIBUTE((warn_unused_result)) {
-    return m_type == NONE;
-  }
+  [[nodiscard]] bool is_none() const noexcept { return m_type == NONE; }
 
   /** Set encryption type
   @param[in]  type  encryption type **/
   void set_type(Type type);
 
-  /** Get encryption key
-  @return encryption key **/
-  byte *get_key() const;
-
   /** Set encryption key
   @param[in]  key  encryption key **/
-  void set_key(byte *key);
+  void set_key(const byte *key);
 
   /** Get key length
   @return  key length **/
@@ -342,13 +354,9 @@
   @param[in]  klen  key length **/
   void set_key_length(ulint klen);
 
-  /** Get initial vector
-  @return initial vector **/
-  byte *get_initial_vector() const;
-
   /** Set initial vector
   @param[in]  iv  initial_vector **/
-  void set_initial_vector(byte *iv);
+  void set_initial_vector(const byte *iv);
 
   /** Get master key id
   @return master key id **/
@@ -363,20 +371,20 @@
   @param[in,out]  dst       destination area
   @param[in,out]  dst_len   size of the destination in bytes
   @return true if operation successful, false otherwise. */
-  bool encrypt_low(byte *src, ulint src_len, byte *dst, ulint *dst_len) noexcept
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool encrypt_low(byte *src, ulint src_len, byte *dst,
+                                 ulint *dst_len) noexcept;
 
   /** Encrypt type */
   Type m_type;
 
   /** Encrypt key */
-  byte *m_key;
+  const byte *m_key;
 
   /** Encrypt key length*/
   ulint m_klen;
 
   /** Encrypt initial vector */
-  byte *m_iv;
+  const byte *m_iv;
 
   /** Current master key id */
   static uint32_t s_master_key_id;
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/os0file.h mysql-8.0-8.0.27/storage/innobase/include/os0file.h
--- mysql-8.0-8.0.26/storage/innobase/include/os0file.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/os0file.h	2021-09-28 11:46:34.000000000 +0000
@@ -104,6 +104,11 @@
 };
 }  // namespace file
 
+/** Raw file handle. */
+using os_fd_t = int;
+
+static constexpr os_fd_t OS_FD_CLOSED = -1;
+
 #ifdef _WIN32
 
 typedef HANDLE os_file_dir_t; /*!< directory stream */
@@ -115,8 +120,10 @@
 /** Use unbuffered I/O */
 #define UNIV_NON_BUFFERED_IO
 
-/** File handle */
-#define os_file_t HANDLE
+/** Windows file handle */
+using os_file_t = HANDLE;
+
+static const os_file_t OS_FILE_CLOSED = INVALID_HANDLE_VALUE;
 
 /** Convert a C file descriptor to a native file handle
 @param fd file descriptor
@@ -136,7 +143,9 @@
 #else /* _WIN32 */
 
 /** File handle */
-typedef int os_file_t;
+using os_file_t = os_fd_t;
+
+static constexpr os_fd_t OS_FILE_CLOSED = OS_FD_CLOSED;
 
 /** Convert a C file descriptor to a native file handle
 @param fd file descriptor
@@ -151,7 +160,7 @@
 /** Closes the file associated with C file descriptor fd
 @param[in]	fd	C file descriptor
 @return 0 if success */
-#define OS_FILE_CLOSE_FD(fd) (os_file_close(fd) ? 0 : -1)
+#define OS_FILE_CLOSE_FD(fd) (os_file_close(fd) ? 0 : OS_FD_CLOSED)
 
 #endif /* _WIN32 */
 
@@ -170,8 +179,6 @@
   os_file_t m_file;
 };
 
-static const os_file_t OS_FILE_CLOSED = os_file_t(~0);
-
 /** The next value should be smaller or equal to the smallest sector size used
 on any disk. A log block is required to be a portion of disk which is written
 so that if the start and the end of a block get written to disk, then the
@@ -345,38 +352,29 @@
   }
 
   /** @return true if ignore missing flag is set */
-  static bool ignore_missing(ulint type) MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] static bool ignore_missing(ulint type) {
     return ((type & IGNORE_MISSING) == IGNORE_MISSING);
   }
 
   /** @return true if it is a read request */
-  bool is_read() const MY_ATTRIBUTE((warn_unused_result)) {
-    return ((m_type & READ) == READ);
-  }
+  [[nodiscard]] bool is_read() const { return ((m_type & READ) == READ); }
 
   /** @return true if it is a write request */
-  bool is_write() const MY_ATTRIBUTE((warn_unused_result)) {
-    return ((m_type & WRITE) == WRITE);
-  }
+  [[nodiscard]] bool is_write() const { return ((m_type & WRITE) == WRITE); }
 
   /** @return true if it is a redo log write */
-  bool is_log() const MY_ATTRIBUTE((warn_unused_result)) {
-    return ((m_type & LOG) == LOG);
-  }
+  [[nodiscard]] bool is_log() const { return ((m_type & LOG) == LOG); }
 
   /** @return true if it is a row log entry used in online DDL */
-  bool is_row_log() const MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] bool is_row_log() const {
     return ((m_type & ROW_LOG) == ROW_LOG);
   }
 
   /** @return true if the simulated AIO thread should be woken up */
-  bool is_wake() const MY_ATTRIBUTE((warn_unused_result)) {
-    return ((m_type & DO_NOT_WAKE) == 0);
-  }
+  [[nodiscard]] bool is_wake() const { return ((m_type & DO_NOT_WAKE) == 0); }
 
   /** @return true if partial read warning disabled */
-  bool is_partial_io_warning_disabled() const
-      MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] bool is_partial_io_warning_disabled() const {
     return ((m_type & DISABLE_PARTIAL_IO_WARNINGS) ==
             DISABLE_PARTIAL_IO_WARNINGS);
   }
@@ -385,19 +383,16 @@
   void disable_partial_io_warnings() { m_type |= DISABLE_PARTIAL_IO_WARNINGS; }
 
   /** @return true if missing files should be ignored */
-  bool ignore_missing() const MY_ATTRIBUTE((warn_unused_result)) {
-    return (ignore_missing(m_type));
-  }
+  [[nodiscard]] bool ignore_missing() const { return (ignore_missing(m_type)); }
 
   /** @return true if punch hole should be used */
-  bool punch_hole() const MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] bool punch_hole() const {
     return ((m_type & PUNCH_HOLE) == PUNCH_HOLE);
   }
 
   /** @return true if punch hole needs to be done always if it's supported and
   if the page is to be compressed. */
-  bool is_punch_hole_optimisation_disabled() const
-      MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] bool is_punch_hole_optimisation_disabled() const {
     ut_ad(is_compressed() && punch_hole());
 
     return (m_type & DISABLE_PUNCH_HOLE_OPTIMISATION) ==
@@ -405,7 +400,7 @@
   }
 
   /** @return true if the read should be validated */
-  bool validate() const MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] bool validate() const {
     ut_ad(is_read() ^ is_write());
 
     return (!is_read() || !punch_hole());
@@ -432,9 +427,7 @@
   void clear_punch_hole() { m_type &= ~PUNCH_HOLE; }
 
   /** @return the block size to use for IO */
-  ulint block_size() const MY_ATTRIBUTE((warn_unused_result)) {
-    return (m_block_size);
-  }
+  [[nodiscard]] ulint block_size() const { return (m_block_size); }
 
   /** Set the block size for IO
   @param[in] block_size		Block size to set */
@@ -467,17 +460,17 @@
 
   /** Get the compression algorithm.
   @return the compression algorithm */
-  Compression compression_algorithm() const MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] Compression compression_algorithm() const {
     return (m_compression);
   }
 
   /** @return true if the page should be compressed */
-  bool is_compressed() const MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] bool is_compressed() const {
     return (compression_algorithm().m_type != Compression::NONE);
   }
 
   /** @return true if the page read should not be transformed. */
-  bool is_compression_enabled() const MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] bool is_compression_enabled() const {
     return ((m_type & NO_COMPRESSION) == 0);
   }
 
@@ -498,7 +491,7 @@
   @param[in] key		The encryption key to use
   @param[in] key_len	length of the encryption key
   @param[in] iv		The encryption iv to use */
-  void encryption_key(byte *key, ulint key_len, byte *iv) {
+  void encryption_key(const byte *key, ulint key_len, const byte *iv) {
     m_encryption.set_key(key);
     m_encryption.set_key_length(key_len);
     m_encryption.set_initial_vector(iv);
@@ -506,12 +499,12 @@
 
   /** Get the encryption algorithm.
   @return the encryption algorithm */
-  Encryption encryption_algorithm() const MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] Encryption encryption_algorithm() const {
     return (m_encryption);
   }
 
   /** @return true if the page should be encrypted. */
-  bool is_encrypted() const MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] bool is_encrypted() const {
     return (m_encryption.get_type() != Encryption::NONE);
   }
 
@@ -527,9 +520,7 @@
   void dblwr() { m_type |= DBLWR; }
 
   /** @return true if the request is for a dblwr page. */
-  bool is_dblwr() const MY_ATTRIBUTE((warn_unused_result)) {
-    return ((m_type & DBLWR) == DBLWR);
-  }
+  [[nodiscard]] bool is_dblwr() const { return ((m_type & DBLWR) == DBLWR); }
 
   /** @return true if punch hole is supported */
   static bool is_punch_hole_supported() {
@@ -594,8 +585,7 @@
 
   /** Get a reference to the underlying encryption information.
   @return reference to the encryption information. */
-  Encryption &get_encryption_info() noexcept
-      MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] Encryption &get_encryption_info() noexcept {
     return m_encryption;
   }
 
@@ -607,8 +597,7 @@
 
   /** Get the encrypted block.
   @return the encrypted block. */
-  const file::Block *get_encrypted_block() const noexcept
-      MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] const file::Block *get_encrypted_block() const noexcept {
     return m_eblock;
   }
 
@@ -792,9 +781,9 @@
 @param[out]	success		true if succeeded
 @return own: handle to the file, not defined if error, error number
         can be retrieved with os_file_get_last_error */
-pfs_os_file_t os_file_create_simple_no_error_handling_func(
+[[nodiscard]] pfs_os_file_t os_file_create_simple_no_error_handling_func(
     const char *name, ulint create_mode, ulint access_type, bool read_only,
-    bool *success) MY_ATTRIBUTE((warn_unused_result));
+    bool *success);
 
 /** Tries to disable OS caching on an opened file descriptor.
 @param[in]	fd		file descriptor to alter
@@ -821,10 +810,10 @@
 @param[in]	success		true if succeeded
 @return own: handle to the file, not defined if error, error number
         can be retrieved with os_file_get_last_error */
-pfs_os_file_t os_file_create_func(const char *name, ulint create_mode,
-                                  ulint purpose, ulint type, bool read_only,
-                                  bool *success)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] pfs_os_file_t os_file_create_func(const char *name,
+                                                ulint create_mode,
+                                                ulint purpose, ulint type,
+                                                bool read_only, bool *success);
 
 /** Deletes a file. The file has to be closed before calling this.
 @param[in]	name		file path as a null-terminated string
@@ -1039,10 +1028,9 @@
 @param[in]	src_line	line where the func invoked
 @return own: handle to the file, not defined if error, error number
         can be retrieved with os_file_get_last_error */
-static inline pfs_os_file_t pfs_os_file_create_simple_func(
+[[nodiscard]] static inline pfs_os_file_t pfs_os_file_create_simple_func(
     mysql_pfs_key_t key, const char *name, ulint create_mode, ulint access_type,
-    bool read_only, bool *success, const char *src_file, uint src_line)
-    MY_ATTRIBUTE((warn_unused_result));
+    bool read_only, bool *success, const char *src_file, uint src_line);
 
 /** NOTE! Please use the corresponding macro
 os_file_create_simple_no_error_handling(), not directly this function!
@@ -1062,10 +1050,10 @@
 @param[in]	src_line	line where the func invoked
 @return own: handle to the file, not defined if error, error number
         can be retrieved with os_file_get_last_error */
-static inline pfs_os_file_t pfs_os_file_create_simple_no_error_handling_func(
+[[nodiscard]] static inline pfs_os_file_t
+pfs_os_file_create_simple_no_error_handling_func(
     mysql_pfs_key_t key, const char *name, ulint create_mode, ulint access_type,
-    bool read_only, bool *success, const char *src_file, uint src_line)
-    MY_ATTRIBUTE((warn_unused_result));
+    bool read_only, bool *success, const char *src_file, uint src_line);
 
 /** NOTE! Please use the corresponding macro os_file_create(), not directly
 this function!
@@ -1088,10 +1076,10 @@
 @param[in]	src_line	line where the func invoked
 @return own: handle to the file, not defined if error, error number
         can be retrieved with os_file_get_last_error */
-static inline pfs_os_file_t pfs_os_file_create_func(
+[[nodiscard]] static inline pfs_os_file_t pfs_os_file_create_func(
     mysql_pfs_key_t key, const char *name, ulint create_mode, ulint purpose,
     ulint type, bool read_only, bool *success, const char *src_file,
-    uint src_line) MY_ATTRIBUTE((warn_unused_result));
+    uint src_line);
 
 /** NOTE! Please use the corresponding macro os_file_close(), not directly
 this function!
@@ -1439,14 +1427,12 @@
 @param[in]	filename	Full path to the filename to check
 @return file size if OK, else set m_total_size to ~0 and m_alloc_size to
         errno. */
-os_file_size_t os_file_get_size(const char *filename)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] os_file_size_t os_file_get_size(const char *filename);
 
 /** Gets a file size.
 @param[in]	file		Handle to a file
 @return file size, or (os_offset_t) -1 on failure */
-os_offset_t os_file_get_size(pfs_os_file_t file)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] os_offset_t os_file_get_size(pfs_os_file_t file);
 
 /** Allocate a block to file using fallocate from the given offset if
 fallocate is supported. Falls back to the old slower method of writing
@@ -1458,9 +1444,9 @@
 @param[in]	read_only	enable read-only checks if true
 @param[in]	flush		flush file content to disk
 @return true if success */
-bool os_file_set_size_fast(const char *name, pfs_os_file_t file,
-                           os_offset_t offset, os_offset_t size, bool read_only,
-                           bool flush) MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool os_file_set_size_fast(const char *name, pfs_os_file_t file,
+                                         os_offset_t offset, os_offset_t size,
+                                         bool read_only, bool flush);
 
 /** Write the specified number of zeros to a file from specific offset.
 @param[in]	name		name of the file or path as a null-terminated
@@ -1471,9 +1457,9 @@
 @param[in]	read_only	enable read-only checks if true
 @param[in]	flush		flush file content to disk
 @return true if success */
-bool os_file_set_size(const char *name, pfs_os_file_t file, os_offset_t offset,
-                      os_offset_t size, bool read_only, bool flush)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool os_file_set_size(const char *name, pfs_os_file_t file,
+                                    os_offset_t offset, os_offset_t size,
+                                    bool read_only, bool flush);
 
 /** Truncates a file at its current position.
 @param[in,out]	file	file to be truncated
@@ -1523,9 +1509,9 @@
 @param[in]	offset		file offset where to read
 @param[in]	n		number of bytes to read
 @return DB_SUCCESS if request was successful, DB_IO_ERROR on failure */
-dberr_t os_file_read_func(IORequest &type, const char *file_name,
-                          os_file_t file, void *buf, os_offset_t offset,
-                          ulint n) MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t os_file_read_func(IORequest &type, const char *file_name,
+                                        os_file_t file, void *buf,
+                                        os_offset_t offset, ulint n);
 
 /** NOTE! Use the corresponding macro os_file_read_first_page(),
 not directly this function!
@@ -1536,9 +1522,10 @@
 @param[out]	buf		buffer where to read
 @param[in]	n		number of bytes to read
 @return DB_SUCCESS if request was successful, DB_IO_ERROR on failure */
-dberr_t os_file_read_first_page_func(IORequest &type, const char *file_name,
-                                     os_file_t file, void *buf, ulint n)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t os_file_read_first_page_func(IORequest &type,
+                                                   const char *file_name,
+                                                   os_file_t file, void *buf,
+                                                   ulint n);
 
 /** Copy data from one file to another file. Data is read/written
 at current file offset.
@@ -1548,9 +1535,10 @@
 @param[in]	dest_offset	offset to copy to
 @param[in]	size		number of bytes to copy
 @return DB_SUCCESS if successful */
-dberr_t os_file_copy_func(os_file_t src_file, os_offset_t src_offset,
-                          os_file_t dest_file, os_offset_t dest_offset,
-                          uint size) MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t os_file_copy_func(os_file_t src_file,
+                                        os_offset_t src_offset,
+                                        os_file_t dest_file,
+                                        os_offset_t dest_offset, uint size);
 
 /** Rewind file to its start, read at most size - 1 bytes from it to str, and
 NUL-terminate str. All errors are silently ignored. This function is
@@ -1572,9 +1560,9 @@
 @param[in]	n		number of bytes to read
 @param[out]	o		number of bytes actually read
 @return DB_SUCCESS or error code */
-dberr_t os_file_read_no_error_handling_func(
+[[nodiscard]] dberr_t os_file_read_no_error_handling_func(
     IORequest &type, const char *file_name, os_file_t file, void *buf,
-    os_offset_t offset, ulint n, ulint *o) MY_ATTRIBUTE((warn_unused_result));
+    os_offset_t offset, ulint n, ulint *o);
 
 /** NOTE! Use the corresponding macro os_file_write(), not directly this
 function!
@@ -1587,9 +1575,9 @@
 @param[in]	offset		file offset where to read
 @param[in]	n		number of bytes to read
 @return DB_SUCCESS if request was successful */
-dberr_t os_file_write_func(IORequest &type, const char *name, os_file_t file,
-                           const void *buf, os_offset_t offset, ulint n)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t os_file_write_func(IORequest &type, const char *name,
+                                         os_file_t file, const void *buf,
+                                         os_offset_t offset, ulint n);
 
 /** Check the existence and type of a given path.
 @param[in]   path    pathname of the file
@@ -1750,8 +1738,8 @@
 /** Creates a temporary file in the location specified by the parameter
 path. If the path is NULL, then it will be created in --tmpdir.
 @param[in]	path	location for creating temporary file
-@return temporary file descriptor, or < 0 on error */
-int innobase_mysql_tmpfile(const char *path);
+@return temporary file descriptor, or OS_FD_CLOSED on error */
+os_fd_t innobase_mysql_tmpfile(const char *path);
 
 #endif /* !UNIV_HOTBACKUP */
 
@@ -1780,8 +1768,8 @@
 @param[in]	off		Starting offset (SEEK_SET)
 @param[in]	len		Size of the hole
 @return DB_SUCCESS or error code */
-dberr_t os_file_punch_hole(os_file_t fh, os_offset_t off, os_offset_t len)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t os_file_punch_hole(os_file_t fh, os_offset_t off,
+                                         os_offset_t len);
 
 /** Check if the file system supports sparse files.
 
@@ -1794,8 +1782,8 @@
 @param[in]	path	File name
 @param[in]	fh	File handle for the file - if opened
 @return true if the file system supports sparse files */
-bool os_is_sparse_file_supported(const char *path, pfs_os_file_t fh)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool os_is_sparse_file_supported(const char *path,
+                                               pfs_os_file_t fh);
 
 /** Decompress the page data contents. Page type must be FIL_PAGE_COMPRESSED, if
 not then the source contents are left unchanged and DB_SUCCESS is returned.
@@ -1807,9 +1795,8 @@
 @param[in]	dst_len		If dst is valid, then size of the scratch area
                                 in bytes
 @return DB_SUCCESS or error code */
-dberr_t os_file_decompress_page(bool dblwr_read, byte *src, byte *dst,
-                                ulint dst_len)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t os_file_decompress_page(bool dblwr_read, byte *src,
+                                              byte *dst, ulint dst_len);
 
 /** Compress a data page
 @param[in]	compression	Compression algorithm
@@ -1826,7 +1813,7 @@
 /** Determine if O_DIRECT is supported.
 @retval	true	if O_DIRECT is supported.
 @retval	false	if O_DIRECT is not supported. */
-bool os_is_o_direct_supported() MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool os_is_o_direct_supported();
 
 /** Fill the pages with NULs
 @param[in] file		File handle
@@ -1837,10 +1824,9 @@
 @param[in] read_only_mode
                         if true, then read only mode checks are enforced.
 @return DB_SUCCESS or error code */
-dberr_t os_file_write_zeros(pfs_os_file_t file, const char *name,
-                            ulint page_size, os_offset_t start, ulint len,
-                            bool read_only_mode)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t os_file_write_zeros(pfs_os_file_t file, const char *name,
+                                          ulint page_size, os_offset_t start,
+                                          ulint len, bool read_only_mode);
 
 #ifndef UNIV_NONINL
 /** Class to scan the directory heirarchy using a depth first scan. */
@@ -1899,13 +1885,12 @@
 
 /** Allocate a page for sync IO
 @return pointer to page */
-file::Block *os_alloc_block() noexcept MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] file::Block *os_alloc_block() noexcept;
 
 /** Get the sector aligned frame pointer.
 @param[in]  block   the memory block containing the page frame.
 @return the sector aligned frame pointer. */
-byte *os_block_get_frame(const file::Block *block) noexcept
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] byte *os_block_get_frame(const file::Block *block) noexcept;
 
 /** Free a page after sync IO
 @param[in,out]	block		The block to free/release */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/os0once.h mysql-8.0-8.0.27/storage/innobase/include/os0once.h
--- mysql-8.0-8.0.26/storage/innobase/include/os0once.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/os0once.h	2021-09-28 11:46:34.000000000 +0000
@@ -110,7 +110,7 @@
           case IN_PROGRESS:
             break;
           case NEVER_DONE:
-            /* fall through */
+            [[fallthrough]];
           default:
             ut_error;
         }
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/os0proc.h mysql-8.0-8.0.27/storage/innobase/include/os0proc.h
--- mysql-8.0-8.0.26/storage/innobase/include/os0proc.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/os0proc.h	2021-09-28 11:46:34.000000000 +0000
@@ -36,11 +36,6 @@
 
 #include "univ.i"
 
-#ifdef UNIV_LINUX
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#endif
-
 typedef void *os_process_t;
 typedef unsigned long int os_process_id_t;
 
@@ -58,14 +53,4 @@
 @return process id as a number */
 ulint os_proc_get_number(void);
 
-/** Allocates large pages memory.
-@param[in,out]	n	Number of bytes to allocate
-@return allocated memory */
-void *os_mem_alloc_large(ulint *n);
-
-/** Frees large pages memory.
-@param[in]	ptr	pointer returned by os_mem_alloc_large()
-@param[in]	size	size returned by os_mem_alloc_large() */
-void os_mem_free_large(void *ptr, ulint size);
-
 #endif
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/os0thread-create.h mysql-8.0-8.0.27/storage/innobase/include/os0thread-create.h
--- mysql-8.0-8.0.26/storage/innobase/include/os0thread-create.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/os0thread-create.h	2021-09-28 11:46:34.000000000 +0000
@@ -38,6 +38,7 @@
 #include "univ.i"
 
 #include "os0thread.h"
+#include "sql_thd_internal_api.h"
 
 #include <atomic>
 #include <functional>
@@ -55,7 +56,7 @@
 /** Check if there are threads active.
 @return true if the thread count > 0. */
 inline bool os_thread_any_active() {
-  return (os_thread_count.load(std::memory_order_relaxed) > 0);
+  return os_thread_count.load(std::memory_order_relaxed) > 0;
 }
 
 /** Frees OS thread management data structures. */
@@ -65,22 +66,113 @@
   }
 }
 
-/** Wrapper for a callable, it will count the number of registered
-Runnable instances and will register the thread executing the callable
-with the PFS and the Server threading infrastructure. */
-class Runnable {
+/** Register with MySQL infrastructure. */
+class MySQL_thread {
  public:
 #ifdef UNIV_PFS_THREAD
   /** Constructor for the Runnable object.
-  @param[in]	pfs_key		Performance schema key */
-  explicit Runnable(mysql_pfs_key_t pfs_key) : m_pfs_key(pfs_key) { init(); }
+  @param[in]	pfs_key		Performance schema key
+  @param[in]	pfs_seqnum	Performance schema sequence number */
+  explicit MySQL_thread(mysql_pfs_key_t pfs_key, PSI_thread_seqnum pfs_seqnum)
+      : m_pfs_key(pfs_key), m_pfs_seqnum(pfs_seqnum) {}
 #else
   /** Constructor for the Runnable object.
-  @param[in]	pfs_key		Performance schema key (ignored) */
-  explicit Runnable(mysql_pfs_key_t) { init(); }
+  @param[in]	pfs_key		Performance schema key (ignored)
+  @param[in]	pfs_seqnum	Performance schema sequence number */
+  explicit MySQL_thread(mysql_pfs_key_t, PSI_thread_seqnum) {}
+#endif /* UNIV_PFS_THREAD */
+
+ protected:
+  /** Register the thread with the server */
+  void preamble() {
+    my_thread_init();
+
+#if defined(UNIV_PFS_THREAD) && !defined(UNIV_HOTBACKUP)
+    if (m_pfs_key.m_value != PFS_NOT_INSTRUMENTED.m_value) {
+      auto &value = m_pfs_key.m_value;
+      auto psi = PSI_THREAD_CALL(new_thread)(value, m_pfs_seqnum, this, 0);
+
+      PSI_THREAD_CALL(set_thread_os_id)(psi);
+      PSI_THREAD_CALL(set_thread)(psi);
+    }
+#endif /* UNIV_PFS_THREAD && !UNIV_HOTBACKUP */
+  }
+
+  /** Deregister the thread */
+  void epilogue() {
+    my_thread_end();
+
+#if defined(UNIV_PFS_THREAD) && !defined(UNIV_HOTBACKUP)
+    if (m_pfs_key.m_value != PFS_NOT_INSTRUMENTED.m_value) {
+      PSI_THREAD_CALL(delete_current_thread)();
+    }
+#endif /* UNIV_PFS_THREAD && !UNIV_HOTBACKUP */
+  }
+
+  /** @return a THD instance. */
+  THD *create_mysql_thd() noexcept {
+#ifdef UNIV_PFS_THREAD
+    return create_thd(false, true, true, m_pfs_key.m_value, m_pfs_seqnum);
+#else
+    return create_thd(false, true, true, 0, 0);
 #endif /* UNIV_PFS_THREAD */
+  }
 
+  /** Destroy a THD instance.
+  @param[in,out] thd            Instance to destroy. */
+  void destroy_mysql_thd(THD *thd) noexcept { destroy_thd(thd); }
+
+ protected:
+#ifdef UNIV_PFS_THREAD
+  /** Performance schema key */
+  const mysql_pfs_key_t m_pfs_key;
+
+  /** Performance schema sequence number */
+  PSI_thread_seqnum m_pfs_seqnum;
+#endif /* UNIV_PFS_THREAD */
+};
+
+/** Execute in the context of a non detached MySQL thread. */
+class Runnable : public MySQL_thread {
  public:
+  /** Constructor for the Runnable object.
+  @param[in]	pfs_key		Performance schema key
+  @param[in]	pfs_seqnum	Performance schema sequence number */
+  explicit Runnable(mysql_pfs_key_t pfs_key, PSI_thread_seqnum pfs_seqnum)
+      : MySQL_thread(pfs_key, pfs_seqnum) {}
+
+  /** Method to execute the callable
+  @param[in]	f		Callable object
+  @param[in]	args		Variable number of args to F
+  @retval f return value. */
+  template <typename F, typename... Args>
+  dberr_t operator()(F &&f, Args &&... args) {
+    MySQL_thread::preamble();
+
+    auto task = std::bind(std::forward<F>(f), std::forward<Args>(args)...);
+
+    auto r = task();
+
+    MySQL_thread::epilogue();
+
+    return r;
+  }
+};
+
+/** Wrapper for a callable, it will count the number of registered
+Runnable instances and will register the thread executing the callable
+with the PFS and the Server threading infrastructure. */
+class Detached_thread : public MySQL_thread {
+ public:
+  /** Constructor for the detached thread.
+  @param[in]	pfs_key		Performance schema key
+  @param[in]	pfs_seqnum	Performance schema sequence number */
+  explicit Detached_thread(mysql_pfs_key_t pfs_key,
+                           PSI_thread_seqnum pfs_seqnum)
+      : MySQL_thread(pfs_key, pfs_seqnum) {
+    init();
+  }
+
   /** Method to execute the callable
   @param[in]	f		Callable object
   @param[in]	args		Variable number of args to F */
@@ -105,76 +197,52 @@
     m_thread.set_state(IB_thread::State::STOPPED);
   }
 
+  /** @return thread handle. */
   IB_thread thread() const { return (m_thread); }
 
  private:
+  /** Initializes the m_shared_future, uses the m_promise's get_future,
+  which cannot be used since then, according to its documentation. */
+  void init() { m_thread.init(m_promise); }
+
   /** Register the thread with the server */
   void preamble() {
-    my_thread_init();
-
-#if defined(UNIV_PFS_THREAD) && !defined(UNIV_HOTBACKUP)
-    if (m_pfs_key.m_value != PFS_NOT_INSTRUMENTED.m_value) {
-      PSI_thread *psi;
-
-      psi = PSI_THREAD_CALL(new_thread)(m_pfs_key.m_value, nullptr, 0);
-
-      PSI_THREAD_CALL(set_thread_os_id)(psi);
-      PSI_THREAD_CALL(set_thread)(psi);
-    }
-#endif /* UNIV_PFS_THREAD && !UNIV_HOTBACKUP */
+    MySQL_thread::preamble();
 
     std::atomic_thread_fence(std::memory_order_release);
 
-    int old;
-
-    old = os_thread_count.fetch_add(1, std::memory_order_relaxed);
+    auto old = os_thread_count.fetch_add(1, std::memory_order_relaxed);
 
     ut_a(old <= static_cast<int>(srv_max_n_threads) - 1);
   }
 
   /** Deregister the thread */
   void epilogue() {
+    m_promise.set_value();
+
     std::atomic_thread_fence(std::memory_order_release);
 
-    int old;
+    auto old = os_thread_count.fetch_sub(1, std::memory_order_relaxed);
 
-    old = os_thread_count.fetch_sub(1, std::memory_order_relaxed);
     ut_a(old > 0);
 
-    my_thread_end();
-
-#if defined(UNIV_PFS_THREAD) && !defined(UNIV_HOTBACKUP)
-    if (m_pfs_key.m_value != PFS_NOT_INSTRUMENTED.m_value) {
-      PSI_THREAD_CALL(delete_current_thread)();
-    }
-#endif /* UNIV_PFS_THREAD && !UNIV_HOTBACKUP */
-
-    m_promise.set_value();
+    MySQL_thread::epilogue();
   }
 
  private:
-#ifdef UNIV_PFS_THREAD
-  /** Performance schema key */
-  const mysql_pfs_key_t m_pfs_key;
-#endif /* UNIV_PFS_THREAD */
-
-  /** Promise which is set when task is done. */
-  std::promise<void> m_promise;
-
   /** Future object which keeps the ref counter >= 1 at least
-  as long as the Runnable is non-destroyed. */
+  as long as the Detached_thread is not-destroyed. */
   mutable IB_thread m_thread;
 
-  /** Initializes the m_shared_future, uses the m_promise's get_future,
-  which cannot be used since then, according to its documentation. */
-  void init() { m_thread.init(m_promise); }
+  /** Promise which is set when task is done. */
+  std::promise<void> m_promise;
 };
 
 /** Check if thread is stopped
 @param[in]	thread Thread handle.
 @return true if the thread has started, finished tasks and stopped. */
 inline bool thread_is_stopped(const IB_thread &thread) {
-  return (thread.state() == IB_thread::State::STOPPED);
+  return thread.state() == IB_thread::State::STOPPED;
 }
 
 /** Check if thread is active
@@ -184,7 +252,7 @@
   switch (thread.state()) {
     case IB_thread::State::NOT_STARTED:
       /* Not yet started. */
-      return (false);
+      return false;
 
     case IB_thread::State::ALLOWED_TO_START:
       /* Thread "thread" is already active, but start() has not been called.
@@ -193,22 +261,22 @@
       regarding "thread". That could happen faster than thread's state
       is advanced from ALLOWED_TO_START to STARTED. Therefore we must
       already consider such thread as "active". */
-      return (true);
+      return true;
 
     case IB_thread::State::STARTED:
       /* Note, that potentially the thread might be doing its cleanup after
       it has already ended its task. We still consider it active, until the
       cleanup is finished. */
-      return (true);
+      return true;
 
     case IB_thread::State::STOPPED:
       /* Ended its task and became marked as STOPPED (cleanup finished) */
-      return (false);
+      return false;
 
     case IB_thread::State::INVALID:
     default:
       /* The thread object has not been assigned yet. */
-      return (false);
+      return false;
   }
 
   /* Note that similar goal was achieved by the usage of shared_future:
@@ -225,18 +293,19 @@
 object (any number of copies is allowed). After assigning you are allowed to
 start the thread by calling start() on any of those objects.
 @param[in]	pfs_key   Performance schema thread key
+@param[in]	pfs_seqnum  Performance schema thread sequence number
 @param[in]	f         Callable instance
 @param[in]	args      Zero or more args
 @return Object which allows to start the created thread, monitor its state and
         wait until the thread is finished. */
 template <typename F, typename... Args>
-IB_thread create_detached_thread(mysql_pfs_key_t pfs_key, F &&f,
+IB_thread create_detached_thread(mysql_pfs_key_t pfs_key,
+                                 PSI_thread_seqnum pfs_seqnum, F &&f,
                                  Args &&... args) {
-  Runnable runnable{pfs_key};
-
-  auto thread = runnable.thread();
+  Detached_thread detached_thread{pfs_key, pfs_seqnum};
+  auto thread = detached_thread.thread();
 
-  std::thread t(std::move(runnable), f, args...);
+  std::thread t(std::move(detached_thread), f, args...);
   t.detach();
 
   /* Thread t is doing busy waiting until the state is changed
@@ -244,13 +313,13 @@
   thread.start() will be called. */
   ut_a(thread.state() == IB_thread::State::NOT_STARTED);
 
-  return (thread);
+  return thread;
 }
 
 #ifdef UNIV_PFS_THREAD
 #define os_thread_create(...) create_detached_thread(__VA_ARGS__)
 #else
-#define os_thread_create(k, ...) create_detached_thread(0, __VA_ARGS__)
+#define os_thread_create(k, s, ...) create_detached_thread(0, 0, __VA_ARGS__)
 #endif /* UNIV_PFS_THREAD */
 
 /** Parallel for loop over a container.
@@ -278,7 +347,7 @@
     auto b = c.begin() + (i * slice);
     auto e = b + slice;
 
-    auto worker = os_thread_create(pfs_key, f, b, e, i, args...);
+    auto worker = os_thread_create(pfs_key, i, f, b, e, i, args...);
     worker.start();
 
     workers.push_back(std::move(worker));
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/os0thread.h mysql-8.0-8.0.27/storage/innobase/include/os0thread.h
--- mysql-8.0-8.0.26/storage/innobase/include/os0thread.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/os0thread.h	2021-09-28 11:46:34.000000000 +0000
@@ -57,12 +57,22 @@
   std::shared_future<void> m_shared_future;
   std::shared_ptr<std::atomic<State>> m_state;
 
-  friend class Runnable;
-
   void init(std::promise<void> &promise);
   void set_state(State state);
+
+  friend class Detached_thread;
 };
 
+/** Operating system thread native handle */
+using os_thread_id_t = std::thread::native_handle_type;
+
+/** The thread sleeps at least the time given in microseconds.
+@param[in]	usecs		time in microseconds */
+#define os_thread_sleep(usecs)                                     \
+  do {                                                             \
+    std::this_thread::sleep_for(std::chrono::microseconds(usecs)); \
+  } while (false)
+
 /** Returns the string representation of the thread ID supplied. It uses the
  only standard-compliant way of printing the thread ID.
  @param thread_id The thread ID to convert to string.
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/page0cur.h mysql-8.0-8.0.27/storage/innobase/include/page0cur.h
--- mysql-8.0-8.0.26/storage/innobase/include/page0cur.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/page0cur.h	2021-09-28 11:46:34.000000000 +0000
@@ -113,17 +113,16 @@
  or by invoking ibuf_reset_free_bits() before mtr_commit().
 
  @return pointer to record if succeed, NULL otherwise */
-static inline rec_t *page_cur_tuple_insert(
+[[nodiscard]] static inline rec_t *page_cur_tuple_insert(
     page_cur_t *cursor,    /*!< in/out: a page cursor */
     const dtuple_t *tuple, /*!< in: pointer to a data tuple */
     dict_index_t *index,   /*!< in: record descriptor */
     ulint **offsets,       /*!< out: offsets on *rec */
     mem_heap_t **heap,     /*!< in/out: pointer to memory heap, or NULL */
     mtr_t *mtr,            /*!< in: mini-transaction handle, or NULL */
-    bool use_cache = false)
-    /*!< in: if true, then use record cache to
-    hold the tuple converted record. */
-    MY_ATTRIBUTE((warn_unused_result));
+    bool use_cache = false);
+/*!< in: if true, then use record cache to
+hold the tuple converted record. */
 #endif /* !UNIV_HOTBACKUP */
 
 /** Inserts a record next to page cursor. Returns pointer to inserted record
@@ -150,14 +149,13 @@
  Returns pointer to inserted record if succeed, i.e., enough
  space available, NULL otherwise. The cursor stays at the same position.
  @return pointer to record if succeed, NULL otherwise */
-rec_t *page_cur_insert_rec_low(
+[[nodiscard]] rec_t *page_cur_insert_rec_low(
     rec_t *current_rec,  /*!< in: pointer to current record after
                      which the new record is inserted */
     dict_index_t *index, /*!< in: record descriptor */
     const rec_t *rec,    /*!< in: pointer to a physical record */
     ulint *offsets,      /*!< in/out: rec_get_offsets(rec, index) */
-    mtr_t *mtr)          /*!< in: mini-transaction handle, or NULL */
-    MY_ATTRIBUTE((warn_unused_result));
+    mtr_t *mtr);         /*!< in: mini-transaction handle, or NULL */
 
 /** Inserts a record next to page cursor on an uncompressed page.
 @param[in]	current_rec	Pointer to current record after which
@@ -183,13 +181,12 @@
  or by invoking ibuf_reset_free_bits() before mtr_commit().
 
  @return pointer to record if succeed, NULL otherwise */
-rec_t *page_cur_insert_rec_zip(
+[[nodiscard]] rec_t *page_cur_insert_rec_zip(
     page_cur_t *cursor,  /*!< in/out: page cursor */
     dict_index_t *index, /*!< in: record descriptor */
     const rec_t *rec,    /*!< in: pointer to a physical record */
     ulint *offsets,      /*!< in/out: rec_get_offsets(rec, index) */
-    mtr_t *mtr)          /*!< in: mini-transaction handle, or NULL */
-    MY_ATTRIBUTE((warn_unused_result));
+    mtr_t *mtr);         /*!< in: mini-transaction handle, or NULL */
 /** Copies records from page to a newly created page, from a given record
  onward, including that record. Infimum and supremum records are not copied.
 
@@ -313,10 +310,17 @@
 /** Index page cursor */
 
 struct page_cur_t {
+  /** Index the cursor is on. */
   const dict_index_t *index{nullptr};
-  rec_t *rec{nullptr}; /*!< pointer to a record on page */
+
+  /** pointer to a record on page */
+  rec_t *rec{nullptr};
+
+  /** Current offsets of the record. */
   ulint *offsets{nullptr};
-  buf_block_t *block{nullptr}; /*!< pointer to the block containing rec */
+
+  /** Pointer to the current block containing rec. */
+  buf_block_t *block{nullptr};
 };
 
 #include "page0cur.ic"
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/page0page.h mysql-8.0-8.0.27/storage/innobase/include/page0page.h
--- mysql-8.0-8.0.26/storage/innobase/include/page0page.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/page0page.h	2021-09-28 11:46:34.000000000 +0000
@@ -164,9 +164,9 @@
 
 /** Returns the offset stored in the given header field.
  @return offset from the start of the page, or 0 */
-static inline ulint page_header_get_offs(const page_t *page, /*!< in: page */
-                                         ulint field) /*!< in: PAGE_FREE, ... */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ulint page_header_get_offs(
+    const page_t *page, /*!< in: page */
+    ulint field);       /*!< in: PAGE_FREE, ... */
 
 /** Returns the pointer stored in the given header field, or NULL. */
 #define page_header_get_ptr(page, field)          \
@@ -209,26 +209,25 @@
 /** Returns the nth record of the record list.
  This is the inverse function of page_rec_get_n_recs_before().
  @return nth record */
-const rec_t *page_rec_get_nth_const(const page_t *page, /*!< in: page */
-                                    ulint nth)          /*!< in: nth record */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] const rec_t *page_rec_get_nth_const(
+    const page_t *page, /*!< in: page */
+    ulint nth);         /*!< in: nth record */
 
 /** Returns the nth record of the record list.
 This is the inverse function of page_rec_get_n_recs_before().
 @param[in]	page	page
 @param[in]	nth	nth record
 @return nth record */
-static inline rec_t *page_rec_get_nth(page_t *page, ulint nth)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline rec_t *page_rec_get_nth(page_t *page, ulint nth);
 
 #ifndef UNIV_HOTBACKUP
 /** Returns the middle record of the records on the page. If there is an
  even number of records in the list, returns the first record of the
  upper half-list.
  @return middle record */
-static inline rec_t *page_get_middle_rec(page_t *page) /*!< in: page */
-    MY_ATTRIBUTE((warn_unused_result));
-#endif /* !UNIV_HOTBACKUP */
+[[nodiscard]] static inline rec_t *page_get_middle_rec(
+    page_t *page); /*!< in: page */
+#endif             /* !UNIV_HOTBACKUP */
 /** Gets the page number.
  @return page number */
 static inline page_no_t page_get_page_no(const page_t *page); /*!< in: page */
@@ -338,21 +337,20 @@
     const rec_t *rec); /*!< in: the physical record */
 /** Determine whether the page is a B-tree leaf.
  @return true if the page is a B-tree leaf (PAGE_LEVEL = 0) */
-static inline bool page_is_leaf(const page_t *page) /*!< in: page */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline bool page_is_leaf(
+    const page_t *page); /*!< in: page */
 /** Determine whether the page is empty.
  @return true if the page is empty (PAGE_N_RECS = 0) */
-static inline bool page_is_empty(const page_t *page) /*!< in: page */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline bool page_is_empty(
+    const page_t *page); /*!< in: page */
 /** Determine whether a page is an index root page.
 @param[in]	page	page frame
 @return true if the page is a root page of an index */
-static inline bool page_is_root(const page_t *page)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline bool page_is_root(const page_t *page);
 /** Determine whether the page contains garbage.
  @return true if the page contains garbage (PAGE_GARBAGE is not 0) */
-static inline bool page_has_garbage(const page_t *page) /*!< in: page */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline bool page_has_garbage(
+    const page_t *page); /*!< in: page */
 
 /** Gets the pointer to the next record on the page.
 @param[in]	rec	pointer to record
@@ -406,35 +404,35 @@
 
 /** TRUE if the record is a user record on the page.
  @return true if a user record */
-static inline ibool page_rec_is_user_rec(const rec_t *rec) /*!< in: record */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ibool page_rec_is_user_rec(
+    const rec_t *rec); /*!< in: record */
 /** TRUE if the record is the supremum record on a page.
  @return true if the supremum record */
-static inline ibool page_rec_is_supremum(const rec_t *rec) /*!< in: record */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ibool page_rec_is_supremum(
+    const rec_t *rec); /*!< in: record */
 
 /** TRUE if the record is the infimum record on a page.
  @return true if the infimum record */
-static inline ibool page_rec_is_infimum(const rec_t *rec) /*!< in: record */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ibool page_rec_is_infimum(
+    const rec_t *rec); /*!< in: record */
 
 /** true if the record is the first user record on a page.
  @return true if the first user record */
-static inline bool page_rec_is_first(const rec_t *rec,   /*!< in: record */
-                                     const page_t *page) /*!< in: page */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline bool page_rec_is_first(
+    const rec_t *rec,    /*!< in: record */
+    const page_t *page); /*!< in: page */
 
 /** true if the record is the second user record on a page.
  @return true if the second user record */
-static inline bool page_rec_is_second(const rec_t *rec,   /*!< in: record */
-                                      const page_t *page) /*!< in: page */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline bool page_rec_is_second(
+    const rec_t *rec,    /*!< in: record */
+    const page_t *page); /*!< in: page */
 
 /** true if the record is the last user record on a page.
  @return true if the last user record */
-static inline bool page_rec_is_last(const rec_t *rec,   /*!< in: record */
-                                    const page_t *page) /*!< in: page */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline bool page_rec_is_last(
+    const rec_t *rec,    /*!< in: record */
+    const page_t *page); /*!< in: page */
 
 /** true if distance between the records (measured in number of times we have to
 move to the next record) is at most the specified value
@@ -442,16 +440,14 @@
 @param[in]  right_rec   righter record
 @param[in]  val         specified value to compare
 @return true if the distance is smaller than the value */
-static inline bool page_rec_distance_is_at_most(const rec_t *left_rec,
-                                                const rec_t *right_rec,
-                                                ulint val)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline bool page_rec_distance_is_at_most(
+    const rec_t *left_rec, const rec_t *right_rec, ulint val);
 
 /** true if the record is the second last user record on a page.
  @return true if the second last user record */
-static inline bool page_rec_is_second_last(const rec_t *rec, /*!< in: record */
-                                           const page_t *page) /*!< in: page */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline bool page_rec_is_second_last(
+    const rec_t *rec,    /*!< in: record */
+    const page_t *page); /*!< in: page */
 
 /** Looks for the record which owns the given record.
  @return the owner record */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/page0types.h mysql-8.0-8.0.27/storage/innobase/include/page0types.h
--- mysql-8.0-8.0.26/storage/innobase/include/page0types.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/page0types.h	2021-09-28 11:46:34.000000000 +0000
@@ -245,7 +245,7 @@
 
 /** Compression statistics types */
 typedef std::map<index_id_t, page_zip_stat_t, std::less<index_id_t>,
-                 ut_allocator<std::pair<const index_id_t, page_zip_stat_t>>>
+                 ut::allocator<std::pair<const index_id_t, page_zip_stat_t>>>
     page_zip_stat_per_index_t;
 
 /** Statistics on compression, indexed by page_zip_des_t::ssize - 1 */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/page0zip.h mysql-8.0-8.0.27/storage/innobase/include/page0zip.h
--- mysql-8.0-8.0.26/storage/innobase/include/page0zip.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/page0zip.h	2021-09-28 11:46:34.000000000 +0000
@@ -87,10 +87,8 @@
 tablespace is not compressed
 @param[in]	page_size	page size
 @return false if the entire record can be stored locally on the page */
-static inline ibool page_zip_rec_needs_ext(ulint rec_size, ulint comp,
-                                           ulint n_fields,
-                                           const page_size_t &page_size)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ibool page_zip_rec_needs_ext(
+    ulint rec_size, ulint comp, ulint n_fields, const page_size_t &page_size);
 #endif /* !UNIV_HOTBACKUP */
 
 /** Determine the guaranteed free space on an empty page.
@@ -174,20 +172,18 @@
 /** Determine how big record can be inserted without recompressing the page.
  @return a positive number indicating the maximum size of a record
  whose insertion is guaranteed to succeed, or zero or negative */
-static inline lint page_zip_max_ins_size(
+[[nodiscard]] static inline lint page_zip_max_ins_size(
     const page_zip_des_t *page_zip, /*!< in: compressed page */
-    ibool is_clust)                 /*!< in: TRUE if clustered index */
-    MY_ATTRIBUTE((warn_unused_result));
+    ibool is_clust);                /*!< in: TRUE if clustered index */
 
 /** Determine if enough space is available in the modification log.
  @return true if page_zip_write_rec() will succeed */
-static inline ibool page_zip_available(
+[[nodiscard]] static inline ibool page_zip_available(
     const page_zip_des_t *page_zip, /*!< in: compressed page */
     bool is_clust,                  /*!< in: TRUE if clustered index */
     ulint length,                   /*!< in: combined size of the record */
-    ulint create)                   /*!< in: nonzero=add the record to
-                                    the heap */
-    MY_ATTRIBUTE((warn_unused_result));
+    ulint create);                  /*!< in: nonzero=add the record to
+                                   the heap */
 
 /** Write data to the uncompressed header portion of a page.  The data must
 already have been written to the uncompressed page.
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/pars0pars.h mysql-8.0-8.0.27/storage/innobase/include/pars0pars.h
--- mysql-8.0-8.0.26/storage/innobase/include/pars0pars.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/pars0pars.h	2021-09-28 11:46:34.000000000 +0000
@@ -311,10 +311,10 @@
 @param[in]	heap		memory heap from which allocated
 @param[in]	prebuilt	row prebuilt structure
 @return query thread node to run */
-que_thr_t *pars_complete_graph_for_exec(que_node_t *node, trx_t *trx,
-                                        mem_heap_t *heap,
-                                        row_prebuilt_t *prebuilt)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] que_thr_t *pars_complete_graph_for_exec(que_node_t *node,
+                                                      trx_t *trx,
+                                                      mem_heap_t *heap,
+                                                      row_prebuilt_t *prebuilt);
 
 /** Create parser info struct.
  @return own: info struct */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/read0types.h mysql-8.0-8.0.27/storage/innobase/include/read0types.h
--- mysql-8.0-8.0.26/storage/innobase/include/read0types.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/read0types.h	2021-09-28 11:46:34.000000000 +0000
@@ -56,7 +56,7 @@
 
     /**
     Destructor */
-    ~ids_t() { UT_DELETE_ARRAY(m_ptr); }
+    ~ids_t() { ut::delete_arr(m_ptr); }
 
     /** Try and increase the size of the array. Old elements are copied across.
     It is a no-op if n is < current size.
@@ -159,8 +159,8 @@
   @param[in]	id	transaction id to check against the view
   @param[in]	name	table name
   @return whether the view sees the modifications of id. */
-  bool changes_visible(trx_id_t id, const table_name_t &name) const
-      MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] bool changes_visible(trx_id_t id,
+                                     const table_name_t &name) const {
     ut_ad(id > 0);
 
     if (id < m_up_limit_id || id == m_creator_trx_id) {
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/rem0cmp.h mysql-8.0-8.0.27/storage/innobase/include/rem0cmp.h
--- mysql-8.0-8.0.26/storage/innobase/include/rem0cmp.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/rem0cmp.h	2021-09-28 11:46:34.000000000 +0000
@@ -69,9 +69,9 @@
 @retval 0 if data1 is equal to data2
 @retval negative if data1 is less than data2
 @retval positive if data1 is greater than data2 */
-int cmp_data_data(ulint mtype, ulint prtype, bool is_asc, const byte *data1,
-                  ulint len1, const byte *data2, ulint len2)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] int cmp_data_data(ulint mtype, ulint prtype, bool is_asc,
+                                const byte *data1, ulint len1,
+                                const byte *data2, ulint len2);
 
 /** Compare two data fields.
 @param[in]	dfield1	data field; must have type field set
@@ -81,18 +81,17 @@
 @retval 0 if dfield1 is equal to dfield2
 @retval negative if dfield1 is less than dfield2
 @retval positive if dfield1 is greater than dfield2 */
-static inline int cmp_dfield_dfield(const dfield_t *dfield1,
-                                    const dfield_t *dfield2, bool is_asc)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline int cmp_dfield_dfield(const dfield_t *dfield1,
+                                                  const dfield_t *dfield2,
+                                                  bool is_asc);
 
 /** Compare two data fields, the first one can be of any form of multi-value
 field, while the second one must be one field from multi-value index
 @param[in]	dfield1	multi-value data field;
 @param[in]	dfield2	data field; must have type field set
 @return 0 if dfield1 has dfield2 or they are equal if both NULL, otherwise 1 */
-static inline int cmp_multi_value_dfield_dfield(const dfield_t *dfield1,
-                                                const dfield_t *dfield2)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline int cmp_multi_value_dfield_dfield(
+    const dfield_t *dfield1, const dfield_t *dfield2);
 
 /** Compare a GIS data tuple to a physical record.
 @param[in] dtuple data tuple
@@ -145,11 +144,9 @@
 @retval 0 if dtuple is equal to rec
 @retval negative if dtuple is less than rec
 @retval positive if dtuple is greater than rec */
-int cmp_dtuple_rec_with_match_bytes(const dtuple_t *dtuple, const rec_t *rec,
-                                    const dict_index_t *index,
-                                    const ulint *offsets, ulint *matched_fields,
-                                    ulint *matched_bytes)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] int cmp_dtuple_rec_with_match_bytes(
+    const dtuple_t *dtuple, const rec_t *rec, const dict_index_t *index,
+    const ulint *offsets, ulint *matched_fields, ulint *matched_bytes);
 /** Compare a data tuple to a physical record.
 @see cmp_dtuple_rec_with_match
 @param[in]	dtuple	data tuple
@@ -160,34 +157,33 @@
 @retval 0 if dtuple is equal to rec
 @retval negative if dtuple is less than rec
 @retval positive if dtuple is greater than rec */
-int cmp_dtuple_rec(const dtuple_t *dtuple, const rec_t *rec,
-                   const dict_index_t *index, const ulint *offsets)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] int cmp_dtuple_rec(const dtuple_t *dtuple, const rec_t *rec,
+                                 const dict_index_t *index,
+                                 const ulint *offsets);
 /** Check if a dtuple is a prefix of a record.
 @param[in]	dtuple	data tuple
 @param[in]	rec	B-tree record
 @param[in]	index	B-tree index
 @param[in]	offsets	rec_get_offsets(rec)
 @return true if prefix */
-bool cmp_dtuple_is_prefix_of_rec(const dtuple_t *dtuple, const rec_t *rec,
-                                 const dict_index_t *index,
-                                 const ulint *offsets)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool cmp_dtuple_is_prefix_of_rec(const dtuple_t *dtuple,
+                                               const rec_t *rec,
+                                               const dict_index_t *index,
+                                               const ulint *offsets);
 /** Compare two physical records that contain the same number of columns,
 none of which are stored externally.
 @retval positive if rec1 (including non-ordering columns) is greater than rec2
 @retval negative if rec1 (including non-ordering columns) is less than rec2
 @retval 0 if rec1 is a duplicate of rec2 */
-int cmp_rec_rec_simple(
+[[nodiscard]] int cmp_rec_rec_simple(
     const rec_t *rec1,         /*!< in: physical record */
     const rec_t *rec2,         /*!< in: physical record */
     const ulint *offsets1,     /*!< in: rec_get_offsets(rec1, ...) */
     const ulint *offsets2,     /*!< in: rec_get_offsets(rec2, ...) */
     const dict_index_t *index, /*!< in: data dictionary index */
-    struct TABLE *table)       /*!< in: MySQL table, for reporting
-                               duplicate key value if applicable,
-                               or NULL */
-    MY_ATTRIBUTE((warn_unused_result));
+    struct TABLE *table);      /*!< in: MySQL table, for reporting
+                              duplicate key value if applicable,
+                              or NULL */
 /** Compare two B-tree records.
 @param[in] rec1 B-tree record
 @param[in] rec2 B-tree record
@@ -239,9 +235,8 @@
 @return the comparison result of dfield1 and dfield2
 @retval true if dfield1 is equal to dfield2, or a prefix of dfield1
 @retval false otherwise */
-static inline bool cmp_dfield_dfield_eq_prefix(const dfield_t *dfield1,
-                                               const dfield_t *dfield2)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline bool cmp_dfield_dfield_eq_prefix(
+    const dfield_t *dfield1, const dfield_t *dfield2);
 #endif /* !UNIV_HOTBACKUP */
 
 #include "rem0cmp.ic"
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/rem0cmp.ic mysql-8.0-8.0.27/storage/innobase/include/rem0cmp.ic
--- mysql-8.0-8.0.26/storage/innobase/include/rem0cmp.ic	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/rem0cmp.ic	2021-09-28 11:46:34.000000000 +0000
@@ -156,9 +156,9 @@
   }
 
 #ifdef UNIV_NO_ERR_MSGS
-  ib::fatal()
+  ib::fatal(UT_LOCATION_HERE)
 #else
-  ib::fatal(ER_IB_MSG_627)
+  ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_627)
 #endif /* !UNIV_NO_ERR_MSGS */
       << "Unable to find charset-collation " << cs_num;
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/rem0rec.h mysql-8.0-8.0.27/storage/innobase/include/rem0rec.h
--- mysql-8.0-8.0.26/storage/innobase/include/rem0rec.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/rem0rec.h	2021-09-28 11:46:34.000000000 +0000
@@ -49,24 +49,21 @@
 /** The following function is used to get the pointer of the next chained record
  on the same page.
  @return pointer to the next chained record, or NULL if none */
-static inline const rec_t *rec_get_next_ptr_const(
+[[nodiscard]] static inline const rec_t *rec_get_next_ptr_const(
     const rec_t *rec, /*!< in: physical record */
-    ulint comp)       /*!< in: nonzero=compact page format */
-    MY_ATTRIBUTE((warn_unused_result));
+    ulint comp);      /*!< in: nonzero=compact page format */
 /** The following function is used to get the pointer of the next chained record
  on the same page.
  @return pointer to the next chained record, or NULL if none */
-static inline rec_t *rec_get_next_ptr(
-    rec_t *rec, /*!< in: physical record */
-    ulint comp) /*!< in: nonzero=compact page format */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline rec_t *rec_get_next_ptr(
+    rec_t *rec,  /*!< in: physical record */
+    ulint comp); /*!< in: nonzero=compact page format */
 /** The following function is used to get the offset of the
  next chained record on the same page.
  @return the page offset of the next chained record, or 0 if none */
-static inline ulint rec_get_next_offs(
+[[nodiscard]] static inline ulint rec_get_next_offs(
     const rec_t *rec, /*!< in: physical record */
-    ulint comp)       /*!< in: nonzero=compact page format */
-    MY_ATTRIBUTE((warn_unused_result));
+    ulint comp);      /*!< in: nonzero=compact page format */
 
 /** The following function is used to set the next record offset field of an
 old-style record.
@@ -81,9 +78,8 @@
 /** The following function is used to get the number of records owned by the
  previous directory record.
  @return number of owned records */
-static inline ulint rec_get_n_owned_old(
-    const rec_t *rec) /*!< in: old-style physical record */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ulint rec_get_n_owned_old(
+    const rec_t *rec); /*!< in: old-style physical record */
 
 /** The following function is used to set the number of owned records.
 @param[in]	rec		old-style physical record
@@ -93,9 +89,8 @@
 /** The following function is used to get the number of records owned by the
  previous directory record.
  @return number of owned records */
-static inline ulint rec_get_n_owned_new(
-    const rec_t *rec) /*!< in: new-style physical record */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ulint rec_get_n_owned_new(
+    const rec_t *rec); /*!< in: new-style physical record */
 
 /** The following function is used to set the number of owned records.
 @param[in,out]	rec		new-style physical record
@@ -122,10 +117,9 @@
 /** The following function is used to retrieve the info and status
  bits of a record.  (Only compact records have status bits.)
  @return info bits */
-static inline ulint rec_get_info_and_status_bits(
+[[nodiscard]] static inline ulint rec_get_info_and_status_bits(
     const rec_t *rec, /*!< in: physical record */
-    ulint comp)       /*!< in: nonzero=compact page format */
-    MY_ATTRIBUTE((warn_unused_result));
+    ulint comp);      /*!< in: nonzero=compact page format */
 
 /** The following function is used to set the info and status bits of a record.
 (Only compact records have status bits.)
@@ -135,10 +129,9 @@
 
 /** The following function tells if record is delete marked.
  @return nonzero if delete marked */
-static inline ulint rec_get_deleted_flag(
+[[nodiscard]] static inline ulint rec_get_deleted_flag(
     const rec_t *rec, /*!< in: physical record */
-    ulint comp)       /*!< in: nonzero=compact page format */
-    MY_ATTRIBUTE((warn_unused_result));
+    ulint comp);      /*!< in: nonzero=compact page format */
 
 /** The following function is used to set the deleted bit.
 @param[in]	rec		old-style physical record
@@ -160,16 +153,14 @@
 
 /** The following function tells if a new-style record is a node pointer.
  @return true if node pointer */
-static inline bool rec_get_node_ptr_flag(
-    const rec_t *rec) /*!< in: physical record */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline bool rec_get_node_ptr_flag(
+    const rec_t *rec); /*!< in: physical record */
 
 /** The following function is used to get the order number of an old-style
 record in the heap of the index page.
 @param[in]	rec	physical record
 @return heap order number */
-static inline ulint rec_get_heap_no_old(const rec_t *rec)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ulint rec_get_heap_no_old(const rec_t *rec);
 
 /** The following function is used to set the heap number field in an old-style
 record.
@@ -181,8 +172,7 @@
 record in the heap of the index page.
 @param[in]	rec	physical record
 @return heap order number */
-static inline ulint rec_get_heap_no_new(const rec_t *rec)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ulint rec_get_heap_no_new(const rec_t *rec);
 
 /** The following function is used to set the heap number field in a new-style
 record.
@@ -193,9 +183,8 @@
 /** The following function is used to test whether the data offsets
  in the record are stored in one-byte or two-byte format.
  @return true if 1-byte form */
-static inline ibool rec_get_1byte_offs_flag(
-    const rec_t *rec) /*!< in: physical record */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ibool rec_get_1byte_offs_flag(
+    const rec_t *rec); /*!< in: physical record */
 
 /** The following function is used to set the 1-byte offsets flag.
 @param[in]	rec	physical record
@@ -206,36 +195,33 @@
  offsets form. If the field is SQL null, the flag is ORed in the returned
  value.
  @return offset of the start of the field, SQL null flag ORed */
-static inline ulint rec_1_get_field_end_info(
+[[nodiscard]] static inline ulint rec_1_get_field_end_info(
     const rec_t *rec, /*!< in: record */
-    ulint n)          /*!< in: field index */
-    MY_ATTRIBUTE((warn_unused_result));
+    ulint n);         /*!< in: field index */
 
 /** Returns the offset of nth field end if the record is stored in the 2-byte
  offsets form. If the field is SQL null, the flag is ORed in the returned
  value.
  @return offset of the start of the field, SQL null flag and extern
  storage flag ORed */
-static inline ulint rec_2_get_field_end_info(
+[[nodiscard]] static inline ulint rec_2_get_field_end_info(
     const rec_t *rec, /*!< in: record */
-    ulint n)          /*!< in: field index */
-    MY_ATTRIBUTE((warn_unused_result));
+    ulint n);         /*!< in: field index */
 
 /** Returns nonzero if the field is stored off-page.
  @retval 0 if the field is stored in-page
  @retval REC_2BYTE_EXTERN_MASK if the field is stored externally */
-static inline ulint rec_2_is_field_extern(const rec_t *rec, /*!< in: record */
-                                          ulint n) /*!< in: field index */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ulint rec_2_is_field_extern(
+    const rec_t *rec, /*!< in: record */
+    ulint n);         /*!< in: field index */
 
 /** Determine how many of the first n columns in a compact
  physical record are stored externally.
  @return number of externally stored columns */
-ulint rec_get_n_extern_new(
+[[nodiscard]] ulint rec_get_n_extern_new(
     const rec_t *rec,          /*!< in: compact physical record */
     const dict_index_t *index, /*!< in: record descriptor */
-    ulint n)                   /*!< in: number of columns to scan */
-    MY_ATTRIBUTE((warn_unused_result));
+    ulint n);                  /*!< in: number of columns to scan */
 
 #ifdef UNIV_DEBUG
 #define rec_get_offsets(rec, index, offsets, n, heap) \
@@ -270,10 +256,9 @@
  Also an SQL null may have a field of size > 0,
  if the data type is of a fixed size.
  @return field size in bytes */
-static inline ulint rec_get_nth_field_size(
+[[nodiscard]] static inline ulint rec_get_nth_field_size(
     const rec_t *rec, /*!< in: record */
-    ulint n)          /*!< in: index of the field */
-    MY_ATTRIBUTE((warn_unused_result));
+    ulint n);         /*!< in: index of the field */
 
 /** The following function is used to get an offset to the nth data field in a
 record.
@@ -337,27 +322,23 @@
 /** Determine if the offsets are for a record in the new
  compact format.
  @return nonzero if compact format */
-static inline ulint rec_offs_comp(
-    const ulint *offsets) /*!< in: array returned by rec_get_offsets() */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ulint rec_offs_comp(
+    const ulint *offsets); /*!< in: array returned by rec_get_offsets() */
 /** Determine if the offsets are for a record containing
  externally stored columns.
  @return nonzero if externally stored */
-static inline ulint rec_offs_any_extern(
-    const ulint *offsets) /*!< in: array returned by rec_get_offsets() */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ulint rec_offs_any_extern(
+    const ulint *offsets); /*!< in: array returned by rec_get_offsets() */
 /** Determine if the offsets are for a record containing null BLOB pointers.
  @return first field containing a null BLOB pointer, or NULL if none found */
-static inline const byte *rec_offs_any_null_extern(
-    const rec_t *rec,     /*!< in: record */
-    const ulint *offsets) /*!< in: rec_get_offsets(rec) */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline const byte *rec_offs_any_null_extern(
+    const rec_t *rec,      /*!< in: record */
+    const ulint *offsets); /*!< in: rec_get_offsets(rec) */
 /** Returns nonzero if the extern bit is set in nth field of rec.
  @return nonzero if externally stored */
-static inline ulint rec_offs_nth_extern(
+[[nodiscard]] static inline ulint rec_offs_nth_extern(
     const ulint *offsets, /*!< in: array returned by rec_get_offsets() */
-    ulint n)              /*!< in: nth field */
-    MY_ATTRIBUTE((warn_unused_result));
+    ulint n);             /*!< in: nth field */
 
 /** Mark the nth field as externally stored.
 @param[in]	offsets		array returned by rec_get_offsets()
@@ -365,10 +346,9 @@
 void rec_offs_make_nth_extern(ulint *offsets, const ulint n);
 /** Returns nonzero if the SQL NULL bit is set in nth field of rec.
  @return nonzero if SQL NULL */
-static inline ulint rec_offs_nth_sql_null(
+[[nodiscard]] static inline ulint rec_offs_nth_sql_null(
     const ulint *offsets, /*!< in: array returned by rec_get_offsets() */
-    ulint n)              /*!< in: nth field */
-    MY_ATTRIBUTE((warn_unused_result));
+    ulint n);             /*!< in: nth field */
 
 /** Returns nonzero if the default bit is set in nth field of rec.
 @return	nonzero if default bit is set */
@@ -376,16 +356,14 @@
 
 /** Gets the physical size of a field.
  @return length of field */
-static inline ulint rec_offs_nth_size(
+[[nodiscard]] static inline ulint rec_offs_nth_size(
     const ulint *offsets, /*!< in: array returned by rec_get_offsets() */
-    ulint n)              /*!< in: nth field */
-    MY_ATTRIBUTE((warn_unused_result));
+    ulint n);             /*!< in: nth field */
 
 /** Returns the number of extern bits set in a record.
  @return number of externally stored fields */
-static inline ulint rec_offs_n_extern(
-    const ulint *offsets) /*!< in: array returned by rec_get_offsets() */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ulint rec_offs_n_extern(
+    const ulint *offsets); /*!< in: array returned by rec_get_offsets() */
 
 /** This is used to modify the value of an already existing field in a record.
 The previous value must have exactly the same size as the new value. If len is
@@ -408,9 +386,8 @@
  are counted as length 0 fields. The value returned by the function
  is the distance from record origin to record end in bytes.
  @return size */
-static inline ulint rec_get_data_size_old(
-    const rec_t *rec) /*!< in: physical record */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ulint rec_get_data_size_old(
+    const rec_t *rec); /*!< in: physical record */
 #define rec_offs_init(offsets) \
   rec_offs_set_n_alloc(offsets, (sizeof offsets) / sizeof *offsets)
 
@@ -493,35 +470,30 @@
  are counted as length 0 fields. The value returned by the function
  is the distance from record origin to record end in bytes.
  @return size */
-static inline ulint rec_offs_data_size(
-    const ulint *offsets) /*!< in: array returned by rec_get_offsets() */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ulint rec_offs_data_size(
+    const ulint *offsets); /*!< in: array returned by rec_get_offsets() */
 /** Returns the total size of record minus data size of record.
  The value returned by the function is the distance from record
  start to record origin in bytes.
  @return size */
-static inline ulint rec_offs_extra_size(
-    const ulint *offsets) /*!< in: array returned by rec_get_offsets() */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ulint rec_offs_extra_size(
+    const ulint *offsets); /*!< in: array returned by rec_get_offsets() */
 /** Returns the total size of a physical record.
  @return size */
-static inline ulint rec_offs_size(
-    const ulint *offsets) /*!< in: array returned by rec_get_offsets() */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ulint rec_offs_size(
+    const ulint *offsets); /*!< in: array returned by rec_get_offsets() */
 #ifdef UNIV_DEBUG
 /** Returns a pointer to the start of the record.
  @return pointer to start */
-static inline byte *rec_get_start(
-    const rec_t *rec,     /*!< in: pointer to record */
-    const ulint *offsets) /*!< in: array returned by rec_get_offsets() */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline byte *rec_get_start(
+    const rec_t *rec,      /*!< in: pointer to record */
+    const ulint *offsets); /*!< in: array returned by rec_get_offsets() */
 /** Returns a pointer to the end of the record.
  @return pointer to end */
-static inline byte *rec_get_end(
-    const rec_t *rec,     /*!< in: pointer to record */
-    const ulint *offsets) /*!< in: array returned by rec_get_offsets() */
-    MY_ATTRIBUTE((warn_unused_result));
-#else /* UNIV_DEBUG */
+[[nodiscard]] static inline byte *rec_get_end(
+    const rec_t *rec,      /*!< in: pointer to record */
+    const ulint *offsets); /*!< in: array returned by rec_get_offsets() */
+#else                      /* UNIV_DEBUG */
 #define rec_get_start(rec, offsets) ((rec)-rec_offs_extra_size(offsets))
 #define rec_get_end(rec, offsets) ((rec) + rec_offs_data_size(offsets))
 #endif /* UNIV_DEBUG */
@@ -537,26 +509,25 @@
 #ifndef UNIV_HOTBACKUP
 /** Determines the size of a data tuple prefix in a temporary file.
  @return total size */
-ulint rec_get_converted_size_temp(
+[[nodiscard]] ulint rec_get_serialize_size(
     const dict_index_t *index, /*!< in: record descriptor */
     const dfield_t *fields,    /*!< in: array of data fields */
     ulint n_fields,            /*!< in: number of data fields */
     const dtuple_t *v_entry,   /*!< in: dtuple contains virtual column
                                data */
-    ulint *extra)              /*!< out: extra size */
-    MY_ATTRIBUTE((warn_unused_result));
+    ulint *extra);             /*!< out: extra size */
 
 /** Determine the offset to each field in temporary file.
- @see rec_convert_dtuple_to_temp() */
-void rec_init_offsets_temp(
+ @see rec_serialize_dtuple() */
+void rec_deserialize_init_offsets(
     const rec_t *rec,          /*!< in: temporary file record */
     const dict_index_t *index, /*!< in: record descriptor */
     ulint *offsets);           /*!< in/out: array of offsets;
                               in: n=rec_offs_n_fields(offsets) */
 
 /** Builds a temporary file record out of a data tuple.
- @see rec_init_offsets_temp() */
-void rec_convert_dtuple_to_temp(
+ @see rec_deserialize_init_offsets() */
+void rec_serialize_dtuple(
     rec_t *rec,                /*!< out: record */
     const dict_index_t *index, /*!< in: record descriptor */
     const dfield_t *fields,    /*!< in: array of data fields */
@@ -585,20 +556,19 @@
 @param[in]	fold		fold value of the index identifier
 @param[in]	index		index where the record resides
 @return the folded value */
-static inline ulint rec_fold(const rec_t *rec, const ulint *offsets,
-                             ulint n_fields, ulint n_bytes, ulint fold,
-                             const dict_index_t *index)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ulint rec_fold(const rec_t *rec,
+                                           const ulint *offsets, ulint n_fields,
+                                           ulint n_bytes, ulint fold,
+                                           const dict_index_t *index);
 #endif /* !UNIV_HOTBACKUP */
 /** Builds a physical record out of a data tuple and
  stores it into the given buffer.
  @return pointer to the origin of physical record */
-rec_t *rec_convert_dtuple_to_rec(
+[[nodiscard]] rec_t *rec_convert_dtuple_to_rec(
     byte *buf,                 /*!< in: start address of the
                                physical record */
     const dict_index_t *index, /*!< in: record descriptor */
-    const dtuple_t *dtuple)    /*!< in: data tuple */
-    MY_ATTRIBUTE((warn_unused_result));
+    const dtuple_t *dtuple);   /*!< in: data tuple */
 /** Returns the extra size of an old-style physical record if we know its
  data size and number of fields.
  @param[in] data_size	data size
@@ -609,12 +579,11 @@
                                                  ulint n_fields, bool has_ext);
 /** Determines the size of a data tuple prefix in ROW_FORMAT=COMPACT.
  @return total size */
-ulint rec_get_converted_size_comp_prefix(
+[[nodiscard]] ulint rec_get_converted_size_comp_prefix(
     const dict_index_t *index, /*!< in: record descriptor */
     const dfield_t *fields,    /*!< in: array of data fields */
     ulint n_fields,            /*!< in: number of data fields */
-    ulint *extra)              /*!< out: extra size */
-    MY_ATTRIBUTE((warn_unused_result));
+    ulint *extra);             /*!< out: extra size */
 /** Determines the size of a data tuple in ROW_FORMAT=COMPACT.
  @return total size */
 ulint rec_get_converted_size_comp(
@@ -631,9 +600,8 @@
  @param[in] index	record descriptor
  @param[in] dtuple	data tuple
  @return size */
-static inline ulint rec_get_converted_size(const dict_index_t *index,
-                                           const dtuple_t *dtuple)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ulint rec_get_converted_size(
+    const dict_index_t *index, const dtuple_t *dtuple);
 #ifndef UNIV_HOTBACKUP
 /** Copies the first n fields of a physical record to a data tuple.
  The fields are copied to the memory heap. */
@@ -780,10 +748,10 @@
 
 /** Reads the DB_TRX_ID of a clustered index record.
  @return the value of DB_TRX_ID */
-trx_id_t rec_get_trx_id(const rec_t *rec,          /*!< in: record */
-                        const dict_index_t *index) /*!< in: clustered index */
-    MY_ATTRIBUTE((warn_unused_result));
-#endif /* UNIV_HOTBACKUP */
+[[nodiscard]] trx_id_t rec_get_trx_id(
+    const rec_t *rec,           /*!< in: record */
+    const dict_index_t *index); /*!< in: clustered index */
+#endif                          /* UNIV_HOTBACKUP */
 
 /* Maximum lengths for the data in a physical record if the offsets
 are given in one byte (resp. two byte) format. */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/row0ext.ic mysql-8.0-8.0.27/storage/innobase/include/row0ext.ic
--- mysql-8.0-8.0.26/storage/innobase/include/row0ext.ic	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/row0ext.ic	2021-09-28 11:46:34.000000000 +0000
@@ -33,54 +33,29 @@
 #include "btr0types.h"
 #include "rem0types.h"
 
-/** Looks up a column prefix of an externally stored column.
- @return column prefix, or NULL if the column is not stored externally,
- or pointer to field_ref_zero if the BLOB pointer is unset */
-static inline const byte *row_ext_lookup_ith(
-    const row_ext_t *ext, /*!< in/out: column prefix cache */
-    ulint i,              /*!< in: index of ext->ext[] */
-    ulint *len)           /*!< out: length of prefix, in bytes,
-                          at most ext->max_len */
-{
-  ut_ad(ext);
-  ut_ad(len);
+inline const byte *row_ext_lookup_ith(const row_ext_t *ext, ulint i,
+                                      ulint *len) {
   ut_ad(i < ext->n_ext);
 
   *len = ext->len[i];
 
-  ut_ad(*len <= ext->max_len);
   ut_ad(ext->max_len > 0);
+  ut_ad(*len <= ext->max_len);
 
   if (*len == 0) {
     /* The BLOB could not be fetched to the cache. */
-    return (field_ref_zero);
+    return field_ref_zero;
   } else {
-    return (ext->buf + i * ext->max_len);
+    return ext->buf + i * ext->max_len;
   }
 }
 
-/** Looks up a column prefix of an externally stored column.
- @return column prefix, or NULL if the column is not stored externally,
- or pointer to field_ref_zero if the BLOB pointer is unset */
-static inline const byte *row_ext_lookup(
-    const row_ext_t *ext, /*!< in: column prefix cache */
-    ulint col,            /*!< in: column number in the InnoDB
-                          table object, as reported by
-                          dict_col_get_no(); NOT relative to the
-                          records in the clustered index */
-    ulint *len)           /*!< out: length of prefix, in bytes,
-                          at most ext->max_len */
-{
-  ulint i;
-
-  ut_ad(ext);
-  ut_ad(len);
-
-  for (i = 0; i < ext->n_ext; i++) {
+inline const byte *row_ext_lookup(const row_ext_t *ext, ulint col, ulint *len) {
+  for (size_t i = 0; i < ext->n_ext; ++i) {
     if (col == ext->ext[i]) {
-      return (row_ext_lookup_ith(ext, i, len));
+      return row_ext_lookup_ith(ext, i, len);
     }
   }
 
-  return (nullptr);
+  return nullptr;
 }
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/row0ftsort.h mysql-8.0-8.0.27/storage/innobase/include/row0ftsort.h
--- mysql-8.0-8.0.26/storage/innobase/include/row0ftsort.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/row0ftsort.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,236 +0,0 @@
-/*****************************************************************************
-
-Copyright (c) 2010, 2021, Oracle 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, as published by the
-Free Software Foundation.
-
-This program is also distributed with certain software (including but not
-limited to OpenSSL) that is licensed under separate terms, as designated in a
-particular file or component or in included license documentation. The authors
-of MySQL hereby grant you an additional permission to link the program and
-your derivative works with the separately licensed software that they have
-included with MySQL.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
-for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-*****************************************************************************/
-
-/** @file include/row0ftsort.h
- Create Full Text Index with (parallel) merge sort
-
- Created 10/13/2010 Jimmy Yang
- *******************************************************/
-
-#ifndef row0ftsort_h
-#define row0ftsort_h
-
-#include "btr0bulk.h"
-#include "data0data.h"
-#include "dict0types.h"
-#include "fts0fts.h"
-#include "fts0priv.h"
-#include "fts0types.h"
-#include "row0merge.h"
-#include "row0mysql.h"
-#include "univ.i"
-
-/** This structure defineds information the scan thread will fetch
-and put to the linked list for parallel tokenization/sort threads
-to process */
-typedef struct fts_doc_item fts_doc_item_t;
-
-/** Information about temporary files used in merge sort */
-struct fts_doc_item {
-  dfield_t *field; /*!< field contains document string */
-  doc_id_t doc_id; /*!< document ID */
-  UT_LIST_NODE_T(fts_doc_item_t) doc_list;
-  /*!< list of doc items */
-};
-
-/** This defines the list type that scan thread would feed the parallel
-tokenization threads and sort threads. */
-typedef UT_LIST_BASE_NODE_T(fts_doc_item_t, doc_list) fts_doc_list_t;
-
-#define FTS_PLL_MERGE 1
-
-/** Sort information passed to each individual parallel sort thread */
-struct fts_psort_t;
-
-/** Common info passed to each parallel sort thread */
-struct fts_psort_common_t {
-  row_merge_dup_t *dup;    /*!< descriptor of FTS index */
-  dict_table_t *old_table; /*!< Needed to fetch LOB from
-                           old table. */
-  dict_table_t *new_table; /*!< source table */
-  trx_t *trx;              /*!< transaction */
-  fts_psort_t *all_info;   /*!< all parallel sort info */
-  os_event_t sort_event;   /*!< sort event */
-  os_event_t merge_event;  /*!< merge event */
-  ibool opt_doc_id_size;   /*!< whether to use 4 bytes
-                           instead of 8 bytes integer to
-                           store Doc ID during sort, if
-                           Doc ID will not be big enough
-                           to use 8 bytes value */
-};
-
-struct fts_psort_t {
-  ulint psort_id; /*!< Parallel sort ID */
-  row_merge_buf_t *merge_buf[FTS_NUM_AUX_INDEX];
-  /*!< sort buffer */
-  merge_file_t *merge_file[FTS_NUM_AUX_INDEX];
-  /*!< sort file */
-  row_merge_block_t *merge_block[FTS_NUM_AUX_INDEX];
-  /*!< buffer to allocated */
-  ulint child_status;               /*!< child thread status */
-  ulint state;                      /*!< parent thread state */
-  fts_doc_list_t fts_doc_list;      /*!< doc list to process */
-  fts_psort_common_t *psort_common; /*!< ptr to all psort info */
-  dberr_t error;                    /*!< db error during psort */
-  ulint memory_used;                /*!< memory used by fts_doc_list */
-  ib_mutex_t mutex;                 /*!< mutex for fts_doc_list */
-};
-
-/** Row fts token for plugin parser */
-struct row_fts_token_t {
-  fts_string_t *text; /*!< token */
-  ulint position;     /*!< token position in the document */
-  UT_LIST_NODE_T(row_fts_token_t)
-  token_list; /*!< next token link */
-};
-
-typedef UT_LIST_BASE_NODE_T(row_fts_token_t, token_list) fts_token_list_t;
-
-/** Structure stores information from string tokenization operation */
-struct fts_tokenize_ctx {
-  ulint processed_len{0}; /*!< processed string length */
-  ulint init_pos{0};      /*!< doc start position */
-  ulint buf_used{0};      /*!< the sort buffer (ID) when
-                               tokenization stops, which
-                               could due to sort buffer full */
-  ulint rows_added[FTS_NUM_AUX_INDEX]{0};
-  /*!< number of rows added for
-  each FTS index partition */
-  ib_rbt_t *cached_stopword{nullptr}; /*!< in: stopword list */
-  dfield_t sort_field[FTS_NUM_FIELDS_SORT];
-  /*!< in: sort field */
-  fts_token_list_t fts_token_list{};
-};
-
-typedef struct fts_tokenize_ctx fts_tokenize_ctx_t;
-
-/** Structure stores information needed for the insertion phase of FTS
-parallel sort. */
-struct fts_psort_insert {
-  CHARSET_INFO *charset; /*!< charset info */
-  mem_heap_t *heap;      /*!< heap */
-  ibool opt_doc_id_size; /*!< Whether to use smaller (4 bytes)
-                         integer for Doc ID */
-  BtrBulk *btr_bulk;     /*!< Bulk load instance */
-  dtuple_t *tuple;       /*!< Tuple to insert */
-
-#ifdef UNIV_DEBUG
-  ulint aux_index_id; /*!< Auxiliary index id */
-#endif
-};
-
-typedef struct fts_psort_insert fts_psort_insert_t;
-
-/** status bit used for communication between parent and child thread */
-#define FTS_PARENT_COMPLETE 1
-#define FTS_PARENT_EXITING 2
-#define FTS_CHILD_COMPLETE 1
-#define FTS_CHILD_EXITING 2
-
-/** Print some debug information */
-#define FTSORT_PRINT
-
-#ifdef FTSORT_PRINT
-#define DEBUG_FTS_SORT_PRINT(str) \
-  do {                            \
-    ut_print_timestamp(stderr);   \
-    fprintf(stderr, str);         \
-  } while (0)
-#else
-#define DEBUG_FTS_SORT_PRINT(str)
-#endif /* FTSORT_PRINT */
-
-/** Create a temporary "fts sort index" used to merge sort the
- tokenized doc string. The index has three "fields":
-
- 1. Tokenized word,
- 2. Doc ID
- 3. Word's position in original 'doc'.
-
- @return dict_index_t structure for the fts sort index */
-dict_index_t *row_merge_create_fts_sort_index(
-    dict_index_t *index,       /*!< in: Original FTS index
-                               based on which this sort index
-                               is created */
-    const dict_table_t *table, /*!< in: table that FTS index
-                               is being created on */
-    ibool *opt_doc_id_size);
-/*!< out: whether to use 4 bytes
-instead of 8 bytes integer to
-store Doc ID during sort */
-
-/** Initialize FTS parallel sort structures.
-@param[in] trx Transaction
-@param[in,out] dup Descriptor of fts index being created
-@param[in] old_table Needed to fetch lob from old table
-@param[in] new_table Table where indexes are created
-@param[in] opt_doc_id_size Whether to use 4 bytes instead of 8 bytes integer to
-store doc id during sort
-@param[out] psort Parallel sort info to be instantiated
-@param[out] merge Parallel merge info to be instantiated
-@return InnoDB error code */
-dberr_t row_fts_psort_info_init(trx_t *trx, row_merge_dup_t *dup,
-                                const dict_table_t *old_table,
-                                const dict_table_t *new_table,
-                                ibool opt_doc_id_size, fts_psort_t **psort,
-                                fts_psort_t **merge);
-
-/** Clean up and deallocate FTS parallel sort structures, and close
- temparary merge sort files */
-void row_fts_psort_info_destroy(
-    fts_psort_t *psort_info,  /*!< parallel sort info */
-    fts_psort_t *merge_info); /*!< parallel merge info */
-/** Free up merge buffers when merge sort is done */
-void row_fts_free_pll_merge_buf(
-    fts_psort_t *psort_info); /*!< in: parallel sort info */
-
-/** Start the parallel tokenization and parallel merge sort */
-void row_fts_start_psort(
-    fts_psort_t *psort_info); /*!< in: parallel sort info */
-/** Kick off the parallel merge and insert thread */
-void row_fts_start_parallel_merge(
-    fts_psort_t *merge_info); /*!< in: parallel sort info */
-/** Propagate a newly added record up one level in the selection tree
- @return parent where this value propagated to */
-int row_merge_fts_sel_propagate(
-    int propogated,      /*!< [in] tree node propagated */
-    int *sel_tree,       /*!< [in] selection tree */
-    ulint level,         /*!< [in] selection tree level */
-    const mrec_t **mrec, /*!< [in] sort record */
-    ulint **offsets,     /*!< [in] record offsets */
-    dict_index_t *index  /*!< [in] FTS index */
-);
-
-/** Read sorted file containing index data tuples and insert these data
-tuples to the index
-@param[in]	index		index
-@param[in]	table		new table
-@param[in]	psort_info	parallel sort info
-@param[in]	id		which auxiliary table's data to insert to
-@return DB_SUCCESS or error number */
-dberr_t row_fts_merge_insert(dict_index_t *index, dict_table_t *table,
-                             fts_psort_t *psort_info, ulint id);
-#endif /* row0ftsort_h */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/row0import.h mysql-8.0-8.0.27/storage/innobase/include/row0import.h
--- mysql-8.0-8.0.26/storage/innobase/include/row0import.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/row0import.h	2021-09-28 11:46:34.000000000 +0000
@@ -47,8 +47,8 @@
 @param[in]	table_def	dd table
 @param[in]	prebuilt	prebuilt struct in MySQL
 @return error code or DB_SUCCESS */
-dberr_t row_import_for_mysql(dict_table_t *table, dd::Table *table_def,
-                             row_prebuilt_t *prebuilt)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t row_import_for_mysql(dict_table_t *table,
+                                           dd::Table *table_def,
+                                           row_prebuilt_t *prebuilt);
 
 #endif /* row0import_h */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/row0ins.h mysql-8.0-8.0.27/storage/innobase/include/row0ins.h
--- mysql-8.0-8.0.26/storage/innobase/include/row0ins.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/row0ins.h	2021-09-28 11:46:34.000000000 +0000
@@ -45,7 +45,7 @@
  the caller must have a shared latch on dict_foreign_key_check_lock.
  @return DB_SUCCESS, DB_LOCK_WAIT, DB_NO_REFERENCED_ROW, or
  DB_ROW_IS_REFERENCED */
-dberr_t row_ins_check_foreign_constraint(
+[[nodiscard]] dberr_t row_ins_check_foreign_constraint(
     ibool check_ref,         /*!< in: TRUE If we want to check that
                            the referenced table is ok, FALSE if we
                            want to check the foreign key table */
@@ -55,8 +55,7 @@
     dict_table_t *table,     /*!< in: if check_ref is TRUE, then the foreign
                              table, else the referenced table */
     dtuple_t *entry,         /*!< in: index entry for index */
-    que_thr_t *thr)          /*!< in: query thread */
-    MY_ATTRIBUTE((warn_unused_result));
+    que_thr_t *thr);         /*!< in: query thread */
 /** Creates an insert node struct.
  @return own: insert node struct */
 ins_node_t *ins_node_create(
@@ -79,7 +78,7 @@
  @retval DB_LOCK_WAIT on lock wait when !(flags & BTR_NO_LOCKING_FLAG)
  @retval DB_FAIL if retry with BTR_MODIFY_TREE is needed
  @return error code */
-dberr_t row_ins_clust_index_entry_low(
+[[nodiscard]] dberr_t row_ins_clust_index_entry_low(
     uint32_t flags,      /*!< in: undo logging and locking flags */
     ulint mode,          /*!< in: BTR_MODIFY_LEAF or BTR_MODIFY_TREE,
                          depending on whether we wish optimistic or
@@ -91,10 +90,9 @@
                          flags & (BTR_NO_LOCKING_FLAG
                          | BTR_NO_UNDO_LOG_FLAG) and a duplicate
                          can't occur */
-    bool dup_chk_only)
-    /*!< in: if true, just do duplicate check
-    and return. don't execute actual insert. */
-    MY_ATTRIBUTE((warn_unused_result));
+    bool dup_chk_only);
+/*!< in: if true, just do duplicate check
+and return. don't execute actual insert. */
 
 /** Tries to insert an entry into a secondary index. If a record with exactly
 the same fields is found, the other record is necessarily marked deleted.
@@ -117,12 +115,10 @@
 @retval DB_LOCK_WAIT on lock wait when !(flags & BTR_NO_LOCKING_FLAG)
 @retval DB_FAIL if retry with BTR_MODIFY_TREE is needed
 @return error code */
-dberr_t row_ins_sec_index_entry_low(uint32_t flags, ulint mode,
-                                    dict_index_t *index,
-                                    mem_heap_t *offsets_heap, mem_heap_t *heap,
-                                    dtuple_t *entry, trx_id_t trx_id,
-                                    que_thr_t *thr, bool dup_chk_only)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t row_ins_sec_index_entry_low(
+    uint32_t flags, ulint mode, dict_index_t *index, mem_heap_t *offsets_heap,
+    mem_heap_t *heap, dtuple_t *entry, trx_id_t trx_id, que_thr_t *thr,
+    bool dup_chk_only);
 
 /** Sets the values of the dtuple fields in entry from the values of appropriate
 columns in row.
@@ -138,27 +134,25 @@
  to a delete marked record, performs the insert by updating or delete
  unmarking the delete marked record.
  @return DB_SUCCESS, DB_LOCK_WAIT, DB_DUPLICATE_KEY, or some other error code */
-dberr_t row_ins_clust_index_entry(
+[[nodiscard]] dberr_t row_ins_clust_index_entry(
     dict_index_t *index, /*!< in: clustered index */
     dtuple_t *entry,     /*!< in/out: index entry to insert */
     que_thr_t *thr,      /*!< in: query thread */
-    bool dup_chk_only)
-    /*!< in: if true, just do duplicate check
-    and return. don't execute actual insert. */
-    MY_ATTRIBUTE((warn_unused_result));
+    bool dup_chk_only);
+/*!< in: if true, just do duplicate check
+and return. don't execute actual insert. */
 /** Inserts an entry into a secondary index. Tries first optimistic,
  then pessimistic descent down the tree. If the entry matches enough
  to a delete marked record, performs the insert by updating or delete
  unmarking the delete marked record.
  @return DB_SUCCESS, DB_LOCK_WAIT, DB_DUPLICATE_KEY, or some other error code */
-dberr_t row_ins_sec_index_entry(
+[[nodiscard]] dberr_t row_ins_sec_index_entry(
     dict_index_t *index, /*!< in: secondary index */
     dtuple_t *entry,     /*!< in/out: index entry to insert */
     que_thr_t *thr,      /*!< in: query thread */
-    bool dup_chk_only)
-    /*!< in: if true, just do duplicate check
-    and return. don't execute actual insert. */
-    MY_ATTRIBUTE((warn_unused_result));
+    bool dup_chk_only);
+/*!< in: if true, just do duplicate check
+and return. don't execute actual insert. */
 /** Inserts a row to a table. This is a high-level function used in
  SQL execution graphs.
  @return query thread to run next or NULL */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/row0log.h mysql-8.0-8.0.27/storage/innobase/include/row0log.h
--- mysql-8.0-8.0.26/storage/innobase/include/row0log.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/row0log.h	2021-09-28 11:46:34.000000000 +0000
@@ -45,12 +45,12 @@
 #include "row0types.h"
 #include "trx0types.h"
 
-class ut_stage_alter_t;
+class Alter_stage;
 
 /** Allocate the row log for an index and flag the index
  for online creation.
  @retval true if success, false if not */
-bool row_log_allocate(
+[[nodiscard]] bool row_log_allocate(
     dict_index_t *index, /*!< in/out: index */
     dict_table_t *table, /*!< in/out: new table being rebuilt,
                          or NULL when creating a secondary index */
@@ -61,8 +61,7 @@
     added columns, or NULL */
     const ulint *col_map, /*!< in: mapping of old column
                           numbers to new ones, or NULL if !table */
-    const char *path)     /*!< in: where to create temporary file */
-    MY_ATTRIBUTE((warn_unused_result));
+    const char *path);    /*!< in: where to create temporary file */
 
 /** Free the row log for an index that was being created online. */
 void row_log_free(row_log_t *&log); /*!< in,own: row log */
@@ -76,13 +75,12 @@
  (or was) being created.
  @retval true if the operation was logged or can be ignored
  @retval false if online index creation is not taking place */
-static inline bool row_log_online_op_try(
+[[nodiscard]] static inline bool row_log_online_op_try(
     dict_index_t *index,   /*!< in/out: index, S or X latched */
     const dtuple_t *tuple, /*!< in: index tuple */
-    trx_id_t trx_id)       /*!< in: transaction ID for insert,
-                           or 0 for delete */
-    MY_ATTRIBUTE((warn_unused_result));
-#endif /* !UNIV_HOTBACKUP */
+    trx_id_t trx_id);      /*!< in: transaction ID for insert,
+                          or 0 for delete */
+#endif                     /* !UNIV_HOTBACKUP */
 /** Logs an operation to a secondary index that is (or was) being created. */
 void row_log_online_op(
     dict_index_t *index,   /*!< in/out: index, S or X latched */
@@ -93,10 +91,9 @@
 
 /** Gets the error status of the online index rebuild log.
  @return DB_SUCCESS or error code */
-dberr_t row_log_table_get_error(
-    const dict_index_t *index) /*!< in: clustered index of a table
+[[nodiscard]] dberr_t row_log_table_get_error(
+    const dict_index_t *index); /*!< in: clustered index of a table
                                that is being rebuilt online */
-    MY_ATTRIBUTE((warn_unused_result));
 
 /** Check whether a virtual column is indexed in the new table being
 created during alter table
@@ -139,7 +136,7 @@
  of a table that is being rebuilt.
  @return tuple of PRIMARY KEY,DB_TRX_ID,DB_ROLL_PTR in the rebuilt table,
  or NULL if the PRIMARY KEY definition does not change */
-const dtuple_t *row_log_table_get_pk(
+[[nodiscard]] const dtuple_t *row_log_table_get_pk(
     trx_t *trx,           /*!< in: the current transaction. */
     const rec_t *rec,     /*!< in: clustered index leaf page record,
                           page X-latched */
@@ -150,7 +147,7 @@
     byte *sys,            /*!< out: DB_TRX_ID,DB_ROLL_PTR for
                           row_log_table_delete(), or NULL */
     mem_heap_t **heap)    /*!< in/out: memory heap where allocated */
-    UNIV_COLD MY_ATTRIBUTE((warn_unused_result));
+    UNIV_COLD;
 
 /** Logs an insert to a table that is being rebuilt.
  This will be merged in row_log_table_apply_insert(). */
@@ -181,16 +178,16 @@
 ALTER TABLE. stage->begin_phase_log_table() will be called initially and then
 stage->inc() will be called for each block of log that is applied.
 @return DB_SUCCESS, or error code on failure */
-dberr_t row_log_table_apply(que_thr_t *thr, dict_table_t *old_table,
-                            struct TABLE *table, ut_stage_alter_t *stage)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t row_log_table_apply(que_thr_t *thr,
+                                          dict_table_t *old_table,
+                                          struct TABLE *table,
+                                          Alter_stage *stage);
 
 /** Get the latest transaction ID that has invoked row_log_online_op()
  during online creation.
  @return latest transaction ID, or 0 if nothing was logged */
-trx_id_t row_log_get_max_trx(
-    dict_index_t *index) /*!< in: index, must be locked */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] trx_id_t row_log_get_max_trx(
+    dict_index_t *index); /*!< in: index, must be locked */
 
 /** Apply the row log to the index upon completing index creation.
 @param[in]	trx	transaction (for checking if the operation was
@@ -201,9 +198,8 @@
 ALTER TABLE. stage->begin_phase_log_index() will be called initially and then
 stage->inc() will be called for each block of log that is applied.
 @return DB_SUCCESS, or error code on failure */
-dberr_t row_log_apply(const trx_t *trx, dict_index_t *index,
-                      struct TABLE *table, ut_stage_alter_t *stage)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t row_log_apply(const trx_t *trx, dict_index_t *index,
+                                    struct TABLE *table, Alter_stage *stage);
 
 #ifdef HAVE_PSI_STAGE_INTERFACE
 /** Estimate how much work is to be done by the log apply phase
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/row0merge.h mysql-8.0-8.0.27/storage/innobase/include/row0merge.h
--- mysql-8.0-8.0.26/storage/innobase/include/row0merge.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/row0merge.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,320 +0,0 @@
-/*****************************************************************************
-
-Copyright (c) 2005, 2021, Oracle 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, as published by the
-Free Software Foundation.
-
-This program is also distributed with certain software (including but not
-limited to OpenSSL) that is licensed under separate terms, as designated in a
-particular file or component or in included license documentation. The authors
-of MySQL hereby grant you an additional permission to link the program and
-your derivative works with the separately licensed software that they have
-included with MySQL.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
-for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-*****************************************************************************/
-
-/** @file include/row0merge.h
- Index build routines using a merge sort
-
- Created 13/06/2005 Jan Lindstrom
- *******************************************************/
-
-#ifndef row0merge_h
-#define row0merge_h
-
-#include "btr0types.h"
-#include "data0data.h"
-#include "dict0types.h"
-#include "lock0types.h"
-#include "mtr0mtr.h"
-#include "que0types.h"
-#include "rem0rec.h"
-#include "rem0types.h"
-#include "row0mysql.h"
-#include "srv0srv.h"
-#include "trx0types.h"
-#include "univ.i"
-#include "ut0stage.h"
-
-// Forward declaration
-struct ib_sequence_t;
-
-/** @brief Block size for I/O operations in merge sort.
-
-The minimum is UNIV_PAGE_SIZE, or page_get_free_space_of_empty()
-rounded to a power of 2.
-
-When not creating a PRIMARY KEY that contains column prefixes, this
-can be set as small as UNIV_PAGE_SIZE / 2. */
-typedef byte row_merge_block_t;
-
-/** @brief Secondary buffer for I/O operations of merge records.
-
-This buffer is used for writing or reading a record that spans two
-row_merge_block_t.  Thus, it must be able to hold one merge record,
-whose maximum size is the same as the minimum size of
-row_merge_block_t. */
-typedef byte mrec_buf_t[UNIV_PAGE_SIZE_MAX];
-
-/** @brief Merge record in row_merge_block_t.
-
-The format is the same as a record in ROW_FORMAT=COMPACT with the
-exception that the REC_N_NEW_EXTRA_BYTES are omitted. */
-typedef byte mrec_t;
-
-/** Merge record in row_merge_buf_t */
-struct mtuple_t {
-  dfield_t *fields; /*!< data fields */
-};
-
-/** Buffer for sorting in main memory. */
-struct row_merge_buf_t {
-  mem_heap_t *heap;     /*!< memory heap where allocated */
-  dict_index_t *index;  /*!< the index the tuples belong to */
-  ulint total_size;     /*!< total amount of data bytes */
-  ulint n_tuples;       /*!< number of data tuples */
-  ulint max_tuples;     /*!< maximum number of data tuples */
-  mtuple_t *tuples;     /*!< array of data tuples */
-  mtuple_t *tmp_tuples; /*!< temporary copy of tuples,
-                        for sorting */
-};
-
-/** Information about temporary files used in merge sort */
-struct merge_file_t {
-  int fd;            /*!< file descriptor */
-  ulint offset;      /*!< file offset (end of file) */
-  ib_uint64_t n_rec; /*!< number of records in the file */
-};
-
-/** Index field definition */
-struct index_field_t {
-  ulint col_no;        /*!< column offset */
-  ulint prefix_len;    /*!< column prefix length, or 0
-                       if indexing the whole column */
-  bool is_v_col;       /*!< whether this is a virtual column */
-  bool is_multi_value; /*!< whether it has multi-value */
-  bool is_ascending;   /*!< true=ASC, false=DESC */
-};
-
-/** Definition of an index being created */
-struct index_def_t {
-  const char *name;          /*!< index name */
-  bool rebuild;              /*!< whether the table is rebuilt */
-  ulint ind_type;            /*!< 0, DICT_UNIQUE,
-                             or DICT_CLUSTERED */
-  ulint key_number;          /*!< MySQL key number,
-                             or ULINT_UNDEFINED if none */
-  ulint n_fields;            /*!< number of fields in index */
-  index_field_t *fields;     /*!< field definitions */
-  st_mysql_ftparser *parser; /*!< fulltext parser plugin */
-  bool is_ngram;             /*!< true if it's ngram parser */
-  bool srid_is_valid;        /*!< true if we want to check SRID
-                             while inserting to index */
-  uint32_t srid;             /*!< SRID obtained from dd column */
-};
-
-/** Structure for reporting duplicate records. */
-struct row_merge_dup_t {
-  dict_index_t *index;  /*!< index being sorted */
-  struct TABLE *table;  /*!< MySQL table object */
-  const ulint *col_map; /*!< mapping of column numbers
-                        in table to the rebuilt table
-                        (index->table), or NULL if not
-                        rebuilding table */
-  ulint n_dup;          /*!< number of duplicates */
-};
-
-/** Report a duplicate key.
-@param[in,out] dup For reporting duplicates
-@param[in] entry Duplicate index entry */
-void row_merge_dup_report(row_merge_dup_t *dup, const dfield_t *entry);
-
-/** Sets an exclusive lock on a table, for the duration of creating indexes.
- @return error code or DB_SUCCESS */
-dberr_t row_merge_lock_table(trx_t *trx,          /*!< in/out: transaction */
-                             dict_table_t *table, /*!< in: table to lock */
-                             enum lock_mode mode) /*!< in: LOCK_X or LOCK_S */
-    MY_ATTRIBUTE((warn_unused_result));
-/** Drop those indexes which were created before an error occurred.
- The data dictionary must have been locked exclusively by the caller,
- because the transaction will not be committed. */
-void row_merge_drop_indexes(
-    trx_t *trx,          /*!< in/out: transaction */
-    dict_table_t *table, /*!< in/out: table containing the indexes */
-    ibool locked);       /*!< in: TRUE=table locked,
-                 FALSE=may need to do a lazy drop */
-
-/**Create temporary merge files in the given paramater path, and if
-UNIV_PFS_IO defined, register the file descriptor with Performance Schema.
-@param[in]	path	location for creating temporary merge files.
-@return File descriptor */
-int row_merge_file_create_low(const char *path)
-    MY_ATTRIBUTE((warn_unused_result));
-
-/** Destroy a merge file. And de-register the file from Performance Schema
- if UNIV_PFS_IO is defined. */
-void row_merge_file_destroy_low(int fd); /*!< in: merge file descriptor */
-
-/** Provide a new pathname for a table that is being renamed if it belongs to
- a file-per-table tablespace.  The caller is responsible for freeing the
- memory allocated for the return value.
- @return new pathname of tablespace file, or NULL if space = 0 */
-char *row_make_new_pathname(dict_table_t *table, /*!< in: table to be renamed */
-                            const char *new_name); /*!< in: new name */
-/** Rename the tables in the data dictionary.  The data dictionary must
- have been locked exclusively by the caller, because the transaction
- will not be committed.
- @return error code or DB_SUCCESS */
-dberr_t row_merge_rename_tables_dict(
-    dict_table_t *old_table, /*!< in/out: old table, renamed to
-                             tmp_name */
-    dict_table_t *new_table, /*!< in/out: new table, renamed to
-                             old_table->name */
-    const char *tmp_name,    /*!< in: new name for old_table */
-    trx_t *trx)              /*!< in/out: dictionary transaction */
-    MY_ATTRIBUTE((warn_unused_result));
-
-/** Create the index and load in to the dictionary.
-@param[in,out]	trx		trx (sets error_state)
-@param[in,out]	table		the index is on this table
-@param[in]	index_def	the index definition
-@param[in]	add_v		new virtual columns added along with add
-                                index call
-@return index, or NULL on error */
-dict_index_t *row_merge_create_index(trx_t *trx, dict_table_t *table,
-                                     const index_def_t *index_def,
-                                     const dict_add_v_col_t *add_v);
-
-/** Drop a table. The caller must have ensured that the background stats
- thread is not processing the table. This can be done by calling
- dict_stats_wait_bg_to_stop_using_table() after locking the dictionary and
- before calling this function.
- @return DB_SUCCESS or error code */
-dberr_t row_merge_drop_table(
-    trx_t *trx,           /*!< in: transaction */
-    dict_table_t *table); /*!< in: table instance to drop */
-
-/** Build indexes on a table by reading a clustered index, creating a temporary
-file containing index entries, merge sorting these index entries and inserting
-sorted index entries to indexes.
-@param[in]	trx		transaction
-@param[in]	old_table	table where rows are read from
-@param[in]	new_table	table where indexes are created; identical to
-old_table unless creating a PRIMARY KEY
-@param[in]	online		true if creating indexes online
-@param[in]	indexes		indexes to be created
-@param[in]	key_numbers	MySQL key numbers
-@param[in]	n_indexes	size of indexes[]
-@param[in,out]	table		MySQL table, for reporting erroneous key value
-if applicable
-@param[in]	add_cols	default values of added columns, or NULL
-@param[in]	col_map		mapping of old column numbers to new ones, or
-NULL if old_table == new_table
-@param[in]	add_autoinc	number of added AUTO_INCREMENT columns, or
-ULINT_UNDEFINED if none is added
-@param[in,out]	sequence	autoinc sequence
-@param[in]	skip_pk_sort	whether the new PRIMARY KEY will follow
-existing order
-@param[in,out]	stage		performance schema accounting object, used by
-ALTER TABLE. stage->begin_phase_read_pk() will be called at the beginning of
-this function and it will be passed to other functions for further accounting.
-@param[in]	add_v		new virtual columns added along with indexes
-@param[in]	eval_table	mysql table used to evaluate virtual column
-                                value, see innobase_get_computed_value().
-@return DB_SUCCESS or error code */
-dberr_t row_merge_build_indexes(
-    trx_t *trx, dict_table_t *old_table, dict_table_t *new_table, bool online,
-    dict_index_t **indexes, const ulint *key_numbers, ulint n_indexes,
-    struct TABLE *table, const dtuple_t *add_cols, const ulint *col_map,
-    ulint add_autoinc, ib_sequence_t &sequence, bool skip_pk_sort,
-    ut_stage_alter_t *stage, const dict_add_v_col_t *add_v,
-    struct TABLE *eval_table) MY_ATTRIBUTE((warn_unused_result));
-
-/** Write a buffer to a block.
-@param[in]	buf	sorted buffer
-@param[in]	of	output file
-@param[out]	block	buffer for writing to file */
-void row_merge_buf_write(const row_merge_buf_t *buf, const merge_file_t *of,
-                         row_merge_block_t *block);
-
-/** Sort a buffer.
-@param[in,out] buf Sort buffer
-@param[in,out] dup Reporter of duplicates (null if non-unique index) */
-void row_merge_buf_sort(row_merge_buf_t *buf, row_merge_dup_t *dup);
-
-/** Write a merge block to the file system.
- @return true if request was successful, false if fail */
-ibool row_merge_write(int fd,           /*!< in: file descriptor */
-                      ulint offset,     /*!< in: offset where to write,
-                                        in number of row_merge_block_t elements */
-                      const void *buf); /*!< in: data */
-/** Empty a sort buffer.
- @return sort buffer */
-row_merge_buf_t *row_merge_buf_empty(
-    row_merge_buf_t *buf) /*!< in,own: sort buffer */
-    MY_ATTRIBUTE((warn_unused_result));
-
-/** Create a merge file in the given location.
-@param[out]	merge_file	merge file structure
-@param[in]	path		location for creating temporary file
-@return file descriptor, or -1 on failure */
-int row_merge_file_create(merge_file_t *merge_file, const char *path);
-
-/** Merge disk files.
-@param[in]	trx	transaction
-@param[in]	dup	descriptor of index being created
-@param[in,out]	file	file containing index entries
-@param[in,out]	block	3 buffers
-@param[in,out]	tmpfd	temporary file handle
-@param[in,out]	stage	performance schema accounting object, used by
-ALTER TABLE. If not NULL, stage->begin_phase_sort() will be called initially
-and then stage->inc() will be called for each record processed.
-@return DB_SUCCESS or error code */
-dberr_t row_merge_sort(trx_t *trx, const row_merge_dup_t *dup,
-                       merge_file_t *file, row_merge_block_t *block, int *tmpfd,
-                       ut_stage_alter_t *stage = nullptr);
-
-/** Allocate a sort buffer.
- @return own: sort buffer */
-row_merge_buf_t *row_merge_buf_create(
-    dict_index_t *index) /*!< in: secondary index */
-    MY_ATTRIBUTE((warn_unused_result, malloc));
-/** Deallocate a sort buffer. */
-void row_merge_buf_free(
-    row_merge_buf_t *buf); /*!< in,own: sort buffer to be freed */
-/** Destroy a merge file. */
-void row_merge_file_destroy(
-    merge_file_t *merge_file); /*!< in/out: merge file structure */
-/** Read a merge block from the file system.
- @return true if request was successful, false if fail */
-ibool row_merge_read(int fd,                  /*!< in: file descriptor */
-                     ulint offset,            /*!< in: offset where to read
-                                              in number of row_merge_block_t
-                                              elements */
-                     row_merge_block_t *buf); /*!< out: data */
-/** Read a merge record.
- @return pointer to next record, or NULL on I/O error or end of list */
-const byte *row_merge_read_rec(
-    row_merge_block_t *block,  /*!< in/out: file buffer */
-    mrec_buf_t *buf,           /*!< in/out: secondary buffer */
-    const byte *b,             /*!< in: pointer to record */
-    const dict_index_t *index, /*!< in: index of the record */
-    int fd,                    /*!< in: file descriptor */
-    ulint *foffs,              /*!< in/out: file offset */
-    const mrec_t **mrec,       /*!< out: pointer to merge record,
-                               or NULL on end of list
-                               (non-NULL on I/O error) */
-    ulint *offsets)            /*!< out: offsets of mrec */
-    MY_ATTRIBUTE((warn_unused_result));
-#endif /* row0merge.h */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/row0mysql.h mysql-8.0-8.0.27/storage/innobase/include/row0mysql.h
--- mysql-8.0-8.0.26/storage/innobase/include/row0mysql.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/row0mysql.h	2021-09-28 11:46:34.000000000 +0000
@@ -218,10 +218,9 @@
  It is not compatible with another AUTO_INC or exclusive lock on the
  table.
  @return error code or DB_SUCCESS */
-dberr_t row_lock_table_autoinc_for_mysql(
-    row_prebuilt_t *prebuilt) /*!< in: prebuilt struct in the MySQL
+[[nodiscard]] dberr_t row_lock_table_autoinc_for_mysql(
+    row_prebuilt_t *prebuilt); /*!< in: prebuilt struct in the MySQL
                               table handle */
-    MY_ATTRIBUTE((warn_unused_result));
 
 /** Sets a table lock on the table mentioned in prebuilt.
 @param[in,out]	prebuilt	table handle
@@ -232,8 +231,8 @@
 @param[in]	mysql_rec	row in the MySQL format
 @param[in,out]	prebuilt	prebuilt struct in MySQL handle
 @return error code or DB_SUCCESS*/
-dberr_t row_insert_for_mysql(const byte *mysql_rec, row_prebuilt_t *prebuilt)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t row_insert_for_mysql(const byte *mysql_rec,
+                                           row_prebuilt_t *prebuilt);
 
 /** Builds a dummy query graph used in selects. */
 void row_prebuild_sel_graph(row_prebuilt_t *prebuilt); /*!< in: prebuilt struct
@@ -255,8 +254,8 @@
 @param[in]	mysql_rec	row in the MySQL format
 @param[in,out]	prebuilt	prebuilt struct in MySQL handle
 @return error code or DB_SUCCESS */
-dberr_t row_update_for_mysql(const byte *mysql_rec, row_prebuilt_t *prebuilt)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t row_update_for_mysql(const byte *mysql_rec,
+                                           row_prebuilt_t *prebuilt);
 
 /** Delete all rows for the given table by freeing/truncating indexes.
 @param[in,out]	table	table handler */
@@ -281,8 +280,7 @@
 /** Checks if a table name contains the string "/#sql" which denotes temporary
  tables in MySQL.
  @return true if temporary table */
-bool row_is_mysql_tmp_table_name(const char *name)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool row_is_mysql_tmp_table_name(const char *name);
 /*!< in: table name in the form
 'database/tablename' */
 
@@ -295,12 +293,12 @@
     mem_heap_t *heap);   /*!< in: mem heap from which allocated */
 /** Does a cascaded delete or set null in a foreign key operation.
  @return error code or DB_SUCCESS */
-dberr_t row_update_cascade_for_mysql(
+[[nodiscard]] dberr_t row_update_cascade_for_mysql(
     que_thr_t *thr,      /*!< in: query thread */
     upd_node_t *node,    /*!< in: update node used in the cascade
                          or set null operation */
     dict_table_t *table) /*!< in: table where we do the operation */
-    MY_ATTRIBUTE((nonnull, warn_unused_result));
+    MY_ATTRIBUTE((nonnull));
 
 /** Locks the data dictionary exclusively for performing a table create or other
  data dictionary modification operation.
@@ -336,16 +334,15 @@
 @param[in]	create_info     HA_CREATE_INFO object
 @param[in,out]	trx		transaction
 @return error code or DB_SUCCESS */
-dberr_t row_create_table_for_mysql(dict_table_t *table, const char *compression,
-                                   const HA_CREATE_INFO *create_info,
-                                   trx_t *trx)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t row_create_table_for_mysql(
+    dict_table_t *table, const char *compression,
+    const HA_CREATE_INFO *create_info, trx_t *trx);
 
 /** Does an index creation operation for MySQL. TODO: currently failure
  to create an index results in dropping the whole table! This is no problem
  currently as all indexes must be created at the same time as the table.
  @return error number or DB_SUCCESS */
-dberr_t row_create_index_for_mysql(
+[[nodiscard]] dberr_t row_create_index_for_mysql(
     dict_index_t *index,        /*!< in, own: index definition
                                 (will be freed) */
     trx_t *trx,                 /*!< in: transaction handle */
@@ -355,8 +352,7 @@
                                 index columns, which are
                                 then checked for not being too
                                 large. */
-    dict_table_t *handler)      /* ! in/out: table handler. */
-    MY_ATTRIBUTE((warn_unused_result));
+    dict_table_t *handler);     /* ! in/out: table handler. */
 
 /** Loads foreign key constraints for the table being created. This
  function should be called after the indexes for a table have been
@@ -368,9 +364,8 @@
  @param[in]	name		table full name in normalized form
  @param[in]	dd_table	MySQL dd::Table for the table
  @return error code or DB_SUCCESS */
-dberr_t row_table_load_foreign_constraints(trx_t *trx, const char *name,
-                                           const dd::Table *dd_table)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t row_table_load_foreign_constraints(
+    trx_t *trx, const char *name, const dd::Table *dd_table);
 
 /** The master thread in srv0srv.cc calls this regularly to drop tables which
  we must drop in background after queries to them have ended. Such lazy
@@ -380,12 +375,11 @@
 
 /** Sets an exclusive lock on a table.
  @return error code or DB_SUCCESS */
-dberr_t row_mysql_lock_table(
-    trx_t *trx,          /*!< in/out: transaction */
-    dict_table_t *table, /*!< in: table to lock */
-    enum lock_mode mode, /*!< in: LOCK_X or LOCK_S */
-    const char *op_info) /*!< in: string for trx->op_info */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t row_mysql_lock_table(
+    trx_t *trx,           /*!< in/out: transaction */
+    dict_table_t *table,  /*!< in: table to lock */
+    enum lock_mode mode,  /*!< in: LOCK_X or LOCK_S */
+    const char *op_info); /*!< in: string for trx->op_info */
 
 /** Drop a tablespace as part of dropping or renaming a table.
 This deletes the fil_space_t if found and the file on disk.
@@ -419,17 +413,15 @@
  means that this function deletes the .ibd file and assigns a new table id for
  the table. Also the flag table->ibd_file_missing is set TRUE.
  @return error code or DB_SUCCESS */
-dberr_t row_discard_tablespace_for_mysql(
+[[nodiscard]] dberr_t row_discard_tablespace_for_mysql(
     const char *name, /*!< in: table name */
-    trx_t *trx)       /*!< in: transaction handle */
-    MY_ATTRIBUTE((warn_unused_result));
+    trx_t *trx);      /*!< in: transaction handle */
 /** Imports a tablespace. The space id in the .ibd file must match the space id
  of the table in the data dictionary.
  @return error code or DB_SUCCESS */
-dberr_t row_import_tablespace_for_mysql(
-    dict_table_t *table,      /*!< in/out: table */
-    row_prebuilt_t *prebuilt) /*!< in: prebuilt struct in MySQL */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t row_import_tablespace_for_mysql(
+    dict_table_t *table,       /*!< in/out: table */
+    row_prebuilt_t *prebuilt); /*!< in: prebuilt struct in MySQL */
 
 /** Drop a database for MySQL.
 @param[in]	name	database name which ends at '/'
@@ -445,10 +437,10 @@
 @param[in,out]	trx		transaction
 @param[in]      replay          whether in replay stage
 @return error code or DB_SUCCESS */
-dberr_t row_rename_table_for_mysql(const char *old_name, const char *new_name,
-                                   const dd::Table *dd_table, trx_t *trx,
-                                   bool replay)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t row_rename_table_for_mysql(const char *old_name,
+                                                 const char *new_name,
+                                                 const dd::Table *dd_table,
+                                                 trx_t *trx, bool replay);
 
 /** Read the total number of records in a consistent view.
 @param[in,out]  trx             Covering transaction.
@@ -470,10 +462,10 @@
 @param[in]      check_keys  True if called form check table.
 @param[out]     n_rows      Number of entries seen in the consistent read.
 @return DB_SUCCESS or other error */
-dberr_t row_scan_index_for_mysql(row_prebuilt_t *prebuilt, dict_index_t *index,
-                                 size_t n_threads, bool check_keys,
-                                 ulint *n_rows)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t row_scan_index_for_mysql(row_prebuilt_t *prebuilt,
+                                               dict_index_t *index,
+                                               size_t n_threads,
+                                               bool check_keys, ulint *n_rows);
 /** Initialize this module */
 void row_mysql_init(void);
 
@@ -940,6 +932,15 @@
   virtual void operator()(mtr_t *mtr, btr_pcur_t *pcur) noexcept = 0;
 };
 
+/** Get the updated parent field value from the update vector for the
+given col_no.
+@param[in]      foreign         foreign key information
+@param[in]      update          updated parent vector.
+@param[in]      col_no          base column position of the child table to check
+@return updated field from the parent update vector, else NULL */
+dfield_t *innobase_get_field_from_update_vector(dict_foreign_t *foreign,
+                                                upd_t *update, uint32_t col_no);
+
 /** Get the computed value by supplying the base column values.
 @param[in,out]	row		the data row
 @param[in]	col		virtual column
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/row0pread-adapter.h mysql-8.0-8.0.27/storage/innobase/include/row0pread-adapter.h
--- mysql-8.0-8.0.26/storage/innobase/include/row0pread-adapter.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/row0pread-adapter.h	2021-09-28 11:46:34.000000000 +0000
@@ -66,8 +66,9 @@
   @param[in]  config            (Cluster) Index scan configuration.
   @param[in]  f                 Callback function.
   @retval error. */
-  dberr_t add_scan(trx_t *trx, const Parallel_reader::Config &config,
-                   Parallel_reader::F &&f) MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t add_scan(trx_t *trx,
+                                 const Parallel_reader::Config &config,
+                                 Parallel_reader::F &&f);
 
   /** Run the parallel scan.
   @param[in]  thread_contexts   Context for each of the spawned threads
@@ -78,14 +79,13 @@
   @param[in]  end_fn            Callback called by each parallel load thread
                                 when processing of rows has ended.
   @return DB_SUCCESS or error code. */
-  dberr_t run(void **thread_contexts, Init_fn init_fn, Load_fn load_fn,
-              End_fn end_fn) MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t run(void **thread_contexts, Init_fn init_fn,
+                            Load_fn load_fn, End_fn end_fn);
 
   /** Convert the record in InnoDB format to MySQL format and send them.
   @param[in]  reader_ctx  Parallel read context.
   @return error code */
-  dberr_t process_rows(const Parallel_reader::Ctx *reader_ctx)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t process_rows(const Parallel_reader::Ctx *reader_ctx);
 
   /** Set up the query processing state cache.
   @param[in]  prebuilt           The prebuilt cache for the query. */
@@ -93,39 +93,38 @@
 
  private:
   /** Each parallel reader thread's init function.
-  @param[in]  reader_thread_ctx  context info related to the current thread
+  @param[in]  reader_thread_ctx  context info related to the
+  current thread
   @param[in]  prebuilt           prebuilt cache
   @return DB_SUCCESS or error code. */
-  dberr_t init(Parallel_reader::Thread_ctx *reader_thread_ctx,
-               row_prebuilt_t *prebuilt) MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t init(Parallel_reader::Thread_ctx *reader_thread_ctx,
+                             row_prebuilt_t *prebuilt);
 
   /** Each parallel reader thread's end function.
   @param[in]  reader_thread_ctx  context info related to the current thread
   @return DB_SUCCESS or error code. */
-  dberr_t end(Parallel_reader::Thread_ctx *reader_thread_ctx)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t end(Parallel_reader::Thread_ctx *reader_thread_ctx);
 
   /** Send a batch of records.
   @param[in]  reader_thread_ctx reader threads related thread context info
   @param[in]  partition_id      partition ID of the index the record belongs to
   @param[in]  n_recs            Number of records to send.
   @return DB_SUCCESS or error code. */
-  dberr_t send_batch(Parallel_reader::Thread_ctx *reader_thread_ctx,
-                     size_t partition_id, uint64_t n_recs)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t send_batch(
+      Parallel_reader::Thread_ctx *reader_thread_ctx, size_t partition_id,
+      uint64_t n_recs);
 
   /** Get the number of rows buffered but not sent.
   @param[in]  ctx  adapter related thread context information.
   @return number of buffered items. */
-  size_t pending(Thread_ctx *ctx) const MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] size_t pending(Thread_ctx *ctx) const {
     return (ctx->m_n_read - ctx->m_n_sent);
   }
 
   /** Check if the buffer is full.
   @param[in]  ctx  adapter related thread context information.
   @return true if the buffer is full. */
-  bool is_buffer_full(Thread_ctx *ctx) const
-      MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] bool is_buffer_full(Thread_ctx *ctx) const {
     return ctx->m_n_read > 0 && ctx->m_n_read % m_batch_size == 0;
   }
 
@@ -151,7 +150,7 @@
 
   /** MySQL row meta data. This is common across partitions. */
   struct MySQL_row {
-    using Column_meta_data = std::vector<ulong, ut_allocator<ulong>>;
+    using Column_meta_data = std::vector<ulong, ut::allocator<ulong>>;
 
     /** Column offsets. */
     Column_meta_data m_offsets{};
@@ -183,8 +182,12 @@
     /** Number of records sent to the adapter. */
     size_t m_n_sent{};
 
+    /** Partition ID for the records in buffer. Must be set when adding more
+    records to be sent i.e. while incrementing m_n_read. */
+    size_t m_partition_id{std::numeric_limits<size_t>::max()};
+
     /** Buffer to store records to be sent to the adapter. */
-    std::vector<byte, ut_allocator<byte>> m_buffer;
+    std::vector<byte, ut::allocator<byte>> m_buffer;
   };
 
   /** Prebuilt to use for conversion to MySQL row format.
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/row0pread.h mysql-8.0-8.0.27/storage/innobase/include/row0pread.h
--- mysql-8.0-8.0.26/storage/innobase/include/row0pread.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/row0pread.h	2021-09-28 11:46:34.000000000 +0000
@@ -41,6 +41,7 @@
 // Forward declarations
 struct trx_t;
 struct mtr_t;
+class PCursor;
 struct btr_pcur_t;
 struct buf_block_t;
 struct dict_table_t;
@@ -109,13 +110,28 @@
   spawned. */
   constexpr static size_t MAX_TOTAL_THREADS{MAX_THREADS + MAX_RESERVED_THREADS};
 
-  using Links = std::vector<page_no_t, ut_allocator<page_no_t>>;
+  using Links = std::vector<page_no_t, ut::allocator<page_no_t>>;
 
   // Forward declaration.
   class Ctx;
   class Scan_ctx;
   struct Thread_ctx;
 
+  /** Scan state. */
+  enum class State : uint8_t {
+    /** Unknown state. */
+    UNKNOWN,
+
+    /** Start/Finish thread state. */
+    THREAD,
+
+    /** Start/Finish Ctx state. */
+    CTX,
+
+    /** Start/Finish page read. */
+    PAGE
+  };
+
   /** Callback to initialise callers state. */
   using Start = std::function<dberr_t(Thread_ctx *thread_ctx)>;
 
@@ -147,7 +163,7 @@
     const dtuple_t *m_end{};
 
     /** Convert the instance to a string representation. */
-    std::string to_string() const MY_ATTRIBUTE((warn_unused_result));
+    [[nodiscard]] std::string to_string() const;
   };
 
   /** Scan (Scan_ctx) configuration. */
@@ -156,8 +172,8 @@
     @param[in] scan_range     Range to scan.
     @param[in] index          Cluster index to scan.
     @param[in] read_level     Btree level from which records need to be read.
-    @param[in] partition_id   Partition id if it the index to be scanned.
-    belongs to a partitioned table. */
+    @param[in] partition_id   Partition id if the index to be scanned.
+                              belongs to a partitioned table. */
     Config(const Scan_range &scan_range, dict_index_t *index,
            size_t read_level = 0,
            size_t partition_id = std::numeric_limits<size_t>::max())
@@ -230,12 +246,19 @@
       m_blob_heap = mem_heap_create(UNIV_PAGE_SIZE);
     }
 
+    /** @return the worker thread state. */
+    State get_state() const noexcept { return m_state; }
+
+    /** Save current position, commit any active mtr. */
+    void savepoint() noexcept;
+
+    /** Restore saved position and resume scan.
+    @return DB_SUCCESS or error code. */
+    [[nodiscard]] dberr_t restore_from_savepoint() noexcept;
+
     /** Thread ID. */
     size_t m_thread_id{std::numeric_limits<size_t>::max()};
 
-    /** Partition ID of the index the thread had processed earlier. */
-    size_t m_prev_partition_id{std::numeric_limits<size_t>::max()};
-
     /** Callback information related to the thread.
     @note Needs to be created and destroyed by the callback itself. */
     void *m_callback_ctx{};
@@ -243,6 +266,12 @@
     /** BLOB heap per thread. */
     mem_heap_t *m_blob_heap{};
 
+    /** Worker thread state. */
+    State m_state{State::UNKNOWN};
+
+    /** Current persistent cursor. */
+    PCursor *m_pcursor{};
+
     Thread_ctx(Thread_ctx &&) = delete;
     Thread_ctx(const Thread_ctx &) = delete;
     Thread_ctx &operator=(Thread_ctx &&) = delete;
@@ -250,16 +279,8 @@
   };
 
   /** Constructor.
-  @param[in]  max_threads Maximum number of threads to use.
-  @param[in]  sync        true if the read is synchronous */
-  explicit Parallel_reader(size_t max_threads, bool sync = true);
-
-  /** Constructor.
-  @param[in]  max_threads Maximum number of threads to use.
-  @param[in]  n_threads   Number of threads to be spawned.
-  @param[in]  sync        true if the read is synchronous */
-  explicit Parallel_reader(size_t max_threads, size_t n_threads,
-                           bool sync = true);
+  @param[in]  max_threads Maximum number of threads to use. */
+  explicit Parallel_reader(size_t max_threads);
 
   /** Destructor. */
   ~Parallel_reader();
@@ -269,33 +290,23 @@
   @param[in] use_reserved true if reserved threads needs to be considered
   while checking for availability of threads
   @return number of threads available. */
-  static size_t available_threads(size_t n_required, bool use_reserved = false)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static size_t available_threads(size_t n_required,
+                                                bool use_reserved);
 
   /** Release the parallel read threads. */
   static void release_threads(size_t n_threads) {
-    const auto RELAXED = std::memory_order_relaxed;
-    auto active = s_active_threads.fetch_sub(n_threads, RELAXED);
+    const auto SEQ_CST = std::memory_order_seq_cst;
+    auto active = s_active_threads.fetch_sub(n_threads, SEQ_CST);
     ut_a(active >= n_threads);
   }
 
-  /** Fallback to single threaded mode in case of out of resource
-  issue where extra threads cannot be spawned. */
-  void fallback_to_single_threaded_mode() {
-    m_single_threaded_mode = true;
-    release_unused_threads(m_n_threads);
-    m_n_threads = 0;
-    reset_error_state();
-  }
-
   /** Add scan context.
   @param[in,out]  trx         Covering transaction.
   @param[in]      config      Scan condfiguration.
   @param[in]      f           Callback function.
   (default is 0 which is leaf level)
   @return error. */
-  dberr_t add_scan(trx_t *trx, const Config &config, F &&f)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t add_scan(trx_t *trx, const Config &config, F &&f);
 
   /** Wait for the join of threads spawned by the parallel reader. */
   void join() {
@@ -306,13 +317,11 @@
 
   /** Get the error stored in the global error state.
   @return global error state. */
-  dberr_t get_error_state() const MY_ATTRIBUTE((warn_unused_result)) {
-    return (m_err);
-  }
+  [[nodiscard]] dberr_t get_error_state() const { return m_err; }
 
   /** @return true if the tree is empty, else false. */
-  bool is_tree_empty() const MY_ATTRIBUTE((warn_unused_result)) {
-    return (m_ctx_id.load(std::memory_order_relaxed) == 0);
+  [[nodiscard]] bool is_tree_empty() const {
+    return m_ctx_id.load(std::memory_order_relaxed) == 0;
   }
 
   /** Set the callback that must be called before any processing.
@@ -323,18 +332,23 @@
   @param[in] f                  Call after last row is processed.*/
   void set_finish_callback(Finish &&f) { m_finish_callback = std::move(f); }
 
+  /** Spawn the threads to do the parallel read for the specified range.
+  Don't wait for the spawned to threads to complete.
+  @param[in]  n_threads number of threads that *need* to be spawned
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t spawn(size_t n_threads) noexcept;
+
   /** Start the threads to do the parallel read for the specified range.
+  @param[in] n_threads          Number of threads to use for the scan.
   @return DB_SUCCESS or error code. */
-  dberr_t run() MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t run(size_t n_threads);
 
   /** @return the configured max threads size. */
-  size_t max_threads() const MY_ATTRIBUTE((warn_unused_result)) {
-    return m_max_threads;
-  }
+  [[nodiscard]] size_t max_threads() const { return m_max_threads; }
 
   /** @return true if in error state. */
-  bool is_error_set() const MY_ATTRIBUTE((warn_unused_result)) {
-    return (m_err.load(std::memory_order_relaxed) != DB_SUCCESS);
+  [[nodiscard]] bool is_error_set() const {
+    return m_err.load(std::memory_order_relaxed) != DB_SUCCESS;
   }
 
   /** Set the error state.
@@ -357,9 +371,6 @@
   Parallel_reader &operator=(const Parallel_reader &) = delete;
 
  private:
-  /** Reset error state. */
-  void reset_error_state() { m_err = DB_SUCCESS; }
-
   /** Release unused threads back to the pool.
   @param[in] unused_threads     Number of threads to "release". */
   void release_unused_threads(size_t unused_threads) {
@@ -373,10 +384,10 @@
 
   /** Fetch the next job execute.
   @return job to execute or nullptr. */
-  std::shared_ptr<Ctx> dequeue() MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] std::shared_ptr<Ctx> dequeue();
 
   /** @return true if job queue is empty. */
-  bool is_queue_empty() const MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool is_queue_empty() const;
 
   /** Poll for requests and execute.
   @param[in]  thread_ctx  thread related context information */
@@ -386,25 +397,25 @@
   void parallel_read();
 
   /** @return true if tasks are still executing. */
-  bool is_active() const MY_ATTRIBUTE((warn_unused_result)) {
-    return (m_n_completed.load(std::memory_order_relaxed) <
-            m_ctx_id.load(std::memory_order_relaxed));
+  [[nodiscard]] bool is_active() const {
+    return m_n_completed.load(std::memory_order_relaxed) <
+           m_ctx_id.load(std::memory_order_relaxed);
   }
 
  private:
   // clang-format off
   using Ctxs =
       std::list<std::shared_ptr<Ctx>,
-                ut_allocator<std::shared_ptr<Ctx>>>;
+                ut::allocator<std::shared_ptr<Ctx>>>;
 
   using Scan_ctxs =
       std::list<std::shared_ptr<Scan_ctx>,
-                ut_allocator<std::shared_ptr<Scan_ctx>>>;
+                ut::allocator<std::shared_ptr<Scan_ctx>>>;
 
   // clang-format on
 
   /** Maximum number of worker threads to use. */
-  const size_t m_max_threads;
+  size_t m_max_threads{};
 
   /** Number of worker threads that will be spawned. */
   size_t m_n_threads{0};
@@ -418,10 +429,6 @@
   /** Scan contexts. */
   Scan_ctxs m_scan_ctxs{};
 
-  /** True if we fallback to single threaded mode in case of out of resource
-  issue where extra threads cannot be spawned. */
-  bool m_single_threaded_mode{false};
-
   /** For signalling worker threads about events. */
   os_event_t m_event{};
 
@@ -447,7 +454,7 @@
   std::atomic<dberr_t> m_err{DB_SUCCESS};
 
   /** List of threads used for paralle_read purpose. */
-  std::vector<IB_thread, ut_allocator<IB_thread>> m_parallel_read_threads;
+  std::vector<IB_thread, ut::allocator<IB_thread>> m_parallel_read_threads;
 
   /** Number of threads currently doing parallel reads. */
   static std::atomic_size_t s_active_threads;
@@ -456,15 +463,12 @@
   bool m_sync;
 
   /** Context information related to each parallel reader thread. */
-  std::vector<Thread_ctx *, ut_allocator<Thread_ctx *>> m_thread_ctxs;
-
-  friend class Ctx;
-  friend class Scan_ctx;
+  std::vector<Thread_ctx *, ut::allocator<Thread_ctx *>> m_thread_ctxs;
 };
 
 /** Parallel reader context. */
 class Parallel_reader::Scan_ctx {
- private:
+ public:
   /** Constructor.
   @param[in]  reader          Parallel reader that owns this context.
   @param[in]  id              ID of this scan context.
@@ -474,7 +478,6 @@
   Scan_ctx(Parallel_reader *reader, size_t id, trx_t *trx,
            const Parallel_reader::Config &config, F &&f);
 
- public:
   /** Destructor. */
   ~Scan_ctx() = default;
 
@@ -505,15 +508,15 @@
   using Savepoint = std::pair<ulint, buf_block_t *>;
 
   /** For releasing the S latches after processing the blocks. */
-  using Savepoints = std::vector<Savepoint, ut_allocator<Savepoint>>;
+  using Savepoints = std::vector<Savepoint, ut::allocator<Savepoint>>;
 
   /** The first cursor should read up to the second cursor [f, s). */
   using Range = std::pair<std::shared_ptr<Iter>, std::shared_ptr<Iter>>;
 
-  using Ranges = std::vector<Range, ut_allocator<Range>>;
+  using Ranges = std::vector<Range, ut::allocator<Range>>;
 
   /** @return the scan context ID. */
-  size_t id() const MY_ATTRIBUTE((warn_unused_result)) { return (m_id); }
+  [[nodiscard]] size_t id() const { return m_id; }
 
   /** Set the error state.
   @param[in] err                Error state to set to. */
@@ -522,8 +525,8 @@
   }
 
   /** @return true if in error state. */
-  bool is_error_set() const MY_ATTRIBUTE((warn_unused_result)) {
-    return (m_err.load(std::memory_order_relaxed) != DB_SUCCESS);
+  [[nodiscard]] bool is_error_set() const {
+    return m_err.load(std::memory_order_relaxed) != DB_SUCCESS;
   }
 
   /** Fetch a block from the buffer pool and acquire an S latch on it.
@@ -531,9 +534,8 @@
   @param[in,out]  mtr           Mini-transaction covering the fetch.
   @param[in]      line          Line from where called.
   @return the block fetched from the buffer pool. */
-  buf_block_t *block_get_s_latched(const page_id_t &page_id, mtr_t *mtr,
-                                   int line) const
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] buf_block_t *block_get_s_latched(const page_id_t &page_id,
+                                                 mtr_t *mtr, int line) const;
 
   /** Partition the B+Tree for parallel read.
   @param[in] scan_range Range for partitioning.
@@ -548,8 +550,8 @@
   @param[in]  block             Page to look in.
   @param[in] key                Key of the first record in the range.
   @return the left child page number. */
-  page_no_t search(const buf_block_t *block, const dtuple_t *key) const
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] page_no_t search(const buf_block_t *block,
+                                 const dtuple_t *key) const;
 
   /** Traverse from given sub-tree page number to start of the scan range
   from the given page number.
@@ -558,9 +560,9 @@
   @param[in]      key           Key of the first record in the range.
   @param[in,out]  savepoints    Blocks S latched and accessed.
   @return the leaf node page cursor. */
-  page_cur_t start_range(page_no_t page_no, mtr_t *mtr, const dtuple_t *key,
-                         Savepoints &savepoints) const
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] page_cur_t start_range(page_no_t page_no, mtr_t *mtr,
+                                       const dtuple_t *key,
+                                       Savepoints &savepoints) const;
 
   /** Create and add the range to the scan ranges.
   @param[in,out]  ranges        Ranges to scan.
@@ -591,9 +593,8 @@
   @param[in]      page_cursor   Current page cursor
   @param[in]      mtr           Mini-transaction covering the read.
   @return Start iterator. */
-  std::shared_ptr<Iter> create_persistent_cursor(const page_cur_t &page_cursor,
-                                                 mtr_t *mtr) const
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] std::shared_ptr<Iter> create_persistent_cursor(
+      const page_cur_t &page_cursor, mtr_t *mtr) const;
 
   /** Build an old version of the row if required.
   @param[in,out]  rec           Current row read from the index. This can
@@ -604,27 +605,23 @@
                                 built from the undo log.
   @param[in,out]  mtr           Mini-transaction covering the read.
   @return true if row is visible to the transaction. */
-  bool check_visibility(const rec_t *&rec, ulint *&offsets, mem_heap_t *&heap,
-                        mtr_t *mtr) MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool check_visibility(const rec_t *&rec, ulint *&offsets,
+                                      mem_heap_t *&heap, mtr_t *mtr);
 
   /** Create an execution context for a range and add it to
   the Parallel_reader's run queue.
   @param[in] range              Range for which to create the context.
   @param[in] split              true if the sub-tree should be split further.
   @return DB_SUCCESS or error code. */
-  dberr_t create_context(const Range &range, bool split)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t create_context(const Range &range, bool split);
 
   /** Create the execution contexts based on the ranges.
   @param[in]  ranges            Ranges for which to create the contexts.
   @return DB_SUCCESS or error code. */
-  dberr_t create_contexts(const Ranges &ranges)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t create_contexts(const Ranges &ranges);
 
   /** @return the maximum number of threads configured. */
-  size_t max_threads() const MY_ATTRIBUTE((warn_unused_result)) {
-    return m_reader->m_max_threads;
-  }
+  [[nodiscard]] size_t max_threads() const { return m_reader->max_threads(); }
 
   /** Release unused threads back to the pool.
   @param[in] unused_threads     Number of threads to "release". */
@@ -640,7 +637,7 @@
 
   /** @return true if at least one thread owns the S latch on the index. */
   bool index_s_own() const {
-    return (m_s_locks.load(std::memory_order_acquire) > 0);
+    return m_s_locks.load(std::memory_order_acquire) > 0;
   }
 
  private:
@@ -671,7 +668,6 @@
   std::atomic_size_t m_s_locks{};
 
   friend class Parallel_reader;
-  friend class Parallel_reader::Ctx;
 
   Scan_ctx(Scan_ctx &&) = delete;
   Scan_ctx(const Scan_ctx &) = delete;
@@ -679,11 +675,9 @@
   Scan_ctx &operator=(const Scan_ctx &) = delete;
 };
 
-class PCursor;
-
 /** Parallel reader execution context. */
 class Parallel_reader::Ctx {
- private:
+ public:
   /** Constructor.
   @param[in]    id              Thread ID.
   @param[in]    scan_ctx        Scan context.
@@ -691,44 +685,34 @@
   Ctx(size_t id, Scan_ctx *scan_ctx, const Scan_ctx::Range &range)
       : m_id(id), m_range(range), m_scan_ctx(scan_ctx) {}
 
- public:
   /** Destructor. */
   ~Ctx() = default;
 
  public:
   /** @return the context ID. */
-  size_t id() const MY_ATTRIBUTE((warn_unused_result)) { return (m_id); }
+  [[nodiscard]] size_t id() const { return m_id; }
 
   /** The scan ID of the scan context this belongs to. */
-  size_t scan_id() const MY_ATTRIBUTE((warn_unused_result)) {
-    return (m_scan_ctx->id());
-  }
+  [[nodiscard]] size_t scan_id() const { return m_scan_ctx->id(); }
 
   /** @return the covering transaction. */
-  const trx_t *trx() const MY_ATTRIBUTE((warn_unused_result)) {
-    return (m_scan_ctx->m_trx);
-  }
+  [[nodiscard]] const trx_t *trx() const { return m_scan_ctx->m_trx; }
 
   /** @return the index being scanned. */
-  const dict_index_t *index() const MY_ATTRIBUTE((warn_unused_result)) {
-    return (m_scan_ctx->m_config.m_index);
+  [[nodiscard]] const dict_index_t *index() const {
+    return m_scan_ctx->m_config.m_index;
   }
 
   /** @return ID of the thread processing this context */
-  size_t thread_id() const MY_ATTRIBUTE((warn_unused_result)) {
-    return m_thread_ctx->m_thread_id;
-  }
+  [[nodiscard]] size_t thread_id() const { return m_thread_ctx->m_thread_id; }
 
-  /** @return context information related to the thread processing this
-  context */
-  Thread_ctx *thread_ctx() const MY_ATTRIBUTE((warn_unused_result)) {
-    return m_thread_ctx;
-  }
+  /** @return the thread context of the reader thread. */
+  [[nodiscard]] Thread_ctx *thread_ctx() const { return m_thread_ctx; }
 
   /** @return the partition id of the index.
   @note this is std::numeric_limits<size_t>::max() if the index does not
   belong to a partition. */
-  size_t partition_id() const MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] size_t partition_id() const {
     return m_scan_ctx->m_config.m_partition_id;
   }
 
@@ -743,13 +727,13 @@
   @return true if row is visible to the transaction. */
   bool is_rec_visible(const rec_t *&rec, ulint *&offsets, mem_heap_t *&heap,
                       mtr_t *mtr) {
-    return (m_scan_ctx->check_visibility(rec, offsets, heap, mtr));
+    return m_scan_ctx->check_visibility(rec, offsets, heap, mtr);
   }
 
  private:
   /** Traverse the pages by key order.
   @return DB_SUCCESS or error code. */
-  dberr_t traverse() MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t traverse();
 
   /** Traverse the records in a node.
   @param[in]  pcursor persistent b-tree cursor
@@ -759,16 +743,15 @@
 
   /** Move to the next node in the specified level.
   @param[in]  pcursor persistent b-tree cursor
-  @param[in]  mtr mtr
   @return success */
-  bool move_to_next_node(PCursor *pcursor, mtr_t *mtr);
+  bool move_to_next_node(PCursor *pcursor);
 
   /** Split the context into sub-ranges and add them to the execution queue.
   @return DB_SUCCESS or error code. */
-  dberr_t split() MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t split();
 
   /** @return true if in error state. */
-  bool is_error_set() const MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] bool is_error_set() const {
     return m_scan_ctx->m_reader->is_error_set() || m_scan_ctx->is_error_set();
   }
 
@@ -776,7 +759,7 @@
   /** Context ID. */
   size_t m_id{std::numeric_limits<size_t>::max()};
 
-  /** If true the split the context at the block level. */
+  /** If true then split the context at the block level. */
   bool m_split{};
 
   /** Range to read in this context. */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/row0pread-histogram.h mysql-8.0-8.0.27/storage/innobase/include/row0pread-histogram.h
--- mysql-8.0-8.0.26/storage/innobase/include/row0pread-histogram.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/row0pread-histogram.h	2021-09-28 11:46:34.000000000 +0000
@@ -99,21 +99,19 @@
   void set_error_state(dberr_t err) { m_err = err; }
 
   /** @return true if in error state. */
-  bool is_error_set() const MY_ATTRIBUTE((warn_unused_result)) {
-    return (m_err != DB_SUCCESS);
-  }
+  [[nodiscard]] bool is_error_set() const { return (m_err != DB_SUCCESS); }
 
   /** Each parallel reader thread's init function.
   @param[in]  reader_thread_ctx  context information related to the thread
   @return DB_SUCCESS or error code. */
-  dberr_t start_callback(Parallel_reader::Thread_ctx *reader_thread_ctx)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t start_callback(
+      Parallel_reader::Thread_ctx *reader_thread_ctx);
 
   /** Each parallel reader thread's end function.
   @param[in]  reader_thread_ctx  context information related to the thread
   @return DB_SUCCESS or error code. */
-  dberr_t finish_callback(Parallel_reader::Thread_ctx *reader_thread_ctx)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t finish_callback(
+      Parallel_reader::Thread_ctx *reader_thread_ctx);
 
   /** Convert the row in InnoDB format to MySQL format and store in the buffer
   for server to use.
@@ -133,9 +131,8 @@
   @param[in]  ctx       Parallel read context.
   @param[in]  prebuilt  Row meta-data cache.
   @return error code */
-  dberr_t process_non_leaf_rec(const Parallel_reader::Ctx *ctx,
-                               row_prebuilt_t *prebuilt)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t process_non_leaf_rec(const Parallel_reader::Ctx *ctx,
+                                             row_prebuilt_t *prebuilt);
 
   /** Process the record in the leaf page. This would happen only when the root
   page is the leaf page and in such a case we process the page regardless of
@@ -143,9 +140,8 @@
   @param[in]  ctx       Parallel read context.
   @param[in]  prebuilt  Row meta-data cache.
   @return error code */
-  dberr_t process_leaf_rec(const Parallel_reader::Ctx *ctx,
-                           row_prebuilt_t *prebuilt)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t process_leaf_rec(const Parallel_reader::Ctx *ctx,
+                                         row_prebuilt_t *prebuilt);
 
  private:
   /** Buffer to store the sampled row which is in the MySQL format. */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/row0purge.h mysql-8.0-8.0.27/storage/innobase/include/row0purge.h
--- mysql-8.0-8.0.26/storage/innobase/include/row0purge.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/row0purge.h	2021-09-28 11:46:34.000000000 +0000
@@ -48,8 +48,8 @@
 @param[in]	parent	parent node, i.e., a thr node
 @param[in]	heap	memory heap where created
 @return own: purge node */
-purge_node_t *row_purge_node_create(que_thr_t *parent, mem_heap_t *heap)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] purge_node_t *row_purge_node_create(que_thr_t *parent,
+                                                  mem_heap_t *heap);
 
 /** Determines if it is possible to remove a secondary index entry.
  Removal is possible if the secondary index entry does not refer to any
@@ -65,16 +65,16 @@
  secondary index entry after purge has removed it and released the leaf
  page latch.
  @return true if the secondary index record can be purged */
-bool row_purge_poss_sec(purge_node_t *node,    /*!< in/out: row purge node */
-                        dict_index_t *index,   /*!< in: secondary index */
-                        const dtuple_t *entry) /*!< in: secondary index entry */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool row_purge_poss_sec(
+    purge_node_t *node,     /*!< in/out: row purge node */
+    dict_index_t *index,    /*!< in: secondary index */
+    const dtuple_t *entry); /*!< in: secondary index entry */
 /***************************************************************
 Does the purge operation for a single undo log record. This is a high-level
 function used in an SQL execution graph.
 @return query thread to run next or NULL */
-que_thr_t *row_purge_step(que_thr_t *thr) /*!< in: query thread */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] que_thr_t *row_purge_step(
+    que_thr_t *thr); /*!< in: query thread */
 
 using Page_free_tuple = std::tuple<index_id_t, page_id_t, table_id_t>;
 
@@ -208,7 +208,7 @@
 
  private:
   using LOB_free_set = std::set<Page_free_tuple, Compare_page_free_tuple,
-                                ut_allocator<Page_free_tuple>>;
+                                ut::allocator<Page_free_tuple>>;
 
   /** Set of LOB first pages that are to be freed. */
   LOB_free_set m_lob_pages;
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/row0quiesce.h mysql-8.0-8.0.27/storage/innobase/include/row0quiesce.h
--- mysql-8.0-8.0.26/storage/innobase/include/row0quiesce.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/row0quiesce.h	2021-09-28 11:46:34.000000000 +0000
@@ -62,11 +62,10 @@
 
 /** Set a table's quiesce state.
  @return DB_SUCCESS or errro code. */
-dberr_t row_quiesce_set_state(
+[[nodiscard]] dberr_t row_quiesce_set_state(
     dict_table_t *table, /*!< in: quiesce this table */
     ib_quiesce_t state,  /*!< in: quiesce state to set */
-    trx_t *trx)          /*!< in/out: transaction */
-    MY_ATTRIBUTE((warn_unused_result));
+    trx_t *trx);         /*!< in/out: transaction */
 
 /** Cleanup after table quiesce.
 @param[in] table Quiesce this table
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/row0row.h mysql-8.0-8.0.27/storage/innobase/include/row0row.h
--- mysql-8.0-8.0.26/storage/innobase/include/row0row.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/row0row.h	2021-09-28 11:46:34.000000000 +0000
@@ -46,24 +46,21 @@
 /** Gets the offset of the DB_TRX_ID field, in bytes relative to the origin of
  a clustered index record.
  @return offset of DATA_TRX_ID */
-static inline ulint row_get_trx_id_offset(
+[[nodiscard]] static inline ulint row_get_trx_id_offset(
     const dict_index_t *index, /*!< in: clustered index */
-    const ulint *offsets)      /*!< in: record offsets */
-    MY_ATTRIBUTE((warn_unused_result));
+    const ulint *offsets);     /*!< in: record offsets */
 /** Reads the trx id field from a clustered index record.
  @return value of the field */
-static inline trx_id_t row_get_rec_trx_id(
+[[nodiscard]] static inline trx_id_t row_get_rec_trx_id(
     const rec_t *rec,          /*!< in: record */
     const dict_index_t *index, /*!< in: clustered index */
-    const ulint *offsets)      /*!< in: rec_get_offsets(rec, index) */
-    MY_ATTRIBUTE((warn_unused_result));
+    const ulint *offsets);     /*!< in: rec_get_offsets(rec, index) */
 /** Reads the roll pointer field from a clustered index record.
  @return value of the field */
-static inline roll_ptr_t row_get_rec_roll_ptr(
+[[nodiscard]] static inline roll_ptr_t row_get_rec_roll_ptr(
     const rec_t *rec,          /*!< in: record */
     const dict_index_t *index, /*!< in: clustered index */
-    const ulint *offsets)      /*!< in: rec_get_offsets(rec, index) */
-    MY_ATTRIBUTE((warn_unused_result));
+    const ulint *offsets);     /*!< in: rec_get_offsets(rec, index) */
 
 /* Flags for row build type. */
 #define ROW_BUILD_NORMAL 0     /*!< build index row */
@@ -75,7 +72,7 @@
  @return index entry which should be inserted or purged
  @retval NULL if the externally stored columns in the clustered index record
  are unavailable and ext != NULL, or row is missing some needed columns. */
-dtuple_t *row_build_index_entry_low(
+[[nodiscard]] dtuple_t *row_build_index_entry_low(
     const dtuple_t *row,       /*!< in: row which should be
                                inserted or purged */
     const row_ext_t *ext,      /*!< in: externally stored column
@@ -84,25 +81,23 @@
     mem_heap_t *heap,          /*!< in: memory heap from which
                                the memory for the index entry
                                is allocated */
-    ulint flag)                /*!< in: ROW_BUILD_NORMAL,
-                               ROW_BUILD_FOR_PURGE
-                               or ROW_BUILD_FOR_UNDO */
-    MY_ATTRIBUTE((warn_unused_result));
+    ulint flag);               /*!< in: ROW_BUILD_NORMAL,
+                              ROW_BUILD_FOR_PURGE
+                              or ROW_BUILD_FOR_UNDO */
 /** When an insert or purge to a table is performed, this function builds
  the entry to be inserted into or purged from an index on the table.
  @return index entry which should be inserted or purged, or NULL if the
  externally stored columns in the clustered index record are
  unavailable and ext != NULL */
-static inline dtuple_t *row_build_index_entry(
+[[nodiscard]] static inline dtuple_t *row_build_index_entry(
     const dtuple_t *row,       /*!< in: row which should be
                                inserted or purged */
     const row_ext_t *ext,      /*!< in: externally stored column
                                prefixes, or NULL */
     const dict_index_t *index, /*!< in: index on the table */
-    mem_heap_t *heap)          /*!< in: memory heap from which
-                               the memory for the index entry
-                               is allocated */
-    MY_ATTRIBUTE((warn_unused_result));
+    mem_heap_t *heap);         /*!< in: memory heap from which
+                              the memory for the index entry
+                              is allocated */
 /** An inverse function to row_build_index_entry. Builds a row from a
  record in a clustered index.
  @return own: row built; see the NOTE below! */
@@ -180,27 +175,25 @@
 /** Converts an index record to a typed data tuple.
  @return index entry built; does not set info_bits, and the data fields
  in the entry will point directly to rec */
-dtuple_t *row_rec_to_index_entry_low(
+[[nodiscard]] dtuple_t *row_rec_to_index_entry_low(
     const rec_t *rec,          /*!< in: record in the index */
     const dict_index_t *index, /*!< in: index */
     const ulint *offsets,      /*!< in: rec_get_offsets(rec, index) */
-    mem_heap_t *heap)          /*!< in: memory heap from which
-                               the memory needed is allocated */
-    MY_ATTRIBUTE((warn_unused_result));
+    mem_heap_t *heap);         /*!< in: memory heap from which
+                              the memory needed is allocated */
 /** Converts an index record to a typed data tuple. NOTE that externally
  stored (often big) fields are NOT copied to heap.
  @return own: index entry built */
-dtuple_t *row_rec_to_index_entry(
+[[nodiscard]] dtuple_t *row_rec_to_index_entry(
     const rec_t *rec,          /*!< in: record in the index */
     const dict_index_t *index, /*!< in: index */
     const ulint *offsets,      /*!< in/out: rec_get_offsets(rec) */
-    mem_heap_t *heap)          /*!< in: memory heap from which
-                               the memory needed is allocated */
-    MY_ATTRIBUTE((warn_unused_result));
+    mem_heap_t *heap);         /*!< in: memory heap from which
+                              the memory needed is allocated */
 /** Builds from a secondary index record a row reference with which we can
  search the clustered index record.
  @return own: row reference built; see the NOTE below! */
-dtuple_t *row_build_row_ref(
+[[nodiscard]] dtuple_t *row_build_row_ref(
     ulint type,                /*!< in: ROW_COPY_DATA, or ROW_COPY_POINTERS:
                                the former copies also the data fields to
                                heap, whereas the latter only places pointers
@@ -213,9 +206,8 @@
                                the buffer page of this record must be
                                at least s-latched and the latch held
                                as long as the row reference is used! */
-    mem_heap_t *heap)          /*!< in: memory heap from which the memory
-                               needed is allocated */
-    MY_ATTRIBUTE((warn_unused_result));
+    mem_heap_t *heap);         /*!< in: memory heap from which the memory
+                              needed is allocated */
 
 /** Builds from a secondary index record a row reference with which we can
 search the clustered index record.
@@ -245,23 +237,22 @@
 /** Searches the clustered index record for a row, if we have the row
  reference.
  @return true if found */
-ibool row_search_on_row_ref(btr_pcur_t *pcur, /*!< out: persistent cursor, which
-                                              must be closed by the caller */
-                            ulint mode,       /*!< in: BTR_MODIFY_LEAF, ... */
-                            dict_table_t *table, /*!< in: table */
-                            const dtuple_t *ref, /*!< in: row reference */
-                            mtr_t *mtr)          /*!< in/out: mtr */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] ibool row_search_on_row_ref(
+    btr_pcur_t *pcur,    /*!< out: persistent cursor, which
+            must be closed by the caller */
+    ulint mode,          /*!< in: BTR_MODIFY_LEAF, ... */
+    dict_table_t *table, /*!< in: table */
+    const dtuple_t *ref, /*!< in: row reference */
+    mtr_t *mtr);         /*!< in/out: mtr */
 /** Fetches the clustered index record for a secondary index record. The latches
  on the secondary index record are preserved.
  @return record or NULL, if no record found */
-rec_t *row_get_clust_rec(
+[[nodiscard]] rec_t *row_get_clust_rec(
     ulint mode,                 /*!< in: BTR_MODIFY_LEAF, ... */
     const rec_t *rec,           /*!< in: record in a secondary index */
     const dict_index_t *index,  /*!< in: secondary index */
     dict_index_t **clust_index, /*!< out: clustered index */
-    mtr_t *mtr)                 /*!< in: mtr */
-    MY_ATTRIBUTE((warn_unused_result));
+    mtr_t *mtr);                /*!< in: mtr */
 
 /** Parse the integer data from specified data, which could be
 DATA_INT, DATA_FLOAT or DATA_DOUBLE. If the value is less than 0
@@ -304,14 +295,13 @@
 
 /** Searches an index record.
  @return whether the record was found or buffered */
-enum row_search_result row_search_index_entry(
+[[nodiscard]] enum row_search_result row_search_index_entry(
     dict_index_t *index,   /*!< in: index */
     const dtuple_t *entry, /*!< in: index entry */
     ulint mode,            /*!< in: BTR_MODIFY_LEAF, ... */
     btr_pcur_t *pcur,      /*!< in/out: persistent cursor, which must
                            be closed by the caller */
-    mtr_t *mtr)            /*!< in: mtr */
-    MY_ATTRIBUTE((warn_unused_result));
+    mtr_t *mtr);           /*!< in: mtr */
 
 #define ROW_COPY_DATA 1
 #define ROW_COPY_POINTERS 2
@@ -328,14 +318,14 @@
  number of bytes that were written to "buf" is returned (including the
  terminating NUL).
  @return number of bytes that were written */
-ulint row_raw_format(const char *data,               /*!< in: raw data */
-                     ulint data_len,                 /*!< in: raw data length
-                                                     in bytes */
-                     const dict_field_t *dict_field, /*!< in: index field */
-                     char *buf,                      /*!< out: output buffer */
-                     ulint buf_size)                 /*!< in: output buffer size
-                                                     in bytes */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] ulint row_raw_format(
+    const char *data,               /*!< in: raw data */
+    ulint data_len,                 /*!< in: raw data length
+                                    in bytes */
+    const dict_field_t *dict_field, /*!< in: index field */
+    char *buf,                      /*!< out: output buffer */
+    ulint buf_size);                /*!< in: output buffer size
+                                   in bytes */
 
 /** Class to build a series of entries based on one multi-value field.
 It assumes that there is only one multi-value field on multi-value index. */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/row0sel.h mysql-8.0-8.0.27/storage/innobase/include/row0sel.h
--- mysql-8.0-8.0.26/storage/innobase/include/row0sel.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/row0sel.h	2021-09-28 11:46:34.000000000 +0000
@@ -161,10 +161,9 @@
                                 cursor 'direction' should be 0.
 @return DB_SUCCESS, DB_RECORD_NOT_FOUND, DB_END_OF_INDEX, DB_DEADLOCK,
 DB_LOCK_TABLE_FULL, DB_CORRUPTION, or DB_TOO_BIG_RECORD */
-static inline dberr_t row_search_for_mysql(byte *buf, page_cur_mode_t mode,
-                                           row_prebuilt_t *prebuilt,
-                                           ulint match_mode, ulint direction)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline dberr_t row_search_for_mysql(
+    byte *buf, page_cur_mode_t mode, row_prebuilt_t *prebuilt, ulint match_mode,
+    ulint direction);
 
 /** Searches for rows in the database using cursor.
 Function is for temporary tables that are not shared accross connections
@@ -184,9 +183,9 @@
                                 pcur with stored position! In opening of a
                                 cursor 'direction' should be 0.
 @return DB_SUCCESS or error code */
-dberr_t row_search_no_mvcc(byte *buf, page_cur_mode_t mode,
-                           row_prebuilt_t *prebuilt, ulint match_mode,
-                           ulint direction) MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t row_search_no_mvcc(byte *buf, page_cur_mode_t mode,
+                                         row_prebuilt_t *prebuilt,
+                                         ulint match_mode, ulint direction);
 
 /** Searches for rows in the database using cursor.
 Function is mainly used for tables that are shared accorss connection and
@@ -207,10 +206,9 @@
                                 pcur with stored position! In opening of a
                                 cursor 'direction' should be 0.
 @return DB_SUCCESS or error code */
-dberr_t row_search_mvcc(byte *buf, page_cur_mode_t mode,
-                        row_prebuilt_t *prebuilt, ulint match_mode,
-                        const ulint direction)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t row_search_mvcc(byte *buf, page_cur_mode_t mode,
+                                      row_prebuilt_t *prebuilt,
+                                      ulint match_mode, const ulint direction);
 
 /** Count rows in a R-Tree leaf level.
  @return DB_SUCCESS if successful */
@@ -229,11 +227,10 @@
 
 /** Read the max AUTOINC value from an index.
  @return DB_SUCCESS if all OK else error code */
-dberr_t row_search_max_autoinc(
+[[nodiscard]] dberr_t row_search_max_autoinc(
     dict_index_t *index,  /*!< in: index to search */
     const char *col_name, /*!< in: autoinc column name */
-    ib_uint64_t *value)   /*!< out: AUTOINC value read */
-    MY_ATTRIBUTE((warn_unused_result));
+    ib_uint64_t *value);  /*!< out: AUTOINC value read */
 
 /** A structure for caching column values for prefetched rows */
 struct sel_buf_t {
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/row0uins.h mysql-8.0-8.0.27/storage/innobase/include/row0uins.h
--- mysql-8.0-8.0.26/storage/innobase/include/row0uins.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/row0uins.h	2021-09-28 11:46:34.000000000 +0000
@@ -48,8 +48,7 @@
  if it figures out that an index record will be removed in the purge
  anyway, it will remove it in the rollback.
  @return DB_SUCCESS */
-dberr_t row_undo_ins(undo_node_t *node, /*!< in: row undo node */
-                     que_thr_t *thr)    /*!< in: query thread */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t row_undo_ins(undo_node_t *node, /*!< in: row undo node */
+                                   que_thr_t *thr);   /*!< in: query thread */
 
 #endif
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/row0umod.h mysql-8.0-8.0.27/storage/innobase/include/row0umod.h
--- mysql-8.0-8.0.26/storage/innobase/include/row0umod.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/row0umod.h	2021-09-28 11:46:34.000000000 +0000
@@ -43,8 +43,7 @@
 
 /** Undoes a modify operation on a row of a table.
  @return DB_SUCCESS or error code */
-dberr_t row_undo_mod(undo_node_t *node, /*!< in: row undo node */
-                     que_thr_t *thr)    /*!< in: query thread */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t row_undo_mod(undo_node_t *node, /*!< in: row undo node */
+                                   que_thr_t *thr);   /*!< in: query thread */
 
 #endif
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/row0undo.h mysql-8.0-8.0.27/storage/innobase/include/row0undo.h
--- mysql-8.0-8.0.26/storage/innobase/include/row0undo.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/row0undo.h	2021-09-28 11:46:34.000000000 +0000
@@ -64,9 +64,8 @@
  by the caller in any case.
  @return true if found; NOTE the node->pcur must be closed by the
  caller, regardless of the return value */
-bool row_undo_search_clust_to_pcur(
-    undo_node_t *node) /*!< in/out: row undo node */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool row_undo_search_clust_to_pcur(
+    undo_node_t *node); /*!< in/out: row undo node */
 /** Undoes a row operation in a table. This is a high-level function used
  in SQL execution graphs.
  @return query thread to run next or NULL */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/row0upd.h mysql-8.0-8.0.27/storage/innobase/include/row0upd.h
--- mysql-8.0-8.0.26/storage/innobase/include/row0upd.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/row0upd.h	2021-09-28 11:46:34.000000000 +0000
@@ -89,11 +89,10 @@
                                             const dict_index_t *index);
 /** Returns a field of an update vector by field_no.
  @return update vector field, or NULL */
-static inline const upd_field_t *upd_get_field_by_field_no(
+[[nodiscard]] static inline const upd_field_t *upd_get_field_by_field_no(
     const upd_t *update, /*!< in: update vector */
     ulint no,            /*!< in: field_no */
-    bool is_virtual)     /*!< in: if it is a virtual column */
-    MY_ATTRIBUTE((warn_unused_result));
+    bool is_virtual);    /*!< in: if it is a virtual column */
 /** Writes into the redo log the values of trx id and roll ptr and enough info
  to determine their positions within a clustered index record.
  @return new pointer to mlog */
@@ -157,9 +156,8 @@
     const upd_t *update);      /*!< in: update vector */
 /** Returns true if row update contains disowned external fields.
  @return true if the update contains disowned external fields. */
-bool row_upd_changes_disowned_external(
-    const upd_t *update) /*!< in: update vector */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool row_upd_changes_disowned_external(
+    const upd_t *update); /*!< in: update vector */
 /** Replaces the new column values stored in the update vector to the
  record given. No field size changes are allowed. This function is
  usually invoked on a clustered index. The only use case for a
@@ -176,13 +174,12 @@
  differ from a record that has the equal ordering fields. NOTE: we compare
  the fields as binary strings!
  @return own: update vector of differing fields */
-upd_t *row_upd_build_sec_rec_difference_binary(
+[[nodiscard]] upd_t *row_upd_build_sec_rec_difference_binary(
     const rec_t *rec,      /*!< in: secondary index record */
     dict_index_t *index,   /*!< in: index */
     const ulint *offsets,  /*!< in: rec_get_offsets(rec, index) */
     const dtuple_t *entry, /*!< in: entry to insert */
-    mem_heap_t *heap)      /*!< in: memory heap from which allocated */
-    MY_ATTRIBUTE((warn_unused_result));
+    mem_heap_t *heap);     /*!< in: memory heap from which allocated */
 /** Builds an update vector from those fields, excluding the roll ptr and
 trx id fields, which in an index entry differ from a record that has
 the equal ordering fields. NOTE: we compare the fields as binary strings!
@@ -200,12 +197,10 @@
 @param[out]	error		error number in case of failure
 @return own: update vector of differing fields, excluding roll ptr and
 trx id */
-upd_t *row_upd_build_difference_binary(dict_index_t *index,
-                                       const dtuple_t *entry, const rec_t *rec,
-                                       const ulint *offsets, bool no_sys,
-                                       trx_t *trx, mem_heap_t *heap,
-                                       TABLE *mysql_table, dberr_t *error)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] upd_t *row_upd_build_difference_binary(
+    dict_index_t *index, const dtuple_t *entry, const rec_t *rec,
+    const ulint *offsets, bool no_sys, trx_t *trx, mem_heap_t *heap,
+    TABLE *mysql_table, dberr_t *error);
 
 /** Replaces the new column values stored in the update vector to the index
  entry given.
@@ -288,15 +283,12 @@
 @param[in]	flag		ROW_BUILD_NORMAL, ROW_BUILD_FOR_PURGE or
                                 ROW_BUILD_FOR_UNDO
 @return true if update vector changes an ordering field in the index record */
-bool row_upd_changes_ord_field_binary_func(dict_index_t *index,
-                                           const upd_t *update,
+[[nodiscard]] bool row_upd_changes_ord_field_binary_func(
+    dict_index_t *index, const upd_t *update,
 #ifdef UNIV_DEBUG
-                                           const que_thr_t *thr,
+    const que_thr_t *thr,
 #endif /* UNIV_DEBUG */
-                                           const dtuple_t *row,
-                                           const row_ext_t *ext,
-                                           bool *non_mv_upd, ulint flag)
-    MY_ATTRIBUTE((warn_unused_result));
+    const dtuple_t *row, const row_ext_t *ext, bool *non_mv_upd, ulint flag);
 
 #ifdef UNIV_DEBUG
 #define row_upd_changes_ord_field_binary(index, update, thr, row, ext, \
@@ -317,9 +309,9 @@
     upd_field_t *upd_field); /*!< in: field to check */
 /** Checks if an FTS Doc ID column is affected by an UPDATE.
  @return whether Doc ID column is affected */
-bool row_upd_changes_doc_id(dict_table_t *table,    /*!< in: table */
-                            upd_field_t *upd_field) /*!< in: field to check */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool row_upd_changes_doc_id(
+    dict_table_t *table,     /*!< in: table */
+    upd_field_t *upd_field); /*!< in: field to check */
 /** Checks if an update vector changes an ordering field of an index record.
  This function is fast if the update vector is short or the number of ordering
  fields in the index is small. Otherwise, this can be quadratic.
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/sess0sess.h mysql-8.0-8.0.27/storage/innobase/include/sess0sess.h
--- mysql-8.0-8.0.26/storage/innobase/include/sess0sess.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/sess0sess.h	2021-09-28 11:46:34.000000000 +0000
@@ -64,7 +64,7 @@
 /** InnoDB private data that is cached in THD */
 typedef std::map<
     std::string, dict_intrinsic_table_t *, std::less<std::string>,
-    ut_allocator<std::pair<const std::string, dict_intrinsic_table_t *>>>
+    ut::allocator<std::pair<const std::string, dict_intrinsic_table_t *>>>
     table_cache_t;
 
 class innodb_session_t {
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/srv0shutdown.h mysql-8.0-8.0.27/storage/innobase/include/srv0shutdown.h
--- mysql-8.0-8.0.26/storage/innobase/include/srv0shutdown.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/srv0shutdown.h	2021-09-28 11:46:34.000000000 +0000
@@ -115,7 +115,7 @@
 extern std::atomic<enum srv_shutdown_t> srv_shutdown_state;
 
 /** Call std::quick_exit(3) */
-void srv_fatal_error() MY_ATTRIBUTE((noreturn));
+[[noreturn]] void srv_fatal_error();
 
 /** Attempt to shutdown all background threads created by InnoDB.
 NOTE: Does not guarantee they are actually shut down, only does
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/srv0srv.h mysql-8.0-8.0.27/storage/innobase/include/srv0srv.h
--- mysql-8.0-8.0.26/storage/innobase/include/srv0srv.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/srv0srv.h	2021-09-28 11:46:34.000000000 +0000
@@ -763,6 +763,7 @@
 extern mysql_pfs_key_t buf_resize_thread_key;
 extern mysql_pfs_key_t clone_ddl_thread_key;
 extern mysql_pfs_key_t clone_gtid_thread_key;
+extern mysql_pfs_key_t ddl_thread_key;
 extern mysql_pfs_key_t dict_stats_thread_key;
 extern mysql_pfs_key_t fts_optimize_thread_key;
 extern mysql_pfs_key_t fts_parallel_merge_thread_key;
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/srv0start.h mysql-8.0-8.0.27/storage/innobase/include/srv0start.h
--- mysql-8.0-8.0.26/storage/innobase/include/srv0start.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/srv0start.h	2021-09-28 11:46:34.000000000 +0000
@@ -90,7 +90,7 @@
 /** Start InnoDB.
 @param[in]	create_new_db		Whether to create a new database
 @return DB_SUCCESS or error code */
-dberr_t srv_start(bool create_new_db) MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t srv_start(bool create_new_db);
 
 /** Fix up an undo tablespace if it was in the process of being truncated
 when the server crashed. This is the second call and is done after the DD
@@ -122,11 +122,11 @@
  copy up to and including the terminating path separator.
  @return number of bytes copied or ULINT_UNDEFINED if destination buffer
          is smaller than the path to be copied. */
-ulint srv_path_copy(char *dest,             /*!< out: destination buffer */
-                    ulint dest_len,         /*!< in: max bytes to copy */
-                    const char *basedir,    /*!< in: base directory */
-                    const char *table_name) /*!< in: source table name */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] ulint srv_path_copy(
+    char *dest,              /*!< out: destination buffer */
+    ulint dest_len,          /*!< in: max bytes to copy */
+    const char *basedir,     /*!< in: base directory */
+    const char *table_name); /*!< in: source table name */
 
 /** Get the encryption-data filename from the table name for a
 single-table tablespace.
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/srv0tmp.h mysql-8.0-8.0.27/storage/innobase/include/srv0tmp.h
--- mysql-8.0-8.0.26/storage/innobase/include/srv0tmp.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/srv0tmp.h	2021-09-28 11:46:34.000000000 +0000
@@ -135,7 +135,7 @@
 to the pool. */
 class Tablespace_pool {
  public:
-  using Pool = std::list<Tablespace *, ut_allocator<Tablespace *>>;
+  using Pool = std::list<Tablespace *, ut::allocator<Tablespace *>>;
 
   /** Tablespace_pool constructor
   @param[in]    init_size    Initial size of the tablespace pool */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/sync0debug.h mysql-8.0-8.0.27/storage/innobase/include/sync0debug.h
--- mysql-8.0-8.0.26/storage/innobase/include/sync0debug.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/sync0debug.h	2021-09-28 11:46:34.000000000 +0000
@@ -41,7 +41,9 @@
 
 #ifndef UNIV_LIBRARY
 #include "sync0types.h"
-#include "univ.i"
+
+#include <string>
+#include <vector>
 
 /** Initializes the synchronization data structures.
 @param[in]	max_threads	Maximum threads that can be created. */
@@ -97,6 +99,57 @@
 /** Releases the debug mutex. */
 void rw_lock_debug_mutex_exit();
 
+/** For handling sync points in child threads spawned by a foreground thread. */
+class Sync_point {
+ public:
+  /** Constructor.
+  @param[in,out] thd            Server connection/session context. */
+  explicit Sync_point(const THD *thd) noexcept : m_thd(thd) {}
+
+  Sync_point(const Sync_point &) = default;
+
+  Sync_point &operator=(const Sync_point &) = default;
+
+  /** Destructor. */
+  ~Sync_point() = default;
+
+  /** Add a target to the list of sync points, nop for duplicates.
+  @param[in] thd                Server conenction/session context.
+  @param[in] target             Target to add. */
+  static void add(const THD *thd, const std::string &target) noexcept;
+
+  /** Check if a target is enabled. Disable it if found.
+  @param[in] thd                Server conenction/session context.
+  @param[in] target             Check if target is enabled.
+  @return true if was enabled. */
+  static bool enabled(const THD *thd, const std::string &target) noexcept;
+
+  /** Check if a target is enabled. Disable it if found.
+  @param[in] target             Check if target is enabled.
+  @return true if was enabled. */
+  static bool enabled(const std::string &target) noexcept;
+
+  /** Clear the named target.
+  @param[in] thd                Server conenction/session context.
+  @param[in] target             Check if target is enabled. */
+  static void erase(const THD *thd, const std::string &target) noexcept;
+
+ private:
+  using Targets = std::vector<std::string, ut::allocator<std::string>>;
+  using Sync_points = std::vector<Sync_point, ut::allocator<Sync_point>>;
+
+  /** Mutex protecting access to Sync_point infrastructure. */
+  static std::mutex s_mutex;
+
+  /** Sync points. */
+  static Sync_points s_sync_points;
+
+  /** Server connection/session context. */
+  const THD *m_thd{};
+
+  /** List of enabled targets. */
+  Targets m_targets{};
+};
 #endif /* UNIV_DEBUG */
 
 #endif /* !UNIV_LIBRARY */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/sync0rw.h mysql-8.0-8.0.27/storage/innobase/include/sync0rw.h
--- mysql-8.0-8.0.26/storage/innobase/include/sync0rw.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/sync0rw.h	2021-09-28 11:46:34.000000000 +0000
@@ -298,7 +298,7 @@
 @param[in]	line		line where requested
 @return true if success */
 static inline bool rw_lock_s_lock_low(rw_lock_t *lock,
-                                      ulint pass MY_ATTRIBUTE((unused)),
+                                      ulint pass [[maybe_unused]],
                                       const char *file_name, ulint line);
 
 /** NOTE! Use the corresponding macro, not directly this function, except if
@@ -467,18 +467,16 @@
 @param[in]  lock_type   The exact lock type to check:
                         RW_LOCK_S, RW_LOCK_SX or RW_LOCK_X
  */
-bool rw_lock_own(const rw_lock_t *lock, ulint lock_type)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] bool rw_lock_own(const rw_lock_t *lock, ulint lock_type);
 
 /** Checks if the thread has locked the rw-lock in the specified mode, with
  the pass value == 0. */
-bool rw_lock_own_flagged(
-    const rw_lock_t *lock, /*!< in: rw-lock */
-    rw_lock_flags_t flags) /*!< in: specify lock types with
+[[nodiscard]] bool rw_lock_own_flagged(
+    const rw_lock_t *lock,  /*!< in: rw-lock */
+    rw_lock_flags_t flags); /*!< in: specify lock types with
                            OR of the rw_lock_flag_t values */
-    MY_ATTRIBUTE((warn_unused_result));
-#endif /* UNIV_DEBUG */
-#endif /* !UNIV_HOTBACKUP */
+#endif                      /* UNIV_DEBUG */
+#endif                      /* !UNIV_HOTBACKUP */
 /** Checks if somebody has locked the rw-lock in the specified mode.
  @return true if locked */
 bool rw_lock_is_locked(rw_lock_t *lock,  /*!< in: rw-lock */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/sync0rw.ic mysql-8.0-8.0.27/storage/innobase/include/sync0rw.ic
--- mysql-8.0-8.0.26/storage/innobase/include/sync0rw.ic	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/sync0rw.ic	2021-09-28 11:46:34.000000000 +0000
@@ -247,7 +247,7 @@
 ALWAYS_INLINE
 bool rw_lock_s_lock_low(
     rw_lock_t *lock, /*!< in: pointer to rw-lock */
-    ulint pass MY_ATTRIBUTE((unused)),
+    ulint pass [[maybe_unused]],
     /*!< in: pass value; != 0, if the lock will be
     passed to another thread to unlock */
     const char *file_name, /*!< in: file name where lock requested */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/sync0sharded_rw.h mysql-8.0-8.0.27/storage/innobase/include/sync0sharded_rw.h
--- mysql-8.0-8.0.26/storage/innobase/include/sync0sharded_rw.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/sync0sharded_rw.h	2021-09-28 11:46:34.000000000 +0000
@@ -69,7 +69,8 @@
     ut_ad(ut_is_2pow(n_shards));
     m_n_shards = n_shards;
 
-    m_shards = static_cast<Shard *>(ut_zalloc_nokey(sizeof(Shard) * n_shards));
+    m_shards = static_cast<Shard *>(
+        ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sizeof(Shard) * n_shards));
 
     for_each([
 #ifdef UNIV_PFS_RWLOCK
@@ -86,7 +87,7 @@
 
     for_each([](rw_lock_t &lock) { rw_lock_free(&lock); });
 
-    ut_free(m_shards);
+    ut::free(m_shards);
     m_shards = nullptr;
     m_n_shards = 0;
   }
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/sync0sync.h mysql-8.0-8.0.27/storage/innobase/include/sync0sync.h
--- mysql-8.0-8.0.26/storage/innobase/include/sync0sync.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/sync0sync.h	2021-09-28 11:46:34.000000000 +0000
@@ -95,6 +95,7 @@
 extern mysql_pfs_key_t buf_pool_zip_hash_mutex_key;
 extern mysql_pfs_key_t buf_pool_zip_mutex_key;
 extern mysql_pfs_key_t cache_last_read_mutex_key;
+extern mysql_pfs_key_t ddl_autoinc_mutex_key;
 extern mysql_pfs_key_t dict_foreign_err_mutex_key;
 extern mysql_pfs_key_t dict_persist_dirty_tables_mutex_key;
 extern mysql_pfs_key_t dict_sys_mutex_key;
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/sync0types.h mysql-8.0-8.0.27/storage/innobase/include/sync0types.h
--- mysql-8.0-8.0.26/storage/innobase/include/sync0types.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/sync0types.h	2021-09-28 11:46:34.000000000 +0000
@@ -365,6 +365,7 @@
   LATCH_ID_BUF_POOL_FLUSH_STATE,
   LATCH_ID_DBLWR,
   LATCH_ID_DBLWR_SPACE_CACHE,
+  LATCH_ID_DDL_AUTOINC,
   LATCH_ID_CACHE_LAST_READ,
   LATCH_ID_DICT_FOREIGN_ERR,
   LATCH_ID_DICT_SYS,
@@ -587,9 +588,9 @@
 @param[in]	id		Latch id
 @param[in]	level		Latch level
 @param[in]	key		PFS key */
-#define LATCH_ADD_MUTEX(id, level, key) \
-  latch_meta[LATCH_ID_##id] =           \
-      UT_NEW_NOKEY(latch_meta_t(LATCH_ID_##id, #id, level, #level, key))
+#define LATCH_ADD_MUTEX(id, level, key)                      \
+  latch_meta[LATCH_ID_##id] = ut::new_withkey<latch_meta_t>( \
+      UT_NEW_THIS_FILE_PSI_KEY, LATCH_ID_##id, #id, level, #level, key)
 
 #ifdef UNIV_PFS_RWLOCK
 /** Latch element.
@@ -597,22 +598,23 @@
 @param[in]	id		Latch id
 @param[in]	level		Latch level
 @param[in]	key		PFS key */
-#define LATCH_ADD_RWLOCK(id, level, key) \
-  latch_meta[LATCH_ID_##id] =            \
-      UT_NEW_NOKEY(latch_meta_t(LATCH_ID_##id, #id, level, #level, key))
-#else
-#define LATCH_ADD_RWLOCK(id, level, key)    \
-  latch_meta[LATCH_ID_##id] = UT_NEW_NOKEY( \
-      latch_meta_t(LATCH_ID_##id, #id, level, #level, PSI_NOT_INSTRUMENTED))
+#define LATCH_ADD_RWLOCK(id, level, key)                     \
+  latch_meta[LATCH_ID_##id] = ut::new_withkey<latch_meta_t>( \
+      UT_NEW_THIS_FILE_PSI_KEY, LATCH_ID_##id, #id, level, #level, key)
+#else
+#define LATCH_ADD_RWLOCK(id, level, key)                                     \
+  latch_meta[LATCH_ID_##id] =                                                \
+      ut::new_withkey<latch_meta_t>(UT_NEW_THIS_FILE_PSI_KEY, LATCH_ID_##id, \
+                                    #id, level, #level, PSI_NOT_INSTRUMENTED)
 #endif /* UNIV_PFS_RWLOCK */
 
 #else
-#define LATCH_ADD_MUTEX(id, level, key) \
-  latch_meta[LATCH_ID_##id] =           \
-      UT_NEW_NOKEY(latch_meta_t(LATCH_ID_##id, #id, level, #level))
-#define LATCH_ADD_RWLOCK(id, level, key) \
-  latch_meta[LATCH_ID_##id] =            \
-      UT_NEW_NOKEY(latch_meta_t(LATCH_ID_##id, #id, level, #level))
+#define LATCH_ADD_MUTEX(id, level, key)                      \
+  latch_meta[LATCH_ID_##id] = ut::new_withkey<latch_meta_t>( \
+      UT_NEW_THIS_FILE_PSI_KEY, LATCH_ID_##id, #id, level, #level)
+#define LATCH_ADD_RWLOCK(id, level, key)                     \
+  latch_meta[LATCH_ID_##id] = ut::new_withkey<latch_meta_t>( \
+      UT_NEW_THIS_FILE_PSI_KEY, LATCH_ID_##id, #id, level, #level)
 #endif /* UNIV_PFS_MUTEX */
 
 /** Default latch counter */
@@ -653,7 +655,7 @@
     m_mutex.destroy();
 
     for (Count *count : m_counters) {
-      UT_DELETE(count);
+      ut::delete_(count);
     }
   }
 
@@ -678,7 +680,7 @@
     Count *count;
 
     if (m_counters.empty()) {
-      count = UT_NEW_NOKEY(Count());
+      count = ut::new_withkey<Count>(UT_NEW_THIS_FILE_PSI_KEY);
       m_counters.push_back(count);
     } else {
       ut_a(m_counters.size() == 1);
@@ -874,7 +876,8 @@
 };
 
 typedef LatchMeta<LatchCounter> latch_meta_t;
-typedef std::vector<latch_meta_t *, ut_allocator<latch_meta_t *>> LatchMetaData;
+typedef std::vector<latch_meta_t *, ut::allocator<latch_meta_t *>>
+    LatchMetaData;
 
 /** Note: This is accessed without any mutex protection. It is initialised
 at startup and elements should not be added to or removed from it after
@@ -1205,7 +1208,7 @@
   True if all OK */
   bool m_result;
 
-  typedef std::vector<latch_level_t, ut_allocator<latch_level_t>> latches_t;
+  typedef std::vector<latch_level_t, ut::allocator<latch_level_t>> latches_t;
 
   /** List of latch levels that are allowed to be held */
   latches_t m_latches;
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/trx0i_s.h mysql-8.0-8.0.27/storage/innobase/include/trx0i_s.h
--- mysql-8.0-8.0.26/storage/innobase/include/trx0i_s.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/trx0i_s.h	2021-09-28 11:46:34.000000000 +0000
@@ -35,6 +35,8 @@
 #ifndef trx0i_s_h
 #define trx0i_s_h
 
+#include <optional>
+
 #include "dict0types.h"
 #include "trx0types.h"
 #include "univ.i"
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/trx0purge.h mysql-8.0-8.0.27/storage/innobase/include/trx0purge.h
--- mysql-8.0-8.0.26/storage/innobase/include/trx0purge.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/trx0purge.h	2021-09-28 11:46:34.000000000 +0000
@@ -344,29 +344,29 @@
     vector. This constructor is only used in the global
     undo::Tablespaces object where rollback segments are
     tracked. */
-    m_rsegs = UT_NEW_NOKEY(Rsegs());
+    m_rsegs = ut::new_withkey<Rsegs>(UT_NEW_THIS_FILE_PSI_KEY);
   }
 
   /** Destructor */
   ~Tablespace() {
     if (m_space_name != nullptr) {
-      ut_free(m_space_name);
+      ut::free(m_space_name);
       m_space_name = nullptr;
     }
 
     if (m_file_name != nullptr) {
-      ut_free(m_file_name);
+      ut::free(m_file_name);
       m_file_name = nullptr;
     }
 
     if (m_log_file_name != nullptr) {
-      ut_free(m_log_file_name);
+      ut::free(m_log_file_name);
       m_log_file_name = nullptr;
     }
 
     /* Clear the cached rollback segments.  */
     if (m_rsegs != nullptr) {
-      UT_DELETE(m_rsegs);
+      ut::delete_(m_rsegs);
       m_rsegs = nullptr;
     }
   }
@@ -643,7 +643,7 @@
 rollback segments. */
 class Tablespaces {
   using Tablespaces_Vector =
-      std::vector<Tablespace *, ut_allocator<Tablespace *>>;
+      std::vector<Tablespace *, ut::allocator<Tablespace *>>;
 
  public:
   Tablespaces() { init(); }
@@ -660,7 +660,7 @@
   This does not deallocate any memory. */
   void clear() {
     for (auto undo_space : m_spaces) {
-      UT_DELETE(undo_space);
+      ut::delete_(undo_space);
     }
     m_spaces.clear();
   }
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/trx0rec.h mysql-8.0-8.0.27/storage/innobase/include/trx0rec.h
--- mysql-8.0-8.0.26/storage/innobase/include/trx0rec.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/trx0rec.h	2021-09-28 11:46:34.000000000 +0000
@@ -81,8 +81,8 @@
 /** Reads from an undo log record the table ID
 @param[in]	undo_rec	Undo log record
 @return the table ID */
-table_id_t trx_undo_rec_get_table_id(const trx_undo_rec_t *undo_rec)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] table_id_t trx_undo_rec_get_table_id(
+    const trx_undo_rec_t *undo_rec);
 
 /** Builds a row reference from an undo log record.
  @return pointer to remaining part of undo record */
@@ -140,7 +140,7 @@
  It contains the columns which occur as ordering in any index of the table.
  Any missing columns are indicated by col->mtype == DATA_MISSING.
  @return pointer to remaining part of undo record */
-byte *trx_undo_rec_get_partial_row(
+[[nodiscard]] byte *trx_undo_rec_get_partial_row(
     const byte *ptr,     /*!< in: remaining part in update undo log
                          record of a suitable type, at the start of
                          the stored index columns;
@@ -153,15 +153,14 @@
     ibool ignore_prefix, /*!< in: flag to indicate if we
                   expect blob prefixes in undo. Used
                   only in the assertion. */
-    mem_heap_t *heap)    /*!< in: memory heap from which the memory
-                         needed is allocated */
-    MY_ATTRIBUTE((warn_unused_result));
+    mem_heap_t *heap);   /*!< in: memory heap from which the memory
+                        needed is allocated */
 /** Writes information to an undo log about an insert, update, or a delete
  marking of a clustered index record. This information is used in a rollback of
  the transaction and in consistent reads that must look to the history of this
  transaction.
  @return DB_SUCCESS or error code */
-dberr_t trx_undo_report_row_operation(
+[[nodiscard]] dberr_t trx_undo_report_row_operation(
     ulint flags,                 /*!< in: if BTR_NO_UNDO_LOG_FLAG bit is
                                  set, does nothing */
     ulint op_type,               /*!< in: TRX_UNDO_INSERT_OP or
@@ -179,11 +178,10 @@
                                  marking, the record in the clustered
                                  index, otherwise NULL */
     const ulint *offsets,        /*!< in: rec_get_offsets(rec) */
-    roll_ptr_t *roll_ptr)        /*!< out: rollback pointer to the
-                                 inserted undo log record,
-                                 0 if BTR_NO_UNDO_LOG
-                                 flag was specified */
-    MY_ATTRIBUTE((warn_unused_result));
+    roll_ptr_t *roll_ptr);       /*!< out: rollback pointer to the
+                                inserted undo log record,
+                                0 if BTR_NO_UNDO_LOG
+                                flag was specified */
 
 /** status bit used for trx_undo_prev_version_build() */
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/trx0roll.h mysql-8.0-8.0.27/storage/innobase/include/trx0roll.h
--- mysql-8.0-8.0.26/storage/innobase/include/trx0roll.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/trx0roll.h	2021-09-28 11:46:34.000000000 +0000
@@ -105,16 +105,15 @@
  were set after this savepoint are deleted.
  @return if no savepoint of the name found then DB_NO_SAVEPOINT,
  otherwise DB_SUCCESS */
-dberr_t trx_rollback_to_savepoint_for_mysql(
-    trx_t *trx,                      /*!< in: transaction handle */
-    const char *savepoint_name,      /*!< in: savepoint name */
-    int64_t *mysql_binlog_cache_pos) /*!< out: the MySQL binlog cache
+[[nodiscard]] dberr_t trx_rollback_to_savepoint_for_mysql(
+    trx_t *trx,                       /*!< in: transaction handle */
+    const char *savepoint_name,       /*!< in: savepoint name */
+    int64_t *mysql_binlog_cache_pos); /*!< out: the MySQL binlog cache
                                      position corresponding to this
                                      savepoint; MySQL needs this
                                      information to remove the
                                      binlog entries of the queries
                                      executed after the savepoint */
-    MY_ATTRIBUTE((warn_unused_result));
 /** Creates a named savepoint. If the transaction is not yet started, starts it.
  If there is already a savepoint of the same name, this call erases that old
  savepoint and replaces it with a new. Savepoints are deleted in a transaction
@@ -131,10 +130,9 @@
  were set after this savepoint are deleted.
  @return if no savepoint of the name found then DB_NO_SAVEPOINT,
  otherwise DB_SUCCESS */
-dberr_t trx_release_savepoint_for_mysql(
-    trx_t *trx,                 /*!< in: transaction handle */
-    const char *savepoint_name) /*!< in: savepoint name */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] dberr_t trx_release_savepoint_for_mysql(
+    trx_t *trx,                  /*!< in: transaction handle */
+    const char *savepoint_name); /*!< in: savepoint name */
 
 /** Frees savepoint structs starting from savep.
 @param[in] trx Transaction handle
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/trx0sys.h mysql-8.0-8.0.27/storage/innobase/include/trx0sys.h
--- mysql-8.0-8.0.26/storage/innobase/include/trx0sys.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/trx0sys.h	2021-09-28 11:46:34.000000000 +0000
@@ -44,10 +44,12 @@
 #include "page0types.h"
 #include "ut0byte.h"
 #include "ut0class_life_cycle.h"
+#include "ut0guarded.h"
 #include "ut0lst.h"
 #include "ut0mutex.h"
 #endif /* !UNIV_HOTBACKUP */
 #include <atomic>
+#include <unordered_map>
 #include <vector>
 #include "trx0trx.h"
 
@@ -160,12 +162,6 @@
 static inline trx_id_t trx_read_trx_id(
     const byte *ptr); /*!< in: pointer to memory from where to read */
 
-/** Looks for the trx handle with the given id in rw trxs list.
-The caller must be holding trx_sys->shard's mutex for trx_id.
-@param[in]   trx_id   trx id to search for
-@return the trx handle or nullptr if not found */
-static inline trx_t *trx_get_rw_trx_by_id_low(trx_id_t trx_id);
-
 /** Returns the minimum trx id in rw trx list. This is the smallest id for which
 the rw trx can possibly be active. (But, you must look at the trx->state
 to find out if the minimum trx id transaction itself is active, or already
@@ -174,11 +170,6 @@
 static inline trx_id_t trx_rw_min_trx_id(void);
 
 /** Checks if a rw transaction with the given id is active.
-@param[in]	trx_id		trx id of the transaction
-@return transaction instance if active, or NULL */
-static inline trx_t *trx_rw_is_active_low(trx_id_t trx_id);
-
-/** Checks if a rw transaction with the given id is active.
 Please note, that positive result means only that the trx was active
 at some moment during the call, but it might have already become
 TRX_STATE_COMMITTED_IN_MEMORY before the call returns to the caller, as this
@@ -398,7 +389,7 @@
 /** @} */
 
 /** List of undo tablespace IDs. */
-class Space_Ids : public std::vector<space_id_t, ut_allocator<space_id_t>> {
+class Space_Ids : public std::vector<space_id_t, ut::allocator<space_id_t>> {
  public:
   void sort() { std::sort(begin(), end()); }
 
@@ -415,26 +406,90 @@
   iterator find(space_id_t id) { return (std::find(begin(), end(), id)); }
 };
 
-/** Shard for subset of transactions. */
-struct Trx_shard {
-  Trx_shard() { mutex_create(LATCH_ID_TRX_SYS_SHARD, &mutex); }
+/** Number of shards created for transactions. */
+constexpr size_t TRX_SHARDS_N = 256;
 
-  ~Trx_shard() { mutex_free(&mutex); }
+/** Computes shard number for a given trx_id.
+@param[in]  trx_id  trx_id for which shard_no should be computed
+@return the computed shard number (number in range 0..TRX_SHARDS_N-1) */
+inline size_t trx_get_shard_no(trx_id_t trx_id) {
+  ut_ad(trx_id != 0);
+  return trx_id % TRX_SHARDS_N;
+}
 
-  /** Mutex protecting members inside this shard. */
-  TrxSysMutex mutex;
+#ifndef UNIV_HOTBACKUP
+class Trx_by_id_with_min {
+  struct Trx_track_hash {
+    size_t operator()(const trx_id_t &key) const {
+      return static_cast<size_t>(key / TRX_SHARDS_N);
+    }
+  };
 
-  /** Padding to avoid false sharing between mutex and rw_trx_set. */
-  char pad_after_mutex[ut::INNODB_CACHE_LINE_SIZE];
+  using By_id = std::unordered_map<trx_id_t, trx_t *, Trx_track_hash>;
+  By_id m_by_id;
 
-  /** Set of active RW transactions. */
-  TrxIdSet rw_trx_set;
+  /** For observers which use Trx_shard::mutex protection: each transaction id
+  in the m_by_id is guaranteed to be at least m_min_id.
+  Writes are protected with Trx_shard::mutex.
+  Reads can be performed without any latch before accessing m_by_id,
+  but care must be taken to interpret the result -
+  @see trx_rw_is_active for details.*/
+  std::atomic<trx_id_t> m_min_id{0};
 
-  /** Padding to eliminate risk of false sharing between consecutive shards. */
-  char pad_after_shard[ut::INNODB_CACHE_LINE_SIZE];
+ public:
+  By_id const &by_id() const { return m_by_id; }
+  trx_id_t min_id() const { return m_min_id.load(); }
+  trx_t *get(trx_id_t trx_id) const {
+    const auto it = m_by_id.find(trx_id);
+    trx_t *trx = it == m_by_id.end() ? nullptr : it->second;
+    /* We remove trx from active_rw_trxs and change state to
+    TRX_STATE_COMMITTED_IN_MEMORY in a same critical section protected by
+    Trx_shard's mutex, which we happen to hold here, so we expect the state
+    of trx to match its presence in that set */
+    ut_ad(trx == nullptr || !trx_state_eq(trx, TRX_STATE_COMMITTED_IN_MEMORY));
+    return trx;
+  }
+  void insert(trx_t &trx) {
+    const trx_id_t trx_id = trx.id;
+    ut_ad(0 == m_by_id.count(trx_id));
+    m_by_id.emplace(trx_id, &trx);
+    if (m_by_id.size() == 1 ||
+        trx_id < m_min_id.load(std::memory_order_relaxed)) {
+      m_min_id.store(trx_id, std::memory_order_release);
+    }
+  }
+  void erase(trx_id_t trx_id) {
+    ut_ad(1 == m_by_id.count(trx_id));
+    m_by_id.erase(trx_id);
+    if (m_min_id.load(std::memory_order_relaxed) == trx_id) {
+      // We want at most 1 release store, so we use a local variable for the
+      // loop.
+      trx_id_t new_min = trx_id + TRX_SHARDS_N;
+      if (!m_by_id.empty()) {
+#ifdef UNIV_DEBUG
+        // These asserts ensure while loop terminates:
+        const trx_id_t some_id = m_by_id.begin()->first;
+        ut_a(new_min <= some_id);
+        ut_a((some_id - new_min) % TRX_SHARDS_N == 0);
+#endif /* UNIV_DEBUG */
+        while (m_by_id.count(new_min) == 0) {
+          new_min += TRX_SHARDS_N;
+        }
+      }
+      m_min_id.store(new_min, std::memory_order_release);
+    }
+  }
+};
+
+/** Shard for subset of transactions. */
+struct Trx_shard {
+  /** Mapping from trx->id to trx of active rw transactions.
+  The peek() interface can only be used safely for the min_id().
+  Use latch_and_execute() interface to access other members. */
+  ut::Cacheline_padded<ut::Guarded<Trx_by_id_with_min, LATCH_ID_TRX_SYS_SHARD>>
+      active_rw_trxs;
 };
 
-#ifndef UNIV_HOTBACKUP
 /** The transaction system central memory data structure. */
 struct trx_sys_t {
   /* Members protected by neither trx_sys_t::mutex nor serialisation_mutex. */
@@ -516,10 +571,6 @@
   /** Mutex protecting most fields in this structure (the default one). */
   TrxSysMutex mutex;
 
-  /** Minimum trx->id of active RW transactions (minimum in the rw_trx_ids).
-  Protected by the trx_sys_t::mutex but might be read without the mutex. */
-  std::atomic<trx_id_t> min_active_trx_id;
-
   char pad5[ut::INNODB_CACHE_LINE_SIZE];
 
   /** List of active and committed in memory read-write transactions, sorted
@@ -558,6 +609,19 @@
   /** @} */
 
   char pad_after[ut::INNODB_CACHE_LINE_SIZE];
+
+  Trx_shard &get_shard_by_trx_id(trx_id_t trx_id) {
+    return trx_sys->shards[trx_get_shard_no(trx_id)];
+  }
+  template <typename F>
+  auto latch_and_execute_with_active_trx(trx_id_t trx_id, F &&f,
+                                         const ut::Location &loc) {
+    return get_shard_by_trx_id(trx_id).active_rw_trxs.latch_and_execute(
+        [&](Trx_by_id_with_min &trx_by_id_with_min) {
+          return std::forward<F>(f)(trx_by_id_with_min.get(trx_id));
+        },
+        loc);
+  }
 };
 
 #endif /* !UNIV_HOTBACKUP */
@@ -590,64 +654,6 @@
     trx_sys->mutex.exit();   \
   } while (0)
 
-/** Computes shard number for a given trx_id.
-@param[in]  trx_id  trx_id for which shard_no should be computed
-@return the computed shard number (number in range 0..TRX_SHARDS_N-1) */
-inline size_t trx_get_shard_no(trx_id_t trx_id) {
-  ut_ad(trx_id != 0);
-  return trx_id % TRX_SHARDS_N;
-}
-
-#ifdef UNIV_LIBRARY
-#ifdef UNIV_DEBUG
-inline bool trx_sys_shard_mutex_own(size_t) { return true; }
-#endif /* UNIV_DEBUG */
-inline void trx_sys_shard_mutex_enter(size_t, ut::Location) {}
-inline void trx_sys_shard_mutex_exit(size_t) {}
-#else
-#ifdef UNIV_DEBUG
-/** Test if mutex protecting a given trx shard is owned.
-@param[in]  shard_no  shard number
-@return true iff the shard's mutex is owned */
-inline bool trx_sys_shard_mutex_own(size_t shard_no) {
-  ut_ad(shard_no < TRX_SHARDS_N);
-  return trx_sys->shards[shard_no].mutex.is_owned();
-}
-#endif /* UNIV_DEBUG */
-/** Acquire the mutex protecting a given trx shard.
-@param[in]  shard_no  shard number
-@param[in]  location  defines place in code where this function is called */
-inline void trx_sys_shard_mutex_enter(size_t shard_no, ut::Location location) {
-  ut_ad(shard_no < TRX_SHARDS_N);
-  mutex_enter_inline(&trx_sys->shards[shard_no].mutex, location);
-}
-/** Release the mutex protecting a given trx shard.
-@param[in]  shard_no  shard number */
-inline void trx_sys_shard_mutex_exit(size_t shard_no) {
-  ut_ad(shard_no < TRX_SHARDS_N);
-  trx_sys->shards[shard_no].mutex.exit();
-}
-#endif /* !UNIV_LIBRARY */
-
-/** RAII-alike guard for a critical section protected by
-the trx_sys->shard's mutex. */
-struct Trx_shard_latch_guard : private ut::Non_copyable {
-  /** Acquires the trx_sys->shard's mutex for shard containing a given trx_id.
-  @param[in]  trx_id    the given trx_id
-  @param[in]  location  defines place in code, where it was called */
-  Trx_shard_latch_guard(trx_id_t trx_id, ut::Location location)
-      : m_shard_no{trx_get_shard_no(trx_id)} {
-    trx_sys_shard_mutex_enter(m_shard_no, location);
-  }
-
-  /** Releases the acquired trx_sys->shard's mutex (acquired in ctor). */
-  ~Trx_shard_latch_guard() { trx_sys_shard_mutex_exit(m_shard_no); }
-
- private:
-  /** Shard which mutex was acquired in ctor (index in trx_sys->shards). */
-  const size_t m_shard_no;
-};
-
 /** Test if trx_sys->serialisation_mutex is owned. */
 #define trx_sys_serialisation_mutex_own() \
   (trx_sys->serialisation_mutex.is_owned())
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/trx0sys.ic mysql-8.0-8.0.27/storage/innobase/include/trx0sys.ic
--- mysql-8.0-8.0.26/storage/innobase/include/trx0sys.ic	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/trx0sys.ic	2021-09-28 11:46:34.000000000 +0000
@@ -174,19 +174,6 @@
   return (mach_read_from_6(ptr));
 }
 
-static inline trx_t *trx_get_rw_trx_by_id_low(trx_id_t trx_id) {
-  ut_ad(trx_id > 0);
-
-  const auto trx_shard_no = trx_get_shard_no(trx_id);
-  ut_ad(trx_sys_shard_mutex_own(trx_shard_no));
-
-  const auto &trx_shard = trx_sys->shards[trx_shard_no];
-
-  const auto it = trx_shard.rw_trx_set.find(TrxTrack(trx_id));
-
-  return it == trx_shard.rw_trx_set.end() ? nullptr : it->m_trx;
-}
-
 /** Returns the minimum trx id in trx list. This is the smallest id for which
 the trx can possibly be active. (But, you must look at the trx->state
 to find out if the minimum trx id transaction itself is active, or already
@@ -219,35 +206,58 @@
   return (id);
 }
 
-static inline trx_t *trx_rw_is_active_low(trx_id_t trx_id) {
-  ut_ad(trx_sys_shard_mutex_own(trx_get_shard_no(trx_id)));
-
-  trx_t *const trx = trx_get_rw_trx_by_id_low(trx_id);
-  /* We remove trx from rw_trx_set and change state to
-  TRX_STATE_COMMITTED_IN_MEMORY in a same critical section protected by
-  Trx_shard's mutex, which we happen to hold here, so we expect the state
-  of trx to match its presence in that set */
-  ut_ad(trx == nullptr || !trx_state_eq(trx, TRX_STATE_COMMITTED_IN_MEMORY));
-
-  return trx;
-}
-
 static inline trx_t *trx_rw_is_active(trx_id_t trx_id, bool do_ref_count) {
-  /* Fast checking. If it's smaller than minimal active trx id, just
-  return NULL. */
-  if (trx_sys->min_active_trx_id.load() > trx_id) {
+  /* Fast checking without Trx_shard::mutex to see if trx_id can't be in the
+  Trx_shard::active_rw_trxs because it's too small. This works, because
+  whenever we add or remove an element from Trx_by_id_with_min::m_by_id under
+  Trx_shard::mutex, we also modify the m_min_id to be lower or equal to
+  each of ids inside Trx_by_id_with_min::m_by_id in the same critical
+  section. We assume that trx_id is an identifier of a transaction for which the
+  call to trx_sys_rw_trx_add(trx) happened-before the current call to
+  trx_rw_is_active(trx_id,..) - indeed in current implementation of InnoDB, the
+  trx_id comes from:
+  - a recovered transaction (for which trx_sys_rw_trx_add happened before crash)
+  - a header of a row (stored there by an active transaction which must have
+    finished a call to trx_sys_rw_trx_add before)
+  - a prepared transaction (which must have called trx_sys_rw_trx_add before
+    becoming PREPAREd)
+  so clearly trx_sys_rw_trx_add() happened-before.
+  Under this assumption, if trx_id < Trx_shard::min_id, then the value of
+  Trx_shard::min_id is loaded from a store which must have occurred in a
+  critical section protected by Trx_shard::mutex which happened-after the
+  trx_sys_rw_trx_add(trx) for the trx with trx->id==trx_id - it could not be an
+  earlier critical section, by our assumption, and it couldn't be stored during
+  that particular trx_sys_rw_trx_add(trx) because of the invariant for min_id.
+  Further, given that the loaded value is larger than trx_id, it must be the
+  case that during that critical section the trx with trx->id==trx_id no longer
+  belonged to Trx_shard::active_rw_trxs.m_by_id. In other words, this load of
+  min_id synchronizes with a store, which happens-after Trx_shard::mutex
+  acquisition of a critical section in which trx_id was not in
+  active_rw_trxs.m_by_id. So, if this thread were to check the contents
+  of active_rw_trxs.m_by_id after the if's condition evaluated to true,
+  it would first have to acquire Trx_shard::mutex, which could only succeed
+  *after* that critical section, thus it would not find trx_id in it for sure.
+  NOTE: to appreciate why the assumption is important, observe, that if we call
+  the trx_rw_is_active(trx_id,..) with trx_id for which trx_sys_rw_trx_add(trx)
+  wasn't called yet, then it could happen, that trx_id+TRX_SHARDS_N was already
+  assigned and added to Trx_shard::active_rw_trxs.m_by_id, and Trx_shard::min_id
+  was set to larger than trx_id, so we decide to return nullptr, even though, if
+  we were to repeat the call in just a moment we might get a different result if
+  the trx_sys_rw_trx_add() for the trx_id happens meanwhile. */
+  ut_ad(trx_id < trx_sys_get_next_trx_id_or_no());
+  auto &shard = trx_sys->get_shard_by_trx_id(trx_id);
+  if (trx_id < shard.active_rw_trxs.peek().min_id()) {
     return nullptr;
   }
-
-  Trx_shard_latch_guard guard{trx_id, UT_LOCATION_HERE};
-
-  trx_t *trx = trx_rw_is_active_low(trx_id);
-
-  if (trx != nullptr) {
-    trx = trx_reference(trx, do_ref_count);
-  }
-
-  return trx;
+  return trx_sys->latch_and_execute_with_active_trx(
+      trx_id,
+      [&](trx_t *trx) {
+        if (trx != nullptr && do_ref_count) {
+          trx_reference(trx);
+        }
+        return trx;
+      },
+      UT_LOCATION_HERE);
 }
 
 inline bool trx_sys_id_is_corrupted(trx_id_t trx_id) {
@@ -324,11 +334,21 @@
 }
 
 static inline void trx_sys_rw_trx_add(trx_t *trx) {
-  ut_ad(trx->id != 0);
-  const auto trx_shard_no = trx_get_shard_no(trx->id);
-  trx_sys_shard_mutex_enter(trx_shard_no, UT_LOCATION_HERE);
-  trx_sys->shards[trx_shard_no].rw_trx_set.insert(TrxTrack(trx->id, trx));
-  trx_sys_shard_mutex_exit(trx_shard_no);
+  const trx_id_t trx_id = trx->id;
+  ut_ad(trx_id != 0);
+  const auto trx_shard_no = trx_get_shard_no(trx_id);
+  DBUG_EXECUTE_IF("trx_sys_rw_trx_add_rc", {
+    if (trx_shard_no == 123 && (trx_id / TRX_SHARDS_N) % 3 == 0) {
+      std::this_thread::sleep_for(std::chrono::seconds(1));
+    }
+  });
+  trx_sys->shards[trx_shard_no].active_rw_trxs.latch_and_execute(
+      [&](Trx_by_id_with_min &trx_by_id_with_min) {
+        trx_by_id_with_min.insert(*trx);
+        ut_ad(trx_by_id_with_min.min_id() <= trx_id);
+        ut_ad(trx_by_id_with_min.min_id() % TRX_SHARDS_N == trx_shard_no);
+      },
+      UT_LOCATION_HERE);
 }
 
 #endif /* !UNIV_HOTBACKUP */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/trx0trx.h mysql-8.0-8.0.27/storage/innobase/include/trx0trx.h
--- mysql-8.0-8.0.26/storage/innobase/include/trx0trx.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/trx0trx.h	2021-09-28 11:46:34.000000000 +0000
@@ -61,7 +61,7 @@
 class ReadView;
 
 // Forward declaration
-class FlushObserver;
+class Flush_observer;
 
 /** Dummy session used currently in MySQL interface */
 extern sess_t *trx_dummy_sess;
@@ -70,7 +70,7 @@
 /** Set flush observer for the transaction
 @param[in,out]	trx		transaction struct
 @param[in]	observer	flush observer */
-void trx_set_flush_observer(trx_t *trx, FlushObserver *observer);
+void trx_set_flush_observer(trx_t *trx, Flush_observer *observer);
 
 /** Set detailed error message for the transaction.
 @param[in] trx Transaction struct
@@ -93,8 +93,14 @@
  @return own: transaction object */
 trx_t *trx_allocate_for_background(void);
 
-/** Resurrect table locks for resurrected transactions. */
-void trx_resurrect_locks();
+/** Resurrect table locks for resurrected transactions.
+@param[in]      all     false: resurrect locks for dictionary transactions,
+                        true : resurrect locks for all transactions. */
+void trx_resurrect_locks(bool all);
+
+/** Clear all resurrected table IDs. Needs to be called after all tables locks
+are resurrected. */
+void trx_clear_resurrected_table_ids();
 
 /** Free and initialize a transaction object instantiated during recovery.
 @param[in,out]	trx	transaction object to free and initialize */
@@ -283,9 +289,8 @@
 
 /** Determine if a transaction is a dictionary operation.
  @return dictionary operation mode */
-static inline enum trx_dict_op_t trx_get_dict_operation(
-    const trx_t *trx) /*!< in: transaction */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline enum trx_dict_op_t trx_get_dict_operation(
+    const trx_t *trx); /*!< in: transaction */
 
 /** Flag a transaction a dictionary operation.
 @param[in,out]	trx	transaction
@@ -297,9 +302,9 @@
  that is serving a running transaction.
  A running RW transaction must be in trx_sys->rw_trx_list.
  @return true if trx->state == state */
-static inline bool trx_state_eq(const trx_t *trx,  /*!< in: transaction */
-                                trx_state_t state) /*!< in: state */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline bool trx_state_eq(
+    const trx_t *trx,   /*!< in: transaction */
+    trx_state_t state); /*!< in: state */
 #ifdef UNIV_DEBUG
 /** Determines if trx can be handled by current thread, which is when
 trx->mysql_thd is nullptr (a "background" trx) or equals current_thd.
@@ -319,9 +324,9 @@
 /** Asserts that a transaction has been started.
  The caller must hold trx_sys->mutex.
  @return true if started */
-ibool trx_assert_started(const trx_t *trx) /*!< in: transaction */
-    MY_ATTRIBUTE((warn_unused_result));
-#endif /* UNIV_DEBUG */
+[[nodiscard]] ibool trx_assert_started(
+    const trx_t *trx); /*!< in: transaction */
+#endif                 /* UNIV_DEBUG */
 
 /** Determines if the currently running transaction has been interrupted.
  @return true if interrupted */
@@ -381,11 +386,10 @@
 /**
 Increase the reference count. If the transaction is in state
 TRX_STATE_COMMITTED_IN_MEMORY then the transaction is considered
-committed and the reference count is not incremented.
+committed and this function fails on assertion.
 @param trx Transaction that is being referenced
-@param do_ref_count Increment the reference iff this is true
-@return transaction instance if it is not committed */
-static inline trx_t *trx_reference(trx_t *trx, bool do_ref_count);
+*/
+static inline void trx_reference(trx_t *trx);
 
 /**
 Release the transaction. Decrease the reference count.
@@ -471,7 +475,7 @@
     ut_ad(!trx_is_autocommit_non_locking((t))); \
     switch ((t)->state) {                       \
       case TRX_STATE_PREPARED:                  \
-        /* fall through */                      \
+        [[fallthrough]];                        \
       case TRX_STATE_ACTIVE:                    \
       case TRX_STATE_COMMITTED_IN_MEMORY:       \
         continue;                               \
@@ -531,7 +535,7 @@
 #endif /* UNIV_DEBUG */
 #endif /* !UNIV_HOTBACKUP */
 
-typedef std::vector<ib_lock_t *, ut_allocator<ib_lock_t *>> lock_pool_t;
+typedef std::vector<ib_lock_t *, ut::allocator<ib_lock_t *>> lock_pool_t;
 
 /** Latching protocol for trx_lock_t::que_state.  trx_lock_t::que_state
  captures the state of the query thread during the execution of a query.
@@ -739,7 +743,7 @@
 we know that a table object will not be destroyed while a transaction
 that modified it is running. */
 typedef std::set<dict_table_t *, std::less<dict_table_t *>,
-                 ut_allocator<dict_table_t *>>
+                 ut::allocator<dict_table_t *>>
     trx_mod_tables_t;
 
 /** The transaction handle
@@ -1005,14 +1009,17 @@
                             the running thread can change. */
 
   /* These fields are not protected by any mutex. */
-  const char *op_info;   /*!< English text describing the
-                         current operation, or an empty
-                         string */
-  ulint isolation_level; /*!< TRX_ISO_REPEATABLE_READ, ... */
-  bool check_foreigns;   /*!< normally TRUE, but if the user
-                         wants to suppress foreign key checks,
-                         (in table imports, for example) we
-                         set this FALSE */
+  const char *op_info; /*!< English text describing the
+                       current operation, or an empty
+                       string */
+
+  /** Current isolation level */
+  isolation_level_t isolation_level;
+
+  bool check_foreigns; /*!< normally TRUE, but if the user
+                       wants to suppress foreign key checks,
+                       (in table imports, for example) we
+                       set this FALSE */
   /*------------------------------*/
   /* MySQL has a transaction coordinator to coordinate two phase
   commit between multiple storage engines and the binary log. When
@@ -1241,9 +1248,9 @@
   this fact. */
   bool purge_sys_trx;
   /*------------------------------*/
-  char *detailed_error;          /*!< detailed error message for last
-                                 error, or empty. */
-  FlushObserver *flush_observer; /*!< flush observer */
+  char *detailed_error;           /*!< detailed error message for last
+                                  error, or empty. */
+  Flush_observer *flush_observer; /*!< flush observer */
 
 #ifdef UNIV_DEBUG
   bool is_dd_trx; /*!< True if the transaction is used for
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/trx0trx.ic mysql-8.0-8.0.27/storage/innobase/include/trx0trx.ic
--- mysql-8.0-8.0.26/storage/innobase/include/trx0trx.ic	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/trx0trx.ic	2021-09-28 11:46:34.000000000 +0000
@@ -221,28 +221,12 @@
           trx->rsegs.m_noredo.rseg != nullptr);
 }
 
-/**
-Increase the reference count. If the transaction is in state
-TRX_STATE_COMMITTED_IN_MEMORY then the transaction is considered
-committed and the reference count is not incremented.
-@param trx Transaction that is being referenced
-@param do_ref_count Increment the reference iff this is true
-@return transaction instance if it is not committed */
-static inline trx_t *trx_reference(trx_t *trx, bool do_ref_count) {
+static inline void trx_reference(trx_t *trx) {
   trx_mutex_enter(trx);
-
-  if (trx_state_eq(trx, TRX_STATE_COMMITTED_IN_MEMORY)) {
-    trx_mutex_exit(trx);
-    trx = nullptr;
-  } else if (do_ref_count) {
-    ut_ad(trx->n_ref >= 0);
-    ++trx->n_ref;
-    trx_mutex_exit(trx);
-  } else {
-    trx_mutex_exit(trx);
-  }
-
-  return (trx);
+  ut_a(!trx_state_eq(trx, TRX_STATE_COMMITTED_IN_MEMORY));
+  ut_ad(trx->n_ref >= 0);
+  ++trx->n_ref;
+  trx_mutex_exit(trx);
 }
 
 /**
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/trx0types.h mysql-8.0-8.0.27/storage/innobase/include/trx0types.h
--- mysql-8.0-8.0.26/storage/innobase/include/trx0types.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/trx0types.h	2021-09-28 11:46:34.000000000 +0000
@@ -44,8 +44,6 @@
 #include <set>
 #include <vector>
 
-//#include <unordered_set>
-
 /** printf(3) format used for printing DB_TRX_ID and other system fields */
 #define TRX_ID_FMT IB_ID_FMT
 
@@ -288,7 +286,7 @@
   return (rseg.print(out));
 }
 
-using Rsegs_Vector = std::vector<trx_rseg_t *, ut_allocator<trx_rseg_t *>>;
+using Rsegs_Vector = std::vector<trx_rseg_t *, ut::allocator<trx_rseg_t *>>;
 using Rseg_Iterator = Rsegs_Vector::iterator;
 
 /** This is a wrapper for a std::vector of trx_rseg_t object pointers. */
@@ -590,41 +588,11 @@
 };
 
 typedef std::priority_queue<
-    TrxUndoRsegs, std::vector<TrxUndoRsegs, ut_allocator<TrxUndoRsegs>>,
+    TrxUndoRsegs, std::vector<TrxUndoRsegs, ut::allocator<TrxUndoRsegs>>,
     TrxUndoRsegs>
     purge_pq_t;
 
-typedef std::vector<trx_id_t, ut_allocator<trx_id_t>> trx_ids_t;
-
-/** Mapping read-write transactions from id to transaction instance, for
-creating read views and during trx id lookup for MVCC and locking. */
-struct TrxTrack {
-  explicit TrxTrack(trx_id_t id, trx_t *trx = nullptr) : m_id(id), m_trx(trx) {
-    // Do nothing
-  }
-
-  trx_id_t m_id;
-  trx_t *m_trx;
-};
-
-/** Number of shards created for transactions. */
-constexpr size_t TRX_SHARDS_N = 256;
-
-struct TrxTrackHash {
-  size_t operator()(const TrxTrack &key) const {
-    return static_cast<size_t>(key.m_id / TRX_SHARDS_N);
-  }
-};
-
-/**
-Comparator for TrxMap */
-struct TrxTrackHashCmp {
-  bool operator()(const TrxTrack &lhs, const TrxTrack &rhs) const {
-    return (lhs.m_id == rhs.m_id);
-  }
-};
-
-typedef std::unordered_set<TrxTrack, TrxTrackHash, TrxTrackHashCmp> TrxIdSet;
+typedef std::vector<trx_id_t, ut::allocator<trx_id_t>> trx_ids_t;
 
 struct TrxVersion {
   TrxVersion(trx_t *trx);
@@ -633,5 +601,5 @@
   ulint m_version;
 };
 
-typedef std::vector<TrxVersion, ut_allocator<TrxVersion>> hit_list_t;
+typedef std::vector<TrxVersion, ut::allocator<TrxVersion>> hit_list_t;
 #endif /* trx0types_h */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/trx0undo.h mysql-8.0-8.0.27/storage/innobase/include/trx0undo.h
--- mysql-8.0-8.0.26/storage/innobase/include/trx0undo.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/trx0undo.h	2021-09-28 11:46:34.000000000 +0000
@@ -48,10 +48,9 @@
     roll_ptr_t roll_ptr); /*!< in: roll pointer */
 /** Returns true if the record is of the insert type.
  @return true if the record was freshly inserted (not updated). */
-static inline bool trx_undo_trx_id_is_insert(
-    const byte *trx_id) /*!< in: DB_TRX_ID, followed by DB_ROLL_PTR */
-    MY_ATTRIBUTE((warn_unused_result));
-#endif /* !UNIV_HOTBACKUP */
+[[nodiscard]] static inline bool trx_undo_trx_id_is_insert(
+    const byte *trx_id); /*!< in: DB_TRX_ID, followed by DB_ROLL_PTR */
+#endif                   /* !UNIV_HOTBACKUP */
 
 /** Writes a roll ptr to an index page. In case that the size changes in
 some future version, this function should be used instead of
@@ -159,16 +158,15 @@
 
 /** Tries to add a page to the undo log segment where the undo log is placed.
  @return X-latched block if success, else NULL */
-buf_block_t *trx_undo_add_page(
+[[nodiscard]] buf_block_t *trx_undo_add_page(
     trx_t *trx,               /*!< in: transaction */
     trx_undo_t *undo,         /*!< in: undo log memory object */
     trx_undo_ptr_t *undo_ptr, /*!< in: assign undo log from
                               referred rollback segment. */
-    mtr_t *mtr)               /*!< in: mtr which does not have
-                              a latch to any undo log page;
-                              the caller must have reserved
-                              the rollback segment mutex */
-    MY_ATTRIBUTE((warn_unused_result));
+    mtr_t *mtr);              /*!< in: mtr which does not have
+                             a latch to any undo log page;
+                             the caller must have reserved
+                             the rollback segment mutex */
 /** Frees the last undo log page.
  The caller must hold the rollback segment mutex. */
 void trx_undo_free_last_page_func(
@@ -232,13 +230,12 @@
  @return DB_SUCCESS if undo log assign successful, possible error codes
  are: DB_TOO_MANY_CONCURRENT_TRXS DB_OUT_OF_FILE_SPACE DB_READ_ONLY
  DB_OUT_OF_MEMORY */
-dberr_t trx_undo_assign_undo(
+[[nodiscard]] dberr_t trx_undo_assign_undo(
     trx_t *trx,               /*!< in: transaction */
     trx_undo_ptr_t *undo_ptr, /*!< in: assign undo log from
                               referred rollback segment. */
-    ulint type)               /*!< in: TRX_UNDO_INSERT or
-                              TRX_UNDO_UPDATE */
-    MY_ATTRIBUTE((warn_unused_result));
+    ulint type);              /*!< in: TRX_UNDO_INSERT or
+                             TRX_UNDO_UPDATE */
 /** Sets the state of the undo log segment at a transaction finish.
  @return undo log segment header page, x-latched */
 page_t *trx_undo_set_state_at_finish(
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/univ.i mysql-8.0-8.0.27/storage/innobase/include/univ.i
--- mysql-8.0-8.0.26/storage/innobase/include/univ.i	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/univ.i	2021-09-28 11:46:34.000000000 +0000
@@ -378,7 +378,7 @@
 */
 
 /* Note that inside MySQL 'byte' is defined as char on Linux! */
-#define byte unsigned char
+using byte = unsigned char;
 
 /* Another basic type we use is unsigned long integer which should be equal to
 the word size of the machine, that is on a 32-bit platform 32 bits, and on a
@@ -498,12 +498,8 @@
 
 #define UNIV_EXTERN_STORAGE_FIELD (UNIV_SQL_NULL - UNIV_PAGE_SIZE_DEF)
 
-#if defined(__GNUC__)
 /* Tell the compiler that variable/function is unused. */
-#define UNIV_UNUSED MY_ATTRIBUTE((unused))
-#else
-#define UNIV_UNUSED
-#endif /* CHECK FOR GCC VER_GT_2 */
+#define UNIV_UNUSED [[maybe_unused]]
 
 /* Some macros to improve branch prediction and reduce cache misses */
 #if defined(COMPILER_HINTS) && defined(__GNUC__)
@@ -518,23 +514,6 @@
 it is read or written. */
 #define UNIV_PREFETCH_RW(addr) __builtin_prefetch(addr, 1, 3)
 
-/* Sun Studio includes sun_prefetch.h as of version 5.9 */
-#elif (defined(__SUNPRO_C) || defined(__SUNPRO_CC))
-
-#include <sun_prefetch.h>
-
-#define UNIV_EXPECT(expr, value) (expr)
-#define UNIV_LIKELY_NULL(expr) (expr)
-
-#if defined(COMPILER_HINTS)
-//# define UNIV_PREFETCH_R(addr) sun_prefetch_read_many((void*) addr)
-#define UNIV_PREFETCH_R(addr) ((void)0)
-#define UNIV_PREFETCH_RW(addr) sun_prefetch_write_many(addr)
-#else
-#define UNIV_PREFETCH_R(addr) ((void)0)
-#define UNIV_PREFETCH_RW(addr) ((void)0)
-#endif /* COMPILER_HINTS */
-
 #elif defined __WIN__ && defined COMPILER_HINTS
 #include <xmmintrin.h>
 
@@ -546,8 +525,8 @@
 #define UNIV_PREFETCH_RW(addr) _mm_prefetch((char *)addr, _MM_HINT_T0)
 #else
 /* Dummy versions of the macros */
-#define UNIV_EXPECT(expr, value) (expr)
-#define UNIV_LIKELY_NULL(expr) (expr)
+#define UNIV_EXPECT(expr, value) expr
+#define UNIV_LIKELY_NULL(expr) expr
 #define UNIV_PREFETCH_R(addr) ((void)0)
 #define UNIV_PREFETCH_RW(addr) ((void)0)
 #endif
@@ -707,4 +686,25 @@
 #define UNIV_NO_ERR_MSGS
 
 #endif /* UNIV_LIBRARY && !UNIV_NO_ERR_MSGS */
+
+#ifdef UNIV_DEBUG
+#define IF_DEBUG(...) __VA_ARGS__
+#define IF_ENABLED(s, ...)        \
+  if (Sync_point::enabled((s))) { \
+    __VA_ARGS__                   \
+  }
+#else
+
+/* Expand the macro if we are generating Doxygen documentation. */
+#ifdef DOXYGEN_IF_DEBUG
+#define IF_DEBUG(...) __VA_ARGS__
+#else
+#define IF_DEBUG(...)
+#endif /* DOXYGEN_IF_DEBUG */
+
+#define IF_ENABLED(s, ...)
+#endif /* UNIV_DEBUG */
+
+using Col_offsets_t = ulint;
+
 #endif /* univ_i */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/ut0byte.h mysql-8.0-8.0.27/storage/innobase/include/ut0byte.h
--- mysql-8.0-8.0.26/storage/innobase/include/ut0byte.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/ut0byte.h	2021-09-28 11:46:34.000000000 +0000
@@ -52,7 +52,7 @@
 @param[in]	n		number to be rounded
 @param[in]	align_no	align by this number
 @return rounded value */
-static inline ib_uint64_t ut_uint64_align_up(ib_uint64_t n, ulint align_no);
+static inline uint64_t ut_uint64_align_up(uint64_t n, ulint align_no);
 
 /** The following function rounds up a pointer to the nearest aligned address.
 @param[in]	ptr		pointer
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/ut0byte.ic mysql-8.0-8.0.27/storage/innobase/include/ut0byte.ic
--- mysql-8.0-8.0.26/storage/innobase/include/ut0byte.ic	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/ut0byte.ic	2021-09-28 11:46:34.000000000 +0000
@@ -54,19 +54,13 @@
   return (n & ~((ib_uint64_t)align_no - 1));
 }
 
-/** Rounds ib_uint64_t upward to a multiple of a power of 2.
- @return rounded value */
-static inline ib_uint64_t ut_uint64_align_up(
-    ib_uint64_t n,  /*!< in: number to be rounded */
-    ulint align_no) /*!< in: align by this number
-                    which must be a power of 2 */
-{
-  ib_uint64_t align_1 = (ib_uint64_t)align_no - 1;
+static inline uint64_t ut_uint64_align_up(uint64_t n, ulint align_no) {
+  const uint64_t align_1 = (uint64_t)align_no - 1;
 
   ut_ad(align_no > 0);
   ut_ad(ut_is_2pow(align_no));
 
-  return ((n + align_1) & ~align_1);
+  return (n + align_1) & ~align_1;
 }
 
 /** The following function rounds up a pointer to the nearest aligned address.
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/ut0cpu_cache.h mysql-8.0-8.0.27/storage/innobase/include/ut0cpu_cache.h
--- mysql-8.0-8.0.26/storage/innobase/include/ut0cpu_cache.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/ut0cpu_cache.h	2021-09-28 11:46:34.000000000 +0000
@@ -50,6 +50,9 @@
 template <typename T>
 struct Cacheline_padded : public T {
   char pad[INNODB_CACHE_LINE_SIZE];
+
+  template <class... Args>
+  Cacheline_padded(Args &&... args) : T{std::forward<Args>(args)...} {}
 };
 } /* namespace ut */
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/ut0crc32.h mysql-8.0-8.0.27/storage/innobase/include/ut0crc32.h
--- mysql-8.0-8.0.26/storage/innobase/include/ut0crc32.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/ut0crc32.h	2021-09-28 11:46:34.000000000 +0000
@@ -35,30 +35,119 @@
 
 #include "univ.i"
 
+/*
+- 1. some things depend on the compiling environment
+  - is it a compiler for which we even know how to use intrinsics?
+  - is it x86, arm64, or mac-arm?
+- 2. some depend on runtime environment
+  - is it x86 which has crc32?
+  - is it x86 which has pcmul?
+  - is it arm which has crc32?
+  - is it arm which has pcmul?
+- 3. some depend on the runtime usage:
+  - is it 0.5kb redo buffer, 16kb page, or something else?
+  - do you need the variant with swapped byte order?
+*/
+
+#if defined(__GNUC__) && defined(__x86_64__) || defined(_WIN32)
+#define CRC32_x86_64
+#ifdef _WIN32
+#define CRC32_x86_64_WIN
+#else /* _WIN32 */
+#define CRC32_x86_64_DEFAULT
+#endif /* _WIN32 */
+#elif defined(__aarch64__) && defined(__GNUC__)
+#define CRC32_ARM64
+#ifdef APPLE_ARM
+#define CRC32_ARM64_APPLE
+#else /* APPLE_ARM */
+#define CRC32_ARM64_DEFAULT
+#endif /* APPLE_ARM */
+#else
+#define CRC32_DEFAULT
+#endif /* defined(__aarch64__) && defined(__GNUC__) */
+
+/* At this point we have classified the system statically into exactly one of
+the possible cases:
+
+CRC32_x86_64
+    An environment in which we can use `cpuid` instruction to detect if it has
+    support for crc32 and pclmul instructions, which (if available) can be used
+    via _mm_crc32_u64 and _mm_clmulepi64_si128 respectively exposed by
+    nmmintrin.h and wmmintrin.h.
+    This is narrowed further into one of:
+
+    CRC32_x86_64_WIN
+        An environment which seems to be like Visual Studio, so we expect
+        intrin.h header exposing `__cpuid`, which we can use instead of inline
+        assembly, which is good as Visual Studio dialect of asm is different.
+        Also, __attribute__(target(...)) probably doesn't work on it.
+    CRC32_x86_64_DEFAULT
+        An environment which seems to be like gcc or clang, and thus we can use
+        inline assembly to get `cpuid`.
+        Also, we can/have to use __attribute__(target(...)) on functions which
+        use intrinsics, and may need to use __attribute__(flatten) at top level
+        to ensure that the run-time selection of target-specific variant of the
+        function happens just once at the top, not in every leaf, which would
+        break inlining and optimizations.
+CRC32_ARM64
+    An environment in which it is probable that __crc32cd and vmull_p64 could be
+    used for hardware accelerated crc32 and polynomial multiplication
+    computations, respectively. However we might need to perform some runtime
+    checks via getauxval() to see if this particular processor on which we run
+    supports them.
+    This is narrowed further into one of:
+
+    CRC32_ARM64_APPLE
+        An environment which seems to be like Apple's M1 processor, and we don't
+        expect to find sys/auxv.h header which defines getauxval() on it, yet we
+        also expect the __crc32cd and vmull_p64 to "just work" on it, without
+        checking getauxval().
+
+    CRC32_ARM64_DEFAULT
+        An environment which seems to be like a "regular" ARM64. Note that this
+        is not very specific term, as there are ARMv7-A, ARMv8-A, and the later
+        has two execution states AArch32 and AArch64. FWIW we use __aarch64__ to
+        detect this case. We still need to call getauxval() to see if particular
+        instruction set is available. We assume we run in 64-bit execution state
+        thus we use AT_HWCAP (as opposed to AT_HWCAP2).
+CRC32_DEFAULT
+    An environment in which we don't even know how to ask if the hardware
+    supports crc32 or polynomial multiplication and even if it does we don't
+    know how to ask it to do it anyway. We use software implementation of crc32.
+*/
+
 /** Initializes the data structures used by ut_crc32*(). Does not do any
  allocations, would not hurt if called twice, but would be pointless. */
 void ut_crc32_init();
 
+/** The CRC-32C polynomial without the implicit highest 1 at x^32 */
+constexpr uint32_t CRC32C_POLYNOMIAL{0x1EDC6F41};
+
 /** Calculates CRC32.
  @param ptr - data over which to calculate CRC32.
  @param len - data length in bytes.
- @return CRC32 (CRC-32C, using the GF(2) primitive polynomial 0x11EDC6F41,
- or 0x1EDC6F41 without the high-order bit) */
-typedef uint32_t (*ut_crc32_func_t)(const byte *ptr, ulint len);
+ @return calculated hash */
+typedef uint32_t (*ut_crc32_func_t)(const byte *ptr, size_t len);
 
-/** Pointer to CRC32 calculation function. */
+/** Pointer to standard-compliant CRC32-C (using the GF(2) primitive polynomial
+0x11EDC6F41) calculation function picked by ut_crc32_init() as the fastest
+implementation for the current environment. */
 extern ut_crc32_func_t ut_crc32;
 
-/** Pointer to CRC32 calculation function, which uses big-endian byte order
-when converting byte strings to integers internally. */
-extern ut_crc32_func_t ut_crc32_legacy_big_endian;
-
-/** Pointer to CRC32-byte-by-byte calculation function (byte order agnostic,
-but very slow). */
-extern ut_crc32_func_t ut_crc32_byte_by_byte;
+/** Calculates CRC32 using legacy algorithm, which uses big-endian byte ordering
+when converting byte sequence to integers - flips each full aligned 8-byte chunk
+within the buf, but not the initial and trailing unaligned fragments.
+ut_crc32_init() needs to be called at least once before calling this function.
+@param[in]	buf	data over which to calculate CRC32
+@param[in]	len	data length
+@return calculated hash */
+uint32_t ut_crc32_legacy_big_endian(const byte *buf, size_t len);
 
-/** Flag that tells whether the CPU supports CRC32 or not.
-The CRC32 instructions are part of the SSE4.2 instruction set. */
+/** Flag that tells whether the CPU supports CRC32 or not. */
 extern bool ut_crc32_cpu_enabled;
 
+/** Flag that tells whether the CPU supports polynomial multiplication or not.*/
+extern bool ut_poly_mul_cpu_enabled;
+
 #endif /* ut0crc32_h */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/ut0dbg.h mysql-8.0-8.0.27/storage/innobase/include/ut0dbg.h
--- mysql-8.0-8.0.26/storage/innobase/include/ut0dbg.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/ut0dbg.h	2021-09-28 11:46:34.000000000 +0000
@@ -99,7 +99,7 @@
 
 /** Silence warnings about an unused variable by doing a null assignment.
 @param A the unused variable */
-#define UT_NOT_USED(A) A = A
+#define UT_NOT_USED(A) std::ignore = A
 
 #if defined(HAVE_SYS_TIME_H) && defined(HAVE_SYS_RESOURCE_H)
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/ut0guarded.h mysql-8.0-8.0.27/storage/innobase/include/ut0guarded.h
--- mysql-8.0-8.0.26/storage/innobase/include/ut0guarded.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/ut0guarded.h	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,59 @@
+/*****************************************************************************
+
+Copyright (c) 2021, Oracle 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, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
+/** @file include/ut0guarded.h
+The ut::Guarded template which protects access to another class with mutex. */
+
+#ifndef ut0guarded_h
+#define ut0guarded_h
+
+#ifndef UNIV_LIBRARY
+#include "ut0cpu_cache.h"
+#include "ut0mutex.h"
+#endif
+
+namespace ut {
+// TBD: should latch_id be specified at runtime?
+template <typename Inner, latch_id_t latch_id>
+class Guarded {
+#ifndef UNIV_LIBRARY
+  Cacheline_padded<IB_mutex> mutex{latch_id};
+#endif
+  Inner inner;
+
+ public:
+  template <typename F>
+  auto latch_and_execute(F &&f, const ut::Location &loc) {
+#ifndef UNIV_LIBRARY
+    IB_mutex_guard guard{&mutex, loc};
+#endif
+    return std::forward<F>(f)(inner);
+  }
+
+  const Inner &peek() const { return inner; }
+};
+}  // namespace ut
+#endif /* ut0guarded_h */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/ut0link_buf.h mysql-8.0-8.0.27/storage/innobase/include/ut0link_buf.h
--- mysql-8.0-8.0.26/storage/innobase/include/ut0link_buf.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/ut0link_buf.h	2021-09-28 11:46:34.000000000 +0000
@@ -203,7 +203,8 @@
 
   ut_a((capacity & (capacity - 1)) == 0);
 
-  m_links = UT_NEW_ARRAY_NOKEY(std::atomic<Distance>, capacity);
+  m_links = ut::new_arr_withkey<std::atomic<Distance>>(UT_NEW_THIS_FILE_PSI_KEY,
+                                                       ut::Count{capacity});
 
   for (size_t i = 0; i < capacity; ++i) {
     m_links[i].store(0);
@@ -242,7 +243,7 @@
 template <typename Position>
 void Link_buf<Position>::free() {
   if (m_links != nullptr) {
-    UT_DELETE_ARRAY(m_links);
+    ut::delete_arr(m_links);
     m_links = nullptr;
   }
 }
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/ut0lock_free_hash.h mysql-8.0-8.0.27/storage/innobase/include/ut0lock_free_hash.h
--- mysql-8.0-8.0.26/storage/innobase/include/ut0lock_free_hash.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/ut0lock_free_hash.h	2021-09-28 11:46:34.000000000 +0000
@@ -42,7 +42,7 @@
 
 #include "os0numa.h"  /* os_numa_*() */
 #include "ut0mutex.h" /* ib_mutex_t */
-#include "ut0new.h"   /* UT_NEW*(), UT_DELETE*() */
+#include "ut0new.h"   /* UT_NEW*(), ut::delete_*() */
 #include "ut0rnd.h"   /* ut_fold_ull() */
 
 /** An interface class to a basic hash table, that ut_lock_free_hash_t is. */
@@ -113,8 +113,9 @@
       m_cnt_size = 256;
     }
 
-    m_cnt = UT_NEW_ARRAY(std::atomic<int64_t> *, m_cnt_size,
-                         mem_key_ut_lock_free_hash_t);
+    m_cnt = ut::new_arr_withkey<std::atomic<int64_t> *>(
+        ut::make_psi_memory_key(mem_key_ut_lock_free_hash_t),
+        ut::Count{m_cnt_size});
 
     for (size_t i = 0; i < m_cnt_size; i++) {
       const size_t s = sizeof(std::atomic<int64_t>);
@@ -125,7 +126,8 @@
 
         mem = os_numa_alloc_onnode(s, node);
       } else {
-        mem = ut_malloc(s, mem_key_ut_lock_free_hash_t);
+        mem = ut::malloc_withkey(
+            ut::make_psi_memory_key(mem_key_ut_lock_free_hash_t), s);
       }
 
       ut_a(mem != nullptr);
@@ -146,11 +148,11 @@
       if (m_numa_available) {
         os_numa_free(m_cnt[i], sizeof(std::atomic<int64_t>));
       } else {
-        ut_free(m_cnt[i]);
+        ut::free(m_cnt[i]);
       }
     }
 
-    UT_DELETE_ARRAY(m_cnt);
+    ut::delete_arr(m_cnt);
   }
 
   /** Increment the counter. */
@@ -220,13 +222,15 @@
   @param[in]	n_elements	number of elements to create */
   explicit ut_lock_free_list_node_t(size_t n_elements)
       : m_n_base_elements(n_elements), m_pending_free(false), m_next(nullptr) {
-    m_base = UT_NEW_ARRAY(T, m_n_base_elements, mem_key_ut_lock_free_hash_t);
+    m_base = ut::new_arr_withkey<T>(
+        ut::make_psi_memory_key(mem_key_ut_lock_free_hash_t),
+        ut::Count{m_n_base_elements});
 
     ut_ad(n_elements > 0);
   }
 
   /** Destructor. */
-  ~ut_lock_free_list_node_t() { UT_DELETE_ARRAY(m_base); }
+  ~ut_lock_free_list_node_t() { ut::delete_arr(m_base); }
 
   /** Create and append a new array to this one and store a pointer
   to it in 'm_next'. This is done in a way that multiple threads can
@@ -251,8 +255,8 @@
       new_size = m_n_base_elements * 2;
     }
 
-    next_t new_arr = UT_NEW(ut_lock_free_list_node_t<T>(new_size),
-                            mem_key_ut_lock_free_hash_t);
+    next_t new_arr = ut::new_withkey<ut_lock_free_list_node_t<T>>(
+        ut::make_psi_memory_key(mem_key_ut_lock_free_hash_t), new_size);
 
     /* Publish the allocated entry. If somebody did this in the
     meantime then just discard the allocated entry and do
@@ -261,7 +265,7 @@
     if (!m_next.compare_exchange_strong(expected, new_arr,
                                         std::memory_order_relaxed)) {
       /* Somebody just did that. */
-      UT_DELETE(new_arr);
+      ut::delete_(new_arr);
 
       /* 'expected' has the current value which
       must be != NULL because the CAS failed. */
@@ -437,14 +441,16 @@
     ut_a(initial_size > 0);
     ut_a(ut_is_2pow(initial_size));
 
-    m_data.store(UT_NEW(arr_node_t(initial_size), mem_key_ut_lock_free_hash_t),
-                 std::memory_order_relaxed);
+    m_data.store(
+        ut::new_withkey<arr_node_t>(
+            ut::make_psi_memory_key(mem_key_ut_lock_free_hash_t), initial_size),
+        std::memory_order_relaxed);
 
     mutex_create(LATCH_ID_LOCK_FREE_HASH, &m_optimize_latch);
 
-    m_hollow_objects =
-        UT_NEW(hollow_t(hollow_alloc_t(mem_key_ut_lock_free_hash_t)),
-               mem_key_ut_lock_free_hash_t);
+    m_hollow_objects = ut::new_withkey<hollow_t>(
+        ut::make_psi_memory_key(mem_key_ut_lock_free_hash_t),
+        hollow_alloc_t(mem_key_ut_lock_free_hash_t));
   }
 
   /** Destructor. Not thread safe. */
@@ -456,16 +462,16 @@
     do {
       arr_node_t *next = arr->m_next.load(std::memory_order_relaxed);
 
-      UT_DELETE(arr);
+      ut::delete_(arr);
 
       arr = next;
     } while (arr != nullptr);
 
     while (!m_hollow_objects->empty()) {
-      UT_DELETE(m_hollow_objects->front());
+      ut::delete_(m_hollow_objects->front());
       m_hollow_objects->pop_front();
     }
-    UT_DELETE(m_hollow_objects);
+    ut::delete_(m_hollow_objects);
   }
 
   /** Get the value mapped to a given key.
@@ -1007,8 +1013,8 @@
         ;
       }
 
-      UT_DELETE_ARRAY(arr->m_base);
-      /* The destructor of arr will call UT_DELETE_ARRAY()
+      ut::delete_arr(arr->m_base);
+      /* The destructor of arr will call ut::delete_arr()
       on m_base again. Make sure it is a noop and avoid
       double free. */
       arr->m_base = nullptr;
@@ -1100,7 +1106,7 @@
   /** Storage for the (key, val) tuples. */
   std::atomic<arr_node_t *> m_data;
 
-  typedef ut_allocator<arr_node_t *> hollow_alloc_t;
+  typedef ut::allocator<arr_node_t *> hollow_alloc_t;
   typedef std::list<arr_node_t *, hollow_alloc_t> hollow_t;
 
   /** Container for hollow (semi-destroyed) objects that have been
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/ut0mem.h mysql-8.0-8.0.27/storage/innobase/include/ut0mem.h
--- mysql-8.0-8.0.26/storage/innobase/include/ut0mem.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/ut0mem.h	2021-09-28 11:46:34.000000000 +0000
@@ -93,7 +93,7 @@
 Concatenate 3 strings.*/
 char *ut_str3cat(
     /* out, own: concatenated string, must be
-    freed with ut_free() */
+    freed with ut::free() */
     const char *s1,  /* in: string 1 */
     const char *s2,  /* in: string 2 */
     const char *s3); /* in: string 3 */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/ut0mem.ic mysql-8.0-8.0.27/storage/innobase/include/ut0mem.ic
--- mysql-8.0-8.0.26/storage/innobase/include/ut0mem.ic	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/ut0mem.ic	2021-09-28 11:46:34.000000000 +0000
@@ -196,13 +196,13 @@
         buf[buf_i] = '\'';
         buf_i++;
       }
-      /* FALLTHROUGH */
+      [[fallthrough]];
     case 2:
     case 1:
 
       buf[buf_i] = '\0';
       buf_i++;
-      /* FALLTHROUGH */
+      [[fallthrough]];
     case 0:
 
       return (buf_i);
@@ -241,7 +241,7 @@
         }
         buf[buf_i] = ch;
         buf_i++;
-        /* FALLTHROUGH */
+        [[fallthrough]];
       default:
 
         buf[buf_i] = ch;
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/ut0mpmcbq.h mysql-8.0-8.0.27/storage/innobase/include/ut0mpmcbq.h
--- mysql-8.0-8.0.26/storage/innobase/include/ut0mpmcbq.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/ut0mpmcbq.h	2021-09-28 11:46:34.000000000 +0000
@@ -39,7 +39,8 @@
   /** Constructor
   @param[in]	n_elems		Max number of elements allowed */
   explicit mpmc_bq(size_t n_elems)
-      : m_ring(reinterpret_cast<Cell *>(UT_NEW_ARRAY_NOKEY(Aligned, n_elems))),
+      : m_ring(reinterpret_cast<Cell *>(ut::new_arr_withkey<Aligned>(
+            UT_NEW_THIS_FILE_PSI_KEY, ut::Count{n_elems}))),
         m_capacity(n_elems - 1) {
     /* Should be a power of 2 */
     ut_a((n_elems >= 2) && ((n_elems & (n_elems - 1)) == 0));
@@ -53,12 +54,12 @@
   }
 
   /** Destructor */
-  ~mpmc_bq() { UT_DELETE_ARRAY(m_ring); }
+  ~mpmc_bq() { ut::delete_arr(m_ring); }
 
   /** Enqueue an element
   @param[in]	data		Element to insert, it will be copied
   @return true on success */
-  bool enqueue(T const &data) MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] bool enqueue(T const &data) {
     /* m_enqueue_pos only wraps at MAX(m_enqueue_pos), instead
     we use the capacity to convert the sequence to an array
     index. This is why the ring buffer must be a size which
@@ -113,7 +114,7 @@
   /** Dequeue an element
   @param[out]	data		Element read from the queue
   @return true on success */
-  bool dequeue(T &data) MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] bool dequeue(T &data) {
     Cell *cell;
     size_t pos = m_dequeue_pos.load(std::memory_order_relaxed);
 
@@ -156,12 +157,10 @@
   }
 
   /** @return the capacity of the queue */
-  size_t capacity() const MY_ATTRIBUTE((warn_unused_result)) {
-    return (m_capacity + 1);
-  }
+  [[nodiscard]] size_t capacity() const { return (m_capacity + 1); }
 
   /** @return true if the queue is empty. */
-  bool empty() const MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] bool empty() const {
     size_t pos = m_dequeue_pos.load(std::memory_order_relaxed);
 
     for (;;) {
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/ut0mutex.h mysql-8.0-8.0.27/storage/innobase/include/ut0mutex.h
--- mysql-8.0-8.0.26/storage/innobase/include/ut0mutex.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/ut0mutex.h	2021-09-28 11:46:34.000000000 +0000
@@ -50,9 +50,8 @@
 
 #ifdef UNIV_DEBUG
 #define mutex_validate(M) (M)
-/* Since mutexes are disabled under UNIV_LIBRARY, the following is OK
-and necessary to suppress compiler warnings. */
-#define mutex_own(M) ((M) || false)
+/* Since mutexes are disabled under UNIV_LIBRARY, the following is OK. */
+#define mutex_own(m) ((m) != nullptr)
 #endif /* UNIV_DEBUG */
 typedef OSMutex SysMutex;
 typedef OSMutex ib_mutex_t;
@@ -132,6 +131,11 @@
     mutex_enter(in_mutex);
   }
 
+  IB_mutex_guard(ib_mutex_t *in_mutex, const ut::Location &loc)
+      : m_mutex(in_mutex) {
+    mutex_enter_inline(in_mutex, loc);
+  }
+
   /** Destructor to release mutex */
   ~IB_mutex_guard() { mutex_exit(m_mutex); }
 
@@ -240,7 +244,20 @@
 void mutex_destroy(Mutex *mutex) {
   mutex->destroy();
 }
-#endif /* UNIV_LIBRARY */
+
+class IB_mutex : public ib_mutex_t {
+ public:
+  explicit IB_mutex(latch_id_t latch_id) {
+    mutex_create(latch_id, static_cast<ib_mutex_t *>(this));
+  }
+  ~IB_mutex() { mutex_free(static_cast<ib_mutex_t *>(this)); }
+  void lock(const ut::Location &loc) {
+    mutex_enter_inline(static_cast<ib_mutex_t *>(this), loc);
+  }
+  void unlock() { exit(); }
+};
+
 #endif /* !UNIV_HOTBACKUP */
+#endif /* UNIV_LIBRARY */
 
 #endif /* ut0mutex_h */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/ut0new.h mysql-8.0-8.0.27/storage/innobase/include/ut0new.h
--- mysql-8.0-8.0.26/storage/innobase/include/ut0new.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/ut0new.h	2021-09-28 11:46:34.000000000 +0000
@@ -25,102 +25,84 @@
 *****************************************************************************/
 
 /** @file include/ut0new.h
- Instrumented memory allocator.
-
- Created May 26, 2014 Vasil Dimov
- *******************************************************/
+    Dynamic memory allocation routines and custom allocators specifically
+    crafted to support memory instrumentation through performance schema memory
+    engine (PFS).
+ */
 
-/** Dynamic memory allocation within InnoDB guidelines.
-All dynamic (heap) memory allocations (malloc(3), strdup(3), etc, "new",
-various std:: containers that allocate memory internally), that are done
-within InnoDB are instrumented. This means that InnoDB uses a custom set
-of functions for allocating memory, rather than calling e.g. "new" directly.
-
-Here follows a cheat sheet on what InnoDB functions to use whenever a
-standard one would have been used.
-
-Creating new objects with "new":
---------------------------------
-Standard:
-  new expression
-  or
-  new(std::nothrow) expression
-InnoDB, default instrumentation:
-  UT_NEW_NOKEY(expression)
-InnoDB, custom instrumentation, preferred:
-  UT_NEW(expression, key)
-
-Destroying objects, created with "new":
----------------------------------------
-Standard:
-  delete ptr
-InnoDB:
-  UT_DELETE(ptr)
-
-Creating new arrays with "new[]":
----------------------------------
-Standard:
-  new type[num]
-  or
-  new(std::nothrow) type[num]
-InnoDB, default instrumentation:
-  UT_NEW_ARRAY_NOKEY(type, num)
-InnoDB, custom instrumentation, preferred:
-  UT_NEW_ARRAY(type, num, key)
-
-Destroying arrays, created with "new[]":
-----------------------------------------
-Standard:
-  delete[] ptr
-InnoDB:
-  UT_DELETE_ARRAY(ptr)
-
-Declaring a type with a std:: container, e.g. std::vector:
-----------------------------------------------------------
-Standard:
-  std::vector<t>
-InnoDB:
-  std::vector<t, ut_allocator<t> >
-
-Declaring objects of some std:: type:
--------------------------------------
-Standard:
-  std::vector<t> v
-InnoDB, default instrumentation:
-  std::vector<t, ut_allocator<t> > v
-InnoDB, custom instrumentation, preferred:
-  std::vector<t, ut_allocator<t> > v(ut_allocator<t>(key))
-
-Raw block allocation (as usual in C++, consider whether using "new" would
-not be more appropriate):
--------------------------------------------------------------------------
-Standard:
-  malloc(num)
-InnoDB, default instrumentation:
-  ut_malloc_nokey(num)
-InnoDB, custom instrumentation, preferred:
-  ut_malloc(num, key)
-
-Raw block resize:
------------------
-Standard:
-  realloc(ptr, new_size)
-InnoDB:
-  ut_realloc(ptr, new_size)
-
-Raw block deallocation:
------------------------
-Standard:
-  free(ptr)
-InnoDB:
-  ut_free(ptr)
-
-Note: the expression passed to UT_NEW() or UT_NEW_NOKEY() must always end
-with (), thus:
-Standard:
-  new int
-InnoDB:
-  UT_NEW_NOKEY(int())
+/** This file contains a set of libraries providing overloads for regular
+    dynamic allocation routines which allow for opt-in memory instrumentation
+    through performance schema memory engine (PFS).
+
+    In particular, _no_ regular dynamic allocation routines shall be used given
+    that the end goal of instrumentation through PFS is system observability
+    and resource control. In practice this means that we are off the chances to
+    use _any_ standard means of allocating the memory and that we have to
+    provide and re-implement our own PFS-aware variants ourselves.
+
+    This does not only apply to direct memory allocation through malloc or new
+    but also to data structures that may allocate dynamic memory under the hood,
+    like the ones from STL. For that reason, STL data structures shall always
+    be used with PFS-enabled custom memory allocator. STL algorithms OTOH
+    also _may_ allocate dynamic memory but they do not provide customization
+    point for user-code to provide custom memory allocation mechanism so there's
+    nothing that we can do about it.
+
+    Furthermore, facilities that allow safer memory management such as
+    std::unique_ptr, std::shared_ptr and their respective std::make_unique and
+    std::make_shared functions also have to be re-implemented as such so that
+    they become PFS-aware.
+
+    Following is the list of currently implemented PFS-enabled dynamic
+    allocation overloads:
+      * Primitive allocation functions:
+          * ut::malloc
+          * ut::zalloc
+          * ut::realloc
+          * ut::free
+          * ut::{malloc | zalloc | realloc}_withkey
+      * Primitive allocation functions for types with extended alignment:
+          * ut::aligned_alloc
+          * ut::aligned_zalloc
+          * ut::aligned_free
+          * ut::{aligned_alloc | aligned_zalloc}_withkey
+      * Primitive allocation functions for page-aligned allocations:
+          * ut::malloc_page
+          * ut::malloc_page_withkey
+          * ut::free_page
+      * Primitive allocation functions for large (huge) page aligned
+        allocations:
+          * ut::malloc_large_page
+          * ut::malloc_large_page_withkey
+          * ut::free_large_page
+      * Primitive allocation functions for large (huge) aligned allocations with
+        fallback to page-aligned allocations:
+          * ut::malloc_large_page(fallback_to_normal_page_t)
+          * ut::malloc_large_page_withkey(fallback_to_normal_page_t)
+          * ut::free_large_page(fallback_to_normal_page_t)
+      * Overloads for C++ new and delete syntax:
+          * ut::new_
+          * ut::new_arr
+          * ut::{new_ | new_arr_}_withkey
+          * ut::delete_
+          * ut::delete_arr
+      * Overloads for C++ new and delete syntax for types with extended
+        alignment:
+          * ut::aligned_new
+          * ut::aligned_new_arr
+          * ut::{aligned_new_ | aligned_new_arr_}_withkey
+          * ut::aligned_delete
+          * ut::aligned_delete_arr
+      * Custom memory allocators:
+          * ut::allocator
+    _withkey variants from above are the PFS-enabled dynamic allocation
+    overloads.
+
+    Usages of PFS-enabled library functions are trying to resemble already
+    familiar syntax as close as possible. For concrete examples please see
+    particular function documentation but in general it applies that ::foo(x)
+    becomes ut::foo(x) or ut::foo_withkey(key, x) where foo is some allocation
+    function listed above and key is PFS key to instrument the allocation with.
 */
 
 #ifndef ut0new_h
@@ -150,10 +132,44 @@
 #include "ut0dbg.h"
 #include "ut0ut.h"
 
-#define OUT_OF_MEMORY_MSG                                             \
-  "Check if you should increase the swap file or ulimits of your"     \
-  " operating system. Note that on most 32-bit computers the process" \
-  " memory space is limited to 2 GB or 4 GB."
+namespace ut {
+
+/** Light-weight and type-safe wrapper around the PSI_memory_key
+    that eliminates the possibility of introducing silent bugs
+    through the course of implicit conversions and makes them
+    show up as compile-time errors.
+
+    Without this wrapper it was possible to say:
+      aligned_alloc_withkey(10*sizeof(int), key, 64))
+    Which would unfortunately compile just fine but it would silently
+    introduce a bug because it confuses the order of 10*sizeof(int) and
+    key input arguments. Both of them are unsigned types.
+
+    With the wrapper, aligned_alloc_withkey(10*sizeof(int), key, 64)) now
+    results with a compile-time error and the only proper way to accomplish
+    the original intent is to use PSI_memory_key_t wrapper like so:
+    aligned_alloc_withkey(PSI_memory_key_t{key}, 10*sizeof(int), 64))
+
+    Or by making use of the convenience function to create one:
+      aligned_alloc_withkey(make_psi_memory_key(key), 10*sizeof(int), 64))
+*/
+struct PSI_memory_key_t {
+  explicit PSI_memory_key_t(PSI_memory_key key) : m_key(key) {}
+  PSI_memory_key operator()() const { return m_key; }
+  PSI_memory_key m_key;
+};
+
+/** Convenience helper function to create type-safe representation of
+    PSI_memory_key.
+
+    @param[in] key PSI memory key to be held in type-safe PSI_memory_key_t.
+    @return PSI_memory_key_t which wraps the given PSI_memory_key
+ */
+inline PSI_memory_key_t make_psi_memory_key(PSI_memory_key key) {
+  return PSI_memory_key_t(key);
+}
+
+}  // namespace ut
 
 /** Maximum number of retries to allocate memory. */
 extern const size_t alloc_max_retries;
@@ -184,19 +200,19 @@
 extern PSI_memory_key mem_key_other;
 extern PSI_memory_key mem_key_partitioning;
 extern PSI_memory_key mem_key_row_log_buf;
-extern PSI_memory_key mem_key_row_merge_sort;
+extern PSI_memory_key mem_key_ddl;
 extern PSI_memory_key mem_key_std;
 extern PSI_memory_key mem_key_trx_sys_t_rw_trx_ids;
 extern PSI_memory_key mem_key_undo_spaces;
 extern PSI_memory_key mem_key_ut_lock_free_hash_t;
 /* Please obey alphabetical order in the definitions above. */
 
-/** Setup the internal objects needed for UT_NEW() to operate.
-This must be called before the first call to UT_NEW(). */
+/** Setup the internal objects needed for ut::*_withkey() to operate.
+This must be called before the first call to ut::*_withkey(). */
 void ut_new_boot();
 
-/** Setup the internal objects needed for UT_NEW() to operate.
-This must be called before the first call to UT_NEW(). This
+/** Setup the internal objects needed for ut::*_withkey() to operate.
+This must be called before the first call to ut::*_withkey(). This
 version of function might be called several times and it will
 simply skip all calls except the first one, during which the
 initialization will happen. */
@@ -210,8 +226,8 @@
     "api0api",
     "api0misc",
     "btr0btr",
-    "btr0bulk",
     "btr0cur",
+    "btr0load",
     "btr0pcur",
     "btr0sea",
     "btr0types",
@@ -233,6 +249,15 @@
     "data0type",
     "data0types",
     "db0err",
+    "ddl0buffer",
+    "ddl0builder",
+    "ddl0ctx",
+    "ddl0ddl",
+    "ddl0file-reader",
+    "ddl0loader",
+    "ddl0merge",
+    "ddl0rtree",
+    "ddl0par-scan",
     "dict",
     "dict0boot",
     "dict0crea",
@@ -334,11 +359,10 @@
     "rem0rec",
     "rem0types",
     "row0ext",
-    "row0ftsort",
+    "row0ft",
     "row0import",
     "row0ins",
     "row0log",
-    "row0merge",
     "row0mysql",
     "row0purge",
     "row0quiesce",
@@ -515,653 +539,865 @@
 #define UT_NEW_THIS_FILE_PSI_INDEX \
   (force_constexpr<ut_new_get_key_by_file(MY_BASENAME)>::value)
 
-#define UT_NEW_THIS_FILE_PSI_KEY    \
-  (UT_NEW_THIS_FILE_PSI_INDEX == -1 \
-       ? PSI_NOT_INSTRUMENTED       \
-       : auto_event_keys[UT_NEW_THIS_FILE_PSI_INDEX])
+#define UT_NEW_THIS_FILE_PSI_KEY                       \
+  (UT_NEW_THIS_FILE_PSI_INDEX == -1                    \
+       ? ut::make_psi_memory_key(PSI_NOT_INSTRUMENTED) \
+       : ut::make_psi_memory_key(auto_event_keys[UT_NEW_THIS_FILE_PSI_INDEX]))
 
 #endif /* __GNUG__ == 5 */
 
 #else
 
-#define UT_NEW_THIS_FILE_PSI_KEY PSI_NOT_INSTRUMENTED
+#define UT_NEW_THIS_FILE_PSI_KEY ut::make_psi_memory_key(PSI_NOT_INSTRUMENTED)
 
 #endif /* UNIV_PFS_MEMORY */
 
-/** A structure that holds the necessary data for performance schema
-accounting. An object of this type is put in front of each allocated block
-of memory when allocation is done by ut_allocator::allocate(). This is
-because the data is needed even when freeing the memory. Users of
-ut_allocator::allocate_large() are responsible for maintaining this
-themselves.
- To maintain proper alignment of the pointers ut_allocator returns to the
-calling code, this struct is declared with alignas(std::max_align_t). This tells
-the compiler to insert enough padding to the struct to satisfy the strictest
-fundamental alignment requirement. The size of this object then becomes a
-multiple of the alignment requirement, this is implied by the fact that arrays
-are contiguous in memory. This means that when we increment a pointer to
-ut_new_pfx_t the resulting pointer must be aligned to the alignment requirement
-of std::max_align_t. Ref. C++ standard: 6.6.5 [basic.align], 11.3.4 [dcl.array]
-*/
-struct alignas(std::max_align_t) ut_new_pfx_t {
-#ifdef UNIV_PFS_MEMORY
+namespace ut {
 
-  /** Performance schema key. Assigned to a name at startup via
-  PSI_MEMORY_CALL(register_memory)() and later used for accounting
-  allocations and deallocations with
-  PSI_MEMORY_CALL(memory_alloc)(key, size, owner) and
-  PSI_MEMORY_CALL(memory_free)(key, size, owner). */
-  PSI_memory_key m_key;
+#ifdef HAVE_PSI_MEMORY_INTERFACE
+constexpr bool WITH_PFS_MEMORY = true;
+#else
+constexpr bool WITH_PFS_MEMORY = false;
+#endif
 
-  /**
-    Thread owner.
-    Instrumented thread that owns the allocated memory.
-    This state is used by the performance schema to maintain
-    per thread statistics,
-    when memory is given from thread A to thread B.
-  */
-  struct PSI_thread *m_owner;
+/** Dynamically allocates storage of given size. Instruments the memory with
+    given PSI memory key in case PFS memory support is enabled.
 
-#endif /* UNIV_PFS_MEMORY */
+    @param[in] key PSI memory key to be used for PFS memory instrumentation.
+    @param[in] size Size of storage (in bytes) requested to be allocated.
+    @return Pointer to the allocated storage. nullptr if dynamic storage
+    allocation failed.
 
-  /** Size of the allocated block in bytes, including this prepended
-  aux structure (for ut_allocator::allocate()). For example if InnoDB
-  code requests to allocate 100 bytes, and sizeof(ut_new_pfx_t) is 16,
-  then 116 bytes are allocated in total and m_size will be 116.
-  ut_allocator::allocate_large() does not prepend this struct to the
-  allocated block and its users are responsible for maintaining it
-  and passing it later to ut_allocator::deallocate_large(). */
-  size_t m_size;
-};
+    Example:
+     int *x = static_cast<int*>(ut::malloc_withkey(key, 10*sizeof(int)));
+ */
+inline void *malloc_withkey(PSI_memory_key_t key, std::size_t size) noexcept {
+  using impl = detail::select_malloc_impl_t<WITH_PFS_MEMORY, false>;
+  using malloc_impl = detail::Alloc_<impl>;
+  return malloc_impl::alloc<false>(size, key());
+}
 
-/** Allocator class for allocating memory from inside std::* containers. */
-template <class T>
-class ut_allocator {
- public:
-  typedef T *pointer;
-  typedef const T *const_pointer;
-  typedef T &reference;
-  typedef const T &const_reference;
-  typedef T value_type;
-  typedef size_t size_type;
-  typedef ptrdiff_t difference_type;
+/** Dynamically allocates storage of given size.
+
+    NOTE: Given that this function will _NOT_ be instrumenting the allocation
+    through PFS, observability for particular parts of the system which want to
+    use it will be lost or in best case inaccurate. Please have a strong reason
+    to do so.
 
-  static_assert(alignof(T) <= alignof(std::max_align_t),
-                "ut_allocator does not support over-aligned types. Use "
-                "aligned_memory or another similar allocator for this type.");
+    @param[in] size Size of storage (in bytes) requested to be allocated.
+    @return Pointer to the allocated storage. nullptr if dynamic storage
+    allocation failed.
 
-  /** Default constructor.
-  @param[in] key  performance schema key. */
-#ifdef UNIV_PFS_MEMORY
-  explicit ut_allocator(PSI_memory_key key = UT_NEW_THIS_FILE_PSI_KEY)
-      : m_key(key)
-#else
-  explicit ut_allocator(PSI_memory_key key = PSI_NOT_INSTRUMENTED)
-#endif /* UNIV_PFS_MEMORY */
-  {
-  }
+    Example:
+     int *x = static_cast<int*>(ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY,
+   10*sizeof(int)));
+ */
+inline void *malloc(std::size_t size) noexcept {
+  return ut::malloc_withkey(make_psi_memory_key(PSI_NOT_INSTRUMENTED), size);
+}
 
-  /** Constructor from allocator of another type.
-  @param[in] other  the allocator to copy. */
-  template <class U>
-  ut_allocator(const ut_allocator<U> &other)
-#ifdef UNIV_PFS_MEMORY
-      : m_key(other.get_mem_key())
-#endif /* UNIV_PFS_MEMORY */
-  {
-  }
+/** Dynamically allocates zero-initialized storage of given size. Instruments
+    the memory with given PSI memory key in case PFS memory support is enabled.
 
-#ifdef UNIV_PFS_MEMORY
-  /** Get the performance schema key to use for tracing allocations.
-  @return performance schema key */
-  PSI_memory_key get_mem_key() const {
-    /* note: keep this as simple getter as is used by copy constructor */
-    return (m_key);
-  }
-#endif /* UNIV_PFS_MEMORY */
+    @param[in] key PSI memory key to be used for PFS memory instrumentation.
+    @param[in] size Size of storage (in bytes) requested to be allocated.
+    @return Pointer to the zero-initialized allocated storage. nullptr if
+    dynamic storage allocation failed.
 
-  /** Return the maximum number of objects that can be allocated by
-  this allocator. */
-  size_type max_size() const {
-    const size_type s_max = std::numeric_limits<size_type>::max();
+    Example:
+     int *x = static_cast<int*>(ut::zalloc_withkey(key, 10*sizeof(int)));
+ */
+inline void *zalloc_withkey(PSI_memory_key_t key, std::size_t size) noexcept {
+  using impl = detail::select_malloc_impl_t<WITH_PFS_MEMORY, false>;
+  using malloc_impl = detail::Alloc_<impl>;
+  return malloc_impl::alloc<true>(size, key());
+}
 
-#ifdef UNIV_PFS_MEMORY
-    return ((s_max - sizeof(ut_new_pfx_t)) / sizeof(T));
-#else
-    return (s_max / sizeof(T));
-#endif /* UNIV_PFS_MEMORY */
-  }
+/** Dynamically allocates zero-initialized storage of given size.
+
+    NOTE: Given that this function will _NOT_ be instrumenting the allocation
+    through PFS, observability for particular parts of the system which want to
+    use it will be lost or in best case inaccurate. Please have a strong reason
+    to do so.
 
-  /** Allocate a chunk of memory that can hold 'n_elements' objects of
-  type 'T' and trace the allocation.
-  If the allocation fails this method will throw an exception. This
-  is mandated by the standard and if it returns NULL instead, then
-  STL containers that use it (e.g. std::vector) may get confused.
-  After successful allocation the returned pointer must be passed
-  to ut_allocator::deallocate() when no longer needed.
-  @param[in]  n_elements      number of elements
-  @param[in]  hint            pointer to a nearby memory location,
-                              unused by this implementation
-  @param[in]  key             performance schema key
-  @param[in]  set_to_zero     if true, then the returned memory is
-                              initialized with 0x0 bytes.
-  @return pointer to the allocated memory */
-  pointer allocate(size_type n_elements, const_pointer hint = nullptr,
-                   PSI_memory_key key = PSI_NOT_INSTRUMENTED,
-                   bool set_to_zero = false) {
-    if (n_elements > max_size()) {
-      throw std::bad_array_new_length();
-    }
+    @param[in] size Size of storage (in bytes) requested to be allocated.
+    @return Pointer to the zero-initialized allocated storage. nullptr if
+    dynamic storage allocation failed.
 
-    void *ptr;
-    size_t total_bytes = n_elements * sizeof(T);
+    Example:
+     int *x = static_cast<int*>(ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY,
+   10*sizeof(int)));
+ */
+inline void *zalloc(std::size_t size) noexcept {
+  return ut::zalloc_withkey(make_psi_memory_key(PSI_NOT_INSTRUMENTED), size);
+}
 
-#ifdef UNIV_PFS_MEMORY
-    total_bytes += sizeof(ut_new_pfx_t);
-#endif /* UNIV_PFS_MEMORY */
+/** Upsizes or downsizes already dynamically allocated storage to the new size.
+    Instruments the memory with given PSI memory key in case PFS memory support
+    is enabled.
 
-    for (size_t retries = 1;; retries++) {
-      if (set_to_zero) {
-        ptr = calloc(1, total_bytes);
-      } else {
-        ptr = malloc(total_bytes);
-      }
-
-      if (ptr != nullptr || retries >= alloc_max_retries) {
-        break;
-      }
+    It also supports standard realloc() semantics by:
+      * allocating size bytes of memory when passed ptr is nullptr
+      * freeing the memory pointed by ptr if passed size is 0
 
-      std::this_thread::sleep_for(std::chrono::seconds(1));
-    }
+    @param[in] key PSI memory key to be used for PFS memory instrumentation.
+    @param[in] ptr Pointer to the memory area to be reallocated.
+    @param[in] size New size of storage (in bytes) requested to be reallocated.
+    @return Pointer to the reallocated storage. nullptr if dynamic storage
+    allocation failed.
 
-    if (ptr == nullptr) {
-      throw std::bad_alloc();
-    }
+    Example:
+     int *x = static_cast<int*>(ut::malloc_withkey(key, 10*sizeof(int));
+     x = static_cast<int*>(ut::realloc_withkey(key, ptr, 100*sizeof(int)));
+ */
+inline void *realloc_withkey(PSI_memory_key_t key, void *ptr,
+                             std::size_t size) noexcept {
+  using impl = detail::select_malloc_impl_t<WITH_PFS_MEMORY, false>;
+  using malloc_impl = detail::Alloc_<impl>;
+  return malloc_impl::realloc(ptr, size, key());
+}
+
+/** Upsizes or downsizes already dynamically allocated storage to the new size.
+
+    It also supports standard realloc() semantics by:
+      * allocating size bytes of memory when passed ptr is nullptr
+      * freeing the memory pointed by ptr if passed size is 0
+
+    NOTE: Given that this function will _NOT_ be instrumenting the allocation
+    through PFS, observability for particular parts of the system which want to
+    use it will be lost or in best case inaccurate. Please have a strong reason
+    to do so.
+
+    @param[in] ptr Pointer to the memory area to be reallocated.
+    @param[in] size New size of storage (in bytes) requested to be reallocated.
+    @return Pointer to the reallocated storage. nullptr if dynamic storage
+    allocation failed.
 
-#ifdef UNIV_PFS_MEMORY
-    ut_new_pfx_t *pfx = static_cast<ut_new_pfx_t *>(ptr);
-    allocate_trace(total_bytes, key, pfx);
-    return (reinterpret_cast<pointer>(pfx + 1));
-#else
-    return (reinterpret_cast<pointer>(ptr));
-#endif /* UNIV_PFS_MEMORY */
-  }
+    Example:
+     int *x = static_cast<int*>(ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY,
+   10*sizeof(int)); x = static_cast<int*>(ut::realloc(key, ptr,
+   100*sizeof(int)));
+ */
+inline void *realloc(void *ptr, std::size_t size) noexcept {
+  return ut::realloc_withkey(make_psi_memory_key(PSI_NOT_INSTRUMENTED), ptr,
+                             size);
+}
 
-  /** Free a memory allocated by allocate() and trace the deallocation.
-  @param[in,out]	ptr		pointer to memory to free
-  @param[in]	n_elements	number of elements allocated (unused) */
-  void deallocate(pointer ptr, size_type n_elements = 0) {
-    if (ptr == nullptr) {
-      return;
-    }
+/** Releases storage which has been dynamically allocated through any of
+    the ut::malloc*(), ut::realloc* or ut::zalloc*() variants.
 
-#ifdef UNIV_PFS_MEMORY
-    ut_new_pfx_t *pfx = reinterpret_cast<ut_new_pfx_t *>(ptr) - 1;
+    @param[in] ptr Pointer which has been obtained through any of the
+    ut::malloc*(), ut::realloc* or ut::zalloc*() variants.
 
-    deallocate_trace(pfx);
+    Example:
+     ut::free(ptr);
+ */
+inline void free(void *ptr) noexcept {
+  using impl = detail::select_malloc_impl_t<WITH_PFS_MEMORY, false>;
+  using malloc_impl = detail::Alloc_<impl>;
+  malloc_impl::free(ptr);
+}
 
-    free(pfx);
-#else
-    free(ptr);
-#endif /* UNIV_PFS_MEMORY */
-  }
+/** Dynamically allocates storage for an object of type T. Constructs the object
+    of type T with provided Args. Instruments the memory with given PSI memory
+    key in case PFS memory support is enabled.
 
-  /** Destroy an object pointed by 'p'. */
-  void destroy(pointer p) { p->~T(); }
+    @param[in] key PSI memory key to be used for PFS memory instrumentation.
+    @param[in] args Arguments one wishes to pass over to T constructor(s)
+    @return Pointer to the allocated storage. Throws std::bad_alloc exception
+    if dynamic storage allocation could not be fulfilled. Re-throws whatever
+    exception that may have occured during the construction of T, in which case
+    it automatically cleans up the raw memory allocated for it.
 
-  /** Return the address of an object. */
-  pointer address(reference x) const { return (&x); }
+    Example 1:
+     int *ptr = ut::new_withkey<int>(key);
 
-  /** Return the address of a const object. */
-  const_pointer address(const_reference x) const { return (&x); }
+    Example 2:
+     int *ptr = ut::new_withkey<int>(key, 10);
+     assert(*ptr == 10);
 
-  template <class U>
-  struct rebind {
-    typedef ut_allocator<U> other;
-  };
+    Example 3:
+     struct A {
+       A(int x, int y) : _x(x), _y(y) {}
+       int _x, _y;
+     };
+     A *ptr = ut::new_withkey<A>(key, 1, 2);
+     assert(ptr->_x == 1);
+     assert(ptr->_y == 2);
+ */
+template <typename T, typename... Args>
+inline T *new_withkey(PSI_memory_key_t key, Args &&... args) {
+  auto mem = ut::malloc_withkey(key, sizeof(T));
+  if (unlikely(!mem)) throw std::bad_alloc();
+  try {
+    new (mem) T(std::forward<Args>(args)...);
+  } catch (...) {
+    ut::free(mem);
+    throw;
+  }
+  return static_cast<T *>(mem);
+}
 
-  /* The following are custom methods, not required by the standard. */
+/** Dynamically allocates storage for an object of type T. Constructs the object
+    of type T with provided Args.
 
-#ifdef UNIV_PFS_MEMORY
+    NOTE: Given that this function will _NOT_ be instrumenting the allocation
+    through PFS, observability for particular parts of the system which want to
+    use it will be lost or in best case inaccurate. Please have a strong reason
+    to do so.
 
-  /** realloc(3)-like method.
-  The passed in ptr must have been returned by allocate() and the
-  pointer returned by this method must be passed to deallocate() when
-  no longer needed.
-  @param[in,out]	ptr		old pointer to reallocate
-  @param[in]	n_elements	new number of elements to allocate
-  @param[in]	key		Performance schema key to allocate under
-  @return newly allocated memory */
-  pointer reallocate(void *ptr, size_type n_elements, PSI_memory_key key) {
-    if (n_elements == 0) {
-      deallocate(static_cast<pointer>(ptr));
-      return (nullptr);
-    }
+    @param[in] args Arguments one wishes to pass over to T constructor(s)
+    @return Pointer to the allocated storage. Throws std::bad_alloc exception
+    if dynamic storage allocation could not be fulfilled. Re-throws whatever
+    exception that may have occured during the construction of T, in which case
+    it automatically cleans up the raw memory allocated for it.
 
-    if (ptr == nullptr) {
-      return (allocate(n_elements, nullptr, key, false));
-    }
+    Example 1:
+     int *ptr = ut::new_withkey<int>(UT_NEW_THIS_FILE_PSI_KEY);
 
-    if (n_elements > max_size()) {
-      return (nullptr);
-    }
+    Example 2:
+     int *ptr = ut::new_withkey<int>(UT_NEW_THIS_FILE_PSI_KEY, 10);
+     assert(*ptr == 10);
 
-    ut_new_pfx_t *pfx_old;
-    ut_new_pfx_t *pfx_new;
-    size_t total_bytes;
+    Example 3:
+     struct A {
+       A(int x, int y) : _x(x), _y(y) {}
+       int _x, _y;
+     };
+     A *ptr = ut::new_withkey<A>(UT_NEW_THIS_FILE_PSI_KEY, 1, 2);
+     assert(ptr->_x == 1);
+     assert(ptr->_y == 2);
+ */
+template <typename T, typename... Args>
+inline T *new_(Args &&... args) {
+  return ut::new_withkey<T>(make_psi_memory_key(PSI_NOT_INSTRUMENTED),
+                            std::forward<Args>(args)...);
+}
 
-    pfx_old = reinterpret_cast<ut_new_pfx_t *>(ptr) - 1;
+/** Releases storage which has been dynamically allocated through any of
+    the ut::new*() variants. Destructs the object of type T.
 
-    total_bytes = n_elements * sizeof(T) + sizeof(ut_new_pfx_t);
+    @param[in] ptr Pointer which has been obtained through any of the
+    ut::new*() variants
 
-    for (size_t retries = 1;; retries++) {
-      pfx_new = static_cast<ut_new_pfx_t *>(realloc(pfx_old, total_bytes));
+    Example:
+     ut::delete_(ptr);
+ */
+template <typename T>
+inline void delete_(T *ptr) noexcept {
+  if (unlikely(!ptr)) return;
+  ptr->~T();
+  ut::free(ptr);
+}
 
-      if (pfx_new != nullptr || retries >= alloc_max_retries) {
-        break;
-      }
+/** Dynamically allocates storage for an array of T's. Constructs objects of
+    type T with provided Args. Arguments that are to be used to construct some
+    respective instance of T shall be wrapped into a std::tuple. See examples
+    down below. Instruments the memory with given PSI memory key in case PFS
+    memory support is enabled.
+
+    To create an array of default-intialized T's, one can use this function
+    template but for convenience purposes one can achieve the same by using
+    the ut::new_arr_withkey with ut::Count overload.
 
-      std::this_thread::sleep_for(std::chrono::seconds(1));
-    }
+    @param[in] key PSI memory key to be used for PFS memory instrumentation.
+    @param[in] args Tuples of arguments one wishes to pass over to T
+    constructor(s).
+    @return Pointer to the first element of allocated storage. Throws
+    std::bad_alloc exception if dynamic storage allocation could not be
+    fulfilled. Re-throws whatever exception that may have occured during the
+    construction of any instance of T, in which case it automatically destroys
+    successfully constructed objects till that moment (if any), and finally
+    cleans up the raw memory allocated for T instances.
 
-    if (pfx_new == nullptr) {
-      return nullptr;
-    }
+    Example 1:
+     int *ptr = ut::new_arr_withkey<int>(key,
+                    std::forward_as_tuple(1),
+                    std::forward_as_tuple(2));
+     assert(ptr[0] == 1);
+     assert(ptr[1] == 2);
 
-    /* pfx_new still contains the description of the old block
-    that was presumably freed by realloc(). */
-    deallocate_trace(pfx_new);
-
-    /* pfx_new is set here to describe the new block. */
-    allocate_trace(total_bytes, key, pfx_new);
-
-    return (reinterpret_cast<pointer>(pfx_new + 1));
-  }
-
-  /** Allocate, trace the allocation and construct 'n_elements' objects
-  of type 'T'. If the allocation fails or if some of the constructors
-  throws an exception, then this method will return NULL. It does not
-  throw exceptions. After successful completion the returned pointer
-  must be passed to delete_array() when no longer needed.
-  @param[in]	n_elements	number of elements to allocate
-  @param[in]	key		Performance schema key to allocate under
-  @return pointer to the first allocated object or NULL */
-  pointer new_array(size_type n_elements, PSI_memory_key key) {
-    static_assert(std::is_default_constructible<T>::value,
-                  "Array element type must be default-constructible");
-
-    T *p = allocate(n_elements, nullptr, key, false);
-
-    T *first = p;
-    size_type i;
-
-    try {
-      for (i = 0; i < n_elements; i++) {
-        new (p) T;
-        ++p;
-      }
-    } catch (...) {
-      for (size_type j = 0; j < i; j++) {
-        --p;
-        p->~T();
-      }
+    Example 2:
+     struct A {
+       A(int x, int y) : _x(x), _y(y) {}
+       int _x, _y;
+     };
+     A *ptr = ut::new_arr_withkey<A>(key,
+                std::forward_as_tuple(0, 1), std::forward_as_tuple(2, 3),
+                std::forward_as_tuple(4, 5), std::forward_as_tuple(6, 7),
+                std::forward_as_tuple(8, 9));
+     assert(ptr[0]->_x == 0 && ptr[0]->_y == 1);
+     assert(ptr[1]->_x == 2 && ptr[1]->_y == 3);
+     assert(ptr[2]->_x == 4 && ptr[2]->_y == 5);
+     assert(ptr[3]->_x == 6 && ptr[3]->_y == 7);
+     assert(ptr[4]->_x == 8 && ptr[4]->_y == 9);
 
-      deallocate(first);
+    Example 3:
+     struct A {
+       A() : _x(10), _y(100) {}
+       A(int x, int y) : _x(x), _y(y) {}
+       int _x, _y;
+     };
+     A *ptr = ut::new_arr_withkey<A>(key,
+                std::forward_as_tuple(0, 1), std::forward_as_tuple(2, 3),
+                std::forward_as_tuple(), std::forward_as_tuple(6, 7),
+                std::forward_as_tuple());
+     assert(ptr[0]->_x == 0  && ptr[0]->_y == 1);
+     assert(ptr[1]->_x == 2  && ptr[1]->_y == 3);
+     assert(ptr[2]->_x == 10 && ptr[2]->_y == 100);
+     assert(ptr[3]->_x == 6  && ptr[3]->_y == 7);
+     assert(ptr[4]->_x == 10 && ptr[4]->_y == 100);
+ */
+template <typename T, typename... Args>
+inline T *new_arr_withkey(PSI_memory_key_t key, Args &&... args) {
+  using impl = detail::select_malloc_impl_t<WITH_PFS_MEMORY, true>;
+  using malloc_impl = detail::Alloc_<impl>;
+  auto mem = malloc_impl::alloc<false>(sizeof(T) * sizeof...(args), key());
+  if (unlikely(!mem)) throw std::bad_alloc();
 
-      throw;
+  size_t idx = 0;
+  try {
+    using arr_t = int[];
+    (void)arr_t{0, (detail::construct<T>(mem, sizeof(T) * idx++,
+                                         std::forward<Args>(args)),
+                    0)...};
+  } catch (...) {
+    for (size_t offset = (idx - 1) * sizeof(T); offset != 0;
+         offset -= sizeof(T)) {
+      reinterpret_cast<T *>(reinterpret_cast<std::uintptr_t>(mem) + offset -
+                            sizeof(T))
+          ->~T();
     }
-
-    return (first);
+    malloc_impl::free(mem);
+    throw;
   }
+  return static_cast<T *>(mem);
+}
 
-  /** Destroy, deallocate and trace the deallocation of an array created
-  by new_array().
-  @param[in,out]	ptr	pointer to the first object in the array */
-  void delete_array(T *ptr) {
-    if (ptr == nullptr) {
-      return;
-    }
-
-    const size_type n_elements = n_elements_allocated(ptr);
-
-    T *p = ptr + n_elements - 1;
-
-    for (size_type i = 0; i < n_elements; i++) {
-      p->~T();
-      --p;
-    }
-
-    deallocate(ptr);
-  }
+/** Dynamically allocates storage for an array of T's. Constructs objects of
+    type T with provided Args. Arguments that are to be used to construct some
+    respective instance of T shall be wrapped into a std::tuple. See examples
+    down below.
+
+    To create an array of default-intialized T's, one can use this function
+    template but for convenience purposes one can achieve the same by using
+    the ut::new_arr_withkey with ut::Count overload.
+
+    NOTE: Given that this function will _NOT_ be instrumenting the allocation
+    through PFS, observability for particular parts of the system which want to
+    use it will be lost or in best case inaccurate. Please have a strong reason
+    to do so.
 
-#endif /* UNIV_PFS_MEMORY */
+    @param[in] args Tuples of arguments one wishes to pass over to T
+    constructor(s).
+    @return Pointer to the first element of allocated storage. Throws
+    std::bad_alloc exception if dynamic storage allocation could not be
+    fulfilled. Re-throws whatever exception that may have occured during the
+    construction of any instance of T, in which case it automatically destroys
+    successfully constructed objects till that moment (if any), and finally
+    cleans up the raw memory allocated for T instances.
 
-  /** Allocate a large chunk of memory that can hold 'n_elements'
-  objects of type 'T' and trace the allocation.
-  @param[in]	n_elements	number of elements
-  @return pointer to the allocated memory or NULL */
-  pointer allocate_large(size_type n_elements) {
-    if (n_elements == 0 || n_elements > max_size()) {
-      return (nullptr);
-    }
+    Example 1:
+     int *ptr = ut::new_arr_withkey<int>(UT_NEW_THIS_FILE_PSI_KEY,
+                    std::forward_as_tuple(1),
+                    std::forward_as_tuple(2));
+     assert(ptr[0] == 1);
+     assert(ptr[1] == 2);
 
-    ulint n_bytes = n_elements * sizeof(T) + CPU_PAGE_SIZE;
+    Example 2:
+     struct A {
+       A(int x, int y) : _x(x), _y(y) {}
+       int _x, _y;
+     };
+     A *ptr = ut::new_arr_withkey<A>(UT_NEW_THIS_FILE_PSI_KEY,
+                std::forward_as_tuple(0, 1), std::forward_as_tuple(2, 3),
+                std::forward_as_tuple(4, 5), std::forward_as_tuple(6, 7),
+                std::forward_as_tuple(8, 9));
+     assert(ptr[0]->_x == 0 && ptr[0]->_y == 1);
+     assert(ptr[1]->_x == 2 && ptr[1]->_y == 3);
+     assert(ptr[2]->_x == 4 && ptr[2]->_y == 5);
+     assert(ptr[3]->_x == 6 && ptr[3]->_y == 7);
+     assert(ptr[4]->_x == 8 && ptr[4]->_y == 9);
 
-    auto ptr = os_mem_alloc_large(&n_bytes);
-    if (unlikely(!ptr)) return nullptr;
+    Example 3:
+     struct A {
+       A() : _x(10), _y(100) {}
+       A(int x, int y) : _x(x), _y(y) {}
+       int _x, _y;
+     };
+     A *ptr = ut::new_arr_withkey<A>(UT_NEW_THIS_FILE_PSI_KEY,
+                std::forward_as_tuple(0, 1), std::forward_as_tuple(2, 3),
+                std::forward_as_tuple(), std::forward_as_tuple(6, 7),
+                std::forward_as_tuple());
+     assert(ptr[0]->_x == 0  && ptr[0]->_y == 1);
+     assert(ptr[1]->_x == 2  && ptr[1]->_y == 3);
+     assert(ptr[2]->_x == 10 && ptr[2]->_y == 100);
+     assert(ptr[3]->_x == 6  && ptr[3]->_y == 7);
+     assert(ptr[4]->_x == 10 && ptr[4]->_y == 100);
+ */
+template <typename T, typename... Args>
+inline T *new_arr(Args &&... args) {
+  return ut::new_arr_withkey<T>(make_psi_memory_key(PSI_NOT_INSTRUMENTED),
+                                std::forward<Args>(args)...);
+}
+
+/** Light-weight and type-safe wrapper which serves a purpose of
+    being able to select proper ut::new_arr* overload.
+
+    Without having a separate overload with this type, creating an array of
+    default-initialized instances of T through the ut::new_arr*(Args &&... args)
+    overload would have been impossible because:
+      int *ptr = ut::new_arr_withkey<int>(UT_NEW_THIS_FILE_PSI_KEY, 5);
+    wouldn't even compile and
+      int *ptr = ut::new_arr_withkey<int>(UT_NEW_THIS_FILE_PSI_KEY,
+   std::forward_as_tuple(5)); would compile but would not have intended effect.
+   It would create an array holding 1 integer element that is initialized to 5.
+
+    Given that function templates cannot be specialized, having an overload
+    crafted specifically for given case solves the problem:
+      int *ptr = ut::new_arr_withkey<int>(UT_NEW_THIS_FILE_PSI_KEY,
+   ut::Count{5});
+*/
+struct Count {
+  explicit Count(size_t count) : m_count(count) {}
+  size_t operator()() const { return m_count; }
+  size_t m_count;
+};
 
-#ifdef UNIV_PFS_MEMORY
-    ut_new_pfx_t *pfx = reinterpret_cast<ut_new_pfx_t *>(ptr);
-    allocate_trace(n_bytes, PSI_NOT_INSTRUMENTED, pfx);
-#else
-    *reinterpret_cast<size_t *>(ptr) = n_bytes;
-#endif /* UNIV_PFS_MEMORY */
-    return reinterpret_cast<pointer>(static_cast<uint8_t *>(ptr) +
-                                     CPU_PAGE_SIZE);
-  }
+/** Dynamically allocates storage for an array of T's. Constructs objects of
+    type T using default constructor. If T cannot be default-initialized (e.g.
+    default constructor does not exist), then this interace cannot be used for
+    constructing such an array. ut::new_arr_withkey overload with user-provided
+    initialization must be used then. Instruments the memory with given PSI
+    memory key in case PFS memory support is enabled.
 
-  /** Free a memory allocated by allocate_large() and trace the
-  deallocation.
-  @param[in,out]	ptr	pointer to memory to free
-  */
-  void deallocate_large(pointer ptr) {
-    if (unlikely(!ptr)) return;
+    @param[in] key PSI memory key to be used for PFS memory instrumentation.
+    @param[in] count Number of T elements in an array.
+    @return Pointer to the first element of allocated storage. Throws
+    std::bad_alloc exception if dynamic storage allocation could not be
+    fulfilled. Re-throws whatever exception that may have occured during the
+    construction of any instance of T, in which case it automatically destroys
+    successfully constructed objects till that moment (if any), and finally
+    cleans up the raw memory allocated for T instances.
 
-    auto deduced_alloc_large_ptr = static_cast<uint8_t *>(ptr) - CPU_PAGE_SIZE;
+    Example 1:
+     int *ptr = ut::new_arr_withkey<int>(key, ut::Count{2});
 
-#ifdef UNIV_PFS_MEMORY
-    ut_new_pfx_t *pfx =
-        reinterpret_cast<ut_new_pfx_t *>(deduced_alloc_large_ptr);
-    size_t dealloc_size = pfx->m_size;
-    deallocate_trace(pfx);
-#else
-    size_t dealloc_size = *reinterpret_cast<size_t *>(deduced_alloc_large_ptr);
-#endif /* UNIV_PFS_MEMORY */
+    Example 2:
+     struct A {
+       A() : _x(10), _y(100) {}
+       int _x, _y;
+     };
+     A *ptr = ut::new_arr_withkey<A>(key, ut::Count{5});
+     assert(ptr[0]->_x == 10 && ptr[0]->_y == 100);
+     assert(ptr[1]->_x == 10 && ptr[1]->_y == 100);
+     assert(ptr[2]->_x == 10 && ptr[2]->_y == 100);
+     assert(ptr[3]->_x == 10 && ptr[3]->_y == 100);
+     assert(ptr[4]->_x == 10 && ptr[4]->_y == 100);
 
-    os_mem_free_large(deduced_alloc_large_ptr, dealloc_size);
-  }
+    Example 3:
+     struct A {
+       A(int x, int y) : _x(x), _y(y) {}
+       int _x, _y;
+     };
+     // Following cannot compile because A is not default-constructible
+     A *ptr = ut::new_arr_withkey<A>(key, ut::Count{5});
+ */
+template <typename T>
+inline T *new_arr_withkey(PSI_memory_key_t key, Count count) {
+  using impl = detail::select_malloc_impl_t<WITH_PFS_MEMORY, true>;
+  using malloc_impl = detail::Alloc_<impl>;
+  auto mem = malloc_impl::alloc<false>(sizeof(T) * count(), key());
+  if (unlikely(!mem)) throw std::bad_alloc();
 
-  /** Find out the size of large allocation given the pointer to it.
-  @param[in,out] ptr pointer to memory returned by allocate_large()
-  @return Size of the large page that has been allocated. */
-  static size_t large_page_size(pointer ptr) {
-    auto deduced_alloc_large_ptr = static_cast<uint8_t *>(ptr) - CPU_PAGE_SIZE;
-#ifdef UNIV_PFS_MEMORY
-    ut_new_pfx_t *pfx =
-        reinterpret_cast<ut_new_pfx_t *>(deduced_alloc_large_ptr);
-    return pfx->m_size - CPU_PAGE_SIZE;
-#else
-    return *reinterpret_cast<size_t *>(deduced_alloc_large_ptr) - CPU_PAGE_SIZE;
-#endif
+  size_t offset = 0;
+  try {
+    for (; offset < sizeof(T) * count(); offset += sizeof(T)) {
+      new (reinterpret_cast<uint8_t *>(mem) + offset) T{};
+    }
+  } catch (...) {
+    for (; offset != 0; offset -= sizeof(T)) {
+      reinterpret_cast<T *>(reinterpret_cast<std::uintptr_t>(mem) + offset -
+                            sizeof(T))
+          ->~T();
+    }
+    malloc_impl::free(mem);
+    throw;
   }
+  return static_cast<T *>(mem);
+}
 
- private:
-#ifdef UNIV_PFS_MEMORY
+/** Dynamically allocates storage for an array of T's. Constructs objects of
+    type T using default constructor. If T cannot be default-initialized (e.g.
+    default constructor does not exist), then this interace cannot be used for
+    constructing such an array. ut::new_arr overload with user-provided
+    initialization must be used then.
+
+    NOTE: Given that this function will _NOT_ be instrumenting the allocation
+    through PFS, observability for particular parts of the system which want to
+    use it will be lost or in best case inaccurate. Please have a strong reason
+    to do so.
 
-  /** Retrieve the size of a memory block allocated by new_array().
-  @param[in]	ptr	pointer returned by new_array().
-  @return size of memory block */
-  size_type n_elements_allocated(const_pointer ptr) {
-    const ut_new_pfx_t *pfx = reinterpret_cast<const ut_new_pfx_t *>(ptr) - 1;
-
-    const size_type user_bytes = pfx->m_size - sizeof(ut_new_pfx_t);
-
-    ut_ad(user_bytes % sizeof(T) == 0);
-
-    return (user_bytes / sizeof(T));
-  }
-
-  /** Trace a memory allocation.
-  @param[in]	size	number of bytes that were allocated
-  @param[in]	key	Performance Schema key
-  @param[out]	pfx	placeholder to store the info which will be
-                          needed when freeing the memory */
-  void allocate_trace(size_t size, PSI_memory_key key, ut_new_pfx_t *pfx) {
-    if (m_key != PSI_NOT_INSTRUMENTED) {
-      key = m_key;
-    }
+    @param[in] count Number of T elements in an array.
+    @return Pointer to the first element of allocated storage. Throws
+    std::bad_alloc exception if dynamic storage allocation could not be
+    fulfilled. Re-throws whatever exception that may have occured during the
+    construction of any instance of T, in which case it automatically destroys
+    successfully constructed objects till that moment (if any), and finally
+    cleans up the raw memory allocated for T instances.
 
-    pfx->m_key = PSI_MEMORY_CALL(memory_alloc)(key, size, &pfx->m_owner);
+    Example 1:
+     int *ptr = ut::new_arr_withkey<int>(UT_NEW_THIS_FILE_PSI_KEY,
+   ut::Count{2});
 
-    pfx->m_size = size;
-  }
+    Example 2:
+     struct A {
+       A() : _x(10), _y(100) {}
+       int _x, _y;
+     };
+     A *ptr = ut::new_arr_withkey<A>(UT_NEW_THIS_FILE_PSI_KEY, ut::Count{5});
+     assert(ptr[0]->_x == 10 && ptr[0]->_y == 100);
+     assert(ptr[1]->_x == 10 && ptr[1]->_y == 100);
+     assert(ptr[2]->_x == 10 && ptr[2]->_y == 100);
+     assert(ptr[3]->_x == 10 && ptr[3]->_y == 100);
+     assert(ptr[4]->_x == 10 && ptr[4]->_y == 100);
 
-  /** Trace a memory deallocation.
-  @param[in]	pfx	info for the deallocation */
-  void deallocate_trace(const ut_new_pfx_t *pfx) {
-    PSI_MEMORY_CALL(memory_free)(pfx->m_key, pfx->m_size, pfx->m_owner);
-  }
-#endif /* UNIV_PFS_MEMORY */
+    Example 3:
+     struct A {
+       A(int x, int y) : _x(x), _y(y) {}
+       int _x, _y;
+     };
+     // Following cannot compile because A is not default-constructible
+     A *ptr = ut::new_arr_withkey<A>(UT_NEW_THIS_FILE_PSI_KEY, ut::Count{5});
+ */
+template <typename T>
+inline T *new_arr(Count count) {
+  return ut::new_arr_withkey<T>(make_psi_memory_key(PSI_NOT_INSTRUMENTED),
+                                count);
+}
 
-  /* Assignment operator, not used, thus disabled (private. */
-  template <class U>
-  void operator=(const ut_allocator<U> &);
+/** Releases storage which has been dynamically allocated through any of
+    the ut::new_arr*() variants. Destructs all objects of type T.
 
-#ifdef UNIV_PFS_MEMORY
-  /** Performance schema key. */
-  const PSI_memory_key m_key;
-#endif /* UNIV_PFS_MEMORY */
-};
+    @param[in] ptr Pointer which has been obtained through any of the
+    ut::new_arr*() variants
 
-/** Compare two allocators of the same type.
-As long as the type of A1 and A2 is the same, a memory allocated by A1
-could be freed by A2 even if the pfs mem key is different. */
+    Example:
+     ut::delete_arr(ptr);
+ */
 template <typename T>
-inline bool operator==(const ut_allocator<T> &lhs, const ut_allocator<T> &rhs) {
-  return (true);
+inline void delete_arr(T *ptr) noexcept {
+  if (unlikely(!ptr)) return;
+  using impl = detail::select_malloc_impl_t<WITH_PFS_MEMORY, true>;
+  using malloc_impl = detail::Alloc_<impl>;
+  const auto data_len = malloc_impl::datalen(ptr);
+  for (size_t offset = 0; offset < data_len; offset += sizeof(T)) {
+    reinterpret_cast<T *>(reinterpret_cast<std::uintptr_t>(ptr) + offset)->~T();
+  }
+  malloc_impl::free(ptr);
 }
 
-/** Compare two allocators of the same type. */
-template <typename T>
-inline bool operator!=(const ut_allocator<T> &lhs, const ut_allocator<T> &rhs) {
-  return (!(lhs == rhs));
+/** Returns number of bytes that ut::malloc_*, ut::zalloc_*, ut::realloc_* and
+    ut::new_* variants will be using to store the necessary metadata for PFS.
+
+    @return Size of the PFS metadata.
+*/
+inline size_t pfs_overhead() noexcept {
+  using impl = detail::select_malloc_impl_t<WITH_PFS_MEMORY, false>;
+  using malloc_impl = detail::Alloc_<impl>;
+  return malloc_impl::pfs_overhead();
 }
 
-#ifdef UNIV_PFS_MEMORY
+/** Dynamically allocates system page-aligned storage of given size. Instruments
+    the memory with given PSI memory key in case PFS memory support is enabled.
+
+    Actual page-alignment, and thus page-size, will depend on CPU architecture
+    but in general page is traditionally mostly 4K large. In contrast to Unices,
+    Windows do make an exception here and implement 64K granularity on top of
+    regular page-size for some legacy reasons. For more details see:
+      https://devblogs.microsoft.com/oldnewthing/20031008-00/?p=42223
 
-/** Allocate, trace the allocation and construct an object.
-Use this macro instead of 'new' within InnoDB.
-For example: instead of
-        Foo*	f = new Foo(args);
-use:
-        Foo*	f = UT_NEW(Foo(args), mem_key_some);
-Upon failure to allocate the memory, this macro may return NULL. It
-will not throw exceptions. After successful allocation the returned
-pointer must be passed to UT_DELETE() when no longer needed.
-@param[in]	expr	any expression that could follow "new"
-@param[in]	key	performance schema memory tracing key
-@return pointer to the created object or NULL */
-#define UT_NEW(expr, key)                                           \
-  /* Placement new will return NULL and not attempt to construct an \
-  object if the passed in pointer is NULL, e.g. if allocate() has   \
-  failed to allocate memory and has returned NULL. */               \
-  ::new (ut_allocator<decltype(expr)>(key).allocate(1, NULL, key, false)) expr
-
-/** Allocate, trace the allocation and construct an object.
-Use this macro instead of 'new' within InnoDB and instead of UT_NEW()
-when creating a dedicated memory key is not feasible.
-For example: instead of
-        Foo*	f = new Foo(args);
-use:
-        Foo*	f = UT_NEW_NOKEY(Foo(args));
-Upon failure to allocate the memory, this macro may return NULL. It
-will not throw exceptions. After successful allocation the returned
-pointer must be passed to UT_DELETE() when no longer needed.
-@param[in]	expr	any expression that could follow "new"
-@return pointer to the created object or NULL */
-#define UT_NEW_NOKEY(expr) UT_NEW(expr, PSI_NOT_INSTRUMENTED)
-
-/** Destroy, deallocate and trace the deallocation of an object created by
-UT_NEW() or UT_NEW_NOKEY().
-We can't instantiate ut_allocator without having the type of the object, thus
-we redirect this to a template function. */
-#define UT_DELETE(ptr) ut_delete(ptr)
+    @param[in] key PSI memory key to be used for PFS memory instrumentation.
+    @param[in] size Size of storage (in bytes) requested to be allocated.
+    @return Pointer to the page-aligned storage. nullptr if dynamic storage
+    allocation failed.
 
-/** Destroy and account object created by UT_NEW() or UT_NEW_NOKEY().
-@param[in,out]	ptr	pointer to the object */
-template <typename T>
-inline void ut_delete(T *ptr) {
-  if (ptr == nullptr) {
-    return;
-  }
-
-  ut_allocator<T> allocator;
-
-  allocator.destroy(ptr);
-  allocator.deallocate(ptr);
-}
-
-/** Allocate and account 'n_elements' objects of type 'type'.
-Use this macro to allocate memory within InnoDB instead of 'new[]'.
-The returned pointer must be passed to UT_DELETE_ARRAY().
-@param[in]	type		type of objects being created
-@param[in]	n_elements	number of objects to create
-@param[in]	key		performance schema memory tracing key
-@return pointer to the first allocated object or NULL */
-#define UT_NEW_ARRAY(type, n_elements, key) \
-  ut_allocator<type>(key).new_array(n_elements, UT_NEW_THIS_FILE_PSI_KEY)
-
-/** Allocate and account 'n_elements' objects of type 'type'.
-Use this macro to allocate memory within InnoDB instead of 'new[]' and
-instead of UT_NEW_ARRAY() when it is not feasible to create a dedicated key.
-@param[in]	type		type of objects being created
-@param[in]	n_elements	number of objects to create
-@return pointer to the first allocated object or NULL */
-#define UT_NEW_ARRAY_NOKEY(type, n_elements) \
-  UT_NEW_ARRAY(type, n_elements, PSI_NOT_INSTRUMENTED)
-
-/** Destroy, deallocate and trace the deallocation of an array created by
-UT_NEW_ARRAY() or UT_NEW_ARRAY_NOKEY().
-We can't instantiate ut_allocator without having the type of the object, thus
-we redirect this to a template function. */
-#define UT_DELETE_ARRAY(ptr) ut_delete_array(ptr)
-
-/** Destroy and account objects created by UT_NEW_ARRAY() or
-UT_NEW_ARRAY_NOKEY().
-@param[in,out]	ptr	pointer to the first object in the array */
-template <typename T>
-inline void ut_delete_array(T *ptr) {
-  ut_allocator<T>().delete_array(ptr);
+    Example:
+     int *x = static_cast<int*>(ut::malloc_page_withkey(key, 10*sizeof(int)));
+ */
+inline void *malloc_page_withkey(PSI_memory_key_t key,
+                                 std::size_t size) noexcept {
+  using impl = detail::select_page_alloc_impl_t<WITH_PFS_MEMORY>;
+  using page_alloc_impl = detail::Page_alloc_<impl>;
+  return page_alloc_impl::alloc(size, key());
+}
+
+/** Dynamically allocates system page-aligned storage of given size.
+
+    Actual page-alignment, and thus page-size, will depend on CPU architecture
+    but in general page is traditionally mostly 4K large. In contrast to Unices,
+    Windows do make an exception here and implement 64K granularity on top of
+    regular page-size for some legacy reasons. For more details see:
+      https://devblogs.microsoft.com/oldnewthing/20031008-00/?p=42223
+
+    NOTE: Given that this function will _NOT_ be instrumenting the allocation
+    through PFS, observability for particular parts of the system which want to
+    use it will be lost or in best case inaccurate. Please have a strong reason
+    to do so.
+
+    @param[in] size Size of storage (in bytes) requested to be allocated.
+    @return Pointer to the page-aligned storage. nullptr if dynamic storage
+    allocation failed.
+
+    Example:
+     int *x = static_cast<int*>(ut::malloc_page(10*sizeof(int)));
+ */
+inline void *malloc_page(std::size_t size) noexcept {
+  return ut::malloc_page_withkey(make_psi_memory_key(PSI_NOT_INSTRUMENTED),
+                                 size);
 }
 
-/**
-Do not use ut_malloc, ut_zalloc, ut_malloc_nokey, ut_zalloc_nokey,
-and ut_realloc when allocating memory for over-aligned types. We have to use
-aligned_pointer instead, analogously to how we have to use aligned_alloc when
-working with the standard library to handle dynamic allocation for over-aligned
-types. These macros use ut_allocator to allocate raw memory (no type information
-is passed). This is why ut_allocator needs to be instantiated with the byte
-type. This has implications on the max alignment of the objects that are
-allocated using this API. ut_allocator returns memory aligned to
-alignof(std::max_align_t), similarly to library allocation functions. This value
-is 16 bytes on most x64 machines. A static_assert enforces this when using
-UT_NEW, however, since the ut_allocator template is instantiated with byte here
-the assert will not be hit if using alignment >= alignof(std::max_align_t). Not
-meeting the alignment requirements for a type causes undefined behaviour. One
-should avoid using the macros below when writing new code in general, and try to
-remove them when refactoring existing code (in favor of using the UT_NEW). The
-reason behind this lies both in the undefined behaviour problem described above,
-and in the fact that standard C-like malloc use is discouraged in c++ (see
-CppCoreGuidelines - R.10: Avoid malloc() and free()). Using ut_malloc has the
-same problems as the standard library malloc.
-*/
+/** Retrieves the total amount of bytes that are available for application code
+    to use.
 
-#define ut_malloc(n_bytes, key)                         \
-  static_cast<void *>(ut_allocator<byte>(key).allocate( \
-      n_bytes, NULL, UT_NEW_THIS_FILE_PSI_KEY, false))
+    Amount of bytes returned does _not_ have to match bytes requested
+    through ut::malloc_page*(). This is so because bytes requested will always
+    be implicitly rounded up to the next regular page size (e.g. 4K).
 
-#define ut_zalloc(n_bytes, key)                         \
-  static_cast<void *>(ut_allocator<byte>(key).allocate( \
-      n_bytes, NULL, UT_NEW_THIS_FILE_PSI_KEY, true))
+    @param[in] ptr Pointer which has been obtained through any of the
+    ut::malloc_page*() variants.
+    @return Number of bytes available.
 
-#define ut_malloc_nokey(n_bytes)               \
-  static_cast<void *>(                         \
-      ut_allocator<byte>(PSI_NOT_INSTRUMENTED) \
-          .allocate(n_bytes, NULL, UT_NEW_THIS_FILE_PSI_KEY, false))
+    Example:
+     int *x = static_cast<int*>(ut::malloc_page(10*sizeof(int)));
+     assert(page_allocation_size(x) == CPU_PAGE_SIZE);
+ */
+inline size_t page_allocation_size(void *ptr) noexcept {
+  using impl = detail::select_page_alloc_impl_t<WITH_PFS_MEMORY>;
+  using page_alloc_impl = detail::Page_alloc_<impl>;
+  return page_alloc_impl::datalen(ptr);
+}
 
-#define ut_zalloc_nokey(n_bytes)               \
-  static_cast<void *>(                         \
-      ut_allocator<byte>(PSI_NOT_INSTRUMENTED) \
-          .allocate(n_bytes, NULL, UT_NEW_THIS_FILE_PSI_KEY, true))
+/** Releases storage which has been dynamically allocated through any of
+    the ut::malloc_page*() variants.
 
-#define ut_realloc(ptr, n_bytes)                               \
-  static_cast<void *>(ut_allocator<byte>(PSI_NOT_INSTRUMENTED) \
-                          .reallocate(ptr, n_bytes, UT_NEW_THIS_FILE_PSI_KEY))
+    @param[in] ptr Pointer which has been obtained through any of the
+    ut::malloc_page*() variants.
+    @return True if releasing the page-aligned memory was successful.
 
-#define ut_free(ptr)                       \
-  ut_allocator<byte>(PSI_NOT_INSTRUMENTED) \
-      .deallocate(reinterpret_cast<byte *>(ptr))
+    Example:
+     ut::free_page(ptr);
+ */
+inline bool free_page(void *ptr) noexcept {
+  using impl = detail::select_page_alloc_impl_t<WITH_PFS_MEMORY>;
+  using page_alloc_impl = detail::Page_alloc_<impl>;
+  return page_alloc_impl::free(ptr);
+}
 
-#else /* UNIV_PFS_MEMORY */
+/** Dynamically allocates memory backed up by large (huge) pages. Instruments
+    the memory with given PSI memory key in case PFS memory support is enabled.
 
-/* Fallbacks when memory tracing is disabled at compile time. */
+    For large (huge) pages to be functional, usually some steps in system admin
+    preparation is required. Exact steps vary from system to system.
 
-#define UT_NEW(expr, key) ::new (std::nothrow) expr
-#define UT_NEW_NOKEY(expr) ::new (std::nothrow) expr
-#define UT_DELETE(ptr) ::delete ptr
+    @param[in] key PSI memory key to be used for PFS memory instrumentation.
+    @param[in] size Size of storage (in bytes) requested to be allocated.
+    @return Pointer to the page-aligned storage. nullptr if dynamic storage
+    allocation failed.
 
-#define UT_NEW_ARRAY(type, n_elements, key) \
-  ::new (std::nothrow) type[n_elements]
+    Example:
+     int *x = static_cast<int*>(
+                ut::malloc_large_page_withkey(key, 10*sizeof(int))
+              );
+ */
+inline void *malloc_large_page_withkey(PSI_memory_key_t key,
+                                       std::size_t size) noexcept {
+  using impl = detail::select_large_page_alloc_impl_t<WITH_PFS_MEMORY>;
+  using large_page_alloc_impl = detail::Large_alloc_<impl>;
+  return large_page_alloc_impl::alloc(size, key());
+}
+
+/** Dynamically allocates memory backed up by large (huge) pages.
+
+    For large (huge) pages to be functional, usually some steps in system admin
+    preparation is required. Exact steps vary from system to system.
+
+    NOTE: Given that this function will _NOT_ be instrumenting the allocation
+    through PFS, observability for particular parts of the system which want to
+    use it will be lost or in best case inaccurate. Please have a strong reason
+    to do so.
 
-#define UT_NEW_ARRAY_NOKEY(type, n_elements) \
-  ::new (std::nothrow) type[n_elements]
+    @param[in] size Size of storage (in bytes) requested to be allocated.
+    @return Pointer to the page-aligned storage. nullptr if dynamic storage
+    allocation failed.
 
-#define UT_DELETE_ARRAY(ptr) ::delete[] ptr
+    Example:
+     int *x = static_cast<int*>(ut::malloc_large_page(10*sizeof(int)));
+ */
+inline void *malloc_large_page(std::size_t size) noexcept {
+  return ut::malloc_large_page_withkey(
+      make_psi_memory_key(PSI_NOT_INSTRUMENTED), size);
+}
 
-#define ut_malloc(n_bytes, key) ::malloc(n_bytes)
+/** Retrieves the total amount of bytes that are available for application code
+    to use.
+
+    Amount of bytes returned does _not_ have to match bytes requested
+    through ut::malloc_large_page*(). This is so because bytes requested will
+    always be implicitly rounded up to the next multiple of huge-page size (e.g.
+    2MiB). Exact huge-page size value that is going to be used will be stored
+    in large_page_default_size.
 
-#define ut_zalloc(n_bytes, key) ::calloc(1, n_bytes)
+    @param[in] ptr Pointer which has been obtained through any of the
+    ut::malloc_large_page*() variants.
+    @return Number of bytes available.
 
-#define ut_malloc_nokey(n_bytes) ::malloc(n_bytes)
+    Example:
+     int *x = static_cast<int*>(ut::malloc_large_page(10*sizeof(int)));
+     assert(large_page_allocation_size(x) == HUGE_PAGE_SIZE);
+ */
+inline size_t large_page_allocation_size(void *ptr) noexcept {
+  using impl = detail::select_large_page_alloc_impl_t<WITH_PFS_MEMORY>;
+  using large_page_alloc_impl = detail::Large_alloc_<impl>;
+  return large_page_alloc_impl::datalen(ptr);
+}
 
-#define ut_zalloc_nokey(n_bytes) ::calloc(1, n_bytes)
+/** Releases storage which has been dynamically allocated through any of
+    the ut::malloc_large_page*() variants.
 
-#define ut_realloc(ptr, n_bytes) ::realloc(ptr, n_bytes)
+    @param[in] ptr Pointer which has been obtained through any of the
+    ut::malloc_large_page*() variants.
+    @return True if releasing the large (huge) page-aligned memory was
+    successful.
 
-#define ut_free(ptr) ::free(ptr)
+    Example:
+     ut::free_large_page(ptr);
+ */
+inline bool free_large_page(void *ptr) noexcept {
+  using impl = detail::select_large_page_alloc_impl_t<WITH_PFS_MEMORY>;
+  using large_page_alloc_impl = detail::Large_alloc_<impl>;
+  return large_page_alloc_impl::free(ptr);
+}
 
-#endif /* UNIV_PFS_MEMORY */
+/* Helper type for tag-dispatch */
+struct fallback_to_normal_page_t {};
+
+/** Dynamically allocates memory backed up by large (huge) pages. In the event
+    that large (huge) pages are unavailable or disabled explicitly through
+    os_use_large_pages, it will fallback to dynamic allocation backed by
+    page-aligned memory. Instruments the memory with given PSI memory key in
+    case PFS memory support is enabled.
 
-namespace ut {
+    @param[in] key PSI memory key to be used for PFS memory instrumentation.
+    @param[in] size Size of storage (in bytes) requested to be allocated.
+    @return Pointer to the page-aligned storage. nullptr if dynamic storage
+    allocation failed.
 
-/** Light-weight and type-safe wrapper around the PSI_memory_key
-    that eliminates the possibility of introducing silent bugs
-    through the course of implicit conversions and makes them
-    show up as compile-time errors.
+    Example:
+     int *x = static_cast<int*>(
+                ut::malloc_large_page_withkey(
+                  key,
+                  10*sizeof(int),
+                  fallback_to_normal_page_t{}
+                )
+              );
+ */
+inline void *malloc_large_page_withkey(
+    PSI_memory_key_t key, std::size_t size, fallback_to_normal_page_t,
+    bool large_pages_enabled = os_use_large_pages) noexcept {
+  void *large_page_mem = nullptr;
+  if (large_pages_enabled) {
+    large_page_mem = malloc_large_page_withkey(key, size);
+  }
+  return large_page_mem ? large_page_mem : malloc_page_withkey(key, size);
+}
+
+/** Dynamically allocates memory backed up by large (huge) pages. In the event
+    that large (huge) pages are unavailable or disabled explicitly through
+    os_use_large_pages, it will fallback to dynamic allocation backed by
+    page-aligned memory.
+
+    NOTE: Given that this function will _NOT_ be instrumenting the allocation
+    through PFS, observability for particular parts of the system which want to
+    use it will be lost or in best case inaccurate. Please have a strong reason
+    to do so.
 
-    Without this wrapper it was possible to say:
-      aligned_alloc_withkey(10*sizeof(int), key, 64))
-    Which would unfortunately compile just fine but it would silently
-    introduce a bug because it confuses the order of 10*sizeof(int) and
-    key input arguments. Both of them are unsigned types.
+    @param[in] key PSI memory key to be used for PFS memory instrumentation.
+    @param[in] size Size of storage (in bytes) requested to be allocated.
+    @return Pointer to the page-aligned storage. nullptr if dynamic storage
+    allocation failed.
 
-    With the wrapper, aligned_alloc_withkey(10*sizeof(int), key, 64)) now
-    results with a compile-time error and the only proper way to accomplish
-    the original intent is to use PSI_memory_key_t wrapper like so:
-      aligned_alloc_withkey(PSI_memory_key_t(key), 10*sizeof(int), 64))
+    Example:
+     int *x = static_cast<int*>(
+                ut::malloc_large_page(
+                  10*sizeof(int),
+                  fallback_to_normal_page_t{}
+                )
+              );
+ */
+inline void *malloc_large_page(
+    std::size_t size, fallback_to_normal_page_t,
+    bool large_pages_enabled = os_use_large_pages) noexcept {
+  return ut::malloc_large_page_withkey(
+      make_psi_memory_key(PSI_NOT_INSTRUMENTED), size,
+      fallback_to_normal_page_t{}, large_pages_enabled);
+}
+
+/** Retrieves the total amount of bytes that are available for application code
+    to use.
+
+    Amount of bytes returned does _not_ have to match bytes requested
+    through ut::malloc_large_page*(fallback_to_normal_page_t). This is so
+    because bytes requested will always be implicitly rounded up to the next
+    multiple of either huge-page size (e.g. 2MiB) or regular page size (e.g.
+    4K).
 
-    Or by making use of the convenience function to create one:
-      aligned_alloc_withkey(make_psi_memory_key(key), 10*sizeof(int), 64))
+    @param[in] ptr Pointer which has been obtained through any of the
+    ut::malloc_large_page*(fallback_to_normal_page_t) variants.
+    @return Number of bytes available for use.
  */
-struct PSI_memory_key_t {
-  explicit PSI_memory_key_t(PSI_memory_key key) : m_key(key) {}
-  PSI_memory_key operator()() const { return m_key; }
-  PSI_memory_key m_key;
-};
+inline size_t large_page_allocation_size(void *ptr,
+                                         fallback_to_normal_page_t) noexcept {
+  assert(ptr);
+  using impl = detail::select_large_page_alloc_impl_t<WITH_PFS_MEMORY>;
+  using large_page_alloc_impl = detail::Large_alloc_<impl>;
+  if (large_page_alloc_impl::page_type(ptr) == detail::Page_type::system_page)
+    return ut::page_allocation_size(ptr);
+  return ut::large_page_allocation_size(ptr);
+}
 
-/** Convenience helper function to create type-safe representation of
-    PSI_memory_key.
+/** Releases storage which has been dynamically allocated through any of
+    the ut::malloc_large_page*(fallback_to_normal_page_t) variants.
 
-    @param[in] key PSI memory key to be held in type-safe PSI_memory_key_t.
-    @return PSI_memory_key_t which wraps the given PSI_memory_key
+    Whether the pointer is representing area backed up by regular or huge-pages,
+    this function will know the difference and therefore act accordingly.
+
+    @param[in] ptr Pointer which has been obtained through any of the
+    ut::malloc_large_page*(fallback_to_normal_page_t) variants.
+    @return True if releasing the memory was successful.
+
+    Example:
+     ut::free_large_page(ptr);
  */
-inline PSI_memory_key_t make_psi_memory_key(PSI_memory_key key) {
-  return PSI_memory_key_t(key);
+inline bool free_large_page(void *ptr, fallback_to_normal_page_t) noexcept {
+  using impl = detail::select_large_page_alloc_impl_t<WITH_PFS_MEMORY>;
+  using large_page_alloc_impl = detail::Large_alloc_<impl>;
+
+  if (!ptr) return false;
+
+  bool success;
+  if (large_page_alloc_impl::page_type(ptr) == detail::Page_type::system_page) {
+    success = free_page(ptr);
+  } else {
+    success = free_large_page(ptr);
+  }
+  assert(success);
+  return success;
 }
 
 /** Dynamically allocates storage of given size and at the address aligned to
     the requested alignment. Instruments the memory with given PSI memory key
-    in case PFS memory support is enabled (-DDISABLE_PSI_MEMORY=OFF).
+    in case PFS memory support is enabled.
 
     @param[in] key PSI memory key to be used for PFS memory instrumentation.
     @param[in] size Size of storage (in bytes) requested to be allocated.
@@ -1174,7 +1410,7 @@
  */
 inline void *aligned_alloc_withkey(PSI_memory_key_t key, std::size_t size,
                                    std::size_t alignment) noexcept {
-  using impl = detail::select_alloc_impl_t<detail::WITH_PFS_MEMORY>;
+  using impl = detail::select_alloc_impl_t<WITH_PFS_MEMORY>;
   using aligned_alloc_impl = detail::Aligned_alloc_<impl>;
   return aligned_alloc_impl::alloc<false>(size, alignment, key());
 }
@@ -1182,6 +1418,11 @@
 /** Dynamically allocates storage of given size and at the address aligned to
     the requested alignment.
 
+    NOTE: Given that this function will _NOT_ be instrumenting the allocation
+    through PFS, observability for particular parts of the system which want to
+    use it will be lost or in best case inaccurate. Please have a strong reason
+    to do so.
+
     @param[in] size Size of storage (in bytes) requested to be allocated.
     @param[in] alignment Alignment requirement for storage to be allocated.
     @return Pointer to the allocated storage. nullptr if dynamic storage
@@ -1197,8 +1438,7 @@
 
 /** Dynamically allocates zero-initialized storage of given size and at the
     address aligned to the requested alignment. Instruments the memory with
-    given PSI memory key in case PFS memory support is enabled
-    (-DDISABLE_PSI_MEMORY=OFF).
+    given PSI memory key in case PFS memory support is enabled.
 
     @param[in] key PSI memory key to be used for PFS memory instrumentation.
     @param[in] size Size of storage (in bytes) requested to be allocated.
@@ -1212,7 +1452,7 @@
  */
 inline void *aligned_zalloc_withkey(PSI_memory_key_t key, std::size_t size,
                                     std::size_t alignment) noexcept {
-  using impl = detail::select_alloc_impl_t<detail::WITH_PFS_MEMORY>;
+  using impl = detail::select_alloc_impl_t<WITH_PFS_MEMORY>;
   using aligned_alloc_impl = detail::Aligned_alloc_<impl>;
   return aligned_alloc_impl::alloc<true>(size, alignment, key());
 }
@@ -1220,6 +1460,11 @@
 /** Dynamically allocates zero-initialized storage of given size and at the
     address aligned to the requested alignment.
 
+    NOTE: Given that this function will _NOT_ be instrumenting the allocation
+    through PFS, observability for particular parts of the system which want to
+    use it will be lost or in best case inaccurate. Please have a strong reason
+    to do so.
+
     @param[in] size Size of storage (in bytes) requested to be allocated.
     @param[in] alignment Alignment requirement for storage to be allocated.
     @return Pointer to the zero-initialized allocated storage. nullptr if
@@ -1243,7 +1488,7 @@
      aligned_free(ptr);
  */
 inline void aligned_free(void *ptr) noexcept {
-  using impl = detail::select_alloc_impl_t<detail::WITH_PFS_MEMORY>;
+  using impl = detail::select_alloc_impl_t<WITH_PFS_MEMORY>;
   using aligned_alloc_impl = detail::Aligned_alloc_<impl>;
   aligned_alloc_impl::free(ptr);
 }
@@ -1251,7 +1496,7 @@
 /** Dynamically allocates storage for an object of type T at address aligned
     to the requested alignment. Constructs the object of type T with provided
     Args. Instruments the memory with given PSI memory key in case PFS memory
-    support is enabled (-DDISABLE_PSI_MEMORY=OFF).
+    support is enabled.
 
     @param[in] key PSI memory key to be used for PFS memory instrumentation.
     @param[in] alignment Alignment requirement for storage to be allocated.
@@ -1285,6 +1530,11 @@
     to the requested alignment. Constructs the object of type T with provided
     Args.
 
+    NOTE: Given that this function will _NOT_ be instrumenting the allocation
+    through PFS, observability for particular parts of the system which want to
+    use it will be lost or in best case inaccurate. Please have a strong reason
+    to do so.
+
     @param[in] alignment Alignment requirement for storage to be allocated.
     @param[in] args Arguments one wishes to pass over to T constructor(s)
     @return Pointer to the allocated storage. Throws std::bad_alloc exception
@@ -1327,7 +1577,7 @@
 /** Dynamically allocates storage for an array of T's at address aligned to
     the requested alignment. Constructs objects of type T with provided Args.
     Instruments the memory with given PSI memory key in case PFS memory support
-    is enabled (-DDISABLE_PSI_MEMORY=OFF).
+    is enabled.
 
     @param[in] key PSI memory key to be used for PFS memory instrumentation.
     @param[in] alignment Alignment requirement for storage to be allocated.
@@ -1378,7 +1628,7 @@
 /** Dynamically allocates storage for an array of T's at address aligned to
     the requested alignment. Constructs objects of type T using default
     constructor. Instruments the memory with given PSI memory key in case PFS
-    memory support is enabled (-DDISABLE_PSI_MEMORY=OFF).
+    memory support is enabled.
 
     @param[in] key PSI memory key to be used for PFS memory instrumentation.
     @param[in] alignment Alignment requirement for storage to be allocated.
@@ -1423,6 +1673,11 @@
 /** Dynamically allocates storage for an array of T's at address aligned to
     the requested alignment. Constructs objects of type T with provided Args.
 
+    NOTE: Given that this function will _NOT_ be instrumenting the allocation
+    through PFS, observability for particular parts of the system which want to
+    use it will be lost or in best case inaccurate. Please have a strong reason
+    to do so.
+
     @param[in] alignment Alignment requirement for storage to be allocated.
     @param[in] args Arguments one wishes to pass over to T constructor(s)
     @return Pointer to the first element of allocated storage. Throws
@@ -1462,6 +1717,11 @@
     the requested alignment. Constructs objects of type T using default
     constructor.
 
+    NOTE: Given that this function will _NOT_ be instrumenting the allocation
+    through PFS, observability for particular parts of the system which want to
+    use it will be lost or in best case inaccurate. Please have a strong reason
+    to do so.
+
     @param[in] alignment Alignment requirement for storage to be allocated.
     @param[in] count Number of T elements in an array.
     @return Pointer to the first element of allocated storage. Throws
@@ -1506,7 +1766,7 @@
  */
 template <typename T>
 inline void aligned_delete_arr(T *ptr) noexcept {
-  using impl = detail::select_alloc_impl_t<detail::WITH_PFS_MEMORY>;
+  using impl = detail::select_alloc_impl_t<WITH_PFS_MEMORY>;
   using aligned_alloc_impl = detail::Aligned_alloc_<impl>;
   const auto data_len = aligned_alloc_impl::datalen(ptr);
   for (size_t offset = 0; offset < data_len; offset += sizeof(T)) {
@@ -1563,8 +1823,7 @@
   /** Allocates sufficiently large memory of dynamic storage duration to fit
       the instance of type T at the address which is aligned to Alignment bytes.
       Constructs the instance of type T with given Args. Instruments the memory
-      with given PSI memory key in case PFS memory support is enabled
-      (-DDISABLE_PSI_MEMORY=OFF).
+      with given PSI memory key in case PFS memory support is enabled.
 
       Underlying instance of type T is accessed through the conversion operator.
 
@@ -1678,7 +1937,7 @@
       aligned to Alignment bytes. Constructs the size number of instances of
       type T, each being initialized through the means of default constructor.
       Instruments the memory with given PSI memory key in case PFS memory
-      support is enabled (-DDISABLE_PSI_MEMORY=OFF).
+      support is enabled.
 
       Underlying instances of type T are accessed through the conversion
       operator.
@@ -1696,7 +1955,7 @@
       aligned to Alignment bytes. Constructs the size number of instances of
       type T, each being initialized through the means of provided Args and
       corresponding constructors. Instruments the memory with given PSI memory
-      key in case PFS memory support is enabled (-DDISABLE_PSI_MEMORY=OFF).
+      key in case PFS memory support is enabled.
 
       Underlying instances of type T are accessed through the conversion
       operator.
@@ -1730,20 +1989,183 @@
   }
 };
 
-/** Specialization of basic_ostringstream which uses ut_allocator. Please note
-that it's .str() method returns std::basic_string which is not std::string, so
-it has similar API (in particular .c_str()), but you can't assign it to
-regular, std::string. */
+namespace detail {
+template <typename T>
+struct allocator_base {
+  explicit allocator_base(PSI_memory_key /*key*/) {}
+
+  template <typename U>
+  allocator_base(const allocator_base<U> &other) {}
+
+  void *allocate_impl(size_t n_bytes) { return ut::malloc(n_bytes); }
+};
+
+template <typename T>
+struct allocator_base_pfs {
+  explicit allocator_base_pfs(PSI_memory_key key) : m_key(key) {}
+
+  template <typename U>
+  allocator_base_pfs(const allocator_base_pfs<U> &other)
+      : allocator_base_pfs(other.get_mem_key()) {}
+
+  PSI_memory_key get_mem_key() const { return m_key; }
+
+  void *allocate_impl(size_t n_bytes) {
+    return ut::malloc_withkey(ut::make_psi_memory_key(m_key), n_bytes);
+  }
+
+ private:
+  const PSI_memory_key m_key;
+};
+}  // namespace detail
+
+/** Allocator that allows std::* containers to manage their memory through
+    ut::malloc* and ut::free library functions.
+
+    Main purpose of this custom allocator is to instrument all of the memory
+    allocations and deallocations that are being done by std::* containers under
+    the hood, and have them recorded through the PFS (memory) engine.
+
+    Other than std::* containers, this allocator is of course also suitable for
+    use in any other allocator-aware containers and/or code.
+
+    Given that ut::malloc* and ut::free library functions already handle all
+    the PFS and non-PFS implementation bits and pieces, this allocator is a mere
+    wrapper around them.
+
+    Example which uses default PFS key (mem_key_std) to trace all std::vector
+    allocations and deallocations:
+      std::vector<int, ut::allocator<int>> vec;
+      vec.push_back(...);
+      ...
+      vec.push_back(...);
+
+    Example which uses user-provided PFS key to trace std::vector allocations
+    and deallocations:
+      ut::allocator<int> allocator(some_other_psi_key);
+      std::vector<int, ut::allocator<int>> vec(allocator);
+      vec.push_back(...);
+      ...
+      vec.push_back(...);
+ */
+template <typename T, typename Allocator_base = std::conditional_t<
+                          ut::WITH_PFS_MEMORY, detail::allocator_base_pfs<T>,
+                          detail::allocator_base<T>>>
+class allocator : public Allocator_base {
+ public:
+  using pointer = T *;
+  using const_pointer = const T *;
+  using reference = T &;
+  using const_reference = const T &;
+  using value_type = T;
+  using size_type = size_t;
+  using difference_type = ptrdiff_t;
+
+  static_assert(alignof(T) <= alignof(std::max_align_t),
+                "ut::allocator does not support over-aligned types. Use "
+                "ut::aligned_* API to handle such types.");
+
+  /** Default constructor.
+      @param[in] key  performance schema key.
+    */
+  explicit allocator(PSI_memory_key key = mem_key_std) : Allocator_base(key) {}
+
+  /* Rule-of-five */
+  allocator(const allocator<T, Allocator_base> &) = default;
+  allocator<T, Allocator_base> &operator=(
+      const allocator<T, Allocator_base> &) = default;
+  allocator(allocator<T, Allocator_base> &&) = default;
+  allocator<T, Allocator_base> &operator=(allocator<T, Allocator_base> &&) =
+      default;
+  ~allocator() = default;
+
+  /** Copy-construct a new instance of allocator with type T by using existing
+      instance of allocator constructed with a different type U.
+      @param[in] other  the allocator to copy from.
+    */
+  template <typename U>
+  allocator(const allocator<U, Allocator_base> &other)
+      : Allocator_base(other) {}
+
+  /* NOTE: rebind is deprecated in C++17 and to be removed in C++20 but one of
+     our toolchains, when used in 32-bit setting, still does not support custom
+     allocators that do not provide rebind support explicitly. In future, this
+     part will become redundant and can be removed.
+   */
+  template <typename U>
+  struct rebind {
+    using other = ut::allocator<U, Allocator_base>;
+  };
+
+  /** Equality of allocators instantiated with same types T. */
+  inline bool operator==(const ut::allocator<T, Allocator_base> &other) const {
+    return true;
+  }
+  /** Non-equality of allocators instantiated with same types T. */
+  inline bool operator!=(const ut::allocator<T, Allocator_base> &other) const {
+    return !(*this == other);
+  }
+
+  /** Return the maximum number of objects that can be allocated by
+      this allocator. This number is somewhat lower for PFS-enabled
+      builds because of extra few bytes needed for PFS.
+    */
+  size_type max_size() const {
+    const size_type s_max = std::numeric_limits<size_type>::max();
+    return (s_max - ut::pfs_overhead()) / sizeof(T);
+  }
+
+  /** Allocates chunk of memory that can hold n_elements objects of
+      type T. Returned pointer is always valid. In case underlying
+      allocation function was not able to fulfil the allocation request,
+      this function will throw std::bad_alloc exception. After successful
+      allocation, returned pointer must be passed back to
+      ut::allocator<T>::deallocate() when no longer needed.
+
+      @param[in]  n_elements  number of elements
+      @param[in]  hint        pointer to a nearby memory location,
+                              not used by this implementation
+      @return pointer to the allocated memory
+    */
+  pointer allocate(size_type n_elements, const_pointer hint = nullptr) {
+    if (unlikely(n_elements > max_size())) {
+      throw std::bad_array_new_length();
+    }
+
+    auto ptr = Allocator_base::allocate_impl(n_elements * sizeof(T));
+
+    if (unlikely(!ptr)) {
+      throw std::bad_alloc();
+    }
+
+    return static_cast<pointer>(ptr);
+  }
+
+  /** Releases the memory allocated through ut::allocator<T>::allocate().
+
+      @param[in,out]  ptr         pointer to memory to free
+      @param[in]      n_elements  number of elements allocated (unused)
+   */
+  void deallocate(pointer ptr, size_type n_elements = 0) { ut::free(ptr); }
+};
+
+/** Specialization of basic_ostringstream which uses ut::allocator. Please note
+    that it's .str() method returns std::basic_string which is not std::string,
+    so it has similar API (in particular .c_str()), but you can't assign it to
+    regular, std::string.
+ */
 using ostringstream =
-    std::basic_ostringstream<char, std::char_traits<char>, ut_allocator<char>>;
+    std::basic_ostringstream<char, std::char_traits<char>, ut::allocator<char>>;
 
-/** Specialization of vector which uses ut_allocator. */
+/** Specialization of vector which uses allocator. */
 template <typename T>
-using vector = std::vector<T, ut_allocator<T>>;
+using vector = std::vector<T, ut::allocator<T>>;
 
 template <typename Key>
-using unordered_set = std::unordered_set<Key, std::hash<Key>,
-                                         std::equal_to<Key>, ut_allocator<Key>>;
+using unordered_set =
+    std::unordered_set<Key, std::hash<Key>, std::equal_to<Key>,
+                       ut::allocator<Key>>;
 
 }  // namespace ut
+
 #endif /* ut0new_h */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/ut0pool.h mysql-8.0-8.0.27/storage/innobase/include/ut0pool.h
--- mysql-8.0-8.0.26/storage/innobase/include/ut0pool.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/ut0pool.h	2021-09-28 11:46:34.000000000 +0000
@@ -62,7 +62,8 @@
 
     ut_a(m_start == nullptr);
 
-    m_start = reinterpret_cast<Element *>(ut_zalloc_nokey(m_size));
+    m_start = reinterpret_cast<Element *>(
+        ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, m_size));
 
     m_last = m_start;
 
@@ -87,7 +88,7 @@
       Factory::destroy(&elem->m_type);
     }
 
-    ut_free(m_start);
+    ut::free(m_start);
     m_end = m_last = m_start = nullptr;
     m_size = 0;
   }
@@ -139,7 +140,7 @@
  private:
   /* We only need to compare on pointer address. */
   typedef std::priority_queue<Element *,
-                              std::vector<Element *, ut_allocator<Element *>>,
+                              std::vector<Element *, ut::allocator<Element *>>,
                               std::greater<Element *>>
       pqueue_t;
 
@@ -270,7 +271,7 @@
 
       ut_ad(n_pools == m_pools.size());
 
-      pool = UT_NEW_NOKEY(PoolType(m_size));
+      pool = ut::new_withkey<PoolType>(UT_NEW_THIS_FILE_PSI_KEY, m_size);
 
       if (pool != nullptr) {
         ut_ad(n_pools <= m_pools.size());
@@ -306,7 +307,7 @@
     for (it = m_pools.begin(); it != end; ++it) {
       PoolType *pool = *it;
 
-      UT_DELETE(pool);
+      ut::delete_(pool);
     }
 
     m_pools.clear();
@@ -319,7 +320,7 @@
   PoolManager(const PoolManager &);
   PoolManager &operator=(const PoolManager &);
 
-  typedef std::vector<PoolType *, ut_allocator<PoolType *>> Pools;
+  typedef std::vector<PoolType *, ut::allocator<PoolType *>> Pools;
 
   /** Size of each block */
   size_t m_size;
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/ut0rnd.h mysql-8.0-8.0.27/storage/innobase/include/ut0rnd.h
--- mysql-8.0-8.0.26/storage/innobase/include/ut0rnd.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/ut0rnd.h	2021-09-28 11:46:34.000000000 +0000
@@ -72,9 +72,8 @@
 
 /** Folds a character string ending in the null character.
  @return folded value */
-static inline ulint ut_fold_string(
-    const char *str) /*!< in: null-terminated string */
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline ulint ut_fold_string(
+    const char *str); /*!< in: null-terminated string */
 
 /** Looks for a prime number slightly greater than the given argument.
 The prime is chosen so that it is not near any power of 2.
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/ut0rnd.ic mysql-8.0-8.0.27/storage/innobase/include/ut0rnd.ic
--- mysql-8.0-8.0.26/storage/innobase/include/ut0rnd.ic	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/ut0rnd.ic	2021-09-28 11:46:34.000000000 +0000
@@ -178,22 +178,22 @@
   switch (len & 0x7) {
     case 7:
       fold = ut_fold_ulint_pair(fold, (ulint)(*str++));
-      // Fall through.
+      [[fallthrough]];
     case 6:
       fold = ut_fold_ulint_pair(fold, (ulint)(*str++));
-      // Fall through.
+      [[fallthrough]];
     case 5:
       fold = ut_fold_ulint_pair(fold, (ulint)(*str++));
-      // Fall through.
+      [[fallthrough]];
     case 4:
       fold = ut_fold_ulint_pair(fold, (ulint)(*str++));
-      // Fall through.
+      [[fallthrough]];
     case 3:
       fold = ut_fold_ulint_pair(fold, (ulint)(*str++));
-      // Fall through.
+      [[fallthrough]];
     case 2:
       fold = ut_fold_ulint_pair(fold, (ulint)(*str++));
-      // Fall through.
+      [[fallthrough]];
     case 1:
       fold = ut_fold_ulint_pair(fold, (ulint)(*str++));
   }
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/ut0sort.h mysql-8.0-8.0.27/storage/innobase/include/ut0sort.h
--- mysql-8.0-8.0.26/storage/innobase/include/ut0sort.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/ut0sort.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,108 +0,0 @@
-/*****************************************************************************
-
-Copyright (c) 1995, 2021, Oracle 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, as published by the
-Free Software Foundation.
-
-This program is also distributed with certain software (including but not
-limited to OpenSSL) that is licensed under separate terms, as designated in a
-particular file or component or in included license documentation. The authors
-of MySQL hereby grant you an additional permission to link the program and
-your derivative works with the separately licensed software that they have
-included with MySQL.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
-for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-*****************************************************************************/
-
-/** @file include/ut0sort.h
- Sort utility
-
- Created 11/9/1995 Heikki Tuuri
- ***********************************************************************/
-
-#ifndef ut0sort_h
-#define ut0sort_h
-
-#include "univ.i"
-
-/* This module gives a macro definition of the body of
-a standard sort function for an array of elements of any
-type. The comparison function is given as a parameter to
-the macro. The sort algorithm is mergesort which has logarithmic
-worst case.
-*/
-
-/** This macro expands to the body of a standard sort function.
- The sort function uses mergesort and must be defined separately
- for each type of array.
- Also the comparison function has to be defined individually
- for each array cell type. SORT_FUN is the sort function name.
- The function takes the array to be sorted (ARR),
- the array of auxiliary space (AUX_ARR) of same size,
- and the low (LOW), inclusive, and high (HIGH), noninclusive,
- limits for the sort interval as arguments.
- CMP_FUN is the comparison function name. It takes as arguments
- two elements from the array and returns 1, if the first is bigger,
- 0 if equal, and -1 if the second bigger. */
-
-#define UT_SORT_FUNCTION_BODY(SORT_FUN, ARR, AUX_ARR, LOW, HIGH, CMP_FUN)    \
-  {                                                                          \
-    ulint ut_sort_mid77;                                                     \
-    ulint ut_sort_i77;                                                       \
-    ulint ut_sort_low77;                                                     \
-    ulint ut_sort_high77;                                                    \
-                                                                             \
-    ut_ad((LOW) < (HIGH));                                                   \
-    ut_ad(ARR);                                                              \
-    ut_ad(AUX_ARR);                                                          \
-                                                                             \
-    if ((LOW) == (HIGH)-1) {                                                 \
-      return;                                                                \
-    } else if ((LOW) == (HIGH)-2) {                                          \
-      if (CMP_FUN((ARR)[LOW], (ARR)[(HIGH)-1]) > 0) {                        \
-        (AUX_ARR)[LOW] = (ARR)[LOW];                                         \
-        (ARR)[LOW] = (ARR)[(HIGH)-1];                                        \
-        (ARR)[(HIGH)-1] = (AUX_ARR)[LOW];                                    \
-      }                                                                      \
-      return;                                                                \
-    }                                                                        \
-                                                                             \
-    ut_sort_mid77 = ((LOW) + (HIGH)) / 2;                                    \
-                                                                             \
-    SORT_FUN((ARR), (AUX_ARR), (LOW), ut_sort_mid77);                        \
-    SORT_FUN((ARR), (AUX_ARR), ut_sort_mid77, (HIGH));                       \
-                                                                             \
-    ut_sort_low77 = (LOW);                                                   \
-    ut_sort_high77 = ut_sort_mid77;                                          \
-                                                                             \
-    for (ut_sort_i77 = (LOW); ut_sort_i77 < (HIGH); ut_sort_i77++) {         \
-      if (ut_sort_low77 >= ut_sort_mid77) {                                  \
-        (AUX_ARR)[ut_sort_i77] = (ARR)[ut_sort_high77];                      \
-        ut_sort_high77++;                                                    \
-      } else if (ut_sort_high77 >= (HIGH)) {                                 \
-        (AUX_ARR)[ut_sort_i77] = (ARR)[ut_sort_low77];                       \
-        ut_sort_low77++;                                                     \
-      } else if (CMP_FUN((ARR)[ut_sort_low77], (ARR)[ut_sort_high77]) > 0) { \
-        (AUX_ARR)[ut_sort_i77] = (ARR)[ut_sort_high77];                      \
-        ut_sort_high77++;                                                    \
-      } else {                                                               \
-        (AUX_ARR)[ut_sort_i77] = (ARR)[ut_sort_low77];                       \
-        ut_sort_low77++;                                                     \
-      }                                                                      \
-    }                                                                        \
-                                                                             \
-    memcpy((void *)((ARR) + (LOW)), (AUX_ARR) + (LOW),                       \
-           ((HIGH) - (LOW)) * sizeof *(ARR));                                \
-  }
-
-#endif
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/ut0stage.h mysql-8.0-8.0.27/storage/innobase/include/ut0stage.h
--- mysql-8.0-8.0.26/storage/innobase/include/ut0stage.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/ut0stage.h	2021-09-28 11:46:34.000000000 +0000
@@ -39,11 +39,14 @@
 #include "dict0mem.h"              /* dict_index_t */
 #include "mysql/psi/mysql_stage.h" /* mysql_stage_inc_work_completed */
 #include "row0log.h"               /* row_log_estimate_work() */
-#include "srv0srv.h"               /* ut_stage_alter_t */
-#include "univ.i"
+#include "srv0srv.h"               /* Alter_stage */
 
 #ifdef HAVE_PSI_STAGE_INTERFACE
 
+// Forward declaration.
+class Alter_stage;
+using Alter_stages = std::vector<Alter_stage *, ut::allocator<Alter_stage *>>;
+
 /** Class used to report ALTER TABLE progress via performance_schema.
 The only user of this class is the ALTER TABLE code and it calls the methods
 in the following order
@@ -74,26 +77,24 @@
 
 This class knows the specifics of each phase and tries to increment the
 progress in an even manner across the entire ALTER TABLE lifetime. */
-class ut_stage_alter_t {
+class Alter_stage {
  public:
   /** Constructor.
   @param[in]	pk	primary key of the old table */
-  explicit ut_stage_alter_t(const dict_index_t *pk)
-      : m_progress(nullptr),
-        m_pk(pk),
-        m_n_pk_recs(0),
-        m_n_pk_pages(0),
-        m_n_recs_processed(0),
-        m_n_flush_pages(0),
-        m_cur_phase(NOT_STARTED) {}
+  explicit Alter_stage(const dict_index_t *pk) noexcept
+      : m_pk(pk), m_cur_phase(NOT_STARTED) {}
+
+  /** Copy constructor. "Inherits" the current state of rhs.
+  @param[in] rhs                Instance to copy current state from. */
+  explicit Alter_stage(const Alter_stage &rhs) noexcept;
 
   /** Destructor. */
-  ~ut_stage_alter_t();
+  ~Alter_stage();
 
   /** Flag an ALTER TABLE start (read primary key phase).
   @param[in]	n_sort_indexes	number of indexes that will be sorted
   during ALTER TABLE, used for estimating the total work to be done */
-  void begin_phase_read_pk(ulint n_sort_indexes);
+  void begin_phase_read_pk(size_t n_sort_indexes);
 
   /** Increment the number of records in PK (table) with 1.
   This is used to get more accurate estimate about the number of
@@ -102,10 +103,14 @@
   to get the progress as even as possible. */
   void n_pk_recs_inc();
 
+  /** See simple increment version above.
+  @param[in] n Number fo records read so far. */
+  void n_pk_recs_inc(uint64_t n);
+
   /** Flag either one record or one page processed, depending on the
   current phase.
   @param[in]	inc_val	flag this many units processed at once */
-  void inc(ulint inc_val = 1);
+  void inc(uint64_t inc_val);
 
   /** Flag the end of reading of the primary key.
   Here we know the exact number of pages and records and calculate
@@ -124,7 +129,7 @@
   /** Flag the beginning of the flush phase.
   @param[in]	n_flush_pages	this many pages are going to be
   flushed */
-  void begin_phase_flush(ulint n_flush_pages);
+  void begin_phase_flush(page_no_t n_flush_pages);
 
   /** Flag the beginning of the log index phase. */
   void begin_phase_log_index();
@@ -135,6 +140,10 @@
   /** Flag the beginning of the end phase. */
   void begin_phase_end();
 
+  /** Aggregate the results of the build from the sub builds.
+  @param[in] alter_stages       Sub stages to aggregate. */
+  void aggregate(const Alter_stages &alter_stages) noexcept;
+
  private:
   /** Update the estimate of total work to be done. */
   void reestimate();
@@ -143,103 +152,111 @@
   @param[in]	new_stage	pointer to the new stage to change to */
   void change_phase(const PSI_stage_info *new_stage);
 
-  /** Performance schema accounting object. */
-  PSI_stage_progress *m_progress;
+ private:
+  using Counter = std::pair<uint64_t, uint64_t>;
+  using Progress = std::pair<PSI_stage_progress *, Counter>;
+  using Stage = std::pair<const PSI_stage_info *, Progress>;
+  using Stages = std::vector<Stage, ut::allocator<Stage>>;
+
+  /** Progress counters for the various stages. */
+  Stage m_stage{};
+
+  /** Collection of previous stages. */
+  Stages m_stages{};
 
   /** Old table PK. Used for calculating the estimate. */
-  const dict_index_t *m_pk;
+  const dict_index_t *m_pk{};
 
   /** Number of records in the primary key (table), including delete
   marked records. */
-  ulint m_n_pk_recs;
+  std::atomic<uint64_t> m_n_pk_recs{};
 
   /** Number of leaf pages in the primary key. */
-  ulint m_n_pk_pages;
+  page_no_t m_n_pk_pages{};
 
   /** Estimated number of records per page in the primary key. */
-  double m_n_recs_per_page;
+  double m_n_recs_per_page{};
 
   /** Number of indexes that are being added. */
-  ulint m_n_sort_indexes;
+  size_t m_n_sort_indexes{};
 
   /** During the sort phase, increment the counter once per this
   many pages processed. This is because sort processes one page more
   than once. */
-  ulint m_sort_multi_factor;
+  uint64_t m_sort_multi_factor{};
 
   /** Number of records processed during sort & insert phases. We
   need to increment the counter only once page, or once per
   recs-per-page records. */
-  ulint m_n_recs_processed;
+  uint64_t m_n_inserted{};
 
   /** Number of pages to flush. */
-  ulint m_n_flush_pages;
+  page_no_t m_n_flush_pages{};
 
   /** Current phase. */
   enum {
+    /** Init phase. */
     NOT_STARTED = 0,
+
+    /** Scan phase. */
     READ_PK = 1,
+
+    /** Sort phase. */
     SORT = 2,
+
+    /** Bulk load/insert phase. */
     INSERT = 3,
+
+    /** Flush non-redo logged pages phase. */
     FLUSH = 4,
+
+    /** Apply entries from the row log to the index after creation. */
     LOG_INDEX = 5,
+
+    /** Apply entries from the row log to the table after the build. */
     LOG_TABLE = 6,
+
+    /** End/Stop. */
     END = 7,
-  } m_cur_phase;
+  } m_cur_phase{NOT_STARTED};
 };
 
-/** Destructor. */
-inline ut_stage_alter_t::~ut_stage_alter_t() {
-  if (m_progress == nullptr) {
+inline Alter_stage::Alter_stage(const Alter_stage &rhs) noexcept
+    : m_pk(rhs.m_pk), m_cur_phase(NOT_STARTED) {}
+
+inline Alter_stage::~Alter_stage() {
+  auto progress = m_stage.second.first;
+
+  if (progress == nullptr) {
     return;
   }
 
   /* Set completed = estimated before we quit. */
-  mysql_stage_set_work_completed(m_progress,
-                                 mysql_stage_get_work_estimated(m_progress));
+  mysql_stage_set_work_completed(progress,
+                                 mysql_stage_get_work_estimated(progress));
 
   mysql_end_stage();
 }
 
-/** Flag an ALTER TABLE start (read primary key phase).
-@param[in]	n_sort_indexes	number of indexes that will be sorted
-during ALTER TABLE, used for estimating the total work to be done */
-inline void ut_stage_alter_t::begin_phase_read_pk(ulint n_sort_indexes) {
-  m_n_sort_indexes = n_sort_indexes;
-
-  m_cur_phase = READ_PK;
-
-  m_progress =
-      mysql_set_stage(srv_stage_alter_table_read_pk_internal_sort.m_key);
-
-  mysql_stage_set_work_completed(m_progress, 0);
-
-  reestimate();
+inline void Alter_stage::n_pk_recs_inc(uint64_t n) {
+  m_n_pk_recs.fetch_add(n, std::memory_order_relaxed);
 }
 
-/** Increment the number of records in PK (table) with 1.
-This is used to get more accurate estimate about the number of
-records per page which is needed because some phases work on
-per-page basis while some work on per-record basis and we want
-to get the progress as even as possible. */
-inline void ut_stage_alter_t::n_pk_recs_inc() { m_n_pk_recs++; }
-
-/** Flag either one record or one page processed, depending on the
-current phase.
-@param[in]	inc_val	flag this many units processed at once */
-inline void ut_stage_alter_t::inc(ulint inc_val /* = 1 */) {
-  if (m_progress == nullptr) {
+inline void Alter_stage::n_pk_recs_inc() { n_pk_recs_inc(1); }
+
+inline void Alter_stage::inc(uint64_t inc_val) {
+  if (m_stages.empty()) {
     return;
   }
 
-  ulint multi_factor = 1;
-  bool should_proceed = true;
+  uint64_t multi_factor{1};
+  bool should_proceed{true};
 
   switch (m_cur_phase) {
     case NOT_STARTED:
       ut_error;
     case READ_PK:
-      m_n_pk_pages++;
+      ++m_n_pk_pages;
       ut_ad(inc_val == 1);
       /* Overall the read pk phase will read all the pages from the
       PK and will do work, proportional to the number of added
@@ -249,7 +266,7 @@
       break;
     case SORT:
       multi_factor = m_sort_multi_factor;
-      /* fall through */
+      [[fallthrough]];
     case INSERT: {
       /* Increment the progress every nth record. During
       sort and insert phases, this method is called once per
@@ -260,37 +277,49 @@
       should be incremented on the inc() calls round(k*N),
       for k=1,2,3... */
       const double every_nth = m_n_recs_per_page * multi_factor;
+      const uint64_t k = static_cast<uint64_t>(round(m_n_inserted / every_nth));
+      const uint64_t nth = static_cast<uint64_t>(round(k * every_nth));
 
-      const ulint k = static_cast<ulint>(round(m_n_recs_processed / every_nth));
-
-      const ulint nth = static_cast<ulint>(round(k * every_nth));
-
-      should_proceed = m_n_recs_processed == nth;
-
-      m_n_recs_processed++;
+      should_proceed = m_n_inserted == nth;
 
+      ++m_n_inserted;
       break;
     }
     case FLUSH:
-      break;
     case LOG_INDEX:
-      break;
     case LOG_TABLE:
-      break;
     case END:
       break;
   }
 
   if (should_proceed) {
-    mysql_stage_inc_work_completed(m_progress, inc_val);
+    auto progress = m_stages.back().second.first;
+    mysql_stage_inc_work_completed(progress, inc_val);
+    reestimate();
+  }
+}
+
+inline void Alter_stage::begin_phase_read_pk(size_t n_sort_indexes) {
+  m_cur_phase = READ_PK;
+
+  m_n_sort_indexes = n_sort_indexes;
+
+  Stage stage{};
+
+  stage.first = &srv_stage_alter_table_read_pk_internal_sort;
+  stage.second.first = mysql_set_stage(stage.first->m_key);
+
+  if (stage.second.first != nullptr) {
+    m_stages.push_back(stage);
+
+    auto progress = stage.second.first;
+    mysql_stage_set_work_completed(progress, 0);
+
     reestimate();
   }
 }
 
-/** Flag the end of reading of the primary key.
-Here we know the exact number of pages and records and calculate
-the number of records per page and refresh the estimate. */
-inline void ut_stage_alter_t::end_phase_read_pk() {
+inline void Alter_stage::end_phase_read_pk() {
   reestimate();
 
   if (m_n_pk_pages == 0) {
@@ -299,34 +328,28 @@
     division by zero later. */
     m_n_recs_per_page = 1.0;
   } else {
-    m_n_recs_per_page =
-        std::max(static_cast<double>(m_n_pk_recs) / m_n_pk_pages, 1.0);
+    m_n_recs_per_page = std::max(
+        static_cast<double>(m_n_pk_recs.load(std::memory_order_relaxed)) /
+            m_n_pk_pages,
+        1.0);
   }
 }
 
-/** Flag the beginning of the sort phase.
-@param[in]	sort_multi_factor	since merge sort processes
-one page more than once we only update the estimate once per this
-many pages processed. */
-inline void ut_stage_alter_t::begin_phase_sort(double sort_multi_factor) {
+inline void Alter_stage::begin_phase_sort(double sort_multi_factor) {
   if (sort_multi_factor <= 1.0) {
     m_sort_multi_factor = 1;
   } else {
-    m_sort_multi_factor = static_cast<ulint>(round(sort_multi_factor));
+    m_sort_multi_factor = static_cast<uint64_t>(round(sort_multi_factor));
   }
 
   change_phase(&srv_stage_alter_table_merge_sort);
 }
 
-/** Flag the beginning of the insert phase. */
-inline void ut_stage_alter_t::begin_phase_insert() {
+inline void Alter_stage::begin_phase_insert() {
   change_phase(&srv_stage_alter_table_insert);
 }
 
-/** Flag the beginning of the flush phase.
-@param[in]	n_flush_pages	this many pages are going to be
-flushed */
-inline void ut_stage_alter_t::begin_phase_flush(ulint n_flush_pages) {
+inline void Alter_stage::begin_phase_flush(page_no_t n_flush_pages) {
   m_n_flush_pages = n_flush_pages;
 
   reestimate();
@@ -334,33 +357,32 @@
   change_phase(&srv_stage_alter_table_flush);
 }
 
-/** Flag the beginning of the log index phase. */
-inline void ut_stage_alter_t::begin_phase_log_index() {
+inline void Alter_stage::begin_phase_log_index() {
   change_phase(&srv_stage_alter_table_log_index);
 }
 
-/** Flag the beginning of the log table phase. */
-inline void ut_stage_alter_t::begin_phase_log_table() {
+inline void Alter_stage::begin_phase_log_table() {
   change_phase(&srv_stage_alter_table_log_table);
 }
 
-/** Flag the beginning of the end phase. */
-inline void ut_stage_alter_t::begin_phase_end() {
+inline void Alter_stage::begin_phase_end() {
   change_phase(&srv_stage_alter_table_end);
 }
 
-/** Update the estimate of total work to be done. */
-inline void ut_stage_alter_t::reestimate() {
-  if (m_progress == nullptr) {
+inline void Alter_stage::reestimate() {
+  if (m_stages.empty()) {
     return;
   }
 
   /* During the log table phase we calculate the estimate as
   work done so far + log size remaining. */
   if (m_cur_phase == LOG_TABLE) {
-    mysql_stage_set_work_estimated(m_progress,
-                                   mysql_stage_get_work_completed(m_progress) +
-                                       row_log_estimate_work(m_pk));
+    auto progress = m_stages.back().second.first;
+
+    mysql_stage_set_work_estimated(
+        progress,
+        mysql_stage_get_work_completed(progress) + row_log_estimate_work(m_pk));
+
     return;
   }
 
@@ -370,7 +392,7 @@
   /* For number of pages in the PK - if the PK has not been
   read yet, use stat_n_leaf_pages (approximate), otherwise
   use the exact number we gathered. */
-  const ulint n_pk_pages =
+  const page_no_t n_pk_pages =
       m_cur_phase != READ_PK ? m_n_pk_pages : m_pk->stat_n_leaf_pages;
 
   /* If flush phase has not started yet and we do not know how
@@ -380,7 +402,7 @@
     m_n_flush_pages = n_pk_pages / 2;
   }
 
-  ulonglong estimate =
+  uint64_t estimate =
       n_pk_pages *
           (1                  /* read PK */
            + m_n_sort_indexes /* row_merge_buf_sort() inside the
@@ -388,22 +410,21 @@
            + m_n_sort_indexes * 2 /* sort & insert per created index */) +
       m_n_flush_pages + row_log_estimate_work(m_pk);
 
-  /* Prevent estimate < completed */
-  estimate = std::max(estimate, mysql_stage_get_work_completed(m_progress));
+  auto progress = m_stages.back().second.first;
+  const auto completed = (uint64_t)mysql_stage_get_work_completed(progress);
 
-  mysql_stage_set_work_estimated(m_progress, estimate);
+  /* Prevent estimate < completed */
+  mysql_stage_set_work_estimated(progress, std::max(estimate, completed));
 }
 
-/** Change the current phase.
-@param[in]	new_stage	pointer to the new stage to change to */
-inline void ut_stage_alter_t::change_phase(const PSI_stage_info *new_stage) {
-  if (m_progress == nullptr) {
+inline void Alter_stage::change_phase(const PSI_stage_info *new_stage) {
+  if (m_stages.empty()) {
     return;
   }
 
-  if (new_stage == &srv_stage_alter_table_read_pk_internal_sort) {
-    m_cur_phase = READ_PK;
-  } else if (new_stage == &srv_stage_alter_table_merge_sort) {
+  ut_a(new_stage != &srv_stage_alter_table_read_pk_internal_sort);
+
+  if (new_stage == &srv_stage_alter_table_merge_sort) {
     m_cur_phase = SORT;
   } else if (new_stage == &srv_stage_alter_table_insert) {
     m_cur_phase = INSERT;
@@ -419,34 +440,120 @@
     ut_error;
   }
 
-  const ulonglong c = mysql_stage_get_work_completed(m_progress);
-  const ulonglong e = mysql_stage_get_work_estimated(m_progress);
+  auto progress = m_stages.back().second.first;
+
+  const auto c = mysql_stage_get_work_completed(progress);
+  const auto e = mysql_stage_get_work_estimated(progress);
+
+  Stage stage{new_stage, {mysql_set_stage(new_stage->m_key), {}}};
+
+  if (stage.second.first != nullptr) {
+    m_stages.push_back(stage);
+
+    auto &counter = m_stages.back().second.second;
+
+    counter.first = c;
+    counter.second = e;
+
+    mysql_stage_set_work_completed(stage.second.first, c);
+    mysql_stage_set_work_estimated(stage.second.first, e);
+  }
+}
+
+inline void Alter_stage::aggregate(const Alter_stages &alter_stages) noexcept {
+  if (alter_stages.empty()) {
+    return;
+  }
+
+  ut_a(m_cur_phase == NOT_STARTED);
+
+  Stage cur_stage{};
 
-  m_progress = mysql_set_stage(new_stage->m_key);
+  for (auto alter_stage : alter_stages) {
+    alter_stage->begin_phase_end();
 
-  mysql_stage_set_work_completed(m_progress, c);
-  mysql_stage_set_work_estimated(m_progress, e);
+    for (auto stage : alter_stage->m_stages) {
+      if (stage.first == &srv_stage_alter_table_end) {
+        continue;
+      }
+      auto progress = mysql_set_stage(stage.first->m_key);
+
+      if (progress == nullptr) {
+        /* The user can disable the instrument clas and that can return
+        nullptr. That forces us to skip and will break the state transitions
+        and counts.*/
+        return;
+      }
+
+      auto c = mysql_stage_get_work_completed(progress);
+      auto e = mysql_stage_get_work_estimated(progress);
+
+      const auto &counter = stage.second.second;
+
+      c += counter.first;
+      e += counter.second;
+
+      mysql_stage_set_work_completed(progress, c);
+      mysql_stage_set_work_estimated(progress, e);
+
+      if (stage.first == &srv_stage_alter_table_read_pk_internal_sort) {
+        if ((int)m_cur_phase < (int)READ_PK) {
+          m_cur_phase = READ_PK;
+          cur_stage.first = stage.first;
+          cur_stage.second.first = progress;
+        }
+      } else if (stage.first == &srv_stage_alter_table_merge_sort) {
+        if ((int)m_cur_phase < (int)NOT_STARTED) {
+          m_cur_phase = SORT;
+          cur_stage.first = stage.first;
+          cur_stage.second.first = progress;
+        }
+      } else if (stage.first == &srv_stage_alter_table_insert) {
+        if ((int)m_cur_phase < (int)SORT) {
+          m_cur_phase = INSERT;
+          cur_stage.first = stage.first;
+          cur_stage.second.first = progress;
+        }
+      } else if (stage.first == &srv_stage_alter_table_log_index) {
+        if ((int)m_cur_phase < (int)LOG_INDEX) {
+          m_cur_phase = LOG_INDEX;
+          cur_stage.first = stage.first;
+          cur_stage.second.first = progress;
+        }
+      }
+
+      ut_a(stage.first != &srv_stage_alter_table_flush);
+      ut_a(stage.first != &srv_stage_alter_table_log_table);
+    }
+  }
+
+  if (cur_stage.first != nullptr) {
+    ut_a(cur_stage.second.first != nullptr);
+    m_stages.push_back(cur_stage);
+  }
 }
 
-/* class to monitor the progress of 'ALTER TABLESPACE ENCRYPTION' in terms
+/** class to monitor the progress of 'ALTER TABLESPACE ENCRYPTION' in terms
 of number of pages operated upon. */
-class ut_stage_alter_ts {
+class Alter_stage_ts {
  public:
   /** Constructor. */
-  ut_stage_alter_ts()
+  Alter_stage_ts()
       : m_progress(nullptr),
         m_work_estimated(0),
         m_work_done(0),
         m_cur_phase(NOT_STARTED) {}
 
   /** Destructor. */
-  inline ~ut_stage_alter_ts() {
+  inline ~Alter_stage_ts() {
     if (m_progress == nullptr) {
       return;
     }
     mysql_end_stage();
   }
 
+  /** Initialize.
+  @param[in] key                PFS key. */
   void init(int key) {
     ut_ad(key != -1);
     ut_ad(m_cur_phase == NOT_STARTED);
@@ -460,7 +567,9 @@
     change_phase();
   }
 
-  void set_estimate(ulint units) {
+  /** Set estimate.
+  @param[in] units              Units. */
+  void set_estimate(uint64_t units) {
     if (m_progress == nullptr) {
       return;
     }
@@ -472,7 +581,9 @@
     change_phase();
   }
 
-  void update_work(ulint units) {
+  /** Update the progress.
+  @param[in] units              Update delta. */
+  void update_work(uint64_t units) {
     if (m_progress == nullptr) {
       return;
     }
@@ -489,6 +600,7 @@
     }
   }
 
+  /** Change phase. */
   void change_phase() {
     if (m_progress == nullptr) {
       ut_ad(m_cur_phase == NOT_STARTED);
@@ -514,9 +626,9 @@
   bool is_completed() {
     if (m_progress == nullptr) {
       return true;
+    } else {
+      return (m_cur_phase == WORK_COMPLETED);
     }
-
-    return (m_cur_phase == WORK_COMPLETED);
   }
 
  private:
@@ -524,61 +636,93 @@
   PSI_stage_progress *m_progress;
 
   /** Number of pages to be (un)encrypted . */
-  ulint m_work_estimated;
+  page_no_t m_work_estimated;
 
   /** Number of pages already (un)encrypted . */
-  ulint m_work_done;
+  page_no_t m_work_done;
 
   /** Current phase. */
   enum {
+    /** Not open phase. */
     NOT_STARTED = 0,
+
+    /** Initialised. */
     INITIATED = 1,
+
+    /** Work estimated phase. */
     WORK_ESTIMATED = 2,
+
+    /** Work completed phase. */
     WORK_COMPLETED = 3,
   } m_cur_phase;
 };
 
 #else  /* HAVE_PSI_STAGE_INTERFACE */
 
-class ut_stage_alter_t {
+/** Dummy alter stage. */
+class Alter_stage {
  public:
-  explicit ut_stage_alter_t(const dict_index_t *pk) {}
+  /** Constructor. */
+  explicit Alter_stage(const dict_index_t *pk) {}
 
-  void begin_phase_read_pk(ulint n_sort_indexes) {}
+  /** Setup the number of indexes to read.
+  @param[in] n_sort_indexes     Number of indexe.s */
+  void begin_phase_read_pk(size_t n_sort_indexes) {}
 
+  /** Increments the numbfer of rows read so far. */
   void n_pk_recs_inc() {}
 
-  void inc(ulint inc_val = 1) {}
+  /** Increment depending on stage. */
+  void inc(uint64_t inc_val = 1) {}
 
+  /** End scan phase. */
   void end_phase_read_pk() {}
 
+  /** Begin merge sort phase. */
   void begin_phase_sort(double sort_multi_factor) {}
 
+  /** Begin insert phase. */
   void begin_phase_insert() {}
 
-  void begin_phase_flush(ulint n_flush_pages) {}
+  /** Begin flushing of non-redo logged pages.
+  @param[in] n_flush_pages      Number of pages to flush. */
+  void begin_phase_flush(page_no_t n_flush_pages) {}
 
+  /** Begin row log apply phase to the index. */
   void begin_phase_log_index() {}
 
+  /** Begin row log apply phase to the table. */
   void begin_phase_log_table() {}
 
+  /** Build end phase. */
   void begin_phase_end() {}
+
+  /** Aggregate the sub stages..
+  @param[in] stages             Stages to aggregate. */
+  void Alter_stage::aggregate(const Alter_stages &alter_stages) noexcept {}
 };
 
-class ut_stage_alter_ts {
+class Alter_stage_ts {
  public:
   /** Constructor. */
-  ut_stage_alter_ts() {}
+  Alter_stage_ts() {}
 
   /** Destructor. */
-  inline ~ut_stage_alter_ts() {}
+  inline ~Alter_stage_ts() {}
 
+  /** Initialize.
+  @param[in] key                PFS key. */
   void init(int key) {}
 
+  /** Set estimate.
+  @param[in] units              Units. */
   void set_estimate(uint units) {}
 
+  /** Update the progress.
+  @param[in] units              Update delta. */
   void update_work(uint units) {}
 
+  /** Change phase. */
   void change_phase() {}
 };
 #endif /* HAVE_PSI_STAGE_INTERFACE */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/ut0stateful_latching_rules.h mysql-8.0-8.0.27/storage/innobase/include/ut0stateful_latching_rules.h
--- mysql-8.0-8.0.26/storage/innobase/include/ut0stateful_latching_rules.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/ut0stateful_latching_rules.h	2021-09-28 11:46:34.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2021, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2021, Oracle 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, as published by the
@@ -277,7 +277,7 @@
     const bool can_leave_B = can_leave(owned_latches, B);
 
     if (can_leave_A || can_leave_B) {
-      ib::fatal the_err{};
+      ib::fatal the_err{UT_LOCATION_HERE};
       the_err << "We can leave "
               << (can_leave_A && can_leave_B ? "both A and B"
                                              : (can_leave_A ? "A" : "B"))
@@ -314,7 +314,7 @@
         })) {
       return;
     }
-    ib::fatal the_err{};
+    ib::fatal the_err{UT_LOCATION_HERE};
     the_err << "Disallowed transition FROM " << from << " TO " << to
             << " WITH ";
     print(the_err, owned_latches);
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/ut0test.h mysql-8.0-8.0.27/storage/innobase/include/ut0test.h
--- mysql-8.0-8.0.26/storage/innobase/include/ut0test.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/ut0test.h	2021-09-28 11:46:34.000000000 +0000
@@ -89,8 +89,7 @@
 2. Add member function with same name as the command to the Tester class. Its
    signature would be as follows:
 
-   Ret_t hello_world(std::vector<std::string> &tokens) noexcept
-      MY_ATTRIBUTE((warn_unused_result));
+   [[nodiscard]] Ret_t hello_world(std::vector<std::string> &tokens) noexcept;
 
    The command has 4 tokens - the command name followed by 3 arguments.  The
    vector will be of size 4.
@@ -167,17 +166,17 @@
    @param[in]  cmd   the command to run.
    @return 0 on success.
    @return error code on failure. */
-  Ret_t run(ulong cmd) noexcept MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] Ret_t run(ulong cmd) noexcept;
 
   /** Run the given command.
    @param[in]  cmd   the command to run.
    @return 0 on success.
    @return error code on failure. */
-  Ret_t run(const std::string &cmd) noexcept MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] Ret_t run(const std::string &cmd) noexcept;
 
   /** Get the last generated output.
   @return the last generated output. */
-  const char *get_last_log() const noexcept MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] const char *get_last_log() const noexcept {
     return m_log.c_str();
   }
 
@@ -192,8 +191,7 @@
   /** Open the specified table.
   @param[in]   tokens   the given command line
   @return RET_PASS on success, or the error code. */
-  Ret_t open_table(std::vector<std::string> &tokens) noexcept
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] Ret_t open_table(std::vector<std::string> &tokens) noexcept;
 
   /** Close the given table.
   @param[in]   table   the table object */
@@ -202,54 +200,51 @@
   /** Find the space_id of the given table.
   @param[in]   tokens   the given command line
   @return RET_PASS on success, or the error code. */
-  Ret_t find_space_id(std::vector<std::string> &tokens) noexcept
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] Ret_t find_space_id(std::vector<std::string> &tokens) noexcept;
 
   /** Find the root page of the given table.
   @param[in]   tokens   the given command line
   @return RET_PASS on success, or the error code. */
-  Ret_t find_root_page_no(std::vector<std::string> &tokens) noexcept
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] Ret_t find_root_page_no(
+      std::vector<std::string> &tokens) noexcept;
 
   /** Find the on-disk page type of the given page.
   @param[in]   tokens   the given command line
   @return RET_PASS on success, or the error code. */
-  Ret_t find_ondisk_page_type(std::vector<std::string> &tokens) noexcept
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] Ret_t find_ondisk_page_type(
+      std::vector<std::string> &tokens) noexcept;
 
   /** Find the FIL_PAGE_LSN of the given page.
   @param[in]   tokens   the given command line
   @return RET_PASS on success, or the error code. */
-  Ret_t find_fil_page_lsn(std::vector<std::string> &tokens) noexcept
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] Ret_t find_fil_page_lsn(
+      std::vector<std::string> &tokens) noexcept;
 
   /** Find the flush sync lsn from the buffer pool module.
   @param[in]   tokens   the given command line
   @return RET_PASS on success, or the error code. */
-  Ret_t find_flush_sync_lsn(std::vector<std::string> &tokens) noexcept
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] Ret_t find_flush_sync_lsn(
+      std::vector<std::string> &tokens) noexcept;
 
   /** Print the page type of pages in dblwr file to server error log.
   @param[in]   tokens   the given command line
   @return RET_PASS on success, or the error code. */
-  Ret_t print_dblwr_has_encrypted_pages(
-      std::vector<std::string> &tokens) noexcept
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] Ret_t print_dblwr_has_encrypted_pages(
+      std::vector<std::string> &tokens) noexcept;
 
   /** Obtain the file name of the given tablespace
   @param[in]   tokens   the given command line
   @return RET_PASS on success, or the error code. */
-  Ret_t find_tablespace_file_name(std::vector<std::string> &tokens) noexcept
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] Ret_t find_tablespace_file_name(
+      std::vector<std::string> &tokens) noexcept;
 
   /** A macro to declare a dispatch function or a command function.  They all
   have the same signature.
   @param[in]   func_  the function that is being declared. */
-#define DISPATCH_FUNCTION(func_)                                       \
-  /* @param[in] tokens   the command line */                           \
-  /* @return RET_PASS on success, or the error code. */                \
-  Ret_t func_(std::vector<std::string> &tokens) noexcept MY_ATTRIBUTE( \
-      (warn_unused_result))
+#define DISPATCH_FUNCTION(func_)                        \
+  /* @param[in] tokens   the command line */            \
+  /* @return RET_PASS on success, or the error code. */ \
+  [[nodiscard]] Ret_t func_(std::vector<std::string> &tokens) noexcept
 
   /** Count various page_types for given tablespace. */
   DISPATCH_FUNCTION(count_page_type);
@@ -270,14 +265,14 @@
   /** Corrupt the root page of the given table.
   @param[in]   tokens   the given command line
   @return RET_PASS on success, or the error code. */
-  Ret_t corrupt_ondisk_root_page(std::vector<std::string> &tokens) noexcept
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] Ret_t corrupt_ondisk_root_page(
+      std::vector<std::string> &tokens) noexcept;
 
   /** Corrupt the first page of the given tablespace.
   @param[in]   tokens   the given command line
   @return RET_PASS on success, or the error code. */
-  Ret_t corrupt_ondisk_page0(std::vector<std::string> &tokens) noexcept
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] Ret_t corrupt_ondisk_page0(
+      std::vector<std::string> &tokens) noexcept;
 
   /** Set the dblwr::Force_crash to the desired page.  This will
   crash the server after flushing the page to dblwr.
@@ -292,8 +287,8 @@
   @param[in]  table_name  name of the table to open.
   @return if table is already open return its pointer.
   @return if table is NOT already open return nullptr. */
-  dict_table_t *is_table_open(const std::string &table_name) const noexcept
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dict_table_t *is_table_open(
+      const std::string &table_name) const noexcept;
 
   /** Set the output value of the interpreter.
   @param[in]  sout   the output string stream containing the output string. */
@@ -321,7 +316,7 @@
 
  private:
   /** List of open tables. */
-  std::list<dict_table_t *, ut_allocator<dict_table_t *>> m_open_tables{};
+  std::list<dict_table_t *, ut::allocator<dict_table_t *>> m_open_tables{};
 
   /** Current thread object. */
   THD *m_thd{};
@@ -336,7 +331,7 @@
 
   using Function_executor = Ret_t (Tester::*)(std::vector<std::string> &);
   using Pair = std::pair<const std::string, Function_executor>;
-  using Allocator = ut_allocator<Pair>;
+  using Allocator = ut::allocator<Pair>;
 
   /** Mapping b/w the command name and the function to execute. */
   std::map<std::string, Function_executor, std::less<std::string>, Allocator>
@@ -346,8 +341,7 @@
 /** The main function to execute the commands in the tester.
 @param[in]  command  the command to execute.
 @return the error code. */
-int interpreter_run(const char *command) noexcept
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] int interpreter_run(const char *command) noexcept;
 
 }  // namespace ib
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/ut0ut.h mysql-8.0-8.0.27/storage/innobase/include/ut0ut.h
--- mysql-8.0-8.0.26/storage/innobase/include/ut0ut.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/ut0ut.h	2021-09-28 11:46:34.000000000 +0000
@@ -102,11 +102,7 @@
 instruction has important side-effects and must not be removed.
 Also asm volatile may trigger a memory barrier (spilling all registers
 to memory). */
-#ifdef __SUNPRO_CC
-#define UT_RELAX_CPU() asm("pause")
-#else
 #define UT_RELAX_CPU() __asm__ __volatile__("pause")
-#endif /* __SUNPRO_CC */
 
 #elif defined(HAVE_FAKE_PAUSE_INSTRUCTION)
 #define UT_RELAX_CPU() __asm__ __volatile__("rep; nop")
@@ -159,9 +155,17 @@
 struct Location {
   const char *filename;
   size_t line;
+  std::ostream &print(std::ostream &out) const {
+    out << "[Location: file=" << filename << ", line=" << line << "]";
+    return out;
+  }
 };
 }  // namespace ut
 
+inline std::ostream &operator<<(std::ostream &out, const ut::Location &obj) {
+  return obj.print(out);
+}
+
 #define UT_LOCATION_HERE (ut::Location{__FILE__, __LINE__})
 
 #define ut_max std::max
@@ -195,8 +199,8 @@
 @retval -1 if (a_h,a_l) is less than (b_h,b_l)
 @retval 0 if (a_h,a_l) is equal to (b_h,b_l)
 @retval 1 if (a_h,a_l) is greater than (b_h,b_l) */
-static inline int ut_pair_cmp(ulint a_h, ulint a_l, ulint b_h, ulint b_l)
-    MY_ATTRIBUTE((warn_unused_result));
+[[nodiscard]] static inline int ut_pair_cmp(ulint a_h, ulint a_l, ulint b_h,
+                                            ulint b_l);
 
 /** Calculates fast the remainder of n/m when m is a power of two.
  @param n in: numerator
@@ -239,7 +243,7 @@
 store the given number of bits.
 @param b in: bits
 @return number of bytes (octets) needed to represent b */
-#define UT_BITS_IN_BYTES(b) (((b) + 7) / 8)
+#define UT_BITS_IN_BYTES(b) (((b) + 7UL) / 8UL)
 
 /** Returns system time. We do not specify the format of the time returned:
  the only way to manipulate it is to use the function ut_difftime.
@@ -715,22 +719,32 @@
 class fatal : public logger {
  public:
 #ifndef UNIV_NO_ERR_MSGS
-  /** Default constructor uses ER_IB_MSG_0 */
-  fatal() : logger(ERROR_LEVEL) {}
+  /** Default constructor uses ER_IB_MSG_0
+  @param[in]	location		Location that creates the fatal message.
+*/
+  fatal(ut::Location location) : logger(ERROR_LEVEL), m_location(location) {}
 
   /** Constructor.
+  @param[in]	location		Location that creates the fatal message.
   @param[in]	err		Error code from errmsg-*.txt.
   @param[in]	args		Variable length argument list */
   template <class... Args>
-  explicit fatal(int err, Args &&... args)
-      : logger(ERROR_LEVEL, err, std::forward<Args>(args)...) {}
-
-  /** Destructor. */
-  ~fatal() override;
+  explicit fatal(ut::Location location, int err, Args &&... args)
+      : logger(ERROR_LEVEL, err, std::forward<Args>(args)...),
+        m_location(location) {}
 #else
+  /** Constructor
+  @param[in]	location		Location that creates the fatal message.
+  */
+  fatal(ut::Location location) : m_location(location) {}
+#endif /* !UNIV_NO_ERR_MSGS */
+
   /** Destructor. */
   ~fatal() override;
-#endif /* !UNIV_NO_ERR_MSGS */
+
+ private:
+  /** Location of the original caller to report to assertion failure */
+  ut::Location m_location;
 };
 
 /** Emit an error message if the given predicate is true, otherwise emit a
@@ -761,26 +775,40 @@
  public:
 #ifndef UNIV_NO_ERR_MSGS
   /** Default constructor uses ER_IB_MSG_0
-  @param[in]	fatal		true if it's a fatal message */
-  fatal_or_error(bool fatal) : logger(ERROR_LEVEL), m_fatal(fatal) {}
+  @param[in]	fatal		true if it's a fatal message
+  @param[in] location Location that creates the fatal */
+  fatal_or_error(bool fatal, ut::Location location)
+      : logger(ERROR_LEVEL), m_fatal(fatal), m_location(location) {}
 
   /** Constructor.
   @param[in]	fatal		true if it's a fatal message
+  @param[in] location Location that creates the fatal
   @param[in]	err		Error code from errmsg-*.txt.
   @param[in]	args		Variable length argument list */
   template <class... Args>
-  explicit fatal_or_error(bool fatal, int err, Args &&... args)
-      : logger(ERROR_LEVEL, err, std::forward<Args>(args)...), m_fatal(fatal) {}
+  explicit fatal_or_error(bool fatal, ut::Location location, int err,
+                          Args &&... args)
+      : logger(ERROR_LEVEL, err, std::forward<Args>(args)...),
+        m_fatal(fatal),
+        m_location(location) {}
 
   /** Destructor */
   ~fatal_or_error() override;
 #else
-  /** Constructor */
-  fatal_or_error(bool fatal) : m_fatal(fatal) {}
+  /** Constructor
+  @param[in] location Location that creates the fatal */
+  fatal_or_error(bool fatal, ut::Location location)
+      : m_fatal(fatal), m_location(location) {}
+
+  /** Destructor */
+  ~fatal_or_error() override;
+
 #endif /* !UNIV_NO_ERR_MSGS */
  private:
   /** If true then assert after printing an error message. */
   const bool m_fatal;
+  /** Location of the original caller to report to assertion failure */
+  ut::Location m_location;
 };
 
 #ifdef UNIV_HOTBACKUP
@@ -914,6 +942,47 @@
   bool any_waits() const { return (wait_loops != 0); }
 };
 
+namespace ib {
+
+/** Allows to monitor an event processing times, allowing to throttle the
+processing to one per THROTTLE_DELAY_SEC. */
+class Throttler {
+ public:
+  Throttler() : m_last_applied_time(0) {}
+
+  /** Checks if the item should be processed or ignored to not process them more
+  frequently than one per THROTTLE_DELAY_SEC. */
+  bool apply() {
+    const auto current_time = std::chrono::steady_clock::now();
+    const auto current_time_in_sec =
+        std::chrono::duration_cast<std::chrono::seconds>(
+            current_time.time_since_epoch())
+            .count();
+    auto last_apply_time = m_last_applied_time.load();
+    if (last_apply_time + THROTTLE_DELAY_SEC <
+        static_cast<uint64_t>(current_time_in_sec)) {
+      if (m_last_applied_time.compare_exchange_strong(last_apply_time,
+                                                      current_time_in_sec)) {
+        return true;
+      }
+      /* Any race condition with other threads would mean someone just changed
+      the `m_last_apply_time` and will print the message. We don't want
+      to retry the operation again. */
+    }
+    return false;
+  }
+
+ private:
+  /* Time when the last item was not throttled. Stored as number of seconds
+  since epoch. */
+  std::atomic<uint64_t> m_last_applied_time;
+
+  /** Throttle all items within that amount seconds from the last non throttled
+  one. */
+  static constexpr uint64_t THROTTLE_DELAY_SEC = 10;
+};
+}  // namespace ib
+
 #include "ut0ut.ic"
 
 #endif /* !ut0ut_h */
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/ut0wqueue.h mysql-8.0-8.0.27/storage/innobase/include/ut0wqueue.h
--- mysql-8.0-8.0.26/storage/innobase/include/ut0wqueue.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/ut0wqueue.h	2021-09-28 11:46:34.000000000 +0000
@@ -59,6 +59,11 @@
 @param[in] heap Memory heap to use for allocating the list node */
 void ib_wqueue_add(ib_wqueue_t *wq, void *item, mem_heap_t *heap);
 
+/** read total number of work item to the queue.
+@param[in] wq Work queue
+@return total count of work item in the queue */
+uint64_t ib_wqueue_get_count(ib_wqueue_t *wq);
+
 /********************************************************************
 Check if queue is empty. */
 ibool ib_wqueue_is_empty(
diff -Nru mysql-8.0-8.0.26/storage/innobase/include/zlob0first.h mysql-8.0-8.0.27/storage/innobase/include/zlob0first.h
--- mysql-8.0-8.0.26/storage/innobase/include/zlob0first.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/include/zlob0first.h	2021-09-28 11:46:34.000000000 +0000
@@ -264,16 +264,23 @@
     return (fil_addr_t(page_no, offset));
   }
 
-  /** All the index pages are singled linked with each other, and
+  /** All the index pages are singly linked with each other, and
   the first page contains the link to one index page.
   @param[in]  page_no  the page number of an index page. */
   void set_index_page_no(page_no_t page_no) {
+    set_index_page_no(page_no, m_mtr);
+  }
+
+  /** All the index pages are singly linked with each other, and
+  the first page contains the link to one index page.
+  @param[in]  page_no  the page number of an index page.
+  @param[in]  mtr      use this mini transaction context for redo logs. */
+  void set_index_page_no(page_no_t page_no, mtr_t *mtr) {
     ut_ad(m_mtr != nullptr);
-    mlog_write_ulint(frame() + OFFSET_INDEX_PAGE_NO, page_no, MLOG_4BYTES,
-                     m_mtr);
+    mlog_write_ulint(frame() + OFFSET_INDEX_PAGE_NO, page_no, MLOG_4BYTES, mtr);
   }
 
-  /** All the index pages are singled linked with each other, and
+  /** All the index pages are singly linked with each other, and
   the first page contains the link to one index page. Get that index
   page number.
   @return the index page number. */
@@ -303,8 +310,9 @@
   bool verify_frag_page_no();
 #endif /* UNIV_DEBUG */
 
-  /** All the fragment pages are doubly linked with each other, and
-  the first page contains the link to one fragment page in FIL_PAGE_PREV.
+  /** All the fragment pages (@see z_frag_page_t) are doubly linked with each
+  other, and the first page contains the link to one fragment page in
+  FIL_PAGE_PREV.
   @param[in]  mtr      Mini-transaction for this modification.
   @param[in]  page_no  The page number of a fragment page. */
   void set_frag_page_no(mtr_t *mtr, page_no_t page_no) {
@@ -312,21 +320,34 @@
     set_prev_page_no(page_no, mtr);
   }
 
-  /** All the fragment pages are doubly linked with each other, and
-  the first page contains the link to one fragment page in FIL_PAGE_PREV.
+  /** All the fragment pages (@see z_frag_page_t) are doubly linked with each
+  other, and the first page contains the link to one fragment page in
+  FIL_PAGE_PREV.
   @param[in]  page_no  the page number of a fragment page. */
   void set_frag_page_no(page_no_t page_no) {
     ut_ad(verify_frag_page_no());
     set_prev_page_no(page_no, m_mtr);
   }
 
-  /** All the frag node pages are singled linked with each other, and
-  the first page contains the link to one frag node page.
+  /** All the frag node pages (@see z_frag_node_page_t) are singly linked with
+  each other, and the first page contains the link to the last allocated frag
+  node page. The last allocated FIL_PAGE_TYPE_ZLOB_FRAG_ENTRY  page will be the
+  first in this list. This list is used to free these pages.
   @param[in]  page_no  the page number of an frag node page. */
   void set_frag_node_page_no(page_no_t page_no) {
-    ut_ad(m_mtr != nullptr);
+    set_frag_node_page_no(page_no, m_mtr);
+  }
+
+  /** All the frag node pages (@see z_frag_node_page_t) are singly linked with
+  each other, and the first page contains the link to the last allocated frag
+  node page. The last allocated FIL_PAGE_TYPE_ZLOB_FRAG_ENTRY  page will be the
+  first in this list. This list is used to free these pages.
+  @param[in]  page_no  the page number of an frag node page.
+  @param[in]  mtr      mini trx context to generate redo logs. */
+  void set_frag_node_page_no(page_no_t page_no, mtr_t *mtr) {
+    ut_ad(mtr != nullptr);
     mlog_write_ulint(frame() + OFFSET_FRAG_NODES_PAGE_NO, page_no, MLOG_4BYTES,
-                     m_mtr);
+                     mtr);
   }
 
   /** Free all the z_frag_page_t pages. All the z_frag_page_t pages are
@@ -359,7 +380,7 @@
   @return the number of pages freed. */
   size_t free_all_data_pages();
 
-  /** All the frag node pages are singled linked with each other, and the
+  /** All the frag node pages are singly linked with each other, and the
   first page contains the link to one frag node page. Get that frag node
   page number.
   @return the index page number. */
diff -Nru mysql-8.0-8.0.26/storage/innobase/innodb.cmake mysql-8.0-8.0.27/storage/innobase/innodb.cmake
--- mysql-8.0-8.0.26/storage/innobase/innodb.cmake	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/innodb.cmake	2021-09-28 11:46:34.000000000 +0000
@@ -30,6 +30,8 @@
   ADD_DEFINITIONS(-DHAVE_LZ4=1)
 ENDIF()
 
+#ADD_DEFINITIONS("-O0")
+
 # OS tests
 IF(UNIX AND NOT IGNORE_AIO_CHECK)
   IF(LINUX)
diff -Nru mysql-8.0-8.0.26/storage/innobase/lob/lob0first.cc mysql-8.0-8.0.27/storage/innobase/lob/lob0first.cc
--- mysql-8.0-8.0.26/storage/innobase/lob/lob0first.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/lob/lob0first.cc	2021-09-28 11:46:34.000000000 +0000
@@ -303,9 +303,11 @@
     node_loc = cur_entry.get_next();
     cur_entry.reset(nullptr);
 
+    ut_ad(!local_mtr.conflicts_with(m_mtr));
     restart_mtr(&local_mtr);
   }
 
+  ut_ad(!local_mtr.conflicts_with(m_mtr));
   mtr_commit(&local_mtr);
 }
 
@@ -332,9 +334,11 @@
     set_next_page(next_page, &local_mtr);
     index_page.dealloc();
 
+    ut_ad(!local_mtr.conflicts_with(m_mtr));
     restart_mtr(&local_mtr);
   }
 
+  ut_ad(!local_mtr.conflicts_with(m_mtr));
   mtr_commit(&local_mtr);
 }
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/lob/lob0lob.cc mysql-8.0-8.0.27/storage/innobase/lob/lob0lob.cc
--- mysql-8.0-8.0.26/storage/innobase/lob/lob0lob.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/lob/lob0lob.cc	2021-09-28 11:46:34.000000000 +0000
@@ -40,7 +40,7 @@
 namespace lob {
 
 /** A BLOB field reference has all the bits set to zero, except the "being
- * modified" bit. */
+modified" bit. */
 const byte field_ref_almost_zero[FIELD_REF_SIZE] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x20, 0, 0, 0, 0, 0, 0, 0,
 };
@@ -92,7 +92,7 @@
 void BtrContext::check_redolog_bulk() {
   ut_ad(is_bulk());
 
-  FlushObserver *observer = m_mtr->get_flush_observer();
+  Flush_observer *observer = m_mtr->get_flush_observer();
 
   rec_block_fix();
 
@@ -114,7 +114,7 @@
 void BtrContext::check_redolog_normal() {
   ut_ad(!is_bulk());
 
-  FlushObserver *observer = m_mtr->get_flush_observer();
+  Flush_observer *observer = m_mtr->get_flush_observer();
   store_position();
 
   commit_btr_mtr();
@@ -214,15 +214,15 @@
         if (m_rctx.m_page_no == FIL_NULL) {
           goto end_of_blob;
         }
-      /* fall through */
+        [[fallthrough]];
       default:
         err = DB_FAIL;
         ib::error(ER_IB_MSG_630)
             << "inflate() of compressed BLOB page "
             << page_id_t(m_rctx.m_space_id, curr_page_no) << " returned "
             << zlib_err << " (" << m_stream.msg << ")";
-        /* fall through */
         ut_error;
+        [[fallthrough]];
       case Z_BUF_ERROR:
         goto end_of_blob;
     }
@@ -680,11 +680,9 @@
 
   ut_a(local_len >= BTR_EXTERN_FIELD_REF_SIZE);
 
-#ifdef UNIV_DEBUG
   /* Verify if the LOB reference is sane. */
-  space_id_t space_id = ref.space_id();
+  ut_d(space_id_t space_id = ref.space_id());
   ut_ad(space_id == 0 || space_id == index->space);
-#endif /* UNIV_DEBUG */
 
   if (ref.is_null()) {
     /* The externally stored field was not written yet.
@@ -736,7 +734,7 @@
       }
 #endif /* !UNIV_DEBUG */
 
-      ib::fatal(ER_IB_MSG_631)
+      ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_631)
           << "FIL_PAGE_TYPE=" << type << " on BLOB "
           << (read ? "read" : "purge") << " space " << space_id << " page "
           << page_no << " flags " << flags;
@@ -907,32 +905,10 @@
   return (local_len + fetch_len);
 }
 
-/** Copies an externally stored field of a record to mem heap.
-The clustered index record must be protected by a lock or a page latch.
-@param[in]	trx		the current trx object or nullptr
-@param[in]	index		the clust index in which lob is read.
-@param[out]	len		length of the whole field
-@param[out]	lob_version	LOB version number.
-@param[in]	data		'internally' stored part of the field
-                                containing also the reference to the external
-                                part; must be protected by a lock or a page
-                                latch.
-@param[in]	page_size	BLOB page size
-@param[in]	local_len	length of data */
-#ifdef UNIV_DEBUG
-/**
-@param[in]	is_sdi		true for SDI Indexes */
-#endif /* UNIV_DEBUG */
-/**
-@param[in,out]	heap		mem heap
-@return the whole field copied to heap */
 byte *btr_copy_externally_stored_field_func(
     trx_t *trx, const dict_index_t *index, ulint *len, size_t *lob_version,
     const byte *data, const page_size_t &page_size, ulint local_len,
-#ifdef UNIV_DEBUG
-    bool is_sdi,
-#endif /* UNIV_DEBUG */
-    mem_heap_t *heap) {
+    IF_DEBUG(bool is_sdi, ) mem_heap_t *heap) {
   uint32_t extern_len;
   byte *buf;
 
@@ -952,12 +928,7 @@
   buf = (byte *)mem_heap_alloc(heap, local_len + extern_len);
 
   ReadContext rctx(page_size, data, local_len + BTR_EXTERN_FIELD_REF_SIZE,
-                   buf + local_len, extern_len
-#ifdef UNIV_DEBUG
-                   ,
-                   is_sdi
-#endif /* UNIV_DEBUG */
-  );
+                   buf + local_len, extern_len IF_DEBUG(, is_sdi));
 
   rctx.m_index = (dict_index_t *)index;
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/lob/lob0purge.cc mysql-8.0-8.0.27/storage/innobase/lob/lob0purge.cc
--- mysql-8.0-8.0.26/storage/innobase/lob/lob0purge.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/lob/lob0purge.cc	2021-09-28 11:46:34.000000000 +0000
@@ -278,14 +278,14 @@
 }
 
 /** Purge a compressed LOB.
-@param[in]	ctx	      the delete operation context information.
-@param[in]	index	      clustered index in which LOB is present
-@param[in]	trxid	      the transaction that is being purged.
-@param[in]	undo_no	      during rollback to savepoint, purge only upto
-                              this undo number.
-@param[in]	rec_type      undo record type.
-@param[in,out]  purge_node    if nullptr, free the complete LOB. Otherwise,
-                              save the first page of LOB in this purge node. */
+@param[in] ctx		              The delete operation context information.
+@param[in] index                Clustered index in which LOB is present
+@param[in] trxid                The transaction that is being purged.
+@param[in] undo_no              During rollback to savepoint, purge only upto
+                                this undo number.
+@param[in] rec_type	            Undo record type.
+@param[in,out] purge_node       if nullptr, free the complete LOB. Otherwise,
+                                save the first page of LOB in this purge node.*/
 static void z_purge(DeleteContext *ctx, dict_index_t *index, trx_id_t trxid,
                     undo_no_t undo_no, ulint rec_type,
                     purge_node_t *purge_node) {
@@ -337,6 +337,9 @@
       ref.set_length(0, nullptr);
       ctx->zblob_write_blobref(ctx->m_field_no, mtr);
     } else {
+      /* Only purge operation should reach this else block. */
+      ut_ad(purge_node != nullptr);
+
       /* Note that page_zip will be NULL in
       row_purge_upd_exist_or_extern(). */
       ref.set_page_no(FIL_NULL, mtr);
@@ -386,12 +389,14 @@
     node_loc = cur_entry.get_next();
     cur_entry.reset(nullptr);
 
+    ut_ad(!lob_mtr.conflicts_with(mtr));
     mtr_commit(&lob_mtr);
     mtr_start(&lob_mtr);
     lob_mtr.set_log_mode(mtr->get_log_mode());
     first.load_x(first_page_no);
   }
 
+  ut_ad(!lob_mtr.conflicts_with(mtr));
   mtr_commit(&lob_mtr);
 
   if (ctx->get_page_zip() != nullptr) {
diff -Nru mysql-8.0-8.0.26/storage/innobase/lob/lob0undo.cc mysql-8.0-8.0.27/storage/innobase/lob/lob0undo.cc
--- mysql-8.0-8.0.26/storage/innobase/lob/lob0undo.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/lob/lob0undo.cc	2021-09-28 11:46:34.000000000 +0000
@@ -73,7 +73,8 @@
 @return pointer past the old data. */
 const byte *undo_data_t::copy_old_data(const byte *undo_ptr, ulint len) {
   m_length = len;
-  m_old_data = UT_NEW_ARRAY_NOKEY(byte, m_length);
+  m_old_data =
+      ut::new_arr_withkey<byte>(UT_NEW_THIS_FILE_PSI_KEY, ut::Count{m_length});
   if (m_old_data == nullptr) {
     return (nullptr);
   }
@@ -84,7 +85,7 @@
 /** Free allocated memory for old data. */
 void undo_data_t::destroy() {
   if (m_old_data != nullptr) {
-    UT_DELETE_ARRAY(m_old_data);
+    ut::delete_arr(m_old_data);
     m_old_data = nullptr;
   }
 }
diff -Nru mysql-8.0-8.0.26/storage/innobase/lob/zlob0first.cc mysql-8.0-8.0.27/storage/innobase/lob/zlob0first.cc
--- mysql-8.0-8.0.26/storage/innobase/lob/zlob0first.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/lob/zlob0first.cc	2021-09-28 11:46:34.000000000 +0000
@@ -350,12 +350,16 @@
     z_frag_node_page_t frag_node_page(&local_mtr, m_index);
     frag_node_page.load_x(page_no);
     page_no_t next_page = frag_node_page.get_next_page_no();
-    set_frag_node_page_no(next_page);
+
+    /* Make all changes to the first page using local_mtr. */
+    set_frag_node_page_no(next_page, &local_mtr);
     frag_node_page.dealloc();
     n_pages_freed++;
 
+    ut_ad(!local_mtr.conflicts_with(m_mtr));
     restart_mtr(&local_mtr);
   }
+  ut_ad(!local_mtr.conflicts_with(m_mtr));
   mtr_commit(&local_mtr);
 
   return (n_pages_freed);
@@ -374,14 +378,19 @@
     if (page_no == FIL_NULL) {
       break;
     }
-    z_index_page_t index_page(m_mtr, m_index);
+    z_index_page_t index_page(&local_mtr, m_index);
     index_page.load_x(page_no);
     page_no_t next_page = index_page.get_next_page_no();
-    set_index_page_no(next_page);
+
+    /* Make all changes to the first page using local_mtr. */
+    set_index_page_no(next_page, &local_mtr);
+
     index_page.dealloc();
     n_pages_freed++;
+    ut_ad(!local_mtr.conflicts_with(m_mtr));
     restart_mtr(&local_mtr);
   }
+  ut_ad(!local_mtr.conflicts_with(m_mtr));
   mtr_commit(&local_mtr);
   return (n_pages_freed);
 }
@@ -498,6 +507,7 @@
       n_pages_freed += vers_entry.free_data_pages(&local_mtr);
       ver_loc = vers_entry.get_next();
 
+      ut_ad(!local_mtr.conflicts_with(m_mtr));
       restart_mtr(&local_mtr);
       node = addr2ptr_x(node_loc, &local_mtr);
       cur_entry.reset(node);
@@ -505,8 +515,10 @@
 
     node_loc = cur_entry.get_next();
     cur_entry.reset(nullptr);
+    ut_ad(!local_mtr.conflicts_with(m_mtr));
     restart_mtr(&local_mtr);
   }
+  ut_ad(!local_mtr.conflicts_with(m_mtr));
   mtr_commit(&local_mtr);
 
   return (n_pages_freed);
@@ -613,10 +625,12 @@
       /* Free the fragment page. */
       entry.free_frag_page(&local_mtr, m_index);
       n_pages_freed++;
+      ut_ad(!local_mtr.conflicts_with(m_mtr));
       restart_mtr(&local_mtr);
     }
   }
 
+  ut_ad(!local_mtr.conflicts_with(m_mtr));
   mtr_commit(&local_mtr);
   return (n_pages_freed);
 }
@@ -649,8 +663,10 @@
     set_frag_page_no(&local_mtr, next_page);
     frag_page.dealloc();
     n_pages_freed++;
+    ut_ad(!local_mtr.conflicts_with(m_mtr));
     restart_mtr(&local_mtr);
   }
+  ut_ad(!local_mtr.conflicts_with(m_mtr));
   mtr_commit(&local_mtr);
   return (n_pages_freed);
 }
diff -Nru mysql-8.0-8.0.26/storage/innobase/lock/lock0lock.cc mysql-8.0-8.0.27/storage/innobase/lock/lock0lock.cc
--- mysql-8.0-8.0.26/storage/innobase/lock/lock0lock.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/lock/lock0lock.cc	2021-09-28 11:46:34.000000000 +0000
@@ -182,10 +182,9 @@
 
 /** Validates the record lock queues on a page.
  @return true if ok */
-static bool lock_rec_validate_page(
-    const buf_block_t *block) /*!< in: buffer block */
-    MY_ATTRIBUTE((warn_unused_result));
-#endif /* UNIV_DEBUG */
+[[nodiscard]] static bool lock_rec_validate_page(
+    const buf_block_t *block); /*!< in: buffer block */
+#endif                         /* UNIV_DEBUG */
 
 /* The lock system */
 lock_sys_t *lock_sys = nullptr;
@@ -214,7 +213,7 @@
 #ifdef UNIV_DEBUG
 
 #else
-static MY_ATTRIBUTE((warn_unused_result))
+[[nodiscard]] static
 #endif
 bool lock_check_trx_id_sanity(
     trx_id_t trx_id,           /*!< in: trx id */
@@ -313,7 +312,8 @@
 
   lock_sys_sz = sizeof(*lock_sys) + srv_max_n_threads * sizeof(srv_slot_t);
 
-  lock_sys = static_cast<lock_sys_t *>(ut_zalloc_nokey(lock_sys_sz));
+  lock_sys = static_cast<lock_sys_t *>(
+      ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, lock_sys_sz));
 
   new (lock_sys) lock_sys_t{};
 
@@ -364,10 +364,10 @@
     TBD: if buf_resize_thread() were to use create_thd() then should it be
     instrumented (together or instead of os_thread_create instrumentation)? */
     ut_ad(current_thd == nullptr);
-    THD *thd = create_thd(false, true, true, PSI_NOT_INSTRUMENTED);
+    THD *thd = create_internal_thd();
     ut_ad(current_thd == thd);
     CONDITIONAL_SYNC_POINT("after_lock_sys_resize_rec_hash");
-    destroy_thd(thd);
+    destroy_internal_thd(thd);
     ut_ad(current_thd == nullptr);
   });
 
@@ -381,23 +381,6 @@
   HASH_MIGRATE(old_hash, lock_sys->prdt_page_hash, lock_t, hash,
                lock_rec_lock_fold);
   hash_table_free(old_hash);
-
-  /* need to update block->lock_hash_val */
-  for (ulint i = 0; i < srv_buf_pool_instances; ++i) {
-    buf_pool_t *buf_pool = buf_pool_from_array(i);
-
-    mutex_enter(&buf_pool->LRU_list_mutex);
-
-    for (auto bpage : buf_pool->LRU) {
-      if (buf_page_get_state(bpage) == BUF_BLOCK_FILE_PAGE) {
-        buf_block_t *block;
-        block = reinterpret_cast<buf_block_t *>(bpage);
-
-        block->lock_hash_val = lock_rec_hash(bpage->id);
-      }
-    }
-    mutex_exit(&buf_pool->LRU_list_mutex);
-  }
 }
 
 /** Closes the lock system at database shutdown. */
@@ -423,13 +406,13 @@
     }
   }
   for (auto &cached_lock_mode_name : lock_cached_lock_mode_names) {
-    ut_free(const_cast<char *>(cached_lock_mode_name.second));
+    ut::free(const_cast<char *>(cached_lock_mode_name.second));
   }
   lock_cached_lock_mode_names.clear();
 
   lock_sys->~lock_sys_t();
 
-  ut_free(lock_sys);
+  ut::free(lock_sys);
 
   lock_sys = nullptr;
 }
@@ -4933,31 +4916,33 @@
 
     trx_id = lock_clust_rec_some_has_impl(rec, index, offsets);
 
-    Trx_shard_latch_guard guard{trx_id, UT_LOCATION_HERE};
-
-    const trx_t *impl_trx = trx_rw_is_active_low(trx_id);
-    if (impl_trx != nullptr) {
-      ut_ad(owns_page_shard(block->get_page_id()));
-      /* impl_trx cannot become TRX_STATE_COMMITTED_IN_MEMORY nor removed from
-      rw_trx_set until we release Trx_shard's mutex, which means that currently
-      all other threads in the system consider this impl_trx active and thus
-      should respect implicit locks held by impl_trx*/
-
-      const lock_t *other_lock =
-          lock_rec_other_has_expl_req(LOCK_S, block, true, heap_no, impl_trx);
-
-      /* The impl_trx is holding an implicit lock on the
-      given record 'rec'. So there cannot be another
-      explicit granted lock.  Also, there can be another
-      explicit waiting lock only if the impl_trx has an
-      explicit granted lock. */
-
-      if (other_lock != nullptr) {
-        ut_a(lock_get_wait(other_lock));
-        ut_a(lock_rec_has_expl(LOCK_X | LOCK_REC_NOT_GAP, block, heap_no,
-                               impl_trx));
-      }
-    }
+    trx_sys->latch_and_execute_with_active_trx(
+        trx_id,
+        [&](const trx_t *impl_trx) {
+          if (impl_trx != nullptr) {
+            ut_ad(owns_page_shard(block->get_page_id()));
+            /* impl_trx cannot become TRX_STATE_COMMITTED_IN_MEMORY nor removed
+            from active_rw_trxs.by_id until we release Trx_shard's mutex, which
+            means that currently all other threads in the system consider this
+            impl_trx active and thus should respect implicit locks held by
+            impl_trx*/
+
+            const lock_t *other_lock = lock_rec_other_has_expl_req(
+                LOCK_S, block, true, heap_no, impl_trx);
+
+            /* The impl_trx is holding an implicit lock on the given 'rec'.
+            So there cannot be another explicit granted lock. Also, there can
+            be another explicit waiting lock only if the impl_trx has an
+            explicit granted lock. */
+
+            if (other_lock != nullptr) {
+              ut_a(lock_get_wait(other_lock));
+              ut_a(lock_rec_has_expl(LOCK_X | LOCK_REC_NOT_GAP, block, heap_no,
+                                     impl_trx));
+            }
+          }
+        },
+        UT_LOCATION_HERE);
   }
 
   Lock_iter::for_each(rec_id, [&](lock_t *lock) {
@@ -5132,7 +5117,7 @@
 }
 
 bool lock_validate() {
-  typedef std::set<page_id_t, std::less<page_id_t>, ut_allocator<page_id_t>>
+  typedef std::set<page_id_t, std::less<page_id_t>, ut::allocator<page_id_t>>
       page_addr_set;
 
   page_addr_set pages;
@@ -5253,7 +5238,7 @@
   switch (err) {
     case DB_SUCCESS_LOCKED_REC:
       err = DB_SUCCESS;
-      /* fall through */
+      [[fallthrough]];
     case DB_SUCCESS:
       if (!inherit_in || index->is_clustered()) {
         break;
@@ -5386,7 +5371,7 @@
                                           const rec_t *rec, dict_index_t *index,
                                           const ulint *offsets, trx_t *trx,
                                           ulint heap_no) {
-  trx_reference(trx, true);
+  trx_reference(trx);
   lock_rec_convert_impl_to_expl_for_trx(block, rec, index, offsets, trx,
                                         heap_no);
 }
@@ -5605,10 +5590,10 @@
 
     MONITOR_INC(MONITOR_NUM_RECLOCK_REQ);
   }
+  DEBUG_SYNC_C("after_lock_clust_rec_read_check_and_lock");
 
   ut_d(locksys::rec_queue_latch_and_validate(block, rec, index, offsets));
 
-  DEBUG_SYNC_C("after_lock_clust_rec_read_check_and_lock");
   ut_ad(err == DB_SUCCESS || err == DB_SUCCESS_LOCKED_REC ||
         err == DB_LOCK_WAIT || err == DB_DEADLOCK || err == DB_SKIP_LOCKED ||
         err == DB_LOCK_NOWAIT);
@@ -5839,7 +5824,8 @@
     return "UNKNOWN";
   }
   auto name_string = name_stream.str();
-  char *name_buffer = (char *)ut_malloc_nokey(name_string.length() + 1);
+  char *name_buffer = (char *)ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY,
+                                                 name_string.length() + 1);
   strcpy(name_buffer, name_string.c_str());
   lock_cached_lock_mode_names[key] = name_buffer;
   return (name_buffer);
@@ -6377,7 +6363,8 @@
   constructed, but how can we (the lock-sys) "know" about it and why risk? */
   trx_mutex_enter(trx);
   ulint sz = REC_LOCK_SIZE * REC_LOCK_CACHE;
-  byte *ptr = reinterpret_cast<byte *>(ut_malloc_nokey(sz));
+  byte *ptr = reinterpret_cast<byte *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sz));
 
   /* We allocate one big chunk and then distribute it among
   the rest of the elements. The allocated chunk pointer is always
@@ -6388,7 +6375,8 @@
   }
 
   sz = TABLE_LOCK_SIZE * TABLE_LOCK_CACHE;
-  ptr = reinterpret_cast<byte *>(ut_malloc_nokey(sz));
+  ptr = reinterpret_cast<byte *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sz));
 
   for (ulint i = 0; i < TABLE_LOCK_CACHE; ++i, ptr += TABLE_LOCK_SIZE) {
     trx->lock.table_pool.push_back(reinterpret_cast<ib_lock_t *>(ptr));
diff -Nru mysql-8.0-8.0.26/storage/innobase/lock/lock0prdt.cc mysql-8.0-8.0.27/storage/innobase/lock/lock0prdt.cc
--- mysql-8.0-8.0.26/storage/innobase/lock/lock0prdt.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/lock/lock0prdt.cc	2021-09-28 11:46:34.000000000 +0000
@@ -502,7 +502,7 @@
   switch (err) {
     case DB_SUCCESS_LOCKED_REC:
       err = DB_SUCCESS;
-      /* fall through */
+      [[fallthrough]];
     case DB_SUCCESS:
       /* Update the page max trx id field */
       page_update_max_trx_id(block, buf_block_get_page_zip(block), trx->id,
diff -Nru mysql-8.0-8.0.26/storage/innobase/log/log0ddl.cc mysql-8.0-8.0.27/storage/innobase/log/log0ddl.cc
--- mysql-8.0-8.0.26/storage/innobase/log/log0ddl.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/log/log0ddl.cc	2021-09-28 11:46:34.000000000 +0000
@@ -650,7 +650,7 @@
       continue;
     }
 
-    DDL_Record *record = UT_NEW_NOKEY(DDL_Record());
+    DDL_Record *record = ut::new_withkey<DDL_Record>(UT_NEW_THIS_FILE_PSI_KEY);
     convert_to_ddl_record(index->is_clustered(), rec, offsets, *record);
     records.push_back(record);
   }
@@ -676,7 +676,7 @@
   }
 
   for (auto record : records_of_thread_id) {
-    UT_DELETE(record);
+    ut::delete_(record);
   }
 
   return (error);
@@ -714,7 +714,7 @@
       continue;
     }
 
-    DDL_Record *record = UT_NEW_NOKEY(DDL_Record());
+    DDL_Record *record = ut::new_withkey<DDL_Record>(UT_NEW_THIS_FILE_PSI_KEY);
     convert_to_ddl_record(index->is_clustered(), rec, offsets, *record);
     records.push_back(record);
   }
@@ -1162,7 +1162,7 @@
 }
 
 dberr_t Log_DDL::write_alter_encrypt_space_log(space_id_t space_id,
-                                               encryption_op_type type,
+                                               Encryption::Progress type,
                                                DDL_Record *existing_rec) {
   /* Missing current_thd, it happens during crash recovery */
   if (!current_thd) {
@@ -1207,24 +1207,22 @@
 
 dberr_t Log_DDL::insert_alter_encrypt_space_log(uint64_t id, ulint thread_id,
                                                 space_id_t space_id,
-                                                encryption_op_type type,
+                                                Encryption::Progress type,
                                                 DDL_Record *existing_rec) {
   dberr_t err = DB_SUCCESS;
   trx_t *trx = trx_allocate_for_background();
   trx_start_internal(trx);
   trx->ddl_operation = true;
 
-  ut_ad(type == ENCRYPTION || type == DECRYPTION);
-
   DDL_Record record;
   record.set_id(id);
   record.set_thread_id(thread_id);
-  if (type == ENCRYPTION) {
+
+  if (type == Encryption::Progress::ENCRYPTION) {
     record.set_type(Log_Type::ALTER_ENCRYPT_TABLESPACE_LOG);
-  } else if (type == DECRYPTION) {
-    record.set_type(Log_Type::ALTER_UNENCRYPT_TABLESPACE_LOG);
   } else {
-    ut_ad(false);
+    ut_ad(type == Encryption::Progress::DECRYPTION);
+    record.set_type(Log_Type::ALTER_UNENCRYPT_TABLESPACE_LOG);
   }
   record.set_space_id(space_id);
 
@@ -1495,7 +1493,7 @@
 
   for (auto record : records) {
     if (record->get_deletable()) {
-      UT_DELETE(record);
+      ut::delete_(record);
     }
   }
 
@@ -1526,7 +1524,7 @@
 
   for (auto record : records) {
     if (record->get_deletable()) {
-      UT_DELETE(record);
+      ut::delete_(record);
     }
   }
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/log/log0log.cc mysql-8.0-8.0.27/storage/innobase/log/log0log.cc
--- mysql-8.0-8.0.26/storage/innobase/log/log0log.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/log/log0log.cc	2021-09-28 11:46:34.000000000 +0000
@@ -497,7 +497,8 @@
   need to forbid dtor calls then. */
 
   using log_t_aligned_pointer = std::decay_t<decltype(*log_sys_object)>;
-  log_sys_object = UT_NEW_NOKEY(log_t_aligned_pointer{});
+  log_sys_object =
+      ut::new_withkey<log_t_aligned_pointer>(UT_NEW_THIS_FILE_PSI_KEY);
   log_sys_object->alloc();
 
   log_sys = *log_sys_object;
@@ -553,8 +554,8 @@
 #endif /* UNIV_PFS_RWLOCK */
 #ifdef UNIV_DEBUG
   /* initialize rw_lock without pfs_psi */
-  log.sn_lock_inst =
-      static_cast<rw_lock_t *>(ut_zalloc_nokey(sizeof(*log.sn_lock_inst)));
+  log.sn_lock_inst = static_cast<rw_lock_t *>(
+      ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sizeof(*log.sn_lock_inst)));
   new (log.sn_lock_inst) rw_lock_t;
   rw_lock_create_func(log.sn_lock_inst, SYNC_LOG_SN, "log.sn_lock_inst",
                       __FILE__, __LINE__);
@@ -683,7 +684,7 @@
 
 #ifdef UNIV_DEBUG
   rw_lock_free_func(log.sn_lock_inst);
-  ut_free(log.sn_lock_inst);
+  ut::free(log.sn_lock_inst);
   log.sn_lock_inst = nullptr;
 #endif /* UNIV_DEBUG */
 #ifdef UNIV_PFS_RWLOCK
@@ -713,7 +714,7 @@
   os_event_destroy(log.sn_lock_event);
 
   log_sys_object->dealloc();
-  UT_DELETE(log_sys_object);
+  ut::delete_(log_sys_object);
   log_sys_object = nullptr;
 
   log_sys = nullptr;
@@ -769,19 +770,19 @@
   log.writer_threads_paused.store(false);
 
   srv_threads.m_log_checkpointer =
-      os_thread_create(log_checkpointer_thread_key, log_checkpointer, &log);
+      os_thread_create(log_checkpointer_thread_key, 0, log_checkpointer, &log);
 
-  srv_threads.m_log_flush_notifier =
-      os_thread_create(log_flush_notifier_thread_key, log_flush_notifier, &log);
+  srv_threads.m_log_flush_notifier = os_thread_create(
+      log_flush_notifier_thread_key, 0, log_flush_notifier, &log);
 
   srv_threads.m_log_flusher =
-      os_thread_create(log_flusher_thread_key, log_flusher, &log);
+      os_thread_create(log_flusher_thread_key, 0, log_flusher, &log);
 
-  srv_threads.m_log_write_notifier =
-      os_thread_create(log_write_notifier_thread_key, log_write_notifier, &log);
+  srv_threads.m_log_write_notifier = os_thread_create(
+      log_write_notifier_thread_key, 0, log_write_notifier, &log);
 
   srv_threads.m_log_writer =
-      os_thread_create(log_writer_thread_key, log_writer, &log);
+      os_thread_create(log_writer_thread_key, 0, log_writer, &log);
 
   srv_threads.m_log_checkpointer.start();
   srv_threads.m_log_flush_notifier.start();
@@ -1040,7 +1041,8 @@
   }
 
   /* Save the contents. */
-  byte *tmp_buf = UT_NEW_ARRAY_NOKEY(byte, end_lsn - start_lsn);
+  byte *tmp_buf = ut::new_arr_withkey<byte>(UT_NEW_THIS_FILE_PSI_KEY,
+                                            ut::Count(end_lsn - start_lsn));
   for (auto i = start_lsn; i < end_lsn; i += OS_FILE_LOG_BLOCK_SIZE) {
     std::memcpy(&tmp_buf[i - start_lsn], &log.buf[i % log.buf_size],
                 OS_FILE_LOG_BLOCK_SIZE);
@@ -1056,7 +1058,7 @@
     std::memcpy(&log.buf[i % new_size], &tmp_buf[i - start_lsn],
                 OS_FILE_LOG_BLOCK_SIZE);
   }
-  UT_DELETE_ARRAY(tmp_buf);
+  ut::delete_arr(tmp_buf);
 
   log_calc_buf_size(log);
 
@@ -1166,7 +1168,8 @@
   ut_a((n & (n - 1)) == 0);
 
   log.flush_events_size = n;
-  log.flush_events = UT_NEW_ARRAY_NOKEY(os_event_t, n);
+  log.flush_events =
+      ut::new_arr_withkey<os_event_t>(UT_NEW_THIS_FILE_PSI_KEY, ut::Count{n});
 
   for (size_t i = 0; i < log.flush_events_size; ++i) {
     log.flush_events[i] = os_event_create();
@@ -1180,7 +1183,7 @@
     os_event_destroy(log.flush_events[i]);
   }
 
-  UT_DELETE_ARRAY(log.flush_events);
+  ut::delete_arr(log.flush_events);
   log.flush_events = nullptr;
 }
 
@@ -1192,7 +1195,8 @@
   ut_a((n & (n - 1)) == 0);
 
   log.write_events_size = n;
-  log.write_events = UT_NEW_ARRAY_NOKEY(os_event_t, n);
+  log.write_events =
+      ut::new_arr_withkey<os_event_t>(UT_NEW_THIS_FILE_PSI_KEY, ut::Count{n});
 
   for (size_t i = 0; i < log.write_events_size; ++i) {
     log.write_events[i] = os_event_create();
@@ -1206,7 +1210,7 @@
     os_event_destroy(log.write_events[i]);
   }
 
-  UT_DELETE_ARRAY(log.write_events);
+  ut::delete_arr(log.write_events);
   log.write_events = nullptr;
 }
 
@@ -1231,7 +1235,8 @@
   const uint32_t n_files = log.n_files;
 
   using Buf_ptr = ut::aligned_array_pointer<byte, OS_FILE_LOG_BLOCK_SIZE>;
-  log.file_header_bufs = UT_NEW_ARRAY_NOKEY(Buf_ptr, n_files);
+  log.file_header_bufs = ut::new_arr_withkey<Buf_ptr>(UT_NEW_THIS_FILE_PSI_KEY,
+                                                      ut::Count{n_files});
 
   for (uint32_t i = 0; i < n_files; i++) {
     log.file_header_bufs[i].alloc(LOG_FILE_HDR_SIZE);
@@ -1242,7 +1247,7 @@
   ut_a(log.n_files > 0);
   ut_a(log.file_header_bufs != nullptr);
 
-  UT_DELETE_ARRAY(log.file_header_bufs);
+  ut::delete_arr(log.file_header_bufs);
   log.file_header_bufs = nullptr;
 }
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/log/log0meb.cc mysql-8.0-8.0.27/storage/innobase/log/log0meb.cc
--- mysql-8.0-8.0.26/storage/innobase/log/log0meb.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/log/log0meb.cc	2021-09-28 11:46:34.000000000 +0000
@@ -56,7 +56,11 @@
 #include "ut0new.h"
 
 namespace meb {
-const std::string logmsgpfx("innodb_redo_log_archive: ");
+constexpr const char *innodb_redo_log_archive_privilege{
+    "INNODB_REDO_LOG_ARCHIVE"};
+constexpr const char *backup_admin_privilege{"BACKUP_ADMIN"};
+constexpr const char *logmsgpfx{"innodb_redo_log_archive: "};
+#define LOGMSGPFX std::string(logmsgpfx)
 constexpr size_t QUEUE_BLOCK_SIZE = 4096;
 constexpr size_t QUEUE_SIZE_MAX = 16384;
 
@@ -98,9 +102,7 @@
 
       @retval byte[] The byte array of size  QUEUE_BLOCK_SIZE in this
       object. */
-  const byte *get_queue_block() const MY_ATTRIBUTE((warn_unused_result)) {
-    return m_block;
-  }
+  [[nodiscard]] const byte *get_queue_block() const { return m_block; }
 
   /** Copy a log block from the given position inside the input byte array. Note
       that a complete log block is of size OS_FILE_LOG_BLOCK_SIZE. A log block
@@ -115,8 +117,7 @@
       @retval true if a complete redo log block (multiple of
                    OS_FILE_LOG_BLOCK_SIZE) was copied.
       @retval false otherwise. */
-  bool put_log_block(const byte block[], const size_t pos)
-      MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] bool put_log_block(const byte block[], const size_t pos) {
     ut_ad(!full());
 
     size_t size = log_block_get_data_len(block + pos);
@@ -140,9 +141,7 @@
 
       @retval true if the is_final_block flag is true.
               false if the is_final_block flag is false. */
-  bool get_is_final_block() const MY_ATTRIBUTE((warn_unused_result)) {
-    return m_is_final_block;
-  }
+  [[nodiscard]] bool get_is_final_block() const { return m_is_final_block; }
 
   /** Set the is_final_block flag.
 
@@ -161,7 +160,7 @@
 
       @retval true if the log block has QUEUE_BLOCK_SIZE bytes.
       @retval false otherwise. */
-  bool full() const MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] bool full() const {
     return (m_offset > QUEUE_BLOCK_SIZE - OS_FILE_LOG_BLOCK_SIZE);
   }
 
@@ -517,7 +516,7 @@
     /* purecov: begin inspected */
     LogErr(
         ERROR_LEVEL, ER_INNODB_ERROR_LOGGER_MSG,
-        (logmsgpfx + "mysql_plugin_registry_acquire() returns NULL").c_str());
+        (LOGMSGPFX + "mysql_plugin_registry_acquire() returns NULL").c_str());
     return true;
     /* purecov: end */
   }
@@ -531,7 +530,7 @@
     if (reg_priv->register_privilege(priv_name, strlen(priv_name))) {
       /* purecov: begin inspected */
       LogErr(ERROR_LEVEL, ER_INNODB_ERROR_LOGGER_MSG,
-             (logmsgpfx + "cannot register privilege '" + priv_name + "'")
+             (LOGMSGPFX + "cannot register privilege '" + priv_name + "'")
                  .c_str());
       failed = true;
       /* purecov: end */
@@ -565,7 +564,7 @@
   redo_log_archive_file_handle.m_file = OS_FILE_CLOSED;
   redo_log_archive_queue.create();
   bool failed = false;
-  if (register_privilege("INNODB_REDO_LOG_ARCHIVE")) {
+  if (register_privilege(innodb_redo_log_archive_privilege)) {
     failed = true;
   } else if (register_udfs()) {
     failed = true;
@@ -599,7 +598,7 @@
     redo_log_archive_recorded_error.append(
         "Consumer thread did not terminate properly");
     LogErr(INFORMATION_LEVEL, ER_INNODB_ERROR_LOGGER_MSG,
-           (logmsgpfx + redo_log_archive_recorded_error).c_str());
+           (LOGMSGPFX + redo_log_archive_recorded_error).c_str());
     if (terminate_consumer(/*rapid*/ true) && !force) {
       return true;
     }
@@ -666,9 +665,9 @@
   @param[in]	value     incoming string
   @return 0 for valid contents
 */
-int validate_redo_log_archive_dirs(THD *thd MY_ATTRIBUTE((unused)),
-                                   SYS_VAR *var MY_ATTRIBUTE((unused)),
-                                   void *save, struct st_mysql_value *value) {
+int validate_redo_log_archive_dirs(THD *thd [[maybe_unused]],
+                                   SYS_VAR *var [[maybe_unused]], void *save,
+                                   struct st_mysql_value *value) {
   ut_a(save != nullptr);
   ut_a(value != nullptr);
   char buff[STRING_BUFFER_USUAL_SIZE];
@@ -714,13 +713,14 @@
 }
 
 /**
-  Verify that thd has the INNODB_REDO_LOG_ARCHIVE privilege.
+  Verify that thd has a certain privilege.
   @param[in,out]  thd           current THD instance, current session
+  @param[in]      priv_name     name of the required privilege
   @return         status
-    @retval       false         success
-    @retval       true          failure
+    @retval       false         privilege is granted
+    @retval       true          privilege is denied
 */
-static bool verify_redo_log_archive_privilege(THD *thd) {
+static bool verify_privilege(THD *thd, const char *priv_name) {
   DBUG_TRACE;
   if (thd == nullptr) {
     /* service interface does not allow this. */
@@ -730,9 +730,8 @@
     /* purecov: end */
   }
   auto sctx = thd->security_context();
-  const char privilege[]{"INNODB_REDO_LOG_ARCHIVE"};
-  if (!(sctx->has_global_grant(STRING_WITH_LEN(privilege)).first)) {
-    my_error(ER_SPECIFIC_ACCESS_DENIED_ERROR, MYF(0), privilege);
+  if (!(sctx->has_global_grant(priv_name, strlen(priv_name)).first)) {
+    my_error(ER_SPECIFIC_ACCESS_DENIED_ERROR, MYF(0), priv_name);
     return true;
   }
   return false;
@@ -793,7 +792,7 @@
   DBUG_PRINT("redo_log_archive", ("dir: '%s'", dir->c_str()));
 #ifdef DEBUG_REDO_LOG_ARCHIVE_EXTRA_LOG
   LogErr(INFORMATION_LEVEL, ER_INNODB_ERROR_LOGGER_MSG,
-         (logmsgpfx + "selected dir '" + dir + "'").c_str());
+         (LOGMSGPFX + "selected dir '" + dir + "'").c_str());
 #endif /* DEBUG_REDO_LOG_ARCHIVE_EXTRA_LOG */
   return false;
 }
@@ -921,7 +920,7 @@
 #endif /* DEBUG_REDO_LOG_ARCHIVE_EXTRA */
 #ifdef DEBUG_REDO_LOG_ARCHIVE_EXTRA_LOG
   LogErr(INFORMATION_LEVEL, ER_INNODB_ERROR_LOGGER_MSG,
-         (logmsgpfx + "compare '" + target + "'").c_str());
+         (LOGMSGPFX + "compare '" + target + "'").c_str());
 #endif /* DEBUG_REDO_LOG_ARCHIVE_EXTRA_LOG */
 
   for (int idx = 0; idx < int(std::min(variables.size(), directories.size()));
@@ -954,7 +953,7 @@
 #endif /* DEBUG_REDO_LOG_ARCHIVE_EXTRA */
 #ifdef DEBUG_REDO_LOG_ARCHIVE_EXTRA_LOG
     LogErr(INFORMATION_LEVEL, ER_INNODB_ERROR_LOGGER_MSG,
-           (logmsgpfx + "with    '" + compare + "'").c_str());
+           (LOGMSGPFX + "with    '" + compare + "'").c_str());
 #endif /* DEBUG_REDO_LOG_ARCHIVE_EXTRA_LOG */
     if (((compare_len == target_len) ||
          ((compare_len < target_len) &&
@@ -969,7 +968,7 @@
     ) {
 #ifdef DEBUG_REDO_LOG_ARCHIVE_EXTRA_LOG
       LogErr(INFORMATION_LEVEL, ER_INNODB_ERROR_LOGGER_MSG,
-             (logmsgpfx + "match").c_str());
+             (LOGMSGPFX + "match").c_str());
 #endif /* DEBUG_REDO_LOG_ARCHIVE_EXTRA_LOG */
       my_error(ER_INNODB_REDO_LOG_ARCHIVE_DIR_CLASH, MYF(0), path(),
                variables[idx].c_str(), compare_path());
@@ -978,7 +977,7 @@
   }
 #ifdef DEBUG_REDO_LOG_ARCHIVE_EXTRA_LOG
   LogErr(INFORMATION_LEVEL, ER_INNODB_ERROR_LOGGER_MSG,
-         (logmsgpfx + "no match").c_str());
+         (LOGMSGPFX + "no match").c_str());
 #endif /* DEBUG_REDO_LOG_ARCHIVE_EXTRA_LOG */
   return false;
 }
@@ -1068,7 +1067,7 @@
     directory.append(subdir);
 #ifdef DEBUG_REDO_LOG_ARCHIVE_EXTRA_LOG
     LogErr(INFORMATION_LEVEL, ER_INNODB_ERROR_LOGGER_MSG,
-           (logmsgpfx + "subdir path '" + directory + "'").c_str());
+           (LOGMSGPFX + "subdir path '" + directory + "'").c_str());
 #endif /* DEBUG_REDO_LOG_ARCHIVE_EXTRA_LOG */
   }
 
@@ -1161,7 +1160,7 @@
     redo_log_archive_recorded_error.append(
         "Termination of the consumer thread timed out");
     LogErr(INFORMATION_LEVEL, ER_INNODB_ERROR_LOGGER_MSG,
-           (logmsgpfx + redo_log_archive_recorded_error).c_str());
+           (LOGMSGPFX + redo_log_archive_recorded_error).c_str());
     my_error(ER_INNODB_REDO_LOG_ARCHIVE_FAILED, MYF(0),
              redo_log_archive_recorded_error.c_str());
     return true;
@@ -1182,7 +1181,7 @@
                                   (label == nullptr) ? "[NULL]" : label,
                                   (subdir == nullptr) ? "[NULL]" : subdir));
   /* Security measure: Require the redo log archive privilege. */
-  if (verify_redo_log_archive_privilege(thd)) {
+  if (verify_privilege(thd, innodb_redo_log_archive_privilege)) {
     return true;
   }
 
@@ -1303,7 +1302,7 @@
   redo_log_archive_active = true;
 
   srv_threads.m_backup_log_archiver = os_thread_create(
-      redo_log_archive_consumer_thread_key, redo_log_archive_consumer);
+      redo_log_archive_consumer_thread_key, 0, redo_log_archive_consumer);
 
   mutex_exit(&redo_log_archive_admin_mutex);
 
@@ -1369,7 +1368,7 @@
   /*
     Security measure: Require the redo log archive privilege.
   */
-  if (verify_redo_log_archive_privilege(thd)) {
+  if (verify_privilege(thd, innodb_redo_log_archive_privilege)) {
     return true;
   }
 
@@ -1492,7 +1491,7 @@
   /*
     Security measure: Require the redo log archive privilege.
   */
-  if (verify_redo_log_archive_privilege(thd)) {
+  if (verify_privilege(thd, innodb_redo_log_archive_privilege)) {
     return true;
   }
 
@@ -1558,7 +1557,7 @@
     redo_log_archive_recorded_error.append(
         "Flushing of the archive log timed out");
     LogErr(INFORMATION_LEVEL, ER_INNODB_ERROR_LOGGER_MSG,
-           (logmsgpfx + redo_log_archive_recorded_error).c_str());
+           (LOGMSGPFX + redo_log_archive_recorded_error).c_str());
     my_error(ER_INNODB_REDO_LOG_ARCHIVE_FAILED, MYF(0),
              redo_log_archive_recorded_error.c_str());
     mutex_exit(&redo_log_archive_admin_mutex);
@@ -1609,7 +1608,7 @@
 
     if (stop_required && (thd != nullptr)) {
       LogErr(INFORMATION_LEVEL, ER_INNODB_ERROR_LOGGER_MSG,
-             (logmsgpfx + "Unexpected termination of the session that started"
+             (LOGMSGPFX + "Unexpected termination of the session that started"
                           " redo log archiving. Stopping redo log archiving.")
                  .c_str());
       if (redo_log_archive_stop(thd)) {
@@ -1725,7 +1724,7 @@
       os_event_set(redo_log_archive_consume_event);
     }
     LogErr(INFORMATION_LEVEL, ER_INNODB_ERROR_LOGGER_MSG,
-           (logmsgpfx + "Redo log archiving consumer thread refuses to start"
+           (LOGMSGPFX + "Redo log archiving consumer thread refuses to start"
                         " - another one is running")
                .c_str());
     mutex_exit(&redo_log_archive_admin_mutex);
@@ -1756,7 +1755,7 @@
       os_event_set(redo_log_archive_consume_event); /* purecov: inspected */
     }
     LogErr(INFORMATION_LEVEL, ER_INNODB_ERROR_LOGGER_MSG,
-           (logmsgpfx +
+           (LOGMSGPFX +
             "Redo log archiving consumer thread sees completion at start"
             " - terminating")
                .c_str());
@@ -1798,7 +1797,7 @@
         }
         redo_log_archive_recorded_error.append(recorded_error_ss.str());
         LogErr(ERROR_LEVEL, ER_INNODB_ERROR_LOGGER_MSG,
-               (logmsgpfx + recorded_error_ss.str()).c_str());
+               (LOGMSGPFX + recorded_error_ss.str()).c_str());
         /* Setting this flag prevents from entering the below loop. */
         redo_log_archive_consume_complete = true;
         /* purecov: end */
@@ -1886,7 +1885,7 @@
             os_event_set(redo_log_archive_consume_event);
           }
           LogErr(INFORMATION_LEVEL, ER_INNODB_ERROR_LOGGER_MSG,
-                 (logmsgpfx + "Flushed redo log archive").c_str());
+                 (LOGMSGPFX + "Flushed redo log archive").c_str());
         } else {
           file_offset += QUEUE_BLOCK_SIZE;
         }
@@ -1922,7 +1921,7 @@
     redo_log_archive_recorded_error.append(
         " - stopped redo log archiving and deleted the file.");
     LogErr(INFORMATION_LEVEL, ER_INNODB_ERROR_LOGGER_MSG,
-           (logmsgpfx + redo_log_archive_recorded_error).c_str());
+           (LOGMSGPFX + redo_log_archive_recorded_error).c_str());
     /* purecov: end */
   }
   mutex_exit(&redo_log_archive_admin_mutex);
@@ -1934,7 +1933,7 @@
 
   See include/mysql/udf_registration_types.h
 */
-bool innodb_redo_log_archive_start_init(UDF_INIT *initid MY_ATTRIBUTE((unused)),
+bool innodb_redo_log_archive_start_init(UDF_INIT *initid [[maybe_unused]],
                                         UDF_ARGS *args, char *message) {
   if ((args->arg_count < 1) || (args->arg_count > 2)) {
     strncpy(message, "Invalid number of arguments.", MYSQL_ERRMSG_SIZE);
@@ -1960,8 +1959,7 @@
 
   See include/mysql/udf_registration_types.h
 */
-void innodb_redo_log_archive_start_deinit(
-    UDF_INIT *initid MY_ATTRIBUTE((unused))) {
+void innodb_redo_log_archive_start_deinit(UDF_INIT *initid [[maybe_unused]]) {
   return;
 }
 
@@ -1983,10 +1981,11 @@
 
   Returns zero on success, one otherwise.
 */
-long long innodb_redo_log_archive_start(
-    UDF_INIT *initid MY_ATTRIBUTE((unused)), UDF_ARGS *args,
-    unsigned char *null_value MY_ATTRIBUTE((unused)),
-    unsigned char *error MY_ATTRIBUTE((unused))) {
+long long innodb_redo_log_archive_start(UDF_INIT *initid [[maybe_unused]],
+                                        UDF_ARGS *args,
+                                        unsigned char *null_value
+                                        [[maybe_unused]],
+                                        unsigned char *error [[maybe_unused]]) {
   return static_cast<long long>(meb::redo_log_archive_start(
       current_thd, args->args[0],
       (args->arg_count == 2) ? args->args[1] : nullptr));
@@ -1997,7 +1996,7 @@
 
   See include/mysql/udf_registration_types.h
 */
-bool innodb_redo_log_archive_stop_init(UDF_INIT *initid MY_ATTRIBUTE((unused)),
+bool innodb_redo_log_archive_stop_init(UDF_INIT *initid [[maybe_unused]],
                                        UDF_ARGS *args, char *message) {
   if (args->arg_count != 0) {
     strncpy(message, "Invalid number of arguments.", MYSQL_ERRMSG_SIZE);
@@ -2011,8 +2010,7 @@
 
   See include/mysql/udf_registration_types.h
 */
-void innodb_redo_log_archive_stop_deinit(
-    UDF_INIT *initid MY_ATTRIBUTE((unused))) {
+void innodb_redo_log_archive_stop_deinit(UDF_INIT *initid [[maybe_unused]]) {
   return;
 }
 
@@ -2028,11 +2026,11 @@
 
   Returns zero on success, one otherwise.
 */
-long long innodb_redo_log_archive_stop(
-    UDF_INIT *initid MY_ATTRIBUTE((unused)),
-    UDF_ARGS *args MY_ATTRIBUTE((unused)),
-    unsigned char *null_value MY_ATTRIBUTE((unused)),
-    unsigned char *error MY_ATTRIBUTE((unused))) {
+long long innodb_redo_log_archive_stop(UDF_INIT *initid [[maybe_unused]],
+                                       UDF_ARGS *args [[maybe_unused]],
+                                       unsigned char *null_value
+                                       [[maybe_unused]],
+                                       unsigned char *error [[maybe_unused]]) {
   return static_cast<long long>(meb::redo_log_archive_stop(current_thd));
 }
 
@@ -2041,7 +2039,7 @@
 
   See include/mysql/udf_registration_types.h
 */
-bool innodb_redo_log_archive_flush_init(UDF_INIT *initid MY_ATTRIBUTE((unused)),
+bool innodb_redo_log_archive_flush_init(UDF_INIT *initid [[maybe_unused]],
                                         UDF_ARGS *args, char *message) {
   if (args->arg_count != 0) {
     strncpy(message, "Invalid number of arguments.", MYSQL_ERRMSG_SIZE);
@@ -2055,8 +2053,7 @@
 
   See include/mysql/udf_registration_types.h
 */
-void innodb_redo_log_archive_flush_deinit(
-    UDF_INIT *initid MY_ATTRIBUTE((unused))) {
+void innodb_redo_log_archive_flush_deinit(UDF_INIT *initid [[maybe_unused]]) {
   return;
 }
 
@@ -2072,15 +2069,70 @@
 
   Returns zero on success, one otherwise.
 */
-long long innodb_redo_log_archive_flush(
-    UDF_INIT *initid MY_ATTRIBUTE((unused)),
-    UDF_ARGS *args MY_ATTRIBUTE((unused)),
-    unsigned char *null_value MY_ATTRIBUTE((unused)),
-    unsigned char *error MY_ATTRIBUTE((unused))) {
+long long innodb_redo_log_archive_flush(UDF_INIT *initid [[maybe_unused]],
+                                        UDF_ARGS *args [[maybe_unused]],
+                                        unsigned char *null_value
+                                        [[maybe_unused]],
+                                        unsigned char *error [[maybe_unused]]) {
   return static_cast<long long>(meb::redo_log_archive_flush(current_thd));
 }
 
 /**
+  Initialize UDF innodb_redo_log_sharp_checkpoint
+
+  See include/mysql/udf_registration_types.h
+*/
+bool innodb_redo_log_sharp_checkpoint_init([[maybe_unused]] UDF_INIT *initid,
+                                           UDF_ARGS *args, char *message) {
+  if (args->arg_count != 0) {
+    strncpy(message, "Invalid number of arguments.", MYSQL_ERRMSG_SIZE);
+    return true;
+  }
+  return false;
+}
+
+/**
+  Deinitialize UDF innodb_redo_log_sharp_checkpoint
+
+  See include/mysql/udf_registration_types.h
+*/
+void innodb_redo_log_sharp_checkpoint_deinit([
+    [maybe_unused]] UDF_INIT *initid) {
+  return;
+}
+
+/**
+  UDF innodb_redo_log_sharp_checkpoint
+
+  The UDF is of type Udf_func_longlong returning INT_RESULT
+
+  See include/mysql/udf_registration_types.h
+
+  The UDF expects one argument:
+  - A thread context pointer, maybe NULL
+
+  Returns zero on success, one otherwise.
+*/
+long long innodb_redo_log_sharp_checkpoint(
+    [[maybe_unused]] UDF_INIT *initid, [[maybe_unused]] UDF_ARGS *args,
+    [[maybe_unused]] unsigned char *null_value,
+    [[maybe_unused]] unsigned char *error) {
+  /* Security measure: Require the backup admin privilege. */
+  if (verify_privilege(current_thd, backup_admin_privilege)) {
+    return 1;
+  }
+
+  if (log_sys == nullptr) {
+    my_error(ER_INVALID_USE_OF_NULL, MYF(0));
+    return 1;
+  }
+  LogErr(INFORMATION_LEVEL, ER_INNODB_ERROR_LOGGER_MSG,
+         "innodb_redo_log_sharp_checkpoint() making checkpoint");
+  log_make_latest_checkpoint(*log_sys);
+  return 0;
+}
+
+/**
   Type and data for tracking registered UDFs.
 */
 struct udf_data_t {
@@ -2114,7 +2166,12 @@
     {"innodb_redo_log_archive_flush", INT_RESULT,
      reinterpret_cast<Udf_func_any>(innodb_redo_log_archive_flush),
      reinterpret_cast<Udf_func_init>(innodb_redo_log_archive_flush_init),
-     reinterpret_cast<Udf_func_deinit>(innodb_redo_log_archive_flush_deinit)}};
+     reinterpret_cast<Udf_func_deinit>(innodb_redo_log_archive_flush_deinit)},
+    {"innodb_redo_log_sharp_checkpoint", INT_RESULT,
+     reinterpret_cast<Udf_func_any>(innodb_redo_log_sharp_checkpoint),
+     reinterpret_cast<Udf_func_init>(innodb_redo_log_sharp_checkpoint_init),
+     reinterpret_cast<Udf_func_deinit>(
+         innodb_redo_log_sharp_checkpoint_deinit)}};
 
 /**
   Unregister UDF(s)
@@ -2125,7 +2182,7 @@
     /* purecov: begin inspected */
     LogErr(
         WARNING_LEVEL, ER_INNODB_ERROR_LOGGER_MSG,
-        (logmsgpfx + "mysql_plugin_registry_acquire() returns NULL").c_str());
+        (LOGMSGPFX + "mysql_plugin_registry_acquire() returns NULL").c_str());
     return;
     /* purecov: end */
   }
@@ -2144,13 +2201,13 @@
         if (udf_registrar->udf_unregister(name, &was_present) && was_present) {
           /* purecov: begin inspected */ /* Only needed if unregister fails. */
           LogErr(WARNING_LEVEL, ER_INNODB_ERROR_LOGGER_MSG,
-                 (logmsgpfx + "Cannot unregister UDF '" + name + "'").c_str());
+                 (LOGMSGPFX + "Cannot unregister UDF '" + name + "'").c_str());
           /* purecov: end */
         }
       }
     } else {
       LogErr(WARNING_LEVEL, ER_INNODB_ERROR_LOGGER_MSG,
-             (logmsgpfx + "Cannot get valid udf_registration service").c_str());
+             (LOGMSGPFX + "Cannot get valid udf_registration service").c_str());
     }
   } /* end of udf_registrar block */
   mysql_plugin_registry_release(plugin_registry);
@@ -2175,7 +2232,7 @@
     /* purecov: begin inspected */
     LogErr(
         ERROR_LEVEL, ER_INNODB_ERROR_LOGGER_MSG,
-        (logmsgpfx + "mysql_plugin_registry_acquire() returns NULL").c_str());
+        (LOGMSGPFX + "mysql_plugin_registry_acquire() returns NULL").c_str());
     return true;
     /* purecov: end */
   }
@@ -2195,7 +2252,7 @@
                                         udf.m_init_func, udf.m_deinit_func)) {
           /* purecov: begin inspected */ /* Only needed if register fails. */
           LogErr(ERROR_LEVEL, ER_INNODB_ERROR_LOGGER_MSG,
-                 (logmsgpfx + "Cannot register UDF '" + name + "'").c_str());
+                 (LOGMSGPFX + "Cannot register UDF '" + name + "'").c_str());
           failed = true;
           break;
           /* purecov: end */
@@ -2203,7 +2260,7 @@
       }
     } else {
       LogErr(ERROR_LEVEL, ER_INNODB_ERROR_LOGGER_MSG,
-             (logmsgpfx + "Cannot get valid udf_registration service").c_str());
+             (LOGMSGPFX + "Cannot get valid udf_registration service").c_str());
       failed = true;
     }
   } /* end of udf_registrar block */
diff -Nru mysql-8.0-8.0.26/storage/innobase/log/log0recv.cc mysql-8.0-8.0.27/storage/innobase/log/log0recv.cc
--- mysql-8.0-8.0.26/storage/innobase/log/log0recv.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/log/log0recv.cc	2021-09-28 11:46:34.000000000 +0000
@@ -70,7 +70,7 @@
 
 #ifndef UNIV_HOTBACKUP
 #include "buf0rea.h"
-#include "row0merge.h"
+#include "ddl0ddl.h"
 #include "srv0srv.h"
 #include "srv0start.h"
 #include "trx0purge.h"
@@ -140,10 +140,10 @@
 }
 #endif /* UNIV_HOTBACKUP */
 
-#ifndef UNIV_HOTBACKUP
+//#ifndef UNIV_HOTBACKUP
 PSI_memory_key mem_log_recv_page_hash_key;
 PSI_memory_key mem_log_recv_space_hash_key;
-#endif /* !UNIV_HOTBACKUP */
+//#endif /* !UNIV_HOTBACKUP */
 
 /** true when recv_init_crash_recovery() has been called. */
 bool recv_needed_recovery;
@@ -253,7 +253,7 @@
 /** Destructor */
 MetadataRecover::~MetadataRecover() {
   for (auto &table : m_tables) {
-    UT_DELETE(table.second);
+    ut::delete_(table.second);
   }
 }
 
@@ -266,7 +266,8 @@
   PersistentTables::iterator iter = m_tables.find(id);
 
   if (iter == m_tables.end()) {
-    metadata = UT_NEW_NOKEY(PersistentTableMetadata(id, 0));
+    metadata = ut::new_withkey<PersistentTableMetadata>(
+        UT_NEW_THIS_FILE_PSI_KEY, id, 0);
 
     m_tables.insert(std::make_pair(id, metadata));
   } else {
@@ -392,7 +393,8 @@
     return;
   }
 
-  recv_sys = static_cast<recv_sys_t *>(ut_zalloc_nokey(sizeof(*recv_sys)));
+  recv_sys = static_cast<recv_sys_t *>(
+      ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sizeof(*recv_sys)));
 
   mutex_create(LATCH_ID_RECV_SYS, &recv_sys->mutex);
   mutex_create(LATCH_ID_RECV_WRITER, &recv_sys->writer_mutex);
@@ -413,7 +415,7 @@
 #else  /* !UNIV_HOTBACKUP */
   if ((recv_sys->buf_len >= srv_log_buffer_size) ||
       (recv_sys->len >= srv_log_buffer_size)) {
-    ib::fatal(ER_IB_ERR_LOG_PARSING_BUFFER_OVERFLOW)
+    ib::fatal(UT_LOCATION_HERE, ER_IB_ERR_LOG_PARSING_BUFFER_OVERFLOW)
         << "Log parsing buffer overflow. Log parse failed. "
         << "Please increase --limit-memory above "
         << srv_log_buffer_size / 1024 / 1024 << " (MB)";
@@ -427,8 +429,8 @@
                           : recv_sys->buf_len * 2;
 
   /* Resize the buffer to the new size. */
-  recv_sys->buf =
-      static_cast<byte *>(ut_realloc(recv_sys->buf, recv_sys->buf_len));
+  recv_sys->buf = static_cast<byte *>(ut::realloc_withkey(
+      UT_NEW_THIS_FILE_PSI_KEY, recv_sys->buf, recv_sys->buf_len));
 
   ut_ad(recv_sys->buf != nullptr);
 
@@ -456,12 +458,12 @@
       }
     }
 
-    UT_DELETE(recv_sys->spaces);
+    ut::delete_(recv_sys->spaces);
   }
 
-  ut_free(recv_sys->buf);
+  ut::free(recv_sys->buf);
   ut::aligned_free(recv_sys->last_block);
-  UT_DELETE(recv_sys->metadata_recover);
+  ut::delete_(recv_sys->metadata_recover);
 
   recv_sys->buf = nullptr;
   recv_sys->spaces = nullptr;
@@ -488,7 +490,7 @@
 
 #endif /* !UNIV_HOTBACKUP */
 
-  UT_DELETE(recv_sys->dblwr);
+  ut::delete_(recv_sys->dblwr);
 
   call_destructor(&recv_sys->deleted);
   call_destructor(&recv_sys->missing_ids);
@@ -501,7 +503,7 @@
 #endif /* !UNIV_HOTBACKUP */
   mutex_free(&recv_sys->writer_mutex);
 
-  ut_free(recv_sys);
+  ut::free(recv_sys);
   recv_sys = nullptr;
 }
 
@@ -611,7 +613,8 @@
     recv_n_pool_free_frames = 512;
   }
 
-  recv_sys->buf = static_cast<byte *>(ut_malloc_nokey(RECV_PARSING_BUF_SIZE));
+  recv_sys->buf = static_cast<byte *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, RECV_PARSING_BUF_SIZE));
   recv_sys->buf_len = RECV_PARSING_BUF_SIZE;
 
   recv_sys->len = 0;
@@ -619,7 +622,8 @@
 
   using Spaces = recv_sys_t::Spaces;
 
-  recv_sys->spaces = UT_NEW(Spaces(), mem_log_recv_space_hash_key);
+  recv_sys->spaces = ut::new_withkey<Spaces>(
+      ut::make_psi_memory_key(mem_log_recv_space_hash_key));
 
   recv_sys->n_addrs = 0;
 
@@ -635,7 +639,8 @@
 
   recv_max_page_lsn = 0;
 
-  recv_sys->dblwr = UT_NEW_NOKEY(dblwr::recv::DBLWR());
+  recv_sys->dblwr =
+      ut::new_withkey<dblwr::recv::DBLWR>(UT_NEW_THIS_FILE_PSI_KEY);
 
   new (&recv_sys->deleted) recv_sys_t::Missing_Ids();
 
@@ -645,7 +650,8 @@
 
   recv_sys->saved_recs.resize(recv_sys_t::MAX_SAVED_MLOG_RECS);
 
-  recv_sys->metadata_recover = UT_NEW_NOKEY(MetadataRecover());
+  recv_sys->metadata_recover =
+      ut::new_withkey<MetadataRecover>(UT_NEW_THIS_FILE_PSI_KEY);
 
   mutex_exit(&recv_sys->mutex);
 }
@@ -655,7 +661,7 @@
   ut_ad(mutex_own(&recv_sys->mutex));
 
   if (recv_sys->n_addrs != 0) {
-    ib::fatal(ER_IB_MSG_699, ulonglong{recv_sys->n_addrs});
+    ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_699, ulonglong{recv_sys->n_addrs});
   }
 
   for (auto &space : *recv_sys->spaces) {
@@ -665,11 +671,12 @@
     }
   }
 
-  UT_DELETE(recv_sys->spaces);
+  ut::delete_(recv_sys->spaces);
 
   using Spaces = recv_sys_t::Spaces;
 
-  recv_sys->spaces = UT_NEW(Spaces(), mem_log_recv_space_hash_key);
+  recv_sys->spaces = ut::new_withkey<Spaces>(
+      ut::make_psi_memory_key(mem_log_recv_space_hash_key));
 }
 
 /** Check the consistency of a log header block.
@@ -854,19 +861,19 @@
   if (recv_sys->keys != nullptr) {
     for (auto &key : *recv_sys->keys) {
       if (key.ptr != nullptr) {
-        ut_free(key.ptr);
+        ut::free(key.ptr);
         key.ptr = nullptr;
       }
 
       if (key.iv != nullptr) {
-        ut_free(key.iv);
+        ut::free(key.iv);
         key.iv = nullptr;
       }
     }
 
     recv_sys->keys->swap(*recv_sys->keys);
 
-    UT_DELETE(recv_sys->keys);
+    ut::delete_(recv_sys->keys);
     recv_sys->keys = nullptr;
   }
 
@@ -966,8 +973,8 @@
 @param[in,out]	log		redo log
 @param[out]	max_field	LOG_CHECKPOINT_1 or LOG_CHECKPOINT_2
 @return error code or DB_SUCCESS */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    recv_find_max_checkpoint(log_t &log, ulint *max_field) {
+[[nodiscard]] static dberr_t recv_find_max_checkpoint(log_t &log,
+                                                      ulint *max_field) {
   bool found_checkpoint = false;
 
   *max_field = 0;
@@ -1479,8 +1486,9 @@
   success = fil_space_extend(space, recv_addr->page_no + 1);
 
   if (!success) {
-    ib::fatal(ER_IB_MSG_711) << "Cannot extend tablespace " << recv_addr->space
-                             << " to hold " << recv_addr->page_no << " pages";
+    ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_711)
+        << "Cannot extend tablespace " << recv_addr->space << " to hold "
+        << recv_addr->page_no << " pages";
   }
 
   mutex_exit(&recv_sys->mutex);
@@ -1502,7 +1510,7 @@
   }
 
   if (err != DB_SUCCESS) {
-    ib::fatal(ER_IB_MSG_712)
+    ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_712)
         << "Cannot read from tablespace " << recv_addr->space << " page number "
         << recv_addr->page_no;
   }
@@ -1535,7 +1543,7 @@
   }
 
   if (err != DB_SUCCESS) {
-    ib::fatal(ER_IB_MSG_713)
+    ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_713)
         << "Cannot write to tablespace " << recv_addr->space << " page number "
         << recv_addr->page_no;
   }
@@ -1612,6 +1620,50 @@
 
 #endif /* !UNIV_HOTBACKUP */
 
+/** Check if redo log is for encryption information.
+@param[in]	page_no		Page number
+@param[in]	space_id	Tablespace identifier
+@param[in]	start		Redo log record body
+@param[in]	end		End of buffer
+@return true if encryption information. */
+static inline bool check_encryption(page_no_t page_no, space_id_t space_id,
+                                    const byte *start, const byte *end) {
+  /* Only page zero contains encryption metadata. */
+  if (page_no != 0 || fsp_is_system_or_temp_tablespace(space_id) ||
+      end < start + 4) {
+    return false;
+  }
+
+  bool found = false;
+
+  const page_size_t &page_size = fil_space_get_page_size(space_id, &found);
+
+  if (!found) {
+    return false;
+  }
+
+  auto encryption_offset = fsp_header_get_encryption_offset(page_size);
+  auto offset = mach_read_from_2(start);
+
+  /* Encryption offset at page 0 is the only way we can identify encryption
+  information as of today. Ideally we should have a separate redo type. */
+  if (offset == encryption_offset) {
+    auto len = mach_read_from_2(start + 2);
+    ut_ad(len == Encryption::INFO_SIZE);
+
+    if (len != Encryption::INFO_SIZE) {
+      /* purecov: begin inspected */
+      ib::warn(ER_IB_WRN_ENCRYPTION_INFO_SIZE_MISMATCH, size_t{len},
+               Encryption::INFO_SIZE);
+      return false;
+      /* purecov: end */
+    }
+    return true;
+  }
+
+  return false;
+}
+
 /** Try to parse a single log record body and also applies it if
 specified.
 @param[in]	type		Redo log entry type
@@ -1813,7 +1865,7 @@
         break;
       }
 
-      // fall through
+      [[fallthrough]];
 
     case MLOG_1BYTE:
       /* If 'ALTER TABLESPACE ... ENCRYPTION' was in progress and page 0 has
@@ -1833,20 +1885,22 @@
           byte op = mach_read_from_1(page + offset);
           switch (op) {
             case Encryption::ENCRYPT_IN_PROGRESS:
-              space->encryption_op_in_progress = ENCRYPTION;
+              space->encryption_op_in_progress =
+                  Encryption::Progress::ENCRYPTION;
               break;
             case Encryption::DECRYPT_IN_PROGRESS:
-              space->encryption_op_in_progress = DECRYPTION;
+              space->encryption_op_in_progress =
+                  Encryption::Progress::DECRYPTION;
               break;
             default:
-              space->encryption_op_in_progress = NONE;
+              space->encryption_op_in_progress = Encryption::Progress::NONE;
               break;
           }
         }
         fil_space_release(space);
       }
 
-      // fall through
+      [[fallthrough]];
 
     case MLOG_2BYTES:
     case MLOG_8BYTES:
@@ -2019,7 +2073,7 @@
         break;
       }
 
-      /* Fall through */
+      [[fallthrough]];
 
     case MLOG_REC_SEC_DELETE_MARK:
 
@@ -2208,22 +2262,28 @@
       break;
 
     case MLOG_INIT_FILE_PAGE:
-    case MLOG_INIT_FILE_PAGE2:
-
-      /* Allow anything in page_type when creating a page. */
-
-      ptr = fsp_parse_init_file_page(ptr, end_ptr, block);
+    case MLOG_INIT_FILE_PAGE2: {
+      /* For clone, avoid initializing page-0. Page-0 should already have been
+      initialized. This is to avoid erasing encryption information. We cannot
+      update encryption information later with redo logged information for
+      clone. Please check comments in MLOG_WRITE_STRING. */
+      bool skip_init = (recv_sys->is_cloned_db && page_no == 0);
 
+      if (!skip_init) {
+        /* Allow anything in page_type when creating a page. */
+        ptr = fsp_parse_init_file_page(ptr, end_ptr, block);
+      }
       break;
+    }
 
-    case MLOG_WRITE_STRING:
-
+    case MLOG_WRITE_STRING: {
       ut_ad(!page || page_type != FIL_PAGE_TYPE_ALLOCATED || page_no == 0);
+      bool is_encryption = check_encryption(page_no, space_id, ptr, end_ptr);
 
 #ifndef UNIV_HOTBACKUP
       /* Reset in-mem encryption information for the tablespace here if this
       is "resetting encryprion info" log. */
-      if (page_no == 0 && !fsp_is_system_or_temp_tablespace(space_id)) {
+      if (is_encryption && !recv_sys->is_cloned_db) {
         byte buf[Encryption::INFO_SIZE] = {0};
 
         if (memcmp(ptr + 4, buf, Encryption::INFO_SIZE - 4) == 0) {
@@ -2232,9 +2292,18 @@
       }
 
 #endif
-      ptr = mlog_parse_string(ptr, end_ptr, page, page_zip);
+      auto apply_page = page;
 
+      /* For clone recovery, skip applying encryption information from
+      redo log. It is already updated in page 0. Redo log encryption
+      information is encrypted with donor master key and must be ignored. */
+      if (recv_sys->is_cloned_db && is_encryption) {
+        apply_page = nullptr;
+      }
+
+      ptr = mlog_parse_string(ptr, end_ptr, apply_page, page_zip);
       break;
+    }
 
     case MLOG_ZIP_WRITE_NODE_PTR:
 
@@ -2604,7 +2673,8 @@
       /* We have to copy the record body to a separate
       buffer */
 
-      buf = static_cast<byte *>(ut_malloc_nokey(recv->len));
+      buf = static_cast<byte *>(
+          ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, recv->len));
 
       recv_data_copy_to_buf(buf, recv);
     } else if (recv->data != nullptr) {
@@ -2686,7 +2756,7 @@
     }
 
     if (recv->len > RECV_DATA_BLOCK_SIZE) {
-      ut_free(buf);
+      ut::free(buf);
     }
   }
 
@@ -2967,7 +3037,7 @@
 #endif /* !UNIV_HOTBACKUP */
       }
 
-      /* fall through */
+      [[fallthrough]];
 
     case MLOG_INDEX_LOAD:
     case MLOG_FILE_DELETE:
@@ -3454,7 +3524,8 @@
             return (true);
           }
 #else  /* !UNIV_HOTBACKUP */
-          ib::fatal(ER_IB_ERR_NOT_ENOUGH_MEMORY_FOR_PARSE_BUFFER)
+          ib::fatal(UT_LOCATION_HERE,
+                    ER_IB_ERR_NOT_ENOUGH_MEMORY_FOR_PARSE_BUFFER)
               << "Insufficient memory for InnoDB parse buffer; want "
               << recv_sys->buf_len;
 #endif /* !UNIV_HOTBACKUP */
@@ -3723,7 +3794,7 @@
     from the buffer pools. */
 
     srv_threads.m_recv_writer =
-        os_thread_create(recv_writer_thread_key, recv_writer_thread);
+        os_thread_create(recv_writer_thread_key, 0, recv_writer_thread);
 
     srv_threads.m_recv_writer.start();
   }
diff -Nru mysql-8.0-8.0.26/storage/innobase/log/log0write.cc mysql-8.0-8.0.27/storage/innobase/log/log0write.cc
--- mysql-8.0-8.0.26/storage/innobase/log/log0write.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/log/log0write.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1965,9 +1965,11 @@
 
     if (!log.m_allow_checkpoints.load()) {
       if (srv_force_recovery < 4) {
-        ib::fatal(ER_IB_MSG_RECOVERY_NO_SPACE_IN_REDO_LOG__SKIP_IBUF_MERGES);
+        ib::fatal(UT_LOCATION_HERE,
+                  ER_IB_MSG_RECOVERY_NO_SPACE_IN_REDO_LOG__SKIP_IBUF_MERGES);
       } else {
-        ib::fatal(ER_IB_MSG_RECOVERY_NO_SPACE_IN_REDO_LOG__UNEXPECTED);
+        ib::fatal(UT_LOCATION_HERE,
+                  ER_IB_MSG_RECOVERY_NO_SPACE_IN_REDO_LOG__UNEXPECTED);
       }
     }
 
@@ -2867,7 +2869,7 @@
   return (true);
 }
 
-bool log_file_header_fill_encryption(byte *buf, byte *key, byte *iv,
+bool log_file_header_fill_encryption(byte *buf, const byte *key, const byte *iv,
                                      bool is_boot, bool encrypt_key) {
   byte encryption_info[Encryption::INFO_SIZE];
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/mem/memory.cc mysql-8.0-8.0.27/storage/innobase/mem/memory.cc
--- mysql-8.0-8.0.26/storage/innobase/mem/memory.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/mem/memory.cc	2021-09-28 11:46:34.000000000 +0000
@@ -279,7 +279,8 @@
   if (type == MEM_HEAP_DYNAMIC || len < UNIV_PAGE_SIZE / 2) {
     ut_ad(type == MEM_HEAP_DYNAMIC || n <= MEM_MAX_ALLOC_IN_BUF);
 
-    block = static_cast<mem_block_t *>(ut_malloc_nokey(len));
+    block = static_cast<mem_block_t *>(
+        ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, len));
   } else {
     len = UNIV_PAGE_SIZE;
 
@@ -303,9 +304,9 @@
 
   if (block == nullptr) {
 #ifdef UNIV_NO_ERR_MSGS
-    ib::fatal()
+    ib::fatal(UT_LOCATION_HERE)
 #else
-    ib::fatal(ER_IB_MSG_1274)
+    ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_1274)
 #endif /* !UNIV_NO_ERR_MSGS */
         << "Unable to allocate memory of size " << len << ".";
   }
@@ -320,7 +321,8 @@
 
 #else  /* !UNIV_LIBRARY && !UNIV_HOTBACKUP */
   len = MEM_BLOCK_HEADER_SIZE + MEM_SPACE_NEEDED(n);
-  block = static_cast<mem_block_t *>(ut_malloc_nokey(len));
+  block = static_cast<mem_block_t *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, len));
   ut_a(block);
   block->free_block = nullptr;
 #endif /* !UNIV_LIBRARY && !UNIV_HOTBACKUP */
@@ -438,7 +440,7 @@
 #if !defined(UNIV_LIBRARY) && !defined(UNIV_HOTBACKUP)
   if (type == MEM_HEAP_DYNAMIC || len < UNIV_PAGE_SIZE / 2) {
     ut_ad(!buf_block);
-    ut_free(block);
+    ut::free(block);
   } else {
     ut_ad(type & MEM_HEAP_BUFFER);
 
@@ -448,7 +450,7 @@
     buf_block_free(buf_block);
   }
 #else  /* !UNIV_LIBRARY && !UNIV_HOTBACKUP */
-  ut_free(block);
+  ut::free(block);
 #endif /* !UNIV_LIBRARY && !UNIV_HOTBACKUP */
 }
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/mtr/mtr0mtr.cc mysql-8.0-8.0.27/storage/innobase/mtr/mtr0mtr.cc
--- mysql-8.0-8.0.26/storage/innobase/mtr/mtr0mtr.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/mtr/mtr0mtr.cc	2021-09-28 11:46:34.000000000 +0000
@@ -171,6 +171,27 @@
   mtr_memo_slot_t *m_slot;
 };
 
+struct Mtr_memo_print {
+  Mtr_memo_print(std::ostream &out) : m_out(out) {}
+
+  bool operator()(mtr_memo_slot_t *slot) {
+    slot->print(m_out);
+    return true;
+  }
+
+ private:
+  std::ostream &m_out;
+};
+
+std::ostream &mtr_t::print_memos(std::ostream &out) const {
+  Mtr_memo_print printer(out);
+  Iterate<Mtr_memo_print> iterator(printer);
+  out << "[mtr_t: this=" << (void *)this << ", ";
+  m_impl.m_memo.for_each_block_in_reverse(iterator);
+  out << "]" << std::endl;
+  return out;
+}
+
 #ifndef UNIV_HOTBACKUP
 #ifdef UNIV_DEBUG
 struct Mtr_memo_contains {
@@ -199,7 +220,12 @@
   Mtr_memo_contains check(mtr2, MTR_MEMO_MODIFY);
   Iterate<Mtr_memo_contains> iterator(check);
 
-  return !m_impl.m_memo.for_each_block_in_reverse(iterator);
+  bool conflict = !m_impl.m_memo.for_each_block_in_reverse(iterator);
+  if (conflict) {
+    print_memos(std::cout);
+    mtr2->print_memos(std::cout);
+  }
+  return conflict;
 }
 #endif /* UNIV_DEBUG */
 #endif /* !UNIV_HOTBACKUP */
@@ -270,7 +296,7 @@
 
 #ifdef UNIV_DEBUG
 /** Assure that there are no slots that are latching any resources. Only buffer
- * fixing a page is allowed. */
+fixing a page is allowed. */
 struct Debug_check_no_latching {
   /** @return true always. */
   bool operator()(const mtr_memo_slot_t *slot) const {
@@ -278,13 +304,12 @@
       case MTR_MEMO_BUF_FIX:
         break;
       default:
-        ib::fatal() << "Debug_check_no_latching failed, slot->type="
-                    << slot->type;
+        ib::fatal(UT_LOCATION_HERE, ER_MTR_MSG_1, (int)slot->type);
     }
     return true;
   }
 };
-#endif
+#endif /* UNIV_DEBUG */
 
 /** Add blocks modified by the mini-transaction to the flush list. */
 struct Add_dirty_blocks_to_flush_list {
@@ -295,7 +320,7 @@
                                   added to REDO by the MTR
   @param[in,out]	observer	flush observer */
   Add_dirty_blocks_to_flush_list(lsn_t start_lsn, lsn_t end_lsn,
-                                 FlushObserver *observer);
+                                 Flush_observer *observer);
 
   /** Add the modified page to the buffer flush list. */
   void add_dirty_page_to_flush_list(mtr_memo_slot_t *slot) const {
@@ -338,7 +363,7 @@
   const lsn_t m_start_lsn;
 
   /** Flush observer */
-  FlushObserver *const m_flush_observer;
+  Flush_observer *const m_flush_observer;
 };
 
 /** Constructor.
@@ -348,7 +373,7 @@
                                 to REDO by the MTR
 @param[in,out]	observer	flush observer */
 Add_dirty_blocks_to_flush_list::Add_dirty_blocks_to_flush_list(
-    lsn_t start_lsn, lsn_t end_lsn, FlushObserver *observer)
+    lsn_t start_lsn, lsn_t end_lsn, Flush_observer *observer)
     : m_end_lsn(end_lsn), m_start_lsn(start_lsn), m_flush_observer(observer) {
   /* Do nothing */
 }
@@ -870,6 +895,19 @@
   release_resources();
 }
 
+std::ostream &mtr_memo_slot_t::print(std::ostream &out) const {
+  buf_block_t *block = nullptr;
+  if (!is_lock()) {
+    block = reinterpret_cast<buf_block_t *>(object);
+  }
+  out << "[mtr_memo_slot_t: object=" << object << ", type=" << type << " ("
+      << mtr_memo_type(type) << "), page_id="
+      << ((block == nullptr) ? page_id_t(FIL_NULL, FIL_NULL)
+                             : block->get_page_id())
+      << "]" << std::endl;
+  return out;
+}
+
 #ifndef UNIV_HOTBACKUP
 int mtr_t::Logging::enable(THD *thd) {
   if (is_enabled()) {
@@ -933,10 +971,13 @@
     return ER_INNODB_REDO_ARCHIVING_ENABLED;
   }
 
-  /* Concurrent clone is blocked by BACKUP MDL lock except when
-  clone_ddl_timeout = 0. Force any existing clone to abort. */
-  clone_mark_abort(true);
-  ut_ad(!clone_check_active());
+  /* Concurrent clone operation is not supported. */
+  Clone_notify notifier(Clone_notify::Type::SYSTEM_REDO_DISABLE,
+                        dict_sys_t::s_invalid_space_id, false);
+  if (notifier.failed()) {
+    m_state.store(ENABLED);
+    return notifier.get_error();
+  }
 
   /* Mark that it is unsafe to crash going forward. */
   log_persist_disable(*log_sys);
@@ -944,8 +985,6 @@
   ib::warn(ER_IB_WRN_REDO_DISABLED);
   m_state.store(DISABLED);
 
-  clone_mark_active();
-
   return 0;
 }
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/os/file.cc mysql-8.0-8.0.27/storage/innobase/os/file.cc
--- mysql-8.0-8.0.26/storage/innobase/os/file.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/os/file.cc	2021-09-28 11:46:34.000000000 +0000
@@ -166,7 +166,8 @@
     /* Add a safety margin of an additional 50% */
     ulint n_bytes = header.m_original_size + (header.m_original_size / 2);
 
-    dst = reinterpret_cast<byte *>(ut_malloc_nokey(n_bytes));
+    dst = reinterpret_cast<byte *>(
+        ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, n_bytes));
 
     if (dst == nullptr) {
       return (DB_OUT_OF_MEMORY);
@@ -189,7 +190,7 @@
 
       if (uncompress(dst, &zlen, ptr, header.m_compressed_size) != Z_OK) {
         if (allocated) {
-          ut_free(dst);
+          ut::free(dst);
         }
 
         return (DB_IO_DECOMPRESS_FAIL);
@@ -223,7 +224,7 @@
 
       if (ret < 0) {
         if (allocated) {
-          ut_free(dst);
+          ut::free(dst);
         }
 
         return (DB_IO_DECOMPRESS_FAIL);
@@ -241,7 +242,7 @@
           << Compression::to_string(compression.m_type);
 
       if (allocated) {
-        ut_free(dst);
+        ut::free(dst);
       }
 
       return (DB_UNSUPPORTED);
@@ -256,7 +257,7 @@
                           src, header.m_original_size + FIL_PAGE_DATA));
 
   if (allocated) {
-    ut_free(dst);
+    ut::free(dst);
   }
 
   return (DB_SUCCESS);
diff -Nru mysql-8.0-8.0.26/storage/innobase/os/file.h mysql-8.0-8.0.27/storage/innobase/os/file.h
--- mysql-8.0-8.0.26/storage/innobase/os/file.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/os/file.h	2021-09-28 11:46:34.000000000 +0000
@@ -130,14 +130,12 @@
   /** Check the page header type field.
   @param[in]	page		Page contents
   @return true if it is a compressed page */
-  static bool is_compressed_page(const byte *page)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static bool is_compressed_page(const byte *page);
 
   /** Check the page header type field.
   @param[in]	page		Page contents
   @return true if it is a compressed and encrypted page */
-  static bool is_compressed_encrypted_page(const byte *page)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static bool is_compressed_encrypted_page(const byte *page);
 
   /** Check if the version on page is valid.
   @param[in]	version		version
@@ -148,30 +146,28 @@
   @param[in]      algorithm       Compression algorithm to check
   @param[out]     compression            The type that algorithm maps to
   @return DB_SUCCESS or error code */
-  static dberr_t check(const char *algorithm, Compression *compression)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static dberr_t check(const char *algorithm,
+                                     Compression *compression);
 
   /** Validate the algorithm string.
   @param[in]      algorithm       Compression algorithm to check
   @return DB_SUCCESS or error code */
-  static dberr_t validate(const char *algorithm)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static dberr_t validate(const char *algorithm);
 
   /** Validate the algorithm string.
   @param[in]  type  compression type
   @return true if type is valid, else false */
-  static bool validate(const Type type) MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static bool validate(const Type type);
 
   /** Convert to a "string".
   @param[in]      type            The compression type
   @return the string representation */
-  static const char *to_string(Type type) MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static const char *to_string(Type type);
 
   /** Convert the meta data to a std::string.
   @param[in]      meta		Page Meta data
   @return the string representation */
-  static std::string to_string(const meta_t &meta)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static std::string to_string(const meta_t &meta);
 
   /** Deserizlise the page header compression meta-data
   @param[in]	page		Pointer to the page header
@@ -181,7 +177,7 @@
   /** Check if the string is "empty" or "none".
   @param[in]      algorithm       Compression algorithm to check
   @return true if no algorithm requested */
-  static bool is_none(const char *algorithm) MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static bool is_none(const char *algorithm);
 
   /** Decompress the page data contents. Page type must be FIL_PAGE_COMPRESSED,
   if not then the source contents are left unchanged and DB_SUCCESS is returned.
@@ -193,8 +189,8 @@
   @param[in]	dst_len		If dst is valid, size of the scratch area in
                                   bytes.
   @return DB_SUCCESS or error code */
-  static dberr_t deserialize(bool dblwr_read, byte *src, byte *dst,
-                             ulint dst_len) MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static dberr_t deserialize(bool dblwr_read, byte *src,
+                                           byte *dst, ulint dst_len);
 
   /** Compression type */
   Type m_type;
diff -Nru mysql-8.0-8.0.26/storage/innobase/os/os0enc.cc mysql-8.0-8.0.27/storage/innobase/os/os0enc.cc
--- mysql-8.0-8.0.26/storage/innobase/os/os0enc.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/os/os0enc.cc	2021-09-28 11:46:34.000000000 +0000
@@ -157,18 +157,15 @@
 
   @returns status of key generation
     @retval true  Success
-    @retval fales Error. No error is raised.
+    @retval false Error. No error is raised.
 */
 bool generate_key(const char *key_id, const char *key_type, size_t key_length) {
   if (key_id == nullptr || key_type == nullptr || key_length == 0) {
     return false;
   }
 
-  if (keyring_generator_service->generate(key_id, nullptr, key_type,
-                                          key_length) == true) {
-    return false;
-  }
-  return true;
+  return keyring_generator_service->generate(key_id, nullptr, key_type,
+                                             key_length) == 0;
 }
 
 /**
@@ -448,8 +445,9 @@
 #endif /* !UNIV_HOTBACKUP */
 }
 
-bool Encryption::fill_encryption_info(byte *key, byte *iv, byte *encrypt_info,
-                                      bool is_boot, bool encrypt_key) noexcept {
+bool Encryption::fill_encryption_info(const byte *key, const byte *iv,
+                                      byte *encrypt_info, bool is_boot,
+                                      bool encrypt_key) noexcept {
   byte *master_key = nullptr;
   uint32_t master_key_id = DEFAULT_MASTER_KEY_ID;
 
@@ -582,7 +580,8 @@
       ptr += SERVER_UUID_LEN;
 
       if (key_id == DEFAULT_MASTER_KEY_ID) {
-        *master_key = static_cast<byte *>(ut_zalloc_nokey(KEY_LEN));
+        *master_key = static_cast<byte *>(
+            ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, KEY_LEN));
         memcpy(*master_key, DEFAULT_MASTER_KEY, strlen(DEFAULT_MASTER_KEY));
       } else {
         ut_ad(strlen(srv_uuid) != 0);
@@ -623,9 +622,10 @@
     version = VERSION_3;
   } else {
     /* We don't report an error during recovery, since the
-    encryption info maybe hasn't writen into datafile when
-    the table is newly created. */
-    if (recv_recovery_is_on()) {
+    encryption info maybe hasn't written into datafile when
+    the table is newly created. For clone encryption information
+    should have been already correct. */
+    if (recv_recovery_is_on() && !recv_sys->is_cloned_db) {
       return (true);
     }
 
@@ -654,7 +654,7 @@
                               KEY_LEN, my_aes_256_ecb, nullptr, false);
 
     if (master_key_id == DEFAULT_MASTER_KEY_ID) {
-      ut_free(master_key);
+      ut::free(master_key);
       /* Re-encrypt tablespace key with current master key */
     } else {
       my_free(master_key);
@@ -773,9 +773,8 @@
 
       auto elen = my_aes_encrypt(
           src_ptr + LOG_BLOCK_HDR_SIZE, static_cast<uint32>(main_len),
-          dst_ptr + LOG_BLOCK_HDR_SIZE,
-          reinterpret_cast<unsigned char *>(m_key), static_cast<uint32>(m_klen),
-          my_aes_256_cbc, reinterpret_cast<unsigned char *>(m_iv), false);
+          dst_ptr + LOG_BLOCK_HDR_SIZE, m_key, static_cast<uint32>(m_klen),
+          my_aes_256_cbc, m_iv, false);
 
       if (elen == MY_AES_BAD_DATA) {
         return (false);
@@ -797,12 +796,10 @@
       if (remain_len != 0) {
         remain_len = MY_AES_BLOCK_SIZE * 2;
 
-        elen =
-            my_aes_encrypt(dst_ptr + LOG_BLOCK_HDR_SIZE + data_len - remain_len,
-                           static_cast<uint32>(remain_len), remain_buf,
-                           reinterpret_cast<unsigned char *>(m_key),
-                           static_cast<uint32>(m_klen), my_aes_256_cbc,
-                           reinterpret_cast<unsigned char *>(m_iv), false);
+        elen = my_aes_encrypt(
+            dst_ptr + LOG_BLOCK_HDR_SIZE + data_len - remain_len,
+            static_cast<uint32>(remain_len), remain_buf, m_key,
+            static_cast<uint32>(m_klen), my_aes_256_cbc, m_iv, false);
 
         if (elen == MY_AES_BAD_DATA) {
           return (false);
@@ -828,9 +825,10 @@
     os << std::endl;
     ib::info() << os.str();
 
-    byte *check_buf =
-        static_cast<byte *>(ut_malloc_nokey(OS_FILE_LOG_BLOCK_SIZE));
-    byte *buf2 = static_cast<byte *>(ut_malloc_nokey(OS_FILE_LOG_BLOCK_SIZE));
+    byte *check_buf = static_cast<byte *>(
+        ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, OS_FILE_LOG_BLOCK_SIZE));
+    byte *buf2 = static_cast<byte *>(
+        ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, OS_FILE_LOG_BLOCK_SIZE));
 
     memcpy(check_buf, dst_ptr, OS_FILE_LOG_BLOCK_SIZE);
     log_block_set_encrypt_bit(check_buf, true);
@@ -846,8 +844,8 @@
       ut_print_buf_hex(msg, check_buf, OS_FILE_LOG_BLOCK_SIZE);
       ib::fatal() << msg.str();
     }
-    ut_free(buf2);
-    ut_free(check_buf);
+    ut::free(buf2);
+    ut::free(check_buf);
   }
 #endif /* UNIV_ENCRYPT_DEBUG */
 
@@ -881,8 +879,10 @@
 
 #ifdef UNIV_ENCRYPT_DEBUG
   {
-    byte *check_buf = static_cast<byte *>(ut_malloc_nokey(src_len));
-    byte *buf2 = static_cast<byte *>(ut_malloc_nokey(src_len));
+    byte *check_buf = static_cast<byte *>(
+        ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, src_len));
+    byte *buf2 = static_cast<byte *>(
+        ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, src_len));
 
     memcpy(check_buf, dst, src_len);
 
@@ -896,8 +896,8 @@
       ut_print_buf_hex(msg, check_buf, src_len);
       ib::fatal() << msg.str();
     }
-    ut_free(buf2);
-    ut_free(check_buf);
+    ut::free(buf2);
+    ut::free(check_buf);
   }
 #endif /* UNIV_ENCRYPT_DEBUG */
 
@@ -948,11 +948,10 @@
       const auto chunk_len = (data_len / MY_AES_BLOCK_SIZE) * MY_AES_BLOCK_SIZE;
       const auto remain_len = data_len - chunk_len;
 
-      auto elen =
-          my_aes_encrypt(src + FIL_PAGE_DATA, static_cast<uint32>(chunk_len),
-                         dst + FIL_PAGE_DATA, reinterpret_cast<byte *>(m_key),
-                         static_cast<uint32>(m_klen), my_aes_256_cbc,
-                         reinterpret_cast<byte *>(m_iv), false);
+      auto elen = my_aes_encrypt(
+          src + FIL_PAGE_DATA, static_cast<uint32>(chunk_len),
+          dst + FIL_PAGE_DATA, m_key, static_cast<uint32>(m_klen),
+          my_aes_256_cbc, m_iv, false);
 
       if (elen == MY_AES_BAD_DATA) {
         const auto page_id = page_get_page_id(src);
@@ -975,10 +974,9 @@
         byte buf[trailer_len];
 
         elen = my_aes_encrypt(dst + FIL_PAGE_DATA + data_len - trailer_len,
-                              static_cast<uint32>(trailer_len), buf,
-                              reinterpret_cast<byte *>(m_key),
-                              static_cast<uint32>(m_klen), my_aes_256_cbc,
-                              reinterpret_cast<byte *>(m_iv), false);
+                              static_cast<uint32>(trailer_len), buf, m_key,
+                              static_cast<uint32>(m_klen), my_aes_256_cbc, m_iv,
+                              false);
 
         if (elen == MY_AES_BAD_DATA) {
           const auto page_id = page_get_page_id(src);
@@ -1054,8 +1052,10 @@
 
 #ifdef UNIV_ENCRYPT_DEBUG
   {
-    byte *check_buf = static_cast<byte *>(ut_malloc_nokey(src_len));
-    byte *buf2 = static_cast<byte *>(ut_malloc_nokey(src_len));
+    byte *check_buf = static_cast<byte *>(
+        ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, src_len));
+    byte *buf2 = static_cast<byte *>(
+        ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, src_len));
 
     memcpy(check_buf, dst, src_len);
 
@@ -1067,8 +1067,8 @@
       ut_print_buf(stderr, check_buf, src_len);
       ut_ad(0);
     }
-    ut_free(buf2);
-    ut_free(check_buf);
+    ut::free(buf2);
+    ut::free(check_buf);
 
     fprintf(stderr, "Encrypted page:%lu.%lu\n", space_id, page_no);
   }
@@ -1105,10 +1105,9 @@
         memcpy(remain_buf, ptr + data_len - remain_len, remain_len);
 
         elen = my_aes_decrypt(remain_buf, static_cast<uint32>(remain_len),
-                              dst + data_len - remain_len,
-                              reinterpret_cast<unsigned char *>(m_key),
-                              static_cast<uint32>(m_klen), my_aes_256_cbc,
-                              reinterpret_cast<unsigned char *>(m_iv), false);
+                              dst + data_len - remain_len, m_key,
+                              static_cast<uint32>(m_klen), my_aes_256_cbc, m_iv,
+                              false);
         if (elen == MY_AES_BAD_DATA) {
           return (DB_IO_DECRYPT_FAIL);
         }
@@ -1123,10 +1122,9 @@
       }
 
       /* Then decrypt the main data */
-      elen = my_aes_decrypt(dst, static_cast<uint32>(main_len), ptr,
-                            reinterpret_cast<unsigned char *>(m_key),
-                            static_cast<uint32>(m_klen), my_aes_256_cbc,
-                            reinterpret_cast<unsigned char *>(m_iv), false);
+      elen = my_aes_decrypt(dst, static_cast<uint32>(main_len), ptr, m_key,
+                            static_cast<uint32>(m_klen), my_aes_256_cbc, m_iv,
+                            false);
       if (elen == MY_AES_BAD_DATA) {
         return (DB_IO_DECRYPT_FAIL);
       }
@@ -1314,10 +1312,9 @@
         memcpy(remain_buf, ptr + data_len - remain_len, remain_len);
 
         elen = my_aes_decrypt(remain_buf, static_cast<uint32>(remain_len),
-                              dst + data_len - remain_len,
-                              reinterpret_cast<unsigned char *>(m_key),
-                              static_cast<uint32>(m_klen), my_aes_256_cbc,
-                              reinterpret_cast<unsigned char *>(m_iv), false);
+                              dst + data_len - remain_len, m_key,
+                              static_cast<uint32>(m_klen), my_aes_256_cbc, m_iv,
+                              false);
 
         if (elen == MY_AES_BAD_DATA) {
           if (block != nullptr) {
@@ -1339,10 +1336,9 @@
       }
 
       /* Then decrypt the main data */
-      elen = my_aes_decrypt(dst, static_cast<uint32>(main_len), ptr,
-                            reinterpret_cast<unsigned char *>(m_key),
-                            static_cast<uint32>(m_klen), my_aes_256_cbc,
-                            reinterpret_cast<unsigned char *>(m_iv), false);
+      elen = my_aes_decrypt(dst, static_cast<uint32>(main_len), ptr, m_key,
+                            static_cast<uint32>(m_klen), my_aes_256_cbc, m_iv,
+                            false);
       if (elen == MY_AES_BAD_DATA) {
         if (block != nullptr) {
           os_free_block(block);
@@ -1483,16 +1479,12 @@
 
 void Encryption::set_type(Encryption::Type type) { m_type = type; }
 
-byte *Encryption::get_key() const { return m_key; }
-
-void Encryption::set_key(byte *key) { m_key = key; }
+void Encryption::set_key(const byte *key) { m_key = key; }
 
 ulint Encryption::get_key_length() const { return m_klen; }
 
 void Encryption::set_key_length(ulint klen) { m_klen = klen; }
 
-byte *Encryption::get_initial_vector() const { return m_iv; }
-
-void Encryption::set_initial_vector(byte *iv) { m_iv = iv; }
+void Encryption::set_initial_vector(const byte *iv) { m_iv = iv; }
 
 uint32_t Encryption::get_master_key_id() { return s_master_key_id; }
diff -Nru mysql-8.0-8.0.26/storage/innobase/os/os0event.cc mysql-8.0-8.0.27/storage/innobase/os/os0event.cc
--- mysql-8.0-8.0.26/storage/innobase/os/os0event.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/os/os0event.cc	2021-09-28 11:46:34.000000000 +0000
@@ -43,8 +43,6 @@
 #include <windows.h>
 #endif /* _WIN32 */
 
-#include <list>
-
 /** The number of microseconds in a second. */
 static const uint64_t MICROSECS_IN_A_SECOND = 1000000;
 
@@ -59,9 +57,6 @@
 typedef pthread_cond_t os_cond_t;
 #endif /* _WIN32 */
 
-typedef std::list<os_event_t, ut_allocator<os_event_t>> os_event_list_t;
-typedef os_event_list_t::iterator event_iter_t;
-
 /** InnoDB condition variable. */
 struct os_event {
   os_event() UNIV_NOTHROW;
@@ -274,9 +269,6 @@
   static std::atomic_size_t n_objects_alive;
 #endif /* UNIV_DEBUG */
 
- public:
-  event_iter_t event_iter; /*!< For O(1) removal from
-                           list */
  protected:
   // Disable copying
   os_event(const os_event &);
@@ -529,7 +521,7 @@
 must be reset explicitly by calling sync_os_reset_event.
 @return	the event handle */
 os_event_t os_event_create() {
-  os_event_t ret = (UT_NEW_NOKEY(os_event()));
+  os_event_t ret = (ut::new_withkey<os_event>(UT_NEW_THIS_FILE_PSI_KEY));
 /**
  On SuSE Linux we get spurious EBUSY from pthread_mutex_destroy()
  unless we grab and release the mutex here. Current OS version:
@@ -608,7 +600,7 @@
 
 {
   if (event != nullptr) {
-    UT_DELETE(event);
+    ut::delete_(event);
     event = nullptr;
   }
 }
diff -Nru mysql-8.0-8.0.26/storage/innobase/os/os0file.cc mysql-8.0-8.0.27/storage/innobase/os/os0file.cc
--- mysql-8.0-8.0.26/storage/innobase/os/os0file.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/os/os0file.cc	2021-09-28 11:46:34.000000000 +0000
@@ -160,7 +160,8 @@
 
   /* Allocate a new path and move the directory path to it. */
   path_len = dir_len + sizeof "o_direct_test";
-  file_name = static_cast<char *>(ut_zalloc_nokey(path_len));
+  file_name = static_cast<char *>(
+      ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, path_len));
   if (add_os_path_separator == true) {
     memcpy(file_name, path, dir_len - 1);
     file_name[dir_len - 1] = OS_PATH_SEPARATOR;
@@ -177,13 +178,13 @@
 
   /* If Failed */
   if (file_handle == -1) {
-    ut_free(file_name);
+    ut::free(file_name);
     return (false);
   }
 
   ::close(file_handle);
   unlink(file_name);
-  ut_free(file_name);
+  ut::free(file_name);
 
   return (true);
 #else
@@ -387,7 +388,7 @@
 
   /** Serialize the object into JSON format.
   @return the object in JSON format. */
-  std::string to_json() const noexcept MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] std::string to_json() const noexcept;
 
   /** Print this object into the given output stream.
   @return the output stream into which object was printed. */
@@ -442,10 +443,10 @@
   @param[in]	len	        length of the block to read or write
   @param[in]	e_block         Encrypted block or nullptr.
   @return pointer to slot */
-  Slot *reserve_slot(IORequest &type, fil_node_t *m1, void *m2,
-                     pfs_os_file_t file, const char *name, void *buf,
-                     os_offset_t offset, ulint len, const file::Block *e_block)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] Slot *reserve_slot(IORequest &type, fil_node_t *m1, void *m2,
+                                   pfs_os_file_t file, const char *name,
+                                   void *buf, os_offset_t offset, ulint len,
+                                   const file::Block *e_block);
 
   /** @return number of reserved slots */
   ulint pending_io_count() const;
@@ -453,16 +454,17 @@
   /** Returns a pointer to the nth slot in the aio array.
   @param[in]	i	Index of the slot in the array
   @return pointer to slot */
-  const Slot *at(ulint i) const MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] const Slot *at(ulint i) const {
     ut_a(i < m_slots.size());
 
     return (&m_slots[i]);
   }
 
   /** Non const version */
-  Slot *at(ulint i) MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] Slot *at(ulint i) {
     if (i >= m_slots.size()) {
-      ib::fatal(ER_IB_MSG_1357) << "i: " << i << " slots: " << m_slots.size();
+      ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_1357)
+          << "i: " << i << " slots: " << m_slots.size();
     }
 
     return (&m_slots[i]);
@@ -481,20 +483,16 @@
   void print(FILE *file);
 
   /** @return the number of slots per segment */
-  ulint slots_per_segment() const MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] ulint slots_per_segment() const {
     return (m_slots.size() / m_n_segments);
   }
 
   /** @return accessor for n_segments */
-  ulint get_n_segments() const MY_ATTRIBUTE((warn_unused_result)) {
-    return (m_n_segments);
-  }
+  [[nodiscard]] ulint get_n_segments() const { return (m_n_segments); }
 
 #ifdef UNIV_DEBUG
   /** @return true if the thread owns the mutex */
-  bool is_mutex_owned() const MY_ATTRIBUTE((warn_unused_result)) {
-    return (mutex_own(&m_mutex));
-  }
+  [[nodiscard]] bool is_mutex_owned() const { return (mutex_own(&m_mutex)); }
 #endif /* UNIV_DEBUG */
 
   /** Acquire the mutex */
@@ -511,12 +509,12 @@
   /** Dispatch an AIO request to the kernel.
   @param[in,out]	slot	an already reserved slot
   @return true on success. */
-  bool linux_dispatch(Slot *slot) MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] bool linux_dispatch(Slot *slot);
 
   /** Accessor for an AIO event
   @param[in]	index	Index into the array
   @return the event at the index */
-  io_event *io_events(ulint index) MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] io_event *io_events(ulint index) {
     ut_a(index < m_events.size());
 
     return (&m_events[index]);
@@ -525,7 +523,7 @@
   /** Accessor for the AIO context
   @param[in]	segment	Segment for which to get the context
   @return the AIO context for the segment */
-  io_context *io_ctx(ulint segment) MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] io_context *io_ctx(ulint segment) {
     ut_ad(segment < get_n_segments());
 
     return (m_aio_ctx[segment]);
@@ -535,16 +533,15 @@
   @param[in]	max_events	number of events
   @param[out]	io_ctx		io_ctx to initialize.
   @return true on success. */
-  static bool linux_create_io_ctx(ulint max_events, io_context_t *io_ctx)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static bool linux_create_io_ctx(ulint max_events,
+                                                io_context_t *io_ctx);
 
   /** Checks if the system supports native linux aio. On some kernel
   versions where native aio is supported it won't work on tmpfs. In such
   cases we can't use native aio as it is not possible to mix simulated
   and native aio.
   @return true if supported, false otherwise. */
-  static bool is_linux_native_aio_supported()
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static bool is_linux_native_aio_supported();
 #endif /* LINUX_NATIVE_AIO */
 
 #ifdef WIN_ASYNC_IO
@@ -583,20 +580,20 @@
 
   /** The non asynchronous IO array.
   @return the synchronous AIO array instance. */
-  static AIO *sync_array() MY_ATTRIBUTE((warn_unused_result)) { return s_sync; }
+  [[nodiscard]] static AIO *sync_array() { return s_sync; }
 
   /**
   Get the AIO handles for a segment.
   @param[in]	segment		The local segment.
   @return the handles for the segment. */
-  HANDLE *handles(ulint segment) MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] HANDLE *handles(ulint segment) {
     ut_ad(segment < m_handles->size() / slots_per_segment());
 
     return (&(*m_handles)[segment * slots_per_segment()]);
   }
 
   /** @return true if no slots are reserved */
-  bool is_empty() const MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] bool is_empty() const {
     ut_ad(is_mutex_owned());
     return (m_n_reserved == 0);
   }
@@ -610,8 +607,7 @@
                                   allowed; n must be divisible by m_n_segments
   @param[in]	n_segments	number of segments in the AIO array
   @return own: AIO array, NULL on failure */
-  static AIO *create(latch_id_t id, ulint n, ulint n_segments)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static AIO *create(latch_id_t id, ulint n, ulint n_segments);
 
   /** Initializes the asynchronous io system. Creates one array each
   for ibuf and log I/O. Also creates one array each for read and write
@@ -625,8 +621,8 @@
   @param[in]	n_writers	number of writer threads
   @param[in]	n_slots_sync	number of slots in the sync aio array
   @return true if AIO sub-system was started successfully */
-  static bool start(ulint n_per_seg, ulint n_readers, ulint n_writers,
-                    ulint n_slots_sync) MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static bool start(ulint n_per_seg, ulint n_readers,
+                                  ulint n_writers, ulint n_slots_sync);
 
   /** Free the AIO arrays */
   static void shutdown();
@@ -640,25 +636,24 @@
   @param[out]	array		AIO wait array
   @param[in]	segment		global segment number
   @return local segment number within the aio array */
-  static ulint get_array_and_local_segment(AIO *&array, ulint segment)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static ulint get_array_and_local_segment(AIO *&array,
+                                                         ulint segment);
 
   /** Select the IO slot array
   @param[in,out]	type		Type of IO, READ or WRITE
   @param[in]	read_only	true if running in read-only mode
   @param[in]	aio_mode	IO mode
   @return slot array or NULL if invalid mode specified */
-  static AIO *select_slot_array(IORequest &type, bool read_only,
-                                AIO_mode aio_mode)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static AIO *select_slot_array(IORequest &type, bool read_only,
+                                              AIO_mode aio_mode);
 
   /** Calculates segment number for a slot.
   @param[in]	array		AIO wait array
   @param[in]	slot		slot in this array
   @return segment number (which is the number used by, for example,
           I/O handler threads) */
-  static ulint get_segment_no_from_slot(const AIO *array, const Slot *slot)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] static ulint get_segment_no_from_slot(const AIO *array,
+                                                      const Slot *slot);
 
   /** Wakes up a simulated AIO I/O handler thread if it has something to do.
   @param[in]	global_segment	The number of the segment in the AIO arrays */
@@ -667,9 +662,7 @@
   /** Check if it is a read request
   @param[in]	aio		The AIO instance to check
   @return true if the AIO instance is for reading. */
-  static bool is_read(const AIO *aio) MY_ATTRIBUTE((warn_unused_result)) {
-    return (s_reads == aio);
-  }
+  [[nodiscard]] static bool is_read(const AIO *aio) { return (s_reads == aio); }
 
   /** Wait on an event until no pending writes */
   static void wait_until_no_pending_writes() {
@@ -688,7 +681,7 @@
  private:
   /** Initialise the slots
   @return DB_SUCCESS or error code */
-  dberr_t init_slots() MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t init_slots();
 
   /** Wakes up a simulated AIO I/O-handler thread if it has something to do
   for a local segment in the AIO array.
@@ -707,7 +700,7 @@
 #ifdef LINUX_NATIVE_AIO
   /** Initialise the Linux native AIO data structures
   @return DB_SUCCESS or error code */
-  dberr_t init_linux_native_aio() MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t init_linux_native_aio();
 #endif /* LINUX_NATIVE_AIO */
 
  private:
@@ -744,7 +737,7 @@
   std::atomic_size_t m_last_slot_used;
 
 #ifdef _WIN32
-  typedef std::vector<HANDLE, ut_allocator<HANDLE>> Handles;
+  typedef std::vector<HANDLE, ut::allocator<HANDLE>> Handles;
 
   /** Pointer to an array of OS native event handles where
   we copied the handles from slots, in the same order. This
@@ -991,8 +984,8 @@
     if (retry == MAX_BLOCKS * 3) {
       byte *ptr;
 
-      ptr = static_cast<byte *>(
-          ut_malloc_nokey(sizeof(*block) + BUFFER_BLOCK_SIZE));
+      ptr = static_cast<byte *>(ut::malloc_withkey(
+          UT_NEW_THIS_FILE_PSI_KEY, sizeof(*block) + BUFFER_BLOCK_SIZE));
 
       block = new (ptr) file::Block();
       block->m_ptr = static_cast<byte *>(ptr + sizeof(*block));
@@ -1027,7 +1020,7 @@
   a temporary block, we need to free it directly. */
   if (std::less<file::Block *>()(block, &block_cache->front()) ||
       std::greater<file::Block *>()(block, &block_cache->back())) {
-    ut_free(block);
+    ut::free(block);
   }
 }
 
@@ -1124,8 +1117,7 @@
   }
 
   /** Destructor */
-  ~SyncFileIO() { /* No op */
-  }
+  ~SyncFileIO() = default;
 
   /** Do the read/write
   @param[in]	request	The IO context and type
@@ -1249,7 +1241,7 @@
   }
 
   if (slot->encrypt_log_buf != nullptr) {
-    ut_free(slot->encrypt_log_buf);
+    ut::free(slot->encrypt_log_buf);
     slot->encrypt_log_buf = nullptr;
   }
 
@@ -1300,7 +1292,7 @@
     }
 
     if (slot->encrypt_log_buf != nullptr) {
-      ut_free(slot->encrypt_log_buf);
+      ut::free(slot->encrypt_log_buf);
       slot->encrypt_log_buf = nullptr;
     }
   } else if ((ulint)slot->n_bytes == (ulint)slot->len) {
@@ -1843,13 +1835,13 @@
   bool unexpected =
       (expected == NULL ? (parent != NULL) : (0 != strcmp(parent, expected)));
   if (unexpected) {
-    ib::fatal(ER_IB_MSG_752)
+    ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_752)
         << "os_file_get_parent_dir('" << child << "') returned '" << parent
         << "', instead of '" << expected << "'.";
   }
-  ut_free(parent);
-  ut_free(child);
-  ut_free(expected);
+  ut::free(parent);
+  ut::free(child);
+  ut::free(expected);
 }
 
 /* Test the function os_file_get_parent_dir. */
@@ -1909,7 +1901,7 @@
     dberr_t err = os_file_create_subdirs_if_needed(subdir);
 
     if (err != DB_SUCCESS) {
-      ut_free(subdir);
+      ut::free(subdir);
 
       return (err);
     }
@@ -1917,7 +1909,7 @@
     success = os_file_create_directory(subdir, false);
   }
 
-  ut_free(subdir);
+  ut::free(subdir);
 
   return (success ? DB_SUCCESS : DB_ERROR);
 }
@@ -2437,7 +2429,7 @@
     }
 
     /* All other errors should cause a trap for now. */
-    ib::fatal(ER_IB_MSG_755)
+    ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_755)
         << "Unexpected ret_code[" << ret << "] from io_getevents()!";
 
     break;
@@ -2505,11 +2497,12 @@
 
   if (err == DB_IO_PARTIAL_FAILED) {
     /* Aborting in case of submit failure */
-    ib::fatal(ER_IB_MSG_756) << "Native Linux AIO interface. "
-                                "io_submit() call failed when "
-                                "resubmitting a partial I/O "
-                                "request on the file "
-                             << slot->name << ".";
+    ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_756)
+        << "Native Linux AIO interface. "
+           "io_submit() call failed when "
+           "resubmitting a partial I/O "
+           "request on the file "
+        << slot->name << ".";
   }
 
   *m1 = slot->m1;
@@ -2756,7 +2749,7 @@
              " AIO or you can set innodb_use_native_aio to"
              " FALSE to avoid this message.";
 
-      /* fall through. */
+      [[fallthrough]];
     default:
       ib::error(ER_IB_MSG_766) << "Linux Native AIO check on "
                                << (srv_read_only_mode ? name : "tmpdir")
@@ -2893,7 +2886,8 @@
 
       case EIO:
 
-        ib::fatal(ER_IB_MSG_1358) << "fsync() returned EIO, aborting.";
+        ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_1358)
+            << "fsync() returned EIO, aborting.";
         break;
 
       case EINTR:
@@ -4873,7 +4867,7 @@
   for (ulint i = 0; i < os_aio_n_segments; i++) {
     AIO *array{};
 
-    get_array_and_local_segment(array, i);
+    (void)get_array_and_local_segment(array, i);
 
     if (array == s_reads) {
       os_event_reset(os_aio_segment_wait_events[i]);
@@ -4997,9 +4991,10 @@
 @param[out]	err		DB_SUCCESS or error code
 @param[in]	e_block         encrypted block or nullptr.
 @return number of bytes read/written, -1 if error */
-static MY_ATTRIBUTE((warn_unused_result)) ssize_t
-    os_file_io(const IORequest &in_type, os_file_t file, void *buf, ulint n,
-               os_offset_t offset, dberr_t *err, const file::Block *e_block) {
+[[nodiscard]] static ssize_t os_file_io(const IORequest &in_type,
+                                        os_file_t file, void *buf, ulint n,
+                                        os_offset_t offset, dberr_t *err,
+                                        const file::Block *e_block) {
   ulint original_n = n;
   file::Block *block{};
   IORequest type = in_type;
@@ -5076,7 +5071,7 @@
       }
 
       if (encrypt_log_buf != nullptr) {
-        ut_free(encrypt_log_buf);
+        ut::free(encrypt_log_buf);
       }
 
       return (original_n);
@@ -5106,7 +5101,7 @@
   }
 
   if (encrypt_log_buf != nullptr) {
-    ut_free(encrypt_log_buf);
+    ut::free(encrypt_log_buf);
   }
 
   if (*err != DB_IO_DECRYPT_FAIL) {
@@ -5131,10 +5126,10 @@
 @param[out]	err		DB_SUCCESS or error code
 @param[in]	e_block         encrypted block or nullptr.
 @return number of bytes written, -1 if error */
-static MY_ATTRIBUTE((warn_unused_result)) ssize_t
-    os_file_pwrite(IORequest &type, os_file_t file, const byte *buf, ulint n,
-                   os_offset_t offset, dberr_t *err,
-                   const file::Block *e_block) {
+[[nodiscard]] static ssize_t os_file_pwrite(IORequest &type, os_file_t file,
+                                            const byte *buf, ulint n,
+                                            os_offset_t offset, dberr_t *err,
+                                            const file::Block *e_block) {
 #ifdef UNIV_HOTBACKUP
   static meb::Mutex meb_mutex;
 #endif /* UNIV_HOTBACKUP */
@@ -5171,10 +5166,11 @@
 @param[in]	n		number of bytes to read, starting from offset
 @param[in]	e_block         encrypted block or nullptr.
 @return DB_SUCCESS if request was successful, false if fail */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    os_file_write_page(IORequest &type, const char *name, os_file_t file,
-                       const byte *buf, os_offset_t offset, ulint n,
-                       const file::Block *e_block) {
+[[nodiscard]] static dberr_t os_file_write_page(IORequest &type,
+                                                const char *name,
+                                                os_file_t file, const byte *buf,
+                                                os_offset_t offset, ulint n,
+                                                const file::Block *e_block) {
   dberr_t err(DB_ERROR_UNSET);
 
   ut_ad(type.validate());
@@ -5218,9 +5214,9 @@
 @param[in]	n		number of bytes to read, starting from offset
 @param[out]	err		DB_SUCCESS or error code
 @return number of bytes read, -1 if error */
-static MY_ATTRIBUTE((warn_unused_result)) ssize_t
-    os_file_pread(IORequest &type, os_file_t file, void *buf, ulint n,
-                  os_offset_t offset, dberr_t *err) {
+[[nodiscard]] static ssize_t os_file_pread(IORequest &type, os_file_t file,
+                                           void *buf, ulint n,
+                                           os_offset_t offset, dberr_t *err) {
 #ifdef UNIV_HOTBACKUP
   static meb::Mutex meb_mutex;
 
@@ -5253,10 +5249,11 @@
 @param[out]	o		number of bytes actually read
 @param[in]	exit_on_err	if true then exit on error
 @return DB_SUCCESS or error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    os_file_read_page(IORequest &type, const char *file_name, os_file_t file,
-                      void *buf, os_offset_t offset, ulint n, ulint *o,
-                      bool exit_on_err) {
+[[nodiscard]] static dberr_t os_file_read_page(IORequest &type,
+                                               const char *file_name,
+                                               os_file_t file, void *buf,
+                                               os_offset_t offset, ulint n,
+                                               ulint *o, bool exit_on_err) {
   dberr_t err(DB_ERROR_UNSET);
 
 #ifdef UNIV_HOTBACKUP
@@ -5322,8 +5319,8 @@
     }
   }
 
-  ib::fatal(ER_IB_MSG_818) << "Cannot read from file. OS error number " << errno
-                           << ".";
+  ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_818)
+      << "Cannot read from file. OS error number " << errno << ".";
 
   return (err);
 }
@@ -5349,9 +5346,10 @@
 @param[in]	on_error_silent	if true then don't print any message to the log
                                 iff it is an unknown non-fatal error
 @return true if we should retry the operation */
-static MY_ATTRIBUTE((warn_unused_result)) bool os_file_handle_error_cond_exit(
-    const char *name, const char *operation, bool should_exit,
-    bool on_error_silent) {
+[[nodiscard]] static bool os_file_handle_error_cond_exit(const char *name,
+                                                         const char *operation,
+                                                         bool should_exit,
+                                                         bool on_error_silent) {
   ulint err;
 
   err = os_file_get_last_error_low(false, on_error_silent);
@@ -5423,8 +5421,9 @@
 #ifndef UNIV_HOTBACKUP
         srv_fatal_error();
 #else  /* !UNIV_HOTBACKUP */
-        ib::fatal(ER_IB_MSG_822) << "Internal error,"
-                                 << " cannot continue operation.";
+        ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_822)
+            << "Internal error,"
+            << " cannot continue operation.";
 #endif /* !UNIV_HOTBACKUP */
       }
   }
@@ -5459,9 +5458,9 @@
 @param[in]	file_name	file name, used in the diagnostic message
 @param[in]	operation_name	"open" or "create"; used in the diagnostic
                                 message */
-void os_file_set_nocache(int fd MY_ATTRIBUTE((unused)),
-                         const char *file_name MY_ATTRIBUTE((unused)),
-                         const char *operation_name MY_ATTRIBUTE((unused))) {
+void os_file_set_nocache(int fd [[maybe_unused]],
+                         const char *file_name [[maybe_unused]],
+                         const char *operation_name [[maybe_unused]]) {
 /* some versions of Solaris may not have DIRECTIO_ON */
 #if defined(UNIV_SOLARIS) && defined(DIRECTIO_ON)
   if (directio(fd, DIRECTIO_ON) == -1) {
@@ -5726,9 +5725,15 @@
   if (err == DB_SUCCESS) {
     uint32_t flags = fsp_header_get_flags(static_cast<byte *>(buf));
     const page_size_t page_size(flags);
-    ut_ad(page_size.physical() <= n);
-    err = os_file_read_page(type, file_name, file, buf, 0, page_size.physical(),
-                            nullptr, true);
+    /* TODO: Revert to single page access.
+    Temporally, accepting multiple pages for Fil_shard::get_file_size() during
+    recovery phase, until we can get consistent DD flag at the time.
+    Fil_shard::get_file_size() doesn't need multiple pages access for
+    estimation, if the consistent flag is got from recovered DD. */
+    const size_t read_size = page_size.physical() * (n >> UNIV_PAGE_SIZE_SHIFT);
+    ut_ad(read_size > 0);
+    err = os_file_read_page(type, file_name, file, buf, 0, read_size, nullptr,
+                            true);
   }
   return (err);
 }
@@ -6190,8 +6195,8 @@
 
   ut_a(m_aio_ctx == nullptr);
 
-  m_aio_ctx = static_cast<io_context **>(
-      ut_zalloc_nokey(m_n_segments * sizeof(*m_aio_ctx)));
+  m_aio_ctx = static_cast<io_context **>(ut::zalloc_withkey(
+      UT_NEW_THIS_FILE_PSI_KEY, m_n_segments * sizeof(*m_aio_ctx)));
 
   if (m_aio_ctx == nullptr) {
     return (DB_OUT_OF_MEMORY);
@@ -6223,7 +6228,8 @@
 #ifdef _WIN32
   ut_a(m_handles == NULL);
 
-  m_handles = UT_NEW_NOKEY(Handles(m_slots.size()));
+  m_handles =
+      ut::new_withkey<Handles>(UT_NEW_THIS_FILE_PSI_KEY, m_slots.size());
 #endif /* _WIN32 */
 
   if (srv_use_native_aio) {
@@ -6258,10 +6264,11 @@
     return (nullptr);
   }
 
-  AIO *array = UT_NEW_NOKEY(AIO(id, n, n_segments));
+  AIO *array =
+      ut::new_withkey<AIO>(UT_NEW_THIS_FILE_PSI_KEY, id, n, n_segments);
 
   if (array != nullptr && array->init() != DB_SUCCESS) {
-    UT_DELETE(array);
+    ut::delete_(array);
 
     array = nullptr;
   }
@@ -6278,7 +6285,7 @@
 #endif /* WIN_ASYNC_IO */
 
 #ifdef _WIN32
-  UT_DELETE(m_handles);
+  ut::delete_(m_handles);
 #endif /* _WIN32 */
 
   mutex_destroy(&m_mutex);
@@ -6289,7 +6296,7 @@
 #if defined(LINUX_NATIVE_AIO)
   if (srv_use_native_aio) {
     m_events.clear();
-    ut_free(m_aio_ctx);
+    ut::free(m_aio_ctx);
   }
 #endif /* LINUX_NATIVE_AIO */
 
@@ -6399,7 +6406,8 @@
   os_aio_validate();
 
   os_aio_segment_wait_events = static_cast<os_event_t *>(
-      ut_zalloc_nokey(n_segments * sizeof *os_aio_segment_wait_events));
+      ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY,
+                         n_segments * sizeof *os_aio_segment_wait_events));
 
   if (os_aio_segment_wait_events == nullptr) {
     return false;
@@ -6416,19 +6424,19 @@
 
 /** Free the AIO arrays */
 void AIO::shutdown() {
-  UT_DELETE(s_ibuf);
+  ut::delete_(s_ibuf);
   s_ibuf = nullptr;
 
-  UT_DELETE(s_log);
+  ut::delete_(s_log);
   s_log = nullptr;
 
-  UT_DELETE(s_writes);
+  ut::delete_(s_writes);
   s_writes = nullptr;
 
-  UT_DELETE(s_sync);
+  ut::delete_(s_sync);
   s_sync = nullptr;
 
-  UT_DELETE(s_reads);
+  ut::delete_(s_reads);
   s_reads = nullptr;
 }
 
@@ -6468,7 +6476,8 @@
 
     /* allocate a new path and move the directory path to it. */
     check_path_len = dir_len + sizeof "/check_sector_size";
-    check_file_name = static_cast<char *>(ut_zalloc_nokey(check_path_len));
+    check_file_name = static_cast<char *>(
+        ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, check_path_len));
     memcpy(check_file_name, path, dir_len);
 
     /* Construct a check file name. */
@@ -6484,7 +6493,7 @@
           << " Please confirm O_DIRECT is"
           << " supported and remove the file " << check_file_name
           << " if it exists.";
-      ut_free(check_file_name);
+      ut::free(check_file_name);
       errno = 0;
       return;
     }
@@ -6508,7 +6517,7 @@
     close(check_file);
     unlink(check_file_name);
 
-    ut_free(check_file_name);
+    ut::free(check_file_name);
     errno = 0;
 
     os_io_ptr_align = sector_size;
@@ -6527,7 +6536,7 @@
 void os_create_block_cache() {
   ut_a(block_cache == nullptr);
 
-  block_cache = UT_NEW_NOKEY(Blocks(MAX_BLOCKS));
+  block_cache = ut::new_withkey<Blocks>(UT_NEW_THIS_FILE_PSI_KEY, MAX_BLOCKS);
 
   for (Blocks::iterator it = block_cache->begin(); it != block_cache->end();
        ++it) {
@@ -6537,7 +6546,8 @@
     /* Allocate double of max page size memory, since
     compress could generate more bytes than original
     data. */
-    it->m_ptr = static_cast<byte *>(ut_malloc_nokey(BUFFER_BLOCK_SIZE));
+    it->m_ptr = static_cast<byte *>(
+        ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, BUFFER_BLOCK_SIZE));
 
     ut_a(it->m_ptr != nullptr);
   }
@@ -6553,10 +6563,10 @@
   for (Blocks::iterator it = block_cache->begin(); it != block_cache->end();
        ++it) {
     ut_a(!it->m_in_use);
-    ut_free(it->m_ptr);
+    ut::free(it->m_ptr);
   }
 
-  UT_DELETE(block_cache);
+  ut::delete_(block_cache);
 
   block_cache = nullptr;
 }
@@ -6598,17 +6608,17 @@
     os_event_destroy(os_aio_segment_wait_events[i]);
   }
 
-  ut_free(os_aio_segment_wait_events);
+  ut::free(os_aio_segment_wait_events);
   os_aio_segment_wait_events = nullptr;
   os_aio_n_segments = 0;
 
   for (Blocks::iterator it = block_cache->begin(); it != block_cache->end();
        ++it) {
     ut_a(!it->m_in_use);
-    ut_free(it->m_ptr);
+    ut::free(it->m_ptr);
   }
 
-  UT_DELETE(block_cache);
+  ut::delete_(block_cache);
 
   block_cache = nullptr;
 }
@@ -6862,7 +6872,7 @@
         slot->buf_block = encrypted_block;
 
         if (slot->encrypt_log_buf != nullptr) {
-          ut_free(slot->encrypt_log_buf);
+          ut::free(slot->encrypt_log_buf);
         }
 
         slot->encrypt_log_buf = encrypt_log_buf;
@@ -7426,7 +7436,7 @@
   in the array; allocate a single buffer which can hold
   all data, and perform the I/O
   @return the length of the buffer */
-  ulint allocate_buffer() MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] ulint allocate_buffer() {
     ulint len;
     Slot *slot = first_slot();
 
@@ -7499,7 +7509,7 @@
   }
 
   /** @return the first slot in the consecutive array */
-  Slot *first_slot() MY_ATTRIBUTE((warn_unused_result)) {
+  [[nodiscard]] Slot *first_slot() {
     ut_a(m_n_elems > 0);
 
     return (m_slots[0]);
@@ -7509,8 +7519,7 @@
   @param[in]	global_segment	The global segment
   @param[in,out]	event		Wait on event if no active requests
   @return the number of slots */
-  ulint check_pending(ulint global_segment, os_event_t event)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] ulint check_pending(ulint global_segment, os_event_t event);
 
  private:
   /** Do the file read
@@ -8116,7 +8125,7 @@
       std::this_thread::sleep_for(ten);
       continue;
     } else {
-      ib::fatal(ER_INNODB_IO_WRITE_FAILED, name);
+      ib::fatal(UT_LOCATION_HERE, ER_INNODB_IO_WRITE_FAILED, name);
     }
   }
   return err;
diff -Nru mysql-8.0-8.0.26/storage/innobase/os/os0proc.cc mysql-8.0-8.0.27/storage/innobase/os/os0proc.cc
--- mysql-8.0-8.0.26/storage/innobase/os/os0proc.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/os/os0proc.cc	2021-09-28 11:46:34.000000000 +0000
@@ -42,14 +42,6 @@
 #include "ut0byte.h"
 #include "ut0mem.h"
 
-/* FreeBSD for example has only MAP_ANON, Linux has MAP_ANONYMOUS and
-MAP_ANON but MAP_ANON is marked as deprecated */
-#if defined(MAP_ANONYMOUS)
-#define OS_MAP_ANON MAP_ANONYMOUS
-#elif defined(MAP_ANON)
-#define OS_MAP_ANON MAP_ANON
-#endif
-
 /** The total amount of memory currently allocated from the operating
 system with os_mem_alloc_large(). */
 std::atomic<ulint> os_total_large_mem_allocated{0};
@@ -69,136 +61,3 @@
   return (static_cast<ulint>(getpid()));
 #endif
 }
-
-/** Allocates large pages memory.
-@param[in,out]	n	Number of bytes to allocate
-@return allocated memory */
-void *os_mem_alloc_large(ulint *n) {
-  void *ptr;
-  ulint size;
-#if defined HAVE_LINUX_LARGE_PAGES && defined UNIV_LINUX
-  int shmid;
-  struct shmid_ds buf;
-
-  if (!os_use_large_pages || !os_large_page_size) {
-    goto skip;
-  }
-
-  /* Align block size to os_large_page_size */
-  ut_ad(ut_is_2pow(os_large_page_size));
-  size = ut_2pow_round(*n + (os_large_page_size - 1), os_large_page_size);
-
-  shmid = shmget(IPC_PRIVATE, (size_t)size, SHM_HUGETLB | SHM_R | SHM_W);
-  if (shmid < 0) {
-    ib::warn(ER_IB_MSG_852)
-        << "Failed to allocate " << size << " bytes. errno " << errno;
-    ptr = nullptr;
-  } else {
-    ptr = shmat(shmid, nullptr, 0);
-    if (ptr == (void *)-1) {
-      ib::warn(ER_IB_MSG_853) << "Failed to attach shared memory segment,"
-                                 " errno "
-                              << errno;
-      ptr = nullptr;
-    }
-
-    /* Remove the shared memory segment so that it will be
-    automatically freed after memory is detached or
-    process exits */
-    shmctl(shmid, IPC_RMID, &buf);
-  }
-
-  if (ptr) {
-    *n = size;
-    os_total_large_mem_allocated.fetch_add(size);
-
-    UNIV_MEM_ALLOC(ptr, size);
-    return (ptr);
-  }
-
-  ib::warn(ER_IB_MSG_854) << "Using conventional memory pool";
-skip:
-#endif /* HAVE_LINUX_LARGE_PAGES && UNIV_LINUX */
-
-#ifdef _WIN32
-  SYSTEM_INFO system_info;
-  GetSystemInfo(&system_info);
-
-  /* Align block size to system page size */
-  ut_ad(ut_is_2pow(system_info.dwPageSize));
-  /* system_info.dwPageSize is only 32-bit. Casting to ulint is required
-  on 64-bit Windows. */
-  size = *n = ut_2pow_round(*n + (system_info.dwPageSize - 1),
-                            (ulint)system_info.dwPageSize);
-  ptr = VirtualAlloc(NULL, size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
-  if (!ptr) {
-    ib::info(ER_IB_MSG_855) << "VirtualAlloc(" << size
-                            << " bytes) failed;"
-                               " Windows error "
-                            << GetLastError();
-  } else {
-    os_total_large_mem_allocated.fetch_add(size);
-    UNIV_MEM_ALLOC(ptr, size);
-  }
-#else
-  size = getpagesize();
-  /* Align block size to system page size */
-  ut_ad(ut_is_2pow(size));
-  size = *n = ut_2pow_round(*n + (size - 1), size);
-  ptr = mmap(nullptr, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | OS_MAP_ANON,
-             -1, 0);
-  if (UNIV_UNLIKELY(ptr == (void *)-1)) {
-    ib::error(ER_IB_MSG_856) << "mmap(" << size
-                             << " bytes) failed;"
-                                " errno "
-                             << errno;
-    ptr = nullptr;
-  } else {
-    os_total_large_mem_allocated.fetch_add(size);
-    UNIV_MEM_ALLOC(ptr, size);
-  }
-#endif
-  return (ptr);
-}
-
-/** Frees large pages memory.
-@param[in]	ptr	pointer returned by os_mem_alloc_large()
-@param[in]	size	size returned by os_mem_alloc_large() */
-void os_mem_free_large(void *ptr, ulint size) {
-  ut_a(os_total_large_mem_allocated >= size);
-
-#if defined HAVE_LINUX_LARGE_PAGES && defined UNIV_LINUX
-  if (os_use_large_pages && os_large_page_size && !shmdt(ptr)) {
-    os_total_large_mem_allocated.fetch_sub(size);
-    UNIV_MEM_FREE(ptr, size);
-    return;
-  }
-#endif /* HAVE_LINUX_LARGE_PAGES && UNIV_LINUX */
-#ifdef _WIN32
-  /* When RELEASE memory, the size parameter must be 0.
-  Do not use MEM_RELEASE with MEM_DECOMMIT. */
-  if (!VirtualFree(ptr, 0, MEM_RELEASE)) {
-    ib::error(ER_IB_MSG_857) << "VirtualFree(" << ptr << ", " << size
-                             << ") failed; Windows error " << GetLastError();
-  } else {
-    os_total_large_mem_allocated.fetch_sub(size);
-    UNIV_MEM_FREE(ptr, size);
-  }
-#elif !defined OS_MAP_ANON
-  ut_free(ptr);
-#else
-#if defined(UNIV_SOLARIS)
-  if (munmap(static_cast<caddr_t>(ptr), size)) {
-#else
-  if (munmap(ptr, size)) {
-#endif /* UNIV_SOLARIS */
-    ib::error(ER_IB_MSG_858) << "munmap(" << ptr << ", " << size
-                             << ") failed;"
-                                " errno "
-                             << errno;
-  } else {
-    os_total_large_mem_allocated.fetch_sub(size);
-    UNIV_MEM_FREE(ptr, size);
-  }
-#endif
-}
diff -Nru mysql-8.0-8.0.26/storage/innobase/page/page0cur.cc mysql-8.0-8.0.27/storage/innobase/page/page0cur.cc
--- mysql-8.0-8.0.26/storage/innobase/page/page0cur.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/page/page0cur.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1134,13 +1134,14 @@
   if (mismatch_index + end_seg_len < sizeof buf1) {
     buf = buf1;
   } else {
-    buf = static_cast<byte *>(ut_malloc_nokey(mismatch_index + end_seg_len));
+    buf = static_cast<byte *>(ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY,
+                                                 mismatch_index + end_seg_len));
   }
 
   /* Build the inserted record to buf */
 
   if (UNIV_UNLIKELY(mismatch_index >= UNIV_PAGE_SIZE)) {
-    ib::fatal(ER_IB_MSG_859)
+    ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_859)
         << "is_short " << is_short << ", "
         << "info_and_status_bits " << info_and_status_bits << ", offset "
         << page_offset(cursor_rec)
@@ -1171,7 +1172,7 @@
   }
 
   if (buf != buf1) {
-    ut_free(buf);
+    ut::free(buf);
   }
 
   if (UNIV_LIKELY_NULL(heap)) {
diff -Nru mysql-8.0-8.0.26/storage/innobase/page/page0page.cc mysql-8.0-8.0.27/storage/innobase/page/page0page.cc
--- mysql-8.0-8.0.26/storage/innobase/page/page0page.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/page/page0page.cc	2021-09-28 11:46:34.000000000 +0000
@@ -499,7 +499,7 @@
     offsets = rec_get_offsets(cur1_rec, index, offsets, ULINT_UNDEFINED, &heap);
     ins_rec = page_cur_insert_rec_low(cur2, index, cur1_rec, offsets, mtr);
     if (UNIV_UNLIKELY(!ins_rec)) {
-      ib::fatal(ER_IB_MSG_862)
+      ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_862)
           << "Rec offset " << page_offset(rec) << ", cur1 offset "
           << page_offset(page_cur_get_rec(&cur1)) << ", cur2 offset "
           << page_offset(cur2);
@@ -1737,13 +1737,15 @@
   supremum_offs = mach_read_from_2(page_dir_get_nth_slot(page, n_slots - 1));
 
   if (UNIV_UNLIKELY(!page_rec_is_infimum_low(infimum_offs))) {
-    ib::fatal(ER_IB_MSG_867) << "Page directory corruption: infimum not"
-                                " pointed to";
+    ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_867)
+        << "Page directory corruption: infimum not"
+           " pointed to";
   }
 
   if (UNIV_UNLIKELY(!page_rec_is_supremum_low(supremum_offs))) {
-    ib::fatal(ER_IB_MSG_868) << "Page directory corruption: supremum not"
-                                " pointed to";
+    ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_868)
+        << "Page directory corruption: supremum not"
+           " pointed to";
   }
 }
 #endif /* UNIV_DEBUG */
diff -Nru mysql-8.0-8.0.26/storage/innobase/page/zipdecompress.cc mysql-8.0-8.0.27/storage/innobase/page/zipdecompress.cc
--- mysql-8.0-8.0.26/storage/innobase/page/zipdecompress.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/page/zipdecompress.cc	2021-09-28 11:46:34.000000000 +0000
@@ -87,9 +87,9 @@
 }
 
 /** Deallocate memory for zlib. */
-static void page_zip_free(
-    void *opaque MY_ATTRIBUTE((unused)),  /*!< in: memory heap */
-    void *address MY_ATTRIBUTE((unused))) /*!< in: object to free */
+static void page_zip_free(void *opaque [[maybe_unused]], /*!< in: memory heap */
+                          void *address
+                          [[maybe_unused]]) /*!< in: object to free */
 {}
 
 } /* extern "C" */
@@ -122,7 +122,7 @@
 
 /** Populate the sparse page directory from the dense directory.
  @return true on success, false on failure */
-static MY_ATTRIBUTE((warn_unused_result)) ibool page_zip_dir_decode(
+[[nodiscard]] static ibool page_zip_dir_decode(
     const page_zip_des_t *page_zip, /*!< in: dense page directory on
                                    compressed page */
     page_t *page,                   /*!< in: compact page with valid header;
@@ -654,7 +654,7 @@
         if (!d_stream->avail_out) {
           break;
         }
-        /* fall through */
+        [[fallthrough]];
       default:
         page_zip_fail(
             ("page_zip_decompress_node_ptrs:"
@@ -686,7 +686,7 @@
         if (!d_stream->avail_out) {
           break;
         }
-        /* fall through */
+        [[fallthrough]];
       default:
         page_zip_fail(
             ("page_zip_decompress_node_ptrs:"
@@ -831,7 +831,7 @@
           if (!d_stream->avail_out) {
             break;
           }
-          /* fall through */
+          [[fallthrough]];
         default:
           page_zip_fail(
               ("page_zip_decompress_sec:"
@@ -1053,7 +1053,7 @@
           if (!d_stream->avail_out) {
             break;
           }
-          /* fall through */
+          [[fallthrough]];
         default:
           page_zip_fail(
               ("page_zip_decompress_clust_ext:"
@@ -1083,7 +1083,7 @@
           if (!d_stream->avail_out) {
             break;
           }
-          /* fall through */
+          [[fallthrough]];
         default:
           page_zip_fail(
               ("page_zip_decompress_clust_ext:"
@@ -1157,7 +1157,7 @@
         if (UNIV_LIKELY(!d_stream->avail_out)) {
           break;
         }
-        /* fall through */
+        [[fallthrough]];
       default:
         page_zip_fail(
             ("page_zip_decompress_clust:"
@@ -1205,7 +1205,7 @@
           if (!d_stream->avail_out) {
             break;
           }
-          /* fall through */
+          [[fallthrough]];
         default:
           page_zip_fail(
               ("page_zip_decompress_clust:"
@@ -1235,7 +1235,7 @@
         if (!d_stream->avail_out) {
           break;
         }
-        /* fall through */
+        [[fallthrough]];
       default:
         page_zip_fail(
             ("page_zip_decompress_clust:"
diff -Nru mysql-8.0-8.0.26/storage/innobase/pars/lexyy.cc mysql-8.0-8.0.27/storage/innobase/pars/lexyy.cc
--- mysql-8.0-8.0.26/storage/innobase/pars/lexyy.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/pars/lexyy.cc	2021-09-28 11:46:34.000000000 +0000
@@ -297,12 +297,12 @@
 static int yy_did_buffer_switch_on_eof;
 
 static void yyrestart (FILE *input_file  );
-MY_ATTRIBUTE((unused)) static void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+[[maybe_unused]] static void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
 static YY_BUFFER_STATE yy_create_buffer (FILE *file,int size  );
 static void yy_delete_buffer (YY_BUFFER_STATE b  );
 static void yy_flush_buffer (YY_BUFFER_STATE b  );
-MY_ATTRIBUTE((unused)) static void yypush_buffer_state (YY_BUFFER_STATE new_buffer  );
-MY_ATTRIBUTE((unused)) static void yypop_buffer_state (void );
+[[maybe_unused]] static void yypush_buffer_state (YY_BUFFER_STATE new_buffer  );
+[[maybe_unused]] static void yypop_buffer_state (void );
 
 static void yyensure_buffer_stack (void );
 static void yy_load_buffer_state (void );
@@ -911,9 +911,9 @@
 #include "mem0mem.h"
 #include "os0proc.h"
 
-#define malloc(A)	ut_malloc_nokey(A)
-#define free(A)		ut_free(A)
-#define realloc(P, A)	ut_realloc(P, A)
+#define malloc(A) ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, A)
+#define free(A) ut::free(A)
+#define realloc(P, A) ut::realloc(P, A)
 #define exit(A) 	ut_error
 
 /* Note: We cast result from int to yy_size_t */
@@ -977,31 +977,31 @@
 /* Accessor methods to globals.
    These are made visible to non-reentrant scanners for convenience. */
 
-MY_ATTRIBUTE((unused)) static int yylex_destroy (void );
+[[maybe_unused]] static int yylex_destroy (void );
 
-MY_ATTRIBUTE((unused)) static int yyget_debug (void );
+[[maybe_unused]] static int yyget_debug (void );
 
-MY_ATTRIBUTE((unused)) static void yyset_debug (int debug_flag  );
+[[maybe_unused]] static void yyset_debug (int debug_flag  );
 
 YY_EXTRA_TYPE yyget_extra (void );
 
 
 
-MY_ATTRIBUTE((unused)) static FILE *yyget_in (void );
+[[maybe_unused]] static FILE *yyget_in (void );
 
-MY_ATTRIBUTE((unused)) static void yyset_in  (FILE * in_str  );
+[[maybe_unused]] static void yyset_in  (FILE * in_str  );
 
-MY_ATTRIBUTE((unused)) static FILE *yyget_out (void );
+[[maybe_unused]] static FILE *yyget_out (void );
 
-MY_ATTRIBUTE((unused)) static void yyset_out  (FILE * out_str  );
+[[maybe_unused]] static void yyset_out  (FILE * out_str  );
 
 yy_size_t yyget_leng (void );
 
-MY_ATTRIBUTE((unused)) static char *yyget_text (void );
+[[maybe_unused]] static char *yyget_text (void );
 
-MY_ATTRIBUTE((unused)) static int yyget_lineno (void );
+[[maybe_unused]] static int yyget_lineno (void );
 
-MY_ATTRIBUTE((unused)) static void yyset_lineno (int line_number  );
+[[maybe_unused]] static void yyset_lineno (int line_number  );
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -2545,7 +2545,7 @@
  * @param new_buffer The new input buffer.
  * 
  */
-    MY_ATTRIBUTE((unused)) static void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+    [[maybe_unused]] static void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
 {
     
 	/* TODO. We should be able to replace this entire function body
@@ -2694,7 +2694,7 @@
  *  @param new_buffer The new state.
  *  
  */
-MY_ATTRIBUTE((unused)) static void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
+[[maybe_unused]] static void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
 {
   if (new_buffer == nullptr) return;
 
@@ -2722,7 +2722,7 @@
  *  The next element becomes the new top.
  *  
  */
-MY_ATTRIBUTE((unused)) static void yypop_buffer_state (void)
+[[maybe_unused]] static void yypop_buffer_state (void)
 {
     	if (!YY_CURRENT_BUFFER)
 		return;
@@ -2816,7 +2816,7 @@
 /** Get the current line number.
  * 
  */
-MY_ATTRIBUTE((unused)) static int yyget_lineno  (void)
+[[maybe_unused]] static int yyget_lineno  (void)
 {
         
     return yylineno;
@@ -2825,7 +2825,7 @@
 /** Get the input stream.
  * 
  */
-MY_ATTRIBUTE((unused)) static FILE *yyget_in  (void)
+[[maybe_unused]] static FILE *yyget_in  (void)
 {
         return yyin;
 }
@@ -2833,7 +2833,7 @@
 /** Get the output stream.
  * 
  */
-MY_ATTRIBUTE((unused)) static FILE *yyget_out  (void)
+[[maybe_unused]] static FILE *yyget_out  (void)
 {
         return yyout;
 }
@@ -2850,7 +2850,7 @@
  * 
  */
 
-MY_ATTRIBUTE((unused)) static char *yyget_text  (void)
+[[maybe_unused]] static char *yyget_text  (void)
 {
         return yytext;
 }
@@ -2859,7 +2859,7 @@
  * @param line_number line number
  * 
  */
-MY_ATTRIBUTE((unused)) static void yyset_lineno (int  line_number )
+[[maybe_unused]] static void yyset_lineno (int  line_number )
 {
     
     yylineno = line_number;
@@ -2871,22 +2871,22 @@
  * 
  * @see yy_switch_to_buffer
  */
-MY_ATTRIBUTE((unused)) static void yyset_in (FILE *  in_str )
+[[maybe_unused]] static void yyset_in (FILE *  in_str )
 {
         yyin = in_str ;
 }
 
-MY_ATTRIBUTE((unused)) static void yyset_out (FILE *  out_str )
+[[maybe_unused]] static void yyset_out (FILE *  out_str )
 {
         yyout = out_str ;
 }
 
-MY_ATTRIBUTE((unused)) static int yyget_debug  (void)
+[[maybe_unused]] static int yyget_debug  (void)
 {
         return yy_flex_debug;
 }
 
-MY_ATTRIBUTE((unused)) static void yyset_debug (int  bdebug )
+[[maybe_unused]] static void yyset_debug (int  bdebug )
 {
         yy_flex_debug = bdebug ;
 }
@@ -2920,7 +2920,7 @@
 }
 
 /* yylex_destroy is for both reentrant and non-reentrant scanners. */
-MY_ATTRIBUTE((unused)) static int yylex_destroy  (void)
+[[maybe_unused]] static int yylex_destroy  (void)
 {
     
     /* Pop the buffer stack, destroying each element. */
diff -Nru mysql-8.0-8.0.26/storage/innobase/pars/make_flex.sh mysql-8.0-8.0.27/storage/innobase/pars/make_flex.sh
--- mysql-8.0-8.0.26/storage/innobase/pars/make_flex.sh	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/pars/make_flex.sh	2021-09-28 11:46:34.000000000 +0000
@@ -43,15 +43,15 @@
 s/\<register\> *//;
 s/\(int offset = \)\((yy_c_buf_p) - (yytext_ptr)\);/\1(int)(\2);/;
 s/\(void yy\(restart\|_\(delete\|flush\)_buffer\)\)/static \1/;
-s/\(void yy_switch_to_buffer\)/MY_ATTRIBUTE((unused)) static \1/;
-s/\(void yy\(push\|pop\)_buffer_state\)/MY_ATTRIBUTE((unused)) static \1/;
+s/\(void yy_switch_to_buffer\)/[[maybe_unused]] static \1/;
+s/\(void yy\(push\|pop\)_buffer_state\)/[[maybe_unused]] static \1/;
 s/\(YY_BUFFER_STATE yy_create_buffer\)/static \1/;
 s/^void yyset_extra.*;//;
-s/\(\(int\|void\) yy[gs]et_\)/MY_ATTRIBUTE((unused)) static \1/;
+s/\(\(int\|void\) yy[gs]et_\)/[[maybe_unused]] static \1/;
 s/\(void \*\?yy\(\(re\)\?alloc\|free\)\)/static \1/;
 s/\(extern \)\?\(int yy\(leng\|lineno\|_flex_debug\)\)/static \2/;
-s/\(int yylex_destroy\)/MY_ATTRIBUTE((unused)) static \1/;
-s/^\(\(FILE\|char\) *\* *yyget\)/MY_ATTRIBUTE((unused)) static \1/;
+s/\(int yylex_destroy\)/[[maybe_unused]] static \1/;
+s/^\(\(FILE\|char\) *\* *yyget\)/[[maybe_unused]] static \1/;
 s/^\(extern \)\?\(\(FILE\|char\) *\* *yy\)/static \2/;
 s/^static FILE \*yyin = .*0, \*yyout = .*0;//;
 s/^static int yy\(_flex_debug\|lineno\);//;
diff -Nru mysql-8.0-8.0.26/storage/innobase/pars/pars0lex.l mysql-8.0-8.0.27/storage/innobase/pars/pars0lex.l
--- mysql-8.0-8.0.26/storage/innobase/pars/pars0lex.l	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/pars/pars0lex.l	2021-09-28 11:46:34.000000000 +0000
@@ -67,8 +67,8 @@
 #include "mem0mem.h"
 #include "os0proc.h"
 
-#define malloc(A)	ut_malloc_nokey(A)
-#define free(A)		ut_free(A)
+#define malloc(A)	ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, A)
+#define free(A)		ut::free(A)
 #define realloc(P, A)	ut_realloc(P, A)
 #define exit(A) 	ut_error
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/pars/pars0pars.cc mysql-8.0-8.0.27/storage/innobase/pars/pars0pars.cc
--- mysql-8.0-8.0.26/storage/innobase/pars/pars0pars.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/pars/pars0pars.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1606,7 +1606,7 @@
 @return table create subgraph */
 tab_node_t *pars_create_table(sym_node_t *table_sym, sym_node_t *column_defs,
                               sym_node_t *compact, sym_node_t *block_size,
-                              void *not_fit_in_memory MY_ATTRIBUTE((unused))) {
+                              void *not_fit_in_memory [[maybe_unused]]) {
   return (nullptr);
 }
 
@@ -1695,12 +1695,13 @@
 }
 
 /** Called by yyparse on error. */
-void yyerror(const char *s MY_ATTRIBUTE((unused)))
+void yyerror(const char *s [[maybe_unused]])
 /*!< in: error message string */
 {
   ut_ad(s);
 
-  ib::fatal(ER_IB_MSG_917) << "PARSER: Syntax error in SQL string";
+  ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_917)
+      << "PARSER: Syntax error in SQL string";
 }
 
 /** Parses an SQL string returning the query graph.
diff -Nru mysql-8.0-8.0.26/storage/innobase/que/que0que.cc mysql-8.0-8.0.27/storage/innobase/que/que0que.cc
--- mysql-8.0-8.0.26/storage/innobase/que/que0que.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/que/que0que.cc	2021-09-28 11:46:34.000000000 +0000
@@ -782,7 +782,7 @@
 #ifdef UNIV_DEBUG
 /** Gets information of an SQL query graph node.
 @return type description */
-static MY_ATTRIBUTE((warn_unused_result)) const char *que_node_type_string(
+[[nodiscard]] static const char *que_node_type_string(
     const que_node_t *node) /*!< in: query graph node */
 {
   switch (que_node_get_type(node)) {
diff -Nru mysql-8.0-8.0.26/storage/innobase/read/read0read.cc mysql-8.0-8.0.27/storage/innobase/read/read0read.cc
--- mysql-8.0-8.0.26/storage/innobase/read/read0read.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/read/read0read.cc	2021-09-28 11:46:34.000000000 +0000
@@ -225,7 +225,8 @@
 
   value_type *p = m_ptr;
 
-  m_ptr = UT_NEW_ARRAY_NOKEY(value_type, n);
+  m_ptr =
+      ut::new_arr_withkey<value_type>(UT_NEW_THIS_FILE_PSI_KEY, ut::Count{n});
 
   m_reserved = n;
 
@@ -234,7 +235,7 @@
   if (p != nullptr) {
     ::memmove(m_ptr, p, size() * sizeof(value_type));
 
-    UT_DELETE_ARRAY(p);
+    ut::delete_arr(p);
   }
 }
 
@@ -330,7 +331,7 @@
 @param size		Number of views to pre-allocate */
 MVCC::MVCC(ulint size) : m_free(), m_views() {
   for (ulint i = 0; i < size; ++i) {
-    ReadView *view = UT_NEW_NOKEY(ReadView());
+    ReadView *view = ut::new_withkey<ReadView>(UT_NEW_THIS_FILE_PSI_KEY);
 
     UT_LIST_ADD_FIRST(m_free, view);
   }
@@ -340,7 +341,7 @@
   while (ReadView *view = UT_LIST_GET_FIRST(m_free)) {
     UT_LIST_REMOVE(m_free, view);
 
-    UT_DELETE(view);
+    ut::delete_(view);
   }
 
   ut_a(UT_LIST_GET_LEN(m_views) == 0);
@@ -411,19 +412,21 @@
   if (ut_rnd_interval(0, 99) == 0) {
     /* Assert that all transaction ids in list are active. */
     for (auto trx_id : trx_ids) {
-      while (true) {
-        {
-          Trx_shard_latch_guard guard{trx_id, UT_LOCATION_HERE};
-          trx_t *trx = trx_get_rw_trx_by_id_low(trx_id);
-          if (trx != nullptr) {
-            const auto trx_state = trx->state.load(std::memory_order_relaxed);
-            /* Transaction in rw_trx_ids might only be ACTIVE or PREPARED,
-            before it becomes COMMITTED it is removed from rw_trx_ids. */
-            ut_ad(trx_state == TRX_STATE_ACTIVE ||
-                  trx_state == TRX_STATE_PREPARED);
-            break;
-          }
-        }
+      while (trx_sys->latch_and_execute_with_active_trx(
+          trx_id,
+          [](trx_t *trx) {
+            if (trx != nullptr) {
+              const auto trx_state = trx->state.load(std::memory_order_relaxed);
+              /* Transaction in active_rw_trxs might only be ACTIVE or
+              PREPARED, before it becomes COMMITTED it is removed from
+              active_rw_trxs. */
+              ut_ad(trx_state == TRX_STATE_ACTIVE ||
+                    trx_state == TRX_STATE_PREPARED);
+              return false;
+            }
+            return true;
+          },
+          UT_LOCATION_HERE)) {
         /* It might happen that transaction became added to rw_trx_ids,
         then trx_sys mutex has been released and thread become scheduled
         out before the call to trx_sys_rw_trx_add(trx). We need to wait,
@@ -480,7 +483,7 @@
     view = UT_LIST_GET_FIRST(m_free);
     UT_LIST_REMOVE(m_free, view);
   } else {
-    view = UT_NEW_NOKEY(ReadView());
+    view = ut::new_withkey<ReadView>(UT_NEW_THIS_FILE_PSI_KEY);
 
     if (view == nullptr) {
       ib::error(ER_IB_MSG_918) << "Failed to allocate MVCC view";
diff -Nru mysql-8.0-8.0.26/storage/innobase/rem/rec.h mysql-8.0-8.0.27/storage/innobase/rem/rec.h
--- mysql-8.0-8.0.26/storage/innobase/rem/rec.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/rem/rec.h	2021-09-28 11:46:34.000000000 +0000
@@ -185,7 +185,7 @@
  the fields defined in the clustered index. So the offsets
  size is allocated according to the clustered index fields.
  @return the new offsets */
-ulint *rec_get_offsets_func(
+[[nodiscard]] ulint *rec_get_offsets_func(
     const rec_t *rec,          /*!< in: physical record */
     const dict_index_t *index, /*!< in: record descriptor */
     ulint *offsets,            /*!< in/out: array consisting of
@@ -196,11 +196,10 @@
                               initialized fields
                                (ULINT_UNDEFINED if all fields) */
 #ifdef UNIV_DEBUG
-    const char *file,  /*!< in: file name where called */
-    ulint line,        /*!< in: line number where called */
-#endif                 /* UNIV_DEBUG */
-    mem_heap_t **heap) /*!< in/out: memory heap */
-    MY_ATTRIBUTE((warn_unused_result));
+    const char *file,   /*!< in: file name where called */
+    ulint line,         /*!< in: line number where called */
+#endif                  /* UNIV_DEBUG */
+    mem_heap_t **heap); /*!< in/out: memory heap */
 
 /** The following function determines the offsets to each field
  in the record.  It can reuse a previously allocated array. */
@@ -241,8 +240,8 @@
 
 /** The following function retrieves the status bits of a new-style record.
  @return status bits */
-static inline MY_ATTRIBUTE((warn_unused_result)) ulint
-    rec_get_status(const rec_t *rec) /*!< in: physical record */
+[[nodiscard]] static inline ulint rec_get_status(
+    const rec_t *rec) /*!< in: physical record */
 {
   ulint ret;
 
@@ -291,8 +290,8 @@
 /** The following function is used to get the number of fields
  in an old-style record, which is stored in the rec
  @return number of data fields */
-static inline MY_ATTRIBUTE((warn_unused_result)) uint16_t
-    rec_get_n_fields_old_raw(const rec_t *rec) /*!< in: physical record */
+[[nodiscard]] static inline uint16_t rec_get_n_fields_old_raw(
+    const rec_t *rec) /*!< in: physical record */
 {
   uint16_t ret;
 
@@ -313,8 +312,8 @@
 @param[in]	rec	physical record
 @param[in]	index	index where the record resides
 @return number of data fields */
-static inline MY_ATTRIBUTE((warn_unused_result)) uint16_t
-    rec_get_n_fields_old(const rec_t *rec, const dict_index_t *index) {
+[[nodiscard]] static inline uint16_t rec_get_n_fields_old(
+    const rec_t *rec, const dict_index_t *index) {
   uint16_t n = rec_get_n_fields_old_raw(rec);
 
   if (index->has_instant_cols()) {
@@ -396,7 +395,7 @@
 /** The following function returns the number of allocated elements
  for an array of offsets.
  @return number of elements */
-static inline MY_ATTRIBUTE((warn_unused_result)) ulint rec_offs_get_n_alloc(
+[[nodiscard]] static inline ulint rec_offs_get_n_alloc(
     const ulint *offsets) /*!< in: array for rec_get_offsets() */
 {
   ulint n_alloc;
@@ -435,7 +434,7 @@
 
 /** The following function returns the number of fields in a record.
  @return number of fields */
-static inline MY_ATTRIBUTE((warn_unused_result)) ulint rec_offs_n_fields(
+[[nodiscard]] static inline ulint rec_offs_n_fields(
     const ulint *offsets) /*!< in: array returned by rec_get_offsets() */
 {
   ulint n_fields;
@@ -488,7 +487,7 @@
 #ifdef UNIV_DEBUG
 /** Validates offsets returned by rec_get_offsets().
  @return true if valid */
-static inline MY_ATTRIBUTE((warn_unused_result)) ibool rec_offs_validate(
+[[nodiscard]] static inline ibool rec_offs_validate(
     const rec_t *rec,          /*!< in: record or NULL */
     const dict_index_t *index, /*!< in: record descriptor or NULL */
     const ulint *offsets)      /*!< in: array returned by
@@ -857,8 +856,8 @@
 /** The following function is used to test whether the data offsets in the
  record are stored in one-byte or two-byte format.
  @return true if 1-byte form */
-static inline MY_ATTRIBUTE((warn_unused_result)) ibool
-    rec_get_1byte_offs_flag(const rec_t *rec) /*!< in: physical record */
+[[nodiscard]] static inline ibool rec_get_1byte_offs_flag(
+    const rec_t *rec) /*!< in: physical record */
 {
 #if TRUE != 1
 #error "TRUE != 1"
@@ -872,9 +871,9 @@
  offsets form. If the field is SQL null, the flag is ORed in the returned
  value.
  @return offset of the start of the field, SQL null flag ORed */
-static inline MY_ATTRIBUTE((warn_unused_result)) ulint
-    rec_1_get_field_end_info(const rec_t *rec, /*!< in: record */
-                             ulint n)          /*!< in: field index */
+[[nodiscard]] static inline ulint rec_1_get_field_end_info(
+    const rec_t *rec, /*!< in: record */
+    ulint n)          /*!< in: field index */
 {
   ut_ad(rec_get_1byte_offs_flag(rec));
   ut_ad(n < rec_get_n_fields_old_raw(rec));
@@ -887,9 +886,9 @@
  value.
  @return offset of the start of the field, SQL null flag and extern
  storage flag ORed */
-static inline MY_ATTRIBUTE((warn_unused_result)) ulint
-    rec_2_get_field_end_info(const rec_t *rec, /*!< in: record */
-                             ulint n)          /*!< in: field index */
+[[nodiscard]] static inline ulint rec_2_get_field_end_info(
+    const rec_t *rec, /*!< in: record */
+    ulint n)          /*!< in: field index */
 {
   ut_ad(!rec_get_1byte_offs_flag(rec));
   ut_ad(n < rec_get_n_fields_old_raw(rec));
diff -Nru mysql-8.0-8.0.26/storage/innobase/rem/rem0cmp.cc mysql-8.0-8.0.27/storage/innobase/rem/rem0cmp.cc
--- mysql-8.0-8.0.26/storage/innobase/rem/rem0cmp.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/rem/rem0cmp.cc	2021-09-28 11:46:34.000000000 +0000
@@ -109,7 +109,8 @@
     return (cs->coll->strnncollsp(cs, a, a_length, b, b_length));
   }
 
-  ib::fatal(ER_IB_MSG_919) << "Unable to find charset-collation " << cs_num;
+  ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_919)
+      << "Unable to find charset-collation " << cs_num;
   return (0);
 }
 
@@ -362,7 +363,7 @@
                                     " using a character set collation!";
         ut_ad(0);
       }
-      /* fall through */
+      [[fallthrough]];
     case DATA_VARMYSQL:
     case DATA_MYSQL:
       cmp = innobase_mysql_cmp(prtype, a, a_length, b, b_length);
@@ -372,7 +373,8 @@
     case DATA_GEOMETRY:
       return (cmp_geometry_field(mtype, prtype, a, a_length, b, b_length));
     default:
-      ib::fatal(ER_IB_MSG_921) << "Unknown data type number " << mtype;
+      ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_921)
+          << "Unknown data type number " << mtype;
       cmp = 0;
   }
   if (!is_asc) {
@@ -418,7 +420,7 @@
         pad = 0x20;
         break;
       }
-      /* fall through */
+      [[fallthrough]];
     case DATA_INT:
     case DATA_SYS_CHILD:
     case DATA_SYS:
@@ -442,7 +444,7 @@
         pad = ULINT_UNDEFINED;
         break;
       }
-      /* fall through */
+      [[fallthrough]];
     default:
       return (cmp_whole_field(mtype, prtype, is_asc, data1, (unsigned)len1,
                               data2, (unsigned)len2));
@@ -703,7 +705,7 @@
         VARBINARY or BINARY columns. */
         return (ULINT_UNDEFINED);
       }
-      /* Fall through */
+      [[fallthrough]];
     case DATA_CHAR:
     case DATA_VARCHAR:
     case DATA_MYSQL:
@@ -718,7 +720,7 @@
       if (!(type->prtype & DATA_BINARY_TYPE)) {
         return (0x20);
       }
-      /* Fall through */
+      [[fallthrough]];
     default:
       /* No padding specified */
       return (ULINT_UNDEFINED);
@@ -801,7 +803,7 @@
         if (type->prtype & DATA_BINARY_TYPE) {
           break;
         }
-        /* fall through */
+        [[fallthrough]];
       default:
         ut_ad(!(dfield_is_multi_value(dfield) &&
                 dtuple_f_len == UNIV_MULTI_VALUE_ARRAY_MARKER));
@@ -907,7 +909,7 @@
 @retval positive if rec1 field is greater than rec2
 @retval negative if rec1 field is less than rec2
 @retval 0 if rec1 field equals to rec2 */
-static MY_ATTRIBUTE((warn_unused_result)) int cmp_rec_rec_simple_field(
+[[nodiscard]] static int cmp_rec_rec_simple_field(
     const rec_t *rec1, const rec_t *rec2, const ulint *offsets1,
     const ulint *offsets2, const dict_index_t *index, ulint n) {
   ulint rec1_f_len;
@@ -929,22 +931,20 @@
 
 int cmp_rec_rec_simple(const rec_t *rec1, const rec_t *rec2,
                        const ulint *offsets1, const ulint *offsets2,
-                       const dict_index_t *index, struct TABLE *table) {
+                       const dict_index_t *index, TABLE *table) {
   ulint n;
-  ulint n_uniq = dict_index_get_n_unique(index);
-  bool null_eq = false;
+  bool null_eq{};
+  const auto n_uniq = dict_index_get_n_unique(index);
 
   ut_ad(rec_offs_n_fields(offsets1) >= n_uniq);
-  ut_ad(rec_offs_n_fields(offsets2) == rec_offs_n_fields(offsets2));
-
   ut_ad(rec_offs_comp(offsets1) == rec_offs_comp(offsets2));
+  ut_ad(rec_offs_n_fields(offsets2) == rec_offs_n_fields(offsets2));
 
   for (n = 0; n < n_uniq; n++) {
-    int cmp =
-        cmp_rec_rec_simple_field(rec1, rec2, offsets1, offsets2, index, n);
+    auto r = cmp_rec_rec_simple_field(rec1, rec2, offsets1, offsets2, index, n);
 
-    if (cmp) {
-      return (cmp);
+    if (r != 0) {
+      return r;
     }
 
     /* If the fields are internally equal, they must both
@@ -964,29 +964,23 @@
   if (!null_eq && table && dict_index_is_unique(index)) {
     /* Report erroneous row using new version of table. */
     innobase_rec_to_mysql(table, rec1, index, offsets1);
-    return (0);
+    return 0;
   }
 
-  /* Else, keep comparing so that we have the full internal
-  order. */
+  /* Else, keep comparing so that we have the full internal order. */
   for (; n < dict_index_get_n_fields(index); n++) {
-    int cmp =
-        cmp_rec_rec_simple_field(rec1, rec2, offsets1, offsets2, index, n);
+    auto r = cmp_rec_rec_simple_field(rec1, rec2, offsets1, offsets2, index, n);
 
-    if (cmp) {
-      return (cmp);
+    if (r != 0) {
+      return r;
     }
 
-    /* If the fields are internally equal, they must both
-    be NULL or non-NULL. */
+    /* If the fields are equal, they must both be NULL or non-NULL. */
     ut_ad(rec_offs_nth_sql_null(offsets1, n) ==
           rec_offs_nth_sql_null(offsets2, n));
   }
 
-  /* This should never be reached. Internally, an index must
-  never contain duplicate entries. */
-  ut_ad(0);
-  return (0);
+  return 0;
 }
 
 int cmp_rec_rec_with_match(const rec_t *rec1, const rec_t *rec2,
diff -Nru mysql-8.0-8.0.26/storage/innobase/rem/rem0rec.cc mysql-8.0-8.0.27/storage/innobase/rem/rem0rec.cc
--- mysql-8.0-8.0.26/storage/innobase/rem/rem0rec.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/rem/rem0rec.cc	2021-09-28 11:46:34.000000000 +0000
@@ -290,21 +290,20 @@
 
 /** Determines the size of a data tuple prefix in ROW_FORMAT=COMPACT.
  @return total size */
-static inline MY_ATTRIBUTE((warn_unused_result)) ulint
-    rec_get_converted_size_comp_prefix_low(
-        const dict_index_t *index, /*!< in: record descriptor;
-                                   dict_table_is_comp() is
-                                   assumed to hold, even if
-                                   it does not */
-        const dfield_t *fields,    /*!< in: array of data fields */
-        ulint n_fields,            /*!< in: number of data fields */
-        const dtuple_t *v_entry,   /*!< in: dtuple contains virtual column
-                                   data */
-        ulint *extra,              /*!< out: extra size */
-        ulint *status,             /*!< in: status bits of the record,
-                                   can be nullptr if unnecessary */
-        bool temp)                 /*!< in: whether this is a
-                                   temporary file record */
+[[nodiscard]] static inline ulint rec_get_converted_size_comp_prefix_low(
+    const dict_index_t *index, /*!< in: record descriptor;
+                               dict_table_is_comp() is
+                               assumed to hold, even if
+                               it does not */
+    const dfield_t *fields,    /*!< in: array of data fields */
+    ulint n_fields,            /*!< in: number of data fields */
+    const dtuple_t *v_entry,   /*!< in: dtuple contains virtual column
+                               data */
+    ulint *extra,              /*!< out: extra size */
+    ulint *status,             /*!< in: status bits of the record,
+                               can be nullptr if unnecessary */
+    bool temp)                 /*!< in: whether this is a
+                               temporary file record */
 {
   ulint extra_size = 0;
   ulint data_size;
@@ -1003,7 +1002,7 @@
 #ifndef UNIV_HOTBACKUP
 /** Determines the size of a data tuple prefix in ROW_FORMAT=COMPACT.
  @return total size */
-ulint rec_get_converted_size_temp(
+ulint rec_get_serialize_size(
     const dict_index_t *index, /*!< in: record descriptor */
     const dfield_t *fields,    /*!< in: array of data fields */
     ulint n_fields,            /*!< in: number of data fields */
@@ -1016,8 +1015,8 @@
 }
 
 /** Determine the offset to each field in temporary file.
- @see rec_convert_dtuple_to_temp() */
-void rec_init_offsets_temp(
+ @see rec_serialize_dtuple() */
+void rec_deserialize_init_offsets(
     const rec_t *rec,          /*!< in: temporary file record */
     const dict_index_t *index, /*!< in: record descriptor */
     ulint *offsets)            /*!< in/out: array of offsets;
@@ -1027,8 +1026,8 @@
 }
 
 /** Builds a temporary file record out of a data tuple.
- @see rec_init_offsets_temp() */
-void rec_convert_dtuple_to_temp(
+ @see rec_deserialize_init_offsets() */
+void rec_serialize_dtuple(
     rec_t *rec,                /*!< out: record */
     const dict_index_t *index, /*!< in: record descriptor */
     const dfield_t *fields,    /*!< in: array of data fields */
@@ -1104,9 +1103,10 @@
   prefix_len = area_start + area_end;
 
   if ((*buf == nullptr) || (*buf_size < prefix_len)) {
-    ut_free(*buf);
+    ut::free(*buf);
     *buf_size = prefix_len;
-    *buf = static_cast<byte *>(ut_malloc_nokey(prefix_len));
+    *buf = static_cast<byte *>(
+        ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, prefix_len));
   }
 
   ut_memcpy(*buf, rec - area_start, prefix_len);
@@ -1226,9 +1226,10 @@
   prefix_len += rec - (lens + 1);
 
   if ((*buf == nullptr) || (*buf_size < prefix_len)) {
-    ut_free(*buf);
+    ut::free(*buf);
     *buf_size = prefix_len;
-    *buf = static_cast<byte *>(ut_malloc_nokey(prefix_len));
+    *buf = static_cast<byte *>(
+        ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, prefix_len));
   }
 
   memcpy(*buf, lens + 1, prefix_len);
diff -Nru mysql-8.0-8.0.26/storage/innobase/row/row0ftsort.cc mysql-8.0-8.0.27/storage/innobase/row/row0ftsort.cc
--- mysql-8.0-8.0.26/storage/innobase/row/row0ftsort.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/row/row0ftsort.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,1628 +0,0 @@
-/*****************************************************************************
-
-Copyright (c) 2010, 2021, Oracle 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, as published by the
-Free Software Foundation.
-
-This program is also distributed with certain software (including but not
-limited to OpenSSL) that is licensed under separate terms, as designated in a
-particular file or component or in included license documentation. The authors
-of MySQL hereby grant you an additional permission to link the program and
-your derivative works with the separately licensed software that they have
-included with MySQL.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
-for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-*****************************************************************************/
-
-/** @file row/row0ftsort.cc
- Create Full Text Index with (parallel) merge sort
-
- Created 10/13/2010 Jimmy Yang
- *******************************************************/
-
-#include <sys/types.h>
-
-#include "btr0bulk.h"
-#include "btr0cur.h"
-#include "dict0dd.h"
-#include "dict0dict.h"
-#include "fts0plugin.h"
-#include "ha_prototypes.h"
-#include "lob0lob.h"
-#include "os0thread-create.h"
-#include "pars0pars.h"
-#include "row0ftsort.h"
-#include "row0merge.h"
-#include "row0row.h"
-
-#include "my_dbug.h"
-
-/** Read the next record to buffer N.
-@param N index into array of merge info structure */
-#define ROW_MERGE_READ_GET_NEXT(N)                                             \
-  do {                                                                         \
-    b[N] = row_merge_read_rec(block[N], buf[N], b[N], index, fd[N], &foffs[N], \
-                              &mrec[N], offsets[N]);                           \
-    if (UNIV_UNLIKELY(!b[N])) {                                                \
-      if (mrec[N]) {                                                           \
-        goto exit;                                                             \
-      }                                                                        \
-    }                                                                          \
-  } while (0)
-
-/** Parallel sort degree */
-ulong fts_sort_pll_degree = 2;
-
-/** Create a temporary "fts sort index" used to merge sort the
- tokenized doc string. The index has three "fields":
-
- 1) Tokenized word,
- 2) Doc ID (depend on number of records to sort, it can be a 4 bytes or 8 bytes
- integer value)
- 3) Word's position in original doc.
-
- @return dict_index_t structure for the fts sort index */
-dict_index_t *row_merge_create_fts_sort_index(
-    dict_index_t *index,       /*!< in: Original FTS index
-                               based on which this sort index
-                               is created */
-    const dict_table_t *table, /*!< in: table that FTS index
-                               is being created on */
-    ibool *opt_doc_id_size)
-/*!< out: whether to use 4 bytes
-instead of 8 bytes integer to
-store Doc ID during sort */
-{
-  dict_index_t *new_index;
-  dict_field_t *field;
-  dict_field_t *idx_field;
-  CHARSET_INFO *charset;
-
-  // FIXME: This name shouldn't be hard coded here.
-  new_index = dict_mem_index_create(index->table->name.m_name, "tmp_fts_idx", 0,
-                                    DICT_FTS, 3);
-
-  new_index->id = index->id;
-  new_index->table = (dict_table_t *)table;
-  new_index->n_uniq = FTS_NUM_FIELDS_SORT;
-  new_index->n_def = FTS_NUM_FIELDS_SORT;
-  new_index->cached = TRUE;
-  new_index->parser = index->parser;
-  new_index->is_ngram = index->is_ngram;
-
-  idx_field = index->get_field(0);
-  charset = fts_index_get_charset(index);
-
-  /* The first field is on the Tokenized Word */
-  field = new_index->get_field(0);
-  field->name = nullptr;
-  field->prefix_len = 0;
-  field->is_ascending = true;
-  field->col = static_cast<dict_col_t *>(
-      mem_heap_alloc(new_index->heap, sizeof(dict_col_t)));
-  field->col->len = FTS_MAX_WORD_LEN;
-  field->col->mtype =
-      (charset == &my_charset_latin1) ? DATA_VARCHAR : DATA_VARMYSQL;
-
-  field->col->prtype = idx_field->col->prtype | DATA_NOT_NULL;
-  field->col->mbminmaxlen = idx_field->col->mbminmaxlen;
-  field->fixed_len = 0;
-
-  /* Doc ID */
-  field = new_index->get_field(1);
-  field->name = nullptr;
-  field->prefix_len = 0;
-  field->is_ascending = true;
-  field->col = static_cast<dict_col_t *>(
-      mem_heap_alloc(new_index->heap, sizeof(dict_col_t)));
-  field->col->mtype = DATA_INT;
-  *opt_doc_id_size = FALSE;
-
-  /* Check whether we can use 4 bytes instead of 8 bytes integer
-  field to hold the Doc ID, thus reduce the overall sort size */
-  if (DICT_TF2_FLAG_IS_SET(table, DICT_TF2_FTS_ADD_DOC_ID)) {
-    /* If Doc ID column is being added by this create
-    index, then just check the number of rows in the table */
-    if (dict_table_get_n_rows(table) < MAX_DOC_ID_OPT_VAL) {
-      *opt_doc_id_size = TRUE;
-    }
-  } else {
-    doc_id_t max_doc_id;
-
-    /* If the Doc ID column is supplied by user, then
-    check the maximum Doc ID in the table */
-    max_doc_id = fts_get_max_doc_id((dict_table_t *)table);
-
-    if (max_doc_id && max_doc_id < MAX_DOC_ID_OPT_VAL) {
-      *opt_doc_id_size = TRUE;
-    }
-  }
-
-  if (*opt_doc_id_size) {
-    field->col->len = sizeof(ib_uint32_t);
-    field->fixed_len = sizeof(ib_uint32_t);
-  } else {
-    field->col->len = FTS_DOC_ID_LEN;
-    field->fixed_len = FTS_DOC_ID_LEN;
-  }
-
-  field->col->prtype = DATA_NOT_NULL | DATA_BINARY_TYPE;
-
-  field->col->mbminmaxlen = 0;
-
-  /* The third field is on the word's position in the original doc */
-  field = new_index->get_field(2);
-  field->name = nullptr;
-  field->prefix_len = 0;
-  field->is_ascending = true;
-  field->col = static_cast<dict_col_t *>(
-      mem_heap_alloc(new_index->heap, sizeof(dict_col_t)));
-  field->col->mtype = DATA_INT;
-  field->col->len = 4;
-  field->fixed_len = 4;
-  field->col->prtype = DATA_NOT_NULL;
-  field->col->mbminmaxlen = 0;
-
-  return (new_index);
-}
-
-/** Initialize FTS parallel sort structures.
-@param[in] trx Transaction
-@param[in,out] dup Descriptor of fts index being created
-@param[in] old_table Needed to fetch lob from old table
-@param[in] new_table Table where indexes are created
-@param[in] opt_doc_id_size Whether to use 4 bytes instead of 8 bytes integer to
-store doc id during sort
-@param[out] psort Parallel sort info to be instantiated
-@param[out] merge Parallel merge info to be instantiated
-@return InnoDB error code */
-dberr_t row_fts_psort_info_init(trx_t *trx, row_merge_dup_t *dup,
-                                const dict_table_t *old_table,
-                                const dict_table_t *new_table,
-                                ibool opt_doc_id_size, fts_psort_t **psort,
-                                fts_psort_t **merge) {
-  ulint i;
-  ulint j;
-  fts_psort_common_t *common_info = nullptr;
-  fts_psort_t *psort_info = nullptr;
-  fts_psort_t *merge_info = nullptr;
-  ulint block_size;
-  dberr_t error = DB_SUCCESS;
-
-  block_size = 3 * srv_sort_buf_size;
-
-  *psort = psort_info = static_cast<fts_psort_t *>(
-      ut_zalloc_nokey(fts_sort_pll_degree * sizeof *psort_info));
-
-  if (!psort_info) {
-    ut_free(dup);
-    return (DB_OUT_OF_MEMORY);
-  }
-
-  /* Common Info for all sort threads */
-  common_info =
-      static_cast<fts_psort_common_t *>(ut_malloc_nokey(sizeof *common_info));
-
-  if (!common_info) {
-    ut_free(dup);
-    ut_free(psort_info);
-    *psort = nullptr;
-    return (DB_OUT_OF_MEMORY);
-  }
-
-  common_info->dup = dup;
-  common_info->old_table = (dict_table_t *)old_table;
-  common_info->new_table = (dict_table_t *)new_table;
-  common_info->trx = trx;
-  common_info->all_info = psort_info;
-  common_info->sort_event = os_event_create();
-  common_info->merge_event = os_event_create();
-  common_info->opt_doc_id_size = opt_doc_id_size;
-
-  ut_ad(trx->mysql_thd != nullptr);
-  const char *path = thd_innodb_tmpdir(trx->mysql_thd);
-
-  /* Initialize merge_info structures parallel merge and insert
-     into auxiliary FTS tables (FTS_INDEX_TABLE) */
-  *merge = merge_info = static_cast<fts_psort_t *>(
-      ut_malloc_nokey(FTS_NUM_AUX_INDEX * sizeof *merge_info));
-
-  if (!merge_info) {
-    ut_free(common_info);
-    error = DB_OUT_OF_MEMORY;
-    goto func_exit;
-  }
-
-  for (j = 0; j < FTS_NUM_AUX_INDEX; j++) {
-    merge_info[j].child_status = 0;
-    merge_info[j].state = 0;
-    merge_info[j].psort_common = common_info;
-  }
-
-  /* There will be FTS_NUM_AUX_INDEX number of "sort buckets" for
-  each parallel sort thread. Each "sort bucket" holds records for
-  a particular "FTS index partition" */
-  for (j = 0; j < fts_sort_pll_degree; j++) {
-    UT_LIST_INIT(psort_info[j].fts_doc_list);
-
-    for (i = 0; i < FTS_NUM_AUX_INDEX; i++) {
-      psort_info[j].merge_file[i] =
-          static_cast<merge_file_t *>(ut_zalloc_nokey(sizeof(merge_file_t)));
-
-      if (!psort_info[j].merge_file[i]) {
-        error = DB_OUT_OF_MEMORY;
-        goto func_exit;
-      }
-
-      psort_info[j].merge_buf[i] = row_merge_buf_create(dup->index);
-
-      if (row_merge_file_create(psort_info[j].merge_file[i], path) < 0) {
-        error = DB_TEMP_FILE_WRITE_FAIL;
-        goto func_exit;
-      }
-
-      /* Need to align memory for O_DIRECT write */
-      psort_info[j].merge_block[i] =
-          static_cast<row_merge_block_t *>(ut::aligned_alloc(block_size, 1024));
-
-      if (!psort_info[j].merge_block[i]) {
-        error = DB_OUT_OF_MEMORY;
-        goto func_exit;
-      }
-    }
-
-    psort_info[j].child_status = 0;
-    psort_info[j].state = 0;
-    psort_info[j].psort_common = common_info;
-    psort_info[j].error = DB_SUCCESS;
-    psort_info[j].memory_used = 0;
-    mutex_create(LATCH_ID_FTS_PLL_TOKENIZE, &psort_info[j].mutex);
-  }
-
-func_exit:
-  if (error != DB_SUCCESS) {
-    row_fts_free_pll_merge_buf(psort_info);
-    row_fts_psort_info_destroy(psort_info, merge_info);
-    *psort = nullptr;
-    *merge = nullptr;
-  }
-
-  return (error);
-}
-/** Clean up and deallocate FTS parallel sort structures, and close the
- merge sort files  */
-void row_fts_psort_info_destroy(
-    fts_psort_t *psort_info, /*!< parallel sort info */
-    fts_psort_t *merge_info) /*!< parallel merge info */
-{
-  ulint i;
-  ulint j;
-
-  if (psort_info) {
-    for (j = 0; j < fts_sort_pll_degree; j++) {
-      for (i = 0; i < FTS_NUM_AUX_INDEX; i++) {
-        if (psort_info[j].merge_file[i]) {
-          row_merge_file_destroy(psort_info[j].merge_file[i]);
-        }
-
-        ut::aligned_free(psort_info[j].merge_block[i]);
-        ut_free(psort_info[j].merge_file[i]);
-      }
-
-      // If error is unset, then the mutex has not been initialized yet.
-      if (psort_info[j].error != DB_ERROR_UNSET)
-        mutex_free(&psort_info[j].mutex);
-    }
-
-    os_event_destroy(merge_info[0].psort_common->sort_event);
-    os_event_destroy(merge_info[0].psort_common->merge_event);
-    ut_free(merge_info[0].psort_common->dup);
-    ut_free(merge_info[0].psort_common);
-    ut_free(psort_info);
-  }
-
-  ut_free(merge_info);
-}
-/** Free up merge buffers when merge sort is done */
-void row_fts_free_pll_merge_buf(
-    fts_psort_t *psort_info) /*!< in: parallel sort info */
-{
-  ulint j;
-  ulint i;
-
-  if (!psort_info) {
-    return;
-  }
-
-  for (j = 0; j < fts_sort_pll_degree; j++) {
-    for (i = 0; i < FTS_NUM_AUX_INDEX; i++) {
-      if (psort_info[j].merge_buf[i])
-        row_merge_buf_free(psort_info[j].merge_buf[i]);
-    }
-  }
-
-  return;
-}
-
-/** FTS plugin parser 'myql_add_word' callback function for row merge.
- Refer to 'MYSQL_FTPARSER_PARAM' for more detail.
- @return always returns 0 */
-static int row_merge_fts_doc_add_word_for_parser(
-    MYSQL_FTPARSER_PARAM *param,               /* in: parser paramter */
-    char *word,                                /* in: token word */
-    int word_len,                              /* in: word len */
-    MYSQL_FTPARSER_BOOLEAN_INFO *boolean_info) /* in: boolean info */
-{
-  fts_string_t str;
-  fts_tokenize_ctx_t *t_ctx;
-  row_fts_token_t *fts_token;
-  byte *ptr;
-
-  ut_ad(param);
-  ut_ad(param->mysql_ftparam);
-  ut_ad(word);
-  ut_ad(boolean_info);
-
-  t_ctx = static_cast<fts_tokenize_ctx_t *>(param->mysql_ftparam);
-  ut_ad(t_ctx);
-
-  str.f_str = reinterpret_cast<byte *>(word);
-  str.f_len = word_len;
-  str.f_n_char = fts_get_token_size((CHARSET_INFO *)param->cs, word, word_len);
-
-  ut_ad(boolean_info->position >= 0);
-
-  ptr = static_cast<byte *>(ut_malloc_nokey(sizeof(row_fts_token_t) +
-                                            sizeof(fts_string_t) + str.f_len));
-  fts_token = reinterpret_cast<row_fts_token_t *>(ptr);
-  fts_token->text =
-      reinterpret_cast<fts_string_t *>(ptr + sizeof(row_fts_token_t));
-  fts_token->text->f_str =
-      static_cast<byte *>(ptr + sizeof(row_fts_token_t) + sizeof(fts_string_t));
-
-  fts_token->text->f_len = str.f_len;
-  fts_token->text->f_n_char = str.f_n_char;
-  memcpy(fts_token->text->f_str, str.f_str, str.f_len);
-  fts_token->position = boolean_info->position;
-
-  /* Add token to list */
-  UT_LIST_ADD_LAST(t_ctx->fts_token_list, fts_token);
-
-  return (0);
-}
-
-/** Tokenize by fts plugin parser */
-static void row_merge_fts_doc_tokenize_by_parser(
-    fts_doc_t *doc,            /* in: doc to tokenize */
-    st_mysql_ftparser *parser, /* in: plugin parser instance */
-    fts_tokenize_ctx_t *t_ctx) /* in/out: tokenize ctx instance */
-{
-  MYSQL_FTPARSER_PARAM param;
-
-  ut_a(parser);
-
-  /* Set paramters for param */
-  param.mysql_parse = fts_tokenize_document_internal;
-  param.mysql_add_word = row_merge_fts_doc_add_word_for_parser;
-  param.mysql_ftparam = t_ctx;
-  param.cs = doc->charset;
-  param.doc = reinterpret_cast<char *>(doc->text.f_str);
-  param.length = static_cast<int>(doc->text.f_len);
-  param.mode = MYSQL_FTPARSER_SIMPLE_MODE;
-
-  PARSER_INIT(parser, &param);
-  /* We assume parse returns successfully here. */
-  parser->parse(&param);
-  PARSER_DEINIT(parser, &param);
-}
-
-/** Tokenize incoming text data and add to the sort buffer.
- @return true if the record passed, false if out of space */
-static ibool row_merge_fts_doc_tokenize(
-    row_merge_buf_t **sort_buf, /*!< in/out: sort buffer */
-    doc_id_t doc_id,            /*!< in: Doc ID */
-    fts_doc_t *doc,             /*!< in: Doc to be tokenized */
-    dtype_t *word_dtype,        /*!< in: data structure for
-                                word col */
-    merge_file_t **merge_file,  /*!< in/out: merge file */
-    ibool opt_doc_id_size,      /*!< in: whether to use 4 bytes
-                                instead of 8 bytes integer to
-                                store Doc ID during sort*/
-    fts_tokenize_ctx_t *t_ctx)  /*!< in/out: tokenize context */
-{
-  ulint inc = 0;
-  fts_string_t str;
-  ulint len;
-  row_merge_buf_t *buf;
-  dfield_t *field;
-  fts_string_t t_str;
-  ibool buf_full = FALSE;
-  byte str_buf[FTS_MAX_WORD_LEN + 1];
-  ulint data_size[FTS_NUM_AUX_INDEX];
-  ulint n_tuple[FTS_NUM_AUX_INDEX];
-  st_mysql_ftparser *parser;
-  bool is_ngram;
-
-  t_str.f_n_char = 0;
-  t_ctx->buf_used = 0;
-
-  memset(n_tuple, 0, FTS_NUM_AUX_INDEX * sizeof(ulint));
-  memset(data_size, 0, FTS_NUM_AUX_INDEX * sizeof(ulint));
-
-  parser = sort_buf[0]->index->parser;
-  is_ngram = sort_buf[0]->index->is_ngram;
-
-  /* Tokenize the data and add each word string, its corresponding
-  doc id and position to sort buffer */
-  while (t_ctx->processed_len < doc->text.f_len) {
-    ulint idx = 0;
-    ib_uint32_t position;
-    ulint cur_len = 0;
-    doc_id_t write_doc_id;
-    row_fts_token_t *fts_token = nullptr;
-
-    if (parser != nullptr) {
-      if (t_ctx->processed_len == 0) {
-        /* Parse the whole doc and cache tokens */
-        row_merge_fts_doc_tokenize_by_parser(doc, parser, t_ctx);
-
-        /* Just indictate we have parsed all the word */
-        t_ctx->processed_len += 1;
-      }
-
-      /* Then get a token */
-      fts_token = UT_LIST_GET_FIRST(t_ctx->fts_token_list);
-      if (fts_token) {
-        str.f_len = fts_token->text->f_len;
-        str.f_n_char = fts_token->text->f_n_char;
-        str.f_str = fts_token->text->f_str;
-      } else {
-        ut_ad(UT_LIST_GET_LEN(t_ctx->fts_token_list) == 0);
-        /* Reach the end of the list */
-        t_ctx->processed_len = doc->text.f_len;
-        break;
-      }
-    } else {
-      inc = innobase_mysql_fts_get_token(
-          doc->charset, doc->text.f_str + t_ctx->processed_len,
-          doc->text.f_str + doc->text.f_len, &str);
-
-      ut_a(inc > 0);
-    }
-
-    /* Ignore string whose character number is less than
-    "fts_min_token_size" or more than "fts_max_token_size" */
-    if (!fts_check_token(&str, nullptr, is_ngram, nullptr)) {
-      if (parser != nullptr) {
-        UT_LIST_REMOVE(t_ctx->fts_token_list, fts_token);
-        ut_free(fts_token);
-      } else {
-        t_ctx->processed_len += inc;
-      }
-
-      continue;
-    }
-
-    t_str.f_len =
-        innobase_fts_casedn_str(doc->charset, (char *)str.f_str, str.f_len,
-                                (char *)&str_buf, FTS_MAX_WORD_LEN + 1);
-
-    t_str.f_str = (byte *)&str_buf;
-
-    /* if "cached_stopword" is defined, ignore words in the
-    stopword list */
-    if (!fts_check_token(&str, t_ctx->cached_stopword, is_ngram,
-                         doc->charset)) {
-      if (parser != nullptr) {
-        UT_LIST_REMOVE(t_ctx->fts_token_list, fts_token);
-        ut_free(fts_token);
-      } else {
-        t_ctx->processed_len += inc;
-      }
-
-      continue;
-    }
-
-    /* There are FTS_NUM_AUX_INDEX auxiliary tables, find
-    out which sort buffer to put this word record in */
-    t_ctx->buf_used = fts_select_index(doc->charset, t_str.f_str, t_str.f_len);
-
-    buf = sort_buf[t_ctx->buf_used];
-
-    ut_a(t_ctx->buf_used < FTS_NUM_AUX_INDEX);
-    idx = t_ctx->buf_used;
-
-    mtuple_t *mtuple = &buf->tuples[buf->n_tuples + n_tuple[idx]];
-
-    field = mtuple->fields = static_cast<dfield_t *>(
-        mem_heap_alloc(buf->heap, FTS_NUM_FIELDS_SORT * sizeof *field));
-
-    /* The first field is the tokenized word */
-    dfield_set_data(field, t_str.f_str, t_str.f_len);
-    len = dfield_get_len(field);
-
-    field->type.mtype = word_dtype->mtype;
-    field->type.prtype = word_dtype->prtype | DATA_NOT_NULL;
-
-    /* Variable length field, set to max size. */
-    field->type.len = FTS_MAX_WORD_LEN;
-    field->type.mbminmaxlen = word_dtype->mbminmaxlen;
-
-    cur_len += len;
-    dfield_dup(field, buf->heap);
-    field++;
-
-    /* The second field is the Doc ID */
-
-    ib_uint32_t doc_id_32_bit;
-
-    if (!opt_doc_id_size) {
-      fts_write_doc_id((byte *)&write_doc_id, doc_id);
-
-      dfield_set_data(field, &write_doc_id, sizeof(write_doc_id));
-    } else {
-      mach_write_to_4((byte *)&doc_id_32_bit, (ib_uint32_t)doc_id);
-
-      dfield_set_data(field, &doc_id_32_bit, sizeof(doc_id_32_bit));
-    }
-
-    len = field->len;
-    ut_ad(len == FTS_DOC_ID_LEN || len == sizeof(ib_uint32_t));
-
-    field->type.mtype = DATA_INT;
-    field->type.prtype = DATA_NOT_NULL | DATA_BINARY_TYPE;
-    field->type.len = len;
-    field->type.mbminmaxlen = 0;
-
-    cur_len += len;
-    dfield_dup(field, buf->heap);
-
-    ++field;
-
-    /* The third field is the position */
-    if (parser != nullptr) {
-      mach_write_to_4(reinterpret_cast<byte *>(&position),
-                      (fts_token->position + t_ctx->init_pos));
-    } else {
-      mach_write_to_4(
-          reinterpret_cast<byte *>(&position),
-          (t_ctx->processed_len + inc - str.f_len + t_ctx->init_pos));
-    }
-
-    dfield_set_data(field, &position, sizeof(position));
-    len = dfield_get_len(field);
-    ut_ad(len == sizeof(ib_uint32_t));
-
-    field->type.mtype = DATA_INT;
-    field->type.prtype = DATA_NOT_NULL;
-    field->type.len = len;
-    field->type.mbminmaxlen = 0;
-    cur_len += len;
-    dfield_dup(field, buf->heap);
-
-    /* One variable length column, word with its lenght less than
-    fts_max_token_size, add one extra size and one extra byte.
-
-    Since the max length for FTS token now is larger than 255,
-    so we will need to signify length byte itself, so only 1 to 128
-    bytes can be used for 1 bytes, larger than that 2 bytes. */
-    if (t_str.f_len < 128) {
-      /* Extra size is one byte. */
-      cur_len += 2;
-    } else {
-      /* Extra size is two bytes. */
-      cur_len += 3;
-    }
-
-    /* Reserve one byte for the end marker of row_merge_block_t. */
-    if (buf->total_size + data_size[idx] + cur_len >= srv_sort_buf_size - 1) {
-      buf_full = TRUE;
-      break;
-    }
-
-    /* Increment the number of tuples */
-    n_tuple[idx]++;
-    if (parser != nullptr) {
-      UT_LIST_REMOVE(t_ctx->fts_token_list, fts_token);
-      ut_free(fts_token);
-    } else {
-      t_ctx->processed_len += inc;
-    }
-    data_size[idx] += cur_len;
-  }
-
-  /* Update the data length and the number of new word tuples
-  added in this round of tokenization */
-  for (ulint i = 0; i < FTS_NUM_AUX_INDEX; i++) {
-    /* The computation of total_size below assumes that no
-    delete-mark flags will be stored and that all fields
-    are NOT NULL and fixed-length. */
-
-    sort_buf[i]->total_size += data_size[i];
-
-    sort_buf[i]->n_tuples += n_tuple[i];
-
-    merge_file[i]->n_rec += n_tuple[i];
-    t_ctx->rows_added[i] += n_tuple[i];
-  }
-
-  if (!buf_full) {
-    /* we pad one byte between text accross two fields */
-    t_ctx->init_pos += doc->text.f_len + 1;
-  }
-
-  return (!buf_full);
-}
-
-/** Get next doc item from fts_doc_list */
-static inline void row_merge_fts_get_next_doc_item(
-    fts_psort_t *psort_info,   /*!< in: psort_info */
-    fts_doc_item_t **doc_item) /*!< in/out: doc item */
-{
-  if (*doc_item != nullptr) {
-    ut_free(*doc_item);
-  }
-
-  mutex_enter(&psort_info->mutex);
-
-  *doc_item = UT_LIST_GET_FIRST(psort_info->fts_doc_list);
-  if (*doc_item != nullptr) {
-    UT_LIST_REMOVE(psort_info->fts_doc_list, *doc_item);
-
-    ut_ad(psort_info->memory_used >=
-          sizeof(fts_doc_item_t) + (*doc_item)->field->len);
-    psort_info->memory_used -= sizeof(fts_doc_item_t) + (*doc_item)->field->len;
-  }
-
-  mutex_exit(&psort_info->mutex);
-}
-
-/** Function performs parallel tokenization of the incoming doc strings.
-It also performs the initial in memory sort of the parsed records. */
-static void fts_parallel_tokenization_thread(fts_psort_t *psort_info) {
-  ulint i;
-  fts_doc_item_t *doc_item = nullptr;
-  row_merge_buf_t **buf;
-  ibool processed = FALSE;
-  merge_file_t **merge_file;
-  row_merge_block_t **block;
-  int tmpfd[FTS_NUM_AUX_INDEX];
-  ulint mycount[FTS_NUM_AUX_INDEX];
-  ib_uint64_t total_rec = 0;
-  ulint num_doc_processed = 0;
-  doc_id_t last_doc_id = 0;
-  mem_heap_t *blob_heap = nullptr;
-  fts_doc_t doc;
-  dict_table_t *table = psort_info->psort_common->new_table;
-  dict_table_t *old_table = psort_info->psort_common->old_table;
-  dtype_t word_dtype;
-  dict_field_t *idx_field;
-  fts_tokenize_ctx_t t_ctx;
-  ulint retried = 0;
-  dberr_t error = DB_SUCCESS;
-
-  ut_ad(psort_info->psort_common->trx->mysql_thd != nullptr);
-  const char *path =
-      thd_innodb_tmpdir(psort_info->psort_common->trx->mysql_thd);
-
-  ut_ad(psort_info);
-
-  buf = psort_info->merge_buf;
-  merge_file = psort_info->merge_file;
-  blob_heap = mem_heap_create(512);
-  memset(&doc, 0, sizeof(doc));
-  memset(mycount, 0, FTS_NUM_AUX_INDEX * sizeof(int));
-
-  doc.charset = fts_index_get_charset(psort_info->psort_common->dup->index);
-
-  idx_field = psort_info->psort_common->dup->index->get_field(0);
-  word_dtype.prtype = idx_field->col->prtype;
-  word_dtype.mbminmaxlen = idx_field->col->mbminmaxlen;
-  word_dtype.mtype =
-      (doc.charset == &my_charset_latin1) ? DATA_VARCHAR : DATA_VARMYSQL;
-
-  block = psort_info->merge_block;
-
-  const page_size_t &page_size = dict_table_page_size(table);
-
-  row_merge_fts_get_next_doc_item(psort_info, &doc_item);
-
-  t_ctx.cached_stopword = table->fts->cache->stopword_info.cached_stopword;
-  processed = TRUE;
-loop:
-  while (doc_item) {
-    dfield_t *dfield = doc_item->field;
-
-    last_doc_id = doc_item->doc_id;
-
-    ut_ad(dfield->data != nullptr && dfield_get_len(dfield) != UNIV_SQL_NULL);
-
-    /* If finish processing the last item, update "doc" with
-    strings in the doc_item, otherwise continue processing last
-    item */
-    if (processed) {
-      byte *data;
-      ulint data_len;
-
-      dfield = doc_item->field;
-      data = static_cast<byte *>(dfield_get_data(dfield));
-      data_len = dfield_get_len(dfield);
-
-      if (dfield_is_ext(dfield)) {
-        dict_index_t *clust_index = old_table->first_index();
-        doc.text.f_str = lob::btr_copy_externally_stored_field(
-            nullptr, clust_index, &doc.text.f_len, nullptr, data, page_size,
-            data_len, false, blob_heap);
-      } else {
-        doc.text.f_str = data;
-        doc.text.f_len = data_len;
-      }
-
-      doc.tokens = nullptr;
-      t_ctx.processed_len = 0;
-    } else {
-      /* Not yet finish processing the "doc" on hand,
-      continue processing it */
-      ut_ad(doc.text.f_str);
-      ut_ad(t_ctx.processed_len < doc.text.f_len);
-    }
-
-    processed = row_merge_fts_doc_tokenize(
-        buf, doc_item->doc_id, &doc, &word_dtype, merge_file,
-        psort_info->psort_common->opt_doc_id_size, &t_ctx);
-
-    /* Current sort buffer full, need to recycle */
-    if (!processed) {
-      ut_ad(t_ctx.processed_len < doc.text.f_len);
-      ut_ad(t_ctx.rows_added[t_ctx.buf_used]);
-      break;
-    }
-
-    num_doc_processed++;
-
-    if (fts_enable_diag_print && num_doc_processed % 10000 == 1) {
-      ib::info(ER_IB_MSG_928)
-          << "Number of documents processed: " << num_doc_processed;
-#ifdef FTS_INTERNAL_DIAG_PRINT
-      for (i = 0; i < FTS_NUM_AUX_INDEX; i++) {
-        ib::info(ER_IB_MSG_929)
-            << "ID " << psort_info->psort_id << ", partition " << i << ", word "
-            << mycount[i];
-      }
-#endif
-    }
-
-    mem_heap_empty(blob_heap);
-
-    row_merge_fts_get_next_doc_item(psort_info, &doc_item);
-
-    if (doc_item && last_doc_id != doc_item->doc_id) {
-      t_ctx.init_pos = 0;
-    }
-  }
-
-  /* If we run out of current sort buffer, need to sort
-  and flush the sort buffer to disk */
-  if (t_ctx.rows_added[t_ctx.buf_used] && !processed) {
-    row_merge_buf_sort(buf[t_ctx.buf_used], nullptr);
-    row_merge_buf_write(buf[t_ctx.buf_used], merge_file[t_ctx.buf_used],
-                        block[t_ctx.buf_used]);
-
-    if (!row_merge_write(merge_file[t_ctx.buf_used]->fd,
-                         merge_file[t_ctx.buf_used]->offset++,
-                         block[t_ctx.buf_used])) {
-      error = DB_TEMP_FILE_WRITE_FAIL;
-      goto func_exit;
-    }
-
-    UNIV_MEM_INVALID(block[t_ctx.buf_used][0], srv_sort_buf_size);
-    buf[t_ctx.buf_used] = row_merge_buf_empty(buf[t_ctx.buf_used]);
-    mycount[t_ctx.buf_used] += t_ctx.rows_added[t_ctx.buf_used];
-    t_ctx.rows_added[t_ctx.buf_used] = 0;
-
-    ut_a(doc_item);
-    goto loop;
-  }
-
-  /* Parent done scanning, and if finish processing all the docs, exit */
-  if (psort_info->state == FTS_PARENT_COMPLETE) {
-    if (UT_LIST_GET_LEN(psort_info->fts_doc_list) == 0) {
-      goto exit;
-    } else if (retried > 10000) {
-      ut_ad(!doc_item);
-      /* retied too many times and cannot get new record */
-      ib::error(ER_IB_MSG_930)
-          << "FTS parallel sort processed " << num_doc_processed
-          << " records, the sort queue has "
-          << UT_LIST_GET_LEN(psort_info->fts_doc_list)
-          << " records. But sort cannot get the next"
-             " records";
-      goto exit;
-    }
-  } else if (psort_info->state == FTS_PARENT_EXITING) {
-    /* Parent abort */
-    goto func_exit;
-  }
-
-  if (doc_item == nullptr) {
-    std::this_thread::yield();
-  }
-
-  row_merge_fts_get_next_doc_item(psort_info, &doc_item);
-
-  if (doc_item != nullptr) {
-    if (last_doc_id != doc_item->doc_id) {
-      t_ctx.init_pos = 0;
-    }
-
-    retried = 0;
-  } else if (psort_info->state == FTS_PARENT_COMPLETE) {
-    retried++;
-  }
-
-  goto loop;
-
-exit:
-  /* Do a final sort of the last (or latest) batch of records
-  in block memory. Flush them to temp file if records cannot
-  be hold in one block memory */
-  for (i = 0; i < FTS_NUM_AUX_INDEX; i++) {
-    if (t_ctx.rows_added[i]) {
-      row_merge_buf_sort(buf[i], nullptr);
-      row_merge_buf_write(buf[i], merge_file[i], block[i]);
-
-      /* Write to temp file, only if records have
-      been flushed to temp file before (offset > 0):
-      The pseudo code for sort is following:
-
-              while (there are rows) {
-                      tokenize rows, put result in block[]
-                      if (block[] runs out) {
-                              sort rows;
-                              write to temp file with
-                              row_merge_write();
-                              offset++;
-                      }
-              }
-
-              # write out the last batch
-              if (offset > 0) {
-                      row_merge_write();
-                      offset++;
-              } else {
-                      # no need to write anything
-                      offset stay as 0
-              }
-
-      so if merge_file[i]->offset is 0 when we come to
-      here as the last batch, this means rows have
-      never flush to temp file, it can be held all in
-      memory */
-      if (merge_file[i]->offset != 0) {
-        if (!row_merge_write(merge_file[i]->fd, merge_file[i]->offset++,
-                             block[i])) {
-          error = DB_TEMP_FILE_WRITE_FAIL;
-          goto func_exit;
-        }
-
-        UNIV_MEM_INVALID(block[i][0], srv_sort_buf_size);
-      }
-
-      buf[i] = row_merge_buf_empty(buf[i]);
-      t_ctx.rows_added[i] = 0;
-    }
-  }
-
-  if (fts_enable_diag_print) {
-    DEBUG_FTS_SORT_PRINT("  InnoDB_FTS: start merge sort\n");
-  }
-
-  for (i = 0; i < FTS_NUM_AUX_INDEX; i++) {
-    if (!merge_file[i]->offset) {
-      continue;
-    }
-
-    tmpfd[i] = row_merge_file_create_low(path);
-    if (tmpfd[i] < 0) {
-      error = DB_OUT_OF_MEMORY;
-      goto func_exit;
-    }
-
-    error = row_merge_sort(psort_info->psort_common->trx,
-                           psort_info->psort_common->dup, merge_file[i],
-                           block[i], &tmpfd[i]);
-    if (error != DB_SUCCESS) {
-      close(tmpfd[i]);
-      goto func_exit;
-    }
-
-    total_rec += merge_file[i]->n_rec;
-    close(tmpfd[i]);
-  }
-
-func_exit:
-  if (fts_enable_diag_print) {
-    DEBUG_FTS_SORT_PRINT("  InnoDB_FTS: complete merge sort\n");
-  }
-
-  mem_heap_free(blob_heap);
-
-  mutex_enter(&psort_info->mutex);
-  psort_info->error = error;
-  mutex_exit(&psort_info->mutex);
-
-  if (UT_LIST_GET_LEN(psort_info->fts_doc_list) > 0) {
-    /* child can exit either with error or told by parent. */
-    ut_ad(error != DB_SUCCESS || psort_info->state == FTS_PARENT_EXITING);
-  }
-
-  /* Free fts doc list in case of error. */
-  do {
-    row_merge_fts_get_next_doc_item(psort_info, &doc_item);
-  } while (doc_item != nullptr);
-
-  psort_info->child_status = FTS_CHILD_COMPLETE;
-  os_event_set(psort_info->psort_common->sort_event);
-  psort_info->child_status = FTS_CHILD_EXITING;
-}
-
-/** Start the parallel tokenization and parallel merge sort
-@param[in,out]	psort_info		Parallel sort structure */
-void row_fts_start_psort(fts_psort_t *psort_info) {
-  for (ulint i = 0; i < fts_sort_pll_degree; i++) {
-    psort_info[i].psort_id = i;
-
-    auto thread =
-        os_thread_create(fts_parallel_tokenization_thread_key,
-                         fts_parallel_tokenization_thread, &psort_info[i]);
-
-    thread.start();
-  }
-}
-
-/** Function performs the merge and insertion of the sorted records.
-@param[in]	psort_info		parallel merge info */
-static void fts_parallel_merge_thread(fts_psort_t *psort_info) {
-  ulint id = psort_info->psort_id;
-
-  row_fts_merge_insert(psort_info->psort_common->dup->index,
-                       psort_info->psort_common->new_table,
-                       psort_info->psort_common->all_info, id);
-
-  psort_info->child_status = FTS_CHILD_COMPLETE;
-  os_event_set(psort_info->psort_common->merge_event);
-  psort_info->child_status = FTS_CHILD_EXITING;
-}
-
-/** Kick off the parallel merge and insert thread
-@param[in,out]	merge_info	parallel sort info */
-void row_fts_start_parallel_merge(fts_psort_t *merge_info) {
-  /* Kick off merge/insert threads */
-  for (int i = 0; i < FTS_NUM_AUX_INDEX; ++i) {
-    merge_info[i].psort_id = i;
-    merge_info[i].child_status = 0;
-
-    auto thread = os_thread_create(fts_parallel_merge_thread_key,
-                                   fts_parallel_merge_thread, &merge_info[i]);
-
-    thread.start();
-  }
-}
-
-/**
-Write out a single word's data as new entry/entries in the INDEX table.
-@param[in]	ins_ctx	insert context
-@param[in]	word	word string
-@param[in]	node	node colmns
-@return	DB_SUCCUESS if insertion runs fine, otherwise error code */
-static dberr_t row_merge_write_fts_node(const fts_psort_insert_t *ins_ctx,
-                                        const fts_string_t *word,
-                                        const fts_node_t *node) {
-  dtuple_t *tuple;
-  dfield_t *field;
-  dberr_t ret = DB_SUCCESS;
-  doc_id_t write_first_doc_id[8];
-  doc_id_t write_last_doc_id[8];
-  ib_uint32_t write_doc_count;
-
-  tuple = ins_ctx->tuple;
-
-  /* The first field is the tokenized word */
-  field = dtuple_get_nth_field(tuple, 0);
-  dfield_set_data(field, word->f_str, word->f_len);
-
-  /* The second field is first_doc_id */
-  field = dtuple_get_nth_field(tuple, 1);
-  fts_write_doc_id((byte *)&write_first_doc_id, node->first_doc_id);
-  dfield_set_data(field, &write_first_doc_id, sizeof(doc_id_t));
-
-  /* The third and fourth fileds(TRX_ID, ROLL_PTR) are filled already.*/
-  /* The fifth field is last_doc_id */
-  field = dtuple_get_nth_field(tuple, 4);
-  fts_write_doc_id((byte *)&write_last_doc_id, node->last_doc_id);
-  dfield_set_data(field, &write_last_doc_id, sizeof(doc_id_t));
-
-  /* The sixth field is doc_count */
-  field = dtuple_get_nth_field(tuple, 5);
-  mach_write_to_4((byte *)&write_doc_count, (ib_uint32_t)node->doc_count);
-  dfield_set_data(field, &write_doc_count, sizeof(ib_uint32_t));
-
-  /* The seventh field is ilist */
-  field = dtuple_get_nth_field(tuple, 6);
-  dfield_set_data(field, node->ilist, node->ilist_size);
-
-  ret = ins_ctx->btr_bulk->insert(tuple);
-
-  return (ret);
-}
-
-/** Insert processed FTS data to auxillary index tables.
- @return DB_SUCCESS if insertion runs fine */
-static dberr_t row_merge_write_fts_word(
-    fts_psort_insert_t *ins_ctx, /*!< in: insert context */
-    fts_tokenizer_word_t *word)  /*!< in: sorted and tokenized
-                                 word */
-{
-  dberr_t ret = DB_SUCCESS;
-
-  ut_ad(ins_ctx->aux_index_id ==
-        fts_select_index(ins_ctx->charset, word->text.f_str, word->text.f_len));
-
-  /* Pop out each fts_node in word->nodes write them to auxiliary table */
-  for (ulint i = 0; i < ib_vector_size(word->nodes); i++) {
-    dberr_t error;
-    fts_node_t *fts_node;
-
-    fts_node = static_cast<fts_node_t *>(ib_vector_get(word->nodes, i));
-
-    error = row_merge_write_fts_node(ins_ctx, &word->text, fts_node);
-
-    if (error != DB_SUCCESS) {
-      ib::error(ER_IB_MSG_931) << "Failed to write word " << word->text.f_str
-                               << " to FTS auxiliary"
-                                  " index table, error ("
-                               << ut_strerr(error) << ")";
-      ret = error;
-    }
-
-    ut_free(fts_node->ilist);
-    fts_node->ilist = nullptr;
-  }
-
-  ib_vector_reset(word->nodes);
-
-  return (ret);
-}
-
-/** Read sorted FTS data files and insert data tuples to auxillary tables.
- */
-static void row_fts_insert_tuple(
-    fts_psort_insert_t *ins_ctx, /*!< in: insert context */
-    fts_tokenizer_word_t *word,  /*!< in: last processed
-                                 tokenized word */
-    ib_vector_t *positions,      /*!< in: word position */
-    doc_id_t *in_doc_id,         /*!< in: last item doc id */
-    dtuple_t *dtuple)            /*!< in: entry to insert */
-{
-  fts_node_t *fts_node = nullptr;
-  dfield_t *dfield;
-  doc_id_t doc_id;
-  ulint position;
-  fts_string_t token_word;
-  ulint i;
-
-  /* Get fts_node for the FTS auxillary INDEX table */
-  if (ib_vector_size(word->nodes) > 0) {
-    fts_node = static_cast<fts_node_t *>(ib_vector_last(word->nodes));
-  }
-
-  if (fts_node == nullptr || fts_node->ilist_size > FTS_ILIST_MAX_SIZE) {
-    fts_node = static_cast<fts_node_t *>(ib_vector_push(word->nodes, nullptr));
-
-    memset(fts_node, 0x0, sizeof(*fts_node));
-  }
-
-  /* If dtuple == NULL, this is the last word to be processed */
-  if (!dtuple) {
-    if (fts_node && ib_vector_size(positions) > 0) {
-      fts_cache_node_add_positions(nullptr, fts_node, *in_doc_id, positions);
-
-      /* Write out the current word */
-      row_merge_write_fts_word(ins_ctx, word);
-    }
-
-    return;
-  }
-
-  /* Get the first field for the tokenized word */
-  dfield = dtuple_get_nth_field(dtuple, 0);
-
-  token_word.f_n_char = 0;
-  token_word.f_len = dfield->len;
-  token_word.f_str = static_cast<byte *>(dfield_get_data(dfield));
-
-  if (!word->text.f_str) {
-    fts_string_dup(&word->text, &token_word, ins_ctx->heap);
-  }
-
-  /* compare to the last word, to see if they are the same
-  word */
-  if (innobase_fts_text_cmp(ins_ctx->charset, &word->text, &token_word) != 0) {
-    ulint num_item;
-
-    /* Getting a new word, flush the last position info
-    for the currnt word in fts_node */
-    if (ib_vector_size(positions) > 0) {
-      fts_cache_node_add_positions(nullptr, fts_node, *in_doc_id, positions);
-    }
-
-    /* Write out the current word */
-    row_merge_write_fts_word(ins_ctx, word);
-
-    /* Copy the new word */
-    fts_string_dup(&word->text, &token_word, ins_ctx->heap);
-
-    num_item = ib_vector_size(positions);
-
-    /* Clean up position queue */
-    for (i = 0; i < num_item; i++) {
-      ib_vector_pop(positions);
-    }
-
-    /* Reset Doc ID */
-    *in_doc_id = 0;
-    memset(fts_node, 0x0, sizeof(*fts_node));
-  }
-
-  /* Get the word's Doc ID */
-  dfield = dtuple_get_nth_field(dtuple, 1);
-
-  if (!ins_ctx->opt_doc_id_size) {
-    doc_id = fts_read_doc_id(static_cast<byte *>(dfield_get_data(dfield)));
-  } else {
-    doc_id = (doc_id_t)mach_read_from_4(
-        static_cast<byte *>(dfield_get_data(dfield)));
-  }
-
-  /* Get the word's position info */
-  dfield = dtuple_get_nth_field(dtuple, 2);
-  position = mach_read_from_4(static_cast<byte *>(dfield_get_data(dfield)));
-
-  /* If this is the same word as the last word, and they
-  have the same Doc ID, we just need to add its position
-  info. Otherwise, we will flush position info to the
-  fts_node and initiate a new position vector  */
-  if (!(*in_doc_id) || *in_doc_id == doc_id) {
-    ib_vector_push(positions, &position);
-  } else {
-    ulint num_pos = ib_vector_size(positions);
-
-    fts_cache_node_add_positions(nullptr, fts_node, *in_doc_id, positions);
-    for (i = 0; i < num_pos; i++) {
-      ib_vector_pop(positions);
-    }
-    ib_vector_push(positions, &position);
-  }
-
-  /* record the current Doc ID */
-  *in_doc_id = doc_id;
-}
-
-/** Propagate a newly added record up one level in the selection tree
- @return parent where this value propagated to */
-static int row_fts_sel_tree_propagate(
-    int propogated,      /*!< in: tree node propagated */
-    int *sel_tree,       /*!< in: selection tree */
-    const mrec_t **mrec, /*!< in: sort record */
-    ulint **offsets,     /*!< in: record offsets */
-    dict_index_t *index) /*!< in/out: FTS index */
-{
-  ulint parent;
-  int child_left;
-  int child_right;
-  int selected;
-
-  /* Find which parent this value will be propagated to */
-  parent = (propogated - 1) / 2;
-
-  /* Find out which value is smaller, and to propagate */
-  child_left = sel_tree[parent * 2 + 1];
-  child_right = sel_tree[parent * 2 + 2];
-
-  if (child_left == -1 || mrec[child_left] == nullptr) {
-    if (child_right == -1 || mrec[child_right] == nullptr) {
-      selected = -1;
-    } else {
-      selected = child_right;
-    }
-  } else if (child_right == -1 || mrec[child_right] == nullptr) {
-    selected = child_left;
-  } else if (cmp_rec_rec_simple(mrec[child_left], mrec[child_right],
-                                offsets[child_left], offsets[child_right],
-                                index, nullptr) < 0) {
-    selected = child_left;
-  } else {
-    selected = child_right;
-  }
-
-  sel_tree[parent] = selected;
-
-  return (static_cast<int>(parent));
-}
-
-/** Readjust selection tree after popping the root and read a new value
- @return the new root */
-static int row_fts_sel_tree_update(
-    int *sel_tree,       /*!< in/out: selection tree */
-    ulint propagated,    /*!< in: node to propagate up */
-    ulint height,        /*!< in: tree height */
-    const mrec_t **mrec, /*!< in: sort record */
-    ulint **offsets,     /*!< in: record offsets */
-    dict_index_t *index) /*!< in: index dictionary */
-{
-  ulint i;
-
-  for (i = 1; i <= height; i++) {
-    propagated = static_cast<ulint>(row_fts_sel_tree_propagate(
-        static_cast<int>(propagated), sel_tree, mrec, offsets, index));
-  }
-
-  return (sel_tree[0]);
-}
-
-/** Build selection tree at a specified level */
-static void row_fts_build_sel_tree_level(
-    int *sel_tree,       /*!< in/out: selection tree */
-    ulint level,         /*!< in: selection tree level */
-    const mrec_t **mrec, /*!< in: sort record */
-    ulint **offsets,     /*!< in: record offsets */
-    dict_index_t *index) /*!< in: index dictionary */
-{
-  ulint start;
-  int child_left;
-  int child_right;
-  ulint i;
-  ulint num_item;
-
-  num_item = static_cast<ulint>(1) << level;
-  start = num_item - 1;
-
-  for (i = 0; i < num_item; i++) {
-    child_left = sel_tree[(start + i) * 2 + 1];
-    child_right = sel_tree[(start + i) * 2 + 2];
-
-    if (child_left == -1) {
-      if (child_right == -1) {
-        sel_tree[start + i] = -1;
-      } else {
-        sel_tree[start + i] = child_right;
-      }
-      continue;
-    } else if (child_right == -1) {
-      sel_tree[start + i] = child_left;
-      continue;
-    }
-
-    /* Deal with NULL child conditions */
-    if (!mrec[child_left]) {
-      if (!mrec[child_right]) {
-        sel_tree[start + i] = -1;
-      } else {
-        sel_tree[start + i] = child_right;
-      }
-      continue;
-    } else if (!mrec[child_right]) {
-      sel_tree[start + i] = child_left;
-      continue;
-    }
-
-    /* Select the smaller one to set parent pointer */
-    int cmp = cmp_rec_rec_simple(mrec[child_left], mrec[child_right],
-                                 offsets[child_left], offsets[child_right],
-                                 index, nullptr);
-
-    sel_tree[start + i] = cmp < 0 ? child_left : child_right;
-  }
-}
-
-/** Build a selection tree for merge. The selection tree is a binary tree
- and should have fts_sort_pll_degree / 2 levels. With root as level 0
- @return number of tree levels */
-static ulint row_fts_build_sel_tree(
-    int *sel_tree,       /*!< in/out: selection tree */
-    const mrec_t **mrec, /*!< in: sort record */
-    ulint **offsets,     /*!< in: record offsets */
-    dict_index_t *index) /*!< in: index dictionary */
-{
-  ulint treelevel = 1;
-  ulint num = 2;
-  int i = 0;
-  ulint start;
-
-  /* No need to build selection tree if we only have two merge threads */
-  if (fts_sort_pll_degree <= 2) {
-    return (0);
-  }
-
-  while (num < fts_sort_pll_degree) {
-    num = num << 1;
-    treelevel++;
-  }
-
-  start = (1 << treelevel) - 1;
-
-  for (i = 0; i < (int)fts_sort_pll_degree; i++) {
-    sel_tree[i + start] = i;
-  }
-
-  for (i = static_cast<int>(treelevel) - 1; i >= 0; i--) {
-    row_fts_build_sel_tree_level(sel_tree, static_cast<ulint>(i), mrec, offsets,
-                                 index);
-  }
-
-  return (treelevel);
-}
-
-/** Read sorted file containing index data tuples and insert these data
-tuples to the index
-@param[in]	index		index
-@param[in]	table		new table
-@param[in]	psort_info	parallel sort info
-@param[in]	id		which auxiliary table's data to insert to
-@return DB_SUCCESS or error number */
-dberr_t row_fts_merge_insert(dict_index_t *index, dict_table_t *table,
-                             fts_psort_t *psort_info, ulint id) {
-  const byte **b;
-  mem_heap_t *tuple_heap;
-  mem_heap_t *heap;
-  dberr_t error = DB_SUCCESS;
-  ulint *foffs;
-  ulint **offsets;
-  fts_tokenizer_word_t new_word;
-  ib_vector_t *positions;
-  doc_id_t last_doc_id;
-  ib_alloc_t *heap_alloc;
-  ulint i;
-  mrec_buf_t **buf;
-  int *fd;
-  byte **block;
-  const mrec_t **mrec;
-  ulint count = 0;
-  int *sel_tree;
-  ulint height;
-  ulint start;
-  fts_psort_insert_t ins_ctx;
-  ulint count_diag = 0;
-  fts_table_t fts_table;
-  char aux_table_name[MAX_FULL_NAME_LEN];
-  dict_table_t *aux_table;
-  dict_index_t *aux_index;
-  trx_t *trx;
-  byte trx_id_buf[6];
-  roll_ptr_t roll_ptr = 0;
-  dfield_t *field;
-
-  ut_ad(index);
-  ut_ad(table);
-
-  /* We use the insert query graph as the dummy graph
-  needed in the row module call */
-
-  trx = trx_allocate_for_background();
-  trx_start_if_not_started(trx, true);
-
-  trx->op_info = "inserting index entries";
-
-  ins_ctx.opt_doc_id_size = psort_info[0].psort_common->opt_doc_id_size;
-
-  heap = mem_heap_create(500 + sizeof(mrec_buf_t));
-
-  b = (const byte **)mem_heap_alloc(heap, sizeof(*b) * fts_sort_pll_degree);
-  foffs = (ulint *)mem_heap_alloc(heap, sizeof(*foffs) * fts_sort_pll_degree);
-  offsets =
-      (ulint **)mem_heap_alloc(heap, sizeof(*offsets) * fts_sort_pll_degree);
-  buf = (mrec_buf_t **)mem_heap_alloc(heap, sizeof(*buf) * fts_sort_pll_degree);
-  fd = (int *)mem_heap_alloc(heap, sizeof(*fd) * fts_sort_pll_degree);
-  block = (byte **)mem_heap_alloc(heap, sizeof(*block) * fts_sort_pll_degree);
-  mrec = (const mrec_t **)mem_heap_alloc(heap,
-                                         sizeof(*mrec) * fts_sort_pll_degree);
-  sel_tree = (int *)mem_heap_alloc(
-      heap, sizeof(*sel_tree) * (fts_sort_pll_degree * 2));
-
-  tuple_heap = mem_heap_create(1000);
-
-  ins_ctx.charset = fts_index_get_charset(index);
-  ins_ctx.heap = heap;
-
-  for (i = 0; i < fts_sort_pll_degree; i++) {
-    ulint num;
-
-    num = 1 + REC_OFFS_HEADER_SIZE + dict_index_get_n_fields(index);
-    offsets[i] =
-        static_cast<ulint *>(mem_heap_zalloc(heap, num * sizeof *offsets[i]));
-    offsets[i][0] = num;
-    offsets[i][1] = dict_index_get_n_fields(index);
-    block[i] = psort_info[i].merge_block[id];
-    b[i] = psort_info[i].merge_block[id];
-    fd[i] = psort_info[i].merge_file[id]->fd;
-    foffs[i] = 0;
-
-    buf[i] = static_cast<mrec_buf_t *>(mem_heap_alloc(heap, sizeof *buf[i]));
-    count_diag += (int)psort_info[i].merge_file[id]->n_rec;
-  }
-
-  if (fts_enable_diag_print) {
-    ib::info(ER_IB_MSG_932)
-        << "InnoDB_FTS: to inserted " << count_diag << " records";
-  }
-
-  /* Initialize related variables if creating FTS indexes */
-  heap_alloc = ib_heap_allocator_create(heap);
-
-  memset(&new_word, 0, sizeof(new_word));
-
-  new_word.nodes = ib_vector_create(heap_alloc, sizeof(fts_node_t), 4);
-  positions = ib_vector_create(heap_alloc, sizeof(ulint), 32);
-  last_doc_id = 0;
-
-  fts_table.type = FTS_INDEX_TABLE;
-  fts_table.index_id = index->id;
-  fts_table.table_id = table->id;
-  fts_table.parent = index->table->name.m_name;
-  fts_table.table = index->table;
-  fts_table.suffix = fts_get_suffix(id);
-
-  /* Get aux index */
-  fts_get_table_name(&fts_table, aux_table_name);
-
-  aux_table = dd_table_open_on_name(nullptr, nullptr, aux_table_name, false,
-                                    DICT_ERR_IGNORE_NONE);
-  ut_ad(aux_table != nullptr);
-  dd_table_close(aux_table, nullptr, nullptr, false);
-  aux_index = aux_table->first_index();
-
-  FlushObserver *observer;
-  observer = psort_info[0].psort_common->trx->flush_observer;
-
-  /* Create bulk load instance */
-  ins_ctx.btr_bulk = UT_NEW_NOKEY(BtrBulk(aux_index, trx->id, observer));
-  error = ins_ctx.btr_bulk->init();
-  if (error != DB_SUCCESS) {
-    /* delete immediately so finish() would not be called */
-    UT_DELETE(ins_ctx.btr_bulk);
-    ins_ctx.btr_bulk = nullptr;
-    goto exit;
-  }
-
-  /* Create tuple for insert */
-  ins_ctx.tuple = dtuple_create(heap, dict_index_get_n_fields(aux_index));
-  dict_index_copy_types(ins_ctx.tuple, aux_index,
-                        dict_index_get_n_fields(aux_index));
-
-  /* Set TRX_ID and ROLL_PTR */
-  trx_write_trx_id(trx_id_buf, trx->id);
-  field = dtuple_get_nth_field(ins_ctx.tuple, 2);
-  dfield_set_data(field, &trx_id_buf, 6);
-
-  field = dtuple_get_nth_field(ins_ctx.tuple, 3);
-  dfield_set_data(field, &roll_ptr, 7);
-
-#ifdef UNIV_DEBUG
-  ins_ctx.aux_index_id = id;
-#endif
-
-  for (i = 0; i < fts_sort_pll_degree; i++) {
-    if (psort_info[i].merge_file[id]->n_rec == 0) {
-      /* No Rows to read */
-      mrec[i] = b[i] = nullptr;
-    } else {
-      /* Read from temp file only if it has been
-      written to. Otherwise, block memory holds
-      all the sorted records */
-      if (psort_info[i].merge_file[id]->offset > 0 &&
-          (!row_merge_read(fd[i], foffs[i], (row_merge_block_t *)block[i]))) {
-        error = DB_CORRUPTION;
-        goto exit;
-      }
-
-      ROW_MERGE_READ_GET_NEXT(i);
-    }
-  }
-
-  height =
-      row_fts_build_sel_tree(sel_tree, (const mrec_t **)mrec, offsets, index);
-
-  start = (1 << height) - 1;
-
-  /* Fetch sorted records from sort buffer and insert them into
-  corresponding FTS index auxiliary tables */
-  for (;;) {
-    dtuple_t *dtuple;
-    int min_rec = 0;
-
-    if (fts_sort_pll_degree <= 2) {
-      while (!mrec[min_rec]) {
-        min_rec++;
-
-        if (min_rec >= (int)fts_sort_pll_degree) {
-          row_fts_insert_tuple(&ins_ctx, &new_word, positions, &last_doc_id,
-                               nullptr);
-
-          goto exit;
-        }
-      }
-
-      for (i = min_rec + 1; i < fts_sort_pll_degree; i++) {
-        if (!mrec[i]) {
-          continue;
-        }
-
-        if (cmp_rec_rec_simple(mrec[i], mrec[min_rec], offsets[i],
-                               offsets[min_rec], index, nullptr) < 0) {
-          min_rec = static_cast<int>(i);
-        }
-      }
-    } else {
-      min_rec = sel_tree[0];
-
-      if (min_rec == -1) {
-        row_fts_insert_tuple(&ins_ctx, &new_word, positions, &last_doc_id,
-                             nullptr);
-
-        goto exit;
-      }
-    }
-
-    dtuple = row_rec_to_index_entry_low(mrec[min_rec], index, offsets[min_rec],
-                                        tuple_heap);
-
-    row_fts_insert_tuple(&ins_ctx, &new_word, positions, &last_doc_id, dtuple);
-
-    ROW_MERGE_READ_GET_NEXT(min_rec);
-
-    if (fts_sort_pll_degree > 2) {
-      if (!mrec[min_rec]) {
-        sel_tree[start + min_rec] = -1;
-      }
-
-      row_fts_sel_tree_update(sel_tree, start + min_rec, height, mrec, offsets,
-                              index);
-    }
-
-    count++;
-
-    mem_heap_empty(tuple_heap);
-  }
-
-exit:
-  fts_sql_commit(trx);
-
-  trx->op_info = "";
-
-  mem_heap_free(tuple_heap);
-
-  if (ins_ctx.btr_bulk) {
-    error = ins_ctx.btr_bulk->finish(error);
-    UT_DELETE(ins_ctx.btr_bulk);
-  }
-
-  trx_free_for_background(trx);
-
-  mem_heap_free(heap);
-
-  if (fts_enable_diag_print) {
-    ib::info(ER_IB_MSG_933) << "InnoDB_FTS: inserted " << count << " records";
-  }
-
-  return (error);
-}
diff -Nru mysql-8.0-8.0.26/storage/innobase/row/row0import.cc mysql-8.0-8.0.27/storage/innobase/row/row0import.cc
--- mysql-8.0-8.0.26/storage/innobase/row/row0import.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/row/row0import.cc	2021-09-28 11:46:34.000000000 +0000
@@ -391,7 +391,7 @@
         m_table_flags(UINT32_UNDEFINED) UNIV_NOTHROW {}
 
   /** Free any extent descriptor instance */
-  ~AbstractCallback() override { UT_DELETE_ARRAY(m_xdes); }
+  ~AbstractCallback() override { ut::delete_arr(m_xdes); }
 
   /** Determine the page size to use for traversing the tablespace
   @param file_size size of the tablespace file in bytes
@@ -451,7 +451,7 @@
   dberr_t set_current_xdes(page_no_t page_no, const page_t *page) UNIV_NOTHROW {
     m_xdes_page_no = page_no;
 
-    UT_DELETE_ARRAY(m_xdes);
+    ut::delete_arr(m_xdes);
     m_xdes = nullptr;
 
     ulint state;
@@ -460,10 +460,11 @@
     state = mach_read_ulint(xdesc + XDES_STATE, MLOG_4BYTES);
 
     if (state != XDES_FREE) {
-      m_xdes = UT_NEW_ARRAY_NOKEY(xdes_t, m_page_size.physical());
+      m_xdes = ut::new_arr_withkey<xdes_t>(UT_NEW_THIS_FILE_PSI_KEY,
+                                           ut::Count{m_page_size.physical()});
 
       /* Trigger OOM */
-      DBUG_EXECUTE_IF("ib_import_OOM_13", UT_DELETE_ARRAY(m_xdes);
+      DBUG_EXECUTE_IF("ib_import_OOM_13", ut::delete_arr(m_xdes);
                       m_xdes = nullptr;);
 
       if (m_xdes == nullptr) {
@@ -591,7 +592,7 @@
     page_no_t m_page_no; /*!< Root page number */
   };
 
-  typedef std::vector<Index, ut_allocator<Index>> Indexes;
+  typedef std::vector<Index, ut::allocator<Index>> Indexes;
 
   /** Constructor
   @param trx covering (user) transaction
@@ -733,10 +734,11 @@
     return (DB_CORRUPTION);
   }
 
-  cfg->m_indexes = UT_NEW_ARRAY_NOKEY(row_index_t, cfg->m_n_indexes);
+  cfg->m_indexes = ut::new_arr_withkey<row_index_t>(
+      UT_NEW_THIS_FILE_PSI_KEY, ut::Count{cfg->m_n_indexes});
 
   /* Trigger OOM */
-  DBUG_EXECUTE_IF("ib_import_OOM_11", UT_DELETE_ARRAY(cfg->m_indexes);
+  DBUG_EXECUTE_IF("ib_import_OOM_11", ut::delete_arr(cfg->m_indexes);
                   cfg->m_indexes = nullptr;);
 
   if (cfg->m_indexes == nullptr) {
@@ -755,10 +757,11 @@
 
     ulint len = strlen(name) + 1;
 
-    cfg_index->m_name = UT_NEW_ARRAY_NOKEY(byte, len);
+    cfg_index->m_name =
+        ut::new_arr_withkey<byte>(UT_NEW_THIS_FILE_PSI_KEY, ut::Count{len});
 
     /* Trigger OOM */
-    DBUG_EXECUTE_IF("ib_import_OOM_12", UT_DELETE_ARRAY(cfg_index->m_name);
+    DBUG_EXECUTE_IF("ib_import_OOM_12", ut::delete_arr(cfg_index->m_name);
                     cfg_index->m_name = nullptr;);
 
     if (cfg_index->m_name == nullptr) {
@@ -967,7 +970,7 @@
 row_import destructor. */
 row_import::~row_import() UNIV_NOTHROW {
   for (ulint i = 0; m_indexes != nullptr && i < m_n_indexes; ++i) {
-    UT_DELETE_ARRAY(m_indexes[i].m_name);
+    ut::delete_arr(m_indexes[i].m_name);
 
     if (m_indexes[i].m_fields == nullptr) {
       continue;
@@ -977,21 +980,21 @@
     ulint n_fields = m_indexes[i].m_n_fields;
 
     for (ulint j = 0; j < n_fields; ++j) {
-      UT_DELETE_ARRAY(const_cast<char *>(fields[j].name()));
+      ut::delete_arr(const_cast<char *>(fields[j].name()));
     }
 
-    UT_DELETE_ARRAY(fields);
+    ut::delete_arr(fields);
   }
 
   for (ulint i = 0; m_col_names != nullptr && i < m_n_cols; ++i) {
-    UT_DELETE_ARRAY(m_col_names[i]);
+    ut::delete_arr(m_col_names[i]);
   }
 
-  UT_DELETE_ARRAY(m_cols);
-  UT_DELETE_ARRAY(m_indexes);
-  UT_DELETE_ARRAY(m_col_names);
-  UT_DELETE_ARRAY(m_table_name);
-  UT_DELETE_ARRAY(m_hostname);
+  ut::delete_arr(m_cols);
+  ut::delete_arr(m_indexes);
+  ut::delete_arr(m_col_names);
+  ut::delete_arr(m_table_name);
+  ut::delete_arr(m_hostname);
 
   if (m_heap != nullptr) {
     mem_heap_free(m_heap);
@@ -1478,11 +1481,12 @@
     }
 
     ut_ad(index != nullptr);
-    UT_DELETE_ARRAY(cfg_index[i].m_name);
+    ut::delete_arr(cfg_index[i].m_name);
 
     ulint len = strlen(index->name) + 1;
 
-    cfg_index[i].m_name = UT_NEW_ARRAY_NOKEY(byte, len);
+    cfg_index[i].m_name =
+        ut::new_arr_withkey<byte>(UT_NEW_THIS_FILE_PSI_KEY, ut::Count{len});
 
     if (cfg_index[i].m_name == nullptr) {
       err = DB_OUT_OF_MEMORY;
@@ -1504,14 +1508,15 @@
       dict_set_corrupted(index);
       ib::warn(ER_IB_MSG_940) << "Skipping FTS index: " << index->name;
     } else if (i < m_n_indexes) {
-      UT_DELETE_ARRAY(cfg_index[i].m_name);
+      ut::delete_arr(cfg_index[i].m_name);
 
       ulint len = strlen(index->name) + 1;
 
-      cfg_index[i].m_name = UT_NEW_ARRAY_NOKEY(byte, len);
+      cfg_index[i].m_name =
+          ut::new_arr_withkey<byte>(UT_NEW_THIS_FILE_PSI_KEY, ut::Count{len});
 
       /* Trigger OOM */
-      DBUG_EXECUTE_IF("ib_import_OOM_14", UT_DELETE_ARRAY(cfg_index[i].m_name);
+      DBUG_EXECUTE_IF("ib_import_OOM_14", ut::delete_arr(cfg_index[i].m_name);
                       cfg_index[i].m_name = nullptr;);
 
       if (cfg_index[i].m_name == nullptr) {
@@ -2162,7 +2167,7 @@
 
     case FIL_PAGE_TYPE_XDES:
       err = set_current_xdes(block->page.id.page_no(), get_frame(block));
-      /* Fall through. */
+      [[fallthrough]];
     case FIL_PAGE_INODE:
     case FIL_PAGE_TYPE_TRX_SYS:
     case FIL_PAGE_IBUF_FREE_LIST:
@@ -2332,7 +2337,7 @@
 }
 
 /** Clean up after import tablespace. */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t row_import_cleanup(
+[[nodiscard]] static dberr_t row_import_cleanup(
     row_prebuilt_t *prebuilt, /*!< in/out: prebuilt from handler */
     trx_t *trx,               /*!< in/out: transaction for import */
     dberr_t err)              /*!< in: error code */
@@ -2366,7 +2371,7 @@
 }
 
 /** Report error during tablespace import. */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t row_import_error(
+[[nodiscard]] static dberr_t row_import_error(
     row_prebuilt_t *prebuilt, /*!< in/out: prebuilt from handler */
     trx_t *trx,               /*!< in/out: transaction for import */
     dberr_t err)              /*!< in: error code */
@@ -2387,15 +2392,14 @@
 /** Adjust the root page index node and leaf node segment headers, update
  with the new space id. For all the table's secondary indexes.
  @return error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_import_adjust_root_pages_of_secondary_indexes(
-        row_prebuilt_t *prebuilt, /*!< in/out: prebuilt from
-                                  handler */
-        trx_t *trx,               /*!< in: transaction used for
-                                  the import */
-        dict_table_t *table,      /*!< in: table the indexes
-                                  belong to */
-        const row_import &cfg)    /*!< Import context */
+[[nodiscard]] static dberr_t row_import_adjust_root_pages_of_secondary_indexes(
+    row_prebuilt_t *prebuilt, /*!< in/out: prebuilt from
+                              handler */
+    trx_t *trx,               /*!< in: transaction used for
+                              the import */
+    dict_table_t *table,      /*!< in: table the indexes
+                              belong to */
+    const row_import &cfg)    /*!< Import context */
 {
   dict_index_t *index;
   ulint n_rows_in_table;
@@ -2483,7 +2487,7 @@
 
 /** Ensure that dict_sys->row_id exceeds SELECT MAX(DB_ROW_ID).
  @return error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t row_import_set_sys_max_row_id(
+[[nodiscard]] static dberr_t row_import_set_sys_max_row_id(
     row_prebuilt_t *prebuilt, /*!< in/out: prebuilt from
                               handler */
     dict_table_t *table)      /*!< in: table to import */
@@ -2612,12 +2616,11 @@
 
 /** Write the meta data (index user fields) config file.
  @return DB_SUCCESS or error code. */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_import_cfg_read_index_fields(
-        FILE *file,         /*!< in: file to write to */
-        THD *thd,           /*!< in/out: session */
-        row_index_t *index, /*!< Index being read in */
-        row_import *cfg)    /*!< in/out: meta-data read */
+[[nodiscard]] static dberr_t row_import_cfg_read_index_fields(
+    FILE *file,         /*!< in: file to write to */
+    THD *thd,           /*!< in/out: session */
+    row_index_t *index, /*!< Index being read in */
+    row_import *cfg)    /*!< in/out: meta-data read */
 {
   /* v4 row will have prefix_len, fixed_len, is_ascending, name length */
   byte row[sizeof(ib_uint32_t) * 4];
@@ -2629,10 +2632,11 @@
 
   ulint n_fields = index->m_n_fields;
 
-  index->m_fields = UT_NEW_ARRAY_NOKEY(dict_field_t, n_fields);
+  index->m_fields = ut::new_arr_withkey<dict_field_t>(UT_NEW_THIS_FILE_PSI_KEY,
+                                                      ut::Count{n_fields});
 
   /* Trigger OOM */
-  DBUG_EXECUTE_IF("ib_import_OOM_4", UT_DELETE_ARRAY(index->m_fields);
+  DBUG_EXECUTE_IF("ib_import_OOM_4", ut::delete_arr(index->m_fields);
                   index->m_fields = nullptr;);
 
   if (index->m_fields == nullptr) {
@@ -2676,10 +2680,11 @@
     /* Include the NUL byte in the length. */
     ulint len = mach_read_from_4(ptr);
 
-    byte *name = UT_NEW_ARRAY_NOKEY(byte, len);
+    byte *name =
+        ut::new_arr_withkey<byte>(UT_NEW_THIS_FILE_PSI_KEY, ut::Count{len});
 
     /* Trigger OOM */
-    DBUG_EXECUTE_IF("ib_import_OOM_5", UT_DELETE_ARRAY(name); name = nullptr;);
+    DBUG_EXECUTE_IF("ib_import_OOM_5", ut::delete_arr(name); name = nullptr;);
 
     if (name == nullptr) {
       return (DB_OUT_OF_MEMORY);
@@ -2703,10 +2708,10 @@
 /** Read the index names and root page numbers of the indexes and set the
  values. Row format [root_page_no, len of str, str ... ]
  @return DB_SUCCESS or error code. */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_import_read_index_data(FILE *file,      /*!< in: File to read from */
-                               THD *thd,        /*!< in: session */
-                               row_import *cfg) /*!< in/out: meta-data read */
+[[nodiscard]] static dberr_t row_import_read_index_data(
+    FILE *file,      /*!< in: File to read from */
+    THD *thd,        /*!< in: session */
+    row_import *cfg) /*!< in/out: meta-data read */
 {
   byte *ptr;
   row_index_t *cfg_index;
@@ -2716,10 +2721,11 @@
   ut_a(cfg->m_n_indexes > 0);
   ut_a(cfg->m_n_indexes < 1024);
 
-  cfg->m_indexes = UT_NEW_ARRAY_NOKEY(row_index_t, cfg->m_n_indexes);
+  cfg->m_indexes = ut::new_arr_withkey<row_index_t>(
+      UT_NEW_THIS_FILE_PSI_KEY, ut::Count{cfg->m_n_indexes});
 
   /* Trigger OOM */
-  DBUG_EXECUTE_IF("ib_import_OOM_6", UT_DELETE_ARRAY(cfg->m_indexes);
+  DBUG_EXECUTE_IF("ib_import_OOM_6", ut::delete_arr(cfg->m_indexes);
                   cfg->m_indexes = nullptr;);
 
   if (cfg->m_indexes == nullptr) {
@@ -2806,10 +2812,11 @@
       return (DB_CORRUPTION);
     }
 
-    cfg_index->m_name = UT_NEW_ARRAY_NOKEY(byte, len);
+    cfg_index->m_name =
+        ut::new_arr_withkey<byte>(UT_NEW_THIS_FILE_PSI_KEY, ut::Count{len});
 
     /* Trigger OOM */
-    DBUG_EXECUTE_IF("ib_import_OOM_7", UT_DELETE_ARRAY(cfg_index->m_name);
+    DBUG_EXECUTE_IF("ib_import_OOM_7", ut::delete_arr(cfg_index->m_name);
                     cfg_index->m_name = nullptr;);
 
     if (cfg_index->m_name == nullptr) {
@@ -2884,10 +2891,10 @@
 @param[in]	file	file to read from
 @param[in]	length	length of bytes to read
 @return	the bytes stream, caller has to free the memory if not nullptr */
-static MY_ATTRIBUTE((warn_unused_result)) byte *row_import_read_bytes(
-    FILE *file, size_t length) {
+[[nodiscard]] static byte *row_import_read_bytes(FILE *file, size_t length) {
   size_t read = 0;
-  byte *r = UT_NEW_ARRAY_NOKEY(byte, length);
+  byte *r =
+      ut::new_arr_withkey<byte>(UT_NEW_THIS_FILE_PSI_KEY, ut::Count{length});
 
   if (length == 0) {
     return (r);
@@ -2908,7 +2915,7 @@
 
   errno = EINVAL;
 
-  UT_DELETE_ARRAY(r);
+  ut::delete_arr(r);
 
   return (nullptr);
 }
@@ -2920,9 +2927,10 @@
 @param[in,out]	col	column whose default value to read
 @param[in,out]  heap    memory heap to store default value
 @param[in,out]	read	true if default value read */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_import_read_default_values(FILE *file, dict_col_t *col,
-                                   mem_heap_t **heap, bool *read) {
+[[nodiscard]] static dberr_t row_import_read_default_values(FILE *file,
+                                                            dict_col_t *col,
+                                                            mem_heap_t **heap,
+                                                            bool *read) {
   byte *str;
 
   /* Instant or not byte */
@@ -2931,14 +2939,14 @@
   }
 
   if (str[0] == 0) {
-    UT_DELETE_ARRAY(str);
+    ut::delete_arr(str);
     *read = false;
     return (DB_SUCCESS);
   }
 
   *read = true;
 
-  UT_DELETE_ARRAY(str);
+  ut::delete_arr(str);
 
   /* Null byte */
   if ((str = row_import_read_bytes(file, 1)) == nullptr) {
@@ -2950,11 +2958,11 @@
   }
 
   if (str[0] == 1) {
-    UT_DELETE_ARRAY(str);
+    ut::delete_arr(str);
     col->set_default(nullptr, UNIV_SQL_NULL, *heap);
     return (DB_SUCCESS);
   } else {
-    UT_DELETE_ARRAY(str);
+    ut::delete_arr(str);
 
     /* Legnth bytes */
     if ((str = row_import_read_bytes(file, 4)) == nullptr) {
@@ -2963,7 +2971,7 @@
 
     size_t length = mach_read_from_4(str);
 
-    UT_DELETE_ARRAY(str);
+    ut::delete_arr(str);
 
     /* Value bytes */
     if (((str = row_import_read_bytes(file, length)) == nullptr) &&
@@ -2973,7 +2981,7 @@
 
     col->set_default(str, length, *heap);
 
-    UT_DELETE_ARRAY(str);
+    ut::delete_arr(str);
 
     return (DB_SUCCESS);
   }
@@ -2981,10 +2989,10 @@
 
 /** Read the meta data (table columns) config file. Deserialise the contents of
  dict_col_t structure, along with the column name. */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_import_read_columns(FILE *file,      /*!< in: file to write to */
-                            THD *thd,        /*!< in/out: session */
-                            row_import *cfg) /*!< in/out: meta-data read */
+[[nodiscard]] static dberr_t row_import_read_columns(
+    FILE *file,      /*!< in: file to write to */
+    THD *thd,        /*!< in/out: session */
+    row_import *cfg) /*!< in/out: meta-data read */
 {
   dict_col_t *col;
   byte row[sizeof(ib_uint32_t) * 8];
@@ -2993,10 +3001,11 @@
   ut_a(cfg->m_n_cols > 0);
   ut_a(cfg->m_n_cols < 1024);
 
-  cfg->m_cols = UT_NEW_ARRAY_NOKEY(dict_col_t, cfg->m_n_cols);
+  cfg->m_cols = ut::new_arr_withkey<dict_col_t>(UT_NEW_THIS_FILE_PSI_KEY,
+                                                ut::Count{cfg->m_n_cols});
 
   /* Trigger OOM */
-  DBUG_EXECUTE_IF("ib_import_OOM_8", UT_DELETE_ARRAY(cfg->m_cols);
+  DBUG_EXECUTE_IF("ib_import_OOM_8", ut::delete_arr(cfg->m_cols);
                   cfg->m_cols = nullptr;);
 
   if (cfg->m_cols == nullptr) {
@@ -3005,10 +3014,11 @@
 
   memset(cfg->m_cols, 0x0, sizeof(*cfg->m_cols) * cfg->m_n_cols);
 
-  cfg->m_col_names = UT_NEW_ARRAY_NOKEY(byte *, cfg->m_n_cols);
+  cfg->m_col_names = ut::new_arr_withkey<byte *>(UT_NEW_THIS_FILE_PSI_KEY,
+                                                 ut::Count{cfg->m_n_cols});
 
   /* Trigger OOM */
-  DBUG_EXECUTE_IF("ib_import_OOM_9", UT_DELETE_ARRAY(cfg->m_col_names);
+  DBUG_EXECUTE_IF("ib_import_OOM_9", ut::delete_arr(cfg->m_col_names);
                   cfg->m_col_names = nullptr;);
 
   if (cfg->m_col_names == nullptr) {
@@ -3068,10 +3078,11 @@
       return (DB_CORRUPTION);
     }
 
-    cfg->m_col_names[i] = UT_NEW_ARRAY_NOKEY(byte, len);
+    cfg->m_col_names[i] =
+        ut::new_arr_withkey<byte>(UT_NEW_THIS_FILE_PSI_KEY, ut::Count{len});
 
     /* Trigger OOM */
-    DBUG_EXECUTE_IF("ib_import_OOM_10", UT_DELETE_ARRAY(cfg->m_col_names[i]);
+    DBUG_EXECUTE_IF("ib_import_OOM_10", ut::delete_arr(cfg->m_col_names[i]);
                     cfg->m_col_names[i] = nullptr;);
 
     if (cfg->m_col_names[i] == nullptr) {
@@ -3114,10 +3125,10 @@
 
 /** Read the contents of the @<tablespace@>.cfg file.
  @return DB_SUCCESS or error code. */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_import_read_v1(FILE *file,      /*!< in: File to read from */
-                       THD *thd,        /*!< in: session */
-                       row_import *cfg) /*!< out: meta data */
+[[nodiscard]] static dberr_t row_import_read_v1(
+    FILE *file,      /*!< in: File to read from */
+    THD *thd,        /*!< in: session */
+    row_import *cfg) /*!< out: meta data */
 {
   byte value[sizeof(ib_uint32_t)];
 
@@ -3137,10 +3148,11 @@
   ulint len = mach_read_from_4(value);
 
   /* NUL byte is part of name length. */
-  cfg->m_hostname = UT_NEW_ARRAY_NOKEY(byte, len);
+  cfg->m_hostname =
+      ut::new_arr_withkey<byte>(UT_NEW_THIS_FILE_PSI_KEY, ut::Count{len});
 
   /* Trigger OOM */
-  DBUG_EXECUTE_IF("ib_import_OOM_1", UT_DELETE_ARRAY(cfg->m_hostname);
+  DBUG_EXECUTE_IF("ib_import_OOM_1", ut::delete_arr(cfg->m_hostname);
                   cfg->m_hostname = nullptr;);
 
   if (cfg->m_hostname == nullptr) {
@@ -3171,10 +3183,11 @@
   len = mach_read_from_4(value);
 
   /* NUL byte is part of name length. */
-  cfg->m_table_name = UT_NEW_ARRAY_NOKEY(byte, len);
+  cfg->m_table_name =
+      ut::new_arr_withkey<byte>(UT_NEW_THIS_FILE_PSI_KEY, ut::Count{len});
 
   /* Trigger OOM */
-  DBUG_EXECUTE_IF("ib_import_OOM_2", UT_DELETE_ARRAY(cfg->m_table_name);
+  DBUG_EXECUTE_IF("ib_import_OOM_2", ut::delete_arr(cfg->m_table_name);
                   cfg->m_table_name = nullptr;);
 
   if (cfg->m_table_name == nullptr) {
@@ -3277,7 +3290,7 @@
 @param[in]	thd	session
 @param[in,out]	cfg	meta data
 @return DB_SUCCESS or error code. */
-static MY_ATTRIBUTE((nonnull, warn_unused_result)) dberr_t
+[[nodiscard]] static MY_ATTRIBUTE((nonnull)) dberr_t
     row_import_read_v2(FILE *file, THD *thd, row_import *cfg) {
   byte value[sizeof(uint32_t)];
 
@@ -3318,7 +3331,7 @@
 @param[in]	thd	session
 @param[in,out]	cfg	meta data
 @return DB_SUCCESS or error code. */
-static MY_ATTRIBUTE((nonnull, warn_unused_result)) dberr_t
+[[nodiscard]] static MY_ATTRIBUTE((nonnull)) dberr_t
     row_import_read_common(FILE *file, THD *thd, row_import *cfg) {
   dberr_t err;
   if ((err = row_import_read_columns(file, thd, cfg)) != DB_SUCCESS) {
@@ -3335,7 +3348,7 @@
 /**
 Read the contents of the @<tablespace@>.cfg file.
 @return DB_SUCCESS or error code. */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t row_import_read_meta_data(
+[[nodiscard]] static dberr_t row_import_read_meta_data(
     dict_table_t *table, /*!< in: table */
     FILE *file,          /*!< in: File to read from */
     THD *thd,            /*!< in: session */
@@ -3396,9 +3409,9 @@
 @param[in]	thd		session
 @param[in,out]	cfg		contents of the .cfg file
 @return DB_SUCCESS or error code. */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_import_read_cfg(dict_table_t *table, dd::Table *table_def, THD *thd,
-                        row_import &cfg) {
+[[nodiscard]] static dberr_t row_import_read_cfg(dict_table_t *table,
+                                                 dd::Table *table_def, THD *thd,
+                                                 row_import &cfg) {
   dberr_t err;
   char name[OS_FILE_MAX_PATH];
 
@@ -3832,7 +3845,7 @@
     filepath = Fil_path::make_ibd_from_table_name(table->name.m_name);
   }
 
-  DBUG_EXECUTE_IF("ib_import_OOM_15", ut_free(filepath); filepath = nullptr;);
+  DBUG_EXECUTE_IF("ib_import_OOM_15", ut::free(filepath); filepath = nullptr;);
 
   if (filepath == nullptr) {
     row_mysql_unlock_data_dictionary(trx);
@@ -3864,7 +3877,7 @@
     ib_senderrf(trx->mysql_thd, IB_LOG_LEVEL_ERROR, ER_FILE_NOT_FOUND, filepath,
                 err, ut_strerr(err));
 
-    ut_free(filepath);
+    ut::free(filepath);
 
     return row_import_cleanup(prebuilt, trx, err);
   }
@@ -3901,7 +3914,7 @@
     }
   }
 
-  ut_free(filepath);
+  ut::free(filepath);
 
   err = ibuf_check_bitmap_on_import(trx, table->space);
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/row/row0ins.cc mysql-8.0-8.0.27/storage/innobase/row/row0ins.cc
--- mysql-8.0-8.0.26/storage/innobase/row/row0ins.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/row/row0ins.cc	2021-09-28 11:46:34.000000000 +0000
@@ -218,21 +218,20 @@
  in the index. This situation can occur if the delete-marked record is
  kept in the index for consistent reads.
  @return DB_SUCCESS or error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_ins_sec_index_entry_by_modify(
-        ulint flags,       /*!< in: undo logging and locking flags */
-        ulint mode,        /*!< in: BTR_MODIFY_LEAF or BTR_MODIFY_TREE,
-                           depending on whether mtr holds just a leaf
-                           latch or also a tree latch */
-        btr_cur_t *cursor, /*!< in: B-tree cursor */
-        ulint **offsets,   /*!< in/out: offsets on cursor->page_cur.rec */
-        mem_heap_t *offsets_heap,
-        /*!< in/out: memory heap that can be emptied */
-        mem_heap_t *heap,      /*!< in/out: memory heap */
-        const dtuple_t *entry, /*!< in: index entry to insert */
-        que_thr_t *thr,        /*!< in: query thread */
-        mtr_t *mtr)            /*!< in: mtr; must be committed before
-                               latching any further pages */
+[[nodiscard]] static dberr_t row_ins_sec_index_entry_by_modify(
+    ulint flags,       /*!< in: undo logging and locking flags */
+    ulint mode,        /*!< in: BTR_MODIFY_LEAF or BTR_MODIFY_TREE,
+                       depending on whether mtr holds just a leaf
+                       latch or also a tree latch */
+    btr_cur_t *cursor, /*!< in: B-tree cursor */
+    ulint **offsets,   /*!< in/out: offsets on cursor->page_cur.rec */
+    mem_heap_t *offsets_heap,
+    /*!< in/out: memory heap that can be emptied */
+    mem_heap_t *heap,      /*!< in/out: memory heap */
+    const dtuple_t *entry, /*!< in: index entry to insert */
+    que_thr_t *thr,        /*!< in: query thread */
+    mtr_t *mtr)            /*!< in: mtr; must be committed before
+                           latching any further pages */
 {
   big_rec_t *dummy_big_rec;
   upd_t *update;
@@ -306,23 +305,22 @@
  existing record in the index. This situation can occur if the delete marked
  record is kept in the index for consistent reads.
  @return DB_SUCCESS, DB_FAIL, or error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_ins_clust_index_entry_by_modify(
-        btr_pcur_t *pcur, /*!< in/out: a persistent cursor pointing
-                          to the clust_rec that is being modified. */
-        ulint flags,      /*!< in: undo logging and locking flags */
-        ulint mode,       /*!< in: BTR_MODIFY_LEAF or BTR_MODIFY_TREE,
-                          depending on whether mtr holds just a leaf
-                          latch or also a tree latch */
-        ulint **offsets,  /*!< out: offsets on cursor->page_cur.rec */
-        mem_heap_t **offsets_heap,
-        /*!< in/out: pointer to memory heap that can
-        be emptied, or NULL */
-        mem_heap_t *heap,      /*!< in/out: memory heap */
-        const dtuple_t *entry, /*!< in: index entry to insert */
-        que_thr_t *thr,        /*!< in: query thread */
-        mtr_t *mtr)            /*!< in: mtr; must be committed before
-                               latching any further pages */
+[[nodiscard]] static dberr_t row_ins_clust_index_entry_by_modify(
+    btr_pcur_t *pcur, /*!< in/out: a persistent cursor pointing
+                      to the clust_rec that is being modified. */
+    ulint flags,      /*!< in: undo logging and locking flags */
+    ulint mode,       /*!< in: BTR_MODIFY_LEAF or BTR_MODIFY_TREE,
+                      depending on whether mtr holds just a leaf
+                      latch or also a tree latch */
+    ulint **offsets,  /*!< out: offsets on cursor->page_cur.rec */
+    mem_heap_t **offsets_heap,
+    /*!< in/out: pointer to memory heap that can
+    be emptied, or NULL */
+    mem_heap_t *heap,      /*!< in/out: memory heap */
+    const dtuple_t *entry, /*!< in: index entry to insert */
+    que_thr_t *thr,        /*!< in: query thread */
+    mtr_t *mtr)            /*!< in: mtr; must be committed before
+                           latching any further pages */
 {
   const rec_t *rec;
   upd_t *update;
@@ -421,7 +419,7 @@
 /** Returns the number of ancestor UPDATE or DELETE nodes of a
  cascaded update/delete node.
  @return number of ancestors */
-static MY_ATTRIBUTE((warn_unused_result)) ulint row_ins_cascade_n_ancestors(
+[[nodiscard]] static ulint row_ins_cascade_n_ancestors(
     que_node_t *node) /*!< in: node in a query graph */
 {
   que_node_t *parent;
@@ -442,7 +440,7 @@
  can also be 0 if no foreign key fields changed; the returned value is
  ULINT_UNDEFINED if the column type in the child table is too short to
  fit the new value in the parent table: that means the update fails */
-static MY_ATTRIBUTE((warn_unused_result)) ulint row_ins_cascade_calc_update_vec(
+[[nodiscard]] static ulint row_ins_cascade_calc_update_vec(
     upd_node_t *node,        /*!< in: update node of the parent
                              table */
     dict_foreign_t *foreign, /*!< in: foreign key constraint whose
@@ -898,7 +896,29 @@
 
     if (node->is_delete ? (foreign->type & DICT_FOREIGN_ON_DELETE_SET_NULL)
                         : (foreign->type & DICT_FOREIGN_ON_UPDATE_SET_NULL)) {
-      dfield_set_null(&upd_field->new_val);
+      uint32_t col_match_count = dict_vcol_base_is_foreign_key(col, foreign);
+      if (col_match_count == col->num_base) {
+        /* If all base columns of virtual col are in FK */
+        dfield_set_null(&upd_field->new_val);
+      } else if (col_match_count == 0) {
+        /* If no base column of virtual col is in FK */
+        dfield_copy(&(upd_field->new_val), vfield);
+      } else {
+        /* If at least one base column of virtual col is in FK */
+        for (uint32_t j = 0; j < col->num_base; j++) {
+          dict_col_t *base_col = col->base_col[j];
+          uint32_t col_no = base_col->ind;
+          dfield_t *row_field = innobase_get_field_from_update_vector(
+              foreign, node->update, col_no);
+          if (row_field != nullptr) {
+            dfield_set_null(row_field);
+          }
+        }
+        dfield_t *new_vfield = innobase_get_computed_value(
+            update->old_vrow, col, index, &v_heap, update->heap, nullptr, thd,
+            nullptr, nullptr, node->update, foreign);
+        dfield_copy(&(upd_field->new_val), new_vfield);
+      }
     }
 
     if (!node->is_delete && (foreign->type & DICT_FOREIGN_ON_UPDATE_CASCADE)) {
@@ -932,18 +952,17 @@
  @return DB_SUCCESS, DB_LOCK_WAIT, or error code
  Disable inlining because of a bug in gcc8 which may lead to stack exhaustion.
 */
-static NO_INLINE MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_ins_foreign_check_on_constraint(
-        que_thr_t *thr,          /*!< in: query thread whose run_node
-                                 is an update node */
-        dict_foreign_t *foreign, /*!< in: foreign key constraint whose
-                                 type is != 0 */
-        btr_pcur_t *pcur,        /*!< in: cursor placed on a matching
-                                 index record in the child table */
-        dtuple_t *entry,         /*!< in: index entry in the parent
-                                 table */
-        mtr_t *mtr)              /*!< in: mtr holding the latch of pcur
-                                 page */
+[[nodiscard]] static NO_INLINE dberr_t row_ins_foreign_check_on_constraint(
+    que_thr_t *thr,          /*!< in: query thread whose run_node
+                             is an update node */
+    dict_foreign_t *foreign, /*!< in: foreign key constraint whose
+                             type is != 0 */
+    btr_pcur_t *pcur,        /*!< in: cursor placed on a matching
+                             index record in the child table */
+    dtuple_t *entry,         /*!< in: index entry in the parent
+                             table */
+    mtr_t *mtr)              /*!< in: mtr holding the latch of pcur
+                             page */
 {
   upd_node_t *node;
   upd_node_t *cascade;
@@ -1458,8 +1477,8 @@
       }
 
       if (check_table && check_index) {
-        tmp_foreign = static_cast<dict_foreign_t *>(
-            ut_malloc_nokey(sizeof(dict_foreign_t)));
+        tmp_foreign = static_cast<dict_foreign_t *>(ut::malloc_withkey(
+            UT_NEW_THIS_FILE_PSI_KEY, sizeof(dict_foreign_t)));
 
         memcpy(tmp_foreign, foreign, sizeof(*foreign));
 
@@ -1719,7 +1738,7 @@
   if (tmp_open) {
     dict_sys_mutex_enter();
     dd_table_close(check_table, thd, &mdl, true);
-    ut_free(tmp_foreign);
+    ut::free(tmp_foreign);
     dict_sys_mutex_exit();
   }
 
@@ -1732,12 +1751,11 @@
  sets shared locks which lock either the success or the failure of
  a constraint.
  @return DB_SUCCESS or error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_ins_check_foreign_constraints(
-        dict_table_t *table, /*!< in: table */
-        dict_index_t *index, /*!< in: index */
-        dtuple_t *entry,     /*!< in: index entry for index */
-        que_thr_t *thr)      /*!< in: query thread */
+[[nodiscard]] static dberr_t row_ins_check_foreign_constraints(
+    dict_table_t *table, /*!< in: table */
+    dict_index_t *index, /*!< in: index */
+    dtuple_t *entry,     /*!< in: index entry for index */
+    que_thr_t *thr)      /*!< in: query thread */
 {
   dict_foreign_t *foreign;
   dberr_t err;
@@ -1853,15 +1871,14 @@
  whether a uniqueness violation has occurred for the key value of the entry.
  Set shared locks on possible duplicate records.
  @return DB_SUCCESS, DB_DUPLICATE_KEY, or DB_LOCK_WAIT */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_ins_scan_sec_index_for_duplicate(
-        ulint flags,         /*!< in: undo logging and locking flags */
-        dict_index_t *index, /*!< in: non-clustered unique index */
-        dtuple_t *entry,     /*!< in: index entry */
-        que_thr_t *thr,      /*!< in: query thread */
-        bool s_latch,        /*!< in: whether index->lock is being held */
-        mtr_t *mtr,          /*!< in/out: mini-transaction */
-        mem_heap_t *offsets_heap)
+[[nodiscard]] static dberr_t row_ins_scan_sec_index_for_duplicate(
+    ulint flags,         /*!< in: undo logging and locking flags */
+    dict_index_t *index, /*!< in: non-clustered unique index */
+    dtuple_t *entry,     /*!< in: index entry */
+    que_thr_t *thr,      /*!< in: query thread */
+    bool s_latch,        /*!< in: whether index->lock is being held */
+    mtr_t *mtr,          /*!< in/out: mini-transaction */
+    mem_heap_t *offsets_heap)
 /*!< in/out: memory heap that can be emptied */
 {
   ulint n_unique;
@@ -2037,10 +2054,11 @@
 @retval DB_SUCCESS_LOCKED_REC when rec is an exact match of entry or
 a newer version of entry (the entry should not be inserted)
 @retval DB_DUPLICATE_KEY when entry is a duplicate of rec */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_ins_duplicate_online(ulint n_uniq, const dtuple_t *entry,
-                             const rec_t *rec, const dict_index_t *index,
-                             ulint *offsets) {
+[[nodiscard]] static dberr_t row_ins_duplicate_online(ulint n_uniq,
+                                                      const dtuple_t *entry,
+                                                      const rec_t *rec,
+                                                      const dict_index_t *index,
+                                                      ulint *offsets) {
   ulint fields = 0;
 
   /* During rebuild, there should not be any delete-marked rows
@@ -2071,13 +2089,12 @@
 @retval DB_SUCCESS_LOCKED_REC when rec is an exact match of entry or
 a newer version of entry (the entry should not be inserted)
 @retval DB_DUPLICATE_KEY when entry is a duplicate of rec */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_ins_duplicate_error_in_clust_online(
-        ulint n_uniq,            /*!< in: offset of DB_TRX_ID */
-        const dtuple_t *entry,   /*!< in: entry that is being inserted */
-        const btr_cur_t *cursor, /*!< in: cursor on insert position */
-        ulint **offsets,         /*!< in/out: rec_get_offsets(rec) */
-        mem_heap_t **heap)       /*!< in/out: heap for offsets */
+[[nodiscard]] static dberr_t row_ins_duplicate_error_in_clust_online(
+    ulint n_uniq,            /*!< in: offset of DB_TRX_ID */
+    const dtuple_t *entry,   /*!< in: entry that is being inserted */
+    const btr_cur_t *cursor, /*!< in: cursor on insert position */
+    ulint **offsets,         /*!< in/out: rec_get_offsets(rec) */
+    mem_heap_t **heap)       /*!< in/out: heap for offsets */
 {
   dberr_t err = DB_SUCCESS;
   const rec_t *rec = btr_cur_get_rec(cursor);
@@ -2111,13 +2128,12 @@
  record
  @retval DB_SUCCESS_LOCKED_REC if an exact match of the record was found
  in online table rebuild (flags & (BTR_KEEP_SYS_FLAG | BTR_NO_LOCKING_FLAG)) */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_ins_duplicate_error_in_clust(
-        ulint flags,           /*!< in: undo logging and locking flags */
-        btr_cur_t *cursor,     /*!< in: B-tree cursor */
-        const dtuple_t *entry, /*!< in: entry to insert */
-        que_thr_t *thr,        /*!< in: query thread */
-        mtr_t *mtr)            /*!< in: mtr */
+[[nodiscard]] static dberr_t row_ins_duplicate_error_in_clust(
+    ulint flags,           /*!< in: undo logging and locking flags */
+    btr_cur_t *cursor,     /*!< in: B-tree cursor */
+    const dtuple_t *entry, /*!< in: entry to insert */
+    que_thr_t *thr,        /*!< in: query thread */
+    mtr_t *mtr)            /*!< in: mtr */
 {
   dberr_t err;
   rec_t *rec;
@@ -2440,6 +2456,8 @@
   }
 #endif /* UNIV_DEBUG */
 
+  bool persist_autoinc = false;
+
   /* Write logs for AUTOINC right after index lock has been got and
   before any further resource acquisitions to prevent deadlock.
   No need to log for temporary tables and intermediate tables */
@@ -2451,7 +2469,7 @@
     if (counter != 0) {
       /* Always log the counter change first, so it won't
       be affected by any follow-up failure. */
-      dict_table_autoinc_log(index->table, counter, &mtr);
+      persist_autoinc = dict_table_autoinc_log(index->table, counter, &mtr);
     }
   }
 
@@ -2475,7 +2493,7 @@
           break;
         default:
           ut_ad(0);
-          /* fall through */
+          [[fallthrough]];
         case DB_SUCCESS_LOCKED_REC:
         case DB_DUPLICATE_KEY:
           if (thr != nullptr) {
@@ -2594,6 +2612,12 @@
             << index->table->name << " return status: " << err;
       });
 
+  /* Persist auto increment value to DD buffer table if requested. Do it after
+  closing the mini transaction and releasing latches. */
+  if (persist_autoinc) {
+    dict_table_persist_to_dd_table_buffer(index->table);
+  }
+
   return err;
 }
 
@@ -2730,7 +2754,7 @@
 @param[in]	check		Whether to check
 @param[in]	search_mode	Flags
 @return true if the index is to be dropped */
-static MY_ATTRIBUTE((warn_unused_result)) bool row_ins_sec_mtr_start_and_check_if_aborted(
+[[nodiscard]] static bool row_ins_sec_mtr_start_and_check_if_aborted(
     mtr_t *mtr, dict_index_t *index, bool check, ulint search_mode) {
   ut_ad(!index->is_clustered());
 
@@ -2954,7 +2978,7 @@
           private to its call stack. */
           err = DB_SUCCESS;
         }
-        /* fall through */
+        [[fallthrough]];
       default:
         if (dict_index_is_spatial(index)) {
           rtr_clean_rtr_info(&rtr_info, true);
@@ -3422,9 +3446,9 @@
 /** Inserts a single index entry to the table.
  @return DB_SUCCESS if operation successfully completed, else error
  code or DB_LOCK_WAIT */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_ins_index_entry_step(ins_node_t *node, /*!< in: row insert node */
-                             que_thr_t *thr)   /*!< in: query thread */
+[[nodiscard]] static dberr_t row_ins_index_entry_step(
+    ins_node_t *node, /*!< in: row insert node */
+    que_thr_t *thr)   /*!< in: query thread */
 {
   dberr_t err;
 
@@ -3529,9 +3553,9 @@
 /** Inserts a row to a table.
  @return DB_SUCCESS if operation successfully completed, else error
  code or DB_LOCK_WAIT */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_ins(ins_node_t *node, /*!< in: row insert node */
-            que_thr_t *thr)   /*!< in: query thread */
+[[nodiscard]] static dberr_t row_ins(
+    ins_node_t *node, /*!< in: row insert node */
+    que_thr_t *thr)   /*!< in: query thread */
 {
   dberr_t err;
 
@@ -3567,7 +3591,7 @@
         case DB_DUPLICATE_KEY:
           thr_get_trx(thr)->error_state = DB_DUPLICATE_KEY;
           thr_get_trx(thr)->error_index = node->index;
-        // fall through
+          [[fallthrough]];
         default:
           return err;
       }
diff -Nru mysql-8.0-8.0.26/storage/innobase/row/row0log.cc mysql-8.0-8.0.27/storage/innobase/row/row0log.cc
--- mysql-8.0-8.0.26/storage/innobase/row/row0log.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/row/row0log.cc	2021-09-28 11:46:34.000000000 +0000
@@ -39,12 +39,13 @@
 #include <map>
 
 #include "data0data.h"
+#include "ddl0ddl.h"
 #include "handler0alter.h"
 #include "lob0lob.h"
 #include "que0que.h"
 #include "row0ext.h"
 #include "row0ins.h"
-#include "row0merge.h"
+#include "row0mysql.h"
 #include "row0row.h"
 #include "row0upd.h"
 #include "srv0mon.h"
@@ -78,15 +79,21 @@
 
 /** Log block for modifications during online ALTER TABLE */
 struct row_log_buf_t {
-  byte *block;     /*!< file block buffer */
-  mrec_buf_t buf;  /*!< buffer for accessing a record
-                   that spans two blocks */
-  ulint blocks;    /*!< current position in blocks */
-  ulint bytes;     /*!< current position within block */
-  ulonglong total; /*!< logical position, in bytes from
-                   the start of the row_log_table log;
-                   0 for row_log_online_op() and
-                   row_log_apply(). */
+  /** File block buffer */
+  byte *block;
+
+  /** Buffer for accessing a record that spans two blocks */
+  ddl::mrec_buf_t buf;
+
+  /** Current position in blocks */
+  ulint blocks;
+
+  /** Current position within block */
+  ulint bytes;
+
+  /** logical position, in bytes from the start of the row_log_table log; 0 for
+  row_log_online_op() and row_log_apply(). */
+  ulonglong total;
 };
 
 /** Tracks BLOB allocation during online ALTER TABLE */
@@ -154,8 +161,9 @@
 If a page number maps to a nonzero number, the number is a byte offset
 into the index->online_log, indicating that the page is safe to access
 when applying log records starting from that offset. */
-typedef std::map<page_no_t, row_log_table_blob_t, std::less<page_no_t>,
-                 ut_allocator<std::pair<const page_no_t, row_log_table_blob_t>>>
+typedef std::map<
+    page_no_t, row_log_table_blob_t, std::less<page_no_t>,
+    ut::allocator<std::pair<const page_no_t, row_log_table_blob_t>>>
     page_no_map;
 
 /** @brief Buffer for logging modifications during online index creation
@@ -171,51 +179,64 @@
 directly. When also head.bytes == tail.bytes, both counts will be
 reset to 0 and the file will be truncated. */
 struct row_log_t {
-  int fd;              /*!< file descriptor */
-  ib_mutex_t mutex;    /*!< mutex protecting error,
-                       max_trx and tail */
-  page_no_map *blobs;  /*!< map of page numbers of off-page columns
-                       that have been freed during table-rebuilding
-                       ALTER TABLE (row_log_table_*); protected by
-                       index->lock X-latch only */
-  dict_table_t *table; /*!< table that is being rebuilt,
-                       or NULL when this is a secondary
-                       index that is being created online */
-  bool same_pk;        /*!< whether the definition of the PRIMARY KEY
-                       has remained the same */
+  /** File descriptor */
+  os_fd_t fd;
+
+  /** Mutex protecting error, max_trx and tail */
+  ib_mutex_t mutex;
+
+  /** Map of page numbers of off-page columns that have been freed during
+  table-rebuilding ALTER TABLE (row_log_table_*); protected by index->lock
+  X-latch only */
+  page_no_map *blobs;
+
+  /** Table that is being rebuilt, or NULL when this is a secondary index that
+  is being created online */
+  dict_table_t *table;
+
+  /** Whether the definition of the PRIMARY KEY has remained the same */
+  bool same_pk;
+
+  /** Default values of added columns, or NULL */
   const dtuple_t *add_cols;
-  /*!< default values of added columns, or NULL */
-  const ulint *col_map; /*!< mapping of old column numbers to
-                        new ones, or NULL if !table */
-  dberr_t error;        /*!< error that occurred during online
-                        table rebuild */
-  trx_id_t max_trx;     /*!< biggest observed trx_id in
-                        row_log_online_op();
-                        protected by mutex and index->lock S-latch,
-                        or by index->lock X-latch only */
-  row_log_buf_t tail;   /*!< writer context;
-                        protected by mutex and index->lock S-latch,
-                        or by index->lock X-latch only */
-  row_log_buf_t head;   /*!< reader context; protected by MDL only;
-                        modifiable by row_log_apply_ops() */
-  ulint n_old_col;
-  /*!< number of non-virtual column in
-  old table */
-  ulint n_old_vcol;
-  /*!< number of virtual column in old table */
-  const char *path; /*!< where to create temporary file during
-                    log operation */
+
+  /** Mapping of old column numbers to new ones, or NULL if !table */
+  const ulint *col_map;
+
+  /** Error that occurred during online table rebuild */
+  dberr_t error;
+
+  /** Biggest observed trx_id in row_log_online_op(); protected by mutex and
+  index->lock S-latch, or by index->lock X-latch only */
+  trx_id_t max_trx;
+
+  /** writer context; protected by mutex and index->lock S-latch, or by
+  index->lock X-latch only */
+  row_log_buf_t tail;
+
+  /** Reader context; protected by MDL only; modifiable by
+  row_log_apply_ops() */
+  row_log_buf_t head;
+
+  /** number of non-virtual column in old table */
+  size_t n_old_col;
+
+  /** number of virtual column in old table */
+  size_t n_old_vcol;
+
+  /** Where to create temporary file during log operation */
+  const char *path;
 };
 
 /** Create the file or online log if it does not exist.
 @param[in,out] log     online rebuild log
 @return true if success, false if not */
-static MY_ATTRIBUTE((warn_unused_result)) int row_log_tmpfile(row_log_t *log) {
+[[nodiscard]] static int row_log_tmpfile(row_log_t *log) {
   DBUG_TRACE;
   if (log->fd < 0) {
-    log->fd = row_merge_file_create_low(log->path);
+    log->fd = ddl::file_create_low(log->path);
     DBUG_EXECUTE_IF("row_log_tmpfile_fail",
-                    if (log->fd > 0) row_merge_file_destroy_low(log->fd);
+                    if (log->fd > 0) ddl::file_destroy_low(log->fd);
                     log->fd = -1;);
     if (log->fd >= 0) {
       MONITOR_ATOMIC_INC(MONITOR_ALTER_TABLE_LOG_FILES);
@@ -228,14 +249,14 @@
 /** Allocate the memory for the log buffer.
 @param[in,out]	log_buf	Buffer used for log operation
 @return true if success, false if not */
-static MY_ATTRIBUTE((warn_unused_result)) bool row_log_block_allocate(
-    row_log_buf_t &log_buf) {
+[[nodiscard]] static bool row_log_block_allocate(row_log_buf_t &log_buf) {
   DBUG_TRACE;
   if (log_buf.block == nullptr) {
     DBUG_EXECUTE_IF("simulate_row_log_allocation_failure", return false;);
 
-    log_buf.block = ut_allocator<byte>(mem_key_row_log_buf)
-                        .allocate_large(srv_sort_buf_size);
+    log_buf.block = static_cast<uint8_t *>(ut::malloc_large_page_withkey(
+        ut::make_psi_memory_key(mem_key_row_log_buf), srv_sort_buf_size,
+        ut::fallback_to_normal_page_t{}));
 
     if (log_buf.block == nullptr) {
       return false;
@@ -248,10 +269,8 @@
 @param[in,out]	log_buf	Buffer used for log operation */
 static void row_log_block_free(row_log_buf_t &log_buf) {
   DBUG_TRACE;
-  if (log_buf.block != nullptr) {
-    ut_allocator<byte>(mem_key_row_log_buf).deallocate_large(log_buf.block);
-    log_buf.block = nullptr;
-  }
+  ut::free_large_page(log_buf.block, ut::fallback_to_normal_page_t{});
+  log_buf.block = nullptr;
 }
 
 /** Logs an operation to a secondary index that is (or was) being created. */
@@ -279,12 +298,12 @@
 
   ut_ad(dict_index_is_online_ddl(index));
 
-  /* Compute the size of the record. This differs from
-  row_merge_buf_encode(), because here we do not encode
-  extra_size+1 (and reserve 0 as the end-of-chunk marker). */
+  /* Compute the size of the record. This differs from ddl::buf_encode(),
+  because here we do not encode extra_size+1 (and reserve 0 as the
+  end-of-chunk marker). */
 
-  size = rec_get_converted_size_temp(index, tuple->fields, tuple->n_fields,
-                                     nullptr, &extra_size);
+  size = rec_get_serialize_size(index, tuple->fields, tuple->n_fields, nullptr,
+                                &extra_size);
   ut_ad(size >= extra_size);
   ut_ad(size <= sizeof log->tail.buf);
 
@@ -330,8 +349,8 @@
     *b++ = (byte)extra_size;
   }
 
-  rec_convert_dtuple_to_temp(b + extra_size, index, tuple->fields,
-                             tuple->n_fields, nullptr);
+  rec_serialize_dtuple(b + extra_size, index, tuple->fields, tuple->n_fields,
+                       nullptr);
   b += size;
 
   if (mrec_size >= avail_size) {
@@ -395,7 +414,7 @@
 
 /** Starts logging an operation to a table that is being rebuilt.
  @return pointer to log, or NULL if no logging is necessary */
-static MY_ATTRIBUTE((warn_unused_result)) byte *row_log_table_open(
+[[nodiscard]] static byte *row_log_table_open(
     row_log_t *log, /*!< in/out: online rebuild log */
     ulint size,     /*!< in: size of log record */
     ulint *avail)   /*!< out: available size for log record */
@@ -585,7 +604,7 @@
         dtuple_get_nth_field(old_pk, old_pk->n_fields - 2)->len);
   ut_ad(DATA_ROLL_PTR_LEN ==
         dtuple_get_nth_field(old_pk, old_pk->n_fields - 1)->len);
-  old_pk_size = rec_get_converted_size_temp(
+  old_pk_size = rec_get_serialize_size(
       new_index, old_pk->fields, old_pk->n_fields, nullptr, &old_pk_extra_size);
   ut_ad(old_pk_extra_size < 0x100);
 
@@ -596,21 +615,21 @@
   if (ventry->n_v_fields > 0) {
     ulint v_extra;
     mrec_size +=
-        rec_get_converted_size_temp(new_index, nullptr, 0, ventry, &v_extra);
+        rec_get_serialize_size(new_index, nullptr, 0, ventry, &v_extra);
   }
 
   if (byte *b = row_log_table_open(index->online_log, mrec_size, &avail_size)) {
     *b++ = ROW_T_DELETE;
     *b++ = static_cast<byte>(old_pk_extra_size);
 
-    rec_convert_dtuple_to_temp(b + old_pk_extra_size, new_index, old_pk->fields,
-                               old_pk->n_fields, nullptr);
+    rec_serialize_dtuple(b + old_pk_extra_size, new_index, old_pk->fields,
+                         old_pk->n_fields, nullptr);
 
     b += old_pk_size;
 
     /* log virtual columns */
     if (ventry->n_v_fields > 0) {
-      rec_convert_dtuple_to_temp(b, new_index, nullptr, 0, ventry);
+      rec_serialize_dtuple(b, new_index, nullptr, 0, ventry);
       b += mach_read_from_2(b);
     } else if (index->table->n_v_cols) {
       mach_write_to_2(b, 2);
@@ -700,16 +719,16 @@
     }
   }
 
-  size = rec_get_converted_size_temp(index, tuple->fields, tuple->n_fields,
-                                     ventry, &extra_size);
+  size = rec_get_serialize_size(index, tuple->fields, tuple->n_fields, ventry,
+                                &extra_size);
 
   mrec_size = ROW_LOG_HEADER_SIZE + size + (extra_size >= 0x80);
 
   if (num_v) {
     if (o_ventry) {
       ulint v_extra = 0;
-      mrec_size += rec_get_converted_size_temp(new_index, nullptr, 0, o_ventry,
-                                               &v_extra);
+      mrec_size +=
+          rec_get_serialize_size(new_index, nullptr, 0, o_ventry, &v_extra);
     }
   } else if (index->table->n_v_cols) {
     mrec_size += 2;
@@ -727,8 +746,8 @@
           dtuple_get_nth_field(old_pk, old_pk->n_fields - 1)->len);
 
     old_pk_size =
-        rec_get_converted_size_temp(new_index, old_pk->fields, old_pk->n_fields,
-                                    nullptr, &old_pk_extra_size);
+        rec_get_serialize_size(new_index, old_pk->fields, old_pk->n_fields,
+                               nullptr, &old_pk_extra_size);
     ut_ad(old_pk_extra_size < 0x100);
     mrec_size += 1 /*old_pk_extra_size*/ + old_pk_size;
   }
@@ -739,8 +758,8 @@
     if (old_pk_size) {
       *b++ = static_cast<byte>(old_pk_extra_size);
 
-      rec_convert_dtuple_to_temp(b + old_pk_extra_size, new_index,
-                                 old_pk->fields, old_pk->n_fields, ventry);
+      rec_serialize_dtuple(b + old_pk_extra_size, new_index, old_pk->fields,
+                           old_pk->n_fields, ventry);
       b += old_pk_size;
     }
 
@@ -752,13 +771,13 @@
       *b++ = static_cast<byte>(extra_size);
     }
 
-    rec_convert_dtuple_to_temp(b + extra_size, index, tuple->fields,
-                               tuple->n_fields, ventry);
+    rec_serialize_dtuple(b + extra_size, index, tuple->fields, tuple->n_fields,
+                         ventry);
     b += size;
 
     if (num_v) {
       if (o_ventry) {
-        rec_convert_dtuple_to_temp(b, new_index, nullptr, 0, o_ventry);
+        rec_serialize_dtuple(b, new_index, nullptr, 0, o_ventry);
         b += mach_read_from_2(b);
       }
     } else if (index->table->n_v_cols) {
@@ -844,7 +863,7 @@
   if (ventry && ventry->n_v_fields > 0) {
     ulint v_extra = 0;
     uint64_t rec_size =
-        rec_get_converted_size_temp(new_index, nullptr, 0, ventry, &v_extra);
+        rec_get_serialize_size(new_index, nullptr, 0, ventry, &v_extra);
 
     mrec_size += rec_size;
 
@@ -852,8 +871,8 @@
     there must be also nothing to do with old entry. In this case,
     make it same with the case below, by only keep 2 bytes length marker */
     if (rec_size > 2 && o_ventry != nullptr) {
-      mrec_size += rec_get_converted_size_temp(new_index, nullptr, 0, o_ventry,
-                                               &v_extra);
+      mrec_size +=
+          rec_get_serialize_size(new_index, nullptr, 0, o_ventry, &v_extra);
     }
   } else if (index->table->n_v_cols) {
     /* Always leave 2 bytes length marker for virtual column
@@ -874,8 +893,8 @@
           dtuple_get_nth_field(old_pk, old_pk->n_fields - 1)->len);
 
     old_pk_size =
-        rec_get_converted_size_temp(new_index, old_pk->fields, old_pk->n_fields,
-                                    nullptr, &old_pk_extra_size);
+        rec_get_serialize_size(new_index, old_pk->fields, old_pk->n_fields,
+                               nullptr, &old_pk_extra_size);
     ut_ad(old_pk_extra_size < 0x100);
     mrec_size += 1 /*old_pk_extra_size*/ + old_pk_size;
   }
@@ -888,8 +907,8 @@
 
       *b++ = static_cast<byte>(old_pk_extra_size);
 
-      rec_convert_dtuple_to_temp(b + old_pk_extra_size, new_index,
-                                 old_pk->fields, old_pk->n_fields, nullptr);
+      rec_serialize_dtuple(b + old_pk_extra_size, new_index, old_pk->fields,
+                           old_pk->n_fields, nullptr);
       b += old_pk_size;
     }
 
@@ -909,13 +928,13 @@
     if (ventry && ventry->n_v_fields > 0) {
       uint64_t new_v_size;
 
-      rec_convert_dtuple_to_temp(b, new_index, nullptr, 0, ventry);
+      rec_serialize_dtuple(b, new_index, nullptr, 0, ventry);
       new_v_size = mach_read_from_2(b);
       b += new_v_size;
 
       /* Nothing for new entry to be logged, skip the old one too. */
       if (new_v_size != 2 && o_ventry != nullptr) {
-        rec_convert_dtuple_to_temp(b, new_index, nullptr, 0, o_ventry);
+        rec_serialize_dtuple(b, new_index, nullptr, 0, o_ventry);
         b += mach_read_from_2(b);
       }
     } else if (index->table->n_v_cols) {
@@ -1225,7 +1244,8 @@
   page_no_map *blobs = index->online_log->blobs;
 
   if (blobs == nullptr) {
-    index->online_log->blobs = blobs = UT_NEW_NOKEY(page_no_map());
+    index->online_log->blobs = blobs =
+        ut::new_withkey<page_no_map>(UT_NEW_THIS_FILE_PSI_KEY);
   }
 
 #ifdef UNIV_DEBUG
@@ -1278,18 +1298,17 @@
 
 /** Converts a log record to a table row.
  @return converted row, or NULL if the conversion fails */
-static MY_ATTRIBUTE((warn_unused_result))
-    const dtuple_t *row_log_table_apply_convert_mrec(
-        trx_t *trx,           /*!< in: current transaction */
-        const mrec_t *mrec,   /*!< in: merge record */
-        dict_index_t *index,  /*!< in: index of mrec */
-        const ulint *offsets, /*!< in: offsets of mrec */
-        const row_log_t *log, /*!< in: rebuild context */
-        mem_heap_t *heap,     /*!< in/out: memory heap */
-        trx_id_t trx_id,      /*!< in: DB_TRX_ID of mrec */
-        dberr_t *error)       /*!< out: DB_SUCCESS or
-                              DB_MISSING_HISTORY or
-                              reason of failure */
+[[nodiscard]] static const dtuple_t *row_log_table_apply_convert_mrec(
+    trx_t *trx,              /*!< in: current transaction */
+    const ddl::mrec_t *mrec, /*!< in: merge record */
+    dict_index_t *index,     /*!< in: index of mrec */
+    const ulint *offsets,    /*!< in: offsets of mrec */
+    const row_log_t *log,    /*!< in: rebuild context */
+    mem_heap_t *heap,        /*!< in/out: memory heap */
+    trx_id_t trx_id,         /*!< in: DB_TRX_ID of mrec */
+    dberr_t *error)          /*!< out: DB_SUCCESS or
+                             DB_MISSING_HISTORY or
+                             reason of failure */
 {
   dtuple_t *row;
   ulint num_v = dict_table_get_n_v_cols(log->table);
@@ -1444,10 +1463,9 @@
 @retval DB_LOCK_WAIT on lock wait when !(flags & BTR_NO_LOCKING_FLAG)
 @retval DB_FAIL if retry with BTR_MODIFY_TREE is needed
 @return error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    apply_insert_multi_value(uint32_t flags, dict_index_t *index,
-                             mem_heap_t *offsets_heap, mem_heap_t *heap,
-                             dtuple_t *entry, trx_id_t trx_id, que_thr_t *thr) {
+[[nodiscard]] static dberr_t apply_insert_multi_value(
+    uint32_t flags, dict_index_t *index, mem_heap_t *offsets_heap,
+    mem_heap_t *heap, dtuple_t *entry, trx_id_t trx_id, que_thr_t *thr) {
   dberr_t err = DB_SUCCESS;
   Multi_value_entry_builder_insert mv_entry_builder(index, entry);
 
@@ -1466,21 +1484,20 @@
 
 /** Replays an insert operation on a table that was rebuilt.
  @return DB_SUCCESS or error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_log_table_apply_insert_low(
-        que_thr_t *thr,           /*!< in: query graph */
-        const dtuple_t *row,      /*!< in: table row
-                                  in the old table definition */
-        trx_id_t trx_id,          /*!< in: trx_id of the row */
-        mem_heap_t *offsets_heap, /*!< in/out: memory heap
-                                  that can be emptied */
-        mem_heap_t *heap,         /*!< in/out: memory heap */
-        row_merge_dup_t *dup)     /*!< in/out: for reporting
-                                  duplicate key errors */
+[[nodiscard]] static dberr_t row_log_table_apply_insert_low(
+    que_thr_t *thr,           /*!< in: query graph */
+    const dtuple_t *row,      /*!< in: table row
+                              in the old table definition */
+    trx_id_t trx_id,          /*!< in: trx_id of the row */
+    mem_heap_t *offsets_heap, /*!< in/out: memory heap
+                              that can be emptied */
+    mem_heap_t *heap,         /*!< in/out: memory heap */
+    ddl::Dup *dup)            /*!< in/out: for reporting
+                                     duplicate key errors */
 {
   dberr_t error;
   dtuple_t *entry;
-  const row_log_t *log = dup->index->online_log;
+  const row_log_t *log = dup->m_index->online_log;
   dict_index_t *index = log->table->first_index();
   ulint n_index = 0;
 
@@ -1542,22 +1559,22 @@
 
 /** Replays an insert operation on a table that was rebuilt.
  @return DB_SUCCESS or error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t row_log_table_apply_insert(
+[[nodiscard]] static dberr_t row_log_table_apply_insert(
     que_thr_t *thr,           /*!< in: query graph */
-    const mrec_t *mrec,       /*!< in: record to insert */
+    const ddl::mrec_t *mrec,  /*!< in: record to insert */
     const ulint *offsets,     /*!< in: offsets of mrec */
     mem_heap_t *offsets_heap, /*!< in/out: memory heap
                               that can be emptied */
     mem_heap_t *heap,         /*!< in/out: memory heap */
-    row_merge_dup_t *dup,     /*!< in/out: for reporting
-                              duplicate key errors */
+    ddl::Dup *dup,            /*!< in/out: for reporting
+                                     duplicate key errors */
     trx_id_t trx_id)          /*!< in: DB_TRX_ID of mrec */
 {
-  const row_log_t *log = dup->index->online_log;
+  const row_log_t *log = dup->m_index->online_log;
   trx_t *trx = thr_get_trx(thr);
   dberr_t error;
   const dtuple_t *row = row_log_table_apply_convert_mrec(
-      trx, mrec, dup->index, offsets, log, heap, trx_id, &error);
+      trx, mrec, dup->m_index, offsets, log, heap, trx_id, &error);
 
   switch (error) {
     case DB_MISSING_HISTORY:
@@ -1584,7 +1601,7 @@
   if (error != DB_SUCCESS) {
     /* Report the erroneous row using the new
     version of the table. */
-    innobase_row_to_mysql(dup->table, log->table, row);
+    innobase_row_to_mysql(dup->m_table, log->table, row);
   }
   return (error);
 }
@@ -1594,9 +1611,8 @@
 @param[in]	entry	entry to delete
 @param[in,out]	pcur	B-tree cursor
 @return DB_SUCCESS or error code */
-static inline MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_log_table_delete_sec(dict_index_t *index, const dtuple_t *entry,
-                             btr_pcur_t *pcur) {
+[[nodiscard]] static inline dberr_t row_log_table_delete_sec(
+    dict_index_t *index, const dtuple_t *entry, btr_pcur_t *pcur) {
   dberr_t error;
   mtr_t mtr;
 
@@ -1649,10 +1665,9 @@
 @param[in,out]	pcur	B-tree cursor
 @param[in,out]	heap	memory heap
 @return DB_SUCCESS or error code */
-static inline MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    apply_delete_multi_value(const dtuple_t *row, row_ext_t *ext,
-                             dict_index_t *index, btr_pcur_t *pcur,
-                             mem_heap_t *heap) {
+[[nodiscard]] static inline dberr_t apply_delete_multi_value(
+    const dtuple_t *row, row_ext_t *ext, dict_index_t *index, btr_pcur_t *pcur,
+    mem_heap_t *heap) {
   dberr_t err = DB_SUCCESS;
   Multi_value_entry_builder_normal mv_entry_builder(row, ext, index, heap, true,
                                                     false);
@@ -1672,17 +1687,16 @@
 
 /** Deletes a record from a table that is being rebuilt.
  @return DB_SUCCESS or error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_log_table_apply_delete_low(
-        trx_t *trx,             /*!< in: current transaction*/
-        btr_pcur_t *pcur,       /*!< in/out: B-tree cursor,
-                                will be trashed */
-        const dtuple_t *ventry, /*!< in: dtuple holding
-                                virtual column info */
-        const ulint *offsets,   /*!< in: offsets on pcur */
-        mem_heap_t *heap,       /*!< in/out: memory heap */
-        mtr_t *mtr)             /*!< in/out: mini-transaction,
-                                will be committed */
+[[nodiscard]] static dberr_t row_log_table_apply_delete_low(
+    trx_t *trx,             /*!< in: current transaction*/
+    btr_pcur_t *pcur,       /*!< in/out: B-tree cursor,
+                            will be trashed */
+    const dtuple_t *ventry, /*!< in: dtuple holding
+                            virtual column info */
+    const ulint *offsets,   /*!< in: offsets on pcur */
+    mem_heap_t *heap,       /*!< in/out: memory heap */
+    mtr_t *mtr)             /*!< in/out: mini-transaction,
+                            will be committed */
 {
   dberr_t error;
   row_ext_t *ext = nullptr;
@@ -1741,12 +1755,12 @@
 
 /** Replays a delete operation on a table that was rebuilt.
  @return DB_SUCCESS or error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t row_log_table_apply_delete(
+[[nodiscard]] static dberr_t row_log_table_apply_delete(
     que_thr_t *thr,           /*!< in: query graph */
     ulint trx_id_col,         /*!< in: position of
                               DB_TRX_ID in the new
                               clustered index */
-    const mrec_t *mrec,       /*!< in: merge record */
+    const ddl::mrec_t *mrec,  /*!< in: merge record */
     const ulint *moffsets,    /*!< in: offsets of mrec */
     mem_heap_t *offsets_heap, /*!< in/out: memory heap
                               that can be emptied */
@@ -1877,12 +1891,11 @@
 @param[in,out]	offsets_heap	memory heap that can be emptied
 @param[in,out]	heap		memory heap
 @return DB_SUCCESS or error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    apply_update_multi_value(dict_index_t *index, uint32_t n_index,
-                             const dtuple_t *old_row, row_ext_t *old_ext,
-                             const dtuple_t *new_row, bool non_mv_upd,
-                             trx_id_t trx_id, que_thr_t *thr,
-                             mem_heap_t *offsets_heap, mem_heap_t *heap) {
+[[nodiscard]] static dberr_t apply_update_multi_value(
+    dict_index_t *index, uint32_t n_index, const dtuple_t *old_row,
+    row_ext_t *old_ext, const dtuple_t *new_row, bool non_mv_upd,
+    trx_id_t trx_id, que_thr_t *thr, mem_heap_t *offsets_heap,
+    mem_heap_t *heap) {
   btr_pcur_t pcur;
   mtr_t mtr;
   dberr_t error = DB_SUCCESS;
@@ -1944,25 +1957,25 @@
 
 /** Replays an update operation on a table that was rebuilt.
  @return DB_SUCCESS or error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t row_log_table_apply_update(
+[[nodiscard]] static dberr_t row_log_table_apply_update(
     que_thr_t *thr,           /*!< in: query graph */
     ulint new_trx_id_col,     /*!< in: position of
                               DB_TRX_ID in the new
                               clustered index */
-    const mrec_t *mrec,       /*!< in: new value */
+    const ddl::mrec_t *mrec,  /*!< in: new value */
     const ulint *offsets,     /*!< in: offsets of mrec */
     mem_heap_t *offsets_heap, /*!< in/out: memory heap
                               that can be emptied */
     mem_heap_t *heap,         /*!< in/out: memory heap */
-    row_merge_dup_t *dup,     /*!< in/out: for reporting
-                              duplicate key errors */
+    ddl::Dup *dup,            /*!< in/out: for reporting
+                                     duplicate key errors */
     trx_id_t trx_id,          /*!< in: DB_TRX_ID of mrec */
     const dtuple_t *old_pk)   /*!< in: PRIMARY KEY and
                               DB_TRX_ID,DB_ROLL_PTR
                               of the old value,
                               or PRIMARY KEY if same_pk */
 {
-  const row_log_t *log = dup->index->online_log;
+  const row_log_t *log = dup->m_index->online_log;
   const dtuple_t *row;
   dict_index_t *index = log->table->first_index();
   mtr_t mtr;
@@ -1976,7 +1989,7 @@
   ut_ad(dtuple_get_n_fields(old_pk) ==
         dict_index_get_n_unique(index) + (log->same_pk ? 0 : 2));
 
-  row = row_log_table_apply_convert_mrec(trx, mrec, dup->index, offsets, log,
+  row = row_log_table_apply_convert_mrec(trx, mrec, dup->m_index, offsets, log,
                                          heap, trx_id, &error);
 
   switch (error) {
@@ -1993,7 +2006,7 @@
 
       When applying the subsequent ROW_T_DELETE, no matching
       record will be found. */
-      /* Fall through. */
+      [[fallthrough]];
     case DB_SUCCESS:
       ut_ad(row != nullptr);
       break;
@@ -2081,7 +2094,7 @@
     if (error != DB_SUCCESS) {
       /* Report the erroneous row using the new
       version of the table. */
-      innobase_row_to_mysql(dup->table, log->table, row);
+      innobase_row_to_mysql(dup->m_table, log->table, row);
     }
 
     return (error);
@@ -2151,7 +2164,7 @@
                                               ROW_BUILD_FOR_INSERT);
   upd_t *update = row_upd_build_difference_binary(
       index, entry, btr_pcur_get_rec(&pcur), cur_offsets, false, nullptr, heap,
-      dup->table, &error);
+      dup->m_table, &error);
   if (error != DB_SUCCESS) {
     goto func_exit;
   }
@@ -2307,32 +2320,32 @@
 /** Applies an operation to a table that was rebuilt.
  @return NULL on failure (mrec corruption) or when out of data;
  pointer to next record on success */
-static MY_ATTRIBUTE((warn_unused_result)) const mrec_t *row_log_table_apply_op(
-    que_thr_t *thr,           /*!< in: query graph */
-    ulint trx_id_col,         /*!< in: position of
-                              DB_TRX_ID in old index */
-    ulint new_trx_id_col,     /*!< in: position of
-                              DB_TRX_ID in new index */
-    row_merge_dup_t *dup,     /*!< in/out: for reporting
-                              duplicate key errors */
-    dberr_t *error,           /*!< out: DB_SUCCESS
-                              or error code */
-    mem_heap_t *offsets_heap, /*!< in/out: memory heap
-                              that can be emptied */
-    mem_heap_t *heap,         /*!< in/out: memory heap */
-    const mrec_t *mrec,       /*!< in: merge record */
-    const mrec_t *mrec_end,   /*!< in: end of buffer */
-    ulint *offsets)           /*!< in/out: work area
-                              for parsing mrec */
+[[nodiscard]] static const ddl::mrec_t *row_log_table_apply_op(
+    que_thr_t *thr,              /*!< in: query graph */
+    ulint trx_id_col,            /*!< in: position of
+                                 DB_TRX_ID in old index */
+    ulint new_trx_id_col,        /*!< in: position of
+                                 DB_TRX_ID in new index */
+    ddl::Dup *dup,               /*!< in/out: for reporting
+                                        duplicate key errors */
+    dberr_t *error,              /*!< out: DB_SUCCESS
+                                 or error code */
+    mem_heap_t *offsets_heap,    /*!< in/out: memory heap
+                                 that can be emptied */
+    mem_heap_t *heap,            /*!< in/out: memory heap */
+    const ddl::mrec_t *mrec,     /*!< in: merge record */
+    const ddl::mrec_t *mrec_end, /*!< in: end of buffer */
+    ulint *offsets)              /*!< in/out: work area
+                                 for parsing mrec */
 {
-  row_log_t *log = dup->index->online_log;
+  row_log_t *log = dup->m_index->online_log;
   dict_index_t *new_index = log->table->first_index();
   ulint extra_size;
-  const mrec_t *next_mrec;
+  const ddl::mrec_t *next_mrec;
   dtuple_t *old_pk;
 
-  ut_ad(dup->index->is_clustered());
-  ut_ad(dup->index->table != log->table);
+  ut_ad(dup->m_index->is_clustered());
+  ut_ad(dup->m_index->table != log->table);
   ut_ad(log->head.total <= log->tail.total);
 
   *error = DB_SUCCESS;
@@ -2342,7 +2355,7 @@
     return (nullptr);
   }
 
-  const mrec_t *const mrec_start = mrec;
+  const ddl::mrec_t *const mrec_start = mrec;
 
   switch (*mrec++) {
     default:
@@ -2365,8 +2378,8 @@
         return (nullptr);
       }
 
-      rec_offs_set_n_fields(offsets, dup->index->n_fields);
-      rec_init_offsets_temp(mrec, dup->index, offsets);
+      rec_offs_set_n_fields(offsets, dup->m_index->n_fields);
+      rec_deserialize_init_offsets(mrec, dup->m_index, offsets);
 
       next_mrec = mrec + rec_offs_data_size(offsets);
 
@@ -2406,7 +2419,7 @@
       mrec += extra_size;
 
       rec_offs_set_n_fields(offsets, new_index->n_uniq + 2);
-      rec_init_offsets_temp(mrec, new_index, offsets);
+      rec_deserialize_init_offsets(mrec, new_index, offsets);
       next_mrec = mrec + rec_offs_data_size(offsets);
       if (log->table->n_v_cols) {
         if (next_mrec + 2 > mrec_end) {
@@ -2436,8 +2449,8 @@
       DB_TRX_ID,new_row. */
       ulint num_v = new_index->table->n_v_cols;
 
-      if (dup->index->online_log->same_pk) {
-        ut_ad(new_index->n_uniq == dup->index->n_uniq);
+      if (dup->m_index->online_log->same_pk) {
+        ut_ad(new_index->n_uniq == dup->m_index->n_uniq);
 
         extra_size = *mrec++;
 
@@ -2454,8 +2467,8 @@
           return (nullptr);
         }
 
-        rec_offs_set_n_fields(offsets, dup->index->n_fields);
-        rec_init_offsets_temp(mrec, dup->index, offsets);
+        rec_offs_set_n_fields(offsets, dup->m_index->n_fields);
+        rec_deserialize_init_offsets(mrec, dup->m_index, offsets);
 
         next_mrec = mrec + rec_offs_data_size(offsets);
 
@@ -2495,7 +2508,7 @@
         /* Get offsets for PRIMARY KEY,
         DB_TRX_ID, DB_ROLL_PTR. */
         rec_offs_set_n_fields(offsets, new_index->n_uniq + 2);
-        rec_init_offsets_temp(mrec, new_index, offsets);
+        rec_deserialize_init_offsets(mrec, new_index, offsets);
 
         next_mrec = mrec + rec_offs_data_size(offsets);
         if (next_mrec + 2 > mrec_end) {
@@ -2544,8 +2557,8 @@
           return (nullptr);
         }
 
-        rec_offs_set_n_fields(offsets, dup->index->n_fields);
-        rec_init_offsets_temp(mrec, dup->index, offsets);
+        rec_offs_set_n_fields(offsets, dup->m_index->n_fields);
+        rec_deserialize_init_offsets(mrec, dup->m_index, offsets);
 
         next_mrec = mrec + rec_offs_data_size(offsets);
 
@@ -2654,19 +2667,19 @@
 ALTER TABLE. If not NULL, then stage->inc() will be called for each block
 of log that is applied.
 @return DB_SUCCESS, or error code on failure */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_log_table_apply_ops(que_thr_t *thr, row_merge_dup_t *dup,
-                            ut_stage_alter_t *stage) {
+[[nodiscard]] static dberr_t row_log_table_apply_ops(que_thr_t *thr,
+                                                     ddl::Dup *dup,
+                                                     Alter_stage *stage) {
   dberr_t error;
-  const mrec_t *mrec = nullptr;
-  const mrec_t *next_mrec;
-  const mrec_t *mrec_end = nullptr; /* silence bogus warning */
-  const mrec_t *next_mrec_end;
+  const ddl::mrec_t *mrec = nullptr;
+  const ddl::mrec_t *next_mrec;
+  const ddl::mrec_t *mrec_end = nullptr; /* silence bogus warning */
+  const ddl::mrec_t *next_mrec_end;
   mem_heap_t *heap;
   mem_heap_t *offsets_heap;
   ulint *offsets;
   bool has_index_lock;
-  dict_index_t *index = const_cast<dict_index_t *>(dup->index);
+  dict_index_t *index = const_cast<dict_index_t *>(dup->m_index);
   dict_table_t *new_table = index->online_log->table;
   dict_index_t *new_index = new_table->first_index();
   ulint n_fields = dict_index_get_n_fields(index);
@@ -2691,7 +2704,8 @@
 
   UNIV_MEM_INVALID(&mrec_end, sizeof mrec_end);
 
-  offsets = static_cast<ulint *>(ut_malloc_nokey(i * sizeof *offsets));
+  offsets = static_cast<ulint *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, i * sizeof *offsets));
   offsets[0] = i;
   offsets[1] = dict_index_get_n_fields(index);
 
@@ -2821,7 +2835,7 @@
     ut_ad(mrec_end > mrec);
     ut_ad(mrec_end < (&index->online_log->head.buf)[1]);
 
-    memcpy((mrec_t *)mrec_end, next_mrec,
+    memcpy((ddl::mrec_t *)mrec_end, next_mrec,
            (&index->online_log->head.buf)[1] - mrec_end);
     mrec =
         row_log_table_apply_op(thr, trx_id_col, new_trx_id_col, dup, &error,
@@ -2974,7 +2988,7 @@
   mem_heap_free(offsets_heap);
   mem_heap_free(heap);
   row_log_block_free(index->online_log->head);
-  ut_free(offsets);
+  ut::free(offsets);
   return (error);
 }
 
@@ -2987,7 +3001,7 @@
 stage->inc() will be called for each block of log that is applied.
 @return DB_SUCCESS, or error code on failure */
 dberr_t row_log_table_apply(que_thr_t *thr, dict_table_t *old_table,
-                            struct TABLE *table, ut_stage_alter_t *stage) {
+                            struct TABLE *table, Alter_stage *stage) {
   dberr_t error;
   dict_index_t *clust_index;
 
@@ -3009,8 +3023,7 @@
     ut_ad(0);
     error = DB_ERROR;
   } else {
-    row_merge_dup_t dup = {clust_index, table, clust_index->online_log->col_map,
-                           0};
+    ddl::Dup dup = {clust_index, table, clust_index->online_log->col_map, 0};
 
     error = row_log_table_apply_ops(thr, &dup, stage);
 
@@ -3051,7 +3064,8 @@
   ut_ad(!add_cols || col_map);
   ut_ad(rw_lock_own(dict_index_get_lock(index), RW_LOCK_X));
 
-  log = static_cast<row_log_t *>(ut_malloc_nokey(sizeof *log));
+  log = static_cast<row_log_t *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sizeof *log));
 
   if (log == nullptr) {
     return false;
@@ -3092,12 +3106,12 @@
 {
   MONITOR_ATOMIC_DEC(MONITOR_ONLINE_CREATE_INDEX);
 
-  UT_DELETE(log->blobs);
+  ut::delete_(log->blobs);
   row_log_block_free(log->tail);
   row_log_block_free(log->head);
-  row_merge_file_destroy_low(log->fd);
+  ddl::file_destroy_low(log->fd);
   mutex_free(&log->mutex);
-  ut_free(log);
+  ut::free(log);
   log = nullptr;
 }
 
@@ -3119,8 +3133,8 @@
 /** Applies an operation to a secondary index that was being created. */
 static void row_log_apply_op_low(
     dict_index_t *index,      /*!< in/out: index */
-    row_merge_dup_t *dup,     /*!< in/out: for reporting
-                              duplicate key errors */
+    ddl::Dup *dup,            /*!< in/out: for reporting
+                                     duplicate key errors */
     dberr_t *error,           /*!< out: DB_SUCCESS or error code */
     mem_heap_t *offsets_heap, /*!< in/out: memory heap for
                               allocating offsets; can be emptied */
@@ -3272,7 +3286,7 @@
         duplicate:
           /* Duplicate key */
           ut_ad(dict_index_is_unique(index));
-          row_merge_dup_report(dup, entry->fields);
+          dup->report(entry->fields);
           *error = DB_DUPLICATE_KEY;
           goto func_exit;
         }
@@ -3329,21 +3343,21 @@
 /** Applies an operation to a secondary index that was being created.
  @return NULL on failure (mrec corruption) or when out of data;
  pointer to next record on success */
-static MY_ATTRIBUTE((warn_unused_result)) const mrec_t *row_log_apply_op(
-    dict_index_t *index,      /*!< in/out: index */
-    row_merge_dup_t *dup,     /*!< in/out: for reporting
-                              duplicate key errors */
-    dberr_t *error,           /*!< out: DB_SUCCESS or error code */
-    mem_heap_t *offsets_heap, /*!< in/out: memory heap for
-                              allocating offsets; can be emptied */
-    mem_heap_t *heap,         /*!< in/out: memory heap for
-                              allocating data tuples */
-    bool has_index_lock,      /*!< in: true if holding index->lock
-                              in exclusive mode */
-    const mrec_t *mrec,       /*!< in: merge record */
-    const mrec_t *mrec_end,   /*!< in: end of buffer */
-    ulint *offsets)           /*!< in/out: work area for
-                              rec_init_offsets_temp() */
+[[nodiscard]] static const ddl::mrec_t *row_log_apply_op(
+    dict_index_t *index,         /*!< in/out: index */
+    ddl::Dup *dup,               /*!< in/out: for reporting
+                                        duplicate key errors */
+    dberr_t *error,              /*!< out: DB_SUCCESS or error code */
+    mem_heap_t *offsets_heap,    /*!< in/out: memory heap for
+                                 allocating offsets; can be emptied */
+    mem_heap_t *heap,            /*!< in/out: memory heap for
+                                 allocating data tuples */
+    bool has_index_lock,         /*!< in: true if holding index->lock
+                                 in exclusive mode */
+    const ddl::mrec_t *mrec,     /*!< in: merge record */
+    const ddl::mrec_t *mrec_end, /*!< in: end of buffer */
+    ulint *offsets)              /*!< in/out: work area for
+                                 rec_deserialize_init_offsets() */
 
 {
   enum row_op op;
@@ -3406,7 +3420,7 @@
     return (nullptr);
   }
 
-  rec_init_offsets_temp(mrec, index, offsets);
+  rec_deserialize_init_offsets(mrec, index, offsets);
 
   if (rec_offs_any_extern(offsets)) {
     /* There should never be any externally stored fields
@@ -3444,13 +3458,12 @@
 of log that is applied.
 @return DB_SUCCESS, or error code on failure */
 static dberr_t row_log_apply_ops(const trx_t *trx, dict_index_t *index,
-                                 row_merge_dup_t *dup,
-                                 ut_stage_alter_t *stage) {
+                                 ddl::Dup *dup, Alter_stage *stage) {
   dberr_t error;
-  const mrec_t *mrec = nullptr;
-  const mrec_t *next_mrec;
-  const mrec_t *mrec_end = nullptr; /* silence bogus warning */
-  const mrec_t *next_mrec_end;
+  const ddl::mrec_t *mrec = nullptr;
+  const ddl::mrec_t *next_mrec;
+  const ddl::mrec_t *mrec_end = nullptr; /* silence bogus warning */
+  const ddl::mrec_t *next_mrec_end;
   mem_heap_t *offsets_heap;
   mem_heap_t *heap;
   ulint *offsets;
@@ -3463,7 +3476,8 @@
   ut_ad(index->online_log);
   UNIV_MEM_INVALID(&mrec_end, sizeof mrec_end);
 
-  offsets = static_cast<ulint *>(ut_malloc_nokey(i * sizeof *offsets));
+  offsets = static_cast<ulint *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, i * sizeof *offsets));
   offsets[0] = i;
   offsets[1] = dict_index_get_n_fields(index);
 
@@ -3575,7 +3589,7 @@
     ut_ad(mrec_end > mrec);
     ut_ad(mrec_end < (&index->online_log->head.buf)[1]);
 
-    memcpy((mrec_t *)mrec_end, next_mrec,
+    memcpy((ddl::mrec_t *)mrec_end, next_mrec,
            (&index->online_log->head.buf)[1] - mrec_end);
     mrec = row_log_apply_op(index, dup, &error, offsets_heap, heap,
                             has_index_lock, index->online_log->head.buf,
@@ -3719,7 +3733,7 @@
         /* The log file grew too big. */
         error = DB_ONLINE_LOG_TOO_BIG;
       }
-      /* fall through */
+      [[fallthrough]];
     default:
       /* We set the flag directly instead of
       invoking dict_set_corrupted() here,
@@ -3730,7 +3744,7 @@
   mem_heap_free(heap);
   mem_heap_free(offsets_heap);
   row_log_block_free(index->online_log->head);
-  ut_free(offsets);
+  ut::free(offsets);
   return (error);
 }
 
@@ -3744,10 +3758,10 @@
 stage->inc() will be called for each block of log that is applied.
 @return DB_SUCCESS, or error code on failure */
 dberr_t row_log_apply(const trx_t *trx, dict_index_t *index,
-                      struct TABLE *table, ut_stage_alter_t *stage) {
+                      struct TABLE *table, Alter_stage *stage) {
   dberr_t error;
   row_log_t *log;
-  row_merge_dup_t dup = {index, table, nullptr, 0};
+  ddl::Dup dup = {index, table, nullptr, 0};
   DBUG_TRACE;
 
   ut_ad(dict_index_is_online_ddl(index));
@@ -3771,11 +3785,11 @@
     invoking dict_set_corrupted() here,
     because the index is not "public" yet. */
     index->type |= DICT_CORRUPT;
-    index->table->drop_aborted = TRUE;
+    index->table->drop_aborted = true;
 
     dict_index_set_online_status(index, ONLINE_INDEX_ABORTED);
   } else {
-    ut_ad(dup.n_dup == 0);
+    ut_ad(dup.m_n_dup == 0);
     dict_index_set_online_status(index, ONLINE_INDEX_COMPLETE);
   }
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/row/row0merge.cc mysql-8.0-8.0.27/storage/innobase/row/row0merge.cc
--- mysql-8.0-8.0.26/storage/innobase/row/row0merge.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/row/row0merge.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,3974 +0,0 @@
-/*****************************************************************************
-
-Copyright (c) 2005, 2021, Oracle 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, as published by the
-Free Software Foundation.
-
-This program is also distributed with certain software (including but not
-limited to OpenSSL) that is licensed under separate terms, as designated in a
-particular file or component or in included license documentation. The authors
-of MySQL hereby grant you an additional permission to link the program and
-your derivative works with the separately licensed software that they have
-included with MySQL.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
-for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-*****************************************************************************/
-
-/** @file row/row0merge.cc
- New index creation routines using a merge sort
-
- Created 12/4/2005 Jan Lindstrom
- Completed by Sunny Bains and Marko Makela
- *******************************************************/
-
-#include <fcntl.h>
-#include <math.h>
-#include <sys/types.h>
-
-#include <sql_class.h>
-#include "btr0bulk.h"
-#include "dict0crea.h"
-#include "dict0dd.h"
-#include "fsp0sysspace.h"
-#include "ha_prototypes.h"
-#include "handler0alter.h"
-#include "lob0lob.h"
-#include "lock0lock.h"
-#include "my_psi_config.h"
-#include "pars0pars.h"
-#include "row0ext.h"
-#include "row0ftsort.h"
-#include "row0import.h"
-#include "row0ins.h"
-#include "row0log.h"
-#include "row0merge.h"
-#include "row0sel.h"
-#include "trx0purge.h"
-#include "ut0new.h"
-#include "ut0sort.h"
-#include "ut0stage.h"
-
-#include "my_dbug.h"
-#include "sql/table.h"
-
-/* Ignore posix_fadvise() on those platforms where it does not exist */
-#if defined _WIN32
-#define posix_fadvise(fd, offset, len, advice) /* nothing */
-#endif                                         /* _WIN32 */
-
-/* Whether to disable file system cache */
-bool srv_disable_sort_file_cache;
-
-/** Class that caches index row tuples made from a single cluster
-index page scan, and then insert into corresponding index tree */
-class index_tuple_info_t {
- public:
-  /** constructor
-  @param[in]	heap	memory heap
-  @param[in]	index	index to be created */
-  index_tuple_info_t(mem_heap_t *heap, dict_index_t *index) UNIV_NOTHROW {
-    m_heap = heap;
-    m_index = index;
-    m_dtuple_vec = UT_NEW_NOKEY(idx_tuple_vec());
-  }
-
-  /** destructor */
-  ~index_tuple_info_t() { UT_DELETE(m_dtuple_vec); }
-
-  /** Get the index object
-  @return the index object */
-  dict_index_t *get_index() UNIV_NOTHROW { return (m_index); }
-
-  /** Caches an index row into index tuple vector
-  @param[in]	row	table row
-  @param[in]	ext	externally stored column
-  prefixes, or NULL */
-  void add(const dtuple_t *row, const row_ext_t *ext) UNIV_NOTHROW {
-    dtuple_t *dtuple;
-
-    dtuple = row_build_index_entry(row, ext, m_index, m_heap);
-
-    ut_ad(dtuple);
-
-    m_dtuple_vec->push_back(dtuple);
-  }
-
-  /** Copy the fields pointing to the clustered index record.  This call
-  will make the tuple independent of the clustered index record. */
-  void cache_tuples();
-
-  /** Initialize an iterator to traverse the vector of tuples. This iterator
-  is used by the insert() member function to process the vector of tuples. */
-  void iter_init();
-
-  /** Insert spatial index rows cached in vector into spatial index
-  @param[in]      trx_id        Transaction id
-  @param[in,out]  row_heap      Memory heap
-  @param[in]      pcur          Cluster index scanning cursor
-  @param[in,out]  scan_mtr      Mini-transaction for pcur
-  @param[out]     mtr_committed Whether scan_mtr got committed
-  @return DB_SUCCESS if successful, else error number */
-  dberr_t insert(trx_id_t trx_id, mem_heap_t *row_heap, btr_pcur_t *pcur,
-                 mtr_t *scan_mtr, bool *mtr_committed) {
-    big_rec_t *big_rec;
-    rec_t *rec;
-    btr_cur_t ins_cur;
-    mtr_t mtr;
-    rtr_info_t rtr_info;
-    ulint *ins_offsets = nullptr;
-    dberr_t error = DB_SUCCESS;
-    dtuple_t *dtuple;
-    ulint count = 0;
-    bool force_log_free_check = false;
-
-    const ulint flag = BTR_NO_UNDO_LOG_FLAG | BTR_NO_LOCKING_FLAG |
-                       BTR_KEEP_SYS_FLAG | BTR_CREATE_FLAG;
-
-    ut_ad(dict_index_is_spatial(m_index));
-
-    DBUG_EXECUTE_IF("row_merge_instrument_log_check_flush",
-                    force_log_free_check = true;);
-
-    while (m_iter != m_dtuple_vec->end()) {
-      dtuple = *m_iter;
-      ut_ad(dtuple);
-
-      if (log_needs_free_check() || force_log_free_check) {
-        if (!(*mtr_committed)) {
-          /* Request the caller to cache the records */
-          return (DB_CACHE_RECORDS);
-        }
-
-        log_free_check();
-        force_log_free_check = false;
-      }
-
-      mtr.start();
-
-      ins_cur.index = m_index;
-      rtr_init_rtr_info(&rtr_info, false, &ins_cur, m_index, false);
-      rtr_info_update_btr(&ins_cur, &rtr_info);
-
-      btr_cur_search_to_nth_level(m_index, 0, dtuple, PAGE_CUR_RTREE_INSERT,
-                                  BTR_MODIFY_LEAF, &ins_cur, 0, __FILE__,
-                                  __LINE__, &mtr);
-
-      /* It need to update MBR in parent entry,
-      so change search mode to BTR_MODIFY_TREE */
-      if (rtr_info.mbr_adj) {
-        mtr_commit(&mtr);
-        rtr_clean_rtr_info(&rtr_info, true);
-        rtr_init_rtr_info(&rtr_info, false, &ins_cur, m_index, false);
-        rtr_info_update_btr(&ins_cur, &rtr_info);
-
-        mtr_start(&mtr);
-
-        btr_cur_search_to_nth_level(m_index, 0, dtuple, PAGE_CUR_RTREE_INSERT,
-                                    BTR_MODIFY_TREE, &ins_cur, 0, __FILE__,
-                                    __LINE__, &mtr);
-      }
-
-      error = btr_cur_optimistic_insert(flag, &ins_cur, &ins_offsets, &row_heap,
-                                        dtuple, &rec, &big_rec, nullptr, &mtr);
-
-      if (error == DB_FAIL) {
-        ut_ad(!big_rec);
-
-        mtr.commit();
-
-        mtr.start();
-
-        rtr_clean_rtr_info(&rtr_info, true);
-
-        rtr_init_rtr_info(&rtr_info, false, &ins_cur, m_index, false);
-
-        rtr_info_update_btr(&ins_cur, &rtr_info);
-        btr_cur_search_to_nth_level(m_index, 0, dtuple, PAGE_CUR_RTREE_INSERT,
-                                    BTR_MODIFY_TREE, &ins_cur, 0, __FILE__,
-                                    __LINE__, &mtr);
-
-        error =
-            btr_cur_pessimistic_insert(flag, &ins_cur, &ins_offsets, &row_heap,
-                                       dtuple, &rec, &big_rec, nullptr, &mtr);
-      }
-
-      DBUG_EXECUTE_IF("row_merge_ins_spatial_fail", error = DB_FAIL;);
-
-      if (error == DB_SUCCESS) {
-        if (rtr_info.mbr_adj) {
-          error = rtr_ins_enlarge_mbr(&ins_cur, nullptr, &mtr);
-        }
-
-        if (error == DB_SUCCESS) {
-          page_update_max_trx_id(btr_cur_get_block(&ins_cur),
-                                 btr_cur_get_page_zip(&ins_cur), trx_id, &mtr);
-        }
-      }
-
-      mtr_commit(&mtr);
-
-      rtr_clean_rtr_info(&rtr_info, true);
-      count++;
-      ++m_iter;
-    }
-
-    m_dtuple_vec->clear();
-
-    return (error);
-  }
-
- private:
-  /** Cache index rows made from a cluster index scan. Usually
-  for rows on single cluster index page */
-  typedef std::vector<dtuple_t *, ut_allocator<dtuple_t *>> idx_tuple_vec;
-
-  /** Iterator to process m_dtuple_vec */
-  idx_tuple_vec::iterator m_iter;
-
-  /** vector used to cache index rows made from cluster index scan */
-  idx_tuple_vec *m_dtuple_vec;
-
-  /** the index being built */
-  dict_index_t *m_index;
-
-  /** memory heap for creating index tuples */
-  mem_heap_t *m_heap;
-};
-
-void index_tuple_info_t::iter_init() { m_iter = m_dtuple_vec->begin(); }
-
-void index_tuple_info_t::cache_tuples() {
-  /* Since the data of the tuple pk fields are pointers of cluster rows.
-     After mtr committed, these pointer could be point to invalid data. Then, we
-     need to copy all these data from cluster rows.
-  */
-  dtuple_t *cp_tuple;
-  for (idx_tuple_vec::iterator cp_it = m_iter; cp_it != m_dtuple_vec->end();
-       ++cp_it) {
-    cp_tuple = *cp_it;
-
-    /* The first field is the spatial MBR field, which is the key for spatial
-    indexes.  So skip it. */
-    for (ulint i = 1; i < dtuple_get_n_fields(cp_tuple); i++) {
-      dfield_dup(&cp_tuple->fields[i], m_heap);
-    }
-  }
-}
-
-/* Maximum pending doc memory limit in bytes for a fts tokenization thread */
-#define FTS_PENDING_DOC_MEMORY_LIMIT 1000000
-
-/** Insert sorted data tuples to the index.
-@param[in]	trx		current transaction
-@param[in]	index		index to be inserted
-@param[in]	old_table	old table
-@param[in]	fd		file descriptor
-@param[in,out]	block		file buffer
-@param[in]	row_buf		row_buf the sorted data tuples,
-or NULL if fd, block will be used instead
-@param[in,out]	btr_bulk	btr bulk instance
-@param[in,out]	stage		performance schema accounting object, used by
-ALTER TABLE. If not NULL stage->begin_phase_insert() will be called initially
-and then stage->inc() will be called for each record that is processed.
-@return DB_SUCCESS or error number */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t row_merge_insert_index_tuples(
-    trx_t *trx, dict_index_t *index, const dict_table_t *old_table, int fd,
-    row_merge_block_t *block, const row_merge_buf_t *row_buf, BtrBulk *btr_bulk,
-    ut_stage_alter_t *stage = nullptr);
-
-/** Encode an index record. */
-static void row_merge_buf_encode(
-    byte **b,                  /*!< in/out: pointer to
-                               current end of output buffer */
-    const dict_index_t *index, /*!< in: index */
-    const mtuple_t *entry,     /*!< in: index fields
-                               of the record to encode */
-    ulint n_fields)            /*!< in: number of fields
-                               in the entry */
-{
-  ulint size;
-  ulint extra_size;
-
-  size = rec_get_converted_size_temp(index, entry->fields, n_fields, nullptr,
-                                     &extra_size);
-  ut_ad(size >= extra_size);
-
-  /* Encode extra_size + 1 */
-  if (extra_size + 1 < 0x80) {
-    *(*b)++ = (byte)(extra_size + 1);
-  } else {
-    ut_ad((extra_size + 1) < 0x8000);
-    *(*b)++ = (byte)(0x80 | ((extra_size + 1) >> 8));
-    *(*b)++ = (byte)(extra_size + 1);
-  }
-
-  rec_convert_dtuple_to_temp(*b + extra_size, index, entry->fields, n_fields,
-                             nullptr);
-
-  *b += size;
-}
-
-/** Allocate a sort buffer.
- @return own: sort buffer */
-static MY_ATTRIBUTE((malloc)) row_merge_buf_t *row_merge_buf_create_low(
-    mem_heap_t *heap,    /*!< in: heap where allocated */
-    dict_index_t *index, /*!< in: secondary index */
-    ulint max_tuples,    /*!< in: maximum number of
-                         data tuples */
-    ulint buf_size)      /*!< in: size of the buffer,
-                         in bytes */
-{
-  row_merge_buf_t *buf;
-
-  ut_ad(max_tuples > 0);
-
-  ut_ad(max_tuples <= srv_sort_buf_size);
-
-  buf = static_cast<row_merge_buf_t *>(mem_heap_zalloc(heap, buf_size));
-  buf->heap = heap;
-  buf->index = index;
-  buf->max_tuples = max_tuples;
-  buf->tuples = static_cast<mtuple_t *>(
-      ut_malloc_nokey(2 * max_tuples * sizeof *buf->tuples));
-  buf->tmp_tuples = buf->tuples + max_tuples;
-
-  return (buf);
-}
-
-/** Allocate a sort buffer.
- @return own: sort buffer */
-row_merge_buf_t *row_merge_buf_create(
-    dict_index_t *index) /*!< in: secondary index */
-{
-  row_merge_buf_t *buf;
-  ulint max_tuples;
-  ulint buf_size;
-  mem_heap_t *heap;
-
-  max_tuples = static_cast<ulint>(srv_sort_buf_size) /
-               ut_max(static_cast<ulint>(1), index->get_min_size());
-
-  buf_size = (sizeof *buf);
-
-  heap = mem_heap_create(buf_size);
-
-  buf = row_merge_buf_create_low(heap, index, max_tuples, buf_size);
-
-  return (buf);
-}
-
-/** Empty a sort buffer.
- @return sort buffer */
-row_merge_buf_t *row_merge_buf_empty(
-    row_merge_buf_t *buf) /*!< in,own: sort buffer */
-{
-  ulint buf_size = sizeof *buf;
-  ulint max_tuples = buf->max_tuples;
-  mem_heap_t *heap = buf->heap;
-  dict_index_t *index = buf->index;
-  mtuple_t *tuples = buf->tuples;
-
-  mem_heap_empty(heap);
-
-  buf = static_cast<row_merge_buf_t *>(mem_heap_zalloc(heap, buf_size));
-  buf->heap = heap;
-  buf->index = index;
-  buf->max_tuples = max_tuples;
-  buf->tuples = tuples;
-  buf->tmp_tuples = buf->tuples + max_tuples;
-
-  return (buf);
-}
-
-/** Deallocate a sort buffer. */
-void row_merge_buf_free(
-    row_merge_buf_t *buf) /*!< in,own: sort buffer to be freed */
-{
-  ut_free(buf->tuples);
-  mem_heap_free(buf->heap);
-}
-
-#ifdef UNIV_DEBUG
-#define row_merge_buf_redundant_convert(trx, index, row_field, field, len, \
-                                        page_size, is_sdi, heap)           \
-  row_merge_buf_redundant_convert_func(trx, index, row_field, field, len,  \
-                                       page_size, is_sdi, heap)
-#else /* UNIV_DEBUG */
-#define row_merge_buf_redundant_convert(trx, index, row_field, field, len, \
-                                        page_size, is_sdi, heap)           \
-  row_merge_buf_redundant_convert_func(trx, index, row_field, field, len,  \
-                                       page_size, heap)
-#endif /* UNIV_DEBUG */
-
-/** Convert the field data from compact to redundant format.
-@param[in]	trx		current transaction
-@param[in]	clust_index	clustered index being built
-@param[in]	row_field	field to copy from
-@param[out]	field		field to copy to
-@param[in]	len		length of the field data
-@param[in]	page_size	compressed BLOB page size,
-                                zero for uncompressed BLOBs */
-#ifdef UNIV_DEBUG
-/**
-@param[in]	is_sdi		true for SDI indexes */
-#endif /* UNIV_DEBUG */
-/**
-@param[in,out]	heap		memory heap where to allocate data when
-                                converting to ROW_FORMAT=REDUNDANT, or NULL
-                                when not to invoke
-                                row_merge_buf_redundant_convert(). */
-static void row_merge_buf_redundant_convert_func(
-    trx_t *trx, const dict_index_t *clust_index, const dfield_t *row_field,
-    dfield_t *field, ulint len, const page_size_t &page_size,
-#ifdef UNIV_DEBUG
-    bool is_sdi,
-#endif /* UNIV_DEBUG */
-    mem_heap_t *heap) {
-  ut_ad(DATA_MBMINLEN(field->type.mbminmaxlen) == 1);
-  ut_ad(DATA_MBMAXLEN(field->type.mbminmaxlen) > 1);
-
-  byte *buf = (byte *)mem_heap_alloc(heap, len);
-  ulint field_len = row_field->len;
-  ut_ad(field_len <= len);
-
-  if (row_field->ext) {
-    const byte *field_data = static_cast<byte *>(dfield_get_data(row_field));
-    ulint ext_len;
-
-    ut_a(field_len >= BTR_EXTERN_FIELD_REF_SIZE);
-    ut_a(memcmp(field_data + field_len - BTR_EXTERN_FIELD_REF_SIZE,
-                field_ref_zero, BTR_EXTERN_FIELD_REF_SIZE));
-
-    byte *data = lob::btr_copy_externally_stored_field(
-        nullptr, clust_index, &ext_len, nullptr, field_data, page_size,
-        field_len, is_sdi, heap);
-
-    ut_ad(ext_len < len);
-
-    memcpy(buf, data, ext_len);
-    field_len = ext_len;
-  } else {
-    memcpy(buf, row_field->data, field_len);
-  }
-
-  memset(buf + field_len, 0x20, len - field_len);
-
-  dfield_set_data(field, buf, len);
-}
-
-/** Insert a data tuple into a sort buffer.
-@param[in,out]	buf		sort buffer
-@param[in]	fts_index	fts index to be created
-@param[in]	old_table	original table
-@param[in]	new_table	new table
-@param[in,out]	psort_info	parallel sort info
-@param[in]	row		table row
-@param[in]	ext		cache of externally stored
-                                column prefixes, or NULL
-@param[in,out]	doc_id		Doc ID if we are creating
-                                FTS index
-@param[in,out]	conv_heap	memory heap where to allocate data when
-                                converting to ROW_FORMAT=REDUNDANT, or NULL
-                                when not to invoke
-                                row_merge_buf_redundant_convert()
-@param[in,out]	err		set if error occurs
-@param[in,out]	v_heap		heap memory to process data for virtual column
-@param[in,out]	my_table	mysql table object
-@param[in]	trx		transaction object
-@param[in,out]	multi_val_added	non-zero indicates this number of multi-value
-                                data has been put to the buffer, and it should
-                                just continue from this point, otherwise,
-                                this is a new row to be added to buffer.
-                                For the output, non-zero means the new number
-                                of multi-value data which have been handled,
-                                while zero means this is a normal row or all
-                                data of the multi-value data in this row have
-                                been parsed
-@return number of rows added, 0 if out of space, or UNIV_NO_INDEX_VALUE
-if this is a multi-value index and current row has nothing valid to be
-indexed */
-static ulint row_merge_buf_add(row_merge_buf_t *buf, dict_index_t *fts_index,
-                               const dict_table_t *old_table,
-                               const dict_table_t *new_table,
-                               fts_psort_t *psort_info, const dtuple_t *row,
-                               const row_ext_t *ext, doc_id_t *doc_id,
-                               mem_heap_t *conv_heap, dberr_t *err,
-                               mem_heap_t **v_heap, TABLE *my_table, trx_t *trx,
-                               ulint *multi_val_added) {
-  ulint i;
-  const dict_index_t *index;
-  mtuple_t *entry;
-  dfield_t *field;
-  const dict_field_t *ifield;
-  ulint n_fields;
-  ulint data_size;
-  ulint extra_size;
-  ulint bucket = 0;
-  doc_id_t write_doc_id;
-  ulint n_row_added = 0;
-  ulint n_row_to_add = 0;
-  multi_value_data *multi_v = nullptr;
-  DBUG_TRACE;
-
-  if (buf->n_tuples >= buf->max_tuples) {
-    return 0;
-  }
-
-  DBUG_EXECUTE_IF("ib_row_merge_buf_add_two",
-                  if (buf->n_tuples >= 2) return 0;);
-
-  UNIV_PREFETCH_R(row->fields);
-
-  /* If we are building FTS index, buf->index points to
-  the 'fts_sort_idx', and real FTS index is stored in
-  fts_index */
-  index = (buf->index->type & DICT_FTS) ? fts_index : buf->index;
-
-  /* create spatial index should not come here */
-  ut_ad(!dict_index_is_spatial(index));
-
-add_next:
-  n_fields = dict_index_get_n_fields(index);
-
-  if (buf->n_tuples >= buf->max_tuples) {
-    return n_row_added;
-  }
-
-  DBUG_EXECUTE_IF("row_merge_add_multi_value",
-                  if (n_row_added == 5) return n_row_added;);
-
-  entry = &buf->tuples[buf->n_tuples];
-  field = entry->fields = static_cast<dfield_t *>(
-      mem_heap_alloc(buf->heap, n_fields * sizeof *entry->fields));
-
-  data_size = 0;
-  extra_size = UT_BITS_IN_BYTES(index->n_nullable);
-
-  ifield = index->get_field(0);
-
-  for (i = 0; i < n_fields; i++, field++, ifield++) {
-    ulint len;
-    const dict_col_t *col;
-    const dict_v_col_t *v_col = nullptr;
-    ulint col_no;
-    ulint fixed_len;
-    dfield_t *row_field;
-
-    col = ifield->col;
-    if (col->is_virtual()) {
-      v_col = reinterpret_cast<const dict_v_col_t *>(col);
-    }
-
-    col_no = dict_col_get_no(col);
-
-    /* Process the Doc ID column */
-    if (*doc_id > 0 && col_no == index->table->fts->doc_col &&
-        !col->is_virtual()) {
-      fts_write_doc_id((byte *)&write_doc_id, *doc_id);
-
-      /* Note: field->data now points to a value on the
-      stack: &write_doc_id after dfield_set_data(). Because
-      there is only one doc_id per row, it shouldn't matter.
-      We allocate a new buffer before we leave the function
-      later below. */
-
-      dfield_set_data(field, &write_doc_id, sizeof(write_doc_id));
-
-      field->type.mtype = ifield->col->mtype;
-      field->type.prtype = ifield->col->prtype;
-      field->type.mbminmaxlen = DATA_MBMINMAXLEN(0, 0);
-      field->type.len = ifield->col->len;
-    } else {
-      /* Use callback to get the virtual column value */
-      if (col->is_virtual()) {
-        const dict_index_t *clust_index = new_table->first_index();
-        if (col->is_multi_value()) {
-          ut_ad(index->is_multi_value());
-          row_field = dtuple_get_nth_v_field(row, v_col->v_pos);
-
-          if (n_row_to_add == 0) {
-            row_field = innobase_get_computed_value(
-                row, v_col, clust_index, v_heap, buf->heap, ifield,
-                trx->mysql_thd, my_table, old_table, nullptr, nullptr);
-
-            if (row_field == nullptr) {
-              *err = DB_COMPUTE_VALUE_FAILED;
-              return 0;
-            }
-
-            if (dfield_is_null(row_field)) {
-              n_row_to_add = 1;
-            } else if (row_field->len != UNIV_NO_INDEX_VALUE) {
-              multi_v = static_cast<multi_value_data *>(row_field->data);
-
-              if (*multi_val_added == 0) {
-                n_row_to_add = multi_v->num_v;
-                row_field->data = const_cast<void *>(multi_v->datap[0]);
-                row_field->len = multi_v->data_len[0];
-              } else {
-                n_row_to_add = multi_v->num_v - *multi_val_added;
-                row_field->data =
-                    const_cast<void *>(multi_v->datap[*multi_val_added]);
-                row_field->len = multi_v->data_len[*multi_val_added];
-              }
-            } else {
-              /* Nothing to be indexed */
-              return UNIV_NO_INDEX_VALUE;
-            }
-
-            ut_ad(n_row_to_add > 0);
-          } else {
-            row_field->data =
-                const_cast<void *>(multi_v->datap[*multi_val_added]);
-            row_field->len = multi_v->data_len[*multi_val_added];
-          }
-        } else {
-          row_field = innobase_get_computed_value(
-              row, v_col, clust_index, v_heap, nullptr, ifield, trx->mysql_thd,
-              my_table, old_table, nullptr, nullptr);
-
-          if (row_field == nullptr) {
-            *err = DB_COMPUTE_VALUE_FAILED;
-            return 0;
-          }
-        }
-        dfield_copy(field, row_field);
-      } else {
-        row_field = dtuple_get_nth_field(row, col_no);
-        dfield_copy(field, row_field);
-      }
-
-      /* Tokenize and process data for FTS */
-      if (index->type & DICT_FTS) {
-        fts_doc_item_t *doc_item;
-        byte *value;
-        void *ptr;
-        const ulint max_trial_count = 10000;
-        ulint trial_count = 0;
-
-        /* fetch Doc ID if it already exists
-        in the row, and not supplied by the
-        caller. Even if the value column is
-        NULL, we still need to get the Doc
-        ID so to maintain the correct max
-        Doc ID */
-        if (*doc_id == 0) {
-          const dfield_t *doc_field;
-          doc_field = dtuple_get_nth_field(row, index->table->fts->doc_col);
-          *doc_id = (doc_id_t)mach_read_from_8(
-              static_cast<byte *>(dfield_get_data(doc_field)));
-
-          if (*doc_id == 0) {
-            ib::warn(ER_IB_MSG_964) << "FTS Doc ID is"
-                                       " zero. Record"
-                                       " skipped";
-            return 0;
-          }
-        }
-
-        if (dfield_is_null(field)) {
-          n_row_added = 1;
-          continue;
-        }
-
-        ptr = ut_malloc_nokey(sizeof(*doc_item) + field->len);
-
-        doc_item = static_cast<fts_doc_item_t *>(ptr);
-        value = static_cast<byte *>(ptr) + sizeof(*doc_item);
-        memcpy(value, field->data, field->len);
-        field->data = value;
-
-        doc_item->field = field;
-        doc_item->doc_id = *doc_id;
-
-        bucket = *doc_id % fts_sort_pll_degree;
-
-        /* Add doc item to fts_doc_list */
-        mutex_enter(&psort_info[bucket].mutex);
-
-        if (psort_info[bucket].error == DB_SUCCESS) {
-          UT_LIST_ADD_LAST(psort_info[bucket].fts_doc_list, doc_item);
-          psort_info[bucket].memory_used += sizeof(*doc_item) + field->len;
-        } else {
-          ut_free(doc_item);
-        }
-
-        mutex_exit(&psort_info[bucket].mutex);
-
-        /* Sleep when memory used exceeds limit*/
-        while (psort_info[bucket].memory_used > FTS_PENDING_DOC_MEMORY_LIMIT &&
-               trial_count++ < max_trial_count) {
-          std::this_thread::sleep_for(std::chrono::milliseconds(1));
-        }
-
-        n_row_added = 1;
-        continue;
-      }
-
-      if (field->len != UNIV_SQL_NULL && col->mtype == DATA_MYSQL &&
-          col->len != field->len) {
-        if (conv_heap != nullptr) {
-          row_merge_buf_redundant_convert(
-              trx, old_table->first_index(), row_field, field, col->len,
-              dict_table_page_size(old_table), dict_table_is_sdi(old_table->id),
-              conv_heap);
-        } else {
-          /* Field length mismatch should not
-          happen when rebuilding redundant row
-          format table. */
-          ut_ad(dict_table_is_comp(index->table));
-        }
-      }
-    }
-
-    len = dfield_get_len(field);
-
-    if (dfield_is_null(field)) {
-      ut_ad(!(col->prtype & DATA_NOT_NULL));
-      continue;
-    } else if (!ext) {
-    } else if (index->is_clustered()) {
-      /* Flag externally stored fields. */
-      const byte *buf = row_ext_lookup(ext, col_no, &len);
-      if (UNIV_LIKELY_NULL(buf)) {
-        ut_a(buf != field_ref_zero);
-        if (i < dict_index_get_n_unique(index)) {
-          dfield_set_data(field, buf, len);
-        } else {
-          dfield_set_ext(field);
-          len = dfield_get_len(field);
-        }
-      }
-    } else if (!col->is_virtual()) {
-      /* Only non-virtual column are stored externally */
-      const byte *buf = row_ext_lookup(ext, col_no, &len);
-      if (UNIV_LIKELY_NULL(buf)) {
-        ut_a(buf != field_ref_zero);
-        dfield_set_data(field, buf, len);
-      }
-    }
-
-    /* If a column prefix index, take only the prefix */
-
-    if (ifield->prefix_len) {
-      len = dtype_get_at_most_n_mbchars(
-          col->prtype, col->mbminmaxlen, ifield->prefix_len, len,
-          static_cast<char *>(dfield_get_data(field)));
-      dfield_set_len(field, len);
-    }
-
-    ut_ad(len <= col->len || DATA_LARGE_MTYPE(col->mtype) ||
-          (col->mtype == DATA_POINT && len == DATA_MBR_LEN));
-
-    fixed_len = ifield->fixed_len;
-    if (fixed_len && !dict_table_is_comp(index->table) &&
-        DATA_MBMINLEN(col->mbminmaxlen) != DATA_MBMAXLEN(col->mbminmaxlen)) {
-      /* CHAR in ROW_FORMAT=REDUNDANT is always
-      fixed-length, but in the temporary file it is
-      variable-length for variable-length character
-      sets. */
-      fixed_len = 0;
-    }
-
-    if (fixed_len) {
-#ifdef UNIV_DEBUG
-      ulint mbminlen = DATA_MBMINLEN(col->mbminmaxlen);
-      ulint mbmaxlen = DATA_MBMAXLEN(col->mbminmaxlen);
-
-      /* len should be between size calcualted base on
-      mbmaxlen and mbminlen */
-      ut_ad(len <= fixed_len);
-      ut_ad(!mbmaxlen || len >= mbminlen * (fixed_len / mbmaxlen));
-
-      ut_ad(!dfield_is_ext(field));
-#endif /* UNIV_DEBUG */
-    } else if (dfield_is_ext(field)) {
-      extra_size += 2;
-    } else if (len < 128 || (!DATA_BIG_COL(col))) {
-      extra_size++;
-    } else {
-      /* For variable-length columns, we look up the
-      maximum length from the column itself.  If this
-      is a prefix index column shorter than 256 bytes,
-      this will waste one byte. */
-      extra_size += 2;
-    }
-    data_size += len;
-  }
-
-  /* If this is FTS index, we already populated the sort buffer, return
-  here */
-  if (index->type & DICT_FTS) {
-    return n_row_added;
-  }
-
-#ifdef UNIV_DEBUG
-  {
-    ulint size;
-    ulint extra;
-
-    size = rec_get_converted_size_temp(index, entry->fields, n_fields, nullptr,
-                                       &extra);
-
-    ut_ad(data_size + extra_size == size);
-    ut_ad(extra_size == extra);
-  }
-#endif /* UNIV_DEBUG */
-
-  /* Add to the total size of the record in row_merge_block_t
-  the encoded length of extra_size and the extra bytes (extra_size).
-  See row_merge_buf_write() for the variable-length encoding
-  of extra_size. */
-  data_size += (extra_size + 1) + ((extra_size + 1) >= 0x80);
-
-  /* Record size can exceed page size while converting to
-  redundant row format. But there is assert
-  ut_ad(size < UNIV_PAGE_SIZE) in rec_offs_data_size().
-  It may hit the assert before attempting to insert the row. */
-  if (conv_heap != nullptr && data_size > UNIV_PAGE_SIZE) {
-    *err = DB_TOO_BIG_RECORD;
-  }
-
-  ut_ad(data_size < srv_sort_buf_size);
-
-  /* Reserve one byte for the end marker of row_merge_block_t. */
-  if (buf->total_size + data_size >= srv_sort_buf_size - 1) {
-    return (index->is_multi_value() ? n_row_added : 0);
-  }
-
-  buf->total_size += data_size;
-  buf->n_tuples++;
-  n_row_added++;
-
-  field = entry->fields;
-
-  /* Copy the data fields. */
-
-  do {
-    dfield_dup(field++, buf->heap);
-  } while (--n_fields);
-
-  if (conv_heap != nullptr) {
-    mem_heap_empty(conv_heap);
-  }
-
-  if (n_row_added < n_row_to_add) {
-    ut_ad(index->is_multi_value());
-    *multi_val_added += 1;
-
-    DBUG_EXECUTE_IF("row_merge_add_multi_value",
-                    if (*multi_val_added == 7) return n_row_added;);
-
-    goto add_next;
-  }
-
-  if (index->is_multi_value()) {
-    *multi_val_added = 0;
-  }
-
-  return n_row_added;
-}
-
-/** Report a duplicate key.
-@param[in,out] dup For reporting duplicates
-@param[in] entry Duplicate index entry */
-void row_merge_dup_report(row_merge_dup_t *dup, const dfield_t *entry) {
-  if (!dup->n_dup++) {
-    /* Only report the first duplicate record,
-    but count all duplicate records. */
-    innobase_fields_to_mysql(dup->table, dup->index, entry);
-  }
-}
-
-/** Compare two tuples.
- @param[in]	index	index tree
- @param[in]	n_uniq	number of unique fields
- @param[in]	n_field	number of fields
- @param[in]	a	first tuple to be compared
- @param[in]	b	second tuple to be compared
- @param[in,out]	dup	for reporting duplicates, NULL if non-unique index
- @return positive, 0, negative if a is greater, equal, less, than b,
- respectively */
-static MY_ATTRIBUTE((warn_unused_result)) int row_merge_tuple_cmp(
-    const dict_index_t *index, ulint n_uniq, ulint n_field, const mtuple_t &a,
-    const mtuple_t &b, row_merge_dup_t *dup) {
-  int cmp;
-  const dfield_t *af = a.fields;
-  const dfield_t *bf = b.fields;
-  ulint n = n_uniq;
-  const dict_field_t *f = index->fields;
-  ut_ad(n > 0);
-  ut_ad(n_uniq <= n_field);
-
-  /* Compare the fields of the tuples until a difference is
-  found or we run out of fields to compare.  If !cmp at the
-  end, the tuples are equal. */
-  do {
-    cmp = cmp_dfield_dfield(af++, bf++, (f++)->is_ascending);
-  } while (!cmp && --n);
-
-  if (cmp) {
-    return (cmp);
-  }
-
-  if (dup) {
-    /* Report a duplicate value error if the tuples are
-    logically equal.  NULL columns are logically inequal,
-    although they are equal in the sorting order.  Find
-    out if any of the fields are NULL. */
-    for (const dfield_t *df = a.fields; df != af; df++) {
-      if (dfield_is_null(df)) {
-        goto no_report;
-      }
-    }
-
-    row_merge_dup_report(dup, a.fields);
-  }
-
-no_report:
-  /* The n_uniq fields were equal, but we compare all fields so
-  that we will get the same (internal) order as in the B-tree. */
-  for (n = n_field - n_uniq + 1; --n;) {
-    cmp = cmp_dfield_dfield(af++, bf++, (f++)->is_ascending);
-    if (cmp) {
-      return (cmp);
-    }
-  }
-
-  /* This should never be reached, except in a secondary index
-  when creating a secondary index and a PRIMARY KEY, and there
-  is a duplicate in the PRIMARY KEY that has not been detected
-  yet. Internally, an index must never contain duplicates. */
-  return (cmp);
-}
-
-/** Wrapper for row_merge_tuple_sort() to inject some more context to
-UT_SORT_FUNCTION_BODY().
-@param tuples array of tuples that being sorted
-@param aux work area, same size as tuples[]
-@param low lower bound of the sorting area, inclusive
-@param high upper bound of the sorting area, inclusive */
-#define row_merge_tuple_sort_ctx(tuples, aux, low, high) \
-  row_merge_tuple_sort(index, n_uniq, n_field, dup, tuples, aux, low, high)
-/** Wrapper for row_merge_tuple_cmp() to inject some more context to
-UT_SORT_FUNCTION_BODY().
-@param a first tuple to be compared
-@param b second tuple to be compared
-@return positive, 0, negative, if a is greater, equal, less, than b,
-respectively */
-#define row_merge_tuple_cmp_ctx(a, b) \
-  row_merge_tuple_cmp(index, n_uniq, n_field, a, b, dup)
-
-/** Merge sort the tuple buffer in main memory. */
-static void row_merge_tuple_sort(
-    const dict_index_t *index, /*!< in: index tree */
-    ulint n_uniq,              /*!< in: number of unique fields */
-    ulint n_field,             /*!< in: number of fields */
-    row_merge_dup_t *dup,      /*!< in/out: reporter of duplicates
-                               (NULL if non-unique index) */
-    mtuple_t *tuples,          /*!< in/out: tuples */
-    mtuple_t *aux,             /*!< in/out: work area */
-    ulint low,                 /*!< in: lower bound of the
-                               sorting area, inclusive */
-    ulint high)                /*!< in: upper bound of the
-                               sorting area, exclusive */
-{
-  ut_ad(n_field > 0);
-  ut_ad(n_uniq <= n_field);
-
-  UT_SORT_FUNCTION_BODY(row_merge_tuple_sort_ctx, tuples, aux, low, high,
-                        row_merge_tuple_cmp_ctx);
-}
-
-/** Sort a buffer.
-@param[in,out] buf Sort buffer
-@param[in,out] dup Reporter of duplicates (null if non-unique index) */
-void row_merge_buf_sort(row_merge_buf_t *buf, row_merge_dup_t *dup) {
-  ut_ad(!dict_index_is_spatial(buf->index));
-
-  row_merge_tuple_sort(buf->index, dict_index_get_n_unique(buf->index),
-                       dict_index_get_n_fields(buf->index), dup, buf->tuples,
-                       buf->tmp_tuples, 0, buf->n_tuples);
-}
-
-/** Write a buffer to a block. */
-void row_merge_buf_write(
-    const row_merge_buf_t *buf, /*!< in: sorted buffer */
-    const merge_file_t *of UNIV_UNUSED,
-    /*!< in: output file */
-    row_merge_block_t *block) /*!< out: buffer for writing to file */
-{
-  const dict_index_t *index = buf->index;
-  ulint n_fields = dict_index_get_n_fields(index);
-  byte *b = &block[0];
-
-  DBUG_TRACE;
-
-  for (ulint i = 0; i < buf->n_tuples; i++) {
-    const mtuple_t *entry = &buf->tuples[i];
-
-    row_merge_buf_encode(&b, index, entry, n_fields);
-    ut_ad(b < &block[srv_sort_buf_size]);
-
-    DBUG_PRINT("ib_merge_sort",
-               ("%p,fd=%d,%lu %lu: %s", reinterpret_cast<const void *>(b),
-                of->fd, ulong(of->offset), ulong(i),
-                rec_printer(entry->fields, n_fields).str().c_str()));
-  }
-
-  /* Write an "end-of-chunk" marker. */
-  ut_a(b < &block[srv_sort_buf_size]);
-  ut_a(b == &block[0] + buf->total_size);
-  *b++ = 0;
-#ifdef UNIV_DEBUG_VALGRIND
-  /* The rest of the block is uninitialized.  Initialize it
-  to avoid bogus warnings. */
-  memset(b, 0xff, &block[srv_sort_buf_size] - b);
-#endif /* UNIV_DEBUG_VALGRIND */
-  DBUG_PRINT("ib_merge_sort",
-             ("write %p,%d,%lu EOF", reinterpret_cast<const void *>(b), of->fd,
-              ulong(of->offset)));
-}
-
-/** Create a memory heap and allocate space for row_merge_rec_offsets()
- and mrec_buf_t[3].
- @return memory heap */
-static mem_heap_t *row_merge_heap_create(
-    const dict_index_t *index, /*!< in: record descriptor */
-    mrec_buf_t **buf,          /*!< out: 3 buffers */
-    ulint **offsets1,          /*!< out: offsets */
-    ulint **offsets2)          /*!< out: offsets */
-{
-  ulint i = 1 + REC_OFFS_HEADER_SIZE + dict_index_get_n_fields(index);
-  mem_heap_t *heap =
-      mem_heap_create(2 * i * sizeof **offsets1 + 3 * sizeof **buf);
-
-  *buf = static_cast<mrec_buf_t *>(mem_heap_alloc(heap, 3 * sizeof **buf));
-  *offsets1 = static_cast<ulint *>(mem_heap_alloc(heap, i * sizeof **offsets1));
-  *offsets2 = static_cast<ulint *>(mem_heap_alloc(heap, i * sizeof **offsets2));
-
-  (*offsets1)[0] = (*offsets2)[0] = i;
-  (*offsets1)[1] = (*offsets2)[1] = dict_index_get_n_fields(index);
-
-  return (heap);
-}
-
-/** Read a merge block from the file system.
- @return true if request was successful, false if fail */
-ibool row_merge_read(int fd,                 /*!< in: file descriptor */
-                     ulint offset,           /*!< in: offset where to read
-                                             in number of row_merge_block_t
-                                             elements */
-                     row_merge_block_t *buf) /*!< out: data */
-{
-  os_offset_t ofs = ((os_offset_t)offset) * srv_sort_buf_size;
-  dberr_t err;
-
-  DBUG_TRACE;
-  DBUG_PRINT("ib_merge_sort", ("fd=%d ofs=" UINT64PF, fd, ofs));
-  DBUG_EXECUTE_IF("row_merge_read_failure", return FALSE;);
-
-  IORequest request;
-
-  /* Merge sort pages are never compressed. */
-  request.disable_compression();
-
-  err = os_file_read_no_error_handling_int_fd(request, nullptr, fd, buf, ofs,
-                                              srv_sort_buf_size, nullptr);
-
-#ifdef POSIX_FADV_DONTNEED
-  /* Each block is read exactly once.  Free up the file cache. */
-  posix_fadvise(fd, ofs, srv_sort_buf_size, POSIX_FADV_DONTNEED);
-#endif /* POSIX_FADV_DONTNEED */
-
-  if (err != DB_SUCCESS) {
-    ib::error(ER_IB_MSG_965) << "Failed to read merge block at " << ofs;
-  }
-
-  return err == DB_SUCCESS;
-}
-
-/** Write a merge block to the file system.
- @return true if request was successful, false if fail */
-ibool row_merge_write(int fd,          /*!< in: file descriptor */
-                      ulint offset,    /*!< in: offset where to write,
-                                       in number of row_merge_block_t elements */
-                      const void *buf) /*!< in: data */
-{
-  size_t buf_len = srv_sort_buf_size;
-  os_offset_t ofs = buf_len * (os_offset_t)offset;
-  dberr_t err;
-
-  DBUG_TRACE;
-  DBUG_PRINT("ib_merge_sort", ("fd=%d ofs=" UINT64PF, fd, ofs));
-  DBUG_EXECUTE_IF("row_merge_write_failure", return FALSE;);
-
-  IORequest request(IORequest::WRITE);
-
-  request.disable_compression();
-
-  err = os_file_write_int_fd(request, "(merge)", fd, buf, ofs, buf_len);
-
-#ifdef POSIX_FADV_DONTNEED
-  /* The block will be needed on the next merge pass,
-  but it can be evicted from the file cache meanwhile. */
-  posix_fadvise(fd, ofs, buf_len, POSIX_FADV_DONTNEED);
-#endif /* POSIX_FADV_DONTNEED */
-
-  return err == DB_SUCCESS;
-}
-
-/** Read a merge record.
- @return pointer to next record, or NULL on I/O error or end of list */
-const byte *row_merge_read_rec(
-    row_merge_block_t *block,  /*!< in/out: file buffer */
-    mrec_buf_t *buf,           /*!< in/out: secondary buffer */
-    const byte *b,             /*!< in: pointer to record */
-    const dict_index_t *index, /*!< in: index of the record */
-    int fd,                    /*!< in: file descriptor */
-    ulint *foffs,              /*!< in/out: file offset */
-    const mrec_t **mrec,       /*!< out: pointer to merge record,
-                               or NULL on end of list
-                               (non-NULL on I/O error) */
-    ulint *offsets)            /*!< out: offsets of mrec */
-{
-  ulint extra_size;
-  ulint data_size;
-  ulint avail_size;
-
-  ut_ad(block);
-  ut_ad(buf);
-  ut_ad(b >= &block[0]);
-  ut_ad(b < &block[srv_sort_buf_size]);
-  ut_ad(index);
-  ut_ad(foffs);
-  ut_ad(mrec);
-  ut_ad(offsets);
-
-  ut_ad(*offsets == 1 + REC_OFFS_HEADER_SIZE + dict_index_get_n_fields(index));
-
-  DBUG_TRACE;
-
-  extra_size = *b++;
-
-  if (UNIV_UNLIKELY(!extra_size)) {
-    /* End of list */
-    *mrec = nullptr;
-    DBUG_PRINT("ib_merge_sort",
-               ("read %p,%p,%d,%lu EOF\n", reinterpret_cast<const void *>(b),
-                reinterpret_cast<const void *>(block), fd, ulong(*foffs)));
-    return nullptr;
-  }
-
-  if (extra_size >= 0x80) {
-    /* Read another byte of extra_size. */
-
-    if (UNIV_UNLIKELY(b >= &block[srv_sort_buf_size])) {
-      if (!row_merge_read(fd, ++(*foffs), block)) {
-      err_exit:
-        /* Signal I/O error. */
-        *mrec = b;
-        return nullptr;
-      }
-
-      /* Wrap around to the beginning of the buffer. */
-      b = &block[0];
-    }
-
-    extra_size = (extra_size & 0x7f) << 8;
-    extra_size |= *b++;
-  }
-
-  /* Normalize extra_size.  Above, value 0 signals "end of list". */
-  extra_size--;
-
-  /* Read the extra bytes. */
-
-  if (UNIV_UNLIKELY(b + extra_size >= &block[srv_sort_buf_size])) {
-    /* The record spans two blocks.  Copy the entire record
-    to the auxiliary buffer and handle this as a special
-    case. */
-
-    avail_size = &block[srv_sort_buf_size] - b;
-    ut_ad(avail_size < sizeof *buf);
-    memcpy(*buf, b, avail_size);
-
-    if (!row_merge_read(fd, ++(*foffs), block)) {
-      goto err_exit;
-    }
-
-    /* Wrap around to the beginning of the buffer. */
-    b = &block[0];
-
-    /* Copy the record. */
-    memcpy(*buf + avail_size, b, extra_size - avail_size);
-    b += extra_size - avail_size;
-
-    *mrec = *buf + extra_size;
-
-    rec_init_offsets_temp(*mrec, index, offsets);
-
-    data_size = rec_offs_data_size(offsets);
-
-    /* These overflows should be impossible given that
-    records are much smaller than either buffer, and
-    the record starts near the beginning of each buffer. */
-    ut_a(extra_size + data_size < sizeof *buf);
-    ut_a(b + data_size < &block[srv_sort_buf_size]);
-
-    /* Copy the data bytes. */
-    memcpy(*buf + extra_size, b, data_size);
-    b += data_size;
-
-    goto func_exit;
-  }
-
-  *mrec = b + extra_size;
-
-  rec_init_offsets_temp(*mrec, index, offsets);
-
-  data_size = rec_offs_data_size(offsets);
-  ut_ad(extra_size + data_size < sizeof *buf);
-
-  b += extra_size + data_size;
-
-  if (UNIV_LIKELY(b < &block[srv_sort_buf_size])) {
-    /* The record fits entirely in the block.
-    This is the normal case. */
-    goto func_exit;
-  }
-
-  /* The record spans two blocks.  Copy it to buf. */
-
-  b -= extra_size + data_size;
-  avail_size = &block[srv_sort_buf_size] - b;
-  memcpy(*buf, b, avail_size);
-  *mrec = *buf + extra_size;
-
-  /* We cannot invoke rec_offs_make_valid() here, because there
-  are no REC_N_NEW_EXTRA_BYTES between extra_size and data_size.
-  Similarly, rec_offs_validate() would fail, because it invokes
-  rec_get_status(). */
-  ut_d(offsets[2] = (ulint)*mrec);
-  ut_d(offsets[3] = (ulint)index);
-
-  if (!row_merge_read(fd, ++(*foffs), block)) {
-    goto err_exit;
-  }
-
-  /* Wrap around to the beginning of the buffer. */
-  b = &block[0];
-
-  /* Copy the rest of the record. */
-  memcpy(*buf + avail_size, b, extra_size + data_size - avail_size);
-  b += extra_size + data_size - avail_size;
-
-func_exit:
-  DBUG_PRINT("ib_merge_sort",
-             ("%p,%p,fd=%d,%lu: %s", reinterpret_cast<const void *>(b),
-              reinterpret_cast<const void *>(block), fd, ulong(*foffs),
-              rec_printer(*mrec, 0, offsets).str().c_str()));
-  return b;
-}
-
-/** Write a merge record. */
-static void row_merge_write_rec_low(
-    byte *b, /*!< out: buffer */
-    ulint e, /*!< in: encoded extra_size */
-#ifdef UNIV_DEBUG
-    ulint size,           /*!< in: total size to write */
-    int fd,               /*!< in: file descriptor */
-    ulint foffs,          /*!< in: file offset */
-#endif                    /* UNIV_DEBUG */
-    const mrec_t *mrec,   /*!< in: record to write */
-    const ulint *offsets) /*!< in: offsets of mrec */
-#ifndef UNIV_DEBUG
-#define row_merge_write_rec_low(b, e, size, fd, foffs, mrec, offsets) \
-  row_merge_write_rec_low(b, e, mrec, offsets)
-#endif /* !UNIV_DEBUG */
-{
-  DBUG_TRACE;
-
-#ifdef UNIV_DEBUG
-  const byte *const end = b + size;
-#endif /* UNIV_DEBUG */
-  assert(e == rec_offs_extra_size(offsets) + 1);
-  DBUG_PRINT("ib_merge_sort",
-             ("%p,fd=%d,%lu: %s", reinterpret_cast<const void *>(b), fd,
-              ulong(foffs), rec_printer(mrec, 0, offsets).str().c_str()));
-
-  if (e < 0x80) {
-    *b++ = (byte)e;
-  } else {
-    *b++ = (byte)(0x80 | (e >> 8));
-    *b++ = (byte)e;
-  }
-
-  memcpy(b, mrec - rec_offs_extra_size(offsets), rec_offs_size(offsets));
-  assert(b + rec_offs_size(offsets) == end);
-}
-
-/** Write a merge record.
- @return pointer to end of block, or NULL on error */
-static byte *row_merge_write_rec(
-    row_merge_block_t *block, /*!< in/out: file buffer */
-    mrec_buf_t *buf,          /*!< in/out: secondary buffer */
-    byte *b,                  /*!< in: pointer to end of block */
-    int fd,                   /*!< in: file descriptor */
-    ulint *foffs,             /*!< in/out: file offset */
-    const mrec_t *mrec,       /*!< in: record to write */
-    const ulint *offsets)     /*!< in: offsets of mrec */
-{
-  ulint extra_size;
-  ulint size;
-  ulint avail_size;
-
-  ut_ad(block);
-  ut_ad(buf);
-  ut_ad(b >= &block[0]);
-  ut_ad(b < &block[srv_sort_buf_size]);
-  ut_ad(mrec);
-  ut_ad(foffs);
-  ut_ad(mrec < &block[0] || mrec > &block[srv_sort_buf_size]);
-  ut_ad(mrec < buf[0] || mrec > buf[1]);
-
-  /* Normalize extra_size.  Value 0 signals "end of list". */
-  extra_size = rec_offs_extra_size(offsets) + 1;
-
-  size = extra_size + (extra_size >= 0x80) + rec_offs_data_size(offsets);
-
-  if (UNIV_UNLIKELY(b + size >= &block[srv_sort_buf_size])) {
-    /* The record spans two blocks.
-    Copy it to the temporary buffer first. */
-    avail_size = &block[srv_sort_buf_size] - b;
-
-    row_merge_write_rec_low(buf[0], extra_size, size, fd, *foffs, mrec,
-                            offsets);
-
-    /* Copy the head of the temporary buffer, write
-    the completed block, and copy the tail of the
-    record to the head of the new block. */
-    memcpy(b, buf[0], avail_size);
-
-    if (!row_merge_write(fd, (*foffs)++, block)) {
-      return (nullptr);
-    }
-
-    UNIV_MEM_INVALID(&block[0], srv_sort_buf_size);
-
-    /* Copy the rest. */
-    b = &block[0];
-    memcpy(b, buf[0] + avail_size, size - avail_size);
-    b += size - avail_size;
-  } else {
-    row_merge_write_rec_low(b, extra_size, size, fd, *foffs, mrec, offsets);
-    b += size;
-  }
-
-  return (b);
-}
-
-/** Write an end-of-list marker.
- @return pointer to end of block, or NULL on error */
-static byte *row_merge_write_eof(
-    row_merge_block_t *block, /*!< in/out: file buffer */
-    byte *b,                  /*!< in: pointer to end of block */
-    int fd,                   /*!< in: file descriptor */
-    ulint *foffs)             /*!< in/out: file offset */
-{
-  ut_ad(block);
-  ut_ad(b >= &block[0]);
-  ut_ad(b < &block[srv_sort_buf_size]);
-  ut_ad(foffs);
-
-  DBUG_TRACE;
-  DBUG_PRINT("ib_merge_sort",
-             ("%p,%p,fd=%d,%lu", reinterpret_cast<const void *>(b),
-              reinterpret_cast<const void *>(block), fd, ulong(*foffs)));
-
-  *b++ = 0;
-  UNIV_MEM_ASSERT_RW(&block[0], b - &block[0]);
-  UNIV_MEM_ASSERT_W(&block[0], srv_sort_buf_size);
-#ifdef UNIV_DEBUG_VALGRIND
-  /* The rest of the block is uninitialized.  Initialize it
-  to avoid bogus warnings. */
-  memset(b, 0xff, &block[srv_sort_buf_size] - b);
-#endif /* UNIV_DEBUG_VALGRIND */
-
-  if (!row_merge_write(fd, (*foffs)++, block)) {
-    return nullptr;
-  }
-
-  UNIV_MEM_INVALID(&block[0], srv_sort_buf_size);
-  return &block[0];
-}
-
-/** Create a temporary file if it has not been created already.
-@param[in,out]	tmpfd	temporary file handle
-@param[in]	path	location for creating temporary file
-@return file descriptor, or -1 on failure */
-static MY_ATTRIBUTE((warn_unused_result)) int row_merge_tmpfile_if_needed(
-    int *tmpfd, const char *path) {
-  if (*tmpfd < 0) {
-    *tmpfd = row_merge_file_create_low(path);
-    if (*tmpfd >= 0) {
-      MONITOR_ATOMIC_INC(MONITOR_ALTER_TABLE_SORT_FILES);
-    }
-  }
-
-  return (*tmpfd);
-}
-
-/** Create a temporary file for merge sort if it was not created already.
-@param[in,out]	file	merge file structure
-@param[in]	tmpfd	temporary file handle
-@param[in]	nrec	number of records in the file
-@param[in]	path	location for creating temporary file
-@return file descriptor, or -1 on failure */
-static MY_ATTRIBUTE((warn_unused_result)) int row_merge_file_create_if_needed(
-    merge_file_t *file, int *tmpfd, ulint nrec, const char *path) {
-  ut_ad(file->fd < 0 || *tmpfd >= 0);
-  if (file->fd < 0 && row_merge_file_create(file, path) >= 0) {
-    MONITOR_ATOMIC_INC(MONITOR_ALTER_TABLE_SORT_FILES);
-    if (row_merge_tmpfile_if_needed(tmpfd, path) < 0) {
-      return (-1);
-    }
-
-    file->n_rec = nrec;
-  }
-
-  ut_ad(file->fd < 0 || *tmpfd >= 0);
-  return (file->fd);
-}
-
-/** Copy the merge data tuple from another merge data tuple.
-@param[in]	mtuple		source merge data tuple
-@param[in,out]	prev_mtuple	destination merge data tuple
-@param[in]	n_unique	number of unique fields exist in the mtuple
-@param[in,out]	heap		memory heap where last_mtuple allocated */
-static void row_mtuple_create(const mtuple_t *mtuple, mtuple_t *prev_mtuple,
-                              ulint n_unique, mem_heap_t *heap) {
-  memcpy(prev_mtuple->fields, mtuple->fields,
-         n_unique * sizeof *mtuple->fields);
-
-  dfield_t *field = prev_mtuple->fields;
-
-  for (ulint i = 0; i < n_unique; i++) {
-    dfield_dup(field++, heap);
-  }
-}
-
-/** Compare two merge data tuples.
-@param[in]	prev_mtuple	merge data tuple
-@param[in]	current_mtuple	merge data tuple
-@param[in,out]	dup		reporter of duplicates
-@retval positive, 0, negative if current_mtuple is greater, equal, less, than
-last_mtuple. */
-static int row_mtuple_cmp(const mtuple_t *prev_mtuple,
-                          const mtuple_t *current_mtuple,
-                          row_merge_dup_t *dup) {
-  ut_ad(dup->index->is_clustered());
-  const ulint n_unique = dict_index_get_n_unique(dup->index);
-
-  return (row_merge_tuple_cmp(dup->index, n_unique, n_unique, *current_mtuple,
-                              *prev_mtuple, dup));
-}
-
-/** Insert cached spatial index rows.
-@param[in]	trx_id		Transaction id
-@param[in]	sp_tuples	Cached spatial rows
-@param[in]	num_spatial	Number of spatial indexes
-@param[in,out]	row_heap	Heap for insert
-@param[in,out]	sp_heap		Heap for tuples
-@param[in,out]	pcur		Cluster index cursor
-@param[in,out]	mtr		Mini-transaction
-@param[in,out]	mtr_committed	Whether scan_mtr got committed
-@return DB_SUCCESS or error number */
-static dberr_t row_merge_spatial_rows(trx_id_t trx_id,
-                                      index_tuple_info_t **sp_tuples,
-                                      ulint num_spatial, mem_heap_t *row_heap,
-                                      mem_heap_t *sp_heap, btr_pcur_t *pcur,
-                                      mtr_t *mtr, bool *mtr_committed) {
-  dberr_t err = DB_SUCCESS;
-
-  if (sp_tuples == nullptr) {
-    return (DB_SUCCESS);
-  }
-
-  ut_ad(sp_heap != nullptr);
-
-  for (ulint j = 0; j < num_spatial; j++) {
-    sp_tuples[j]->iter_init();
-  }
-
-  for (ulint j = 0; j < num_spatial; j++) {
-    err = sp_tuples[j]->insert(trx_id, row_heap, pcur, mtr, mtr_committed);
-
-    if (err == DB_CACHE_RECORDS) {
-      ut_ad(*mtr_committed == false);
-
-      /* Since the data of the tuple pk fields are pointers of cluster rows,
-         after mtr committed, these pointers could point to invalid data.
-         Hence, copy all these data from cluster rows.  */
-      for (ulint x = j; x < num_spatial; x++) {
-        sp_tuples[x]->cache_tuples();
-      }
-
-      btr_pcur_move_to_prev_on_page(pcur);
-      btr_pcur_store_position(pcur, mtr);
-      mtr_commit(mtr); /* committing the scan mtr */
-      *mtr_committed = true;
-      err = sp_tuples[j]->insert(trx_id, row_heap, pcur, mtr, mtr_committed);
-    }
-
-    if (err != DB_SUCCESS) {
-      ut_ad(err != DB_CACHE_RECORDS);
-      return (err);
-    }
-  }
-
-  mem_heap_empty(sp_heap);
-
-  return (err);
-}
-
-/** Check if the geometry field is valid.
-@param[in]	row		the row
-@param[in]	index		spatial index
-@return true if it's valid, false if it's invalid. */
-static bool row_geo_field_is_valid(const dtuple_t *row, dict_index_t *index) {
-  const dict_field_t *ind_field = index->get_field(0);
-  const dict_col_t *col = ind_field->col;
-  ulint col_no = dict_col_get_no(col);
-  const dfield_t *dfield = dtuple_get_nth_field(row, col_no);
-
-  if (dfield_is_null(dfield) || dfield_get_len(dfield) < GEO_DATA_HEADER_SIZE) {
-    return (false);
-  }
-
-  return (true);
-}
-
-/** Reads clustered index of the table and create temporary files
-containing the index entries for the indexes to be built.
-@param[in]	trx		transaction
-@param[in,out]	table		MySQL table object, for reporting erroneous
-records
-@param[in]	old_table	table where rows are read from
-@param[in]	new_table	table where indexes are created; identical to
-old_table unless creating a PRIMARY KEY
-@param[in]	online		true if creating indexes online
-@param[in]	index		indexes to be created
-@param[in]	fts_sort_idx	full-text index to be created, or NULL
-@param[in]	psort_info	parallel sort info for fts_sort_idx creation,
-or NULL
-@param[in]	files		temporary files
-@param[in]	key_numbers	MySQL key numbers to create
-@param[in]	n_index		number of indexes to create
-@param[in]	add_cols	default values of added columns, or NULL
-@param[in]	add_v		newly added virtual columns along with indexes
-@param[in]	col_map		mapping of old column numbers to new ones, or
-NULL if old_table == new_table
-@param[in]	add_autoinc	number of added AUTO_INCREMENT columns, or
-ULINT_UNDEFINED if none is added
-@param[in,out]	sequence	autoinc sequence
-@param[in,out]	block		file buffer
-@param[in]	skip_pk_sort	whether the new PRIMARY KEY will follow
-existing order
-@param[in,out]	tmpfd		temporary file handle
-@param[in,out]	stage		performance schema accounting object, used by
-ALTER TABLE. stage->n_pk_recs_inc() will be called for each record read and
-stage->inc() will be called for each page read.
-@param[in]	eval_table	mysql table used to evaluate virtual column
-                                value, see innobase_get_computed_value().
-@return DB_SUCCESS or error */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_merge_read_clustered_index(
-        trx_t *trx, struct TABLE *table, const dict_table_t *old_table,
-        dict_table_t *new_table, bool online, dict_index_t **index,
-        dict_index_t *fts_sort_idx, fts_psort_t *psort_info,
-        merge_file_t *files, const ulint *key_numbers, ulint n_index,
-        const dtuple_t *add_cols, const dict_add_v_col_t *add_v,
-        const ulint *col_map, ulint add_autoinc, ib_sequence_t &sequence,
-        row_merge_block_t *block, bool skip_pk_sort, int *tmpfd,
-        ut_stage_alter_t *stage, struct TABLE *eval_table) {
-  dict_index_t *clust_index;         /* Clustered index */
-  mem_heap_t *row_heap;              /* Heap memory to create
-                                     clustered index tuples */
-  row_merge_buf_t **merge_buf;       /* Temporary list for records*/
-  mem_heap_t *v_heap = nullptr;      /* Heap memory to process large
-                                  data for virtual column */
-  btr_pcur_t pcur;                   /* Cursor on the clustered
-                                     index */
-  mtr_t mtr;                         /* Mini-transaction */
-  dberr_t err = DB_SUCCESS;          /* Return code */
-  ulint n_nonnull = 0;               /* number of columns
-                                     changed to NOT NULL */
-  ulint *nonnull = nullptr;          /* NOT NULL columns */
-  dict_index_t *fts_index = nullptr; /* FTS index */
-  doc_id_t doc_id = 0;
-  doc_id_t max_doc_id = 0;
-  ibool add_doc_id = FALSE;
-  os_event_t fts_parallel_sort_event = nullptr;
-  ibool fts_pll_sort = FALSE;
-  int64_t sig_count = 0;
-  index_tuple_info_t **sp_tuples = nullptr;
-  mem_heap_t *sp_heap = nullptr;
-  ulint num_spatial = 0;
-  BtrBulk *clust_btr_bulk = nullptr;
-  bool clust_temp_file = false;
-  mem_heap_t *mtuple_heap = nullptr;
-  mtuple_t prev_mtuple;
-  mem_heap_t *conv_heap = nullptr;
-  FlushObserver *observer = trx->flush_observer;
-  DBUG_TRACE;
-
-  ut_ad((old_table == new_table) == !col_map);
-  ut_ad(!add_cols || col_map);
-
-  trx->op_info = "reading clustered index";
-
-#ifdef FTS_INTERNAL_DIAG_PRINT
-  DEBUG_FTS_SORT_PRINT("FTS_SORT: Start Create Index\n");
-#endif
-
-  /* Create and initialize memory for record buffers */
-
-  merge_buf = static_cast<row_merge_buf_t **>(
-      ut_malloc_nokey(n_index * sizeof *merge_buf));
-
-  row_merge_dup_t clust_dup = {index[0], table, col_map, 0};
-  dfield_t *prev_fields;
-  const ulint n_uniq = dict_index_get_n_unique(index[0]);
-
-  ut_ad(trx->mysql_thd != nullptr);
-
-  const char *path = thd_innodb_tmpdir(trx->mysql_thd);
-
-  ut_ad(!skip_pk_sort || index[0]->is_clustered());
-  /* There is no previous tuple yet. */
-  prev_mtuple.fields = nullptr;
-
-  for (ulint i = 0; i < n_index; i++) {
-    if (index[i]->type & DICT_FTS) {
-      /* We are building a FT index, make sure
-      we have the temporary 'fts_sort_idx' */
-      ut_a(fts_sort_idx);
-
-      fts_index = index[i];
-
-      merge_buf[i] = row_merge_buf_create(fts_sort_idx);
-
-      add_doc_id = DICT_TF2_FLAG_IS_SET(new_table, DICT_TF2_FTS_ADD_DOC_ID);
-
-      /* If Doc ID does not exist in the table itself,
-      fetch the first FTS Doc ID */
-      if (add_doc_id) {
-        fts_get_next_doc_id((dict_table_t *)new_table, &doc_id);
-        ut_ad(doc_id > 0);
-      }
-
-      fts_pll_sort = TRUE;
-      row_fts_start_psort(psort_info);
-      fts_parallel_sort_event = psort_info[0].psort_common->sort_event;
-    } else {
-      if (dict_index_is_spatial(index[i])) {
-        num_spatial++;
-      }
-
-      merge_buf[i] = row_merge_buf_create(index[i]);
-    }
-  }
-
-  if (num_spatial > 0) {
-    ulint count = 0;
-
-    sp_heap = mem_heap_create(512);
-
-    sp_tuples = static_cast<index_tuple_info_t **>(
-        ut_malloc_nokey(num_spatial * sizeof(*sp_tuples)));
-
-    for (ulint i = 0; i < n_index; i++) {
-      if (dict_index_is_spatial(index[i])) {
-        sp_tuples[count] = UT_NEW_NOKEY(index_tuple_info_t(sp_heap, index[i]));
-        count++;
-      }
-    }
-
-    ut_ad(count == num_spatial);
-  }
-
-  mtr_start(&mtr);
-
-  /* Find the clustered index and create a persistent cursor
-  based on that. */
-
-  clust_index = const_cast<dict_table_t *>(old_table)->first_index();
-
-  btr_pcur_open_at_index_side(true, clust_index, BTR_SEARCH_LEAF, &pcur, true,
-                              0, &mtr);
-
-  if (old_table != new_table) {
-    /* The table is being rebuilt.  Identify the columns
-    that were flagged NOT NULL in the new table, so that
-    we can quickly check that the records in the old table
-    do not violate the added NOT NULL constraints. */
-
-    nonnull = static_cast<ulint *>(
-        ut_malloc_nokey(new_table->get_n_cols() * sizeof *nonnull));
-
-    for (ulint i = 0; i < old_table->get_n_cols(); i++) {
-      if (old_table->get_col(i)->prtype & DATA_NOT_NULL) {
-        continue;
-      }
-
-      const ulint j = col_map[i];
-
-      if (j == ULINT_UNDEFINED) {
-        /* The column was dropped. */
-        continue;
-      }
-
-      if (new_table->get_col(j)->prtype & DATA_NOT_NULL) {
-        nonnull[n_nonnull++] = j;
-      }
-    }
-
-    if (!n_nonnull) {
-      ut_free(nonnull);
-      nonnull = nullptr;
-    }
-  }
-
-  row_heap = mem_heap_create(sizeof(mrec_buf_t));
-
-  if (dict_table_is_comp(old_table) && !dict_table_is_comp(new_table)) {
-    conv_heap = mem_heap_create(sizeof(mrec_buf_t));
-  }
-
-  if (skip_pk_sort) {
-    prev_fields =
-        static_cast<dfield_t *>(ut_malloc_nokey(n_uniq * sizeof *prev_fields));
-    mtuple_heap = mem_heap_create(sizeof(mrec_buf_t));
-  } else {
-    prev_fields = nullptr;
-  }
-
-  /* Scan the clustered index. */
-  for (;;) {
-    const rec_t *rec;
-    ulint *offsets;
-    const dtuple_t *row;
-    row_ext_t *ext = nullptr;
-    page_cur_t *cur = btr_pcur_get_page_cur(&pcur);
-
-    mem_heap_empty(row_heap);
-
-    page_cur_move_to_next(cur);
-
-    stage->n_pk_recs_inc();
-
-    if (page_cur_is_after_last(cur)) {
-      stage->inc();
-
-      if (UNIV_UNLIKELY(trx_is_interrupted(trx))) {
-        err = DB_INTERRUPTED;
-        trx->error_key_num = 0;
-        goto func_exit;
-      }
-
-      if (online && old_table != new_table) {
-        err = row_log_table_get_error(clust_index);
-        if (err != DB_SUCCESS) {
-          trx->error_key_num = 0;
-          goto func_exit;
-        }
-      }
-
-#ifndef UNIV_DEBUG
-#define dbug_run_purge false
-#else  /* UNIV_DEBUG */
-      bool dbug_run_purge = false;
-#endif /* UNIV_DEBUG */
-      DBUG_EXECUTE_IF("ib_purge_on_create_index_page_switch",
-                      dbug_run_purge = true;);
-
-      /* Insert the cached spatial index rows. */
-      bool mtr_committed = false;
-
-      err = row_merge_spatial_rows(trx->id, sp_tuples, num_spatial, row_heap,
-                                   sp_heap, &pcur, &mtr, &mtr_committed);
-
-      if (err != DB_SUCCESS) {
-        goto func_exit;
-      }
-
-      if (mtr_committed) {
-        goto scan_next;
-      }
-
-      if (dbug_run_purge ||
-          rw_lock_get_waiters(dict_index_get_lock(clust_index))) {
-        /* There are waiters on the clustered
-        index tree lock, likely the purge
-        thread. Store and restore the cursor
-        position, and yield so that scanning a
-        large table will not starve other
-        threads. */
-
-        /* Store the cursor position on the last user
-        record on the page. */
-        btr_pcur_move_to_prev_on_page(&pcur);
-        /* Leaf pages must never be empty, unless
-        this is the only page in the index tree. */
-        ut_ad(btr_pcur_is_on_user_rec(&pcur) ||
-              btr_pcur_get_block(&pcur)->page.id.page_no() ==
-                  clust_index->page);
-
-        btr_pcur_store_position(&pcur, &mtr);
-        mtr_commit(&mtr);
-
-        if (dbug_run_purge) {
-          /* This is for testing
-          purposes only (see
-          DBUG_EXECUTE_IF above).  We
-          signal the purge thread and
-          hope that the purge batch will
-          complete before we execute
-          btr_pcur_restore_position(). */
-          trx_purge_run();
-          std::this_thread::sleep_for(std::chrono::seconds(1));
-        }
-
-        /* Give the waiters a chance to proceed. */
-        std::this_thread::yield();
-      scan_next:
-        mtr_start(&mtr);
-        /* Restore position on the record, or its
-        predecessor if the record was purged
-        meanwhile. */
-        btr_pcur_restore_position(BTR_SEARCH_LEAF, &pcur, &mtr);
-        /* Move to the successor of the
-        original record. */
-        if (!btr_pcur_move_to_next_user_rec(&pcur, &mtr)) {
-        end_of_index:
-          row = nullptr;
-          mtr_commit(&mtr);
-          mem_heap_free(row_heap);
-          ut_free(nonnull);
-          goto write_buffers;
-        }
-      } else {
-        page_no_t next_page_no;
-        buf_block_t *block;
-
-        next_page_no = btr_page_get_next(page_cur_get_page(cur), &mtr);
-
-        if (next_page_no == FIL_NULL) {
-          goto end_of_index;
-        }
-
-        block = page_cur_get_block(cur);
-        block =
-            btr_block_get(page_id_t(block->page.id.space(), next_page_no),
-                          block->page.size, BTR_SEARCH_LEAF, clust_index, &mtr);
-
-        btr_leaf_page_release(page_cur_get_block(cur), BTR_SEARCH_LEAF, &mtr);
-        page_cur_set_before_first(block, cur);
-        page_cur_move_to_next(cur);
-
-        ut_ad(!page_cur_is_after_last(cur));
-      }
-    }
-
-    rec = page_cur_get_rec(cur);
-
-    offsets =
-        rec_get_offsets(rec, clust_index, nullptr, ULINT_UNDEFINED, &row_heap);
-
-    if (online) {
-      /* Perform a REPEATABLE READ.
-
-      When rebuilding the table online,
-      row_log_table_apply() must not see a newer
-      state of the table when applying the log.
-      This is mainly to prevent false duplicate key
-      errors, because the log will identify records
-      by the PRIMARY KEY, and also to prevent unsafe
-      BLOB access.
-
-      When creating a secondary index online, this
-      table scan must not see records that have only
-      been inserted to the clustered index, but have
-      not been written to the online_log of
-      index[]. If we performed READ UNCOMMITTED, it
-      could happen that the ADD INDEX reaches
-      ONLINE_INDEX_COMPLETE state between the time
-      the DML thread has updated the clustered index
-      but has not yet accessed secondary index. */
-      ut_ad(MVCC::is_view_active(trx->read_view));
-
-      if (!trx->read_view->changes_visible(
-              row_get_rec_trx_id(rec, clust_index, offsets), old_table->name)) {
-        rec_t *old_vers;
-
-        row_vers_build_for_consistent_read(rec, &mtr, clust_index, &offsets,
-                                           trx->read_view, &row_heap, row_heap,
-                                           &old_vers, nullptr, nullptr);
-
-        rec = old_vers;
-
-        if (!rec) {
-          continue;
-        }
-      }
-
-      if (rec_get_deleted_flag(rec, dict_table_is_comp(old_table))) {
-        /* This record was deleted in the latest
-        committed version, or it was deleted and
-        then reinserted-by-update before purge
-        kicked in. Skip it. */
-        continue;
-      }
-
-      ut_ad(!rec_offs_any_null_extern(rec, offsets));
-    } else if (rec_get_deleted_flag(rec, dict_table_is_comp(old_table))) {
-      /* Skip delete-marked records.
-
-      Skipping delete-marked records will make the
-      created indexes unuseable for transactions
-      whose read views were created before the index
-      creation completed, but preserving the history
-      would make it tricky to detect duplicate
-      keys. */
-      continue;
-    }
-
-    /* When !online, we are holding a lock on old_table, preventing
-    any inserts that could have written a record 'stub' before
-    writing out off-page columns. */
-    ut_ad(!rec_offs_any_null_extern(rec, offsets));
-
-    /* Build a row based on the clustered index. */
-
-    row = row_build_w_add_vcol(ROW_COPY_POINTERS, clust_index, rec, offsets,
-                               new_table, add_cols, add_v, col_map, &ext,
-                               row_heap);
-    ut_ad(row);
-
-    for (ulint i = 0; i < n_nonnull; i++) {
-      const dfield_t *field = &row->fields[nonnull[i]];
-
-      ut_ad(dfield_get_type(field)->prtype & DATA_NOT_NULL);
-
-      if (dfield_is_null(field)) {
-        err = DB_INVALID_NULL;
-        trx->error_key_num = 0;
-        goto func_exit;
-      }
-    }
-
-    /* Get the next Doc ID */
-    if (add_doc_id) {
-      doc_id++;
-    } else {
-      doc_id = 0;
-    }
-
-    if (add_autoinc != ULINT_UNDEFINED) {
-      ut_ad(add_autoinc < new_table->get_n_user_cols());
-
-      const dfield_t *dfield;
-
-      dfield = dtuple_get_nth_field(row, add_autoinc);
-      if (dfield_is_null(dfield)) {
-        goto write_buffers;
-      }
-
-      const dtype_t *dtype = dfield_get_type(dfield);
-      byte *b = static_cast<byte *>(dfield_get_data(dfield));
-
-      if (sequence.eof()) {
-        err = DB_ERROR;
-        trx->error_key_num = 0;
-
-        ib_senderrf(trx->mysql_thd, IB_LOG_LEVEL_ERROR, ER_AUTOINC_READ_FAILED);
-
-        goto func_exit;
-      }
-
-      ulonglong value = sequence++;
-
-      switch (dtype_get_mtype(dtype)) {
-        case DATA_INT: {
-          ibool usign;
-          ulint len = dfield_get_len(dfield);
-
-          usign = dtype_get_prtype(dtype) & DATA_UNSIGNED;
-          mach_write_ulonglong(b, value, len, usign);
-
-          break;
-        }
-
-        case DATA_FLOAT:
-          mach_float_write(b, static_cast<float>(value));
-          break;
-
-        case DATA_DOUBLE:
-          mach_double_write(b, static_cast<double>(value));
-          break;
-
-        default:
-          ut_ad(0);
-      }
-    }
-
-  write_buffers:
-    /* Build all entries for all the indexes to be created
-    in a single scan of the clustered index. */
-
-    ulint s_idx_cnt = 0;
-    bool skip_sort = skip_pk_sort && merge_buf[0]->index->is_clustered();
-
-    for (ulint i = 0; i < n_index; i++, skip_sort = false) {
-      row_merge_buf_t *buf = merge_buf[i];
-      merge_file_t *file = &files[i];
-      ulint rows_added = 0;
-      ulint multi_val_added = 0;
-
-      if (dict_index_is_spatial(buf->index)) {
-        if (!row) {
-          continue;
-        }
-
-        ut_ad(sp_tuples[s_idx_cnt]->get_index() == buf->index);
-
-        /* If the geometry field is invalid, report
-        error. */
-        if (!row_geo_field_is_valid(row, buf->index)) {
-          err = DB_CANT_CREATE_GEOMETRY_OBJECT;
-          break;
-        }
-
-        sp_tuples[s_idx_cnt]->add(row, ext);
-        s_idx_cnt++;
-
-        continue;
-      }
-
-      if (UNIV_LIKELY(row &&
-                      (rows_added = row_merge_buf_add(
-                           buf, fts_index, old_table, new_table, psort_info,
-                           row, ext, &doc_id, conv_heap, &err, &v_heap,
-                           eval_table, trx, &multi_val_added)) &&
-                      multi_val_added == 0)) {
-        if (rows_added == UNIV_NO_INDEX_VALUE) {
-          /* Nothing to be indexed from current row, skip this index */
-          ut_ad(buf->index->is_multi_value());
-          continue;
-        }
-
-        /* If we are creating FTS index,
-        a single row can generate more
-        records for tokenized word */
-        file->n_rec += rows_added;
-
-        if (err != DB_SUCCESS) {
-          ut_ad(err == DB_TOO_BIG_RECORD || err == DB_COMPUTE_VALUE_FAILED);
-          break;
-        }
-
-        if (doc_id > max_doc_id) {
-          max_doc_id = doc_id;
-        }
-
-        if (buf->index->type & DICT_FTS) {
-          /* Check if error occurs in child thread */
-          for (ulint j = 0; j < fts_sort_pll_degree; j++) {
-            if (psort_info[j].error != DB_SUCCESS) {
-              err = psort_info[j].error;
-              trx->error_key_num = i;
-              break;
-            }
-          }
-
-          if (err != DB_SUCCESS) {
-            break;
-          }
-        }
-
-        if (skip_sort) {
-          ut_ad(buf->n_tuples > 0);
-          const mtuple_t *curr = &buf->tuples[buf->n_tuples - 1];
-
-          ut_ad(i == 0);
-          ut_ad(merge_buf[0]->index->is_clustered());
-          /* Detect duplicates by comparing the
-          current record with previous record.
-          When temp file is not used, records
-          should be in sorted order. */
-          if (prev_mtuple.fields != nullptr &&
-              (row_mtuple_cmp(&prev_mtuple, curr, &clust_dup) == 0)) {
-            err = DB_DUPLICATE_KEY;
-            trx->error_key_num = key_numbers[0];
-            goto func_exit;
-          }
-
-          prev_mtuple.fields = curr->fields;
-        }
-
-        continue;
-      }
-
-      if (multi_val_added != 0) {
-        /* This signalizes that a partial row was added to the buffer due to
-        reaching its size limit. We need to increment the file size by this
-        amount */
-        file->n_rec += multi_val_added;
-      }
-
-      if (err == DB_COMPUTE_VALUE_FAILED) {
-        trx->error_key_num = i;
-        goto func_exit;
-      }
-
-      if (buf->index->type & DICT_FTS) {
-        if (!row || !doc_id) {
-          continue;
-        }
-      }
-
-      /* The buffer must be sufficiently large
-      to hold at least one record. It may only
-      be empty when we reach the end of the
-      clustered index. row_merge_buf_add()
-      must not have been called in this loop. */
-      ut_ad(buf->n_tuples || row == nullptr);
-
-      /* We have enough data tuples to form a block.
-      Sort them and write to disk if temp file is used
-      or insert into index if temp file is not used. */
-      ut_ad(old_table == new_table ? !buf->index->is_clustered()
-                                   : (i == 0) == buf->index->is_clustered());
-
-      /* We have enough data tuples to form a block.
-      Sort them (if !skip_sort) and write to disk. */
-    write_buffer_and_retry:
-      if (buf->n_tuples) {
-        if (skip_sort) {
-          /* Temporary File is not used.
-          so insert sorted block to the index */
-          if (row != nullptr) {
-            bool mtr_committed = false;
-
-            /* We have to do insert the
-            cached spatial index rows, since
-            after the mtr_commit, the cluster
-            index page could be updated, then
-            the data in cached rows become
-            invalid. */
-            err = row_merge_spatial_rows(trx->id, sp_tuples, num_spatial,
-                                         row_heap, sp_heap, &pcur, &mtr,
-                                         &mtr_committed);
-
-            if (err != DB_SUCCESS) {
-              goto func_exit;
-            }
-
-            /* We are not at the end of
-            the scan yet. We must
-            mtr_commit() in order to be
-            able to call log_free_check()
-            in row_merge_insert_index_tuples().
-            Due to mtr_commit(), the
-            current row will be invalid, and
-            we must reread it on the next
-            loop iteration. */
-            if (!mtr_committed) {
-              btr_pcur_move_to_prev_on_page(&pcur);
-              btr_pcur_store_position(&pcur, &mtr);
-
-              mtr_commit(&mtr);
-            }
-          }
-
-          mem_heap_empty(mtuple_heap);
-          prev_mtuple.fields = prev_fields;
-
-          row_mtuple_create(&buf->tuples[buf->n_tuples - 1], &prev_mtuple,
-                            n_uniq, mtuple_heap);
-
-          if (clust_btr_bulk == nullptr) {
-            clust_btr_bulk = UT_NEW_NOKEY(BtrBulk(index[i], trx->id, observer));
-
-            err = clust_btr_bulk->init();
-            if (err != DB_SUCCESS) {
-              UT_DELETE(clust_btr_bulk);
-              clust_btr_bulk = nullptr;
-              break;
-            }
-          } else {
-            clust_btr_bulk->latch();
-          }
-
-          err = row_merge_insert_index_tuples(trx, index[i], old_table, -1,
-                                              nullptr, buf, clust_btr_bulk);
-
-          if (row == nullptr) {
-            err = clust_btr_bulk->finish(err);
-            UT_DELETE(clust_btr_bulk);
-            clust_btr_bulk = nullptr;
-          } else {
-            /* Release latches for possible
-            log_free_chck in spatial index
-            build. */
-            clust_btr_bulk->release();
-          }
-
-          if (err != DB_SUCCESS) {
-            break;
-          }
-
-          if (row != nullptr) {
-            /* Restore the cursor on the
-            previous clustered index record,
-            and empty the buffer. The next
-            iteration of the outer loop will
-            advance the cursor and read the
-            next record (the one which we
-            had to ignore due to the buffer
-            overflow). */
-            mtr_start(&mtr);
-            btr_pcur_restore_position(BTR_SEARCH_LEAF, &pcur, &mtr);
-            buf = row_merge_buf_empty(buf);
-            /* Restart the outer loop on the
-            record. We did not insert it
-            into any index yet. */
-            ut_ad(i == 0);
-            break;
-          }
-        } else if (dict_index_is_unique(buf->index)) {
-          row_merge_dup_t dup = {buf->index, table, col_map, 0};
-
-          row_merge_buf_sort(buf, &dup);
-
-          if (dup.n_dup) {
-            err = DB_DUPLICATE_KEY;
-            trx->error_key_num = key_numbers[i];
-            break;
-          }
-        } else {
-          row_merge_buf_sort(buf, nullptr);
-        }
-      } else if (online && new_table == old_table) {
-        /* Note the newest transaction that
-        modified this index when the scan was
-        completed. We prevent older readers
-        from accessing this index, to ensure
-        read consistency. */
-
-        trx_id_t max_trx_id;
-
-        ut_a(row == nullptr);
-        rw_lock_x_lock(dict_index_get_lock(buf->index));
-        ut_a(dict_index_get_online_status(buf->index) == ONLINE_INDEX_CREATION);
-
-        max_trx_id = row_log_get_max_trx(buf->index);
-
-        if (max_trx_id > buf->index->trx_id) {
-          buf->index->trx_id = max_trx_id;
-        }
-
-        rw_lock_x_unlock(dict_index_get_lock(buf->index));
-      }
-
-      /* Secondary index and clustered index which is
-      not in sorted order can use the temporary file.
-      Fulltext index should not use the temporary file. */
-      if (!skip_sort && !(buf->index->type & DICT_FTS)) {
-        /* In case we can have all rows in sort buffer,
-        we can insert directly into the index without
-        temporary file if clustered index does not uses
-        temporary file. */
-        if (row == nullptr && file->fd == -1 && !clust_temp_file) {
-          DBUG_EXECUTE_IF("row_merge_write_failure",
-                          err = DB_TEMP_FILE_WRITE_FAIL;
-                          trx->error_key_num = i; goto all_done;);
-
-          DBUG_EXECUTE_IF("row_merge_tmpfile_fail", err = DB_OUT_OF_MEMORY;
-                          trx->error_key_num = i; goto all_done;);
-
-          BtrBulk btr_bulk(index[i], trx->id, observer);
-          err = btr_bulk.init();
-          if (err == DB_SUCCESS) {
-            err = row_merge_insert_index_tuples(trx, index[i], old_table, -1,
-                                                nullptr, buf, &btr_bulk);
-
-            err = btr_bulk.finish(err);
-          }
-
-          DBUG_EXECUTE_IF("row_merge_insert_big_row", err = DB_TOO_BIG_RECORD;);
-
-          if (err != DB_SUCCESS) {
-            break;
-          }
-        } else {
-          if (row_merge_file_create_if_needed(file, tmpfd, buf->n_tuples,
-                                              path) < 0) {
-            err = DB_OUT_OF_MEMORY;
-            trx->error_key_num = i;
-            goto func_exit;
-          }
-
-          /* Ensure that duplicates in the
-          clustered index will be detected before
-          inserting secondary index records. */
-          if (buf->index->is_clustered()) {
-            clust_temp_file = true;
-          }
-
-          ut_ad(file->n_rec > 0);
-
-          row_merge_buf_write(buf, file, block);
-
-          if (!row_merge_write(file->fd, file->offset++, block)) {
-            err = DB_TEMP_FILE_WRITE_FAIL;
-            trx->error_key_num = i;
-            break;
-          }
-
-          UNIV_MEM_INVALID(&block[0], srv_sort_buf_size);
-        }
-      }
-      merge_buf[i] = row_merge_buf_empty(buf);
-
-      if (UNIV_LIKELY(row != nullptr)) {
-        /* Try writing the record again, now
-        that the buffer has been written out
-        and emptied. */
-
-        if (UNIV_UNLIKELY(!(rows_added = row_merge_buf_add(
-                                buf, fts_index, old_table, new_table,
-                                psort_info, row, ext, &doc_id, conv_heap, &err,
-                                &v_heap, table, trx, &multi_val_added)))) {
-          /* An empty buffer should have enough
-          room for at least one record. */
-          ut_error;
-        }
-
-        if (err != DB_SUCCESS) {
-          break;
-        }
-
-        ut_ad(rows_added != UNIV_NO_INDEX_VALUE);
-
-        file->n_rec += rows_added;
-
-        /* It's possible that there're some multi-value data left.
-        So write current buffer to disk and try with an empty buffer again. */
-        if (multi_val_added != 0) {
-          goto write_buffer_and_retry;
-        }
-      }
-    }
-
-    if (row == nullptr) {
-      goto all_done;
-    }
-
-    if (err != DB_SUCCESS) {
-      goto func_exit;
-    }
-
-    if (v_heap) {
-      mem_heap_empty(v_heap);
-    }
-  }
-
-func_exit:
-  /* row_merge_spatial_rows may have committed
-  the mtr	before an error occurs. */
-  if (mtr.is_active()) {
-    mtr_commit(&mtr);
-  }
-  mem_heap_free(row_heap);
-  ut_free(nonnull);
-
-all_done:
-  if (clust_btr_bulk != nullptr) {
-    ut_ad(err != DB_SUCCESS);
-    clust_btr_bulk->latch();
-    err = clust_btr_bulk->finish(err);
-    UT_DELETE(clust_btr_bulk);
-  }
-
-  if (prev_fields != nullptr) {
-    ut_free(prev_fields);
-    mem_heap_free(mtuple_heap);
-  }
-
-  if (v_heap) {
-    mem_heap_free(v_heap);
-  }
-
-  if (conv_heap != nullptr) {
-    mem_heap_free(conv_heap);
-  }
-
-#ifdef FTS_INTERNAL_DIAG_PRINT
-  DEBUG_FTS_SORT_PRINT("FTS_SORT: Complete Scan Table\n");
-#endif
-  if (fts_pll_sort) {
-    bool all_exit = false;
-    ulint trial_count = 0;
-    const ulint max_trial_count = 10000;
-
-  wait_again:
-    /* Check if error occurs in child thread */
-    for (ulint j = 0; j < fts_sort_pll_degree; j++) {
-      if (psort_info[j].error != DB_SUCCESS) {
-        err = psort_info[j].error;
-        trx->error_key_num = j;
-        break;
-      }
-    }
-
-    /* Tell all children that parent has done scanning */
-    for (ulint i = 0; i < fts_sort_pll_degree; i++) {
-      if (err == DB_SUCCESS) {
-        psort_info[i].state = FTS_PARENT_COMPLETE;
-      } else {
-        psort_info[i].state = FTS_PARENT_EXITING;
-      }
-    }
-
-    /* Now wait all children to report back to be completed */
-    os_event_wait_time_low(fts_parallel_sort_event, 1000000, sig_count);
-
-    for (ulint i = 0; i < fts_sort_pll_degree; i++) {
-      if (psort_info[i].child_status != FTS_CHILD_COMPLETE &&
-          psort_info[i].child_status != FTS_CHILD_EXITING) {
-        sig_count = os_event_reset(fts_parallel_sort_event);
-        goto wait_again;
-      }
-    }
-
-    /* Now all children should complete, wait a bit until
-    they all finish setting the event, before we free everything.
-    This has a 10 second timeout */
-    do {
-      all_exit = true;
-
-      for (ulint j = 0; j < fts_sort_pll_degree; j++) {
-        if (psort_info[j].child_status != FTS_CHILD_EXITING) {
-          all_exit = false;
-          std::this_thread::sleep_for(std::chrono::milliseconds(1));
-          break;
-        }
-      }
-      trial_count++;
-    } while (!all_exit && trial_count < max_trial_count);
-
-    if (!all_exit) {
-      ib::fatal(ER_IB_MSG_966) << "Not all child sort threads exited"
-                                  " when creating FTS index '"
-                               << fts_sort_idx->name << "'";
-    }
-  }
-
-#ifdef FTS_INTERNAL_DIAG_PRINT
-  DEBUG_FTS_SORT_PRINT("FTS_SORT: Complete Tokenization\n");
-#endif
-  for (ulint i = 0; i < n_index; i++) {
-    row_merge_buf_free(merge_buf[i]);
-  }
-
-  row_fts_free_pll_merge_buf(psort_info);
-
-  ut_free(merge_buf);
-
-  btr_pcur_close(&pcur);
-
-  if (sp_tuples != nullptr) {
-    for (ulint i = 0; i < num_spatial; i++) {
-      UT_DELETE(sp_tuples[i]);
-    }
-    ut_free(sp_tuples);
-
-    if (sp_heap) {
-      mem_heap_free(sp_heap);
-    }
-  }
-
-  /* Update the next Doc ID we used. Table should be locked, so
-  no concurrent DML */
-  if (max_doc_id && err == DB_SUCCESS) {
-    /* Sync fts cache for other fts indexes to keep all
-    fts indexes consistent in sync_doc_id. */
-    err = fts_sync_table(const_cast<dict_table_t *>(new_table), false, true,
-                         false);
-
-    if (err == DB_SUCCESS) {
-      fts_update_next_doc_id(nullptr, new_table, old_table->name.m_name,
-                             max_doc_id);
-    }
-  }
-
-  trx->op_info = "";
-
-  return err;
-}
-
-/** Write a record via buffer 2 and read the next record to buffer N.
-@param N number of the buffer (0 or 1)
-@param INDEX record descriptor
-@param AT_END statement to execute at end of input */
-#define ROW_MERGE_WRITE_GET_NEXT_LOW(N, INDEX, AT_END)                       \
-  do {                                                                       \
-    b2 = row_merge_write_rec(&block[2 * srv_sort_buf_size], &buf[2], b2,     \
-                             of->fd, &of->offset, mrec##N, offsets##N);      \
-    if (UNIV_UNLIKELY(!b2 || ++of->n_rec > file->n_rec)) {                   \
-      goto corrupt;                                                          \
-    }                                                                        \
-    b##N =                                                                   \
-        row_merge_read_rec(&block[N * srv_sort_buf_size], &buf[N], b##N,     \
-                           INDEX, file->fd, foffs##N, &mrec##N, offsets##N); \
-    if (UNIV_UNLIKELY(!b##N)) {                                              \
-      if (mrec##N) {                                                         \
-        goto corrupt;                                                        \
-      }                                                                      \
-      AT_END;                                                                \
-    }                                                                        \
-  } while (0)
-
-#ifdef HAVE_PSI_STAGE_INTERFACE
-#define ROW_MERGE_WRITE_GET_NEXT(N, INDEX, AT_END)  \
-  do {                                              \
-    if (stage != NULL) {                            \
-      stage->inc();                                 \
-    }                                               \
-    ROW_MERGE_WRITE_GET_NEXT_LOW(N, INDEX, AT_END); \
-  } while (0)
-#else /* HAVE_PSI_STAGE_INTERFACE */
-#define ROW_MERGE_WRITE_GET_NEXT(N, INDEX, AT_END) \
-  ROW_MERGE_WRITE_GET_NEXT_LOW(N, INDEX, AT_END)
-#endif /* HAVE_PSI_STAGE_INTERFACE */
-
-/** Merge two blocks of records on disk and write a bigger block.
-@param[in]	dup	descriptor of index being created
-@param[in]	file	file containing index entries
-@param[in,out]	block	3 buffers
-@param[in,out]	foffs0	offset of first source list in the file
-@param[in,out]	foffs1	offset of second source list in the file
-@param[in,out]	of	output file
-@param[in,out]	stage	performance schema accounting object, used by
-ALTER TABLE. If not NULL stage->inc() will be called for each record
-processed.
-@return DB_SUCCESS or error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_merge_blocks(const row_merge_dup_t *dup, const merge_file_t *file,
-                     row_merge_block_t *block, ulint *foffs0, ulint *foffs1,
-                     merge_file_t *of, ut_stage_alter_t *stage) {
-  mem_heap_t *heap; /*!< memory heap for offsets0, offsets1 */
-
-  mrec_buf_t *buf;     /*!< buffer for handling
-                       split mrec in block[] */
-  const byte *b0;      /*!< pointer to block[0] */
-  const byte *b1;      /*!< pointer to block[srv_sort_buf_size] */
-  byte *b2;            /*!< pointer to block[2 * srv_sort_buf_size] */
-  const mrec_t *mrec0; /*!< merge rec, points to block[0] or buf[0] */
-  const mrec_t *mrec1; /*!< merge rec, points to
-                       block[srv_sort_buf_size] or buf[1] */
-  ulint *offsets0;     /* offsets of mrec0 */
-  ulint *offsets1;     /* offsets of mrec1 */
-
-  DBUG_TRACE;
-  DBUG_PRINT("ib_merge_sort",
-             ("fd=%d,%lu+%lu to fd=%d,%lu", file->fd, ulong(*foffs0),
-              ulong(*foffs1), of->fd, ulong(of->offset)));
-
-  heap = row_merge_heap_create(dup->index, &buf, &offsets0, &offsets1);
-
-  /* Write a record and read the next record.  Split the output
-  file in two halves, which can be merged on the following pass. */
-
-  if (!row_merge_read(file->fd, *foffs0, &block[0]) ||
-      !row_merge_read(file->fd, *foffs1, &block[srv_sort_buf_size])) {
-  corrupt:
-    mem_heap_free(heap);
-    return DB_CORRUPTION;
-  }
-
-  b0 = &block[0];
-  b1 = &block[srv_sort_buf_size];
-  b2 = &block[2 * srv_sort_buf_size];
-
-  b0 = row_merge_read_rec(&block[0], &buf[0], b0, dup->index, file->fd, foffs0,
-                          &mrec0, offsets0);
-  b1 = row_merge_read_rec(&block[srv_sort_buf_size], &buf[srv_sort_buf_size],
-                          b1, dup->index, file->fd, foffs1, &mrec1, offsets1);
-  if (UNIV_UNLIKELY(!b0 && mrec0) || UNIV_UNLIKELY(!b1 && mrec1)) {
-    goto corrupt;
-  }
-
-  while (mrec0 && mrec1) {
-    int cmp = cmp_rec_rec_simple(mrec0, mrec1, offsets0, offsets1, dup->index,
-                                 dup->table);
-    if (cmp < 0) {
-      ROW_MERGE_WRITE_GET_NEXT(0, dup->index, goto merged);
-    } else if (cmp) {
-      ROW_MERGE_WRITE_GET_NEXT(1, dup->index, goto merged);
-    } else {
-      mem_heap_free(heap);
-      return DB_DUPLICATE_KEY;
-    }
-  }
-
-merged:
-  if (mrec0) {
-    /* append all mrec0 to output */
-    for (;;) {
-      ROW_MERGE_WRITE_GET_NEXT(0, dup->index, goto done0);
-    }
-  }
-done0:
-  if (mrec1) {
-    /* append all mrec1 to output */
-    for (;;) {
-      ROW_MERGE_WRITE_GET_NEXT(1, dup->index, goto done1);
-    }
-  }
-done1:
-
-  mem_heap_free(heap);
-  b2 = row_merge_write_eof(&block[2 * srv_sort_buf_size], b2, of->fd,
-                           &of->offset);
-  return b2 ? DB_SUCCESS : DB_CORRUPTION;
-}
-
-/** Copy a block of index entries.
-@param[in]	index	index being created
-@param[in]	file	input file
-@param[in,out]	block	3 buffers
-@param[in,out]	foffs0	input file offset
-@param[in,out]	of	output file
-@param[in,out]	stage	performance schema accounting object, used by
-ALTER TABLE. If not NULL stage->inc() will be called for each record
-processed.
-@return true on success, false on failure */
-static MY_ATTRIBUTE((warn_unused_result)) ibool
-    row_merge_blocks_copy(const dict_index_t *index, const merge_file_t *file,
-                          row_merge_block_t *block, ulint *foffs0,
-                          merge_file_t *of, ut_stage_alter_t *stage) {
-  mem_heap_t *heap; /*!< memory heap for offsets0, offsets1 */
-
-  mrec_buf_t *buf;     /*!< buffer for handling
-                       split mrec in block[] */
-  const byte *b0;      /*!< pointer to block[0] */
-  byte *b2;            /*!< pointer to block[2 * srv_sort_buf_size] */
-  const mrec_t *mrec0; /*!< merge rec, points to block[0] */
-  ulint *offsets0;     /* offsets of mrec0 */
-  ulint *offsets1;     /* dummy offsets */
-
-  DBUG_TRACE;
-  DBUG_PRINT("ib_merge_sort", ("fd=%d," ULINTPF " to fd=%d," ULINTPF, file->fd,
-                               *foffs0, of->fd, of->offset));
-
-  heap = row_merge_heap_create(index, &buf, &offsets0, &offsets1);
-
-  /* Write a record and read the next record.  Split the output
-  file in two halves, which can be merged on the following pass. */
-
-  if (!row_merge_read(file->fd, *foffs0, &block[0])) {
-  corrupt:
-    mem_heap_free(heap);
-    return FALSE;
-  }
-
-  b0 = &block[0];
-
-  b2 = &block[2 * srv_sort_buf_size];
-
-  b0 = row_merge_read_rec(&block[0], &buf[0], b0, index, file->fd, foffs0,
-                          &mrec0, offsets0);
-  if (UNIV_UNLIKELY(!b0 && mrec0)) {
-    goto corrupt;
-  }
-
-  if (mrec0) {
-    /* append all mrec0 to output */
-    for (;;) {
-      ROW_MERGE_WRITE_GET_NEXT(0, index, goto done0);
-    }
-  }
-done0:
-
-  /* The file offset points to the beginning of the last page
-  that has been read.  Update it to point to the next block. */
-  (*foffs0)++;
-
-  mem_heap_free(heap);
-  return row_merge_write_eof(&block[2 * srv_sort_buf_size], b2, of->fd,
-                             &of->offset) != nullptr;
-}
-
-/** Merge disk files.
-@param[in]	trx		transaction
-@param[in]	dup		descriptor of index being created
-@param[in,out]	file		file containing index entries
-@param[in,out]	block		3 buffers
-@param[in,out]	tmpfd		temporary file handle
-@param[in,out]	num_run		Number of runs that remain to be merged
-@param[in,out]	run_offset	Array that contains the first offset number
-for each merge run
-@param[in,out]	stage		performance schema accounting object, used by
-ALTER TABLE. If not NULL stage->inc() will be called for each record
-processed.
-@return DB_SUCCESS or error code */
-static dberr_t row_merge(trx_t *trx, const row_merge_dup_t *dup,
-                         merge_file_t *file, row_merge_block_t *block,
-                         int *tmpfd, ulint *num_run, ulint *run_offset,
-                         ut_stage_alter_t *stage) {
-  ulint foffs0;    /*!< first input offset */
-  ulint foffs1;    /*!< second input offset */
-  dberr_t error;   /*!< error code */
-  merge_file_t of; /*!< output file */
-  const ulint ihalf = run_offset[*num_run / 2];
-  /*!< half the input file */
-  ulint n_run = 0;
-  /*!< num of runs generated from this merge */
-
-  UNIV_MEM_ASSERT_W(&block[0], 3 * srv_sort_buf_size);
-
-  ut_ad(ihalf < file->offset);
-
-  of.fd = *tmpfd;
-  of.offset = 0;
-  of.n_rec = 0;
-
-#ifdef POSIX_FADV_SEQUENTIAL
-  /* The input file will be read sequentially, starting from the
-  beginning and the middle.  In Linux, the POSIX_FADV_SEQUENTIAL
-  affects the entire file.  Each block will be read exactly once. */
-  posix_fadvise(file->fd, 0, 0, POSIX_FADV_SEQUENTIAL | POSIX_FADV_NOREUSE);
-#endif /* POSIX_FADV_SEQUENTIAL */
-
-  /* Merge blocks to the output file. */
-  foffs0 = 0;
-  foffs1 = ihalf;
-
-  UNIV_MEM_INVALID(run_offset, *num_run * sizeof *run_offset);
-
-  for (; foffs0 < ihalf && foffs1 < file->offset; foffs0++, foffs1++) {
-    if (trx_is_interrupted(trx)) {
-      return (DB_INTERRUPTED);
-    }
-
-    /* Remember the offset number for this run */
-    run_offset[n_run++] = of.offset;
-
-    error = row_merge_blocks(dup, file, block, &foffs0, &foffs1, &of, stage);
-
-    if (error != DB_SUCCESS) {
-      return (error);
-    }
-  }
-
-  /* Copy the last blocks, if there are any. */
-
-  while (foffs0 < ihalf) {
-    if (UNIV_UNLIKELY(trx_is_interrupted(trx))) {
-      return (DB_INTERRUPTED);
-    }
-
-    /* Remember the offset number for this run */
-    run_offset[n_run++] = of.offset;
-
-    if (!row_merge_blocks_copy(dup->index, file, block, &foffs0, &of, stage)) {
-      return (DB_CORRUPTION);
-    }
-  }
-
-  ut_ad(foffs0 == ihalf);
-
-  while (foffs1 < file->offset) {
-    if (trx_is_interrupted(trx)) {
-      return (DB_INTERRUPTED);
-    }
-
-    /* Remember the offset number for this run */
-    run_offset[n_run++] = of.offset;
-
-    if (!row_merge_blocks_copy(dup->index, file, block, &foffs1, &of, stage)) {
-      return (DB_CORRUPTION);
-    }
-  }
-
-  ut_ad(foffs1 == file->offset);
-
-  if (UNIV_UNLIKELY(of.n_rec != file->n_rec)) {
-    return (DB_CORRUPTION);
-  }
-
-  ut_ad(n_run <= *num_run);
-
-  *num_run = n_run;
-
-  /* Each run can contain one or more offsets. As merge goes on,
-  the number of runs (to merge) will reduce until we have one
-  single run. So the number of runs will always be smaller than
-  the number of offsets in file */
-  ut_ad((*num_run) <= file->offset);
-
-  /* The number of offsets in output file is always equal or
-  smaller than input file */
-  ut_ad(of.offset <= file->offset);
-
-  /* Swap file descriptors for the next pass. */
-  *tmpfd = file->fd;
-  *file = of;
-
-  UNIV_MEM_INVALID(&block[0], 3 * srv_sort_buf_size);
-
-  return (DB_SUCCESS);
-}
-
-/** Merge disk files.
-@param[in]	trx	transaction
-@param[in]	dup	descriptor of index being created
-@param[in,out]	file	file containing index entries
-@param[in,out]	block	3 buffers
-@param[in,out]	tmpfd	temporary file handle
-@param[in,out]	stage	performance schema accounting object, used by
-ALTER TABLE. If not NULL, stage->begin_phase_sort() will be called initially
-and then stage->inc() will be called for each record processed.
-@return DB_SUCCESS or error code */
-dberr_t row_merge_sort(trx_t *trx, const row_merge_dup_t *dup,
-                       merge_file_t *file, row_merge_block_t *block, int *tmpfd,
-                       ut_stage_alter_t *stage /* = NULL */) {
-  const ulint half = file->offset / 2;
-  ulint num_runs;
-  ulint *run_offset;
-  dberr_t error = DB_SUCCESS;
-  DBUG_TRACE;
-
-  /* Record the number of merge runs we need to perform */
-  num_runs = file->offset;
-
-  if (stage != nullptr) {
-    stage->begin_phase_sort(log2(num_runs));
-  }
-
-  /* If num_runs are less than 1, nothing to merge */
-  if (num_runs <= 1) {
-    return error;
-  }
-
-  /* "run_offset" records each run's first offset number */
-  run_offset = (ulint *)ut_malloc_nokey(file->offset * sizeof(ulint));
-
-  /* This tells row_merge() where to start for the first round
-  of merge. */
-  run_offset[half] = half;
-
-  /* The file should always contain at least one byte (the end
-  of file marker).  Thus, it must be at least one block. */
-  ut_ad(file->offset > 0);
-
-  /* Merge the runs until we have one big run */
-  do {
-    error =
-        row_merge(trx, dup, file, block, tmpfd, &num_runs, run_offset, stage);
-
-    if (error != DB_SUCCESS) {
-      break;
-    }
-
-    UNIV_MEM_ASSERT_RW(run_offset, num_runs * sizeof *run_offset);
-  } while (num_runs > 1);
-
-  ut_free(run_offset);
-
-  return error;
-}
-
-#ifdef UNIV_DEBUG
-#define row_merge_copy_blobs(trx, index, mrec, offsets, page_size, tuple, \
-                             is_sdi, heap)                                \
-  row_merge_copy_blobs_func(trx, index, mrec, offsets, page_size, tuple,  \
-                            is_sdi, heap)
-#else /* UNIV_DEBUG */
-#define row_merge_copy_blobs(trx, index, mrec, offsets, page_size, tuple, \
-                             is_sdi, heap)                                \
-  row_merge_copy_blobs_func(trx, index, mrec, offsets, page_size, tuple, heap)
-#endif /* UNIV_DEBUG */
-
-/** Copy externally stored columns to the data tuple.
-@param[in]	trx		current transaction
-@param[in]	index		index dictionary object.
-@param[in]	mrec		record containing BLOB pointers,
-                                or NULL to use tuple instead
-@param[in]	offsets		offsets of mrec
-@param[in]	page_size	compressed page size in bytes, or 0
-@param[in,out]	tuple		data tuple */
-#ifdef UNIV_DEBUG
-/**
-@param[in]	is_sdi		true for SDI Indexes */
-#endif /* UNIV_DEBUG */
-/**
-@param[in,out]	heap		memory heap */
-static void row_merge_copy_blobs_func(trx_t *trx, const dict_index_t *index,
-                                      const mrec_t *mrec, const ulint *offsets,
-                                      const page_size_t &page_size,
-                                      dtuple_t *tuple,
-#ifdef UNIV_DEBUG
-                                      bool is_sdi,
-#endif /* UNIV_DEBUG */
-                                      mem_heap_t *heap) {
-  ut_ad(mrec == nullptr || rec_offs_any_extern(offsets));
-
-  for (ulint i = 0; i < dtuple_get_n_fields(tuple); i++) {
-    ulint len;
-    const void *data;
-    dfield_t *field = dtuple_get_nth_field(tuple, i);
-    ulint field_len;
-    const byte *field_data;
-
-    if (!dfield_is_ext(field)) {
-      continue;
-    }
-
-    ut_ad(!dfield_is_null(field));
-
-    /* During the creation of a PRIMARY KEY, the table is
-    X-locked, and we skip copying records that have been
-    marked for deletion. Therefore, externally stored
-    columns cannot possibly be freed between the time the
-    BLOB pointers are read (row_merge_read_clustered_index())
-    and dereferenced (below). */
-    if (mrec == nullptr) {
-      field_data = static_cast<byte *>(dfield_get_data(field));
-      field_len = dfield_get_len(field);
-
-      ut_a(field_len >= BTR_EXTERN_FIELD_REF_SIZE);
-
-      ut_a(memcmp(field_data + field_len - BTR_EXTERN_FIELD_REF_SIZE,
-                  field_ref_zero, BTR_EXTERN_FIELD_REF_SIZE));
-
-      data = lob::btr_copy_externally_stored_field(
-          nullptr, index, &len, nullptr, field_data, page_size, field_len,
-          is_sdi, heap);
-    } else {
-      data = lob::btr_rec_copy_externally_stored_field(
-          nullptr, index, mrec, offsets, page_size, i, &len, nullptr, is_sdi,
-          heap);
-    }
-
-    /* Because we have locked the table, any records
-    written by incomplete transactions must have been
-    rolled back already. There must not be any incomplete
-    BLOB columns. */
-    ut_a(data);
-
-    dfield_set_data(field, data, len);
-  }
-}
-
-/** Convert a merge record to a typed data tuple. Note that externally
-stored fields are not copied to heap.
-@param[in,out]	index	index on the table
-@param[in]	mtuple	merge record
-@param[in]	dtuple	data tuple of records */
-static void row_merge_mtuple_to_dtuple(dict_index_t *index, dtuple_t *dtuple,
-                                       const mtuple_t *mtuple) {
-  ut_ad(!dict_index_is_ibuf(index));
-
-  memcpy(dtuple->fields, mtuple->fields,
-         dtuple->n_fields * sizeof *mtuple->fields);
-}
-
-/** Insert sorted data tuples to the index.
-@param[in]	trx		current transaction
-@param[in]	index		index to be inserted
-@param[in]	old_table	old table
-@param[in]	fd		file descriptor
-@param[in,out]	block		file buffer
-@param[in]	row_buf		row_buf the sorted data tuples,
-or NULL if fd, block will be used instead
-@param[in,out]	btr_bulk	btr bulk instance
-@param[in,out]	stage		performance schema accounting object, used by
-ALTER TABLE. If not NULL stage->begin_phase_insert() will be called initially
-and then stage->inc() will be called for each record that is processed.
-@return DB_SUCCESS or error number */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t row_merge_insert_index_tuples(
-    trx_t *trx, dict_index_t *index, const dict_table_t *old_table, int fd,
-    row_merge_block_t *block, const row_merge_buf_t *row_buf, BtrBulk *btr_bulk,
-    ut_stage_alter_t *stage /* = NULL */) {
-  const byte *b;
-  mem_heap_t *heap;
-  mem_heap_t *tuple_heap;
-  dberr_t error = DB_SUCCESS;
-  ulint foffs = 0;
-  ulint *offsets;
-  mrec_buf_t *buf;
-  ulint n_rows = 0;
-  dtuple_t *dtuple;
-  DBUG_TRACE;
-
-  ut_ad(!srv_read_only_mode);
-  ut_ad(!(index->type & DICT_FTS));
-  ut_ad(!dict_index_is_spatial(index));
-  ut_ad(trx->id);
-
-  if (stage != nullptr) {
-    stage->begin_phase_insert();
-  }
-
-  tuple_heap = mem_heap_create(1000);
-
-  {
-    ulint i = 1 + REC_OFFS_HEADER_SIZE + dict_index_get_n_fields(index);
-    heap = mem_heap_create(sizeof *buf + i * sizeof *offsets);
-    offsets = static_cast<ulint *>(mem_heap_alloc(heap, i * sizeof *offsets));
-    offsets[0] = i;
-    offsets[1] = dict_index_get_n_fields(index);
-  }
-
-  if (row_buf != nullptr) {
-    ut_ad(fd == -1);
-    ut_ad(block == nullptr);
-    DBUG_EXECUTE_IF("row_merge_read_failure", error = DB_CORRUPTION;
-                    goto err_exit;);
-    buf = nullptr;
-    b = nullptr;
-    dtuple = dtuple_create(heap, dict_index_get_n_fields(index));
-    dtuple_set_n_fields_cmp(dtuple, dict_index_get_n_unique_in_tree(index));
-  } else {
-    b = block;
-    dtuple = nullptr;
-
-    if (!row_merge_read(fd, foffs, block)) {
-      error = DB_CORRUPTION;
-      goto err_exit;
-    } else {
-      buf = static_cast<mrec_buf_t *>(mem_heap_alloc(heap, sizeof *buf));
-    }
-  }
-
-  for (;;) {
-    const mrec_t *mrec;
-    mtr_t mtr;
-
-    if (stage != nullptr) {
-      stage->inc();
-    }
-
-    if (row_buf != nullptr) {
-      if (n_rows >= row_buf->n_tuples) {
-        break;
-      }
-
-      /* Convert merge tuple record from
-      row buffer to data tuple record */
-      row_merge_mtuple_to_dtuple(index, dtuple, &row_buf->tuples[n_rows]);
-
-      n_rows++;
-      /* BLOB pointers must be copied from dtuple */
-      mrec = nullptr;
-    } else {
-      b = row_merge_read_rec(block, buf, b, index, fd, &foffs, &mrec, offsets);
-      if (UNIV_UNLIKELY(!b)) {
-        /* End of list, or I/O error */
-        if (mrec) {
-          error = DB_CORRUPTION;
-        }
-        break;
-      }
-
-      dtuple = row_rec_to_index_entry_low(mrec, index, offsets, tuple_heap);
-    }
-
-    const dict_index_t *old_index = old_table->first_index();
-
-    if (index->is_clustered() && dict_index_is_online_ddl(old_index)) {
-      error = row_log_table_get_error(old_index);
-      if (error != DB_SUCCESS) {
-        break;
-      }
-    }
-
-    /* If there are externally stored columns. */
-    if (dtuple->has_ext()) {
-      ut_ad(index->is_clustered());
-      /* Off-page columns can be fetched safely
-      when concurrent modifications to the table
-      are disabled. (Purge can process delete-marked
-      records, but row_merge_read_clustered_index()
-      would have skipped them.)
-
-      When concurrent modifications are enabled,
-      row_merge_read_clustered_index() will
-      only see rows from transactions that were
-      committed before the ALTER TABLE started
-      (REPEATABLE READ).
-
-      Any modifications after the
-      row_merge_read_clustered_index() scan
-      will go through row_log_table_apply().
-      Any modifications to off-page columns
-      will be tracked by
-      row_log_table_blob_alloc() and
-      row_log_table_blob_free(). */
-      row_merge_copy_blobs(trx, old_index, mrec, offsets,
-                           dict_table_page_size(old_table), dtuple,
-                           dict_index_is_sdi(index), tuple_heap);
-    }
-
-    ut_ad(dtuple_validate(dtuple));
-
-    error = btr_bulk->insert(dtuple);
-
-    if (error != DB_SUCCESS) {
-      goto err_exit;
-    }
-
-    mem_heap_empty(tuple_heap);
-  }
-
-err_exit:
-  mem_heap_free(tuple_heap);
-  mem_heap_free(heap);
-
-  return error;
-}
-
-/** Sets an exclusive lock on a table, for the duration of creating indexes.
- @return error code or DB_SUCCESS */
-dberr_t row_merge_lock_table(trx_t *trx,          /*!< in/out: transaction */
-                             dict_table_t *table, /*!< in: table to lock */
-                             enum lock_mode mode) /*!< in: LOCK_X or LOCK_S */
-{
-  ut_ad(!srv_read_only_mode);
-  ut_ad(mode == LOCK_X || mode == LOCK_S);
-
-  trx->op_info = "setting table lock for creating or dropping index";
-  /* Trx for DDL should not be forced to rollback for now */
-  trx->in_innodb |= TRX_FORCE_ROLLBACK_DISABLE;
-
-  dberr_t err = lock_table_for_trx(table, trx, mode);
-
-  return (err);
-}
-
-/** Drop indexes that were created before an error occurred.
- The data dictionary must have been locked exclusively by the caller,
- because the transaction will not be committed. */
-void row_merge_drop_indexes(
-    trx_t *trx,          /*!< in/out: dictionary transaction */
-    dict_table_t *table, /*!< in/out: table containing the indexes */
-    ibool locked)        /*!< in: TRUE=table locked,
-                         FALSE=may need to do a lazy drop */
-{
-  dict_index_t *index;
-  dict_index_t *next_index;
-
-  ut_ad(!srv_read_only_mode);
-  ut_ad(mutex_own(&dict_sys->mutex));
-  ut_ad(trx->dict_operation_lock_mode == RW_X_LATCH);
-  ut_ad(rw_lock_own(dict_operation_lock, RW_LOCK_X));
-
-  index = table->first_index();
-  ut_ad(index->is_clustered());
-  ut_ad(dict_index_get_online_status(index) == ONLINE_INDEX_COMPLETE);
-
-  /* the caller should have an open handle to the table */
-  ut_ad(table->get_ref_count() >= 1);
-
-  /* It is possible that table->n_ref_count > 1 when
-  locked=TRUE. In this case, all code that should have an open
-  handle to the table be waiting for the next statement to execute,
-  or waiting for a meta-data lock.
-
-  A concurrent purge will be prevented by dict_operation_lock. */
-
-  if (!locked && table->get_ref_count() > 1) {
-    /* We will have to drop the indexes later, when the
-    table is guaranteed to be no longer in use.  Mark the
-    indexes as incomplete and corrupted, so that other
-    threads will stop using them.  Let dict_table_close()
-    or crash recovery or the next invocation of
-    prepare_inplace_alter_table() take care of dropping
-    the indexes. */
-
-    while ((index = index->next()) != nullptr) {
-      ut_ad(!index->is_clustered());
-
-      switch (dict_index_get_online_status(index)) {
-        case ONLINE_INDEX_ABORTED_DROPPED:
-          continue;
-        case ONLINE_INDEX_COMPLETE:
-          if (index->is_committed()) {
-            /* Do nothing to already
-            published indexes. */
-          } else if (index->type & DICT_FTS) {
-            /* Drop a completed FULLTEXT
-            index, due to a timeout during
-            MDL upgrade for
-            commit_inplace_alter_table().
-            Because only concurrent reads
-            are allowed (and they are not
-            seeing this index yet) we
-            are safe to drop the index. */
-            dict_index_t *prev = UT_LIST_GET_PREV(indexes, index);
-            /* At least there should be
-            the clustered index before
-            this one. */
-            ut_ad(prev);
-            ut_a(table->fts);
-            fts_drop_index(table, index, trx, nullptr);
-            /* Since
-            INNOBASE_SHARE::idx_trans_tbl
-            is shared between all open
-            ha_innobase handles to this
-            table, no thread should be
-            accessing this dict_index_t
-            object. Also, we should be
-            holding LOCK=SHARED MDL on the
-            table even after the MDL
-            upgrade timeout. */
-
-            /* We can remove a DICT_FTS
-            index from the cache, because
-            we do not allow ADD FULLTEXT INDEX
-            with LOCK=NONE. If we allowed that,
-            we should exclude FTS entries from
-            prebuilt->ins_node->entry_list
-            in ins_node_create_entry_list(). */
-            dict_index_remove_from_cache(table, index);
-            index = prev;
-          } else {
-            rw_lock_x_lock(dict_index_get_lock(index));
-            dict_index_set_online_status(index, ONLINE_INDEX_ABORTED);
-            index->type |= DICT_CORRUPT;
-            table->drop_aborted = TRUE;
-            goto drop_aborted;
-          }
-          continue;
-        case ONLINE_INDEX_CREATION:
-          rw_lock_x_lock(dict_index_get_lock(index));
-          ut_ad(!index->is_committed());
-          row_log_abort_sec(index);
-        drop_aborted:
-          rw_lock_x_unlock(dict_index_get_lock(index));
-
-          DEBUG_SYNC_C("merge_drop_index_after_abort");
-          /* fall through */
-        case ONLINE_INDEX_ABORTED:
-          rw_lock_x_lock(dict_index_get_lock(index));
-          dict_index_set_online_status(index, ONLINE_INDEX_ABORTED_DROPPED);
-          rw_lock_x_unlock(dict_index_get_lock(index));
-          table->drop_aborted = TRUE;
-          if (dict_index_has_virtual(index)) {
-            /* If multi-value index, a virtual column would be created too.
-            This is same for a virtual column along with an index on it case.
-            In this rollback case, the metadata for this index would be
-            inconsistent with metadata of table, because table metadata
-            doesn't have the virtual column for this index yet. So set
-            this index to be corrupted and any further use of this index
-            would be prevented. One example is row_build_index_entry_low(). */
-            index->type |= DICT_CORRUPT;
-          }
-          continue;
-      }
-      ut_error;
-    }
-
-    return;
-  }
-
-  /* Invalidate all row_prebuilt_t::ins_graph that are referring
-  to this table. That is, force row_get_prebuilt_insert_row() to
-  rebuild prebuilt->ins_node->entry_list). */
-  ut_ad(table->def_trx_id <= trx->id);
-  table->def_trx_id = trx->id;
-
-  next_index = index->next();
-
-  while ((index = next_index) != nullptr) {
-    /* read the next pointer before freeing the index */
-    next_index = index->next();
-
-    ut_ad(!index->is_clustered());
-
-    if (!index->is_committed()) {
-      /* If it is FTS index, drop from table->fts
-      and also drop its auxiliary tables */
-      if (index->type & DICT_FTS) {
-        ut_a(table->fts);
-        fts_drop_index(table, index, trx, nullptr);
-      }
-
-      switch (dict_index_get_online_status(index)) {
-        case ONLINE_INDEX_CREATION:
-          /* This state should only be possible
-          when prepare_inplace_alter_table() fails
-          after invoking row_merge_create_index().
-          In inplace_alter_table(),
-          row_merge_build_indexes()
-          should never leave the index in this state.
-          It would invoke row_log_abort_sec() on
-          failure. */
-        case ONLINE_INDEX_COMPLETE:
-          /* In these cases, we are able to drop
-          the index straight. The DROP INDEX was
-          never deferred. */
-          break;
-        case ONLINE_INDEX_ABORTED:
-        case ONLINE_INDEX_ABORTED_DROPPED:
-          break;
-      }
-
-      dict_index_remove_from_cache(table, index);
-    }
-  }
-
-  table->drop_aborted = FALSE;
-  ut_d(dict_table_check_for_dup_indexes(table, CHECK_ALL_COMPLETE));
-}
-
-/** Create temporary merge files in the given paramater path, and if
-UNIV_PFS_IO defined, register the file descriptor with Performance Schema.
-@param[in]	path	location for creating temporary merge files.
-@return File descriptor */
-int row_merge_file_create_low(const char *path) {
-  int fd;
-  if (path == nullptr) {
-    path = innobase_mysql_tmpdir();
-  }
-#ifdef UNIV_PFS_IO
-  /* This temp file open does not go through normal
-  file APIs, add instrumentation to register with
-  performance schema */
-  Datafile df;
-  df.make_filepath(path, "Innodb Merge Temp File", NO_EXT);
-
-  struct PSI_file_locker *locker = nullptr;
-  PSI_file_locker_state state;
-
-  locker = PSI_FILE_CALL(get_thread_file_name_locker)(
-      &state, innodb_temp_file_key.m_value, PSI_FILE_OPEN, df.filepath(),
-      &locker);
-
-  if (locker != nullptr) {
-    PSI_FILE_CALL(start_file_open_wait)(locker, __FILE__, __LINE__);
-  }
-#endif /* UNIV_PFS_IO */
-  fd = innobase_mysql_tmpfile(path);
-#ifdef UNIV_PFS_IO
-  if (locker != nullptr) {
-    PSI_FILE_CALL(end_file_open_wait_and_bind_to_descriptor)(locker, fd);
-  }
-#endif /* UNIV_PFS_IO */
-
-  if (fd < 0) {
-    ib::error(ER_IB_MSG_967) << "Cannot create temporary merge file";
-    return (-1);
-  }
-  return (fd);
-}
-
-/** Create a merge file in the given location.
-@param[out]	merge_file	merge file structure
-@param[in]	path		location for creating temporary file
-@return file descriptor, or -1 on failure */
-int row_merge_file_create(merge_file_t *merge_file, const char *path) {
-  merge_file->fd = row_merge_file_create_low(path);
-  merge_file->offset = 0;
-  merge_file->n_rec = 0;
-
-  if (merge_file->fd >= 0) {
-    if (srv_disable_sort_file_cache) {
-      os_file_set_nocache(merge_file->fd, "row0merge.cc", "sort");
-    }
-  }
-  return (merge_file->fd);
-}
-
-/** Destroy a merge file. And de-register the file from Performance Schema
- if UNIV_PFS_IO is defined. */
-void row_merge_file_destroy_low(int fd) /*!< in: merge file descriptor */
-{
-#ifdef UNIV_PFS_IO
-  struct PSI_file_locker *locker = nullptr;
-  PSI_file_locker_state state;
-  locker = PSI_FILE_CALL(get_thread_file_descriptor_locker)(&state, fd,
-                                                            PSI_FILE_CLOSE);
-  if (locker != nullptr) {
-    PSI_FILE_CALL(start_file_wait)(locker, 0, __FILE__, __LINE__);
-  }
-#endif
-  if (fd >= 0) {
-    close(fd);
-  }
-#ifdef UNIV_PFS_IO
-  if (locker != nullptr) {
-    PSI_FILE_CALL(end_file_wait)(locker, 0);
-  }
-#endif
-}
-/** Destroy a merge file. */
-void row_merge_file_destroy(
-    merge_file_t *merge_file) /*!< in/out: merge file structure */
-{
-  ut_ad(!srv_read_only_mode);
-
-  if (merge_file->fd != -1) {
-    row_merge_file_destroy_low(merge_file->fd);
-    merge_file->fd = -1;
-  }
-}
-
-/** Provide a new pathname for a table that is being renamed if it belongs to
- a file-per-table tablespace.  The caller is responsible for freeing the
- memory allocated for the return value.
- @return new pathname of tablespace file, or NULL if space = 0 */
-char *row_make_new_pathname(dict_table_t *table, /*!< in: table to be renamed */
-                            const char *new_name) /*!< in: new name */
-{
-  ut_ad(dict_table_is_file_per_table(table));
-
-  auto old_path = fil_space_get_first_path(table->space);
-  auto new_path = Fil_path::make_new_path(old_path, new_name, IBD);
-
-  return (mem_strdup(new_path.c_str()));
-}
-
-/** Create the index and load in to the dictionary.
-@param[in,out]	trx		trx (sets error_state)
-@param[in,out]	table		the index is on this table
-@param[in]	index_def	the index definition
-@param[in]	add_v		new virtual columns added along with add
-                                index call
-@return index, or NULL on error */
-dict_index_t *row_merge_create_index(trx_t *trx, dict_table_t *table,
-                                     const index_def_t *index_def,
-                                     const dict_add_v_col_t *add_v) {
-  dict_index_t *index;
-  dberr_t err;
-  ulint n_fields = index_def->n_fields;
-  ulint i;
-  bool has_new_v_col = false;
-
-  DBUG_TRACE;
-
-  ut_ad(!srv_read_only_mode);
-
-  /* Create the index prototype, using the passed in def, this is not
-  a persistent operation. We pass 0 as the space id, and determine at
-  a lower level the space id where to store the table. */
-
-  index = dict_mem_index_create(table->name.m_name, index_def->name, 0,
-                                index_def->ind_type, n_fields);
-
-  ut_a(index);
-
-  index->set_committed(index_def->rebuild);
-
-  for (i = 0; i < n_fields; i++) {
-    const char *name;
-    index_field_t *ifield = &index_def->fields[i];
-
-    if (ifield->is_v_col) {
-      if (ifield->col_no >= table->n_v_def) {
-        ut_ad(ifield->col_no < table->n_v_def + add_v->n_v_col);
-        ut_ad(ifield->col_no >= table->n_v_def);
-        name = add_v->v_col_name[ifield->col_no - table->n_v_def];
-
-        has_new_v_col = true;
-      } else {
-        name = dict_table_get_v_col_name(table, ifield->col_no);
-      }
-    } else {
-      name = table->get_col_name(ifield->col_no);
-    }
-
-    index->add_field(name, ifield->prefix_len, ifield->is_ascending);
-  }
-
-  /* Create B-tree */
-  mutex_exit(&dict_sys->mutex);
-
-  dict_build_index_def(table, index, trx);
-
-  err = dict_index_add_to_cache_w_vcol(table, index, add_v, index->page,
-                                       trx_is_strict(trx));
-
-  if (err != DB_SUCCESS) {
-    trx->error_state = err;
-    mutex_enter(&dict_sys->mutex);
-    return nullptr;
-  }
-
-  index =
-      dict_table_get_index_on_name(table, index_def->name, index_def->rebuild);
-  ut_ad(index != nullptr);
-
-  err = dict_create_index_tree_in_mem(index, trx);
-
-  mutex_enter(&dict_sys->mutex);
-
-  if (err != DB_SUCCESS) {
-    if ((index->type & DICT_FTS) && table->fts) {
-      fts_cache_index_cache_remove(table, index);
-    }
-
-    trx->error_state = err;
-    return nullptr;
-  }
-
-  if (dict_index_is_spatial(index)) {
-    index->fill_srid_value(index_def->srid, index_def->srid_is_valid);
-  }
-
-  /* Adjust field name for newly added virtual columns. */
-  for (i = 0; i < n_fields; i++) {
-    index_field_t *ifield = &index_def->fields[i];
-
-    if (ifield->is_v_col && ifield->col_no >= table->n_v_def) {
-      ut_ad(ifield->col_no < table->n_v_def + add_v->n_v_col);
-      ut_ad(ifield->col_no >= table->n_v_def);
-      dict_field_t *field = index->get_field(i);
-      field->name = add_v->v_col_name[ifield->col_no - table->n_v_def];
-    }
-  }
-
-  if (dict_index_is_spatial(index)) {
-    index->fill_srid_value(index_def->srid, index_def->srid_is_valid);
-    index->rtr_srs.reset(fetch_srs(index->srid));
-  }
-
-  index->parser = index_def->parser;
-  index->is_ngram = index_def->is_ngram;
-  index->has_new_v_col = has_new_v_col;
-
-  /* Note the id of the transaction that created this
-  index, we use it to restrict readers from accessing
-  this index, to ensure read consistency. */
-  ut_ad(index->trx_id == trx->id);
-
-  index->table->def_trx_id = trx->id;
-
-  return index;
-}
-
-/** Drop a table. The caller must have ensured that the background stats
- thread is not processing the table. This can be done by calling
- dict_stats_wait_bg_to_stop_using_table() after locking the dictionary and
- before calling this function.
- @return DB_SUCCESS or error code */
-dberr_t row_merge_drop_table(trx_t *trx,          /*!< in: transaction */
-                             dict_table_t *table) /*!< in: table to drop */
-{
-  ut_ad(!srv_read_only_mode);
-
-  /* There must be no open transactions on the table. */
-  ut_a(table->get_ref_count() == 0);
-
-  return (row_drop_table_for_mysql(table->name.m_name, trx, false, nullptr));
-}
-
-/** Write an MLOG_INDEX_LOAD record to indicate in the redo-log
-that redo-logging of individual index pages was disabled, and
-the flushing of such pages to the data files was completed.
-@param[in]	index	an index tree on which redo logging was disabled */
-static void row_merge_write_redo(const dict_index_t *index) {
-  mtr_t mtr;
-  byte *log_ptr = nullptr;
-
-  ut_ad(!index->table->is_temporary());
-  mtr.start();
-  if (mlog_open(&mtr, 11 + 8, log_ptr)) {
-    log_ptr = mlog_write_initial_log_record_low(MLOG_INDEX_LOAD, index->space,
-                                                index->page, log_ptr, &mtr);
-    mach_write_to_8(log_ptr, index->id);
-    mlog_close(&mtr, log_ptr + 8);
-  }
-  mtr.commit();
-}
-
-/** Build indexes on a table by reading a clustered index, creating a temporary
-file containing index entries, merge sorting these index entries and inserting
-sorted index entries to indexes.
-@param[in]	trx		transaction
-@param[in]	old_table	table where rows are read from
-@param[in]	new_table	table where indexes are created; identical to
-old_table unless creating a PRIMARY KEY
-@param[in]	online		true if creating indexes online
-@param[in]	indexes		indexes to be created
-@param[in]	key_numbers	MySQL key numbers
-@param[in]	n_indexes	size of indexes[]
-@param[in,out]	table		MySQL table, for reporting erroneous key value
-if applicable
-@param[in]	add_cols	default values of added columns, or NULL
-@param[in]	col_map		mapping of old column numbers to new ones, or
-NULL if old_table == new_table
-@param[in]	add_autoinc	number of added AUTO_INCREMENT columns, or
-ULINT_UNDEFINED if none is added
-@param[in,out]	sequence	autoinc sequence
-@param[in]	skip_pk_sort	whether the new PRIMARY KEY will follow
-existing order
-@param[in,out]	stage		performance schema accounting object, used by
-ALTER TABLE. stage->begin_phase_read_pk() will be called at the beginning of
-this function and it will be passed to other functions for further accounting.
-@param[in]	add_v		new virtual columns added along with indexes
-@param[in]	eval_table	mysql table used to evaluate virtual column
-                                value, see innobase_get_computed_value().
-@return DB_SUCCESS or error code */
-dberr_t row_merge_build_indexes(
-    trx_t *trx, dict_table_t *old_table, dict_table_t *new_table, bool online,
-    dict_index_t **indexes, const ulint *key_numbers, ulint n_indexes,
-    struct TABLE *table, const dtuple_t *add_cols, const ulint *col_map,
-    ulint add_autoinc, ib_sequence_t &sequence, bool skip_pk_sort,
-    ut_stage_alter_t *stage, const dict_add_v_col_t *add_v,
-    struct TABLE *eval_table) {
-  merge_file_t *merge_files;
-  row_merge_block_t *block;
-  ulint i;
-  ulint j;
-  dberr_t error;
-  int tmpfd = -1;
-  dict_index_t *fts_sort_idx = nullptr;
-  fts_psort_t *psort_info = nullptr;
-  fts_psort_t *merge_info = nullptr;
-  int64_t sig_count = 0;
-  bool fts_psort_initiated = false;
-  DBUG_TRACE;
-
-  ut_ad(!srv_read_only_mode);
-  ut_ad((old_table == new_table) == !col_map);
-  ut_ad(!add_cols || col_map);
-
-  stage->begin_phase_read_pk(
-      skip_pk_sort && new_table != old_table ? n_indexes - 1 : n_indexes);
-
-  /* Allocate memory for merge file data structure and initialize
-  fields */
-
-  ut_allocator<row_merge_block_t> alloc(mem_key_row_merge_sort);
-
-  /* This will allocate "3 * srv_sort_buf_size" elements of type
-  row_merge_block_t. The latter is defined as byte. */
-  block = alloc.allocate_large(3 * srv_sort_buf_size);
-
-  if (block == nullptr) {
-    return DB_OUT_OF_MEMORY;
-  }
-
-  trx_start_if_not_started_xa(trx, true);
-
-  /* Check if we need a flush observer to flush dirty pages.
-  Since we disable redo logging in bulk load, so we should flush
-  dirty pages before online log apply, because online log apply enables
-  redo logging(we can do further optimization here).
-  1. online add index: flush dirty pages right before row_log_apply().
-  2. table rebuild: flush dirty pages before row_log_table_apply().
-
-  we use bulk load to create all types of indexes except spatial index,
-  for which redo logging is enabled. If we create only spatial indexes,
-  we don't need to flush dirty pages at all. */
-  bool need_flush_observer = (old_table != new_table);
-
-  for (i = 0; i < n_indexes; i++) {
-    if (!dict_index_is_spatial(indexes[i])) {
-      need_flush_observer = true;
-    }
-  }
-
-  FlushObserver *flush_observer = nullptr;
-  if (need_flush_observer) {
-    flush_observer = UT_NEW_NOKEY(FlushObserver(new_table->space, trx, stage));
-
-    trx_set_flush_observer(trx, flush_observer);
-  }
-
-  merge_files = static_cast<merge_file_t *>(
-      ut_malloc_nokey(n_indexes * sizeof *merge_files));
-
-  /* Initialize all the merge file descriptors, so that we
-  don't call row_merge_file_destroy() on uninitialized
-  merge file descriptor */
-
-  for (i = 0; i < n_indexes; i++) {
-    merge_files[i].fd = -1;
-  }
-
-  for (i = 0; i < n_indexes; i++) {
-    if (indexes[i]->type & DICT_FTS) {
-      ibool opt_doc_id_size = FALSE;
-
-      /* To build FTS index, we would need to extract
-      doc's word, Doc ID, and word's position, so
-      we need to build a "fts sort index" indexing
-      on above three 'fields' */
-      fts_sort_idx = row_merge_create_fts_sort_index(indexes[i], old_table,
-                                                     &opt_doc_id_size);
-
-      row_merge_dup_t *dup =
-          static_cast<row_merge_dup_t *>(ut_malloc_nokey(sizeof *dup));
-      dup->index = fts_sort_idx;
-      dup->table = table;
-      dup->col_map = col_map;
-      dup->n_dup = 0;
-
-      error =
-          row_fts_psort_info_init(trx, dup, old_table, new_table,
-                                  opt_doc_id_size, &psort_info, &merge_info);
-
-      if (error != DB_SUCCESS) {
-        goto func_exit;
-      }
-
-      /* We need to ensure that we free the resources
-      allocated */
-      fts_psort_initiated = true;
-    }
-  }
-
-  /* Reset the MySQL row buffer that is used when reporting duplicate keys. */
-  innobase_rec_reset(table);
-
-  /* Read clustered index of the table and create files for
-  secondary index entries for merge sort */
-  error = row_merge_read_clustered_index(
-      trx, table, old_table, new_table, online, indexes, fts_sort_idx,
-      psort_info, merge_files, key_numbers, n_indexes, add_cols, add_v, col_map,
-      add_autoinc, sequence, block, skip_pk_sort, &tmpfd, stage, eval_table);
-
-  stage->end_phase_read_pk();
-
-  DBUG_EXECUTE_IF("force_virtual_col_build_fail",
-                  error = DB_COMPUTE_VALUE_FAILED;
-                  goto func_exit;);
-
-  if (error != DB_SUCCESS) {
-    goto func_exit;
-  }
-
-  DEBUG_SYNC_C("row_merge_after_scan");
-
-  /* Now we have files containing index entries ready for
-  sorting and inserting. */
-
-  for (i = 0; i < n_indexes; i++) {
-    dict_index_t *sort_idx = indexes[i];
-
-    if (dict_index_is_spatial(sort_idx)) {
-      continue;
-    }
-
-    if (indexes[i]->type & DICT_FTS) {
-      os_event_t fts_parallel_merge_event;
-
-      sort_idx = fts_sort_idx;
-
-      fts_parallel_merge_event = merge_info[0].psort_common->merge_event;
-
-      if (FTS_PLL_MERGE) {
-        ulint trial_count = 0;
-        bool all_exit = false;
-
-        os_event_reset(fts_parallel_merge_event);
-        row_fts_start_parallel_merge(merge_info);
-      wait_again:
-        os_event_wait_time_low(fts_parallel_merge_event, 1000000, sig_count);
-
-        for (j = 0; j < FTS_NUM_AUX_INDEX; j++) {
-          if (merge_info[j].child_status != FTS_CHILD_COMPLETE &&
-              merge_info[j].child_status != FTS_CHILD_EXITING) {
-            sig_count = os_event_reset(fts_parallel_merge_event);
-
-            goto wait_again;
-          }
-        }
-
-        /* Now all children should complete, wait
-        a bit until they all finish using event */
-        while (!all_exit && trial_count < 10000) {
-          all_exit = true;
-
-          for (j = 0; j < FTS_NUM_AUX_INDEX; j++) {
-            if (merge_info[j].child_status != FTS_CHILD_EXITING) {
-              all_exit = false;
-              std::this_thread::sleep_for(std::chrono::milliseconds(1));
-              break;
-            }
-          }
-          trial_count++;
-        }
-
-        if (!all_exit) {
-          ib::error(ER_IB_MSG_968) << "Not all child merge"
-                                      " threads exited when creating"
-                                      " FTS index '"
-                                   << indexes[i]->name << "'";
-        }
-      } else {
-        /* This cannot report duplicates; an
-        assertion would fail in that case. */
-        error = row_fts_merge_insert(sort_idx, new_table, psort_info, 0);
-      }
-
-#ifdef FTS_INTERNAL_DIAG_PRINT
-      DEBUG_FTS_SORT_PRINT("FTS_SORT: Complete Insert\n");
-#endif
-    } else if (merge_files[i].fd >= 0) {
-      row_merge_dup_t dup = {sort_idx, table, col_map, 0};
-
-      error = row_merge_sort(trx, &dup, &merge_files[i], block, &tmpfd, stage);
-
-      if (error == DB_SUCCESS) {
-        BtrBulk btr_bulk(sort_idx, trx->id, flush_observer);
-        error = btr_bulk.init();
-        if (error == DB_SUCCESS) {
-          error = row_merge_insert_index_tuples(trx, sort_idx, old_table,
-                                                merge_files[i].fd, block,
-                                                nullptr, &btr_bulk, stage);
-
-          error = btr_bulk.finish(error);
-        }
-      }
-    }
-
-    /* Close the temporary file to free up space. */
-    row_merge_file_destroy(&merge_files[i]);
-
-    if (indexes[i]->type & DICT_FTS) {
-      row_fts_psort_info_destroy(psort_info, merge_info);
-      fts_psort_initiated = false;
-    } else if (error != DB_SUCCESS || !online) {
-      /* Do not apply any online log. */
-    } else if (old_table != new_table) {
-      ut_ad(!sort_idx->online_log);
-      ut_ad(sort_idx->online_status == ONLINE_INDEX_COMPLETE);
-    } else {
-      ut_ad(need_flush_observer);
-
-      flush_observer->flush();
-      row_merge_write_redo(indexes[i]);
-
-      DEBUG_SYNC_C("row_log_apply_before");
-      error = row_log_apply(trx, sort_idx, table, stage);
-      DEBUG_SYNC_C("row_log_apply_after");
-    }
-
-    if (error != DB_SUCCESS) {
-      trx->error_key_num = key_numbers[i];
-      goto func_exit;
-    }
-
-    if (indexes[i]->type & DICT_FTS && fts_enable_diag_print) {
-      ib::info(ER_IB_MSG_969)
-          << "Finished building full-text index " << indexes[i]->name;
-    }
-  }
-
-func_exit:
-  DBUG_EXECUTE_IF("ib_build_indexes_too_many_concurrent_trxs",
-                  error = DB_TOO_MANY_CONCURRENT_TRXS;
-                  trx->error_state = error;);
-
-  if (fts_psort_initiated) {
-    /* Clean up FTS psort related resource */
-    row_fts_psort_info_destroy(psort_info, merge_info);
-    fts_psort_initiated = false;
-  }
-
-  row_merge_file_destroy_low(tmpfd);
-
-  for (i = 0; i < n_indexes; i++) {
-    row_merge_file_destroy(&merge_files[i]);
-  }
-
-  if (fts_sort_idx) {
-    dict_mem_index_free(fts_sort_idx);
-  }
-
-  ut_free(merge_files);
-
-  alloc.deallocate_large(block);
-
-  DICT_TF2_FLAG_UNSET(new_table, DICT_TF2_FTS_ADD_DOC_ID);
-
-  if (online && old_table == new_table && error != DB_SUCCESS) {
-    /* On error, flag all online secondary index creation
-    as aborted. */
-    for (i = 0; i < n_indexes; i++) {
-      ut_ad(!(indexes[i]->type & DICT_FTS));
-      ut_ad(!indexes[i]->is_committed());
-      ut_ad(!indexes[i]->is_clustered());
-
-      /* Completed indexes should be dropped as
-      well, and indexes whose creation was aborted
-      should be dropped from the persistent
-      storage. However, at this point we can only
-      set some flags in the not-yet-published
-      indexes. These indexes will be dropped later
-      in row_merge_drop_indexes(), called by
-      rollback_inplace_alter_table(). */
-
-      switch (dict_index_get_online_status(indexes[i])) {
-        case ONLINE_INDEX_COMPLETE:
-          break;
-        case ONLINE_INDEX_CREATION:
-          rw_lock_x_lock(dict_index_get_lock(indexes[i]));
-          row_log_abort_sec(indexes[i]);
-          indexes[i]->type |= DICT_CORRUPT;
-          rw_lock_x_unlock(dict_index_get_lock(indexes[i]));
-          new_table->drop_aborted = TRUE;
-          /* fall through */
-        case ONLINE_INDEX_ABORTED_DROPPED:
-        case ONLINE_INDEX_ABORTED:
-          break;
-      }
-    }
-  }
-
-  DBUG_EXECUTE_IF("ib_index_crash_after_bulk_load", DBUG_SUICIDE(););
-
-  if (flush_observer != nullptr) {
-    ut_ad(need_flush_observer);
-
-    DBUG_EXECUTE_IF("ib_index_build_fail_before_flush", error = DB_FAIL;);
-
-    if (error != DB_SUCCESS) {
-      flush_observer->interrupted();
-    }
-
-    flush_observer->flush();
-
-    UT_DELETE(flush_observer);
-
-    if (trx_is_interrupted(trx)) {
-      error = DB_INTERRUPTED;
-    }
-
-    if (error == DB_SUCCESS && old_table != new_table) {
-      for (const dict_index_t *index = new_table->first_index();
-           index != nullptr; index = index->next()) {
-        row_merge_write_redo(index);
-      }
-    }
-  }
-
-  return error;
-}
diff -Nru mysql-8.0-8.0.26/storage/innobase/row/row0mysql.cc mysql-8.0-8.0.27/storage/innobase/row/row0mysql.cc
--- mysql-8.0-8.0.26/storage/innobase/row/row0mysql.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/row/row0mysql.cc	2021-09-28 11:46:34.000000000 +0000
@@ -43,6 +43,7 @@
 #include <vector>
 
 #include "btr0sea.h"
+#include "ddl0ddl.h"
 #include "dict0boot.h"
 #include "dict0crea.h"
 #include "dict0dd.h"
@@ -66,7 +67,6 @@
 #include "row0ext.h"
 #include "row0import.h"
 #include "row0ins.h"
-#include "row0merge.h"
 #include "row0mysql.h"
 #include "row0pread.h"
 #include "row0row.h"
@@ -670,7 +670,7 @@
         trx_rollback_to_savepoint(trx, nullptr);
         break;
       }
-    /* fall through */
+      [[fallthrough]];
     case DB_DUPLICATE_KEY:
     case DB_FOREIGN_DUPLICATE_KEY:
     case DB_TOO_BIG_RECORD:
@@ -725,7 +725,7 @@
       break;
 
     case DB_MUST_GET_MORE_FILE_SPACE:
-      ib::fatal(ER_IB_MSG_972)
+      ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_972)
           << "The database cannot continue operation because"
              " of lack of space. You must add a new data file"
              " to my.cnf and restart the database.";
@@ -750,7 +750,7 @@
              " foreign constraints and try again";
       break;
     default:
-      ib::fatal(ER_IB_MSG_975)
+      ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_975)
           << "Unknown error code " << err << ": " << ut_strerr(err);
   }
 
@@ -941,7 +941,7 @@
   btr_pcur_reset(prebuilt->pcur);
   btr_pcur_reset(prebuilt->clust_pcur);
 
-  ut_free(prebuilt->mysql_template);
+  ut::free(prebuilt->mysql_template);
 
   if (prebuilt->ins_graph) {
     que_graph_free_recursive(prebuilt->ins_graph);
@@ -981,7 +981,7 @@
       ptr += 4;
     }
 
-    ut_free(base);
+    ut::free(base);
   }
 
   if (prebuilt->rtr_info) {
@@ -1955,7 +1955,7 @@
   return (DB_SUCCESS);
 }
 
-typedef std::vector<btr_pcur_t, ut_allocator<btr_pcur_t>> cursors_t;
+typedef std::vector<btr_pcur_t, ut::allocator<btr_pcur_t>> cursors_t;
 
 /** Delete row from table (corresponding entries from all the indexes).
 Function will maintain cursor to the entries to invoke explicity rollback
@@ -3040,8 +3040,8 @@
   trx->op_info = "";
   trx->dict_operation = TRX_DICT_OP_NONE;
 
-  ut_free(table_name);
-  ut_free(index_name);
+  ut::free(table_name);
+  ut::free(index_name);
 
   return (err);
 }
@@ -3183,7 +3183,7 @@
     if (thd != nullptr) {
       /* All these kind of table should not be
       intrinsic ones, so this is no need later. */
-      UT_DELETE(thd_to_innodb_session(thd));
+      ut::delete_(thd_to_innodb_session(thd));
       thd_to_innodb_session(thd) = nullptr;
     }
 
@@ -3225,7 +3225,7 @@
     if (thd != nullptr) {
       /* All these kind of table should not be
       intrinsic ones, so this is no need later. */
-      UT_DELETE(thd_to_innodb_session(thd));
+      ut::delete_(thd_to_innodb_session(thd));
       thd_to_innodb_session(thd) = nullptr;
     }
 
@@ -3248,9 +3248,9 @@
                           << ut_get_name(nullptr, drop->table_name)
                           << " in background drop queue.",
 
-      ut_free(drop->table_name);
+      ut::free(drop->table_name);
 
-  ut_free(drop);
+  ut::free(drop);
 
   mutex_exit(&row_drop_list_mutex);
 
@@ -3285,7 +3285,7 @@
   }
 
   auto drop = static_cast<row_mysql_drop_t *>(
-      ut_malloc_nokey(sizeof(row_mysql_drop_t)));
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sizeof(row_mysql_drop_t)));
 
   drop->table_name = mem_strdup(name);
 
@@ -4128,7 +4128,7 @@
 
 funct_exit:
 
-  ut_free(filepath);
+  ut::free(filepath);
 
   if (locked_dictionary) {
     row_mysql_unlock_data_dictionary(trx);
@@ -4156,8 +4156,7 @@
   return err;
 }
 
-MY_ATTRIBUTE((warn_unused_result))
-bool row_is_mysql_tmp_table_name(const char *name) {
+[[nodiscard]] bool row_is_mysql_tmp_table_name(const char *name) {
   return (strstr(name, "/" TEMP_FILE_PREFIX) != nullptr);
   /* return(strstr(name, "/@0023sql") != NULL); */
 }
@@ -4375,67 +4374,47 @@
   return (err);
 }
 
-/** Read the total number of records in a consistent view.
-@param[in,out]  trx             Covering transaction.
-@param[in]  indexes             Indexes to scan.
-@param[in]  max_threads         Maximum number of threads to use.
-@param[out] n_rows              Number of rows seen.
-@return DB_SUCCESS or error code. */
 dberr_t row_mysql_parallel_select_count_star(
-    trx_t *trx, std::vector<dict_index_t *> &indexes, size_t max_threads,
+    trx_t *trx, std::vector<dict_index_t *> &indexes, size_t n_threads,
     ulint *n_rows) {
+  ut_a(n_threads > 1);
   ut_a(!indexes.empty());
   using Shards = Counter::Shards<Parallel_reader::MAX_THREADS>;
 
   Shards n_recs;
   Counter::clear(n_recs);
 
-  struct alignas(ut::INNODB_CACHE_LINE_SIZE) Check_interrupt {
-    size_t m_count{};
-    const buf_block_t *m_prev_block{};
-  };
-
-  Check_interrupt checker[Parallel_reader::MAX_THREADS] = {};
-
-  Parallel_reader reader(max_threads);
-
   const Parallel_reader::Scan_range FULL_SCAN;
 
-  // clang-format off
-  bool success{};
+  Parallel_reader reader(n_threads);
+
+  dberr_t err{DB_SUCCESS};
 
   for (auto index : indexes) {
     Parallel_reader::Config config(FULL_SCAN, index);
 
-    success =
-      reader.add_scan(trx, config, [&](const Parallel_reader::Ctx *ctx) {
+    err = reader.add_scan(trx, config, [&](const Parallel_reader::Ctx *ctx) {
       Counter::inc(n_recs, ctx->thread_id());
-
-      auto &check = checker[ctx->thread_id()];
-
-      if (ctx->m_block != check.m_prev_block) {
-        check.m_prev_block = ctx->m_block;
-
-        ++check.m_count;
-      }
-      return (DB_SUCCESS);
+      return DB_SUCCESS;
     });
 
-    if (!success) {
+    if (err != DB_SUCCESS) {
       break;
     }
   }
-  // clang-format on
 
-  auto err = success ? reader.run() : DB_ERROR;
+  if (err == DB_SUCCESS) {
+    err = reader.run(n_threads);
+  }
 
   if (err == DB_OUT_OF_RESOURCES) {
+    ut_a(n_threads > 0);
+
     ib::warn(ER_INNODB_OUT_OF_RESOURCES)
         << "Resource not available to create threads for parallel scan."
         << " Falling back to single thread mode.";
 
-    reader.fallback_to_single_threaded_mode();
-    err = reader.run();
+    err = reader.run(0);
   }
 
   if (err == DB_SUCCESS) {
@@ -4446,17 +4425,12 @@
     });
   }
 
-  return (err);
+  return err;
 }
 
-/** Scan the rows in parallel.
-@param[in,out] trx              Transaction covering the scan.
-@param[in] index                (Cluster) Index to scan.
-@param[in] max_threads          Maximum threads to use for the scan.
-@param[out] n_rows              Number of rows seen.
-@return DB_SUCCESS or error code. */
 static dberr_t parallel_check_table(trx_t *trx, dict_index_t *index,
-                                    size_t max_threads, ulint *n_rows) {
+                                    size_t n_threads, ulint *n_rows) {
+  ut_a(n_threads > 1);
   using Shards = Counter::Shards<Parallel_reader::MAX_THREADS>;
 
   Shards n_recs{};
@@ -4467,50 +4441,30 @@
   Counter::clear(n_recs);
   Counter::clear(n_corrupt);
 
-  using Tuples = std::vector<dtuple_t *, ut_allocator<dtuple_t *>>;
-  using Heaps = std::vector<mem_heap_t *, ut_allocator<mem_heap_t *>>;
-  using Blocks =
-      std::vector<const buf_block_t *, ut_allocator<const buf_block_t *>>;
+  using Tuples = std::vector<dtuple_t *, ut::allocator<dtuple_t *>>;
+  using Heaps = std::vector<mem_heap_t *, ut::allocator<mem_heap_t *>>;
+  using Buf_block_allocator = ut::allocator<const buf_block_t *>;
+  using Blocks = std::vector<const buf_block_t *, Buf_block_allocator>;
 
+  Heaps heaps;
   Tuples prev_tuples;
   Blocks prev_blocks;
 
-  Heaps heaps;
-
-  for (size_t i = 0; i < max_threads; ++i) {
-    heaps.push_back(mem_heap_create(100));
+  for (size_t i = 0; i < n_threads; ++i) {
+    heaps.push_back(mem_heap_create(4096));
   }
 
-  /* Check for transaction interrupted every 1000 rows. */
-  size_t counter = 1000;
-
-  Parallel_reader reader(max_threads);
-
+  Parallel_reader reader(n_threads);
   Parallel_reader::Scan_range full_scan;
-
   Parallel_reader::Config config(full_scan, index);
 
-  // clang-format off
-  dberr_t err = reader.add_scan(
-    trx, config, [&](const Parallel_reader::Ctx* ctx) {
-
+  auto err = reader.add_scan(trx, config, [&](const Parallel_reader::Ctx *ctx) {
     const auto rec = ctx->m_rec;
     const auto block = ctx->m_block;
     const auto id = ctx->thread_id();
 
     Counter::inc(n_recs, id);
 
-    /* Only check the THD state for the first thread. */
-    if (id == 0) {
-      --counter;
-
-      if (counter == 0 && trx_is_interrupted(trx)) {
-        return (DB_INTERRUPTED);
-      }
-
-      counter = 1000;
-    }
-
     auto heap = heaps[id];
 
     if (ctx->m_start) {
@@ -4547,9 +4501,9 @@
         Counter::inc(n_corrupt, id);
 
         ib::error(ER_IB_ERR_INDEX_RECORDS_WRONG_ORDER)
-          << "Index records in a wrong order in " << index->name
-          << " of table " << index->table->name << ": " << *prev_tuple
-          << ", " << rec_offsets_print(rec, offsets);
+            << "Index records in a wrong order in " << index->name
+            << " of table " << index->table->name << ": " << *prev_tuple << ", "
+            << rec_offsets_print(rec, offsets);
         /* Continue reading */
       } else if (dict_index_is_unique(index) && !contains_null &&
                  matched_fields >=
@@ -4557,9 +4511,9 @@
         Counter::inc(n_dups, id);
 
         ib::error(ER_IB_ERR_INDEX_DUPLICATE_KEY)
-          << "Duplicate key in " << index->name << " of table "
-          << index->table->name << ": " << *prev_tuple << ", "
-          << rec_offsets_print(rec, offsets);
+            << "Duplicate key in " << index->name << " of table "
+            << index->table->name << ": " << *prev_tuple << ", "
+            << rec_offsets_print(rec, offsets);
       }
     }
 
@@ -4572,25 +4526,23 @@
 
     prev_tuples[id] = row_rec_to_index_entry(rec, index, offsets, heap);
 
-    return (DB_SUCCESS);
+    return DB_SUCCESS;
   });
 
-  // clang-format off
-
   if (err == DB_SUCCESS) {
-    prev_tuples.resize(max_threads);
-    prev_blocks.resize(max_threads);
+    prev_tuples.resize(n_threads);
+    prev_blocks.resize(n_threads);
 
-    err = reader.run();
+    err = reader.run(n_threads);
   }
 
   if (err == DB_OUT_OF_RESOURCES) {
+    ut_a(n_threads > 0);
     ib::warn(ER_INNODB_OUT_OF_RESOURCES)
-      << "Resource not available to create threads for parallel scan."
-      << " Falling back to single thread mode.";
+        << "Resource not available to create threads for parallel scan."
+        << " Falling back to single thread mode.";
 
-    reader.fallback_to_single_threaded_mode();
-    err = reader.run();
+    err = reader.run(0);
   }
 
   for (auto heap : heaps) {
@@ -4599,22 +4551,23 @@
 
   if (Counter::total(n_dups) > 0) {
     ib::error(ER_IB_ERR_FOUND_N_DUPLICATE_KEYS)
-      << "Found " << Counter::total(n_dups) << " duplicate rows in "
-      << index->name;
+        << "Found " << Counter::total(n_dups) << " duplicate rows in "
+        << index->name;
 
     err = DB_DUPLICATE_KEY;
   }
 
   if (Counter::total(n_corrupt) > 0) {
-    ib::error(ER_IB_ERR_FOUND_N_RECORDS_WRONG_ORDER) << "Found " << Counter::total(n_corrupt)
-                << " rows in the wrong order in " << index->name;
+    ib::error(ER_IB_ERR_FOUND_N_RECORDS_WRONG_ORDER)
+        << "Found " << Counter::total(n_corrupt)
+        << " rows in the wrong order in " << index->name;
 
     err = DB_INDEX_CORRUPT;
   }
 
   *n_rows = Counter::total(n_recs);
 
-  return (err);
+  return err;
 }
 
 dberr_t row_scan_index_for_mysql(row_prebuilt_t *prebuilt, dict_index_t *index,
@@ -4646,10 +4599,9 @@
       prebuilt->select_lock_type == LOCK_NONE && index->is_clustered() &&
       (check_keys || prebuilt->trx->mysql_n_tables_locked == 0) &&
       !prebuilt->ins_sel_stmt) {
+    auto n_threads = Parallel_reader::available_threads(max_threads, false);
 
-    max_threads = Parallel_reader::available_threads(max_threads);
-
-    if (max_threads > 0) {
+    if (n_threads > 1) {
       /* No INSERT INTO  ... SELECT  and non-locking selects only. */
       trx_start_if_not_started_xa(prebuilt->trx, false);
 
@@ -4659,16 +4611,19 @@
 
       ut_a(prebuilt->table == index->table);
 
-      std::vector<dict_index_t*> indexes;
+      std::vector<dict_index_t *> indexes;
 
       indexes.push_back(index);
 
       if (!check_keys) {
-        return (row_mysql_parallel_select_count_star(trx, indexes, max_threads,
-                                                     n_rows));
+        return row_mysql_parallel_select_count_star(trx, indexes, n_threads,
+                                                    n_rows);
       }
 
-      return (parallel_check_table(trx, index, max_threads, n_rows));
+      return parallel_check_table(trx, index, n_threads, n_rows);
+    } else if (n_threads == 1) {
+      /* If there is a single thread available then we do a sync scan. */
+      Parallel_reader::release_threads(n_threads);
     }
   }
 
@@ -4687,7 +4642,8 @@
 
   ulint cnt = 1000;
   ulint bufsize = ut_max(UNIV_PAGE_SIZE, prebuilt->mysql_row_len);
-  auto buf = static_cast<byte *>(ut_malloc_nokey(bufsize));
+  auto buf = static_cast<byte *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, bufsize));
   auto heap = mem_heap_create(100);
 
   auto ret = row_search_for_mysql(buf, PAGE_CUR_G, prebuilt, 0, 0);
@@ -4717,11 +4673,12 @@
                                   " table "
                                << index->table->name << " returned " << ret;
     }
-    /* fall through (this error is ignored by CHECK TABLE) */
+      /* fall through (this error is ignored by CHECK TABLE) */
+      [[fallthrough]];
     case DB_END_OF_INDEX:
       ret = DB_SUCCESS;
     func_exit:
-      ut_free(buf);
+      ut::free(buf);
       mem_heap_free(heap);
 
       return (ret);
@@ -4857,8 +4814,8 @@
 
   /* Skip concurrency ticket while implicitly updating GTID table. This is to
   avoid deadlock otherwise possible with low innodb_thread_concurrency.
-  Session: RESET MASTER -> FLUSH LOGS -> get innodb ticket -> wait for GTID flush
-  GTID Background: Write to GTID table -> wait for innodb ticket. */
+  Session: RESET MASTER -> FLUSH LOGS -> get innodb ticket -> wait for GTID
+  flush GTID Background: Write to GTID table -> wait for innodb ticket. */
   auto thd = trx->mysql_thd;
   if (thd == nullptr) {
     thd = current_thd;
diff -Nru mysql-8.0-8.0.26/storage/innobase/row/row0pread-adapter.cc mysql-8.0-8.0.27/storage/innobase/row/row0pread-adapter.cc
--- mysql-8.0-8.0.26/storage/innobase/row/row0pread-adapter.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/row/row0pread-adapter.cc	2021-09-28 11:46:34.000000000 +0000
@@ -37,7 +37,7 @@
 
 Parallel_reader_adapter::Parallel_reader_adapter(size_t max_threads,
                                                  ulint rowlen)
-    : m_parallel_reader(max_threads, max_threads) {
+    : m_parallel_reader(max_threads) {
   m_batch_size = ADAPTER_SEND_BUFFER_SIZE / rowlen;
 }
 
@@ -77,12 +77,20 @@
 
   m_parallel_reader.set_start_callback(
       [=](Parallel_reader::Thread_ctx *reader_thread_ctx) {
-        return init(reader_thread_ctx, prebuilt);
+        if (reader_thread_ctx->get_state() == Parallel_reader::State::THREAD) {
+          return init(reader_thread_ctx, prebuilt);
+        } else {
+          return DB_SUCCESS;
+        }
       });
 
   m_parallel_reader.set_finish_callback(
       [=](Parallel_reader::Thread_ctx *reader_thread_ctx) {
-        return end(reader_thread_ctx);
+        if (reader_thread_ctx->get_state() == Parallel_reader::State::THREAD) {
+          return end(reader_thread_ctx);
+        } else {
+          return DB_SUCCESS;
+        }
       });
 
   ut_a(m_prebuilt == nullptr);
@@ -98,12 +106,13 @@
 
   m_parallel_reader.set_n_threads(m_parallel_reader.max_threads());
 
-  return m_parallel_reader.run();
+  return m_parallel_reader.run(m_parallel_reader.max_threads());
 }
 
 dberr_t Parallel_reader_adapter::init(
     Parallel_reader::Thread_ctx *reader_thread_ctx, row_prebuilt_t *prebuilt) {
-  auto thread_ctx = UT_NEW(Thread_ctx(), mem_key_archive);
+  auto thread_ctx =
+      ut::new_withkey<Thread_ctx>(ut::make_psi_memory_key(mem_key_archive));
 
   if (thread_ctx == nullptr) {
     return DB_OUT_OF_MEMORY;
@@ -175,11 +184,7 @@
 
     /* Start of a new range, send what we have buffered. */
     if ((reader_ctx->m_start && n_pending > 0) || is_buffer_full(ctx)) {
-      auto part_id = reader_ctx->m_start
-                         ? reader_thread_ctx->m_prev_partition_id
-                         : reader_ctx->partition_id();
-
-      err = send_batch(reader_thread_ctx, part_id, n_pending);
+      err = send_batch(reader_thread_ctx, ctx->m_partition_id, n_pending);
 
       if (err != DB_SUCCESS) {
         return (err);
@@ -209,7 +214,15 @@
                               nullptr, true, reader_ctx->index(),
                               reader_ctx->index(), offsets, false, nullptr,
                               blob_heap)) {
-    ++ctx->m_n_read;
+    /* If there is any pending records, then we should not overwrite the
+    partition ID with a different one. */
+    if (pending(ctx) && ctx->m_partition_id != reader_ctx->partition_id()) {
+      ut_ad(false);
+      err = DB_ERROR;
+    } else {
+      ++ctx->m_n_read;
+      ctx->m_partition_id = reader_ctx->partition_id();
+    }
 
     if (m_parallel_reader.is_error_set()) {
       /* Simply skip sending the records to RAPID in case of an error in the
@@ -244,15 +257,15 @@
     Send them now. */
     size_t n_pending = pending(thread_ctx);
 
-    err = (n_pending != 0)
-              ? send_batch(reader_thread_ctx,
-                           reader_thread_ctx->m_prev_partition_id, n_pending)
-              : DB_SUCCESS;
+    if (n_pending != 0) {
+      err =
+          send_batch(reader_thread_ctx, thread_ctx->m_partition_id, n_pending);
+    }
   }
 
   m_end_fn(m_thread_ctxs[thread_id]);
 
-  UT_DELETE(thread_ctx);
+  ut::delete_(thread_ctx);
   reader_thread_ctx->set_callback_ctx<Thread_ctx>(nullptr);
 
   return (err);
diff -Nru mysql-8.0-8.0.26/storage/innobase/row/row0pread.cc mysql-8.0-8.0.27/storage/innobase/row/row0pread.cc
--- mysql-8.0-8.0.26/storage/innobase/row/row0pread.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/row/row0pread.cc	2021-09-28 11:46:34.000000000 +0000
@@ -89,24 +89,21 @@
 Parallel_reader::~Parallel_reader() {
   mutex_destroy(&m_mutex);
   os_event_destroy(m_event);
-
-  if (!m_single_threaded_mode) {
+  if (!m_sync) {
     release_unused_threads(m_n_threads);
   }
-
   for (auto thread_ctx : m_thread_ctxs) {
     if (thread_ctx != nullptr) {
-      UT_DELETE(thread_ctx);
+      ut::delete_(thread_ctx);
     }
   }
 }
 
 size_t Parallel_reader::available_threads(size_t n_required,
                                           bool use_reserved) {
-  const auto RELAXED = std::memory_order_relaxed;
-  auto active = s_active_threads.fetch_add(n_required, RELAXED);
-
-  size_t max_threads = MAX_THREADS;
+  auto max_threads = MAX_THREADS;
+  constexpr auto SEQ_CST = std::memory_order_seq_cst;
+  auto active = s_active_threads.fetch_add(n_required, SEQ_CST);
 
   if (use_reserved) {
     max_threads += MAX_RESERVED_THREADS;
@@ -116,16 +113,19 @@
     const auto available = max_threads - active;
 
     if (n_required <= available) {
-      return (n_required);
+      return n_required;
     } else {
-      s_active_threads.fetch_sub(n_required - available, RELAXED);
-      return (available);
+      const auto release = n_required - available;
+      const auto o = s_active_threads.fetch_sub(release, SEQ_CST);
+      ut_a(o >= release);
+      return available;
     }
   }
 
-  s_active_threads.fetch_sub(n_required, RELAXED);
+  const auto o = s_active_threads.fetch_sub(n_required, SEQ_CST);
+  ut_a(o >= n_required);
 
-  return (0);
+  return 0;
 }
 
 void Parallel_reader::Scan_ctx::index_s_lock() {
@@ -184,15 +184,11 @@
   return err;
 }
 
-Parallel_reader::Parallel_reader(size_t max_threads, bool sync)
-    : Parallel_reader(max_threads, 0, sync) {}
-
-Parallel_reader::Parallel_reader(size_t max_threads, size_t n_threads,
-                                 bool sync)
+Parallel_reader::Parallel_reader(size_t max_threads)
     : m_max_threads(max_threads),
-      m_n_threads(n_threads),
+      m_n_threads(max_threads),
       m_ctxs(),
-      m_sync(sync) {
+      m_sync(max_threads == 0) {
   m_n_completed = 0;
 
   mutex_create(LATCH_ID_PARALLEL_READ, &m_mutex);
@@ -211,39 +207,99 @@
 class PCursor {
  public:
   /** Constructor.
-  @param[in,out]  pcur  Persistent cursor in use.
-  @param[in]      mtr   Mini-transaction used by the persistent cursor.
-  @param[in]      read_level  read level where the block should be present. */
+  @param[in,out] pcur           Persistent cursor in use.
+  @param[in] mtr                Mini-transaction used by the persistent cursor.
+  @param[in] read_level         Read level where the block should be present. */
   PCursor(btr_pcur_t *pcur, mtr_t *mtr, size_t read_level)
       : m_mtr(mtr), m_pcur(pcur), m_read_level(read_level) {}
 
-  /** Check if there are threads waiting on the index latch. Yield the latch
-  so that other threads can progress. */
-  void yield();
+  /** Create a savepoint and commit the mini-transaction.*/
+  void savepoint() noexcept;
+
+  /** Resume from savepoint. */
+  void resume() noexcept;
 
   /** Move to the next block.
-  @param[in]  index  Index being traversed.
+  @param[in]  index             Index being traversed.
   @return DB_SUCCESS or error code. */
-  dberr_t move_to_next_block(dict_index_t *index)
-      MY_ATTRIBUTE((warn_unused_result));
+  [[nodiscard]] dberr_t move_to_next_block(dict_index_t *index);
 
   /** Restore the cursor position. */
-  void restore_position() {
-    auto relative = m_pcur->m_rel_pos;
+  void restore_position() noexcept {
+    constexpr auto MODE = BTR_SEARCH_LEAF;
+    const auto relative = m_pcur->m_rel_pos;
+    auto equal = m_pcur->restore_position(MODE, m_mtr, __FILE__, __LINE__);
+
+#ifdef UNIV_DEBUG
+    if (m_pcur->m_pos_state == BTR_PCUR_IS_POSITIONED_OPTIMISTIC) {
+      ut_ad(m_pcur->m_rel_pos == BTR_PCUR_BEFORE ||
+            m_pcur->m_rel_pos == BTR_PCUR_AFTER);
+    } else {
+      ut_ad(m_pcur->m_pos_state == BTR_PCUR_IS_POSITIONED);
+      ut_ad((m_pcur->m_rel_pos == BTR_PCUR_ON) == m_pcur->is_on_user_rec());
+    }
+#endif /* UNIV_DEBUG */
 
-    auto equal =
-        m_pcur->restore_position(BTR_SEARCH_LEAF, m_mtr, __FILE__, __LINE__);
+    switch (relative) {
+      case BTR_PCUR_ON:
+        if (!equal) {
+          page_cur_move_to_next(m_pcur->get_page_cur());
+        }
+        break;
 
-    if (relative == BTR_PCUR_ON) {
-      if (!equal) {
-        page_cur_move_to_next(m_pcur->get_page_cur());
-      }
-    } else {
-      ut_ad(relative == BTR_PCUR_AFTER ||
-            relative == BTR_PCUR_AFTER_LAST_IN_TREE);
+      case BTR_PCUR_UNSET:
+      case BTR_PCUR_BEFORE_FIRST_IN_TREE:
+        ut_error;
+        break;
+
+      case BTR_PCUR_AFTER:
+      case BTR_PCUR_AFTER_LAST_IN_TREE:
+        break;
+
+      case BTR_PCUR_BEFORE:
+        /* For non-optimistic restoration:
+        The position is now set to the record before pcur->old_rec.
+
+        For optimistic restoration:
+        The position also needs to take the previous search_mode into
+        consideration. */
+        switch (m_pcur->m_pos_state) {
+          case BTR_PCUR_IS_POSITIONED_OPTIMISTIC:
+            m_pcur->m_pos_state = BTR_PCUR_IS_POSITIONED;
+            /* The cursor always moves "up" ie. in ascending order. */
+            break;
+
+          case BTR_PCUR_IS_POSITIONED:
+            if (m_pcur->is_on_user_rec()) {
+              m_pcur->move_to_next(m_mtr);
+            }
+            break;
+
+          case BTR_PCUR_NOT_POSITIONED:
+          case BTR_PCUR_WAS_POSITIONED:
+            ut_error;
+        }
+        break;
     }
   }
 
+  /** @return the current page cursor. */
+  [[nodiscard]] page_cur_t *get_page_cursor() noexcept {
+    return m_pcur->get_page_cur();
+  }
+
+  /** Restore from a saved position.
+  @return DB_SUCCESS or error code. */
+  [[nodiscard]] dberr_t restore_from_savepoint() noexcept;
+
+  /** Move to the first user rec on the restored page. */
+  [[nodiscard]] dberr_t move_to_user_rec() noexcept;
+
+  /** @return true if cursor is after last on page. */
+  [[nodiscard]] bool is_after_last_on_page() const noexcept {
+    return m_pcur->is_after_last_on_page();
+  }
+
  private:
   /** Mini-transaction. */
   mtr_t *m_mtr{};
@@ -258,6 +314,9 @@
 
 buf_block_t *Parallel_reader::Scan_ctx::block_get_s_latched(
     const page_id_t &page_id, mtr_t *mtr, int line) const {
+  /* We never scan undo tablespaces. */
+  ut_a(!fsp_is_undo_tablespace(page_id.space()));
+
   auto block = buf_page_get_gen(page_id, m_config.m_page_size, RW_S_LATCH,
                                 nullptr, Page_fetch::SCAN, __FILE__, line, mtr);
 
@@ -266,20 +325,16 @@
   return (block);
 }
 
-void PCursor::yield() {
-  /* We should always yield on a block boundary. */
-  ut_ad(m_pcur->is_after_last_on_page());
-
-  /* Store the cursor position on the last user record on the page. */
+void PCursor::savepoint() noexcept {
+  /* Store the cursor position on the previous user record on the page. */
   m_pcur->move_to_prev_on_page();
 
   m_pcur->store_position(m_mtr);
 
   m_mtr->commit();
+}
 
-  /* Yield so that another thread can proceed. */
-  std::this_thread::yield();
-
+void PCursor::resume() noexcept {
   m_mtr->start();
 
   m_mtr->set_log_mode(MTR_LOG_NO_REDO);
@@ -295,35 +350,21 @@
   }
 }
 
-dberr_t PCursor::move_to_next_block(dict_index_t *index) {
-  ut_ad(m_pcur->is_after_last_on_page());
-
-  if (rw_lock_get_waiters(dict_index_get_lock(index))) {
-    /* There are waiters on the index tree lock. Store and restore
-    the cursor position, and yield so that scanning a large table
-    will not starve other threads. */
-
-    yield();
-
-    /* It's possible that the restore places the cursor in the middle of
-    the block. We need to account for that too. */
-
-    if (m_pcur->is_on_user_rec()) {
-      return (DB_SUCCESS);
-    }
-  }
-
+dberr_t PCursor::move_to_user_rec() noexcept {
   auto cur = m_pcur->get_page_cur();
-  auto next_page_no = btr_page_get_next(page_cur_get_page(cur), m_mtr);
+  const auto next_page_no = btr_page_get_next(page_cur_get_page(cur), m_mtr);
 
   if (next_page_no == FIL_NULL) {
     m_mtr->commit();
-    return (DB_END_OF_INDEX);
+    return DB_END_OF_INDEX;
   }
 
   auto block = page_cur_get_block(cur);
   const auto &page_id = block->page.id;
 
+  /* We never scan undo tablespaces. */
+  ut_a(!fsp_is_undo_tablespace(page_id.space()));
+
   block = buf_page_get_gen(page_id_t(page_id.space(), next_page_no),
                            block->page.size, RW_S_LATCH, nullptr,
                            Page_fetch::SCAN, __FILE__, __LINE__, m_mtr);
@@ -342,7 +383,42 @@
   /* Page can't be empty unless it is a root page. */
   ut_ad(!page_cur_is_after_last(cur));
 
-  return (DB_SUCCESS);
+  return DB_SUCCESS;
+}
+
+dberr_t PCursor::restore_from_savepoint() noexcept {
+  resume();
+  return m_pcur->is_on_user_rec() ? DB_SUCCESS : move_to_user_rec();
+}
+
+dberr_t Parallel_reader::Thread_ctx::restore_from_savepoint() noexcept {
+  return m_pcursor->restore_from_savepoint();
+}
+
+void Parallel_reader::Thread_ctx::savepoint() noexcept {
+  m_pcursor->savepoint();
+}
+
+dberr_t PCursor::move_to_next_block(dict_index_t *index) {
+  ut_ad(m_pcur->is_after_last_on_page());
+
+  if (rw_lock_get_waiters(dict_index_get_lock(index))) {
+    /* There are waiters on the index tree lock. Store and restore
+    the cursor position, and yield so that scanning a large table
+    will not starve other threads. */
+
+    /* We should always yield on a block boundary. */
+    ut_ad(m_pcur->is_after_last_on_page());
+
+    savepoint();
+
+    /* Yield so that another thread can proceed. */
+    std::this_thread::yield();
+
+    return restore_from_savepoint();
+  } else {
+    return move_to_user_rec();
+  }
 }
 
 bool Parallel_reader::Scan_ctx::check_visibility(const rec_t *&rec,
@@ -485,22 +561,20 @@
   return (iter);
 }
 
-bool Parallel_reader::Ctx::move_to_next_node(PCursor *pcursor, mtr_t *mtr) {
-  page_cur_t *cur MY_ATTRIBUTE((unused)) =
-      m_range.first->m_pcur->get_page_cur();
+bool Parallel_reader::Ctx::move_to_next_node(PCursor *pcursor) {
+  IF_DEBUG(auto cur = m_range.first->m_pcur->get_page_cur();)
 
   auto err = pcursor->move_to_next_block(const_cast<dict_index_t *>(index()));
 
   if (err != DB_SUCCESS) {
     ut_a(err == DB_END_OF_INDEX);
-    return (false);
+    return false;
+  } else {
+    /* Page can't be empty unless it is a root page. */
+    ut_ad(!page_cur_is_after_last(cur));
+    ut_ad(!page_cur_is_before_first(cur));
+    return true;
   }
-
-  /* Page can't be empty unless it is a root page. */
-  ut_ad(!page_cur_is_after_last(cur));
-  ut_ad(!page_cur_is_before_first(cur));
-
-  return (true);
 }
 
 dberr_t Parallel_reader::Ctx::traverse() {
@@ -521,12 +595,16 @@
 
   dberr_t err{DB_SUCCESS};
 
+  m_thread_ctx->m_pcursor = &pcursor;
+
   err = traverse_recs(&pcursor, &mtr);
 
   if (mtr.is_active()) {
     mtr.commit();
   }
 
+  m_thread_ctx->m_pcursor = nullptr;
+
   if (m_scan_ctx->m_config.m_read_level != 0) {
     m_scan_ctx->index_s_unlock();
   }
@@ -538,14 +616,33 @@
   const auto &end_tuple = m_range.second->m_tuple;
   auto heap = mem_heap_create(srv_page_size / 4);
   auto index = m_scan_ctx->m_config.m_index;
-  auto cur = m_range.first->m_pcur->get_page_cur();
 
   m_start = true;
 
   dberr_t err{DB_SUCCESS};
 
+  if (m_scan_ctx->m_reader->m_start_callback) {
+    /* Page start. */
+    m_thread_ctx->m_state = State::PAGE;
+    err = m_scan_ctx->m_reader->m_start_callback(m_thread_ctx);
+  }
+
+  bool call_end_page{true};
+  auto cur = pcursor->get_page_cursor();
+
   while (err == DB_SUCCESS) {
     if (page_cur_is_after_last(cur)) {
+      call_end_page = false;
+
+      if (m_scan_ctx->m_reader->m_finish_callback) {
+        /* End of page. */
+        m_thread_ctx->m_state = State::PAGE;
+        err = m_scan_ctx->m_reader->m_finish_callback(m_thread_ctx);
+        if (err != DB_SUCCESS) {
+          break;
+        }
+      }
+
       mem_heap_empty(heap);
 
       if (!(m_n_pages % TRX_IS_INTERRUPTED_PROBE) &&
@@ -554,12 +651,29 @@
         break;
       }
 
-      if (is_error_set() || !move_to_next_node(pcursor, mtr)) {
+      if (is_error_set()) {
+        break;
+      }
+
+      /* Note: The page end callback (above) can save and restore the cursor.
+      The restore can end up in the middle of a page. */
+      if (pcursor->is_after_last_on_page() && !move_to_next_node(pcursor)) {
         break;
       }
 
       ++m_n_pages;
       m_first_rec = true;
+
+      call_end_page = true;
+
+      if (m_scan_ctx->m_reader->m_start_callback) {
+        /* Page start. */
+        m_thread_ctx->m_state = State::PAGE;
+        err = m_scan_ctx->m_reader->m_start_callback(m_thread_ctx);
+        if (err != DB_SUCCESS) {
+          break;
+        }
+      }
     }
 
     ulint offsets_[REC_OFFS_NORMAL_SIZE];
@@ -574,12 +688,12 @@
       ut_ad(rec != nullptr);
 
       /* Key value of a record can change only if the record is deleted or if
-      its updated. And an update is essentially a delete + insert. So in both
+      it's updated. An update is essentially a delete + insert. So in both
       the cases we just delete mark the record and the original key value is
       preserved on the page.
 
       Since the range creation is based on the key values and the key value do
-      not ever change the latest (non-MVCC) version of the record should always
+      not ever change the, latest (non-MVCC) version of the record should always
       tell us correctly whether we're within the range or outside of it. */
       auto ret = end_tuple->compare(rec, index, offsets);
 
@@ -598,11 +712,15 @@
 
     if (!skip) {
       m_rec = rec;
-      m_block = cur->block;
       m_offsets = offsets;
+      m_block = cur->block;
 
       err = m_scan_ctx->m_f(this);
 
+      if (err != DB_SUCCESS) {
+        break;
+      }
+
       m_start = false;
     }
 
@@ -615,10 +733,18 @@
     m_scan_ctx->set_error_state(err);
   }
 
-  m_thread_ctx->m_prev_partition_id = partition_id();
-
   mem_heap_free(heap);
 
+  if (call_end_page && m_scan_ctx->m_reader->m_finish_callback) {
+    /* Page finished. */
+    m_thread_ctx->m_state = State::PAGE;
+    auto cb_err = m_scan_ctx->m_reader->m_finish_callback(m_thread_ctx);
+
+    if (cb_err != DB_SUCCESS && !m_scan_ctx->is_error_set()) {
+      err = cb_err;
+    }
+  }
+
   return (err);
 }
 
@@ -653,22 +779,33 @@
 
 void Parallel_reader::worker(Parallel_reader::Thread_ctx *thread_ctx) {
   dberr_t err{DB_SUCCESS};
+  dberr_t cb_err{DB_SUCCESS};
+
+  constexpr auto FOREVER = OS_SYNC_INFINITE_TIME;
 
   if (m_start_callback) {
-    err = m_start_callback(thread_ctx);
+    /* Thread start. */
+    thread_ctx->m_state = State::THREAD;
+    cb_err = m_start_callback(thread_ctx);
+
+    if (cb_err != DB_SUCCESS) {
+      err = cb_err;
+      set_error_state(cb_err);
+    }
   }
 
   /* Wait for all the threads to be spawned as it's possible that we could
   abort the operation if there are not enough resources to spawn all the
   threads. */
-  constexpr auto FOREVER = OS_SYNC_INFINITE_TIME;
-  os_event_wait_time_low(m_event, FOREVER, m_sig_count);
+  if (!m_sync) {
+    os_event_wait_time_low(m_event, FOREVER, m_sig_count);
+  }
 
   for (;;) {
-    size_t n_completed = 0;
+    size_t n_completed{};
     int64_t sig_count = os_event_reset(m_event);
 
-    while (err == DB_SUCCESS && !is_error_set()) {
+    while (err == DB_SUCCESS && cb_err == DB_SUCCESS && !is_error_set()) {
       auto ctx = dequeue();
 
       if (ctx == nullptr) {
@@ -688,7 +825,21 @@
         /* Tell the other threads that there is work to do. */
         os_event_set(m_event);
       } else {
-        err = ctx->traverse();
+        if (m_start_callback) {
+          /* Context start. */
+          thread_ctx->m_state = State::CTX;
+          cb_err = m_start_callback(thread_ctx);
+        }
+
+        if (cb_err == DB_SUCCESS && err == DB_SUCCESS) {
+          err = ctx->traverse();
+        }
+
+        if (m_finish_callback) {
+          /* Context finished. */
+          thread_ctx->m_state = State::CTX;
+          cb_err = m_finish_callback(thread_ctx);
+        }
       }
 
       /* Check for trx interrupted (useful in the case of small tables). */
@@ -703,7 +854,7 @@
       ++n_completed;
     }
 
-    if (err != DB_SUCCESS || is_error_set()) {
+    if (cb_err != DB_SUCCESS || err != DB_SUCCESS || is_error_set()) {
       break;
     }
 
@@ -715,16 +866,14 @@
       break;
     }
 
-    constexpr auto FOREVER = OS_SYNC_INFINITE_TIME;
-
-    os_event_wait_time_low(m_event, FOREVER, sig_count);
+    if (!m_sync) {
+      os_event_wait_time_low(m_event, FOREVER, sig_count);
+    }
   }
 
-  if (err != DB_SUCCESS) {
+  if (err != DB_SUCCESS && !is_error_set()) {
     /* Set the "global" error state. */
-    if (!is_error_set()) {
-      set_error_state(err);
-    }
+    set_error_state(err);
   }
 
   if (is_error_set()) {
@@ -733,10 +882,14 @@
   }
 
   if (m_finish_callback) {
-    dberr_t finish_err = m_finish_callback(thread_ctx);
-
-    if (finish_err != DB_SUCCESS) {
-      set_error_state(finish_err);
+    /* Thread finished. */
+    thread_ctx->m_state = State::THREAD;
+    cb_err = m_finish_callback(thread_ctx);
+
+    /* Keep the err status from previous failed operations */
+    if (cb_err != DB_SUCCESS) {
+      err = cb_err;
+      set_error_state(cb_err);
     }
   }
 
@@ -846,7 +999,6 @@
                                                  const size_t split_level,
                                                  Ranges &ranges, mtr_t *mtr) {
   ut_ad(index_s_own());
-  ut_a(max_threads() > 0);
   ut_a(page_no != FIL_NULL);
 
   /* Do a breadth first traversal of the B+Tree using recursion. We want to
@@ -1037,8 +1189,8 @@
   // clang-format off
 
   auto ctx = std::shared_ptr<Ctx>(
-      UT_NEW_NOKEY(Ctx(ctx_id, this, range)),
-      [](Ctx *ctx) { UT_DELETE(ctx); });
+      ut::new_withkey<Ctx>(UT_NEW_THIS_FILE_PSI_KEY, ctx_id, this, range),
+      [](Ctx *ctx) { ut::delete_(ctx); });
 
   // clang-format on
 
@@ -1058,15 +1210,18 @@
 dberr_t Parallel_reader::Scan_ctx::create_contexts(const Ranges &ranges) {
   size_t split_point{};
 
-  ut_a(max_threads() > 0 &&
-       max_threads() <= Parallel_reader::MAX_TOTAL_THREADS);
+  {
+    const auto n = std::max(max_threads(), size_t{1});
+
+    ut_a(n <= Parallel_reader::MAX_TOTAL_THREADS);
 
-  if (ranges.size() > max_threads()) {
-    split_point = (ranges.size() / max_threads()) * max_threads();
-  } else if (m_depth < SPLIT_THRESHOLD) {
-    /* If the tree is not very deep then don't split. For smaller tables
-    it is more expensive to split because we end up traversing more blocks*/
-    split_point = max_threads();
+    if (ranges.size() > n) {
+      split_point = (ranges.size() / n) * n;
+    } else if (m_depth < SPLIT_THRESHOLD) {
+      /* If the tree is not very deep then don't split. For smaller tables
+      it is more expensive to split because we end up traversing more blocks*/
+      split_point = n;
+    }
   }
 
   size_t i{};
@@ -1081,7 +1236,7 @@
     ++i;
   }
 
-  return (DB_SUCCESS);
+  return DB_SUCCESS;
 }
 
 void Parallel_reader::parallel_read() {
@@ -1089,8 +1244,8 @@
     return;
   }
 
-  if (m_n_threads == 0) {
-    auto ptr = UT_NEW_NOKEY(Thread_ctx{0});
+  if (m_sync) {
+    auto ptr = ut::new_withkey<Thread_ctx>(UT_NEW_THIS_FILE_PSI_KEY, 0);
 
     if (ptr == nullptr) {
       set_error_state(DB_OUT_OF_MEMORY);
@@ -1107,21 +1262,23 @@
     return;
   }
 
+  ut_a(m_n_threads > 0);
+
   m_thread_ctxs.reserve(m_n_threads);
 
   dberr_t err{DB_SUCCESS};
 
   for (size_t i = 0; i < m_n_threads; ++i) {
     try {
-      auto ptr = UT_NEW_NOKEY(Thread_ctx{i});
+      auto ptr = ut::new_withkey<Thread_ctx>(UT_NEW_THIS_FILE_PSI_KEY, i);
       if (ptr == nullptr) {
         set_error_state(DB_OUT_OF_MEMORY);
         return;
       }
       m_thread_ctxs.emplace_back(ptr);
       m_parallel_read_threads.emplace_back(
-          os_thread_create(parallel_read_thread_key, &Parallel_reader::worker,
-                           this, m_thread_ctxs[i]));
+          os_thread_create(parallel_read_thread_key, i + 1,
+                           &Parallel_reader::worker, this, m_thread_ctxs[i]));
       m_parallel_read_threads.back().start();
     } catch (...) {
       err = DB_OUT_OF_RESOURCES;
@@ -1133,55 +1290,66 @@
 
   DEBUG_SYNC_C("parallel_read_wait_for_kill_query");
 
-  DBUG_EXECUTE_IF("innodb_pread_thread_OOR", err = DB_OUT_OF_RESOURCES;
-                  set_error_state(err););
+  DBUG_EXECUTE_IF(
+      "innodb_pread_thread_OOR", if (!m_sync) {
+        err = DB_OUT_OF_RESOURCES;
+        set_error_state(err);
+      });
 
   os_event_set(m_event);
 
   DBUG_EXECUTE_IF("bug28079850", set_error_state(DB_INTERRUPTED););
+}
 
-  /* Don't wait for the threads to finish if the read is not synchronous. */
-  if (!m_sync) {
-    return;
-  }
+dberr_t Parallel_reader::spawn(size_t n_threads) noexcept {
+  /* In case this is a retry after a DB_OUT_OF_RESOURCES error. */
+  m_err = DB_SUCCESS;
 
-  join();
-}
+  m_n_threads = n_threads;
 
-dberr_t Parallel_reader::run() {
-  if (!m_scan_ctxs.empty()) {
-    if (m_n_threads == 0) {
-      size_t n_threads = std::min(m_max_threads, m_ctxs.size());
+  if (max_threads() > m_n_threads) {
+    release_unused_threads(max_threads() - m_n_threads);
+  }
 
-      /* No need to spawn any threads if only one thread is required. */
-      if (n_threads == 1 || m_single_threaded_mode) {
-        n_threads = 0;
-      }
+  parallel_read();
 
-      m_n_threads = n_threads;
-    }
+  return DB_SUCCESS;
+}
 
-    if (!m_single_threaded_mode) {
-      release_unused_threads(m_max_threads - m_n_threads);
-    }
+dberr_t Parallel_reader::run(size_t n_threads) {
+  /* In case this is a retry after a DB_OUT_OF_RESOURCES error. */
+  m_err = DB_SUCCESS;
 
-    parallel_read();
-  }
+  ut_a(max_threads() >= n_threads);
 
-  /* Don't wait for the threads to finish if the read is not synchronous or if
-  there's no parallel read. */
-  if (!m_sync || m_n_threads == 0) {
-    return DB_SUCCESS;
+  if (n_threads == 0) {
+    m_sync = true;
   }
 
-  if (is_error_set()) {
-    return m_err;
-  }
+  const auto err = spawn(n_threads);
 
-  for (auto &scan_ctx : m_scan_ctxs) {
-    if (scan_ctx->is_error_set()) {
-      /* Return the state of the first Scan context that is in state ERROR. */
-      return scan_ctx->m_err;
+  /* Don't wait for the threads to finish if the read is not synchronous or
+  if there's no parallel read. */
+  if (m_sync) {
+    if (err != DB_SUCCESS) {
+      return err;
+    }
+    ut_a(m_n_threads == 0);
+    return is_error_set() ? m_err.load() : DB_SUCCESS;
+  } else {
+    join();
+
+    if (err != DB_SUCCESS) {
+      return err;
+    } else if (is_error_set()) {
+      return m_err;
+    }
+
+    for (auto &scan_ctx : m_scan_ctxs) {
+      if (scan_ctx->is_error_set()) {
+        /* Return the state of the first Scan context that is in state ERROR. */
+        return scan_ctx->m_err;
+      }
     }
   }
 
@@ -1194,8 +1362,8 @@
   // clang-format off
 
   auto scan_ctx = std::shared_ptr<Scan_ctx>(
-      UT_NEW_NOKEY(Scan_ctx(this, m_scan_ctx_id, trx, config, std::move(f))),
-      [](Scan_ctx *scan_ctx) { UT_DELETE(scan_ctx); });
+      ut::new_withkey<Scan_ctx>(UT_NEW_THIS_FILE_PSI_KEY, this, m_scan_ctx_id, trx, config, std::move(f)),
+      [](Scan_ctx *scan_ctx) { ut::delete_(scan_ctx); });
 
   // clang-format on
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/row/row0pread-histogram.cc mysql-8.0-8.0.27/storage/innobase/row/row0pread-histogram.cc
--- mysql-8.0-8.0.26/storage/innobase/row/row0pread-histogram.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/row/row0pread-histogram.cc	2021-09-28 11:46:34.000000000 +0000
@@ -40,7 +40,7 @@
 Histogram_sampler::Histogram_sampler(size_t max_threads, int sampling_seed,
                                      double sampling_percentage,
                                      enum_sampling_method sampling_method)
-    : m_parallel_reader(max_threads, max_threads, false),
+    : m_parallel_reader(max_threads),
       m_random_generator(sampling_seed),
       m_sampling_method(sampling_method),
       m_sampling_percentage(sampling_percentage),
@@ -56,13 +56,21 @@
   m_n_sampled = 0;
 
   m_parallel_reader.set_start_callback(
-      [=](Parallel_reader::Thread_ctx *reader_thread_ctx) {
-        return start_callback(reader_thread_ctx);
+      [=](Parallel_reader::Thread_ctx *thread_ctx) {
+        if (thread_ctx->get_state() == Parallel_reader::State::THREAD) {
+          return start_callback(thread_ctx);
+        } else {
+          return DB_SUCCESS;
+        }
       });
 
   m_parallel_reader.set_finish_callback(
-      [&](Parallel_reader::Thread_ctx *reader_thread_ctx) {
-        return finish_callback(reader_thread_ctx);
+      [=](Parallel_reader::Thread_ctx *thread_ctx) {
+        if (thread_ctx->get_state() == Parallel_reader::State::THREAD) {
+          return finish_callback(thread_ctx);
+        } else {
+          return DB_SUCCESS;
+        }
       });
 }
 
@@ -75,6 +83,7 @@
 
 dberr_t Histogram_sampler::start_callback(
     Parallel_reader::Thread_ctx *reader_thread_ctx) {
+  ut_a(reader_thread_ctx->get_state() == Parallel_reader::State::THREAD);
   /** There are data members in row_prebuilt_t that cannot be accessed in
   multi-threaded mode e.g., blob_heap.
 
@@ -82,9 +91,9 @@
   it among threads is not recommended unless "you know what you are doing".
   This is very fragile code as it stands.
 
-  To solve the blob heap issue in prebuilt we request parallel reader thread to
-  use blob heap per thread and we pass this blob heap to the InnoDB to MySQL
-  row format conversion function. */
+  To solve the blob heap issue in prebuilt we request parallel reader thread
+  to use blob heap per thread and we pass this blob heap to the InnoDB to
+  MySQL row format conversion function. */
   reader_thread_ctx->create_blob_heap();
 
   return DB_SUCCESS;
@@ -92,6 +101,8 @@
 
 dberr_t Histogram_sampler::finish_callback(
     Parallel_reader::Thread_ctx *reader_thread_ctx) {
+  ut_a(reader_thread_ctx->get_state() == Parallel_reader::State::THREAD);
+
   DBUG_PRINT("histogram_sampler_buffering_print", ("-> Buffering complete."));
 
   DBUG_LOG("histogram_sampler_buffering_print",
@@ -100,7 +111,7 @@
 
   if (is_error_set()) {
     signal_end_of_buffering();
-    return (m_err);
+    return m_err;
   }
 
   wait_for_start_of_buffering();
@@ -111,7 +122,7 @@
 
   signal_end_of_buffering();
 
-  return (DB_SUCCESS);
+  return DB_SUCCESS;
 }
 
 bool Histogram_sampler::init(trx_t *trx, dict_index_t *index,
@@ -222,7 +233,9 @@
   return;
 }
 
-dberr_t Histogram_sampler::run() { return m_parallel_reader.run(); }
+dberr_t Histogram_sampler::run() {
+  return m_parallel_reader.spawn(m_parallel_reader.max_threads());
+}
 
 dberr_t Histogram_sampler::sample_rec(const Parallel_reader::Ctx *reader_ctx,
                                       const rec_t *rec, ulint *offsets,
diff -Nru mysql-8.0-8.0.26/storage/innobase/row/row0purge.cc mysql-8.0-8.0.27/storage/innobase/row/row0purge.cc
--- mysql-8.0-8.0.26/storage/innobase/row/row0purge.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/row/row0purge.cc	2021-09-28 11:46:34.000000000 +0000
@@ -129,7 +129,7 @@
 /** Removes a delete marked clustered index record if possible.
  @retval true if the row was not found, or it was successfully removed
  @retval false if the row was modified after the delete marking */
-static MY_ATTRIBUTE((warn_unused_result)) bool row_purge_remove_clust_if_poss_low(
+[[nodiscard]] static bool row_purge_remove_clust_if_poss_low(
     purge_node_t *node, /*!<
                            in/out:
                            row
@@ -235,7 +235,7 @@
  @retval true if the row was not found, or it was successfully removed
  @retval false the purge needs to be suspended because of running out
  of file space. */
-static MY_ATTRIBUTE((warn_unused_result)) bool row_purge_remove_clust_if_poss(
+[[nodiscard]] static bool row_purge_remove_clust_if_poss(
     purge_node_t *node) /*!< in/out: row purge node */
 {
   if (row_purge_remove_clust_if_poss_low(node, BTR_MODIFY_LEAF)) {
@@ -298,11 +298,10 @@
 Removes a secondary index entry if possible, by modifying the
 index tree.  Does not try to buffer the delete.
 @return true if success or if not found */
-static MY_ATTRIBUTE((warn_unused_result)) ibool
-    row_purge_remove_sec_if_poss_tree(
-        purge_node_t *node,    /*!< in: row purge node */
-        dict_index_t *index,   /*!< in: index */
-        const dtuple_t *entry) /*!< in: index entry */
+[[nodiscard]] static ibool row_purge_remove_sec_if_poss_tree(
+    purge_node_t *node,    /*!< in: row purge node */
+    dict_index_t *index,   /*!< in: index */
+    const dtuple_t *entry) /*!< in: index entry */
 {
   btr_pcur_t pcur;
   btr_cur_t *btr_cur;
@@ -412,7 +411,7 @@
 if possible.
 @retval true if success or if not found
 @retval false if row_purge_remove_sec_if_poss_tree() should be invoked */
-static MY_ATTRIBUTE((warn_unused_result)) bool row_purge_remove_sec_if_poss_leaf(
+[[nodiscard]] static bool row_purge_remove_sec_if_poss_leaf(
     purge_node_t *node,    /*!<
                               in:
                               row
@@ -554,6 +553,7 @@
       }
       /* fall through (the index entry is still needed,
       or the deletion succeeded) */
+      [[fallthrough]];
     case ROW_NOT_DELETED_REF:
       /* The index entry is still needed. */
     case ROW_BUFFERED:
@@ -649,7 +649,7 @@
  @retval true if the row was not found, or it was successfully removed
  @retval false the purge needs to be suspended because of
  running out of file space */
-static MY_ATTRIBUTE((warn_unused_result)) bool row_purge_del_mark(
+[[nodiscard]] static bool row_purge_del_mark(
     purge_node_t *node) /*!< in/out: row purge node */
 {
   mem_heap_t *heap;
@@ -1076,12 +1076,12 @@
 @param[in]	updated_extern	whether external columns were updated
 @param[in,out]	thd		current thread
 @return true if purged, false if skipped */
-static MY_ATTRIBUTE((warn_unused_result)) bool row_purge_record_func(
-    purge_node_t *node, trx_undo_rec_t *undo_rec,
+[[nodiscard]] static bool row_purge_record_func(purge_node_t *node,
+                                                trx_undo_rec_t *undo_rec,
 #ifdef UNIV_DEBUG
-    const que_thr_t *thr,
+                                                const que_thr_t *thr,
 #endif /* UNIV_DEBUG */
-    bool updated_extern, THD *thd) {
+                                                bool updated_extern, THD *thd) {
   dict_index_t *clust_index;
   bool purged = true;
 
@@ -1105,7 +1105,7 @@
       if (!updated_extern) {
         break;
       }
-      /* fall through */
+      [[fallthrough]];
     case TRX_UNDO_UPD_EXIST_REC:
       DBUG_EXECUTE_IF("innodb_purge_sleep_12",
                       std::this_thread::sleep_for(std::chrono::seconds(5)););
@@ -1362,7 +1362,7 @@
     dict_sys_mutex_enter();
     const dict_index_t *idx = dict_index_find(index_id);
 
-    if (idx == nullptr || idx->space != space_id ||
+    if (idx == nullptr || idx->space != space_id || idx->page == FIL_NULL ||
         idx->table->id != table_id) {
       dict_sys_mutex_exit();
       continue;
diff -Nru mysql-8.0-8.0.26/storage/innobase/row/row0quiesce.cc mysql-8.0-8.0.27/storage/innobase/row/row0quiesce.cc
--- mysql-8.0-8.0.26/storage/innobase/row/row0quiesce.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/row/row0quiesce.cc	2021-09-28 11:46:34.000000000 +0000
@@ -46,12 +46,11 @@
 
 /** Write the meta data (index user fields) config file.
  @return DB_SUCCESS or error code. */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_quiesce_write_index_fields(
-        const dict_index_t *index, /*!< in: write the meta data for
-                                   this index */
-        FILE *file,                /*!< in: file to write to */
-        THD *thd)                  /*!< in/out: session */
+[[nodiscard]] static dberr_t row_quiesce_write_index_fields(
+    const dict_index_t *index, /*!< in: write the meta data for
+                               this index */
+    FILE *file,                /*!< in: file to write to */
+    THD *thd)                  /*!< in/out: session */
 {
   /* This row will store prefix_len, fixed_len,
   and in IB_EXPORT_CFG_VERSION_V4, is_ascending */
@@ -107,9 +106,8 @@
 @param[in,out]	file	file to write to
 @param[in,out]	thd	session
 @return DB_SUCCESS or error code. */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_quiesce_write_one_index(const dict_index_t *index, FILE *file,
-                                THD *thd) {
+[[nodiscard]] static dberr_t row_quiesce_write_one_index(
+    const dict_index_t *index, FILE *file, THD *thd) {
   dberr_t err;
   byte *ptr;
   byte row[sizeof(space_index_t) + sizeof(uint32_t) * 8];
@@ -175,7 +173,7 @@
 
 /** Write the meta data config file index information.
  @return DB_SUCCESS or error code. */
-static MY_ATTRIBUTE((nonnull, warn_unused_result)) dberr_t
+[[nodiscard]] static MY_ATTRIBUTE((nonnull)) dberr_t
     row_quiesce_write_indexes(const dict_table_t *table, /*!< in: write the meta
                                                          data for this table */
                               FILE *file, /*!< in: file to write to */
@@ -237,8 +235,8 @@
 @param[in]	col	column to which the default value belongs
 @param[in]	file	file to write to
 @return DB_SUCCESS or DB_IO_ERROR. */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_quiesce_write_default_value(const dict_col_t *col, FILE *file) {
+[[nodiscard]] static dberr_t row_quiesce_write_default_value(
+    const dict_col_t *col, FILE *file) {
   byte row[6];
 
   if (col->instant_default != nullptr) {
@@ -274,11 +272,11 @@
  dict_col_t structure, along with the column name. All fields are serialized
  as ib_uint32_t.
  @return DB_SUCCESS or error code. */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_quiesce_write_table(const dict_table_t *table, /*!< in: write the meta
-                                                       data for this table */
-                            FILE *file, /*!< in: file to write to */
-                            THD *thd)   /*!< in/out: session */
+[[nodiscard]] static dberr_t row_quiesce_write_table(
+    const dict_table_t *table, /*!< in: write the meta
+                               data for this table */
+    FILE *file,                /*!< in: file to write to */
+    THD *thd)                  /*!< in/out: session */
 {
   dict_col_t *col;
   byte row[sizeof(ib_uint32_t) * 7];
@@ -352,11 +350,11 @@
 
 /** Write the meta data config file header.
  @return DB_SUCCESS or error code. */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_quiesce_write_header(const dict_table_t *table, /*!< in: write the meta
-                                                        data for this table */
-                             FILE *file, /*!< in: file to write to */
-                             THD *thd)   /*!< in/out: session */
+[[nodiscard]] static dberr_t row_quiesce_write_header(
+    const dict_table_t *table, /*!< in: write the meta
+                               data for this table */
+    FILE *file,                /*!< in: file to write to */
+    THD *thd)                  /*!< in/out: session */
 {
   byte value[sizeof(ib_uint32_t)];
 
@@ -500,10 +498,10 @@
 
 /** Write the table meta data after quiesce.
  @return DB_SUCCESS or error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_quiesce_write_cfg(dict_table_t *table, /*!< in: write the meta data for
-                                                       this table */
-                          THD *thd)            /*!< in/out: session */
+[[nodiscard]] static dberr_t row_quiesce_write_cfg(
+    dict_table_t *table, /*!< in: write the meta data for
+                                 this table */
+    THD *thd)            /*!< in/out: session */
 {
   dberr_t err;
   char name[OS_FILE_MAX_PATH];
@@ -557,7 +555,7 @@
 @param[in]	file		file to write to
 @param[in]	thd		session
 @return DB_SUCCESS or error code. */
-static MY_ATTRIBUTE((nonnull, warn_unused_result)) dberr_t
+[[nodiscard]] static MY_ATTRIBUTE((nonnull)) dberr_t
     row_quiesce_write_transfer_key(const dict_table_t *table, FILE *file,
                                    THD *thd) {
   byte key_size[sizeof(ib_uint32_t)];
@@ -638,7 +636,7 @@
 @param[in]	table		write the data for this table
 @param[in]	thd		session
 @return DB_SUCCESS or error code */
-static MY_ATTRIBUTE((nonnull, warn_unused_result)) dberr_t
+[[nodiscard]] static MY_ATTRIBUTE((nonnull)) dberr_t
     row_quiesce_write_cfp(dict_table_t *table, THD *thd) {
   dberr_t err;
   char name[OS_FILE_MAX_PATH];
diff -Nru mysql-8.0-8.0.26/storage/innobase/row/row0row.cc mysql-8.0-8.0.27/storage/innobase/row/row0row.cc
--- mysql-8.0-8.0.26/storage/innobase/row/row0row.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/row/row0row.cc	2021-09-28 11:46:34.000000000 +0000
@@ -89,7 +89,7 @@
 
   if (index->is_corrupted() && dict_index_has_virtual(index) &&
       dict_index_get_online_status(index) == ONLINE_INDEX_ABORTED_DROPPED) {
-    /* See comments for virtual index in row_merge_drop_indexes().
+    /* See comments for virtual index in ddl::drop_indexes().
     In this case, just return the empty entry object */
     return (entry);
   }
@@ -623,7 +623,7 @@
   ut_ad(heap != nullptr);
   ut_ad(index != nullptr);
 
-  /* Because this function may be invoked by row0merge.cc
+  /* Because this function may be invoked by row0ddl.cc
   on a record whose header is in different format, the check
   rec_offs_validate(rec, index, offsets) must be avoided here. */
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/row/row0sel.cc mysql-8.0-8.0.27/storage/innobase/row/row0sel.cc
--- mysql-8.0-8.0.26/storage/innobase/row/row0sel.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/row/row0sel.cc	2021-09-28 11:46:34.000000000 +0000
@@ -538,8 +538,8 @@
 
   ut_ad(que_node_get_type(column) == QUE_NODE_SYMBOL);
 
-  column->prefetch_buf = static_cast<sel_buf_t *>(
-      ut_malloc_nokey(SEL_MAX_N_PREFETCH * sizeof(sel_buf_t)));
+  column->prefetch_buf = static_cast<sel_buf_t *>(ut::malloc_withkey(
+      UT_NEW_THIS_FILE_PSI_KEY, SEL_MAX_N_PREFETCH * sizeof(sel_buf_t)));
 
   for (i = 0; i < SEL_MAX_N_PREFETCH; i++) {
     sel_buf = column->prefetch_buf + i;
@@ -562,11 +562,11 @@
     sel_buf = prefetch_buf + i;
 
     if (sel_buf->val_buf_size > 0) {
-      ut_free(sel_buf->data);
+      ut::free(sel_buf->data);
     }
   }
 
-  ut_free(prefetch_buf);
+  ut::free(prefetch_buf);
 }
 
 /** Pops the column values for a prefetched, cached row from the column prefetch
@@ -686,7 +686,7 @@
 
 /** Builds a previous version of a clustered index record for a consistent read
  @return DB_SUCCESS or error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t row_sel_build_prev_vers(
+[[nodiscard]] static dberr_t row_sel_build_prev_vers(
     ReadView *read_view,        /*!< in: read view */
     dict_index_t *index,        /*!< in: plan node for table */
     rec_t *rec,                 /*!< in: record in a clustered index */
@@ -791,7 +791,7 @@
 /** Retrieves the clustered index record corresponding to a record in a
  non-clustered index. Does the necessary locking.
  @return DB_SUCCESS or error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t row_sel_get_clust_rec(
+[[nodiscard]] static dberr_t row_sel_get_clust_rec(
     sel_node_t *node, /*!< in: select_node */
     plan_t *plan,     /*!< in: plan node for table */
     rec_t *rec,       /*!< in: record in a non-clustered index */
@@ -1435,9 +1435,8 @@
 
 /** Performs a select step.
  @return DB_SUCCESS or error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_sel(sel_node_t *node, /*!< in: select node */
-            que_thr_t *thr)   /*!< in: query thread */
+[[nodiscard]] static dberr_t row_sel(sel_node_t *node, /*!< in: select node */
+                                     que_thr_t *thr)   /*!< in: query thread */
 {
   dict_index_t *index;
   plan_t *plan;
@@ -2759,7 +2758,7 @@
 @param[in]      lob_undo        the LOB undo information.
 @param[in,out]  blob_heap       If not null then use this heap for BLOBs */
 // clang-format on
-static MY_ATTRIBUTE((warn_unused_result)) bool row_sel_store_mysql_field_func(
+[[nodiscard]] static bool row_sel_store_mysql_field_func(
     byte *mysql_rec, row_prebuilt_t *prebuilt, const rec_t *rec,
     const dict_index_t *rec_index, const dict_index_t *prebuilt_index,
     const ulint *offsets, ulint field_no, const mysql_row_templ_t *templ,
@@ -3089,14 +3088,11 @@
 @param[in]	mtr		the mini-transaction context.
 @param[in,out]	lob_undo	Undo information for BLOBs.
 @return DB_SUCCESS or error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_sel_build_prev_vers_for_mysql(ReadView *read_view,
-                                      dict_index_t *clust_index,
-                                      row_prebuilt_t *prebuilt,
-                                      const rec_t *rec, ulint **offsets,
-                                      mem_heap_t **offset_heap,
-                                      rec_t **old_vers, const dtuple_t **vrow,
-                                      mtr_t *mtr, lob::undo_vers_t *lob_undo) {
+[[nodiscard]] static dberr_t row_sel_build_prev_vers_for_mysql(
+    ReadView *read_view, dict_index_t *clust_index, row_prebuilt_t *prebuilt,
+    const rec_t *rec, ulint **offsets, mem_heap_t **offset_heap,
+    rec_t **old_vers, const dtuple_t **vrow, mtr_t *mtr,
+    lob::undo_vers_t *lob_undo) {
   DBUG_TRACE;
 
   dberr_t err;
@@ -3153,8 +3149,8 @@
 /** Retrieve the clustered index record corresponding to a record in a
 non-clustered index. Does the necessary locking.
   @return DB_SUCCESS, DB_SUCCESS_LOCKED_REC, or error code */
-MY_ATTRIBUTE((warn_unused_result))
-dberr_t Row_sel_get_clust_rec_for_mysql::operator()(
+
+[[nodiscard]] dberr_t Row_sel_get_clust_rec_for_mysql::operator()(
     row_prebuilt_t *prebuilt, dict_index_t *sec_index, const rec_t *rec,
     que_thr_t *thr, const rec_t **out_rec, ulint **offsets,
     mem_heap_t **offset_heap, const dtuple_t **vrow, mtr_t *mtr,
@@ -3654,7 +3650,7 @@
 
   /* Reserve space for the magic number. */
   sz = UT_ARR_SIZE(prebuilt->fetch_cache) * (prebuilt->mysql_row_len + 8);
-  ptr = static_cast<byte *>(ut_malloc_nokey(sz));
+  ptr = static_cast<byte *>(ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sz));
 
   for (i = 0; i < UT_ARR_SIZE(prebuilt->fetch_cache); i++) {
     /* A user has reported memory corruption in these
@@ -4974,8 +4970,8 @@
       dict_index_t *key_index = prebuilt->index;
 
       if (end_range_cache == nullptr) {
-        end_range_cache =
-            static_cast<byte *>(ut_malloc_nokey(prebuilt->mysql_row_len));
+        end_range_cache = static_cast<byte *>(ut::malloc_withkey(
+            UT_NEW_THIS_FILE_PSI_KEY, prebuilt->mysql_row_len));
       }
 
       if (clust_templ_for_sec) {
@@ -5235,7 +5231,7 @@
           prebuilt->new_rec_lock[row_prebuilt_t::LOCK_PCUR] = true;
         }
         err = DB_SUCCESS;
-        // Fall through
+        [[fallthrough]];
       case DB_SUCCESS:
         if (row_to_range_relation.row_must_be_at_end) {
           prebuilt->m_stop_tuple_found = true;
@@ -6024,7 +6020,7 @@
   trx->op_info = "";
 
   if (end_range_cache != nullptr) {
-    ut_free(end_range_cache);
+    ut::free(end_range_cache);
   }
 
   if (heap != nullptr) {
@@ -6033,7 +6029,7 @@
 
 #ifdef UNIV_DEBUG
   if (prev_rec_debug_buf != nullptr) {
-    ut_free(prev_rec_debug_buf);
+    ut::free(prev_rec_debug_buf);
   }
 #endif /* UNIV_DEBUG */
 
@@ -6137,7 +6133,8 @@
   prebuilt->search_tuple = entry;
 
   ulint bufsize = ut_max(UNIV_PAGE_SIZE, prebuilt->mysql_row_len);
-  buf = static_cast<byte *>(ut_malloc_nokey(bufsize));
+  buf = static_cast<byte *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, bufsize));
 
   ulint cnt = 1000;
 
@@ -6174,7 +6171,7 @@
       prebuilt->rtr_info->is_dup = nullptr;
 
       prebuilt->search_tuple = search_entry;
-      ut_free(buf);
+      ut::free(buf);
       mem_heap_free(heap);
 
       return (ret);
diff -Nru mysql-8.0-8.0.26/storage/innobase/row/row0uins.cc mysql-8.0-8.0.27/storage/innobase/row/row0uins.cc
--- mysql-8.0-8.0.26/storage/innobase/row/row0uins.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/row/row0uins.cc	2021-09-28 11:46:34.000000000 +0000
@@ -64,8 +64,8 @@
 /** Removes a clustered index record. The pcur in node was positioned on the
  record, now it is detached.
  @return DB_SUCCESS or DB_OUT_OF_FILE_SPACE */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_undo_ins_remove_clust_rec(undo_node_t *node) /*!< in: undo node */
+[[nodiscard]] static dberr_t row_undo_ins_remove_clust_rec(
+    undo_node_t *node) /*!< in: undo node */
 {
   btr_cur_t *btr_cur;
   ibool success;
@@ -167,10 +167,11 @@
 @param[in]	thr	query thread
 @param[in]	node	undo node
 @return DB_SUCCESS, DB_FAIL, or DB_OUT_OF_FILE_SPACE */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_undo_ins_remove_sec_low(ulint mode, dict_index_t *index,
-                                dtuple_t *entry, que_thr_t *thr,
-                                undo_node_t *node) {
+[[nodiscard]] static dberr_t row_undo_ins_remove_sec_low(ulint mode,
+                                                         dict_index_t *index,
+                                                         dtuple_t *entry,
+                                                         que_thr_t *thr,
+                                                         undo_node_t *node) {
   btr_pcur_t pcur;
   btr_cur_t *btr_cur;
   dberr_t err = DB_SUCCESS;
@@ -269,9 +270,10 @@
 @param[in]	thr	query thread
 @param[in]	node	undo node
 @return DB_SUCCESS or DB_OUT_OF_FILE_SPACE */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_undo_ins_remove_sec(dict_index_t *index, dtuple_t *entry,
-                            que_thr_t *thr, undo_node_t *node) {
+[[nodiscard]] static dberr_t row_undo_ins_remove_sec(dict_index_t *index,
+                                                     dtuple_t *entry,
+                                                     que_thr_t *thr,
+                                                     undo_node_t *node) {
   dberr_t err;
   ulint n_tries = 0;
 
@@ -392,9 +394,9 @@
 
 /** Removes secondary index records.
  @return DB_SUCCESS or DB_OUT_OF_FILE_SPACE */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_undo_ins_remove_sec_rec(undo_node_t *node, /*!< in/out: row undo node */
-                                que_thr_t *thr)    /*!< in: query thread */
+[[nodiscard]] static dberr_t row_undo_ins_remove_sec_rec(
+    undo_node_t *node, /*!< in/out: row undo node */
+    que_thr_t *thr)    /*!< in: query thread */
 {
   dberr_t err = DB_SUCCESS;
   dict_index_t *index = node->index;
diff -Nru mysql-8.0-8.0.26/storage/innobase/row/row0umod.cc mysql-8.0-8.0.27/storage/innobase/row/row0umod.cc
--- mysql-8.0-8.0.26/storage/innobase/row/row0umod.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/row/row0umod.cc	2021-09-28 11:46:34.000000000 +0000
@@ -80,7 +80,7 @@
 
 /** Undoes a modify in a clustered index record.
  @return DB_SUCCESS, DB_FAIL, or error code: we may run out of file space */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t row_undo_mod_clust_low(
+[[nodiscard]] static dberr_t row_undo_mod_clust_low(
     undo_node_t *node, /*!< in: row undo node */
     ulint **offsets,   /*!< out: rec_get_offsets() on the record */
     mem_heap_t **offsets_heap,
@@ -162,7 +162,7 @@
  that would see the delete-marked record.
  @return	DB_SUCCESS, DB_FAIL, or error code: we may run out of file space
  */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t row_undo_mod_remove_clust_low(
+[[nodiscard]] static dberr_t row_undo_mod_remove_clust_low(
     undo_node_t *node, /*!< in: row undo node */
     mtr_t *mtr,        /*!< in/out: mini-transaction */
     ulint mode)        /*!< in: BTR_MODIFY_LEAF or BTR_MODIFY_TREE */
@@ -245,9 +245,9 @@
 /** Undoes a modify in a clustered index record. Sets also the node state for
  the next round of undo.
  @return DB_SUCCESS or error code: we may run out of file space */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_undo_mod_clust(undo_node_t *node, /*!< in: row undo node */
-                       que_thr_t *thr)    /*!< in: query thread */
+[[nodiscard]] static dberr_t row_undo_mod_clust(
+    undo_node_t *node, /*!< in: row undo node */
+    que_thr_t *thr)    /*!< in: query thread */
 {
   btr_pcur_t *pcur;
   mtr_t mtr;
@@ -373,14 +373,13 @@
 
 /** Delete marks or removes a secondary index entry if found.
  @return DB_SUCCESS, DB_FAIL, or DB_OUT_OF_FILE_SPACE */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_undo_mod_del_mark_or_remove_sec_low(
-        undo_node_t *node,   /*!< in: row undo node */
-        que_thr_t *thr,      /*!< in: query thread */
-        dict_index_t *index, /*!< in: index */
-        dtuple_t *entry,     /*!< in: index entry */
-        ulint mode)          /*!< in: latch mode BTR_MODIFY_LEAF or
-                             BTR_MODIFY_TREE */
+[[nodiscard]] static dberr_t row_undo_mod_del_mark_or_remove_sec_low(
+    undo_node_t *node,   /*!< in: row undo node */
+    que_thr_t *thr,      /*!< in: query thread */
+    dict_index_t *index, /*!< in: index */
+    dtuple_t *entry,     /*!< in: index entry */
+    ulint mode)          /*!< in: latch mode BTR_MODIFY_LEAF or
+                         BTR_MODIFY_TREE */
 {
   btr_pcur_t pcur;
   btr_cur_t *btr_cur;
@@ -537,12 +536,11 @@
  clustered index record or an earlier version of it, if the secondary index
  record through which we do the search is delete-marked.
  @return DB_SUCCESS or DB_OUT_OF_FILE_SPACE */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_undo_mod_del_mark_or_remove_sec(
-        undo_node_t *node,   /*!< in: row undo node */
-        que_thr_t *thr,      /*!< in: query thread */
-        dict_index_t *index, /*!< in: index */
-        dtuple_t *entry)     /*!< in: index entry */
+[[nodiscard]] static dberr_t row_undo_mod_del_mark_or_remove_sec(
+    undo_node_t *node,   /*!< in: row undo node */
+    que_thr_t *thr,      /*!< in: query thread */
+    dict_index_t *index, /*!< in: index */
+    dtuple_t *entry)     /*!< in: index entry */
 {
   dberr_t err;
 
@@ -566,14 +564,13 @@
  @retval DB_OUT_OF_FILE_SPACE when running out of tablespace
  @retval DB_DUPLICATE_KEY if the value was missing
          and an insert would lead to a duplicate exists */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_undo_mod_del_unmark_sec_and_undo_update(
-        ulint mode,          /*!< in: search mode: BTR_MODIFY_LEAF or
-                             BTR_MODIFY_TREE */
-        que_thr_t *thr,      /*!< in: query thread */
-        dict_index_t *index, /*!< in: index */
-        dtuple_t *entry,     /*!< in: index entry */
-        undo_no_t undo_no)
+[[nodiscard]] static dberr_t row_undo_mod_del_unmark_sec_and_undo_update(
+    ulint mode,          /*!< in: search mode: BTR_MODIFY_LEAF or
+                         BTR_MODIFY_TREE */
+    que_thr_t *thr,      /*!< in: query thread */
+    dict_index_t *index, /*!< in: index */
+    dtuple_t *entry,     /*!< in: index entry */
+    undo_no_t undo_no)
 /*!< in: undo number upto which to rollback.*/
 {
   btr_pcur_t pcur;
@@ -774,7 +771,7 @@
       dict_set_corrupted(index);
       break;
     default:
-      /* fall through */
+      [[fallthrough]];
     case RW_X_LATCH:
       /* This should be the rollback of a data dictionary
       transaction. */
@@ -789,9 +786,10 @@
 @param[in]	index	the multi-value index
 @param[in,out]	heap	memory heap
 @return DB_SUCCESS or DB_OUT_OF_FILE_SPACE */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_undo_mod_upd_del_multi_sec(undo_node_t *node, que_thr_t *thr,
-                                   dict_index_t *index, mem_heap_t *heap) {
+[[nodiscard]] static dberr_t row_undo_mod_upd_del_multi_sec(undo_node_t *node,
+                                                            que_thr_t *thr,
+                                                            dict_index_t *index,
+                                                            mem_heap_t *heap) {
   dberr_t err = DB_SUCCESS;
   Multi_value_entry_builder_normal mv_entry_builder(node->row, node->ext, index,
                                                     heap, true, false);
@@ -812,9 +810,9 @@
 
 /** Undoes a modify in secondary indexes when undo record type is UPD_DEL.
  @return DB_SUCCESS or DB_OUT_OF_FILE_SPACE */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_undo_mod_upd_del_sec(undo_node_t *node, /*!< in: row undo node */
-                             que_thr_t *thr)    /*!< in: query thread */
+[[nodiscard]] static dberr_t row_undo_mod_upd_del_sec(
+    undo_node_t *node, /*!< in: row undo node */
+    que_thr_t *thr)    /*!< in: query thread */
 {
   mem_heap_t *heap;
   dberr_t err = DB_SUCCESS;
@@ -888,9 +886,8 @@
 @param[in]	index	the multi-value index
 @param[in,out]	heap	memory heap
 @return DB_SUCCESS or DB_OUT_OF_FILE_SPACE */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_undo_mod_del_mark_multi_sec(undo_node_t *node, que_thr_t *thr,
-                                    dict_index_t *index, mem_heap_t *heap) {
+[[nodiscard]] static dberr_t row_undo_mod_del_mark_multi_sec(
+    undo_node_t *node, que_thr_t *thr, dict_index_t *index, mem_heap_t *heap) {
   dberr_t err = DB_SUCCESS;
   Multi_value_entry_builder_normal mv_entry_builder(node->row, node->ext, index,
                                                     heap, true, false);
@@ -926,9 +923,9 @@
 
 /** Undoes a modify in secondary indexes when undo record type is DEL_MARK.
  @return DB_SUCCESS or DB_OUT_OF_FILE_SPACE */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_undo_mod_del_mark_sec(undo_node_t *node, /*!< in: row undo node */
-                              que_thr_t *thr)    /*!< in: query thread */
+[[nodiscard]] static dberr_t row_undo_mod_del_mark_sec(
+    undo_node_t *node, /*!< in: row undo node */
+    que_thr_t *thr)    /*!< in: query thread */
 {
   mem_heap_t *heap;
   dberr_t err = DB_SUCCESS;
@@ -1055,9 +1052,9 @@
 
 /** Undoes a modify in secondary indexes when undo record type is UPD_EXIST.
  @return DB_SUCCESS or DB_OUT_OF_FILE_SPACE */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_undo_mod_upd_exist_sec(undo_node_t *node, /*!< in: row undo node */
-                               que_thr_t *thr)    /*!< in: query thread */
+[[nodiscard]] static dberr_t row_undo_mod_upd_exist_sec(
+    undo_node_t *node, /*!< in: row undo node */
+    que_thr_t *thr)    /*!< in: query thread */
 {
   mem_heap_t *heap;
   dberr_t err = DB_SUCCESS;
diff -Nru mysql-8.0-8.0.26/storage/innobase/row/row0undo.cc mysql-8.0-8.0.27/storage/innobase/row/row0undo.cc
--- mysql-8.0-8.0.26/storage/innobase/row/row0undo.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/row/row0undo.cc	2021-09-28 11:46:34.000000000 +0000
@@ -243,9 +243,9 @@
  If none left, or a partial rollback completed, returns control to the
  parent node, which is always a query thread node.
  @return DB_SUCCESS if operation successfully completed, else error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_undo(undo_node_t *node, /*!< in: row undo node */
-             que_thr_t *thr)    /*!< in: query thread */
+[[nodiscard]] static dberr_t row_undo(
+    undo_node_t *node, /*!< in: row undo node */
+    que_thr_t *thr)    /*!< in: query thread */
 {
   dberr_t err;
   trx_t *trx;
@@ -367,11 +367,12 @@
     /* SQL error detected */
 
     if (err == DB_OUT_OF_FILE_SPACE) {
-      ib::fatal(ER_IB_MSG_1041) << "Out of tablespace during rollback."
-                                   " Consider increasing your tablespace.";
+      ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_1041)
+          << "Out of tablespace during rollback."
+             " Consider increasing your tablespace.";
     }
 
-    ib::fatal(ER_IB_MSG_1042)
+    ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_1042)
         << "Error (" << ut_strerr(err) << ") in rollback.";
   }
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/row/row0upd.cc mysql-8.0-8.0.27/storage/innobase/row/row0upd.cc
--- mysql-8.0-8.0.26/storage/innobase/row/row0upd.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/row/row0upd.cc	2021-09-28 11:46:34.000000000 +0000
@@ -176,16 +176,15 @@
  pcur position!
 
  @return DB_SUCCESS or an error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_upd_check_references_constraints(
-        upd_node_t *node,    /*!< in: row update node */
-        btr_pcur_t *pcur,    /*!< in: cursor positioned on a record; NOTE: the
-                             cursor position is lost in this function! */
-        dict_table_t *table, /*!< in: table in question */
-        dict_index_t *index, /*!< in: index of the cursor */
-        ulint *offsets,      /*!< in/out: rec_get_offsets(pcur.rec, index) */
-        que_thr_t *thr,      /*!< in: query thread */
-        mtr_t *mtr)          /*!< in: mtr */
+[[nodiscard]] static dberr_t row_upd_check_references_constraints(
+    upd_node_t *node,    /*!< in: row update node */
+    btr_pcur_t *pcur,    /*!< in: cursor positioned on a record; NOTE: the
+                         cursor position is lost in this function! */
+    dict_table_t *table, /*!< in: table in question */
+    dict_index_t *index, /*!< in: index of the cursor */
+    ulint *offsets,      /*!< in/out: rec_get_offsets(pcur.rec, index) */
+    que_thr_t *thr,      /*!< in: query thread */
+    mtr_t *mtr)          /*!< in: mtr */
 {
   dict_foreign_t *foreign;
   mem_heap_t *heap;
@@ -529,12 +528,12 @@
  to determine their positions within a clustered index record.
  @return new pointer to mlog */
 byte *row_upd_write_sys_vals_to_log(
-    dict_index_t *index, /*!< in: clustered index */
-    trx_id_t trx_id,     /*!< in: transaction id */
-    roll_ptr_t roll_ptr, /*!< in: roll ptr of the undo log record */
-    byte *log_ptr,       /*!< pointer to a buffer of size > 20 opened
-                         in mlog */
-    mtr_t *mtr MY_ATTRIBUTE((unused))) /*!< in: mtr */
+    dict_index_t *index,         /*!< in: clustered index */
+    trx_id_t trx_id,             /*!< in: transaction id */
+    roll_ptr_t roll_ptr,         /*!< in: roll ptr of the undo log record */
+    byte *log_ptr,               /*!< pointer to a buffer of size > 20 opened
+                                 in mlog */
+    mtr_t *mtr [[maybe_unused]]) /*!< in: mtr */
 {
   ut_ad(index->is_clustered());
   ut_ad(mtr);
@@ -1084,7 +1083,7 @@
       dfield_set_data(dfield, data + len - BTR_EXTERN_FIELD_REF_SIZE,
                       BTR_EXTERN_FIELD_REF_SIZE);
       dfield_set_ext(dfield);
-      /* fall through */
+      [[fallthrough]];
     case 0:
       if (dfield_is_multi_value(dfield)) {
         dfield_multi_value_dup(dfield, heap);
@@ -2102,9 +2101,9 @@
                                 gets updated too
 @return DB_SUCCESS if operation successfully completed, else error
 code or DB_LOCK_WAIT */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_upd_multi_sec_index_entry(upd_node_t *node, que_thr_t *thr,
-                                  bool non_mv_upd) {
+[[nodiscard]] static dberr_t row_upd_multi_sec_index_entry(upd_node_t *node,
+                                                           que_thr_t *thr,
+                                                           bool non_mv_upd) {
   mem_heap_t *heap;
   dict_index_t *index;
   dberr_t err = DB_SUCCESS;
@@ -2169,9 +2168,9 @@
 @param[in]	thr		query thread
 @return DB_SUCCESS if operation successfully completed, else error
 code or DB_LOCK_WAIT */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_upd_sec_index_entry_low(upd_node_t *node, dtuple_t *old_entry,
-                                que_thr_t *thr) {
+[[nodiscard]] static dberr_t row_upd_sec_index_entry_low(upd_node_t *node,
+                                                         dtuple_t *old_entry,
+                                                         que_thr_t *thr) {
   mtr_t mtr;
   const rec_t *rec;
   btr_pcur_t pcur;
@@ -2268,7 +2267,7 @@
           ut_a(entry);
           row_log_online_op(index, entry, trx->id);
         }
-        /* fall through */
+        [[fallthrough]];
       case ONLINE_INDEX_ABORTED:
       case ONLINE_INDEX_ABORTED_DROPPED:
         mtr_commit(&mtr);
@@ -2412,8 +2411,8 @@
 @param[in]      thr     query thread
 @return DB_SUCCESS if operation successfully completed, else error
 code or DB_LOCK_WAIT */
-static inline MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_upd_sec_index_entry(upd_node_t *node, que_thr_t *thr) {
+[[nodiscard]] static inline dberr_t row_upd_sec_index_entry(upd_node_t *node,
+                                                            que_thr_t *thr) {
   return (row_upd_sec_index_entry_low(node, nullptr, thr));
 }
 
@@ -2423,8 +2422,8 @@
 @param[in]      thr     query thread
 @return DB_SUCCESS if operation successfully completed, else error
 code or DB_LOCK_WAIT */
-static inline MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_upd_del_multi_sec_index_entry(upd_node_t *node, que_thr_t *thr) {
+[[nodiscard]] static inline dberr_t row_upd_del_multi_sec_index_entry(
+    upd_node_t *node, que_thr_t *thr) {
   mem_heap_t *heap;
   dberr_t err = DB_SUCCESS;
   heap = mem_heap_create(1024);
@@ -2465,9 +2464,9 @@
  deletes it if this is a delete.
  @return DB_SUCCESS if operation successfully completed, else error
  code or DB_LOCK_WAIT */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_upd_sec_step(upd_node_t *node, /*!< in: row update node */
-                     que_thr_t *thr)   /*!< in: query thread */
+[[nodiscard]] static dberr_t row_upd_sec_step(
+    upd_node_t *node, /*!< in: row update node */
+    que_thr_t *thr)   /*!< in: query thread */
 {
   ut_ad((node->state == UPD_NODE_UPDATE_ALL_SEC) ||
         (node->state == UPD_NODE_UPDATE_SOME_SEC));
@@ -2582,7 +2581,7 @@
  database applications.
  @return DB_SUCCESS if operation successfully completed, else error
  code or DB_LOCK_WAIT */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t row_upd_clust_rec_by_insert(
+[[nodiscard]] static dberr_t row_upd_clust_rec_by_insert(
     ulint flags,         /*!< in: undo logging and locking flags */
     upd_node_t *node,    /*!< in/out: row update node */
     dict_index_t *index, /*!< in: clustered index of the record */
@@ -2734,13 +2733,14 @@
 some bigger value, we need to log the new autoinc counter. We will
 use the given mtr to do logging for performance reasons.
 @param[in]	node	Row update node
-@param[in,out]	mtr	Mini-transaction */
-static void row_upd_check_autoinc_counter(const upd_node_t *node, mtr_t *mtr) {
+@param[in,out]	mtr	Mini-transaction
+@return true if auto increment needs to be persisted to DD table buffer. */
+static bool row_upd_check_autoinc_counter(const upd_node_t *node, mtr_t *mtr) {
   dict_table_t *table = node->table;
 
   if (!dict_table_has_autoinc_col(table) || table->is_temporary() ||
       node->row == nullptr) {
-    return;
+    return false;
   }
 
   /* If the node->row hasn't been prepared, there must
@@ -2753,7 +2753,7 @@
       row_upd_get_new_autoinc_counter(node->update, table->autoinc_field_no);
 
   if (new_counter == 0) {
-    return;
+    return false;
   }
 
   ib_uint64_t old_counter;
@@ -2767,20 +2767,24 @@
   old_counter = row_get_autoinc_counter(
       node->row, index->get_col_no(table->autoinc_field_no));
 
+  bool persist_autoinc = false;
+
   /* We just check if the updated counter is bigger than
   the old one, which may result in more redo logs, since
   this is safer than checking with the counter in table
   object. */
   if (new_counter > old_counter) {
-    dict_table_autoinc_log(table, new_counter, mtr);
+    persist_autoinc = dict_table_autoinc_log(table, new_counter, mtr);
   }
+
+  return persist_autoinc;
 }
 
 /** Updates a clustered index record of a row when the ordering fields do
  not change.
  @return DB_SUCCESS if operation successfully completed, else error
  code or DB_LOCK_WAIT */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t row_upd_clust_rec(
+[[nodiscard]] static dberr_t row_upd_clust_rec(
     ulint flags,         /*!< in: undo logging and locking flags */
     upd_node_t *node,    /*!< in: row update node */
     dict_index_t *index, /*!< in: clustered index */
@@ -2818,7 +2822,7 @@
 
   /* Check and log if necessary at the beginning, to prevent any
   further potential deadlock */
-  row_upd_check_autoinc_counter(node, mtr);
+  bool persist_autoinc = row_upd_check_autoinc_counter(node, mtr);
 
   /* Try optimistic updating of the record, keeping changes within
   the page; we do not check locks because we assume the x-lock on the
@@ -2917,12 +2921,18 @@
     dtuple_big_rec_free(big_rec);
   }
 
-  return (err);
+  /* Persist auto increment value to DD buffer table if requested. Do it after
+  closing the mini transaction and releasing latches. */
+  if (persist_autoinc) {
+    dict_table_persist_to_dd_table_buffer(node->table);
+  }
+
+  return err;
 }
 
 /** Delete marks a clustered index record.
  @return DB_SUCCESS if operation successfully completed, else error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t row_upd_del_mark_clust_rec(
+[[nodiscard]] static dberr_t row_upd_del_mark_clust_rec(
     ulint flags,         /*!< in: undo logging and locking flags */
     upd_node_t *node,    /*!< in: row update node */
     dict_index_t *index, /*!< in: clustered index */
@@ -2973,9 +2983,9 @@
 /** Updates the clustered index record.
  @return DB_SUCCESS if operation successfully completed, DB_LOCK_WAIT
  in case of a lock wait, else error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    row_upd_clust_step(upd_node_t *node,     /*!< in: row update node */
-                       que_thr_t *const thr) /*!< in: query thread */
+[[nodiscard]] static dberr_t row_upd_clust_step(
+    upd_node_t *node,     /*!< in: row update node */
+    que_thr_t *const thr) /*!< in: query thread */
 {
   dict_index_t *index;
   btr_pcur_t *pcur;
diff -Nru mysql-8.0-8.0.26/storage/innobase/row/row0vers.cc mysql-8.0-8.0.27/storage/innobase/row/row0vers.cc
--- mysql-8.0-8.0.26/storage/innobase/row/row0vers.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/row/row0vers.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1382,7 +1382,6 @@
   ut_ad(!vrow || !(*vrow));
 
   for (;;) {
-    const trx_t *version_trx;
     mem_heap_t *heap2;
     rec_t *prev_version;
     trx_id_t version_trx_id;
@@ -1391,21 +1390,7 @@
     if (rec == version) {
       rec_trx_id = version_trx_id;
     }
-
-    {
-      Trx_shard_latch_guard guard{version_trx_id, UT_LOCATION_HERE};
-      version_trx = trx_get_rw_trx_by_id_low(version_trx_id);
-      /* Because version_trx is a read-write transaction,
-      its state cannot change from or to NOT_STARTED while
-      we are holding the trx_sys->mutex.  It may change from
-      ACTIVE to PREPARED or COMMITTED. */
-      if (version_trx &&
-          trx_state_eq(version_trx, TRX_STATE_COMMITTED_IN_MEMORY)) {
-        version_trx = nullptr;
-      }
-    }
-
-    if (!version_trx) {
+    if (!trx_rw_is_active(version_trx_id, false)) {
     committed_version_trx:
       /* We found a version that belongs to a
       committed transaction: return it. */
diff -Nru mysql-8.0-8.0.26/storage/innobase/srv/srv0srv.cc mysql-8.0-8.0.27/storage/innobase/srv/srv0srv.cc
--- mysql-8.0-8.0.26/storage/innobase/srv/srv0srv.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/srv/srv0srv.cc	2021-09-28 11:46:34.000000000 +0000
@@ -775,8 +775,7 @@
 PSI_stage_info srv_stage_alter_table_flush = {
     0, "alter table (flush)", PSI_FLAG_STAGE_PROGRESS, PSI_DOCUMENT_ME};
 
-/** Performance schema stage event for monitoring ALTER TABLE progress
-row_merge_insert_index_tuples(). */
+/** Performance schema stage event for monitoring ALTER TABLE progress. */
 PSI_stage_info srv_stage_alter_table_insert = {
     0, "alter table (insert)", PSI_FLAG_STAGE_PROGRESS, PSI_DOCUMENT_ME};
 
@@ -792,13 +791,11 @@
     0, "alter table (log apply table)", PSI_FLAG_STAGE_PROGRESS,
     PSI_DOCUMENT_ME};
 
-/** Performance schema stage event for monitoring ALTER TABLE progress
-row_merge_sort(). */
+/** Performance schema stage event for monitoring ALTER TABLE progress. */
 PSI_stage_info srv_stage_alter_table_merge_sort = {
     0, "alter table (merge sort)", PSI_FLAG_STAGE_PROGRESS, PSI_DOCUMENT_ME};
 
-/** Performance schema stage event for monitoring ALTER TABLE progress
-row_merge_read_clustered_index(). */
+/** Performance schema stage event for monitoring ALTER TABLE progress. */
 PSI_stage_info srv_stage_alter_table_read_pk_internal_sort = {
     0, "alter table (read PK and internal sort)", PSI_FLAG_STAGE_PROGRESS,
     PSI_DOCUMENT_ME};
@@ -1083,8 +1080,8 @@
 
   srv_threads.m_purge_workers_n = srv_n_purge_threads;
 
-  srv_threads.m_purge_workers =
-      UT_NEW_ARRAY_NOKEY(IB_thread, srv_threads.m_purge_workers_n);
+  srv_threads.m_purge_workers = ut::new_arr_withkey<IB_thread>(
+      UT_NEW_THIS_FILE_PSI_KEY, ut::Count{srv_threads.m_purge_workers_n});
 
   if (!srv_read_only_mode) {
     /* Number of purge threads + master thread */
@@ -1097,10 +1094,12 @@
 
   srv_threads.m_page_cleaner_workers_n = srv_n_page_cleaners;
 
-  srv_threads.m_page_cleaner_workers =
-      UT_NEW_ARRAY_NOKEY(IB_thread, srv_threads.m_page_cleaner_workers_n);
+  srv_threads.m_page_cleaner_workers = ut::new_arr_withkey<IB_thread>(
+      UT_NEW_THIS_FILE_PSI_KEY,
+      ut::Count{srv_threads.m_page_cleaner_workers_n});
 
-  srv_sys = static_cast<srv_sys_t *>(ut_zalloc_nokey(srv_sys_sz));
+  srv_sys = static_cast<srv_sys_t *>(
+      ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, srv_sys_sz));
 
   srv_sys->n_sys_threads = n_sys_threads;
 
@@ -1193,7 +1192,7 @@
 
   trx_i_s_cache_free(trx_i_s_cache);
 
-  ut_free(srv_sys);
+  ut::free(srv_sys);
 
   srv_sys = nullptr;
 
@@ -1201,7 +1200,7 @@
     for (size_t i = 0; i < srv_threads.m_page_cleaner_workers_n; ++i) {
       srv_threads.m_page_cleaner_workers[i] = {};
     }
-    UT_DELETE_ARRAY(srv_threads.m_page_cleaner_workers);
+    ut::delete_arr(srv_threads.m_page_cleaner_workers);
     srv_threads.m_page_cleaner_workers = nullptr;
   }
 
@@ -1209,7 +1208,7 @@
     for (size_t i = 0; i < srv_threads.m_purge_workers_n; ++i) {
       srv_threads.m_purge_workers[i] = {};
     }
-    UT_DELETE_ARRAY(srv_threads.m_purge_workers);
+    ut::delete_arr(srv_threads.m_purge_workers);
     srv_threads.m_purge_workers = nullptr;
   }
 
@@ -1835,7 +1834,8 @@
       waiter == old_waiter) {
     fatal_cnt++;
     if (fatal_cnt > 10) {
-      ib::fatal(ER_IB_MSG_1047, ulonglong{srv_fatal_semaphore_wait_threshold});
+      ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_1047,
+                ulonglong{srv_fatal_semaphore_wait_threshold});
     }
   } else {
     fatal_cnt = 0;
@@ -2045,8 +2045,7 @@
 @param[in]	a	later timeval
 @param[in]	b	earlier timeval
 @return a - b; number of microseconds between b and a */
-MY_ATTRIBUTE((unused))
-static int64_t timeval_diff_us(timeval a, timeval b) {
+[[maybe_unused]] static int64_t timeval_diff_us(timeval a, timeval b) {
   return ((a.tv_sec - b.tv_sec) * 1000000LL + a.tv_usec - b.tv_usec);
 }
 
@@ -2477,6 +2476,12 @@
     return false;
   }
 
+  Clone_notify notifier(Clone_notify::Type::SPACE_ALTER_ENCRYPT,
+                        dict_sys_t::s_log_space_first_id, false);
+  if (notifier.failed()) {
+    return true;
+  }
+
   dberr_t err;
   byte key[Encryption::KEY_LEN];
   byte iv[Encryption::KEY_LEN];
@@ -2548,6 +2553,7 @@
 bool srv_enable_undo_encryption(bool is_boot) {
   /* Make sure undo::ddl_mutex is owned. */
   ut_ad(mutex_own(&undo::ddl_mutex));
+  bool ret_val = false;
 
   /* Traverse over all UNDO tablespaces and mark them encrypted. */
   undo::spaces->s_lock();
@@ -2566,6 +2572,13 @@
       continue;
     }
 
+    Clone_notify notifier(Clone_notify::Type::SPACE_ALTER_ENCRYPT, space->id,
+                          false);
+    if (notifier.failed()) {
+      ret_val = true;
+      break;
+    }
+
     undo_space->rsegs()->s_lock();
 
     /* Make sure that there is enough reusable space in the redo log files. */
@@ -2578,8 +2591,8 @@
     if (set_undo_tablespace_encryption(undo_space->id(), &mtr, is_boot)) {
       mtr_commit(&mtr);
       undo_space->rsegs()->s_unlock();
-      undo::spaces->s_unlock();
-      return true;
+      ret_val = true;
+      break;
     }
 
     mtr_commit(&mtr);
@@ -2588,9 +2601,9 @@
     /* Announce encryption is successfully enabled for the undo tablespace. */
     ib::info(ER_IB_MSG_1055, undo_space->space_name());
   }
-  undo::spaces->s_unlock();
 
-  return false;
+  undo::spaces->s_unlock();
+  return ret_val;
 }
 
 /** Puts master thread to sleep. At this point we are using polling to
@@ -2656,15 +2669,6 @@
       srv_master_do_idle_tasks();
     }
 
-    /* Let clone wait when redo/undo log encryption is set. If clone is already
-    in progress we skip the check and come back later. */
-    if (!clone_mark_wait()) {
-      continue;
-    }
-
-    /* Allow any blocking clone to progress. */
-    clone_mark_free();
-
     /* Purge any deleted tablespace pages. */
     fil_purge();
   }
@@ -2704,7 +2708,7 @@
 
   srv_slot_t *slot;
 
-  THD *thd = create_thd(false, true, true, 0);
+  THD *thd = create_internal_thd();
 
   ut_ad(!srv_read_only_mode);
 
@@ -2730,7 +2734,7 @@
   srv_master_shutdown_loop();
 
   srv_main_thread_op_info = "exiting";
-  destroy_thd(thd);
+  destroy_internal_thd(thd);
 }
 
 /**
@@ -2804,11 +2808,7 @@
   ut_ad(!srv_read_only_mode);
   ut_a(srv_force_recovery < SRV_FORCE_NO_BACKGROUND);
 
-#ifdef UNIV_PFS_THREAD
-  THD *thd = create_thd(false, true, true, srv_worker_thread_key.m_value);
-#else
-  THD *thd = create_thd(false, true, true, 0);
-#endif
+  THD *thd = create_internal_thd();
 
   rw_lock_x_lock(&purge_sys->latch);
 
@@ -2856,7 +2856,7 @@
 
   rw_lock_x_unlock(&purge_sys->latch);
 
-  destroy_thd(thd);
+  destroy_internal_thd(thd);
 }
 
 /** Do the actual purge operation.
@@ -3052,11 +3052,7 @@
 void srv_purge_coordinator_thread() {
   srv_slot_t *slot;
 
-#ifdef UNIV_PFS_THREAD
-  THD *thd = create_thd(false, true, true, srv_purge_thread_key.m_value);
-#else
-  THD *thd = create_thd(false, true, true, 0);
-#endif
+  THD *thd = create_internal_thd();
 
   rw_lock_x_lock(&purge_sys->latch);
 
@@ -3167,7 +3163,7 @@
   For explanation look at comment for similar usage above. */
   srv_thread_delay_cleanup_if_needed(false);
 
-  destroy_thd(thd);
+  destroy_internal_thd(thd);
 }
 
 /** Enqueues a task to server task queue and releases a worker thread, if there
diff -Nru mysql-8.0-8.0.26/storage/innobase/srv/srv0start.cc mysql-8.0-8.0.27/storage/innobase/srv/srv0start.cc
--- mysql-8.0-8.0.26/storage/innobase/srv/srv0start.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/srv/srv0start.cc	2021-09-28 11:46:34.000000000 +0000
@@ -77,13 +77,13 @@
 #include "mysql/psi/mysql_stage.h"
 #include "mysqld.h"
 
+#include "ddl0fts.h"
 #include "os0file.h"
 #include "os0thread-create.h"
 #include "os0thread.h"
 #include "page0cur.h"
 #include "page0page.h"
 #include "rem0rec.h"
-#include "row0ftsort.h"
 #include "srv0srv.h"
 #include "srv0start.h"
 #include "trx0sys.h"
@@ -182,6 +182,7 @@
 mysql_pfs_key_t buf_resize_thread_key;
 mysql_pfs_key_t clone_ddl_thread_key;
 mysql_pfs_key_t clone_gtid_thread_key;
+mysql_pfs_key_t ddl_thread_key;
 mysql_pfs_key_t dict_stats_thread_key;
 mysql_pfs_key_t fts_optimize_thread_key;
 mysql_pfs_key_t fts_parallel_merge_thread_key;
@@ -282,9 +283,9 @@
 
 /** Creates a log file.
  @return DB_SUCCESS or error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    create_log_file(pfs_os_file_t *file, /*!< out: file handle */
-                    const char *name)    /*!< in: log file name */
+[[nodiscard]] static dberr_t create_log_file(
+    pfs_os_file_t *file, /*!< out: file handle */
+    const char *name)    /*!< in: log file name */
 {
   bool ret;
 
@@ -529,10 +530,10 @@
 
 /** Opens a log file.
  @return DB_SUCCESS or error code */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    open_log_file(pfs_os_file_t *file, /*!< out: file handle */
-                  const char *name,    /*!< in: log file name */
-                  os_offset_t *size)   /*!< out: file size */
+[[nodiscard]] static dberr_t open_log_file(
+    pfs_os_file_t *file, /*!< out: file handle */
+    const char *name,    /*!< in: log file name */
+    os_offset_t *size)   /*!< out: file size */
 {
   bool ret;
 
@@ -707,6 +708,7 @@
   }
 
   ut::aligned_free(first_page);
+  ib::info(ER_IB_MSG_UNDO_ENCRYPTION_INFO_LOADED, space->name);
 
   return (DB_SUCCESS);
 }
@@ -1308,10 +1310,11 @@
   /* Remove the truncate log files if they exist. */
   for (auto space_id : undo::s_under_construction) {
     /* Flush these pages to disk since they were not redo logged. */
-    FlushObserver *flush_observer =
-        UT_NEW_NOKEY(FlushObserver(space_id, nullptr, nullptr));
+    auto flush_observer = ut::new_withkey<Flush_observer>(
+        UT_NEW_THIS_FILE_PSI_KEY, space_id, nullptr, nullptr);
+
     flush_observer->flush();
-    UT_DELETE(flush_observer);
+    ut::delete_(flush_observer);
 
     space_id_t space_num = undo::id2num(space_id);
     if (undo::is_active_truncate_log_present(space_num)) {
@@ -1472,7 +1475,8 @@
 void undo_spaces_init() {
   ut_ad(undo::spaces == nullptr);
 
-  undo::spaces = UT_NEW(undo::Tablespaces(), mem_key_undo_spaces);
+  undo::spaces = ut::new_withkey<undo::Tablespaces>(
+      ut::make_psi_memory_key(mem_key_undo_spaces));
 
   trx_sys_undo_spaces_init();
 
@@ -1490,14 +1494,14 @@
     /* There can't be any active transactions. */
     undo::spaces->clear();
 
-    UT_DELETE(undo::spaces);
+    ut::delete_(undo::spaces);
     undo::spaces = nullptr;
   }
 
   trx_sys_undo_spaces_deinit();
 
   if (undo::space_id_bank != nullptr) {
-    UT_DELETE_ARRAY(undo::space_id_bank);
+    ut::delete_arr(undo::space_id_bank);
     undo::space_id_bank = nullptr;
   }
 }
@@ -1981,8 +1985,14 @@
 
   srv_boot();
 
-  ib::info(ER_IB_MSG_1126) << (ut_crc32_cpu_enabled ? "Using" : "Not using")
-                           << " CPU crc32 instructions";
+  ib::info(ER_IB_MSG_1126)
+      << "Using "
+      << (ut_crc32_cpu_enabled ? (ut_poly_mul_cpu_enabled
+                                      ? "hardware accelerated crc32 and "
+                                        "polynomial multiplication."
+                                      : "hardware accelerated crc32 and "
+                                        "software polynomial multiplication.")
+                               : "software crc32.");
 
   os_create_block_cache();
 
@@ -2034,7 +2044,8 @@
     mutex_create(LATCH_ID_SRV_MONITOR_FILE, &srv_monitor_file_mutex);
 
     if (srv_innodb_status) {
-      srv_monitor_file_name = static_cast<char *>(ut_malloc_nokey(
+      srv_monitor_file_name = static_cast<char *>(ut::malloc_withkey(
+          UT_NEW_THIS_FILE_PSI_KEY,
           MySQL_datadir_path.len() + 20 + sizeof "/innodb_status."));
 
       sprintf(srv_monitor_file_name, "%s/innodb_status." ULINTPF,
@@ -2144,23 +2155,33 @@
   Please see innobase_start_or_create_for_mysql() */
   ulint start = (srv_read_only_mode) ? 0 : 2;
 
+  /* Sequence number displayed in the thread os name. */
+  PSI_thread_seqnum pfs_seqnum;
+
   for (ulint t = 0; t < srv_n_file_io_threads; ++t) {
     IB_thread thread;
     if (t < start) {
       if (t == 0) {
-        thread = os_thread_create(io_ibuf_thread_key, io_handler_thread, t);
+        thread = os_thread_create(io_ibuf_thread_key, 0, io_handler_thread, t);
       } else {
         ut_ad(t == 1);
-        thread = os_thread_create(io_log_thread_key, io_handler_thread, t);
+        thread = os_thread_create(io_log_thread_key, 0, io_handler_thread, t);
       }
     } else if (t >= start && t < (start + srv_n_read_io_threads)) {
-      thread = os_thread_create(io_read_thread_key, io_handler_thread, t);
+      /* Numbering for ib_io_rd-NN starts with N=1. */
+      pfs_seqnum = t + 1 - start;
+      thread = os_thread_create(io_read_thread_key, pfs_seqnum,
+                                io_handler_thread, t);
 
     } else if (t >= (start + srv_n_read_io_threads) &&
                t < (start + srv_n_read_io_threads + srv_n_write_io_threads)) {
-      thread = os_thread_create(io_write_thread_key, io_handler_thread, t);
+      /* Numbering for ib_io_wr-NN starts with N=1. */
+      pfs_seqnum = t + 1 - start - srv_n_read_io_threads;
+      thread = os_thread_create(io_write_thread_key, pfs_seqnum,
+                                io_handler_thread, t);
     } else {
-      thread = os_thread_create(io_handler_thread_key, io_handler_thread, t);
+      /* Dead code ? */
+      thread = os_thread_create(io_handler_thread_key, t, io_handler_thread, t);
     }
     thread.start();
   }
@@ -2192,7 +2213,7 @@
       break;
     case DB_CANNOT_OPEN_FILE:
       ib::error(ER_IB_MSG_1134);
-      /* fall through */
+      [[fallthrough]];
     default:
 
       /* Other errors might come from
@@ -2553,6 +2574,11 @@
 
     srv_dict_metadata = recv_recovery_from_checkpoint_finish(*log_sys, false);
 
+    if (recv_sys->is_cloned_db && srv_dict_metadata != nullptr) {
+      ut::delete_(srv_dict_metadata);
+      srv_dict_metadata = nullptr;
+    }
+
     /* We need to save the dynamic metadata collected from redo log to DD
     buffer table here. This is to make sure that the dynamic metadata is not
     lost by any future checkpoint. Since DD and data dictionary in memory
@@ -2579,7 +2605,8 @@
         fil_space_release(space);
       }
 
-      dict_persist->table_buffer = UT_NEW_NOKEY(DDTableBuffer());
+      dict_persist->table_buffer =
+          ut::new_withkey<DDTableBuffer>(UT_NEW_THIS_FILE_PSI_KEY);
       /* We write redo log here. We assume that there should be enough room in
       log files, supposing log_free_check() works fine before crash. */
       srv_dict_metadata->store();
@@ -2605,6 +2632,15 @@
 
       log_stop_background_threads(*log_sys);
 
+      /* Make sure redo log is flushed after checkpoint thread is stopped. On
+      windows, Fil_shard::close_file intermittently hits mismatching
+      modification_counter and flush_counter assert while closing redo files.
+      This is likely because we flush redo in log_fsync (during checkpoint)
+      conditionally based on flush mode. Thus flush counter could remain behind
+      if checkpoint occurs after flush in srv_prepare_to_delete_redo_log_files.
+      This call is idempotent and should be harmless here. */
+      fil_flush_file_redo();
+
       /* Prohibit redo log writes from any other
       threads until creating a log checkpoint at the
       end of create_log_files(). */
@@ -2783,20 +2819,20 @@
 
     /* Create the thread which watches the timeouts
     for lock waits */
-    srv_threads.m_lock_wait_timeout =
-        os_thread_create(srv_lock_timeout_thread_key, lock_wait_timeout_thread);
+    srv_threads.m_lock_wait_timeout = os_thread_create(
+        srv_lock_timeout_thread_key, 0, lock_wait_timeout_thread);
 
     srv_threads.m_lock_wait_timeout.start();
 
     /* Create the thread which warns of long semaphore waits */
     srv_threads.m_error_monitor = os_thread_create(srv_error_monitor_thread_key,
-                                                   srv_error_monitor_thread);
+                                                   0, srv_error_monitor_thread);
 
     srv_threads.m_error_monitor.start();
 
     /* Create the thread which prints InnoDB monitor info */
     srv_threads.m_monitor =
-        os_thread_create(srv_monitor_thread_key, srv_monitor_thread);
+        os_thread_create(srv_monitor_thread_key, 0, srv_monitor_thread);
 
     srv_threads.m_monitor.start();
 
@@ -2897,7 +2933,7 @@
 
   if (srv_dict_metadata != nullptr) {
     srv_dict_metadata->apply();
-    UT_DELETE(srv_dict_metadata);
+    ut::delete_(srv_dict_metadata);
     srv_dict_metadata = nullptr;
   }
 }
@@ -2905,7 +2941,8 @@
 /** On a restart, initialize the remaining InnoDB subsystems so that
 any tables (including data dictionary tables) can be accessed. */
 void srv_dict_recover_on_restart() {
-  trx_resurrect_locks();
+  /* Resurrect locks for dictionary transactions */
+  trx_resurrect_locks(false);
 
   /* Roll back any recovered data dictionary transactions, so
   that the data dictionary tables will be free of any locks.
@@ -2915,6 +2952,43 @@
     trx_rollback_or_clean_recovered(FALSE);
   }
 
+  /* Resurrect locks for non-dictionary transactions only after rolling back all
+  dictionary transactions. This is required as of today since we read
+  uncommitted data while constructing table object in dd_table_open_on_id_low.
+  This is done only while looking for the DD space object
+  client->acquire_uncached_uncommitted<dd::Tablespace>().
+
+  TODO-1: dd_table_open_on_id_low : Reading uncommitted data doesn't seem
+  correct and needs to be analyzed and possibly fixed.
+
+  Till that time we let all DD transactions to rollback to avoid reading dirty
+  data from incomplete DDL commands while resurrecting locks. It essentially
+  fixes two independent issues.
+
+  1. Not able to resurrect table locks for uncommitted transaction.
+
+  2. Not able to load innodb dict_* object for the table involved in the DDL.
+     This could result in much more serious issue when binary log is enabled
+     and crash happens after the transaction is prepared. Currently in binlog
+     transaction recovery path no session THD is created and we rely on cached
+     dict_* object to find out if a table is dropped. If the dict_table_t
+     object is not already loaded, the table is considered dropped and undo
+     apply is skipped. This would further result in uncommitted but prepared
+     transaction data being committed and persisted.
+
+  TODO-2: Have session (THD) while doing binary log recovery. The lack of
+  THD seems not correct since rollback requires DD metadata. This alone would
+  have prevented transaction inconsistency between innodb and binlog even if we
+  failed to resurrect the table locks.
+  binlog_recover->ha_recover->xarecover_handlerton->innobase_rollback_by_xid
+  ->innobase_rollback_trx
+
+  Note: The current work around fixes both issues but ideally should not be
+  required if base issues [TODOs] are fixed. */
+  trx_resurrect_locks(true);
+
+  trx_clear_resurrected_table_ids();
+
   /* Do after all DD transactions recovery, to get consistent metadata */
   apply_dynamic_metadata();
 
@@ -2932,14 +3006,14 @@
   }
 
   srv_threads.m_purge_coordinator =
-      os_thread_create(srv_purge_thread_key, srv_purge_coordinator_thread);
+      os_thread_create(srv_purge_thread_key, 0, srv_purge_coordinator_thread);
 
   srv_threads.m_purge_workers[0] = srv_threads.m_purge_coordinator;
 
   /* We've already created the purge coordinator thread above. */
   for (size_t i = 1; i < srv_threads.m_purge_workers_n; ++i) {
     srv_threads.m_purge_workers[i] =
-        os_thread_create(srv_worker_thread_key, srv_worker_thread);
+        os_thread_create(srv_worker_thread_key, i, srv_worker_thread);
   }
 
   for (size_t i = 0; i < srv_threads.m_purge_workers_n; ++i) {
@@ -2977,7 +3051,7 @@
   }
 
   srv_threads.m_buf_resize =
-      os_thread_create(buf_resize_thread_key, buf_resize_thread);
+      os_thread_create(buf_resize_thread_key, 0, buf_resize_thread);
 
   srv_threads.m_buf_resize.start();
 
@@ -2991,7 +3065,7 @@
     /* Rollback all recovered transactions that are
     not in committed nor in XA PREPARE state. */
     srv_threads.m_trx_recovery_rollback = os_thread_create(
-        trx_recovery_rollback_thread_key, trx_recovery_rollback_thread);
+        trx_recovery_rollback_thread_key, 0, trx_recovery_rollback_thread);
 
     srv_threads.m_trx_recovery_rollback.start();
   }
@@ -2999,7 +3073,7 @@
   /* Create the master thread which does purge and other utility
   operations */
   srv_threads.m_master =
-      os_thread_create(srv_master_thread_key, srv_master_thread);
+      os_thread_create(srv_master_thread_key, 0, srv_master_thread);
 
   srv_start_state_set(SRV_START_STATE_MASTER);
 
@@ -3016,7 +3090,7 @@
 
   /* Create the dict stats gathering thread */
   srv_threads.m_dict_stats =
-      os_thread_create(dict_stats_thread_key, dict_stats_thread);
+      os_thread_create(dict_stats_thread_key, 0, dict_stats_thread);
 
   dict_stats_thread_init();
 
@@ -3032,14 +3106,14 @@
   /* Start the buffer pool dump/load thread, which will access spaces thus
         must wait for DDL recovery */
   srv_threads.m_buf_dump =
-      os_thread_create(buf_dump_thread_key, buf_dump_thread);
+      os_thread_create(buf_dump_thread_key, 0, buf_dump_thread);
 
   srv_threads.m_buf_dump.start();
 
   /* Resume unfinished (un)encryption process in background thread. */
   if (!ts_encrypt_ddl_records.empty()) {
     srv_threads.m_ts_alter_encrypt =
-        os_thread_create(srv_ts_alter_encrypt_thread_key,
+        os_thread_create(srv_ts_alter_encrypt_thread_key, 0,
                          fsp_init_resume_alter_encrypt_tablespace);
 
     mysql_mutex_lock(&resume_encryption_cond_m);
@@ -3598,7 +3672,7 @@
     srv_monitor_file = nullptr;
     if (srv_monitor_file_name) {
       unlink(srv_monitor_file_name);
-      ut_free(srv_monitor_file_name);
+      ut::free(srv_monitor_file_name);
     }
     mutex_free(&srv_monitor_file_mutex);
   }
@@ -3625,7 +3699,7 @@
   btr_search_sys_free();
   undo_spaces_deinit();
 
-  UT_DELETE(srv_dict_metadata);
+  ut::delete_(srv_dict_metadata);
 
   os_aio_free();
   que_close();
@@ -3667,7 +3741,7 @@
 
   strcpy(filename, filepath);
 
-  ut_free(filepath);
+  ut::free(filepath);
 }
 
 /** Call std::_Exit(3) */
diff -Nru mysql-8.0-8.0.26/storage/innobase/srv/srv0tmp.cc mysql-8.0-8.0.27/storage/innobase/srv/srv0tmp.cc
--- mysql-8.0-8.0.26/storage/innobase/srv/srv0tmp.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/srv/srv0tmp.cc	2021-09-28 11:46:34.000000000 +0000
@@ -186,14 +186,14 @@
 Tablespace_pool::~Tablespace_pool() {
   mutex_destroy(&m_mutex);
   for (Tablespace *ts : *m_active) {
-    UT_DELETE(ts);
+    ut::delete_(ts);
   }
 
   for (Tablespace *ts : *m_free) {
-    UT_DELETE(ts);
+    ut::delete_(ts);
   }
-  UT_DELETE(m_active);
-  UT_DELETE(m_free);
+  ut::delete_(m_active);
+  ut::delete_(m_free);
 }
 
 Tablespace *Tablespace_pool::get(my_thread_id id, enum tbsp_purpose purpose) {
@@ -253,12 +253,12 @@
 
   ut_ad(m_active == nullptr && m_free == nullptr);
 
-  m_active = UT_NEW_NOKEY(Pool());
+  m_active = ut::new_withkey<Pool>(UT_NEW_THIS_FILE_PSI_KEY);
   if (m_active == nullptr) {
     return (DB_OUT_OF_MEMORY);
   }
 
-  m_free = UT_NEW_NOKEY(Pool());
+  m_free = ut::new_withkey<Pool>(UT_NEW_THIS_FILE_PSI_KEY);
   if (m_free == nullptr) {
     return (DB_OUT_OF_MEMORY);
   }
@@ -276,7 +276,7 @@
 dberr_t Tablespace_pool::expand(size_t size) {
   ut_ad(!m_pool_initialized || mutex_own(&m_mutex));
   for (size_t i = 0; i < size; i++) {
-    Tablespace *ts = UT_NEW_NOKEY(Tablespace());
+    Tablespace *ts = ut::new_withkey<Tablespace>(UT_NEW_THIS_FILE_PSI_KEY);
 
     if (ts == nullptr) {
       return (DB_OUT_OF_MEMORY);
@@ -287,7 +287,7 @@
     if (err == DB_SUCCESS) {
       m_free->push_back(ts);
     } else {
-      UT_DELETE(ts);
+      ut::delete_(ts);
       return (err);
     }
   }
@@ -367,7 +367,8 @@
     return (err);
   }
 
-  tbsp_pool = UT_NEW_NOKEY(Tablespace_pool(INIT_SIZE));
+  tbsp_pool =
+      ut::new_withkey<Tablespace_pool>(UT_NEW_THIS_FILE_PSI_KEY, INIT_SIZE);
   if (tbsp_pool == nullptr) {
     return (DB_OUT_OF_MEMORY);
   }
@@ -382,7 +383,7 @@
   tbsp_pool->free_ts(ts);
 }
 
-void delete_pool_manager() { UT_DELETE(tbsp_pool); }
+void delete_pool_manager() { ut::delete_(tbsp_pool); }
 
 void close_files() {
   auto close = [&](const ibt::Tablespace *ts) { ts->close(); };
diff -Nru mysql-8.0-8.0.26/storage/innobase/sync/sync0arr.cc mysql-8.0-8.0.27/storage/innobase/sync/sync0arr.cc
--- mysql-8.0-8.0.26/storage/innobase/sync/sync0arr.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/sync/sync0arr.cc	2021-09-28 11:46:34.000000000 +0000
@@ -118,7 +118,8 @@
                                                            first_free_slot() {
   ut_a(num_cells > 0);
 
-  cells = UT_NEW_ARRAY_NOKEY(sync_cell_t, num_cells);
+  cells = ut::new_arr_withkey<sync_cell_t>(UT_NEW_THIS_FILE_PSI_KEY,
+                                           ut::Count{num_cells});
 
   n_cells = num_cells;
 
@@ -138,7 +139,7 @@
 
   mutex_free(&mutex);
 
-  UT_DELETE_ARRAY(cells);
+  ut::delete_arr(cells);
 }
 
 sync_cell_t *sync_array_get_nth_cell(sync_array_t *arr, ulint n) {
@@ -150,7 +151,7 @@
 /** Frees the resources in a wait array. */
 static void sync_array_free(sync_array_t *arr) /*!< in, own: sync wait array */
 {
-  UT_DELETE(arr);
+  ut::delete_(arr);
 }
 
 /** Returns the event that the thread owning the cell waits for. */
@@ -311,9 +312,9 @@
 
   if (sync_array_detect_deadlock(arr, cell, cell, 0)) {
 #ifdef UNIV_NO_ERR_MSGS
-    ib::fatal()
+    ib::fatal(UT_LOCATION_HERE)
 #else
-    ib::fatal(ER_IB_MSG_1157)
+    ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_1157)
 #endif /* UNIV_NO_ERR_MSGS */
         << "########################################"
            " Deadlock Detected!";
@@ -650,7 +651,7 @@
             if (thread == cell->thread_id) {
               break;
             }
-            /* fall through */
+            [[fallthrough]];
           case RW_LOCK_S:
 
             /* The (wait) x-lock request can block
@@ -1026,12 +1027,14 @@
 
   sync_array_size = srv_sync_array_size;
 
-  sync_wait_array = UT_NEW_ARRAY_NOKEY(sync_array_t *, sync_array_size);
+  sync_wait_array = ut::new_arr_withkey<sync_array_t *>(
+      UT_NEW_THIS_FILE_PSI_KEY, ut::Count{sync_array_size});
 
   ulint n_slots = 1 + (n_threads - 1) / sync_array_size;
 
   for (ulint i = 0; i < sync_array_size; ++i) {
-    sync_wait_array[i] = UT_NEW_NOKEY(sync_array_t(n_slots));
+    sync_wait_array[i] =
+        ut::new_withkey<sync_array_t>(UT_NEW_THIS_FILE_PSI_KEY, n_slots);
   }
 }
 
@@ -1041,7 +1044,7 @@
     sync_array_free(sync_wait_array[i]);
   }
 
-  UT_DELETE_ARRAY(sync_wait_array);
+  ut::delete_arr(sync_wait_array);
   sync_wait_array = nullptr;
 }
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/sync/sync0debug.cc mysql-8.0-8.0.27/storage/innobase/sync/sync0debug.cc
--- mysql-8.0-8.0.26/storage/innobase/sync/sync0debug.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/sync/sync0debug.cc	2021-09-28 11:46:34.000000000 +0000
@@ -56,6 +56,9 @@
 #include "ut0new.h"
 
 #ifdef UNIV_DEBUG
+#ifndef UNIV_NO_ERR_MSGS
+#include <current_thd.h>
+#endif /* !UNIV_NO_ERR_MSGS */
 
 bool srv_sync_debug;
 
@@ -103,7 +106,7 @@
 };
 
 /** Thread specific latches. This is ordered on level in descending order. */
-typedef std::vector<Latched, ut_allocator<Latched>> Latches;
+typedef std::vector<Latched, ut::allocator<Latched>> Latches;
 
 /** The deadlock detector. */
 struct LatchDebug {
@@ -113,7 +116,7 @@
 
   /** For tracking a thread's latches. */
   typedef std::map<std::thread::id, Latches *, std::less<std::thread::id>,
-                   ut_allocator<std::pair<const std::thread::id, Latches *>>>
+                   ut::allocator<std::pair<const std::thread::id, Latches *>>>
       ThreadMap;
 
   /** Constructor */
@@ -312,7 +315,7 @@
   static void create_instance() UNIV_NOTHROW {
     ut_ad(s_instance == nullptr);
 
-    s_instance = UT_NEW_NOKEY(LatchDebug());
+    s_instance = ut::new_withkey<LatchDebug>(UT_NEW_THIS_FILE_PSI_KEY);
   }
 
  private:
@@ -356,7 +359,7 @@
   };
 
   typedef std::map<latch_level_t, std::string, latch_level_less,
-                   ut_allocator<std::pair<const latch_level_t, std::string>>>
+                   ut::allocator<std::pair<const latch_level_t, std::string>>>
       Levels;
 
   /** Mutex protecting the deadlock detector data structures. */
@@ -609,7 +612,7 @@
   } else {
     typedef ThreadMap::value_type value_type;
 
-    Latches *latches = UT_NEW_NOKEY(Latches());
+    Latches *latches = ut::new_withkey<Latches>(UT_NEW_THIS_FILE_PSI_KEY);
 
     ut_a(latches != nullptr);
 
@@ -962,7 +965,7 @@
 
         m_mutex.exit();
 
-        UT_DELETE(latches);
+        ut::delete_(latches);
       }
 
       return;
@@ -1139,7 +1142,7 @@
     return;
   }
 
-  UT_DELETE(s_instance);
+  ut::delete_(s_instance);
 
   LatchDebug::s_instance = nullptr;
 }
@@ -1210,6 +1213,8 @@
 
   LATCH_ADD_MUTEX(AUTOINC, SYNC_DICT_AUTOINC_MUTEX, autoinc_mutex_key);
 
+  LATCH_ADD_MUTEX(DDL_AUTOINC, SYNC_NO_ORDER_CHECK, ddl_autoinc_mutex_key);
+
 #ifdef PFS_SKIP_BUFFER_MUTEX_RWLOCK
   LATCH_ADD_MUTEX(BUF_BLOCK_MUTEX, SYNC_BUF_BLOCK, PFS_NOT_INSTRUMENTED);
 #else
@@ -1526,7 +1531,7 @@
 static void sync_latch_meta_destroy() {
   for (LatchMetaData::iterator it = latch_meta.begin(); it != latch_meta.end();
        ++it) {
-    UT_DELETE(*it);
+    ut::delete_(*it);
   }
 
   latch_meta.clear();
@@ -1628,7 +1633,7 @@
 
   /** Map the mutex instance to where it was created */
   typedef std::map<const void *, File, std::less<const void *>,
-                   ut_allocator<std::pair<const void *const, File>>>
+                   ut::allocator<std::pair<const void *const, File>>>
       Files;
 
   typedef OSMutex Mutex;
@@ -1672,10 +1677,10 @@
   ut_d(LatchDebug::s_initialized = true);
 
   /** For collecting latch statistic - SHOW ... MUTEX */
-  mutex_monitor = UT_NEW_NOKEY(MutexMonitor());
+  mutex_monitor = ut::new_withkey<MutexMonitor>(UT_NEW_THIS_FILE_PSI_KEY);
 
   /** For trcking mutex creation location */
-  create_tracker = UT_NEW_NOKEY(CreateTracker());
+  create_tracker = ut::new_withkey<CreateTracker>(UT_NEW_THIS_FILE_PSI_KEY);
 
   sync_latch_meta_init();
 
@@ -1697,13 +1702,86 @@
 
   sync_array_close();
 
-  UT_DELETE(mutex_monitor);
+  ut::delete_(mutex_monitor);
 
   mutex_monitor = nullptr;
 
-  UT_DELETE(create_tracker);
+  ut::delete_(create_tracker);
 
   create_tracker = nullptr;
 
   sync_latch_meta_destroy();
 }
+
+#ifdef UNIV_DEBUG
+std::mutex Sync_point::s_mutex{};
+Sync_point::Sync_points Sync_point::s_sync_points{};
+
+void Sync_point::add(const THD *thd, const std::string &target) noexcept {
+  const std::lock_guard<std::mutex> lock(s_mutex);
+
+  auto r1 = std::find_if(
+      std::begin(s_sync_points), std::end(s_sync_points),
+      [=](const Sync_point &sync_point) { return thd == sync_point.m_thd; });
+
+  if (r1 != s_sync_points.end()) {
+    const auto &b = std::begin(r1->m_targets);
+    const auto &e = std::end(r1->m_targets);
+    const auto r2 = std::find(b, e, target);
+
+    if (r2 == e) {
+      r1->m_targets.push_back(target);
+    }
+  } else {
+    s_sync_points.push_back(Sync_point{thd});
+    s_sync_points.back().m_targets.push_back(target);
+  }
+}
+
+bool Sync_point::enabled(const THD *thd, const std::string &target) noexcept {
+  const std::lock_guard<std::mutex> lock(s_mutex);
+
+  auto r1 = std::find_if(
+      std::begin(s_sync_points), std::end(s_sync_points),
+      [=](const Sync_point &sync_point) { return thd == sync_point.m_thd; });
+
+  if (r1 == s_sync_points.end()) {
+    return false;
+  }
+
+  const auto &b = std::begin(r1->m_targets);
+  const auto &e = std::end(r1->m_targets);
+  const auto r2 = std::find(b, e, target);
+
+  return r2 != e;
+}
+
+bool Sync_point::enabled(const std::string &target) noexcept {
+#ifndef UNIV_NO_ERR_MSGS
+  return enabled(current_thd, target);
+#else
+  return false;
+#endif /* !UNIV_NO_ERR_MSGS */
+}
+
+void Sync_point::erase(const THD *thd, const std::string &target) noexcept {
+  const std::lock_guard<std::mutex> lock(s_mutex);
+
+  auto r1 = std::find_if(
+      std::begin(s_sync_points), std::end(s_sync_points),
+      [=](const Sync_point &sync_point) { return thd == sync_point.m_thd; });
+
+  if (r1 != s_sync_points.end()) {
+    const auto &b = std::begin(r1->m_targets);
+    const auto &e = std::end(r1->m_targets);
+    const auto r2 = std::find(b, e, target);
+
+    if (r2 != e) {
+      r1->m_targets.erase(r2);
+      if (r1->m_targets.empty()) {
+        s_sync_points.erase(r1);
+      }
+    }
+  }
+}
+#endif /* UNIV_DEBUG */
diff -Nru mysql-8.0-8.0.26/storage/innobase/sync/sync0rw.cc mysql-8.0-8.0.27/storage/innobase/sync/sync0rw.cc
--- mysql-8.0-8.0.26/storage/innobase/sync/sync0rw.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/sync/sync0rw.cc	2021-09-28 11:46:34.000000000 +0000
@@ -179,11 +179,12 @@
 /** Creates a debug info struct.
  @return own: debug info struct */
 static rw_lock_debug_t *rw_lock_debug_create(void) {
-  return ((rw_lock_debug_t *)ut_malloc_nokey(sizeof(rw_lock_debug_t)));
+  return ((rw_lock_debug_t *)ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY,
+                                                sizeof(rw_lock_debug_t)));
 }
 
 /** Frees a debug info struct. */
-static void rw_lock_debug_free(rw_lock_debug_t *info) { ut_free(info); }
+static void rw_lock_debug_free(rw_lock_debug_t *info) { ut::free(info); }
 #endif /* UNIV_DEBUG */
 
 /** Creates, or rather, initializes an rw-lock object in a specified memory
diff -Nru mysql-8.0-8.0.26/storage/innobase/sync/sync0sync.cc mysql-8.0-8.0.27/storage/innobase/sync/sync0sync.cc
--- mysql-8.0-8.0.26/storage/innobase/sync/sync0sync.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/sync/sync0sync.cc	2021-09-28 11:46:34.000000000 +0000
@@ -62,6 +62,7 @@
 mysql_pfs_key_t buf_pool_zip_hash_mutex_key;
 mysql_pfs_key_t buf_pool_zip_mutex_key;
 mysql_pfs_key_t cache_last_read_mutex_key;
+mysql_pfs_key_t ddl_autoinc_mutex_key;
 mysql_pfs_key_t dict_foreign_err_mutex_key;
 mysql_pfs_key_t dict_persist_dirty_tables_mutex_key;
 mysql_pfs_key_t dict_sys_mutex_key;
diff -Nru mysql-8.0-8.0.26/storage/innobase/trx/trx0i_s.cc mysql-8.0-8.0.27/storage/innobase/trx/trx0i_s.cc
--- mysql-8.0-8.0.26/storage/innobase/trx/trx0i_s.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/trx/trx0i_s.cc	2021-09-28 11:46:34.000000000 +0000
@@ -178,11 +178,6 @@
                             rw_lock member */
   i_s_table_cache_t innodb_trx;     /*!< innodb_trx table */
   i_s_table_cache_t innodb_locks;   /*!< innodb_locks table */
-/** the hash table size is LOCKS_HASH_CELLS_NUM * sizeof(void*) bytes */
-#define LOCKS_HASH_CELLS_NUM 10000
-  hash_table_t *locks_hash; /*!< hash table used to eliminate
-                            duplicate entries in the
-                            innodb_locks table */
 /** Initial size of the cache storage */
 #define CACHE_STORAGE_INITIAL_SIZE 1024
 /** Number of hash cells in the cache storage */
@@ -259,7 +254,7 @@
     /* the memory is actually allocated in
     table_cache_create_empty_row() */
     if (table_cache->chunks[i].base) {
-      ut_free(table_cache->chunks[i].base);
+      ut::free(table_cache->chunks[i].base);
       table_cache->chunks[i].base = nullptr;
     }
   }
@@ -331,7 +326,7 @@
     chunk = &table_cache->chunks[i];
 
     got_bytes = req_bytes;
-    chunk->base = ut_malloc_nokey(req_bytes);
+    chunk->base = ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, req_bytes);
 
     got_rows = got_bytes / table_cache->row_size;
 
@@ -854,8 +849,6 @@
   cache->innodb_trx.rows_used = 0;
   cache->innodb_locks.rows_used = 0;
 
-  hash_table_clear(cache->locks_hash);
-
   ha_storage_empty(&cache->storage);
 }
 
@@ -1011,8 +1004,8 @@
   release trx_i_s_cache_t::last_read_mutex
   release trx_i_s_cache_t::rw_lock */
 
-  cache->rw_lock =
-      static_cast<rw_lock_t *>(ut_malloc_nokey(sizeof(*cache->rw_lock)));
+  cache->rw_lock = static_cast<rw_lock_t *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sizeof(*cache->rw_lock)));
 
   rw_lock_create(trx_i_s_cache_lock_key, cache->rw_lock, SYNC_TRX_I_S_RWLOCK);
 
@@ -1023,8 +1016,6 @@
   table_cache_init(&cache->innodb_trx, sizeof(i_s_trx_row_t));
   table_cache_init(&cache->innodb_locks, sizeof(i_s_locks_row_t));
 
-  cache->locks_hash = hash_create(LOCKS_HASH_CELLS_NUM);
-
   cache->storage =
       ha_storage_create(CACHE_STORAGE_INITIAL_SIZE, CACHE_STORAGE_HASH_CELLS);
 
@@ -1037,12 +1028,11 @@
 void trx_i_s_cache_free(trx_i_s_cache_t *cache) /*!< in, own: cache to free */
 {
   rw_lock_free(cache->rw_lock);
-  ut_free(cache->rw_lock);
+  ut::free(cache->rw_lock);
   cache->rw_lock = nullptr;
 
   mutex_free(&cache->last_read_mutex);
 
-  hash_table_free(cache->locks_hash);
   ha_storage_free(cache->storage);
   table_cache_free(&cache->innodb_trx);
   table_cache_free(&cache->innodb_locks);
diff -Nru mysql-8.0-8.0.26/storage/innobase/trx/trx0purge.cc mysql-8.0-8.0.27/storage/innobase/trx/trx0purge.cc
--- mysql-8.0-8.0.26/storage/innobase/trx/trx0purge.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/trx/trx0purge.cc	2021-09-28 11:46:34.000000000 +0000
@@ -209,7 +209,8 @@
 }
 
 void trx_purge_sys_mem_create() {
-  purge_sys = static_cast<trx_purge_t *>(ut_zalloc_nokey(sizeof(*purge_sys)));
+  purge_sys = static_cast<trx_purge_t *>(
+      ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sizeof(*purge_sys)));
 
   purge_sys->state = PURGE_STATE_INIT;
   purge_sys->event = os_event_create();
@@ -260,7 +261,8 @@
 
   purge_sys->view_active = true;
 
-  purge_sys->rseg_iter = UT_NEW_NOKEY(TrxUndoRsegsIterator(purge_sys));
+  purge_sys->rseg_iter = ut::new_withkey<TrxUndoRsegsIterator>(
+      UT_NEW_THIS_FILE_PSI_KEY, purge_sys);
 }
 
 void trx_purge_sys_close() {
@@ -282,7 +284,7 @@
   mutex_free(&purge_sys->pq_mutex);
 
   if (purge_sys->purge_queue != nullptr) {
-    UT_DELETE(purge_sys->purge_queue);
+    ut::delete_(purge_sys->purge_queue);
     purge_sys->purge_queue = nullptr;
   }
 
@@ -294,13 +296,13 @@
 
   purge_sys->heap = nullptr;
 
-  UT_DELETE(purge_sys->rseg_iter);
+  ut::delete_(purge_sys->rseg_iter);
 
   call_destructor(&purge_sys->thds);
   call_destructor(&purge_sys->undo_trunc);
   call_destructor(&purge_sys->rsegs_queue);
 
-  ut_free(purge_sys);
+  ut::free(purge_sys);
 
   purge_sys = nullptr;
 }
@@ -342,7 +344,7 @@
     /* The undo log segment will not be reused */
 
     if (UNIV_UNLIKELY(undo->id >= TRX_RSEG_N_SLOTS)) {
-      ib::fatal(ER_IB_MSG_1165) << "undo->id is " << undo->id;
+      ib::fatal(UT_LOCATION_HERE, ER_IB_MSG_1165) << "undo->id is " << undo->id;
     }
 
     trx_rsegf_set_nth_undo(rseg_header, undo->id, FIL_NULL, mtr);
@@ -616,8 +618,9 @@
 space ID is needed in that range the max space ID will be used first.
 As truncation occurs, the space_ids are assigned from max down to min. */
 void init_space_id_bank() {
-  space_id_bank = UT_NEW_ARRAY(struct space_id_account,
-                               FSP_MAX_UNDO_TABLESPACES, mem_key_undo_spaces);
+  space_id_bank = ut::new_arr_withkey<struct space_id_account>(
+      ut::make_psi_memory_key(mem_key_undo_spaces),
+      ut::Count{FSP_MAX_UNDO_TABLESPACES});
 
   for (size_t slot = 0; slot < FSP_MAX_UNDO_TABLESPACES; slot++) {
     undo::space_id_bank[slot].space_id = SPACE_UNKNOWN;
@@ -775,7 +778,8 @@
 
   size_t size = sizeof(undo_space_name) + 3 + (old ? 0 : 1);
 
-  char *name = static_cast<char *>(ut_malloc_nokey(size));
+  char *name =
+      static_cast<char *>(ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, size));
 
   snprintf(name, size, (old ? "%s%03" SPACE_ID_PFS : "%s_%03" SPACE_ID_PFS),
            undo_space_name, static_cast<unsigned>(id2num(space_id)));
@@ -797,7 +801,8 @@
   size_t size = strlen(srv_undo_dir) + (with_sep ? 0 : 1) + sizeof("undo000") +
                 (old ? 0 : 1);
 
-  char *name = static_cast<char *>(ut_malloc_nokey(size));
+  char *name =
+      static_cast<char *>(ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, size));
 
   memcpy(name, srv_undo_dir, len);
 
@@ -820,12 +825,13 @@
 
 void Tablespace::set_space_name(const char *new_space_name) {
   if (m_space_name != nullptr) {
-    ut_free(m_space_name);
+    ut::free(m_space_name);
     m_space_name = nullptr;
   }
 
   size_t size = strlen(new_space_name) + 1;
-  m_space_name = static_cast<char *>(ut_malloc_nokey(size));
+  m_space_name =
+      static_cast<char *>(ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, size));
 
   strncpy(m_space_name, new_space_name, size);
 }
@@ -858,11 +864,12 @@
 
   /* We are going to replace any existing m_file_name. */
   if (m_file_name != nullptr) {
-    ut_free(m_file_name);
+    ut::free(m_file_name);
   }
 
   size_t len = final_fn.size();
-  m_file_name = static_cast<char *>(ut_malloc_nokey(len + 1));
+  m_file_name = static_cast<char *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, len + 1));
   memcpy(m_file_name, final_fn.c_str(), len);
   m_file_name[len] = '\0';
 }
@@ -874,7 +881,8 @@
   size_t size = strlen(srv_log_group_home_dir) + 22 + 1 /* NUL */
                 + strlen(undo::s_log_prefix) + strlen(undo::s_log_ext);
 
-  char *name = static_cast<char *>(ut_malloc_nokey(size));
+  char *name =
+      static_cast<char *>(ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, size));
 
   memset(name, 0, size);
 
@@ -1425,6 +1433,16 @@
     return (false);
   }
 
+  Clone_notify notifier(Clone_notify::Type::SPACE_UNDO_DDL, marked_space->id(),
+                        true);
+
+  if (notifier.failed()) {
+    /* purecov: begin inspected */
+    ib::info(ER_IB_MSG_UNDO_TRUNCATE_DELAY_BY_CLONE, space_name.c_str());
+    return false;
+    /* purecov: end */
+  }
+
   /* Do the truncate.  This will change the space_id of the marked_space. */
   bool success = trx_undo_truncate_tablespace(marked_space);
 
@@ -1501,17 +1519,11 @@
   std::string space_name = marked_space->space_name();
   undo::spaces->s_unlock();
 
-  /* Don't truncate if a concurrent clone is in progress. */
-  if (clone_check_active()) {
-    ib::info(ER_IB_MSG_UNDO_TRUNCATE_DELAY_BY_CLONE, space_name.c_str());
-    return (false);
-  }
-
   ib::info(ER_IB_MSG_UNDO_TRUNCATE_START, space_name.c_str());
 
   ut_d(undo::inject_crash("ib_undo_trunc_before_mdl"));
 
-  /* Get the MDL lock to prevent an ALTER or DROP command from interferring
+  /* Get the MDL lock to prevent an ALTER or DROP command from interfering
   with this undo tablespace while it is being truncated. */
   MDL_ticket *mdl_ticket;
   bool dd_result =
@@ -1536,7 +1548,7 @@
   /* Re-check for clone after acquiring MDL. The Backup MDL from clone
   is released by clone during shutdown while provisioning. We should
   not allow truncate to proceed here. */
-  if (clone_check_active()) {
+  if (clone_check_provisioning()) {
     dd_release_mdl(mdl_ticket);
     ib::info(ER_IB_MSG_UNDO_TRUNCATE_DELAY_BY_CLONE, space_name.c_str());
     return (false);
@@ -2150,7 +2162,7 @@
         if (target_grpid == n_purge_threads) {
           target_grpid = 0;
           /* Undo records are moved to the first group. So a second pass is
-           * needed. */
+          needed. */
           need_second_pass = true;
         }
         auto to_list = m_groups[target_grpid];
@@ -2160,7 +2172,7 @@
                         from_list->end());
       } else if (i == 1) {
         /* In the second pass, stop as soon as we encounter a group with <=
-         * max_n records. */
+        max_n records. */
         break;
       }
     }
@@ -2192,15 +2204,14 @@
  be released with the corresponding release function.
  @return copy of an undo log record or pointer to trx_purge_ignore_rec,
  if the whole undo log can skipped in purge; NULL if none left */
-static MY_ATTRIBUTE((warn_unused_result))
-    trx_undo_rec_t *trx_purge_fetch_next_rec(
-        trx_id_t *modifier_trx_id,
-        /*!< out: modifier trx id. this is the
-        trx that created the undo record. */
-        roll_ptr_t *roll_ptr,   /*!< out: roll pointer to undo record */
-        ulint *n_pages_handled, /*!< in/out: number of UNDO log pages
-                                handled */
-        mem_heap_t *heap)       /*!< in: memory heap where copied */
+[[nodiscard]] static trx_undo_rec_t *trx_purge_fetch_next_rec(
+    trx_id_t *modifier_trx_id,
+    /*!< out: modifier trx id. this is the
+    trx that created the undo record. */
+    roll_ptr_t *roll_ptr,   /*!< out: roll pointer to undo record */
+    ulint *n_pages_handled, /*!< in/out: number of UNDO log pages
+                            handled */
+    mem_heap_t *heap)       /*!< in: memory heap where copied */
 {
   if (!purge_sys->next_stored) {
     trx_purge_choose_next_log();
@@ -2469,13 +2480,13 @@
 #endif /* UNIV_DEBUG */
 
   /* The first page of LOBs are freed at the end of a purge batch because
-   * multiple purge threads will access the same LOB as part of the purge
-   * process.  Some purge threads will free only portion of the LOB related to
-   * the partial update of the LOB.  But 1 of the purge thread will free the LOB
-   * completely if it is not needed anymore (either because of full update or
-   * because of deletion).  If the LOB is freed, and a purge thread attempts to
-   * access the LOB, then it is a bug.  To avoid this, we delay the freeing of
-   * the first page of LOB till the end of a purge batch.  */
+  multiple purge threads will access the same LOB as part of the purge
+  process.  Some purge threads will free only portion of the LOB related to
+  the partial update of the LOB.  But 1 of the purge thread will free the LOB
+  completely if it is not needed anymore (either because of full update or
+  because of deletion).  If the LOB is freed, and a purge thread attempts to
+  access the LOB, then it is a bug.  To avoid this, we delay the freeing of
+  the first page of LOB till the end of a purge batch.  */
   for (thr = UT_LIST_GET_FIRST(purge_sys->query->thrs); thr != nullptr;
        thr = UT_LIST_GET_NEXT(thrs, thr)) {
     purge_node_t *node = static_cast<purge_node_t *>(thr->child);
@@ -2616,7 +2627,8 @@
   read without using a latch. */
   m_spaces.reserve(FSP_MAX_UNDO_TABLESPACES);
 
-  m_latch = static_cast<rw_lock_t *>(ut_zalloc_nokey(sizeof(*m_latch)));
+  m_latch = static_cast<rw_lock_t *>(
+      ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sizeof(*m_latch)));
 
   rw_lock_create(undo_spaces_lock_key, m_latch, SYNC_UNDO_SPACES);
 
@@ -2628,7 +2640,7 @@
   clear();
 
   rw_lock_free(m_latch);
-  ut_free(m_latch);
+  ut::free(m_latch);
   m_latch = nullptr;
   mutex_free(&ddl_mutex);
 }
@@ -2645,7 +2657,8 @@
     return;
   }
 
-  auto undo_space = UT_NEW_NOKEY(Tablespace(ref_undo_space));
+  auto undo_space =
+      ut::new_withkey<Tablespace>(UT_NEW_THIS_FILE_PSI_KEY, ref_undo_space);
 
   m_spaces.push_back(undo_space);
 }
@@ -2658,7 +2671,7 @@
 
   for (auto it = m_spaces.begin(); it != m_spaces.end(); it++) {
     if (*it == undo_space) {
-      UT_DELETE(undo_space);
+      ut::delete_(undo_space);
       m_spaces.erase(it);
       break;
     }
@@ -2672,7 +2685,7 @@
 
   for (auto it = m_spaces.begin(); it != m_spaces.end(); it++) {
     if ((*it)->id() == ref_undo_space.id()) {
-      UT_DELETE(*it);
+      ut::delete_(*it);
       m_spaces.erase(it);
       break;
     }
diff -Nru mysql-8.0-8.0.26/storage/innobase/trx/trx0rec.cc mysql-8.0-8.0.27/storage/innobase/trx/trx0rec.cc
--- mysql-8.0-8.0.26/storage/innobase/trx/trx0rec.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/trx/trx0rec.cc	2021-09-28 11:46:34.000000000 +0000
@@ -2100,11 +2100,11 @@
 
 /** Parses a redo log record of erasing of an undo page end.
  @return end of log record or NULL */
-byte *trx_undo_parse_erase_page_end(
-    byte *ptr,                            /*!< in: buffer */
-    byte *end_ptr MY_ATTRIBUTE((unused)), /*!< in: buffer end */
-    page_t *page,                         /*!< in: page or NULL */
-    mtr_t *mtr)                           /*!< in: mtr or NULL */
+byte *trx_undo_parse_erase_page_end(byte *ptr, /*!< in: buffer */
+                                    byte *end_ptr
+                                    [[maybe_unused]], /*!< in: buffer end */
+                                    page_t *page,     /*!< in: page or NULL */
+                                    mtr_t *mtr)       /*!< in: mtr or NULL */
 {
   if (page == nullptr) {
     return (ptr);
@@ -2380,11 +2380,10 @@
 /** Copies an undo record to heap. This function can be called if we know that
  the undo log record exists.
  @return own: copy of the record */
-static MY_ATTRIBUTE((warn_unused_result))
-    trx_undo_rec_t *trx_undo_get_undo_rec_low(
-        roll_ptr_t roll_ptr, /*!< in: roll pointer to record */
-        mem_heap_t *heap,    /*!< in: memory heap where copied */
-        bool is_temp)        /*!< in: true if temp undo rec. */
+[[nodiscard]] static trx_undo_rec_t *trx_undo_get_undo_rec_low(
+    roll_ptr_t roll_ptr, /*!< in: roll pointer to record */
+    mem_heap_t *heap,    /*!< in: memory heap where copied */
+    bool is_temp)        /*!< in: true if temp undo rec. */
 {
   trx_undo_rec_t *undo_rec;
   ulint rseg_id;
@@ -2427,9 +2426,11 @@
  truncated and we cannot fetch the old version
  @retval false if the undo log record is available
  NOTE: the caller must have latches on the clustered index page. */
-static MY_ATTRIBUTE((warn_unused_result)) bool trx_undo_get_undo_rec(
-    roll_ptr_t roll_ptr, trx_id_t trx_id, mem_heap_t *heap, bool is_temp,
-    const table_name_t &name, trx_undo_rec_t **undo_rec) {
+[[nodiscard]] static bool trx_undo_get_undo_rec(roll_ptr_t roll_ptr,
+                                                trx_id_t trx_id,
+                                                mem_heap_t *heap, bool is_temp,
+                                                const table_name_t &name,
+                                                trx_undo_rec_t **undo_rec) {
   bool missing_history;
 
   rw_lock_s_lock(&purge_sys->latch);
@@ -2447,7 +2448,7 @@
 #ifdef UNIV_DEBUG
 #define ATTRIB_USED_ONLY_IN_DEBUG
 #else /* UNIV_DEBUG */
-#define ATTRIB_USED_ONLY_IN_DEBUG MY_ATTRIBUTE((unused))
+#define ATTRIB_USED_ONLY_IN_DEBUG [[maybe_unused]]
 #endif /* UNIV_DEBUG */
 
 bool trx_undo_prev_version_build(
diff -Nru mysql-8.0-8.0.26/storage/innobase/trx/trx0roll.cc mysql-8.0-8.0.27/storage/innobase/trx/trx0roll.cc
--- mysql-8.0-8.0.26/storage/innobase/trx/trx0roll.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/trx/trx0roll.cc	2021-09-28 11:46:34.000000000 +0000
@@ -355,8 +355,8 @@
 {
   UT_LIST_REMOVE(trx->trx_savepoints, savep);
 
-  ut_free(savep->name);
-  ut_free(savep);
+  ut::free(savep->name);
+  ut::free(savep);
 }
 
 /** Frees savepoint structs starting from savep.
@@ -383,11 +383,10 @@
  were set after this savepoint are deleted.
  @return if no savepoint of the name found then DB_NO_SAVEPOINT,
  otherwise DB_SUCCESS */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    trx_rollback_to_savepoint_for_mysql_low(
-        trx_t *trx,                /*!< in/out: transaction */
-        trx_named_savept_t *savep, /*!< in/out: savepoint */
-        int64_t *mysql_binlog_cache_pos)
+[[nodiscard]] static dberr_t trx_rollback_to_savepoint_for_mysql_low(
+    trx_t *trx,                /*!< in/out: transaction */
+    trx_named_savept_t *savep, /*!< in/out: savepoint */
+    int64_t *mysql_binlog_cache_pos)
 /*!< out: the MySQL binlog
 cache position corresponding
 to this savepoint; MySQL needs
@@ -510,13 +509,14 @@
 
     UT_LIST_REMOVE(trx->trx_savepoints, savep);
 
-    ut_free(savep->name);
-    ut_free(savep);
+    ut::free(savep->name);
+    ut::free(savep);
   }
 
   /* Create a new savepoint and add it as the last in the list */
 
-  savep = static_cast<trx_named_savept_t *>(ut_malloc_nokey(sizeof(*savep)));
+  savep = static_cast<trx_named_savept_t *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sizeof(*savep)));
 
   savep->name = mem_strdup(savepoint_name);
 
@@ -783,12 +783,7 @@
 transaction was not yet committed, then we roll it back.
 Note: this is done in a background thread. */
 void trx_recovery_rollback_thread() {
-#ifdef UNIV_PFS_THREAD
-  THD *thd =
-      create_thd(false, true, true, trx_recovery_rollback_thread_key.m_value);
-#else
-  THD *thd = create_thd(false, true, true, 0);
-#endif /* UNIV_PFS_THREAD */
+  THD *thd = create_internal_thd();
 
   ut_ad(!srv_read_only_mode);
 
@@ -801,7 +796,7 @@
 
   trx_rollback_or_clean_recovered(TRUE);
 
-  destroy_thd(thd);
+  destroy_internal_thd(thd);
 }
 
 /** Tries truncate the undo logs. */
diff -Nru mysql-8.0-8.0.26/storage/innobase/trx/trx0rseg.cc mysql-8.0-8.0.27/storage/innobase/trx/trx0rseg.cc
--- mysql-8.0-8.0.26/storage/innobase/trx/trx0rseg.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/trx/trx0rseg.cc	2021-09-28 11:46:34.000000000 +0000
@@ -151,7 +151,7 @@
     trx_undo_mem_free(undo);
   }
 
-  ut_free(rseg);
+  ut::free(rseg);
 }
 
 static void trx_rseg_persist_gtid(trx_rseg_t *rseg, trx_id_t gtid_trx_no) {
@@ -219,7 +219,8 @@
 static trx_rseg_t *trx_rseg_mem_initialize(ulint id, space_id_t space_id,
                                            page_no_t page_no,
                                            const page_size_t &page_size) {
-  auto rseg = static_cast<trx_rseg_t *>(ut_zalloc_nokey(sizeof(trx_rseg_t)));
+  auto rseg = static_cast<trx_rseg_t *>(
+      ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sizeof(trx_rseg_t)));
 
   rseg->id = id;
   rseg->space_id = space_id;
@@ -364,7 +365,8 @@
                                 page_no_t page_no, const page_size_t &page_size,
                                 trx_id_t gtid_trx_no, purge_pq_t *purge_queue,
                                 mtr_t *mtr) {
-  auto rseg = static_cast<trx_rseg_t *>(ut_zalloc_nokey(sizeof(trx_rseg_t)));
+  auto rseg = static_cast<trx_rseg_t *>(
+      ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sizeof(trx_rseg_t)));
 
   rseg->id = id;
   rseg->space_id = space_id;
@@ -583,7 +585,7 @@
 
   for (uint32_t i = 0; i < srv_rseg_init_threads; i++) {
     auto thread =
-        os_thread_create(parallel_rseg_init_thread_key, trx_rseg_init_thread,
+        os_thread_create(parallel_rseg_init_thread_key, 0, trx_rseg_init_thread,
                          (void *)purge_queue, gtid_trx_no);
     threads.emplace_back(thread);
     thread.start();
@@ -593,7 +595,7 @@
     t.join();
   }
 
-  ib::info() << "Parallel initialization of rseg complete";
+  ib::info(ER_IB_MSG_PAR_RSEG_INIT_COMPLETE_MSG);
   trx_rsegs_init_end();
 }
 
@@ -740,7 +742,8 @@
 void Rsegs::init() {
   m_rsegs.reserve(TRX_SYS_N_RSEGS);
 
-  m_latch = static_cast<rw_lock_t *>(ut_zalloc_nokey(sizeof(*m_latch)));
+  m_latch = static_cast<rw_lock_t *>(
+      ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sizeof(*m_latch)));
 
   rw_lock_create(rsegs_lock_key, m_latch, SYNC_RSEGS);
 }
@@ -750,7 +753,7 @@
   clear();
 
   rw_lock_free(m_latch);
-  ut_free(m_latch);
+  ut::free(m_latch);
   m_latch = nullptr;
 }
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/trx/trx0sys.cc mysql-8.0-8.0.27/storage/innobase/trx/trx0sys.cc
--- mysql-8.0-8.0.26/storage/innobase/trx/trx0sys.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/trx/trx0sys.cc	2021-09-28 11:46:34.000000000 +0000
@@ -441,7 +441,7 @@
   /* We create the min binary heap here and pass ownership to
   purge when we init the purge sub-system. Purge is responsible
   for freeing the binary heap. */
-  purge_queue = UT_NEW_NOKEY(purge_pq_t());
+  purge_queue = ut::new_withkey<purge_pq_t>(UT_NEW_THIS_FILE_PSI_KEY);
   ut_a(purge_queue != nullptr);
 
   if (srv_force_recovery < SRV_FORCE_NO_UNDO_LOG_SCAN) {
@@ -467,8 +467,8 @@
     const auto time_diff =
         std::chrono::duration_cast<std::chrono::microseconds>(end - start)
             .count();
-    ib::info() << "Time taken to initialize rseg using "
-               << srv_rseg_init_threads << " thread: " << time_diff << " ms.";
+    ib::info(ER_IB_MSG_PAR_RSEG_INIT_TIME_MSG, srv_rseg_init_threads,
+             (uint32_t)time_diff);
   }
 
   mtr_t mtr;
@@ -560,7 +560,8 @@
 void trx_sys_create(void) {
   ut_ad(trx_sys == nullptr);
 
-  trx_sys = static_cast<trx_sys_t *>(ut_zalloc_nokey(sizeof(*trx_sys)));
+  trx_sys = static_cast<trx_sys_t *>(
+      ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sizeof(*trx_sys)));
 
   mutex_create(LATCH_ID_TRX_SYS, &trx_sys->mutex);
   mutex_create(LATCH_ID_TRX_SYS_SERIALISATION, &trx_sys->serialisation_mutex);
@@ -569,16 +570,14 @@
   UT_LIST_INIT(trx_sys->rw_trx_list);
   UT_LIST_INIT(trx_sys->mysql_trx_list);
 
-  trx_sys->mvcc = UT_NEW_NOKEY(MVCC(1024));
+  trx_sys->mvcc = ut::new_withkey<MVCC>(UT_NEW_THIS_FILE_PSI_KEY, 1024);
 
   trx_sys->serialisation_min_trx_no.store(0);
 
-  trx_sys->min_active_trx_id.store(0);
-
   ut_d(trx_sys->rw_max_trx_no = 0);
 
   new (&trx_sys->rw_trx_ids)
-      trx_ids_t(ut_allocator<trx_id_t>(mem_key_trx_sys_t_rw_trx_ids));
+      trx_ids_t(ut::allocator<trx_id_t>(mem_key_trx_sys_t_rw_trx_ids));
 
   for (auto &shard : trx_sys->shards) {
     new (&shard) Trx_shard{};
@@ -639,7 +638,7 @@
 
   trx_sys->tmp_rsegs.~Rsegs();
 
-  UT_DELETE(trx_sys->mvcc);
+  ut::delete_(trx_sys->mvcc);
 
   ut_a(UT_LIST_GET_LEN(trx_sys->rw_trx_list) == 0);
   ut_a(UT_LIST_GET_LEN(trx_sys->mysql_trx_list) == 0);
@@ -655,7 +654,7 @@
 
   trx_sys->rw_trx_ids.~trx_ids_t();
 
-  ut_free(trx_sys);
+  ut::free(trx_sys);
 
   trx_sys = nullptr;
 }
@@ -763,7 +762,8 @@
 
 /** Initialize trx_sys_undo_spaces, called once during srv_start(). */
 void trx_sys_undo_spaces_init() {
-  trx_sys_undo_spaces = UT_NEW(Space_Ids(), mem_key_undo_spaces);
+  trx_sys_undo_spaces =
+      ut::new_withkey<Space_Ids>(ut::make_psi_memory_key(mem_key_undo_spaces));
 
   trx_sys_undo_spaces->reserve(TRX_SYS_N_RSEGS);
 }
@@ -773,7 +773,7 @@
 void trx_sys_undo_spaces_deinit() {
   if (trx_sys_undo_spaces != nullptr) {
     trx_sys_undo_spaces->clear();
-    UT_DELETE(trx_sys_undo_spaces);
+    ut::delete_(trx_sys_undo_spaces);
     trx_sys_undo_spaces = nullptr;
   }
 }
diff -Nru mysql-8.0-8.0.26/storage/innobase/trx/trx0trx.cc mysql-8.0-8.0.27/storage/innobase/trx/trx0trx.cc
--- mysql-8.0-8.0.26/storage/innobase/trx/trx0trx.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/trx/trx0trx.cc	2021-09-28 11:46:34.000000000 +0000
@@ -72,12 +72,12 @@
 static const ulint MAX_DETAILED_ERROR_LEN = 256;
 
 /** Set of table_id */
-typedef std::set<table_id_t, std::less<table_id_t>, ut_allocator<table_id_t>>
+typedef std::set<table_id_t, std::less<table_id_t>, ut::allocator<table_id_t>>
     table_id_set;
 
 /** Map of transactions to affected table_id */
 typedef std::map<trx_t *, table_id_set, std::less<trx_t *>,
-                 ut_allocator<std::pair<trx_t *const, table_id_set>>>
+                 ut::allocator<std::pair<trx_t *const, table_id_set>>>
     trx_table_map;
 
 /** Map of resurrected transactions to affected table_id */
@@ -117,7 +117,7 @@
 /** Set flush observer for the transaction
 @param[in,out]	trx		transaction struct
 @param[in]	observer	flush observer */
-void trx_set_flush_observer(trx_t *trx, FlushObserver *observer) {
+void trx_set_flush_observer(trx_t *trx, Flush_observer *observer) {
   trx->flush_observer = observer;
 }
 
@@ -243,7 +243,7 @@
   static void init(trx_t *trx) {
     /* Explicitly call the constructor of the already
     allocated object. trx_t objects are allocated by
-    ut_zalloc() in Pool::Pool() which would not call
+    ut::zalloc_withkey() in Pool::Pool() which would not call
     the constructors of the trx_t members. */
     new (trx) trx_t();
 
@@ -253,10 +253,10 @@
 
     trx->dict_operation_lock_mode = 0;
 
-    trx->xid = UT_NEW_NOKEY(xid_t());
+    trx->xid = ut::new_withkey<xid_t>(UT_NEW_THIS_FILE_PSI_KEY);
 
-    trx->detailed_error =
-        reinterpret_cast<char *>(ut_zalloc_nokey(MAX_DETAILED_ERROR_LEN));
+    trx->detailed_error = reinterpret_cast<char *>(
+        ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, MAX_DETAILED_ERROR_LEN));
 
     trx->lock.lock_heap = mem_heap_create_typed(1024, MEM_HEAP_FOR_LOCK_HEAP);
 
@@ -288,8 +288,8 @@
 
     ut_a(UT_LIST_GET_LEN(trx->lock.trx_locks) == 0);
 
-    UT_DELETE(trx->xid);
-    ut_free(trx->detailed_error);
+    ut::delete_(trx->xid);
+    ut::free(trx->detailed_error);
 
     mutex_free(&trx->mutex);
     mutex_free(&trx->undo_mutex);
@@ -302,14 +302,14 @@
       /* See lock_trx_alloc_locks() why we only free
       the first element. */
 
-      ut_free(trx->lock.rec_pool[0]);
+      ut::free(trx->lock.rec_pool[0]);
     }
 
     if (!trx->lock.table_pool.empty()) {
       /* See lock_trx_alloc_locks() why we only free
       the first element. */
 
-      ut_free(trx->lock.table_pool[0]);
+      ut::free(trx->lock.table_pool[0]);
     }
 
     trx->lock.rec_pool.~lock_pool_t();
@@ -410,14 +410,15 @@
 
 /** Create the trx_t pool */
 void trx_pool_init() {
-  trx_pools = UT_NEW_NOKEY(trx_pools_t(MAX_TRX_BLOCK_SIZE));
+  trx_pools = ut::new_withkey<trx_pools_t>(UT_NEW_THIS_FILE_PSI_KEY,
+                                           MAX_TRX_BLOCK_SIZE);
 
   ut_a(trx_pools != nullptr);
 }
 
 /** Destroy the trx_t pool */
 void trx_pool_close() {
-  UT_DELETE(trx_pools);
+  ut::delete_(trx_pools);
 
   trx_pools = nullptr;
 }
@@ -723,48 +724,53 @@
   mtr_commit(&mtr);
 }
 
-/** Resurrect table locks for resurrected transactions. */
-void trx_resurrect_locks() {
-  for (trx_table_map::const_iterator t = resurrected_trx_tables.begin();
-       t != resurrected_trx_tables.end(); t++) {
-    trx_t *trx = t->first;
-    const table_id_set &tables = t->second;
-    ut_ad(trx->is_recovered);
+void trx_resurrect_locks(bool all) {
+  for (const auto &element : resurrected_trx_tables) {
+    trx_t *trx = element.first;
+
+    /* We deal only with recovered transactions. If all is false,
+    we skip non dictionary transactions. */
+    if (!trx->is_recovered || (!all && !trx->ddl_operation)) {
+      continue;
+    }
 
-    for (table_id_set::const_iterator i = tables.begin(); i != tables.end();
-         i++) {
-      dict_table_t *table =
-          dd_table_open_on_id(*i, nullptr, nullptr, false, true);
-      if (table) {
-        ut_ad(!table->is_temporary());
-
-        if (table->ibd_file_missing || table->is_temporary()) {
-          dict_sys_mutex_enter();
-          dd_table_close(table, nullptr, nullptr, true);
-          dict_table_remove_from_cache(table);
-          dict_sys_mutex_exit();
-          continue;
-        }
-
-        if (trx->state.load(std::memory_order_relaxed) == TRX_STATE_PREPARED &&
-            !dict_table_is_sdi(table->id)) {
-          trx->mod_tables.insert(table);
-        }
-        DICT_TF2_FLAG_SET(table, DICT_TF2_RESURRECT_PREPARED);
+    const table_id_set &tables = element.second;
 
-        lock_table_ix_resurrect(table, trx);
+    for (auto id : tables) {
+      auto table = dd_table_open_on_id(id, nullptr, nullptr, false, true);
 
-        DBUG_PRINT("ib_trx", ("resurrect" TRX_ID_FMT "  table '%s' IX lock",
-                              trx_get_id_for_print(trx), table->name.m_name));
+      if (table == nullptr) {
+        continue;
+      }
+
+      ut_ad(!table->is_temporary());
+
+      if (table->ibd_file_missing || table->is_temporary()) {
+        dict_sys_mutex_enter();
+        dd_table_close(table, nullptr, nullptr, true);
+        dict_table_remove_from_cache(table);
+        dict_sys_mutex_exit();
+        continue;
+      }
 
-        dd_table_close(table, nullptr, nullptr, false);
+      if (trx->state.load(std::memory_order_relaxed) == TRX_STATE_PREPARED &&
+          !dict_table_is_sdi(table->id)) {
+        trx->mod_tables.insert(table);
       }
+      DICT_TF2_FLAG_SET(table, DICT_TF2_RESURRECT_PREPARED);
+
+      lock_table_ix_resurrect(table, trx);
+
+      DBUG_PRINT("ib_trx", ("resurrect" TRX_ID_FMT "  table '%s' IX lock",
+                            trx_get_id_for_print(trx), table->name.m_name));
+
+      dd_table_close(table, nullptr, nullptr, false);
     }
   }
-
-  resurrected_trx_tables.clear();
 }
 
+void trx_clear_resurrected_table_ids() { resurrected_trx_tables.clear(); }
+
 /** Resurrect the transactions that were doing inserts at the time of the
  crash, they need to be undone.
  @return trx_t instance */
@@ -783,6 +789,7 @@
   trx->rsegs.m_redo.rseg = rseg;
   *trx->xid = undo->xid;
   trx->id = undo->trx_id;
+  trx_sys_rw_trx_add(trx);
   trx->rsegs.m_redo.insert_undo = undo;
   trx->is_recovered = true;
 
@@ -901,6 +908,7 @@
     trx->rsegs.m_redo.rseg = rseg;
     *trx->xid = undo->xid;
     trx->id = undo->trx_id;
+    trx_sys_rw_trx_add(trx);
     trx->is_recovered = true;
   }
 
@@ -956,19 +964,15 @@
   for (auto undo : rseg->insert_undo_list) {
     auto trx = trx_resurrect_insert(undo, rseg);
 
-    trx_sys_rw_trx_add(trx);
-
     trx_resurrect_table_ids(trx, &trx->rsegs.m_redo, undo);
   }
 
   /* Ressurrect transactions that were doing updates. */
   for (auto undo : rseg->update_undo_list) {
-    /* Check the rw_trx_set first. */
-    trx_t *trx;
-    {
-      Trx_shard_latch_guard guard{undo->trx_id, UT_LOCATION_HERE};
-      trx = trx_get_rw_trx_by_id_low(undo->trx_id);
-    }
+    /* Check the active_rw_trxs.by_id first. */
+
+    trx_t *trx = trx_sys->latch_and_execute_with_active_trx(
+        undo->trx_id, [](trx_t *trx) { return trx; }, UT_LOCATION_HERE);
 
     if (trx == nullptr) {
       trx = trx_allocate_for_background();
@@ -979,8 +983,6 @@
 
     trx_resurrect_update(trx, undo, rseg);
 
-    trx_sys_rw_trx_add(trx);
-
     trx_resurrect_table_ids(trx, &trx->rsegs.m_redo, undo);
   }
 }
@@ -1035,9 +1037,13 @@
 
   ut::vector<trx_t *> trxs;
   for (auto &shard : trx_sys->shards) {
-    for (const auto &trx_track : shard.rw_trx_set) {
-      trxs.emplace_back(trx_track.m_trx);
-    }
+    shard.active_rw_trxs.latch_and_execute(
+        [&](const Trx_by_id_with_min &trx_by_id_with_min) {
+          for (const auto &trx_track : trx_by_id_with_min.by_id()) {
+            trxs.emplace_back(trx_track.second);
+          }
+        },
+        UT_LOCATION_HERE);
   }
   std::sort(trxs.begin(), trxs.end(),
             [&](trx_t *a, trx_t *b) { return a->id < b->id; });
@@ -1158,7 +1164,7 @@
   trx_rseg_t *rseg = trx_sys->rsegs.at(slot);
   trx_sys->rsegs.s_unlock();
 
-  /* It is not neccessary to s_lock Rsegs::m_latch here because the
+  /* It is not necessary to s_lock Rsegs::m_latch here because the
   system tablespace is never truncated like other undo tablespaces. */
   rseg->trx_ref_count++;
 
@@ -1699,7 +1705,7 @@
     case 2:
       /* Write the log but do not flush it to disk */
       flush = false;
-      /* fall through */
+      [[fallthrough]];
     case 1:
       /* Write the log and optionally flush it to disk */
       wait_stats = log_write_up_to(*log_sys, lsn, flush);
@@ -1774,23 +1780,9 @@
   trx_ids_t::iterator it = std::lower_bound(trx_sys->rw_trx_ids.begin(),
                                             trx_sys->rw_trx_ids.end(), trx->id);
 
-  const bool update_min_active = it == trx_sys->rw_trx_ids.begin();
-
   ut_ad(*it == trx->id);
   trx_sys->rw_trx_ids.erase(it);
 
-  /* We update min_active_trx_id only if needed (separate cache line). */
-  if (update_min_active) {
-    trx_id_t min_id =
-        trx_sys->rw_trx_ids.empty()
-            ? trx_sys->rw_max_trx_id.load(std::memory_order_relaxed) + 1
-            : trx_sys->rw_trx_ids.front();
-
-    ut_ad(min_id > trx_sys->min_active_trx_id.load());
-
-    trx_sys->min_active_trx_id.store(min_id);
-  }
-
   if (trx->read_only || trx->rsegs.m_redo.rseg == nullptr) {
     ut_ad(!trx->in_rw_trx_list);
   } else {
@@ -1801,6 +1793,7 @@
       trx_sys->mvcc->view_close(trx->read_view, true);
     }
   }
+  DEBUG_SYNC_C("after_trx_erase_lists");
 }
 
 static void trx_release_impl_and_expl_locks(trx_t *trx, bool serialised) {
@@ -1842,38 +1835,40 @@
     trx_sys_mutex_exit();
   }
 
-  size_t trx_shard_no{};
-  if (trx->id > 0) {
-    trx_shard_no = trx_get_shard_no(trx->id);
-    trx_sys_shard_mutex_enter(trx_shard_no, UT_LOCATION_HERE);
-  }
-
-  trx_mutex_enter(trx);
-  /* Please consider this particular point in time as the moment the trx's
-  implicit locks become released.
-  This change is protected by both Trx_shard's mutex and trx->mutex.
-  Therefore, there are two secure ways to check if the trx still can hold
-  implicit locks:
-  (1) if you only know id of the trx, then you can obtain Trx_shard's mutex and
-      check if trx is still in the Trx_shard's rw_trx_set. This works, because
-      the removal from the rw_trx_set is also protected by the same mutex.
-      We use this approach in lock_rec_convert_impl_to_expl() by using
-      trx_rw_is_active()
-  (2) if you have pointer to trx, and you know it is safe to access (say, you
-      hold reference to this trx which prevents it from being freed) then you
-      can obtain trx->mutex and check if trx->state is equal to
-      TRX_STATE_COMMITTED_IN_MEMORY. We use this approach in
-      lock_rec_convert_impl_to_expl_for_trx() when deciding for the final time
-      if we really want to create explicit lock on behalf of implicit lock
-      holder. */
-  trx->state.store(TRX_STATE_COMMITTED_IN_MEMORY, std::memory_order_relaxed);
-  trx_mutex_exit(trx);
-
+  auto state_transition = [&]() {
+    trx_mutex_enter(trx);
+    /* Please consider this particular point in time as the moment the trx's
+    implicit locks become released.
+    This change is protected by both Trx_shard's mutex and trx->mutex.
+    Therefore, there are two secure ways to check if the trx still can hold
+    implicit locks:
+    (1) if you only know id of the trx, then you can obtain Trx_shard's mutex
+    and check if trx is still in the Trx_shard's active_rw_trxs. This works,
+        because the removal from the active_rw_trxs is also protected by the
+        same mutex. We use this approach in lock_rec_convert_impl_to_expl() by
+        using trx_rw_is_active()
+    (2) if you have pointer to trx, and you know it is safe to access (say, you
+        hold reference to this trx which prevents it from being freed) then you
+        can obtain trx->mutex and check if trx->state is equal to
+        TRX_STATE_COMMITTED_IN_MEMORY. We use this approach in
+        lock_rec_convert_impl_to_expl_for_trx() when deciding for the final time
+        if we really want to create explicit lock on behalf of implicit lock
+        holder. */
+    trx->state.store(TRX_STATE_COMMITTED_IN_MEMORY, std::memory_order_relaxed);
+    trx_mutex_exit(trx);
+  };
   if (trx->id > 0) {
-    ut_ad(1 ==
-          trx_sys->shards[trx_shard_no].rw_trx_set.count(TrxTrack(trx->id)));
-    trx_sys->shards[trx_shard_no].rw_trx_set.erase(TrxTrack(trx->id));
-    trx_sys_shard_mutex_exit(trx_shard_no);
+    trx_sys->get_shard_by_trx_id(trx->id).active_rw_trxs.latch_and_execute(
+        [&](Trx_by_id_with_min &trx_by_id_with_min) {
+          state_transition();
+          ut_d(const size_t trx_shard_no = trx_get_shard_no(trx->id));
+          ut_ad(trx_get_shard_no(trx_by_id_with_min.min_id()) == trx_shard_no);
+          trx_by_id_with_min.erase(trx->id);
+          ut_ad(trx_get_shard_no(trx_by_id_with_min.min_id()) == trx_shard_no);
+        },
+        UT_LOCATION_HERE);
+  } else {
+    state_transition();
   }
 
   /* It is important to remove the transaction from the serialisation list
@@ -1977,15 +1972,6 @@
     }
   }
 
-  if (trx->rsegs.m_redo.rseg != nullptr) {
-    trx_rseg_t *rseg = trx->rsegs.m_redo.rseg;
-    ut_ad(rseg->trx_ref_count > 0);
-
-    /* Multiple transactions can simultaneously decrement
-    the atomic counter. */
-    rseg->trx_ref_count--;
-  }
-
   /* Reset flag that SE persists GTID. */
   auto &gtid_persistor = clone_sys->get_gtid_persistor();
   gtid_persistor.set_persist_gtid(trx, false);
@@ -2057,6 +2043,27 @@
     srv_active_wake_master_thread();
   }
 
+  /* Do not decrement the reference count before this point.
+  There is a potential issue where a thread attempting to drop
+  an undo tablespace may end up dropping this undo space
+  before this thread can complete the cleanup.
+  While marking a undo space as inactive, the server tries
+  to find if any transaction is actively using the undo log
+  being truncated. A non-zero reference count ensures that the
+  thread attempting to truncate/drop the undo tablespace
+  cannot be successful as the undo log cannot be dropped until
+  is it empty. */
+  if (trx->rsegs.m_redo.rseg != nullptr) {
+    trx_rseg_t *rseg = trx->rsegs.m_redo.rseg;
+    ut_ad(rseg->trx_ref_count > 0);
+
+    /* Multiple transactions can simultaneously decrement
+    the atomic counter. */
+    rseg->trx_ref_count--;
+
+    trx->rsegs.m_redo.rseg = nullptr;
+  }
+
   /* Free all savepoints, starting from the first. */
   trx_named_savept_t *savep = UT_LIST_GET_FIRST(trx->trx_savepoints);
 
@@ -2287,7 +2294,7 @@
     case TRX_STATE_FORCED_ROLLBACK:
 
       trx_start_low(trx, true);
-      /* fall through */
+      [[fallthrough]];
 
     case TRX_STATE_ACTIVE:
     case TRX_STATE_PREPARED:
@@ -2401,7 +2408,7 @@
       ut_d(trx->start_line = __LINE__);
 
       trx_start_low(trx, true);
-      /* fall through */
+      [[fallthrough]];
     case TRX_STATE_ACTIVE:
     case TRX_STATE_PREPARED:
       trx->op_info = "committing";
@@ -2464,7 +2471,7 @@
     case TRX_STATE_FORCED_ROLLBACK:
       trx->undo_no = 0;
       trx->undo_rseg_space = 0;
-      /* fall through */
+      [[fallthrough]];
     case TRX_STATE_ACTIVE:
       trx->last_sql_stat_start.least_undo_no = trx->undo_no;
 
@@ -3156,7 +3163,7 @@
  which is in the prepared state
  @return trx on match, the trx->xid will be invalidated;
  */
-static MY_ATTRIBUTE((warn_unused_result)) trx_t *trx_get_trx_by_xid_low(
+[[nodiscard]] static trx_t *trx_get_trx_by_xid_low(
     const XID *xid) /*!< in: X/Open XA transaction
                     identifier */
 {
diff -Nru mysql-8.0-8.0.26/storage/innobase/trx/trx0undo.cc mysql-8.0-8.0.27/storage/innobase/trx/trx0undo.cc
--- mysql-8.0-8.0.26/storage/innobase/trx/trx0undo.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/trx/trx0undo.cc	2021-09-28 11:46:34.000000000 +0000
@@ -384,13 +384,13 @@
 /** Creates a new undo log segment in file.
  @return DB_SUCCESS if page creation OK possible error codes are:
  DB_TOO_MANY_CONCURRENT_TRXS DB_OUT_OF_FILE_SPACE */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t trx_undo_seg_create(
-    trx_rseg_t *rseg MY_ATTRIBUTE((unused)), /*!< in: rollback segment */
-    trx_rsegf_t *rseg_hdr, /*!< in: rollback segment header, page
-                          x-latched */
-    ulint type,            /*!< in: type of the segment: TRX_UNDO_INSERT or
-                           TRX_UNDO_UPDATE */
-    ulint *id,             /*!< out: slot index within rseg header */
+[[nodiscard]] static dberr_t trx_undo_seg_create(
+    trx_rseg_t *rseg [[maybe_unused]], /*!< in: rollback segment */
+    trx_rsegf_t *rseg_hdr,             /*!< in: rollback segment header,
+                                      page x-latched */
+    ulint type,                        /*!< in: type of the segment:
+                                       TRX_UNDO_INSERT or            TRX_UNDO_UPDATE */
+    ulint *id, /*!< out: slot index within rseg header */
     page_t **undo_page,
     /*!< out: segment header page x-latched, NULL
     if there was an error */
@@ -1481,7 +1481,8 @@
 
   ut_a(id < TRX_RSEG_N_SLOTS);
 
-  undo = static_cast<trx_undo_t *>(ut_malloc_nokey(sizeof(*undo)));
+  undo = static_cast<trx_undo_t *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sizeof(*undo)));
 
   if (undo == nullptr) {
     return (nullptr);
@@ -1544,7 +1545,7 @@
 {
   ut_a(undo->id < TRX_RSEG_N_SLOTS);
 
-  ut_free(undo);
+  ut::free(undo);
 }
 
 /** Create a new undo log in the given rollback segment.
@@ -1560,10 +1561,9 @@
 @retval DB_TOO_MANY_CONCURRENT_TRXS
 @retval DB_OUT_OF_FILE_SPACE
 @retval DB_OUT_OF_MEMORY */
-static MY_ATTRIBUTE((warn_unused_result)) dberr_t
-    trx_undo_create(trx_t *trx, trx_rseg_t *rseg, ulint type, trx_id_t trx_id,
-                    const XID *xid, trx_undo_t::Gtid_storage gtid_storage,
-                    trx_undo_t **undo, mtr_t *mtr) {
+[[nodiscard]] static dberr_t trx_undo_create(
+    trx_t *trx, trx_rseg_t *rseg, ulint type, trx_id_t trx_id, const XID *xid,
+    trx_undo_t::Gtid_storage gtid_storage, trx_undo_t **undo, mtr_t *mtr) {
   trx_rsegf_t *rseg_header;
   page_no_t page_no;
   ulint offset;
@@ -1967,6 +1967,7 @@
 
     rseg->unlatch();
 
+    DEBUG_SYNC_C("innodb_commit_wait_for_truncate");
     trx_undo_seg_free(undo, noredo);
 
     rseg->latch();
diff -Nru mysql-8.0-8.0.26/storage/innobase/usr/usr0sess.cc mysql-8.0-8.0.27/storage/innobase/usr/usr0sess.cc
--- mysql-8.0-8.0.26/storage/innobase/usr/usr0sess.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/usr/usr0sess.cc	2021-09-28 11:46:34.000000000 +0000
@@ -38,7 +38,8 @@
 sess_t *sess_open(void) {
   sess_t *sess;
 
-  sess = static_cast<sess_t *>(ut_zalloc_nokey(sizeof(*sess)));
+  sess = static_cast<sess_t *>(
+      ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sizeof(*sess)));
 
   sess->state = SESS_ACTIVE;
 
@@ -52,5 +53,5 @@
 void sess_close(sess_t *sess) /*!< in, own: session object */
 {
   trx_free_for_background(sess->trx);
-  ut_free(sess);
+  ut::free(sess);
 }
diff -Nru mysql-8.0-8.0.26/storage/innobase/ut/crc32.cc mysql-8.0-8.0.27/storage/innobase/ut/crc32.cc
--- mysql-8.0-8.0.26/storage/innobase/ut/crc32.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/ut/crc32.cc	2021-09-28 11:46:34.000000000 +0000
@@ -89,363 +89,71 @@
 other files in library. The code in this file is used to make a library for
 external tools. */
 
+#include <string.h>
 #include "my_compiler.h"
 #include "my_config.h"
 #include "my_inttypes.h"
+#include "univ.i"
+#include "ut0crc32.h"
 
-#include <string.h>
-
-#if defined(__GNUC__) && defined(__x86_64__)
-#define gnuc64
-#endif
-
-#if defined(gnuc64) || defined(_WIN32)
-/*
-  GCC 4.8 can't include intrinsic headers without -msse4.2.
-  4.9 and newer can, so we can remove this test once we no longer
-  support 4.8.
-*/
-#if defined(__SSE4_2__) || defined(__clang__) || !defined(__GNUC__) || \
-    __GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9)
+#ifdef CRC32_x86_64
 #include <nmmintrin.h>
-#else
-// GCC 4.8 without -msse4.2.
-MY_ATTRIBUTE((target("sse4.2")))
-ALWAYS_INLINE uint32_t _mm_crc32_u8(uint32_t __C, uint32_t __V) {
-  return __builtin_ia32_crc32qi(__C, __V);
-}
+#include <wmmintrin.h>
+#endif /* CRC32_x86_64 */
 
-MY_ATTRIBUTE((target("sse4.2")))
-ALWAYS_INLINE uint64_t _mm_crc32_u64(uint64_t __C, uint64_t __V) {
-  return __builtin_ia32_crc32di(__C, __V);
-}
-#endif
-#endif  // defined(gnuc64) || defined(_WIN32)
+#ifdef CRC32_x86_64_WIN
+#include <intrin.h>
+#endif /* CRC32_x86_64_WIN */
 
-#include "univ.i"
-#include "ut0crc32.h"
+#ifdef CRC32_ARM64
+#include <arm_acle.h>
+#include <arm_neon.h>
+#endif /* CRC32_ARM64 */
+
+#ifdef CRC32_ARM64_DEFAULT
+#include <asm/hwcap.h>
+#include <sys/auxv.h>
+#endif /* CRC32_ARM64_DEFAULT */
+
+#ifdef CRC32_ARM64_APPLE
+#if __has_include(<asm/hwcap.h>) &&  __has_include(<sys/auxv.h>)
+#error \
+    "Current implementation is based on asumption that APPLE_ARM always " \
+    "supports crc32 and pmull and that there is no way to check it, yet it "\
+    "seem that this APPLE_ARM has getauxval()."
+#endif /* __has_include(<asm/hwcap.h>) &&  __has_include(<sys/auxv.h>) */
+#endif /* CRC32_ARM64_APPLE */
 
 /** Pointer to CRC32 calculation function. */
 ut_crc32_func_t ut_crc32;
 
-/** Pointer to CRC32 calculation function, which uses big-endian byte order
-when converting byte strings to integers internally. */
-ut_crc32_func_t ut_crc32_legacy_big_endian;
-
-/** Pointer to CRC32-byte-by-byte calculation function (byte order agnostic,
-but very slow). */
-ut_crc32_func_t ut_crc32_byte_by_byte;
+bool ut_crc32_cpu_enabled = false;
+bool ut_poly_mul_cpu_enabled = false;
+
+/* CRC32 software implementation. */
+namespace software {
 
 /** Swap the byte order of an 8 byte integer.
 @param[in]	i	8-byte integer
 @return 8-byte integer */
-inline uint64_t ut_crc32_swap_byteorder(uint64_t i) {
+inline uint64_t swap_byteorder(uint64_t i) {
   return (i << 56 | (i & 0x000000000000FF00ULL) << 40 |
           (i & 0x0000000000FF0000ULL) << 24 | (i & 0x00000000FF000000ULL) << 8 |
           (i & 0x000000FF00000000ULL) >> 8 | (i & 0x0000FF0000000000ULL) >> 24 |
           (i & 0x00FF000000000000ULL) >> 40 | i >> 56);
 }
 
-/* CRC32 hardware implementation. */
-
-/** Flag that tells whether the CPU supports CRC32 or not.
-The CRC32 instructions are part of the SSE4.2 instruction set. */
-bool ut_crc32_cpu_enabled = false;
-
-#if defined(_WIN32)
-#include <intrin.h>
-#endif
-#if defined(gnuc64) || defined(_WIN32)
-/** Checks whether the CPU has the CRC32 instructions (part of the SSE4.2
-instruction set).
-@return true if CRC32 is available */
-static bool ut_crc32_check_cpu() {
-#ifdef UNIV_DEBUG_VALGRIND
-  /* Valgrind does not understand the CRC32 instructions:
-
-  vex amd64->IR: unhandled instruction bytes: 0xF2 0x48 0xF 0x38 0xF0 0xA
-  valgrind: Unrecognised instruction at address 0xad3db5.
-  Your program just tried to execute an instruction that Valgrind
-  did not recognise.  There are two possible reasons for this.
-  1. Your program has a bug and erroneously jumped to a non-code
-     location.  If you are running Memcheck and you just saw a
-     warning about a bad jump, it's probably your program's fault.
-  2. The instruction is legitimate but Valgrind doesn't handle it,
-     i.e. it's Valgrind's fault.  If you think this is the case or
-     you are not sure, please let us know and we'll try to fix it.
-  Either way, Valgrind will now raise a SIGILL signal which will
-  probably kill your program.
-
-  */
-  return false;
-#else
-
-  uint32_t features_ecx;
-
-#if defined(gnuc64)
-  uint32_t sig;
-  uint32_t features_edx;
-
-  asm("cpuid"
-      : "=a"(sig), "=c"(features_ecx), "=d"(features_edx)
-      : "a"(1)
-      : "ebx");
-#elif defined(_WIN32)
-  int cpu_info[4] = {-1, -1, -1, -1};
-
-  __cpuid(cpu_info, 1 /* function 1 */);
-
-  features_ecx = static_cast<uint32_t>(cpu_info[2]);
-#else
-#error Dont know how to handle non-gnuc64 and non-windows platforms.
-#endif
-
-  return features_ecx & (1 << 20);  // SSE4.2
-#endif /* UNIV_DEBUG_VALGRIND */
-}
-
-/** Calculate CRC32 over 8-bit data using a hardware/CPU instruction.
-@param[in,out]	crc	crc32 checksum so far when this function is called,
-when the function ends it will contain the new checksum
-@param[in,out]	data	data to be checksummed, the pointer will be advanced
-with 1 byte
-@param[in,out]	len	remaining bytes, it will be decremented with 1 */
-MY_ATTRIBUTE((target("sse4.2")))
-inline void ut_crc32_8_hw(uint64_t *crc, const byte **data, ulint *len) {
-  *crc = _mm_crc32_u8(static_cast<unsigned>(*crc), (*data)[0]);
-  (*data)++;
-  (*len)--;
-}
-
-/** Calculate CRC32 over a 64-bit integer using a hardware/CPU instruction.
-@param[in]	crc	crc32 checksum so far
-@param[in]	data	data to be checksummed
-@return resulting checksum of crc + crc(data) */
-MY_ATTRIBUTE((target("sse4.2")))
-inline uint64_t ut_crc32_64_low_hw(uint64_t crc, uint64_t data) {
-  uint64_t crc_64bit = crc;
-  crc_64bit = _mm_crc32_u64(crc_64bit, data);
-  return (crc_64bit);
-}
-
-/** Calculate CRC32 over 64-bit byte string using a hardware/CPU instruction.
-@param[in,out]	crc	crc32 checksum so far when this function is called,
-when the function ends it will contain the new checksum
-@param[in,out]	data	data to be checksummed, the pointer will be advanced
-with 8 bytes
-@param[in,out]	len	remaining bytes, it will be decremented with 8 */
-MY_ATTRIBUTE((target("sse4.2")))
-inline void ut_crc32_64_hw(uint64_t *crc, const byte **data, ulint *len) {
-  uint64_t data_int = *reinterpret_cast<const uint64_t *>(*data);
-
-#ifdef WORDS_BIGENDIAN
-  /* Currently we only support x86_64 (little endian) CPUs. In case
-  some big endian CPU supports a CRC32 instruction, then maybe we will
-  need a byte order swap here. */
-#error Dont know how to handle big endian CPUs
-  /*
-  data_int = ut_crc32_swap_byteorder(data_int);
-  */
-#endif /* WORDS_BIGENDIAN */
-
-  *crc = ut_crc32_64_low_hw(*crc, data_int);
-
-  *data += 8;
-  *len -= 8;
-}
-
-/** Calculate CRC32 over 64-bit byte string using a hardware/CPU instruction.
-The byte string is converted to a 64-bit integer using big endian byte order.
-@param[in,out]	crc	crc32 checksum so far when this function is called,
-when the function ends it will contain the new checksum
-@param[in,out]	data	data to be checksummed, the pointer will be advanced
-with 8 bytes
-@param[in,out]	len	remaining bytes, it will be decremented with 8 */
-inline void ut_crc32_64_legacy_big_endian_hw(uint64_t *crc, const byte **data,
-                                             ulint *len) {
-  uint64_t data_int = *reinterpret_cast<const uint64_t *>(*data);
-
-#ifndef WORDS_BIGENDIAN
-  data_int = ut_crc32_swap_byteorder(data_int);
-#else
-  /* Currently we only support x86_64 (little endian) CPUs. In case
-  some big endian CPU supports a CRC32 instruction, then maybe we will
-  NOT need a byte order swap here. */
-#error Dont know how to handle big endian CPUs
-#endif /* WORDS_BIGENDIAN */
-
-  *crc = ut_crc32_64_low_hw(*crc, data_int);
-
-  *data += 8;
-  *len -= 8;
-}
-
-/** Calculates CRC32 using hardware/CPU instructions.
-@param[in]	buf	data over which to calculate CRC32
-@param[in]	len	data length
-@return CRC-32C (polynomial 0x11EDC6F41) */
-MY_ATTRIBUTE((target("sse4.2")))
-static uint32_t ut_crc32_hw(const byte *buf, ulint len) {
-  uint64_t crc = 0xFFFFFFFFU;
-
-  ut_ad(ut_crc32_cpu_enabled);
-
-  /* Calculate byte-by-byte up to an 8-byte aligned address. After
-  this consume the input 8-bytes at a time. */
-  while (len > 0 && (reinterpret_cast<uintptr_t>(buf) & 7) != 0) {
-    ut_crc32_8_hw(&crc, &buf, &len);
-  }
-
-  /* Perf testing
-  ./unittest/gunit/innodb/merge_innodb_tests-t --gtest_filter=ut0crc32.perf
-  on CPU "Intel(R) Core(TM) i7-4770 CPU @ 3.40GHz"
-  with different N in "while (len >= N) {" shows:
-  N=16
-  2.867254 sec
-  2.866860 sec
-  2.867973 sec
-
-  N=32
-  2.715725 sec
-  2.713008 sec
-  2.712520 sec
-  (5.36% speedup over N=16)
-
-  N=64
-  2.634140 sec
-  2.636558 sec
-  2.636488 sec
-  (2.88% speedup over N=32)
-
-  N=128
-  2.599534 sec
-  2.599919 sec
-  2.598035 sec
-  (1.39% speedup over N=64)
-
-  N=256
-  2.576993 sec
-  2.576748 sec
-  2.575700 sec
-  (0.87% speedup over N=128)
-
-  N=512
-  2.693928 sec
-  2.691663 sec
-  2.692142 sec
-  (4.51% slowdown over N=256)
-  */
-  while (len >= 128) {
-    /* This call is repeated 16 times. 16 * 8 = 128. */
-    ut_crc32_64_hw(&crc, &buf, &len);
-    ut_crc32_64_hw(&crc, &buf, &len);
-    ut_crc32_64_hw(&crc, &buf, &len);
-    ut_crc32_64_hw(&crc, &buf, &len);
-    ut_crc32_64_hw(&crc, &buf, &len);
-    ut_crc32_64_hw(&crc, &buf, &len);
-    ut_crc32_64_hw(&crc, &buf, &len);
-    ut_crc32_64_hw(&crc, &buf, &len);
-    ut_crc32_64_hw(&crc, &buf, &len);
-    ut_crc32_64_hw(&crc, &buf, &len);
-    ut_crc32_64_hw(&crc, &buf, &len);
-    ut_crc32_64_hw(&crc, &buf, &len);
-    ut_crc32_64_hw(&crc, &buf, &len);
-    ut_crc32_64_hw(&crc, &buf, &len);
-    ut_crc32_64_hw(&crc, &buf, &len);
-    ut_crc32_64_hw(&crc, &buf, &len);
-  }
-
-  while (len >= 8) {
-    ut_crc32_64_hw(&crc, &buf, &len);
-  }
-
-  while (len > 0) {
-    ut_crc32_8_hw(&crc, &buf, &len);
-  }
-
-  return (~static_cast<uint32_t>(crc));
-}
-
-/** Calculates CRC32 using hardware/CPU instructions.
-This function uses big endian byte ordering when converting byte sequence to
-integers.
-@param[in]	buf	data over which to calculate CRC32
-@param[in]	len	data length
-@return CRC-32C (polynomial 0x11EDC6F41) */
-static uint32_t ut_crc32_legacy_big_endian_hw(const byte *buf, ulint len) {
-  uint64_t crc = 0xFFFFFFFFU;
-
-  ut_ad(ut_crc32_cpu_enabled);
-
-  /* Calculate byte-by-byte up to an 8-byte aligned address. After
-  this consume the input 8-bytes at a time. */
-  while (len > 0 && (reinterpret_cast<uintptr_t>(buf) & 7) != 0) {
-    ut_crc32_8_hw(&crc, &buf, &len);
-  }
-
-  while (len >= 128) {
-    /* This call is repeated 16 times. 16 * 8 = 128. */
-    ut_crc32_64_legacy_big_endian_hw(&crc, &buf, &len);
-    ut_crc32_64_legacy_big_endian_hw(&crc, &buf, &len);
-    ut_crc32_64_legacy_big_endian_hw(&crc, &buf, &len);
-    ut_crc32_64_legacy_big_endian_hw(&crc, &buf, &len);
-    ut_crc32_64_legacy_big_endian_hw(&crc, &buf, &len);
-    ut_crc32_64_legacy_big_endian_hw(&crc, &buf, &len);
-    ut_crc32_64_legacy_big_endian_hw(&crc, &buf, &len);
-    ut_crc32_64_legacy_big_endian_hw(&crc, &buf, &len);
-    ut_crc32_64_legacy_big_endian_hw(&crc, &buf, &len);
-    ut_crc32_64_legacy_big_endian_hw(&crc, &buf, &len);
-    ut_crc32_64_legacy_big_endian_hw(&crc, &buf, &len);
-    ut_crc32_64_legacy_big_endian_hw(&crc, &buf, &len);
-    ut_crc32_64_legacy_big_endian_hw(&crc, &buf, &len);
-    ut_crc32_64_legacy_big_endian_hw(&crc, &buf, &len);
-    ut_crc32_64_legacy_big_endian_hw(&crc, &buf, &len);
-    ut_crc32_64_legacy_big_endian_hw(&crc, &buf, &len);
-  }
-
-  while (len >= 8) {
-    ut_crc32_64_legacy_big_endian_hw(&crc, &buf, &len);
-  }
-
-  while (len > 0) {
-    ut_crc32_8_hw(&crc, &buf, &len);
-  }
-
-  return (~static_cast<uint32_t>(crc));
-}
-
-/** Calculates CRC32 using hardware/CPU instructions.
-This function processes one byte at a time (very slow) and thus it does
-not depend on the byte order of the machine.
-@param[in]	buf	data over which to calculate CRC32
-@param[in]	len	data length
-@return CRC-32C (polynomial 0x11EDC6F41) */
-static uint32_t ut_crc32_byte_by_byte_hw(const byte *buf, ulint len) {
-  uint64_t crc = 0xFFFFFFFFU;
-
-  ut_ad(ut_crc32_cpu_enabled);
-
-  while (len > 0) {
-    ut_crc32_8_hw(&crc, &buf, &len);
-  }
-
-  return (~static_cast<uint32_t>(crc));
-}
-#endif /* defined(gnuc64) || defined(_WIN32) */
-
-/* CRC32 software implementation. */
-
 /* Precalculated table used to generate the CRC32 if the CPU does not
 have support for it */
-static uint32_t ut_crc32_slice8_table[8][256];
+static uint32_t crc32_slice8_table[8][256];
 
 #ifdef UNIV_DEBUG
-static bool ut_crc32_slice8_table_initialized = false;
+static bool crc32_slice8_table_initialized = false;
 #endif /* UNIV_DEBUG */
 
 /** Initializes the table that is used to generate the CRC32 if the CPU does
  not have support for it. */
-static void ut_crc32_slice8_table_init() {
+static void crc32_slice8_table_init() {
   /* bit-reversed poly 0x1EDC6F41 (from SSE42 crc32 instruction) */
   static const uint32_t poly = 0x82f63b78;
   uint32_t n;
@@ -457,19 +165,19 @@
     for (k = 0; k < 8; k++) {
       c = (c & 1) ? (poly ^ (c >> 1)) : (c >> 1);
     }
-    ut_crc32_slice8_table[0][n] = c;
+    crc32_slice8_table[0][n] = c;
   }
 
   for (n = 0; n < 256; n++) {
-    c = ut_crc32_slice8_table[0][n];
+    c = crc32_slice8_table[0][n];
     for (k = 1; k < 8; k++) {
-      c = ut_crc32_slice8_table[0][c & 0xFF] ^ (c >> 8);
-      ut_crc32_slice8_table[k][n] = c;
+      c = crc32_slice8_table[0][c & 0xFF] ^ (c >> 8);
+      crc32_slice8_table[k][n] = c;
     }
   }
 
 #ifdef UNIV_DEBUG
-  ut_crc32_slice8_table_initialized = true;
+  crc32_slice8_table_initialized = true;
 #endif /* UNIV_DEBUG */
 }
 
@@ -479,10 +187,10 @@
 @param[in,out]	data	data to be checksummed, the pointer will be advanced
 with 1 byte
 @param[in,out]	len	remaining bytes, it will be decremented with 1 */
-inline void ut_crc32_8_sw(uint32_t *crc, const byte **data, ulint *len) {
+inline void crc32_8(uint32_t *crc, const byte **data, size_t *len) {
   const uint8_t i = (*crc ^ (*data)[0]) & 0xFF;
 
-  *crc = (*crc >> 8) ^ ut_crc32_slice8_table[0][i];
+  *crc = (*crc >> 8) ^ crc32_slice8_table[0][i];
 
   (*data)++;
   (*len)--;
@@ -492,17 +200,17 @@
 @param[in]	crc	crc32 checksum so far
 @param[in]	data	data to be checksummed
 @return resulting checksum of crc + crc(data) */
-inline uint32_t ut_crc32_64_low_sw(uint32_t crc, uint64_t data) {
+inline uint32_t crc32_64_low(uint32_t crc, uint64_t data) {
   const uint64_t i = crc ^ data;
 
-  return (ut_crc32_slice8_table[7][(i)&0xFF] ^
-          ut_crc32_slice8_table[6][(i >> 8) & 0xFF] ^
-          ut_crc32_slice8_table[5][(i >> 16) & 0xFF] ^
-          ut_crc32_slice8_table[4][(i >> 24) & 0xFF] ^
-          ut_crc32_slice8_table[3][(i >> 32) & 0xFF] ^
-          ut_crc32_slice8_table[2][(i >> 40) & 0xFF] ^
-          ut_crc32_slice8_table[1][(i >> 48) & 0xFF] ^
-          ut_crc32_slice8_table[0][(i >> 56)]);
+  return (crc32_slice8_table[7][(i)&0xFF] ^
+          crc32_slice8_table[6][(i >> 8) & 0xFF] ^
+          crc32_slice8_table[5][(i >> 16) & 0xFF] ^
+          crc32_slice8_table[4][(i >> 24) & 0xFF] ^
+          crc32_slice8_table[3][(i >> 32) & 0xFF] ^
+          crc32_slice8_table[2][(i >> 40) & 0xFF] ^
+          crc32_slice8_table[1][(i >> 48) & 0xFF] ^
+          crc32_slice8_table[0][(i >> 56)]);
 }
 
 /** Calculate CRC32 over 64-bit byte string using a software implementation.
@@ -511,14 +219,14 @@
 @param[in,out]	data	data to be checksummed, the pointer will be advanced
 with 8 bytes
 @param[in,out]	len	remaining bytes, it will be decremented with 8 */
-inline void ut_crc32_64_sw(uint32_t *crc, const byte **data, ulint *len) {
+static inline void crc32_64(uint32_t *crc, const byte **data, size_t *len) {
   uint64_t data_int = *reinterpret_cast<const uint64_t *>(*data);
 
 #ifdef WORDS_BIGENDIAN
-  data_int = ut_crc32_swap_byteorder(data_int);
+  data_int = swap_byteorder(data_int);
 #endif /* WORDS_BIGENDIAN */
 
-  *crc = ut_crc32_64_low_sw(*crc, data_int);
+  *crc = crc32_64_low(*crc, data_int);
 
   *data += 8;
   *len -= 8;
@@ -531,149 +239,596 @@
 @param[in,out]	data	data to be checksummed, the pointer will be advanced
 with 8 bytes
 @param[in,out]	len	remaining bytes, it will be decremented with 8 */
-inline void ut_crc32_64_legacy_big_endian_sw(uint32_t *crc, const byte **data,
-                                             ulint *len) {
+static inline void crc32_64_legacy_big_endian(uint32_t *crc, const byte **data,
+                                              size_t *len) {
   uint64_t data_int = *reinterpret_cast<const uint64_t *>(*data);
 
 #ifndef WORDS_BIGENDIAN
-  data_int = ut_crc32_swap_byteorder(data_int);
-#endif /* WORDS_BIGENDIAN */
+  data_int = swap_byteorder(data_int);
+#endif /* !WORDS_BIGENDIAN */
 
-  *crc = ut_crc32_64_low_sw(*crc, data_int);
+  *crc = crc32_64_low(*crc, data_int);
 
   *data += 8;
   *len -= 8;
 }
 
 /** Calculates CRC32 in software, without using CPU instructions.
-@param[in]	buf	data over which to calculate CRC32
-@param[in]	len	data length
+@param[in]     buf     data over which to calculate CRC32
+@param[in]     len     data length
 @return CRC-32C (polynomial 0x11EDC6F41) */
-static uint32_t ut_crc32_sw(const byte *buf, ulint len) {
+template <void crc32_64(uint32_t *crc, const byte **data, size_t *len)>
+uint32_t crc32_processing_64bit_chunks(const byte *buf, size_t len) {
   uint32_t crc = 0xFFFFFFFFU;
 
-  ut_ad(ut_crc32_slice8_table_initialized);
+  ut_ad(crc32_slice8_table_initialized);
 
   /* Calculate byte-by-byte up to an 8-byte aligned address. After
   this consume the input 8-bytes at a time. */
   while (len > 0 && (reinterpret_cast<uintptr_t>(buf) & 7) != 0) {
-    ut_crc32_8_sw(&crc, &buf, &len);
+    crc32_8(&crc, &buf, &len);
   }
 
   while (len >= 128) {
     /* This call is repeated 16 times. 16 * 8 = 128. */
-    ut_crc32_64_sw(&crc, &buf, &len);
-    ut_crc32_64_sw(&crc, &buf, &len);
-    ut_crc32_64_sw(&crc, &buf, &len);
-    ut_crc32_64_sw(&crc, &buf, &len);
-    ut_crc32_64_sw(&crc, &buf, &len);
-    ut_crc32_64_sw(&crc, &buf, &len);
-    ut_crc32_64_sw(&crc, &buf, &len);
-    ut_crc32_64_sw(&crc, &buf, &len);
-    ut_crc32_64_sw(&crc, &buf, &len);
-    ut_crc32_64_sw(&crc, &buf, &len);
-    ut_crc32_64_sw(&crc, &buf, &len);
-    ut_crc32_64_sw(&crc, &buf, &len);
-    ut_crc32_64_sw(&crc, &buf, &len);
-    ut_crc32_64_sw(&crc, &buf, &len);
-    ut_crc32_64_sw(&crc, &buf, &len);
-    ut_crc32_64_sw(&crc, &buf, &len);
+    crc32_64(&crc, &buf, &len);
+    crc32_64(&crc, &buf, &len);
+    crc32_64(&crc, &buf, &len);
+    crc32_64(&crc, &buf, &len);
+    crc32_64(&crc, &buf, &len);
+    crc32_64(&crc, &buf, &len);
+    crc32_64(&crc, &buf, &len);
+    crc32_64(&crc, &buf, &len);
+    crc32_64(&crc, &buf, &len);
+    crc32_64(&crc, &buf, &len);
+    crc32_64(&crc, &buf, &len);
+    crc32_64(&crc, &buf, &len);
+    crc32_64(&crc, &buf, &len);
+    crc32_64(&crc, &buf, &len);
+    crc32_64(&crc, &buf, &len);
+    crc32_64(&crc, &buf, &len);
   }
 
   while (len >= 8) {
-    ut_crc32_64_sw(&crc, &buf, &len);
+    crc32_64(&crc, &buf, &len);
   }
 
   while (len > 0) {
-    ut_crc32_8_sw(&crc, &buf, &len);
+    crc32_8(&crc, &buf, &len);
   }
 
   return (~crc);
 }
-
-/** Calculates CRC32 in software, without using CPU instructions.
-This function uses big endian byte ordering when converting byte sequence to
-integers.
+/** Computes CRC32-C hash not using any hardware accelaration.
+It's non-static so it can be unit-tested, but otherwise should not be used
+directly, and thus is not exposed in the header file - use ut_crc32 to benefit
+from hardware acceleration available.
 @param[in]	buf	data over which to calculate CRC32
 @param[in]	len	data length
 @return CRC-32C (polynomial 0x11EDC6F41) */
-static uint32_t ut_crc32_legacy_big_endian_sw(const byte *buf, ulint len) {
-  uint32_t crc = 0xFFFFFFFFU;
+uint32_t crc32(const byte *buf, size_t len) {
+  return crc32_processing_64bit_chunks<crc32_64>(buf, len);
+}
+} /* namespace software */
 
-  ut_ad(ut_crc32_slice8_table_initialized);
+uint32_t ut_crc32_legacy_big_endian(const byte *buf, size_t len) {
+  return software::crc32_processing_64bit_chunks<
+      software::crc32_64_legacy_big_endian>(buf, len);
+}
 
-  /* Calculate byte-by-byte up to an 8-byte aligned address. After
-  this consume the input 8-bytes at a time. */
-  while (len > 0 && (reinterpret_cast<uintptr_t>(buf) & 7) != 0) {
-    ut_crc32_8_sw(&crc, &buf, &len);
-  }
+#ifndef CRC32_DEFAULT
 
-  while (len >= 128) {
-    /* This call is repeated 16 times. 16 * 8 = 128. */
-    ut_crc32_64_legacy_big_endian_sw(&crc, &buf, &len);
-    ut_crc32_64_legacy_big_endian_sw(&crc, &buf, &len);
-    ut_crc32_64_legacy_big_endian_sw(&crc, &buf, &len);
-    ut_crc32_64_legacy_big_endian_sw(&crc, &buf, &len);
-    ut_crc32_64_legacy_big_endian_sw(&crc, &buf, &len);
-    ut_crc32_64_legacy_big_endian_sw(&crc, &buf, &len);
-    ut_crc32_64_legacy_big_endian_sw(&crc, &buf, &len);
-    ut_crc32_64_legacy_big_endian_sw(&crc, &buf, &len);
-    ut_crc32_64_legacy_big_endian_sw(&crc, &buf, &len);
-    ut_crc32_64_legacy_big_endian_sw(&crc, &buf, &len);
-    ut_crc32_64_legacy_big_endian_sw(&crc, &buf, &len);
-    ut_crc32_64_legacy_big_endian_sw(&crc, &buf, &len);
-    ut_crc32_64_legacy_big_endian_sw(&crc, &buf, &len);
-    ut_crc32_64_legacy_big_endian_sw(&crc, &buf, &len);
-    ut_crc32_64_legacy_big_endian_sw(&crc, &buf, &len);
-    ut_crc32_64_legacy_big_endian_sw(&crc, &buf, &len);
-  }
+namespace hardware {
 
-  while (len >= 8) {
-    ut_crc32_64_legacy_big_endian_sw(&crc, &buf, &len);
-  }
+#ifdef CRC32_x86_64
+/** Executes cpuid assembly instruction and returns the ecx register's value.
+@return ecx value produced by cpuid */
+static inline uint32_t get_cpuid_ecx();
+#endif /* CRC32_x86_64 */
 
-  while (len > 0) {
-    ut_crc32_8_sw(&crc, &buf, &len);
+#ifdef CRC32_x86_64_WIN
+static inline uint32_t get_cpuid_ecx() {
+  int cpu_info[4] = {-1, -1, -1, -1};
+  __cpuid(cpu_info, 1 /* function 1 */);
+  return static_cast<uint32_t>(cpu_info[2]);
+}
+#endif /* CRC32_x86_64_WIN */
+
+#ifdef CRC32_x86_64_DEFAULT
+static inline uint32_t get_cpuid_ecx() {
+  uint32_t features_ecx;
+  asm("cpuid" : "=c"(features_ecx) : "a"(1) : "ebx", "edx");
+  return features_ecx;
+}
+#endif /* CRC32_x86_64_DEFAULT */
+
+/** Checks if hardware accelerated crc32 instructions are available to this
+process right now. */
+bool can_use_crc32();
+/** Checks if hardware accelerated polynomial multiplication instructions are
+available to this process right now. */
+bool can_use_poly_mul();
+
+#ifdef CRC32_x86_64
+bool can_use_crc32() { return get_cpuid_ecx() & (1U << 20); }
+bool can_use_poly_mul() { return get_cpuid_ecx() & (1U << 1); }
+#endif /* CRC32_x86_64 */
+
+#ifdef CRC32_ARM64_APPLE
+bool can_use_crc32() { return true; }
+bool can_use_poly_mul() { return true; }
+#endif /* CRC32_ARM64_APPLE */
+
+#ifdef CRC32_ARM64_DEFAULT
+bool can_use_crc32() { return getauxval(AT_HWCAP) & HWCAP_CRC32; }
+bool can_use_poly_mul() { return getauxval(AT_HWCAP) & HWCAP_PMULL; }
+#endif /* CRC32_ARM64_DEFAULT */
+
+/** A helper template to statically unroll a loop with a fixed number of
+iterations, where the iteration number itself is constexpr. So, instead of:
+
+   Something::template run<0>(a,b);
+   Something::template run<1>(a,b);
+   Something::template run<2>(a,b);
+
+you can write:
+
+    Loop<3>::template run<Something>(a, b);
+*/
+template <size_t iterations>
+struct Loop {
+  template <typename Step_executor, typename... Args>
+  static void run(Args &&... args) {
+    Loop<iterations - 1>::template run<Step_executor, Args...>(
+        std::forward<Args>(args)...);
+    Step_executor::template run<iterations - 1>(std::forward<Args>(args)...);
+  }
+};
+template <>
+struct Loop<0> {
+  template <typename Step_executor, typename... Args>
+  static void run(Args &&... args) {}
+};
+
+/** Computes x^(len*8) modulo CRC32-C polynomial, which is useful, when you need
+to conceptually append len bytes of zeros to already computed hash.
+@param[in]  len   The value of len in the x^(len*8) mod CRC32-C
+@return the rest of x^(len*8) mod CRC32-C, with the most significant coefficient
+of the resulting rest - the one which is for x^31 - stored as the most
+significant bit of the uint32_t (the one at 1U<<31) */
+constexpr uint32_t compute_x_to_8len(size_t len) {
+  // The x^(len*8) mod CRC32 polynomial depends on len only.
+  uint32_t x_to_8len = 1;
+  // push len bytes worth of zeros
+  for (size_t i = 0; i < len * 8; ++i) {
+    const bool will_wrap = x_to_8len >> 31 & 1;
+    x_to_8len <<= 1;
+    if (will_wrap) x_to_8len ^= CRC32C_POLYNOMIAL;
+  }
+  return x_to_8len;
+}
+
+/** Produces a 64-bit result by moving i-th bit of 32-bit input to the
+32-i-th position (zeroing the other bits). Please note that in particular this
+moves 0-th bit to 32-nd, and 31-st bit to 1-st, so the range in which data
+resides is not only mirrored, but also shifted one bit. Such operation is useful
+for implementing polynomial multiplication when one of the operands is given in
+reverse and we need the result reversed, too (as is the case in CRC32-C):
+    rev(w * v) =   rev(w)*flip_at_32(v)
+proof:
+    rev(w * v)[i] = (w * v)[63-i] = sum(0<=j<=31){w[j]*v[63-i-j]} =
+    sum(0<=j<=31){rev(w)[31-j]*v[63-i-j]} =
+    sum(0<=j<=31){rev(w)[31-j]*flip_at_32(v)[32-63+i+j]} =
+    sum(0<=j<=31){rev(w)[31-j]*flip_at_32(v)[i-(j-31)]} =
+    sum(0<=j<=31){rev(w)[j]*flip_at_32(v)[i-j]} =
+    rev(w)*flip_at_32(v)[i]
+So, for example, if crc32=rev(w) is the variable storing the CRC32-C hash of a
+buffer, and you want to conceptually append len bytes of zeros to it, then you
+can precompute v = compute_x_to_8len(len), and are interested in rev(w*v), which
+you can achieve by crc32 * flip_at_32(compute_x_to_8len(len)).
+@param[in]  w   The input 32-bit polynomial
+@return The polynomial flipped and shifted, so that i-th bit becomes 32-i-th. */
+constexpr uint64_t flip_at_32(uint32_t w) {
+  uint64_t f{0};
+  for (int i = 0; i < 32; ++i) {
+    if (((w >> i) & 1)) {
+      f ^= uint64_t{1} << (32 - i);
+    }
   }
+  return f;
+}
 
-  return (~crc);
+/** The collection of functions implementing hardware accelerated updating of
+CRC32-C hash by processing a few (1,2,4 or 8) bytes of input. They are grouped
+together in a type, so it's easier to swap their implementation by providing
+algo_to_use template argument to higher level functions. */
+struct crc32_impl {
+  static inline uint32_t update(uint32_t crc, unsigned char data);
+  static inline uint32_t update(uint32_t crc, uint16_t data);
+  static inline uint32_t update(uint32_t crc, uint32_t data);
+  static inline uint64_t update(uint64_t crc, uint64_t data);
+};
+
+#ifdef CRC32_x86_64
+MY_ATTRIBUTE((target("sse4.2")))
+uint32_t crc32_impl::update(uint32_t crc, unsigned char data) {
+  return _mm_crc32_u8(crc, data);
+}
+MY_ATTRIBUTE((target("sse4.2")))
+uint32_t crc32_impl::update(uint32_t crc, uint16_t data) {
+  return _mm_crc32_u16(crc, data);
+}
+MY_ATTRIBUTE((target("sse4.2")))
+uint32_t crc32_impl::update(uint32_t crc, uint32_t data) {
+  return _mm_crc32_u32(crc, data);
 }
+MY_ATTRIBUTE((target("sse4.2")))
+uint64_t crc32_impl::update(uint64_t crc, uint64_t data) {
+  return _mm_crc32_u64(crc, data);
+}
+#endif /* CRC32_x86_64 */
 
-/** Calculates CRC32 in software, without using CPU instructions.
-This function processes one byte at a time (very slow) and thus it does
-not depend on the byte order of the machine.
-@param[in]	buf	data over which to calculate CRC32
+#ifdef CRC32_ARM64
+#ifdef CRC32_ARM64_DEFAULT
+MY_ATTRIBUTE((target("+crc")))
+#endif /* CRC32_ARM64_DEFAULT */
+uint32_t crc32_impl::update(uint32_t crc, unsigned char data) {
+  return __crc32cb(crc, data);
+}
+#ifdef CRC32_ARM64_DEFAULT
+MY_ATTRIBUTE((target("+crc")))
+#endif /* CRC32_ARM64_DEFAULT */
+uint32_t crc32_impl::update(uint32_t crc, uint16_t data) {
+  return __crc32ch(crc, data);
+}
+#ifdef CRC32_ARM64_DEFAULT
+MY_ATTRIBUTE((target("+crc")))
+#endif /* CRC32_ARM64_DEFAULT */
+uint32_t crc32_impl::update(uint32_t crc, uint32_t data) {
+  return __crc32cw(crc, data);
+}
+#ifdef CRC32_ARM64_DEFAULT
+MY_ATTRIBUTE((target("+crc")))
+#endif /* CRC32_ARM64_DEFAULT */
+uint64_t crc32_impl::update(uint64_t crc, uint64_t data) {
+  return (uint64_t)__crc32cd((uint32_t)crc, data);
+}
+#endif /* CRC32_ARM64 */
+
+/** Implementation of polynomial_mul_rev<w>(rev_u) function which uses hardware
+accelerated polynomial multiplication to compute rev(w*u), where rev_u=rev(u).
+This is accomplished by using rev_u * flip_at_32(w), @see flip_at_32 for
+explanation why it works and why this is useful. */
+struct use_pclmul : crc32_impl {
+  template <uint32_t w>
+  inline static uint64_t polynomial_mul_rev(uint32_t rev_u);
+};
+#ifdef CRC32_x86_64
+template <uint32_t w>
+MY_ATTRIBUTE((target("sse4.2,pclmul")))
+uint64_t use_pclmul::polynomial_mul_rev(uint32_t rev_u) {
+  constexpr uint64_t flipped_w = flip_at_32(w);
+  return _mm_cvtsi128_si64(_mm_clmulepi64_si128(
+      _mm_set_epi64x(0, rev_u), _mm_set_epi64x(0, flipped_w), 0x00));
+}
+#endif /* CRC32_x86_64 */
+
+#ifdef CRC32_ARM64
+/** This function performs just a "type casts" from uint64_t to poly64_t.
+@param[in]  w   The 64 coefficients of the polynomial
+@return the polynomial w(x) = sum_{i=0}^{63} { (w&(1ULL<<i)) * x^{i} }
+*/
+static inline poly64_t uint64_t_to_poly_64_t(uint64_t w) {
+  /* This should compile down to nothing */
+  return vget_lane_p64(vcreate_p64(w), 0);
+}
+/** This function takes a polynomial and extracts the 64 least significant
+coefficients.
+@param[in]  w   The polynomial w(x) = sum_{i=0}^{127} { a_i * x^{i} }
+@return The lowest 64 coefficients, i.e. (result & (1ULL<<i)) == a_i for 0<=i<64
+*/
+static inline uint64_t less_significant_half_of_poly128_t_to_uint64_t(
+    poly128_t w) {
+  /* This should compile down to just a single mov */
+  return vgetq_lane_u64(vreinterpretq_u64_p128(w), 0);
+}
+template <uint32_t w>
+#ifdef CRC32_ARM64_DEFAULT
+MY_ATTRIBUTE((target("+crypto")))
+#endif /* CRC32_ARM64_DEFAULT */
+uint64_t use_pclmul::polynomial_mul_rev(uint32_t rev_u) {
+  constexpr uint64_t flipped_w = flip_at_32(w);
+  return less_significant_half_of_poly128_t_to_uint64_t(vmull_p64(
+      uint64_t_to_poly_64_t(flipped_w), uint64_t_to_poly_64_t(rev_u)));
+}
+#endif /* CRC32_ARM64 */
+
+/** Implementation of polynomial_mul_rev<w>(rev_u) function which uses a simple
+loop over i: if(w>>i&1)result^=rev_u<<(32-i), which is equivalent to
+w * flip_at_32(rev_u), which in turn is equivalent to rev(rev(w) * rev_u),
+@see flip_at_32 for explanation why this holds,
+@see use_pclmul for explanation of what polynomial_mul_rev is computing.
+This implementation is to be used when hardware accelerated polynomial
+multiplication is not available. It tries to unroll the simple loop, so just
+the few xors and shifts for non-zero bits of w are emitted. */
+struct use_unrolled_loop_poly_mul : crc32_impl {
+  template <uint32_t x_to_len_8>
+  struct Polynomial_mul_rev_step_executor {
+    template <size_t i>
+    static void run(uint64_t &acc, const uint32_t hash_1) {
+      if (x_to_len_8 >> ((uint32_t)i) & 1) {
+        acc ^= uint64_t{hash_1} << (32 - i);
+      }
+    }
+  };
+  template <uint32_t w>
+  inline static uint64_t polynomial_mul_rev(uint32_t rev_u) {
+    uint64_t rev_w_times_u{0};
+    Loop<32>::run<Polynomial_mul_rev_step_executor<w>>(rev_w_times_u, rev_u);
+    return rev_w_times_u;
+  }
+};
+
+/** Rolls the crc forward by len bytes, that is updates it as if 8*len zero bits
+were processed.
+@param[in]	crc	initial value of the hash
+@return Updated value of the hash: rev(rev(crc)*(x^{8*len} mod CRC32-C)) */
+template <size_t len, typename algo_to_use>
+inline static uint64_t roll(uint32_t crc) {
+  return algo_to_use::template polynomial_mul_rev<compute_x_to_8len(len)>(crc);
+}
+
+/** Takes a 64-bit reversed representation of a polynomial, and computes the
+32-bit reveresed representation of it modulo CRC32-C.
+@param[in]  big   The 64-bit representation of polynomial w, with the most
+                  significant coefficient (the one for x^63) stored at least
+                  significant bit (the one at 1<<0).
+@return The 32-bit representation of w mod CRC-32, in which the most significant
+        coefficient (the one for x^31) stored at least significant bit
+        (the one at 1<<0). */
+template <typename algo_to_use>
+static inline uint32_t fold_64_to_32(uint64_t big) {
+  /* crc is stored in bit-reversed format, so "significant part of uint64_t" is
+  actually the least significant part of the polynomial, and the "insignificant
+  part of uint64_t" are the coefficients of highest degrees for which we need to
+  compute the rest mod crc32-c polynomial. */
+  return algo_to_use::update((uint32_t)big, uint32_t{0}) ^ (big >> 32);
+}
+
+/** The body of unrolled loop used to process slices in parallel, which in i-th
+iteration processes 8 bytes from the i-th slice of data, where each slice has
+slice_len bytes. */
+template <typename algo_to_use, size_t slice_len>
+struct Update_step_executor {
+  template <size_t i>
+  static void run(uint64_t *crc, const uint64_t *data64) {
+    crc[i] = algo_to_use::update(crc[i], *(data64 + i * (slice_len / 8)));
+  }
+};
+
+/** The body of unrolled loop used to combine partial results from each slice
+into the final hash of whole chunk, which in i-th iteration takes the crc of
+i-th slice and "rolls it forward" by virtually processing as many zeros as there
+are from the end of the i-th slice to the end of the chunk. */
+template <typename algo_to_use, size_t slice_len, size_t slices_count>
+struct Combination_step_executor {
+  template <size_t i>
+  static void run(uint64_t &combined, const uint64_t *crc) {
+    combined ^= roll<slice_len *(slices_count - 1 - i), algo_to_use>(crc[i]);
+  }
+};
+
+/** Updates the crc checksum by processing slices_count*slice_len bytes of data.
+The chunk is processed as slice_count independent slices of length slice_len,
+and the results are combined together at the end to compute correct result.
+@param[in]	crc0	initial value of the hash
+@param[in]	data	data over which to calculate CRC32-C
+@return The value of _crc updated by processing the range
+        data[0]...data[slices_count*slice_len-1]. */
+template <size_t slice_len, size_t slices_count, typename algo_to_use>
+static inline uint32_t consume_chunk(uint32_t crc0, const unsigned char *data) {
+  static_assert(slices_count > 0, "there must be at least one slice");
+  const uint64_t *data64 = (const uint64_t *)data;
+  /* crc[i] is the hash for i-th slice, data[i*slice_len...(i+1)*slice_len)
+  where the initial value for each crc[i] is zero, except crc[0] for which we
+  use the initial value crc0 passed in by the caller. */
+  uint64_t crc[slices_count]{crc0};
+  /* Each iteration of the for() loop will eat 8 bytes (single uint64_t) from
+  each slice. */
+  static_assert(
+      slice_len % sizeof(uint64_t) == 0,
+      "we must be able to process a slice efficiently using 8-byte updates");
+  constexpr auto iters = slice_len / sizeof(uint64_t);
+  for (size_t i = 0; i < iters; ++i) {
+    Loop<slices_count>::template run<
+        Update_step_executor<algo_to_use, slice_len>>(crc, data64);
+    ++data64;
+  }
+  /* combined_crc = sum crc[i]*x^{slices_count-i-1} mod CRC32-C */
+  uint64_t combined_crc{0};
+  /* This ugly if is here to ensure that fold_64_to_32 is called just once, as
+  opposed to being done as part of combining each individual slice, which would
+  also be correct, but would mean that CPU can't process roll()s in parallel.
+  That is:
+    combined ^= roll<"n-1 slices">(crc[0])
+    combined ^= roll<"n-2 slices">(crc[1])
+    ...
+    combined ^= roll<1>(crc[n-2])
+    return fold_64_to_32(combined) ^ crc[n-1]
+  is faster than:
+    crc[1] ^= fold_64_to_32(roll<"n-1 slices">(crc[0]))
+    crc[2] ^= fold_64_to_32(roll<"n-1 slices">(crc[1]))
+    ...
+    crc[n-1] ^= fold_64_to_32(roll<1>(crc[n-2]))
+    return crc[n-1]
+  as the inputs to roll()s are independent, but now fold_64_to_32 is only needed
+  conditionally, when slices_count > 1. */
+  if (1 < slices_count) {
+    Loop<slices_count - 1>::template run<
+        Combination_step_executor<algo_to_use, slice_len, slices_count>>(
+        combined_crc, crc);
+    combined_crc = fold_64_to_32<algo_to_use>(combined_crc);
+  }
+  return combined_crc ^ crc[slices_count - 1];
+}
+
+/** Updates the crc checksum by processing at most len bytes of data.
+The data is consumed in chunks of size slice_len*slices_count, and stops when
+no more full chunks can be fit into len bytes.
+Each chunk is processed as slice_count independent slices of length slice_len,
+and the results are combined together at the end to compute correct result.
+@param[in,out]	crc	initial value of the hash. Updated by this function by
+                        processing data[0]...data[B*(slice_len * slices_count)],
+                        where B = floor(len / (slice_len * slices_count)).
+@param[in,out]	data	data over which to calculate CRC32-C. Advanced by this
+                        function to point to unprocessed part of the buffer.
+@param[in,out]	len	data length to be processed. Updated by this function
+                        to be len % (slice_len * slices_count). */
+template <size_t slice_len, size_t slices_count, typename algo_to_use>
+static inline void consume_chunks(uint32_t &crc, const byte *&data,
+                                  size_t &len) {
+  while (len >= slice_len * slices_count) {
+    crc = consume_chunk<slice_len, slices_count, algo_to_use>(crc, data);
+    len -= slice_len * slices_count;
+    data += slice_len * slices_count;
+  }
+}
+/** Updates the crc checksum by processing Chunk (1,2 or 4 bytes) of data,
+but only when the len of the data provided, when decomposed into powers of two,
+has a Chunk of this length. This is used to process the prefix of the buffer to
+get to the position which is aligned mod 8, and to process the remaining suffix
+which starts at position aligned  mod 8, but has less than 8 bytes.
+@param[in,out]	crc	initial value of the hash. Updated by this function by
+                        processing Chunk pointed by data.
+@param[in,out]	data	data over which to calculate CRC32-C. Advanced by this
+                        function to point to unprocessed part of the buffer.
+@param[in,out]	len	data length, allowed to be processed. */
+template <typename Chunk, typename algo_to_use>
+static inline void consume_pow2(uint32_t &crc, const byte *&data, size_t len) {
+  if (len & sizeof(Chunk)) {
+    crc = algo_to_use::update(crc, *(Chunk *)data);
+    data += sizeof(Chunk);
+  }
+}
+/** The hardware accelerated implementation of CRC32-C exploiting within-core
+parallelism on reordering processors, by consuming the data in large chunks
+split into 3 independent slices each. It's optimized for handling buffers of
+length typical for 16kb pages and redo log blocks, but it works correctly for
+any len and alignment.
+@param[in]	crc	initial value of the hash (0 for first block, or the
+                        result of CRC32-C for the data processed so far)
+@param[in]	data	data over which to calculate CRC32-C
 @param[in]	len	data length
 @return CRC-32C (polynomial 0x11EDC6F41) */
-static uint32_t ut_crc32_byte_by_byte_sw(const byte *buf, ulint len) {
-  uint32_t crc = 0xFFFFFFFFU;
-
-  ut_ad(ut_crc32_slice8_table_initialized);
-
-  while (len > 0) {
-    ut_crc32_8_sw(&crc, &buf, &len);
+template <typename algo_to_use>
+static uint32_t crc32(uint32_t crc, const byte *data, size_t len) {
+  crc = ~crc;
+  if (8 <= len) {
+    /* For performance, the main loop will operate on uint64_t[].
+    On some  platforms unaligned reads are not allowed, on others they are
+    slower, so we start by consuming the unaligned prefix of the data. */
+    const size_t prefix_len = (8 - reinterpret_cast<uintptr_t>(data)) & 7;
+    /* data address may be unaligned, so we read just one byte if it's odd */
+    consume_pow2<byte, algo_to_use>(crc, data, prefix_len);
+    /* data address is now aligned mod 2, but may be unaligned mod 4*/
+    consume_pow2<uint16_t, algo_to_use>(crc, data, prefix_len);
+    /* data address is now aligned mod 4, but may be unaligned mod 8 */
+    consume_pow2<uint32_t, algo_to_use>(crc, data, prefix_len);
+    /* data is now aligned mod 8 */
+    len -= prefix_len;
+    /* The suffix_len will be needed later, but we can compute it here already,
+    as len will only be modified by subtracting multiples of 8, and hopefully,
+    learning suffix_len sooner will make it easier for branch predictor later.*/
+    const size_t suffix_len = len & 7;
+    /* A typical page is 16kb, but the part for which we compute crc32 is a bit
+    shorter, thus 5440*3 is the largest multiple of 8*3 that fits. For pages
+    larger than 16kb, there's not much gain from handling them specially. */
+    consume_chunks<5440, 3, algo_to_use>(crc, data, len);
+    /* A typical redo log block is 0.5kb, but 168*3 is the largest multiple of
+    8*3 which fits in the part for which we compute crc32. */
+    consume_chunks<168, 3, algo_to_use>(crc, data, len);
+    /* In general there can be some left-over (smaller than 168*3) which we
+    consume 8*1 bytes at a time. */
+    consume_chunks<8, 1, algo_to_use>(crc, data, len);
+    /* Finally, there might be unprocessed suffix_len < 8, which we deal with
+    minimal number of computations caring about proper alignment. */
+    consume_pow2<uint32_t, algo_to_use>(crc, data, suffix_len);
+    consume_pow2<uint16_t, algo_to_use>(crc, data, suffix_len);
+    consume_pow2<byte, algo_to_use>(crc, data, suffix_len);
+  } else {
+    while (len--) {
+      crc = algo_to_use::update(crc, *data++);
+    }
   }
+  return ~crc;
+}
 
-  return (~crc);
+/** The specialization of crc32<> template for use_pclmul and 0 as initial
+value of the hash. Used on platforms which support hardware accelerated
+polynomial multiplication.
+It's non-static so it can be unit-tested.
+@param[in]	data	data over which to calculate CRC32-C
+@param[in]	len	data length
+@return CRC-32C (polynomial 0x11EDC6F41) */
+#ifdef CRC32_x86_64_DEFAULT
+MY_ATTRIBUTE((target("sse4.2,pclmul"), flatten))
+#endif /* CRC32_x86_64_DEFAULT */
+#ifdef CRC32_ARM64_APPLE
+MY_ATTRIBUTE((flatten))
+#endif /* CRC32_ARM64_APPLE */
+#ifdef CRC32_ARM64_DEFAULT
+MY_ATTRIBUTE((target("+crc+crypto"), flatten))
+#endif /* CRC32_ARM64_DEFAULT */
+uint32_t crc32_using_pclmul(const byte *data, size_t len) {
+  return crc32<use_pclmul>(0, data, len);
+}
+
+/** The specialization of crc32<> template for use_unrolled_loop_poly_mul and 0
+as initial value of the hash. Used on platforms which do not support hardware
+accelerated polynomial multiplication.
+It's non-static so it can be unit-tested.
+@param[in]	data	data over which to calculate CRC32-C
+@param[in]	len	data length
+@return CRC-32C (polynomial 0x11EDC6F41) */
+#ifdef CRC32_x86_64_DEFAULT
+MY_ATTRIBUTE((target("sse4.2"), flatten))
+#endif /* CRC32_x86_64_DEFAULT */
+#ifdef CRC32_ARM64_APPLE
+MY_ATTRIBUTE((flatten))
+#endif /* CRC32_ARM64_APPLE */
+#ifdef CRC32_ARM64_DEFAULT
+MY_ATTRIBUTE((target("+crc"), flatten))
+#endif /* CRC32_ARM64_DEFAULT */
+uint32_t crc32_using_unrolled_loop_poly_mul(const byte *data, size_t len) {
+  return crc32<use_unrolled_loop_poly_mul>(0, data, len);
 }
 
+} /* namespace hardware */
+
+#endif /* !CRC32_DEFAULT */
+
 /** Initializes the data structures used by ut_crc32*(). Does not do any
- allocations, would not hurt if called twice, but would be pointless. */
+allocations, would not hurt if called twice, but would be pointless. */
 void ut_crc32_init() {
-#if defined(gnuc64) || defined(_WIN32)
-  ut_crc32_cpu_enabled = ut_crc32_check_cpu();
+  software::crc32_slice8_table_init();
+#ifndef CRC32_DEFAULT
+
+#ifdef WORDS_BIGENDIAN
+#error The current crc32 implementation assumes that on big-endian platforms we\
+       will use the default software implementation, because current hardware\
+       implementation supports only little-endian platforms
+#endif /* WORDS_BIGENDIAN */
 
+  ut_crc32_cpu_enabled = hardware::can_use_crc32();
+  ut_poly_mul_cpu_enabled = hardware::can_use_poly_mul();
   if (ut_crc32_cpu_enabled) {
-    ut_crc32 = ut_crc32_hw;
-    ut_crc32_legacy_big_endian = ut_crc32_legacy_big_endian_hw;
-    ut_crc32_byte_by_byte = ut_crc32_byte_by_byte_hw;
-  }
-#endif /* defined(gnuc64) || defined(_WIN32) */
-
-  if (!ut_crc32_cpu_enabled) {
-    ut_crc32_slice8_table_init();
-    ut_crc32 = ut_crc32_sw;
-    ut_crc32_legacy_big_endian = ut_crc32_legacy_big_endian_sw;
-    ut_crc32_byte_by_byte = ut_crc32_byte_by_byte_sw;
+    if (ut_poly_mul_cpu_enabled) {
+      ut_crc32 = hardware::crc32_using_pclmul;
+    } else {
+      ut_crc32 = hardware::crc32_using_unrolled_loop_poly_mul;
+    }
+    return;
   }
+#endif /* !CRC32_DEFAULT */
+  ut_crc32 = software::crc32;
 }
diff -Nru mysql-8.0-8.0.26/storage/innobase/ut/ut0list.cc mysql-8.0-8.0.27/storage/innobase/ut/ut0list.cc
--- mysql-8.0-8.0.26/storage/innobase/ut/ut0list.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/ut/ut0list.cc	2021-09-28 11:46:34.000000000 +0000
@@ -37,7 +37,8 @@
 /** Create a new list.
  @return list */
 ib_list_t *ib_list_create(void) {
-  return (static_cast<ib_list_t *>(ut_zalloc_nokey(sizeof(ib_list_t))));
+  return (static_cast<ib_list_t *>(
+      ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sizeof(ib_list_t))));
 }
 
 /** Free a list. */
@@ -47,7 +48,7 @@
   to e.g. have all the nodes allocated from a single heap that is then
   freed after the list itself is freed. */
 
-  ut_free(list);
+  ut::free(list);
 }
 
 /** Add the data after the indicated node.
diff -Nru mysql-8.0-8.0.26/storage/innobase/ut/ut0mem.cc mysql-8.0-8.0.27/storage/innobase/ut/ut0mem.cc
--- mysql-8.0-8.0.26/storage/innobase/ut/ut0mem.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/ut/ut0mem.cc	2021-09-28 11:46:34.000000000 +0000
@@ -59,7 +59,7 @@
 Concatenate 3 strings.*/
 char *ut_str3cat(
     /* out, own: concatenated string, must be
-    freed with ut_free() */
+    freed with ut::free() */
     const char *s1, /* in: string 1 */
     const char *s2, /* in: string 2 */
     const char *s3) /* in: string 3 */
@@ -69,7 +69,8 @@
   ulint s2_len = strlen(s2);
   ulint s3_len = strlen(s3);
 
-  s = static_cast<char *>(ut_malloc_nokey(s1_len + s2_len + s3_len + 1));
+  s = static_cast<char *>(ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY,
+                                             s1_len + s2_len + s3_len + 1));
 
   memcpy(s, s1, s1_len);
   memcpy(s + s1_len, s2, s2_len);
diff -Nru mysql-8.0-8.0.26/storage/innobase/ut/ut0new.cc mysql-8.0-8.0.27/storage/innobase/ut/ut0new.cc
--- mysql-8.0-8.0.26/storage/innobase/ut/ut0new.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/ut/ut0new.cc	2021-09-28 11:46:34.000000000 +0000
@@ -35,6 +35,9 @@
 #include "my_compiler.h"
 #include "ut0new.h"
 
+/** System-default huge (large) page setting. */
+const size_t large_page_default_size = ut::detail::large_page_size();
+
 /** Maximum number of retries to allocate memory. */
 const size_t alloc_max_retries = 60;
 
@@ -53,7 +56,7 @@
 PSI_memory_key mem_key_other;
 PSI_memory_key mem_key_partitioning;
 PSI_memory_key mem_key_row_log_buf;
-PSI_memory_key mem_key_row_merge_sort;
+PSI_memory_key mem_key_ddl;
 PSI_memory_key mem_key_std;
 PSI_memory_key mem_key_trx_sys_t_rw_trx_ids;
 PSI_memory_key mem_key_undo_spaces;
@@ -94,7 +97,7 @@
     {&mem_key_other, "other", 0, 0, PSI_DOCUMENT_ME},
     {&mem_key_partitioning, "partitioning", 0, 0, PSI_DOCUMENT_ME},
     {&mem_key_row_log_buf, "row_log_buf", 0, 0, PSI_DOCUMENT_ME},
-    {&mem_key_row_merge_sort, "row_merge_sort", 0, 0, PSI_DOCUMENT_ME},
+    {&mem_key_ddl, "ddl", 0, 0, PSI_DOCUMENT_ME},
     {&mem_key_std, "std", 0, 0, PSI_DOCUMENT_ME},
     {&mem_key_trx_sys_t_rw_trx_ids, "trx_sys_t::rw_trx_ids", 0, 0,
      PSI_DOCUMENT_ME},
@@ -109,8 +112,8 @@
 
 #endif /* UNIV_PFS_MEMORY */
 
-/** Setup the internal objects needed for UT_NEW() to operate.
-This must be called before the first call to UT_NEW(). */
+/** Setup the internal objects needed for ut::new_withkey() to operate.
+This must be called before the first call to ut::new_withkey(). */
 void ut_new_boot() {
 #ifdef UNIV_PFS_MEMORY
   for (size_t i = 0; i < n_auto; i++) {
diff -Nru mysql-8.0-8.0.26/storage/innobase/ut/ut0rbt.cc mysql-8.0-8.0.27/storage/innobase/ut/ut0rbt.cc
--- mysql-8.0-8.0.26/storage/innobase/ut/ut0rbt.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/ut/ut0rbt.cc	2021-09-28 11:46:34.000000000 +0000
@@ -638,7 +638,7 @@
     rbt_free_node(node->left, nil);
     rbt_free_node(node->right, nil);
 
-    ut_free(node);
+    ut::free(node);
   }
 }
 
@@ -646,8 +646,8 @@
 void rbt_free(ib_rbt_t *tree) /*!< in: rb tree to free */
 {
   rbt_free_node(tree->root, tree->nil);
-  ut_free(tree->nil);
-  ut_free(tree);
+  ut::free(tree->nil);
+  ut::free(tree);
 }
 
 /** Create an instance of a red black tree, whose comparison function takes
@@ -677,19 +677,22 @@
   ib_rbt_t *tree;
   ib_rbt_node_t *node;
 
-  tree = (ib_rbt_t *)ut_zalloc_nokey(sizeof(*tree));
+  tree =
+      (ib_rbt_t *)ut::zalloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sizeof(*tree));
 
   tree->sizeof_value = sizeof_value;
 
   /* Create the sentinel (NIL) node. */
-  node = tree->nil = (ib_rbt_node_t *)ut_zalloc_nokey(sizeof(*node));
+  node = tree->nil = (ib_rbt_node_t *)ut::zalloc_withkey(
+      UT_NEW_THIS_FILE_PSI_KEY, sizeof(*node));
 
   node->color = IB_RBT_BLACK;
   node->parent = node->left = node->right = node;
 
   /* Create the "fake" root, the real root node will be the
   left child of this node. */
-  node = tree->root = (ib_rbt_node_t *)ut_zalloc_nokey(sizeof(*node));
+  node = tree->root = (ib_rbt_node_t *)ut::zalloc_withkey(
+      UT_NEW_THIS_FILE_PSI_KEY, sizeof(*node));
 
   node->color = IB_RBT_BLACK;
   node->parent = node->left = node->right = tree->nil;
@@ -710,7 +713,8 @@
   ib_rbt_node_t *node;
 
   /* Create the node that will hold the value data. */
-  node = (ib_rbt_node_t *)ut_malloc_nokey(SIZEOF_NODE(tree));
+  node = (ib_rbt_node_t *)ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY,
+                                             SIZEOF_NODE(tree));
 
   memcpy(node->value, value, tree->sizeof_value);
   node->parent = node->left = node->right = tree->nil;
@@ -734,7 +738,8 @@
   ib_rbt_node_t *node;
 
   /* Create the node that will hold the value data */
-  node = (ib_rbt_node_t *)ut_malloc_nokey(SIZEOF_NODE(tree));
+  node = (ib_rbt_node_t *)ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY,
+                                             SIZEOF_NODE(tree));
 
   memcpy(node->value, value, tree->sizeof_value);
   node->parent = node->left = node->right = tree->nil;
@@ -798,7 +803,7 @@
   if (node) {
     rbt_remove_node_and_rebalance(tree, node);
 
-    ut_free(node);
+    ut::free(node);
     deleted = TRUE;
   }
 
@@ -819,7 +824,7 @@
   rbt_remove_node_and_rebalance(tree, (ib_rbt_node_t *)const_node);
 
   /* This is to make it easier to do something like this:
-          ut_free(rbt_remove_node(node));
+          ut::free(rbt_remove_node(node));
   */
 
   return ((ib_rbt_node_t *)const_node);
diff -Nru mysql-8.0-8.0.26/storage/innobase/ut/ut0test.cc mysql-8.0-8.0.27/storage/innobase/ut/ut0test.cc
--- mysql-8.0-8.0.26/storage/innobase/ut/ut0test.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/ut/ut0test.cc	2021-09-28 11:46:34.000000000 +0000
@@ -357,7 +357,7 @@
   char *filename = fil_space_get_first_path(space_id);
   sout << filename;
   set_output(sout);
-  ut_free(filename);
+  ut::free(filename);
   return RET_PASS;
 }
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/ut/ut0ut.cc mysql-8.0-8.0.27/storage/innobase/ut/ut0ut.cc
--- mysql-8.0-8.0.26/storage/innobase/ut/ut0ut.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/ut/ut0ut.cc	2021-09-28 11:46:34.000000000 +0000
@@ -231,7 +231,7 @@
   switch (formatted_size) {
     case 1:
       formatted[0] = '\0';
-      /* FALL-THROUGH */
+      [[fallthrough]];
     case 0:
       return (formatted);
   }
@@ -330,8 +330,6 @@
 @return string, describing the error */
 const char *ut_strerr(dberr_t num) {
   switch (num) {
-    case DB_CACHE_RECORDS:
-      return ("Request caller to copy tuple");
     case DB_SUCCESS:
       return ("Success");
     case DB_SUCCESS_LOCKED_REC:
@@ -523,6 +521,8 @@
       return ("Too many nested sub-expressions in a full-text search");
     case DB_PAGE_IS_STALE:
       return "Page was discarded, was not written to storage.";
+    case DB_AUTOINC_READ_ERROR:
+      return "Auto-increment read failed";
     case DB_FILE_READ_BEYOND_SIZE:
       return "File read failure because of the read being beyond file size.";
     case DB_ERROR_UNSET:;
@@ -552,15 +552,30 @@
 }
 logger::~logger() { log_event(m_oss.str()); }
 
+/*
+MSVS complains: Warning C4722: destructor never returns, potential memory leak.
+But, the whole point of using ib::fatal temporary object is to cause an abort.
+*/
+#ifdef _WIN32
+#pragma warning(push)
+#pragma warning(disable : 4722)
+#endif /* _WIN32 */
+
 fatal::~fatal() {
   log_event("[FATAL] " + m_oss.str());
-  ut_error;
+  ut_dbg_assertion_failed("ib::fatal triggered", m_location.filename,
+                          m_location.line);
 }
+// Restore the MSVS checks for Warning C4722, silenced for ib::fatal::~fatal().
+#ifdef _WIN32
+#pragma warning(pop)
+#endif /* _WIN32 */
 
 fatal_or_error::~fatal_or_error() {
   if (m_fatal) {
     log_event("[FATAL] " + m_oss.str());
-    ut_error;
+    ut_dbg_assertion_failed("ib::fatal_or_error triggered", m_location.filename,
+                            m_location.line);
   }
 }
 
diff -Nru mysql-8.0-8.0.26/storage/innobase/ut/ut0wqueue.cc mysql-8.0-8.0.27/storage/innobase/ut/ut0wqueue.cc
--- mysql-8.0-8.0.26/storage/innobase/ut/ut0wqueue.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/innobase/ut/ut0wqueue.cc	2021-09-28 11:46:34.000000000 +0000
@@ -42,13 +42,15 @@
 struct ib_wqueue_t {
   ib_mutex_t mutex; /*!< mutex protecting everything */
   ib_list_t *items; /*!< work item list */
+  uint64_t count;   /*!< total number of work items */
   os_event_t event; /*!< event we use to signal additions to list */
 };
 
 /** Create a new work queue.
  @return work queue */
 ib_wqueue_t *ib_wqueue_create(void) {
-  ib_wqueue_t *wq = static_cast<ib_wqueue_t *>(ut_malloc_nokey(sizeof(*wq)));
+  ib_wqueue_t *wq = static_cast<ib_wqueue_t *>(
+      ut::malloc_withkey(UT_NEW_THIS_FILE_PSI_KEY, sizeof(*wq)));
 
   /* Function ib_wqueue_create() has not been used anywhere,
   not necessary to instrument this mutex */
@@ -57,6 +59,7 @@
 
   wq->items = ib_list_create();
   wq->event = os_event_create();
+  wq->count = 0;
 
   return (wq);
 }
@@ -68,7 +71,7 @@
   ib_list_free(wq->items);
   os_event_destroy(wq->event);
 
-  ut_free(wq);
+  ut::free(wq);
 }
 
 /** Add a work item to the queue.
@@ -79,11 +82,20 @@
   mutex_enter(&wq->mutex);
 
   ib_list_add_last(wq->items, item, heap);
+  wq->count++;
   os_event_set(wq->event);
 
   mutex_exit(&wq->mutex);
 }
 
+uint64_t ib_wqueue_get_count(ib_wqueue_t *wq) {
+  uint64_t count;
+  mutex_enter(&wq->mutex);
+  count = wq->count;
+  mutex_exit(&wq->mutex);
+  return count;
+}
+
 /********************************************************************
 Wait for a work item to appear in the queue for specified time. */
 void *ib_wqueue_timedwait(
@@ -103,6 +115,7 @@
 
     if (node) {
       ib_list_remove(wq->items, node);
+      wq->count--;
 
       mutex_exit(&wq->mutex);
       break;
diff -Nru mysql-8.0-8.0.26/storage/myisam/ft_boolean_search.cc mysql-8.0-8.0.27/storage/myisam/ft_boolean_search.cc
--- mysql-8.0-8.0.26/storage/myisam/ft_boolean_search.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/myisam/ft_boolean_search.cc	2021-09-28 11:46:34.000000000 +0000
@@ -204,7 +204,7 @@
       for (tmp_expr = ftb_param->ftbe; tmp_expr->up; tmp_expr = tmp_expr->up)
         if (!(tmp_expr->flags & FTB_FLAG_YES)) break;
       ftbw->max_docid_expr = tmp_expr;
-      /* fall through */
+      [[fallthrough]];
     case FT_TOKEN_STOPWORD:
       if (!ftb_param->up_quot) break;
       phrase_word = (FT_WORD *)ftb_param->ftb->mem_root.Alloc(sizeof(FT_WORD));
@@ -530,7 +530,7 @@
   memset(&ftb->no_dupes, 0, sizeof(TREE));
   ftb->last_word = nullptr;
 
-  init_alloc_root(PSI_INSTRUMENT_ME, &ftb->mem_root, 1024, 1024);
+  ::new ((void *)&ftb->mem_root) MEM_ROOT(PSI_INSTRUMENT_ME, 1024);
   ftb->queue.max_elements = 0;
   if (!(ftbe = (FTB_EXPR *)ftb->mem_root.Alloc(sizeof(FTB_EXPR)))) goto err;
   ftbe->weight = 1;
@@ -575,7 +575,7 @@
   ftb->state = FTB::READY;
   return (FT_INFO *)ftb;
 err:
-  free_root(&ftb->mem_root, MYF(0));
+  ftb->mem_root.Clear();
   my_free(ftb);
   return nullptr;
 }
@@ -589,9 +589,10 @@
   uint match;
 };
 
-static int ftb_phrase_add_word(
-    MYSQL_FTPARSER_PARAM *param, char *word, int word_len,
-    MYSQL_FTPARSER_BOOLEAN_INFO *boolean_info MY_ATTRIBUTE((unused))) {
+static int ftb_phrase_add_word(MYSQL_FTPARSER_PARAM *param, char *word,
+                               int word_len,
+                               MYSQL_FTPARSER_BOOLEAN_INFO *boolean_info
+                               [[maybe_unused]]) {
   MY_FTB_PHRASE_PARAM *phrase_param =
       (MY_FTB_PHRASE_PARAM *)param->mysql_ftparam;
   FT_WORD *w = (FT_WORD *)phrase_param->document->data;
@@ -811,9 +812,10 @@
   FT_SEG_ITERATOR *ftsi;
 };
 
-static int ftb_find_relevance_add_word(
-    MYSQL_FTPARSER_PARAM *param, char *word, int len,
-    MYSQL_FTPARSER_BOOLEAN_INFO *boolean_info MY_ATTRIBUTE((unused))) {
+static int ftb_find_relevance_add_word(MYSQL_FTPARSER_PARAM *param, char *word,
+                                       int len,
+                                       MYSQL_FTPARSER_BOOLEAN_INFO *boolean_info
+                                       [[maybe_unused]]) {
   MY_FTB_FIND_PARAM *ftb_param = (MY_FTB_FIND_PARAM *)param->mysql_ftparam;
   FTB *ftb = ftb_param->ftb;
   FTB_WORD *ftbw;
@@ -939,7 +941,7 @@
   if (is_tree_inited(&ftb->no_dupes)) {
     delete_tree(&ftb->no_dupes);
   }
-  free_root(&ftb->mem_root, MYF(0));
+  ftb->mem_root.Clear();
   my_free(ftb);
 }
 
diff -Nru mysql-8.0-8.0.26/storage/myisam/ft_nlq_search.cc mysql-8.0-8.0.27/storage/myisam/ft_nlq_search.cc
--- mysql-8.0-8.0.26/storage/myisam/ft_nlq_search.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/myisam/ft_nlq_search.cc	2021-09-28 11:46:34.000000000 +0000
@@ -307,8 +307,12 @@
   st_ft_info_nlq *handler = (st_ft_info_nlq *)handler_base;
   MI_INFO *info = (MI_INFO *)handler->info;
 
-  if (++handler->curdoc >= handler->ndocs) {
-    --handler->curdoc;
+  // Move to the next document that has a non-zero score.
+  while (++handler->curdoc < handler->ndocs &&
+         ft_nlq_get_relevance(handler) == 0.0) {
+  }
+
+  if (handler->curdoc >= handler->ndocs) {
     return HA_ERR_END_OF_FILE;
   }
 
@@ -323,8 +327,8 @@
 }
 
 float ft_nlq_find_relevance(FT_INFO *handler_base,
-                            uchar *record MY_ATTRIBUTE((unused)),
-                            uint length MY_ATTRIBUTE((unused))) {
+                            uchar *record [[maybe_unused]],
+                            uint length [[maybe_unused]]) {
   st_ft_info_nlq *handler = (st_ft_info_nlq *)handler_base;
   int a, b, c;
   FT_DOC *docs = handler->doc;
diff -Nru mysql-8.0-8.0.26/storage/myisam/ft_parser.cc mysql-8.0-8.0.27/storage/myisam/ft_parser.cc
--- mysql-8.0-8.0.26/storage/myisam/ft_parser.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/myisam/ft_parser.cc	2021-09-28 11:46:34.000000000 +0000
@@ -257,7 +257,7 @@
 
 static int ft_add_word(MYSQL_FTPARSER_PARAM *param, char *word, int word_len,
                        MYSQL_FTPARSER_BOOLEAN_INFO *boolean_info
-                           MY_ATTRIBUTE((unused))) {
+                       [[maybe_unused]]) {
   TREE *wtree;
   FT_WORD w;
   MY_FT_PARSER_PARAM *ft_param = (MY_FT_PARSER_PARAM *)param->mysql_ftparam;
@@ -333,8 +333,8 @@
         mi_key_memory_FTPARSER_PARAM,
         MAX_PARAM_NR * sizeof(MYSQL_FTPARSER_PARAM) * info->s->ftkeys,
         MYF(MY_WME | MY_ZEROFILL));
-    init_alloc_root(mi_key_memory_ft_memroot, &info->ft_memroot,
-                    FTPARSER_MEMROOT_ALLOC_SIZE, 0);
+    ::new ((void *)&info->ft_memroot)
+        MEM_ROOT(mi_key_memory_ft_memroot, FTPARSER_MEMROOT_ALLOC_SIZE);
   }
   return info->ftparser_param;
 }
@@ -370,7 +370,7 @@
 
 void ftparser_call_deinitializer(MI_INFO *info) {
   uint i, j, keys = info->s->state.header.keys;
-  free_root(&info->ft_memroot, MYF(0));
+  info->ft_memroot.Clear();
   if (!info->ftparser_param) return;
   for (i = 0; i < keys; i++) {
     MI_KEYDEF *keyinfo = &info->s->keyinfo[i];
diff -Nru mysql-8.0-8.0.26/storage/myisam/ft_update.cc mysql-8.0-8.0.27/storage/myisam/ft_update.cc
--- mysql-8.0-8.0.26/storage/myisam/ft_update.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/myisam/ft_update.cc	2021-09-28 11:46:34.000000000 +0000
@@ -223,7 +223,7 @@
     error = _mi_ft_store(info, keynr, keybuf, new_word, pos);
 
 err:
-  free_root(&info->ft_memroot, MYF(MY_MARK_BLOCKS_FREE));
+  info->ft_memroot.ClearForReuse();
   return error;
 }
 
@@ -239,7 +239,7 @@
   if ((wlist = _mi_ft_parserecord(info, keynr, record, &info->ft_memroot)))
     error = _mi_ft_store(info, keynr, keybuf, wlist, pos);
 
-  free_root(&info->ft_memroot, MYF(MY_MARK_BLOCKS_FREE));
+  info->ft_memroot.ClearForReuse();
   DBUG_PRINT("exit", ("Return: %d", error));
   return error;
 }
@@ -256,7 +256,7 @@
   if ((wlist = _mi_ft_parserecord(info, keynr, record, &info->ft_memroot)))
     error = _mi_ft_erase(info, keynr, keybuf, wlist, pos);
 
-  free_root(&info->ft_memroot, MYF(MY_MARK_BLOCKS_FREE));
+  info->ft_memroot.ClearForReuse();
   DBUG_PRINT("exit", ("Return: %d", error));
   return error;
 }
diff -Nru mysql-8.0-8.0.26/storage/myisam/ha_myisam.cc mysql-8.0-8.0.27/storage/myisam/ha_myisam.cc
--- mysql-8.0-8.0.26/storage/myisam/ha_myisam.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/myisam/ha_myisam.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1600,9 +1600,8 @@
   return error;
 }
 
-int ha_myisam::index_next_same(uchar *buf,
-                               const uchar *key MY_ATTRIBUTE((unused)),
-                               uint length MY_ATTRIBUTE((unused))) {
+int ha_myisam::index_next_same(uchar *buf, const uchar *key [[maybe_unused]],
+                               uint length [[maybe_unused]]) {
   int error;
   assert(inited == INDEX);
   ha_statistic_increment(&System_status_var::ha_read_next_count);
diff -Nru mysql-8.0-8.0.26/storage/myisam/ha_myisam.h mysql-8.0-8.0.27/storage/myisam/ha_myisam.h
--- mysql-8.0-8.0.26/storage/myisam/ha_myisam.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/myisam/ha_myisam.h	2021-09-28 11:46:34.000000000 +0000
@@ -105,8 +105,8 @@
   }
   uint max_supported_keys() const override { return MI_MAX_KEY; }
   uint max_supported_key_length() const override { return MI_MAX_KEY_LENGTH; }
-  uint max_supported_key_part_length(
-      HA_CREATE_INFO *create_info MY_ATTRIBUTE((unused))) const override {
+  uint max_supported_key_part_length(HA_CREATE_INFO *create_info
+                                     [[maybe_unused]]) const override {
     return MI_MAX_KEY_LENGTH;
   }
   uint checksum() const override;
diff -Nru mysql-8.0-8.0.26/storage/myisam/mi_check.cc mysql-8.0-8.0.27/storage/myisam/mi_check.cc
--- mysql-8.0-8.0.26/storage/myisam/mi_check.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/myisam/mi_check.cc	2021-09-28 11:46:34.000000000 +0000
@@ -816,7 +816,6 @@
         (*keys) += tmp_keys - 1;
         continue;
       }
-      /* fall through */
     }
     if (record >= info->state->data_file_length) {
 #ifndef NDEBUG
@@ -2110,8 +2109,8 @@
       mysql_file_seek(param->read_cache.file, 0L, MY_SEEK_END, MYF(0));
 
   sort_param.wordlist = nullptr;
-  init_alloc_root(mi_key_memory_MI_SORT_PARAM_wordroot, &sort_param.wordroot,
-                  FTPARSER_MEMROOT_ALLOC_SIZE, 0);
+  ::new ((void *)&sort_param.wordroot) MEM_ROOT(
+      mi_key_memory_MI_SORT_PARAM_wordroot, FTPARSER_MEMROOT_ALLOC_SIZE);
 
   if (share->data_file_type == DYNAMIC_RECORD)
     length =
@@ -2213,7 +2212,7 @@
     }
     /* No need to calculate checksum again. */
     sort_param.calc_checksum = false;
-    free_root(&sort_param.wordroot, MYF(0));
+    sort_param.wordroot.Clear();
 
     /* Set for next loop */
     sort_info.max_records = (ha_rows)info->state->records;
@@ -2629,8 +2628,8 @@
           FT_MAX_WORD_LEN_FOR_SORT *
           sort_param[i].keyinfo->seg->charset->mbmaxlen;
       sort_param[i].key_length += ft_max_word_len_for_sort - HA_FT_MAXBYTELEN;
-      init_alloc_root(mi_key_memory_MI_SORT_PARAM_wordroot,
-                      &sort_param[i].wordroot, FTPARSER_MEMROOT_ALLOC_SIZE, 0);
+      ::new ((void *)&sort_param[i].wordroot) MEM_ROOT(
+          mi_key_memory_MI_SORT_PARAM_wordroot, FTPARSER_MEMROOT_ALLOC_SIZE);
     }
   }
   sort_info.total_keys = i;
@@ -2865,7 +2864,7 @@
 
   if (!sort_param->wordlist) {
     for (;;) {
-      free_root(&sort_param->wordroot, MYF(MY_MARK_BLOCKS_FREE));
+      sort_param->wordroot.ClearForReuse();
       if ((error = sort_get_next_record(sort_param))) return error;
       if (!(wptr = _mi_ft_parserecord(info, sort_param->key, sort_param->record,
                                       &sort_param->wordroot)))
@@ -2884,7 +2883,7 @@
                                              (uchar *)key, wptr++,
                                              sort_param->filepos));
   if (!wptr->pos) {
-    free_root(&sort_param->wordroot, MYF(MY_MARK_BLOCKS_FREE));
+    sort_param->wordroot.ClearForReuse();
     sort_param->wordlist = nullptr;
     error = sort_write_record(sort_param);
   } else
diff -Nru mysql-8.0-8.0.26/storage/myisam/mi_create.cc mysql-8.0-8.0.27/storage/myisam/mi_create.cc
--- mysql-8.0-8.0.26/storage/myisam/mi_create.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/myisam/mi_create.cc	2021-09-28 11:46:34.000000000 +0000
@@ -750,7 +750,7 @@
   switch (errpos) {
     case 3:
       (void)mysql_file_close(dfile, MYF(0));
-      /* fall through */
+      [[fallthrough]];
     case 2:
       if (!(flags & HA_DONT_TOUCH_DATA))
         mysql_file_delete_with_symlink(
@@ -758,7 +758,7 @@
             fn_format(filename, name, "", MI_NAME_DEXT,
                       MY_UNPACK_FILENAME | MY_APPEND_EXT),
             MYF(0));
-      /* fall through */
+      [[fallthrough]];
     case 1:
       (void)mysql_file_close(file, MYF(0));
       if (!(flags & HA_DONT_TOUCH_DATA))
diff -Nru mysql-8.0-8.0.26/storage/myisam/mi_dbug.cc mysql-8.0-8.0.27/storage/myisam/mi_dbug.cc
--- mysql-8.0-8.0.26/storage/myisam/mi_dbug.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/myisam/mi_dbug.cc	2021-09-28 11:46:34.000000000 +0000
@@ -60,7 +60,7 @@
           (void)fprintf(stream, "%d", (uint)*key++);
           break;
         }
-        /* fall through */
+        [[fallthrough]];
       case HA_KEYTYPE_TEXT:
       case HA_KEYTYPE_NUM:
         if (keyseg->flag & HA_SPACE_PACK) {
diff -Nru mysql-8.0-8.0.26/storage/myisam/mi_extra.cc mysql-8.0-8.0.27/storage/myisam/mi_extra.cc
--- mysql-8.0-8.0.26/storage/myisam/mi_extra.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/myisam/mi_extra.cc	2021-09-28 11:46:34.000000000 +0000
@@ -73,7 +73,7 @@
     case HA_EXTRA_PREPARE_FOR_UPDATE:
       if (info->s->data_file_type != DYNAMIC_RECORD) break;
       /* Remove read/write cache if dynamic rows */
-      // Fall through.
+      [[fallthrough]];
     case HA_EXTRA_NO_READCHECK:
       info->opt_flag &= ~READ_CHECK_USED; /* No readcheck */
       break;
@@ -90,7 +90,7 @@
       info->save_lastpos = info->lastpos;
       info->save_lastkey_length = info->lastkey_length;
       if (function == HA_EXTRA_REMEMBER_POS) break;
-      /* fall through */
+      [[fallthrough]];
     case HA_EXTRA_KEYREAD_CHANGE_POS:
       info->opt_flag |= KEY_READ_USED;
       info->read_record = _mi_read_key_record;
diff -Nru mysql-8.0-8.0.26/storage/myisam/mi_extrafunc.h mysql-8.0-8.0.27/storage/myisam/mi_extrafunc.h
--- mysql-8.0-8.0.26/storage/myisam/mi_extrafunc.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/myisam/mi_extrafunc.h	2021-09-28 11:46:34.000000000 +0000
@@ -24,7 +24,7 @@
   @file storage/myisam/mi_extrafunc.h
 */
 
-void _mi_report_crashed(MI_INFO *file MY_ATTRIBUTE((unused)),
-                        const char *message MY_ATTRIBUTE((unused)),
-                        const char *sfile MY_ATTRIBUTE((unused)),
-                        uint sline MY_ATTRIBUTE((unused))) {}
+void _mi_report_crashed(MI_INFO *file [[maybe_unused]],
+                        const char *message [[maybe_unused]],
+                        const char *sfile [[maybe_unused]],
+                        uint sline [[maybe_unused]]) {}
diff -Nru mysql-8.0-8.0.26/storage/myisam/mi_keycache.cc mysql-8.0-8.0.27/storage/myisam/mi_keycache.cc
--- mysql-8.0-8.0.26/storage/myisam/mi_keycache.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/myisam/mi_keycache.cc	2021-09-28 11:46:34.000000000 +0000
@@ -56,8 +56,7 @@
     #  Error code
 */
 
-int mi_assign_to_key_cache(MI_INFO *info,
-                           ulonglong key_map MY_ATTRIBUTE((unused)),
+int mi_assign_to_key_cache(MI_INFO *info, ulonglong key_map [[maybe_unused]],
                            KEY_CACHE *key_cache) {
   int error = 0;
   MYISAM_SHARE *share = info->s;
diff -Nru mysql-8.0-8.0.26/storage/myisam/mi_open.cc mysql-8.0-8.0.27/storage/myisam/mi_open.cc
--- mysql-8.0-8.0.26/storage/myisam/mi_open.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/myisam/mi_open.cc	2021-09-28 11:46:34.000000000 +0000
@@ -629,23 +629,23 @@
   switch (errpos) {
     case 6:
       my_free(m_info);
-      /* fall through */
+      [[fallthrough]];
     case 5:
       (void)mysql_file_close(info.dfile, MYF(0));
       if (old_share) break; /* Don't remove open table */
 
-      /* fall through */
+      [[fallthrough]];
     case 4:
       my_free(share);
-      /* fall through */
+      [[fallthrough]];
     case 3:
       if (!lock_error) (void)my_lock(kfile, F_UNLCK, MYF(MY_SEEK_NOT_DONE));
-      /* fall through */
+      [[fallthrough]];
     case 2:
-      /* fall through */
+      [[fallthrough]];
     case 1:
       (void)mysql_file_close(kfile, MYF(0));
-      /* fall through */
+      [[fallthrough]];
     case 0:
     default:
       break;
@@ -1227,7 +1227,7 @@
 *************************************************************************/
 
 int mi_open_datafile(MI_INFO *info, MYISAM_SHARE *share, const char *org_name,
-                     File file_to_dup MY_ATTRIBUTE((unused))) {
+                     File file_to_dup [[maybe_unused]]) {
   char *data_name = share->data_file_name;
   char real_data_name[FN_REFLEN];
   ST_FILE_ID file_id = {0, 0};
diff -Nru mysql-8.0-8.0.26/storage/myisam/mi_packrec.cc mysql-8.0-8.0.27/storage/myisam/mi_packrec.cc
--- mysql-8.0-8.0.26/storage/myisam/mi_packrec.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/myisam/mi_packrec.cc	2021-09-28 11:46:34.000000000 +0000
@@ -918,7 +918,7 @@
 }
 
 static void uf_constant(MI_COLUMNDEF *rec,
-                        MI_BIT_BUFF *bit_buff MY_ATTRIBUTE((unused)), uchar *to,
+                        MI_BIT_BUFF *bit_buff [[maybe_unused]], uchar *to,
                         uchar *end) {
   memcpy(to, rec->huff_tree->intervalls, (size_t)(end - to));
 }
@@ -933,8 +933,8 @@
 }
 
 /*ARGSUSED*/
-static void uf_zero(MI_COLUMNDEF *rec MY_ATTRIBUTE((unused)),
-                    MI_BIT_BUFF *bit_buff MY_ATTRIBUTE((unused)), uchar *to,
+static void uf_zero(MI_COLUMNDEF *rec [[maybe_unused]],
+                    MI_BIT_BUFF *bit_buff [[maybe_unused]], uchar *to,
                     uchar *end) {
   memset(to, 0, (end - to));
 }
@@ -960,7 +960,7 @@
 }
 
 static void uf_varchar1(MI_COLUMNDEF *rec, MI_BIT_BUFF *bit_buff, uchar *to,
-                        uchar *end MY_ATTRIBUTE((unused))) {
+                        uchar *end [[maybe_unused]]) {
   if (get_bit(bit_buff))
     to[0] = 0; /* Zero lengths */
   else {
@@ -971,7 +971,7 @@
 }
 
 static void uf_varchar2(MI_COLUMNDEF *rec, MI_BIT_BUFF *bit_buff, uchar *to,
-                        uchar *end MY_ATTRIBUTE((unused))) {
+                        uchar *end [[maybe_unused]]) {
   if (get_bit(bit_buff))
     to[0] = to[1] = 0; /* Zero lengths */
   else {
@@ -1430,9 +1430,10 @@
 }
 
 /*ARGSUSED*/
-static int _mi_read_rnd_mempack_record(
-    MI_INFO *info, uchar *buf, my_off_t filepos,
-    bool skip_deleted_blocks MY_ATTRIBUTE((unused))) {
+static int _mi_read_rnd_mempack_record(MI_INFO *info, uchar *buf,
+                                       my_off_t filepos,
+                                       bool skip_deleted_blocks
+                                       [[maybe_unused]]) {
   MI_BLOCK_INFO block_info;
   MYISAM_SHARE *share = info->s;
   uchar *pos, *start;
diff -Nru mysql-8.0-8.0.26/storage/myisam/mi_search.cc mysql-8.0-8.0.27/storage/myisam/mi_search.cc
--- mysql-8.0-8.0.26/storage/myisam/mi_search.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/myisam/mi_search.cc	2021-09-28 11:46:34.000000000 +0000
@@ -179,7 +179,7 @@
 
 int _mi_bin_search(MI_INFO *info, MI_KEYDEF *keyinfo, uchar *page, uchar *key,
                    uint key_len, uint comp_flag, uchar **ret_pos,
-                   uchar *buff MY_ATTRIBUTE((unused)), bool *last_key) {
+                   uchar *buff [[maybe_unused]], bool *last_key) {
   int start, mid, end, save_end;
   int flag = 0;
   uint totlength, nod_flag, not_used[2];
@@ -1262,9 +1262,9 @@
 /* Static length key */
 
 int _mi_calc_static_key_length(MI_KEYDEF *keyinfo, uint nod_flag,
-                               const uchar *next_pos MY_ATTRIBUTE((unused)),
-                               uchar *org_key MY_ATTRIBUTE((unused)),
-                               uchar *prev_key MY_ATTRIBUTE((unused)),
+                               const uchar *next_pos [[maybe_unused]],
+                               uchar *org_key [[maybe_unused]],
+                               uchar *prev_key [[maybe_unused]],
                                const uchar *key, MI_KEY_PARAM *s_temp) {
   s_temp->key = key;
   return (int)(s_temp->totlength = keyinfo->keylength + nod_flag);
@@ -1273,10 +1273,10 @@
 /* Variable length key */
 
 int _mi_calc_var_key_length(MI_KEYDEF *keyinfo, uint nod_flag,
-                            const uchar *next_pos MY_ATTRIBUTE((unused)),
-                            uchar *org_key MY_ATTRIBUTE((unused)),
-                            uchar *prev_key MY_ATTRIBUTE((unused)),
-                            const uchar *key, MI_KEY_PARAM *s_temp) {
+                            const uchar *next_pos [[maybe_unused]],
+                            uchar *org_key [[maybe_unused]],
+                            uchar *prev_key [[maybe_unused]], const uchar *key,
+                            MI_KEY_PARAM *s_temp) {
   s_temp->key = key;
   return (int)(s_temp->totlength = _mi_keylength(keyinfo, key) + nod_flag);
 }
@@ -1622,8 +1622,8 @@
 
 /* store key without compression */
 
-void _mi_store_static_key(MI_KEYDEF *keyinfo MY_ATTRIBUTE((unused)),
-                          uchar *key_pos, MI_KEY_PARAM *s_temp) {
+void _mi_store_static_key(MI_KEYDEF *keyinfo [[maybe_unused]], uchar *key_pos,
+                          MI_KEY_PARAM *s_temp) {
   memcpy(key_pos, s_temp->key, (size_t)s_temp->totlength);
 }
 
@@ -1639,8 +1639,8 @@
     }                                        \
   }
 
-void _mi_store_var_pack_key(MI_KEYDEF *keyinfo MY_ATTRIBUTE((unused)),
-                            uchar *key_pos, MI_KEY_PARAM *s_temp) {
+void _mi_store_var_pack_key(MI_KEYDEF *keyinfo [[maybe_unused]], uchar *key_pos,
+                            MI_KEY_PARAM *s_temp) {
   uint length;
   uchar *start;
 
@@ -1687,8 +1687,8 @@
 
 /* variable length key with prefix compression */
 
-void _mi_store_bin_pack_key(MI_KEYDEF *keyinfo MY_ATTRIBUTE((unused)),
-                            uchar *key_pos, MI_KEY_PARAM *s_temp) {
+void _mi_store_bin_pack_key(MI_KEYDEF *keyinfo [[maybe_unused]], uchar *key_pos,
+                            MI_KEY_PARAM *s_temp) {
   store_key_length_inc(key_pos, s_temp->ref_length);
   memcpy((char *)key_pos,
          pointer_cast<const char *>(s_temp->key) + s_temp->ref_length,
diff -Nru mysql-8.0-8.0.26/storage/myisam/mi_static.cc mysql-8.0-8.0.27/storage/myisam/mi_static.cc
--- mysql-8.0-8.0.26/storage/myisam/mi_static.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/myisam/mi_static.cc	2021-09-28 11:46:34.000000000 +0000
@@ -66,9 +66,7 @@
 /* Used by myisamchk */
 thread_local st_keycache_thread_var *keycache_tls = nullptr;
 
-static int always_valid(const char *filename MY_ATTRIBUTE((unused))) {
-  return 0;
-}
+static int always_valid(const char *filename [[maybe_unused]]) { return 0; }
 
 int (*myisam_test_invalid_symlink)(const char *filename) = always_valid;
 
@@ -167,8 +165,9 @@
 PSI_thread_key mi_key_thread_find_all_keys;
 
 #ifdef HAVE_PSI_THREAD_INTERFACE
-static PSI_thread_info all_myisam_threads[] = {
-    {&mi_key_thread_find_all_keys, "find_all_keys", 0, 0, PSI_DOCUMENT_ME}};
+static PSI_thread_info all_myisam_threads[] = {{&mi_key_thread_find_all_keys,
+                                                "find_all_keys", "mi_all_keys",
+                                                0, 0, PSI_DOCUMENT_ME}};
 #endif /* HAVE_PSI_THREAD_INTERFACE */
 
 #ifdef HAVE_PSI_MEMORY_INTERFACE
@@ -208,8 +207,8 @@
 
 #ifdef HAVE_PSI_INTERFACE
 void init_myisam_psi_keys() {
-  const char *category MY_ATTRIBUTE((unused)) = "myisam";
-  int count MY_ATTRIBUTE((unused));
+  const char *category [[maybe_unused]] = "myisam";
+  int count [[maybe_unused]];
 
 #ifdef HAVE_PSI_MUTEX_INTERFACE
   count = array_elements(all_myisam_mutexes);
diff -Nru mysql-8.0-8.0.26/storage/myisam/mi_test1.cc mysql-8.0-8.0.27/storage/myisam/mi_test1.cc
--- mysql-8.0-8.0.26/storage/myisam/mi_test1.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/myisam/mi_test1.cc	2021-09-28 11:46:34.000000000 +0000
@@ -528,8 +528,8 @@
     {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}};
 
 static bool get_one_option(int optid,
-                           const struct my_option *opt MY_ATTRIBUTE((unused)),
-                           char *argument MY_ATTRIBUTE((unused))) {
+                           const struct my_option *opt [[maybe_unused]],
+                           char *argument [[maybe_unused]]) {
   switch (optid) {
     case 'a':
       key_type = HA_KEYTYPE_TEXT;
diff -Nru mysql-8.0-8.0.26/storage/myisam/myisamchk.cc mysql-8.0-8.0.27/storage/myisam/myisamchk.cc
--- mysql-8.0-8.0.26/storage/myisam/myisamchk.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/myisam/myisamchk.cc	2021-09-28 11:46:34.000000000 +0000
@@ -525,7 +525,7 @@
 /* Read options */
 
 static bool get_one_option(int optid,
-                           const struct my_option *opt MY_ATTRIBUTE((unused)),
+                           const struct my_option *opt [[maybe_unused]],
                            char *argument) {
   switch (optid) {
     case 'a':
@@ -1628,15 +1628,15 @@
 
 static int not_killed = 0;
 
-volatile int *killed_ptr(MI_CHECK *param MY_ATTRIBUTE((unused))) {
+volatile int *killed_ptr(MI_CHECK *param [[maybe_unused]]) {
   return &not_killed; /* always NULL */
 }
 
 /* print warnings and errors */
 /* VARARGS */
 
-void mi_check_print_info(MI_CHECK *param MY_ATTRIBUTE((unused)),
-                         const char *fmt, ...) {
+void mi_check_print_info(MI_CHECK *param [[maybe_unused]], const char *fmt,
+                         ...) {
   va_list args;
 
   va_start(args, fmt);
diff -Nru mysql-8.0-8.0.26/storage/myisam/myisam_ftdump.cc mysql-8.0-8.0.27/storage/myisam/myisam_ftdump.cc
--- mysql-8.0-8.0.26/storage/myisam/myisam_ftdump.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/myisam/myisam_ftdump.cc	2021-09-28 11:46:34.000000000 +0000
@@ -219,8 +219,8 @@
 }
 
 static bool get_one_option(int optid,
-                           const struct my_option *opt MY_ATTRIBUTE((unused)),
-                           char *argument MY_ATTRIBUTE((unused))) {
+                           const struct my_option *opt [[maybe_unused]],
+                           char *argument [[maybe_unused]]) {
   switch (optid) {
     case 'd':
       dump = 1;
diff -Nru mysql-8.0-8.0.26/storage/myisam/myisamlog.cc mysql-8.0-8.0.27/storage/myisam/myisamlog.cc
--- mysql-8.0-8.0.26/storage/myisam/myisamlog.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/myisam/myisamlog.cc	2021-09-28 11:46:34.000000000 +0000
@@ -254,7 +254,7 @@
           break;
         case 'V':
           version = 1;
-          /* Fall through */
+          [[fallthrough]];
         case 'I':
         case '?':
           print_version();
diff -Nru mysql-8.0-8.0.26/storage/myisam/myisampack.cc mysql-8.0-8.0.27/storage/myisam/myisampack.cc
--- mysql-8.0-8.0.26/storage/myisam/myisampack.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/myisam/myisampack.cc	2021-09-28 11:46:34.000000000 +0000
@@ -144,8 +144,8 @@
 static void free_counts_and_tree_and_queue(HUFF_TREE *huff_trees, uint trees,
                                            HUFF_COUNTS *huff_counts,
                                            uint fields);
-static int compare_tree(const void *cmp_arg MY_ATTRIBUTE((unused)),
-                        const void *a, const void *b);
+static int compare_tree(const void *cmp_arg [[maybe_unused]], const void *a,
+                        const void *b);
 static int get_statistic(PACK_MRG_INFO *mrg, HUFF_COUNTS *huff_counts);
 static void check_counts(HUFF_COUNTS *huff_counts, uint trees,
                          my_off_t records);
@@ -322,7 +322,7 @@
 }
 
 static bool get_one_option(int optid,
-                           const struct my_option *opt MY_ATTRIBUTE((unused)),
+                           const struct my_option *opt [[maybe_unused]],
                            char *argument) {
   uint length;
 
@@ -1068,8 +1068,8 @@
   return error != HA_ERR_END_OF_FILE;
 }
 
-static int compare_huff_elements(void *not_used MY_ATTRIBUTE((unused)),
-                                 uchar *a, uchar *b) {
+static int compare_huff_elements(void *not_used [[maybe_unused]], uchar *a,
+                                 uchar *b) {
   return *((my_off_t *)a) < *((my_off_t *)b)
              ? -1
              : (*((my_off_t *)a) == *((my_off_t *)b) ? 0 : 1);
@@ -1529,8 +1529,8 @@
   return 0;
 }
 
-static int compare_tree(const void *cmp_arg MY_ATTRIBUTE((unused)),
-                        const void *a, const void *b) {
+static int compare_tree(const void *cmp_arg [[maybe_unused]], const void *a,
+                        const void *b) {
   uint length;
   const uchar *s = (const uchar *)a;
   const uchar *t = (const uchar *)b;
@@ -2313,7 +2313,7 @@
             }
             DBUG_PRINT("fields", ("FIELD_SKIP_ZERO not only zeroes, bits:  1"));
             write_bits(0, 1);
-            /* Fall through */
+            [[fallthrough]];
           case FIELD_NORMAL:
             DBUG_PRINT("fields", ("FIELD_NORMAL %lu bytes",
                                   (ulong)(end_pos - start_pos)));
diff -Nru mysql-8.0-8.0.26/storage/myisam/my_lock.cc mysql-8.0-8.0.27/storage/myisam/my_lock.cc
--- mysql-8.0-8.0.26/storage/myisam/my_lock.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/myisam/my_lock.cc	2021-09-28 11:46:34.000000000 +0000
@@ -48,7 +48,7 @@
 static int volatile my_have_got_alarm = 0;
 static uint my_time_to_wait_for_lock = 2; /* In seconds */
 
-static void my_set_alarm_variable(int signo MY_ATTRIBUTE((unused))) {
+static void my_set_alarm_variable(int signo [[maybe_unused]]) {
   my_have_got_alarm = 1; /* Tell program that time expired */
 }
 }  // extern C
diff -Nru mysql-8.0-8.0.26/storage/myisam/rt_test.cc mysql-8.0-8.0.27/storage/myisam/rt_test.cc
--- mysql-8.0-8.0.26/storage/myisam/rt_test.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/myisam/rt_test.cc	2021-09-28 11:46:34.000000000 +0000
@@ -79,7 +79,7 @@
     /*19*/ 110, 120, 10, 20,
     /*20*/ 100, 110, 0,  10, -1};
 
-int main(int argc MY_ATTRIBUTE((unused)), char *argv[] MY_ATTRIBUTE((unused))) {
+int main(int argc [[maybe_unused]], char *argv[] [[maybe_unused]]) {
   MY_INIT(argv[0]);
   exit(run_test("rt_test"));
 }
@@ -319,7 +319,7 @@
   return 0;
 }
 
-static void print_record(uchar *record, my_off_t offs MY_ATTRIBUTE((unused)),
+static void print_record(uchar *record, my_off_t offs [[maybe_unused]],
                          const char *tail) {
   int i;
   uchar *pos;
diff -Nru mysql-8.0-8.0.26/storage/myisam/sort.cc mysql-8.0-8.0.27/storage/myisam/sort.cc
--- mysql-8.0-8.0.26/storage/myisam/sort.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/myisam/sort.cc	2021-09-28 11:46:34.000000000 +0000
@@ -430,7 +430,7 @@
   close_cached_file(&sort_param->tempfile_for_exceptions);
 
 ok:
-  free_root(&sort_param->wordroot, MYF(0));
+  sort_param->wordroot.Clear();
   /*
     Detach from the share if the writer is involved. Avoid others to
     be blocked. This includes a flush of the write buffer. This will
@@ -795,7 +795,7 @@
   return (0);
 }
 
-static int write_merge_key(MI_SORT_PARAM *info MY_ATTRIBUTE((unused)),
+static int write_merge_key(MI_SORT_PARAM *info [[maybe_unused]],
                            IO_CACHE *to_file, uchar *key, uint sort_length,
                            uint count) {
   return my_b_write(to_file, key, (size_t)sort_length * count);
diff -Nru mysql-8.0-8.0.26/storage/myisam/sp_key.cc mysql-8.0-8.0.27/storage/myisam/sp_key.cc
--- mysql-8.0-8.0.26/storage/myisam/sp_key.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/myisam/sp_key.cc	2021-09-28 11:46:34.000000000 +0000
@@ -118,8 +118,7 @@
 */
 
 static int sp_add_point_to_mbr(uchar *(*wkb), uchar *end, uint n_dims,
-                               uchar byte_order MY_ATTRIBUTE((unused)),
-                               double *mbr) {
+                               uchar byte_order [[maybe_unused]], double *mbr) {
   double *mbr_end = mbr + n_dims * 2;
 
   while (mbr < mbr_end) {
diff -Nru mysql-8.0-8.0.26/storage/myisam/sp_test.cc mysql-8.0-8.0.27/storage/myisam/sp_test.cc
--- mysql-8.0-8.0.26/storage/myisam/sp_test.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/myisam/sp_test.cc	2021-09-28 11:46:34.000000000 +0000
@@ -46,7 +46,7 @@
 
 static char blob_key[MAX_REC_LENGTH];
 
-int main(int argc MY_ATTRIBUTE((unused)), char *argv[]) {
+int main(int argc [[maybe_unused]], char *argv[]) {
   MY_INIT(argv[0]);
   exit(run_test("sp_test"));
 }
diff -Nru mysql-8.0-8.0.26/storage/myisammrg/ha_myisammrg.cc mysql-8.0-8.0.27/storage/myisammrg/ha_myisammrg.cc
--- mysql-8.0-8.0.26/storage/myisammrg/ha_myisammrg.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/myisammrg/ha_myisammrg.cc	2021-09-28 11:46:34.000000000 +0000
@@ -138,7 +138,7 @@
   @brief Destructor
 */
 
-ha_myisammrg::~ha_myisammrg(void) { free_root(&children_mem_root, MYF(0)); }
+ha_myisammrg::~ha_myisammrg(void) { children_mem_root.Clear(); }
 
 static const char *ha_myisammrg_exts[] = {".MRG", NullS};
 static void split_file_name(const char *file_name, LEX_CSTRING *db,
@@ -307,9 +307,9 @@
   and adds a child list of TABLE_LIST to the parent handler.
 */
 
-int ha_myisammrg::open(const char *name, int mode MY_ATTRIBUTE((unused)),
+int ha_myisammrg::open(const char *name, int mode [[maybe_unused]],
                        uint test_if_locked_arg,
-                       const dd::Table *table_def MY_ATTRIBUTE((unused))) {
+                       const dd::Table *table_def [[maybe_unused]]) {
   DBUG_TRACE;
   DBUG_PRINT("myrg", ("name: '%s'  table: %p", name, table));
   DBUG_PRINT("myrg", ("test_if_locked_arg: %u", test_if_locked_arg));
@@ -321,7 +321,7 @@
   test_if_locked = test_if_locked_arg;
 
   /* In case this handler was open and closed before, free old data. */
-  free_root(&this->children_mem_root, MYF(MY_MARK_BLOCKS_FREE));
+  this->children_mem_root.ClearForReuse();
 
   /*
     Initialize variables that are used, modified, and/or set by
@@ -1065,9 +1065,8 @@
   return error;
 }
 
-int ha_myisammrg::index_next_same(uchar *buf,
-                                  const uchar *key MY_ATTRIBUTE((unused)),
-                                  uint length MY_ATTRIBUTE((unused))) {
+int ha_myisammrg::index_next_same(uchar *buf, const uchar *key [[maybe_unused]],
+                                  uint length [[maybe_unused]]) {
   int error;
   assert(this->file->children_attached);
   ha_statistic_increment(&System_status_var::ha_read_next_count);
diff -Nru mysql-8.0-8.0.26/storage/myisammrg/ha_myisammrg.h mysql-8.0-8.0.27/storage/myisammrg/ha_myisammrg.h
--- mysql-8.0-8.0.26/storage/myisammrg/ha_myisammrg.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/myisammrg/ha_myisammrg.h	2021-09-28 11:46:34.000000000 +0000
@@ -108,8 +108,8 @@
   }
   uint max_supported_keys() const override { return MI_MAX_KEY; }
   uint max_supported_key_length() const override { return MI_MAX_KEY_LENGTH; }
-  uint max_supported_key_part_length(
-      HA_CREATE_INFO *create_info MY_ATTRIBUTE((unused))) const override {
+  uint max_supported_key_part_length(HA_CREATE_INFO *create_info
+                                     [[maybe_unused]]) const override {
     return MI_MAX_KEY_LENGTH;
   }
   double scan_time() override {
diff -Nru mysql-8.0-8.0.26/storage/myisammrg/myrg_open.cc mysql-8.0-8.0.27/storage/myisammrg/myrg_open.cc
--- mysql-8.0-8.0.26/storage/myisammrg/myrg_open.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/myisammrg/myrg_open.cc	2021-09-28 11:46:34.000000000 +0000
@@ -184,10 +184,10 @@
     case 3:
       while (files) (void)mi_close(m_info->open_tables[--files].table);
       my_free(m_info);
-      /* Fall through */
+      [[fallthrough]];
     case 2:
       end_io_cache(&file);
-      /* Fall through */
+      [[fallthrough]];
     case 1:
       (void)mysql_file_close(fd, MYF(0));
   }
@@ -324,10 +324,10 @@
   switch (errpos) {
     case 3:
       my_free(m_info);
-      /* Fall through */
+      [[fallthrough]];
     case 2:
       end_io_cache(&file_cache);
-      /* Fall through */
+      [[fallthrough]];
     case 1:
       (void)mysql_file_close(fd, MYF(0));
   }
diff -Nru mysql-8.0-8.0.26/storage/perfschema/ha_perfschema.cc mysql-8.0-8.0.27/storage/perfschema/ha_perfschema.cc
--- mysql-8.0-8.0.26/storage/perfschema/ha_perfschema.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/ha_perfschema.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1375,10 +1375,11 @@
   @retval false                   Success - no errors.
 */
 
-static bool pfs_dict_init(
-    dict_init_mode_t dict_init_mode, uint version MY_ATTRIBUTE((unused)),
-    List<const Plugin_table> *tables,
-    List<const Plugin_tablespace> *tablespaces MY_ATTRIBUTE((unused))) {
+static bool pfs_dict_init(dict_init_mode_t dict_init_mode,
+                          uint version [[maybe_unused]],
+                          List<const Plugin_table> *tables,
+                          List<const Plugin_tablespace> *tablespaces
+                          [[maybe_unused]]) {
   if (dict_init_mode != DICT_INIT_CREATE_FILES) {
     return false;
   }
diff -Nru mysql-8.0-8.0.26/storage/perfschema/ha_perfschema.h mysql-8.0-8.0.27/storage/perfschema/ha_perfschema.h
--- mysql-8.0-8.0.26/storage/perfschema/ha_perfschema.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/ha_perfschema.h	2021-09-28 11:46:34.000000000 +0000
@@ -115,8 +115,8 @@
 
   uint max_supported_key_length(void) const override { return MAX_KEY_LENGTH; }
 
-  uint max_supported_key_part_length(
-      HA_CREATE_INFO *create_info MY_ATTRIBUTE((unused))) const override {
+  uint max_supported_key_part_length(HA_CREATE_INFO *create_info
+                                     [[maybe_unused]]) const override {
     return MAX_KEY_LENGTH;
   }
 
diff -Nru mysql-8.0-8.0.26/storage/perfschema/pfs.cc mysql-8.0-8.0.27/storage/perfschema/pfs.cc
--- mysql-8.0-8.0.26/storage/perfschema/pfs.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/pfs.cc	2021-09-28 11:46:34.000000000 +0000
@@ -572,8 +572,8 @@
   @code
 static inline int
 inline_mysql_mutex_lock(mysql_mutex_t *that,
-                        const char *src_file MY_ATTRIBUTE((unused)),
-                        uint src_line MY_ATTRIBUTE((unused))
+                        const char *src_file [[maybe_unused]],
+                        uint src_line [[maybe_unused]]
                         )
 {
   int result;
@@ -2117,7 +2117,28 @@
 
 static inline PFS_thread *my_thread_get_THR_PFS() { return THR_PFS; }
 
-static inline void my_thread_set_THR_PFS(PFS_thread *pfs) { THR_PFS = pfs; }
+static my_thread_t main_thread_id;
+
+void record_main_thread_id() { main_thread_id = my_thread_self(); }
+
+static void pfs_thread_setname(PFS_thread *pfs) {
+  if (pfs != nullptr) {
+    /*
+      The main thread is named "mysqld" by default,
+      derived from the server executable name.
+      Do not change the main thread name,
+      this breaks ps -C mysqld.
+    */
+    if (main_thread_id != my_thread_self()) {
+      my_thread_self_setname(pfs->m_os_name);
+    }
+  }
+}
+
+static inline void my_thread_set_THR_PFS(PFS_thread *pfs) {
+  THR_PFS = pfs;
+  pfs_thread_setname(pfs);
+}
 
 /**
   Conversion map from PSI_mutex_operation to enum_operation_type.
@@ -2388,7 +2409,7 @@
 
 /**
   Implementation of the thread instrumentation interface.
-  @sa PSI_v1::register_thread.
+  @sa PSI_v5::register_thread.
 */
 void pfs_register_thread_vc(const char *category, PSI_thread_info *info,
                             int count) {
@@ -2397,6 +2418,31 @@
 }
 
 /**
+  Implementation of the thread instrumentation interface.
+  @sa PSI_v1::register_thread.
+*/
+void pfs_register_thread_v1(const char *category, PSI_thread_info_v1 *info,
+                            int count) {
+  for (int i = 0; i < count; i++) {
+    PSI_thread_info info_vc;
+    char os_name[PFS_MAX_OS_NAME_LENGTH];
+
+    info_vc.m_key = info->m_key;
+    info_vc.m_name = info->m_name;
+    info_vc.m_flags = info->m_flags;
+    info_vc.m_volatility = info->m_volatility;
+    info_vc.m_documentation = info->m_documentation;
+
+    /* No os name in PSI_thread_info_v1, truncate the thread name. */
+    strncpy(os_name, info->m_name, sizeof(os_name) - 1);
+    os_name[sizeof(os_name) - 1] = '\0';
+    info_vc.m_os_name = os_name;
+
+    pfs_register_thread_vc(category, &info_vc, 1);
+  }
+}
+
+/**
   Implementation of the file instrumentation interface.
   @sa PSI_v1::register_file.
 */
@@ -2847,6 +2893,7 @@
   uint m_hostname_length;
 
   PSI_thread_key m_child_key;
+  PSI_thread_seqnum m_child_seqnum;
   const void *m_child_identity;
   void *(*m_user_start_routine)(void *);
   void *m_user_arg;
@@ -2863,7 +2910,8 @@
   /* First, attach instrumentation to this newly created pthread. */
   PFS_thread_class *klass = find_thread_class(typed_arg->m_child_key);
   if (likely(klass != nullptr)) {
-    pfs = create_thread(klass, typed_arg->m_child_identity, 0);
+    pfs = create_thread(klass, typed_arg->m_child_seqnum,
+                        typed_arg->m_child_identity, 0);
     if (likely(pfs != nullptr)) {
       pfs->m_thread_os_id = my_thread_os_id();
       clear_thread_account(pfs);
@@ -2905,8 +2953,8 @@
   Implementation of the thread instrumentation interface.
   @sa PSI_v2::spawn_thread.
 */
-int pfs_spawn_thread_vc(PSI_thread_key key, my_thread_handle *thread,
-                        const my_thread_attr_t *attr,
+int pfs_spawn_thread_vc(PSI_thread_key key, PSI_thread_seqnum seqnum,
+                        my_thread_handle *thread, const my_thread_attr_t *attr,
                         void *(*start_routine)(void *), void *arg) {
   PFS_spawn_thread_arg *psi_arg;
   PFS_thread *parent;
@@ -2919,6 +2967,7 @@
   }
 
   psi_arg->m_child_key = key;
+  psi_arg->m_child_seqnum = seqnum;
   psi_arg->m_child_identity = (arg ? arg : thread);
   psi_arg->m_user_start_routine = start_routine;
   psi_arg->m_user_arg = arg;
@@ -2952,17 +3001,23 @@
   return result;
 }
 
+int pfs_spawn_thread_v4(PSI_thread_key key, my_thread_handle *thread,
+                        const my_thread_attr_t *attr,
+                        void *(*start_routine)(void *), void *arg) {
+  return pfs_spawn_thread_vc(key, 0, thread, attr, start_routine, arg);
+}
+
 /**
   Implementation of the thread instrumentation interface.
-  @sa PSI_v2::new_thread.
+  @sa PSI_v5::new_thread.
 */
-PSI_thread *pfs_new_thread_vc(PSI_thread_key key, const void *identity,
-                              ulonglong processlist_id) {
+PSI_thread *pfs_new_thread_vc(PSI_thread_key key, PSI_thread_seqnum seqnum,
+                              const void *identity, ulonglong processlist_id) {
   PFS_thread *pfs;
 
   PFS_thread_class *klass = find_thread_class(key);
   if (likely(klass != nullptr)) {
-    pfs = create_thread(klass, identity, processlist_id);
+    pfs = create_thread(klass, seqnum, identity, processlist_id);
   } else {
     pfs = nullptr;
   }
@@ -2974,6 +3029,11 @@
   return reinterpret_cast<PSI_thread *>(pfs);
 }
 
+PSI_thread *pfs_new_thread_v4(PSI_thread_key key, const void *identity,
+                              ulonglong processlist_id) {
+  return pfs_new_thread_vc(key, 0, identity, processlist_id);
+}
+
 /**
   Implementation of the thread instrumentation interface.
   @sa PSI_v2::set_thread_id.
@@ -3441,8 +3501,7 @@
   Implementation of the thread instrumentation interface.
   @sa PSI_v2::notify_session_disconnect.
 */
-void pfs_notify_session_disconnect_vc(
-    PSI_thread *thread MY_ATTRIBUTE((unused))) {
+void pfs_notify_session_disconnect_vc(PSI_thread *thread [[maybe_unused]]) {
   pfs_notify_session_disconnect(thread);
 }
 
@@ -3450,8 +3509,7 @@
   Implementation of the thread instrumentation interface.
   @sa PSI_v2::notify_session_change_user.
 */
-void pfs_notify_session_change_user_vc(
-    PSI_thread *thread MY_ATTRIBUTE((unused))) {
+void pfs_notify_session_change_user_vc(PSI_thread *thread [[maybe_unused]]) {
   pfs_notify_session_change_user(thread);
 }
 
@@ -4601,7 +4659,7 @@
   @sa PSI_v1::unlock_rwlock.
 */
 void pfs_unlock_rwlock_v2(PSI_rwlock *rwlock,
-                          PSI_rwlock_operation op MY_ATTRIBUTE((unused))) {
+                          PSI_rwlock_operation op [[maybe_unused]]) {
   PFS_rwlock *pfs_rwlock = reinterpret_cast<PFS_rwlock *>(rwlock);
   assert(pfs_rwlock != nullptr);
   assert(pfs_rwlock == sanitize_rwlock(pfs_rwlock));
@@ -4680,7 +4738,7 @@
   Implementation of the cond instrumentation interface.
   @sa PSI_v1::signal_cond.
 */
-void pfs_signal_cond_v1(PSI_cond *cond MY_ATTRIBUTE((unused))) {
+void pfs_signal_cond_v1(PSI_cond *cond [[maybe_unused]]) {
 #ifdef PFS_LATER
   PFS_cond *pfs_cond = reinterpret_cast<PFS_cond *>(cond);
 
@@ -4694,7 +4752,7 @@
   Implementation of the cond instrumentation interface.
   @sa PSI_v1::broadcast_cond.
 */
-void pfs_broadcast_cond_v1(PSI_cond *cond MY_ATTRIBUTE((unused))) {
+void pfs_broadcast_cond_v1(PSI_cond *cond [[maybe_unused]]) {
 #ifdef PFS_LATER
   PFS_cond *pfs_cond = reinterpret_cast<PFS_cond *>(cond);
 
@@ -5622,9 +5680,9 @@
   @sa PSI_v1::start_file_rename_wait.
 */
 void pfs_start_file_rename_wait_vc(PSI_file_locker *locker,
-                                   size_t count MY_ATTRIBUTE((unused)),
-                                   const char *old_name MY_ATTRIBUTE((unused)),
-                                   const char *new_name MY_ATTRIBUTE((unused)),
+                                   size_t count [[maybe_unused]],
+                                   const char *old_name [[maybe_unused]],
+                                   const char *new_name [[maybe_unused]],
                                    const char *src_file, uint src_line) {
   PSI_file_locker_state *state =
       reinterpret_cast<PSI_file_locker_state *>(locker);
@@ -5646,8 +5704,8 @@
   @sa PSI_v1::end_file_rename_wait.
 */
 void pfs_end_file_rename_wait_vc(PSI_file_locker *locker,
-                                 const char *old_name MY_ATTRIBUTE((unused)),
-                                 const char *new_name MY_ATTRIBUTE((unused)),
+                                 const char *old_name [[maybe_unused]],
+                                 const char *new_name [[maybe_unused]],
                                  int rc) {
   PSI_file_locker_state *state =
       reinterpret_cast<PSI_file_locker_state *>(locker);
@@ -7757,7 +7815,7 @@
 }
 
 void pfs_memory_free_vc(PSI_memory_key key, size_t size,
-                        PSI_thread *owner MY_ATTRIBUTE((unused))) {
+                        PSI_thread *owner [[maybe_unused]]) {
   PFS_memory_class *klass = find_memory_class(key);
   if (klass == nullptr) {
     return;
@@ -8093,7 +8151,7 @@
   Implementation of the thread instrumentation interface.
   @sa PSI_v1::unload_plugin.
 */
-void pfs_unload_plugin_v1(const char *plugin_name MY_ATTRIBUTE((unused))) {
+void pfs_unload_plugin_v1(const char *plugin_name [[maybe_unused]]) {
   /*
     A plugin or component is being unloaded. Events that originated from the
     plugin contain string pointers set by the __FILE__ macro. These source file
@@ -8131,6 +8189,83 @@
 */
 PSI_thread_service_v4 pfs_thread_service_v4 = {
     /* Old interface, for plugins. */
+    pfs_register_thread_v1,
+    pfs_spawn_thread_v4,
+    pfs_new_thread_v4,
+    pfs_set_thread_id_vc,
+    pfs_get_current_thread_internal_id_vc,
+    pfs_get_thread_internal_id_vc,
+    pfs_get_thread_by_id_vc,
+    pfs_set_thread_THD_vc,
+    pfs_set_thread_os_id_vc,
+    pfs_get_thread_vc,
+    pfs_set_thread_user_vc,
+    pfs_set_thread_account_vc,
+    pfs_set_thread_db_vc,
+    pfs_set_thread_command_vc,
+    pfs_set_connection_type_vc,
+    pfs_set_thread_start_time_vc,
+    pfs_set_thread_info_vc,
+    pfs_set_thread_resource_group_vc,
+    pfs_set_thread_resource_group_by_id_vc,
+    pfs_set_thread_vc,
+    pfs_set_thread_peer_port_vc,
+    pfs_aggregate_thread_status_vc,
+    pfs_delete_current_thread_vc,
+    pfs_delete_thread_vc,
+    pfs_set_thread_connect_attrs_vc,
+    pfs_get_current_thread_event_id_vc,
+    pfs_get_thread_event_id_vc,
+    pfs_get_thread_system_attrs_vc,
+    pfs_get_thread_system_attrs_by_id_vc,
+    pfs_register_notification_vc,
+    pfs_unregister_notification_vc,
+    pfs_notify_session_connect_vc,
+    pfs_notify_session_disconnect_vc,
+    pfs_notify_session_change_user_vc};
+
+SERVICE_TYPE(psi_thread_v4)
+SERVICE_IMPLEMENTATION(performance_schema, psi_thread_v4) = {
+    /* New interface, for components. */
+    pfs_register_thread_v1,
+    pfs_spawn_thread_v4,
+    pfs_new_thread_v4,
+    pfs_set_thread_id_vc,
+    pfs_get_current_thread_internal_id_vc,
+    pfs_get_thread_internal_id_vc,
+    pfs_get_thread_by_id_vc,
+    pfs_set_thread_THD_vc,
+    pfs_set_thread_os_id_vc,
+    pfs_get_thread_vc,
+    pfs_set_thread_user_vc,
+    pfs_set_thread_account_vc,
+    pfs_set_thread_db_vc,
+    pfs_set_thread_command_vc,
+    pfs_set_connection_type_vc,
+    pfs_set_thread_start_time_vc,
+    pfs_set_thread_info_vc,
+    pfs_set_thread_vc,
+    pfs_set_thread_peer_port_vc,
+    pfs_aggregate_thread_status_vc,
+    pfs_delete_current_thread_vc,
+    pfs_delete_thread_vc,
+    pfs_set_thread_connect_attrs_vc,
+    pfs_get_current_thread_event_id_vc,
+    pfs_get_thread_event_id_vc,
+    pfs_get_thread_system_attrs_vc,
+    pfs_get_thread_system_attrs_by_id_vc,
+    pfs_register_notification_vc,
+    pfs_unregister_notification_vc,
+    pfs_notify_session_connect_vc,
+    pfs_notify_session_disconnect_vc,
+    pfs_notify_session_change_user_vc};
+
+/**
+  Implementation of the instrumentation interface.
+  @sa PSI_thread_service_v5
+*/
+PSI_thread_service_v5 pfs_thread_service_v5 = {
+    /* Old interface, for plugins. */
     pfs_register_thread_vc,
     pfs_spawn_thread_vc,
     pfs_new_thread_vc,
@@ -8166,8 +8301,8 @@
     pfs_notify_session_disconnect_vc,
     pfs_notify_session_change_user_vc};
 
-SERVICE_TYPE(psi_thread_v4)
-SERVICE_IMPLEMENTATION(performance_schema, psi_thread_v4) = {
+SERVICE_TYPE(psi_thread_v5)
+SERVICE_IMPLEMENTATION(performance_schema, psi_thread_v5) = {
     /* New interface, for components. */
     pfs_register_thread_vc,
     pfs_spawn_thread_vc,
@@ -8551,6 +8686,8 @@
       return nullptr;
     case PSI_THREAD_VERSION_4:
       return &pfs_thread_service_v4;
+    case PSI_THREAD_VERSION_5:
+      return &pfs_thread_service_v5;
     default:
       return nullptr;
   }
@@ -8797,7 +8934,9 @@
     PROVIDES_SERVICE(performance_schema, psi_table_v1),
     /* Obsolete: PROVIDES_SERVICE(performance_schema, psi_thread_v1), */
     /* Obsolete: PROVIDES_SERVICE(performance_schema, psi_thread_v2), */
+    /* Obsolete: PROVIDES_SERVICE(performance_schema, psi_thread_v3), */
     PROVIDES_SERVICE(performance_schema, psi_thread_v4),
+    PROVIDES_SERVICE(performance_schema, psi_thread_v5),
     PROVIDES_SERVICE(performance_schema, psi_transaction_v1),
     /* Deprecated, use pfs_plugin_table_v1. */
     PROVIDES_SERVICE(performance_schema, pfs_plugin_table),
diff -Nru mysql-8.0-8.0.26/storage/perfschema/pfs_data_lock.cc mysql-8.0-8.0.27/storage/perfschema/pfs_data_lock.cc
--- mysql-8.0-8.0.26/storage/perfschema/pfs_data_lock.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/pfs_data_lock.cc	2021-09-28 11:46:34.000000000 +0000
@@ -259,7 +259,7 @@
 }
 
 void PFS_data_lock_container::add_lock_row(
-    const char *engine, size_t engine_length MY_ATTRIBUTE((unused)),
+    const char *engine, size_t engine_length [[maybe_unused]],
     const char *engine_lock_id, size_t engine_lock_id_length,
     ulonglong transaction_id, ulonglong thread_id, ulonglong event_id,
     const char *table_schema, size_t table_schema_length,
@@ -431,7 +431,7 @@
 }
 
 void PFS_data_lock_wait_container::add_lock_wait_row(
-    const char *engine, size_t engine_length MY_ATTRIBUTE((unused)),
+    const char *engine, size_t engine_length [[maybe_unused]],
     const char *requesting_engine_lock_id,
     size_t requesting_engine_lock_id_length,
     ulonglong requesting_transaction_id, ulonglong requesting_thread_id,
diff -Nru mysql-8.0-8.0.26/storage/perfschema/pfs_data_lock.h mysql-8.0-8.0.27/storage/perfschema/pfs_data_lock.h
--- mysql-8.0-8.0.26/storage/perfschema/pfs_data_lock.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/pfs_data_lock.h	2021-09-28 11:46:34.000000000 +0000
@@ -156,37 +156,34 @@
 
   ~PFS_index_data_locks() override = default;
 
-  virtual bool match_engine(const char *engine MY_ATTRIBUTE((unused)),
-                            size_t engine_length MY_ATTRIBUTE((unused))) {
+  virtual bool match_engine(const char *engine [[maybe_unused]],
+                            size_t engine_length [[maybe_unused]]) {
     return true;
   }
 
-  virtual bool match_lock_id(const char *engine_lock_id MY_ATTRIBUTE((unused)),
-                             size_t engine_lock_id_length
-                                 MY_ATTRIBUTE((unused))) {
+  virtual bool match_lock_id(const char *engine_lock_id [[maybe_unused]],
+                             size_t engine_lock_id_length [[maybe_unused]]) {
     return true;
   }
 
-  virtual bool match_transaction_id(
-      ulonglong engine_transaction_id MY_ATTRIBUTE((unused))) {
+  virtual bool match_transaction_id(ulonglong engine_transaction_id
+                                    [[maybe_unused]]) {
     return true;
   }
 
-  virtual bool match_thread_id_event_id(
-      ulonglong thread_id MY_ATTRIBUTE((unused)),
-      ulonglong event_id MY_ATTRIBUTE((unused))) {
+  virtual bool match_thread_id_event_id(ulonglong thread_id [[maybe_unused]],
+                                        ulonglong event_id [[maybe_unused]]) {
     return true;
   }
 
-  virtual bool match_object(
-      const char *table_schema MY_ATTRIBUTE((unused)),
-      size_t table_schema_length MY_ATTRIBUTE((unused)),
-      const char *table_name MY_ATTRIBUTE((unused)),
-      size_t table_name_length MY_ATTRIBUTE((unused)),
-      const char *partition_name MY_ATTRIBUTE((unused)),
-      size_t partition_name_length MY_ATTRIBUTE((unused)),
-      const char *sub_partition_name MY_ATTRIBUTE((unused)),
-      size_t sub_partition_name_length MY_ATTRIBUTE((unused))) {
+  virtual bool match_object(const char *table_schema [[maybe_unused]],
+                            size_t table_schema_length [[maybe_unused]],
+                            const char *table_name [[maybe_unused]],
+                            size_t table_name_length [[maybe_unused]],
+                            const char *partition_name [[maybe_unused]],
+                            size_t partition_name_length [[maybe_unused]],
+                            const char *sub_partition_name [[maybe_unused]],
+                            size_t sub_partition_name_length [[maybe_unused]]) {
     return true;
   }
 };
@@ -348,42 +345,46 @@
 
   ~PFS_index_data_lock_waits() override = default;
 
-  virtual bool match_engine(const char *engine MY_ATTRIBUTE((unused)),
-                            size_t engine_length MY_ATTRIBUTE((unused))) {
+  virtual bool match_engine(const char *engine [[maybe_unused]],
+                            size_t engine_length [[maybe_unused]]) {
     return true;
   }
 
-  virtual bool match_requesting_lock_id(
-      const char *engine_lock_id MY_ATTRIBUTE((unused)),
-      size_t engine_lock_id_length MY_ATTRIBUTE((unused))) {
+  virtual bool match_requesting_lock_id(const char *engine_lock_id
+                                        [[maybe_unused]],
+                                        size_t engine_lock_id_length
+                                        [[maybe_unused]]) {
     return true;
   }
 
-  virtual bool match_blocking_lock_id(
-      const char *engine_lock_id MY_ATTRIBUTE((unused)),
-      size_t engine_lock_id_length MY_ATTRIBUTE((unused))) {
+  virtual bool match_blocking_lock_id(const char *engine_lock_id
+                                      [[maybe_unused]],
+                                      size_t engine_lock_id_length
+                                      [[maybe_unused]]) {
     return true;
   }
 
-  virtual bool match_requesting_transaction_id(
-      ulonglong engine_transaction_id MY_ATTRIBUTE((unused))) {
+  virtual bool match_requesting_transaction_id(ulonglong engine_transaction_id
+                                               [[maybe_unused]]) {
     return true;
   }
 
-  virtual bool match_blocking_transaction_id(
-      ulonglong engine_transaction_id MY_ATTRIBUTE((unused))) {
+  virtual bool match_blocking_transaction_id(ulonglong engine_transaction_id
+                                             [[maybe_unused]]) {
     return true;
   }
 
-  virtual bool match_requesting_thread_id_event_id(
-      ulonglong thread_id MY_ATTRIBUTE((unused)),
-      ulonglong event_id MY_ATTRIBUTE((unused))) {
+  virtual bool match_requesting_thread_id_event_id(ulonglong thread_id
+                                                   [[maybe_unused]],
+                                                   ulonglong event_id
+                                                   [[maybe_unused]]) {
     return true;
   }
 
-  virtual bool match_blocking_thread_id_event_id(
-      ulonglong thread_id MY_ATTRIBUTE((unused)),
-      ulonglong event_id MY_ATTRIBUTE((unused))) {
+  virtual bool match_blocking_thread_id_event_id(ulonglong thread_id
+                                                 [[maybe_unused]],
+                                                 ulonglong event_id
+                                                 [[maybe_unused]]) {
     return true;
   }
 };
diff -Nru mysql-8.0-8.0.26/storage/perfschema/pfs_dd_version.h mysql-8.0-8.0.27/storage/perfschema/pfs_dd_version.h
--- mysql-8.0-8.0.26/storage/perfschema/pfs_dd_version.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/pfs_dd_version.h	2021-09-28 11:46:34.000000000 +0000
@@ -173,8 +173,20 @@
   80024:
   performance_schema tables changed in MySQL 8.0.24
   - WL#13446 added performance_schema.keyring_component_status
+
+  80027:
+  performance_schema tables changed in MySQL 8.0.27
+  - WL#9852 added replication_group_members column
+    MEMBER_COMMUNICATION_PROTOCOL_STACK
+  - Bug#32701593:'SELECT FROM
+    PS.REPLICATION_ASYNCHRONOUS_CONNECTION_FAILOVER' DIDN'T RETURN A RE
+  - WL#7491 added the column to replication_connection_configuration
+    the column GTID_ONLY
+  - BUG#104643 Defaults in performance schema tables incompatible with sql_mode
+    fixed TIMESTAMP columns (removed default 0)
+    fixed DOUBLE columns (removed sign)
 */
 
-static const uint PFS_DD_VERSION = 80024;
+static const uint PFS_DD_VERSION = 80027;
 
 #endif /* PFS_DD_VERSION_H */
diff -Nru mysql-8.0-8.0.26/storage/perfschema/pfs_defaults.cc mysql-8.0-8.0.27/storage/perfschema/pfs_defaults.cc
--- mysql-8.0-8.0.26/storage/perfschema/pfs_defaults.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/pfs_defaults.cc	2021-09-28 11:46:34.000000000 +0000
@@ -44,14 +44,15 @@
 #ifdef HAVE_PSI_THREAD_INTERFACE
   static PSI_thread_key thread_key;
   static PSI_thread_info thread_info = {&thread_key, "setup",
-                                        PSI_FLAG_SINGLETON, 0, PSI_DOCUMENT_ME};
+                                        "pfs_setup", PSI_FLAG_SINGLETON,
+                                        0,           PSI_DOCUMENT_ME};
 
   const char *pfs_category = "performance_schema";
 
   PSI_thread_service_t *psi = (PSI_thread_service_t *)service;
 
   psi->register_thread(pfs_category, &thread_info, 1);
-  PSI_thread *psi_thread = psi->new_thread(thread_key, nullptr, 0);
+  PSI_thread *psi_thread = psi->new_thread(thread_key, 0, nullptr, 0);
 
   if (psi_thread != nullptr) {
     /* LF_HASH needs a thread, for PINS */
diff -Nru mysql-8.0-8.0.26/storage/perfschema/pfs_engine_table.cc mysql-8.0-8.0.27/storage/perfschema/pfs_engine_table.cc
--- mysql-8.0-8.0.26/storage/perfschema/pfs_engine_table.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/pfs_engine_table.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1298,7 +1298,7 @@
 
 enum ha_rkey_function PFS_key_reader::read_varchar_utf8(
     enum ha_rkey_function find_flag, bool &isnull, char *buffer,
-    uint *buffer_length, uint buffer_capacity MY_ATTRIBUTE((unused))) {
+    uint *buffer_length, uint buffer_capacity [[maybe_unused]]) {
   if (m_remaining_key_part_info->store_length <= m_remaining_key_len) {
     /*
       Stored as:
@@ -1350,7 +1350,7 @@
 
 enum ha_rkey_function PFS_key_reader::read_text_utf8(
     enum ha_rkey_function find_flag, bool &isnull, char *buffer,
-    uint *buffer_length, uint buffer_capacity MY_ATTRIBUTE((unused))) {
+    uint *buffer_length, uint buffer_capacity [[maybe_unused]]) {
   if (m_remaining_key_part_info->store_length <= m_remaining_key_len) {
     /*
       Stored as:
diff -Nru mysql-8.0-8.0.26/storage/perfschema/pfs_engine_table.h mysql-8.0-8.0.27/storage/perfschema/pfs_engine_table.h
--- mysql-8.0-8.0.26/storage/perfschema/pfs_engine_table.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/pfs_engine_table.h	2021-09-28 11:46:34.000000000 +0000
@@ -85,13 +85,13 @@
   int delete_row(TABLE *table, const unsigned char *buf, Field **fields);
 
   /** Initialize table scan. */
-  virtual int rnd_init(bool scan MY_ATTRIBUTE((unused))) { return 0; }
+  virtual int rnd_init(bool scan [[maybe_unused]]) { return 0; }
 
   /** Fetch the next row in this cursor. */
   virtual int rnd_next(void) = 0;
 
-  virtual int index_init(uint idx MY_ATTRIBUTE((unused)),
-                         bool sorted MY_ATTRIBUTE((unused))) {
+  virtual int index_init(uint idx [[maybe_unused]],
+                         bool sorted [[maybe_unused]]) {
     assert(false);
     return HA_ERR_UNSUPPORTED;
   }
@@ -99,9 +99,9 @@
   virtual int index_read(KEY *key_infos, uint index, const uchar *key,
                          uint key_len, enum ha_rkey_function find_flag);
 
-  virtual int index_read_last(KEY *key_infos MY_ATTRIBUTE((unused)),
-                              const uchar *key MY_ATTRIBUTE((unused)),
-                              uint key_len MY_ATTRIBUTE((unused))) {
+  virtual int index_read_last(KEY *key_infos [[maybe_unused]],
+                              const uchar *key [[maybe_unused]],
+                              uint key_len [[maybe_unused]]) {
     return HA_ERR_UNSUPPORTED;
   }
 
diff -Nru mysql-8.0-8.0.26/storage/perfschema/pfs.h mysql-8.0-8.0.27/storage/perfschema/pfs.h
--- mysql-8.0-8.0.26/storage/perfschema/pfs.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/pfs.h	2021-09-28 11:46:34.000000000 +0000
@@ -28,6 +28,8 @@
   Performance schema instrumentation (declarations).
 */
 
+void record_main_thread_id();
+
 #define HAVE_PSI_1
 
 #include <mysql/components/services/bits/psi_bits.h>
diff -Nru mysql-8.0-8.0.26/storage/perfschema/pfs_instr.cc mysql-8.0-8.0.27/storage/perfschema/pfs_instr.cc
--- mysql-8.0-8.0.26/storage/perfschema/pfs_instr.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/pfs_instr.cc	2021-09-28 11:46:34.000000000 +0000
@@ -548,14 +548,15 @@
 /**
   Create instrumentation for a thread instance.
   @param klass                        the thread class
+  @param seqnum                       the thread instance sequence number
   @param identity                     the thread address,
     or a value characteristic of this thread
   @param processlist_id               the PROCESSLIST id,
     or 0 if unknown
   @return a thread instance, or NULL
 */
-PFS_thread *create_thread(PFS_thread_class *klass,
-                          const void *identity MY_ATTRIBUTE((unused)),
+PFS_thread *create_thread(PFS_thread_class *klass, PSI_thread_seqnum seqnum,
+                          const void *identity [[maybe_unused]],
                           ulonglong processlist_id) {
   PFS_thread *pfs;
   pfs_dirty_state dirty_state;
@@ -640,6 +641,27 @@
     pfs->m_events_statements_count = 0;
     pfs->m_transaction_current.m_event_id = 0;
 
+    if (klass->is_singleton()) {
+#if 0
+      /* See destroy_thread() */
+      assert(klass->m_singleton == nullptr);
+#endif
+      klass->m_singleton = pfs;
+    }
+
+    if (klass->has_seqnum()) {
+      if (klass->has_auto_seqnum()) {
+        seqnum = klass->m_seqnum++;
+      }
+
+      /* Possible truncation */
+      snprintf(pfs->m_os_name, PFS_MAX_OS_NAME_LENGTH - 1, klass->m_os_name,
+               seqnum);
+    } else {
+      snprintf(pfs->m_os_name, PFS_MAX_OS_NAME_LENGTH, "%s", klass->m_os_name);
+    }
+    pfs->m_os_name[PFS_MAX_OS_NAME_LENGTH - 1] = '\0';
+
     pfs->m_lock.dirty_to_allocated(&dirty_state);
   }
 
@@ -741,6 +763,43 @@
   pfs->reset_session_connect_attrs();
   pfs->m_thd = nullptr;
 
+  PFS_thread_class *klass = pfs->m_class;
+  if (klass->is_singleton()) {
+#if 0
+    /*
+      In theory, some threads are -- logically -- singletons.
+
+      START XYZ will start a XYZ thread with mysql_thread_create(),
+      and set a global state as "running".
+      STOP XYZ will notify the running thread to stop,
+      and set a global state as "not running".
+
+      In practice, these threads are -- physically -- not singletons.
+
+      STOP XYZ only notifies the running thread to stop,
+      but the MySQL code base in general never calls pthread_join(3).
+      Instead, the running thread, when noticing it should stop,
+      is still executing cleanup actions, until the thread main loop
+      finally terminates and call destroy_thread in the performance schema.
+
+      Because of this, the following sequence:
+        START XYZ --> fork thread #1
+        STOP XYZ --> tell #1 to stop
+        START XYZ --> fork thread #2
+      can create situations when both threads #1 and #2
+      are executing at the same time, until #1 gracefully ends.
+
+      As a result, the assert below is relaxed.
+
+      To enforce it properly,
+      a pre requisite is first to use pthread_join() in the entire code base.
+    */
+
+    assert(klass->m_singleton == pfs);
+#endif
+    klass->m_singleton = nullptr;
+  }
+
   if (pfs->m_account != nullptr) {
     pfs->m_account->release();
     pfs->m_account = nullptr;
diff -Nru mysql-8.0-8.0.26/storage/perfschema/pfs_instr_class.cc mysql-8.0-8.0.27/storage/perfschema/pfs_instr_class.cc
--- mysql-8.0-8.0.26/storage/perfschema/pfs_instr_class.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/pfs_instr_class.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1316,6 +1316,9 @@
 */
 PFS_thread_key register_thread_class(const char *name, uint name_length,
                                      PSI_thread_info *info) {
+  assert(info != nullptr);
+  assert(info->m_os_name != nullptr);
+
   /* See comments in register_mutex_class */
   uint32 index;
   PFS_thread_class *entry;
@@ -1335,10 +1338,31 @@
     entry->m_history = true;
 
     entry->enforce_valid_flags(PSI_FLAG_SINGLETON | PSI_FLAG_USER |
-                               PSI_FLAG_THREAD_SYSTEM);
+                               PSI_FLAG_THREAD_SYSTEM | PSI_FLAG_AUTO_SEQNUM |
+                               PSI_FLAG_NO_SEQNUM);
 
     configure_instr_class(entry);
     ++thread_class_allocated_count;
+
+    entry->m_seqnum.store(1);
+
+    if (entry->has_seqnum()) {
+      /*
+        Ensure room for "-%d" suffix with 2 digits minimum,
+        so that:
+        - the "-%d" format fits into the class
+        - the "-NN" suffix fits into the instance
+      */
+      assert(strlen(info->m_os_name) < PFS_MAX_OS_NAME_LENGTH - 3);
+
+      snprintf(entry->m_os_name, PFS_MAX_OS_NAME_LENGTH, "%s-%%d",
+               info->m_os_name);
+    } else {
+      assert(strlen(info->m_os_name) < PFS_MAX_OS_NAME_LENGTH);
+      strncpy(entry->m_os_name, info->m_os_name, PFS_MAX_OS_NAME_LENGTH);
+    }
+    entry->m_os_name[PFS_MAX_OS_NAME_LENGTH - 1] = '\0';
+
     return (index + 1);
   }
 
diff -Nru mysql-8.0-8.0.26/storage/perfschema/pfs_instr_class.h mysql-8.0-8.0.27/storage/perfschema/pfs_instr_class.h
--- mysql-8.0-8.0.26/storage/perfschema/pfs_instr_class.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/pfs_instr_class.h	2021-09-28 11:46:34.000000000 +0000
@@ -56,6 +56,14 @@
 #define PFS_MAX_INFO_NAME_LENGTH 128
 
 /**
+  Maximum length of the thread os name.
+  Must include a terminating NUL character.
+  Length is 16 because of linux pthread_setname_np(3)
+  @see my_thread_self_setname()
+*/
+#define PFS_MAX_OS_NAME_LENGTH 16
+
+/**
   Maximum length of the 'full' prefix of an instrument name.
   For example, for the instrument name 'wait/sync/mutex/sql/LOCK_open',
   the full prefix is 'wait/sync/mutex/sql/', which in turn derives from
@@ -236,6 +244,12 @@
 
   bool is_global() const { return m_flags & PSI_FLAG_ONLY_GLOBAL_STAT; }
 
+  bool has_seqnum() const {
+    return (m_flags & (PSI_FLAG_SINGLETON | PSI_FLAG_NO_SEQNUM)) == 0;
+  }
+
+  bool has_auto_seqnum() const { return m_flags & PSI_FLAG_AUTO_SEQNUM; }
+
   void enforce_valid_flags(uint allowed_flags) {
     /* Reserved for future use. */
     allowed_flags |= PSI_FLAG_THREAD | PSI_FLAG_TRANSFER;
@@ -317,6 +331,10 @@
   PFS_thread *m_singleton;
   /** Thread history instrumentation flag. */
   bool m_history{false};
+  /** Thread os name. */
+  char m_os_name[PFS_MAX_OS_NAME_LENGTH];
+  /** Thread instance sequence number counter. */
+  std::atomic<unsigned int> m_seqnum;
 };
 
 /** Key identifying a table share. */
diff -Nru mysql-8.0-8.0.26/storage/perfschema/pfs_instr.h mysql-8.0-8.0.27/storage/perfschema/pfs_instr.h
--- mysql-8.0-8.0.26/storage/perfschema/pfs_instr.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/pfs_instr.h	2021-09-28 11:46:34.000000000 +0000
@@ -609,6 +609,10 @@
     Protected by @c m_session_lock.
   */
   uint m_groupname_length;
+  /**
+    Operating system name.
+  */
+  char m_os_name[PFS_MAX_OS_NAME_LENGTH];
   /** User-defined data. */
   void *m_user_data;
   /** Current command. */
@@ -752,8 +756,8 @@
 PFS_cond *create_cond(PFS_cond_class *klass, const void *identity);
 void destroy_cond(PFS_cond *pfs);
 
-PFS_thread *create_thread(PFS_thread_class *klass, const void *identity,
-                          ulonglong processlist_id);
+PFS_thread *create_thread(PFS_thread_class *klass, PSI_thread_seqnum seqnum,
+                          const void *identity, ulonglong processlist_id);
 
 PFS_thread *find_thread_by_processlist_id(ulonglong processlist_id);
 PFS_thread *find_thread_by_internal_id(ulonglong thread_id);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/pfs_plugin_table.cc mysql-8.0-8.0.27/storage/perfschema/pfs_plugin_table.cc
--- mysql-8.0-8.0.26/storage/perfschema/pfs_plugin_table.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/pfs_plugin_table.cc	2021-09-28 11:46:34.000000000 +0000
@@ -244,8 +244,7 @@
  * @param fields    Array of fields in the table
  */
 static int write_row(PFS_engine_table *pfs_table, TABLE *table,
-                     unsigned char *buf MY_ATTRIBUTE((unused)),
-                     Field **fields) {
+                     unsigned char *buf [[maybe_unused]], Field **fields) {
   int result = 0;
   Field *f;
   table_plugin_table *temp = (table_plugin_table *)pfs_table;
diff -Nru mysql-8.0-8.0.26/storage/perfschema/pfs_server.cc mysql-8.0-8.0.27/storage/perfschema/pfs_server.cc
--- mysql-8.0-8.0.26/storage/perfschema/pfs_server.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/pfs_server.cc	2021-09-28 11:46:34.000000000 +0000
@@ -66,6 +66,8 @@
 void cleanup_instrument_config(void);
 
 void pre_initialize_performance_schema() {
+  record_main_thread_id();
+
   pfs_initialized = false;
 
   init_all_builtin_memory_class();
diff -Nru mysql-8.0-8.0.26/storage/perfschema/pfs_server.h mysql-8.0-8.0.27/storage/perfschema/pfs_server.h
--- mysql-8.0-8.0.26/storage/perfschema/pfs_server.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/pfs_server.h	2021-09-28 11:46:34.000000000 +0000
@@ -55,13 +55,13 @@
 #define PFS_AUTOSIZE_VALUE (-1)
 
 #ifndef PFS_MAX_MUTEX_CLASS
-#define PFS_MAX_MUTEX_CLASS 300
+#define PFS_MAX_MUTEX_CLASS 350
 #endif
 #ifndef PFS_MAX_RWLOCK_CLASS
 #define PFS_MAX_RWLOCK_CLASS 60
 #endif
 #ifndef PFS_MAX_COND_CLASS
-#define PFS_MAX_COND_CLASS 100
+#define PFS_MAX_COND_CLASS 150
 #endif
 #ifndef PFS_MAX_THREAD_CLASS
 #define PFS_MAX_THREAD_CLASS 100
diff -Nru mysql-8.0-8.0.26/storage/perfschema/pfs_services.h mysql-8.0-8.0.27/storage/perfschema/pfs_services.h
--- mysql-8.0-8.0.26/storage/perfschema/pfs_services.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/pfs_services.h	2021-09-28 11:46:34.000000000 +0000
@@ -79,6 +79,8 @@
     SERVICE_IMPLEMENTATION(performance_schema, psi_table_v1);
 extern SERVICE_TYPE(psi_thread_v4)
     SERVICE_IMPLEMENTATION(performance_schema, psi_thread_v4);
+extern SERVICE_TYPE(psi_thread_v5)
+    SERVICE_IMPLEMENTATION(performance_schema, psi_thread_v5);
 extern SERVICE_TYPE(psi_transaction_v1)
     SERVICE_IMPLEMENTATION(performance_schema, psi_transaction_v1);
 extern SERVICE_TYPE(psi_tls_channel_v1)
diff -Nru mysql-8.0-8.0.26/storage/perfschema/pfs_stat.cc mysql-8.0-8.0.27/storage/perfschema/pfs_stat.cc
--- mysql-8.0-8.0.26/storage/perfschema/pfs_stat.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/pfs_stat.cc	2021-09-28 11:46:34.000000000 +0000
@@ -429,14 +429,6 @@
   }
 }
 
-// Missing overload for Studio 12.6 Sun C++ 5.15
-#if defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x5150)
-inline size_t &operator+=(size_t &target, const std::atomic<size_t> &val) {
-  target += val.load();
-  return target;
-}
-#endif
-
 void memory_partial_aggregate(PFS_memory_safe_stat *from,
                               PFS_memory_shared_stat *stat) {
   if (!from->m_used) {
diff -Nru mysql-8.0-8.0.26/storage/perfschema/pfs_variable.cc mysql-8.0-8.0.27/storage/perfschema/pfs_variable.cc
--- mysql-8.0-8.0.26/storage/perfschema/pfs_variable.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/pfs_variable.cc	2021-09-28 11:46:34.000000000 +0000
@@ -34,6 +34,7 @@
   Performance schema system variable and status variable (implementation).
 */
 
+#include "mutex_lock.h"
 #include "my_macros.h"
 #include "my_sys.h"
 #include "sql/current_thd.h"
@@ -53,13 +54,7 @@
 
 bool Find_THD_variable::operator()(THD *thd) {
   // TODO: filter bg threads?
-  if (thd != m_unsafe_thd) {
-    return false;
-  }
-
-  /* Hold this lock to keep THD during materialization. */
-  mysql_mutex_lock(&thd->LOCK_thd_data);
-  return true;
+  return (thd == m_unsafe_thd);
 }
 
 template <class Var_type>
@@ -201,7 +196,7 @@
   m_cache.clear();
 
   /* Block plugins from unloading. */
-  mysql_mutex_lock(&LOCK_plugin_delete);
+  MUTEX_LOCK(plugin_delete_lock_guard, &LOCK_plugin_delete);
 
   /*
      Build array of SHOW_VARs from system variable hash. Do this within
@@ -213,7 +208,8 @@
   }
 
   /* Get and lock a validated THD from the thread manager. */
-  if ((m_safe_thd = get_THD(unsafe_thd)) != nullptr) {
+  THD_ptr thd_ptr = get_THD(unsafe_thd);
+  if ((m_safe_thd = thd_ptr.get()) != nullptr) {
     DEBUG_SYNC(m_current_thd, "materialize_session_variable_array_THD_locked");
     for (Show_var_array::iterator show_var = m_show_var_array.begin();
          show_var->value && (show_var != m_show_var_array.end()); show_var++) {
@@ -222,14 +218,10 @@
       m_cache.push_back(system_var);
     }
 
-    /* Release lock taken in get_THD(). */
-    mysql_mutex_unlock(&m_safe_thd->LOCK_thd_data);
-
     m_materialized = true;
     ret = 0;
   }
 
-  mysql_mutex_unlock(&LOCK_plugin_delete);
   return ret;
 }
 
@@ -253,7 +245,7 @@
 */
 void PFS_system_variable_cache::clear_mem_root(void) {
   if (m_mem_sysvar_ptr) {
-    free_root(&m_mem_sysvar, MYF(MY_MARK_BLOCKS_FREE));
+    m_mem_sysvar.ClearForReuse();
     *m_mem_thd = m_mem_thd_save; /* restore original mem_root */
     m_mem_thd = nullptr;
     m_mem_thd_save = nullptr;
@@ -266,7 +258,7 @@
 */
 void PFS_system_variable_cache::free_mem_root(void) {
   if (m_mem_sysvar_ptr) {
-    free_root(&m_mem_sysvar, MYF(0));
+    m_mem_sysvar.Clear();
     m_mem_sysvar_ptr = nullptr;
     if (m_mem_thd && m_mem_thd_save) {
       *m_mem_thd = m_mem_thd_save; /* restore original mem_root */
@@ -289,7 +281,7 @@
   m_cache.clear();
 
   /* Block plugins from unloading. */
-  mysql_mutex_lock(&LOCK_plugin_delete);
+  MUTEX_LOCK(plugin_delete_lock_guard, &LOCK_plugin_delete);
 
   /* The SHOW_VAR array must be initialized externally. */
   assert(m_initialized);
@@ -300,7 +292,8 @@
   }
 
   /* Get and lock a validated THD from the thread manager. */
-  if ((m_safe_thd = get_THD(pfs_thread)) != nullptr) {
+  THD_ptr thd_ptr = get_THD(pfs_thread);
+  if ((m_safe_thd = thd_ptr.get()) != nullptr) {
     for (Show_var_array::iterator show_var = m_show_var_array.begin();
          show_var->value && (show_var != m_show_var_array.end()); show_var++) {
       sys_var *value = (sys_var *)show_var->value;
@@ -313,9 +306,6 @@
       }
     }
 
-    /* Release lock taken in get_THD(). */
-    mysql_mutex_unlock(&m_safe_thd->LOCK_thd_data);
-
     m_materialized = true;
     ret = 0;
   }
@@ -325,7 +315,6 @@
     clear_mem_root();
   }
 
-  mysql_mutex_unlock(&LOCK_plugin_delete);
   return ret;
 }
 
@@ -343,13 +332,14 @@
   m_cache.clear();
 
   /* Block plugins from unloading. */
-  mysql_mutex_lock(&LOCK_plugin_delete);
+  MUTEX_LOCK(plugin_delete_lock_guard, &LOCK_plugin_delete);
 
   /* The SHOW_VAR array must be initialized externally. */
   assert(m_initialized);
 
   /* Get and lock a validated THD from the thread manager. */
-  if ((m_safe_thd = get_THD(pfs_thread)) != nullptr) {
+  THD_ptr thd_ptr = get_THD(pfs_thread);
+  if ((m_safe_thd = thd_ptr.get()) != nullptr) {
     SHOW_VAR *show_var = &m_show_var_array.at(index);
 
     if (show_var && show_var->value && (show_var != m_show_var_array.end())) {
@@ -363,14 +353,10 @@
       }
     }
 
-    /* Release lock taken in get_THD(). */
-    mysql_mutex_unlock(&m_safe_thd->LOCK_thd_data);
-
     m_materialized = true;
     ret = 0;
   }
 
-  mysql_mutex_unlock(&LOCK_plugin_delete);
   return ret;
 }
 
@@ -386,7 +372,7 @@
   m_cache.clear();
 
   /* Block plugins from unloading. */
-  mysql_mutex_lock(&LOCK_plugin_delete);
+  MUTEX_LOCK(plugin_delete_lock_guard, &LOCK_plugin_delete);
 
   /*
      Build array of SHOW_VARs from system variable hash. Do this within
@@ -398,7 +384,8 @@
   }
 
   /* Get and lock a validated THD from the thread manager. */
-  if ((m_safe_thd = get_THD(unsafe_thd)) != nullptr) {
+  THD_ptr thd_ptr = get_THD(unsafe_thd);
+  if ((m_safe_thd = thd_ptr.get()) != nullptr) {
     for (Show_var_array::iterator show_var = m_show_var_array.begin();
          show_var->value && (show_var != m_show_var_array.end()); show_var++) {
       sys_var *value = (sys_var *)show_var->value;
@@ -411,14 +398,10 @@
       }
     }
 
-    /* Release lock taken in get_THD(). */
-    mysql_mutex_unlock(&m_safe_thd->LOCK_thd_data);
-
     m_materialized = true;
     ret = 0;
   }
 
-  mysql_mutex_unlock(&LOCK_plugin_delete);
   return ret;
 }
 
@@ -438,7 +421,7 @@
   m_cache.clear();
 
   /* Block plugins from unloading. */
-  mysql_mutex_lock(&LOCK_plugin_delete);
+  MUTEX_LOCK(plugin_delete_lock_guard, &LOCK_plugin_delete);
 
   /*
      Build array of SHOW_VARs from system variable hash. Do this within
@@ -450,7 +433,8 @@
   }
 
   /* Get and lock a validated THD from the thread manager. */
-  if ((m_safe_thd = get_THD(unsafe_thd)) != nullptr) {
+  THD_ptr thd_ptr = get_THD(unsafe_thd);
+  if ((m_safe_thd = thd_ptr.get()) != nullptr) {
     for (Show_var_array::iterator show_var = m_show_var_array.begin();
          show_var->value && (show_var != m_show_var_array.end()); show_var++) {
       /* Resolve value, convert to text, add to cache. */
@@ -458,14 +442,10 @@
       m_cache.push_back(system_var);
     }
 
-    /* Release lock taken in get_THD(). */
-    mysql_mutex_unlock(&m_safe_thd->LOCK_thd_data);
-
     m_materialized = true;
     ret = 0;
   }
 
-  mysql_mutex_unlock(&LOCK_plugin_delete);
   return ret;
 }
 
@@ -484,10 +464,11 @@
   m_cache.clear();
 
   /* Block plugins from unloading. */
-  mysql_mutex_lock(&LOCK_plugin_delete);
+  MUTEX_LOCK(plugin_delete_lock_guard, &LOCK_plugin_delete);
 
   /* Get and lock a validated THD from the thread manager. */
-  if ((m_safe_thd = get_THD(unsafe_thd)) != nullptr) {
+  THD_ptr thd_ptr = get_THD(unsafe_thd);
+  if ((m_safe_thd = thd_ptr.get()) != nullptr) {
     Persisted_variables_cache *pv = Persisted_variables_cache::get_instance();
     if (pv) {
       auto *persist_variables = pv->get_persisted_variables();
@@ -526,14 +507,11 @@
       }
       pv->unlock();
     }
-    /* Release lock taken in get_THD(). */
-    mysql_mutex_unlock(&m_safe_thd->LOCK_thd_data);
 
     m_materialized = true;
     ret = 0;
   }
 
-  mysql_mutex_unlock(&LOCK_plugin_delete);
   return ret;
 }
 
@@ -881,26 +859,7 @@
     if (!my_strcasecmp(system_charset_info, prefix, "Com") && !m_show_command) {
       return true;
     }
-  } else {
-    /*
-      Slave status resides in Performance Schema replication tables. Exclude
-      these slave status variables from the SHOW STATUS command and from the
-      status tables.
-      Assume null prefix to ensure that only server-defined slave status
-      variables are filtered.
-    */
-    const char *name = show_var->name;
-    if (!my_strcasecmp(system_charset_info, name, "Slave_running") ||
-        !my_strcasecmp(system_charset_info, name,
-                       "Slave_retried_transactions") ||
-        !my_strcasecmp(system_charset_info, name, "Slave_last_heartbeat") ||
-        !my_strcasecmp(system_charset_info, name,
-                       "Slave_received_heartbeats") ||
-        !my_strcasecmp(system_charset_info, name, "Slave_heartbeat_period")) {
-      return true;
-    }
   }
-
   return false;
 }
 
@@ -1187,8 +1146,10 @@
   m_cache.clear();
 
   /* Avoid recursive acquisition of LOCK_status. */
+  std::unique_ptr<Mutex_lock> status_lock_guard;
   if (m_current_thd->fill_status_recursion_level++ == 0) {
-    mysql_mutex_lock(&LOCK_status);
+    status_lock_guard = std::unique_ptr<Mutex_lock>(
+        new Mutex_lock(&LOCK_status, __FILE__, __LINE__));
   }
 
   /*
@@ -1201,7 +1162,8 @@
   }
 
   /* Get and lock a validated THD from the thread manager. */
-  if ((m_safe_thd = get_THD(unsafe_thd)) != nullptr) {
+  THD_ptr thd_ptr = get_THD(unsafe_thd);
+  if ((m_safe_thd = thd_ptr.get()) != nullptr) {
     /*
       Build the status variable cache using the SHOW_VAR array as a reference.
       Use the status values from the THD protected by the thread manager lock.
@@ -1210,16 +1172,11 @@
     manifest(m_safe_thd, m_show_var_array.begin(), status_vars, "", false,
              false);
 
-    /* Release lock taken in get_THD(). */
-    mysql_mutex_unlock(&m_safe_thd->LOCK_thd_data);
-
     m_materialized = true;
     ret = 0;
   }
 
-  if (m_current_thd->fill_status_recursion_level-- == 1) {
-    mysql_mutex_unlock(&LOCK_status);
-  }
+  m_current_thd->fill_status_recursion_level--;
   return ret;
 }
 
@@ -1236,8 +1193,10 @@
   m_cache.clear();
 
   /* Avoid recursive acquisition of LOCK_status. */
+  std::unique_ptr<Mutex_lock> status_lock_guard;
   if (m_current_thd->fill_status_recursion_level++ == 0) {
-    mysql_mutex_lock(&LOCK_status);
+    status_lock_guard = std::unique_ptr<Mutex_lock>(
+        new Mutex_lock(&LOCK_status, __FILE__, __LINE__));
   }
 
   /*
@@ -1250,7 +1209,8 @@
   }
 
   /* Get and lock a validated THD from the thread manager. */
-  if ((m_safe_thd = get_THD(unsafe_thd)) != nullptr) {
+  THD_ptr thd_ptr = get_THD(unsafe_thd);
+  if ((m_safe_thd = thd_ptr.get()) != nullptr) {
     /*
       Build the status variable cache using the SHOW_VAR array as a reference.
       Use the status values from the THD protected by the thread manager lock.
@@ -1259,16 +1219,11 @@
     manifest(m_safe_thd, m_show_var_array.begin(), status_vars, "", false,
              true);
 
-    /* Release lock taken in get_THD(). */
-    mysql_mutex_unlock(&m_safe_thd->LOCK_thd_data);
-
     m_materialized = true;
     ret = 0;
   }
 
-  if (m_current_thd->fill_status_recursion_level-- == 1) {
-    mysql_mutex_unlock(&LOCK_status);
-  }
+  m_current_thd->fill_status_recursion_level--;
   return ret;
 }
 
@@ -1285,15 +1240,18 @@
   m_cache.clear();
 
   /* Acquire LOCK_status to guard against plugin load/unload. */
+  std::unique_ptr<Mutex_lock> status_lock_guard;
   if (m_current_thd->fill_status_recursion_level++ == 0) {
-    mysql_mutex_lock(&LOCK_status);
+    status_lock_guard = std::unique_ptr<Mutex_lock>(
+        new Mutex_lock(&LOCK_status, __FILE__, __LINE__));
   }
 
   /* The SHOW_VAR array must be initialized externally. */
   assert(m_initialized);
 
   /* Get and lock a validated THD from the thread manager. */
-  if ((m_safe_thd = get_THD(pfs_thread)) != nullptr) {
+  THD_ptr thd_ptr = get_THD(pfs_thread);
+  if ((m_safe_thd = thd_ptr.get()) != nullptr) {
     /*
       Build the status variable cache using the SHOW_VAR array as a reference.
       Use the status values from the THD protected by the thread manager lock.
@@ -1302,16 +1260,11 @@
     manifest(m_safe_thd, m_show_var_array.begin(), status_vars, "", false,
              true);
 
-    /* Release lock taken in get_THD(). */
-    mysql_mutex_unlock(&m_safe_thd->LOCK_thd_data);
-
     m_materialized = true;
     ret = 0;
   }
 
-  if (m_current_thd->fill_status_recursion_level-- == 1) {
-    mysql_mutex_unlock(&LOCK_status);
-  }
+  m_current_thd->fill_status_recursion_level--;
   return ret;
 }
 
diff -Nru mysql-8.0-8.0.26/storage/perfschema/pfs_variable.h mysql-8.0-8.0.27/storage/perfschema/pfs_variable.h
--- mysql-8.0-8.0.26/storage/perfschema/pfs_variable.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/pfs_variable.h	2021-09-28 11:46:34.000000000 +0000
@@ -368,8 +368,8 @@
     Get a validated THD from the thread manager. Execute callback function while
     inside of the thread manager locks.
   */
-  THD *get_THD(THD *thd);
-  THD *get_THD(PFS_thread *pfs_thread);
+  THD_ptr get_THD(THD *thd);
+  THD_ptr get_THD(PFS_thread *pfs_thread);
 
   /**
     Get a single variable from the cache.
@@ -459,23 +459,22 @@
   while inside the thread manager lock.
 */
 template <class Var_type>
-THD *PFS_variable_cache<Var_type>::get_THD(THD *unsafe_thd) {
+THD_ptr PFS_variable_cache<Var_type>::get_THD(THD *unsafe_thd) {
   if (unsafe_thd == nullptr) {
     /*
       May happen, precisely because the pointer is unsafe
       (THD just disconnected for example).
       No need to walk Global_THD_manager for that.
     */
-    return nullptr;
+    return THD_ptr{nullptr};
   }
 
   m_thd_finder.set_unsafe_thd(unsafe_thd);
-  THD *safe_thd = Global_THD_manager::get_instance()->find_thd(&m_thd_finder);
-  return safe_thd;
+  return Global_THD_manager::get_instance()->find_thd(&m_thd_finder);
 }
 
 template <class Var_type>
-THD *PFS_variable_cache<Var_type>::get_THD(PFS_thread *pfs_thread) {
+THD_ptr PFS_variable_cache<Var_type>::get_THD(PFS_thread *pfs_thread) {
   assert(pfs_thread != nullptr);
   return get_THD(pfs_thread->m_thd);
 }
diff -Nru mysql-8.0-8.0.26/storage/perfschema/pfs_visitor.h mysql-8.0-8.0.27/storage/perfschema/pfs_visitor.h
--- mysql-8.0-8.0.26/storage/perfschema/pfs_visitor.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/pfs_visitor.h	2021-09-28 11:46:34.000000000 +0000
@@ -276,12 +276,11 @@
   virtual void visit_table_share(PFS_table_share *) {}
   /** Visit a table share index. */
   virtual void visit_table_share_index(PFS_table_share *,
-                                       uint index MY_ATTRIBUTE((unused))) {}
+                                       uint index [[maybe_unused]]) {}
   /** Visit a table. */
   virtual void visit_table(PFS_table *) {}
   /** Visit a table index. */
-  virtual void visit_table_index(PFS_table *,
-                                 uint index MY_ATTRIBUTE((unused))) {}
+  virtual void visit_table_index(PFS_table *, uint index [[maybe_unused]]) {}
 };
 
 /**
diff -Nru mysql-8.0-8.0.26/storage/perfschema/service_pfs_notification.cc mysql-8.0-8.0.27/storage/perfschema/service_pfs_notification.cc
--- mysql-8.0-8.0.26/storage/perfschema/service_pfs_notification.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/service_pfs_notification.cc	2021-09-28 11:46:34.000000000 +0000
@@ -334,7 +334,7 @@
   @param thread  instrumented thread
   @sa pfs_notify_thread_create
 */
-void pfs_notify_thread_create(PSI_thread *thread MY_ATTRIBUTE((unused))) {
+void pfs_notify_thread_create(PSI_thread *thread [[maybe_unused]]) {
   auto node = pfs_notification_registry.get_first(EVENT_THREAD_CREATE);
   if (node == nullptr) {
     return;
@@ -361,7 +361,7 @@
   @param thread  instrumented thread
   @sa pfs_notify_thread_destroy
 */
-void pfs_notify_thread_destroy(PSI_thread *thread MY_ATTRIBUTE((unused))) {
+void pfs_notify_thread_destroy(PSI_thread *thread [[maybe_unused]]) {
   auto node = pfs_notification_registry.get_first(EVENT_THREAD_DESTROY);
   if (node == nullptr) {
     return;
@@ -387,7 +387,7 @@
   @param thread  instrumented thread
   @sa PSI_v1::notify_session_connect
 */
-void pfs_notify_session_connect(PSI_thread *thread MY_ATTRIBUTE((unused))) {
+void pfs_notify_session_connect(PSI_thread *thread [[maybe_unused]]) {
   auto node = pfs_notification_registry.get_first(EVENT_SESSION_CONNECT);
   if (node == nullptr) {
     return;
@@ -413,7 +413,7 @@
   @param thread  instrumented thread
   @sa PSI_v1::notify_session_disconnect
 */
-void pfs_notify_session_disconnect(PSI_thread *thread MY_ATTRIBUTE((unused))) {
+void pfs_notify_session_disconnect(PSI_thread *thread [[maybe_unused]]) {
   auto node = pfs_notification_registry.get_first(EVENT_SESSION_DISCONNECT);
   if (node == nullptr) {
     return;
@@ -439,7 +439,7 @@
   @param thread  instrumented thread
   @sa PSI_v1::notify_session_change_user
 */
-void pfs_notify_session_change_user(PSI_thread *thread MY_ATTRIBUTE((unused))) {
+void pfs_notify_session_change_user(PSI_thread *thread [[maybe_unused]]) {
   auto node = pfs_notification_registry.get_first(EVENT_SESSION_CHANGE_USER);
   if (node == nullptr) {
     return;
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_all_instr.h mysql-8.0-8.0.27/storage/perfschema/table_all_instr.h
--- mysql-8.0-8.0.26/storage/perfschema/table_all_instr.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_all_instr.h	2021-09-28 11:46:34.000000000 +0000
@@ -71,7 +71,7 @@
   virtual bool match(PFS_file *) { return false; }
   virtual bool match(PFS_socket *) { return false; }
   /* All views match by default. */
-  virtual bool match_view(uint view MY_ATTRIBUTE((unused))) { return true; }
+  virtual bool match_view(uint view [[maybe_unused]]) { return true; }
 };
 
 /**
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_ees_by_account_by_error.cc mysql-8.0-8.0.27/storage/perfschema/table_ees_by_account_by_error.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_ees_by_account_by_error.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_ees_by_account_by_error.cc	2021-09-28 11:46:34.000000000 +0000
@@ -56,8 +56,8 @@
     "  SQL_STATE VARCHAR(5),\n"
     "  SUM_ERROR_RAISED  BIGINT unsigned not null,\n"
     "  SUM_ERROR_HANDLED BIGINT unsigned not null,\n"
-    "  FIRST_SEEN TIMESTAMP(0) null default 0,\n"
-    "  LAST_SEEN TIMESTAMP(0) null default 0,\n"
+    "  FIRST_SEEN TIMESTAMP(0) null,\n"
+    "  LAST_SEEN TIMESTAMP(0) null,\n"
     "  UNIQUE KEY `ACCOUNT` (USER, HOST, ERROR_NUMBER) USING HASH\n",
     /* Options */
     " ENGINE=PERFORMANCE_SCHEMA",
@@ -167,8 +167,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_ees_by_account_by_error::index_init(uint idx MY_ATTRIBUTE((unused)),
-                                              bool) {
+int table_ees_by_account_by_error::index_init(uint idx [[maybe_unused]], bool) {
   PFS_index_ees_by_account_by_error *result = nullptr;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_ees_by_account_by_error);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_ees_by_host_by_error.cc mysql-8.0-8.0.27/storage/perfschema/table_ees_by_host_by_error.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_ees_by_host_by_error.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_ees_by_host_by_error.cc	2021-09-28 11:46:34.000000000 +0000
@@ -56,8 +56,8 @@
     "  SQL_STATE VARCHAR(5),\n"
     "  SUM_ERROR_RAISED  BIGINT unsigned not null,\n"
     "  SUM_ERROR_HANDLED BIGINT unsigned not null,\n"
-    "  FIRST_SEEN TIMESTAMP(0) null default 0,\n"
-    "  LAST_SEEN TIMESTAMP(0) null default 0,\n"
+    "  FIRST_SEEN TIMESTAMP(0) null,\n"
+    "  LAST_SEEN TIMESTAMP(0) null,\n"
     "  UNIQUE KEY (host, error_number) USING HASH\n",
     /* Options */
     " ENGINE=PERFORMANCE_SCHEMA",
@@ -159,8 +159,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_ees_by_host_by_error::index_init(uint idx MY_ATTRIBUTE((unused)),
-                                           bool) {
+int table_ees_by_host_by_error::index_init(uint idx [[maybe_unused]], bool) {
   PFS_index_ees_by_host_by_error *result = nullptr;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_ees_by_host_by_error);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_ees_by_thread_by_error.cc mysql-8.0-8.0.27/storage/perfschema/table_ees_by_thread_by_error.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_ees_by_thread_by_error.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_ees_by_thread_by_error.cc	2021-09-28 11:46:34.000000000 +0000
@@ -75,8 +75,8 @@
     "  SQL_STATE VARCHAR(5),\n"
     "  SUM_ERROR_RAISED  BIGINT unsigned not null,\n"
     "  SUM_ERROR_HANDLED BIGINT unsigned not null,\n"
-    "  FIRST_SEEN TIMESTAMP(0) null default 0,\n"
-    "  LAST_SEEN TIMESTAMP(0) null default 0,\n"
+    "  FIRST_SEEN TIMESTAMP(0) null,\n"
+    "  LAST_SEEN TIMESTAMP(0) null,\n"
     "  UNIQUE KEY (THREAD_ID, ERROR_NUMBER) USING HASH\n",
     /* Options */
     " ENGINE=PERFORMANCE_SCHEMA",
@@ -159,8 +159,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_ees_by_thread_by_error::index_init(uint idx MY_ATTRIBUTE((unused)),
-                                             bool) {
+int table_ees_by_thread_by_error::index_init(uint idx [[maybe_unused]], bool) {
   PFS_index_ees_by_thread_by_error *result = nullptr;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_ees_by_thread_by_error);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_ees_by_user_by_error.cc mysql-8.0-8.0.27/storage/perfschema/table_ees_by_user_by_error.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_ees_by_user_by_error.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_ees_by_user_by_error.cc	2021-09-28 11:46:34.000000000 +0000
@@ -56,8 +56,8 @@
     "  SQL_STATE VARCHAR(5),\n"
     "  SUM_ERROR_RAISED  BIGINT unsigned not null,\n"
     "  SUM_ERROR_HANDLED BIGINT unsigned not null,\n"
-    "  FIRST_SEEN TIMESTAMP(0) null default 0,\n"
-    "  LAST_SEEN TIMESTAMP(0) null default 0,\n"
+    "  FIRST_SEEN TIMESTAMP(0) null,\n"
+    "  LAST_SEEN TIMESTAMP(0) null,\n"
     "  UNIQUE KEY (USER, ERROR_NUMBER) USING HASH\n",
     /* Options */
     " ENGINE=PERFORMANCE_SCHEMA",
@@ -159,8 +159,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_ees_by_user_by_error::index_init(uint idx MY_ATTRIBUTE((unused)),
-                                           bool) {
+int table_ees_by_user_by_error::index_init(uint idx [[maybe_unused]], bool) {
   PFS_index_ees_by_user_by_error *result = nullptr;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_ees_by_user_by_error);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_ees_global_by_error.cc mysql-8.0-8.0.27/storage/perfschema/table_ees_global_by_error.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_ees_global_by_error.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_ees_global_by_error.cc	2021-09-28 11:46:34.000000000 +0000
@@ -55,8 +55,8 @@
     "  SQL_STATE VARCHAR(5),\n"
     "  SUM_ERROR_RAISED  BIGINT unsigned not null,\n"
     "  SUM_ERROR_HANDLED BIGINT unsigned not null,\n"
-    "  FIRST_SEEN TIMESTAMP(0) null default 0,\n"
-    "  LAST_SEEN TIMESTAMP(0) null default 0,\n"
+    "  FIRST_SEEN TIMESTAMP(0) null,\n"
+    "  LAST_SEEN TIMESTAMP(0) null,\n"
     "  UNIQUE KEY (ERROR_NUMBER) USING HASH\n",
     /* Options */
     " ENGINE=PERFORMANCE_SCHEMA",
@@ -139,8 +139,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_ees_global_by_error::index_init(uint idx MY_ATTRIBUTE((unused)),
-                                          bool) {
+int table_ees_global_by_error::index_init(uint idx [[maybe_unused]], bool) {
   PFS_index_ees_global_by_error *result = nullptr;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_ees_global_by_error);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_error_log.cc mysql-8.0-8.0.27/storage/perfschema/table_error_log.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_error_log.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_error_log.cc	2021-09-28 11:46:34.000000000 +0000
@@ -224,7 +224,7 @@
 
   @retval 0    success
 */
-int table_error_log::index_init(uint idx, bool sorted MY_ATTRIBUTE((unused))) {
+int table_error_log::index_init(uint idx, bool sorted [[maybe_unused]]) {
   PFS_index_error_log *result = nullptr;
 
   switch (idx) {
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_esgs_by_account_by_event_name.cc mysql-8.0-8.0.27/storage/perfschema/table_esgs_by_account_by_event_name.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_esgs_by_account_by_event_name.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_esgs_by_account_by_event_name.cc	2021-09-28 11:46:34.000000000 +0000
@@ -167,8 +167,8 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_esgs_by_account_by_event_name::index_init(
-    uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_esgs_by_account_by_event_name::index_init(uint idx [[maybe_unused]],
+                                                    bool) {
   PFS_index_esgs_by_account_by_event_name *result = nullptr;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_esgs_by_account_by_event_name);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_esgs_by_host_by_event_name.cc mysql-8.0-8.0.27/storage/perfschema/table_esgs_by_host_by_event_name.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_esgs_by_host_by_event_name.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_esgs_by_host_by_event_name.cc	2021-09-28 11:46:34.000000000 +0000
@@ -161,8 +161,8 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_esgs_by_host_by_event_name::index_init(
-    uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_esgs_by_host_by_event_name::index_init(uint idx [[maybe_unused]],
+                                                 bool) {
   PFS_index_esgs_by_host_by_event_name *result = nullptr;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_esgs_by_host_by_event_name);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_esgs_by_thread_by_event_name.cc mysql-8.0-8.0.27/storage/perfschema/table_esgs_by_thread_by_event_name.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_esgs_by_thread_by_event_name.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_esgs_by_thread_by_event_name.cc	2021-09-28 11:46:34.000000000 +0000
@@ -157,8 +157,8 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_esgs_by_thread_by_event_name::index_init(
-    uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_esgs_by_thread_by_event_name::index_init(uint idx [[maybe_unused]],
+                                                   bool) {
   assert(idx == 0);
   m_opened_index = PFS_NEW(PFS_index_esgs_by_thread_by_event_name);
   m_index = m_opened_index;
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_esgs_by_user_by_event_name.cc mysql-8.0-8.0.27/storage/perfschema/table_esgs_by_user_by_event_name.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_esgs_by_user_by_event_name.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_esgs_by_user_by_event_name.cc	2021-09-28 11:46:34.000000000 +0000
@@ -161,8 +161,8 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_esgs_by_user_by_event_name::index_init(
-    uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_esgs_by_user_by_event_name::index_init(uint idx [[maybe_unused]],
+                                                 bool) {
   PFS_index_esgs_by_user_by_event_name *result = nullptr;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_esgs_by_user_by_event_name);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_esgs_global_by_event_name.cc mysql-8.0-8.0.27/storage/perfschema/table_esgs_global_by_event_name.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_esgs_global_by_event_name.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_esgs_global_by_event_name.cc	2021-09-28 11:46:34.000000000 +0000
@@ -151,7 +151,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_esgs_global_by_event_name::index_init(uint idx MY_ATTRIBUTE((unused)),
+int table_esgs_global_by_event_name::index_init(uint idx [[maybe_unused]],
                                                 bool) {
   PFS_index_esgs_global_by_event_name *result = nullptr;
   assert(idx == 0);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_esmh_by_digest.cc mysql-8.0-8.0.27/storage/perfschema/table_esmh_by_digest.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_esmh_by_digest.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_esmh_by_digest.cc	2021-09-28 11:46:34.000000000 +0000
@@ -165,7 +165,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_esmh_by_digest::index_init(uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_esmh_by_digest::index_init(uint idx [[maybe_unused]], bool) {
   PFS_index_esmh_by_digest *result = nullptr;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_esmh_by_digest);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_esmh_global.cc mysql-8.0-8.0.27/storage/perfschema/table_esmh_global.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_esmh_global.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_esmh_global.cc	2021-09-28 11:46:34.000000000 +0000
@@ -129,7 +129,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_esmh_global::index_init(uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_esmh_global::index_init(uint idx [[maybe_unused]], bool) {
   PFS_index_esmh_global *result = nullptr;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_esmh_global);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_esms_by_account_by_event_name.cc mysql-8.0-8.0.27/storage/perfschema/table_esms_by_account_by_event_name.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_esms_by_account_by_event_name.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_esms_by_account_by_event_name.cc	2021-09-28 11:46:34.000000000 +0000
@@ -190,8 +190,8 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_esms_by_account_by_event_name::index_init(
-    uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_esms_by_account_by_event_name::index_init(uint idx [[maybe_unused]],
+                                                    bool) {
   PFS_index_esms_by_account_by_event_name *result = nullptr;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_esms_by_account_by_event_name);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_esms_by_digest.cc mysql-8.0-8.0.27/storage/perfschema/table_esms_by_digest.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_esms_by_digest.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_esms_by_digest.cc	2021-09-28 11:46:34.000000000 +0000
@@ -79,14 +79,14 @@
     "  SUM_SORT_SCAN BIGINT unsigned not null,\n"
     "  SUM_NO_INDEX_USED BIGINT unsigned not null,\n"
     "  SUM_NO_GOOD_INDEX_USED BIGINT unsigned not null,\n"
-    "  FIRST_SEEN TIMESTAMP(6) NOT NULL default 0,\n"
-    "  LAST_SEEN TIMESTAMP(6) NOT NULL default 0,\n"
+    "  FIRST_SEEN TIMESTAMP(6) not null,\n"
+    "  LAST_SEEN TIMESTAMP(6) not null,\n"
     "  QUANTILE_95 BIGINT unsigned not null,\n"
     "  QUANTILE_99 BIGINT unsigned not null,\n"
     "  QUANTILE_999 BIGINT unsigned not null,\n"
     "  QUERY_SAMPLE_TEXT LONGTEXT,\n"
-    "  QUERY_SAMPLE_SEEN TIMESTAMP(6) NOT NULL default 0,\n"
-    "  QUERY_SAMPLE_TIMER_WAIT BIGINT unsigned NOT NULL,\n"
+    "  QUERY_SAMPLE_SEEN TIMESTAMP(6) not null,\n"
+    "  QUERY_SAMPLE_TIMER_WAIT BIGINT unsigned not null,\n"
     "  UNIQUE KEY (SCHEMA_NAME, DIGEST) USING HASH\n",
     /* Options */
     " ENGINE=PERFORMANCE_SCHEMA",
@@ -181,7 +181,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_esms_by_digest::index_init(uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_esms_by_digest::index_init(uint idx [[maybe_unused]], bool) {
   PFS_index_esms_by_digest *result = nullptr;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_esms_by_digest);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_esms_by_host_by_event_name.cc mysql-8.0-8.0.27/storage/perfschema/table_esms_by_host_by_event_name.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_esms_by_host_by_event_name.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_esms_by_host_by_event_name.cc	2021-09-28 11:46:34.000000000 +0000
@@ -185,8 +185,8 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_esms_by_host_by_event_name::index_init(
-    uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_esms_by_host_by_event_name::index_init(uint idx [[maybe_unused]],
+                                                 bool) {
   PFS_index_esms_by_host_by_event_name *result = nullptr;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_esms_by_host_by_event_name);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_esms_by_program.cc mysql-8.0-8.0.27/storage/perfschema/table_esms_by_program.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_esms_by_program.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_esms_by_program.cc	2021-09-28 11:46:34.000000000 +0000
@@ -177,7 +177,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_esms_by_program::index_init(uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_esms_by_program::index_init(uint idx [[maybe_unused]], bool) {
   PFS_index_esms_by_program *result = nullptr;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_esms_by_program);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_esms_by_thread_by_event_name.cc mysql-8.0-8.0.27/storage/perfschema/table_esms_by_thread_by_event_name.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_esms_by_thread_by_event_name.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_esms_by_thread_by_event_name.cc	2021-09-28 11:46:34.000000000 +0000
@@ -180,8 +180,8 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_esms_by_thread_by_event_name::index_init(
-    uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_esms_by_thread_by_event_name::index_init(uint idx [[maybe_unused]],
+                                                   bool) {
   assert(idx == 0);
   m_opened_index = PFS_NEW(PFS_index_esms_by_thread_by_event_name);
   m_index = m_opened_index;
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_esms_by_user_by_event_name.cc mysql-8.0-8.0.27/storage/perfschema/table_esms_by_user_by_event_name.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_esms_by_user_by_event_name.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_esms_by_user_by_event_name.cc	2021-09-28 11:46:34.000000000 +0000
@@ -183,8 +183,8 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_esms_by_user_by_event_name::index_init(
-    uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_esms_by_user_by_event_name::index_init(uint idx [[maybe_unused]],
+                                                 bool) {
   PFS_index_esms_by_user_by_event_name *result = nullptr;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_esms_by_user_by_event_name);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_esms_global_by_event_name.cc mysql-8.0-8.0.27/storage/perfschema/table_esms_global_by_event_name.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_esms_global_by_event_name.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_esms_global_by_event_name.cc	2021-09-28 11:46:34.000000000 +0000
@@ -175,7 +175,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_esms_global_by_event_name::index_init(uint idx MY_ATTRIBUTE((unused)),
+int table_esms_global_by_event_name::index_init(uint idx [[maybe_unused]],
                                                 bool) {
   PFS_index_esms_global_by_event_name *result = nullptr;
   assert(idx == 0);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_ets_by_account_by_event_name.cc mysql-8.0-8.0.27/storage/perfschema/table_ets_by_account_by_event_name.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_ets_by_account_by_event_name.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_ets_by_account_by_event_name.cc	2021-09-28 11:46:34.000000000 +0000
@@ -177,8 +177,8 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_ets_by_account_by_event_name::index_init(
-    uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_ets_by_account_by_event_name::index_init(uint idx [[maybe_unused]],
+                                                   bool) {
   PFS_index_ets_by_account_by_event_name *result = nullptr;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_ets_by_account_by_event_name);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_ets_by_host_by_event_name.cc mysql-8.0-8.0.27/storage/perfschema/table_ets_by_host_by_event_name.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_ets_by_host_by_event_name.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_ets_by_host_by_event_name.cc	2021-09-28 11:46:34.000000000 +0000
@@ -171,7 +171,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_ets_by_host_by_event_name::index_init(uint idx MY_ATTRIBUTE((unused)),
+int table_ets_by_host_by_event_name::index_init(uint idx [[maybe_unused]],
                                                 bool) {
   PFS_index_ets_by_host_by_event_name *result = nullptr;
   assert(idx == 0);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_ets_by_thread_by_event_name.cc mysql-8.0-8.0.27/storage/perfschema/table_ets_by_thread_by_event_name.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_ets_by_thread_by_event_name.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_ets_by_thread_by_event_name.cc	2021-09-28 11:46:34.000000000 +0000
@@ -169,8 +169,8 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_ets_by_thread_by_event_name::index_init(
-    uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_ets_by_thread_by_event_name::index_init(uint idx [[maybe_unused]],
+                                                  bool) {
   assert(idx == 0);
   m_opened_index = PFS_NEW(PFS_index_ets_by_thread_by_event_name);
   m_index = m_opened_index;
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_ets_by_user_by_event_name.cc mysql-8.0-8.0.27/storage/perfschema/table_ets_by_user_by_event_name.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_ets_by_user_by_event_name.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_ets_by_user_by_event_name.cc	2021-09-28 11:46:34.000000000 +0000
@@ -171,7 +171,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_ets_by_user_by_event_name::index_init(uint idx MY_ATTRIBUTE((unused)),
+int table_ets_by_user_by_event_name::index_init(uint idx [[maybe_unused]],
                                                 bool) {
   PFS_index_ets_by_user_by_event_name *result = nullptr;
   assert(idx == 0);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_ets_global_by_event_name.cc mysql-8.0-8.0.27/storage/perfschema/table_ets_global_by_event_name.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_ets_global_by_event_name.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_ets_global_by_event_name.cc	2021-09-28 11:46:34.000000000 +0000
@@ -154,7 +154,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_ets_global_by_event_name::index_init(uint idx MY_ATTRIBUTE((unused)),
+int table_ets_global_by_event_name::index_init(uint idx [[maybe_unused]],
                                                bool) {
   PFS_index_ets_global_by_event_name *result = nullptr;
   assert(idx == 0);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_events_stages.cc mysql-8.0-8.0.27/storage/perfschema/table_events_stages.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_events_stages.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_events_stages.cc	2021-09-28 11:46:34.000000000 +0000
@@ -372,8 +372,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_events_stages_current::index_init(uint idx MY_ATTRIBUTE((unused)),
-                                            bool) {
+int table_events_stages_current::index_init(uint idx [[maybe_unused]], bool) {
   PFS_index_events_stages *result;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_events_stages);
@@ -493,8 +492,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_events_stages_history::index_init(uint idx MY_ATTRIBUTE((unused)),
-                                            bool) {
+int table_events_stages_history::index_init(uint idx [[maybe_unused]], bool) {
   PFS_index_events_stages *result;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_events_stages);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_events_statements.cc mysql-8.0-8.0.27/storage/perfschema/table_events_statements.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_events_statements.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_events_statements.cc	2021-09-28 11:46:34.000000000 +0000
@@ -792,7 +792,7 @@
   return global_thread_container.get_row_count() * statement_stack_max;
 }
 
-int table_events_statements_current::index_init(uint idx MY_ATTRIBUTE((unused)),
+int table_events_statements_current::index_init(uint idx [[maybe_unused]],
                                                 bool) {
   PFS_index_events_statements *result;
   assert(idx == 0);
@@ -952,7 +952,7 @@
          global_thread_container.get_row_count();
 }
 
-int table_events_statements_history::index_init(uint idx MY_ATTRIBUTE((unused)),
+int table_events_statements_history::index_init(uint idx [[maybe_unused]],
                                                 bool) {
   PFS_index_events_statements *result;
   assert(idx == 0);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_events_transactions.cc mysql-8.0-8.0.27/storage/perfschema/table_events_transactions.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_events_transactions.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_events_transactions.cc	2021-09-28 11:46:34.000000000 +0000
@@ -558,8 +558,8 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_events_transactions_current::index_init(
-    uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_events_transactions_current::index_init(uint idx [[maybe_unused]],
+                                                  bool) {
   PFS_index_events_transactions *result;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_events_transactions);
@@ -677,8 +677,8 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_events_transactions_history::index_init(
-    uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_events_transactions_history::index_init(uint idx [[maybe_unused]],
+                                                  bool) {
   PFS_index_events_transactions *result;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_events_transactions);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_events_waits.cc mysql-8.0-8.0.27/storage/perfschema/table_events_waits.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_events_waits.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_events_waits.cc	2021-09-28 11:46:34.000000000 +0000
@@ -936,8 +936,9 @@
   m_next_pos.reset();
 }
 
-PFS_events_waits *table_events_waits_current::get_wait(
-    PFS_thread *pfs_thread, uint index_2 MY_ATTRIBUTE((unused))) {
+PFS_events_waits *table_events_waits_current::get_wait(PFS_thread *pfs_thread,
+                                                       uint index_2
+                                                       [[maybe_unused]]) {
   PFS_events_waits *wait;
 
   /*
@@ -1020,8 +1021,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_events_waits_current::index_init(uint idx MY_ATTRIBUTE((unused)),
-                                           bool) {
+int table_events_waits_current::index_init(uint idx [[maybe_unused]], bool) {
   PFS_index_events_waits *result;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_events_waits);
@@ -1165,8 +1165,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_events_waits_history::index_init(uint idx MY_ATTRIBUTE((unused)),
-                                           bool) {
+int table_events_waits_history::index_init(uint idx [[maybe_unused]], bool) {
   PFS_index_events_waits *result;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_events_waits);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_ews_by_account_by_event_name.cc mysql-8.0-8.0.27/storage/perfschema/table_ews_by_account_by_event_name.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_ews_by_account_by_event_name.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_ews_by_account_by_event_name.cc	2021-09-28 11:46:34.000000000 +0000
@@ -234,8 +234,8 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_ews_by_account_by_event_name::index_init(
-    uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_ews_by_account_by_event_name::index_init(uint idx [[maybe_unused]],
+                                                   bool) {
   PFS_index_ews_by_account_by_event_name *result = nullptr;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_ews_by_account_by_event_name);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_ews_by_host_by_event_name.cc mysql-8.0-8.0.27/storage/perfschema/table_ews_by_host_by_event_name.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_ews_by_host_by_event_name.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_ews_by_host_by_event_name.cc	2021-09-28 11:46:34.000000000 +0000
@@ -229,7 +229,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_ews_by_host_by_event_name::index_init(uint idx MY_ATTRIBUTE((unused)),
+int table_ews_by_host_by_event_name::index_init(uint idx [[maybe_unused]],
                                                 bool) {
   PFS_index_ews_by_host_by_event_name *result = nullptr;
   assert(idx == 0);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_ews_by_thread_by_event_name.cc mysql-8.0-8.0.27/storage/perfschema/table_ews_by_thread_by_event_name.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_ews_by_thread_by_event_name.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_ews_by_thread_by_event_name.cc	2021-09-28 11:46:34.000000000 +0000
@@ -223,8 +223,8 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_ews_by_thread_by_event_name::index_init(
-    uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_ews_by_thread_by_event_name::index_init(uint idx [[maybe_unused]],
+                                                  bool) {
   PFS_index_ews_by_thread_by_event_name *result = nullptr;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_ews_by_thread_by_event_name);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_ews_by_user_by_event_name.cc mysql-8.0-8.0.27/storage/perfschema/table_ews_by_user_by_event_name.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_ews_by_user_by_event_name.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_ews_by_user_by_event_name.cc	2021-09-28 11:46:34.000000000 +0000
@@ -228,7 +228,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_ews_by_user_by_event_name::index_init(uint idx MY_ATTRIBUTE((unused)),
+int table_ews_by_user_by_event_name::index_init(uint idx [[maybe_unused]],
                                                 bool) {
   PFS_index_ews_by_user_by_event_name *result = nullptr;
   assert(idx == 0);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_ews_global_by_event_name.cc mysql-8.0-8.0.27/storage/perfschema/table_ews_global_by_event_name.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_ews_global_by_event_name.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_ews_global_by_event_name.cc	2021-09-28 11:46:34.000000000 +0000
@@ -268,7 +268,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_ews_global_by_event_name::index_init(uint idx MY_ATTRIBUTE((unused)),
+int table_ews_global_by_event_name::index_init(uint idx [[maybe_unused]],
                                                bool) {
   PFS_index_ews_global_by_event_name *result = nullptr;
   assert(idx == 0);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_file_summary_by_event_name.cc mysql-8.0-8.0.27/storage/perfschema/table_file_summary_by_event_name.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_file_summary_by_event_name.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_file_summary_by_event_name.cc	2021-09-28 11:46:34.000000000 +0000
@@ -155,8 +155,8 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_file_summary_by_event_name::index_init(
-    uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_file_summary_by_event_name::index_init(uint idx [[maybe_unused]],
+                                                 bool) {
   PFS_index_file_summary_by_event_name *result = nullptr;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_file_summary_by_event_name);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_global_status.cc mysql-8.0-8.0.27/storage/perfschema/table_global_status.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_global_status.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_global_status.cc	2021-09-28 11:46:34.000000000 +0000
@@ -146,7 +146,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_global_status::index_init(uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_global_status::index_init(uint idx [[maybe_unused]], bool) {
   /* Build a cache of all global status variables. Sum across threads. */
   m_status_cache.materialize_global();
 
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_global_variables.cc mysql-8.0-8.0.27/storage/perfschema/table_global_variables.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_global_variables.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_global_variables.cc	2021-09-28 11:46:34.000000000 +0000
@@ -142,7 +142,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_global_variables::index_init(uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_global_variables::index_init(uint idx [[maybe_unused]], bool) {
   /*
     Build a list of system variables from the global system variable hash.
     Filter by scope.
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_host_cache.cc mysql-8.0-8.0.27/storage/perfschema/table_host_cache.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_host_cache.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_host_cache.cc	2021-09-28 11:46:34.000000000 +0000
@@ -70,10 +70,10 @@
     "  COUNT_INIT_CONNECT_ERRORS BIGINT not null,\n"
     "  COUNT_LOCAL_ERRORS BIGINT not null,\n"
     "  COUNT_UNKNOWN_ERRORS BIGINT not null,\n"
-    "  FIRST_SEEN TIMESTAMP(0) NOT NULL default 0,\n"
-    "  LAST_SEEN TIMESTAMP(0) NOT NULL default 0,\n"
-    "  FIRST_ERROR_SEEN TIMESTAMP(0) null default 0,\n"
-    "  LAST_ERROR_SEEN TIMESTAMP(0) null default 0,\n"
+    "  FIRST_SEEN TIMESTAMP(0) not null,\n"
+    "  LAST_SEEN TIMESTAMP(0) not null,\n"
+    "  FIRST_ERROR_SEEN TIMESTAMP(0) null,\n"
+    "  LAST_ERROR_SEEN TIMESTAMP(0) null,\n"
     "  PRIMARY KEY (IP) USING HASH,\n"
     "  KEY (HOST) USING HASH\n",
     /* Options */
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_log_status.cc mysql-8.0-8.0.27/storage/perfschema/table_log_status.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_log_status.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_log_status.cc	2021-09-28 11:46:34.000000000 +0000
@@ -97,7 +97,7 @@
   return res;
 }
 
-int table_log_status::rnd_pos(const void *pos MY_ATTRIBUTE((unused))) {
+int table_log_status::rnd_pos(const void *pos [[maybe_unused]]) {
   int res = HA_ERR_RECORD_DELETED;
 
   set_position(pos);
@@ -310,10 +310,10 @@
   return error ? HA_ERR_RECORD_DELETED : 0;
 }
 
-int table_log_status::read_row_values(TABLE *table MY_ATTRIBUTE((unused)),
-                                      unsigned char *buf MY_ATTRIBUTE((unused)),
-                                      Field **fields MY_ATTRIBUTE((unused)),
-                                      bool read_all MY_ATTRIBUTE((unused))) {
+int table_log_status::read_row_values(TABLE *table [[maybe_unused]],
+                                      unsigned char *buf [[maybe_unused]],
+                                      Field **fields [[maybe_unused]],
+                                      bool read_all [[maybe_unused]]) {
   Field *f;
 
   assert(table->s->null_bytes == 0);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_mems_by_account_by_event_name.cc mysql-8.0-8.0.27/storage/perfschema/table_mems_by_account_by_event_name.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_mems_by_account_by_event_name.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_mems_by_account_by_event_name.cc	2021-09-28 11:46:34.000000000 +0000
@@ -175,8 +175,8 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_mems_by_account_by_event_name::index_init(
-    uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_mems_by_account_by_event_name::index_init(uint idx [[maybe_unused]],
+                                                    bool) {
   PFS_index_mems_by_account_by_event_name *result = nullptr;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_mems_by_account_by_event_name);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_mems_by_host_by_event_name.cc mysql-8.0-8.0.27/storage/perfschema/table_mems_by_host_by_event_name.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_mems_by_host_by_event_name.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_mems_by_host_by_event_name.cc	2021-09-28 11:46:34.000000000 +0000
@@ -168,8 +168,8 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_mems_by_host_by_event_name::index_init(
-    uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_mems_by_host_by_event_name::index_init(uint idx [[maybe_unused]],
+                                                 bool) {
   PFS_index_mems_by_host_by_event_name *result = nullptr;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_mems_by_host_by_event_name);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_mems_by_thread_by_event_name.cc mysql-8.0-8.0.27/storage/perfschema/table_mems_by_thread_by_event_name.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_mems_by_thread_by_event_name.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_mems_by_thread_by_event_name.cc	2021-09-28 11:46:34.000000000 +0000
@@ -166,8 +166,8 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_mems_by_thread_by_event_name::index_init(
-    uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_mems_by_thread_by_event_name::index_init(uint idx [[maybe_unused]],
+                                                   bool) {
   assert(idx == 0);
   m_opened_index = PFS_NEW(PFS_index_mems_by_thread_by_event_name);
   m_index = m_opened_index;
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_mems_by_user_by_event_name.cc mysql-8.0-8.0.27/storage/perfschema/table_mems_by_user_by_event_name.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_mems_by_user_by_event_name.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_mems_by_user_by_event_name.cc	2021-09-28 11:46:34.000000000 +0000
@@ -168,8 +168,8 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_mems_by_user_by_event_name::index_init(
-    uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_mems_by_user_by_event_name::index_init(uint idx [[maybe_unused]],
+                                                 bool) {
   PFS_index_mems_by_user_by_event_name *result = nullptr;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_mems_by_user_by_event_name);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_mems_global_by_event_name.cc mysql-8.0-8.0.27/storage/perfschema/table_mems_global_by_event_name.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_mems_global_by_event_name.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_mems_global_by_event_name.cc	2021-09-28 11:46:34.000000000 +0000
@@ -177,7 +177,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_mems_global_by_event_name::index_init(uint idx MY_ATTRIBUTE((unused)),
+int table_mems_global_by_event_name::index_init(uint idx [[maybe_unused]],
                                                 bool) {
   PFS_index_mems_global_by_event_name *result = nullptr;
   assert(idx == 0);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_os_global_by_type.cc mysql-8.0-8.0.27/storage/perfschema/table_os_global_by_type.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_os_global_by_type.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_os_global_by_type.cc	2021-09-28 11:46:34.000000000 +0000
@@ -215,7 +215,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_os_global_by_type::index_init(uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_os_global_by_type::index_init(uint idx [[maybe_unused]], bool) {
   PFS_index_os_global_by_type *result;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_os_global_by_type);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_persisted_variables.cc mysql-8.0-8.0.27/storage/perfschema/table_persisted_variables.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_persisted_variables.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_persisted_variables.cc	2021-09-28 11:46:34.000000000 +0000
@@ -143,8 +143,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_persisted_variables::index_init(uint idx MY_ATTRIBUTE((unused)),
-                                          bool) {
+int table_persisted_variables::index_init(uint idx [[maybe_unused]], bool) {
   /*
     Build a cache of system variables for this thread.
   */
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_processlist.cc mysql-8.0-8.0.27/storage/perfschema/table_processlist.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_processlist.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_processlist.cc	2021-09-28 11:46:34.000000000 +0000
@@ -119,7 +119,7 @@
   return 0;
 }
 
-int table_processlist::rnd_init(bool scan MY_ATTRIBUTE((unused))) {
+int table_processlist::rnd_init(bool scan [[maybe_unused]]) {
   set_access();
   return 0;
 }
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_processlist.h mysql-8.0-8.0.27/storage/perfschema/table_processlist.h
--- mysql-8.0-8.0.26/storage/perfschema/table_processlist.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_processlist.h	2021-09-28 11:46:34.000000000 +0000
@@ -117,7 +117,7 @@
  protected:
   table_processlist();
 
-  int rnd_init(bool scan MY_ATTRIBUTE((unused))) override;
+  int rnd_init(bool scan [[maybe_unused]]) override;
 
   int index_init(uint idx, bool sorted) override;
   int read_row_values(TABLE *table, unsigned char *buf, Field **fields,
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_replication_applier_configuration.cc mysql-8.0-8.0.27/storage/perfschema/table_replication_applier_configuration.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_replication_applier_configuration.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_replication_applier_configuration.cc	2021-09-28 11:46:34.000000000 +0000
@@ -170,8 +170,9 @@
   return res;
 }
 
-int table_replication_applier_configuration::index_init(
-    uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_replication_applier_configuration::index_init(uint idx
+                                                        [[maybe_unused]],
+                                                        bool) {
   PFS_index_rpl_applier_config *result = nullptr;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_rpl_applier_config);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_replication_applier_filters.cc mysql-8.0-8.0.27/storage/perfschema/table_replication_applier_filters.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_replication_applier_filters.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_replication_applier_filters.cc	2021-09-28 11:46:34.000000000 +0000
@@ -60,8 +60,8 @@
     "  CONFIGURED_BY ENUM('STARTUP_OPTIONS','CHANGE_REPLICATION_FILTER',\n"
     "                     'STARTUP_OPTIONS_FOR_CHANNEL',\n"
     "                     'CHANGE_REPLICATION_FILTER_FOR_CHANNEL') not null,\n"
-    "  ACTIVE_SINCE TIMESTAMP(6) NOT NULL default 0,\n"
-    "  COUNTER bigint(20) unsigned NOT NULL default 0\n",
+    "  ACTIVE_SINCE TIMESTAMP(6) not null,\n"
+    "  COUNTER bigint(20) unsigned not null default 0\n",
     /* Options */
     " ENGINE=PERFORMANCE_SCHEMA",
     /* Tablespace */
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_replication_applier_global_filters.cc mysql-8.0-8.0.27/storage/perfschema/table_replication_applier_global_filters.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_replication_applier_global_filters.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_replication_applier_global_filters.cc	2021-09-28 11:46:34.000000000 +0000
@@ -58,7 +58,7 @@
     "  FILTER_RULE LONGTEXT not null,\n"
     "  CONFIGURED_BY ENUM('STARTUP_OPTIONS',\n"
     "                     'CHANGE_REPLICATION_FILTER') not null,\n"
-    "  ACTIVE_SINCE TIMESTAMP(6) NOT NULL default 0\n",
+    "  ACTIVE_SINCE TIMESTAMP(6) not null\n",
     /* Options */
     " ENGINE=PERFORMANCE_SCHEMA",
     /* Tablespace */
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_replication_applier_status_by_coordinator.cc mysql-8.0-8.0.27/storage/perfschema/table_replication_applier_status_by_coordinator.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_replication_applier_status_by_coordinator.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_replication_applier_status_by_coordinator.cc	2021-09-28 11:46:34.000000000 +0000
@@ -123,7 +123,7 @@
     mysql_mutex_lock(&mi->rli->data_lock);
 
     if (mi->rli->slave_running) {
-      PSI_thread *psi MY_ATTRIBUTE((unused)) = thd_get_psi(mi->rli->info_thd);
+      PSI_thread *psi [[maybe_unused]] = thd_get_psi(mi->rli->info_thd);
 #ifdef HAVE_PSI_THREAD_INTERFACE
       if (psi != nullptr) {
         row.thread_id = PSI_THREAD_CALL(get_thread_internal_id)(psi);
@@ -275,7 +275,7 @@
   m_row.thread_id_is_null = true;
 
   if (mi->rli->slave_running) {
-    PSI_thread *psi MY_ATTRIBUTE((unused)) = thd_get_psi(mi->rli->info_thd);
+    PSI_thread *psi [[maybe_unused]] = thd_get_psi(mi->rli->info_thd);
 #ifdef HAVE_PSI_THREAD_INTERFACE
     if (psi != nullptr) {
       m_row.thread_id = PSI_THREAD_CALL(get_thread_internal_id)(psi);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_replication_applier_status_by_worker.cc mysql-8.0-8.0.27/storage/perfschema/table_replication_applier_status_by_worker.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_replication_applier_status_by_worker.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_replication_applier_status_by_worker.cc	2021-09-28 11:46:34.000000000 +0000
@@ -168,7 +168,7 @@
     if (mi->rli->slave_running) {
       /* STS will use SQL thread as workers on this table */
       if (mi->rli->get_worker_count() == 0) {
-        PSI_thread *psi MY_ATTRIBUTE((unused)) = thd_get_psi(mi->rli->info_thd);
+        PSI_thread *psi [[maybe_unused]] = thd_get_psi(mi->rli->info_thd);
 #ifdef HAVE_PSI_THREAD_INTERFACE
         if (psi != nullptr) {
           row.thread_id = PSI_THREAD_CALL(get_thread_internal_id)(psi);
@@ -198,7 +198,7 @@
 
     if (mi->rli->slave_running) {
       if (worker) {
-        PSI_thread *psi MY_ATTRIBUTE((unused)) = thd_get_psi(worker->info_thd);
+        PSI_thread *psi [[maybe_unused]] = thd_get_psi(worker->info_thd);
 #ifdef HAVE_PSI_THREAD_INTERFACE
         if (psi != nullptr) {
           row.thread_id = PSI_THREAD_CALL(get_thread_internal_id)(psi);
@@ -435,7 +435,7 @@
          m_row.channel_name_length);
 
   if (mi->rli->slave_running) {
-    PSI_thread *psi MY_ATTRIBUTE((unused)) = thd_get_psi(mi->rli->info_thd);
+    PSI_thread *psi [[maybe_unused]] = thd_get_psi(mi->rli->info_thd);
 #ifdef HAVE_PSI_THREAD_INTERFACE
     if (psi != nullptr) {
       m_row.thread_id = PSI_THREAD_CALL(get_thread_internal_id)(psi);
@@ -486,7 +486,7 @@
 
   mysql_mutex_lock(&w->jobs_lock);
   if (w->running_status == Slave_worker::RUNNING) {
-    PSI_thread *psi MY_ATTRIBUTE((unused)) = thd_get_psi(w->info_thd);
+    PSI_thread *psi [[maybe_unused]] = thd_get_psi(w->info_thd);
 #ifdef HAVE_PSI_THREAD_INTERFACE
     if (psi != nullptr) {
       m_row.thread_id = PSI_THREAD_CALL(get_thread_internal_id)(psi);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_replication_applier_status.cc mysql-8.0-8.0.27/storage/perfschema/table_replication_applier_status.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_replication_applier_status.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_replication_applier_status.cc	2021-09-28 11:46:34.000000000 +0000
@@ -152,8 +152,8 @@
   return res;
 }
 
-int table_replication_applier_status::index_init(
-    uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_replication_applier_status::index_init(uint idx [[maybe_unused]],
+                                                 bool) {
   PFS_index_rpl_applier_status *result = nullptr;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_rpl_applier_status);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_replication_asynchronous_connection_failover.cc mysql-8.0-8.0.27/storage/perfschema/table_replication_asynchronous_connection_failover.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_replication_asynchronous_connection_failover.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_replication_asynchronous_connection_failover.cc	2021-09-28 11:46:34.000000000 +0000
@@ -72,9 +72,7 @@
     "the highest weight and 1 the lowest.',\n"
     " MANAGED_NAME CHAR(64) CHARACTER SET utf8 COLLATE utf8_general_ci "
     "NOT NULL DEFAULT '' COMMENT 'The name of the group which this server "
-    "belongs to.',\n"
-    "  PRIMARY KEY(CHANNEL_NAME, HOST, PORT, NETWORK_NAMESPACE, MANAGED_NAME), "
-    "  KEY(Channel_name, Managed_name) \n",
+    "belongs to.'\n",
     /* Options */
     " ENGINE=PERFORMANCE_SCHEMA",
     /* Tablespace */
@@ -98,59 +96,6 @@
         false /* m_in_purgatory */
     };
 
-bool PFS_index_rpl_async_conn_failover::match(
-    RPL_FAILOVER_SOURCE_TUPLE source_conn_detail) {
-  DBUG_TRACE;
-  st_row_rpl_async_conn_failover row;
-  std::string channel_name;
-  std::string host;
-  uint port;
-  std::string network_namespace{};
-  std::string managed_name;
-
-  std::tie(channel_name, host, port, std::ignore, std::ignore, std::ignore) =
-      source_conn_detail;
-  channel_map.rdlock();
-  Master_info *mi = channel_map.get_mi(channel_name.c_str());
-  if (nullptr != mi) {
-    network_namespace.assign(mi->network_namespace_str());
-  }
-  channel_map.unlock();
-
-  row.channel_name_length = channel_name.length();
-  memcpy(row.channel_name, channel_name.c_str(), row.channel_name_length);
-  if (!m_key_1.match_not_null(row.channel_name, row.channel_name_length)) {
-    return false;
-  }
-
-  row.host_length = host.length();
-  memcpy(row.host, host.c_str(), row.host_length);
-  if (!m_key_2.match_not_null(row.host, row.host_length)) {
-    return false;
-  }
-
-  row.port = port;
-  if (!m_key_3.match(row.port)) {
-    return false;
-  }
-
-  row.network_namespace_length = network_namespace.length();
-  memcpy(row.network_namespace, network_namespace.c_str(),
-         row.network_namespace_length);
-  if (!m_key_4.match_not_null(row.network_namespace,
-                              row.network_namespace_length)) {
-    return false;
-  }
-
-  row.managed_name_length = managed_name.length();
-  memcpy(row.managed_name, managed_name.c_str(), row.managed_name_length);
-  if (!m_key_5.match_not_null(row.managed_name, row.managed_name_length)) {
-    return false;
-  }
-
-  return true;
-}
-
 PFS_engine_table *table_replication_asynchronous_connection_failover::create(
     PFS_engine_table_share *) {
   return new table_replication_asynchronous_connection_failover();
@@ -158,44 +103,48 @@
 
 table_replication_asynchronous_connection_failover::
     table_replication_asynchronous_connection_failover()
-    : PFS_engine_table(&m_share, &m_pos),
-      m_pos(0),
-      m_next_pos(0),
-      read_error{false} {}
+    : PFS_engine_table(&m_share, &m_pos), m_pos(0), m_next_pos(0) {}
 
 table_replication_asynchronous_connection_failover::
     ~table_replication_asynchronous_connection_failover() = default;
 
 void table_replication_asynchronous_connection_failover::reset_position(void) {
   DBUG_TRACE;
-  m_pos = 0;
-  m_next_pos = 0;
+  m_pos.m_index = 0;
+  m_next_pos.m_index = 0;
+  m_source_conn_detail.clear();
+  table_replication_asynchronous_connection_failover::num_rows = 0;
 }
 
 ha_rows table_replication_asynchronous_connection_failover::get_row_count() {
   DBUG_TRACE;
-  return (ha_rows)table_replication_asynchronous_connection_failover::num_rows;
+  return table_replication_asynchronous_connection_failover::num_rows;
 }
 
 int table_replication_asynchronous_connection_failover::rnd_init(bool) {
   DBUG_TRACE;
+  bool error{true};
+
   Rpl_async_conn_failover_table_operations table_op(TL_READ);
-  std::tie(read_error, source_conn_detail) = table_op.read_source_random_rows();
+  std::tie(error, m_source_conn_detail) = table_op.read_source_random_rows();
+  if (error) {
+    table_replication_asynchronous_connection_failover::num_rows = 0;
+    m_source_conn_detail.clear();
+    return HA_ERR_INTERNAL_ERROR;
+  }
+
+  table_replication_asynchronous_connection_failover::num_rows =
+      m_source_conn_detail.size();
   return 0;
 }
 
 int table_replication_asynchronous_connection_failover::rnd_next(void) {
   DBUG_TRACE;
-  if (read_error) return 1;
 
-  table_replication_asynchronous_connection_failover::num_rows =
-      source_conn_detail.size();
-
-  for (m_pos.set_at(&m_next_pos); m_pos.m_index < source_conn_detail.size();
-       m_pos.next()) {
-    auto source_conn_tuple = source_conn_detail[m_pos.m_index];
+  m_pos.set_at(&m_next_pos);
+  if (m_pos.m_index < m_source_conn_detail.size()) {
     m_next_pos.set_after(&m_pos);
-    return make_row(source_conn_tuple);
+    return make_row(m_pos.m_index);
   }
 
   return HA_ERR_END_OF_FILE;
@@ -204,92 +153,64 @@
 int table_replication_asynchronous_connection_failover::rnd_pos(
     const void *pos) {
   DBUG_TRACE;
-  RPL_FAILOVER_SOURCE_TUPLE source_conn_tuple;
-  bool error{false};
-  int res{HA_ERR_RECORD_DELETED};
 
   set_position(pos);
-  auto upos = std::to_string(m_pos.m_index);
-  Rpl_async_conn_failover_table_operations table_op(TL_READ);
-  std::tie(error, source_conn_tuple) =
-      table_op.read_source_random_rows_pos(upos);
-
-  table_replication_asynchronous_connection_failover::num_rows = 1;
-  if (error) return res;
-
-  res = make_row(source_conn_tuple);
-  return res;
-}
-
-int table_replication_asynchronous_connection_failover::index_init(
-    uint idx MY_ATTRIBUTE((unused)), bool) {
-  DBUG_TRACE;
-  PFS_index_rpl_async_conn_failover *result = nullptr;
-  assert(idx == 0);
-  result = PFS_NEW(PFS_index_rpl_async_conn_failover);
-  m_opened_index = result;
-  m_index = result;
-
-  Rpl_async_conn_failover_table_operations table_op(TL_READ);
-  std::tie(read_error, source_conn_detail) = table_op.read_source_all_rows();
-
-  return 0;
-}
-
-int table_replication_asynchronous_connection_failover::index_next(void) {
-  DBUG_TRACE;
-  if (read_error) return 1;
-
-  table_replication_asynchronous_connection_failover::num_rows =
-      source_conn_detail.size();
-
-  for (m_pos.set_at(&m_next_pos); m_pos.m_index < source_conn_detail.size();
-       m_pos.next()) {
-    auto source_conn_tuple = source_conn_detail[m_pos.m_index];
-    if (m_opened_index->match(source_conn_tuple)) {
-      m_next_pos.set_after(&m_pos);
-      return make_row(source_conn_tuple);
-    }
+  assert(m_pos.m_index < m_source_conn_detail.size());
+  if (m_pos.m_index < m_source_conn_detail.size()) {
+    return make_row(m_pos.m_index);
   }
 
   return HA_ERR_END_OF_FILE;
 }
 
-int table_replication_asynchronous_connection_failover::make_row(
-    RPL_FAILOVER_SOURCE_TUPLE source_tuple) {
+int table_replication_asynchronous_connection_failover::make_row(uint index) {
   DBUG_TRACE;
-  std::string channel{};
-  std::string host{};
-  std::string network_namespace{};
-  uint port;
-  uint weight;
-  std::string managed_name{};
-
-  std::tie(channel, host, port, std::ignore, weight, managed_name) =
-      source_tuple;
-  channel_map.rdlock();
-  Master_info *mi = channel_map.get_mi(channel.c_str());
-  if (nullptr != mi) {
-    network_namespace.assign(mi->network_namespace_str());
-  }
-  channel_map.unlock();
 
-  m_row.channel_name_length = channel.length();
-  memcpy(m_row.channel_name, channel.c_str(), channel.length());
+  m_row.channel_name_length = 0;
+  m_row.host_length = 0;
+  m_row.port = 0;
+  m_row.network_namespace_length = 0;
+  m_row.weight = 0;
+  m_row.managed_name_length = 0;
+
+  if (index >= m_source_conn_detail.size()) {
+    return HA_ERR_END_OF_FILE;
+  } else {
+    std::string channel{};
+    std::string host{};
+    std::string network_namespace{};
+    uint port;
+    uint weight;
+    std::string managed_name{};
+
+    auto source_tuple = m_source_conn_detail[index];
+    std::tie(channel, host, port, std::ignore, weight, managed_name) =
+        source_tuple;
+
+    channel_map.rdlock();
+    Master_info *mi = channel_map.get_mi(channel.c_str());
+    if (nullptr != mi) {
+      network_namespace.assign(mi->network_namespace_str());
+    }
+    channel_map.unlock();
+
+    m_row.channel_name_length = channel.length();
+    memcpy(m_row.channel_name, channel.c_str(), channel.length());
 
-  m_row.host_length = host.length();
-  memcpy(m_row.host, host.c_str(), host.length());
+    m_row.host_length = host.length();
+    memcpy(m_row.host, host.c_str(), host.length());
 
-  m_row.port = port;
+    m_row.port = port;
 
-  m_row.network_namespace_length = network_namespace.length();
-  memcpy(m_row.network_namespace, network_namespace.c_str(),
-         network_namespace.length());
+    m_row.network_namespace_length = network_namespace.length();
+    memcpy(m_row.network_namespace, network_namespace.c_str(),
+           network_namespace.length());
 
-  m_row.weight = weight;
+    m_row.weight = weight;
 
-  m_row.managed_name_length = managed_name.length();
-  memcpy(m_row.managed_name, managed_name.c_str(), managed_name.length());
+    m_row.managed_name_length = managed_name.length();
+    memcpy(m_row.managed_name, managed_name.c_str(), managed_name.length());
+  }
 
   return 0;
 }
@@ -301,6 +222,10 @@
   assert(table->s->null_bytes == 1);
   buf[0] = 0;
 
+  if (m_pos.m_index >= m_source_conn_detail.size()) {
+    return HA_ERR_END_OF_FILE;
+  }
+
   for (Field *f = nullptr; (f = *fields); fields++) {
     if (read_all || bitmap_is_set(table->read_set, f->field_index())) {
       switch (f->field_index()) {
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_replication_asynchronous_connection_failover.h mysql-8.0-8.0.27/storage/perfschema/table_replication_asynchronous_connection_failover.h
--- mysql-8.0-8.0.26/storage/perfschema/table_replication_asynchronous_connection_failover.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_replication_asynchronous_connection_failover.h	2021-09-28 11:46:34.000000000 +0000
@@ -68,34 +68,6 @@
   uint managed_name_length;
 };
 
-class PFS_index_rpl_async_conn_failover : public PFS_engine_index {
- public:
-  PFS_index_rpl_async_conn_failover()
-      : PFS_engine_index(&m_key_1, &m_key_2, &m_key_3, &m_key_4, &m_key_5),
-        m_key_1("CHANNEL_NAME"),
-        m_key_2("HOST"),
-        m_key_3("PORT"),
-        m_key_4("NETWORK_NAMESPACE"),
-        m_key_5("MANAGED_NAME") {}
-
-  ~PFS_index_rpl_async_conn_failover() override = default;
-
-  /**
-    Match fetched row with searched values.
-
-    @param source_conn_detail  the tuple contains source network configuration
-                               details to be matched.
-  */
-  virtual bool match(RPL_FAILOVER_SOURCE_TUPLE source_conn_detail);
-
- private:
-  PFS_key_name m_key_1;  // channel_name key
-  PFS_key_name m_key_2;  // host key
-  PFS_key_port m_key_3;  // port key
-  PFS_key_name m_key_4;  // network_namespace key
-  PFS_key_name m_key_5;  // managed_name key
-};
-
 /**
   Table
   PERFORMANCE_SCHEMA.TABLE_REPLICATION_ASYNCHRONOUS_CONNECTION_FAILOVER.
@@ -106,7 +78,17 @@
   typedef PFS_simple_index pos_t;
 
  private:
-  int make_row(RPL_FAILOVER_SOURCE_TUPLE source_tuple);
+  /**
+    Stores current row (i.e.index) values for the table into m_row struct
+    members. This stored data is read later through read_row_values().
+
+    @param[in] index  current row position.
+
+    @return Operation status
+      @retval 0     Success
+      @retval != 0  Error (error code returned)
+  */
+  int make_row(uint index);
 
   /** Table share lock. */
   static THR_LOCK m_table_lock;
@@ -127,10 +109,10 @@
   /**
     Read the current row values.
 
-    @param table            Table handle
-    @param buf              row buffer
-    @param fields           Table fields
-    @param read_all         true if all columns are read.
+    @param[in] table            Table handle
+    @param[in] buf              row buffer
+    @param[in] fields           Table fields
+    @param[in] read_all         true if all columns are read.
   */
   int read_row_values(TABLE *table, unsigned char *buf, Field **fields,
                       bool read_all) override;
@@ -146,7 +128,7 @@
   /**
     Open table function.
 
-    @param tbs  Table share object
+    @param[in] tbs  Table share object
   */
   static PFS_engine_table *create(PFS_engine_table_share *tbs);
 
@@ -163,8 +145,8 @@
   /**
     Initialize table for random read or scan.
 
-    @param scan  if true: Initialize for random scans through rnd_next()
-                 if false: Initialize for random reads through rnd_pos()
+    @param[in] scan  if true: Initialize for random scans through rnd_next()
+                     if false: Initialize for random reads through rnd_pos()
 
     @return Operation status
       @retval 0     Success
@@ -184,7 +166,7 @@
   /**
     Read row via random scan from position.
 
-    @param      pos  Position from position() call
+    @param[in]      pos  Position from position() call
 
     @return Operation status
       @retval 0     Success
@@ -192,36 +174,9 @@
   */
   int rnd_pos(const void *pos) override;
 
-  /**
-    Initialize use of index.
-
-    @param idx     Index to use
-    @param sorted  Use sorted order
-
-    @return Operation status
-      @retval 0     Success
-      @retval != 0  Error (error code returned)
-  */
-  int index_init(uint idx, bool sorted) override;
-
-  /**
-    Read next row via random scan.
-
-    @return Operation status
-      @retval 0     Success
-      @retval != 0  Error (error code returned)
-  */
-  int index_next() override;
-
  private:
-  /* Index object to get match searched values */
-  PFS_index_rpl_async_conn_failover *m_opened_index;
-
   /* Stores the data being read i.e. source connection details. */
-  RPL_FAILOVER_SOURCE_LIST source_conn_detail;
-
-  /* Stores error happened while reading rows */
-  bool read_error;
+  RPL_FAILOVER_SOURCE_LIST m_source_conn_detail{};
 
   /* Stores the current number of rows read. */
   static ha_rows num_rows;
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_replication_connection_configuration.cc mysql-8.0-8.0.27/storage/perfschema/table_replication_connection_configuration.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_replication_connection_configuration.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_replication_connection_configuration.cc	2021-09-28 11:46:34.000000000 +0000
@@ -68,7 +68,7 @@
     "  SSL_CRL_PATH VARCHAR(255) not null,\n"
     "  CONNECTION_RETRY_INTERVAL INTEGER not null,\n"
     "  CONNECTION_RETRY_COUNT BIGINT unsigned not null,\n"
-    "  HEARTBEAT_INTERVAL DOUBLE(10,3) unsigned not null\n"
+    "  HEARTBEAT_INTERVAL DOUBLE(10,3) not null\n"
     "  COMMENT 'Number of seconds after which a heartbeat will be sent .',\n"
     "  TLS_VERSION VARCHAR(255) not null,\n"
     "  PUBLIC_KEY_PATH VARCHAR(512) not null,\n"
@@ -82,6 +82,9 @@
     "algorithm.',\n"
     "  TLS_CIPHERSUITES TEXT CHARACTER SET utf8 COLLATE utf8_bin NULL,\n"
     "  SOURCE_CONNECTION_AUTO_FAILOVER ENUM('1','0') not null,\n"
+    "  GTID_ONLY ENUM('1','0') not null\n"
+    "  COMMENT 'Indicates if this channel only uses GTIDs and does not persist "
+    "positions.',\n"
     "  PRIMARY KEY (channel_name) USING HASH\n",
     /* Options */
     " ENGINE=PERFORMANCE_SCHEMA",
@@ -182,8 +185,9 @@
   return res;
 }
 
-int table_replication_connection_configuration::index_init(
-    uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_replication_connection_configuration::index_init(uint idx
+                                                           [[maybe_unused]],
+                                                           bool) {
   PFS_index_rpl_connection_config *result = nullptr;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_rpl_connection_config);
@@ -320,6 +324,8 @@
     m_row.source_connection_auto_failover = PS_RPL_NO;
   }
 
+  m_row.gtid_only = mi->is_gtid_only_mode() ? PS_RPL_YES : PS_RPL_NO;
+
   mysql_mutex_unlock(&mi->rli->data_lock);
   mysql_mutex_unlock(&mi->data_lock);
 
@@ -429,6 +435,9 @@
         case 25: /** source_connection_auto_failover */
           set_field_enum(f, m_row.source_connection_auto_failover);
           break;
+        case 26: /** gtid_only */
+          set_field_enum(f, m_row.gtid_only);
+          break;
         default:
           assert(false);
       }
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_replication_connection_configuration.h mysql-8.0-8.0.27/storage/perfschema/table_replication_connection_configuration.h
--- mysql-8.0-8.0.26/storage/perfschema/table_replication_connection_configuration.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_replication_connection_configuration.h	2021-09-28 11:46:34.000000000 +0000
@@ -115,6 +115,8 @@
   */
   std::pair<bool, std::string> tls_ciphersuites = {true, ""};
   enum_rpl_yes_no source_connection_auto_failover{PS_RPL_NO};
+  /*PS_RPL_NO if gtid_only is disabled, PS_RPL_YES if enabled */
+  enum_rpl_yes_no gtid_only{PS_RPL_NO};
 };
 
 class PFS_index_rpl_connection_config : public PFS_engine_index {
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_replication_connection_status.cc mysql-8.0-8.0.27/storage/perfschema/table_replication_connection_status.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_replication_connection_status.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_replication_connection_status.cc	2021-09-28 11:46:34.000000000 +0000
@@ -159,7 +159,7 @@
     row.thread_id = 0;
 
     if (mi->slave_running == MYSQL_SLAVE_RUN_CONNECT) {
-      PSI_thread *psi MY_ATTRIBUTE((unused)) = thd_get_psi(mi->info_thd);
+      PSI_thread *psi [[maybe_unused]] = thd_get_psi(mi->info_thd);
 #ifdef HAVE_PSI_THREAD_INTERFACE
       if (psi != nullptr) {
         row.thread_id = PSI_THREAD_CALL(get_thread_internal_id)(psi);
@@ -331,7 +331,7 @@
   }
 
   if (mi->slave_running == MYSQL_SLAVE_RUN_CONNECT) {
-    PSI_thread *psi MY_ATTRIBUTE((unused)) = thd_get_psi(mi->info_thd);
+    PSI_thread *psi [[maybe_unused]] = thd_get_psi(mi->info_thd);
 #ifdef HAVE_PSI_THREAD_INTERFACE
     if (psi != nullptr) {
       m_row.thread_id = PSI_THREAD_CALL(get_thread_internal_id)(psi);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_replication_group_members.cc mysql-8.0-8.0.27/storage/perfschema/table_replication_group_members.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_replication_group_members.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_replication_group_members.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+  Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
 
   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,
@@ -119,6 +119,17 @@
   memcpy(row->member_role, &value, length);
 }
 
+static void set_member_communication_stack(void *const context,
+                                           const char &value, size_t length) {
+  struct st_row_group_members *row =
+      static_cast<struct st_row_group_members *>(context);
+  const size_t max = NAME_LEN;
+  length = std::min(length, max);
+
+  row->member_communication_stack_length = length;
+  memcpy(row->member_communication_stack, &value, length);
+}
+
 THR_LOCK table_replication_group_members::m_table_lock;
 
 Plugin_table table_replication_group_members::m_table_def(
@@ -133,7 +144,9 @@
     "  MEMBER_PORT INTEGER,\n"
     "  MEMBER_STATE CHAR(64) collate utf8mb4_bin not null,\n"
     "  MEMBER_ROLE CHAR(64) collate utf8mb4_bin not null,\n"
-    "  MEMBER_VERSION CHAR(64) collate utf8mb4_bin not null\n",
+    "  MEMBER_VERSION CHAR(64) collate utf8mb4_bin not null,\n"
+    "  MEMBER_COMMUNICATION_STACK CHAR(64) collate utf8mb4_bin not "
+    "null\n",
     /* Options */
     " ENGINE=PERFORMANCE_SCHEMA",
     /* Tablespace */
@@ -207,12 +220,13 @@
   m_row.member_state_length = 0;
   m_row.member_version_length = 0;
   m_row.member_role_length = 0;
+  m_row.member_communication_stack_length = 0;
 
   // Set callbacks on GROUP_REPLICATION_GROUP_MEMBERS_CALLBACKS.
   const GROUP_REPLICATION_GROUP_MEMBERS_CALLBACKS callbacks = {
       &m_row,           &set_channel_name,   &set_member_id,
       &set_member_host, &set_member_port,    &set_member_state,
-      &set_member_role, &set_member_version,
+      &set_member_role, &set_member_version, &set_member_communication_stack,
   };
 
   // Query plugin and let callbacks do their job.
@@ -262,6 +276,10 @@
           set_field_char_utf8(f, m_row.member_version,
                               m_row.member_version_length);
           break;
+        case 7: /** member_incoming_protocol */
+          set_field_char_utf8(f, m_row.member_communication_stack,
+                              m_row.member_communication_stack_length);
+          break;
         default:
           assert(false);
       }
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_replication_group_members.h mysql-8.0-8.0.27/storage/perfschema/table_replication_group_members.h
--- mysql-8.0-8.0.26/storage/perfschema/table_replication_group_members.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_replication_group_members.h	2021-09-28 11:46:34.000000000 +0000
@@ -67,6 +67,8 @@
   uint member_role_length;
   char member_version[NAME_LEN];
   uint member_version_length;
+  char member_communication_stack[NAME_LEN];
+  uint member_communication_stack_length;
 };
 
 /** Table PERFORMANCE_SCHEMA.replication_group_members. */
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_rpl_async_connection_failover_managed.cc mysql-8.0-8.0.27/storage/perfschema/table_rpl_async_connection_failover_managed.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_rpl_async_connection_failover_managed.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_rpl_async_connection_failover_managed.cc	2021-09-28 11:46:34.000000000 +0000
@@ -65,8 +65,7 @@
     "For Managed_type = GroupReplication, Configuration value should contain "
     "{\"Primary_weight\": 80, \"Secondary_weight\": 60}, so that it assigns "
     "weight=80 to PRIMARY of the group, and weight=60 for rest of the members "
-    "in mysql.replication_asynchronous_connection_failover table.',\n"
-    "  PRIMARY KEY(CHANNEL_NAME, MANAGED_NAME) \n",
+    "in mysql.replication_asynchronous_connection_failover table.'\n",
     /* Options */
     " ENGINE=PERFORMANCE_SCHEMA",
     /* Tablespace */
@@ -89,31 +88,6 @@
     false /* m_in_purgatory */
 };
 
-bool PFS_index_rpl_async_conn_failover_managed::match(
-    RPL_FAILOVER_MANAGED_JSON_TUPLE source_managed_tuple) {
-  DBUG_TRACE;
-  st_row_rpl_async_conn_failover_managed row;
-  std::string channel_name;
-  std::string managed_name;
-
-  std::tie(channel_name, managed_name, std::ignore, std::ignore) =
-      source_managed_tuple;
-
-  row.channel_name_length = channel_name.length();
-  memcpy(row.channel_name, channel_name.c_str(), row.channel_name_length);
-  if (!m_key_1.match_not_null(row.channel_name, row.channel_name_length)) {
-    return false;
-  }
-
-  row.managed_name_length = managed_name.length();
-  memcpy(row.managed_name, managed_name.c_str(), row.managed_name_length);
-  if (!m_key_2.match_not_null(row.managed_name, row.managed_name_length)) {
-    return false;
-  }
-
-  return true;
-}
-
 PFS_engine_table *table_rpl_async_connection_failover_managed::create(
     PFS_engine_table_share *) {
   return new table_rpl_async_connection_failover_managed();
@@ -121,30 +95,35 @@
 
 table_rpl_async_connection_failover_managed::
     table_rpl_async_connection_failover_managed()
-    : PFS_engine_table(&m_share, &m_pos),
-      m_pos(0),
-      m_next_pos(0),
-      read_error{false} {}
+    : PFS_engine_table(&m_share, &m_pos), m_pos(0), m_next_pos(0) {}
 
 table_rpl_async_connection_failover_managed::
     ~table_rpl_async_connection_failover_managed() = default;
 
 void table_rpl_async_connection_failover_managed::reset_position(void) {
   DBUG_TRACE;
-  m_pos = 0;
-  m_next_pos = 0;
+  m_pos.m_index = 0;
+  m_next_pos.m_index = 0;
+  m_source_managed_list.clear();
+  table_rpl_async_connection_failover_managed::num_rows = 0;
 }
 
 ha_rows table_rpl_async_connection_failover_managed::get_row_count() {
   DBUG_TRACE;
-  return (ha_rows)table_rpl_async_connection_failover_managed::num_rows;
+  return table_rpl_async_connection_failover_managed::num_rows;
 }
 
 int table_rpl_async_connection_failover_managed::rnd_init(bool) {
   DBUG_TRACE;
+
   Rpl_async_conn_failover_table_operations table_op(TL_READ);
   std::vector<RPL_FAILOVER_MANAGED_TUPLE> source_list;
-  read_error = table_op.read_managed_random_rows(source_list);
+  auto error = table_op.read_managed_random_rows(source_list);
+  if (error) {
+    m_source_managed_list.clear();
+    table_rpl_async_connection_failover_managed::num_rows = 0;
+    return HA_ERR_INTERNAL_ERROR;
+  }
 
   for (auto source_detail : source_list) {
     std::stringstream json_str;
@@ -157,7 +136,9 @@
     if (res_dom == nullptr ||
         res_dom->json_type() != enum_json_type::J_OBJECT) {
       my_error(ER_INVALID_USER_ATTRIBUTE_JSON, MYF(0));
-      return 1;
+      m_source_managed_list.clear();
+      table_rpl_async_connection_failover_managed::num_rows = 0;
+      return HA_ERR_INTERNAL_ERROR;
     }
 
     Json_object_ptr res_obj_ptr(down_cast<Json_object *>(res_dom.release()));
@@ -170,23 +151,22 @@
         std::make_tuple(std::get<0>(source_detail), std::get<1>(source_detail),
                         std::get<2>(source_detail), wrapper);
 
-    source_managed_list.push_back(source_mng_detail);
+    m_source_managed_list.push_back(source_mng_detail);
   }
+
+  table_rpl_async_connection_failover_managed::num_rows =
+      m_source_managed_list.size();
+
   return 0;
 }
 
 int table_rpl_async_connection_failover_managed::rnd_next(void) {
   DBUG_TRACE;
-  if (read_error) return 1;
-
-  table_rpl_async_connection_failover_managed::num_rows =
-      source_managed_list.size();
 
-  for (m_pos.set_at(&m_next_pos); m_pos.m_index < source_managed_list.size();
-       m_pos.next()) {
-    auto source_managed_tuple = source_managed_list[m_pos.m_index];
+  m_pos.set_at(&m_next_pos);
+  if (m_pos.m_index < m_source_managed_list.size()) {
     m_next_pos.set_after(&m_pos);
-    return make_row(source_managed_tuple);
+    return make_row(m_pos.m_index);
   }
 
   return HA_ERR_END_OF_FILE;
@@ -194,107 +174,47 @@
 
 int table_rpl_async_connection_failover_managed::rnd_pos(const void *pos) {
   DBUG_TRACE;
-  RPL_FAILOVER_MANAGED_JSON_TUPLE source_managed_tuple;
-  bool error{false};
-  int res{HA_ERR_RECORD_DELETED};
 
   set_position(pos);
-  auto upos = std::to_string(m_pos.m_index);
-  Rpl_async_conn_failover_table_operations table_op(TL_READ);
-  std::tie(error, source_managed_tuple) =
-      table_op.read_managed_random_rows_pos(upos);
-
-  table_rpl_async_connection_failover_managed::num_rows = 1;
-  if (error) return res;
+  assert(m_pos.m_index < m_source_managed_list.size());
+  if (m_pos.m_index < m_source_managed_list.size()) {
+    return make_row(m_pos.m_index);
+  }
 
-  res = make_row(source_managed_tuple);
-  return res;
+  return HA_ERR_END_OF_FILE;
 }
 
-int table_rpl_async_connection_failover_managed::index_init(
-    uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_rpl_async_connection_failover_managed::make_row(uint index) {
   DBUG_TRACE;
-  PFS_index_rpl_async_conn_failover_managed *result = nullptr;
-  assert(idx == 0);
-  result = PFS_NEW(PFS_index_rpl_async_conn_failover_managed);
-  m_opened_index = result;
-  m_index = result;
 
-  Rpl_async_conn_failover_table_operations table_op(TL_READ);
+  m_row.channel_name_length = 0;
+  m_row.managed_name_length = 0;
+  m_row.managed_type_length = 0;
 
-  std::vector<RPL_FAILOVER_MANAGED_TUPLE> source_list;
-  read_error = table_op.read_managed_random_rows(source_list);
+  if (index >= m_source_managed_list.size()) {
+    return HA_ERR_END_OF_FILE;
+  } else {
+    std::string channel{};
+    std::string managed_name{};
+    std::string managed_type{};
+    Json_wrapper configuration;
 
-  for (auto source_detail : source_list) {
-    std::stringstream json_str;
-    json_str << "{\"Primary_weight\": " << std::get<3>(source_detail)
-             << ", \"Secondary_weight\": " << std::get<4>(source_detail) << "}";
+    auto managed_tuple = m_source_managed_list[index];
+    std::tie(channel, managed_name, managed_type, configuration) =
+        managed_tuple;
 
-    auto res_dom = Json_dom::parse(json_str.str().c_str(),
-                                   json_str.str().length(), nullptr, nullptr);
+    m_row.channel_name_length = channel.length();
+    memcpy(m_row.channel_name, channel.c_str(), channel.length());
 
-    if (res_dom == nullptr ||
-        res_dom->json_type() != enum_json_type::J_OBJECT) {
-      // my_error(ER_INVALID_USER_ATTRIBUTE_JSON, MYF(0));
-      return 1;
-    }
+    m_row.managed_name_length = managed_name.length();
+    memcpy(m_row.managed_name, managed_name.c_str(), managed_name.length());
 
-    Json_object_ptr res_obj_ptr(down_cast<Json_object *>(res_dom.release()));
-    Json_dom_ptr json_dom = create_dom_ptr<Json_object>();
-    Json_object *json_ob = down_cast<Json_object *>(json_dom.get());
-    json_ob->merge_patch(std::move(res_obj_ptr));
-    Json_wrapper wrapper(json_ob->clone());
-
-    auto source_mng_detail =
-        std::make_tuple(std::get<0>(source_detail), std::get<1>(source_detail),
-                        std::get<2>(source_detail), wrapper);
-
-    source_managed_list.push_back(source_mng_detail);
-  }
-  return 0;
-}
-
-int table_rpl_async_connection_failover_managed::index_next(void) {
-  DBUG_TRACE;
-  if (read_error) return 1;
+    m_row.managed_type_length = managed_type.length();
+    memcpy(m_row.managed_type, managed_type.c_str(), managed_type.length());
 
-  table_rpl_async_connection_failover_managed::num_rows =
-      source_managed_list.size();
-
-  for (m_pos.set_at(&m_next_pos); m_pos.m_index < source_managed_list.size();
-       m_pos.next()) {
-    auto source_managed_tuple = source_managed_list[m_pos.m_index];
-    if (m_opened_index->match(source_managed_tuple)) {
-      m_next_pos.set_after(&m_pos);
-      return make_row(source_managed_tuple);
-    }
+    m_row.configuration = Json_wrapper(configuration);
   }
 
-  return HA_ERR_END_OF_FILE;
-}
-
-int table_rpl_async_connection_failover_managed::make_row(
-    RPL_FAILOVER_MANAGED_JSON_TUPLE source_tuple) {
-  DBUG_TRACE;
-  std::string channel{};
-  std::string managed_name{};
-  std::string managed_type{};
-  Json_wrapper configuration;
-  Json_object json_config;
-
-  std::tie(channel, managed_name, managed_type, configuration) = source_tuple;
-
-  m_row.channel_name_length = channel.length();
-  memcpy(m_row.channel_name, channel.c_str(), channel.length());
-
-  m_row.managed_name_length = managed_name.length();
-  memcpy(m_row.managed_name, managed_name.c_str(), managed_name.length());
-
-  m_row.managed_type_length = managed_type.length();
-  memcpy(m_row.managed_type, managed_type.c_str(), managed_type.length());
-
-  m_row.configuration = Json_wrapper(configuration);
-
   return 0;
 }
 
@@ -305,6 +225,10 @@
   assert(table->s->null_bytes == 1);
   buf[0] = 0;
 
+  if (m_pos.m_index >= m_source_managed_list.size()) {
+    return HA_ERR_END_OF_FILE;
+  }
+
   for (Field *f = nullptr; (f = *fields); fields++) {
     if (read_all || bitmap_is_set(table->read_set, f->field_index())) {
       switch (f->field_index()) {
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_rpl_async_connection_failover_managed.h mysql-8.0-8.0.27/storage/perfschema/table_rpl_async_connection_failover_managed.h
--- mysql-8.0-8.0.26/storage/perfschema/table_rpl_async_connection_failover_managed.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_rpl_async_connection_failover_managed.h	2021-09-28 11:46:34.000000000 +0000
@@ -65,28 +65,6 @@
   Json_wrapper configuration;
 };
 
-class PFS_index_rpl_async_conn_failover_managed : public PFS_engine_index {
- public:
-  PFS_index_rpl_async_conn_failover_managed()
-      : PFS_engine_index(&m_key_1, &m_key_2),
-        m_key_1("CHANNEL_NAME"),
-        m_key_2("MANAGED_NAME") {}
-
-  ~PFS_index_rpl_async_conn_failover_managed() override = default;
-
-  /**
-    Match fetched row with searched values.
-
-    @param source_managed_tuple  the tuple contains source network configuration
-                                 details to be matched.
-  */
-  virtual bool match(RPL_FAILOVER_MANAGED_JSON_TUPLE source_managed_tuple);
-
- private:
-  PFS_key_name m_key_1;  // channel_name key
-  PFS_key_name m_key_2;  // managed_name key
-};
-
 /**
   Table
   PERFORMANCE_SCHEMA.TABLE_RPL_ASYNC_CONNECTION_FAILOVER_MANAGED.
@@ -96,7 +74,17 @@
   typedef PFS_simple_index pos_t;
 
  private:
-  int make_row(RPL_FAILOVER_MANAGED_JSON_TUPLE source_managed_tuple);
+  /**
+    Stores current row (i.e.index) values for the table into m_row struct
+    members. This stored data is read later through read_row_values().
+
+    @param[in] index  current row position.
+
+    @return Operation status
+      @retval 0     Success
+      @retval != 0  Error (error code returned)
+  */
+  int make_row(uint index);
 
   /** Table share lock. */
   static THR_LOCK m_table_lock;
@@ -117,10 +105,14 @@
   /**
     Read the current row values.
 
-    @param table            Table handle
-    @param buf              row buffer
-    @param fields           Table fields
-    @param read_all         true if all columns are read.
+    @param[in] table            Table handle
+    @param[in] buf              row buffer
+    @param[in] fields           Table fields
+    @param[in] read_all         true if all columns are read.
+
+    @return Operation status
+      @retval 0     Success
+      @retval != 0  Error (error code returned)
   */
   int read_row_values(TABLE *table, unsigned char *buf, Field **fields,
                       bool read_all) override;
@@ -136,7 +128,7 @@
   /**
     Open table function.
 
-    @param tbs  Table share object
+    @param[in] tbs  Table share object
   */
   static PFS_engine_table *create(PFS_engine_table_share *tbs);
 
@@ -153,8 +145,8 @@
   /**
     Initialize table for random read or scan.
 
-    @param scan  if true: Initialize for random scans through rnd_next()
-                 if false: Initialize for random reads through rnd_pos()
+    @param[in] scan  if true: Initialize for random scans through rnd_next()
+                     if false: Initialize for random reads through rnd_pos()
 
     @return Operation status
       @retval 0     Success
@@ -174,7 +166,7 @@
   /**
     Read row via random scan from position.
 
-    @param      pos  Position from position() call
+    @param[in]      pos  Position from position() call
 
     @return Operation status
       @retval 0     Success
@@ -182,36 +174,9 @@
   */
   int rnd_pos(const void *pos) override;
 
-  /**
-    Initialize use of index.
-
-    @param idx     Index to use
-    @param sorted  Use sorted order
-
-    @return Operation status
-      @retval 0     Success
-      @retval != 0  Error (error code returned)
-  */
-  int index_init(uint idx, bool sorted) override;
-
-  /**
-    Read next row via random scan.
-
-    @return Operation status
-      @retval 0     Success
-      @retval != 0  Error (error code returned)
-  */
-  int index_next() override;
-
  private:
-  /* Index object to get match searched values */
-  PFS_index_rpl_async_conn_failover_managed *m_opened_index;
-
   /* Stores the data being read i.e. source connection details. */
-  std::vector<RPL_FAILOVER_MANAGED_JSON_TUPLE> source_managed_list;
-
-  /* Stores error happened while reading rows */
-  bool read_error;
+  std::vector<RPL_FAILOVER_MANAGED_JSON_TUPLE> m_source_managed_list{};
 
   /* Stores the current number of rows read. */
   static ha_rows num_rows;
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_session_connect.cc mysql-8.0-8.0.27/storage/perfschema/table_session_connect.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_session_connect.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_session_connect.cc	2021-09-28 11:46:34.000000000 +0000
@@ -71,7 +71,7 @@
   my_free(m_copy_session_connect_attrs);
 }
 
-int table_session_connect::index_init(uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_session_connect::index_init(uint idx [[maybe_unused]], bool) {
   assert(idx == 0);
   m_opened_index = PFS_NEW(PFS_index_session_connect);
   m_index = m_opened_index;
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_session_status.cc mysql-8.0-8.0.27/storage/perfschema/table_session_status.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_session_status.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_session_status.cc	2021-09-28 11:46:34.000000000 +0000
@@ -144,7 +144,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_session_status::index_init(uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_session_status::index_init(uint idx [[maybe_unused]], bool) {
   /* Build a cache of all status variables for this thread. */
   m_status_cache.materialize_all(current_thd);
 
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_session_variables.cc mysql-8.0-8.0.27/storage/perfschema/table_session_variables.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_session_variables.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_session_variables.cc	2021-09-28 11:46:34.000000000 +0000
@@ -144,7 +144,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_session_variables::index_init(uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_session_variables::index_init(uint idx [[maybe_unused]], bool) {
   /*
     Build a cache of system variables for this thread.
   */
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_setup_actors.cc mysql-8.0-8.0.27/storage/perfschema/table_setup_actors.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_setup_actors.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_setup_actors.cc	2021-09-28 11:46:34.000000000 +0000
@@ -202,7 +202,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_setup_actors::index_init(uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_setup_actors::index_init(uint idx [[maybe_unused]], bool) {
   PFS_index_setup_actors *result = nullptr;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_setup_actors);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_setup_consumers.cc mysql-8.0-8.0.27/storage/perfschema/table_setup_consumers.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_setup_consumers.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_setup_consumers.cc	2021-09-28 11:46:34.000000000 +0000
@@ -187,7 +187,7 @@
   return 0;
 }
 
-int table_setup_consumers::index_init(uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_setup_consumers::index_init(uint idx [[maybe_unused]], bool) {
   PFS_index_setup_consumers *result = nullptr;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_setup_consumers);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_setup_instruments.cc mysql-8.0-8.0.27/storage/perfschema/table_setup_instruments.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_setup_instruments.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_setup_instruments.cc	2021-09-28 11:46:34.000000000 +0000
@@ -255,7 +255,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_setup_instruments::index_init(uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_setup_instruments::index_init(uint idx [[maybe_unused]], bool) {
   PFS_index_setup_instruments *result;
 
   assert(idx == 0);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_setup_objects.cc mysql-8.0-8.0.27/storage/perfschema/table_setup_objects.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_setup_objects.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_setup_objects.cc	2021-09-28 11:46:34.000000000 +0000
@@ -251,7 +251,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_setup_objects::index_init(uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_setup_objects::index_init(uint idx [[maybe_unused]], bool) {
   PFS_index_setup_objects *result = nullptr;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_setup_objects);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_setup_threads.cc mysql-8.0-8.0.27/storage/perfschema/table_setup_threads.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_setup_threads.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_setup_threads.cc	2021-09-28 11:46:34.000000000 +0000
@@ -137,7 +137,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_setup_threads::index_init(uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_setup_threads::index_init(uint idx [[maybe_unused]], bool) {
   PFS_index_setup_threads *result;
 
   assert(idx == 0);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_socket_summary_by_event_name.cc mysql-8.0-8.0.27/storage/perfschema/table_socket_summary_by_event_name.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_socket_summary_by_event_name.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_socket_summary_by_event_name.cc	2021-09-28 11:46:34.000000000 +0000
@@ -154,8 +154,8 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_socket_summary_by_event_name::index_init(
-    uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_socket_summary_by_event_name::index_init(uint idx [[maybe_unused]],
+                                                   bool) {
   PFS_index_socket_summary_by_event_name *result = nullptr;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_socket_summary_by_event_name);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_status_by_account.cc mysql-8.0-8.0.27/storage/perfschema/table_status_by_account.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_status_by_account.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_status_by_account.cc	2021-09-28 11:46:34.000000000 +0000
@@ -178,7 +178,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_status_by_account::index_init(uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_status_by_account::index_init(uint idx [[maybe_unused]], bool) {
   /* Build array of SHOW_VARs from the global status array prior to
    * materializing. */
   m_status_cache.initialize_client_session();
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_status_by_host.cc mysql-8.0-8.0.27/storage/perfschema/table_status_by_host.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_status_by_host.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_status_by_host.cc	2021-09-28 11:46:34.000000000 +0000
@@ -173,7 +173,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_status_by_host::index_init(uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_status_by_host::index_init(uint idx [[maybe_unused]], bool) {
   /* Build array of SHOW_VARs from the global status array prior to
    * materializing. */
   m_status_cache.initialize_client_session();
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_status_by_thread.cc mysql-8.0-8.0.27/storage/perfschema/table_status_by_thread.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_status_by_thread.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_status_by_thread.cc	2021-09-28 11:46:34.000000000 +0000
@@ -170,7 +170,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_status_by_thread::index_init(uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_status_by_thread::index_init(uint idx [[maybe_unused]], bool) {
   /* Build array of SHOW_VARs from the global status array. */
   m_status_cache.initialize_session();
 
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_status_by_user.cc mysql-8.0-8.0.27/storage/perfschema/table_status_by_user.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_status_by_user.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_status_by_user.cc	2021-09-28 11:46:34.000000000 +0000
@@ -174,7 +174,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_status_by_user::index_init(uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_status_by_user::index_init(uint idx [[maybe_unused]], bool) {
   /* Build array of SHOW_VARs from the global status array. */
   m_status_cache.initialize_client_session();
 
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_tiws_by_index_usage.cc mysql-8.0-8.0.27/storage/perfschema/table_tiws_by_index_usage.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_tiws_by_index_usage.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_tiws_by_index_usage.cc	2021-09-28 11:46:34.000000000 +0000
@@ -229,8 +229,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_tiws_by_index_usage::index_init(uint idx MY_ATTRIBUTE((unused)),
-                                          bool) {
+int table_tiws_by_index_usage::index_init(uint idx [[maybe_unused]], bool) {
   PFS_index_tiws_by_index_usage *result = nullptr;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_tiws_by_index_usage);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_tiws_by_table.cc mysql-8.0-8.0.27/storage/perfschema/table_tiws_by_table.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_tiws_by_table.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_tiws_by_table.cc	2021-09-28 11:46:34.000000000 +0000
@@ -188,7 +188,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_tiws_by_table::index_init(uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_tiws_by_table::index_init(uint idx [[maybe_unused]], bool) {
   PFS_index_tiws_by_table *result = nullptr;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_tiws_by_table);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_tlws_by_table.cc mysql-8.0-8.0.27/storage/perfschema/table_tlws_by_table.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_tlws_by_table.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_tlws_by_table.cc	2021-09-28 11:46:34.000000000 +0000
@@ -218,7 +218,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_tlws_by_table::index_init(uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_tlws_by_table::index_init(uint idx [[maybe_unused]], bool) {
   PFS_index_tlws_by_table *result = nullptr;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_tlws_by_table);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_uvar_by_thread.cc mysql-8.0-8.0.27/storage/perfschema/table_uvar_by_thread.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_uvar_by_thread.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_uvar_by_thread.cc	2021-09-28 11:46:34.000000000 +0000
@@ -56,7 +56,6 @@
       return false;
     }
 
-    mysql_mutex_lock(&thd->LOCK_thd_data);
     return true;
   }
 
@@ -233,7 +232,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_uvar_by_thread::index_init(uint idx MY_ATTRIBUTE((unused)), bool) {
+int table_uvar_by_thread::index_init(uint idx [[maybe_unused]], bool) {
   PFS_index_uvar_by_thread *result = nullptr;
   assert(idx == 0);
   result = PFS_NEW(PFS_index_uvar_by_thread);
@@ -287,13 +286,12 @@
   }
 
   Find_thd_user_var finder(unsafe_thd);
-  THD *safe_thd = Global_THD_manager::get_instance()->find_thd(&finder);
-  if (safe_thd == nullptr) {
+  THD_ptr safe_thd = Global_THD_manager::get_instance()->find_thd(&finder);
+  if (!safe_thd) {
     return 1;
   }
 
-  m_THD_cache.materialize(thread, safe_thd);
-  mysql_mutex_unlock(&safe_thd->LOCK_thd_data);
+  m_THD_cache.materialize(thread, safe_thd.get());
   return 0;
 }
 
diff -Nru mysql-8.0-8.0.26/storage/perfschema/table_variables_by_thread.cc mysql-8.0-8.0.27/storage/perfschema/table_variables_by_thread.cc
--- mysql-8.0-8.0.26/storage/perfschema/table_variables_by_thread.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/table_variables_by_thread.cc	2021-09-28 11:46:34.000000000 +0000
@@ -166,8 +166,7 @@
   return HA_ERR_RECORD_DELETED;
 }
 
-int table_variables_by_thread::index_init(uint idx MY_ATTRIBUTE((unused)),
-                                          bool) {
+int table_variables_by_thread::index_init(uint idx [[maybe_unused]], bool) {
   /* Build array of SHOW_VARs from the system variable hash. */
   m_sysvar_cache.initialize_session();
 
diff -Nru mysql-8.0-8.0.26/storage/perfschema/unittest/pfs_host-oom-t.cc mysql-8.0-8.0.27/storage/perfschema/unittest/pfs_host-oom-t.cc
--- mysql-8.0-8.0.26/storage/perfschema/unittest/pfs_host-oom-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/unittest/pfs_host-oom-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -116,10 +116,11 @@
       PSI_CURRENT_THREAD_VERSION);
 
   PSI_thread_key thread_key_1;
-  PSI_thread_info all_thread[] = {{&thread_key_1, "T-1", 0, 0, ""}};
+  PSI_thread_info all_thread[] = {{&thread_key_1, "T-1", "T-1", 0, 0, ""}};
   thread_service->register_thread("test", all_thread, 1);
 
-  PSI_thread *thread_1 = thread_service->new_thread(thread_key_1, nullptr, 0);
+  PSI_thread *thread_1 =
+      thread_service->new_thread(thread_key_1, 0, nullptr, 0);
   thread_service->set_thread(thread_1);
 
   /* Tests */
diff -Nru mysql-8.0-8.0.26/storage/perfschema/unittest/pfs_instr_class-t.cc mysql-8.0-8.0.27/storage/perfschema/unittest/pfs_instr_class-t.cc
--- mysql-8.0-8.0.26/storage/perfschema/unittest/pfs_instr_class-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/unittest/pfs_instr_class-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -67,8 +67,9 @@
   PSI_cond_info_v1 cond_info;
   memset(&cond_info, 0, sizeof(cond_info));
 
-  PSI_thread_info_v1 thread_info;
+  PSI_thread_info_v5 thread_info;
   memset(&thread_info, 0, sizeof(thread_info));
+  thread_info.m_os_name = "OS_NAME";
 
   PSI_file_info_v1 file_info;
   memset(&file_info, 0, sizeof(file_info));
@@ -338,8 +339,9 @@
   int rc;
   PFS_thread_key key;
   PFS_thread_class *thread;
-  PSI_thread_info_v1 thread_info;
+  PSI_thread_info_v5 thread_info;
   memset(&thread_info, 0, sizeof(thread_info));
+  thread_info.m_os_name = "OS_NAME";
 
   rc = init_thread_class(5);
   ok(rc == 0, "room for 5 thread");
diff -Nru mysql-8.0-8.0.26/storage/perfschema/unittest/pfs_instr-oom-t.cc mysql-8.0-8.0.27/storage/perfschema/unittest/pfs_instr-oom-t.cc
--- mysql-8.0-8.0.26/storage/perfschema/unittest/pfs_instr-oom-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/unittest/pfs_instr-oom-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -40,7 +40,7 @@
 #include "unittest/mytap/tap.h"
 
 PSI_thread_key thread_key_1;
-PSI_thread_info all_thread[] = {{&thread_key_1, "T-1", 0, 0, ""}};
+PSI_thread_info all_thread[] = {{&thread_key_1, "T-1", "T-1", 0, 0, ""}};
 
 /** Simulate initialize_performance_schema(). */
 
@@ -179,23 +179,39 @@
   dummy_mutex_class.m_event_name_index = 0;
   dummy_mutex_class.m_flags = 0;
   dummy_mutex_class.m_enabled = true;
+  dummy_mutex_class.m_timed = true;
   dummy_mutex_class.m_volatility = PSI_VOLATILITY_UNKNOWN;
+
   dummy_rwlock_class.m_event_name_index = 1;
   dummy_rwlock_class.m_flags = 0;
   dummy_rwlock_class.m_enabled = true;
+  dummy_rwlock_class.m_timed = true;
   dummy_rwlock_class.m_volatility = PSI_VOLATILITY_UNKNOWN;
+
+  dummy_thread_class.m_enabled = 0;
+  dummy_thread_class.m_flags = 0;
+  dummy_thread_class.m_singleton = nullptr;
+  dummy_thread_class.m_history = 0;
+  snprintf(dummy_thread_class.m_os_name, PFS_MAX_OS_NAME_LENGTH, "OS_NAME");
+
   dummy_cond_class.m_event_name_index = 2;
   dummy_cond_class.m_flags = 0;
   dummy_cond_class.m_enabled = true;
+  dummy_cond_class.m_timed = true;
   dummy_cond_class.m_volatility = PSI_VOLATILITY_UNKNOWN;
+
   dummy_file_class.m_event_name_index = 3;
   dummy_file_class.m_flags = 0;
   dummy_file_class.m_enabled = true;
+  dummy_file_class.m_timed = true;
   dummy_file_class.m_volatility = PSI_VOLATILITY_UNKNOWN;
+
   dummy_socket_class.m_event_name_index = 4;
   dummy_socket_class.m_flags = 0;
   dummy_socket_class.m_enabled = true;
+  dummy_socket_class.m_timed = true;
   dummy_socket_class.m_volatility = PSI_VOLATILITY_UNKNOWN;
+
   dummy_table_share.m_enabled = true;
   dummy_table_share.m_timed = true;
 
@@ -237,21 +253,21 @@
   ok(cond_2 == nullptr, "oom (create cond)");
 
   /* Create file. */
+  stub_alloc_always_fails = false;
   PFS_thread fake_thread;
   rc = init_instruments(&param);
+  ok(rc == 0, "instances init");
   fake_thread.m_filename_hash_pins = nullptr;
   init_file_hash(&param);
+  file_1 =
+      find_or_create_file(&fake_thread, &dummy_file_class, "dummy1", 6, true);
+  ok(file_1 != nullptr, "create file");
+  release_file(file_1);
 
   stub_alloc_always_fails = true;
   file_2 =
-      find_or_create_file(&fake_thread, &dummy_file_class, "dummy", 5, true);
+      find_or_create_file(&fake_thread, &dummy_file_class, "dummy2", 6, true);
   ok(file_2 == nullptr, "oom (create file)");
-
-  stub_alloc_always_fails = false;
-  file_1 =
-      find_or_create_file(&fake_thread, &dummy_file_class, "dummy", 5, true);
-  ok(file_1 != nullptr, "create file");
-  release_file(file_1);
   cleanup_instruments();
 
   /* Create socket. */
@@ -282,13 +298,13 @@
   /* Create thread. */
   stub_alloc_always_fails = false;
   rc = init_instruments(&param);
-  thread_1 = create_thread(&dummy_thread_class, nullptr, 0);
+  thread_1 = create_thread(&dummy_thread_class, 12, nullptr, 0);
   ok(thread_1 != nullptr, "create thread");
   destroy_thread(thread_1);
   cleanup_instruments();
 
   stub_alloc_always_fails = true;
-  thread_2 = create_thread(&dummy_thread_class, nullptr, 0);
+  thread_2 = create_thread(&dummy_thread_class, 12, nullptr, 0);
   ok(thread_2 == nullptr, "oom (create thread)");
 
   PSI_thread *thread;
@@ -301,7 +317,7 @@
   param.m_file_class_sizing = 50;
   thread_service = initialize_performance_schema_helper(&param);
   stub_alloc_fails_after_count = 2;
-  thread = thread_service->new_thread(thread_key_1, nullptr, 0);
+  thread = thread_service->new_thread(thread_key_1, 12, nullptr, 0);
   ok(thread == nullptr, "oom (per thread wait)");
 
   cleanup_sync_class();
@@ -315,7 +331,7 @@
   param.m_events_waits_history_sizing = 10;
   thread_service = initialize_performance_schema_helper(&param);
   stub_alloc_fails_after_count = 3;
-  thread = thread_service->new_thread(thread_key_1, nullptr, 0);
+  thread = thread_service->new_thread(thread_key_1, 12, nullptr, 0);
   ok(thread == nullptr, "oom (thread waits history sizing)");
 
   cleanup_thread_class();
@@ -326,7 +342,7 @@
   param.m_stage_class_sizing = 50;
   thread_service = initialize_performance_schema_helper(&param);
   stub_alloc_fails_after_count = 3;
-  thread = thread_service->new_thread(thread_key_1, nullptr, 0);
+  thread = thread_service->new_thread(thread_key_1, 12, nullptr, 0);
   ok(thread == nullptr, "oom (per thread stages)");
 
   cleanup_stage_class();
@@ -338,7 +354,7 @@
   param.m_events_stages_history_sizing = 10;
   thread_service = initialize_performance_schema_helper(&param);
   stub_alloc_fails_after_count = 3;
-  thread = thread_service->new_thread(thread_key_1, nullptr, 0);
+  thread = thread_service->new_thread(thread_key_1, 12, nullptr, 0);
   ok(thread == nullptr, "oom (thread stages history sizing)");
 
   cleanup_instruments();
@@ -350,7 +366,7 @@
   thread_service = initialize_performance_schema_helper(&param);
   init_statement_class(param.m_statement_class_sizing);
   stub_alloc_fails_after_count = 3;
-  thread = thread_service->new_thread(thread_key_1, nullptr, 0);
+  thread = thread_service->new_thread(thread_key_1, 12, nullptr, 0);
   ok(thread == nullptr, "oom (per thread statements)");
 
   cleanup_stage_class();
@@ -363,7 +379,7 @@
   param.m_events_statements_history_sizing = 10;
   thread_service = initialize_performance_schema_helper(&param);
   stub_alloc_fails_after_count = 3;
-  thread = thread_service->new_thread(thread_key_1, nullptr, 0);
+  thread = thread_service->new_thread(thread_key_1, 12, nullptr, 0);
   ok(thread == nullptr, "oom (thread statements history sizing)");
 
   cleanup_thread_class();
@@ -374,7 +390,7 @@
   thread_service = initialize_performance_schema_helper(&param);
   transaction_class_max = 1;  // set by register_global_classes();
   stub_alloc_fails_after_count = 3;
-  thread = thread_service->new_thread(thread_key_1, nullptr, 0);
+  thread = thread_service->new_thread(thread_key_1, 12, nullptr, 0);
   ok(thread == nullptr, "oom (per thread transactions)");
   transaction_class_max = 0;
 
@@ -386,7 +402,7 @@
   param.m_events_transactions_history_sizing = 10;
   thread_service = initialize_performance_schema_helper(&param);
   stub_alloc_fails_after_count = 3;
-  thread = thread_service->new_thread(thread_key_1, nullptr, 0);
+  thread = thread_service->new_thread(thread_key_1, 12, nullptr, 0);
   ok(thread == nullptr, "oom (thread transactions history sizing)");
 
   cleanup_thread_class();
@@ -444,7 +460,7 @@
 static void do_all_tests() { test_oom(); }
 
 int main(int, char **) {
-  plan(32);
+  plan(33);
   MY_INIT("pfs_instr-oom-t");
   do_all_tests();
   my_end(0);
diff -Nru mysql-8.0-8.0.26/storage/perfschema/unittest/pfs_instr-t.cc mysql-8.0-8.0.27/storage/perfschema/unittest/pfs_instr-t.cc
--- mysql-8.0-8.0.26/storage/perfschema/unittest/pfs_instr-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/unittest/pfs_instr-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -189,10 +189,10 @@
   ok(cond == nullptr, "no cond");
   ok(global_cond_container.m_lost == 2, "lost 2");
 
-  thread = create_thread(&dummy_thread_class, nullptr, 0);
+  thread = create_thread(&dummy_thread_class, 0, nullptr, 0);
   ok(thread == nullptr, "no thread");
   ok(global_thread_container.m_lost == 1, "lost 1");
-  thread = create_thread(&dummy_thread_class, nullptr, 0);
+  thread = create_thread(&dummy_thread_class, 0, nullptr, 0);
   ok(thread == nullptr, "no thread");
   ok(global_thread_container.m_lost == 2, "lost 2");
 
@@ -319,22 +319,37 @@
   dummy_mutex_class.m_event_name_index = 0;
   dummy_mutex_class.m_flags = 0;
   dummy_mutex_class.m_enabled = true;
+  dummy_mutex_class.m_timed = true;
   dummy_mutex_class.m_volatility = PSI_VOLATILITY_UNKNOWN;
+
   dummy_rwlock_class.m_event_name_index = 1;
   dummy_rwlock_class.m_flags = 0;
   dummy_rwlock_class.m_enabled = true;
+  dummy_rwlock_class.m_timed = true;
   dummy_rwlock_class.m_volatility = PSI_VOLATILITY_UNKNOWN;
+
   dummy_cond_class.m_event_name_index = 2;
   dummy_cond_class.m_flags = 0;
   dummy_cond_class.m_enabled = true;
+  dummy_cond_class.m_timed = true;
   dummy_cond_class.m_volatility = PSI_VOLATILITY_UNKNOWN;
+
+  dummy_thread_class.m_enabled = 0;
+  dummy_thread_class.m_flags = 0;
+  dummy_thread_class.m_singleton = nullptr;
+  dummy_thread_class.m_history = 0;
+  snprintf(dummy_thread_class.m_os_name, PFS_MAX_OS_NAME_LENGTH, "OS_NAME");
+
   dummy_file_class.m_event_name_index = 3;
   dummy_file_class.m_flags = 0;
   dummy_file_class.m_enabled = true;
+  dummy_file_class.m_timed = true;
   dummy_file_class.m_volatility = PSI_VOLATILITY_UNKNOWN;
+
   dummy_socket_class.m_event_name_index = 4;
   dummy_socket_class.m_flags = 0;
   dummy_socket_class.m_enabled = true;
+  dummy_socket_class.m_timed = true;
   dummy_socket_class.m_volatility = PSI_VOLATILITY_UNKNOWN;
 
   dummy_table_share.m_enabled = true;
@@ -382,17 +397,17 @@
   ok(cond_2 != nullptr, "cond");
   ok(global_cond_container.m_lost == 1, "no new loss");
 
-  thread_1 = create_thread(&dummy_thread_class, nullptr, 0);
+  thread_1 = create_thread(&dummy_thread_class, 0, nullptr, 0);
   ok(thread_1 != nullptr, "thread");
   ok(global_thread_container.m_lost == 0, "not lost");
-  thread_2 = create_thread(&dummy_thread_class, nullptr, 0);
+  thread_2 = create_thread(&dummy_thread_class, 0, nullptr, 0);
   ok(thread_2 != nullptr, "thread");
   ok(global_thread_container.m_lost == 0, "not lost");
-  thread_2 = create_thread(&dummy_thread_class, nullptr, 0);
+  thread_2 = create_thread(&dummy_thread_class, 0, nullptr, 0);
   ok(thread_2 == nullptr, "no thread");
   ok(global_thread_container.m_lost == 1, "lost 1");
   destroy_thread(thread_1);
-  thread_2 = create_thread(&dummy_thread_class, nullptr, 0);
+  thread_2 = create_thread(&dummy_thread_class, 0, nullptr, 0);
   ok(thread_2 != nullptr, "thread");
   ok(global_thread_container.m_lost == 1, "no new loss");
 
diff -Nru mysql-8.0-8.0.26/storage/perfschema/unittest/pfs_noop-t.cc mysql-8.0-8.0.27/storage/perfschema/unittest/pfs_noop-t.cc
--- mysql-8.0-8.0.26/storage/perfschema/unittest/pfs_noop-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/unittest/pfs_noop-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -98,7 +98,7 @@
   psi_table_service->close_table(nullptr, nullptr);
   psi_file_service->create_file(1, nullptr, 2);
   /* TODO: spawn thread */
-  thread = psi_thread_service->new_thread(1, nullptr, 2);
+  thread = psi_thread_service->new_thread(1, 0, nullptr, 2);
   ok(thread == nullptr, "no thread");
   psi_thread_service->set_thread_id(nullptr, 1);
   thread = psi_thread_service->get_thread();
diff -Nru mysql-8.0-8.0.26/storage/perfschema/unittest/pfs_server_stubs.cc mysql-8.0-8.0.27/storage/perfschema/unittest/pfs_server_stubs.cc
--- mysql-8.0-8.0.26/storage/perfschema/unittest/pfs_server_stubs.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/unittest/pfs_server_stubs.cc	2021-09-28 11:46:34.000000000 +0000
@@ -60,8 +60,8 @@
 
 SERVICE_TYPE(registry) * mysql_plugin_registry_acquire() { return nullptr; }
 
-int mysql_plugin_registry_release(SERVICE_TYPE(registry) *
-                                  reg MY_ATTRIBUTE((unused))) {
+int mysql_plugin_registry_release(SERVICE_TYPE(registry) * reg
+                                  [[maybe_unused]]) {
   return 0;
 }
 
diff -Nru mysql-8.0-8.0.26/storage/perfschema/unittest/pfs-t.cc mysql-8.0-8.0.27/storage/perfschema/unittest/pfs-t.cc
--- mysql-8.0-8.0.26/storage/perfschema/unittest/pfs-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/unittest/pfs-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -657,7 +657,7 @@
   */
 
   PSI_thread_key dummy_thread_key = 9999;
-  PSI_thread_info bad_thread_1[] = {{&dummy_thread_key, "X", 0, 0, ""}};
+  PSI_thread_info bad_thread_1[] = {{&dummy_thread_key, "X", "X", 0, 0, ""}};
 
   thread_service->register_thread("/", bad_thread_1, 1);
   ok(dummy_thread_key == 0, "zero key");
@@ -689,7 +689,7 @@
        "12345678901234567890123456789012345678901234567890"
        "12345678901234567890123456789012345678901234567890"
        "12345678901234567890",
-       0, 0, ""}};
+       "BAD", 0, 0, ""}};
 
   thread_service->register_thread("X", bad_thread_2, 1);
   ok(dummy_thread_key == 0, "zero key");
@@ -701,7 +701,7 @@
        "12345678901234567890123456789012345678901234567890"
        "12345678901234567890123456789012345678901234567890"
        "1234567890123456789",
-       0, 0, ""}};
+       "OK", 0, 0, ""}};
 
   thread_service->register_thread("XX", bad_thread_3, 1);
   ok(dummy_thread_key == 0, "zero key");
@@ -872,7 +872,7 @@
   PSI_socket_info all_socket[] = {{&socket_key_A, "S-A", 0, 0, ""}};
 
   PSI_thread_key thread_key_1;
-  PSI_thread_info all_thread[] = {{&thread_key_1, "T-1", 0, 0, ""}};
+  PSI_thread_info all_thread[] = {{&thread_key_1, "T-1", "T-1", 0, 0, ""}};
 
   mutex_service->register_mutex("test", all_mutex, 1);
   rwlock_service->register_rwlock("test", all_rwlock, 1);
@@ -895,7 +895,7 @@
 
   /* Preparation */
 
-  thread_1 = thread_service->new_thread(thread_key_1, nullptr, 0);
+  thread_1 = thread_service->new_thread(thread_key_1, 12, nullptr, 0);
   ok(thread_1 != nullptr, "T-1");
   thread_service->set_thread_id(thread_1, 1);
 
@@ -1312,7 +1312,7 @@
   PSI_socket_info all_socket[] = {{&socket_key_A, "S-A", 0, 0, ""}};
 
   PSI_thread_key thread_key_1;
-  PSI_thread_info all_thread[] = {{&thread_key_1, "T-1", 0, 0, ""}};
+  PSI_thread_info all_thread[] = {{&thread_key_1, "T-1", "T-1", 0, 0, ""}};
 
   mutex_service->register_mutex("test", all_mutex, 1);
   rwlock_service->register_rwlock("test", all_rwlock, 1);
@@ -1335,7 +1335,7 @@
 
   /* Preparation */
 
-  thread_1 = thread_service->new_thread(thread_key_1, nullptr, 0);
+  thread_1 = thread_service->new_thread(thread_key_1, 12, nullptr, 0);
   ok(thread_1 != nullptr, "T-1");
   thread_service->set_thread_id(thread_1, 1);
 
@@ -1676,7 +1676,7 @@
                               {&file_key_B, "F-B", 0, 0, ""}};
 
   PSI_thread_key thread_key_1;
-  PSI_thread_info all_thread[] = {{&thread_key_1, "T-1", 0, 0, ""}};
+  PSI_thread_info all_thread[] = {{&thread_key_1, "T-1", "T-1", 0, 0, ""}};
 
   file_service->register_file("test", all_file, 2);
   thread_service->register_thread("test", all_thread, 1);
@@ -1688,7 +1688,7 @@
 
   /* Preparation */
 
-  thread_1 = thread_service->new_thread(thread_key_1, nullptr, 0);
+  thread_1 = thread_service->new_thread(thread_key_1, 12, nullptr, 0);
   ok(thread_1 != nullptr, "T-1");
   thread_service->set_thread_id(thread_1, 1);
 
@@ -2059,7 +2059,7 @@
   PSI_memory_info all_memory[] = {{&memory_key_A, "M-A", 0, 0, ""}};
 
   PSI_thread_key thread_key_1;
-  PSI_thread_info all_thread[] = {{&thread_key_1, "T-1", 0, 0, ""}};
+  PSI_thread_info all_thread[] = {{&thread_key_1, "T-1", "T-1", 0, 0, ""}};
 
   memory_service->register_memory("test", all_memory, 1);
   thread_service->register_thread("test", all_thread, 1);
@@ -2070,7 +2070,7 @@
 
   /* Preparation */
 
-  thread_1 = thread_service->new_thread(thread_key_1, nullptr, 0);
+  thread_1 = thread_service->new_thread(thread_key_1, 12, nullptr, 0);
   ok(thread_1 != nullptr, "T-1");
   thread_service->set_thread_id(thread_1, 1);
 
@@ -2229,18 +2229,18 @@
 }
 
 /* Simulated my_close() */
-int my_close(File fd MY_ATTRIBUTE((unused)), bool success) {
+int my_close(File fd [[maybe_unused]], bool success) {
   return (success ? 0 : 1);
 }
 
 /* Simulated my_delete() */
-int my_delete(const char *filename MY_ATTRIBUTE((unused)), bool success) {
+int my_delete(const char *filename [[maybe_unused]], bool success) {
   return (success ? 0 : 1);
 }
 
 /* Simulated my_rename() */
-int my_rename(const char *from MY_ATTRIBUTE((unused)),
-              const char *to MY_ATTRIBUTE((unused)), bool success) {
+int my_rename(const char *from [[maybe_unused]],
+              const char *to [[maybe_unused]], bool success) {
   return (success ? 0 : 1);
 }
 
@@ -2283,17 +2283,18 @@
   PSI_file_key file_key;
   PSI_file_info all_file[] = {{&file_key, "File Class", 0, 0, ""}};
   PSI_thread_key thread_key;
-  PSI_thread_info all_thread[] = {{&thread_key, "Thread Class", 0, 0, ""}};
+  PSI_thread_info all_thread[] = {
+      {&thread_key, "Thread Class", "OS NAME", 0, 0, ""}};
 
   file_service->register_file("test", all_file, 1);
   thread_service->register_thread("test", all_thread, 1);
 
   /* Create Thread A and B to simulate operations from different threads. */
-  thread_A = thread_service->new_thread(thread_key, NULL, 0);
+  thread_A = thread_service->new_thread(thread_key, 12, nullptr, 0);
   ok(thread_A != NULL, "Thread A");
   thread_service->set_thread_id(thread_A, 1);
 
-  thread_B = thread_service->new_thread(thread_key, NULL, 0);
+  thread_B = thread_service->new_thread(thread_key, 12, nullptr, 0);
   ok(thread_B != NULL, "Thread B");
   thread_service->set_thread_id(thread_B, 1);
 
diff -Nru mysql-8.0-8.0.26/storage/perfschema/unittest/pfs_user-oom-t.cc mysql-8.0-8.0.27/storage/perfschema/unittest/pfs_user-oom-t.cc
--- mysql-8.0-8.0.26/storage/perfschema/unittest/pfs_user-oom-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/perfschema/unittest/pfs_user-oom-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -114,10 +114,11 @@
       PSI_CURRENT_THREAD_VERSION);
 
   PSI_thread_key thread_key_1;
-  PSI_thread_info all_thread[] = {{&thread_key_1, "T-1", 0, 0, ""}};
+  PSI_thread_info all_thread[] = {{&thread_key_1, "T-1", "T-1", 0, 0, ""}};
   thread_service->register_thread("test", all_thread, 1);
 
-  PSI_thread *thread_1 = thread_service->new_thread(thread_key_1, nullptr, 0);
+  PSI_thread *thread_1 =
+      thread_service->new_thread(thread_key_1, 0, nullptr, 0);
   thread_service->set_thread(thread_1);
 
   /* Tests */
diff -Nru mysql-8.0-8.0.26/storage/secondary_engine_mock/ha_mock.cc mysql-8.0-8.0.27/storage/secondary_engine_mock/ha_mock.cc
--- mysql-8.0-8.0.26/storage/secondary_engine_mock/ha_mock.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/secondary_engine_mock/ha_mock.cc	2021-09-28 11:46:34.000000000 +0000
@@ -271,7 +271,7 @@
   assert(path->secondary_engine_data == nullptr);
 }
 
-static bool OptimizeSecondaryEngine(THD *thd MY_ATTRIBUTE((unused)), LEX *lex) {
+static bool OptimizeSecondaryEngine(THD *thd [[maybe_unused]], LEX *lex) {
   // The context should have been set by PrepareSecondaryEngine.
   assert(lex->secondary_engine_execution_context() != nullptr);
 
@@ -334,9 +334,10 @@
   return false;
 }
 
-static bool ModifyAccessPathCost(
-    THD *thd MY_ATTRIBUTE((unused)),
-    const JoinHypergraph &hypergraph MY_ATTRIBUTE((unused)), AccessPath *path) {
+static bool ModifyAccessPathCost(THD *thd [[maybe_unused]],
+                                 const JoinHypergraph &hypergraph
+                                 [[maybe_unused]],
+                                 AccessPath *path) {
   assert(!thd->is_error());
   assert(hypergraph.query_block()->join == hypergraph.join());
   AssertSupportedPath(path);
diff -Nru mysql-8.0-8.0.26/storage/temptable/CMakeLists.txt mysql-8.0-8.0.27/storage/temptable/CMakeLists.txt
--- mysql-8.0-8.0.26/storage/temptable/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/temptable/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -24,7 +24,7 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/include
 )
 
-MYSQL_ADD_PLUGIN(temptable
+SET(TEMPTABLE_SOURCES
   src/allocator.cc
   src/block.cc
   src/column.cc
@@ -36,7 +36,14 @@
   src/result.cc
   src/row.cc
   src/table.cc
+  )
+
+IF(NOT LINUX)
+  LIST(REMOVE_ITEM TEMPTABLE_SOURCES src/memutils.cc)
+ENDIF()
 
+MYSQL_ADD_PLUGIN(temptable
+  ${TEMPTABLE_SOURCES}
   STORAGE_ENGINE
   MANDATORY
 )
diff -Nru mysql-8.0-8.0.26/storage/temptable/include/temptable/memutils.h mysql-8.0-8.0.27/storage/temptable/include/temptable/memutils.h
--- mysql-8.0-8.0.26/storage/temptable/include/temptable/memutils.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/temptable/include/temptable/memutils.h	2021-09-28 11:46:34.000000000 +0000
@@ -178,7 +178,7 @@
     free(ptr);
   }
 #elif defined(HAVE_WINNUMA)
-  BOOL MY_ATTRIBUTE((unused)) ret = VirtualFree(ptr, 0, MEM_RELEASE);
+  BOOL ret [[maybe_unused]] = VirtualFree(ptr, 0, MEM_RELEASE);
   assert(ret != 0);
 #else
   free(ptr);
diff -Nru mysql-8.0-8.0.26/storage/temptable/include/temptable/misc.h mysql-8.0-8.0.27/storage/temptable/include/temptable/misc.h
--- mysql-8.0-8.0.26/storage/temptable/include/temptable/misc.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/temptable/include/temptable/misc.h	2021-09-28 11:46:34.000000000 +0000
@@ -30,10 +30,10 @@
 
 #include "my_compiler.h"
 
-#define TEMPTABLE_UNUSED MY_ATTRIBUTE((unused))
+#define TEMPTABLE_UNUSED [[maybe_unused]]
 
 #ifdef NDEBUG
-#define TEMPTABLE_UNUSED_NODBUG MY_ATTRIBUTE((unused))
+#define TEMPTABLE_UNUSED_NODBUG [[maybe_unused]]
 #else /* NDEBUG */
 #define TEMPTABLE_UNUSED_NODBUG
 #endif /* NDEBUG */
diff -Nru mysql-8.0-8.0.26/storage/temptable/src/handler.cc mysql-8.0-8.0.27/storage/temptable/src/handler.cc
--- mysql-8.0-8.0.26/storage/temptable/src/handler.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/storage/temptable/src/handler.cc	2021-09-28 11:46:34.000000000 +0000
@@ -840,8 +840,8 @@
   return length;
 }
 
-uint Handler::max_supported_key_part_length(
-    HA_CREATE_INFO *create_info MY_ATTRIBUTE((unused))) const {
+uint Handler::max_supported_key_part_length(HA_CREATE_INFO *create_info
+                                            [[maybe_unused]]) const {
   DBUG_TRACE;
 
   const uint length = std::numeric_limits<uint>::max();
diff -Nru mysql-8.0-8.0.26/strings/CMakeLists.txt mysql-8.0-8.0.27/strings/CMakeLists.txt
--- mysql-8.0-8.0.26/strings/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/strings/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -100,10 +100,6 @@
   LINK_LIBRARIES mysys
   )
 
-IF(MY_COMPILER_IS_SUNPRO)
-  TARGET_COMPILE_OPTIONS(strings_objlib PRIVATE $<$<CONFIG:RelWithDebInfo>:-xO4>)
-ENDIF()
-
 MYSQL_ADD_EXECUTABLE(conf_to_src conf_to_src.cc SKIP_INSTALL)
 TARGET_LINK_LIBRARIES(conf_to_src strings)
 
diff -Nru mysql-8.0-8.0.26/strings/conf_to_src.cc mysql-8.0-8.0.27/strings/conf_to_src.cc
--- mysql-8.0-8.0.26/strings/conf_to_src.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/strings/conf_to_src.cc	2021-09-28 11:46:34.000000000 +0000
@@ -147,8 +147,8 @@
   return MY_XML_OK;
 }
 
-static void default_reporter(enum loglevel level MY_ATTRIBUTE((unused)),
-                             uint ecode MY_ATTRIBUTE((unused)), ...) {}
+static void default_reporter(enum loglevel level [[maybe_unused]],
+                             uint ecode [[maybe_unused]], ...) {}
 
 static void my_charset_loader_init(MY_CHARSET_LOADER *loader) {
   loader->errcode = 0;
@@ -265,7 +265,7 @@
   fprintf(f, "}\n");
 }
 
-int main(int argc, char **argv MY_ATTRIBUTE((unused))) {
+int main(int argc, char **argv [[maybe_unused]]) {
   CHARSET_INFO ncs;
   CHARSET_INFO *cs;
   char filename[256];
diff -Nru mysql-8.0-8.0.26/strings/ctype-big5.cc mysql-8.0-8.0.27/strings/ctype-big5.cc
--- mysql-8.0-8.0.26/strings/ctype-big5.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/strings/ctype-big5.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1220,7 +1220,7 @@
 /* Compare strings */
 
 extern "C" {
-static int my_strnncoll_big5(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static int my_strnncoll_big5(const CHARSET_INFO *cs [[maybe_unused]],
                              const uchar *a, size_t a_length, const uchar *b,
                              size_t b_length, bool b_is_prefix) {
   size_t length = std::min(a_length, b_length);
@@ -1230,7 +1230,7 @@
 
 /* compare strings, ignore end space */
 
-static int my_strnncollsp_big5(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static int my_strnncollsp_big5(const CHARSET_INFO *cs [[maybe_unused]],
                                const uchar *a, size_t a_length, const uchar *b,
                                size_t b_length) {
   size_t length = std::min(a_length, b_length);
@@ -1282,13 +1282,12 @@
   return my_strxfrm_pad(cs, d0, dst, de, nweights, flags);
 }
 
-static uint ismbchar_big5(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static uint ismbchar_big5(const CHARSET_INFO *cs [[maybe_unused]],
                           const char *p, const char *e) {
   return (isbig5head(*(p)) && (e) - (p) > 1 && isbig5tail(*((p) + 1)) ? 2 : 0);
 }
 
-static uint mbcharlen_big5(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                           uint c) {
+static uint mbcharlen_big5(const CHARSET_INFO *cs [[maybe_unused]], uint c) {
   return (isbig5head(c) ? 2 : 1);
 }
 }  // extern "C"
@@ -6422,8 +6421,8 @@
 }
 
 extern "C" {
-static int my_wc_mb_big5(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                         my_wc_t wc, uchar *s, uchar *e) {
+static int my_wc_mb_big5(const CHARSET_INFO *cs [[maybe_unused]], my_wc_t wc,
+                         uchar *s, uchar *e) {
   int code;
 
   if (s >= e) return MY_CS_TOOSMALL;
@@ -6443,8 +6442,8 @@
   return 2;
 }
 
-static int my_mb_wc_big5(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                         my_wc_t *pwc, const uchar *s, const uchar *e) {
+static int my_mb_wc_big5(const CHARSET_INFO *cs [[maybe_unused]], my_wc_t *pwc,
+                         const uchar *s, const uchar *e) {
   int hi;
 
   if (s >= e) return MY_CS_TOOSMALL;
@@ -6465,9 +6464,9 @@
   Returns a well formed length of a BIG5 string.
   CP950 and HKSCS additional characters are also accepted.
 */
-static size_t my_well_formed_len_big5(
-    const CHARSET_INFO *cs MY_ATTRIBUTE((unused)), const char *b, const char *e,
-    size_t pos, int *error) {
+static size_t my_well_formed_len_big5(const CHARSET_INFO *cs [[maybe_unused]],
+                                      const char *b, const char *e, size_t pos,
+                                      int *error) {
   const char *b0 = b;
   const char *emb = e - 1; /* Last possible end of an MB character */
 
diff -Nru mysql-8.0-8.0.26/strings/ctype-bin.cc mysql-8.0-8.0.27/strings/ctype-bin.cc
--- mysql-8.0-8.0.26/strings/ctype-bin.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/strings/ctype-bin.cc	2021-09-28 11:46:34.000000000 +0000
@@ -92,13 +92,13 @@
     255};
 
 extern "C" {
-static bool my_coll_init_8bit_bin(
-    CHARSET_INFO *cs, MY_CHARSET_LOADER *loader MY_ATTRIBUTE((unused))) {
+static bool my_coll_init_8bit_bin(CHARSET_INFO *cs,
+                                  MY_CHARSET_LOADER *loader [[maybe_unused]]) {
   cs->max_sort_char = 255;
   return false;
 }
 
-static int my_strnncoll_binary(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static int my_strnncoll_binary(const CHARSET_INFO *cs [[maybe_unused]],
                                const uchar *s, size_t slen, const uchar *t,
                                size_t tlen, bool t_is_prefix) {
   size_t len = std::min(slen, tlen);
@@ -106,8 +106,8 @@
   return cmp ? cmp : (int)((t_is_prefix ? len : slen) - tlen);
 }
 
-static size_t my_lengthsp_binary(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                                 const char *ptr MY_ATTRIBUTE((unused)),
+static size_t my_lengthsp_binary(const CHARSET_INFO *cs [[maybe_unused]],
+                                 const char *ptr [[maybe_unused]],
                                  size_t length) {
   return length;
 }
@@ -141,7 +141,7 @@
   return my_strnncoll_binary(cs, s, slen, t, tlen, false);
 }
 
-static int my_strnncoll_8bit_bin(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static int my_strnncoll_8bit_bin(const CHARSET_INFO *cs [[maybe_unused]],
                                  const uchar *s, size_t slen, const uchar *t,
                                  size_t tlen, bool t_is_prefix) {
   size_t len = std::min(slen, tlen);
@@ -171,9 +171,9 @@
   > 0	s > t
 */
 
-static int my_strnncollsp_8bit_bin(
-    const CHARSET_INFO *cs MY_ATTRIBUTE((unused)), const uchar *a,
-    size_t a_length, const uchar *b, size_t b_length) {
+static int my_strnncollsp_8bit_bin(const CHARSET_INFO *cs [[maybe_unused]],
+                                   const uchar *a, size_t a_length,
+                                   const uchar *b, size_t b_length) {
   const uchar *end;
   size_t length;
   int res;
@@ -205,40 +205,40 @@
 
 /* This function is used for all conversion functions */
 
-static size_t my_case_str_bin(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                              char *str MY_ATTRIBUTE((unused))) {
+static size_t my_case_str_bin(const CHARSET_INFO *cs [[maybe_unused]],
+                              char *str [[maybe_unused]]) {
   return 0;
 }
 
-static size_t my_case_bin(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                          char *src MY_ATTRIBUTE((unused)), size_t srclen,
-                          char *dst MY_ATTRIBUTE((unused)),
-                          size_t dstlen MY_ATTRIBUTE((unused))) {
+static size_t my_case_bin(const CHARSET_INFO *cs [[maybe_unused]],
+                          char *src [[maybe_unused]], size_t srclen,
+                          char *dst [[maybe_unused]],
+                          size_t dstlen [[maybe_unused]]) {
   return srclen;
 }
 
-static int my_strcasecmp_bin(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static int my_strcasecmp_bin(const CHARSET_INFO *cs [[maybe_unused]],
                              const char *s, const char *t) {
   return strcmp(s, t);
 }
 }  // extern "C"
 
-uint my_mbcharlen_8bit(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                       uint c MY_ATTRIBUTE((unused))) {
+uint my_mbcharlen_8bit(const CHARSET_INFO *cs [[maybe_unused]],
+                       uint c [[maybe_unused]]) {
   return 1;
 }
 
 extern "C" {
-static int my_mb_wc_bin(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                        my_wc_t *wc, const uchar *str, const uchar *end) {
+static int my_mb_wc_bin(const CHARSET_INFO *cs [[maybe_unused]], my_wc_t *wc,
+                        const uchar *str, const uchar *end) {
   if (str >= end) return MY_CS_TOOSMALL;
 
   *wc = str[0];
   return 1;
 }
 
-static int my_wc_mb_bin(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                        my_wc_t wc, uchar *s, uchar *e) {
+static int my_wc_mb_bin(const CHARSET_INFO *cs [[maybe_unused]], my_wc_t wc,
+                        uchar *s, uchar *e) {
   if (s >= e) return MY_CS_TOOSMALL;
 
   if (wc < 256) {
@@ -250,7 +250,7 @@
 }  // extern "C"
 
 extern "C" {
-static void my_hash_sort_8bit_bin(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static void my_hash_sort_8bit_bin(const CHARSET_INFO *cs [[maybe_unused]],
                                   const uchar *key, size_t len, uint64 *nr1,
                                   uint64 *nr2) {
   const uchar *pos = key;
@@ -275,7 +275,7 @@
   *nr2 = tmp2;
 }
 
-static void my_hash_sort_bin(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static void my_hash_sort_bin(const CHARSET_INFO *cs [[maybe_unused]],
                              const uchar *key, size_t len, uint64 *nr1,
                              uint64 *nr2) {
   const uchar *pos = key;
@@ -400,9 +400,9 @@
   return srclen;
 }
 
-static uint my_instr_bin(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                         const char *b, size_t b_length, const char *s,
-                         size_t s_length, my_match_t *match, uint nmatch) {
+static uint my_instr_bin(const CHARSET_INFO *cs [[maybe_unused]], const char *b,
+                         size_t b_length, const char *s, size_t s_length,
+                         my_match_t *match, uint nmatch) {
   const uchar *str, *search, *end, *search_end;
 
   if (s_length <= b_length) {
diff -Nru mysql-8.0-8.0.26/strings/ctype-cp932.cc mysql-8.0-8.0.27/strings/ctype-cp932.cc
--- mysql-8.0-8.0.26/strings/ctype-cp932.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/strings/ctype-cp932.cc	2021-09-28 11:46:34.000000000 +0000
@@ -242,15 +242,14 @@
   ((0x40 <= (c) && (c) <= 0x7e) || (0x80 <= (c) && (c) <= 0xfc))
 
 extern "C" {
-static uint ismbchar_cp932(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static uint ismbchar_cp932(const CHARSET_INFO *cs [[maybe_unused]],
                            const char *p, const char *e) {
   return (iscp932head((uchar)*p) && (e - p) > 1 && iscp932tail((uchar)p[1])
               ? 2
               : 0);
 }
 
-static uint mbcharlen_cp932(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                            uint c) {
+static uint mbcharlen_cp932(const CHARSET_INFO *cs [[maybe_unused]], uint c) {
   return (iscp932head((uchar)c) ? 2 : 1);
 }
 }  // extern "C"
@@ -18635,8 +18634,8 @@
 */
 
 extern "C" {
-static int my_mb_wc_cp932(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                          my_wc_t *pwc, const uchar *s, const uchar *e) {
+static int my_mb_wc_cp932(const CHARSET_INFO *cs [[maybe_unused]], my_wc_t *pwc,
+                          const uchar *s, const uchar *e) {
   int hi;
 
   if (s >= e) return MY_CS_TOOSMALL;
@@ -18675,8 +18674,8 @@
   @retval   2              If a 2-byte character was put
   @retval   MY_CS_ILUNI    If the Unicode character does not exist in CP932
 */
-static int my_wc_mb_cp932(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                          my_wc_t wc, uchar *s, uchar *e) {
+static int my_wc_mb_cp932(const CHARSET_INFO *cs [[maybe_unused]], my_wc_t wc,
+                          uchar *s, uchar *e) {
   int code;
 
   if ((int)wc < 0x80) /* ASCII: [U+0000..U+007F] -> [00-7F] */
@@ -18707,7 +18706,7 @@
   return 2;
 }
 
-static size_t my_numcells_cp932(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static size_t my_numcells_cp932(const CHARSET_INFO *cs [[maybe_unused]],
                                 const char *str, const char *str_end) {
   size_t clen = 0;
   const uchar *b = (const uchar *)str;
@@ -18733,9 +18732,9 @@
   cp932 additional characters are also accepted.
 */
 
-static size_t my_well_formed_len_cp932(
-    const CHARSET_INFO *cs MY_ATTRIBUTE((unused)), const char *b, const char *e,
-    size_t pos, int *error) {
+static size_t my_well_formed_len_cp932(const CHARSET_INFO *cs [[maybe_unused]],
+                                       const char *b, const char *e, size_t pos,
+                                       int *error) {
   const char *b0 = b;
   *error = 0;
   while (pos-- && b < e) {
diff -Nru mysql-8.0-8.0.26/strings/ctype-czech.cc mysql-8.0-8.0.27/strings/ctype-czech.cc
--- mysql-8.0-8.0.26/strings/ctype-czech.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/strings/ctype-czech.cc	2021-09-28 11:46:34.000000000 +0000
@@ -304,7 +304,7 @@
 */
 
 extern "C" {
-static int my_strnncoll_czech(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static int my_strnncoll_czech(const CHARSET_INFO *cs [[maybe_unused]],
                               const uchar *s1, size_t len1, const uchar *s2,
                               size_t len2, bool s2_is_prefix) {
   int v1, v2;
@@ -343,8 +343,8 @@
 /*
   Returns the number of bytes required for strnxfrm().
 */
-static size_t my_strnxfrmlen_czech(
-    const CHARSET_INFO *cs MY_ATTRIBUTE((unused)), size_t len) {
+static size_t my_strnxfrmlen_czech(const CHARSET_INFO *cs [[maybe_unused]],
+                                   size_t len) {
   return len * 4 + 4;
 }
 
@@ -353,9 +353,9 @@
   the length of the strings being specified
 */
 
-static size_t my_strnxfrm_czech(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static size_t my_strnxfrm_czech(const CHARSET_INFO *cs [[maybe_unused]],
                                 uchar *dest, size_t len,
-                                uint nweights_arg MY_ATTRIBUTE((unused)),
+                                uint nweights_arg [[maybe_unused]],
                                 const uchar *src, size_t srclen, uint flags) {
   int value;
   const uchar *p, *store;
diff -Nru mysql-8.0-8.0.26/strings/ctype-eucjpms.cc mysql-8.0-8.0.27/strings/ctype-eucjpms.cc
--- mysql-8.0-8.0.26/strings/ctype-eucjpms.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/strings/ctype-eucjpms.cc	2021-09-28 11:46:34.000000000 +0000
@@ -279,7 +279,7 @@
 #define iseucjpms_ss3(c) (((c)&0xff) == 0x8f)
 
 extern "C" {
-static uint ismbchar_eucjpms(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static uint ismbchar_eucjpms(const CHARSET_INFO *cs [[maybe_unused]],
                              const char *p, const char *e) {
   return ((static_cast<uchar>(*p) < 0x80)
               ? 0
@@ -294,8 +294,7 @@
                                 : 0);
 }
 
-static uint mbcharlen_eucjpms(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                              uint c) {
+static uint mbcharlen_eucjpms(const CHARSET_INFO *cs [[maybe_unused]], uint c) {
   return (iseucjpms(c) ? 2 : iseucjpms_ss2(c) ? 2 : iseucjpms_ss3(c) ? 3 : 1);
 }
 }  // extern "C"
@@ -36313,7 +36312,7 @@
   @retval   MY_CS_ILSEQ    If a wrong byte sequence was found
 */
 extern "C" {
-static int my_mb_wc_eucjpms(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static int my_mb_wc_eucjpms(const CHARSET_INFO *cs [[maybe_unused]],
                             my_wc_t *pwc, const uchar *s, const uchar *e) {
   int hi;
 
@@ -36367,8 +36366,8 @@
   @retval   2              If a 2-byte character was put
   @retval   MY_CS_ILUNI    If the Unicode character does not exist in EUCJPMS
 */
-static int my_wc_mb_eucjpms(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                            my_wc_t wc, uchar *s, uchar *e) {
+static int my_wc_mb_eucjpms(const CHARSET_INFO *cs [[maybe_unused]], my_wc_t wc,
+                            uchar *s, uchar *e) {
   int jp;
 
   if ((int)wc < 0x80) /* ASCII [00-7F] */
@@ -36414,9 +36413,10 @@
   [xA1-xFE][xA1-xFE]		# JIS X 0208:1997 (two bytes/char)
 */
 
-static size_t my_well_formed_len_eucjpms(
-    const CHARSET_INFO *cs MY_ATTRIBUTE((unused)), const char *beg,
-    const char *end, size_t pos, int *error) {
+static size_t my_well_formed_len_eucjpms(const CHARSET_INFO *cs
+                                         [[maybe_unused]],
+                                         const char *beg, const char *end,
+                                         size_t pos, int *error) {
   const uchar *b = pointer_cast<const uchar *>(beg);
   *error = 0;
 
@@ -36456,7 +36456,7 @@
   return (size_t)(b - pointer_cast<const uchar *>(beg));
 }
 
-static size_t my_numcells_eucjpms(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static size_t my_numcells_eucjpms(const CHARSET_INFO *cs [[maybe_unused]],
                                   const char *str, const char *str_end) {
   size_t clen;
   const uchar *b = (const uchar *)str;
diff -Nru mysql-8.0-8.0.26/strings/ctype-euc_kr.cc mysql-8.0-8.0.27/strings/ctype-euc_kr.cc
--- mysql-8.0-8.0.26/strings/ctype-euc_kr.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/strings/ctype-euc_kr.cc	2021-09-28 11:46:34.000000000 +0000
@@ -265,7 +265,7 @@
   (iseuc_kr_tail1(c) || iseuc_kr_tail2(c) || iseuc_kr_tail3(c))
 
 extern "C" {
-static uint ismbchar_euc_kr(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static uint ismbchar_euc_kr(const CHARSET_INFO *cs [[maybe_unused]],
                             const char *p, const char *e) {
   return ((static_cast<uchar>(*p) < 0x80)
               ? 0
@@ -275,8 +275,7 @@
                     : 0);
 }
 
-static uint mbcharlen_euc_kr(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                             uint c) {
+static uint mbcharlen_euc_kr(const CHARSET_INFO *cs [[maybe_unused]], uint c) {
   return (iseuc_kr_head(c) ? 2 : 1);
 }
 }  // extern "C"
@@ -9347,8 +9346,8 @@
 }
 
 extern "C" {
-static int my_wc_mb_euc_kr(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                           my_wc_t wc, uchar *s, uchar *e) {
+static int my_wc_mb_euc_kr(const CHARSET_INFO *cs [[maybe_unused]], my_wc_t wc,
+                           uchar *s, uchar *e) {
   int code;
 
   if (s >= e) return MY_CS_TOOSMALL;
@@ -9368,7 +9367,7 @@
   return 2;
 }
 
-static int my_mb_wc_euc_kr(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static int my_mb_wc_euc_kr(const CHARSET_INFO *cs [[maybe_unused]],
                            my_wc_t *pwc, const uchar *s, const uchar *e) {
   int hi;
 
@@ -9389,9 +9388,9 @@
 /*
   Returns well formed length of a EUC-KR string.
 */
-static size_t my_well_formed_len_euckr(
-    const CHARSET_INFO *cs MY_ATTRIBUTE((unused)), const char *b, const char *e,
-    size_t pos, int *error) {
+static size_t my_well_formed_len_euckr(const CHARSET_INFO *cs [[maybe_unused]],
+                                       const char *b, const char *e, size_t pos,
+                                       int *error) {
   const char *b0 = b;
   const char *emb = e - 1; /* Last possible end of an MB character */
 
diff -Nru mysql-8.0-8.0.26/strings/ctype-gb18030.cc mysql-8.0-8.0.27/strings/ctype-gb18030.cc
--- mysql-8.0-8.0.26/strings/ctype-gb18030.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/strings/ctype-gb18030.cc	2021-09-28 11:46:34.000000000 +0000
@@ -19277,7 +19277,7 @@
                 0 if not
 */
 extern "C" {
-static uint my_ismbchar_gb18030(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static uint my_ismbchar_gb18030(const CHARSET_INFO *cs [[maybe_unused]],
                                 const char *p, const char *e) {
   assert(e > p);
 
@@ -19301,7 +19301,7 @@
   @retval       1/2/4 accordingly if the leading byte(s) indicate
                 the code would be gb18030, otherwise 0
 */
-static uint my_mbcharlen_gb18030(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static uint my_mbcharlen_gb18030(const CHARSET_INFO *cs [[maybe_unused]],
                                  uint c) {
   if (c <= 0xFF)
     /* We use is_mb_odd instead of is_mb_1 here, because in other cs,
@@ -19327,7 +19327,7 @@
                     space is too small
                  3) MY_CS_ILUNI if we can't encode unicode to gb18030
 */
-static int my_wc_mb_gb18030_chs(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static int my_wc_mb_gb18030_chs(const CHARSET_INFO *cs [[maybe_unused]],
                                 my_wc_t wc, uchar *s, uchar *e) {
   uint idx = 0;
   uint len;
@@ -19418,7 +19418,7 @@
                   3) MY_CS_ILSEQ if gb18030 code is
                      wrong by sequence
 */
-static int my_mb_wc_gb18030(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static int my_mb_wc_gb18030(const CHARSET_INFO *cs [[maybe_unused]],
                             my_wc_t *pwc, const uchar *s, const uchar *e) {
   uint idx = 0;
   uint cp = 0;
@@ -19504,9 +19504,10 @@
   @param[out] error 0 if every gb18030 code we get is correct, otherwise 1
   @return           the length of all well formed bytes
 */
-static size_t my_well_formed_len_gb18030(
-    const CHARSET_INFO *cs MY_ATTRIBUTE((unused)), const char *b, const char *e,
-    size_t pos, int *error) {
+static size_t my_well_formed_len_gb18030(const CHARSET_INFO *cs
+                                         [[maybe_unused]],
+                                         const char *b, const char *e,
+                                         size_t pos, int *error) {
   const char *b0 = b;
   const char *emb = e - 1;
 
diff -Nru mysql-8.0-8.0.26/strings/ctype-gb2312.cc mysql-8.0-8.0.27/strings/ctype-gb2312.cc
--- mysql-8.0-8.0.26/strings/ctype-gb2312.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/strings/ctype-gb2312.cc	2021-09-28 11:46:34.000000000 +0000
@@ -235,14 +235,13 @@
 #define isgb2312tail(c) (0xa1 <= (uchar)(c) && (uchar)(c) <= 0xfe)
 
 extern "C" {
-static uint ismbchar_gb2312(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static uint ismbchar_gb2312(const CHARSET_INFO *cs [[maybe_unused]],
                             const char *p, const char *e) {
   return (isgb2312head(*(p)) && (e) - (p) > 1 && isgb2312tail(*((p) + 1)) ? 2
                                                                           : 0);
 }
 
-static uint mbcharlen_gb2312(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                             uint c) {
+static uint mbcharlen_gb2312(const CHARSET_INFO *cs [[maybe_unused]], uint c) {
   return (isgb2312head(c) ? 2 : 1);
 }
 }  // extern "C"
@@ -6442,8 +6441,8 @@
 }
 
 extern "C" {
-static int my_wc_mb_gb2312(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                           my_wc_t wc, uchar *s, uchar *e) {
+static int my_wc_mb_gb2312(const CHARSET_INFO *cs [[maybe_unused]], my_wc_t wc,
+                           uchar *s, uchar *e) {
   int code;
 
   if (s >= e) return MY_CS_TOOSMALL;
@@ -6463,7 +6462,7 @@
   return 2;
 }
 
-static int my_mb_wc_gb2312(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static int my_mb_wc_gb2312(const CHARSET_INFO *cs [[maybe_unused]],
                            my_wc_t *pwc, const uchar *s, const uchar *e) {
   int hi;
 
@@ -6485,9 +6484,9 @@
 /*
   Returns well formed length of a EUC-KR string.
 */
-static size_t my_well_formed_len_gb2312(
-    const CHARSET_INFO *cs MY_ATTRIBUTE((unused)), const char *b, const char *e,
-    size_t pos, int *error) {
+static size_t my_well_formed_len_gb2312(const CHARSET_INFO *cs [[maybe_unused]],
+                                        const char *b, const char *e,
+                                        size_t pos, int *error) {
   const char *b0 = b;
   const char *emb = e - 1; /* Last possible end of an MB character */
 
diff -Nru mysql-8.0-8.0.26/strings/ctype-gbk.cc mysql-8.0-8.0.27/strings/ctype-gbk.cc
--- mysql-8.0-8.0.26/strings/ctype-gbk.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/strings/ctype-gbk.cc	2021-09-28 11:46:34.000000000 +0000
@@ -3542,7 +3542,7 @@
 }
 
 extern "C" {
-static int my_strnncoll_gbk(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static int my_strnncoll_gbk(const CHARSET_INFO *cs [[maybe_unused]],
                             const uchar *a, size_t a_length, const uchar *b,
                             size_t b_length, bool b_is_prefix) {
   size_t length = std::min(a_length, b_length);
@@ -3550,7 +3550,7 @@
   return res ? res : (int)((b_is_prefix ? length : a_length) - b_length);
 }
 
-static int my_strnncollsp_gbk(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static int my_strnncollsp_gbk(const CHARSET_INFO *cs [[maybe_unused]],
                               const uchar *a, size_t a_length, const uchar *b,
                               size_t b_length) {
   size_t length = std::min(a_length, b_length);
@@ -3602,13 +3602,12 @@
   return my_strxfrm_pad(cs, d0, dst, de, nweights, flags);
 }
 
-static uint ismbchar_gbk(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                         const char *p, const char *e) {
+static uint ismbchar_gbk(const CHARSET_INFO *cs [[maybe_unused]], const char *p,
+                         const char *e) {
   return (isgbkhead(*(p)) && (e) - (p) > 1 && isgbktail(*((p) + 1)) ? 2 : 0);
 }
 
-static uint mbcharlen_gbk(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                          uint c) {
+static uint mbcharlen_gbk(const CHARSET_INFO *cs [[maybe_unused]], uint c) {
   return (isgbkhead(c) ? 2 : 1);
 }
 }  // extern "C"
@@ -9931,8 +9930,8 @@
 }
 
 extern "C" {
-static int my_wc_mb_gbk(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                        my_wc_t wc, uchar *s, uchar *e) {
+static int my_wc_mb_gbk(const CHARSET_INFO *cs [[maybe_unused]], my_wc_t wc,
+                        uchar *s, uchar *e) {
   int code;
 
   if (s >= e) return MY_CS_TOOSMALL;
@@ -9951,8 +9950,8 @@
   return 2;
 }
 
-static int my_mb_wc_gbk(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                        my_wc_t *pwc, const uchar *s, const uchar *e) {
+static int my_mb_wc_gbk(const CHARSET_INFO *cs [[maybe_unused]], my_wc_t *pwc,
+                        const uchar *s, const uchar *e) {
   int hi;
 
   if (s >= e) return MY_CS_TOOSMALL;
@@ -9974,9 +9973,9 @@
 /*
   Returns well formed length of a GBK string.
 */
-static size_t my_well_formed_len_gbk(
-    const CHARSET_INFO *cs MY_ATTRIBUTE((unused)), const char *b, const char *e,
-    size_t pos, int *error) {
+static size_t my_well_formed_len_gbk(const CHARSET_INFO *cs [[maybe_unused]],
+                                     const char *b, const char *e, size_t pos,
+                                     int *error) {
   const char *b0 = b;
   const char *emb = e - 1; /* Last possible end of an MB character */
 
diff -Nru mysql-8.0-8.0.26/strings/ctype-latin1.cc mysql-8.0-8.0.27/strings/ctype-latin1.cc
--- mysql-8.0-8.0.26/strings/ctype-latin1.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/strings/ctype-latin1.cc	2021-09-28 11:46:34.000000000 +0000
@@ -314,16 +314,16 @@
     nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr};
 
 extern "C" {
-static int my_mb_wc_latin1(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                           my_wc_t *wc, const uchar *str, const uchar *end) {
+static int my_mb_wc_latin1(const CHARSET_INFO *cs [[maybe_unused]], my_wc_t *wc,
+                           const uchar *str, const uchar *end) {
   if (str >= end) return MY_CS_TOOSMALL;
 
   *wc = cs_to_uni[*str];
   return (!wc[0] && str[0]) ? -1 : 1;
 }
 
-static int my_wc_mb_latin1(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                           my_wc_t wc, uchar *str, uchar *end) {
+static int my_wc_mb_latin1(const CHARSET_INFO *cs [[maybe_unused]], my_wc_t wc,
+                           uchar *str, uchar *end) {
   const uchar *pl;
 
   if (str >= end) return MY_CS_TOOSMALL;
@@ -488,7 +488,7 @@
 */
 
 extern "C" {
-static int my_strnncoll_latin1_de(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static int my_strnncoll_latin1_de(const CHARSET_INFO *cs [[maybe_unused]],
                                   const uchar *a, size_t a_length,
                                   const uchar *b, size_t b_length,
                                   bool b_is_prefix) {
@@ -521,9 +521,9 @@
                                   : (b < b_end || b_extend) ? -1 : 0);
 }
 
-static int my_strnncollsp_latin1_de(
-    const CHARSET_INFO *cs MY_ATTRIBUTE((unused)), const uchar *a,
-    size_t a_length, const uchar *b, size_t b_length) {
+static int my_strnncollsp_latin1_de(const CHARSET_INFO *cs [[maybe_unused]],
+                                    const uchar *a, size_t a_length,
+                                    const uchar *b, size_t b_length) {
   const uchar *a_end = a + a_length, *b_end = b + b_length;
   uchar a_char, a_extend = 0, b_char, b_extend = 0;
   int res;
@@ -587,9 +587,9 @@
   return my_strxfrm_pad(cs, d0, dst, de, nweights, flags);
 }
 
-static void my_hash_sort_latin1_de(
-    const CHARSET_INFO *cs MY_ATTRIBUTE((unused)), const uchar *key, size_t len,
-    uint64 *nr1, uint64 *nr2) {
+static void my_hash_sort_latin1_de(const CHARSET_INFO *cs [[maybe_unused]],
+                                   const uchar *key, size_t len, uint64 *nr1,
+                                   uint64 *nr2) {
   const uchar *end;
   uint64 tmp1;
   uint64 tmp2;
diff -Nru mysql-8.0-8.0.26/strings/ctype-mb.cc mysql-8.0-8.0.27/strings/ctype-mb.cc
--- mysql-8.0-8.0.26/strings/ctype-mb.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/strings/ctype-mb.cc	2021-09-28 11:46:34.000000000 +0000
@@ -85,8 +85,8 @@
   For character sets which don't change octet length in case conversion.
 */
 size_t my_caseup_mb(const CHARSET_INFO *cs, char *src, size_t srclen,
-                    char *dst MY_ATTRIBUTE((unused)),
-                    size_t dstlen MY_ATTRIBUTE((unused))) {
+                    char *dst [[maybe_unused]],
+                    size_t dstlen [[maybe_unused]]) {
   uint32 l;
   char *srcend = src + srclen;
   const uchar *map = cs->to_upper;
@@ -112,8 +112,8 @@
 }
 
 size_t my_casedn_mb(const CHARSET_INFO *cs, char *src, size_t srclen,
-                    char *dst MY_ATTRIBUTE((unused)),
-                    size_t dstlen MY_ATTRIBUTE((unused))) {
+                    char *dst [[maybe_unused]],
+                    size_t dstlen [[maybe_unused]]) {
   uint32 l;
   char *srcend = src + srclen;
   const uchar *map = cs->to_lower;
@@ -149,7 +149,7 @@
 */
 static size_t my_casefold_mb_varlen(const CHARSET_INFO *cs, char *src,
                                     size_t srclen, char *dst,
-                                    size_t dstlen MY_ATTRIBUTE((unused)),
+                                    size_t dstlen [[maybe_unused]],
                                     const uchar *map, size_t is_upper) {
   char *srcend = src + srclen, *dst0 = dst;
 
@@ -406,9 +406,9 @@
 
 /* BINARY collations handlers for MB charsets */
 
-int my_strnncoll_mb_bin(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                        const uchar *s, size_t slen, const uchar *t,
-                        size_t tlen, bool t_is_prefix) {
+int my_strnncoll_mb_bin(const CHARSET_INFO *cs [[maybe_unused]], const uchar *s,
+                        size_t slen, const uchar *t, size_t tlen,
+                        bool t_is_prefix) {
   size_t len = std::min(slen, tlen);
   int cmp = len == 0 ? 0 : memcmp(s, t, len);
   return cmp ? cmp : (int)((t_is_prefix ? len : slen) - tlen);
@@ -436,7 +436,7 @@
     0 if strings are equal
 */
 
-int my_strnncollsp_mb_bin(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+int my_strnncollsp_mb_bin(const CHARSET_INFO *cs [[maybe_unused]],
                           const uchar *a, size_t a_length, const uchar *b,
                           size_t b_length) {
   const uchar *end;
@@ -481,13 +481,13 @@
     switch (cs->cset->ismbchar(cs, (const char *)src, (const char *)se)) {   \
       case 4:                                                                \
         *dst++ = *src++;                                                     \
-        /* fall through */                                                   \
+        [[fallthrough]];                                                     \
       case 3:                                                                \
         *dst++ = *src++;                                                     \
-        /* fall through */                                                   \
+        [[fallthrough]];                                                     \
       case 2:                                                                \
         *dst++ = *src++;                                                     \
-        /* fall through */                                                   \
+        [[fallthrough]];                                                     \
       case 0:                                                                \
         *dst++ = *src++; /* byte in range 0x80..0xFF which is not MB head */ \
     }                                                                        \
@@ -557,12 +557,12 @@
   return my_strxfrm_pad(cs, d0, dst, de, nweights, flags);
 }
 
-int my_strcasecmp_mb_bin(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                         const char *s, const char *t) {
+int my_strcasecmp_mb_bin(const CHARSET_INFO *cs [[maybe_unused]], const char *s,
+                         const char *t) {
   return strcmp(s, t);
 }
 
-void my_hash_sort_mb_bin(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+void my_hash_sort_mb_bin(const CHARSET_INFO *cs [[maybe_unused]],
                          const uchar *key, size_t len, uint64 *nr1,
                          uint64 *nr2) {
   const uchar *pos = key;
@@ -834,11 +834,11 @@
                                  pointer_cast<const uchar *>(end))) <= 0) {
         if (res == MY_CS_ILSEQ)
           return true; /* min_length and max_length are not important */
-        /*
-           End of the string: Escape is the last character.
-           Put escape as a normal character.
-           We'll will leave the loop on the next iteration.
-        */
+                       /*
+                          End of the string: Escape is the last character.
+                          Put escape as a normal character.
+                          We'll will leave the loop on the next iteration.
+                       */
       } else
         ptr += res;
 
diff -Nru mysql-8.0-8.0.26/strings/ctype-simple.cc mysql-8.0-8.0.27/strings/ctype-simple.cc
--- mysql-8.0-8.0.26/strings/ctype-simple.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/strings/ctype-simple.cc	2021-09-28 11:46:34.000000000 +0000
@@ -213,8 +213,8 @@
 }
 
 size_t my_caseup_8bit(const CHARSET_INFO *cs, char *src, size_t srclen,
-                      char *dst MY_ATTRIBUTE((unused)),
-                      size_t dstlen MY_ATTRIBUTE((unused))) {
+                      char *dst [[maybe_unused]],
+                      size_t dstlen [[maybe_unused]]) {
   char *end = src + srclen;
   const uchar *map = cs->to_upper;
   assert(src == dst && srclen == dstlen);
@@ -223,8 +223,8 @@
 }
 
 size_t my_casedn_8bit(const CHARSET_INFO *cs, char *src, size_t srclen,
-                      char *dst MY_ATTRIBUTE((unused)),
-                      size_t dstlen MY_ATTRIBUTE((unused))) {
+                      char *dst [[maybe_unused]],
+                      size_t dstlen [[maybe_unused]]) {
   char *end = src + srclen;
   const uchar *map = cs->to_lower;
   assert(src == dst && srclen == dstlen);
@@ -268,7 +268,7 @@
    end buffer must be checked.
 */
 
-size_t my_snprintf_8bit(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)), char *to,
+size_t my_snprintf_8bit(const CHARSET_INFO *cs [[maybe_unused]], char *to,
                         size_t n, const char *fmt, ...) {
   va_list args;
   size_t result;
@@ -633,9 +633,8 @@
     Value of number in string
 */
 
-double my_strntod_8bit(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                       const char *str, size_t length, const char **end,
-                       int *err) {
+double my_strntod_8bit(const CHARSET_INFO *cs [[maybe_unused]], const char *str,
+                       size_t length, const char **end, int *err) {
   if (length == INT_MAX32) length = 65535; /* Should be big enough */
   *end = str + length;
   return my_strtod(str, end, err);
@@ -647,8 +646,8 @@
   Assume len >= 1
 */
 
-size_t my_long10_to_str_8bit(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                             char *dst, size_t len, int radix, long int val) {
+size_t my_long10_to_str_8bit(const CHARSET_INFO *cs [[maybe_unused]], char *dst,
+                             size_t len, int radix, long int val) {
   char buffer[66];
   char *p, *e;
   long int new_val;
@@ -683,7 +682,7 @@
   return len + sign;
 }
 
-size_t my_longlong10_to_str_8bit(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+size_t my_longlong10_to_str_8bit(const CHARSET_INFO *cs [[maybe_unused]],
                                  char *dst, size_t len, int radix,
                                  longlong val) {
   char buffer[65];
@@ -895,28 +894,28 @@
   }
 }
 
-void my_fill_8bit(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)), char *s,
-                  size_t l, int fill) {
+void my_fill_8bit(const CHARSET_INFO *cs [[maybe_unused]], char *s, size_t l,
+                  int fill) {
   memset(s, fill, l);
 }
 
-size_t my_numchars_8bit(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                        const char *b, const char *e) {
+size_t my_numchars_8bit(const CHARSET_INFO *cs [[maybe_unused]], const char *b,
+                        const char *e) {
   return (size_t)(e - b);
 }
 
-size_t my_numcells_8bit(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                        const char *b, const char *e) {
+size_t my_numcells_8bit(const CHARSET_INFO *cs [[maybe_unused]], const char *b,
+                        const char *e) {
   return (size_t)(e - b);
 }
 
-size_t my_charpos_8bit(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                       const char *b MY_ATTRIBUTE((unused)),
-                       const char *e MY_ATTRIBUTE((unused)), size_t pos) {
+size_t my_charpos_8bit(const CHARSET_INFO *cs [[maybe_unused]],
+                       const char *b [[maybe_unused]],
+                       const char *e [[maybe_unused]], size_t pos) {
   return pos;
 }
 
-size_t my_well_formed_len_8bit(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+size_t my_well_formed_len_8bit(const CHARSET_INFO *cs [[maybe_unused]],
                                const char *start, const char *end,
                                size_t nchars, int *error) {
   size_t nbytes = (size_t)(end - start);
@@ -924,7 +923,7 @@
   return std::min(nbytes, nchars);
 }
 
-size_t my_lengthsp_8bit(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+size_t my_lengthsp_8bit(const CHARSET_INFO *cs [[maybe_unused]],
                         const char *ptr, size_t length) {
   const char *end;
   end = (const char *)skip_trailing_space((const uchar *)ptr, length);
@@ -981,9 +980,10 @@
 }
 
 extern "C" {
-static size_t my_well_formed_len_ascii(
-    const CHARSET_INFO *cs MY_ATTRIBUTE((unused)), const char *start,
-    const char *end, size_t nchars MY_ATTRIBUTE((unused)), int *error) {
+static size_t my_well_formed_len_ascii(const CHARSET_INFO *cs [[maybe_unused]],
+                                       const char *start, const char *end,
+                                       size_t nchars [[maybe_unused]],
+                                       int *error) {
   const char *oldstart = start;
   *error = 0;
   while (start < end) {
@@ -1119,14 +1119,14 @@
 }
 
 extern "C" {
-static bool my_coll_init_simple(
-    CHARSET_INFO *cs, MY_CHARSET_LOADER *loader MY_ATTRIBUTE((unused))) {
+static bool my_coll_init_simple(CHARSET_INFO *cs,
+                                MY_CHARSET_LOADER *loader [[maybe_unused]]) {
   set_max_sort_char(cs);
   return false;
 }
 }  // extern "C"
 
-longlong my_strtoll10_8bit(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+longlong my_strtoll10_8bit(const CHARSET_INFO *cs [[maybe_unused]],
                            const char *nptr, const char **endptr, int *error) {
   return my_strtoll10(nptr, endptr, error);
 }
@@ -1222,7 +1222,7 @@
     In this case the return value is 0.
 */
 
-ulonglong my_strntoull10rnd_8bit(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+ulonglong my_strntoull10rnd_8bit(const CHARSET_INFO *cs [[maybe_unused]],
                                  const char *str, size_t length,
                                  int unsigned_flag, const char **endptr,
                                  int *error) {
@@ -1471,15 +1471,15 @@
     0 if it is not safe to propagate the constant
 */
 
-bool my_propagate_simple(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                         const uchar *str MY_ATTRIBUTE((unused)),
-                         size_t length MY_ATTRIBUTE((unused))) {
+bool my_propagate_simple(const CHARSET_INFO *cs [[maybe_unused]],
+                         const uchar *str [[maybe_unused]],
+                         size_t length [[maybe_unused]]) {
   return true;
 }
 
-bool my_propagate_complex(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                          const uchar *str MY_ATTRIBUTE((unused)),
-                          size_t length MY_ATTRIBUTE((unused))) {
+bool my_propagate_complex(const CHARSET_INFO *cs [[maybe_unused]],
+                          const uchar *str [[maybe_unused]],
+                          size_t length [[maybe_unused]]) {
   return false;
 }
 
diff -Nru mysql-8.0-8.0.26/strings/ctype-sjis.cc mysql-8.0-8.0.27/strings/ctype-sjis.cc
--- mysql-8.0-8.0.26/strings/ctype-sjis.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/strings/ctype-sjis.cc	2021-09-28 11:46:34.000000000 +0000
@@ -242,14 +242,13 @@
   ((0x40 <= (c) && (c) <= 0x7e) || (0x80 <= (c) && (c) <= 0xfc))
 
 extern "C" {
-static uint ismbchar_sjis(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static uint ismbchar_sjis(const CHARSET_INFO *cs [[maybe_unused]],
                           const char *p, const char *e) {
   return (issjishead((uchar)*p) && (e - p) > 1 && issjistail((uchar)p[1]) ? 2
                                                                           : 0);
 }
 
-static uint mbcharlen_sjis(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                           uint c) {
+static uint mbcharlen_sjis(const CHARSET_INFO *cs [[maybe_unused]], uint c) {
   return (issjishead((uchar)c) ? 2 : 1);
 }
 }  // extern "C"
@@ -17844,8 +17843,8 @@
   @retval   MY_CS_ILSEQ    If a wrong byte sequence was found
 */
 extern "C" {
-static int my_mb_wc_sjis(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                         my_wc_t *pwc, const uchar *s, const uchar *e) {
+static int my_mb_wc_sjis(const CHARSET_INFO *cs [[maybe_unused]], my_wc_t *pwc,
+                         const uchar *s, const uchar *e) {
   int hi;
 
   if (s >= e) return MY_CS_TOOSMALL;
@@ -17884,8 +17883,8 @@
   @retval   2              If a 2-byte character was put
   @retval   MY_CS_ILUNI    If the Unicode character does not exist in SJIS
 */
-static int my_wc_mb_sjis(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                         my_wc_t wc, uchar *s, uchar *e) {
+static int my_wc_mb_sjis(const CHARSET_INFO *cs [[maybe_unused]], my_wc_t wc,
+                         uchar *s, uchar *e) {
   int code;
 
   if ((int)wc < 0x80) /* ASCII: [U+0000..U+007F] -> [00-7F] */
@@ -17924,7 +17923,7 @@
   return 2;
 }
 
-static size_t my_numcells_sjis(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static size_t my_numcells_sjis(const CHARSET_INFO *cs [[maybe_unused]],
                                const char *str, const char *str_end) {
   size_t clen;
   const uchar *b = (const uchar *)str;
@@ -17949,9 +17948,9 @@
   Returns a well formed length of a SJIS string.
   CP932 additional characters are also accepted.
 */
-static size_t my_well_formed_len_sjis(
-    const CHARSET_INFO *cs MY_ATTRIBUTE((unused)), const char *b, const char *e,
-    size_t pos, int *error) {
+static size_t my_well_formed_len_sjis(const CHARSET_INFO *cs [[maybe_unused]],
+                                      const char *b, const char *e, size_t pos,
+                                      int *error) {
   const char *b0 = b;
   *error = 0;
   while (pos-- && b < e) {
diff -Nru mysql-8.0-8.0.26/strings/ctype-tis620.cc mysql-8.0-8.0.27/strings/ctype-tis620.cc
--- mysql-8.0-8.0.26/strings/ctype-tis620.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/strings/ctype-tis620.cc	2021-09-28 11:46:34.000000000 +0000
@@ -590,7 +590,7 @@
 */
 
 extern "C" {
-static int my_strnncoll_tis620(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static int my_strnncoll_tis620(const CHARSET_INFO *cs [[maybe_unused]],
                                const uchar *s1, size_t len1, const uchar *s2,
                                size_t len2, bool s2_is_prefix) {
   uchar buf[80];
@@ -614,7 +614,7 @@
   return i;
 }
 
-static int my_strnncollsp_tis620(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static int my_strnncollsp_tis620(const CHARSET_INFO *cs [[maybe_unused]],
                                  const uchar *a0, size_t a_length,
                                  const uchar *b0, size_t b_length) {
   uchar buf[80], *end, *a, *b, *alloced = nullptr;
@@ -860,16 +860,16 @@
     nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, plFF};
 
 extern "C" {
-static int my_mb_wc_tis620(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                           my_wc_t *wc, const uchar *str, const uchar *end) {
+static int my_mb_wc_tis620(const CHARSET_INFO *cs [[maybe_unused]], my_wc_t *wc,
+                           const uchar *str, const uchar *end) {
   if (str >= end) return MY_CS_TOOSMALL;
 
   *wc = cs_to_uni[*str];
   return (!wc[0] && str[0]) ? -1 : 1;
 }
 
-static int my_wc_mb_tis620(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                           my_wc_t wc, uchar *str, uchar *end) {
+static int my_wc_mb_tis620(const CHARSET_INFO *cs [[maybe_unused]], my_wc_t wc,
+                           uchar *str, uchar *end) {
   const uchar *pl;
 
   if (str >= end) return MY_CS_TOOSMALL;
diff -Nru mysql-8.0-8.0.26/strings/ctype-uca.cc mysql-8.0-8.0.27/strings/ctype-uca.cc
--- mysql-8.0-8.0.26/strings/ctype-uca.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/strings/ctype-uca.cc	2021-09-28 11:46:34.000000000 +0000
@@ -5033,8 +5033,8 @@
   a constant just if the collation itself allows expansions or contractions.
 */
 bool my_propagate_uca_900(const CHARSET_INFO *cs,
-                          const uchar *str MY_ATTRIBUTE((unused)),
-                          size_t length MY_ATTRIBUTE((unused))) {
+                          const uchar *str [[maybe_unused]],
+                          size_t length [[maybe_unused]]) {
   return !my_uca_have_contractions(cs->uca);
 }
 
@@ -5055,8 +5055,8 @@
 
   if (dst != dst_end) {
     scanner.for_each_weight(
-        [&dst, dst_end](
-            int s_res, bool is_level_separator MY_ATTRIBUTE((unused))) -> bool {
+        [&dst, dst_end](int s_res,
+                        bool is_level_separator [[maybe_unused]]) -> bool {
           assert(is_level_separator == (s_res == 0));
           if (LEVELS_FOR_COMPARE == 1) assert(!is_level_separator);
 
@@ -5080,7 +5080,7 @@
 
 static size_t my_strnxfrm_uca_900(const CHARSET_INFO *cs, uchar *dst,
                                   size_t dstlen,
-                                  uint num_codepoints MY_ATTRIBUTE((unused)),
+                                  uint num_codepoints [[maybe_unused]],
                                   const uchar *src, size_t srclen, uint flags) {
   if (cs->cset->mb_wc == my_mb_wc_utf8mb4_thunk) {
     switch (cs->levels_for_compare) {
@@ -11393,10 +11393,12 @@
   my_strnxfrm_unicode_full_bin() chooses to transform to UCS before collation;
   this is purely for legacy reasons and is not needed here.
  */
-static size_t my_strnxfrm_utf8mb4_0900_bin(
-    const CHARSET_INFO *cs MY_ATTRIBUTE((unused)), uchar *dst, size_t dstlen,
-    uint nweights MY_ATTRIBUTE((unused)), const uchar *src, size_t srclen,
-    uint flags) {
+static size_t my_strnxfrm_utf8mb4_0900_bin(const CHARSET_INFO *cs
+                                           [[maybe_unused]],
+                                           uchar *dst, size_t dstlen,
+                                           uint nweights [[maybe_unused]],
+                                           const uchar *src, size_t srclen,
+                                           uint flags) {
   assert(src);
 
   size_t weight_len = std::min<size_t>(srclen, dstlen);
diff -Nru mysql-8.0-8.0.26/strings/ctype-ucs2.cc mysql-8.0-8.0.27/strings/ctype-ucs2.cc
--- mysql-8.0-8.0.26/strings/ctype-ucs2.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/strings/ctype-ucs2.cc	2021-09-28 11:46:34.000000000 +0000
@@ -69,24 +69,21 @@
 }
 
 extern "C" {
-static size_t my_caseup_str_mb2_or_mb4(const CHARSET_INFO *cs
-                                           MY_ATTRIBUTE((unused)),
-                                       char *s MY_ATTRIBUTE((unused))) {
+static size_t my_caseup_str_mb2_or_mb4(const CHARSET_INFO *cs [[maybe_unused]],
+                                       char *s [[maybe_unused]]) {
   assert(0);
   return 0;
 }
 
-static size_t my_casedn_str_mb2_or_mb4(const CHARSET_INFO *cs
-                                           MY_ATTRIBUTE((unused)),
-                                       char *s MY_ATTRIBUTE((unused))) {
+static size_t my_casedn_str_mb2_or_mb4(const CHARSET_INFO *cs [[maybe_unused]],
+                                       char *s [[maybe_unused]]) {
   assert(0);
   return 0;
 }
 
-static int my_strcasecmp_mb2_or_mb4(const CHARSET_INFO *cs
-                                        MY_ATTRIBUTE((unused)),
-                                    const char *s MY_ATTRIBUTE((unused)),
-                                    const char *t MY_ATTRIBUTE((unused))) {
+static int my_strcasecmp_mb2_or_mb4(const CHARSET_INFO *cs [[maybe_unused]],
+                                    const char *s [[maybe_unused]],
+                                    const char *t [[maybe_unused]]) {
   assert(0);
   return 0;
 }
@@ -894,8 +891,8 @@
 }
 
 extern "C" {
-static size_t my_snprintf_mb2(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                              char *to, size_t n, const char *fmt, ...) {
+static size_t my_snprintf_mb2(const CHARSET_INFO *cs [[maybe_unused]], char *to,
+                              size_t n, const char *fmt, ...) {
   size_t retval;
   va_list args;
   va_start(args, fmt);
@@ -904,7 +901,7 @@
   return retval;
 }
 
-static size_t my_lengthsp_mb2(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static size_t my_lengthsp_mb2(const CHARSET_INFO *cs [[maybe_unused]],
                               const char *ptr, size_t length) {
   const char *end = ptr + length;
   while (end > ptr + 1 && end[-1] == ' ' && end[-2] == '\0') end -= 2;
@@ -937,8 +934,8 @@
   (((a & 3) << 18) + (b << 10) + ((c & 3) << 8) + d + 0x10000)
 
 extern "C" {
-static int my_utf16_uni(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                        my_wc_t *pwc, const uchar *s, const uchar *e) {
+static int my_utf16_uni(const CHARSET_INFO *cs [[maybe_unused]], my_wc_t *pwc,
+                        const uchar *s, const uchar *e) {
   if (s + 2 > e) return MY_CS_TOOSMALL2;
 
   /*
@@ -965,8 +962,8 @@
   return 2;
 }
 
-static int my_uni_utf16(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                        my_wc_t wc, uchar *s, uchar *e) {
+static int my_uni_utf16(const CHARSET_INFO *cs [[maybe_unused]], my_wc_t wc,
+                        uchar *s, uchar *e) {
   if (wc <= 0xFFFF) {
     if (s + 2 > e) return MY_CS_TOOSMALL2;
     if (MY_UTF16_SURROGATE(wc)) return MY_CS_ILUNI;
@@ -1014,8 +1011,8 @@
 
 extern "C" {
 static size_t my_caseup_utf16(const CHARSET_INFO *cs, char *src, size_t srclen,
-                              char *dst MY_ATTRIBUTE((unused)),
-                              size_t dstlen MY_ATTRIBUTE((unused))) {
+                              char *dst [[maybe_unused]],
+                              size_t dstlen [[maybe_unused]]) {
   my_wc_t wc;
   int res;
   char *srcend = src + srclen;
@@ -1057,8 +1054,8 @@
 }
 
 static size_t my_casedn_utf16(const CHARSET_INFO *cs, char *src, size_t srclen,
-                              char *dst MY_ATTRIBUTE((unused)),
-                              size_t dstlen MY_ATTRIBUTE((unused))) {
+                              char *dst [[maybe_unused]],
+                              size_t dstlen [[maybe_unused]]) {
   my_wc_t wc;
   int res;
   char *srcend = src + srclen;
@@ -1192,7 +1189,7 @@
   return (uint)(res > 0 ? res : 0);
 }
 
-static uint my_mbcharlen_utf16(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static uint my_mbcharlen_utf16(const CHARSET_INFO *cs [[maybe_unused]],
                                uint c) {
   assert(0);
   return MY_UTF16_HIGH_HEAD(c) ? 4 : 2;
@@ -1479,8 +1476,8 @@
     PAD_SPACE};
 
 extern "C" {
-static int my_utf16le_uni(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                          my_wc_t *pwc, const uchar *s, const uchar *e) {
+static int my_utf16le_uni(const CHARSET_INFO *cs [[maybe_unused]], my_wc_t *pwc,
+                          const uchar *s, const uchar *e) {
   my_wc_t lo;
 
   if (s + 2 > e) return MY_CS_TOOSMALL2;
@@ -1504,8 +1501,8 @@
   return 4;
 }
 
-static int my_uni_utf16le(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                          my_wc_t wc, uchar *s, uchar *e) {
+static int my_uni_utf16le(const CHARSET_INFO *cs [[maybe_unused]], my_wc_t wc,
+                          uchar *s, uchar *e) {
   if (wc < MY_UTF16_SURROGATE_HIGH_FIRST ||
       (wc > MY_UTF16_SURROGATE_LOW_LAST && wc <= 0xFFFF)) {
     if (s + 2 > e) return MY_CS_TOOSMALL2;
@@ -1525,7 +1522,7 @@
   return 4; /* [010000-10FFFF] */
 }
 
-static size_t my_lengthsp_utf16le(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static size_t my_lengthsp_utf16le(const CHARSET_INFO *cs [[maybe_unused]],
                                   const char *ptr, size_t length) {
   const char *end = ptr + length;
   while (end > ptr + 1 && uint2korr(end - 2) == 0x20) end -= 2;
@@ -1635,15 +1632,15 @@
     PAD_SPACE};
 
 extern "C" {
-static int my_utf32_uni(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                        my_wc_t *pwc, const uchar *s, const uchar *e) {
+static int my_utf32_uni(const CHARSET_INFO *cs [[maybe_unused]], my_wc_t *pwc,
+                        const uchar *s, const uchar *e) {
   if (s + 4 > e) return MY_CS_TOOSMALL4;
   *pwc = (((my_wc_t)s[0]) << 24) + (s[1] << 16) + (s[2] << 8) + (s[3]);
   return 4;
 }
 
-static int my_uni_utf32(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                        my_wc_t wc, uchar *s, uchar *e) {
+static int my_uni_utf32(const CHARSET_INFO *cs [[maybe_unused]], my_wc_t wc,
+                        uchar *s, uchar *e) {
   if (s + 4 > e) return MY_CS_TOOSMALL4;
 
   s[0] = (uchar)(wc >> 24);
@@ -1680,8 +1677,8 @@
 
 extern "C" {
 static size_t my_caseup_utf32(const CHARSET_INFO *cs, char *src, size_t srclen,
-                              char *dst MY_ATTRIBUTE((unused)),
-                              size_t dstlen MY_ATTRIBUTE((unused))) {
+                              char *dst [[maybe_unused]],
+                              size_t dstlen [[maybe_unused]]) {
   my_wc_t wc;
   int res;
   char *srcend = src + srclen;
@@ -1740,8 +1737,8 @@
 }
 
 static size_t my_casedn_utf32(const CHARSET_INFO *cs, char *src, size_t srclen,
-                              char *dst MY_ATTRIBUTE((unused)),
-                              size_t dstlen MY_ATTRIBUTE((unused))) {
+                              char *dst [[maybe_unused]],
+                              size_t dstlen [[maybe_unused]]) {
   my_wc_t wc;
   int res;
   char *srcend = src + srclen;
@@ -1867,19 +1864,19 @@
   return res;
 }
 
-static size_t my_strnxfrmlen_utf32(
-    const CHARSET_INFO *cs MY_ATTRIBUTE((unused)), size_t len) {
+static size_t my_strnxfrmlen_utf32(const CHARSET_INFO *cs [[maybe_unused]],
+                                   size_t len) {
   return len / 2;
 }
 
-static uint my_ismbchar_utf32(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                              const char *b MY_ATTRIBUTE((unused)),
-                              const char *e MY_ATTRIBUTE((unused))) {
+static uint my_ismbchar_utf32(const CHARSET_INFO *cs [[maybe_unused]],
+                              const char *b [[maybe_unused]],
+                              const char *e [[maybe_unused]]) {
   return 4;
 }
 
-static uint my_mbcharlen_utf32(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                               uint c MY_ATTRIBUTE((unused))) {
+static uint my_mbcharlen_utf32(const CHARSET_INFO *cs [[maybe_unused]],
+                               uint c [[maybe_unused]]) {
   return 4;
 }
 }  // extern "C"
@@ -1960,7 +1957,7 @@
 }
 
 extern "C" {
-static size_t my_snprintf_utf32(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static size_t my_snprintf_utf32(const CHARSET_INFO *cs [[maybe_unused]],
                                 char *to, size_t n, const char *fmt, ...) {
   size_t retval;
   va_list args;
@@ -1970,9 +1967,9 @@
   return retval;
 }
 
-static longlong my_strtoll10_utf32(
-    const CHARSET_INFO *cs MY_ATTRIBUTE((unused)), const char *nptr,
-    const char **endptr, int *error) {
+static longlong my_strtoll10_utf32(const CHARSET_INFO *cs [[maybe_unused]],
+                                   const char *nptr, const char **endptr,
+                                   int *error) {
   const char *s, *end, *start, *n_end, *true_end;
   uchar c;
   unsigned long i, j, k;
@@ -2108,20 +2105,20 @@
   return 0;
 }
 
-static size_t my_numchars_utf32(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static size_t my_numchars_utf32(const CHARSET_INFO *cs [[maybe_unused]],
                                 const char *b, const char *e) {
   return (size_t)(e - b) / 4;
 }
 
-static size_t my_charpos_utf32(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static size_t my_charpos_utf32(const CHARSET_INFO *cs [[maybe_unused]],
                                const char *b, const char *e, size_t pos) {
   size_t string_length = (size_t)(e - b);
   return pos * 4 > string_length ? string_length + 4 : pos * 4;
 }
 
-static size_t my_well_formed_len_utf32(
-    const CHARSET_INFO *cs MY_ATTRIBUTE((unused)), const char *b, const char *e,
-    size_t nchars, int *error) {
+static size_t my_well_formed_len_utf32(const CHARSET_INFO *cs [[maybe_unused]],
+                                       const char *b, const char *e,
+                                       size_t nchars, int *error) {
   /* Ensure string length is divisible by 4 */
   const char *b0 = b;
   size_t length = e - b;
@@ -2165,7 +2162,7 @@
   }
 }
 
-static size_t my_lengthsp_utf32(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static size_t my_lengthsp_utf32(const CHARSET_INFO *cs [[maybe_unused]],
                                 const char *ptr, size_t length) {
   const char *end = ptr + length;
   assert((length % 4) == 0);
@@ -2223,9 +2220,9 @@
 }
 
 extern "C" {
-static int my_strnncollsp_utf32_bin(
-    const CHARSET_INFO *cs MY_ATTRIBUTE((unused)), const uchar *s, size_t slen,
-    const uchar *t, size_t tlen) {
+static int my_strnncollsp_utf32_bin(const CHARSET_INFO *cs [[maybe_unused]],
+                                    const uchar *s, size_t slen, const uchar *t,
+                                    size_t tlen) {
   const uchar *se, *te;
   size_t minlen;
 
@@ -2468,8 +2465,8 @@
     255};
 
 extern "C" {
-static int my_ucs2_uni(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                       my_wc_t *pwc, const uchar *s, const uchar *e) {
+static int my_ucs2_uni(const CHARSET_INFO *cs [[maybe_unused]], my_wc_t *pwc,
+                       const uchar *s, const uchar *e) {
   if (s + 2 > e) /* Need 2 characters */
     return MY_CS_TOOSMALL2;
 
@@ -2477,8 +2474,8 @@
   return 2;
 }
 
-static int my_uni_ucs2(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                       my_wc_t wc, uchar *r, uchar *e) {
+static int my_uni_ucs2(const CHARSET_INFO *cs [[maybe_unused]], my_wc_t wc,
+                       uchar *r, uchar *e) {
   if (r + 2 > e) return MY_CS_TOOSMALL2;
 
   if (wc > 0xFFFF) /* UCS2 does not support characters outside BMP */
@@ -2512,8 +2509,8 @@
 
 extern "C" {
 static size_t my_caseup_ucs2(const CHARSET_INFO *cs, char *src, size_t srclen,
-                             char *dst MY_ATTRIBUTE((unused)),
-                             size_t dstlen MY_ATTRIBUTE((unused))) {
+                             char *dst [[maybe_unused]],
+                             size_t dstlen [[maybe_unused]]) {
   my_wc_t wc;
   int res;
   char *srcend = src + srclen;
@@ -2557,8 +2554,8 @@
 }
 
 static size_t my_casedn_ucs2(const CHARSET_INFO *cs, char *src, size_t srclen,
-                             char *dst MY_ATTRIBUTE((unused)),
-                             size_t dstlen MY_ATTRIBUTE((unused))) {
+                             char *dst [[maybe_unused]],
+                             size_t dstlen [[maybe_unused]]) {
   my_wc_t wc;
   int res;
   char *srcend = src + srclen;
@@ -2574,7 +2571,7 @@
   return srclen;
 }
 
-static void my_fill_ucs2(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)), char *s,
+static void my_fill_ucs2(const CHARSET_INFO *cs [[maybe_unused]], char *s,
                          size_t l, int fill) {
   assert(fill <= 0xFFFF);
   for (; l >= 2; s[0] = (fill >> 8), s[1] = (fill & 0xFF), s += 2, l -= 2)
@@ -2679,31 +2676,31 @@
   return 0;
 }
 
-static uint my_ismbchar_ucs2(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                             const char *b MY_ATTRIBUTE((unused)),
-                             const char *e MY_ATTRIBUTE((unused))) {
+static uint my_ismbchar_ucs2(const CHARSET_INFO *cs [[maybe_unused]],
+                             const char *b [[maybe_unused]],
+                             const char *e [[maybe_unused]]) {
   return 2;
 }
 
-static uint my_mbcharlen_ucs2(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                              uint c MY_ATTRIBUTE((unused))) {
+static uint my_mbcharlen_ucs2(const CHARSET_INFO *cs [[maybe_unused]],
+                              uint c [[maybe_unused]]) {
   return 2;
 }
 
-static size_t my_numchars_ucs2(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static size_t my_numchars_ucs2(const CHARSET_INFO *cs [[maybe_unused]],
                                const char *b, const char *e) {
   return (size_t)(e - b) / 2;
 }
 
-static size_t my_charpos_ucs2(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static size_t my_charpos_ucs2(const CHARSET_INFO *cs [[maybe_unused]],
                               const char *b, const char *e, size_t pos) {
   size_t string_length = (size_t)(e - b);
   return pos > string_length ? string_length + 2 : pos * 2;
 }
 
-static size_t my_well_formed_len_ucs2(
-    const CHARSET_INFO *cs MY_ATTRIBUTE((unused)), const char *b, const char *e,
-    size_t nchars, int *error) {
+static size_t my_well_formed_len_ucs2(const CHARSET_INFO *cs [[maybe_unused]],
+                                      const char *b, const char *e,
+                                      size_t nchars, int *error) {
   /* Ensure string length is dividable with 2 */
   size_t nbytes = ((size_t)(e - b)) & ~(size_t)1;
   *error = 0;
@@ -2754,9 +2751,9 @@
   return (int)(t_is_prefix ? t - te : ((se - s) - (te - t)));
 }
 
-static int my_strnncollsp_ucs2_bin(
-    const CHARSET_INFO *cs MY_ATTRIBUTE((unused)), const uchar *s, size_t slen,
-    const uchar *t, size_t tlen) {
+static int my_strnncollsp_ucs2_bin(const CHARSET_INFO *cs [[maybe_unused]],
+                                   const uchar *s, size_t slen, const uchar *t,
+                                   size_t tlen) {
   const uchar *se, *te;
   size_t minlen;
 
@@ -2791,7 +2788,7 @@
   return 0;
 }
 
-static void my_hash_sort_ucs2_bin(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static void my_hash_sort_ucs2_bin(const CHARSET_INFO *cs [[maybe_unused]],
                                   const uchar *key, size_t len, uint64 *nr1,
                                   uint64 *nr2) {
   const uchar *pos = key;
diff -Nru mysql-8.0-8.0.26/strings/ctype-ujis.cc mysql-8.0-8.0.27/strings/ctype-ujis.cc
--- mysql-8.0-8.0.26/strings/ctype-ujis.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/strings/ctype-ujis.cc	2021-09-28 11:46:34.000000000 +0000
@@ -280,7 +280,7 @@
 #define isujis_ss3(c) (((c)&0xff) == 0x8f)
 
 extern "C" {
-static uint ismbchar_ujis(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static uint ismbchar_ujis(const CHARSET_INFO *cs [[maybe_unused]],
                           const char *p, const char *e) {
   return ((static_cast<uchar>(*p) < 0x80)
               ? 0
@@ -294,8 +294,7 @@
                                 : 0);
 }
 
-static uint mbcharlen_ujis(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                           uint c) {
+static uint mbcharlen_ujis(const CHARSET_INFO *cs [[maybe_unused]], uint c) {
   return (isujis(c) ? 2 : isujis_ss2(c) ? 2 : isujis_ss3(c) ? 3 : 1);
 }
 
@@ -307,9 +306,9 @@
   [xA1-xFE][xA1-xFE]		# JIS X 0208:1997 (two bytes/char)
 */
 
-static size_t my_well_formed_len_ujis(
-    const CHARSET_INFO *cs MY_ATTRIBUTE((unused)), const char *beg,
-    const char *end, size_t pos, int *error) {
+static size_t my_well_formed_len_ujis(const CHARSET_INFO *cs [[maybe_unused]],
+                                      const char *beg, const char *end,
+                                      size_t pos, int *error) {
   const uchar *b = pointer_cast<const uchar *>(beg);
 
   for (*error = 0; pos && b < pointer_cast<const uchar *>(end); pos--, b++) {
@@ -351,7 +350,7 @@
   return (size_t)(b - pointer_cast<const uchar *>(beg));
 }
 
-static size_t my_numcells_eucjp(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static size_t my_numcells_eucjp(const CHARSET_INFO *cs [[maybe_unused]],
                                 const char *str, const char *str_end) {
   size_t clen;
   const uchar *b = (const uchar *)str;
@@ -33189,7 +33188,7 @@
   @retval   MY_CS_ILSEQ    If a wrong byte sequence was found
 */
 extern "C" {
-static int my_mb_wc_euc_jp(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static int my_mb_wc_euc_jp(const CHARSET_INFO *cs [[maybe_unused]],
                            my_wc_t *pwc, const uchar *s, const uchar *e) {
   int hi;
 
@@ -33243,8 +33242,8 @@
   @retval   2              If a 2-byte character was put
   @retval   MY_CS_ILUNI    If the Unicode character does not exist in UJIS
 */
-static int my_wc_mb_euc_jp(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                           my_wc_t wc, uchar *s, uchar *e) {
+static int my_wc_mb_euc_jp(const CHARSET_INFO *cs [[maybe_unused]], my_wc_t wc,
+                           uchar *s, uchar *e) {
   int jp;
 
   if ((int)wc < 0x80) /* ASCII [00-7F] */
@@ -35727,7 +35726,7 @@
   Generic function to handle UPPER and LOWER translation
 */
 static size_t my_casefold_ujis(const CHARSET_INFO *cs, char *src, size_t srclen,
-                               char *dst, size_t dstlen MY_ATTRIBUTE((unused)),
+                               char *dst, size_t dstlen [[maybe_unused]],
                                const uchar *map, size_t is_upper) {
   char *srcend = src + srclen, *dst0 = dst;
 
diff -Nru mysql-8.0-8.0.26/strings/ctype-utf8.cc mysql-8.0-8.0.27/strings/ctype-utf8.cc
--- mysql-8.0-8.0.26/strings/ctype-utf8.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/strings/ctype-utf8.cc	2021-09-28 11:46:34.000000000 +0000
@@ -5263,8 +5263,8 @@
 }
 
 extern "C" {
-static int my_uni_utf8(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                       my_wc_t wc, uchar *r, uchar *e) {
+static int my_uni_utf8(const CHARSET_INFO *cs [[maybe_unused]], my_wc_t wc,
+                       uchar *r, uchar *e) {
   int count;
 
   if (r >= e) return MY_CS_TOOSMALL;
@@ -5288,11 +5288,13 @@
     case 3:
       r[2] = (uchar)(0x80 | (wc & 0x3f));
       wc = wc >> 6;
-      wc |= 0x800;  // Fall through.
+      wc |= 0x800;
+      [[fallthrough]];
     case 2:
       r[1] = (uchar)(0x80 | (wc & 0x3f));
       wc = wc >> 6;
-      wc |= 0xc0;  // Fall through.
+      wc |= 0xc0;
+      [[fallthrough]];
     case 1:
       r[0] = (uchar)wc;
   }
@@ -5303,7 +5305,7 @@
 /*
   The same as above, but without range check.
 */
-static int my_uni_utf8_no_range(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static int my_uni_utf8_no_range(const CHARSET_INFO *cs [[maybe_unused]],
                                 my_wc_t wc, uchar *r) {
   int count;
 
@@ -5320,11 +5322,13 @@
     case 3:
       r[2] = (uchar)(0x80 | (wc & 0x3f));
       wc = wc >> 6;
-      wc |= 0x800;  // Fall through.
+      wc |= 0x800;
+      [[fallthrough]];
     case 2:
       r[1] = (uchar)(0x80 | (wc & 0x3f));
       wc = wc >> 6;
-      wc |= 0xc0;  // Fall through.
+      wc |= 0xc0;
+      [[fallthrough]];
     case 1:
       r[0] = (uchar)wc;
   }
@@ -5672,7 +5676,7 @@
                             w_many, uni_plane);
 }
 
-static size_t my_strnxfrmlen_utf8(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static size_t my_strnxfrmlen_utf8(const CHARSET_INFO *cs [[maybe_unused]],
                                   size_t len) {
   // We really ought to have len % 3 == 0, but not all calling code conforms.
   return ((len + 2) / 3) * 2;
@@ -5705,8 +5709,7 @@
   return (res > 1) ? res : 0;
 }
 
-static uint my_mbcharlen_utf8(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                              uint c) {
+static uint my_mbcharlen_utf8(const CHARSET_INFO *cs [[maybe_unused]], uint c) {
   if (c < 0x80)
     return 1;
   else if (c < 0xc2)
@@ -6915,7 +6918,7 @@
 #define MY_FILENAME_ESCAPE '@'
 
 extern "C" {
-static int my_mb_wc_filename(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static int my_mb_wc_filename(const CHARSET_INFO *cs [[maybe_unused]],
                              my_wc_t *pwc, const uchar *s, const uchar *e) {
   int byte1, byte2;
   if (s >= e) return MY_CS_TOOSMALL;
@@ -6959,7 +6962,7 @@
   return MY_CS_ILSEQ;
 }
 
-static int my_wc_mb_filename(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static int my_wc_mb_filename(const CHARSET_INFO *cs [[maybe_unused]],
                              my_wc_t wc, uchar *s, uchar *e) {
   int code;
   char hex[] = "0123456789abcdef";
@@ -7204,8 +7207,8 @@
   @return The number of bytes read from s, or a value <= 0 for failure
     (see m_ctype.h).
 */
-int my_mb_wc_utf8_thunk(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                        my_wc_t *pwc, const uchar *s, const uchar *e) {
+int my_mb_wc_utf8_thunk(const CHARSET_INFO *cs [[maybe_unused]], my_wc_t *pwc,
+                        const uchar *s, const uchar *e) {
   return my_mb_wc_utf8(pwc, s, e);
 }
 
@@ -7220,7 +7223,7 @@
   @return The number of bytes read from s, or a value <= 0 for failure
     (see m_ctype.h).
 */
-int my_mb_wc_utf8mb4_thunk(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+int my_mb_wc_utf8mb4_thunk(const CHARSET_INFO *cs [[maybe_unused]],
                            my_wc_t *pwc, const uchar *s, const uchar *e) {
   return my_mb_wc_utf8mb4(pwc, s, e);
 }
@@ -7231,16 +7234,15 @@
   The same as above, but without range check
   for example, for a null-terminated string
 */
-static int my_mb_wc_utf8mb4_no_range(const CHARSET_INFO *cs
-                                         MY_ATTRIBUTE((unused)),
+static int my_mb_wc_utf8mb4_no_range(const CHARSET_INFO *cs [[maybe_unused]],
                                      my_wc_t *pwc, const uchar *s) {
   return my_mb_wc_utf8_prototype</*RANGE_CHECK=*/false, /*SUPPORT_MB4=*/true>(
       pwc, s, nullptr);
 }
 
 extern "C" {
-static int my_wc_mb_utf8mb4(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
-                            my_wc_t wc, uchar *r, uchar *e) {
+static int my_wc_mb_utf8mb4(const CHARSET_INFO *cs [[maybe_unused]], my_wc_t wc,
+                            uchar *r, uchar *e) {
   int count;
 
   if (r >= e) return MY_CS_TOOSMALL;
@@ -7262,15 +7264,18 @@
     case 4:
       r[3] = (uchar)(0x80 | (wc & 0x3f));
       wc = wc >> 6;
-      wc |= 0x10000;  // Fall through.
+      wc |= 0x10000;
+      [[fallthrough]];
     case 3:
       r[2] = (uchar)(0x80 | (wc & 0x3f));
       wc = wc >> 6;
-      wc |= 0x800;  // Fall through.
+      wc |= 0x800;
+      [[fallthrough]];
     case 2:
       r[1] = (uchar)(0x80 | (wc & 0x3f));
       wc = wc >> 6;
-      wc |= 0xc0;  // Fall through.
+      wc |= 0xc0;
+      [[fallthrough]];
     case 1:
       r[0] = (uchar)wc;
   }
@@ -7281,8 +7286,8 @@
 /*
   The same as above, but without range check.
 */
-static int my_wc_mb_utf8mb4_no_range(
-    const CHARSET_INFO *cs MY_ATTRIBUTE((unused)), my_wc_t wc, uchar *r) {
+static int my_wc_mb_utf8mb4_no_range(const CHARSET_INFO *cs [[maybe_unused]],
+                                     my_wc_t wc, uchar *r) {
   int count;
 
   if (wc < 0x80)
@@ -7300,15 +7305,18 @@
     case 4:
       r[3] = (uchar)(0x80 | (wc & 0x3f));
       wc = wc >> 6;
-      wc |= 0x10000;  // Fall through.
+      wc |= 0x10000;
+      [[fallthrough]];
     case 3:
       r[2] = (uchar)(0x80 | (wc & 0x3f));
       wc = wc >> 6;
-      wc |= 0x800;  // Fall through.
+      wc |= 0x800;
+      [[fallthrough]];
     case 2:
       r[1] = (uchar)(0x80 | (wc & 0x3f));
       wc = wc >> 6;
-      wc |= 0xc0;  // Fall through.
+      wc |= 0xc0;
+      [[fallthrough]];
     case 1:
       r[0] = (uchar)wc;
   }
@@ -7655,16 +7663,17 @@
                             w_many, cs->caseinfo);
 }
 
-static size_t my_strnxfrmlen_utf8mb4(
-    const CHARSET_INFO *cs MY_ATTRIBUTE((unused)), size_t len) {
+static size_t my_strnxfrmlen_utf8mb4(const CHARSET_INFO *cs [[maybe_unused]],
+                                     size_t len) {
   // We really ought to have len % 4 == 0, but not all calling code conforms.
   return ((len + 3) / 4) * 2;
 }
 }  // extern "C"
 
-static ALWAYS_INLINE int my_valid_mbcharlen_utf8mb4(
-    const CHARSET_INFO *cs MY_ATTRIBUTE((unused)), const uchar *s,
-    const uchar *e) {
+static ALWAYS_INLINE int my_valid_mbcharlen_utf8mb4(const CHARSET_INFO *cs
+                                                    [[maybe_unused]],
+                                                    const uchar *s,
+                                                    const uchar *e) {
   my_wc_t wc;  // Ignored.
   return my_mb_wc_utf8_prototype</*RANGE_CHECK=*/true, /*SUPPORT_MB4=*/true>(
       &wc, s, e);
@@ -7726,7 +7735,7 @@
   return (size_t)(length ? end + 2 - start : pos - start);
 }
 
-static uint my_mbcharlen_utf8mb4(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static uint my_mbcharlen_utf8mb4(const CHARSET_INFO *cs [[maybe_unused]],
                                  uint c) {
   if (c < 0x80) return 1;
   if (c < 0xc2) return 0; /* Illegal mb head */
diff -Nru mysql-8.0-8.0.26/strings/ctype-win1250ch.cc mysql-8.0-8.0.27/strings/ctype-win1250ch.cc
--- mysql-8.0-8.0.26/strings/ctype-win1250ch.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/strings/ctype-win1250ch.cc	2021-09-28 11:46:34.000000000 +0000
@@ -400,7 +400,7 @@
   ((pointer_cast<const char *>(p) - pointer_cast<const char *>(src)) >= (len))
 
 extern "C" {
-static int my_strnncoll_win1250ch(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+static int my_strnncoll_win1250ch(const CHARSET_INFO *cs [[maybe_unused]],
                                   const uchar *s1, size_t len1, const uchar *s2,
                                   size_t len2, bool s2_is_prefix) {
   int v1, v2;
@@ -434,10 +434,11 @@
   return my_strnncoll_win1250ch(cs, s, slen, t, tlen, false);
 }
 
-static size_t my_strnxfrm_win1250ch(
-    const CHARSET_INFO *cs MY_ATTRIBUTE((unused)), uchar *dest, size_t len,
-    uint nweights_arg MY_ATTRIBUTE((unused)), const uchar *src, size_t srclen,
-    uint flags) {
+static size_t my_strnxfrm_win1250ch(const CHARSET_INFO *cs [[maybe_unused]],
+                                    uchar *dest, size_t len,
+                                    uint nweights_arg [[maybe_unused]],
+                                    const uchar *src, size_t srclen,
+                                    uint flags) {
   int value;
   const uchar *p;
   int pass = 0;
diff -Nru mysql-8.0-8.0.26/strings/decimal.cc mysql-8.0-8.0.27/strings/decimal.cc
--- mysql-8.0-8.0.26/strings/decimal.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/strings/decimal.cc	2021-09-28 11:46:34.000000000 +0000
@@ -298,34 +298,44 @@
     /* @note Intentional fallthrough in all case labels */
     case 9:
       if (val >= 1000000000) break;
-      ++ret;  // Fall through.
+      ++ret;
+      [[fallthrough]];
     case 8:
       if (val >= 100000000) break;
-      ++ret;  // Fall through.
+      ++ret;
+      [[fallthrough]];
     case 7:
       if (val >= 10000000) break;
-      ++ret;  // Fall through.
+      ++ret;
+      [[fallthrough]];
     case 6:
       if (val >= 1000000) break;
-      ++ret;  // Fall through.
+      ++ret;
+      [[fallthrough]];
     case 5:
       if (val >= 100000) break;
-      ++ret;  // Fall through.
+      ++ret;
+      [[fallthrough]];
     case 4:
       if (val >= 10000) break;
-      ++ret;  // Fall through.
+      ++ret;
+      [[fallthrough]];
     case 3:
       if (val >= 1000) break;
-      ++ret;  // Fall through.
+      ++ret;
+      [[fallthrough]];
     case 2:
       if (val >= 100) break;
-      ++ret;  // Fall through.
+      ++ret;
+      [[fallthrough]];
     case 1:
       if (val >= 10) break;
-      ++ret;  // Fall through.
+      ++ret;
+      [[fallthrough]];
     case 0:
       if (val >= 1) break;
-      ++ret;  // Fall through.
+      ++ret;
+      [[fallthrough]];
     default: {
       assert(false);
     }
@@ -354,34 +364,44 @@
     /* @note Intentional fallthrough in all case labels */
     case 0:
       if ((uval % 1) != 0) break;
-      ++ret;  // Fall through.
+      ++ret;
+      [[fallthrough]];
     case 1:
       if ((uval % 10) != 0) break;
-      ++ret;  // Fall through.
+      ++ret;
+      [[fallthrough]];
     case 2:
       if ((uval % 100) != 0) break;
-      ++ret;  // Fall through.
+      ++ret;
+      [[fallthrough]];
     case 3:
       if ((uval % 1000) != 0) break;
-      ++ret;  // Fall through.
+      ++ret;
+      [[fallthrough]];
     case 4:
       if ((uval % 10000) != 0) break;
-      ++ret;  // Fall through.
+      ++ret;
+      [[fallthrough]];
     case 5:
       if ((uval % 100000) != 0) break;
-      ++ret;  // Fall through.
+      ++ret;
+      [[fallthrough]];
     case 6:
       if ((uval % 1000000) != 0) break;
-      ++ret;  // Fall through.
+      ++ret;
+      [[fallthrough]];
     case 7:
       if ((uval % 10000000) != 0) break;
-      ++ret;  // Fall through.
+      ++ret;
+      [[fallthrough]];
     case 8:
       if ((uval % 100000000) != 0) break;
-      ++ret;  // Fall through.
+      ++ret;
+      [[fallthrough]];
     case 9:
       if ((uval % 1000000000) != 0) break;
-      ++ret;  // Fall through.
+      ++ret;
+      [[fallthrough]];
     default: {
       assert(false);
     }
diff -Nru mysql-8.0-8.0.26/strings/dtoa.cc mysql-8.0-8.0.27/strings/dtoa.cc
--- mysql-8.0-8.0.26/strings/dtoa.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/strings/dtoa.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1295,7 +1295,7 @@
   for (s = s00; s < end; s++) switch (*s) {
       case '-':
         sign = 1;
-        // Fall through.
+        [[fallthrough]];
       case '+':
         s++;
         goto break2;
@@ -1386,7 +1386,7 @@
     if (++s < end) switch (c = *s) {
         case '-':
           esign = 1;
-          // Fall through.
+          [[fallthrough]];
         case '+':
           if (++s < end) c = *s;
       }
@@ -2096,14 +2096,14 @@
       break;
     case 2:
       leftright = 0;
-      // Fall through.
+      [[fallthrough]];
     case 4:
       if (ndigits <= 0) ndigits = 1;
       ilim = ilim1 = i = ndigits;
       break;
     case 3:
       leftright = 0;
-      // Fall through.
+      [[fallthrough]];
     case 5:
       i = ndigits + k + 1;
       ilim = i;
diff -Nru mysql-8.0-8.0.26/strings/uca9-dump.cc mysql-8.0-8.0.27/strings/uca9-dump.cc
--- mysql-8.0-8.0.26/strings/uca9-dump.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/strings/uca9-dump.cc	2021-09-28 11:46:34.000000000 +0000
@@ -433,7 +433,7 @@
     int bytes = my_mb_wc_utf8mb4(&ja_ch_u16, ja_han, ja_han + ja_length);
     if (bytes <= 0) break;
     ja_han += bytes;
-    int page MY_ATTRIBUTE((unused)) = ja_ch_u16 >> 8;
+    int page [[maybe_unused]] = ja_ch_u16 >> 8;
     assert(page >= 0x4E && page <= 0x9F);
     MY_UCA_ITEM *item = &uca->item[ja_ch_u16 - 0x4E00];
     item->num_of_ce = 1;
diff -Nru mysql-8.0-8.0.26/testclients/bug25714.cc mysql-8.0-8.0.27/testclients/bug25714.cc
--- mysql-8.0-8.0.26/testclients/bug25714.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/testclients/bug25714.cc	2021-09-28 11:46:34.000000000 +0000
@@ -30,7 +30,7 @@
 
 int main(int argc, char **argv) {
   MYSQL conn;
-  int OK MY_ATTRIBUTE((unused));
+  int OK [[maybe_unused]];
 
   const char *query4 = "INSERT INTO federated.t1 SET Value=54";
   const char *query5 = "INSERT INTO federated.t1 SET Value=55";
diff -Nru mysql-8.0-8.0.26/testclients/mysql_client_fw.cc mysql-8.0-8.0.27/testclients/mysql_client_fw.cc
--- mysql-8.0-8.0.26/testclients/mysql_client_fw.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/testclients/mysql_client_fw.cc	2021-09-28 11:46:34.000000000 +0000
@@ -195,24 +195,22 @@
   }
 
 /* Silence unused function warnings for some of the static functions. */
-static int cmp_double(double *a, double *b) MY_ATTRIBUTE((unused));
-static void verify_col_data(const char *table, const char *col,
-                            const char *exp_data) MY_ATTRIBUTE((unused));
-static void do_verify_prepare_field(MYSQL_RES *result, unsigned int no,
-                                    const char *name, const char *org_name,
-                                    enum enum_field_types type,
-                                    const char *table, const char *org_table,
-                                    const char *db, unsigned long length,
-                                    const char *def, const char *file, int line)
-    MY_ATTRIBUTE((unused));
-static void verify_st_affected_rows(MYSQL_STMT *stmt, ulonglong exp_count)
-    MY_ATTRIBUTE((unused));
-static void verify_affected_rows(ulonglong exp_count) MY_ATTRIBUTE((unused));
-static void verify_field_count(MYSQL_RES *result, uint exp_count)
-    MY_ATTRIBUTE((unused));
-static void execute_prepare_query(const char *query, ulonglong exp_count)
-    MY_ATTRIBUTE((unused));
-static bool thread_query(const char *query) MY_ATTRIBUTE((unused));
+[[maybe_unused]] static int cmp_double(double *a, double *b);
+[[maybe_unused]] static void verify_col_data(const char *table, const char *col,
+                                             const char *exp_data);
+[[maybe_unused]] static void do_verify_prepare_field(
+    MYSQL_RES *result, unsigned int no, const char *name, const char *org_name,
+    enum enum_field_types type, const char *table, const char *org_table,
+    const char *db, unsigned long length, const char *def, const char *file,
+    int line);
+[[maybe_unused]] static void verify_st_affected_rows(MYSQL_STMT *stmt,
+                                                     ulonglong exp_count);
+[[maybe_unused]] static void verify_affected_rows(ulonglong exp_count);
+[[maybe_unused]] static void verify_field_count(MYSQL_RES *result,
+                                                uint exp_count);
+[[maybe_unused]] static void execute_prepare_query(const char *query,
+                                                   ulonglong exp_count);
+[[maybe_unused]] static bool thread_query(const char *query);
 
 /* A workaround for Sun Forte 5.6 on Solaris x86 */
 
@@ -1131,7 +1129,7 @@
 static struct my_tests_st *my_testlist = nullptr;
 
 static bool get_one_option(int optid,
-                           const struct my_option *opt MY_ATTRIBUTE((unused)),
+                           const struct my_option *opt [[maybe_unused]],
                            char *argument) {
   switch (optid) {
     case '#':
diff -Nru mysql-8.0-8.0.26/testclients/mysql_client_test.cc mysql-8.0-8.0.27/testclients/mysql_client_test.cc
--- mysql-8.0-8.0.26/testclients/mysql_client_test.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/testclients/mysql_client_test.cc	2021-09-28 11:46:34.000000000 +0000
@@ -20815,6 +20815,7 @@
     char user[32];
     char host[255];
     char password[255];
+    char authfactor[2];
   } Userhostpass;
 
   Userhostpass userhostpass[3];
@@ -20823,6 +20824,7 @@
     strcpy(userhostpass[i].user, row[0]);
     strcpy(userhostpass[i].host, row[1]);
     strcpy(userhostpass[i].password, row[2]);
+    strcpy(userhostpass[i].authfactor, row[3]);
     ++i;
   }
   mysql_free_result(result);
@@ -20850,6 +20852,7 @@
     strcpy(userhostpass[i].user, row[0]);
     strcpy(userhostpass[i].host, row[1]);
     strcpy(userhostpass[i].password, row[2]);
+    strcpy(userhostpass[i].authfactor, row[3]);
     ++i;
   }
   mysql_free_result(result);
@@ -22192,6 +22195,65 @@
       mysql, "UNINSTALL COMPONENT 'file://component_query_attributes'"));
 }
 
+static void test_bug32892045() {
+  myheader("test_bug32892045");
+
+  char command[100];
+  strcpy(command, "USE ");
+  strcat(command, current_db);
+
+  int rc = mysql_query(mysql, command);
+  myquery(rc);
+
+  rc = mysql_query(mysql,
+                   "CREATE TABLE t1 (AAA INT, BBB INT, CCC INT, DDD INT)");
+  myquery(rc);
+
+  MYSQL_STMT *stmt =
+      mysql_simple_prepare(mysql, "SELECT AAA, bbb, cCc, ddd AS eEe FROM t1");
+  check_stmt(stmt);
+
+  MYSQL_RES *result = mysql_stmt_result_metadata(stmt);
+  mytest(result);
+
+  verify_prepare_field(result, 0, "AAA", "AAA", MYSQL_TYPE_LONG, "t1", "t1",
+                       current_db, 11, 0);
+
+  verify_prepare_field(result, 1, "bbb", "BBB", MYSQL_TYPE_LONG, "t1", "t1",
+                       current_db, 11, 0);
+
+  verify_prepare_field(result, 2, "cCc", "CCC", MYSQL_TYPE_LONG, "t1", "t1",
+                       current_db, 11, 0);
+
+  verify_prepare_field(result, 3, "eEe", "DDD", MYSQL_TYPE_LONG, "t1", "t1",
+                       current_db, 11, 0);
+  mysql_free_result(result);
+
+  result = mysql_stmt_result_metadata(stmt);
+  mytest(result);
+
+  my_print_result_metadata(result);
+  mysql_free_result(result);
+  mysql_stmt_close(stmt);
+
+  myquery(mysql_query(mysql, "DROP TABLE t1"));
+}
+
+static void test_bug33164347() {
+  int rc = 0;
+  bool opt = true;
+  struct st_mysql_client_plugin *plugin;
+
+  DBUG_TRACE;
+  myheader("test_bug33164347");
+
+  plugin = mysql_load_plugin(mysql, "qa_auth_client", -1, 0);
+  DIE_UNLESS(plugin == nullptr);
+
+  rc = mysql_plugin_get_option(plugin, "plugin_option", &opt);
+  DIE_UNLESS(rc != 0);
+}
+
 static struct my_tests_st my_tests[] = {
     {"test_bug5194", test_bug5194},
     {"disable_query_logs", disable_query_logs},
@@ -22496,6 +22558,8 @@
     {"test_bug32372038", test_bug32372038},
     {"test_bug32558782", test_bug32558782},
     {"test_bug32847269", test_bug32847269},
+    {"test_bug32892045", test_bug32892045},
+    {"test_bug33164347", test_bug33164347},
     {nullptr, nullptr}};
 
 static struct my_tests_st *get_my_tests() { return my_tests; }
diff -Nru mysql-8.0-8.0.26/unittest/gunit/base_mock_field.h mysql-8.0-8.0.27/unittest/gunit/base_mock_field.h
--- mysql-8.0-8.0.26/unittest/gunit/base_mock_field.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/base_mock_field.h	2021-09-28 11:46:34.000000000 +0000
@@ -63,6 +63,16 @@
   {}
 };
 
+class Base_mock_field_blob : public Field_blob {
+ public:
+  Base_mock_field_blob(uint32 length)
+      : Field_blob(length,              // len_arg
+                   false,               // maybe_null_arg
+                   "field_NAME",        // field_name_arg
+                   &my_charset_latin1,  // char set
+                   true) {}             // set_packlength
+};
+
 class Base_mock_field_json : public Field_json {
  public:
   Base_mock_field_json() : Field_json(MAX_BLOB_WIDTH, true, "json_field") {}
diff -Nru mysql-8.0-8.0.26/unittest/gunit/CMakeLists.txt mysql-8.0-8.0.27/unittest/gunit/CMakeLists.txt
--- mysql-8.0-8.0.26/unittest/gunit/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -81,21 +81,6 @@
 SET_TARGET_PROPERTIES(gunit_small
   PROPERTIES COMPILE_DEFINITIONS "${DISABLE_PSI_DEFINITIONS}"
 )
-IF(MY_COMPILER_IS_SUNPRO)
-  TARGET_COMPILE_OPTIONS(gunit_small PRIVATE $<$<CONFIG:RelWithDebInfo>:-xO4>)
-  # Segfaults in EXPECT_EQ(TYPE_OK, set_field_to_null(field));
-  # unless we switch off optimization.
-  ADD_COMPILE_FLAGS(item_json_func-t.cc COMPILE_FLAGS "-xO0")
-ENDIF()
-
-# Several "small" unit tests got 'missing symbol client_errors'
-# When building with Sun Studio
-ADD_LIBRARY(libmysql_errmsg STATIC
-  ${CMAKE_SOURCE_DIR}/libmysql/errmsg.cc
-)
-SET_TARGET_PROPERTIES(libmysql_errmsg
-  PROPERTIES COMPILE_DEFINITIONS "${DISABLE_PSI_DEFINITIONS}"
-)
 
 ADD_LIBRARY(gunit_large STATIC
   benchmark.cc
@@ -105,11 +90,8 @@
 )
 ADD_DEPENDENCIES(gunit_small GenError)
 ADD_DEPENDENCIES(gunit_large GenError)
-TARGET_LINK_LIBRARIES(gunit_small
-  mysys strings ${GTEST_LIBRARIES} libmysql_errmsg)
-TARGET_LINK_LIBRARIES(gunit_large
-  mysys strings ${GTEST_LIBRARIES})
-MESSAGE(STATUS "GTEST_LIBRARIES:${GTEST_LIBRARIES}")
+TARGET_LINK_LIBRARIES(gunit_small mysys strings ${GTEST_LIBRARIES})
+TARGET_LINK_LIBRARIES(gunit_large mysys strings ${GTEST_LIBRARIES})
 
 IF(WIN32)
   ## Create an object library of nt_servc.cc, so we don't have to
@@ -174,8 +156,8 @@
   mysys_my_time
   mysys_my_write
   mysys_pathfuncs
-  nullable
   opt_recperkey
+  overflow_bitset
   partitioned_rwlock
   pattern_matcher
   prealloced_array
@@ -234,6 +216,7 @@
   gis_frechet_distance
   gis_geometries
   gis_hausdorff_distance
+  gis_intersection
   gis_is_simple
   gis_isvalid
   gis_line_interpolate_point
@@ -241,6 +224,7 @@
   gis_rtree_support
   gis_setops
   gis_srs
+  gis_symdifference
   gis_union
   gis_wkb_parser
   gis_wkb_writer
@@ -328,6 +312,7 @@
   ${CMAKE_SOURCE_DIR}/sql-common/sql_string.cc
   ${CMAKE_SOURCE_DIR}/sql/thr_malloc.cc
   ${CMAKE_SOURCE_DIR}/sql/join_optimizer/hypergraph.cc
+  ${CMAKE_SOURCE_DIR}/sql/join_optimizer/overflow_bitset.cc
   ${CMAKE_SOURCE_DIR}/sql/locks/shared_spin_lock.cc
   )
 
@@ -338,10 +323,11 @@
 )
 
 MYSQL_ADD_EXECUTABLE(merge_small_tests-t ${ALL_SMALL_TESTS}
+  ADD_TEST merge_small_tests
+  COMPILE_DEFINITIONS ${DISABLE_PSI_DEFINITIONS}
   ENABLE_EXPORTS
-  ADD_TEST merge_small_tests)
-TARGET_LINK_LIBRARIES(merge_small_tests-t
-  sqlgunitlib gunit_small)
+  LINK_LIBRARIES sqlgunitlib gunit_small
+  )
 
 IF(WIN32)
   LIST(APPEND ALL_LARGE_TESTS ../../sql/nt_servc.cc)
@@ -349,20 +335,19 @@
 LIST(APPEND ALL_LARGE_TESTS ../../storage/example/ha_example.cc)
 
 MYSQL_ADD_EXECUTABLE(merge_large_tests-t ${ALL_LARGE_TESTS}
+  ADD_TEST merge_large_tests
   ENABLE_EXPORTS
-  ADD_TEST merge_large_tests)
-
-TARGET_LINK_LIBRARIES(merge_large_tests-t
-  gunit_large
-  server_unittest_library
+  LINK_LIBRARIES gunit_large server_unittest_library
   )
 
 FOREACH(test ${TESTS})
   MYSQL_ADD_EXECUTABLE(${test}-t ${test}-t.cc
-    ENABLE_EXPORTS SKIP_INSTALL EXCLUDE_FROM_ALL)
-  ADD_COMPILE_DEFINITIONS(${test}-t.cc
-    COMPILE_DEFINITIONS ${DISABLE_PSI_DEFINITIONS})
-  TARGET_LINK_LIBRARIES(${test}-t sqlgunitlib gunit_small)
+    COMPILE_DEFINITIONS ${DISABLE_PSI_DEFINITIONS}
+    ENABLE_EXPORTS
+    EXCLUDE_FROM_ALL
+    LINK_LIBRARIES sqlgunitlib gunit_small
+    SKIP_INSTALL
+    )
 ENDFOREACH()
 
 # See comments about __builtin_memcmp in the source file.
@@ -387,11 +372,10 @@
     LIST(APPEND SRC_FILES ../../storage/example/ha_example.cc)
   ENDIF()
   MYSQL_ADD_EXECUTABLE(${test}-t ${SRC_FILES}
-    ENABLE_EXPORTS SKIP_INSTALL EXCLUDE_FROM_ALL)
-
-  TARGET_LINK_LIBRARIES(${test}-t
-    gunit_large
-    server_unittest_library
+    ENABLE_EXPORTS
+    EXCLUDE_FROM_ALL
+    LINK_LIBRARIES gunit_large server_unittest_library
+    SKIP_INSTALL
     )
 ENDFOREACH()
 
diff -Nru mysql-8.0-8.0.26/unittest/gunit/components/keyring_common/CMakeLists.txt mysql-8.0-8.0.27/unittest/gunit/components/keyring_common/CMakeLists.txt
--- mysql-8.0-8.0.26/unittest/gunit/components/keyring_common/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/components/keyring_common/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -51,32 +51,34 @@
     )
 ENDIF()
 
-SET(KEYRING_COMPONENT_LIBS)
-LIST(APPEND KEYRING_COMPONENT_LIBS
+SET(KEYRING_COMPONENT_LIBS
   keyring_common
   ${SSL_LIBRARIES}
   ${LIBDL}
   )
 
+IF(COMPONENT_COMPILE_VISIBILITY)
+  SET(COMPILE_OPTIONS_ARG COMPILE_OPTIONS "${COMPONENT_COMPILE_VISIBILITY}")
+ENDIF()
+
 MYSQL_ADD_EXECUTABLE(merge_component_keyring_common_tests-t
  ${ALL_KEYRING_COMPONENT_COMMON_TESTS}
+ ${COMPILE_OPTIONS_ARG}
  ENABLE_EXPORTS
- ADD_TEST merge_component_keyring_common_tests)
-
-TARGET_LINK_LIBRARIES(merge_component_keyring_common_tests-t
-  ${KEYRING_COMPONENT_LIBS}
-  gunit_large
-  server_unittest_library
-  )
+ ADD_TEST merge_component_keyring_common_tests
+ LINK_LIBRARIES
+ ${KEYRING_COMPONENT_LIBS}
+ gunit_large
+ server_unittest_library
+ )
 
 FOREACH(test ${KEYRING_COMPONENT_COMMON_TESTS})
   MYSQL_ADD_EXECUTABLE(${test}-t ${test}-t.cc
+    ${COMPILE_OPTIONS_ARG}
     ENABLE_EXPORTS
     SKIP_INSTALL
     EXCLUDE_FROM_ALL
-    )
-
-  TARGET_LINK_LIBRARIES(${test}-t
+    LINK_LIBRARIES
     ${KEYRING_COMPONENT_LIBS}
     gunit_large
     server_unittest_library
diff -Nru mysql-8.0-8.0.26/unittest/gunit/components/keyring_common/parser-t.cc mysql-8.0-8.0.27/unittest/gunit/components/keyring_common/parser-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/components/keyring_common/parser-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/components/keyring_common/parser-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -27,6 +27,8 @@
 
 #include <gtest/gtest.h>
 
+#include "template_utils.h"
+
 namespace component_load_parser_unittest {
 
 class ComponentLoadParser_test : public ::testing::Test {};
@@ -54,8 +56,9 @@
   }
 }
 
+// Use myu::IsSpace rather than ::isspace to avoid linker warnings on MacOS.
 void remove_spaces(std::string &groups) {
-  groups.erase(std::remove_if(groups.begin(), groups.end(), ::isspace),
+  groups.erase(std::remove_if(groups.begin(), groups.end(), myu::IsSpace),
                groups.end());
 }
 
diff -Nru mysql-8.0-8.0.26/unittest/gunit/components/mysql_server/builtins_stubs.cc mysql-8.0-8.0.27/unittest/gunit/components/mysql_server/builtins_stubs.cc
--- mysql-8.0-8.0.26/unittest/gunit/components/mysql_server/builtins_stubs.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/components/mysql_server/builtins_stubs.cc	2021-09-28 11:46:34.000000000 +0000
@@ -38,43 +38,38 @@
 
 void THD::debug_assert_query_locked() const {}
 
-my_thread_id log_get_thread_id(THD *thd MY_ATTRIBUTE((unused))) { return -1; }
+my_thread_id log_get_thread_id(THD *thd [[maybe_unused]]) { return -1; }
 
-void log_write_errstream(const char *buffer MY_ATTRIBUTE((unused)),
-                         size_t length MY_ATTRIBUTE((unused))) {}
+void log_write_errstream(const char *buffer [[maybe_unused]],
+                         size_t length [[maybe_unused]]) {}
 
-const char *mysql_errno_to_symbol(int mysql_errno MY_ATTRIBUTE((unused))) {
+const char *mysql_errno_to_symbol(int mysql_errno [[maybe_unused]]) {
   return nullptr;
 }
 
-int mysql_symbol_to_errno(const char *error_symbol MY_ATTRIBUTE((unused))) {
+int mysql_symbol_to_errno(const char *error_symbol [[maybe_unused]]) {
   return -1;
 }
 
-const char *mysql_errno_to_sqlstate(uint mysql_errno MY_ATTRIBUTE((unused))) {
+const char *mysql_errno_to_sqlstate(uint mysql_errno [[maybe_unused]]) {
   return nullptr;
 }
 
-int mysql_errno_to_builtin(uint mysql_errno MY_ATTRIBUTE((unused))) {
-  return 0;
-}
+int mysql_errno_to_builtin(uint mysql_errno [[maybe_unused]]) { return 0; }
 
-int log_vmessage(int log_type MY_ATTRIBUTE((unused)),
-                 va_list lili MY_ATTRIBUTE((unused))) {
+int log_vmessage(int log_type [[maybe_unused]], va_list lili [[maybe_unused]]) {
   return -1;
 }
 
-int log_message(int log_type MY_ATTRIBUTE((unused)), ...) { return -1; }
+int log_message(int log_type [[maybe_unused]], ...) { return -1; }
 
-const char *error_message_for_error_log(
-    int mysql_errno MY_ATTRIBUTE((unused))) {
+const char *error_message_for_error_log(int mysql_errno [[maybe_unused]]) {
   return nullptr;
 }
 
-void push_warning(THD *thd MY_ATTRIBUTE((unused)),
-                  Sql_condition::enum_severity_level severity
-                      MY_ATTRIBUTE((unused)),
-                  uint code MY_ATTRIBUTE((unused)),
-                  const char *message_text MY_ATTRIBUTE((unused))) {}
+void push_warning(THD *thd [[maybe_unused]],
+                  Sql_condition::enum_severity_level severity [[maybe_unused]],
+                  uint code [[maybe_unused]],
+                  const char *message_text [[maybe_unused]]) {}
 
 #endif
diff -Nru mysql-8.0-8.0.26/unittest/gunit/copy_info-t.cc mysql-8.0-8.0.27/unittest/gunit/copy_info-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/copy_info-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/copy_info-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -285,7 +285,7 @@
   // We do not care about the argument to store_timestamp().
   EXPECT_CALL(b, store_timestamp(_)).Times(1);
   EXPECT_CALL(c, store_timestamp(_)).Times(0);
-  insert.set_function_defaults(&table);
+  EXPECT_FALSE(insert.set_function_defaults(&table));
 }
 
 }  // namespace copy_info_unittest
diff -Nru mysql-8.0-8.0.26/unittest/gunit/dd_cache-t.cc mysql-8.0-8.0.27/unittest/gunit/dd_cache-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/dd_cache-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/dd_cache-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1273,7 +1273,7 @@
 //   dd::cache::Dictionary_client::Auto_releaser releaser(&dc);
 
 //   // Create a new tablespace.
-//   dd::Object_id tablespace_id MY_ATTRIBUTE((unused));
+//   dd::Object_id tablespace_id [[maybe_unused]];
 //   {
 //     std::unique_ptr<dd::Tablespace> obj(dd::create_object<dd::Tablespace>());
 //     dd_unittest::set_attributes(obj.get(), "test_tablespace");
@@ -1393,7 +1393,7 @@
 
   dd::String_type obj_name =
       dd::Table::DD_table::instance().name() + dd::String_type("_trigs");
-  dd::Object_id id MY_ATTRIBUTE((unused));
+  dd::Object_id id [[maybe_unused]];
 
   //
   // Create table object
diff -Nru mysql-8.0-8.0.26/unittest/gunit/dd.h mysql-8.0-8.0.27/unittest/gunit/dd.h
--- mysql-8.0-8.0.26/unittest/gunit/dd.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/dd.h	2021-09-28 11:46:34.000000000 +0000
@@ -416,8 +416,7 @@
   value_map.add_values(-1, 10);
   value_map.add_values(1, 10);
 
-  MEM_ROOT mem_root;
-  init_alloc_root(PSI_NOT_INSTRUMENTED, &mem_root, 256, 0);
+  MEM_ROOT mem_root(PSI_NOT_INSTRUMENTED, 256);
 
   /*
     The Column_statistics object will take over the histogram data and free the
diff -Nru mysql-8.0-8.0.26/unittest/gunit/dd_properties-t.cc mysql-8.0-8.0.27/unittest/gunit/dd_properties-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/dd_properties-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/dd_properties-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -627,7 +627,7 @@
 
   EXPECT_TRUE(p->size() == 0);
 
-  for (dd::Properties::iterator it MY_ATTRIBUTE((unused)) = p->begin();
+  for (dd::Properties::iterator it [[maybe_unused]] = p->begin();
        it != p->end(); ++it, ++i)
     EXPECT_TRUE(false);
 
diff -Nru mysql-8.0-8.0.26/unittest/gunit/dd_sdi-t.cc mysql-8.0-8.0.27/unittest/gunit/dd_sdi-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/dd_sdi-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/dd_sdi-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -341,8 +341,7 @@
   std::unique_ptr<dd::Column_statistics> dd_obj(
       dd::create_object<dd::Column_statistics>());
 
-  MEM_ROOT mem_root;
-  init_alloc_root(PSI_NOT_INSTRUMENTED, &mem_root, 256, 0);
+  MEM_ROOT mem_root(PSI_NOT_INSTRUMENTED, 256);
 
   mock_column_statistics_obj(dd_obj.get(), &mem_root);
 
@@ -360,7 +359,7 @@
   EXPECT_TRUE(dd_obj.get()->schema_name() == deserialized.get()->schema_name());
   EXPECT_TRUE(dd_obj.get()->table_name() == deserialized.get()->table_name());
   EXPECT_TRUE(dd_obj.get()->column_name() == deserialized.get()->column_name());
-  free_root(&mem_root, MYF(0));
+  mem_root.Clear();
 }
 
 TEST(SdiTest, Index_element) { simple_test<dd::Index_element>(); }
diff -Nru mysql-8.0-8.0.26/unittest/gunit/dphyp-t.cc mysql-8.0-8.0.27/unittest/gunit/dphyp-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/dphyp-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/dphyp-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -65,7 +65,7 @@
 
   // Called EmitCsgCmp() in the paper.
   bool FoundSubgraphPair(NodeMap left, NodeMap right,
-                         int edge_idx MY_ATTRIBUTE((unused))) {
+                         int edge_idx [[maybe_unused]]) {
     printf("Found sets %s and %s, connected by edge %s-%s\n",
            PrintSet(left).c_str(), PrintSet(right).c_str(),
            PrintSet(m_g.edges[edge_idx].left).c_str(),
diff -Nru mysql-8.0-8.0.26/unittest/gunit/dynarray-t.cc mysql-8.0-8.0.27/unittest/gunit/dynarray-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/dynarray-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/dynarray-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -86,7 +86,7 @@
     destroy_counter = 0;
   }
 
-  void TearDown() override { free_root(&m_mem_root, MYF(0)); }
+  void TearDown() override { m_mem_root.Clear(); }
 
   static void SetUpTestCase() {
     generate_test_data(test_data, table_list, num_elements);
diff -Nru mysql-8.0-8.0.26/unittest/gunit/fake_range_opt_param.h mysql-8.0-8.0.27/unittest/gunit/fake_range_opt_param.h
--- mysql-8.0-8.0.26/unittest/gunit/fake_range_opt_param.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/fake_range_opt_param.h	2021-09-28 11:46:34.000000000 +0000
@@ -25,8 +25,8 @@
 
 #include <gmock/gmock.h>
 
-#include "sql/opt_range.h"
-#include "sql/opt_range_internal.h"
+#include "sql/range_optimizer/internal.h"
+#include "sql/range_optimizer/range_optimizer.h"
 #include "unittest/gunit/fake_table.h"
 
 using ::testing::_;
@@ -55,29 +55,23 @@
       : m_kpis(alloc_arg), fake_table(number_columns, columns_nullable) {
     m_kpis.reserve(64);
 
-    thd = thd_arg;
-    mem_root = alloc_arg;
+    real_keynr = alloc_arg->ArrayAlloc<uint>(MAX_KEY);
+    key = alloc_arg->ArrayAlloc<KEY_PART *>(MAX_KEY);
+
+    return_mem_root = alloc_arg;
+    temp_mem_root = alloc_arg;
     query_block = thd_arg->lex->current_query_block();
 
     if (number_columns != 0) {
       table = &fake_table;
-      current_table = table->pos_in_table_list->map();
     } else {
       table = nullptr;
-      current_table = 1;
     }
 
     using_real_indexes = true;
     key_parts = m_key_parts;
     key_parts_end = m_key_parts;
     keys = 0;
-    /*
-      Controls whether or not ranges that do not have conditions on
-      the first keypart are removed before two trees are ORed in such
-      a way that index merge is required. The value of 'true' means
-      that such ranges are removed.
-    */
-    remove_jump_scans = true;
 
     const Mock_HANDLER *mock_handler = &fake_table.mock_handler;
 
diff -Nru mysql-8.0-8.0.26/unittest/gunit/fake_table.h mysql-8.0-8.0.27/unittest/gunit/fake_table.h
--- mysql-8.0-8.0.26/unittest/gunit/fake_table.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/fake_table.h	2021-09-28 11:46:34.000000000 +0000
@@ -165,11 +165,9 @@
     Mock_field_long columns, and this is their pack_length.
   */
   static const int DEFAULT_PACK_LENGTH = Mock_field_long::PACK_LENGTH;
-  NiceMock<Mock_HANDLER> mock_handler;
+  NiceMock<Mock_HANDLER> mock_handler{&fake_handlerton, &table_share};
 
-  Fake_TABLE(List<Field> fields)
-      : table_share(fields.elements),
-        mock_handler(static_cast<handlerton *>(nullptr), &table_share) {
+  explicit Fake_TABLE(List<Field> fields) : table_share(fields.elements) {
     initialize();
     List_iterator<Field> it(fields);
     int nbr_fields = 0;
@@ -177,24 +175,18 @@
       add(cur_field, nbr_fields++);
   }
 
-  Fake_TABLE(Field *column)
-      : table_share(1),
-        mock_handler(static_cast<handlerton *>(nullptr), &table_share) {
+  explicit Fake_TABLE(Field *column) : table_share(1) {
     initialize();
     add(column, 0);
   }
 
-  Fake_TABLE(Field *column1, Field *column2)
-      : table_share(2),
-        mock_handler(static_cast<handlerton *>(nullptr), &table_share) {
+  Fake_TABLE(Field *column1, Field *column2) : table_share(2) {
     initialize();
     add(column1, 0);
     add(column2, 1);
   }
 
-  Fake_TABLE(Field *column1, Field *column2, Field *column3)
-      : table_share(3),
-        mock_handler(static_cast<handlerton *>(nullptr), &table_share) {
+  Fake_TABLE(Field *column1, Field *column2, Field *column3) : table_share(3) {
     initialize();
     add(column1, 0);
     add(column2, 1);
@@ -259,6 +251,10 @@
 
   // Defines an index over (column1, column2) and generates a unique id.
   int create_index(Field *column1, Field *column2, bool unique = false) {
+    return create_index(column1, column2, unique ? ulong{HA_NOSAME} : 0);
+  }
+
+  int create_index(Field *column1, Field *column2, ulong key_flags) {
     column1->set_flag(PART_KEY_FLAG);
     int index_id = highest_index_id++;
     column1->key_start.set_bit(index_id);
@@ -272,11 +268,7 @@
 
     KEY *key = &m_keys[index_id];
     key->table = this;
-    if (unique) {
-      key->flags = key->actual_flags = HA_NOSAME;
-    } else {
-      key->flags = key->actual_flags = 0;
-    }
+    key->flags = key->actual_flags = key_flags;
     key->actual_key_parts = key->user_defined_key_parts = 1;
     key->key_part[0].field = column1;
     key->key_part[0].store_length = 8;
@@ -288,6 +280,8 @@
     key->name = "unittest_index";
 
     ++s->keys;
+    s->visible_indexes.set_bit(index_id);
+    s->keys_in_use.set_bit(index_id);
     return index_id;
   }
 
diff -Nru mysql-8.0-8.0.26/unittest/gunit/field-t.cc mysql-8.0-8.0.27/unittest/gunit/field-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/field-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/field-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -98,7 +98,7 @@
   ulong get_client_capabilities() override { return 0; }
   bool has_client_capability(unsigned long) override { return false; }
   void end_partial_result_set() override {}
-  int shutdown(bool server_shutdown MY_ATTRIBUTE((unused)) = false) override {
+  int shutdown(bool server_shutdown [[maybe_unused]] = false) override {
     return 0;
   }
   SSL_handle get_ssl() { return nullptr; }
diff -Nru mysql-8.0-8.0.26/unittest/gunit/filesort_compare-t.cc mysql-8.0-8.0.27/unittest/gunit/filesort_compare-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/filesort_compare-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/filesort_compare-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -394,27 +394,25 @@
 BENCHMARK(BM_StdStableSortCompare5)
 
 // Disabled: experimental.
-static void MY_ATTRIBUTE((unused)) BM_StdSortIntCompare(size_t num_iterations) {
+[[maybe_unused]] static void BM_StdSortIntCompare(size_t num_iterations) {
   RunSortBenchmark<Mem_compare_int>(num_iterations, /*stable_sort=*/false);
 }
 // BENCHMARK(BM_StdSortIntCompare)
 
-static void MY_ATTRIBUTE((unused))
-    BM_StdStableSortIntCompare(size_t num_iterations) {
+[[maybe_unused]] static void BM_StdStableSortIntCompare(size_t num_iterations) {
   RunSortBenchmark<Mem_compare_int>(num_iterations, /*stable_sort=*/true);
 }
 // BENCHMARK(BM_StdStableSortIntCompare)
 
 // Disabled: experimental.
-static void MY_ATTRIBUTE((unused))
-    BM_StdSortIntIntIntInt(size_t num_iterations) {
+[[maybe_unused]] static void BM_StdSortIntIntIntInt(size_t num_iterations) {
   RunSortBenchmark<Mem_compare_int_4>(num_iterations, /*stable_sort=*/false);
 }
 // BENCHMARK(BM_StdSortIntIntIntInt)
 
 // Disabled: experimental.
-static void MY_ATTRIBUTE((unused))
-    BM_StdStableSortIntIntIntInt(size_t num_iterations) {
+[[maybe_unused]] static void BM_StdStableSortIntIntIntInt(
+    size_t num_iterations) {
   RunSortBenchmark<Mem_compare_int_4>(num_iterations, /*stable_sort=*/true);
 }
 // BENCHMARK(BM_StdStableSortIntIntIntInt)
diff -Nru mysql-8.0-8.0.26/unittest/gunit/gis_intersection-t.cc mysql-8.0-8.0.27/unittest/gunit/gis_intersection-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/gis_intersection-t.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/gis_intersection-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,421 @@
+/*
+  Copyright (c) 2020, 2021, Oracle 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,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License, version 2.0, for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include <gtest/gtest.h>
+#include <memory>   // unique_ptr
+#include <ostream>  // <<
+
+#include "sql/dd/dd.h"
+#include "sql/dd/impl/types/spatial_reference_system_impl.h"
+#include "sql/dd/properties.h"
+#include "sql/dd/types/spatial_reference_system.h"
+#include "sql/gis/geometries.h"
+#include "sql/gis/geometries_cs.h"
+#include "sql/gis/relops.h"
+#include "sql/gis/setops.h"
+#include "template_utils.h"  // down_cast
+#include "unittest/gunit/gis_setops_testshapes.h"
+#include "unittest/gunit/gis_test.h"
+#include "unittest/gunit/gis_typeset.h"
+
+namespace gis_intersectionunittest {
+
+bool areEquals(const dd::Spatial_reference_system_impl *srs,
+               const gis::Geometry &expected_result,
+               const gis::Geometry &actual_result) {
+  bool is_equals = false;
+  bool is_null = false;
+  bool equals_error = gis::equals(srs, &expected_result, &actual_result,
+                                  "unittest", &is_equals, &is_null);
+  EXPECT_FALSE(equals_error);
+  EXPECT_FALSE(is_null);
+  return is_equals;
+}
+
+template <typename Types>
+struct IntersectionTest : Gis_test<Types> {
+  void test_valid_input(const gis::Geometry &g1, const gis::Geometry &g2,
+                        gis::Geometry &expected_result) {
+    std::unique_ptr<gis::Geometry> result;
+    bool is_null = false;
+    bool error =
+        gis::intersection(this->m_srs.get(), &g1, &g2, "unittest", &result);
+    EXPECT_FALSE(error);
+    EXPECT_FALSE(is_null);
+
+    // Verify geometry return type.
+    const std::string type_res(gis::type_to_name(result->type()));
+    const std::string type_exp(gis::type_to_name(expected_result.type()));
+    EXPECT_EQ(type_exp, type_res);
+
+    // Verify result is correct.
+    EXPECT_PRED3(areEquals, this->m_srs.get(), expected_result, *result.get());
+  }
+};
+
+// The purpose of these tests is to check that the result returned from
+// gis::intersection is correct. The tests test all combinations of geometries.
+
+TYPED_TEST_SUITE(IntersectionTest, gis_typeset::Test_both);
+
+// intersection(... ,point, *, ...)
+
+TYPED_TEST(IntersectionTest, PointPoint) {
+  typename TypeParam::Point pt1{0, 0};
+  typename TypeParam::Point pt2{0, 0.1};
+  typename TypeParam::Geometrycollection empty_gc{};
+
+  this->test_valid_input(pt1, pt2, empty_gc);
+  this->test_valid_input(pt1, pt1, pt1);
+}
+
+TYPED_TEST(IntersectionTest, PointMultipoint) {
+  typename TypeParam::Point pt1{0, 0};
+  typename TypeParam::Point pt2{0, 0.1};
+  typename TypeParam::Multipoint mpt = simple_mpt<TypeParam>();
+  typename TypeParam::Geometrycollection empty_gc{};
+
+  this->test_valid_input(pt2, mpt, empty_gc);
+  this->test_valid_input(mpt, pt1, pt1);
+}
+
+TYPED_TEST(IntersectionTest, PointLinestring) {
+  typename TypeParam::Point pt1{0, 0};
+  typename TypeParam::Point pt2{0.1, 0.1};
+  typename TypeParam::Linestring ls = simple_ls<TypeParam>();
+  typename TypeParam::Geometrycollection empty_gc{};
+
+  this->test_valid_input(pt2, ls, empty_gc);
+  this->test_valid_input(pt1, ls, pt1);
+  this->test_valid_input(ls, pt1, pt1);
+}
+
+TYPED_TEST(IntersectionTest, PointMultiLinestring) {
+  typename TypeParam::Point pt1{0, 0};
+  typename TypeParam::Point pt2{0.1, 0.1};
+  typename TypeParam::Multilinestring mls = simple_mls<TypeParam>();
+  typename TypeParam::Geometrycollection empty_gc{};
+
+  this->test_valid_input(pt2, mls, empty_gc);
+  this->test_valid_input(pt1, mls, pt1);
+  this->test_valid_input(mls, pt1, pt1);
+}
+
+TYPED_TEST(IntersectionTest, PointPolygon) {
+  typename TypeParam::Point pt1{0, 0};
+  typename TypeParam::Point pt2{0, 0.2};
+  typename TypeParam::Polygon py = base_py<TypeParam>();
+  typename TypeParam::Geometrycollection empty_gc{};
+
+  this->test_valid_input(pt2, py, empty_gc);
+  this->test_valid_input(pt1, py, pt1);
+  this->test_valid_input(py, pt1, pt1);
+}
+
+TYPED_TEST(IntersectionTest, PointMultipolygon) {
+  typename TypeParam::Point pt1{0, 0};
+  typename TypeParam::Point pt2{0, 0.2};
+  typename TypeParam::Multipolygon mpy = simple_mpy<TypeParam>();
+  typename TypeParam::Geometrycollection empty_gc{};
+
+  this->test_valid_input(pt2, mpy, empty_gc);
+  this->test_valid_input(pt1, mpy, pt1);
+  this->test_valid_input(mpy, pt1, pt1);
+}
+
+// intersection(..., multipoint, *, ...)
+
+TYPED_TEST(IntersectionTest, MultipointMultipoint) {
+  typename TypeParam::Multipoint mpt1 = simple_mpt<TypeParam>();
+  typename TypeParam::Multipoint mpt2 = simple_mpt<TypeParam>();
+  typename TypeParam::Geometrycollection empty_gc{};
+  typename TypeParam::Point pt2{0.0, 0.1};
+
+  mpt1.push_back(pt2);
+  mpt2.push_back(typename TypeParam::Point{0.1, 0.1});
+
+  this->test_valid_input(mpt1, mpt1, mpt1);
+  this->test_valid_input(mpt1, mpt2, mpt1[0]);
+}
+
+TYPED_TEST(IntersectionTest, MultipointLinestring) {
+  typename TypeParam::Multipoint mpt = simple_mpt<TypeParam>();
+  typename TypeParam::Linestring ls = simple_ls<TypeParam>();
+
+  mpt.push_back(typename TypeParam::Point(0.1, 0.1));
+
+  this->test_valid_input(mpt, ls, mpt[0]);
+  this->test_valid_input(ls, mpt, mpt[0]);
+}
+
+TYPED_TEST(IntersectionTest, MultipointMultilinestring) {
+  typename TypeParam::Multipoint mpt = simple_mpt<TypeParam>();
+  typename TypeParam::Multilinestring mls = simple_mls<TypeParam>();
+
+  mpt.push_back(typename TypeParam::Point(0.1, 0.1));
+
+  this->test_valid_input(mpt, mls, mpt[0]);
+  this->test_valid_input(mls, mpt, mpt[0]);
+}
+
+TYPED_TEST(IntersectionTest, MultipointPolygon) {
+  typename TypeParam::Multipoint mpt = simple_mpt<TypeParam>();
+  typename TypeParam::Polygon py = base_py<TypeParam>();
+
+  mpt.push_back(typename TypeParam::Point(0.0, 0.2));
+
+  this->test_valid_input(mpt, py, mpt[0]);
+  this->test_valid_input(py, mpt, mpt[0]);
+}
+
+TYPED_TEST(IntersectionTest, MultipointMultipolygon) {
+  typename TypeParam::Multipoint mpt = simple_mpt<TypeParam>();
+  typename TypeParam::Multipolygon mpy = simple_mpy<TypeParam>();
+
+  mpt.push_back(typename TypeParam::Point(0.1, 0.2));
+
+  this->test_valid_input(mpt, mpy, mpt[0]);
+  this->test_valid_input(mpy, mpt, mpt[0]);
+}
+
+// intersection(..., linestring, *, ...)
+
+TYPED_TEST(IntersectionTest, LinestringLinestring) {
+  typename TypeParam::Linestring ls1 = simple_ls<TypeParam>();
+  typename TypeParam::Linestring ls2 = offset_simple_ls<TypeParam>();
+  typename TypeParam::Linestring expected_result{};
+
+  expected_result.push_back(typename TypeParam::Point(0.05, 0.0));
+  expected_result.push_back(typename TypeParam::Point(0.1, 0.0));
+
+  this->test_valid_input(ls1, ls1, ls1);
+  this->test_valid_input(ls1, ls2, expected_result);
+}
+
+TYPED_TEST(IntersectionTest, LinestringMultilinestring) {
+  typename TypeParam::Multilinestring mls = simple_mls<TypeParam>();
+  typename TypeParam::Linestring ls2 = offset_simple_ls<TypeParam>();
+  typename TypeParam::Linestring expected_result{};
+
+  expected_result.push_back(typename TypeParam::Point(0.05, 0.0));
+  expected_result.push_back(typename TypeParam::Point(0.1, 0.0));
+
+  this->test_valid_input(mls[0], mls, mls[0]);
+  this->test_valid_input(ls2, mls, expected_result);
+}
+
+TYPED_TEST(IntersectionTest, LinestringPolygon) {
+  typename TypeParam::Linestring ls1 = diagonal_ls<TypeParam>();
+  typename TypeParam::Polygon py = base_py<TypeParam>();
+
+  this->test_valid_input(ls1, py, ls1);
+  this->test_valid_input(py, ls1, ls1);
+}
+
+TYPED_TEST(IntersectionTest, LinestringMultiPolygon) {
+  typename TypeParam::Linestring ls1 = diagonal_ls<TypeParam>();
+  typename TypeParam::Multipolygon mpy = simple_mpy<TypeParam>();
+
+  this->test_valid_input(ls1, mpy, ls1);
+  this->test_valid_input(mpy, ls1, ls1);
+}
+
+// intersection(..., multilinestring, *, ...)
+
+TYPED_TEST(IntersectionTest, MultilinestringMultilinestring) {
+  typename TypeParam::Multilinestring mls1 = simple_mls<TypeParam>();
+  typename TypeParam::Multilinestring mls2{};
+  typename TypeParam::Linestring expected_result{};
+
+  mls2.push_back(offset_simple_ls<TypeParam>());
+  expected_result.push_back(typename TypeParam::Point{0.05, 0.0});
+  expected_result.push_back(typename TypeParam::Point{0.1, 0.0});
+
+  this->test_valid_input(mls1, mls1, mls1[0]);
+  this->test_valid_input(mls1, mls2, expected_result);
+}
+
+TYPED_TEST(IntersectionTest, MultilinestringPolygon) {
+  typename TypeParam::Multilinestring mls = simple_mls<TypeParam>();
+  typename TypeParam::Polygon py = base_py<TypeParam>();
+
+  // mls.push_back(ls_overlapping_base_py<TypeParam>());
+
+  this->test_valid_input(mls, py, mls[0]);
+  this->test_valid_input(py, mls, mls[0]);
+}
+
+TYPED_TEST(IntersectionTest, MultilinestringMultipolygon) {
+  typename TypeParam::Multilinestring mls = simple_mls<TypeParam>();
+  typename TypeParam::Multipolygon mpy = simple_mpy<TypeParam>();
+
+  //  mls.push_back(ls_overlapping_base_py<TypeParam>());
+
+  this->test_valid_input(mls, mpy, mls[0]);
+  this->test_valid_input(mpy, mls, mls[0]);
+}
+
+// intersection(..., polygon, *, ...)
+
+TYPED_TEST(IntersectionTest, PolygonPolygon) {
+  typename TypeParam::Polygon py1 = base_py<TypeParam>();
+  typename TypeParam::Polygon py2 = overlapping_py<TypeParam>();
+  typename TypeParam::Linestring ls = vertical_ls<TypeParam>();
+
+  this->test_valid_input(py1, py1, py1);
+  this->test_valid_input(py1, py2, ls);
+}
+
+TYPED_TEST(IntersectionTest, PolygonMultipolygon) {
+  typename TypeParam::Polygon py1 = base_py<TypeParam>();
+  typename TypeParam::Polygon py2 = overlapping_py<TypeParam>();
+  typename TypeParam::Multipolygon mpy{};
+  typename TypeParam::Linestring ls = vertical_ls<TypeParam>();
+
+  mpy.push_back(py2);
+
+  this->test_valid_input(py2, mpy, py2);
+  this->test_valid_input(mpy, py1, ls);
+}
+
+// intersection(..., multipolygon, *, ...)
+
+TYPED_TEST(IntersectionTest, MultipolygonMultipolygon) {
+  typename TypeParam::Polygon py1 = base_py<TypeParam>();
+  typename TypeParam::Polygon py2 = overlapping_py<TypeParam>();
+  typename TypeParam::Polygon py3 = disjoint_py<TypeParam>();
+  typename TypeParam::Multipolygon mpy1 = simple_mpy<TypeParam>();
+  typename TypeParam::Multipolygon mpy2{};
+  typename TypeParam::Linestring ls = vertical_ls<TypeParam>();
+
+  mpy2.push_back(py2);
+  mpy2.push_back(py3);
+
+  this->test_valid_input(mpy1, mpy1, mpy1[0]);
+  this->test_valid_input(mpy1, mpy2, ls);
+}
+
+// intersection(..., geometrycollection, *, ...)
+
+TYPED_TEST(IntersectionTest, GeometrycollectionPoint) {
+  typename TypeParam::Geometrycollection gc{};
+  typename TypeParam::Geometrycollection empty_gc{};
+  typename TypeParam::Point pt1{0, 0};
+  typename TypeParam::Point pt2{0, 0.1};
+
+  gc.push_back(pt1);
+
+  this->test_valid_input(gc, pt1, pt1);
+  this->test_valid_input(pt2, gc, empty_gc);
+}
+
+TYPED_TEST(IntersectionTest, GeometrycollectionMultipoint) {
+  typename TypeParam::Geometrycollection gc{};
+  typename TypeParam::Multipoint mpt = simple_mpt<TypeParam>();
+
+  gc.push_back(mpt[0]);
+  gc.push_back(typename TypeParam::Point(0.1, 0.1));
+
+  this->test_valid_input(mpt, gc, mpt[0]);
+  this->test_valid_input(gc, mpt, mpt[0]);
+}
+
+TYPED_TEST(IntersectionTest, GeometrycollectionLinestring) {
+  typename TypeParam::Geometrycollection gc{};
+  typename TypeParam::Linestring ls1 = simple_ls<TypeParam>();
+  typename TypeParam::Linestring ls2 = diagonal_ls<TypeParam>();
+  auto pt = typename TypeParam::Point(0.0, 0.0);
+
+  gc.push_back(ls1);
+
+  this->test_valid_input(ls1, gc, ls1);
+  this->test_valid_input(gc, ls2, pt);
+}
+
+TYPED_TEST(IntersectionTest, GeometrycollectionMultilinestring) {
+  typename TypeParam::Geometrycollection gc{};
+  typename TypeParam::Multilinestring mls = simple_mls<TypeParam>();
+  typename TypeParam::Linestring ls2 = diagonal_ls<TypeParam>();
+  auto pt = typename TypeParam::Point(0.0, 0.0);
+
+  gc.push_back(ls2);
+
+  this->test_valid_input(mls, gc, pt);
+  this->test_valid_input(gc, mls, pt);
+}
+
+TYPED_TEST(IntersectionTest, GeometrycollectionPolygon) {
+  typename TypeParam::Geometrycollection gc{};
+  typename TypeParam::Polygon py1 = base_py<TypeParam>();
+  typename TypeParam::Polygon py2 = disjoint_py<TypeParam>();
+  typename TypeParam::Geometrycollection empty_gc{};
+
+  gc.push_back(py1);
+
+  this->test_valid_input(py1, gc, py1);
+  this->test_valid_input(gc, py2, empty_gc);
+}
+
+TYPED_TEST(IntersectionTest, GeometrycollectionMultipolygon) {
+  typename TypeParam::Geometrycollection gc{};
+  typename TypeParam::Multipolygon mpy = simple_mpy<TypeParam>();
+  typename TypeParam::Polygon py2 = disjoint_py<TypeParam>();
+  typename TypeParam::Geometrycollection empty_gc{};
+
+  gc.push_back(py2);
+
+  this->test_valid_input(mpy, gc, empty_gc);
+  this->test_valid_input(gc, mpy, empty_gc);
+}
+
+TYPED_TEST(IntersectionTest, GeometrycollectionGeometrycollection) {
+  typename TypeParam::Geometrycollection gc1{};
+  typename TypeParam::Geometrycollection gc2{};
+  typename TypeParam::Geometrycollection gc_result{};
+  this->test_valid_input(gc1, gc1, gc1);
+
+  typename TypeParam::Point pt{0, 0};
+  typename TypeParam::Linestring ls = ls_overlapping_base_py<TypeParam>();
+  typename TypeParam::Polygon py = overlapping_py<TypeParam>();
+  typename TypeParam::Multipoint mpt = simple_mpt<TypeParam>();
+  typename TypeParam::Multilinestring mls = simple_mls<TypeParam>();
+  typename TypeParam::Multipolygon mpy = simple_mpy<TypeParam>();
+  gc1.push_back(pt);
+  gc1.push_back(ls);
+  gc1.push_back(py);
+  gc1.push_back(mpt);
+  gc1.push_back(mls);
+  gc1.push_back(mpy);
+  gc1.push_back(gc1);
+
+  gc2.push_back(mpy);
+  gc2.push_back(pt);
+
+  gc_result.push_back(pt);
+  gc_result.push_back(mpy);
+
+  this->test_valid_input(gc1, gc2, gc_result);
+}
+
+}  // namespace gis_intersectionunittest
diff -Nru mysql-8.0-8.0.26/unittest/gunit/gis_setops-t.cc mysql-8.0-8.0.27/unittest/gunit/gis_setops-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/gis_setops-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/gis_setops-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2020, Oracle and/or its affiliates.
+  Copyright (c) 2020, 2021, Oracle 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,
@@ -73,8 +73,10 @@
     for (auto g2 : gc) {
       std::unique_ptr<gis::Geometry> result;
       bool is_null = false;
-      gis::union_(this->m_srs.get(), g1, g2, "unittest", &result, &is_null);
       gis::difference(this->m_srs.get(), g1, g2, "unittest", &result);
+      gis::intersection(this->m_srs.get(), g1, g2, "unittest", &result);
+      gis::symdifference(this->m_srs.get(), g1, g2, "unittest", &result);
+      gis::union_(this->m_srs.get(), g1, g2, "unittest", &result, &is_null);
     }
   }
 }
diff -Nru mysql-8.0-8.0.26/unittest/gunit/gis_setops_testshapes.h mysql-8.0-8.0.27/unittest/gunit/gis_setops_testshapes.h
--- mysql-8.0-8.0.26/unittest/gunit/gis_setops_testshapes.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/gis_setops_testshapes.h	2021-09-28 11:46:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2020, Oracle and/or its affiliates.
+  Copyright (c) 2020, 2021, Oracle 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,
@@ -43,6 +43,22 @@
   return ls;
 }
 
+template <typename T>
+typename T::Linestring vertical_ls() {
+  typename T::Linestring ls;
+  ls.push_back(typename T::Point(0.1, 0.0));
+  ls.push_back(typename T::Point(0.1, 0.1));
+  return ls;
+}
+
+template <typename T>
+typename T::Linestring simple_ls_2() {
+  typename T::Linestring ls;
+  ls.push_back(typename T::Point(0.0, 0.1));
+  ls.push_back(typename T::Point(0.1, 0.1));
+  return ls;
+}
+
 template <typename T>
 typename T::Linestring offset_simple_ls() {
   typename T::Linestring ls;
diff -Nru mysql-8.0-8.0.26/unittest/gunit/gis_symdifference-t.cc mysql-8.0-8.0.27/unittest/gunit/gis_symdifference-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/gis_symdifference-t.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/gis_symdifference-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,1029 @@
+/*
+  Copyright (c) 2021, Oracle 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,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License, version 2.0, for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include <gtest/gtest.h>
+#include <memory>   // unique_ptr
+#include <ostream>  // <<
+
+#include "sql/dd/dd.h"
+#include "sql/dd/impl/types/spatial_reference_system_impl.h"
+#include "sql/dd/properties.h"
+#include "sql/dd/types/spatial_reference_system.h"
+#include "sql/gis/geometries.h"
+#include "sql/gis/geometries_cs.h"
+#include "sql/gis/relops.h"
+#include "sql/gis/setops.h"
+#include "template_utils.h"  // down_cast
+#include "unittest/gunit/gis_setops_testshapes.h"
+#include "unittest/gunit/gis_test.h"
+#include "unittest/gunit/gis_typeset.h"
+
+#include <boost/geometry.hpp>
+
+#ifdef GIS_SYMDIFFERENCE_TEST_DEBUG
+namespace gis {
+std::ostream &operator<<(std::ostream &os, const Geometry &geometry) {
+  if (geometry.coordinate_system() == Coordinate_system::kGeographic) {
+    switch (geometry.type()) {
+      case Geometry_type::kPoint: {
+        Geographic_point pt = *down_cast<const Geographic_point *>(&geometry);
+        return os << "POINT(" << pt.x() << "," << pt.y() << ")";
+      }
+      case Geometry_type::kLinestring: {
+        Geographic_linestring ls =
+            *down_cast<const Geographic_linestring *>(&geometry);
+        os << "LINESTRING: ";
+        for (auto pt : ls) {
+          os << pt;
+        }
+        return os;
+      }
+      case Geometry_type::kPolygon: {
+        Geographic_polygon py =
+            *down_cast<const Geographic_polygon *>(&geometry);
+        Geographic_linearring lr = py.geographic_exterior_ring();
+        os << "POLYGON: ";
+        for (auto pt : lr) {
+          os << pt;
+        }
+        return os;
+      }
+      case Geometry_type::kMultipoint: {
+        Geographic_multipoint g =
+            *down_cast<const Geographic_multipoint *>(&geometry);
+        os << "MULTIPOINT: ";
+        for (size_t i = 0; i < g.size(); i++) {
+          os << g[i] << " ";
+        }
+        return os;
+      }
+      case Geometry_type::kMultilinestring: {
+        Geographic_multilinestring g =
+            *down_cast<const Geographic_multilinestring *>(&geometry);
+        os << "MULTILINESTRING: ";
+        for (size_t i = 0; i < g.size(); i++) {
+          os << g[i] << " ";
+        }
+        return os;
+      }
+      case Geometry_type::kMultipolygon: {
+        Geographic_multipolygon g =
+            *down_cast<const Geographic_multipolygon *>(&geometry);
+        os << "MULTIPOLYGON: ";
+        for (size_t i = 0; i < g.size(); i++) {
+          os << g[i] << " ";
+        }
+        return os;
+      }
+      case Geometry_type::kGeometrycollection: {
+        Geographic_geometrycollection g =
+            *down_cast<const Geographic_geometrycollection *>(&geometry);
+        os << "GEOMCOL: ";
+        for (size_t i = 0; i < g.size(); i++) {
+          os << g[i] << " ";
+        }
+        return os;
+      }
+      case Geometry_type::kGeometry:
+        break;
+    }
+  } else if (geometry.coordinate_system() == Coordinate_system::kCartesian) {
+    switch (geometry.type()) {
+      case Geometry_type::kPoint: {
+        Cartesian_point pt = *down_cast<const Cartesian_point *>(&geometry);
+        return os << "POINT(" << pt.x() << "," << pt.y() << ")";
+      }
+      case Geometry_type::kLinestring: {
+        Cartesian_linestring ls =
+            *down_cast<const Cartesian_linestring *>(&geometry);
+        os << "LINESTRING: ";
+        for (auto pt : ls) {
+          os << pt;
+        }
+        return os;
+      }
+      case Geometry_type::kPolygon: {
+        Cartesian_polygon py = *down_cast<const Cartesian_polygon *>(&geometry);
+        Cartesian_linearring lr = py.cartesian_exterior_ring();
+        os << "POLYGON: ";
+        for (auto pt : lr) {
+          os << pt;
+        }
+        return os;
+      }
+      case Geometry_type::kMultipoint: {
+        Cartesian_multipoint g =
+            *down_cast<const Cartesian_multipoint *>(&geometry);
+        os << "MULTIPOINT: ";
+        for (size_t i = 0; i < g.size(); i++) {
+          os << g[i] << " ";
+        }
+        return os;
+      }
+      case Geometry_type::kMultilinestring: {
+        Cartesian_multilinestring g =
+            *down_cast<const Cartesian_multilinestring *>(&geometry);
+        os << "MULTILINESTRING: ";
+        for (size_t i = 0; i < g.size(); i++) {
+          os << g[i] << " ";
+        }
+        return os;
+      }
+      case Geometry_type::kMultipolygon: {
+        Cartesian_multipolygon g =
+            *down_cast<const Cartesian_multipolygon *>(&geometry);
+        os << "MULTIPOLYGON: ";
+        for (size_t i = 0; i < g.size(); i++) {
+          os << g[i] << " ";
+        }
+        return os;
+      }
+      case Geometry_type::kGeometrycollection: {
+        Cartesian_geometrycollection g =
+            *down_cast<const Cartesian_geometrycollection *>(&geometry);
+        os << "GEOMCOL: ";
+        for (size_t i = 0; i < g.size(); i++) {
+          os << g[i] << " ";
+        }
+        return os;
+      }
+      case Geometry_type::kGeometry:
+        break;
+    }
+  }
+  return os << "Hello " << type_to_name(geometry.type());
+}
+}  // namespace gis
+#endif
+
+namespace gis_symdifference_unittest {
+
+template <typename Types>
+struct SymDifferenceTest : Gis_test<Types> {
+  void test_valid_input_both_orders(
+      const gis::Geometry &g1, const gis::Geometry &g2,
+      const gis::Geometry &expected_result) const {
+    std::unique_ptr<gis::Geometry> result;
+    bool is_null = false;
+    bool error =
+        gis::symdifference(this->m_srs.get(), &g1, &g2, "unittest", &result);
+    EXPECT_FALSE(error);
+
+#ifdef GIS_SYMDIFFERENCE_TEST_DEBUG
+    std::cout << "g1 :" << g1 << std::endl;
+    std::cout << "g2 :" << g2 << std::endl;
+    std::cout << "Exp:" << expected_result << std::endl;
+    std::cout << "Res:" << *result << std::endl;
+#endif
+
+    // Verify geometry return type.
+    const std::string type_res(gis::type_to_name(result->type()));
+    const std::string type_exp(gis::type_to_name(expected_result.type()));
+    EXPECT_EQ(type_exp, type_res);
+
+    // Verify result is correct.
+    bool is_equals = false;
+    bool equals_error =
+        gis::equals(this->m_srs.get(), &expected_result, result.get(),
+                    "unittest", &is_equals, &is_null);
+    EXPECT_FALSE(equals_error);
+    EXPECT_FALSE(is_null);
+    EXPECT_TRUE(is_equals);
+  }
+
+  void test_valid_input(const gis::Geometry &g1, const gis::Geometry &g2,
+                        const gis::Geometry &expected_result) const {
+    test_valid_input_both_orders(g1, g2, expected_result);
+    test_valid_input_both_orders(g2, g1, expected_result);
+  }
+};
+
+// The purpose of these tests is to check that the result returned from
+// gis::symdifference is correct. The tests test all combinations of geometries.
+// TYPED_TEST_SUITE(SymDifferenceTest, gis_typeset::Cartesian);
+TYPED_TEST_SUITE(SymDifferenceTest, gis_typeset::Test_both);
+
+// symdifference(... ,point, *, ...)
+
+TYPED_TEST(SymDifferenceTest, PointPoint) {
+  typename TypeParam::Point pt1{0, 0};
+  typename TypeParam::Point pt2{0, 0.1};
+  typename TypeParam::Multipoint expected_result{};
+  typename TypeParam::Geometrycollection empty_result{};
+
+  expected_result.push_back(pt1);
+  expected_result.push_back(pt2);
+
+  this->test_valid_input(pt1, pt1, empty_result);
+  this->test_valid_input(pt1, pt2, expected_result);
+}
+
+TYPED_TEST(SymDifferenceTest, PointLinestring) {
+  typename TypeParam::Point pt1{0, 0};
+  typename TypeParam::Point pt2{0.1, 0.1};
+  typename TypeParam::Linestring ls = simple_ls<TypeParam>();
+  typename TypeParam::Geometrycollection result{};
+
+  this->test_valid_input(pt1, ls, ls);
+
+  result.push_back(pt2);
+  result.push_back(ls);
+  this->test_valid_input(pt2, ls, result);
+}
+
+TYPED_TEST(SymDifferenceTest, PointPolygon) {
+  typename TypeParam::Point pt1{0.05, 0.05};
+  typename TypeParam::Point pt2{0.1, 0.2};
+  typename TypeParam::Polygon py = base_py<TypeParam>();
+  typename TypeParam::Geometrycollection result{};
+
+  this->test_valid_input(pt1, py, py);
+
+  result.push_back(pt2);
+  result.push_back(py);
+  this->test_valid_input(pt2, py, result);
+}
+
+TYPED_TEST(SymDifferenceTest, PointMultiPoint) {
+  typename TypeParam::Point pt1{0, 0};
+  typename TypeParam::Point pt2{0, 0.1};
+  typename TypeParam::Point pt3{0.1, 0.1};
+  typename TypeParam::Multipoint mpt{};
+  typename TypeParam::Multipoint expected_result{};
+  typename TypeParam::Geometrycollection empty_result{};
+
+  // intersect
+  mpt.push_back(pt1);
+  mpt.push_back(pt2);
+  mpt.push_back(pt3);
+  expected_result.push_back(pt2);
+  expected_result.push_back(pt3);
+
+  this->test_valid_input(pt1, mpt, expected_result);
+
+  mpt.clear();
+  expected_result.clear();
+
+  // disjoint
+  mpt.push_back(pt2);
+  mpt.push_back(pt3);
+  expected_result.push_back(pt1);
+  expected_result.push_back(pt2);
+  expected_result.push_back(pt3);
+
+  this->test_valid_input(pt1, mpt, expected_result);
+
+  mpt.clear();
+  expected_result.clear();
+
+  // equals
+  mpt.push_back(pt1);
+
+  this->test_valid_input(pt1, mpt, empty_result);
+}
+
+TYPED_TEST(SymDifferenceTest, PointMultiLinestring) {
+  typename TypeParam::Point pt1{0, 0};
+  typename TypeParam::Point pt2{0.1, 0.1};
+  typename TypeParam::Point pt3{0.05, 0.05};
+  typename TypeParam::Linestring ls1 = simple_ls<TypeParam>();
+  typename TypeParam::Linestring ls2 = simple_ls_2<TypeParam>();
+  typename TypeParam::Multilinestring mls;
+  mls.push_back(ls1);
+  mls.push_back(ls2);
+
+  this->test_valid_input(pt1, mls, mls);
+  this->test_valid_input(pt2, mls, mls);
+
+  typename TypeParam::Geometrycollection result{};
+  result.push_back(mls);
+  result.push_back(pt3);
+  this->test_valid_input(pt3, mls, result);
+}
+
+TYPED_TEST(SymDifferenceTest, PointMultiPolygon) {
+  typename TypeParam::Point pt1{0.05, 0.05};
+  typename TypeParam::Point pt2{0.1, 0.2};
+  typename TypeParam::Polygon py = base_py<TypeParam>();
+  typename TypeParam::Multipolygon mpy = simple_mpy<TypeParam>();
+  typename TypeParam::Geometrycollection result{};
+
+  this->test_valid_input(pt1, mpy, py);
+
+  result.push_back(pt2);
+  result.push_back(mpy);
+  this->test_valid_input(pt2, mpy, result);
+}
+
+TYPED_TEST(SymDifferenceTest, PointGeometryCollection) {
+  typename TypeParam::Point pt1{0.05, 0.05};
+  typename TypeParam::Point pt2{0.1, 0.2};
+  typename TypeParam::Point pt3{0.2, 0.0};
+  typename TypeParam::Point pt4{0.2, 0.1};
+  typename TypeParam::Linestring ls1;
+  ls1.push_back(pt3);
+  ls1.push_back(pt4);
+  typename TypeParam::Multipolygon mpy = simple_mpy<TypeParam>();
+  typename TypeParam::Geometrycollection gc{};
+
+  this->test_valid_input(pt1, gc, pt1);
+
+  gc.push_back(pt1);
+  gc.push_back(ls1);
+  gc.push_back(mpy);
+
+  typename TypeParam::Geometrycollection result{};
+
+  this->test_valid_input(pt1, gc, gc);
+
+  result.push_back(pt2);
+  result.push_back(gc);
+  this->test_valid_input(pt2, gc, result);
+
+  typename TypeParam::Geometrycollection gc2{};
+  gc2.push_back(mpy);
+  gc2.push_back(ls1);
+  this->test_valid_input(pt1, gc2, gc);
+}
+
+// symdifference(... , linestring, *, ...)
+
+TYPED_TEST(SymDifferenceTest, LinestringLinestring) {
+  typename TypeParam::Linestring ls1 = simple_ls<TypeParam>();
+  typename TypeParam::Linestring ls2 = offset_simple_ls<TypeParam>();
+  typename TypeParam::Point pt1{0.0, 0.0};
+  typename TypeParam::Point pt2{0.05, 0.0};
+  typename TypeParam::Point pt3{0.1, 0.0};
+  typename TypeParam::Point pt4{0.15, 0.0};
+  typename TypeParam::Linestring ls1_result;
+  ls1_result.push_back(pt1);
+  ls1_result.push_back(pt2);
+  typename TypeParam::Linestring ls2_result;
+  ls2_result.push_back(pt3);
+  ls2_result.push_back(pt4);
+  typename TypeParam::Multilinestring mls_result;
+  mls_result.push_back(ls1_result);
+  mls_result.push_back(ls2_result);
+
+  typename TypeParam::Geometrycollection empty_result{};
+
+  this->test_valid_input(ls1, ls1, empty_result);
+  this->test_valid_input(ls1, ls2, mls_result);
+}
+
+TYPED_TEST(SymDifferenceTest, LinestringPolygon) {
+  // TODO: needs intersection point for geographic CS
+  // for a robust test
+  // typename TypeParam::Point pt1{0.05, 0.05};
+  typename TypeParam::Point pt1{0.1, 0.05};
+  typename TypeParam::Point pt2{0.1, 0.05};
+  ;
+  typename TypeParam::Point pt3{0.15, 0.05};
+
+  typename TypeParam::Linestring ls;
+  ls.push_back(pt1);
+  ls.push_back(pt3);
+  typename TypeParam::Linestring ls_result;
+  ls_result.push_back(pt2);
+  ls_result.push_back(pt3);
+  typename TypeParam::Polygon py = base_py<TypeParam>();
+
+  typename TypeParam::Geometrycollection result{};
+  result.push_back(py);
+  result.push_back(ls_result);
+
+  this->test_valid_input(ls, py, result);
+}
+
+TYPED_TEST(SymDifferenceTest, LinestringMultiPoint) {
+  typename TypeParam::Linestring ls = simple_ls<TypeParam>();
+  typename TypeParam::Point pt1{0.0, 0.0};
+  typename TypeParam::Point pt2{0.05, 0.0};
+  typename TypeParam::Point pt3{0.15, 0.05};
+  typename TypeParam::Multipoint mp;
+  mp.push_back(pt1);
+  mp.push_back(pt2);
+  mp.push_back(pt3);
+
+  typename TypeParam::Geometrycollection result{};
+  result.push_back(ls);
+  result.push_back(pt3);
+
+  this->test_valid_input(ls, mp, result);
+}
+
+TYPED_TEST(SymDifferenceTest, LinestringMultiLinestring) {
+  typename TypeParam::Linestring ls1 = simple_ls<TypeParam>();
+  typename TypeParam::Linestring ls2 = offset_simple_ls<TypeParam>();
+  typename TypeParam::Point pt1{0.0, 0.0};
+  typename TypeParam::Point pt2{0.05, 0.0};
+  typename TypeParam::Point pt3{0.1, 0.0};
+  typename TypeParam::Point pt4{0.15, 0.0};
+  typename TypeParam::Linestring ls1_result;
+  ls1_result.push_back(pt1);
+  ls1_result.push_back(pt2);
+  typename TypeParam::Linestring ls2_result;
+  ls2_result.push_back(pt3);
+  ls2_result.push_back(pt4);
+  typename TypeParam::Multilinestring mls_result;
+  mls_result.push_back(ls1_result);
+  mls_result.push_back(ls2_result);
+
+  typename TypeParam::Multilinestring mls{};
+  this->test_valid_input(ls1, mls, ls1);
+  mls.push_back(ls2);
+  this->test_valid_input(ls1, mls, mls_result);
+}
+
+TYPED_TEST(SymDifferenceTest, LinestringMultiPolygon) {
+  // TODO: needs intersection point for geographic CS
+  // for a robust test
+  // typename TypeParam::Point pt1{0.05, 0.05};
+  typename TypeParam::Point pt1{0.1, 0.05};
+  typename TypeParam::Point pt2{0.1, 0.05};
+  typename TypeParam::Point pt3{0.15, 0.05};
+  typename TypeParam::Linestring ls;
+  ls.push_back(pt1);
+  ls.push_back(pt3);
+  typename TypeParam::Linestring ls_result;
+  ls_result.push_back(pt2);
+  ls_result.push_back(pt3);
+  typename TypeParam::Multipolygon mpy = simple_mpy<TypeParam>();
+
+  typename TypeParam::Geometrycollection result{};
+  result.push_back(mpy);
+  result.push_back(ls_result);
+
+  this->test_valid_input(ls, mpy, result);
+}
+
+TYPED_TEST(SymDifferenceTest, LinestringGeometryCollection) {
+  typename TypeParam::Point pt1{0.05, 0.05};
+  typename TypeParam::Point pt2{0.1, 0.2};
+  typename TypeParam::Point pt3{0.2, 0.0};
+  typename TypeParam::Point pt4{0.2, 0.1};
+  typename TypeParam::Linestring ls1;
+  ls1.push_back(pt3);
+  ls1.push_back(pt4);
+  typename TypeParam::Multipolygon mpy = simple_mpy<TypeParam>();
+  typename TypeParam::Geometrycollection gc{};
+  this->test_valid_input(ls1, gc, ls1);
+  gc.push_back(pt1);
+  gc.push_back(ls1);
+  gc.push_back(mpy);
+
+  this->test_valid_input(ls1, gc, base_py<TypeParam>());
+
+  typename TypeParam::Linestring ls_intersect_py;
+  ls_intersect_py.push_back(pt2);
+  typename TypeParam::Point pt5{0.1, 0.0};
+  ls_intersect_py.push_back(pt5);
+  typename TypeParam::Geometrycollection result{};
+  result.push_back(mpy);
+  result.push_back(ls1);
+  typename TypeParam::Linestring ls_result;
+  ls_result.push_back(pt2);
+  typename TypeParam::Point pt6{0.1, 0.1};
+  ls_result.push_back(pt6);
+  result.push_back(ls_result);
+  this->test_valid_input(ls_intersect_py, gc, result);
+
+  typename TypeParam::Linestring ls2;
+  ls2.push_back(pt3);
+  ls2.push_back(pt4);
+  ls2.push_back(pt2);
+  typename TypeParam::Linestring ls_result2;
+  ls_result2.push_back(pt2);
+  ls_result2.push_back(pt4);
+
+  result.clear();
+  result.push_back(ls_result2);
+  result.push_back(mpy);
+  this->test_valid_input(ls2, gc, result);
+}
+
+// symdifference(... , polygon, *, ...)
+
+TYPED_TEST(SymDifferenceTest, PolygonPolygon) {
+  typename TypeParam::Point pt1{0.0, 0.0};
+  typename TypeParam::Point pt2{0.1, 0.0};
+  typename TypeParam::Point pt3{0.0, 0.1};
+  typename TypeParam::Point pt4{0.1, 0.1};
+  typename TypeParam::Point pt5{0.1, 0.2};
+  typename TypeParam::Polygon py1 = base_py<TypeParam>();
+  typename TypeParam::Polygon py2;
+  typename TypeParam::Linearring exterior2;
+  exterior2.push_back(pt2);
+  exterior2.push_back(pt5);
+  exterior2.push_back(pt3);
+  exterior2.push_back(pt2);
+  py2.push_back(exterior2);
+
+  typename TypeParam::Multipolygon mpy_result;
+  typename TypeParam::Polygon py1_result;
+  typename TypeParam::Linearring exterior1r;
+  typename TypeParam::Polygon py2_result;
+  typename TypeParam::Linearring exterior2r;
+  exterior1r.push_back(pt1);
+  exterior1r.push_back(pt2);
+  exterior1r.push_back(pt3);
+  exterior1r.push_back(pt1);
+  py1_result.push_back(exterior1r);
+  mpy_result.push_back(py1_result);
+  exterior2r.push_back(pt3);
+  exterior2r.push_back(pt4);
+  exterior2r.push_back(pt5);
+  exterior2r.push_back(pt3);
+  py2_result.push_back(exterior2r);
+  mpy_result.push_back(py2_result);
+  typename TypeParam::Geometrycollection empty_result{};
+
+  this->test_valid_input(py1, py1, empty_result);
+  this->test_valid_input(py1, py2, mpy_result);
+}
+
+TYPED_TEST(SymDifferenceTest, PolygonMultiPoint) {
+  typename TypeParam::Point pt1{0.05, 0.05};
+  typename TypeParam::Point pt2{0.1, 0.2};
+  typename TypeParam::Multipoint mp;
+  mp.push_back(pt1);
+  mp.push_back(pt2);
+  typename TypeParam::Polygon py = base_py<TypeParam>();
+  typename TypeParam::Geometrycollection result{};
+  result.push_back(pt2);
+  result.push_back(py);
+
+  this->test_valid_input(py, mp, result);
+}
+
+TYPED_TEST(SymDifferenceTest, PolygonMultiLinestring) {
+  // TODO: needs intersection point for geographic CS
+  // for a robust test
+  // typename TypeParam::Point pt1{0.05, 0.05};
+  typename TypeParam::Point pt1{0.1, 0.05};
+  typename TypeParam::Point pt2{0.1, 0.05};
+  typename TypeParam::Point pt3{0.15, 0.05};
+  typename TypeParam::Linestring ls;
+  ls.push_back(pt1);
+  ls.push_back(pt3);
+  typename TypeParam::Multilinestring mls;
+  mls.push_back(ls);
+  typename TypeParam::Polygon py = base_py<TypeParam>();
+
+  typename TypeParam::Linestring ls_result;
+  ls_result.push_back(pt2);
+  ls_result.push_back(pt3);
+  typename TypeParam::Geometrycollection result{};
+  result.push_back(py);
+  result.push_back(ls_result);
+
+  this->test_valid_input(py, mls, result);
+}
+
+TYPED_TEST(SymDifferenceTest, PolygonMultiPolygon) {
+  typename TypeParam::Point pt1{0.0, 0.0};
+  typename TypeParam::Point pt2{0.1, 0.0};
+  typename TypeParam::Point pt3{0.0, 0.1};
+  typename TypeParam::Point pt4{0.1, 0.1};
+  typename TypeParam::Point pt5{0.1, 0.2};
+  typename TypeParam::Polygon py1 = base_py<TypeParam>();
+  typename TypeParam::Polygon py2;
+  typename TypeParam::Linearring exterior2;
+  exterior2.push_back(pt2);
+  exterior2.push_back(pt5);
+  exterior2.push_back(pt3);
+  exterior2.push_back(pt2);
+  py2.push_back(exterior2);
+  typename TypeParam::Multipolygon mpy;
+  mpy.push_back(py2);
+
+  typename TypeParam::Multipolygon mpy_result;
+  typename TypeParam::Polygon py1_result;
+  typename TypeParam::Linearring exterior1r;
+  typename TypeParam::Polygon py2_result;
+  typename TypeParam::Linearring exterior2r;
+  exterior1r.push_back(pt1);
+  exterior1r.push_back(pt2);
+  exterior1r.push_back(pt3);
+  exterior1r.push_back(pt1);
+  py1_result.push_back(exterior1r);
+  mpy_result.push_back(py1_result);
+  exterior2r.push_back(pt3);
+  exterior2r.push_back(pt4);
+  exterior2r.push_back(pt5);
+  exterior2r.push_back(pt3);
+  py2_result.push_back(exterior2r);
+  mpy_result.push_back(py2_result);
+
+  this->test_valid_input(py1, mpy, mpy_result);
+
+  typename TypeParam::Multipolygon mpy2 = simple_mpy<TypeParam>();
+  typename TypeParam::Geometrycollection empty_result{};
+  this->test_valid_input(py1, mpy2, empty_result);
+}
+
+TYPED_TEST(SymDifferenceTest, PolygonGeometryCollection) {
+  typename TypeParam::Point pt1{0.05, 0.05};
+  typename TypeParam::Point pt2{0.1, 0.2};
+  typename TypeParam::Point pt3{0.2, 0.0};
+  typename TypeParam::Point pt4{0.2, 0.1};
+  typename TypeParam::Linestring ls1;
+  ls1.push_back(pt3);
+  ls1.push_back(pt4);
+  // typename TypeParam::Multipolygon mpy = simple_mpy<TypeParam>();
+  typename TypeParam::Polygon py = base_py<TypeParam>();
+  typename TypeParam::Geometrycollection gc{};
+  this->test_valid_input(py, gc, py);
+  gc.push_back(pt3);
+  gc.push_back(ls1);
+  gc.push_back(py);
+  this->test_valid_input(py, gc, ls1);
+
+  typename TypeParam::Linestring ls2;
+  ls2.push_back(pt3);
+  ls2.push_back(pt4);
+  ls2.push_back(pt2);
+  typename TypeParam::Linestring ls3;
+  ls3.push_back(pt1);
+  ls3.push_back(pt2);
+  gc.push_back(ls2);
+  gc.push_back(ls3);
+  typename TypeParam::Multilinestring result{};
+  typename TypeParam::Linestring ls_result;
+  ls_result.push_back(pt2);
+  ls_result.push_back(typename TypeParam::Point(0.0666667, 0.1));
+  result.push_back(ls_result);
+  result.push_back(ls1);
+  result.push_back(ls2);
+  this->test_valid_input(py, gc, result);
+}
+
+// symdifference(... , multipoint, *, ...)
+
+TYPED_TEST(SymDifferenceTest, MultiPointMultiPoint) {
+  typename TypeParam::Point pt1{0, 0};
+  typename TypeParam::Point pt2{0, 0.1};
+  typename TypeParam::Point pt3{0.1, 0.1};
+  typename TypeParam::Multipoint mpt1{};
+  mpt1.push_back(pt1);
+  typename TypeParam::Multipoint mpt2{};
+  typename TypeParam::Multipoint expected_result{};
+  typename TypeParam::Geometrycollection empty_result{};
+
+  // intersect
+  mpt2.push_back(pt1);
+  mpt2.push_back(pt2);
+  mpt2.push_back(pt3);
+  expected_result.push_back(pt2);
+  expected_result.push_back(pt3);
+
+  this->test_valid_input(mpt1, mpt2, expected_result);
+
+  mpt2.clear();
+  expected_result.clear();
+
+  // disjoint
+  mpt2.push_back(pt2);
+  mpt2.push_back(pt3);
+  expected_result.push_back(pt1);
+  expected_result.push_back(pt2);
+  expected_result.push_back(pt3);
+
+  this->test_valid_input(mpt1, mpt2, expected_result);
+
+  mpt2.clear();
+  expected_result.clear();
+
+  // equals
+  mpt2.push_back(pt1);
+
+  this->test_valid_input(mpt1, mpt2, empty_result);
+}
+
+TYPED_TEST(SymDifferenceTest, MultiPointMultiLinestring) {
+  typename TypeParam::Point pt1{0, 0};
+  typename TypeParam::Point pt2{0.1, 0.1};
+  typename TypeParam::Point pt3{0.05, 0.05};
+  typename TypeParam::Multipoint mpt1;
+  mpt1.push_back(pt1);
+  typename TypeParam::Multipoint mpt2;
+  mpt2.push_back(pt1);
+  mpt2.push_back(pt2);
+  typename TypeParam::Multipoint mpt3;
+  mpt3.push_back(pt1);
+  mpt3.push_back(pt2);
+  mpt3.push_back(pt3);
+  typename TypeParam::Linestring ls1 = simple_ls<TypeParam>();
+  typename TypeParam::Linestring ls2 = simple_ls_2<TypeParam>();
+  typename TypeParam::Multilinestring mls;
+  mls.push_back(ls1);
+  mls.push_back(ls2);
+
+  this->test_valid_input(mpt1, mls, mls);
+  this->test_valid_input(mpt2, mls, mls);
+
+  typename TypeParam::Geometrycollection result{};
+  result.push_back(mls);
+  result.push_back(pt3);
+  this->test_valid_input(mpt3, mls, result);
+}
+
+TYPED_TEST(SymDifferenceTest, MultiPointMultiPolygon) {
+  typename TypeParam::Point pt1{0.05, 0.05};
+  typename TypeParam::Point pt2{0.1, 0.2};
+  typename TypeParam::Multipoint mpt1;
+  mpt1.push_back(pt1);
+  typename TypeParam::Multipoint mpt2;
+  mpt2.push_back(pt1);
+  mpt2.push_back(pt2);
+  typename TypeParam::Polygon py = base_py<TypeParam>();
+  typename TypeParam::Multipolygon mpy = simple_mpy<TypeParam>();
+  typename TypeParam::Geometrycollection result{};
+
+  this->test_valid_input(mpt1, mpy, py);
+
+  result.push_back(pt2);
+  result.push_back(mpy);
+  this->test_valid_input(mpt2, mpy, result);
+}
+
+TYPED_TEST(SymDifferenceTest, MultiPointGeometryCollection) {
+  typename TypeParam::Point pt1{0.05, 0.05};
+  typename TypeParam::Point pt2{0.1, 0.2};
+  typename TypeParam::Point pt3{0.2, 0.0};
+  typename TypeParam::Point pt4{0.2, 0.1};
+  typename TypeParam::Point pt5{0.3, 0.0};
+  typename TypeParam::Point pt6{0.3, 0.1};
+  typename TypeParam::Linestring ls1;
+  ls1.push_back(pt3);
+  ls1.push_back(pt4);
+  typename TypeParam::Multipolygon mpy = simple_mpy<TypeParam>();
+  typename TypeParam::Geometrycollection gc{};
+  gc.push_back(pt2);
+  gc.push_back(pt3);
+  gc.push_back(pt4);
+  gc.push_back(pt5);
+  gc.push_back(ls1);
+  gc.push_back(mpy);
+
+  typename TypeParam::Multipoint mp;
+  mp.push_back(pt1);
+  mp.push_back(pt2);
+  mp.push_back(pt3);
+  mp.push_back(pt6);
+  this->test_valid_input(mp, typename TypeParam::Geometrycollection(), mp);
+
+  typename TypeParam::Geometrycollection result{};
+  result.push_back(mpy);
+  result.push_back(ls1);
+  result.push_back(pt5);
+  result.push_back(pt6);
+
+  this->test_valid_input(mp, gc, result);
+}
+
+// symdifference(... , multilinestring, *, ...)
+
+TYPED_TEST(SymDifferenceTest, MultiLinestringMultiLinestring) {
+  typename TypeParam::Linestring ls1 = simple_ls<TypeParam>();
+  typename TypeParam::Linestring ls2 = offset_simple_ls<TypeParam>();
+  typename TypeParam::Point pt1{0.0, 0.0};
+  typename TypeParam::Point pt2{0.05, 0.0};
+  typename TypeParam::Point pt3{0.1, 0.0};
+  typename TypeParam::Point pt4{0.15, 0.0};
+  typename TypeParam::Multilinestring mls1;
+  mls1.push_back(ls1);
+  typename TypeParam::Linestring ls1_result;
+  ls1_result.push_back(pt1);
+  ls1_result.push_back(pt2);
+  typename TypeParam::Linestring ls2_result;
+  ls2_result.push_back(pt3);
+  ls2_result.push_back(pt4);
+  typename TypeParam::Multilinestring mls_result;
+  mls_result.push_back(ls1_result);
+  mls_result.push_back(ls2_result);
+
+  typename TypeParam::Multilinestring mls{};
+  this->test_valid_input(mls1, mls, ls1);
+  mls.push_back(ls2);
+  this->test_valid_input(mls1, mls, mls_result);
+}
+
+TYPED_TEST(SymDifferenceTest, MultiLinestringMultiPolygon) {
+  // TODO: needs intersection point for geographic CS
+  // for a robust test
+  // typename TypeParam::Point pt1{0.05, 0.05};
+  typename TypeParam::Point pt1{0.1, 0.05};
+  typename TypeParam::Point pt2{0.1, 0.05};
+  typename TypeParam::Point pt3{0.15, 0.05};
+  typename TypeParam::Linestring ls;
+  ls.push_back(pt1);
+  ls.push_back(pt3);
+  typename TypeParam::Multilinestring mls;
+  mls.push_back(ls);
+  typename TypeParam::Linestring ls_result;
+  ls_result.push_back(pt2);
+  ls_result.push_back(pt3);
+  typename TypeParam::Multipolygon mpy = simple_mpy<TypeParam>();
+
+  typename TypeParam::Geometrycollection result{};
+  result.push_back(mpy);
+  result.push_back(ls_result);
+
+  this->test_valid_input(mls, mpy, result);
+}
+
+TYPED_TEST(SymDifferenceTest, MultiLinestringGeometryCollection) {
+  typename TypeParam::Point pt1{0.05, 0.05};
+  typename TypeParam::Point pt2{0.1, 0.2};
+  typename TypeParam::Point pt3{0.2, 0.0};
+  typename TypeParam::Point pt4{0.2, 0.1};
+  typename TypeParam::Linestring ls1;
+  ls1.push_back(pt3);
+  ls1.push_back(pt4);
+  typename TypeParam::Multipolygon mpy = simple_mpy<TypeParam>();
+  typename TypeParam::Geometrycollection gc{};
+  this->test_valid_input(ls1, gc, ls1);
+  gc.push_back(pt1);
+  gc.push_back(ls1);
+  gc.push_back(mpy);
+
+  typename TypeParam::Multilinestring mls;
+  mls.push_back(ls1);
+  this->test_valid_input(mls, gc, base_py<TypeParam>());
+
+  typename TypeParam::Linestring ls_intersect_py;
+  ls_intersect_py.push_back(pt2);
+  typename TypeParam::Point pt5{0.1, 0.0};
+  ls_intersect_py.push_back(pt5);
+  typename TypeParam::Geometrycollection result{};
+  result.push_back(mpy);
+  result.push_back(ls1);
+  typename TypeParam::Linestring ls_result;
+  ls_result.push_back(pt2);
+  typename TypeParam::Point pt6{0.1, 0.1};
+  ls_result.push_back(pt6);
+  result.push_back(ls_result);
+  mls.clear();
+  mls.push_back(ls_intersect_py);
+  this->test_valid_input(mls, gc, result);
+
+  typename TypeParam::Linestring ls2;
+  ls2.push_back(pt3);
+  ls2.push_back(pt4);
+  ls2.push_back(pt2);
+  typename TypeParam::Linestring ls_result2;
+  ls_result2.push_back(pt2);
+  ls_result2.push_back(pt4);
+
+  result.clear();
+  result.push_back(ls_result2);
+  result.push_back(mpy);
+  mls.clear();
+  mls.push_back(ls2);
+  this->test_valid_input(mls, gc, result);
+}
+
+// symdifference(... , multipolygon, *, ...)
+
+TYPED_TEST(SymDifferenceTest, MultiPolygonMultiPolygon) {
+  typename TypeParam::Point pt1{0.0, 0.0};
+  typename TypeParam::Point pt2{0.1, 0.0};
+  typename TypeParam::Point pt3{0.0, 0.1};
+  typename TypeParam::Point pt4{0.1, 0.1};
+  typename TypeParam::Point pt5{0.1, 0.2};
+  typename TypeParam::Multipolygon mpy1 = simple_mpy<TypeParam>();
+  typename TypeParam::Polygon py2;
+  typename TypeParam::Linearring exterior2;
+  exterior2.push_back(pt2);
+  exterior2.push_back(pt5);
+  exterior2.push_back(pt3);
+  exterior2.push_back(pt2);
+  py2.push_back(exterior2);
+  typename TypeParam::Multipolygon mpy2;
+  mpy2.push_back(py2);
+
+  typename TypeParam::Multipolygon mpy_result;
+  typename TypeParam::Polygon py1_result;
+  typename TypeParam::Linearring exterior1r;
+  typename TypeParam::Polygon py2_result;
+  typename TypeParam::Linearring exterior2r;
+  exterior1r.push_back(pt1);
+  exterior1r.push_back(pt2);
+  exterior1r.push_back(pt3);
+  exterior1r.push_back(pt1);
+  py1_result.push_back(exterior1r);
+  mpy_result.push_back(py1_result);
+  exterior2r.push_back(pt3);
+  exterior2r.push_back(pt4);
+  exterior2r.push_back(pt5);
+  exterior2r.push_back(pt3);
+  py2_result.push_back(exterior2r);
+  mpy_result.push_back(py2_result);
+
+  this->test_valid_input(mpy1, mpy2, mpy_result);
+}
+
+TYPED_TEST(SymDifferenceTest, MultiPolygonGeometryCollection) {
+  typename TypeParam::Point pt1{0.05, 0.05};
+  typename TypeParam::Point pt2{0.1, 0.2};
+  typename TypeParam::Point pt3{0.2, 0.0};
+  typename TypeParam::Point pt4{0.2, 0.1};
+  typename TypeParam::Linestring ls1;
+  ls1.push_back(pt3);
+  ls1.push_back(pt4);
+  typename TypeParam::Multipolygon mpy = simple_mpy<TypeParam>();
+  typename TypeParam::Polygon py = base_py<TypeParam>();
+  typename TypeParam::Geometrycollection gc{};
+
+  this->test_valid_input(mpy, gc, py);
+  gc.push_back(pt3);
+  gc.push_back(ls1);
+  gc.push_back(mpy);
+
+  this->test_valid_input(mpy, gc, ls1);
+
+  typename TypeParam::Linestring ls2;
+  ls2.push_back(pt3);
+  ls2.push_back(pt4);
+  ls2.push_back(pt2);
+  typename TypeParam::Linestring ls3;
+  ls3.push_back(pt1);
+  ls3.push_back(pt2);
+  gc.push_back(ls2);
+  gc.push_back(ls3);
+  typename TypeParam::Multilinestring result{};
+  typename TypeParam::Linestring ls_result;
+  ls_result.push_back(pt2);
+  ls_result.push_back(typename TypeParam::Point(0.0666667, 0.1));
+  result.push_back(ls_result);
+  result.push_back(ls1);
+  result.push_back(ls2);
+  this->test_valid_input(mpy, gc, result);
+}
+
+// symdifference(... , geometrycollection, geometrycollection, ...)
+
+TYPED_TEST(SymDifferenceTest, GeometryCollectionGeometryCollection) {
+  typename TypeParam::Point pt1{0.05, 0.05};
+  typename TypeParam::Point pt2{0.1, 0.2};
+  typename TypeParam::Point pt3{0.2, 0.0};
+  typename TypeParam::Point pt4{0.2, 0.1};
+  typename TypeParam::Linestring ls1;
+  ls1.push_back(pt3);
+  ls1.push_back(pt4);
+  typename TypeParam::Multipolygon mpy = simple_mpy<TypeParam>();
+  typename TypeParam::Polygon py = base_py<TypeParam>();
+  typename TypeParam::Geometrycollection emptygc{};
+  typename TypeParam::Geometrycollection gc{};
+  typename TypeParam::Geometrycollection gc_py{};
+  gc_py.push_back(mpy);
+  this->test_valid_input(gc_py, gc_py, emptygc);
+  this->test_valid_input(gc_py, gc, py);
+  gc.push_back(ls1);
+  this->test_valid_input(gc, gc, emptygc);
+  gc.push_back(pt3);
+  gc.push_back(mpy);
+  this->test_valid_input(gc_py, gc, ls1);
+
+  typename TypeParam::Linestring ls2;
+  ls2.push_back(pt3);
+  ls2.push_back(pt4);
+  ls2.push_back(pt2);
+  typename TypeParam::Linestring ls3;
+  ls3.push_back(pt1);
+  ls3.push_back(pt2);
+  gc.push_back(ls2);
+  gc.push_back(ls3);
+  typename TypeParam::Multilinestring result{};
+  typename TypeParam::Linestring ls_result;
+  ls_result.push_back(pt2);
+  ls_result.push_back(typename TypeParam::Point(0.0666667, 0.1));
+  result.push_back(ls_result);
+  result.push_back(ls1);
+  result.push_back(ls2);
+  this->test_valid_input(gc_py, gc, result);
+}
+
+}  // namespace gis_symdifference_unittest
diff -Nru mysql-8.0-8.0.26/unittest/gunit/group_replication/CMakeLists.txt mysql-8.0-8.0.27/unittest/gunit/group_replication/CMakeLists.txt
--- mysql-8.0-8.0.26/unittest/gunit/group_replication/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/group_replication/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -31,15 +31,22 @@
   group_replication_compatibility_module
   group_replication_member_version
   group_replication_mysql_version_gcs_protocol_map
+  group_replication_gcs_mysql_network_provider
   )
 
 FOREACH(test ${TESTS})
-  MYSQL_ADD_EXECUTABLE(${test}-t ${test}-t.cc
+  SET(SRC_FILES ${test}-t.cc)
+  IF(WIN32)
+    LIST(APPEND SRC_FILES ../../../sql/nt_servc.cc)
+  ENDIF()
+
+  MYSQL_ADD_EXECUTABLE(${test}-t ${SRC_FILES}
     ADD_TEST ${test}
     ENABLE_EXPORTS
     LINK_LIBRARIES
     gr_unit_test_resource
-    gunit_small
+    gunit_large
+    server_unittest_library
     mysqlclient
     mysqlgcs
     )
diff -Nru mysql-8.0-8.0.26/unittest/gunit/group_replication/group_replication_gcs_mysql_network_provider-t.cc mysql-8.0-8.0.27/unittest/gunit/group_replication/group_replication_gcs_mysql_network_provider-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/group_replication/group_replication_gcs_mysql_network_provider-t.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/group_replication/group_replication_gcs_mysql_network_provider-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,454 @@
+/* Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+
+   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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include "plugin/group_replication/include/gcs_mysql_network_provider.h"
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+void handle_group_replication_incoming_connection(THD *thd, int fd,
+                                                  SSL *ssl_ctx) {
+  (void)thd;
+  (void)fd;
+  (void)ssl_ctx;
+}
+
+// To fool the compiler
+ulong get_components_stop_timeout_var() { return 0; }
+
+namespace group_replication_gcs_mysql_networkprovidertest {
+
+class mock_gcs_mysql_network_provider_auth_interface
+    : public Gcs_mysql_network_provider_auth_interface {
+ public:
+  MOCK_METHOD(bool, get_credentials,
+              (std::string & username, std::string &password), (override));
+};
+
+class mock_gcs_mysql_network_provider_native_interface
+    : public Gcs_mysql_network_provider_native_interface {
+ public:
+  MOCK_METHOD(MYSQL *, mysql_real_connect,
+              (MYSQL * mysql, const char *host, const char *user,
+               const char *passwd, const char *db, unsigned int port,
+               const char *unix_socket, unsigned long clientflag),
+              (override));
+  MOCK_METHOD(bool, send_command,
+              (MYSQL * mysql, enum enum_server_command command,
+               const unsigned char *arg, size_t length, bool skip_check),
+              (override));
+  MOCK_METHOD(MYSQL *, mysql_init, (MYSQL * sock), (override));
+  MOCK_METHOD(void, mysql_close, (MYSQL * sock), (override));
+  MOCK_METHOD(void, mysql_free, (void *ptr), (override));
+  MOCK_METHOD(int, channel_get_network_namespace, (std::string & net_ns),
+              (override));
+  MOCK_METHOD(bool, set_network_namespace,
+              (const std::string &network_namespace), (override));
+  MOCK_METHOD(bool, restore_original_network_namespace, (), (override));
+
+  MOCK_METHOD(int, mysql_options,
+              (MYSQL * mysql, enum mysql_option option, const void *arg),
+              (override));
+  MOCK_METHOD(bool, mysql_ssl_set,
+              (MYSQL * mysql, const char *key, const char *cert, const char *ca,
+               const char *capath, const char *cipher),
+              (override));
+};
+
+/**
+ * @brief Unit Test Fixture for Gcs_mysql_network_provider.
+ *
+ * It is intended to provide as much coverage as possible to
+ * Gcs_mysql_network_provider. For that, it uses a series of mocks and
+ * dependecy injection mechanisms to reach its goal.
+ *
+ * The tests are:
+ *
+ * MySQLNetworkProviderTest.StartAndStopTest
+ *   Tests if we are able to start and stop the provider
+ *
+ * MySQLNetworkProviderTest.StartAgainAndStopTest
+ *   Tests if we are able to start the provider twice and stop it
+ *
+ * MySQLNetworkProviderTest.CreateConnectionToSelfTest
+ *   Test if one is able to connect successfully
+ *
+ * MySQLNetworkProviderTest.CreateConnectionToSelfWithSSLTest
+ *   Test if one is able to connect successfully using SSL
+ *
+ * MySQLNetworkProviderTest.CreateConnectionToSelfCredentialsErrorTest
+ *   Test error case when getting credentials
+ *
+ * MySQLNetworkProviderTest.CreateConnectionToSelfRealConnectErrorTest
+ *   Test error case when connecting
+ *
+ * MySQLNetworkProviderTest.CreateConnectionToSelfSendCommandErrorTest
+ *   Test error case when sending a command
+ *
+ * MySQLNetworkProviderTest.NewServerConnectionTest
+ *   Test receiving a new connection from the outside
+ */
+
+class MySQLNetworkProviderTest : public ::testing::Test {
+ protected:
+  MySQLNetworkProviderTest() {}
+
+  virtual void SetUp() {
+    auth_interface = new mock_gcs_mysql_network_provider_auth_interface();
+    native_interface = new mock_gcs_mysql_network_provider_native_interface();
+  }
+
+  virtual void TearDown() {
+    delete auth_interface;
+    delete native_interface;
+  }
+
+  mock_gcs_mysql_network_provider_auth_interface *auth_interface;
+  mock_gcs_mysql_network_provider_native_interface *native_interface;
+};
+
+TEST_F(MySQLNetworkProviderTest, StartAndStopTest) {
+  Gcs_mysql_network_provider net_provider(auth_interface, native_interface);
+
+  ASSERT_FALSE(net_provider.start());
+  net_provider.stop();
+}
+
+TEST_F(MySQLNetworkProviderTest, StartAgainAndStopTest) {
+  Gcs_mysql_network_provider net_provider(auth_interface, native_interface);
+
+  ASSERT_FALSE(net_provider.start());
+  ASSERT_FALSE(net_provider.start());
+
+  net_provider.stop();
+}
+
+TEST_F(MySQLNetworkProviderTest, CreateConnectionToSelfTest) {
+  EXPECT_CALL(*auth_interface, get_credentials(testing::_, testing::_))
+      .Times(1)
+      .WillRepeatedly(testing::Return(false));
+
+  MYSQL *fake_conn = (MYSQL *)malloc(sizeof(MYSQL));
+
+  EXPECT_CALL(*native_interface, mysql_init(testing::_))
+      .Times(1)
+      .WillRepeatedly(testing::Return(fake_conn));
+
+  EXPECT_CALL(
+      *native_interface,
+      mysql_real_connect(testing::_, testing::_, testing::_, testing::_,
+                         testing::_, testing::_, testing::_, testing::_))
+      .Times(1)
+      .WillRepeatedly(testing::Return(fake_conn));
+
+  EXPECT_CALL(
+      *native_interface,
+      send_command(testing::_, testing::_, testing::_, testing::_, testing::_))
+      .Times(1)
+      .WillRepeatedly(testing::Return(false));
+
+  EXPECT_CALL(*native_interface, channel_get_network_namespace(testing::_))
+      .Times(1)
+      .WillRepeatedly(testing::Return(false));
+
+  EXPECT_CALL(*native_interface, set_network_namespace(testing::_)).Times(0);
+
+  EXPECT_CALL(*native_interface, restore_original_network_namespace()).Times(0);
+
+  EXPECT_CALL(*native_interface, mysql_close(testing::_));
+
+  Gcs_mysql_network_provider net_provider(auth_interface, native_interface);
+
+  ASSERT_FALSE(net_provider.start());
+
+  auto new_connection =
+      net_provider.open_connection("localhost", 12345, {"", "", false});
+
+  ASSERT_NE(-1, new_connection.get()->fd);
+
+  int close_connection_retval = net_provider.close_connection(*new_connection);
+
+  ASSERT_EQ(0, close_connection_retval);
+
+  net_provider.stop();
+
+  free(fake_conn);
+}
+
+TEST_F(MySQLNetworkProviderTest, CreateConnectionToSelfWithNameSpaceTest) {
+  EXPECT_CALL(*auth_interface, get_credentials(testing::_, testing::_))
+      .Times(1)
+      .WillRepeatedly(testing::Return(false));
+
+  MYSQL *fake_conn = (MYSQL *)malloc(sizeof(MYSQL));
+
+  EXPECT_CALL(*native_interface, mysql_init(testing::_))
+      .Times(1)
+      .WillRepeatedly(testing::Return(fake_conn));
+
+  EXPECT_CALL(
+      *native_interface,
+      mysql_real_connect(testing::_, testing::_, testing::_, testing::_,
+                         testing::_, testing::_, testing::_, testing::_))
+      .Times(1)
+      .WillRepeatedly(testing::Return(fake_conn));
+
+  EXPECT_CALL(
+      *native_interface,
+      send_command(testing::_, testing::_, testing::_, testing::_, testing::_))
+      .Times(1)
+      .WillRepeatedly(testing::Return(false));
+
+  EXPECT_CALL(*native_interface, channel_get_network_namespace(testing::_))
+      .Times(1)
+      .WillRepeatedly(
+          testing::DoAll([](std::string &net_ns) { net_ns.assign("test_ns"); },
+                         testing::Return(false)));
+
+  EXPECT_CALL(*native_interface,
+              set_network_namespace(testing::StrEq("test_ns")))
+      .Times(1)
+      .WillRepeatedly(testing::Return(false));
+
+  EXPECT_CALL(*native_interface, restore_original_network_namespace())
+      .Times(1)
+      .WillRepeatedly(testing::Return(false));
+
+  EXPECT_CALL(*native_interface, mysql_close(testing::_));
+
+  Gcs_mysql_network_provider net_provider(auth_interface, native_interface);
+
+  ASSERT_FALSE(net_provider.start());
+
+  auto new_connection =
+      net_provider.open_connection("localhost", 12345, {"", "", false});
+
+  ASSERT_NE(-1, new_connection.get()->fd);
+
+  int close_connection_retval = net_provider.close_connection(*new_connection);
+
+  ASSERT_EQ(0, close_connection_retval);
+
+  net_provider.stop();
+
+  free(fake_conn);
+}
+
+TEST_F(MySQLNetworkProviderTest, CreateConnectionToSelfWithSSLTest) {
+  EXPECT_CALL(*auth_interface, get_credentials(testing::_, testing::_))
+      .Times(1)
+      .WillRepeatedly(testing::Return(false));
+
+  MYSQL *fake_conn = (MYSQL *)malloc(sizeof(MYSQL));
+
+  EXPECT_CALL(*native_interface, mysql_init(testing::_))
+      .Times(1)
+      .WillRepeatedly(testing::Return(fake_conn));
+
+  EXPECT_CALL(
+      *native_interface,
+      mysql_real_connect(testing::_, testing::_, testing::_, testing::_,
+                         testing::_, testing::_, testing::_, testing::_))
+      .Times(1)
+      .WillRepeatedly(testing::DoAll(
+          [](MYSQL *mysql, const char *host, const char *user,
+             const char *passwd, const char *db, unsigned int port,
+             const char *unix_socket, unsigned long clientflag) {
+            (void)host;
+            (void)user;
+            (void)passwd;
+            (void)db;
+            (void)port;
+            (void)unix_socket;
+            (void)clientflag;
+            mysql->net.vio = (Vio *)malloc(sizeof(Vio));
+            SSL *fake_ssl_connection = (SSL *)malloc(sizeof(SSL *));
+            mysql->net.vio->ssl_arg = fake_ssl_connection;
+          },
+          testing::Return(fake_conn)));
+
+  EXPECT_CALL(
+      *native_interface,
+      send_command(testing::_, testing::_, testing::_, testing::_, testing::_))
+      .Times(1)
+      .WillRepeatedly(testing::Return(false));
+
+  EXPECT_CALL(*native_interface, mysql_close(testing::_));
+
+  Network_configuration_parameters net_provider_security_params;
+  net_provider_security_params.ssl_params = {
+      SSL_REQUIRED, nullptr, nullptr, nullptr, nullptr,
+      nullptr,      nullptr, nullptr, nullptr, nullptr};
+  net_provider_security_params.tls_params = {nullptr, nullptr};
+  Gcs_mysql_network_provider net_provider(auth_interface, native_interface);
+
+  net_provider.configure_secure_connections(net_provider_security_params);
+
+  ASSERT_FALSE(net_provider.start());
+
+  auto new_connection =
+      net_provider.open_connection("localhost", 12345, {"", "", true});
+
+  ASSERT_NE(-1, new_connection.get()->fd);
+
+  int close_connection_retval = net_provider.close_connection(*new_connection);
+
+  ASSERT_EQ(0, close_connection_retval);
+
+  net_provider.stop();
+
+  free(fake_conn->net.vio->ssl_arg);
+  free(fake_conn->net.vio);
+  free(fake_conn);
+}
+
+TEST_F(MySQLNetworkProviderTest, CreateConnectionToSelfCredentialsErrorTest) {
+  EXPECT_CALL(*auth_interface, get_credentials(testing::_, testing::_))
+      .Times(1)
+      .WillOnce(testing::Return(true));
+
+  MYSQL *fake_conn = (MYSQL *)malloc(sizeof(MYSQL));
+
+  EXPECT_CALL(*native_interface, mysql_init(testing::_))
+      .Times(1)
+      .WillRepeatedly(testing::Return(fake_conn));
+
+  Gcs_mysql_network_provider net_provider(auth_interface, native_interface);
+
+  ASSERT_FALSE(net_provider.start());
+
+  auto new_connection =
+      net_provider.open_connection("localhost", 12345, {"", "", false});
+
+  ASSERT_EQ(-1, new_connection.get()->fd);
+
+  net_provider.stop();
+
+  free(fake_conn);
+}
+
+TEST_F(MySQLNetworkProviderTest, CreateConnectionToSelfRealConnectErrorTest) {
+  EXPECT_CALL(*auth_interface, get_credentials(testing::_, testing::_))
+      .Times(1)
+      .WillRepeatedly(testing::Return(false));
+
+  MYSQL *fake_conn = (MYSQL *)malloc(sizeof(MYSQL));
+
+  EXPECT_CALL(*native_interface, mysql_init(testing::_))
+      .Times(1)
+      .WillRepeatedly(testing::Return(fake_conn));
+
+  EXPECT_CALL(
+      *native_interface,
+      mysql_real_connect(testing::_, testing::_, testing::_, testing::_,
+                         testing::_, testing::_, testing::_, testing::_))
+      .Times(1)
+      .WillOnce(testing::Return(nullptr));
+
+  EXPECT_CALL(*native_interface, mysql_close(testing::_)).Times(1);
+
+  Gcs_mysql_network_provider net_provider(auth_interface, native_interface);
+
+  ASSERT_FALSE(net_provider.start());
+
+  auto new_connection =
+      net_provider.open_connection("localhost", 12345, {"", "", false});
+
+  ASSERT_EQ(-1, new_connection.get()->fd);
+
+  net_provider.stop();
+
+  free(fake_conn);
+}
+
+TEST_F(MySQLNetworkProviderTest, CreateConnectionToSelfSendCommandErrorTest) {
+  EXPECT_CALL(*auth_interface, get_credentials(testing::_, testing::_))
+      .Times(1)
+      .WillRepeatedly(testing::Return(false));
+
+  MYSQL *fake_conn = (MYSQL *)malloc(sizeof(MYSQL));
+
+  EXPECT_CALL(*native_interface, mysql_init(testing::_))
+      .Times(1)
+      .WillRepeatedly(testing::Return(fake_conn));
+
+  EXPECT_CALL(
+      *native_interface,
+      mysql_real_connect(testing::_, testing::_, testing::_, testing::_,
+                         testing::_, testing::_, testing::_, testing::_))
+      .Times(1)
+      .WillRepeatedly(testing::Return(fake_conn));
+
+  EXPECT_CALL(
+      *native_interface,
+      send_command(testing::_, testing::_, testing::_, testing::_, testing::_))
+      .Times(1)
+      .WillRepeatedly(testing::Return(true));
+
+  EXPECT_CALL(*native_interface, mysql_close(testing::_));
+
+  Gcs_mysql_network_provider net_provider(auth_interface, native_interface);
+
+  ASSERT_FALSE(net_provider.start());
+
+  auto new_connection =
+      net_provider.open_connection("localhost", 12345, {"", "", false});
+
+  ASSERT_EQ(-1, new_connection.get()->fd);
+
+  net_provider.stop();
+
+  free(fake_conn);
+}
+
+TEST_F(MySQLNetworkProviderTest, NewServerConnectionTest) {
+  Gcs_mysql_network_provider net_provider(auth_interface, native_interface);
+
+  ASSERT_FALSE(net_provider.start());
+
+  constexpr int socket_to_use = 42;
+
+  THD fake_thd(false);
+  // Vio *active_vio = (Vio *)malloc(sizeof(Vio));
+  MYSQL_VIO active_vio = vio_new(socket_to_use, VIO_TYPE_TCPIP, 0);
+  active_vio->mysql_socket.fd = socket_to_use;
+  active_vio->vioshutdown = [](Vio *) { return 0; };
+
+  fake_thd.set_active_vio(active_vio);
+
+  Network_connection fake_network_conn(socket_to_use);
+
+  net_provider.set_new_connection(&fake_thd, &fake_network_conn);
+
+  Network_connection *retrieved_network_connection =
+      net_provider.get_new_connection();
+
+  ASSERT_NE(retrieved_network_connection, nullptr);
+  ASSERT_EQ(fake_network_conn.fd, retrieved_network_connection->fd);
+
+  net_provider.stop();
+
+  fake_thd.clear_active_vio();
+  vio_delete(active_vio);
+}
+
+}  // namespace group_replication_gcs_mysql_networkprovidertest
\ No newline at end of file
diff -Nru mysql-8.0-8.0.26/unittest/gunit/group_replication/group_replication_member_info-t.cc mysql-8.0-8.0.27/unittest/gunit/group_replication/group_replication_member_info-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/group_replication/group_replication_member_info-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/group_replication/group_replication_member_info-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -56,6 +56,7 @@
     uint member_weight = 70;
     std::string member_recovery_endpoints = "DEFAULT";
     std::string member_view_change_uuid = "AUTOMATIC";
+    bool allow_single_leader = true;
 
     gcs_member_id = new Gcs_member_identifier("stuff");
 
@@ -70,7 +71,7 @@
         in_primary_mode, has_enforces_update_everywhere_checks, member_weight,
         lower_case_table_names, default_table_encryption,
         member_recovery_endpoints.c_str(), member_view_change_uuid.c_str(),
-        PSI_NOT_INSTRUMENTED);
+        allow_single_leader, PSI_NOT_INSTRUMENTED);
     local_node->update_gtid_sets(executed_gtid, purged_gtid, retrieved_gtid);
   }
 
@@ -114,7 +115,8 @@
             decoded_local_node.get_member_weight());
   ASSERT_EQ(local_node->get_view_change_uuid(),
             decoded_local_node.get_view_change_uuid());
-
+  ASSERT_EQ(local_node->get_allow_single_leader(),
+            decoded_local_node.get_allow_single_leader());
   delete encoded;
 }
 
@@ -138,6 +140,7 @@
     std::string member_recovery_endpoints = "DEFAULT";
     std::string member_view_change_uuid =
         "8896eb66-8684-11eb-8dcd-0242ac130003";
+    bool allow_single_leader = false;
 
     Group_member_info::Group_member_status status =
         Group_member_info::MEMBER_OFFLINE;
@@ -150,7 +153,7 @@
         in_primary_mode, has_enforces_update_everywhere_checks, member_weight,
         lower_case_table_names, default_table_encryption,
         member_recovery_endpoints.c_str(), member_view_change_uuid.c_str(),
-        PSI_NOT_INSTRUMENTED);
+        allow_single_leader, PSI_NOT_INSTRUMENTED);
 
     cluster_member_mgr =
         new Group_member_info_manager(local_node, PSI_NOT_INSTRUMENTED);
@@ -186,6 +189,7 @@
   uint member_weight = 90;
   std::string member_recovery_endpoints = "DEFAULT";
   std::string member_view_change_uuid = "99f957fc-75c5-445d-98ae-7ea02e55c5be";
+  bool allow_single_leader = true;
 
   Group_member_info::Group_member_status status =
       Group_member_info::MEMBER_OFFLINE;
@@ -198,7 +202,7 @@
       in_primary_mode, has_enforces_update_everywhere_checks, member_weight,
       lower_case_table_names, default_table_encryption,
       member_recovery_endpoints.c_str(), member_view_change_uuid.c_str(),
-      PSI_NOT_INSTRUMENTED);
+      allow_single_leader, PSI_NOT_INSTRUMENTED);
   new_member->update_gtid_sets(executed_gtid, purged_gtid, retrieved_gtid);
 
   cluster_member_mgr->add(new_member);
@@ -277,6 +281,8 @@
             retrieved_local_info->get_member_weight());
   ASSERT_EQ(local_node->get_view_change_uuid(),
             retrieved_local_info->get_view_change_uuid());
+  ASSERT_EQ(local_node->get_allow_single_leader(),
+            retrieved_local_info->get_allow_single_leader());
 
   delete retrieved_local_info;
 }
@@ -343,6 +349,7 @@
   uint member_weight = 40;
   std::string member_recovery_endpoints = "DEFAULT";
   std::string member_view_change_uuid = "ba1c4c32-1887-4ccf-bc5a-8f6165d19ea3";
+  bool allow_single_leader = true;
 
   Group_member_info::Group_member_status status =
       Group_member_info::MEMBER_OFFLINE;
@@ -355,7 +362,7 @@
       in_primary_mode, has_enforces_update_everywhere_checks, member_weight,
       lower_case_table_names, default_table_encryption,
       member_recovery_endpoints.c_str(), member_view_change_uuid.c_str(),
-      PSI_NOT_INSTRUMENTED);
+      allow_single_leader, PSI_NOT_INSTRUMENTED);
   new_member->update_gtid_sets(executed_gtid, purged_gtid, retrieved_gtid);
 
   cluster_member_mgr->add(new_member);
@@ -424,6 +431,8 @@
             retrieved_local_info->get_default_table_encryption());
   ASSERT_EQ(local_node->get_view_change_uuid(),
             retrieved_local_info->get_view_change_uuid());
+  ASSERT_EQ(local_node->get_allow_single_leader(),
+            retrieved_local_info->get_allow_single_leader());
 
   delete retrieved_local_info;
 }
diff -Nru mysql-8.0-8.0.26/unittest/gunit/group_replication/group_replication_mysql_version_gcs_protocol_map-t.cc mysql-8.0-8.0.27/unittest/gunit/group_replication/group_replication_mysql_version_gcs_protocol_map-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/group_replication/group_replication_mysql_version_gcs_protocol_map-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/group_replication/group_replication_mysql_version_gcs_protocol_map-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -66,7 +66,8 @@
 TEST_F(MysqlVerGcsProtoMapTest, ConvertToMysqlVersion) {
   std::vector<std::pair<Gcs_protocol_version, Member_version>> versions = {
       {Gcs_protocol_version::V1, Member_version(0x050714)},
-      {Gcs_protocol_version::V2, Member_version(0x080016)}};
+      {Gcs_protocol_version::V2, Member_version(0x080016)},
+      {Gcs_protocol_version::V3, Member_version(0x080027)}};
   for (auto const &version_pair : versions) {
     Member_version member_version =
         convert_to_mysql_version(version_pair.first);
@@ -78,10 +79,11 @@
   std::vector<std::pair<Member_version, Gcs_protocol_version>> versions = {
       {Member_version(0x050714), Gcs_protocol_version::V1},
       {Member_version(0x080015), Gcs_protocol_version::V1},
-      {Member_version(0x080016), Gcs_protocol_version::V2}};
+      {Member_version(0x080016), Gcs_protocol_version::V2},
+      {Member_version(0x080027), Gcs_protocol_version::V3}};
   for (auto const &version_pair : versions) {
     Gcs_protocol_version gcs_protocol =
-        convert_to_gcs_protocol(version_pair.first, Member_version(0x080016));
+        convert_to_gcs_protocol(version_pair.first, Member_version(0x080027));
     ASSERT_EQ(version_pair.second, gcs_protocol);
   }
 }
diff -Nru mysql-8.0-8.0.26/unittest/gunit/histograms-t.cc mysql-8.0-8.0.27/unittest/gunit/histograms-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/histograms-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/histograms-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -2613,8 +2613,7 @@
   values.add_values(3, 10);
   values.add_values(4, 10);
 
-  MEM_ROOT oom_mem_root;
-  init_alloc_root(PSI_NOT_INSTRUMENTED, &oom_mem_root, 32, 0);
+  MEM_ROOT oom_mem_root(PSI_NOT_INSTRUMENTED, 32);
 
   /*
     Restrict the maximum capacity of the MEM_ROOT so it cannot grow anymore. But
@@ -2645,8 +2644,7 @@
   values.add_values(3, 10);
   values.add_values(4, 10);
 
-  MEM_ROOT oom_mem_root;
-  init_alloc_root(PSI_NOT_INSTRUMENTED, &oom_mem_root, 128, 0);
+  MEM_ROOT oom_mem_root(PSI_NOT_INSTRUMENTED, 128);
 
   {
     /*
@@ -2673,8 +2671,7 @@
   values.add_values(3, 10);
   values.add_values(4, 10);
 
-  MEM_ROOT oom_mem_root;
-  init_alloc_root(PSI_NOT_INSTRUMENTED, &oom_mem_root, 128, 0);
+  MEM_ROOT oom_mem_root(PSI_NOT_INSTRUMENTED, 128);
 
   {
     /*
diff -Nru mysql-8.0-8.0.26/unittest/gunit/hypergraph_optimizer-t.cc mysql-8.0-8.0.27/unittest/gunit/hypergraph_optimizer-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/hypergraph_optimizer-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/hypergraph_optimizer-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -31,6 +31,7 @@
 
 #include "mem_root_deque.h"
 #include "my_alloc.h"
+#include "my_base.h"
 #include "my_inttypes.h"
 #include "my_sys.h"
 #include "mysqld_error.h"
@@ -40,10 +41,12 @@
 #include "sql/item.h"
 #include "sql/item_subselect.h"
 #include "sql/join_optimizer/access_path.h"
+#include "sql/join_optimizer/common_subexpression_elimination.h"
 #include "sql/join_optimizer/explain_access_path.h"
 #include "sql/join_optimizer/hypergraph.h"
 #include "sql/join_optimizer/join_optimizer.h"
 #include "sql/join_optimizer/make_join_hypergraph.h"
+#include "sql/join_optimizer/print_utils.h"
 #include "sql/join_optimizer/relational_expression.h"
 #include "sql/join_optimizer/subgraph_enumeration.h"
 #include "sql/join_optimizer/walk_access_paths.h"
@@ -61,6 +64,7 @@
 #include "sql/system_variables.h"
 #include "sql/table.h"
 #include "template_utils.h"
+#include "unittest/gunit/base_mock_field.h"
 #include "unittest/gunit/fake_table.h"
 #include "unittest/gunit/handler-t.h"
 #include "unittest/gunit/parsertest.h"
@@ -68,10 +72,21 @@
 
 using hypergraph::NodeMap;
 using std::unordered_map;
+using std::vector;
 using testing::_;
 using testing::Pair;
 using testing::Return;
 
+static AccessPath *FindBestQueryPlanAndFinalize(THD *thd,
+                                                Query_block *query_block,
+                                                string *trace) {
+  AccessPath *path = FindBestQueryPlan(thd, query_block, trace);
+  if (path != nullptr) {
+    FinalizePlanForQueryBlock(thd, query_block, path);
+  }
+  return path;
+}
+
 // Base class for the hypergraph unit tests. Its parent class is a type
 // parameter, so that it can be used as a base class for both non-parametrized
 // tests (::testing::Test) and parametrized tests (::testing::TestWithParam).
@@ -89,6 +104,7 @@
   void ResolveFieldToFakeTable(Item *item);
   void ResolveAllFieldsToFakeTable(
       const mem_root_deque<TABLE_LIST *> &join_list);
+  void SetJoinConditions(const mem_root_deque<TABLE_LIST *> &join_list);
   void DestroyFakeTables() {
     for (const auto &name_and_table : m_fake_tables) {
       destroy(name_and_table.second);
@@ -111,8 +127,13 @@
   int num_tables = 0;
   for (TABLE_LIST *tl = query_block->get_table_list(); tl != nullptr;
        tl = tl->next_global) {
-    Fake_TABLE *fake_table =
-        new (m_thd->mem_root) Fake_TABLE(/*num_columns=*/2, nullable);
+    // If we already have created a fake table with this name (for example to
+    // get columns of specific types), use that one. Otherwise, create a new one
+    // with two integer columns.
+    Fake_TABLE *fake_table = m_fake_tables.count(tl->alias) == 0
+                                 ? new (m_thd->mem_root)
+                                       Fake_TABLE(/*num_columns=*/4, nullable)
+                                 : m_fake_tables[tl->alias];
     fake_table->alias = tl->alias;
     fake_table->pos_in_table_list = tl;
     tl->table = fake_table;
@@ -168,6 +189,7 @@
   query_block->join->having_cond = query_block->having_cond();
   query_block->join->fields = &query_block->fields;
   query_block->join->alloc_func_list();
+  SetJoinConditions(query_block->top_join_list);
 
   if (query_block->select_limit != nullptr) {
     query_block->master_query_expression()->select_limit_cnt =
@@ -188,10 +210,15 @@
         item_field->field = table->field[0];
       } else if (strcmp(item_field->field_name, "y") == 0) {
         item_field->field = table->field[1];
+      } else if (strcmp(item_field->field_name, "z") == 0) {
+        item_field->field = table->field[2];
+      } else if (strcmp(item_field->field_name, "w") == 0) {
+        item_field->field = table->field[3];
       } else {
         assert(false);
       }
       item_field->set_nullable(item_field->field->is_nullable());
+      item_field->set_data_type(MYSQL_TYPE_LONG);
     }
     return false;
   });
@@ -211,6 +238,17 @@
 }
 
 template <typename T>
+void HypergraphTestBase<T>::SetJoinConditions(
+    const mem_root_deque<TABLE_LIST *> &join_list) {
+  for (TABLE_LIST *tl : join_list) {
+    tl->set_join_cond_optim(tl->join_cond());
+    if (tl->nested_join != nullptr) {
+      SetJoinConditions(tl->nested_join->join_list);
+    }
+  }
+}
+
+template <typename T>
 handlerton *HypergraphTestBase<T>::EnableSecondaryEngine(
     bool aggregation_is_unordered) {
   auto hton = new (m_thd->mem_root) Fake_handlerton;
@@ -235,6 +273,7 @@
 }
 
 namespace {
+
 /// An error checker which, upon destruction, verifies that a single error was
 /// raised while the checker was alive, and that the error had the expected
 /// error number. If an error is raised, the THD::is_error() flag will be set,
@@ -268,6 +307,55 @@
   unsigned m_errno;
   ErrorHandlerFunctionPointer m_saved_error_hook;
 };
+
+// Sort the nodes in the given graph by name, which makes the test
+// a bit more robust against irrelevant changes. Note that we don't
+// sort edges, since it's often useful to correlate the code with
+// the Graphviz output in the optimizer trace, which isn't sorted.
+void SortNodes(JoinHypergraph *graph) {
+  // Sort nodes (by alias). We sort a series of indexes first the same way
+  // so that we know which went where.
+  std::vector<int> node_order;
+  for (unsigned i = 0; i < graph->nodes.size(); ++i) {
+    node_order.push_back(i);
+  }
+  std::sort(node_order.begin(), node_order.end(), [graph](int a, int b) {
+    return strcmp(graph->nodes[a].table->alias, graph->nodes[b].table->alias) <
+           0;
+  });
+  std::sort(graph->nodes.begin(), graph->nodes.end(),
+            [](const JoinHypergraph::Node &a, const JoinHypergraph::Node &b) {
+              return strcmp(a.table->alias, b.table->alias) < 0;
+            });
+
+  // Remap hyperedges to the new node indexes. Note that we don't
+  // change the neighborhood, because nothing in these tests need it.
+  int node_map[MAX_TABLES];
+  for (unsigned i = 0; i < graph->nodes.size(); ++i) {
+    node_map[node_order[i]] = i;
+  }
+  for (hypergraph::Hyperedge &edge : graph->graph.edges) {
+    NodeMap new_left = 0, new_right = 0;
+    for (int node_idx : BitsSetIn(edge.left)) {
+      new_left |= NodeMap{1} << node_map[node_idx];
+    }
+    for (int node_idx : BitsSetIn(edge.right)) {
+      new_right |= NodeMap{1} << node_map[node_idx];
+    }
+    edge.left = new_left;
+    edge.right = new_right;
+  }
+
+  // Remap TES.
+  for (Predicate &pred : graph->predicates) {
+    NodeMap new_tes = 0;
+    for (int node_idx : BitsSetIn(pred.total_eligibility_set)) {
+      new_tes |= NodeMap{1} << node_map[node_idx];
+    }
+    pred.total_eligibility_set = new_tes;
+  }
+}
+
 }  // namespace
 
 using MakeHypergraphTest = HypergraphTestBase<::testing::Test>;
@@ -302,6 +390,8 @@
   EXPECT_EQ(graph.graph.nodes.size(), graph.nodes.size());
   EXPECT_EQ(graph.graph.edges.size(), 2 * graph.edges.size());
 
+  SortNodes(&graph);
+
   ASSERT_EQ(3, graph.nodes.size());
   EXPECT_STREQ("t1", graph.nodes[0].table->alias);
   EXPECT_STREQ("t2", graph.nodes[1].table->alias);
@@ -311,17 +401,17 @@
   ASSERT_EQ(2, graph.edges.size());
 
   // t1/t2. There is no index information, so the default 0.1 should be used.
-  EXPECT_EQ(0x01, graph.graph.edges[0].left);
-  EXPECT_EQ(0x02, graph.graph.edges[0].right);
-  EXPECT_EQ(RelationalExpression::INNER_JOIN, graph.edges[0].expr->type);
-  EXPECT_FLOAT_EQ(0.1, graph.edges[0].selectivity);
-
-  // t2/t3.
-  EXPECT_EQ(0x02, graph.graph.edges[2].left);
-  EXPECT_EQ(0x04, graph.graph.edges[2].right);
+  EXPECT_EQ(0x01, graph.graph.edges[2].left);
+  EXPECT_EQ(0x02, graph.graph.edges[2].right);
   EXPECT_EQ(RelationalExpression::INNER_JOIN, graph.edges[1].expr->type);
   EXPECT_FLOAT_EQ(0.1, graph.edges[1].selectivity);
 
+  // t2/t3.
+  EXPECT_EQ(0x02, graph.graph.edges[0].left);
+  EXPECT_EQ(0x04, graph.graph.edges[0].right);
+  EXPECT_EQ(RelationalExpression::INNER_JOIN, graph.edges[0].expr->type);
+  EXPECT_FLOAT_EQ(0.1, graph.edges[0].selectivity);
+
   EXPECT_EQ(0, graph.predicates.size());
 }
 
@@ -559,6 +649,644 @@
   EXPECT_EQ(0, graph.predicates.size());
 }
 
+TEST_F(MakeHypergraphTest, Cycle) {
+  // If == is outer join and -- is inner join:
+  //
+  // t6 == t1 -- t2 -- t4 == t5
+  //        |  /
+  //        | /
+  //       t3
+  //
+  // Note that t6 is on the _left_ side of the inner join, so we should be able
+  // to push down conditions to it.
+
+  Query_block *query_block = ParseAndResolve(
+      "SELECT 1 FROM "
+      "((t1,t2,t3,t4) LEFT JOIN t5 ON t4.x=t5.x) LEFT JOIN t6 ON t1.x=t6.x "
+      "WHERE t1.x=t2.x AND t2.x=t3.x AND t1.x=t3.x AND t2.x=t4.x",
+      /*nullable=*/true);
+
+  JoinHypergraph graph(m_thd->mem_root, query_block);
+  string trace;
+  EXPECT_FALSE(MakeJoinHypergraph(m_thd, &trace, &graph));
+  SCOPED_TRACE(trace);  // Prints out the trace on failure.
+
+  EXPECT_EQ(graph.graph.nodes.size(), graph.nodes.size());
+  EXPECT_EQ(graph.graph.edges.size(), 2 * graph.edges.size());
+
+  SortNodes(&graph);
+
+  ASSERT_EQ(6, graph.nodes.size());
+  EXPECT_STREQ("t1", graph.nodes[0].table->alias);
+  EXPECT_STREQ("t2", graph.nodes[1].table->alias);
+  EXPECT_STREQ("t3", graph.nodes[2].table->alias);
+  EXPECT_STREQ("t4", graph.nodes[3].table->alias);
+  EXPECT_STREQ("t5", graph.nodes[4].table->alias);
+  EXPECT_STREQ("t6", graph.nodes[5].table->alias);
+
+  // t1/t2.
+  ASSERT_EQ(6, graph.edges.size());
+  EXPECT_EQ(0x01, graph.graph.edges[0].left);
+  EXPECT_EQ(0x02, graph.graph.edges[0].right);
+  EXPECT_EQ(RelationalExpression::INNER_JOIN, graph.edges[0].expr->type);
+
+  // t2/t3.
+  EXPECT_EQ(0x04, graph.graph.edges[2].left);
+  EXPECT_EQ(0x02, graph.graph.edges[2].right);
+  EXPECT_EQ(RelationalExpression::INNER_JOIN, graph.edges[1].expr->type);
+
+  // t4/t2.
+  EXPECT_EQ(0x08, graph.graph.edges[4].left);
+  EXPECT_EQ(0x02, graph.graph.edges[4].right);
+  EXPECT_EQ(RelationalExpression::INNER_JOIN, graph.edges[2].expr->type);
+
+  // t4/t5.
+  EXPECT_EQ(0x08, graph.graph.edges[6].left);
+  EXPECT_EQ(0x10, graph.graph.edges[6].right);
+  EXPECT_EQ(RelationalExpression::LEFT_JOIN, graph.edges[3].expr->type);
+
+  // t1/t6.
+  EXPECT_EQ(0x01, graph.graph.edges[8].left);
+  EXPECT_EQ(0x20, graph.graph.edges[8].right);
+  EXPECT_EQ(RelationalExpression::LEFT_JOIN, graph.edges[4].expr->type);
+
+  // t3/t1; added last because it completes a cycle.
+  EXPECT_EQ(0x04, graph.graph.edges[10].left);
+  EXPECT_EQ(0x01, graph.graph.edges[10].right);
+  EXPECT_EQ(RelationalExpression::INNER_JOIN, graph.edges[5].expr->type);
+
+  // The three predicates from the cycle should be added, but no others.
+  // The TES should be equivalent to the SES, ie., the outer joins should
+  // not influence this.
+  ASSERT_EQ(3, graph.predicates.size());
+
+  EXPECT_EQ("(t1.x = t2.x)", ItemToString(graph.predicates[0].condition));
+  EXPECT_EQ(0x03, graph.predicates[0].total_eligibility_set);  // t1/t2.
+  EXPECT_TRUE(graph.predicates[0].was_join_condition);
+
+  EXPECT_EQ("(t2.x = t3.x)", ItemToString(graph.predicates[1].condition));
+  EXPECT_EQ(0x06, graph.predicates[1].total_eligibility_set);  // t2/t3.
+  EXPECT_TRUE(graph.predicates[1].was_join_condition);
+
+  EXPECT_EQ("(t1.x = t3.x)", ItemToString(graph.predicates[2].condition));
+  EXPECT_EQ(0x05, graph.predicates[2].total_eligibility_set);  // t1/t3.
+  EXPECT_TRUE(graph.predicates[2].was_join_condition);
+}
+
+TEST_F(MakeHypergraphTest, NoCycleBelowOuterJoin) {
+  // The OR ... IS NULL part is to keep the LEFT JOIN from being simplified
+  // to an inner join.
+  Query_block *query_block = ParseAndResolve(
+      "SELECT 1 FROM t1 LEFT JOIN (t2,t3,t4) ON t1.x=t2.x "
+      "WHERE (t2.x=t3.x OR t2.x IS NULL) "
+      "AND (t3.x=t4.x OR t3.x IS NULL) "
+      "AND (t4.x=t2.x OR t4.x IS NULL)",
+      /*nullable=*/true);
+
+  JoinHypergraph graph(m_thd->mem_root, query_block);
+  string trace;
+  EXPECT_FALSE(MakeJoinHypergraph(m_thd, &trace, &graph));
+  SCOPED_TRACE(trace);  // Prints out the trace on failure.
+
+  EXPECT_EQ(graph.graph.nodes.size(), graph.nodes.size());
+  EXPECT_EQ(graph.graph.edges.size(), 2 * graph.edges.size());
+
+  ASSERT_EQ(4, graph.nodes.size());
+  EXPECT_STREQ("t1", graph.nodes[0].table->alias);
+  EXPECT_STREQ("t2", graph.nodes[1].table->alias);
+  EXPECT_STREQ("t3", graph.nodes[2].table->alias);
+  EXPECT_STREQ("t4", graph.nodes[3].table->alias);
+
+  // t2/t3.
+  ASSERT_EQ(3, graph.edges.size());
+  EXPECT_EQ(0x02, graph.graph.edges[0].left);
+  EXPECT_EQ(0x04, graph.graph.edges[0].right);
+  EXPECT_EQ(RelationalExpression::INNER_JOIN, graph.edges[0].expr->type);
+
+  // {t2,t3}/t4 (due to the Cartesian product).
+  EXPECT_EQ(0x06, graph.graph.edges[2].left);
+  EXPECT_EQ(0x08, graph.graph.edges[2].right);
+  EXPECT_EQ(RelationalExpression::INNER_JOIN, graph.edges[1].expr->type);
+
+  // t1/{t2,t3,t4} (the outer join).
+  EXPECT_EQ(0x01, graph.graph.edges[4].left);
+  EXPECT_EQ(0x0e, graph.graph.edges[4].right);
+  EXPECT_EQ(RelationalExpression::LEFT_JOIN, graph.edges[2].expr->type);
+
+  // The three predicates are still there; no extra predicates due to cycles.
+  EXPECT_EQ(3, graph.predicates.size());
+}
+
+TEST_F(MakeHypergraphTest, CyclePushedFromOuterJoinCondition) {
+  Query_block *query_block = ParseAndResolve(
+      "SELECT 1 FROM "
+      "t1 LEFT JOIN (t2 JOIN (t3 JOIN t4 ON t3.x=t4.x) ON t2.x=t3.x) "
+      "ON t1.x=t2.x AND t2.x=t4.x",
+      /*nullable=*/true);
+
+  JoinHypergraph graph(m_thd->mem_root, query_block);
+  string trace;
+  EXPECT_FALSE(MakeJoinHypergraph(m_thd, &trace, &graph));
+  SCOPED_TRACE(trace);  // Prints out the trace on failure.
+
+  EXPECT_EQ(graph.graph.nodes.size(), graph.nodes.size());
+  EXPECT_EQ(graph.graph.edges.size(), 2 * graph.edges.size());
+
+  SortNodes(&graph);
+
+  ASSERT_EQ(4, graph.nodes.size());
+  EXPECT_STREQ("t1", graph.nodes[0].table->alias);
+  EXPECT_STREQ("t2", graph.nodes[1].table->alias);
+  EXPECT_STREQ("t3", graph.nodes[2].table->alias);
+  EXPECT_STREQ("t4", graph.nodes[3].table->alias);
+
+  // t3/t2.
+  ASSERT_EQ(4, graph.edges.size());
+  EXPECT_EQ(0x04, graph.graph.edges[2].left);
+  EXPECT_EQ(0x02, graph.graph.edges[2].right);
+  EXPECT_EQ(RelationalExpression::INNER_JOIN, graph.edges[1].expr->type);
+
+  // t2/t4 (pushed from the ON condition).
+  EXPECT_EQ(0x02, graph.graph.edges[0].left);
+  EXPECT_EQ(0x08, graph.graph.edges[0].right);
+  EXPECT_EQ(RelationalExpression::INNER_JOIN, graph.edges[0].expr->type);
+
+  // t1/{t2,t3,t4} (the outer join).
+  EXPECT_EQ(0x01, graph.graph.edges[4].left);
+  EXPECT_EQ(0x0e, graph.graph.edges[4].right);
+  EXPECT_EQ(RelationalExpression::LEFT_JOIN, graph.edges[2].expr->type);
+
+  // t3/t4; added last because it completes a cycle.
+  EXPECT_EQ(0x04, graph.graph.edges[6].left);
+  EXPECT_EQ(0x08, graph.graph.edges[6].right);
+  EXPECT_EQ(RelationalExpression::INNER_JOIN, graph.edges[3].expr->type);
+
+  // The three predicates from the cycle should be added, but no others.
+  // The TES should be equivalent to the SES, ie., the outer joins should
+  // not influence this.
+  ASSERT_EQ(3, graph.predicates.size());
+
+  EXPECT_EQ("(t2.x = t3.x)", ItemToString(graph.predicates[1].condition));
+  EXPECT_EQ(0x06, graph.predicates[1].total_eligibility_set);  // t2/t3.
+  EXPECT_TRUE(graph.predicates[1].was_join_condition);
+
+  EXPECT_EQ("(t2.x = t4.x)", ItemToString(graph.predicates[0].condition));
+  EXPECT_EQ(0x0a, graph.predicates[0].total_eligibility_set);  // t2/t4.
+  EXPECT_TRUE(graph.predicates[0].was_join_condition);
+
+  EXPECT_EQ("(t3.x = t4.x)", ItemToString(graph.predicates[2].condition));
+  EXPECT_EQ(0x0c, graph.predicates[2].total_eligibility_set);  // t3/t4.
+  EXPECT_TRUE(graph.predicates[2].was_join_condition);
+}
+
+TEST_F(MakeHypergraphTest, MultipleEqualitiesCauseCycle) {
+  Query_block *query_block =
+      ParseAndResolve("SELECT 1 FROM t1,t2,t3 WHERE t1.x=t2.x AND t2.x=t3.x",
+                      /*nullable=*/true);
+
+  // Build multiple equalities from the WHERE condition.
+  COND_EQUAL *cond_equal = nullptr;
+  EXPECT_FALSE(optimize_cond(m_thd, query_block->where_cond_ref(), &cond_equal,
+                             &query_block->top_join_list,
+                             &query_block->cond_value));
+
+  JoinHypergraph graph(m_thd->mem_root, query_block);
+  string trace;
+  EXPECT_FALSE(MakeJoinHypergraph(m_thd, &trace, &graph));
+  SCOPED_TRACE(trace);  // Prints out the trace on failure.
+
+  EXPECT_EQ(graph.graph.nodes.size(), graph.nodes.size());
+  EXPECT_EQ(graph.graph.edges.size(), 2 * graph.edges.size());
+
+  ASSERT_EQ(3, graph.nodes.size());
+  EXPECT_STREQ("t1", graph.nodes[0].table->alias);
+  EXPECT_STREQ("t2", graph.nodes[1].table->alias);
+  EXPECT_STREQ("t3", graph.nodes[2].table->alias);
+
+  // t1/t2.
+  ASSERT_EQ(3, graph.edges.size());
+  EXPECT_EQ(0x01, graph.graph.edges[0].left);
+  EXPECT_EQ(0x02, graph.graph.edges[0].right);
+
+  // t2/t3.
+  EXPECT_EQ(0x02, graph.graph.edges[2].left);
+  EXPECT_EQ(0x04, graph.graph.edges[2].right);
+
+  // t1/t3 (the cycle edge).
+  EXPECT_EQ(0x01, graph.graph.edges[4].left);
+  EXPECT_EQ(0x04, graph.graph.edges[4].right);
+  EXPECT_EQ(RelationalExpression::INNER_JOIN, graph.edges[2].expr->type);
+}
+
+TEST_F(MakeHypergraphTest, Flattening) {
+  // This query is impossible to push cleanly without flattening,
+  // or adding broad hyperedges. We want to make sure we don't try to
+  // “solve� it by pushing the t2.x = t3.x condition twice.
+  // Due to flattening, we also don't get any Cartesian products.
+  Query_block *query_block = ParseAndResolve(
+      "SELECT 1 FROM t1 JOIN (t2 JOIN (t3 JOIN t4)) "
+      "WHERE t1.y = t4.y AND t2.x = t3.x AND t3.x = t4.x",
+      /*nullable=*/true);
+
+  // Build multiple equalities from the WHERE condition.
+  COND_EQUAL *cond_equal = nullptr;
+  EXPECT_FALSE(optimize_cond(m_thd, query_block->where_cond_ref(), &cond_equal,
+                             &query_block->top_join_list,
+                             &query_block->cond_value));
+  EXPECT_EQ("(multiple equal(t1.y, t4.y) and multiple equal(t2.x, t3.x, t4.x))",
+            ItemToString(query_block->where_cond()));
+
+  JoinHypergraph graph(m_thd->mem_root, query_block);
+  string trace;
+  EXPECT_FALSE(MakeJoinHypergraph(m_thd, &trace, &graph));
+  SCOPED_TRACE(trace);  // Prints out the trace on failure.
+
+  EXPECT_EQ(graph.graph.nodes.size(), graph.nodes.size());
+  EXPECT_EQ(graph.graph.edges.size(), 2 * graph.edges.size());
+
+  SortNodes(&graph);
+
+  ASSERT_EQ(4, graph.nodes.size());
+  EXPECT_STREQ("t1", graph.nodes[0].table->alias);
+  EXPECT_STREQ("t2", graph.nodes[1].table->alias);
+  EXPECT_STREQ("t3", graph.nodes[2].table->alias);
+  EXPECT_STREQ("t4", graph.nodes[3].table->alias);
+
+  ASSERT_EQ(4, graph.edges.size());
+
+  // t2/t3.
+  EXPECT_EQ(0x02, graph.graph.edges[0].left);
+  EXPECT_EQ(0x04, graph.graph.edges[0].right);
+  EXPECT_EQ(RelationalExpression::INNER_JOIN, graph.edges[0].expr->type);
+  ASSERT_EQ(1, graph.edges[1].expr->equijoin_conditions.size());
+  EXPECT_EQ("(t2.x = t3.x)",
+            ItemToString(graph.edges[0].expr->equijoin_conditions[0]));
+
+  // t1/t4.
+  EXPECT_EQ(0x01, graph.graph.edges[2].left);
+  EXPECT_EQ(0x08, graph.graph.edges[2].right);
+  EXPECT_EQ(RelationalExpression::INNER_JOIN, graph.edges[1].expr->type);
+  ASSERT_EQ(1, graph.edges[1].expr->equijoin_conditions.size());
+  EXPECT_EQ("(t1.y = t4.y)",
+            ItemToString(graph.edges[1].expr->equijoin_conditions[0]));
+
+  // t3/t4.
+  EXPECT_EQ(0x04, graph.graph.edges[4].left);
+  EXPECT_EQ(0x08, graph.graph.edges[4].right);
+  EXPECT_EQ(RelationalExpression::INNER_JOIN, graph.edges[2].expr->type);
+  ASSERT_EQ(1, graph.edges[2].expr->equijoin_conditions.size());
+  EXPECT_EQ("(t3.x = t4.x)",
+            ItemToString(graph.edges[2].expr->equijoin_conditions[0]));
+
+  // t2/t4.
+  EXPECT_EQ(0x02, graph.graph.edges[6].left);
+  EXPECT_EQ(0x08, graph.graph.edges[6].right);
+  EXPECT_EQ(RelationalExpression::INNER_JOIN, graph.edges[3].expr->type);
+  ASSERT_EQ(1, graph.edges[3].expr->equijoin_conditions.size());
+  EXPECT_EQ("(t2.x = t4.x)",
+            ItemToString(graph.edges[3].expr->equijoin_conditions[0]));
+}
+
+TEST_F(MakeHypergraphTest, PredicatePromotionOnMultipleEquals) {
+  Query_block *query_block = ParseAndResolve(
+      "SELECT 1 FROM t1,t2,t3 WHERE t1.x=t2.x AND t2.x=t3.x AND t1.y=t3.y",
+      /*nullable=*/true);
+
+  // Build multiple equalities from the WHERE condition.
+  COND_EQUAL *cond_equal = nullptr;
+  EXPECT_FALSE(optimize_cond(m_thd, query_block->where_cond_ref(), &cond_equal,
+                             &query_block->top_join_list,
+                             &query_block->cond_value));
+
+  JoinHypergraph graph(m_thd->mem_root, query_block);
+  string trace;
+  EXPECT_FALSE(MakeJoinHypergraph(m_thd, &trace, &graph));
+  SCOPED_TRACE(trace);  // Prints out the trace on failure.
+
+  EXPECT_EQ(graph.graph.nodes.size(), graph.nodes.size());
+  EXPECT_EQ(graph.graph.edges.size(), 2 * graph.edges.size());
+
+  ASSERT_EQ(3, graph.nodes.size());
+  EXPECT_STREQ("t1", graph.nodes[0].table->alias);
+  EXPECT_STREQ("t2", graph.nodes[1].table->alias);
+  EXPECT_STREQ("t3", graph.nodes[2].table->alias);
+
+  // t1/t2.
+  ASSERT_EQ(3, graph.edges.size());
+  EXPECT_EQ(0x01, graph.graph.edges[0].left);
+  EXPECT_EQ(0x02, graph.graph.edges[0].right);
+  EXPECT_EQ(0, graph.edges[0].expr->join_conditions.size());
+  ASSERT_EQ(1, graph.edges[0].expr->equijoin_conditions.size());
+  EXPECT_EQ("(t1.x = t2.x)",
+            ItemToString(graph.edges[0].expr->equijoin_conditions[0]));
+
+  // t2/t3.
+  EXPECT_EQ(0x02, graph.graph.edges[2].left);
+  EXPECT_EQ(0x04, graph.graph.edges[2].right);
+  EXPECT_EQ(0, graph.edges[1].expr->join_conditions.size());
+  ASSERT_EQ(1, graph.edges[1].expr->equijoin_conditions.size());
+  EXPECT_EQ("(t2.x = t3.x)",
+            ItemToString(graph.edges[1].expr->equijoin_conditions[0]));
+
+  // t1/t3 (the cycle edge). Has both the original condition and the
+  // multi-equality condition.
+  EXPECT_EQ(0x01, graph.graph.edges[4].left);
+  EXPECT_EQ(0x04, graph.graph.edges[4].right);
+  EXPECT_EQ(RelationalExpression::INNER_JOIN, graph.edges[2].expr->type);
+  EXPECT_EQ(0, graph.edges[2].expr->join_conditions.size());
+  ASSERT_EQ(2, graph.edges[2].expr->equijoin_conditions.size());
+  EXPECT_EQ("(t1.y = t3.y)",
+            ItemToString(graph.edges[2].expr->equijoin_conditions[0]));
+  EXPECT_EQ("(t1.x = t3.x)",
+            ItemToString(graph.edges[2].expr->equijoin_conditions[1]));
+
+  // Verify that the ones coming from the multi-equality are marked with
+  // the same index, so that they are properly deduplicated.
+  ASSERT_EQ(4, graph.predicates.size());
+
+  EXPECT_EQ("(t1.x = t2.x)", ItemToString(graph.predicates[0].condition));
+  EXPECT_TRUE(graph.predicates[0].was_join_condition);
+  EXPECT_EQ(0, graph.predicates[0].source_multiple_equality_idx);
+
+  EXPECT_EQ("(t2.x = t3.x)", ItemToString(graph.predicates[1].condition));
+  EXPECT_TRUE(graph.predicates[1].was_join_condition);
+  EXPECT_EQ(0, graph.predicates[1].source_multiple_equality_idx);
+
+  EXPECT_EQ("(t1.y = t3.y)", ItemToString(graph.predicates[2].condition));
+  EXPECT_TRUE(graph.predicates[2].was_join_condition);
+  EXPECT_EQ(-1, graph.predicates[2].source_multiple_equality_idx);
+
+  EXPECT_EQ("(t1.x = t3.x)", ItemToString(graph.predicates[3].condition));
+  EXPECT_TRUE(graph.predicates[3].was_join_condition);
+  EXPECT_EQ(0, graph.predicates[3].source_multiple_equality_idx);
+}
+
+// Verify that multiple equalities are properly resolved to a single equality,
+// and not left as a multiple one. Antijoins have a similar issue.
+// Inspired by issues in a larger query (DBT-3 Q21).
+TEST_F(MakeHypergraphTest, MultipleEqualityPushedFromJoinConditions) {
+  Query_block *query_block = ParseAndResolve(
+      "SELECT 1 FROM t1, t2 "
+      "WHERE t1.x=t2.x AND t1.x IN (SELECT t3.x FROM t3) ",
+      /*nullable=*/false);
+
+  // Build multiple equalities from the WHERE condition.
+  COND_EQUAL *cond_equal = nullptr;
+  EXPECT_FALSE(optimize_cond(m_thd, query_block->where_cond_ref(), &cond_equal,
+                             &query_block->top_join_list,
+                             &query_block->cond_value));
+
+  JoinHypergraph graph(m_thd->mem_root, query_block);
+  string trace;
+  EXPECT_FALSE(MakeJoinHypergraph(m_thd, &trace, &graph));
+  SCOPED_TRACE(trace);  // Prints out the trace on failure.
+
+  EXPECT_EQ(graph.graph.nodes.size(), graph.nodes.size());
+  EXPECT_EQ(graph.graph.edges.size(), 2 * graph.edges.size());
+
+  ASSERT_EQ(3, graph.nodes.size());
+  EXPECT_STREQ("t1", graph.nodes[0].table->alias);
+  EXPECT_STREQ("t2", graph.nodes[1].table->alias);
+  EXPECT_STREQ("t3", graph.nodes[2].table->alias);
+
+  // t1/t2.
+  ASSERT_EQ(2, graph.edges.size());
+  EXPECT_EQ(0x01, graph.graph.edges[0].left);
+  EXPECT_EQ(0x02, graph.graph.edges[0].right);
+  EXPECT_EQ(RelationalExpression::INNER_JOIN, graph.edges[0].expr->type);
+  ASSERT_EQ(1, graph.edges[0].expr->equijoin_conditions.size());
+  EXPECT_EQ("(t1.x = t2.x)",
+            ItemToString(graph.edges[0].expr->equijoin_conditions[0]));
+  EXPECT_EQ(0, graph.edges[0].expr->join_conditions.size());
+
+  // t2/t3 (semijoin). t1/t3 would also be fine. The really important part
+  // is that we do not also have a t1/t2 or t1/t3 join conditions.
+  EXPECT_EQ(0x02, graph.graph.edges[2].left);
+  EXPECT_EQ(0x04, graph.graph.edges[2].right);
+  EXPECT_EQ(RelationalExpression::SEMIJOIN, graph.edges[1].expr->type);
+  ASSERT_EQ(1, graph.edges[1].expr->equijoin_conditions.size());
+  EXPECT_EQ("(t2.x = t3.x)",
+            ItemToString(graph.edges[1].expr->equijoin_conditions[0]));
+  EXPECT_EQ(0, graph.edges[1].expr->join_conditions.size());
+}
+
+TEST_F(MakeHypergraphTest, UnpushableMultipleEqualityCausesCycle) {
+  Query_block *query_block = ParseAndResolve(
+      "SELECT 1 FROM t1, t2, t3, t4 "
+      // Two simple equalities that set up a join structure.
+      "WHERE t1.y=t2.y AND t2.z=t3.z "
+      // And then a multi-equality that is not cleanly pushable onto that
+      // structure.
+      "AND t1.x=t3.x AND t3.x=t4.x",
+      /*nullable=*/false);
+
+  // Build multiple equalities from the WHERE condition.
+  COND_EQUAL *cond_equal = nullptr;
+  EXPECT_FALSE(optimize_cond(m_thd, query_block->where_cond_ref(), &cond_equal,
+                             &query_block->top_join_list,
+                             &query_block->cond_value));
+
+  JoinHypergraph graph(m_thd->mem_root, query_block);
+  string trace;
+  EXPECT_FALSE(MakeJoinHypergraph(m_thd, &trace, &graph));
+  SCOPED_TRACE(trace);  // Prints out the trace on failure.
+
+  EXPECT_EQ(graph.graph.nodes.size(), graph.nodes.size());
+  EXPECT_EQ(graph.graph.edges.size(), 2 * graph.edges.size());
+
+  SortNodes(&graph);
+
+  ASSERT_EQ(4, graph.nodes.size());
+  EXPECT_STREQ("t1", graph.nodes[0].table->alias);
+  EXPECT_STREQ("t2", graph.nodes[1].table->alias);
+  EXPECT_STREQ("t3", graph.nodes[2].table->alias);
+  EXPECT_STREQ("t4", graph.nodes[3].table->alias);
+
+  ASSERT_EQ(5, graph.edges.size());
+
+  // t1/t2.
+  EXPECT_EQ(0x01, graph.graph.edges[0].left);
+  EXPECT_EQ(0x02, graph.graph.edges[0].right);
+  EXPECT_EQ(RelationalExpression::INNER_JOIN, graph.edges[0].expr->type);
+  ASSERT_EQ(1, graph.edges[0].expr->equijoin_conditions.size());
+  EXPECT_EQ("(t1.y = t2.y)",
+            ItemToString(graph.edges[0].expr->equijoin_conditions[0]));
+  EXPECT_EQ(0, graph.edges[0].expr->join_conditions.size());
+
+  // t3/t2.
+  EXPECT_EQ(0x04, graph.graph.edges[2].left);
+  EXPECT_EQ(0x02, graph.graph.edges[2].right);
+  EXPECT_EQ(RelationalExpression::INNER_JOIN, graph.edges[1].expr->type);
+  ASSERT_EQ(1, graph.edges[1].expr->equijoin_conditions.size());
+  EXPECT_EQ("(t2.z = t3.z)",
+            ItemToString(graph.edges[1].expr->equijoin_conditions[0]));
+  EXPECT_EQ(0, graph.edges[1].expr->join_conditions.size());
+
+  // t4/t3 (the first of many cycle edges from the multiple equality).
+  EXPECT_EQ(0x08, graph.graph.edges[4].left);
+  EXPECT_EQ(0x04, graph.graph.edges[4].right);
+  EXPECT_EQ(RelationalExpression::INNER_JOIN, graph.edges[2].expr->type);
+  ASSERT_EQ(1, graph.edges[2].expr->equijoin_conditions.size());
+  EXPECT_EQ("(t4.x = t3.x)",
+            ItemToString(graph.edges[2].expr->equijoin_conditions[0]));
+  EXPECT_EQ(0, graph.edges[2].expr->join_conditions.size());
+
+  // t3/t1 (cycle edge).
+  EXPECT_EQ(0x04, graph.graph.edges[6].left);
+  EXPECT_EQ(0x01, graph.graph.edges[6].right);
+  EXPECT_EQ(RelationalExpression::INNER_JOIN, graph.edges[3].expr->type);
+  ASSERT_EQ(1, graph.edges[3].expr->equijoin_conditions.size());
+  EXPECT_EQ("(t1.x = t3.x)",
+            ItemToString(graph.edges[3].expr->equijoin_conditions[0]));
+  EXPECT_EQ(0, graph.edges[3].expr->join_conditions.size());
+
+  // t1/t4 (cycle edge within the cycle, comes from meshing).
+  EXPECT_EQ(0x01, graph.graph.edges[8].left);
+  EXPECT_EQ(0x08, graph.graph.edges[8].right);
+  EXPECT_EQ(RelationalExpression::INNER_JOIN, graph.edges[4].expr->type);
+  ASSERT_EQ(1, graph.edges[4].expr->equijoin_conditions.size());
+  EXPECT_EQ("(t1.x = t4.x)",
+            ItemToString(graph.edges[4].expr->equijoin_conditions[0]));
+  EXPECT_EQ(0, graph.edges[4].expr->join_conditions.size());
+}
+
+TEST_F(MakeHypergraphTest, UnpushableMultipleEqualityWithSameTableTwice) {
+  // The (t2.y, t3.x, t3.y, t4.x) multi-equality is unpushable
+  // due to the t1.z = t4.w equality that's already set up;
+  // we need to create a cycle from t2/t3/t4, while still not losing
+  // the t3.x = t3.y condition.
+  Query_block *query_block = ParseAndResolve(
+      "SELECT 1 FROM t1, t1 AS t2, t1 AS t3, t1 AS t4 "
+      "WHERE t1.z = t4.w "
+      "AND t2.y = t3.x AND t3.x = t3.y AND t3.y = t4.x",
+      /*nullable=*/false);
+
+  // Build multiple equalities from the WHERE condition.
+  COND_EQUAL *cond_equal = nullptr;
+  EXPECT_FALSE(optimize_cond(m_thd, query_block->where_cond_ref(), &cond_equal,
+                             &query_block->top_join_list,
+                             &query_block->cond_value));
+
+  JoinHypergraph graph(m_thd->mem_root, query_block);
+  string trace;
+  EXPECT_FALSE(MakeJoinHypergraph(m_thd, &trace, &graph));
+  SCOPED_TRACE(trace);  // Prints out the trace on failure.
+
+  EXPECT_EQ(graph.graph.nodes.size(), graph.nodes.size());
+  EXPECT_EQ(graph.graph.edges.size(), 2 * graph.edges.size());
+
+  SortNodes(&graph);
+
+  ASSERT_EQ(4, graph.nodes.size());
+  EXPECT_STREQ("t1", graph.nodes[0].table->alias);
+  EXPECT_STREQ("t2", graph.nodes[1].table->alias);
+  EXPECT_STREQ("t3", graph.nodes[2].table->alias);
+  EXPECT_STREQ("t4", graph.nodes[3].table->alias);
+
+  ASSERT_EQ(4, graph.edges.size());
+
+  // We only check that the given edges exist, and that we didn't lose
+  // the t3.x = t3.y condition. All edges come from explicit
+  // WHERE conditions.
+
+  // t2/t3. Note that we get both t2.y=t3.y and t2.y=t3.x;
+  // they come from the same multi-equality and we've already
+  // checked t3.x=t3.y, so one is redundant, but we can't
+  // figure this out yet.
+  EXPECT_EQ(0x02, graph.graph.edges[0].left);
+  EXPECT_EQ(0x04, graph.graph.edges[0].right);
+
+  // t1/t4.
+  EXPECT_EQ(0x01, graph.graph.edges[2].left);
+  EXPECT_EQ(0x08, graph.graph.edges[2].right);
+
+  // t3/t4.
+  EXPECT_EQ(0x04, graph.graph.edges[4].left);
+  EXPECT_EQ(0x08, graph.graph.edges[4].right);
+
+  // t2/t4.
+  EXPECT_EQ(0x02, graph.graph.edges[6].left);
+  EXPECT_EQ(0x08, graph.graph.edges[6].right);
+
+  bool found_predicate = false;
+  for (const Predicate &pred : graph.predicates) {
+    if (ItemToString(pred.condition) == "(t3.x = t3.y)") {
+      found_predicate = true;
+    }
+  }
+  EXPECT_TRUE(found_predicate);
+}
+
+// Sets up a nonsensical query, but the point is that the multiple equality
+// on the antijoin can be resolved to either t1.x or t2.x, and it should choose
+// the same as is already there due to the inequality in order to not create
+// an overly broad hyperedge. This is similar to a situation in DBT-3 Q21.
+//
+// We test with the inequality referring to both tables in turn, to make sure
+// that we're not just getting lucky.
+using MakeHypergraphMultipleEqualParamTest =
+    HypergraphTestBase<::testing::TestWithParam<int>>;
+
+TEST_P(MakeHypergraphMultipleEqualParamTest,
+       MultipleEqualityOnAntijoinGetsIdeallyResolved) {
+  const int table_num = GetParam();
+  string other_table = (table_num == 0) ? "t1" : "t2";
+  string query_str =
+      "SELECT 1 FROM t1, t2 WHERE t1.x=t2.x "
+      "AND t1.x NOT IN (SELECT t3.x FROM t3 WHERE t3.x <> " +
+      other_table + ".x + 1)";
+  Query_block *query_block = ParseAndResolve(query_str.c_str(),
+                                             /*nullable=*/false);
+
+  // Build multiple equalities from the WHERE condition.
+  COND_EQUAL *cond_equal = nullptr;
+  EXPECT_FALSE(optimize_cond(m_thd, query_block->where_cond_ref(), &cond_equal,
+                             &query_block->top_join_list,
+                             &query_block->cond_value));
+
+  JoinHypergraph graph(m_thd->mem_root, query_block);
+  string trace;
+  EXPECT_FALSE(MakeJoinHypergraph(m_thd, &trace, &graph));
+  SCOPED_TRACE(trace);  // Prints out the trace on failure.
+
+  EXPECT_EQ(graph.graph.nodes.size(), graph.nodes.size());
+  EXPECT_EQ(graph.graph.edges.size(), 2 * graph.edges.size());
+
+  ASSERT_EQ(3, graph.nodes.size());
+  EXPECT_STREQ("t1", graph.nodes[0].table->alias);
+  EXPECT_STREQ("t2", graph.nodes[1].table->alias);
+  EXPECT_STREQ("t3", graph.nodes[2].table->alias);
+
+  // t1/t2. This one should not be too surprising.
+  ASSERT_EQ(2, graph.edges.size());
+  EXPECT_EQ(0x01, graph.graph.edges[0].left);
+  EXPECT_EQ(0x02, graph.graph.edges[0].right);
+  EXPECT_EQ(RelationalExpression::INNER_JOIN, graph.edges[0].expr->type);
+  ASSERT_EQ(1, graph.edges[0].expr->equijoin_conditions.size());
+  EXPECT_EQ("(t1.x = t2.x)",
+            ItemToString(graph.edges[0].expr->equijoin_conditions[0]));
+  EXPECT_EQ(0, graph.edges[0].expr->join_conditions.size());
+
+  // t1/t3 (antijoin) or t2/t3. The important part is that this should _not_
+  // be a hyperedge.
+  if (table_num == 0) {
+    EXPECT_EQ(0x01, graph.graph.edges[2].left);
+  } else {
+    EXPECT_EQ(0x02, graph.graph.edges[2].left);
+  }
+  EXPECT_EQ(0x04, graph.graph.edges[2].right);
+  EXPECT_EQ(RelationalExpression::ANTIJOIN, graph.edges[1].expr->type);
+  ASSERT_EQ(1, graph.edges[1].expr->equijoin_conditions.size());
+  ASSERT_EQ(1, graph.edges[1].expr->join_conditions.size());
+  EXPECT_EQ("(" + other_table + ".x = t3.x)",
+            ItemToString(graph.edges[1].expr->equijoin_conditions[0]));
+  EXPECT_EQ("(t3.x <> (" + other_table + ".x + 1))",
+            ItemToString(graph.edges[1].expr->join_conditions[0]));
+}
+
+INSTANTIATE_TEST_SUITE_P(All, MakeHypergraphMultipleEqualParamTest,
+                         ::testing::Values(0, 1));
+
 // An alias for better naming.
 // We don't verify costs; to do that, we'd probably need to mock out
 // the cost model.
@@ -570,7 +1298,7 @@
   m_fake_tables["t1"]->file->stats.records = 100;
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
 
   ASSERT_EQ(AccessPath::TABLE_SCAN, root->type);
@@ -586,7 +1314,7 @@
   m_fake_tables["t2"]->file->stats.records = 3;
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   // Prints out the query plan on failure.
   SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
@@ -631,7 +1359,7 @@
   m_fake_tables["t2"]->file->stats.records = 3;
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
 
   // The t2 filter cannot be pushed down through the join, so it should be
@@ -673,7 +1401,7 @@
   m_fake_tables["t2"]->file->stats.records = 30;
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   // Prints out the query plan on failure.
   SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
@@ -721,7 +1449,7 @@
   m_fake_tables["t2"]->file->stats.records = 30;
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   // Prints out the query plan on failure.
   SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
@@ -762,7 +1490,7 @@
   t1->create_index(t1->field[0], t1->field[1], /*unique=*/true);
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   // Prints out the query plan on failure.
   SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
@@ -783,7 +1511,7 @@
   t1->create_index(t1->field[0], t1->field[1], /*unique=*/true);
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   // Prints out the query plan on failure.
   SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
@@ -801,7 +1529,7 @@
   t1->create_index(t1->field[0], t1->field[1], /*unique=*/true);
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   // Prints out the query plan on failure.
   SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
@@ -831,7 +1559,7 @@
   m_fake_tables["t3"]->file->stats.data_file_length = 1e6;
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   // Prints out the query plan on failure.
   SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
@@ -867,13 +1595,200 @@
   // t2/t3 is 100 * 1, obviously.
   EXPECT_FLOAT_EQ(100.0, inner->num_output_rows);
 
-  // The root should have t1 multiplied by t2/t3;
-  // since the join predicate is already applied (and subsumed),
-  // we should have no further reduction from it.
-  EXPECT_FLOAT_EQ(outer->num_output_rows * inner->num_output_rows,
-                  root->num_output_rows);
+  // The root should have t1 multiplied by t2/t3;
+  // since the join predicate is already applied (and subsumed),
+  // we should have no further reduction from it.
+  EXPECT_FLOAT_EQ(outer->num_output_rows * inner->num_output_rows,
+                  root->num_output_rows);
+}
+
+// Verify that we can make sargable predicates out of multiple equalities.
+TEST_F(HypergraphOptimizerTest, MultiEqualitySargable) {
+  Query_block *query_block = ParseAndResolve(
+      "SELECT 1 FROM t1, t2, t3 WHERE t1.x = t2.x AND t2.x = t3.x",
+      /*nullable=*/true);
+  Fake_TABLE *t2 = m_fake_tables["t2"];
+  Fake_TABLE *t3 = m_fake_tables["t3"];
+  t2->create_index(t2->field[0], /*column2=*/nullptr, /*unique=*/false);
+  t3->create_index(t3->field[0], /*column2=*/nullptr, /*unique=*/false);
+
+  // Build multiple equalities from the WHERE condition.
+  COND_EQUAL *cond_equal = nullptr;
+  EXPECT_FALSE(optimize_cond(m_thd, query_block->where_cond_ref(), &cond_equal,
+                             &query_block->top_join_list,
+                             &query_block->cond_value));
+
+  // The logical plan should be t1/t2/t3, with index lookups on t2 and t3.
+  // should not be.
+  m_fake_tables["t1"]->file->stats.records = 100;
+  m_fake_tables["t2"]->file->stats.records = 10000;
+  m_fake_tables["t3"]->file->stats.records = 1000000;
+
+  string trace;
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
+  SCOPED_TRACE(trace);  // Prints out the trace on failure.
+  // Prints out the query plan on failure.
+  SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
+                              /*is_root_of_join=*/true));
+
+  // The optimal plan consists of only nested-loop joins.
+  // We don't verify costs.
+  ASSERT_EQ(AccessPath::NESTED_LOOP_JOIN, root->type);
+  EXPECT_EQ(JoinType::INNER, root->nested_loop_join().join_type);
+
+  // t1 is on the outside.
+  AccessPath *outer = root->nested_loop_join().outer;
+  ASSERT_EQ(AccessPath::TABLE_SCAN, outer->type);
+  EXPECT_EQ(m_fake_tables["t1"], outer->table_scan().table);
+
+  // The inner part should also be nested-loop.
+  AccessPath *inner = root->nested_loop_join().inner;
+  ASSERT_EQ(AccessPath::NESTED_LOOP_JOIN, inner->type);
+  EXPECT_EQ(JoinType::INNER, inner->nested_loop_join().join_type);
+
+  // We have two index lookups; t2 and t3. We don't care about the order.
+  ASSERT_EQ(AccessPath::REF, inner->nested_loop_join().outer->type);
+  ASSERT_EQ(AccessPath::REF, inner->nested_loop_join().inner->type);
+}
+
+TEST_F(HypergraphOptimizerTest, DoNotApplyBothSargableJoinAndFilterJoin) {
+  Query_block *query_block = ParseAndResolve(
+      "SELECT 1 FROM t1, t2, t3, t4 WHERE t1.x = t2.x AND t2.x = t3.x",
+      /*nullable=*/true);
+  Fake_TABLE *t1 = m_fake_tables["t1"];
+  t1->create_index(t1->field[0], /*column2=*/nullptr, /*unique=*/false);
+
+  // Build multiple equalities from the WHERE condition.
+  COND_EQUAL *cond_equal = nullptr;
+  EXPECT_FALSE(optimize_cond(m_thd, query_block->where_cond_ref(), &cond_equal,
+                             &query_block->top_join_list,
+                             &query_block->cond_value));
+
+  // The logical plan should be to hash-join t2/t3, then nestloop-join
+  // against the index on t1. The t4 table somehow needs to be present
+  // to trigger the issue; it doesn't really matter whether it's on the
+  // left or right side (since it doesn't have a join condition),
+  // but it happens to be put on the right.
+  m_fake_tables["t1"]->file->stats.records = 100;
+  m_fake_tables["t2"]->file->stats.records = 100000000;
+  m_fake_tables["t3"]->file->stats.records = 1000000;
+  m_fake_tables["t4"]->file->stats.records = 10000;
+
+  string trace;
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
+  SCOPED_TRACE(trace);  // Prints out the trace on failure.
+  // Prints out the query plan on failure.
+  SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
+                              /*is_root_of_join=*/true));
+
+  // t4 needs to come in on the top (since we've put it as a Cartesian product);
+  // either left or right side. It happens to be on the right.
+  // We don't verify costs.
+  ASSERT_EQ(AccessPath::NESTED_LOOP_JOIN, root->type);
+  EXPECT_EQ(JoinType::INNER, root->nested_loop_join().join_type);
+
+  AccessPath *inner = root->nested_loop_join().inner;
+  ASSERT_EQ(AccessPath::TABLE_SCAN, inner->type);
+  EXPECT_EQ(m_fake_tables["t4"], inner->table_scan().table);
+
+  // Now for the meat of the plan. There should be a nested loop,
+  // with t2/t3 on the inside and t1 on the outside.
+  AccessPath *outer = root->nested_loop_join().outer;
+  ASSERT_EQ(AccessPath::NESTED_LOOP_JOIN, outer->type);
+
+  // We don't check the t2/t3 part very thoroughly.
+  EXPECT_EQ(AccessPath::HASH_JOIN, outer->nested_loop_join().outer->type);
+
+  // Now for the point of the test: We should have t1 on the inner side,
+  // with t1=t2 pushed down into the index, and it should _not_ have a t1=t3
+  // filter; even though it would seemingly be attractive to join t1=t3 against
+  // the ref access, that would be double-counting the selectivity and thus
+  // not permitted. (Well, it would be permitted, but we'd have to add code
+  // not to apply the selectivity twice, and then it would just be extra cost
+  // applying a redundant filter.)
+  AccessPath *inner_inner = outer->nested_loop_join().inner;
+  ASSERT_EQ(AccessPath::REF, inner_inner->type);
+  EXPECT_STREQ("t1", inner_inner->ref().table->alias);
+  EXPECT_EQ(0, inner_inner->ref().ref->key);
+  EXPECT_EQ("t2.x", ItemToString(inner_inner->ref().ref->items[0]));
+}
+
+static string PrintSargablePredicate(const SargablePredicate &sp,
+                                     const JoinHypergraph &graph) {
+  return StringPrintf(
+      "%s.%s -> %s [%s]", sp.field->table->alias, sp.field->field_name,
+      ItemToString(sp.other_side).c_str(),
+      ItemToString(graph.predicates[sp.predicate_index].condition).c_str());
+}
+
+// Verify that when we add a cycle in the graph due to a multiple equality,
+// that join predicate also becomes sargable.
+using HypergraphOptimizerCyclePredicatesSargableTest =
+    HypergraphTestBase<::testing::TestWithParam<const char *>>;
+
+TEST_P(HypergraphOptimizerCyclePredicatesSargableTest,
+       CyclePredicatesSargable) {
+  Query_block *query_block = ParseAndResolve(GetParam(),
+                                             /*nullable=*/true);
+  Fake_TABLE *t1 = m_fake_tables["t1"];
+  Fake_TABLE *t2 = m_fake_tables["t2"];
+  Fake_TABLE *t3 = m_fake_tables["t3"];
+  t1->create_index(t1->field[0], /*column2=*/nullptr, /*unique=*/false);
+  t2->create_index(t2->field[0], /*column2=*/nullptr, /*unique=*/false);
+  t3->create_index(t3->field[0], /*column2=*/nullptr, /*unique=*/false);
+
+  // Build multiple equalities from the WHERE condition.
+  COND_EQUAL *cond_equal = nullptr;
+  EXPECT_FALSE(optimize_cond(m_thd, query_block->where_cond_ref(), &cond_equal,
+                             &query_block->top_join_list,
+                             &query_block->cond_value));
+
+  string trace;
+  SCOPED_TRACE(trace);  // Prints out the trace on failure.
+  JoinHypergraph graph(m_thd->mem_root, query_block);
+  ASSERT_FALSE(MakeJoinHypergraph(m_thd, &trace, &graph));
+  FindSargablePredicates(m_thd, &trace, &graph);
+
+  // Each node should have two sargable join predicates
+  // (one to each of the other nodes). Verify that they are
+  // correctly set up (the order does not matter, though).
+  ASSERT_EQ(3, graph.nodes.size());
+  EXPECT_STREQ("t1", graph.nodes[0].table->alias);
+  EXPECT_STREQ("t2", graph.nodes[1].table->alias);
+  EXPECT_STREQ("t3", graph.nodes[2].table->alias);
+
+  ASSERT_EQ(2, graph.nodes[0].sargable_predicates.size());
+  EXPECT_EQ(
+      "t1.field_1 -> t2.x [(t1.x = t2.x)]",
+      PrintSargablePredicate(graph.nodes[0].sargable_predicates[0], graph));
+  EXPECT_EQ(
+      "t1.field_1 -> t3.x [(t1.x = t3.x)]",
+      PrintSargablePredicate(graph.nodes[0].sargable_predicates[1], graph));
+
+  ASSERT_EQ(2, graph.nodes[1].sargable_predicates.size());
+  EXPECT_EQ(
+      "t2.field_1 -> t3.x [(t2.x = t3.x)]",
+      PrintSargablePredicate(graph.nodes[1].sargable_predicates[0], graph));
+  EXPECT_EQ(
+      "t2.field_1 -> t1.x [(t1.x = t2.x)]",
+      PrintSargablePredicate(graph.nodes[1].sargable_predicates[1], graph));
+
+  ASSERT_EQ(2, graph.nodes[2].sargable_predicates.size());
+  EXPECT_EQ(
+      "t3.field_1 -> t2.x [(t2.x = t3.x)]",
+      PrintSargablePredicate(graph.nodes[2].sargable_predicates[0], graph));
+  EXPECT_EQ(
+      "t3.field_1 -> t1.x [(t1.x = t3.x)]",
+      PrintSargablePredicate(graph.nodes[2].sargable_predicates[1], graph));
 }
 
+INSTANTIATE_TEST_SUITE_P(
+    TrueAndFalse, HypergraphOptimizerCyclePredicatesSargableTest,
+    ::testing::Values(
+        // With and without an explicit cycle.
+        "SELECT 1 FROM t1,t2,t3 WHERE t1.x=t2.x AND t2.x=t3.x AND t1.x=t3.x",
+        "SELECT 1 FROM t1,t2,t3 WHERE t1.x=t2.x AND t2.x=t3.x"));
+
 TEST_F(HypergraphOptimizerTest, SimpleInnerJoin) {
   Query_block *query_block = ParseAndResolve(
       "SELECT 1 FROM t1 JOIN t2 ON t1.x=t2.x JOIN t3 ON t2.y=t3.y",
@@ -888,7 +1803,7 @@
   m_fake_tables["t3"]->file->stats.data_file_length = 10000e6;
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   // Prints out the query plan on failure.
   SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
@@ -937,7 +1852,7 @@
   m_fake_tables["t2"]->file->stats.data_file_length = 100e6;
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   // Prints out the query plan on failure.
   SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
@@ -962,12 +1877,435 @@
   EXPECT_EQ(m_thd->m_current_query_partial_plans, 3);
 }
 
+TEST_F(HypergraphOptimizerTest, Cycle) {
+  Query_block *query_block = ParseAndResolve(
+      "SELECT 1 FROM "
+      "t1,t2,t3 WHERE t1.x=t2.x AND t2.x=t3.x AND t1.x=t3.x",
+      /*nullable=*/true);
+
+  string trace;
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
+  SCOPED_TRACE(trace);  // Prints out the trace on failure.
+  // Prints out the query plan on failure.
+  SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
+                              /*is_root_of_join=*/true));
+
+  // We should see t1, t2, t3, {t1,t2}, {t2,t3}, {t1,t3} and {t1,t2,t3}.
+  EXPECT_EQ(m_thd->m_current_query_partial_plans, 7);
+}
+
+TEST_F(HypergraphOptimizerTest, CycleFromMultipleEquality) {
+  Query_block *query_block = ParseAndResolve(
+      "SELECT 1 FROM "
+      "t1,t2,t3 WHERE t1.x=t2.x AND t2.x=t3.x",
+      /*nullable=*/true);
+
+  // Build multiple equalities from the WHERE condition.
+  COND_EQUAL *cond_equal = nullptr;
+  EXPECT_FALSE(optimize_cond(m_thd, query_block->where_cond_ref(), &cond_equal,
+                             &query_block->top_join_list,
+                             &query_block->cond_value));
+
+  string trace;
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
+  SCOPED_TRACE(trace);  // Prints out the trace on failure.
+  // Prints out the query plan on failure.
+  SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
+                              /*is_root_of_join=*/true));
+
+  // We should see t1, t2, t3, {t1,t2}, {t2,t3}, {t1,t3} and {t1,t2,t3}.
+  EXPECT_EQ(m_thd->m_current_query_partial_plans, 7);
+}
+
+TEST_F(HypergraphOptimizerTest, SwitchesOrderToMakeSafeForRowid) {
+  // Mark t1.y as a blob, to make sure we need rowids for our sort.
+  Mock_field_long t1_x(/*is_unsigned=*/false);
+  Base_mock_field_blob t1_y(/*length=*/1000000);
+  t1_x.field_name = "x";
+  t1_y.field_name = "y";
+
+  Fake_TABLE *t1 = new (m_initializer.thd()->mem_root) Fake_TABLE(&t1_x, &t1_y);
+  m_fake_tables["t1"] = t1;
+
+  t1->set_created();
+  Query_block *query_block = ParseAndResolve(
+      "SELECT t1.y FROM t1 JOIN t2 ON t1.x=t2.x ORDER BY t1.y, t2.y",
+      /*nullable=*/true);
+
+  t1->create_index(t1->field[0], nullptr, /*unique=*/false);
+  Fake_TABLE *t2 = m_fake_tables["t2"];
+  t2->create_index(t2->field[0], nullptr, /*unique=*/false);
+
+  // The normal case for rowid-unsafe tables are LATERAL derived tables,
+  // but since we don't support derived tables in the unit test,
+  // we cheat and mark t2 as unsafe for row IDs manually instead,
+  // and also disallow hash join.
+  handlerton *hton = EnableSecondaryEngine(/*aggregation_is_unordered=*/false);
+  hton->secondary_engine_flags =
+      MakeSecondaryEngineFlags(SecondaryEngineFlag::SUPPORTS_NESTED_LOOP_JOIN);
+  hton->secondary_engine_modify_access_path_cost =
+      [](THD *, const JoinHypergraph &, AccessPath *path) {
+        if (path->type == AccessPath::REF &&
+            strcmp("t2", path->ref().table->alias) == 0) {
+          path->safe_for_rowid = AccessPath::SAFE_IF_SCANNED_ONCE;
+        }
+        return false;
+      };
+
+  m_fake_tables["t1"]->file->stats.records = 99;
+  m_fake_tables["t2"]->file->stats.records = 100;
+
+  string trace;
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
+  SCOPED_TRACE(trace);  // Prints out the trace on failure.
+  // Prints out the query plan on failure.
+  SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
+                              /*is_root_of_join=*/true));
+
+  // Normally, it would be better to have t1 on the outside
+  // and t2 on the inside, since t2 is the larger one, but that would create
+  // a materialization, so the better version is to flip.
+  ASSERT_EQ(AccessPath::SORT, root->type);
+  AccessPath *join = root->sort().child;
+  ASSERT_EQ(AccessPath::NESTED_LOOP_JOIN, join->type);
+  AccessPath *outer = join->nested_loop_join().outer;
+  AccessPath *inner = join->nested_loop_join().inner;
+
+  ASSERT_EQ(AccessPath::TABLE_SCAN, outer->type);
+  EXPECT_STREQ("t2", outer->table_scan().table->alias);
+
+  ASSERT_EQ(AccessPath::REF, inner->type);
+  EXPECT_STREQ("t1", inner->ref().table->alias);
+}
+
+namespace {
+
+struct FullTextParam {
+  const char *query;
+  bool expect_filter;
+  bool expect_index;
+};
+
+std::ostream &operator<<(std::ostream &os, const FullTextParam &param) {
+  return os << param.query;
+}
+
+}  // namespace
+
+using HypergraphFullTextTest =
+    HypergraphTestBase<::testing::TestWithParam<FullTextParam>>;
+
+TEST_P(HypergraphFullTextTest, FullTextSearch) {
+  SCOPED_TRACE(GetParam().query);
+
+  // CREATE TABLE t1(x VARCHAR(100)).
+  Base_mock_field_varstring column1(/*length=*/100, /*share=*/nullptr);
+  column1.field_name = "x";
+  Fake_TABLE *t1 = new (m_initializer.thd()->mem_root) Fake_TABLE(&column1);
+  t1->file->stats.records = 10000;
+  m_fake_tables["t1"] = t1;
+  t1->set_created();
+
+  // CREATE FULLTEXT INDEX idx ON t1(x).
+  down_cast<Mock_HANDLER *>(t1->file)->set_ha_table_flags(
+      t1->file->ha_table_flags() | HA_CAN_FULLTEXT);
+  t1->create_index(&column1, /*column2=*/nullptr, ulong{HA_FULLTEXT});
+
+  Query_block *query_block = ParseAndResolve(GetParam().query,
+                                             /*nullable=*/false);
+  ASSERT_NE(nullptr, query_block);
+
+  string trace;
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
+  SCOPED_TRACE(trace);  // Prints out the trace on failure.
+  // Prints out the query plan on failure.
+  SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
+                              /*is_root_of_join=*/true));
+  ASSERT_NE(nullptr, root);
+
+  AccessPath *path = root;
+
+  if (GetParam().expect_filter) {
+    ASSERT_EQ(AccessPath::FILTER, path->type);
+    path = path->filter().child;
+  }
+
+  if (GetParam().expect_index) {
+    ASSERT_EQ(AccessPath::FULL_TEXT_SEARCH, path->type);
+    // Since there is no ORDER BY in the query, expect an unordered index scan.
+    EXPECT_FALSE(query_block->is_ordered());
+    EXPECT_FALSE(path->full_text_search().use_order);
+  } else {
+    EXPECT_EQ(AccessPath::TABLE_SCAN, path->type);
+  }
+}
+
+static constexpr FullTextParam full_text_queries[] = {
+    // Expect a full-text index scan if the predicate returns true for positive
+    // scores only. Expect the index scan to have a filter on top of it if the
+    // predicate does not return true for all non-zero scores.
+    {"SELECT t1.x FROM t1 WHERE MATCH(t1.x) AGAINST ('abc' IN BOOLEAN MODE)",
+     /*expect_filter=*/false,
+     /*expect_index=*/true},
+    {"SELECT t1.x FROM t1 WHERE MATCH(t1.x) AGAINST ('abc')",
+     /*expect_filter=*/false,
+     /*expect_index=*/true},
+    {"SELECT t1.x FROM t1 WHERE MATCH(t1.x) AGAINST ('abc') > 0",
+     /*expect_filter=*/false,
+     /*expect_index=*/true},
+    {"SELECT t1.x FROM t1 WHERE MATCH(t1.x) AGAINST ('abc') > 0.5",
+     /*expect_filter=*/true,
+     /*expect_index=*/true},
+    {"SELECT t1.x FROM t1 WHERE MATCH(t1.x) AGAINST ('abc') >= 0.5",
+     /*expect_filter=*/true,
+     /*expect_index=*/true},
+    {"SELECT t1.x FROM t1 WHERE 0.5 < MATCH(t1.x) AGAINST ('abc')",
+     /*expect_filter=*/true,
+     /*expect_index=*/true},
+    {"SELECT t1.x FROM t1 WHERE 0.5 <= MATCH(t1.x) AGAINST ('abc')",
+     /*expect_filter=*/true,
+     /*expect_index=*/true},
+
+    // Expect a table scan if the predicate might return true for zero or
+    // negative scores. A filter node is added on top for the predicate.
+    {"SELECT t1.x FROM t1 WHERE MATCH(t1.x) AGAINST ('abc') < 0.5",
+     /*expect_filter=*/true,
+     /*expect_index=*/false},
+    {"SELECT t1.x FROM t1 WHERE MATCH(t1.x) AGAINST ('abc') <= 0.5",
+     /*expect_filter=*/true,
+     /*expect_index=*/false},
+    {"SELECT t1.x FROM t1 WHERE MATCH(t1.x) AGAINST ('abc') >= 0",
+     /*expect_filter=*/true,
+     /*expect_index=*/false},
+    {"SELECT t1.x FROM t1 WHERE MATCH(t1.x) AGAINST ('abc') > -1",
+     /*expect_filter=*/true,
+     /*expect_index=*/false},
+    {"SELECT t1.x FROM t1 WHERE MATCH(t1.x) AGAINST ('abc') <> 0.5",
+     /*expect_filter=*/true,
+     /*expect_index=*/false},
+    {"SELECT t1.x FROM t1 WHERE 0.5 > MATCH(t1.x) AGAINST ('abc')",
+     /*expect_filter=*/true,
+     /*expect_index=*/false},
+    {"SELECT t1.x FROM t1 WHERE 0.5 >= MATCH(t1.x) AGAINST ('abc')",
+     /*expect_filter=*/true,
+     /*expect_index=*/false},
+
+    // Expect a table scan if the predicate checks for an exact score. (Not
+    // because an index scan cannot be used, but because it's not a very useful
+    // query, so we haven't optimized for it.)
+    {"SELECT t1.x FROM t1 WHERE MATCH(t1.x) AGAINST ('abc') = 0.5",
+     /*expect_filter=*/true,
+     /*expect_index=*/false},
+
+    // Expect a table scan if the predicate is a disjunction.
+    {"SELECT t1.x FROM t1 WHERE MATCH(t1.x) AGAINST ('abc' IN BOOLEAN MODE) "
+     "OR MATCH(t1.x) AGAINST ('xyz' IN BOOLEAN MODE)",
+     /*expect_filter=*/true,
+     /*expect_index=*/false},
+
+    // Expect an index scan if the predicate is a conjunction. A filter node
+    // will be added for the predicate that is not subsumed by the index.
+    {"SELECT t1.x FROM t1 WHERE MATCH(t1.x) AGAINST ('abc' IN BOOLEAN MODE) "
+     "AND MATCH(t1.x) AGAINST ('xyz' IN BOOLEAN MODE)",
+     /*expect_filter=*/true,
+     /*expect_index=*/true},
+};
+INSTANTIATE_TEST_SUITE_P(FullTextQueries, HypergraphFullTextTest,
+                         ::testing::ValuesIn(full_text_queries));
+
+TEST_F(HypergraphOptimizerTest, FullTextSearchNoHashJoin) {
+  // CREATE TABLE t1(x VARCHAR(100)).
+  Base_mock_field_varstring column1(/*length=*/100, /*share=*/nullptr);
+  column1.field_name = "x";
+  Fake_TABLE *t1 = new (m_initializer.thd()->mem_root) Fake_TABLE(&column1);
+  m_fake_tables["t1"] = t1;
+  t1->set_created();
+
+  // CREATE FULLTEXT INDEX idx ON t1(x).
+  down_cast<Mock_HANDLER *>(t1->file)->set_ha_table_flags(
+      t1->file->ha_table_flags() | HA_CAN_FULLTEXT);
+  t1->create_index(&column1, /*column2=*/nullptr, ulong{HA_FULLTEXT});
+
+  Query_block *query_block = ParseAndResolve(
+      "SELECT MATCH(t1.x) AGAINST ('abc') FROM t1, t2 WHERE t1.x = t2.x",
+      /*nullable=*/false);
+  ASSERT_NE(nullptr, query_block);
+
+  // Add some rows to make a hash join more tempting than a nested loop join.
+  m_fake_tables["t1"]->file->stats.records = 1000;
+  m_fake_tables["t2"]->file->stats.records = 1000;
+
+  string trace;
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
+  SCOPED_TRACE(trace);  // Prints out the trace on failure.
+  // Prints out the query plan on failure.
+  SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
+                              /*is_root_of_join=*/true));
+  ASSERT_NE(nullptr, root);
+
+  // FTS does not work well with hash join, so we force nested loop join for
+  // this query.
+  ASSERT_EQ(AccessPath::NESTED_LOOP_JOIN, root->type);
+}
+
+TEST_F(HypergraphOptimizerTest, FullTextCanSkipRanking) {
+  // CREATE TABLE t1(x VARCHAR(100)).
+  Base_mock_field_varstring column1(/*length=*/100, /*share=*/nullptr);
+  column1.field_name = "x";
+  Fake_TABLE *t1 = new (m_initializer.thd()->mem_root) Fake_TABLE(&column1);
+  m_fake_tables["t1"] = t1;
+  t1->set_created();
+
+  // CREATE FULLTEXT INDEX idx ON t1(x).
+  down_cast<Mock_HANDLER *>(t1->file)->set_ha_table_flags(
+      t1->file->ha_table_flags() | HA_CAN_FULLTEXT);
+  t1->create_index(&column1, /*column2=*/nullptr, ulong{HA_FULLTEXT});
+
+  Query_block *query_block = ParseAndResolve(
+      "SELECT MATCH(t1.x) AGAINST ('a') FROM t1 WHERE "
+      "MATCH(t1.x) AGAINST ('a') AND "
+      "MATCH(t1.x) AGAINST ('b') AND "
+      "MATCH(t1.x) AGAINST ('c') AND MATCH(t1.x) AGAINST ('c') > 0.1",
+      /*nullable=*/false);
+  ASSERT_NE(nullptr, query_block);
+
+  string trace;
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
+  SCOPED_TRACE(trace);  // Prints out the trace on failure.
+  // Prints out the query plan on failure.
+  SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
+                              /*is_root_of_join=*/true));
+  ASSERT_NE(nullptr, root);
+
+  const List<Item_func_match> *ftfuncs = query_block->ftfunc_list;
+  ASSERT_EQ(5, ftfuncs->size());
+
+  // MATCH(t1.x) AGAINST ('a') needs ranking because it is used in the
+  // SELECT list.
+  EXPECT_EQ("(match t1.x against ('a'))", ItemToString((*ftfuncs)[0]));
+  EXPECT_EQ(nullptr, (*ftfuncs)[0]->master);
+  EXPECT_FALSE((*ftfuncs)[0]->can_skip_ranking());
+  EXPECT_EQ((*ftfuncs)[0], (*ftfuncs)[1]->get_master());
+
+  // MATCH (t1.x) AGAINST ('b') does not need ranking, since it's only used
+  // in a standalone predicate.
+  EXPECT_EQ("(match t1.x against ('b'))", ItemToString((*ftfuncs)[2]));
+  EXPECT_EQ(nullptr, (*ftfuncs)[2]->master);
+  EXPECT_TRUE((*ftfuncs)[2]->can_skip_ranking());
+
+  // MATCH (t1.x) AGAINST ('c') needs ranking because one of the predicates
+  // requires it to return > 0.1.
+  EXPECT_EQ("(match t1.x against ('c'))", ItemToString((*ftfuncs)[3]));
+  EXPECT_EQ(nullptr, (*ftfuncs)[3]->master);
+  EXPECT_FALSE((*ftfuncs)[3]->can_skip_ranking());
+  EXPECT_EQ((*ftfuncs)[3], (*ftfuncs)[4]->get_master());
+}
+
+TEST_F(HypergraphOptimizerTest, FullTextAvoidDescSort) {
+  // CREATE TABLE t1(x VARCHAR(100)).
+  Base_mock_field_varstring column1(/*length=*/100, /*share=*/nullptr);
+  column1.field_name = "x";
+  Fake_TABLE *t1 = new (m_initializer.thd()->mem_root) Fake_TABLE(&column1);
+  t1->file->stats.records = 10000;
+  m_fake_tables["t1"] = t1;
+  t1->set_created();
+
+  // CREATE FULLTEXT INDEX idx ON t1(x).
+  down_cast<Mock_HANDLER *>(t1->file)->set_ha_table_flags(
+      t1->file->ha_table_flags() | HA_CAN_FULLTEXT);
+  t1->create_index(&column1, /*column2=*/nullptr, ulong{HA_FULLTEXT});
+
+  Query_block *query_block = ParseAndResolve(
+      "SELECT t1.x FROM t1 WHERE MATCH(t1.x) AGAINST ('abc') "
+      "ORDER BY MATCH(t1.x) AGAINST ('abc') DESC",
+      /*nullable=*/false);
+  ASSERT_NE(nullptr, query_block);
+
+  string trace;
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
+  SCOPED_TRACE(trace);  // Prints out the trace on failure.
+  // Prints out the query plan on failure.
+  SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
+                              /*is_root_of_join=*/true));
+  ASSERT_NE(nullptr, root);
+
+  // Expect no sort in the plan. An ordered index scan is used.
+  ASSERT_EQ(AccessPath::FULL_TEXT_SEARCH, root->type);
+  EXPECT_TRUE(root->full_text_search().use_order);
+}
+
+TEST_F(HypergraphOptimizerTest, FullTextAscSort) {
+  // CREATE TABLE t1(x VARCHAR(100)).
+  Base_mock_field_varstring column1(/*length=*/100, /*share=*/nullptr);
+  column1.field_name = "x";
+  Fake_TABLE *t1 = new (m_initializer.thd()->mem_root) Fake_TABLE(&column1);
+  t1->file->stats.records = 10000;
+  m_fake_tables["t1"] = t1;
+  t1->set_created();
+
+  // CREATE FULLTEXT INDEX idx ON t1(x).
+  down_cast<Mock_HANDLER *>(t1->file)->set_ha_table_flags(
+      t1->file->ha_table_flags() | HA_CAN_FULLTEXT);
+  t1->create_index(&column1, /*column2=*/nullptr, ulong{HA_FULLTEXT});
+
+  Query_block *query_block = ParseAndResolve(
+      "SELECT t1.x FROM t1 WHERE MATCH(t1.x) AGAINST ('abc') "
+      "ORDER BY MATCH(t1.x) AGAINST ('abc') ASC",
+      /*nullable=*/false);
+  ASSERT_NE(nullptr, query_block);
+
+  string trace;
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
+  SCOPED_TRACE(trace);  // Prints out the trace on failure.
+  // Prints out the query plan on failure.
+  SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
+                              /*is_root_of_join=*/true));
+  ASSERT_NE(nullptr, root);
+
+  // The full-text index can only return results in descending order, so expect
+  // a SORT node on top.
+  EXPECT_EQ(AccessPath::SORT, root->type);
+}
+
+TEST_F(HypergraphOptimizerTest, FullTextDescSortNoPredicate) {
+  // CREATE TABLE t1(x VARCHAR(100)).
+  Base_mock_field_varstring column1(/*length=*/100, /*share=*/nullptr);
+  column1.field_name = "x";
+  Fake_TABLE *t1 = new (m_initializer.thd()->mem_root) Fake_TABLE(&column1);
+  t1->file->stats.records = 10000;
+  m_fake_tables["t1"] = t1;
+  t1->set_created();
+
+  // CREATE FULLTEXT INDEX idx ON t1(x).
+  down_cast<Mock_HANDLER *>(t1->file)->set_ha_table_flags(
+      t1->file->ha_table_flags() | HA_CAN_FULLTEXT);
+  t1->create_index(&column1, /*column2=*/nullptr, ulong{HA_FULLTEXT});
+
+  Query_block *query_block = ParseAndResolve(
+      "SELECT t1.x FROM t1 ORDER BY MATCH(t1.x) AGAINST ('abc') DESC",
+      /*nullable=*/false);
+  ASSERT_NE(nullptr, query_block);
+
+  string trace;
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
+  SCOPED_TRACE(trace);  // Prints out the trace on failure.
+  // Prints out the query plan on failure.
+  SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
+                              /*is_root_of_join=*/true));
+  ASSERT_NE(nullptr, root);
+
+  // A full-text index scan cannot be used for ordering when there is no
+  // predicate, since the index scan doesn't return all rows (only those with a
+  // positive score). Expect a SORT node on top.
+  EXPECT_EQ(AccessPath::SORT, root->type);
+}
+
 TEST_F(HypergraphOptimizerTest, DistinctIsDoneAsSort) {
   Query_block *query_block =
       ParseAndResolve("SELECT DISTINCT t1.y, t1.x FROM t1", /*nullable=*/true);
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   // Prints out the query plan on failure.
   SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
@@ -991,7 +2329,7 @@
       /*nullable=*/true);
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   // Prints out the query plan on failure.
   SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
@@ -1012,7 +2350,7 @@
   m_initializer.thd()->variables.sql_mode |= MODE_ONLY_FULL_GROUP_BY;
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   // Prints out the query plan on failure.
   SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
@@ -1044,7 +2382,7 @@
                       /*nullable=*/true);
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   // Prints out the query plan on failure.
   SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
@@ -1074,7 +2412,7 @@
   m_fake_tables["t2"]->file->stats.data_file_length = 100e6;
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   // Prints out the query plan on failure.
   SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
@@ -1114,7 +2452,7 @@
   m_fake_tables["t2"]->file->stats.data_file_length = 100e6;
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   // Prints out the query plan on failure.
   SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
@@ -1148,7 +2486,7 @@
   m_fake_tables["t3"]->file->stats.data_file_length = 100e6;
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   // Prints out the query plan on failure.
   SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
@@ -1185,6 +2523,30 @@
   query_block->cleanup(m_thd, /*full=*/true);
 }
 
+TEST_F(HypergraphOptimizerTest, NoSortAheadOnNondeterministicFunction) {
+  Query_block *query_block =
+      ParseAndResolve("SELECT t1.x, t2.x FROM t1, t2 ORDER BY t1.x + RAND()",
+                      /*nullable=*/true);
+
+  m_fake_tables["t1"]->file->stats.records = 100;
+  m_fake_tables["t2"]->file->stats.records = 100;
+  m_fake_tables["t1"]->file->stats.data_file_length = 1e6;
+  m_fake_tables["t2"]->file->stats.data_file_length = 1e6;
+
+  string trace;
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
+  SCOPED_TRACE(trace);  // Prints out the trace on failure.
+  // Prints out the query plan on failure.
+  SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
+                              /*is_root_of_join=*/true));
+
+  // The sort should _not_ be pushed to t1, but kept at the top.
+  // We don't care about the rest of the plan.
+  ASSERT_EQ(AccessPath::SORT, root->type);
+
+  query_block->cleanup(m_thd, /*full=*/true);
+}
+
 TEST_F(HypergraphOptimizerTest, SortAheadDueToEquivalence) {
   Query_block *query_block = ParseAndResolve(
       "SELECT t1.x, t2.x FROM t1 JOIN t2 ON t1.x=t2.x ORDER BY t1.x, t2.x "
@@ -1197,7 +2559,7 @@
   m_fake_tables["t2"]->file->stats.data_file_length = 100e6;
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   // Prints out the query plan on failure.
   SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
@@ -1248,13 +2610,13 @@
   m_fake_tables["t2"]->create_index(m_fake_tables["t2"]->field[0],
                                     /*column2=*/nullptr, /*unique=*/true);
 
-  m_fake_tables["t1"]->file->stats.records = 100;
+  m_fake_tables["t1"]->file->stats.records = 200;
   m_fake_tables["t2"]->file->stats.records = 10000;
-  m_fake_tables["t1"]->file->stats.data_file_length = 1e6;
+  m_fake_tables["t1"]->file->stats.data_file_length = 2e6;
   m_fake_tables["t2"]->file->stats.data_file_length = 100e6;
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   // Prints out the query plan on failure.
   SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
@@ -1303,13 +2665,13 @@
   m_fake_tables["t2"]->create_index(m_fake_tables["t2"]->field[0],
                                     /*column2=*/nullptr, /*unique=*/false);
 
-  m_fake_tables["t1"]->file->stats.records = 100;
+  m_fake_tables["t1"]->file->stats.records = 200;
   m_fake_tables["t2"]->file->stats.records = 10000;
-  m_fake_tables["t1"]->file->stats.data_file_length = 1e6;
+  m_fake_tables["t1"]->file->stats.data_file_length = 2e6;
   m_fake_tables["t2"]->file->stats.data_file_length = 100e6;
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   // Prints out the query plan on failure.
   SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
@@ -1344,7 +2706,7 @@
   m_fake_tables["t1"]->file->stats.data_file_length = 1e6;
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   // Prints out the query plan on failure.
   SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
@@ -1371,7 +2733,7 @@
   m_fake_tables["t2"]->file->stats.data_file_length = 100e6;
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   // Prints out the query plan on failure.
   SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
@@ -1407,7 +2769,7 @@
       .WillByDefault(Return(HA_READ_ORDER | HA_READ_NEXT | HA_READ_PREV));
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   // Prints out the query plan on failure.
   SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
@@ -1429,7 +2791,7 @@
                       /*nullable=*/true);
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   // Prints out the query plan on failure.
   SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
@@ -1461,7 +2823,7 @@
       .WillByDefault(Return(HA_READ_ORDER | HA_READ_NEXT | HA_READ_PREV));
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   // Prints out the query plan on failure.
   SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
@@ -1488,7 +2850,7 @@
   m_fake_tables["t2"]->file->stats.data_file_length = 1e6;
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   // Prints out the query plan on failure.
   SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
@@ -1533,7 +2895,7 @@
       .WillByDefault(Return(HA_READ_ORDER | HA_READ_NEXT | HA_READ_PREV));
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   // Prints out the query plan on failure.
   SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
@@ -1566,7 +2928,7 @@
       .WillByDefault(Return(HA_READ_ORDER | HA_READ_NEXT | HA_READ_PREV));
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   // Prints out the query plan on failure.
   SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
@@ -1603,7 +2965,7 @@
   m_fake_tables["t2"]->file->stats.data_file_length = 1e6;
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   // Prints out the query plan on failure.
   SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
@@ -1644,6 +3006,47 @@
   query_block->cleanup(m_thd, /*full=*/true);
 }
 
+TEST_F(HypergraphOptimizerTest, ImpossibleJoinConditionGivesZeroRows) {
+  Query_block *query_block = ParseAndResolve(
+      "SELECT 1 FROM t1 LEFT JOIN (t2 JOIN t3 ON t2.x=t3.x AND 1=2) ON "
+      "t1.x=t2.x",
+      /*nullable=*/false);
+
+  // We don't need any statistics; the best plan is quite obvious.
+  // But we'd like to confirm the estimated row count for the join.
+  m_fake_tables["t1"]->file->stats.records = 10;
+  m_fake_tables["t2"]->file->stats.records = 1000;
+  m_fake_tables["t3"]->file->stats.records = 1000;
+
+  string trace;
+  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  SCOPED_TRACE(trace);  // Prints out the trace on failure.
+  // Prints out the query plan on failure.
+  SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
+                              /*is_root_of_join=*/true));
+
+  // Since there are no rows on the right side, we should have a nested loop
+  // with t1 on the left side.
+  ASSERT_EQ(AccessPath::NESTED_LOOP_JOIN, root->type);
+  EXPECT_EQ(JoinType::OUTER, root->nested_loop_join().join_type);
+  EXPECT_FLOAT_EQ(10.0, root->num_output_rows);
+
+  AccessPath *outer = root->nested_loop_join().outer;
+  ASSERT_EQ(AccessPath::TABLE_SCAN, outer->type);
+  EXPECT_STREQ("t1", outer->table_scan().table->alias);
+
+  // On the right side, we should have pushed _up_ the 1=2 condition,
+  // and seen that it kills all the rows on the right side.
+  AccessPath *inner = root->nested_loop_join().inner;
+  ASSERT_EQ(AccessPath::ZERO_ROWS, inner->type);
+
+  // Just verify that we indeed have a join under there.
+  // (It is needed to get the zero row flags set on t2 and t3.)
+  EXPECT_EQ(AccessPath::NESTED_LOOP_JOIN, inner->zero_rows().child->type);
+
+  query_block->cleanup(m_thd, /*full=*/true);
+}
+
 // An alias for better naming.
 using HypergraphSecondaryEngineTest = HypergraphOptimizerTest;
 
@@ -1663,7 +3066,7 @@
       };
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   ASSERT_NE(nullptr, root);
 
@@ -1694,7 +3097,7 @@
       };
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   ASSERT_NE(nullptr, root);
 
@@ -1714,7 +3117,7 @@
   EnableSecondaryEngine(/*aggregation_is_unordered=*/false);
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   ASSERT_NE(nullptr, root);
 
@@ -1730,7 +3133,7 @@
   EnableSecondaryEngine(/*aggregation_is_unordered=*/true);
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   ASSERT_NE(nullptr, root);
 
@@ -1748,7 +3151,7 @@
   EnableSecondaryEngine(/*aggregation_is_unordered=*/false);
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   // Prints out the query plan on failure.
   SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
@@ -1776,7 +3179,7 @@
   EnableSecondaryEngine(/*aggregation_is_unordered=*/true);
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   // Prints out the query plan on failure.
   SCOPED_TRACE(PrintQueryPlan(0, root, query_block->join,
@@ -1824,7 +3227,7 @@
   ErrorChecker error_checker{m_thd, ER_SECONDARY_ENGINE};
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   EXPECT_EQ(nullptr, root);
 }
@@ -1838,14 +3241,14 @@
   hton->secondary_engine_modify_access_path_cost =
       [](THD *, const JoinHypergraph &, AccessPath *path) {
         // Reject the path if all three tables are referenced.
-        return GetUsedTableMap(path) == 0b111;
+        return GetUsedTableMap(path, /*include_pruned_tables=*/true) == 0b111;
       };
 
   // No plans will be found, so expect an error.
   ErrorChecker error_checker{m_thd, ER_SECONDARY_ENGINE};
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   EXPECT_EQ(nullptr, root);
 }
@@ -1888,7 +3291,7 @@
       };
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   ASSERT_NE(nullptr, root);
 
@@ -1951,7 +3354,7 @@
                              param.expect_error ? ER_SECONDARY_ENGINE : 0);
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   EXPECT_EQ(param.expect_error, root == nullptr);
 
@@ -1979,7 +3382,7 @@
       m_thd, param.expect_error ? ER_SECONDARY_ENGINE_PLUGIN : 0);
 
   string trace;
-  AccessPath *root = FindBestQueryPlan(m_thd, query_block, &trace);
+  AccessPath *root = FindBestQueryPlanAndFinalize(m_thd, query_block, &trace);
   SCOPED_TRACE(trace);  // Prints out the trace on failure.
   EXPECT_EQ(param.expect_error, root == nullptr);
 
@@ -2325,3 +3728,73 @@
   }
   initializer.TearDown();
 }
+
+class CSETest : public HypergraphTestBase<::testing::Test> {
+ protected:
+  string TestCSE(const string &expression);
+};
+
+string CSETest::TestCSE(const string &expression) {
+  // Abuse ParseAndResolve() to get the expression parsed.
+  Query_block *query_block = ParseAndResolve(
+      ("SELECT 1 FROM t1, t2, t3, t4, t5 WHERE " + expression).c_str(),
+      /*nullable=*/true);
+  return ItemToString(
+      CommonSubexpressionElimination(query_block->join->where_cond));
+}
+
+TEST_F(CSETest, NoopSimpleItem) {
+  EXPECT_EQ(TestCSE("t1.x=t2.x"), "(t1.x = t2.x)");
+}
+
+TEST_F(CSETest, NoopANDNoOR) {
+  EXPECT_EQ(TestCSE("t1.x=t2.x AND t2.x = t3.x"),
+            "((t1.x = t2.x) and (t2.x = t3.x))");
+}
+
+TEST_F(CSETest, NoopORNoAND) {
+  EXPECT_EQ(TestCSE("t1.x=t2.x OR t2.x = t3.x"),
+            "((t1.x = t2.x) or (t2.x = t3.x))");
+}
+
+TEST_F(CSETest, NoopNoCommon) {
+  EXPECT_EQ(TestCSE("t1.x=t2.x OR (t2.x = t3.x AND t3.x > 4)"),
+            "((t1.x = t2.x) or ((t2.x = t3.x) and (t3.x > 4)))");
+}
+
+TEST_F(CSETest, BasicSplit) {
+  EXPECT_EQ(TestCSE("(t1.x=t2.x AND t2.x > 3) OR (t1.x=t2.x AND t2.x < 0)"),
+            "((t1.x = t2.x) and ((t2.x > 3) or (t2.x < 0)))");
+}
+
+TEST_F(CSETest, SplitFromRecursedORGroups) {
+  EXPECT_EQ(TestCSE("(t1.x=0 AND t2.x>1) OR ((t1.x=0 AND t2.y>1) OR (t1.x=0 "
+                    "AND t2.z>0))"),
+            "((t1.x = 0) and ((t2.x > 1) or (t2.y > 1) or (t2.z > 0)))");
+}
+
+TEST_F(CSETest, SplitFromRecursedANDGroups) {
+  EXPECT_EQ(TestCSE("(t2.x>1 AND (t2.y>1 AND (t1.x=0))) OR "
+                    "(t3.x>1 AND (t3.y>1 AND (t1.x=0)))"),
+            "((t1.x = 0) and "
+            "(((t2.x > 1) and (t2.y > 1)) or ((t3.x > 1) and (t3.y > 1))))");
+}
+
+// Split out t1.x > 1 and t2.y < 2, ie., more than one element,
+// and they are in different orders. There are multiple items left
+// in the rightmost OR group, too.
+TEST_F(CSETest, SplitOutMoreThanOneElement) {
+  EXPECT_EQ(TestCSE("(t1.x > 1 AND t2.y < 2 AND t2.x > 3) OR ((t2.y < 2 AND "
+                    "t1.x > 1 AND t2.x < 1 AND t2.z >= 4))"),
+            "((t1.x > 1) and (t2.y < 2) and "
+            "((t2.x > 3) or ((t2.x < 1) and (t2.z >= 4))))");
+}
+
+TEST_F(CSETest, ShortCircuit) {
+  EXPECT_EQ(TestCSE("t1.x=t2.x OR (t1.x=t2.x AND t2.x < 0)"), "(t1.x = t2.x)");
+}
+
+TEST_F(CSETest, ShortCircuitWithMultipleElements) {
+  EXPECT_EQ(TestCSE("(t1.x=0 AND t1.y=1) OR (t1.x=0 AND t1.y=1)"),
+            "((t1.x = 0) and (t1.y = 1))");
+}
diff -Nru mysql-8.0-8.0.26/unittest/gunit/innodb/CMakeLists.txt mysql-8.0-8.0.27/unittest/gunit/innodb/CMakeLists.txt
--- mysql-8.0-8.0.26/unittest/gunit/innodb/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/innodb/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -43,6 +43,19 @@
   ut0new
 )
 
+# Treat warnings as errors on MSVC for InnoDB's unittests
+IF(MSVC AND NOT WIN32_CLANG)
+  ADD_COMPILE_OPTIONS("/WX")
+ENDIF()
+
+# Fixes "C1128: number of sections exceeded object file format limit" in MSVC
+IF(MSVC)
+  ADD_COMPILE_FLAGS(
+    ut0new-t.cc
+    COMPILE_FLAGS "/bigobj"
+    )
+ENDIF()
+
 SET(ALL_INNODB_TESTS)
 FOREACH(test ${TESTS})
   LIST(APPEND ALL_INNODB_TESTS ${test}-t.cc)
@@ -53,11 +66,8 @@
 ENDIF()
 MYSQL_ADD_EXECUTABLE(merge_innodb_tests-t ${ALL_INNODB_TESTS}
   ENABLE_EXPORTS
-  ADD_TEST merge_innodb_tests-t)
-
-TARGET_LINK_LIBRARIES(merge_innodb_tests-t
-  gunit_large
-  server_unittest_library
+  ADD_TEST merge_innodb_tests-t
+  LINK_LIBRARIES gunit_large server_unittest_library
   )
 
 # Download TBB from https://www.threadingbuildingblocks.org
@@ -74,14 +84,12 @@
     LIST(APPEND SRC_FILES ../../../sql/nt_servc.cc)
   ENDIF()
   MYSQL_ADD_EXECUTABLE(${test}-t ${SRC_FILES}
-    ENABLE_EXPORTS SKIP_INSTALL EXCLUDE_FROM_ALL)
-
-  TARGET_LINK_LIBRARIES(${test}-t
-    gunit_large
-    server_unittest_library
+    ENABLE_EXPORTS
+    EXCLUDE_FROM_ALL
+    SKIP_INSTALL
+    LINK_LIBRARIES gunit_large server_unittest_library
+    DEPENDENCIES GenError
     )
-  ADD_DEPENDENCIES(${test}-t GenError)
-
 ENDFOREACH()
 
 ADD_SUBDIRECTORY(lob)
diff -Nru mysql-8.0-8.0.26/unittest/gunit/innodb/lob/ut0dbg.cc mysql-8.0-8.0.27/unittest/gunit/innodb/lob/ut0dbg.cc
--- mysql-8.0-8.0.26/unittest/gunit/innodb/lob/ut0dbg.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/innodb/lob/ut0dbg.cc	2021-09-28 11:46:34.000000000 +0000
@@ -27,7 +27,8 @@
 
 #include "ut0dbg.h"
 
-void ut_dbg_assertion_failed(const char *expr, const char *file, ulint line) {
+[[noreturn]] void ut_dbg_assertion_failed(const char *expr, const char *file,
+                                          ulint line) {
   fflush(stderr);
   fflush(stdout);
   abort();
diff -Nru mysql-8.0-8.0.26/unittest/gunit/innodb/lob/ut0dbg.h mysql-8.0-8.0.27/unittest/gunit/innodb/lob/ut0dbg.h
--- mysql-8.0-8.0.26/unittest/gunit/innodb/lob/ut0dbg.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/innodb/lob/ut0dbg.h	2021-09-28 11:46:34.000000000 +0000
@@ -28,7 +28,8 @@
 
 #include "lot0types.h"
 
-void ut_dbg_assertion_failed(const char *expr, const char *file, ulint line);
+[[noreturn]] void ut_dbg_assertion_failed(const char *expr, const char *file,
+                                          ulint line);
 
 #define ut_a(EXPR)                                               \
   do {                                                           \
diff -Nru mysql-8.0-8.0.26/unittest/gunit/innodb/lob/zlob0int.h mysql-8.0-8.0.27/unittest/gunit/innodb/lob/zlob0int.h
--- mysql-8.0-8.0.26/unittest/gunit/innodb/lob/zlob0int.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/innodb/lob/zlob0int.h	2021-09-28 11:46:34.000000000 +0000
@@ -563,21 +563,21 @@
     return (fil_addr_t(page_no, offset));
   }
 
-  /** All the index pages are singled linked with each other, and the first
+  /** All the index pages are singly linked with each other, and the first
   page contains the link to one index page.
   @param[in]  page_no  the page number of an index page. */
   void set_index_page_no(page_no_t page_no) {
     mlog_write_ulint(frame() + OFFSET_INDEX_PAGE_NO, page_no, MLOG_4BYTES);
   }
 
-  /** All the index pages are singled linked with each other, and the first
+  /** All the index pages are singly linked with each other, and the first
   page contains the link to one index page. Get that index page number.
   @return the index page number. */
   page_no_t get_index_page_no() const {
     return (mach_read_from_4(frame() + OFFSET_INDEX_PAGE_NO));
   }
 
-  /** All the frag node pages are singled linked with each other, and the
+  /** All the frag node pages are singly linked with each other, and the
   first page contains the link to one frag node page.
   @param[in]  page_no  the page number of an frag node page. */
   void set_frag_node_page_no(page_no_t page_no) {
@@ -592,7 +592,7 @@
   /** Free all the index pages. */
   void free_all_index_pages();
 
-  /** All the frag node pages are singled linked with each other, and the
+  /** All the frag node pages are singly linked with each other, and the
   first page contains the link to one frag node page. Get that frag node
   page number.
   @return the index page number. */
diff -Nru mysql-8.0-8.0.26/unittest/gunit/innodb/os0thread-create-t.cc mysql-8.0-8.0.27/unittest/gunit/innodb/os0thread-create-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/innodb/os0thread-create-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/innodb/os0thread-create-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -50,7 +50,7 @@
   IB_thread thread;
   EXPECT_FALSE(thread_is_active(thread));
 
-  thread = create_detached_thread(0, std::move(f), 42);
+  thread = create_detached_thread(0, 0, std::move(f), 42);
   EXPECT_FALSE(thread_is_active(thread));
 
   thread.start();
@@ -88,7 +88,7 @@
 
   IB_thread t1, t2;
 
-  t1 = create_detached_thread(0, std::move(f), 42);
+  t1 = create_detached_thread(0, 0, std::move(f), 42);
   t1.start();
   EXPECT_TRUE(thread_is_active(t1));
 
diff -Nru mysql-8.0-8.0.26/unittest/gunit/innodb/srv0conc-t.cc mysql-8.0-8.0.27/unittest/gunit/innodb/srv0conc-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/innodb/srv0conc-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/innodb/srv0conc-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -87,14 +87,16 @@
   static void TearDownTestCase() { srv_thread_concurrency = 0; }
 };
 
-TEST_F(srv0conc, no_concurrency_limit) {
+// TODO(tdidriks) DISABLED some tests until this is fixed:
+// Bug #32855166 BROKEN INNODB UNIT TESTS
+TEST_F(srv0conc, DISABLED_no_concurrency_limit) {
   const int THREADS = std::thread::hardware_concurrency();
   run_threads(user_thread_simulation<100, 100>, THREADS);
   EXPECT_EQ(srv_conc_get_waiting_threads(), 0);
   EXPECT_EQ(srv_conc_get_active_threads(), 0);
 }
 
-TEST_F(srv0conc, concurrency_limit_equals_hw_threads) {
+TEST_F(srv0conc, DISABLED_concurrency_limit_equals_hw_threads) {
   const int THREADS = std::thread::hardware_concurrency();
   srv_thread_concurrency = THREADS;
   run_threads(user_thread_simulation<100, 100>, THREADS);
@@ -102,7 +104,7 @@
   EXPECT_EQ(srv_conc_get_active_threads(), 0);
 }
 
-TEST_F(srv0conc, concurrency_limit_half_hw_threads) {
+TEST_F(srv0conc, DISABLED_concurrency_limit_half_hw_threads) {
   const int THREADS = std::thread::hardware_concurrency();
   srv_thread_concurrency = THREADS / 2;
   run_threads(user_thread_simulation<100, 100>, THREADS);
@@ -110,7 +112,7 @@
   EXPECT_EQ(srv_conc_get_active_threads(), 0);
 }
 
-TEST_F(srv0conc, concurrency_limit_2) {
+TEST_F(srv0conc, DISABLED_concurrency_limit_2) {
   const int THREADS = std::thread::hardware_concurrency();
   srv_thread_concurrency = 2;
   run_threads(user_thread_simulation<100, 100>, THREADS);
@@ -118,7 +120,7 @@
   EXPECT_EQ(srv_conc_get_active_threads(), 0);
 }
 
-TEST_F(srv0conc, concurrency_limit_1) {
+TEST_F(srv0conc, DISABLED_concurrency_limit_1) {
   const int THREADS = std::thread::hardware_concurrency();
   srv_thread_concurrency = 1;
   run_threads(user_thread_simulation<100, 100>, THREADS);
@@ -128,7 +130,7 @@
 
 /* This test case simulates the situation where the transaction is interrupted
 while waiting for n_active threads to drop below the concurrency limit. */
-TEST_F(srv0conc, trx_interrupted) {
+TEST_F(srv0conc, DISABLED_trx_interrupted) {
   srv_thread_concurrency = 1;
   prebuilt_guard active_prebuilt_guard;
   prebuilt_guard interrupted_prebuilt_guard;
diff -Nru mysql-8.0-8.0.26/unittest/gunit/innodb/ut0crc32-t.cc mysql-8.0-8.0.27/unittest/gunit/innodb/ut0crc32-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/innodb/ut0crc32-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/innodb/ut0crc32-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -24,16 +24,30 @@
 
 #include <gtest/gtest.h>
 #include <string.h>
+#include <array>
+#include <iostream>
 
 #include "storage/innobase/include/univ.i"
 #include "storage/innobase/include/ut0crc32.h"
 #include "storage/innobase/include/ut0dbg.h"
 #include "unittest/gunit/benchmark.h"
 
+#ifndef CRC32_DEFAULT
+namespace hardware {
+uint32_t crc32_using_pclmul(const byte *data, size_t len);
+uint32_t crc32_using_unrolled_loop_poly_mul(const byte *data, size_t len);
+bool can_use_crc32();
+bool can_use_poly_mul();
+}  // namespace hardware
+#endif /* !CRC32_DEFAULT */
+namespace software {
+uint32_t crc32(const byte *data, size_t len);
+}
+
 namespace innodb_ut0crc32_unittest {
 
 /** A copy of a real 16k page from InnoDB. */
-static const byte page[] = {
+alignas(8) static const byte page[] = {
     0x31, 0xd4, 0xa8, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x01, 0x84,
     0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x07, 0x72, 0x00, 0x00,
@@ -1406,23 +1420,147 @@
 static void init() {
   ut_crc32_init();
 
-  fprintf(stderr, "Using %s, CPU is %s-endian\n",
-          ut_crc32_cpu_enabled ? "hardware CPU crc32 instructions"
-                               : "software crc32 implementation",
+  fprintf(stderr,
+          "CPU is %s-endian, %s crc32 and %s polynomial multiplication "
+          "instructions.\n",
 #ifdef WORDS_BIGENDIAN
           "big"
 #else  /* WORDS_BIGENDIAN */
           "little"
 #endif /* WORDS_BIGENDIAN */
-  );
+          ,
+          ut_crc32_cpu_enabled ? "has" : "has no",
+          ut_poly_mul_cpu_enabled ? "has" : "has no");
+}
+
+constexpr uint32_t rev(uint32_t x) {
+  uint32_t r{0};
+  for (int i = 0; i < 32; ++i) {
+    r <<= 1;
+    if (x >> i & 1) {
+      r ^= 1;
+    }
+  }
+  return r;
+}
+/** For the given 32-bit g, creates a 64-bit value such that it is congruent to
+g modulo CRC32-C polynomial, and has zeros at the lower 32-bit.
+In a sense it "inverts the crc32" step giving you <w,0> s.t. crc32(<w,0>)=g.
+It returns just higher half (the w). */
+constexpr uint32_t invert_crc32(uint32_t g) {
+  uint64_t r{g};
+  for (int i = 0; i < 32; ++i) {
+    if (r >> i & 1) {
+      /* We clear each non-zero bit within lower 32-bits by xoring with a
+      shifted crc32c polynomial (which is congruent to zero).
+      This works because CRC32C_POLYNOMIAL's lowest bit is 1. */
+      r ^= uint64_t{CRC32C_POLYNOMIAL} << i;
+      /* Note that the polynomial has implicitly a x^32 in the front of it. */
+      r ^= 1ULL << (i + 32);
+    }
+  }
+  return r >> 32;
+}
+/** This is a very slow, but correct implementation of CRC32C which I hope is
+useful for educational purposes, as it shows how the academic ideal of
+   "It's just w(x) mod c(x)!"
+gets complicated in real world technical specification of it:
+- the most significant coefficients of w(x) are in data[0]
+- the most significant coefficient within data[i] is at position (1<<0)
+- the bits of the result are "reversed", in the sense that the most significant
+  coefficient of the resulting polynomial (the one for x^31), is actually stored
+  in the least significant bit (1<<0)
+- the bits of the result are negated
+- the input is conceptually extended by appending 32 zero bits to it
+- the initial value of the register holding "the result" in the real world
+  implementation is not really 0 - it should be 0xFFFFFFFF, instead. But in the
+  real world implementation, the value of this register is not the remainder for
+  the data seen so far, but rather the result for the data seen so far with the
+  additional 32 zeros appended to it. One way to wrap your head around it is to
+  pretend that there were four bytes 0x53,0x64,0x1f,0x64 prepended to the
+  data, which leads to the same result. (This magical sequence is chosen so
+  that after appending 32 zeros to it you get polynomial with rest 0xFFFFFFFF).
+Apart from that, the rest is "obvious" implementation of the academic ideal -
+you just read one bit at the time, starting with least significant (1<<0) bit of
+each byte, and for each of them just do r(x)=r(x)*x + bit mod CRC32C_POLYNOMIAL.
+@return the crc32c of data[0...len).
+*/
+uint32_t naive_crc32(const byte *data, size_t len) {
+  byte *buff = new byte[4 + len + 4];
+  constexpr auto magic_prefix = invert_crc32(0xFFFFFFFF);
+  /* The magic_prefix treated a polynomial is such that
+    (magic_prefix * x^32) mod crc32c = x^31+x^30+...+x^0 == 0xFFFFFFFF
+  The least significant coefficient of magic_prefix is magic_prefix&(1<<31), but
+  the crc32 implementation's loop expects the most significant bit to be in
+  buff[0]&(1<<0), thus we have to reverse the bits within each byte. */
+  buff[0] = rev(magic_prefix) & 0xFF;        // 0x54;
+  buff[1] = rev(magic_prefix) >> 8 & 0xFF;   // 0x64;
+  buff[2] = rev(magic_prefix) >> 16 & 0xFF;  // 0x1f;
+  buff[3] = rev(magic_prefix) >> 24 & 0xFF;  // 0x64;
+  memcpy(buff + 4, data, len);
+  buff[4 + len] = 0;
+  buff[4 + len + 1] = 0;
+  buff[4 + len + 2] = 0;
+  buff[4 + len + 3] = 0;
+  uint32_t r{0};
+  for (size_t bit = 0; bit < (4 + len + 4) * 8; ++bit) {
+    const uint32_t next = buff[bit / 8] >> bit % 8 & 1;
+    const bool will_wrap = r >> 31 & 1;
+    r = r << 1 | next;
+    if (will_wrap) r ^= CRC32C_POLYNOMIAL;
+  }
+  delete[] buff;
+  return ~rev(r);
 }
 
-/* test ut_crc32*() */
+struct random_data_t {
+  std::array<byte, 20000> data;
+  random_data_t() {
+    for (byte &b : data) {
+      b = rand();
+    }
+  }
+};
+random_data_t random_data{};
+
 TEST(ut0crc32, basic) {
   init();
 
   EXPECT_EQ(1090276284U, ut_crc32((const byte *)"innodb", 6));
+}
+TEST(ut0crc32, software) {
+  init();
+  for (size_t o = 0; o < 128; ++o) {
+    for (size_t size = 0; size <= 512; ++size) {
+      const auto data = &random_data.data[o];
+      const auto good = naive_crc32(data, size);
+      EXPECT_EQ(good, software::crc32(data, size));
+    }
+  }
+}
+TEST(ut0crc32, hardware) {
+  init();
+  for (size_t o = 0; o < 128; ++o) {
+    for (size_t size = 0; size + o <= random_data.data.size(); ++size) {
+      if (rand() % 100) continue;
+      const auto data = &random_data.data[o];
+      const auto good = software::crc32(data, size);
 
+      EXPECT_EQ(good, ut_crc32(data, size));
+#ifndef CRC32_DEFAULT
+      if (hardware::can_use_crc32()) {
+        EXPECT_EQ(good,
+                  hardware::crc32_using_unrolled_loop_poly_mul(data, size));
+        if (hardware::can_use_poly_mul()) {
+          EXPECT_EQ(good, hardware::crc32_using_pclmul(data, size));
+        }
+      }
+#endif /* !CRC32_DEFAULT */
+    }
+  }
+}
+TEST(ut0crc32, legacy) {
+  init();
   EXPECT_EQ(1090276284U, ut_crc32_legacy_big_endian((const byte *)"innodb", 6));
 
   byte *buf = new byte[page_size + 7];
@@ -1435,7 +1573,16 @@
     memcpy(p, page, page_size);
 
     EXPECT_EQ(2400278014U, ut_crc32(p, page_size));
-    EXPECT_EQ(2400278014U, ut_crc32_byte_by_byte(p, page_size));
+    EXPECT_EQ(2400278014U, naive_crc32(p, page_size));
+#ifndef CRC32_DEFAULT
+    if (hardware::can_use_crc32()) {
+      EXPECT_EQ(2400278014U,
+                hardware::crc32_using_unrolled_loop_poly_mul(p, page_size));
+      if (hardware::can_use_poly_mul()) {
+        EXPECT_EQ(2400278014U, hardware::crc32_using_pclmul(p, page_size));
+      }
+    }
+#endif /* !CRC32_DEFAULT */
 
     /* Big endian results depend on the alignment. */
     switch (reinterpret_cast<uintptr_t>(p) % 8) {
@@ -1468,7 +1615,7 @@
 
   delete[] buf;
 }
-
+template <size_t offset, size_t size>
 static void BM_CRC32(size_t num_iterations) {
   StopBenchmarkTiming();
   init();
@@ -1476,14 +1623,21 @@
   StartBenchmarkTiming();
   size_t sum = 0;
   for (size_t n = 0; n < num_iterations; n++) {
-    sum += ut_crc32(page, sizeof(page));
+    sum += ut_crc32(page + offset, size);
   }
   StopBenchmarkTiming();
 
   EXPECT_NE(0U, sum);  // To keep the compiler from optimizing it away.
-  SetBytesProcessed(num_iterations * sizeof(page));
+  SetBytesProcessed(num_iterations * size);
 }
-BENCHMARK(BM_CRC32)
+#define BENCHMARK_CRC(offset, size)                               \
+  static void BM_CRC32_##offset##_##size(size_t num_iterations) { \
+    BM_CRC32<offset, size>(num_iterations);                       \
+  }                                                               \
+  BENCHMARK(BM_CRC32_##offset##_##size)
+
+BENCHMARK_CRC(6, 16338)
+BENCHMARK_CRC(0, 508)
 
 static void BM_BigEndianCRC32(size_t num_iterations) {
   StopBenchmarkTiming();
diff -Nru mysql-8.0-8.0.26/unittest/gunit/innodb/ut0new-t.cc mysql-8.0-8.0.27/unittest/gunit/innodb/ut0new-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/innodb/ut0new-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/innodb/ut0new-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -24,6 +24,8 @@
 
 #include <gtest/gtest.h>
 #include <stddef.h>
+#include <stdexcept>
+#include <vector>
 
 #include "storage/innobase/include/detail/ut0new.h"
 #include "storage/innobase/include/univ.i"
@@ -31,254 +33,15 @@
 
 namespace innodb_ut0new_unittest {
 
-static void start() { ut_new_boot_safe(); }
-
-using int_types =
-    ::testing::Types<short int, unsigned short int, int, unsigned int, long int,
-                     unsigned long int, long long int, unsigned long long int>;
-
-using char_types = ::testing::Types<char, unsigned char, wchar_t>;
-
-using floating_point_types = ::testing::Types<float, double, long double>;
-
-/**
- * This is a typed test template, it's instantiated below for all primitive
- * types. This way we can cover all the supported fundamental alignments and
- * sizes.
- */
-template <class T>
-class ut0new_t : public ::testing::Test {
- protected:
-  ut_allocator<T> allocator;
-};
-
-template <class T>
-struct wrapper {
- public:
-  static constexpr T INIT_VAL = std::numeric_limits<T>::min() + 1;
-  wrapper(T data = INIT_VAL) : data(data) {}
-  T data;
-};
-
-template <class T>
-constexpr T wrapper<T>::INIT_VAL;
-
-TYPED_TEST_SUITE_P(ut0new_t);
-
-TYPED_TEST_P(ut0new_t, ut_new_fundamental_types) {
-  start();
-  const auto MAX = std::numeric_limits<TypeParam>::max();
-  auto p = UT_NEW_NOKEY(TypeParam(MAX));
-  EXPECT_EQ(*p, MAX);
-  UT_DELETE(p);
-
-  p = UT_NEW(TypeParam(MAX - 1), mem_key_buf_buf_pool);
-  EXPECT_EQ(*p, MAX - 1);
-  UT_DELETE(p);
-
-  const int CNT = 5;
-  p = UT_NEW_ARRAY_NOKEY(TypeParam, CNT);
-  for (int i = 0; i < CNT; ++i) {
-    p[i] = MAX;
-    EXPECT_EQ(p[i], MAX);
-  }
-  UT_DELETE_ARRAY(p);
-
-  p = UT_NEW_ARRAY(TypeParam, CNT, mem_key_buf_buf_pool);
-  for (int i = 0; i < CNT; ++i) {
-    p[i] = MAX - 1;
-    EXPECT_EQ(p[i], MAX - 1);
-  }
-  UT_DELETE_ARRAY(p);
-}
-
-TYPED_TEST_P(ut0new_t, ut_new_structs) {
-  start();
-  const auto MAX = std::numeric_limits<TypeParam>::max();
-
-  using w = wrapper<TypeParam>;
-
-  auto p = UT_NEW_NOKEY(w(TypeParam(MAX)));
-  EXPECT_EQ(p->data, MAX);
-  UT_DELETE(p);
-
-  p = UT_NEW(w(TypeParam(MAX - 1)), mem_key_buf_buf_pool);
-  EXPECT_EQ(p->data, MAX - 1);
-  UT_DELETE(p);
-
-  const int CNT = 5;
-
-  p = UT_NEW_ARRAY_NOKEY(w, CNT);
-  for (int i = 0; i < CNT; ++i) {
-    EXPECT_EQ(w::INIT_VAL, p[i].data);
-  }
-  UT_DELETE_ARRAY(p);
-
-  p = UT_NEW_ARRAY(w, CNT, mem_key_buf_buf_pool);
-  for (int i = 0; i < CNT; ++i) {
-    EXPECT_EQ(w::INIT_VAL, p[i].data);
-  }
-  UT_DELETE_ARRAY(p);
-}
-
-TYPED_TEST_P(ut0new_t, ut_malloc) {
-  start();
-  TypeParam *p;
-  const auto MAX = std::numeric_limits<TypeParam>::max();
-  const auto MIN = std::numeric_limits<TypeParam>::min();
-
-  p = static_cast<TypeParam *>(ut_malloc_nokey(sizeof(TypeParam)));
-  *p = MIN;
-  ut_free(p);
-
-  p = static_cast<TypeParam *>(
-      ut_malloc(sizeof(TypeParam), mem_key_buf_buf_pool));
-  *p = MAX;
-  ut_free(p);
-
-  p = static_cast<TypeParam *>(ut_zalloc_nokey(sizeof(TypeParam)));
-  EXPECT_EQ(0, *p);
-  *p = MAX;
-  ut_free(p);
-
-  p = static_cast<TypeParam *>(
-      ut_zalloc(sizeof(TypeParam), mem_key_buf_buf_pool));
-  EXPECT_EQ(0, *p);
-  *p = MAX;
-  ut_free(p);
-
-  p = static_cast<TypeParam *>(ut_malloc_nokey(sizeof(TypeParam)));
-  *p = MAX - 1;
-  p = static_cast<TypeParam *>(ut_realloc(p, 2 * sizeof(TypeParam)));
-  EXPECT_EQ(MAX - 1, p[0]);
-  p[1] = MAX;
-  ut_free(p);
-}
-
-/* test ut_allocator() */
-TYPED_TEST_P(ut0new_t, ut_vector) {
-  start();
-
-  typedef ut_allocator<TypeParam> vec_allocator_t;
-  typedef std::vector<TypeParam, vec_allocator_t> vec_t;
-  const auto MAX = std::numeric_limits<TypeParam>::max();
-  const auto MIN = std::numeric_limits<TypeParam>::min();
-
-  vec_t v1;
-  v1.push_back(MIN);
-  v1.push_back(MIN + 1);
-  v1.push_back(MAX);
-  EXPECT_EQ(MIN, v1[0]);
-  EXPECT_EQ(MIN + 1, v1[1]);
-  EXPECT_EQ(MAX, v1[2]);
-
-  /* We use "new" instead of "UT_NEW()" for simplicity here. Real InnoDB
-  code should use UT_NEW(). */
-
-  /* This could of course be written as:
-  std::vector<int, ut_allocator<int> >*	v2
-  = new std::vector<int, ut_allocator<int> >(ut_allocator<int>(
-  mem_key_buf_buf_pool)); */
-  vec_t *v2 = new vec_t(vec_allocator_t(mem_key_buf_buf_pool));
-  v2->push_back(MIN);
-  v2->push_back(MIN + 1);
-  v2->push_back(MAX);
-  EXPECT_EQ(MIN, v2->at(0));
-  EXPECT_EQ(MIN + 1, v2->at(1));
-  EXPECT_EQ(MAX, v2->at(2));
-  delete v2;
-}
-
-REGISTER_TYPED_TEST_SUITE_P(ut0new_t, ut_new_fundamental_types, ut_new_structs,
-                            ut_malloc, ut_vector);
-
-INSTANTIATE_TYPED_TEST_SUITE_P(int_types, ut0new_t, int_types);
-INSTANTIATE_TYPED_TEST_SUITE_P(float_types, ut0new_t, floating_point_types);
-INSTANTIATE_TYPED_TEST_SUITE_P(char_types, ut0new_t, char_types);
-INSTANTIATE_TYPED_TEST_SUITE_P(bool, ut0new_t, bool);
-
-static int n_construct = 0;
-
-class cc_t {
- public:
-  cc_t() {
-    n_construct++;
-    if (n_construct % 4 == 0) {
-      throw(1);
-    }
-  }
-};
-
-struct big_t {
-  char x[128];
-};
+static auto pfs_key = 12345;
 
 /* test edge cases */
 TEST(ut0new, edgecases) {
-  ut_allocator<byte> alloc1(mem_key_buf_buf_pool);
-  void *ret;
-  const void *null_ptr = nullptr;
-
-  ret = alloc1.allocate_large(0);
-  EXPECT_EQ(null_ptr, ret);
-
 #ifdef UNIV_PFS_MEMORY
-  ret = alloc1.allocate(16);
-  ASSERT_TRUE(ret != nullptr);
-
-  ret = alloc1.reallocate(ret, 0, UT_NEW_THIS_FILE_PSI_KEY);
-  EXPECT_EQ(null_ptr, ret);
-
-  ret = UT_NEW_ARRAY_NOKEY(byte, 0);
-  EXPECT_NE(null_ptr, ret);
-  UT_DELETE_ARRAY((byte *)ret);
+  auto ptr = ut::new_arr_withkey<byte>(UT_NEW_THIS_FILE_PSI_KEY, ut::Count{0});
+  EXPECT_NE(nullptr, ptr);
+  ut::delete_arr((byte *)ptr);
 #endif /* UNIV_PFS_MEMORY */
-
-  ut_allocator<big_t> alloc2(mem_key_buf_buf_pool);
-
-  const ut_allocator<big_t>::size_type too_many_elements =
-      std::numeric_limits<ut_allocator<big_t>::size_type>::max() /
-          sizeof(big_t) +
-      1;
-
-#ifdef UNIV_PFS_MEMORY
-  ret = alloc2.allocate(16);
-  ASSERT_TRUE(ret != nullptr);
-  void *ret2 =
-      alloc2.reallocate(ret, too_many_elements, UT_NEW_THIS_FILE_PSI_KEY);
-  EXPECT_EQ(null_ptr, ret2);
-  /* If reallocate fails due to too many elements,
-  memory is still allocated. Do explicit deallocate do avoid mem leak. */
-  alloc2.deallocate(static_cast<big_t *>(ret));
-#endif /* UNIV_PFS_MEMORY */
-
-  bool threw = false;
-  try {
-    ret = alloc2.allocate(too_many_elements);
-  } catch (...) {
-    threw = true;
-  }
-  EXPECT_TRUE(threw);
-
-  threw = false;
-  try {
-    ret = alloc2.allocate(too_many_elements, nullptr, PSI_NOT_INSTRUMENTED,
-                          false);
-  } catch (std::bad_array_new_length &e) {
-    threw = true;
-  }
-  EXPECT_TRUE(threw);
-
-  threw = false;
-  try {
-    cc_t *cc = UT_NEW_ARRAY_NOKEY(cc_t, 16);
-    /* Not reached, but silence a compiler warning
-    about unused 'cc': */
-    ASSERT_TRUE(cc != nullptr);
-  } catch (...) {
-    threw = true;
-  }
-  EXPECT_TRUE(threw);
 }
 
 struct Pod_type {
@@ -309,67 +72,1090 @@
 };
 
 template <typename T, bool With_pfs>
-struct Wrap_aligned_test_param {
+struct Ut0new_test_param_wrapper {
   using type = T;
   static constexpr bool with_pfs = With_pfs;
 };
 
 using all_fundamental_types = ::testing::Types<
     // with PFS
-    Wrap_aligned_test_param<char, true>,
-    Wrap_aligned_test_param<unsigned char, true>,
-    Wrap_aligned_test_param<wchar_t, true>,
-    Wrap_aligned_test_param<short int, true>,
-    Wrap_aligned_test_param<unsigned short int, true>,
-    Wrap_aligned_test_param<int, true>,
-    Wrap_aligned_test_param<unsigned int, true>,
-    Wrap_aligned_test_param<long int, true>,
-    Wrap_aligned_test_param<unsigned long int, true>,
-    Wrap_aligned_test_param<long long int, true>,
-    Wrap_aligned_test_param<unsigned long long int, true>,
-    Wrap_aligned_test_param<float, true>, Wrap_aligned_test_param<double, true>,
-    Wrap_aligned_test_param<long double, true>,
+    Ut0new_test_param_wrapper<char, true>,
+    Ut0new_test_param_wrapper<unsigned char, true>,
+    Ut0new_test_param_wrapper<wchar_t, true>,
+    Ut0new_test_param_wrapper<short int, true>,
+    Ut0new_test_param_wrapper<unsigned short int, true>,
+    Ut0new_test_param_wrapper<int, true>,
+    Ut0new_test_param_wrapper<unsigned int, true>,
+    Ut0new_test_param_wrapper<long int, true>,
+    Ut0new_test_param_wrapper<unsigned long int, true>,
+    Ut0new_test_param_wrapper<long long int, true>,
+    Ut0new_test_param_wrapper<unsigned long long int, true>,
+    Ut0new_test_param_wrapper<float, true>,
+    Ut0new_test_param_wrapper<double, true>,
+    Ut0new_test_param_wrapper<long double, true>,
     // no PFS
-    Wrap_aligned_test_param<char, false>,
-    Wrap_aligned_test_param<unsigned char, false>,
-    Wrap_aligned_test_param<wchar_t, false>,
-    Wrap_aligned_test_param<short int, false>,
-    Wrap_aligned_test_param<unsigned short int, false>,
-    Wrap_aligned_test_param<int, false>,
-    Wrap_aligned_test_param<unsigned int, false>,
-    Wrap_aligned_test_param<long int, false>,
-    Wrap_aligned_test_param<unsigned long int, false>,
-    Wrap_aligned_test_param<long long int, false>,
-    Wrap_aligned_test_param<unsigned long long int, false>,
-    Wrap_aligned_test_param<float, false>,
-    Wrap_aligned_test_param<double, false>,
-    Wrap_aligned_test_param<long double, false>>;
+    Ut0new_test_param_wrapper<char, false>,
+    Ut0new_test_param_wrapper<unsigned char, false>,
+    Ut0new_test_param_wrapper<wchar_t, false>,
+    Ut0new_test_param_wrapper<short int, false>,
+    Ut0new_test_param_wrapper<unsigned short int, false>,
+    Ut0new_test_param_wrapper<int, false>,
+    Ut0new_test_param_wrapper<unsigned int, false>,
+    Ut0new_test_param_wrapper<long int, false>,
+    Ut0new_test_param_wrapper<unsigned long int, false>,
+    Ut0new_test_param_wrapper<long long int, false>,
+    Ut0new_test_param_wrapper<unsigned long long int, false>,
+    Ut0new_test_param_wrapper<float, false>,
+    Ut0new_test_param_wrapper<double, false>,
+    Ut0new_test_param_wrapper<long double, false>>;
 
 using all_pod_types = ::testing::Types<
     // with PFS
-    Wrap_aligned_test_param<Pod_type, true>,
+    Ut0new_test_param_wrapper<Pod_type, true>,
     // no PFS
-    Wrap_aligned_test_param<Pod_type, false>>;
+    Ut0new_test_param_wrapper<Pod_type, false>>;
 
 using all_default_constructible_pod_types = ::testing::Types<
     // with PFS
-    Wrap_aligned_test_param<Default_constructible_pod, true>,
+    Ut0new_test_param_wrapper<Default_constructible_pod, true>,
     // no PFS
-    Wrap_aligned_test_param<Default_constructible_pod, false>>;
+    Ut0new_test_param_wrapper<Default_constructible_pod, false>>;
 
 using all_non_pod_types = ::testing::Types<
     // with PFS
-    Wrap_aligned_test_param<Non_pod_type, true>,
+    Ut0new_test_param_wrapper<Non_pod_type, true>,
     // no PFS
-    Wrap_aligned_test_param<Non_pod_type, false>>;
+    Ut0new_test_param_wrapper<Non_pod_type, false>>;
 
 using all_default_constructible_non_pod_types = ::testing::Types<
     // with PFS
-    Wrap_aligned_test_param<Default_constructible_non_pod, true>,
+    Ut0new_test_param_wrapper<Default_constructible_non_pod, true>,
     // no PFS
-    Wrap_aligned_test_param<Default_constructible_non_pod, false>>;
+    Ut0new_test_param_wrapper<Default_constructible_non_pod, false>>;
 
-static auto pfs_key = 12345;
+// malloc/free - fundamental types
+template <typename T>
+class ut0new_malloc_free_fundamental_types : public ::testing::Test {};
+TYPED_TEST_SUITE_P(ut0new_malloc_free_fundamental_types);
+TYPED_TEST_P(ut0new_malloc_free_fundamental_types, fundamental_types) {
+  using type = typename TypeParam::type;
+  auto with_pfs = TypeParam::with_pfs;
+  type *ptr = with_pfs ? static_cast<type *>(ut::malloc_withkey(
+                             ut::make_psi_memory_key(pfs_key), sizeof(type)))
+                       : static_cast<type *>(ut::malloc(sizeof(type)));
+  EXPECT_TRUE(reinterpret_cast<std::uintptr_t>(ptr) % alignof(max_align_t) ==
+              0);
+  ut::free(ptr);
+}
+REGISTER_TYPED_TEST_SUITE_P(ut0new_malloc_free_fundamental_types,
+                            fundamental_types);
+INSTANTIATE_TYPED_TEST_SUITE_P(FundamentalTypes,
+                               ut0new_malloc_free_fundamental_types,
+                               all_fundamental_types);
+
+// malloc/free - pod types
+template <typename T>
+class ut0new_malloc_free_pod_types : public ::testing::Test {};
+TYPED_TEST_SUITE_P(ut0new_malloc_free_pod_types);
+TYPED_TEST_P(ut0new_malloc_free_pod_types, pod_types) {
+  using type = typename TypeParam::type;
+  auto with_pfs = TypeParam::with_pfs;
+  type *ptr = with_pfs ? static_cast<type *>(ut::malloc_withkey(
+                             ut::make_psi_memory_key(pfs_key), sizeof(type)))
+                       : static_cast<type *>(ut::malloc(sizeof(type)));
+  EXPECT_TRUE(reinterpret_cast<std::uintptr_t>(ptr) % alignof(max_align_t) ==
+              0);
+  ut::free(ptr);
+}
+REGISTER_TYPED_TEST_SUITE_P(ut0new_malloc_free_pod_types, pod_types);
+INSTANTIATE_TYPED_TEST_SUITE_P(PodTypes, ut0new_malloc_free_pod_types,
+                               all_pod_types);
+
+// malloc/free - non-pod types
+template <typename T>
+class ut0new_malloc_free_non_pod_types : public ::testing::Test {};
+TYPED_TEST_SUITE_P(ut0new_malloc_free_non_pod_types);
+TYPED_TEST_P(ut0new_malloc_free_non_pod_types, non_pod_types) {
+  using type = typename TypeParam::type;
+  auto with_pfs = TypeParam::with_pfs;
+  type *ptr = with_pfs ? static_cast<type *>(ut::malloc_withkey(
+                             ut::make_psi_memory_key(pfs_key), sizeof(type)))
+                       : static_cast<type *>(ut::malloc(sizeof(type)));
+  EXPECT_TRUE(reinterpret_cast<std::uintptr_t>(ptr) % alignof(max_align_t) ==
+              0);
+  ut::free(ptr);
+}
+REGISTER_TYPED_TEST_SUITE_P(ut0new_malloc_free_non_pod_types, non_pod_types);
+INSTANTIATE_TYPED_TEST_SUITE_P(NonPodTypes, ut0new_malloc_free_non_pod_types,
+                               all_non_pod_types);
+
+// zalloc/free - fundamental types
+template <typename T>
+class ut0new_zalloc_free_fundamental_types : public ::testing::Test {};
+TYPED_TEST_SUITE_P(ut0new_zalloc_free_fundamental_types);
+TYPED_TEST_P(ut0new_zalloc_free_fundamental_types, fundamental_types) {
+  using type = typename TypeParam::type;
+  auto with_pfs = TypeParam::with_pfs;
+  type *ptr = with_pfs ? static_cast<type *>(ut::zalloc_withkey(
+                             ut::make_psi_memory_key(pfs_key), sizeof(type)))
+                       : static_cast<type *>(ut::zalloc(sizeof(type)));
+  EXPECT_TRUE(reinterpret_cast<std::uintptr_t>(ptr) % alignof(max_align_t) ==
+              0);
+  EXPECT_EQ(*ptr, 0);
+  ut::free(ptr);
+}
+REGISTER_TYPED_TEST_SUITE_P(ut0new_zalloc_free_fundamental_types,
+                            fundamental_types);
+INSTANTIATE_TYPED_TEST_SUITE_P(FundamentalTypes,
+                               ut0new_zalloc_free_fundamental_types,
+                               all_fundamental_types);
+
+// realloc - fundamental types
+template <typename T>
+class ut0new_realloc_fundamental_types : public ::testing::Test {};
+TYPED_TEST_SUITE_P(ut0new_realloc_fundamental_types);
+TYPED_TEST_P(ut0new_realloc_fundamental_types, fundamental_types) {
+  using T = typename TypeParam::type;
+  auto with_pfs = TypeParam::with_pfs;
+  {
+    // Allocating through realloc and release through free should work fine
+    auto p = with_pfs
+                 ? static_cast<T *>(ut::realloc_withkey(
+                       ut::make_psi_memory_key(pfs_key), nullptr, sizeof(T)))
+                 : static_cast<T *>(ut::realloc(nullptr, sizeof(T)));
+    EXPECT_TRUE(reinterpret_cast<std::uintptr_t>(p) % alignof(max_align_t) ==
+                0);
+    ut::free(p);
+  }
+
+  {
+    // Allocating through realloc and release through realloc should work fine
+    auto p = with_pfs
+                 ? static_cast<T *>(ut::realloc_withkey(
+                       ut::make_psi_memory_key(pfs_key), nullptr, sizeof(T)))
+                 : static_cast<T *>(ut::realloc(nullptr, sizeof(T)));
+    EXPECT_TRUE(reinterpret_cast<std::uintptr_t>(p) % alignof(max_align_t) ==
+                0);
+    ut::realloc(p, 0);
+  }
+
+  {
+    // Allocating through malloc and then upsizing the memory region through
+    // realloc should work fine
+    auto p = with_pfs ? static_cast<T *>(ut::malloc_withkey(
+                            ut::make_psi_memory_key(pfs_key), sizeof(T)))
+                      : static_cast<T *>(ut::malloc(sizeof(T)));
+    EXPECT_TRUE(reinterpret_cast<std::uintptr_t>(p) % alignof(max_align_t) ==
+                0);
+
+    // Let's write something into the memory so we can afterwards check if
+    // ut::realloc_* is handling the copying/moving the element(s) properly
+    *p = 0xA;
+
+    // Enlarge to 10x through realloc
+    p = with_pfs ? static_cast<T *>(ut::realloc_withkey(
+                       ut::make_psi_memory_key(pfs_key), p, 10 * sizeof(T)))
+                 : static_cast<T *>(ut::realloc(p, 10 * sizeof(T)));
+    EXPECT_TRUE(reinterpret_cast<std::uintptr_t>(p) % alignof(max_align_t) ==
+                0);
+
+    // Make sure that the contents of memory are untouched after reallocation
+    EXPECT_EQ(p[0], 0xA);
+
+    // Write some more stuff to the memory
+    for (size_t i = 1; i < 10; i++) p[i] = 0xB;
+
+    // Enlarge to 100x through realloc
+    p = with_pfs ? static_cast<T *>(ut::realloc_withkey(
+                       ut::make_psi_memory_key(pfs_key), p, 100 * sizeof(T)))
+                 : static_cast<T *>(ut::realloc(p, 100 * sizeof(T)));
+    EXPECT_TRUE(reinterpret_cast<std::uintptr_t>(p) % alignof(max_align_t) ==
+                0);
+
+    // Make sure that the contents of memory are untouched after reallocation
+    EXPECT_EQ(p[0], 0xA);
+    for (size_t i = 1; i < 10; i++) EXPECT_EQ(p[i], 0xB);
+
+    // Write some more stuff to the memory
+    for (size_t i = 10; i < 100; i++) p[i] = 0xC;
+
+    // Enlarge to 1000x through realloc
+    p = with_pfs ? static_cast<T *>(ut::realloc_withkey(
+                       ut::make_psi_memory_key(pfs_key), p, 1000 * sizeof(T)))
+                 : static_cast<T *>(ut::realloc(p, 1000 * sizeof(T)));
+    EXPECT_TRUE(reinterpret_cast<std::uintptr_t>(p) % alignof(max_align_t) ==
+                0);
+
+    // Make sure that the contents of memory are untouched after reallocation
+    EXPECT_EQ(p[0], 0xA);
+    for (size_t i = 1; i < 10; i++) EXPECT_EQ(p[i], 0xB);
+    for (size_t i = 10; i < 100; i++) EXPECT_EQ(p[i], 0xC);
+
+    ut::free(p);
+  }
+
+  {
+    // Allocating through malloc and then downsizing the memory region through
+    // realloc should also work fine
+    auto p = with_pfs ? static_cast<T *>(ut::malloc_withkey(
+                            ut::make_psi_memory_key(pfs_key), 10 * sizeof(T)))
+                      : static_cast<T *>(ut::malloc(10 * sizeof(T)));
+    EXPECT_TRUE(reinterpret_cast<std::uintptr_t>(p) % alignof(max_align_t) ==
+                0);
+
+    // Write some stuff to the memory
+    for (size_t i = 0; i < 10; i++) p[i] = 0xA;
+
+    // Downsize the array to only half of the elements
+    p = with_pfs ? static_cast<T *>(ut::realloc_withkey(
+                       ut::make_psi_memory_key(pfs_key), p, 5 * sizeof(T)))
+                 : static_cast<T *>(ut::realloc(p, 5 * sizeof(T)));
+    EXPECT_TRUE(reinterpret_cast<std::uintptr_t>(p) % alignof(max_align_t) ==
+                0);
+
+    // Make sure that the respective contents of memory (only half of the
+    // elements) are untouched after reallocation
+    for (size_t i = 0; i < 5; i++) EXPECT_EQ(p[i], 0xA);
+
+    ut::free(p);
+  }
+}
+REGISTER_TYPED_TEST_SUITE_P(ut0new_realloc_fundamental_types,
+                            fundamental_types);
+INSTANTIATE_TYPED_TEST_SUITE_P(FundamentalTypes,
+                               ut0new_realloc_fundamental_types,
+                               all_fundamental_types);
+
+// new/delete - fundamental types
+template <typename T>
+class ut0new_new_delete_fundamental_types : public ::testing::Test {};
+TYPED_TEST_SUITE_P(ut0new_new_delete_fundamental_types);
+TYPED_TEST_P(ut0new_new_delete_fundamental_types, fundamental_types) {
+  using type = typename TypeParam::type;
+  auto with_pfs = TypeParam::with_pfs;
+  type *ptr = with_pfs
+                  ? ut::new_withkey<type>(ut::make_psi_memory_key(pfs_key), 1)
+                  : ut::new_<type>(1);
+  EXPECT_TRUE(reinterpret_cast<std::uintptr_t>(ptr) % alignof(max_align_t) ==
+              0);
+  EXPECT_EQ(*ptr, 1);
+  ut::delete_(ptr);
+}
+REGISTER_TYPED_TEST_SUITE_P(ut0new_new_delete_fundamental_types,
+                            fundamental_types);
+INSTANTIATE_TYPED_TEST_SUITE_P(My, ut0new_new_delete_fundamental_types,
+                               all_fundamental_types);
+
+// new/delete - pod types
+template <typename T>
+class ut0new_new_delete_pod_types : public ::testing::Test {};
+TYPED_TEST_SUITE_P(ut0new_new_delete_pod_types);
+TYPED_TEST_P(ut0new_new_delete_pod_types, pod_types) {
+  using type = typename TypeParam::type;
+  auto with_pfs = TypeParam::with_pfs;
+
+  type *ptr =
+      with_pfs ? ut::new_withkey<type>(ut::make_psi_memory_key(pfs_key), 2, 5)
+               : ut::new_<type>(2, 5);
+  EXPECT_TRUE(reinterpret_cast<std::uintptr_t>(ptr) % alignof(max_align_t) ==
+              0);
+  EXPECT_EQ(ptr->x, 2);
+  EXPECT_EQ(ptr->y, 5);
+  ut::delete_(ptr);
+}
+REGISTER_TYPED_TEST_SUITE_P(ut0new_new_delete_pod_types, pod_types);
+INSTANTIATE_TYPED_TEST_SUITE_P(My, ut0new_new_delete_pod_types, all_pod_types);
+
+// new/delete - non-pod types
+template <typename T>
+class ut0new_new_delete_non_pod_types : public ::testing::Test {};
+TYPED_TEST_SUITE_P(ut0new_new_delete_non_pod_types);
+TYPED_TEST_P(ut0new_new_delete_non_pod_types, non_pod_types) {
+  using type = typename TypeParam::type;
+  auto with_pfs = TypeParam::with_pfs;
+  type *ptr = with_pfs ? ut::new_withkey<type>(ut::make_psi_memory_key(pfs_key),
+                                               2, 5, std::string("non-pod"))
+                       : ut::new_<type>(2, 5, std::string("non-pod"));
+  EXPECT_TRUE(reinterpret_cast<std::uintptr_t>(ptr) % alignof(max_align_t) ==
+              0);
+  EXPECT_EQ(ptr->x, 2);
+  EXPECT_EQ(ptr->y, 5);
+  EXPECT_EQ(ptr->sum->result, 7);
+  EXPECT_EQ(ptr->s, std::string("non-pod"));
+  ut::delete_(ptr);
+}
+REGISTER_TYPED_TEST_SUITE_P(ut0new_new_delete_non_pod_types, non_pod_types);
+INSTANTIATE_TYPED_TEST_SUITE_P(My, ut0new_new_delete_non_pod_types,
+                               all_non_pod_types);
+
+// new/delete - array specialization for fundamental types
+template <typename T>
+class ut0new_new_delete_fundamental_types_arr : public ::testing::Test {};
+TYPED_TEST_SUITE_P(ut0new_new_delete_fundamental_types_arr);
+TYPED_TEST_P(ut0new_new_delete_fundamental_types_arr, fundamental_types) {
+  using type = typename TypeParam::type;
+  auto with_pfs = TypeParam::with_pfs;
+  type *ptr =
+      with_pfs
+          ? ut::new_arr_withkey<type>(
+                ut::make_psi_memory_key(pfs_key),
+                std::forward_as_tuple((type)0), std::forward_as_tuple((type)1),
+                std::forward_as_tuple((type)2), std::forward_as_tuple((type)3),
+                std::forward_as_tuple((type)4), std::forward_as_tuple((type)5),
+                std::forward_as_tuple((type)6), std::forward_as_tuple((type)7),
+                std::forward_as_tuple((type)8), std::forward_as_tuple((type)9))
+          : ut::new_arr<type>(
+                std::forward_as_tuple((type)0), std::forward_as_tuple((type)1),
+                std::forward_as_tuple((type)2), std::forward_as_tuple((type)3),
+                std::forward_as_tuple((type)4), std::forward_as_tuple((type)5),
+                std::forward_as_tuple((type)6), std::forward_as_tuple((type)7),
+                std::forward_as_tuple((type)8), std::forward_as_tuple((type)9));
+
+  EXPECT_TRUE(reinterpret_cast<std::uintptr_t>(ptr) % alignof(max_align_t) ==
+              0);
+
+  for (size_t elem = 0; elem < 10; elem++) {
+    EXPECT_EQ(ptr[elem], elem);
+  }
+  ut::delete_arr(ptr);
+}
+REGISTER_TYPED_TEST_SUITE_P(ut0new_new_delete_fundamental_types_arr,
+                            fundamental_types);
+INSTANTIATE_TYPED_TEST_SUITE_P(My, ut0new_new_delete_fundamental_types_arr,
+                               all_fundamental_types);
+
+// new/delete - array specialization for pod types
+template <typename T>
+class ut0new_new_delete_pod_types_arr : public ::testing::Test {};
+TYPED_TEST_SUITE_P(ut0new_new_delete_pod_types_arr);
+TYPED_TEST_P(ut0new_new_delete_pod_types_arr, pod_types) {
+  using type = typename TypeParam::type;
+  auto with_pfs = TypeParam::with_pfs;
+  type *ptr =
+      with_pfs
+          ? ut::new_arr_withkey<type>(
+                ut::make_psi_memory_key(pfs_key), std::forward_as_tuple(0, 1),
+                std::forward_as_tuple(2, 3), std::forward_as_tuple(4, 5),
+                std::forward_as_tuple(6, 7), std::forward_as_tuple(8, 9))
+          : ut::new_arr<type>(
+                std::forward_as_tuple(0, 1), std::forward_as_tuple(2, 3),
+                std::forward_as_tuple(4, 5), std::forward_as_tuple(6, 7),
+                std::forward_as_tuple(8, 9));
+
+  EXPECT_TRUE(reinterpret_cast<std::uintptr_t>(ptr) % alignof(max_align_t) ==
+              0);
+
+  for (size_t elem = 0; elem < 5; elem++) {
+    EXPECT_EQ(ptr[elem].x, 2 * elem);
+    EXPECT_EQ(ptr[elem].y, 2 * elem + 1);
+  }
+  ut::delete_arr(ptr);
+}
+REGISTER_TYPED_TEST_SUITE_P(ut0new_new_delete_pod_types_arr, pod_types);
+INSTANTIATE_TYPED_TEST_SUITE_P(My, ut0new_new_delete_pod_types_arr,
+                               all_pod_types);
+
+// new/delete - array specialization for non-pod types
+template <typename T>
+class ut0new_new_delete_non_pod_types_arr : public ::testing::Test {};
+TYPED_TEST_SUITE_P(ut0new_new_delete_non_pod_types_arr);
+TYPED_TEST_P(ut0new_new_delete_non_pod_types_arr, non_pod_types) {
+  using type = typename TypeParam::type;
+  auto with_pfs = TypeParam::with_pfs;
+  type *ptr = with_pfs ? ut::new_arr_withkey<type>(
+                             ut::make_psi_memory_key(pfs_key),
+                             std::forward_as_tuple(1, 2, std::string("a")),
+                             std::forward_as_tuple(3, 4, std::string("b")),
+                             std::forward_as_tuple(5, 6, std::string("c")),
+                             std::forward_as_tuple(7, 8, std::string("d")),
+                             std::forward_as_tuple(9, 10, std::string("e")))
+                       : ut::new_arr<type>(
+                             std::forward_as_tuple(1, 2, std::string("a")),
+                             std::forward_as_tuple(3, 4, std::string("b")),
+                             std::forward_as_tuple(5, 6, std::string("c")),
+                             std::forward_as_tuple(7, 8, std::string("d")),
+                             std::forward_as_tuple(9, 10, std::string("e")));
+
+  EXPECT_TRUE(reinterpret_cast<std::uintptr_t>(ptr) % alignof(max_align_t) ==
+              0);
+
+  EXPECT_EQ(ptr[0].x, 1);
+  EXPECT_EQ(ptr[0].y, 2);
+  EXPECT_TRUE(ptr[0].s == std::string("a"));
+  EXPECT_EQ(ptr[0].sum->result, 3);
+
+  EXPECT_EQ(ptr[1].x, 3);
+  EXPECT_EQ(ptr[1].y, 4);
+  EXPECT_TRUE(ptr[1].s == std::string("b"));
+  EXPECT_EQ(ptr[1].sum->result, 7);
+
+  EXPECT_EQ(ptr[2].x, 5);
+  EXPECT_EQ(ptr[2].y, 6);
+  EXPECT_TRUE(ptr[2].s == std::string("c"));
+  EXPECT_EQ(ptr[2].sum->result, 11);
+
+  EXPECT_EQ(ptr[3].x, 7);
+  EXPECT_EQ(ptr[3].y, 8);
+  EXPECT_TRUE(ptr[3].s == std::string("d"));
+  EXPECT_EQ(ptr[3].sum->result, 15);
+
+  EXPECT_EQ(ptr[4].x, 9);
+  EXPECT_EQ(ptr[4].y, 10);
+  EXPECT_TRUE(ptr[4].s == std::string("e"));
+  EXPECT_EQ(ptr[4].sum->result, 19);
+
+  ut::delete_arr(ptr);
+}
+REGISTER_TYPED_TEST_SUITE_P(ut0new_new_delete_non_pod_types_arr, non_pod_types);
+INSTANTIATE_TYPED_TEST_SUITE_P(My, ut0new_new_delete_non_pod_types_arr,
+                               all_non_pod_types);
+
+// new/delete - array specialization for default constructible
+// fundamental types
+template <typename T>
+class ut0new_new_delete_default_constructible_fundamental_types_arr
+    : public ::testing::Test {};
+TYPED_TEST_SUITE_P(
+    ut0new_new_delete_default_constructible_fundamental_types_arr);
+TYPED_TEST_P(ut0new_new_delete_default_constructible_fundamental_types_arr,
+             fundamental_types) {
+  using type = typename TypeParam::type;
+  auto with_pfs = TypeParam::with_pfs;
+  constexpr size_t n_elements = 5;
+  type *ptr = with_pfs
+                  ? ut::new_arr_withkey<type>(ut::make_psi_memory_key(pfs_key),
+                                              ut::Count{n_elements})
+                  : ut::new_arr<type>(ut::Count{n_elements});
+
+  EXPECT_TRUE(reinterpret_cast<std::uintptr_t>(ptr) % alignof(max_align_t) ==
+              0);
+
+  for (size_t elem = 0; elem < n_elements; elem++) {
+    EXPECT_EQ(ptr[elem], type{});
+  }
+  ut::delete_arr(ptr);
+}
+REGISTER_TYPED_TEST_SUITE_P(
+    ut0new_new_delete_default_constructible_fundamental_types_arr,
+    fundamental_types);
+INSTANTIATE_TYPED_TEST_SUITE_P(
+    My, ut0new_new_delete_default_constructible_fundamental_types_arr,
+    all_fundamental_types);
+
+// new/delete - array specialization for default constructible pod types
+template <typename T>
+class ut0new_new_delete_default_constructible_pod_types_arr
+    : public ::testing::Test {};
+TYPED_TEST_SUITE_P(ut0new_new_delete_default_constructible_pod_types_arr);
+TYPED_TEST_P(ut0new_new_delete_default_constructible_pod_types_arr, pod_types) {
+  using type = typename TypeParam::type;
+  auto with_pfs = TypeParam::with_pfs;
+  constexpr size_t n_elements = 5;
+  type *ptr = with_pfs
+                  ? ut::new_arr_withkey<type>(ut::make_psi_memory_key(pfs_key),
+                                              ut::Count{n_elements})
+                  : ut::new_arr<type>(ut::Count{n_elements});
+
+  EXPECT_TRUE(reinterpret_cast<std::uintptr_t>(ptr) % alignof(max_align_t) ==
+              0);
+
+  for (size_t elem = 0; elem < n_elements; elem++) {
+    EXPECT_EQ(ptr[elem].x, 0);
+    EXPECT_EQ(ptr[elem].y, 1);
+  }
+  ut::delete_arr(ptr);
+}
+REGISTER_TYPED_TEST_SUITE_P(
+    ut0new_new_delete_default_constructible_pod_types_arr, pod_types);
+INSTANTIATE_TYPED_TEST_SUITE_P(
+    My, ut0new_new_delete_default_constructible_pod_types_arr,
+    all_default_constructible_pod_types);
+
+// new/delete - array specialization for default constructible non-pod
+// types
+template <typename T>
+class ut0new_new_delete_default_constructible_non_pod_types_arr
+    : public ::testing::Test {};
+TYPED_TEST_SUITE_P(ut0new_new_delete_default_constructible_non_pod_types_arr);
+TYPED_TEST_P(ut0new_new_delete_default_constructible_non_pod_types_arr,
+             pod_types) {
+  using type = typename TypeParam::type;
+  auto with_pfs = TypeParam::with_pfs;
+  constexpr size_t n_elements = 5;
+  type *ptr = with_pfs
+                  ? ut::new_arr_withkey<type>(ut::make_psi_memory_key(pfs_key),
+                                              ut::Count{n_elements})
+                  : ut::new_arr<type>(ut::Count{n_elements});
+
+  EXPECT_TRUE(reinterpret_cast<std::uintptr_t>(ptr) % alignof(max_align_t) ==
+              0);
+
+  for (size_t elem = 0; elem < n_elements; elem++) {
+    EXPECT_EQ(ptr[elem].x, 0);
+    EXPECT_EQ(ptr[elem].y, 1);
+    EXPECT_TRUE(ptr[elem].s == std::string("non-pod-string"));
+  }
+  ut::delete_arr(ptr);
+}
+REGISTER_TYPED_TEST_SUITE_P(
+    ut0new_new_delete_default_constructible_non_pod_types_arr, pod_types);
+INSTANTIATE_TYPED_TEST_SUITE_P(
+    My, ut0new_new_delete_default_constructible_non_pod_types_arr,
+    all_default_constructible_non_pod_types);
+
+TEST(ut0new_new_delete, unique_ptr_demo) {
+  struct Int_deleter {
+    void operator()(int *p) {
+      std::cout << "Hello from custom deleter!\n";
+      ut::delete_(p);
+    }
+  };
+  std::unique_ptr<int, Int_deleter> ptr(ut::new_<int>(1), Int_deleter{});
+}
+
+TEST(ut0new_new_delete_arr, unique_ptr_demo) {
+  struct Int_arr_deleter {
+    void operator()(int *p) {
+      std::cout << "Hello from custom deleter!\n";
+      ut::delete_arr(p);
+    }
+  };
+  std::unique_ptr<int, Int_arr_deleter> ptr(
+      ut::new_arr<int>(std::forward_as_tuple(1), std::forward_as_tuple(2),
+                       std::forward_as_tuple(3), std::forward_as_tuple(4),
+                       std::forward_as_tuple(5)),
+      Int_arr_deleter{});
+}
+
+TEST(ut0new_new_delete_arr, demo_with_non_default_constructible_types) {
+  auto ptr = ut::new_arr_withkey<Pod_type>(
+      ut::make_psi_memory_key(pfs_key), std::forward_as_tuple(1, 2),
+      std::forward_as_tuple(3, 4), std::forward_as_tuple(5, 6),
+      std::forward_as_tuple(7, 8), std::forward_as_tuple(9, 10));
+
+  EXPECT_EQ(ptr[0].x, 1);
+  EXPECT_EQ(ptr[0].y, 2);
+  EXPECT_EQ(ptr[1].x, 3);
+  EXPECT_EQ(ptr[1].y, 4);
+  EXPECT_EQ(ptr[2].x, 5);
+  EXPECT_EQ(ptr[2].y, 6);
+  EXPECT_EQ(ptr[3].x, 7);
+  EXPECT_EQ(ptr[3].y, 8);
+  EXPECT_EQ(ptr[4].x, 9);
+  EXPECT_EQ(ptr[4].y, 10);
+
+  ut::delete_arr(ptr);
+}
+
+TEST(ut0new_new_delete_arr,
+     demo_with_explicit_N_default_constructible_instances) {
+  constexpr auto n_elements = 5;
+  auto ptr = ut::new_arr_withkey<Default_constructible_pod>(
+      ut::make_psi_memory_key(pfs_key), std::forward_as_tuple(),
+      std::forward_as_tuple(), std::forward_as_tuple(), std::forward_as_tuple(),
+      std::forward_as_tuple());
+
+  for (size_t elem = 0; elem < n_elements; elem++) {
+    EXPECT_EQ(ptr[elem].x, 0);
+    EXPECT_EQ(ptr[elem].y, 1);
+  }
+  ut::delete_arr(ptr);
+}
+
+TEST(ut0new_new_delete_arr,
+     demo_with_N_default_constructible_instances_through_ut_count) {
+  constexpr auto n_elements = 5;
+  auto ptr = ut::new_arr_withkey<Default_constructible_pod>(
+      ut::make_psi_memory_key(pfs_key), ut::Count(n_elements));
+
+  for (size_t elem = 0; elem < n_elements; elem++) {
+    EXPECT_EQ(ptr[elem].x, 0);
+    EXPECT_EQ(ptr[elem].y, 1);
+  }
+  ut::delete_arr(ptr);
+}
+
+TEST(
+    ut0new_new_delete_arr,
+    demo_with_type_that_is_both_default_constructible_and_constructible_through_user_provided_ctr) {
+  struct Type {
+    Type() : x(10), y(15) {}
+    Type(int _x, int _y) : x(_x), y(_y) {}
+    int x, y;
+  };
+
+  auto ptr = ut::new_arr_withkey<Type>(
+      ut::make_psi_memory_key(pfs_key), std::forward_as_tuple(1, 2),
+      std::forward_as_tuple(), std::forward_as_tuple(3, 4),
+      std::forward_as_tuple(5, 6), std::forward_as_tuple());
+
+  EXPECT_EQ(ptr[0].x, 1);
+  EXPECT_EQ(ptr[0].y, 2);
+  EXPECT_EQ(ptr[1].x, 10);
+  EXPECT_EQ(ptr[1].y, 15);
+  EXPECT_EQ(ptr[2].x, 3);
+  EXPECT_EQ(ptr[2].y, 4);
+  EXPECT_EQ(ptr[3].x, 5);
+  EXPECT_EQ(ptr[3].y, 6);
+  EXPECT_EQ(ptr[4].x, 10);
+  EXPECT_EQ(ptr[4].y, 15);
+
+  ut::delete_arr(ptr);
+}
+
+TEST(
+    ut0new_new_delete_arr,
+    destructors_of_successfully_instantiated_trivially_constructible_elements_are_invoked_when_one_of_the_element_constructors_throws) {
+  static int n_constructors = 0;
+  static int n_destructors = 0;
+
+  struct Type_that_may_throw {
+    Type_that_may_throw() {
+      n_constructors++;
+      if (n_constructors % 4 == 0) {
+        throw std::runtime_error("cannot construct");
+      }
+    }
+    ~Type_that_may_throw() { ++n_destructors; }
+  };
+
+  bool exception_thrown_and_caught = false;
+  try {
+    auto ptr = ut::new_arr_withkey<Type_that_may_throw>(
+        ut::make_psi_memory_key(pfs_key), ut::Count(7));
+    ASSERT_FALSE(ptr);
+  } catch (std::runtime_error &) {
+    exception_thrown_and_caught = true;
+  }
+  EXPECT_TRUE(exception_thrown_and_caught);
+  EXPECT_EQ(n_constructors, 4);
+  EXPECT_EQ(n_destructors, 3);
+}
+
+TEST(
+    ut0new_new_delete_arr,
+    destructors_of_successfully_instantiated_non_trivially_constructible_elements_are_invoked_when_one_of_the_element_constructors_throws) {
+  static int n_constructors = 0;
+  static int n_destructors = 0;
+
+  struct Type_that_may_throw {
+    Type_that_may_throw(int x, int y) : _x(x), _y(y) {
+      n_constructors++;
+      if (n_constructors % 4 == 0) {
+        throw std::runtime_error("cannot construct");
+      }
+    }
+    ~Type_that_may_throw() { ++n_destructors; }
+    int _x, _y;
+  };
+
+  bool exception_thrown_and_caught = false;
+  try {
+    auto ptr = ut::new_arr_withkey<Type_that_may_throw>(
+        ut::make_psi_memory_key(pfs_key), std::forward_as_tuple(0, 1),
+        std::forward_as_tuple(2, 3), std::forward_as_tuple(4, 5),
+        std::forward_as_tuple(6, 7), std::forward_as_tuple(8, 9));
+    ASSERT_FALSE(ptr);
+  } catch (std::runtime_error &) {
+    exception_thrown_and_caught = true;
+  }
+  EXPECT_TRUE(exception_thrown_and_caught);
+  EXPECT_EQ(n_constructors, 4);
+  EXPECT_EQ(n_destructors, 3);
+}
+
+TEST(
+    ut0new_new_delete_arr,
+    no_destructors_are_invoked_when_first_trivially_constructible_element_constructor_throws) {
+  static int n_constructors = 0;
+  static int n_destructors = 0;
+
+  struct Type_that_always_throws {
+    Type_that_always_throws() {
+      n_constructors++;
+      throw std::runtime_error("cannot construct");
+    }
+    ~Type_that_always_throws() { ++n_destructors; }
+  };
+
+  bool exception_thrown_and_caught = false;
+  try {
+    auto ptr = ut::new_arr_withkey<Type_that_always_throws>(
+        ut::make_psi_memory_key(pfs_key), ut::Count(7));
+    ASSERT_FALSE(ptr);
+  } catch (std::runtime_error &) {
+    exception_thrown_and_caught = true;
+  }
+  EXPECT_TRUE(exception_thrown_and_caught);
+  EXPECT_EQ(n_constructors, 1);
+  EXPECT_EQ(n_destructors, 0);
+}
+
+TEST(
+    ut0new_new_delete_arr,
+    no_destructors_are_invoked_when_first_non_trivially_constructible_element_constructor_throws) {
+  static int n_constructors = 0;
+  static int n_destructors = 0;
+
+  struct Type_that_always_throws {
+    Type_that_always_throws(int x, int y) : _x(x), _y(y) {
+      n_constructors++;
+      throw std::runtime_error("cannot construct");
+    }
+    ~Type_that_always_throws() { ++n_destructors; }
+    int _x, _y;
+  };
+
+  bool exception_thrown_and_caught = false;
+  try {
+    auto ptr = ut::new_arr_withkey<Type_that_always_throws>(
+        ut::make_psi_memory_key(pfs_key), std::forward_as_tuple(0, 1),
+        std::forward_as_tuple(2, 3), std::forward_as_tuple(4, 5),
+        std::forward_as_tuple(6, 7), std::forward_as_tuple(8, 9));
+    ASSERT_FALSE(ptr);
+  } catch (std::runtime_error &) {
+    exception_thrown_and_caught = true;
+  }
+  EXPECT_TRUE(exception_thrown_and_caught);
+  EXPECT_EQ(n_constructors, 1);
+  EXPECT_EQ(n_destructors, 0);
+}
+
+TEST(ut0new_new_delete,
+     no_destructor_is_invoked_when_no_object_is_successfully_constructed) {
+  static int n_constructors = 0;
+  static int n_destructors = 0;
+
+  struct Type_that_always_throws {
+    Type_that_always_throws() {
+      n_constructors++;
+      throw std::runtime_error("cannot construct");
+    }
+    ~Type_that_always_throws() { ++n_destructors; }
+  };
+
+  bool exception_thrown_and_caught = false;
+  try {
+    auto ptr = ut::new_withkey<Type_that_always_throws>(
+        ut::make_psi_memory_key(pfs_key));
+    ASSERT_FALSE(ptr);
+  } catch (std::runtime_error &) {
+    exception_thrown_and_caught = true;
+  }
+  EXPECT_TRUE(exception_thrown_and_caught);
+  EXPECT_EQ(n_constructors, 1);
+  EXPECT_EQ(n_destructors, 0);
+}
+
+TEST(ut0new_new_delete, zero_sized_allocation_returns_valid_ptr) {
+  auto ptr = ut::new_<byte>(0);
+  EXPECT_NE(ptr, nullptr);
+  ut::delete_(ptr);
+}
+
+TEST(ut0new_new_delete_arr, zero_sized_allocation_returns_valid_ptr) {
+  auto ptr = ut::new_arr<byte>(ut::Count{0});
+  EXPECT_NE(ptr, nullptr);
+  ut::delete_arr(ptr);
+}
+
+TEST(ut0new_new_delete_arr,
+     reference_types_are_automagically_handled_through_forward_as_tuple) {
+  struct My_ref {
+    My_ref(int &ref) : _ref(ref) {}
+    int &_ref;
+  };
+
+  int y = 10;
+  int x = 20;
+  auto ptr = ut::new_arr_withkey<My_ref>(ut::make_psi_memory_key(pfs_key),
+                                         std::forward_as_tuple(x),
+                                         std::forward_as_tuple(y));
+  EXPECT_EQ(ptr[0]._ref, x);
+  EXPECT_EQ(ptr[1]._ref, y);
+  x = 30;
+  y = 40;
+  EXPECT_EQ(ptr[0]._ref, x);
+  EXPECT_EQ(ptr[1]._ref, y);
+
+  ut::delete_arr(ptr);
+}
+
+TEST(ut0new_new_delete_arr,
+     reference_types_are_automagically_handled_through_make_tuple_and_ref) {
+  struct My_ref {
+    My_ref(int &ref) : _ref(ref) {}
+    int &_ref;
+  };
+
+  int y = 10;
+  int x = 20;
+  auto ptr = ut::new_arr_withkey<My_ref>(ut::make_psi_memory_key(pfs_key),
+                                         std::make_tuple(std::ref(x)),
+                                         std::make_tuple(std::ref(y)));
+  EXPECT_EQ(ptr[0]._ref, x);
+  EXPECT_EQ(ptr[1]._ref, y);
+  x = 30;
+  y = 40;
+  EXPECT_EQ(ptr[0]._ref, x);
+  EXPECT_EQ(ptr[1]._ref, y);
+
+  ut::delete_arr(ptr);
+}
+
+TEST(ut0new_new_delete_arr, proper_overload_resolution_is_selected) {
+  auto ptr = ut::new_arr_withkey<Pod_type>(ut::make_psi_memory_key(pfs_key),
+                                           std::forward_as_tuple(1, 2));
+  EXPECT_EQ(ptr[0].x, 1);
+  EXPECT_EQ(ptr[0].y, 2);
+  ut::delete_arr(ptr);
+}
+
+// Page-aligned alloc/free - fundamental types
+template <typename T>
+class ut0new_page_malloc_free_fundamental_types : public ::testing::Test {};
+TYPED_TEST_SUITE_P(ut0new_page_malloc_free_fundamental_types);
+TYPED_TEST_P(ut0new_page_malloc_free_fundamental_types, fundamental_types) {
+  using type = typename TypeParam::type;
+  auto with_pfs = TypeParam::with_pfs;
+  type *ptr = with_pfs ? static_cast<type *>(ut::malloc_page_withkey(
+                             ut::make_psi_memory_key(pfs_key), sizeof(type)))
+                       : static_cast<type *>(ut::malloc_page(sizeof(type)));
+  EXPECT_TRUE(reinterpret_cast<std::uintptr_t>(ptr) % alignof(max_align_t) ==
+              0);
+  EXPECT_GE(ut::page_allocation_size(ptr), sizeof(type));
+  ut::free_page(ptr);
+}
+REGISTER_TYPED_TEST_SUITE_P(ut0new_page_malloc_free_fundamental_types,
+                            fundamental_types);
+INSTANTIATE_TYPED_TEST_SUITE_P(FundamentalTypes,
+                               ut0new_page_malloc_free_fundamental_types,
+                               all_fundamental_types);
+
+// Page-aligned alloc/free - pod types
+template <typename T>
+class ut0new_page_malloc_free_pod_types : public ::testing::Test {};
+TYPED_TEST_SUITE_P(ut0new_page_malloc_free_pod_types);
+TYPED_TEST_P(ut0new_page_malloc_free_pod_types, pod_types) {
+  using type = typename TypeParam::type;
+  auto with_pfs = TypeParam::with_pfs;
+  type *ptr = with_pfs ? static_cast<type *>(ut::malloc_page_withkey(
+                             ut::make_psi_memory_key(pfs_key), sizeof(type)))
+                       : static_cast<type *>(ut::malloc_page(sizeof(type)));
+  EXPECT_TRUE(reinterpret_cast<std::uintptr_t>(ptr) % alignof(max_align_t) ==
+              0);
+  EXPECT_GE(ut::page_allocation_size(ptr), sizeof(type));
+  ut::free_page(ptr);
+}
+REGISTER_TYPED_TEST_SUITE_P(ut0new_page_malloc_free_pod_types, pod_types);
+INSTANTIATE_TYPED_TEST_SUITE_P(PodTypes, ut0new_page_malloc_free_pod_types,
+                               all_pod_types);
+
+// Page-aligned alloc/free - non-pod types
+template <typename T>
+class ut0new_page_malloc_free_non_pod_types : public ::testing::Test {};
+TYPED_TEST_SUITE_P(ut0new_page_malloc_free_non_pod_types);
+TYPED_TEST_P(ut0new_page_malloc_free_non_pod_types, non_pod_types) {
+  using type = typename TypeParam::type;
+  auto with_pfs = TypeParam::with_pfs;
+  type *ptr = with_pfs ? static_cast<type *>(ut::malloc_page_withkey(
+                             ut::make_psi_memory_key(pfs_key), sizeof(type)))
+                       : static_cast<type *>(ut::malloc_page(sizeof(type)));
+  EXPECT_TRUE(reinterpret_cast<std::uintptr_t>(ptr) % alignof(max_align_t) ==
+              0);
+  EXPECT_GE(ut::page_allocation_size(ptr), sizeof(type));
+  // Referencing non-pod type members through returned pointer is UB.
+  // Solely releasing it is ok.
+  //
+  // Using it otherwise is UB because ut::malloc_* functions are raw
+  // memory management functions which do not invoke constructors neither
+  // they know which type they are operating with. That is why we would be end
+  // up accessing memory of not yet instantiated object (UB).
+  ut::free_page(ptr);
+}
+REGISTER_TYPED_TEST_SUITE_P(ut0new_page_malloc_free_non_pod_types,
+                            non_pod_types);
+INSTANTIATE_TYPED_TEST_SUITE_P(NonPodTypes,
+                               ut0new_page_malloc_free_non_pod_types,
+                               all_non_pod_types);
+
+// Allocating memory backed by huge (large) pages generally requires some prior
+// system admin setup. When there's no such setup, we don't want to make our CI
+// systems red. We skip the test instead and by doing it we are denoting that
+// test was neither failed nor successful with the message explaining possible
+// reasons. Solaris and OSX for example do not require any prior setup whereas
+// Linux and Windows do.
+#define SKIP_TEST_IF_HUGE_PAGE_SUPPORT_IS_NOT_AVAILABLE(ptr)       \
+  if (!ptr)                                                        \
+    GTEST_SKIP()                                                   \
+        << "Huge-page support seems not to be enabled on this "    \
+           "platform or underlying huge-page allocation function " \
+           "was not used correctly. Please check. Skipping the test ...";
+
+// Large-page alloc/free - fundamental types
+template <typename T>
+class ut0new_large_malloc_free_fundamental_types : public ::testing::Test {};
+TYPED_TEST_SUITE_P(ut0new_large_malloc_free_fundamental_types);
+TYPED_TEST_P(ut0new_large_malloc_free_fundamental_types, fundamental_types) {
+  using type = typename TypeParam::type;
+  auto with_pfs = TypeParam::with_pfs;
+  type *ptr = with_pfs
+                  ? static_cast<type *>(ut::malloc_large_page_withkey(
+                        ut::make_psi_memory_key(pfs_key), sizeof(type)))
+                  : static_cast<type *>(ut::malloc_large_page(sizeof(type)));
+  SKIP_TEST_IF_HUGE_PAGE_SUPPORT_IS_NOT_AVAILABLE(ptr)
+  EXPECT_TRUE(reinterpret_cast<std::uintptr_t>(ptr) % alignof(max_align_t) ==
+              0);
+  EXPECT_GE(ut::large_page_allocation_size(ptr), sizeof(type));
+  ut::free_large_page(ptr);
+}
+REGISTER_TYPED_TEST_SUITE_P(ut0new_large_malloc_free_fundamental_types,
+                            fundamental_types);
+INSTANTIATE_TYPED_TEST_SUITE_P(FundamentalTypes,
+                               ut0new_large_malloc_free_fundamental_types,
+                               all_fundamental_types);
+
+// Large-page alloc/free - pod types
+template <typename T>
+class ut0new_large_malloc_free_pod_types : public ::testing::Test {};
+TYPED_TEST_SUITE_P(ut0new_large_malloc_free_pod_types);
+TYPED_TEST_P(ut0new_large_malloc_free_pod_types, pod_types) {
+  using type = typename TypeParam::type;
+  auto with_pfs = TypeParam::with_pfs;
+  type *ptr = with_pfs
+                  ? static_cast<type *>(ut::malloc_large_page_withkey(
+                        ut::make_psi_memory_key(pfs_key), sizeof(type)))
+                  : static_cast<type *>(ut::malloc_large_page(sizeof(type)));
+  SKIP_TEST_IF_HUGE_PAGE_SUPPORT_IS_NOT_AVAILABLE(ptr)
+  EXPECT_TRUE(reinterpret_cast<std::uintptr_t>(ptr) % alignof(max_align_t) ==
+              0);
+  EXPECT_GE(ut::large_page_allocation_size(ptr), sizeof(type));
+  ut::free_large_page(ptr);
+}
+REGISTER_TYPED_TEST_SUITE_P(ut0new_large_malloc_free_pod_types, pod_types);
+INSTANTIATE_TYPED_TEST_SUITE_P(PodTypes, ut0new_large_malloc_free_pod_types,
+                               all_pod_types);
+
+// Large-page alloc/free - non-pod types
+template <typename T>
+class ut0new_large_malloc_free_non_pod_types : public ::testing::Test {};
+TYPED_TEST_SUITE_P(ut0new_large_malloc_free_non_pod_types);
+TYPED_TEST_P(ut0new_large_malloc_free_non_pod_types, non_pod_types) {
+  using type = typename TypeParam::type;
+  auto with_pfs = TypeParam::with_pfs;
+  type *ptr = with_pfs
+                  ? static_cast<type *>(ut::malloc_large_page_withkey(
+                        ut::make_psi_memory_key(pfs_key), sizeof(type)))
+                  : static_cast<type *>(ut::malloc_large_page(sizeof(type)));
+  SKIP_TEST_IF_HUGE_PAGE_SUPPORT_IS_NOT_AVAILABLE(ptr)
+  EXPECT_TRUE(reinterpret_cast<std::uintptr_t>(ptr) % alignof(max_align_t) ==
+              0);
+  EXPECT_GE(ut::large_page_allocation_size(ptr), sizeof(type));
+  // Referencing non-pod type members through returned pointer is UB.
+  // Solely releasing it is ok.
+  //
+  // Using it otherwise is UB because ut::large_malloc_* functions are raw
+  // memory management functions which do not invoke constructors neither
+  // they know which type they are operating with. That is why we would be end
+  // up accessing memory of not yet instantiated object (UB).
+  ut::free_large_page(ptr);
+}
+REGISTER_TYPED_TEST_SUITE_P(ut0new_large_malloc_free_non_pod_types,
+                            non_pod_types);
+INSTANTIATE_TYPED_TEST_SUITE_P(NonPodTypes,
+                               ut0new_large_malloc_free_non_pod_types,
+                               all_non_pod_types);
+
+// Large-page alloc/free with page-aligned fallback - fundamental types
+template <typename T>
+class ut0new_large_malloc_free_fallback_fundamental_types
+    : public ::testing::Test {};
+TYPED_TEST_SUITE_P(ut0new_large_malloc_free_fallback_fundamental_types);
+TYPED_TEST_P(ut0new_large_malloc_free_fallback_fundamental_types,
+             fundamental_types) {
+  using type = typename TypeParam::type;
+  auto with_pfs = TypeParam::with_pfs;
+  for (auto default_cfg : {true, false}) {
+    auto ret = with_pfs ? ut::malloc_large_page_withkey(
+                              ut::make_psi_memory_key(pfs_key), sizeof(type),
+                              ut::fallback_to_normal_page_t{}, default_cfg)
+                        : ut::malloc_large_page(sizeof(type),
+                                                ut::fallback_to_normal_page_t{},
+                                                default_cfg);
+    EXPECT_TRUE(reinterpret_cast<std::uintptr_t>(ret) % CPU_PAGE_SIZE == 0);
+    EXPECT_GE(
+        ut::large_page_allocation_size(ret, ut::fallback_to_normal_page_t{}),
+        sizeof(type));
+    ut::free_large_page(ret, ut::fallback_to_normal_page_t{});
+  }
+}
+REGISTER_TYPED_TEST_SUITE_P(ut0new_large_malloc_free_fallback_fundamental_types,
+                            fundamental_types);
+INSTANTIATE_TYPED_TEST_SUITE_P(
+    FundamentalTypes, ut0new_large_malloc_free_fallback_fundamental_types,
+    all_fundamental_types);
+
+// Large-page alloc/free with page-aligned fallback - pod types
+template <typename T>
+class ut0new_large_malloc_free_fallback_pod_types : public ::testing::Test {};
+TYPED_TEST_SUITE_P(ut0new_large_malloc_free_fallback_pod_types);
+TYPED_TEST_P(ut0new_large_malloc_free_fallback_pod_types, pod_types) {
+  using type = typename TypeParam::type;
+  auto with_pfs = TypeParam::with_pfs;
+  for (auto default_cfg : {true, false}) {
+    auto ret = with_pfs ? ut::malloc_large_page_withkey(
+                              ut::make_psi_memory_key(pfs_key), sizeof(type),
+                              ut::fallback_to_normal_page_t{}, default_cfg)
+                        : ut::malloc_large_page(sizeof(type),
+                                                ut::fallback_to_normal_page_t{},
+                                                default_cfg);
+    EXPECT_TRUE(reinterpret_cast<std::uintptr_t>(ret) % CPU_PAGE_SIZE == 0);
+    EXPECT_GE(
+        ut::large_page_allocation_size(ret, ut::fallback_to_normal_page_t{}),
+        sizeof(type));
+    ut::free_large_page(ret, ut::fallback_to_normal_page_t{});
+  }
+}
+REGISTER_TYPED_TEST_SUITE_P(ut0new_large_malloc_free_fallback_pod_types,
+                            pod_types);
+INSTANTIATE_TYPED_TEST_SUITE_P(PodTypes,
+                               ut0new_large_malloc_free_fallback_pod_types,
+                               all_pod_types);
+
+// Large-page alloc/free with page-aligned fallback - non-pod types
+template <typename T>
+class ut0new_large_malloc_free_fallback_non_pod_types : public ::testing::Test {
+};
+TYPED_TEST_SUITE_P(ut0new_large_malloc_free_fallback_non_pod_types);
+TYPED_TEST_P(ut0new_large_malloc_free_fallback_non_pod_types, non_pod_types) {
+  using type = typename TypeParam::type;
+  auto with_pfs = TypeParam::with_pfs;
+  for (auto default_cfg : {true, false}) {
+    auto ret = with_pfs ? ut::malloc_large_page_withkey(
+                              ut::make_psi_memory_key(pfs_key), sizeof(type),
+                              ut::fallback_to_normal_page_t{}, default_cfg)
+                        : ut::malloc_large_page(sizeof(type),
+                                                ut::fallback_to_normal_page_t{},
+                                                default_cfg);
+    EXPECT_TRUE(reinterpret_cast<std::uintptr_t>(ret) % CPU_PAGE_SIZE == 0);
+    EXPECT_GE(
+        ut::large_page_allocation_size(ret, ut::fallback_to_normal_page_t{}),
+        sizeof(type));
+    // Referencing non-pod type members through returned pointer is UB.
+    // Solely releasing it is ok.
+    //
+    // Using it otherwise is UB because ut::large_malloc_* functions are raw
+    // memory management functions which do not invoke constructors neither
+    // they know which type they are operating with. That is why we would be end
+    // up accessing memory of not yet instantiated object (UB).
+    ut::free_large_page(ret, ut::fallback_to_normal_page_t{});
+  }
+}
+REGISTER_TYPED_TEST_SUITE_P(ut0new_large_malloc_free_fallback_non_pod_types,
+                            non_pod_types);
+INSTANTIATE_TYPED_TEST_SUITE_P(NonPodTypes,
+                               ut0new_large_malloc_free_fallback_non_pod_types,
+                               all_non_pod_types);
 
 // aligned alloc/free - fundamental types
 template <typename T>
@@ -439,7 +1225,7 @@
   ut::aligned_free(ptr);
 }
 REGISTER_TYPED_TEST_SUITE_P(aligned_alloc_free_non_pod_types, non_pod_types);
-INSTANTIATE_TYPED_TEST_SUITE_P(PodTypes, aligned_alloc_free_non_pod_types,
+INSTANTIATE_TYPED_TEST_SUITE_P(NonPodTypes, aligned_alloc_free_non_pod_types,
                                all_non_pod_types);
 
 // aligned new/delete - fundamental types
@@ -849,4 +1635,305 @@
   ptr.dealloc();
 }
 
+template <bool With_pfs, typename T>
+struct select_allocator_variant {
+  using type = ut::detail::allocator_base<T>;
+};
+template <typename T>
+struct select_allocator_variant<false, T> {
+  using type = ut::detail::allocator_base_pfs<T>;
+};
+template <bool With_pfs, typename T>
+using select_allocator_variant_t =
+    typename select_allocator_variant<With_pfs, T>::type;
+
+// allocator - fundamental types
+template <typename T>
+class ut0new_allocator_fundamental_types : public ::testing::Test {};
+TYPED_TEST_SUITE_P(ut0new_allocator_fundamental_types);
+TYPED_TEST_P(ut0new_allocator_fundamental_types, fundamental_types) {
+  using T = typename TypeParam::type;
+  using allocator_variant = select_allocator_variant_t<TypeParam::with_pfs, T>;
+
+  auto n_elements = 100;
+  ut::allocator<T, allocator_variant> a(pfs_key);
+
+  auto ptr = a.allocate(n_elements);
+
+  EXPECT_TRUE(reinterpret_cast<std::uintptr_t>(ptr) % alignof(max_align_t) ==
+              0);
+
+  ptr[0] = std::numeric_limits<T>::max();
+  EXPECT_EQ(ptr[0], std::numeric_limits<T>::max());
+  ptr[n_elements - 1] = std::numeric_limits<T>::min();
+  EXPECT_EQ(ptr[n_elements - 1], std::numeric_limits<T>::min());
+
+  a.deallocate(ptr);
+}
+REGISTER_TYPED_TEST_SUITE_P(ut0new_allocator_fundamental_types,
+                            fundamental_types);
+INSTANTIATE_TYPED_TEST_SUITE_P(FundamentalTypes,
+                               ut0new_allocator_fundamental_types,
+                               all_fundamental_types);
+
+// allocator - pod types
+template <typename T>
+class ut0new_allocator_pod_types : public ::testing::Test {};
+TYPED_TEST_SUITE_P(ut0new_allocator_pod_types);
+TYPED_TEST_P(ut0new_allocator_pod_types, pod_types) {
+  using T = typename TypeParam::type;
+  using allocator_variant = select_allocator_variant_t<TypeParam::with_pfs, T>;
+
+  auto n_elements = 100;
+  ut::allocator<T, allocator_variant> a(pfs_key);
+
+  auto ptr = a.allocate(n_elements);
+
+  EXPECT_TRUE(reinterpret_cast<std::uintptr_t>(ptr) % alignof(max_align_t) ==
+              0);
+
+  a.deallocate(ptr);
+}
+REGISTER_TYPED_TEST_SUITE_P(ut0new_allocator_pod_types, pod_types);
+INSTANTIATE_TYPED_TEST_SUITE_P(PodTypes, ut0new_allocator_pod_types,
+                               all_pod_types);
+
+// allocator - non_pod types
+template <typename T>
+class ut0new_allocator_non_pod_types : public ::testing::Test {};
+TYPED_TEST_SUITE_P(ut0new_allocator_non_pod_types);
+TYPED_TEST_P(ut0new_allocator_non_pod_types, non_pod_types) {
+  using T = typename TypeParam::type;
+  using allocator_variant = select_allocator_variant_t<TypeParam::with_pfs, T>;
+
+  auto n_elements = 100;
+  ut::allocator<T, allocator_variant> a(pfs_key);
+  auto ptr = a.allocate(n_elements);
+
+  EXPECT_TRUE(reinterpret_cast<std::uintptr_t>(ptr) % alignof(max_align_t) ==
+              0);
+
+  a.deallocate(ptr);
+}
+REGISTER_TYPED_TEST_SUITE_P(ut0new_allocator_non_pod_types, non_pod_types);
+INSTANTIATE_TYPED_TEST_SUITE_P(NonPodTypes, ut0new_allocator_non_pod_types,
+                               all_non_pod_types);
+
+// allocator - std::vector with fundamental types
+template <typename T>
+class ut0new_allocator_std_vector_with_fundamental_types
+    : public ::testing::Test {};
+TYPED_TEST_SUITE_P(ut0new_allocator_std_vector_with_fundamental_types);
+TYPED_TEST_P(ut0new_allocator_std_vector_with_fundamental_types,
+             std_vector_with_fundamental_types) {
+  using T = typename TypeParam::type;
+  using allocator_variant = select_allocator_variant_t<TypeParam::with_pfs, T>;
+
+  std::vector<T, ut::allocator<T, allocator_variant>> vec;
+  vec.push_back(std::numeric_limits<T>::max());
+  vec.push_back(std::numeric_limits<T>::min());
+  vec.push_back(std::numeric_limits<T>::max());
+  vec.push_back(std::numeric_limits<T>::min());
+
+  EXPECT_TRUE(
+      reinterpret_cast<std::uintptr_t>(&vec[0]) % alignof(max_align_t) == 0);
+
+  EXPECT_EQ(vec[0], std::numeric_limits<T>::max());
+  EXPECT_EQ(vec[1], std::numeric_limits<T>::min());
+  EXPECT_EQ(vec[2], std::numeric_limits<T>::max());
+  EXPECT_EQ(vec[3], std::numeric_limits<T>::min());
+}
+REGISTER_TYPED_TEST_SUITE_P(ut0new_allocator_std_vector_with_fundamental_types,
+                            std_vector_with_fundamental_types);
+INSTANTIATE_TYPED_TEST_SUITE_P(
+    FundamentalTypes, ut0new_allocator_std_vector_with_fundamental_types,
+    all_fundamental_types);
+
+// allocator - std::vector with pod types
+template <typename T>
+class ut0new_allocator_std_vector_with_pod_types : public ::testing::Test {};
+TYPED_TEST_SUITE_P(ut0new_allocator_std_vector_with_pod_types);
+TYPED_TEST_P(ut0new_allocator_std_vector_with_pod_types,
+             std_vector_with_pod_types) {
+  using T = typename TypeParam::type;
+  using allocator_variant = select_allocator_variant_t<TypeParam::with_pfs, T>;
+
+  constexpr auto min = std::numeric_limits<int>::min();
+  constexpr auto max = std::numeric_limits<int>::max();
+  std::vector<T, ut::allocator<T, allocator_variant>> vec;
+  vec.push_back({min, min});
+  vec.push_back({min, max});
+  vec.push_back({max, min});
+  vec.push_back({max, max});
+
+  EXPECT_TRUE(
+      reinterpret_cast<std::uintptr_t>(&vec[0]) % alignof(max_align_t) == 0);
+
+  EXPECT_EQ(vec[0].x, min);
+  EXPECT_EQ(vec[0].y, min);
+  EXPECT_EQ(vec[1].x, min);
+  EXPECT_EQ(vec[1].y, max);
+  EXPECT_EQ(vec[2].x, max);
+  EXPECT_EQ(vec[2].y, min);
+  EXPECT_EQ(vec[3].x, max);
+  EXPECT_EQ(vec[3].y, max);
+}
+REGISTER_TYPED_TEST_SUITE_P(ut0new_allocator_std_vector_with_pod_types,
+                            std_vector_with_pod_types);
+INSTANTIATE_TYPED_TEST_SUITE_P(PodTypes,
+                               ut0new_allocator_std_vector_with_pod_types,
+                               all_pod_types);
+
+// allocator - std::vector with non_pod types
+template <typename T>
+class ut0new_allocator_std_vector_with_non_pod_types : public ::testing::Test {
+};
+TYPED_TEST_SUITE_P(ut0new_allocator_std_vector_with_non_pod_types);
+TYPED_TEST_P(ut0new_allocator_std_vector_with_non_pod_types,
+             std_vector_with_non_pod_types) {
+  using T = typename TypeParam::type;
+  using allocator_variant = select_allocator_variant_t<TypeParam::with_pfs, T>;
+
+  std::vector<T, ut::allocator<T, allocator_variant>> vec;
+  vec.push_back({1, 2, std::string("a")});
+  vec.push_back({3, 4, std::string("b")});
+  vec.push_back({5, 6, std::string("c")});
+  vec.push_back({7, 8, std::string("d")});
+  vec.push_back({9, 10, std::string("e")});
+
+  EXPECT_TRUE(
+      reinterpret_cast<std::uintptr_t>(&vec[0]) % alignof(max_align_t) == 0);
+
+  EXPECT_EQ(vec[0].x, 1);
+  EXPECT_EQ(vec[0].y, 2);
+  EXPECT_TRUE(vec[0].s == std::string("a"));
+
+  EXPECT_EQ(vec[1].x, 3);
+  EXPECT_EQ(vec[1].y, 4);
+  EXPECT_TRUE(vec[1].s == std::string("b"));
+
+  EXPECT_EQ(vec[2].x, 5);
+  EXPECT_EQ(vec[2].y, 6);
+  EXPECT_TRUE(vec[2].s == std::string("c"));
+
+  EXPECT_EQ(vec[3].x, 7);
+  EXPECT_EQ(vec[3].y, 8);
+  EXPECT_TRUE(vec[3].s == std::string("d"));
+
+  EXPECT_EQ(vec[4].x, 9);
+  EXPECT_EQ(vec[4].y, 10);
+  EXPECT_TRUE(vec[4].s == std::string("e"));
+}
+REGISTER_TYPED_TEST_SUITE_P(ut0new_allocator_std_vector_with_non_pod_types,
+                            std_vector_with_non_pod_types);
+INSTANTIATE_TYPED_TEST_SUITE_P(NonPodTypes,
+                               ut0new_allocator_std_vector_with_non_pod_types,
+                               all_non_pod_types);
+
+// allocator - std::vector with default_constructible_pod types
+template <typename T>
+class ut0new_allocator_std_vector_with_default_constructible_pod_types
+    : public ::testing::Test {};
+TYPED_TEST_SUITE_P(
+    ut0new_allocator_std_vector_with_default_constructible_pod_types);
+TYPED_TEST_P(ut0new_allocator_std_vector_with_default_constructible_pod_types,
+             std_vector_with_default_constructible_pod_types) {
+  using T = typename TypeParam::type;
+  using allocator_variant = select_allocator_variant_t<TypeParam::with_pfs, T>;
+
+  std::vector<T, ut::allocator<T, allocator_variant>> vec;
+  vec.push_back({});
+  vec.push_back({});
+  vec.push_back({});
+  vec.push_back({});
+
+  EXPECT_TRUE(
+      reinterpret_cast<std::uintptr_t>(&vec[0]) % alignof(max_align_t) == 0);
+
+  EXPECT_EQ(vec[0].x, 0);
+  EXPECT_EQ(vec[0].y, 1);
+  EXPECT_EQ(vec[1].x, 0);
+  EXPECT_EQ(vec[1].y, 1);
+  EXPECT_EQ(vec[2].x, 0);
+  EXPECT_EQ(vec[2].y, 1);
+  EXPECT_EQ(vec[3].x, 0);
+  EXPECT_EQ(vec[3].y, 1);
+}
+REGISTER_TYPED_TEST_SUITE_P(
+    ut0new_allocator_std_vector_with_default_constructible_pod_types,
+    std_vector_with_default_constructible_pod_types);
+INSTANTIATE_TYPED_TEST_SUITE_P(
+    DefaultConstructiblePodTypes,
+    ut0new_allocator_std_vector_with_default_constructible_pod_types,
+    all_default_constructible_pod_types);
+
+// allocator - std::vector with default_non_pod_constructible types
+template <typename T>
+class ut0new_allocator_std_vector_with_default_non_pod_constructible_types
+    : public ::testing::Test {};
+TYPED_TEST_SUITE_P(
+    ut0new_allocator_std_vector_with_default_non_pod_constructible_types);
+TYPED_TEST_P(
+    ut0new_allocator_std_vector_with_default_non_pod_constructible_types,
+    std_vector_with_default_non_pod_constructible_types) {
+  using T = typename TypeParam::type;
+  using allocator_variant = select_allocator_variant_t<TypeParam::with_pfs, T>;
+
+  std::vector<T, ut::allocator<T, allocator_variant>> vec;
+  vec.push_back({});
+  vec.push_back({});
+  vec.push_back({});
+  vec.push_back({});
+  vec.push_back({});
+
+  EXPECT_TRUE(
+      reinterpret_cast<std::uintptr_t>(&vec[0]) % alignof(max_align_t) == 0);
+
+  EXPECT_EQ(vec[0].x, 0);
+  EXPECT_EQ(vec[0].y, 1);
+  EXPECT_TRUE(vec[0].s == std::string("non-pod-string"));
+
+  EXPECT_EQ(vec[1].x, 0);
+  EXPECT_EQ(vec[1].y, 1);
+  EXPECT_TRUE(vec[1].s == std::string("non-pod-string"));
+
+  EXPECT_EQ(vec[2].x, 0);
+  EXPECT_EQ(vec[2].y, 1);
+  EXPECT_TRUE(vec[2].s == std::string("non-pod-string"));
+
+  EXPECT_EQ(vec[3].x, 0);
+  EXPECT_EQ(vec[3].y, 1);
+  EXPECT_TRUE(vec[3].s == std::string("non-pod-string"));
+}
+REGISTER_TYPED_TEST_SUITE_P(
+    ut0new_allocator_std_vector_with_default_non_pod_constructible_types,
+    std_vector_with_default_non_pod_constructible_types);
+INSTANTIATE_TYPED_TEST_SUITE_P(
+    NonPodTypes,
+    ut0new_allocator_std_vector_with_default_non_pod_constructible_types,
+    all_default_constructible_non_pod_types);
+
+TEST(ut0new_allocator, throws_bad_array_new_length_when_max_size_is_exceeded) {
+  struct big_t {
+    char x[128];
+  };
+
+  ut::allocator<big_t> alloc(mem_key_buf_buf_pool);
+
+  const ut::allocator<big_t>::size_type too_many_elements =
+      std::numeric_limits<ut::allocator<big_t>::size_type>::max() /
+          sizeof(big_t) +
+      1;
+
+  big_t *ptr = nullptr;
+  bool threw = false;
+  try {
+    ptr = alloc.allocate(too_many_elements);
+  } catch (std::bad_array_new_length &) {
+    threw = true;
+  }
+  EXPECT_TRUE(threw);
+  EXPECT_FALSE(ptr);
+}
+
 }  // namespace innodb_ut0new_unittest
diff -Nru mysql-8.0-8.0.26/unittest/gunit/interesting_orders-t.cc mysql-8.0-8.0.27/unittest/gunit/interesting_orders-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/interesting_orders-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/interesting_orders-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -184,18 +184,21 @@
     m_initializer.SetUp();
     m_orderings.reset(new LogicalOrderings(m_initializer.thd()));
 
-    m_table.reset(new Fake_TABLE(/*num_columns=*/5, /*nullable=*/true));
+    m_table.reset(new Fake_TABLE(/*num_columns=*/6, /*nullable=*/true));
     m_table->field[0]->field_name = "a";
     m_table->field[1]->field_name = "b";
     m_table->field[2]->field_name = "c";
     m_table->field[3]->field_name = "d";
     m_table->field[4]->field_name = "e";
+    m_table->field[5]->field_name = "f";
 
     a = m_orderings->GetHandle(new Item_field(m_table->field[0]));
     b = m_orderings->GetHandle(new Item_field(m_table->field[1]));
     c = m_orderings->GetHandle(new Item_field(m_table->field[2]));
     d = m_orderings->GetHandle(new Item_field(m_table->field[3]));
     e = m_orderings->GetHandle(new Item_field(m_table->field[4]));
+    // Don't add f; the tests can use it to get a higher handle
+    // than the others.
   }
 
  protected:
@@ -1178,3 +1181,98 @@
   EXPECT_THAT(m_orderings->ordering(5),
               testing::ElementsAre(OrderElement{d, ORDER_ASC}));
 }
+
+TEST_F(InterestingOrderingTableTest, NoGroupCoverWithNondeterminism) {
+  THD *thd = m_initializer.thd();
+
+  Item_func *r_item =
+      new Item_func_plus(new Item_int(2),
+                         new Item_int(2));  // Guaranteed random.
+  r_item->set_used_tables(RAND_TABLE_BIT);  // Chosen by fair die roll.
+  ItemHandle r = m_orderings->GetHandle(r_item);
+
+  // Get a new field that's higher than r, so that the grouping below
+  // is valid.
+  ItemHandle f = m_orderings->GetHandle(new Item_field(m_table->field[5]));
+
+  // Interesting orders are {rf} and (f).
+  array<OrderElement, 2> group_rf{OrderElement{r, ORDER_NOT_RELEVANT},
+                                  OrderElement{f, ORDER_NOT_RELEVANT}};
+  array<OrderElement, 1> order_f{OrderElement{f, ORDER_ASC}};
+
+  int group_rf_idx =
+      AddOrdering(thd, group_rf, /*interesting=*/true, m_orderings.get());
+  int f_idx =
+      AddOrdering(thd, order_f, /*interesting=*/true, m_orderings.get());
+
+  string trace;
+  m_orderings->Build(thd, &trace);
+  SCOPED_TRACE(trace);  // Prints out the trace on failure.
+
+  // We will have covered {rf} with (fr), but that ordering should
+  // _not_ be used to satisfy (f). In this case, (rf) would also be
+  // an acceptable cover, but we don't constrain the cover logic;
+  // there's not really any need.
+  ASSERT_EQ(4, m_orderings->num_orderings());
+  EXPECT_THAT(m_orderings->ordering(3),
+              testing::ElementsAre(OrderElement{f, ORDER_ASC},
+                                   OrderElement{r, ORDER_ASC}));
+
+  int idx = m_orderings->SetOrder(3);
+  EXPECT_TRUE(m_orderings->DoesFollowOrder(idx, group_rf_idx));
+  EXPECT_FALSE(m_orderings->DoesFollowOrder(idx, f_idx));
+}
+
+TEST_F(InterestingOrderingTableTest, GroupReordering) {
+  THD *thd = m_initializer.thd();
+
+  // Interesting orders are (b) and {bc}.
+  array<OrderElement, 1> order_b{OrderElement{b, ORDER_ASC}};
+  array<OrderElement, 2> group_bc{OrderElement{b, ORDER_NOT_RELEVANT},
+                                  OrderElement{c, ORDER_NOT_RELEVANT}};
+
+  int b_idx =
+      AddOrdering(thd, order_b, /*interesting=*/true, m_orderings.get());
+  int bc_idx =
+      AddOrdering(thd, group_bc, /*interesting=*/true, m_orderings.get());
+
+  // Add a = c.
+  FunctionalDependency fd_equiv;
+  fd_equiv.type = FunctionalDependency::EQUIVALENCE;
+  fd_equiv.head = Bounds_checked_array<ItemHandle>(&a, 1);
+  fd_equiv.tail = c;
+  int fd_equiv_idx = m_orderings->AddFunctionalDependency(thd, fd_equiv);
+
+  // Add b → a.
+  FunctionalDependency fd_ba;
+  fd_ba.type = FunctionalDependency::FD;
+  fd_ba.head = Bounds_checked_array<ItemHandle>(&b, 1);
+  fd_ba.tail = a;
+  int fd_ba_idx = m_orderings->AddFunctionalDependency(thd, fd_ba);
+
+  string trace;
+  m_orderings->Build(thd, &trace);
+  SCOPED_TRACE(trace);  // Prints out the trace on failure.
+
+  b_idx = m_orderings->RemapOrderingIndex(b_idx);
+  bc_idx = m_orderings->RemapOrderingIndex(bc_idx);
+
+  // Start with (b).
+  int idx = m_orderings->SetOrder(b_idx);
+  EXPECT_TRUE(m_orderings->DoesFollowOrder(idx, b_idx));
+  EXPECT_FALSE(m_orderings->DoesFollowOrder(idx, bc_idx));
+
+  // Apply both FDs.
+  FunctionalDependencySet fds{0};
+  fds |= m_orderings->GetFDSet(fd_equiv_idx);
+  fds |= m_orderings->GetFDSet(fd_ba_idx);
+  idx = m_orderings->ApplyFDs(idx, fds);
+
+  // Now we should also follow {b,c}. Note that this requires us
+  // either to create {b,a}, which follows a counterintuitive group
+  // canonicalization (the intuitive would be {a,b}), or internally
+  // represent {b,c} as {c,b}. Otherwise, we would be pruning away
+  // the the {a,b} (or {b,a}) grouping before reaching {b,c}.
+  EXPECT_TRUE(m_orderings->DoesFollowOrder(idx, b_idx));
+  EXPECT_TRUE(m_orderings->DoesFollowOrder(idx, bc_idx));
+}
diff -Nru mysql-8.0-8.0.26/unittest/gunit/item_filter-t.cc mysql-8.0-8.0.27/unittest/gunit/item_filter-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/item_filter-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/item_filter-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -67,7 +67,7 @@
     delete m_table;
 
     initializer.TearDown();
-    free_root(&m_alloc, MYF(0));
+    m_alloc.Clear();
   }
 
   THD *thd() { return initializer.thd(); }
diff -Nru mysql-8.0-8.0.26/unittest/gunit/item-t.cc mysql-8.0-8.0.27/unittest/gunit/item-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/item-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/item-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -486,7 +486,7 @@
   const char divisor_str[] = "0.5";
   Item_float *dividend = new Item_float(dividend_str, sizeof(dividend_str));
   Item_float *divisor = new Item_float(divisor_str, sizeof(divisor_str));
-  Item_func_int_div *quotient = new Item_func_int_div(dividend, divisor);
+  Item_func_div_int *quotient = new Item_func_div_int(dividend, divisor);
 
   Mock_error_handler error_handler(thd(), ER_TRUNCATED_WRONG_VALUE);
   EXPECT_FALSE(quotient->fix_fields(thd(), nullptr));
@@ -500,7 +500,7 @@
   const char divisor_str[] = "1.7976931348623157E+308";
   Item_float *dividend = new Item_float(dividend_str, sizeof(dividend_str));
   Item_float *divisor = new Item_float(divisor_str, sizeof(divisor_str));
-  Item_func_int_div *quotient = new Item_func_int_div(dividend, divisor);
+  Item_func_div_int *quotient = new Item_func_div_int(dividend, divisor);
 
   Mock_error_handler error_handler(thd(), ER_TRUNCATED_WRONG_VALUE);
   EXPECT_FALSE(quotient->fix_fields(thd(), nullptr));
diff -Nru mysql-8.0-8.0.26/unittest/gunit/keyring/buffered_file_io_10.cc mysql-8.0-8.0.27/unittest/gunit/keyring/buffered_file_io_10.cc
--- mysql-8.0-8.0.26/unittest/gunit/keyring/buffered_file_io_10.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/keyring/buffered_file_io_10.cc	2021-09-28 11:46:34.000000000 +0000
@@ -28,9 +28,9 @@
 #include "my_io.h"
 
 namespace keyring {
-bool Buffered_file_io_10::flush_to_file(
-    PSI_file_key *file_key MY_ATTRIBUTE((unused)), const std::string *filename,
-    const Digest *) {
+bool Buffered_file_io_10::flush_to_file(PSI_file_key *file_key [[maybe_unused]],
+                                        const std::string *filename,
+                                        const Digest *) {
   File file;
   bool was_error = true;
   file = mysql_file_open(*file_key, filename->c_str(),
diff -Nru mysql-8.0-8.0.26/unittest/gunit/keyring/CMakeLists.txt mysql-8.0-8.0.27/unittest/gunit/keyring/CMakeLists.txt
--- mysql-8.0-8.0.26/unittest/gunit/keyring/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/keyring/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -27,11 +27,6 @@
   converter
   file_io
 )
-# This compiler fails to handle some of the mock functions involved.
-IF(MY_COMPILER_IS_SUNPRO)
-  LIST(REMOVE_ITEM TESTS keys_container)
-ENDIF()
-
 
 ADD_DEFINITIONS(-DLOG_COMPONENT_TAG="keyring_file_tests")
 
diff -Nru mysql-8.0-8.0.26/unittest/gunit/libmysqlgcs/CMakeLists.txt mysql-8.0-8.0.27/unittest/gunit/libmysqlgcs/CMakeLists.txt
--- mysql-8.0-8.0.26/unittest/gunit/libmysqlgcs/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/libmysqlgcs/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -79,7 +79,17 @@
   xcom/gcs_message_stage_fragmentation
   xcom/gcs_xcom_site_def
   xcom/gcs_xcom_expels_in_progress
-  )
+  xcom/gcs_xcom_network_provider
+  xcom/gcs_xcom_network_provider_manager
+  xcom/gcs_xcom_xcom_single_writer
+)
+
+# When binding using IPv6 the way XCom does (dual stack IPv4/IPv6), it
+# does not detect that a port is busy when binding and overruns the
+# previous port. As such, this test cannot run on Solaris
+IF(SOLARIS)
+  LIST(REMOVE_ITEM GCS_XCOM_TESTS xcom/gcs_xcom_network_provider)
+ENDIF()
 
 ###
 ### Configure the tests and add target
diff -Nru mysql-8.0-8.0.26/unittest/gunit/libmysqlgcs/include/gcs_base_test.h mysql-8.0-8.0.27/unittest/gunit/libmysqlgcs/include/gcs_base_test.h
--- mysql-8.0-8.0.26/unittest/gunit/libmysqlgcs/include/gcs_base_test.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/libmysqlgcs/include/gcs_base_test.h	2021-09-28 11:46:34.000000000 +0000
@@ -72,4 +72,6 @@
   virtual ~GcsBaseTestNoLogging() = default;
 };
 
+enum class XComLeaderConfiguration { ONE, ALL };
+
 #endif  // GCS_BASE_TEST_INCLUDED
diff -Nru mysql-8.0-8.0.26/unittest/gunit/libmysqlgcs/xcom/gcs_allowlist-t.cc mysql-8.0-8.0.27/unittest/gunit/libmysqlgcs/xcom/gcs_allowlist-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/libmysqlgcs/xcom/gcs_allowlist-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/libmysqlgcs/xcom/gcs_allowlist-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -254,7 +254,7 @@
 TEST_F(GcsAllowlist, XComMembers) {
   Gcs_ip_allowlist wl;
   char const *members[] = {"8.8.8.8:12435", "8.8.4.4:1234", "localhost:12346"};
-  char **xcom_addrs = const_cast<char **>(members);
+  const char **xcom_addrs{members};
   node_address *xcom_names = new_node_address(3, xcom_addrs);
   site_def *xcom_config = new_site_def();
   init_site_def(3, xcom_names, xcom_config);
diff -Nru mysql-8.0-8.0.26/unittest/gunit/libmysqlgcs/xcom/gcs_message_stage_fragmentation-t.cc mysql-8.0-8.0.27/unittest/gunit/libmysqlgcs/xcom/gcs_message_stage_fragmentation-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/libmysqlgcs/xcom/gcs_message_stage_fragmentation-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/libmysqlgcs/xcom/gcs_message_stage_fragmentation-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -27,6 +27,7 @@
 #include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_split.h"
 #include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stages.h"
 #include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_communication_interface.h"
+#include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/network_provider_manager.h"
 
 namespace gcs_message_stage_fragmentation_unittest {
 
@@ -49,7 +50,8 @@
   }
 
   MOCK_METHOD3(new_node_address_uuid,
-               node_address *(unsigned int n, char *names[], blob uuids[]));
+               node_address *(unsigned int n, char const *names[],
+                              blob uuids[]));
   MOCK_METHOD2(delete_node_address, void(unsigned int n, node_address *na));
   MOCK_METHOD3(xcom_client_add_node, bool(connection_descriptor *con,
                                           node_list *nl, uint32_t group_id));
@@ -60,6 +62,13 @@
                bool(uint32_t group_id, xcom_event_horizon &event_horizon));
   MOCK_METHOD2(xcom_client_set_event_horizon,
                bool(uint32_t group_id, xcom_event_horizon event_horizon));
+  MOCK_METHOD2(xcom_client_set_max_leaders,
+               bool(uint32_t group_id, node_no max_leaders));
+  MOCK_METHOD4(xcom_client_set_leaders,
+               bool(uint32_t group_id, u_int n, char const *names[],
+                    node_no max_nr_leaders));
+  MOCK_METHOD2(xcom_client_get_leaders,
+               bool(uint32_t gid, leader_info_data &leaders));
   MOCK_METHOD4(xcom_client_get_synode_app_data,
                bool(connection_descriptor *con, uint32_t group_id_hash,
                     synode_no_array &synodes, synode_app_data_array &reply));
@@ -143,6 +152,9 @@
   MOCK_METHOD1(set_belongs_to_group, void(bool));
   MOCK_METHOD1(set_unsafe_current_view, void(Gcs_view *));
   MOCK_METHOD0(get_unsafe_current_view, Gcs_view *());
+
+  MOCK_METHOD0(finalize, void());
+  MOCK_METHOD0(is_finalized, bool());
 };
 
 class Mock_gcs_communication_event_listener
@@ -151,6 +163,30 @@
   MOCK_CONST_METHOD1(on_message_received, void(const Gcs_message &message));
 };
 
+class Mock_gcs_network_provider_management_interface
+    : public Network_provider_management_interface {
+ public:
+  MOCK_METHOD0(initialize, bool());
+  MOCK_METHOD0(finalize, bool());
+  MOCK_METHOD1(set_running_protocol, void(enum_transport_protocol new_value));
+  MOCK_METHOD1(add_network_provider,
+               void(std::shared_ptr<Network_provider> provider));
+  MOCK_CONST_METHOD0(get_running_protocol, enum_transport_protocol());
+  MOCK_CONST_METHOD0(get_incoming_connections_protocol,
+                     enum_transport_protocol());
+  MOCK_CONST_METHOD0(is_xcom_using_ssl, int());
+  MOCK_METHOD1(xcom_set_ssl_mode, int(int mode));
+  MOCK_METHOD1(xcom_get_ssl_mode, int(const char *mode));
+  MOCK_METHOD0(xcom_get_ssl_mode, int());
+  MOCK_METHOD1(xcom_set_ssl_fips_mode, int(int mode));
+  MOCK_METHOD1(xcom_get_ssl_fips_mode, int(const char *mode));
+  MOCK_METHOD0(xcom_get_ssl_fips_mode, int());
+  MOCK_METHOD0(cleanup_secure_connections_context, void());
+  MOCK_METHOD0(finalize_secure_connections_context, void());
+  MOCK_METHOD0(remove_all_network_provider, void());
+  MOCK_METHOD1(remove_network_provider, void(enum_transport_protocol));
+};
+
 class GcsMessageStageFragmentationTest : public GcsBaseTest {
  protected:
   Gcs_xcom_engine m_engine;
@@ -159,8 +195,14 @@
   Mock_gcs_xcom_statistics_updater m_mock_stats;
   Mock_gcs_xcom_proxy m_mock_proxy;
   Mock_gcs_xcom_view_change_control_interface m_mock_vce;
-  Gcs_xcom_communication m_xcom_comm_if{&m_mock_stats, &m_mock_proxy,
-                                        &m_mock_vce, &m_engine, m_mock_gid};
+
+  Gcs_xcom_communication m_xcom_comm_if{
+      &m_mock_stats,
+      &m_mock_proxy,
+      &m_mock_vce,
+      &m_engine,
+      m_mock_gid,
+      std::make_unique<Mock_gcs_network_provider_management_interface>()};
   Gcs_message_stage_split_v2 *m_fragmentation_stage{nullptr};
 
  public:
@@ -246,7 +288,7 @@
   std::tie(buffer_pointer, buffer_size) = packets_out.at(0).serialize();
   auto first_fragment = Gcs_packet::make_incoming_packet(
       std::move(buffer_pointer), buffer_size, synod_first_fragment,
-      m_xcom_comm_if.get_msg_pipeline());
+      synod_first_fragment, m_xcom_comm_if.get_msg_pipeline());
   m_xcom_comm_if.process_user_data_packet(std::move(first_fragment),
                                           std::move(xcom_nodes_first_view));
 
@@ -266,7 +308,7 @@
   std::tie(buffer_pointer, buffer_size) = packets_out.at(1).serialize();
   auto last_fragment = Gcs_packet::make_incoming_packet(
       std::move(buffer_pointer), buffer_size, synod_last_fragment,
-      m_xcom_comm_if.get_msg_pipeline());
+      synod_last_fragment, m_xcom_comm_if.get_msg_pipeline());
   Gcs_view mock_view(
       {Gcs_member_identifier(m_mock_xcom_address.get_member_address())},
       Gcs_xcom_view_identifier(0, 0), {}, {}, m_mock_gid);
diff -Nru mysql-8.0-8.0.26/unittest/gunit/libmysqlgcs/xcom/gcs_msg_stages-t.cc mysql-8.0-8.0.27/unittest/gunit/libmysqlgcs/xcom/gcs_msg_stages-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/libmysqlgcs/xcom/gcs_msg_stages-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/libmysqlgcs/xcom/gcs_msg_stages-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -142,7 +142,7 @@
   unsigned long long buffer_size;
   std::tie(buffer, buffer_size) = packet.serialize();
   auto packet_from_network = Gcs_packet::make_incoming_packet(
-      std::move(buffer), buffer_size, null_synode, pipeline);
+      std::move(buffer), buffer_size, null_synode, null_synode, pipeline);
 
   Gcs_pipeline_incoming_result error_code;
   Gcs_packet packet_in;
@@ -218,7 +218,7 @@
   }
 
   auto packet_from_network = Gcs_packet::make_incoming_packet(
-      std::move(buffer), buffer_size, null_synode, pipeline);
+      std::move(buffer), buffer_size, null_synode, null_synode, pipeline);
 
   Gcs_pipeline_incoming_result error_code;
   Gcs_packet packet_in;
@@ -351,7 +351,7 @@
   std::tie(buffer, buffer_size) = packet.serialize();
 
   auto packet_from_network = Gcs_packet::make_incoming_packet(
-      std::move(buffer), buffer_size, null_synode, pipeline);
+      std::move(buffer), buffer_size, null_synode, null_synode, pipeline);
 
   Gcs_pipeline_incoming_result error_code;
   Gcs_packet packet_in;
@@ -405,7 +405,7 @@
   std::tie(buffer, buffer_size) = packet.serialize();
 
   auto packet_from_network = Gcs_packet::make_incoming_packet(
-      std::move(buffer), buffer_size, null_synode, pipeline);
+      std::move(buffer), buffer_size, null_synode, null_synode, pipeline);
 
   // Configure the receiver pipeline without compression.
   Gcs_message_pipeline receiver_pipeline;
@@ -683,7 +683,7 @@
       Gcs_protocol_version::V2, Gcs_protocol_version::V3,
       Gcs_protocol_version::V5};
   std::vector<Gcs_protocol_version> configured_inc_versions = {
-      Gcs_protocol_version::V2, Gcs_protocol_version::V1,
+      Gcs_protocol_version::HIGHEST_KNOWN, Gcs_protocol_version::V1,
       Gcs_protocol_version::V2, Gcs_protocol_version::V3,
       Gcs_protocol_version::V3};
   std::vector<int> configured_inc_success = {false, true, true, true, false};
@@ -826,8 +826,8 @@
       unsigned long long buffer_size;
       std::tie(buffer, buffer_size) = out.serialize();
 
-      auto in = Gcs_packet::make_incoming_packet(std::move(buffer), buffer_size,
-                                                 null_synode, pipeline);
+      auto in = Gcs_packet::make_incoming_packet(
+          std::move(buffer), buffer_size, null_synode, null_synode, pipeline);
       Gcs_pipeline_incoming_result error_code;
       Gcs_packet packet_in;
       std::tie(error_code, packet_in) =
@@ -908,7 +908,7 @@
   unsigned long long buffer_size;
   std::tie(buffer, buffer_size) = packet.serialize();
   auto packet_from_network = Gcs_packet::make_incoming_packet(
-      std::move(buffer), buffer_size, null_synode, pipeline);
+      std::move(buffer), buffer_size, null_synode, null_synode, pipeline);
 
   Gcs_pipeline_incoming_result error_code;
   Gcs_packet packet_in;
@@ -1026,8 +1026,8 @@
       unsigned long long buffer_size;
       std::tie(buffer, buffer_size) = out.serialize();
 
-      auto in = Gcs_packet::make_incoming_packet(std::move(buffer), buffer_size,
-                                                 null_synode, pipeline);
+      auto in = Gcs_packet::make_incoming_packet(
+          std::move(buffer), buffer_size, null_synode, null_synode, pipeline);
       Gcs_pipeline_incoming_result error_code;
       Gcs_packet packet_in;
       std::tie(error_code, packet_in) =
diff -Nru mysql-8.0-8.0.26/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_communication_interface-t.cc mysql-8.0-8.0.27/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_communication_interface-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_communication_interface-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_communication_interface-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -54,6 +54,9 @@
   MOCK_METHOD1(set_belongs_to_group, void(bool));
   MOCK_METHOD1(set_unsafe_current_view, void(Gcs_view *));
   MOCK_METHOD0(get_unsafe_current_view, Gcs_view *());
+
+  MOCK_METHOD0(finalize, void());
+  MOCK_METHOD0(is_finalized, bool());
 };
 
 class mock_gcs_xcom_statistics_updater : public Gcs_xcom_statistics_updater {
@@ -78,7 +81,8 @@
   }
 
   MOCK_METHOD3(new_node_address_uuid,
-               node_address *(unsigned int n, char *names[], blob uuids[]));
+               node_address *(unsigned int n, char const *names[],
+                              blob uuids[]));
   MOCK_METHOD2(delete_node_address, void(unsigned int n, node_address *na));
   MOCK_METHOD3(xcom_client_add_node, bool(connection_descriptor *con,
                                           node_list *nl, uint32_t group_id));
@@ -89,6 +93,13 @@
                bool(uint32_t group_id, xcom_event_horizon &event_horizon));
   MOCK_METHOD2(xcom_client_set_event_horizon,
                bool(uint32_t group_id, xcom_event_horizon event_horizon));
+  MOCK_METHOD2(xcom_client_set_max_leaders,
+               bool(uint32_t group_id, node_no max_leaders));
+  MOCK_METHOD4(xcom_client_set_leaders,
+               bool(uint32_t group_id, u_int n, char const *names[],
+                    node_no max_nr_leaders));
+  MOCK_METHOD2(xcom_client_get_leaders,
+               bool(uint32_t gid, leader_info_data &leaders));
   MOCK_METHOD4(xcom_client_get_synode_app_data,
                bool(connection_descriptor *con, uint32_t group_id_hash,
                     synode_no_array &synodes, synode_app_data_array &reply));
@@ -149,6 +160,30 @@
   MOCK_METHOD0(xcom_input_try_pop, xcom_input_request_ptr());
 };
 
+class mock_gcs_network_provider_management_interface
+    : public Network_provider_management_interface {
+ public:
+  MOCK_METHOD0(initialize, bool());
+  MOCK_METHOD0(finalize, bool());
+  MOCK_METHOD1(set_running_protocol, void(enum_transport_protocol new_value));
+  MOCK_METHOD1(add_network_provider,
+               void(std::shared_ptr<Network_provider> provider));
+  MOCK_CONST_METHOD0(get_running_protocol, enum_transport_protocol());
+  MOCK_CONST_METHOD0(get_incoming_connections_protocol,
+                     enum_transport_protocol());
+  MOCK_CONST_METHOD0(is_xcom_using_ssl, int());
+  MOCK_METHOD1(xcom_set_ssl_mode, int(int mode));
+  MOCK_METHOD1(xcom_get_ssl_mode, int(const char *mode));
+  MOCK_METHOD0(xcom_get_ssl_mode, int());
+  MOCK_METHOD1(xcom_set_ssl_fips_mode, int(int mode));
+  MOCK_METHOD1(xcom_get_ssl_fips_mode, int(const char *mode));
+  MOCK_METHOD0(xcom_get_ssl_fips_mode, int());
+  MOCK_METHOD0(cleanup_secure_connections_context, void());
+  MOCK_METHOD0(finalize_secure_connections_context, void());
+  MOCK_METHOD0(remove_all_network_provider, void());
+  MOCK_METHOD1(remove_network_provider, void(enum_transport_protocol));
+};
+
 class XComCommunicationTest : public GcsBaseTest {
  protected:
   void SetUp() override {
@@ -164,18 +199,25 @@
     mock_stats = new mock_gcs_xcom_statistics_updater();
     mock_proxy = new mock_gcs_xcom_proxy();
     mock_vce = new mock_gcs_xcom_view_change_control_interface();
-    xcom_comm_if = new Gcs_xcom_communication(mock_stats, mock_proxy, mock_vce,
-                                              engine, *mock_gid);
+    net_mgr_interface =
+        std::make_unique<mock_gcs_network_provider_management_interface>();
+    xcom_comm_if =
+        new Gcs_xcom_communication(mock_stats, mock_proxy, mock_vce, engine,
+                                   *mock_gid, std::move(net_mgr_interface));
 
     // clang-format off
     xcom_comm_if->get_msg_pipeline().register_stage<Gcs_message_stage_lz4>();
     xcom_comm_if->get_msg_pipeline().register_stage<Gcs_message_stage_lz4_v2>();
+    xcom_comm_if->get_msg_pipeline().register_stage<Gcs_message_stage_lz4_v3>();
     xcom_comm_if->get_msg_pipeline().register_pipeline({
       {
         Gcs_protocol_version::V1, { Stage_code::ST_LZ4_V1 }
       },
       {
         Gcs_protocol_version::V2, { Stage_code::ST_LZ4_V2 }
+      },
+      {
+        Gcs_protocol_version::V3, { Stage_code::ST_LZ4_V3 }
       }
     });
     // clang-format on
@@ -199,6 +241,8 @@
   Gcs_xcom_node_address *mock_xcom_address;
   Gcs_xcom_engine *engine;
   Gcs_group_identifier *mock_gid;
+  std::unique_ptr<mock_gcs_network_provider_management_interface>
+      net_mgr_interface;
 };
 
 TEST_F(XComCommunicationTest, SetEventListenerTest) {
@@ -337,7 +381,7 @@
   packet_synode.msgno = 0;
   packet_synode.node = 0;
   auto packet = Gcs_packet::make_incoming_packet(
-      std::move(buffer), buffer_len, packet_synode,
+      std::move(buffer), buffer_len, packet_synode, packet_synode,
       xcom_comm_if->get_msg_pipeline());
 
   int listener_ref = xcom_comm_if->add_event_listener(ev_listener);
@@ -409,7 +453,7 @@
   packet_synode.msgno = 0;
   packet_synode.node = 0;
   auto packet = Gcs_packet::make_incoming_packet(
-      std::move(buffer), buffer_len, packet_synode,
+      std::move(buffer), buffer_len, packet_synode, packet_synode,
       xcom_comm_if->get_msg_pipeline());
 
   /*
@@ -580,7 +624,7 @@
     std::tie(buffer, buffer_len) = packet_out.serialize();
     synode_no const &packet_synode = synodes_in_order.at(i);
     auto packet = Gcs_packet::make_incoming_packet(
-        std::move(buffer), buffer_len, packet_synode, pipeline);
+        std::move(buffer), buffer_len, packet_synode, packet_synode, pipeline);
 
     /* Reassemble the packets. */
     Gcs_pipeline_incoming_result error_code;
diff -Nru mysql-8.0-8.0.26/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_control_interface-t.cc mysql-8.0-8.0.27/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_control_interface-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_control_interface-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_control_interface-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -37,6 +37,8 @@
 
 using std::string;
 
+using ::testing::NiceMock;
+
 namespace gcs_xcom_control_unittest {
 typedef enum { JJ = 0, LL = 1, JL = 2, LJ = 3 } InvocationOrder;
 
@@ -150,6 +152,9 @@
   MOCK_METHOD0(wait_for_view_change_end, void());
   MOCK_METHOD0(is_view_changing, bool());
 
+  MOCK_METHOD0(finalize, void());
+  MOCK_METHOD0(is_finalized, bool());
+
   bool start_leave() override {
     bool retval = false;
 
@@ -338,7 +343,8 @@
   }
 
   MOCK_METHOD3(new_node_address_uuid,
-               node_address *(unsigned int n, char *names[], blob uuids[]));
+               node_address *(unsigned int n, char const *names[],
+                              blob uuids[]));
   MOCK_METHOD2(delete_node_address, void(unsigned int n, node_address *na));
   MOCK_METHOD3(xcom_client_add_node, bool(connection_descriptor *con,
                                           node_list *nl, uint32_t group_id));
@@ -352,6 +358,13 @@
                     xcom_event_horizon event_horizon));
   MOCK_METHOD2(xcom_client_set_event_horizon,
                bool(uint32_t group_id, xcom_event_horizon event_horizon));
+  MOCK_METHOD2(xcom_client_set_max_leaders,
+               bool(uint32_t group_id, node_no max_leaders));
+  MOCK_METHOD4(xcom_client_set_leaders,
+               bool(uint32_t group_id, u_int n, char const *names[],
+                    node_no max_nr_leaders));
+  MOCK_METHOD2(xcom_client_get_leaders,
+               bool(uint32_t gid, leader_info_data &leaders));
   MOCK_METHOD4(xcom_client_get_synode_app_data,
                bool(connection_descriptor *con, uint32_t group_id,
                     synode_no_array &synodes, synode_app_data_array &reply));
@@ -434,20 +447,47 @@
   MOCK_METHOD1(disable_nagle_in_socket, int(int fd));
 };
 
+class mock_gcs_network_provider_operations_interface
+    : public Network_provider_operations_interface {
+ public:
+  mock_gcs_network_provider_operations_interface() {
+    ON_CALL(*this, start_active_network_provider())
+        .WillByDefault(Return(false));
+    ON_CALL(*this, stop_all_network_providers()).WillByDefault(Return(false));
+    ON_CALL(*this, stop_active_network_provider()).WillByDefault(Return(false));
+    ON_CALL(*this, configure_active_provider(_)).WillByDefault(Return(false));
+    ON_CALL(*this, configure_active_provider_secure_connections(_))
+        .WillByDefault(Return(false));
+  }
+
+  MOCK_METHOD0(start_active_network_provider, bool());
+  MOCK_METHOD0(stop_all_network_providers, bool());
+  MOCK_METHOD0(stop_active_network_provider, bool());
+  MOCK_METHOD1(configure_active_provider,
+               bool(Network_configuration_parameters &params));
+  MOCK_METHOD1(configure_active_provider_secure_connections,
+               bool(Network_configuration_parameters &params));
+  MOCK_METHOD0(remove_all_network_provider, void());
+  MOCK_METHOD1(remove_network_provider,
+               void(enum_transport_protocol provider_key));
+};
+
 class mock_gcs_xcom_control : public Gcs_xcom_control {
  public:
-  mock_gcs_xcom_control(Gcs_xcom_node_address *xcom_node_address,
-                        std::vector<Gcs_xcom_node_address *> &xcom_peers,
-                        Gcs_group_identifier group_identifier,
-                        Gcs_xcom_proxy *xcom_proxy,
-                        Gcs_xcom_group_management *xcom_group_management,
-                        Gcs_xcom_engine *gcs_engine,
-                        Gcs_xcom_state_exchange_interface *state_exchange,
-                        Gcs_xcom_view_change_control_interface *view_control,
-                        bool boot, My_xp_socket_util *socket_util)
+  mock_gcs_xcom_control(
+      Gcs_xcom_node_address *xcom_node_address,
+      std::vector<Gcs_xcom_node_address *> &xcom_peers,
+      Gcs_group_identifier group_identifier, Gcs_xcom_proxy *xcom_proxy,
+      Gcs_xcom_group_management *xcom_group_management,
+      Gcs_xcom_engine *gcs_engine,
+      Gcs_xcom_state_exchange_interface *state_exchange,
+      Gcs_xcom_view_change_control_interface *view_control, bool boot,
+      My_xp_socket_util *socket_util,
+      std::unique_ptr<Network_provider_operations_interface> network_ops)
       : Gcs_xcom_control(xcom_node_address, xcom_peers, group_identifier,
                          xcom_proxy, xcom_group_management, gcs_engine,
-                         state_exchange, view_control, boot, socket_util) {}
+                         state_exchange, view_control, boot, socket_util,
+                         std::move(network_ops)) {}
 
   enum_gcs_error join() override { return join(nullptr); }
 
@@ -518,9 +558,9 @@
     m_wait_called_mutex.init(PSI_NOT_INSTRUMENTED, nullptr);
     m_wait_called_cond.init(PSI_NOT_INSTRUMENTED);
 
-    mock_se = new mock_gcs_xcom_state_exchange_interface();
+    mock_se = new NiceMock<mock_gcs_xcom_state_exchange_interface>();
 
-    mock_vce = new mock_gcs_xcom_view_change_control_interface();
+    mock_vce = new NiceMock<mock_gcs_xcom_view_change_control_interface>();
 
     xcom_node_address = new Gcs_xcom_node_address("127.0.0.1:12345");
     peers.push_back(new Gcs_xcom_node_address("127.0.0.1:12345"));
@@ -530,15 +570,20 @@
     string group_name("only_group");
     group_id = new Gcs_group_identifier(group_name);
 
-    mock_socket_util = new mock_my_xp_socket_util();
+    mock_socket_util = new NiceMock<mock_my_xp_socket_util>();
 
     gcs_engine.initialize(nullptr);
 
     xcom_group_mgm = new Gcs_xcom_group_management(&proxy, *group_id);
 
-    xcom_control_if = new mock_gcs_xcom_control(
+    mock_net_ops_for_interface =
+        std::make_unique<mock_gcs_network_provider_operations_interface>();
+    mock_net_ops = mock_net_ops_for_interface.get();
+
+    xcom_control_if = new NiceMock<mock_gcs_xcom_control>(
         xcom_node_address, peers, *group_id, &proxy, xcom_group_mgm,
-        &gcs_engine, mock_se, mock_vce, true, mock_socket_util);
+        &gcs_engine, mock_se, mock_vce, true, mock_socket_util,
+        std::move(mock_net_ops_for_interface));
     extern_xcom_control_if = xcom_control_if;
   }
 
@@ -565,13 +610,16 @@
 
   Gcs_group_identifier *group_id;
 
-  mock_gcs_xcom_proxy proxy;
-  mock_gcs_control_event_listener mock_ev_listener;
+  NiceMock<mock_gcs_xcom_proxy> proxy;
+  NiceMock<mock_gcs_control_event_listener> mock_ev_listener;
 
-  mock_gcs_xcom_control *xcom_control_if;
-  mock_gcs_xcom_state_exchange_interface *mock_se;
-  mock_gcs_xcom_view_change_control_interface *mock_vce;
-  mock_my_xp_socket_util *mock_socket_util;
+  NiceMock<mock_gcs_xcom_control> *xcom_control_if;
+  NiceMock<mock_gcs_xcom_state_exchange_interface> *mock_se;
+  NiceMock<mock_gcs_xcom_view_change_control_interface> *mock_vce;
+  NiceMock<mock_my_xp_socket_util> *mock_socket_util;
+  mock_gcs_network_provider_operations_interface *mock_net_ops;
+  std::unique_ptr<mock_gcs_network_provider_operations_interface>
+      mock_net_ops_for_interface;
 
   bool m_wait_called;
   My_xp_mutex_impl m_wait_called_mutex;
@@ -601,14 +649,18 @@
   }
 };
 
+/**
+ * @brief This test exercices a basic leave-join scenario.
+ *
+ */
 TEST_F(XComControlTest, JoinLeaveTest) {
   EXPECT_CALL(proxy, xcom_input_connect(_, _)).Times(1);
   EXPECT_CALL(proxy, test_xcom_tcp_connection(_, _)).Times(1);
   EXPECT_CALL(proxy, xcom_client_boot(_, _)).Times(1);
   EXPECT_CALL(proxy, xcom_client_remove_node(_, _)).Times(1);
-  EXPECT_CALL(proxy, xcom_wait_for_xcom_comms_status_change(_))
+  /*EXPECT_CALL(proxy, xcom_wait_for_xcom_comms_status_change(_))
       .Times(1)
-      .WillOnce(SetArgReferee<0>(GCS_OK));
+      .WillOnce(SetArgReferee<0>(GCS_OK));*/
   EXPECT_CALL(proxy, xcom_wait_ready()).Times(1);
   EXPECT_CALL(proxy, xcom_wait_exit()).Times(1);
   EXPECT_CALL(proxy, xcom_init(_)).Times(1);
@@ -623,14 +675,16 @@
   ASSERT_FALSE(xcom_control_if->is_xcom_running());
 }
 
+/**
+ * @brief This test exercises a join() after a successful join()
+ *
+ */
 TEST_F(XComControlTest, JoinTestFailedMultipleJoins) {
   EXPECT_CALL(proxy, xcom_input_connect(_, _)).Times(1);
   EXPECT_CALL(proxy, test_xcom_tcp_connection(_, _)).Times(1);
   EXPECT_CALL(proxy, xcom_client_boot(_, _)).Times(1);
   EXPECT_CALL(proxy, xcom_client_remove_node(_, _)).Times(1);
-  EXPECT_CALL(proxy, xcom_wait_for_xcom_comms_status_change(_))
-      .Times(1)
-      .WillOnce(SetArgReferee<0>(GCS_OK));
+
   EXPECT_CALL(proxy, xcom_wait_ready()).Times(1);
   EXPECT_CALL(proxy, xcom_wait_exit()).Times(1);
   EXPECT_CALL(proxy, xcom_init(_)).Times(1);
@@ -649,11 +703,14 @@
   ASSERT_FALSE(xcom_control_if->is_xcom_running());
 }
 
+/**
+ * @brief This test exercises a failed
+ *
+ */
 TEST_F(XComControlTest, JoinTestFailedToStartComms) {
   EXPECT_CALL(proxy, xcom_client_boot(_, _)).Times(0);
   EXPECT_CALL(proxy, xcom_wait_ready()).Times(0);
   EXPECT_CALL(proxy, xcom_init(_)).Times(1);
-  EXPECT_CALL(proxy, xcom_exit()).Times(1);
 
   /*
     The join is forced to wait until the XCOM's tread is running.
@@ -702,28 +759,6 @@
   ASSERT_FALSE(xcom_control_if->is_xcom_running());
 }
 
-TEST_F(XComControlTest, JoinTestTimeoutStartingComms) {
-  Gcs_xcom_proxy *my_proxy = new Gcs_xcom_proxy_impl();
-
-  EXPECT_CALL(proxy, xcom_init(_)).Times(1);
-  EXPECT_CALL(proxy, xcom_exit()).Times(1);
-
-  /*
-    The join is forced to wait until the XCOM's tread is running.
-    In this test case though, we make the operation time out.
-  */
-  EXPECT_CALL(proxy, xcom_wait_for_xcom_comms_status_change(_))
-      .Times(1)
-      .WillOnce(Invoke(
-          my_proxy, &Gcs_xcom_proxy::xcom_wait_for_xcom_comms_status_change));
-
-  enum_gcs_error result = xcom_control_if->join();
-  ASSERT_EQ(GCS_NOK, result);
-  ASSERT_FALSE(xcom_control_if->is_xcom_running());
-
-  delete my_proxy;
-}
-
 TEST_F(XComControlTest, JoinTestFailedToStartXCom) {
   EXPECT_CALL(proxy, xcom_input_connect(_, _)).Times(1);
   EXPECT_CALL(proxy, test_xcom_tcp_connection(_, _)).Times(1);
@@ -731,7 +766,6 @@
   EXPECT_CALL(proxy, xcom_wait_ready()).Times(1).WillOnce(Return(GCS_NOK));
   EXPECT_CALL(proxy, xcom_init(_)).Times(1);
   EXPECT_CALL(proxy, xcom_exit()).Times(1);
-  EXPECT_CALL(proxy, xcom_wait_for_xcom_comms_status_change(_)).Times(1);
 
   enum_gcs_error result = xcom_control_if->join();
 
@@ -749,7 +783,6 @@
       .WillOnce(Invoke(my_proxy, &Gcs_xcom_proxy::xcom_wait_ready));
   EXPECT_CALL(proxy, xcom_init(_)).Times(1);
   EXPECT_CALL(proxy, xcom_exit()).Times(1);
-  EXPECT_CALL(proxy, xcom_wait_for_xcom_comms_status_change(_)).Times(1);
 
   enum_gcs_error result = xcom_control_if->join();
 
@@ -781,6 +814,32 @@
       (connection_descriptor *)malloc(sizeof(connection_descriptor));
   con->fd = 0;
 
+  /*connection_descriptor *failed_con =
+      (connection_descriptor *)malloc(sizeof(connection_descriptor *));
+  failed_con->fd = -1;*/
+
+  auto create_failed_con_lambda = [](std::string a, xcom_port b) {
+    (void)a;
+    (void)b;
+
+    connection_descriptor *failed_con =
+        (connection_descriptor *)malloc(sizeof(connection_descriptor));
+    failed_con->fd = -1;
+
+    return failed_con;
+  };
+
+  auto create_good_con_lambda = [](std::string a, xcom_port b) {
+    (void)a;
+    (void)b;
+
+    connection_descriptor *failed_con =
+        (connection_descriptor *)malloc(sizeof(connection_descriptor));
+    failed_con->fd = 0;
+
+    return failed_con;
+  };
+
   EXPECT_CALL(proxy, xcom_input_connect(_, _)).Times(1);
   EXPECT_CALL(proxy, test_xcom_tcp_connection(_, _)).Times(1);
   EXPECT_CALL(proxy, xcom_client_boot(_, _)).Times(0);
@@ -790,7 +849,7 @@
   // Fail to connect to the peer every time.
   EXPECT_CALL(proxy, xcom_client_open_connection(Eq("127.0.0.1"), Eq(12346)))
       .Times(3)
-      .WillRepeatedly(Return((connection_descriptor *)nullptr));
+      .WillRepeatedly(create_failed_con_lambda);
 
   /*
    Fail to connect on the first attempt.
@@ -799,8 +858,8 @@
   */
   EXPECT_CALL(proxy, xcom_client_open_connection(Eq("127.0.0.1"), Eq(12347)))
       .Times(3)
-      .WillOnce(Return((connection_descriptor *)nullptr))
-      .WillRepeatedly(Return((connection_descriptor *)con));
+      .WillOnce(create_failed_con_lambda)
+      .WillRepeatedly(create_good_con_lambda);
   EXPECT_CALL(*mock_socket_util, disable_nagle_in_socket(_))
       .Times(2)
       .WillOnce(Return(-1))
@@ -822,24 +881,34 @@
   result = xcom_control_if->leave();
   ASSERT_EQ(GCS_OK, result);
   ASSERT_FALSE(xcom_control_if->is_xcom_running());
-
-  free(con);
 }
 
 TEST_F(XComControlTest, JoinTestAllPeersUnavailable) {
+  auto create_failed_con_lambda = [](std::string a, xcom_port b) {
+    (void)a;
+    (void)b;
+
+    connection_descriptor *failed_con =
+        (connection_descriptor *)malloc(sizeof(connection_descriptor));
+    failed_con->fd = -1;
+
+    return failed_con;
+  };
+
   EXPECT_CALL(proxy, xcom_input_connect(_, _)).Times(1);
   EXPECT_CALL(proxy, test_xcom_tcp_connection(_, _)).Times(1);
   EXPECT_CALL(proxy, xcom_client_boot(_, _)).Times(0);
   EXPECT_CALL(proxy, xcom_wait_ready()).Times(0);
   EXPECT_CALL(proxy, xcom_init(_)).Times(1);
   EXPECT_CALL(proxy, xcom_exit()).Times(1);
+
   /*
    Fail to connect to all peers every time.
    peers.size() - 1 because we skip our own address.
   */
   EXPECT_CALL(proxy, xcom_client_open_connection(_, _))
       .Times((peers.size() - 1) * Gcs_xcom_control::CONNECTION_ATTEMPTS)
-      .WillRepeatedly(Return((connection_descriptor *)nullptr));
+      .WillRepeatedly(create_failed_con_lambda);
   EXPECT_CALL(*mock_socket_util, disable_nagle_in_socket(_)).Times(0);
   EXPECT_CALL(proxy, xcom_client_add_node(_, _, _)).Times(0);
   EXPECT_CALL(proxy, xcom_client_remove_node(_, _, _)).Times(0);
@@ -1015,9 +1084,14 @@
   uuid_2.encode(reinterpret_cast<uchar **>(&blob_2.data.data_val),
                 &blob_2.data.data_len);
 
-  node_address node_addrs[2] = {
-      {const_cast<char *>("127.0.0.1:12345"), blob_1, {x_1_0, x_1_2}},
-      {const_cast<char *>("127.0.0.1:12346"), blob_2, {x_1_0, x_1_2}}};
+  node_address node_addrs[2] = {{const_cast<char *>("127.0.0.1:12345"),
+                                 blob_1,
+                                 {x_1_0, x_1_2},
+                                 P_PROP | P_ACC | P_LEARN},
+                                {const_cast<char *>("127.0.0.1:12346"),
+                                 blob_2,
+                                 {x_1_0, x_1_2},
+                                 P_PROP | P_ACC | P_LEARN}};
 
   // Common unit test data
   Gcs_xcom_view_identifier *view_id = new Gcs_xcom_view_identifier(999999, 27);
@@ -1197,10 +1271,18 @@
   uuid_3.encode(reinterpret_cast<uchar **>(&blob_3.data.data_val),
                 &blob_3.data.data_len);
 
-  node_address node_addrs[3] = {
-      {const_cast<char *>("127.0.0.1:12345"), blob_1, {x_1_0, x_1_2}},
-      {const_cast<char *>("127.0.0.1:12343"), blob_2, {x_1_0, x_1_2}},
-      {const_cast<char *>("127.0.0.1:12341"), blob_3, {x_1_0, x_1_2}}};
+  node_address node_addrs[3] = {{const_cast<char *>("127.0.0.1:12345"),
+                                 blob_1,
+                                 {x_1_0, x_1_2},
+                                 P_PROP | P_ACC | P_LEARN},
+                                {const_cast<char *>("127.0.0.1:12343"),
+                                 blob_2,
+                                 {x_1_0, x_1_2},
+                                 P_PROP | P_ACC | P_LEARN},
+                                {const_cast<char *>("127.0.0.1:12341"),
+                                 blob_3,
+                                 {x_1_0, x_1_2},
+                                 P_PROP | P_ACC | P_LEARN}};
 
   site_def *site_config = new_site_def();
   init_site_def(3, node_addrs, site_config);
@@ -1321,9 +1403,14 @@
   uuid_2.encode(reinterpret_cast<uchar **>(&blob_2.data.data_val),
                 &blob_2.data.data_len);
 
-  node_address node_addrs[2] = {
-      {const_cast<char *>("127.0.0.1:12345"), blob_1, {x_1_0, x_1_2}},
-      {const_cast<char *>("127.0.0.1:12343"), blob_2, {x_1_0, x_1_2}}};
+  node_address node_addrs[2] = {{const_cast<char *>("127.0.0.1:12345"),
+                                 blob_1,
+                                 {x_1_0, x_1_2},
+                                 P_PROP | P_ACC | P_LEARN},
+                                {const_cast<char *>("127.0.0.1:12343"),
+                                 blob_2,
+                                 {x_1_0, x_1_2},
+                                 P_PROP | P_ACC | P_LEARN}};
 
   site_def *site_config = new_site_def();
   init_site_def(2, node_addrs, site_config);
@@ -1927,7 +2014,6 @@
   EXPECT_CALL(proxy, test_xcom_tcp_connection(_, _)).Times(1);
   EXPECT_CALL(proxy, xcom_client_boot(_, _)).Times(1);
   EXPECT_CALL(proxy, xcom_client_remove_node(_, _)).Times(1);
-  EXPECT_CALL(proxy, xcom_wait_for_xcom_comms_status_change(_)).Times(1);
   EXPECT_CALL(proxy, xcom_wait_ready()).Times(1);
   EXPECT_CALL(proxy, xcom_init(_)).Times(1);
   EXPECT_CALL(proxy, xcom_exit()).Times(0);
@@ -2170,8 +2256,10 @@
   uuid.encode(reinterpret_cast<uchar **>(&blob.data.data_val),
               &blob.data.data_len);
 
-  node_address node_addrs[1] = {
-      {const_cast<char *>(member_id_2.c_str()), blob, {x_1_0, x_1_2}}};
+  node_address node_addrs[1] = {{const_cast<char *>(member_id_2.c_str()),
+                                 blob,
+                                 {x_1_0, x_1_2},
+                                 P_PROP | P_ACC | P_LEARN}};
 
   site_def *site_config = new_site_def();
   init_site_def(1, node_addrs, site_config);
@@ -2229,9 +2317,9 @@
 
    Upon receiving V2, does NOT expel `suspect_1`. The only reason to expel
    `suspect_1` is because the view states that there is a majority of members
-   alive, `(me, suspect_2)` vs. `{suspect_1}`. But we have already ordered the
-   expel of `suspect_2`, so it should be counted as if it is failed. In this
-   case, there is no majority, `(me)` vs. `{suspect_1, suspect_2}`, so
+   alive, `(me, suspect_2)` vs. `{suspect_1}`. But we have already ordered
+   the expel of `suspect_2`, so it should be counted as if it is failed. In
+   this case, there is no majority, `(me)` vs. `{suspect_1, suspect_2}`, so
    `suspect_1` should not be expelled.
 
    Upon receiving V3, expels `me`, due to the `force_remove` flag in the
diff -Nru mysql-8.0-8.0.26/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_group_management-t.cc mysql-8.0-8.0.27/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_group_management-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_group_management-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_group_management-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -41,7 +41,8 @@
   }
 
   MOCK_METHOD3(new_node_address_uuid,
-               node_address *(unsigned int n, char *names[], blob uuid[]));
+               node_address *(unsigned int n, char const *names[],
+                              blob uuids[]));
   MOCK_METHOD2(delete_node_address, void(unsigned int n, node_address *na));
   MOCK_METHOD3(xcom_client_add_node, bool(connection_descriptor *fd,
                                           node_list *nl, uint32_t group_id));
@@ -52,6 +53,13 @@
                bool(uint32_t group_id, xcom_event_horizon &event_horizon));
   MOCK_METHOD2(xcom_client_set_event_horizon,
                bool(uint32_t group_id, xcom_event_horizon event_horizon));
+  MOCK_METHOD2(xcom_client_set_max_leaders,
+               bool(uint32_t group_id, node_no max_leaders));
+  MOCK_METHOD4(xcom_client_set_leaders,
+               bool(uint32_t group_id, u_int n, char const *names[],
+                    node_no max_nr_leaders));
+  MOCK_METHOD2(xcom_client_get_leaders,
+               bool(uint32_t gid, leader_info_data &leaders));
   MOCK_METHOD4(xcom_client_get_synode_app_data,
                bool(connection_descriptor *con, uint32_t group_id_hash,
                     synode_no_array &synodes, synode_app_data_array &reply));
@@ -170,10 +178,12 @@
 TEST_F(XcomGroupManagementTest, TestListContent) {
   Gcs_xcom_node_information node_1("127.0.0.1:12345");
   Gcs_xcom_node_information node_2("127.0.0.1:12346");
+  Gcs_xcom_node_information node_3("127.0.0.1:12347");
 
   Gcs_xcom_nodes nodes;
   nodes.add_node(node_1);
   nodes.add_node(node_2);
+  nodes.add_node(node_3);
 
   node_list nl;
   nl.node_list_len = 2;
@@ -190,8 +200,8 @@
       reinterpret_cast<uchar **>(&blobs[1].data.data_val),
       &blobs[1].data.data_len);
 
-  nl.node_list_val = ::new_node_address_uuid(
-      nl.node_list_len, const_cast<char **>(node_addrs), blobs);
+  nl.node_list_val =
+      ::new_node_address_uuid(nl.node_list_len, node_addrs, blobs);
 
   EXPECT_CALL(proxy, xcom_client_force_config(node_list_pointer_matcher(nl), _))
       .Times(1)
@@ -208,6 +218,59 @@
   ASSERT_EQ((unsigned)2, nl.node_list_len);
   ASSERT_STREQ("127.0.0.1:12345", nl.node_list_val[0].address);
   ASSERT_STREQ("127.0.0.1:12346", nl.node_list_val[1].address);
+
+  ::delete_node_address(nl.node_list_len, nl.node_list_val);
+
+  free(blobs[0].data.data_val);
+  free(blobs[1].data.data_val);
+}
+
+TEST_F(XcomGroupManagementTest, DisallowForcingSameMembership) {
+  Gcs_xcom_node_information node_1("127.0.0.1:12345");
+  Gcs_xcom_node_information node_2("127.0.0.1:12346");
+
+  Gcs_xcom_nodes nodes;
+  nodes.add_node(node_1);
+  nodes.add_node(node_2);
+
+  node_list nl;
+  nl.node_list_len = 2;
+  const char *node_addrs[] = {node_1.get_member_id().get_member_id().c_str(),
+                              node_2.get_member_id().get_member_id().c_str()};
+  blob blobs[] = {{{0, static_cast<char *>(malloc(
+                           node_1.get_member_uuid().actual_value.size()))}},
+                  {{0, static_cast<char *>(malloc(
+                           node_2.get_member_uuid().actual_value.size()))}}};
+  node_1.get_member_uuid().encode(
+      reinterpret_cast<uchar **>(&blobs[0].data.data_val),
+      &blobs[0].data.data_len);
+  node_2.get_member_uuid().encode(
+      reinterpret_cast<uchar **>(&blobs[1].data.data_val),
+      &blobs[1].data.data_len);
+
+  nl.node_list_val =
+      ::new_node_address_uuid(nl.node_list_len, node_addrs, blobs);
+
+  EXPECT_CALL(proxy, xcom_client_force_config(node_list_pointer_matcher(nl), _))
+      .Times(0);
+
+  xcom_group_mgmt_if->set_xcom_nodes(nodes);
+
+  Gcs_interface_parameters forced_group_1;
+  forced_group_1.add_parameter("peer_nodes", "127.0.0.1:12346,127.0.0.1:12345");
+  enum_gcs_error result_1 =
+      xcom_group_mgmt_if->modify_configuration(forced_group_1);
+  ASSERT_EQ(GCS_NOK, result_1);
+
+  Gcs_interface_parameters forced_group_2;
+  forced_group_2.add_parameter("peer_nodes", "127.0.0.1:12345,127.0.0.1:12346");
+  enum_gcs_error result_2 =
+      xcom_group_mgmt_if->modify_configuration(forced_group_2);
+  ASSERT_EQ(GCS_NOK, result_2);
+
+  ASSERT_EQ((unsigned)2, nl.node_list_len);
+  ASSERT_STREQ("127.0.0.1:12345", nl.node_list_val[0].address);
+  ASSERT_STREQ("127.0.0.1:12346", nl.node_list_val[1].address);
 
   ::delete_node_address(nl.node_list_len, nl.node_list_val);
 
diff -Nru mysql-8.0-8.0.26/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_group_member_information-t.cc mysql-8.0-8.0.27/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_group_member_information-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_group_member_information-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_group_member_information-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -588,7 +588,7 @@
   Gcs_xcom_uuid uuid_2;
 
   unsigned int length = 0;
-  char **addrs = nullptr;
+  char const **addrs = nullptr;
   blob *uuids = nullptr;
 
   nodes.encode(&length, &addrs, &uuids);
@@ -629,9 +629,14 @@
   uuid_2.encode(reinterpret_cast<uchar **>(&blob_2.data.data_val),
                 &blob_2.data.data_len);
 
-  node_address node_addrs[2] = {
-      {const_cast<char *>("127.0.0.1:12345"), blob_1, {x_1_0, x_1_2}},
-      {const_cast<char *>("127.0.0.1:12343"), blob_2, {x_1_0, x_1_2}}};
+  node_address node_addrs[2] = {{const_cast<char *>("127.0.0.1:12345"),
+                                 blob_1,
+                                 {x_1_0, x_1_2},
+                                 P_PROP | P_ACC | P_LEARN},
+                                {const_cast<char *>("127.0.0.1:12343"),
+                                 blob_2,
+                                 {x_1_0, x_1_2},
+                                 P_PROP | P_ACC | P_LEARN}};
 
   site_def *site_config = new_site_def();
   init_site_def(2, node_addrs, site_config);
diff -Nru mysql-8.0-8.0.26/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_interface_unit-t.cc mysql-8.0-8.0.27/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_interface_unit-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_interface_unit-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_interface_unit-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -29,7 +29,7 @@
 
 using std::vector;
 
-extern void do_cb_xcom_receive_data(synode_no message_id,
+extern void do_cb_xcom_receive_data(synode_no message_id, synode_no origin,
                                     Gcs_xcom_nodes *xcom_nodes,
                                     synode_no last_removed, u_int size,
                                     char *data);
@@ -81,7 +81,8 @@
   gcs->initialize(if_params);
 
   // invoke the callback with a message with size zero
-  do_cb_xcom_receive_data(null_synode, nullptr, null_synode, 0, nullptr);
+  do_cb_xcom_receive_data(null_synode, null_synode, nullptr, null_synode, 0,
+                          nullptr);
 
   // finalize the interface
   gcs->finalize();
diff -Nru mysql-8.0-8.0.26/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_network_provider_manager-t.cc mysql-8.0-8.0.27/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_network_provider_manager-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_network_provider_manager-t.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_network_provider_manager-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,339 @@
+/* Copyright (c) 2020, 2021 Oracle and/or its affiliates. All rights reserved.
+
+   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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/include/network_provider.h"
+#include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/network_provider_manager.h"
+#include "unittest/gunit/libmysqlgcs/include/gcs_base_test.h"
+
+namespace gcs_xcom_networkprovidermamangertest {
+
+class mock_network_provider : public Network_provider {
+ public:
+  MOCK_METHOD(int, start, (), (override));
+  MOCK_METHOD(int, stop, (), (override));
+  MOCK_METHOD(enum_transport_protocol, get_communication_stack, (),
+              (const, override));
+  MOCK_METHOD(bool, configure, (const Network_configuration_parameters &params),
+              (override));
+  MOCK_METHOD(bool, configure_secure_connections,
+              (const Network_configuration_parameters &params), (override));
+  MOCK_METHOD(std::unique_ptr<Network_connection>, open_connection,
+              (const std::string &address, const unsigned short port,
+               const Network_security_credentials &security_credentials,
+               int connection_timeout),
+              (override));
+  MOCK_METHOD(int, close_connection, (const Network_connection &connection),
+              (override));
+  MOCK_METHOD(bool, cleanup_secure_connections_context, (), (override));
+  MOCK_METHOD(bool, finalize_secure_connections_context, (), (override));
+};
+
+/**
+ * @brief This is the test suite for the Network Provider Manager. Each test
+ *         will create a mock provider and exercise the Manager's behaviour.
+ *
+ *         Note that the test subject is a singleton. Meaning that the state
+ *         must be cleansed after each individual test.
+ *
+ * XComNetworkProviderManagerTest.BasicManagerTest
+ *   Adds a network provider, starts and stops it and removes
+ *
+ * XComNetworkProviderManagerTest.ManagerShortcutMethodsTest
+ *   Uses add_and_start, stops and removes
+ *
+ * XComNetworkProviderManagerTest.DoubleAddManagerTest
+ *   Tries to add the same provider twice. It will do so, but the side effect
+ *   is calling stop() twice
+ *
+ * XComNetworkProviderManagerTest.RemoveAndStartAndStopProviderManagerTest
+ *   Adds and removes a Provider and then tries to start and stop.
+ *   start and stop will never be called.
+ *
+ * XComNetworkProviderManagerTest.RemoveAllAndStartAndStopProviderManagerTest
+ *   Adds and removes all providers and then tries to start and stop.
+ *   start and stop will never be called.
+ *
+ * XComNetworkProviderManagerTest.BasicManagerActiveProviderTest
+ *    Adds a network provider with XCOM which is the default active provider,
+ *    starts, stops it and remove.
+ *
+ * XComNetworkProviderManagerTest.BasicManagerActiveProviderWithSSLTest
+ *    Adds a network provider with XCOM which is the default active provider,
+ *    SSL enabled, starts, stops it and remove.
+ *
+ * XComNetworkProviderManagerTest.BasicManagerActiveFailProviderTest
+ *    Adds a network provider with MYSQL which is NOT the default active
+ * provider, start and stop must fail and remove.
+ *
+ * XComNetworkProviderManagerTest.BasicManagerActiveProviderInterfaceTest
+ *   Does the whole path for a provider: add, open a connection, receive a
+ * connection, stop and remove.
+ *
+ */
+
+class XComNetworkProviderManagerTest : public GcsBaseTest {
+ protected:
+  XComNetworkProviderManagerTest() {}
+
+  virtual void SetUp() {}
+
+  virtual void TearDown() {}
+};
+
+TEST_F(XComNetworkProviderManagerTest, BasicManagerTest) {
+  std::shared_ptr<mock_network_provider> mock_provider =
+      std::make_shared<mock_network_provider>();
+  EXPECT_CALL(*mock_provider, get_communication_stack())
+      .WillRepeatedly(testing::Return(XCOM_PROTOCOL));
+  EXPECT_CALL(*mock_provider, start())
+      .Times(1)
+      .WillRepeatedly(testing::Return(false));
+  EXPECT_CALL(*mock_provider, stop())
+      .Times(1)
+      .WillRepeatedly(testing::Return(false));
+
+  Network_provider_manager::getInstance().add_network_provider(mock_provider);
+
+  ASSERT_FALSE(Network_provider_manager::getInstance().start_network_provider(
+      XCOM_PROTOCOL));
+  ASSERT_FALSE(Network_provider_manager::getInstance().stop_network_provider(
+      XCOM_PROTOCOL));
+
+  Network_provider_manager::getInstance().remove_network_provider(
+      XCOM_PROTOCOL);
+}
+
+TEST_F(XComNetworkProviderManagerTest, ManagerShortcutMethodsTest) {
+  std::shared_ptr<mock_network_provider> mock_provider =
+      std::make_shared<mock_network_provider>();
+  EXPECT_CALL(*mock_provider, get_communication_stack())
+      .WillRepeatedly(testing::Return(XCOM_PROTOCOL));
+  EXPECT_CALL(*mock_provider, start())
+      .Times(1)
+      .WillRepeatedly(testing::Return(false));
+  EXPECT_CALL(*mock_provider, stop())
+      .Times(1)
+      .WillRepeatedly(testing::Return(false));
+
+  Network_provider_manager::getInstance().add_and_start_network_provider(
+      mock_provider);
+
+  ASSERT_FALSE(Network_provider_manager::getInstance().stop_network_provider(
+      XCOM_PROTOCOL));
+
+  Network_provider_manager::getInstance().remove_network_provider(
+      XCOM_PROTOCOL);
+}
+
+TEST_F(XComNetworkProviderManagerTest, DoubleAddManagerTest) {
+  std::shared_ptr<mock_network_provider> mock_provider =
+      std::make_shared<mock_network_provider>();
+  EXPECT_CALL(*mock_provider, get_communication_stack())
+      .WillRepeatedly(testing::Return(XCOM_PROTOCOL));
+  EXPECT_CALL(*mock_provider, start())
+      .Times(1)
+      .WillRepeatedly(testing::Return(false));
+  EXPECT_CALL(*mock_provider, stop())
+      .Times(2)
+      .WillRepeatedly(testing::Return(false));
+
+  Network_provider_manager::getInstance().add_network_provider(mock_provider);
+  Network_provider_manager::getInstance().add_network_provider(mock_provider);
+
+  ASSERT_FALSE(Network_provider_manager::getInstance().start_network_provider(
+      XCOM_PROTOCOL));
+  ASSERT_FALSE(Network_provider_manager::getInstance().stop_network_provider(
+      XCOM_PROTOCOL));
+
+  Network_provider_manager::getInstance().remove_network_provider(
+      XCOM_PROTOCOL);
+}
+
+TEST_F(XComNetworkProviderManagerTest,
+       RemoveAndStartAndStopProviderManagerTest) {
+  std::shared_ptr<mock_network_provider> mock_provider =
+      std::make_shared<mock_network_provider>();
+  EXPECT_CALL(*mock_provider, get_communication_stack())
+      .WillRepeatedly(testing::Return(XCOM_PROTOCOL));
+
+  Network_provider_manager::getInstance().add_network_provider(mock_provider);
+
+  Network_provider_manager::getInstance().remove_network_provider(
+      XCOM_PROTOCOL);
+
+  EXPECT_TRUE(Network_provider_manager::getInstance().start_network_provider(
+      XCOM_PROTOCOL));
+  EXPECT_TRUE(Network_provider_manager::getInstance().stop_network_provider(
+      XCOM_PROTOCOL));
+}
+
+TEST_F(XComNetworkProviderManagerTest,
+       RemoveAllAndStartAndStopProviderManagerTest) {
+  std::shared_ptr<mock_network_provider> mock_provider =
+      std::make_shared<mock_network_provider>();
+  EXPECT_CALL(*mock_provider, get_communication_stack())
+      .WillRepeatedly(testing::Return(XCOM_PROTOCOL));
+
+  Network_provider_manager::getInstance().add_network_provider(mock_provider);
+
+  Network_provider_manager::getInstance().remove_all_network_provider();
+
+  EXPECT_TRUE(Network_provider_manager::getInstance().start_network_provider(
+      XCOM_PROTOCOL));
+  EXPECT_TRUE(Network_provider_manager::getInstance().stop_network_provider(
+      XCOM_PROTOCOL));
+}
+
+TEST_F(XComNetworkProviderManagerTest, BasicManagerActiveProviderTest) {
+  std::shared_ptr<mock_network_provider> mock_provider =
+      std::make_shared<mock_network_provider>();
+  EXPECT_CALL(*mock_provider, get_communication_stack())
+      .WillRepeatedly(testing::Return(XCOM_PROTOCOL));
+  EXPECT_CALL(*mock_provider, start())
+      .Times(1)
+      .WillRepeatedly(testing::Return(false));
+  EXPECT_CALL(*mock_provider, stop())
+      .Times(1)
+      .WillRepeatedly(testing::Return(false));
+  EXPECT_CALL(*mock_provider, configure(testing::_))
+      .Times(1)
+      .WillOnce(testing::Return(true));
+
+  Network_provider_manager::getInstance().add_network_provider(mock_provider);
+
+  ASSERT_FALSE(
+      Network_provider_manager::getInstance().start_active_network_provider());
+  ASSERT_FALSE(
+      Network_provider_manager::getInstance().stop_active_network_provider());
+
+  Network_provider_manager::getInstance().remove_network_provider(
+      XCOM_PROTOCOL);
+}
+
+TEST_F(XComNetworkProviderManagerTest, BasicManagerActiveProviderWithSSLTest) {
+  std::shared_ptr<mock_network_provider> mock_provider =
+      std::make_shared<mock_network_provider>();
+  EXPECT_CALL(*mock_provider, get_communication_stack())
+      .WillRepeatedly(testing::Return(XCOM_PROTOCOL));
+  EXPECT_CALL(*mock_provider, start())
+      .Times(1)
+      .WillRepeatedly(testing::Return(false));
+  EXPECT_CALL(*mock_provider, stop())
+      .Times(1)
+      .WillRepeatedly(testing::Return(false));
+  EXPECT_CALL(*mock_provider, configure(testing::_))
+      .Times(1)
+      .WillOnce(testing::Return(true));
+  EXPECT_CALL(*mock_provider, configure_secure_connections(testing::_))
+      .WillRepeatedly(testing::Return(false));
+
+  Network_provider_manager::getInstance().add_network_provider(mock_provider);
+
+  Network_provider_manager::getInstance().xcom_set_ssl_mode(SSL_REQUIRED);
+
+  ASSERT_FALSE(
+      Network_provider_manager::getInstance().start_active_network_provider());
+  ASSERT_FALSE(
+      Network_provider_manager::getInstance().stop_active_network_provider());
+
+  Network_provider_manager::getInstance().remove_network_provider(
+      XCOM_PROTOCOL);
+
+  Network_provider_manager::getInstance().xcom_set_ssl_mode(SSL_DISABLED);
+}
+
+TEST_F(XComNetworkProviderManagerTest, BasicManagerActiveFailProviderTest) {
+  std::shared_ptr<mock_network_provider> mock_provider =
+      std::make_shared<mock_network_provider>();
+  EXPECT_CALL(*mock_provider, get_communication_stack())
+      .WillRepeatedly(testing::Return(MYSQL_PROTOCOL));
+
+  Network_provider_manager::getInstance().add_network_provider(mock_provider);
+
+  EXPECT_TRUE(
+      Network_provider_manager::getInstance().start_active_network_provider());
+  EXPECT_TRUE(
+      Network_provider_manager::getInstance().stop_active_network_provider());
+
+  Network_provider_manager::getInstance().remove_network_provider(
+      XCOM_PROTOCOL);
+}
+
+TEST_F(XComNetworkProviderManagerTest,
+       BasicManagerActiveProviderInterfaceTest) {
+  constexpr int fd_number = 42;
+
+  std::shared_ptr<mock_network_provider> mock_provider =
+      std::make_shared<mock_network_provider>();
+  EXPECT_CALL(*mock_provider, get_communication_stack())
+      .WillRepeatedly(testing::Return(XCOM_PROTOCOL));
+  EXPECT_CALL(*mock_provider, start())
+      .Times(1)
+      .WillRepeatedly(testing::Return(false));
+  EXPECT_CALL(*mock_provider, stop())
+      .Times(1)
+      .WillRepeatedly(testing::Return(false));
+  EXPECT_CALL(*mock_provider, configure(testing::_))
+      .Times(1)
+      .WillOnce(testing::Return(true));
+  EXPECT_CALL(*mock_provider,
+              open_connection(testing::_, testing::_, testing::_, testing::_))
+      .Times(1)
+      .WillOnce(testing::Return(
+          testing::ByMove(std::make_unique<Network_connection>(fd_number))));
+
+  Network_provider_manager::getInstance().add_network_provider(mock_provider);
+
+  ASSERT_FALSE(
+      Network_provider_manager::getInstance().start_active_network_provider());
+
+  auto connection_to =
+      Network_provider_manager::getInstance().open_xcom_connection("", 12345,
+                                                                   false);
+  ASSERT_NE(connection_to, nullptr);
+  ASSERT_EQ(connection_to->fd, fd_number);
+
+  auto *fake_incoming = new Network_connection(fd_number);
+  mock_provider->set_new_connection(fake_incoming);
+
+  connection_descriptor *incoming_from_manager =
+      Network_provider_manager::getInstance().incoming_connection();
+
+  ASSERT_NE(incoming_from_manager, nullptr);
+  ASSERT_EQ(incoming_from_manager->fd, fd_number);
+
+  free(incoming_from_manager);
+
+  connection_descriptor *incoming_from_manager_must_be_null =
+      Network_provider_manager::getInstance().incoming_connection();
+
+  ASSERT_EQ(incoming_from_manager_must_be_null, nullptr);
+
+  ASSERT_FALSE(
+      Network_provider_manager::getInstance().stop_active_network_provider());
+
+  Network_provider_manager::getInstance().remove_network_provider(
+      XCOM_PROTOCOL);
+
+  free(connection_to);
+}
+}  // namespace gcs_xcom_networkprovidermamangertest
\ No newline at end of file
diff -Nru mysql-8.0-8.0.26/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_network_provider-t.cc mysql-8.0-8.0.27/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_network_provider-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_network_provider-t.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_network_provider-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,118 @@
+/* Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+
+   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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include "unittest/gunit/libmysqlgcs/include/gcs_base_test.h"
+
+#include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider.h"
+
+namespace gcs_xcom_networkprovidertest {
+class XComNetworkProviderTest : public GcsBaseTest {
+ protected:
+  XComNetworkProviderTest() {}
+
+  virtual void SetUp() {}
+
+  virtual void TearDown() {}
+};
+
+TEST_F(XComNetworkProviderTest, StartAndStopTestMissingPort) {
+  Xcom_network_provider net_provider;
+
+  ASSERT_TRUE(net_provider.start());
+  net_provider.stop();
+}
+
+TEST_F(XComNetworkProviderTest, StartAndStopTest) {
+  Xcom_network_provider net_provider;
+  Network_configuration_parameters params;
+  params.port = 12345;
+  net_provider.configure(params);
+
+  ASSERT_FALSE(net_provider.start());
+
+  // Make sure that the first one has started correctly
+  My_xp_util::sleep_seconds(5);
+
+  net_provider.stop();
+}
+
+#ifndef _WIN32  // Windows is sensitive to successive binds operations.
+                // To avoid adding big sleeps to the test, we will just skip
+                // them as a whole.
+TEST_F(XComNetworkProviderTest, StartAgainAndStopTest) {
+  Xcom_network_provider net_provider;
+  Network_configuration_parameters params;
+  params.port = 12345;
+  net_provider.configure(params);
+
+  ASSERT_FALSE(net_provider.start());
+
+  // Make sure that the first one has started correctly
+  My_xp_util::sleep_seconds(5);
+
+  ASSERT_TRUE(net_provider.start());
+
+  net_provider.stop();
+}
+
+TEST_F(XComNetworkProviderTest, StartAndStopTestWithError) {
+  Xcom_network_provider net_provider1, net_provider2;
+  Network_configuration_parameters params;
+  params.port = 12345;
+  net_provider1.configure(params);
+  net_provider2.configure(params);
+
+  ASSERT_FALSE(net_provider1.start());
+
+  // Make sure that the first one has started correctly
+  My_xp_util::sleep_seconds(5);
+
+  ASSERT_TRUE(net_provider2.start());
+
+  net_provider1.stop();
+}
+#endif
+
+TEST_F(XComNetworkProviderTest, CreateConnectionToSelfTest) {
+  Xcom_network_provider net_provider;
+  Network_configuration_parameters params;
+  params.port = 12345;
+  net_provider.configure(params);
+
+  ASSERT_FALSE(net_provider.start());
+
+  // Make sure that it has started correctly
+  My_xp_util::sleep_seconds(5);
+
+  auto new_connection =
+      net_provider.open_connection("localhost", 12345, {"", "", false});
+
+  ASSERT_TRUE(new_connection.get() != nullptr);
+
+  int close_connection_retval = net_provider.close_connection(*new_connection);
+
+  ASSERT_EQ(0, close_connection_retval);
+
+  net_provider.stop();
+}
+
+}  // namespace gcs_xcom_networkprovidertest
\ No newline at end of file
diff -Nru mysql-8.0-8.0.26/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_site_def-t.cc mysql-8.0-8.0.27/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_site_def-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_site_def-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_site_def-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -48,7 +48,8 @@
   ASSERT_TRUE(synode_eq(max_boot_key, null_synode));
 
   /* `max_boot_key` of snapshot with one config is that config's `boot_key`. */
-  config one_cfg{null_synode, synode_0_1_0, {0, 0}, {0, 0}, EVENT_HORIZON_MIN};
+  config one_cfg{null_synode, synode_0_1_0, {0, 0}, {0, 0}, EVENT_HORIZON_MIN,
+                 0,           {0, 0}};
   config_ptr one_cfg_ptr = &one_cfg;
   gcs_snap.cfg.configs_len = 1;
   gcs_snap.cfg.configs_val = &one_cfg_ptr;
@@ -58,9 +59,9 @@
   /* `max_boot_key` of snapshot with various configs is highest `boot_key` of a
      config... */
   config three_cfg[3] = {
-      {null_synode, synode_0_2_0, {0, 0}, {0, 0}, EVENT_HORIZON_MIN},
-      {null_synode, synode_0_3_1, {0, 0}, {0, 0}, EVENT_HORIZON_MIN},
-      {null_synode, synode_0_3_0, {0, 0}, {0, 0}, EVENT_HORIZON_MIN},
+      {null_synode, synode_0_2_0, {0, 0}, {0, 0}, EVENT_HORIZON_MIN, 0, {0, 0}},
+      {null_synode, synode_0_3_1, {0, 0}, {0, 0}, EVENT_HORIZON_MIN, 0, {0, 0}},
+      {null_synode, synode_0_3_0, {0, 0}, {0, 0}, EVENT_HORIZON_MIN, 0, {0, 0}},
   };
   config_ptr three_cfg_ptr[3] = {&three_cfg[0], &three_cfg[1], &three_cfg[2]};
   gcs_snap.cfg.configs_len = 3;
@@ -71,8 +72,8 @@
   /* ...whose group_id's match the snapshot, otherwise `max_boot_key` is
      `null_synode`. */
   config two_cfg[2] = {
-      {null_synode, synode_1_2_0, {0, 0}, {0, 0}, EVENT_HORIZON_MIN},
-      {null_synode, synode_0_3_0, {0, 0}, {0, 0}, EVENT_HORIZON_MIN},
+      {null_synode, synode_1_2_0, {0, 0}, {0, 0}, EVENT_HORIZON_MIN, 0, {0, 0}},
+      {null_synode, synode_0_3_0, {0, 0}, {0, 0}, EVENT_HORIZON_MIN, 0, {0, 0}},
   };
   config_ptr two_cfg_ptr[2] = {&two_cfg[0], &two_cfg[1]};
   gcs_snap.cfg.configs_len = 2;
diff -Nru mysql-8.0-8.0.26/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_state_exchange-t.cc mysql-8.0-8.0.27/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_state_exchange-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_state_exchange-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_state_exchange-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -128,6 +128,11 @@
                void(Gcs_protocol_version version));
   MOCK_CONST_METHOD0(get_maximum_supported_protocol_version,
                      Gcs_protocol_version());
+  MOCK_METHOD1(set_communication_protocol,
+               void(enum_transport_protocol protocol));
+  MOCK_METHOD1(add_communication_provider,
+               void(std::shared_ptr<Network_provider> provider));
+  MOCK_METHOD0(get_incoming_connections_protocol, enum_transport_protocol());
 
   virtual Gcs_message_pipeline &get_msg_pipeline() { return m_msg_pipeline; }
 
diff -Nru mysql-8.0-8.0.26/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_xcom_base-t.cc mysql-8.0-8.0.27/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_xcom_base-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_xcom_base-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_xcom_base-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -33,19 +33,29 @@
 #include "xcom_memory.h"
 #include "xcom_transport.h"
 
+#include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/network_provider_manager.h"
+#include "plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider.h"
+
 namespace xcom_base_unittest {
 
 class XcomBase : public GcsBaseTest {
  protected:
-  XcomBase() { ::init_cache(); }
-  ~XcomBase() override { ::deinit_cache(); }
+  XcomBase() {
+    ::init_cache();
+
+    auto &net_manager = Network_provider_manager::getInstance();
+
+    auto xcom_network_provider = std::make_shared<Xcom_network_provider>();
+    net_manager.add_network_provider(xcom_network_provider);
+  }
+  ~XcomBase() { ::deinit_cache(); }
 };
 
 TEST_F(XcomBase, XcomSendClientAppDataUpgradeScenario) {
   app_data a;
   std::string address("127.0.0.1:12345");
 
-  char *names[] = {const_cast<char *>(address.c_str())};
+  char const *names[]{address.c_str()};
   node_address *na = new_node_address(1, names);
 
   a.body.c_t = add_node_type;
@@ -63,7 +73,7 @@
   app_data a;
   std::string address("[::1]:12345");
 
-  char *names[] = {const_cast<char *>(address.c_str())};
+  char const *names[]{address.c_str()};
   node_address *na = new_node_address(1, names);
 
   a.body.c_t = add_node_type;
@@ -82,7 +92,7 @@
   app_data a;
   std::string address("::1]:12345");
 
-  char *names[] = {const_cast<char *>(address.c_str())};
+  char const *names[]{address.c_str()};
   node_address *na = new_node_address(1, names);
 
   a.body.c_t = add_node_type;
@@ -100,7 +110,7 @@
 TEST_F(XcomBase, XcomNewClientEligibleDowngradeScenario) {
   std::string address("127.0.0.1:12345");
 
-  char *names[] = {const_cast<char *>(address.c_str())};
+  char const *names[]{address.c_str()};
   node_address *na = new_node_address(1, names);
 
   site_def *sd = new_site_def();
@@ -118,7 +128,7 @@
 TEST_F(XcomBase, XcomNewClientEligibleDowngradeScenarioFail) {
   std::string address("[::1]:12345");
 
-  char *names[] = {const_cast<char *>(address.c_str())};
+  char const *names[]{address.c_str()};
   node_address *na = new_node_address(1, names);
 
   site_def *sd = new_site_def();
@@ -192,6 +202,11 @@
   synode.msgno = 0;
   synode.node = 0;
 
+  synode_no origin;
+  origin.group_id = 12345;
+  origin.msgno = 0;
+  origin.node = 1;
+
   synode_no_array synodes;
   synodes.synode_no_array_len = 1;
   synodes.synode_no_array_val = &synode;
@@ -203,6 +218,7 @@
   /* Add the synode to the cache, and set it as decided. */
   char const *const payload = "Message in a bottle";
   app_data_ptr a = new_app_data();
+  a->unique_id = origin;
   a->body.c_t = app_type;
   a->body.app_u_u.data.data_len = std::strlen(payload) + 1;
   a->body.app_u_u.data.data_val = const_cast<char *>(payload);
@@ -220,6 +236,7 @@
 
   ASSERT_EQ(result.synode_app_data_array_len, 1);
   ASSERT_EQ(synode_eq(result.synode_app_data_array_val[0].synode, synode), 1);
+  ASSERT_EQ(synode_eq(result.synode_app_data_array_val[0].origin, origin), 1);
   ASSERT_EQ(result.synode_app_data_array_val[0].data.data_len,
             p->a->body.app_u_u.data.data_len);
   ASSERT_EQ(std::strcmp(result.synode_app_data_array_val[0].data.data_val,
@@ -762,8 +779,7 @@
   synod.node = 0;
 
   // Fake node information.
-  char *name = const_cast<char *>("127.0.0.1:10001");
-  char *names[] = {name};
+  char const *names[]{"127.0.0.1:10001"};
   blob uuid;
   uuid.data.data_len = 1;
   uuid.data.data_val = const_cast<char *>("1");
@@ -797,8 +813,7 @@
   synod.node = 0;
 
   // Fake node information.
-  char *name = const_cast<char *>("127.0.0.1:10001");
-  char *names[] = {name};
+  char const *names[]{"127.0.0.1:10001"};
   blob uuid;
   uuid.data.data_len = 1;
   uuid.data.data_val = const_cast<char *>("1");
@@ -834,8 +849,7 @@
   synod.node = 0;
 
   // Fake node information.
-  char *name = const_cast<char *>("127.0.0.1:10001");
-  char *names[] = {name};
+  char const *names[]{"127.0.0.1:10001"};
   blob uuid;
   uuid.data.data_len = 1;
   uuid.data.data_val = const_cast<char *>("1");
@@ -875,8 +889,8 @@
   synod.node = 0;
 
   // Fake node information.
-  char *name = const_cast<char *>("127.0.0.1:10001");
-  char *names[] = {name};
+  char const *name{"127.0.0.1:10001"};
+  char const *names[]{name};
   blob uuid;
   uuid.data.data_len = 1;
   uuid.data.data_val = const_cast<char *>("1");
@@ -890,8 +904,8 @@
 
   pax_msg *need_boot = pax_msg_new(synod, nullptr);
   // need_boot_op with two identities.
-  char *other_name = const_cast<char *>("127.0.0.1:10002");
-  char *two_names[] = {name, other_name};
+  char const *other_name{"127.0.0.1:10002"};
+  char const *two_names[] = {name, other_name};
   blob two_uuids[] = {uuid, uuid};
   node_address *identity = ::new_node_address_uuid(2, two_names, two_uuids);
   need_boot->op = need_boot_op;
@@ -934,9 +948,9 @@
   server srv_from;
   srv_from.last_ping_received = 0.0;
   srv_from.number_of_pings_received = 0;
-  srv_from.con.connected_ = CON_PROTO;
-  srv_from.con.fd = 0;
-  srv_from.con.ssl_fd = nullptr;
+
+  srv_from.con = new_connection(0, nullptr);
+  srv_from.con->connected_ = CON_PROTO;
 
   char srv_addr[1024] = "test";
   srv_from.srv = &srv_addr[0];
@@ -966,6 +980,8 @@
   has_disconnected = pre_process_incoming_ping(&site, &pm, true, 5.0);
   ASSERT_EQ(4, srv_from.number_of_pings_received);
   ASSERT_FALSE(has_disconnected);
+
+  free(srv_from.con);
 }
 
 /**
@@ -985,9 +1001,8 @@
   server srv_from;
   srv_from.last_ping_received = 0.0;
   srv_from.number_of_pings_received = 0;
-  srv_from.con.connected_ = CON_PROTO;
-  srv_from.con.fd = 0;
-  srv_from.con.ssl_fd = nullptr;
+  srv_from.con = new_connection(0, nullptr);
+  srv_from.con->connected_ = CON_PROTO;
 
   char srv_addr[1024] = "test";
   srv_from.srv = &srv_addr[0];
@@ -1017,6 +1032,8 @@
   has_disconnected = pre_process_incoming_ping(&site, &pm, false, 5.0);
   ASSERT_EQ(0, srv_from.number_of_pings_received);
   ASSERT_FALSE(has_disconnected);
+
+  free(srv_from.con);
 }
 
 /**
@@ -1042,7 +1059,8 @@
   server srv_from;
   srv_from.last_ping_received = 0.0;
   srv_from.number_of_pings_received = 0;
-  srv_from.con.connected_ = CON_NULL;
+  srv_from.con = new_connection(-1, nullptr);
+  srv_from.con->connected_ = CON_NULL;
 
   site.nodeno = 1;
   site.global_node_set.node_set_len = 3;
@@ -1068,6 +1086,8 @@
   has_disconnected = pre_process_incoming_ping(&site, &pm, true, 5.0);
   ASSERT_EQ(4, srv_from.number_of_pings_received);
   ASSERT_FALSE(has_disconnected);
+
+  free(srv_from.con);
 }
 
 /**
@@ -1091,7 +1111,8 @@
   server srv_from;
   srv_from.last_ping_received = 0.0;
   srv_from.number_of_pings_received = 0;
-  srv_from.con.connected_ = CON_NULL;
+  srv_from.con = new_connection(-1, nullptr);
+  srv_from.con->connected_ = CON_NULL;
 
   site.nodeno = 1;
   site.global_node_set.node_set_len = 3;
@@ -1113,6 +1134,8 @@
   has_disconnected = pre_process_incoming_ping(&site, &pm, true, 10.0);
   ASSERT_EQ(1, srv_from.number_of_pings_received);
   ASSERT_FALSE(has_disconnected);
+
+  free(srv_from.con);
 }
 
 /**
@@ -1144,18 +1167,16 @@
   server srv_from1, srv_from2;
   srv_from1.last_ping_received = 0.0;
   srv_from1.number_of_pings_received = 0;
-  srv_from1.con.connected_ = CON_PROTO;
-  srv_from1.con.fd = 0;
-  srv_from1.con.ssl_fd = nullptr;
+  srv_from1.con = new_connection(0, nullptr);
+  srv_from1.con->connected_ = CON_PROTO;
 
   srv_from1.srv = &srv_addr[0];
   srv_from1.port = 12345;
 
   srv_from2.last_ping_received = 0.0;
   srv_from2.number_of_pings_received = 0;
-  srv_from2.con.connected_ = CON_PROTO;
-  srv_from2.con.fd = 0;
-  srv_from2.con.ssl_fd = nullptr;
+  srv_from2.con = new_connection(0, nullptr);
+  srv_from2.con->connected_ = CON_PROTO;
 
   srv_from2.srv = &srv_addr[0];
   srv_from2.port = 12346;
@@ -1192,6 +1213,9 @@
   has_disconnected = pre_process_incoming_ping(&site, &pm1, true, 5.0);
   ASSERT_EQ(4, srv_from1.number_of_pings_received);
   ASSERT_FALSE(has_disconnected);
+
+  free(srv_from1.con);
+  free(srv_from2.con);
 }
 
 }  // namespace xcom_base_unittest
diff -Nru mysql-8.0-8.0.26/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_xcom_cache-t.cc mysql-8.0-8.0.27/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_xcom_cache-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_xcom_cache-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_xcom_cache-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -78,7 +78,7 @@
   void SetUp() override {
     m_synode = {1, 1, 0};
     m_addr = new std::string("127.0.0.1:12345");
-    char *names[] = {const_cast<char *>(m_addr->c_str())};
+    char const *names[]{m_addr->c_str()};
     m_na = new_node_address(1, names);
     m_sd = new_site_def();
     init_site_def(1, m_na, m_sd);
diff -Nru mysql-8.0-8.0.26/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_xcom_single_writer-t.cc mysql-8.0-8.0.27/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_xcom_single_writer-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_xcom_single_writer-t.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_xcom_single_writer-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,715 @@
+/* Copyright (c) 2018, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include "gcs_base_test.h"
+
+#include <array>
+#include <cstring>
+#include <string>
+#include <vector>
+#include "app_data.h"
+#include "get_synode_app_data.h"
+#include "pax_msg.h"
+#include "xcom/site_struct.h"
+#include "xcom_base.h"
+#include "xcom_cache.h"
+#include "xcom_memory.h"
+#include "xcom_transport.h"
+
+extern void recompute_node_set(node_set const *old_set,
+                               node_list const *old_nodes, node_set *new_set,
+                               node_list const *new_nodes);
+
+extern void recompute_timestamps(detector_state const old_timestamp,
+                                 node_list const *old_nodes,
+                                 detector_state new_timestamp,
+                                 node_list const *new_nodes);
+
+extern void analyze_leaders(site_def *site);
+extern int is_active_leader(node_no x, site_def *site);
+extern node_no found_active_leaders(site_def *site);
+extern bool unsafe_leaders(app_data *a);
+extern bool_t handle_set_leaders(app_data *a);
+extern bool_t handle_leaders(app_data *a);
+
+namespace xcom_base_unittest {
+
+uint32_t constexpr const test_group_id{0xbaadcafe};
+
+class XcomSingleWriter : public GcsBaseTest {
+ protected:
+  XcomSingleWriter() {}
+  ~XcomSingleWriter() override {}
+};
+
+auto xprintf = [](std::ostream &os, auto... args) {
+  int dummy[] = {(os << args, 0)...};
+  (void)dummy;
+};
+
+TEST_F(XcomSingleWriter, test_xcom_client_set_max_leaders) {
+  std::array<uint32_t, 4> numbers = {std::numeric_limits<uint32_t>::min(), 0, 1,
+                                     std::numeric_limits<uint32_t>::max()};
+  for (auto n : numbers) {  // Should always return 0 because of nullptr
+    ASSERT_EQ(0, xcom_client_set_max_leaders(nullptr, n, test_group_id));
+  }
+}
+
+TEST_F(XcomSingleWriter, test_xcom_client_set_leaders) {
+  std::array<char const *, 5> a = {nullptr, "hostname", "xxfunnyxx.nohost.foo",
+                                   "localhost", "127.0.0.1"};
+  for (auto name : a) {  // Should always return 0 because of nullptr
+    ASSERT_EQ(0, xcom_client_set_leaders(nullptr, 1, &name, test_group_id));
+  }
+}
+
+struct test_node_address : public node_address {
+  test_node_address(char const *s) {
+    address = strdup(s);
+    uuid = {};
+    proto = {};
+    services = 0;
+  }
+};
+
+TEST_F(XcomSingleWriter, test_recompute_node_set) {
+  node_set old_set{};
+  node_set new_set{};
+  test_node_address node_a{"node_a:12345"};
+  test_node_address node_b{"node_b:67890"};
+  test_node_address list_1[]{node_a, node_b};
+  test_node_address list_2[]{node_b, node_a};
+  node_list old_nodes{2, list_1};
+  node_list new_nodes{2, list_2};
+  bool failed{false};
+
+  // Deallocate on scope exit
+  auto cleanup{[&](auto p) {
+    (void)p;
+    xdr_free((xdrproc_t)xdr_node_address, (char *)&node_a);
+    xdr_free((xdrproc_t)xdr_node_address, (char *)&node_b);
+    xdr_free((xdrproc_t)xdr_node_set, (char *)&old_set);
+    xdr_free((xdrproc_t)xdr_node_set, (char *)&new_set);
+  }};
+  std::unique_ptr<node_set, decltype(cleanup)> guard(&old_set, cleanup);
+
+  // Note failure and print message
+  auto fail{[&failed](auto... args) {
+    xprintf(std::cerr, "test_recompute_node_set FAILED: ", args..., "\n");
+    failed = true;
+    ASSERT_FALSE(failed);
+  }};
+
+  // Two nodes, one alive,and one not
+  init_node_set(&old_set, 2);
+  init_node_set(&new_set, 2);
+  add_node(old_set, 0);  // Node 0 (node_a) is alive
+
+  auto assert_set{[&](u_int i) {
+    if (!is_set(new_set, i))
+      fail("new_set[", i, "] should be set after ::recompute_node_set");
+  }};
+
+  auto assert_not_set{[&](u_int i) {
+    if (is_set(new_set, i))
+      fail("new_set[", i, "] should not be set after ::recompute_node_set");
+  }};
+
+  // Recompute node set after having swapped position of a and b in node list
+  ::recompute_node_set(&old_set, &old_nodes, &new_set, &new_nodes);
+  assert_not_set(0);
+  assert_set(1);
+
+  // Recompute node set after having removed node a
+  new_nodes.node_list_len = 1;
+  new_set.node_set_len = 1;
+  ::recompute_node_set(&old_set, &old_nodes, &new_set, &new_nodes);
+  assert_not_set(0);
+
+  // Recompute node set after having removed node b
+  new_nodes.node_list_val[0] = node_a;
+  ::recompute_node_set(&old_set, &old_nodes, &new_set, &new_nodes);
+  assert_set(0);
+}
+
+TEST_F(XcomSingleWriter, test_recompute_timestamps) {
+  detector_state const old_ts{1.0, 2.0};
+  detector_state new_ts{};
+  test_node_address node_a{"node_a:12345"};
+  test_node_address node_b{"node_b:67890"};
+  node_address list_1[]{node_a, node_b};
+  node_address list_2[]{node_b, node_a};
+  node_list old_nodes{2, list_1};
+  node_list new_nodes{2, list_2};
+  bool failed{false};
+
+  // Deallocate on scope exit
+  auto cleanup{[&](auto p) {
+    (void)p;
+    xdr_free((xdrproc_t)xdr_node_address, (char *)&node_a);
+    xdr_free((xdrproc_t)xdr_node_address, (char *)&node_b);
+  }};
+  std::unique_ptr<node_address, decltype(cleanup)> guard(&node_a, cleanup);
+
+  // Note failure and print message
+  auto fail{[&failed](auto... args) {
+    xprintf(std::cerr, "test_recompute_timestamps FAILED: ", args..., "\n");
+    failed = true;
+    ASSERT_FALSE(failed);
+  }};
+
+  auto assert_ts{[&](u_int i, double ts) {
+    if (!(new_ts[i] == ts))
+      fail("new_ts[", i, "] should be ", ts, " after recompute_timestamps");
+  }};
+
+  // Recompute timestamps after having swapped position of a and b in node list
+  ::recompute_timestamps(old_ts, &old_nodes, new_ts, &new_nodes);
+  assert_ts(0, 2.0);
+  assert_ts(1, 1.0);
+
+  // Recompute node ts after having removed node a
+  new_nodes.node_list_len = 1;
+  ::recompute_timestamps(old_ts, &old_nodes, new_ts, &new_nodes);
+  assert_ts(0, 2.0);
+
+  // Recompute node ts after having removed node b
+  new_nodes.node_list_val[0] = node_a;
+  ::recompute_timestamps(old_ts, &old_nodes, new_ts, &new_nodes);
+  assert_ts(0, 1.0);
+}
+
+/* Simple multiplicative hash */
+static uint32_t mhash(unsigned char const *buf, size_t length) {
+  size_t i = 0;
+  uint32_t sum = 0;
+  for (i = 0; i < length; i++) {
+    sum += 0x811c9dc5 * (uint32_t)buf[i];
+  }
+  return sum;
+}
+
+static blob uuid_blob(char const *arg) {
+  blob uuid_tmp;
+  unsigned int hash = mhash((unsigned char const *)arg, strlen(arg));
+  G_MESSAGE("hash %x", hash);
+  uuid_tmp.data.data_len = sizeof(hash);
+  uuid_tmp.data.data_val = (char *)calloc(1, uuid_tmp.data.data_len);
+  memcpy(uuid_tmp.data.data_val, &hash, uuid_tmp.data.data_len);
+  return uuid_tmp;
+}
+
+/* Initialize address list from command line */
+static void init_me(node_list *nl, char const *arg) {
+  /* Synthesize (hopefully) unique identifier and add to address list. */
+  /* The uuid may be anything, it is not used by xcom */
+  u_int j = 0;
+  blob uuid_tmp = uuid_blob(arg);
+  nl->node_list_len = 1;
+  nl->node_list_val = new_node_address_uuid(nl->node_list_len, &arg, &uuid_tmp);
+  GET_GOUT;
+  ADD_GOUT("init_me uuid");
+  for (j = 0; j < uuid_tmp.data.data_len; j++) {
+    ADD_F_GOUT(" %x", *((unsigned char *)&uuid_tmp.data.data_val[j]));
+  }
+  ADD_GOUT(" services");
+  ADD_F_GOUT(" %x", nl->node_list_val->services);
+  PRINT_GOUT;
+  FREE_GOUT;
+  free(uuid_tmp.data.data_val);
+}
+
+TEST_F(XcomSingleWriter, test_analyze_leaders) {
+  bool failed{false};
+  char const *node0{"iamthegreatest:12345"};
+  char const *node1{"node1:12346"};
+  blob uuid{uuid_blob(node1)};
+  site_def site;
+
+  // Deallocate on scope exit
+  auto cleanup{[&](auto p) {
+    uuid.data.data_len = 0;
+    free(uuid.data.data_val);
+    free_site_def_body(p);
+  }};
+  std::unique_ptr<site_def, decltype(cleanup)> guard(&site, cleanup);
+
+  // Note failure and print message
+  auto fail{[&failed](auto... args) {
+    xprintf(std::cerr, "test_analyze_leaders FAILED: ", args..., "\n");
+    failed = true;
+    ASSERT_FALSE(failed);
+  }};
+
+  auto assert_cached_leaders{[&]() {
+    if (!site.cached_leaders)
+      fail("site.cached_leaders should be set if max_active_leaders == 1");
+  }};
+
+  auto assert_no_cached_leaders{[&]() {
+    if (site.cached_leaders)
+      fail(
+          "site.cached_leaders should not be set if max_active_leaders == "
+          "active_leaders_all");
+  }};
+
+  auto assert_leader{[&](node_no n, char const *why) {
+    if (!site.active_leader[n])
+      fail("site.active_leader[", n, "] should be set if ", why);
+    if (!::is_active_leader(n, &site))
+      fail("::is_active_leader(", n, ") should return 1 if ", why);
+  }};
+
+  auto assert_not_leader{[&](node_no n, char const *why) {
+    if (site.active_leader[n])
+      fail("site.active_leader[", n, "] should not be set if ", why);
+    if (::is_active_leader(n, &site))
+      fail("::is_active_leader(", n, ") should return 0 if ", why);
+  }};
+
+  auto assert_found_leaders{[&](node_no n) {
+    if (::found_active_leaders(&site) != n)
+      fail("::found_active_leaders(site) should return ", n);
+  }};
+
+  // Completely empty config with all nodes as leaders
+  site.max_active_leaders = 0;
+  ::analyze_leaders(&site);
+  assert_no_cached_leaders();
+  assert_found_leaders(0);
+
+  // Single writer, but no nodes in global node set
+  site.nodeno = 0;  // I am node 0
+  site.max_active_leaders = 1;
+  init_me(&site.nodes, node0);
+  init_node_set(&site.global_node_set, 1);
+
+  ::analyze_leaders(&site);
+  assert_cached_leaders();
+  // Node 0 wil be leader if node set empty
+  assert_leader(0, "no nodes in global node set");
+  assert_found_leaders(1);
+
+  // Single writer, all nodes in global node set
+  site.cached_leaders = 0;
+  set_node_set(&site.global_node_set);
+
+  ::analyze_leaders(&site);
+  assert_cached_leaders();
+  assert_leader(0, "all nodes in global node set");
+  assert_found_leaders(1);
+
+  // Add second node as leader
+  node_address *addr = new_node_address_uuid(1, &node1, &uuid);
+  add_site_def(1, addr, &site);
+  delete_node_address(1, addr);
+  site.leaders = alloc_leader_array(1);
+  site.leaders.leader_array_val[0].address = strdup(node1);
+
+  site.cached_leaders = 0;
+  reset_node_set(&site.global_node_set);  // Mark all as down
+
+  ::analyze_leaders(&site);
+  assert_cached_leaders();
+  assert_not_leader(1, "all are down");
+  assert_leader(0, "all are down");
+  assert_found_leaders(1);
+
+  site.cached_leaders = 0;
+  set_node_set(&site.global_node_set);  // Mark all as present
+
+  ::analyze_leaders(&site);
+  assert_cached_leaders();
+  assert_not_leader(0, "node1 is leader");
+  assert_leader(1, "node1 is leader");
+  assert_found_leaders(1);
+
+  // Remove leader from global node set
+  site.global_node_set.node_set_val[1] = 0;
+  site.cached_leaders = 0;
+
+  ::analyze_leaders(&site);
+  assert_cached_leaders();
+  assert_leader(0, "node1 is down");
+  assert_not_leader(1, "node1 is down");
+  assert_found_leaders(1);
+}
+
+TEST_F(XcomSingleWriter, test_unsafe_leaders) {
+  bool failed = false;
+  char const *node0 = "iamthegreatest:12345";
+  app_data a;
+  memset(&a, 0, sizeof a);
+  site_def *site = new_site_def();
+  char const *node1{"node1:12346"};
+  blob uuid{uuid_blob(node1)};
+
+  // Deallocate on scope exit
+  auto cleanup{[&](auto p) {
+    (void)p;
+    uuid.data.data_len = 0;
+    free(uuid.data.data_val);
+    free_site_defs();
+    xdr_free((xdrproc_t)xdr_app_data, (char *)&a);
+  }};
+  std::unique_ptr<site_def, decltype(cleanup)> guard(site, cleanup);
+
+  // Note failure and print message
+  auto fail{[&failed](auto... args) {
+    xprintf(std::cerr, "test_unsafe_leaders FAILED: ", args..., "\n");
+    failed = true;
+    ASSERT_FALSE(failed);
+  }};
+
+  // Null app_data
+  a.body.c_t = add_node_type;
+
+  if (::unsafe_leaders(&a)) fail("empty app_data should be all right");
+
+  // Single node, compatible protocol version and max_leaders == all
+  node_list &nl = a.body.app_u_u.nodes;
+  init_me(&nl, node0);
+  push_site_def(site);
+  if (::unsafe_leaders(&a))
+    fail("Compatible protocol version and max_active_leaders == all");
+
+  // Single node, compatible protocol version and max_active_leaders == 1
+  site->max_active_leaders = 1;
+  if (::unsafe_leaders(&a))
+    fail("Compatible protocol version and max_active_leaders == 1");
+
+  // Single node, incompatible protocol version and max_active_leaders == all
+  site->max_active_leaders = active_leaders_all;
+  nl.node_list_val[0].proto.max_proto = x_1_8;
+  if (::unsafe_leaders(&a))
+    fail("Incompatible protocol version and max_active_leaders == all");
+
+  // Single node, incompatible protocol version and max_active_leaders == 1
+  site->max_active_leaders = 1;
+  if (!::unsafe_leaders(&a))
+    fail("Incompatible protocol version and max_active_leaders == 1");
+
+  // Add second node with compatible protocol version
+  node_address *addr = new_node_address_uuid(1, &node1, &uuid);
+  add_site_def(1, addr, site);
+  delete_node_address(1, addr);
+  if (!::unsafe_leaders(&a))
+    fail(
+        "Two nodes, 1 incompatible protocol version and max_active_leaders == "
+        "1");
+
+  // Switch to max_active_leaders == all
+  site->max_active_leaders = active_leaders_all;
+  if (::unsafe_leaders(&a))
+    fail(
+        "Two nodes, 1 incompatible protocol version and max_active_leaders == "
+        "all");
+
+  // Make both protocol versions compatible
+  nl.node_list_val[0].proto.max_proto = x_1_9;
+  if (::unsafe_leaders(&a))
+    fail(
+        "Two nodes, compatible protocol versions and max_active_leaders == "
+        "all");
+
+  // Make both protocol versions compatible
+  site->max_active_leaders = 1;
+  if (::unsafe_leaders(&a))
+    fail("Two nodes, compatible protocol versions and max_active_leaders == 1");
+}
+
+TEST_F(XcomSingleWriter, test_handle_max_leaders) {
+  bool failed = false;
+  char const *node0 = "iamthegreatest:12345";
+  app_data a;
+  memset(&a, 0, sizeof a);
+  site_def *site = new_site_def();
+  char const *node1{"node1:12346"};
+  blob uuid{uuid_blob(node1)};
+
+  // Deallocate on scope exit
+  auto cleanup{[&](auto p) {
+    (void)p;
+    uuid.data.data_len = 0;
+    free(uuid.data.data_val);
+    free_site_defs();
+    xdr_free((xdrproc_t)xdr_app_data, (char *)&a);
+  }};
+  std::unique_ptr<site_def, decltype(cleanup)> guard(site, cleanup);
+
+  // Note failure and print message
+  auto fail{[&failed](auto... args) {
+    xprintf(std::cerr, "test_handle_max_leaders FAILED: ", args..., "\n");
+    failed = true;
+    ASSERT_FALSE(failed);
+  }};
+
+  // Single node, compatible protocol version and max_leaders == all
+  init_me(&site->nodes, node0);
+  alloc_node_set(&site->global_node_set, 1);
+  alloc_node_set(&site->local_node_set, 1);
+  site->nodeno = 0;
+  site->event_horizon = EVENT_HORIZON_MIN;
+  site_install_action(site, unified_boot_type);
+  init_set_max_leaders(test_group_id, &a, active_leaders_all);
+  if (!handle_max_leaders(&a))
+    fail("Compatible protocol version and new max_leaders == all");
+
+  // Single node, compatible protocol version and max_leaders == 1
+  a.body.app_u_u.max_leaders = 1;
+  if (!handle_max_leaders(&a))
+    fail("Compatible protocol version and new max_leaders == 1");
+
+  init_set_max_leaders(test_group_id, &a, 2);
+  if (handle_max_leaders(&a))
+    fail("Compatible protocol version and new max_leaders == 2");
+
+  // Add second node with incompatible protocol version, max_leaders == all
+  site = clone_site_def(get_site_def());
+  node_address *addr = new_node_address_uuid(1, &node1, &uuid);
+  addr->proto.max_proto = x_1_8;
+  add_site_def(1, addr, site);
+  site_install_action(site, add_node_type);
+  delete_node_address(1, addr);
+  init_set_max_leaders(test_group_id, &a, active_leaders_all);
+  if (!handle_max_leaders(&a))
+    fail("Incompatible protocol version and max_leaders == all");
+
+  // Two nodes, incompatible protocol version and max_leaders == 1
+  init_set_max_leaders(test_group_id, &a, 1);
+  if (handle_max_leaders(&a))
+    fail("Incompatible protocol version and max_leaders == 1");
+
+  // Two nodes, incompatible protocol version and max_leaders == 2
+  init_set_max_leaders(test_group_id, &a, 2);
+  if (handle_max_leaders(&a))
+    fail("Incompatible protocol version and max_leaders == 2");
+
+  // Two nodes, incompatible protocol version and max_leaders == 3
+  init_set_max_leaders(test_group_id, &a, 3);
+  if (handle_max_leaders(&a))
+    fail("Incompatible protocol version and max_leaders == 3");
+}
+
+TEST_F(XcomSingleWriter, test_handle_set_leaders) {
+  bool failed = false;
+  char const *nodes[]{"iamthegreatest:12345", "node1:12346"};
+  app_data a;
+  memset(&a, 0, sizeof a);
+  site_def *site = new_site_def();
+  blob uuid{uuid_blob(nodes[1])};
+
+  auto free_app{[&]() { xdr_free((xdrproc_t)xdr_app_data, (char *)&a); }};
+
+  // Deallocate on scope exit
+  auto cleanup{[&](auto p) {
+    (void)p;
+    uuid.data.data_len = 0;
+    free(uuid.data.data_val);
+    free_site_defs();
+    free_app();
+  }};
+  std::unique_ptr<site_def, decltype(cleanup)> guard(site, cleanup);
+
+  // Note failure and print message
+  auto fail{[&](auto... args) {
+    xprintf(std::cerr, "test_handle_set_leaders FAILED: ", args..., "\n");
+    failed = true;
+    ASSERT_FALSE(failed);
+  }};
+
+  init_me(&site->nodes, nodes[0]);
+  alloc_node_set(&site->global_node_set, 1);
+  alloc_node_set(&site->local_node_set, 1);
+  site->nodeno = 0;
+  site->event_horizon = EVENT_HORIZON_MIN;
+  site_install_action(site, unified_boot_type);
+
+  // Single node, compatible protocol version and leaders node0
+  init_set_leaders(test_group_id, &a, 1, nodes);
+  if (!handle_set_leaders(&a))
+    fail("Compatible protocol version and leaders node0");
+  free_app();
+
+  // Compatible protocol version and leaders == node0, node1
+  init_set_leaders(test_group_id, &a, 2, nodes);
+  if (!handle_set_leaders(&a))
+    fail("Compatible protocol version and leaders node0, node1");
+  free_app();
+
+  // Add second node with incompatible protocol version
+  site = clone_site_def(get_site_def());
+  node_address *addr = new_node_address_uuid(1, &nodes[1], &uuid);
+  addr->proto.max_proto = x_1_8;
+  add_site_def(1, addr, site);
+  site_install_action(site, add_node_type);
+  delete_node_address(1, addr);
+
+  init_set_leaders(test_group_id, &a, 1, nodes);
+  if (handle_set_leaders(&a))
+    fail("Both compatible and incompatible protocol versions");
+  free_app();
+
+  init_set_leaders(test_group_id, &a, 2, nodes);
+  if (handle_set_leaders(&a))
+    fail("Both compatible and incompatible protocol versions");
+  free_app();
+
+  // Two nodes, incompatible protocol version and leaders == 3
+  a.body.app_u_u.max_leaders = 3;
+  if (handle_set_leaders(&a))
+    fail("Incompatible protocol version and leaders == 3");
+}
+
+TEST_F(XcomSingleWriter, test_handle_leaders) {
+  bool failed = false;
+  char const *nodes[]{"iamthegreatest:12345", "node1:12346"};
+  app_data leader_app;
+  memset(&leader_app, 0, sizeof leader_app);
+  app_data max_app;
+  memset(&max_app, 0, sizeof max_app);
+  site_def *site = nullptr;
+  blob uuid{uuid_blob(nodes[1])};
+
+  auto free_app{[&]() {
+    // leader_app and max_app have been linked, so unlink
+    // to avoid deallocating the stack objects.
+    leader_app.next = nullptr;
+    max_app.next = nullptr;
+    xdr_free((xdrproc_t)xdr_app_data, (char *)&leader_app);
+    xdr_free((xdrproc_t)xdr_app_data, (char *)&max_app);
+  }};
+
+  // Deallocate on scope exit
+  auto cleanup{[&](auto p) {
+    (void)p;
+    uuid.data.data_len = 0;
+    free(uuid.data.data_val);
+    free_site_defs();
+    free_app();
+  }};
+
+  // Note failure and print message
+  auto fail{[&](auto... args) {
+    xprintf(std::cerr, "test_handle_leaders FAILED: ", args..., "\n");
+    failed = true;
+    ASSERT_FALSE(failed);
+  }};
+
+  site = new_site_def();
+  std::unique_ptr<site_def, decltype(cleanup)> guard(site, cleanup);
+
+  init_me(&site->nodes, nodes[0]);
+  alloc_node_set(&site->global_node_set, 1);
+  alloc_node_set(&site->local_node_set, 1);
+  site->nodeno = 0;
+  site->event_horizon = EVENT_HORIZON_MIN;
+  site_install_action(site, unified_boot_type);
+
+  // Single node, compatible protocol version and leaders node0
+  init_set_leaders(test_group_id, &leader_app, 1, nodes, &max_app, 1);
+  if (!::handle_leaders(&leader_app))
+    fail("Compatible protocol version and leaders node0, max_leaders == 1");
+  free_app();
+
+  // Compatible protocol version and leaders == node0, node1
+  init_set_leaders(test_group_id, &leader_app, 2, nodes, &max_app, 1);
+  if (!::handle_leaders(&leader_app))
+    fail(
+        "Compatible protocol version and leaders node0, node1, max_leaders == "
+        "1");
+  free_app();
+
+  // Single node, compatible protocol version and leaders node0
+  init_set_leaders(test_group_id, &leader_app, 1, nodes, &max_app, 2);
+  if (::handle_leaders(&leader_app))
+    fail("Compatible protocol version and leaders node0, max_leaders == 2");
+  free_app();
+
+  // Compatible protocol version and leaders == node0, node1
+  init_set_leaders(test_group_id, &leader_app, 2, nodes, &max_app, 2);
+  if (::handle_leaders(&leader_app))
+    fail(
+        "Compatible protocol version and leaders node0, node1, max_leaders == "
+        "2");
+  free_app();
+
+  // Single node, compatible protocol version and leaders node0
+  init_set_leaders(test_group_id, &leader_app, 1, nodes, &max_app, 3);
+  if (::handle_leaders(&leader_app))
+    fail("Compatible protocol version and leaders node0, max_leaders == 3");
+  free_app();
+
+  // Compatible protocol version and leaders == node0, node1
+  init_set_leaders(test_group_id, &leader_app, 2, nodes, &max_app, 3);
+  if (::handle_leaders(&leader_app))
+    fail(
+        "Compatible protocol version and leaders node0, node1, max_leaders == "
+        "3");
+  free_app();
+
+  // Add second node with incompatible protocol version
+  site = clone_site_def(get_site_def());
+  node_address *addr = new_node_address_uuid(1, &nodes[1], &uuid);
+  addr->proto.max_proto = x_1_8;
+  add_site_def(1, addr, site);
+  site_install_action(site, add_node_type);
+  delete_node_address(1, addr);
+
+  init_set_leaders(test_group_id, &leader_app, 1, nodes, &max_app, 1);
+  if (::handle_leaders(&leader_app))
+    fail(
+        "Both compatible and incompatible protocol versions, max_leaders == 1");
+  free_app();
+
+  init_set_leaders(test_group_id, &leader_app, 2, nodes, &max_app, 1);
+  if (::handle_leaders(&leader_app))
+    fail(
+        "Both compatible and incompatible protocol versions, max_leaders == 1");
+  free_app();
+
+  init_set_leaders(test_group_id, &leader_app, 1, nodes, &max_app, 2);
+  if (::handle_leaders(&leader_app))
+    fail(
+        "Both compatible and incompatible protocol versions, max_leaders == 2");
+  free_app();
+
+  init_set_leaders(test_group_id, &leader_app, 2, nodes, &max_app, 2);
+  if (::handle_leaders(&leader_app))
+    fail(
+        "Both compatible and incompatible protocol versions, max_leaders == 2");
+  free_app();
+
+  init_set_leaders(test_group_id, &leader_app, 1, nodes, &max_app, 3);
+  if (::handle_leaders(&leader_app))
+    fail(
+        "Both compatible and incompatible protocol versions, max_leaders == 3");
+  free_app();
+
+  init_set_leaders(test_group_id, &leader_app, 2, nodes, &max_app, 3);
+  if (::handle_leaders(&leader_app))
+    fail(
+        "Both compatible and incompatible protocol versions, max_leaders == 3");
+  free_app();
+}
+
+}  // namespace xcom_base_unittest
diff -Nru mysql-8.0-8.0.26/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_xcom_transport-t.cc mysql-8.0-8.0.27/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_xcom_transport-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_xcom_transport-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/libmysqlgcs/xcom/gcs_xcom_xcom_transport-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -66,8 +66,10 @@
 
 TEST_F(XcomTransport, is_new_node_eligible_for_ipv6) {
   char const *invalid_address = "127.0.0.257:123456";
-  node_address node{
-      const_cast<char *>(invalid_address), {{0, 0}}, {x_1_0, x_1_0}};
+  node_address node{const_cast<char *>(invalid_address),
+                    {{0, 0}},
+                    {x_1_0, x_1_0},
+                    P_PROP | P_ACC | P_LEARN};
   site_def site{null_synode,
                 null_synode,
                 VOID_NODE_NO,
@@ -81,7 +83,10 @@
                 x_1_0,
                 {null_synode},
                 0.0,
-                EVENT_HORIZON_MIN};
+                EVENT_HORIZON_MIN,
+                0,
+                {0, 0},
+                0};
   /* Any protocol version besides x_1_6 is okay as long as it is older than
      MY_XCOM_PROTO */
   ASSERT_EQ(1, is_new_node_eligible_for_ipv6(x_1_6, &site));
diff -Nru mysql-8.0-8.0.26/unittest/gunit/log_timestamp-t.cc mysql-8.0-8.0.27/unittest/gunit/log_timestamp-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/log_timestamp-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/log_timestamp-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -60,7 +60,7 @@
   int time_buff_len;
 
   EXPECT_EQ(((iso8601_size)-1), LEN_MS_CET);
-  EXPECT_EQ(((LEN_MS_CET)-5), LEN_MS_UTC);
+  EXPECT_EQ(((LEN_MS_CET)-5), LEN_MS_UTC);  // timezone "Z" instead of "+12:34"
 
   // set up timezone (central european time)
   putenv(tz);
diff -Nru mysql-8.0-8.0.26/unittest/gunit/mdl-t.cc mysql-8.0-8.0.27/unittest/gunit/mdl-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/mdl-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/mdl-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -76,8 +76,7 @@
   Mock away this global function.
   We don't need DEBUG_SYNC functionality in a unit test.
  */
-void debug_sync(THD *, const char *sync_point_name MY_ATTRIBUTE((unused)),
-                size_t) {
+void debug_sync(THD *, const char *sync_point_name [[maybe_unused]], size_t) {
   DBUG_PRINT("debug_sync_point", ("hit: '%s'", sync_point_name));
   FAIL() << "Not yet implemented.";
 }
diff -Nru mysql-8.0-8.0.26/unittest/gunit/memory/unique_ptr-t.cc mysql-8.0-8.0.27/unittest/gunit/memory/unique_ptr-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/memory/unique_ptr-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/memory/unique_ptr-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -51,20 +51,14 @@
   ptr[9] = '\0';
 
   EXPECT_EQ(ptr[2], '2');
-#if !(defined(__SUNPRO_CC))
   EXPECT_EQ(*ptr, '0');
-#endif
   EXPECT_EQ(!ptr, false);
 
   EXPECT_EQ(*ptr.get(), '0');
-#if !(defined(__SUNPRO_CC))
   EXPECT_EQ(ptr.size(), 10);
-#endif
 
-#if !(defined(__SUNPRO_CC))
   ptr.reserve(20);
   EXPECT_EQ(ptr.size(), 20);
-#endif
   ptr[9] = '9';
   ptr[10] = '0';
   ptr[11] = '1';
@@ -79,9 +73,7 @@
 
   EXPECT_EQ(ptr[12], '2');
   EXPECT_EQ(*ptr.get(), '0');
-#if !(defined(__SUNPRO_CC))
   EXPECT_EQ(ptr.size(), 20);
-#endif
 
   char *underlying = ptr.release();
   EXPECT_EQ(!ptr, true);
@@ -100,9 +92,7 @@
   EXPECT_EQ(!ptr, false);
 
   EXPECT_EQ(*ptr.get(), "012345678");
-#if !(defined(__SUNPRO_CC))
   EXPECT_EQ(ptr.size(), sizeof(std::string));
-#endif
 
   std::string *underlying = ptr.release();
   EXPECT_EQ(!ptr, true);
diff -Nru mysql-8.0-8.0.26/unittest/gunit/mock_create_field.h mysql-8.0-8.0.27/unittest/gunit/mock_create_field.h
--- mysql-8.0-8.0.26/unittest/gunit/mock_create_field.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/mock_create_field.h	2021-09-28 11:46:34.000000000 +0000
@@ -25,6 +25,8 @@
 
 #include <assert.h>
 
+#include <optional>
+
 #include "sql/create_field.h"
 #include "sql/dd/types/column.h"
 
@@ -61,7 +63,7 @@
          0,              // uint fld_geom_type
          nullptr,        // gcol info
          nullptr,        // gen default val
-         {},             // Nullable<gis::srid_t> srid
+         {},             // std::optional<gis::srid_t> srid
          dd::Column::enum_hidden_type::HT_VISIBLE);  // Visible
   }
 };
diff -Nru mysql-8.0-8.0.26/unittest/gunit/my_alloc-t.cc mysql-8.0-8.0.27/unittest/gunit/my_alloc-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/my_alloc-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/my_alloc-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -24,6 +24,8 @@
 #include <gtest/gtest.h>
 #include <stddef.h>
 #include <sys/types.h>
+#include <memory>
+#include <string>
 
 #include "my_alloc.h"
 #include "my_inttypes.h"
@@ -88,9 +90,9 @@
 class MyAllocTest : public ::testing::TestWithParam<size_t> {
  protected:
   void SetUp() override {
-    init_alloc_root(PSI_NOT_INSTRUMENTED, &m_root, 1024, 0);
+    ::new ((void *)&m_root) MEM_ROOT(PSI_NOT_INSTRUMENTED, 1024);
   }
-  void TearDown() override { free_root(&m_root, MYF(0)); }
+  void TearDown() override { m_root.Clear(); }
   size_t m_num_objects;
   MEM_ROOT m_root;
 };
@@ -98,9 +100,9 @@
 class MyPreAllocTest : public ::testing::Test {
  protected:
   void SetUp() override {
-    init_alloc_root(PSI_NOT_INSTRUMENTED, &m_prealloc_root, 1024, 2048);
+    ::new ((void *)&m_prealloc_root) MEM_ROOT(PSI_NOT_INSTRUMENTED, 1024);
   }
-  void TearDown() override { free_root(&m_prealloc_root, MYF(0)); }
+  void TearDown() override { m_prealloc_root.Clear(); }
   size_t m_num_objects;
   MEM_ROOT m_prealloc_root;
 };
@@ -198,4 +200,49 @@
   EXPECT_STREQ("12345", store_ptr);
 }
 
+TEST_F(MyAllocTest, ArrayAllocInitialization) {
+  MEM_ROOT alloc(PSI_NOT_INSTRUMENTED, 512);
+
+  // No default value means each element is value-initialized. For int, it means
+  // they are set to 0.
+  int *int_array1 = alloc.ArrayAlloc<int>(100);
+  ASSERT_NE(nullptr, int_array1);
+  for (int i = 0; i < 100; ++i) {
+    EXPECT_EQ(0, int_array1[i]);
+  }
+
+  // Initialize to explicit value.
+  int *int_array2 = alloc.ArrayAlloc<int>(100, 123);
+  ASSERT_NE(nullptr, int_array2);
+  for (int i = 0; i < 100; ++i) {
+    EXPECT_EQ(123, int_array2[i]);
+  }
+
+  // Initialize from rvalue. (Verifies that a bug, which made it only initialize
+  // the first element correctly, is fixed.)
+  std::string *string_array1 = alloc.ArrayAlloc<std::string>(
+      10, std::string("abcdefghijklmnopqrstuvwxyz"));
+  ASSERT_NE(nullptr, string_array1);
+  for (int i = 0; i < 10; ++i) {
+    EXPECT_EQ("abcdefghijklmnopqrstuvwxyz", string_array1[i]);
+  }
+  destroy_array(string_array1, 10);
+
+  // Should be allowed to create an array of a class which is not
+  // copy-constructible.
+  auto uptr_array1 = alloc.ArrayAlloc<std::unique_ptr<int>>(10);
+  ASSERT_NE(nullptr, uptr_array1);
+  auto uptr_array2 = alloc.ArrayAlloc<std::unique_ptr<int>>(10, nullptr);
+  ASSERT_NE(nullptr, uptr_array2);
+  for (int i = 0; i < 10; ++i) {
+    EXPECT_EQ(nullptr, uptr_array1[i]);
+    EXPECT_EQ(nullptr, uptr_array2[i]);
+  }
+
+  // This should give a compiler error, because it attempts to copy a value of a
+  // non-copyable type:
+  //
+  // alloc.ArrayAlloc<std::unique_ptr<int>>(3, std::make_unique<int>(123));
+}
+
 }  // namespace my_alloc_unittest
diff -Nru mysql-8.0-8.0.26/unittest/gunit/nullable-t.cc mysql-8.0-8.0.27/unittest/gunit/nullable-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/nullable-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/nullable-t.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-/*
-   Copyright (c) 2006, 2021, Oracle 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,
-   as published by the Free Software Foundation.
-
-   This program is also distributed with certain software (including
-   but not limited to OpenSSL) that is licensed under separate terms,
-   as designated in a particular file or component or in included license
-   documentation.  The authors of MySQL hereby grant you an additional
-   permission to link the program and your derivative works with the
-   separately licensed software that they have included with MySQL.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License, version 2.0, for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-*/
-
-#include <gtest/gtest.h>
-
-#include "my_inttypes.h"
-#include "nullable.h"
-
-namespace nullable_unittest {
-
-using Mysql::Nullable;
-
-class NullableTest : public ::testing::TestWithParam<uint> {
- protected:
-  void SetUp() override {}
-};
-
-TEST(NullableTest, NullConstructor) {
-  Nullable<int> nullable_int;
-  EXPECT_FALSE(nullable_int.has_value());
-}
-
-TEST(NullableTest, ValueConstructor) {
-  Nullable<int> nullable_int(42);
-  EXPECT_TRUE(nullable_int.has_value());
-  EXPECT_EQ(42, nullable_int.value());
-
-  Nullable<int> nullable_int2 = 42;
-  EXPECT_TRUE(nullable_int2.has_value());
-  EXPECT_EQ(42, nullable_int2.value());
-}
-
-TEST(NullableTest, Assignment) {
-  Nullable<int> ni(42);
-  Nullable<int> ni2 = ni;
-  EXPECT_TRUE(ni2.has_value());
-  EXPECT_EQ(42, ni2.value());
-
-  Nullable<int> mynull;
-  Nullable<int> mynull2 = mynull;
-  EXPECT_FALSE(mynull2.has_value());
-}
-
-TEST(NullableTest, Equals) {
-  Nullable<int> ni1(42), ni2(123);
-  Nullable<int> nn1, nn2;
-  EXPECT_NE(ni1, ni2);
-  EXPECT_EQ(nn1, nn2);
-  EXPECT_EQ(Nullable<int>(), nn2);
-}
-
-}  // namespace nullable_unittest
diff -Nru mysql-8.0-8.0.26/unittest/gunit/opt_range-t.cc mysql-8.0-8.0.27/unittest/gunit/opt_range-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/opt_range-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/opt_range-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -29,9 +29,11 @@
 #include <vector>
 
 #include "my_inttypes.h"
-#include "sql/opt_range.h"
-#include "sql/opt_range_internal.h"
 #include "sql/parse_tree_helpers.h"
+#include "sql/range_optimizer/internal.h"
+#include "sql/range_optimizer/range_analysis.h"
+#include "sql/range_optimizer/range_optimizer.h"
+#include "sql/range_optimizer/tree.h"
 #include "unittest/gunit/fake_range_opt_param.h"
 #include "unittest/gunit/fake_table.h"
 #include "unittest/gunit/handler-t.h"
@@ -105,7 +107,7 @@
     delete m_opt_param;
 
     initializer.TearDown();
-    free_root(&m_alloc, MYF(0));
+    m_alloc.Clear();
   }
 
   THD *thd() { return initializer.thd(); }
@@ -133,6 +135,11 @@
     m_opt_param =
         new Fake_RANGE_OPT_PARAM(thd(), &m_alloc, nbr_fields, columns_nullable);
     m_field = m_opt_param->table->field;
+    if (nbr_fields != 0) {
+      m_current_table = m_opt_param->table->pos_in_table_list->map();
+    } else {
+      m_current_table = 1;
+    }
   }
 
   void create_table(int nbr_fields) { create_table(nbr_fields, false); }
@@ -195,7 +202,16 @@
 #define create_tree(i, er) do_create_tree(i, er, TestFailLinePrinter(__LINE__))
   SEL_TREE *do_create_tree(Item *item, const char *expected_result,
                            TestFailLinePrinter called_from_line) {
-    SEL_TREE *result = get_mm_tree(m_opt_param, item);
+    /*
+      Controls whether or not ranges that do not have conditions on
+      the first keypart are removed before two trees are ORed in such
+      a way that index merge is required. The value of 'true' means
+      that such ranges are removed.
+     */
+    const bool remove_jump_scans = true;
+
+    SEL_TREE *result = get_mm_tree(thd(), m_opt_param, 0, 0, m_current_table,
+                                   remove_jump_scans, item);
     SCOPED_TRACE(called_from_line);
     check_tree_result(result, SEL_TREE::KEY, expected_result);
     return result;
@@ -296,6 +312,7 @@
     created by calling one of OptRangeTest::create_table*()
    */
   Field **m_field;
+  table_map m_current_table;
 };
 
 Item_func *OptRangeTest::create_item(Item_func::Functype type, Field *fld,
@@ -375,7 +392,8 @@
     check_use_count(tree2);
   }
 
-  SEL_TREE *result = tree_or(m_opt_param, tree1, tree2);
+  SEL_TREE *result =
+      tree_or(m_opt_param, /*remove_jump_scans=*/true, tree1, tree2);
 
   // Tree returned from tree_or()
   SCOPED_TRACE(called_from_line);
@@ -413,14 +431,14 @@
 
 TEST_F(OptRangeTest, AllocateExplicit) {
   for (int ix = 0; ix < num_iterations; ++ix) {
-    free_root(thd()->mem_root, MYF(MY_KEEP_PREALLOC));
+    thd()->mem_root->ClearForReuse();
     for (int ii = 0; ii < num_allocs; ++ii) new (thd()->mem_root) SEL_ARG;
   }
 }
 
 TEST_F(OptRangeTest, AllocateImplicit) {
   for (int ix = 0; ix < num_iterations; ++ix) {
-    free_root(thd()->mem_root, MYF(MY_KEEP_PREALLOC));
+    thd()->mem_root->ClearForReuse();
     for (int ii = 0; ii < num_allocs; ++ii) new (thd()->mem_root) SEL_ARG;
   }
 }
@@ -449,7 +467,9 @@
 
 TEST_F(OptRangeTest, SimpleCond) {
   Fake_RANGE_OPT_PARAM opt_param(thd(), &m_alloc, 0, false);
-  EXPECT_NE(null_tree, get_mm_tree(&opt_param, new Item_int(42)));
+  EXPECT_NE(null_tree,
+            get_mm_tree(thd(), &opt_param, 0, 0, m_current_table,
+                        /*remove_jump_scans=*/true, new Item_int(42)));
 }
 
 /*
@@ -457,8 +477,9 @@
 */
 TEST_F(OptRangeTest, EqualCondNoIndexes) {
   Fake_RANGE_OPT_PARAM opt_param(thd(), &m_alloc, 1, false);
-  SEL_TREE *tree =
-      get_mm_tree(&opt_param, new_item_equal(opt_param.table->field[0], 42));
+  SEL_TREE *tree = get_mm_tree(thd(), &opt_param, 0, 0, m_current_table,
+                               /*remove_jump_scans=*/true,
+                               new_item_equal(opt_param.table->field[0], 42));
   EXPECT_EQ(null_tree, tree);
 }
 
@@ -473,7 +494,9 @@
     XOR is not range optimizible ATM and is treated as
     always true. No SEL_TREE is therefore expected.
   */
-  SEL_TREE *tree = get_mm_tree(m_opt_param, new_item_xor(m_field[0], 42));
+  SEL_TREE *tree =
+      get_mm_tree(thd(), m_opt_param, 0, 0, m_current_table,
+                  /*remove_jump_scans=*/true, new_item_xor(m_field[0], 42));
   EXPECT_EQ(null_tree, tree);
 }
 
@@ -497,8 +520,9 @@
   const char expected1[] = "result keys[0]: (7 <= field_1 <= 7)\n";
 
   SEL_TREE *tree = get_mm_tree(
-      m_opt_param, new Item_cond_and(new_item_xor(m_field[0], 42),
-                                     new_item_equal(m_field[0], 7)));
+      thd(), m_opt_param, 0, 0, m_current_table, /*remove_jump_scans=*/true,
+      new Item_cond_and(new_item_xor(m_field[0], 42),
+                        new_item_equal(m_field[0], 7)));
   SCOPED_TRACE("");
   check_tree_result(tree, SEL_TREE::KEY, expected1);
 
@@ -509,9 +533,10 @@
   */
   const char expected2[] = "result keys[0]: (14 < field_1)\n";
 
-  tree =
-      get_mm_tree(m_opt_param, new Item_cond_and(new_item_xor(m_field[0], 0),
-                                                 new_item_gt(m_field[0], 14)));
+  tree = get_mm_tree(thd(), m_opt_param, 0, 0, m_current_table,
+                     /*remove_jump_scans=*/true,
+                     new Item_cond_and(new_item_xor(m_field[0], 0),
+                                       new_item_gt(m_field[0], 14)));
   SCOPED_TRACE("");
   check_tree_result(tree, SEL_TREE::KEY, expected2);
 
@@ -521,7 +546,7 @@
     always true), we get a NULL tree.
   */
   tree = get_mm_tree(
-      m_opt_param,
+      thd(), m_opt_param, 0, 0, m_current_table, /*remove_jump_scans=*/true,
       create_xor_item(new Item_cond_and(new_item_lt(m_field[0], 0),
                                         new_item_gt(m_field[0], 14)),
                       new_item_gt(m_field[0], 17)));
@@ -540,7 +565,7 @@
       "result keys[1]: (14 < field_2)\n";
 
   tree = get_mm_tree(
-      m_opt_param,
+      thd(), m_opt_param, 0, 0, m_current_table, /*remove_jump_scans=*/true,
       new Item_cond_and(
           new Item_cond_and(new_item_lt(m_field[0], 0),
                             new_item_gt(m_field[1], 14)),
@@ -566,8 +591,9 @@
   const char expected2[] =
       "result keys[0]: (42 <= field_1 <= 42) OR (43 <= field_1 <= 43)\n";
   SEL_TREE *tree = get_mm_tree(
-      m_opt_param, new Item_cond_or(new_item_equal(m_field[0], 42),
-                                    new_item_equal(m_field[0], 43)));
+      thd(), m_opt_param, 0, 0, m_current_table, /*remove_jump_scans=*/true,
+      new Item_cond_or(new_item_equal(m_field[0], 42),
+                       new_item_equal(m_field[0], 43)));
 
   SCOPED_TRACE("");
   check_tree_result(tree, SEL_TREE::KEY, expected2);
@@ -589,12 +615,14 @@
   or_list1.push_back(new_item_equal(m_field[0], 7));
   or_list1.push_back(new_item_equal(m_field[0], 8));
 
-  tree = get_mm_tree(m_opt_param, new Item_cond_or(or_list1));
+  tree = get_mm_tree(thd(), m_opt_param, 0, 0, m_current_table,
+                     /*remove_jump_scans=*/true, new Item_cond_or(or_list1));
   check_tree_result(tree, SEL_TREE::KEY, expected3);
 
   // Expected result of next test:
   const char expected4[] = "result keys[0]: (7 <= field_1 <= 7)\n";
-  tree = get_mm_tree(m_opt_param,
+  tree = get_mm_tree(thd(), m_opt_param, 0, 0, m_current_table,
+                     /*remove_jump_scans=*/true,
                      new Item_cond_and(new Item_cond_or(or_list1),
                                        new_item_equal(m_field[0], 7)));
   SCOPED_TRACE("");
@@ -612,9 +640,10 @@
   or_list2.push_back(new_item_equal(m_field[0], 7));
   or_list2.push_back(new_item_equal(m_field[0], 9));
 
-  tree =
-      get_mm_tree(m_opt_param, new Item_cond_and(new Item_cond_or(or_list1),
-                                                 new Item_cond_or(or_list2)));
+  tree = get_mm_tree(thd(), m_opt_param, 0, 0, m_current_table,
+                     /*remove_jump_scans=*/true,
+                     new Item_cond_and(new Item_cond_or(or_list1),
+                                       new Item_cond_or(or_list2)));
   SCOPED_TRACE("");
   check_tree_result(tree, SEL_TREE::KEY, expected5);
 }
@@ -661,8 +690,9 @@
   const char expected2[] =
       "result keys[0]: (42 <= field_1 <= 42 AND 10 <= field_2 <= 10)\n";
   SEL_TREE *tree = get_mm_tree(
-      m_opt_param, new Item_cond_and(new_item_equal(m_field[0], 42),
-                                     new_item_equal(m_field[1], 10)));
+      thd(), m_opt_param, 0, 0, m_current_table, /*remove_jump_scans=*/true,
+      new Item_cond_and(new_item_equal(m_field[0], 42),
+                        new_item_equal(m_field[1], 10)));
 
   range_string.length(0);
   print_tree(&range_string, "result", tree, m_opt_param, false);
@@ -693,8 +723,9 @@
   */
   const char expected1[] = "result keys[0]: (42 <= field_1 <= 42)\n";
   SEL_TREE *tree = get_mm_tree(
-      m_opt_param, new Item_cond_and(new_item_equal(m_field[0], 42),
-                                     new_item_equal(m_field[2], 10)));
+      thd(), m_opt_param, 0, 0, m_current_table, /*remove_jump_scans=*/true,
+      new Item_cond_and(new_item_equal(m_field[0], 42),
+                        new_item_equal(m_field[2], 10)));
   range_string.length(0);
   print_tree(&range_string, "result", tree, m_opt_param, false);
   EXPECT_STREQ(expected1, range_string.c_ptr());
@@ -717,7 +748,8 @@
   */
   const char expected2[] = "result keys[0]: (field_1 < 42)\n";
 
-  tree = get_mm_tree(m_opt_param,
+  tree = get_mm_tree(thd(), m_opt_param, 0, 0, m_current_table,
+                     /*remove_jump_scans=*/true,
                      new Item_cond_and(new_item_lt(m_field[0], 42),
                                        new_item_equal(m_field[1], 10)));
 
@@ -1627,7 +1659,8 @@
   Item *item = cond;
   cond->fix_fields(thd(), &item);
 
-  SEL_TREE *sel_tree = get_mm_tree(m_opt_param, cond);
+  SEL_TREE *sel_tree = get_mm_tree(thd(), m_opt_param, 0, 0, m_current_table,
+                                   /*remove_jump_scans=*/true, cond);
 
   EXPECT_FALSE(sel_tree == nullptr);
   EXPECT_EQ(Key_map(1), sel_tree->keys_map);
@@ -1657,7 +1690,8 @@
   Item *item = cond;
   cond->fix_fields(thd(), &item);
 
-  SEL_TREE *sel_tree = get_mm_tree(m_opt_param, cond);
+  SEL_TREE *sel_tree = get_mm_tree(thd(), m_opt_param, 0, 0, m_current_table,
+                                   /*remove_jump_scans=*/true, cond);
 
   EXPECT_FALSE(sel_tree == nullptr);
   EXPECT_EQ(Key_map(1), sel_tree->keys_map);
@@ -1816,8 +1850,10 @@
   opt_param.add_key(opt_param.table->field[0]);
   std::vector<SEL_ARG *> args;
   for (int i = 0; i < 10; ++i) {
-    SEL_TREE *tree =
-        get_mm_tree(&opt_param, new_item_equal(opt_param.table->field[0], i));
+    SEL_TREE *tree = get_mm_tree(thd(), &opt_param, 0, 0,
+                                 opt_param.table->pos_in_table_list->map(),
+                                 /*remove_jump_scans=*/true,
+                                 new_item_equal(opt_param.table->field[0], i));
     ASSERT_NE(nullptr, tree);
     SEL_ROOT *root = tree->keys[0];
     ASSERT_EQ(1, root->elements);
diff -Nru mysql-8.0-8.0.26/unittest/gunit/overflow_bitset-t.cc mysql-8.0-8.0.27/unittest/gunit/overflow_bitset-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/overflow_bitset-t.cc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/overflow_bitset-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -0,0 +1,219 @@
+/* Copyright (c) 2020, 2021, Oracle 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include <gmock/gmock.h>
+#include <memory>
+#include <vector>
+#include "my_alloc.h"
+#include "sql/join_optimizer/overflow_bitset.h"
+
+using std::move;
+using std::vector;
+
+TEST(OverflowBitsetTest, ZeroInitialize) {
+  OverflowBitset s;
+  if (sizeof(void *) == 8) {
+    EXPECT_EQ(63, s.capacity());
+  } else {
+    EXPECT_EQ(31, s.capacity());
+  }
+  for (unsigned i = 0; i < s.capacity(); ++i) {
+    EXPECT_FALSE(IsBitSet(i, s));
+  }
+  EXPECT_TRUE(s.is_inline());
+}
+
+TEST(OverflowBitsetTest, InitializeFromInt) {
+  OverflowBitset s{0x7eadbeef};
+  for (int i = 0; i < 31; ++i) {
+    EXPECT_EQ(IsBitSet(i, s), IsBitSet(i, 0x7eadbeef));
+  }
+}
+
+TEST(OverflowBitsetTest, TrivialCopy) {
+  OverflowBitset s{0x7eadbeef};
+  OverflowBitset t(s);
+  for (int i = 0; i < 31; ++i) {
+    EXPECT_EQ(IsBitSet(i, s), IsBitSet(i, t));
+  }
+}
+
+TEST(OverflowBitsetTest, MutateInline) {
+  MEM_ROOT mem_root;
+  MutableOverflowBitset s{&mem_root, 30};
+  for (int i = 0; i < 30; ++i) {
+    if (i % 3 == 0) {
+      s.SetBit(i);
+    }
+  }
+  s.ClearBits(2, 9);
+
+  OverflowBitset cs = move(s);
+  for (int i = 0; i < 30; ++i) {
+    SCOPED_TRACE(i);
+    EXPECT_EQ(i % 3 == 0 && (i < 2 || i >= 9), IsBitSet(i, cs));
+  }
+}
+
+TEST(OverflowBitsetTest, MutateOverflow) {
+  MEM_ROOT mem_root;
+  MutableOverflowBitset s{&mem_root, 200};
+  for (int i = 0; i < 200; ++i) {
+    if (i % 3 == 0) {
+      s.SetBit(i);
+    }
+  }
+  s.ClearBits(2, 9);
+  s.ClearBits(60, 150);
+
+  OverflowBitset cs = move(s);
+  for (int i = 0; i < 200; ++i) {
+    SCOPED_TRACE(i);
+    EXPECT_EQ(i % 3 == 0 && (i < 2 || i >= 9) && (i < 60 || i >= 150),
+              IsBitSet(i, cs));
+  }
+}
+
+TEST(OverflowBitsetTest, AndOrXor) {  // Also tests Clone.
+  for (int size : {63, 64, 200}) {
+    SCOPED_TRACE(size);
+
+    MEM_ROOT mem_root;
+    MutableOverflowBitset s1{&mem_root, static_cast<size_t>(size)};
+    MutableOverflowBitset s2{&mem_root, static_cast<size_t>(size)};
+    for (int i = 0; i < size; ++i) {
+      if (i % 3 == 0) {
+        s1.SetBit(i);
+      }
+      if (i % 5 == 0) {
+        s2.SetBit(i);
+      }
+    }
+
+    OverflowBitset ors =
+        OverflowBitset::Or(&mem_root, s1.Clone(&mem_root), s2.Clone(&mem_root));
+    OverflowBitset ands = OverflowBitset::And(&mem_root, s1.Clone(&mem_root),
+                                              s2.Clone(&mem_root));
+    OverflowBitset xors = OverflowBitset::Xor(&mem_root, s1.Clone(&mem_root),
+                                              s2.Clone(&mem_root));
+
+    for (int i = 0; i < size; ++i) {
+      const bool v1 = (i % 3 == 0);
+      const bool v2 = (i % 5 == 0);
+
+      SCOPED_TRACE(i);
+      EXPECT_EQ(v1 | v2, IsBitSet(i, ors));
+      EXPECT_EQ(v1 & v2, IsBitSet(i, ands));
+      EXPECT_EQ(v1 ^ v2, IsBitSet(i, xors));
+    }
+  }
+}
+
+TEST(OverflowBitsetTest, BitsSetInInline) {
+  OverflowBitset s{0x1005};
+  vector<int> ret;
+  for (int bit_num : BitsSetIn(s)) {
+    ret.push_back(bit_num);
+  }
+  EXPECT_THAT(ret, testing::ElementsAre(0, 2, 12));
+}
+
+TEST(OverflowBitsetTest, BitsSetInOverflow) {
+  MEM_ROOT mem_root;
+  MutableOverflowBitset s{&mem_root, 200};
+  s.SetBit(100);
+  s.SetBit(180);
+  s.SetBit(181);
+  s.SetBit(199);
+
+  vector<int> ret;
+  for (int bit_num : BitsSetIn(move(s))) {
+    ret.push_back(bit_num);
+  }
+  EXPECT_THAT(ret, testing::ElementsAre(100, 180, 181, 199));
+}
+
+TEST(OverflowBitsetTest, OverlapsInline) {
+  OverflowBitset s1{0x1005};
+  OverflowBitset s2{0x0150};
+  OverflowBitset s3{0xffff};
+
+  EXPECT_FALSE(Overlaps(s1, s2));
+  EXPECT_TRUE(Overlaps(s2, s3));
+  EXPECT_TRUE(Overlaps(s1, s3));
+
+  // Nothing overlaps with the empty set.
+  OverflowBitset s4{0};
+  EXPECT_FALSE(Overlaps(s1, s4));
+  EXPECT_FALSE(Overlaps(s2, s4));
+  EXPECT_FALSE(Overlaps(s3, s4));
+  EXPECT_FALSE(Overlaps(s4, s1));
+  EXPECT_FALSE(Overlaps(s4, s2));
+  EXPECT_FALSE(Overlaps(s4, s3));
+}
+
+TEST(OverflowBitsetTest, OverlapsOverflow) {
+  MEM_ROOT mem_root;
+  MutableOverflowBitset s1_tmp{&mem_root, 200};
+  MutableOverflowBitset s2_tmp{&mem_root, 200};
+  MutableOverflowBitset s3_tmp{&mem_root, 200};
+
+  s1_tmp.SetBit(1);
+  s1_tmp.SetBit(100);
+  s2_tmp.SetBit(60);
+  s2_tmp.SetBit(160);
+  s3_tmp.SetBit(1);
+  s3_tmp.SetBit(160);
+
+  OverflowBitset s1 = move(s1_tmp);
+  OverflowBitset s2 = move(s2_tmp);
+  OverflowBitset s3 = move(s3_tmp);
+  EXPECT_FALSE(Overlaps(s1, s2));
+  EXPECT_TRUE(Overlaps(s2, s3));
+  EXPECT_TRUE(Overlaps(s1, s3));
+
+  // Nothing overlaps with the empty set, but it's allowed
+  // to test against it even though it's not the same size.
+  OverflowBitset s4{0};
+  EXPECT_FALSE(Overlaps(s1, s4));
+  EXPECT_FALSE(Overlaps(s2, s4));
+  EXPECT_FALSE(Overlaps(s3, s4));
+  EXPECT_FALSE(Overlaps(s4, s1));
+  EXPECT_FALSE(Overlaps(s4, s2));
+  EXPECT_FALSE(Overlaps(s4, s3));
+}
+
+TEST(OverflowBitsetTest, IsEmptyInline) {
+  EXPECT_TRUE(IsEmpty(OverflowBitset{}));
+  EXPECT_TRUE(IsEmpty(OverflowBitset{0}));
+  EXPECT_FALSE(IsEmpty(OverflowBitset{1}));
+}
+
+TEST(OverflowBitsetTest, IsEmptyOverflow) {
+  MEM_ROOT mem_root;
+  MutableOverflowBitset s1{&mem_root, 200};
+  EXPECT_TRUE(IsEmpty(move(s1)));
+
+  MutableOverflowBitset s2{&mem_root, 200};
+  s2.SetBit(186);
+  EXPECT_FALSE(IsEmpty(move(s2)));
+}
diff -Nru mysql-8.0-8.0.26/unittest/gunit/regexp_facade-t.cc mysql-8.0-8.0.27/unittest/gunit/regexp_facade-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/regexp_facade-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/regexp_facade-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -23,6 +23,8 @@
 
 #include "my_config.h"
 
+#include <optional>
+
 #include "unittest/gunit/mock_parse_tree.h"
 #include "unittest/gunit/test_utils.h"
 
@@ -58,7 +60,7 @@
         m_pattern_expr(make_fixed_literal(thd, pattern)),
         m_is_error(SetPattern(m_pattern_expr, 0)) {}
 
-  Mysql::Nullable<int32_t> Find(const char *subject) {
+  std::optional<int32_t> Find(const char *subject) {
     Item *subject_expr = make_fixed_literal(m_thd, subject);
     return Regexp_facade::Find(subject_expr, 1, 0, false);
   }
@@ -90,7 +92,7 @@
     MockRegexpFacade regex(thd(), "a");
     ASSERT_FALSE(is_error);
     EXPECT_EQ(1, regex.FindValue("abc"));
-    EXPECT_EQ(Nullable<int>(), regex.Find(nullptr));
+    EXPECT_EQ(std::optional<int>(), regex.Find(nullptr));
   }
 
   // No error wanted.
@@ -103,7 +105,7 @@
     ASSERT_FALSE(is_error);
     {
       SCOPED_TRACE("Failure value of: ");
-      EXPECT_EQ(Nullable<int>(1), regex.Find("abc"));
+      EXPECT_EQ(std::optional<int>(1), regex.Find("abc"));
     }
   }
 }
diff -Nru mysql-8.0-8.0.26/unittest/gunit/rpl_group_set-t.cc mysql-8.0-8.0.27/unittest/gunit/rpl_group_set-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/rpl_group_set-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/rpl_group_set-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -448,9 +448,9 @@
        method_i++) {                                                        \
     for (int sid_map_i = 0; sid_map_i < MAX_SID_MAP;                        \
          sid_map_i++, combination_i++) {                                    \
-      Gtid_set &gtid_set MY_ATTRIBUTE((unused)) =                           \
+      Gtid_set &gtid_set [[maybe_unused]] =                                 \
           containers[combination_i]->gtid_set;                              \
-      Sid_map *&sid_map MY_ATTRIBUTE((unused)) = sid_maps[sid_map_i];       \
+      Sid_map *&sid_map [[maybe_unused]] = sid_maps[sid_map_i];             \
       append_errtext(__LINE__, "sid_map_i=%d method_i=%d combination_i=%d", \
                      sid_map_i, method_i, combination_i);
 
@@ -466,13 +466,13 @@
     for (int end_i = 0; end_i < MAX_END; end_i++) {                            \
       for (int empty_i = 0; empty_i < MAX_EMPTY; empty_i++) {                  \
         for (int anon_i = 0; anon_i < MAX_ANON; anon_i++, combination_i++) {   \
-          Gtid_set &gtid_set MY_ATTRIBUTE((unused)) =                          \
+          Gtid_set &gtid_set [[maybe_unused]] =                                \
               containers[combination_i]->gtid_set;                             \
-          Group_cache &stmt_cache MY_ATTRIBUTE((unused)) =                     \
+          Group_cache &stmt_cache [[maybe_unused]] =                           \
               containers[combination_i]->stmt_cache;                           \
-          Group_cache &trx_cache MY_ATTRIBUTE((unused)) =                      \
+          Group_cache &trx_cache [[maybe_unused]] =                            \
               containers[combination_i]->trx_cache;                            \
-          Group_log_state &group_log_state MY_ATTRIBUTE((unused)) =            \
+          Group_log_state &group_log_state [[maybe_unused]] =                  \
               containers[combination_i]->group_log_state;                      \
           append_errtext(__LINE__,                                             \
                          "type_i=%d end_i=%d empty_i=%d "                      \
diff -Nru mysql-8.0-8.0.26/unittest/gunit/sql_list-t.cc mysql-8.0-8.0.27/unittest/gunit/sql_list-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/sql_list-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/sql_list-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -65,7 +65,7 @@
     THR_MALLOC = &m_mem_root_p;
   }
 
-  void TearDown() override { free_root(&m_mem_root, MYF(0)); }
+  void TearDown() override { m_mem_root.Clear(); }
 
   static void SetUpTestCase() {
     current_thd = nullptr;
@@ -110,15 +110,14 @@
 TEST_F(SqlListTest, DeepCopy) {
   int values[] = {11, 22, 33, 42, 5};
   insert_values(values, &m_int_list);
-  MEM_ROOT mem_root;
-  init_alloc_root(PSI_NOT_INSTRUMENTED, &mem_root, 4096, 4096);
+  MEM_ROOT mem_root(PSI_NOT_INSTRUMENTED, 4096);
   List<int> list_copy(m_int_list, &mem_root);
   EXPECT_EQ(list_copy.elements, m_int_list.elements);
   while (!list_copy.is_empty()) {
     EXPECT_EQ(*m_int_list.pop(), *list_copy.pop());
   }
   EXPECT_TRUE(m_int_list.is_empty());
-  free_root(&mem_root, MYF(0));
+  mem_root.Clear();
 }
 
 // Tests that we can iterate over values.
diff -Nru mysql-8.0-8.0.26/unittest/gunit/stl_alloc-t.cc mysql-8.0-8.0.27/unittest/gunit/stl_alloc-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/stl_alloc-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/stl_alloc-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -82,7 +82,7 @@
     memcpy(&m_mem_root, &other.m_mem_root, sizeof(m_mem_root));
   }
 
-  ~Mem_root_allocator_wrapper() { free_root(&m_mem_root, MYF(0)); }
+  ~Mem_root_allocator_wrapper() { m_mem_root.Clear(); }
 };
 
 /*
diff -Nru mysql-8.0-8.0.26/unittest/gunit/stream_cipher-t.cc mysql-8.0-8.0.27/unittest/gunit/stream_cipher-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/stream_cipher-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/stream_cipher-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -21,6 +21,7 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
 #include <gtest/gtest.h>
+#include <algorithm>
 #include <memory>
 #include <string>
 #include "include/my_rnd.h"
diff -Nru mysql-8.0-8.0.26/unittest/gunit/table_cache-t.cc mysql-8.0-8.0.27/unittest/gunit/table_cache-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/table_cache-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/table_cache-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -127,7 +127,9 @@
   Mock_share(const char *key)
       :  // Assertion in some of Table_cache methods check that the
          // version of the share is up-to-date, so make sure it's set.
-        TABLE_SHARE(refresh_version, false) {
+        TABLE_SHARE(refresh_version, false),
+        // MEM_ROOT is used for constructing ha_example() instances.
+        m_mem_root(PSI_NOT_INSTRUMENTED, 1024) {
     /*
       Both table_cache_key and cache_element array are used by
       Table_cache code.
@@ -136,13 +138,11 @@
     table_cache_key.length = strlen(key);
     memset(cache_element_arr, 0, sizeof(cache_element_arr));
     cache_element = cache_element_arr;
-    // MEM_ROOT is used for constructing ha_example() instances.
-    init_alloc_root(PSI_NOT_INSTRUMENTED, &m_mem_root, 1024, 0);
     // Ensure that share is never destroyed.
     increment_ref_count();
   }
 
-  ~Mock_share() { free_root(&m_mem_root, MYF(0)); }
+  ~Mock_share() { m_mem_root.Clear(); }
 
   TABLE *create_table(THD *thd) {
     TABLE *result =
diff -Nru mysql-8.0-8.0.26/unittest/gunit/test_utils.cc mysql-8.0-8.0.27/unittest/gunit/test_utils.cc
--- mysql-8.0-8.0.26/unittest/gunit/test_utils.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/test_utils.cc	2021-09-28 11:46:34.000000000 +0000
@@ -51,7 +51,7 @@
 #include "sql/mysqld.h"  // set_remaining_args
 #include "sql/mysqld_thd_manager.h"
 #include "sql/opt_costconstantcache.h"  // optimizer cost constant cache
-#include "sql/opt_range.h"
+#include "sql/range_optimizer/range_optimizer.h"
 #include "sql/rpl_filter.h"
 #include "sql/rpl_handler.h"  // delegates_init()
 #include "sql/set_var.h"
@@ -94,6 +94,7 @@
   sys_var_init();
   init_common_variables();
   test_flags |= TEST_SIGINT;
+  test_flags |= TEST_NO_TEMP_TABLES;
   test_flags &= ~TEST_CORE_ON_SIGNAL;
   my_init_signals();
   randominit(&sql_rand, 0, 0);
diff -Nru mysql-8.0-8.0.26/unittest/gunit/test_utils.h mysql-8.0-8.0.27/unittest/gunit/test_utils.h
--- mysql-8.0-8.0.26/unittest/gunit/test_utils.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/test_utils.h	2021-09-28 11:46:34.000000000 +0000
@@ -30,7 +30,6 @@
 #include "my_compiler.h"
 #include "my_sys.h"
 #include "mysql/components/services/mysql_mutex_bits.h"
-#include "nullable.h"
 #include "sql/error_handler.h"
 #include "sql/sql_error.h"
 
@@ -45,7 +44,7 @@
   return memcmp(*a, *b, *length);
 }
 
-inline qsort2_cmp get_ptr_compare(size_t size MY_ATTRIBUTE((unused))) {
+inline qsort2_cmp get_ptr_compare(size_t size [[maybe_unused]]) {
   return (qsort2_cmp)native_compare;
 }
 
diff -Nru mysql-8.0-8.0.26/unittest/gunit/thd_manager-t.cc mysql-8.0-8.0.27/unittest/gunit/thd_manager-t.cc
--- mysql-8.0-8.0.26/unittest/gunit/thd_manager-t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/thd_manager-t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -183,15 +183,28 @@
   thd_manager->add_thd(&thd2);
   TestFunc2 testFunc2;
   testFunc2.set_search_value(2);
-  THD *thd = thd_manager->find_thd(&testFunc2);
+  THD_ptr thd_ptr = thd_manager->find_thd(&testFunc2);
   /* Returns the last thd which matches. */
-  EXPECT_EQ(2U, thd->server_id);
+  EXPECT_EQ(2U, thd_ptr->server_id);
 
   testFunc2.set_search_value(6);
-  thd = thd_manager->find_thd(&testFunc2);
+  thd_ptr = thd_manager->find_thd(&testFunc2);
   /* Find non existing thd with server_id value 6. Expected to return NULL. */
   const THD *null_thd = nullptr;
-  EXPECT_EQ(null_thd, thd);
+  EXPECT_EQ(null_thd, thd_ptr.get());
+
+  /* Verify if THD being disposed is returned from find_thd() */
+  testFunc2.set_search_value(1);
+  thd_ptr = thd_manager->find_thd(&testFunc2);
+  EXPECT_EQ(1U, thd_ptr->server_id);
+  EXPECT_EQ(false, thd_ptr->is_being_disposed());
+  thd_ptr.release();
+  // Starting thd1 disposal.
+  thd1.release_resources();
+  // Find THD being disposed. Expected to return nullptr.
+  thd_ptr = thd_manager->find_thd(&testFunc2);
+  EXPECT_EQ(null_thd, thd_ptr.get());
+  EXPECT_EQ(true, thd1.release_resources_done());
 
   // Cleanup - Remove added THD.
   thd_manager->remove_thd(&thd1);
diff -Nru mysql-8.0-8.0.26/unittest/gunit/xplugin/CMakeLists.txt mysql-8.0-8.0.27/unittest/gunit/xplugin/CMakeLists.txt
--- mysql-8.0-8.0.26/unittest/gunit/xplugin/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/xplugin/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -45,9 +45,7 @@
   ${MYSQLX_CLIENT_INCLUDE_DIR}
 )
 
-# Protobuf 3 will generate #if PROTOBUF_INLINE_NOT_IN_HEADERS
-# which may fail with -Werror=undef
-ADD_DEFINITIONS(-DPROTOBUF_INLINE_NOT_IN_HEADERS=0 -DXPLUGIN_DISABLE_LOG)
+ADD_DEFINITIONS(-DXPLUGIN_DISABLE_LOG)
 # Protobuf 3.7.0 will generate #if 3007000 < PROTOBUF_MIN_PROTOC_VERSION
 IF(PROTOBUF_VERSION_NUMBER MATCHES "3007000")
   ADD_DEFINITIONS(-DPROTOBUF_MIN_PROTOC_VERSION=2006000)
diff -Nru mysql-8.0-8.0.26/unittest/gunit/xplugin/xcl/CMakeLists.txt mysql-8.0-8.0.27/unittest/gunit/xplugin/xcl/CMakeLists.txt
--- mysql-8.0-8.0.26/unittest/gunit/xplugin/xcl/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/xplugin/xcl/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -35,32 +35,13 @@
 
 INCLUDE(source_files.cmake)
 
-# TODO(fix Bug #32738447)
-# -Werror=lto-type-mismatch for several uses of MOCK_METHOD.
-# -Wodr for different implementations of class XProtocol.
-# note: code may be misoptimized unless '-fno-strict-aliasing' is used.
-REMOVE_CMAKE_COMPILER_FLAGS(CMAKE_CXX_FLAGS "${MY_COMPILER_FLAG_FLTO}")
-
 # There may be extra semicolons in code generated by protobuf.
 MY_CHECK_CXX_COMPILER_WARNING("-Wextra-semi" HAS_WARN_FLAG)
 IF(HAS_WARN_FLAG)
   STRING_APPEND(CMAKE_CXX_FLAGS " ${HAS_WARN_FLAG}")
 ENDIF()
 
-# This compiler fails to handle some of the mock functions involved.
-IF(MY_COMPILER_IS_SUNPRO)
-  LIST(REMOVE_ITEM XCL_TEST_SRC
-    auth_chaining_t.cc
-    session_capability_t.cc
-    session_connect_t.cc
-    session_execute_t.cc
-    session_general_t.cc
-    session_options_t.cc
-    session_negotiation_t.cc
-  )
-ENDIF()
-
-ADD_COMPILE_DEFINITIONS(${XCL_TEST_SRC}
+MY_ADD_COMPILE_DEFINITIONS(${XCL_TEST_SRC}
   COMPILE_DEFINITIONS USE_MYSQLX_FULL_PROTO
 )
 
diff -Nru mysql-8.0-8.0.26/unittest/gunit/xplugin/xcl/mock/factory.h mysql-8.0-8.0.27/unittest/gunit/xplugin/xcl/mock/factory.h
--- mysql-8.0-8.0.26/unittest/gunit/xplugin/xcl/mock/factory.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/xplugin/xcl/mock/factory.h	2021-09-28 11:46:34.000000000 +0000
@@ -39,18 +39,18 @@
   Protocol_factory();
   virtual ~Protocol_factory() override;
 
-  MOCK_METHOD(XProtocol *, create_protocol_raw,
+  MOCK_METHOD(xcl::XProtocol *, create_protocol_raw,
               (std::shared_ptr<Context> context));
-  MOCK_METHOD(XConnection *, create_connection_raw,
+  MOCK_METHOD(xcl::XConnection *, create_connection_raw,
               (std::shared_ptr<Context> context));
-  MOCK_METHOD(XQuery_result *, create_result_raw,
+  MOCK_METHOD(xcl::XQuery_result *, create_result_raw,
               (std::shared_ptr<XProtocol>, Query_instances *,
                std::shared_ptr<Context>));
 
  private:
-  std::shared_ptr<XProtocol> create_protocol(
+  std::shared_ptr<xcl::XProtocol> create_protocol(
       std::shared_ptr<Context> context) override {
-    std::shared_ptr<XProtocol> result{create_protocol_raw(context)};
+    std::shared_ptr<xcl::XProtocol> result{create_protocol_raw(context)};
 
     return result;
   }
@@ -63,7 +63,8 @@
   }
 
   std::unique_ptr<xcl::XQuery_result> create_result(
-      std::shared_ptr<XProtocol> protocol, Query_instances *query_instances,
+      std::shared_ptr<xcl::XProtocol> protocol,
+      Query_instances *query_instances,
       std::shared_ptr<Context> context) override {
     std::unique_ptr<xcl::XQuery_result> result{
         create_result_raw(protocol, query_instances, context)};
diff -Nru mysql-8.0-8.0.26/unittest/gunit/xplugin/xcl/mock/protocol.h mysql-8.0-8.0.27/unittest/gunit/xplugin/xcl/mock/protocol.h
--- mysql-8.0-8.0.26/unittest/gunit/xplugin/xcl/mock/protocol.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/xplugin/xcl/mock/protocol.h	2021-09-28 11:46:34.000000000 +0000
@@ -60,7 +60,7 @@
               (override));
   MOCK_METHOD(void, remove_send_message_handler, (Handler_id handler),
               (override));
-  MOCK_METHOD(XConnection &, get_connection, (), (override));
+  MOCK_METHOD(xcl::XConnection &, get_connection, (), (override));
   MOCK_METHOD(XError, recv,
               (Header_message_type_id * out_mid, uint8_t **buffer,
                std::size_t *buffer_size),
diff -Nru mysql-8.0-8.0.26/unittest/gunit/xplugin/xcl/protocol_t.h mysql-8.0-8.0.27/unittest/gunit/xplugin/xcl/protocol_t.h
--- mysql-8.0-8.0.26/unittest/gunit/xplugin/xcl/protocol_t.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/xplugin/xcl/protocol_t.h	2021-09-28 11:46:34.000000000 +0000
@@ -96,17 +96,16 @@
                            const uint32_t expected_payload_size,
                            const int32_t error_code = 0) {
     EXPECT_CALL(*m_mock_connection, write(_, 5))
-        .WillOnce(Invoke(
-            [this, id, expected_payload_size, error_code](
-                const uchar *data,
-                const std::size_t size MY_ATTRIBUTE((unused))) -> XError {
-              EXPECT_EQ(data[4], id);
-              auto header = this->extract_header_from_message(data);
-
-              EXPECT_EQ(expected_payload_size,
-                        *reinterpret_cast<int32_t *>(header.data()) - 1);
-              return XError{error_code, ""};
-            }));
+        .WillOnce(Invoke([this, id, expected_payload_size, error_code](
+                             const uchar *data, const std::size_t size
+                             [[maybe_unused]]) -> XError {
+          EXPECT_EQ(data[4], id);
+          auto header = this->extract_header_from_message(data);
+
+          EXPECT_EQ(expected_payload_size,
+                    *reinterpret_cast<int32_t *>(header.data()) - 1);
+          return XError{error_code, ""};
+        }));
   }
 
   template <typename Message_type>
@@ -151,17 +150,16 @@
     const std::uint8_t header_size = 5;
 
     EXPECT_CALL(*m_mock_connection, write(_, header_size + payload_size))
-        .WillOnce(Invoke(
-            [this, id, payload_size, error_code](
-                const uchar *data,
-                const std::size_t size MY_ATTRIBUTE((unused))) -> XError {
-              EXPECT_EQ(data[4], id);
-              auto header = this->extract_header_from_message(data);
-
-              EXPECT_EQ(payload_size,
-                        *reinterpret_cast<int32_t *>(header.data()) - 1);
-              return XError{error_code, ""};
-            }));
+        .WillOnce(Invoke([this, id, payload_size, error_code](
+                             const uchar *data, const std::size_t size
+                             [[maybe_unused]]) -> XError {
+          EXPECT_EQ(data[4], id);
+          auto header = this->extract_header_from_message(data);
+
+          EXPECT_EQ(payload_size,
+                    *reinterpret_cast<int32_t *>(header.data()) - 1);
+          return XError{error_code, ""};
+        }));
   }
 
   template <typename Message_type_id>
@@ -190,7 +188,7 @@
 
   template <typename Message_type>
   void expect_read_message_without_payload(const Message_type &message
-                                               MY_ATTRIBUTE((unused)),
+                                           [[maybe_unused]],
                                            const int32_t error_code = 0) {
     expect_read_header(Server_message<Message_type>::get_id(), 0, error_code);
   }
diff -Nru mysql-8.0-8.0.26/unittest/gunit/xplugin/xcl/session_execute_t.cc mysql-8.0-8.0.27/unittest/gunit/xplugin/xcl/session_execute_t.cc
--- mysql-8.0-8.0.26/unittest/gunit/xplugin/xcl/session_execute_t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/xplugin/xcl/session_execute_t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -65,7 +65,7 @@
   XError out_error;
   EXPECT_CALL(*m_mock_protocol,
               execute_stmt_raw(Cmp_msg("stmt: \"SELECT 1;\""), _))
-      .WillOnce(Invoke([](const StmtExecute &stmt MY_ATTRIBUTE((unused)),
+      .WillOnce(Invoke([](const StmtExecute &stmt [[maybe_unused]],
                           XError *out_r) -> XQuery_result_ptr {
         *out_r = XError{expected_error_code, ""};
         return {};
@@ -93,7 +93,7 @@
       *m_mock_protocol,
       execute_stmt_raw(
           Cmp_msg("stmt: \"SELECT 1;\" namespace: \"our-namespace\""), _))
-      .WillOnce(Invoke([](const StmtExecute &stmt MY_ATTRIBUTE((unused)),
+      .WillOnce(Invoke([](const StmtExecute &stmt [[maybe_unused]],
                           XError *out_r) -> XQuery_result_ptr {
         *out_r = XError{expected_error_code, ""};
         return {};
@@ -117,12 +117,11 @@
       *m_mock_protocol,
       execute_stmt_raw(
           Cmp_msg("stmt: \"SELECT 1;\" namespace: \"our-namespace\""), _))
-      .WillOnce(
-          Invoke([&dummy_result](const StmtExecute &stmt MY_ATTRIBUTE((unused)),
-                                 XError *out_r) -> XQuery_result_ptr {
-            *out_r = {};
-            return dummy_result.release();
-          }));
+      .WillOnce(Invoke([&dummy_result](const StmtExecute &stmt [[maybe_unused]],
+                                       XError *out_r) -> XQuery_result_ptr {
+        *out_r = {};
+        return dummy_result.release();
+      }));
 
   auto query_result =
       m_sut->execute_stmt("our-namespace", expected_sql, {}, &out_error);
@@ -146,12 +145,11 @@
                                        "   type: V_SINT "
                                        "   v_signed_int: 1002} }"),
                                _))
-      .WillOnce(
-          Invoke([&dummy_result](const StmtExecute &stmt MY_ATTRIBUTE((unused)),
-                                 XError *out_r) -> XQuery_result_ptr {
-            *out_r = {};
-            return dummy_result.release();
-          }));
+      .WillOnce(Invoke([&dummy_result](const StmtExecute &stmt [[maybe_unused]],
+                                       XError *out_r) -> XQuery_result_ptr {
+        *out_r = {};
+        return dummy_result.release();
+      }));
 
   auto query_result = m_sut->execute_stmt(
       "s", expected_sql, {Argument_value(argument_value)}, &out_error);
@@ -210,12 +208,11 @@
                                        "args { type:SCALAR scalar {"
                                        "   type: V_NULL } }"),
                                _))
-      .WillOnce(
-          Invoke([&dummy_result](const StmtExecute &stmt MY_ATTRIBUTE((unused)),
-                                 XError *out_r) -> XQuery_result_ptr {
-            *out_r = {};
-            return dummy_result.release();
-          }));
+      .WillOnce(Invoke([&dummy_result](const StmtExecute &stmt [[maybe_unused]],
+                                       XError *out_r) -> XQuery_result_ptr {
+        *out_r = {};
+        return dummy_result.release();
+      }));
 
   auto query_result = m_sut->execute_stmt(
       "s", expected_sql,
@@ -276,12 +273,11 @@
                                        "       } } } "
                                        "} }"),
                                _))
-      .WillOnce(
-          Invoke([&dummy_result](const StmtExecute &stmt MY_ATTRIBUTE((unused)),
-                                 XError *out_r) -> XQuery_result_ptr {
-            *out_r = {};
-            return dummy_result.release();
-          }));
+      .WillOnce(Invoke([&dummy_result](const StmtExecute &stmt [[maybe_unused]],
+                                       XError *out_r) -> XQuery_result_ptr {
+        *out_r = {};
+        return dummy_result.release();
+      }));
 
   Argument_value::Object obj;
   obj.emplace("key1", argument_value_int);
@@ -329,12 +325,11 @@
                                        "       } } "
                                        "} }"),
                                _))
-      .WillOnce(
-          Invoke([&dummy_result](const StmtExecute &stmt MY_ATTRIBUTE((unused)),
-                                 XError *out_r) -> XQuery_result_ptr {
-            *out_r = {};
-            return dummy_result.release();
-          }));
+      .WillOnce(Invoke([&dummy_result](const StmtExecute &stmt [[maybe_unused]],
+                                       XError *out_r) -> XQuery_result_ptr {
+        *out_r = {};
+        return dummy_result.release();
+      }));
 
   auto query_result = m_sut->execute_stmt(
       "s", expected_sql,
diff -Nru mysql-8.0-8.0.26/unittest/gunit/xplugin/xcl/session_options_t.cc mysql-8.0-8.0.27/unittest/gunit/xplugin/xcl/session_options_t.cc
--- mysql-8.0-8.0.26/unittest/gunit/xplugin/xcl/session_options_t.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/xplugin/xcl/session_options_t.cc	2021-09-28 11:46:34.000000000 +0000
@@ -72,7 +72,7 @@
 }
 
 INSTANTIATE_TEST_SUITE_P(InstantiationNotSupportedIntOptions,
-                         Xcl_session_impl_tests_param_bool_option,
+                         Xcl_session_impl_tests_param_int_option,
                          Values(XSession::Mysqlx_option::Read_timeout,
                                 XSession::Mysqlx_option::Write_timeout,
                                 XSession::Mysqlx_option::Connect_timeout));
diff -Nru mysql-8.0-8.0.26/unittest/gunit/xplugin/xcl/session_t.h mysql-8.0-8.0.27/unittest/gunit/xplugin/xcl/session_t.h
--- mysql-8.0-8.0.26/unittest/gunit/xplugin/xcl/session_t.h	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/xplugin/xcl/session_t.h	2021-09-28 11:46:34.000000000 +0000
@@ -43,6 +43,7 @@
 
 using ::testing::_;
 using ::testing::An;
+using ::testing::DoAll;
 using ::testing::Invoke;
 using ::testing::Return;
 using ::testing::ReturnRef;
diff -Nru mysql-8.0-8.0.26/unittest/gunit/xplugin/xpl/CMakeLists.txt mysql-8.0-8.0.27/unittest/gunit/xplugin/xpl/CMakeLists.txt
--- mysql-8.0-8.0.26/unittest/gunit/xplugin/xpl/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/xplugin/xpl/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -36,21 +36,6 @@
   STRING_APPEND(CMAKE_CXX_FLAGS " ${HAS_WARN_FLAG}")
 ENDIF()
 
-# This compiler fails to handle some of the mock functions involved.
-IF(MY_COMPILER_IS_SUNPRO)
-  LIST(REMOVE_ITEM XPL_TEST_SRC
-    account_verification_handler_t.cc
-    admin_cmd_index_t.cc
-    index_field_t.cc
-    listener_tcp_t.cc
-    listener_unix_socket_t.cc
-    protocol_decoder_t.cc
-    sql_data_context_t.cc
-    socket_acceptor_task_t.cc
-    timeouts_t.cc
-  )
-ENDIF()
-
 # googlemock uses GTEST_DISALLOW_ASSIGN_ which will generate:
 # definition of implicit copy constructor for  ....
 # is deprecated because it has a user-declared copy assignment operator
@@ -84,7 +69,7 @@
 )
 
 IF(DISABLE_MYSQLX_PROTOBUF_LITE)
-  ADD_COMPILE_DEFINITIONS(${XPL_TEST_SRC}
+  MY_ADD_COMPILE_DEFINITIONS(${XPL_TEST_SRC}
     COMPILE_DEFINITIONS USE_MYSQLX_FULL_PROTO)
 ENDIF()
 
@@ -99,14 +84,6 @@
   SET_TARGET_PROPERTIES(${XPL_UNIT_TESTS} PROPERTIES COMPILE_FLAGS "/wd4373")
 ENDIF(WIN32)
 
-# assertion failed in function assert_with_dumps() @ ssa.c:621 when using -xO3
-# Segfault in the unit test, so lower optimization level there as well
-IF(MY_COMPILER_IS_SUNPRO)
-  ADD_COMPILE_FLAGS(
-    callback_command_delegate_t.cc
-    COMPILE_FLAGS "-xO2")
-ENDIF()
-
 TARGET_LINK_LIBRARIES(${XPL_UNIT_TESTS}
   ${GCOV_LDFLAGS}
   ${MYSQLX_CLIENT_LIB}
diff -Nru mysql-8.0-8.0.26/unittest/gunit/xplugin/xpl/stubs/pfs.cc mysql-8.0-8.0.27/unittest/gunit/xplugin/xpl/stubs/pfs.cc
--- mysql-8.0-8.0.26/unittest/gunit/xplugin/xpl/stubs/pfs.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/unittest/gunit/xplugin/xpl/stubs/pfs.cc	2021-09-28 11:46:34.000000000 +0000
@@ -119,14 +119,15 @@
 
 #ifdef HAVE_PSI_THREAD_INTERFACE
 void pfs_delete_current_thread_vc() {}
-PSI_thread *pfs_new_thread_vc(PSI_thread_key, const void *, ulonglong) {
+PSI_thread *pfs_new_thread_vc(PSI_thread_key, PSI_thread_seqnum, const void *,
+                              ulonglong) {
   return nullptr;
 }
-void pfs_register_thread_vc(char const *, PSI_thread_info_v1 *, int) {}
+void pfs_register_thread_vc(char const *, PSI_thread_info *, int) {}
 void pfs_set_thread_account_vc(char const *, int, char const *, int) {}
 void pfs_set_thread_os_id_vc(PSI_thread *) {}
 void pfs_set_thread_vc(PSI_thread *) {}
-int pfs_spawn_thread_vc(PSI_thread_key, my_thread_handle *,
+int pfs_spawn_thread_vc(PSI_thread_key, PSI_thread_seqnum, my_thread_handle *,
                         const my_thread_attr_t *, void *(*)(void *), void *) {
   return 0;
 }
diff -Nru mysql-8.0-8.0.26/utilities/CMakeLists.txt mysql-8.0-8.0.27/utilities/CMakeLists.txt
--- mysql-8.0-8.0.26/utilities/CMakeLists.txt	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/utilities/CMakeLists.txt	2021-09-28 11:46:34.000000000 +0000
@@ -177,7 +177,7 @@
   DEPENDENCIES GenError
   LINK_LIBRARIES mysys innodb_zipdecompress ${LZ4_LIBRARY}
   )
-TARGET_COMPILE_DEFINITIONS(ibd2sdi PRIVATE UNIV_NO_ERR_MSGS UNIV_LIBRARY)
+TARGET_COMPILE_DEFINITIONS(ibd2sdi PRIVATE UNIV_NO_ERR_MSGS UNIV_LIBRARY DISABLE_PSI_MEMORY)
 IF(MY_COMPILER_IS_GNU_OR_CLANG)
   ADD_COMPILE_FLAGS(ibd2sdi.cc
     COMPILE_FLAGS "-Wno-unused-parameter -Wno-cast-qual")
diff -Nru mysql-8.0-8.0.26/utilities/comp_err.cc mysql-8.0-8.0.27/utilities/comp_err.cc
--- mysql-8.0-8.0.26/utilities/comp_err.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/utilities/comp_err.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1375,8 +1375,8 @@
 /* Read options */
 
 static bool get_one_option(int optid,
-                           const struct my_option *opt MY_ATTRIBUTE((unused)),
-                           char *argument MY_ATTRIBUTE((unused))) {
+                           const struct my_option *opt [[maybe_unused]],
+                           char *argument [[maybe_unused]]) {
   DBUG_TRACE;
   switch (optid) {
     case 'V':
diff -Nru mysql-8.0-8.0.26/utilities/ibd2sdi.cc mysql-8.0-8.0.27/utilities/ibd2sdi.cc
--- mysql-8.0-8.0.26/utilities/ibd2sdi.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/utilities/ibd2sdi.cc	2021-09-28 11:46:34.000000000 +0000
@@ -313,9 +313,10 @@
 }
 
 /** Parse the options passed to tool. */
-extern "C" bool ibd2sdi_get_one_option(
-    int optid, const struct my_option *opt MY_ATTRIBUTE((unused)),
-    char *argument MY_ATTRIBUTE((unused))) {
+extern "C" bool ibd2sdi_get_one_option(int optid,
+                                       const struct my_option *opt
+                                       [[maybe_unused]],
+                                       char *argument [[maybe_unused]]) {
   switch (optid) {
 #ifndef NDEBUG
     case '#':
@@ -718,8 +719,7 @@
   }
 
   if (page_size.is_compressed() && fil_page_get_type(buf) == FIL_PAGE_SDI) {
-    byte *uncomp_buf =
-        static_cast<byte *>(ut_malloc_nokey(2 * page_size.logical()));
+    byte *uncomp_buf = static_cast<byte *>(ut::malloc(2 * page_size.logical()));
 
     byte *uncomp_page =
         static_cast<byte *>(ut_align(uncomp_buf, page_size.logical()));
@@ -753,7 +753,7 @@
       memcpy(buf, uncomp_page, page_size.logical());
     }
 
-    ut_free(uncomp_buf);
+    ut::free(uncomp_buf);
   }
 
   return n_bytes;
@@ -1688,7 +1688,7 @@
         if (next_page_num == FIL_NULL) {
           goto func_exit;
         }
-      /* fall through */
+        [[fallthrough]];
       default:
       inflate_error : {
         page_id_t page_id(space_id, page_num);
diff -Nru mysql-8.0-8.0.26/utilities/innochecksum.cc mysql-8.0-8.0.27/utilities/innochecksum.cc
--- mysql-8.0-8.0.26/utilities/innochecksum.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/utilities/innochecksum.cc	2021-09-28 11:46:34.000000000 +0000
@@ -1282,9 +1282,10 @@
   my_print_variables(innochecksum_options);
 }
 
-extern "C" bool innochecksum_get_one_option(
-    int optid, const struct my_option *opt MY_ATTRIBUTE((unused)),
-    char *argument MY_ATTRIBUTE((unused))) {
+extern "C" bool innochecksum_get_one_option(int optid,
+                                            const struct my_option *opt
+                                            [[maybe_unused]],
+                                            char *argument [[maybe_unused]]) {
   switch (optid) {
 #ifndef NDEBUG
     case '#':
diff -Nru mysql-8.0-8.0.26/utilities/my_print_defaults.cc mysql-8.0-8.0.27/utilities/my_print_defaults.cc
--- mysql-8.0-8.0.26/utilities/my_print_defaults.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/utilities/my_print_defaults.cc	2021-09-28 11:46:34.000000000 +0000
@@ -127,8 +127,8 @@
 }
 
 static bool get_one_option(int optid,
-                           const struct my_option *opt MY_ATTRIBUTE((unused)),
-                           char *argument MY_ATTRIBUTE((unused))) {
+                           const struct my_option *opt [[maybe_unused]],
+                           char *argument [[maybe_unused]]) {
   switch (optid) {
     case 'c':
       opt_defaults_file_used = 1;
diff -Nru mysql-8.0-8.0.26/utilities/perror.cc mysql-8.0-8.0.27/utilities/perror.cc
--- mysql-8.0-8.0.26/utilities/perror.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/utilities/perror.cc	2021-09-28 11:46:34.000000000 +0000
@@ -71,8 +71,8 @@
 }
 
 static bool get_one_option(int optid,
-                           const struct my_option *opt MY_ATTRIBUTE((unused)),
-                           char *argument MY_ATTRIBUTE((unused))) {
+                           const struct my_option *opt [[maybe_unused]],
+                           char *argument [[maybe_unused]]) {
   switch (optid) {
     case 's':
       verbose = false;
diff -Nru mysql-8.0-8.0.26/vio/test-sslclient.cc mysql-8.0-8.0.27/vio/test-sslclient.cc
--- mysql-8.0-8.0.26/vio/test-sslclient.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/vio/test-sslclient.cc	2021-09-28 11:46:34.000000000 +0000
@@ -42,7 +42,7 @@
   exit(0);
 }
 
-int main(int argc MY_ATTRIBUTE((unused)), char **argv) {
+int main(int argc [[maybe_unused]], char **argv) {
   char client_key[] = "../SSL/client-key.pem",
        client_cert[] = "../SSL/client-cert.pem";
   char ca_file[] = "../SSL/cacert.pem", *ca_path = 0, *cipher = 0;
diff -Nru mysql-8.0-8.0.26/vio/test-sslserver.cc mysql-8.0-8.0.27/vio/test-sslserver.cc
--- mysql-8.0-8.0.26/vio/test-sslserver.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/vio/test-sslserver.cc	2021-09-28 11:46:34.000000000 +0000
@@ -74,7 +74,7 @@
   return 0;
 }
 
-int main(int argc MY_ATTRIBUTE((unused)), char **argv) {
+int main(int argc [[maybe_unused]], char **argv) {
   char server_key[] = "../SSL/server-key.pem",
        server_cert[] = "../SSL/server-cert.pem";
   char ca_file[] = "../SSL/cacert.pem", *ca_path = 0, *cipher = 0;
diff -Nru mysql-8.0-8.0.26/vio/vio.cc mysql-8.0-8.0.27/vio/vio.cc
--- mysql-8.0-8.0.26/vio/vio.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/vio/vio.cc	2021-09-28 11:46:34.000000000 +0000
@@ -85,16 +85,16 @@
   @retval 1       The requested I/O event has occurred.
 */
 
-static int no_io_wait(Vio *vio MY_ATTRIBUTE((unused)),
-                      enum enum_vio_io_event event MY_ATTRIBUTE((unused)),
-                      int timeout MY_ATTRIBUTE((unused))) {
+static int no_io_wait(Vio *vio [[maybe_unused]],
+                      enum enum_vio_io_event event [[maybe_unused]],
+                      int timeout [[maybe_unused]]) {
   return 1;
 }
 
 #endif
 
 extern "C" {
-static bool has_no_data(Vio *vio MY_ATTRIBUTE((unused))) { return false; }
+static bool has_no_data(Vio *vio [[maybe_unused]]) { return false; }
 }  // extern "C"
 
 Vio::Vio(uint flags) {
@@ -348,7 +348,7 @@
 */
 
 bool vio_reset(Vio *vio, enum enum_vio_type type, my_socket sd,
-               void *ssl MY_ATTRIBUTE((unused)), uint flags) {
+               void *ssl [[maybe_unused]], uint flags) {
   int ret = false;
   Vio new_vio(flags);
   DBUG_TRACE;
diff -Nru mysql-8.0-8.0.26/vio/viosocket.cc mysql-8.0-8.0.27/vio/viosocket.cc
--- mysql-8.0-8.0.26/vio/viosocket.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/vio/viosocket.cc	2021-09-28 11:46:34.000000000 +0000
@@ -70,7 +70,7 @@
 
 #include "mysql/psi/mysql_socket.h"
 
-int vio_errno(Vio *vio MY_ATTRIBUTE((unused))) {
+int vio_errno(Vio *vio [[maybe_unused]]) {
 /* These transport types are not Winsock based. */
 #ifdef _WIN32
   if (vio->type == VIO_TYPE_NAMEDPIPE || vio->type == VIO_TYPE_SHARED_MEMORY)
@@ -306,8 +306,7 @@
   return vio->is_blocking_flag;
 }
 
-int vio_socket_timeout(Vio *vio, uint which MY_ATTRIBUTE((unused)),
-                       bool old_mode) {
+int vio_socket_timeout(Vio *vio, uint which [[maybe_unused]], bool old_mode) {
   int ret = 0;
   DBUG_TRACE;
 
diff -Nru mysql-8.0-8.0.26/vio/viosslfactories.cc mysql-8.0-8.0.27/vio/viosslfactories.cc
--- mysql-8.0-8.0.26/vio/viosslfactories.cc	2021-07-01 07:53:49.000000000 +0000
+++ mysql-8.0-8.0.27/vio/viosslfactories.cc	2021-09-28 11:46:34.000000000 +0000
@@ -313,8 +313,8 @@
   as we are using our own locking mechanism.
 */
 static void openssl_lock(int mode, openssl_lock_t *lock,
-                         const char *file MY_ATTRIBUTE((unused)),
-                         int line MY_ATTRIBUTE((unused))) {
+                         const char *file [[maybe_unused]],
+                         int line [[maybe_unused]]) {
   int err;
   char const *what;
 
@@ -353,8 +353,8 @@
 }
 
 static void openssl_lock_function(int mode, int n,
-                                  const char *file MY_ATTRIBUTE((unused)),
-                                  int line MY_ATTRIBUTE((unused))) {
+                                  const char *file [[maybe_unused]],
+                                  int line [[maybe_unused]]) {
   if (n < 0 || n > CRYPTO_num_locks()) {
     /* Lock number out of bounds. */
     DBUG_PRINT("error", ("Fatal OpenSSL: %s:%d: interface problem (n = %d)",
@@ -367,8 +367,8 @@
   openssl_lock(mode, &openssl_stdlocks[n], file, line);
 }
 
-static openssl_lock_t *openssl_dynlock_create(
-    const char *file MY_ATTRIBUTE((unused)), int line MY_ATTRIBUTE((unused))) {
+static openssl_lock_t *openssl_dynlock_create(const char *file [[maybe_unused]],
+                                              int line [[maybe_unused]]) {
   openssl_lock_t *lock;
 
   DBUG_PRINT("info", ("openssl_dynlock_create: %s:%d", file, line));
@@ -385,8 +385,8 @@
 }
 
 static void openssl_dynlock_destroy(openssl_lock_t *lock,
-                                    const char *file MY_ATTRIBUTE((unused)),
-                                    int line MY_ATTRIBUTE((unused))) {
+                                    const char *file [[maybe_unused]],
+                                    int line [[maybe_unused]]) {
   DBUG_PRINT("info", ("openssl_dynlock_destroy: %s:%d", file, line));
 
   mysql_rwlock_destroy(&lock->lock);
@@ -526,6 +526,21 @@
 */
 uint get_fips_mode() { return FIPS_mode(); }
 
+/**
+  Toggle FIPS mode, to see whether it is available with the current SSL library.
+  @retval 0 FIPS is not supported.
+  @retval non-zero: FIPS is supported.
+*/
+int test_ssl_fips_mode(char *err_string) {
+  int ret = FIPS_mode_set(FIPS_mode() == 0 ? 1 : 0);
+  unsigned long err = (ret == 0) ? ERR_get_error() : 0;
+
+  if (err != 0) {
+    ERR_error_string_n(err, err_string, OPENSSL_ERROR_LENGTH - 1);
+  }
+  return ret;
+}
+
 long process_tls_version(const char *tls_version) {
   const char *separator = ",";
   char *token, *lasts = nullptr;
@@ -578,9 +593,9 @@
 static struct st_VioSSLFd *new_VioSSLFd(
     const char *key_file, const char *cert_file, const char *ca_file,
     const char *ca_path, const char *cipher,
-    const char *ciphersuites MY_ATTRIBUTE((unused)), bool is_client,
+    const char *ciphersuites [[maybe_unused]], bool is_client,
     enum enum_ssl_init_error *error, const char *crl_file, const char *crl_path,
-    const long ssl_ctx_flags, const char *server_host MY_ATTRIBUTE((unused))) {
+    const long ssl_ctx_flags, const char *server_host [[maybe_unused]]) {
   DH *dh;
   struct st_VioSSLFd *ssl_fd;
   long ssl_ctx_options = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
@@ -745,6 +760,7 @@
     *error = SSL_INITERR_ECDHFAIL;
     goto error;
   }
+  EC_KEY_free(eckey);
 #else
   if (SSL_CTX_set_ecdh_auto(ssl_fd->ssl_context, 1) == 0) {
     *error = SSL_INITERR_ECDHFAIL;